From 87fb9c542fb930d1c4f14d81952f5dc5829cb31b Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Fri, 4 Mar 2016 22:26:34 +0100
Subject: [PATCH 0001/1304] build: Fix dependency generation for go binaries

The way depsgen works is that it recursively gets all the dependencies
of a given module (say, github.com/coreos/rkt/rkt), filters the
dependencies to eliminate packages outside the repository (basically
packages from Go standard library), and then gets the files of all
those filtered deps and the module. Filtering was done by simply
checking if an import path of a dependency had a specific prefix,
namely a name of the repository (in our case the repo name is
github.com/coreos/rkt). This worked fine until we stopped rewriting
our imports. It is because rewritten imports always had the prefix we
wanted (github.com/coreos/rkt/Godeps/_workspace/etc/etc) and now they
do not. In effect, we were getting the files of all the dependencies
that are a part of the repository (like github.com/coreos/rkt/stage0).

So now, instead of checking ImportPath of a dependency, we check its
Dir and check if it is a direct or indirect subdirectory of the repo.
---
 tools/depsgen/gocmd.go | 56 ++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/tools/depsgen/gocmd.go b/tools/depsgen/gocmd.go
index c6badcfc9f..d15f70b4be 100644
--- a/tools/depsgen/gocmd.go
+++ b/tools/depsgen/gocmd.go
@@ -16,6 +16,7 @@ package main
 
 import (
 	"bytes"
+	"fmt"
 	"os/exec"
 	"path"
 	"path/filepath"
@@ -98,32 +99,36 @@ func goGetArgs(args []string) (string, string, string, goDepsMode) {
 // goGetPackageDeps returns a list of files that are used to build a
 // module in a given repo.
 func goGetPackageDeps(repo, module string) []string {
-	pkg := path.Join(repo, module)
-	deps := []string{pkg}
-	for _, d := range goGetDeps(pkg) {
-		if strings.HasPrefix(d, repo) {
-			deps = append(deps, d)
-		}
-	}
-	return goGetFiles(repo, deps)
+	dir, deps := goGetDeps(repo, module)
+	return goGetFiles(dir, deps)
 }
 
-// goGetDeps gets all dependencies, direct or indirect, of a given
-// package.
-func goGetDeps(pkg string) []string {
-	rawDeps := goRun(goList([]string{"Deps"}, []string{pkg}))
-	// we expect only one line
-	if len(rawDeps) != 1 {
-		return []string{}
+// goGetDeps gets the directory of a given repo and the all
+// dependencies, direct or indirect, of a given module in the repo.
+func goGetDeps(repo, module string) (string, []string) {
+	pkg := path.Join(repo, module)
+	rawTuples := goRun(goList([]string{"Dir", "Deps"}, []string{pkg}))
+	if len(rawTuples) != 1 {
+		common.Die("Expected to get only one line from go list for a single package")
 	}
-	return goSliceRawSlice(rawDeps[0])
+	tuple := goSliceRawTuple(rawTuples[0])
+	dir := tuple[0]
+	if module != "." {
+		dirsToStrip := 1 + strings.Count(module, "/")
+		for i := 0; i < dirsToStrip; i++ {
+			dir = filepath.Dir(dir)
+		}
+	}
+	dir = filepath.Clean(dir)
+	deps := goSliceRawSlice(tuple[1])
+	return dir, append([]string{pkg}, deps...)
 }
 
 // goGetFiles returns a list of files that are in given packages. File
-// paths are "relative" to passed repo.
-func goGetFiles(repo string, pkgs []string) []string {
+// paths are relative to a given directory.
+func goGetFiles(dir string, pkgs []string) []string {
 	params := []string{
-		"ImportPath",
+		"Dir",
 		"GoFiles",
 		"CgoFiles",
 	}
@@ -131,10 +136,19 @@ func goGetFiles(repo string, pkgs []string) []string {
 	rawTuples := goRun(goList(params, pkgs))
 	for _, raw := range rawTuples {
 		tuple := goSliceRawTuple(raw)
-		module := strings.TrimPrefix(tuple[0], repo+"/")
+		moduleDir := filepath.Clean(tuple[0])
+		dirSep := fmt.Sprintf("%s%c", dir, filepath.Separator)
+		moduleDirSep := fmt.Sprintf("%s%c", moduleDir, filepath.Separator)
+		if !strings.HasPrefix(moduleDirSep, dirSep) {
+			continue
+		}
+		relModuleDir, err := filepath.Rel(dir, moduleDir)
+		if err != nil {
+			common.Die("Could not make a relative path from %q to %q, even if they have the same prefix", moduleDir, dir)
+		}
 		files := append(goSliceRawSlice(tuple[1]), goSliceRawSlice(tuple[2])...)
 		for i := 0; i < len(files); i++ {
-			files[i] = filepath.Join(module, files[i])
+			files[i] = filepath.Join(relModuleDir, files[i])
 		}
 		allFiles = append(allFiles, files...)
 	}

From 574a54180b589969a37dd0df2289d7ee410df6ec Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Thu, 17 Mar 2016 08:54:47 +0100
Subject: [PATCH 0002/1304] *: drop support for go1.4

---
 .travis.yml                            |  1 -
 Documentation/dependencies.md          |  2 +-
 Documentation/getting-started-guide.md |  8 -----
 configure.ac                           | 42 ++++++++------------------
 pkg/log/log.go                         |  7 -----
 tests/cloudinit/centos.cloudinit       | 17 ++++++-----
 6 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index db7dcaa744..4ca1563148 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@
 language: go
 
 go:
-  - 1.4.2
   - 1.5.3
   - 1.6
 
diff --git a/Documentation/dependencies.md b/Documentation/dependencies.md
index 1aef0544d9..d55d1a8469 100644
--- a/Documentation/dependencies.md
+++ b/Documentation/dependencies.md
@@ -7,7 +7,7 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
 ### Basic
 
 * GNU Make
-* Go 1.4+ (ideally 1.5.3 or later)
+* Go 1.5.3 or later
 * autoconf
 * aclocal (usually a part of automake)
 * bash
diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index a5e1ddb7f4..98f654447d 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -27,14 +27,6 @@ func main() {
 Next we need to build our application.
 We are going to statically link our app so we can ship an App Container Image with no external dependencies.
 
-With [Go 1.4](https://github.com/golang/go/issues/9344#issuecomment-69944514):
-
-```
-$ CGO_ENABLED=0 GOOS=linux go build -o hello -a -installsuffix cgo .
-```
-
-or with Go 1.5:
-
 ```
 $ CGO_ENABLED=0 GOOS=linux go build -o hello -a -tags netgo -ldflags '-w' .
 ```
diff --git a/configure.ac b/configure.ac
index cc97a81eb2..1b798b71c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,20 +596,14 @@ dnl for [ and ].
 m4_define([DIGITS],[@<:@0-9@:>@])
 m4_define([ALNUM],[@<:@a-z0-9@:>@])
 
-dnl Detect go version. Go 1.4 support only "-X variable 'value'"
-dnl format of assigning values to variables via linker flags. Go 1.5
-dnl deprecates this format in favor of "-X 'variable=value'"
-dnl format. Drop this ugliness when we drop support for Go 1.4.
-dnl Successfully parse versions like "go1.5", "go1.5.3", "go1.6rc1",
-dnl "devel +66330d8 Wed Jan 13 23:40:13 2016 +0000".
+dnl Detect go version. Successfully parse versions like "go1.5",
+dnl "go1.5.3", "go1.6rc1", "devel +66330d8 Wed Jan 13 23:40:13 2016
+dnl +0000".
 GO_VERSION_OUTPUT=`"${ABS_GO}" version`
 GO_VERSION=`AS_ECHO(["${GO_VERSION_OUTPUT}"]) | sed -e 's/^go version \(.*\) ALNUM*\/ALNUM*$/\1/'`
 AS_CASE([$GO_VERSION],
         [devel*],
-                [AC_MSG_WARN([* Using development version of go, all bets are off])
-                 RKT_XF() {
-                     AS_ECHO(["-X '$1=$2'"])
-                 }],
+                [AC_MSG_WARN([* Using development version of go, all bets are off])],
         [go*],
                 [GO_VERSION=`AS_ECHO(["${GO_VERSION}"]) | sed -e 's/^go\(.*\)/\1/'`
                  GO_MAJOR=`AS_ECHO(["${GO_VERSION}"]) | grep -o '^DIGITS\+'`
@@ -622,18 +616,9 @@ AS_CASE([$GO_VERSION],
                  GO_BEST_MINOR=5
                  AC_MSG_CHECKING([whether we have go ${GO_BEST_MAJOR}.${GO_BEST_MINOR} or newer])
                  AS_IF([test "${GO_MAJOR}" -gt "${GO_BEST_MAJOR}" || test "${GO_MAJOR}" -eq "${GO_BEST_MAJOR}" -a "${GO_MINOR}" -ge "${GO_BEST_MINOR}"],
-                       [AC_MSG_RESULT([yes])
-                        RKT_XF() {
-                            AS_ECHO(["-X '$1=$2'"])
-                        }],
+                       [AC_MSG_RESULT([yes])],
                        [AC_MSG_RESULT([no])
-                        AC_MSG_CHECKING([whether we have go 1.4])
-                        AS_IF([test "${GO_MAJOR}" -eq "1" -a "${GO_MINOR}" -eq "4"],
-                              [AC_MSG_RESULT([yes])
-                               RKT_XF() {
-                                   AS_ECHO(["-X $1 '$2'"])
-                               }],
-                              [AC_MSG_ERROR([*** go is too old (${GO_VERSION})])])])
+                        AC_MSG_ERROR([*** go is too old (${GO_VERSION})])])
 
                  AC_MSG_CHECKING([whether we have a go version without CVE-2015-8618])
                  AS_IF([test "${GO_MAJOR}" -eq "1" -a "${GO_MINOR}" -eq "5" -a "${GO_MICRO}" -lt "3"],
@@ -644,14 +629,13 @@ AS_CASE([$GO_VERSION],
                                   [AC_MSG_WARN([* ${insecure_go_warning}])])],
                        [AC_MSG_RESULT([yes])])],
         [AC_MSG_ERROR([*** Could not parse the output of go version])])
-
-RKT_STAGE1_DEFAULT_NAME_LDFLAGS=`RKT_XF main.buildDefaultStage1Name "${RKT_STAGE1_DEFAULT_NAME}"`
-RKT_STAGE1_DEFAULT_VERSION_LDFLAGS=`RKT_XF main.buildDefaultStage1Version "${RKT_STAGE1_DEFAULT_VERSION}"`
-RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS=`RKT_XF main.buildDefaultStage1ImageLoc "${RKT_STAGE1_DEFAULT_LOCATION}"`
-RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS=`RKT_XF main.buildDefaultStage1ImageInRktDir "${RKT_STAGE1_DEFAULT_IMAGE_FILENAME_IN_RKT_DIRECTORY}"`
-RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS=`RKT_XF main.buildDefaultStage1ImagesDir "${RKT_STAGE1_DEFAULT_IMAGES_DIR}"`
-RKT_VERSION_LDFLAGS=`RKT_XF github.com/coreos/rkt/version.Version "${RKT_VERSION}"`
-RKT_FEATURES_LDFLAGS=`RKT_XF main.rktFeatures "${RKT_FEATURES}"`
+RKT_STAGE1_DEFAULT_NAME_LDFLAGS="-X 'main.buildDefaultStage1Name=${RKT_STAGE1_DEFAULT_NAME}'"
+RKT_STAGE1_DEFAULT_VERSION_LDFLAGS="-X 'main.buildDefaultStage1Version=${RKT_STAGE1_DEFAULT_VERSION}'"
+RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS="-X 'main.buildDefaultStage1ImageLoc=${RKT_STAGE1_DEFAULT_LOCATION}'"
+RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS="-X 'main.buildDefaultStage1ImageInRktDir=${RKT_STAGE1_DEFAULT_IMAGE_FILENAME_IN_RKT_DIRECTORY}'"
+RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS="-X 'main.buildDefaultStage1ImagesDir=${RKT_STAGE1_DEFAULT_IMAGES_DIR}'"
+RKT_VERSION_LDFLAGS="-X 'github.com/coreos/rkt/version.Version=${RKT_VERSION}'"
+RKT_FEATURES_LDFLAGS="-X 'main.rktFeatures=${RKT_FEATURES}'"
 
 #### SUBSTITUTIONS
 
diff --git a/pkg/log/log.go b/pkg/log/log.go
index ac951acdf0..479b1ac69c 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -58,13 +58,6 @@ func NewLogSet(prefix string, debug bool) (stderr, diagnostic, stdout *Logger) {
 // SetDebug sets the debug flag to the value of b
 func (l *Logger) SetDebug(b bool) { l.debug = b }
 
-// SetOutput sets the output destination for Logger.
-// FIXME: We can get rid of this once rkt drops support for 1.4.
-func (l *Logger) SetOutput(w io.Writer) {
-	// No SetOutput exposed in go 1.4.
-	*l = *New(w, l.Prefix(), l.debug)
-}
-
 // SetFlags is a wrapper around log.SetFlags that adds and removes, ": " to and
 // from a prefix. This is needed because ": " is only added by golang's log
 // package if either of the Lshortfile or Llongfile flags are set.
diff --git a/tests/cloudinit/centos.cloudinit b/tests/cloudinit/centos.cloudinit
index 4d4cb67f94..3f4a7e5142 100644
--- a/tests/cloudinit/centos.cloudinit
+++ b/tests/cloudinit/centos.cloudinit
@@ -12,14 +12,17 @@ groupadd rkt
 gpasswd -a centos rkt
 
 #yum update -y
-yum -y -v install epel-release # Needed for golang-vet and golang-cover
 yum -y -v groupinstall "Development Tools"
-yum -y -v install wget squashfs-tools patch glibc-static gnupg golang libacl-devel golang-vet golang-cover
-
-# # No need to do that with CentOS's go1.4.2
-# # https://github.com/coreos/rkt/pull/1877#issuecomment-169614067
-# GOPATH=/tmp /usr/bin/go get golang.org/x/tools/cmd/vet
-# GOPATH=/tmp /usr/bin/go get golang.org/x/tools/cmd/cover
+yum -y -v install wget squashfs-tools patch glibc-static gnupg libacl-devel
+
+pushd /tmp
+wget https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz
+popd
+tar -C /usr/local -xzf /tmp/go1.5.3.linux-amd64.tar.gz
+ln -s /usr/local/go/bin/go /usr/local/bin/go
+ln -s /usr/local/go/bin/godoc /usr/local/bin/godoc
+ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt
+export GOROOT=/usr/local/go
 
 /usr/sbin/setenforce 0
 

From 2f39baa87ec0c95f200767ada9c758c72f7a974a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 18 Mar 2016 16:09:08 +0100
Subject: [PATCH 0003/1304] version: bump to v1.2.0+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e7f3d5a34b..0091edb1c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.2.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.2.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 342b15ce08..536f342713 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -25,7 +25,7 @@ ACI_NAME=${ACI_NAME:-"coreos.com/rkt/builder"}
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
 ACI_GOPATH=/go
-VERSION=${VERSION:-"v1.2.0"}
+VERSION=${VERSION:-"v1.2.0+git"}
 echo "Version: $VERSION"
 
 echo "Building $ACI_FILE"
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index b98c5a50bb..577bf1ea21 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR=${SRC_DIR:-$PWD}
 BUILDDIR=${BUILDDIR:-$PWD/build-rir}
-RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.2.0}
+RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.2.0+git}
 
 mkdir -p $BUILDDIR
 

From 164e2ebb1a2092fc4b713950d3b0f4a5eb89847a Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Fri, 18 Mar 2016 16:22:50 -0700
Subject: [PATCH 0004/1304] stage1/prepare-app: Do not error out if symlinks
 exits.

If /dev/ptmx or /dev/log already exists in the image,
leave it as is instead of overriding it.
---
 Documentation/app-environment.md | 2 +-
 stage1/prepare-app/prepare-app.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/app-environment.md b/Documentation/app-environment.md
index 077bab40ac..e20a1f3fbf 100644
--- a/Documentation/app-environment.md
+++ b/Documentation/app-environment.md
@@ -21,4 +21,4 @@ Since rkt v1.2.0, rkt gives access to systemd-journald's sockets in the /run/sys
 
 #### /dev/log
 
-Since rkt v1.2.0, /dev/log is created as a symlink to /run/systemd/journal/dev-log.
+Since rkt v1.2.0, if /dev/log does not exist in the image, it will be created as a symlink to /run/systemd/journal/dev-log.
diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 27db950336..30d88173f5 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -283,13 +283,13 @@ int main(int argc, char *argv[])
 	/* /dev/ptmx -> /dev/pts/ptmx */
 	exit_if(snprintf(to, sizeof(to), "%s/dev/ptmx", root) >= sizeof(to),
 		"Path too long: \"%s\"", to);
-	pexit_if(symlink("/dev/pts/ptmx", to) == -1,
+	pexit_if(symlink("/dev/pts/ptmx", to) == -1 && errno != EEXIST,
 		"Failed to create /dev/ptmx symlink");
 
 	/* /dev/log -> /run/systemd/journal/dev-log */
 	exit_if(snprintf(to, sizeof(to), "%s/dev/log", root) >= sizeof(to),
 		"Path too long: \"%s\"", to);
-	pexit_if(symlink("/run/systemd/journal/dev-log", to) == -1,
+	pexit_if(symlink("/run/systemd/journal/dev-log", to) == -1 && errno != EEXIST,
 		"Failed to create /dev/log symlink");
 
 	return EXIT_SUCCESS;

From dc741e9b3e3d8e096530756f84c9468f07282f47 Mon Sep 17 00:00:00 2001
From: David Castillo <castillobg@users.noreply.github.com>
Date: Sat, 19 Mar 2016 00:40:50 -0500
Subject: [PATCH 0005/1304] docs: fix typos in hacking guide.

---
 Documentation/hacking.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 059a480296..c6d1009a4f 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -7,7 +7,7 @@ For more information on the rkt internals, see the [`devel`](devel/) documentati
 
 ## Building rkt
 
-rkt should be able to be built on any modern Linux system.
+You should be able build rkt on any modern Linux system.
 For the most part the codebase is self-contained (e.g. all dependencies are vendored), but assembly of the stage1 requires some other tools to be installed on the system.
 Please see [the list of the build-time dependencies](dependencies.md#build-time-dependencies).
 Once the dependenciess have been satisfied you can build rkt by running the following commands:
@@ -225,7 +225,7 @@ rkt attempts to offer consistent and structured error output. To achieve this, w
 
 ### Wrapping errors
 
-rkt uses the errwrap package to structure errors. This allows us to manages how we output errors. You can wrap errors by doing the following.
+rkt uses the errwrap package to structure errors. This allows us to manage how we output errors. You can wrap errors by doing the following.
 
 ```
 err := funcReturningSomeError()

From 5cb76ddc10b7f2dc55d4f1a1fdb03f33f97db48c Mon Sep 17 00:00:00 2001
From: David Castillo <castillobgr@gmail.com>
Date: Sun, 20 Mar 2016 13:22:50 -0500
Subject: [PATCH 0006/1304] docs: fix typo in hacking.md.

---
 Documentation/hacking.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index c6d1009a4f..cb00f46970 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -10,7 +10,7 @@ For more information on the rkt internals, see the [`devel`](devel/) documentati
 You should be able build rkt on any modern Linux system.
 For the most part the codebase is self-contained (e.g. all dependencies are vendored), but assembly of the stage1 requires some other tools to be installed on the system.
 Please see [the list of the build-time dependencies](dependencies.md#build-time-dependencies).
-Once the dependenciess have been satisfied you can build rkt by running the following commands:
+Once the dependencies have been satisfied you can build rkt by running the following commands:
 
 ```
 git clone https://github.com/coreos/rkt.git
@@ -258,7 +258,7 @@ Here, the prefix is an empty string and debug is set to `false`.
 
 ## Finishing Up
 
-At this point, you should be good to PR.
+At this point, you should be good to submit a PR.
 As well as a simple sanity check that the code actually builds and tests pass, here are some things to look out for:
 - `git status Godeps/` should show only a minimal and relevant change (i.e. only the dependencies you actually intended to touch).
 - `git diff Godeps/` should be free of any changes to import paths within the vendored dependencies

From 812506598fcbef69c036edf4e2edecf344f7ef8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 21 Mar 2016 14:08:48 +0100
Subject: [PATCH 0007/1304] Godeps: bump go-systemd to v5

---
 Godeps/Godeps.json                            | 16 +++---
 .../coreos/go-systemd/dbus/methods.go         | 54 +++++++++++++++----
 .../github.com/coreos/go-systemd/util/util.go | 16 +++++-
 3 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index edda092aa1..c34c51d13a 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -226,23 +226,23 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/activation",
-			"Comment": "v4-15-ga831f36",
-			"Rev": "a831f36d09de8f095c28eeee839df52e9de5031f"
+			"Comment": "v5",
+			"Rev": "7b2428fec40033549c68f54e26e89e7ca9a9ce31"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/dbus",
-			"Comment": "v4-15-ga831f36",
-			"Rev": "a831f36d09de8f095c28eeee839df52e9de5031f"
+			"Comment": "v5",
+			"Rev": "7b2428fec40033549c68f54e26e89e7ca9a9ce31"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/unit",
-			"Comment": "v4-15-ga831f36",
-			"Rev": "a831f36d09de8f095c28eeee839df52e9de5031f"
+			"Comment": "v5",
+			"Rev": "7b2428fec40033549c68f54e26e89e7ca9a9ce31"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/util",
-			"Comment": "v4-15-ga831f36",
-			"Rev": "a831f36d09de8f095c28eeee839df52e9de5031f"
+			"Comment": "v5",
+			"Rev": "7b2428fec40033549c68f54e26e89e7ca9a9ce31"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-tspi/attestation",
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
index ab614c7c63..f9552a3380 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
@@ -221,6 +221,19 @@ func (c *Conn) GetUnitTypeProperty(unit string, unitType string, propertyName st
 	return c.getProperty(unit, "org.freedesktop.systemd1."+unitType, propertyName)
 }
 
+type UnitStatus struct {
+	Name        string          // The primary unit name as string
+	Description string          // The human readable description string
+	LoadState   string          // The load state (i.e. whether the unit file has been loaded successfully)
+	ActiveState string          // The active state (i.e. whether the unit is currently started or not)
+	SubState    string          // The sub state (a more fine-grained version of the active state that is specific to the unit type, which the active state is not)
+	Followed    string          // A unit that is being followed in its state by this unit, if there is any, otherwise the empty string.
+	Path        dbus.ObjectPath // The unit object path
+	JobId       uint32          // If there is a job queued for the job unit the numeric job id, 0 otherwise
+	JobType     string          // The job type as string
+	JobPath     dbus.ObjectPath // The job object path
+}
+
 // ListUnits returns an array with all currently loaded units. Note that
 // units may be known by multiple names at the same time, and hence there might
 // be more unit names loaded than actual units behind them.
@@ -250,17 +263,36 @@ func (c *Conn) ListUnits() ([]UnitStatus, error) {
 	return status, nil
 }
 
-type UnitStatus struct {
-	Name        string          // The primary unit name as string
-	Description string          // The human readable description string
-	LoadState   string          // The load state (i.e. whether the unit file has been loaded successfully)
-	ActiveState string          // The active state (i.e. whether the unit is currently started or not)
-	SubState    string          // The sub state (a more fine-grained version of the active state that is specific to the unit type, which the active state is not)
-	Followed    string          // A unit that is being followed in its state by this unit, if there is any, otherwise the empty string.
-	Path        dbus.ObjectPath // The unit object path
-	JobId       uint32          // If there is a job queued for the job unit the numeric job id, 0 otherwise
-	JobType     string          // The job type as string
-	JobPath     dbus.ObjectPath // The job object path
+type UnitFile struct {
+	Path string
+	Type string
+}
+
+// ListUnitFiles returns an array of all available units on disk.
+func (c *Conn) ListUnitFiles() ([]UnitFile, error) {
+	result := make([][]interface{}, 0)
+	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFiles", 0).Store(&result)
+	if err != nil {
+		return nil, err
+	}
+
+	resultInterface := make([]interface{}, len(result))
+	for i := range result {
+		resultInterface[i] = result[i]
+	}
+
+	files := make([]UnitFile, len(result))
+	fileInterface := make([]interface{}, len(files))
+	for i := range files {
+		fileInterface[i] = &files[i]
+	}
+
+	err = dbus.Store(resultInterface, fileInterface...)
+	if err != nil {
+		return nil, err
+	}
+
+	return files, nil
 }
 
 type LinkUnitFileChange EnableUnitFileChange
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
index 0863665774..f9f0b2a35a 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
@@ -60,7 +60,9 @@ import "C"
 import (
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
+	"strings"
 	"syscall"
 	"unsafe"
 )
@@ -244,7 +246,7 @@ func CurrentUnitName() (unit string, err error) {
 }
 
 // IsRunningSystemd checks whether the host was booted with systemd as its init
-// system. This functions similar to systemd's `sd_booted(3)`: internally, it
+// system. This functions similarly to systemd's `sd_booted(3)`: internally, it
 // checks whether /run/systemd/system/ exists and is a directory.
 // http://www.freedesktop.org/software/systemd/man/sd_booted.html
 func IsRunningSystemd() bool {
@@ -254,3 +256,15 @@ func IsRunningSystemd() bool {
 	}
 	return fi.IsDir()
 }
+
+// GetMachineID returns a host's 128-bit machine ID as a string. This functions
+// similarly to systemd's `sd_id128_get_machine`: internally, it simply reads
+// the contents of /etc/machine-id
+// http://www.freedesktop.org/software/systemd/man/sd_id128_get_machine.html
+func GetMachineID() (string, error) {
+	machineID, err := ioutil.ReadFile("/etc/machine-id")
+	if err != nil {
+		return "", fmt.Errorf("failed to read /etc/machine-id: %v", err)
+	}
+	return strings.TrimSpace(string(machineID)), nil
+}

From 0502fa06dce78b232352d28f578a2b2a7971eb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 21 Mar 2016 14:15:37 +0100
Subject: [PATCH 0008/1304] stage1/init: remove unnecessary arg to systemd

Since v222, systemd-shutdown follows `--log-target` so we don't need to
pass `--log-level=warning` anymore.
---
 stage1/init/init.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index f7bc046d0c..6d09258f29 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -430,9 +430,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 	args = append(args, "--default-standard-output=tty") // redirect all service logs straight to tty
 	if !debug {
 		args = append(args, "--log-target=null") // silence systemd output inside pod
-		// TODO remove --log-level=warning when we update stage1 to systemd v222
-		args = append(args, "--log-level=warning") // limit log output (systemd-shutdown ignores --log-target)
-		args = append(args, "--show-status=0")     // silence systemd initialization status output
+		args = append(args, "--show-status=0")   // silence systemd initialization status output
 	}
 
 	return args, env, nil

From fe5033e5caa3392c59d83f23dca5f21c3a38241b Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 22 Mar 2016 17:51:19 +0100
Subject: [PATCH 0009/1304] docs: update rktnetes link

---
 Documentation/using-rkt-with-kubernetes.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/using-rkt-with-kubernetes.md b/Documentation/using-rkt-with-kubernetes.md
index e24d2925ec..6b8124aeba 100644
--- a/Documentation/using-rkt-with-kubernetes.md
+++ b/Documentation/using-rkt-with-kubernetes.md
@@ -14,9 +14,9 @@ The kubelet provides several flags to use rkt as the container runtime:
 - `--rkt-path` sets the rkt binary path.
 - `--rkt-stage1-image` sets the stage1 image path.
 
-The [getting started with rkt guide][] in the Kubernetes repository provides more detailed information about how to launch a kubernetes cluster with rkt, how to debug it, and more.
+The [getting started with rkt guide][] in the upstream Kubernetes documentation provides more detailed information about how to launch a kubernetes cluster with rkt, how to debug it, and more.
 
-[getting started with rkt guide]: https://github.com/kubernetes/kubernetes/blob/master/docs/getting-started-guides/rkt/README.md
+[getting started with rkt guide]: http://kubernetes.io/docs/getting-started-guides/rkt/
 
 ### Current Status
 

From a085e84bed0d14af5202f815d72da445f3acaa3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 21 Mar 2016 17:19:22 +0100
Subject: [PATCH 0010/1304] CHANGELOG: v1.2.1

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2b949bab0..89fbe458f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## v1.2.1
+
+This release fixes a couple of bugs we missed in 1.2.0.
+
+#### Bug fixes
+
+- Do not error out if `/dev/ptmx` or `/dev/log` exist ([#2302](https://github.com/coreos/rkt/pull/2302)).
+- Vendor a release of go-systemd instead of current master ([#2306](https://github.com/coreos/rkt/pull/2306)).
+
 ## v1.2.0
 
 This release is an incremental release with numerous bug fixes.

From 585b6ef69c008ac7af449b94964007e4c217bd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 21 Mar 2016 17:19:56 +0100
Subject: [PATCH 0011/1304] version: bump to v1.2.1

---
 Documentation/getting-started-ubuntu.md | 6 +++---
 Documentation/running-fly-stage1.md     | 2 +-
 Documentation/running-lkvm-stage1.md    | 2 +-
 Documentation/subcommands/prepare.md    | 2 +-
 Documentation/subcommands/version.md    | 2 +-
 Documentation/trying-out-rkt.md         | 6 +++---
 configure.ac                            | 2 +-
 scripts/acbuild-rkt-builder.sh          | 2 +-
 scripts/build-rir.sh                    | 2 +-
 tests/empty-image/manifest              | 2 +-
 tests/image/manifest                    | 2 +-
 tests/rkt_exec_test.go                  | 2 +-
 tests/rkt_image_cat_manifest_test.go    | 2 +-
 tests/rkt_image_export_test.go          | 2 +-
 tests/rkt_image_render_test.go          | 2 +-
 tests/rkt_os_arch_test.go               | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
index ba17acd952..86672711a7 100644
--- a/Documentation/getting-started-ubuntu.md
+++ b/Documentation/getting-started-ubuntu.md
@@ -15,9 +15,9 @@ vagrant up --provider virtualbox
 vagrant ssh
 sudo -s
 
-wget https://github.com/coreos/rkt/releases/download/v1.2.0/rkt-v1.2.0.tar.gz
-tar xzvf rkt-v1.2.0.tar.gz
-cd rkt-v1.2.0
+wget https://github.com/coreos/rkt/releases/download/v1.2.1/rkt-v1.2.1.tar.gz
+tar xzvf rkt-v1.2.1.tar.gz
+cd rkt-v1.2.1
 ./rkt help
 ```
 
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index dd2dfe7e89..97f792e037 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,7 +60,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.2.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.2.1+git/bin/`.
 
 ### Selecting stage1 at runtime
 
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index cda5a325ad..e7e554d3b0 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.2.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.2.1+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index b578d3ee93..2cc71d0e02 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.2.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.2.1
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 91162e1c7e..905dba5666 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.2.0
+rkt Version: 1.2.1
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 21492bb0be..909c515bbb 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool, and is currently supported on amd64 Linux. A
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.2.0/rkt-v1.2.0.tar.gz
-tar xzvf rkt-v1.2.0.tar.gz
-cd rkt-v1.2.0
+wget https://github.com/coreos/rkt/releases/download/v1.2.1/rkt-v1.2.1.tar.gz
+tar xzvf rkt-v1.2.1.tar.gz
+cd rkt-v1.2.1
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 0091edb1c2..c16ded3aba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.2.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.2.1], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 536f342713..36b17a7e60 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -25,7 +25,7 @@ ACI_NAME=${ACI_NAME:-"coreos.com/rkt/builder"}
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
 ACI_GOPATH=/go
-VERSION=${VERSION:-"v1.2.0+git"}
+VERSION=${VERSION:-"v1.2.1"}
 echo "Version: $VERSION"
 
 echo "Building $ACI_FILE"
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 577bf1ea21..3ab2375f72 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR=${SRC_DIR:-$PWD}
 BUILDDIR=${BUILDDIR:-$PWD/build-rir}
-RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.2.0+git}
+RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.2.1}
 
 mkdir -p $BUILDDIR
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index aec1b5fbf0..09c7e908ef 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.2.0"
+            "value": "1.2.1"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 36af2cccc0..73913d743b 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.2.0"
+            "value": "1.2.1"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 5e3eb50d2c..9696bacd81 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.2.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 5ddd3b1952..72dd1e5948 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -27,7 +27,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 1e93222ab1..fd48d7a8f2 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index cfc4e2b78b..8abba1a4e2 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 6f4cb5c187..ef5165ffad 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.1"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 2c055c690eaaa05f53717fc7a9e7cfa4efd85279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 21 Mar 2016 17:19:56 +0100
Subject: [PATCH 0012/1304] version: bump to v1.2.1+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index c16ded3aba..d0d0fa5d38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.2.1], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.2.1+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 36b17a7e60..1e5ef7a12a 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -25,7 +25,7 @@ ACI_NAME=${ACI_NAME:-"coreos.com/rkt/builder"}
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
 ACI_GOPATH=/go
-VERSION=${VERSION:-"v1.2.1"}
+VERSION=${VERSION:-"v1.2.1+git"}
 echo "Version: $VERSION"
 
 echo "Building $ACI_FILE"
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 3ab2375f72..8db2ec9076 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR=${SRC_DIR:-$PWD}
 BUILDDIR=${BUILDDIR:-$PWD/build-rir}
-RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.2.1}
+RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.2.1+git}
 
 mkdir -p $BUILDDIR
 

From 423f233fe49ff67f1dc2cb86fbccda9be10ed953 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 23 Mar 2016 12:03:25 +0100
Subject: [PATCH 0013/1304] tests: aws: update Fedora images

Fedora images get published on AWS again. It broke in February, and was
repaired yesterday. We can now test on more recent images.
---
 tests/aws.sh | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/tests/aws.sh b/tests/aws.sh
index 302ba69ea0..7d55cff9f5 100755
--- a/tests/aws.sh
+++ b/tests/aws.sh
@@ -47,21 +47,16 @@ if [ "$DISTRO" = "fedora-22" ] ; then
   # https://apps.fedoraproject.org/datagrepper/raw?category=fedimg
   # Sources: https://github.com/fedora-infra/fedimg/blob/develop/bin/list-the-amis.py
 
-  # Fedora-Cloud-Base-22-20151026.x86_64-eu-central-1-HVM-standard-0 was deleted
-
-  # Fedora-Cloud-Base-22-20150521.x86_64-eu-central-1-HVM-standard-0
-  AMI=ami-a88eb0b5
+  # Fedora-Cloud-Base-22-20160218.x86_64-eu-central-1-HVM-standard-0
+  AMI=ami-7a1b0116
   AWS_USER=fedora
 elif [ "$DISTRO" = "fedora-23" ] ; then
-  # Fedora-Cloud-Base-23-20160129.x86_64-eu-central-1-HVM-standard-0
-  AMI=ami-4d3e2621
+  # Fedora-Cloud-Base-23-20160323.x86_64-eu-central-1-HVM-standard-0
+  AMI=ami-d59670ba
   AWS_USER=fedora
 elif [ "$DISTRO" = "fedora-rawhide" ] ; then
-  # rawhide is currently broken
-  # Error: nothing provides libpsl.so.0()(64bit) needed by wget-1.17.1-1.fc24.x86_64
-
-  # Fedora-Cloud-Base-rawhide-20160127.x86_64-eu-central-1-HVM-standard-0
-  AMI=ami-877068eb
+  # Fedora-Cloud-Base-Rawhide-20160321.0.x86_64-eu-central-1-HVM-standard-0
+  AMI=ami-69967006
   AWS_USER=fedora
 elif [ "$DISTRO" = "ubuntu-1604" ] ; then
   # https://cloud-images.ubuntu.com/locator/ec2/

From 16c36d92ffc715c595a670be191128b9c62d80e3 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 23 Mar 2016 13:41:18 +0100
Subject: [PATCH 0014/1304] tests: aws: add workarounds for Fedora

Fedora-Rawhide: keep SELinux enabled but disable overlayfs.
---
 tests/aws.sh                     | 15 ++++++++++++++-
 tests/cloudinit/fedora.cloudinit | 16 +++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/tests/aws.sh b/tests/aws.sh
index 7d55cff9f5..5e1953cf79 100755
--- a/tests/aws.sh
+++ b/tests/aws.sh
@@ -50,14 +50,25 @@ if [ "$DISTRO" = "fedora-22" ] ; then
   # Fedora-Cloud-Base-22-20160218.x86_64-eu-central-1-HVM-standard-0
   AMI=ami-7a1b0116
   AWS_USER=fedora
+
+  # Workarounds
+  DISABLE_SELINUX=true
 elif [ "$DISTRO" = "fedora-23" ] ; then
   # Fedora-Cloud-Base-23-20160323.x86_64-eu-central-1-HVM-standard-0
   AMI=ami-d59670ba
   AWS_USER=fedora
+
+  # Workarounds
+  DISABLE_SELINUX=true
 elif [ "$DISTRO" = "fedora-rawhide" ] ; then
   # Fedora-Cloud-Base-Rawhide-20160321.0.x86_64-eu-central-1-HVM-standard-0
   AMI=ami-69967006
   AWS_USER=fedora
+
+  # Workarounds
+  # systemd in stage1 does not have the fixes for SELinux yet
+  FLAVOR=host
+  DISABLE_OVERLAY=true
 elif [ "$DISTRO" = "ubuntu-1604" ] ; then
   # https://cloud-images.ubuntu.com/locator/ec2/
   # ubuntu/images-milestone/hvm/ubuntu-xenial-alpha2-amd64-server-20160125
@@ -89,6 +100,8 @@ CLOUDINIT=$(mktemp --tmpdir rkt-cloudinit.XXXXXXXXXX)
 sed -e "s#@GIT_URL@#${GIT_URL}#g" \
     -e "s#@GIT_BRANCH@#${GIT_BRANCH}#g" \
     -e "s#@FLAVOR@#${FLAVOR}#g" \
+    -e "s#@DISABLE_SELINUX@#${DISABLE_SELINUX}#g" \
+    -e "s#@DISABLE_OVERLAY@#${DISABLE_OVERLAY}#g" \
     < $CLOUDINIT_IN >> $CLOUDINIT
 
 INSTANCE_ID=$(aws ec2 run-instances \
@@ -96,7 +109,7 @@ INSTANCE_ID=$(aws ec2 run-instances \
 	--count 1 \
 	--key-name $KEY_PAIR_NAME \
 	--security-groups $SECURITY_GROUP \
-	--instance-type t2.micro \
+	--instance-type m4.large \
 	--instance-initiated-shutdown-behavior terminate \
 	--user-data file://$CLOUDINIT \
 	--output text \
diff --git a/tests/cloudinit/fedora.cloudinit b/tests/cloudinit/fedora.cloudinit
index b9a5d4051b..eabe16a70c 100644
--- a/tests/cloudinit/fedora.cloudinit
+++ b/tests/cloudinit/fedora.cloudinit
@@ -1,7 +1,14 @@
 #!/bin/bash
 
-# Workarounds on Fedora
-/usr/sbin/setenforce 0
+if [ "@DISABLE_OVERLAY@" = true ] ; then
+  # Workaround for SELinux: do not use overlay fs
+  /sbin/rmmod overlay || true
+  mv /lib/modules/`uname -r`/kernel/fs/overlayfs/overlay.ko.xz /root/overlay.ko.xz-disabled
+fi
+
+if [ "@DISABLE_SELINUX@" = true ] ; then
+  /usr/sbin/setenforce 0
+fi
 
 cat > /var/tmp/rkt-test.sh <<TESTEOF
 #!/bin/bash
@@ -19,6 +26,8 @@ dnf -y -v update
 dnf -y -v groupinstall "Development Tools"
 dnf -y -v groupinstall "C Development Tools and Libraries"
 dnf -y -v install wget squashfs-tools patch glibc-static gnupg golang libacl-devel file
+# systemd-container only available in newer versions of Fedora
+dnf -y -v install systemd-container || true
 
 # unsquashfs is in /usr/sbin
 export PATH=/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/fedora/.local/bin:/home/fedora/bin
@@ -29,4 +38,5 @@ TESTEOF
 
 chmod +x /var/tmp/rkt-test.sh
 
-systemd-run --unit=rkt-test /var/tmp/rkt-test.sh
+# "sh -c" is necessary, otherwise SELinux would reject the service
+systemd-run --unit=rkt-test sh -c /var/tmp/rkt-test.sh

From 453f76b11e34a13284c71ae552b2ee40810ceaf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 21 Mar 2016 14:43:09 +0100
Subject: [PATCH 0015/1304] stage1: update to systemd v225 on the coreos flavor

---
 stage1/usr_from_coreos/coreos-common.mk          |  4 ++--
 stage1/usr_from_coreos/manifest.d/bash.manifest  |  8 ++++----
 .../usr_from_coreos/manifest.d/systemd.manifest  | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index add1b2ecff..72197709e7 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -9,9 +9,9 @@ _CCN_INCLUDED_ := x
 $(call setup-tmp-dir,CCN_TMPDIR)
 
 # systemd version in coreos image
-CCN_SYSTEMD_VERSION := v222
+CCN_SYSTEMD_VERSION := v225
 # coreos image version
-CCN_IMG_RELEASE := 794.1.0
+CCN_IMG_RELEASE := 991.0.0
 # coreos image URL
 CCN_IMG_URL := http://alpha.release.core-os.net/amd64-usr/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image
diff --git a/stage1/usr_from_coreos/manifest.d/bash.manifest b/stage1/usr_from_coreos/manifest.d/bash.manifest
index 523f4c0fa7..a74b266609 100644
--- a/stage1/usr_from_coreos/manifest.d/bash.manifest
+++ b/stage1/usr_from_coreos/manifest.d/bash.manifest
@@ -1,9 +1,9 @@
 bin/bash
-lib64/ld-2.20.so
+lib64/ld-2.21.so
 lib64/ld-linux-x86-64.so.2
-lib64/libc-2.20.so
+lib64/libc-2.21.so
 lib64/libc.so.6
-lib64/libdl-2.20.so
+lib64/libdl-2.21.so
 lib64/libdl.so
 lib64/libdl.so.2
 lib64/libncurses.so
@@ -11,4 +11,4 @@ lib64/libncurses.so.5
 lib64/libncurses.so.5.9
 lib64/libreadline.so
 lib64/libreadline.so.6
-lib64/libreadline.so.6.2
+lib64/libreadline.so.6.3
diff --git a/stage1/usr_from_coreos/manifest.d/systemd.manifest b/stage1/usr_from_coreos/manifest.d/systemd.manifest
index f91829d2d2..8ba84bfc19 100644
--- a/stage1/usr_from_coreos/manifest.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest.d/systemd.manifest
@@ -20,7 +20,7 @@ bin/systemd-sysusers
 bin/systemd-tmpfiles
 bin/systemd-tty-ask-password-agent
 lib
-lib64/ld-2.20.so
+lib64/ld-2.21.so
 lib64/ld-linux-x86-64.so.2
 lib64/libattr.so
 lib64/libattr.so.1
@@ -31,16 +31,16 @@ lib64/libaudit.so.1.0.0
 lib64/libblkid.so
 lib64/libblkid.so.1
 lib64/libblkid.so.1.1.0
-lib64/libc-2.20.so
+lib64/libc-2.21.so
 lib64/libcap.so
 lib64/libcap.so.2
-lib64/libcap.so.2.22
+lib64/libcap.so.2.24
 lib64/libc.so.6
 lib64/libgcc_s.so
 lib64/libgcc_s.so.1
 lib64/libgcrypt.so
-lib64/libgcrypt.so.11
-lib64/libgcrypt.so.11.8.2
+lib64/libgcrypt.so.20
+lib64/libgcrypt.so.20.0.3
 lib64/libgpg-error.so
 lib64/libgpg-error.so.0
 lib64/libgpg-error.so.0.10.0
@@ -52,7 +52,7 @@ lib64/libip4tc.so.0
 lib64/libip4tc.so.0.1.0
 lib64/libkmod.so
 lib64/libkmod.so.2
-lib64/libkmod.so.2.2.5
+lib64/libkmod.so.2.2.11
 lib64/liblzma.so
 lib64/liblzma.so.5
 lib64/liblzma.so.5.0.8
@@ -62,10 +62,10 @@ lib64/libmount.so.1.1.0
 lib64/libpcre.so
 lib64/libpcre.so.1
 lib64/libpcre.so.1.2.4
-lib64/libpthread-2.20.so
+lib64/libpthread-2.21.so
 lib64/libpthread.so
 lib64/libpthread.so.0
-lib64/librt-2.20.so
+lib64/librt-2.21.so
 lib64/librt.so
 lib64/librt.so.1
 lib64/libseccomp.so

From f5fd7b7c1c08f152385b2e83a06e1ca851a0a0e8 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 17 Mar 2016 14:34:13 +0100
Subject: [PATCH 0016/1304] stage1: exit code: use systemctl exit on coreos
 flavor

The exit status can be propagated from apps by using "systemctl exit"
since systemd v227. rkt checks the systemd version to know whether it
can use "systemctl exit". However, systemd from coreos is back porting
the patches, so we skip the systemd version check on the coreos flavor.

See https://github.com/coreos/rkt/issues/1460
---
 stage1/init/common/pod.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 44954e1a1d..d108023eb6 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -472,7 +472,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 }
 
 func writeShutdownService(p *stage1commontypes.Pod) error {
-	_, systemdVersion, err := GetFlavor(p)
+	flavor, systemdVersion, err := GetFlavor(p)
 	if err != nil {
 		return err
 	}
@@ -493,7 +493,10 @@ func writeShutdownService(p *stage1commontypes.Pod) error {
 	// This can happen, for example, when building rkt with:
 	//
 	// ./configure --with-stage1-flavors=src --with-stage1-systemd-version=master
-	if systemdVersion != 0 && systemdVersion < 227 {
+	//
+	// The patches for the "exit" verb are backported to the "coreos" flavor, so
+	// don't rely on the systemd version on the "coreos" flavor.
+	if flavor != "coreos" && systemdVersion != 0 && systemdVersion < 227 {
 		shutdownVerb = "halt"
 	}
 

From 862953ce0fbf0808e327643fd614fa4ba117fe8b Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 18 Mar 2016 17:35:32 +0100
Subject: [PATCH 0017/1304] tests: exit code: don't return 42 without reason

Now that the exit code is propagated from the app to rkt, returning 42
from /inspect would make the rkt command fails. The API service tests
don't actually test the exit code, so it is safe to remove that.
---
 tests/rkt_api_service_bench_test.go | 2 +-
 tests/rkt_api_service_test.go       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_api_service_bench_test.go b/tests/rkt_api_service_bench_test.go
index b006283d92..1104efdbbb 100644
--- a/tests/rkt_api_service_bench_test.go
+++ b/tests/rkt_api_service_bench_test.go
@@ -32,7 +32,7 @@ func setup() (*testutils.RktRunCtx, *gexpect.ExpectSubprocess, v1alpha.PublicAPI
 	ctx := testutils.NewRktRunCtx()
 	svc := startAPIService(t, ctx)
 	c, conn := newAPIClientOrFail(t, "localhost:15441")
-	imagePath := patchTestACI("rkt-inspect-print.aci", "--exec=/inspect --print-msg=HELLO_API --exit-code=42")
+	imagePath := patchTestACI("rkt-inspect-print.aci", "--exec=/inspect --print-msg=HELLO_API")
 
 	return ctx, svc, c, conn, imagePath
 }
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index e051fca5a0..9bb3c0d729 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -284,7 +284,7 @@ func TestAPIServiceListInspectPods(t *testing.T) {
 		t.Errorf("Unexpected result: %v, should see zero pods", resp.Pods)
 	}
 
-	patches := []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=42"}
+	patches := []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}
 	imageHash := patchImportAndFetchHash("rkt-inspect-print.aci", patches, t, ctx)
 	imgID, err := types.NewHash(imageHash)
 	if err != nil {

From 4b4cb769d6d6602117bff47538f6cbb269f003cd Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 18 Mar 2016 18:22:59 +0100
Subject: [PATCH 0018/1304] tests: exit code: fix TestDNS

---
 tests/rkt_dns_test.go | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/tests/rkt_dns_test.go b/tests/rkt_dns_test.go
index 4c4e173fb3..6d80ff9e1c 100644
--- a/tests/rkt_dns_test.go
+++ b/tests/rkt_dns_test.go
@@ -30,38 +30,45 @@ func TestDNS(t *testing.T) {
 	defer ctx.Cleanup()
 
 	for _, tt := range []struct {
-		paramDNS     string
-		expectedLine string
+		paramDNS      string
+		expectedLine  string
+		expectedError bool
 	}{
 		{
-			paramDNS:     "",
-			expectedLine: "Cannot read file",
+			paramDNS:      "",
+			expectedLine:  "Cannot read file",
+			expectedError: true,
 		},
 		{
-			paramDNS:     "--dns=8.8.4.4",
-			expectedLine: "nameserver 8.8.4.4",
+			paramDNS:      "--dns=8.8.4.4",
+			expectedLine:  "nameserver 8.8.4.4",
+			expectedError: false,
 		},
 		{
-			paramDNS:     "--dns=8.8.8.8 --dns=8.8.4.4",
-			expectedLine: "nameserver 8.8.8.8",
+			paramDNS:      "--dns=8.8.8.8 --dns=8.8.4.4",
+			expectedLine:  "nameserver 8.8.8.8",
+			expectedError: false,
 		},
 		{
-			paramDNS:     "--dns=8.8.8.8 --dns=8.8.4.4 --dns-search=search.com --dns-opt=debug",
-			expectedLine: "nameserver 8.8.4.4",
+			paramDNS:      "--dns=8.8.8.8 --dns=8.8.4.4 --dns-search=search.com --dns-opt=debug",
+			expectedLine:  "nameserver 8.8.4.4",
+			expectedError: false,
 		},
 		{
-			paramDNS:     "--dns-search=foo.com --dns-search=bar.com",
-			expectedLine: "search foo.com bar.com",
+			paramDNS:      "--dns-search=foo.com --dns-search=bar.com",
+			expectedLine:  "search foo.com bar.com",
+			expectedError: false,
 		},
 		{
-			paramDNS:     "--dns-opt=debug --dns-opt=use-vc --dns-opt=rotate",
-			expectedLine: "options debug use-vc rotate",
+			paramDNS:      "--dns-opt=debug --dns-opt=use-vc --dns-opt=rotate",
+			expectedLine:  "options debug use-vc rotate",
+			expectedError: false,
 		},
 	} {
 
 		rktCmd := fmt.Sprintf(`%s --insecure-options=image run --set-env=FILE=/etc/resolv.conf %s %s`,
 			ctx.Cmd(), tt.paramDNS, imageFile)
 		t.Logf("%s\n", rktCmd)
-		runRktAndCheckOutput(t, rktCmd, tt.expectedLine, false)
+		runRktAndCheckOutput(t, rktCmd, tt.expectedLine, tt.expectedError)
 	}
 }

From 101b53e770476d497827218232208c37d5220353 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 18 Mar 2016 18:26:29 +0100
Subject: [PATCH 0019/1304] tests: exit code: fix TestExitCodeSimple,
 TestExitCodeWithSeveralApps

---
 tests/rkt_exit_test.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/rkt_exit_test.go b/tests/rkt_exit_test.go
index 91fb9586e3..90dfc5e9a3 100644
--- a/tests/rkt_exit_test.go
+++ b/tests/rkt_exit_test.go
@@ -35,7 +35,7 @@ func TestExitCodeSimple(t *testing.T) {
 		cmd := fmt.Sprintf(`%s --debug --insecure-options=image run --mds-register=false %s`,
 			ctx.Cmd(), imageFile)
 		t.Logf("%s\n", cmd)
-		spawnAndWaitOrFail(t, cmd, 0)
+		spawnAndWaitOrFail(t, cmd, i)
 		checkAppStatus(t, ctx, false, "rkt-inspect", fmt.Sprintf("status=%d", i))
 	}
 }
@@ -71,10 +71,8 @@ func TestExitCodeWithSeveralApps(t *testing.T) {
 	}
 
 	t.Logf("Waiting pod termination\n")
-	// Currently we have systemd v222 in the coreos flavor which doesn't
-	// include the exit status propagation code.
-	// TODO(iaguis): we should expect 5 as the exit status when we update to v229
-	waitOrFail(t, child, 0)
+	// Since systend v227, the exit status is propagated from the app to rkt
+	waitOrFail(t, child, 5)
 
 	t.Logf("Check final status\n")
 

From ae5fac8797233954e47597f4d347b93fd6027cc7 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 18 Mar 2016 18:33:14 +0100
Subject: [PATCH 0020/1304] tests: exit code: fix TestNonRootReadInfo

---
 tests/rkt_non_root_test.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index fc97a8cd7e..cc3c920ffd 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -47,19 +47,18 @@ func TestNonRootReadInfo(t *testing.T) {
 
 	// Launch some pods, this creates the environment for later testing.
 	imgs := []struct {
-		name     string
-		msg      string
-		exitCode string
-		imgFile  string
+		name    string
+		msg     string
+		imgFile string
 	}{
-		{name: "inspect-1", msg: "foo-1", exitCode: "1"},
-		{name: "inspect-2", msg: "foo-2", exitCode: "2"},
-		{name: "inspect-3", msg: "foo-3", exitCode: "3"},
+		{name: "inspect-1", msg: "foo-1"},
+		{name: "inspect-2", msg: "foo-2"},
+		{name: "inspect-3", msg: "foo-3"},
 	}
 
 	for i, img := range imgs {
 		imgName := fmt.Sprintf("rkt-%s.aci", img.name)
-		imgs[i].imgFile = patchTestACI(imgName, fmt.Sprintf("--name=%s", img.name), fmt.Sprintf("--exec=/inspect --print-msg=%s --exit-code=%s", img.msg, img.exitCode))
+		imgs[i].imgFile = patchTestACI(imgName, fmt.Sprintf("--name=%s", img.name), fmt.Sprintf("--exec=/inspect --print-msg=%s --exit-code=0", img.msg))
 		defer os.Remove(imgs[i].imgFile)
 	}
 

From b5b353913843219c9df9027fe3e8cbc2423c3ee1 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 18 Mar 2016 18:35:09 +0100
Subject: [PATCH 0021/1304] tests: exit code: TestRktListCreatedStarted

---
 tests/rkt_list_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index 0605f7f982..3727440825 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -139,7 +139,7 @@ func getCreationStartTime(t *testing.T, ctx *testutils.RktRunCtx, imageID string
 func TestRktListCreatedStarted(t *testing.T) {
 	const imgName = "rkt-list-creation-start-time-test"
 
-	image := patchTestACI(fmt.Sprintf("%s.aci", imgName), fmt.Sprintf("--exec=/inspect "))
+	image := patchTestACI(fmt.Sprintf("%s.aci", imgName), fmt.Sprintf("--exec=/inspect --exit-code=0"))
 	defer os.Remove(image)
 
 	imageHash := getHashOrPanic(image)

From ef04d7d8384a0b04f8a2fbfab234fc51efc6fa50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 21 Mar 2016 15:50:53 +0100
Subject: [PATCH 0022/1304] Revert "tests: fix TestVolumes on
 systemd-git-master"

This reverts commit e9238f9254a8b91389ab0f67586deb22bcc22c9c.

Now that we updated to v225 on flavor coreos, We don't support old
systemd versions so we can actually check for the exit status
everywhere.
---
 tests/inspect/inspect.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 88139a6e44..8e218181ea 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -232,9 +232,8 @@ func main() {
 
 		err := ioutil.WriteFile(fileName, []byte(content), 0600)
 		if err != nil {
-			// This error message is tested in TestVolumes
 			fmt.Fprintf(os.Stderr, "Cannot write to file %q: %v\n", fileName, err)
-			os.Exit(0)
+			os.Exit(1)
 		}
 	}
 

From af8d8c746bba55b9abb46fb42bda8fe5be35b7d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 21 Mar 2016 15:21:05 +0100
Subject: [PATCH 0023/1304] functional tests: check for exit status on
 TestPodManifest

---
 tests/rkt_run_pod_manifest_test.go | 61 +++++++++++++-----------------
 1 file changed, 27 insertions(+), 34 deletions(-)

diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index acbf8140a4..f9aeca0686 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -109,7 +109,7 @@ func TestPodManifest(t *testing.T) {
 		// [image name]:[image patches]
 		images         []imagePatch
 		podManifest    *schema.PodManifest
-		shouldSucceed  bool
+		expectedExit   int
 		expectedResult string
 		cgroup         string
 	}{
@@ -130,7 +130,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			`'"[$]`,
 			"",
 		},
@@ -154,7 +154,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			"dir1",
 			"",
 		},
@@ -191,7 +191,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			"empty:foo",
 			"",
 		},
@@ -227,7 +227,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			"(?s)/dir1: mode: d--x-w--wx.*" + "/dir1: user: 9991.*" + "/dir1: group: 9992",
 			"",
 		},
@@ -258,7 +258,7 @@ func TestPodManifest(t *testing.T) {
 					{"dir1", "host", tmpdir, nil, nil, nil, nil},
 				},
 			},
-			true,
+			0,
 			"host:foo",
 			"",
 		},
@@ -289,7 +289,7 @@ func TestPodManifest(t *testing.T) {
 					{"dir1", "host", tmpdir, nil, nil, nil, nil},
 				},
 			},
-			false,
+			1,
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
@@ -322,7 +322,7 @@ func TestPodManifest(t *testing.T) {
 					{"dir1", "host", tmpdir, &boolTrue, nil, nil, nil},
 				},
 			},
-			false,
+			1,
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
@@ -354,7 +354,7 @@ func TestPodManifest(t *testing.T) {
 					{"dir1", "host", tmpdir, nil, nil, nil, nil},
 				},
 			},
-			true,
+			0,
 			"host:bar",
 			"",
 		},
@@ -377,7 +377,7 @@ func TestPodManifest(t *testing.T) {
 					{"dir1", "host", tmpdir, nil, nil, nil, nil},
 				},
 			},
-			true,
+			0,
 			"host:baz",
 			"",
 		},
@@ -402,7 +402,7 @@ func TestPodManifest(t *testing.T) {
 					{"dir1", "host", tmpdir, &boolFalse, nil, nil, nil},
 				},
 			},
-			true,
+			0,
 			"host:zaz",
 			"",
 		},
@@ -426,7 +426,7 @@ func TestPodManifest(t *testing.T) {
 					{"dir1", "host", tmpdir, &boolTrue, nil, nil, nil},
 				},
 			},
-			false,
+			1,
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
@@ -453,7 +453,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			`CPU Quota: 100`,
 			"cpu",
 		},
@@ -481,7 +481,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			`Memory Limit: 4194304`,
 			"memory",
 		},
@@ -528,7 +528,7 @@ func TestPodManifest(t *testing.T) {
 					{"dir", "host", tmpdir, nil, nil, nil, nil},
 				},
 			},
-			true,
+			0,
 			"host:foo",
 			"",
 		},
@@ -552,7 +552,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			fmt.Sprintf("%v=disabled", capability.CAP_NET_ADMIN.String()),
 			"",
 		},
@@ -582,7 +582,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			fmt.Sprintf("%v=enabled", capability.CAP_NET_ADMIN.String()),
 			"",
 		},
@@ -603,7 +603,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			"User: uid=1000 euid=1000 gid=100 egid=100",
 			"",
 		},
@@ -624,7 +624,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			"User: uid=1000 euid=1000 gid=100 egid=100",
 			"",
 		},
@@ -645,7 +645,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			false,
+			2,
 			`"user2" user not found`,
 			"",
 		},
@@ -666,7 +666,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			false,
+			2,
 			`"group2" group not found`,
 			"",
 		},
@@ -687,7 +687,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			true,
+			0,
 			"User: uid=0 euid=0 gid=0 egid=0",
 			"",
 		},
@@ -708,7 +708,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			false,
+			2,
 			`no such file or directory`,
 			"",
 		},
@@ -729,7 +729,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			false,
+			2,
 			`no such file or directory`,
 			"",
 		},
@@ -772,11 +772,7 @@ func TestPodManifest(t *testing.T) {
 				t.Fatalf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
 			}
 		}
-		if err := child.Wait(); err != nil {
-			if tt.shouldSucceed {
-				t.Fatalf("rkt didn't terminate correctly: %v", err)
-			}
-		}
+		waitOrFail(t, child, tt.expectedExit)
 		verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
 
 		// 2. Test 'rkt prepare' + 'rkt run-prepared'.
@@ -793,11 +789,8 @@ func TestPodManifest(t *testing.T) {
 				t.Fatalf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
 			}
 		}
-		if err := child.Wait(); err != nil {
-			if tt.shouldSucceed {
-				t.Fatalf("rkt didn't terminate correctly: %v", err)
-			}
-		}
+
+		waitOrFail(t, child, tt.expectedExit)
 		verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
 
 		// we run the garbage collector and remove the imported images to save

From 64744b5ec4539267b4b467d56372803787e76013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 21 Mar 2016 15:49:39 +0100
Subject: [PATCH 0024/1304] functional tests: test for exit code on TestVolumes

---
 tests/rkt_volume_test.go | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 4994862e19..4077bd45b8 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -27,56 +27,67 @@ import (
 )
 
 var volTests = []struct {
-	rktCmd string
-	expect string
+	rktCmd       string
+	expect       string
+	expectedExit int
 }{
 	// Check that we can read files in the ACI
 	{
 		`/bin/sh -c "export FILE=/dir1/file ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true ^READ_FILE^"`,
 		`<<<dir1>>>`,
+		0,
 	},
 	// Check that we can read files from a volume (both ro and rw)
 	{
 		`/bin/sh -c "export FILE=/dir1/file ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=dir1 ^VOL_RW_READ_FILE^"`,
 		`<<<host>>>`,
+		0,
 	},
 	{
 		`/bin/sh -c "export FILE=/dir1/file ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=dir1 ^VOL_RO_READ_FILE^"`,
 		`<<<host>>>`,
+		0,
 	},
 	// Check that we can write to files in the ACI
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=1 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true ^WRITE_FILE^"`,
 		`<<<1>>>`,
+		0,
 	},
 	// Check that we can write files to a volume (both ro and rw)
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=2 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=dir1 ^VOL_RW_WRITE_FILE^"`,
 		`<<<2>>>`,
+		0,
 	},
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=3 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=dir1 ^VOL_RO_WRITE_FILE^"`,
 		`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
+		1,
 	},
 	// Check that the volume still contains the file previously written
 	{
 		`/bin/sh -c "export FILE=/dir1/file ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=dir1 ^VOL_RO_READ_FILE^"`,
 		`<<<2>>>`,
+		0,
 	},
 	// Check that injecting a rw mount/volume works without any mountpoint in the image manifest
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=1 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ ^VOL_ADD_MOUNT_RW^ --mount=volume=dir1,target=dir1"`,
 		`<<<1>>>`,
+		0,
 	},
 	// Check that injecting a ro mount/volume works without any mountpoint in the image manifest
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=1 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^,readOnly=true ^VOL_ADD_MOUNT_RO^ --mount=volume=dir1,target=dir1"`,
 		`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
+		1,
 	},
 	// Check that an implicit empty volume is created if the user didn't provide it but there's a mount point in the app
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=1 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true ^VOL_RW_WRITE_FILE^"`,
 		`<<<1>>>`,
+		0,
 	},
 }
 
@@ -122,7 +133,7 @@ func TestVolumes(t *testing.T) {
 
 		t.Logf("Running test #%v", i)
 		child := spawnOrFail(t, cmd)
-		defer waitOrFail(t, child, 0)
+		defer waitOrFail(t, child, tt.expectedExit)
 
 		if err := expectTimeoutWithOutput(child, tt.expect, time.Minute); err != nil {
 			fmt.Printf("Command: %s\n", cmd)

From 0e5eb8d230adb19dc55615b8519f62cb385a63f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 23 Mar 2016 18:50:32 +0100
Subject: [PATCH 0025/1304] *: make v229 the default version for flavor src

---
 Documentation/build-configure.md | 4 ++--
 configure.ac                     | 6 +++---
 tests/README.md                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/build-configure.md b/Documentation/build-configure.md
index c96761891d..548750debe 100644
--- a/Documentation/build-configure.md
+++ b/Documentation/build-configure.md
@@ -103,7 +103,7 @@ You may want to change it to point the build system to use some local repository
 
 This parameter takes either a tag name or a branch name.
 Tag names are usually in form of `v<number>`, where number is a systemd version.
-The default is `v222`.
+The default is `v229`.
 You can use branch name `master` to test the bleeding edge version of systemd.
 
 ### `coreos` and `kvm` flavor
@@ -122,7 +122,7 @@ If this parameter is specified, then also `--with-coreos-local-pxe-image-systemd
 
 The build system has no reliable way to deduce automatically what version of systemd the CoreOS PXE image contains, so it needs some help.
 This parameters tells the build systemd what is the version of systemd in the local PXE image.
-The value should be like tag name in systemd git repository, that is - `v<number>`, like `v222`.
+The value should be like tag name in systemd git repository, that is - `v<number>`, like `v229`.
 If this parameter is specified, then also `--with-coreos-local-pxe-image-path` must be specified too.
 
 ## Testing
diff --git a/configure.ac b/configure.ac
index d0d0fa5d38..48320e65c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ AC_ARG_WITH([stage1-systemd-src],
 
 AC_ARG_WITH([stage1-systemd-version],
             [AS_HELP_STRING([--with-stage1-systemd-version],
-                            [systemd version to build, used in 'src' stage1 flavor (default: 'v222', should be in format 'v<number>', like v222)])],
+                            [systemd version to build, used in 'src' stage1 flavor (default: 'v229', should be in format 'v<number>', like v229)])],
             [RKT_STAGE1_SYSTEMD_VER="${withval}"],
             [RKT_STAGE1_SYSTEMD_VER='auto'])
 
@@ -112,7 +112,7 @@ AC_ARG_WITH([coreos-local-pxe-image-path],
 
 AC_ARG_WITH([coreos-local-pxe-image-systemd-version],
             [AS_HELP_STRING([--with-coreos-local-pxe-image-systemd-version],
-                            [version of systemd in local CoreOS PXE image, used in 'coreos' and 'kvm' stage1 flavors (should be in format 'v<number>', like v222)])],
+                            [version of systemd in local CoreOS PXE image, used in 'coreos' and 'kvm' stage1 flavors (should be in format 'v<number>', like v229)])],
             [RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER="${withval}"],
             [RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER=])
 
@@ -363,7 +363,7 @@ RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}],[src],
                              [:])
                    AS_VAR_IF([RKT_STAGE1_SYSTEMD_VER], [auto],
                              dnl systemd version not specified, use default
-                             [RKT_STAGE1_SYSTEMD_VER='v222'],
+                             [RKT_STAGE1_SYSTEMD_VER='v229'],
                              dnl systemd version specified, use it
                              [:])],
                   dnl we are not building src flavor
diff --git a/tests/README.md b/tests/README.md
index 6243126b47..b9b7bb2f12 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -36,7 +36,7 @@ sudo gpasswd -a runner rkt
 
 ```
 ./tests/run-build.sh none
-./tests/run-build.sh src v222
+./tests/run-build.sh src v229
 ```
 
 #### Thread 2

From 91c19de7e41ded7465c621e30308a85c59f1491a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 23 Mar 2016 18:50:43 +0100
Subject: [PATCH 0026/1304] functional tests: fix typo

---
 tests/rkt_exit_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_exit_test.go b/tests/rkt_exit_test.go
index 90dfc5e9a3..7733f2f9da 100644
--- a/tests/rkt_exit_test.go
+++ b/tests/rkt_exit_test.go
@@ -71,7 +71,7 @@ func TestExitCodeWithSeveralApps(t *testing.T) {
 	}
 
 	t.Logf("Waiting pod termination\n")
-	// Since systend v227, the exit status is propagated from the app to rkt
+	// Since systemd v227, the exit status is propagated from the app to rkt
 	waitOrFail(t, child, 5)
 
 	t.Logf("Check final status\n")

From 5d64becd39e92c3590ae2a8a1ce2ab1dafe4c179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 23 Mar 2016 18:55:19 +0100
Subject: [PATCH 0027/1304] functional tests: semaphore needs libmount to build
 v229

---
 tests/install-deps.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/install-deps.sh b/tests/install-deps.sh
index 6ad3220b0e..995ec8e5a8 100755
--- a/tests/install-deps.sh
+++ b/tests/install-deps.sh
@@ -15,9 +15,6 @@ fi
 if [ "${CI-}" == true ] ; then
 	# https://semaphoreci.com/
 	if [ "${SEMAPHORE-}" == true ] ; then
-		# A colon to guard against an empty body error.
-		:
-
 		# Most dependencies are already installed on Semaphore.
 		# Here we can install any missing dependencies. Whenever
 		# Semaphore installs more dependencies on their platform,
@@ -31,8 +28,8 @@ if [ "${CI-}" == true ] ; then
 		sudo apt-get install -y libacl1-dev
 
 		# libmount: https://github.com/systemd/systemd/pull/986#issuecomment-138451264
-		# sudo add-apt-repository --yes ppa:pitti/systemd-semaphore
-		# sudo apt-get update -qq || true
-		# sudo apt-get install -y libmount-dev libmount1
+		sudo add-apt-repository --yes ppa:pitti/systemd-semaphore
+		sudo apt-get update -qq || true
+		sudo apt-get install -y libmount-dev libmount1
 	fi
 fi

From 67f9c1d5e56f232237c35bd21b18422997052b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 23 Mar 2016 19:21:57 +0100
Subject: [PATCH 0028/1304] functional tests: install and use gcc-5

gcc-4.8 crashes when building systemd v229.
---
 tests/install-deps.sh | 5 +++++
 tests/run-build.sh    | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/tests/install-deps.sh b/tests/install-deps.sh
index 995ec8e5a8..101435b374 100755
--- a/tests/install-deps.sh
+++ b/tests/install-deps.sh
@@ -31,5 +31,10 @@ if [ "${CI-}" == true ] ; then
 		sudo add-apt-repository --yes ppa:pitti/systemd-semaphore
 		sudo apt-get update -qq || true
 		sudo apt-get install -y libmount-dev libmount1
+
+		# building systemd v229 crashes with the gcc 4.8, update to gcc 5
+		sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+		sudo apt-get update -qq
+		sudo apt-get install gcc-5 gcc-5-base libgcc-5-dev -y -qq
 	fi
 fi
diff --git a/tests/run-build.sh b/tests/run-build.sh
index 6cc36c9179..db694b5353 100755
--- a/tests/run-build.sh
+++ b/tests/run-build.sh
@@ -36,6 +36,9 @@ if [ "${SEMAPHORE-}" == true ] ; then
             . /opt/change-go-version.sh
             change-go-version 1.5
         fi
+
+        # systemd v229 doesn't build on gcc-4.8, set the compiler to gcc-5
+        export CC=gcc-5
 fi
 
 HEAD=`git rev-parse HEAD`

From dead82ad5a03d12014b4f61f218aede3fab752b5 Mon Sep 17 00:00:00 2001
From: mstachowski <michal.stachowski@outlook.com>
Date: Thu, 18 Feb 2016 17:22:18 +0000
Subject: [PATCH 0029/1304] kvm: Improving lkvm performance

When lkvm is using more vcpus than platform has got, then VMs
spinning up is very slow. This patch blocks this behavior and
when user choose more vcpus then platform has cores, then
number of cpus is set to number of cores
---
 stage1/init/kvm/resources.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/stage1/init/kvm/resources.go b/stage1/init/kvm/resources.go
index 29e223c4e5..eabbcfe664 100644
--- a/stage1/init/kvm/resources.go
+++ b/stage1/init/kvm/resources.go
@@ -55,10 +55,12 @@ func GetAppsResources(apps schema.AppList) (totalCpus, totalMem int64) {
 		totalCpus += cpus
 		totalMem += mem
 	}
-	// If user doesn't specify cpus for at least one app, we set no limit for
-	// whole pod.
-	if !cpusSpecified {
-		totalCpus = int64(runtime.NumCPU())
+	// In case when number of specified cpus is greater than
+	// number or when cpus aren't specified, we set number
+	// of logical cpus as a limit.
+	availableCpus := int64(runtime.NumCPU())
+	if !cpusSpecified || totalCpus > availableCpus {
+		totalCpus = availableCpus
 	}
 
 	// Add an overhead for the VM system

From fb5df19be7425cf3539dbc24e2902ad7668adb69 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 25 Mar 2016 16:27:05 +0100
Subject: [PATCH 0030/1304] stage1/fly: fix path stat error messages

---
 stage1_fly/run/main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 4c0515fb2b..53e09b58cd 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -281,7 +281,7 @@ func stage1() int {
 
 		if strings.HasPrefix(mount.HostPath, "/") {
 			if hostPathInfo, err = os.Stat(mount.HostPath); err != nil {
-				log.PrintE(fmt.Sprintf("stat of host directory %s", mount.HostPath), err)
+				log.PrintE(fmt.Sprintf("stat of host path %s", mount.HostPath), err)
 				return 1
 			}
 		} else {
@@ -290,7 +290,7 @@ func stage1() int {
 
 		absTargetPath := filepath.Join(mount.TargetPrefixPath, mount.RelTargetPath)
 		if targetPathInfo, err = os.Stat(absTargetPath); err != nil && !os.IsNotExist(err) {
-			log.PrintE(fmt.Sprintf("stat of target directory %s", absTargetPath), err)
+			log.PrintE(fmt.Sprintf("stat of target path %s", absTargetPath), err)
 			return 1
 		}
 

From 3e05c9d10ebe1579c7a0eed0944ce46aa04b890d Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Fri, 25 Mar 2016 18:04:27 -0700
Subject: [PATCH 0031/1304] api_service: Add logs when inner function fails in
 ListPods().

---
 rkt/api_service.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 87b38c3931..31ee70103a 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -303,6 +303,13 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest, error) {
 	case Running:
 		pod.State = v1alpha.PodState_POD_STATE_RUNNING
 		pod.Networks = getNetworks(p)
+
+		// Get cgroup.
+		cgroup, err := p.getCgroup()
+		if err != nil {
+			return nil, nil, err
+		}
+		pod.Cgroup = cgroup
 	case Deleting:
 		pod.State = v1alpha.PodState_POD_STATE_DELETING
 	case Exited:
@@ -346,6 +353,7 @@ func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPo
 	if err := walkPods(includeMostDirs, func(p *pod) {
 		pod, manifest, err := getBasicPod(p)
 		if err != nil { // Do not return partial pods.
+			stderr.PrintE(fmt.Sprintf("failed to get basic pod information for pod with uuid: %v", p.uuid), err)
 			return
 		}
 
@@ -356,6 +364,7 @@ func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPo
 
 		if request.Detail {
 			if err := fillAppInfo(s.store, p, pod); err != nil { // Do not return partial pods.
+				stderr.PrintE(fmt.Sprintf("failed to fill app information for pod with uuid: %v", p.uuid), err)
 				return
 			}
 		} else {

From 5ca5b6f4f3d9e645c4382e04fb0a43a5f9cdaf1f Mon Sep 17 00:00:00 2001
From: mstachowski <michal.stachowski@outlook.com>
Date: Tue, 29 Mar 2016 12:56:08 +0200
Subject: [PATCH 0032/1304] kvm: Add missing libraries to stage1 image

Due to last pxe.img upgrade, few libraries are missing inside
stage1-kvm.aci image. This patch is resolving this issue.

Note: this issue impacts on entering feature for kvm flavor
---
 stage1/usr_from_kvm/manifest.d/sshd.manifest | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/stage1/usr_from_kvm/manifest.d/sshd.manifest b/stage1/usr_from_kvm/manifest.d/sshd.manifest
index b994e64552..3116bd7011 100644
--- a/stage1/usr_from_kvm/manifest.d/sshd.manifest
+++ b/stage1/usr_from_kvm/manifest.d/sshd.manifest
@@ -2,18 +2,18 @@ bin/chown
 bin/chmod
 bin/ssh-keygen
 sbin/sshd
-lib64/libcrypt-2.20.so
+lib64/libcrypt-2.21.so
 lib64/libcrypt.so.1
 lib64/libcrypto.so.1.0.0
-lib64/libnsl-2.20.so
+lib64/libnsl-2.21.so
 lib64/libnsl.so.1
-lib64/libnss_compat-2.20.so
+lib64/libnss_compat-2.21.so
 lib64/libnss_compat.so.2
-lib64/libnss_files-2.20.so
+lib64/libnss_files-2.21.so
 lib64/libnss_files.so.2
-lib64/libresolv-2.20.so
+lib64/libresolv-2.21.so
 lib64/libresolv.so.2
-lib64/libutil-2.20.so
+lib64/libutil-2.21.so
 lib64/libutil.so.1
 lib64/libz.so.1
 lib64/libz.so.1.2.8

From 9f98dc1ef390710aa06c1b8d83eff472ea1ca3cd Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 29 Mar 2016 18:12:46 +0200
Subject: [PATCH 0033/1304] doc: distributions: update caveats

rkt on Fedora is still limited because of SELinux and FirewallD but the
situation improved recently. Update the caveats.
---
 Documentation/distributions.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index ff06203025..6b86e3fa00 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -18,8 +18,13 @@ rkt's entry in the [Fedora package database](https://admin.fedoraproject.org/pkg
 
 #### Caveat: SELinux
 
-rkt currently does not integrate with SELinux on Fedora.
-See [#1727](https://github.com/coreos/rkt/issues/1727).
+rkt can integrate with SELinux on Fedora but in a limited way.
+This has the following caveats:
+- running as systemd service restricted (see [#2322](https://github.com/coreos/rkt/issues/2322))
+- access to host volumes restricted (see [#2325](https://github.com/coreos/rkt/issues/2325))
+- socket activation restricted (see [#2326](https://github.com/coreos/rkt/issues/2326))
+- metadata service restricted (see [#1978](https://github.com/coreos/rkt/issues/1978))
+
 As a workaround, SELinux can be temporarily disabled:
 ```
 sudo setenforce Permissive
@@ -32,6 +37,7 @@ SELINUX=permissive
 #### Caveat: firewall
 
 The default firewall rules can block the traffic from rkt pods.
+See [#2206](https://github.com/coreos/rkt/issues/2206).
 As a workaround, they can be removed:
 ```
 sudo iptables -F

From 2879b2515f5295a95a9a0e65c7f9f6c9b4a8cfb5 Mon Sep 17 00:00:00 2001
From: Yifan Gu <guyifan1121@gmail.com>
Date: Fri, 25 Mar 2016 23:37:01 -0700
Subject: [PATCH 0034/1304] rkt/pods.go: Fix a bug in getContainerPID1().

If 'getChildPID()' returns an 'ErrChildNotReady' error,
then the variable 'err' will be set to nil, which causes the last
If statement's condition to be true, and returns '-1, nil'.
---
 rkt/pods.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rkt/pods.go b/rkt/pods.go
index 0750c46b92..761c518996 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -893,14 +893,15 @@ func (p *pod) getContainerPID1() (pid int, err error) {
 		}
 
 		ppid, err = p.readIntFromFile("ppid")
+		if err != nil && !os.IsNotExist(err) {
+			return -1, err
+		}
 		if err == nil {
 			pid, err = getChildPID(ppid)
 			if err == nil {
 				return pid, nil
 			}
-			if _, ok := err.(ErrChildNotReady); ok {
-				err = nil
-			} else {
+			if _, ok := err.(ErrChildNotReady); !ok {
 				return -1, err
 			}
 		}
@@ -914,8 +915,8 @@ func (p *pod) getContainerPID1() (pid int, err error) {
 			return -1, err
 		}
 
-		if !os.IsNotExist(err) || !p.isRunning() {
-			return -1, err
+		if !p.isRunning() {
+			return -1, fmt.Errorf("pod %v is not running anymore", p.uuid)
 		}
 	}
 }

From f1d5bc9a1582ec443ad9536be60e7672e6bf89f4 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Wed, 30 Mar 2016 11:20:59 +0200
Subject: [PATCH 0035/1304] build: Make sure we really got all the files from
 the squashfs file

Since unsquashfs does not have a flag for ensuring that all the files
from manifest were extracted, we have to do it on our own. We do this
by making sure that the complete manifest is a subset of a list of the
files in the squashfs file (acquired by the "unsquashfs -ls <file>"
command). This requires doing some set operations, so we got a
dependency on comm from coreutils.
---
 Documentation/dependencies.md       |  1 +
 configure.ac                        |  1 +
 stage1/usr_from_coreos/build-usr.mk | 19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Documentation/dependencies.md b/Documentation/dependencies.md
index 1aef0544d9..645c79866f 100644
--- a/Documentation/dependencies.md
+++ b/Documentation/dependencies.md
@@ -37,6 +37,7 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
 ### Specific dependencies for the coreos/kvm flavor
 
 * cat
+* comm
 * cpio
 * gzip
 * md5sum
diff --git a/configure.ac b/configure.ac
index 48320e65c5..bc8bf8cdf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,6 +260,7 @@ dnl gpg - it will be checked when we will actually download the image
 dnl from the network
 AC_DEFUN([RKT_COMMON_COREOS_PROGS],
          [RKT_REQ_PROG([CAT],[cat],[cat])
+          RKT_REQ_PROG([COMM],[comm],[comm])
           RKT_REQ_PROG([CPIO],[cpio],[cpio])
           RKT_REQ_PROG([GZIP],[gzip],[gzip])
           RKT_REQ_PROG([MD5SUM],[md5sum],[md5sum])
diff --git a/stage1/usr_from_coreos/build-usr.mk b/stage1/usr_from_coreos/build-usr.mk
index 73d408e802..a32a7447f3 100644
--- a/stage1/usr_from_coreos/build-usr.mk
+++ b/stage1/usr_from_coreos/build-usr.mk
@@ -34,6 +34,13 @@ CBU_ROOTFS := $(CBU_TMPDIR)/rootfs
 CBU_COMPLETE_MANIFEST := $(CBU_TMPDIR)/manifest.txt
 # All manifest in the CBU_MANIFESTS_DIR
 CBU_MANIFESTS := $(wildcard $(CBU_MANIFESTS_DIR)/*)
+# A list of all files in the squashfs file without the likely
+# "squashfs-root" prefix
+CBU_SQUASHFS_FILES := $(CBU_TMPDIR)/squashfsfiles
+# A list of files that appear in both CBU_COMPLETE_MANIFEST and
+# CBU_SQUASHFS_FILES, should be the same as the list in
+# CBU_COMPLETE_MANIFEST, otherwise we get an error.
+CBU_COMMON_FILES := $(CBU_TMPDIR)/commonfiles
 
 # Stamp telling when ACI rootfs was prepared.
 $(call setup-stamp-file,CBU_ACI_ROOTFS_STAMP,$(CBU_DIFF)-acirootfs)
@@ -94,7 +101,9 @@ CBU_SYSTEMD_VERSION_FILE := $(CBU_ACIROOTFSDIR)/systemd-version
 
 CLEAN_FILES += \
 	$(CBU_COMPLETE_MANIFEST) \
-	$(CBU_SYSTEMD_VERSION_FILE)
+	$(CBU_SYSTEMD_VERSION_FILE) \
+	$(CBU_SQUASHFS_FILES) \
+	$(CBU_COMMON_FILES)
 INSTALL_DIRS += \
 	$(CBU_ROOTFS):0755
 INSTALL_SYMLINKS += \
@@ -154,6 +163,14 @@ $(call generate-clean-mk,$(CBU_ROOTFS_CLEAN_STAMP),$(CBU_ROOTFSDIR_CLEANMK),$(CB
 # This unpacks squashfs image to a temporary rootfs.
 $(call generate-stamp-rule,$(CBU_MKBASE_STAMP),$(CCN_SQUASHFS) $(CBU_COMPLETE_MANIFEST),$(CBU_ROOTFS), \
 	$(call vb,vt,UNSQUASHFS,$(call vsp,$(CCN_SQUASHFS)) => $(call vsp,$(CBU_ROOTFS)/usr)) \
+	CBU_SQROOT=$$$$(unsquashfs -ls "$(CCN_SQUASHFS)" --no-progress | tail --lines=1); \
+	unsquashfs -ls "$(CCN_SQUASHFS)" | grep "^$$$${CBU_SQROOT}" | sed -e "s/$$$${CBU_SQROOT}\///g" | sort >"$(CBU_SQUASHFS_FILES)"; \
+	comm -1 -2 "$(CBU_SQUASHFS_FILES)" "$(CBU_COMPLETE_MANIFEST)" >"$(CBU_COMMON_FILES)"; \
+	if ! cmp --silent "$(CBU_COMMON_FILES)" "$(CBU_COMPLETE_MANIFEST)"; \
+	then \
+		echo -e "Files listed in $(CBU_COMPLETE_MANIFEST) are missing from $(CCN_SQUASHFS):\n$$$$(comm -1 -3 "$(CBU_SQUASHFS_FILES)" "$(CBU_COMPLETE_MANIFEST)")"; \
+		exit 1; \
+	fi; \
 	unsquashfs -dest "$(CBU_ROOTFS)/usr" -ef "$(CBU_COMPLETE_MANIFEST)" "$(CCN_SQUASHFS)"$(call vl3, >/dev/null))
 
 # If either squashfs file or the concatenated manifest file changes we

From 12aa095a9dfca030bd3be6f043f3f878fc77f46f Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Wed, 30 Mar 2016 12:10:10 +0200
Subject: [PATCH 0036/1304] build: Make ip.manifest consistent with other files

All other manifest files do not add the root slash to the path. Also
fixes the missing files detection for kvm flavor.
---
 stage1/usr_from_kvm/manifest.d/ip.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/usr_from_kvm/manifest.d/ip.manifest b/stage1/usr_from_kvm/manifest.d/ip.manifest
index f722531477..4fdedb4b70 100644
--- a/stage1/usr_from_kvm/manifest.d/ip.manifest
+++ b/stage1/usr_from_kvm/manifest.d/ip.manifest
@@ -1 +1 @@
-/bin/ip
+bin/ip

From 9b3137bca71e9b35198c6adcfa35cedb2ff32726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 30 Mar 2016 15:49:28 +0200
Subject: [PATCH 0037/1304] rkt: check signatures on --stage1-* options

We were not checking signatures when the uses passes `--stage1-*`
options.
---
 rkt/stage1hash.go | 51 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index 332370b99b..1d37938e95 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -219,23 +219,41 @@ func getStage1ImagesDirectory(c *config.Config) string {
 }
 
 func getStage1HashFromFlag(s *store.Store, loc stage1ImageLocation, dir string) (*types.Hash, error) {
+	withKeystore := true
+	location := loc.location
+	if loc.kind == stage1ImageLocationFromDir {
+		location = filepath.Join(dir, loc.location)
+	}
+	trustedLocation, err := isTrustedLocation(location)
+	if err != nil {
+		return nil, err
+	}
+
 	imgType := apps.AppImageGuess
 	switch loc.kind {
 	case stage1ImageLocationURL:
 		imgType = apps.AppImageURL
+		if trustedLocation {
+			withKeystore = false
+		}
 	case stage1ImageLocationPath:
 		imgType = apps.AppImagePath
+		if trustedLocation {
+			withKeystore = false
+		}
 	case stage1ImageLocationName:
 		imgType = apps.AppImageName
 	case stage1ImageLocationHash:
 		imgType = apps.AppImageHash
 	case stage1ImageLocationFromDir:
-		loc.location = filepath.Join(dir, loc.location)
+		if trustedLocation {
+			withKeystore = false
+		}
 		imgType = apps.AppImagePath
 	}
 
-	fn := getStage1Finder(s)
-	return fn.FindImage(loc.location, "", imgType)
+	fn := getStage1Finder(s, withKeystore)
+	return fn.FindImage(location, "", imgType)
 }
 
 func getStage1DataFromConfig(c *config.Config) (string, string, string) {
@@ -267,8 +285,24 @@ func getFileNameFromLocation(imgLoc string) string {
 	return filepath.Base(imgLoc)
 }
 
+func isTrustedLocation(location string) (bool, error) {
+	absLocation, err := filepath.Abs(location)
+	if err != nil {
+		return false, err
+	}
+	if absLocation == buildDefaultStage1ImageLoc ||
+		strings.HasPrefix(absLocation, fmt.Sprintf("%s%c", filepath.Clean(buildDefaultStage1ImagesDir), filepath.Separator)) {
+		return true, nil
+	}
+	return false, nil
+}
+
 func getConfiguredStage1Hash(s *store.Store, imgRef, imgLoc, imgFileName string) (*types.Hash, error) {
-	fn := getStage1Finder(s)
+	trusted, err := isTrustedLocation(imgLoc)
+	if err != nil {
+		return nil, err
+	}
+	fn := getStage1Finder(s, !trusted)
 	if !strings.HasSuffix(imgRef, "-dirty") {
 		fn.StoreOnly = true
 		if hash, err := fn.FindImage(imgRef, "", apps.AppImageName); err == nil {
@@ -287,8 +321,8 @@ func getConfiguredStage1Hash(s *store.Store, imgRef, imgLoc, imgFileName string)
 	return getStage1HashFromPath(fn, imgLoc, imgFileName)
 }
 
-func getStage1Finder(s *store.Store) *image.Finder {
-	return &image.Finder{
+func getStage1Finder(s *store.Store, withKeystore bool) *image.Finder {
+	fn := &image.Finder{
 		S:                  s,
 		InsecureFlags:      globalFlags.InsecureFlags,
 		TrustKeysFromHTTPS: globalFlags.TrustKeysFromHTTPS,
@@ -297,6 +331,11 @@ func getStage1Finder(s *store.Store) *image.Finder {
 		NoStore:   false,
 		WithDeps:  false,
 	}
+
+	if withKeystore {
+		fn.Ks = getKeystore()
+	}
+	return fn
 }
 
 func getStage1HashFromPath(fn *image.Finder, imgLoc, imgFileName string) (*types.Hash, error) {

From d7297ab9c88ae3bfa10ddf6899bd08014888ba6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 30 Mar 2016 15:49:24 +0200
Subject: [PATCH 0038/1304] rkt: don't check stage1 signature if it's in the
 rkt binary dir

---
 rkt/stage1hash.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index 1d37938e95..4ad6374d26 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -353,6 +353,8 @@ func getStage1HashFromPath(fn *image.Finder, imgLoc, imgFileName string) (*types
 		if err != nil {
 			fallbackErr = err
 		} else {
+			// using stage1 image in rkt's path, don't check the signature
+			fn.Ks = nil
 			rktDir := filepath.Dir(exePath)
 			imgPath := filepath.Join(rktDir, imgFileName)
 			hash, err := fn.FindImage(imgPath, "", apps.AppImagePath)

From bbd2b67c1ed6fb34538760b45a1b070b013b8947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 30 Mar 2016 17:46:14 +0200
Subject: [PATCH 0039/1304] Documentation: update `--stage1-*` documentation

Simply use `--stage1-name` in most of the examples now that we have the
stage1 images in coreos.com.
---
 Documentation/hacking.md             |  6 ++++++
 Documentation/running-fly-stage1.md  | 11 +++--------
 Documentation/running-lkvm-stage1.md | 25 ++++---------------------
 Documentation/subcommands/enter.md   | 14 +-------------
 Documentation/subcommands/run.md     | 18 ++++++++++++++++++
 5 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index cb00f46970..5f4b9d3c38 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -85,6 +85,12 @@ However, a default value can be set for this parameter at build time by setting
 It can be set with the `paths` kind of configuration.
 For more details, see [configure script parameters documentation](build-configure.md) and [configuration documentation](configuration.md).
 
+rkt expects stage1 images to be signed except in the following cases:
+
+* it is the default stage1 image and it's in the same directory as the rkt binary
+* `--stage1-{name,hash}` is used and the image is already in the store
+* `--stage1-{url,path,from-dir}` is used and the image is in the default directory configured at build time
+
 ## Managing Dependencies
 
 rkt uses [`godep`](https://github.com/tools/godep) to manage third-party dependencies.
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 97f792e037..04d33fc3d1 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -64,18 +64,13 @@ This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.2.1+git/bi
 
 ### Selecting stage1 at runtime
 
-Here is a quick example of how to use a container stage1 named `stage1-fly.aci` in `/usr/share/rkt/`:
+Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-path=/usr/share/rkt/stage1-fly.aci coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.2.1 coreos.com/etcd:v2.2.5
 ```
 
-When the image is already in the store, the `--stage1-name` or `--stage1-hash` flags can be used instead for a faster startup:
-
-```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly coreos.com/etcd:v2.2.5
-# rkt run --stage1-hash=<hash> coreos.com/etcd:v2.2.5
-```
+If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
 
 ## Notes on isolation and security
 
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index e7e554d3b0..dd77c1b595 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -79,33 +79,16 @@ Currently, the memory allocated to the virtual machine is a sum of memory requir
 
 ### Selecting stage1 at runtime
 
-If you want to run software that requires hypervisor isolation along with trusted software that only needs container isolation, you can [choose which stage1.aci to use at runtime](https://github.com/coreos/rkt/blob/master/Documentation/commands.md#use-a-custom-stage-1).
+If you want to run software that requires hypervisor isolation along with trusted software that only needs container isolation, you can [choose which stage1 to use at runtime](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/run.md#use-a-custom-stage-1).
 
-For example, if you have a container stage1 named `stage1-coreos.aci` and a lkvm stage1 named `stage1-kvm.aci` in `/usr/local/rkt/`:
+For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-path=/usr/local/rkt/stage1-coreos.aci coreos.com/etcd:v2.0.9
-...
-# rkt run --stage1-path=/usr/local/rkt/stage1-kvm.aci coreos.com/etcd:v2.0.9
-...
-```
-
-These images can be installed in the default stage1 images directory.
-In this case, the stage1 image can be selected with a different flag:
-
-```
-# rkt run --stage1-from-dir=stage1-coreos.aci coreos.com/etcd:v2.0.9
-...
-# rkt run --stage1-from-dir=stage1-kvm.aci coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.2.1 coreos.com/etcd:v2.0.9
 ...
 ```
 
-When the image is already in the store, the `--stage1-name` or `--stage1-hash` flags can be used instead for a faster startup:
-
-```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm coreos.com/etcd:v2.0.9
-# rkt run --stage1-hash=<hash> coreos.com/etcd:v2.0.9
-```
+If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
 
 ## How does it work?
 
diff --git a/Documentation/subcommands/enter.md b/Documentation/subcommands/enter.md
index 33b9d6b4cd..4ca3214e8d 100644
--- a/Documentation/subcommands/enter.md
+++ b/Documentation/subcommands/enter.md
@@ -16,18 +16,6 @@ bin   data  entrypoint.sh  home  lib64  mnt  proc  run   selinux  sys  usr
 boot  dev   etc            lib   media  opt  root  sbin  srv      tmp  var
 ```
 
-## Use a Custom Stage 1
-
-rkt is designed and intended to be modular, using a [staged architecture](../devel/architecture.md).
-
-You can use a custom stage1 by using the `--stage1-{url,path,name,hash,from-dir}` flags.
-
-```
-# rkt --stage1-path=/tmp/stage1.aci run coreos.com/etcd:v2.0.0
-```
-
-For more details see the [hacking documentation](../hacking.md).
-
 ## Run a Pod in the Background
 
 Work in progress. Please contribute!
@@ -48,4 +36,4 @@ Work in progress. Please contribute!
 | `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
 | `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
 | `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
\ No newline at end of file
+| `--user-config` |  `` | A directory path | Path to the user configuration directory |
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index aa7ce0b976..7caafb715c 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -305,6 +305,24 @@ For example, if you use systemd, you can [run rkt using `systemd-run`](https://g
 
 If you don't use systemd, you can use [daemon](http://www.libslack.org/daemon/) as an alternative.
 
+## Use a Custom Stage 1
+
+rkt is designed and intended to be modular, using a [staged architecture](../devel/architecture.md).
+
+You can use a custom stage1 by using the `--stage1-{url,path,name,hash,from-dir}` flags.
+
+```
+# rkt --stage1-path=/tmp/stage1.aci run coreos.com/etcd:v2.0.0
+```
+
+rkt expects stage1 images to be signed except in the following cases:
+
+* it is the default stage1 image and it's in the same directory as the rkt binary
+* `--stage1-{name,hash}` is used and the image is already in the store
+* `--stage1-{url,path,from-dir}` is used and the image is in the default directory configured at build time
+
+For more details see the [hacking documentation](../hacking.md).
+
 ## Options
 
 | Flag | Default | Options | Description |

From 1b3c4d24ae8ca6b51850970a450e5ccd4b47ee80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 31 Mar 2016 09:46:34 +0200
Subject: [PATCH 0040/1304] Godeps: bump peterbourgon/diskv to v1.0.0

Use tagged releases for dependencies.
---
 Godeps/Godeps.json                            |  3 +-
 .../github.com/peterbourgon/diskv/diskv.go    | 42 +++++++------
 .../examples/content-addressable-store/cas.go | 63 -------------------
 .../super-simple-store/super-simple-store.go  | 30 ---------
 4 files changed, 24 insertions(+), 114 deletions(-)
 delete mode 100644 Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/content-addressable-store/cas.go
 delete mode 100644 Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/super-simple-store/super-simple-store.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index c34c51d13a..90834e6389 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -380,7 +380,8 @@
 		},
 		{
 			"ImportPath": "github.com/peterbourgon/diskv",
-			"Rev": "508f5671a72eeaef05cf8c24abe7fbc1c07faf69"
+			"Comment": "v1.0.0",
+			"Rev": "f2c8925fb5e0e9614e23499efa68df1924ba6add"
 		},
 		{
 			"ImportPath": "github.com/russross/blackfriday",
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/diskv.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/diskv.go
index 512b5353fd..ea05842cbd 100644
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/diskv.go
+++ b/Godeps/_workspace/src/github.com/peterbourgon/diskv/diskv.go
@@ -56,8 +56,8 @@ type Options struct {
 // Diskv implements the Diskv interface. You shouldn't construct Diskv
 // structures directly; instead, use the New constructor.
 type Diskv struct {
-	sync.RWMutex
 	Options
+	mu        sync.RWMutex
 	cache     map[string][]byte
 	cacheSize uint64
 }
@@ -109,8 +109,8 @@ func (d *Diskv) WriteStream(key string, r io.Reader, sync bool) error {
 		return errEmptyKey
 	}
 
-	d.Lock()
-	defer d.Unlock()
+	d.mu.Lock()
+	defer d.mu.Unlock()
 
 	return d.writeStreamWithLock(key, r, sync)
 }
@@ -143,6 +143,7 @@ func (d *Diskv) writeStreamWithLock(key string, r io.Reader, sync bool) error {
 	}
 
 	if err := wc.Close(); err != nil {
+		f.Close() // error deliberately ignored
 		return fmt.Errorf("compression close: %s", err)
 	}
 
@@ -180,8 +181,8 @@ func (d *Diskv) Import(srcFilename, dstKey string, move bool) (err error) {
 		return errImportDirectory
 	}
 
-	d.Lock()
-	defer d.Unlock()
+	d.mu.Lock()
+	defer d.mu.Unlock()
 
 	if err := d.ensurePathWithLock(dstKey); err != nil {
 		return fmt.Errorf("ensure path: %s", err)
@@ -233,8 +234,8 @@ func (d *Diskv) Read(key string) ([]byte, error) {
 // If compression is enabled, ReadStream taps into the io.Reader stream prior
 // to decompression, and caches the compressed data.
 func (d *Diskv) ReadStream(key string, direct bool) (io.ReadCloser, error) {
-	d.RLock()
-	defer d.RUnlock()
+	d.mu.RLock()
+	defer d.mu.RUnlock()
 
 	if val, ok := d.cache[key]; ok {
 		if !direct {
@@ -246,8 +247,8 @@ func (d *Diskv) ReadStream(key string, direct bool) (io.ReadCloser, error) {
 		}
 
 		go func() {
-			d.Lock()
-			defer d.Unlock()
+			d.mu.Lock()
+			defer d.mu.Unlock()
 			d.uncacheWithLock(key, uint64(len(val)))
 		}()
 	}
@@ -351,8 +352,8 @@ func (s *siphon) Read(p []byte) (int, error) {
 
 // Erase synchronously erases the given key from the disk and the cache.
 func (d *Diskv) Erase(key string) error {
-	d.Lock()
-	defer d.Unlock()
+	d.mu.Lock()
+	defer d.mu.Unlock()
 
 	d.bustCacheWithLock(key)
 
@@ -364,14 +365,15 @@ func (d *Diskv) Erase(key string) error {
 	// erase from disk
 	filename := d.completeFilename(key)
 	if s, err := os.Stat(filename); err == nil {
-		if !!s.IsDir() {
+		if s.IsDir() {
 			return errBadKey
 		}
 		if err = os.Remove(filename); err != nil {
-			return fmt.Errorf("remove: %s", err)
+			return err
 		}
 	} else {
-		return fmt.Errorf("stat: %s", err)
+		// Return err as-is so caller can do os.IsNotExist(err).
+		return err
 	}
 
 	// clean up and return
@@ -384,8 +386,8 @@ func (d *Diskv) Erase(key string) error {
 // diskv-related data. Care should be taken to always specify a diskv base
 // directory that is exclusively for diskv data.
 func (d *Diskv) EraseAll() error {
-	d.Lock()
-	defer d.Unlock()
+	d.mu.Lock()
+	defer d.mu.Unlock()
 	d.cache = make(map[string][]byte)
 	d.cacheSize = 0
 	return os.RemoveAll(d.BasePath)
@@ -393,8 +395,8 @@ func (d *Diskv) EraseAll() error {
 
 // Has returns true if the given key exists.
 func (d *Diskv) Has(key string) bool {
-	d.Lock()
-	defer d.Unlock()
+	d.mu.Lock()
+	defer d.mu.Unlock()
 
 	if _, ok := d.cache[key]; ok {
 		return true
@@ -497,8 +499,8 @@ func (d *Diskv) cacheWithLock(key string, val []byte) error {
 
 // cacheWithoutLock acquires the store's (write) mutex and calls cacheWithLock.
 func (d *Diskv) cacheWithoutLock(key string, val []byte) error {
-	d.Lock()
-	defer d.Unlock()
+	d.mu.Lock()
+	defer d.mu.Unlock()
 	return d.cacheWithLock(key, val)
 }
 
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/content-addressable-store/cas.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/content-addressable-store/cas.go
deleted file mode 100644
index a3abaaf775..0000000000
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/content-addressable-store/cas.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package main
-
-import (
-	"crypto/md5"
-	"fmt"
-	"io"
-
-	"github.com/peterbourgon/diskv"
-)
-
-const transformBlockSize = 2 // grouping of chars per directory depth
-
-func blockTransform(s string) []string {
-	var (
-		sliceSize = len(s) / transformBlockSize
-		pathSlice = make([]string, sliceSize)
-	)
-	for i := 0; i < sliceSize; i++ {
-		from, to := i*transformBlockSize, (i*transformBlockSize)+transformBlockSize
-		pathSlice[i] = s[from:to]
-	}
-	return pathSlice
-}
-
-func main() {
-	d := diskv.New(diskv.Options{
-		BasePath:     "data",
-		Transform:    blockTransform,
-		CacheSizeMax: 1024 * 1024, // 1MB
-	})
-
-	for _, valueStr := range []string{
-		"I am the very model of a modern Major-General",
-		"I've information vegetable, animal, and mineral",
-		"I know the kings of England, and I quote the fights historical",
-		"From Marathon to Waterloo, in order categorical",
-		"I'm very well acquainted, too, with matters mathematical",
-		"I understand equations, both the simple and quadratical",
-		"About binomial theorem I'm teeming with a lot o' news",
-		"With many cheerful facts about the square of the hypotenuse",
-	} {
-		d.Write(md5sum(valueStr), []byte(valueStr))
-	}
-
-	var keyCount int
-	for key := range d.Keys(nil) {
-		val, err := d.Read(key)
-		if err != nil {
-			panic(fmt.Sprintf("key %s had no value", key))
-		}
-		fmt.Printf("%s: %s\n", key, val)
-		keyCount++
-	}
-	fmt.Printf("%d total keys\n", keyCount)
-
-	// d.EraseAll() // leave it commented out to see how data is kept on disk
-}
-
-func md5sum(s string) string {
-	h := md5.New()
-	io.WriteString(h, s)
-	return fmt.Sprintf("%x", h.Sum(nil))
-}
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/super-simple-store/super-simple-store.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/super-simple-store/super-simple-store.go
deleted file mode 100644
index b5da11d646..0000000000
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/super-simple-store/super-simple-store.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/peterbourgon/diskv"
-)
-
-func main() {
-	d := diskv.New(diskv.Options{
-		BasePath:     "my-diskv-data-directory",
-		Transform:    func(s string) []string { return []string{} },
-		CacheSizeMax: 1024 * 1024, // 1MB
-	})
-
-	key := "alpha"
-	if err := d.Write(key, []byte{'1', '2', '3'}); err != nil {
-		panic(err)
-	}
-
-	value, err := d.Read(key)
-	if err != nil {
-		panic(err)
-	}
-	fmt.Printf("%v\n", value)
-
-	if err := d.Erase(key); err != nil {
-		panic(err)
-	}
-}

From fae673fc7d9171876d8b082a8e14bd47db871959 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 24 Mar 2016 15:49:23 -0700
Subject: [PATCH 0041/1304] api_service: Return cgroup in
 ListPods()/InspectPod().

Add Pod.Cgroup to indicate the cgroup of the pod.
---
 api/v1alpha/api.pb.go   | 153 ++++++++++++++++++++--------------------
 api/v1alpha/api.proto   |   3 +
 common/cgroup/cgroup.go |  15 +++-
 rkt/api_service.go      |  27 +++++--
 4 files changed, 113 insertions(+), 85 deletions(-)

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index 06e8d7bfaa..80151f7489 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -338,6 +338,8 @@ type Pod struct {
 	Manifest []byte `protobuf:"bytes,6,opt,name=manifest,proto3" json:"manifest,omitempty"`
 	// Annotations on this pod.
 	Annotations []*KeyValue `protobuf:"bytes,7,rep,name=annotations" json:"annotations,omitempty"`
+	// Cgroup of the pod, empty if the pod is not running.
+	Cgroup string `protobuf:"bytes,8,opt,name=cgroup" json:"cgroup,omitempty"`
 }
 
 func (m *Pod) Reset()                    { *m = Pod{} }
@@ -1124,17 +1126,17 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1430 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xdb, 0x6e, 0xdb, 0x46,
-	0x13, 0x8e, 0x0e, 0xd4, 0x61, 0xa4, 0xc8, 0xd2, 0xda, 0x89, 0x65, 0xe5, 0xe4, 0xf0, 0xff, 0x1b,
-	0xa4, 0xbe, 0x70, 0x5b, 0x27, 0xcd, 0x4d, 0x81, 0x22, 0x8a, 0x4d, 0x1b, 0x6a, 0x6c, 0x49, 0x50,
-	0x94, 0xa0, 0xb9, 0x22, 0x68, 0x69, 0xe5, 0x10, 0xa1, 0x48, 0x96, 0xa4, 0x9c, 0xb8, 0x97, 0x7d,
-	0x81, 0x3e, 0x42, 0xfb, 0x16, 0x05, 0x7a, 0xd3, 0x77, 0x29, 0xd0, 0xf7, 0xe8, 0xec, 0x72, 0x49,
-	0x2e, 0x29, 0xea, 0xa2, 0x77, 0xe6, 0xcc, 0xec, 0x37, 0xdf, 0xcc, 0xce, 0x7c, 0x2b, 0x43, 0xdd,
+	// 1442 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0x4b, 0x72, 0xdb, 0x46,
+	0x13, 0x36, 0x1f, 0xe0, 0xa3, 0x49, 0x53, 0xe4, 0x48, 0xb6, 0x28, 0xfa, 0x25, 0xe3, 0xff, 0xe3,
+	0x72, 0xb4, 0x50, 0x12, 0xd9, 0xf1, 0x26, 0x55, 0x29, 0xd3, 0x12, 0xa4, 0x62, 0x2c, 0x91, 0x2c,
+	0x9a, 0x76, 0xc5, 0x2b, 0x14, 0x44, 0x0e, 0x65, 0x94, 0x41, 0x00, 0x01, 0x40, 0xd9, 0xca, 0x32,
+	0x17, 0xc8, 0x11, 0x92, 0x5b, 0x64, 0x99, 0x7d, 0x8e, 0x91, 0xaa, 0xdc, 0x23, 0x3d, 0x83, 0x01,
+	0x30, 0x00, 0xc1, 0x45, 0x76, 0x42, 0x77, 0xcf, 0xd7, 0x5f, 0xf7, 0x74, 0x7f, 0x43, 0x41, 0xdd,
 	0x70, 0xcd, 0x43, 0xd7, 0x73, 0x02, 0x87, 0x54, 0xaf, 0xbf, 0x31, 0x2c, 0xf7, 0x83, 0xa1, 0xbe,
 	0x84, 0xc6, 0x60, 0x69, 0x5c, 0xd1, 0x53, 0xc7, 0x5b, 0x1a, 0x01, 0xd9, 0x87, 0x72, 0x70, 0xe3,
 	0xd2, 0x6e, 0x61, 0xbf, 0xf0, 0xb4, 0x75, 0x44, 0x0e, 0x45, 0xd8, 0x21, 0x8f, 0x99, 0xa2, 0x87,
-	0x6c, 0x41, 0xf5, 0x9a, 0x7a, 0xbe, 0xe9, 0xd8, 0xdd, 0x22, 0x06, 0xd5, 0xd5, 0xbf, 0x0a, 0xa0,
+	0x6c, 0x41, 0xf5, 0x9a, 0x7a, 0xbe, 0xe9, 0xd8, 0xdd, 0x22, 0x06, 0xd5, 0xd5, 0x3f, 0x0b, 0xa0,
 	0x70, 0x37, 0xf9, 0x12, 0x1a, 0x97, 0x86, 0x4f, 0xf5, 0x05, 0xc7, 0xe2, 0x18, 0x8d, 0xa3, 0x9d,
 	0x34, 0x86, 0xc8, 0x03, 0x50, 0x34, 0xe7, 0x21, 0x00, 0x69, 0x42, 0xd9, 0x36, 0x96, 0xb4, 0x5b,
 	0xe2, 0x5f, 0x12, 0x7e, 0x99, 0x1b, 0xba, 0xd0, 0x36, 0x97, 0xae, 0xe3, 0x05, 0x7a, 0x60, 0x2e,
@@ -1146,73 +1148,74 @@ var fileDescriptor0 = []byte{
 	0x01, 0x4a, 0x7d, 0xd7, 0xcd, 0x9c, 0x78, 0x00, 0x8a, 0xc9, 0xca, 0xe4, 0x47, 0x1a, 0x47, 0xad,
 	0x74, 0xf1, 0xd8, 0x5e, 0x05, 0x0b, 0x08, 0xc2, 0x5a, 0x5b, 0x12, 0x17, 0x44, 0x7a, 0xc3, 0x1c,
 	0xa4, 0x03, 0x75, 0xfa, 0xd9, 0x0c, 0xf4, 0x99, 0x33, 0xa7, 0xbc, 0x01, 0x9d, 0x6c, 0x19, 0xca,
-	0xa6, 0x32, 0xfe, 0x44, 0x46, 0x63, 0x67, 0x2e, 0x7a, 0x1b, 0xf2, 0x69, 0x40, 0xc9, 0x15, 0x8d,
+	0xa6, 0x32, 0xfe, 0x42, 0x46, 0x63, 0x67, 0x2e, 0x7a, 0x1b, 0xf2, 0x69, 0x40, 0xc9, 0x15, 0x8d,
 	0xee, 0x6c, 0xce, 0x8e, 0xa7, 0xc2, 0xec, 0x3d, 0x28, 0x1b, 0xae, 0xeb, 0x63, 0x62, 0x96, 0xa3,
 	0x29, 0xd3, 0x23, 0x2a, 0xd4, 0xec, 0xb0, 0x4b, 0x11, 0x87, 0x76, 0xec, 0x8f, 0xda, 0xb7, 0x7e,
-	0x23, 0x19, 0xf2, 0xd5, 0x4d, 0xe4, 0x9f, 0x40, 0x2d, 0xfa, 0x9b, 0x91, 0xc6, 0xbf, 0x45, 0x05,
-	0xb7, 0x41, 0xb9, 0x66, 0x56, 0x31, 0x6d, 0xbf, 0x17, 0xa0, 0x8e, 0x74, 0x4f, 0x4d, 0x2b, 0xa0,
-	0x1e, 0x8b, 0x34, 0xe7, 0x3e, 0x46, 0x96, 0x30, 0xf2, 0x31, 0x54, 0x78, 0x79, 0x3e, 0x86, 0x96,
-	0xf2, 0xeb, 0xeb, 0xb0, 0x1d, 0x70, 0x75, 0x76, 0x61, 0x3e, 0x76, 0x81, 0x9d, 0x42, 0x13, 0xbf,
-	0x31, 0x9d, 0x01, 0x95, 0xb9, 0xe9, 0x0e, 0xdc, 0x16, 0x95, 0x8a, 0x48, 0x85, 0x9b, 0x33, 0xa5,
-	0x54, 0x36, 0x95, 0xf2, 0x77, 0x21, 0xda, 0xa9, 0x1c, 0x92, 0xd8, 0x21, 0xd7, 0xa3, 0x0b, 0xf3,
-	0xb3, 0xa0, 0x59, 0x27, 0x78, 0x5f, 0x7c, 0x6b, 0x64, 0x52, 0x18, 0xf5, 0x91, 0xde, 0x20, 0x83,
-	0x98, 0x13, 0x16, 0x67, 0x19, 0x97, 0xd4, 0xda, 0x7c, 0xff, 0xe4, 0x2e, 0xb4, 0xc2, 0x45, 0xa1,
-	0x73, 0xdd, 0x58, 0x60, 0x66, 0x7e, 0x05, 0x25, 0xb2, 0x0b, 0x5b, 0xb1, 0xfd, 0x92, 0xe2, 0x72,
-	0xfe, 0xc7, 0xfd, 0x60, 0x0c, 0x17, 0x2b, 0xcb, 0x12, 0x0c, 0xeb, 0x8c, 0x8f, 0xfa, 0x1b, 0x16,
-	0x79, 0x66, 0x39, 0x97, 0x86, 0x75, 0x6a, 0x19, 0x57, 0x3e, 0x2b, 0x72, 0x6e, 0x7a, 0xe2, 0xce,
-	0xf6, 0xa0, 0xe3, 0xdf, 0xf8, 0x01, 0x5d, 0xe2, 0x18, 0xdb, 0x0b, 0xf3, 0x4a, 0x67, 0xae, 0x62,
-	0xb4, 0xcd, 0x96, 0x33, 0x33, 0x2c, 0xd9, 0x13, 0x2e, 0x3e, 0xd2, 0x5c, 0xf9, 0xd4, 0x93, 0x1d,
-	0xa1, 0x00, 0xb0, 0xba, 0x6c, 0x9f, 0xce, 0x56, 0x1e, 0x4a, 0x0b, 0x4b, 0xc6, 0xd7, 0x9f, 0xed,
-	0xda, 0x9d, 0xc0, 0x5b, 0xf9, 0x81, 0x8e, 0xad, 0xf2, 0xf5, 0x85, 0xe7, 0x2c, 0xf5, 0x0f, 0x41,
-	0xe0, 0xfa, 0xbc, 0xec, 0x9a, 0xea, 0x41, 0x79, 0x60, 0x2f, 0x1c, 0xb2, 0x0d, 0x0d, 0xef, 0x63,
-	0xa0, 0x47, 0xa2, 0x12, 0x32, 0xdc, 0x81, 0x26, 0x0e, 0xc2, 0x4c, 0x4f, 0x49, 0x19, 0x0b, 0x45,
-	0x89, 0x8c, 0x8d, 0x21, 0xaf, 0x03, 0x68, 0x5e, 0xf1, 0x42, 0x45, 0xf2, 0x72, 0x46, 0xd6, 0xa4,
-	0x2e, 0x60, 0x4e, 0x45, 0xbb, 0xa6, 0xf6, 0x66, 0x1d, 0xe5, 0x5e, 0xae, 0xa3, 0x19, 0x05, 0x64,
-	0xf4, 0x45, 0x42, 0xfc, 0x62, 0x4a, 0xc7, 0x13, 0x95, 0xc8, 0x23, 0x28, 0xcf, 0x8d, 0xc0, 0xd8,
-	0xbc, 0xf6, 0x01, 0x34, 0x38, 0xaa, 0x98, 0xb6, 0xc7, 0xa0, 0xb0, 0xcc, 0xe1, 0xbc, 0xe5, 0xa7,
-	0x16, 0x03, 0x19, 0x8e, 0x1f, 0xee, 0x97, 0x3c, 0x79, 0xc8, 0xcb, 0x37, 0xed, 0x19, 0xd5, 0x25,
-	0x0a, 0x68, 0x5b, 0xd9, 0x81, 0x69, 0x85, 0x36, 0xae, 0xbd, 0x6a, 0x1b, 0x5a, 0x67, 0x34, 0x60,
-	0x0d, 0x9e, 0xd0, 0x9f, 0x56, 0xb8, 0xef, 0xea, 0x21, 0x6c, 0xc5, 0x16, 0xdf, 0xc5, 0x81, 0xa2,
-	0xe4, 0x1e, 0x2a, 0x26, 0x7e, 0x8b, 0x97, 0xe0, 0x76, 0x22, 0x86, 0x68, 0x54, 0x4f, 0x61, 0xeb,
-	0xdc, 0xf4, 0x03, 0xdc, 0x4d, 0x5f, 0x40, 0x90, 0xff, 0x41, 0x75, 0xc1, 0xab, 0x08, 0xd9, 0x37,
-	0x24, 0xf6, 0xc9, 0xce, 0xb7, 0xa0, 0x32, 0xa7, 0x81, 0x61, 0x5a, 0xbc, 0x79, 0x35, 0xcc, 0xdb,
-	0x4e, 0x70, 0x44, 0x62, 0xd4, 0x31, 0xd7, 0x99, 0x47, 0x28, 0x4d, 0x19, 0x45, 0x7d, 0x04, 0x9d,
-	0x81, 0xed, 0xbb, 0x74, 0xc6, 0x8e, 0x44, 0x99, 0x25, 0xcd, 0x54, 0xbf, 0x02, 0x22, 0x07, 0x08,
-	0xc8, 0x3d, 0x54, 0x52, 0x67, 0x2e, 0x4a, 0x49, 0x23, 0xfe, 0x00, 0x1d, 0xc6, 0x80, 0xef, 0x7c,
-	0x5c, 0xcb, 0x17, 0xd9, 0x5a, 0xb2, 0x0f, 0x61, 0x7e, 0x35, 0xcf, 0x81, 0xc8, 0x58, 0x22, 0xf9,
-	0x43, 0xa8, 0x70, 0x91, 0x8a, 0xb0, 0x32, 0xef, 0x8a, 0xfa, 0x18, 0xb6, 0x05, 0x65, 0xfe, 0x9d,
-	0x57, 0xd5, 0xb7, 0xb0, 0x93, 0x0e, 0x11, 0xd0, 0xf1, 0x8b, 0x55, 0xc8, 0x7b, 0xb1, 0xd4, 0xef,
-	0x60, 0x9b, 0xf1, 0xa1, 0x36, 0x1f, 0x9f, 0xb8, 0xba, 0xff, 0x43, 0x25, 0xac, 0x6e, 0xed, 0x95,
-	0x97, 0x66, 0x51, 0x7d, 0x01, 0x3b, 0xe9, 0xc3, 0x49, 0x39, 0x94, 0x5b, 0xd6, 0xca, 0xe1, 0x81,
-	0xea, 0x0d, 0x1f, 0xae, 0x73, 0xe7, 0x2a, 0xce, 0x87, 0x6d, 0xc2, 0xee, 0xeb, 0xf1, 0xbb, 0x86,
-	0x02, 0x19, 0x09, 0xb9, 0xd8, 0x21, 0x9c, 0x63, 0xcb, 0xb4, 0xf9, 0x1c, 0x17, 0x9e, 0x2a, 0xec,
-	0xc0, 0xc2, 0xb1, 0x2c, 0xe7, 0x13, 0x9f, 0xe1, 0x5a, 0x66, 0xae, 0x95, 0x9c, 0xb9, 0xe6, 0x62,
-	0xa9, 0xee, 0xf3, 0x29, 0x0e, 0x53, 0x0b, 0xb6, 0x31, 0x32, 0x57, 0xf0, 0x03, 0x0a, 0xf5, 0xe4,
-	0xd7, 0x50, 0x17, 0xbb, 0x7a, 0xd1, 0x3f, 0xd3, 0xf4, 0xe9, 0xfb, 0xb1, 0xa6, 0xbf, 0x1d, 0x9e,
-	0x68, 0xa7, 0x83, 0xa1, 0x76, 0xd2, 0xbe, 0x85, 0x5a, 0xb2, 0x25, 0x79, 0xfa, 0xe3, 0xf1, 0x71,
-	0xbb, 0x80, 0x2f, 0x4b, 0x47, 0x32, 0x9e, 0x8c, 0x8e, 0x5f, 0x6b, 0x93, 0x76, 0x11, 0x89, 0xb4,
-	0x24, 0xf3, 0xe8, 0x78, 0xd0, 0x2e, 0x1d, 0x8c, 0xa1, 0x16, 0xff, 0x28, 0xd8, 0x85, 0x6d, 0x04,
-	0xd0, 0xdf, 0x4c, 0xfb, 0xd3, 0x74, 0x12, 0xc4, 0x4b, 0x1c, 0x93, 0xb7, 0xc3, 0xe1, 0x60, 0x78,
-	0x86, 0x69, 0x76, 0xa0, 0x9d, 0x98, 0xb5, 0x1f, 0x07, 0x53, 0x0c, 0x2e, 0x1e, 0xfc, 0x53, 0x80,
-	0x5a, 0xfc, 0x12, 0x22, 0xe4, 0x78, 0x74, 0x92, 0x03, 0x89, 0x67, 0x13, 0x87, 0x76, 0xf1, 0x6a,
-	0xf2, 0x7e, 0x84, 0x88, 0xa9, 0xf0, 0xf1, 0x44, 0x1b, 0xf7, 0x27, 0x2c, 0x55, 0x11, 0xc5, 0x99,
-	0x64, 0x1d, 0x08, 0x53, 0x62, 0xcc, 0x12, 0x7b, 0xc4, 0xac, 0x8c, 0xd3, 0xb6, 0x97, 0x98, 0xfb,
-	0xaf, 0x46, 0x13, 0xa4, 0x16, 0x1d, 0x6b, 0x2b, 0x99, 0xe4, 0x21, 0xf1, 0x4a, 0x3a, 0xc7, 0x89,
-	0x76, 0xae, 0x4d, 0x19, 0x58, 0x35, 0x9d, 0xe3, 0xac, 0x3f, 0x79, 0x85, 0x2d, 0x6c, 0xd7, 0x0e,
-	0xfe, 0x28, 0x42, 0x3d, 0x11, 0x3b, 0xbc, 0x21, 0xed, 0x9d, 0x36, 0x9c, 0xae, 0xdf, 0xd0, 0x3d,
-	0xd8, 0x95, 0x3c, 0x0c, 0x29, 0xe6, 0x5f, 0xc0, 0x5f, 0x3b, 0x0f, 0xf3, 0x9d, 0x11, 0x6b, 0xac,
-	0xbd, 0x07, 0x77, 0x33, 0x31, 0x48, 0x85, 0xfb, 0x4a, 0x28, 0x17, 0x77, 0x32, 0x3e, 0x51, 0x4e,
-	0x19, 0x77, 0x67, 0x3f, 0xe3, 0x12, 0xdc, 0xf5, 0xe3, 0xd1, 0xf9, 0xb9, 0x76, 0xcc, 0xa2, 0x94,
-	0x0c, 0xb8, 0xb8, 0xce, 0x49, 0xd8, 0x90, 0x34, 0x38, 0xf3, 0x09, 0xf0, 0x2a, 0x6b, 0xb0, 0xe4,
-	0x0a, 0xa7, 0x6a, 0x70, 0x31, 0x0e, 0x29, 0xd7, 0xc8, 0x7d, 0xe8, 0xae, 0xb9, 0x27, 0xda, 0xc5,
-	0xe8, 0x1d, 0x7a, 0xeb, 0x47, 0xbf, 0x94, 0xf1, 0xc7, 0xd5, 0xea, 0xd2, 0x32, 0x67, 0xfd, 0xf1,
-	0x80, 0x7c, 0x0f, 0x55, 0x21, 0xe8, 0x64, 0x37, 0x79, 0xed, 0x52, 0xa2, 0xdf, 0xeb, 0xae, 0x3b,
-	0xc2, 0xad, 0x51, 0x6f, 0x91, 0x3e, 0xd4, 0x22, 0x61, 0x26, 0x49, 0x5c, 0x46, 0xf3, 0x7b, 0x7b,
-	0x39, 0x9e, 0x18, 0xe2, 0x0c, 0x20, 0x91, 0x62, 0xd2, 0x93, 0x1e, 0x90, 0x8c, 0x80, 0xf7, 0xee,
-	0xe5, 0xfa, 0x64, 0xa0, 0x44, 0x56, 0x25, 0xa0, 0x35, 0xdd, 0x96, 0x80, 0xd6, 0x75, 0x18, 0x81,
-	0x2e, 0xa0, 0x29, 0xcb, 0x28, 0xb9, 0x9f, 0xcd, 0x2b, 0x0b, 0x70, 0xef, 0xc1, 0x06, 0x6f, 0x0c,
-	0x37, 0x82, 0xa6, 0xac, 0x90, 0x12, 0x5c, 0x8e, 0xea, 0x4a, 0x70, 0x79, 0xb2, 0xaa, 0xde, 0xfa,
-	0xba, 0x40, 0x5e, 0xf2, 0x4b, 0x63, 0xfa, 0x95, 0xbe, 0x34, 0x49, 0x4c, 0xd3, 0x97, 0x26, 0x4b,
-	0x1d, 0x43, 0xb8, 0xac, 0xf0, 0xff, 0x10, 0x9f, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xca, 0x1c,
-	0xe0, 0x93, 0x2e, 0x0e, 0x00, 0x00,
+	0x23, 0x19, 0xf2, 0xd5, 0x0d, 0xe4, 0x49, 0x0b, 0x2a, 0xb3, 0x2b, 0xcf, 0x59, 0xb9, 0x78, 0x4d,
+	0xac, 0xbd, 0x4f, 0xa0, 0x16, 0xfb, 0xb0, 0x08, 0xfc, 0x5b, 0x54, 0x74, 0x1b, 0x94, 0x6b, 0x66,
+	0x15, 0xd3, 0xf7, 0x7b, 0x01, 0xea, 0x48, 0xff, 0xd4, 0xb4, 0x02, 0xea, 0xb1, 0x48, 0x73, 0xee,
+	0x63, 0x64, 0x09, 0x23, 0x1f, 0x43, 0x85, 0x97, 0xeb, 0x63, 0x68, 0x29, 0xbf, 0xde, 0x0e, 0xdb,
+	0x09, 0x57, 0x67, 0x17, 0xe8, 0x63, 0x57, 0xd8, 0x29, 0x34, 0xf1, 0x1b, 0xd4, 0x19, 0x50, 0x99,
+	0x9b, 0xee, 0xc0, 0x6d, 0x51, 0xb9, 0x88, 0x54, 0xb8, 0x39, 0x53, 0x5a, 0x65, 0xd3, 0xbd, 0xfc,
+	0x5d, 0x88, 0x76, 0x2c, 0x87, 0x24, 0x76, 0xcc, 0xf5, 0xe8, 0xc2, 0xfc, 0x2c, 0x68, 0xd6, 0x09,
+	0xde, 0x1f, 0xdf, 0x22, 0x99, 0x14, 0x46, 0x7d, 0xa4, 0x37, 0xc8, 0x20, 0xe6, 0x84, 0xc5, 0x59,
+	0xc6, 0x25, 0xb5, 0x36, 0xcf, 0x03, 0xb9, 0x0b, 0xad, 0x70, 0x71, 0xe8, 0x5c, 0x37, 0x16, 0x98,
+	0x99, 0x5f, 0x49, 0x89, 0xec, 0xc2, 0x56, 0x6c, 0xbf, 0xa4, 0xb8, 0xac, 0xff, 0x71, 0x5f, 0x18,
+	0xc3, 0xc5, 0xca, 0xb2, 0x04, 0xc3, 0x3a, 0xe3, 0xa3, 0xfe, 0x86, 0x45, 0x9e, 0x59, 0xce, 0xa5,
+	0x61, 0x9d, 0x5a, 0xc6, 0x95, 0xcf, 0x8a, 0x9c, 0x9b, 0x9e, 0xb8, 0xb3, 0x3d, 0xe8, 0xf8, 0x37,
+	0x7e, 0x40, 0x97, 0x38, 0xd6, 0xf6, 0xc2, 0xbc, 0xd2, 0x99, 0xab, 0x18, 0x6d, 0xb7, 0xe5, 0xcc,
+	0x0c, 0x4b, 0xf6, 0x84, 0x42, 0x80, 0x34, 0x57, 0x3e, 0xf5, 0x64, 0x47, 0x28, 0x08, 0xac, 0x2e,
+	0xdb, 0xa7, 0xb3, 0x95, 0x87, 0x52, 0xc3, 0x92, 0x71, 0x39, 0x60, 0xbb, 0x77, 0x27, 0xf0, 0x56,
+	0x7e, 0xa0, 0x63, 0xab, 0x7c, 0x7d, 0xe1, 0x39, 0x4b, 0xfd, 0x43, 0x10, 0xb8, 0x3e, 0x2f, 0xbb,
+	0xa6, 0x7a, 0x50, 0x1e, 0xd8, 0x0b, 0x87, 0x6c, 0x43, 0xc3, 0xfb, 0x18, 0xe8, 0x91, 0xc8, 0x84,
+	0x0c, 0x77, 0xa0, 0x89, 0x83, 0x30, 0xd3, 0x53, 0xd2, 0xc6, 0x42, 0x51, 0x32, 0x63, 0x63, 0xc8,
+	0xeb, 0x00, 0x9a, 0x57, 0xbc, 0x50, 0x91, 0xbc, 0x9c, 0x91, 0x39, 0xa9, 0x0b, 0x98, 0x53, 0xd1,
+	0xae, 0xa9, 0xbd, 0x59, 0x57, 0xb9, 0x97, 0xeb, 0x6a, 0x46, 0x11, 0x19, 0x7d, 0x91, 0x10, 0xbf,
+	0x98, 0xf2, 0xf1, 0x44, 0x25, 0xf2, 0x08, 0xca, 0x73, 0x23, 0x30, 0x36, 0xcb, 0x40, 0x00, 0x0d,
+	0x8e, 0x2a, 0xa6, 0xed, 0x31, 0x28, 0x2c, 0x73, 0x38, 0x6f, 0xf9, 0xa9, 0xc5, 0x40, 0x86, 0xe3,
+	0x87, 0xfb, 0x25, 0x4f, 0x1e, 0xf2, 0xf2, 0x4d, 0x7b, 0x46, 0x75, 0x89, 0x02, 0xda, 0x56, 0x76,
+	0x60, 0x5a, 0xa1, 0x8d, 0x6b, 0xb1, 0xda, 0x86, 0xd6, 0x19, 0x0d, 0x58, 0x83, 0x27, 0xf4, 0xa7,
+	0x15, 0xee, 0xbf, 0x7a, 0x08, 0x5b, 0xb1, 0xc5, 0x77, 0x71, 0xa0, 0x28, 0xb9, 0x87, 0x0a, 0x8a,
+	0xdf, 0xe2, 0x65, 0xb8, 0x9d, 0x88, 0x23, 0x1a, 0xd5, 0x53, 0xd8, 0x3a, 0x37, 0xfd, 0x00, 0x77,
+	0xd3, 0x17, 0x10, 0xe4, 0x7f, 0x50, 0x5d, 0xf0, 0x2a, 0x42, 0xf6, 0x0d, 0x89, 0x7d, 0xb2, 0xf3,
+	0xa8, 0x1c, 0x73, 0x1a, 0x18, 0xa6, 0xc5, 0x9b, 0x57, 0xc3, 0xbc, 0xed, 0x04, 0x47, 0x24, 0x46,
+	0x5d, 0x73, 0x9d, 0x79, 0x84, 0xd2, 0x94, 0x51, 0xd4, 0x47, 0xd0, 0x19, 0xd8, 0xbe, 0x4b, 0x67,
+	0xec, 0x48, 0x94, 0x59, 0xd2, 0x50, 0xf5, 0x2b, 0x20, 0x72, 0x80, 0x80, 0xdc, 0x43, 0x65, 0x75,
+	0xe6, 0xa2, 0x94, 0x34, 0xe2, 0x0f, 0xd0, 0x61, 0x0c, 0xf8, 0xce, 0xc7, 0xb5, 0x7c, 0x91, 0xad,
+	0x25, 0xfb, 0x30, 0xe6, 0x57, 0xf3, 0x1c, 0x88, 0x8c, 0x25, 0x92, 0x3f, 0x84, 0x0a, 0x17, 0xa9,
+	0x08, 0x2b, 0xf3, 0xce, 0xa8, 0x8f, 0x61, 0x5b, 0x50, 0xe6, 0xdf, 0x79, 0x55, 0x7d, 0x0b, 0x3b,
+	0xe9, 0x10, 0x01, 0x1d, 0xbf, 0x60, 0x85, 0xbc, 0x17, 0x4c, 0xfd, 0x0e, 0xb6, 0x19, 0x1f, 0x6a,
+	0xf3, 0xf1, 0x89, 0xab, 0xfb, 0x3f, 0x54, 0xc2, 0xea, 0xd6, 0x5e, 0x7d, 0x69, 0x16, 0xd5, 0x17,
+	0xb0, 0x93, 0x3e, 0x9c, 0x94, 0x43, 0xb9, 0x65, 0xad, 0x1c, 0x1e, 0xa8, 0xde, 0xf0, 0xe1, 0x3a,
+	0x77, 0xae, 0xe2, 0x7c, 0xd8, 0x26, 0xec, 0xbe, 0x1e, 0xbf, 0x73, 0x28, 0x90, 0x91, 0x90, 0x8b,
+	0x1d, 0xc2, 0x39, 0xb6, 0x4c, 0x9b, 0xcf, 0x71, 0xe1, 0xa9, 0xc2, 0x0e, 0x2c, 0x1c, 0xcb, 0x72,
+	0x3e, 0xf1, 0x19, 0xae, 0x65, 0xe6, 0x5a, 0xc9, 0x99, 0x6b, 0x2e, 0x96, 0xea, 0x3e, 0x9f, 0xe2,
+	0x30, 0xb5, 0x60, 0x1b, 0x23, 0x73, 0x05, 0x3f, 0xa0, 0x50, 0x4f, 0x7e, 0x1d, 0x75, 0xb1, 0xab,
+	0x17, 0xfd, 0x33, 0x4d, 0x9f, 0xbe, 0x1f, 0x6b, 0xfa, 0xdb, 0xe1, 0x89, 0x76, 0x3a, 0x18, 0x6a,
+	0x27, 0xed, 0x5b, 0xa8, 0x25, 0x5b, 0x92, 0xa7, 0x3f, 0x1e, 0x1f, 0xb7, 0x0b, 0xf8, 0xb2, 0x74,
+	0x24, 0xe3, 0xc9, 0xe8, 0xf8, 0xb5, 0x36, 0x69, 0x17, 0x91, 0x48, 0x4b, 0x32, 0x8f, 0x8e, 0x07,
+	0xed, 0xd2, 0xc1, 0x18, 0x6a, 0xf1, 0x8f, 0x84, 0x5d, 0xd8, 0x46, 0x00, 0xfd, 0xcd, 0xb4, 0x3f,
+	0x4d, 0x27, 0x41, 0xbc, 0xc4, 0x31, 0x79, 0x3b, 0x1c, 0x0e, 0x86, 0x67, 0x98, 0x66, 0x07, 0xda,
+	0x89, 0x59, 0xfb, 0x71, 0x30, 0xc5, 0xe0, 0xe2, 0xc1, 0x3f, 0x05, 0xa8, 0xc5, 0x2f, 0x21, 0x42,
+	0x8e, 0x47, 0x27, 0x39, 0x90, 0x78, 0x36, 0x71, 0x68, 0x17, 0xaf, 0x26, 0xef, 0x47, 0x88, 0x98,
+	0x0a, 0x1f, 0x4f, 0xb4, 0x71, 0x7f, 0xc2, 0x52, 0x15, 0x51, 0x9c, 0x49, 0xd6, 0x81, 0x30, 0x25,
+	0xc6, 0x2c, 0xb1, 0x47, 0xcc, 0xca, 0x38, 0x6d, 0x7b, 0x89, 0xb9, 0xff, 0x6a, 0x34, 0x41, 0x6a,
+	0xd1, 0xb1, 0xb6, 0x92, 0x49, 0x1e, 0x12, 0xaf, 0xa4, 0x73, 0x9c, 0x68, 0xe7, 0xda, 0x94, 0x81,
+	0x55, 0xd3, 0x39, 0xce, 0xfa, 0x93, 0x57, 0xd8, 0xc2, 0x76, 0xed, 0xe0, 0x8f, 0x22, 0xd4, 0x13,
+	0xb1, 0xc3, 0x1b, 0xd2, 0xde, 0x69, 0xc3, 0xe9, 0xfa, 0x0d, 0xdd, 0x83, 0x5d, 0xc9, 0xc3, 0x90,
+	0x62, 0xfe, 0x05, 0xfc, 0xf5, 0xf3, 0x30, 0xdf, 0x19, 0xb1, 0xc6, 0xda, 0x7b, 0x70, 0x37, 0x13,
+	0x83, 0x54, 0xb8, 0xaf, 0x84, 0x72, 0x71, 0x27, 0xe3, 0x13, 0xe5, 0x94, 0x71, 0x77, 0xf6, 0x33,
+	0x2e, 0xc1, 0x5d, 0x3f, 0x1e, 0x9d, 0x9f, 0x6b, 0xc7, 0x2c, 0x4a, 0xc9, 0x80, 0x8b, 0xeb, 0x9c,
+	0x84, 0x0d, 0x49, 0x83, 0x33, 0x9f, 0x00, 0xaf, 0xb2, 0x06, 0x4b, 0xae, 0x70, 0xaa, 0x06, 0x17,
+	0xe3, 0x90, 0x72, 0x8d, 0xdc, 0x87, 0xee, 0x9a, 0x7b, 0xa2, 0x5d, 0x8c, 0xde, 0xa1, 0xb7, 0x7e,
+	0xf4, 0x4b, 0x19, 0x7f, 0x5c, 0xad, 0x2e, 0x2d, 0x73, 0xd6, 0x1f, 0x0f, 0xc8, 0xf7, 0x50, 0x15,
+	0x82, 0x4e, 0x76, 0x93, 0xd7, 0x2e, 0x25, 0xfa, 0xbd, 0xee, 0xba, 0x23, 0xdc, 0x1a, 0xf5, 0x16,
+	0xe9, 0x43, 0x2d, 0x12, 0x66, 0x92, 0xc4, 0x65, 0x34, 0xbf, 0xb7, 0x97, 0xe3, 0x89, 0x21, 0xce,
+	0x00, 0x12, 0x29, 0x26, 0x3d, 0xe9, 0x01, 0xc9, 0x08, 0x78, 0xef, 0x5e, 0xae, 0x4f, 0x06, 0x4a,
+	0x64, 0x55, 0x02, 0x5a, 0xd3, 0x6d, 0x09, 0x68, 0x5d, 0x87, 0x11, 0xe8, 0x02, 0x9a, 0xb2, 0x8c,
+	0x92, 0xfb, 0xd9, 0xbc, 0xb2, 0x00, 0xf7, 0x1e, 0x6c, 0xf0, 0xc6, 0x70, 0x23, 0x68, 0xca, 0x0a,
+	0x29, 0xc1, 0xe5, 0xa8, 0xae, 0x04, 0x97, 0x27, 0xab, 0xea, 0xad, 0xaf, 0x0b, 0xe4, 0x25, 0xbf,
+	0x34, 0xa6, 0x5f, 0xe9, 0x4b, 0x93, 0xc4, 0x34, 0x7d, 0x69, 0xb2, 0xd4, 0x31, 0x84, 0xcb, 0x0a,
+	0xff, 0x8f, 0xf1, 0xd9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xee, 0xd0, 0xb0, 0x32, 0x3e, 0x0e,
+	0x00, 0x00,
 }
diff --git a/api/v1alpha/api.proto b/api/v1alpha/api.proto
index efa97c47b2..fca5c92bdb 100644
--- a/api/v1alpha/api.proto
+++ b/api/v1alpha/api.proto
@@ -172,6 +172,9 @@ message Pod {
 
         // Annotations on this pod.
         repeated KeyValue annotations = 7;
+
+        // Cgroup of the pod, empty if the pod is not running.
+        string cgroup = 8;
 }
 
 message KeyValue {
diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index 17e58d88be..967485aedb 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -182,8 +182,7 @@ func getControllerRWFiles(controller string) []string {
 	return nil
 }
 
-func parseOwnCgroupController(controller string) ([]string, error) {
-	cgroupPath := "/proc/self/cgroup"
+func parseCgroupController(cgroupPath, controller string) ([]string, error) {
 	cg, err := os.Open(cgroupPath)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
@@ -210,7 +209,17 @@ func parseOwnCgroupController(controller string) ([]string, error) {
 // GetOwnCgroupPath returns the cgroup path of this process in controller
 // hierarchy
 func GetOwnCgroupPath(controller string) (string, error) {
-	parts, err := parseOwnCgroupController(controller)
+	parts, err := parseCgroupController("/proc/self/cgroup", controller)
+	if err != nil {
+		return "", err
+	}
+	return parts[2], nil
+}
+
+// GetCgroupPathByPid returns the cgroup path of the process with the given pid
+// and given controller.
+func GetCgroupPathByPid(pid int, controller string) (string, error) {
+	parts, err := parseCgroupController(fmt.Sprintf("/proc/%d/cgroup", pid), controller)
 	if err != nil {
 		return "", err
 	}
diff --git a/rkt/api_service.go b/rkt/api_service.go
index 31ee70103a..63ed9b4b1c 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -29,6 +29,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/api/v1alpha"
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/pkg/set"
 	"github.com/coreos/rkt/store"
 	"github.com/coreos/rkt/version"
@@ -303,13 +304,6 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest, error) {
 	case Running:
 		pod.State = v1alpha.PodState_POD_STATE_RUNNING
 		pod.Networks = getNetworks(p)
-
-		// Get cgroup.
-		cgroup, err := p.getCgroup()
-		if err != nil {
-			return nil, nil, err
-		}
-		pod.Cgroup = cgroup
 	case Deleting:
 		pod.State = v1alpha.PodState_POD_STATE_DELETING
 	case Exited:
@@ -341,6 +335,25 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest, error) {
 		pod.Pid = int32(pid)
 	}
 
+	if pod.State == v1alpha.PodState_POD_STATE_RUNNING {
+		// Get cgroup for the "name=systemd" controller.
+		pid, err := p.getContainerPID1()
+		if err != nil {
+			return nil, nil, err
+		}
+		cgroup, err := cgroup.GetCgroupPathByPid(pid, "name=systemd")
+		if err != nil {
+			return nil, nil, err
+		}
+
+		// If the stage1 systemd > v226, it will put the PID1 into "init.scope"
+		// implicit scope unit in the root slice.
+		// See https://github.com/coreos/rkt/pull/2331#issuecomment-203540543
+		//
+		// TODO(yifan): Revisit this when using unified cgroup hierarchy.
+		pod.Cgroup = strings.TrimSuffix(cgroup, "/init.scope")
+	}
+
 	pod.Manifest = data
 	pod.Apps = apps
 	pod.Annotations = convertAnnotationsToKeyValue(manifest.Annotations)

From b3a0850032556374329e4f083b33d74ca8452e9c Mon Sep 17 00:00:00 2001
From: Yifan Gu <guyifan1121@gmail.com>
Date: Fri, 25 Mar 2016 11:58:16 -0700
Subject: [PATCH 0042/1304] api_service: Add cgroups in the pod filter.

If PodFilter.Cgroups is not empty, then only the pods whose cgroups
are listed will be returned.
---
 api/v1alpha/api.pb.go | 186 +++++++++++++++++++++---------------------
 api/v1alpha/api.proto |   3 +
 rkt/api_service.go    |   8 ++
 3 files changed, 105 insertions(+), 92 deletions(-)

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index 80151f7489..99783930f9 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -395,6 +395,8 @@ type PodFilter struct {
 	NetworkNames []string `protobuf:"bytes,5,rep,name=network_names" json:"network_names,omitempty"`
 	// If not empty, the pods that have all of the annotations will be returned.
 	Annotations []*KeyValue `protobuf:"bytes,6,rep,name=annotations" json:"annotations,omitempty"`
+	// If not empty, the pods whose cgroup are listed will be returned.
+	Cgroups []string `protobuf:"bytes,7,rep,name=cgroups" json:"cgroups,omitempty"`
 }
 
 func (m *PodFilter) Reset()                    { *m = PodFilter{} }
@@ -1126,96 +1128,96 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1442 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0x4b, 0x72, 0xdb, 0x46,
-	0x13, 0x36, 0x1f, 0xe0, 0xa3, 0x49, 0x53, 0xe4, 0x48, 0xb6, 0x28, 0xfa, 0x25, 0xe3, 0xff, 0xe3,
-	0x72, 0xb4, 0x50, 0x12, 0xd9, 0xf1, 0x26, 0x55, 0x29, 0xd3, 0x12, 0xa4, 0x62, 0x2c, 0x91, 0x2c,
-	0x9a, 0x76, 0xc5, 0x2b, 0x14, 0x44, 0x0e, 0x65, 0x94, 0x41, 0x00, 0x01, 0x40, 0xd9, 0xca, 0x32,
-	0x17, 0xc8, 0x11, 0x92, 0x5b, 0x64, 0x99, 0x7d, 0x8e, 0x91, 0xaa, 0xdc, 0x23, 0x3d, 0x83, 0x01,
-	0x30, 0x00, 0xc1, 0x45, 0x76, 0x42, 0x77, 0xcf, 0xd7, 0x5f, 0xf7, 0x74, 0x7f, 0x43, 0x41, 0xdd,
-	0x70, 0xcd, 0x43, 0xd7, 0x73, 0x02, 0x87, 0x54, 0xaf, 0xbf, 0x31, 0x2c, 0xf7, 0x83, 0xa1, 0xbe,
-	0x84, 0xc6, 0x60, 0x69, 0x5c, 0xd1, 0x53, 0xc7, 0x5b, 0x1a, 0x01, 0xd9, 0x87, 0x72, 0x70, 0xe3,
-	0xd2, 0x6e, 0x61, 0xbf, 0xf0, 0xb4, 0x75, 0x44, 0x0e, 0x45, 0xd8, 0x21, 0x8f, 0x99, 0xa2, 0x87,
-	0x6c, 0x41, 0xf5, 0x9a, 0x7a, 0xbe, 0xe9, 0xd8, 0xdd, 0x22, 0x06, 0xd5, 0xd5, 0x3f, 0x0b, 0xa0,
-	0x70, 0x37, 0xf9, 0x12, 0x1a, 0x97, 0x86, 0x4f, 0xf5, 0x05, 0xc7, 0xe2, 0x18, 0x8d, 0xa3, 0x9d,
-	0x34, 0x86, 0xc8, 0x03, 0x50, 0x34, 0xe7, 0x21, 0x00, 0x69, 0x42, 0xd9, 0x36, 0x96, 0xb4, 0x5b,
-	0xe2, 0x5f, 0x12, 0x7e, 0x99, 0x1b, 0xba, 0xd0, 0x36, 0x97, 0xae, 0xe3, 0x05, 0x7a, 0x60, 0x2e,
-	0xa9, 0x1f, 0x18, 0x4b, 0xb7, 0xab, 0xa0, 0xa7, 0x44, 0xda, 0x50, 0x5b, 0x1a, 0xb6, 0xb9, 0x40,
-	0x63, 0xb7, 0x82, 0x96, 0x26, 0x83, 0xf2, 0xcd, 0x9f, 0x69, 0xb7, 0xca, 0xfd, 0x4f, 0xa0, 0x61,
-	0xd8, 0xb6, 0x13, 0x18, 0x01, 0xa2, 0xf9, 0xdd, 0xda, 0x7e, 0x09, 0xf9, 0x74, 0x62, 0x3e, 0xaf,
-	0xe9, 0xcd, 0x3b, 0xc3, 0x5a, 0x51, 0xf5, 0x19, 0x54, 0x87, 0x34, 0xf8, 0xe4, 0x78, 0x1f, 0x63,
-	0x2e, 0x85, 0x88, 0x99, 0xe9, 0x5e, 0x3f, 0x4f, 0x78, 0xe2, 0xd7, 0x8b, 0x90, 0xa7, 0xfa, 0x6b,
-	0x01, 0x4a, 0x7d, 0xd7, 0xcd, 0x9c, 0x78, 0x00, 0x8a, 0xc9, 0xca, 0xe4, 0x47, 0x1a, 0x47, 0xad,
-	0x74, 0xf1, 0xd8, 0x5e, 0x05, 0x0b, 0x08, 0xc2, 0x5a, 0x5b, 0x12, 0x17, 0x44, 0x7a, 0xc3, 0x1c,
-	0xa4, 0x03, 0x75, 0xfa, 0xd9, 0x0c, 0xf4, 0x99, 0x33, 0xa7, 0xbc, 0x01, 0x9d, 0x6c, 0x19, 0xca,
-	0xa6, 0x32, 0xfe, 0x42, 0x46, 0x63, 0x67, 0x2e, 0x7a, 0x1b, 0xf2, 0x69, 0x40, 0xc9, 0x15, 0x8d,
-	0xee, 0x6c, 0xce, 0x8e, 0xa7, 0xc2, 0xec, 0x3d, 0x28, 0x1b, 0xae, 0xeb, 0x63, 0x62, 0x96, 0xa3,
-	0x29, 0xd3, 0x23, 0x2a, 0xd4, 0xec, 0xb0, 0x4b, 0x11, 0x87, 0x76, 0xec, 0x8f, 0xda, 0xb7, 0x7e,
-	0x23, 0x19, 0xf2, 0xd5, 0x0d, 0xe4, 0x49, 0x0b, 0x2a, 0xb3, 0x2b, 0xcf, 0x59, 0xb9, 0x78, 0x4d,
-	0xac, 0xbd, 0x4f, 0xa0, 0x16, 0xfb, 0xb0, 0x08, 0xfc, 0x5b, 0x54, 0x74, 0x1b, 0x94, 0x6b, 0x66,
-	0x15, 0xd3, 0xf7, 0x7b, 0x01, 0xea, 0x48, 0xff, 0xd4, 0xb4, 0x02, 0xea, 0xb1, 0x48, 0x73, 0xee,
-	0x63, 0x64, 0x09, 0x23, 0x1f, 0x43, 0x85, 0x97, 0xeb, 0x63, 0x68, 0x29, 0xbf, 0xde, 0x0e, 0xdb,
-	0x09, 0x57, 0x67, 0x17, 0xe8, 0x63, 0x57, 0xd8, 0x29, 0x34, 0xf1, 0x1b, 0xd4, 0x19, 0x50, 0x99,
-	0x9b, 0xee, 0xc0, 0x6d, 0x51, 0xb9, 0x88, 0x54, 0xb8, 0x39, 0x53, 0x5a, 0x65, 0xd3, 0xbd, 0xfc,
-	0x5d, 0x88, 0x76, 0x2c, 0x87, 0x24, 0x76, 0xcc, 0xf5, 0xe8, 0xc2, 0xfc, 0x2c, 0x68, 0xd6, 0x09,
-	0xde, 0x1f, 0xdf, 0x22, 0x99, 0x14, 0x46, 0x7d, 0xa4, 0x37, 0xc8, 0x20, 0xe6, 0x84, 0xc5, 0x59,
-	0xc6, 0x25, 0xb5, 0x36, 0xcf, 0x03, 0xb9, 0x0b, 0xad, 0x70, 0x71, 0xe8, 0x5c, 0x37, 0x16, 0x98,
-	0x99, 0x5f, 0x49, 0x89, 0xec, 0xc2, 0x56, 0x6c, 0xbf, 0xa4, 0xb8, 0xac, 0xff, 0x71, 0x5f, 0x18,
-	0xc3, 0xc5, 0xca, 0xb2, 0x04, 0xc3, 0x3a, 0xe3, 0xa3, 0xfe, 0x86, 0x45, 0x9e, 0x59, 0xce, 0xa5,
-	0x61, 0x9d, 0x5a, 0xc6, 0x95, 0xcf, 0x8a, 0x9c, 0x9b, 0x9e, 0xb8, 0xb3, 0x3d, 0xe8, 0xf8, 0x37,
-	0x7e, 0x40, 0x97, 0x38, 0xd6, 0xf6, 0xc2, 0xbc, 0xd2, 0x99, 0xab, 0x18, 0x6d, 0xb7, 0xe5, 0xcc,
-	0x0c, 0x4b, 0xf6, 0x84, 0x42, 0x80, 0x34, 0x57, 0x3e, 0xf5, 0x64, 0x47, 0x28, 0x08, 0xac, 0x2e,
-	0xdb, 0xa7, 0xb3, 0x95, 0x87, 0x52, 0xc3, 0x92, 0x71, 0x39, 0x60, 0xbb, 0x77, 0x27, 0xf0, 0x56,
-	0x7e, 0xa0, 0x63, 0xab, 0x7c, 0x7d, 0xe1, 0x39, 0x4b, 0xfd, 0x43, 0x10, 0xb8, 0x3e, 0x2f, 0xbb,
-	0xa6, 0x7a, 0x50, 0x1e, 0xd8, 0x0b, 0x87, 0x6c, 0x43, 0xc3, 0xfb, 0x18, 0xe8, 0x91, 0xc8, 0x84,
-	0x0c, 0x77, 0xa0, 0x89, 0x83, 0x30, 0xd3, 0x53, 0xd2, 0xc6, 0x42, 0x51, 0x32, 0x63, 0x63, 0xc8,
-	0xeb, 0x00, 0x9a, 0x57, 0xbc, 0x50, 0x91, 0xbc, 0x9c, 0x91, 0x39, 0xa9, 0x0b, 0x98, 0x53, 0xd1,
-	0xae, 0xa9, 0xbd, 0x59, 0x57, 0xb9, 0x97, 0xeb, 0x6a, 0x46, 0x11, 0x19, 0x7d, 0x91, 0x10, 0xbf,
-	0x98, 0xf2, 0xf1, 0x44, 0x25, 0xf2, 0x08, 0xca, 0x73, 0x23, 0x30, 0x36, 0xcb, 0x40, 0x00, 0x0d,
-	0x8e, 0x2a, 0xa6, 0xed, 0x31, 0x28, 0x2c, 0x73, 0x38, 0x6f, 0xf9, 0xa9, 0xc5, 0x40, 0x86, 0xe3,
-	0x87, 0xfb, 0x25, 0x4f, 0x1e, 0xf2, 0xf2, 0x4d, 0x7b, 0x46, 0x75, 0x89, 0x02, 0xda, 0x56, 0x76,
-	0x60, 0x5a, 0xa1, 0x8d, 0x6b, 0xb1, 0xda, 0x86, 0xd6, 0x19, 0x0d, 0x58, 0x83, 0x27, 0xf4, 0xa7,
-	0x15, 0xee, 0xbf, 0x7a, 0x08, 0x5b, 0xb1, 0xc5, 0x77, 0x71, 0xa0, 0x28, 0xb9, 0x87, 0x0a, 0x8a,
-	0xdf, 0xe2, 0x65, 0xb8, 0x9d, 0x88, 0x23, 0x1a, 0xd5, 0x53, 0xd8, 0x3a, 0x37, 0xfd, 0x00, 0x77,
-	0xd3, 0x17, 0x10, 0xe4, 0x7f, 0x50, 0x5d, 0xf0, 0x2a, 0x42, 0xf6, 0x0d, 0x89, 0x7d, 0xb2, 0xf3,
-	0xa8, 0x1c, 0x73, 0x1a, 0x18, 0xa6, 0xc5, 0x9b, 0x57, 0xc3, 0xbc, 0xed, 0x04, 0x47, 0x24, 0x46,
-	0x5d, 0x73, 0x9d, 0x79, 0x84, 0xd2, 0x94, 0x51, 0xd4, 0x47, 0xd0, 0x19, 0xd8, 0xbe, 0x4b, 0x67,
-	0xec, 0x48, 0x94, 0x59, 0xd2, 0x50, 0xf5, 0x2b, 0x20, 0x72, 0x80, 0x80, 0xdc, 0x43, 0x65, 0x75,
-	0xe6, 0xa2, 0x94, 0x34, 0xe2, 0x0f, 0xd0, 0x61, 0x0c, 0xf8, 0xce, 0xc7, 0xb5, 0x7c, 0x91, 0xad,
-	0x25, 0xfb, 0x30, 0xe6, 0x57, 0xf3, 0x1c, 0x88, 0x8c, 0x25, 0x92, 0x3f, 0x84, 0x0a, 0x17, 0xa9,
-	0x08, 0x2b, 0xf3, 0xce, 0xa8, 0x8f, 0x61, 0x5b, 0x50, 0xe6, 0xdf, 0x79, 0x55, 0x7d, 0x0b, 0x3b,
-	0xe9, 0x10, 0x01, 0x1d, 0xbf, 0x60, 0x85, 0xbc, 0x17, 0x4c, 0xfd, 0x0e, 0xb6, 0x19, 0x1f, 0x6a,
-	0xf3, 0xf1, 0x89, 0xab, 0xfb, 0x3f, 0x54, 0xc2, 0xea, 0xd6, 0x5e, 0x7d, 0x69, 0x16, 0xd5, 0x17,
-	0xb0, 0x93, 0x3e, 0x9c, 0x94, 0x43, 0xb9, 0x65, 0xad, 0x1c, 0x1e, 0xa8, 0xde, 0xf0, 0xe1, 0x3a,
-	0x77, 0xae, 0xe2, 0x7c, 0xd8, 0x26, 0xec, 0xbe, 0x1e, 0xbf, 0x73, 0x28, 0x90, 0x91, 0x90, 0x8b,
-	0x1d, 0xc2, 0x39, 0xb6, 0x4c, 0x9b, 0xcf, 0x71, 0xe1, 0xa9, 0xc2, 0x0e, 0x2c, 0x1c, 0xcb, 0x72,
-	0x3e, 0xf1, 0x19, 0xae, 0x65, 0xe6, 0x5a, 0xc9, 0x99, 0x6b, 0x2e, 0x96, 0xea, 0x3e, 0x9f, 0xe2,
-	0x30, 0xb5, 0x60, 0x1b, 0x23, 0x73, 0x05, 0x3f, 0xa0, 0x50, 0x4f, 0x7e, 0x1d, 0x75, 0xb1, 0xab,
-	0x17, 0xfd, 0x33, 0x4d, 0x9f, 0xbe, 0x1f, 0x6b, 0xfa, 0xdb, 0xe1, 0x89, 0x76, 0x3a, 0x18, 0x6a,
-	0x27, 0xed, 0x5b, 0xa8, 0x25, 0x5b, 0x92, 0xa7, 0x3f, 0x1e, 0x1f, 0xb7, 0x0b, 0xf8, 0xb2, 0x74,
-	0x24, 0xe3, 0xc9, 0xe8, 0xf8, 0xb5, 0x36, 0x69, 0x17, 0x91, 0x48, 0x4b, 0x32, 0x8f, 0x8e, 0x07,
-	0xed, 0xd2, 0xc1, 0x18, 0x6a, 0xf1, 0x8f, 0x84, 0x5d, 0xd8, 0x46, 0x00, 0xfd, 0xcd, 0xb4, 0x3f,
-	0x4d, 0x27, 0x41, 0xbc, 0xc4, 0x31, 0x79, 0x3b, 0x1c, 0x0e, 0x86, 0x67, 0x98, 0x66, 0x07, 0xda,
-	0x89, 0x59, 0xfb, 0x71, 0x30, 0xc5, 0xe0, 0xe2, 0xc1, 0x3f, 0x05, 0xa8, 0xc5, 0x2f, 0x21, 0x42,
-	0x8e, 0x47, 0x27, 0x39, 0x90, 0x78, 0x36, 0x71, 0x68, 0x17, 0xaf, 0x26, 0xef, 0x47, 0x88, 0x98,
-	0x0a, 0x1f, 0x4f, 0xb4, 0x71, 0x7f, 0xc2, 0x52, 0x15, 0x51, 0x9c, 0x49, 0xd6, 0x81, 0x30, 0x25,
-	0xc6, 0x2c, 0xb1, 0x47, 0xcc, 0xca, 0x38, 0x6d, 0x7b, 0x89, 0xb9, 0xff, 0x6a, 0x34, 0x41, 0x6a,
-	0xd1, 0xb1, 0xb6, 0x92, 0x49, 0x1e, 0x12, 0xaf, 0xa4, 0x73, 0x9c, 0x68, 0xe7, 0xda, 0x94, 0x81,
-	0x55, 0xd3, 0x39, 0xce, 0xfa, 0x93, 0x57, 0xd8, 0xc2, 0x76, 0xed, 0xe0, 0x8f, 0x22, 0xd4, 0x13,
-	0xb1, 0xc3, 0x1b, 0xd2, 0xde, 0x69, 0xc3, 0xe9, 0xfa, 0x0d, 0xdd, 0x83, 0x5d, 0xc9, 0xc3, 0x90,
-	0x62, 0xfe, 0x05, 0xfc, 0xf5, 0xf3, 0x30, 0xdf, 0x19, 0xb1, 0xc6, 0xda, 0x7b, 0x70, 0x37, 0x13,
-	0x83, 0x54, 0xb8, 0xaf, 0x84, 0x72, 0x71, 0x27, 0xe3, 0x13, 0xe5, 0x94, 0x71, 0x77, 0xf6, 0x33,
-	0x2e, 0xc1, 0x5d, 0x3f, 0x1e, 0x9d, 0x9f, 0x6b, 0xc7, 0x2c, 0x4a, 0xc9, 0x80, 0x8b, 0xeb, 0x9c,
-	0x84, 0x0d, 0x49, 0x83, 0x33, 0x9f, 0x00, 0xaf, 0xb2, 0x06, 0x4b, 0xae, 0x70, 0xaa, 0x06, 0x17,
-	0xe3, 0x90, 0x72, 0x8d, 0xdc, 0x87, 0xee, 0x9a, 0x7b, 0xa2, 0x5d, 0x8c, 0xde, 0xa1, 0xb7, 0x7e,
-	0xf4, 0x4b, 0x19, 0x7f, 0x5c, 0xad, 0x2e, 0x2d, 0x73, 0xd6, 0x1f, 0x0f, 0xc8, 0xf7, 0x50, 0x15,
-	0x82, 0x4e, 0x76, 0x93, 0xd7, 0x2e, 0x25, 0xfa, 0xbd, 0xee, 0xba, 0x23, 0xdc, 0x1a, 0xf5, 0x16,
-	0xe9, 0x43, 0x2d, 0x12, 0x66, 0x92, 0xc4, 0x65, 0x34, 0xbf, 0xb7, 0x97, 0xe3, 0x89, 0x21, 0xce,
-	0x00, 0x12, 0x29, 0x26, 0x3d, 0xe9, 0x01, 0xc9, 0x08, 0x78, 0xef, 0x5e, 0xae, 0x4f, 0x06, 0x4a,
-	0x64, 0x55, 0x02, 0x5a, 0xd3, 0x6d, 0x09, 0x68, 0x5d, 0x87, 0x11, 0xe8, 0x02, 0x9a, 0xb2, 0x8c,
-	0x92, 0xfb, 0xd9, 0xbc, 0xb2, 0x00, 0xf7, 0x1e, 0x6c, 0xf0, 0xc6, 0x70, 0x23, 0x68, 0xca, 0x0a,
-	0x29, 0xc1, 0xe5, 0xa8, 0xae, 0x04, 0x97, 0x27, 0xab, 0xea, 0xad, 0xaf, 0x0b, 0xe4, 0x25, 0xbf,
-	0x34, 0xa6, 0x5f, 0xe9, 0x4b, 0x93, 0xc4, 0x34, 0x7d, 0x69, 0xb2, 0xd4, 0x31, 0x84, 0xcb, 0x0a,
-	0xff, 0x8f, 0xf1, 0xd9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xee, 0xd0, 0xb0, 0x32, 0x3e, 0x0e,
-	0x00, 0x00,
+	// 1450 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0x4d, 0x72, 0xdb, 0x46,
+	0x13, 0x35, 0x7f, 0xc0, 0x9f, 0x26, 0x4d, 0x91, 0x23, 0xd9, 0xa2, 0xe8, 0x3f, 0x19, 0xdf, 0x17,
+	0x97, 0xa3, 0x85, 0x92, 0xc8, 0x8e, 0x37, 0xa9, 0x4a, 0x99, 0x96, 0x20, 0x15, 0x63, 0x89, 0x64,
+	0xd1, 0xb4, 0x2b, 0x5e, 0xa1, 0x20, 0x72, 0x28, 0xa3, 0x0c, 0x02, 0x08, 0x00, 0xca, 0x56, 0x96,
+	0xb9, 0x40, 0x8e, 0x90, 0x33, 0x64, 0x95, 0x65, 0xf6, 0x39, 0x46, 0xaa, 0x72, 0x8f, 0xf4, 0x0c,
+	0x06, 0xc0, 0x00, 0x04, 0x17, 0xd9, 0x89, 0xdd, 0x33, 0xaf, 0xdf, 0xeb, 0xe9, 0x79, 0x03, 0x41,
+	0xdd, 0x70, 0xcd, 0x43, 0xd7, 0x73, 0x02, 0x87, 0x54, 0xaf, 0xbf, 0x31, 0x2c, 0xf7, 0x83, 0xa1,
+	0xbe, 0x84, 0xc6, 0x60, 0x69, 0x5c, 0xd1, 0x53, 0xc7, 0x5b, 0x1a, 0x01, 0xd9, 0x87, 0x72, 0x70,
+	0xe3, 0xd2, 0x6e, 0x61, 0xbf, 0xf0, 0xb4, 0x75, 0x44, 0x0e, 0xc5, 0xb2, 0x43, 0xbe, 0x66, 0x8a,
+	0x19, 0xb2, 0x05, 0xd5, 0x6b, 0xea, 0xf9, 0xa6, 0x63, 0x77, 0x8b, 0xb8, 0xa8, 0xae, 0xfe, 0x59,
+	0x00, 0x85, 0xa7, 0xc9, 0x97, 0xd0, 0xb8, 0x34, 0x7c, 0xaa, 0x2f, 0x38, 0x16, 0xc7, 0x68, 0x1c,
+	0xed, 0xa4, 0x31, 0x44, 0x1d, 0x80, 0xa2, 0x39, 0x0f, 0x01, 0x48, 0x13, 0xca, 0xb6, 0xb1, 0xa4,
+	0xdd, 0x12, 0xff, 0x25, 0xe1, 0x97, 0x79, 0xa0, 0x0b, 0x6d, 0x73, 0xe9, 0x3a, 0x5e, 0xa0, 0x07,
+	0xe6, 0x92, 0xfa, 0x81, 0xb1, 0x74, 0xbb, 0x0a, 0x66, 0x4a, 0xa4, 0x0d, 0xb5, 0xa5, 0x61, 0x9b,
+	0x0b, 0x0c, 0x76, 0x2b, 0x18, 0x69, 0x32, 0x28, 0xdf, 0xfc, 0x99, 0x76, 0xab, 0x3c, 0xff, 0x04,
+	0x1a, 0x86, 0x6d, 0x3b, 0x81, 0x11, 0x20, 0x9a, 0xdf, 0xad, 0xed, 0x97, 0x90, 0x4f, 0x27, 0xe6,
+	0xf3, 0x9a, 0xde, 0xbc, 0x33, 0xac, 0x15, 0x55, 0x9f, 0x41, 0x75, 0x48, 0x83, 0x4f, 0x8e, 0xf7,
+	0x31, 0xe6, 0x52, 0x88, 0x98, 0x99, 0xee, 0xf5, 0xf3, 0x84, 0x27, 0xfe, 0x7a, 0x11, 0xf2, 0x54,
+	0x7f, 0x2d, 0x40, 0xa9, 0xef, 0xba, 0x99, 0x1d, 0x0f, 0x40, 0x31, 0x99, 0x4c, 0xbe, 0xa5, 0x71,
+	0xd4, 0x4a, 0x8b, 0xc7, 0xf6, 0x2a, 0x28, 0x20, 0x08, 0xb5, 0xb6, 0x24, 0x2e, 0x88, 0xf4, 0x86,
+	0x25, 0x48, 0x07, 0xea, 0xf4, 0xb3, 0x19, 0xe8, 0x33, 0x67, 0x4e, 0x79, 0x03, 0x3a, 0x59, 0x19,
+	0xca, 0x26, 0x19, 0x7f, 0x21, 0xa3, 0xb1, 0x33, 0x17, 0xbd, 0x0d, 0xf9, 0x34, 0xa0, 0xe4, 0x8a,
+	0x46, 0x77, 0x36, 0x57, 0xc7, 0x5d, 0x61, 0xf5, 0x1e, 0x94, 0x0d, 0xd7, 0xf5, 0xb1, 0x30, 0xab,
+	0xd1, 0x94, 0xe9, 0x11, 0x15, 0x6a, 0x76, 0xd8, 0xa5, 0x88, 0x43, 0x3b, 0xce, 0x47, 0xed, 0x5b,
+	0x3f, 0x91, 0x0c, 0xf9, 0xea, 0x06, 0xf2, 0xa4, 0x05, 0x95, 0xd9, 0x95, 0xe7, 0xac, 0x5c, 0x3c,
+	0x26, 0xd6, 0xde, 0x27, 0x50, 0x8b, 0x73, 0x28, 0x02, 0xff, 0x16, 0x8a, 0x6e, 0x83, 0x72, 0xcd,
+	0xa2, 0x62, 0xfa, 0x7e, 0x2f, 0x40, 0x1d, 0xe9, 0x9f, 0x9a, 0x56, 0x40, 0x3d, 0xb6, 0xd2, 0x9c,
+	0xfb, 0xb8, 0xb2, 0x84, 0x2b, 0x1f, 0x43, 0x85, 0xcb, 0xf5, 0x71, 0x69, 0x29, 0x5f, 0x6f, 0x87,
+	0xdd, 0x09, 0x57, 0x67, 0x07, 0xe8, 0x63, 0x57, 0xd8, 0x2e, 0x0c, 0xf1, 0x13, 0xd4, 0x19, 0x50,
+	0x99, 0x87, 0xee, 0xc0, 0x6d, 0xa1, 0x5c, 0xac, 0x54, 0x78, 0x38, 0x23, 0xad, 0xb2, 0x49, 0x1a,
+	0x4e, 0x74, 0x28, 0x2d, 0x94, 0x5f, 0x57, 0xff, 0x2e, 0x44, 0x97, 0x2e, 0x87, 0x35, 0xb6, 0xd0,
+	0xf5, 0xe8, 0xc2, 0xfc, 0x2c, 0x78, 0xd7, 0x09, 0x1e, 0x28, 0xbf, 0x56, 0x32, 0x4b, 0x5c, 0xf5,
+	0x91, 0xde, 0x20, 0xa5, 0x98, 0x24, 0xaa, 0xb5, 0x8c, 0x4b, 0x6a, 0x6d, 0x1e, 0x10, 0x72, 0x17,
+	0x5a, 0xe1, 0x4d, 0xa2, 0x73, 0xdd, 0x58, 0x60, 0x65, 0x7e, 0x46, 0x25, 0xb2, 0x0b, 0x5b, 0x71,
+	0xfc, 0x92, 0xe2, 0xed, 0xfd, 0x8f, 0x17, 0x88, 0x31, 0x5c, 0xac, 0x2c, 0x4b, 0x30, 0xac, 0x73,
+	0x91, 0xbf, 0xa1, 0xc8, 0x33, 0xcb, 0xb9, 0x34, 0xac, 0x53, 0xcb, 0xb8, 0xf2, 0x99, 0xc8, 0xb9,
+	0xe9, 0x89, 0x43, 0xdc, 0x83, 0x8e, 0x7f, 0xe3, 0x07, 0x74, 0x89, 0x73, 0x6e, 0x2f, 0xcc, 0x2b,
+	0x9d, 0xa5, 0x8a, 0xd1, 0x75, 0xb7, 0x9c, 0x99, 0x61, 0xc9, 0x99, 0xd0, 0x19, 0x90, 0xe6, 0xca,
+	0xa7, 0x9e, 0x9c, 0x08, 0x1d, 0x82, 0xe9, 0xb2, 0x7d, 0x3a, 0x5b, 0x79, 0xe8, 0x3d, 0xac, 0x18,
+	0xf7, 0x07, 0x76, 0x19, 0xef, 0x04, 0xde, 0xca, 0x0f, 0x74, 0x6c, 0x95, 0xaf, 0x2f, 0x3c, 0x67,
+	0xa9, 0x7f, 0x08, 0x02, 0xd7, 0xe7, 0xb2, 0x6b, 0xaa, 0x07, 0xe5, 0x81, 0xbd, 0x70, 0xc8, 0x36,
+	0x34, 0xbc, 0x8f, 0x81, 0x1e, 0xb9, 0x4e, 0xc8, 0x70, 0x07, 0x9a, 0x38, 0x19, 0x33, 0x3d, 0xe5,
+	0x75, 0x6c, 0x29, 0x7a, 0x68, 0x1c, 0x0c, 0x79, 0x1d, 0x40, 0xf3, 0x8a, 0x0b, 0x15, 0xc5, 0xcb,
+	0x19, 0xdf, 0x93, 0xba, 0x80, 0x35, 0x15, 0xed, 0x9a, 0xda, 0x9b, 0x8d, 0x96, 0x67, 0xb9, 0xd1,
+	0x66, 0x2c, 0x92, 0xd1, 0x17, 0x05, 0xf1, 0x17, 0xb3, 0x42, 0x5e, 0xa8, 0x44, 0x1e, 0x41, 0x79,
+	0x6e, 0x04, 0xc6, 0x66, 0x5f, 0x08, 0xa0, 0xc1, 0x51, 0xc5, 0xb4, 0x3d, 0x06, 0x85, 0x55, 0x0e,
+	0xe7, 0x2d, 0xbf, 0xb4, 0x18, 0xc8, 0x70, 0xfc, 0xf0, 0xc2, 0xc9, 0x93, 0x87, 0xbc, 0x7c, 0xd3,
+	0x9e, 0x51, 0x5d, 0xa2, 0x80, 0xb1, 0x95, 0x1d, 0x98, 0x56, 0x18, 0xe3, 0xe6, 0xac, 0xb6, 0xa1,
+	0x75, 0x46, 0x03, 0xd6, 0xe0, 0x09, 0xfd, 0x69, 0x85, 0x86, 0xa0, 0x1e, 0xc2, 0x56, 0x1c, 0xf1,
+	0x5d, 0x1c, 0x28, 0x4a, 0xee, 0xa1, 0xa5, 0xe2, 0x6f, 0xf1, 0x54, 0xdc, 0x4e, 0xdc, 0x12, 0x83,
+	0xea, 0x29, 0x6c, 0x9d, 0x9b, 0x7e, 0x80, 0x97, 0xd5, 0x17, 0x10, 0xe4, 0x7f, 0x50, 0x5d, 0x70,
+	0x15, 0x21, 0xfb, 0x86, 0xc4, 0x3e, 0x31, 0x01, 0xb4, 0x92, 0x39, 0x0d, 0x0c, 0xd3, 0xe2, 0xcd,
+	0xab, 0x61, 0xdd, 0x76, 0x82, 0x23, 0x0a, 0xa3, 0xd1, 0xb9, 0xce, 0x3c, 0x42, 0x69, 0xca, 0x28,
+	0xea, 0x23, 0xe8, 0x0c, 0x6c, 0xdf, 0xa5, 0x33, 0xb6, 0x25, 0xaa, 0x2c, 0x99, 0xaa, 0xfa, 0x15,
+	0x10, 0x79, 0x81, 0x80, 0xdc, 0x43, 0xab, 0x75, 0xe6, 0x42, 0x4a, 0x1a, 0xf1, 0x07, 0xe8, 0x30,
+	0x06, 0xfc, 0xce, 0xc7, 0x5a, 0xbe, 0xc8, 0x6a, 0xc9, 0xbe, 0x94, 0xf9, 0x6a, 0x9e, 0x03, 0x91,
+	0xb1, 0x44, 0xf1, 0x87, 0x50, 0xe1, 0xae, 0x15, 0x61, 0x65, 0x1e, 0x1e, 0xf5, 0x31, 0x6c, 0x0b,
+	0xca, 0xfc, 0x77, 0x9e, 0xaa, 0x6f, 0x61, 0x27, 0xbd, 0x44, 0x40, 0xc7, 0x4f, 0x5a, 0x21, 0xef,
+	0x49, 0x53, 0xbf, 0x83, 0x6d, 0xc6, 0x87, 0xda, 0x7c, 0x7c, 0x62, 0x75, 0xff, 0x87, 0x4a, 0xa8,
+	0x6e, 0xed, 0x33, 0x40, 0x9a, 0x45, 0xf5, 0x05, 0xec, 0xa4, 0x37, 0x27, 0x72, 0x28, 0x8f, 0xac,
+	0xc9, 0xe1, 0x0b, 0xd5, 0x1b, 0x3e, 0x5c, 0xe7, 0xce, 0x55, 0x5c, 0x0f, 0xdb, 0x84, 0xdd, 0xd7,
+	0xe3, 0x87, 0x0f, 0x0d, 0x32, 0x72, 0x76, 0x71, 0x87, 0x70, 0x8e, 0x2d, 0xd3, 0xe6, 0x73, 0x5c,
+	0x78, 0xaa, 0xb0, 0x0d, 0x0b, 0xc7, 0xb2, 0x9c, 0x4f, 0x7c, 0x86, 0x6b, 0x99, 0xb9, 0x56, 0x72,
+	0xe6, 0x9a, 0x9b, 0xa5, 0xba, 0xcf, 0xa7, 0x38, 0x2c, 0x2d, 0xd8, 0xc6, 0xc8, 0xdc, 0xc1, 0x0f,
+	0x28, 0xd4, 0x93, 0xcf, 0xa5, 0x2e, 0x76, 0xf5, 0xa2, 0x7f, 0xa6, 0xe9, 0xd3, 0xf7, 0x63, 0x4d,
+	0x7f, 0x3b, 0x3c, 0xd1, 0x4e, 0x07, 0x43, 0xed, 0xa4, 0x7d, 0x0b, 0xbd, 0x64, 0x4b, 0xca, 0xf4,
+	0xc7, 0xe3, 0xe3, 0x76, 0x01, 0x9f, 0x9a, 0x8e, 0x14, 0x3c, 0x19, 0x1d, 0xbf, 0xd6, 0x26, 0xed,
+	0x22, 0x12, 0x69, 0x49, 0xe1, 0xd1, 0xf1, 0xa0, 0x5d, 0x3a, 0x18, 0x43, 0x2d, 0xfe, 0x6a, 0xd8,
+	0x85, 0x6d, 0x04, 0xd0, 0xdf, 0x4c, 0xfb, 0xd3, 0x74, 0x11, 0xc4, 0x4b, 0x12, 0x93, 0xb7, 0xc3,
+	0xe1, 0x60, 0x78, 0x86, 0x65, 0x76, 0xa0, 0x9d, 0x84, 0xb5, 0x1f, 0x07, 0x53, 0x5c, 0x5c, 0x3c,
+	0xf8, 0xa7, 0x00, 0xb5, 0xf8, 0x69, 0x44, 0xc8, 0xf1, 0xe8, 0x24, 0x07, 0x12, 0xf7, 0x26, 0x09,
+	0xed, 0xe2, 0xd5, 0xe4, 0xfd, 0x08, 0x11, 0x53, 0xcb, 0xc7, 0x13, 0x6d, 0xdc, 0x9f, 0xb0, 0x52,
+	0x45, 0x34, 0x67, 0x92, 0x4d, 0x20, 0x4c, 0x89, 0x31, 0x4b, 0xe2, 0x11, 0xb3, 0x32, 0x4e, 0xdb,
+	0x5e, 0x12, 0xee, 0xbf, 0x1a, 0x4d, 0x90, 0x5a, 0xb4, 0xad, 0xad, 0x64, 0x8a, 0x87, 0xc4, 0x2b,
+	0xe9, 0x1a, 0x27, 0xda, 0xb9, 0x36, 0x65, 0x60, 0xd5, 0x74, 0x8d, 0xb3, 0xfe, 0xe4, 0x15, 0xb6,
+	0xb0, 0x5d, 0x3b, 0xf8, 0xa3, 0x08, 0xf5, 0xc4, 0xec, 0xf0, 0x84, 0xb4, 0x77, 0xda, 0x70, 0xba,
+	0x7e, 0x42, 0xf7, 0x60, 0x57, 0xca, 0x30, 0xa4, 0x98, 0x7f, 0x01, 0x3f, 0x87, 0x1e, 0xe6, 0x27,
+	0x23, 0xd6, 0xa8, 0xbd, 0x07, 0x77, 0x33, 0x6b, 0x90, 0x0a, 0xcf, 0x95, 0xd0, 0x2e, 0xee, 0x64,
+	0x72, 0x42, 0x4e, 0x19, 0xef, 0xce, 0x7e, 0x26, 0x25, 0xb8, 0xeb, 0xc7, 0xa3, 0xf3, 0x73, 0xed,
+	0x98, 0xad, 0x52, 0x32, 0xe0, 0xe2, 0x38, 0x27, 0x61, 0x43, 0xd2, 0xe0, 0x2c, 0x27, 0xc0, 0xab,
+	0xac, 0xc1, 0x52, 0x2a, 0x9c, 0xaa, 0xc1, 0xc5, 0x38, 0xa4, 0x5c, 0x23, 0xf7, 0xa1, 0xbb, 0x96,
+	0x9e, 0x68, 0x17, 0xa3, 0x77, 0x98, 0xad, 0x1f, 0xfd, 0x52, 0xc6, 0xaf, 0xad, 0xd5, 0xa5, 0x65,
+	0xce, 0xfa, 0xe3, 0x01, 0xf9, 0x1e, 0xaa, 0xc2, 0xd0, 0xc9, 0x6e, 0xf2, 0xda, 0xa5, 0x4c, 0xbf,
+	0xd7, 0x5d, 0x4f, 0x84, 0xb7, 0x46, 0xbd, 0x45, 0xfa, 0x50, 0x8b, 0x8c, 0x99, 0x24, 0xeb, 0x32,
+	0x9e, 0xdf, 0xdb, 0xcb, 0xc9, 0xc4, 0x10, 0x67, 0x00, 0x89, 0x15, 0x93, 0x9e, 0xf4, 0x80, 0x64,
+	0x0c, 0xbc, 0x77, 0x2f, 0x37, 0x27, 0x03, 0x25, 0xb6, 0x2a, 0x01, 0xad, 0xf9, 0xb6, 0x04, 0xb4,
+	0xee, 0xc3, 0x08, 0x74, 0x01, 0x4d, 0xd9, 0x46, 0xc9, 0xfd, 0x6c, 0x5d, 0xd9, 0x80, 0x7b, 0x0f,
+	0x36, 0x64, 0x63, 0xb8, 0x11, 0x34, 0x65, 0x87, 0x94, 0xe0, 0x72, 0x5c, 0x57, 0x82, 0xcb, 0xb3,
+	0x55, 0xf5, 0xd6, 0xd7, 0x05, 0xf2, 0x92, 0x1f, 0x1a, 0xf3, 0xaf, 0xf4, 0xa1, 0x49, 0x66, 0x9a,
+	0x3e, 0x34, 0xd9, 0xea, 0x18, 0xc2, 0x65, 0x85, 0xff, 0x0b, 0xf9, 0xec, 0xdf, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x8d, 0x30, 0x01, 0x4e, 0x4f, 0x0e, 0x00, 0x00,
 }
diff --git a/api/v1alpha/api.proto b/api/v1alpha/api.proto
index fca5c92bdb..0f1944f37f 100644
--- a/api/v1alpha/api.proto
+++ b/api/v1alpha/api.proto
@@ -204,6 +204,9 @@ message PodFilter {
 
         // If not empty, the pods that have all of the annotations will be returned.
         repeated KeyValue annotations = 6;
+
+        // If not empty, the pods whose cgroup are listed will be returned.
+        repeated string cgroups = 7;
 }
 
 // ImageFilter defines the condition that the returned images need to satisfy in ListImages().
diff --git a/rkt/api_service.go b/rkt/api_service.go
index 63ed9b4b1c..fbbe5db7ee 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -191,6 +191,14 @@ func satisfiesPodFilter(pod v1alpha.Pod, manifest schema.PodManifest, filter v1a
 		}
 	}
 
+	// Filter according to the cgroup.
+	if len(filter.Cgroups) > 0 {
+		s := set.NewString(filter.Cgroups...)
+		if !s.Has(pod.Cgroup) {
+			return false
+		}
+	}
+
 	return true
 }
 

From fa65282d14152056bbe3d12e616476b9e261cfce Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 24 Mar 2016 18:40:06 -0700
Subject: [PATCH 0043/1304] tests: Add tests for api service to test the
 cgroup.

Test the cgroup should be returned for running pods.
Test the cgroup filter should work for running pods.
---
 tests/rkt_api_service_test.go | 115 ++++++++++++++++++++++++++++++++++
 tests/rkt_tests.go            |   3 +
 tests/testutils/utils.go      |  10 +++
 3 files changed, 128 insertions(+)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 9bb3c0d729..80a10709c7 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -23,6 +23,7 @@ import (
 	"strings"
 	"syscall"
 	"testing"
+	"time"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -148,6 +149,17 @@ func checkPod(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, hasAppStat
 	checkPodApps(t, podInfo.apps, p.Apps, hasAppState)
 	checkPodNetworks(t, podInfo.networks, p.Networks)
 
+	expectedCgroupSuffix := ""
+	if podInfo.state == "running" {
+		machineID := fmt.Sprintf("rkt-%s", p.Id)
+		escapedmID := strings.Replace(machineID, "-", "\\x2d", -1)
+		expectedCgroupSuffix = fmt.Sprintf("/machine-%s.scope", escapedmID)
+	}
+
+	if !strings.HasSuffix(p.Cgroup, expectedCgroupSuffix) {
+		t.Errorf("Expected the cgroup suffix to have %q, but saw %q", expectedCgroupSuffix, p.Cgroup)
+	}
+
 	if hasManifest {
 		var mfst schema.PodManifest
 		err := json.Unmarshal(podInfo.manifest, &mfst)
@@ -406,3 +418,106 @@ func TestAPIServiceListInspectImages(t *testing.T) {
 		checkImageDetails(t, ctx, m)
 	}
 }
+
+func TestAPIServiceCroup(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	svc := startAPIService(t, ctx)
+	defer stopAPIService(t, svc)
+
+	c, conn := newAPIClientOrFail(t, "localhost:15441")
+	defer conn.Close()
+
+	aciFileName := patchTestACI("rkt-inspect-interactive.aci", "--exec=/inspect --read-stdin")
+	defer os.Remove(aciFileName)
+
+	runCmd := fmt.Sprintf("%s --insecure-options=image run --interactive %s", ctx.Cmd(), aciFileName)
+	child := spawnOrFail(t, runCmd)
+
+	var resp *v1alpha.ListPodsResponse
+	var err error
+	done := make(chan struct{})
+
+	// Wait the pods to be running.
+	go func() {
+		for {
+			// ListPods(detail=false).
+			resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
+			if err != nil {
+				t.Fatalf("Unexpected error: %v", err)
+			}
+
+			if len(resp.Pods) != 0 {
+				allRunning := true
+				for _, p := range resp.Pods {
+					if p.State != v1alpha.PodState_POD_STATE_RUNNING {
+						allRunning = false
+						break
+					}
+				}
+				if allRunning {
+					t.Logf("Pods are running")
+					close(done)
+					return
+				}
+			}
+			t.Logf("Pods are not in RUNNING state")
+			time.Sleep(time.Second)
+		}
+	}()
+
+	testutils.WaitOrTimeout(t, time.Second*10, done)
+
+	var cgroups []string
+
+	for _, p := range resp.Pods {
+		checkPodBasics(t, ctx, p)
+
+		// Test InspectPod().
+		inspectResp, err := c.InspectPod(context.Background(), &v1alpha.InspectPodRequest{Id: p.Id})
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+		checkPodDetails(t, ctx, inspectResp.Pod)
+		if p.Cgroup != "" {
+			cgroups = append(cgroups, p.Cgroup)
+		}
+	}
+
+	// ListPods(detail=true). Filter according to the cgroup.
+	resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{
+		Detail:  true,
+		Filters: []*v1alpha.PodFilter{{Cgroups: cgroups}},
+	})
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	if len(resp.Pods) == 0 {
+		t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
+	}
+
+	for _, p := range resp.Pods {
+		checkPodDetails(t, ctx, p)
+	}
+
+	// Terminate the pods.
+	if err := child.SendLine("Good bye"); err != nil {
+		t.Fatalf("Failed to send message to the pod: %v", err)
+	}
+	waitOrFail(t, child, 0)
+
+	// Check that there's no cgroups returned for non-running pods.
+	cgroups = []string{}
+	resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
+	for _, p := range resp.Pods {
+		checkPodBasics(t, ctx, p)
+		if p.Cgroup != "" {
+			cgroups = append(cgroups, p.Cgroup)
+		}
+	}
+	if len(cgroups) != 0 {
+		t.Errorf("Unexpected cgroup returned by pods: %v", cgroups)
+	}
+}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index ebe37264dc..4709950969 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -428,6 +428,9 @@ func parsePodInfoOutput(t *testing.T, result string, p *podInfo) {
 		case "state":
 			p.state = tuples[1]
 		case "networks":
+			if tuples[1] == "" {
+				break
+			}
 			networks := strings.Split(tuples[1], ",")
 			for _, n := range networks {
 				fields := strings.Split(n, ":")
diff --git a/tests/testutils/utils.go b/tests/testutils/utils.go
index 1f25c9a6b6..e653c81f45 100644
--- a/tests/testutils/utils.go
+++ b/tests/testutils/utils.go
@@ -17,6 +17,8 @@ package testutils
 import (
 	"fmt"
 	"os"
+	"testing"
+	"time"
 )
 
 func GetValueFromEnvOrPanic(envVar string) string {
@@ -26,3 +28,11 @@ func GetValueFromEnvOrPanic(envVar string) string {
 	}
 	return path
 }
+
+func WaitOrTimeout(t *testing.T, timeout time.Duration, notify chan struct{}) {
+	select {
+	case <-time.After(timeout):
+		t.Fatalf("Timeout after %v", timeout)
+	case <-notify:
+	}
+}

From 0976e9e31001f1d3c3d13d24cd0ebecb81ae7630 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 31 Mar 2016 12:26:40 +0200
Subject: [PATCH 0044/1304] api_service: fix typos

Follow up to https://github.com/coreos/rkt/pull/2331
---
 tests/rkt_api_service_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 80a10709c7..d3dd9244bd 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -419,7 +419,7 @@ func TestAPIServiceListInspectImages(t *testing.T) {
 	}
 }
 
-func TestAPIServiceCroup(t *testing.T) {
+func TestAPIServiceCgroup(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
@@ -502,7 +502,7 @@ func TestAPIServiceCroup(t *testing.T) {
 		checkPodDetails(t, ctx, p)
 	}
 
-	// Terminate the pods.
+	// Terminate the pod.
 	if err := child.SendLine("Good bye"); err != nil {
 		t.Fatalf("Failed to send message to the pod: %v", err)
 	}

From 64f7216c8b35da8fd46eda0c9723a0c532cc0ddc Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Fri, 11 Mar 2016 14:26:51 +0100
Subject: [PATCH 0045/1304] docs: Deduplicate the global options table

The redundancy was mind-boggling. This just replaces all the tables in
subcommands with a link to a global options section in general
commands documentation. This also saves us the requirement to remember
to update all the tables, when new global option is added.
---
 Documentation/subcommands/api-service.md      | 10 +---------
 Documentation/subcommands/cat-manifest.md     | 10 +---------
 Documentation/subcommands/enter.md            | 10 +---------
 Documentation/subcommands/fetch.md            | 10 +---------
 Documentation/subcommands/gc.md               | 10 +---------
 Documentation/subcommands/image.md            | 10 +---------
 Documentation/subcommands/list.md             | 10 +---------
 Documentation/subcommands/metadata-service.md | 10 +---------
 Documentation/subcommands/prepare.md          | 10 +---------
 Documentation/subcommands/rm.md               | 10 +---------
 Documentation/subcommands/run-prepared.md     | 10 +---------
 Documentation/subcommands/run.md              | 10 +---------
 Documentation/subcommands/status.md           | 10 +---------
 Documentation/subcommands/trust.md            | 10 +---------
 14 files changed, 14 insertions(+), 126 deletions(-)

diff --git a/Documentation/subcommands/api-service.md b/Documentation/subcommands/api-service.md
index 2e203b69dd..e2795e4d51 100644
--- a/Documentation/subcommands/api-service.md
+++ b/Documentation/subcommands/api-service.md
@@ -26,12 +26,4 @@ Here is a small [Go program](../../api/v1alpha/client_example.go) that illustrat
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
\ No newline at end of file
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index 928a40610f..d350b26add 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -18,12 +18,4 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
\ No newline at end of file
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/enter.md b/Documentation/subcommands/enter.md
index 4ca3214e8d..1bedb20512 100644
--- a/Documentation/subcommands/enter.md
+++ b/Documentation/subcommands/enter.md
@@ -28,12 +28,4 @@ Work in progress. Please contribute!
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/fetch.md b/Documentation/subcommands/fetch.md
index 7bac28ee6d..460410b263 100644
--- a/Documentation/subcommands/fetch.md
+++ b/Documentation/subcommands/fetch.md
@@ -92,14 +92,6 @@ Note that the configuration kind for images downloaded via https:// and images d
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
+See the table with [global options in general commands documentation](../commands.md#global-options).
 
 [appc-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md
diff --git a/Documentation/subcommands/gc.md b/Documentation/subcommands/gc.md
index 336f78057e..326732f22d 100644
--- a/Documentation/subcommands/gc.md
+++ b/Documentation/subcommands/gc.md
@@ -32,12 +32,4 @@ Garbage collecting pod "f07a4070-79a9-4db0-ae65-a090c9c393a3"
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
\ No newline at end of file
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 3eda8093cd..150f7ed364 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -143,12 +143,4 @@ rkt: 2 image(s) successfully removed
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/list.md b/Documentation/subcommands/list.md
index 0fea9b367e..fca4fccfd5 100644
--- a/Documentation/subcommands/list.md
+++ b/Documentation/subcommands/list.md
@@ -29,12 +29,4 @@ UUID                                   APP     IMAGE NAME              IMAGE ID
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/metadata-service.md b/Documentation/subcommands/metadata-service.md
index 3af2a77859..41839da1dc 100644
--- a/Documentation/subcommands/metadata-service.md
+++ b/Documentation/subcommands/metadata-service.md
@@ -34,12 +34,4 @@ See [App Container specification](https://github.com/appc/spec/blob/master/spec/
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
\ No newline at end of file
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 2cc71d0e02..9b1793dd91 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -55,12 +55,4 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/rm.md b/Documentation/subcommands/rm.md
index a4990c66bb..30b888201f 100644
--- a/Documentation/subcommands/rm.md
+++ b/Documentation/subcommands/rm.md
@@ -17,12 +17,4 @@ rkt rm --uuid-file=/run/rkt-uuids/mypod
 
 ### Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
\ No newline at end of file
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/run-prepared.md b/Documentation/subcommands/run-prepared.md
index 7b7e7fb2e6..dcf7b75ad3 100644
--- a/Documentation/subcommands/run-prepared.md
+++ b/Documentation/subcommands/run-prepared.md
@@ -55,12 +55,4 @@ c9fad0e6    etcd    coreos.com/etcd prepared
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 7caafb715c..0040dab16a 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -357,12 +357,4 @@ For more details see the [hacking documentation](../hacking.md).
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/status.md b/Documentation/subcommands/status.md
index 0f7a8aedc7..0db25fb261 100644
--- a/Documentation/subcommands/status.md
+++ b/Documentation/subcommands/status.md
@@ -24,12 +24,4 @@ If the pod is still running, you can wait for it to finish and then get the stat
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
\ No newline at end of file
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/trust.md b/Documentation/subcommands/trust.md
index 64e57bd360..68611f0095 100644
--- a/Documentation/subcommands/trust.md
+++ b/Documentation/subcommands/trust.md
@@ -94,14 +94,6 @@ $ find /etc/rkt/trustedkeys/
 
 ## Global options
 
-| Flag | Default | Options | Description |
-| --- | --- | --- | --- |
-| `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
-| `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
-| `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
+See the table with [global options in general commands documentation](../commands.md#global-options).
 
 [appc-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md

From e525b6c4ed3aa369b5f220e2808a78d5063bf7f7 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Mon, 7 Mar 2016 15:34:31 +0100
Subject: [PATCH 0046/1304] docs, flag, image, pubkey: Allow downloading
 insecure GPG keys

When fetching images via a discovery mechanism, it is also possible to
fetch the keys via the discovery and then trust them to verify the
image signature. For the key to be fetched, HTTPS connection is
required and the server's certificate must be successfully
verified. Trusting the key puts it into a persistent keystore. This
makes it hard to test it with a local server, which usually doesn't
have a valid certificate.

The "pubkey" option of the --insecure-options flag makes fetching keys
from insecure places possible, that is - from HTTP connections or from
servers with an invalid certificate.
---
 Documentation/commands.md |  4 +--
 rkt/flag/secflags.go      | 12 ++++++---
 rkt/image/namefetcher.go  | 20 ++++++++++-----
 rkt/pubkey/pubkey.go      | 54 +++++++++++++++++++++++++++++++++------
 4 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index f983518224..d40876c2f8 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -72,10 +72,10 @@ In addition to the flags used by individual `rkt` commands, `rkt` has a set of g
 | --- | --- | --- | --- |
 | `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
 | `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
+| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**pubkey**: Allow fetching pubkeys via insecure connections (via HTTP connections or from servers with unverified certificates). This slightly extends the meaning of the `--trust-keys-from-https` flag.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
 | `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
 | `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
-| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from https |
+| `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from HTTPS (or HTTP if the insecure `pubkey` option is also specified) |
 | `--user-config` |  `` | A directory path | Path to the user configuration directory |
 
 ## Logging
diff --git a/rkt/flag/secflags.go b/rkt/flag/secflags.go
index e1badf0528..817c3ef485 100644
--- a/rkt/flag/secflags.go
+++ b/rkt/flag/secflags.go
@@ -20,12 +20,13 @@ const (
 	insecureTLS
 	insecureOnDisk
 	insecureHTTP
+	insecurePubKey
 
-	insecureAll = (insecureImage | insecureTLS | insecureOnDisk | insecureHTTP)
+	insecureAll = (insecureImage | insecureTLS | insecureOnDisk | insecureHTTP | insecurePubKey)
 )
 
 var (
-	insecureOptions = []string{"none", "image", "tls", "ondisk", "http", "all"}
+	insecureOptions = []string{"none", "image", "tls", "ondisk", "http", "pubkey", "all"}
 
 	insecureOptionsMap = map[string]int{
 		insecureOptions[0]: insecureNone,
@@ -33,7 +34,8 @@ var (
 		insecureOptions[2]: insecureTLS,
 		insecureOptions[3]: insecureOnDisk,
 		insecureOptions[4]: insecureHTTP,
-		insecureOptions[5]: insecureAll,
+		insecureOptions[5]: insecurePubKey,
+		insecureOptions[6]: insecureAll,
 	}
 )
 
@@ -69,6 +71,10 @@ func (sf *SecFlags) AllowHTTP() bool {
 	return sf.hasFlag(insecureHTTP)
 }
 
+func (sf *SecFlags) ConsiderInsecurePubKeys() bool {
+	return sf.hasFlag(insecurePubKey)
+}
+
 func (sf *SecFlags) SkipAllSecurityChecks() bool {
 	return sf.hasFlag(insecureAll)
 }
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index fe71fe0e82..9fded8f7f7 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -199,13 +199,19 @@ func (f *nameFetcher) maybeFetchPubKeys(appName string) {
 		log.Printf("keys already exist for prefix %q, not fetching again", appName)
 		return
 	}
-	if !f.InsecureFlags.SkipTLSCheck() {
+	allowHTTP := false
+	if f.InsecureFlags.ConsiderInsecurePubKeys() {
+		log.Printf("signing keys may be downloaded from an insecure connection")
+		allowHTTP = f.InsecureFlags.AllowHTTP()
+	}
+	if !f.InsecureFlags.SkipTLSCheck() || f.InsecureFlags.ConsiderInsecurePubKeys() {
 		m := &pubkey.Manager{
-			AuthPerHost:        f.Headers,
-			InsecureAllowHTTP:  false,
-			TrustKeysFromHTTPS: f.TrustKeysFromHTTPS,
-			Ks:                 f.Ks,
-			Debug:              f.Debug,
+			AuthPerHost:          f.Headers,
+			InsecureAllowHTTP:    allowHTTP,
+			InsecureSkipTLSCheck: f.InsecureFlags.SkipTLSCheck(),
+			TrustKeysFromHTTPS:   f.TrustKeysFromHTTPS,
+			Ks:                   f.Ks,
+			Debug:                f.Debug,
 		}
 		pkls, err := m.GetPubKeyLocations(appName)
 		// We do not bail out here, because if fetching the
@@ -233,7 +239,7 @@ func (f *nameFetcher) checkIdentity(appName string, ascFile io.ReadSeeker) error
 	empty := bytes.NewReader([]byte{})
 	if _, err := f.Ks.CheckSignature(appName, empty, ascFile); err != nil {
 		if err == pgperrors.ErrUnknownIssuer {
-			log.Printf("If you expected the signing key to change, try running:")
+			log.Printf("if you expected the signing key to change, try running:")
 			log.Printf("    rkt trust --prefix %q", appName)
 		}
 		if _, ok := err.(pgperrors.SignatureError); !ok {
diff --git a/rkt/pubkey/pubkey.go b/rkt/pubkey/pubkey.go
index 933151ad67..000dec8c53 100644
--- a/rkt/pubkey/pubkey.go
+++ b/rkt/pubkey/pubkey.go
@@ -16,14 +16,17 @@ package pubkey
 
 import (
 	"bufio"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/coreos/rkt/pkg/keystore"
 	rktlog "github.com/coreos/rkt/pkg/log"
@@ -36,11 +39,12 @@ import (
 )
 
 type Manager struct {
-	AuthPerHost        map[string]config.Headerer
-	InsecureAllowHTTP  bool
-	TrustKeysFromHTTPS bool
-	Ks                 *keystore.Keystore
-	Debug              bool
+	AuthPerHost          map[string]config.Headerer
+	InsecureAllowHTTP    bool
+	InsecureSkipTLSCheck bool
+	TrustKeysFromHTTPS   bool
+	Ks                   *keystore.Keystore
+	Debug                bool
 }
 
 type AcceptOption int
@@ -157,6 +161,9 @@ func (m *Manager) metaDiscoverPubKeyLocations(prefix string) ([]string, error) {
 	if m.InsecureAllowHTTP {
 		insecure = insecure | discovery.InsecureHttp
 	}
+	if m.InsecureSkipTLSCheck {
+		insecure = insecure | discovery.InsecureTls
+	}
 	ep, attempts, err := discovery.DiscoverPublicKeys(*app, hostHeaders, insecure)
 	if err != nil {
 		return nil, err
@@ -182,14 +189,14 @@ func (m *Manager) getPubKey(u *url.URL) (*os.File, error) {
 		}
 		fallthrough
 	case "https":
-		return downloadKey(u)
+		return downloadKey(u, m.InsecureSkipTLSCheck)
 	}
 
 	return nil, fmt.Errorf("only local files and http or https URLs supported")
 }
 
 // downloadKey retrieves the file, storing it in a deleted tempfile
-func downloadKey(u *url.URL) (*os.File, error) {
+func downloadKey(u *url.URL, skipTLSCheck bool) (*os.File, error) {
 	tf, err := ioutil.TempFile("", "")
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error creating tempfile"), err)
@@ -204,7 +211,8 @@ func downloadKey(u *url.URL) (*os.File, error) {
 
 	// TODO(krnowak): we should probably apply credential headers
 	// from config here
-	res, err := http.Get(u.String())
+	client := getClient(skipTLSCheck)
+	res, err := client.Get(u.String())
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error getting key"), err)
 	}
@@ -227,6 +235,36 @@ func downloadKey(u *url.URL) (*os.File, error) {
 	return retTf, nil
 }
 
+func getClient(skipTLSCheck bool) *http.Client {
+	if !skipTLSCheck {
+		return http.DefaultClient
+	}
+	client := *http.DefaultClient
+	var tr *http.Transport
+	// default transport is hidden behind the RoundTripper
+	// interface, so we can't easily make a copy of it
+	if transport, ok := http.DefaultTransport.(*http.Transport); ok {
+		trCopy := *transport
+		tr = &trCopy
+	} else {
+		// meh, an already outdated copy from golang's
+		// net/http DefaultTransport defintion, without the
+		// ExpectContinueTimeout field set, because it exists
+		// only in go1.6
+		tr = &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+			Dial: (&net.Dialer{
+				Timeout:   30 * time.Second,
+				KeepAlive: 30 * time.Second,
+			}).Dial,
+			TLSHandshakeTimeout: 10 * time.Second,
+		}
+	}
+	tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+	client.Transport = tr
+	return &client
+}
+
 // displayKey shows the key summary
 func displayKey(prefix, location string, key *os.File) error {
 	defer key.Seek(0, os.SEEK_SET)

From c0d0ef704d00c1ce62c200371b909442dc134d64 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Thu, 31 Mar 2016 12:09:15 +0200
Subject: [PATCH 0047/1304] godeps: Update gexpect

This gets some fixes in gexpect, so the tests will be less likely to
fail.
---
 Godeps/Godeps.json                            |  4 +-
 .../github.com/coreos/gexpect/examples/ftp.go | 27 ----------
 .../coreos/gexpect/examples/ping.go           | 15 ------
 .../coreos/gexpect/examples/python.go         | 22 --------
 .../coreos/gexpect/examples/screen.go         | 53 -------------------
 .../src/github.com/coreos/gexpect/gexpect.go  | 24 ++++-----
 6 files changed, 13 insertions(+), 132 deletions(-)
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/gexpect/examples/ftp.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/gexpect/examples/ping.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/gexpect/examples/python.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/gexpect/examples/screen.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 90834e6389..9bc7b578e9 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/rkt",
 	"GoVersion": "go1.5",
+	"GodepVersion": "v60",
 	"Packages": [
 		"./...",
 		"github.com/appc/spec/actool",
@@ -214,7 +215,8 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/gexpect",
-			"Rev": "0b5620b695de57d5fcea082b9a062157ac60ed73"
+			"Comment": "v0.1.0",
+			"Rev": "ca42424d18c76d0d51a4cccd830d11878e9e5c17"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-iptables/iptables",
diff --git a/Godeps/_workspace/src/github.com/coreos/gexpect/examples/ftp.go b/Godeps/_workspace/src/github.com/coreos/gexpect/examples/ftp.go
deleted file mode 100644
index 28fbbae4f4..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/gexpect/examples/ftp.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package main
-
-import gexpect "github.com/coreos/gexpect"
-import "log"
-
-func main() {
-	log.Printf("Testing Ftp... ")
-
-	child, err := gexpect.Spawn("ftp ftp.openbsd.org")
-	if err != nil {
-		panic(err)
-	}
-	child.Expect("Name")
-	child.SendLine("anonymous")
-	child.Expect("Password")
-	child.SendLine("pexpect@sourceforge.net")
-	child.Expect("ftp> ")
-	child.SendLine("cd /pub/OpenBSD/3.7/packages/i386")
-	child.Expect("ftp> ")
-	child.SendLine("bin")
-	child.Expect("ftp> ")
-	child.SendLine("prompt")
-	child.Expect("ftp> ")
-	child.SendLine("pwd")
-	child.Expect("ftp> ")
-	log.Printf("Success\n")
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/gexpect/examples/ping.go b/Godeps/_workspace/src/github.com/coreos/gexpect/examples/ping.go
deleted file mode 100644
index a39dd68f2b..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/gexpect/examples/ping.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package main
-
-import gexpect "github.com/coreos/gexpect"
-import "log"
-
-func main() {
-	log.Printf("Testing Ping interact... \n")
-
-	child, err := gexpect.Spawn("ping -c8 127.0.0.1")
-	if err != nil {
-		panic(err)
-	}
-	child.Interact()
-	log.Printf("Success\n")
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/gexpect/examples/python.go b/Godeps/_workspace/src/github.com/coreos/gexpect/examples/python.go
deleted file mode 100644
index ef8be7cb6b..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/gexpect/examples/python.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package main
-
-import "github.com/coreos/gexpect"
-import "fmt"
-
-func main() {
-	fmt.Printf("Starting python.. \n")
-	child, err := gexpect.Spawn("python")
-	if err != nil {
-		panic(err)
-	}
-	fmt.Printf("Expecting >>>.. \n")
-	child.Expect(">>>")
-	fmt.Printf("print 'Hello World'..\n")
-	child.SendLine("print 'Hello World'")
-	child.Expect(">>>")
-
-	fmt.Printf("Interacting.. \n")
-	child.Interact()
-	fmt.Printf("Done \n")
-	child.Close()
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/gexpect/examples/screen.go b/Godeps/_workspace/src/github.com/coreos/gexpect/examples/screen.go
deleted file mode 100644
index dfdd74747f..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/gexpect/examples/screen.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package main
-
-import "github.com/coreos/gexpect"
-import "fmt"
-import "strings"
-
-func main() {
-	waitChan := make(chan string)
-
-	fmt.Printf("Starting screen.. \n")
-
-	child, err := gexpect.Spawn("screen")
-	if err != nil {
-		panic(err)
-	}
-
-	sender, reciever := child.AsyncInteractChannels()
-	go func() {
-		waitString := ""
-		count := 0
-		for {
-			select {
-			case waitString = <-waitChan:
-				count++
-			case msg, open := <-reciever:
-				if !open {
-					return
-				}
-				fmt.Printf("Recieved: %s\n", msg)
-
-				if strings.Contains(msg, waitString) {
-					if count >= 1 {
-						waitChan <- msg
-						count -= 1
-					}
-				}
-			}
-		}
-	}()
-	wait := func(str string) {
-		waitChan <- str
-		<-waitChan
-	}
-	fmt.Printf("Waiting until started.. \n")
-	wait(" ")
-	fmt.Printf("Sending Enter.. \n")
-	sender <- "\n"
-	wait("$")
-	fmt.Printf("Sending echo.. \n")
-	sender <- "echo Hello World\n"
-	wait("Hello World")
-	fmt.Printf("Received echo. \n")
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/gexpect/gexpect.go b/Godeps/_workspace/src/github.com/coreos/gexpect/gexpect.go
index 63bbf00270..4ea620ef6e 100644
--- a/Godeps/_workspace/src/github.com/coreos/gexpect/gexpect.go
+++ b/Godeps/_workspace/src/github.com/coreos/gexpect/gexpect.go
@@ -71,7 +71,7 @@ func (buf *buffer) ReadRune() (r rune, size int, err error) {
 		if err != nil {
 			return 0, 0, err
 		}
-		if utf8.FullRune(chunk) {
+		if utf8.FullRune(chunk[:n]) {
 			r, rL := utf8.DecodeRune(chunk)
 			if n > rL {
 				buf.PutBack(chunk[rL:n])
@@ -90,7 +90,7 @@ func (buf *buffer) ReadRune() (r rune, size int, err error) {
 		}
 		l = l + fn
 
-		if utf8.FullRune(chunk) {
+		if utf8.FullRune(chunk[:l]) {
 			r, rL := utf8.DecodeRune(chunk)
 			if buf.collect {
 				buf.collection.WriteRune(r)
@@ -331,7 +331,7 @@ func (expect *ExpectSubprocess) Expect(searchString string) (e error) {
 				if i == target {
 					unreadIndex := m + i - offset
 					if len(chunk) > unreadIndex {
-						expect.buf.PutBack(chunk[unreadIndex:])
+						expect.buf.PutBack(chunk[unreadIndex:n])
 					}
 					return nil
 				}
@@ -378,27 +378,26 @@ func (expect *ExpectSubprocess) Interact() {
 }
 
 func (expect *ExpectSubprocess) ReadUntil(delim byte) ([]byte, error) {
-	join := make([]byte, 1, 512)
+	join := make([]byte, 0, 512)
 	chunk := make([]byte, 255)
 
 	for {
-
 		n, err := expect.buf.Read(chunk)
 
-		if err != nil {
-			return join, err
-		}
-
 		for i := 0; i < n; i++ {
 			if chunk[i] == delim {
 				if len(chunk) > i+1 {
-					expect.buf.PutBack(chunk[i+1:])
+					expect.buf.PutBack(chunk[i+1:n])
 				}
 				return join, nil
 			} else {
 				join = append(join, chunk[i])
 			}
 		}
+
+		if err != nil {
+			return join, err
+		}
 	}
 }
 
@@ -408,10 +407,7 @@ func (expect *ExpectSubprocess) Wait() error {
 
 func (expect *ExpectSubprocess) ReadLine() (string, error) {
 	str, err := expect.ReadUntil('\n')
-	if err != nil {
-		return "", err
-	}
-	return string(str), nil
+	return string(str), err
 }
 
 func _start(expect *ExpectSubprocess) (*ExpectSubprocess, error) {

From 02939a31dda76543928a7ac4078fc3fbba9ec96b Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 29 Mar 2016 17:18:05 +0200
Subject: [PATCH 0048/1304] tests/aws.sh: add test for Fedora 24

---
 tests/aws.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/aws.sh b/tests/aws.sh
index 5e1953cf79..a3163d6dc7 100755
--- a/tests/aws.sh
+++ b/tests/aws.sh
@@ -29,6 +29,7 @@ if [ "$DISTRO" = "all" ] ; then
   gnome-terminal \
 	--tab --command="$SCRIPTPATH/aws.sh fedora-22      $GIT_URL $GIT_BRANCH $FLAVOR" \
 	--tab --command="$SCRIPTPATH/aws.sh fedora-23      $GIT_URL $GIT_BRANCH $FLAVOR" \
+	--tab --command="$SCRIPTPATH/aws.sh fedora-24      $GIT_URL $GIT_BRANCH $FLAVOR" \
 	--tab --command="$SCRIPTPATH/aws.sh fedora-rawhide $GIT_URL $GIT_BRANCH $FLAVOR" \
 	--tab --command="$SCRIPTPATH/aws.sh ubuntu-1604    $GIT_URL $GIT_BRANCH $FLAVOR" \
 	--tab --command="$SCRIPTPATH/aws.sh ubuntu-1510    $GIT_URL $GIT_BRANCH $FLAVOR" \
@@ -60,6 +61,13 @@ elif [ "$DISTRO" = "fedora-23" ] ; then
 
   # Workarounds
   DISABLE_SELINUX=true
+elif [ "$DISTRO" = "fedora-24" ] ; then
+  # Fedora-Cloud-Base-24_Alpha-7.x86_64-eu-central-1-HVM-standard-0
+  AMI=ami-748b6d1b
+  AWS_USER=fedora
+
+  # Workarounds
+  DISABLE_OVERLAY=true
 elif [ "$DISTRO" = "fedora-rawhide" ] ; then
   # Fedora-Cloud-Base-Rawhide-20160321.0.x86_64-eu-central-1-HVM-standard-0
   AMI=ami-69967006

From c02ccb91b4cd066529e9484169c26375d2dc659f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 17 Mar 2016 15:10:48 +0100
Subject: [PATCH 0049/1304] stage1: implement docker volume semantics

Docker volumes are initialized with the files in the image if they
exist, unless a host directory is mounted there (see
https://docs.docker.com/engine/userguide/containers/dockervolumes/#data-volumes).

However, when we convert docker images with docker2aci, we convert
docker volumes to mount points, and if the user doesn't specify a host
path for mounting, we mount an empty volume, effectively masking the
files in the image.

To fix this, we create a special case for the case when application uses
an image converted from docker and we mount an implicit empty volume.
In that case, we copy the files from the image to the volume, so docker
images work correctly.

Note that we won't do this if the user explicitly specifies an empty
volume or if they mount a host directory.
---
 stage1/init/common/kvm_mount.go |  23 +++++--
 stage1/init/common/mount.go     | 111 ++++++++++++++++++++++++++------
 stage1/init/common/pod.go       |  46 +++++--------
 3 files changed, 123 insertions(+), 57 deletions(-)

diff --git a/stage1/init/common/kvm_mount.go b/stage1/init/common/kvm_mount.go
index b3e6cc68c7..08b37f007b 100644
--- a/stage1/init/common/kvm_mount.go
+++ b/stage1/init/common/kvm_mount.go
@@ -38,6 +38,7 @@ package common
 import (
 	"crypto/md5"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -172,7 +173,7 @@ func AppToSystemdMountUnits(root string, appName types.ACName, volumes []types.V
 		vols[v.Name] = v
 	}
 
-	mounts := GenerateMounts(ra, vols)
+	mounts := generateMounts(ra, vols)
 	for _, m := range mounts {
 		vol := vols[m.Volume]
 
@@ -180,18 +181,26 @@ func AppToSystemdMountUnits(root string, appName types.ACName, volumes []types.V
 		hashedVolName := makeHashFromVolumeName(vol.Name.String())
 
 		whatPath := filepath.Join(stage1MntDir, hashedVolName)
-
 		whatFullPath := filepath.Join(root, whatPath)
 
-		// set volume permissions
-		if err := PrepareMountpoints(whatFullPath, &vol); err != nil {
-			return err
-		}
-
 		// destination relative to stage1 rootfs and relative to pod root
 		wherePath := filepath.Join(common.RelAppRootfsPath(appName), m.Path)
 		whereFullPath := filepath.Join(root, wherePath)
 
+		// create shared volumes directory
+		stage1MntPath := filepath.Join(root, stage1MntDir)
+		if err := os.MkdirAll(stage1MntPath, sharedVolPerm); err != nil {
+			return errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
+		}
+		if err := os.Chmod(stage1MntPath, sharedVolPerm); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", stage1MntPath), err)
+		}
+
+		// prepare empty volumes
+		if err := PrepareMountpoints(whatFullPath, whereFullPath, &vol, m.dockerImplicit); err != nil {
+			return errwrap.Wrap(errors.New("error preparing empty mount points"), err)
+		}
+
 		// assertion to make sure that "what" exists (created earlier by PodToSystemdHostMountUnits)
 		diag.Printf("checking required source path: %q", whatFullPath)
 		if _, err := os.Stat(whatFullPath); os.IsNotExist(err) {
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 4ed5150917..9045268552 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -18,12 +18,23 @@ import (
 	"fmt"
 	"os"
 	"strconv"
+	"syscall"
+
+	"github.com/coreos/rkt/pkg/fileutil"
+	"github.com/coreos/rkt/pkg/uid"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 )
 
+// mountWrapper is a wrapper around a schema.Mount with an additional field indicating
+// whether it is an implicit empty volume converted from a Docker image.
+type mountWrapper struct {
+	schema.Mount
+	dockerImplicit bool
+}
+
 func isMPReadOnly(mountPoints []types.MountPoint, name types.ACName) bool {
 	for _, mp := range mountPoints {
 		if mp.Name == name {
@@ -45,13 +56,28 @@ func IsMountReadOnly(vol types.Volume, mountPoints []types.MountPoint) bool {
 	return isMPReadOnly(mountPoints, vol.Name)
 }
 
-// GenerateMounts maps MountPoint paths to volumes, returning a list of Mounts.
-func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume) []schema.Mount {
+func convertedFromDocker(ra *schema.RuntimeApp) bool {
+	ann := ra.Annotations
+	_, ok := ann.Get("appc.io/docker/repository")
+	return ok
+}
+
+// generateMounts maps MountPoint paths to volumes, returning a list of mounts,
+// each with a parameter indicating if it's an implicit empty volume from a
+// Docker image.
+func generateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume) []mountWrapper {
 	app := ra.App
 
+	var genMnts []mountWrapper
+
 	mnts := make(map[string]schema.Mount)
 	for _, m := range ra.Mounts {
 		mnts[m.Path] = m
+		genMnts = append(genMnts,
+			mountWrapper{
+				Mount:          m,
+				dockerImplicit: false,
+			})
 	}
 
 	for _, mp := range app.MountPoints {
@@ -74,36 +100,79 @@ func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume
 				GID:  &defaultGID,
 			}
 
+			dockerImplicit := convertedFromDocker(ra)
 			log.Printf("warning: no volume specified for mount point %q, implicitly creating an \"empty\" volume. This volume will be removed when the pod is garbage-collected.", mp.Name)
+			if dockerImplicit {
+				log.Printf("Docker converted image, initializing implicit volume with data contained at the mount point %q.", mp.Name)
+			}
 
 			volumes[mp.Name] = emptyVol
-			ra.Mounts = append(ra.Mounts, schema.Mount{Volume: mp.Name, Path: mp.Path})
+			genMnts = append(genMnts,
+				mountWrapper{
+					Mount: schema.Mount{
+						Volume: mp.Name,
+						Path:   mp.Path,
+					},
+					dockerImplicit: dockerImplicit,
+				})
 		} else {
-			ra.Mounts = append(ra.Mounts, schema.Mount{Volume: vol.Name, Path: mp.Path})
+			genMnts = append(genMnts,
+				mountWrapper{
+					Mount: schema.Mount{
+						Volume: vol.Name,
+						Path:   mp.Path,
+					},
+					dockerImplicit: false,
+				})
 		}
 	}
 
-	return ra.Mounts
+	return genMnts
 }
 
-// PrepareMountpoints creates and sets permissions for volumes.
-func PrepareMountpoints(path string, vol *types.Volume) error {
-	if vol.Kind == "empty" {
-		diag.Printf("creating an empty volume folder for sharing: %q", path)
-		err := os.MkdirAll(path, sharedVolPerm)
-		if err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not create mount point for volume %q", vol.Name), err)
-		}
-		if err := os.Chown(path, *vol.UID, *vol.GID); err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not change owner of %q", path), err)
-		}
-		mod, err := strconv.ParseUint(*vol.Mode, 8, 32)
-		if err != nil {
-			return errwrap.Wrap(fmt.Errorf("invalid mode %q for volume %q", *vol.Mode, vol.Name), err)
+// PrepareMountpoints creates and sets permissions for empty volumes.
+// If the mountpoint comes from a Docker image and it is an implicit empty
+// volume, we copy files from the image to the volume, see
+// https://docs.docker.com/engine/userguide/containers/dockervolumes/#data-volumes
+func PrepareMountpoints(volPath string, targetPath string, vol *types.Volume, dockerImplicit bool) error {
+	if vol.Kind != "empty" {
+		return nil
+	}
+
+	diag.Printf("creating an empty volume folder for sharing: %q", volPath)
+	m, err := strconv.ParseUint(*vol.Mode, 8, 32)
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("invalid mode %q for volume %q", *vol.Mode, vol.Name), err)
+	}
+	mode := os.FileMode(m)
+	Uid := *vol.UID
+	Gid := *vol.GID
+
+	if dockerImplicit {
+		fi, err := os.Stat(targetPath)
+		if err == nil {
+			// the directory exists in the image, let's set the same
+			// permissions and copy files from there to the empty volume
+			mode = fi.Mode()
+			Uid = int(fi.Sys().(*syscall.Stat_t).Uid)
+			Gid = int(fi.Sys().(*syscall.Stat_t).Gid)
+
+			if err := fileutil.CopyTree(targetPath, volPath, uid.NewBlankUidRange()); err != nil {
+				return errwrap.Wrap(fmt.Errorf("error copying image files to empty volume %q", volPath), err)
+			}
 		}
-		if err := os.Chmod(path, os.FileMode(mod)); err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", path), err)
+	} else {
+		if err := os.MkdirAll(volPath, 0770); err != nil {
+			return errwrap.Wrap(fmt.Errorf("error creating %q", volPath), err)
 		}
+
+	}
+	if err := os.Chown(volPath, Uid, Gid); err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not change owner of %q", volPath), err)
 	}
+	if err := os.Chmod(volPath, mode); err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", volPath), err)
+	}
+
 	return nil
 }
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index d108023eb6..ab6f265ad6 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -638,25 +638,26 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 		vols[v.Name] = v
 	}
 
-	mounts := GenerateMounts(ra, vols)
+	mounts := generateMounts(ra, vols)
 	for _, m := range mounts {
 		vol := vols[m.Volume]
 
-		if vol.Kind == "empty" {
-			p := filepath.Join(sharedVolPath, vol.Name.String())
-			if err := os.MkdirAll(p, sharedVolPerm); err != nil {
-				return nil, errwrap.Wrap(fmt.Errorf("could not create shared volume %q", vol.Name), err)
-			}
-			if err := os.Chown(p, *vol.UID, *vol.GID); err != nil {
-				return nil, errwrap.Wrap(fmt.Errorf("could not change owner of %q", p), err)
-			}
-			mod, err := strconv.ParseUint(*vol.Mode, 8, 32)
-			if err != nil {
-				return nil, errwrap.Wrap(fmt.Errorf("invalid mode %q for volume %q", *vol.Mode, vol.Name), err)
-			}
-			if err := os.Chmod(p, os.FileMode(mod)); err != nil {
-				return nil, errwrap.Wrap(fmt.Errorf("could not change permissions of %q", p), err)
-			}
+		shPath := filepath.Join(sharedVolPath, vol.Name.String())
+
+		absRoot, err := filepath.Abs(p.Root) // Absolute path to the pod's rootfs.
+		if err != nil {
+			return nil, errwrap.Wrap(errors.New("could not get pod's root absolute path"), err)
+		}
+
+		appRootfs := common.AppRootfsPath(absRoot, appName)
+		mntPath, err := evaluateAppMountPath(appRootfs, m.Path)
+		if err != nil {
+			return nil, errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Path), err)
+		}
+		mntAbsPath := filepath.Join(appRootfs, mntPath)
+
+		if err := PrepareMountpoints(shPath, mntAbsPath, &vol, m.dockerImplicit); err != nil {
+			return nil, err
 		}
 
 		opt := make([]string, 4)
@@ -667,11 +668,6 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 			opt[0] = "--bind="
 		}
 
-		absRoot, err := filepath.Abs(p.Root) // Absolute path to the pod's rootfs.
-		if err != nil {
-			return nil, errwrap.Wrap(errors.New("could not get pod's root absolute path"), err)
-		}
-
 		switch vol.Kind {
 		case "host":
 			opt[1] = vol.Source
@@ -681,15 +677,7 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 			return nil, fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, vol.Kind)
 		}
 		opt[2] = ":"
-
-		appRootfs := common.AppRootfsPath(absRoot, appName)
-		mntPath, err := evaluateAppMountPath(appRootfs, m.Path)
-		if err != nil {
-			return nil, errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Path), err)
-		}
-
 		opt[3] = filepath.Join(common.RelAppRootfsPath(appName), mntPath)
-
 		args = append(args, strings.Join(opt, ""))
 	}
 

From 5d3928de4fd0010a7e4e87db1cd437e21fb3036c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 23 Mar 2016 16:47:04 +0100
Subject: [PATCH 0050/1304] stage1/init: generate unique names for implicit
 empty vols

---
 stage1/init/common/mount.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 9045268552..86978d31bf 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -92,8 +92,9 @@ func generateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume
 			defaultMode := "0755"
 			defaultUID := 0
 			defaultGID := 0
+			uniqName := ra.Name + "-" + mp.Name
 			emptyVol := types.Volume{
-				Name: mp.Name,
+				Name: uniqName,
 				Kind: "empty",
 				Mode: &defaultMode,
 				UID:  &defaultUID,
@@ -106,11 +107,11 @@ func generateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume
 				log.Printf("Docker converted image, initializing implicit volume with data contained at the mount point %q.", mp.Name)
 			}
 
-			volumes[mp.Name] = emptyVol
+			volumes[uniqName] = emptyVol
 			genMnts = append(genMnts,
 				mountWrapper{
 					Mount: schema.Mount{
-						Volume: mp.Name,
+						Volume: uniqName,
 						Path:   mp.Path,
 					},
 					dockerImplicit: dockerImplicit,

From 8de36ca9edd65a62471e7a81da524462bc8e960a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 30 Mar 2016 15:40:28 +0200
Subject: [PATCH 0051/1304] functional tests: simulate a docker-converted image

To test Docker volume semantics, we simulate the inspect aci is a
Docker-converted image. The other tests don't care about this.
---
 tests/image/manifest | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/image/manifest b/tests/image/manifest
index 73913d743b..81978de79d 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -55,6 +55,10 @@
         ]
     },
     "annotations": [
+        {
+            "name": "appc.io/docker/repository",
+            "value": "whatever"
+        },
         {
             "name": "coreos.com/rkt/stage1/run",
             "value": "/ex/run"

From 4ebff8a0369b87753ba40e05c7fb5a3ef426b0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 30 Mar 2016 15:41:14 +0200
Subject: [PATCH 0052/1304] functional tests: test Docker volume semantics

---
 tests/rkt_volume_test.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 4077bd45b8..6f9a7abae2 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -141,3 +141,16 @@ func TestVolumes(t *testing.T) {
 		}
 	}
 }
+
+func TestDockerVolumeSemantics(t *testing.T) {
+	dockerVolImage := patchTestACI("rkt-volume-image.aci", fmt.Sprintf("--mounts=dir1,path=/dir1,readOnly=false"))
+	defer os.Remove(dockerVolImage)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	cmd := fmt.Sprintf(`/bin/sh -c "export FILE=/dir1/file ; %s --debug --insecure-options=image run --inherit-env %s --exec /inspect -- --read-file"`, ctx.Cmd(), dockerVolImage)
+
+	expected := "<<<dir1>>>"
+	runRktAndCheckOutput(t, cmd, expected, false)
+}

From f8db946bf6cb0a036db72c134f8956403d70780a Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Thu, 31 Mar 2016 13:38:47 +0200
Subject: [PATCH 0053/1304] godeps: update goaci to v0.1.0

No code changes here.
---
 Godeps/Godeps.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 9bc7b578e9..1c15d7093d 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -148,6 +148,7 @@
 		},
 		{
 			"ImportPath": "github.com/appc/goaci/proj2aci",
+			"Comment": "v0.1.0",
 			"Rev": "ba7b591f930783c0ab75f5bbfd6ff65c7bd011bf"
 		},
 		{

From 2c2bb2ef6ca60ed34df1ff2e739a8d57e80950fa Mon Sep 17 00:00:00 2001
From: 0xbzho <0xbzho@gmail.com>
Date: Thu, 31 Mar 2016 13:49:01 +0100
Subject: [PATCH 0054/1304] Use lowercase for UID & GID options in run example

The syntax description for the --volume option uses lowercase for the uid and gid parameters; whereas the example uses uppercase. Change the example to conform to the implemented behaviour.
---
 Documentation/subcommands/run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 0040dab16a..411863880d 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -170,7 +170,7 @@ Syntax:
  In the following example, we create an empty volume for app1's `/var/data`:
 
  ```
- # rkt run --volume data,kind=empty,mode=0700,UID=0,GID=0
+ # rkt run --volume data,kind=empty,mode=0700,uid=0,gid=0
  ```
 
 ### Mounting Volumes without Mount Points

From bce65e08dfd95f6cdb4c9fbff3551cf0c6ca4293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 31 Mar 2016 15:28:16 +0200
Subject: [PATCH 0055/1304] Godeps: bump diskv to v2.0.0

Yes. Another bump. On the same day.
---
 Godeps/Godeps.json                            |  12 +-
 .../src/github.com/google/btree/.travis.yml   |   1 +
 .../src/github.com/google/btree/LICENSE       | 202 +++++++
 .../src/github.com/google/btree/README.md     |  12 +
 .../src/github.com/google/btree/btree.go      | 571 ++++++++++++++++++
 .../src/github.com/google/btree/btree_mem.go  |  76 +++
 .../github.com/petar/GoLLRB/llrb/avgvar.go    |  39 --
 .../github.com/petar/GoLLRB/llrb/iterator.go  |  93 ---
 .../petar/GoLLRB/llrb/llrb-stats.go           |  46 --
 .../src/github.com/petar/GoLLRB/llrb/llrb.go  | 456 --------------
 .../src/github.com/petar/GoLLRB/llrb/util.go  |  17 -
 .../github.com/peterbourgon/diskv/index.go    |  71 ++-
 12 files changed, 903 insertions(+), 693 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/google/btree/.travis.yml
 create mode 100644 Godeps/_workspace/src/github.com/google/btree/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/google/btree/README.md
 create mode 100644 Godeps/_workspace/src/github.com/google/btree/btree.go
 create mode 100644 Godeps/_workspace/src/github.com/google/btree/btree_mem.go
 delete mode 100644 Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/avgvar.go
 delete mode 100644 Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/iterator.go
 delete mode 100644 Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/llrb-stats.go
 delete mode 100644 Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/llrb.go
 delete mode 100644 Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/util.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 1c15d7093d..8e30ea4b2e 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -344,6 +344,10 @@
 			"ImportPath": "github.com/golang/protobuf/proto",
 			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
 		},
+		{
+			"ImportPath": "github.com/google/btree",
+			"Rev": "f06e229e679911bb31a04e07ac891115822e37c3"
+		},
 		{
 			"ImportPath": "github.com/gorilla/context",
 			"Rev": "50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da"
@@ -377,14 +381,10 @@
 			"ImportPath": "github.com/pborman/uuid",
 			"Rev": "cccd189d45f7ac3368a0d127efb7f4d08ae0b655"
 		},
-		{
-			"ImportPath": "github.com/petar/GoLLRB/llrb",
-			"Rev": "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"
-		},
 		{
 			"ImportPath": "github.com/peterbourgon/diskv",
-			"Comment": "v1.0.0",
-			"Rev": "f2c8925fb5e0e9614e23499efa68df1924ba6add"
+			"Comment": "v2.0.0",
+			"Rev": "937c5a91d7fb1477fa6d2bb71410b2ae7a0f2143"
 		},
 		{
 			"ImportPath": "github.com/russross/blackfriday",
diff --git a/Godeps/_workspace/src/github.com/google/btree/.travis.yml b/Godeps/_workspace/src/github.com/google/btree/.travis.yml
new file mode 100644
index 0000000000..4f2ee4d973
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/google/btree/.travis.yml
@@ -0,0 +1 @@
+language: go
diff --git a/Godeps/_workspace/src/github.com/google/btree/LICENSE b/Godeps/_workspace/src/github.com/google/btree/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/google/btree/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/google/btree/README.md b/Godeps/_workspace/src/github.com/google/btree/README.md
new file mode 100644
index 0000000000..6062a4dacd
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/google/btree/README.md
@@ -0,0 +1,12 @@
+# BTree implementation for Go
+
+![Travis CI Build Status](https://api.travis-ci.org/google/btree.svg?branch=master)
+
+This package provides an in-memory B-Tree implementation for Go, useful as
+an ordered, mutable data structure.
+
+The API is based off of the wonderful
+http://godoc.org/github.com/petar/GoLLRB/llrb, and is meant to allow btree to
+act as a drop-in replacement for gollrb trees.
+
+See http://godoc.org/github.com/google/btree for documentation.
diff --git a/Godeps/_workspace/src/github.com/google/btree/btree.go b/Godeps/_workspace/src/github.com/google/btree/btree.go
new file mode 100644
index 0000000000..eb1f75cda6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/google/btree/btree.go
@@ -0,0 +1,571 @@
+// Copyright 2014 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package btree implements in-memory B-Trees of arbitrary degree.
+//
+// btree implements an in-memory B-Tree for use as an ordered data structure.
+// It is not meant for persistent storage solutions.
+//
+// It has a flatter structure than an equivalent red-black or other binary tree,
+// which in some cases yields better memory usage and/or performance.
+// See some discussion on the matter here:
+//   http://google-opensource.blogspot.com/2013/01/c-containers-that-save-memory-and-time.html
+// Note, though, that this project is in no way related to the C++ B-Tree
+// implmentation written about there.
+//
+// Within this tree, each node contains a slice of items and a (possibly nil)
+// slice of children.  For basic numeric values or raw structs, this can cause
+// efficiency differences when compared to equivalent C++ template code that
+// stores values in arrays within the node:
+//   * Due to the overhead of storing values as interfaces (each
+//     value needs to be stored as the value itself, then 2 words for the
+//     interface pointing to that value and its type), resulting in higher
+//     memory use.
+//   * Since interfaces can point to values anywhere in memory, values are
+//     most likely not stored in contiguous blocks, resulting in a higher
+//     number of cache misses.
+// These issues don't tend to matter, though, when working with strings or other
+// heap-allocated structures, since C++-equivalent structures also must store
+// pointers and also distribute their values across the heap.
+//
+// This implementation is designed to be a drop-in replacement to gollrb.LLRB
+// trees, (http://github.com/petar/gollrb), an excellent and probably the most
+// widely used ordered tree implementation in the Go ecosystem currently.
+// Its functions, therefore, exactly mirror those of
+// llrb.LLRB where possible.  Unlike gollrb, though, we currently don't
+// support storing multiple equivalent values or backwards iteration.
+package btree
+
+import (
+	"fmt"
+	"io"
+	"sort"
+	"strings"
+)
+
+// Item represents a single object in the tree.
+type Item interface {
+	// Less tests whether the current item is less than the given argument.
+	//
+	// This must provide a strict weak ordering.
+	// If !a.Less(b) && !b.Less(a), we treat this to mean a == b (i.e. we can only
+	// hold one of either a or b in the tree).
+	Less(than Item) bool
+}
+
+// ItemIterator allows callers of Ascend* to iterate in-order over portions of
+// the tree.  When this function returns false, iteration will stop and the
+// associated Ascend* function will immediately return.
+type ItemIterator func(i Item) bool
+
+// New creates a new B-Tree with the given degree.
+//
+// New(2), for example, will create a 2-3-4 tree (each node contains 1-3 items
+// and 2-4 children).
+func New(degree int) *BTree {
+	if degree <= 1 {
+		panic("bad degree")
+	}
+	return &BTree{
+		degree:   degree,
+		freelist: make([]*node, 0, 32),
+	}
+}
+
+// items stores items in a node.
+type items []Item
+
+// insertAt inserts a value into the given index, pushing all subsequent values
+// forward.
+func (s *items) insertAt(index int, item Item) {
+	*s = append(*s, nil)
+	if index < len(*s) {
+		copy((*s)[index+1:], (*s)[index:])
+	}
+	(*s)[index] = item
+}
+
+// removeAt removes a value at a given index, pulling all subsequent values
+// back.
+func (s *items) removeAt(index int) Item {
+	item := (*s)[index]
+	copy((*s)[index:], (*s)[index+1:])
+	*s = (*s)[:len(*s)-1]
+	return item
+}
+
+// pop removes and returns the last element in the list.
+func (s *items) pop() (out Item) {
+	index := len(*s) - 1
+	out, *s = (*s)[index], (*s)[:index]
+	return
+}
+
+// find returns the index where the given item should be inserted into this
+// list.  'found' is true if the item already exists in the list at the given
+// index.
+func (s items) find(item Item) (index int, found bool) {
+	i := sort.Search(len(s), func(i int) bool {
+		return item.Less(s[i])
+	})
+	if i > 0 && !s[i-1].Less(item) {
+		return i - 1, true
+	}
+	return i, false
+}
+
+// children stores child nodes in a node.
+type children []*node
+
+// insertAt inserts a value into the given index, pushing all subsequent values
+// forward.
+func (s *children) insertAt(index int, n *node) {
+	*s = append(*s, nil)
+	if index < len(*s) {
+		copy((*s)[index+1:], (*s)[index:])
+	}
+	(*s)[index] = n
+}
+
+// removeAt removes a value at a given index, pulling all subsequent values
+// back.
+func (s *children) removeAt(index int) *node {
+	n := (*s)[index]
+	copy((*s)[index:], (*s)[index+1:])
+	*s = (*s)[:len(*s)-1]
+	return n
+}
+
+// pop removes and returns the last element in the list.
+func (s *children) pop() (out *node) {
+	index := len(*s) - 1
+	out, *s = (*s)[index], (*s)[:index]
+	return
+}
+
+// node is an internal node in a tree.
+//
+// It must at all times maintain the invariant that either
+//   * len(children) == 0, len(items) unconstrained
+//   * len(children) == len(items) + 1
+type node struct {
+	items    items
+	children children
+	t        *BTree
+}
+
+// split splits the given node at the given index.  The current node shrinks,
+// and this function returns the item that existed at that index and a new node
+// containing all items/children after it.
+func (n *node) split(i int) (Item, *node) {
+	item := n.items[i]
+	next := n.t.newNode()
+	next.items = append(next.items, n.items[i+1:]...)
+	n.items = n.items[:i]
+	if len(n.children) > 0 {
+		next.children = append(next.children, n.children[i+1:]...)
+		n.children = n.children[:i+1]
+	}
+	return item, next
+}
+
+// maybeSplitChild checks if a child should be split, and if so splits it.
+// Returns whether or not a split occurred.
+func (n *node) maybeSplitChild(i, maxItems int) bool {
+	if len(n.children[i].items) < maxItems {
+		return false
+	}
+	first := n.children[i]
+	item, second := first.split(maxItems / 2)
+	n.items.insertAt(i, item)
+	n.children.insertAt(i+1, second)
+	return true
+}
+
+// insert inserts an item into the subtree rooted at this node, making sure
+// no nodes in the subtree exceed maxItems items.  Should an equivalent item be
+// be found/replaced by insert, it will be returned.
+func (n *node) insert(item Item, maxItems int) Item {
+	i, found := n.items.find(item)
+	if found {
+		out := n.items[i]
+		n.items[i] = item
+		return out
+	}
+	if len(n.children) == 0 {
+		n.items.insertAt(i, item)
+		return nil
+	}
+	if n.maybeSplitChild(i, maxItems) {
+		inTree := n.items[i]
+		switch {
+		case item.Less(inTree):
+			// no change, we want first split node
+		case inTree.Less(item):
+			i++ // we want second split node
+		default:
+			out := n.items[i]
+			n.items[i] = item
+			return out
+		}
+	}
+	return n.children[i].insert(item, maxItems)
+}
+
+// get finds the given key in the subtree and returns it.
+func (n *node) get(key Item) Item {
+	i, found := n.items.find(key)
+	if found {
+		return n.items[i]
+	} else if len(n.children) > 0 {
+		return n.children[i].get(key)
+	}
+	return nil
+}
+
+// toRemove details what item to remove in a node.remove call.
+type toRemove int
+
+const (
+	removeItem toRemove = iota // removes the given item
+	removeMin                  // removes smallest item in the subtree
+	removeMax                  // removes largest item in the subtree
+)
+
+// remove removes an item from the subtree rooted at this node.
+func (n *node) remove(item Item, minItems int, typ toRemove) Item {
+	var i int
+	var found bool
+	switch typ {
+	case removeMax:
+		if len(n.children) == 0 {
+			return n.items.pop()
+		}
+		i = len(n.items)
+	case removeMin:
+		if len(n.children) == 0 {
+			return n.items.removeAt(0)
+		}
+		i = 0
+	case removeItem:
+		i, found = n.items.find(item)
+		if len(n.children) == 0 {
+			if found {
+				return n.items.removeAt(i)
+			}
+			return nil
+		}
+	default:
+		panic("invalid type")
+	}
+	// If we get to here, we have children.
+	child := n.children[i]
+	if len(child.items) <= minItems {
+		return n.growChildAndRemove(i, item, minItems, typ)
+	}
+	// Either we had enough items to begin with, or we've done some
+	// merging/stealing, because we've got enough now and we're ready to return
+	// stuff.
+	if found {
+		// The item exists at index 'i', and the child we've selected can give us a
+		// predecessor, since if we've gotten here it's got > minItems items in it.
+		out := n.items[i]
+		// We use our special-case 'remove' call with typ=maxItem to pull the
+		// predecessor of item i (the rightmost leaf of our immediate left child)
+		// and set it into where we pulled the item from.
+		n.items[i] = child.remove(nil, minItems, removeMax)
+		return out
+	}
+	// Final recursive call.  Once we're here, we know that the item isn't in this
+	// node and that the child is big enough to remove from.
+	return child.remove(item, minItems, typ)
+}
+
+// growChildAndRemove grows child 'i' to make sure it's possible to remove an
+// item from it while keeping it at minItems, then calls remove to actually
+// remove it.
+//
+// Most documentation says we have to do two sets of special casing:
+//   1) item is in this node
+//   2) item is in child
+// In both cases, we need to handle the two subcases:
+//   A) node has enough values that it can spare one
+//   B) node doesn't have enough values
+// For the latter, we have to check:
+//   a) left sibling has node to spare
+//   b) right sibling has node to spare
+//   c) we must merge
+// To simplify our code here, we handle cases #1 and #2 the same:
+// If a node doesn't have enough items, we make sure it does (using a,b,c).
+// We then simply redo our remove call, and the second time (regardless of
+// whether we're in case 1 or 2), we'll have enough items and can guarantee
+// that we hit case A.
+func (n *node) growChildAndRemove(i int, item Item, minItems int, typ toRemove) Item {
+	child := n.children[i]
+	if i > 0 && len(n.children[i-1].items) > minItems {
+		// Steal from left child
+		stealFrom := n.children[i-1]
+		stolenItem := stealFrom.items.pop()
+		child.items.insertAt(0, n.items[i-1])
+		n.items[i-1] = stolenItem
+		if len(stealFrom.children) > 0 {
+			child.children.insertAt(0, stealFrom.children.pop())
+		}
+	} else if i < len(n.items) && len(n.children[i+1].items) > minItems {
+		// steal from right child
+		stealFrom := n.children[i+1]
+		stolenItem := stealFrom.items.removeAt(0)
+		child.items = append(child.items, n.items[i])
+		n.items[i] = stolenItem
+		if len(stealFrom.children) > 0 {
+			child.children = append(child.children, stealFrom.children.removeAt(0))
+		}
+	} else {
+		if i >= len(n.items) {
+			i--
+			child = n.children[i]
+		}
+		// merge with right child
+		mergeItem := n.items.removeAt(i)
+		mergeChild := n.children.removeAt(i + 1)
+		child.items = append(child.items, mergeItem)
+		child.items = append(child.items, mergeChild.items...)
+		child.children = append(child.children, mergeChild.children...)
+		n.t.freeNode(mergeChild)
+	}
+	return n.remove(item, minItems, typ)
+}
+
+// iterate provides a simple method for iterating over elements in the tree.
+// It could probably use some work to be extra-efficient (it calls from() a
+// little more than it should), but it works pretty well for now.
+//
+// It requires that 'from' and 'to' both return true for values we should hit
+// with the iterator.  It should also be the case that 'from' returns true for
+// values less than or equal to values 'to' returns true for, and 'to'
+// returns true for values greater than or equal to those that 'from'
+// does.
+func (n *node) iterate(from, to func(Item) bool, iter ItemIterator) bool {
+	for i, item := range n.items {
+		if !from(item) {
+			continue
+		}
+		if len(n.children) > 0 && !n.children[i].iterate(from, to, iter) {
+			return false
+		}
+		if !to(item) {
+			return false
+		}
+		if !iter(item) {
+			return false
+		}
+	}
+	if len(n.children) > 0 {
+		return n.children[len(n.children)-1].iterate(from, to, iter)
+	}
+	return true
+}
+
+// Used for testing/debugging purposes.
+func (n *node) print(w io.Writer, level int) {
+	fmt.Fprintf(w, "%sNODE:%v\n", strings.Repeat("  ", level), n.items)
+	for _, c := range n.children {
+		c.print(w, level+1)
+	}
+}
+
+// BTree is an implementation of a B-Tree.
+//
+// BTree stores Item instances in an ordered structure, allowing easy insertion,
+// removal, and iteration.
+//
+// Write operations are not safe for concurrent mutation by multiple
+// goroutines, but Read operations are.
+type BTree struct {
+	degree   int
+	length   int
+	root     *node
+	freelist []*node
+}
+
+// maxItems returns the max number of items to allow per node.
+func (t *BTree) maxItems() int {
+	return t.degree*2 - 1
+}
+
+// minItems returns the min number of items to allow per node (ignored for the
+// root node).
+func (t *BTree) minItems() int {
+	return t.degree - 1
+}
+
+func (t *BTree) newNode() (n *node) {
+	index := len(t.freelist) - 1
+	if index < 0 {
+		return &node{t: t}
+	}
+	t.freelist, n = t.freelist[:index], t.freelist[index]
+	return
+}
+
+func (t *BTree) freeNode(n *node) {
+	if len(t.freelist) < cap(t.freelist) {
+    for i := range n.items {
+      n.items[i] = nil  // clear to allow GC
+    }
+		n.items = n.items[:0]
+    for i := range n.children {
+      n.children[i] = nil  // clear to allow GC
+    }
+		n.children = n.children[:0]
+		t.freelist = append(t.freelist, n)
+	}
+}
+
+// ReplaceOrInsert adds the given item to the tree.  If an item in the tree
+// already equals the given one, it is removed from the tree and returned.
+// Otherwise, nil is returned.
+//
+// nil cannot be added to the tree (will panic).
+func (t *BTree) ReplaceOrInsert(item Item) Item {
+	if item == nil {
+		panic("nil item being added to BTree")
+	}
+	if t.root == nil {
+		t.root = t.newNode()
+		t.root.items = append(t.root.items, item)
+		t.length++
+		return nil
+	} else if len(t.root.items) >= t.maxItems() {
+		item2, second := t.root.split(t.maxItems() / 2)
+		oldroot := t.root
+		t.root = t.newNode()
+		t.root.items = append(t.root.items, item2)
+		t.root.children = append(t.root.children, oldroot, second)
+	}
+	out := t.root.insert(item, t.maxItems())
+	if out == nil {
+		t.length++
+	}
+	return out
+}
+
+// Delete removes an item equal to the passed in item from the tree, returning
+// it.  If no such item exists, returns nil.
+func (t *BTree) Delete(item Item) Item {
+	return t.deleteItem(item, removeItem)
+}
+
+// DeleteMin removes the smallest item in the tree and returns it.
+// If no such item exists, returns nil.
+func (t *BTree) DeleteMin() Item {
+	return t.deleteItem(nil, removeMin)
+}
+
+// DeleteMax removes the largest item in the tree and returns it.
+// If no such item exists, returns nil.
+func (t *BTree) DeleteMax() Item {
+	return t.deleteItem(nil, removeMax)
+}
+
+func (t *BTree) deleteItem(item Item, typ toRemove) Item {
+	if t.root == nil || len(t.root.items) == 0 {
+		return nil
+	}
+	out := t.root.remove(item, t.minItems(), typ)
+	if len(t.root.items) == 0 && len(t.root.children) > 0 {
+		oldroot := t.root
+		t.root = t.root.children[0]
+		t.freeNode(oldroot)
+	}
+	if out != nil {
+		t.length--
+	}
+	return out
+}
+
+// AscendRange calls the iterator for every value in the tree within the range
+// [greaterOrEqual, lessThan), until iterator returns false.
+func (t *BTree) AscendRange(greaterOrEqual, lessThan Item, iterator ItemIterator) {
+	if t.root == nil {
+		return
+	}
+	t.root.iterate(
+		func(a Item) bool { return !a.Less(greaterOrEqual) },
+		func(a Item) bool { return a.Less(lessThan) },
+		iterator)
+}
+
+// AscendLessThan calls the iterator for every value in the tree within the range
+// [first, pivot), until iterator returns false.
+func (t *BTree) AscendLessThan(pivot Item, iterator ItemIterator) {
+	if t.root == nil {
+		return
+	}
+	t.root.iterate(
+		func(a Item) bool { return true },
+		func(a Item) bool { return a.Less(pivot) },
+		iterator)
+}
+
+// AscendGreaterOrEqual calls the iterator for every value in the tree within
+// the range [pivot, last], until iterator returns false.
+func (t *BTree) AscendGreaterOrEqual(pivot Item, iterator ItemIterator) {
+	if t.root == nil {
+		return
+	}
+	t.root.iterate(
+		func(a Item) bool { return !a.Less(pivot) },
+		func(a Item) bool { return true },
+		iterator)
+}
+
+// Ascend calls the iterator for every value in the tree within the range
+// [first, last], until iterator returns false.
+func (t *BTree) Ascend(iterator ItemIterator) {
+	if t.root == nil {
+		return
+	}
+	t.root.iterate(
+		func(a Item) bool { return true },
+		func(a Item) bool { return true },
+		iterator)
+}
+
+// Get looks for the key item in the tree, returning it.  It returns nil if
+// unable to find that item.
+func (t *BTree) Get(key Item) Item {
+	if t.root == nil {
+		return nil
+	}
+	return t.root.get(key)
+}
+
+// Has returns true if the given key is in the tree.
+func (t *BTree) Has(key Item) bool {
+	return t.Get(key) != nil
+}
+
+// Len returns the number of items currently in the tree.
+func (t *BTree) Len() int {
+	return t.length
+}
+
+// Int implements the Item interface for integers.
+type Int int
+
+// Less returns true if int(a) < int(b).
+func (a Int) Less(b Item) bool {
+	return a < b.(Int)
+}
diff --git a/Godeps/_workspace/src/github.com/google/btree/btree_mem.go b/Godeps/_workspace/src/github.com/google/btree/btree_mem.go
new file mode 100644
index 0000000000..cb95b7fa1b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/google/btree/btree_mem.go
@@ -0,0 +1,76 @@
+// Copyright 2014 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build ignore
+
+// This binary compares memory usage between btree and gollrb.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"math/rand"
+	"runtime"
+	"time"
+
+	"github.com/google/btree"
+	"github.com/petar/GoLLRB/llrb"
+)
+
+var (
+	size   = flag.Int("size", 1000000, "size of the tree to build")
+	degree = flag.Int("degree", 8, "degree of btree")
+	gollrb = flag.Bool("llrb", false, "use llrb instead of btree")
+)
+
+func main() {
+	flag.Parse()
+	vals := rand.Perm(*size)
+	var t, v interface{}
+	v = vals
+	var stats runtime.MemStats
+	for i := 0; i < 10; i++ {
+		runtime.GC()
+	}
+	fmt.Println("-------- BEFORE ----------")
+	runtime.ReadMemStats(&stats)
+	fmt.Printf("%+v\n", stats)
+	start := time.Now()
+	if *gollrb {
+		tr := llrb.New()
+		for _, v := range vals {
+			tr.ReplaceOrInsert(llrb.Int(v))
+		}
+		t = tr // keep it around
+	} else {
+		tr := btree.New(*degree)
+		for _, v := range vals {
+			tr.ReplaceOrInsert(btree.Int(v))
+		}
+		t = tr // keep it around
+	}
+	fmt.Printf("%v inserts in %v\n", *size, time.Since(start))
+	fmt.Println("-------- AFTER ----------")
+	runtime.ReadMemStats(&stats)
+	fmt.Printf("%+v\n", stats)
+	for i := 0; i < 10; i++ {
+		runtime.GC()
+	}
+	fmt.Println("-------- AFTER GC ----------")
+	runtime.ReadMemStats(&stats)
+	fmt.Printf("%+v\n", stats)
+	if t == v {
+		fmt.Println("to make sure vals and tree aren't GC'd")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/avgvar.go b/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/avgvar.go
deleted file mode 100644
index 2d7e2a3262..0000000000
--- a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/avgvar.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2010 Petar Maymounkov. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package llrb
-
-import "math"
-
-// avgVar maintains the average and variance of a stream of numbers
-// in a space-efficient manner.
-type avgVar struct {
-	count      int64
-	sum, sumsq float64
-}
-
-func (av *avgVar) Init() {
-	av.count = 0
-	av.sum = 0.0
-	av.sumsq = 0.0
-}
-
-func (av *avgVar) Add(sample float64) {
-	av.count++
-	av.sum += sample
-	av.sumsq += sample * sample
-}
-
-func (av *avgVar) GetCount() int64 { return av.count }
-
-func (av *avgVar) GetAvg() float64 { return av.sum / float64(av.count) }
-
-func (av *avgVar) GetTotal() float64 { return av.sum }
-
-func (av *avgVar) GetVar() float64 {
-	a := av.GetAvg()
-	return av.sumsq/float64(av.count) - a*a
-}
-
-func (av *avgVar) GetStdDev() float64 { return math.Sqrt(av.GetVar()) }
diff --git a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/iterator.go b/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/iterator.go
deleted file mode 100644
index ee7b27f442..0000000000
--- a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/iterator.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package llrb
-
-type ItemIterator func(i Item) bool
-
-//func (t *Tree) Ascend(iterator ItemIterator) {
-//	t.AscendGreaterOrEqual(Inf(-1), iterator)
-//}
-
-func (t *LLRB) AscendRange(greaterOrEqual, lessThan Item, iterator ItemIterator) {
-	t.ascendRange(t.root, greaterOrEqual, lessThan, iterator)
-}
-
-func (t *LLRB) ascendRange(h *Node, inf, sup Item, iterator ItemIterator) bool {
-	if h == nil {
-		return true
-	}
-	if !less(h.Item, sup) {
-		return t.ascendRange(h.Left, inf, sup, iterator)
-	}
-	if less(h.Item, inf) {
-		return t.ascendRange(h.Right, inf, sup, iterator)
-	}
-
-	if !t.ascendRange(h.Left, inf, sup, iterator) {
-		return false
-	}
-	if !iterator(h.Item) {
-		return false
-	}
-	return t.ascendRange(h.Right, inf, sup, iterator)
-}
-
-// AscendGreaterOrEqual will call iterator once for each element greater or equal to
-// pivot in ascending order. It will stop whenever the iterator returns false.
-func (t *LLRB) AscendGreaterOrEqual(pivot Item, iterator ItemIterator) {
-	t.ascendGreaterOrEqual(t.root, pivot, iterator)
-}
-
-func (t *LLRB) ascendGreaterOrEqual(h *Node, pivot Item, iterator ItemIterator) bool {
-	if h == nil {
-		return true
-	}
-	if !less(h.Item, pivot) {
-		if !t.ascendGreaterOrEqual(h.Left, pivot, iterator) {
-			return false
-		}
-		if !iterator(h.Item) {
-			return false
-		}
-	}
-	return t.ascendGreaterOrEqual(h.Right, pivot, iterator)
-}
-
-func (t *LLRB) AscendLessThan(pivot Item, iterator ItemIterator) {
-	t.ascendLessThan(t.root, pivot, iterator)
-}
-
-func (t *LLRB) ascendLessThan(h *Node, pivot Item, iterator ItemIterator) bool {
-	if h == nil {
-		return true
-	}
-	if !t.ascendLessThan(h.Left, pivot, iterator) {
-		return false
-	}
-	if !iterator(h.Item) {
-		return false
-	}
-	if less(h.Item, pivot) {
-		return t.ascendLessThan(h.Left, pivot, iterator)
-	}
-	return true
-}
-
-// DescendLessOrEqual will call iterator once for each element less than the
-// pivot in descending order. It will stop whenever the iterator returns false.
-func (t *LLRB) DescendLessOrEqual(pivot Item, iterator ItemIterator) {
-	t.descendLessOrEqual(t.root, pivot, iterator)
-}
-
-func (t *LLRB) descendLessOrEqual(h *Node, pivot Item, iterator ItemIterator) bool {
-	if h == nil {
-		return true
-	}
-	if less(h.Item, pivot) || !less(pivot, h.Item) {
-		if !t.descendLessOrEqual(h.Right, pivot, iterator) {
-			return false
-		}
-		if !iterator(h.Item) {
-			return false
-		}
-	}
-	return t.descendLessOrEqual(h.Left, pivot, iterator)
-}
diff --git a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/llrb-stats.go b/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/llrb-stats.go
deleted file mode 100644
index 47126a3be9..0000000000
--- a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/llrb-stats.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2010 Petar Maymounkov. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package llrb
-
-// GetHeight() returns an item in the tree with key @key, and it's height in the tree
-func (t *LLRB) GetHeight(key Item) (result Item, depth int) {
-	return t.getHeight(t.root, key)
-}
-
-func (t *LLRB) getHeight(h *Node, item Item) (Item, int) {
-	if h == nil {
-		return nil, 0
-	}
-	if less(item, h.Item) {
-		result, depth := t.getHeight(h.Left, item)
-		return result, depth + 1
-	}
-	if less(h.Item, item) {
-		result, depth := t.getHeight(h.Right, item)
-		return result, depth + 1
-	}
-	return h.Item, 0
-}
-
-// HeightStats() returns the average and standard deviation of the height
-// of elements in the tree
-func (t *LLRB) HeightStats() (avg, stddev float64) {
-	av := &avgVar{}
-	heightStats(t.root, 0, av)
-	return av.GetAvg(), av.GetStdDev()
-}
-
-func heightStats(h *Node, d int, av *avgVar) {
-	if h == nil {
-		return
-	}
-	av.Add(float64(d))
-	if h.Left != nil {
-		heightStats(h.Left, d+1, av)
-	}
-	if h.Right != nil {
-		heightStats(h.Right, d+1, av)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/llrb.go b/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/llrb.go
deleted file mode 100644
index 81373fbfdf..0000000000
--- a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/llrb.go
+++ /dev/null
@@ -1,456 +0,0 @@
-// Copyright 2010 Petar Maymounkov. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// A Left-Leaning Red-Black (LLRB) implementation of 2-3 balanced binary search trees,
-// based on the following work:
-//
-//   http://www.cs.princeton.edu/~rs/talks/LLRB/08Penn.pdf
-//   http://www.cs.princeton.edu/~rs/talks/LLRB/LLRB.pdf
-//   http://www.cs.princeton.edu/~rs/talks/LLRB/Java/RedBlackBST.java
-//
-//  2-3 trees (and the run-time equivalent 2-3-4 trees) are the de facto standard BST
-//  algoritms found in implementations of Python, Java, and other libraries. The LLRB
-//  implementation of 2-3 trees is a recent improvement on the traditional implementation,
-//  observed and documented by Robert Sedgewick.
-//
-package llrb
-
-// Tree is a Left-Leaning Red-Black (LLRB) implementation of 2-3 trees
-type LLRB struct {
-	count int
-	root  *Node
-}
-
-type Node struct {
-	Item
-	Left, Right *Node // Pointers to left and right child nodes
-	Black       bool  // If set, the color of the link (incoming from the parent) is black
-	// In the LLRB, new nodes are always red, hence the zero-value for node
-}
-
-type Item interface {
-	Less(than Item) bool
-}
-
-//
-func less(x, y Item) bool {
-	if x == pinf {
-		return false
-	}
-	if x == ninf {
-		return true
-	}
-	return x.Less(y)
-}
-
-// Inf returns an Item that is "bigger than" any other item, if sign is positive.
-// Otherwise  it returns an Item that is "smaller than" any other item.
-func Inf(sign int) Item {
-	if sign == 0 {
-		panic("sign")
-	}
-	if sign > 0 {
-		return pinf
-	}
-	return ninf
-}
-
-var (
-	ninf = nInf{}
-	pinf = pInf{}
-)
-
-type nInf struct{}
-
-func (nInf) Less(Item) bool {
-	return true
-}
-
-type pInf struct{}
-
-func (pInf) Less(Item) bool {
-	return false
-}
-
-// New() allocates a new tree
-func New() *LLRB {
-	return &LLRB{}
-}
-
-// SetRoot sets the root node of the tree.
-// It is intended to be used by functions that deserialize the tree.
-func (t *LLRB) SetRoot(r *Node) {
-	t.root = r
-}
-
-// Root returns the root node of the tree.
-// It is intended to be used by functions that serialize the tree.
-func (t *LLRB) Root() *Node {
-	return t.root
-}
-
-// Len returns the number of nodes in the tree.
-func (t *LLRB) Len() int { return t.count }
-
-// Has returns true if the tree contains an element whose order is the same as that of key.
-func (t *LLRB) Has(key Item) bool {
-	return t.Get(key) != nil
-}
-
-// Get retrieves an element from the tree whose order is the same as that of key.
-func (t *LLRB) Get(key Item) Item {
-	h := t.root
-	for h != nil {
-		switch {
-		case less(key, h.Item):
-			h = h.Left
-		case less(h.Item, key):
-			h = h.Right
-		default:
-			return h.Item
-		}
-	}
-	return nil
-}
-
-// Min returns the minimum element in the tree.
-func (t *LLRB) Min() Item {
-	h := t.root
-	if h == nil {
-		return nil
-	}
-	for h.Left != nil {
-		h = h.Left
-	}
-	return h.Item
-}
-
-// Max returns the maximum element in the tree.
-func (t *LLRB) Max() Item {
-	h := t.root
-	if h == nil {
-		return nil
-	}
-	for h.Right != nil {
-		h = h.Right
-	}
-	return h.Item
-}
-
-func (t *LLRB) ReplaceOrInsertBulk(items ...Item) {
-	for _, i := range items {
-		t.ReplaceOrInsert(i)
-	}
-}
-
-func (t *LLRB) InsertNoReplaceBulk(items ...Item) {
-	for _, i := range items {
-		t.InsertNoReplace(i)
-	}
-}
-
-// ReplaceOrInsert inserts item into the tree. If an existing
-// element has the same order, it is removed from the tree and returned.
-func (t *LLRB) ReplaceOrInsert(item Item) Item {
-	if item == nil {
-		panic("inserting nil item")
-	}
-	var replaced Item
-	t.root, replaced = t.replaceOrInsert(t.root, item)
-	t.root.Black = true
-	if replaced == nil {
-		t.count++
-	}
-	return replaced
-}
-
-func (t *LLRB) replaceOrInsert(h *Node, item Item) (*Node, Item) {
-	if h == nil {
-		return newNode(item), nil
-	}
-
-	h = walkDownRot23(h)
-
-	var replaced Item
-	if less(item, h.Item) { // BUG
-		h.Left, replaced = t.replaceOrInsert(h.Left, item)
-	} else if less(h.Item, item) {
-		h.Right, replaced = t.replaceOrInsert(h.Right, item)
-	} else {
-		replaced, h.Item = h.Item, item
-	}
-
-	h = walkUpRot23(h)
-
-	return h, replaced
-}
-
-// InsertNoReplace inserts item into the tree. If an existing
-// element has the same order, both elements remain in the tree.
-func (t *LLRB) InsertNoReplace(item Item) {
-	if item == nil {
-		panic("inserting nil item")
-	}
-	t.root = t.insertNoReplace(t.root, item)
-	t.root.Black = true
-	t.count++
-}
-
-func (t *LLRB) insertNoReplace(h *Node, item Item) *Node {
-	if h == nil {
-		return newNode(item)
-	}
-
-	h = walkDownRot23(h)
-
-	if less(item, h.Item) {
-		h.Left = t.insertNoReplace(h.Left, item)
-	} else {
-		h.Right = t.insertNoReplace(h.Right, item)
-	}
-
-	return walkUpRot23(h)
-}
-
-// Rotation driver routines for 2-3 algorithm
-
-func walkDownRot23(h *Node) *Node { return h }
-
-func walkUpRot23(h *Node) *Node {
-	if isRed(h.Right) && !isRed(h.Left) {
-		h = rotateLeft(h)
-	}
-
-	if isRed(h.Left) && isRed(h.Left.Left) {
-		h = rotateRight(h)
-	}
-
-	if isRed(h.Left) && isRed(h.Right) {
-		flip(h)
-	}
-
-	return h
-}
-
-// Rotation driver routines for 2-3-4 algorithm
-
-func walkDownRot234(h *Node) *Node {
-	if isRed(h.Left) && isRed(h.Right) {
-		flip(h)
-	}
-
-	return h
-}
-
-func walkUpRot234(h *Node) *Node {
-	if isRed(h.Right) && !isRed(h.Left) {
-		h = rotateLeft(h)
-	}
-
-	if isRed(h.Left) && isRed(h.Left.Left) {
-		h = rotateRight(h)
-	}
-
-	return h
-}
-
-// DeleteMin deletes the minimum element in the tree and returns the
-// deleted item or nil otherwise.
-func (t *LLRB) DeleteMin() Item {
-	var deleted Item
-	t.root, deleted = deleteMin(t.root)
-	if t.root != nil {
-		t.root.Black = true
-	}
-	if deleted != nil {
-		t.count--
-	}
-	return deleted
-}
-
-// deleteMin code for LLRB 2-3 trees
-func deleteMin(h *Node) (*Node, Item) {
-	if h == nil {
-		return nil, nil
-	}
-	if h.Left == nil {
-		return nil, h.Item
-	}
-
-	if !isRed(h.Left) && !isRed(h.Left.Left) {
-		h = moveRedLeft(h)
-	}
-
-	var deleted Item
-	h.Left, deleted = deleteMin(h.Left)
-
-	return fixUp(h), deleted
-}
-
-// DeleteMax deletes the maximum element in the tree and returns
-// the deleted item or nil otherwise
-func (t *LLRB) DeleteMax() Item {
-	var deleted Item
-	t.root, deleted = deleteMax(t.root)
-	if t.root != nil {
-		t.root.Black = true
-	}
-	if deleted != nil {
-		t.count--
-	}
-	return deleted
-}
-
-func deleteMax(h *Node) (*Node, Item) {
-	if h == nil {
-		return nil, nil
-	}
-	if isRed(h.Left) {
-		h = rotateRight(h)
-	}
-	if h.Right == nil {
-		return nil, h.Item
-	}
-	if !isRed(h.Right) && !isRed(h.Right.Left) {
-		h = moveRedRight(h)
-	}
-	var deleted Item
-	h.Right, deleted = deleteMax(h.Right)
-
-	return fixUp(h), deleted
-}
-
-// Delete deletes an item from the tree whose key equals key.
-// The deleted item is return, otherwise nil is returned.
-func (t *LLRB) Delete(key Item) Item {
-	var deleted Item
-	t.root, deleted = t.delete(t.root, key)
-	if t.root != nil {
-		t.root.Black = true
-	}
-	if deleted != nil {
-		t.count--
-	}
-	return deleted
-}
-
-func (t *LLRB) delete(h *Node, item Item) (*Node, Item) {
-	var deleted Item
-	if h == nil {
-		return nil, nil
-	}
-	if less(item, h.Item) {
-		if h.Left == nil { // item not present. Nothing to delete
-			return h, nil
-		}
-		if !isRed(h.Left) && !isRed(h.Left.Left) {
-			h = moveRedLeft(h)
-		}
-		h.Left, deleted = t.delete(h.Left, item)
-	} else {
-		if isRed(h.Left) {
-			h = rotateRight(h)
-		}
-		// If @item equals @h.Item and no right children at @h
-		if !less(h.Item, item) && h.Right == nil {
-			return nil, h.Item
-		}
-		// PETAR: Added 'h.Right != nil' below
-		if h.Right != nil && !isRed(h.Right) && !isRed(h.Right.Left) {
-			h = moveRedRight(h)
-		}
-		// If @item equals @h.Item, and (from above) 'h.Right != nil'
-		if !less(h.Item, item) {
-			var subDeleted Item
-			h.Right, subDeleted = deleteMin(h.Right)
-			if subDeleted == nil {
-				panic("logic")
-			}
-			deleted, h.Item = h.Item, subDeleted
-		} else { // Else, @item is bigger than @h.Item
-			h.Right, deleted = t.delete(h.Right, item)
-		}
-	}
-
-	return fixUp(h), deleted
-}
-
-// Internal node manipulation routines
-
-func newNode(item Item) *Node { return &Node{Item: item} }
-
-func isRed(h *Node) bool {
-	if h == nil {
-		return false
-	}
-	return !h.Black
-}
-
-func rotateLeft(h *Node) *Node {
-	x := h.Right
-	if x.Black {
-		panic("rotating a black link")
-	}
-	h.Right = x.Left
-	x.Left = h
-	x.Black = h.Black
-	h.Black = false
-	return x
-}
-
-func rotateRight(h *Node) *Node {
-	x := h.Left
-	if x.Black {
-		panic("rotating a black link")
-	}
-	h.Left = x.Right
-	x.Right = h
-	x.Black = h.Black
-	h.Black = false
-	return x
-}
-
-// REQUIRE: Left and Right children must be present
-func flip(h *Node) {
-	h.Black = !h.Black
-	h.Left.Black = !h.Left.Black
-	h.Right.Black = !h.Right.Black
-}
-
-// REQUIRE: Left and Right children must be present
-func moveRedLeft(h *Node) *Node {
-	flip(h)
-	if isRed(h.Right.Left) {
-		h.Right = rotateRight(h.Right)
-		h = rotateLeft(h)
-		flip(h)
-	}
-	return h
-}
-
-// REQUIRE: Left and Right children must be present
-func moveRedRight(h *Node) *Node {
-	flip(h)
-	if isRed(h.Left.Left) {
-		h = rotateRight(h)
-		flip(h)
-	}
-	return h
-}
-
-func fixUp(h *Node) *Node {
-	if isRed(h.Right) {
-		h = rotateLeft(h)
-	}
-
-	if isRed(h.Left) && isRed(h.Left.Left) {
-		h = rotateRight(h)
-	}
-
-	if isRed(h.Left) && isRed(h.Right) {
-		flip(h)
-	}
-
-	return h
-}
diff --git a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/util.go b/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/util.go
deleted file mode 100644
index 63dbdb2df0..0000000000
--- a/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb/util.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2010 Petar Maymounkov. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package llrb
-
-type Int int
-
-func (x Int) Less(than Item) bool {
-	return x < than.(Int)
-}
-
-type String string
-
-func (x String) Less(than Item) bool {
-	return x < than.(String)
-}
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go
index 1481b2c763..96fee5152b 100644
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go
+++ b/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go
@@ -3,7 +3,7 @@ package diskv
 import (
 	"sync"
 
-	"github.com/petar/GoLLRB/llrb"
+	"github.com/google/btree"
 )
 
 // Index is a generic interface for things that can
@@ -18,85 +18,84 @@ type Index interface {
 // LessFunction is used to initialize an Index of keys in a specific order.
 type LessFunction func(string, string) bool
 
-// llrbString is a custom data type that satisfies the LLRB Less interface,
-// making the strings it wraps sortable by the LLRB package.
-type llrbString struct {
+// btreeString is a custom data type that satisfies the BTree Less interface,
+// making the strings it wraps sortable by the BTree package.
+type btreeString struct {
 	s string
 	l LessFunction
 }
 
-// Less satisfies the llrb.Less interface using the llrbString's LessFunction.
-func (s llrbString) Less(i llrb.Item) bool {
-	return s.l(s.s, i.(llrbString).s)
+// Less satisfies the BTree.Less interface using the btreeString's LessFunction.
+func (s btreeString) Less(i btree.Item) bool {
+	return s.l(s.s, i.(btreeString).s)
 }
 
-// LLRBIndex is an implementation of the Index interface
-// using Petar Maymounkov's LLRB tree.
-type LLRBIndex struct {
+// BTreeIndex is an implementation of the Index interface using google/btree.
+type BTreeIndex struct {
 	sync.RWMutex
 	LessFunction
-	*llrb.LLRB
+	*btree.BTree
 }
 
-// Initialize populates the LLRB tree with data from the keys channel,
-// according to the passed less function. It's destructive to the LLRBIndex.
-func (i *LLRBIndex) Initialize(less LessFunction, keys <-chan string) {
+// Initialize populates the BTree tree with data from the keys channel,
+// according to the passed less function. It's destructive to the BTreeIndex.
+func (i *BTreeIndex) Initialize(less LessFunction, keys <-chan string) {
 	i.Lock()
 	defer i.Unlock()
 	i.LessFunction = less
-	i.LLRB = rebuild(less, keys)
+	i.BTree = rebuild(less, keys)
 }
 
-// Insert inserts the given key (only) into the LLRB tree.
-func (i *LLRBIndex) Insert(key string) {
+// Insert inserts the given key (only) into the BTree tree.
+func (i *BTreeIndex) Insert(key string) {
 	i.Lock()
 	defer i.Unlock()
-	if i.LLRB == nil || i.LessFunction == nil {
+	if i.BTree == nil || i.LessFunction == nil {
 		panic("uninitialized index")
 	}
-	i.LLRB.ReplaceOrInsert(llrbString{s: key, l: i.LessFunction})
+	i.BTree.ReplaceOrInsert(btreeString{s: key, l: i.LessFunction})
 }
 
-// Delete removes the given key (only) from the LLRB tree.
-func (i *LLRBIndex) Delete(key string) {
+// Delete removes the given key (only) from the BTree tree.
+func (i *BTreeIndex) Delete(key string) {
 	i.Lock()
 	defer i.Unlock()
-	if i.LLRB == nil || i.LessFunction == nil {
+	if i.BTree == nil || i.LessFunction == nil {
 		panic("uninitialized index")
 	}
-	i.LLRB.Delete(llrbString{s: key, l: i.LessFunction})
+	i.BTree.Delete(btreeString{s: key, l: i.LessFunction})
 }
 
 // Keys yields a maximum of n keys in order. If the passed 'from' key is empty,
 // Keys will return the first n keys. If the passed 'from' key is non-empty, the
 // first key in the returned slice will be the key that immediately follows the
 // passed key, in key order.
-func (i *LLRBIndex) Keys(from string, n int) []string {
+func (i *BTreeIndex) Keys(from string, n int) []string {
 	i.RLock()
 	defer i.RUnlock()
 
-	if i.LLRB == nil || i.LessFunction == nil {
+	if i.BTree == nil || i.LessFunction == nil {
 		panic("uninitialized index")
 	}
 
-	if i.LLRB.Len() <= 0 {
+	if i.BTree.Len() <= 0 {
 		return []string{}
 	}
 
-	llrbFrom := llrbString{s: from, l: i.LessFunction}
+	btreeFrom := btreeString{s: from, l: i.LessFunction}
 	skipFirst := true
-	if len(from) <= 0 || !i.LLRB.Has(llrbFrom) {
-		// no such key, so start at the top
-		llrbFrom = i.LLRB.Min().(llrbString)
+	if len(from) <= 0 || !i.BTree.Has(btreeFrom) {
+		// no such key, so fabricate an always-smallest item
+		btreeFrom = btreeString{s: "", l: func(string, string) bool { return true }}
 		skipFirst = false
 	}
 
 	keys := []string{}
-	iterator := func(i llrb.Item) bool {
-		keys = append(keys, i.(llrbString).s)
+	iterator := func(i btree.Item) bool {
+		keys = append(keys, i.(btreeString).s)
 		return len(keys) < n
 	}
-	i.LLRB.AscendGreaterOrEqual(llrbFrom, iterator)
+	i.BTree.AscendGreaterOrEqual(btreeFrom, iterator)
 
 	if skipFirst && len(keys) > 0 {
 		keys = keys[1:]
@@ -107,10 +106,10 @@ func (i *LLRBIndex) Keys(from string, n int) []string {
 
 // rebuildIndex does the work of regenerating the index
 // with the given keys.
-func rebuild(less LessFunction, keys <-chan string) *llrb.LLRB {
-	tree := llrb.New()
+func rebuild(less LessFunction, keys <-chan string) *btree.BTree {
+	tree := btree.New(2)
 	for key := range keys {
-		tree.ReplaceOrInsert(llrbString{s: key, l: less})
+		tree.ReplaceOrInsert(btreeString{s: key, l: less})
 	}
 	return tree
 }

From 7bd0dfca044d62d39998f92c3aa7641d3a77fc2e Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Thu, 31 Mar 2016 15:55:08 +0200
Subject: [PATCH 0056/1304] pubkey: simplify the code

Just assume that DefaultTransport _is_ an *http.Transport behind the
RoundTripper interface. If this is not true in future, we can adapt.
---
 rkt/pubkey/pubkey.go | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/rkt/pubkey/pubkey.go b/rkt/pubkey/pubkey.go
index 000dec8c53..006954b44c 100644
--- a/rkt/pubkey/pubkey.go
+++ b/rkt/pubkey/pubkey.go
@@ -21,12 +21,10 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"net"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/coreos/rkt/pkg/keystore"
 	rktlog "github.com/coreos/rkt/pkg/log"
@@ -240,28 +238,16 @@ func getClient(skipTLSCheck bool) *http.Client {
 		return http.DefaultClient
 	}
 	client := *http.DefaultClient
-	var tr *http.Transport
-	// default transport is hidden behind the RoundTripper
-	// interface, so we can't easily make a copy of it
-	if transport, ok := http.DefaultTransport.(*http.Transport); ok {
-		trCopy := *transport
-		tr = &trCopy
-	} else {
-		// meh, an already outdated copy from golang's
-		// net/http DefaultTransport defintion, without the
-		// ExpectContinueTimeout field set, because it exists
-		// only in go1.6
-		tr = &http.Transport{
-			Proxy: http.ProxyFromEnvironment,
-			Dial: (&net.Dialer{
-				Timeout:   30 * time.Second,
-				KeepAlive: 30 * time.Second,
-			}).Dial,
-			TLSHandshakeTimeout: 10 * time.Second,
-		}
+	// Default transport is hidden behind the RoundTripper
+	// interface, so we can't easily make a copy of it. If this
+	// ever panics, we will have to adapt.
+	realTransport := http.DefaultTransport.(*http.Transport)
+	tr := *realTransport
+	if tr.TLSClientConfig == nil {
+		tr.TLSClientConfig = &tls.Config{}
 	}
-	tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
-	client.Transport = tr
+	tr.TLSClientConfig.InsecureSkipVerify = true
+	client.Transport = &tr
 	return &client
 }
 

From d16d80123e4435c9542ff1207137ee360ab44541 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 31 Mar 2016 18:53:46 +0200
Subject: [PATCH 0057/1304] README: add known issue about overlayfs+selinux

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b38c809df0..a4fbf4049a 100644
--- a/README.md
+++ b/README.md
@@ -82,4 +82,6 @@ Due to a bug in the Linux kernel, using rkt's overlay support on top of an overl
 
 Due to a bug in the Linux kernel, rkt will not work when /var/lib/rkt is on btrfs ([#2175](https://github.com/coreos/rkt/issues/2175)).
 
+Due to a bug in the Linux kernel, using rkt's overlay support in conjunction with SELinux requires a set of patches that are only currently available on some Linux distributions (for example, [CoreOS Linux](https://github.com/coreos/coreos-overlay/tree/master/sys-kernel/coreos-sources/files/4.4)). Work is ongoing to merge this work into the mainline Linux kernel ([#1727](https://github.com/coreos/rkt/issues/1727#issuecomment-173203129)).
+
 Linux 3.18+ is required to successfully garbage collect rkt pods when system services such as udevd are in a slave mount namespace (see [lazy umounts on unlinked files and directories](https://github.com/torvalds/linux/commit/8ed936b) and [#1922](https://github.com/coreos/rkt/issues/1922)).

From cabcf866da75b37242d6a55eba65973e2ad11396 Mon Sep 17 00:00:00 2001
From: 0xbzho <0xbzho@gmail.com>
Date: Fri, 1 Apr 2016 09:14:10 +0100
Subject: [PATCH 0058/1304] Fix broken links in networking docs

---
 Documentation/networking/overview.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/networking/overview.md b/Documentation/networking/overview.md
index 384ce333c5..964aff3941 100644
--- a/Documentation/networking/overview.md
+++ b/Documentation/networking/overview.md
@@ -1,10 +1,10 @@
 # Networking
 
-On some of rkt's subcommands *([run](subcommands/run.md), [run-prepared](subcommands/run-prepared.md))*, the `--net` flag allows you to configure the pod's network.
+On some of rkt's subcommands *([run](../subcommands/run.md), [run-prepared](../subcommands/run-prepared.md))*, the `--net` flag allows you to configure the pod's network.
 The various options can be grouped by two categories:
 
-* [host mode](#host mode)
-* [contained mode (default)](#contained mode)
+* [host mode](#host-mode)
+* [contained mode (default)](#contained-mode)
 
 This document gives a brief overview of the supported plugins.
 More examples and advanced topics are linked in the [more docs](#more-docs) section.
@@ -333,7 +333,7 @@ The pod's TCP port 80 can be mapped to an arbitrary port on the host during rkt
 Now, any traffic arriving on host's TCP port 8888 will be forwarded to the pod on port 80.
 
 rkt also supports socket activation.
-This is documented in [Socket-activated service](using-rkt-with-systemd.md#socket-activated-service).
+This is documented in [Socket-activated service](../using-rkt-with-systemd.md#socket-activated-service).
 
 ## More Docs
 

From e1523587fd3e9ebedee16b9d3bf7fcb0adce2148 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 1 Apr 2016 10:28:13 +0200
Subject: [PATCH 0059/1304] deps: bump go-iptables to v0.1.0

---
 Godeps/Godeps.json                            |   3 +-
 .../coreos/go-iptables/iptables/iptables.go   | 141 +++++++++++-------
 .../coreos/go-iptables/iptables/lock.go       |  84 +++++++++++
 3 files changed, 176 insertions(+), 52 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/lock.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8e30ea4b2e..a5629f8561 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -221,7 +221,8 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/go-iptables/iptables",
-			"Rev": "74b0926558061d3a23824e9c18c9cf9c1b9c11f4"
+			"Comment": "v0.1.0",
+			"Rev": "fbb73372b87f6e89951c2b6b31470c2c9d5cfae3"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-semver/semver",
diff --git a/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go b/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go
index 4d8db73ab4..4b2f2f2f4b 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go
@@ -17,7 +17,7 @@ package iptables
 import (
 	"bytes"
 	"fmt"
-	"log"
+	"io"
 	"os/exec"
 	"regexp"
 	"strconv"
@@ -40,7 +40,9 @@ func (e *Error) Error() string {
 }
 
 type IPTables struct {
-	path string
+	path     string
+	hasCheck bool
+	hasWait  bool
 }
 
 func New() (*IPTables, error) {
@@ -48,33 +50,34 @@ func New() (*IPTables, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	return &IPTables{path}, nil
+	checkPresent, waitPresent, err := getIptablesCommandSupport()
+	if err != nil {
+		return nil, fmt.Errorf("error checking iptables version: %v", err)
+	}
+	ipt := IPTables{
+		path:     path,
+		hasCheck: checkPresent,
+		hasWait:  waitPresent,
+	}
+	return &ipt, nil
 }
 
 // Exists checks if given rulespec in specified table/chain exists
 func (ipt *IPTables) Exists(table, chain string, rulespec ...string) (bool, error) {
-	checkPresent, err := getIptablesHasCheckCommand()
-	if err != nil {
-		log.Printf("Error checking iptables version, assuming version at least 1.4.11: %v", err)
-		checkPresent = true
-	}
+	if !ipt.hasCheck {
+		return ipt.existsForOldIptables(table, chain, rulespec)
 
-	if !checkPresent {
-		cmd := append([]string{"-A", chain}, rulespec...)
-		return existsForOldIpTables(table, strings.Join(cmd, " "))
-	} else {
-		cmd := append([]string{"-t", table, "-C", chain}, rulespec...)
-		err := ipt.run(cmd...)
-
-		switch {
-		case err == nil:
-			return true, nil
-		case err.(*Error).ExitStatus() == 1:
-			return false, nil
-		default:
-			return false, err
-		}
+	}
+	cmd := append([]string{"-t", table, "-C", chain}, rulespec...)
+	err := ipt.run(cmd...)
+	eerr, eok := err.(*Error)
+	switch {
+	case err == nil:
+		return true, nil
+	case eok && eerr.ExitStatus() == 1:
+		return false, nil
+	default:
+		return false, err
 	}
 }
 
@@ -112,16 +115,10 @@ func (ipt *IPTables) Delete(table, chain string, rulespec ...string) error {
 
 // List rules in specified table/chain
 func (ipt *IPTables) List(table, chain string) ([]string, error) {
-	var stdout, stderr bytes.Buffer
-	cmd := exec.Cmd{
-		Path:   ipt.path,
-		Args:   []string{ipt.path, "--wait", "-t", table, "-S", chain},
-		Stdout: &stdout,
-		Stderr: &stderr,
-	}
-
-	if err := cmd.Run(); err != nil {
-		return nil, &Error{*(err.(*exec.ExitError)), stderr.String()}
+	args := []string{"-t", table, "-S", chain}
+	var stdout bytes.Buffer
+	if err := ipt.runWithOutput(args, &stdout); err != nil {
+		return nil, err
 	}
 
 	rules := strings.Split(stdout.String(), "\n")
@@ -136,15 +133,16 @@ func (ipt *IPTables) NewChain(table, chain string) error {
 	return ipt.run("-t", table, "-N", chain)
 }
 
-// ClearChain flushed (deletes all rules) in the specifed table/chain.
-// If the chain does not exist, new one will be created
+// ClearChain flushed (deletes all rules) in the specified table/chain.
+// If the chain does not exist, a new one will be created
 func (ipt *IPTables) ClearChain(table, chain string) error {
 	err := ipt.NewChain(table, chain)
 
+	eerr, eok := err.(*Error)
 	switch {
 	case err == nil:
 		return nil
-	case err.(*Error).ExitStatus() == 1:
+	case eok && eerr.ExitStatus() == 1:
 		// chain already exists. Flush (clear) it.
 		return ipt.run("-t", table, "-F", chain)
 	default:
@@ -152,18 +150,46 @@ func (ipt *IPTables) ClearChain(table, chain string) error {
 	}
 }
 
+// RenameChain renames the old chain to the new one.
+func (ipt *IPTables) RenameChain(table, oldChain, newChain string) error {
+	return ipt.run("-t", table, "-E", oldChain, newChain)
+}
+
 // DeleteChain deletes the chain in the specified table.
 // The chain must be empty
 func (ipt *IPTables) DeleteChain(table, chain string) error {
 	return ipt.run("-t", table, "-X", chain)
 }
 
+// run runs an iptables command with the given arguments, ignoring
+// any stdout output
 func (ipt *IPTables) run(args ...string) error {
+	return ipt.runWithOutput(args, nil)
+}
+
+// runWithOutput runs an iptables command with the given arguments,
+// writing any stdout output to the given writer
+func (ipt *IPTables) runWithOutput(args []string, stdout io.Writer) error {
+	args = append([]string{ipt.path}, args...)
+	if ipt.hasWait {
+		args = append(args, "--wait")
+	} else {
+		fmu, err := newXtablesFileLock()
+		if err != nil {
+			return err
+		}
+		ul, err := fmu.tryLock()
+		if err != nil {
+			return err
+		}
+		defer ul.Unlock()
+	}
+
 	var stderr bytes.Buffer
-	args = append([]string{"--wait"}, args...)
 	cmd := exec.Cmd{
 		Path:   ipt.path,
-		Args:   append([]string{ipt.path}, args...),
+		Args:   args,
+		Stdout: stdout,
 		Stderr: &stderr,
 	}
 
@@ -174,19 +200,19 @@ func (ipt *IPTables) run(args ...string) error {
 	return nil
 }
 
-// Checks if iptables has the "-C" flag
-func getIptablesHasCheckCommand() (bool, error) {
+// Checks if iptables has the "-C" and "--wait" flag
+func getIptablesCommandSupport() (bool, bool, error) {
 	vstring, err := getIptablesVersionString()
 	if err != nil {
-		return false, err
+		return false, false, err
 	}
 
 	v1, v2, v3, err := extractIptablesVersion(vstring)
 	if err != nil {
-		return false, err
+		return false, false, err
 	}
 
-	return iptablesHasCheckCommand(v1, v2, v3), nil
+	return iptablesHasCheckCommand(v1, v2, v3), iptablesHasWaitCommand(v1, v2, v3), nil
 }
 
 // getIptablesVersion returns the first three components of the iptables version.
@@ -242,15 +268,28 @@ func iptablesHasCheckCommand(v1 int, v2 int, v3 int) bool {
 	return false
 }
 
+// Checks if an iptables version is after 1.4.20, when --wait was added
+func iptablesHasWaitCommand(v1 int, v2 int, v3 int) bool {
+	if v1 > 1 {
+		return true
+	}
+	if v1 == 1 && v2 > 4 {
+		return true
+	}
+	if v1 == 1 && v2 == 4 && v3 >= 20 {
+		return true
+	}
+	return false
+}
+
 // Checks if a rule specification exists for a table
-func existsForOldIpTables(table string, ruleSpec string) (bool, error) {
-	cmd := exec.Command("iptables", "-t", table, "-S")
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
+func (ipt *IPTables) existsForOldIptables(table, chain string, rulespec []string) (bool, error) {
+	rs := strings.Join(append([]string{"-A", chain}, rulespec...), " ")
+	args := []string{"-t", table, "-S"}
+	var stdout bytes.Buffer
+	err := ipt.runWithOutput(args, &stdout)
 	if err != nil {
 		return false, err
 	}
-	rules := out.String()
-	return strings.Contains(rules, ruleSpec), nil
+	return strings.Contains(stdout.String(), rs), nil
 }
diff --git a/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/lock.go b/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/lock.go
new file mode 100644
index 0000000000..a88e92b4e4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/lock.go
@@ -0,0 +1,84 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package iptables
+
+import (
+	"os"
+	"sync"
+	"syscall"
+)
+
+const (
+	// In earlier versions of iptables, the xtables lock was implemented
+	// via a Unix socket, but now flock is used via this lockfile:
+	// http://git.netfilter.org/iptables/commit/?id=aa562a660d1555b13cffbac1e744033e91f82707
+	// Note the LSB-conforming "/run" directory does not exist on old
+	// distributions, so assume "/var" is symlinked
+	xtablesLockFilePath = "/var/run/xtables.lock"
+
+	defaultFilePerm = 0600
+)
+
+type Unlocker interface {
+	Unlock() error
+}
+
+type nopUnlocker struct{}
+
+func (_ nopUnlocker) Unlock() error { return nil }
+
+type fileLock struct {
+	// mu is used to protect against concurrent invocations from within this process
+	mu sync.Mutex
+	fd int
+}
+
+// tryLock takes an exclusive lock on the xtables lock file without blocking.
+// This is best-effort only: if the exclusive lock would block (i.e. because
+// another process already holds it), no error is returned. Otherwise, any
+// error encountered during the locking operation is returned.
+// The returned Unlocker should be used to release the lock when the caller is
+// done invoking iptables commands.
+func (l *fileLock) tryLock() (Unlocker, error) {
+	l.mu.Lock()
+	err := syscall.Flock(l.fd, syscall.LOCK_EX|syscall.LOCK_NB)
+	switch err {
+	case syscall.EWOULDBLOCK:
+		l.mu.Unlock()
+		return nopUnlocker{}, nil
+	case nil:
+		return l, nil
+	default:
+		l.mu.Unlock()
+		return nil, err
+	}
+}
+
+// Unlock closes the underlying file, which implicitly unlocks it as well. It
+// also unlocks the associated mutex.
+func (l *fileLock) Unlock() error {
+	defer l.mu.Unlock()
+	return syscall.Close(l.fd)
+}
+
+// newXtablesFileLock opens a new lock on the xtables lockfile without
+// acquiring the lock
+func newXtablesFileLock() (*fileLock, error) {
+	fd, err := syscall.Open(xtablesLockFilePath, os.O_CREATE, defaultFilePerm)
+	if err != nil {
+		return nil, err
+	}
+	return &fileLock{fd: fd}, nil
+}

From fd4d49b6e59b8ca08e001ec7a5c3f774e01ea31d Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 1 Apr 2016 11:09:42 +0200
Subject: [PATCH 0060/1304] test: TestAPIServiceCgroup: increase timeout

A timeout of 10 seconds is not enough for slow machines.

https://github.com/coreos/rkt/issues/2357
---
 tests/rkt_api_service_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index d3dd9244bd..40606513eb 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -467,7 +467,7 @@ func TestAPIServiceCgroup(t *testing.T) {
 		}
 	}()
 
-	testutils.WaitOrTimeout(t, time.Second*10, done)
+	testutils.WaitOrTimeout(t, time.Second*30, done)
 
 	var cgroups []string
 

From 443073354c7d2bb40a3f69d520f4f45f69f2f31d Mon Sep 17 00:00:00 2001
From: Josh Wood <j@coreos.com>
Date: Fri, 1 Apr 2016 01:27:38 -0700
Subject: [PATCH 0061/1304] Doc/subcmd/run: Add docker port name convention

Update link to contained network doc#heading.

Ref #2113.
---
 Documentation/subcommands/run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 411863880d..613ea9f28c 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -342,7 +342,7 @@ For more details see the [hacking documentation](../hacking.md).
 | `--no-overlay` |  `false` | `true` or `false` | Disable overlay filesystem |
 | `--no-store` |  `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
 | `--pod-manifest` |  `` | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect |
-| `--port` |  `` | A port number | Ports to expose on the host (requires [contained network](https://github.com/coreos/rkt/blob/master/Documentation/networking.md#contained-mode)). Syntax: --port=NAME:HOSTPORT |
+| `--port` |  `` | A port number | Ports to expose on the host (requires [contained network](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md#contained-mode)). Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080` |
 | `--private-users` |  `false` | `true` or `false` | Run within user namespaces (experimental) |
 | `--set-env` |  `` | An environment variable. Syntax `NAME=VALUE` | An environment variable to set for apps |
 | `--signature` |  `` | A file path | Local signature file to use in validating the preceding image |

From 37df88e7b13ec8e8779d66d9ee932378812c4d94 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 1 Apr 2016 12:27:08 +0200
Subject: [PATCH 0062/1304] Godeps: bump coreos/go-tspi to v0.1.1

---
 Godeps/Godeps.json                            |  21 +-
 .../coreos/go-tspi/tpmclient/tpmclient.go     | 104 +++-
 .../github.com/coreos/go-tspi/tspi/context.go | 107 ----
 .../github.com/coreos/go-tspi/tspi/hash.go    |  38 --
 .../src/github.com/coreos/go-tspi/tspi/key.go |  75 ---
 .../src/github.com/coreos/go-tspi/tspi/nv.go  |  44 --
 .../github.com/coreos/go-tspi/tspi/pcrs.go    |  61 ---
 .../github.com/coreos/go-tspi/tspi/policy.go  |  31 --
 .../src/github.com/coreos/go-tspi/tspi/tpm.go | 189 -------
 .../{tspi/tspi.go => tspiconst/tspiconst.go}  | 461 +-----------------
 .../verification.go}                          | 234 ++-------
 11 files changed, 151 insertions(+), 1214 deletions(-)
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/context.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/hash.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/key.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/nv.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/pcrs.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/policy.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/tpm.go
 rename Godeps/_workspace/src/github.com/coreos/go-tspi/{tspi/tspi.go => tspiconst/tspiconst.go} (68%)
 rename Godeps/_workspace/src/github.com/coreos/go-tspi/{attestation/attestation.go => verification/verification.go} (84%)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8e30ea4b2e..4b3a8dc506 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -58,12 +58,12 @@
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local/backend",
-			"Comment": "v0.1.0-84-gb7ff8ab",
+			"Comment": "v0.1.0-84-gb7ff8ab158bd",
 			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local/backend/disk",
-			"Comment": "v0.1.0-84-gb7ff8ab",
+			"Comment": "v0.1.0-84-gb7ff8ab158bd",
 			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
 		},
 		{
@@ -248,16 +248,19 @@
 			"Rev": "7b2428fec40033549c68f54e26e89e7ca9a9ce31"
 		},
 		{
-			"ImportPath": "github.com/coreos/go-tspi/attestation",
-			"Rev": "8d98d77f9fc5e3a93227cbcde7abb8bdf1a29869"
+			"ImportPath": "github.com/coreos/go-tspi/tpmclient",
+			"Comment": "v0.1.1",
+			"Rev": "03955c59fff97f9e38e7e32c68ac4db21a2aea2b"
 		},
 		{
-			"ImportPath": "github.com/coreos/go-tspi/tpmclient",
-			"Rev": "8d98d77f9fc5e3a93227cbcde7abb8bdf1a29869"
+			"ImportPath": "github.com/coreos/go-tspi/tspiconst",
+			"Comment": "v0.1.1",
+			"Rev": "03955c59fff97f9e38e7e32c68ac4db21a2aea2b"
 		},
 		{
-			"ImportPath": "github.com/coreos/go-tspi/tspi",
-			"Rev": "8d98d77f9fc5e3a93227cbcde7abb8bdf1a29869"
+			"ImportPath": "github.com/coreos/go-tspi/verification",
+			"Comment": "v0.1.1",
+			"Rev": "03955c59fff97f9e38e7e32c68ac4db21a2aea2b"
 		},
 		{
 			"ImportPath": "github.com/coreos/ioprogress",
@@ -337,7 +340,7 @@
 		},
 		{
 			"ImportPath": "github.com/godbus/dbus/introspect",
-			"Comment": "v3-6-ga1b8ba5",
+			"Comment": "v3-6-ga1b8ba5163b7",
 			"Rev": "a1b8ba5163b7f041b22761461eabd02b70d1f824"
 		},
 		{
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tpmclient/tpmclient.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tpmclient/tpmclient.go
index e71aa1464f..fb5279b2a1 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tpmclient/tpmclient.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-tspi/tpmclient/tpmclient.go
@@ -24,8 +24,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/coreos/go-tspi/attestation"
-	"github.com/coreos/go-tspi/tspi"
+	"github.com/coreos/go-tspi/tspiconst"
+	"github.com/coreos/go-tspi/verification"
 )
 
 // TPMClient represents a connection to a system running a daemon providing
@@ -35,8 +35,17 @@ type TPMClient struct {
 	timeout time.Duration
 }
 
+const (
+	GetEKCertURL    = "/v1/getEkcert"
+	ExtendURL       = "/v1/extend"
+	QuoteURL        = "/v1/quote"
+	GenerateAikURL  = "/v1/generateAik"
+	GenerateKeyURL  = "/v1/generateKey"
+	AikChallengeURL = "/v1/aikChallenge"
+)
+
 func (client *TPMClient) get(endpoint string) (*http.Response, error) {
-	url := fmt.Sprintf("http://%s/%s", client.host, endpoint)
+	url := fmt.Sprintf("http://%s%s", client.host, endpoint)
 	httpClient := &http.Client{
 		Timeout: client.timeout,
 	}
@@ -45,7 +54,7 @@ func (client *TPMClient) get(endpoint string) (*http.Response, error) {
 }
 
 func (client *TPMClient) post(endpoint string, data io.Reader) (*http.Response, error) {
-	url := fmt.Sprintf("http://%s/%s", client.host, endpoint)
+	url := fmt.Sprintf("http://%s%s", client.host, endpoint)
 	httpClient := &http.Client{
 		Timeout: client.timeout,
 	}
@@ -53,7 +62,7 @@ func (client *TPMClient) post(endpoint string, data io.Reader) (*http.Response,
 	return resp, err
 }
 
-type ekcertResponse struct {
+type EkcertResponse struct {
 	EKCert []byte
 }
 
@@ -61,9 +70,9 @@ type ekcertResponse struct {
 // is an X509 certificate containing the public half of the Endorsement Key
 // and a signature chain chaining back to a vendor-issued signing certificate.
 func (client *TPMClient) GetEKCert() (ekcert []byte, err error) {
-	var ekcertData ekcertResponse
+	var ekcertData EkcertResponse
 
-	ekresp, err := client.get("v1/getEkcert")
+	ekresp, err := client.get(GetEKCertURL)
 	if err != nil {
 		return nil, fmt.Errorf("Can't obtain ekcert: %s", err)
 	}
@@ -81,7 +90,7 @@ func (client *TPMClient) GetEKCert() (ekcert []byte, err error) {
 	return ekcertData.EKCert, nil
 }
 
-type aikResponse struct {
+type AikResponse struct {
 	AIKBlob []byte
 	AIKPub  []byte
 }
@@ -90,9 +99,9 @@ type aikResponse struct {
 // It returns an unencrypted copy of the public half of the AIK, along with
 // a TSPI key blob encrypted by the TPM.
 func (client *TPMClient) GenerateAIK() (aikpub []byte, aikblob []byte, err error) {
-	var aikData aikResponse
+	var aikData AikResponse
 
-	aikresp, err := client.post("v1/generateAik", nil)
+	aikresp, err := client.post(GenerateAikURL, nil)
 	if err != nil {
 		return nil, nil, fmt.Errorf("Can't generate AIK: %s", err)
 	}
@@ -113,13 +122,54 @@ func (client *TPMClient) GenerateAIK() (aikpub []byte, aikblob []byte, err error
 	return aikpub, aikblob, nil
 }
 
-type challengeData struct {
+type KeyData struct {
+	KeyFlags int
+}
+
+type KeyResponse struct {
+	KeyBlob []byte
+	KeyPub  []byte
+}
+
+// GenerateKey requests that the TPM generate a new keypair
+func (client *TPMClient) GenerateKey(flags int) (keypub []byte, keyblob []byte, err error) {
+	var keyData KeyData
+	var keyResponse KeyResponse
+
+	keyData.KeyFlags = flags
+	request, err := json.Marshal(keyData)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't construct request JSON: %s", err)
+	}
+
+	keyresp, err := client.post(GenerateKeyURL, bytes.NewBuffer(request))
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't generate key: %s", err)
+	}
+	defer keyresp.Body.Close()
+	body, err := ioutil.ReadAll(keyresp.Body)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't read key response: %s", err)
+	}
+
+	err = json.Unmarshal(body, &keyResponse)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't parse key response: %s (%s)", err, body)
+	}
+
+	keypub = keyResponse.KeyPub
+	keyblob = keyResponse.KeyBlob
+
+	return keypub, keyblob, nil
+}
+
+type ChallengeData struct {
 	AIK     []byte
 	Asymenc []byte
 	Symenc  []byte
 }
 
-type challengeResponse struct {
+type ChallengeResponse struct {
 	Response []byte
 }
 
@@ -130,8 +180,8 @@ type challengeResponse struct {
 // provides the AES key used to encrypt symenc. Decrypting symenc provides
 // the original secret, which is then returned.
 func (client *TPMClient) ValidateAIK(aikblob []byte, asymenc []byte, symenc []byte) (secret []byte, err error) {
-	var challenge challengeData
-	var response challengeResponse
+	var challenge ChallengeData
+	var response ChallengeResponse
 
 	challenge.AIK = aikblob
 	challenge.Asymenc = asymenc
@@ -141,7 +191,7 @@ func (client *TPMClient) ValidateAIK(aikblob []byte, asymenc []byte, symenc []by
 	if err != nil {
 		return nil, fmt.Errorf("Can't construct challenge JSON: %s", err)
 	}
-	chalresp, err := client.post("v1/aikChallenge", bytes.NewBuffer(request))
+	chalresp, err := client.post(AikChallengeURL, bytes.NewBuffer(request))
 	if err != nil {
 		return nil, fmt.Errorf("Can't perform AIK challenge: %s", err)
 	}
@@ -158,7 +208,7 @@ func (client *TPMClient) ValidateAIK(aikblob []byte, asymenc []byte, symenc []by
 	return response.Response, nil
 }
 
-type extendInput struct {
+type ExtendInput struct {
 	Pcr       int
 	Eventtype int
 	Data      []byte
@@ -170,7 +220,7 @@ type extendInput struct {
 // event is not nil, data and event will be hashed to generate the extension
 // value. Event will then be stored in the TPM event log.
 func (client *TPMClient) Extend(pcr int, eventtype int, data []byte, event string) error {
-	var extendData extendInput
+	var extendData ExtendInput
 
 	extendData.Pcr = pcr
 	extendData.Eventtype = eventtype
@@ -181,7 +231,7 @@ func (client *TPMClient) Extend(pcr int, eventtype int, data []byte, event strin
 	if err != nil {
 		return fmt.Errorf("Can't construct extension JSON: %s", err)
 	}
-	chalresp, err := client.post("v1/extend", bytes.NewBuffer(request))
+	chalresp, err := client.post(ExtendURL, bytes.NewBuffer(request))
 	if err != nil {
 		return fmt.Errorf("Can't perform PCR extension: %s", err)
 	}
@@ -190,25 +240,25 @@ func (client *TPMClient) Extend(pcr int, eventtype int, data []byte, event strin
 	return nil
 }
 
-type quoteData struct {
+type QuoteData struct {
 	AIK   []byte
 	PCRs  []int
 	Nonce []byte
 }
 
-type quoteResponse struct {
+type QuoteResponse struct {
 	Data       []byte
 	Validation []byte
 	PCRValues  [][]byte
-	Events     []tspi.Log
+	Events     []tspiconst.Log
 }
 
 // GetQuote obtains a PCR quote from the TPM. It takes the aikpub Tspi Key, the
 // encrypted AIK blob and a list of PCRs as arguments. The response will
 // contain an array of PCR values, an array of log entries and any error.
-func (client *TPMClient) GetQuote(aikpub []byte, aikblob []byte, pcrs []int) (pcrvals [][]byte, log []tspi.Log, err error) {
-	var quoteRequest quoteData
-	var response quoteResponse
+func (client *TPMClient) GetQuote(aikpub []byte, aikblob []byte, pcrs []int) (pcrvals [][]byte, log []tspiconst.Log, err error) {
+	var quoteRequest QuoteData
+	var response QuoteResponse
 
 	nonce := make([]byte, 20)
 	_, err = rand.Read(nonce)
@@ -224,7 +274,7 @@ func (client *TPMClient) GetQuote(aikpub []byte, aikblob []byte, pcrs []int) (pc
 	if err != nil {
 		return nil, nil, fmt.Errorf("Can't construct quote request JSON: %s", err)
 	}
-	chalresp, err := client.post("v1/quote", bytes.NewBuffer(request))
+	chalresp, err := client.post(QuoteURL, bytes.NewBuffer(request))
 	if err != nil {
 		return nil, nil, fmt.Errorf("Can't perform obtain quote: %s", err)
 	}
@@ -239,9 +289,9 @@ func (client *TPMClient) GetQuote(aikpub []byte, aikblob []byte, pcrs []int) (pc
 		return nil, nil, fmt.Errorf("Can't parse quote response: %s", err)
 	}
 
-	aikmod := tspi.ModulusFromBlob(aikpub)
+	aikmod := aikpub[28:]
 
-	err = attestation.QuoteVerify(response.Data, response.Validation, aikmod, response.PCRValues, nonce)
+	err = verification.QuoteVerify(response.Data, response.Validation, aikmod, response.PCRValues, nonce)
 
 	if err != nil {
 		return nil, nil, fmt.Errorf("Can't verify quote: %s", err)
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/context.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/context.go
deleted file mode 100644
index 306506a86e..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/context.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tspi
-
-// #include <trousers/tss.h>
-import "C"
-import "unsafe"
-
-// Context is a TSS context
-type Context struct {
-	context C.TSS_HCONTEXT
-	tpm     TPM
-}
-
-// NewContext returns a TSS daemon context
-func NewContext() (*Context, error) {
-	context := new(Context)
-	err := tspiError(C.Tspi_Context_Create(&context.context))
-	return context, err
-}
-
-// Connect opens a connection between the context and the TSS daemon. It
-// returns an error on failure.
-func (context *Context) Connect() error {
-	var tpmhandle C.TSS_HTPM
-	err := tspiError(C.Tspi_Context_Connect(context.context, nil))
-	if err != nil {
-		return err
-	}
-	C.Tspi_Context_GetTpmObject(context.context, &tpmhandle)
-	context.tpm = TPM{handle: tpmhandle, context: context.context}
-	return nil
-}
-
-// Close closes the connection between the context and the TSS daemon. It
-// returns an error on failure.
-func (context *Context) Close() error {
-	err := tspiError(C.Tspi_Context_Close(context.context))
-	return err
-}
-
-// CreateNV creates a TSS object referring to a TPM NVRAM area. It returns a
-// reference to the object and any error.
-func (context *Context) CreateNV() (*NV, error) {
-	var handle C.TSS_HNVSTORE
-	err := tspiError(C.Tspi_Context_CreateObject(context.context, C.TSS_OBJECT_TYPE_NV, 0, (*C.TSS_HOBJECT)(&handle)))
-	return &NV{handle: handle, context: context.context}, err
-}
-
-// CreateKey creates a TSS object referring to a TPM key. It returns a
-// reference to the object and any error.
-func (context *Context) CreateKey(flags int) (*Key, error) {
-	var handle C.TSS_HKEY
-	err := tspiError(C.Tspi_Context_CreateObject(context.context, C.TSS_OBJECT_TYPE_RSAKEY, (C.TSS_FLAG)(flags), (*C.TSS_HOBJECT)(&handle)))
-	return &Key{handle: handle, context: context.context}, err
-}
-
-// LoadKeyByUUID loads the key referenced by UUID. The storetype argument
-// indicates whether the key should be obtained from the system or user
-// stores. It returns a reference to the key and any error.
-func (context *Context) LoadKeyByUUID(storetype int, uuid C.TSS_UUID) (*Key, error) {
-	var handle C.TSS_HKEY
-	err := tspiError(C.Tspi_Context_LoadKeyByUUID(context.context, (C.TSS_FLAG)(storetype), uuid, &handle))
-	return &Key{handle: handle, context: context.context}, err
-}
-
-// LoadKeyByBlob takes an encrypted key blob and reads it into the TPM. It
-// takes a reference to the parent key and the key blob, and returns a
-// reference to the key and any error.
-func (context *Context) LoadKeyByBlob(parent *Key, blob []byte) (*Key, error) {
-	var handle C.TSS_HKEY
-	err := tspiError(C.Tspi_Context_LoadKeyByBlob(context.context, parent.handle, (C.UINT32)(len(blob)), (*C.BYTE)(unsafe.Pointer(&blob[0])), &handle))
-	return &Key{handle: handle, context: context.context}, err
-}
-
-// GetTPM returns a reference to the TPM associated with this context
-func (context *Context) GetTPM() *TPM {
-	return &context.tpm
-}
-
-// CreatePolicy creates an object referring to a TSS policy. It returns a
-// reference to the object plus any error.
-func (context *Context) CreatePolicy(flags int) (*Policy, error) {
-	var handle C.TSS_HPOLICY
-	err := tspiError(C.Tspi_Context_CreateObject(context.context, C.TSS_OBJECT_TYPE_POLICY, (C.TSS_FLAG)(flags), (*C.TSS_HOBJECT)(&handle)))
-	return &Policy{handle: handle, context: context.context}, err
-}
-
-// CreatePCRs creates an object referring to a TSS PCR composite. It returns
-// a reference to the object plus any error.
-func (context *Context) CreatePCRs(flags int) (*PCRs, error) {
-	var handle C.TSS_HPCRS
-	err := tspiError(C.Tspi_Context_CreateObject(context.context, C.TSS_OBJECT_TYPE_PCRS, (C.TSS_FLAG)(flags), (*C.TSS_HOBJECT)(&handle)))
-	return &PCRs{handle: handle, context: context.context}, err
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/hash.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/hash.go
deleted file mode 100644
index 72cb161921..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/hash.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tspi
-
-// #include <trousers/tss.h>
-import "C"
-
-// Hash is a TSS hash
-type Hash struct {
-	handle  C.TSS_HHASH
-	context C.TSS_HCONTEXT
-}
-
-// Update updates a TSS hash with the data provided. It returns an error on
-// failure.
-func (hash *Hash) Update(data []byte) error {
-	err := tspiError(C.Tspi_Hash_UpdateHashValue(hash.handle, (C.UINT32)(len(data)), (*C.BYTE)(&data[0])))
-	return err
-}
-
-// Verify checks whether a hash matches the signature signed with the
-// provided key. It returns an error on failure.
-func (hash *Hash) Verify(key *Key, signature []byte) error {
-	err := tspiError(C.Tspi_Hash_VerifySignature(hash.handle, key.handle, (C.UINT32)(len(signature)), (*C.BYTE)(&signature[0])))
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/key.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/key.go
deleted file mode 100644
index 14e4ed4e7d..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/key.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tspi
-
-// #include <trousers/tss.h>
-import "C"
-import "unsafe"
-
-// ModulusFromBlob provides the modulus of a provided TSS key blob
-func ModulusFromBlob(blob []byte) []byte {
-	return blob[28:]
-}
-
-// Key is a TSS key
-type Key struct {
-	handle  C.TSS_HKEY
-	context C.TSS_HCONTEXT
-}
-
-// GetPolicy returns the policy associated with the key
-func (key *Key) GetPolicy(poltype int) (*Policy, error) {
-	var policyHandle C.TSS_HPOLICY
-	err := tspiError(C.Tspi_GetPolicyObject((C.TSS_HOBJECT)(key.handle), (C.TSS_FLAG)(poltype), &policyHandle))
-	return &Policy{handle: policyHandle, context: key.context}, err
-}
-
-// SetModulus sets the modulus of a public key to the provided value
-func (key *Key) SetModulus(n []byte) error {
-	err := tspiError(C.Tspi_SetAttribData((C.TSS_HOBJECT)(key.handle), C.TSS_TSPATTRIB_RSAKEY_INFO, C.TSS_TSPATTRIB_KEYINFO_RSA_MODULUS, (C.UINT32)(len(n)), (*C.BYTE)(unsafe.Pointer(&n[0]))))
-	return err
-}
-
-// GetModulus returns the modulus of the public key
-func (key *Key) GetModulus() (modulus []byte, err error) {
-	var dataLen C.UINT32
-	var cData *C.BYTE
-	err = tspiError(C.Tspi_GetAttribData((C.TSS_HOBJECT)(key.handle), C.TSS_TSPATTRIB_RSAKEY_INFO, C.TSS_TSPATTRIB_KEYINFO_RSA_MODULUS, &dataLen, &cData))
-	data := C.GoBytes(unsafe.Pointer(cData), (C.int)(dataLen))
-	C.Tspi_Context_FreeMemory(key.context, cData)
-	return data, err
-}
-
-// GetPubKeyBlob returns the public half of the key in TPM blob format
-func (key *Key) GetPubKeyBlob() (pubkey []byte, err error) {
-	var dataLen C.UINT32
-	var cData *C.BYTE
-	err = tspiError(C.Tspi_GetAttribData((C.TSS_HOBJECT)(key.handle), C.TSS_TSPATTRIB_KEY_BLOB, C.TSS_TSPATTRIB_KEYBLOB_PUBLIC_KEY, &dataLen, &cData))
-	data := C.GoBytes(unsafe.Pointer(cData), (C.int)(dataLen))
-	C.Tspi_Context_FreeMemory(key.context, cData)
-	return data, err
-}
-
-// GetKeyBlob returns an encrypted blob containing the public and private
-// halves of the key
-func (key *Key) GetKeyBlob() ([]byte, error) {
-	var dataLen C.UINT32
-	var cData *C.BYTE
-	err := tspiError(C.Tspi_GetAttribData((C.TSS_HOBJECT)(key.handle), C.TSS_TSPATTRIB_KEY_BLOB, C.TSS_TSPATTRIB_KEYBLOB_BLOB, &dataLen, &cData))
-	data := C.GoBytes(unsafe.Pointer(cData), (C.int)(dataLen))
-	C.Tspi_Context_FreeMemory(key.context, cData)
-	return data, err
-}
-
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/nv.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/nv.go
deleted file mode 100644
index 844741f085..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/nv.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tspi
-
-// #include <trousers/tss.h>
-import "C"
-import "unsafe"
-
-// NV is a TSS NV object
-type NV struct {
-	handle  C.TSS_HNVSTORE
-	context C.TSS_HCONTEXT
-}
-
-// ReadValue reads length bytes from offset in the TPM NVRAM space
-func (nv *NV) ReadValue(offset uint, length uint) ([]byte, error) {
-	data := make([]byte, length)
-	err := tspiError(C.Tspi_NV_ReadValue(nv.handle, (C.UINT32)(offset), (*C.UINT32)(unsafe.Pointer(&length)), (**C.BYTE)(unsafe.Pointer(&data))))
-	return data, err
-}
-
-// SetIndex sets the TPM NVRAM index that will be referenced by ReadValue()
-func (nv *NV) SetIndex(index uint) error {
-	err := tspiError(C.Tspi_SetAttribUint32((C.TSS_HOBJECT)(nv.handle), C.TSS_TSPATTRIB_NV_INDEX, 0, (C.UINT32)(index)))
-	return err
-}
-
-// AssignPolicy assigns a policy to the TPM NVRAM region
-func (nv *NV) AssignPolicy(policy *Policy) error {
-	err := tspiError(C.Tspi_Policy_AssignToObject(policy.handle, (C.TSS_HOBJECT)(nv.handle)))
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/pcrs.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/pcrs.go
deleted file mode 100644
index 98eb412e7d..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/pcrs.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tspi
-
-// #include <trousers/tss.h>
-import "C"
-import "unsafe"
-
-// PCRs is a structure representing a PCR object and the PCR values
-type PCRs struct {
-	handle  C.TSS_HPCRS
-	context C.TSS_HCONTEXT
-	pcrs    [24][]byte
-	pcrset  [24]bool
-}
-
-// SetPCRs takes an array of integers referring to PCRs. Any queries performed
-// with this PCR object will then query these PCRs.
-func (pcrs *PCRs) SetPCRs(pcrset []int) error {
-	for pcr := range pcrs.pcrset {
-		pcrs.pcrset[pcr] = false
-	}
-	for _, pcr := range pcrset {
-		err := tspiError(C.Tspi_PcrComposite_SelectPcrIndex(pcrs.handle, (C.UINT32)(pcr)))
-		if err != nil {
-			return err
-		}
-		pcrs.pcrset[pcr] = true
-	}
-	return nil
-}
-
-// GetPCRValues obtains the PCR values for any PCRs that have been set.
-func (pcrs *PCRs) GetPCRValues() ([][]byte, error) {
-	var buflen C.UINT32
-	var buf *C.BYTE
-	for pcr := range pcrs.pcrs {
-		if pcrs.pcrset[pcr] == false {
-			continue
-		}
-		err := tspiError(C.Tspi_PcrComposite_GetPcrValue(pcrs.handle, (C.UINT32)(pcr), &buflen, &buf))
-		if err != nil {
-			return nil, err
-		}
-		pcrs.pcrs[pcr] = C.GoBytes(unsafe.Pointer(buf), (C.int)(buflen))
-		C.Tspi_Context_FreeMemory(pcrs.context, buf)
-	}
-	return pcrs.pcrs[:], nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/policy.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/policy.go
deleted file mode 100644
index acc67ad035..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/policy.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tspi
-
-// #include <trousers/tss.h>
-import "C"
-
-// Policy is a TSS policy object
-type Policy struct {
-	handle  C.TSS_HPOLICY
-	context C.TSS_HCONTEXT
-}
-
-// SetSecret sets the secret for a policy. This policy may then be applied to
-// another object.
-func (policy *Policy) SetSecret(sectype int, secret []byte) error {
-	err := tspiError(C.Tspi_Policy_SetSecret(policy.handle, (C.TSS_FLAG)(sectype), (C.UINT32)(len(secret)), (*C.BYTE)(&secret[0])))
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/tpm.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/tpm.go
deleted file mode 100644
index c15f92dd21..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/tpm.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tspi
-
-// #include <trousers/tss.h>
-import "C"
-import (
-	"crypto/sha1"
-	"unsafe"
-)
-
-// TPM is a TSS TPM object
-type TPM struct {
-	handle  C.TSS_HTPM
-	context C.TSS_HCONTEXT
-}
-
-// Log represents an entry from the TSS event log. Pcr is the register that
-// was extended by the event. Eventtype is the type of the event. PcrValue
-// is the value that was hashed into the TPM. Event is the raw event data.
-type Log struct {
-	Pcr       int
-	Eventtype int
-	PcrValue  []byte
-	Event     []byte
-}
-
-// GetEventLog returns an array of structures representing the contents of the
-// TSS event log
-func (tpm *TPM) GetEventLog() ([]Log, error) {
-	var count C.UINT32
-	var events *C.TSS_PCR_EVENT
-	var event C.TSS_PCR_EVENT
-
-	err := tspiError(C.Tspi_TPM_GetEventLog(tpm.handle, &count, &events))
-	if err != nil {
-		return nil, err
-	}
-
-	if count == 0 {
-		return nil, nil
-	}
-
-	log := make([]Log, count)
-	length := count * C.UINT32(unsafe.Sizeof(event))
-	slice := (*[1 << 30]C.TSS_PCR_EVENT)(unsafe.Pointer(events))[:length:length]
-
-	for i := 0; i < int(count); i++ {
-		log[i].Pcr = int(slice[i].ulPcrIndex)
-		log[i].Eventtype = int(slice[i].eventType)
-		log[i].PcrValue = C.GoBytes(unsafe.Pointer(slice[i].rgbPcrValue), C.int(slice[i].ulPcrValueLength))
-		log[i].Event = C.GoBytes(unsafe.Pointer(slice[i].rgbEvent), C.int(slice[i].ulEventLength))
-	}
-	C.Tspi_Context_FreeMemory(tpm.context, (*C.BYTE)(unsafe.Pointer(events)))
-	return log, nil
-}
-
-// ExtendPCR extends a pcr. If event is nil, data must be pre-hashed with
-// SHA1. If event is not nil, event is used to populate the TSS event
-// log. If both data and event are provided, both will be used to create the
-// extend hash.
-func (tpm *TPM) ExtendPCR(pcr int, data []byte, eventtype int, event []byte) error {
-	var outlen C.UINT32
-	var pcrval *C.BYTE
-	var eventstruct C.TSS_PCR_EVENT
-	var err error
-
-	shasum := sha1.Sum(data)
-
-	if event != nil {
-		var pcrdata *C.BYTE
-		var pcrdatalen C.UINT32
-
-		eventstruct.versionInfo.bMajor = 1
-		eventstruct.versionInfo.bMinor = 2
-		eventstruct.versionInfo.bRevMajor = 1
-		eventstruct.versionInfo.bRevMinor = 0
-		eventstruct.ulPcrIndex = C.UINT32(pcr)
-		eventstruct.rgbPcrValue = (*C.BYTE)(&shasum[0])
-		eventstruct.eventType = C.TSS_EVENTTYPE(eventtype)
-		eventstruct.ulEventLength = C.UINT32(len(event))
-		eventstruct.rgbEvent = (*C.BYTE)(&event[0])
-
-		if data == nil || len(data) == 0 {
-			pcrdata = nil
-			pcrdatalen = C.UINT32(0)
-		} else {
-			pcrdata = (*C.BYTE)(&data[0])
-			pcrdatalen = C.UINT32(len(data))
-		}
-
-		err = tspiError(C.Tspi_TPM_PcrExtend(tpm.handle, C.UINT32(pcr), pcrdatalen, pcrdata, &eventstruct, &outlen, &pcrval))
-	} else {
-		err = tspiError(C.Tspi_TPM_PcrExtend(tpm.handle, C.UINT32(pcr), C.UINT32(len(shasum)), (*C.BYTE)(&shasum[0]), nil, &outlen, &pcrval))
-	}
-
-	C.Tspi_Context_FreeMemory(tpm.context, pcrval)
-
-	return err
-}
-
-//GetQuote takes an encrypted key blob representing the AIK, a set of PCRs
-//and a challenge and returns a blob containing a hash of the PCR hashes and
-//the challenge, and a validation blob signed by the AIK.
-func (tpm *TPM) GetQuote(aik *Key, pcrs *PCRs, challenge []byte) ([]byte, []byte, error) {
-	var validation C.TSS_VALIDATION
-	challangeHash := sha1.Sum(challenge[:])
-
-	validation.ulExternalDataLength = sha1.Size
-	validation.rgbExternalData = (*C.BYTE)(&challangeHash[0])
-	err := tspiError(C.Tspi_TPM_Quote(tpm.handle, aik.handle, pcrs.handle, &validation))
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	data := C.GoBytes(unsafe.Pointer(validation.rgbData), (C.int)(validation.ulDataLength))
-	validationOutput := C.GoBytes(unsafe.Pointer(validation.rgbValidationData), (C.int)(validation.ulValidationDataLength))
-
-	C.Tspi_Context_FreeMemory(tpm.context, validation.rgbData)
-	C.Tspi_Context_FreeMemory(tpm.context, validation.rgbValidationData)
-
-	return data, validationOutput, nil
-}
-
-// ActivateIdentity accepts an encrypted key blob representing the AIK and
-// two blobs representing the asymmetric and symmetric challenges associated
-// with the AIK. If the TPM is able to decrypt the challenges and the
-// challenges correspond to the AIK, the TPM will return the original
-// challenge secret.
-func (tpm *TPM) ActivateIdentity(aik *Key, asymblob []byte, symblob []byte) (secret []byte, err error) {
-	var creds *C.BYTE
-	var credlen C.UINT32
-
-	err = tspiError(C.Tspi_TPM_ActivateIdentity(tpm.handle, aik.handle, (C.UINT32)(len(asymblob)), (*C.BYTE)(&asymblob[0]), (C.UINT32)(len(symblob)), (*C.BYTE)(&symblob[0]), &credlen, &creds))
-
-	if err != nil {
-		return nil, err
-	}
-
-	plaintext := C.GoBytes(unsafe.Pointer(creds), (C.int)(credlen))
-
-	C.Tspi_Context_FreeMemory(tpm.context, creds)
-
-	return plaintext, nil
-}
-
-// GetPolicy returns the TSS policy associated with the TPM.
-func (tpm *TPM) GetPolicy(poltype int) (*Policy, error) {
-	var policyHandle C.TSS_HPOLICY
-	err := tspiError(C.Tspi_GetPolicyObject((C.TSS_HOBJECT)(tpm.handle), (C.TSS_FLAG)(poltype), &policyHandle))
-	return &Policy{handle: policyHandle, context: tpm.context}, err
-}
-
-// TakeOwnership transitions a TPM from unowned state to owned, installing the
-// encrypted key blob as the SRK.
-func (tpm *TPM) TakeOwnership(srk *Key) error {
-	err := tspiError(C.Tspi_TPM_TakeOwnership(tpm.handle, srk.handle, 0))
-	return err
-}
-
-
-// AssignPolicy assigns a TSS policy to the TPM.
-func (tpm *TPM) AssignPolicy(policy *Policy) error {
-	err := tspiError(C.Tspi_Policy_AssignToObject(policy.handle, (C.TSS_HOBJECT)(tpm.handle)))
-	return err
-}
-
-// CollateIdentityRequest creates a signing request for the provided AIKq
-func (tpm *TPM) CollateIdentityRequest(srk *Key, pubkey *Key, aik *Key) ([]byte, error) {
-	var certLen C.UINT32
-	var cCertReq *C.BYTE
-	err := tspiError(C.Tspi_TPM_CollateIdentityRequest(tpm.handle, srk.handle, pubkey.handle, 0, nil, aik.handle, C.TSS_ALG_AES, &certLen, &cCertReq))
-	certReq := C.GoBytes(unsafe.Pointer(cCertReq), (C.int)(certLen))
-	C.Tspi_Context_FreeMemory(tpm.context, cCertReq)
-	return certReq, err
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/tspi.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspiconst/tspiconst.go
similarity index 68%
rename from Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/tspi.go
rename to Godeps/_workspace/src/github.com/coreos/go-tspi/tspiconst/tspiconst.go
index 3a39bb7cc5..f2446db76b 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspi/tspi.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspiconst/tspiconst.go
@@ -12,370 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tspi
-
-// #include <trousers/tss.h>
-// #cgo LDFLAGS: -ltspi
-import "C"
-import "errors"
-import "fmt"
-
-func tspiError(tssRet C.TSS_RESULT) error {
-	ret := (int)(tssRet)
-	if ret == 0 {
-		return nil
-	}
-	if (ret & 0xf000) != 0 {
-		ret &= ^(0xf000)
-		switch {
-		case ret == C.TSS_E_FAIL:
-			return errors.New("TSS_E_FAIL")
-		case ret == C.TSS_E_BAD_PARAMETER:
-			return errors.New("TSS_E_BAD_PARAMETER")
-		case ret == C.TSS_E_INTERNAL_ERROR:
-			return errors.New("TSS_E_INTERNAL_ERROR")
-		case ret == C.TSS_E_OUTOFMEMORY:
-			return errors.New("TSS_E_OUTOFMEMORY")
-		case ret == C.TSS_E_NOTIMPL:
-			return errors.New("TSS_E_NOTIMPL")
-		case ret == C.TSS_E_KEY_ALREADY_REGISTERED:
-			return errors.New("TSS_E_KEY_ALREADY_REGISTERED")
-		case ret == C.TSS_E_TPM_UNEXPECTED:
-			return errors.New("TSS_E_TPM_UNEXPECTED")
-		case ret == C.TSS_E_COMM_FAILURE:
-			return errors.New("TSS_E_COMM_FAILURE")
-		case ret == C.TSS_E_TIMEOUT:
-			return errors.New("TSS_E_TIMEOUT")
-		case ret == C.TSS_E_TPM_UNSUPPORTED_FEATURE:
-			return errors.New("TSS_E_TPM_UNSUPPORTED_FEATURE")
-		case ret == C.TSS_E_CANCELED:
-			return errors.New("TSS_E_CANCELED")
-		case ret == C.TSS_E_PS_KEY_NOTFOUND:
-			return errors.New("TSS_E_PS_KEY_NOTFOUND")
-		case ret == C.TSS_E_PS_KEY_EXISTS:
-			return errors.New("TSS_E_PS_KEY_EXISTS")
-		case ret == C.TSS_E_PS_BAD_KEY_STATE:
-			return errors.New("TSS_E_PS_BAD_KEY_STATE")
-		case ret == C.TSS_E_INVALID_OBJECT_TYPE:
-			return errors.New("TSS_E_INVALID_OBJECT_TYPE")
-		case ret == C.TSS_E_NO_CONNECTION:
-			return errors.New("TSS_E_NO_CONNECTION")
-		case ret == C.TSS_E_CONNECTION_FAILED:
-			return errors.New("TSS_E_CONNECTION_FAILED")
-		case ret == C.TSS_E_CONNECTION_BROKEN:
-			return errors.New("TSS_E_CONNECTION_BROKEN")
-		case ret == C.TSS_E_HASH_INVALID_ALG:
-			return errors.New("TSS_E_HASH_INVALID_ALG")
-		case ret == C.TSS_E_HASH_INVALID_LENGTH:
-			return errors.New("TSS_E_HASH_INVALID_LENGTH")
-		case ret == C.TSS_E_HASH_NO_DATA:
-			return errors.New("TSS_E_HASH_NO_DATA")
-		case ret == C.TSS_E_INVALID_ATTRIB_FLAG:
-			return errors.New("TSS_E_INVALID_ATTRIB_FLAG")
-		case ret == C.TSS_E_INVALID_ATTRIB_SUBFLAG:
-			return errors.New("TSS_E_INVALID_ATTRIB_SUBFLAG")
-		case ret == C.TSS_E_INVALID_ATTRIB_DATA:
-			return errors.New("TSS_E_INVALID_ATTRIB_DATA")
-		case ret == C.TSS_E_INVALID_OBJECT_INITFLAG:
-			return errors.New("TSS_E_INVALID_OBJECT_INITFLAG")
-		case ret == C.TSS_E_NO_PCRS_SET:
-			return errors.New("TSS_E_NO_PCRS_SET")
-		case ret == C.TSS_E_KEY_NOT_LOADED:
-			return errors.New("TSS_E_KEY_NOT_LOADED")
-		case ret == C.TSS_E_KEY_NOT_SET:
-			return errors.New("TSS_E_KEY_NOT_SET")
-		case ret == C.TSS_E_VALIDATION_FAILED:
-			return errors.New("TSS_E_VALIDATION_FAILED")
-		case ret == C.TSS_E_TSP_AUTHREQUIRED:
-			return errors.New("TSS_E_TSP_AUTHREQUIRED")
-		case ret == C.TSS_E_TSP_AUTH2REQUIRED:
-			return errors.New("TSS_E_TSP_AUTH2REQUIRED")
-		case ret == C.TSS_E_TSP_AUTHFAIL:
-			return errors.New("TSS_E_TSP_AUTHFAIL")
-		case ret == C.TSS_E_TSP_AUTH2FAIL:
-			return errors.New("TSS_E_TSP_AUTH2FAIL")
-		case ret == C.TSS_E_KEY_NO_MIGRATION_POLICY:
-			return errors.New("TSS_E_KEY_NO_MIGRATION_POLICY")
-		case ret == C.TSS_E_POLICY_NO_SECRET:
-			return errors.New("TSS_E_POLICY_NO_SECRET")
-		case ret == C.TSS_E_INVALID_OBJ_ACCESS:
-			return errors.New("TSS_E_INVALID_OBJ_ACCESS")
-		case ret == C.TSS_E_INVALID_ENCSCHEME:
-			return errors.New("TSS_E_INVALID_ENCSCHEME")
-		case ret == C.TSS_E_INVALID_SIGSCHEME:
-			return errors.New("TSS_E_INVALID_SIGSCHEME")
-		case ret == C.TSS_E_ENC_INVALID_LENGTH:
-			return errors.New("TSS_E_ENC_INVALID_LENGTH")
-		case ret == C.TSS_E_ENC_NO_DATA:
-			return errors.New("TSS_E_ENC_NO_DATA")
-		case ret == C.TSS_E_ENC_INVALID_TYPE:
-			return errors.New("TSS_E_ENC_INVALID_TYPE")
-		case ret == C.TSS_E_INVALID_KEYUSAGE:
-			return errors.New("TSS_E_INVALID_KEYUSAGE")
-		case ret == C.TSS_E_VERIFICATION_FAILED:
-			return errors.New("TSS_E_VERIFICATION_FAILED")
-		case ret == C.TSS_E_HASH_NO_IDENTIFIER:
-			return errors.New("TSS_E_HASH_NO_IDENTIFIER")
-		case ret == C.TSS_E_INVALID_HANDLE:
-			return errors.New("TSS_E_INVALID_HANDLE")
-		case ret == C.TSS_E_SILENT_CONTEXT:
-			return errors.New("TSS_E_SILENT_CONTEXT")
-		case ret == C.TSS_E_EK_CHECKSUM:
-			return errors.New("TSS_E_EK_CHECKSUM")
-		case ret == C.TSS_E_DELEGATION_NOTSET:
-			return errors.New("TSS_E_DELEGATION_NOTSET")
-		case ret == C.TSS_E_DELFAMILY_NOTFOUND:
-			return errors.New("TSS_E_DELFAMILY_NOTFOUND")
-		case ret == C.TSS_E_DELFAMILY_ROWEXISTS:
-			return errors.New("TSS_E_DELFAMILY_ROWEXISTS")
-		case ret == C.TSS_E_VERSION_MISMATCH:
-			return errors.New("TSS_E_VERSION_MISMATCH")
-		case ret == C.TSS_E_DAA_AR_DECRYPTION_ERROR:
-			return errors.New("TSS_E_DAA_AR_DECRYPTION_ERROR")
-		case ret == C.TSS_E_DAA_AUTHENTICATION_ERROR:
-			return errors.New("TSS_E_DAA_AUTHENTICATION_ERROR")
-		case ret == C.TSS_E_DAA_CHALLENGE_RESPONSE_ERROR:
-			return errors.New("TSS_E_DAA_CHALLENGE_RESPONSE_ERROR")
-		case ret == C.TSS_E_DAA_CREDENTIAL_PROOF_ERROR:
-			return errors.New("TSS_E_DAA_CREDENTIAL_PROOF_ERROR")
-		case ret == C.TSS_E_DAA_CREDENTIAL_REQUEST_PROOF_ERROR:
-			return errors.New("TSS_E_DAA_CREDENTIAL_REQUEST_PROOF_ERROR")
-		case ret == C.TSS_E_DAA_ISSUER_KEY_ERROR:
-			return errors.New("TSS_E_DAA_ISSUER_KEY_ERROR")
-		case ret == C.TSS_E_DAA_PSEUDONYM_ERROR:
-			return errors.New("TSS_E_DAA_PSEUDONYM_ERROR")
-		case ret == C.TSS_E_INVALID_RESOURCE:
-			return errors.New("TSS_E_INVALID_RESOURCE")
-		case ret == C.TSS_E_NV_AREA_EXIST:
-			return errors.New("TSS_E_NV_AREA_EXIST")
-		case ret == C.TSS_E_NV_AREA_NOT_EXIST:
-			return errors.New("TSS_E_NV_AREA_NOT_EXIST")
-		case ret == C.TSS_E_TSP_TRANS_AUTHFAIL:
-			return errors.New("TSS_E_TSP_TRANS_AUTHFAIL")
-		case ret == C.TSS_E_TSP_TRANS_AUTHREQUIRED:
-			return errors.New("TSS_E_TSP_TRANS_AUTHREQUIRED")
-		case ret == C.TSS_E_TSP_TRANS_NOTEXCLUSIVE:
-			return errors.New("TSS_E_TSP_TRANS_NOTEXCLUSIVE")
-		case ret == C.TSS_E_TSP_TRANS_FAIL:
-			return errors.New("TSS_E_TSP_TRANS_FAIL")
-		case ret == C.TSS_E_TSP_TRANS_NO_PUBKEY:
-			return errors.New("TSS_E_TSP_TRANS_NO_PUBKEY")
-		case ret == C.TSS_E_NO_ACTIVE_COUNTER:
-			return errors.New("TSS_E_NO_ACTIVE_COUNTER")
-		}
-		return fmt.Errorf("Unknown TSS error: %x", ret)
-	}
-
-	switch {
-	case ret == C.TPM_E_NON_FATAL:
-		return errors.New("TPM_E_NON_FATAL")
-	case ret == C.TPM_E_AUTHFAIL:
-		return errors.New("TPM_E_AUTHFAIL")
-	case ret == C.TPM_E_BADINDEX:
-		return errors.New("TPM_E_BADINDEX")
-	case ret == C.TPM_E_BAD_PARAMETER:
-		return errors.New("TPM_E_BAD_PARAMETER")
-	case ret == C.TPM_E_AUDITFAILURE:
-		return errors.New("TPM_E_AUDITFAILURE")
-	case ret == C.TPM_E_CLEAR_DISABLED:
-		return errors.New("TPM_E_CLEAR_DISABLED")
-	case ret == C.TPM_E_DEACTIVATED:
-		return errors.New("TPM_E_DEACTIVATED")
-	case ret == C.TPM_E_DISABLED:
-		return errors.New("TPM_E_DISABLED")
-	case ret == C.TPM_E_DISABLED_CMD:
-		return errors.New("TPM_E_DISABLED_CMD")
-	case ret == C.TPM_E_FAIL:
-		return errors.New("TPM_E_FAIL")
-	case ret == C.TPM_E_BAD_ORDINAL:
-		return errors.New("TPM_E_BAD_ORDINAL")
-	case ret == C.TPM_E_INSTALL_DISABLED:
-		return errors.New("TPM_E_INSTALL_DISABLED")
-	case ret == C.TPM_E_INVALID_KEYHANDLE:
-		return errors.New("TPM_E_INVALID_KEYHANDLE")
-	case ret == C.TPM_E_KEYNOTFOUND:
-		return errors.New("TPM_E_KEYNOTFOUND")
-	case ret == C.TPM_E_INAPPROPRIATE_ENC:
-		return errors.New("TPM_E_INAPPROPRIATE_ENC")
-	case ret == C.TPM_E_MIGRATEFAIL:
-		return errors.New("TPM_E_MIGRATEFAIL")
-	case ret == C.TPM_E_INVALID_PCR_INFO:
-		return errors.New("TPM_E_INVALID_PCR_INFO")
-	case ret == C.TPM_E_NOSPACE:
-		return errors.New("TPM_E_NOSPACE")
-	case ret == C.TPM_E_NOSRK:
-		return errors.New("TPM_E_NOSRK")
-	case ret == C.TPM_E_NOTSEALED_BLOB:
-		return errors.New("TPM_E_NOTSEALED_BLOB")
-	case ret == C.TPM_E_OWNER_SET:
-		return errors.New("TPM_E_OWNER_SET")
-	case ret == C.TPM_E_RESOURCES:
-		return errors.New("TPM_E_RESOURCES")
-	case ret == C.TPM_E_SHORTRANDOM:
-		return errors.New("TPM_E_SHORTRANDOM")
-	case ret == C.TPM_E_SIZE:
-		return errors.New("TPM_E_SIZE")
-	case ret == C.TPM_E_WRONGPCRVAL:
-		return errors.New("TPM_E_WRONGPCRVAL")
-	case ret == C.TPM_E_BAD_PARAM_SIZE:
-		return errors.New("TPM_E_BAD_PARAM_SIZE")
-	case ret == C.TPM_E_SHA_THREAD:
-		return errors.New("TPM_E_SHA_THREAD")
-	case ret == C.TPM_E_SHA_ERROR:
-		return errors.New("TPM_E_SHA_ERROR")
-	case ret == C.TPM_E_FAILEDSELFTEST:
-		return errors.New("TPM_E_FAILEDSELFTEST")
-	case ret == C.TPM_E_AUTH2FAIL:
-		return errors.New("TPM_E_AUTH2FAIL")
-	case ret == C.TPM_E_BADTAG:
-		return errors.New("TPM_E_BADTAG")
-	case ret == C.TPM_E_IOERROR:
-		return errors.New("TPM_E_IOERROR")
-	case ret == C.TPM_E_ENCRYPT_ERROR:
-		return errors.New("TPM_E_ENCRYPT_ERROR")
-	case ret == C.TPM_E_DECRYPT_ERROR:
-		return errors.New("TPM_E_DECRYPT_ERROR")
-	case ret == C.TPM_E_INVALID_AUTHHANDLE:
-		return errors.New("TPM_E_INVALID_AUTHHANDLE")
-	case ret == C.TPM_E_NO_ENDORSEMENT:
-		return errors.New("TPM_E_NO_ENDORSEMENT")
-	case ret == C.TPM_E_INVALID_KEYUSAGE:
-		return errors.New("TPM_E_INVALID_KEYUSAGE")
-	case ret == C.TPM_E_WRONG_ENTITYTYPE:
-		return errors.New("TPM_E_WRONG_ENTITYTYPE")
-	case ret == C.TPM_E_INVALID_POSTINIT:
-		return errors.New("TPM_E_INVALID_POSTINIT")
-	case ret == C.TPM_E_INAPPROPRIATE_SIG:
-		return errors.New("TPM_E_INAPPROPRIATE_SIG")
-	case ret == C.TPM_E_BAD_KEY_PROPERTY:
-		return errors.New("TPM_E_BAD_KEY_PROPERTY")
-	case ret == C.TPM_E_BAD_MIGRATION:
-		return errors.New("TPM_E_BAD_MIGRATION")
-	case ret == C.TPM_E_BAD_SCHEME:
-		return errors.New("TPM_E_BAD_SCHEME")
-	case ret == C.TPM_E_BAD_DATASIZE:
-		return errors.New("TPM_E_BAD_DATASIZE")
-	case ret == C.TPM_E_BAD_MODE:
-		return errors.New("TPM_E_BAD_MODE")
-	case ret == C.TPM_E_BAD_PRESENCE:
-		return errors.New("TPM_E_BAD_PRESENCE")
-	case ret == C.TPM_E_BAD_VERSION:
-		return errors.New("TPM_E_BAD_VERSION")
-	case ret == C.TPM_E_NO_WRAP_TRANSPORT:
-		return errors.New("TPM_E_NO_WRAP_TRANSPORT")
-	case ret == C.TPM_E_AUDITFAIL_UNSUCCESSFUL:
-		return errors.New("TPM_E_AUDITFAIL_UNSUCCESSFUL")
-	case ret == C.TPM_E_AUDITFAIL_SUCCESSFUL:
-		return errors.New("TPM_E_AUDITFAIL_SUCCESSFUL")
-	case ret == C.TPM_E_NOTRESETABLE:
-		return errors.New("TPM_E_NOTRESETABLE")
-	case ret == C.TPM_E_NOTLOCAL:
-		return errors.New("TPM_E_NOTLOCAL")
-	case ret == C.TPM_E_BAD_TYPE:
-		return errors.New("TPM_E_BAD_TYPE")
-	case ret == C.TPM_E_INVALID_RESOURCE:
-		return errors.New("TPM_E_INVALID_RESOURCE")
-	case ret == C.TPM_E_NOTFIPS:
-		return errors.New("TPM_E_NOTFIPS")
-	case ret == C.TPM_E_INVALID_FAMILY:
-		return errors.New("TPM_E_INVALID_FAMILY")
-	case ret == C.TPM_E_NO_NV_PERMISSION:
-		return errors.New("TPM_E_NO_NV_PERMISSION")
-	case ret == C.TPM_E_REQUIRES_SIGN:
-		return errors.New("TPM_E_REQUIRES_SIGN")
-	case ret == C.TPM_E_KEY_NOTSUPPORTED:
-		return errors.New("TPM_E_KEY_NOTSUPPORTED")
-	case ret == C.TPM_E_AUTH_CONFLICT:
-		return errors.New("TPM_E_AUTH_CONFLICT")
-	case ret == C.TPM_E_AREA_LOCKED:
-		return errors.New("TPM_E_AREA_LOCKED")
-	case ret == C.TPM_E_BAD_LOCALITY:
-		return errors.New("TPM_E_BAD_LOCALITY")
-	case ret == C.TPM_E_READ_ONLY:
-		return errors.New("TPM_E_READ_ONLY")
-	case ret == C.TPM_E_PER_NOWRITE:
-		return errors.New("TPM_E_PER_NOWRITE")
-	case ret == C.TPM_E_FAMILYCOUNT:
-		return errors.New("TPM_E_FAMILYCOUNT")
-	case ret == C.TPM_E_WRITE_LOCKED:
-		return errors.New("TPM_E_WRITE_LOCKED")
-	case ret == C.TPM_E_BAD_ATTRIBUTES:
-		return errors.New("TPM_E_BAD_ATTRIBUTES")
-	case ret == C.TPM_E_INVALID_STRUCTURE:
-		return errors.New("TPM_E_INVALID_STRUCTURE")
-	case ret == C.TPM_E_KEY_OWNER_CONTROL:
-		return errors.New("TPM_E_KEY_OWNER_CONTROL")
-	case ret == C.TPM_E_BAD_COUNTER:
-		return errors.New("TPM_E_BAD_COUNTER")
-	case ret == C.TPM_E_NOT_FULLWRITE:
-		return errors.New("TPM_E_NOT_FULLWRITE")
-	case ret == C.TPM_E_CONTEXT_GAP:
-		return errors.New("TPM_E_CONTEXT_GAP")
-	case ret == C.TPM_E_MAXNVWRITES:
-		return errors.New("TPM_E_MAXNVWRITES")
-	case ret == C.TPM_E_NOOPERATOR:
-		return errors.New("TPM_E_NOOPERATOR")
-	case ret == C.TPM_E_RESOURCEMISSING:
-		return errors.New("TPM_E_RESOURCEMISSING")
-	case ret == C.TPM_E_DELEGATE_LOCK:
-		return errors.New("TPM_E_DELEGATE_LOCK")
-	case ret == C.TPM_E_DELEGATE_FAMILY:
-		return errors.New("TPM_E_DELEGATE_FAMILY")
-	case ret == C.TPM_E_DELEGATE_ADMIN:
-		return errors.New("TPM_E_DELEGATE_ADMIN")
-	case ret == C.TPM_E_TRANSPORT_NOTEXCLUSIVE:
-		return errors.New("TPM_E_TRANSPORT_NOTEXCLUSIVE")
-	case ret == C.TPM_E_OWNER_CONTROL:
-		return errors.New("TPM_E_OWNER_CONTROL")
-	case ret == C.TPM_E_DAA_RESOURCES:
-		return errors.New("TPM_E_DAA_RESOURCES")
-	case ret == C.TPM_E_DAA_INPUT_DATA0:
-		return errors.New("TPM_E_DAA_INPUT_DATA0")
-	case ret == C.TPM_E_DAA_INPUT_DATA1:
-		return errors.New("TPM_E_DAA_INPUT_DATA1")
-	case ret == C.TPM_E_DAA_ISSUER_SETTINGS:
-		return errors.New("TPM_E_DAA_ISSUER_SETTINGS")
-	case ret == C.TPM_E_DAA_TPM_SETTINGS:
-		return errors.New("TPM_E_DAA_TPM_SETTINGS")
-	case ret == C.TPM_E_DAA_STAGE:
-		return errors.New("TPM_E_DAA_STAGE")
-	case ret == C.TPM_E_DAA_ISSUER_VALIDITY:
-		return errors.New("TPM_E_DAA_ISSUER_VALIDITY")
-	case ret == C.TPM_E_DAA_WRONG_W:
-		return errors.New("TPM_E_DAA_WRONG_W")
-	case ret == C.TPM_E_BAD_HANDLE:
-		return errors.New("TPM_E_BAD_HANDLE")
-	case ret == C.TPM_E_BAD_DELEGATE:
-		return errors.New("TPM_E_BAD_DELEGATE")
-	case ret == C.TPM_E_BADCONTEXT:
-		return errors.New("TPM_E_BADCONTEXT")
-	case ret == C.TPM_E_TOOMANYCONTEXTS:
-		return errors.New("TPM_E_TOOMANYCONTEXTS")
-	case ret == C.TPM_E_MA_TICKET_SIGNATURE:
-		return errors.New("TPM_E_MA_TICKET_SIGNATURE")
-	case ret == C.TPM_E_MA_DESTINATION:
-		return errors.New("TPM_E_MA_DESTINATION")
-	case ret == C.TPM_E_MA_SOURCE:
-		return errors.New("TPM_E_MA_SOURCE")
-	case ret == C.TPM_E_MA_AUTHORITY:
-		return errors.New("TPM_E_MA_AUTHORITY")
-	case ret == C.TPM_E_PERMANENTEK:
-		return errors.New("TPM_E_PERMANENTEK")
-	case ret == C.TPM_E_BAD_SIGNATURE:
-		return errors.New("TPM_E_BAD_SIGNATURE")
-	case ret == C.TPM_E_NOCONTEXTSPACE:
-		return errors.New("TPM_E_NOCONTEXTSPACE")
-	case ret == C.TPM_E_RETRY:
-		return errors.New("TPM_E_RETRY")
-	case ret == C.TPM_E_NEEDS_SELFTEST:
-		return errors.New("TPM_E_NEEDS_SELFTEST")
-	case ret == C.TPM_E_DOING_SELFTEST:
-		return errors.New("TPM_E_DOING_SELFTEST")
-	case ret == C.TPM_E_DEFEND_LOCK_RUNNING:
-		return errors.New("TPM_E_DEFEND_LOCK_RUNNING")
-	}
-	return fmt.Errorf("Unknown error: %x", ret)
-}
+package tspiconst
 
 const (
 	TSS_OBJECT_TYPE_POLICY                                = 0x01
@@ -890,92 +527,12 @@ const (
 	TPM_ES_SYM_CBC_PKCS5PAD                               = 0x00FF
 )
 
-var TSS_UUID_SRK = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 1},
-}
-
-var TSS_UUID_SK = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 2},
-}
-
-var TSS_UUID_RK = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 3},
-}
-
-var TSS_UUID_CRK = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 8},
-}
-
-var TSS_UUID_USK1 = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 4},
-}
-
-var TSS_UUID_USK2 = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 5},
-}
-
-var TSS_UUID_USK3 = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 6},
-}
-
-var TSS_UUID_USK4 = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 7},
-}
-
-var TSS_UUID_USK5 = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 9},
-}
-
-var TSS_UUID_USK6 = C.TSS_UUID{
-	ulTimeLow:     0,
-	usTimeMid:     0,
-	usTimeHigh:    0,
-	bClockSeqHigh: 0,
-	bClockSeqLow:  0,
-	rgbNode:       [6]C.BYTE{0, 0, 0, 0, 0, 10},
+// Log represents an entry from the TSS event log. Pcr is the register that
+// was extended by the event. Eventtype is the type of the event. PcrValue
+// is the value that was hashed into the TPM. Event is the raw event data.
+type Log struct {
+	Pcr       int32
+	Eventtype int32
+	PcrValue  [20]byte
+	Event     []byte
 }
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/attestation/attestation.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/verification/verification.go
similarity index 84%
rename from Godeps/_workspace/src/github.com/coreos/go-tspi/attestation/attestation.go
rename to Godeps/_workspace/src/github.com/coreos/go-tspi/verification/verification.go
index 925380b371..15e06e2103 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/attestation/attestation.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-tspi/verification/verification.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package attestation
+package verification
 
 import (
 	"bytes"
@@ -29,7 +29,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/coreos/go-tspi/tspi"
+	"github.com/coreos/go-tspi/tspiconst"
 )
 
 func pad(plaintext []byte, bsize int) ([]byte, error) {
@@ -46,14 +46,14 @@ func pad(plaintext []byte, bsize int) ([]byte, error) {
 	return plaintext, nil
 }
 
-// GenerateChallenge takes a TSPI context, a copy of the EK certificate, the
-// public half of the AIK to be challenged and a secret. It then
-// symmetrically encrypts the secret with a randomly generated AES key and
-// Asymmetrically encrypts the AES key with the public half of the EK. These
-// can then be provided to the TPM in order to ensure that the AIK is under
-// the control of the TPM. It returns the asymmetrically and symmetrically
-// encrypted data, along with any error.
-func GenerateChallenge(context *tspi.Context, ekcert []byte, aikpub []byte, secret []byte) (asymenc []byte, symenc []byte, err error) {
+// GenerateChallenge takes a copy of the EK certificate, the public half of
+// the AIK to be challenged and a secret. It then symmetrically encrypts the
+// secret with a randomly generated AES key and Asymmetrically encrypts the
+// AES key with the public half of the EK. These can then be provided to the
+// TPM in order to ensure that the AIK is under the control of the TPM. It
+// returns the asymmetrically and symmetrically encrypted data, along with
+// any error.
+func GenerateChallenge(ekcert []byte, aikpub []byte, secret []byte) (asymenc []byte, symenc []byte, err error) {
 	aeskey := make([]byte, 16)
 	iv := make([]byte, 16)
 
@@ -99,15 +99,15 @@ func GenerateChallenge(context *tspi.Context, ekcert []byte, aikpub []byte, secr
 	if err != nil {
 		return nil, nil, err
 	}
-	err = binary.Write(symheader, binary.BigEndian, (uint32)(tspi.TPM_ALG_AES))
+	err = binary.Write(symheader, binary.BigEndian, (uint32)(tspiconst.TPM_ALG_AES))
 	if err != nil {
 		return nil, nil, err
 	}
-	err = binary.Write(symheader, binary.BigEndian, (uint16)(tspi.TPM_ES_SYM_CBC_PKCS5PAD))
+	err = binary.Write(symheader, binary.BigEndian, (uint16)(tspiconst.TPM_ES_SYM_CBC_PKCS5PAD))
 	if err != nil {
 		return nil, nil, err
 	}
-	err = binary.Write(symheader, binary.BigEndian, (uint16)(tspi.TPM_SS_NONE))
+	err = binary.Write(symheader, binary.BigEndian, (uint16)(tspiconst.TPM_SS_NONE))
 	if err != nil {
 		return nil, nil, err
 	}
@@ -136,111 +136,6 @@ func GenerateChallenge(context *tspi.Context, ekcert []byte, aikpub []byte, secr
 	return asymenc, symenc, nil
 }
 
-// AIKChallengeResponse takes the output from GenerateChallenge along with the
-// encrypted AIK key blob. The TPM then decrypts the asymmetric challenge with
-// its EK in order to obtain the AES key, and uses the AES key to decrypt the
-// symmetrically encrypted data. It verifies that this data blob corresponds
-// to the AIK it was given, and if so hands back the secret contained within
-// the symmetrically encrypted data.
-func AIKChallengeResponse(context *tspi.Context, aikblob []byte, asymchallenge []byte, symchallenge []byte) (secret []byte, err error) {
-	var wellKnown [20]byte
-
-	srk, err := context.LoadKeyByUUID(tspi.TSS_PS_TYPE_SYSTEM, tspi.TSS_UUID_SRK)
-	if err != nil {
-		return nil, err
-	}
-	srkpolicy, err := srk.GetPolicy(tspi.TSS_POLICY_USAGE)
-	if err != nil {
-		return nil, err
-	}
-	srkpolicy.SetSecret(tspi.TSS_SECRET_MODE_SHA1, wellKnown[:])
-
-	tpm := context.GetTPM()
-	tpmpolicy, err := context.CreatePolicy(tspi.TSS_POLICY_USAGE)
-	if err != nil {
-		return nil, err
-	}
-	tpm.AssignPolicy(tpmpolicy)
-	tpmpolicy.SetSecret(tspi.TSS_SECRET_MODE_SHA1, wellKnown[:])
-
-	aik, err := context.LoadKeyByBlob(srk, aikblob)
-	if err != nil {
-		return nil, err
-	}
-	secret, err = tpm.ActivateIdentity(aik, asymchallenge, symchallenge)
-
-	return secret, err
-}
-
-// CreateAIK asks the TPM to generate an Attestation Identity Key. It returns
-// the unencrypted public half of the AIK along with an encrypted blob
-// containing both halves of the key, and any error.
-func CreateAIK(context *tspi.Context) ([]byte, []byte, error) {
-	var wellKnown [20]byte
-	n := make([]byte, 2048/8)
-	for i := 0; i < 2048/8; i++ {
-		n[i] = 0xff
-	}
-
-	srk, err := context.LoadKeyByUUID(tspi.TSS_PS_TYPE_SYSTEM, tspi.TSS_UUID_SRK)
-	if err != nil {
-		return nil, nil, err
-	}
-	keypolicy, err := srk.GetPolicy(tspi.TSS_POLICY_USAGE)
-	if err != nil {
-		return nil, nil, err
-	}
-	err = keypolicy.SetSecret(tspi.TSS_SECRET_MODE_SHA1, wellKnown[:])
-	if err != nil {
-		return nil, nil, err
-	}
-
-	tpm := context.GetTPM()
-	tpmpolicy, err := tpm.GetPolicy(tspi.TSS_POLICY_USAGE)
-	if err != nil {
-		return nil, nil, err
-	}
-	err = tpm.AssignPolicy(tpmpolicy)
-	if err != nil {
-		return nil, nil, err
-	}
-	err = tpmpolicy.SetSecret(tspi.TSS_SECRET_MODE_SHA1, wellKnown[:])
-	if err != nil {
-		return nil, nil, err
-	}
-
-	pcakey, err := context.CreateKey(tspi.TSS_KEY_TYPE_LEGACY | tspi.TSS_KEY_SIZE_2048)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	err = pcakey.SetModulus(n)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	aik, err := context.CreateKey(tspi.TSS_KEY_TYPE_IDENTITY | tspi.TSS_KEY_SIZE_2048)
-	if err != nil {
-		return nil, nil, err
-	}
-	_, err = tpm.CollateIdentityRequest(srk, pcakey, aik)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	pubkey, err := aik.GetPubKeyBlob()
-	if err != nil {
-		return nil, nil, err
-	}
-	blob, err := aik.GetKeyBlob()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	_, err = aik.GetModulus()
-	return pubkey, blob, nil
-}
-
 // VerifyEKCert verifies that the provided EK certificate is signed by a
 // trusted manufacturer.
 func VerifyEKCert(ekcert []byte) error {
@@ -675,69 +570,6 @@ BwIDAQAB
 	return fmt.Errorf("No matching certificate found")
 }
 
-// GetEKCert reads the Endorsement Key certificate from the TPM's NVRAM and
-// returns it, along with any error generated.
-func GetEKCert(context *tspi.Context) (ekcert []byte, err error) {
-	var wellKnown [20]byte
-	tpm := context.GetTPM()
-	nv, err := context.CreateNV()
-	if err != nil {
-		return nil, err
-	}
-	policy, err := tpm.GetPolicy(tspi.TSS_POLICY_USAGE)
-	if err != nil {
-		return nil, err
-	}
-	policy.SetSecret(tspi.TSS_SECRET_MODE_SHA1, wellKnown[:])
-	nv.SetIndex(0x1000f000)
-	nv.AssignPolicy(policy)
-	data, err := nv.ReadValue(0, 5)
-	if err != nil {
-		return nil, err
-	}
-
-	tag := (uint)((uint)(data[0])<<8 | (uint)(data[1]))
-	if tag != 0x1001 {
-		return nil, fmt.Errorf("Invalid tag: %x", tag)
-	}
-
-	if data[2] != 0 {
-		return nil, fmt.Errorf("Invalid certificate")
-	}
-
-	ekbuflen := (uint)(uint(data[3])<<8 | (uint)(data[4]))
-	offset := (uint)(5)
-
-	data, err = nv.ReadValue(offset, 2)
-
-	tag = (uint)((uint)(data[0])<<8 | (uint)(data[1]))
-	if tag == 0x1002 {
-		offset += 2
-		ekbuflen -= 2
-	} else if data[0] != 0x30 {
-		return nil, fmt.Errorf("Invalid header: %x\n", tag)
-	}
-
-	ekoffset := (uint)(0)
-	var ekbuf []byte
-	for ekoffset < ekbuflen {
-		length := (uint)(ekbuflen - ekoffset)
-		if length > 128 {
-			length = 128
-		}
-		data, err = nv.ReadValue(offset, length)
-		if err != nil {
-			return nil, err
-		}
-
-		ekbuf = append(ekbuf, data...)
-		offset += length
-		ekoffset += length
-	}
-
-	return ekbuf, nil
-}
-
 // QuoteVerify verifies that a quote was genuinely provided by the TPM. It
 // takes the quote data, quote validation blob, public half of the AIK,
 // current PCR values and the nonce used in the original quote request. It
@@ -780,3 +612,43 @@ func QuoteVerify(data []byte, validation []byte, aikpub []byte, pcrvalues [][]by
 
 	return nil
 }
+
+// KeyVerify verifies that a key certification request was genuinely
+// provided by the TPM. It takes the certification data, certification
+// validation blob, the public half of the AIK, the public half of the key
+// to be certified and the nonce used in the original quote request. It then
+// verifies that the validation block is a valid signature for the
+// certification data, that the certification data matches the certified key
+// and that the secrets are the same (in order to avoid replay attacks). It
+// returns an error if any stage of the validation fails.
+func KeyVerify(data []byte, validation []byte, aikpub []byte, keypub []byte, secret []byte) error {
+	n := big.NewInt(0)
+	n.SetBytes(aikpub)
+	e := 65537
+
+	pKey := rsa.PublicKey{N: n, E: int(e)}
+
+	dataHash := sha1.Sum(data[:])
+
+	err := rsa.VerifyPKCS1v15(&pKey, crypto.SHA1, dataHash[:], validation)
+	if err != nil {
+		return err
+	}
+
+	keyHash := data[43:63]
+	nonceHash := data[63:83]
+
+	secretHash := sha1.Sum(secret[:])
+
+	if bytes.Equal(secretHash[:], nonceHash) == false {
+		return fmt.Errorf("Secret doesn't match")
+	}
+
+	certHash := sha1.Sum(keypub[:])
+
+	if bytes.Equal(certHash[:], keyHash) == false {
+		return fmt.Errorf("Key doesn't match")
+	}
+
+	return nil
+}

From 4510ce391fc93318dc18bc678f71e51ce6bc0669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 1 Apr 2016 15:23:07 +0200
Subject: [PATCH 0063/1304] Godeps: bump CNI to v0.2.0-rc0

---
 Godeps/Godeps.json                            | 69 ++++++++++---------
 .../appc/cni/pkg/invoke/delegate.go           | 39 +++++++++++
 .../github.com/appc/cni/pkg/invoke/exec.go    |  5 --
 .../github.com/appc/cni/pkg/invoke/find.go    | 34 +++++----
 .../src/github.com/appc/cni/pkg/ip/ipmasq.go  | 12 ++--
 .../src/github.com/appc/cni/pkg/ipam/ipam.go  | 10 +--
 .../src/github.com/appc/cni/pkg/ns/ns.go      |  7 +-
 .../src/github.com/appc/cni/pkg/types/args.go | 45 +++++++++++-
 .../github.com/appc/cni/pkg/utils/utils.go    | 27 ++++++++
 .../cni/plugins/ipam/host-local/allocator.go  |  4 +-
 .../cni/plugins/ipam/host-local/config.go     |  5 +-
 .../appc/cni/plugins/ipam/host-local/main.go  |  7 --
 .../appc/cni/plugins/main/bridge/bridge.go    |  6 +-
 .../appc/cni/plugins/main/ptp/ptp.go          | 14 ++--
 .../appc/cni/plugins/meta/flannel/flannel.go  |  6 +-
 15 files changed, 199 insertions(+), 91 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/delegate.go
 create mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/utils/utils.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 6552414950..5b590a543f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -18,83 +18,88 @@
 	"Deps": [
 		{
 			"ImportPath": "github.com/appc/cni/pkg/invoke",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/ip",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/ipam",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/ns",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/skel",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/types",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
+		},
+		{
+			"ImportPath": "github.com/appc/cni/pkg/utils",
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/dhcp",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local/backend",
-			"Comment": "v0.1.0-84-gb7ff8ab158bd",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local/backend/disk",
-			"Comment": "v0.1.0-84-gb7ff8ab158bd",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/main/bridge",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/main/ipvlan",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/main/macvlan",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/main/ptp",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/meta/flannel",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/meta/tuning",
-			"Comment": "v0.1.0-84-gb7ff8ab",
-			"Rev": "b7ff8ab158bd2fbc700d0fe6e0a58712970fabc0"
+			"Comment": "v0.2.0-rc0",
+			"Rev": "0046767be795f629180e0713b71822b731531997"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib",
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/delegate.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/delegate.go
new file mode 100644
index 0000000000..9864e6f53e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/delegate.go
@@ -0,0 +1,39 @@
+package invoke
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/appc/cni/pkg/types"
+)
+
+func DelegateAdd(delegatePlugin string, netconf []byte) (*types.Result, error) {
+	if os.Getenv("CNI_COMMAND") != "ADD" {
+		return nil, fmt.Errorf("CNI_COMMAND is not ADD")
+	}
+
+	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
+
+	pluginPath, err := FindInPath(delegatePlugin, paths)
+	if err != nil {
+		return nil, err
+	}
+
+	return ExecPluginWithResult(pluginPath, netconf, ArgsFromEnv())
+}
+
+func DelegateDel(delegatePlugin string, netconf []byte) error {
+	if os.Getenv("CNI_COMMAND") != "DEL" {
+		return fmt.Errorf("CNI_COMMAND is not DEL")
+	}
+
+	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
+
+	pluginPath, err := FindInPath(delegatePlugin, paths)
+	if err != nil {
+		return err
+	}
+
+	return ExecPluginWithoutResult(pluginPath, netconf, ArgsFromEnv())
+}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go
index 905649707b..337bfcb870 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go
@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path/filepath"
 
 	"github.com/appc/cni/pkg/types"
 )
@@ -58,10 +57,6 @@ func ExecPluginWithoutResult(pluginPath string, netconf []byte, args CNIArgs) er
 }
 
 func execPlugin(pluginPath string, netconf []byte, args CNIArgs) ([]byte, error) {
-	if pluginPath == "" {
-		return nil, fmt.Errorf("could not find %q plugin", filepath.Base(pluginPath))
-	}
-
 	stdout := &bytes.Buffer{}
 
 	c := exec.Cmd{
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go
index 82f9a9b766..3b03790711 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go
@@ -15,23 +15,33 @@
 package invoke
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 )
 
-func FindInPath(plugin string, path []string) string {
-	for _, p := range path {
-		fullname := filepath.Join(p, plugin)
-		if fi, err := os.Stat(fullname); err == nil && fi.Mode().IsRegular() {
-			return fullname
+// FindInPath returns the full path of the plugin by searching in the provided path
+func FindInPath(plugin string, paths []string) (string, error) {
+	if plugin == "" {
+		return "", fmt.Errorf("no plugin name provided")
+	}
+
+	if len(paths) == 0 {
+		return "", fmt.Errorf("no paths provided")
+	}
+
+	var fullpath string
+	for _, path := range paths {
+		full := filepath.Join(path, plugin)
+		if fi, err := os.Stat(full); err == nil && fi.Mode().IsRegular() {
+			fullpath = full
+			break
 		}
 	}
-	return ""
-}
 
-// Find returns the full path of the plugin by searching in CNI_PATH
-func Find(plugin string) string {
-	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
-	return FindInPath(plugin, paths)
+	if fullpath == "" {
+		return "", fmt.Errorf("failed to find plugin %q in path %s", plugin, paths)
+	}
+
+	return fullpath, nil
 }
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipmasq.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipmasq.go
index 6901f69e96..8ee279717a 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipmasq.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipmasq.go
@@ -23,7 +23,7 @@ import (
 
 // SetupIPMasq installs iptables rules to masquerade traffic
 // coming from ipn and going outside of it
-func SetupIPMasq(ipn *net.IPNet, chain string) error {
+func SetupIPMasq(ipn *net.IPNet, chain string, comment string) error {
 	ipt, err := iptables.New()
 	if err != nil {
 		return fmt.Errorf("failed to locate iptables: %v", err)
@@ -36,25 +36,25 @@ func SetupIPMasq(ipn *net.IPNet, chain string) error {
 		}
 	}
 
-	if err = ipt.AppendUnique("nat", chain, "-d", ipn.String(), "-j", "ACCEPT"); err != nil {
+	if err = ipt.AppendUnique("nat", chain, "-d", ipn.String(), "-j", "ACCEPT", "-m", "comment", "--comment", comment); err != nil {
 		return err
 	}
 
-	if err = ipt.AppendUnique("nat", chain, "!", "-d", "224.0.0.0/4", "-j", "MASQUERADE"); err != nil {
+	if err = ipt.AppendUnique("nat", chain, "!", "-d", "224.0.0.0/4", "-j", "MASQUERADE", "-m", "comment", "--comment", comment); err != nil {
 		return err
 	}
 
-	return ipt.AppendUnique("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain)
+	return ipt.AppendUnique("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment)
 }
 
 // TeardownIPMasq undoes the effects of SetupIPMasq
-func TeardownIPMasq(ipn *net.IPNet, chain string) error {
+func TeardownIPMasq(ipn *net.IPNet, chain string, comment string) error {
 	ipt, err := iptables.New()
 	if err != nil {
 		return fmt.Errorf("failed to locate iptables: %v", err)
 	}
 
-	if err = ipt.Delete("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain); err != nil {
+	if err = ipt.Delete("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment); err != nil {
 		return err
 	}
 
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ipam/ipam.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ipam/ipam.go
index 4920838a8b..f0adfb7f60 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ipam/ipam.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/pkg/ipam/ipam.go
@@ -26,17 +26,11 @@ import (
 )
 
 func ExecAdd(plugin string, netconf []byte) (*types.Result, error) {
-	if os.Getenv("CNI_COMMAND") != "ADD" {
-		return nil, fmt.Errorf("CNI_COMMAND is not ADD")
-	}
-	return invoke.ExecPluginWithResult(invoke.Find(plugin), netconf, invoke.ArgsFromEnv())
+	return invoke.DelegateAdd(plugin, netconf)
 }
 
 func ExecDel(plugin string, netconf []byte) error {
-	if os.Getenv("CNI_COMMAND") != "DEL" {
-		return fmt.Errorf("CNI_COMMAND is not DEL")
-	}
-	return invoke.ExecPluginWithoutResult(invoke.Find(plugin), netconf, invoke.ArgsFromEnv())
+	return invoke.DelegateDel(plugin, netconf)
 }
 
 // ConfigureIface takes the result of IPAM plugin and
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ns/ns.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ns/ns.go
index 9996aac728..4f0814f1d6 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ns/ns.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/pkg/ns/ns.go
@@ -66,7 +66,8 @@ func WithNetNSPath(nspath string, lockThread bool, f func(*os.File) error) error
 // Changing namespaces must be done on a goroutine that has been
 // locked to an OS thread. If lockThread arg is true, this function
 // locks the goroutine prior to change namespace and unlocks before
-// returning
+// returning.  If the closure returns an error, WithNetNS attempts to
+// restore the original namespace before returning.
 func WithNetNS(ns *os.File, lockThread bool, f func(*os.File) error) error {
 	if lockThread {
 		runtime.LockOSThread()
@@ -82,11 +83,11 @@ func WithNetNS(ns *os.File, lockThread bool, f func(*os.File) error) error {
 	if err = SetNS(ns, syscall.CLONE_NEWNET); err != nil {
 		return fmt.Errorf("Error switching to ns %v: %v", ns.Name(), err)
 	}
+	defer SetNS(thisNS, syscall.CLONE_NEWNET) // switch back
 
 	if err = f(thisNS); err != nil {
 		return err
 	}
 
-	// switch back
-	return SetNS(thisNS, syscall.CLONE_NEWNET)
+	return nil
 }
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go
index 3c0fd88e9c..3b667b0f20 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go
@@ -21,6 +21,39 @@ import (
 	"strings"
 )
 
+// UnmarshallableBool typedef for builtin bool
+// because builtin type's methods can't be declared
+type UnmarshallableBool bool
+
+// UnmarshalText implements the encoding.TextUnmarshaler interface.
+// Returns boolean true if the string is "1" or "[Tt]rue"
+// Returns boolean false if the string is "0" or "[Ff]alse"
+func (b *UnmarshallableBool) UnmarshalText(data []byte) error {
+	s := strings.ToLower(string(data))
+	switch s {
+	case "1", "true":
+		*b = true
+	case "0", "false":
+		*b = false
+	default:
+		return fmt.Errorf("Boolean unmarshal error: invalid input %s", s)
+	}
+	return nil
+}
+
+// CommonArgs contains the IgnoreUnknown argument
+// and must be embedded by all Arg structs
+type CommonArgs struct {
+	IgnoreUnknown UnmarshallableBool `json:"ignoreunknown,omitempty"`
+}
+
+// GetKeyField is a helper function to receive Values
+// Values that represent a pointer to a struct
+func GetKeyField(keyString string, v reflect.Value) reflect.Value {
+	return v.Elem().FieldByName(keyString)
+}
+
+// LoadArgs parses args from a string in the form "K=V;K2=V2;..."
 func LoadArgs(args string, container interface{}) error {
 	if args == "" {
 		return nil
@@ -29,6 +62,7 @@ func LoadArgs(args string, container interface{}) error {
 	containerValue := reflect.ValueOf(container)
 
 	pairs := strings.Split(args, ";")
+	unknownArgs := []string{}
 	for _, pair := range pairs {
 		kv := strings.Split(pair, "=")
 		if len(kv) != 2 {
@@ -36,15 +70,22 @@ func LoadArgs(args string, container interface{}) error {
 		}
 		keyString := kv[0]
 		valueString := kv[1]
-		keyField := containerValue.Elem().FieldByName(keyString)
+		keyField := GetKeyField(keyString, containerValue)
 		if !keyField.IsValid() {
-			return fmt.Errorf("ARGS: invalid key %q", keyString)
+			unknownArgs = append(unknownArgs, pair)
+			continue
 		}
+
 		u := keyField.Addr().Interface().(encoding.TextUnmarshaler)
 		err := u.UnmarshalText([]byte(valueString))
 		if err != nil {
 			return fmt.Errorf("ARGS: error parsing value of pair %q: %v)", pair, err)
 		}
 	}
+
+	isIgnoreUnknown := GetKeyField("IgnoreUnknown", containerValue).Bool()
+	if len(unknownArgs) > 0 && !isIgnoreUnknown {
+		return fmt.Errorf("ARGS: unknown args %q", unknownArgs)
+	}
 	return nil
 }
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/utils/utils.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/utils/utils.go
new file mode 100644
index 0000000000..7ec139fd8f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/appc/cni/pkg/utils/utils.go
@@ -0,0 +1,27 @@
+package utils
+
+import (
+	"crypto/sha512"
+	"fmt"
+)
+
+const (
+	maxChainLength = 28
+	chainPrefix    = "CNI-"
+	prefixLength   = len(chainPrefix)
+)
+
+// Generates a chain name to be used with iptables.
+// Ensures that the generated chain name is exactly
+// maxChainLength chars in length
+func FormatChainName(name string, id string) string {
+	chainBytes := sha512.Sum512([]byte(name + id))
+	chain := fmt.Sprintf("%s%x", chainPrefix, chainBytes)
+	return chain[:maxChainLength]
+}
+
+// FormatComment returns a comment used for easier
+// rule identification within iptables.
+func FormatComment(name string, id string) string {
+	return fmt.Sprintf("name: %q id: %q", name, id)
+}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/allocator.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/allocator.go
index 159e2cb726..2b867ce525 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/allocator.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/allocator.go
@@ -104,7 +104,7 @@ func (a *IPAllocator) Get(id string) (*types.IPConfig, error) {
 
 		if reserved {
 			return &types.IPConfig{
-				IP:      net.IPNet{requestedIP, a.conf.Subnet.Mask},
+				IP:      net.IPNet{IP: requestedIP, Mask: a.conf.Subnet.Mask},
 				Gateway: gw,
 				Routes:  a.conf.Routes,
 			}, nil
@@ -124,7 +124,7 @@ func (a *IPAllocator) Get(id string) (*types.IPConfig, error) {
 		}
 		if reserved {
 			return &types.IPConfig{
-				IP:      net.IPNet{cur, a.conf.Subnet.Mask},
+				IP:      net.IPNet{IP: cur, Mask: a.conf.Subnet.Mask},
 				Gateway: gw,
 				Routes:  a.conf.Routes,
 			}, nil
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/config.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/config.go
index 53ab396b3b..08ca07e384 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/config.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/config.go
@@ -35,6 +35,7 @@ type IPAMConfig struct {
 }
 
 type IPAMArgs struct {
+	types.CommonArgs
 	IP net.IP `json:"ip,omitempty"`
 }
 
@@ -51,8 +52,8 @@ func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, error) {
 	}
 
 	if args != "" {
-		ipamArgs := IPAMArgs{}
-		err := types.LoadArgs(args, &ipamArgs)
+		n.IPAM.Args = &IPAMArgs{}
+		err := types.LoadArgs(args, n.IPAM.Args)
 		if err != nil {
 			return nil, err
 		}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/main.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/main.go
index f1d7d6ae44..9f67e8a507 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/main.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/main.go
@@ -37,13 +37,6 @@ func cmdAdd(args *skel.CmdArgs) error {
 	}
 	defer store.Close()
 
-	ipamArgs := IPAMArgs{}
-	err = types.LoadArgs(args.Args, &ipamArgs)
-	if err != nil {
-		return err
-	}
-	ipamConf.Args = &ipamArgs
-
 	allocator, err := NewIPAllocator(ipamConf, store)
 	if err != nil {
 		return err
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go
index 49c0aa5d23..e4bc106c00 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go
@@ -28,6 +28,7 @@ import (
 	"github.com/appc/cni/pkg/ns"
 	"github.com/appc/cni/pkg/skel"
 	"github.com/appc/cni/pkg/types"
+	"github.com/appc/cni/pkg/utils"
 	"github.com/vishvananda/netlink"
 )
 
@@ -220,8 +221,9 @@ func cmdAdd(args *skel.CmdArgs) error {
 	}
 
 	if n.IPMasq {
-		chain := "CNI-" + n.Name
-		if err = ip.SetupIPMasq(ip.Network(&result.IP4.IP), chain); err != nil {
+		chain := utils.FormatChainName(n.Name, args.ContainerID)
+		comment := utils.FormatComment(n.Name, args.ContainerID)
+		if err = ip.SetupIPMasq(ip.Network(&result.IP4.IP), chain, comment); err != nil {
 			return err
 		}
 	}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go
index 3cb8f64388..3035c643f7 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go
@@ -15,7 +15,6 @@
 package main
 
 import (
-	"crypto/sha512"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -30,6 +29,7 @@ import (
 	"github.com/appc/cni/pkg/ns"
 	"github.com/appc/cni/pkg/skel"
 	"github.com/appc/cni/pkg/types"
+	"github.com/appc/cni/pkg/utils"
 )
 
 func init() {
@@ -178,9 +178,9 @@ func cmdAdd(args *skel.CmdArgs) error {
 	}
 
 	if conf.IPMasq {
-		h := sha512.Sum512([]byte(args.ContainerID))
-		chain := fmt.Sprintf("CNI-%s-%x", conf.Name, h[:8])
-		if err = ip.SetupIPMasq(&result.IP4.IP, chain); err != nil {
+		chain := utils.FormatChainName(conf.Name, args.ContainerID)
+		comment := utils.FormatComment(conf.Name, args.ContainerID)
+		if err = ip.SetupIPMasq(&result.IP4.IP, chain, comment); err != nil {
 			return err
 		}
 	}
@@ -206,9 +206,9 @@ func cmdDel(args *skel.CmdArgs) error {
 	}
 
 	if conf.IPMasq {
-		h := sha512.Sum512([]byte(args.ContainerID))
-		chain := fmt.Sprintf("CNI-%s-%x", conf.Name, h[:8])
-		if err = ip.TeardownIPMasq(ipn, chain); err != nil {
+		chain := utils.FormatChainName(conf.Name, args.ContainerID)
+		comment := utils.FormatComment(conf.Name, args.ContainerID)
+		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
 			return err
 		}
 	}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/flannel/flannel.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/flannel/flannel.go
index af629738d6..6653baca2a 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/flannel/flannel.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/flannel/flannel.go
@@ -29,7 +29,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/appc/cni/pkg/ipam"
+	"github.com/appc/cni/pkg/invoke"
 	"github.com/appc/cni/pkg/skel"
 	"github.com/appc/cni/pkg/types"
 )
@@ -155,7 +155,7 @@ func delegateAdd(cid string, netconf map[string]interface{}) error {
 		return err
 	}
 
-	result, err := ipam.ExecAdd(netconf["type"].(string), netconfBytes)
+	result, err := invoke.DelegateAdd(netconf["type"].(string), netconfBytes)
 	if err != nil {
 		return err
 	}
@@ -245,7 +245,7 @@ func cmdDel(args *skel.CmdArgs) error {
 		return fmt.Errorf("failed to parse netconf: %v", err)
 	}
 
-	return ipam.ExecDel(n.Type, netconfBytes)
+	return invoke.DelegateDel(n.Type, netconfBytes)
 }
 
 func main() {

From eabbfa02c5d7db1c652ac8a3eeb0692240a1cd8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 1 Apr 2016 15:26:39 +0200
Subject: [PATCH 0064/1304] Godeps: bump docker2aci to v0.9.3

---
 Godeps/Godeps.json                            | 40 +++++++++----------
 .../internal/backend/repository/repository.go |  5 +--
 .../backend/repository/repository2.go         |  5 +--
 .../appc/docker2aci/lib/internal/util/util.go | 22 ++++++++++
 .../github.com/appc/docker2aci/lib/version.go |  2 +-
 5 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 5b590a543f..4128e8078c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -103,53 +103,53 @@
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/common",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/backend/file",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/backend/repository",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/docker",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/tarball",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/types",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/util",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/pkg/log",
-			"Comment": "v0.9.2",
-			"Rev": "549d085bf2a55d8e8079f1186c425cee7fdcc4d5"
+			"Comment": "v0.9.3",
+			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
 		},
 		{
 			"ImportPath": "github.com/appc/goaci/proj2aci",
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
index 0f791ee5ba..3c6715e8b3 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
@@ -20,7 +20,6 @@
 package repository
 
 import (
-	"crypto/tls"
 	"fmt"
 	"net/http"
 	"path"
@@ -28,6 +27,7 @@ import (
 	"github.com/appc/docker2aci/lib/common"
 	"github.com/appc/docker2aci/lib/internal/docker"
 	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/util"
 	"github.com/appc/spec/schema"
 )
 
@@ -137,8 +137,7 @@ func (rb *RepositoryBackend) supportsRegistry(indexURL string, version registryV
 
 		rb.setBasicAuth(req)
 
-		tr := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: rb.insecure}}
-		client := &http.Client{Transport: tr}
+		client := util.GetTLSClient(rb.insecure)
 		res, err = client.Do(req)
 		return
 	}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
index 974a690985..b685cf8eaa 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -15,7 +15,6 @@
 package repository
 
 import (
-	"crypto/tls"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -32,6 +31,7 @@ import (
 	"github.com/appc/docker2aci/lib/common"
 	"github.com/appc/docker2aci/lib/internal"
 	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/util"
 	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/schema"
 	"github.com/coreos/ioprogress"
@@ -315,8 +315,7 @@ func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string) (*http.
 		}
 	}
 
-	tr := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: rb.insecure}}
-	client := &http.Client{Transport: tr}
+	client := util.GetTLSClient(rb.insecure)
 	res, err := client.Do(req)
 	if err != nil {
 		return nil, err
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/util/util.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/util/util.go
index 07cde45611..ebaafca62c 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/util/util.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/util/util.go
@@ -19,7 +19,9 @@
 package util
 
 import (
+	"crypto/tls"
 	"fmt"
+	"net/http"
 
 	"github.com/appc/spec/pkg/acirenderer"
 )
@@ -59,3 +61,23 @@ func IndexOf(list []string, el string) int {
 	}
 	return -1
 }
+
+// GetTLSClient gets an HTTP client that behaves like the default HTTP
+// client, but optionally skips the TLS certificate verification.
+func GetTLSClient(skipTLSCheck bool) *http.Client {
+	if !skipTLSCheck {
+		return http.DefaultClient
+	}
+	client := *http.DefaultClient
+	// Default transport is hidden behind the RoundTripper
+	// interface, so we can't easily make a copy of it. If this
+	// ever panics, we will have to adapt.
+	realTransport := http.DefaultTransport.(*http.Transport)
+	tr := *realTransport
+	if tr.TLSClientConfig == nil {
+		tr.TLSClientConfig = &tls.Config{}
+	}
+	tr.TLSClientConfig.InsecureSkipVerify = true
+	client.Transport = &tr
+	return &client
+}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
index 3bf7c4e45e..6120c38b82 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.9.2"
+var Version = "0.9.3"
 var AppcVersion = schema.AppContainerVersion

From 206a8ce1c1c55dfc71f2ad5a656822628399962f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 1 Apr 2016 15:13:18 +0200
Subject: [PATCH 0065/1304] networking/kvm: add comment to IP masquerading

The function signature for SetupIPMasq() and TeardownIPMasq() changed.
---
 networking/kvm.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index b702554469..e353d896c4 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -42,6 +42,7 @@ const (
 	defaultBrName     = "kvm-cni0"
 	defaultSubnetFile = "/run/flannel/subnet.env"
 	defaultMTU        = 1500
+	masqComment       = "rkt-lkvm masquerading"
 )
 
 type BridgeNetConf struct {
@@ -534,7 +535,7 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 			if err := ip.SetupIPMasq(&net.IPNet{
 				IP:   n.runtime.IP,
 				Mask: net.IPMask(n.runtime.Mask),
-			}, chain); err != nil {
+			}, chain, masqComment); err != nil {
 				return nil, err
 			}
 		}
@@ -591,7 +592,7 @@ func (n *Networking) teardownKvmNets() {
 			err := ip.TeardownIPMasq(&net.IPNet{
 				IP:   an.runtime.IP,
 				Mask: net.IPMask(an.runtime.Mask),
-			}, chain)
+			}, chain, masqComment)
 			if err != nil {
 				stderr.PrintE("error on removing masquerading", err)
 			}

From 66ca7ac0fd48ffd8f3fbf2d2fe999b261132da65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 31 Mar 2016 16:22:01 +0200
Subject: [PATCH 0066/1304] ROADMAP: update

---
 ROADMAP.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index e5daecc49b..e25a5f0e53 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,23 +9,21 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-### rkt 1.3 (March)
+### rkt 1.4 (April)
 
 - enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
-- app exit status propagation [#1460](https://github.com/coreos/rkt/issues/1460)
-- different shared namespace execution modes [#1433](https://github.com/coreos/rkt/issues/1433)
-- stage1 benchmarking [#1788](https://github.com/coreos/rkt/issues/1788)
 - user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)
+- `rkt fly` as top-level command [#1889](https://github.com/coreos/rkt/issues/1889)
+- IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
+- stage1 benchmarking [#1788](https://github.com/coreos/rkt/issues/1788)
 - rkt runs on Fedora with SELinux in enforcing mode
 
-### rkt 1.4 (April)
+### rkt 1.5 (April)
 
 - stable API
 - full integration with Kubernetes (aka "rktnetes")
 - full integration with `machinectl login` and `systemd-run` [#1463](https://github.com/coreos/rkt/issues/1463)
-- `rkt fly` as top-level command [#1889](https://github.com/coreos/rkt/issues/1889)
 - attach to the app's stdin/stdout [#1799](https://github.com/coreos/rkt/issues/1799)
-- IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
 - packaged for more distributions
   - Debian [#1307](https://github.com/coreos/rkt/issues/1307)
   - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)

From 03b7de4bf9d62ca250bcc20aa67b65e7ad422bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 31 Mar 2016 17:54:00 +0200
Subject: [PATCH 0067/1304] CHANGELOG: add v1.3.0

---
 CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89fbe458f5..ab0a4d4792 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## v1.3.0
+
+This release includes a number of new features and bugfixes like the long-awaited propagation of apps' exit status.
+
+#### New features and UX changes
+
+- Propagate exit status from apps inside the pod to rkt ([#2308](https://github.com/coreos/rkt/pull/2308)). Previously, if an app exited with a non-zero exit status, rkt's exit status would still be 0. Now, if an app fails, its exit status will be propagated to the outside. While this was partially implemented in some stage1 flavors since rkt v1.1.0, it now works in the default coreos flavor.
+- Check signatures for stage1 images by default, especially useful when stage1 images are downloaded from the Internet ([#2336](https://github.com/coreos/rkt/pull/2336)).
+ This doesn't affect the following cases:
+  - The stage1 image is already in the store
+  - The stage1 image is in the default directory configured at build time
+  - The stage1 image is the default one and it is in the same directory as the rkt binary
+- Allow downloading of insecure public keys with the `pubkey` insecure option ([#2278](https://github.com/coreos/rkt/pull/2278)).
+- Implement Docker volume semantics ([#2315](https://github.com/coreos/rkt/pull/2315)). Docker volumes are initialized with the files in the image if they exist, unless a host directory is mounted there. Implement that behavior in rkt when it runs a Docker converted image.
+
+#### API service
+
+- Return the cgroup when getting information about running pods and add a new cgroup filter ([#2331](https://github.com/coreos/rkt/pull/2331)).
+
+#### Bug fixes
+
+- Avoid configuring more CPUs than the host has in the kvm flavor ([#2321](https://github.com/coreos/rkt/pull/2321)).
+- Fix a bug where the proxy configuration wasn't forwarded to docker2aci ([docker2aci#147](https://github.com/appc/docker2aci/pull/147)).
+
+#### Notes
+
+- This release drops support for go1.4.
+
 ## v1.2.1
 
 This release fixes a couple of bugs we missed in 1.2.0.

From 97b92aac8e4ea6b39b8d2e0a42b3d3a1b91c9092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 31 Mar 2016 17:58:38 +0200
Subject: [PATCH 0068/1304] version: bump to v1.3.0

---
 Documentation/getting-started-ubuntu.md | 6 +++---
 Documentation/running-fly-stage1.md     | 4 ++--
 Documentation/running-lkvm-stage1.md    | 4 ++--
 Documentation/subcommands/prepare.md    | 2 +-
 Documentation/subcommands/version.md    | 2 +-
 Documentation/trying-out-rkt.md         | 6 +++---
 configure.ac                            | 2 +-
 scripts/acbuild-rkt-builder.sh          | 2 +-
 scripts/build-rir.sh                    | 2 +-
 tests/empty-image/manifest              | 2 +-
 tests/image/manifest                    | 2 +-
 tests/rkt_exec_test.go                  | 2 +-
 tests/rkt_image_cat_manifest_test.go    | 2 +-
 tests/rkt_image_export_test.go          | 2 +-
 tests/rkt_image_render_test.go          | 2 +-
 tests/rkt_os_arch_test.go               | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
index 86672711a7..591bc19fe9 100644
--- a/Documentation/getting-started-ubuntu.md
+++ b/Documentation/getting-started-ubuntu.md
@@ -15,9 +15,9 @@ vagrant up --provider virtualbox
 vagrant ssh
 sudo -s
 
-wget https://github.com/coreos/rkt/releases/download/v1.2.1/rkt-v1.2.1.tar.gz
-tar xzvf rkt-v1.2.1.tar.gz
-cd rkt-v1.2.1
+wget https://github.com/coreos/rkt/releases/download/v1.3.0/rkt-v1.3.0.tar.gz
+tar xzvf rkt-v1.3.0.tar.gz
+cd rkt-v1.3.0
 ./rkt help
 ```
 
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 04d33fc3d1..b1a370a42f 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.2.1+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.3.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.2.1 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.3.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index dd77c1b595..b66dbef611 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.2.1+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.3.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.2.1 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.3.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 9b1793dd91..0c9df9ca45 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.2.1
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.3.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 905dba5666..69cfbfbafb 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.2.1
+rkt Version: 1.3.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 909c515bbb..e966deb92b 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool, and is currently supported on amd64 Linux. A
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.2.1/rkt-v1.2.1.tar.gz
-tar xzvf rkt-v1.2.1.tar.gz
-cd rkt-v1.2.1
+wget https://github.com/coreos/rkt/releases/download/v1.3.0/rkt-v1.3.0.tar.gz
+tar xzvf rkt-v1.3.0.tar.gz
+cd rkt-v1.3.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 19f06c020a..4df5fbe3d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.2.1+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.3.0], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 1e5ef7a12a..76a49dd403 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -25,7 +25,7 @@ ACI_NAME=${ACI_NAME:-"coreos.com/rkt/builder"}
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
 ACI_GOPATH=/go
-VERSION=${VERSION:-"v1.2.1+git"}
+VERSION=${VERSION:-"v1.3.0"}
 echo "Version: $VERSION"
 
 echo "Building $ACI_FILE"
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 8db2ec9076..67c16e2d9f 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR=${SRC_DIR:-$PWD}
 BUILDDIR=${BUILDDIR:-$PWD/build-rir}
-RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.2.1+git}
+RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.3.0}
 
 mkdir -p $BUILDDIR
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 09c7e908ef..2a57160f49 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.2.1"
+            "value": "1.3.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 81978de79d..a48b7362ea 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.2.1"
+            "value": "1.3.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 9696bacd81..3268656bfe 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.2.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.3.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 72dd1e5948..765e584db9 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -27,7 +27,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.3.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index fd48d7a8f2..35401d5927 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.3.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 8abba1a4e2..8b5f91420f 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.3.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index ef5165ffad..a82e36b684 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.1"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.3.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 00e233f24bd6639413fd95995cd1fd949fac68ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 31 Mar 2016 17:58:38 +0200
Subject: [PATCH 0069/1304] version: bump to v1.3.0+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4df5fbe3d3..096c1dc974 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.3.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.3.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 76a49dd403..27cff65468 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -25,7 +25,7 @@ ACI_NAME=${ACI_NAME:-"coreos.com/rkt/builder"}
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
 ACI_GOPATH=/go
-VERSION=${VERSION:-"v1.3.0"}
+VERSION=${VERSION:-"v1.3.0+git"}
 echo "Version: $VERSION"
 
 echo "Building $ACI_FILE"
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 67c16e2d9f..2bcb4ae23e 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR=${SRC_DIR:-$PWD}
 BUILDDIR=${BUILDDIR:-$PWD/build-rir}
-RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.3.0}
+RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.3.0+git}
 
 mkdir -p $BUILDDIR
 

From f65389b19e7830ce986ee37844600ff2290ccd05 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Mon, 4 Apr 2016 12:56:31 +0200
Subject: [PATCH 0070/1304] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bd31523d82..72d14470d6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,9 +14,10 @@ contribution. See the [DCO](DCO) file for details.
 
 # Email and Chat
 
-The project has a mailing list and currently uses the general CoreOS IRC channel:
+The project has a mailing list and two discussion channels in IRC:
 - Email: [rkt-dev](https://groups.google.com/forum/#!forum/rkt-dev)
-- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org
+- IRC: #[rkt](irc://irc.freenode.org:6667/#rkt) on freenode.org, for general discussion
+- IRC: #[rkt-dev](irc://irc.freenode.org:6667/#rkt-dev) on freenode.org, for development discussion
 
 Please avoid emailing maintainers found in the MAINTAINERS file directly. They
 are very busy and read the mailing lists.

From 608803b082ed50fce17eb74157b1356eb8a7d48f Mon Sep 17 00:00:00 2001
From: Angus Lees <gus@inodes.org>
Date: Mon, 4 Apr 2016 21:09:52 +1000
Subject: [PATCH 0071/1304] Build actool for the *build* architecture

actool is used during the build to generate stage1 images, etc.  Without
this patch, actool is mistakenly compiled for the *target* architecture.
---
 tools/actool.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/actool.mk b/tools/actool.mk
index 839a3dcc81..1e07c95f14 100644
--- a/tools/actool.mk
+++ b/tools/actool.mk
@@ -4,6 +4,7 @@ $(call setup-stamp-file,ACTOOL_STAMP)
 BGB_STAMP := $(ACTOOL_STAMP)
 BGB_PKG_IN_REPO := Godeps/_workspace/src/github.com/appc/spec/actool
 BGB_BINARY := $(ACTOOL)
+BGB_ADDITIONAL_GO_ENV := GOARCH=$(GOARCH_FOR_BUILD) CC=$(CC_FOR_BUILD)
 
 CLEAN_FILES += $(ACTOOL)
 

From d4cc75bbd6dca1c65f8bfdf134adce91c0758ee9 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Mon, 4 Apr 2016 14:34:32 +0200
Subject: [PATCH 0072/1304] Godeps: add cobra/doc

---
 Godeps/Godeps.json                            |   6 +-
 .../github.com/spf13/cobra/doc/man_docs.go    | 218 ++++++++++++++++++
 .../github.com/spf13/cobra/doc/man_docs.md    |  26 +++
 .../src/github.com/spf13/cobra/doc/md_docs.go | 175 ++++++++++++++
 .../src/github.com/spf13/cobra/doc/md_docs.md | 104 +++++++++
 .../src/github.com/spf13/cobra/doc/util.go    |  38 +++
 rkt/rkt.go                                    |   1 +
 7 files changed, 567 insertions(+), 1 deletion(-)
 create mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go
 create mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md
 create mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go
 create mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md
 create mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 4128e8078c..edbe03bfa0 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -406,7 +406,11 @@
 		},
 		{
 			"ImportPath": "github.com/spf13/cobra",
-			"Rev": "1c44ec8d3f1552cac48999f9306da23c4d8a288b"
+			"Rev": "4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f"
+		},
+		{
+			"ImportPath": "github.com/spf13/cobra/doc",
+			"Rev": "4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f"
 		},
 		{
 			"ImportPath": "github.com/spf13/pflag",
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go b/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go
new file mode 100644
index 0000000000..a98674bf3a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go
@@ -0,0 +1,218 @@
+// Copyright 2015 Red Hat Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package doc
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+
+	mangen "github.com/cpuguy83/go-md2man/md2man"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+)
+
+// GenManTree will generate a man page for this command and all decendants
+// in the directory given. The header may be nil. This function may not work
+// correctly if your command names have - in them. If you have `cmd` with two
+// subcmds, `sub` and `sub-third`. And `sub` has a subcommand called `third`
+// it is undefined which help output will be in the file `cmd-sub-third.1`.
+func GenManTree(cmd *cobra.Command, header *GenManHeader, dir string) error {
+	if header == nil {
+		header = &GenManHeader{}
+	}
+	for _, c := range cmd.Commands() {
+		if !c.IsAvailableCommand() || c.IsHelpCommand() {
+			continue
+		}
+		if err := GenManTree(c, header, dir); err != nil {
+			return err
+		}
+	}
+	needToResetTitle := header.Title == ""
+
+	basename := strings.Replace(cmd.CommandPath(), " ", "_", -1) + ".1"
+	filename := filepath.Join(dir, basename)
+	f, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if err := GenMan(cmd, header, f); err != nil {
+		return err
+	}
+
+	if needToResetTitle {
+		header.Title = ""
+	}
+	return nil
+}
+
+// GenManHeader is a lot like the .TH header at the start of man pages. These
+// include the title, section, date, source, and manual. We will use the
+// current time if Date if unset and will use "Auto generated by spf13/cobra"
+// if the Source is unset.
+type GenManHeader struct {
+	Title   string
+	Section string
+	Date    *time.Time
+	date    string
+	Source  string
+	Manual  string
+}
+
+// GenMan will generate a man page for the given command and write it to
+// w. The header argument may be nil, however obviously w may not.
+func GenMan(cmd *cobra.Command, header *GenManHeader, w io.Writer) error {
+	if header == nil {
+		header = &GenManHeader{}
+	}
+	b := genMan(cmd, header)
+	final := mangen.Render(b)
+	_, err := w.Write(final)
+	return err
+}
+
+func fillHeader(header *GenManHeader, name string) {
+	if header.Title == "" {
+		header.Title = strings.ToUpper(strings.Replace(name, " ", "\\-", -1))
+	}
+	if header.Section == "" {
+		header.Section = "1"
+	}
+	if header.Date == nil {
+		now := time.Now()
+		header.Date = &now
+	}
+	header.date = (*header.Date).Format("Jan 2006")
+	if header.Source == "" {
+		header.Source = "Auto generated by spf13/cobra"
+	}
+}
+
+func manPreamble(out io.Writer, header *GenManHeader, name, short, long string) {
+	dashName := strings.Replace(name, " ", "-", -1)
+	fmt.Fprintf(out, `%% %s(%s)%s
+%% %s
+%% %s
+# NAME
+`, header.Title, header.Section, header.date, header.Source, header.Manual)
+	fmt.Fprintf(out, "%s \\- %s\n\n", dashName, short)
+	fmt.Fprintf(out, "# SYNOPSIS\n")
+	fmt.Fprintf(out, "**%s** [OPTIONS]\n\n", name)
+	fmt.Fprintf(out, "# DESCRIPTION\n")
+	fmt.Fprintf(out, "%s\n\n", long)
+}
+
+func manPrintFlags(out io.Writer, flags *pflag.FlagSet) {
+	flags.VisitAll(func(flag *pflag.Flag) {
+		if len(flag.Deprecated) > 0 || flag.Hidden {
+			return
+		}
+		format := ""
+		if len(flag.Shorthand) > 0 {
+			format = "**-%s**, **--%s**"
+		} else {
+			format = "%s**--%s**"
+		}
+		if len(flag.NoOptDefVal) > 0 {
+			format = format + "["
+		}
+		if flag.Value.Type() == "string" {
+			// put quotes on the value
+			format = format + "=%q"
+		} else {
+			format = format + "=%s"
+		}
+		if len(flag.NoOptDefVal) > 0 {
+			format = format + "]"
+		}
+		format = format + "\n\t%s\n\n"
+		fmt.Fprintf(out, format, flag.Shorthand, flag.Name, flag.DefValue, flag.Usage)
+	})
+}
+
+func manPrintOptions(out io.Writer, command *cobra.Command) {
+	flags := command.NonInheritedFlags()
+	if flags.HasFlags() {
+		fmt.Fprintf(out, "# OPTIONS\n")
+		manPrintFlags(out, flags)
+		fmt.Fprintf(out, "\n")
+	}
+	flags = command.InheritedFlags()
+	if flags.HasFlags() {
+		fmt.Fprintf(out, "# OPTIONS INHERITED FROM PARENT COMMANDS\n")
+		manPrintFlags(out, flags)
+		fmt.Fprintf(out, "\n")
+	}
+}
+
+func genMan(cmd *cobra.Command, header *GenManHeader) []byte {
+	// something like `rootcmd subcmd1 subcmd2`
+	commandName := cmd.CommandPath()
+	// something like `rootcmd-subcmd1-subcmd2`
+	dashCommandName := strings.Replace(commandName, " ", "-", -1)
+
+	fillHeader(header, commandName)
+
+	buf := new(bytes.Buffer)
+
+	short := cmd.Short
+	long := cmd.Long
+	if len(long) == 0 {
+		long = short
+	}
+
+	manPreamble(buf, header, commandName, short, long)
+	manPrintOptions(buf, cmd)
+	if len(cmd.Example) > 0 {
+		fmt.Fprintf(buf, "# EXAMPLE\n")
+		fmt.Fprintf(buf, "```\n%s\n```\n", cmd.Example)
+	}
+	if hasSeeAlso(cmd) {
+		fmt.Fprintf(buf, "# SEE ALSO\n")
+		seealsos := make([]string, 0)
+		if cmd.HasParent() {
+			parentPath := cmd.Parent().CommandPath()
+			dashParentPath := strings.Replace(parentPath, " ", "-", -1)
+			seealso := fmt.Sprintf("**%s(%s)**", dashParentPath, header.Section)
+			seealsos = append(seealsos, seealso)
+			cmd.VisitParents(func(c *cobra.Command) {
+				if c.DisableAutoGenTag {
+					cmd.DisableAutoGenTag = c.DisableAutoGenTag
+				}
+			})
+		}
+		children := cmd.Commands()
+		sort.Sort(byName(children))
+		for _, c := range children {
+			if !c.IsAvailableCommand() || c.IsHelpCommand() {
+				continue
+			}
+			seealso := fmt.Sprintf("**%s-%s(%s)**", dashCommandName, c.Name(), header.Section)
+			seealsos = append(seealsos, seealso)
+		}
+		fmt.Fprintf(buf, "%s\n", strings.Join(seealsos, ", "))
+	}
+	if !cmd.DisableAutoGenTag {
+		fmt.Fprintf(buf, "# HISTORY\n%s Auto generated by spf13/cobra\n", header.Date.Format("2-Jan-2006"))
+	}
+	return buf.Bytes()
+}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md b/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md
new file mode 100644
index 0000000000..5fe957a355
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md
@@ -0,0 +1,26 @@
+# Generating Man Pages For Your Own cobra.Command
+
+Generating man pages from a cobra command is incredibly easy. An example is as follows:
+
+```go
+package main
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/spf13/cobra/doc"
+)
+
+func main() {
+	cmd := &cobra.Command{
+		Use:   "test",
+		Short: "my test program",
+	}
+	header := &cobra.GenManHeader{
+		Title: "MINE",
+		Section: "3",
+	}
+	doc.GenManTree(cmd, header, "/tmp")
+}
+```
+
+That will get you a man page `/tmp/test.1`
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go b/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go
new file mode 100644
index 0000000000..fa13631804
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go
@@ -0,0 +1,175 @@
+//Copyright 2015 Red Hat Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package doc
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+
+	"github.com/spf13/cobra"
+)
+
+func printOptions(w io.Writer, cmd *cobra.Command, name string) error {
+	flags := cmd.NonInheritedFlags()
+	flags.SetOutput(w)
+	if flags.HasFlags() {
+		if _, err := fmt.Fprintf(w, "### Options\n\n```\n"); err != nil {
+			return err
+		}
+		flags.PrintDefaults()
+		if _, err := fmt.Fprintf(w, "```\n\n"); err != nil {
+			return err
+		}
+	}
+
+	parentFlags := cmd.InheritedFlags()
+	parentFlags.SetOutput(w)
+	if parentFlags.HasFlags() {
+		if _, err := fmt.Fprintf(w, "### Options inherited from parent commands\n\n```\n"); err != nil {
+			return err
+		}
+		parentFlags.PrintDefaults()
+		if _, err := fmt.Fprintf(w, "```\n\n"); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func GenMarkdown(cmd *cobra.Command, w io.Writer) error {
+	return GenMarkdownCustom(cmd, w, func(s string) string { return s })
+}
+
+func GenMarkdownCustom(cmd *cobra.Command, w io.Writer, linkHandler func(string) string) error {
+	name := cmd.CommandPath()
+
+	short := cmd.Short
+	long := cmd.Long
+	if len(long) == 0 {
+		long = short
+	}
+
+	if _, err := fmt.Fprintf(w, "## %s\n\n", name); err != nil {
+		return err
+	}
+	if _, err := fmt.Fprintf(w, "%s\n\n", short); err != nil {
+		return err
+	}
+	if _, err := fmt.Fprintf(w, "### Synopsis\n\n"); err != nil {
+		return err
+	}
+	if _, err := fmt.Fprintf(w, "\n%s\n\n", long); err != nil {
+		return err
+	}
+
+	if cmd.Runnable() {
+		if _, err := fmt.Fprintf(w, "```\n%s\n```\n\n", cmd.UseLine()); err != nil {
+			return err
+		}
+	}
+
+	if len(cmd.Example) > 0 {
+		if _, err := fmt.Fprintf(w, "### Examples\n\n"); err != nil {
+			return err
+		}
+		if _, err := fmt.Fprintf(w, "```\n%s\n```\n\n", cmd.Example); err != nil {
+			return err
+		}
+	}
+
+	if err := printOptions(w, cmd, name); err != nil {
+		return err
+	}
+	if hasSeeAlso(cmd) {
+		if _, err := fmt.Fprintf(w, "### SEE ALSO\n"); err != nil {
+			return err
+		}
+		if cmd.HasParent() {
+			parent := cmd.Parent()
+			pname := parent.CommandPath()
+			link := pname + ".md"
+			link = strings.Replace(link, " ", "_", -1)
+			if _, err := fmt.Fprintf(w, "* [%s](%s)\t - %s\n", pname, linkHandler(link), parent.Short); err != nil {
+				return err
+			}
+			cmd.VisitParents(func(c *cobra.Command) {
+				if c.DisableAutoGenTag {
+					cmd.DisableAutoGenTag = c.DisableAutoGenTag
+				}
+			})
+		}
+
+		children := cmd.Commands()
+		sort.Sort(byName(children))
+
+		for _, child := range children {
+			if !child.IsAvailableCommand() || child.IsHelpCommand() {
+				continue
+			}
+			cname := name + " " + child.Name()
+			link := cname + ".md"
+			link = strings.Replace(link, " ", "_", -1)
+			if _, err := fmt.Fprintf(w, "* [%s](%s)\t - %s\n", cname, linkHandler(link), child.Short); err != nil {
+				return err
+			}
+		}
+		if _, err := fmt.Fprintf(w, "\n"); err != nil {
+			return err
+		}
+	}
+	if !cmd.DisableAutoGenTag {
+		if _, err := fmt.Fprintf(w, "###### Auto generated by spf13/cobra on %s\n", time.Now().Format("2-Jan-2006")); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func GenMarkdownTree(cmd *cobra.Command, dir string) error {
+	identity := func(s string) string { return s }
+	emptyStr := func(s string) string { return "" }
+	return GenMarkdownTreeCustom(cmd, dir, emptyStr, identity)
+}
+
+func GenMarkdownTreeCustom(cmd *cobra.Command, dir string, filePrepender, linkHandler func(string) string) error {
+	for _, c := range cmd.Commands() {
+		if !c.IsAvailableCommand() || c.IsHelpCommand() {
+			continue
+		}
+		if err := GenMarkdownTreeCustom(c, dir, filePrepender, linkHandler); err != nil {
+			return err
+		}
+	}
+
+	basename := strings.Replace(cmd.CommandPath(), " ", "_", -1) + ".md"
+	filename := filepath.Join(dir, basename)
+	f, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if _, err := io.WriteString(f, filePrepender(filename)); err != nil {
+		return err
+	}
+	if err := GenMarkdownCustom(cmd, f, linkHandler); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md b/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md
new file mode 100644
index 0000000000..0c3b96e271
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md
@@ -0,0 +1,104 @@
+# Generating Markdown Docs For Your Own cobra.Command
+
+Generating man pages from a cobra command is incredibly easy. An example is as follows:
+
+```go
+package main
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/spf13/cobra/doc"
+)
+
+func main() {
+	cmd := &cobra.Command{
+		Use:   "test",
+		Short: "my test program",
+	}
+	doc.GenMarkdownTree(cmd, "/tmp")
+}
+```
+
+That will get you a Markdown document `/tmp/test.md`
+
+## Generate markdown docs for the entire command tree
+
+This program can actually generate docs for the kubectl command in the kubernetes project
+
+```go
+package main
+
+import (
+	"io/ioutil"
+	"os"
+
+	kubectlcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+
+	"github.com/spf13/cobra/doc"
+)
+
+func main() {
+	cmd := kubectlcmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, ioutil.Discard, ioutil.Discard)
+	doc.GenMarkdownTree(cmd, "./")
+}
+```
+
+This will generate a whole series of files, one for each command in the tree, in the directory specified (in this case "./")
+
+## Generate markdown docs for a single command
+
+You may wish to have more control over the output, or only generate for a single command, instead of the entire command tree. If this is the case you may prefer to `GenMarkdown` instead of `GenMarkdownTree`
+
+```go
+	out := new(bytes.Buffer)
+	doc.GenMarkdown(cmd, out)
+```
+
+This will write the markdown doc for ONLY "cmd" into the out, buffer.
+
+## Customize the output
+
+Both `GenMarkdown` and `GenMarkdownTree` have alternate versions with callbacks to get some control of the output:
+
+```go
+func GenMarkdownTreeCustom(cmd *Command, dir string, filePrepender, linkHandler func(string) string) error {
+	//...
+}
+```
+
+```go
+func GenMarkdownCustom(cmd *Command, out *bytes.Buffer, linkHandler func(string) string) error {
+	//...
+}
+```
+
+The `filePrepender` will prepend the return value given the full filepath to the rendered Markdown file. A common use case is to add front matter to use the generated documentation with [Hugo](http://gohugo.io/):
+
+```go
+const fmTemplate = `---
+date: %s
+title: "%s"
+slug: %s
+url: %s
+---
+`
+
+filePrepender := func(filename string) string {
+	now := time.Now().Format(time.RFC3339)
+	name := filepath.Base(filename)
+	base := strings.TrimSuffix(name, path.Ext(name))
+	url := "/commands/" + strings.ToLower(base) + "/"
+	return fmt.Sprintf(fmTemplate, now, strings.Replace(base, "_", " ", -1), base, url)
+}
+```
+
+The `linkHandler` can be used to customize the rendered internal links to the commands, given a filename:
+
+```go
+linkHandler := func(name string) string {
+	base := strings.TrimSuffix(name, path.Ext(name))
+	return "/commands/" + strings.ToLower(base) + "/"
+}
+```
+
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go b/Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go
new file mode 100644
index 0000000000..a1c6b89ba6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go
@@ -0,0 +1,38 @@
+// Copyright 2015 Red Hat Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package doc
+
+import "github.com/spf13/cobra"
+
+// Test to see if we have a reason to print See Also information in docs
+// Basically this is a test for a parent commend or a subcommand which is
+// both not deprecated and not the autogenerated help command.
+func hasSeeAlso(cmd *cobra.Command) bool {
+	if cmd.HasParent() {
+		return true
+	}
+	for _, c := range cmd.Commands() {
+		if !c.IsAvailableCommand() || c.IsHelpCommand() {
+			continue
+		}
+		return true
+	}
+	return false
+}
+
+type byName []*cobra.Command
+
+func (s byName) Len() int           { return len(s) }
+func (s byName) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s byName) Less(i, j int) bool { return s[i].Name() < s[j].Name() }
diff --git a/rkt/rkt.go b/rkt/rkt.go
index dd94488a5a..367c5f5022 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -28,6 +28,7 @@ import (
 	"github.com/coreos/rkt/rkt/config"
 	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/spf13/cobra"
+	_ "github.com/spf13/cobra/doc"
 )
 
 const (

From 608b1d43e50950f0cf7f188584cd98b227d004c1 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Mon, 4 Apr 2016 17:10:17 -0700
Subject: [PATCH 0073/1304] prepare: Support 'ondisk' verification skip

Prior to this commit, `rkt prepare` would check the ondisk image even if
the `--insecure-options=ondisk` flag was provided.

This commit corrects that.
---
 rkt/prepare.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rkt/prepare.go b/rkt/prepare.go
index f9b6823e8d..3e882c66e0 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -165,9 +165,10 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	pcfg := stage0.PrepareConfig{
-		CommonConfig: &cfg,
-		UseOverlay:   !flagNoOverlay && common.SupportsOverlay(),
-		PrivateUsers: privateUsers,
+		CommonConfig:       &cfg,
+		UseOverlay:         !flagNoOverlay && common.SupportsOverlay(),
+		PrivateUsers:       privateUsers,
+		SkipTreeStoreCheck: globalFlags.InsecureFlags.SkipOnDiskCheck(),
 	}
 
 	if len(flagPodManifest) > 0 {

From 7e96245048a19eae7b2b0bf1396d42c050bef5c7 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 4 Apr 2016 19:26:15 -0700
Subject: [PATCH 0074/1304] api: Add 'CreatedAt', 'StartedAt' in pod's info.

---
 api/v1alpha/api.pb.go | 183 ++++++++++++++++++++++--------------------
 api/v1alpha/api.proto |   6 ++
 rkt/api_service.go    |  12 +++
 3 files changed, 112 insertions(+), 89 deletions(-)

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index 99783930f9..5ae9fe8ace 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -340,6 +340,10 @@ type Pod struct {
 	Annotations []*KeyValue `protobuf:"bytes,7,rep,name=annotations" json:"annotations,omitempty"`
 	// Cgroup of the pod, empty if the pod is not running.
 	Cgroup string `protobuf:"bytes,8,opt,name=cgroup" json:"cgroup,omitempty"`
+	// Timestamp when the pod is created, nanoseconds since epoch.
+	CreatedAt int64 `protobuf:"varint,9,opt,name=created_at" json:"created_at,omitempty"`
+	// Timestamp when the pod is started, nanoseconds since epoch.
+	StartedAt int64 `protobuf:"varint,10,opt,name=started_at" json:"started_at,omitempty"`
 }
 
 func (m *Pod) Reset()                    { *m = Pod{} }
@@ -1128,96 +1132,97 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1450 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0x4d, 0x72, 0xdb, 0x46,
-	0x13, 0x35, 0x7f, 0xc0, 0x9f, 0x26, 0x4d, 0x91, 0x23, 0xd9, 0xa2, 0xe8, 0x3f, 0x19, 0xdf, 0x17,
-	0x97, 0xa3, 0x85, 0x92, 0xc8, 0x8e, 0x37, 0xa9, 0x4a, 0x99, 0x96, 0x20, 0x15, 0x63, 0x89, 0x64,
-	0xd1, 0xb4, 0x2b, 0x5e, 0xa1, 0x20, 0x72, 0x28, 0xa3, 0x0c, 0x02, 0x08, 0x00, 0xca, 0x56, 0x96,
-	0xb9, 0x40, 0x8e, 0x90, 0x33, 0x64, 0x95, 0x65, 0xf6, 0x39, 0x46, 0xaa, 0x72, 0x8f, 0xf4, 0x0c,
-	0x06, 0xc0, 0x00, 0x04, 0x17, 0xd9, 0x89, 0xdd, 0x33, 0xaf, 0xdf, 0xeb, 0xe9, 0x79, 0x03, 0x41,
-	0xdd, 0x70, 0xcd, 0x43, 0xd7, 0x73, 0x02, 0x87, 0x54, 0xaf, 0xbf, 0x31, 0x2c, 0xf7, 0x83, 0xa1,
-	0xbe, 0x84, 0xc6, 0x60, 0x69, 0x5c, 0xd1, 0x53, 0xc7, 0x5b, 0x1a, 0x01, 0xd9, 0x87, 0x72, 0x70,
-	0xe3, 0xd2, 0x6e, 0x61, 0xbf, 0xf0, 0xb4, 0x75, 0x44, 0x0e, 0xc5, 0xb2, 0x43, 0xbe, 0x66, 0x8a,
-	0x19, 0xb2, 0x05, 0xd5, 0x6b, 0xea, 0xf9, 0xa6, 0x63, 0x77, 0x8b, 0xb8, 0xa8, 0xae, 0xfe, 0x59,
-	0x00, 0x85, 0xa7, 0xc9, 0x97, 0xd0, 0xb8, 0x34, 0x7c, 0xaa, 0x2f, 0x38, 0x16, 0xc7, 0x68, 0x1c,
-	0xed, 0xa4, 0x31, 0x44, 0x1d, 0x80, 0xa2, 0x39, 0x0f, 0x01, 0x48, 0x13, 0xca, 0xb6, 0xb1, 0xa4,
-	0xdd, 0x12, 0xff, 0x25, 0xe1, 0x97, 0x79, 0xa0, 0x0b, 0x6d, 0x73, 0xe9, 0x3a, 0x5e, 0xa0, 0x07,
-	0xe6, 0x92, 0xfa, 0x81, 0xb1, 0x74, 0xbb, 0x0a, 0x66, 0x4a, 0xa4, 0x0d, 0xb5, 0xa5, 0x61, 0x9b,
-	0x0b, 0x0c, 0x76, 0x2b, 0x18, 0x69, 0x32, 0x28, 0xdf, 0xfc, 0x99, 0x76, 0xab, 0x3c, 0xff, 0x04,
+	// 1469 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0x4b, 0x72, 0xdb, 0x46,
+	0x13, 0x36, 0x1f, 0xe0, 0xa3, 0x49, 0x53, 0xe4, 0x48, 0xb6, 0x28, 0xfa, 0x25, 0xe3, 0xff, 0xe3,
+	0x72, 0xb4, 0x50, 0x12, 0xd9, 0xf1, 0x26, 0x55, 0x29, 0xd3, 0x12, 0xa4, 0x62, 0x2c, 0x91, 0x2c,
+	0x9a, 0x76, 0xc5, 0x2b, 0x14, 0x44, 0x0e, 0x65, 0x94, 0x41, 0x00, 0x01, 0x40, 0xd9, 0xca, 0x32,
+	0x17, 0xc8, 0x11, 0x72, 0x86, 0xac, 0xb2, 0xcc, 0x5d, 0x52, 0x95, 0x0b, 0xe4, 0x04, 0xe9, 0x19,
+	0x0c, 0x80, 0x01, 0x08, 0x2e, 0xb2, 0x13, 0xbb, 0x7b, 0xbe, 0xfe, 0xba, 0xa7, 0xfb, 0x1b, 0x08,
+	0xea, 0x86, 0x6b, 0x1e, 0xba, 0x9e, 0x13, 0x38, 0xa4, 0x7a, 0xfd, 0x8d, 0x61, 0xb9, 0x1f, 0x0c,
+	0xf5, 0x25, 0x34, 0x06, 0x4b, 0xe3, 0x8a, 0x9e, 0x3a, 0xde, 0xd2, 0x08, 0xc8, 0x3e, 0x94, 0x83,
+	0x1b, 0x97, 0x76, 0x0b, 0xfb, 0x85, 0xa7, 0xad, 0x23, 0x72, 0x28, 0xc2, 0x0e, 0x79, 0xcc, 0x14,
+	0x3d, 0x64, 0x0b, 0xaa, 0xd7, 0xd4, 0xf3, 0x4d, 0xc7, 0xee, 0x16, 0x31, 0xa8, 0xae, 0xfe, 0x59,
+	0x00, 0x85, 0xbb, 0xc9, 0x97, 0xd0, 0xb8, 0x34, 0x7c, 0xaa, 0x2f, 0x38, 0x16, 0xc7, 0x68, 0x1c,
+	0xed, 0xa4, 0x31, 0x44, 0x1e, 0x80, 0xa2, 0x39, 0x0f, 0x01, 0x48, 0x13, 0xca, 0xb6, 0xb1, 0xa4,
+	0xdd, 0x12, 0xff, 0x25, 0xe1, 0x97, 0xb9, 0xa1, 0x0b, 0x6d, 0x73, 0xe9, 0x3a, 0x5e, 0xa0, 0x07,
+	0xe6, 0x92, 0xfa, 0x81, 0xb1, 0x74, 0xbb, 0x0a, 0x7a, 0x4a, 0xa4, 0x0d, 0xb5, 0xa5, 0x61, 0x9b,
+	0x0b, 0x34, 0x76, 0x2b, 0x68, 0x69, 0x32, 0x28, 0xdf, 0xfc, 0x99, 0x76, 0xab, 0xdc, 0xff, 0x04,
 	0x1a, 0x86, 0x6d, 0x3b, 0x81, 0x11, 0x20, 0x9a, 0xdf, 0xad, 0xed, 0x97, 0x90, 0x4f, 0x27, 0xe6,
 	0xf3, 0x9a, 0xde, 0xbc, 0x33, 0xac, 0x15, 0x55, 0x9f, 0x41, 0x75, 0x48, 0x83, 0x4f, 0x8e, 0xf7,
 	0x31, 0xe6, 0x52, 0x88, 0x98, 0x99, 0xee, 0xf5, 0xf3, 0x84, 0x27, 0xfe, 0x7a, 0x11, 0xf2, 0x54,
-	0x7f, 0x2d, 0x40, 0xa9, 0xef, 0xba, 0x99, 0x1d, 0x0f, 0x40, 0x31, 0x99, 0x4c, 0xbe, 0xa5, 0x71,
-	0xd4, 0x4a, 0x8b, 0xc7, 0xf6, 0x2a, 0x28, 0x20, 0x08, 0xb5, 0xb6, 0x24, 0x2e, 0x88, 0xf4, 0x86,
-	0x25, 0x48, 0x07, 0xea, 0xf4, 0xb3, 0x19, 0xe8, 0x33, 0x67, 0x4e, 0x79, 0x03, 0x3a, 0x59, 0x19,
-	0xca, 0x26, 0x19, 0x7f, 0x21, 0xa3, 0xb1, 0x33, 0x17, 0xbd, 0x0d, 0xf9, 0x34, 0xa0, 0xe4, 0x8a,
-	0x46, 0x77, 0x36, 0x57, 0xc7, 0x5d, 0x61, 0xf5, 0x1e, 0x94, 0x0d, 0xd7, 0xf5, 0xb1, 0x30, 0xab,
-	0xd1, 0x94, 0xe9, 0x11, 0x15, 0x6a, 0x76, 0xd8, 0xa5, 0x88, 0x43, 0x3b, 0xce, 0x47, 0xed, 0x5b,
-	0x3f, 0x91, 0x0c, 0xf9, 0xea, 0x06, 0xf2, 0xa4, 0x05, 0x95, 0xd9, 0x95, 0xe7, 0xac, 0x5c, 0x3c,
-	0x26, 0xd6, 0xde, 0x27, 0x50, 0x8b, 0x73, 0x28, 0x02, 0xff, 0x16, 0x8a, 0x6e, 0x83, 0x72, 0xcd,
-	0xa2, 0x62, 0xfa, 0x7e, 0x2f, 0x40, 0x1d, 0xe9, 0x9f, 0x9a, 0x56, 0x40, 0x3d, 0xb6, 0xd2, 0x9c,
-	0xfb, 0xb8, 0xb2, 0x84, 0x2b, 0x1f, 0x43, 0x85, 0xcb, 0xf5, 0x71, 0x69, 0x29, 0x5f, 0x6f, 0x87,
-	0xdd, 0x09, 0x57, 0x67, 0x07, 0xe8, 0x63, 0x57, 0xd8, 0x2e, 0x0c, 0xf1, 0x13, 0xd4, 0x19, 0x50,
-	0x99, 0x87, 0xee, 0xc0, 0x6d, 0xa1, 0x5c, 0xac, 0x54, 0x78, 0x38, 0x23, 0xad, 0xb2, 0x49, 0x1a,
-	0x4e, 0x74, 0x28, 0x2d, 0x94, 0x5f, 0x57, 0xff, 0x2e, 0x44, 0x97, 0x2e, 0x87, 0x35, 0xb6, 0xd0,
-	0xf5, 0xe8, 0xc2, 0xfc, 0x2c, 0x78, 0xd7, 0x09, 0x1e, 0x28, 0xbf, 0x56, 0x32, 0x4b, 0x5c, 0xf5,
-	0x91, 0xde, 0x20, 0xa5, 0x98, 0x24, 0xaa, 0xb5, 0x8c, 0x4b, 0x6a, 0x6d, 0x1e, 0x10, 0x72, 0x17,
-	0x5a, 0xe1, 0x4d, 0xa2, 0x73, 0xdd, 0x58, 0x60, 0x65, 0x7e, 0x46, 0x25, 0xb2, 0x0b, 0x5b, 0x71,
-	0xfc, 0x92, 0xe2, 0xed, 0xfd, 0x8f, 0x17, 0x88, 0x31, 0x5c, 0xac, 0x2c, 0x4b, 0x30, 0xac, 0x73,
-	0x91, 0xbf, 0xa1, 0xc8, 0x33, 0xcb, 0xb9, 0x34, 0xac, 0x53, 0xcb, 0xb8, 0xf2, 0x99, 0xc8, 0xb9,
-	0xe9, 0x89, 0x43, 0xdc, 0x83, 0x8e, 0x7f, 0xe3, 0x07, 0x74, 0x89, 0x73, 0x6e, 0x2f, 0xcc, 0x2b,
-	0x9d, 0xa5, 0x8a, 0xd1, 0x75, 0xb7, 0x9c, 0x99, 0x61, 0xc9, 0x99, 0xd0, 0x19, 0x90, 0xe6, 0xca,
-	0xa7, 0x9e, 0x9c, 0x08, 0x1d, 0x82, 0xe9, 0xb2, 0x7d, 0x3a, 0x5b, 0x79, 0xe8, 0x3d, 0xac, 0x18,
-	0xf7, 0x07, 0x76, 0x19, 0xef, 0x04, 0xde, 0xca, 0x0f, 0x74, 0x6c, 0x95, 0xaf, 0x2f, 0x3c, 0x67,
-	0xa9, 0x7f, 0x08, 0x02, 0xd7, 0xe7, 0xb2, 0x6b, 0xaa, 0x07, 0xe5, 0x81, 0xbd, 0x70, 0xc8, 0x36,
-	0x34, 0xbc, 0x8f, 0x81, 0x1e, 0xb9, 0x4e, 0xc8, 0x70, 0x07, 0x9a, 0x38, 0x19, 0x33, 0x3d, 0xe5,
-	0x75, 0x6c, 0x29, 0x7a, 0x68, 0x1c, 0x0c, 0x79, 0x1d, 0x40, 0xf3, 0x8a, 0x0b, 0x15, 0xc5, 0xcb,
-	0x19, 0xdf, 0x93, 0xba, 0x80, 0x35, 0x15, 0xed, 0x9a, 0xda, 0x9b, 0x8d, 0x96, 0x67, 0xb9, 0xd1,
-	0x66, 0x2c, 0x92, 0xd1, 0x17, 0x05, 0xf1, 0x17, 0xb3, 0x42, 0x5e, 0xa8, 0x44, 0x1e, 0x41, 0x79,
-	0x6e, 0x04, 0xc6, 0x66, 0x5f, 0x08, 0xa0, 0xc1, 0x51, 0xc5, 0xb4, 0x3d, 0x06, 0x85, 0x55, 0x0e,
-	0xe7, 0x2d, 0xbf, 0xb4, 0x18, 0xc8, 0x70, 0xfc, 0xf0, 0xc2, 0xc9, 0x93, 0x87, 0xbc, 0x7c, 0xd3,
-	0x9e, 0x51, 0x5d, 0xa2, 0x80, 0xb1, 0x95, 0x1d, 0x98, 0x56, 0x18, 0xe3, 0xe6, 0xac, 0xb6, 0xa1,
-	0x75, 0x46, 0x03, 0xd6, 0xe0, 0x09, 0xfd, 0x69, 0x85, 0x86, 0xa0, 0x1e, 0xc2, 0x56, 0x1c, 0xf1,
-	0x5d, 0x1c, 0x28, 0x4a, 0xee, 0xa1, 0xa5, 0xe2, 0x6f, 0xf1, 0x54, 0xdc, 0x4e, 0xdc, 0x12, 0x83,
-	0xea, 0x29, 0x6c, 0x9d, 0x9b, 0x7e, 0x80, 0x97, 0xd5, 0x17, 0x10, 0xe4, 0x7f, 0x50, 0x5d, 0x70,
-	0x15, 0x21, 0xfb, 0x86, 0xc4, 0x3e, 0x31, 0x01, 0xb4, 0x92, 0x39, 0x0d, 0x0c, 0xd3, 0xe2, 0xcd,
-	0xab, 0x61, 0xdd, 0x76, 0x82, 0x23, 0x0a, 0xa3, 0xd1, 0xb9, 0xce, 0x3c, 0x42, 0x69, 0xca, 0x28,
-	0xea, 0x23, 0xe8, 0x0c, 0x6c, 0xdf, 0xa5, 0x33, 0xb6, 0x25, 0xaa, 0x2c, 0x99, 0xaa, 0xfa, 0x15,
-	0x10, 0x79, 0x81, 0x80, 0xdc, 0x43, 0xab, 0x75, 0xe6, 0x42, 0x4a, 0x1a, 0xf1, 0x07, 0xe8, 0x30,
-	0x06, 0xfc, 0xce, 0xc7, 0x5a, 0xbe, 0xc8, 0x6a, 0xc9, 0xbe, 0x94, 0xf9, 0x6a, 0x9e, 0x03, 0x91,
-	0xb1, 0x44, 0xf1, 0x87, 0x50, 0xe1, 0xae, 0x15, 0x61, 0x65, 0x1e, 0x1e, 0xf5, 0x31, 0x6c, 0x0b,
-	0xca, 0xfc, 0x77, 0x9e, 0xaa, 0x6f, 0x61, 0x27, 0xbd, 0x44, 0x40, 0xc7, 0x4f, 0x5a, 0x21, 0xef,
-	0x49, 0x53, 0xbf, 0x83, 0x6d, 0xc6, 0x87, 0xda, 0x7c, 0x7c, 0x62, 0x75, 0xff, 0x87, 0x4a, 0xa8,
-	0x6e, 0xed, 0x33, 0x40, 0x9a, 0x45, 0xf5, 0x05, 0xec, 0xa4, 0x37, 0x27, 0x72, 0x28, 0x8f, 0xac,
-	0xc9, 0xe1, 0x0b, 0xd5, 0x1b, 0x3e, 0x5c, 0xe7, 0xce, 0x55, 0x5c, 0x0f, 0xdb, 0x84, 0xdd, 0xd7,
-	0xe3, 0x87, 0x0f, 0x0d, 0x32, 0x72, 0x76, 0x71, 0x87, 0x70, 0x8e, 0x2d, 0xd3, 0xe6, 0x73, 0x5c,
-	0x78, 0xaa, 0xb0, 0x0d, 0x0b, 0xc7, 0xb2, 0x9c, 0x4f, 0x7c, 0x86, 0x6b, 0x99, 0xb9, 0x56, 0x72,
-	0xe6, 0x9a, 0x9b, 0xa5, 0xba, 0xcf, 0xa7, 0x38, 0x2c, 0x2d, 0xd8, 0xc6, 0xc8, 0xdc, 0xc1, 0x0f,
-	0x28, 0xd4, 0x93, 0xcf, 0xa5, 0x2e, 0x76, 0xf5, 0xa2, 0x7f, 0xa6, 0xe9, 0xd3, 0xf7, 0x63, 0x4d,
-	0x7f, 0x3b, 0x3c, 0xd1, 0x4e, 0x07, 0x43, 0xed, 0xa4, 0x7d, 0x0b, 0xbd, 0x64, 0x4b, 0xca, 0xf4,
-	0xc7, 0xe3, 0xe3, 0x76, 0x01, 0x9f, 0x9a, 0x8e, 0x14, 0x3c, 0x19, 0x1d, 0xbf, 0xd6, 0x26, 0xed,
-	0x22, 0x12, 0x69, 0x49, 0xe1, 0xd1, 0xf1, 0xa0, 0x5d, 0x3a, 0x18, 0x43, 0x2d, 0xfe, 0x6a, 0xd8,
-	0x85, 0x6d, 0x04, 0xd0, 0xdf, 0x4c, 0xfb, 0xd3, 0x74, 0x11, 0xc4, 0x4b, 0x12, 0x93, 0xb7, 0xc3,
-	0xe1, 0x60, 0x78, 0x86, 0x65, 0x76, 0xa0, 0x9d, 0x84, 0xb5, 0x1f, 0x07, 0x53, 0x5c, 0x5c, 0x3c,
-	0xf8, 0xa7, 0x00, 0xb5, 0xf8, 0x69, 0x44, 0xc8, 0xf1, 0xe8, 0x24, 0x07, 0x12, 0xf7, 0x26, 0x09,
-	0xed, 0xe2, 0xd5, 0xe4, 0xfd, 0x08, 0x11, 0x53, 0xcb, 0xc7, 0x13, 0x6d, 0xdc, 0x9f, 0xb0, 0x52,
-	0x45, 0x34, 0x67, 0x92, 0x4d, 0x20, 0x4c, 0x89, 0x31, 0x4b, 0xe2, 0x11, 0xb3, 0x32, 0x4e, 0xdb,
-	0x5e, 0x12, 0xee, 0xbf, 0x1a, 0x4d, 0x90, 0x5a, 0xb4, 0xad, 0xad, 0x64, 0x8a, 0x87, 0xc4, 0x2b,
-	0xe9, 0x1a, 0x27, 0xda, 0xb9, 0x36, 0x65, 0x60, 0xd5, 0x74, 0x8d, 0xb3, 0xfe, 0xe4, 0x15, 0xb6,
-	0xb0, 0x5d, 0x3b, 0xf8, 0xa3, 0x08, 0xf5, 0xc4, 0xec, 0xf0, 0x84, 0xb4, 0x77, 0xda, 0x70, 0xba,
-	0x7e, 0x42, 0xf7, 0x60, 0x57, 0xca, 0x30, 0xa4, 0x98, 0x7f, 0x01, 0x3f, 0x87, 0x1e, 0xe6, 0x27,
-	0x23, 0xd6, 0xa8, 0xbd, 0x07, 0x77, 0x33, 0x6b, 0x90, 0x0a, 0xcf, 0x95, 0xd0, 0x2e, 0xee, 0x64,
-	0x72, 0x42, 0x4e, 0x19, 0xef, 0xce, 0x7e, 0x26, 0x25, 0xb8, 0xeb, 0xc7, 0xa3, 0xf3, 0x73, 0xed,
-	0x98, 0xad, 0x52, 0x32, 0xe0, 0xe2, 0x38, 0x27, 0x61, 0x43, 0xd2, 0xe0, 0x2c, 0x27, 0xc0, 0xab,
-	0xac, 0xc1, 0x52, 0x2a, 0x9c, 0xaa, 0xc1, 0xc5, 0x38, 0xa4, 0x5c, 0x23, 0xf7, 0xa1, 0xbb, 0x96,
-	0x9e, 0x68, 0x17, 0xa3, 0x77, 0x98, 0xad, 0x1f, 0xfd, 0x52, 0xc6, 0xaf, 0xad, 0xd5, 0xa5, 0x65,
-	0xce, 0xfa, 0xe3, 0x01, 0xf9, 0x1e, 0xaa, 0xc2, 0xd0, 0xc9, 0x6e, 0xf2, 0xda, 0xa5, 0x4c, 0xbf,
-	0xd7, 0x5d, 0x4f, 0x84, 0xb7, 0x46, 0xbd, 0x45, 0xfa, 0x50, 0x8b, 0x8c, 0x99, 0x24, 0xeb, 0x32,
-	0x9e, 0xdf, 0xdb, 0xcb, 0xc9, 0xc4, 0x10, 0x67, 0x00, 0x89, 0x15, 0x93, 0x9e, 0xf4, 0x80, 0x64,
-	0x0c, 0xbc, 0x77, 0x2f, 0x37, 0x27, 0x03, 0x25, 0xb6, 0x2a, 0x01, 0xad, 0xf9, 0xb6, 0x04, 0xb4,
-	0xee, 0xc3, 0x08, 0x74, 0x01, 0x4d, 0xd9, 0x46, 0xc9, 0xfd, 0x6c, 0x5d, 0xd9, 0x80, 0x7b, 0x0f,
-	0x36, 0x64, 0x63, 0xb8, 0x11, 0x34, 0x65, 0x87, 0x94, 0xe0, 0x72, 0x5c, 0x57, 0x82, 0xcb, 0xb3,
-	0x55, 0xf5, 0xd6, 0xd7, 0x05, 0xf2, 0x92, 0x1f, 0x1a, 0xf3, 0xaf, 0xf4, 0xa1, 0x49, 0x66, 0x9a,
-	0x3e, 0x34, 0xd9, 0xea, 0x18, 0xc2, 0x65, 0x85, 0xff, 0x0b, 0xf9, 0xec, 0xdf, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x8d, 0x30, 0x01, 0x4e, 0x4f, 0x0e, 0x00, 0x00,
+	0x7f, 0x2d, 0x40, 0xa9, 0xef, 0xba, 0x99, 0x13, 0x0f, 0x40, 0x31, 0x59, 0x99, 0xfc, 0x48, 0xe3,
+	0xa8, 0x95, 0x2e, 0x1e, 0xdb, 0xab, 0x60, 0x01, 0x41, 0x58, 0x6b, 0x4b, 0xe2, 0x82, 0x48, 0x6f,
+	0x98, 0x83, 0x74, 0xa0, 0x4e, 0x3f, 0x9b, 0x81, 0x3e, 0x73, 0xe6, 0x94, 0x37, 0xa0, 0x93, 0x2d,
+	0x43, 0xd9, 0x54, 0xc6, 0x3f, 0xc8, 0x68, 0xec, 0xcc, 0x45, 0x6f, 0x43, 0x3e, 0x0d, 0x28, 0xb9,
+	0xa2, 0xd1, 0x9d, 0xcd, 0xd9, 0xf1, 0x54, 0x98, 0xbd, 0x07, 0x65, 0xc3, 0x75, 0x7d, 0x4c, 0xcc,
+	0x72, 0x34, 0x65, 0x7a, 0x44, 0x85, 0x9a, 0x1d, 0x76, 0x29, 0xe2, 0xd0, 0x8e, 0xfd, 0x51, 0xfb,
+	0xd6, 0x6f, 0x24, 0x43, 0xbe, 0xba, 0x81, 0x3c, 0x69, 0x41, 0x65, 0x76, 0xe5, 0x39, 0x2b, 0x17,
+	0xaf, 0x89, 0x11, 0xc7, 0x2a, 0x66, 0x1e, 0x45, 0x4e, 0x73, 0x1d, 0x47, 0xa9, 0xce, 0xef, 0x13,
+	0x6d, 0xc8, 0xdf, 0x13, 0x36, 0x60, 0x36, 0xf5, 0x09, 0xd4, 0x62, 0x0c, 0x2c, 0x16, 0xff, 0x16,
+	0x95, 0xdf, 0x06, 0xe5, 0x9a, 0x59, 0xc5, 0x94, 0xfe, 0x5e, 0x80, 0x3a, 0x96, 0x79, 0x6a, 0x5a,
+	0x01, 0xf5, 0x58, 0xa4, 0x39, 0xf7, 0x31, 0xb2, 0x84, 0x91, 0x8f, 0xa1, 0xc2, 0xdb, 0xe2, 0x63,
+	0x68, 0x29, 0xbf, 0x2f, 0x1d, 0xb6, 0x3b, 0xae, 0xce, 0x2e, 0xda, 0xc7, 0xee, 0xb1, 0x53, 0x68,
+	0xe2, 0x37, 0xad, 0x33, 0xa0, 0x32, 0x37, 0xdd, 0x81, 0xdb, 0xa2, 0x43, 0x22, 0x52, 0xe1, 0xe6,
+	0x4c, 0x0b, 0x2a, 0x9b, 0x5a, 0x80, 0x93, 0x1f, 0xb6, 0x20, 0x6c, 0x53, 0x5d, 0xfd, 0xab, 0x10,
+	0x2d, 0x67, 0x0e, 0x6b, 0x6c, 0xb5, 0xeb, 0xd1, 0x85, 0xf9, 0x59, 0xf0, 0xe6, 0x2d, 0xe3, 0xeb,
+	0x27, 0xb3, 0xc4, 0xa8, 0x8f, 0xf4, 0x06, 0x29, 0xc5, 0x24, 0xb1, 0x5a, 0xcb, 0xb8, 0xa4, 0xd6,
+	0xe6, 0x41, 0x22, 0x77, 0xa1, 0x15, 0x6e, 0x1c, 0x6b, 0xf4, 0x02, 0x33, 0xf3, 0xbb, 0x2c, 0x91,
+	0x5d, 0xd8, 0x8a, 0xed, 0x97, 0x14, 0xb7, 0xfc, 0x3f, 0x2e, 0x1a, 0x63, 0xb8, 0x58, 0x59, 0x96,
+	0x60, 0x58, 0xe7, 0x45, 0xfe, 0x86, 0x45, 0x9e, 0x59, 0xce, 0xa5, 0x61, 0x9d, 0x5a, 0xc6, 0x95,
+	0xcf, 0x8a, 0x9c, 0x9b, 0x9e, 0xb8, 0xc4, 0x3d, 0xe8, 0xf8, 0x37, 0x7e, 0x40, 0x97, 0xb8, 0x0f,
+	0xf6, 0xc2, 0xbc, 0xd2, 0x99, 0xab, 0x18, 0xc9, 0x82, 0xe5, 0xcc, 0x0c, 0x4b, 0xf6, 0x84, 0x0a,
+	0x82, 0x34, 0x57, 0x3e, 0xf5, 0x64, 0x47, 0xa8, 0x24, 0xac, 0x2e, 0xdb, 0xa7, 0xb3, 0x95, 0x87,
+	0x1a, 0xc5, 0x92, 0x71, 0x1d, 0x61, 0x4b, 0x7b, 0x27, 0xf0, 0x56, 0x7e, 0xa0, 0x63, 0xab, 0x7c,
+	0x7d, 0xe1, 0x39, 0x4b, 0xfd, 0x43, 0x10, 0xb8, 0x3e, 0x2f, 0xbb, 0xa6, 0x7a, 0x50, 0x1e, 0xd8,
+	0x0b, 0x87, 0x6c, 0x43, 0xc3, 0xfb, 0x18, 0xe8, 0x91, 0x3a, 0x85, 0x0c, 0x77, 0xa0, 0x89, 0x93,
+	0x31, 0xd3, 0x53, 0x9a, 0xc8, 0x42, 0x51, 0x6b, 0x63, 0x63, 0xc8, 0xeb, 0x00, 0x9a, 0x57, 0xbc,
+	0x50, 0x91, 0xbc, 0x9c, 0xd1, 0x47, 0xa9, 0x0b, 0x98, 0x53, 0xd1, 0xae, 0xa9, 0xbd, 0x59, 0x90,
+	0xb9, 0x97, 0x0b, 0x72, 0x46, 0x4a, 0x19, 0x7d, 0x91, 0x10, 0x7f, 0x31, 0xc9, 0xe4, 0x89, 0x4a,
+	0xe4, 0x11, 0x94, 0xe7, 0x46, 0x60, 0x6c, 0xd6, 0x8f, 0x00, 0x1a, 0x1c, 0x55, 0x4c, 0xdb, 0x63,
+	0x50, 0x58, 0xe6, 0x70, 0xde, 0xf2, 0x53, 0x8b, 0x81, 0x0c, 0xc7, 0x0f, 0x17, 0x4e, 0x9e, 0x3c,
+	0xb6, 0xac, 0xa6, 0x3d, 0xa3, 0xba, 0x44, 0x01, 0x6d, 0x2b, 0x3b, 0x30, 0xad, 0xd0, 0xc6, 0x45,
+	0x5c, 0x6d, 0x43, 0xeb, 0x8c, 0x06, 0xac, 0xc1, 0x13, 0xfa, 0xd3, 0x0a, 0x85, 0x43, 0x3d, 0x84,
+	0xad, 0xd8, 0xe2, 0xbb, 0x38, 0x50, 0x94, 0xdc, 0x43, 0xe9, 0xc5, 0xdf, 0xe2, 0x49, 0xb9, 0x9d,
+	0xa8, 0x2a, 0x1a, 0xd5, 0x53, 0xd8, 0x3a, 0x37, 0xfd, 0x00, 0x97, 0xd5, 0x17, 0x10, 0xe4, 0x7f,
+	0x50, 0x5d, 0xf0, 0x2a, 0x42, 0xf6, 0x0d, 0x89, 0x7d, 0x22, 0x02, 0x28, 0x39, 0x73, 0x1a, 0x18,
+	0xa6, 0xc5, 0x9b, 0x57, 0xc3, 0xbc, 0xed, 0x04, 0x47, 0x24, 0x46, 0x41, 0x74, 0x9d, 0x79, 0x84,
+	0xd2, 0x94, 0x51, 0xd4, 0x47, 0xd0, 0x19, 0xd8, 0xbe, 0x4b, 0x67, 0xec, 0x48, 0x94, 0x59, 0x12,
+	0x5f, 0xf5, 0x2b, 0x20, 0x72, 0x80, 0x80, 0xdc, 0x43, 0x49, 0x76, 0xe6, 0xa2, 0x94, 0x34, 0xe2,
+	0x0f, 0xd0, 0x61, 0x0c, 0xf8, 0xce, 0xc7, 0xb5, 0x7c, 0x91, 0xad, 0x25, 0xfb, 0xa2, 0xe6, 0x57,
+	0xf3, 0x1c, 0x88, 0x8c, 0x25, 0x92, 0x3f, 0x84, 0x0a, 0x57, 0xad, 0x08, 0x2b, 0xf3, 0x40, 0xa9,
+	0x8f, 0x61, 0x5b, 0x50, 0xe6, 0xbf, 0xf3, 0xaa, 0xfa, 0x16, 0x76, 0xd2, 0x21, 0x02, 0x3a, 0x7e,
+	0xfa, 0x0a, 0x79, 0x4f, 0x9f, 0xfa, 0x1d, 0x6c, 0x33, 0x3e, 0xd4, 0xe6, 0xe3, 0x13, 0x57, 0xf7,
+	0x7f, 0xa8, 0x84, 0xd5, 0xad, 0x7d, 0x2e, 0x48, 0xb3, 0xa8, 0xbe, 0x80, 0x9d, 0xf4, 0xe1, 0xa4,
+	0x1c, 0xca, 0x2d, 0x6b, 0xe5, 0xf0, 0x40, 0xf5, 0x86, 0x0f, 0xd7, 0xb9, 0x73, 0x15, 0xe7, 0xc3,
+	0x36, 0x61, 0xf7, 0xf5, 0xf8, 0x81, 0x44, 0x81, 0x8c, 0x94, 0x5d, 0xec, 0x10, 0xce, 0xb1, 0x65,
+	0xda, 0x7c, 0x8e, 0x0b, 0x4f, 0x15, 0x76, 0x60, 0xe1, 0x58, 0x96, 0xf3, 0x89, 0xcf, 0x70, 0x2d,
+	0x33, 0xd7, 0x4a, 0xce, 0x5c, 0x73, 0xb1, 0x54, 0xf7, 0xf9, 0x14, 0x87, 0xa9, 0x05, 0xdb, 0x18,
+	0x99, 0x2b, 0xf8, 0x01, 0x85, 0x7a, 0xf2, 0x59, 0xd5, 0xc5, 0xae, 0x5e, 0xf4, 0xcf, 0x34, 0x7d,
+	0xfa, 0x7e, 0xac, 0xe9, 0x6f, 0x87, 0x27, 0xda, 0xe9, 0x60, 0xa8, 0x9d, 0xb4, 0x6f, 0xa1, 0x96,
+	0x6c, 0x49, 0x9e, 0xfe, 0x78, 0x7c, 0xdc, 0x2e, 0xe0, 0x53, 0xd3, 0x91, 0x8c, 0x27, 0xa3, 0xe3,
+	0xd7, 0xda, 0xa4, 0x5d, 0x44, 0x22, 0x2d, 0xc9, 0x3c, 0x3a, 0x1e, 0xb4, 0x4b, 0x07, 0x63, 0xa8,
+	0xc5, 0x5f, 0x17, 0xbb, 0xb0, 0x8d, 0x00, 0xfa, 0x9b, 0x69, 0x7f, 0x9a, 0x4e, 0x82, 0x78, 0x89,
+	0x63, 0xf2, 0x76, 0x38, 0x1c, 0x0c, 0xcf, 0x30, 0xcd, 0x0e, 0xb4, 0x13, 0xb3, 0xf6, 0xe3, 0x60,
+	0x8a, 0xc1, 0xc5, 0x83, 0xbf, 0x0b, 0x50, 0x8b, 0x9f, 0x46, 0x84, 0x1c, 0x8f, 0x4e, 0x72, 0x20,
+	0xf1, 0x6c, 0xe2, 0xd0, 0x2e, 0x5e, 0x4d, 0xde, 0x8f, 0x10, 0x31, 0x15, 0x3e, 0x9e, 0x68, 0xe3,
+	0xfe, 0x84, 0xa5, 0x2a, 0xa2, 0x38, 0x93, 0xac, 0x03, 0x61, 0x4a, 0x8c, 0x59, 0x62, 0x8f, 0x98,
+	0x95, 0x71, 0xda, 0xf6, 0x12, 0x73, 0xff, 0xd5, 0x68, 0x82, 0xd4, 0xa2, 0x63, 0x6d, 0x25, 0x93,
+	0x3c, 0x24, 0x5e, 0x49, 0xe7, 0x38, 0xd1, 0xce, 0xb5, 0x29, 0x03, 0xab, 0xa6, 0x73, 0x9c, 0xf5,
+	0x27, 0xaf, 0xb0, 0x85, 0xed, 0xda, 0xc1, 0x1f, 0x45, 0xa8, 0x27, 0x62, 0x87, 0x37, 0xa4, 0xbd,
+	0xd3, 0x86, 0xd3, 0xf5, 0x1b, 0xba, 0x07, 0xbb, 0x92, 0x87, 0x21, 0xc5, 0xfc, 0x0b, 0xf8, 0xd9,
+	0xf4, 0x30, 0xdf, 0x19, 0xb1, 0xc6, 0xda, 0x7b, 0x70, 0x37, 0x13, 0x83, 0x54, 0xb8, 0xaf, 0x84,
+	0x72, 0x71, 0x27, 0xe3, 0x13, 0xe5, 0x94, 0x71, 0x77, 0xf6, 0x33, 0x2e, 0xc1, 0x5d, 0x3f, 0x1e,
+	0x9d, 0x9f, 0x6b, 0xc7, 0x2c, 0x4a, 0xc9, 0x80, 0x8b, 0xeb, 0x9c, 0x84, 0x0d, 0x49, 0x83, 0x33,
+	0x9f, 0x00, 0xaf, 0xb2, 0x06, 0x4b, 0xae, 0x70, 0xaa, 0x06, 0x17, 0xe3, 0x90, 0x72, 0x8d, 0xdc,
+	0x87, 0xee, 0x9a, 0x7b, 0xa2, 0x5d, 0x8c, 0xde, 0xa1, 0xb7, 0x7e, 0xf4, 0x4b, 0x19, 0xbf, 0xb6,
+	0x56, 0x97, 0x96, 0x39, 0xeb, 0x8f, 0x07, 0xe4, 0x7b, 0xa8, 0x0a, 0x41, 0x27, 0xbb, 0xc9, 0x6b,
+	0x97, 0x12, 0xfd, 0x5e, 0x77, 0xdd, 0x11, 0x6e, 0x8d, 0x7a, 0x8b, 0xf4, 0xa1, 0x16, 0x09, 0x33,
+	0x49, 0xe2, 0x32, 0x9a, 0xdf, 0xdb, 0xcb, 0xf1, 0xc4, 0x10, 0x67, 0x00, 0x89, 0x14, 0x93, 0x9e,
+	0xf4, 0x80, 0x64, 0x04, 0xbc, 0x77, 0x2f, 0xd7, 0x27, 0x03, 0x25, 0xb2, 0x2a, 0x01, 0xad, 0xe9,
+	0xb6, 0x04, 0xb4, 0xae, 0xc3, 0x08, 0x74, 0x01, 0x4d, 0x59, 0x46, 0xc9, 0xfd, 0x6c, 0x5e, 0x59,
+	0x80, 0x7b, 0x0f, 0x36, 0x78, 0x63, 0xb8, 0x11, 0x34, 0x65, 0x85, 0x94, 0xe0, 0x72, 0x54, 0x57,
+	0x82, 0xcb, 0x93, 0x55, 0xf5, 0xd6, 0xd7, 0x05, 0xf2, 0x92, 0x5f, 0x1a, 0xd3, 0xaf, 0xf4, 0xa5,
+	0x49, 0x62, 0x9a, 0xbe, 0x34, 0x59, 0xea, 0x18, 0xc2, 0x65, 0x85, 0xff, 0xab, 0xf9, 0xec, 0xdf,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0xf4, 0x5c, 0xf5, 0x77, 0x0e, 0x00, 0x00,
 }
diff --git a/api/v1alpha/api.proto b/api/v1alpha/api.proto
index 0f1944f37f..d28dda35e3 100644
--- a/api/v1alpha/api.proto
+++ b/api/v1alpha/api.proto
@@ -175,6 +175,12 @@ message Pod {
 
         // Cgroup of the pod, empty if the pod is not running.
         string cgroup = 8;
+
+        // Timestamp when the pod is created, nanoseconds since epoch.
+        int64 created_at = 9;
+
+        // Timestamp when the pod is started, nanoseconds since epoch.
+        int64 started_at = 10;
 }
 
 message KeyValue {
diff --git a/rkt/api_service.go b/rkt/api_service.go
index fbbe5db7ee..72b66285bd 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -323,6 +323,18 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest, error) {
 		return pod, nil, nil
 	}
 
+	createdAt, err := p.getCreationTime()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	startedAt, err := p.getStartTime()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	pod.CreatedAt, pod.StartedAt = createdAt.UnixNano(), startedAt.UnixNano()
+
 	manifest, data, err := getPodManifest(p)
 	if err != nil {
 		return nil, nil, err

From d6f61cac084621aaf7c124a08e70ce76cefbe6b7 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 4 Apr 2016 19:52:31 -0700
Subject: [PATCH 0075/1304] tests: Add tests for testing CreatedAt and
 StartedAt for api service.

---
 tests/rkt_api_service_test.go |  8 ++++++++
 tests/rkt_tests.go            | 28 ++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 40606513eb..d7ce1ef837 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -145,6 +145,14 @@ func checkPod(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, hasAppStat
 	if podInfo.pid != int(p.Pid) {
 		t.Errorf("Expected %d, saw %d", podInfo.pid, p.Pid)
 	}
+	// The time accuracy returned by 'rkt status' stops at milliseconds.
+	accuracy := time.Millisecond.Nanoseconds()
+	if podInfo.createdAt/accuracy != p.CreatedAt/accuracy {
+		t.Errorf("Expected %d, saw %d", podInfo.createdAt, p.CreatedAt)
+	}
+	if podInfo.startedAt/accuracy != p.StartedAt/accuracy {
+		t.Errorf("Expected %d, saw %d", podInfo.startedAt, p.StartedAt)
+	}
 	checkPodState(t, podInfo.state, p.State)
 	checkPodApps(t, podInfo.apps, p.Apps, hasAppState)
 	checkPodNetworks(t, podInfo.networks, p.Networks)
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 4709950969..34c9a91107 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -402,12 +402,14 @@ type networkInfo struct {
 }
 
 type podInfo struct {
-	id       string
-	pid      int
-	state    string
-	apps     map[string]*appInfo
-	networks map[string]*networkInfo
-	manifest []byte
+	id        string
+	pid       int
+	state     string
+	apps      map[string]*appInfo
+	networks  map[string]*networkInfo
+	manifest  []byte
+	createdAt int64
+	startedAt int64
 }
 
 // parsePodInfo parses the 'rkt status $UUID' result into podInfo struct.
@@ -416,6 +418,8 @@ type podInfo struct {
 // networks=default:ip4=172.16.28.103
 // pid=14352
 // exited=false
+// created=2016-04-01 19:12:03.447 -0700 PDT
+// started=2016-04-01 19:12:04.279 -0700 PDT
 func parsePodInfoOutput(t *testing.T, result string, p *podInfo) {
 	lines := strings.Split(strings.TrimSuffix(result, "\n"), "\n")
 	for _, line := range lines {
@@ -455,6 +459,18 @@ func parsePodInfoOutput(t *testing.T, result string, p *podInfo) {
 				t.Fatalf("Cannot parse the pod's pid %q: %v", tuples[1], err)
 			}
 			p.pid = pid
+		case "created":
+			createdAt, err := time.Parse(defaultTimeLayout, tuples[1])
+			if err != nil {
+				t.Fatalf("Cannot parse the pod's creation time %q: %v", tuples[1], err)
+			}
+			p.createdAt = createdAt.UnixNano()
+		case "started":
+			startedAt, err := time.Parse(defaultTimeLayout, tuples[1])
+			if err != nil {
+				t.Fatalf("Cannot parse the pod's start time %q: %v", tuples[1], err)
+			}
+			p.startedAt = startedAt.UnixNano()
 		}
 		if strings.HasPrefix(tuples[0], "app-") {
 			exitCode, err := strconv.Atoi(tuples[1])

From cb0d5e2177ab91ffe75674bb466774d65ad5b2d5 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Mon, 4 Apr 2016 14:35:20 +0200
Subject: [PATCH 0076/1304] manpages: generate manpages with cobra

To update the manpages, use:
    $ make manpages

It will generate the manpages in dist/manpages/.

Also the bash completion file is no longer built manually, but you can
use:
    $ make bash-completion

It will generate dist/bash_completion/rkt.bash.

The release scripts are updated to make sure that each release
contains an up-to-date version of the manpages and the bash completion
file.
---
 CHANGELOG.md                  |   9 +
 dist/bash_completion/rkt.bash | 860 ----------------------------------
 rkt/bash_completion_gen.go    |  32 ++
 rkt/main.go                   |  37 ++
 rkt/manpages_gen.go           |  39 ++
 rkt/rkt.go                    |  22 -
 rkt/rkt.mk                    |   8 +
 scripts/build-rkt.sh          |   9 +-
 8 files changed, 133 insertions(+), 883 deletions(-)
 delete mode 100644 dist/bash_completion/rkt.bash
 create mode 100644 rkt/bash_completion_gen.go
 create mode 100644 rkt/main.go
 create mode 100644 rkt/manpages_gen.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab0a4d4792..2b09ab1b5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## vUNRELEASED
+
+#### Note for packagers
+
+Files generated from sources are no longer checked-in the git repository. Instead, packagers should build them:
+
+- Bash completion file, generated by `make bash-completion`
+- Man pages, generated by `make manpages`
+
 ## v1.3.0
 
 This release includes a number of new features and bugfixes like the long-awaited propagation of apps' exit status.
diff --git a/dist/bash_completion/rkt.bash b/dist/bash_completion/rkt.bash
deleted file mode 100644
index cc114764f6..0000000000
--- a/dist/bash_completion/rkt.bash
+++ /dev/null
@@ -1,860 +0,0 @@
-#!/bin/bash
-
-__debug()
-{
-    if [[ -n ${BASH_COMP_DEBUG_FILE} ]]; then
-        echo "$*" >> "${BASH_COMP_DEBUG_FILE}"
-    fi
-}
-
-# Homebrew on Macs have version 1.3 of bash-completion which doesn't include
-# _init_completion. This is a very minimal version of that function.
-__my_init_completion()
-{
-    COMPREPLY=()
-    _get_comp_words_by_ref cur prev words cword
-}
-
-__index_of_word()
-{
-    local w word=$1
-    shift
-    index=0
-    for w in "$@"; do
-        [[ $w = "$word" ]] && return
-        index=$((index+1))
-    done
-    index=-1
-}
-
-__contains_word()
-{
-    local w word=$1; shift
-    for w in "$@"; do
-        [[ $w = "$word" ]] && return
-    done
-    return 1
-}
-
-__handle_reply()
-{
-    __debug "${FUNCNAME}"
-    case $cur in
-        -*)
-            if [[ $(type -t compopt) = "builtin" ]]; then
-                compopt -o nospace
-            fi
-            local allflags
-            if [ ${#must_have_one_flag[@]} -ne 0 ]; then
-                allflags=("${must_have_one_flag[@]}")
-            else
-                allflags=("${flags[*]} ${two_word_flags[*]}")
-            fi
-            COMPREPLY=( $(compgen -W "${allflags[*]}" -- "$cur") )
-            if [[ $(type -t compopt) = "builtin" ]]; then
-                [[ $COMPREPLY == *= ]] || compopt +o nospace
-            fi
-            return 0;
-            ;;
-    esac
-
-    # check if we are handling a flag with special work handling
-    local index
-    __index_of_word "${prev}" "${flags_with_completion[@]}"
-    if [[ ${index} -ge 0 ]]; then
-        ${flags_completion[${index}]}
-        return
-    fi
-
-    # we are parsing a flag and don't have a special handler, no completion
-    if [[ ${cur} != "${words[cword]}" ]]; then
-        return
-    fi
-
-    local completions
-    if [[ ${#must_have_one_flag[@]} -ne 0 ]]; then
-        completions=("${must_have_one_flag[@]}")
-    elif [[ ${#must_have_one_noun[@]} -ne 0 ]]; then
-        completions=("${must_have_one_noun[@]}")
-    else
-        completions=("${commands[@]}")
-    fi
-    COMPREPLY=( $(compgen -W "${completions[*]}" -- "$cur") )
-
-    if [[ ${#COMPREPLY[@]} -eq 0 ]]; then
-        declare -F __custom_func >/dev/null && __custom_func
-    fi
-}
-
-# The arguments should be in the form "ext1|ext2|extn"
-__handle_filename_extension_flag()
-{
-    local ext="$1"
-    _filedir "@(${ext})"
-}
-
-__handle_subdirs_in_dir_flag()
-{
-    local dir="$1"
-    pushd "${dir}" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1
-}
-
-__handle_flag()
-{
-    __debug "${FUNCNAME}: c is $c words[c] is ${words[c]}"
-
-    # if a command required a flag, and we found it, unset must_have_one_flag()
-    local flagname=${words[c]}
-    # if the word contained an =
-    if [[ ${words[c]} == *"="* ]]; then
-        flagname=${flagname%=*} # strip everything after the =
-        flagname="${flagname}=" # but put the = back
-    fi
-    __debug "${FUNCNAME}: looking for ${flagname}"
-    if __contains_word "${flagname}" "${must_have_one_flag[@]}"; then
-        must_have_one_flag=()
-    fi
-
-    # skip the argument to a two word flag
-    if __contains_word "${words[c]}" "${two_word_flags[@]}"; then
-        c=$((c+1))
-        # if we are looking for a flags value, don't show commands
-        if [[ $c -eq $cword ]]; then
-            commands=()
-        fi
-    fi
-
-    # skip the flag itself
-    c=$((c+1))
-
-}
-
-__handle_noun()
-{
-    __debug "${FUNCNAME}: c is $c words[c] is ${words[c]}"
-
-    if __contains_word "${words[c]}" "${must_have_one_noun[@]}"; then
-        must_have_one_noun=()
-    fi
-
-    nouns+=("${words[c]}")
-    c=$((c+1))
-}
-
-__handle_command()
-{
-    __debug "${FUNCNAME}: c is $c words[c] is ${words[c]}"
-
-    local next_command
-    if [[ -n ${last_command} ]]; then
-        next_command="_${last_command}_${words[c]}"
-    else
-        next_command="_${words[c]}"
-    fi
-    c=$((c+1))
-    __debug "${FUNCNAME}: looking for ${next_command}"
-    declare -F $next_command >/dev/null && $next_command
-}
-
-__handle_word()
-{
-    if [[ $c -ge $cword ]]; then
-        __handle_reply
-        return
-    fi
-    __debug "${FUNCNAME}: c is $c words[c] is ${words[c]}"
-    if [[ "${words[c]}" == -* ]]; then
-        __handle_flag
-    elif __contains_word "${words[c]}" "${commands[@]}"; then
-        __handle_command
-    else
-        __handle_noun
-    fi
-    __handle_word
-}
-
-__rkt_parse_image()
-{
-    local rkt_output
-    if rkt_output=$(rkt image list --no-legend 2>/dev/null); then
-        out=($(echo "${rkt_output}" | awk '{print $1}'))
-        COMPREPLY=( $( compgen -W "${out[*]}" -- "$cur" ) )
-    fi
-}
-
-__rkt_parse_list()
-{
-    local rkt_output
-    if rkt_output=$(rkt list --no-legend 2>/dev/null); then
-        if [[ -n "$1" ]]; then
-            out=($(echo "${rkt_output}" | grep ${1} | awk '{print $1}'))
-        else
-            out=($(echo "${rkt_output}" | awk '{print $1}'))
-        fi
-        COMPREPLY=( $( compgen -W "${out[*]}" -- "$cur" ) )
-    fi
-}
-
-__custom_func() {
-    case ${last_command} in
-        rkt_image_export | \
-        rkt_image_extract | \
-        rkt_image_cat-manifest | \
-        rkt_image_render | \
-        rkt_image_rm | \
-        rkt_run | \
-        rkt_prepare)
-            __rkt_parse_image
-            return
-            ;;
-        rkt_run-prepared)
-            __rkt_parse_list prepared
-            return
-            ;;
-        rkt_enter)
-            __rkt_parse_list running
-            return
-            ;;
-        rkt_rm)
-            __rkt_parse_list "prepare\|exited"
-            return
-            ;;
-        rkt_status)
-            __rkt_parse_list
-            return
-            ;;
-        *)
-            ;;
-    esac
-}
-
-_rkt_api-service()
-{
-    last_command="rkt_api-service"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--listen=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_cat-manifest()
-{
-    last_command="rkt_cat-manifest"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--pretty-print")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_enter()
-{
-    last_command="rkt_enter"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--app=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_fetch()
-{
-    last_command="rkt_fetch"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--no-store")
-    flags+=("--signature=")
-    flags+=("--store-only")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_gc()
-{
-    last_command="rkt_gc"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--expire-prepared=")
-    flags+=("--grace-period=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_image_cat-manifest()
-{
-    last_command="rkt_image_cat-manifest"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--pretty-print")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_image_export()
-{
-    last_command="rkt_image_export"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--overwrite")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_image_extract()
-{
-    last_command="rkt_image_extract"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--overwrite")
-    flags+=("--rootfs-only")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_image_gc()
-{
-    last_command="rkt_image_gc"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--grace-period=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_image_list()
-{
-    last_command="rkt_image_list"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--fields=")
-    flags+=("--full")
-    flags+=("--no-legend")
-    flags+=("--order=")
-    flags+=("--sort=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_image_render()
-{
-    last_command="rkt_image_render"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--overwrite")
-    flags+=("--rootfs-only")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_image_rm()
-{
-    last_command="rkt_image_rm"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_image()
-{
-    last_command="rkt_image"
-    commands=()
-    commands+=("cat-manifest")
-    commands+=("export")
-    commands+=("extract")
-    commands+=("gc")
-    commands+=("list")
-    commands+=("render")
-    commands+=("rm")
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_list()
-{
-    last_command="rkt_list"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--full")
-    flags+=("--no-legend")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_metadata-service()
-{
-    last_command="rkt_metadata-service"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--listen-port=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_prepare()
-{
-    last_command="rkt_prepare"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--exec=")
-    flags+=("--inherit-env")
-    flags+=("--mount=")
-    flags+=("--no-overlay")
-    flags+=("--no-store")
-    flags+=("--pod-manifest=")
-    flags+=("--port=")
-    flags+=("--private-users")
-    flags+=("--quiet")
-    flags+=("--set-env=")
-    flags+=("--stage1-path=")
-    flags+=("--stage1-url=")
-    flags+=("--stage1-name=")
-    flags+=("--stage1-hash=")
-    flags+=("--stage1-from-dir=")
-    flags+=("--store-only")
-    flags+=("--volume=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_rm()
-{
-    last_command="rkt_rm"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--uuid-file=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_run()
-{
-    last_command="rkt_run"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--cpu=")
-    flags+=("--exec=")
-    flags+=("--inherit-env")
-    flags+=("--interactive")
-    flags+=("--mds-register")
-    flags+=("--memory=")
-    flags+=("--mount=")
-    flags+=("--net=")
-    flags+=("--no-overlay")
-    flags+=("--no-store")
-    flags+=("--pod-manifest=")
-    flags+=("--port=")
-    flags+=("--private-users")
-    flags+=("--set-env=")
-    flags+=("--signature=")
-    flags+=("--stage1-path=")
-    flags+=("--stage1-url=")
-    flags+=("--stage1-name=")
-    flags+=("--stage1-hash=")
-    flags+=("--stage1-from-dir=")
-    flags+=("--store-only")
-    flags+=("--uuid-file-save=")
-    flags+=("--volume=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_run-prepared()
-{
-    last_command="rkt_run-prepared"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--interactive")
-    flags+=("--mds-register")
-    flags+=("--net=")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_status()
-{
-    last_command="rkt_status"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--wait")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_trust()
-{
-    last_command="rkt_trust"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--insecure-allow-http")
-    flags+=("--prefix=")
-    flags+=("--root")
-    flags+=("--skip-fingerprint-review")
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt_version()
-{
-    last_command="rkt_version"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-_rkt()
-{
-    last_command="rkt"
-    commands=()
-    commands+=("api-service")
-    commands+=("cat-manifest")
-    commands+=("enter")
-    commands+=("fetch")
-    commands+=("gc")
-    commands+=("image")
-    commands+=("list")
-    commands+=("metadata-service")
-    commands+=("prepare")
-    commands+=("rm")
-    commands+=("run")
-    commands+=("run-prepared")
-    commands+=("status")
-    commands+=("trust")
-    commands+=("version")
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--debug")
-    flags+=("--dir=")
-    flags+=("--insecure-options=")
-    flags+=("--user-config=")
-    flags+=("--local-config=")
-    flags+=("--system-config=")
-    flags+=("--trust-keys-from-https")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
-__start_rkt()
-{
-    local cur prev words cword
-    if declare -F _init_completion >/dev/null 2>&1; then
-        _init_completion -s || return
-    else
-        __my_init_completion || return
-    fi
-
-    local c=0
-    local flags=()
-    local two_word_flags=()
-    local flags_with_completion=()
-    local flags_completion=()
-    local commands=("rkt")
-    local must_have_one_flag=()
-    local must_have_one_noun=()
-    local last_command
-    local nouns=()
-
-    __handle_word
-}
-
-if [[ $(type -t compopt) = "builtin" ]]; then
-    complete -F __start_rkt rkt
-else
-    complete -o nospace -F __start_rkt rkt
-fi
-
-# ex: ts=4 sw=4 et filetype=sh
diff --git a/rkt/bash_completion_gen.go b/rkt/bash_completion_gen.go
new file mode 100644
index 0000000000..cb6a95a6f6
--- /dev/null
+++ b/rkt/bash_completion_gen.go
@@ -0,0 +1,32 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file is not part of the rkt binary. It is only executed manually via
+// the makefile.
+//+build ignore
+
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+func main() {
+	err := cmdRkt.GenBashCompletionFile("dist/bash_completion/rkt.bash")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to generate the bash completion file: %v\n", err)
+		os.Exit(1)
+	}
+}
diff --git a/rkt/main.go b/rkt/main.go
new file mode 100644
index 0000000000..9067e734ab
--- /dev/null
+++ b/rkt/main.go
@@ -0,0 +1,37 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"os"
+
+	"github.com/coreos/rkt/pkg/multicall"
+)
+
+func main() {
+	// check if rkt is executed with a multicall command
+	multicall.MaybeExec()
+
+	cmdRkt.SetUsageFunc(usageFunc)
+
+	// Make help just show the usage
+	cmdRkt.SetHelpTemplate(`{{.UsageString}}`)
+
+	if err := cmdRkt.Execute(); err != nil && cmdExitCode == 0 {
+		// err already printed by cobra on stderr
+		cmdExitCode = 2 // invalid argument
+	}
+	os.Exit(cmdExitCode)
+}
diff --git a/rkt/manpages_gen.go b/rkt/manpages_gen.go
new file mode 100644
index 0000000000..1c79adc876
--- /dev/null
+++ b/rkt/manpages_gen.go
@@ -0,0 +1,39 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file is not part of the rkt binary. It is only executed manually via
+// the makefile.
+//+build ignore
+
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra/doc"
+)
+
+func main() {
+	header := &doc.GenManHeader{
+		Title:   "rkt - App Container runtime",
+		Section: "1",
+	}
+
+	err := doc.GenManTree(cmdRkt, header, "dist/manpages")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to generate the man pages: %v\n", err)
+		os.Exit(1)
+	}
+}
diff --git a/rkt/rkt.go b/rkt/rkt.go
index 367c5f5022..cf87815ca3 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -24,11 +24,9 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/keystore"
 	"github.com/coreos/rkt/pkg/log"
-	"github.com/coreos/rkt/pkg/multicall"
 	"github.com/coreos/rkt/rkt/config"
 	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/spf13/cobra"
-	_ "github.com/spf13/cobra/doc"
 )
 
 const (
@@ -215,26 +213,6 @@ func runMissingCommand(cmd *cobra.Command, args []string) {
 	cmdExitCode = 2 // invalid argument
 }
 
-func main() {
-	// check if rkt is executed with a multicall command
-	multicall.MaybeExec()
-
-	cmdRkt.SetUsageFunc(usageFunc)
-
-	// Make help just show the usage
-	cmdRkt.SetHelpTemplate(`{{.UsageString}}`)
-
-	// // Uncomment to update rkt.bash
-	// stdout.Print("Generating rkt.bash")
-	// cmdRkt.GenBashCompletionFile("dist/bash_completion/rkt.bash")
-	// os.Exit(0)
-
-	if err := cmdRkt.Execute(); err != nil && cmdExitCode == 0 {
-		cmdExitCode = 2 // invalid argument
-	}
-	os.Exit(cmdExitCode)
-}
-
 // where pod directories are created and locked before moving to prepared
 func embryoDir() string {
 	return filepath.Join(getDataDir(), "pods", "embryo")
diff --git a/rkt/rkt.mk b/rkt/rkt.mk
index cde6985c31..be99d972f7 100644
--- a/rkt/rkt.mk
+++ b/rkt/rkt.mk
@@ -29,6 +29,14 @@ $(BGB_BINARY): $(MK_PATH) | $(BINDIR)
 
 include makelib/build_go_bin.mk
 
+manpages: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
+	mkdir -p dist/manpages/
+	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | xargs go run rkt/manpages_gen.go
+
+bash-completion: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
+	mkdir -p dist/bash_completion/
+	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | xargs go run rkt/bash_completion_gen.go
+
 $(call undefine-namespaces,LOCAL)
 # RKT_STAMP deliberately not cleared
 # RKT_BINARY deliberately not cleared
diff --git a/scripts/build-rkt.sh b/scripts/build-rkt.sh
index 53ee7b5806..65db041679 100755
--- a/scripts/build-rkt.sh
+++ b/scripts/build-rkt.sh
@@ -2,4 +2,11 @@
 
 set -e
 
-./autogen.sh && ./configure --enable-tpm=no --with-stage1-default-images-directory=/usr/lib/rkt/stage1-images --with-stage1-default-location=/usr/lib/rkt/stage1-images/stage1-coreos.aci && make -j4
+./autogen.sh
+./configure \
+	--enable-tpm=no \
+	--with-stage1-default-images-directory=/usr/lib/rkt/stage1-images \
+	--with-stage1-default-location=/usr/lib/rkt/stage1-images/stage1-coreos.aci
+make manpages
+make bash-completion
+make -j4

From 3b797b5206b601696b5f5ce1d11df1d3cf74baec Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 5 Apr 2016 15:09:06 +0200
Subject: [PATCH 0077/1304] rkt/image: remove redundant quotes

---
 rkt/image/fetcher.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index 28054d6e78..5a9026a1c6 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -118,7 +118,7 @@ func (f *Fetcher) fetchSingleImage(img string, a *asc, imgType apps.AppImageType
 		imgType = guessImageType(img)
 	}
 	if imgType == apps.AppImageHash {
-		return "", fmt.Errorf("cannot fetch a hash '%q', expected either a URL, a path or an image name", img)
+		return "", fmt.Errorf("cannot fetch a hash %q, expected either a URL, a path or an image name", img)
 	}
 
 	switch imgType {

From f0e8170c994aefa7e2707f5c27b0fedf0e3734f3 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 5 Apr 2016 13:40:53 +0200
Subject: [PATCH 0078/1304] protobuf: generate code using a script

Currently protobuf bindings have to be generated manually, the process
is being documented as a code comment in api/v1alpha/api.proto.

This automates protobuf generation by introducing a script and
also a make target "protobuf".

Fixes #2004
---
 api/v1alpha/README.md |  10 ++
 api/v1alpha/api.pb.go | 260 ++++++++++++++++++++++--------------------
 api/v1alpha/api.proto |   3 -
 rkt/rkt.mk            |   3 +
 scripts/genproto.sh   |  36 ++++++
 5 files changed, 186 insertions(+), 126 deletions(-)
 create mode 100755 scripts/genproto.sh

diff --git a/api/v1alpha/README.md b/api/v1alpha/README.md
index 738ae2e761..f8c292c1f3 100644
--- a/api/v1alpha/README.md
+++ b/api/v1alpha/README.md
@@ -9,3 +9,13 @@ For more information, see:
 - #1359
 - #1468
 - [API Service Subcommand](../../Documentation/subcommands/api-service.md)
+
+## Protobuf
+
+The rkt gRPC API uses Protocol Buffers for its services.
+In order to rebuild the generated code make sure you have protobuf 3.0.0 installed (https://github.com/google/protobuf)
+and execute from the top-level directory:
+
+```
+$ make protobuf
+```
diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index 5ae9fe8ace..b4057e7e4a 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -224,7 +224,7 @@ type Image struct {
 	// Base format of the image, required. This indicates the original format
 	// for the image as nowadays all the image formats will be transformed to
 	// ACI.
-	BaseFormat *ImageFormat `protobuf:"bytes,1,opt,name=base_format" json:"base_format,omitempty"`
+	BaseFormat *ImageFormat `protobuf:"bytes,1,opt,name=base_format,json=baseFormat" json:"base_format,omitempty"`
 	// ID of the image, a string that can be used to uniquely identify the image,
 	// e.g. sha512 hash of the ACIs, required.
 	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
@@ -233,7 +233,7 @@ type Image struct {
 	// Version of the image, e.g. 'latest', '2.0.10', optional.
 	Version string `protobuf:"bytes,4,opt,name=version" json:"version,omitempty"`
 	// Timestamp of when the image is imported, it is the seconds since epoch, optional.
-	ImportTimestamp int64 `protobuf:"varint,5,opt,name=import_timestamp" json:"import_timestamp,omitempty"`
+	ImportTimestamp int64 `protobuf:"varint,5,opt,name=import_timestamp,json=importTimestamp" json:"import_timestamp,omitempty"`
 	// JSON-encoded byte array that represents the image manifest, optional.
 	Manifest []byte `protobuf:"bytes,6,opt,name=manifest,proto3" json:"manifest,omitempty"`
 	// Size is the size in bytes of this image in the store.
@@ -287,7 +287,7 @@ type App struct {
 	State AppState `protobuf:"varint,3,opt,name=state,enum=v1alpha.AppState" json:"state,omitempty"`
 	// Exit code of the app. optional, only valid if it's returned by InspectPod() and
 	// the app has already exited.
-	ExitCode int32 `protobuf:"zigzag32,4,opt,name=exit_code" json:"exit_code,omitempty"`
+	ExitCode int32 `protobuf:"zigzag32,4,opt,name=exit_code,json=exitCode" json:"exit_code,omitempty"`
 	// Annotations for this app.
 	Annotations []*KeyValue `protobuf:"bytes,5,rep,name=annotations" json:"annotations,omitempty"`
 }
@@ -340,10 +340,6 @@ type Pod struct {
 	Annotations []*KeyValue `protobuf:"bytes,7,rep,name=annotations" json:"annotations,omitempty"`
 	// Cgroup of the pod, empty if the pod is not running.
 	Cgroup string `protobuf:"bytes,8,opt,name=cgroup" json:"cgroup,omitempty"`
-	// Timestamp when the pod is created, nanoseconds since epoch.
-	CreatedAt int64 `protobuf:"varint,9,opt,name=created_at" json:"created_at,omitempty"`
-	// Timestamp when the pod is started, nanoseconds since epoch.
-	StartedAt int64 `protobuf:"varint,10,opt,name=started_at" json:"started_at,omitempty"`
 }
 
 func (m *Pod) Reset()                    { *m = Pod{} }
@@ -374,7 +370,7 @@ func (m *Pod) GetAnnotations() []*KeyValue {
 
 type KeyValue struct {
 	// Key part of the key-value pair.
-	Key string `protobuf:"bytes,1,opt,name=Key" json:"Key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=Key,json=key" json:"Key,omitempty"`
 	// Value part of the key-value pair.
 	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
 }
@@ -392,11 +388,11 @@ type PodFilter struct {
 	// If not empty, the pods that have any of the states will be returned.
 	States []PodState `protobuf:"varint,2,rep,name=states,enum=v1alpha.PodState" json:"states,omitempty"`
 	// If not empty, the pods that all of the apps will be returned.
-	AppNames []string `protobuf:"bytes,3,rep,name=app_names" json:"app_names,omitempty"`
+	AppNames []string `protobuf:"bytes,3,rep,name=app_names,json=appNames" json:"app_names,omitempty"`
 	// If not empty, the pods that have all of the images(in the apps) will be returned
-	ImageIds []string `protobuf:"bytes,4,rep,name=image_ids" json:"image_ids,omitempty"`
+	ImageIds []string `protobuf:"bytes,4,rep,name=image_ids,json=imageIds" json:"image_ids,omitempty"`
 	// If not empty, the pods that are in all of the networks will be returned.
-	NetworkNames []string `protobuf:"bytes,5,rep,name=network_names" json:"network_names,omitempty"`
+	NetworkNames []string `protobuf:"bytes,5,rep,name=network_names,json=networkNames" json:"network_names,omitempty"`
 	// If not empty, the pods that have all of the annotations will be returned.
 	Annotations []*KeyValue `protobuf:"bytes,6,rep,name=annotations" json:"annotations,omitempty"`
 	// If not empty, the pods whose cgroup are listed will be returned.
@@ -425,20 +421,20 @@ type ImageFilter struct {
 	// If not empty, the images that have any of the base names will be returned.
 	// For example, both 'coreos.com/etcd' and 'k8s.io/etcd' will be returned if 'etcd' is included,
 	// however 'k8s.io/etcd-backup' will not be returned.
-	BaseNames []string `protobuf:"bytes,3,rep,name=base_names" json:"base_names,omitempty"`
+	BaseNames []string `protobuf:"bytes,3,rep,name=base_names,json=baseNames" json:"base_names,omitempty"`
 	// If not empty, the images that have any of the keywords in the name will be returned.
 	// For example, both 'kubernetes-etcd', 'etcd:latest' will be returned if 'etcd' is included,
 	Keywords []string `protobuf:"bytes,4,rep,name=keywords" json:"keywords,omitempty"`
 	// If not empty, the images that have all of the labels will be returned.
 	Labels []*KeyValue `protobuf:"bytes,5,rep,name=labels" json:"labels,omitempty"`
 	// If set, the images that are imported after this timestamp will be returned.
-	ImportedAfter int64 `protobuf:"varint,6,opt,name=imported_after" json:"imported_after,omitempty"`
+	ImportedAfter int64 `protobuf:"varint,6,opt,name=imported_after,json=importedAfter" json:"imported_after,omitempty"`
 	// If set, the images that are imported before this timestamp will be returned.
-	ImportedBefore int64 `protobuf:"varint,7,opt,name=imported_before" json:"imported_before,omitempty"`
+	ImportedBefore int64 `protobuf:"varint,7,opt,name=imported_before,json=importedBefore" json:"imported_before,omitempty"`
 	// If not empty, the images that have all of the annotations will be returned.
 	Annotations []*KeyValue `protobuf:"bytes,8,rep,name=annotations" json:"annotations,omitempty"`
 	// If not empty, the images that have any of the exact full names will be returned.
-	FullNames []string `protobuf:"bytes,9,rep,name=full_names" json:"full_names,omitempty"`
+	FullNames []string `protobuf:"bytes,9,rep,name=full_names,json=fullNames" json:"full_names,omitempty"`
 }
 
 func (m *ImageFilter) Reset()                    { *m = ImageFilter{} }
@@ -465,15 +461,15 @@ type GlobalFlags struct {
 	// Data directory.
 	Dir string `protobuf:"bytes,1,opt,name=dir" json:"dir,omitempty"`
 	// System configuration directory.
-	SystemConfigDir string `protobuf:"bytes,2,opt,name=system_config_dir" json:"system_config_dir,omitempty"`
+	SystemConfigDir string `protobuf:"bytes,2,opt,name=system_config_dir,json=systemConfigDir" json:"system_config_dir,omitempty"`
 	// Local configuration directory.
-	LocalConfigDir string `protobuf:"bytes,3,opt,name=local_config_dir" json:"local_config_dir,omitempty"`
+	LocalConfigDir string `protobuf:"bytes,3,opt,name=local_config_dir,json=localConfigDir" json:"local_config_dir,omitempty"`
 	// User configuration directory.
-	UserConfigDir string `protobuf:"bytes,4,opt,name=user_config_dir" json:"user_config_dir,omitempty"`
+	UserConfigDir string `protobuf:"bytes,4,opt,name=user_config_dir,json=userConfigDir" json:"user_config_dir,omitempty"`
 	// Insecure flags configurates what security features to disable.
-	InsecureFlags string `protobuf:"bytes,5,opt,name=insecure_flags" json:"insecure_flags,omitempty"`
+	InsecureFlags string `protobuf:"bytes,5,opt,name=insecure_flags,json=insecureFlags" json:"insecure_flags,omitempty"`
 	// Whether to automatically trust gpg keys fetched from https
-	TrustKeysFromHttps bool `protobuf:"varint,6,opt,name=trust_keys_from_https" json:"trust_keys_from_https,omitempty"`
+	TrustKeysFromHttps bool `protobuf:"varint,6,opt,name=trust_keys_from_https,json=trustKeysFromHttps" json:"trust_keys_from_https,omitempty"`
 }
 
 func (m *GlobalFlags) Reset()                    { *m = GlobalFlags{} }
@@ -484,13 +480,13 @@ func (*GlobalFlags) Descriptor() ([]byte, []int) { return fileDescriptor0, []int
 // Info describes the information of rkt on the machine.
 type Info struct {
 	// Version of rkt, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
-	RktVersion string `protobuf:"bytes,1,opt,name=rkt_version" json:"rkt_version,omitempty"`
+	RktVersion string `protobuf:"bytes,1,opt,name=rkt_version,json=rktVersion" json:"rkt_version,omitempty"`
 	// Version of appc, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
-	AppcVersion string `protobuf:"bytes,2,opt,name=appc_version" json:"appc_version,omitempty"`
+	AppcVersion string `protobuf:"bytes,2,opt,name=appc_version,json=appcVersion" json:"appc_version,omitempty"`
 	// Latest version of the api that's supported by the service, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
-	ApiVersion string `protobuf:"bytes,3,opt,name=api_version" json:"api_version,omitempty"`
+	ApiVersion string `protobuf:"bytes,3,opt,name=api_version,json=apiVersion" json:"api_version,omitempty"`
 	// The global flags that passed to the rkt api service when it's launched.
-	GlobalFlags *GlobalFlags `protobuf:"bytes,4,opt,name=global_flags" json:"global_flags,omitempty"`
+	GlobalFlags *GlobalFlags `protobuf:"bytes,4,opt,name=global_flags,json=globalFlags" json:"global_flags,omitempty"`
 }
 
 func (m *Info) Reset()                    { *m = Info{} }
@@ -548,10 +544,10 @@ type EventFilter struct {
 	// If set, then only returns the events after this timestamp.
 	// If the server starts after since_time, then only the events happened after the start of the server will be returned.
 	// If since_time is a future timestamp, then no events will be returned until that time.
-	SinceTime int64 `protobuf:"varint,4,opt,name=since_time" json:"since_time,omitempty"`
+	SinceTime int64 `protobuf:"varint,4,opt,name=since_time,json=sinceTime" json:"since_time,omitempty"`
 	// If set, then only returns the events before this timestamp.
 	// If it is a future timestamp, then the event stream will be closed at that moment.
-	UntilTime int64 `protobuf:"varint,5,opt,name=until_time" json:"until_time,omitempty"`
+	UntilTime int64 `protobuf:"varint,5,opt,name=until_time,json=untilTime" json:"until_time,omitempty"`
 }
 
 func (m *EventFilter) Reset()                    { *m = EventFilter{} }
@@ -748,11 +744,11 @@ func (m *ListenEventsResponse) GetEvents() []*Event {
 // Request for GetLogs().
 type GetLogsRequest struct {
 	// ID of the pod which we will get logs from, required.
-	PodId string `protobuf:"bytes,1,opt,name=pod_id" json:"pod_id,omitempty"`
+	PodId string `protobuf:"bytes,1,opt,name=pod_id,json=podId" json:"pod_id,omitempty"`
 	// Name of the app within the pod which we will get logs
 	// from, optional. If not set, then the logs of all the
 	// apps within the pod will be returned.
-	AppName string `protobuf:"bytes,2,opt,name=app_name" json:"app_name,omitempty"`
+	AppName string `protobuf:"bytes,2,opt,name=app_name,json=appName" json:"app_name,omitempty"`
 	// Number of most recent lines to return, optional.
 	Lines int32 `protobuf:"varint,3,opt,name=lines" json:"lines,omitempty"`
 	// If true, then a response stream will not be closed,
@@ -760,10 +756,10 @@ type GetLogsRequest struct {
 	Follow bool `protobuf:"varint,4,opt,name=follow" json:"follow,omitempty"`
 	// If set, then only the logs after the timestamp will
 	// be returned, optional.
-	SinceTime int64 `protobuf:"varint,5,opt,name=since_time" json:"since_time,omitempty"`
+	SinceTime int64 `protobuf:"varint,5,opt,name=since_time,json=sinceTime" json:"since_time,omitempty"`
 	// If set, then only the logs before the timestamp will
 	// be returned, optional.
-	UntilTime int64 `protobuf:"varint,6,opt,name=until_time" json:"until_time,omitempty"`
+	UntilTime int64 `protobuf:"varint,6,opt,name=until_time,json=untilTime" json:"until_time,omitempty"`
 }
 
 func (m *GetLogsRequest) Reset()                    { *m = GetLogsRequest{} }
@@ -819,6 +815,10 @@ func init() {
 var _ context.Context
 var _ grpc.ClientConn
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion1
+
 // Client API for PublicAPI service
 
 type PublicAPIClient interface {
@@ -1132,97 +1132,111 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1469 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0x4b, 0x72, 0xdb, 0x46,
-	0x13, 0x36, 0x1f, 0xe0, 0xa3, 0x49, 0x53, 0xe4, 0x48, 0xb6, 0x28, 0xfa, 0x25, 0xe3, 0xff, 0xe3,
-	0x72, 0xb4, 0x50, 0x12, 0xd9, 0xf1, 0x26, 0x55, 0x29, 0xd3, 0x12, 0xa4, 0x62, 0x2c, 0x91, 0x2c,
-	0x9a, 0x76, 0xc5, 0x2b, 0x14, 0x44, 0x0e, 0x65, 0x94, 0x41, 0x00, 0x01, 0x40, 0xd9, 0xca, 0x32,
-	0x17, 0xc8, 0x11, 0x72, 0x86, 0xac, 0xb2, 0xcc, 0x5d, 0x52, 0x95, 0x0b, 0xe4, 0x04, 0xe9, 0x19,
-	0x0c, 0x80, 0x01, 0x08, 0x2e, 0xb2, 0x13, 0xbb, 0x7b, 0xbe, 0xfe, 0xba, 0xa7, 0xfb, 0x1b, 0x08,
-	0xea, 0x86, 0x6b, 0x1e, 0xba, 0x9e, 0x13, 0x38, 0xa4, 0x7a, 0xfd, 0x8d, 0x61, 0xb9, 0x1f, 0x0c,
-	0xf5, 0x25, 0x34, 0x06, 0x4b, 0xe3, 0x8a, 0x9e, 0x3a, 0xde, 0xd2, 0x08, 0xc8, 0x3e, 0x94, 0x83,
-	0x1b, 0x97, 0x76, 0x0b, 0xfb, 0x85, 0xa7, 0xad, 0x23, 0x72, 0x28, 0xc2, 0x0e, 0x79, 0xcc, 0x14,
-	0x3d, 0x64, 0x0b, 0xaa, 0xd7, 0xd4, 0xf3, 0x4d, 0xc7, 0xee, 0x16, 0x31, 0xa8, 0xae, 0xfe, 0x59,
-	0x00, 0x85, 0xbb, 0xc9, 0x97, 0xd0, 0xb8, 0x34, 0x7c, 0xaa, 0x2f, 0x38, 0x16, 0xc7, 0x68, 0x1c,
-	0xed, 0xa4, 0x31, 0x44, 0x1e, 0x80, 0xa2, 0x39, 0x0f, 0x01, 0x48, 0x13, 0xca, 0xb6, 0xb1, 0xa4,
-	0xdd, 0x12, 0xff, 0x25, 0xe1, 0x97, 0xb9, 0xa1, 0x0b, 0x6d, 0x73, 0xe9, 0x3a, 0x5e, 0xa0, 0x07,
-	0xe6, 0x92, 0xfa, 0x81, 0xb1, 0x74, 0xbb, 0x0a, 0x7a, 0x4a, 0xa4, 0x0d, 0xb5, 0xa5, 0x61, 0x9b,
-	0x0b, 0x34, 0x76, 0x2b, 0x68, 0x69, 0x32, 0x28, 0xdf, 0xfc, 0x99, 0x76, 0xab, 0xdc, 0xff, 0x04,
-	0x1a, 0x86, 0x6d, 0x3b, 0x81, 0x11, 0x20, 0x9a, 0xdf, 0xad, 0xed, 0x97, 0x90, 0x4f, 0x27, 0xe6,
-	0xf3, 0x9a, 0xde, 0xbc, 0x33, 0xac, 0x15, 0x55, 0x9f, 0x41, 0x75, 0x48, 0x83, 0x4f, 0x8e, 0xf7,
-	0x31, 0xe6, 0x52, 0x88, 0x98, 0x99, 0xee, 0xf5, 0xf3, 0x84, 0x27, 0xfe, 0x7a, 0x11, 0xf2, 0x54,
-	0x7f, 0x2d, 0x40, 0xa9, 0xef, 0xba, 0x99, 0x13, 0x0f, 0x40, 0x31, 0x59, 0x99, 0xfc, 0x48, 0xe3,
-	0xa8, 0x95, 0x2e, 0x1e, 0xdb, 0xab, 0x60, 0x01, 0x41, 0x58, 0x6b, 0x4b, 0xe2, 0x82, 0x48, 0x6f,
-	0x98, 0x83, 0x74, 0xa0, 0x4e, 0x3f, 0x9b, 0x81, 0x3e, 0x73, 0xe6, 0x94, 0x37, 0xa0, 0x93, 0x2d,
-	0x43, 0xd9, 0x54, 0xc6, 0x3f, 0xc8, 0x68, 0xec, 0xcc, 0x45, 0x6f, 0x43, 0x3e, 0x0d, 0x28, 0xb9,
-	0xa2, 0xd1, 0x9d, 0xcd, 0xd9, 0xf1, 0x54, 0x98, 0xbd, 0x07, 0x65, 0xc3, 0x75, 0x7d, 0x4c, 0xcc,
-	0x72, 0x34, 0x65, 0x7a, 0x44, 0x85, 0x9a, 0x1d, 0x76, 0x29, 0xe2, 0xd0, 0x8e, 0xfd, 0x51, 0xfb,
-	0xd6, 0x6f, 0x24, 0x43, 0xbe, 0xba, 0x81, 0x3c, 0x69, 0x41, 0x65, 0x76, 0xe5, 0x39, 0x2b, 0x17,
-	0xaf, 0x89, 0x11, 0xc7, 0x2a, 0x66, 0x1e, 0x45, 0x4e, 0x73, 0x1d, 0x47, 0xa9, 0xce, 0xef, 0x13,
-	0x6d, 0xc8, 0xdf, 0x13, 0x36, 0x60, 0x36, 0xf5, 0x09, 0xd4, 0x62, 0x0c, 0x2c, 0x16, 0xff, 0x16,
-	0x95, 0xdf, 0x06, 0xe5, 0x9a, 0x59, 0xc5, 0x94, 0xfe, 0x5e, 0x80, 0x3a, 0x96, 0x79, 0x6a, 0x5a,
-	0x01, 0xf5, 0x58, 0xa4, 0x39, 0xf7, 0x31, 0xb2, 0x84, 0x91, 0x8f, 0xa1, 0xc2, 0xdb, 0xe2, 0x63,
-	0x68, 0x29, 0xbf, 0x2f, 0x1d, 0xb6, 0x3b, 0xae, 0xce, 0x2e, 0xda, 0xc7, 0xee, 0xb1, 0x53, 0x68,
-	0xe2, 0x37, 0xad, 0x33, 0xa0, 0x32, 0x37, 0xdd, 0x81, 0xdb, 0xa2, 0x43, 0x22, 0x52, 0xe1, 0xe6,
-	0x4c, 0x0b, 0x2a, 0x9b, 0x5a, 0x80, 0x93, 0x1f, 0xb6, 0x20, 0x6c, 0x53, 0x5d, 0xfd, 0xab, 0x10,
-	0x2d, 0x67, 0x0e, 0x6b, 0x6c, 0xb5, 0xeb, 0xd1, 0x85, 0xf9, 0x59, 0xf0, 0xe6, 0x2d, 0xe3, 0xeb,
-	0x27, 0xb3, 0xc4, 0xa8, 0x8f, 0xf4, 0x06, 0x29, 0xc5, 0x24, 0xb1, 0x5a, 0xcb, 0xb8, 0xa4, 0xd6,
-	0xe6, 0x41, 0x22, 0x77, 0xa1, 0x15, 0x6e, 0x1c, 0x6b, 0xf4, 0x02, 0x33, 0xf3, 0xbb, 0x2c, 0x91,
-	0x5d, 0xd8, 0x8a, 0xed, 0x97, 0x14, 0xb7, 0xfc, 0x3f, 0x2e, 0x1a, 0x63, 0xb8, 0x58, 0x59, 0x96,
-	0x60, 0x58, 0xe7, 0x45, 0xfe, 0x86, 0x45, 0x9e, 0x59, 0xce, 0xa5, 0x61, 0x9d, 0x5a, 0xc6, 0x95,
-	0xcf, 0x8a, 0x9c, 0x9b, 0x9e, 0xb8, 0xc4, 0x3d, 0xe8, 0xf8, 0x37, 0x7e, 0x40, 0x97, 0xb8, 0x0f,
-	0xf6, 0xc2, 0xbc, 0xd2, 0x99, 0xab, 0x18, 0xc9, 0x82, 0xe5, 0xcc, 0x0c, 0x4b, 0xf6, 0x84, 0x0a,
-	0x82, 0x34, 0x57, 0x3e, 0xf5, 0x64, 0x47, 0xa8, 0x24, 0xac, 0x2e, 0xdb, 0xa7, 0xb3, 0x95, 0x87,
-	0x1a, 0xc5, 0x92, 0x71, 0x1d, 0x61, 0x4b, 0x7b, 0x27, 0xf0, 0x56, 0x7e, 0xa0, 0x63, 0xab, 0x7c,
-	0x7d, 0xe1, 0x39, 0x4b, 0xfd, 0x43, 0x10, 0xb8, 0x3e, 0x2f, 0xbb, 0xa6, 0x7a, 0x50, 0x1e, 0xd8,
-	0x0b, 0x87, 0x6c, 0x43, 0xc3, 0xfb, 0x18, 0xe8, 0x91, 0x3a, 0x85, 0x0c, 0x77, 0xa0, 0x89, 0x93,
-	0x31, 0xd3, 0x53, 0x9a, 0xc8, 0x42, 0x51, 0x6b, 0x63, 0x63, 0xc8, 0xeb, 0x00, 0x9a, 0x57, 0xbc,
-	0x50, 0x91, 0xbc, 0x9c, 0xd1, 0x47, 0xa9, 0x0b, 0x98, 0x53, 0xd1, 0xae, 0xa9, 0xbd, 0x59, 0x90,
-	0xb9, 0x97, 0x0b, 0x72, 0x46, 0x4a, 0x19, 0x7d, 0x91, 0x10, 0x7f, 0x31, 0xc9, 0xe4, 0x89, 0x4a,
-	0xe4, 0x11, 0x94, 0xe7, 0x46, 0x60, 0x6c, 0xd6, 0x8f, 0x00, 0x1a, 0x1c, 0x55, 0x4c, 0xdb, 0x63,
-	0x50, 0x58, 0xe6, 0x70, 0xde, 0xf2, 0x53, 0x8b, 0x81, 0x0c, 0xc7, 0x0f, 0x17, 0x4e, 0x9e, 0x3c,
-	0xb6, 0xac, 0xa6, 0x3d, 0xa3, 0xba, 0x44, 0x01, 0x6d, 0x2b, 0x3b, 0x30, 0xad, 0xd0, 0xc6, 0x45,
-	0x5c, 0x6d, 0x43, 0xeb, 0x8c, 0x06, 0xac, 0xc1, 0x13, 0xfa, 0xd3, 0x0a, 0x85, 0x43, 0x3d, 0x84,
-	0xad, 0xd8, 0xe2, 0xbb, 0x38, 0x50, 0x94, 0xdc, 0x43, 0xe9, 0xc5, 0xdf, 0xe2, 0x49, 0xb9, 0x9d,
-	0xa8, 0x2a, 0x1a, 0xd5, 0x53, 0xd8, 0x3a, 0x37, 0xfd, 0x00, 0x97, 0xd5, 0x17, 0x10, 0xe4, 0x7f,
-	0x50, 0x5d, 0xf0, 0x2a, 0x42, 0xf6, 0x0d, 0x89, 0x7d, 0x22, 0x02, 0x28, 0x39, 0x73, 0x1a, 0x18,
-	0xa6, 0xc5, 0x9b, 0x57, 0xc3, 0xbc, 0xed, 0x04, 0x47, 0x24, 0x46, 0x41, 0x74, 0x9d, 0x79, 0x84,
-	0xd2, 0x94, 0x51, 0xd4, 0x47, 0xd0, 0x19, 0xd8, 0xbe, 0x4b, 0x67, 0xec, 0x48, 0x94, 0x59, 0x12,
-	0x5f, 0xf5, 0x2b, 0x20, 0x72, 0x80, 0x80, 0xdc, 0x43, 0x49, 0x76, 0xe6, 0xa2, 0x94, 0x34, 0xe2,
-	0x0f, 0xd0, 0x61, 0x0c, 0xf8, 0xce, 0xc7, 0xb5, 0x7c, 0x91, 0xad, 0x25, 0xfb, 0xa2, 0xe6, 0x57,
-	0xf3, 0x1c, 0x88, 0x8c, 0x25, 0x92, 0x3f, 0x84, 0x0a, 0x57, 0xad, 0x08, 0x2b, 0xf3, 0x40, 0xa9,
-	0x8f, 0x61, 0x5b, 0x50, 0xe6, 0xbf, 0xf3, 0xaa, 0xfa, 0x16, 0x76, 0xd2, 0x21, 0x02, 0x3a, 0x7e,
-	0xfa, 0x0a, 0x79, 0x4f, 0x9f, 0xfa, 0x1d, 0x6c, 0x33, 0x3e, 0xd4, 0xe6, 0xe3, 0x13, 0x57, 0xf7,
-	0x7f, 0xa8, 0x84, 0xd5, 0xad, 0x7d, 0x2e, 0x48, 0xb3, 0xa8, 0xbe, 0x80, 0x9d, 0xf4, 0xe1, 0xa4,
-	0x1c, 0xca, 0x2d, 0x6b, 0xe5, 0xf0, 0x40, 0xf5, 0x86, 0x0f, 0xd7, 0xb9, 0x73, 0x15, 0xe7, 0xc3,
-	0x36, 0x61, 0xf7, 0xf5, 0xf8, 0x81, 0x44, 0x81, 0x8c, 0x94, 0x5d, 0xec, 0x10, 0xce, 0xb1, 0x65,
-	0xda, 0x7c, 0x8e, 0x0b, 0x4f, 0x15, 0x76, 0x60, 0xe1, 0x58, 0x96, 0xf3, 0x89, 0xcf, 0x70, 0x2d,
-	0x33, 0xd7, 0x4a, 0xce, 0x5c, 0x73, 0xb1, 0x54, 0xf7, 0xf9, 0x14, 0x87, 0xa9, 0x05, 0xdb, 0x18,
-	0x99, 0x2b, 0xf8, 0x01, 0x85, 0x7a, 0xf2, 0x59, 0xd5, 0xc5, 0xae, 0x5e, 0xf4, 0xcf, 0x34, 0x7d,
-	0xfa, 0x7e, 0xac, 0xe9, 0x6f, 0x87, 0x27, 0xda, 0xe9, 0x60, 0xa8, 0x9d, 0xb4, 0x6f, 0xa1, 0x96,
-	0x6c, 0x49, 0x9e, 0xfe, 0x78, 0x7c, 0xdc, 0x2e, 0xe0, 0x53, 0xd3, 0x91, 0x8c, 0x27, 0xa3, 0xe3,
-	0xd7, 0xda, 0xa4, 0x5d, 0x44, 0x22, 0x2d, 0xc9, 0x3c, 0x3a, 0x1e, 0xb4, 0x4b, 0x07, 0x63, 0xa8,
-	0xc5, 0x5f, 0x17, 0xbb, 0xb0, 0x8d, 0x00, 0xfa, 0x9b, 0x69, 0x7f, 0x9a, 0x4e, 0x82, 0x78, 0x89,
-	0x63, 0xf2, 0x76, 0x38, 0x1c, 0x0c, 0xcf, 0x30, 0xcd, 0x0e, 0xb4, 0x13, 0xb3, 0xf6, 0xe3, 0x60,
-	0x8a, 0xc1, 0xc5, 0x83, 0xbf, 0x0b, 0x50, 0x8b, 0x9f, 0x46, 0x84, 0x1c, 0x8f, 0x4e, 0x72, 0x20,
-	0xf1, 0x6c, 0xe2, 0xd0, 0x2e, 0x5e, 0x4d, 0xde, 0x8f, 0x10, 0x31, 0x15, 0x3e, 0x9e, 0x68, 0xe3,
-	0xfe, 0x84, 0xa5, 0x2a, 0xa2, 0x38, 0x93, 0xac, 0x03, 0x61, 0x4a, 0x8c, 0x59, 0x62, 0x8f, 0x98,
-	0x95, 0x71, 0xda, 0xf6, 0x12, 0x73, 0xff, 0xd5, 0x68, 0x82, 0xd4, 0xa2, 0x63, 0x6d, 0x25, 0x93,
-	0x3c, 0x24, 0x5e, 0x49, 0xe7, 0x38, 0xd1, 0xce, 0xb5, 0x29, 0x03, 0xab, 0xa6, 0x73, 0x9c, 0xf5,
-	0x27, 0xaf, 0xb0, 0x85, 0xed, 0xda, 0xc1, 0x1f, 0x45, 0xa8, 0x27, 0x62, 0x87, 0x37, 0xa4, 0xbd,
-	0xd3, 0x86, 0xd3, 0xf5, 0x1b, 0xba, 0x07, 0xbb, 0x92, 0x87, 0x21, 0xc5, 0xfc, 0x0b, 0xf8, 0xd9,
-	0xf4, 0x30, 0xdf, 0x19, 0xb1, 0xc6, 0xda, 0x7b, 0x70, 0x37, 0x13, 0x83, 0x54, 0xb8, 0xaf, 0x84,
-	0x72, 0x71, 0x27, 0xe3, 0x13, 0xe5, 0x94, 0x71, 0x77, 0xf6, 0x33, 0x2e, 0xc1, 0x5d, 0x3f, 0x1e,
-	0x9d, 0x9f, 0x6b, 0xc7, 0x2c, 0x4a, 0xc9, 0x80, 0x8b, 0xeb, 0x9c, 0x84, 0x0d, 0x49, 0x83, 0x33,
-	0x9f, 0x00, 0xaf, 0xb2, 0x06, 0x4b, 0xae, 0x70, 0xaa, 0x06, 0x17, 0xe3, 0x90, 0x72, 0x8d, 0xdc,
-	0x87, 0xee, 0x9a, 0x7b, 0xa2, 0x5d, 0x8c, 0xde, 0xa1, 0xb7, 0x7e, 0xf4, 0x4b, 0x19, 0xbf, 0xb6,
-	0x56, 0x97, 0x96, 0x39, 0xeb, 0x8f, 0x07, 0xe4, 0x7b, 0xa8, 0x0a, 0x41, 0x27, 0xbb, 0xc9, 0x6b,
-	0x97, 0x12, 0xfd, 0x5e, 0x77, 0xdd, 0x11, 0x6e, 0x8d, 0x7a, 0x8b, 0xf4, 0xa1, 0x16, 0x09, 0x33,
-	0x49, 0xe2, 0x32, 0x9a, 0xdf, 0xdb, 0xcb, 0xf1, 0xc4, 0x10, 0x67, 0x00, 0x89, 0x14, 0x93, 0x9e,
-	0xf4, 0x80, 0x64, 0x04, 0xbc, 0x77, 0x2f, 0xd7, 0x27, 0x03, 0x25, 0xb2, 0x2a, 0x01, 0xad, 0xe9,
-	0xb6, 0x04, 0xb4, 0xae, 0xc3, 0x08, 0x74, 0x01, 0x4d, 0x59, 0x46, 0xc9, 0xfd, 0x6c, 0x5e, 0x59,
-	0x80, 0x7b, 0x0f, 0x36, 0x78, 0x63, 0xb8, 0x11, 0x34, 0x65, 0x85, 0x94, 0xe0, 0x72, 0x54, 0x57,
-	0x82, 0xcb, 0x93, 0x55, 0xf5, 0xd6, 0xd7, 0x05, 0xf2, 0x92, 0x5f, 0x1a, 0xd3, 0xaf, 0xf4, 0xa5,
-	0x49, 0x62, 0x9a, 0xbe, 0x34, 0x59, 0xea, 0x18, 0xc2, 0x65, 0x85, 0xff, 0xab, 0xf9, 0xec, 0xdf,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0xf4, 0x5c, 0xf5, 0x77, 0x0e, 0x00, 0x00,
+	// 1692 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x58, 0xcd, 0x6f, 0xdb, 0xc8,
+	0x15, 0x0f, 0xf5, 0xad, 0x27, 0x59, 0x96, 0xc7, 0x4e, 0xa2, 0x38, 0x1f, 0x75, 0x99, 0x26, 0x71,
+	0x8d, 0xc2, 0x68, 0x9c, 0xb4, 0xbd, 0x04, 0x41, 0x65, 0x99, 0x76, 0x85, 0xd8, 0x92, 0xc0, 0x28,
+	0x6e, 0x83, 0x1e, 0x08, 0x5a, 0x1a, 0x39, 0x44, 0x28, 0x91, 0x15, 0x29, 0x27, 0xee, 0xb1, 0xb7,
+	0x02, 0x45, 0xff, 0x83, 0xde, 0x7a, 0xde, 0xeb, 0x02, 0x7b, 0xdf, 0x3f, 0x65, 0xff, 0x85, 0xdd,
+	0xeb, 0xbe, 0xf9, 0x20, 0x39, 0xa4, 0x65, 0xc3, 0xd8, 0xdb, 0xcc, 0xfb, 0xbd, 0xf9, 0xcd, 0xfb,
+	0x98, 0xf7, 0x1e, 0x25, 0xa8, 0xda, 0xbe, 0xb3, 0xeb, 0xcf, 0xbd, 0xd0, 0x23, 0xe5, 0x8b, 0x97,
+	0xb6, 0xeb, 0x7f, 0xb2, 0xf5, 0x3e, 0xd4, 0xba, 0x53, 0xfb, 0x9c, 0x1e, 0x7a, 0xf3, 0xa9, 0x1d,
+	0x92, 0xe7, 0x50, 0x08, 0x2f, 0x7d, 0xda, 0xd2, 0xb6, 0xb4, 0xed, 0xc6, 0x1e, 0xd9, 0x95, 0x6a,
+	0xbb, 0x5c, 0x67, 0x88, 0x88, 0xc9, 0x71, 0xd2, 0x82, 0xf2, 0x05, 0x9d, 0x07, 0x8e, 0x37, 0x6b,
+	0xe5, 0x50, 0xb5, 0x6a, 0x46, 0x5b, 0xfd, 0x3f, 0x39, 0x28, 0x72, 0x6d, 0xf2, 0x07, 0xa8, 0x9d,
+	0xd9, 0x01, 0xb5, 0x26, 0x9c, 0x9a, 0x53, 0xd6, 0xf6, 0x36, 0xd2, 0x94, 0xe2, 0x5a, 0x13, 0x98,
+	0xa2, 0x34, 0xa1, 0x01, 0x39, 0x67, 0x2c, 0x59, 0x71, 0x45, 0x08, 0x14, 0x66, 0xf6, 0x94, 0xb6,
+	0xf2, 0x5c, 0xc2, 0xd7, 0xea, 0xf5, 0x85, 0xd4, 0xf5, 0xe4, 0xb7, 0xd0, 0x74, 0xa6, 0xbe, 0x37,
+	0x0f, 0xad, 0xd0, 0x99, 0xd2, 0x20, 0xb4, 0xa7, 0x7e, 0xab, 0x88, 0x2a, 0x79, 0x73, 0x55, 0xc8,
+	0x87, 0x91, 0x98, 0x6c, 0x42, 0x65, 0x6a, 0xcf, 0x9c, 0x09, 0x6e, 0x5b, 0x25, 0x54, 0xa9, 0x9b,
+	0xf1, 0x9e, 0x5d, 0x1a, 0x38, 0xff, 0xa4, 0xad, 0x32, 0x3f, 0xca, 0xd7, 0xe4, 0x15, 0xd4, 0xec,
+	0xd9, 0xcc, 0x0b, 0xed, 0x10, 0x2f, 0x0a, 0x5a, 0x95, 0xad, 0x3c, 0xfa, 0xb3, 0x16, 0xfb, 0xf3,
+	0x8e, 0x5e, 0x9e, 0xda, 0xee, 0x82, 0x9a, 0xaa, 0x96, 0x6e, 0x40, 0xb9, 0x47, 0xc3, 0x2f, 0xde,
+	0xfc, 0x73, 0xec, 0x88, 0xa6, 0x38, 0x82, 0x32, 0xc7, 0xbf, 0x78, 0x2d, 0xdd, 0xe5, 0x6b, 0x29,
+	0xfb, 0x63, 0xe4, 0x30, 0x5b, 0xeb, 0xdf, 0x69, 0x90, 0x6f, 0xfb, 0xfe, 0x52, 0x8e, 0xdf, 0x40,
+	0xd1, 0x61, 0xb1, 0xe4, 0x24, 0xb5, 0xbd, 0x46, 0x3a, 0xc2, 0xa6, 0x00, 0xc9, 0x0b, 0x28, 0xa2,
+	0xdb, 0xa1, 0x88, 0x63, 0x43, 0xb1, 0x1b, 0x69, 0xdf, 0x33, 0xc0, 0x14, 0x38, 0x79, 0x08, 0x55,
+	0xfa, 0xd5, 0x09, 0xad, 0x91, 0x37, 0xa6, 0x3c, 0xba, 0x6b, 0x66, 0x85, 0x09, 0x3a, 0xb8, 0xcf,
+	0xc6, 0xa0, 0x78, 0xab, 0x18, 0xfc, 0x3b, 0x07, 0xf9, 0x81, 0x37, 0x96, 0x99, 0xd5, 0xe2, 0xcc,
+	0x36, 0x21, 0xef, 0xcb, 0x54, 0xaf, 0x99, 0x6c, 0x79, 0xbd, 0x91, 0x78, 0x3c, 0x65, 0xe4, 0x16,
+	0x14, 0x6c, 0xdf, 0x0f, 0xd0, 0x3e, 0x66, 0x40, 0x5d, 0x75, 0xc6, 0xe4, 0x08, 0xf9, 0x1d, 0x54,
+	0x66, 0x22, 0xf0, 0x91, 0x99, 0xcd, 0x58, 0x4b, 0x66, 0xc4, 0x8c, 0x35, 0x6e, 0x7c, 0x0b, 0x19,
+	0x9f, 0xcb, 0xb7, 0xf1, 0x99, 0xdc, 0x83, 0xd2, 0xe8, 0x7c, 0xee, 0x2d, 0x7c, 0x7c, 0x27, 0xcc,
+	0x5f, 0xb9, 0xd3, 0xf7, 0xa0, 0x12, 0x1d, 0x60, 0xfe, 0xe3, 0x5a, 0x06, 0x24, 0xff, 0x99, 0x5e,
+	0x92, 0x0d, 0x28, 0x5e, 0x30, 0x48, 0xbe, 0x07, 0xb1, 0xd1, 0x7f, 0xd4, 0xa0, 0x8a, 0x01, 0x38,
+	0x74, 0xdc, 0x90, 0xce, 0xd9, 0x29, 0x67, 0x1c, 0xe0, 0xa9, 0x3c, 0x3b, 0x85, 0x4b, 0x7c, 0xf3,
+	0x25, 0x1e, 0x95, 0x00, 0x8f, 0xe5, 0x97, 0x87, 0x4d, 0x2a, 0xb0, 0xe4, 0x62, 0x74, 0x2c, 0xf6,
+	0x6e, 0x02, 0x0c, 0x32, 0xa3, 0xa8, 0xa0, 0xa0, 0xc7, 0xf6, 0x0c, 0xe4, 0x6f, 0xc5, 0x62, 0xfc,
+	0x05, 0x01, 0x72, 0x41, 0x17, 0x2f, 0x79, 0x0a, 0x2b, 0x32, 0x5a, 0xf2, 0x74, 0x91, 0x2b, 0xd4,
+	0xa5, 0x50, 0x30, 0x64, 0x42, 0x55, 0xba, 0x55, 0xa8, 0xb0, 0x98, 0x45, 0x70, 0x44, 0x6c, 0xb1,
+	0x98, 0xe5, 0x56, 0xff, 0x3e, 0x17, 0x75, 0xa7, 0xeb, 0x5c, 0xc7, 0xbc, 0xf9, 0x73, 0x3a, 0x71,
+	0xbe, 0x4a, 0xe7, 0xd1, 0xe2, 0x68, 0x4f, 0x1e, 0x03, 0x6f, 0x2b, 0x29, 0x67, 0xab, 0x4c, 0x22,
+	0x6c, 0xc5, 0xa3, 0x18, 0x72, 0xb4, 0x3d, 0x71, 0x36, 0xda, 0xb3, 0x88, 0xba, 0xf6, 0x19, 0x75,
+	0x6f, 0x78, 0xe1, 0x52, 0x81, 0x3c, 0x83, 0x86, 0x68, 0x2c, 0x74, 0x6c, 0xd9, 0x13, 0xb4, 0x92,
+	0xbf, 0x9f, 0xbc, 0xb9, 0x12, 0x49, 0xdb, 0x4c, 0x88, 0x2f, 0x7b, 0x35, 0x56, 0x3b, 0xa3, 0xd8,
+	0x12, 0xa3, 0xde, 0x12, 0x9f, 0xde, 0xe7, 0xd2, 0x5f, 0xd4, 0x65, 0x98, 0xab, 0x93, 0x85, 0xeb,
+	0x4a, 0x57, 0xab, 0xc2, 0x55, 0x26, 0xe1, 0xae, 0xea, 0x3f, 0x69, 0x50, 0x3b, 0x72, 0xbd, 0x33,
+	0xdb, 0x3d, 0x74, 0xed, 0xf3, 0x80, 0xc5, 0x71, 0xec, 0xcc, 0xa3, 0x87, 0x87, 0x4b, 0xb2, 0x03,
+	0x6b, 0xc1, 0x65, 0x10, 0xd2, 0x29, 0x96, 0xfd, 0x6c, 0xe2, 0x9c, 0x5b, 0x0c, 0x17, 0x8f, 0x70,
+	0x55, 0x00, 0x1d, 0x2e, 0x3f, 0x40, 0xdd, 0x6d, 0x68, 0xba, 0xde, 0xc8, 0x76, 0x55, 0x55, 0xd1,
+	0xab, 0x1a, 0x5c, 0x9e, 0x68, 0x3e, 0x87, 0xd5, 0x45, 0x40, 0xe7, 0xaa, 0xa2, 0x68, 0xd7, 0x2b,
+	0x4c, 0x9c, 0xe8, 0xb1, 0x18, 0xce, 0x02, 0x3a, 0x5a, 0xcc, 0x71, 0x5a, 0x30, 0x0b, 0x79, 0xcb,
+	0x46, 0xb5, 0x48, 0x2a, 0xcc, 0x7e, 0x09, 0x77, 0xc3, 0xf9, 0x22, 0x08, 0x2d, 0xcc, 0x53, 0x60,
+	0x4d, 0xe6, 0xde, 0xd4, 0xfa, 0x14, 0x86, 0x7e, 0xc0, 0x23, 0x5e, 0x31, 0x09, 0x07, 0x31, 0x40,
+	0xc1, 0x21, 0x42, 0x7f, 0x61, 0x88, 0xfe, 0x7f, 0x0d, 0x0a, 0xdd, 0xd9, 0xc4, 0x23, 0xbf, 0x82,
+	0xda, 0xfc, 0x73, 0x68, 0x45, 0x53, 0x43, 0xb8, 0x0e, 0x28, 0x3a, 0x95, 0x83, 0xe3, 0xd7, 0x50,
+	0xc7, 0x42, 0x18, 0x59, 0xe9, 0xb1, 0x56, 0x63, 0xb2, 0x48, 0x05, 0x39, 0x70, 0x82, 0xc6, 0x1a,
+	0xc2, 0x67, 0x40, 0x51, 0xa4, 0xf0, 0x27, 0xa8, 0x9f, 0xf3, 0x30, 0x4b, 0x2f, 0x0a, 0x99, 0x91,
+	0xa7, 0xe4, 0xc0, 0xac, 0x9d, 0x27, 0x1b, 0xfd, 0xbf, 0x1a, 0x14, 0x8d, 0x0b, 0x3a, 0xbb, 0x7e,
+	0x00, 0x73, 0x54, 0x19, 0xc0, 0x4b, 0xa6, 0x24, 0x0b, 0x48, 0x34, 0x34, 0xd8, 0x9a, 0xc9, 0xd8,
+	0x10, 0xe4, 0x66, 0xe0, 0x10, 0x63, 0x6b, 0x0c, 0x75, 0x61, 0x6c, 0x87, 0xf6, 0xf5, 0xef, 0x9a,
+	0xc3, 0xfa, 0xff, 0xf0, 0xc5, 0xf0, 0x2b, 0x65, 0xe5, 0x6d, 0x43, 0x91, 0x5d, 0x2b, 0x6a, 0x6f,
+	0xb9, 0x5d, 0x42, 0x21, 0xaa, 0xd1, 0x5c, 0x52, 0xa3, 0xd8, 0xd4, 0xd4, 0x12, 0x14, 0x1b, 0xf6,
+	0x64, 0x03, 0x67, 0x36, 0xa2, 0x96, 0x62, 0x62, 0x95, 0x4b, 0xd8, 0x84, 0x66, 0xf0, 0x62, 0x16,
+	0x3a, 0xae, 0x80, 0xc5, 0x04, 0xaf, 0x72, 0x09, 0x83, 0xf5, 0x26, 0x34, 0x8e, 0x68, 0xc8, 0x32,
+	0x6b, 0xd2, 0x7f, 0x2c, 0xb0, 0x4b, 0xeb, 0xaf, 0x61, 0x35, 0x96, 0x04, 0x3e, 0x16, 0x05, 0xc5,
+	0x94, 0x16, 0x1c, 0xdc, 0xcb, 0x2f, 0x8f, 0x95, 0x64, 0x2e, 0x32, 0x25, 0x0e, 0xe9, 0x7f, 0x85,
+	0xd5, 0x63, 0x27, 0x08, 0xb1, 0x4f, 0x06, 0x92, 0x08, 0x07, 0x47, 0x79, 0xc2, 0x9d, 0x16, 0xce,
+	0xd6, 0x14, 0x67, 0xe3, 0x26, 0x6c, 0x46, 0x2a, 0xac, 0xcf, 0x8f, 0x69, 0x68, 0x3b, 0x2e, 0xcf,
+	0x45, 0xc5, 0x94, 0x3b, 0x34, 0xa7, 0x99, 0x10, 0x4b, 0x7b, 0x70, 0x68, 0xf9, 0xde, 0x38, 0xa2,
+	0xad, 0xab, 0xb4, 0x26, 0x47, 0xf4, 0xa7, 0xb0, 0xd6, 0x9d, 0x05, 0x3e, 0x1d, 0xb1, 0x83, 0x91,
+	0x41, 0x99, 0xb1, 0x89, 0xd4, 0x44, 0x55, 0x92, 0xe4, 0x4f, 0x70, 0x98, 0x7a, 0x63, 0xe9, 0x6b,
+	0x9a, 0x9b, 0x01, 0xfa, 0xdf, 0x61, 0x8d, 0x19, 0xc4, 0xdb, 0x69, 0xec, 0xeb, 0x6e, 0xd6, 0xd7,
+	0xec, 0xe7, 0xd9, 0x2d, 0xbd, 0x7d, 0x03, 0x44, 0x25, 0x97, 0x26, 0x3d, 0x87, 0x12, 0x1f, 0x1f,
+	0x11, 0x79, 0xf6, 0xcb, 0x44, 0xa2, 0xfa, 0x33, 0x58, 0x97, 0x0e, 0x09, 0xf9, 0x35, 0x7e, 0xbf,
+	0x81, 0x8d, 0xb4, 0x9a, 0xbc, 0x26, 0xfe, 0xfe, 0xd1, 0x6e, 0xf8, 0xfe, 0xd1, 0x3b, 0xb0, 0xce,
+	0x4c, 0xa4, 0x33, 0xfe, 0x62, 0x95, 0x6c, 0x97, 0x84, 0x73, 0x57, 0xbe, 0x4f, 0x95, 0xe7, 0x6f,
+	0x4a, 0x1d, 0xfd, 0x2d, 0x6c, 0xa4, 0x49, 0x12, 0x4f, 0x29, 0x97, 0x5c, 0xf1, 0x94, 0x2b, 0x9a,
+	0x12, 0xd5, 0xbf, 0xd1, 0xf8, 0xbb, 0x3d, 0xf6, 0xce, 0x63, 0x03, 0xee, 0x42, 0x09, 0xd3, 0x63,
+	0xc5, 0x9e, 0x16, 0x71, 0xd7, 0x1d, 0x93, 0x07, 0x50, 0x89, 0x06, 0x75, 0xf4, 0x85, 0x2d, 0xe7,
+	0x34, 0xab, 0x27, 0xd7, 0x99, 0xf1, 0x7a, 0xd2, 0xb6, 0x8b, 0xa6, 0xd8, 0xb0, 0xd4, 0x4c, 0x3c,
+	0xd7, 0xf5, 0xbe, 0xf0, 0x5a, 0xc2, 0xd4, 0x88, 0x5d, 0xa6, 0xce, 0x8a, 0x37, 0xd7, 0x59, 0x29,
+	0x5b, 0x67, 0x2f, 0x78, 0x55, 0x09, 0x7b, 0xa5, 0xaf, 0xf1, 0xf5, 0x62, 0x0c, 0x8b, 0xcd, 0x0e,
+	0x85, 0x6a, 0xfc, 0x1b, 0x01, 0x27, 0xfa, 0x46, 0xf7, 0xa4, 0x7d, 0x64, 0x58, 0xc3, 0x8f, 0x03,
+	0xc3, 0xfa, 0xd0, 0x3b, 0x30, 0x0e, 0xbb, 0x3d, 0xe3, 0xa0, 0x79, 0x87, 0xac, 0xc3, 0xaa, 0x82,
+	0xb4, 0x07, 0x83, 0x4e, 0x53, 0xc3, 0x10, 0xac, 0x29, 0xc2, 0x83, 0x7e, 0xe7, 0x9d, 0x61, 0x36,
+	0x73, 0xd8, 0xbe, 0x1a, 0x8a, 0xb8, 0xdf, 0xe9, 0x36, 0xf3, 0x3b, 0x03, 0xa8, 0x44, 0xdf, 0xab,
+	0xe4, 0x3e, 0xac, 0x23, 0x81, 0xf5, 0x7e, 0xd8, 0x1e, 0xa6, 0x2f, 0x41, 0xbe, 0x04, 0x30, 0x3f,
+	0xf4, 0x7a, 0xdd, 0xde, 0x11, 0x5e, 0xb3, 0x01, 0xcd, 0x44, 0x6c, 0xfc, 0xad, 0x3b, 0x44, 0xe5,
+	0xdc, 0xce, 0x0f, 0x1a, 0x54, 0xa2, 0xcf, 0x24, 0x46, 0x39, 0xe8, 0x1f, 0x2c, 0xa1, 0xc4, 0xb3,
+	0x09, 0x60, 0x9c, 0xec, 0x9b, 0x1f, 0xfb, 0xc8, 0x98, 0x52, 0x1f, 0x98, 0xc6, 0xa0, 0x6d, 0xb2,
+	0xab, 0x72, 0x98, 0x0c, 0x92, 0x05, 0x90, 0x26, 0xcf, 0x2c, 0x4b, 0xe4, 0x91, 0x65, 0x05, 0x4c,
+	0xc2, 0x83, 0x44, 0xdc, 0xde, 0xef, 0x9b, 0x68, 0x5a, 0x74, 0xac, 0x59, 0xcc, 0x5c, 0x2e, 0x0c,
+	0x2f, 0xa5, 0xef, 0x38, 0x30, 0x8e, 0x8d, 0x21, 0x23, 0x2b, 0xa7, 0xef, 0x38, 0x6a, 0x9b, 0xfb,
+	0x18, 0xc2, 0x66, 0x65, 0xe7, 0xdb, 0x1c, 0x54, 0xe3, 0x66, 0xcd, 0x32, 0x64, 0x9c, 0x1a, 0xbd,
+	0xe1, 0xd5, 0x0c, 0x3d, 0x84, 0xfb, 0x0a, 0xc2, 0x98, 0x62, 0xfb, 0x35, 0xa2, 0xc3, 0x93, 0xe5,
+	0x60, 0x64, 0x35, 0xfa, 0xbe, 0x09, 0xf7, 0x32, 0x3a, 0x68, 0x0a, 0xc7, 0xf2, 0xf8, 0xaa, 0xef,
+	0x66, 0x30, 0xe9, 0x4e, 0x01, 0xab, 0x78, 0x2b, 0x03, 0x49, 0xdb, 0xad, 0x4e, 0xff, 0xf8, 0xd8,
+	0xe8, 0x30, 0xad, 0x62, 0x86, 0x5c, 0xa6, 0xd3, 0x14, 0x01, 0x49, 0x93, 0x33, 0x4c, 0x92, 0x97,
+	0x59, 0x80, 0x15, 0x48, 0xbc, 0xaa, 0xee, 0xc9, 0x40, 0x98, 0x5c, 0x21, 0x8f, 0xa0, 0x75, 0x05,
+	0x36, 0x8d, 0x93, 0xfe, 0x29, 0xa2, 0xd5, 0xbd, 0x7f, 0x15, 0xf0, 0xf3, 0x7b, 0x71, 0xe6, 0x3a,
+	0xa3, 0xf6, 0xa0, 0x4b, 0xde, 0x42, 0x59, 0xce, 0x19, 0x72, 0x3f, 0x19, 0xec, 0xa9, 0x59, 0xb4,
+	0xd9, 0xba, 0x0a, 0x88, 0xe2, 0xd1, 0xef, 0x90, 0x36, 0x54, 0xa2, 0xc1, 0x40, 0x12, 0xbd, 0xcc,
+	0x10, 0xda, 0x7c, 0xb0, 0x04, 0x89, 0x29, 0x8e, 0x00, 0x92, 0x01, 0x40, 0x36, 0x95, 0xb9, 0x96,
+	0x19, 0x1d, 0x9b, 0x0f, 0x97, 0x62, 0x2a, 0x51, 0xd2, 0xb6, 0x15, 0xa2, 0x2b, 0x83, 0x42, 0x21,
+	0xba, 0xda, 0xe7, 0x91, 0xe8, 0x04, 0xea, 0x6a, 0x6b, 0x26, 0x8f, 0xb2, 0xf7, 0xaa, 0x8d, 0x7d,
+	0xf3, 0xf1, 0x35, 0x68, 0x4c, 0xd7, 0x87, 0xba, 0xda, 0x66, 0x15, 0xba, 0x25, 0x2d, 0x5c, 0xa1,
+	0x5b, 0xd6, 0x9b, 0xf5, 0x3b, 0xbf, 0xd7, 0xc8, 0x9f, 0x79, 0xd2, 0x58, 0x1b, 0x4b, 0x27, 0x4d,
+	0x69, 0xc4, 0xe9, 0xa4, 0xa9, 0x1d, 0x8f, 0x31, 0x9c, 0x95, 0xf8, 0xff, 0x26, 0xaf, 0x7e, 0x0e,
+	0x00, 0x00, 0xff, 0xff, 0xef, 0x2c, 0x8a, 0x46, 0x44, 0x11, 0x00, 0x00,
 }
diff --git a/api/v1alpha/api.proto b/api/v1alpha/api.proto
index d28dda35e3..fc7174bf6c 100644
--- a/api/v1alpha/api.proto
+++ b/api/v1alpha/api.proto
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// To compile, run 'protoc -I api/v1alpha api/v1alpha/api.proto --go_out=plugins=grpc:api/v1alpha' in rkt root directory.
-// The protoc version must be 3.0.0.
-
 // *************************************************** //
 // ************ WARNING - HERE BE DRAGONS ************ //
 //                                                     //
diff --git a/rkt/rkt.mk b/rkt/rkt.mk
index be99d972f7..bbcb67b839 100644
--- a/rkt/rkt.mk
+++ b/rkt/rkt.mk
@@ -37,6 +37,9 @@ bash-completion: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/bash_completion/
 	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | xargs go run rkt/bash_completion_gen.go
 
+protobuf:
+	scripts/genproto.sh
+
 $(call undefine-namespaces,LOCAL)
 # RKT_STAMP deliberately not cleared
 # RKT_BINARY deliberately not cleared
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
new file mode 100755
index 0000000000..4d351350b5
--- /dev/null
+++ b/scripts/genproto.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+#
+# Generate rkt protobuf bindings.
+# Run from repository root.
+#
+set -e
+
+if ! [[ "$0" =~ "scripts/genproto.sh" ]]; then
+	echo "must be run from repository root"
+	exit 255
+fi
+
+if ! [[ $(protoc --version) =~ "3.0.0" ]]; then
+	echo "could not find protoc 3.0.0, is it installed + in PATH?"
+	exit 255
+fi
+
+export GOPATH=$(mktemp -d)
+export PATH=${GOPATH}/bin:${PATH}
+
+trap 'rm -rf "${GOPATH}"' EXIT
+
+# git (sha) version of golang/protobuf
+GO_PROTOBUF_SHA="dda510ac0fd43b39770f22ac6260eb91d377bce3"
+
+echo "installing golang/protobuf using GOPATH=${GOPATH}"
+go get -u github.com/golang/protobuf/{proto,protoc-gen-go}
+
+echo "resetting golang/protobuf to version ${GO_PROTOBUF_SHA}"
+pushd ${GOPATH}/src/github.com/golang/protobuf
+	git reset --hard "${GO_PROTOBUF_SHA}"
+	make install
+popd
+
+API_DIR="api/v1alpha"
+protoc -I "${API_DIR}" "${API_DIR}"/*.proto --go_out=plugins=grpc:"${API_DIR}"

From 05f7817ffdf396b311dbbec84ea77dbd2351ee0c Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 5 Apr 2016 17:25:41 +0200
Subject: [PATCH 0079/1304] downgrade protobuf to the same version as in godeps

---
 api/v1alpha/api.pb.go | 56 ++++++++++++++++++++-----------------------
 scripts/genproto.sh   |  2 +-
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index b4057e7e4a..fed327f715 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -224,7 +224,7 @@ type Image struct {
 	// Base format of the image, required. This indicates the original format
 	// for the image as nowadays all the image formats will be transformed to
 	// ACI.
-	BaseFormat *ImageFormat `protobuf:"bytes,1,opt,name=base_format,json=baseFormat" json:"base_format,omitempty"`
+	BaseFormat *ImageFormat `protobuf:"bytes,1,opt,name=base_format" json:"base_format,omitempty"`
 	// ID of the image, a string that can be used to uniquely identify the image,
 	// e.g. sha512 hash of the ACIs, required.
 	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
@@ -233,7 +233,7 @@ type Image struct {
 	// Version of the image, e.g. 'latest', '2.0.10', optional.
 	Version string `protobuf:"bytes,4,opt,name=version" json:"version,omitempty"`
 	// Timestamp of when the image is imported, it is the seconds since epoch, optional.
-	ImportTimestamp int64 `protobuf:"varint,5,opt,name=import_timestamp,json=importTimestamp" json:"import_timestamp,omitempty"`
+	ImportTimestamp int64 `protobuf:"varint,5,opt,name=import_timestamp" json:"import_timestamp,omitempty"`
 	// JSON-encoded byte array that represents the image manifest, optional.
 	Manifest []byte `protobuf:"bytes,6,opt,name=manifest,proto3" json:"manifest,omitempty"`
 	// Size is the size in bytes of this image in the store.
@@ -287,7 +287,7 @@ type App struct {
 	State AppState `protobuf:"varint,3,opt,name=state,enum=v1alpha.AppState" json:"state,omitempty"`
 	// Exit code of the app. optional, only valid if it's returned by InspectPod() and
 	// the app has already exited.
-	ExitCode int32 `protobuf:"zigzag32,4,opt,name=exit_code,json=exitCode" json:"exit_code,omitempty"`
+	ExitCode int32 `protobuf:"zigzag32,4,opt,name=exit_code" json:"exit_code,omitempty"`
 	// Annotations for this app.
 	Annotations []*KeyValue `protobuf:"bytes,5,rep,name=annotations" json:"annotations,omitempty"`
 }
@@ -370,7 +370,7 @@ func (m *Pod) GetAnnotations() []*KeyValue {
 
 type KeyValue struct {
 	// Key part of the key-value pair.
-	Key string `protobuf:"bytes,1,opt,name=Key,json=key" json:"Key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=Key" json:"Key,omitempty"`
 	// Value part of the key-value pair.
 	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
 }
@@ -388,11 +388,11 @@ type PodFilter struct {
 	// If not empty, the pods that have any of the states will be returned.
 	States []PodState `protobuf:"varint,2,rep,name=states,enum=v1alpha.PodState" json:"states,omitempty"`
 	// If not empty, the pods that all of the apps will be returned.
-	AppNames []string `protobuf:"bytes,3,rep,name=app_names,json=appNames" json:"app_names,omitempty"`
+	AppNames []string `protobuf:"bytes,3,rep,name=app_names" json:"app_names,omitempty"`
 	// If not empty, the pods that have all of the images(in the apps) will be returned
-	ImageIds []string `protobuf:"bytes,4,rep,name=image_ids,json=imageIds" json:"image_ids,omitempty"`
+	ImageIds []string `protobuf:"bytes,4,rep,name=image_ids" json:"image_ids,omitempty"`
 	// If not empty, the pods that are in all of the networks will be returned.
-	NetworkNames []string `protobuf:"bytes,5,rep,name=network_names,json=networkNames" json:"network_names,omitempty"`
+	NetworkNames []string `protobuf:"bytes,5,rep,name=network_names" json:"network_names,omitempty"`
 	// If not empty, the pods that have all of the annotations will be returned.
 	Annotations []*KeyValue `protobuf:"bytes,6,rep,name=annotations" json:"annotations,omitempty"`
 	// If not empty, the pods whose cgroup are listed will be returned.
@@ -421,20 +421,20 @@ type ImageFilter struct {
 	// If not empty, the images that have any of the base names will be returned.
 	// For example, both 'coreos.com/etcd' and 'k8s.io/etcd' will be returned if 'etcd' is included,
 	// however 'k8s.io/etcd-backup' will not be returned.
-	BaseNames []string `protobuf:"bytes,3,rep,name=base_names,json=baseNames" json:"base_names,omitempty"`
+	BaseNames []string `protobuf:"bytes,3,rep,name=base_names" json:"base_names,omitempty"`
 	// If not empty, the images that have any of the keywords in the name will be returned.
 	// For example, both 'kubernetes-etcd', 'etcd:latest' will be returned if 'etcd' is included,
 	Keywords []string `protobuf:"bytes,4,rep,name=keywords" json:"keywords,omitempty"`
 	// If not empty, the images that have all of the labels will be returned.
 	Labels []*KeyValue `protobuf:"bytes,5,rep,name=labels" json:"labels,omitempty"`
 	// If set, the images that are imported after this timestamp will be returned.
-	ImportedAfter int64 `protobuf:"varint,6,opt,name=imported_after,json=importedAfter" json:"imported_after,omitempty"`
+	ImportedAfter int64 `protobuf:"varint,6,opt,name=imported_after" json:"imported_after,omitempty"`
 	// If set, the images that are imported before this timestamp will be returned.
-	ImportedBefore int64 `protobuf:"varint,7,opt,name=imported_before,json=importedBefore" json:"imported_before,omitempty"`
+	ImportedBefore int64 `protobuf:"varint,7,opt,name=imported_before" json:"imported_before,omitempty"`
 	// If not empty, the images that have all of the annotations will be returned.
 	Annotations []*KeyValue `protobuf:"bytes,8,rep,name=annotations" json:"annotations,omitempty"`
 	// If not empty, the images that have any of the exact full names will be returned.
-	FullNames []string `protobuf:"bytes,9,rep,name=full_names,json=fullNames" json:"full_names,omitempty"`
+	FullNames []string `protobuf:"bytes,9,rep,name=full_names" json:"full_names,omitempty"`
 }
 
 func (m *ImageFilter) Reset()                    { *m = ImageFilter{} }
@@ -461,15 +461,15 @@ type GlobalFlags struct {
 	// Data directory.
 	Dir string `protobuf:"bytes,1,opt,name=dir" json:"dir,omitempty"`
 	// System configuration directory.
-	SystemConfigDir string `protobuf:"bytes,2,opt,name=system_config_dir,json=systemConfigDir" json:"system_config_dir,omitempty"`
+	SystemConfigDir string `protobuf:"bytes,2,opt,name=system_config_dir" json:"system_config_dir,omitempty"`
 	// Local configuration directory.
-	LocalConfigDir string `protobuf:"bytes,3,opt,name=local_config_dir,json=localConfigDir" json:"local_config_dir,omitempty"`
+	LocalConfigDir string `protobuf:"bytes,3,opt,name=local_config_dir" json:"local_config_dir,omitempty"`
 	// User configuration directory.
-	UserConfigDir string `protobuf:"bytes,4,opt,name=user_config_dir,json=userConfigDir" json:"user_config_dir,omitempty"`
+	UserConfigDir string `protobuf:"bytes,4,opt,name=user_config_dir" json:"user_config_dir,omitempty"`
 	// Insecure flags configurates what security features to disable.
-	InsecureFlags string `protobuf:"bytes,5,opt,name=insecure_flags,json=insecureFlags" json:"insecure_flags,omitempty"`
+	InsecureFlags string `protobuf:"bytes,5,opt,name=insecure_flags" json:"insecure_flags,omitempty"`
 	// Whether to automatically trust gpg keys fetched from https
-	TrustKeysFromHttps bool `protobuf:"varint,6,opt,name=trust_keys_from_https,json=trustKeysFromHttps" json:"trust_keys_from_https,omitempty"`
+	TrustKeysFromHttps bool `protobuf:"varint,6,opt,name=trust_keys_from_https" json:"trust_keys_from_https,omitempty"`
 }
 
 func (m *GlobalFlags) Reset()                    { *m = GlobalFlags{} }
@@ -480,13 +480,13 @@ func (*GlobalFlags) Descriptor() ([]byte, []int) { return fileDescriptor0, []int
 // Info describes the information of rkt on the machine.
 type Info struct {
 	// Version of rkt, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
-	RktVersion string `protobuf:"bytes,1,opt,name=rkt_version,json=rktVersion" json:"rkt_version,omitempty"`
+	RktVersion string `protobuf:"bytes,1,opt,name=rkt_version" json:"rkt_version,omitempty"`
 	// Version of appc, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
-	AppcVersion string `protobuf:"bytes,2,opt,name=appc_version,json=appcVersion" json:"appc_version,omitempty"`
+	AppcVersion string `protobuf:"bytes,2,opt,name=appc_version" json:"appc_version,omitempty"`
 	// Latest version of the api that's supported by the service, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
-	ApiVersion string `protobuf:"bytes,3,opt,name=api_version,json=apiVersion" json:"api_version,omitempty"`
+	ApiVersion string `protobuf:"bytes,3,opt,name=api_version" json:"api_version,omitempty"`
 	// The global flags that passed to the rkt api service when it's launched.
-	GlobalFlags *GlobalFlags `protobuf:"bytes,4,opt,name=global_flags,json=globalFlags" json:"global_flags,omitempty"`
+	GlobalFlags *GlobalFlags `protobuf:"bytes,4,opt,name=global_flags" json:"global_flags,omitempty"`
 }
 
 func (m *Info) Reset()                    { *m = Info{} }
@@ -544,10 +544,10 @@ type EventFilter struct {
 	// If set, then only returns the events after this timestamp.
 	// If the server starts after since_time, then only the events happened after the start of the server will be returned.
 	// If since_time is a future timestamp, then no events will be returned until that time.
-	SinceTime int64 `protobuf:"varint,4,opt,name=since_time,json=sinceTime" json:"since_time,omitempty"`
+	SinceTime int64 `protobuf:"varint,4,opt,name=since_time" json:"since_time,omitempty"`
 	// If set, then only returns the events before this timestamp.
 	// If it is a future timestamp, then the event stream will be closed at that moment.
-	UntilTime int64 `protobuf:"varint,5,opt,name=until_time,json=untilTime" json:"until_time,omitempty"`
+	UntilTime int64 `protobuf:"varint,5,opt,name=until_time" json:"until_time,omitempty"`
 }
 
 func (m *EventFilter) Reset()                    { *m = EventFilter{} }
@@ -744,11 +744,11 @@ func (m *ListenEventsResponse) GetEvents() []*Event {
 // Request for GetLogs().
 type GetLogsRequest struct {
 	// ID of the pod which we will get logs from, required.
-	PodId string `protobuf:"bytes,1,opt,name=pod_id,json=podId" json:"pod_id,omitempty"`
+	PodId string `protobuf:"bytes,1,opt,name=pod_id" json:"pod_id,omitempty"`
 	// Name of the app within the pod which we will get logs
 	// from, optional. If not set, then the logs of all the
 	// apps within the pod will be returned.
-	AppName string `protobuf:"bytes,2,opt,name=app_name,json=appName" json:"app_name,omitempty"`
+	AppName string `protobuf:"bytes,2,opt,name=app_name" json:"app_name,omitempty"`
 	// Number of most recent lines to return, optional.
 	Lines int32 `protobuf:"varint,3,opt,name=lines" json:"lines,omitempty"`
 	// If true, then a response stream will not be closed,
@@ -756,10 +756,10 @@ type GetLogsRequest struct {
 	Follow bool `protobuf:"varint,4,opt,name=follow" json:"follow,omitempty"`
 	// If set, then only the logs after the timestamp will
 	// be returned, optional.
-	SinceTime int64 `protobuf:"varint,5,opt,name=since_time,json=sinceTime" json:"since_time,omitempty"`
+	SinceTime int64 `protobuf:"varint,5,opt,name=since_time" json:"since_time,omitempty"`
 	// If set, then only the logs before the timestamp will
 	// be returned, optional.
-	UntilTime int64 `protobuf:"varint,6,opt,name=until_time,json=untilTime" json:"until_time,omitempty"`
+	UntilTime int64 `protobuf:"varint,6,opt,name=until_time" json:"until_time,omitempty"`
 }
 
 func (m *GetLogsRequest) Reset()                    { *m = GetLogsRequest{} }
@@ -815,10 +815,6 @@ func init() {
 var _ context.Context
 var _ grpc.ClientConn
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion1
-
 // Client API for PublicAPI service
 
 type PublicAPIClient interface {
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index 4d351350b5..851de56b33 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -21,7 +21,7 @@ export PATH=${GOPATH}/bin:${PATH}
 trap 'rm -rf "${GOPATH}"' EXIT
 
 # git (sha) version of golang/protobuf
-GO_PROTOBUF_SHA="dda510ac0fd43b39770f22ac6260eb91d377bce3"
+GO_PROTOBUF_SHA="2402d76f3d41f928c7902a765dfc872356dd3aad"
 
 echo "installing golang/protobuf using GOPATH=${GOPATH}"
 go get -u github.com/golang/protobuf/{proto,protoc-gen-go}

From 040d4972d6824d3596b05f673ffc6a885cadc221 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 5 Apr 2016 17:33:51 +0200
Subject: [PATCH 0080/1304] protobuf: catchup with PR #2377

---
 api/v1alpha/api.pb.go | 220 ++++++++++++++++++++++--------------------
 1 file changed, 113 insertions(+), 107 deletions(-)

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index fed327f715..048e000483 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -340,6 +340,10 @@ type Pod struct {
 	Annotations []*KeyValue `protobuf:"bytes,7,rep,name=annotations" json:"annotations,omitempty"`
 	// Cgroup of the pod, empty if the pod is not running.
 	Cgroup string `protobuf:"bytes,8,opt,name=cgroup" json:"cgroup,omitempty"`
+	// Timestamp when the pod is created, nanoseconds since epoch.
+	CreatedAt int64 `protobuf:"varint,9,opt,name=created_at" json:"created_at,omitempty"`
+	// Timestamp when the pod is started, nanoseconds since epoch.
+	StartedAt int64 `protobuf:"varint,10,opt,name=started_at" json:"started_at,omitempty"`
 }
 
 func (m *Pod) Reset()                    { *m = Pod{} }
@@ -1128,111 +1132,113 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1692 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x58, 0xcd, 0x6f, 0xdb, 0xc8,
-	0x15, 0x0f, 0xf5, 0xad, 0x27, 0x59, 0x96, 0xc7, 0x4e, 0xa2, 0x38, 0x1f, 0x75, 0x99, 0x26, 0x71,
-	0x8d, 0xc2, 0x68, 0x9c, 0xb4, 0xbd, 0x04, 0x41, 0x65, 0x99, 0x76, 0x85, 0xd8, 0x92, 0xc0, 0x28,
-	0x6e, 0x83, 0x1e, 0x08, 0x5a, 0x1a, 0x39, 0x44, 0x28, 0x91, 0x15, 0x29, 0x27, 0xee, 0xb1, 0xb7,
-	0x02, 0x45, 0xff, 0x83, 0xde, 0x7a, 0xde, 0xeb, 0x02, 0x7b, 0xdf, 0x3f, 0x65, 0xff, 0x85, 0xdd,
-	0xeb, 0xbe, 0xf9, 0x20, 0x39, 0xa4, 0x65, 0xc3, 0xd8, 0xdb, 0xcc, 0xfb, 0xbd, 0xf9, 0xcd, 0xfb,
-	0x98, 0xf7, 0x1e, 0x25, 0xa8, 0xda, 0xbe, 0xb3, 0xeb, 0xcf, 0xbd, 0xd0, 0x23, 0xe5, 0x8b, 0x97,
-	0xb6, 0xeb, 0x7f, 0xb2, 0xf5, 0x3e, 0xd4, 0xba, 0x53, 0xfb, 0x9c, 0x1e, 0x7a, 0xf3, 0xa9, 0x1d,
-	0x92, 0xe7, 0x50, 0x08, 0x2f, 0x7d, 0xda, 0xd2, 0xb6, 0xb4, 0xed, 0xc6, 0x1e, 0xd9, 0x95, 0x6a,
-	0xbb, 0x5c, 0x67, 0x88, 0x88, 0xc9, 0x71, 0xd2, 0x82, 0xf2, 0x05, 0x9d, 0x07, 0x8e, 0x37, 0x6b,
-	0xe5, 0x50, 0xb5, 0x6a, 0x46, 0x5b, 0xfd, 0x3f, 0x39, 0x28, 0x72, 0x6d, 0xf2, 0x07, 0xa8, 0x9d,
-	0xd9, 0x01, 0xb5, 0x26, 0x9c, 0x9a, 0x53, 0xd6, 0xf6, 0x36, 0xd2, 0x94, 0xe2, 0x5a, 0x13, 0x98,
-	0xa2, 0x34, 0xa1, 0x01, 0x39, 0x67, 0x2c, 0x59, 0x71, 0x45, 0x08, 0x14, 0x66, 0xf6, 0x94, 0xb6,
-	0xf2, 0x5c, 0xc2, 0xd7, 0xea, 0xf5, 0x85, 0xd4, 0xf5, 0xe4, 0xb7, 0xd0, 0x74, 0xa6, 0xbe, 0x37,
-	0x0f, 0xad, 0xd0, 0x99, 0xd2, 0x20, 0xb4, 0xa7, 0x7e, 0xab, 0x88, 0x2a, 0x79, 0x73, 0x55, 0xc8,
-	0x87, 0x91, 0x98, 0x6c, 0x42, 0x65, 0x6a, 0xcf, 0x9c, 0x09, 0x6e, 0x5b, 0x25, 0x54, 0xa9, 0x9b,
-	0xf1, 0x9e, 0x5d, 0x1a, 0x38, 0xff, 0xa4, 0xad, 0x32, 0x3f, 0xca, 0xd7, 0xe4, 0x15, 0xd4, 0xec,
-	0xd9, 0xcc, 0x0b, 0xed, 0x10, 0x2f, 0x0a, 0x5a, 0x95, 0xad, 0x3c, 0xfa, 0xb3, 0x16, 0xfb, 0xf3,
-	0x8e, 0x5e, 0x9e, 0xda, 0xee, 0x82, 0x9a, 0xaa, 0x96, 0x6e, 0x40, 0xb9, 0x47, 0xc3, 0x2f, 0xde,
-	0xfc, 0x73, 0xec, 0x88, 0xa6, 0x38, 0x82, 0x32, 0xc7, 0xbf, 0x78, 0x2d, 0xdd, 0xe5, 0x6b, 0x29,
-	0xfb, 0x63, 0xe4, 0x30, 0x5b, 0xeb, 0xdf, 0x69, 0x90, 0x6f, 0xfb, 0xfe, 0x52, 0x8e, 0xdf, 0x40,
-	0xd1, 0x61, 0xb1, 0xe4, 0x24, 0xb5, 0xbd, 0x46, 0x3a, 0xc2, 0xa6, 0x00, 0xc9, 0x0b, 0x28, 0xa2,
-	0xdb, 0xa1, 0x88, 0x63, 0x43, 0xb1, 0x1b, 0x69, 0xdf, 0x33, 0xc0, 0x14, 0x38, 0x79, 0x08, 0x55,
-	0xfa, 0xd5, 0x09, 0xad, 0x91, 0x37, 0xa6, 0x3c, 0xba, 0x6b, 0x66, 0x85, 0x09, 0x3a, 0xb8, 0xcf,
-	0xc6, 0xa0, 0x78, 0xab, 0x18, 0xfc, 0x3b, 0x07, 0xf9, 0x81, 0x37, 0x96, 0x99, 0xd5, 0xe2, 0xcc,
-	0x36, 0x21, 0xef, 0xcb, 0x54, 0xaf, 0x99, 0x6c, 0x79, 0xbd, 0x91, 0x78, 0x3c, 0x65, 0xe4, 0x16,
-	0x14, 0x6c, 0xdf, 0x0f, 0xd0, 0x3e, 0x66, 0x40, 0x5d, 0x75, 0xc6, 0xe4, 0x08, 0xf9, 0x1d, 0x54,
-	0x66, 0x22, 0xf0, 0x91, 0x99, 0xcd, 0x58, 0x4b, 0x66, 0xc4, 0x8c, 0x35, 0x6e, 0x7c, 0x0b, 0x19,
-	0x9f, 0xcb, 0xb7, 0xf1, 0x99, 0xdc, 0x83, 0xd2, 0xe8, 0x7c, 0xee, 0x2d, 0x7c, 0x7c, 0x27, 0xcc,
-	0x5f, 0xb9, 0xd3, 0xf7, 0xa0, 0x12, 0x1d, 0x60, 0xfe, 0xe3, 0x5a, 0x06, 0x24, 0xff, 0x99, 0x5e,
-	0x92, 0x0d, 0x28, 0x5e, 0x30, 0x48, 0xbe, 0x07, 0xb1, 0xd1, 0x7f, 0xd4, 0xa0, 0x8a, 0x01, 0x38,
-	0x74, 0xdc, 0x90, 0xce, 0xd9, 0x29, 0x67, 0x1c, 0xe0, 0xa9, 0x3c, 0x3b, 0x85, 0x4b, 0x7c, 0xf3,
-	0x25, 0x1e, 0x95, 0x00, 0x8f, 0xe5, 0x97, 0x87, 0x4d, 0x2a, 0xb0, 0xe4, 0x62, 0x74, 0x2c, 0xf6,
-	0x6e, 0x02, 0x0c, 0x32, 0xa3, 0xa8, 0xa0, 0xa0, 0xc7, 0xf6, 0x0c, 0xe4, 0x6f, 0xc5, 0x62, 0xfc,
-	0x05, 0x01, 0x72, 0x41, 0x17, 0x2f, 0x79, 0x0a, 0x2b, 0x32, 0x5a, 0xf2, 0x74, 0x91, 0x2b, 0xd4,
-	0xa5, 0x50, 0x30, 0x64, 0x42, 0x55, 0xba, 0x55, 0xa8, 0xb0, 0x98, 0x45, 0x70, 0x44, 0x6c, 0xb1,
-	0x98, 0xe5, 0x56, 0xff, 0x3e, 0x17, 0x75, 0xa7, 0xeb, 0x5c, 0xc7, 0xbc, 0xf9, 0x73, 0x3a, 0x71,
-	0xbe, 0x4a, 0xe7, 0xd1, 0xe2, 0x68, 0x4f, 0x1e, 0x03, 0x6f, 0x2b, 0x29, 0x67, 0xab, 0x4c, 0x22,
-	0x6c, 0xc5, 0xa3, 0x18, 0x72, 0xb4, 0x3d, 0x71, 0x36, 0xda, 0xb3, 0x88, 0xba, 0xf6, 0x19, 0x75,
-	0x6f, 0x78, 0xe1, 0x52, 0x81, 0x3c, 0x83, 0x86, 0x68, 0x2c, 0x74, 0x6c, 0xd9, 0x13, 0xb4, 0x92,
-	0xbf, 0x9f, 0xbc, 0xb9, 0x12, 0x49, 0xdb, 0x4c, 0x88, 0x2f, 0x7b, 0x35, 0x56, 0x3b, 0xa3, 0xd8,
-	0x12, 0xa3, 0xde, 0x12, 0x9f, 0xde, 0xe7, 0xd2, 0x5f, 0xd4, 0x65, 0x98, 0xab, 0x93, 0x85, 0xeb,
-	0x4a, 0x57, 0xab, 0xc2, 0x55, 0x26, 0xe1, 0xae, 0xea, 0x3f, 0x69, 0x50, 0x3b, 0x72, 0xbd, 0x33,
-	0xdb, 0x3d, 0x74, 0xed, 0xf3, 0x80, 0xc5, 0x71, 0xec, 0xcc, 0xa3, 0x87, 0x87, 0x4b, 0xb2, 0x03,
-	0x6b, 0xc1, 0x65, 0x10, 0xd2, 0x29, 0x96, 0xfd, 0x6c, 0xe2, 0x9c, 0x5b, 0x0c, 0x17, 0x8f, 0x70,
-	0x55, 0x00, 0x1d, 0x2e, 0x3f, 0x40, 0xdd, 0x6d, 0x68, 0xba, 0xde, 0xc8, 0x76, 0x55, 0x55, 0xd1,
-	0xab, 0x1a, 0x5c, 0x9e, 0x68, 0x3e, 0x87, 0xd5, 0x45, 0x40, 0xe7, 0xaa, 0xa2, 0x68, 0xd7, 0x2b,
-	0x4c, 0x9c, 0xe8, 0xb1, 0x18, 0xce, 0x02, 0x3a, 0x5a, 0xcc, 0x71, 0x5a, 0x30, 0x0b, 0x79, 0xcb,
-	0x46, 0xb5, 0x48, 0x2a, 0xcc, 0x7e, 0x09, 0x77, 0xc3, 0xf9, 0x22, 0x08, 0x2d, 0xcc, 0x53, 0x60,
-	0x4d, 0xe6, 0xde, 0xd4, 0xfa, 0x14, 0x86, 0x7e, 0xc0, 0x23, 0x5e, 0x31, 0x09, 0x07, 0x31, 0x40,
-	0xc1, 0x21, 0x42, 0x7f, 0x61, 0x88, 0xfe, 0x7f, 0x0d, 0x0a, 0xdd, 0xd9, 0xc4, 0x23, 0xbf, 0x82,
-	0xda, 0xfc, 0x73, 0x68, 0x45, 0x53, 0x43, 0xb8, 0x0e, 0x28, 0x3a, 0x95, 0x83, 0xe3, 0xd7, 0x50,
-	0xc7, 0x42, 0x18, 0x59, 0xe9, 0xb1, 0x56, 0x63, 0xb2, 0x48, 0x05, 0x39, 0x70, 0x82, 0xc6, 0x1a,
-	0xc2, 0x67, 0x40, 0x51, 0xa4, 0xf0, 0x27, 0xa8, 0x9f, 0xf3, 0x30, 0x4b, 0x2f, 0x0a, 0x99, 0x91,
-	0xa7, 0xe4, 0xc0, 0xac, 0x9d, 0x27, 0x1b, 0xfd, 0xbf, 0x1a, 0x14, 0x8d, 0x0b, 0x3a, 0xbb, 0x7e,
-	0x00, 0x73, 0x54, 0x19, 0xc0, 0x4b, 0xa6, 0x24, 0x0b, 0x48, 0x34, 0x34, 0xd8, 0x9a, 0xc9, 0xd8,
-	0x10, 0xe4, 0x66, 0xe0, 0x10, 0x63, 0x6b, 0x0c, 0x75, 0x61, 0x6c, 0x87, 0xf6, 0xf5, 0xef, 0x9a,
-	0xc3, 0xfa, 0xff, 0xf0, 0xc5, 0xf0, 0x2b, 0x65, 0xe5, 0x6d, 0x43, 0x91, 0x5d, 0x2b, 0x6a, 0x6f,
-	0xb9, 0x5d, 0x42, 0x21, 0xaa, 0xd1, 0x5c, 0x52, 0xa3, 0xd8, 0xd4, 0xd4, 0x12, 0x14, 0x1b, 0xf6,
-	0x64, 0x03, 0x67, 0x36, 0xa2, 0x96, 0x62, 0x62, 0x95, 0x4b, 0xd8, 0x84, 0x66, 0xf0, 0x62, 0x16,
-	0x3a, 0xae, 0x80, 0xc5, 0x04, 0xaf, 0x72, 0x09, 0x83, 0xf5, 0x26, 0x34, 0x8e, 0x68, 0xc8, 0x32,
-	0x6b, 0xd2, 0x7f, 0x2c, 0xb0, 0x4b, 0xeb, 0xaf, 0x61, 0x35, 0x96, 0x04, 0x3e, 0x16, 0x05, 0xc5,
-	0x94, 0x16, 0x1c, 0xdc, 0xcb, 0x2f, 0x8f, 0x95, 0x64, 0x2e, 0x32, 0x25, 0x0e, 0xe9, 0x7f, 0x85,
-	0xd5, 0x63, 0x27, 0x08, 0xb1, 0x4f, 0x06, 0x92, 0x08, 0x07, 0x47, 0x79, 0xc2, 0x9d, 0x16, 0xce,
-	0xd6, 0x14, 0x67, 0xe3, 0x26, 0x6c, 0x46, 0x2a, 0xac, 0xcf, 0x8f, 0x69, 0x68, 0x3b, 0x2e, 0xcf,
-	0x45, 0xc5, 0x94, 0x3b, 0x34, 0xa7, 0x99, 0x10, 0x4b, 0x7b, 0x70, 0x68, 0xf9, 0xde, 0x38, 0xa2,
-	0xad, 0xab, 0xb4, 0x26, 0x47, 0xf4, 0xa7, 0xb0, 0xd6, 0x9d, 0x05, 0x3e, 0x1d, 0xb1, 0x83, 0x91,
-	0x41, 0x99, 0xb1, 0x89, 0xd4, 0x44, 0x55, 0x92, 0xe4, 0x4f, 0x70, 0x98, 0x7a, 0x63, 0xe9, 0x6b,
-	0x9a, 0x9b, 0x01, 0xfa, 0xdf, 0x61, 0x8d, 0x19, 0xc4, 0xdb, 0x69, 0xec, 0xeb, 0x6e, 0xd6, 0xd7,
-	0xec, 0xe7, 0xd9, 0x2d, 0xbd, 0x7d, 0x03, 0x44, 0x25, 0x97, 0x26, 0x3d, 0x87, 0x12, 0x1f, 0x1f,
-	0x11, 0x79, 0xf6, 0xcb, 0x44, 0xa2, 0xfa, 0x33, 0x58, 0x97, 0x0e, 0x09, 0xf9, 0x35, 0x7e, 0xbf,
-	0x81, 0x8d, 0xb4, 0x9a, 0xbc, 0x26, 0xfe, 0xfe, 0xd1, 0x6e, 0xf8, 0xfe, 0xd1, 0x3b, 0xb0, 0xce,
-	0x4c, 0xa4, 0x33, 0xfe, 0x62, 0x95, 0x6c, 0x97, 0x84, 0x73, 0x57, 0xbe, 0x4f, 0x95, 0xe7, 0x6f,
-	0x4a, 0x1d, 0xfd, 0x2d, 0x6c, 0xa4, 0x49, 0x12, 0x4f, 0x29, 0x97, 0x5c, 0xf1, 0x94, 0x2b, 0x9a,
-	0x12, 0xd5, 0xbf, 0xd1, 0xf8, 0xbb, 0x3d, 0xf6, 0xce, 0x63, 0x03, 0xee, 0x42, 0x09, 0xd3, 0x63,
-	0xc5, 0x9e, 0x16, 0x71, 0xd7, 0x1d, 0x93, 0x07, 0x50, 0x89, 0x06, 0x75, 0xf4, 0x85, 0x2d, 0xe7,
-	0x34, 0xab, 0x27, 0xd7, 0x99, 0xf1, 0x7a, 0xd2, 0xb6, 0x8b, 0xa6, 0xd8, 0xb0, 0xd4, 0x4c, 0x3c,
-	0xd7, 0xf5, 0xbe, 0xf0, 0x5a, 0xc2, 0xd4, 0x88, 0x5d, 0xa6, 0xce, 0x8a, 0x37, 0xd7, 0x59, 0x29,
-	0x5b, 0x67, 0x2f, 0x78, 0x55, 0x09, 0x7b, 0xa5, 0xaf, 0xf1, 0xf5, 0x62, 0x0c, 0x8b, 0xcd, 0x0e,
-	0x85, 0x6a, 0xfc, 0x1b, 0x01, 0x27, 0xfa, 0x46, 0xf7, 0xa4, 0x7d, 0x64, 0x58, 0xc3, 0x8f, 0x03,
-	0xc3, 0xfa, 0xd0, 0x3b, 0x30, 0x0e, 0xbb, 0x3d, 0xe3, 0xa0, 0x79, 0x87, 0xac, 0xc3, 0xaa, 0x82,
-	0xb4, 0x07, 0x83, 0x4e, 0x53, 0xc3, 0x10, 0xac, 0x29, 0xc2, 0x83, 0x7e, 0xe7, 0x9d, 0x61, 0x36,
-	0x73, 0xd8, 0xbe, 0x1a, 0x8a, 0xb8, 0xdf, 0xe9, 0x36, 0xf3, 0x3b, 0x03, 0xa8, 0x44, 0xdf, 0xab,
-	0xe4, 0x3e, 0xac, 0x23, 0x81, 0xf5, 0x7e, 0xd8, 0x1e, 0xa6, 0x2f, 0x41, 0xbe, 0x04, 0x30, 0x3f,
-	0xf4, 0x7a, 0xdd, 0xde, 0x11, 0x5e, 0xb3, 0x01, 0xcd, 0x44, 0x6c, 0xfc, 0xad, 0x3b, 0x44, 0xe5,
-	0xdc, 0xce, 0x0f, 0x1a, 0x54, 0xa2, 0xcf, 0x24, 0x46, 0x39, 0xe8, 0x1f, 0x2c, 0xa1, 0xc4, 0xb3,
-	0x09, 0x60, 0x9c, 0xec, 0x9b, 0x1f, 0xfb, 0xc8, 0x98, 0x52, 0x1f, 0x98, 0xc6, 0xa0, 0x6d, 0xb2,
-	0xab, 0x72, 0x98, 0x0c, 0x92, 0x05, 0x90, 0x26, 0xcf, 0x2c, 0x4b, 0xe4, 0x91, 0x65, 0x05, 0x4c,
-	0xc2, 0x83, 0x44, 0xdc, 0xde, 0xef, 0x9b, 0x68, 0x5a, 0x74, 0xac, 0x59, 0xcc, 0x5c, 0x2e, 0x0c,
-	0x2f, 0xa5, 0xef, 0x38, 0x30, 0x8e, 0x8d, 0x21, 0x23, 0x2b, 0xa7, 0xef, 0x38, 0x6a, 0x9b, 0xfb,
-	0x18, 0xc2, 0x66, 0x65, 0xe7, 0xdb, 0x1c, 0x54, 0xe3, 0x66, 0xcd, 0x32, 0x64, 0x9c, 0x1a, 0xbd,
-	0xe1, 0xd5, 0x0c, 0x3d, 0x84, 0xfb, 0x0a, 0xc2, 0x98, 0x62, 0xfb, 0x35, 0xa2, 0xc3, 0x93, 0xe5,
-	0x60, 0x64, 0x35, 0xfa, 0xbe, 0x09, 0xf7, 0x32, 0x3a, 0x68, 0x0a, 0xc7, 0xf2, 0xf8, 0xaa, 0xef,
-	0x66, 0x30, 0xe9, 0x4e, 0x01, 0xab, 0x78, 0x2b, 0x03, 0x49, 0xdb, 0xad, 0x4e, 0xff, 0xf8, 0xd8,
-	0xe8, 0x30, 0xad, 0x62, 0x86, 0x5c, 0xa6, 0xd3, 0x14, 0x01, 0x49, 0x93, 0x33, 0x4c, 0x92, 0x97,
-	0x59, 0x80, 0x15, 0x48, 0xbc, 0xaa, 0xee, 0xc9, 0x40, 0x98, 0x5c, 0x21, 0x8f, 0xa0, 0x75, 0x05,
-	0x36, 0x8d, 0x93, 0xfe, 0x29, 0xa2, 0xd5, 0xbd, 0x7f, 0x15, 0xf0, 0xf3, 0x7b, 0x71, 0xe6, 0x3a,
-	0xa3, 0xf6, 0xa0, 0x4b, 0xde, 0x42, 0x59, 0xce, 0x19, 0x72, 0x3f, 0x19, 0xec, 0xa9, 0x59, 0xb4,
-	0xd9, 0xba, 0x0a, 0x88, 0xe2, 0xd1, 0xef, 0x90, 0x36, 0x54, 0xa2, 0xc1, 0x40, 0x12, 0xbd, 0xcc,
-	0x10, 0xda, 0x7c, 0xb0, 0x04, 0x89, 0x29, 0x8e, 0x00, 0x92, 0x01, 0x40, 0x36, 0x95, 0xb9, 0x96,
-	0x19, 0x1d, 0x9b, 0x0f, 0x97, 0x62, 0x2a, 0x51, 0xd2, 0xb6, 0x15, 0xa2, 0x2b, 0x83, 0x42, 0x21,
-	0xba, 0xda, 0xe7, 0x91, 0xe8, 0x04, 0xea, 0x6a, 0x6b, 0x26, 0x8f, 0xb2, 0xf7, 0xaa, 0x8d, 0x7d,
-	0xf3, 0xf1, 0x35, 0x68, 0x4c, 0xd7, 0x87, 0xba, 0xda, 0x66, 0x15, 0xba, 0x25, 0x2d, 0x5c, 0xa1,
-	0x5b, 0xd6, 0x9b, 0xf5, 0x3b, 0xbf, 0xd7, 0xc8, 0x9f, 0x79, 0xd2, 0x58, 0x1b, 0x4b, 0x27, 0x4d,
-	0x69, 0xc4, 0xe9, 0xa4, 0xa9, 0x1d, 0x8f, 0x31, 0x9c, 0x95, 0xf8, 0xff, 0x26, 0xaf, 0x7e, 0x0e,
-	0x00, 0x00, 0xff, 0xff, 0xef, 0x2c, 0x8a, 0x46, 0x44, 0x11, 0x00, 0x00,
+	// 1717 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x58, 0x4b, 0x6f, 0xdb, 0xc6,
+	0x16, 0x0e, 0xf5, 0xd6, 0x91, 0x2c, 0xcb, 0x63, 0x27, 0x51, 0x9c, 0xc7, 0xf5, 0x65, 0x6e, 0x12,
+	0x5f, 0xe3, 0xc2, 0xb8, 0x71, 0xd2, 0x76, 0x13, 0x04, 0x95, 0x65, 0xda, 0x15, 0x62, 0x4b, 0x02,
+	0xa3, 0xb8, 0x0d, 0xba, 0x20, 0x68, 0x89, 0x72, 0x88, 0x50, 0x22, 0x4b, 0x52, 0x4e, 0xdc, 0x65,
+	0xd7, 0x45, 0xff, 0x41, 0x77, 0x5d, 0x77, 0x5b, 0xa0, 0xfb, 0xa2, 0xbf, 0xa4, 0x7f, 0xa1, 0xdd,
+	0xf6, 0xcc, 0x83, 0xe4, 0x90, 0x96, 0x0d, 0xa3, 0xbb, 0x99, 0xf3, 0x9d, 0xf9, 0xe6, 0x3c, 0xe6,
+	0x9c, 0x43, 0x09, 0xaa, 0xa6, 0x67, 0x6f, 0x7b, 0xbe, 0x1b, 0xba, 0xa4, 0x7c, 0xf6, 0xd4, 0x74,
+	0xbc, 0x77, 0xa6, 0xda, 0x87, 0x5a, 0x77, 0x6a, 0x9e, 0x5a, 0xfb, 0xae, 0x3f, 0x35, 0x43, 0xf2,
+	0x18, 0x0a, 0xe1, 0xb9, 0x67, 0xb5, 0x94, 0x0d, 0x65, 0xb3, 0xb1, 0x43, 0xb6, 0x85, 0xda, 0x36,
+	0xd3, 0x19, 0x22, 0xa2, 0x33, 0x9c, 0xb4, 0xa0, 0x7c, 0x66, 0xf9, 0x81, 0xed, 0xce, 0x5a, 0x39,
+	0x54, 0xad, 0xea, 0xd1, 0x56, 0xfd, 0x3e, 0x07, 0x45, 0xa6, 0x4d, 0x3e, 0x81, 0xda, 0x89, 0x19,
+	0x58, 0xc6, 0x84, 0x51, 0x33, 0xca, 0xda, 0xce, 0x5a, 0x9a, 0x92, 0x5f, 0xab, 0x03, 0x55, 0x14,
+	0x26, 0x34, 0x20, 0x67, 0x8f, 0x05, 0x2b, 0xae, 0x08, 0x81, 0xc2, 0xcc, 0x9c, 0x5a, 0xad, 0x3c,
+	0x93, 0xb0, 0xb5, 0x7c, 0x7d, 0x21, 0x75, 0x3d, 0xf9, 0x2f, 0x34, 0xed, 0xa9, 0xe7, 0xfa, 0xa1,
+	0x11, 0xda, 0x53, 0x2b, 0x08, 0xcd, 0xa9, 0xd7, 0x2a, 0xa2, 0x4a, 0x5e, 0x5f, 0xe6, 0xf2, 0x61,
+	0x24, 0x26, 0xeb, 0x50, 0x99, 0x9a, 0x33, 0x7b, 0x82, 0xdb, 0x56, 0x09, 0x55, 0xea, 0x7a, 0xbc,
+	0xa7, 0x97, 0x06, 0xf6, 0xb7, 0x56, 0xab, 0xcc, 0x8e, 0xb2, 0x35, 0x79, 0x06, 0x35, 0x73, 0x36,
+	0x73, 0x43, 0x33, 0xc4, 0x8b, 0x82, 0x56, 0x65, 0x23, 0x8f, 0xfe, 0xac, 0xc4, 0xfe, 0xbc, 0xb2,
+	0xce, 0x8f, 0x4d, 0x67, 0x6e, 0xe9, 0xb2, 0x96, 0xaa, 0x41, 0xb9, 0x67, 0x85, 0x1f, 0x5c, 0xff,
+	0x7d, 0xec, 0x88, 0x22, 0x39, 0x82, 0x32, 0xdb, 0x3b, 0x7b, 0x2e, 0xdc, 0x65, 0x6b, 0x21, 0xfb,
+	0x34, 0x72, 0x98, 0xae, 0xd5, 0x5f, 0x15, 0xc8, 0xb7, 0x3d, 0x6f, 0x21, 0xc7, 0x7f, 0xa0, 0x68,
+	0xd3, 0x58, 0x32, 0x92, 0xda, 0x4e, 0x23, 0x1d, 0x61, 0x9d, 0x83, 0xe4, 0x09, 0x14, 0xd1, 0xed,
+	0x90, 0xc7, 0xb1, 0x21, 0xd9, 0x8d, 0xb4, 0xaf, 0x29, 0xa0, 0x73, 0x9c, 0xdc, 0x85, 0xaa, 0xf5,
+	0xd1, 0x0e, 0x8d, 0x91, 0x3b, 0xb6, 0x58, 0x74, 0x57, 0xf4, 0x0a, 0x15, 0x74, 0x70, 0x9f, 0x8d,
+	0x41, 0xf1, 0x5a, 0x31, 0xf8, 0x3d, 0x07, 0xf9, 0x81, 0x3b, 0x16, 0x99, 0x55, 0xe2, 0xcc, 0x36,
+	0x21, 0xef, 0x89, 0x54, 0xaf, 0xe8, 0x74, 0x79, 0xb9, 0x91, 0x78, 0x3c, 0x65, 0xe4, 0x06, 0x14,
+	0x4c, 0xcf, 0x0b, 0xd0, 0x3e, 0x6a, 0x40, 0x5d, 0x76, 0x46, 0x67, 0x08, 0xf9, 0x1f, 0x54, 0x66,
+	0x3c, 0xf0, 0x91, 0x99, 0xcd, 0x58, 0x4b, 0x64, 0x44, 0x8f, 0x35, 0xae, 0x7c, 0x0b, 0x19, 0x9f,
+	0xcb, 0xd7, 0xf1, 0x99, 0xdc, 0x82, 0xd2, 0xe8, 0xd4, 0x77, 0xe7, 0x1e, 0xbe, 0x13, 0xea, 0xaf,
+	0xd8, 0x91, 0xfb, 0x00, 0x23, 0xdf, 0x42, 0x17, 0xc6, 0x06, 0xd6, 0x44, 0x95, 0x3d, 0xaf, 0xaa,
+	0x90, 0xb4, 0x43, 0x0a, 0xa3, 0x83, 0xbe, 0x80, 0x81, 0xc3, 0x42, 0xd2, 0x0e, 0xd5, 0x1d, 0xa8,
+	0x44, 0xd7, 0xd1, 0xe8, 0xe1, 0x5a, 0x84, 0x33, 0xff, 0xde, 0x3a, 0x27, 0x6b, 0x50, 0x3c, 0xa3,
+	0x90, 0x78, 0x4d, 0x7c, 0xa3, 0xfe, 0xa9, 0x40, 0x15, 0xc3, 0xb7, 0x6f, 0x3b, 0xa1, 0xe5, 0xd3,
+	0x53, 0xf6, 0x38, 0xc0, 0x53, 0x79, 0x7a, 0x0a, 0x97, 0x58, 0x31, 0x25, 0x16, 0xd3, 0x00, 0x8f,
+	0xe5, 0x17, 0x07, 0x5d, 0x28, 0xd0, 0xa7, 0x81, 0xb1, 0x35, 0xe8, 0xab, 0x0b, 0x30, 0x45, 0x94,
+	0xa2, 0x82, 0x82, 0x1e, 0xdd, 0x53, 0x90, 0xbd, 0x34, 0x83, 0xf2, 0x17, 0x38, 0xc8, 0x04, 0x5d,
+	0xbc, 0xe4, 0x21, 0x2c, 0x89, 0x58, 0x8b, 0xd3, 0x45, 0xa6, 0x50, 0x17, 0x42, 0xce, 0x90, 0x09,
+	0x74, 0xe9, 0x5a, 0x81, 0xc6, 0x56, 0xc0, 0x43, 0xcb, 0x33, 0x83, 0xad, 0x40, 0x6c, 0xd5, 0xdf,
+	0x72, 0x51, 0x6f, 0xbb, 0xcc, 0x75, 0xcc, 0xba, 0xe7, 0x5b, 0x13, 0xfb, 0xa3, 0x70, 0x1e, 0x2d,
+	0x8e, 0xf6, 0x34, 0x13, 0xac, 0x7b, 0xc9, 0xce, 0x56, 0xa9, 0x84, 0xdb, 0x8a, 0x47, 0x31, 0xe4,
+	0x68, 0x7b, 0xe2, 0x6c, 0xb4, 0xa7, 0x11, 0x75, 0xcc, 0x13, 0xcb, 0xb9, 0xa2, 0x3e, 0x84, 0x02,
+	0x79, 0x04, 0x0d, 0xde, 0x96, 0x68, 0xc2, 0x27, 0x68, 0x25, 0x7b, 0x7d, 0x79, 0x7d, 0x29, 0x92,
+	0xb6, 0xa9, 0x10, 0xeb, 0x62, 0x39, 0x56, 0x3b, 0xb1, 0xb0, 0xa1, 0x46, 0x9d, 0x29, 0x3e, 0xbd,
+	0xcb, 0xa4, 0xff, 0xa8, 0x47, 0x51, 0x57, 0x27, 0x73, 0xc7, 0x11, 0xae, 0x56, 0xb9, 0xab, 0x54,
+	0xc2, 0x5c, 0x55, 0xff, 0x52, 0xa0, 0x76, 0xe0, 0xb8, 0x27, 0xa6, 0xb3, 0xef, 0x98, 0xa7, 0x01,
+	0x8d, 0xe3, 0xd8, 0xf6, 0xa3, 0x87, 0x87, 0x4b, 0xb2, 0x05, 0x2b, 0xc1, 0x79, 0x10, 0x5a, 0x53,
+	0x6c, 0x1a, 0xb3, 0x89, 0x7d, 0x6a, 0x50, 0x9c, 0x3f, 0xc2, 0x65, 0x0e, 0x74, 0x98, 0x7c, 0x0f,
+	0x75, 0x37, 0xa1, 0xe9, 0xb8, 0x23, 0xd3, 0x91, 0x55, 0x79, 0xa7, 0x6b, 0x30, 0x79, 0xa2, 0xf9,
+	0x18, 0x96, 0xe7, 0x81, 0xe5, 0xcb, 0x8a, 0xbc, 0xd9, 0x2f, 0x51, 0x71, 0xa2, 0x47, 0x63, 0x38,
+	0x0b, 0xac, 0xd1, 0xdc, 0xc7, 0x59, 0x43, 0x2d, 0x64, 0x0d, 0x1f, 0xd5, 0x22, 0x29, 0x37, 0xfb,
+	0x29, 0xdc, 0x0c, 0xfd, 0x79, 0x10, 0x1a, 0x98, 0xa7, 0xc0, 0x98, 0xf8, 0xee, 0xd4, 0x78, 0x17,
+	0x86, 0x5e, 0xc0, 0x22, 0x5e, 0xd1, 0x09, 0x03, 0x31, 0x40, 0xc1, 0x3e, 0x42, 0x5f, 0x50, 0x44,
+	0xfd, 0x49, 0x81, 0x42, 0x77, 0x36, 0x71, 0xc9, 0xbf, 0xa0, 0xe6, 0xbf, 0x0f, 0x8d, 0x68, 0xe6,
+	0x70, 0xd7, 0x01, 0x45, 0xc7, 0x62, 0xec, 0xfc, 0x1b, 0xea, 0x58, 0x08, 0x23, 0x23, 0x3d, 0x14,
+	0x6b, 0x54, 0x16, 0xa9, 0x20, 0x07, 0xce, 0xdf, 0x58, 0x83, 0xfb, 0x0c, 0x28, 0x8a, 0x14, 0x3e,
+	0x83, 0xfa, 0x29, 0x0b, 0xb3, 0xf0, 0xa2, 0x90, 0x19, 0x98, 0x52, 0x0e, 0xf4, 0xda, 0x69, 0xb2,
+	0x51, 0x7f, 0x50, 0xa0, 0xa8, 0x9d, 0x59, 0xb3, 0xcb, 0xc7, 0x37, 0x43, 0xa5, 0xf1, 0xbd, 0x60,
+	0xc6, 0xd2, 0x80, 0x44, 0x23, 0x87, 0xae, 0xa9, 0x8c, 0x8e, 0x50, 0x66, 0x06, 0x8e, 0x40, 0xba,
+	0xc6, 0x50, 0x17, 0xc6, 0x66, 0x68, 0x5e, 0xfe, 0xae, 0x19, 0xac, 0xfe, 0x88, 0x2f, 0x86, 0x5d,
+	0x29, 0x2a, 0x6f, 0x13, 0x8a, 0xf4, 0x5a, 0x5e, 0x7b, 0x8b, 0xed, 0xe2, 0x0a, 0x51, 0x8d, 0xe6,
+	0x92, 0x1a, 0xc5, 0xa6, 0x26, 0x97, 0x20, 0xdf, 0xb0, 0x3e, 0x69, 0xcf, 0x46, 0x96, 0x21, 0x99,
+	0x58, 0x65, 0x12, 0x3a, 0xdf, 0x29, 0x3c, 0x9f, 0x85, 0xb6, 0xc3, 0x61, 0x3e, 0xff, 0xab, 0x4c,
+	0x42, 0x61, 0xb5, 0x09, 0x8d, 0x03, 0x2b, 0xa4, 0x99, 0xd5, 0xad, 0x6f, 0xe6, 0xd8, 0xe3, 0xd5,
+	0xe7, 0xb0, 0x1c, 0x4b, 0x02, 0x0f, 0x8b, 0xc2, 0xc2, 0x94, 0x16, 0x6c, 0xdc, 0x8b, 0xef, 0x96,
+	0xa5, 0x64, 0xaa, 0x52, 0x25, 0x06, 0xa9, 0x5f, 0xc2, 0xf2, 0xa1, 0x1d, 0x84, 0xd8, 0x27, 0x03,
+	0x41, 0x84, 0x63, 0xa7, 0x3c, 0x61, 0x4e, 0x73, 0x67, 0x6b, 0x92, 0xb3, 0x71, 0x13, 0xd6, 0x23,
+	0x15, 0x3a, 0x25, 0xc6, 0x56, 0x68, 0xda, 0x0e, 0xcb, 0x45, 0x45, 0x17, 0x3b, 0x34, 0xa7, 0x99,
+	0x10, 0x0b, 0x7b, 0x70, 0xe4, 0x79, 0xee, 0x38, 0xa2, 0xad, 0xcb, 0xb4, 0x3a, 0x43, 0xd4, 0x87,
+	0xb0, 0xd2, 0x9d, 0x05, 0x9e, 0x35, 0xa2, 0x07, 0x23, 0x83, 0x32, 0x43, 0x17, 0xa9, 0x89, 0xac,
+	0x24, 0xc8, 0x1f, 0xe0, 0x28, 0x76, 0xc7, 0xc2, 0xd7, 0x34, 0x37, 0x05, 0xd4, 0xaf, 0x61, 0x85,
+	0x1a, 0xc4, 0xda, 0x69, 0xec, 0xeb, 0x76, 0xd6, 0xd7, 0xec, 0xc7, 0xdd, 0x35, 0xbd, 0x7d, 0x01,
+	0x44, 0x26, 0x17, 0x26, 0x3d, 0x86, 0x12, 0x1b, 0x1f, 0x11, 0x79, 0xf6, 0xbb, 0x46, 0xa0, 0xea,
+	0x23, 0x58, 0x15, 0x0e, 0x71, 0xf9, 0x25, 0x7e, 0xbf, 0x80, 0xb5, 0xb4, 0x9a, 0xb8, 0x26, 0xfe,
+	0x7a, 0x52, 0xae, 0xf8, 0x7a, 0x52, 0x3b, 0xb0, 0x4a, 0x4d, 0xb4, 0x66, 0xec, 0xc5, 0x4a, 0xd9,
+	0x2e, 0x71, 0xe7, 0x2e, 0x7c, 0xdd, 0x4a, 0xcf, 0x5f, 0x17, 0x3a, 0xea, 0x4b, 0x58, 0x4b, 0x93,
+	0x24, 0x9e, 0x5a, 0x4c, 0x72, 0xc1, 0x53, 0xa6, 0xa8, 0x0b, 0x54, 0xfd, 0x59, 0x61, 0xef, 0xf6,
+	0xd0, 0x3d, 0x8d, 0x0d, 0xb8, 0x09, 0x25, 0x4c, 0x8f, 0x11, 0x7b, 0x5a, 0xc4, 0x5d, 0x77, 0x4c,
+	0xee, 0x40, 0x25, 0x1a, 0xd4, 0xd1, 0xf7, 0xb9, 0x98, 0xd3, 0xb4, 0x9e, 0x1c, 0x7b, 0xc6, 0xea,
+	0x49, 0xd9, 0x2c, 0xea, 0x7c, 0x43, 0x53, 0x33, 0x71, 0x1d, 0xc7, 0xfd, 0xc0, 0x6a, 0x09, 0x53,
+	0xc3, 0x77, 0x99, 0x3a, 0x2b, 0x5e, 0x5d, 0x67, 0xa5, 0x6c, 0x9d, 0x3d, 0x61, 0x55, 0xc5, 0xed,
+	0x15, 0xbe, 0xc6, 0xd7, 0xf3, 0x31, 0xcc, 0x37, 0x5b, 0x16, 0x54, 0xe3, 0x5f, 0x18, 0x38, 0xd1,
+	0xd7, 0xba, 0x47, 0xed, 0x03, 0xcd, 0x18, 0xbe, 0x1d, 0x68, 0xc6, 0x9b, 0xde, 0x9e, 0xb6, 0xdf,
+	0xed, 0x69, 0x7b, 0xcd, 0x1b, 0x64, 0x15, 0x96, 0x25, 0xa4, 0x3d, 0x18, 0x74, 0x9a, 0x0a, 0x86,
+	0x60, 0x45, 0x12, 0xee, 0xf5, 0x3b, 0xaf, 0x34, 0xbd, 0x99, 0xc3, 0xf6, 0xd5, 0x90, 0xc4, 0xfd,
+	0x4e, 0xb7, 0x99, 0xdf, 0x1a, 0x40, 0x25, 0xfa, 0xda, 0x25, 0xb7, 0x61, 0x15, 0x09, 0x8c, 0xd7,
+	0xc3, 0xf6, 0x30, 0x7d, 0x09, 0xf2, 0x25, 0x80, 0xfe, 0xa6, 0xd7, 0xeb, 0xf6, 0x0e, 0xf0, 0x9a,
+	0x35, 0x68, 0x26, 0x62, 0xed, 0xab, 0xee, 0x10, 0x95, 0x73, 0x5b, 0x7f, 0x28, 0x50, 0x89, 0x3e,
+	0x93, 0x28, 0xe5, 0xa0, 0xbf, 0xb7, 0x80, 0x12, 0xcf, 0x26, 0x80, 0x76, 0xb4, 0xab, 0xbf, 0xed,
+	0x23, 0x63, 0x4a, 0x7d, 0xa0, 0x6b, 0x83, 0xb6, 0x4e, 0xaf, 0xca, 0x61, 0x32, 0x48, 0x16, 0x40,
+	0x9a, 0x3c, 0xb5, 0x2c, 0x91, 0x47, 0x96, 0x15, 0x30, 0x09, 0x77, 0x12, 0x71, 0x7b, 0xb7, 0xaf,
+	0xa3, 0x69, 0xd1, 0xb1, 0x66, 0x31, 0x73, 0x39, 0x37, 0xbc, 0x94, 0xbe, 0x63, 0x4f, 0x3b, 0xd4,
+	0x86, 0x94, 0xac, 0x9c, 0xbe, 0xe3, 0xa0, 0xad, 0xef, 0x62, 0x08, 0x9b, 0x95, 0xad, 0x5f, 0x72,
+	0x50, 0x8d, 0x9b, 0x35, 0xcd, 0x90, 0x76, 0xac, 0xf5, 0x86, 0x17, 0x33, 0x74, 0x17, 0x6e, 0x4b,
+	0x08, 0x65, 0x8a, 0xed, 0x57, 0x88, 0x0a, 0x0f, 0x16, 0x83, 0x91, 0xd5, 0xe8, 0xfb, 0x3a, 0xdc,
+	0xca, 0xe8, 0xa0, 0x29, 0x0c, 0xcb, 0xe3, 0xab, 0xbe, 0x99, 0xc1, 0x84, 0x3b, 0x05, 0xac, 0xe2,
+	0x8d, 0x0c, 0x24, 0x6c, 0x37, 0x3a, 0xfd, 0xc3, 0x43, 0xad, 0x43, 0xb5, 0x8a, 0x19, 0x72, 0x91,
+	0x4e, 0x9d, 0x07, 0x24, 0x4d, 0x4e, 0x31, 0x41, 0x5e, 0xa6, 0x01, 0x96, 0x20, 0xfe, 0xaa, 0xba,
+	0x47, 0x03, 0x6e, 0x72, 0x85, 0xdc, 0x83, 0xd6, 0x05, 0x58, 0xd7, 0x8e, 0xfa, 0xc7, 0x88, 0x56,
+	0x77, 0xbe, 0x2b, 0xe0, 0xe7, 0xf7, 0xfc, 0xc4, 0xb1, 0x47, 0xed, 0x41, 0x97, 0xbc, 0x84, 0xb2,
+	0x98, 0x33, 0xe4, 0x76, 0x32, 0xd8, 0x53, 0xb3, 0x68, 0xbd, 0x75, 0x11, 0xe0, 0xc5, 0xa3, 0xde,
+	0x20, 0x6d, 0xa8, 0x44, 0x83, 0x81, 0x24, 0x7a, 0x99, 0x21, 0xb4, 0x7e, 0x67, 0x01, 0x12, 0x53,
+	0x1c, 0x00, 0x24, 0x03, 0x80, 0xac, 0x4b, 0x73, 0x2d, 0x33, 0x3a, 0xd6, 0xef, 0x2e, 0xc4, 0x64,
+	0xa2, 0xa4, 0x6d, 0x4b, 0x44, 0x17, 0x06, 0x85, 0x44, 0x74, 0xb1, 0xcf, 0x23, 0xd1, 0x11, 0xd4,
+	0xe5, 0xd6, 0x4c, 0xee, 0x65, 0xef, 0x95, 0x1b, 0xfb, 0xfa, 0xfd, 0x4b, 0xd0, 0x98, 0xae, 0x0f,
+	0x75, 0xb9, 0xcd, 0x4a, 0x74, 0x0b, 0x5a, 0xb8, 0x44, 0xb7, 0xa8, 0x37, 0xab, 0x37, 0xfe, 0xaf,
+	0x90, 0xcf, 0x59, 0xd2, 0x68, 0x1b, 0x4b, 0x27, 0x4d, 0x6a, 0xc4, 0xe9, 0xa4, 0xc9, 0x1d, 0x8f,
+	0x32, 0x9c, 0x94, 0xd8, 0xbf, 0x2e, 0xcf, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xb2, 0xc6, 0x99,
+	0x3e, 0x82, 0x11, 0x00, 0x00,
 }

From 8e1a3b7c32e1cced2516079011d8c4962219fd0b Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 5 Apr 2016 18:20:36 +0200
Subject: [PATCH 0081/1304] stage1/init: return exit code 1 on error

On error, stage1/init was returning a non-zero value between 1 and 7. It
was useful for debugging to return a different value when stage1 was not
able to print any error messages. But it is not the case anymore: stage1
can write on stdout/stderr nowadays.
---
 stage1/init/init.go | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 6d09258f29..2a3d07c88d 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -507,7 +507,7 @@ func stage1() int {
 	flavor, _, err := stage1initcommon.GetFlavor(p)
 	if err != nil {
 		log.PrintE("failed to get stage1 flavor", err)
-		return 3
+		return 1
 	}
 
 	var n *networking.Networking
@@ -515,26 +515,26 @@ func stage1() int {
 		fps, err := forwardedPorts(p)
 		if err != nil {
 			log.Error(err)
-			return 6
+			return 1
 		}
 
 		n, err = networking.Setup(root, p.UUID, fps, netList, localConfig, flavor, debug)
 		if err != nil {
 			log.PrintE("failed to setup network", err)
-			return 6
+			return 1
 		}
 
 		if err = n.Save(); err != nil {
 			log.PrintE("failed to save networking state", err)
 			n.Teardown(flavor, debug)
-			return 6
+			return 1
 		}
 
 		if len(mdsToken) > 0 {
 			hostIP, err := n.GetDefaultHostIP()
 			if err != nil {
 				log.PrintE("failed to get default Host IP", err)
-				return 6
+				return 1
 			}
 
 			p.MetadataServiceURL = common.MetadataServicePublicURL(hostIP, mdsToken)
@@ -542,7 +542,7 @@ func stage1() int {
 	} else {
 		if flavor == "kvm" {
 			log.Print("flavor kvm requires private network configuration (try --net)")
-			return 6
+			return 1
 		}
 		if len(mdsToken) > 0 {
 			p.MetadataServiceURL = common.MetadataServicePublicURL(localhostIP, mdsToken)
@@ -551,12 +551,12 @@ func stage1() int {
 
 	if err = stage1initcommon.WriteDefaultTarget(p); err != nil {
 		log.PrintE("failed to write default.target", err)
-		return 2
+		return 1
 	}
 
 	if err = stage1initcommon.WritePrepareAppTemplate(p); err != nil {
 		log.PrintE("failed to write prepare-app service template", err)
-		return 2
+		return 1
 	}
 
 	if err := stage1initcommon.SetJournalPermissions(p); err != nil {
@@ -566,19 +566,19 @@ func stage1() int {
 	if flavor == "kvm" {
 		if err := KvmPodToSystemd(p, n); err != nil {
 			log.PrintE("failed to configure systemd for kvm", err)
-			return 2
+			return 1
 		}
 	}
 
 	if err = stage1initcommon.PodToSystemd(p, interactive, flavor, privateUsers); err != nil {
 		log.PrintE("failed to configure systemd", err)
-		return 2
+		return 1
 	}
 
 	args, env, err := getArgsEnv(p, flavor, debug, n)
 	if err != nil {
 		log.Error(err)
-		return 3
+		return 1
 	}
 
 	// create a separate mount namespace so the cgroup filesystems
@@ -602,13 +602,13 @@ func stage1() int {
 	enabledCgroups, err := cgroup.GetEnabledCgroups()
 	if err != nil {
 		log.FatalE("error getting cgroups", err)
-		return 5
+		return 1
 	}
 
 	// mount host cgroups in the rkt mount namespace
 	if err := mountHostCgroups(enabledCgroups); err != nil {
 		log.FatalE("couldn't mount the host cgroups", err)
-		return 5
+		return 1
 	}
 
 	var serviceNames []string
@@ -621,7 +621,7 @@ func stage1() int {
 	if err == nil {
 		if err := mountContainerCgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
 			log.PrintE("couldn't mount the container cgroups", err)
-			return 5
+			return 1
 		}
 	} else {
 		log.PrintE("continuing with per-app isolators disabled", err)
@@ -629,7 +629,7 @@ func stage1() int {
 
 	if err = stage1common.WritePpid(os.Getpid()); err != nil {
 		log.Error(err)
-		return 4
+		return 1
 	}
 
 	err = stage1common.WithClearedCloExec(lfd, func() error {
@@ -637,7 +637,7 @@ func stage1() int {
 	})
 	if err != nil {
 		log.PrintE(fmt.Sprintf("failed to execute %q", args[0]), err)
-		return 7
+		return 1
 	}
 
 	return 0

From 4a0174828dc6359a26f24a4feca81583d4a0f131 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 5 Apr 2016 18:27:14 +0200
Subject: [PATCH 0082/1304] fly/init: return exit code 1 on error

---
 stage1_fly/run/main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 53e09b58cd..049f49bb3a 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -334,7 +334,7 @@ func stage1() int {
 
 	if err = stage1common.WritePpid(os.Getpid()); err != nil {
 		log.Error(err)
-		return 4
+		return 1
 	}
 
 	diag.Printf("chroot to %q", rfs)
@@ -354,7 +354,7 @@ func stage1() int {
 	})
 	if err != nil {
 		log.PrintE(fmt.Sprintf("can't execute %q", args[0]), err)
-		return 7
+		return 1
 	}
 
 	return 0

From 9e7d5c7a5de5939e215c6042ccc62ba1d53e7d59 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 5 Apr 2016 18:57:02 +0200
Subject: [PATCH 0083/1304] tests: expect return status 0 or 1 from stage1

---
 tests/rkt_mount_test.go            | 4 ++--
 tests/rkt_run_pod_manifest_test.go | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index 531efa3fc3..a2b39569c0 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -70,14 +70,14 @@ func TestMountSymlink(t *testing.T) {
 			"/dir1/../../../foo",
 			"/dir2/foo",
 			"path escapes app's root",
-			3,
+			1,
 		},
 		// '/dir1/link_invalid' is an invalid link because it tries to escape rootfs.
 		{
 			"/dir1/link_invalid/foo",
 			"/dir2/foo",
 			"escapes app's root with value",
-			3,
+			1,
 		},
 	}
 
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index f9aeca0686..87fe3dd746 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -645,7 +645,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			2,
+			1,
 			`"user2" user not found`,
 			"",
 		},
@@ -666,7 +666,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			2,
+			1,
 			`"group2" group not found`,
 			"",
 		},
@@ -708,7 +708,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			2,
+			1,
 			`no such file or directory`,
 			"",
 		},
@@ -729,7 +729,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			2,
+			1,
 			`no such file or directory`,
 			"",
 		},

From 6bd9f7c718e705a301bc2984c826546824b63417 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 1 Apr 2016 13:46:07 +0200
Subject: [PATCH 0084/1304] tests: TestRktListCreatedStarted: fix timing issue

Also fix the error messages

Fix https://github.com/coreos/rkt/issues/2220
---
 tests/rkt_list_test.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index 3727440825..80c49c807a 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -24,15 +24,16 @@ import (
 	"github.com/coreos/rkt/tests/testutils"
 )
 
-const delta = 3 * time.Second
+const delta = 4 * time.Second
+const precision = 2 * time.Second
 
-// compareTime checks if a and b are roughly equal (1s precision)
+// compareTime checks if a and b are roughly equal
 func compareTime(a time.Time, b time.Time) bool {
 	diff := a.Sub(b)
 	if diff < 0 {
 		diff = -diff
 	}
-	return diff < time.Second
+	return diff < precision
 }
 
 func TestRktList(t *testing.T) {
@@ -174,9 +175,9 @@ func TestRktListCreatedStarted(t *testing.T) {
 
 	creation, start := getCreationStartTime(t, ctx, imageID)
 	if !compareTime(expectPrepare, creation) {
-		t.Fatalf("incorrect creation time returned. Got: %q Expect: %q (1s precision)", creation, expectPrepare)
+		t.Fatalf("rkt list returned an incorrect creation time. Got: %q Expect: %q", creation, expectPrepare)
 	}
 	if !compareTime(expectRun, start) {
-		t.Fatalf("incorrect creation time returned. Got: %q Expect: %q (1s precision)", start, expectRun)
+		t.Fatalf("rkt list returned an incorrect start time. Got: %q Expect: %q", start, expectRun)
 	}
 }

From 25f9cd2d2ca12f99738919fe4740e1c9823bba92 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 6 Apr 2016 14:05:30 +0200
Subject: [PATCH 0085/1304] Godeps: add golang/protobuf/protoc-gen-go

---
 Godeps/Godeps.json                            |   23 +-
 .../golang/protobuf/protoc-gen-go/Makefile    |   33 +
 .../protoc-gen-go/descriptor/Makefile         |   39 +
 .../protoc-gen-go/descriptor/descriptor.pb.go | 1812 +++++++++++
 .../golang/protobuf/protoc-gen-go/doc.go      |   51 +
 .../protobuf/protoc-gen-go/generator/Makefile |   40 +
 .../protoc-gen-go/generator/generator.go      | 2715 +++++++++++++++++
 .../protoc-gen-go/internal/grpc/grpc.go       |  442 +++
 .../protobuf/protoc-gen-go/link_grpc.go       |   34 +
 .../golang/protobuf/protoc-gen-go/main.go     |   98 +
 .../protobuf/protoc-gen-go/plugin/Makefile    |   45 +
 .../protoc-gen-go/plugin/plugin.pb.go         |  222 ++
 .../protoc-gen-go/plugin/plugin.pb.golden     |   83 +
 13 files changed, 5636 insertions(+), 1 deletion(-)
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
 create mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index edbe03bfa0..403994f9ec 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -13,7 +13,8 @@
 		"github.com/appc/cni/plugins/main/ptp",
 		"github.com/appc/cni/plugins/meta/flannel",
 		"github.com/appc/cni/plugins/meta/tuning",
-		"github.com/appc/spec/ace"
+		"github.com/appc/spec/ace",
+		"github.com/golang/protobuf/protoc-gen-go"
 	],
 	"Deps": [
 		{
@@ -353,6 +354,26 @@
 			"ImportPath": "github.com/golang/protobuf/proto",
 			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
 		},
+		{
+			"ImportPath": "github.com/golang/protobuf/protoc-gen-go",
+			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
+		},
+		{
+			"ImportPath": "github.com/golang/protobuf/protoc-gen-go/descriptor",
+			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
+		},
+		{
+			"ImportPath": "github.com/golang/protobuf/protoc-gen-go/generator",
+			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
+		},
+		{
+			"ImportPath": "github.com/golang/protobuf/protoc-gen-go/internal/grpc",
+			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
+		},
+		{
+			"ImportPath": "github.com/golang/protobuf/protoc-gen-go/plugin",
+			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
+		},
 		{
 			"ImportPath": "github.com/google/btree",
 			"Rev": "f06e229e679911bb31a04e07ac891115822e37c3"
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile
new file mode 100644
index 0000000000..a42cc3717f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile
@@ -0,0 +1,33 @@
+# Go support for Protocol Buffers - Google's data interchange format
+#
+# Copyright 2010 The Go Authors.  All rights reserved.
+# https://github.com/golang/protobuf
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+test:
+	cd testdata && make test
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
new file mode 100644
index 0000000000..4942418e32
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
@@ -0,0 +1,39 @@
+# Go support for Protocol Buffers - Google's data interchange format
+#
+# Copyright 2010 The Go Authors.  All rights reserved.
+# https://github.com/golang/protobuf
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Not stored here, but descriptor.proto is in https://github.com/google/protobuf/
+# at src/google/protobuf/descriptor.proto
+regenerate:
+	echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
+	protoc --go_out=. -I$(HOME)/src/protobuf/src $(HOME)/src/protobuf/src/google/protobuf/descriptor.proto && \
+		sed 's,^package google_protobuf,package descriptor,' google/protobuf/descriptor.pb.go > \
+		$(GOPATH)/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go && \
+		rm -f google/protobuf/descriptor.pb.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
new file mode 100644
index 0000000000..6a3be28eb6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
@@ -0,0 +1,1812 @@
+// Code generated by protoc-gen-go.
+// source: google/protobuf/descriptor.proto
+// DO NOT EDIT!
+
+/*
+Package google_protobuf is a generated protocol buffer package.
+
+It is generated from these files:
+	google/protobuf/descriptor.proto
+
+It has these top-level messages:
+	FileDescriptorSet
+	FileDescriptorProto
+	DescriptorProto
+	FieldDescriptorProto
+	OneofDescriptorProto
+	EnumDescriptorProto
+	EnumValueDescriptorProto
+	ServiceDescriptorProto
+	MethodDescriptorProto
+	FileOptions
+	MessageOptions
+	FieldOptions
+	EnumOptions
+	EnumValueOptions
+	ServiceOptions
+	MethodOptions
+	UninterpretedOption
+	SourceCodeInfo
+*/
+package descriptor
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+const _ = proto.ProtoPackageIsVersion1
+
+type FieldDescriptorProto_Type int32
+
+const (
+	// 0 is reserved for errors.
+	// Order is weird for historical reasons.
+	FieldDescriptorProto_TYPE_DOUBLE FieldDescriptorProto_Type = 1
+	FieldDescriptorProto_TYPE_FLOAT  FieldDescriptorProto_Type = 2
+	// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
+	// negative values are likely.
+	FieldDescriptorProto_TYPE_INT64  FieldDescriptorProto_Type = 3
+	FieldDescriptorProto_TYPE_UINT64 FieldDescriptorProto_Type = 4
+	// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
+	// negative values are likely.
+	FieldDescriptorProto_TYPE_INT32   FieldDescriptorProto_Type = 5
+	FieldDescriptorProto_TYPE_FIXED64 FieldDescriptorProto_Type = 6
+	FieldDescriptorProto_TYPE_FIXED32 FieldDescriptorProto_Type = 7
+	FieldDescriptorProto_TYPE_BOOL    FieldDescriptorProto_Type = 8
+	FieldDescriptorProto_TYPE_STRING  FieldDescriptorProto_Type = 9
+	FieldDescriptorProto_TYPE_GROUP   FieldDescriptorProto_Type = 10
+	FieldDescriptorProto_TYPE_MESSAGE FieldDescriptorProto_Type = 11
+	// New in version 2.
+	FieldDescriptorProto_TYPE_BYTES    FieldDescriptorProto_Type = 12
+	FieldDescriptorProto_TYPE_UINT32   FieldDescriptorProto_Type = 13
+	FieldDescriptorProto_TYPE_ENUM     FieldDescriptorProto_Type = 14
+	FieldDescriptorProto_TYPE_SFIXED32 FieldDescriptorProto_Type = 15
+	FieldDescriptorProto_TYPE_SFIXED64 FieldDescriptorProto_Type = 16
+	FieldDescriptorProto_TYPE_SINT32   FieldDescriptorProto_Type = 17
+	FieldDescriptorProto_TYPE_SINT64   FieldDescriptorProto_Type = 18
+)
+
+var FieldDescriptorProto_Type_name = map[int32]string{
+	1:  "TYPE_DOUBLE",
+	2:  "TYPE_FLOAT",
+	3:  "TYPE_INT64",
+	4:  "TYPE_UINT64",
+	5:  "TYPE_INT32",
+	6:  "TYPE_FIXED64",
+	7:  "TYPE_FIXED32",
+	8:  "TYPE_BOOL",
+	9:  "TYPE_STRING",
+	10: "TYPE_GROUP",
+	11: "TYPE_MESSAGE",
+	12: "TYPE_BYTES",
+	13: "TYPE_UINT32",
+	14: "TYPE_ENUM",
+	15: "TYPE_SFIXED32",
+	16: "TYPE_SFIXED64",
+	17: "TYPE_SINT32",
+	18: "TYPE_SINT64",
+}
+var FieldDescriptorProto_Type_value = map[string]int32{
+	"TYPE_DOUBLE":   1,
+	"TYPE_FLOAT":    2,
+	"TYPE_INT64":    3,
+	"TYPE_UINT64":   4,
+	"TYPE_INT32":    5,
+	"TYPE_FIXED64":  6,
+	"TYPE_FIXED32":  7,
+	"TYPE_BOOL":     8,
+	"TYPE_STRING":   9,
+	"TYPE_GROUP":    10,
+	"TYPE_MESSAGE":  11,
+	"TYPE_BYTES":    12,
+	"TYPE_UINT32":   13,
+	"TYPE_ENUM":     14,
+	"TYPE_SFIXED32": 15,
+	"TYPE_SFIXED64": 16,
+	"TYPE_SINT32":   17,
+	"TYPE_SINT64":   18,
+}
+
+func (x FieldDescriptorProto_Type) Enum() *FieldDescriptorProto_Type {
+	p := new(FieldDescriptorProto_Type)
+	*p = x
+	return p
+}
+func (x FieldDescriptorProto_Type) String() string {
+	return proto.EnumName(FieldDescriptorProto_Type_name, int32(x))
+}
+func (x *FieldDescriptorProto_Type) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Type_value, data, "FieldDescriptorProto_Type")
+	if err != nil {
+		return err
+	}
+	*x = FieldDescriptorProto_Type(value)
+	return nil
+}
+func (FieldDescriptorProto_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 0} }
+
+type FieldDescriptorProto_Label int32
+
+const (
+	// 0 is reserved for errors
+	FieldDescriptorProto_LABEL_OPTIONAL FieldDescriptorProto_Label = 1
+	FieldDescriptorProto_LABEL_REQUIRED FieldDescriptorProto_Label = 2
+	FieldDescriptorProto_LABEL_REPEATED FieldDescriptorProto_Label = 3
+)
+
+var FieldDescriptorProto_Label_name = map[int32]string{
+	1: "LABEL_OPTIONAL",
+	2: "LABEL_REQUIRED",
+	3: "LABEL_REPEATED",
+}
+var FieldDescriptorProto_Label_value = map[string]int32{
+	"LABEL_OPTIONAL": 1,
+	"LABEL_REQUIRED": 2,
+	"LABEL_REPEATED": 3,
+}
+
+func (x FieldDescriptorProto_Label) Enum() *FieldDescriptorProto_Label {
+	p := new(FieldDescriptorProto_Label)
+	*p = x
+	return p
+}
+func (x FieldDescriptorProto_Label) String() string {
+	return proto.EnumName(FieldDescriptorProto_Label_name, int32(x))
+}
+func (x *FieldDescriptorProto_Label) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Label_value, data, "FieldDescriptorProto_Label")
+	if err != nil {
+		return err
+	}
+	*x = FieldDescriptorProto_Label(value)
+	return nil
+}
+func (FieldDescriptorProto_Label) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{3, 1}
+}
+
+// Generated classes can be optimized for speed or code size.
+type FileOptions_OptimizeMode int32
+
+const (
+	FileOptions_SPEED FileOptions_OptimizeMode = 1
+	// etc.
+	FileOptions_CODE_SIZE    FileOptions_OptimizeMode = 2
+	FileOptions_LITE_RUNTIME FileOptions_OptimizeMode = 3
+)
+
+var FileOptions_OptimizeMode_name = map[int32]string{
+	1: "SPEED",
+	2: "CODE_SIZE",
+	3: "LITE_RUNTIME",
+}
+var FileOptions_OptimizeMode_value = map[string]int32{
+	"SPEED":        1,
+	"CODE_SIZE":    2,
+	"LITE_RUNTIME": 3,
+}
+
+func (x FileOptions_OptimizeMode) Enum() *FileOptions_OptimizeMode {
+	p := new(FileOptions_OptimizeMode)
+	*p = x
+	return p
+}
+func (x FileOptions_OptimizeMode) String() string {
+	return proto.EnumName(FileOptions_OptimizeMode_name, int32(x))
+}
+func (x *FileOptions_OptimizeMode) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FileOptions_OptimizeMode_value, data, "FileOptions_OptimizeMode")
+	if err != nil {
+		return err
+	}
+	*x = FileOptions_OptimizeMode(value)
+	return nil
+}
+func (FileOptions_OptimizeMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} }
+
+type FieldOptions_CType int32
+
+const (
+	// Default mode.
+	FieldOptions_STRING       FieldOptions_CType = 0
+	FieldOptions_CORD         FieldOptions_CType = 1
+	FieldOptions_STRING_PIECE FieldOptions_CType = 2
+)
+
+var FieldOptions_CType_name = map[int32]string{
+	0: "STRING",
+	1: "CORD",
+	2: "STRING_PIECE",
+}
+var FieldOptions_CType_value = map[string]int32{
+	"STRING":       0,
+	"CORD":         1,
+	"STRING_PIECE": 2,
+}
+
+func (x FieldOptions_CType) Enum() *FieldOptions_CType {
+	p := new(FieldOptions_CType)
+	*p = x
+	return p
+}
+func (x FieldOptions_CType) String() string {
+	return proto.EnumName(FieldOptions_CType_name, int32(x))
+}
+func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FieldOptions_CType_value, data, "FieldOptions_CType")
+	if err != nil {
+		return err
+	}
+	*x = FieldOptions_CType(value)
+	return nil
+}
+func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{11, 0} }
+
+// The protocol compiler can output a FileDescriptorSet containing the .proto
+// files it parses.
+type FileDescriptorSet struct {
+	File             []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
+	XXX_unrecognized []byte                 `json:"-"`
+}
+
+func (m *FileDescriptorSet) Reset()                    { *m = FileDescriptorSet{} }
+func (m *FileDescriptorSet) String() string            { return proto.CompactTextString(m) }
+func (*FileDescriptorSet) ProtoMessage()               {}
+func (*FileDescriptorSet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *FileDescriptorSet) GetFile() []*FileDescriptorProto {
+	if m != nil {
+		return m.File
+	}
+	return nil
+}
+
+// Describes a complete .proto file.
+type FileDescriptorProto struct {
+	Name    *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Package *string `protobuf:"bytes,2,opt,name=package" json:"package,omitempty"`
+	// Names of files imported by this file.
+	Dependency []string `protobuf:"bytes,3,rep,name=dependency" json:"dependency,omitempty"`
+	// Indexes of the public imported files in the dependency list above.
+	PublicDependency []int32 `protobuf:"varint,10,rep,name=public_dependency" json:"public_dependency,omitempty"`
+	// Indexes of the weak imported files in the dependency list.
+	// For Google-internal migration only. Do not use.
+	WeakDependency []int32 `protobuf:"varint,11,rep,name=weak_dependency" json:"weak_dependency,omitempty"`
+	// All top-level definitions in this file.
+	MessageType []*DescriptorProto        `protobuf:"bytes,4,rep,name=message_type" json:"message_type,omitempty"`
+	EnumType    []*EnumDescriptorProto    `protobuf:"bytes,5,rep,name=enum_type" json:"enum_type,omitempty"`
+	Service     []*ServiceDescriptorProto `protobuf:"bytes,6,rep,name=service" json:"service,omitempty"`
+	Extension   []*FieldDescriptorProto   `protobuf:"bytes,7,rep,name=extension" json:"extension,omitempty"`
+	Options     *FileOptions              `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
+	// This field contains optional information about the original source code.
+	// You may safely remove this entire field without harming runtime
+	// functionality of the descriptors -- the information is needed only by
+	// development tools.
+	SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info" json:"source_code_info,omitempty"`
+	// The syntax of the proto file.
+	// The supported values are "proto2" and "proto3".
+	Syntax           *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *FileDescriptorProto) Reset()                    { *m = FileDescriptorProto{} }
+func (m *FileDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*FileDescriptorProto) ProtoMessage()               {}
+func (*FileDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *FileDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *FileDescriptorProto) GetPackage() string {
+	if m != nil && m.Package != nil {
+		return *m.Package
+	}
+	return ""
+}
+
+func (m *FileDescriptorProto) GetDependency() []string {
+	if m != nil {
+		return m.Dependency
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetPublicDependency() []int32 {
+	if m != nil {
+		return m.PublicDependency
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetWeakDependency() []int32 {
+	if m != nil {
+		return m.WeakDependency
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetMessageType() []*DescriptorProto {
+	if m != nil {
+		return m.MessageType
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetEnumType() []*EnumDescriptorProto {
+	if m != nil {
+		return m.EnumType
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetService() []*ServiceDescriptorProto {
+	if m != nil {
+		return m.Service
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetExtension() []*FieldDescriptorProto {
+	if m != nil {
+		return m.Extension
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetOptions() *FileOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetSourceCodeInfo() *SourceCodeInfo {
+	if m != nil {
+		return m.SourceCodeInfo
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetSyntax() string {
+	if m != nil && m.Syntax != nil {
+		return *m.Syntax
+	}
+	return ""
+}
+
+// Describes a message type.
+type DescriptorProto struct {
+	Name             *string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Field            []*FieldDescriptorProto           `protobuf:"bytes,2,rep,name=field" json:"field,omitempty"`
+	Extension        []*FieldDescriptorProto           `protobuf:"bytes,6,rep,name=extension" json:"extension,omitempty"`
+	NestedType       []*DescriptorProto                `protobuf:"bytes,3,rep,name=nested_type" json:"nested_type,omitempty"`
+	EnumType         []*EnumDescriptorProto            `protobuf:"bytes,4,rep,name=enum_type" json:"enum_type,omitempty"`
+	ExtensionRange   []*DescriptorProto_ExtensionRange `protobuf:"bytes,5,rep,name=extension_range" json:"extension_range,omitempty"`
+	OneofDecl        []*OneofDescriptorProto           `protobuf:"bytes,8,rep,name=oneof_decl" json:"oneof_decl,omitempty"`
+	Options          *MessageOptions                   `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte                            `json:"-"`
+}
+
+func (m *DescriptorProto) Reset()                    { *m = DescriptorProto{} }
+func (m *DescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*DescriptorProto) ProtoMessage()               {}
+func (*DescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+
+func (m *DescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *DescriptorProto) GetField() []*FieldDescriptorProto {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetExtension() []*FieldDescriptorProto {
+	if m != nil {
+		return m.Extension
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetNestedType() []*DescriptorProto {
+	if m != nil {
+		return m.NestedType
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetEnumType() []*EnumDescriptorProto {
+	if m != nil {
+		return m.EnumType
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetExtensionRange() []*DescriptorProto_ExtensionRange {
+	if m != nil {
+		return m.ExtensionRange
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetOneofDecl() []*OneofDescriptorProto {
+	if m != nil {
+		return m.OneofDecl
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetOptions() *MessageOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+type DescriptorProto_ExtensionRange struct {
+	Start            *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End              *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	XXX_unrecognized []byte `json:"-"`
+}
+
+func (m *DescriptorProto_ExtensionRange) Reset()         { *m = DescriptorProto_ExtensionRange{} }
+func (m *DescriptorProto_ExtensionRange) String() string { return proto.CompactTextString(m) }
+func (*DescriptorProto_ExtensionRange) ProtoMessage()    {}
+func (*DescriptorProto_ExtensionRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{2, 0}
+}
+
+func (m *DescriptorProto_ExtensionRange) GetStart() int32 {
+	if m != nil && m.Start != nil {
+		return *m.Start
+	}
+	return 0
+}
+
+func (m *DescriptorProto_ExtensionRange) GetEnd() int32 {
+	if m != nil && m.End != nil {
+		return *m.End
+	}
+	return 0
+}
+
+// Describes a field within a message.
+type FieldDescriptorProto struct {
+	Name   *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Number *int32                      `protobuf:"varint,3,opt,name=number" json:"number,omitempty"`
+	Label  *FieldDescriptorProto_Label `protobuf:"varint,4,opt,name=label,enum=google.protobuf.FieldDescriptorProto_Label" json:"label,omitempty"`
+	// If type_name is set, this need not be set.  If both this and type_name
+	// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
+	Type *FieldDescriptorProto_Type `protobuf:"varint,5,opt,name=type,enum=google.protobuf.FieldDescriptorProto_Type" json:"type,omitempty"`
+	// For message and enum types, this is the name of the type.  If the name
+	// starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
+	// rules are used to find the type (i.e. first the nested types within this
+	// message are searched, then within the parent, on up to the root
+	// namespace).
+	TypeName *string `protobuf:"bytes,6,opt,name=type_name" json:"type_name,omitempty"`
+	// For extensions, this is the name of the type being extended.  It is
+	// resolved in the same manner as type_name.
+	Extendee *string `protobuf:"bytes,2,opt,name=extendee" json:"extendee,omitempty"`
+	// For numeric types, contains the original text representation of the value.
+	// For booleans, "true" or "false".
+	// For strings, contains the default text contents (not escaped in any way).
+	// For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
+	// TODO(kenton):  Base-64 encode?
+	DefaultValue *string `protobuf:"bytes,7,opt,name=default_value" json:"default_value,omitempty"`
+	// If set, gives the index of a oneof in the containing type's oneof_decl
+	// list.  This field is a member of that oneof.  Extensions of a oneof should
+	// not set this since the oneof to which they belong will be inferred based
+	// on the extension range containing the extension's field number.
+	OneofIndex *int32 `protobuf:"varint,9,opt,name=oneof_index" json:"oneof_index,omitempty"`
+	// JSON name of this field. The value is set by protocol compiler. If the
+	// user has set a "json_name" option on this field, that option's value
+	// will be used. Otherwise, it's deduced from the field's name by converting
+	// it to camelCase.
+	JsonName         *string       `protobuf:"bytes,10,opt,name=json_name" json:"json_name,omitempty"`
+	Options          *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte        `json:"-"`
+}
+
+func (m *FieldDescriptorProto) Reset()                    { *m = FieldDescriptorProto{} }
+func (m *FieldDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*FieldDescriptorProto) ProtoMessage()               {}
+func (*FieldDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+
+func (m *FieldDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetNumber() int32 {
+	if m != nil && m.Number != nil {
+		return *m.Number
+	}
+	return 0
+}
+
+func (m *FieldDescriptorProto) GetLabel() FieldDescriptorProto_Label {
+	if m != nil && m.Label != nil {
+		return *m.Label
+	}
+	return FieldDescriptorProto_LABEL_OPTIONAL
+}
+
+func (m *FieldDescriptorProto) GetType() FieldDescriptorProto_Type {
+	if m != nil && m.Type != nil {
+		return *m.Type
+	}
+	return FieldDescriptorProto_TYPE_DOUBLE
+}
+
+func (m *FieldDescriptorProto) GetTypeName() string {
+	if m != nil && m.TypeName != nil {
+		return *m.TypeName
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetExtendee() string {
+	if m != nil && m.Extendee != nil {
+		return *m.Extendee
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetDefaultValue() string {
+	if m != nil && m.DefaultValue != nil {
+		return *m.DefaultValue
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetOneofIndex() int32 {
+	if m != nil && m.OneofIndex != nil {
+		return *m.OneofIndex
+	}
+	return 0
+}
+
+func (m *FieldDescriptorProto) GetJsonName() string {
+	if m != nil && m.JsonName != nil {
+		return *m.JsonName
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetOptions() *FieldOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+// Describes a oneof.
+type OneofDescriptorProto struct {
+	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *OneofDescriptorProto) Reset()                    { *m = OneofDescriptorProto{} }
+func (m *OneofDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*OneofDescriptorProto) ProtoMessage()               {}
+func (*OneofDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+
+func (m *OneofDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+// Describes an enum type.
+type EnumDescriptorProto struct {
+	Name             *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Value            []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
+	Options          *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte                      `json:"-"`
+}
+
+func (m *EnumDescriptorProto) Reset()                    { *m = EnumDescriptorProto{} }
+func (m *EnumDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*EnumDescriptorProto) ProtoMessage()               {}
+func (*EnumDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+
+func (m *EnumDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *EnumDescriptorProto) GetValue() []*EnumValueDescriptorProto {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+func (m *EnumDescriptorProto) GetOptions() *EnumOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+// Describes a value within an enum.
+type EnumValueDescriptorProto struct {
+	Name             *string           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Number           *int32            `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
+	Options          *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte            `json:"-"`
+}
+
+func (m *EnumValueDescriptorProto) Reset()                    { *m = EnumValueDescriptorProto{} }
+func (m *EnumValueDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*EnumValueDescriptorProto) ProtoMessage()               {}
+func (*EnumValueDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+
+func (m *EnumValueDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *EnumValueDescriptorProto) GetNumber() int32 {
+	if m != nil && m.Number != nil {
+		return *m.Number
+	}
+	return 0
+}
+
+func (m *EnumValueDescriptorProto) GetOptions() *EnumValueOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+// Describes a service.
+type ServiceDescriptorProto struct {
+	Name             *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Method           []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
+	Options          *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte                   `json:"-"`
+}
+
+func (m *ServiceDescriptorProto) Reset()                    { *m = ServiceDescriptorProto{} }
+func (m *ServiceDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*ServiceDescriptorProto) ProtoMessage()               {}
+func (*ServiceDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+
+func (m *ServiceDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *ServiceDescriptorProto) GetMethod() []*MethodDescriptorProto {
+	if m != nil {
+		return m.Method
+	}
+	return nil
+}
+
+func (m *ServiceDescriptorProto) GetOptions() *ServiceOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+// Describes a method of a service.
+type MethodDescriptorProto struct {
+	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// Input and output type names.  These are resolved in the same way as
+	// FieldDescriptorProto.type_name, but must refer to a message type.
+	InputType  *string        `protobuf:"bytes,2,opt,name=input_type" json:"input_type,omitempty"`
+	OutputType *string        `protobuf:"bytes,3,opt,name=output_type" json:"output_type,omitempty"`
+	Options    *MethodOptions `protobuf:"bytes,4,opt,name=options" json:"options,omitempty"`
+	// Identifies if client streams multiple client messages
+	ClientStreaming *bool `protobuf:"varint,5,opt,name=client_streaming,def=0" json:"client_streaming,omitempty"`
+	// Identifies if server streams multiple server messages
+	ServerStreaming  *bool  `protobuf:"varint,6,opt,name=server_streaming,def=0" json:"server_streaming,omitempty"`
+	XXX_unrecognized []byte `json:"-"`
+}
+
+func (m *MethodDescriptorProto) Reset()                    { *m = MethodDescriptorProto{} }
+func (m *MethodDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*MethodDescriptorProto) ProtoMessage()               {}
+func (*MethodDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+
+const Default_MethodDescriptorProto_ClientStreaming bool = false
+const Default_MethodDescriptorProto_ServerStreaming bool = false
+
+func (m *MethodDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *MethodDescriptorProto) GetInputType() string {
+	if m != nil && m.InputType != nil {
+		return *m.InputType
+	}
+	return ""
+}
+
+func (m *MethodDescriptorProto) GetOutputType() string {
+	if m != nil && m.OutputType != nil {
+		return *m.OutputType
+	}
+	return ""
+}
+
+func (m *MethodDescriptorProto) GetOptions() *MethodOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+func (m *MethodDescriptorProto) GetClientStreaming() bool {
+	if m != nil && m.ClientStreaming != nil {
+		return *m.ClientStreaming
+	}
+	return Default_MethodDescriptorProto_ClientStreaming
+}
+
+func (m *MethodDescriptorProto) GetServerStreaming() bool {
+	if m != nil && m.ServerStreaming != nil {
+		return *m.ServerStreaming
+	}
+	return Default_MethodDescriptorProto_ServerStreaming
+}
+
+type FileOptions struct {
+	// Sets the Java package where classes generated from this .proto will be
+	// placed.  By default, the proto package is used, but this is often
+	// inappropriate because proto packages do not normally start with backwards
+	// domain names.
+	JavaPackage *string `protobuf:"bytes,1,opt,name=java_package" json:"java_package,omitempty"`
+	// If set, all the classes from the .proto file are wrapped in a single
+	// outer class with the given name.  This applies to both Proto1
+	// (equivalent to the old "--one_java_file" option) and Proto2 (where
+	// a .proto always translates to a single class, but you may want to
+	// explicitly choose the class name).
+	JavaOuterClassname *string `protobuf:"bytes,8,opt,name=java_outer_classname" json:"java_outer_classname,omitempty"`
+	// If set true, then the Java code generator will generate a separate .java
+	// file for each top-level message, enum, and service defined in the .proto
+	// file.  Thus, these types will *not* be nested inside the outer class
+	// named by java_outer_classname.  However, the outer class will still be
+	// generated to contain the file's getDescriptor() method as well as any
+	// top-level extensions defined in the file.
+	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,def=0" json:"java_multiple_files,omitempty"`
+	// If set true, then the Java code generator will generate equals() and
+	// hashCode() methods for all messages defined in the .proto file.
+	// - In the full runtime, this is purely a speed optimization, as the
+	// AbstractMessage base class includes reflection-based implementations of
+	// these methods.
+	// - In the lite runtime, setting this option changes the semantics of
+	// equals() and hashCode() to more closely match those of the full runtime;
+	// the generated methods compute their results based on field values rather
+	// than object identity. (Implementations should not assume that hashcodes
+	// will be consistent across runtimes or versions of the protocol compiler.)
+	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,def=0" json:"java_generate_equals_and_hash,omitempty"`
+	// If set true, then the Java2 code generator will generate code that
+	// throws an exception whenever an attempt is made to assign a non-UTF-8
+	// byte sequence to a string field.
+	// Message reflection will do the same.
+	// However, an extension field still accepts non-UTF-8 byte sequences.
+	// This option has no effect on when used with the lite runtime.
+	JavaStringCheckUtf8 *bool                     `protobuf:"varint,27,opt,name=java_string_check_utf8,def=0" json:"java_string_check_utf8,omitempty"`
+	OptimizeFor         *FileOptions_OptimizeMode `protobuf:"varint,9,opt,name=optimize_for,enum=google.protobuf.FileOptions_OptimizeMode,def=1" json:"optimize_for,omitempty"`
+	// Sets the Go package where structs generated from this .proto will be
+	// placed. If omitted, the Go package will be derived from the following:
+	//   - The basename of the package import path, if provided.
+	//   - Otherwise, the package statement in the .proto file, if present.
+	//   - Otherwise, the basename of the .proto file, without extension.
+	GoPackage *string `protobuf:"bytes,11,opt,name=go_package" json:"go_package,omitempty"`
+	// Should generic services be generated in each language?  "Generic" services
+	// are not specific to any particular RPC system.  They are generated by the
+	// main code generators in each language (without additional plugins).
+	// Generic services were the only kind of service generation supported by
+	// early versions of google.protobuf.
+	//
+	// Generic services are now considered deprecated in favor of using plugins
+	// that generate code specific to your particular RPC system.  Therefore,
+	// these default to false.  Old code which depends on generic services should
+	// explicitly set them to true.
+	CcGenericServices   *bool `protobuf:"varint,16,opt,name=cc_generic_services,def=0" json:"cc_generic_services,omitempty"`
+	JavaGenericServices *bool `protobuf:"varint,17,opt,name=java_generic_services,def=0" json:"java_generic_services,omitempty"`
+	PyGenericServices   *bool `protobuf:"varint,18,opt,name=py_generic_services,def=0" json:"py_generic_services,omitempty"`
+	// Is this file deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for everything in the file, or it will be completely ignored; in the very
+	// least, this is a formalization for deprecating files.
+	Deprecated *bool `protobuf:"varint,23,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// Enables the use of arenas for the proto messages in this file. This applies
+	// only to generated classes for C++.
+	CcEnableArenas *bool `protobuf:"varint,31,opt,name=cc_enable_arenas,def=0" json:"cc_enable_arenas,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *FileOptions) Reset()                    { *m = FileOptions{} }
+func (m *FileOptions) String() string            { return proto.CompactTextString(m) }
+func (*FileOptions) ProtoMessage()               {}
+func (*FileOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+
+var extRange_FileOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*FileOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_FileOptions
+}
+func (m *FileOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_FileOptions_JavaMultipleFiles bool = false
+const Default_FileOptions_JavaGenerateEqualsAndHash bool = false
+const Default_FileOptions_JavaStringCheckUtf8 bool = false
+const Default_FileOptions_OptimizeFor FileOptions_OptimizeMode = FileOptions_SPEED
+const Default_FileOptions_CcGenericServices bool = false
+const Default_FileOptions_JavaGenericServices bool = false
+const Default_FileOptions_PyGenericServices bool = false
+const Default_FileOptions_Deprecated bool = false
+const Default_FileOptions_CcEnableArenas bool = false
+
+func (m *FileOptions) GetJavaPackage() string {
+	if m != nil && m.JavaPackage != nil {
+		return *m.JavaPackage
+	}
+	return ""
+}
+
+func (m *FileOptions) GetJavaOuterClassname() string {
+	if m != nil && m.JavaOuterClassname != nil {
+		return *m.JavaOuterClassname
+	}
+	return ""
+}
+
+func (m *FileOptions) GetJavaMultipleFiles() bool {
+	if m != nil && m.JavaMultipleFiles != nil {
+		return *m.JavaMultipleFiles
+	}
+	return Default_FileOptions_JavaMultipleFiles
+}
+
+func (m *FileOptions) GetJavaGenerateEqualsAndHash() bool {
+	if m != nil && m.JavaGenerateEqualsAndHash != nil {
+		return *m.JavaGenerateEqualsAndHash
+	}
+	return Default_FileOptions_JavaGenerateEqualsAndHash
+}
+
+func (m *FileOptions) GetJavaStringCheckUtf8() bool {
+	if m != nil && m.JavaStringCheckUtf8 != nil {
+		return *m.JavaStringCheckUtf8
+	}
+	return Default_FileOptions_JavaStringCheckUtf8
+}
+
+func (m *FileOptions) GetOptimizeFor() FileOptions_OptimizeMode {
+	if m != nil && m.OptimizeFor != nil {
+		return *m.OptimizeFor
+	}
+	return Default_FileOptions_OptimizeFor
+}
+
+func (m *FileOptions) GetGoPackage() string {
+	if m != nil && m.GoPackage != nil {
+		return *m.GoPackage
+	}
+	return ""
+}
+
+func (m *FileOptions) GetCcGenericServices() bool {
+	if m != nil && m.CcGenericServices != nil {
+		return *m.CcGenericServices
+	}
+	return Default_FileOptions_CcGenericServices
+}
+
+func (m *FileOptions) GetJavaGenericServices() bool {
+	if m != nil && m.JavaGenericServices != nil {
+		return *m.JavaGenericServices
+	}
+	return Default_FileOptions_JavaGenericServices
+}
+
+func (m *FileOptions) GetPyGenericServices() bool {
+	if m != nil && m.PyGenericServices != nil {
+		return *m.PyGenericServices
+	}
+	return Default_FileOptions_PyGenericServices
+}
+
+func (m *FileOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_FileOptions_Deprecated
+}
+
+func (m *FileOptions) GetCcEnableArenas() bool {
+	if m != nil && m.CcEnableArenas != nil {
+		return *m.CcEnableArenas
+	}
+	return Default_FileOptions_CcEnableArenas
+}
+
+func (m *FileOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type MessageOptions struct {
+	// Set true to use the old proto1 MessageSet wire format for extensions.
+	// This is provided for backwards-compatibility with the MessageSet wire
+	// format.  You should not use this for any other reason:  It's less
+	// efficient, has fewer features, and is more complicated.
+	//
+	// The message must be defined exactly as follows:
+	//   message Foo {
+	//     option message_set_wire_format = true;
+	//     extensions 4 to max;
+	//   }
+	// Note that the message cannot have any defined fields; MessageSets only
+	// have extensions.
+	//
+	// All extensions of your type must be singular messages; e.g. they cannot
+	// be int32s, enums, or repeated messages.
+	//
+	// Because this is an option, the above two restrictions are not enforced by
+	// the protocol compiler.
+	MessageSetWireFormat *bool `protobuf:"varint,1,opt,name=message_set_wire_format,def=0" json:"message_set_wire_format,omitempty"`
+	// Disables the generation of the standard "descriptor()" accessor, which can
+	// conflict with a field of the same name.  This is meant to make migration
+	// from proto1 easier; new code should avoid fields named "descriptor".
+	NoStandardDescriptorAccessor *bool `protobuf:"varint,2,opt,name=no_standard_descriptor_accessor,def=0" json:"no_standard_descriptor_accessor,omitempty"`
+	// Is this message deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the message, or it will be completely ignored; in the very least,
+	// this is a formalization for deprecating messages.
+	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// Whether the message is an automatically generated map entry type for the
+	// maps field.
+	//
+	// For maps fields:
+	//     map<KeyType, ValueType> map_field = 1;
+	// The parsed descriptor looks like:
+	//     message MapFieldEntry {
+	//         option map_entry = true;
+	//         optional KeyType key = 1;
+	//         optional ValueType value = 2;
+	//     }
+	//     repeated MapFieldEntry map_field = 1;
+	//
+	// Implementations may choose not to generate the map_entry=true message, but
+	// use a native map in the target language to hold the keys and values.
+	// The reflection APIs in such implementions still need to work as
+	// if the field is a repeated message field.
+	//
+	// NOTE: Do not set the option in .proto files. Always use the maps syntax
+	// instead. The option should only be implicitly set by the proto compiler
+	// parser.
+	MapEntry *bool `protobuf:"varint,7,opt,name=map_entry" json:"map_entry,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *MessageOptions) Reset()                    { *m = MessageOptions{} }
+func (m *MessageOptions) String() string            { return proto.CompactTextString(m) }
+func (*MessageOptions) ProtoMessage()               {}
+func (*MessageOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+
+var extRange_MessageOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*MessageOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_MessageOptions
+}
+func (m *MessageOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_MessageOptions_MessageSetWireFormat bool = false
+const Default_MessageOptions_NoStandardDescriptorAccessor bool = false
+const Default_MessageOptions_Deprecated bool = false
+
+func (m *MessageOptions) GetMessageSetWireFormat() bool {
+	if m != nil && m.MessageSetWireFormat != nil {
+		return *m.MessageSetWireFormat
+	}
+	return Default_MessageOptions_MessageSetWireFormat
+}
+
+func (m *MessageOptions) GetNoStandardDescriptorAccessor() bool {
+	if m != nil && m.NoStandardDescriptorAccessor != nil {
+		return *m.NoStandardDescriptorAccessor
+	}
+	return Default_MessageOptions_NoStandardDescriptorAccessor
+}
+
+func (m *MessageOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_MessageOptions_Deprecated
+}
+
+func (m *MessageOptions) GetMapEntry() bool {
+	if m != nil && m.MapEntry != nil {
+		return *m.MapEntry
+	}
+	return false
+}
+
+func (m *MessageOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type FieldOptions struct {
+	// The ctype option instructs the C++ code generator to use a different
+	// representation of the field than it normally would.  See the specific
+	// options below.  This option is not yet implemented in the open source
+	// release -- sorry, we'll try to include it in a future version!
+	Ctype *FieldOptions_CType `protobuf:"varint,1,opt,name=ctype,enum=google.protobuf.FieldOptions_CType,def=0" json:"ctype,omitempty"`
+	// The packed option can be enabled for repeated primitive fields to enable
+	// a more efficient representation on the wire. Rather than repeatedly
+	// writing the tag and type for each element, the entire array is encoded as
+	// a single length-delimited blob.
+	Packed *bool `protobuf:"varint,2,opt,name=packed" json:"packed,omitempty"`
+	// Should this field be parsed lazily?  Lazy applies only to message-type
+	// fields.  It means that when the outer message is initially parsed, the
+	// inner message's contents will not be parsed but instead stored in encoded
+	// form.  The inner message will actually be parsed when it is first accessed.
+	//
+	// This is only a hint.  Implementations are free to choose whether to use
+	// eager or lazy parsing regardless of the value of this option.  However,
+	// setting this option true suggests that the protocol author believes that
+	// using lazy parsing on this field is worth the additional bookkeeping
+	// overhead typically needed to implement it.
+	//
+	// This option does not affect the public interface of any generated code;
+	// all method signatures remain the same.  Furthermore, thread-safety of the
+	// interface is not affected by this option; const methods remain safe to
+	// call from multiple threads concurrently, while non-const methods continue
+	// to require exclusive access.
+	//
+	//
+	// Note that implementations may choose not to check required fields within
+	// a lazy sub-message.  That is, calling IsInitialized() on the outher message
+	// may return true even if the inner message has missing required fields.
+	// This is necessary because otherwise the inner message would have to be
+	// parsed in order to perform the check, defeating the purpose of lazy
+	// parsing.  An implementation which chooses not to check required fields
+	// must be consistent about it.  That is, for any particular sub-message, the
+	// implementation must either *always* check its required fields, or *never*
+	// check its required fields, regardless of whether or not the message has
+	// been parsed.
+	Lazy *bool `protobuf:"varint,5,opt,name=lazy,def=0" json:"lazy,omitempty"`
+	// Is this field deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for accessors, or it will be completely ignored; in the very least, this
+	// is a formalization for deprecating fields.
+	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// For Google-internal migration only. Do not use.
+	Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *FieldOptions) Reset()                    { *m = FieldOptions{} }
+func (m *FieldOptions) String() string            { return proto.CompactTextString(m) }
+func (*FieldOptions) ProtoMessage()               {}
+func (*FieldOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+
+var extRange_FieldOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*FieldOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_FieldOptions
+}
+func (m *FieldOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_FieldOptions_Ctype FieldOptions_CType = FieldOptions_STRING
+const Default_FieldOptions_Lazy bool = false
+const Default_FieldOptions_Deprecated bool = false
+const Default_FieldOptions_Weak bool = false
+
+func (m *FieldOptions) GetCtype() FieldOptions_CType {
+	if m != nil && m.Ctype != nil {
+		return *m.Ctype
+	}
+	return Default_FieldOptions_Ctype
+}
+
+func (m *FieldOptions) GetPacked() bool {
+	if m != nil && m.Packed != nil {
+		return *m.Packed
+	}
+	return false
+}
+
+func (m *FieldOptions) GetLazy() bool {
+	if m != nil && m.Lazy != nil {
+		return *m.Lazy
+	}
+	return Default_FieldOptions_Lazy
+}
+
+func (m *FieldOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_FieldOptions_Deprecated
+}
+
+func (m *FieldOptions) GetWeak() bool {
+	if m != nil && m.Weak != nil {
+		return *m.Weak
+	}
+	return Default_FieldOptions_Weak
+}
+
+func (m *FieldOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type EnumOptions struct {
+	// Set this option to true to allow mapping different tag names to the same
+	// value.
+	AllowAlias *bool `protobuf:"varint,2,opt,name=allow_alias" json:"allow_alias,omitempty"`
+	// Is this enum deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the enum, or it will be completely ignored; in the very least, this
+	// is a formalization for deprecating enums.
+	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *EnumOptions) Reset()                    { *m = EnumOptions{} }
+func (m *EnumOptions) String() string            { return proto.CompactTextString(m) }
+func (*EnumOptions) ProtoMessage()               {}
+func (*EnumOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+
+var extRange_EnumOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*EnumOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_EnumOptions
+}
+func (m *EnumOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_EnumOptions_Deprecated bool = false
+
+func (m *EnumOptions) GetAllowAlias() bool {
+	if m != nil && m.AllowAlias != nil {
+		return *m.AllowAlias
+	}
+	return false
+}
+
+func (m *EnumOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_EnumOptions_Deprecated
+}
+
+func (m *EnumOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type EnumValueOptions struct {
+	// Is this enum value deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the enum value, or it will be completely ignored; in the very least,
+	// this is a formalization for deprecating enum values.
+	Deprecated *bool `protobuf:"varint,1,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *EnumValueOptions) Reset()                    { *m = EnumValueOptions{} }
+func (m *EnumValueOptions) String() string            { return proto.CompactTextString(m) }
+func (*EnumValueOptions) ProtoMessage()               {}
+func (*EnumValueOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+
+var extRange_EnumValueOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*EnumValueOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_EnumValueOptions
+}
+func (m *EnumValueOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_EnumValueOptions_Deprecated bool = false
+
+func (m *EnumValueOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_EnumValueOptions_Deprecated
+}
+
+func (m *EnumValueOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type ServiceOptions struct {
+	// Is this service deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the service, or it will be completely ignored; in the very least,
+	// this is a formalization for deprecating services.
+	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *ServiceOptions) Reset()                    { *m = ServiceOptions{} }
+func (m *ServiceOptions) String() string            { return proto.CompactTextString(m) }
+func (*ServiceOptions) ProtoMessage()               {}
+func (*ServiceOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+
+var extRange_ServiceOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*ServiceOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_ServiceOptions
+}
+func (m *ServiceOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_ServiceOptions_Deprecated bool = false
+
+func (m *ServiceOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_ServiceOptions_Deprecated
+}
+
+func (m *ServiceOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type MethodOptions struct {
+	// Is this method deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the method, or it will be completely ignored; in the very least,
+	// this is a formalization for deprecating methods.
+	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *MethodOptions) Reset()                    { *m = MethodOptions{} }
+func (m *MethodOptions) String() string            { return proto.CompactTextString(m) }
+func (*MethodOptions) ProtoMessage()               {}
+func (*MethodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+
+var extRange_MethodOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*MethodOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_MethodOptions
+}
+func (m *MethodOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_MethodOptions_Deprecated bool = false
+
+func (m *MethodOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_MethodOptions_Deprecated
+}
+
+func (m *MethodOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+// A message representing a option the parser does not recognize. This only
+// appears in options protos created by the compiler::Parser class.
+// DescriptorPool resolves these when building Descriptor objects. Therefore,
+// options protos in descriptor objects (e.g. returned by Descriptor::options(),
+// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
+// in them.
+type UninterpretedOption struct {
+	Name []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
+	// The value of the uninterpreted option, in whatever type the tokenizer
+	// identified it as during parsing. Exactly one of these should be set.
+	IdentifierValue  *string  `protobuf:"bytes,3,opt,name=identifier_value" json:"identifier_value,omitempty"`
+	PositiveIntValue *uint64  `protobuf:"varint,4,opt,name=positive_int_value" json:"positive_int_value,omitempty"`
+	NegativeIntValue *int64   `protobuf:"varint,5,opt,name=negative_int_value" json:"negative_int_value,omitempty"`
+	DoubleValue      *float64 `protobuf:"fixed64,6,opt,name=double_value" json:"double_value,omitempty"`
+	StringValue      []byte   `protobuf:"bytes,7,opt,name=string_value" json:"string_value,omitempty"`
+	AggregateValue   *string  `protobuf:"bytes,8,opt,name=aggregate_value" json:"aggregate_value,omitempty"`
+	XXX_unrecognized []byte   `json:"-"`
+}
+
+func (m *UninterpretedOption) Reset()                    { *m = UninterpretedOption{} }
+func (m *UninterpretedOption) String() string            { return proto.CompactTextString(m) }
+func (*UninterpretedOption) ProtoMessage()               {}
+func (*UninterpretedOption) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+
+func (m *UninterpretedOption) GetName() []*UninterpretedOption_NamePart {
+	if m != nil {
+		return m.Name
+	}
+	return nil
+}
+
+func (m *UninterpretedOption) GetIdentifierValue() string {
+	if m != nil && m.IdentifierValue != nil {
+		return *m.IdentifierValue
+	}
+	return ""
+}
+
+func (m *UninterpretedOption) GetPositiveIntValue() uint64 {
+	if m != nil && m.PositiveIntValue != nil {
+		return *m.PositiveIntValue
+	}
+	return 0
+}
+
+func (m *UninterpretedOption) GetNegativeIntValue() int64 {
+	if m != nil && m.NegativeIntValue != nil {
+		return *m.NegativeIntValue
+	}
+	return 0
+}
+
+func (m *UninterpretedOption) GetDoubleValue() float64 {
+	if m != nil && m.DoubleValue != nil {
+		return *m.DoubleValue
+	}
+	return 0
+}
+
+func (m *UninterpretedOption) GetStringValue() []byte {
+	if m != nil {
+		return m.StringValue
+	}
+	return nil
+}
+
+func (m *UninterpretedOption) GetAggregateValue() string {
+	if m != nil && m.AggregateValue != nil {
+		return *m.AggregateValue
+	}
+	return ""
+}
+
+// The name of the uninterpreted option.  Each string represents a segment in
+// a dot-separated name.  is_extension is true iff a segment represents an
+// extension (denoted with parentheses in options specs in .proto files).
+// E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
+// "foo.(bar.baz).qux".
+type UninterpretedOption_NamePart struct {
+	NamePart         *string `protobuf:"bytes,1,req,name=name_part" json:"name_part,omitempty"`
+	IsExtension      *bool   `protobuf:"varint,2,req,name=is_extension" json:"is_extension,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *UninterpretedOption_NamePart) Reset()         { *m = UninterpretedOption_NamePart{} }
+func (m *UninterpretedOption_NamePart) String() string { return proto.CompactTextString(m) }
+func (*UninterpretedOption_NamePart) ProtoMessage()    {}
+func (*UninterpretedOption_NamePart) Descriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{16, 0}
+}
+
+func (m *UninterpretedOption_NamePart) GetNamePart() string {
+	if m != nil && m.NamePart != nil {
+		return *m.NamePart
+	}
+	return ""
+}
+
+func (m *UninterpretedOption_NamePart) GetIsExtension() bool {
+	if m != nil && m.IsExtension != nil {
+		return *m.IsExtension
+	}
+	return false
+}
+
+// Encapsulates information about the original source file from which a
+// FileDescriptorProto was generated.
+type SourceCodeInfo struct {
+	// A Location identifies a piece of source code in a .proto file which
+	// corresponds to a particular definition.  This information is intended
+	// to be useful to IDEs, code indexers, documentation generators, and similar
+	// tools.
+	//
+	// For example, say we have a file like:
+	//   message Foo {
+	//     optional string foo = 1;
+	//   }
+	// Let's look at just the field definition:
+	//   optional string foo = 1;
+	//   ^       ^^     ^^  ^  ^^^
+	//   a       bc     de  f  ghi
+	// We have the following locations:
+	//   span   path               represents
+	//   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
+	//   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
+	//   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
+	//   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
+	//   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
+	//
+	// Notes:
+	// - A location may refer to a repeated field itself (i.e. not to any
+	//   particular index within it).  This is used whenever a set of elements are
+	//   logically enclosed in a single code segment.  For example, an entire
+	//   extend block (possibly containing multiple extension definitions) will
+	//   have an outer location whose path refers to the "extensions" repeated
+	//   field without an index.
+	// - Multiple locations may have the same path.  This happens when a single
+	//   logical declaration is spread out across multiple places.  The most
+	//   obvious example is the "extend" block again -- there may be multiple
+	//   extend blocks in the same scope, each of which will have the same path.
+	// - A location's span is not always a subset of its parent's span.  For
+	//   example, the "extendee" of an extension declaration appears at the
+	//   beginning of the "extend" block and is shared by all extensions within
+	//   the block.
+	// - Just because a location's span is a subset of some other location's span
+	//   does not mean that it is a descendent.  For example, a "group" defines
+	//   both a type and a field in a single declaration.  Thus, the locations
+	//   corresponding to the type and field and their components will overlap.
+	// - Code which tries to interpret locations should probably be designed to
+	//   ignore those that it doesn't understand, as more types of locations could
+	//   be recorded in the future.
+	Location         []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
+	XXX_unrecognized []byte                     `json:"-"`
+}
+
+func (m *SourceCodeInfo) Reset()                    { *m = SourceCodeInfo{} }
+func (m *SourceCodeInfo) String() string            { return proto.CompactTextString(m) }
+func (*SourceCodeInfo) ProtoMessage()               {}
+func (*SourceCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+
+func (m *SourceCodeInfo) GetLocation() []*SourceCodeInfo_Location {
+	if m != nil {
+		return m.Location
+	}
+	return nil
+}
+
+type SourceCodeInfo_Location struct {
+	// Identifies which part of the FileDescriptorProto was defined at this
+	// location.
+	//
+	// Each element is a field number or an index.  They form a path from
+	// the root FileDescriptorProto to the place where the definition.  For
+	// example, this path:
+	//   [ 4, 3, 2, 7, 1 ]
+	// refers to:
+	//   file.message_type(3)  // 4, 3
+	//       .field(7)         // 2, 7
+	//       .name()           // 1
+	// This is because FileDescriptorProto.message_type has field number 4:
+	//   repeated DescriptorProto message_type = 4;
+	// and DescriptorProto.field has field number 2:
+	//   repeated FieldDescriptorProto field = 2;
+	// and FieldDescriptorProto.name has field number 1:
+	//   optional string name = 1;
+	//
+	// Thus, the above path gives the location of a field name.  If we removed
+	// the last element:
+	//   [ 4, 3, 2, 7 ]
+	// this path refers to the whole field declaration (from the beginning
+	// of the label to the terminating semicolon).
+	Path []int32 `protobuf:"varint,1,rep,packed,name=path" json:"path,omitempty"`
+	// Always has exactly three or four elements: start line, start column,
+	// end line (optional, otherwise assumed same as start line), end column.
+	// These are packed into a single field for efficiency.  Note that line
+	// and column numbers are zero-based -- typically you will want to add
+	// 1 to each before displaying to a user.
+	Span []int32 `protobuf:"varint,2,rep,packed,name=span" json:"span,omitempty"`
+	// If this SourceCodeInfo represents a complete declaration, these are any
+	// comments appearing before and after the declaration which appear to be
+	// attached to the declaration.
+	//
+	// A series of line comments appearing on consecutive lines, with no other
+	// tokens appearing on those lines, will be treated as a single comment.
+	//
+	// Only the comment content is provided; comment markers (e.g. //) are
+	// stripped out.  For block comments, leading whitespace and an asterisk
+	// will be stripped from the beginning of each line other than the first.
+	// Newlines are included in the output.
+	//
+	// Examples:
+	//
+	//   optional int32 foo = 1;  // Comment attached to foo.
+	//   // Comment attached to bar.
+	//   optional int32 bar = 2;
+	//
+	//   optional string baz = 3;
+	//   // Comment attached to baz.
+	//   // Another line attached to baz.
+	//
+	//   // Comment attached to qux.
+	//   //
+	//   // Another line attached to qux.
+	//   optional double qux = 4;
+	//
+	//   optional string corge = 5;
+	//   /* Block comment attached
+	//    * to corge.  Leading asterisks
+	//    * will be removed. */
+	//   /* Block comment attached to
+	//    * grault. */
+	//   optional int32 grault = 6;
+	LeadingComments  *string `protobuf:"bytes,3,opt,name=leading_comments" json:"leading_comments,omitempty"`
+	TrailingComments *string `protobuf:"bytes,4,opt,name=trailing_comments" json:"trailing_comments,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *SourceCodeInfo_Location) Reset()                    { *m = SourceCodeInfo_Location{} }
+func (m *SourceCodeInfo_Location) String() string            { return proto.CompactTextString(m) }
+func (*SourceCodeInfo_Location) ProtoMessage()               {}
+func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17, 0} }
+
+func (m *SourceCodeInfo_Location) GetPath() []int32 {
+	if m != nil {
+		return m.Path
+	}
+	return nil
+}
+
+func (m *SourceCodeInfo_Location) GetSpan() []int32 {
+	if m != nil {
+		return m.Span
+	}
+	return nil
+}
+
+func (m *SourceCodeInfo_Location) GetLeadingComments() string {
+	if m != nil && m.LeadingComments != nil {
+		return *m.LeadingComments
+	}
+	return ""
+}
+
+func (m *SourceCodeInfo_Location) GetTrailingComments() string {
+	if m != nil && m.TrailingComments != nil {
+		return *m.TrailingComments
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*FileDescriptorSet)(nil), "google.protobuf.FileDescriptorSet")
+	proto.RegisterType((*FileDescriptorProto)(nil), "google.protobuf.FileDescriptorProto")
+	proto.RegisterType((*DescriptorProto)(nil), "google.protobuf.DescriptorProto")
+	proto.RegisterType((*DescriptorProto_ExtensionRange)(nil), "google.protobuf.DescriptorProto.ExtensionRange")
+	proto.RegisterType((*FieldDescriptorProto)(nil), "google.protobuf.FieldDescriptorProto")
+	proto.RegisterType((*OneofDescriptorProto)(nil), "google.protobuf.OneofDescriptorProto")
+	proto.RegisterType((*EnumDescriptorProto)(nil), "google.protobuf.EnumDescriptorProto")
+	proto.RegisterType((*EnumValueDescriptorProto)(nil), "google.protobuf.EnumValueDescriptorProto")
+	proto.RegisterType((*ServiceDescriptorProto)(nil), "google.protobuf.ServiceDescriptorProto")
+	proto.RegisterType((*MethodDescriptorProto)(nil), "google.protobuf.MethodDescriptorProto")
+	proto.RegisterType((*FileOptions)(nil), "google.protobuf.FileOptions")
+	proto.RegisterType((*MessageOptions)(nil), "google.protobuf.MessageOptions")
+	proto.RegisterType((*FieldOptions)(nil), "google.protobuf.FieldOptions")
+	proto.RegisterType((*EnumOptions)(nil), "google.protobuf.EnumOptions")
+	proto.RegisterType((*EnumValueOptions)(nil), "google.protobuf.EnumValueOptions")
+	proto.RegisterType((*ServiceOptions)(nil), "google.protobuf.ServiceOptions")
+	proto.RegisterType((*MethodOptions)(nil), "google.protobuf.MethodOptions")
+	proto.RegisterType((*UninterpretedOption)(nil), "google.protobuf.UninterpretedOption")
+	proto.RegisterType((*UninterpretedOption_NamePart)(nil), "google.protobuf.UninterpretedOption.NamePart")
+	proto.RegisterType((*SourceCodeInfo)(nil), "google.protobuf.SourceCodeInfo")
+	proto.RegisterType((*SourceCodeInfo_Location)(nil), "google.protobuf.SourceCodeInfo.Location")
+	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Type", FieldDescriptorProto_Type_name, FieldDescriptorProto_Type_value)
+	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Label", FieldDescriptorProto_Label_name, FieldDescriptorProto_Label_value)
+	proto.RegisterEnum("google.protobuf.FileOptions_OptimizeMode", FileOptions_OptimizeMode_name, FileOptions_OptimizeMode_value)
+	proto.RegisterEnum("google.protobuf.FieldOptions_CType", FieldOptions_CType_name, FieldOptions_CType_value)
+}
+
+var fileDescriptor0 = []byte{
+	// 1635 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x72, 0xdb, 0xd4,
+	0x17, 0xff, 0xfb, 0x43, 0xfe, 0x38, 0x76, 0x1c, 0x45, 0x49, 0x5b, 0x35, 0xff, 0x96, 0xb4, 0xa6,
+	0x2d, 0x69, 0x69, 0x1d, 0x26, 0x2d, 0xa5, 0x84, 0x55, 0x3e, 0xd4, 0xd4, 0x33, 0x4e, 0x6c, 0x12,
+	0x87, 0xa1, 0x6c, 0x34, 0x37, 0xf2, 0xb5, 0xa3, 0x56, 0x96, 0x8c, 0x24, 0xa7, 0x4d, 0x19, 0x66,
+	0x78, 0x00, 0x98, 0xe1, 0x09, 0x18, 0x5e, 0x81, 0x0d, 0x2b, 0x36, 0xec, 0x79, 0x03, 0xb6, 0x0c,
+	0xf0, 0x18, 0x9c, 0x7b, 0xaf, 0x25, 0x4b, 0x8a, 0x9d, 0xb6, 0x4c, 0x4b, 0x57, 0xee, 0xb9, 0xbf,
+	0x73, 0xce, 0xef, 0x9e, 0xcf, 0xab, 0xc0, 0x95, 0x9e, 0xe3, 0xf4, 0x2c, 0xba, 0x32, 0x70, 0x1d,
+	0xdf, 0x39, 0x1c, 0x76, 0x57, 0x3a, 0xd4, 0x33, 0x5c, 0x73, 0xe0, 0x3b, 0x6e, 0x8d, 0xcb, 0x94,
+	0x59, 0x81, 0xa8, 0x05, 0x88, 0xea, 0x36, 0xcc, 0x3d, 0x34, 0x2d, 0xba, 0x15, 0x02, 0xf7, 0xa9,
+	0xaf, 0xac, 0x42, 0xb6, 0x8b, 0x42, 0x35, 0x75, 0x25, 0xb3, 0x5c, 0x5a, 0xbd, 0x56, 0x4b, 0x28,
+	0xd5, 0xe2, 0x1a, 0x2d, 0x26, 0xae, 0xfe, 0x9e, 0x81, 0xf9, 0x09, 0x72, 0xa5, 0x0c, 0x59, 0x9b,
+	0xf4, 0x99, 0xad, 0xd4, 0x72, 0x51, 0x99, 0x85, 0xfc, 0x80, 0x18, 0x4f, 0x49, 0x8f, 0xaa, 0x69,
+	0x2e, 0x50, 0x00, 0x3a, 0x74, 0x40, 0xed, 0x0e, 0xb5, 0x8d, 0x13, 0x35, 0x83, 0x0e, 0x8b, 0xca,
+	0x45, 0x98, 0x1b, 0x0c, 0x0f, 0x2d, 0xd3, 0xd0, 0x23, 0x47, 0x80, 0x47, 0x92, 0x72, 0x01, 0x66,
+	0x9f, 0x51, 0xf2, 0x34, 0x7a, 0x50, 0xe2, 0x07, 0xf7, 0xa1, 0xdc, 0xa7, 0x9e, 0x87, 0x86, 0x75,
+	0xff, 0x64, 0x40, 0xd5, 0x2c, 0xa7, 0x7e, 0xe5, 0x14, 0xf5, 0x24, 0xbd, 0x8f, 0xa0, 0x48, 0xed,
+	0x61, 0x5f, 0x28, 0x49, 0x53, 0xee, 0xab, 0x21, 0x22, 0xa9, 0xf8, 0x00, 0xf2, 0x1e, 0x75, 0x8f,
+	0x4d, 0x83, 0xaa, 0x39, 0xae, 0xf6, 0xde, 0x29, 0xb5, 0x7d, 0x71, 0x7e, 0x5a, 0xb3, 0x48, 0x9f,
+	0xfb, 0xd4, 0xf6, 0x4c, 0xc7, 0x56, 0xf3, 0x5c, 0xf7, 0xfa, 0x84, 0x10, 0x53, 0xab, 0x93, 0xd4,
+	0xbc, 0x03, 0x79, 0x67, 0xe0, 0xa3, 0x9a, 0xa7, 0x16, 0x30, 0x7a, 0xa5, 0xd5, 0x4b, 0x13, 0x53,
+	0xd3, 0x14, 0x18, 0xe5, 0x63, 0x90, 0x3d, 0x67, 0xe8, 0x1a, 0x54, 0x37, 0x9c, 0x0e, 0xd5, 0x4d,
+	0xbb, 0xeb, 0xa8, 0x45, 0xae, 0xb7, 0x74, 0x9a, 0x2b, 0x07, 0x6e, 0x22, 0xae, 0x8e, 0x30, 0xa5,
+	0x02, 0x39, 0xef, 0xc4, 0xf6, 0xc9, 0x73, 0xb5, 0xcc, 0xd2, 0x54, 0xfd, 0x23, 0x03, 0xb3, 0x67,
+	0x67, 0xf6, 0x1e, 0x48, 0x5d, 0xc6, 0x19, 0xf3, 0xfa, 0x1a, 0x37, 0x8a, 0xc5, 0x22, 0xf7, 0x3a,
+	0x9a, 0x1f, 0x42, 0xc9, 0xa6, 0x9e, 0x4f, 0x3b, 0x22, 0x75, 0x99, 0x7f, 0x93, 0xef, 0xec, 0x6b,
+	0xe4, 0xfb, 0x11, 0xcc, 0x86, 0x4c, 0x75, 0x97, 0xd8, 0xbd, 0xa0, 0x5c, 0x56, 0x5e, 0xe6, 0xb3,
+	0xa6, 0x05, 0x7a, 0x7b, 0x4c, 0x0d, 0xd3, 0x02, 0x8e, 0x4d, 0x9d, 0x2e, 0x16, 0xb1, 0x61, 0x61,
+	0x22, 0x27, 0x5f, 0xba, 0xc9, 0x20, 0x49, 0x12, 0x1f, 0x8c, 0x0b, 0x20, 0x3f, 0x25, 0x91, 0x3b,
+	0xa2, 0x0b, 0x46, 0x35, 0xb0, 0x78, 0x1b, 0x2a, 0x09, 0xf7, 0x33, 0x20, 0x79, 0x3e, 0x71, 0x7d,
+	0x9e, 0x37, 0x49, 0x29, 0x41, 0x06, 0x3b, 0x89, 0x77, 0xa3, 0x54, 0xfd, 0x45, 0x82, 0x85, 0x89,
+	0xd1, 0x8e, 0xe7, 0x1a, 0xab, 0x03, 0x23, 0x74, 0x48, 0x5d, 0x0c, 0x3b, 0xb3, 0xb1, 0x06, 0x92,
+	0x45, 0x0e, 0xa9, 0x85, 0x01, 0x4d, 0x2d, 0x57, 0x56, 0xdf, 0x7f, 0xa5, 0x0c, 0xd6, 0x1a, 0x4c,
+	0x05, 0x2b, 0x20, 0x3b, 0xea, 0x3d, 0xa6, 0x7a, 0xeb, 0xd5, 0x54, 0xdb, 0xa8, 0xa1, 0xcc, 0x41,
+	0x91, 0x69, 0xea, 0x9c, 0x58, 0x8e, 0x13, 0x93, 0xa1, 0xc0, 0x93, 0xd4, 0xa1, 0xc1, 0x7c, 0x39,
+	0x07, 0x33, 0x1d, 0xda, 0x25, 0x43, 0xcb, 0xd7, 0x8f, 0x89, 0x35, 0xa4, 0x3c, 0x6e, 0x45, 0x65,
+	0x1e, 0x4a, 0x22, 0x07, 0x26, 0x62, 0x9f, 0xf3, 0xae, 0x90, 0x98, 0xc1, 0x27, 0x1e, 0x66, 0x97,
+	0x1b, 0x04, 0x8e, 0xab, 0x25, 0x3b, 0xee, 0xf2, 0x64, 0x82, 0xa3, 0x70, 0x57, 0x7f, 0x4e, 0x43,
+	0x96, 0x93, 0x9b, 0x85, 0x52, 0xfb, 0x71, 0x4b, 0xd3, 0xb7, 0x9a, 0x07, 0x1b, 0x0d, 0x4d, 0x4e,
+	0x61, 0xcc, 0x80, 0x0b, 0x1e, 0x36, 0x9a, 0xeb, 0x6d, 0x39, 0x1d, 0xfe, 0xbf, 0xbe, 0xdb, 0xbe,
+	0x7f, 0x4f, 0xce, 0x84, 0x0a, 0x07, 0x42, 0x90, 0x8d, 0x02, 0xee, 0xae, 0xca, 0x12, 0xde, 0xad,
+	0x2c, 0x0c, 0xd4, 0x3f, 0xd7, 0xb6, 0x10, 0x91, 0x8b, 0x4b, 0x10, 0x93, 0xc7, 0xdc, 0x16, 0xb9,
+	0x64, 0xa3, 0xd9, 0x6c, 0xc8, 0x85, 0xd0, 0xe6, 0x7e, 0x7b, 0xaf, 0xbe, 0xbb, 0x2d, 0x17, 0x43,
+	0x9b, 0xdb, 0x7b, 0xcd, 0x83, 0x96, 0x0c, 0xa1, 0x85, 0x1d, 0x6d, 0x7f, 0x7f, 0x7d, 0x5b, 0x93,
+	0x4b, 0x21, 0x62, 0xe3, 0x71, 0x5b, 0xdb, 0x97, 0xcb, 0x31, 0x5a, 0xe8, 0x62, 0x26, 0x74, 0xa1,
+	0xed, 0x1e, 0xec, 0xc8, 0x15, 0x8c, 0xd9, 0x8c, 0x70, 0x11, 0x90, 0x98, 0x4d, 0x88, 0x90, 0xa9,
+	0x3c, 0x26, 0x22, 0xac, 0xcc, 0xc5, 0x04, 0x88, 0x50, 0xaa, 0x9b, 0x20, 0x89, 0x7a, 0x50, 0xa0,
+	0xd2, 0x58, 0xdf, 0xd0, 0x1a, 0x7a, 0xb3, 0xd5, 0xae, 0x37, 0x77, 0xd7, 0x1b, 0x18, 0xbb, 0x50,
+	0xb6, 0xa7, 0x7d, 0x7a, 0x50, 0xdf, 0xd3, 0xb6, 0x30, 0x7e, 0x11, 0x59, 0x4b, 0x5b, 0x6f, 0xa3,
+	0x2c, 0x53, 0xbd, 0x06, 0x0b, 0x13, 0xdb, 0x26, 0x56, 0xbd, 0xd5, 0x6f, 0x53, 0x30, 0x3f, 0xa9,
+	0xc3, 0xe3, 0x35, 0xfe, 0x00, 0x24, 0x51, 0x30, 0x62, 0x9e, 0xdd, 0x9c, 0x38, 0x24, 0x3e, 0x63,
+	0x88, 0x33, 0xa6, 0x74, 0x66, 0xca, 0x94, 0x66, 0xba, 0x41, 0xc9, 0x58, 0xa0, 0x4e, 0x35, 0x35,
+	0xad, 0xed, 0x78, 0xb7, 0xe2, 0x9a, 0x4e, 0x38, 0xba, 0x3a, 0x9d, 0x64, 0xe0, 0xed, 0xfb, 0x14,
+	0x9c, 0x9f, 0xb2, 0x97, 0xe2, 0xce, 0xee, 0x43, 0xae, 0x4f, 0xfd, 0x23, 0x27, 0x18, 0xe8, 0x37,
+	0x26, 0x4c, 0x1a, 0x76, 0x7c, 0xc6, 0x88, 0xca, 0x4c, 0xdb, 0x35, 0xc2, 0x7f, 0x40, 0xe9, 0xd7,
+	0x14, 0x9c, 0x9b, 0x6c, 0x2b, 0xce, 0x08, 0x9f, 0x0a, 0xa6, 0x3d, 0x18, 0xfa, 0x62, 0x76, 0xa7,
+	0xc3, 0x3e, 0x1e, 0xfa, 0xa1, 0x30, 0xc3, 0x85, 0x2b, 0x63, 0x0a, 0x59, 0x4e, 0xe1, 0x9d, 0x29,
+	0xdc, 0x83, 0x45, 0xb9, 0x04, 0xb2, 0x61, 0x99, 0xd4, 0xf6, 0x75, 0xcf, 0x77, 0x29, 0xe9, 0x9b,
+	0x76, 0x8f, 0xcf, 0xa3, 0xc2, 0x9a, 0xd4, 0x25, 0x96, 0x47, 0x19, 0x80, 0x2d, 0x7b, 0xea, 0x46,
+	0x00, 0xb9, 0x08, 0xa0, 0xfa, 0x5b, 0x16, 0x4a, 0xd1, 0xd5, 0xbb, 0x00, 0xe5, 0x27, 0xe4, 0x98,
+	0xe8, 0xc1, 0x63, 0x47, 0xdc, 0xe0, 0x12, 0x2c, 0x70, 0x29, 0x52, 0x46, 0x53, 0x86, 0x45, 0x3c,
+	0x8f, 0xdf, 0xaf, 0xc0, 0x4f, 0xab, 0x30, 0xcf, 0x4f, 0xfb, 0x38, 0xac, 0xcc, 0x81, 0x45, 0x75,
+	0xf6, 0x06, 0xf3, 0xf8, 0x20, 0x0a, 0x89, 0xdc, 0x86, 0xcb, 0x1c, 0xd3, 0xa3, 0x36, 0x75, 0x89,
+	0x4f, 0x75, 0xfa, 0xe5, 0x10, 0x0f, 0x74, 0x62, 0x77, 0xf4, 0x23, 0xe2, 0x1d, 0xa9, 0x0b, 0x51,
+	0xf4, 0x75, 0x38, 0xcf, 0xd1, 0x48, 0x1a, 0x19, 0xeb, 0xc6, 0x11, 0x35, 0x9e, 0xea, 0x43, 0xbf,
+	0xfb, 0x40, 0xfd, 0x7f, 0x14, 0xf6, 0x10, 0xca, 0x2c, 0x5e, 0x7d, 0xf3, 0x05, 0xfa, 0x74, 0x5c,
+	0x3e, 0x0d, 0x2b, 0x13, 0x2a, 0x3e, 0x72, 0xc1, 0x5a, 0x73, 0xa4, 0xb0, 0x83, 0x2f, 0x86, 0x35,
+	0x69, 0xbf, 0xa5, 0x69, 0x5b, 0x2c, 0x41, 0x3d, 0x27, 0xbc, 0x72, 0x29, 0xb8, 0x94, 0x61, 0x08,
+	0xba, 0xf8, 0x9e, 0x1b, 0xbd, 0x98, 0x3c, 0x55, 0x8e, 0xfa, 0xbf, 0x06, 0xe7, 0xc6, 0x97, 0x8a,
+	0xa2, 0xe6, 0xa2, 0x28, 0xb4, 0x34, 0x38, 0x39, 0x8d, 0x51, 0xa2, 0x98, 0x8b, 0xfc, 0x35, 0xe9,
+	0x52, 0x03, 0x43, 0xd3, 0x51, 0x2f, 0x24, 0x52, 0x88, 0x44, 0xa8, 0x4d, 0x0e, 0x31, 0xb2, 0xc4,
+	0xc5, 0x1f, 0x9e, 0xba, 0x14, 0x05, 0x6c, 0xc2, 0xc2, 0xd0, 0x36, 0x6d, 0xcc, 0x0c, 0x1a, 0x60,
+	0xef, 0x0a, 0x51, 0x43, 0xea, 0x5f, 0xf9, 0x29, 0xaf, 0x84, 0x83, 0x28, 0x5a, 0xc4, 0xa5, 0xba,
+	0x06, 0xe5, 0x68, 0x64, 0x94, 0x22, 0x88, 0xd8, 0xe0, 0x10, 0xc3, 0xc1, 0xb9, 0xd9, 0xdc, 0x62,
+	0x23, 0xef, 0x0b, 0x0d, 0xe7, 0x17, 0x8e, 0xde, 0x46, 0xbd, 0xad, 0xe9, 0x7b, 0x07, 0xbb, 0xed,
+	0xfa, 0x8e, 0x26, 0x67, 0x6e, 0x15, 0x0b, 0x7f, 0xe7, 0xe5, 0x6f, 0xf0, 0x5f, 0xba, 0xfa, 0x67,
+	0x0a, 0x2a, 0xf1, 0x45, 0xae, 0xdc, 0x80, 0x0b, 0xc1, 0x03, 0xd7, 0xa3, 0xbe, 0xfe, 0xcc, 0x74,
+	0x79, 0xb2, 0xfa, 0x44, 0x2c, 0xf2, 0xf0, 0x1a, 0x35, 0x58, 0xb2, 0x1d, 0xcc, 0x38, 0x56, 0x04,
+	0x71, 0x3b, 0xfa, 0xf8, 0x0b, 0x40, 0x27, 0x06, 0xc6, 0xcb, 0x73, 0xc4, 0xf4, 0x98, 0x12, 0xb2,
+	0x4c, 0xf4, 0x08, 0xf7, 0x61, 0x9f, 0x0c, 0x30, 0x66, 0xbe, 0x7b, 0xc2, 0xf7, 0x66, 0xe1, 0x8d,
+	0x04, 0x29, 0x7a, 0xd1, 0x1f, 0xd3, 0x50, 0x8e, 0x2e, 0x50, 0xf6, 0x94, 0x30, 0x78, 0x2b, 0xa7,
+	0x78, 0x11, 0xbe, 0x7b, 0xe6, 0xba, 0xad, 0x6d, 0xb2, 0x5d, 0xbb, 0x96, 0x13, 0xfb, 0x8d, 0xcd,
+	0x47, 0x56, 0x7c, 0x54, 0xbc, 0x66, 0x0a, 0x38, 0x1c, 0xb2, 0x16, 0x79, 0x71, 0x12, 0x6f, 0xe5,
+	0x33, 0xee, 0x8b, 0x78, 0xf6, 0x71, 0x11, 0xef, 0xb8, 0x37, 0x52, 0x16, 0x2b, 0x20, 0x71, 0xaa,
+	0xd8, 0x21, 0x23, 0xb2, 0xf2, 0xff, 0x94, 0x02, 0x64, 0x37, 0x9b, 0x7b, 0xac, 0x34, 0xb0, 0x16,
+	0x84, 0x54, 0x6f, 0xd5, 0xb5, 0x4d, 0xac, 0x8e, 0x68, 0x88, 0xbe, 0x4b, 0x41, 0x29, 0xb2, 0x2f,
+	0xd8, 0xc8, 0x23, 0x96, 0xe5, 0x3c, 0xd3, 0x89, 0x65, 0x62, 0x0d, 0x8b, 0xab, 0x9e, 0x71, 0xab,
+	0x37, 0x9d, 0xb2, 0xaf, 0x41, 0x4e, 0x6e, 0x95, 0x84, 0xfb, 0xd4, 0xdb, 0x74, 0xff, 0x15, 0x54,
+	0xe2, 0xfb, 0x23, 0xe1, 0xfc, 0xea, 0xdb, 0x74, 0xfe, 0x02, 0x66, 0xe2, 0x9b, 0xe3, 0x3f, 0xf4,
+	0xfd, 0x43, 0x1a, 0xe6, 0x27, 0x40, 0x94, 0x4f, 0x46, 0x4b, 0x52, 0xac, 0xe9, 0x3b, 0xaf, 0x62,
+	0xb6, 0xb6, 0x8b, 0x0a, 0x2d, 0xfc, 0x06, 0x50, 0x54, 0x90, 0x4d, 0xfc, 0x8c, 0xf6, 0x4d, 0xfc,
+	0x76, 0x73, 0x47, 0x2f, 0x64, 0xb1, 0x44, 0x17, 0x41, 0x19, 0x38, 0x9e, 0xe9, 0x9b, 0xc7, 0xec,
+	0xcb, 0x31, 0x78, 0x3d, 0xb3, 0x7d, 0x9a, 0x65, 0x67, 0x36, 0xed, 0x91, 0xc4, 0x19, 0x6b, 0xb3,
+	0x0c, 0xdb, 0x7c, 0x1d, 0x67, 0xc8, 0x86, 0xac, 0x90, 0xb2, 0x35, 0x99, 0x62, 0xd2, 0xd1, 0x12,
+	0x1a, 0xbf, 0xc2, 0xcb, 0xec, 0x6b, 0x9e, 0xf4, 0x7a, 0x2e, 0x33, 0x15, 0xc0, 0xf9, 0x2a, 0x5c,
+	0xbc, 0x0b, 0x85, 0x90, 0x22, 0x4e, 0x21, 0x76, 0x3f, 0xdc, 0x2b, 0xfc, 0x9b, 0x25, 0x8d, 0xdc,
+	0xd0, 0x9a, 0xe9, 0xe9, 0xe3, 0x0f, 0xc7, 0x34, 0x4a, 0x0b, 0xd5, 0x9f, 0x70, 0x68, 0x26, 0x3e,
+	0x63, 0xd7, 0xa0, 0x60, 0x39, 0x98, 0x1b, 0x06, 0x12, 0x7f, 0xcc, 0x58, 0x7e, 0xc9, 0x97, 0x6f,
+	0xad, 0x31, 0xc2, 0x2f, 0x1a, 0x50, 0x08, 0x7e, 0x63, 0x83, 0x66, 0x07, 0xc4, 0x3f, 0xe2, 0x36,
+	0xa4, 0x8d, 0x34, 0x6f, 0xd9, 0xac, 0x37, 0x20, 0x36, 0x8f, 0xba, 0x90, 0x60, 0x28, 0x2d, 0x4a,
+	0x3a, 0x7c, 0xd1, 0x3a, 0xfd, 0x3e, 0x06, 0xd5, 0x1b, 0x85, 0xf2, 0x22, 0xcc, 0xf9, 0x2e, 0x31,
+	0xad, 0xd8, 0x11, 0x8b, 0x64, 0x71, 0xe3, 0x26, 0xae, 0x47, 0xa7, 0x9f, 0xe4, 0xb4, 0x21, 0x27,
+	0x5e, 0x42, 0xde, 0xa3, 0xd4, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xe5, 0x5c, 0x96, 0xdd,
+	0x11, 0x00, 0x00,
+}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go
new file mode 100644
index 0000000000..0d6055d610
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go
@@ -0,0 +1,51 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+	A plugin for the Google protocol buffer compiler to generate Go code.
+	Run it by building this program and putting it in your path with the name
+		protoc-gen-go
+	That word 'go' at the end becomes part of the option string set for the
+	protocol compiler, so once the protocol compiler (protoc) is installed
+	you can run
+		protoc --go_out=output_directory input_directory/file.proto
+	to generate Go bindings for the protocol defined by file.proto.
+	With that input, the output will be written to
+		output_directory/file.pb.go
+
+	The generated code is documented in the package comment for
+	the library.
+
+	See the README and documentation for protocol buffers to learn more:
+		https://developers.google.com/protocol-buffers/
+
+*/
+package documentation
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
new file mode 100644
index 0000000000..b5715c3577
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
@@ -0,0 +1,40 @@
+# Go support for Protocol Buffers - Google's data interchange format
+#
+# Copyright 2010 The Go Authors.  All rights reserved.
+# https://github.com/golang/protobuf
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+include $(GOROOT)/src/Make.inc
+
+TARG=github.com/golang/protobuf/compiler/generator
+GOFILES=\
+	generator.go\
+
+DEPS=../descriptor ../plugin ../../proto
+
+include $(GOROOT)/src/Make.pkg
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
new file mode 100644
index 0000000000..c2c96bf720
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
@@ -0,0 +1,2715 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+	The code generator for the plugin for the Google protocol buffer compiler.
+	It generates Go code from the protocol buffer description files read by the
+	main routine.
+*/
+package generator
+
+import (
+	"bufio"
+	"bytes"
+	"compress/gzip"
+	"fmt"
+	"go/parser"
+	"go/printer"
+	"go/token"
+	"log"
+	"os"
+	"path"
+	"strconv"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"github.com/golang/protobuf/proto"
+
+	"github.com/golang/protobuf/protoc-gen-go/descriptor"
+	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
+)
+
+// generatedCodeVersion indicates a version of the generated code.
+// It is incremented whenever an incompatibility between the generated code and
+// proto package is introduced; the generated code references
+// a constant, proto.ProtoPackageIsVersionN (where N is generatedCodeVersion).
+const generatedCodeVersion = 1
+
+// A Plugin provides functionality to add to the output during Go code generation,
+// such as to produce RPC stubs.
+type Plugin interface {
+	// Name identifies the plugin.
+	Name() string
+	// Init is called once after data structures are built but before
+	// code generation begins.
+	Init(g *Generator)
+	// Generate produces the code generated by the plugin for this file,
+	// except for the imports, by calling the generator's methods P, In, and Out.
+	Generate(file *FileDescriptor)
+	// GenerateImports produces the import declarations for this file.
+	// It is called after Generate.
+	GenerateImports(file *FileDescriptor)
+}
+
+var plugins []Plugin
+
+// RegisterPlugin installs a (second-order) plugin to be run when the Go output is generated.
+// It is typically called during initialization.
+func RegisterPlugin(p Plugin) {
+	plugins = append(plugins, p)
+}
+
+// Each type we import as a protocol buffer (other than FileDescriptorProto) needs
+// a pointer to the FileDescriptorProto that represents it.  These types achieve that
+// wrapping by placing each Proto inside a struct with the pointer to its File. The
+// structs have the same names as their contents, with "Proto" removed.
+// FileDescriptor is used to store the things that it points to.
+
+// The file and package name method are common to messages and enums.
+type common struct {
+	file *descriptor.FileDescriptorProto // File this object comes from.
+}
+
+// PackageName is name in the package clause in the generated file.
+func (c *common) PackageName() string { return uniquePackageOf(c.file) }
+
+func (c *common) File() *descriptor.FileDescriptorProto { return c.file }
+
+func fileIsProto3(file *descriptor.FileDescriptorProto) bool {
+	return file.GetSyntax() == "proto3"
+}
+
+func (c *common) proto3() bool { return fileIsProto3(c.file) }
+
+// Descriptor represents a protocol buffer message.
+type Descriptor struct {
+	common
+	*descriptor.DescriptorProto
+	parent   *Descriptor            // The containing message, if any.
+	nested   []*Descriptor          // Inner messages, if any.
+	enums    []*EnumDescriptor      // Inner enums, if any.
+	ext      []*ExtensionDescriptor // Extensions, if any.
+	typename []string               // Cached typename vector.
+	index    int                    // The index into the container, whether the file or another message.
+	path     string                 // The SourceCodeInfo path as comma-separated integers.
+	group    bool
+}
+
+// TypeName returns the elements of the dotted type name.
+// The package name is not part of this name.
+func (d *Descriptor) TypeName() []string {
+	if d.typename != nil {
+		return d.typename
+	}
+	n := 0
+	for parent := d; parent != nil; parent = parent.parent {
+		n++
+	}
+	s := make([]string, n, n)
+	for parent := d; parent != nil; parent = parent.parent {
+		n--
+		s[n] = parent.GetName()
+	}
+	d.typename = s
+	return s
+}
+
+// EnumDescriptor describes an enum. If it's at top level, its parent will be nil.
+// Otherwise it will be the descriptor of the message in which it is defined.
+type EnumDescriptor struct {
+	common
+	*descriptor.EnumDescriptorProto
+	parent   *Descriptor // The containing message, if any.
+	typename []string    // Cached typename vector.
+	index    int         // The index into the container, whether the file or a message.
+	path     string      // The SourceCodeInfo path as comma-separated integers.
+}
+
+// TypeName returns the elements of the dotted type name.
+// The package name is not part of this name.
+func (e *EnumDescriptor) TypeName() (s []string) {
+	if e.typename != nil {
+		return e.typename
+	}
+	name := e.GetName()
+	if e.parent == nil {
+		s = make([]string, 1)
+	} else {
+		pname := e.parent.TypeName()
+		s = make([]string, len(pname)+1)
+		copy(s, pname)
+	}
+	s[len(s)-1] = name
+	e.typename = s
+	return s
+}
+
+// Everything but the last element of the full type name, CamelCased.
+// The values of type Foo.Bar are call Foo_value1... not Foo_Bar_value1... .
+func (e *EnumDescriptor) prefix() string {
+	if e.parent == nil {
+		// If the enum is not part of a message, the prefix is just the type name.
+		return CamelCase(*e.Name) + "_"
+	}
+	typeName := e.TypeName()
+	return CamelCaseSlice(typeName[0:len(typeName)-1]) + "_"
+}
+
+// The integer value of the named constant in this enumerated type.
+func (e *EnumDescriptor) integerValueAsString(name string) string {
+	for _, c := range e.Value {
+		if c.GetName() == name {
+			return fmt.Sprint(c.GetNumber())
+		}
+	}
+	log.Fatal("cannot find value for enum constant")
+	return ""
+}
+
+// ExtensionDescriptor describes an extension. If it's at top level, its parent will be nil.
+// Otherwise it will be the descriptor of the message in which it is defined.
+type ExtensionDescriptor struct {
+	common
+	*descriptor.FieldDescriptorProto
+	parent *Descriptor // The containing message, if any.
+}
+
+// TypeName returns the elements of the dotted type name.
+// The package name is not part of this name.
+func (e *ExtensionDescriptor) TypeName() (s []string) {
+	name := e.GetName()
+	if e.parent == nil {
+		// top-level extension
+		s = make([]string, 1)
+	} else {
+		pname := e.parent.TypeName()
+		s = make([]string, len(pname)+1)
+		copy(s, pname)
+	}
+	s[len(s)-1] = name
+	return s
+}
+
+// DescName returns the variable name used for the generated descriptor.
+func (e *ExtensionDescriptor) DescName() string {
+	// The full type name.
+	typeName := e.TypeName()
+	// Each scope of the extension is individually CamelCased, and all are joined with "_" with an "E_" prefix.
+	for i, s := range typeName {
+		typeName[i] = CamelCase(s)
+	}
+	return "E_" + strings.Join(typeName, "_")
+}
+
+// ImportedDescriptor describes a type that has been publicly imported from another file.
+type ImportedDescriptor struct {
+	common
+	o Object
+}
+
+func (id *ImportedDescriptor) TypeName() []string { return id.o.TypeName() }
+
+// FileDescriptor describes an protocol buffer descriptor file (.proto).
+// It includes slices of all the messages and enums defined within it.
+// Those slices are constructed by WrapTypes.
+type FileDescriptor struct {
+	*descriptor.FileDescriptorProto
+	desc []*Descriptor          // All the messages defined in this file.
+	enum []*EnumDescriptor      // All the enums defined in this file.
+	ext  []*ExtensionDescriptor // All the top-level extensions defined in this file.
+	imp  []*ImportedDescriptor  // All types defined in files publicly imported by this file.
+
+	// Comments, stored as a map of path (comma-separated integers) to the comment.
+	comments map[string]*descriptor.SourceCodeInfo_Location
+
+	// The full list of symbols that are exported,
+	// as a map from the exported object to its symbols.
+	// This is used for supporting public imports.
+	exported map[Object][]symbol
+
+	index int // The index of this file in the list of files to generate code for
+
+	proto3 bool // whether to generate proto3 code for this file
+}
+
+// PackageName is the package name we'll use in the generated code to refer to this file.
+func (d *FileDescriptor) PackageName() string { return uniquePackageOf(d.FileDescriptorProto) }
+
+// goPackageName returns the Go package name to use in the
+// generated Go file.  The result explicit reports whether the name
+// came from an option go_package statement.  If explicit is false,
+// the name was derived from the protocol buffer's package statement
+// or the input file name.
+func (d *FileDescriptor) goPackageName() (name string, explicit bool) {
+	// Does the file have a "go_package" option?
+	if opts := d.Options; opts != nil {
+		if pkg := opts.GetGoPackage(); pkg != "" {
+			return pkg, true
+		}
+	}
+
+	// Does the file have a package clause?
+	if pkg := d.GetPackage(); pkg != "" {
+		return pkg, false
+	}
+	// Use the file base name.
+	return baseName(d.GetName()), false
+}
+
+func (d *FileDescriptor) addExport(obj Object, sym symbol) {
+	d.exported[obj] = append(d.exported[obj], sym)
+}
+
+// symbol is an interface representing an exported Go symbol.
+type symbol interface {
+	// GenerateAlias should generate an appropriate alias
+	// for the symbol from the named package.
+	GenerateAlias(g *Generator, pkg string)
+}
+
+type messageSymbol struct {
+	sym                         string
+	hasExtensions, isMessageSet bool
+	hasOneof                    bool
+	getters                     []getterSymbol
+}
+
+type getterSymbol struct {
+	name     string
+	typ      string
+	typeName string // canonical name in proto world; empty for proto.Message and similar
+	genType  bool   // whether typ contains a generated type (message/group/enum)
+}
+
+func (ms *messageSymbol) GenerateAlias(g *Generator, pkg string) {
+	remoteSym := pkg + "." + ms.sym
+
+	g.P("type ", ms.sym, " ", remoteSym)
+	g.P("func (m *", ms.sym, ") Reset() { (*", remoteSym, ")(m).Reset() }")
+	g.P("func (m *", ms.sym, ") String() string { return (*", remoteSym, ")(m).String() }")
+	g.P("func (*", ms.sym, ") ProtoMessage() {}")
+	if ms.hasExtensions {
+		g.P("func (*", ms.sym, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange ",
+			"{ return (*", remoteSym, ")(nil).ExtensionRangeArray() }")
+		g.P("func (m *", ms.sym, ") ExtensionMap() map[int32]", g.Pkg["proto"], ".Extension ",
+			"{ return (*", remoteSym, ")(m).ExtensionMap() }")
+		if ms.isMessageSet {
+			g.P("func (m *", ms.sym, ") Marshal() ([]byte, error) ",
+				"{ return (*", remoteSym, ")(m).Marshal() }")
+			g.P("func (m *", ms.sym, ") Unmarshal(buf []byte) error ",
+				"{ return (*", remoteSym, ")(m).Unmarshal(buf) }")
+		}
+	}
+	if ms.hasOneof {
+		// Oneofs and public imports do not mix well.
+		// We can make them work okay for the binary format,
+		// but they're going to break weirdly for text/JSON.
+		enc := "_" + ms.sym + "_OneofMarshaler"
+		dec := "_" + ms.sym + "_OneofUnmarshaler"
+		size := "_" + ms.sym + "_OneofSizer"
+		encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error"
+		decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)"
+		sizeSig := "(msg " + g.Pkg["proto"] + ".Message) int"
+		g.P("func (m *", ms.sym, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {")
+		g.P("return ", enc, ", ", dec, ", ", size, ", nil")
+		g.P("}")
+
+		g.P("func ", enc, encSig, " {")
+		g.P("m := msg.(*", ms.sym, ")")
+		g.P("m0 := (*", remoteSym, ")(m)")
+		g.P("enc, _, _, _ := m0.XXX_OneofFuncs()")
+		g.P("return enc(m0, b)")
+		g.P("}")
+
+		g.P("func ", dec, decSig, " {")
+		g.P("m := msg.(*", ms.sym, ")")
+		g.P("m0 := (*", remoteSym, ")(m)")
+		g.P("_, dec, _, _ := m0.XXX_OneofFuncs()")
+		g.P("return dec(m0, tag, wire, b)")
+		g.P("}")
+
+		g.P("func ", size, sizeSig, " {")
+		g.P("m := msg.(*", ms.sym, ")")
+		g.P("m0 := (*", remoteSym, ")(m)")
+		g.P("_, _, size, _ := m0.XXX_OneofFuncs()")
+		g.P("return size(m0)")
+		g.P("}")
+	}
+	for _, get := range ms.getters {
+
+		if get.typeName != "" {
+			g.RecordTypeUse(get.typeName)
+		}
+		typ := get.typ
+		val := "(*" + remoteSym + ")(m)." + get.name + "()"
+		if get.genType {
+			// typ will be "*pkg.T" (message/group) or "pkg.T" (enum)
+			// or "map[t]*pkg.T" (map to message/enum).
+			// The first two of those might have a "[]" prefix if it is repeated.
+			// Drop any package qualifier since we have hoisted the type into this package.
+			rep := strings.HasPrefix(typ, "[]")
+			if rep {
+				typ = typ[2:]
+			}
+			isMap := strings.HasPrefix(typ, "map[")
+			star := typ[0] == '*'
+			if !isMap { // map types handled lower down
+				typ = typ[strings.Index(typ, ".")+1:]
+			}
+			if star {
+				typ = "*" + typ
+			}
+			if rep {
+				// Go does not permit conversion between slice types where both
+				// element types are named. That means we need to generate a bit
+				// of code in this situation.
+				// typ is the element type.
+				// val is the expression to get the slice from the imported type.
+
+				ctyp := typ // conversion type expression; "Foo" or "(*Foo)"
+				if star {
+					ctyp = "(" + typ + ")"
+				}
+
+				g.P("func (m *", ms.sym, ") ", get.name, "() []", typ, " {")
+				g.In()
+				g.P("o := ", val)
+				g.P("if o == nil {")
+				g.In()
+				g.P("return nil")
+				g.Out()
+				g.P("}")
+				g.P("s := make([]", typ, ", len(o))")
+				g.P("for i, x := range o {")
+				g.In()
+				g.P("s[i] = ", ctyp, "(x)")
+				g.Out()
+				g.P("}")
+				g.P("return s")
+				g.Out()
+				g.P("}")
+				continue
+			}
+			if isMap {
+				// Split map[keyTyp]valTyp.
+				bra, ket := strings.Index(typ, "["), strings.Index(typ, "]")
+				keyTyp, valTyp := typ[bra+1:ket], typ[ket+1:]
+				// Drop any package qualifier.
+				// Only the value type may be foreign.
+				star := valTyp[0] == '*'
+				valTyp = valTyp[strings.Index(valTyp, ".")+1:]
+				if star {
+					valTyp = "*" + valTyp
+				}
+
+				typ := "map[" + keyTyp + "]" + valTyp
+				g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " {")
+				g.P("o := ", val)
+				g.P("if o == nil { return nil }")
+				g.P("s := make(", typ, ", len(o))")
+				g.P("for k, v := range o {")
+				g.P("s[k] = (", valTyp, ")(v)")
+				g.P("}")
+				g.P("return s")
+				g.P("}")
+				continue
+			}
+			// Convert imported type into the forwarding type.
+			val = "(" + typ + ")(" + val + ")"
+		}
+
+		g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " { return ", val, " }")
+	}
+
+}
+
+type enumSymbol struct {
+	name   string
+	proto3 bool // Whether this came from a proto3 file.
+}
+
+func (es enumSymbol) GenerateAlias(g *Generator, pkg string) {
+	s := es.name
+	g.P("type ", s, " ", pkg, ".", s)
+	g.P("var ", s, "_name = ", pkg, ".", s, "_name")
+	g.P("var ", s, "_value = ", pkg, ".", s, "_value")
+	g.P("func (x ", s, ") String() string { return (", pkg, ".", s, ")(x).String() }")
+	if !es.proto3 {
+		g.P("func (x ", s, ") Enum() *", s, "{ return (*", s, ")((", pkg, ".", s, ")(x).Enum()) }")
+		g.P("func (x *", s, ") UnmarshalJSON(data []byte) error { return (*", pkg, ".", s, ")(x).UnmarshalJSON(data) }")
+	}
+}
+
+type constOrVarSymbol struct {
+	sym  string
+	typ  string // either "const" or "var"
+	cast string // if non-empty, a type cast is required (used for enums)
+}
+
+func (cs constOrVarSymbol) GenerateAlias(g *Generator, pkg string) {
+	v := pkg + "." + cs.sym
+	if cs.cast != "" {
+		v = cs.cast + "(" + v + ")"
+	}
+	g.P(cs.typ, " ", cs.sym, " = ", v)
+}
+
+// Object is an interface abstracting the abilities shared by enums, messages, extensions and imported objects.
+type Object interface {
+	PackageName() string // The name we use in our output (a_b_c), possibly renamed for uniqueness.
+	TypeName() []string
+	File() *descriptor.FileDescriptorProto
+}
+
+// Each package name we generate must be unique. The package we're generating
+// gets its own name but every other package must have a unique name that does
+// not conflict in the code we generate.  These names are chosen globally (although
+// they don't have to be, it simplifies things to do them globally).
+func uniquePackageOf(fd *descriptor.FileDescriptorProto) string {
+	s, ok := uniquePackageName[fd]
+	if !ok {
+		log.Fatal("internal error: no package name defined for " + fd.GetName())
+	}
+	return s
+}
+
+// Generator is the type whose methods generate the output, stored in the associated response structure.
+type Generator struct {
+	*bytes.Buffer
+
+	Request  *plugin.CodeGeneratorRequest  // The input.
+	Response *plugin.CodeGeneratorResponse // The output.
+
+	Param             map[string]string // Command-line parameters.
+	PackageImportPath string            // Go import path of the package we're generating code for
+	ImportPrefix      string            // String to prefix to imported package file names.
+	ImportMap         map[string]string // Mapping from import name to generated name
+
+	Pkg map[string]string // The names under which we import support packages
+
+	packageName      string                     // What we're calling ourselves.
+	allFiles         []*FileDescriptor          // All files in the tree
+	allFilesByName   map[string]*FileDescriptor // All files by filename.
+	genFiles         []*FileDescriptor          // Those files we will generate output for.
+	file             *FileDescriptor            // The file we are compiling now.
+	usedPackages     map[string]bool            // Names of packages used in current file.
+	typeNameToObject map[string]Object          // Key is a fully-qualified name in input syntax.
+	init             []string                   // Lines to emit in the init function.
+	indent           string
+	writeOutput      bool
+}
+
+// New creates a new generator and allocates the request and response protobufs.
+func New() *Generator {
+	g := new(Generator)
+	g.Buffer = new(bytes.Buffer)
+	g.Request = new(plugin.CodeGeneratorRequest)
+	g.Response = new(plugin.CodeGeneratorResponse)
+	return g
+}
+
+// Error reports a problem, including an error, and exits the program.
+func (g *Generator) Error(err error, msgs ...string) {
+	s := strings.Join(msgs, " ") + ":" + err.Error()
+	log.Print("protoc-gen-go: error:", s)
+	os.Exit(1)
+}
+
+// Fail reports a problem and exits the program.
+func (g *Generator) Fail(msgs ...string) {
+	s := strings.Join(msgs, " ")
+	log.Print("protoc-gen-go: error:", s)
+	os.Exit(1)
+}
+
+// CommandLineParameters breaks the comma-separated list of key=value pairs
+// in the parameter (a member of the request protobuf) into a key/value map.
+// It then sets file name mappings defined by those entries.
+func (g *Generator) CommandLineParameters(parameter string) {
+	g.Param = make(map[string]string)
+	for _, p := range strings.Split(parameter, ",") {
+		if i := strings.Index(p, "="); i < 0 {
+			g.Param[p] = ""
+		} else {
+			g.Param[p[0:i]] = p[i+1:]
+		}
+	}
+
+	g.ImportMap = make(map[string]string)
+	pluginList := "none" // Default list of plugin names to enable (empty means all).
+	for k, v := range g.Param {
+		switch k {
+		case "import_prefix":
+			g.ImportPrefix = v
+		case "import_path":
+			g.PackageImportPath = v
+		case "plugins":
+			pluginList = v
+		default:
+			if len(k) > 0 && k[0] == 'M' {
+				g.ImportMap[k[1:]] = v
+			}
+		}
+	}
+
+	if pluginList != "" {
+		// Amend the set of plugins.
+		enabled := make(map[string]bool)
+		for _, name := range strings.Split(pluginList, "+") {
+			enabled[name] = true
+		}
+		var nplugins []Plugin
+		for _, p := range plugins {
+			if enabled[p.Name()] {
+				nplugins = append(nplugins, p)
+			}
+		}
+		plugins = nplugins
+	}
+}
+
+// DefaultPackageName returns the package name printed for the object.
+// If its file is in a different package, it returns the package name we're using for this file, plus ".".
+// Otherwise it returns the empty string.
+func (g *Generator) DefaultPackageName(obj Object) string {
+	pkg := obj.PackageName()
+	if pkg == g.packageName {
+		return ""
+	}
+	return pkg + "."
+}
+
+// For each input file, the unique package name to use, underscored.
+var uniquePackageName = make(map[*descriptor.FileDescriptorProto]string)
+
+// Package names already registered.  Key is the name from the .proto file;
+// value is the name that appears in the generated code.
+var pkgNamesInUse = make(map[string]bool)
+
+// Create and remember a guaranteed unique package name for this file descriptor.
+// Pkg is the candidate name.  If f is nil, it's a builtin package like "proto" and
+// has no file descriptor.
+func RegisterUniquePackageName(pkg string, f *FileDescriptor) string {
+	// Convert dots to underscores before finding a unique alias.
+	pkg = strings.Map(badToUnderscore, pkg)
+
+	for i, orig := 1, pkg; pkgNamesInUse[pkg]; i++ {
+		// It's a duplicate; must rename.
+		pkg = orig + strconv.Itoa(i)
+	}
+	// Install it.
+	pkgNamesInUse[pkg] = true
+	if f != nil {
+		uniquePackageName[f.FileDescriptorProto] = pkg
+	}
+	return pkg
+}
+
+var isGoKeyword = map[string]bool{
+	"break":       true,
+	"case":        true,
+	"chan":        true,
+	"const":       true,
+	"continue":    true,
+	"default":     true,
+	"else":        true,
+	"defer":       true,
+	"fallthrough": true,
+	"for":         true,
+	"func":        true,
+	"go":          true,
+	"goto":        true,
+	"if":          true,
+	"import":      true,
+	"interface":   true,
+	"map":         true,
+	"package":     true,
+	"range":       true,
+	"return":      true,
+	"select":      true,
+	"struct":      true,
+	"switch":      true,
+	"type":        true,
+	"var":         true,
+}
+
+// defaultGoPackage returns the package name to use,
+// derived from the import path of the package we're building code for.
+func (g *Generator) defaultGoPackage() string {
+	p := g.PackageImportPath
+	if i := strings.LastIndex(p, "/"); i >= 0 {
+		p = p[i+1:]
+	}
+	if p == "" {
+		return ""
+	}
+
+	p = strings.Map(badToUnderscore, p)
+	// Identifier must not be keyword: insert _.
+	if isGoKeyword[p] {
+		p = "_" + p
+	}
+	// Identifier must not begin with digit: insert _.
+	if r, _ := utf8.DecodeRuneInString(p); unicode.IsDigit(r) {
+		p = "_" + p
+	}
+	return p
+}
+
+// SetPackageNames sets the package name for this run.
+// The package name must agree across all files being generated.
+// It also defines unique package names for all imported files.
+func (g *Generator) SetPackageNames() {
+	// Register the name for this package.  It will be the first name
+	// registered so is guaranteed to be unmodified.
+	pkg, explicit := g.genFiles[0].goPackageName()
+
+	// Check all files for an explicit go_package option.
+	for _, f := range g.genFiles {
+		thisPkg, thisExplicit := f.goPackageName()
+		if thisExplicit {
+			if !explicit {
+				// Let this file's go_package option serve for all input files.
+				pkg, explicit = thisPkg, true
+			} else if thisPkg != pkg {
+				g.Fail("inconsistent package names:", thisPkg, pkg)
+			}
+		}
+	}
+
+	// If we don't have an explicit go_package option but we have an
+	// import path, use that.
+	if !explicit {
+		p := g.defaultGoPackage()
+		if p != "" {
+			pkg, explicit = p, true
+		}
+	}
+
+	// If there was no go_package and no import path to use,
+	// double-check that all the inputs have the same implicit
+	// Go package name.
+	if !explicit {
+		for _, f := range g.genFiles {
+			thisPkg, _ := f.goPackageName()
+			if thisPkg != pkg {
+				g.Fail("inconsistent package names:", thisPkg, pkg)
+			}
+		}
+	}
+
+	g.packageName = RegisterUniquePackageName(pkg, g.genFiles[0])
+
+	// Register the support package names. They might collide with the
+	// name of a package we import.
+	g.Pkg = map[string]string{
+		"fmt":   RegisterUniquePackageName("fmt", nil),
+		"math":  RegisterUniquePackageName("math", nil),
+		"proto": RegisterUniquePackageName("proto", nil),
+	}
+
+AllFiles:
+	for _, f := range g.allFiles {
+		for _, genf := range g.genFiles {
+			if f == genf {
+				// In this package already.
+				uniquePackageName[f.FileDescriptorProto] = g.packageName
+				continue AllFiles
+			}
+		}
+		// The file is a dependency, so we want to ignore its go_package option
+		// because that is only relevant for its specific generated output.
+		pkg := f.GetPackage()
+		if pkg == "" {
+			pkg = baseName(*f.Name)
+		}
+		RegisterUniquePackageName(pkg, f)
+	}
+}
+
+// WrapTypes walks the incoming data, wrapping DescriptorProtos, EnumDescriptorProtos
+// and FileDescriptorProtos into file-referenced objects within the Generator.
+// It also creates the list of files to generate and so should be called before GenerateAllFiles.
+func (g *Generator) WrapTypes() {
+	g.allFiles = make([]*FileDescriptor, len(g.Request.ProtoFile))
+	g.allFilesByName = make(map[string]*FileDescriptor, len(g.allFiles))
+	for i, f := range g.Request.ProtoFile {
+		// We must wrap the descriptors before we wrap the enums
+		descs := wrapDescriptors(f)
+		g.buildNestedDescriptors(descs)
+		enums := wrapEnumDescriptors(f, descs)
+		g.buildNestedEnums(descs, enums)
+		exts := wrapExtensions(f)
+		fd := &FileDescriptor{
+			FileDescriptorProto: f,
+			desc:                descs,
+			enum:                enums,
+			ext:                 exts,
+			exported:            make(map[Object][]symbol),
+			proto3:              fileIsProto3(f),
+		}
+		extractComments(fd)
+		g.allFiles[i] = fd
+		g.allFilesByName[f.GetName()] = fd
+	}
+	for _, fd := range g.allFiles {
+		fd.imp = wrapImported(fd.FileDescriptorProto, g)
+	}
+
+	g.genFiles = make([]*FileDescriptor, len(g.Request.FileToGenerate))
+	for i, fileName := range g.Request.FileToGenerate {
+		g.genFiles[i] = g.allFilesByName[fileName]
+		if g.genFiles[i] == nil {
+			g.Fail("could not find file named", fileName)
+		}
+		g.genFiles[i].index = i
+	}
+	g.Response.File = make([]*plugin.CodeGeneratorResponse_File, len(g.genFiles))
+}
+
+// Scan the descriptors in this file.  For each one, build the slice of nested descriptors
+func (g *Generator) buildNestedDescriptors(descs []*Descriptor) {
+	for _, desc := range descs {
+		if len(desc.NestedType) != 0 {
+			for _, nest := range descs {
+				if nest.parent == desc {
+					desc.nested = append(desc.nested, nest)
+				}
+			}
+			if len(desc.nested) != len(desc.NestedType) {
+				g.Fail("internal error: nesting failure for", desc.GetName())
+			}
+		}
+	}
+}
+
+func (g *Generator) buildNestedEnums(descs []*Descriptor, enums []*EnumDescriptor) {
+	for _, desc := range descs {
+		if len(desc.EnumType) != 0 {
+			for _, enum := range enums {
+				if enum.parent == desc {
+					desc.enums = append(desc.enums, enum)
+				}
+			}
+			if len(desc.enums) != len(desc.EnumType) {
+				g.Fail("internal error: enum nesting failure for", desc.GetName())
+			}
+		}
+	}
+}
+
+// Construct the Descriptor
+func newDescriptor(desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *Descriptor {
+	d := &Descriptor{
+		common:          common{file},
+		DescriptorProto: desc,
+		parent:          parent,
+		index:           index,
+	}
+	if parent == nil {
+		d.path = fmt.Sprintf("%d,%d", messagePath, index)
+	} else {
+		d.path = fmt.Sprintf("%s,%d,%d", parent.path, messageMessagePath, index)
+	}
+
+	// The only way to distinguish a group from a message is whether
+	// the containing message has a TYPE_GROUP field that matches.
+	if parent != nil {
+		parts := d.TypeName()
+		if file.Package != nil {
+			parts = append([]string{*file.Package}, parts...)
+		}
+		exp := "." + strings.Join(parts, ".")
+		for _, field := range parent.Field {
+			if field.GetType() == descriptor.FieldDescriptorProto_TYPE_GROUP && field.GetTypeName() == exp {
+				d.group = true
+				break
+			}
+		}
+	}
+
+	d.ext = make([]*ExtensionDescriptor, len(desc.Extension))
+	for i, field := range desc.Extension {
+		d.ext[i] = &ExtensionDescriptor{common{file}, field, d}
+	}
+
+	return d
+}
+
+// Return a slice of all the Descriptors defined within this file
+func wrapDescriptors(file *descriptor.FileDescriptorProto) []*Descriptor {
+	sl := make([]*Descriptor, 0, len(file.MessageType)+10)
+	for i, desc := range file.MessageType {
+		sl = wrapThisDescriptor(sl, desc, nil, file, i)
+	}
+	return sl
+}
+
+// Wrap this Descriptor, recursively
+func wrapThisDescriptor(sl []*Descriptor, desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) []*Descriptor {
+	sl = append(sl, newDescriptor(desc, parent, file, index))
+	me := sl[len(sl)-1]
+	for i, nested := range desc.NestedType {
+		sl = wrapThisDescriptor(sl, nested, me, file, i)
+	}
+	return sl
+}
+
+// Construct the EnumDescriptor
+func newEnumDescriptor(desc *descriptor.EnumDescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *EnumDescriptor {
+	ed := &EnumDescriptor{
+		common:              common{file},
+		EnumDescriptorProto: desc,
+		parent:              parent,
+		index:               index,
+	}
+	if parent == nil {
+		ed.path = fmt.Sprintf("%d,%d", enumPath, index)
+	} else {
+		ed.path = fmt.Sprintf("%s,%d,%d", parent.path, messageEnumPath, index)
+	}
+	return ed
+}
+
+// Return a slice of all the EnumDescriptors defined within this file
+func wrapEnumDescriptors(file *descriptor.FileDescriptorProto, descs []*Descriptor) []*EnumDescriptor {
+	sl := make([]*EnumDescriptor, 0, len(file.EnumType)+10)
+	// Top-level enums.
+	for i, enum := range file.EnumType {
+		sl = append(sl, newEnumDescriptor(enum, nil, file, i))
+	}
+	// Enums within messages. Enums within embedded messages appear in the outer-most message.
+	for _, nested := range descs {
+		for i, enum := range nested.EnumType {
+			sl = append(sl, newEnumDescriptor(enum, nested, file, i))
+		}
+	}
+	return sl
+}
+
+// Return a slice of all the top-level ExtensionDescriptors defined within this file.
+func wrapExtensions(file *descriptor.FileDescriptorProto) []*ExtensionDescriptor {
+	sl := make([]*ExtensionDescriptor, len(file.Extension))
+	for i, field := range file.Extension {
+		sl[i] = &ExtensionDescriptor{common{file}, field, nil}
+	}
+	return sl
+}
+
+// Return a slice of all the types that are publicly imported into this file.
+func wrapImported(file *descriptor.FileDescriptorProto, g *Generator) (sl []*ImportedDescriptor) {
+	for _, index := range file.PublicDependency {
+		df := g.fileByName(file.Dependency[index])
+		for _, d := range df.desc {
+			if d.GetOptions().GetMapEntry() {
+				continue
+			}
+			sl = append(sl, &ImportedDescriptor{common{file}, d})
+		}
+		for _, e := range df.enum {
+			sl = append(sl, &ImportedDescriptor{common{file}, e})
+		}
+		for _, ext := range df.ext {
+			sl = append(sl, &ImportedDescriptor{common{file}, ext})
+		}
+	}
+	return
+}
+
+func extractComments(file *FileDescriptor) {
+	file.comments = make(map[string]*descriptor.SourceCodeInfo_Location)
+	for _, loc := range file.GetSourceCodeInfo().GetLocation() {
+		if loc.LeadingComments == nil {
+			continue
+		}
+		var p []string
+		for _, n := range loc.Path {
+			p = append(p, strconv.Itoa(int(n)))
+		}
+		file.comments[strings.Join(p, ",")] = loc
+	}
+}
+
+// BuildTypeNameMap builds the map from fully qualified type names to objects.
+// The key names for the map come from the input data, which puts a period at the beginning.
+// It should be called after SetPackageNames and before GenerateAllFiles.
+func (g *Generator) BuildTypeNameMap() {
+	g.typeNameToObject = make(map[string]Object)
+	for _, f := range g.allFiles {
+		// The names in this loop are defined by the proto world, not us, so the
+		// package name may be empty.  If so, the dotted package name of X will
+		// be ".X"; otherwise it will be ".pkg.X".
+		dottedPkg := "." + f.GetPackage()
+		if dottedPkg != "." {
+			dottedPkg += "."
+		}
+		for _, enum := range f.enum {
+			name := dottedPkg + dottedSlice(enum.TypeName())
+			g.typeNameToObject[name] = enum
+		}
+		for _, desc := range f.desc {
+			name := dottedPkg + dottedSlice(desc.TypeName())
+			g.typeNameToObject[name] = desc
+		}
+	}
+}
+
+// ObjectNamed, given a fully-qualified input type name as it appears in the input data,
+// returns the descriptor for the message or enum with that name.
+func (g *Generator) ObjectNamed(typeName string) Object {
+	o, ok := g.typeNameToObject[typeName]
+	if !ok {
+		g.Fail("can't find object with type", typeName)
+	}
+
+	// If the file of this object isn't a direct dependency of the current file,
+	// or in the current file, then this object has been publicly imported into
+	// a dependency of the current file.
+	// We should return the ImportedDescriptor object for it instead.
+	direct := *o.File().Name == *g.file.Name
+	if !direct {
+		for _, dep := range g.file.Dependency {
+			if *g.fileByName(dep).Name == *o.File().Name {
+				direct = true
+				break
+			}
+		}
+	}
+	if !direct {
+		found := false
+	Loop:
+		for _, dep := range g.file.Dependency {
+			df := g.fileByName(*g.fileByName(dep).Name)
+			for _, td := range df.imp {
+				if td.o == o {
+					// Found it!
+					o = td
+					found = true
+					break Loop
+				}
+			}
+		}
+		if !found {
+			log.Printf("protoc-gen-go: WARNING: failed finding publicly imported dependency for %v, used in %v", typeName, *g.file.Name)
+		}
+	}
+
+	return o
+}
+
+// P prints the arguments to the generated output.  It handles strings and int32s, plus
+// handling indirections because they may be *string, etc.
+func (g *Generator) P(str ...interface{}) {
+	if !g.writeOutput {
+		return
+	}
+	g.WriteString(g.indent)
+	for _, v := range str {
+		switch s := v.(type) {
+		case string:
+			g.WriteString(s)
+		case *string:
+			g.WriteString(*s)
+		case bool:
+			fmt.Fprintf(g, "%t", s)
+		case *bool:
+			fmt.Fprintf(g, "%t", *s)
+		case int:
+			fmt.Fprintf(g, "%d", s)
+		case *int32:
+			fmt.Fprintf(g, "%d", *s)
+		case *int64:
+			fmt.Fprintf(g, "%d", *s)
+		case float64:
+			fmt.Fprintf(g, "%g", s)
+		case *float64:
+			fmt.Fprintf(g, "%g", *s)
+		default:
+			g.Fail(fmt.Sprintf("unknown type in printer: %T", v))
+		}
+	}
+	g.WriteByte('\n')
+}
+
+// addInitf stores the given statement to be printed inside the file's init function.
+// The statement is given as a format specifier and arguments.
+func (g *Generator) addInitf(stmt string, a ...interface{}) {
+	g.init = append(g.init, fmt.Sprintf(stmt, a...))
+}
+
+// In Indents the output one tab stop.
+func (g *Generator) In() { g.indent += "\t" }
+
+// Out unindents the output one tab stop.
+func (g *Generator) Out() {
+	if len(g.indent) > 0 {
+		g.indent = g.indent[1:]
+	}
+}
+
+// GenerateAllFiles generates the output for all the files we're outputting.
+func (g *Generator) GenerateAllFiles() {
+	// Initialize the plugins
+	for _, p := range plugins {
+		p.Init(g)
+	}
+	// Generate the output. The generator runs for every file, even the files
+	// that we don't generate output for, so that we can collate the full list
+	// of exported symbols to support public imports.
+	genFileMap := make(map[*FileDescriptor]bool, len(g.genFiles))
+	for _, file := range g.genFiles {
+		genFileMap[file] = true
+	}
+	i := 0
+	for _, file := range g.allFiles {
+		g.Reset()
+		g.writeOutput = genFileMap[file]
+		g.generate(file)
+		if !g.writeOutput {
+			continue
+		}
+		g.Response.File[i] = new(plugin.CodeGeneratorResponse_File)
+		g.Response.File[i].Name = proto.String(goFileName(*file.Name))
+		g.Response.File[i].Content = proto.String(g.String())
+		i++
+	}
+}
+
+// Run all the plugins associated with the file.
+func (g *Generator) runPlugins(file *FileDescriptor) {
+	for _, p := range plugins {
+		p.Generate(file)
+	}
+}
+
+// FileOf return the FileDescriptor for this FileDescriptorProto.
+func (g *Generator) FileOf(fd *descriptor.FileDescriptorProto) *FileDescriptor {
+	for _, file := range g.allFiles {
+		if file.FileDescriptorProto == fd {
+			return file
+		}
+	}
+	g.Fail("could not find file in table:", fd.GetName())
+	return nil
+}
+
+// Fill the response protocol buffer with the generated output for all the files we're
+// supposed to generate.
+func (g *Generator) generate(file *FileDescriptor) {
+	g.file = g.FileOf(file.FileDescriptorProto)
+	g.usedPackages = make(map[string]bool)
+
+	if g.file.index == 0 {
+		// For one file in the package, assert version compatibility.
+		g.P("// This is a compile-time assertion to ensure that this generated file")
+		g.P("// is compatible with the proto package it is being compiled against.")
+		g.P("const _ = ", g.Pkg["proto"], ".ProtoPackageIsVersion", generatedCodeVersion)
+		g.P()
+	}
+
+	for _, td := range g.file.imp {
+		g.generateImported(td)
+	}
+	for _, enum := range g.file.enum {
+		g.generateEnum(enum)
+	}
+	for _, desc := range g.file.desc {
+		// Don't generate virtual messages for maps.
+		if desc.GetOptions().GetMapEntry() {
+			continue
+		}
+		g.generateMessage(desc)
+	}
+	for _, ext := range g.file.ext {
+		g.generateExtension(ext)
+	}
+	g.generateInitFunction()
+
+	// Run the plugins before the imports so we know which imports are necessary.
+	g.runPlugins(file)
+
+	g.generateFileDescriptor(file)
+
+	// Generate header and imports last, though they appear first in the output.
+	rem := g.Buffer
+	g.Buffer = new(bytes.Buffer)
+	g.generateHeader()
+	g.generateImports()
+	if !g.writeOutput {
+		return
+	}
+	g.Write(rem.Bytes())
+
+	// Reformat generated code.
+	fset := token.NewFileSet()
+	raw := g.Bytes()
+	ast, err := parser.ParseFile(fset, "", g, parser.ParseComments)
+	if err != nil {
+		// Print out the bad code with line numbers.
+		// This should never happen in practice, but it can while changing generated code,
+		// so consider this a debugging aid.
+		var src bytes.Buffer
+		s := bufio.NewScanner(bytes.NewReader(raw))
+		for line := 1; s.Scan(); line++ {
+			fmt.Fprintf(&src, "%5d\t%s\n", line, s.Bytes())
+		}
+		g.Fail("bad Go source code was generated:", err.Error(), "\n"+src.String())
+	}
+	g.Reset()
+	err = (&printer.Config{Mode: printer.TabIndent | printer.UseSpaces, Tabwidth: 8}).Fprint(g, fset, ast)
+	if err != nil {
+		g.Fail("generated Go source code could not be reformatted:", err.Error())
+	}
+}
+
+// Generate the header, including package definition
+func (g *Generator) generateHeader() {
+	g.P("// Code generated by protoc-gen-go.")
+	g.P("// source: ", g.file.Name)
+	g.P("// DO NOT EDIT!")
+	g.P()
+
+	name := g.file.PackageName()
+
+	if g.file.index == 0 {
+		// Generate package docs for the first file in the package.
+		g.P("/*")
+		g.P("Package ", name, " is a generated protocol buffer package.")
+		g.P()
+		if loc, ok := g.file.comments[strconv.Itoa(packagePath)]; ok {
+			// not using g.PrintComments because this is a /* */ comment block.
+			text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
+			for _, line := range strings.Split(text, "\n") {
+				line = strings.TrimPrefix(line, " ")
+				// ensure we don't escape from the block comment
+				line = strings.Replace(line, "*/", "* /", -1)
+				g.P(line)
+			}
+			g.P()
+		}
+		var topMsgs []string
+		g.P("It is generated from these files:")
+		for _, f := range g.genFiles {
+			g.P("\t", f.Name)
+			for _, msg := range f.desc {
+				if msg.parent != nil {
+					continue
+				}
+				topMsgs = append(topMsgs, CamelCaseSlice(msg.TypeName()))
+			}
+		}
+		g.P()
+		g.P("It has these top-level messages:")
+		for _, msg := range topMsgs {
+			g.P("\t", msg)
+		}
+		g.P("*/")
+	}
+
+	g.P("package ", name)
+	g.P()
+}
+
+// PrintComments prints any comments from the source .proto file.
+// The path is a comma-separated list of integers.
+// It returns an indication of whether any comments were printed.
+// See descriptor.proto for its format.
+func (g *Generator) PrintComments(path string) bool {
+	if !g.writeOutput {
+		return false
+	}
+	if loc, ok := g.file.comments[path]; ok {
+		text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
+		for _, line := range strings.Split(text, "\n") {
+			g.P("// ", strings.TrimPrefix(line, " "))
+		}
+		return true
+	}
+	return false
+}
+
+func (g *Generator) fileByName(filename string) *FileDescriptor {
+	return g.allFilesByName[filename]
+}
+
+// weak returns whether the ith import of the current file is a weak import.
+func (g *Generator) weak(i int32) bool {
+	for _, j := range g.file.WeakDependency {
+		if j == i {
+			return true
+		}
+	}
+	return false
+}
+
+// Generate the imports
+func (g *Generator) generateImports() {
+	// We almost always need a proto import.  Rather than computing when we
+	// do, which is tricky when there's a plugin, just import it and
+	// reference it later. The same argument applies to the fmt and math packages.
+	g.P("import " + g.Pkg["proto"] + " " + strconv.Quote(g.ImportPrefix+"github.com/golang/protobuf/proto"))
+	g.P("import " + g.Pkg["fmt"] + ` "fmt"`)
+	g.P("import " + g.Pkg["math"] + ` "math"`)
+	for i, s := range g.file.Dependency {
+		fd := g.fileByName(s)
+		// Do not import our own package.
+		if fd.PackageName() == g.packageName {
+			continue
+		}
+		filename := goFileName(s)
+		// By default, import path is the dirname of the Go filename.
+		importPath := path.Dir(filename)
+		if substitution, ok := g.ImportMap[s]; ok {
+			importPath = substitution
+		}
+		importPath = g.ImportPrefix + importPath
+		// Skip weak imports.
+		if g.weak(int32(i)) {
+			g.P("// skipping weak import ", fd.PackageName(), " ", strconv.Quote(importPath))
+			continue
+		}
+		// We need to import all the dependencies, even if we don't reference them,
+		// because other code and tools depend on having the full transitive closure
+		// of protocol buffer types in the binary.
+		pname := fd.PackageName()
+		if _, ok := g.usedPackages[pname]; !ok {
+			pname = "_"
+		}
+		g.P("import ", pname, " ", strconv.Quote(importPath))
+	}
+	g.P()
+	// TODO: may need to worry about uniqueness across plugins
+	for _, p := range plugins {
+		p.GenerateImports(g.file)
+		g.P()
+	}
+	g.P("// Reference imports to suppress errors if they are not otherwise used.")
+	g.P("var _ = ", g.Pkg["proto"], ".Marshal")
+	g.P("var _ = ", g.Pkg["fmt"], ".Errorf")
+	g.P("var _ = ", g.Pkg["math"], ".Inf")
+	g.P()
+}
+
+func (g *Generator) generateImported(id *ImportedDescriptor) {
+	// Don't generate public import symbols for files that we are generating
+	// code for, since those symbols will already be in this package.
+	// We can't simply avoid creating the ImportedDescriptor objects,
+	// because g.genFiles isn't populated at that stage.
+	tn := id.TypeName()
+	sn := tn[len(tn)-1]
+	df := g.FileOf(id.o.File())
+	filename := *df.Name
+	for _, fd := range g.genFiles {
+		if *fd.Name == filename {
+			g.P("// Ignoring public import of ", sn, " from ", filename)
+			g.P()
+			return
+		}
+	}
+	g.P("// ", sn, " from public import ", filename)
+	g.usedPackages[df.PackageName()] = true
+
+	for _, sym := range df.exported[id.o] {
+		sym.GenerateAlias(g, df.PackageName())
+	}
+
+	g.P()
+}
+
+// Generate the enum definitions for this EnumDescriptor.
+func (g *Generator) generateEnum(enum *EnumDescriptor) {
+	// The full type name
+	typeName := enum.TypeName()
+	// The full type name, CamelCased.
+	ccTypeName := CamelCaseSlice(typeName)
+	ccPrefix := enum.prefix()
+
+	g.PrintComments(enum.path)
+	g.P("type ", ccTypeName, " int32")
+	g.file.addExport(enum, enumSymbol{ccTypeName, enum.proto3()})
+	g.P("const (")
+	g.In()
+	for i, e := range enum.Value {
+		g.PrintComments(fmt.Sprintf("%s,%d,%d", enum.path, enumValuePath, i))
+
+		name := ccPrefix + *e.Name
+		g.P(name, " ", ccTypeName, " = ", e.Number)
+		g.file.addExport(enum, constOrVarSymbol{name, "const", ccTypeName})
+	}
+	g.Out()
+	g.P(")")
+	g.P("var ", ccTypeName, "_name = map[int32]string{")
+	g.In()
+	generated := make(map[int32]bool) // avoid duplicate values
+	for _, e := range enum.Value {
+		duplicate := ""
+		if _, present := generated[*e.Number]; present {
+			duplicate = "// Duplicate value: "
+		}
+		g.P(duplicate, e.Number, ": ", strconv.Quote(*e.Name), ",")
+		generated[*e.Number] = true
+	}
+	g.Out()
+	g.P("}")
+	g.P("var ", ccTypeName, "_value = map[string]int32{")
+	g.In()
+	for _, e := range enum.Value {
+		g.P(strconv.Quote(*e.Name), ": ", e.Number, ",")
+	}
+	g.Out()
+	g.P("}")
+
+	if !enum.proto3() {
+		g.P("func (x ", ccTypeName, ") Enum() *", ccTypeName, " {")
+		g.In()
+		g.P("p := new(", ccTypeName, ")")
+		g.P("*p = x")
+		g.P("return p")
+		g.Out()
+		g.P("}")
+	}
+
+	g.P("func (x ", ccTypeName, ") String() string {")
+	g.In()
+	g.P("return ", g.Pkg["proto"], ".EnumName(", ccTypeName, "_name, int32(x))")
+	g.Out()
+	g.P("}")
+
+	if !enum.proto3() {
+		g.P("func (x *", ccTypeName, ") UnmarshalJSON(data []byte) error {")
+		g.In()
+		g.P("value, err := ", g.Pkg["proto"], ".UnmarshalJSONEnum(", ccTypeName, `_value, data, "`, ccTypeName, `")`)
+		g.P("if err != nil {")
+		g.In()
+		g.P("return err")
+		g.Out()
+		g.P("}")
+		g.P("*x = ", ccTypeName, "(value)")
+		g.P("return nil")
+		g.Out()
+		g.P("}")
+	}
+
+	var indexes []string
+	for m := enum.parent; m != nil; m = m.parent {
+		// XXX: skip groups?
+		indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
+	}
+	indexes = append(indexes, strconv.Itoa(enum.index))
+	g.P("func (", ccTypeName, ") EnumDescriptor() ([]byte, []int) { return fileDescriptor", g.file.index, ", []int{", strings.Join(indexes, ", "), "} }")
+
+	g.P()
+}
+
+// The tag is a string like "varint,2,opt,name=fieldname,def=7" that
+// identifies details of the field for the protocol buffer marshaling and unmarshaling
+// code.  The fields are:
+//	wire encoding
+//	protocol tag number
+//	opt,req,rep for optional, required, or repeated
+//	packed whether the encoding is "packed" (optional; repeated primitives only)
+//	name= the original declared name
+//	enum= the name of the enum type if it is an enum-typed field.
+//	proto3 if this field is in a proto3 message
+//	def= string representation of the default value, if any.
+// The default value must be in a representation that can be used at run-time
+// to generate the default value. Thus bools become 0 and 1, for instance.
+func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptorProto, wiretype string) string {
+	optrepreq := ""
+	switch {
+	case isOptional(field):
+		optrepreq = "opt"
+	case isRequired(field):
+		optrepreq = "req"
+	case isRepeated(field):
+		optrepreq = "rep"
+	}
+	var defaultValue string
+	if dv := field.DefaultValue; dv != nil { // set means an explicit default
+		defaultValue = *dv
+		// Some types need tweaking.
+		switch *field.Type {
+		case descriptor.FieldDescriptorProto_TYPE_BOOL:
+			if defaultValue == "true" {
+				defaultValue = "1"
+			} else {
+				defaultValue = "0"
+			}
+		case descriptor.FieldDescriptorProto_TYPE_STRING,
+			descriptor.FieldDescriptorProto_TYPE_BYTES:
+			// Nothing to do. Quoting is done for the whole tag.
+		case descriptor.FieldDescriptorProto_TYPE_ENUM:
+			// For enums we need to provide the integer constant.
+			obj := g.ObjectNamed(field.GetTypeName())
+			if id, ok := obj.(*ImportedDescriptor); ok {
+				// It is an enum that was publicly imported.
+				// We need the underlying type.
+				obj = id.o
+			}
+			enum, ok := obj.(*EnumDescriptor)
+			if !ok {
+				log.Printf("obj is a %T", obj)
+				if id, ok := obj.(*ImportedDescriptor); ok {
+					log.Printf("id.o is a %T", id.o)
+				}
+				g.Fail("unknown enum type", CamelCaseSlice(obj.TypeName()))
+			}
+			defaultValue = enum.integerValueAsString(defaultValue)
+		}
+		defaultValue = ",def=" + defaultValue
+	}
+	enum := ""
+	if *field.Type == descriptor.FieldDescriptorProto_TYPE_ENUM {
+		// We avoid using obj.PackageName(), because we want to use the
+		// original (proto-world) package name.
+		obj := g.ObjectNamed(field.GetTypeName())
+		if id, ok := obj.(*ImportedDescriptor); ok {
+			obj = id.o
+		}
+		enum = ",enum="
+		if pkg := obj.File().GetPackage(); pkg != "" {
+			enum += pkg + "."
+		}
+		enum += CamelCaseSlice(obj.TypeName())
+	}
+	packed := ""
+	if field.Options != nil && field.Options.GetPacked() {
+		packed = ",packed"
+	}
+	fieldName := field.GetName()
+	name := fieldName
+	if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
+		// We must use the type name for groups instead of
+		// the field name to preserve capitalization.
+		// type_name in FieldDescriptorProto is fully-qualified,
+		// but we only want the local part.
+		name = *field.TypeName
+		if i := strings.LastIndex(name, "."); i >= 0 {
+			name = name[i+1:]
+		}
+	}
+	name = ",name=" + name
+	if message.proto3() {
+		// We only need the extra tag for []byte fields;
+		// no need to add noise for the others.
+		if *field.Type == descriptor.FieldDescriptorProto_TYPE_BYTES {
+			name += ",proto3"
+		}
+
+	}
+	oneof := ""
+	if field.OneofIndex != nil {
+		oneof = ",oneof"
+	}
+	return strconv.Quote(fmt.Sprintf("%s,%d,%s%s%s%s%s%s",
+		wiretype,
+		field.GetNumber(),
+		optrepreq,
+		packed,
+		name,
+		enum,
+		oneof,
+		defaultValue))
+}
+
+func needsStar(typ descriptor.FieldDescriptorProto_Type) bool {
+	switch typ {
+	case descriptor.FieldDescriptorProto_TYPE_GROUP:
+		return false
+	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+		return false
+	case descriptor.FieldDescriptorProto_TYPE_BYTES:
+		return false
+	}
+	return true
+}
+
+// TypeName is the printed name appropriate for an item. If the object is in the current file,
+// TypeName drops the package name and underscores the rest.
+// Otherwise the object is from another package; and the result is the underscored
+// package name followed by the item name.
+// The result always has an initial capital.
+func (g *Generator) TypeName(obj Object) string {
+	return g.DefaultPackageName(obj) + CamelCaseSlice(obj.TypeName())
+}
+
+// TypeNameWithPackage is like TypeName, but always includes the package
+// name even if the object is in our own package.
+func (g *Generator) TypeNameWithPackage(obj Object) string {
+	return obj.PackageName() + CamelCaseSlice(obj.TypeName())
+}
+
+// GoType returns a string representing the type name, and the wire type
+func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescriptorProto) (typ string, wire string) {
+	// TODO: Options.
+	switch *field.Type {
+	case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
+		typ, wire = "float64", "fixed64"
+	case descriptor.FieldDescriptorProto_TYPE_FLOAT:
+		typ, wire = "float32", "fixed32"
+	case descriptor.FieldDescriptorProto_TYPE_INT64:
+		typ, wire = "int64", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_UINT64:
+		typ, wire = "uint64", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_INT32:
+		typ, wire = "int32", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_UINT32:
+		typ, wire = "uint32", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_FIXED64:
+		typ, wire = "uint64", "fixed64"
+	case descriptor.FieldDescriptorProto_TYPE_FIXED32:
+		typ, wire = "uint32", "fixed32"
+	case descriptor.FieldDescriptorProto_TYPE_BOOL:
+		typ, wire = "bool", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_STRING:
+		typ, wire = "string", "bytes"
+	case descriptor.FieldDescriptorProto_TYPE_GROUP:
+		desc := g.ObjectNamed(field.GetTypeName())
+		typ, wire = "*"+g.TypeName(desc), "group"
+	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+		desc := g.ObjectNamed(field.GetTypeName())
+		typ, wire = "*"+g.TypeName(desc), "bytes"
+	case descriptor.FieldDescriptorProto_TYPE_BYTES:
+		typ, wire = "[]byte", "bytes"
+	case descriptor.FieldDescriptorProto_TYPE_ENUM:
+		desc := g.ObjectNamed(field.GetTypeName())
+		typ, wire = g.TypeName(desc), "varint"
+	case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
+		typ, wire = "int32", "fixed32"
+	case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
+		typ, wire = "int64", "fixed64"
+	case descriptor.FieldDescriptorProto_TYPE_SINT32:
+		typ, wire = "int32", "zigzag32"
+	case descriptor.FieldDescriptorProto_TYPE_SINT64:
+		typ, wire = "int64", "zigzag64"
+	default:
+		g.Fail("unknown type for", field.GetName())
+	}
+	if isRepeated(field) {
+		typ = "[]" + typ
+	} else if message != nil && message.proto3() {
+		return
+	} else if field.OneofIndex != nil && message != nil {
+		return
+	} else if needsStar(*field.Type) {
+		typ = "*" + typ
+	}
+	return
+}
+
+func (g *Generator) RecordTypeUse(t string) {
+	if obj, ok := g.typeNameToObject[t]; ok {
+		// Call ObjectNamed to get the true object to record the use.
+		obj = g.ObjectNamed(t)
+		g.usedPackages[obj.PackageName()] = true
+	}
+}
+
+// Method names that may be generated.  Fields with these names get an
+// underscore appended.
+var methodNames = [...]string{
+	"Reset",
+	"String",
+	"ProtoMessage",
+	"Marshal",
+	"Unmarshal",
+	"ExtensionRangeArray",
+	"ExtensionMap",
+	"Descriptor",
+}
+
+// Generate the type and default constant definitions for this Descriptor.
+func (g *Generator) generateMessage(message *Descriptor) {
+	// The full type name
+	typeName := message.TypeName()
+	// The full type name, CamelCased.
+	ccTypeName := CamelCaseSlice(typeName)
+
+	usedNames := make(map[string]bool)
+	for _, n := range methodNames {
+		usedNames[n] = true
+	}
+	fieldNames := make(map[*descriptor.FieldDescriptorProto]string)
+	fieldGetterNames := make(map[*descriptor.FieldDescriptorProto]string)
+	fieldTypes := make(map[*descriptor.FieldDescriptorProto]string)
+	mapFieldTypes := make(map[*descriptor.FieldDescriptorProto]string)
+
+	oneofFieldName := make(map[int32]string)                           // indexed by oneof_index field of FieldDescriptorProto
+	oneofDisc := make(map[int32]string)                                // name of discriminator method
+	oneofTypeName := make(map[*descriptor.FieldDescriptorProto]string) // without star
+	oneofInsertPoints := make(map[int32]int)                           // oneof_index => offset of g.Buffer
+
+	g.PrintComments(message.path)
+	g.P("type ", ccTypeName, " struct {")
+	g.In()
+
+	// allocNames finds a conflict-free variation of the given strings,
+	// consistently mutating their suffixes.
+	// It returns the same number of strings.
+	allocNames := func(ns ...string) []string {
+	Loop:
+		for {
+			for _, n := range ns {
+				if usedNames[n] {
+					for i := range ns {
+						ns[i] += "_"
+					}
+					continue Loop
+				}
+			}
+			for _, n := range ns {
+				usedNames[n] = true
+			}
+			return ns
+		}
+	}
+
+	for i, field := range message.Field {
+		// Allocate the getter and the field at the same time so name
+		// collisions create field/method consistent names.
+		// TODO: This allocation occurs based on the order of the fields
+		// in the proto file, meaning that a change in the field
+		// ordering can change generated Method/Field names.
+		base := CamelCase(*field.Name)
+		ns := allocNames(base, "Get"+base)
+		fieldName, fieldGetterName := ns[0], ns[1]
+		typename, wiretype := g.GoType(message, field)
+		jsonName := *field.Name
+		tag := fmt.Sprintf("protobuf:%s json:%q", g.goTag(message, field, wiretype), jsonName+",omitempty")
+
+		fieldNames[field] = fieldName
+		fieldGetterNames[field] = fieldGetterName
+
+		oneof := field.OneofIndex != nil
+		if oneof && oneofFieldName[*field.OneofIndex] == "" {
+			odp := message.OneofDecl[int(*field.OneofIndex)]
+			fname := allocNames(CamelCase(odp.GetName()))[0]
+
+			// This is the first field of a oneof we haven't seen before.
+			// Generate the union field.
+			com := g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageOneofPath, *field.OneofIndex))
+			if com {
+				g.P("//")
+			}
+			g.P("// Types that are valid to be assigned to ", fname, ":")
+			// Generate the rest of this comment later,
+			// when we've computed any disambiguation.
+			oneofInsertPoints[*field.OneofIndex] = g.Buffer.Len()
+
+			dname := "is" + ccTypeName + "_" + fname
+			oneofFieldName[*field.OneofIndex] = fname
+			oneofDisc[*field.OneofIndex] = dname
+			tag := `protobuf_oneof:"` + odp.GetName() + `"`
+			g.P(fname, " ", dname, " `", tag, "`")
+		}
+
+		if *field.Type == descriptor.FieldDescriptorProto_TYPE_MESSAGE {
+			desc := g.ObjectNamed(field.GetTypeName())
+			if d, ok := desc.(*Descriptor); ok && d.GetOptions().GetMapEntry() {
+				// Figure out the Go types and tags for the key and value types.
+				keyField, valField := d.Field[0], d.Field[1]
+				keyType, keyWire := g.GoType(d, keyField)
+				valType, valWire := g.GoType(d, valField)
+				keyTag, valTag := g.goTag(d, keyField, keyWire), g.goTag(d, valField, valWire)
+
+				// We don't use stars, except for message-typed values.
+				// Message and enum types are the only two possibly foreign types used in maps,
+				// so record their use. They are not permitted as map keys.
+				keyType = strings.TrimPrefix(keyType, "*")
+				switch *valField.Type {
+				case descriptor.FieldDescriptorProto_TYPE_ENUM:
+					valType = strings.TrimPrefix(valType, "*")
+					g.RecordTypeUse(valField.GetTypeName())
+				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+					g.RecordTypeUse(valField.GetTypeName())
+				default:
+					valType = strings.TrimPrefix(valType, "*")
+				}
+
+				typename = fmt.Sprintf("map[%s]%s", keyType, valType)
+				mapFieldTypes[field] = typename // record for the getter generation
+
+				tag += fmt.Sprintf(" protobuf_key:%s protobuf_val:%s", keyTag, valTag)
+			}
+		}
+
+		fieldTypes[field] = typename
+
+		if oneof {
+			tname := ccTypeName + "_" + fieldName
+			// It is possible for this to collide with a message or enum
+			// nested in this message. Check for collisions.
+			for {
+				ok := true
+				for _, desc := range message.nested {
+					if CamelCaseSlice(desc.TypeName()) == tname {
+						ok = false
+						break
+					}
+				}
+				for _, enum := range message.enums {
+					if CamelCaseSlice(enum.TypeName()) == tname {
+						ok = false
+						break
+					}
+				}
+				if !ok {
+					tname += "_"
+					continue
+				}
+				break
+			}
+
+			oneofTypeName[field] = tname
+			continue
+		}
+
+		g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageFieldPath, i))
+		g.P(fieldName, "\t", typename, "\t`", tag, "`")
+		g.RecordTypeUse(field.GetTypeName())
+	}
+	if len(message.ExtensionRange) > 0 {
+		g.P("XXX_extensions\t\tmap[int32]", g.Pkg["proto"], ".Extension `json:\"-\"`")
+	}
+	if !message.proto3() {
+		g.P("XXX_unrecognized\t[]byte `json:\"-\"`")
+	}
+	g.Out()
+	g.P("}")
+
+	// Update g.Buffer to list valid oneof types.
+	// We do this down here, after we've disambiguated the oneof type names.
+	// We go in reverse order of insertion point to avoid invalidating offsets.
+	for oi := int32(len(message.OneofDecl)); oi >= 0; oi-- {
+		ip := oneofInsertPoints[oi]
+		all := g.Buffer.Bytes()
+		rem := all[ip:]
+		g.Buffer = bytes.NewBuffer(all[:ip:ip]) // set cap so we don't scribble on rem
+		for _, field := range message.Field {
+			if field.OneofIndex == nil || *field.OneofIndex != oi {
+				continue
+			}
+			g.P("//\t*", oneofTypeName[field])
+		}
+		g.Buffer.Write(rem)
+	}
+
+	// Reset, String and ProtoMessage methods.
+	g.P("func (m *", ccTypeName, ") Reset() { *m = ", ccTypeName, "{} }")
+	g.P("func (m *", ccTypeName, ") String() string { return ", g.Pkg["proto"], ".CompactTextString(m) }")
+	g.P("func (*", ccTypeName, ") ProtoMessage() {}")
+	if !message.group {
+		var indexes []string
+		for m := message; m != nil; m = m.parent {
+			// XXX: skip groups?
+			indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
+		}
+		g.P("func (*", ccTypeName, ") Descriptor() ([]byte, []int) { return fileDescriptor", g.file.index, ", []int{", strings.Join(indexes, ", "), "} }")
+	}
+
+	// Extension support methods
+	var hasExtensions, isMessageSet bool
+	if len(message.ExtensionRange) > 0 {
+		hasExtensions = true
+		// message_set_wire_format only makes sense when extensions are defined.
+		if opts := message.Options; opts != nil && opts.GetMessageSetWireFormat() {
+			isMessageSet = true
+			g.P()
+			g.P("func (m *", ccTypeName, ") Marshal() ([]byte, error) {")
+			g.In()
+			g.P("return ", g.Pkg["proto"], ".MarshalMessageSet(m.ExtensionMap())")
+			g.Out()
+			g.P("}")
+			g.P("func (m *", ccTypeName, ") Unmarshal(buf []byte) error {")
+			g.In()
+			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSet(buf, m.ExtensionMap())")
+			g.Out()
+			g.P("}")
+			g.P("func (m *", ccTypeName, ") MarshalJSON() ([]byte, error) {")
+			g.In()
+			g.P("return ", g.Pkg["proto"], ".MarshalMessageSetJSON(m.XXX_extensions)")
+			g.Out()
+			g.P("}")
+			g.P("func (m *", ccTypeName, ") UnmarshalJSON(buf []byte) error {")
+			g.In()
+			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSetJSON(buf, m.XXX_extensions)")
+			g.Out()
+			g.P("}")
+			g.P("// ensure ", ccTypeName, " satisfies proto.Marshaler and proto.Unmarshaler")
+			g.P("var _ ", g.Pkg["proto"], ".Marshaler = (*", ccTypeName, ")(nil)")
+			g.P("var _ ", g.Pkg["proto"], ".Unmarshaler = (*", ccTypeName, ")(nil)")
+		}
+
+		g.P()
+		g.P("var extRange_", ccTypeName, " = []", g.Pkg["proto"], ".ExtensionRange{")
+		g.In()
+		for _, r := range message.ExtensionRange {
+			end := fmt.Sprint(*r.End - 1) // make range inclusive on both ends
+			g.P("{", r.Start, ", ", end, "},")
+		}
+		g.Out()
+		g.P("}")
+		g.P("func (*", ccTypeName, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange {")
+		g.In()
+		g.P("return extRange_", ccTypeName)
+		g.Out()
+		g.P("}")
+		g.P("func (m *", ccTypeName, ") ExtensionMap() map[int32]", g.Pkg["proto"], ".Extension {")
+		g.In()
+		g.P("if m.XXX_extensions == nil {")
+		g.In()
+		g.P("m.XXX_extensions = make(map[int32]", g.Pkg["proto"], ".Extension)")
+		g.Out()
+		g.P("}")
+		g.P("return m.XXX_extensions")
+		g.Out()
+		g.P("}")
+	}
+
+	// Default constants
+	defNames := make(map[*descriptor.FieldDescriptorProto]string)
+	for _, field := range message.Field {
+		def := field.GetDefaultValue()
+		if def == "" {
+			continue
+		}
+		fieldname := "Default_" + ccTypeName + "_" + CamelCase(*field.Name)
+		defNames[field] = fieldname
+		typename, _ := g.GoType(message, field)
+		if typename[0] == '*' {
+			typename = typename[1:]
+		}
+		kind := "const "
+		switch {
+		case typename == "bool":
+		case typename == "string":
+			def = strconv.Quote(def)
+		case typename == "[]byte":
+			def = "[]byte(" + strconv.Quote(def) + ")"
+			kind = "var "
+		case def == "inf", def == "-inf", def == "nan":
+			// These names are known to, and defined by, the protocol language.
+			switch def {
+			case "inf":
+				def = "math.Inf(1)"
+			case "-inf":
+				def = "math.Inf(-1)"
+			case "nan":
+				def = "math.NaN()"
+			}
+			if *field.Type == descriptor.FieldDescriptorProto_TYPE_FLOAT {
+				def = "float32(" + def + ")"
+			}
+			kind = "var "
+		case *field.Type == descriptor.FieldDescriptorProto_TYPE_ENUM:
+			// Must be an enum.  Need to construct the prefixed name.
+			obj := g.ObjectNamed(field.GetTypeName())
+			var enum *EnumDescriptor
+			if id, ok := obj.(*ImportedDescriptor); ok {
+				// The enum type has been publicly imported.
+				enum, _ = id.o.(*EnumDescriptor)
+			} else {
+				enum, _ = obj.(*EnumDescriptor)
+			}
+			if enum == nil {
+				log.Printf("don't know how to generate constant for %s", fieldname)
+				continue
+			}
+			def = g.DefaultPackageName(obj) + enum.prefix() + def
+		}
+		g.P(kind, fieldname, " ", typename, " = ", def)
+		g.file.addExport(message, constOrVarSymbol{fieldname, kind, ""})
+	}
+	g.P()
+
+	// Oneof per-field types, discriminants and getters.
+	//
+	// Generate unexported named types for the discriminant interfaces.
+	// We shouldn't have to do this, but there was (~19 Aug 2015) a compiler/linker bug
+	// that was triggered by using anonymous interfaces here.
+	// TODO: Revisit this and consider reverting back to anonymous interfaces.
+	for oi := range message.OneofDecl {
+		dname := oneofDisc[int32(oi)]
+		g.P("type ", dname, " interface { ", dname, "() }")
+	}
+	g.P()
+	for _, field := range message.Field {
+		if field.OneofIndex == nil {
+			continue
+		}
+		_, wiretype := g.GoType(message, field)
+		tag := "protobuf:" + g.goTag(message, field, wiretype)
+		g.P("type ", oneofTypeName[field], " struct{ ", fieldNames[field], " ", fieldTypes[field], " `", tag, "` }")
+		g.RecordTypeUse(field.GetTypeName())
+	}
+	g.P()
+	for _, field := range message.Field {
+		if field.OneofIndex == nil {
+			continue
+		}
+		g.P("func (*", oneofTypeName[field], ") ", oneofDisc[*field.OneofIndex], "() {}")
+	}
+	g.P()
+	for oi := range message.OneofDecl {
+		fname := oneofFieldName[int32(oi)]
+		g.P("func (m *", ccTypeName, ") Get", fname, "() ", oneofDisc[int32(oi)], " {")
+		g.P("if m != nil { return m.", fname, " }")
+		g.P("return nil")
+		g.P("}")
+	}
+	g.P()
+
+	// Field getters
+	var getters []getterSymbol
+	for _, field := range message.Field {
+		oneof := field.OneofIndex != nil
+
+		fname := fieldNames[field]
+		typename, _ := g.GoType(message, field)
+		if t, ok := mapFieldTypes[field]; ok {
+			typename = t
+		}
+		mname := fieldGetterNames[field]
+		star := ""
+		if needsStar(*field.Type) && typename[0] == '*' {
+			typename = typename[1:]
+			star = "*"
+		}
+
+		// In proto3, only generate getters for message fields and oneof fields.
+		if message.proto3() && *field.Type != descriptor.FieldDescriptorProto_TYPE_MESSAGE && !oneof {
+			continue
+		}
+
+		// Only export getter symbols for basic types,
+		// and for messages and enums in the same package.
+		// Groups are not exported.
+		// Foreign types can't be hoisted through a public import because
+		// the importer may not already be importing the defining .proto.
+		// As an example, imagine we have an import tree like this:
+		//   A.proto -> B.proto -> C.proto
+		// If A publicly imports B, we need to generate the getters from B in A's output,
+		// but if one such getter returns something from C then we cannot do that
+		// because A is not importing C already.
+		var getter, genType bool
+		switch *field.Type {
+		case descriptor.FieldDescriptorProto_TYPE_GROUP:
+			getter = false
+		case descriptor.FieldDescriptorProto_TYPE_MESSAGE, descriptor.FieldDescriptorProto_TYPE_ENUM:
+			// Only export getter if its return type is in this package.
+			getter = g.ObjectNamed(field.GetTypeName()).PackageName() == message.PackageName()
+			genType = true
+		default:
+			getter = true
+		}
+		if getter {
+			getters = append(getters, getterSymbol{
+				name:     mname,
+				typ:      typename,
+				typeName: field.GetTypeName(),
+				genType:  genType,
+			})
+		}
+
+		g.P("func (m *", ccTypeName, ") "+mname+"() "+typename+" {")
+		g.In()
+		def, hasDef := defNames[field]
+		typeDefaultIsNil := false // whether this field type's default value is a literal nil unless specified
+		switch *field.Type {
+		case descriptor.FieldDescriptorProto_TYPE_BYTES:
+			typeDefaultIsNil = !hasDef
+		case descriptor.FieldDescriptorProto_TYPE_GROUP, descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+			typeDefaultIsNil = true
+		}
+		if isRepeated(field) {
+			typeDefaultIsNil = true
+		}
+		if typeDefaultIsNil && !oneof {
+			// A bytes field with no explicit default needs less generated code,
+			// as does a message or group field, or a repeated field.
+			g.P("if m != nil {")
+			g.In()
+			g.P("return m." + fname)
+			g.Out()
+			g.P("}")
+			g.P("return nil")
+			g.Out()
+			g.P("}")
+			g.P()
+			continue
+		}
+		if !oneof {
+			g.P("if m != nil && m." + fname + " != nil {")
+			g.In()
+			g.P("return " + star + "m." + fname)
+			g.Out()
+			g.P("}")
+		} else {
+			uname := oneofFieldName[*field.OneofIndex]
+			tname := oneofTypeName[field]
+			g.P("if x, ok := m.Get", uname, "().(*", tname, "); ok {")
+			g.P("return x.", fname)
+			g.P("}")
+		}
+		if hasDef {
+			if *field.Type != descriptor.FieldDescriptorProto_TYPE_BYTES {
+				g.P("return " + def)
+			} else {
+				// The default is a []byte var.
+				// Make a copy when returning it to be safe.
+				g.P("return append([]byte(nil), ", def, "...)")
+			}
+		} else {
+			switch *field.Type {
+			case descriptor.FieldDescriptorProto_TYPE_BOOL:
+				g.P("return false")
+			case descriptor.FieldDescriptorProto_TYPE_STRING:
+				g.P(`return ""`)
+			case descriptor.FieldDescriptorProto_TYPE_GROUP,
+				descriptor.FieldDescriptorProto_TYPE_MESSAGE,
+				descriptor.FieldDescriptorProto_TYPE_BYTES:
+				// This is only possible for oneof fields.
+				g.P("return nil")
+			case descriptor.FieldDescriptorProto_TYPE_ENUM:
+				// The default default for an enum is the first value in the enum,
+				// not zero.
+				obj := g.ObjectNamed(field.GetTypeName())
+				var enum *EnumDescriptor
+				if id, ok := obj.(*ImportedDescriptor); ok {
+					// The enum type has been publicly imported.
+					enum, _ = id.o.(*EnumDescriptor)
+				} else {
+					enum, _ = obj.(*EnumDescriptor)
+				}
+				if enum == nil {
+					log.Printf("don't know how to generate getter for %s", field.GetName())
+					continue
+				}
+				if len(enum.Value) == 0 {
+					g.P("return 0 // empty enum")
+				} else {
+					first := enum.Value[0].GetName()
+					g.P("return ", g.DefaultPackageName(obj)+enum.prefix()+first)
+				}
+			default:
+				g.P("return 0")
+			}
+		}
+		g.Out()
+		g.P("}")
+		g.P()
+	}
+
+	if !message.group {
+		ms := &messageSymbol{
+			sym:           ccTypeName,
+			hasExtensions: hasExtensions,
+			isMessageSet:  isMessageSet,
+			hasOneof:      len(message.OneofDecl) > 0,
+			getters:       getters,
+		}
+		g.file.addExport(message, ms)
+	}
+
+	// Oneof functions
+	if len(message.OneofDecl) > 0 {
+		fieldWire := make(map[*descriptor.FieldDescriptorProto]string)
+
+		// method
+		enc := "_" + ccTypeName + "_OneofMarshaler"
+		dec := "_" + ccTypeName + "_OneofUnmarshaler"
+		size := "_" + ccTypeName + "_OneofSizer"
+		encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error"
+		decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)"
+		sizeSig := "(msg " + g.Pkg["proto"] + ".Message) (n int)"
+
+		g.P("// XXX_OneofFuncs is for the internal use of the proto package.")
+		g.P("func (*", ccTypeName, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {")
+		g.P("return ", enc, ", ", dec, ", ", size, ", []interface{}{")
+		for _, field := range message.Field {
+			if field.OneofIndex == nil {
+				continue
+			}
+			g.P("(*", oneofTypeName[field], ")(nil),")
+		}
+		g.P("}")
+		g.P("}")
+		g.P()
+
+		// marshaler
+		g.P("func ", enc, encSig, " {")
+		g.P("m := msg.(*", ccTypeName, ")")
+		for oi, odp := range message.OneofDecl {
+			g.P("// ", odp.GetName())
+			fname := oneofFieldName[int32(oi)]
+			g.P("switch x := m.", fname, ".(type) {")
+			for _, field := range message.Field {
+				if field.OneofIndex == nil || int(*field.OneofIndex) != oi {
+					continue
+				}
+				g.P("case *", oneofTypeName[field], ":")
+				var wire, pre, post string
+				val := "x." + fieldNames[field] // overridden for TYPE_BOOL
+				canFail := false                // only TYPE_MESSAGE and TYPE_GROUP can fail
+				switch *field.Type {
+				case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
+					wire = "WireFixed64"
+					pre = "b.EncodeFixed64(" + g.Pkg["math"] + ".Float64bits("
+					post = "))"
+				case descriptor.FieldDescriptorProto_TYPE_FLOAT:
+					wire = "WireFixed32"
+					pre = "b.EncodeFixed32(uint64(" + g.Pkg["math"] + ".Float32bits("
+					post = ")))"
+				case descriptor.FieldDescriptorProto_TYPE_INT64,
+					descriptor.FieldDescriptorProto_TYPE_UINT64:
+					wire = "WireVarint"
+					pre, post = "b.EncodeVarint(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_INT32,
+					descriptor.FieldDescriptorProto_TYPE_UINT32,
+					descriptor.FieldDescriptorProto_TYPE_ENUM:
+					wire = "WireVarint"
+					pre, post = "b.EncodeVarint(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_FIXED64,
+					descriptor.FieldDescriptorProto_TYPE_SFIXED64:
+					wire = "WireFixed64"
+					pre, post = "b.EncodeFixed64(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_FIXED32,
+					descriptor.FieldDescriptorProto_TYPE_SFIXED32:
+					wire = "WireFixed32"
+					pre, post = "b.EncodeFixed32(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_BOOL:
+					// bool needs special handling.
+					g.P("t := uint64(0)")
+					g.P("if ", val, " { t = 1 }")
+					val = "t"
+					wire = "WireVarint"
+					pre, post = "b.EncodeVarint(", ")"
+				case descriptor.FieldDescriptorProto_TYPE_STRING:
+					wire = "WireBytes"
+					pre, post = "b.EncodeStringBytes(", ")"
+				case descriptor.FieldDescriptorProto_TYPE_GROUP:
+					wire = "WireStartGroup"
+					pre, post = "b.Marshal(", ")"
+					canFail = true
+				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+					wire = "WireBytes"
+					pre, post = "b.EncodeMessage(", ")"
+					canFail = true
+				case descriptor.FieldDescriptorProto_TYPE_BYTES:
+					wire = "WireBytes"
+					pre, post = "b.EncodeRawBytes(", ")"
+				case descriptor.FieldDescriptorProto_TYPE_SINT32:
+					wire = "WireVarint"
+					pre, post = "b.EncodeZigzag32(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_SINT64:
+					wire = "WireVarint"
+					pre, post = "b.EncodeZigzag64(uint64(", "))"
+				default:
+					g.Fail("unhandled oneof field type ", field.Type.String())
+				}
+				fieldWire[field] = wire
+				g.P("b.EncodeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".", wire, ")")
+				if !canFail {
+					g.P(pre, val, post)
+				} else {
+					g.P("if err := ", pre, val, post, "; err != nil {")
+					g.P("return err")
+					g.P("}")
+				}
+				if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
+					g.P("b.EncodeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".WireEndGroup)")
+				}
+			}
+			g.P("case nil:")
+			g.P("default: return ", g.Pkg["fmt"], `.Errorf("`, ccTypeName, ".", fname, ` has unexpected type %T", x)`)
+			g.P("}")
+		}
+		g.P("return nil")
+		g.P("}")
+		g.P()
+
+		// unmarshaler
+		g.P("func ", dec, decSig, " {")
+		g.P("m := msg.(*", ccTypeName, ")")
+		g.P("switch tag {")
+		for _, field := range message.Field {
+			if field.OneofIndex == nil {
+				continue
+			}
+			odp := message.OneofDecl[int(*field.OneofIndex)]
+			g.P("case ", field.Number, ": // ", odp.GetName(), ".", *field.Name)
+			g.P("if wire != ", g.Pkg["proto"], ".", fieldWire[field], " {")
+			g.P("return true, ", g.Pkg["proto"], ".ErrInternalBadWireType")
+			g.P("}")
+			lhs := "x, err" // overridden for TYPE_MESSAGE and TYPE_GROUP
+			var dec, cast, cast2 string
+			switch *field.Type {
+			case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
+				dec, cast = "b.DecodeFixed64()", g.Pkg["math"]+".Float64frombits"
+			case descriptor.FieldDescriptorProto_TYPE_FLOAT:
+				dec, cast, cast2 = "b.DecodeFixed32()", "uint32", g.Pkg["math"]+".Float32frombits"
+			case descriptor.FieldDescriptorProto_TYPE_INT64:
+				dec, cast = "b.DecodeVarint()", "int64"
+			case descriptor.FieldDescriptorProto_TYPE_UINT64:
+				dec = "b.DecodeVarint()"
+			case descriptor.FieldDescriptorProto_TYPE_INT32:
+				dec, cast = "b.DecodeVarint()", "int32"
+			case descriptor.FieldDescriptorProto_TYPE_FIXED64:
+				dec = "b.DecodeFixed64()"
+			case descriptor.FieldDescriptorProto_TYPE_FIXED32:
+				dec, cast = "b.DecodeFixed32()", "uint32"
+			case descriptor.FieldDescriptorProto_TYPE_BOOL:
+				dec = "b.DecodeVarint()"
+				// handled specially below
+			case descriptor.FieldDescriptorProto_TYPE_STRING:
+				dec = "b.DecodeStringBytes()"
+			case descriptor.FieldDescriptorProto_TYPE_GROUP:
+				g.P("msg := new(", fieldTypes[field][1:], ")") // drop star
+				lhs = "err"
+				dec = "b.DecodeGroup(msg)"
+				// handled specially below
+			case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+				g.P("msg := new(", fieldTypes[field][1:], ")") // drop star
+				lhs = "err"
+				dec = "b.DecodeMessage(msg)"
+				// handled specially below
+			case descriptor.FieldDescriptorProto_TYPE_BYTES:
+				dec = "b.DecodeRawBytes(true)"
+			case descriptor.FieldDescriptorProto_TYPE_UINT32:
+				dec, cast = "b.DecodeVarint()", "uint32"
+			case descriptor.FieldDescriptorProto_TYPE_ENUM:
+				dec, cast = "b.DecodeVarint()", fieldTypes[field]
+			case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
+				dec, cast = "b.DecodeFixed32()", "int32"
+			case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
+				dec, cast = "b.DecodeFixed64()", "int64"
+			case descriptor.FieldDescriptorProto_TYPE_SINT32:
+				dec, cast = "b.DecodeZigzag32()", "int32"
+			case descriptor.FieldDescriptorProto_TYPE_SINT64:
+				dec, cast = "b.DecodeZigzag64()", "int64"
+			default:
+				g.Fail("unhandled oneof field type ", field.Type.String())
+			}
+			g.P(lhs, " := ", dec)
+			val := "x"
+			if cast != "" {
+				val = cast + "(" + val + ")"
+			}
+			if cast2 != "" {
+				val = cast2 + "(" + val + ")"
+			}
+			switch *field.Type {
+			case descriptor.FieldDescriptorProto_TYPE_BOOL:
+				val += " != 0"
+			case descriptor.FieldDescriptorProto_TYPE_GROUP,
+				descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+				val = "msg"
+			}
+			g.P("m.", oneofFieldName[*field.OneofIndex], " = &", oneofTypeName[field], "{", val, "}")
+			g.P("return true, err")
+		}
+		g.P("default: return false, nil")
+		g.P("}")
+		g.P("}")
+		g.P()
+
+		// sizer
+		g.P("func ", size, sizeSig, " {")
+		g.P("m := msg.(*", ccTypeName, ")")
+		for oi, odp := range message.OneofDecl {
+			g.P("// ", odp.GetName())
+			fname := oneofFieldName[int32(oi)]
+			g.P("switch x := m.", fname, ".(type) {")
+			for _, field := range message.Field {
+				if field.OneofIndex == nil || int(*field.OneofIndex) != oi {
+					continue
+				}
+				g.P("case *", oneofTypeName[field], ":")
+				val := "x." + fieldNames[field]
+				var wire, varint, fixed string
+				switch *field.Type {
+				case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
+					wire = "WireFixed64"
+					fixed = "8"
+				case descriptor.FieldDescriptorProto_TYPE_FLOAT:
+					wire = "WireFixed32"
+					fixed = "4"
+				case descriptor.FieldDescriptorProto_TYPE_INT64,
+					descriptor.FieldDescriptorProto_TYPE_UINT64,
+					descriptor.FieldDescriptorProto_TYPE_INT32,
+					descriptor.FieldDescriptorProto_TYPE_UINT32,
+					descriptor.FieldDescriptorProto_TYPE_ENUM:
+					wire = "WireVarint"
+					varint = val
+				case descriptor.FieldDescriptorProto_TYPE_FIXED64,
+					descriptor.FieldDescriptorProto_TYPE_SFIXED64:
+					wire = "WireFixed64"
+					fixed = "8"
+				case descriptor.FieldDescriptorProto_TYPE_FIXED32,
+					descriptor.FieldDescriptorProto_TYPE_SFIXED32:
+					wire = "WireFixed32"
+					fixed = "4"
+				case descriptor.FieldDescriptorProto_TYPE_BOOL:
+					wire = "WireVarint"
+					fixed = "1"
+				case descriptor.FieldDescriptorProto_TYPE_STRING:
+					wire = "WireBytes"
+					fixed = "len(" + val + ")"
+					varint = fixed
+				case descriptor.FieldDescriptorProto_TYPE_GROUP:
+					wire = "WireStartGroup"
+					fixed = g.Pkg["proto"] + ".Size(" + val + ")"
+				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+					wire = "WireBytes"
+					g.P("s := ", g.Pkg["proto"], ".Size(", val, ")")
+					fixed = "s"
+					varint = fixed
+				case descriptor.FieldDescriptorProto_TYPE_BYTES:
+					wire = "WireBytes"
+					fixed = "len(" + val + ")"
+					varint = fixed
+				case descriptor.FieldDescriptorProto_TYPE_SINT32:
+					wire = "WireVarint"
+					varint = "(uint32(" + val + ") << 1) ^ uint32((int32(" + val + ") >> 31))"
+				case descriptor.FieldDescriptorProto_TYPE_SINT64:
+					wire = "WireVarint"
+					varint = "uint64(" + val + " << 1) ^ uint64((int64(" + val + ") >> 63))"
+				default:
+					g.Fail("unhandled oneof field type ", field.Type.String())
+				}
+				g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".", wire, ")")
+				if varint != "" {
+					g.P("n += ", g.Pkg["proto"], ".SizeVarint(uint64(", varint, "))")
+				}
+				if fixed != "" {
+					g.P("n += ", fixed)
+				}
+				if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
+					g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".WireEndGroup)")
+				}
+			}
+			g.P("case nil:")
+			g.P("default:")
+			g.P("panic(", g.Pkg["fmt"], ".Sprintf(\"proto: unexpected type %T in oneof\", x))")
+			g.P("}")
+		}
+		g.P("return n")
+		g.P("}")
+		g.P()
+	}
+
+	for _, ext := range message.ext {
+		g.generateExtension(ext)
+	}
+
+	fullName := strings.Join(message.TypeName(), ".")
+	if g.file.Package != nil {
+		fullName = *g.file.Package + "." + fullName
+	}
+
+	g.addInitf("%s.RegisterType((*%s)(nil), %q)", g.Pkg["proto"], ccTypeName, fullName)
+}
+
+func (g *Generator) generateExtension(ext *ExtensionDescriptor) {
+	ccTypeName := ext.DescName()
+
+	extObj := g.ObjectNamed(*ext.Extendee)
+	var extDesc *Descriptor
+	if id, ok := extObj.(*ImportedDescriptor); ok {
+		// This is extending a publicly imported message.
+		// We need the underlying type for goTag.
+		extDesc = id.o.(*Descriptor)
+	} else {
+		extDesc = extObj.(*Descriptor)
+	}
+	extendedType := "*" + g.TypeName(extObj) // always use the original
+	field := ext.FieldDescriptorProto
+	fieldType, wireType := g.GoType(ext.parent, field)
+	tag := g.goTag(extDesc, field, wireType)
+	g.RecordTypeUse(*ext.Extendee)
+	if n := ext.FieldDescriptorProto.TypeName; n != nil {
+		// foreign extension type
+		g.RecordTypeUse(*n)
+	}
+
+	typeName := ext.TypeName()
+
+	// Special case for proto2 message sets: If this extension is extending
+	// proto2_bridge.MessageSet, and its final name component is "message_set_extension",
+	// then drop that last component.
+	mset := false
+	if extendedType == "*proto2_bridge.MessageSet" && typeName[len(typeName)-1] == "message_set_extension" {
+		typeName = typeName[:len(typeName)-1]
+		mset = true
+	}
+
+	// For text formatting, the package must be exactly what the .proto file declares,
+	// ignoring overrides such as the go_package option, and with no dot/underscore mapping.
+	extName := strings.Join(typeName, ".")
+	if g.file.Package != nil {
+		extName = *g.file.Package + "." + extName
+	}
+
+	g.P("var ", ccTypeName, " = &", g.Pkg["proto"], ".ExtensionDesc{")
+	g.In()
+	g.P("ExtendedType: (", extendedType, ")(nil),")
+	g.P("ExtensionType: (", fieldType, ")(nil),")
+	g.P("Field: ", field.Number, ",")
+	g.P(`Name: "`, extName, `",`)
+	g.P("Tag: ", tag, ",")
+
+	g.Out()
+	g.P("}")
+	g.P()
+
+	if mset {
+		// Generate a bit more code to register with message_set.go.
+		g.addInitf("%s.RegisterMessageSetType((%s)(nil), %d, %q)", g.Pkg["proto"], fieldType, *field.Number, extName)
+	}
+
+	g.file.addExport(ext, constOrVarSymbol{ccTypeName, "var", ""})
+}
+
+func (g *Generator) generateInitFunction() {
+	for _, enum := range g.file.enum {
+		g.generateEnumRegistration(enum)
+	}
+	for _, d := range g.file.desc {
+		for _, ext := range d.ext {
+			g.generateExtensionRegistration(ext)
+		}
+	}
+	for _, ext := range g.file.ext {
+		g.generateExtensionRegistration(ext)
+	}
+	if len(g.init) == 0 {
+		return
+	}
+	g.P("func init() {")
+	g.In()
+	for _, l := range g.init {
+		g.P(l)
+	}
+	g.Out()
+	g.P("}")
+	g.init = nil
+}
+
+func (g *Generator) generateFileDescriptor(file *FileDescriptor) {
+	// Make a copy and trim source_code_info data.
+	// TODO: Trim this more when we know exactly what we need.
+	pb := proto.Clone(file.FileDescriptorProto).(*descriptor.FileDescriptorProto)
+	pb.SourceCodeInfo = nil
+
+	b, err := proto.Marshal(pb)
+	if err != nil {
+		g.Fail(err.Error())
+	}
+
+	var buf bytes.Buffer
+	w, _ := gzip.NewWriterLevel(&buf, gzip.BestCompression)
+	w.Write(b)
+	w.Close()
+	b = buf.Bytes()
+
+	g.P("var fileDescriptor", file.index, " = []byte{")
+	g.In()
+	g.P("// ", len(b), " bytes of a gzipped FileDescriptorProto")
+	for len(b) > 0 {
+		n := 16
+		if n > len(b) {
+			n = len(b)
+		}
+
+		s := ""
+		for _, c := range b[:n] {
+			s += fmt.Sprintf("0x%02x,", c)
+		}
+		g.P(s)
+
+		b = b[n:]
+	}
+	g.Out()
+	g.P("}")
+}
+
+func (g *Generator) generateEnumRegistration(enum *EnumDescriptor) {
+	// // We always print the full (proto-world) package name here.
+	pkg := enum.File().GetPackage()
+	if pkg != "" {
+		pkg += "."
+	}
+	// The full type name
+	typeName := enum.TypeName()
+	// The full type name, CamelCased.
+	ccTypeName := CamelCaseSlice(typeName)
+	g.addInitf("%s.RegisterEnum(%q, %[3]s_name, %[3]s_value)", g.Pkg["proto"], pkg+ccTypeName, ccTypeName)
+}
+
+func (g *Generator) generateExtensionRegistration(ext *ExtensionDescriptor) {
+	g.addInitf("%s.RegisterExtension(%s)", g.Pkg["proto"], ext.DescName())
+}
+
+// And now lots of helper functions.
+
+// Is c an ASCII lower-case letter?
+func isASCIILower(c byte) bool {
+	return 'a' <= c && c <= 'z'
+}
+
+// Is c an ASCII digit?
+func isASCIIDigit(c byte) bool {
+	return '0' <= c && c <= '9'
+}
+
+// CamelCase returns the CamelCased name.
+// If there is an interior underscore followed by a lower case letter,
+// drop the underscore and convert the letter to upper case.
+// There is a remote possibility of this rewrite causing a name collision,
+// but it's so remote we're prepared to pretend it's nonexistent - since the
+// C++ generator lowercases names, it's extremely unlikely to have two fields
+// with different capitalizations.
+// In short, _my_field_name_2 becomes XMyFieldName_2.
+func CamelCase(s string) string {
+	if s == "" {
+		return ""
+	}
+	t := make([]byte, 0, 32)
+	i := 0
+	if s[0] == '_' {
+		// Need a capital letter; drop the '_'.
+		t = append(t, 'X')
+		i++
+	}
+	// Invariant: if the next letter is lower case, it must be converted
+	// to upper case.
+	// That is, we process a word at a time, where words are marked by _ or
+	// upper case letter. Digits are treated as words.
+	for ; i < len(s); i++ {
+		c := s[i]
+		if c == '_' && i+1 < len(s) && isASCIILower(s[i+1]) {
+			continue // Skip the underscore in s.
+		}
+		if isASCIIDigit(c) {
+			t = append(t, c)
+			continue
+		}
+		// Assume we have a letter now - if not, it's a bogus identifier.
+		// The next word is a sequence of characters that must start upper case.
+		if isASCIILower(c) {
+			c ^= ' ' // Make it a capital letter.
+		}
+		t = append(t, c) // Guaranteed not lower case.
+		// Accept lower case sequence that follows.
+		for i+1 < len(s) && isASCIILower(s[i+1]) {
+			i++
+			t = append(t, s[i])
+		}
+	}
+	return string(t)
+}
+
+// CamelCaseSlice is like CamelCase, but the argument is a slice of strings to
+// be joined with "_".
+func CamelCaseSlice(elem []string) string { return CamelCase(strings.Join(elem, "_")) }
+
+// dottedSlice turns a sliced name into a dotted name.
+func dottedSlice(elem []string) string { return strings.Join(elem, ".") }
+
+// Given a .proto file name, return the output name for the generated Go program.
+func goFileName(name string) string {
+	ext := path.Ext(name)
+	if ext == ".proto" || ext == ".protodevel" {
+		name = name[0 : len(name)-len(ext)]
+	}
+	return name + ".pb.go"
+}
+
+// Is this field optional?
+func isOptional(field *descriptor.FieldDescriptorProto) bool {
+	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_OPTIONAL
+}
+
+// Is this field required?
+func isRequired(field *descriptor.FieldDescriptorProto) bool {
+	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_REQUIRED
+}
+
+// Is this field repeated?
+func isRepeated(field *descriptor.FieldDescriptorProto) bool {
+	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_REPEATED
+}
+
+// badToUnderscore is the mapping function used to generate Go names from package names,
+// which can be dotted in the input .proto file.  It replaces non-identifier characters such as
+// dot or dash with underscore.
+func badToUnderscore(r rune) rune {
+	if unicode.IsLetter(r) || unicode.IsDigit(r) || r == '_' {
+		return r
+	}
+	return '_'
+}
+
+// baseName returns the last path element of the name, with the last dotted suffix removed.
+func baseName(name string) string {
+	// First, find the last element
+	if i := strings.LastIndex(name, "/"); i >= 0 {
+		name = name[i+1:]
+	}
+	// Now drop the suffix
+	if i := strings.LastIndex(name, "."); i >= 0 {
+		name = name[0:i]
+	}
+	return name
+}
+
+// The SourceCodeInfo message describes the location of elements of a parsed
+// .proto file by way of a "path", which is a sequence of integers that
+// describe the route from a FileDescriptorProto to the relevant submessage.
+// The path alternates between a field number of a repeated field, and an index
+// into that repeated field. The constants below define the field numbers that
+// are used.
+//
+// See descriptor.proto for more information about this.
+const (
+	// tag numbers in FileDescriptorProto
+	packagePath = 2 // package
+	messagePath = 4 // message_type
+	enumPath    = 5 // enum_type
+	// tag numbers in DescriptorProto
+	messageFieldPath   = 2 // field
+	messageMessagePath = 3 // nested_type
+	messageEnumPath    = 4 // enum_type
+	messageOneofPath   = 8 // oneof_decl
+	// tag numbers in EnumDescriptorProto
+	enumValuePath = 2 // value
+)
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
new file mode 100644
index 0000000000..f33f7011bf
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
@@ -0,0 +1,442 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2015 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Package grpc outputs gRPC service descriptions in Go code.
+// It runs as a plugin for the Go protocol buffer compiler plugin.
+// It is linked in to protoc-gen-go.
+package grpc
+
+import (
+	"fmt"
+	"path"
+	"strconv"
+	"strings"
+
+	pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
+	"github.com/golang/protobuf/protoc-gen-go/generator"
+)
+
+// Paths for packages used by code generated in this file,
+// relative to the import_prefix of the generator.Generator.
+const (
+	contextPkgPath = "golang.org/x/net/context"
+	grpcPkgPath    = "google.golang.org/grpc"
+)
+
+func init() {
+	generator.RegisterPlugin(new(grpc))
+}
+
+// grpc is an implementation of the Go protocol buffer compiler's
+// plugin architecture.  It generates bindings for gRPC support.
+type grpc struct {
+	gen *generator.Generator
+}
+
+// Name returns the name of this plugin, "grpc".
+func (g *grpc) Name() string {
+	return "grpc"
+}
+
+// The names for packages imported in the generated code.
+// They may vary from the final path component of the import path
+// if the name is used by other packages.
+var (
+	contextPkg string
+	grpcPkg    string
+)
+
+// Init initializes the plugin.
+func (g *grpc) Init(gen *generator.Generator) {
+	g.gen = gen
+	contextPkg = generator.RegisterUniquePackageName("context", nil)
+	grpcPkg = generator.RegisterUniquePackageName("grpc", nil)
+}
+
+// Given a type name defined in a .proto, return its object.
+// Also record that we're using it, to guarantee the associated import.
+func (g *grpc) objectNamed(name string) generator.Object {
+	g.gen.RecordTypeUse(name)
+	return g.gen.ObjectNamed(name)
+}
+
+// Given a type name defined in a .proto, return its name as we will print it.
+func (g *grpc) typeName(str string) string {
+	return g.gen.TypeName(g.objectNamed(str))
+}
+
+// P forwards to g.gen.P.
+func (g *grpc) P(args ...interface{}) { g.gen.P(args...) }
+
+// Generate generates code for the services in the given file.
+func (g *grpc) Generate(file *generator.FileDescriptor) {
+	if len(file.FileDescriptorProto.Service) == 0 {
+		return
+	}
+	g.P("// Reference imports to suppress errors if they are not otherwise used.")
+	g.P("var _ ", contextPkg, ".Context")
+	g.P("var _ ", grpcPkg, ".ClientConn")
+	g.P()
+	for i, service := range file.FileDescriptorProto.Service {
+		g.generateService(file, service, i)
+	}
+}
+
+// GenerateImports generates the import declaration for this file.
+func (g *grpc) GenerateImports(file *generator.FileDescriptor) {
+	if len(file.FileDescriptorProto.Service) == 0 {
+		return
+	}
+	g.P("import (")
+	g.P(contextPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, contextPkgPath)))
+	g.P(grpcPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, grpcPkgPath)))
+	g.P(")")
+	g.P()
+}
+
+// reservedClientName records whether a client name is reserved on the client side.
+var reservedClientName = map[string]bool{
+// TODO: do we need any in gRPC?
+}
+
+func unexport(s string) string { return strings.ToLower(s[:1]) + s[1:] }
+
+// generateService generates all the code for the named service.
+func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.ServiceDescriptorProto, index int) {
+	path := fmt.Sprintf("6,%d", index) // 6 means service.
+
+	origServName := service.GetName()
+	fullServName := origServName
+	if pkg := file.GetPackage(); pkg != "" {
+		fullServName = pkg + "." + fullServName
+	}
+	servName := generator.CamelCase(origServName)
+
+	g.P()
+	g.P("// Client API for ", servName, " service")
+	g.P()
+
+	// Client interface.
+	g.P("type ", servName, "Client interface {")
+	for i, method := range service.Method {
+		g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service.
+		g.P(g.generateClientSignature(servName, method))
+	}
+	g.P("}")
+	g.P()
+
+	// Client structure.
+	g.P("type ", unexport(servName), "Client struct {")
+	g.P("cc *", grpcPkg, ".ClientConn")
+	g.P("}")
+	g.P()
+
+	// NewClient factory.
+	g.P("func New", servName, "Client (cc *", grpcPkg, ".ClientConn) ", servName, "Client {")
+	g.P("return &", unexport(servName), "Client{cc}")
+	g.P("}")
+	g.P()
+
+	var methodIndex, streamIndex int
+	serviceDescVar := "_" + servName + "_serviceDesc"
+	// Client method implementations.
+	for _, method := range service.Method {
+		var descExpr string
+		if !method.GetServerStreaming() && !method.GetClientStreaming() {
+			// Unary RPC method
+			descExpr = fmt.Sprintf("&%s.Methods[%d]", serviceDescVar, methodIndex)
+			methodIndex++
+		} else {
+			// Streaming RPC method
+			descExpr = fmt.Sprintf("&%s.Streams[%d]", serviceDescVar, streamIndex)
+			streamIndex++
+		}
+		g.generateClientMethod(servName, fullServName, serviceDescVar, method, descExpr)
+	}
+
+	g.P("// Server API for ", servName, " service")
+	g.P()
+
+	// Server interface.
+	serverType := servName + "Server"
+	g.P("type ", serverType, " interface {")
+	for i, method := range service.Method {
+		g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service.
+		g.P(g.generateServerSignature(servName, method))
+	}
+	g.P("}")
+	g.P()
+
+	// Server registration.
+	g.P("func Register", servName, "Server(s *", grpcPkg, ".Server, srv ", serverType, ") {")
+	g.P("s.RegisterService(&", serviceDescVar, `, srv)`)
+	g.P("}")
+	g.P()
+
+	// Server handler implementations.
+	var handlerNames []string
+	for _, method := range service.Method {
+		hname := g.generateServerMethod(servName, method)
+		handlerNames = append(handlerNames, hname)
+	}
+
+	// Service descriptor.
+	g.P("var ", serviceDescVar, " = ", grpcPkg, ".ServiceDesc {")
+	g.P("ServiceName: ", strconv.Quote(fullServName), ",")
+	g.P("HandlerType: (*", serverType, ")(nil),")
+	g.P("Methods: []", grpcPkg, ".MethodDesc{")
+	for i, method := range service.Method {
+		if method.GetServerStreaming() || method.GetClientStreaming() {
+			continue
+		}
+		g.P("{")
+		g.P("MethodName: ", strconv.Quote(method.GetName()), ",")
+		g.P("Handler: ", handlerNames[i], ",")
+		g.P("},")
+	}
+	g.P("},")
+	g.P("Streams: []", grpcPkg, ".StreamDesc{")
+	for i, method := range service.Method {
+		if !method.GetServerStreaming() && !method.GetClientStreaming() {
+			continue
+		}
+		g.P("{")
+		g.P("StreamName: ", strconv.Quote(method.GetName()), ",")
+		g.P("Handler: ", handlerNames[i], ",")
+		if method.GetServerStreaming() {
+			g.P("ServerStreams: true,")
+		}
+		if method.GetClientStreaming() {
+			g.P("ClientStreams: true,")
+		}
+		g.P("},")
+	}
+	g.P("},")
+	g.P("}")
+	g.P()
+}
+
+// generateClientSignature returns the client-side signature for a method.
+func (g *grpc) generateClientSignature(servName string, method *pb.MethodDescriptorProto) string {
+	origMethName := method.GetName()
+	methName := generator.CamelCase(origMethName)
+	if reservedClientName[methName] {
+		methName += "_"
+	}
+	reqArg := ", in *" + g.typeName(method.GetInputType())
+	if method.GetClientStreaming() {
+		reqArg = ""
+	}
+	respName := "*" + g.typeName(method.GetOutputType())
+	if method.GetServerStreaming() || method.GetClientStreaming() {
+		respName = servName + "_" + generator.CamelCase(origMethName) + "Client"
+	}
+	return fmt.Sprintf("%s(ctx %s.Context%s, opts ...%s.CallOption) (%s, error)", methName, contextPkg, reqArg, grpcPkg, respName)
+}
+
+func (g *grpc) generateClientMethod(servName, fullServName, serviceDescVar string, method *pb.MethodDescriptorProto, descExpr string) {
+	sname := fmt.Sprintf("/%s/%s", fullServName, method.GetName())
+	methName := generator.CamelCase(method.GetName())
+	inType := g.typeName(method.GetInputType())
+	outType := g.typeName(method.GetOutputType())
+
+	g.P("func (c *", unexport(servName), "Client) ", g.generateClientSignature(servName, method), "{")
+	if !method.GetServerStreaming() && !method.GetClientStreaming() {
+		g.P("out := new(", outType, ")")
+		// TODO: Pass descExpr to Invoke.
+		g.P("err := ", grpcPkg, `.Invoke(ctx, "`, sname, `", in, out, c.cc, opts...)`)
+		g.P("if err != nil { return nil, err }")
+		g.P("return out, nil")
+		g.P("}")
+		g.P()
+		return
+	}
+	streamType := unexport(servName) + methName + "Client"
+	g.P("stream, err := ", grpcPkg, ".NewClientStream(ctx, ", descExpr, `, c.cc, "`, sname, `", opts...)`)
+	g.P("if err != nil { return nil, err }")
+	g.P("x := &", streamType, "{stream}")
+	if !method.GetClientStreaming() {
+		g.P("if err := x.ClientStream.SendMsg(in); err != nil { return nil, err }")
+		g.P("if err := x.ClientStream.CloseSend(); err != nil { return nil, err }")
+	}
+	g.P("return x, nil")
+	g.P("}")
+	g.P()
+
+	genSend := method.GetClientStreaming()
+	genRecv := method.GetServerStreaming()
+	genCloseAndRecv := !method.GetServerStreaming()
+
+	// Stream auxiliary types and methods.
+	g.P("type ", servName, "_", methName, "Client interface {")
+	if genSend {
+		g.P("Send(*", inType, ") error")
+	}
+	if genRecv {
+		g.P("Recv() (*", outType, ", error)")
+	}
+	if genCloseAndRecv {
+		g.P("CloseAndRecv() (*", outType, ", error)")
+	}
+	g.P(grpcPkg, ".ClientStream")
+	g.P("}")
+	g.P()
+
+	g.P("type ", streamType, " struct {")
+	g.P(grpcPkg, ".ClientStream")
+	g.P("}")
+	g.P()
+
+	if genSend {
+		g.P("func (x *", streamType, ") Send(m *", inType, ") error {")
+		g.P("return x.ClientStream.SendMsg(m)")
+		g.P("}")
+		g.P()
+	}
+	if genRecv {
+		g.P("func (x *", streamType, ") Recv() (*", outType, ", error) {")
+		g.P("m := new(", outType, ")")
+		g.P("if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err }")
+		g.P("return m, nil")
+		g.P("}")
+		g.P()
+	}
+	if genCloseAndRecv {
+		g.P("func (x *", streamType, ") CloseAndRecv() (*", outType, ", error) {")
+		g.P("if err := x.ClientStream.CloseSend(); err != nil { return nil, err }")
+		g.P("m := new(", outType, ")")
+		g.P("if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err }")
+		g.P("return m, nil")
+		g.P("}")
+		g.P()
+	}
+}
+
+// generateServerSignature returns the server-side signature for a method.
+func (g *grpc) generateServerSignature(servName string, method *pb.MethodDescriptorProto) string {
+	origMethName := method.GetName()
+	methName := generator.CamelCase(origMethName)
+	if reservedClientName[methName] {
+		methName += "_"
+	}
+
+	var reqArgs []string
+	ret := "error"
+	if !method.GetServerStreaming() && !method.GetClientStreaming() {
+		reqArgs = append(reqArgs, contextPkg+".Context")
+		ret = "(*" + g.typeName(method.GetOutputType()) + ", error)"
+	}
+	if !method.GetClientStreaming() {
+		reqArgs = append(reqArgs, "*"+g.typeName(method.GetInputType()))
+	}
+	if method.GetServerStreaming() || method.GetClientStreaming() {
+		reqArgs = append(reqArgs, servName+"_"+generator.CamelCase(origMethName)+"Server")
+	}
+
+	return methName + "(" + strings.Join(reqArgs, ", ") + ") " + ret
+}
+
+func (g *grpc) generateServerMethod(servName string, method *pb.MethodDescriptorProto) string {
+	methName := generator.CamelCase(method.GetName())
+	hname := fmt.Sprintf("_%s_%s_Handler", servName, methName)
+	inType := g.typeName(method.GetInputType())
+	outType := g.typeName(method.GetOutputType())
+
+	if !method.GetServerStreaming() && !method.GetClientStreaming() {
+		g.P("func ", hname, "(srv interface{}, ctx ", contextPkg, ".Context, dec func(interface{}) error) (interface{}, error) {")
+		g.P("in := new(", inType, ")")
+		g.P("if err := dec(in); err != nil { return nil, err }")
+		g.P("out, err := srv.(", servName, "Server).", methName, "(ctx, in)")
+		g.P("if err != nil { return nil, err }")
+		g.P("return out, nil")
+		g.P("}")
+		g.P()
+		return hname
+	}
+	streamType := unexport(servName) + methName + "Server"
+	g.P("func ", hname, "(srv interface{}, stream ", grpcPkg, ".ServerStream) error {")
+	if !method.GetClientStreaming() {
+		g.P("m := new(", inType, ")")
+		g.P("if err := stream.RecvMsg(m); err != nil { return err }")
+		g.P("return srv.(", servName, "Server).", methName, "(m, &", streamType, "{stream})")
+	} else {
+		g.P("return srv.(", servName, "Server).", methName, "(&", streamType, "{stream})")
+	}
+	g.P("}")
+	g.P()
+
+	genSend := method.GetServerStreaming()
+	genSendAndClose := !method.GetServerStreaming()
+	genRecv := method.GetClientStreaming()
+
+	// Stream auxiliary types and methods.
+	g.P("type ", servName, "_", methName, "Server interface {")
+	if genSend {
+		g.P("Send(*", outType, ") error")
+	}
+	if genSendAndClose {
+		g.P("SendAndClose(*", outType, ") error")
+	}
+	if genRecv {
+		g.P("Recv() (*", inType, ", error)")
+	}
+	g.P(grpcPkg, ".ServerStream")
+	g.P("}")
+	g.P()
+
+	g.P("type ", streamType, " struct {")
+	g.P(grpcPkg, ".ServerStream")
+	g.P("}")
+	g.P()
+
+	if genSend {
+		g.P("func (x *", streamType, ") Send(m *", outType, ") error {")
+		g.P("return x.ServerStream.SendMsg(m)")
+		g.P("}")
+		g.P()
+	}
+	if genSendAndClose {
+		g.P("func (x *", streamType, ") SendAndClose(m *", outType, ") error {")
+		g.P("return x.ServerStream.SendMsg(m)")
+		g.P("}")
+		g.P()
+	}
+	if genRecv {
+		g.P("func (x *", streamType, ") Recv() (*", inType, ", error) {")
+		g.P("m := new(", inType, ")")
+		g.P("if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err }")
+		g.P("return m, nil")
+		g.P("}")
+		g.P()
+	}
+
+	return hname
+}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
new file mode 100644
index 0000000000..24e490ec4b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
@@ -0,0 +1,34 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2015 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import _ "github.com/golang/protobuf/protoc-gen-go/internal/grpc"
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go
new file mode 100644
index 0000000000..8e2486de0b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go
@@ -0,0 +1,98 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// protoc-gen-go is a plugin for the Google protocol buffer compiler to generate
+// Go code.  Run it by building this program and putting it in your path with
+// the name
+// 	protoc-gen-go
+// That word 'go' at the end becomes part of the option string set for the
+// protocol compiler, so once the protocol compiler (protoc) is installed
+// you can run
+// 	protoc --go_out=output_directory input_directory/file.proto
+// to generate Go bindings for the protocol defined by file.proto.
+// With that input, the output will be written to
+// 	output_directory/file.pb.go
+//
+// The generated code is documented in the package comment for
+// the library.
+//
+// See the README and documentation for protocol buffers to learn more:
+// 	https://developers.google.com/protocol-buffers/
+package main
+
+import (
+	"io/ioutil"
+	"os"
+
+	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/protoc-gen-go/generator"
+)
+
+func main() {
+	// Begin by allocating a generator. The request and response structures are stored there
+	// so we can do error handling easily - the response structure contains the field to
+	// report failure.
+	g := generator.New()
+
+	data, err := ioutil.ReadAll(os.Stdin)
+	if err != nil {
+		g.Error(err, "reading input")
+	}
+
+	if err := proto.Unmarshal(data, g.Request); err != nil {
+		g.Error(err, "parsing input proto")
+	}
+
+	if len(g.Request.FileToGenerate) == 0 {
+		g.Fail("no files to generate")
+	}
+
+	g.CommandLineParameters(g.Request.GetParameter())
+
+	// Create a wrapped version of the Descriptors and EnumDescriptors that
+	// point to the file that defines them.
+	g.WrapTypes()
+
+	g.SetPackageNames()
+	g.BuildTypeNameMap()
+
+	g.GenerateAllFiles()
+
+	// Send back the results.
+	data, err = proto.Marshal(g.Response)
+	if err != nil {
+		g.Error(err, "failed to marshal output proto")
+	}
+	_, err = os.Stdout.Write(data)
+	if err != nil {
+		g.Error(err, "failed to write output proto")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
new file mode 100644
index 0000000000..eb41f20daa
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
@@ -0,0 +1,45 @@
+# Go support for Protocol Buffers - Google's data interchange format
+#
+# Copyright 2010 The Go Authors.  All rights reserved.
+# https://github.com/golang/protobuf
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Not stored here, but plugin.proto is in https://github.com/google/protobuf/
+# at src/google/protobuf/compiler/plugin.proto
+# Also we need to fix an import.
+regenerate:
+	echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
+	protoc --go_out=Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor:. \
+		-I$(HOME)/src/protobuf/src $(HOME)/src/protobuf/src/google/protobuf/compiler/plugin.proto && \
+		mv google/protobuf/compiler/plugin.pb.go $(GOPATH)/src/github.com/golang/protobuf/protoc-gen-go/plugin
+
+restore:
+	cp plugin.pb.golden plugin.pb.go
+
+preserve:
+	cp plugin.pb.go plugin.pb.golden
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
new file mode 100644
index 0000000000..af31f733e9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
@@ -0,0 +1,222 @@
+// Code generated by protoc-gen-go.
+// source: google/protobuf/compiler/plugin.proto
+// DO NOT EDIT!
+
+/*
+Package google_protobuf_compiler is a generated protocol buffer package.
+
+It is generated from these files:
+	google/protobuf/compiler/plugin.proto
+
+It has these top-level messages:
+	CodeGeneratorRequest
+	CodeGeneratorResponse
+*/
+package google_protobuf_compiler
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import google_protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+const _ = proto.ProtoPackageIsVersion1
+
+// An encoded CodeGeneratorRequest is written to the plugin's stdin.
+type CodeGeneratorRequest struct {
+	// The .proto files that were explicitly listed on the command-line.  The
+	// code generator should generate code only for these files.  Each file's
+	// descriptor will be included in proto_file, below.
+	FileToGenerate []string `protobuf:"bytes,1,rep,name=file_to_generate" json:"file_to_generate,omitempty"`
+	// The generator parameter passed on the command-line.
+	Parameter *string `protobuf:"bytes,2,opt,name=parameter" json:"parameter,omitempty"`
+	// FileDescriptorProtos for all files in files_to_generate and everything
+	// they import.  The files will appear in topological order, so each file
+	// appears before any file that imports it.
+	//
+	// protoc guarantees that all proto_files will be written after
+	// the fields above, even though this is not technically guaranteed by the
+	// protobuf wire format.  This theoretically could allow a plugin to stream
+	// in the FileDescriptorProtos and handle them one by one rather than read
+	// the entire set into memory at once.  However, as of this writing, this
+	// is not similarly optimized on protoc's end -- it will store all fields in
+	// memory at once before sending them to the plugin.
+	ProtoFile        []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file" json:"proto_file,omitempty"`
+	XXX_unrecognized []byte                                 `json:"-"`
+}
+
+func (m *CodeGeneratorRequest) Reset()                    { *m = CodeGeneratorRequest{} }
+func (m *CodeGeneratorRequest) String() string            { return proto.CompactTextString(m) }
+func (*CodeGeneratorRequest) ProtoMessage()               {}
+func (*CodeGeneratorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *CodeGeneratorRequest) GetFileToGenerate() []string {
+	if m != nil {
+		return m.FileToGenerate
+	}
+	return nil
+}
+
+func (m *CodeGeneratorRequest) GetParameter() string {
+	if m != nil && m.Parameter != nil {
+		return *m.Parameter
+	}
+	return ""
+}
+
+func (m *CodeGeneratorRequest) GetProtoFile() []*google_protobuf.FileDescriptorProto {
+	if m != nil {
+		return m.ProtoFile
+	}
+	return nil
+}
+
+// The plugin writes an encoded CodeGeneratorResponse to stdout.
+type CodeGeneratorResponse struct {
+	// Error message.  If non-empty, code generation failed.  The plugin process
+	// should exit with status code zero even if it reports an error in this way.
+	//
+	// This should be used to indicate errors in .proto files which prevent the
+	// code generator from generating correct code.  Errors which indicate a
+	// problem in protoc itself -- such as the input CodeGeneratorRequest being
+	// unparseable -- should be reported by writing a message to stderr and
+	// exiting with a non-zero status code.
+	Error            *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	File             []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
+	XXX_unrecognized []byte                        `json:"-"`
+}
+
+func (m *CodeGeneratorResponse) Reset()                    { *m = CodeGeneratorResponse{} }
+func (m *CodeGeneratorResponse) String() string            { return proto.CompactTextString(m) }
+func (*CodeGeneratorResponse) ProtoMessage()               {}
+func (*CodeGeneratorResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *CodeGeneratorResponse) GetError() string {
+	if m != nil && m.Error != nil {
+		return *m.Error
+	}
+	return ""
+}
+
+func (m *CodeGeneratorResponse) GetFile() []*CodeGeneratorResponse_File {
+	if m != nil {
+		return m.File
+	}
+	return nil
+}
+
+// Represents a single generated file.
+type CodeGeneratorResponse_File struct {
+	// The file name, relative to the output directory.  The name must not
+	// contain "." or ".." components and must be relative, not be absolute (so,
+	// the file cannot lie outside the output directory).  "/" must be used as
+	// the path separator, not "\".
+	//
+	// If the name is omitted, the content will be appended to the previous
+	// file.  This allows the generator to break large files into small chunks,
+	// and allows the generated text to be streamed back to protoc so that large
+	// files need not reside completely in memory at one time.  Note that as of
+	// this writing protoc does not optimize for this -- it will read the entire
+	// CodeGeneratorResponse before writing files to disk.
+	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// If non-empty, indicates that the named file should already exist, and the
+	// content here is to be inserted into that file at a defined insertion
+	// point.  This feature allows a code generator to extend the output
+	// produced by another code generator.  The original generator may provide
+	// insertion points by placing special annotations in the file that look
+	// like:
+	//   @@protoc_insertion_point(NAME)
+	// The annotation can have arbitrary text before and after it on the line,
+	// which allows it to be placed in a comment.  NAME should be replaced with
+	// an identifier naming the point -- this is what other generators will use
+	// as the insertion_point.  Code inserted at this point will be placed
+	// immediately above the line containing the insertion point (thus multiple
+	// insertions to the same point will come out in the order they were added).
+	// The double-@ is intended to make it unlikely that the generated code
+	// could contain things that look like insertion points by accident.
+	//
+	// For example, the C++ code generator places the following line in the
+	// .pb.h files that it generates:
+	//   // @@protoc_insertion_point(namespace_scope)
+	// This line appears within the scope of the file's package namespace, but
+	// outside of any particular class.  Another plugin can then specify the
+	// insertion_point "namespace_scope" to generate additional classes or
+	// other declarations that should be placed in this scope.
+	//
+	// Note that if the line containing the insertion point begins with
+	// whitespace, the same whitespace will be added to every line of the
+	// inserted text.  This is useful for languages like Python, where
+	// indentation matters.  In these languages, the insertion point comment
+	// should be indented the same amount as any inserted code will need to be
+	// in order to work correctly in that context.
+	//
+	// The code generator that generates the initial file and the one which
+	// inserts into it must both run as part of a single invocation of protoc.
+	// Code generators are executed in the order in which they appear on the
+	// command line.
+	//
+	// If |insertion_point| is present, |name| must also be present.
+	InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point" json:"insertion_point,omitempty"`
+	// The file contents.
+	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *CodeGeneratorResponse_File) Reset()                    { *m = CodeGeneratorResponse_File{} }
+func (m *CodeGeneratorResponse_File) String() string            { return proto.CompactTextString(m) }
+func (*CodeGeneratorResponse_File) ProtoMessage()               {}
+func (*CodeGeneratorResponse_File) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+
+func (m *CodeGeneratorResponse_File) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *CodeGeneratorResponse_File) GetInsertionPoint() string {
+	if m != nil && m.InsertionPoint != nil {
+		return *m.InsertionPoint
+	}
+	return ""
+}
+
+func (m *CodeGeneratorResponse_File) GetContent() string {
+	if m != nil && m.Content != nil {
+		return *m.Content
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*CodeGeneratorRequest)(nil), "google.protobuf.compiler.CodeGeneratorRequest")
+	proto.RegisterType((*CodeGeneratorResponse)(nil), "google.protobuf.compiler.CodeGeneratorResponse")
+	proto.RegisterType((*CodeGeneratorResponse_File)(nil), "google.protobuf.compiler.CodeGeneratorResponse.File")
+}
+
+var fileDescriptor0 = []byte{
+	// 269 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4a, 0xc3, 0x40,
+	0x10, 0x86, 0xa9, 0x46, 0xa4, 0x63, 0x25, 0x1a, 0x14, 0x43, 0xf1, 0x10, 0x44, 0xc1, 0x83, 0x6c,
+	0x40, 0x3c, 0x78, 0xf2, 0x10, 0x45, 0xaf, 0xc5, 0x17, 0x08, 0x31, 0x9d, 0x86, 0x85, 0x74, 0x67,
+	0x9d, 0xdd, 0x1c, 0x7d, 0x21, 0x9f, 0xd2, 0xc9, 0xa6, 0x15, 0x09, 0xf6, 0x14, 0xf8, 0xe7, 0xcf,
+	0xf7, 0xcd, 0xb0, 0x70, 0xd3, 0x10, 0x35, 0x2d, 0xe6, 0x96, 0xc9, 0xd3, 0x47, 0xb7, 0xca, 0x6b,
+	0x5a, 0x5b, 0xdd, 0x22, 0xe7, 0xb6, 0xed, 0x1a, 0x6d, 0x54, 0x18, 0x24, 0xe9, 0x50, 0x53, 0xdb,
+	0x9a, 0xda, 0xd6, 0xe6, 0xd9, 0x18, 0xb0, 0x44, 0x57, 0xb3, 0xb6, 0x9e, 0x78, 0x68, 0x5f, 0x7d,
+	0xc1, 0xd9, 0x33, 0x2d, 0xf1, 0x0d, 0x0d, 0x72, 0x25, 0xf1, 0x3b, 0x7e, 0x76, 0xe8, 0x7c, 0x92,
+	0xc2, 0xc9, 0x4a, 0x10, 0xa5, 0xa7, 0xb2, 0x19, 0x66, 0x98, 0x4e, 0xb2, 0xfd, 0xdb, 0x69, 0x72,
+	0x0a, 0x53, 0x5b, 0x71, 0xb5, 0x46, 0x8f, 0x9c, 0xee, 0x65, 0x13, 0x89, 0x1e, 0x01, 0x02, 0xad,
+	0xec, 0x7f, 0x49, 0x63, 0xa9, 0x1d, 0xdd, 0x5f, 0xab, 0xf1, 0x56, 0xaf, 0x32, 0x7c, 0xf9, 0xf5,
+	0x2f, 0x82, 0xfe, 0x7b, 0x02, 0xe7, 0x23, 0xbf, 0xb3, 0x64, 0x1c, 0x26, 0xc7, 0x70, 0x80, 0xcc,
+	0xc4, 0x62, 0xed, 0x15, 0x05, 0x44, 0x7f, 0xe0, 0x0f, 0x6a, 0xd7, 0xc9, 0xea, 0x5f, 0x5a, 0x70,
+	0xcf, 0x9f, 0x20, 0xea, 0xbf, 0xc9, 0x0c, 0x22, 0x23, 0xfb, 0x6f, 0xc8, 0x17, 0x10, 0x6b, 0xa9,
+	0xb0, 0xd7, 0x64, 0x4a, 0x4b, 0xda, 0xf8, 0xcd, 0x55, 0x31, 0x1c, 0xd6, 0x64, 0x3c, 0x4a, 0x10,
+	0xf7, 0x41, 0x71, 0x07, 0x97, 0xa2, 0xd9, 0xa9, 0x2e, 0x66, 0x8b, 0xf0, 0x2a, 0xe1, 0x32, 0xf7,
+	0x13, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x18, 0x2a, 0x2a, 0xbd, 0x01, 0x00, 0x00,
+}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden
new file mode 100644
index 0000000000..8953d0ff82
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden
@@ -0,0 +1,83 @@
+// Code generated by protoc-gen-go.
+// source: google/protobuf/compiler/plugin.proto
+// DO NOT EDIT!
+
+package google_protobuf_compiler
+
+import proto "github.com/golang/protobuf/proto"
+import "math"
+import google_protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
+
+// Reference proto and math imports to suppress error if they are not otherwise used.
+var _ = proto.GetString
+var _ = math.Inf
+
+type CodeGeneratorRequest struct {
+	FileToGenerate   []string                               `protobuf:"bytes,1,rep,name=file_to_generate" json:"file_to_generate,omitempty"`
+	Parameter        *string                                `protobuf:"bytes,2,opt,name=parameter" json:"parameter,omitempty"`
+	ProtoFile        []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file" json:"proto_file,omitempty"`
+	XXX_unrecognized []byte                                 `json:"-"`
+}
+
+func (this *CodeGeneratorRequest) Reset()         { *this = CodeGeneratorRequest{} }
+func (this *CodeGeneratorRequest) String() string { return proto.CompactTextString(this) }
+func (*CodeGeneratorRequest) ProtoMessage()       {}
+
+func (this *CodeGeneratorRequest) GetParameter() string {
+	if this != nil && this.Parameter != nil {
+		return *this.Parameter
+	}
+	return ""
+}
+
+type CodeGeneratorResponse struct {
+	Error            *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	File             []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
+	XXX_unrecognized []byte                        `json:"-"`
+}
+
+func (this *CodeGeneratorResponse) Reset()         { *this = CodeGeneratorResponse{} }
+func (this *CodeGeneratorResponse) String() string { return proto.CompactTextString(this) }
+func (*CodeGeneratorResponse) ProtoMessage()       {}
+
+func (this *CodeGeneratorResponse) GetError() string {
+	if this != nil && this.Error != nil {
+		return *this.Error
+	}
+	return ""
+}
+
+type CodeGeneratorResponse_File struct {
+	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	InsertionPoint   *string `protobuf:"bytes,2,opt,name=insertion_point" json:"insertion_point,omitempty"`
+	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (this *CodeGeneratorResponse_File) Reset()         { *this = CodeGeneratorResponse_File{} }
+func (this *CodeGeneratorResponse_File) String() string { return proto.CompactTextString(this) }
+func (*CodeGeneratorResponse_File) ProtoMessage()       {}
+
+func (this *CodeGeneratorResponse_File) GetName() string {
+	if this != nil && this.Name != nil {
+		return *this.Name
+	}
+	return ""
+}
+
+func (this *CodeGeneratorResponse_File) GetInsertionPoint() string {
+	if this != nil && this.InsertionPoint != nil {
+		return *this.InsertionPoint
+	}
+	return ""
+}
+
+func (this *CodeGeneratorResponse_File) GetContent() string {
+	if this != nil && this.Content != nil {
+		return *this.Content
+	}
+	return ""
+}
+
+func init() {
+}

From c62a59a4661fa1059bd696a17d4afbf84bdf0730 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 6 Apr 2016 14:15:55 +0200
Subject: [PATCH 0086/1304] protobuf: use vendored protoc-gen-go

---
 rkt/rkt.go          |  1 +
 scripts/genproto.sh | 21 ++++++---------------
 vendoredApps        |  3 +++
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/rkt/rkt.go b/rkt/rkt.go
index cf87815ca3..407088c928 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -27,6 +27,7 @@ import (
 	"github.com/coreos/rkt/rkt/config"
 	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/spf13/cobra"
+	_ "github.com/spf13/cobra/doc" // transitive dependency for man page generation
 )
 
 const (
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index 851de56b33..e536b81851 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -15,22 +15,13 @@ if ! [[ $(protoc --version) =~ "3.0.0" ]]; then
 	exit 255
 fi
 
-export GOPATH=$(mktemp -d)
-export PATH=${GOPATH}/bin:${PATH}
+export GOPATH=$(godep path)
+export PATH=.:${PATH}
 
-trap 'rm -rf "${GOPATH}"' EXIT
-
-# git (sha) version of golang/protobuf
-GO_PROTOBUF_SHA="2402d76f3d41f928c7902a765dfc872356dd3aad"
-
-echo "installing golang/protobuf using GOPATH=${GOPATH}"
-go get -u github.com/golang/protobuf/{proto,protoc-gen-go}
-
-echo "resetting golang/protobuf to version ${GO_PROTOBUF_SHA}"
-pushd ${GOPATH}/src/github.com/golang/protobuf
-	git reset --hard "${GO_PROTOBUF_SHA}"
-	make install
-popd
+echo "building protoc-gen-go"
+go build github.com/golang/protobuf/protoc-gen-go
+trap 'rm -f "protoc-gen-go"' EXIT
 
+echo "generating code"
 API_DIR="api/v1alpha"
 protoc -I "${API_DIR}" "${API_DIR}"/*.proto --go_out=plugins=grpc:"${API_DIR}"
diff --git a/vendoredApps b/vendoredApps
index a82349b119..e8b00a1c35 100644
--- a/vendoredApps
+++ b/vendoredApps
@@ -13,3 +13,6 @@ github.com/appc/cni/plugins/meta/tuning
 
 # Vendor in ACE, which is used in functional tests
 github.com/appc/spec/ace
+
+# Vendor protobuf go generator
+github.com/golang/protobuf/protoc-gen-go

From 9f297e75960e0f68527f57daf676e72bf001fb01 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 6 Apr 2016 14:43:29 +0200
Subject: [PATCH 0087/1304] godep: use +doc in favor of +ignore in *_gen.go

---
 rkt/bash_completion_gen.go | 2 +-
 rkt/manpages_gen.go        | 2 +-
 rkt/rkt.go                 | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/rkt/bash_completion_gen.go b/rkt/bash_completion_gen.go
index cb6a95a6f6..67fe4bf5be 100644
--- a/rkt/bash_completion_gen.go
+++ b/rkt/bash_completion_gen.go
@@ -14,7 +14,7 @@
 
 // This file is not part of the rkt binary. It is only executed manually via
 // the makefile.
-//+build ignore
+//+build doc
 
 package main
 
diff --git a/rkt/manpages_gen.go b/rkt/manpages_gen.go
index 1c79adc876..0f07936816 100644
--- a/rkt/manpages_gen.go
+++ b/rkt/manpages_gen.go
@@ -14,7 +14,7 @@
 
 // This file is not part of the rkt binary. It is only executed manually via
 // the makefile.
-//+build ignore
+//+build doc
 
 package main
 
diff --git a/rkt/rkt.go b/rkt/rkt.go
index 407088c928..cf87815ca3 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -27,7 +27,6 @@ import (
 	"github.com/coreos/rkt/rkt/config"
 	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/spf13/cobra"
-	_ "github.com/spf13/cobra/doc" // transitive dependency for man page generation
 )
 
 const (

From 96f65b362258cef064ab3a660faa891bc7366cba Mon Sep 17 00:00:00 2001
From: Rob Szumski <rob@robszumski.com>
Date: Thu, 25 Feb 2016 16:16:58 -0800
Subject: [PATCH 0088/1304] docs: make options table more consistent

---
 Documentation/subcommands/prepare.md | 14 +++----
 Documentation/subcommands/run.md     | 55 ++++++++++++++--------------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 0c9df9ca45..9d968c973b 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -34,13 +34,13 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--exec` |  `` | A path | Override the exec command for the preceding image |
-| `--inherit-env` |  `false` | `true` or `false` | Inherit all environment variables not set by apps |
-| `--mount` |  `` | Mount syntax (`volume=NAME,target=PATH`). See [Mounting Volumes without Mount Points](run.md#mounting-volumes-without-mount-points) | Mount point binding a volume to a path within an app |
-| `--no-overlay` |  `false` | `true` or `false` | Disable overlay filesystem |
-| `--no-store` |  `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
-| `--pod-manifest` |  `` | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect |
-| `--port` |  `` | A port number | Ports to expose on the host (requires [contained network](https://github.com/coreos/rkt/blob/master/Documentation/networking.md#contained-mode)). Syntax: --port=NAME:HOSTPORT |
+| `--exec` | none | Path to executable | Override the exec command for the preceding image. |
+| `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
+| `--mount` | none | Mount syntax (ex. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
+| `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
+| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
+| `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
+| `--port` | none | A port number (ex. `--port=NAME:HOSTPORT`) | Ports to expose on the host (requires [contained network](../networking.md#contained-mode)). |
 | `--private-users` |  `false` | `true` or `false` | Run within user namespaces (experimental) |
 | `--quiet` |  `false` | `true` or `false` | Suppress superfluous output on stdout, print only the UUID on success |
 | `--set-env` |  `` | An environment variable. Syntax `NAME=VALUE` | An environment variable to set for apps |
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 613ea9f28c..d2971c6662 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -327,34 +327,33 @@ For more details see the [hacking documentation](../hacking.md).
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--cpu` |  `` | CPU units (example `--cpu=500m`, see the [Kubernetes resource model](http://kubernetes.io/v1.1/docs/design/resources.html)) | CPU limit for the preceding image |
-| `--dns` |  `` | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times |
-| `--dns-opt` |  `` | Option as described in the options section in resolv.conf(5) | DNS option to write in `/etc/resolv.conf`. It can be specified several times |
-| `--dns-search` |  `` | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times |
-| `--exec` |  `` | A path | Override the exec command for the preceding image |
-| `--hostname` |  `` | A host name | Pod's hostname. If empty, it will be "rkt-$PODUUID" |
-| `--inherit-env` |  `false` | `true` or `false` | Inherit all environment variables not set by apps |
-| `--interactive` |  `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied |
-| `--mds-register` |  `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net=(default|default-restricted|host)` |
-| `--memory` |  `` | Memory units (example '--memory=50M', see the [Kubernetes resource model](http://kubernetes.io/v1.1/docs/design/resources.html)) | Memory limit for the preceding image |
-| `--mount` |  `` | Mount syntax (`volume=NAME,target=PATH`). See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points) | Mount point binding a volume to a path within an app |
-| `--net` |  `default` | A comma-separated list of networks. Syntax: `--net[=n[:args], ...]` | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively |
-| `--no-overlay` |  `false` | `true` or `false` | Disable overlay filesystem |
-| `--no-store` |  `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
-| `--pod-manifest` |  `` | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect |
-| `--port` |  `` | A port number | Ports to expose on the host (requires [contained network](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md#contained-mode)). Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080` |
-| `--private-users` |  `false` | `true` or `false` | Run within user namespaces (experimental) |
-| `--set-env` |  `` | An environment variable. Syntax `NAME=VALUE` | An environment variable to set for apps |
-| `--signature` |  `` | A file path | Local signature file to use in validating the preceding image |
-| `--stage1-url` |  `` | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported | Image to use as stage1 |
-| `--stage1-path` |  `` | A path to a stage1 image. Absolute and relative paths are supported | Image to use as stage1 |
-| `--stage1-name` |  `` | A name of a stage1 image. Will perform a discovery if the image is not in the store | Image to use as stage1 |
-| `--stage1-hash` |  `` | A hash of a stage1 image. The image must exist in the store | Image to use as stage1 |
-| `--stage1-from-dir` |  `` | A stage1 image file inside the default stage1 images directory | Image to use as stage1 |
-| `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md) |
-| `--uuid-file-save` |  `` | A file path | Write out the pod UUID to a file |
-| `--volume` |  `` | Volume syntax (`NAME,kind=KIND,source=PATH,readOnly=BOOL`). See [Mount Volumes into a Pod](#mount-volumes-into-a-pod) | Volumes to make available in the pod |
+| `--cpu` | none | CPU units (ex. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model](http://kubernetes.io/v1.1/docs/design/resources.html) format. |
+| `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times |
+| `--dns-opt` | none | DNS option  | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
+| `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |
+| `--exec` | none | Path to executable | Override the exec command for the preceding image. |
+| `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
+| `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
+| `--mds-register` | `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net` as `default`, `default-restricted`, or `host`). |
+| `--memory` | none | Memory units (ex. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model](http://kubernetes.io/v1.1/docs/design/resources.html) format. |
+| `--mount` | none | Mount syntax (ex. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
+| `--net` | `default` | A comma-separated list of networks. (ex. `--net[=n[:args], ...]`) | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. |
+| `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
+| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
+| `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
+| `--port` | none | A port number (ex. `--port=NAME:HOSTPORT`) | Ports to expose on the host (requires [contained network](../networking.md#contained-mode)). |
+| `--private-users` |  `false` | `true` or `false` | Run within user namespaces (experimental). |
+| `--set-env` | none | An environment variable (ex. `--set-env=NAME=VALUE`) | An environment variable to set for apps. |
+| `--signature` | none | A file path | Local signature file to use in validating the preceding image |
+| `--stage1-url` | none | URL with protocol | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported. |
+| `--stage1-path` | none | Absolute or relative path | A path to a stage1 image. |
+| `--stage1-name` | none | Image name (ex. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A name of a stage1 image. Will perform a discovery if the image is not in the store. |
+| `--stage1-hash` | none | Image hash (ex. `--stage1-hash=sha512-dedce9f5ea50`) | A hash of a stage1 image. The image must exist in the store. |
+| `--stage1-from-dir` | none | Image name (ex. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A stage1 image file name to search for inside the default stage1 images directory. |
+| `--store-only` | `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md). |
+| `--uuid-file-save` | none | A file path | Write out the pod UUID to a file. |
+| `--volume` |  none | Volume syntax (ex. `--volume NAME,kind=KIND,source=PATH,readOnly=BOOL`) | Volumes to make available in the pod. See [Mount Volumes into a Pod](#mount-volumes-into-a-pod). |
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation](../commands.md#global-options).
\ No newline at end of file

From 28add4d037a4fa49b21019a4fc1610eeecbe1455 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 7 Apr 2016 18:51:14 +0200
Subject: [PATCH 0089/1304] tests: TestDockerVolumeSemantics: more tests with
 symlinks

I tried to reproduce the issue mentioned in:
https://github.com/coreos/rkt/pull/2290#issuecomment-206003364

However, the tests pass fine for me. Nevertheless, this test is worth
adding.
---
 tests/rkt_volume_test.go | 42 ++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 6f9a7abae2..2a25650b16 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -142,15 +142,45 @@ func TestVolumes(t *testing.T) {
 	}
 }
 
-func TestDockerVolumeSemantics(t *testing.T) {
-	dockerVolImage := patchTestACI("rkt-volume-image.aci", fmt.Sprintf("--mounts=dir1,path=/dir1,readOnly=false"))
-	defer os.Remove(dockerVolImage)
+var volDockerTests = []struct {
+	dir             string
+	expectedContent string
+}{
+	{
+		"/dir1",
+		"dir1",
+	},
+	{
+		"/dir2",
+		"dir2",
+	},
+	{
+		"/dir1/link_rel_dir2",
+		"dir2",
+	},
+	{
+		"/dir1/link_abs_dir2",
+		"dir2",
+	},
+}
 
+func TestDockerVolumeSemantics(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	cmd := fmt.Sprintf(`/bin/sh -c "export FILE=/dir1/file ; %s --debug --insecure-options=image run --inherit-env %s --exec /inspect -- --read-file"`, ctx.Cmd(), dockerVolImage)
+	var dockerVolImage []string
+	for _, tt := range volDockerTests {
+		img := patchTestACI("rkt-volume-image.aci", fmt.Sprintf("--mounts=mydir,path=%s,readOnly=false", tt.dir))
+		defer os.Remove(img)
+		dockerVolImage = append(dockerVolImage, img)
+	}
+
+	for i, tt := range volDockerTests {
+		t.Logf("Running test #%v on directory %s", i, tt.dir)
 
-	expected := "<<<dir1>>>"
-	runRktAndCheckOutput(t, cmd, expected, false)
+		cmd := fmt.Sprintf(`/bin/sh -c "export FILE=%s/file ; %s --debug --insecure-options=image run --inherit-env %s --exec /inspect -- --read-file"`, tt.dir, ctx.Cmd(), dockerVolImage[i])
+
+		expected := fmt.Sprintf("<<<%s>>>", tt.expectedContent)
+		runRktAndCheckOutput(t, cmd, expected, false)
+	}
 }

From e9a00d7324936ec00525265ec8ceae3ea584cf8d Mon Sep 17 00:00:00 2001
From: mstachowski <michal.stachowski@outlook.com>
Date: Fri, 18 Mar 2016 11:44:51 +0100
Subject: [PATCH 0090/1304] rkt: Improve build shell script

Rework of run-build shell script.

New run-build script will have got following features:
 - Add temporary build files cleanup (during Semaphore build, it
   improve test stability) - DONE
 - Split script body into functions - DONE
 - Add better argument parsing - DONE
 - Fix build directory name - DONE
---
 tests/README.md                  |  23 ++-
 tests/build-and-run-tests.sh     | 251 +++++++++++++++++++++++++++++++
 tests/cloudinit/centos.cloudinit |   2 +-
 tests/cloudinit/debian.cloudinit |   2 +-
 tests/cloudinit/fedora.cloudinit |   2 +-
 tests/cloudinit/ubuntu.cloudinit |   2 +-
 tests/run-build.sh               | 119 ---------------
 7 files changed, 271 insertions(+), 130 deletions(-)
 create mode 100755 tests/build-and-run-tests.sh
 delete mode 100755 tests/run-build.sh

diff --git a/tests/README.md b/tests/README.md
index b9b7bb2f12..f2e062422a 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -35,15 +35,15 @@ sudo gpasswd -a runner rkt
 #### Thread 1
 
 ```
-./tests/run-build.sh none
-./tests/run-build.sh src v229
+./tests/build-and-run-tests.sh -f none -c
+./tests/build-and-run-tests.sh -f src -s v229 -c
 ```
 
 #### Thread 2
 
 ```
-./tests/run-build.sh coreos
-./tests/run-build.sh host
+./tests/build-and-run-tests.sh -f coreos -c
+./tests/build-and-run-tests.sh -f host -c
 ```
 
 #### Post thread
@@ -58,11 +58,20 @@ The LKVM stage1 or other versions of systemd are not currently tested.
 It would be possible to add more tests with the following commands:
 
 ```
-./tests/run-build.sh src v227
-./tests/run-build.sh src master
-./tests/run-build.sh kvm
+./tests/build-and-run-tests.sh -f src -s v227 -c
+./tests/build-and-run-tests.sh -f src -s master -c
+./tests/build-and-run-tests.sh -f kvm -c
 ```
 
+#### build-and-run-tests.sh parameters description
+
+The build script has the following parameters:
+- `-f` - Select flavor for rkt. You can choose only one from the following list: "`coreos`, `host`, `kvm`, `none`, `src`".
+- `-s` - Systemd version. You can choose `master` or a tag from the [systemd GitHub repository](https://github.com/systemd/systemd).
+- `-c` - Run cleanup. Cleanup has two phases: *after build* and *after tests*. In the *after build* phase, this script removes artifacts from external dependencies (like kernel sources in the `kvm` flavor). In the  *after tests* phase, it removes `rkt` build artifacts and (if the build is running on CI or if the `-x` flag is used) it unmounts the remaining `rkt` mountpoints, removes unused `rkt` NICs and flushes the current state of IPAM IP reservation.
+- `-x` - Force after-test cleanup on a non-CI system. **WARNING: This flag can affect your system. Use with caution.**
+- `-u` - Show usage message and exit.
+
 ### Platform
 
 Select `Ubuntu 14.04 LTS v1503 (beta with Docker support)`.
diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
new file mode 100755
index 0000000000..5a2363da9e
--- /dev/null
+++ b/tests/build-and-run-tests.sh
@@ -0,0 +1,251 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# Clean up environment after build. It is flushing every assigned IP address via IPAM, umounting every
+# mountpoint and removing unused links
+function cleanup {
+    if [[ "${POSTCLEANUP}" == true ]]; then
+        if [[ "${CI}" == true || "${FORCE}" == true ]]; then
+            for mp in $(mount | grep rkt | awk '{print $3}' | tac); do
+                sudo umount "${mp}"
+            done
+
+            for link in $(ip link | grep rkt | cut -d':' -f2); do
+                sudo ip link del "${link}"
+            done
+            sudo rm -rf /var/lib/cni/networks/*
+        fi
+        sudo rm -rf "${BUILD_DIR}"
+    fi
+}
+
+# Skip build on demand. It requires the `last-commit` file inside the last commit.
+function ciSkip {
+    cat last-commit
+    echo
+    echo "Build skipped as requested in the last commit."
+    exit 0
+}
+
+# Configure SemaphoreCI environment.
+function semaphoreConfiguration {
+    # We might not need to run functional tests or process docs.
+    # This is best-effort; || true ensures this does not affect test outcome
+    # First, ensure origin is updated - semaphore can do some weird caching
+    git fetch || true
+    SRC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..origin/master | grep -cEv ${DOC_CHANGE_PATTERN}) || true
+    DOC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..origin/master | grep -cE ${DOC_CHANGE_PATTERN}) || true
+
+    # Set up go environment on semaphore
+    if [ -f /opt/change-go-version.sh ]; then
+        . /opt/change-go-version.sh
+        change-go-version 1.5
+        
+	# systemd v229 doesn't build on gcc-4.8, set the compiler to gcc-5
+        export CC=gcc-5
+    fi
+}
+
+function checkFlavorValue {
+    FLAVORS="coreos host kvm none src"
+    if [ -z "${RKT_STAGE1_USR_FROM}" ]; then
+        set -
+        echo "Flavor is not set"
+        exit 1
+    fi
+    if ! [[ "${FLAVORS}" =~ "${RKT_STAGE1_USR_FROM}" ]]; then
+        set -
+        echo "Unknown flavor: ${RKT_STAGE1_USR_FROM}"
+        echo "Available flavors: ${FLAVORS}"
+        exit 1
+    fi
+}
+
+# Parse user provided parameters
+function parseParameters {
+    while getopts "f:s:cxu" option; do
+        case ${option} in
+        f)
+            RKT_STAGE1_USR_FROM="${OPTARG}"
+            ;;
+        s)
+            if [[ $RKT_STAGE1_USR_FROM == "src" ]]; then
+                RKT_STAGE1_SYSTEMD_VER="${OPTARG}"
+            else
+                echo "Only \`src\` flavor requires systemd version"
+            fi
+            ;;
+        x)
+            FORCE=true
+            ;;
+        u)
+            set -
+            usage
+            exit 0
+            ;;
+        c)
+            PRECLEANUP=true
+            POSTCLEANUP=true
+            ;;
+        \?)
+            set -
+            echo "Invalid parameter -${OPTARG}"
+            usage
+            exit 1
+            ;;
+        esac
+    done
+    checkFlavorValue
+}
+
+# Configure build
+function configure {
+    case "${RKT_STAGE1_USR_FROM}" in
+        coreos|kvm)
+        ./configure --with-stage1-flavors="${RKT_STAGE1_USR_FROM}" \
+                --with-stage1-default-flavor="${RKT_STAGE1_USR_FROM}" \
+                --enable-functional-tests --enable-tpm=auto \
+                --enable-insecure-go
+        ;;
+        host)
+        ./configure --with-stage1-flavors=host \
+                --with-default-stage1-flavor=host \
+                --enable-functional-tests=auto --enable-tpm=auto \
+                --enable-insecure-go
+        ;;
+        src)
+        ./configure --with-stage1-flavors="${RKT_STAGE1_USR_FROM}" \
+                --with-stage1-default-flavor="${RKT_STAGE1_USR_FROM}" \
+                --with-stage1-systemd-version="${RKT_STAGE1_SYSTEMD_VER}" \
+                --enable-functional-tests --enable-tpm=auto \
+                --enable-insecure-go
+        ;;
+        none)
+        # Not a flavor per se, so perform a detailed setup for some
+        # hypothetical 3rd party stage1 image
+        ./configure --with-stage1-default-name="example.com/some-stage1-for-rkt" \
+                --with-stage1-default-version="0.0.1" --enable-tpm=auto \
+                --enable-insecure-go
+        ;;
+        *)
+        echo "Unknown flavor: ${RKT_STAGE1_USR_FROM}"
+        exit 1
+        ;;
+    esac
+}
+
+# Build rkt and run unit & functional tests
+function build {
+    ./autogen.sh
+
+    configure
+
+    CORES=$(grep -c ^processor /proc/cpuinfo)
+    echo "Running make with ${CORES} threads"
+    make "-j${CORES}"
+
+    if [[ ${PRECLEANUP} == true ]]; then
+        rm -rf "${BUILD_DIR}/tmp/usr_from_${RKT_STAGE1_USR_FROM}"
+    fi
+
+    make check
+    make "-j${CORES}" clean
+}
+
+# Prepare build directory name
+function buildFolder {
+    if [[ "${RKT_STAGE1_USR_FROM}" == "src" ]]; then
+        POSTFIX="-${RKT_STAGE1_SYSTEMD_VER}"
+    fi
+    BUILD_DIR="build-rkt-${RKT_STAGE1_USR_FROM}${POSTFIX}"
+}
+
+# Detect changes from last commit. If there is no changes, there is no
+# need to run build
+function detectChanges {
+    HEAD=`git rev-parse HEAD`
+    MASTER=`git rev-parse origin/master`
+    if [[ ${HEAD} != ${MASTER} ]]; then
+        SRC_CHANGES=1
+        DOC_CHANGES=1
+    elif [[ ${SRC_CHANGES} -eq 0 && ${DOC_CHANGES} -eq 0 ]]; then
+        echo "No changes detected and HEAD is not origin/master"
+        exit 0
+    fi
+}
+
+# Clone source code into build directory
+function cloneCode {
+    detectChanges
+    git clone ../ "${BUILD_DIR}"
+    pushd "${BUILD_DIR}"
+}
+
+# Show usage
+function usage {
+    echo "build-and-run-tests.sh usage:"
+    echo -e "-f\tSelect flavor"
+    echo -e "-s\tSystemd version"
+    echo -e "-c\tCleanup"
+    echo -e "-x\tUse with '-c' to force cleanup on non-CI systems"
+    echo -e "-u\tShow this message"
+}
+
+# Prepare build environment
+function prepareBuildEnv {
+    # In case it wasn't cleaned up
+    if [ -e "builds/${BUILD_DIR}" ]; then
+        sudo rm -rf "builds/${BUILD_DIR}"
+    fi
+    mkdir -p builds
+}
+
+# Run docs scan
+function docsScan {
+    :
+    # echo Changes in docs detected, checking docs.
+    # TODO check for broken links
+    # TODO check for obvious spelling mistakes:
+        # coreos -> CoreOS
+        # More?!
+}
+
+function main {
+    # Skip build if requested
+    if test -e ci-skip ; then
+        ciSkip
+    fi
+
+    SRC_CHANGES=1 # run functional tests by default
+    DOC_CHANGES=1 # process docs by default
+
+    parseParameters "${@}"
+
+    DOC_CHANGE_PATTERN="\
+            -e ^Documentation/ \
+            -e ^(README|ROADMAP|CONTRIBUTING|CHANGELOG)$ \
+            -e \.md$\
+    "
+
+    buildFolder
+
+    # https://semaphoreci.com/docs/available-environment-variables.html
+    if [ "${SEMAPHORE-}" == true ] ; then
+        semaphoreConfiguration
+    fi
+
+    prepareBuildEnv
+    cd builds
+    cloneCode
+
+    if [ ${SRC_CHANGES} -gt 0 ]; then
+        build
+    fi
+    if [ ${DOC_CHANGES} -gt 0 ]; then
+        docsScan
+    fi
+    cleanup
+}
+
+main "${@}"
diff --git a/tests/cloudinit/centos.cloudinit b/tests/cloudinit/centos.cloudinit
index 3f4a7e5142..5e65d4abe1 100644
--- a/tests/cloudinit/centos.cloudinit
+++ b/tests/cloudinit/centos.cloudinit
@@ -35,7 +35,7 @@ export PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/centos/.loca
 sed -i 's/ requiretty$/ !requiretty/g' /etc/sudoers
 
 su - centos --command="cd /var/tmp ; git clone --branch @GIT_BRANCH@ @GIT_URL@ rkt"
-su - centos --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/run-build.sh @FLAVOR@"
+su - centos --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/build-and-run-tests.sh -f @FLAVOR@"
 TESTEOF
 
 chmod +x /var/tmp/rkt-test.sh
diff --git a/tests/cloudinit/debian.cloudinit b/tests/cloudinit/debian.cloudinit
index da347913b2..7c8858639a 100644
--- a/tests/cloudinit/debian.cloudinit
+++ b/tests/cloudinit/debian.cloudinit
@@ -20,7 +20,7 @@ apt-get install -y --force-yes build-essential autoconf
 apt-get install -y --force-yes wget squashfs-tools patch gnupg golang git dbus libacl1-dev systemd-container
 
 su - admin --command="cd /var/tmp ; git clone --branch @GIT_BRANCH@ @GIT_URL@ rkt"
-su - admin --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/run-build.sh @FLAVOR@"
+su - admin --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/build-and-run-tests.sh -f @FLAVOR@"
 TESTEOF
 
 chmod +x /var/tmp/rkt-test.sh
diff --git a/tests/cloudinit/fedora.cloudinit b/tests/cloudinit/fedora.cloudinit
index eabe16a70c..aa900ef3d9 100644
--- a/tests/cloudinit/fedora.cloudinit
+++ b/tests/cloudinit/fedora.cloudinit
@@ -33,7 +33,7 @@ dnf -y -v install systemd-container || true
 export PATH=/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/fedora/.local/bin:/home/fedora/bin
 
 su - fedora --command="cd /var/tmp ; git clone --branch @GIT_BRANCH@ @GIT_URL@ rkt"
-su - fedora --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/run-build.sh @FLAVOR@"
+su - fedora --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/build-and-run-tests.sh -f @FLAVOR@"
 TESTEOF
 
 chmod +x /var/tmp/rkt-test.sh
diff --git a/tests/cloudinit/ubuntu.cloudinit b/tests/cloudinit/ubuntu.cloudinit
index 65521e6d8c..22f848ec36 100644
--- a/tests/cloudinit/ubuntu.cloudinit
+++ b/tests/cloudinit/ubuntu.cloudinit
@@ -19,7 +19,7 @@ apt-get install -y build-essential autoconf
 apt-get install -y wget squashfs-tools patch gnupg golang libacl1-dev systemd-container
 
 su - ubuntu --command="cd /var/tmp ; git clone --branch @GIT_BRANCH@ @GIT_URL@ rkt"
-su - ubuntu --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/run-build.sh @FLAVOR@"
+su - ubuntu --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/build-and-run-tests.sh -f @FLAVOR@"
 TESTEOF
 
 chmod +x /var/tmp/rkt-test.sh
diff --git a/tests/run-build.sh b/tests/run-build.sh
deleted file mode 100755
index db694b5353..0000000000
--- a/tests/run-build.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-# Skip build if requested
-if test -e ci-skip ; then
-    cat last-commit
-    echo
-    echo "Build skipped as requested in the last commit."
-    exit 0
-fi
-
-SRC_CHANGES=1 # run functional tests by default
-DOC_CHANGES=1 # process docs by default
-DOC_CHANGE_PATTERN="\
-        -e ^Documentation/ \
-        -e ^(README|ROADMAP|CONTRIBUTING|CHANGELOG)$ \
-        -e \.md$\
-"
-
-RKT_STAGE1_USR_FROM="${1}"
-RKT_STAGE1_SYSTEMD_VER="${2}"
-BUILD_DIR="build-rkt-${RKT_STAGE1_USR_FROM}-${RKT_STAGE1_SYSTEMD_VER}"
-
-# https://semaphoreci.com/docs/available-environment-variables.html
-if [ "${SEMAPHORE-}" == true ] ; then
-        # We might not need to run functional tests or process docs.
-        # This is best-effort; || true ensures this does not affect test outcome
-        # First, ensure origin is updated - semaphore can do some weird caching
-        git fetch || true
-        SRC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..origin/master | grep -cEv ${DOC_CHANGE_PATTERN}) || true
-        DOC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..origin/master | grep -cE ${DOC_CHANGE_PATTERN}) || true
-
-        # Set up go environment on semaphore
-        if [ -f /opt/change-go-version.sh ]; then
-            . /opt/change-go-version.sh
-            change-go-version 1.5
-        fi
-
-        # systemd v229 doesn't build on gcc-4.8, set the compiler to gcc-5
-        export CC=gcc-5
-fi
-
-HEAD=`git rev-parse HEAD`
-MASTER=`git rev-parse origin/master`
-if [[ ${HEAD} == ${MASTER} ]]; then
-    SRC_CHANGES=1
-    DOC_CHANGES=1
-elif [[ ${SRC_CHANGES} -eq 0 && ${DOC_CHANGES} -eq 0 ]]; then
-    echo "No changes detected and HEAD is not origin/master"
-    exit 0
-fi
-
-# In case it wasn't cleaned up
-if [ -e "${BUILD_DIR}" ]; then
-    sudo rm -rf "${BUILD_DIR}"
-fi
-
-mkdir -p builds
-cd builds
-
-git clone ../ "${BUILD_DIR}"
-pushd "${BUILD_DIR}"
-
-if [ ${SRC_CHANGES} -gt 0 ]; then
-    echo "Changes in sources detected. Running functional tests."
-    ./autogen.sh
-    case "${RKT_STAGE1_USR_FROM}" in
-        coreos|kvm)
-        ./configure --with-stage1-flavors="${RKT_STAGE1_USR_FROM}" \
-                --with-stage1-default-flavor="${RKT_STAGE1_USR_FROM}" \
-                --enable-functional-tests --enable-tpm=auto \
-                --enable-insecure-go
-        ;;
-        host)
-        ./configure --with-stage1-flavors=host \
-                --with-default-stage1-flavor=host \
-                --enable-functional-tests=auto --enable-tpm=auto \
-                --enable-insecure-go
-        ;;
-        src)
-        ./configure --with-stage1-flavors="${RKT_STAGE1_USR_FROM}" \
-                --with-stage1-default-flavor="${RKT_STAGE1_USR_FROM}" \
-                --with-stage1-systemd-version="${RKT_STAGE1_SYSTEMD_VER}" \
-                --enable-functional-tests --enable-tpm=auto \
-                --enable-insecure-go
-        ;;
-        none)
-        # Not a flavor per se, so perform a detailed setup for some
-        # hypothetical 3rd party stage1 image
-        ./configure --with-stage1-default-name="example.com/some-stage1-for-rkt" \
-                --with-stage1-default-version="0.0.1" --enable-tpm=auto \
-                --enable-insecure-go
-        ;;
-        *)
-        echo "Unknown flavor: ${RKT_STAGE1_USR_FROM}"
-        exit 1
-        ;;
-    esac
-
-    CORES=$(grep -c ^processor /proc/cpuinfo)
-    echo "Running make with ${CORES} threads"
-    make "-j${CORES}"
-    make check
-    make "-j${CORES}" clean
-fi
-if [ ${DOC_CHANGES} -gt 0 ]; then
-    :
-    # echo Changes in docs detected, checking docs.
-    # TODO check for broken links
-    # TODO check for obvious spelling mistakes:
-        # coreos -> CoreOS
-        # More?!
-fi
-
-popd
-
-# Make sure there is enough disk space for the next build
-sudo rm -rf "${BUILD_DIR}"

From 53104d09eb789ffd1ddd62883d9cf38854dfcef9 Mon Sep 17 00:00:00 2001
From: Simone Gotti <sgotti@sorint.it>
Date: Fri, 8 Apr 2016 13:02:01 +0200
Subject: [PATCH 0091/1304] store: fix multi process and multi goroutines race
 on db.

When there are multiple OS processes concurrently accessing the ql
db and at least one of them has multiple goroutines using a shared store
instance the internal ql (camlistore based) locking error: `cannot
acquire lock: resource temporarily unavailable` can be triggered.

For example:

Process A, goroutine 1: takes the the flock, then takes the lock on the mutex, and do db.Open
Process A, goroutine 2: takes the flock, blocks on the lock on the mutex
Process A, goroutine 1: does something on db, calls db.Close, unlocks the flock, release the lock on the mutex
Process A, goroutine 2: takes the lock on the mutex, but now it has the flock UNLOCKED
Process B, goroutine 1: take the lock on the flock and then takes lock on the mutex (since it's another process): the ql internal camlistore lock will fail.

In the code there's already a locking made by a mutex, but looks like it
was put just there to make the go race detector happy and the
lock/unlock order is wrong. Instead this is really needed.

This patch fixes the lock/unlock order.

A future test to really test this problem will need to spawn two
processes with one at least using multiple goroutines using the same
store instance.

Here an example repro:

```
package main

import (
        "fmt"
        "os"

        "github.com/coreos/rkt/store"
)

func main() {
        s, err := store.NewStore("/tmp/test/rkt")
        if err != nil {
                fmt.Printf("cannot open store: %v", err)
                os.Exit(1)
        }

        runs := 10000
        for i := 0; i < runs; i++ {
                go func() {
                        _, err = s.GetAllACIInfos(nil, false)
                        if err != nil {
                                fmt.Printf("cannot query db: %v", err)
                                os.Exit(1)
                        }
                }()
        }

        s.Close()
}

```

compile and execute the above command with something like:

```
#!/bin/bash
while true; do
        for i in $(seq 0 2); do
                ./test01 &
        done
        wait
done
```
---
 store/db.go      | 41 ++++++++++++++++++++++++++++++-----------
 store/db_test.go |  3 +++
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/store/db.go b/store/db.go
index 26edcc1bfb..d326760a93 100644
--- a/store/db.go
+++ b/store/db.go
@@ -17,6 +17,7 @@ package store
 import (
 	"database/sql"
 	"errors"
+	"fmt"
 	"os"
 	"path/filepath"
 	"sync"
@@ -34,9 +35,11 @@ const (
 // dbLock is used to guarantee both thread-safety and process-safety
 // for db access.
 type dbLock struct {
+	// This lock is to make that access to the ql db file being blocking
+	// since ql use an internal locking that will not block and return an
+	// error when a lock is already held.
 	fl *lock.FileLock
-	// Although the FileLock already ensures thread safety, the Go runtime is unaware
-	// of this, and so Mutex is necessary to satisfy the Go race detector.
+	// This lock is to avoid concurrent access from multiple goroutines.
 	sync.Mutex
 }
 
@@ -49,19 +52,37 @@ func newDBLock(dirPath string) (*dbLock, error) {
 }
 
 func (dl *dbLock) lock() error {
+	dl.Lock()
 	if err := dl.fl.ExclusiveLock(); err != nil {
+		dl.Unlock()
 		return err
 	}
-	dl.Lock()
 	return nil
 }
 
-func (dl *dbLock) unlock() error {
+func (dl *dbLock) unlock() {
 	if err := dl.fl.Unlock(); err != nil {
-		return err
+		// TODO(sgotti) what'll happen when df.fl.Unlock fails? From
+		// man 2 flock looks like it'll happen only when the underlying
+		// fd has been closed (in this case the lock has been released
+		// when the fd has been closed, assuming no dup fd due to
+		// forking etc...).
+
+		// If there're other cases where it fails without unlocking,
+		// there's no simple way to handle them.
+		// Possible solutions:
+		// * panic (done here)
+		// * try to close the lock (and related fd), panic if close
+		// fails and create a new lock.
+		//
+		// Passing a specific error to the caller and let it recover
+		// creating a new store instance is tricky because we
+		// don't know the lock state and cannot be sure on how to clean
+		// this store instance
+
+		panic(fmt.Errorf("failed to unlock the db flock: %v", err))
 	}
 	dl.Unlock()
-	return nil
 }
 
 type DB struct {
@@ -90,10 +111,7 @@ func (db *DB) Open() error {
 
 	sqldb, err := sql.Open("ql", filepath.Join(db.dbdir, DbFilename))
 	if err != nil {
-		unlockErr := db.dl.unlock()
-		if unlockErr != nil {
-			err = errwrap.Wrap(unlockErr, err)
-		}
+		db.dl.unlock()
 		return err
 	}
 	db.sqldb = sqldb
@@ -112,7 +130,8 @@ func (db *DB) Close() error {
 	db.sqldb = nil
 
 	// Don't close the flock as it will be reused.
-	return db.dl.unlock()
+	db.dl.unlock()
+	return nil
 }
 
 func (db *DB) Begin() (*sql.Tx, error) {
diff --git a/store/db_test.go b/store/db_test.go
index 895d6ec019..a639c4f48c 100644
--- a/store/db_test.go
+++ b/store/db_test.go
@@ -78,6 +78,9 @@ func createTable(db *DB, t *testing.T) {
 }
 
 func TestDBRace(t *testing.T) {
+	// TODO(sgotti) this will not find concurrenct accesses to ql db from
+	// multiple processes using multiple goroutines. A test that spawns at
+	// least two processes using multiple goroutines is needed.
 	oldGoMaxProcs := runtime.GOMAXPROCS(runtime.NumCPU())
 	defer runtime.GOMAXPROCS(oldGoMaxProcs)
 

From c5cb65a85d231a230a18c2f35f0492a19c4e3106 Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Wed, 23 Mar 2016 16:34:03 +0100
Subject: [PATCH 0092/1304] kvm: new volumes support

---
 stage1/init/common/kvm_mount.go      | 267 +++++----------------------
 stage1/init/common/kvm_mount_test.go |  68 -------
 stage1/init/common/pod.go            |   5 +-
 stage1/init/init.go                  |   6 +-
 stage1/init/kvm.go                   |  19 +-
 5 files changed, 53 insertions(+), 312 deletions(-)
 delete mode 100644 stage1/init/common/kvm_mount_test.go

diff --git a/stage1/init/common/kvm_mount.go b/stage1/init/common/kvm_mount.go
index 08b37f007b..b7efc44a7b 100644
--- a/stage1/init/common/kvm_mount.go
+++ b/stage1/init/common/kvm_mount.go
@@ -12,260 +12,89 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package common and the file kvm_mount.go provide functions for creating mount units for managing
-// inner(kind=empty) and external(kind=host) volumes.
-// note: used only for kvm flavor (lkvm based)
-//
-// Idea.
-// For example when we have two volumes:
-// 1) --volume=hostdata,kind=host,source=/host/some_data_to_share
-// 2) --volume=temporary,kind=empty
-// then in stage1/rootfs rkt creates two folders (in rootfs of guest)
-// 1) /mnt/hostdata - which is mounted through 9p host thanks to
-//					lkvm --9p=/host/some_data_to_share,hostdata flag shared to quest
-// 2) /mnt/temporary - is created as empty directory in guest
-//
-// both of them are then bind mounted to /opt/stage2/<application/<mountPoint.path>
-// for every application, that has mountPoints specified in ACI json
-// - host mounting is realized by podToSystemdHostMountUnits (for whole pod),
-//   which creates mount.units (9p) required and ordered before all applications
-//   service units
-// - bind mounting is realized by appToSystemdMountUnits (for each app),
-//   which creates mount.units (bind) required and ordered before particular application
-// note: systemd mount units require /usr/bin/mount
 package common
 
 import (
-	"crypto/md5"
-	"encoding/hex"
 	"errors"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strings"
+	"strconv"
+	"syscall"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/go-systemd/unit"
 	"github.com/coreos/rkt/common"
 	"github.com/hashicorp/errwrap"
 )
 
-const (
-	// location within stage1 rootfs where shared volumes will be put
-	// (or empty directories for kind=empty)
-	stage1MntDir = "/mnt/"
-)
-
-// makeHashFromVolumeName returns string of 16 bytes length from the volume name,
-// P9 file system needs that the tag be less than 31 bytes.
-func makeHashFromVolumeName(v string) (ret string) {
-	h := md5.New()
-	io.WriteString(h, v)
-	ret = hex.EncodeToString(h.Sum(nil))
-	return
-}
-
-// serviceUnitName returns a systemd service unit name for the given app name.
-// note: it was shamefully copy-pasted from stage1/init/path.go
-// TODO: extract common functions from path.go
-func serviceUnitName(appName types.ACName) string {
-	return appName.String() + ".service"
-}
-
-// installNewMountUnit creates and installs a new mount unit in the default
-// systemd location (/usr/lib/systemd/system) inside the pod stage1 filesystem.
-// root is pod's absolute stage1 path (from Pod.Root).
-// beforeAndrequiredBy creates a systemd unit dependency (can be space separated
-// for multi).
-// It returns the name of the generated unit.
-func installNewMountUnit(root, what, where, fsType, options, beforeAndrequiredBy, unitsDir string) (string, error) {
-	opts := []*unit.UnitOption{
-		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Mount unit for %s", where)),
-		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
-		unit.NewUnitOption("Unit", "Before", beforeAndrequiredBy),
-		unit.NewUnitOption("Mount", "What", what),
-		unit.NewUnitOption("Mount", "Where", where),
-		unit.NewUnitOption("Mount", "Type", fsType),
-		unit.NewUnitOption("Mount", "Options", options),
-		unit.NewUnitOption("Install", "RequiredBy", beforeAndrequiredBy),
-	}
-
-	unitsPath := filepath.Join(root, unitsDir)
-	unitName := unit.UnitNamePathEscape(where + ".mount")
-
-	if err := writeUnit(opts, filepath.Join(unitsPath, unitName)); err != nil {
-		return "", err
-	}
-	diag.Printf("mount unit created: %q in %q (what=%q, where=%q)", unitName, unitsPath, what, where)
-
-	return unitName, nil
-}
-
-func writeUnit(opts []*unit.UnitOption, unitPath string) error {
-	unitBytes, err := ioutil.ReadAll(unit.Serialize(opts))
-	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("failed to serialize mount unit file to bytes %q", unitPath), err)
-	}
-
-	err = ioutil.WriteFile(unitPath, unitBytes, 0644)
-	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("failed to create mount unit file %q", unitPath), err)
-	}
-
-	return nil
-}
-
-// PodToSystemdHostMountUnits create host shared remote file system
-// mounts (using e.g. 9p) according to https://www.kernel.org/doc/Documentation/filesystems/9p.txt.
-// Additionally it creates required directories in stage1MntDir and then prepares
-// bind mount unit for each app.
-// "root" parameter is stage1 root filesystem path.
-// appNames are used to create before/required dependency between mount unit and
-// app service units.
-func PodToSystemdHostMountUnits(root string, volumes []types.Volume, appNames []types.ACName, unitsDir string) error {
-	// pod volumes need to mount p9 qemu mount_tags
-	for _, vol := range volumes { // only host shared volumes
-		name := vol.Name.String()
-		mountTag := makeHashFromVolumeName(name)
-
-		// serviceNames for ordering and requirements dependency for apps
-		var serviceNames []string
-		for _, appName := range appNames {
-			serviceNames = append(serviceNames, serviceUnitName(appName))
-		}
-
-		// for host kind we create a mount unit to mount host shared folder
-		if vol.Kind == "host" {
-			// /var/lib/.../pod/run/rootfs/mnt/{mountTag}
-			mountPoint := filepath.Join(root, stage1MntDir, mountTag)
-			err := os.MkdirAll(mountPoint, 0700)
-			if err != nil {
-				return err
-			}
-
-			_, err = installNewMountUnit(root,
-				mountTag, // what (source) in 9p it is a channel tag which equals to volume mountTag
-				filepath.Join(stage1MntDir, name), // where - destination
-				"9p",                            // fsType
-				"trans=virtio",                  // 9p specific options
-				strings.Join(serviceNames, " "), // space separated list of services for unit dependency
-				unitsDir,
-			)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// AppToSystemdMountUnits prepare bind mount unit for empty or host kind mounting
-// between stage1 rootfs and chrooted filesystem for application
-func AppToSystemdMountUnits(root string, appName types.ACName, volumes []types.Volume, ra *schema.RuntimeApp, unitsDir string) error {
+func MountSharedVolumes(root string, appName types.ACName, volumes []types.Volume, ra *schema.RuntimeApp) error {
 	app := ra.App
-
 	vols := make(map[types.ACName]types.Volume)
 	for _, v := range volumes {
 		vols[v.Name] = v
 	}
 
+	sharedVolPath := common.SharedVolumesPath(root)
+	if err := os.MkdirAll(sharedVolPath, sharedVolPerm); err != nil {
+		return errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
+	}
+	if err := os.Chmod(sharedVolPath, sharedVolPerm); err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
+	}
+
 	mounts := generateMounts(ra, vols)
 	for _, m := range mounts {
 		vol := vols[m.Volume]
 
-		// source relative to stage1 rootfs to relative pod root
-		hashedVolName := makeHashFromVolumeName(vol.Name.String())
-
-		whatPath := filepath.Join(stage1MntDir, hashedVolName)
-		whatFullPath := filepath.Join(root, whatPath)
-
-		// destination relative to stage1 rootfs and relative to pod root
-		wherePath := filepath.Join(common.RelAppRootfsPath(appName), m.Path)
-		whereFullPath := filepath.Join(root, wherePath)
-
-		// create shared volumes directory
-		stage1MntPath := filepath.Join(root, stage1MntDir)
-		if err := os.MkdirAll(stage1MntPath, sharedVolPerm); err != nil {
-			return errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
-		}
-		if err := os.Chmod(stage1MntPath, sharedVolPerm); err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", stage1MntPath), err)
-		}
-
-		// prepare empty volumes
-		if err := PrepareMountpoints(whatFullPath, whereFullPath, &vol, m.dockerImplicit); err != nil {
-			return errwrap.Wrap(errors.New("error preparing empty mount points"), err)
-		}
-
-		// assertion to make sure that "what" exists (created earlier by PodToSystemdHostMountUnits)
-		diag.Printf("checking required source path: %q", whatFullPath)
-		if _, err := os.Stat(whatFullPath); os.IsNotExist(err) {
-			return fmt.Errorf("bug: missing source for volume %v", vol.Name)
+		if vol.Kind == "empty" {
+			p := filepath.Join(sharedVolPath, vol.Name.String())
+			if err := os.MkdirAll(p, sharedVolPerm); err != nil {
+				return errwrap.Wrap(fmt.Errorf("could not create shared volume %q", vol.Name), err)
+			}
+			if err := os.Chown(p, *vol.UID, *vol.GID); err != nil {
+				return errwrap.Wrap(fmt.Errorf("could not change owner of %q", p), err)
+			}
+			mod, err := strconv.ParseUint(*vol.Mode, 8, 32)
+			if err != nil {
+				return errwrap.Wrap(fmt.Errorf("invalid mode %q for volume %q", *vol.Mode, vol.Name), err)
+			}
+			if err := os.Chmod(p, os.FileMode(mod)); err != nil {
+				return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", p), err)
+			}
 		}
 
-		// optionally prepare app directory
-		diag.Printf("optionally preparing destination path: %q", whereFullPath)
-		err := os.MkdirAll(whereFullPath, 0700)
-		if err != nil {
-			return errwrap.Wrap(fmt.Errorf("failed to prepare dir for mount %v", m.Volume), err)
+		readOnly := IsMountReadOnly(vol, app.MountPoints)
+		var source string
+		switch vol.Kind {
+		case "host":
+			source = vol.Source
+		case "empty":
+			source = filepath.Join(common.SharedVolumesPath(root), vol.Name.String())
+		default:
+			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, vol.Kind)
 		}
-
-		// install new mount unit for bind mount /mnt/volumeName -> /opt/stage2/{app-id}/rootfs/{{mountPoint.Path}}
-		mu, err := installNewMountUnit(
-			root,      // where put a mount unit
-			whatPath,  // what - stage1 rootfs /mnt/VolumeName
-			wherePath, // where - inside chroot app filesystem
-			"bind",    // fstype
-			"bind",    // options
-			serviceUnitName(appName),
-			unitsDir,
-		)
+		appRootfs := common.AppRootfsPath(".", appName)
+		mntPath, err := evaluateAppMountPath(appRootfs, m.Path)
 		if err != nil {
-			return errwrap.Wrap(fmt.Errorf("cannot install new mount unit for app %q", appName.String()), err)
+			return errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Path), err)
 		}
 
-		// TODO(iaguis) when we update util-linux to 2.27, this code can go
-		// away and we can bind-mount RO with one unit file.
-		// http://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27-ReleaseNotes
-		if IsMountReadOnly(vol, app.MountPoints) {
-			opts := []*unit.UnitOption{
-				unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Remount read-only unit for %s", wherePath)),
-				unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
-				unit.NewUnitOption("Unit", "After", mu),
-				unit.NewUnitOption("Unit", "Wants", mu),
-				unit.NewUnitOption("Service", "ExecStart", fmt.Sprintf("/usr/bin/mount -o remount,ro %s", wherePath)),
-				unit.NewUnitOption("Install", "RequiredBy", mu),
-			}
+		destination := filepath.Join(appRootfs, mntPath)
 
-			remountUnitPath := filepath.Join(root, unitsDir, unit.UnitNamePathEscape(wherePath+"-remount.service"))
-			if err := writeUnit(opts, remountUnitPath); err != nil {
-				return err
-			}
+		if err := doBindMount(source, destination, readOnly); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not bind mount path %v (s: %v, d: %v)", m.Path, source, destination), err)
 		}
 	}
 	return nil
 }
 
-// VolumesToKvmDiskArgs prepares argument list to be passed to lkvm to configure
-// shared volumes (only for "host" kind).
-// Example return is ["--9p,src/folder,9ptag"].
-func VolumesToKvmDiskArgs(volumes []types.Volume) []string {
-	var args []string
-
-	for _, vol := range volumes {
-		// tag/channel name for virtio
-		mountTag := makeHashFromVolumeName(vol.Name.String())
-		if vol.Kind == "host" {
-			// eg. --9p=/home/jon/srcdir,tag
-			arg := "--9p=" + vol.Source + "," + mountTag
-			diag.Printf("--disk argument: %#v", arg)
-			args = append(args, arg)
-		}
+func doBindMount(source, destination string, readOnly bool) error {
+	if err := syscall.Mount(source, destination, "bind", syscall.MS_BIND, ""); err != nil {
+		return err
 	}
-
-	return args
+	if readOnly {
+		return syscall.Mount(source, destination, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
+	}
+	return nil
 }
diff --git a/stage1/init/common/kvm_mount_test.go b/stage1/init/common/kvm_mount_test.go
deleted file mode 100644
index ee2d687d62..0000000000
--- a/stage1/init/common/kvm_mount_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/appc/spec/schema/types"
-)
-
-func TestVolumesToKvmDiskArgs(t *testing.T) {
-	tests := []struct {
-		volumes  []types.Volume
-		expected []string
-	}{
-		{ // one host volume - one argument
-			volumes:  []types.Volume{{Name: types.ACName("foo"), Kind: "host", Source: "src1"}},
-			expected: []string{fmt.Sprintf("--9p=src1,%s", makeHashFromVolumeName("foo"))},
-		},
-		{ // on empty volume - no arguments
-			volumes:  []types.Volume{{Name: types.ACName("foo"), Kind: "empty", Source: "src1"}},
-			expected: []string{},
-		},
-		{ // two host volumes
-			volumes: []types.Volume{
-				{Name: types.ACName("foo"), Kind: "host", Source: "src1"},
-				{Name: types.ACName("bar"), Kind: "host", Source: "src2"},
-			},
-			expected: []string{fmt.Sprintf("--9p=src1,%s", makeHashFromVolumeName("foo")),
-				fmt.Sprintf("--9p=src2,%s", makeHashFromVolumeName("bar"))},
-		},
-		{ // mix host and empty
-			volumes: []types.Volume{
-				{Name: types.ACName("foo"), Kind: "host", Source: "src1"},
-				{Name: types.ACName("baz"), Kind: "empty", Source: "src1"},
-				{Name: types.ACName("bar"), Kind: "host", Source: "src2"},
-			},
-			expected: []string{fmt.Sprintf("--9p=src1,%s", makeHashFromVolumeName("foo")),
-				fmt.Sprintf("--9p=src2,%s", makeHashFromVolumeName("bar"))},
-		},
-	}
-
-	for i, tt := range tests {
-		got := VolumesToKvmDiskArgs(tt.volumes)
-		if len(got) != len(tt.expected) {
-			t.Errorf("#%d: expected %v elements got %v", i, len(tt.expected), len(got))
-		} else {
-			for iarg, argExpected := range tt.expected {
-				if got[iarg] != argExpected {
-					t.Errorf("#%d: arg %d expected `%v` got `%v`", i, iarg, argExpected, got[iarg])
-				}
-			}
-		}
-	}
-}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index ab6f265ad6..75170536e2 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -456,9 +456,8 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 	}
 
 	if flavor == "kvm" {
-		// bind mount all shared volumes from /mnt/volumeName (we don't use mechanism for bind-mounting given by nspawn)
-		err := AppToSystemdMountUnits(common.Stage1RootfsPath(p.Root), appName, p.Manifest.Volumes, ra, UnitsDir)
-		if err != nil {
+		// bind mount all shared volumes (we don't use mechanism for bind-mounting given by nspawn)
+		if err := MountSharedVolumes(common.Stage1RootfsPath(p.Root), appName, p.Manifest.Volumes, ra); err != nil {
 			return errwrap.Wrap(errors.New("failed to prepare mount units"), err)
 		}
 
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 2a3d07c88d..73bb098890 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -286,10 +286,6 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 			args = append(args, "--debug")
 		}
 
-		// host volume sharing with 9p
-		nsargs := stage1initcommon.VolumesToKvmDiskArgs(p.Manifest.Volumes)
-		args = append(args, nsargs...)
-
 		// lkvm requires $HOME to be defined,
 		// see https://github.com/coreos/rkt/issues/1393
 		if os.Getenv("HOME") == "" {
@@ -564,7 +560,7 @@ func stage1() int {
 	}
 
 	if flavor == "kvm" {
-		if err := KvmPodToSystemd(p, n); err != nil {
+		if err := KvmNetworkingToSystemd(p, n); err != nil {
 			log.PrintE("failed to configure systemd for kvm", err)
 			return 1
 		}
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index cc7241a7bd..a240e8b10e 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -20,8 +20,6 @@ import (
 	"errors"
 	"path/filepath"
 
-	"github.com/appc/spec/schema/types"
-
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/networking"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
@@ -30,8 +28,8 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
-// KvmPodToSystemd generates systemd unit files for a pod according to the manifest and network configuration
-func KvmPodToSystemd(p *stage1commontypes.Pod, n *networking.Networking) error {
+// KvmNetworkingToSystemd generates systemd unit files for a pod according to network configuration
+func KvmNetworkingToSystemd(p *stage1commontypes.Pod, n *networking.Networking) error {
 	podRoot := common.Stage1RootfsPath(p.Root)
 
 	// networking
@@ -40,18 +38,5 @@ func KvmPodToSystemd(p *stage1commontypes.Pod, n *networking.Networking) error {
 		return errwrap.Wrap(errors.New("failed to transform networking to units"), err)
 	}
 
-	// volumes
-	// prepare all applications names to become dependency for mount units
-	// all host-shared folder has to become available before applications starts
-	appNames := []types.ACName{}
-	for _, runtimeApp := range p.Manifest.Apps {
-		appNames = append(appNames, runtimeApp.Name)
-	}
-	// mount host volumes through some remote file system e.g. 9p to /mnt/volumeName location
-	// order is important here: PodToSystemHostMountUnits prepares folders that are checked by each appToSystemdMountUnits later
-	if err := stage1initcommon.PodToSystemdHostMountUnits(podRoot, p.Manifest.Volumes, appNames, stage1initcommon.UnitsDir); err != nil {
-		return errwrap.Wrap(errors.New("failed to transform pod volumes into mount units"), err)
-	}
-
 	return nil
 }

From e9196cd12da93b18da905c591d4c9a83e8b55447 Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Wed, 30 Mar 2016 13:15:04 +0200
Subject: [PATCH 0093/1304] kvm: fix data loss on 9p caches

Without this change some data could be lost if they are saved by
application just before pod stopping. For example if I started
docker://busybox in interactive mode, added some volume, echoed some
value into new file in this volume and then quickly closed pod - file
was created, but without expected content inside.

Changing this option helped.

Change was done basing on information from
  https://www.kernel.org/doc/Documentation/filesystems/9p.txt
---
 .../lkvm/patches/do_synchronous_writes.patch        | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 stage1/usr_from_kvm/lkvm/patches/do_synchronous_writes.patch

diff --git a/stage1/usr_from_kvm/lkvm/patches/do_synchronous_writes.patch b/stage1/usr_from_kvm/lkvm/patches/do_synchronous_writes.patch
new file mode 100644
index 0000000000..700caf7b6a
--- /dev/null
+++ b/stage1/usr_from_kvm/lkvm/patches/do_synchronous_writes.patch
@@ -0,0 +1,13 @@
+diff --git a/builtin-run.c b/builtin-run.c
+index edcaf3e..f2f2d73 100644
+--- a/builtin-run.c
++++ b/builtin-run.c
+@@ -590,7 +591,7 @@ static struct kvm *kvm_cmd_run_init(int argc, const char **argv)
+ 	}
+ 
+ 	if (kvm->cfg.using_rootfs) {
+-		strcat(real_cmdline, " rw rootflags=trans=virtio,version=9p2000.L,cache=loose rootfstype=9p");
++		strcat(real_cmdline, " rw rootflags=trans=virtio,version=9p2000.L,cache=none rootfstype=9p");
+ 		if (kvm->cfg.custom_rootfs) {
+ 			kvm_run_set_sandbox(kvm);
+ 

From 67f1be7eb5f83b5bc9ff5c93be40fa00b0f3f7e4 Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Fri, 25 Mar 2016 12:51:44 +0100
Subject: [PATCH 0094/1304] kvm: fix for missing destination

---
 stage1/init/common/kvm_mount.go | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/stage1/init/common/kvm_mount.go b/stage1/init/common/kvm_mount.go
index b7efc44a7b..13cd78dc81 100644
--- a/stage1/init/common/kvm_mount.go
+++ b/stage1/init/common/kvm_mount.go
@@ -81,6 +81,11 @@ func MountSharedVolumes(root string, appName types.ACName, volumes []types.Volum
 		}
 
 		destination := filepath.Join(appRootfs, mntPath)
+		// TODO: verify if rkt should do this, or it should be some outer responsibility
+		// to ensure if such patch exists
+		if err := ensureDestinationExists(source, destination); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not create destination mount point: %v", destination), err)
+		}
 
 		if err := doBindMount(source, destination, readOnly); err != nil {
 			return errwrap.Wrap(fmt.Errorf("could not bind mount path %v (s: %v, d: %v)", m.Path, source, destination), err)
@@ -98,3 +103,28 @@ func doBindMount(source, destination string, readOnly bool) error {
 	}
 	return nil
 }
+
+func ensureDestinationExists(source, destination string) error {
+	fileInfo, err := os.Stat(source)
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not stat source location: %v", source), err)
+	}
+
+	targetPathParent, _ := filepath.Split(destination)
+	if err := os.MkdirAll(targetPathParent, sharedVolPerm); err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not create parent directory: %v", targetPathParent), err)
+	}
+
+	if fileInfo.IsDir() {
+		if err := os.Mkdir(destination, sharedVolPerm); !os.IsExist(err) {
+			return err
+		}
+	} else {
+		if file, err := os.OpenFile(destination, os.O_CREATE, sharedVolPerm); err != nil {
+			return err
+		} else {
+			file.Close()
+		}
+	}
+	return nil
+}

From 0ed812208407e4dadf2a34e6892b5493a9a430ae Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Tue, 29 Mar 2016 14:13:56 +0200
Subject: [PATCH 0095/1304] kvm: fix for mounting symlinks

Co-authored-by: Michal Stachowski <michal.stachowski@outlook.com>
---
 stage1/init/common/kvm_mount.go | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/stage1/init/common/kvm_mount.go b/stage1/init/common/kvm_mount.go
index 13cd78dc81..238b39d987 100644
--- a/stage1/init/common/kvm_mount.go
+++ b/stage1/init/common/kvm_mount.go
@@ -20,6 +20,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"syscall"
 
 	"github.com/appc/spec/schema"
@@ -74,21 +75,26 @@ func MountSharedVolumes(root string, appName types.ACName, volumes []types.Volum
 		default:
 			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, vol.Kind)
 		}
-		appRootfs := common.AppRootfsPath(".", appName)
-		mntPath, err := evaluateAppMountPath(appRootfs, m.Path)
+		absAppRootfs, err := filepath.Abs(common.AppRootfsPath(".", appName))
 		if err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Path), err)
+			return fmt.Errorf(`could not evaluate absolute path for application rootfs in app: %v`, appName)
 		}
 
-		destination := filepath.Join(appRootfs, mntPath)
-		// TODO: verify if rkt should do this, or it should be some outer responsibility
-		// to ensure if such patch exists
-		if err := ensureDestinationExists(source, destination); err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not create destination mount point: %v", destination), err)
+		absDestination, err := filepath.Abs(filepath.Join(absAppRootfs, m.Path))
+		if err != nil {
+			return fmt.Errorf(`could not evaluate absolute path for application volume path %q in: %v`, m.Path, appName)
 		}
-
-		if err := doBindMount(source, destination, readOnly); err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not bind mount path %v (s: %v, d: %v)", m.Path, source, destination), err)
+		if !strings.HasPrefix(absDestination, absAppRootfs) {
+			return fmt.Errorf("path escapes app's root: %v", absDestination)
+		}
+		// TODO: verify if rkt should ensure existance of destination there, or it should be some
+		// outer responsibility to ensure if such path exists
+		if cleanedSource, err := filepath.EvalSymlinks(source); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not resolve symlink for source: %v", source), err)
+		} else if err := ensureDestinationExists(cleanedSource, absDestination); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not create destination mount point: %v", absDestination), err)
+		} else if err := doBindMount(cleanedSource, absDestination, readOnly); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not bind mount path %v (s: %v, d: %v)", m.Path, source, absDestination), err)
 		}
 	}
 	return nil

From df5330807227bf99ba04fa241eccc6e79d7ca36e Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Thu, 7 Apr 2016 17:28:18 +0200
Subject: [PATCH 0096/1304] kvm: refactor volume mounting

---
 stage1/init/common/kvm_mount.go | 136 --------------------------------
 stage1/init/common/mount.go     |   4 +-
 stage1/init/common/pod.go       |  16 +---
 stage1/init/init.go             |   8 ++
 stage1/init/kvm.go              | 132 +++++++++++++++++++++++++++++++
 5 files changed, 146 insertions(+), 150 deletions(-)
 delete mode 100644 stage1/init/common/kvm_mount.go

diff --git a/stage1/init/common/kvm_mount.go b/stage1/init/common/kvm_mount.go
deleted file mode 100644
index 238b39d987..0000000000
--- a/stage1/init/common/kvm_mount.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2015 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	"github.com/hashicorp/errwrap"
-)
-
-func MountSharedVolumes(root string, appName types.ACName, volumes []types.Volume, ra *schema.RuntimeApp) error {
-	app := ra.App
-	vols := make(map[types.ACName]types.Volume)
-	for _, v := range volumes {
-		vols[v.Name] = v
-	}
-
-	sharedVolPath := common.SharedVolumesPath(root)
-	if err := os.MkdirAll(sharedVolPath, sharedVolPerm); err != nil {
-		return errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
-	}
-	if err := os.Chmod(sharedVolPath, sharedVolPerm); err != nil {
-		return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
-	}
-
-	mounts := generateMounts(ra, vols)
-	for _, m := range mounts {
-		vol := vols[m.Volume]
-
-		if vol.Kind == "empty" {
-			p := filepath.Join(sharedVolPath, vol.Name.String())
-			if err := os.MkdirAll(p, sharedVolPerm); err != nil {
-				return errwrap.Wrap(fmt.Errorf("could not create shared volume %q", vol.Name), err)
-			}
-			if err := os.Chown(p, *vol.UID, *vol.GID); err != nil {
-				return errwrap.Wrap(fmt.Errorf("could not change owner of %q", p), err)
-			}
-			mod, err := strconv.ParseUint(*vol.Mode, 8, 32)
-			if err != nil {
-				return errwrap.Wrap(fmt.Errorf("invalid mode %q for volume %q", *vol.Mode, vol.Name), err)
-			}
-			if err := os.Chmod(p, os.FileMode(mod)); err != nil {
-				return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", p), err)
-			}
-		}
-
-		readOnly := IsMountReadOnly(vol, app.MountPoints)
-		var source string
-		switch vol.Kind {
-		case "host":
-			source = vol.Source
-		case "empty":
-			source = filepath.Join(common.SharedVolumesPath(root), vol.Name.String())
-		default:
-			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, vol.Kind)
-		}
-		absAppRootfs, err := filepath.Abs(common.AppRootfsPath(".", appName))
-		if err != nil {
-			return fmt.Errorf(`could not evaluate absolute path for application rootfs in app: %v`, appName)
-		}
-
-		absDestination, err := filepath.Abs(filepath.Join(absAppRootfs, m.Path))
-		if err != nil {
-			return fmt.Errorf(`could not evaluate absolute path for application volume path %q in: %v`, m.Path, appName)
-		}
-		if !strings.HasPrefix(absDestination, absAppRootfs) {
-			return fmt.Errorf("path escapes app's root: %v", absDestination)
-		}
-		// TODO: verify if rkt should ensure existance of destination there, or it should be some
-		// outer responsibility to ensure if such path exists
-		if cleanedSource, err := filepath.EvalSymlinks(source); err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not resolve symlink for source: %v", source), err)
-		} else if err := ensureDestinationExists(cleanedSource, absDestination); err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not create destination mount point: %v", absDestination), err)
-		} else if err := doBindMount(cleanedSource, absDestination, readOnly); err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not bind mount path %v (s: %v, d: %v)", m.Path, source, absDestination), err)
-		}
-	}
-	return nil
-}
-
-func doBindMount(source, destination string, readOnly bool) error {
-	if err := syscall.Mount(source, destination, "bind", syscall.MS_BIND, ""); err != nil {
-		return err
-	}
-	if readOnly {
-		return syscall.Mount(source, destination, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
-	}
-	return nil
-}
-
-func ensureDestinationExists(source, destination string) error {
-	fileInfo, err := os.Stat(source)
-	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("could not stat source location: %v", source), err)
-	}
-
-	targetPathParent, _ := filepath.Split(destination)
-	if err := os.MkdirAll(targetPathParent, sharedVolPerm); err != nil {
-		return errwrap.Wrap(fmt.Errorf("could not create parent directory: %v", targetPathParent), err)
-	}
-
-	if fileInfo.IsDir() {
-		if err := os.Mkdir(destination, sharedVolPerm); !os.IsExist(err) {
-			return err
-		}
-	} else {
-		if file, err := os.OpenFile(destination, os.O_CREATE, sharedVolPerm); err != nil {
-			return err
-		} else {
-			file.Close()
-		}
-	}
-	return nil
-}
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 86978d31bf..cbfd8c9a7a 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -62,10 +62,10 @@ func convertedFromDocker(ra *schema.RuntimeApp) bool {
 	return ok
 }
 
-// generateMounts maps MountPoint paths to volumes, returning a list of mounts,
+// GenerateMounts maps MountPoint paths to volumes, returning a list of mounts,
 // each with a parameter indicating if it's an implicit empty volume from a
 // Docker image.
-func generateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume) []mountWrapper {
+func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume) []mountWrapper {
 	app := ra.App
 
 	var genMnts []mountWrapper
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 75170536e2..ce213b2f6c 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -48,7 +48,7 @@ import (
 const (
 	// FlavorFile names the file storing the pod's flavor
 	FlavorFile    = "flavor"
-	sharedVolPerm = os.FileMode(0755)
+	SharedVolPerm = os.FileMode(0755)
 )
 
 var (
@@ -455,14 +455,6 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		return errwrap.Wrap(errors.New("failed to link service want"), err)
 	}
 
-	if flavor == "kvm" {
-		// bind mount all shared volumes (we don't use mechanism for bind-mounting given by nspawn)
-		if err := MountSharedVolumes(common.Stage1RootfsPath(p.Root), appName, p.Manifest.Volumes, ra); err != nil {
-			return errwrap.Wrap(errors.New("failed to prepare mount units"), err)
-		}
-
-	}
-
 	if err = writeAppReaper(p, appName.String()); err != nil {
 		return errwrap.Wrap(fmt.Errorf("failed to write app %q reaper service", appName), err)
 	}
@@ -625,10 +617,10 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 	app := ra.App
 
 	sharedVolPath := common.SharedVolumesPath(p.Root)
-	if err := os.MkdirAll(sharedVolPath, sharedVolPerm); err != nil {
+	if err := os.MkdirAll(sharedVolPath, SharedVolPerm); err != nil {
 		return nil, errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
 	}
-	if err := os.Chmod(sharedVolPath, sharedVolPerm); err != nil {
+	if err := os.Chmod(sharedVolPath, SharedVolPerm); err != nil {
 		return nil, errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
 	}
 
@@ -637,7 +629,7 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 		vols[v.Name] = v
 	}
 
-	mounts := generateMounts(ra, vols)
+	mounts := GenerateMounts(ra, vols)
 	for _, m := range mounts {
 		vol := vols[m.Volume]
 
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 73bb098890..fecb7c111c 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -628,6 +628,14 @@ func stage1() int {
 		return 1
 	}
 
+	// prepare mounts for kvm flavor
+	if flavor == "kvm" {
+		if err := KvmPrepareMounts(s1Root, p); err != nil {
+			log.PrintE("could not prepare mounts", err)
+			return 1
+		}
+	}
+
 	err = stage1common.WithClearedCloExec(lfd, func() error {
 		return syscall.Exec(args[0], args, env)
 	})
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index a240e8b10e..40c423cc3f 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -18,8 +18,15 @@ package main
 
 import (
 	"errors"
+	"fmt"
+	"os"
 	"path/filepath"
+	"strconv"
+	"strings"
+	"syscall"
 
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/networking"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
@@ -40,3 +47,128 @@ func KvmNetworkingToSystemd(p *stage1commontypes.Pod, n *networking.Networking)
 
 	return nil
 }
+
+func mountSharedVolumes(root string, volumes []types.Volume, ra *schema.RuntimeApp) error {
+	app := ra.App
+	appName := ra.Name
+	vols := make(map[types.ACName]types.Volume)
+	for _, v := range volumes {
+		vols[v.Name] = v
+	}
+
+	sharedVolPath := common.SharedVolumesPath(root)
+	if err := os.MkdirAll(sharedVolPath, stage1initcommon.SharedVolPerm); err != nil {
+		return errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
+	}
+	if err := os.Chmod(sharedVolPath, stage1initcommon.SharedVolPerm); err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
+	}
+
+	mounts := stage1initcommon.GenerateMounts(ra, vols)
+	for _, m := range mounts {
+		vol := vols[m.Volume]
+
+		if vol.Kind == "empty" {
+			p := filepath.Join(sharedVolPath, vol.Name.String())
+			if err := os.MkdirAll(p, stage1initcommon.SharedVolPerm); err != nil {
+				return errwrap.Wrap(fmt.Errorf("could not create shared volume %q", vol.Name), err)
+			}
+			if err := os.Chown(p, *vol.UID, *vol.GID); err != nil {
+				return errwrap.Wrap(fmt.Errorf("could not change owner of %q", p), err)
+			}
+			mod, err := strconv.ParseUint(*vol.Mode, 8, 32)
+			if err != nil {
+				return errwrap.Wrap(fmt.Errorf("invalid mode %q for volume %q", *vol.Mode, vol.Name), err)
+			}
+			if err := os.Chmod(p, os.FileMode(mod)); err != nil {
+				return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", p), err)
+			}
+		}
+
+		readOnly := stage1initcommon.IsMountReadOnly(vol, app.MountPoints)
+		var source string
+		switch vol.Kind {
+		case "host":
+			source = vol.Source
+		case "empty":
+			source = filepath.Join(common.SharedVolumesPath(root), vol.Name.String())
+		default:
+			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, vol.Kind)
+		}
+		absAppRootfs, err := filepath.Abs(common.AppRootfsPath(root, appName))
+		if err != nil {
+			return fmt.Errorf(`could not evaluate absolute path for application rootfs in app: %v`, appName)
+		}
+
+		absDestination, err := filepath.Abs(filepath.Join(absAppRootfs, m.Path))
+		if err != nil {
+			return fmt.Errorf(`could not evaluate absolute path for application volume path %q in: %v`, m.Path, appName)
+		}
+		if !strings.HasPrefix(absDestination, absAppRootfs) {
+			return fmt.Errorf("path escapes app's root: %v", absDestination)
+		}
+		if cleanedSource, err := filepath.EvalSymlinks(source); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not resolve symlink for source: %v", source), err)
+		} else if err := ensureDestinationExists(cleanedSource, absDestination); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not create destination mount point: %v", absDestination), err)
+		} else if err := doBindMount(cleanedSource, absDestination, readOnly); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not bind mount path %v (s: %v, d: %v)", m.Path, source, absDestination), err)
+		}
+	}
+	return nil
+}
+
+func doBindMount(source, destination string, readOnly bool) error {
+	if err := syscall.Mount(source, destination, "bind", syscall.MS_BIND, ""); err != nil {
+		return err
+	}
+	if readOnly {
+		return syscall.Mount(source, destination, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
+	}
+	return nil
+}
+
+func ensureDestinationExists(source, destination string) error {
+	fileInfo, err := os.Stat(source)
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not stat source location: %v", source), err)
+	}
+
+	targetPathParent, _ := filepath.Split(destination)
+	if err := os.MkdirAll(targetPathParent, stage1initcommon.SharedVolPerm); err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not create parent directory: %v", targetPathParent), err)
+	}
+
+	if fileInfo.IsDir() {
+		if err := os.Mkdir(destination, stage1initcommon.SharedVolPerm); !os.IsExist(err) {
+			return err
+		}
+	} else {
+		if file, err := os.OpenFile(destination, os.O_CREATE, stage1initcommon.SharedVolPerm); err != nil {
+			return err
+		} else {
+			file.Close()
+		}
+	}
+	return nil
+}
+
+func prepareMountsForApp(s1Root string, p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
+	// bind mount all shared volumes (we don't use mechanism for bind-mounting given by nspawn)
+	if err := mountSharedVolumes(s1Root, p.Manifest.Volumes, ra); err != nil {
+		return errwrap.Wrap(errors.New("failed to prepare mount point"), err)
+	}
+
+	return nil
+}
+
+func KvmPrepareMounts(s1Root string, p *stage1commontypes.Pod) error {
+	for i := range p.Manifest.Apps {
+		ra := &p.Manifest.Apps[i]
+		if err := prepareMountsForApp(s1Root, p, ra); err != nil {
+			return errwrap.Wrap(fmt.Errorf("failed prepare mounts for app %q", ra.Name), err)
+		}
+	}
+
+	return nil
+}

From 13690ed22e6b584c8eec3e2c3b7da934a770e9e5 Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Fri, 8 Apr 2016 12:38:03 +0200
Subject: [PATCH 0097/1304] kvm: fix pid vs ppid usage

Fixes #2389
---
 stage1/common/run.go          | 11 +++++------
 stage1/init/init.go           | 10 +++++++++-
 stage1_fly/run/main.go        |  2 +-
 tests/stub-stage1/run/main.go |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/stage1/common/run.go b/stage1/common/run.go
index 37327bb84c..4b71bd58ef 100644
--- a/stage1/common/run.go
+++ b/stage1/common/run.go
@@ -37,19 +37,18 @@ func WithClearedCloExec(lfd int, f func() error) error {
 	return f()
 }
 
-// WritePpid writes the pid's parent pid to $PWD/ppid
-func WritePpid(pid int) error {
-	// write ppid file as specified in
+// WritePid writes the given pid to $PWD/{filename}
+func WritePid(pid int, filename string) error {
+	// write pid file as specified in
 	// Documentation/devel/stage1-implementors-guide.md
 	out, err := os.Getwd()
 	if err != nil {
 		return errwrap.Wrap(errors.New("cannot get current working directory"), err)
 	}
-	// we are the parent of the process that is PID 1 in the container so we write our PID to "ppid"
-	err = ioutil.WriteFile(filepath.Join(out, "ppid"),
+	err = ioutil.WriteFile(filepath.Join(out, filename),
 		[]byte(fmt.Sprintf("%d\n", pid)), 0644)
 	if err != nil {
-		return errwrap.Wrap(errors.New("cannot write ppid file"), err)
+		return errwrap.Wrap(errors.New("cannot write pid file"), err)
 	}
 	return nil
 }
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 2a3d07c88d..33452a53c5 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -627,7 +627,15 @@ func stage1() int {
 		log.PrintE("continuing with per-app isolators disabled", err)
 	}
 
-	if err = stage1common.WritePpid(os.Getpid()); err != nil {
+	// kvm flavor has a bit different logic in handling pid vs ppid, for details look into #2389
+	// it does not require existance of "ppid", but instead registers current pid (which
+	// will be reused by lkvm binary) as an pod process pid used in entering
+	pid_filename := "ppid"
+	if flavor == "kvm" {
+		pid_filename = "pid"
+	}
+
+	if err = stage1common.WritePid(os.Getpid(), pid_filename); err != nil {
 		log.Error(err)
 		return 1
 	}
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 049f49bb3a..dd7e8dbd3f 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -332,7 +332,7 @@ func stage1() int {
 		}
 	}
 
-	if err = stage1common.WritePpid(os.Getpid()); err != nil {
+	if err = stage1common.WritePid(os.Getpid(), "ppid"); err != nil {
 		log.Error(err)
 		return 1
 	}
diff --git a/tests/stub-stage1/run/main.go b/tests/stub-stage1/run/main.go
index 679f749009..67227fdd70 100644
--- a/tests/stub-stage1/run/main.go
+++ b/tests/stub-stage1/run/main.go
@@ -39,7 +39,7 @@ func run() int {
 		return 1
 	}
 
-	if err := stage1common.WritePpid(os.Getpid()); err != nil {
+	if err := stage1common.WritePid(os.Getpid(), "ppid"); err != nil {
 		fmt.Fprintf(os.Stderr, "write ppid: %v", err)
 		return 1
 	}

From 0a70c841f16f2915144185b198b5ee85e35265f1 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 8 Apr 2016 12:33:22 +0200
Subject: [PATCH 0098/1304] docs: clean up English in hacking guide

---
 Documentation/hacking.md | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 5f4b9d3c38..3cd36ce0e2 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -7,10 +7,10 @@ For more information on the rkt internals, see the [`devel`](devel/) documentati
 
 ## Building rkt
 
-You should be able build rkt on any modern Linux system.
+You should be able build rkt on any modern Linux system with [Go](https://golang.org/) (1.5+) installed.
 For the most part the codebase is self-contained (e.g. all dependencies are vendored), but assembly of the stage1 requires some other tools to be installed on the system.
 Please see [the list of the build-time dependencies](dependencies.md#build-time-dependencies).
-Once the dependencies have been satisfied you can build rkt by running the following commands:
+Once the dependencies have been satisfied you can build rkt with a default configuration by running the following commands:
 
 ```
 git clone https://github.com/coreos/rkt.git
@@ -22,27 +22,25 @@ Build verbosity can be controlled with the V variable.
 Set V to 0 to have a silent build.
 Set V to either 1 or 2 to get short messages about what is being done (level 2 prints more of them).
 Set V to 3 to get raw output.
-Instead of a number, english words can be used.
-`quiet` or `silent` for level 0, `info` for level 1, `all` for level 2 and `raw` for level 3. Example:
-
-`make V=raw`
+Instead of a number, English words can be used: `quiet` or `silent` for level 0, `info` for level 1, `all` for level 2 and `raw` for level 3. 
+For example, `make V=raw` is equivalent to `make V=3`.
 
 To be able to run rkt, please see [the list of the run-time dependencies](dependencies.md#run-time-dependencies).
 
-### With Docker
+### Building rkt with Docker
 
 Alternatively, you can build rkt in a Docker container with the following command.
-Replace $SRC with the absolute path to your rkt source code:
+Replace `$SRC` with the absolute path to your rkt source code:
 
 ```
 # docker run -v $SRC:/opt/rkt -i -t golang:1.5 /bin/bash -c "apt-get update && apt-get install -y coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc && cd /opt/rkt && go get github.com/appc/spec/... && ./autogen.sh && ./configure && make"
 ```
 
-### Building systemd in stage1 from the sources
+### Building systemd in stage1 from source
 
 By default, rkt gets systemd from a CoreOS image to generate stage1.
-But it's also possible to build systemd from the sources.
-To do this, use the following configure parameters after running `./autogen.sh`:
+It's also possible to build systemd from source.
+To do this, use the following `configure` parameters after running `./autogen.sh`:
 
 - `--with-stage1-flavors`
 - `--with-stage1-default-flavor` (optional)
@@ -60,9 +58,9 @@ Example:
 
 The stage1 kvm image is based on CoreOS, but with additional components for running containers on top of a hypervisor.
 
-To build, pass `kvm` to `--with-stage1-flavors` parameter in `./configure`
+To build this stage1 image, pass `kvm` to `--with-stage1-flavors` parameter in `./configure`
 
-This will generate stage1 with embedded kernel and kvmtool to start pod in virtual machine.
+This will generate a stage1 with an embedded kernel and kvmtool, which launches each pod in a separate virtual machine.
 
 Additional build dependencies for the stage1 kvm follow.
 If building with docker, these must be added to the `apt-get install` command.
@@ -91,7 +89,7 @@ rkt expects stage1 images to be signed except in the following cases:
 * `--stage1-{name,hash}` is used and the image is already in the store
 * `--stage1-{url,path,from-dir}` is used and the image is in the default directory configured at build time
 
-## Managing Dependencies
+## Managing dependencies
 
 rkt uses [`godep`](https://github.com/tools/godep) to manage third-party dependencies.
 The build process is crafted to make this transparent to most users (i.e. if you're just building rkt from source, or modifying any of the codebase without changing dependencies, you should have no need to interact with godep).

From b02fd2fee8ca2bd858701ff128248a1918df9697 Mon Sep 17 00:00:00 2001
From: Simone Gotti <sgotti@sorint.it>
Date: Fri, 8 Apr 2016 15:42:25 +0200
Subject: [PATCH 0099/1304] rkt: calculate real dataDir path

If dataDir or some of its parents are symlinks all seems to work correctly
except the gc.

That's because stage0.MountGC determines which mountpoints should be
unmounted filtering the mountpoints returned from /proc/self/mountinfo
with the dataDir value. These mountpoints are the real path so, if the
dataDir or its parents are symlinks, no mountpoint will match.

This patch evaluates the dataDir real path.
---
 rkt/rkt.go | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/rkt/rkt.go b/rkt/rkt.go
index cf87815ca3..1577f3c343 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -259,10 +259,12 @@ func getDataDir() string {
 }
 
 func calculateDataDir() string {
+	var dataDir string
+
 	// If --dir parameter is passed, then use this value.
 	if dirFlag := cmdRkt.PersistentFlags().Lookup("dir"); dirFlag != nil {
 		if dirFlag.Changed {
-			return globalFlags.Dir
+			dataDir = globalFlags.Dir
 		}
 	} else {
 		// should not happen
@@ -270,17 +272,29 @@ func calculateDataDir() string {
 	}
 
 	// If above fails, then try to get the value from configuration.
-	if config, err := getConfig(); err != nil {
-		stderr.PrintE("cannot get configuration", err)
-		os.Exit(1)
-	} else {
-		if config.Paths.DataDir != "" {
-			return config.Paths.DataDir
+	if dataDir == "" {
+		if config, err := getConfig(); err != nil {
+			stderr.PrintE("cannot get configuration", err)
+			os.Exit(1)
+		} else {
+			if config.Paths.DataDir != "" {
+				dataDir = config.Paths.DataDir
+			}
 		}
 	}
 
+	if dataDir == "" {
+		dataDir = defaultDataDir
+	}
+
+	// Resolve symlinks
+	realDataDir, err := filepath.EvalSymlinks(dataDir)
+	if err != nil {
+		stderr.PrintE(fmt.Sprintf("cannot evaluate dataDir %q real path", dataDir), err)
+		os.Exit(1)
+	}
 	// If above fails, then use the default.
-	return defaultDataDir
+	return realDataDir
 }
 
 func getConfig() (*config.Config, error) {

From ce059a7c7e4130b36c4d53a99dba0f96c249379b Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Mon, 15 Feb 2016 11:54:13 +0100
Subject: [PATCH 0100/1304] kvm: Fix macvtap naming issue. Closes #2023

---
 networking/kvm.go | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index e353d896c4..f4a1117b74 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -81,7 +81,8 @@ type MacVTapNetConf struct {
 
 // setupTapDevice creates persistent macvtap device
 // and returns a newly created netlink.Link structure
-func setupMacVTapDevice(podID types.UUID, config MacVTapNetConf) (netlink.Link, error) {
+// using part of pod hash and interface number in interface name
+func setupMacVTapDevice(podID types.UUID, config MacVTapNetConf, interfaceNumber int) (netlink.Link, error) {
 	master, err := netlink.LinkByName(config.Master)
 	if err != nil {
 		return nil, errwrap.Wrap(fmt.Errorf("cannot find master device '%v'", config.Master), err)
@@ -105,11 +106,11 @@ func setupMacVTapDevice(podID types.UUID, config MacVTapNetConf) (netlink.Link,
 	if config.MTU != 0 {
 		mtu = config.MTU
 	}
-	nameTemplate := fmt.Sprintf("rkt-%s-vtap%%d", podID.String()[0:4])
+	interfaceName := fmt.Sprintf("rkt-%s-vtap%d", podID.String()[0:4], interfaceNumber)
 	link := &netlink.Macvtap{
 		Macvlan: netlink.Macvlan{
 			LinkAttrs: netlink.LinkAttrs{
-				Name:        nameTemplate,
+				Name:        interfaceName,
 				MTU:         mtu,
 				ParentIndex: master.Attrs().Index,
 			},
@@ -120,6 +121,11 @@ func setupMacVTapDevice(podID types.UUID, config MacVTapNetConf) (netlink.Link,
 	if err := netlink.LinkAdd(link); err != nil {
 		return nil, errwrap.Wrap(errors.New("cannot create macvtap interface"), err)
 	}
+	if err := netlink.LinkSetUp(link); err != nil {
+		// remove the newly added link and ignore errors, because we already are in a failed state
+		_ = netlink.LinkDel(link)
+		return nil, errwrap.Wrap(errors.New("cannot set up macvtap interface"), err)
+	}
 	return link, nil
 }
 
@@ -131,8 +137,12 @@ func kvmSetupNetAddressing(network *Networking, n activeNet, ifName string) erro
 	if err := ip.EnableIP4Forward(); err != nil {
 		return errwrap.Wrap(errors.New("failed to enable forwarding"), err)
 	}
+
+	// patch plugin type only for single IPAM run time, then revert this change
+	original_type := n.conf.Type
 	n.conf.Type = n.conf.IPAM.Type
 	output, err := network.execNetPlugin("ADD", &n, ifName)
+	n.conf.Type = original_type
 	if err != nil {
 		return errwrap.Wrap(fmt.Errorf("problem executing network plugin %q (%q)", n.conf.Type, ifName), err)
 	}
@@ -514,7 +524,7 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 			if err := json.Unmarshal(n.confBytes, &config); err != nil {
 				return nil, errwrap.Wrap(fmt.Errorf("error parsing %q result", n.conf.Name), err)
 			}
-			link, err := setupMacVTapDevice(podID, config)
+			link, err := setupMacVTapDevice(podID, config, i)
 			if err != nil {
 				return nil, err
 			}

From 6305635e9fd16c60ce146c84a99387b4d429f97e Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Fri, 8 Apr 2016 13:12:51 -0700
Subject: [PATCH 0101/1304] gc: Add flag 'mark-only' to mark garbage pods
 without deleting them.

If this flag is set to true, then we move the exited/aborted pods
to exited-garbage/garbage directory, but do not deleting them.

For prepared pods, if the flag is true, we don't move them to garbage
even the pods are expired.

A third party application can use 'rkt gc --mark-only=true' to
marks the time when the pods is not running.
---
 Documentation/subcommands/gc.md |  1 +
 rkt/gc.go                       |  6 +++
 tests/rkt_gc_test.go            | 74 +++++++++++++++++++++++++++++++++
 tests/rkt_tests.go              |  8 ++++
 4 files changed, 89 insertions(+)
 create mode 100644 tests/rkt_gc_test.go

diff --git a/Documentation/subcommands/gc.md b/Documentation/subcommands/gc.md
index 326732f22d..0befbe6b53 100644
--- a/Documentation/subcommands/gc.md
+++ b/Documentation/subcommands/gc.md
@@ -29,6 +29,7 @@ Garbage collecting pod "f07a4070-79a9-4db0-ae65-a090c9c393a3"
 | --- | --- | --- | --- |
 | `--expire-prepared` |  `24h0m0s` | A time | Duration to wait before expiring prepared pods |
 | `--grace-period` |  `30m0s` | A time | Duration to wait before discarding inactive pods from garbage |
+| `--mark-only` | `false` | If set to true, then the exited/aborted pods will be moved to the garbage directories without actually deleting them, this is useful for marking the exit time of a pod |
 
 ## Global options
 
diff --git a/rkt/gc.go b/rkt/gc.go
index b15b6c7ae6..b671a9db12 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -48,12 +48,14 @@ Use --grace-period=0s to effectively disable the grace-period.`,
 	}
 	flagGracePeriod        time.Duration
 	flagPreparedExpiration time.Duration
+	flagMarkOnly           bool
 )
 
 func init() {
 	cmdRkt.AddCommand(cmdGC)
 	cmdGC.Flags().DurationVar(&flagGracePeriod, "grace-period", defaultGracePeriod, "duration to wait before discarding inactive pods from garbage")
 	cmdGC.Flags().DurationVar(&flagPreparedExpiration, "expire-prepared", defaultPreparedExpiration, "duration to wait before expiring prepared pods")
+	cmdGC.Flags().BoolVar(&flagMarkOnly, "mark-only", false, "if set to true, then the exited/aborted pods will be moved to the garbage directories without actually deleting them, this is useful for marking the exit time of a pod")
 }
 
 func runGC(cmd *cobra.Command, args []string) (exit int) {
@@ -67,6 +69,10 @@ func runGC(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
+	if flagMarkOnly {
+		return
+	}
+
 	if err := renameExpired(flagPreparedExpiration); err != nil {
 		stderr.PrintE("failed to rename expired prepared pods", err)
 		return 1
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
new file mode 100644
index 0000000000..6e1009a8ad
--- /dev/null
+++ b/tests/rkt_gc_test.go
@@ -0,0 +1,74 @@
+// Copyright 2015 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestGC(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	// Finished pods.
+	patchImportAndRun("inspect-gc-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
+
+	// Prepared pods.
+	patchImportAndPrepare("inspect-gc-test-prepare.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
+
+	// Abort prepare.
+	imagePath := patchTestACI("inspect-gc-test-abort.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}...)
+	defer os.Remove(imagePath)
+	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s %s", ctx.Cmd(), imagePath, imagePath)
+	spawnAndWaitOrFail(t, cmd, 1)
+
+	gcCmd := fmt.Sprintf("%s gc --mark-only=true --expire-prepared=0 --grace-period=0", ctx.Cmd())
+	spawnAndWaitOrFail(t, gcCmd, 0)
+
+	gcDirs := []string{
+		filepath.Join(ctx.DataDir(), "pods", "exited-garbage"),
+		filepath.Join(ctx.DataDir(), "pods", "prepared"),
+		filepath.Join(ctx.DataDir(), "pods", "garbage"),
+	}
+
+	for _, dir := range gcDirs {
+		pods, err := ioutil.ReadDir(dir)
+		if err != nil {
+			t.Fatalf("cannot read gc directory %q: %v", dir, err)
+		}
+		if len(pods) == 0 {
+			t.Fatalf("pods should still exist in directory %q", dir)
+		}
+	}
+
+	gcCmd = fmt.Sprintf("%s gc --mark-only=false --expire-prepared=0 --grace-period=0", ctx.Cmd())
+	spawnAndWaitOrFail(t, gcCmd, 0)
+
+	for _, dir := range gcDirs {
+		pods, err := ioutil.ReadDir(dir)
+		if err != nil {
+			t.Fatalf("cannot read gc directory %q: %v", dir, err)
+		}
+		if len(pods) != 0 {
+			t.Fatalf("no pods should exist in directory %q, but found: %v", dir, pods)
+		}
+	}
+}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 34c9a91107..a7c5fbd8fe 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -238,6 +238,14 @@ func patchImportAndRun(image string, patches []string, t *testing.T, ctx *testut
 	spawnAndWaitOrFail(t, cmd, 0)
 }
 
+func patchImportAndPrepare(image string, patches []string, t *testing.T, ctx *testutils.RktRunCtx) {
+	imagePath := patchTestACI(image, patches...)
+	defer os.Remove(imagePath)
+
+	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
+	spawnAndWaitOrFail(t, cmd, 0)
+}
+
 func runGC(t *testing.T, ctx *testutils.RktRunCtx) {
 	cmd := fmt.Sprintf("%s gc --grace-period=0s", ctx.Cmd())
 	spawnAndWaitOrFail(t, cmd, 0)

From ccb9254742a9f207d8d11d2b577869b82c1f7a04 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Mon, 11 Apr 2016 15:02:52 +0200
Subject: [PATCH 0102/1304] store: fix comment + add link in db test

---
 store/db_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/store/db_test.go b/store/db_test.go
index a639c4f48c..b8bdd2a74d 100644
--- a/store/db_test.go
+++ b/store/db_test.go
@@ -78,9 +78,10 @@ func createTable(db *DB, t *testing.T) {
 }
 
 func TestDBRace(t *testing.T) {
-	// TODO(sgotti) this will not find concurrenct accesses to ql db from
+	// TODO(sgotti) this will not find concurrent accesses to ql db from
 	// multiple processes using multiple goroutines. A test that spawns at
 	// least two processes using multiple goroutines is needed.
+	// See https://github.com/coreos/rkt/pull/2391
 	oldGoMaxProcs := runtime.GOMAXPROCS(runtime.NumCPU())
 	defer runtime.GOMAXPROCS(oldGoMaxProcs)
 

From 15b33b18f4693e30943b5539f0091b5a8755c939 Mon Sep 17 00:00:00 2001
From: Simone Gotti <sgotti@sorint.it>
Date: Fri, 8 Apr 2016 14:55:05 +0200
Subject: [PATCH 0103/1304] rkt/image: check that discovery labels match
 manifest labels

The spec in the discovery part says: "Implementations MUST ensure
that the initial name and labels used for discovery matches the name and
labels in the Image Manifest."

Actually rkt just checks that the names matches but ignore the labels.

This patch also check the labels. Like the other validation parts the
check is executed only if the user doesn't pass `--insecure-options=image`

A functional test is added.

With this patch users calling `rkt fetch example.com/aci:latest` but
receiving an aci with a different version (like v2.0) will receive a
validation error.
---
 CHANGELOG.md             |  4 +++
 rkt/image/namefetcher.go | 10 ++++--
 rkt/image/validator.go   | 16 ++++++++++
 tests/rkt_fetch_test.go  | 69 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b09ab1b5a..b187c87f14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## vUNRELEASED
 
+#### New features and UX changes
+
+- Ensure that the initial name and labels used for discovery match the name and labels in the Image Manifest as specified in the appc spec ([#2311](https://github.com/coreos/rkt/pull/2311)). Users wanting the latest image should use `rkt prepare/run/fetch example.com/aci` without any labels. If the discovery server supports the "latest" pattern, the user can bypass a locally cached image in the store and fetch an updated image using `rkt prepare/run/fetch --no-store example.com/aci` option.
+
 #### Note for packagers
 
 Files generated from sources are no longer checked-in the git repository. Instead, packagers should build them:
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 9fded8f7f7..da128379e3 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -181,7 +181,7 @@ func (f *nameFetcher) fetchVerifiedURL(app *discovery.App, u *url.URL, a *asc) (
 		}
 	}
 
-	if err := f.validate(appName, aciFile, ascFile); err != nil {
+	if err := f.validate(app, aciFile, ascFile); err != nil {
 		return nil, nil, err
 	}
 	retAciFile := aciFile
@@ -249,13 +249,17 @@ func (f *nameFetcher) checkIdentity(appName string, ascFile io.ReadSeeker) error
 	return nil
 }
 
-func (f *nameFetcher) validate(appName string, aciFile, ascFile io.ReadSeeker) error {
+func (f *nameFetcher) validate(app *discovery.App, aciFile, ascFile io.ReadSeeker) error {
 	v, err := newValidator(aciFile)
 	if err != nil {
 		return err
 	}
 
-	if err := v.ValidateName(appName); err != nil {
+	if err := v.ValidateName(app.Name.String()); err != nil {
+		return err
+	}
+
+	if err := v.ValidateLabels(app.Labels); err != nil {
 		return err
 	}
 
diff --git a/rkt/image/validator.go b/rkt/image/validator.go
index bace2715fc..a9c0751632 100644
--- a/rkt/image/validator.go
+++ b/rkt/image/validator.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 	"golang.org/x/crypto/openpgp"
 	pgperrors "golang.org/x/crypto/openpgp/errors"
 )
@@ -64,6 +65,21 @@ func (v *validator) ValidateName(imageName string) error {
 	return nil
 }
 
+// ValidateLabels checks if desired image labels are actually the same as
+// the ones in the image manifest.
+func (v *validator) ValidateLabels(labels map[types.ACIdentifier]string) error {
+	for n, rv := range labels {
+		if av, ok := v.manifest.GetLabel(n.String()); ok {
+			if rv != av {
+				return fmt.Errorf("requested value for label %q: %q differs from fetched aci label value: %q", n, rv, av)
+			}
+		} else {
+			return fmt.Errorf("requested label %q not provided by the image manifest", n)
+		}
+	}
+	return nil
+}
+
 // ValidateWithSignature verifies the image against a given signature
 // file.
 func (v *validator) ValidateWithSignature(ks *keystore.Keystore, sig io.ReadSeeker) (*openpgp.Entity, error) {
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index a13867bc9d..69634e4d2e 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -17,6 +17,7 @@ package main
 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -458,3 +459,71 @@ func TestDeferredSignatureDownload(t *testing.T) {
 		}
 	}
 }
+
+func TestDifferentDiscoveryLabels(t *testing.T) {
+	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	emptyImage := getEmptyImagePath()
+	imageName := "localhost/rkt-test-different-discovery-labels-image"
+	manifest := strings.Replace(manifestTemplate, "IMG_NAME", imageName, -1)
+	tmpDir := createTempDirOrPanic("rkt-TestDifferentDiscoveryLabels-")
+	defer os.RemoveAll(tmpDir)
+
+	tmpManifest, err := ioutil.TempFile(tmpDir, "manifest")
+	if err != nil {
+		panic(fmt.Sprintf("Cannot create temp manifest: %v", err))
+	}
+	if err := ioutil.WriteFile(tmpManifest.Name(), []byte(manifest), 0600); err != nil {
+		panic(fmt.Sprintf("Cannot write to temp manifest: %v", err))
+	}
+	defer os.Remove(tmpManifest.Name())
+
+	image := patchACI(emptyImage, "rkt-test-different-discovery-labels-image.aci", "--manifest", tmpManifest.Name())
+	imageFileName := fmt.Sprintf("%s.aci", filepath.Base(imageName))
+	defer os.Remove(image)
+
+	asc := runSignImage(t, image, 1)
+	defer os.Remove(asc)
+	ascBase := filepath.Base(asc)
+
+	setup := taas.GetDefaultServerSetup()
+	server := runServer(t, setup)
+	defer server.Close()
+	fileSet := make(map[string]string, 2)
+	fileSet[imageFileName] = image
+	fileSet[ascBase] = asc
+	if err := server.UpdateFileSet(fileSet); err != nil {
+		t.Fatalf("Failed to populate a file list in test aci server: %v", err)
+	}
+
+	tests := []struct {
+		imageName       string
+		expectedMessage string
+	}{
+		{imageName + ":2.0", fmt.Sprintf("requested value for label %q: %q differs from fetched aci label value: %q", "version", "2.0", "1.2.0")},
+		{imageName + ":latest", fmt.Sprintf("requested value for label %q: %q differs from fetched aci label value: %q", "version", "latest", "1.2.0")},
+		{imageName + ",arch=armv7b", fmt.Sprintf("requested value for label %q: %q differs from fetched aci label value: %q", "arch", "armv7b", "amd64")},
+		{imageName + ",unexistinglabel=bla", fmt.Sprintf("requested label %q not provided by the image manifest", "unexistinglabel")},
+	}
+
+	for _, tt := range tests {
+		testDifferentDiscoveryNameLabels(t, tt.imageName, tt.expectedMessage)
+	}
+}
+
+func testDifferentDiscoveryNameLabels(t *testing.T, imageName string, expectedMessage string) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	runRktTrust(t, ctx, "", 1)
+
+	// Since aci-server provided meta tag template doesn't contains
+	// {version} {os} or {arch}, we can just ask for any version/os/arch
+	// and always get the same ACI
+	runCmd := fmt.Sprintf("%s --debug --insecure-options=tls fetch %s", ctx.Cmd(), imageName)
+	child := spawnOrFail(t, runCmd)
+	defer waitOrFail(t, child, 1)
+
+	if err := expectWithOutput(child, expectedMessage); err != nil {
+		t.Fatalf("Could not find expected msg %q, output follows:\n%v", expectedMessage, err)
+	}
+}

From 3d610d8ada044be14f5f6665005ef6fe1f9c8bfb Mon Sep 17 00:00:00 2001
From: Wlodzimierz Borkowski <wlodzimierz.borkowski@intel.com>
Date: Tue, 8 Mar 2016 08:36:12 +0100
Subject: [PATCH 0104/1304] functional tests: Add new test with systemd-proxyd

Setting ptp template network and IP address in systemd unit during
test. Updated also docs with example.
---
 Documentation/using-rkt-with-systemd.md |  79 ++++++++++
 tests/rkt_socket_proxyd_test.go         | 200 ++++++++++++++++++++++++
 2 files changed, 279 insertions(+)
 create mode 100644 tests/rkt_socket_proxyd_test.go

diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index 6db494365d..47dad93524 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -202,6 +202,84 @@ Jul 30 12:24:50 locke-work systemd[1]: Listening on My socket-activated app's so
 
 Now, a new connection to port 8080 will start your container to handle the request.
 
+### Bidirectionally proxy local sockets to another (possibly remote) socket.
+
+`rkt` also supports the [socket-proxyd service][systemd-socket-proxyd]. Much like socket activation, with socket-proxyd systemd provides a listener on a given port on behalf of a container, and starts the container when a connection is received. Socket-proxy listening can be useful in environments that lack native support for socket activation. The LKVM stage1 flavor is an example of such an environment.
+
+To set up socket proxyd, create a network template consisting of three units, like the example below. This example uses the redis app and the PTP network template in `/etc/rkt/net.d/ptp0.conf`:
+
+```json
+{
+	"name": "ptp0",
+	"type": "ptp",
+	"ipMasq": true,
+	"ipam": {
+		"type": "host-local",
+		"subnet": "172.16.28.0/24",
+		"routes": [
+			{ "dst": "0.0.0.0/0" }
+		]
+	}
+}
+```
+
+```
+# rkt-redis.service
+[Unit]
+Description=Socket-proxyd redis server
+
+[Service]
+ExecStart=/usr/bin/rkt --insecure-options=image run --net="ptp:IP=172.16.28.101" docker://redis
+KillMode=process
+```
+Note that you have to specify IP manually in systemd unit.
+
+Then you will need a pair of `.service` and `.socket` unit files.
+
+We want to use the port 6379 on the localhost instead of the remote container IP,
+so we use next systemd unit to override it.
+
+```
+# proxy-to-rkt-redis.service
+[Unit]
+Requires=rkt-redis.service
+After=rkt-redis.service
+
+[Service]
+ExecStart=/usr/lib/systemd/systemd-socket-proxyd 172.16.28.101:6379
+```
+Lastly the related socket unit,
+```
+# proxy-to-rkt-redis.socket
+[Socket]
+ListenStream=6371
+
+[Install]
+WantedBy=sockets.target
+```
+
+Finally, start the socket unit:
+
+```
+# systemctl enable proxy-to-redis.socket
+$ sudo systemctl start proxy-to-redis.socket
+● proxy-to-rkt-redis.socket
+   Loaded: loaded (/etc/systemd/system/proxy-to-rkt-redis.socket; enabled; vendor preset: disabled)
+   Active: active (listening) since Mon 2016-03-07 11:53:32 CET; 8s ago
+   Listen: [::]:6371 (Stream)
+
+Mar 07 11:53:32 user-host systemd[1]: Listening on proxy-to-rkt-redis.socket.
+Mar 07 11:53:32 user-host systemd[1]: Starting proxy-to-rkt-redis.socket.
+
+```
+
+Now, a new connection to localhost port 6371 will start your container with redis, to handle the request.
+
+```
+$ curl http://localhost:6371/
+```
+
+
 ## Other tools for managing pods
 
 Let us assume the service from the simple example unit file, above, is started on the host.
@@ -309,3 +387,4 @@ $ systemd-cgls --all
 [systemd-machined]: http://www.freedesktop.org/software/systemd/man/systemd-machined.service.html
 [systemd-run]: http://www.freedesktop.org/software/systemd/man/systemd-run.html
 [systemd-socket-activated]: http://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
+[systemd-socket-proxyd]: https://www.freedesktop.org/software/systemd/man/systemd-socket-proxyd.html
diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
new file mode 100644
index 0000000000..8c07df2c1e
--- /dev/null
+++ b/tests/rkt_socket_proxyd_test.go
@@ -0,0 +1,200 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"io/ioutil"
+	"math/rand"
+	"net"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	sd_dbus "github.com/coreos/go-systemd/dbus"
+	sd_util "github.com/coreos/go-systemd/util"
+	"github.com/coreos/rkt/tests/testutils"
+	"github.com/vishvananda/netlink"
+)
+
+func TestSocketProxyd(t *testing.T) {
+	if !sd_util.IsRunningSystemd() {
+		t.Skip("Systemd is not running on the host.")
+	}
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
+	if err != nil {
+		t.Fatalf("Error while getting non-lo host interface: %v\n", err)
+	}
+	if iface.Name == "" {
+		t.Skipf("Cannot run test without non-lo host interface")
+	}
+
+	nt := networkTemplateT{
+		Name:   "ptp0",
+		Type:   "ptp",
+		IpMasq: true,
+		Master: iface.Name,
+		Ipam: ipamTemplateT{
+			Type:   "host-local",
+			Subnet: "192.168.0.0/24",
+			Routes: []map[string]string{
+				{"dst": "0.0.0.0/0"},
+			},
+		},
+	}
+
+	netDir := prepareTestNet(t, ctx, nt)
+	defer os.RemoveAll(netDir)
+
+	port, err := randomFreePort(t)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	echoImage := patchTestACI("rkt-inspect-echo.aci",
+		"--exec=/echo-socket-activated",
+		"--ports=test-port,protocol=tcp,port=80,socketActivated=true")
+	defer os.Remove(echoImage)
+
+	conn, err := sd_dbus.New()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	rktTestingEchoService := `
+	[Unit]
+	Description=Socket-activated echo server
+
+	[Service]
+	ExecStart=%s
+	KillMode=process
+	`
+
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	rnd := r.Int()
+
+	// Write unit files directly to runtime system units directory
+	// (/run/systemd/system) to avoid calling LinkUnitFiles - it is buggy in
+	// systemd v219 as it does not work with absolute paths.
+	unitsDir := "/run/systemd/system"
+	containerIP := "192.168.0.101"
+
+	cmd := fmt.Sprintf("%s --insecure-options=image --debug run --net=\"%s:IP=%s\" --port=test-port:%d --mds-register=false %s",
+		ctx.Cmd(), nt.Name, containerIP, port, echoImage)
+
+	serviceContent := fmt.Sprintf(rktTestingEchoService, cmd)
+	serviceTargetBase := fmt.Sprintf("rkt-testing-socket-activation-%d.service", rnd)
+	serviceTarget := filepath.Join(unitsDir, serviceTargetBase)
+
+	if err := ioutil.WriteFile(serviceTarget, []byte(serviceContent), 0666); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(serviceTarget)
+
+	rktTestingEchoSocket := `
+	[Unit]
+	Description=Socket-activated netcat server socket
+
+	[Socket]
+	ListenStream=%d
+
+	[Install]
+	WantedBy=sockets.target
+	`
+
+	socketContent := fmt.Sprintf(rktTestingEchoSocket, port)
+	socketTargetBase := fmt.Sprintf("proxy-to-rkt-testing-socket-activation-%d.socket", rnd)
+	socketTarget := filepath.Join(unitsDir, socketTargetBase)
+
+	if err := ioutil.WriteFile(socketTarget, []byte(socketContent), 0666); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(socketTarget)
+
+	proxyToRktTestingEchoService := `
+	[Unit]
+	Requires=%s
+	After=%s
+
+	[Service]
+	ExecStart=/lib/systemd/systemd-socket-proxyd %s:%d
+	`
+
+	proxyContent := fmt.Sprintf(proxyToRktTestingEchoService, serviceTargetBase, serviceTargetBase, containerIP, port)
+	proxyContentBase := fmt.Sprintf("proxy-to-rkt-testing-socket-activation-%d.service", rnd)
+	proxyTarget := filepath.Join(unitsDir, proxyContentBase)
+
+	if err := ioutil.WriteFile(proxyTarget, []byte(proxyContent), 0666); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(proxyTarget)
+
+	reschan := make(chan string)
+	doJob := func() {
+		job := <-reschan
+		if job != "done" {
+			t.Fatal("Job is not done:", job)
+		}
+	}
+
+	if _, err := conn.StartUnit(socketTargetBase, "replace", reschan); err != nil {
+		t.Fatal(err)
+	}
+	doJob()
+
+	defer func() {
+		if _, err := conn.StopUnit(socketTargetBase, "replace", reschan); err != nil {
+			t.Fatal(err)
+		}
+		doJob()
+
+		if _, err := conn.StopUnit(serviceTargetBase, "replace", reschan); err != nil {
+			t.Fatal(err)
+		}
+		doJob()
+
+		if _, err := conn.StopUnit(proxyContentBase, "replace", reschan); err != nil {
+			t.Fatal(err)
+		}
+		doJob()
+	}()
+
+	expected := "HELO\n"
+	sockConn, err := net.Dial("tcp", fmt.Sprintf("localhost:%d", port))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if _, err := fmt.Fprintf(sockConn, expected); err != nil {
+		t.Fatal(err)
+	}
+
+	answer, err := bufio.NewReader(sockConn).ReadString('\n')
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if answer != expected {
+		t.Fatalf("Expected %q, Got %q", expected, answer)
+	}
+
+	return
+}

From 6d8c7ae4d695a8fbb4919ceaf26bf4410999f73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 12 Apr 2016 12:06:40 +0200
Subject: [PATCH 0105/1304] stage1/init: create empty volume directory always

If there was an implicit empty volume and the image was converted from
docker, we copy the files from the image to the volume.

However, if the image defines the mountpoint but the directory is not
actually present in the image, CopyTree will do nothing and the volume
directory won't be created, making the following Chown call fail.

We now create the directory always. If CopyTree already created it, it
doesn't hurt.
---
 stage1/init/common/mount.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index cbfd8c9a7a..2b9a3936d5 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -162,11 +162,10 @@ func PrepareMountpoints(volPath string, targetPath string, vol *types.Volume, do
 				return errwrap.Wrap(fmt.Errorf("error copying image files to empty volume %q", volPath), err)
 			}
 		}
-	} else {
-		if err := os.MkdirAll(volPath, 0770); err != nil {
-			return errwrap.Wrap(fmt.Errorf("error creating %q", volPath), err)
-		}
+	}
 
+	if err := os.MkdirAll(volPath, 0770); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error creating %q", volPath), err)
 	}
 	if err := os.Chown(volPath, Uid, Gid); err != nil {
 		return errwrap.Wrap(fmt.Errorf("could not change owner of %q", volPath), err)

From 9939be1749014da029a4e1447a26e81be9dcf3b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 12 Apr 2016 11:42:37 +0200
Subject: [PATCH 0106/1304] functional tests: use different image names for
 docker vol semantics test

We were only testing the last generated image, and the other cases
worked because there was no volume being mounted there and hence the
files were visible.

Name each test image differently so we actually do the tests.
---
 tests/rkt_volume_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 2a25650b16..2d468d8a72 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -169,8 +169,8 @@ func TestDockerVolumeSemantics(t *testing.T) {
 	defer ctx.Cleanup()
 
 	var dockerVolImage []string
-	for _, tt := range volDockerTests {
-		img := patchTestACI("rkt-volume-image.aci", fmt.Sprintf("--mounts=mydir,path=%s,readOnly=false", tt.dir))
+	for i, tt := range volDockerTests {
+		img := patchTestACI(fmt.Sprintf("rkt-volume-image-%d.aci", i), fmt.Sprintf("--mounts=mydir,path=%s,readOnly=false", tt.dir))
 		defer os.Remove(img)
 		dockerVolImage = append(dockerVolImage, img)
 	}

From 4112d50b1e724637ecef9a65606e1f77a78b9da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 12 Apr 2016 10:58:38 +0200
Subject: [PATCH 0107/1304] stage1/init: get annotations from the ImageManifest

To detect if we're running an image that was converted from docker, we
were getting annotations from the RuntimeApp. This doesn't work for the
case where the user runs rkt directly with a pod manifest, since they
can omit the annotations there.

Instead, use the ImageManifest, which is the right place to look for
annotations.
---
 stage1/init/common/mount.go | 8 ++++----
 stage1/init/common/pod.go   | 3 ++-
 stage1/init/kvm.go          | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 2b9a3936d5..2f264b422a 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -56,8 +56,8 @@ func IsMountReadOnly(vol types.Volume, mountPoints []types.MountPoint) bool {
 	return isMPReadOnly(mountPoints, vol.Name)
 }
 
-func convertedFromDocker(ra *schema.RuntimeApp) bool {
-	ann := ra.Annotations
+func convertedFromDocker(im *schema.ImageManifest) bool {
+	ann := im.Annotations
 	_, ok := ann.Get("appc.io/docker/repository")
 	return ok
 }
@@ -65,7 +65,7 @@ func convertedFromDocker(ra *schema.RuntimeApp) bool {
 // GenerateMounts maps MountPoint paths to volumes, returning a list of mounts,
 // each with a parameter indicating if it's an implicit empty volume from a
 // Docker image.
-func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume) []mountWrapper {
+func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume, imageManifest *schema.ImageManifest) []mountWrapper {
 	app := ra.App
 
 	var genMnts []mountWrapper
@@ -101,7 +101,7 @@ func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume
 				GID:  &defaultGID,
 			}
 
-			dockerImplicit := convertedFromDocker(ra)
+			dockerImplicit := convertedFromDocker(imageManifest)
 			log.Printf("warning: no volume specified for mount point %q, implicitly creating an \"empty\" volume. This volume will be removed when the pod is garbage-collected.", mp.Name)
 			if dockerImplicit {
 				log.Printf("Docker converted image, initializing implicit volume with data contained at the mount point %q.", mp.Name)
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index ce213b2f6c..0737c9db1a 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -629,7 +629,8 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 		vols[v.Name] = v
 	}
 
-	mounts := GenerateMounts(ra, vols)
+	imageManifest := p.Images[appName.String()]
+	mounts := GenerateMounts(ra, vols, imageManifest)
 	for _, m := range mounts {
 		vol := vols[m.Volume]
 
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index 40c423cc3f..cb16b7f26d 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -48,9 +48,10 @@ func KvmNetworkingToSystemd(p *stage1commontypes.Pod, n *networking.Networking)
 	return nil
 }
 
-func mountSharedVolumes(root string, volumes []types.Volume, ra *schema.RuntimeApp) error {
+func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
 	app := ra.App
 	appName := ra.Name
+	volumes := p.Manifest.Volumes
 	vols := make(map[types.ACName]types.Volume)
 	for _, v := range volumes {
 		vols[v.Name] = v
@@ -64,7 +65,8 @@ func mountSharedVolumes(root string, volumes []types.Volume, ra *schema.RuntimeA
 		return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
 	}
 
-	mounts := stage1initcommon.GenerateMounts(ra, vols)
+	imageManifest := p.Images[appName.String()]
+	mounts := stage1initcommon.GenerateMounts(ra, vols, imageManifest)
 	for _, m := range mounts {
 		vol := vols[m.Volume]
 
@@ -155,7 +157,7 @@ func ensureDestinationExists(source, destination string) error {
 
 func prepareMountsForApp(s1Root string, p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
 	// bind mount all shared volumes (we don't use mechanism for bind-mounting given by nspawn)
-	if err := mountSharedVolumes(s1Root, p.Manifest.Volumes, ra); err != nil {
+	if err := mountSharedVolumes(s1Root, p, ra); err != nil {
 		return errwrap.Wrap(errors.New("failed to prepare mount point"), err)
 	}
 

From e38cf060b20f30333af1a2f4d5c4e436c5c03466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 12 Apr 2016 11:40:25 +0200
Subject: [PATCH 0108/1304] functional tests: add docker vol semantics + pod
 manifest test

---
 tests/rkt_run_pod_manifest_test.go | 17 ----------
 tests/rkt_tests.go                 | 17 ++++++++++
 tests/rkt_volume_test.go           | 52 ++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 87fe3dd746..322156b206 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -41,23 +41,6 @@ func stringP(s string) *string {
 	return &s
 }
 
-func generatePodManifestFile(t *testing.T, manifest *schema.PodManifest) string {
-	tmpDir := testutils.GetValueFromEnvOrPanic("FUNCTIONAL_TMP")
-	f, err := ioutil.TempFile(tmpDir, "rkt-test-manifest-")
-	if err != nil {
-		t.Fatalf("Cannot create tmp pod manifest: %v", err)
-	}
-
-	data, err := json.Marshal(manifest)
-	if err != nil {
-		t.Fatalf("Cannot marshal pod manifest: %v", err)
-	}
-	if err := ioutil.WriteFile(f.Name(), data, 0600); err != nil {
-		t.Fatalf("Cannot write pod manifest file: %v", err)
-	}
-	return f.Name()
-}
-
 func verifyHostFile(t *testing.T, tmpdir, filename string, i int, expectedResult string) {
 	filePath := path.Join(tmpdir, filename)
 	defer os.Remove(filePath)
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index a7c5fbd8fe..a85740f28a 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -679,6 +679,23 @@ func runRktTrust(t *testing.T, ctx *testutils.RktRunCtx, prefix string, keyIndex
 	}
 }
 
+func generatePodManifestFile(t *testing.T, manifest *schema.PodManifest) string {
+	tmpDir := testutils.GetValueFromEnvOrPanic("FUNCTIONAL_TMP")
+	f, err := ioutil.TempFile(tmpDir, "rkt-test-manifest-")
+	if err != nil {
+		t.Fatalf("Cannot create tmp pod manifest: %v", err)
+	}
+
+	data, err := json.Marshal(manifest)
+	if err != nil {
+		t.Fatalf("Cannot marshal pod manifest: %v", err)
+	}
+	if err := ioutil.WriteFile(f.Name(), data, 0600); err != nil {
+		t.Fatalf("Cannot write pod manifest file: %v", err)
+	}
+	return f.Name()
+}
+
 func checkUserNS() error {
 	// CentOS 7 pretends to support user namespaces, but does not.
 	// See https://bugzilla.redhat.com/show_bug.cgi?id=1168776#c5
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 2d468d8a72..2d9d24bde1 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -24,6 +24,9 @@ import (
 	"time"
 
 	"github.com/coreos/rkt/tests/testutils"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 )
 
 var volTests = []struct {
@@ -184,3 +187,52 @@ func TestDockerVolumeSemantics(t *testing.T) {
 		runRktAndCheckOutput(t, cmd, expected, false)
 	}
 }
+
+func TestDockerVolumeSemanticsPodManifest(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for i, tt := range volDockerTests {
+		t.Logf("Running test #%v on directory %s", i, tt.dir)
+
+		hash := patchImportAndFetchHash(fmt.Sprintf("rkt-volume-image-pm-%d.aci", i), []string{fmt.Sprintf("--mounts=mydir,path=%s,readOnly=false", tt.dir)}, t, ctx)
+
+		imgID, err := types.NewHash(hash)
+		if err != nil {
+			t.Fatalf("Cannot generate types.Hash from %v: %v", hash, err)
+		}
+
+		pm := &schema.PodManifest{
+			ACKind:    schema.PodManifestKind,
+			ACVersion: schema.AppContainerVersion,
+			Apps: []schema.RuntimeApp{
+				{
+					Name: "rkt-volume-image",
+					App: &types.App{
+						Exec:  []string{"/inspect", "--read-file"},
+						User:  "0",
+						Group: "0",
+						Environment: []types.EnvironmentVariable{
+							{"FILE", fmt.Sprintf("%s/file", tt.dir)},
+						},
+						MountPoints: []types.MountPoint{
+							{"mydir", tt.dir, false},
+						},
+					},
+					Image: schema.RuntimeImage{
+						ID: *imgID,
+					},
+				},
+			},
+		}
+
+		manifestFile := generatePodManifestFile(t, pm)
+		defer os.Remove(manifestFile)
+
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --pod-manifest=%s", ctx.Cmd(), manifestFile)
+
+		expected := fmt.Sprintf("<<<%s>>>", tt.expectedContent)
+
+		runRktAndCheckOutput(t, cmd, expected, false)
+	}
+}

From ef52083eb2f3e13d2f4b7a900aa1f406cef8052a Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 12 Apr 2016 16:30:40 +0200
Subject: [PATCH 0109/1304] documentation: remove superfluous dash

---
 Documentation/subcommands/run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index d2971c6662..e8dd61349e 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -142,7 +142,7 @@ The read-only parameter is false by default.
 Syntax:
 
 ```
----volume NAME,kind=host,source=SOURCE_PATH,readOnly=BOOL
+--volume NAME,kind=host,source=SOURCE_PATH,readOnly=BOOL
 ```
 
 In the following example, we make the host's `/srv/data` accessible to app1 on `/var/data`:

From e846f29bc6eea2cbfa3e4b1d7579878715caad1f Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Fri, 8 Apr 2016 17:28:21 -0700
Subject: [PATCH 0110/1304] pods.go: Add pod.getGCMarkedTime().

This returns the timestamp when the pod is moved to garbage/exited-garbage.
---
 rkt/pods.go | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/rkt/pods.go b/rkt/pods.go
index 761c518996..1ae0113648 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -478,7 +478,7 @@ func (p *pod) xToExitedGarbage() error {
 	return nil
 }
 
-// xToGarbage transitions a pod from prepared -> garbage or prepared -> garbage
+// xToGarbage transitions a pod from abortedPrepared -> garbage or prepared -> garbage
 func (p *pod) xToGarbage() error {
 	if !p.isAbortedPrepare && !p.isPrepared {
 		return fmt.Errorf("bug: only failed prepare or prepared pods may transition to garbage")
@@ -676,6 +676,7 @@ func (p *pod) refreshState() error {
 
 // waitExited waits for a pod to (run and) exit.
 func (p *pod) waitExited() error {
+	// isExited implies isExitedGarbage.
 	for !p.isExited && !p.isAbortedPrepare && !p.isGarbage && !p.isGone {
 		if err := p.SharedLock(); err != nil {
 			return err
@@ -764,6 +765,7 @@ func (p *pod) getModTime(path string) (time.Time, error) {
 	if err != nil {
 		return time.Time{}, err
 	}
+	defer f.Close()
 
 	fi, err := f.Stat()
 	if err != nil {
@@ -805,6 +807,29 @@ func (p *pod) getStartTime() (time.Time, error) {
 	return t, err
 }
 
+func (p *pod) getGCMarkedTime() (time.Time, error) {
+	if !p.isGarbage && !p.isExitedGarbage {
+		return time.Time{}, nil
+	}
+
+	// At this point, the pod is in either exited-garbage dir, garbage dir or gone already.
+	podPath := p.path()
+	if podPath == "" {
+		// Pod is gone.
+		return time.Time{}, nil
+	}
+
+	st := &syscall.Stat_t{}
+	if err := syscall.Lstat(podPath, st); err != nil {
+		if err == syscall.ENOENT {
+			// Pod is gone.
+			err = nil
+		}
+		return time.Time{}, err
+	}
+	return time.Unix(st.Ctim.Unix()), nil
+}
+
 type ErrChildNotReady struct {
 }
 

From 490042fc2691733ba772280643be583f4ada5d5a Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Fri, 8 Apr 2016 18:21:47 -0700
Subject: [PATCH 0111/1304] api: Add 'gc_marked_at' field in the pod.

---
 api/v1alpha/api.pb.go | 213 ++++++++++++++++++++----------------------
 api/v1alpha/api.proto |  11 ++-
 2 files changed, 111 insertions(+), 113 deletions(-)

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index 048e000483..d801049bec 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -340,10 +340,16 @@ type Pod struct {
 	Annotations []*KeyValue `protobuf:"bytes,7,rep,name=annotations" json:"annotations,omitempty"`
 	// Cgroup of the pod, empty if the pod is not running.
 	Cgroup string `protobuf:"bytes,8,opt,name=cgroup" json:"cgroup,omitempty"`
-	// Timestamp when the pod is created, nanoseconds since epoch.
+	// Timestamp of when the pod is created, nanoseconds since epoch.
+	// Zero if the pod is not created.
 	CreatedAt int64 `protobuf:"varint,9,opt,name=created_at" json:"created_at,omitempty"`
-	// Timestamp when the pod is started, nanoseconds since epoch.
+	// Timestamp of when the pod is started, nanoseconds since epoch.
+	// Zero if the pod is not started.
 	StartedAt int64 `protobuf:"varint,10,opt,name=started_at" json:"started_at,omitempty"`
+	// Timestamp of when the pod is moved to exited-garbage/garbage,
+	// in nanoseconds since epoch.
+	// Zero if the pod is not moved to exited-garbage/garbage yet.
+	GcMarkedAt int64 `protobuf:"varint,11,opt,name=gc_marked_at" json:"gc_marked_at,omitempty"`
 }
 
 func (m *Pod) Reset()                    { *m = Pod{} }
@@ -1132,113 +1138,98 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1717 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x58, 0x4b, 0x6f, 0xdb, 0xc6,
-	0x16, 0x0e, 0xf5, 0xd6, 0x91, 0x2c, 0xcb, 0x63, 0x27, 0x51, 0x9c, 0xc7, 0xf5, 0x65, 0x6e, 0x12,
-	0x5f, 0xe3, 0xc2, 0xb8, 0x71, 0xd2, 0x76, 0x13, 0x04, 0x95, 0x65, 0xda, 0x15, 0x62, 0x4b, 0x02,
-	0xa3, 0xb8, 0x0d, 0xba, 0x20, 0x68, 0x89, 0x72, 0x88, 0x50, 0x22, 0x4b, 0x52, 0x4e, 0xdc, 0x65,
-	0xd7, 0x45, 0xff, 0x41, 0x77, 0x5d, 0x77, 0x5b, 0xa0, 0xfb, 0xa2, 0xbf, 0xa4, 0x7f, 0xa1, 0xdd,
-	0xf6, 0xcc, 0x83, 0xe4, 0x90, 0x96, 0x0d, 0xa3, 0xbb, 0x99, 0xf3, 0x9d, 0xf9, 0xe6, 0x3c, 0xe6,
-	0x9c, 0x43, 0x09, 0xaa, 0xa6, 0x67, 0x6f, 0x7b, 0xbe, 0x1b, 0xba, 0xa4, 0x7c, 0xf6, 0xd4, 0x74,
-	0xbc, 0x77, 0xa6, 0xda, 0x87, 0x5a, 0x77, 0x6a, 0x9e, 0x5a, 0xfb, 0xae, 0x3f, 0x35, 0x43, 0xf2,
-	0x18, 0x0a, 0xe1, 0xb9, 0x67, 0xb5, 0x94, 0x0d, 0x65, 0xb3, 0xb1, 0x43, 0xb6, 0x85, 0xda, 0x36,
-	0xd3, 0x19, 0x22, 0xa2, 0x33, 0x9c, 0xb4, 0xa0, 0x7c, 0x66, 0xf9, 0x81, 0xed, 0xce, 0x5a, 0x39,
-	0x54, 0xad, 0xea, 0xd1, 0x56, 0xfd, 0x3e, 0x07, 0x45, 0xa6, 0x4d, 0x3e, 0x81, 0xda, 0x89, 0x19,
-	0x58, 0xc6, 0x84, 0x51, 0x33, 0xca, 0xda, 0xce, 0x5a, 0x9a, 0x92, 0x5f, 0xab, 0x03, 0x55, 0x14,
-	0x26, 0x34, 0x20, 0x67, 0x8f, 0x05, 0x2b, 0xae, 0x08, 0x81, 0xc2, 0xcc, 0x9c, 0x5a, 0xad, 0x3c,
-	0x93, 0xb0, 0xb5, 0x7c, 0x7d, 0x21, 0x75, 0x3d, 0xf9, 0x2f, 0x34, 0xed, 0xa9, 0xe7, 0xfa, 0xa1,
-	0x11, 0xda, 0x53, 0x2b, 0x08, 0xcd, 0xa9, 0xd7, 0x2a, 0xa2, 0x4a, 0x5e, 0x5f, 0xe6, 0xf2, 0x61,
-	0x24, 0x26, 0xeb, 0x50, 0x99, 0x9a, 0x33, 0x7b, 0x82, 0xdb, 0x56, 0x09, 0x55, 0xea, 0x7a, 0xbc,
-	0xa7, 0x97, 0x06, 0xf6, 0xb7, 0x56, 0xab, 0xcc, 0x8e, 0xb2, 0x35, 0x79, 0x06, 0x35, 0x73, 0x36,
-	0x73, 0x43, 0x33, 0xc4, 0x8b, 0x82, 0x56, 0x65, 0x23, 0x8f, 0xfe, 0xac, 0xc4, 0xfe, 0xbc, 0xb2,
-	0xce, 0x8f, 0x4d, 0x67, 0x6e, 0xe9, 0xb2, 0x96, 0xaa, 0x41, 0xb9, 0x67, 0x85, 0x1f, 0x5c, 0xff,
-	0x7d, 0xec, 0x88, 0x22, 0x39, 0x82, 0x32, 0xdb, 0x3b, 0x7b, 0x2e, 0xdc, 0x65, 0x6b, 0x21, 0xfb,
-	0x34, 0x72, 0x98, 0xae, 0xd5, 0x5f, 0x15, 0xc8, 0xb7, 0x3d, 0x6f, 0x21, 0xc7, 0x7f, 0xa0, 0x68,
-	0xd3, 0x58, 0x32, 0x92, 0xda, 0x4e, 0x23, 0x1d, 0x61, 0x9d, 0x83, 0xe4, 0x09, 0x14, 0xd1, 0xed,
-	0x90, 0xc7, 0xb1, 0x21, 0xd9, 0x8d, 0xb4, 0xaf, 0x29, 0xa0, 0x73, 0x9c, 0xdc, 0x85, 0xaa, 0xf5,
-	0xd1, 0x0e, 0x8d, 0x91, 0x3b, 0xb6, 0x58, 0x74, 0x57, 0xf4, 0x0a, 0x15, 0x74, 0x70, 0x9f, 0x8d,
-	0x41, 0xf1, 0x5a, 0x31, 0xf8, 0x3d, 0x07, 0xf9, 0x81, 0x3b, 0x16, 0x99, 0x55, 0xe2, 0xcc, 0x36,
-	0x21, 0xef, 0x89, 0x54, 0xaf, 0xe8, 0x74, 0x79, 0xb9, 0x91, 0x78, 0x3c, 0x65, 0xe4, 0x06, 0x14,
-	0x4c, 0xcf, 0x0b, 0xd0, 0x3e, 0x6a, 0x40, 0x5d, 0x76, 0x46, 0x67, 0x08, 0xf9, 0x1f, 0x54, 0x66,
-	0x3c, 0xf0, 0x91, 0x99, 0xcd, 0x58, 0x4b, 0x64, 0x44, 0x8f, 0x35, 0xae, 0x7c, 0x0b, 0x19, 0x9f,
-	0xcb, 0xd7, 0xf1, 0x99, 0xdc, 0x82, 0xd2, 0xe8, 0xd4, 0x77, 0xe7, 0x1e, 0xbe, 0x13, 0xea, 0xaf,
-	0xd8, 0x91, 0xfb, 0x00, 0x23, 0xdf, 0x42, 0x17, 0xc6, 0x06, 0xd6, 0x44, 0x95, 0x3d, 0xaf, 0xaa,
-	0x90, 0xb4, 0x43, 0x0a, 0xa3, 0x83, 0xbe, 0x80, 0x81, 0xc3, 0x42, 0xd2, 0x0e, 0xd5, 0x1d, 0xa8,
-	0x44, 0xd7, 0xd1, 0xe8, 0xe1, 0x5a, 0x84, 0x33, 0xff, 0xde, 0x3a, 0x27, 0x6b, 0x50, 0x3c, 0xa3,
-	0x90, 0x78, 0x4d, 0x7c, 0xa3, 0xfe, 0xa9, 0x40, 0x15, 0xc3, 0xb7, 0x6f, 0x3b, 0xa1, 0xe5, 0xd3,
-	0x53, 0xf6, 0x38, 0xc0, 0x53, 0x79, 0x7a, 0x0a, 0x97, 0x58, 0x31, 0x25, 0x16, 0xd3, 0x00, 0x8f,
-	0xe5, 0x17, 0x07, 0x5d, 0x28, 0xd0, 0xa7, 0x81, 0xb1, 0x35, 0xe8, 0xab, 0x0b, 0x30, 0x45, 0x94,
-	0xa2, 0x82, 0x82, 0x1e, 0xdd, 0x53, 0x90, 0xbd, 0x34, 0x83, 0xf2, 0x17, 0x38, 0xc8, 0x04, 0x5d,
-	0xbc, 0xe4, 0x21, 0x2c, 0x89, 0x58, 0x8b, 0xd3, 0x45, 0xa6, 0x50, 0x17, 0x42, 0xce, 0x90, 0x09,
-	0x74, 0xe9, 0x5a, 0x81, 0xc6, 0x56, 0xc0, 0x43, 0xcb, 0x33, 0x83, 0xad, 0x40, 0x6c, 0xd5, 0xdf,
-	0x72, 0x51, 0x6f, 0xbb, 0xcc, 0x75, 0xcc, 0xba, 0xe7, 0x5b, 0x13, 0xfb, 0xa3, 0x70, 0x1e, 0x2d,
-	0x8e, 0xf6, 0x34, 0x13, 0xac, 0x7b, 0xc9, 0xce, 0x56, 0xa9, 0x84, 0xdb, 0x8a, 0x47, 0x31, 0xe4,
-	0x68, 0x7b, 0xe2, 0x6c, 0xb4, 0xa7, 0x11, 0x75, 0xcc, 0x13, 0xcb, 0xb9, 0xa2, 0x3e, 0x84, 0x02,
-	0x79, 0x04, 0x0d, 0xde, 0x96, 0x68, 0xc2, 0x27, 0x68, 0x25, 0x7b, 0x7d, 0x79, 0x7d, 0x29, 0x92,
-	0xb6, 0xa9, 0x10, 0xeb, 0x62, 0x39, 0x56, 0x3b, 0xb1, 0xb0, 0xa1, 0x46, 0x9d, 0x29, 0x3e, 0xbd,
-	0xcb, 0xa4, 0xff, 0xa8, 0x47, 0x51, 0x57, 0x27, 0x73, 0xc7, 0x11, 0xae, 0x56, 0xb9, 0xab, 0x54,
-	0xc2, 0x5c, 0x55, 0xff, 0x52, 0xa0, 0x76, 0xe0, 0xb8, 0x27, 0xa6, 0xb3, 0xef, 0x98, 0xa7, 0x01,
-	0x8d, 0xe3, 0xd8, 0xf6, 0xa3, 0x87, 0x87, 0x4b, 0xb2, 0x05, 0x2b, 0xc1, 0x79, 0x10, 0x5a, 0x53,
-	0x6c, 0x1a, 0xb3, 0x89, 0x7d, 0x6a, 0x50, 0x9c, 0x3f, 0xc2, 0x65, 0x0e, 0x74, 0x98, 0x7c, 0x0f,
-	0x75, 0x37, 0xa1, 0xe9, 0xb8, 0x23, 0xd3, 0x91, 0x55, 0x79, 0xa7, 0x6b, 0x30, 0x79, 0xa2, 0xf9,
-	0x18, 0x96, 0xe7, 0x81, 0xe5, 0xcb, 0x8a, 0xbc, 0xd9, 0x2f, 0x51, 0x71, 0xa2, 0x47, 0x63, 0x38,
-	0x0b, 0xac, 0xd1, 0xdc, 0xc7, 0x59, 0x43, 0x2d, 0x64, 0x0d, 0x1f, 0xd5, 0x22, 0x29, 0x37, 0xfb,
-	0x29, 0xdc, 0x0c, 0xfd, 0x79, 0x10, 0x1a, 0x98, 0xa7, 0xc0, 0x98, 0xf8, 0xee, 0xd4, 0x78, 0x17,
-	0x86, 0x5e, 0xc0, 0x22, 0x5e, 0xd1, 0x09, 0x03, 0x31, 0x40, 0xc1, 0x3e, 0x42, 0x5f, 0x50, 0x44,
-	0xfd, 0x49, 0x81, 0x42, 0x77, 0x36, 0x71, 0xc9, 0xbf, 0xa0, 0xe6, 0xbf, 0x0f, 0x8d, 0x68, 0xe6,
-	0x70, 0xd7, 0x01, 0x45, 0xc7, 0x62, 0xec, 0xfc, 0x1b, 0xea, 0x58, 0x08, 0x23, 0x23, 0x3d, 0x14,
-	0x6b, 0x54, 0x16, 0xa9, 0x20, 0x07, 0xce, 0xdf, 0x58, 0x83, 0xfb, 0x0c, 0x28, 0x8a, 0x14, 0x3e,
-	0x83, 0xfa, 0x29, 0x0b, 0xb3, 0xf0, 0xa2, 0x90, 0x19, 0x98, 0x52, 0x0e, 0xf4, 0xda, 0x69, 0xb2,
-	0x51, 0x7f, 0x50, 0xa0, 0xa8, 0x9d, 0x59, 0xb3, 0xcb, 0xc7, 0x37, 0x43, 0xa5, 0xf1, 0xbd, 0x60,
-	0xc6, 0xd2, 0x80, 0x44, 0x23, 0x87, 0xae, 0xa9, 0x8c, 0x8e, 0x50, 0x66, 0x06, 0x8e, 0x40, 0xba,
-	0xc6, 0x50, 0x17, 0xc6, 0x66, 0x68, 0x5e, 0xfe, 0xae, 0x19, 0xac, 0xfe, 0x88, 0x2f, 0x86, 0x5d,
-	0x29, 0x2a, 0x6f, 0x13, 0x8a, 0xf4, 0x5a, 0x5e, 0x7b, 0x8b, 0xed, 0xe2, 0x0a, 0x51, 0x8d, 0xe6,
-	0x92, 0x1a, 0xc5, 0xa6, 0x26, 0x97, 0x20, 0xdf, 0xb0, 0x3e, 0x69, 0xcf, 0x46, 0x96, 0x21, 0x99,
-	0x58, 0x65, 0x12, 0x3a, 0xdf, 0x29, 0x3c, 0x9f, 0x85, 0xb6, 0xc3, 0x61, 0x3e, 0xff, 0xab, 0x4c,
-	0x42, 0x61, 0xb5, 0x09, 0x8d, 0x03, 0x2b, 0xa4, 0x99, 0xd5, 0xad, 0x6f, 0xe6, 0xd8, 0xe3, 0xd5,
-	0xe7, 0xb0, 0x1c, 0x4b, 0x02, 0x0f, 0x8b, 0xc2, 0xc2, 0x94, 0x16, 0x6c, 0xdc, 0x8b, 0xef, 0x96,
-	0xa5, 0x64, 0xaa, 0x52, 0x25, 0x06, 0xa9, 0x5f, 0xc2, 0xf2, 0xa1, 0x1d, 0x84, 0xd8, 0x27, 0x03,
-	0x41, 0x84, 0x63, 0xa7, 0x3c, 0x61, 0x4e, 0x73, 0x67, 0x6b, 0x92, 0xb3, 0x71, 0x13, 0xd6, 0x23,
-	0x15, 0x3a, 0x25, 0xc6, 0x56, 0x68, 0xda, 0x0e, 0xcb, 0x45, 0x45, 0x17, 0x3b, 0x34, 0xa7, 0x99,
-	0x10, 0x0b, 0x7b, 0x70, 0xe4, 0x79, 0xee, 0x38, 0xa2, 0xad, 0xcb, 0xb4, 0x3a, 0x43, 0xd4, 0x87,
-	0xb0, 0xd2, 0x9d, 0x05, 0x9e, 0x35, 0xa2, 0x07, 0x23, 0x83, 0x32, 0x43, 0x17, 0xa9, 0x89, 0xac,
-	0x24, 0xc8, 0x1f, 0xe0, 0x28, 0x76, 0xc7, 0xc2, 0xd7, 0x34, 0x37, 0x05, 0xd4, 0xaf, 0x61, 0x85,
-	0x1a, 0xc4, 0xda, 0x69, 0xec, 0xeb, 0x76, 0xd6, 0xd7, 0xec, 0xc7, 0xdd, 0x35, 0xbd, 0x7d, 0x01,
-	0x44, 0x26, 0x17, 0x26, 0x3d, 0x86, 0x12, 0x1b, 0x1f, 0x11, 0x79, 0xf6, 0xbb, 0x46, 0xa0, 0xea,
-	0x23, 0x58, 0x15, 0x0e, 0x71, 0xf9, 0x25, 0x7e, 0xbf, 0x80, 0xb5, 0xb4, 0x9a, 0xb8, 0x26, 0xfe,
-	0x7a, 0x52, 0xae, 0xf8, 0x7a, 0x52, 0x3b, 0xb0, 0x4a, 0x4d, 0xb4, 0x66, 0xec, 0xc5, 0x4a, 0xd9,
-	0x2e, 0x71, 0xe7, 0x2e, 0x7c, 0xdd, 0x4a, 0xcf, 0x5f, 0x17, 0x3a, 0xea, 0x4b, 0x58, 0x4b, 0x93,
-	0x24, 0x9e, 0x5a, 0x4c, 0x72, 0xc1, 0x53, 0xa6, 0xa8, 0x0b, 0x54, 0xfd, 0x59, 0x61, 0xef, 0xf6,
-	0xd0, 0x3d, 0x8d, 0x0d, 0xb8, 0x09, 0x25, 0x4c, 0x8f, 0x11, 0x7b, 0x5a, 0xc4, 0x5d, 0x77, 0x4c,
-	0xee, 0x40, 0x25, 0x1a, 0xd4, 0xd1, 0xf7, 0xb9, 0x98, 0xd3, 0xb4, 0x9e, 0x1c, 0x7b, 0xc6, 0xea,
-	0x49, 0xd9, 0x2c, 0xea, 0x7c, 0x43, 0x53, 0x33, 0x71, 0x1d, 0xc7, 0xfd, 0xc0, 0x6a, 0x09, 0x53,
-	0xc3, 0x77, 0x99, 0x3a, 0x2b, 0x5e, 0x5d, 0x67, 0xa5, 0x6c, 0x9d, 0x3d, 0x61, 0x55, 0xc5, 0xed,
-	0x15, 0xbe, 0xc6, 0xd7, 0xf3, 0x31, 0xcc, 0x37, 0x5b, 0x16, 0x54, 0xe3, 0x5f, 0x18, 0x38, 0xd1,
-	0xd7, 0xba, 0x47, 0xed, 0x03, 0xcd, 0x18, 0xbe, 0x1d, 0x68, 0xc6, 0x9b, 0xde, 0x9e, 0xb6, 0xdf,
-	0xed, 0x69, 0x7b, 0xcd, 0x1b, 0x64, 0x15, 0x96, 0x25, 0xa4, 0x3d, 0x18, 0x74, 0x9a, 0x0a, 0x86,
-	0x60, 0x45, 0x12, 0xee, 0xf5, 0x3b, 0xaf, 0x34, 0xbd, 0x99, 0xc3, 0xf6, 0xd5, 0x90, 0xc4, 0xfd,
-	0x4e, 0xb7, 0x99, 0xdf, 0x1a, 0x40, 0x25, 0xfa, 0xda, 0x25, 0xb7, 0x61, 0x15, 0x09, 0x8c, 0xd7,
-	0xc3, 0xf6, 0x30, 0x7d, 0x09, 0xf2, 0x25, 0x80, 0xfe, 0xa6, 0xd7, 0xeb, 0xf6, 0x0e, 0xf0, 0x9a,
-	0x35, 0x68, 0x26, 0x62, 0xed, 0xab, 0xee, 0x10, 0x95, 0x73, 0x5b, 0x7f, 0x28, 0x50, 0x89, 0x3e,
-	0x93, 0x28, 0xe5, 0xa0, 0xbf, 0xb7, 0x80, 0x12, 0xcf, 0x26, 0x80, 0x76, 0xb4, 0xab, 0xbf, 0xed,
-	0x23, 0x63, 0x4a, 0x7d, 0xa0, 0x6b, 0x83, 0xb6, 0x4e, 0xaf, 0xca, 0x61, 0x32, 0x48, 0x16, 0x40,
-	0x9a, 0x3c, 0xb5, 0x2c, 0x91, 0x47, 0x96, 0x15, 0x30, 0x09, 0x77, 0x12, 0x71, 0x7b, 0xb7, 0xaf,
-	0xa3, 0x69, 0xd1, 0xb1, 0x66, 0x31, 0x73, 0x39, 0x37, 0xbc, 0x94, 0xbe, 0x63, 0x4f, 0x3b, 0xd4,
-	0x86, 0x94, 0xac, 0x9c, 0xbe, 0xe3, 0xa0, 0xad, 0xef, 0x62, 0x08, 0x9b, 0x95, 0xad, 0x5f, 0x72,
-	0x50, 0x8d, 0x9b, 0x35, 0xcd, 0x90, 0x76, 0xac, 0xf5, 0x86, 0x17, 0x33, 0x74, 0x17, 0x6e, 0x4b,
-	0x08, 0x65, 0x8a, 0xed, 0x57, 0x88, 0x0a, 0x0f, 0x16, 0x83, 0x91, 0xd5, 0xe8, 0xfb, 0x3a, 0xdc,
-	0xca, 0xe8, 0xa0, 0x29, 0x0c, 0xcb, 0xe3, 0xab, 0xbe, 0x99, 0xc1, 0x84, 0x3b, 0x05, 0xac, 0xe2,
-	0x8d, 0x0c, 0x24, 0x6c, 0x37, 0x3a, 0xfd, 0xc3, 0x43, 0xad, 0x43, 0xb5, 0x8a, 0x19, 0x72, 0x91,
-	0x4e, 0x9d, 0x07, 0x24, 0x4d, 0x4e, 0x31, 0x41, 0x5e, 0xa6, 0x01, 0x96, 0x20, 0xfe, 0xaa, 0xba,
-	0x47, 0x03, 0x6e, 0x72, 0x85, 0xdc, 0x83, 0xd6, 0x05, 0x58, 0xd7, 0x8e, 0xfa, 0xc7, 0x88, 0x56,
-	0x77, 0xbe, 0x2b, 0xe0, 0xe7, 0xf7, 0xfc, 0xc4, 0xb1, 0x47, 0xed, 0x41, 0x97, 0xbc, 0x84, 0xb2,
-	0x98, 0x33, 0xe4, 0x76, 0x32, 0xd8, 0x53, 0xb3, 0x68, 0xbd, 0x75, 0x11, 0xe0, 0xc5, 0xa3, 0xde,
-	0x20, 0x6d, 0xa8, 0x44, 0x83, 0x81, 0x24, 0x7a, 0x99, 0x21, 0xb4, 0x7e, 0x67, 0x01, 0x12, 0x53,
-	0x1c, 0x00, 0x24, 0x03, 0x80, 0xac, 0x4b, 0x73, 0x2d, 0x33, 0x3a, 0xd6, 0xef, 0x2e, 0xc4, 0x64,
-	0xa2, 0xa4, 0x6d, 0x4b, 0x44, 0x17, 0x06, 0x85, 0x44, 0x74, 0xb1, 0xcf, 0x23, 0xd1, 0x11, 0xd4,
-	0xe5, 0xd6, 0x4c, 0xee, 0x65, 0xef, 0x95, 0x1b, 0xfb, 0xfa, 0xfd, 0x4b, 0xd0, 0x98, 0xae, 0x0f,
-	0x75, 0xb9, 0xcd, 0x4a, 0x74, 0x0b, 0x5a, 0xb8, 0x44, 0xb7, 0xa8, 0x37, 0xab, 0x37, 0xfe, 0xaf,
-	0x90, 0xcf, 0x59, 0xd2, 0x68, 0x1b, 0x4b, 0x27, 0x4d, 0x6a, 0xc4, 0xe9, 0xa4, 0xc9, 0x1d, 0x8f,
-	0x32, 0x9c, 0x94, 0xd8, 0xbf, 0x2e, 0xcf, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xb2, 0xc6, 0x99,
-	0x3e, 0x82, 0x11, 0x00, 0x00,
+	// 1481 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xcd, 0x72, 0xdb, 0x46,
+	0x12, 0x36, 0x7f, 0xc0, 0x9f, 0x26, 0x4d, 0x91, 0x23, 0xd9, 0xa2, 0xe8, 0x3f, 0x19, 0xbb, 0xeb,
+	0xf2, 0xea, 0xa0, 0xdd, 0xc8, 0x8e, 0x2f, 0xa9, 0x4a, 0x99, 0x96, 0x20, 0x15, 0x63, 0x89, 0x64,
+	0xd1, 0xb4, 0x2b, 0x3e, 0xa1, 0x20, 0x72, 0x28, 0xa3, 0x04, 0x02, 0x08, 0x00, 0xca, 0x56, 0x8e,
+	0x39, 0xe5, 0x96, 0x47, 0xc8, 0x33, 0xe4, 0x94, 0x63, 0xde, 0x25, 0x55, 0x79, 0x8f, 0xf4, 0x0c,
+	0x06, 0xc0, 0x00, 0x04, 0x0f, 0xb9, 0x89, 0xdd, 0x3d, 0x5f, 0x7f, 0xdd, 0xd3, 0xfd, 0x0d, 0x04,
+	0x75, 0xc3, 0x35, 0x0f, 0x5d, 0xcf, 0x09, 0x1c, 0x52, 0xbd, 0xf9, 0xca, 0xb0, 0xdc, 0x4f, 0x86,
+	0xfa, 0x1a, 0x1a, 0x83, 0xa5, 0x71, 0x45, 0x4f, 0x1d, 0x6f, 0x69, 0x04, 0x64, 0x1f, 0xca, 0xc1,
+	0xad, 0x4b, 0xbb, 0x85, 0xfd, 0xc2, 0xf3, 0xd6, 0x11, 0x39, 0x14, 0x61, 0x87, 0x3c, 0x66, 0x8a,
+	0x1e, 0xb2, 0x05, 0xd5, 0x1b, 0xea, 0xf9, 0xa6, 0x63, 0x77, 0x8b, 0x18, 0x54, 0x57, 0xff, 0x28,
+	0x80, 0xc2, 0xdd, 0xe4, 0xbf, 0xd0, 0xb8, 0x34, 0x7c, 0xaa, 0x2f, 0x38, 0x16, 0xc7, 0x68, 0x1c,
+	0xed, 0xa4, 0x31, 0x44, 0x1e, 0x80, 0xa2, 0x39, 0x0f, 0x01, 0x48, 0x13, 0xca, 0xb6, 0xb1, 0xa4,
+	0xdd, 0x12, 0xff, 0x25, 0xe1, 0x97, 0xb9, 0xa1, 0x0b, 0x6d, 0x73, 0xe9, 0x3a, 0x5e, 0xa0, 0x07,
+	0xe6, 0x92, 0xfa, 0x81, 0xb1, 0x74, 0xbb, 0x0a, 0x7a, 0x4a, 0xa4, 0x0d, 0xb5, 0xa5, 0x61, 0x9b,
+	0x0b, 0x34, 0x76, 0x2b, 0x68, 0x69, 0x32, 0x28, 0xdf, 0xfc, 0x91, 0x76, 0xab, 0xdc, 0xff, 0x0c,
+	0x1a, 0x86, 0x6d, 0x3b, 0x81, 0x11, 0x20, 0x9a, 0xdf, 0xad, 0xed, 0x97, 0x90, 0x4f, 0x27, 0xe6,
+	0xf3, 0x96, 0xde, 0x7e, 0x30, 0xac, 0x15, 0x55, 0x5f, 0x40, 0x75, 0x48, 0x83, 0xcf, 0x8e, 0x77,
+	0x1d, 0x73, 0x29, 0x44, 0xcc, 0x4c, 0xf7, 0xe6, 0x65, 0xc2, 0x13, 0x7f, 0xbd, 0x0a, 0x79, 0xaa,
+	0xbf, 0x14, 0xa0, 0xd4, 0x77, 0xdd, 0xcc, 0x89, 0x47, 0xa0, 0x98, 0xac, 0x4c, 0x7e, 0xa4, 0x71,
+	0xd4, 0x4a, 0x17, 0x8f, 0xed, 0x55, 0xb0, 0x80, 0x20, 0xac, 0xb5, 0x25, 0x71, 0x41, 0xa4, 0x77,
+	0xcc, 0x41, 0x3a, 0x50, 0xa7, 0x5f, 0xcc, 0x40, 0x9f, 0x39, 0x73, 0xca, 0x1b, 0xd0, 0xc9, 0x96,
+	0xa1, 0x6c, 0x2a, 0xe3, 0xe7, 0x22, 0x94, 0xc6, 0xce, 0x5c, 0xf4, 0x36, 0xe4, 0xd3, 0x80, 0x92,
+	0x2b, 0x1a, 0xdd, 0xd9, 0x9c, 0x1d, 0x4f, 0x85, 0xd9, 0x7b, 0x50, 0x36, 0x5c, 0xd7, 0xc7, 0xc4,
+	0x2c, 0x47, 0x53, 0xa6, 0x47, 0x54, 0xa8, 0xd9, 0x61, 0x97, 0x22, 0x0e, 0xed, 0xd8, 0x1f, 0xb5,
+	0x6f, 0xfd, 0x46, 0x32, 0xe4, 0xab, 0x1b, 0xc8, 0x93, 0x16, 0x54, 0x66, 0x57, 0x9e, 0xb3, 0x72,
+	0xf1, 0x9a, 0x18, 0x71, 0xac, 0x62, 0xe6, 0x51, 0xe4, 0x34, 0xd7, 0x71, 0x94, 0xea, 0xfc, 0x3e,
+	0xd1, 0x86, 0xfc, 0x3d, 0x61, 0x03, 0x6e, 0xdb, 0x81, 0xe6, 0xd5, 0x4c, 0x5f, 0x1a, 0xde, 0x75,
+	0x68, 0x6d, 0x30, 0xab, 0xfa, 0x0c, 0x6a, 0x31, 0x32, 0xb6, 0x00, 0xff, 0x16, 0xfd, 0xb8, 0x0b,
+	0xca, 0x0d, 0xb3, 0x8a, 0xd9, 0xfd, 0xad, 0x00, 0x75, 0x2c, 0xfe, 0xd4, 0xb4, 0x02, 0xea, 0xb1,
+	0x48, 0x73, 0xee, 0x63, 0x64, 0x09, 0x23, 0x9f, 0x42, 0x85, 0x37, 0xcb, 0xc7, 0xd0, 0x52, 0x7e,
+	0xb7, 0x3a, 0x6c, 0xa3, 0x5c, 0x9d, 0x5d, 0xbf, 0x8f, 0x3d, 0x65, 0xa7, 0xd0, 0xc4, 0xef, 0x5f,
+	0x67, 0x40, 0x65, 0x6e, 0xba, 0x07, 0x77, 0x45, 0xdf, 0x44, 0xa4, 0xc2, 0xcd, 0x99, 0xc6, 0x54,
+	0x36, 0x35, 0x06, 0xf7, 0x21, 0x6c, 0x4c, 0xd8, 0xbc, 0xba, 0xfa, 0x67, 0x21, 0x5a, 0xd9, 0x1c,
+	0xd6, 0x78, 0x01, 0xae, 0x47, 0x17, 0xe6, 0x17, 0xc1, 0x9b, 0x37, 0x92, 0x2f, 0xa5, 0xcc, 0x12,
+	0xa3, 0xae, 0xe9, 0x2d, 0x52, 0x8a, 0x49, 0x62, 0xb5, 0x96, 0x71, 0x49, 0xad, 0xcd, 0xe3, 0x45,
+	0xee, 0x43, 0x2b, 0xdc, 0x43, 0xd6, 0xe8, 0x05, 0x66, 0xe6, 0x37, 0x5c, 0x22, 0xbb, 0xb0, 0x15,
+	0xdb, 0x2f, 0x29, 0xee, 0xfe, 0x3f, 0x5c, 0x3f, 0xc6, 0x70, 0xb1, 0xb2, 0x2c, 0xc1, 0xb0, 0xce,
+	0x8b, 0xfc, 0x15, 0x8b, 0x3c, 0xb3, 0x9c, 0x4b, 0xc3, 0x3a, 0xb5, 0x8c, 0x2b, 0x9f, 0x15, 0x39,
+	0x37, 0x3d, 0x71, 0x89, 0x7b, 0xd0, 0xf1, 0x6f, 0xfd, 0x80, 0x2e, 0x71, 0x4b, 0xec, 0x85, 0x79,
+	0xa5, 0x33, 0x57, 0x31, 0x12, 0x0b, 0xcb, 0x99, 0x19, 0x96, 0xec, 0x09, 0x75, 0x05, 0x69, 0xae,
+	0x7c, 0xea, 0xc9, 0x8e, 0x50, 0x5f, 0x58, 0x5d, 0xb6, 0x4f, 0x67, 0x2b, 0x0f, 0x95, 0x8b, 0x25,
+	0xe3, 0xea, 0xc2, 0x56, 0xf9, 0x5e, 0xe0, 0xad, 0xfc, 0x40, 0xc7, 0x56, 0xf9, 0xfa, 0xc2, 0x73,
+	0x96, 0xfa, 0xa7, 0x20, 0x70, 0x7d, 0x5e, 0x76, 0x4d, 0xf5, 0xa0, 0x3c, 0xb0, 0x17, 0x0e, 0xd9,
+	0x86, 0x86, 0x77, 0x1d, 0xe8, 0x91, 0x66, 0x85, 0x0c, 0x71, 0x2a, 0x71, 0x32, 0x66, 0x7a, 0x4a,
+	0x29, 0x59, 0x28, 0x2a, 0x70, 0x6c, 0x0c, 0x79, 0x1d, 0xe0, 0x00, 0xf3, 0x42, 0x45, 0xf2, 0x72,
+	0x46, 0x35, 0xa5, 0x2e, 0x60, 0x4e, 0x45, 0xbb, 0xa1, 0xf6, 0x66, 0x99, 0xe6, 0x5e, 0x2e, 0xd3,
+	0x19, 0x81, 0x65, 0xf4, 0x45, 0x42, 0xfc, 0xc5, 0x84, 0x94, 0x27, 0x2a, 0x91, 0x27, 0x50, 0x9e,
+	0x1b, 0x81, 0xb1, 0x59, 0x55, 0x02, 0x68, 0x70, 0x54, 0x31, 0x6d, 0x4f, 0x41, 0x61, 0x99, 0xc3,
+	0x79, 0xcb, 0x4f, 0x2d, 0x06, 0x32, 0x1c, 0x3f, 0x5c, 0x38, 0x79, 0xf2, 0xd8, 0x0a, 0x9b, 0xf6,
+	0x8c, 0xea, 0x12, 0x05, 0xb4, 0xad, 0xec, 0xc0, 0xb4, 0x42, 0x1b, 0x97, 0x76, 0xb5, 0x0d, 0xad,
+	0x33, 0x1a, 0xb0, 0x06, 0x4f, 0xe8, 0x0f, 0x2b, 0x94, 0x13, 0xf5, 0x10, 0xb6, 0x62, 0x8b, 0xef,
+	0xe2, 0x40, 0x51, 0xf2, 0x00, 0x05, 0x19, 0x7f, 0x8b, 0x87, 0xe6, 0x6e, 0xa2, 0xb5, 0x68, 0x54,
+	0x4f, 0x61, 0xeb, 0xdc, 0xf4, 0x03, 0x5c, 0x56, 0x5f, 0x40, 0x90, 0x7f, 0x41, 0x75, 0xc1, 0xab,
+	0x08, 0xd9, 0x37, 0x24, 0xf6, 0x89, 0x08, 0xa0, 0x10, 0xcd, 0x69, 0x60, 0x98, 0x16, 0x6f, 0x5e,
+	0x0d, 0xf3, 0xb6, 0x13, 0x1c, 0x91, 0x18, 0x65, 0xd2, 0x75, 0xe6, 0x11, 0x4a, 0x53, 0x46, 0x51,
+	0x9f, 0x40, 0x67, 0x60, 0xfb, 0x2e, 0x9d, 0xb1, 0x23, 0x51, 0x66, 0x49, 0x92, 0xd5, 0xff, 0x01,
+	0x91, 0x03, 0x04, 0xe4, 0x1e, 0x0a, 0xb5, 0x33, 0x17, 0xa5, 0xa4, 0x11, 0xbf, 0x83, 0x0e, 0x63,
+	0xc0, 0x77, 0x3e, 0xae, 0xe5, 0x3f, 0xd9, 0x5a, 0xb2, 0xef, 0x6c, 0x7e, 0x35, 0x2f, 0x81, 0xc8,
+	0x58, 0x22, 0xf9, 0x63, 0xa8, 0x70, 0xd5, 0x8a, 0xb0, 0x32, 0xcf, 0x96, 0xfa, 0x14, 0xb6, 0x05,
+	0x65, 0xfe, 0x3b, 0xaf, 0xaa, 0xaf, 0x61, 0x27, 0x1d, 0x22, 0xa0, 0xe3, 0x07, 0xb1, 0x90, 0xf7,
+	0x20, 0xaa, 0xdf, 0xc0, 0x36, 0xe3, 0x43, 0x6d, 0x3e, 0x3e, 0x71, 0x75, 0xff, 0x86, 0x4a, 0x58,
+	0xdd, 0xda, 0x47, 0x84, 0x34, 0x8b, 0xea, 0x2b, 0xd8, 0x49, 0x1f, 0x4e, 0xca, 0xa1, 0xdc, 0xb2,
+	0x56, 0x0e, 0x0f, 0x54, 0x6f, 0xf9, 0x70, 0x9d, 0x3b, 0x57, 0x71, 0x3e, 0x6c, 0x13, 0x76, 0x5f,
+	0x8f, 0x9f, 0x4d, 0x14, 0xc8, 0x48, 0xd9, 0xc5, 0x0e, 0xe1, 0x1c, 0x5b, 0xa6, 0xcd, 0xe7, 0xb8,
+	0xf0, 0x5c, 0x61, 0x07, 0x16, 0x8e, 0x65, 0x39, 0x9f, 0xf9, 0x0c, 0xd7, 0x32, 0x73, 0xad, 0xe4,
+	0xcc, 0x35, 0x17, 0x4b, 0x75, 0x9f, 0x4f, 0x71, 0x98, 0x5a, 0xb0, 0x8d, 0x91, 0xb9, 0x82, 0x1f,
+	0x50, 0xa8, 0x27, 0x1f, 0x5b, 0x5d, 0xec, 0xea, 0x45, 0xff, 0x4c, 0xd3, 0xa7, 0x1f, 0xc7, 0x9a,
+	0xfe, 0x7e, 0x78, 0xa2, 0x9d, 0x0e, 0x86, 0xda, 0x49, 0xfb, 0x0e, 0x6a, 0xc9, 0x96, 0xe4, 0xe9,
+	0x8f, 0xc7, 0xc7, 0xed, 0x02, 0x3e, 0x35, 0x1d, 0xc9, 0x78, 0x32, 0x3a, 0x7e, 0xab, 0x4d, 0xda,
+	0x45, 0x24, 0xd2, 0x92, 0xcc, 0xa3, 0xe3, 0x41, 0xbb, 0x74, 0x30, 0x86, 0x5a, 0xfc, 0xcd, 0xb1,
+	0x0b, 0xdb, 0x08, 0xa0, 0xbf, 0x9b, 0xf6, 0xa7, 0xe9, 0x24, 0x88, 0x97, 0x38, 0x26, 0xef, 0x87,
+	0xc3, 0xc1, 0xf0, 0x0c, 0xd3, 0xec, 0x40, 0x3b, 0x31, 0x6b, 0xdf, 0x0f, 0xa6, 0x18, 0x5c, 0x3c,
+	0xf8, 0xab, 0x00, 0xb5, 0xf8, 0x69, 0x44, 0xc8, 0xf1, 0xe8, 0x24, 0x07, 0x12, 0xcf, 0x26, 0x0e,
+	0xed, 0xe2, 0xcd, 0xe4, 0xe3, 0x08, 0x11, 0x53, 0xe1, 0xe3, 0x89, 0x36, 0xee, 0x4f, 0x58, 0xaa,
+	0x22, 0x8a, 0x33, 0xc9, 0x3a, 0x10, 0xa6, 0xc4, 0x98, 0x25, 0xf6, 0x88, 0x59, 0x19, 0xa7, 0x6d,
+	0x2f, 0x31, 0xf7, 0xdf, 0x8c, 0x26, 0x48, 0x2d, 0x3a, 0xd6, 0x56, 0x32, 0xc9, 0x43, 0xe2, 0x95,
+	0x74, 0x8e, 0x13, 0xed, 0x5c, 0x9b, 0x32, 0xb0, 0x6a, 0x3a, 0xc7, 0x59, 0x7f, 0xf2, 0x06, 0x5b,
+	0xd8, 0xae, 0x1d, 0xfc, 0x5e, 0x84, 0x7a, 0x22, 0x76, 0x78, 0x43, 0xda, 0x07, 0x6d, 0x38, 0x5d,
+	0xbf, 0xa1, 0x07, 0xb0, 0x2b, 0x79, 0x18, 0x52, 0xcc, 0xbf, 0x80, 0x1f, 0x53, 0x8f, 0xf3, 0x9d,
+	0x11, 0x6b, 0xac, 0xbd, 0x07, 0xf7, 0x33, 0x31, 0x48, 0x85, 0xfb, 0x4a, 0x28, 0x17, 0xf7, 0x32,
+	0x3e, 0x51, 0x4e, 0x19, 0x77, 0x67, 0x3f, 0xe3, 0x12, 0xdc, 0xf5, 0xe3, 0xd1, 0xf9, 0xb9, 0x76,
+	0xcc, 0xa2, 0x94, 0x0c, 0xb8, 0xb8, 0xce, 0x49, 0xd8, 0x90, 0x34, 0x38, 0xf3, 0x09, 0xf0, 0x2a,
+	0x6b, 0xb0, 0xe4, 0x0a, 0xa7, 0x6a, 0x70, 0x31, 0x0e, 0x29, 0xd7, 0xc8, 0x43, 0xe8, 0xae, 0xb9,
+	0x27, 0xda, 0xc5, 0xe8, 0x03, 0x7a, 0xeb, 0x47, 0x3f, 0x95, 0xf1, 0x6b, 0x6b, 0x75, 0x69, 0x99,
+	0xb3, 0xfe, 0x78, 0x40, 0xbe, 0x85, 0xaa, 0x10, 0x74, 0xb2, 0x9b, 0xbc, 0x76, 0x29, 0xd1, 0xef,
+	0x75, 0xd7, 0x1d, 0xe1, 0xd6, 0xa8, 0x77, 0x48, 0x1f, 0x6a, 0x91, 0x30, 0x93, 0x24, 0x2e, 0xa3,
+	0xf9, 0xbd, 0xbd, 0x1c, 0x4f, 0x0c, 0x71, 0x06, 0x90, 0x48, 0x31, 0xe9, 0x49, 0x0f, 0x48, 0x46,
+	0xc0, 0x7b, 0x0f, 0x72, 0x7d, 0x32, 0x50, 0x22, 0xab, 0x12, 0xd0, 0x9a, 0x6e, 0x4b, 0x40, 0xeb,
+	0x3a, 0x8c, 0x40, 0x17, 0xd0, 0x94, 0x65, 0x94, 0x3c, 0xcc, 0xe6, 0x95, 0x05, 0xb8, 0xf7, 0x68,
+	0x83, 0x37, 0x86, 0x1b, 0x41, 0x53, 0x56, 0x48, 0x09, 0x2e, 0x47, 0x75, 0x25, 0xb8, 0x3c, 0x59,
+	0x55, 0xef, 0xfc, 0xbf, 0x40, 0x5e, 0xf3, 0x4b, 0x63, 0xfa, 0x95, 0xbe, 0x34, 0x49, 0x4c, 0xd3,
+	0x97, 0x26, 0x4b, 0x1d, 0x43, 0xb8, 0xac, 0xf0, 0x7f, 0x40, 0x5f, 0xfc, 0x1d, 0x00, 0x00, 0xff,
+	0xff, 0x4d, 0xcd, 0xc6, 0xd5, 0x8d, 0x0e, 0x00, 0x00,
 }
diff --git a/api/v1alpha/api.proto b/api/v1alpha/api.proto
index fc7174bf6c..51aa8e6865 100644
--- a/api/v1alpha/api.proto
+++ b/api/v1alpha/api.proto
@@ -173,11 +173,18 @@ message Pod {
         // Cgroup of the pod, empty if the pod is not running.
         string cgroup = 8;
 
-        // Timestamp when the pod is created, nanoseconds since epoch.
+        // Timestamp of when the pod is created, nanoseconds since epoch.
+        // Zero if the pod is not created.
         int64 created_at = 9;
 
-        // Timestamp when the pod is started, nanoseconds since epoch.
+        // Timestamp of when the pod is started, nanoseconds since epoch.
+        // Zero if the pod is not started.
         int64 started_at = 10;
+
+        // Timestamp of when the pod is moved to exited-garbage/garbage,
+        // in nanoseconds since epoch.
+        // Zero if the pod is not moved to exited-garbage/garbage yet.
+        int64 gc_marked_at = 11;
 }
 
 message KeyValue {

From 7d322e61ef9cedab9469a16b1ba623dbc883ab81 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Tue, 12 Apr 2016 17:12:53 -0700
Subject: [PATCH 0112/1304] api: Return GcMarkedTime in api service.

---
 rkt/api_service.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 72b66285bd..532d3254f1 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -333,7 +333,14 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest, error) {
 		return nil, nil, err
 	}
 
-	pod.CreatedAt, pod.StartedAt = createdAt.UnixNano(), startedAt.UnixNano()
+	gcMarkedAt, err := p.getGCMarkedTime()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	pod.CreatedAt = createdAt.UnixNano()
+	pod.StartedAt = startedAt.UnixNano()
+	pod.GcMarkedAt = gcMarkedAt.UnixNano()
 
 	manifest, data, err := getPodManifest(p)
 	if err != nil {

From ab4a7f99edf05c1726289f7821a69b4c6fa60c4e Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Wed, 13 Apr 2016 13:25:29 +0200
Subject: [PATCH 0113/1304] kvm: fix rkt status

---
 rkt/pods.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/rkt/pods.go b/rkt/pods.go
index 761c518996..c19c1ce56f 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -872,11 +872,14 @@ func getChildPID(ppid int) (int, error) {
 
 // getPID returns the pid of the stage1 process that started the pod.
 func (p *pod) getPID() (int, error) {
-	pid, err := p.readIntFromFile("ppid")
-	if err != nil {
+	if pid, err := p.readIntFromFile("pid"); err == nil {
+		return pid, nil
+	}
+	if pid, err := p.readIntFromFile("ppid"); err != nil {
 		return -1, err
+	} else {
+		return pid, nil
 	}
-	return pid, nil
 }
 
 // getContainerPID1 returns the pid of the process with pid 1 in the pod.

From 3bfd34dfbeb4489cec75cb2e135362c751867ad1 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Tue, 12 Apr 2016 17:59:22 -0700
Subject: [PATCH 0114/1304] tests: Add checks in api service tests to test the
 GCMarkedTime.

---
 tests/rkt_api_service_test.go | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index d7ce1ef837..a527977046 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -137,7 +137,7 @@ func checkPodNetworks(t *testing.T, rawNets map[string]*networkInfo, apiNets []*
 }
 
 // Check the pod's information by 'rkt status'.
-func checkPod(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, hasAppState, hasManifest bool) {
+func checkPod(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, hasAppState, hasManifest bool, expectedGCTime time.Time) {
 	podInfo := getPodInfo(t, ctx, p.Id)
 	if podInfo.id != p.Id {
 		t.Errorf("Expected %q, saw %q", podInfo.id, p.Id)
@@ -153,6 +153,12 @@ func checkPod(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, hasAppStat
 	if podInfo.startedAt/accuracy != p.StartedAt/accuracy {
 		t.Errorf("Expected %d, saw %d", podInfo.startedAt, p.StartedAt)
 	}
+
+	// If expectedGCTime.IsZero() == true, then p.GcMarkedAt should also be zero.
+	actualTime := time.Unix(0, p.GcMarkedAt)
+	if !compareTime(expectedGCTime, actualTime) {
+		t.Errorf("API service returned an incorrect GC marked time. Got %q, Expect: %q", actualTime, expectedGCTime)
+	}
 	checkPodState(t, podInfo.state, p.State)
 	checkPodApps(t, podInfo.apps, p.Apps, hasAppState)
 	checkPodNetworks(t, podInfo.networks, p.Networks)
@@ -186,12 +192,16 @@ func checkPod(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, hasAppStat
 	}
 }
 
+func checkPodBasicsWithGCTime(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, expectedGCTime time.Time) {
+	checkPod(t, ctx, p, false, false, expectedGCTime)
+}
+
 func checkPodBasics(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod) {
-	checkPod(t, ctx, p, false, false)
+	checkPod(t, ctx, p, false, false, time.Time{})
 }
 
 func checkPodDetails(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod) {
-	checkPod(t, ctx, p, true, true)
+	checkPod(t, ctx, p, true, true, time.Time{})
 }
 
 // Check the image's information by 'rkt image list'.
@@ -326,8 +336,12 @@ func TestAPIServiceListInspectPods(t *testing.T) {
 	defer os.Remove(manifestFile)
 
 	runCmd := fmt.Sprintf("%s run --pod-manifest=%s", ctx.Cmd(), manifestFile)
-	esp := spawnOrFail(t, runCmd)
-	waitOrFail(t, esp, 0)
+	waitOrFail(t, spawnOrFail(t, runCmd), 0)
+
+	gcCmd := fmt.Sprintf("%s gc --mark-only=true", ctx.Cmd())
+	waitOrFail(t, spawnOrFail(t, gcCmd), 0)
+
+	gcTime := time.Now()
 
 	// ListPods(detail=false).
 	resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
@@ -340,7 +354,7 @@ func TestAPIServiceListInspectPods(t *testing.T) {
 	}
 
 	for _, p := range resp.Pods {
-		checkPodBasics(t, ctx, p)
+		checkPodBasicsWithGCTime(t, ctx, p, gcTime)
 
 		// Test InspectPod().
 		inspectResp, err := c.InspectPod(context.Background(), &v1alpha.InspectPodRequest{Id: p.Id})

From 2588b713492625983d1bca73aea0b7cd9bd89ffe Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 13 Apr 2016 12:51:29 +0200
Subject: [PATCH 0115/1304] run: add user/group app flags

This adds --user and --group app flags to override the user and/or the
group for the run subcommand.

Fixes #1920
---
 CHANGELOG.md                         |   2 +
 Documentation/subcommands/prepare.md |   2 +
 Documentation/subcommands/run.md     |   8 ++
 common/apps/apps.go                  |   1 +
 rkt/cli_apps.go                      |  48 ++++++++++++
 rkt/prepare.go                       |   2 +
 rkt/run.go                           |   2 +
 stage0/run.go                        |   8 ++
 tests/rkt_run_user_group_test.go     | 109 +++++++++++++++++++++++++++
 9 files changed, 182 insertions(+)
 create mode 100644 tests/rkt_run_user_group_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b187c87f14..adf47cf482 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 #### New features and UX changes
 
+- Add `--user`/`--group` option to rkt run/prepare ([#2419](https://github.com/coreos/rkt/pull/2419)). This option allows overriding the user/group specified in the image manifest.
+
 - Ensure that the initial name and labels used for discovery match the name and labels in the Image Manifest as specified in the appc spec ([#2311](https://github.com/coreos/rkt/pull/2311)). Users wanting the latest image should use `rkt prepare/run/fetch example.com/aci` without any labels. If the discovery server supports the "latest" pattern, the user can bypass a locally cached image in the store and fetch an updated image using `rkt prepare/run/fetch --no-store example.com/aci` option.
 
 #### Note for packagers
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 9d968c973b..2e20608a11 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -52,6 +52,8 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--stage1-from-dir` |  `` | A stage1 image file inside the default stage1 images directory | Image to use as stage1 |
 | `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md) |
 | `--volume` |  `` | Volume syntax (`NAME,kind=KIND,source=PATH,readOnly=BOOL`). See [Mount Volumes into a Pod](run.md#mount-volumes-into-a-pod) | Volumes to make available in the pod |
+| `--user` | none | username or UID | user override for the preceding image (example: '--user=user') |
+| `--group` | none | group or GID | group override for the preceding image (example: '--group=group') |
 
 ## Global options
 
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index d2971c6662..97f330da3c 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -44,6 +44,14 @@ In the following example, the CPU isolator is defined to 750 milli-cores and the
 # rkt run coreos.com/etcd:v2.0.0 --cpu=750m --memory=128M
 ```
 
+## Overriding User/Group
+
+Application images must specify the username/group or the UID/GID the app is to be run as as specified in the [Image Manifest Schema](https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema). The user/group can be overridden by rkt using the `--user` and `--group` flags:
+
+```
+# rkt --insecure-options=image run docker://busybox --user=1000 --group=100 --exec id
+```
+
 ## Passing Arguments
 
 To pass additional arguments to images use the pattern of `image1 -- [image1 flags] --- image2 -- [image2 flags]`.
diff --git a/common/apps/apps.go b/common/apps/apps.go
index d3a0a3db72..5c9d687a9d 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -46,6 +46,7 @@ type App struct {
 	Mounts      []schema.Mount        // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
 	MemoryLimit *types.ResourceMemory // memory isolator override
 	CPULimit    *types.ResourceCPU    // cpu isolator override
+	User, Group string                // user, group overrides
 
 	// TODO(jonboulle): These images are partially-populated hashes, this should be clarified.
 	ImageID types.Hash // resolved image identifier
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index a9ceda381d..70f2132ae7 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -305,3 +305,51 @@ func (aml *appCPULimit) String() string {
 func (aml *appCPULimit) Type() string {
 	return "appCPULimit"
 }
+
+// appUser is for --user flags in the form of: --user=user
+type appUser apps.Apps
+
+func (au *appUser) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--user must follow an image")
+	}
+	app.User = s
+	return nil
+}
+
+func (au *appUser) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	return app.User
+}
+
+func (au *appUser) Type() string {
+	return "appUser"
+}
+
+// appGroup is for --group flags in the form of: --group=group
+type appGroup apps.Apps
+
+func (ag *appGroup) Set(s string) error {
+	app := (*apps.Apps)(ag).Last()
+	if app == nil {
+		return fmt.Errorf("--group must follow an image")
+	}
+	app.Group = s
+	return nil
+}
+
+func (ag *appGroup) String() string {
+	app := (*apps.Apps)(ag).Last()
+	if app == nil {
+		return ""
+	}
+	return app.Group
+}
+
+func (ag *appGroup) Type() string {
+	return "appGroup"
+}
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 3e882c66e0..c62696a0bd 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -69,6 +69,8 @@ func init() {
 	cmdPrepare.Flags().Var((*appExec)(&rktApps), "exec", "override the exec command for the preceding image")
 	cmdPrepare.Flags().Var((*appMount)(&rktApps), "mount", "mount point binding a volume to a path within an app")
 	cmdPrepare.Flags().Var((*appAsc)(&rktApps), "signature", "local signature file to use in validating the preceding image")
+	cmdPrepare.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
+	cmdPrepare.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
 
 	// Disable interspersed flags to stop parsing after the first non flag
 	// argument. This is need to permit to correctly handle
diff --git a/rkt/run.go b/rkt/run.go
index d93816e9c0..f7537b4b33 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -99,6 +99,8 @@ func init() {
 	cmdRun.Flags().Var((*appMount)(&rktApps), "mount", "mount point binding a volume to a path within an app")
 	cmdRun.Flags().Var((*appMemoryLimit)(&rktApps), "memory", "memory limit for the preceding image (example: '--memory=16Mi', '--memory=50M', '--memory=1G')")
 	cmdRun.Flags().Var((*appCPULimit)(&rktApps), "cpu", "cpu limit for the preceding image (example: '--cpu=500m')")
+	cmdRun.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
+	cmdRun.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
 
 	flagPorts = portList{}
 	flagDNS = flagStringList{}
diff --git a/stage0/run.go b/stage0/run.go
index f1531014ce..cbacd50fd7 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -248,6 +248,14 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 			ra.App.Isolators = append(ra.App.Isolators, isolator)
 		}
 
+		if user := app.User; user != "" {
+			ra.App.User = user
+		}
+
+		if group := app.Group; group != "" {
+			ra.App.Group = group
+		}
+
 		if cfg.InheritEnv || len(cfg.ExplicitEnv) > 0 {
 			MergeEnvs(&ra.App.Environment, cfg.InheritEnv, cfg.ExplicitEnv)
 		}
diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
new file mode 100644
index 0000000000..a233ff117f
--- /dev/null
+++ b/tests/rkt_run_user_group_test.go
@@ -0,0 +1,109 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestAppUserGroup(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	imageDummy := patchTestACI("rkt-inspect-dummy.aci", "--name=dummy")
+	defer os.Remove(imageDummy)
+
+	for _, tt := range []struct {
+		imageParams []string
+		rktParams   string
+		expected    string
+	}{
+		{
+			expected: "User: uid=0 euid=0 gid=0 egid=0",
+		},
+		{
+			rktParams: "--user=200",
+			expected:  "User: uid=200 euid=200 gid=0 egid=0",
+		},
+		{
+			rktParams: "--group=300",
+			expected:  "User: uid=0 euid=0 gid=300 egid=300",
+		},
+		{
+			rktParams: "--user=200 --group=300",
+			expected:  "User: uid=200 euid=200 gid=300 egid=300",
+		},
+		{
+			rktParams: "--user=user1 --group=300",
+			expected:  "User: uid=1000 euid=1000 gid=300 egid=300",
+		},
+		{
+			rktParams: "--user=200 --group=group1",
+			expected:  "User: uid=200 euid=200 gid=100 egid=100",
+		},
+		{
+			imageParams: []string{"--user=400", "--group=500"},
+			expected:    "User: uid=400 euid=400 gid=500 egid=500",
+		},
+		{
+			imageParams: []string{"--user=400", "--group=500"},
+			rktParams:   "--user=200",
+			expected:    "User: uid=200 euid=200 gid=500 egid=500",
+		},
+		{
+			imageParams: []string{"--user=400", "--group=500"},
+			rktParams:   "--group=300",
+			expected:    "User: uid=400 euid=400 gid=300 egid=300",
+		},
+		{
+			imageParams: []string{"--user=400", "--group=500"},
+			rktParams:   "--user=200 --group=300",
+			expected:    "User: uid=200 euid=200 gid=300 egid=300",
+		},
+		{
+			imageParams: []string{"--user=400", "--group=500"},
+			rktParams:   "--user=user1 --group=group1",
+			expected:    "User: uid=1000 euid=1000 gid=100 egid=100",
+		},
+	} {
+		func() {
+			tt.imageParams = append(tt.imageParams, "--exec=/inspect --print-user")
+			image := patchTestACI("rkt-inspect-user-group.aci", tt.imageParams...)
+			defer os.Remove(image)
+
+			// run the user/group overriden app first
+			rktCmd := fmt.Sprintf(
+				"%s --insecure-options=image run %s %s %s",
+				ctx.Cmd(),
+				image, tt.rktParams,
+				imageDummy,
+			)
+			runRktAndCheckOutput(t, rktCmd, tt.expected, false)
+
+			// run the user/group overriden app last
+			rktCmd = fmt.Sprintf(
+				"%s --insecure-options=image run %s %s %s",
+				ctx.Cmd(),
+				imageDummy,
+				image, tt.rktParams,
+			)
+			runRktAndCheckOutput(t, rktCmd, tt.expected, false)
+		}()
+	}
+}

From d66fa6141cbbe2dc036d1db1b4d8946bb07d9bf2 Mon Sep 17 00:00:00 2001
From: mstachowski <michal.stachowski@outlook.com>
Date: Wed, 16 Dec 2015 13:43:35 -0600
Subject: [PATCH 0116/1304] kvm: Add support for capabilities limitation

By default kvm flavor has got enabled every capability inside pod.
This is normal systemd behavior, when its running as a init process
inside VM. Coreos pod is started by systemd-nspawn, which apply some
initial capabilities by default.

This patch add support for restricted set of capabilities inside rkt-kvm
pod
---
 stage1/init/common/pod.go | 77 ++++++++++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 14 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 0737c9db1a..f401c1fe80 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -59,6 +59,37 @@ var (
 		"LOGNAME": "root",
 		"HOME":    "/root",
 	}
+
+	// The list of default capabilities inside systemd-nspawn pod is available
+	// here: https://www.freedesktop.org/software/systemd/man/systemd-nspawn.html
+	nspawnCapabilities, _ = types.NewLinuxCapabilitiesRetainSet([]string{
+		"CAP_CHOWN",
+		"CAP_DAC_OVERRIDE",
+		"CAP_DAC_READ_SEARCH",
+		"CAP_FOWNER",
+		"CAP_FSETID",
+		"CAP_IPC_OWNER",
+		"CAP_KILL",
+		"CAP_LEASE",
+		"CAP_LINUX_IMMUTABLE",
+		"CAP_NET_BIND_SERVICE",
+		"CAP_NET_BROADCAST",
+		"CAP_NET_RAW",
+		"CAP_SETGID",
+		"CAP_SETFCAP",
+		"CAP_SETPCAP",
+		"CAP_SETUID",
+		"CAP_SYS_ADMIN",
+		"CAP_SYS_CHROOT",
+		"CAP_SYS_NICE",
+		"CAP_SYS_PTRACE",
+		"CAP_SYS_TTY_CONFIG",
+		"CAP_SYS_RESOURCE",
+		"CAP_SYS_BOOT",
+		"CAP_AUDIT_WRITE",
+		"CAP_AUDIT_CONTROL",
+		"CAP_MKNOD",
+	}...)
 )
 
 // execEscape uses Golang's string quoting for ", \, \n, and regex for special cases
@@ -348,6 +379,13 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		opts = append(opts, unit.NewUnitOption("Service", "SyslogIdentifier", filepath.Base(app.Exec[0])))
 	}
 
+	if flavor == "kvm" {
+		capabilities := append(app.Isolators, nspawnCapabilities.AsIsolator())
+		capabilitiesStr := GetAppCapabilities(capabilities)
+
+		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
+	}
+
 	// When an app fails, we shut down the pod
 	opts = append(opts, unit.NewUnitOption("Unit", "OnFailure", "halt.target"))
 
@@ -673,20 +711,8 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 		args = append(args, strings.Join(opt, ""))
 	}
 
-	for _, i := range app.Isolators {
-		switch v := i.Value().(type) {
-		case types.LinuxCapabilitiesSet:
-			var caps []string
-			// TODO: cleanup the API on LinuxCapabilitiesSet to give strings easily.
-			for _, c := range v.Set() {
-				caps = append(caps, string(c))
-			}
-			if i.Name == types.LinuxCapabilitiesRetainSetName {
-				capList := strings.Join(caps, ",")
-				args = append(args, "--capability="+capList)
-			}
-		}
-	}
+	capList := strings.Join(GetAppCapabilities(app.Isolators), ",")
+	args = append(args, "--capability="+capList)
 
 	return args, nil
 }
@@ -772,3 +798,26 @@ func GetAppHashes(p *stage1commontypes.Pod) []types.Hash {
 func GetMachineID(p *stage1commontypes.Pod) string {
 	return "rkt-" + p.UUID.String()
 }
+
+// GetAppCapabilities is a filter which returns a string slice of valid Linux capabilities
+// It requires list of available isolators
+func GetAppCapabilities(isolators types.Isolators) []string {
+	var caps []string
+
+	for _, isolator := range isolators {
+		if capSet, ok := isolator.Value().(types.LinuxCapabilitiesSet); ok &&
+			isolator.Name == types.LinuxCapabilitiesRetainSetName {
+			caps = append(caps, parseLinuxCapabilitiesSet(capSet)...)
+		}
+	}
+	return caps
+}
+
+// parseLinuxCapabilitySet parses a LinuxCapabilitiesSet into string slice
+func parseLinuxCapabilitiesSet(capSet types.LinuxCapabilitiesSet) []string {
+	var capsStr []string
+	for _, cap := range capSet.Set() {
+		capsStr = append(capsStr, string(cap))
+	}
+	return capsStr
+}

From c26f621030dcc8362fd91c4a2a9eabafb3a5346f Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Sat, 9 Apr 2016 16:27:15 +0200
Subject: [PATCH 0117/1304] config: add config subcommand

This adds the config subcommand. Currently only stage0 configuration is
supported.

Fixes #2368
---
 Documentation/commands.md           |   1 +
 Documentation/subcommands/config.md | 125 ++++++++++++++++++++++++++++
 rkt/config.go                       |  51 ++++++++++++
 rkt/config/auth.go                  |  14 ++--
 rkt/config/config.go                |  89 +++++++++++++++++++-
 rkt/config/config_test.go           |   8 ++
 6 files changed, 278 insertions(+), 10 deletions(-)
 create mode 100644 Documentation/subcommands/config.md
 create mode 100644 rkt/config.go

diff --git a/Documentation/commands.md b/Documentation/commands.md
index d40876c2f8..4786242554 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -63,6 +63,7 @@ The API service allows clients to list and inspect pods and images running under
 ## Misc
 
 * [version](subcommands/version.md)
+* [config](subcommands/config.md)
 
 ## Global Options
 
diff --git a/Documentation/subcommands/config.md b/Documentation/subcommands/config.md
new file mode 100644
index 0000000000..fbef3d1c98
--- /dev/null
+++ b/Documentation/subcommands/config.md
@@ -0,0 +1,125 @@
+# rkt config
+
+The `config` subcommand prints the configuration of each rkt stage in JSON on the standard output.
+
+## Structure
+
+The general structure is a simple hierarchy consisting of the following top-level element:
+
+```
+{
+	"stage0": [...]
+}
+```
+
+The entry "stage0" refers to stage-specific configuration; "stage1" is currently left out intentionally because its configuration subsystem is subject to change. The generated output are valid configuration entries as specified in the configuration documentation.
+
+The "stage0" entry contains subentries of rktKind "auth", "dockerAuth", "paths", and "stage1". Note that the `config` subcommand will output separate entries per "auth" domain and separate entries per "dockerAuth" registry. While it is possible to specify an array of strings in the input configuration rkt internally merges configuration state from different directories potentially creating multiple entries.
+
+Consider the following system configuration:
+```
+$ cat /etc/rkt/auth.d/basic.json
+{
+  "rktKind": "auth",
+  "rktVersion": "v1",
+  "domains": [
+    "foo.com",
+    "bar.com",
+    "baz.com"
+  ],
+  "type": "basic",
+  "credentials": { "user": "sysUser", "password": "sysPassword" }
+}
+```
+
+And the following user configuration:
+```
+$ ~/.config/rkt/auth.d/basic.json
+{
+  "rktKind": "auth",
+  "rktVersion": "v1",
+  "domains": [
+    "foo.com"
+  ],
+  "type": "basic",
+  "credentials": { "user": "user", "password": "password" }
+}
+```
+
+The `config` subcommand would generate the following separate merged entries:
+```
+{
+  "stage0": [
+    {
+      "rktVersion": "v1",
+      "rktKind": "auth",
+      "domains": [ "bar.com" ],
+      "type": "basic",
+      "credentials": { "user": "sysUser", "password": "sysPassword" }
+    },
+    {
+      "rktVersion": "v1",
+      "rktKind": "auth",
+      "domains": [ "baz.com" ],
+      "type": "basic",
+      "credentials": { "user": "sysUser", "password": "sysPassword" }
+    },
+    {
+      "rktVersion": "v1",
+      "rktKind": "auth",
+      "domains": [ "foo.com" ],
+      "type": "basic",
+      "credentials": { "user": "user", "password": "password" }
+    }
+  ]
+}
+```
+
+In the example given above the user configuration entry for the domain "foo.com" overrides the system configuration entry leaving the entries "bar.com" and "baz.com" unchanged. The `config` subcommand output creates three separate entries for "foo.com", "bar.com", and "baz.com".
+
+Note: While the "bar.com", and "baz.com" entries in the example given above could be merged into one entry they are still being printed separate. This behavior is subject to change, future implementations may provide a merged output.
+
+## Example
+
+```
+$ rkt config
+{
+  "stage0": [
+    {
+      "rktVersion": "v1",
+      "rktKind": "auth",
+      "domains": [
+        "bar.com"
+      ],
+      "type": "oauth",
+      "credentials": {
+        "token": "someToken"
+      }
+    },
+    {
+      "rktVersion": "v1",
+      "rktKind": "auth",
+      "domains": [
+        "foo.com"
+      ],
+      "type": "basic",
+      "credentials": {
+        "user": "user",
+        "password": "userPassword"
+      }
+    },
+    {
+      "rktVersion": "v1",
+      "rktKind": "paths",
+      "data": "/var/lib/rkt",
+      "stage1-images": "/usr/lib/rkt"
+    },
+    {
+      "rktVersion": "v1",
+      "rktKind": "stage1",
+      "name": "coreos.com/rkt/stage1-coreos",
+      "version": "0.15.0+git",
+      "location": "/usr/libexec/rkt/stage1-coreos.aci"
+    }
+  ]
+}
diff --git a/rkt/config.go b/rkt/config.go
new file mode 100644
index 0000000000..afaf6a1c2f
--- /dev/null
+++ b/rkt/config.go
@@ -0,0 +1,51 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdConfig = &cobra.Command{
+		Use:   "config",
+		Short: "Print configuration for each stage in JSON format",
+		Long: `The output will be parsable JSON with "stage0" and stage1" as keys and rkt configuration entries as values.
+The generated configuration entries resemble the original rkt configuration format.`,
+		Run: runWrapper(runConfig),
+	}
+)
+
+func init() {
+	cmdRkt.AddCommand(cmdConfig)
+}
+
+func runConfig(cmd *cobra.Command, args []string) int {
+	config, err := getConfig()
+	if err != nil {
+		stderr.PrintE("cannot get configuration", err)
+		return 1
+	}
+
+	b, err := json.Marshal(config)
+	if err != nil {
+		stderr.PanicE("error marshaling configuration", err)
+	}
+
+	stdout.Print(string(b))
+	return 0
+}
diff --git a/rkt/config/auth.go b/rkt/config/auth.go
index c0cce1b035..384f82bf9e 100644
--- a/rkt/config/auth.go
+++ b/rkt/config/auth.go
@@ -56,13 +56,12 @@ func init() {
 }
 
 type basicAuthHeaderer struct {
-	user     string
-	password string
+	auth basicV1
 }
 
 func (h *basicAuthHeaderer) Header() http.Header {
 	headers := make(http.Header)
-	creds := []byte(fmt.Sprintf("%s:%s", h.user, h.password))
+	creds := []byte(fmt.Sprintf("%s:%s", h.auth.User, h.auth.Password))
 	encodedCreds := base64.StdEncoding.EncodeToString(creds)
 	headers.Add(authHeader, "Basic "+encodedCreds)
 
@@ -70,12 +69,12 @@ func (h *basicAuthHeaderer) Header() http.Header {
 }
 
 type oAuthBearerTokenHeaderer struct {
-	token string
+	auth oauthV1
 }
 
 func (h *oAuthBearerTokenHeaderer) Header() http.Header {
 	headers := make(http.Header)
-	headers.Add(authHeader, "Bearer "+h.token)
+	headers.Add(authHeader, "Bearer "+h.auth.Token)
 
 	return headers
 }
@@ -124,8 +123,7 @@ func (p *authV1JsonParser) getBasicV1Headerer(raw json.RawMessage) (Headerer, er
 		return nil, err
 	}
 	return &basicAuthHeaderer{
-		user:     basic.User,
-		password: basic.Password,
+		auth: basic,
 	}, nil
 }
 
@@ -138,7 +136,7 @@ func (p *authV1JsonParser) getOAuthV1Headerer(raw json.RawMessage) (Headerer, er
 		return nil, fmt.Errorf("no oauth bearer token specified")
 	}
 	return &oAuthBearerTokenHeaderer{
-		token: oauth.Token,
+		auth: oauth,
 	}, nil
 }
 
diff --git a/rkt/config/config.go b/rkt/config/config.go
index 9f44383f06..5349c240ea 100644
--- a/rkt/config/config.go
+++ b/rkt/config/config.go
@@ -16,6 +16,7 @@ package config
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -37,8 +38,8 @@ type Headerer interface {
 // BasicCredentials holds typical credentials used for authentication
 // (user and password). Used for fetching docker images.
 type BasicCredentials struct {
-	User     string
-	Password string
+	User     string `json:"user"`
+	Password string `json:"password"`
 }
 
 // ConfigurablePaths holds various paths defined in the configuration.
@@ -64,6 +65,90 @@ type Config struct {
 	Stage1                       Stage1Data
 }
 
+// MarshalJSON marshals the config for user output.
+func (c *Config) MarshalJSON() ([]byte, error) {
+	stage0 := []interface{}{}
+
+	for host, auth := range c.AuthPerHost {
+		var typ string
+		var credentials interface{}
+
+		switch h := auth.(type) {
+		case *basicAuthHeaderer:
+			typ = "basic"
+			credentials = h.auth
+		case *oAuthBearerTokenHeaderer:
+			typ = "oauth"
+			credentials = h.auth
+		default:
+			return nil, errors.New("unknown headerer type")
+		}
+
+		auth := struct {
+			RktVersion  string      `json:"rktVersion"`
+			RktKind     string      `json:"rktKind"`
+			Domains     []string    `json:"domains"`
+			Type        string      `json:"type"`
+			Credentials interface{} `json:"credentials"`
+		}{
+			RktVersion:  "v1",
+			RktKind:     "auth",
+			Domains:     []string{host},
+			Type:        typ,
+			Credentials: credentials,
+		}
+
+		stage0 = append(stage0, auth)
+	}
+
+	for registry, credentials := range c.DockerCredentialsPerRegistry {
+		dockerAuth := struct {
+			RktVersion  string           `json:"rktVersion"`
+			RktKind     string           `json:"rktKind"`
+			Registries  []string         `json:"registries"`
+			Credentials BasicCredentials `json:"credentials"`
+		}{
+			RktVersion:  "v1",
+			RktKind:     "dockerAuth",
+			Registries:  []string{registry},
+			Credentials: credentials,
+		}
+
+		stage0 = append(stage0, dockerAuth)
+	}
+
+	paths := struct {
+		RktVersion   string `json:"rktVersion"`
+		RktKind      string `json:"rktKind"`
+		Data         string `json:"data"`
+		Stage1Images string `json:"stage1-images"`
+	}{
+		RktVersion:   "v1",
+		RktKind:      "paths",
+		Data:         c.Paths.DataDir,
+		Stage1Images: c.Paths.Stage1ImagesDir,
+	}
+
+	stage1 := struct {
+		RktVersion string `json:"rktVersion"`
+		RktKind    string `json:"rktKind"`
+		Name       string `json:"name"`
+		Version    string `json:"version"`
+		Location   string `json:"location"`
+	}{
+		RktVersion: "v1",
+		RktKind:    "stage1",
+		Name:       c.Stage1.Name,
+		Version:    c.Stage1.Version,
+		Location:   c.Stage1.Location,
+	}
+
+	stage0 = append(stage0, paths, stage1)
+
+	data := map[string]interface{}{"stage0": stage0}
+	return json.Marshal(data)
+}
+
 type configParser interface {
 	parse(config *Config, raw []byte) error
 }
diff --git a/rkt/config/config_test.go b/rkt/config/config_test.go
index 84c301be5f..52ce69ba83 100644
--- a/rkt/config/config_test.go
+++ b/rkt/config/config_test.go
@@ -85,6 +85,10 @@ func TestAuthConfigFormat(t *testing.T) {
 				t.Error("Got unexpected results\nResult:\n", result, "\n\nExpected:\n", tt.expected)
 			}
 		}
+
+		if _, err := json.Marshal(cfg); err != nil {
+			t.Errorf("error marshaling config %v", err)
+		}
 	}
 }
 
@@ -118,6 +122,10 @@ func TestDockerAuthConfigFormat(t *testing.T) {
 				t.Error("Got unexpected results\nResult:\n", result, "\n\nExpected:\n", tt.expected)
 			}
 		}
+
+		if _, err := json.Marshal(cfg); err != nil {
+			t.Errorf("error marshaling config %v", err)
+		}
 	}
 }
 

From 49aa5c5dcb4734e7e698e454e49a3d19208caa13 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 14 Apr 2016 16:50:01 +0200
Subject: [PATCH 0118/1304] tests/net: cover too long net names

---
 tests/rkt_net_test.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index cae2c00638..b9d8b45b76 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -743,3 +743,19 @@ func TestNetOverride(t *testing.T) {
 		t.Fatalf("overriding IP did not work: Got %q but expected %q", containerIP, expectedIP)
 	}
 }
+
+func TestNetLongName(t *testing.T) {
+	nt := networkTemplateT{
+		Name:   "thisnameiswaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaytoolong",
+		Type:   "ptp",
+		IpMasq: true,
+		Ipam: ipamTemplateT{
+			Type:   "host-local",
+			Subnet: "11.11.6.0/24",
+			Routes: []map[string]string{
+				{"dst": "0.0.0.0/0"},
+			},
+		},
+	}
+	testNetCustomNatConnectivity(t, nt)
+}

From 1cb22b123ff74d75841f1a178ab7d1ee3aa43975 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 14 Apr 2016 15:37:31 -0700
Subject: [PATCH 0119/1304] doc: Update docs for 'rkt gc --mark-only'.

---
 Documentation/subcommands/gc.md         | 2 +-
 Documentation/using-rkt-with-systemd.md | 5 +++++
 tests/rkt_gc_test.go                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation/subcommands/gc.md b/Documentation/subcommands/gc.md
index 0befbe6b53..2d9de34b7a 100644
--- a/Documentation/subcommands/gc.md
+++ b/Documentation/subcommands/gc.md
@@ -29,7 +29,7 @@ Garbage collecting pod "f07a4070-79a9-4db0-ae65-a090c9c393a3"
 | --- | --- | --- | --- |
 | `--expire-prepared` |  `24h0m0s` | A time | Duration to wait before expiring prepared pods |
 | `--grace-period` |  `30m0s` | A time | Duration to wait before discarding inactive pods from garbage |
-| `--mark-only` | `false` | If set to true, then the exited/aborted pods will be moved to the garbage directories without actually deleting them, this is useful for marking the exit time of a pod |
+| `--mark-only` | `false` | `true` or `false` | If set to true, only the "mark" phase of the garbage collection process will be formed (i.e., exited/aborted pods will be moved to the garbage, but nothing will be deleted) |
 
 ## Global options
 
diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index 47dad93524..e88a72642f 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -101,6 +101,10 @@ A more advanced unit example takes advantage of a few convenient `systemd` featu
 1. Inheriting environment variables specified in the unit with `--inherit-env`. This feature helps keep units concise, instead of layering on many flags to `rkt run`.
 2. Using the dependency graph to start our pod after networking has come online. This is helpful if your application requires outside connectivity to fetch remote configuration (for example, from `etcd`).
 3. Set resource limits for this `rkt` pod. This can also be done in the unit file, rather than flagged to `rkt run`.
+4. Set `ExecStop` to invoke `rkt gc --mark-only` to record the timestamp when the pod exits.
+(Run `rkt gc --help` to see more details about this flag).
+After running `rkt gc --mark-only`, the timestamp can be retrieved from rkt API service in pod's `gc_marked_at` field.
+The timestamp can be treated as the finished time of the pod.
 
 Here is what it looks like all together:
 
@@ -127,6 +131,7 @@ Environment=TMPDIR=/var/tmp
 ExecStartPre=/usr/bin/rkt fetch myapp.com/myapp-1.3.4
 # Start the app
 ExecStart=/usr/bin/rkt run --inherit-env --port=http:8888 myapp.com/myapp-1.3.4
+ExecStop=/usr/bin/rkt gc --mark-only
 KillMode=mixed
 Restart=always
 ```
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 6e1009a8ad..9a116c3353 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The rkt Authors
+// Copyright 2016 The rkt Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

From 33517ad059ef160ec49318120f017ebc4a4a22c2 Mon Sep 17 00:00:00 2001
From: Wlodzimierz Borkowski <wlodzimierz.borkowski@intel.com>
Date: Fri, 15 Apr 2016 15:10:59 +0200
Subject: [PATCH 0120/1304] skip TestSocketProxyd when systemd-socket-proxyd is
 not installed

---
 tests/rkt_socket_proxyd_test.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
index 8c07df2c1e..d35dc3ef9e 100644
--- a/tests/rkt_socket_proxyd_test.go
+++ b/tests/rkt_socket_proxyd_test.go
@@ -36,6 +36,11 @@ func TestSocketProxyd(t *testing.T) {
 		t.Skip("Systemd is not running on the host.")
 	}
 
+	socketProxydPath := "/lib/systemd/systemd-socket-proxyd"
+	if _, err := os.Stat(socketProxydPath); os.IsNotExist(err) {
+		t.Skip("systemd-socket-proxyd is not installed.")
+	}
+
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
@@ -135,10 +140,11 @@ func TestSocketProxyd(t *testing.T) {
 	After=%s
 
 	[Service]
-	ExecStart=/lib/systemd/systemd-socket-proxyd %s:%d
+	ExecStart=%s %s:%d
 	`
 
-	proxyContent := fmt.Sprintf(proxyToRktTestingEchoService, serviceTargetBase, serviceTargetBase, containerIP, port)
+	proxyContent := fmt.Sprintf(proxyToRktTestingEchoService, serviceTargetBase, serviceTargetBase,
+		socketProxydPath, containerIP, port)
 	proxyContentBase := fmt.Sprintf("proxy-to-rkt-testing-socket-activation-%d.service", rnd)
 	proxyTarget := filepath.Join(unitsDir, proxyContentBase)
 

From 6aa6874515022ba3e4cac43ef1780bd1e9cff5b0 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 14 Apr 2016 16:07:33 +0200
Subject: [PATCH 0121/1304] ROADMAP: update next few milestones

---
 ROADMAP.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index e25a5f0e53..6a38af157a 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,21 +9,20 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-### rkt 1.4 (April)
+### rkt 1.5 (April)
 
 - enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
 - user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)
 - `rkt fly` as top-level command [#1889](https://github.com/coreos/rkt/issues/1889)
-- IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
 - stage1 benchmarking [#1788](https://github.com/coreos/rkt/issues/1788)
 - rkt runs on Fedora with SELinux in enforcing mode
 
-### rkt 1.5 (April)
+### rkt 1.6 (May)
 
-- stable API
+- stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
+- IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
 - full integration with Kubernetes (aka "rktnetes")
 - full integration with `machinectl login` and `systemd-run` [#1463](https://github.com/coreos/rkt/issues/1463)
-- attach to the app's stdin/stdout [#1799](https://github.com/coreos/rkt/issues/1799)
 - packaged for more distributions
   - Debian [#1307](https://github.com/coreos/rkt/issues/1307)
   - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)

From c10453136467027bcf6836eecd1249a9e3aff853 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 15 Apr 2016 11:24:03 +0200
Subject: [PATCH 0122/1304] CHANGELOG: document 1.4.0 release

---
 CHANGELOG.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adf47cf482..fa51b1fced 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,66 @@
-## vUNRELEASED
+## v1.4.0
+
+This release includes a number of new features and bugfixes like a new config subcommand, man page, and bash completion generation during build time.
 
 #### New features and UX changes
 
-- Add `--user`/`--group` option to rkt run/prepare ([#2419](https://github.com/coreos/rkt/pull/2419)). This option allows overriding the user/group specified in the image manifest.
+- config: add config subcommand ([#2405](https://github.com/coreos/rkt/pull/2405)). This new subcommand prints the current rkt configuration. It can be used to get i.e. authentication credentials. See rkt's [config subcommand](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/config.md) documentation.
+
+- run: add `--user`/`--group` app flags to `rkt run` and `rkt prepare` allowing to override the user and group specified in the image manifest ([#2419](https://github.com/coreos/rkt/pull/2419)).
+
+- gc: Add flag 'mark-only' to mark garbage pods without deleting them ([#2400](https://github.com/coreos/rkt/pull/2400), [#2402](https://github.com/coreos/rkt/pull/2402)). This new flag moves exited/aborted pods to the exited-garbage/garbage directory but does not delete them. A third party application can use `rkt gc --mark-only=true` to mark exited pods as garbage without deleting them.
+
+- kvm: Add support for app capabilities limitation ([#2222](https://github.com/coreos/rkt/pull/2222)). By default kvm flavor has got enabled every capability inside pod. This patch adds support for a restricted set of capabilities inside a kvm flavor of rkt.
+
+- stage1/init: return exit code 1 on error ([#2383](https://github.com/coreos/rkt/pull/2383)). On error, stage1/init was returning a non-zero value between 1 and 7. This change makes it return status code 1 only.
+
+- api: Add 'CreatedAt', 'StartedAt' in pod's info returned by api service. ([#2377](https://github.com/coreos/rkt/pull/2377)).
+
+#### Improved documentation
+
+- Minor documentation fixes ([#2413](https://github.com/coreos/rkt/pull/2413), [#2395](https://github.com/coreos/rkt/pull/2395), [#2231](https://github.com/coreos/rkt/pull/2231)).
+
+- functional tests: Add new test with systemd-proxyd ([#2257](https://github.com/coreos/rkt/pull/2257)). Adds a new test and documentation how to use systemd-proxyd with rkt pods.
+
+#### Bug fixes
+
+- kvm: refactor volumes support ([#2328](https://github.com/coreos/rkt/pull/2328)). This allows users to share regular files as volumes in addition to directories.
+
+- kvm: fix rkt status ([#2415](https://github.com/coreos/rkt/pull/2415)). Fixes a regression bug were `rkt status` was no longer reporting the pid of the pod when using the kvm flavor.
+
+- Build actool for the *build* architecture ([#2372](https://github.com/coreos/rkt/pull/2372)). Fixes a cross compilation issue with acbuild.
+
+- rkt: calculate real dataDir path ([#2399](https://github.com/coreos/rkt/pull/2399)). Fixes garbage collection when the data directory specified by `--dir` contains a symlink component.
+
+- stage1/init: fix docker volume semantics ([#2409](https://github.com/coreos/rkt/pull/2409)). Fixes a bug in docker volume semantics when rkt runs with the option `--pod-manifest`. When a Docker image exposes a mount point that is not mounted by a host volume, Docker volume semantics expect the files in the directory to be available to the application. This was partially fixed in rkt 1.3.0 via [#2315](https://github.com/coreos/rkt/pull/2315) but the bug remained when rkt runs with the option `--pod-manifest`. This is now fully fixed.
+
+- rkt/image: check that discovery labels match manifest labels ([#2311](https://github.com/coreos/rkt/pull/2311)).
+
+- store: fix multi process with multi goroutines race on db ([#2391](https://github.com/coreos/rkt/pull/2391)). This was a bug when multiple `rkt fetch` commands were executed concurrently.
+
+- kvm: fix pid vs ppid usage ([#2396](https://github.com/coreos/rkt/pull/2396)). Fixes a bug in `rkt enter` in the kvm flavor causing an infinite loop.
+
+- kvm: Fix connectivity issue in macvtap networks caused by macvlan NICs having incorrect names ([#2181](https://github.com/coreos/rkt/pull/2181)). 
+
+- tests: TestRktListCreatedStarted: fix timing issue causing the test to fail on slow machines ([#2366](https://github.com/coreos/rkt/pull/2366)).
+
+- rkt/image: remove redundant quotes in an error message ([#2379](https://github.com/coreos/rkt/pull/2379)).
+
+- prepare: Support 'ondisk' verification skip as documented by [the global options](https://github.com/coreos/rkt/blob/master/Documentation/commands.md#global-options) ([#2376](https://github.com/coreos/rkt/pull/2376)). Prior to this commit, rkt prepare would check the ondisk image even if the `--insecure-options=ondisk` flag was provided. This corrects that.
+
+#### Other changes
+
+- tests: skip TestSocketProxyd when systemd-socket-proxyd is not installed ([#2436](https://github.com/coreos/rkt/pull/2436)).
+
+- tests: TestDockerVolumeSemantics: more tests with symlinks ([#2394](https://github.com/coreos/rkt/pull/2394)).
+
+- rkt: Improve build shell script used in [continuous integration](https://github.com/coreos/rkt/blob/master/tests/README.md) ([#2394](https://github.com/coreos/rkt/pull/2394)).
+
+- protobuf: generate code using a script ([#2382](https://github.com/coreos/rkt/pull/2382)).
+
+- Generate manpages ([#2373](https://github.com/coreos/rkt/pull/2373)). This adds support for generating rkt man pages using `make manpages` and the bash completion file using `make bash-completion`, see the note for packagers below.
 
-- Ensure that the initial name and labels used for discovery match the name and labels in the Image Manifest as specified in the appc spec ([#2311](https://github.com/coreos/rkt/pull/2311)). Users wanting the latest image should use `rkt prepare/run/fetch example.com/aci` without any labels. If the discovery server supports the "latest" pattern, the user can bypass a locally cached image in the store and fetch an updated image using `rkt prepare/run/fetch --no-store example.com/aci` option.
+- tests/aws.sh: add test for Fedora 24 ([#2340](https://github.com/coreos/rkt/pull/2340)).
 
 #### Note for packagers
 

From f5b69782d120a7ae5ada8f2ebad97a014a98ebd5 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 15 Apr 2016 11:43:22 +0200
Subject: [PATCH 0123/1304] version: bump to v1.4.0

---
 Documentation/getting-started-ubuntu.md | 6 +++---
 Documentation/running-fly-stage1.md     | 4 ++--
 Documentation/running-lkvm-stage1.md    | 4 ++--
 Documentation/subcommands/prepare.md    | 2 +-
 Documentation/subcommands/version.md    | 2 +-
 Documentation/trying-out-rkt.md         | 6 +++---
 configure.ac                            | 2 +-
 scripts/acbuild-rkt-builder.sh          | 2 +-
 scripts/build-rir.sh                    | 2 +-
 tests/empty-image/manifest              | 2 +-
 tests/image/manifest                    | 2 +-
 tests/rkt_exec_test.go                  | 2 +-
 tests/rkt_image_cat_manifest_test.go    | 2 +-
 tests/rkt_image_export_test.go          | 2 +-
 tests/rkt_image_render_test.go          | 2 +-
 tests/rkt_os_arch_test.go               | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
index 591bc19fe9..99bb2deb81 100644
--- a/Documentation/getting-started-ubuntu.md
+++ b/Documentation/getting-started-ubuntu.md
@@ -15,9 +15,9 @@ vagrant up --provider virtualbox
 vagrant ssh
 sudo -s
 
-wget https://github.com/coreos/rkt/releases/download/v1.3.0/rkt-v1.3.0.tar.gz
-tar xzvf rkt-v1.3.0.tar.gz
-cd rkt-v1.3.0
+wget https://github.com/coreos/rkt/releases/download/v1.4.0/rkt-v1.4.0.tar.gz
+tar xzvf rkt-v1.4.0.tar.gz
+cd rkt-v1.4.0
 ./rkt help
 ```
 
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index b1a370a42f..7eff0faff9 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.3.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.4.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.3.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.4.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index b66dbef611..9111d887ee 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.3.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.4.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.3.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.4.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 2e20608a11..4456a44f46 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.3.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.4.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 69cfbfbafb..2c6cb0464a 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.3.0
+rkt Version: 1.4.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index e966deb92b..bd097e4480 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool, and is currently supported on amd64 Linux. A
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.3.0/rkt-v1.3.0.tar.gz
-tar xzvf rkt-v1.3.0.tar.gz
-cd rkt-v1.3.0
+wget https://github.com/coreos/rkt/releases/download/v1.4.0/rkt-v1.4.0.tar.gz
+tar xzvf rkt-v1.4.0.tar.gz
+cd rkt-v1.4.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 096c1dc974..94da0062d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.3.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.4.0], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 27cff65468..a3b4f15c9f 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -25,7 +25,7 @@ ACI_NAME=${ACI_NAME:-"coreos.com/rkt/builder"}
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
 ACI_GOPATH=/go
-VERSION=${VERSION:-"v1.3.0+git"}
+VERSION=${VERSION:-"v1.4.0"}
 echo "Version: $VERSION"
 
 echo "Building $ACI_FILE"
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 2bcb4ae23e..4afc24a38e 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR=${SRC_DIR:-$PWD}
 BUILDDIR=${BUILDDIR:-$PWD/build-rir}
-RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.3.0+git}
+RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.4.0}
 
 mkdir -p $BUILDDIR
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 2a57160f49..c661ca5d17 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.3.0"
+            "value": "1.4.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index a48b7362ea..7d81c25d1f 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.3.0"
+            "value": "1.4.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 3268656bfe..3bfde38594 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.3.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.4.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 765e584db9..ae210c86d7 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -27,7 +27,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.3.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.4.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 35401d5927..50eba09988 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.3.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.4.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 8b5f91420f..a3dbd0a8f6 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.3.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.4.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index a82e36b684..9430601911 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.3.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.4.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 481ab7156f802206f35b534039846041b4c70d5d Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 15 Apr 2016 11:43:22 +0200
Subject: [PATCH 0124/1304] version: bump to v1.4.0+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 94da0062d4..7b8fc4ef0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.4.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.4.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index a3b4f15c9f..135f2bc220 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -25,7 +25,7 @@ ACI_NAME=${ACI_NAME:-"coreos.com/rkt/builder"}
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
 ACI_GOPATH=/go
-VERSION=${VERSION:-"v1.4.0"}
+VERSION=${VERSION:-"v1.4.0+git"}
 echo "Version: $VERSION"
 
 echo "Building $ACI_FILE"
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 4afc24a38e..acb8f4fc4a 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR=${SRC_DIR:-$PWD}
 BUILDDIR=${BUILDDIR:-$PWD/build-rir}
-RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.4.0}
+RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.4.0+git}
 
 mkdir -p $BUILDDIR
 

From 69353251fc2312a153268974f8d660af161218a6 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 15 Apr 2016 16:14:28 +0200
Subject: [PATCH 0125/1304] release: fix build-rir.sh script

Currently `build-rir.sh` inherits the environment during the build. This
is unnecessary and can actually break the build on a custom host
PATH environment.

This fixes it.
---
 scripts/build-rir.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index acb8f4fc4a..e9880faa53 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -2,15 +2,14 @@
 
 set -xe
 
-SRC_DIR=${SRC_DIR:-$PWD}
-BUILDDIR=${BUILDDIR:-$PWD/build-rir}
-RKT_BUILDER_ACI=${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.4.0+git}
+SRC_DIR="${SRC_DIR:-$PWD}"
+BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.4.0+git}"
 
 mkdir -p $BUILDDIR
 
 rkt run \
-    --inherit-env \
-    --volume src-dir,kind=host,source=$SRC_DIR \
-    --volume build-dir,kind=host,source=$BUILDDIR \
+    --volume src-dir,kind=host,source="${SRC_DIR}" \
+    --volume build-dir,kind=host,source="${BUILDDIR}" \
     --interactive \
     $RKT_BUILDER_ACI $@

From 2f53f48c171b45de44dacca6d808d6e74345ca21 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 14 Apr 2016 15:41:44 -0700
Subject: [PATCH 0126/1304] tests: Sleep delta time before 'rkt gc
 --mark-only'.

---
 Documentation/using-rkt-with-systemd.md | 4 ++--
 tests/rkt_api_service_test.go           | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index e88a72642f..6f7f57d348 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -101,7 +101,7 @@ A more advanced unit example takes advantage of a few convenient `systemd` featu
 1. Inheriting environment variables specified in the unit with `--inherit-env`. This feature helps keep units concise, instead of layering on many flags to `rkt run`.
 2. Using the dependency graph to start our pod after networking has come online. This is helpful if your application requires outside connectivity to fetch remote configuration (for example, from `etcd`).
 3. Set resource limits for this `rkt` pod. This can also be done in the unit file, rather than flagged to `rkt run`.
-4. Set `ExecStop` to invoke `rkt gc --mark-only` to record the timestamp when the pod exits.
+4. Set `ExecStopPost` to invoke `rkt gc --mark-only` to record the timestamp when the pod exits.
 (Run `rkt gc --help` to see more details about this flag).
 After running `rkt gc --mark-only`, the timestamp can be retrieved from rkt API service in pod's `gc_marked_at` field.
 The timestamp can be treated as the finished time of the pod.
@@ -131,7 +131,7 @@ Environment=TMPDIR=/var/tmp
 ExecStartPre=/usr/bin/rkt fetch myapp.com/myapp-1.3.4
 # Start the app
 ExecStart=/usr/bin/rkt run --inherit-env --port=http:8888 myapp.com/myapp-1.3.4
-ExecStop=/usr/bin/rkt gc --mark-only
+ExecStopPost=/usr/bin/rkt gc --mark-only
 KillMode=mixed
 Restart=always
 ```
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index a527977046..6afcd4ce2b 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -338,6 +338,8 @@ func TestAPIServiceListInspectPods(t *testing.T) {
 	runCmd := fmt.Sprintf("%s run --pod-manifest=%s", ctx.Cmd(), manifestFile)
 	waitOrFail(t, spawnOrFail(t, runCmd), 0)
 
+	time.Sleep(delta)
+
 	gcCmd := fmt.Sprintf("%s gc --mark-only=true", ctx.Cmd())
 	waitOrFail(t, spawnOrFail(t, gcCmd), 0)
 

From 1530274e0624c56cd086ae36f6bdd3a3d57a2d16 Mon Sep 17 00:00:00 2001
From: Josh Wood <j@coreos.com>
Date: Fri, 15 Apr 2016 15:56:33 -0700
Subject: [PATCH 0127/1304] Doc/subcmd/config: Fix formatting of code blocks -
 newline.

---
 Documentation/subcommands/config.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/subcommands/config.md b/Documentation/subcommands/config.md
index fbef3d1c98..8d3f1701d2 100644
--- a/Documentation/subcommands/config.md
+++ b/Documentation/subcommands/config.md
@@ -17,6 +17,7 @@ The entry "stage0" refers to stage-specific configuration; "stage1" is currently
 The "stage0" entry contains subentries of rktKind "auth", "dockerAuth", "paths", and "stage1". Note that the `config` subcommand will output separate entries per "auth" domain and separate entries per "dockerAuth" registry. While it is possible to specify an array of strings in the input configuration rkt internally merges configuration state from different directories potentially creating multiple entries.
 
 Consider the following system configuration:
+
 ```
 $ cat /etc/rkt/auth.d/basic.json
 {
@@ -33,6 +34,7 @@ $ cat /etc/rkt/auth.d/basic.json
 ```
 
 And the following user configuration:
+
 ```
 $ ~/.config/rkt/auth.d/basic.json
 {
@@ -47,6 +49,7 @@ $ ~/.config/rkt/auth.d/basic.json
 ```
 
 The `config` subcommand would generate the following separate merged entries:
+
 ```
 {
   "stage0": [
@@ -123,3 +126,4 @@ $ rkt config
     }
   ]
 }
+```

From 10d22b56f25146eddbcdfb8fd071aeac7ce62d5a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Sun, 17 Apr 2016 09:33:06 +0200
Subject: [PATCH 0128/1304] pkg/sys: add SYS_SYNCFS definition for
 ppc64/ppc64le

Added missing SYS_SYNCFS definition for ppc64 and ppc64le,
fixing build failures on those architectures.

Closes: coreos/rkt#2441
Signed-off-by: Luca Bruno <lucab@debian.org>
---
 pkg/sys/sys_linux_ppc64.go   | 21 +++++++++++++++++++++
 pkg/sys/sys_linux_ppc64le.go | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkg/sys/sys_linux_ppc64.go
 create mode 100644 pkg/sys/sys_linux_ppc64le.go

diff --git a/pkg/sys/sys_linux_ppc64.go b/pkg/sys/sys_linux_ppc64.go
new file mode 100644
index 0000000000..10a1d8f875
--- /dev/null
+++ b/pkg/sys/sys_linux_ppc64.go
@@ -0,0 +1,21 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build linux,ppc64
+
+package sys
+
+const (
+	SYS_SYNCFS = 348
+)
diff --git a/pkg/sys/sys_linux_ppc64le.go b/pkg/sys/sys_linux_ppc64le.go
new file mode 100644
index 0000000000..d88a80dab7
--- /dev/null
+++ b/pkg/sys/sys_linux_ppc64le.go
@@ -0,0 +1,21 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build linux,ppc64le
+
+package sys
+
+const (
+	SYS_SYNCFS = 348
+)

From db6c62d17e75c5c72742157e5ef9621f23835d5c Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Mon, 18 Apr 2016 09:45:24 +0200
Subject: [PATCH 0129/1304] tests/TestAppUserGroup: cleanup ctx after each test

Fixes #2444
---
 tests/rkt_run_user_group_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
index a233ff117f..b59ecee943 100644
--- a/tests/rkt_run_user_group_test.go
+++ b/tests/rkt_run_user_group_test.go
@@ -23,9 +23,6 @@ import (
 )
 
 func TestAppUserGroup(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
 	imageDummy := patchTestACI("rkt-inspect-dummy.aci", "--name=dummy")
 	defer os.Remove(imageDummy)
 
@@ -83,6 +80,9 @@ func TestAppUserGroup(t *testing.T) {
 		},
 	} {
 		func() {
+			ctx := testutils.NewRktRunCtx()
+			defer ctx.Cleanup()
+
 			tt.imageParams = append(tt.imageParams, "--exec=/inspect --print-user")
 			image := patchTestACI("rkt-inspect-user-group.aci", tt.imageParams...)
 			defer os.Remove(image)

From daa22603c4128a6994d07a18439052360876e07b Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Mon, 18 Apr 2016 11:55:25 +0300
Subject: [PATCH 0130/1304] tests: find LCA to detect commit differences

Creates a function to find the lowest common ancestor between two commits.

Fixes #2423
---
 tests/build-and-run-tests.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index 5a2363da9e..e5f0215779 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -28,14 +28,24 @@ function ciSkip {
     exit 0
 }
 
+# Finds the branching point of two commits. 
+# For example, let B and D be two commits, and their ancestry graph as A -> B, A -> C -> D. 
+# Given commits B and D, it returns A. 
+function getBranchingPoint {
+    diff --old-line-format='' --new-line-format='' \
+        <(git rev-list --first-parent "${1:-$1}") \
+            <(git rev-list --first-parent "${2:-$2}") | head -1
+}
+
 # Configure SemaphoreCI environment.
 function semaphoreConfiguration {
     # We might not need to run functional tests or process docs.
     # This is best-effort; || true ensures this does not affect test outcome
     # First, ensure origin is updated - semaphore can do some weird caching
     git fetch || true
-    SRC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..origin/master | grep -cEv ${DOC_CHANGE_PATTERN}) || true
-    DOC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..origin/master | grep -cE ${DOC_CHANGE_PATTERN}) || true
+    BRANCHING_POINT=$(getBranchingPoint HEAD origin/master)
+    SRC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..${BRANCHING_POINT} | grep -cEv ${DOC_CHANGE_PATTERN}) || true
+    DOC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..${BRANCHING_POINT} | grep -cE ${DOC_CHANGE_PATTERN}) || true
 
     # Set up go environment on semaphore
     if [ -f /opt/change-go-version.sh ]; then

From 8bbefc32ac76bc9be9292d26cf69529bf98b9fa4 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 19 Apr 2016 13:51:32 +0200
Subject: [PATCH 0131/1304] MAINTAINERS: add Sergiusz Urbaniak @s-urbaniak

---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index ace95542cb..935b563112 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,6 +4,7 @@ Derek Gonyeo <derek.gonyeo@coreos.com> (@dgonyeo)
 Iago López Galeiras <iago.lopez@coreos.com> (@iaguis)
 Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle)
 Krzesimir Nowak <krzesimir.nowak@coreos.com> (@krnowak)
+Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak)
 Stefan Junker <stefan.junker@coreos.com> (@steveeJ)
 Vito Caputo <vito.caputo@coreos.com> (@vcaputo)
 Yifan Gu <yifan.gu@coreos.com> (@yifan-gu)

From 159985297a9a8235c219bd542567edfdc87077b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 18 Apr 2016 15:48:03 +0200
Subject: [PATCH 0132/1304] stage1/init: interpret "root" as UID/GID 0

This is a special case and it should work even if the image doesn't have
/etc/passwd or /etc/group.
---
 stage1/init/common/pod.go | 132 +++++++++++++++++++++++---------------
 1 file changed, 79 insertions(+), 53 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index f401c1fe80..cf04ac2832 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -302,62 +302,13 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		return errwrap.Wrap(errors.New("unable to write environment file"), err)
 	}
 
-	var _uid, gid int
-	var err error
-
-	uidRange := uid.NewBlankUidRange()
-	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
-		return errwrap.Wrap(errors.New("unable to deserialize uid range"), err)
-	}
-
-	if strings.HasPrefix(app.User, "/") {
-		var stat syscall.Stat_t
-		if err = syscall.Lstat(filepath.Join(common.AppRootfsPath(p.Root, appName),
-			app.User), &stat); err != nil {
-			return errwrap.Wrap(fmt.Errorf("unable to get uid from file %q",
-				app.User), err)
-		}
-		uidReal, _, err := uidRange.UnshiftRange(stat.Uid, 0)
-		if err != nil {
-			return errwrap.Wrap(errors.New("unable to determine real uid"), err)
-		}
-		_uid = int(uidReal)
-	} else {
-		_uid, err = strconv.Atoi(app.User)
-		if err != nil {
-			_uid, err = passwd.LookupUidFromFile(app.User,
-				filepath.Join(common.AppRootfsPath(p.Root, appName), "etc/passwd"))
-			if err != nil {
-				return errwrap.Wrap(fmt.Errorf("cannot lookup user %q", app.User), err)
-			}
-		}
-	}
-
-	if strings.HasPrefix(app.Group, "/") {
-		var stat syscall.Stat_t
-		if err = syscall.Lstat(filepath.Join(common.AppRootfsPath(p.Root, appName),
-			app.Group), &stat); err != nil {
-			return errwrap.Wrap(fmt.Errorf("unable to get gid from file %q",
-				app.Group), err)
-		}
-		_, gidReal, err := uidRange.UnshiftRange(0, stat.Gid)
-		if err != nil {
-			return errwrap.Wrap(errors.New("unable to determine real gid"), err)
-		}
-		gid = int(gidReal)
-	} else {
-		gid, err = strconv.Atoi(app.Group)
-		if err != nil {
-			gid, err = group.LookupGidFromFile(app.Group,
-				filepath.Join(common.AppRootfsPath(p.Root, appName), "etc/group"))
-			if err != nil {
-				return errwrap.Wrap(fmt.Errorf("cannot lookup group %q", app.Group), err)
-			}
-		}
+	u, g, err := parseUserGroup(p, ra, privateUsers)
+	if err != nil {
+		return err
 	}
 
 	execWrap := []string{"/appexec", common.RelAppRootfsPath(appName), workDir, RelEnvFilePath(appName),
-		strconv.Itoa(_uid), generateGidArg(gid, app.SupplementaryGIDs), "--"}
+		strconv.Itoa(u), generateGidArg(g, app.SupplementaryGIDs), "--"}
 	execStart := quoteExec(append(execWrap, app.Exec...))
 	opts := []*unit.UnitOption{
 		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Application=%v Image=%v", appName, imgName)),
@@ -500,6 +451,81 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 	return nil
 }
 
+// parseUserGroup parses the User and Group fields of an App and returns its
+// UID and GID.
+// The User and Group fields accept several formats:
+//   1. the hardcoded string "root"
+//   2. a path
+//   3. a number
+//   4. a name in reference to /etc/{group,passwod} in the image
+// See https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
+func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, privateUsers string) (int, int, error) {
+	app := ra.App
+	appName := ra.Name
+
+	var uid_, gid_ int
+	var err error
+
+	uidRange := uid.NewBlankUidRange()
+	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
+		return -1, -1, errwrap.Wrap(errors.New("unable to deserialize uid range"), err)
+	}
+
+	switch {
+	case app.User == "root":
+		uid_ = 0
+	case strings.HasPrefix(app.User, "/"):
+		var stat syscall.Stat_t
+		if err = syscall.Lstat(filepath.Join(common.AppRootfsPath(p.Root, appName),
+			app.User), &stat); err != nil {
+			return -1, -1, errwrap.Wrap(fmt.Errorf("unable to get uid from file %q",
+				app.User), err)
+		}
+		uidReal, _, err := uidRange.UnshiftRange(stat.Uid, 0)
+		if err != nil {
+			return -1, -1, errwrap.Wrap(errors.New("unable to determine real uid"), err)
+		}
+		uid_ = int(uidReal)
+	default:
+		uid_, err = strconv.Atoi(app.User)
+		if err != nil {
+			uid_, err = passwd.LookupUidFromFile(app.User,
+				filepath.Join(common.AppRootfsPath(p.Root, appName), "etc/passwd"))
+			if err != nil {
+				return -1, -1, errwrap.Wrap(fmt.Errorf("cannot lookup user %q", app.User), err)
+			}
+		}
+	}
+
+	switch {
+	case app.Group == "root":
+		gid_ = 0
+	case strings.HasPrefix(app.Group, "/"):
+		var stat syscall.Stat_t
+		if err = syscall.Lstat(filepath.Join(common.AppRootfsPath(p.Root, appName),
+			app.Group), &stat); err != nil {
+			return -1, -1, errwrap.Wrap(fmt.Errorf("unable to get gid from file %q",
+				app.Group), err)
+		}
+		_, gidReal, err := uidRange.UnshiftRange(0, stat.Gid)
+		if err != nil {
+			return -1, -1, errwrap.Wrap(errors.New("unable to determine real gid"), err)
+		}
+		gid_ = int(gidReal)
+	default:
+		gid_, err = strconv.Atoi(app.Group)
+		if err != nil {
+			gid_, err = group.LookupGidFromFile(app.Group,
+				filepath.Join(common.AppRootfsPath(p.Root, appName), "etc/group"))
+			if err != nil {
+				return -1, -1, errwrap.Wrap(fmt.Errorf("cannot lookup group %q", app.Group), err)
+			}
+		}
+	}
+
+	return uid_, gid_, nil
+}
+
 func writeShutdownService(p *stage1commontypes.Pod) error {
 	flavor, systemdVersion, err := GetFlavor(p)
 	if err != nil {

From afe0a382f36b6e7161db4582c9b66bcd7fa362eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 19 Apr 2016 12:02:53 +0200
Subject: [PATCH 0133/1304] functional tests: test "root" in User and Group

---
 tests/rkt_run_pod_manifest_test.go | 22 ++++++++++++++++++++++
 tests/rkt_run_user_group_test.go   | 12 ++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 322156b206..90eff3d349 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -611,6 +611,28 @@ func TestPodManifest(t *testing.T) {
 			"User: uid=1000 euid=1000 gid=100 egid=100",
 			"",
 		},
+		{
+			// Set "root", it should work without it being present in
+			// /etc/{passwd,group}
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-root-user-group.aci", []string{}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--print-user"},
+							User:  "root",
+							Group: "root",
+						},
+					},
+				},
+			},
+			0,
+			"User: uid=0 euid=0 gid=0 egid=0",
+			"",
+		},
 		{
 			// Set invalid non-numerical app user.
 			[]imagePatch{
diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
index b59ecee943..5c77158103 100644
--- a/tests/rkt_run_user_group_test.go
+++ b/tests/rkt_run_user_group_test.go
@@ -78,6 +78,18 @@ func TestAppUserGroup(t *testing.T) {
 			rktParams:   "--user=user1 --group=group1",
 			expected:    "User: uid=1000 euid=1000 gid=100 egid=100",
 		},
+		{
+			imageParams: []string{"--user=root", "--group=root"},
+			expected:    "User: uid=0 euid=0 gid=0 egid=0",
+		},
+		{
+			rktParams: "--user=root --group=root",
+			expected:  "User: uid=0 euid=0 gid=0 egid=0",
+		},
+		{
+			rktParams: "--user=/inspect --group=/inspect",
+			expected:  "User: uid=0 euid=0 gid=0 egid=0",
+		},
 	} {
 		func() {
 			ctx := testutils.NewRktRunCtx()

From cd08a4b32da3d1e61176b127a9998c657d6fa4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 20 Apr 2016 11:41:15 +0200
Subject: [PATCH 0134/1304] rkt/image: strip "Authorization" on redirects to a
 different host

We shouldn't pass the "Authorization" header if the redirect goes to a
different host, it can leak sensitive information to unexpected third
parties.

This fixes an issue where rkt gets redirected to Amazon S3 when
downloading an ACI from quay and S3 returns a 400 (Bad Request) with
this error message:

"Only one auth mechanism allowed; only the X-Amz-Algorithm query
parameter, Signature query string parameter or the Authorization header
should be specified"

The problem happens because we're sending "Authorization" and the URL on
the redirect already includes a "Signature" query string parameter.
---
 rkt/image/resumablesession.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/rkt/image/resumablesession.go b/rkt/image/resumablesession.go
index 66084d5fbe..712d29bbe9 100644
--- a/rkt/image/resumablesession.go
+++ b/rkt/image/resumablesession.go
@@ -285,7 +285,14 @@ func (s *resumableSession) getClient() *http.Client {
 			if len(via) >= 10 {
 				return fmt.Errorf("too many redirects")
 			}
-			s.setHTTPHeaders(req)
+			stripAuth := false
+			// don't propagate "Authorization" if the redirect is to a
+			// different host
+			previousHost := via[len(via)-1].URL.Host
+			if previousHost != req.URL.Host {
+				stripAuth = true
+			}
+			s.setHTTPHeaders(req, stripAuth)
 			return nil
 		},
 	}
@@ -302,7 +309,7 @@ func (s *resumableSession) httpRequest(method string, u *url.URL) *http.Request
 		Host:       u.Host,
 	}
 
-	s.setHTTPHeaders(req)
+	s.setHTTPHeaders(req, false)
 
 	return req
 }
@@ -330,8 +337,11 @@ func (s *resumableSession) eTagOK(res *http.Response) bool {
 	return false
 }
 
-func (s *resumableSession) setHTTPHeaders(req *http.Request) {
+func (s *resumableSession) setHTTPHeaders(req *http.Request, stripAuth bool) {
 	for k, v := range s.Headers {
+		if stripAuth && k == "Authorization" {
+			continue
+		}
 		for _, e := range v {
 			req.Header.Add(k, e)
 		}

From 2438736f65b23f4feb6542be3e9ac33ee35d37dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 20 Apr 2016 14:10:30 +0200
Subject: [PATCH 0135/1304] functional tests: fix detectChanges function

When we did the refactoring of the CI build script, we inverted the
condition that checks if we're in origin/master to always run the tests
in that case. That caused tests not running on the master branch
anymore.
---
 tests/build-and-run-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index 5a2363da9e..536754b03e 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -166,7 +166,7 @@ function buildFolder {
 function detectChanges {
     HEAD=`git rev-parse HEAD`
     MASTER=`git rev-parse origin/master`
-    if [[ ${HEAD} != ${MASTER} ]]; then
+    if [[ ${HEAD} == ${MASTER} ]]; then
         SRC_CHANGES=1
         DOC_CHANGES=1
     elif [[ ${SRC_CHANGES} -eq 0 && ${DOC_CHANGES} -eq 0 ]]; then

From 81a40aee87082c0ce4af8f594cdf2fb093b1c03b Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Mon, 18 Apr 2016 12:45:47 +0300
Subject: [PATCH 0136/1304] tests: rename "Semaphore" to "Semaphore CI system"

To prevent confusion, usage of "Semaphore" is changed to "Semaphore CI system"
---
 tests/README.md              |  8 ++++----
 tests/build-and-run-tests.sh | 10 +++++-----
 tests/install-deps.sh        |  6 +++---
 tests/rkt_userns_test.go     |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index f2e062422a..296803a5eb 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -3,14 +3,14 @@
 This directory contains a set of functional tests for rkt.
 The tests use [gexpect](https://github.com/coreos/gexpect) to spawn various `rkt run` commands and look for expected output.
 
-## Semaphore
+## Semaphore Continuous Integration System
 
-The tests run on the [Semaphore](https://semaphoreci.com/) CI system through the [`rktbot`](https://semaphoreci.com/rktbot) user, which is part of the [`coreos`](https://semaphoreci.com/coreos/) org on Semaphore.
+The tests run on the [Semaphore CI system](https://semaphoreci.com/) through the [`rktbot`](https://semaphoreci.com/rktbot) user, which is part of the [`coreos`](https://semaphoreci.com/coreos/) org on Semaphore CI system.
 This user is authorized against the corresponding [`rktbot`](https://github.com/rktbot) GitHub account.
 The credentials for `rktbot` are currently managed by CoreOS.
 
-The tests are executed on Semaphore at each Pull Request (PR).
-Each GitHub PR page should have a link to the [test results on Semaphore](https://semaphoreci.com/coreos/rkt).
+The tests are executed on Semaphore CI system at each Pull Request (PR).
+Each GitHub PR page should have a link to the [test results on Semaphore CI](https://semaphoreci.com/coreos/rkt).
 
 Developers can disable the tests by adding `[skip ci]` in the last commit message of the PR.
 
diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index b1b0542200..bb60c7b982 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -37,17 +37,17 @@ function getBranchingPoint {
             <(git rev-list --first-parent "${2:-$2}") | head -1
 }
 
-# Configure SemaphoreCI environment.
-function semaphoreConfiguration {
+# Configure Semaphore CI environment.
+function semaphoreCIConfiguration {
     # We might not need to run functional tests or process docs.
     # This is best-effort; || true ensures this does not affect test outcome
-    # First, ensure origin is updated - semaphore can do some weird caching
+    # First, ensure origin is updated - Semaphore CI system can do some weird caching
     git fetch || true
     BRANCHING_POINT=$(getBranchingPoint HEAD origin/master)
     SRC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..${BRANCHING_POINT} | grep -cEv ${DOC_CHANGE_PATTERN}) || true
     DOC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..${BRANCHING_POINT} | grep -cE ${DOC_CHANGE_PATTERN}) || true
 
-    # Set up go environment on semaphore
+    # Set up go environment on Semaphore CI
     if [ -f /opt/change-go-version.sh ]; then
         . /opt/change-go-version.sh
         change-go-version 1.5
@@ -242,7 +242,7 @@ function main {
 
     # https://semaphoreci.com/docs/available-environment-variables.html
     if [ "${SEMAPHORE-}" == true ] ; then
-        semaphoreConfiguration
+        semaphoreCIConfiguration
     fi
 
     prepareBuildEnv
diff --git a/tests/install-deps.sh b/tests/install-deps.sh
index 101435b374..dab8feda62 100755
--- a/tests/install-deps.sh
+++ b/tests/install-deps.sh
@@ -15,10 +15,10 @@ fi
 if [ "${CI-}" == true ] ; then
 	# https://semaphoreci.com/
 	if [ "${SEMAPHORE-}" == true ] ; then
-		# Most dependencies are already installed on Semaphore.
+		# Most dependencies are already installed on Semaphore CI system.
 		# Here we can install any missing dependencies. Whenever
-		# Semaphore installs more dependencies on their platform,
-		# they should be removed from here to save time.
+		# Semaphore CI system installs more dependencies on their
+		# platform, they should be removed from here to save time.
 
 		# If there is some dependency to install then
 		# uncomment the following line and add "sudo apt-get
diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
index 10697979db..a1509c3988 100644
--- a/tests/rkt_userns_test.go
+++ b/tests/rkt_userns_test.go
@@ -46,7 +46,7 @@ var usernsTests = []struct {
 		"", // no check: it could be 0 but also the gid of 'rkt', see https://github.com/coreos/rkt/pull/1452
 	},
 	// TODO test with overlay fs too. We don't test it for now because
-	// Semaphore doesn't support it.
+	// Semaphore CI system doesn't support it.
 }
 
 func TestUserns(t *testing.T) {

From cba545f421f3229f63cad76a8afeb9fce5720acb Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Wed, 20 Apr 2016 15:07:14 +0200
Subject: [PATCH 0137/1304] tests: simplify Semaphore CI references

---
 tests/README.md              | 6 +++---
 tests/build-and-run-tests.sh | 4 ++--
 tests/install-deps.sh        | 4 ++--
 tests/rkt_userns_test.go     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 296803a5eb..9b4c3dd24f 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -5,12 +5,12 @@ The tests use [gexpect](https://github.com/coreos/gexpect) to spawn various `rkt
 
 ## Semaphore Continuous Integration System
 
-The tests run on the [Semaphore CI system](https://semaphoreci.com/) through the [`rktbot`](https://semaphoreci.com/rktbot) user, which is part of the [`coreos`](https://semaphoreci.com/coreos/) org on Semaphore CI system.
+The tests run on the [Semaphore CI system](https://semaphoreci.com/) through the [`rktbot`](https://semaphoreci.com/rktbot) user, which is part of the [`coreos`](https://semaphoreci.com/coreos/) org on Semaphore.
 This user is authorized against the corresponding [`rktbot`](https://github.com/rktbot) GitHub account.
 The credentials for `rktbot` are currently managed by CoreOS.
 
-The tests are executed on Semaphore CI system at each Pull Request (PR).
-Each GitHub PR page should have a link to the [test results on Semaphore CI](https://semaphoreci.com/coreos/rkt).
+The tests are executed on Semaphore at each Pull Request (PR).
+Each GitHub PR page should have a link to the [test results on Semaphore](https://semaphoreci.com/coreos/rkt).
 
 Developers can disable the tests by adding `[skip ci]` in the last commit message of the PR.
 
diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index bb60c7b982..e4c13f1122 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -41,13 +41,13 @@ function getBranchingPoint {
 function semaphoreCIConfiguration {
     # We might not need to run functional tests or process docs.
     # This is best-effort; || true ensures this does not affect test outcome
-    # First, ensure origin is updated - Semaphore CI system can do some weird caching
+    # First, ensure origin is updated - Semaphore can do some weird caching
     git fetch || true
     BRANCHING_POINT=$(getBranchingPoint HEAD origin/master)
     SRC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..${BRANCHING_POINT} | grep -cEv ${DOC_CHANGE_PATTERN}) || true
     DOC_CHANGES=$(git diff-tree --no-commit-id --name-only -r HEAD..${BRANCHING_POINT} | grep -cE ${DOC_CHANGE_PATTERN}) || true
 
-    # Set up go environment on Semaphore CI
+    # Set up go environment on Semaphore
     if [ -f /opt/change-go-version.sh ]; then
         . /opt/change-go-version.sh
         change-go-version 1.5
diff --git a/tests/install-deps.sh b/tests/install-deps.sh
index dab8feda62..1b6bff81f1 100755
--- a/tests/install-deps.sh
+++ b/tests/install-deps.sh
@@ -15,9 +15,9 @@ fi
 if [ "${CI-}" == true ] ; then
 	# https://semaphoreci.com/
 	if [ "${SEMAPHORE-}" == true ] ; then
-		# Most dependencies are already installed on Semaphore CI system.
+		# Most dependencies are already installed on Semaphore.
 		# Here we can install any missing dependencies. Whenever
-		# Semaphore CI system installs more dependencies on their
+		# Semaphore installs more dependencies on their
 		# platform, they should be removed from here to save time.
 
 		# If there is some dependency to install then
diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
index a1509c3988..0067b1c009 100644
--- a/tests/rkt_userns_test.go
+++ b/tests/rkt_userns_test.go
@@ -46,7 +46,7 @@ var usernsTests = []struct {
 		"", // no check: it could be 0 but also the gid of 'rkt', see https://github.com/coreos/rkt/pull/1452
 	},
 	// TODO test with overlay fs too. We don't test it for now because
-	// Semaphore CI system doesn't support it.
+	// the Semaphore CI system doesn't support it.
 }
 
 func TestUserns(t *testing.T) {

From 41948391606e5b3b03843f5b633f28dc47066077 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 6 Apr 2016 16:06:16 +0200
Subject: [PATCH 0138/1304] stage1/prepare-app: avoid recursive bind-mounts on
 /sys

Starting a pod with 100 apps is really slow. This patch fixes the
slowness.

prepare-app recursively bind-mounts /sys from stage1 to the stage2
(apps' rootfs). "Recursive" means it includes all the cgroup mounts
because they are in /sys/fs/cgroup. Moreover, rkt bind mounts some
cgroup knob files in the cgroup filesystem for enabling the memory and
cpu isolator.

The number of cgroup bind mounts in stage1 is linear with the number of
apps: O(n)

The number of cgroup bind mounts in stage2 is quadratic with the number
of apps: O(n^2)

With one app, I have 17 bind mounts related to cgroups. With 100 apps,
17 * 100 * 100 = 170.000 bind mounts.

For each change in the mount table, systemd is notified via inotify on
/proc/self/mountinfo and it checks the configuration of that mount in
/etc/systemd/system, /run/systemd/system, /usr/local/lib/systemd/system
and /usr/lib64/systemd/system.

systemd does about 30 syscalls per new mount notified via
/proc/self/mountinfo. That was 5.100.000 syscalls for mounting
cgroups in a 100-app pod.

This patch changes the logic to bind mount /sys:
- in the usual non-unified cgroup hierarchy: bind mount /sys
  non-recursively and instead bind-mount each cgroup hierarchy
  individually, non-recursively.
- in the unified cgroup hierarchy: keep the recursive bind mount because
  we will not have per-app bind mounts on knob files in this case.
---
 stage1/prepare-app/prepare-app.c | 71 +++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 30d88173f5..2731ef54df 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -21,6 +21,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/vfs.h>
+#include <dirent.h>
 
 #define err_out(_fmt, _args...)						\
 		fprintf(stderr, "Error: " _fmt "\n", ##_args);
@@ -50,6 +52,10 @@ static int exit_err;
 #define MACHINE_ID_LEN		lenof("0123456789abcdef0123456789ab")
 #define MACHINE_NAME_LEN	lenof("rkt-01234567-89ab-cdef-0123-456789ab")
 
+#ifndef CGROUP2_SUPER_MAGIC
+#define CGROUP2_SUPER_MAGIC 0x63677270
+#endif
+
 typedef struct _dir_op_t {
 	const char	*name;
 	mode_t		mode;
@@ -119,6 +125,66 @@ static int ensure_etc_hosts_exists(const char *root, int rootfd) {
 	return 0;
 }
 
+static void mount_sys(const char *root)
+{
+	char from[4096];
+	char to[4096];
+	struct statfs fs;
+	DIR *dir = NULL;
+	struct dirent *d;
+
+	pexit_if(statfs("/sys/fs/cgroup", &fs) != 0,
+	         "Cannot statfs /sys/fs/cgroup");
+	if (fs.f_type == (typeof(fs.f_type)) CGROUP2_SUPER_MAGIC) {
+		/* With the unified cgroup hierarchy, recursive bind mounts
+		 * are fine. */
+		exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
+			"Path too long: \"%s\"", to);
+		pexit_if(mount("/sys", to, "bind",
+			       MS_BIND | MS_REC, "NULL") == -1,
+				"Mounting \"%s\" on \"%s\" failed", "/sys", to);
+		return;
+	}
+
+	/* With cgroup-v1, rkt and systemd-nspawn add more cgroup
+	 * bind-mounts to control which files are read-only. To avoid
+	 * a quadratic progression, prepare-app does not bind mount
+	 * /sys recursively. See:
+	 * https://github.com/coreos/rkt/issues/2351 */
+	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
+		"Path too long: \"%s\"", to);
+	pexit_if(mount("/sys", to, "bind",
+		       MS_BIND, "NULL") == -1,
+			"Mounting \"%s\" on \"%s\" failed", "/sys", to);
+
+	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys/fs/cgroup") >= sizeof(to),
+		"Path too long: \"%s\"", to);
+	pexit_if(mount("/sys/fs/cgroup", to, "bind",
+		       MS_BIND, "NULL") == -1,
+			"Mounting \"%s\" on \"%s\" failed", "/sys/fs/cgroup", to);
+
+	pexit_if(!(dir = opendir(to)), "Failed to open directory \"%s\"", to)
+	errno = 0;
+	while ((d = readdir(dir))) {
+		if (d->d_type != DT_DIR)
+			continue;
+		if (strcmp(d->d_name, ".") == 0)
+			continue;
+		if (strcmp(d->d_name, "..") == 0)
+			continue;
+
+		exit_if(snprintf(from, sizeof(from), "/sys/fs/cgroup/%s", d->d_name) >= sizeof(from),
+			"Path too long: \"%s\"", from);
+		exit_if(snprintf(to, sizeof(to), "%s/sys/fs/cgroup/%s", root, d->d_name) >= sizeof(to),
+			"Path too long: \"%s\"", to);
+		pexit_if(mount(from, to, "bind",
+			       MS_BIND, "NULL") == -1,
+				"Mounting \"%s\" on \"%s\" failed", from, to);
+	}
+	pexit_if(errno != 0, "Failed to read directory \"%s\"", to);
+	pexit_if(closedir(dir) != 0, "Failed to close directory");
+}
+
 int main(int argc, char *argv[])
 {
 	static const char *unlink_paths[] = {
@@ -152,10 +218,10 @@ int main(int argc, char *argv[])
 	};
 	static const mount_point dirs_mount_table[] = {
 		{ "/proc", "/proc", "bind", NULL, MS_BIND|MS_REC },
-		{ "/sys", "/sys", "bind", NULL, MS_BIND|MS_REC },
 		{ "/dev/shm", "/dev/shm", "bind", NULL, MS_BIND },
 		{ "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND },
 		{ "/run/systemd/journal", "/run/systemd/journal", "bind", NULL, MS_BIND },
+		/* /sys is handled separately */
 	};
 	static const mount_point files_mount_table[] = {
 		{ "/etc/rkt-resolv.conf", "/etc/resolv.conf", "bind", NULL, MS_BIND },
@@ -260,6 +326,9 @@ int main(int argc, char *argv[])
 				"Mounting \"%s\" on \"%s\" failed", mnt->source, to);
 	}
 
+	/* Bind mount /sys: handled differently, depending on cgroups */
+	mount_sys(root);
+
 	/* Bind mount files, if the source exists */
 	for (i = 0; i < nelems(files_mount_table); i++) {
 		const mount_point *mnt = &files_mount_table[i];

From cb2047f12266ea399fe062b6fe50e2be0b0092c0 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Mon, 18 Apr 2016 16:32:31 +0200
Subject: [PATCH 0139/1304] doc/CONTRIBUTING: enhace PR and issue workflow

Currently it is unspecified what a contributor is supposed to do after
submitting a pull request. This explains further actions after
the pull request submission.

Also rkt has some critical runtime dependency, namly systemd, the
kernel, and the operation system. This introduces a github issue template.

Fixes #2406
---
 .github/ISSUE_TEMPLATE.md      | 21 +++++++++++++++++++++
 CONTRIBUTING.md                | 31 +++++++++++++++++++++++++++----
 Documentation/devel/release.md | 27 ++++++++++++++++++++++++++-
 3 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..44ab977c7f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,21 @@
+**rkt**
+
+output of `rkt version`
+
+**Kernel**
+
+output of `uname -srm`
+
+**Distribution**
+
+content of `/etc/os-release`
+
+**systemd**
+
+output of `systemctl --version`
+
+**What did you do?**
+
+**What did you expect to see?**
+
+**What did you see instead?**
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 72d14470d6..868581b8bf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,14 +5,14 @@ GitHub pull requests.  This document outlines some of the conventions on
 development workflow, commit message formatting, contact points and other
 resources to make it easier to get your contribution accepted.
 
-# Certificate of Origin
+### Certificate of Origin
 
 By contributing to this project you agree to the Developer Certificate of
 Origin (DCO). This document was created by the Linux Kernel community and is a
 simple statement that you, as a contributor, have the legal right to make the
 contribution. See the [DCO](DCO) file for details.
 
-# Email and Chat
+### Email and Chat
 
 The project has a mailing list and two discussion channels in IRC:
 - Email: [rkt-dev](https://groups.google.com/forum/#!forum/rkt-dev)
@@ -22,13 +22,13 @@ The project has a mailing list and two discussion channels in IRC:
 Please avoid emailing maintainers found in the MAINTAINERS file directly. They
 are very busy and read the mailing lists.
 
-## Getting Started
+### Getting Started
 
 - Fork the repository on GitHub
 - Read the [README](README.md) for build and test instructions
 - Play with the project, submit bugs, submit patches!
 
-## Contribution Flow
+### Contribution Flow
 
 This is a rough outline of what a contributor's workflow looks like:
 
@@ -38,6 +38,14 @@ This is a rough outline of what a contributor's workflow looks like:
 - Push your changes to a topic branch in your fork of the repository.
 - Make sure the tests pass, and add any new tests as appropriate.
 - Submit a pull request to the original repository.
+- Submit a comment with the sole content "@reviewer PTAL" (please take a look) in GitHub
+  and replace "@reviewer" with the correct recipient.
+- When addressing pull request review comments add new commits to the existing pull request or,
+  if the added commits are about the same size as the previous commits,
+  squash them into the existing commits.
+- Once your PR is labelled as "reviewed/lgtm" squash the addressed commits in one commit.
+- If your PR addresses multiple subsystems reorganize your PR and create multiple commits per subsystem.
+- Your contribution is ready to be merged.
 
 Thanks for your contributions!
 
@@ -76,3 +84,18 @@ The first line is the subject and should be no longer than 70 characters, the
 second line is always blank, and other lines should be wrapped at 80 characters.
 This allows the message to be easier to read on GitHub as well as in various
 git tools.
+
+### Format of the Pull Request
+
+The pull request title and the first paragraph of the pull request description
+is being used to generate the changelog of the next release.
+
+The convention follows the same rules as for commit messages. The PR title reflects the
+what and the first paragraph of the PR description reflects the why.
+In most cases one can reuse the commit title as the PR title
+and the commit messages as the PR description for the PR.
+
+If your PR includes more commits spanning mulitple subsystems one should change the PR title
+and the first paragraph of the PR description to reflect a summary of all changes involved.
+
+Do not add entries in the changelog yourself. They will be overwritten when creating a new release.
diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index 357c9adcef..d6950fcfd6 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -98,4 +98,29 @@ Make sure to include a list of authors that contributed since the previous relea
 	git log v1.1.0..v1.2.0 --pretty=format:"%an" | sort | uniq | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $#\n#'
 ```
 
-- Prepare CHANGELOG.md for the next release: add a "vUNRELEASED" section. The CHANGELOG should be updated alongside the code as pull requests are merged into master, so that the releaser does not need to start from scratch.
+Add `CHANGELOG.md` entries:
+
+- Add a new version headline and a meaningful release summary:
+
+```
+## v1.2.0
+
+This release includes a number of new features and bugfixes like a new config subcommand, man page, and bash completion generation during build time.
+```
+
+- Execute `scripts/changelog.sh`
+- Copy/Paste the generated entries into `CHANGELOG.md`
+- Group the generated entries according to the following headlines:
+
+```
+#### New features and UX changes
+...
+#### Improved documentation
+...
+#### Bug fixes
+...
+#### Other changes
+...
+```
+
+- Correct/fix the changelog entries if necessary.

From 6db56deda9cb47943fc0892e4e2a0904304a6d58 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Mon, 18 Apr 2016 16:58:35 +0200
Subject: [PATCH 0140/1304] scripts: add changelog generator

This adds a new script changelog.sh to generate changelog
entries automatically.

Fixes #2433
---
 scripts/changelog.sh | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100755 scripts/changelog.sh

diff --git a/scripts/changelog.sh b/scripts/changelog.sh
new file mode 100755
index 0000000000..65bab0d84d
--- /dev/null
+++ b/scripts/changelog.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+#
+# Create a changelog.
+#
+# The env variable RANGE specifies the range of commits to be searched for the changelog.
+# If unset the latest tag until origin/master will be set.
+#
+# The env variable GITHUB_AUTH can be set in the form user:token to specify a GitHub
+# personal access token. Otherwise one could run into GitHub rate limits.
+# Go to https://github.com/settings/tokens to generate a token.
+#
+set -e
+
+jq --version >/dev/null 2>&1 || {
+    echo "could not find jq (JSON command line processor), is it installed?"
+    exit 255
+}
+
+if [ -z "${RANGE}" ]; then
+    LATEST_TAG=$(git describe --abbrev=0)
+    RANGE="${LATEST_TAG}..origin/master"
+fi
+
+if [ ! -z "${GITHUB_AUTH}" ]; then
+    GITHUB_AUTH="-u ${GITHUB_AUTH}"
+fi
+
+for pr in $(git log --pretty=%s --first-parent "${RANGE}" | egrep -o '#\w+' | tr -d '#'); do
+    body=$(curl -s "${GITHUB_AUTH}" https://api.github.com/repos/coreos/rkt/pulls/"${pr}" | \
+                  jq -r '{title: .title, body: .body}')
+
+    echo "-" \
+         "$(echo "${body}" | jq -r .title | sed 's/\.$//g')" \
+         "([#${pr}](https://github.com/coreos/rkt/pull/$pr))." \
+         "$(echo "${body}" | jq -r .body | awk -v RS='\r\n\r\n' NR==1 | tr -d '\r')"
+done

From 31f3fc1dc6e2d765bf78d3990476394745bf77aa Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 20 Apr 2016 15:13:54 +0200
Subject: [PATCH 0141/1304] docs & scripts: fix rir one liners

* add resolv.conf volume/mount
* use dependency scripts in one liners
* remove duplicate packages
* configure rkt without tpm
---
 Documentation/rkt-build-rkt.md     | 8 ++++++--
 scripts/install-deps-debian-sid.sh | 6 ++++--
 scripts/install-deps-fedora-22.sh  | 6 ++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Documentation/rkt-build-rkt.md b/Documentation/rkt-build-rkt.md
index 71e3d405bf..133979c28e 100644
--- a/Documentation/rkt-build-rkt.md
+++ b/Documentation/rkt-build-rkt.md
@@ -76,23 +76,27 @@ The build output will be in `${SRC_DIR}/build-rkt-${RKT_VERSION}+git`.
 ## Debian Sid
 ```
 rkt run \
+    --volume rslvconf,kind=host,source=/etc/resolv.conf
+    --mount volume=rslvconf,target=/etc/resolv.conf
     --volume src-dir,kind=host,source=$SRC_DIR \
     --mount volume=src-dir,target=/opt/rkt \
     --interactive \
     --insecure-options=image \
     docker://debian:sid \
     --exec /bin/bash \
-    -- -c 'apt-get update && apt-get install -y --no-install-recommends ca-certificates gcc libc6-dev make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev && update-ca-certificates && cd /opt/rkt && ./autogen.sh && ./configure && make'
+    -- -c 'cd /opt/rkt && ./scripts/install-deps-debian-sid.sh && ./autogen.sh && ./configure --disable-tpm && make'
 ```
 
 ## Fedora 22
 ```
 rkt run \
+    --volume rslvconf,kind=host,source=/etc/resolv.conf
+    --mount volume=rslvconf,target=/etc/resolv.conf
     --volume src-dir,kind=host,source=$SRC_DIR \
     --mount volume=src-dir,target=/opt/rkt \
     --interactive \
     --insecure-options=image \
     docker://fedora:22 \
     --exec /bin/bash \
-    -- -c 'dnf install -y make gcc glibc-devel glibc-static cpio squashfs-tools gpg autoconf make automake golang file git wget tar xz patch bc hostname findutils openssl libacl-devel && cd /opt/rkt && ./autogen.sh && ./configure && make'
+    -- -c 'cd /opt/rkt && ./scripts/install-deps-fedora-22.sh && ./autogen.sh && ./configure --disable-tpm && make'
 ```
diff --git a/scripts/install-deps-debian-sid.sh b/scripts/install-deps-debian-sid.sh
index d0794b6c11..0db2db2ed5 100755
--- a/scripts/install-deps-debian-sid.sh
+++ b/scripts/install-deps-debian-sid.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 set -e
-export DEBIAN_FRONTEND=noninteractive
 
+DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev"
+
+export DEBIAN_FRONTEND=noninteractive
 apt-get update
-apt-get install -y --no-install-recommends ca-certificates gcc libc6-dev make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev
+apt-get install -y --no-install-recommends ${DEBIAN_SID_DEPS}
diff --git a/scripts/install-deps-fedora-22.sh b/scripts/install-deps-fedora-22.sh
index 4fe11fb8df..d29bedfc16 100755
--- a/scripts/install-deps-fedora-22.sh
+++ b/scripts/install-deps-fedora-22.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
-set -xe
+set -e
 
-dnf install -y make gcc glibc-devel glibc-static cpio squashfs-tools gpg autoconf make automake golang file git wget tar xz patch bc hostname findutils openssl libacl-devel openssl-devel
+FEDORA22_DEPS="make gcc glibc-devel glibc-static cpio squashfs-tools gpg autoconf automake golang file git wget tar xz patch bc hostname findutils openssl libacl-devel openssl-devel"
+
+dnf install -y ${FEDORA22_DEPS}

From ddd59b8935a3a9ee7c031e753642ea7863526fde Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 20 Apr 2016 14:28:38 -0400
Subject: [PATCH 0142/1304] benchmarks: pulled in code from
 github.com/dgonyeo/rkt-monitor

Added the tests/benchmarks directory, which includes the code for a
golang binary that can start rkt and watch its resource usage. This
directory also includes bash scripts for generating a handful of test
scenarios.
---
 tests/rkt-monitor/README.md              |  43 ++++
 tests/rkt-monitor/build                  |   9 +
 tests/rkt-monitor/build-cpu-stresser.sh  |  26 +++
 tests/rkt-monitor/build-log-stresser.sh  |  26 +++
 tests/rkt-monitor/build-mem-stresser.sh  |  26 +++
 tests/rkt-monitor/build-too-many-apps.sh |  91 ++++++++
 tests/rkt-monitor/cpu-stresser/main.go   |  24 ++
 tests/rkt-monitor/log-stresser/main.go   |  26 +++
 tests/rkt-monitor/main.go                | 285 +++++++++++++++++++++++
 tests/rkt-monitor/mem-stresser/main.go   |  29 +++
 tests/rkt-monitor/sleeper/main.go        |  25 ++
 11 files changed, 610 insertions(+)
 create mode 100644 tests/rkt-monitor/README.md
 create mode 100755 tests/rkt-monitor/build
 create mode 100755 tests/rkt-monitor/build-cpu-stresser.sh
 create mode 100755 tests/rkt-monitor/build-log-stresser.sh
 create mode 100755 tests/rkt-monitor/build-mem-stresser.sh
 create mode 100755 tests/rkt-monitor/build-too-many-apps.sh
 create mode 100644 tests/rkt-monitor/cpu-stresser/main.go
 create mode 100644 tests/rkt-monitor/log-stresser/main.go
 create mode 100644 tests/rkt-monitor/main.go
 create mode 100644 tests/rkt-monitor/mem-stresser/main.go
 create mode 100644 tests/rkt-monitor/sleeper/main.go

diff --git a/tests/rkt-monitor/README.md b/tests/rkt-monitor/README.md
new file mode 100644
index 0000000000..e600f5d746
--- /dev/null
+++ b/tests/rkt-monitor/README.md
@@ -0,0 +1,43 @@
+# rkt-monitor
+
+This is a small go utility intended to monitor the CPU and memory usage of rkt
+and its children processes. This is accomplished by exec'ing rkt, reading proc
+once a second for a specified duration, and printing the results.
+
+This utility has a handful of flags:
+
+```
+Usage:
+  rkt-monitor IMAGE [flags]
+
+Examples:
+rkt-monitor mem-stresser.aci -v -d 30s
+
+Flags:
+  -d, --duration="10s": How long to run the ACI
+  -h, --help[=false]: help for rkt-monitor
+  -o, --show-output[=false]: Display rkt's stdout and stderr
+  -v, --verbose[=false]: Print current usage every second
+```
+
+Some acbuild scripts and golang source code is provided to build ACIs that
+attempt to eat up resources in different ways.
+
+An example usage:
+
+```
+derek@rokot ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> ./build-log-stresser.sh 
+Building worker...
+Beginning build with an empty ACI
+Setting name of ACI to appc.io/rkt-log-stresser
+Copying host:worker-binary to aci:/worker
+Setting exec command [/worker]
+Writing ACI to log-stresser.aci
+Ending the build
+derek@rokot ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor log-stresser.aci 
+[sudo] password for derek: 
+rkt(13261): seconds alive: 10  avg CPU: 33.113897%  avg Mem: 4 kB  peak Mem: 4 kB
+systemd(13302): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
+systemd-journal(13303): seconds alive: 9  avg CPU: 68.004584%  avg Mem: 7 mB  peak Mem: 7 mB
+worker(13307): seconds alive: 9  avg CPU: 13.004088%  avg Mem: 1 mB  peak Mem: 1 mB
+```
diff --git a/tests/rkt-monitor/build b/tests/rkt-monitor/build
new file mode 100755
index 0000000000..5189fc5d44
--- /dev/null
+++ b/tests/rkt-monitor/build
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+
+export GOPATH=${PWD}/../../Godeps/_workspace
+
+eval $(go env)
+export GOOS GOARCH
+
+go build -o rkt-monitor
diff --git a/tests/rkt-monitor/build-cpu-stresser.sh b/tests/rkt-monitor/build-cpu-stresser.sh
new file mode 100755
index 0000000000..a39a3d2d1d
--- /dev/null
+++ b/tests/rkt-monitor/build-cpu-stresser.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+
+echo "Building worker..."
+CGO_ENABLED=0 GOOS=linux go build -o worker-binary -a -tags netgo -ldflags '-w' ./cpu-stresser/main.go
+
+rmWorker() { rm worker-binary; }
+acbuildEnd() {
+    rmWorker
+    export EXIT=$?
+    acbuild --debug end && exit $EXIT
+}
+
+trap rmWorker EXIT
+
+acbuild --debug begin
+
+trap acbuildEnd EXIT
+
+acbuild --debug set-name appc.io/rkt-cpu-stresser
+
+acbuild --debug copy worker-binary /worker
+
+acbuild --debug set-exec -- /worker
+
+acbuild --debug write --overwrite cpu-stresser.aci
diff --git a/tests/rkt-monitor/build-log-stresser.sh b/tests/rkt-monitor/build-log-stresser.sh
new file mode 100755
index 0000000000..692d120052
--- /dev/null
+++ b/tests/rkt-monitor/build-log-stresser.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+
+echo "Building worker..."
+CGO_ENABLED=0 GOOS=linux go build -o worker-binary -a -tags netgo -ldflags '-w' ./log-stresser/main.go
+
+rmWorker() { rm worker-binary; }
+acbuildEnd() {
+    rmWorker
+    export EXIT=$?
+    acbuild --debug end && exit $EXIT
+}
+
+trap rmWorker EXIT
+
+acbuild --debug begin
+
+trap acbuildEnd EXIT
+
+acbuild --debug set-name appc.io/rkt-log-stresser
+
+acbuild --debug copy worker-binary /worker
+
+acbuild --debug set-exec -- /worker
+
+acbuild --debug write --overwrite log-stresser.aci
diff --git a/tests/rkt-monitor/build-mem-stresser.sh b/tests/rkt-monitor/build-mem-stresser.sh
new file mode 100755
index 0000000000..fa1cfd4048
--- /dev/null
+++ b/tests/rkt-monitor/build-mem-stresser.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+
+echo "Building worker..."
+CGO_ENABLED=0 GOOS=linux go build -o worker-binary -a -tags netgo -ldflags '-w' ./mem-stresser/main.go
+
+rmWorker() { rm worker-binary; }
+acbuildEnd() {
+    rmWorker
+    export EXIT=$?
+    acbuild --debug end && exit $EXIT
+}
+
+trap rmWorker EXIT
+
+acbuild --debug begin
+
+trap acbuildEnd EXIT
+
+acbuild --debug set-name appc.io/rkt-mem-stresser
+
+acbuild --debug copy worker-binary /worker
+
+acbuild --debug set-exec -- /worker
+
+acbuild --debug write --overwrite mem-stresser.aci
diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
new file mode 100755
index 0000000000..258d7ee51b
--- /dev/null
+++ b/tests/rkt-monitor/build-too-many-apps.sh
@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+
+set -e
+
+NUM_APPS=100
+
+# Build worker binary
+
+echo "Building worker binary"
+CGO_ENABLED=0 GOOS=linux go build -o worker-binary -a -tags netgo -ldflags '-w' ./sleeper/main.go
+
+# Generate worker images
+
+rmWorker() { rm worker-binary; }
+acbuildEnd() {
+    rmWorker
+    export EXIT=$?
+    acbuild --debug end && exit $EXIT
+}
+trap acbuildEnd EXIT
+
+mkdir -p ./too-many-apps-images
+
+for i in $(seq 1 ${NUM_APPS});
+do
+    NAME="worker-${i}"
+
+    echo "Building image ${NAME}"
+
+    acbuild begin
+    acbuild copy worker-binary /worker-binary
+    acbuild set-exec /worker-binary
+    acbuild set-name ${NAME}
+    acbuild write --overwrite too-many-apps-images/${NAME}.aci
+    acbuild end
+done
+
+trap rmWorker EXIT
+
+# Generate pod manifest
+
+echo "Generating pod manifest"
+
+OUTPUT=${PWD}/too-many-apps.podmanifest
+
+cat <<EOF >${OUTPUT}
+{
+    "acVersion": "0.7.4",
+    "acKind": "PodManifest",
+    "apps": [
+EOF
+
+appSection() {
+    SHA512=$(gunzip too-many-apps-images/${1}.aci --stdout|sha512sum)
+    SHA512="sha512-${SHA512:0:32}"
+
+cat <<EOF >>$2
+{
+    "name": "$1",
+    "image": {
+        "name": "$1",
+        "id": "$SHA512",
+        "labels": [
+            {
+                "name":  "arch",
+                "value": "amd64"
+            },
+            {
+                "name":  "os",
+                "value": "linux"
+            }
+        ]
+    },
+    "app": {
+        "exec": [ "/worker-binary" ],
+        "group": "0",
+        "user": "0"
+    }
+}
+EOF
+}
+
+appSection "worker-1" ${OUTPUT}
+for i in $(seq 2 ${NUM_APPS});
+do
+    echo ',' >> ${OUTPUT}
+    appSection "worker-${i}" ${OUTPUT}
+done
+
+echo ']}' >> ${OUTPUT}
+
diff --git a/tests/rkt-monitor/cpu-stresser/main.go b/tests/rkt-monitor/cpu-stresser/main.go
new file mode 100644
index 0000000000..4874f5a888
--- /dev/null
+++ b/tests/rkt-monitor/cpu-stresser/main.go
@@ -0,0 +1,24 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+func main() {
+	for {
+		var x uint64
+		for i := 0; i < 1000000000; i++ {
+			x += uint64(i)
+		}
+	}
+}
diff --git a/tests/rkt-monitor/log-stresser/main.go b/tests/rkt-monitor/log-stresser/main.go
new file mode 100644
index 0000000000..af1ebc379d
--- /dev/null
+++ b/tests/rkt-monitor/log-stresser/main.go
@@ -0,0 +1,26 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"time"
+)
+
+func main() {
+	for {
+		fmt.Printf("%s\n", time.Now().Format("Mon Jan 2 15:04:05 -0700 MST 2006"))
+	}
+}
diff --git a/tests/rkt-monitor/main.go b/tests/rkt-monitor/main.go
new file mode 100644
index 0000000000..300a1cbf29
--- /dev/null
+++ b/tests/rkt-monitor/main.go
@@ -0,0 +1,285 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+	"os/signal"
+	"strconv"
+	"time"
+
+	"github.com/appc/spec/schema"
+	"github.com/shirou/gopsutil/process"
+	"github.com/spf13/cobra"
+)
+
+type ProcessStatus struct {
+	Pid  int32
+	Name string  // Name of process
+	CPU  float64 // Percent of CPU used since last check
+	VMS  uint64  // Virtual memory size
+	RSS  uint64  // Resident set size
+	Swap uint64  // Swap size
+}
+
+var (
+	pidMap map[int32]*process.Process
+
+	flagVerbose    bool
+	flagDuration   string
+	flagShowOutput bool
+
+	cmdRktMonitor = &cobra.Command{
+		Use:     "rkt-monitor IMAGE",
+		Short:   "Runs the specified ACI or pod manifest with rkt, and monitors rkt's usage",
+		Example: "rkt-monitor mem-stresser.aci -v -d 30s",
+		Run:     runRktMonitor,
+	}
+)
+
+func init() {
+	pidMap = make(map[int32]*process.Process)
+
+	cmdRktMonitor.Flags().BoolVarP(&flagVerbose, "verbose", "v", false, "Print current usage every second")
+	cmdRktMonitor.Flags().StringVarP(&flagDuration, "duration", "d", "10s", "How long to run the ACI")
+	cmdRktMonitor.Flags().BoolVarP(&flagShowOutput, "show-output", "o", false, "Display rkt's stdout and stderr")
+}
+
+func main() {
+	cmdRktMonitor.Execute()
+}
+
+func runRktMonitor(cmd *cobra.Command, args []string) {
+	if len(args) != 1 {
+		cmd.Usage()
+		os.Exit(1)
+	}
+
+	d, err := time.ParseDuration(flagDuration)
+	if err != nil {
+		fmt.Printf("%v\n", err)
+		os.Exit(1)
+	}
+
+	if os.Getuid() != 0 {
+		fmt.Printf("need to be root to run rkt images\n")
+		os.Exit(1)
+	}
+
+	f, err := os.Open(args[0])
+	if err != nil {
+		fmt.Printf("%v\n", err)
+		os.Exit(1)
+	}
+	decoder := json.NewDecoder(f)
+
+	podManifest := false
+	man := schema.PodManifest{}
+	err = decoder.Decode(&man)
+	if err == nil {
+		podManifest = true
+	}
+
+	var execCmd *exec.Cmd
+	if podManifest {
+		execCmd = exec.Command("rkt", "run", "--pod-manifest", args[0], "--net=host")
+	} else {
+		execCmd = exec.Command("rkt", "run", args[0], "--insecure-options=image", "--net=host")
+	}
+	if flagShowOutput {
+		execCmd.Stdout = os.Stdout
+		execCmd.Stderr = os.Stderr
+	}
+	err = execCmd.Start()
+	if err != nil {
+		fmt.Printf("%v\n", err)
+		os.Exit(1)
+	}
+
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt)
+	go func() {
+		for _ = range c {
+			err := killAllChildren(int32(execCmd.Process.Pid))
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
+			}
+			os.Exit(1)
+		}
+	}()
+
+	usages := make(map[int32][]*ProcessStatus)
+
+	timeToStop := time.Now().Add(d)
+	for time.Now().Before(timeToStop) {
+		usage, err := getUsage(int32(execCmd.Process.Pid))
+		if err != nil {
+			panic(err)
+		}
+		if flagVerbose {
+			printUsage(usage)
+		}
+
+		for _, ps := range usage {
+			usages[ps.Pid] = append(usages[ps.Pid], ps)
+		}
+
+		_, err = process.NewProcess(int32(execCmd.Process.Pid))
+		if err != nil {
+			// process.Process.IsRunning is not implemented yet
+			fmt.Fprintf(os.Stderr, "rkt exited prematurely\n")
+			break
+		}
+
+		time.Sleep(time.Second)
+	}
+
+	err = killAllChildren(int32(execCmd.Process.Pid))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
+	}
+
+	for _, processHistory := range usages {
+		var avgCPU float64
+		var avgMem uint64
+		var peakMem uint64
+
+		for _, p := range processHistory {
+			avgCPU += p.CPU
+			avgMem += p.RSS
+			if peakMem < p.RSS {
+				peakMem = p.RSS
+			}
+		}
+
+		avgCPU = avgCPU / float64(len(processHistory))
+		avgMem = avgMem / uint64(len(processHistory))
+
+		fmt.Printf("%s(%d): seconds alive: %d  avg CPU: %f%%  avg Mem: %s  peak Mem: %s\n", processHistory[0].Name, processHistory[0].Pid, len(processHistory), avgCPU, formatSize(avgMem), formatSize(peakMem))
+	}
+}
+
+func killAllChildren(pid int32) error {
+	p, err := process.NewProcess(pid)
+	if err != nil {
+		return err
+	}
+	processes := []*process.Process{p}
+	for i := 0; i < len(processes); i++ {
+		children, err := processes[i].Children()
+		if err != nil && err != process.ErrorNoChildren {
+			return err
+		}
+		processes = append(processes, children...)
+	}
+	for _, p := range processes {
+		osProcess, err := os.FindProcess(int(p.Pid))
+		if err != nil {
+			if err.Error() == "os: process already finished" {
+				continue
+			}
+			return err
+		}
+		err = osProcess.Kill()
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func getUsage(pid int32) ([]*ProcessStatus, error) {
+	var statuses []*ProcessStatus
+	pids := []int32{pid}
+	for i := 0; i < len(pids); i++ {
+		proc, ok := pidMap[pids[i]]
+		if !ok {
+			var err error
+			proc, err = process.NewProcess(pids[i])
+			if err != nil {
+				return nil, err
+			}
+			pidMap[pids[i]] = proc
+		}
+		s, err := getProcStatus(proc)
+		if err != nil {
+			return nil, err
+		}
+		statuses = append(statuses, s)
+
+		children, err := proc.Children()
+		if err != nil && err != process.ErrorNoChildren {
+			return nil, err
+		}
+
+	childloop:
+		for _, child := range children {
+			for _, p := range pids {
+				if p == child.Pid {
+					fmt.Printf("%d is in %#v\n", p, pids)
+					continue childloop
+				}
+			}
+			pids = append(pids, child.Pid)
+		}
+	}
+	return statuses, nil
+}
+
+func getProcStatus(p *process.Process) (*ProcessStatus, error) {
+	n, err := p.Name()
+	if err != nil {
+		return nil, err
+	}
+	c, err := p.Percent(0)
+	if err != nil {
+		return nil, err
+	}
+	m, err := p.MemoryInfo()
+	if err != nil {
+		return nil, err
+	}
+	return &ProcessStatus{
+		Pid:  p.Pid,
+		Name: n,
+		CPU:  c,
+		VMS:  m.VMS,
+		RSS:  m.RSS,
+		Swap: m.Swap,
+	}, nil
+}
+
+func formatSize(size uint64) string {
+	if size > 1024*1024*1024 {
+		return strconv.FormatUint(size/(1024*1024*1024), 10) + " gB"
+	}
+	if size > 1024*1024 {
+		return strconv.FormatUint(size/(1024*1024), 10) + " mB"
+	}
+	if size > 1024 {
+		return strconv.FormatUint(size/1024, 10) + " kB"
+	}
+	return strconv.FormatUint(size, 10) + " B"
+}
+
+func printUsage(statuses []*ProcessStatus) {
+	for _, s := range statuses {
+		fmt.Printf("%s(%d): Mem: %s CPU: %f\n", s.Name, s.Pid, formatSize(s.RSS), s.CPU)
+	}
+	fmt.Printf("\n")
+}
diff --git a/tests/rkt-monitor/mem-stresser/main.go b/tests/rkt-monitor/mem-stresser/main.go
new file mode 100644
index 0000000000..32d3c06787
--- /dev/null
+++ b/tests/rkt-monitor/mem-stresser/main.go
@@ -0,0 +1,29 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"time"
+)
+
+func main() {
+	var counter uint64
+	var numbers []uint64
+	for {
+		numbers = append(numbers, counter)
+		counter = counter + 1
+		time.Sleep(time.Nanosecond)
+	}
+}
diff --git a/tests/rkt-monitor/sleeper/main.go b/tests/rkt-monitor/sleeper/main.go
new file mode 100644
index 0000000000..4778638060
--- /dev/null
+++ b/tests/rkt-monitor/sleeper/main.go
@@ -0,0 +1,25 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"time"
+)
+
+func main() {
+	for {
+		time.Sleep(time.Hour)
+	}
+}

From 6ecb35546616bf55be8b68cd9f10aac619341464 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 20 Apr 2016 14:29:09 -0400
Subject: [PATCH 0143/1304] benchmarks: godeps for rkt-monitor

Vendored the dependencies necessary for rkt-monitor.
---
 Godeps/Godeps.json                            |   48 +
 .../src/github.com/StackExchange/wmi/LICENSE  |   20 +
 .../github.com/StackExchange/wmi/README.md    |    4 +
 .../src/github.com/StackExchange/wmi/wmi.go   |  416 +++
 .../src/github.com/go-ole/go-ole/.travis.yml  |    9 +
 .../src/github.com/go-ole/go-ole/ChangeLog.md |   49 +
 .../src/github.com/go-ole/go-ole/README.md    |   46 +
 .../src/github.com/go-ole/go-ole/appveyor.yml |   63 +
 .../src/github.com/go-ole/go-ole/com.go       |  329 ++
 .../src/github.com/go-ole/go-ole/com_func.go  |  174 ++
 .../src/github.com/go-ole/go-ole/connect.go   |  192 ++
 .../src/github.com/go-ole/go-ole/constants.go |  153 +
 .../src/github.com/go-ole/go-ole/error.go     |   51 +
 .../github.com/go-ole/go-ole/error_func.go    |    8 +
 .../github.com/go-ole/go-ole/error_windows.go |   24 +
 .../src/github.com/go-ole/go-ole/guid.go      |  118 +
 .../go-ole/go-ole/iconnectionpoint.go         |   20 +
 .../go-ole/go-ole/iconnectionpoint_func.go    |   21 +
 .../go-ole/go-ole/iconnectionpoint_windows.go |   43 +
 .../go-ole/iconnectionpointcontainer.go       |   17 +
 .../go-ole/iconnectionpointcontainer_func.go  |   11 +
 .../iconnectionpointcontainer_windows.go      |   25 +
 .../src/github.com/go-ole/go-ole/idispatch.go |   94 +
 .../go-ole/go-ole/idispatch_func.go           |   19 +
 .../go-ole/go-ole/idispatch_windows.go        |  193 ++
 .../github.com/go-ole/go-ole/ienumvariant.go  |   19 +
 .../go-ole/go-ole/ienumvariant_func.go        |   19 +
 .../go-ole/go-ole/ienumvariant_windows.go     |   63 +
 .../github.com/go-ole/go-ole/iinspectable.go  |   18 +
 .../go-ole/go-ole/iinspectable_func.go        |   15 +
 .../go-ole/go-ole/iinspectable_windows.go     |   72 +
 .../go-ole/go-ole/iprovideclassinfo.go        |   21 +
 .../go-ole/go-ole/iprovideclassinfo_func.go   |    7 +
 .../go-ole/iprovideclassinfo_windows.go       |   21 +
 .../src/github.com/go-ole/go-ole/itypeinfo.go |   34 +
 .../go-ole/go-ole/itypeinfo_func.go           |    7 +
 .../go-ole/go-ole/itypeinfo_windows.go        |   21 +
 .../src/github.com/go-ole/go-ole/iunknown.go  |   57 +
 .../github.com/go-ole/go-ole/iunknown_func.go |   19 +
 .../go-ole/go-ole/iunknown_windows.go         |   58 +
 .../src/github.com/go-ole/go-ole/ole.go       |  147 +
 .../go-ole/go-ole/oleutil/connection.go       |  100 +
 .../go-ole/go-ole/oleutil/connection_func.go  |   10 +
 .../go-ole/oleutil/connection_windows.go      |   57 +
 .../go-ole/go-ole/oleutil/go-get.go           |    6 +
 .../go-ole/go-ole/oleutil/oleutil.go          |   89 +
 .../src/github.com/go-ole/go-ole/safearray.go |   27 +
 .../go-ole/go-ole/safearray_func.go           |  211 ++
 .../go-ole/go-ole/safearray_windows.go        |  337 +++
 .../go-ole/go-ole/safearrayconversion.go      |  140 +
 .../go-ole/go-ole/safearrayslices.go          |   33 +
 .../src/github.com/go-ole/go-ole/utility.go   |  101 +
 .../src/github.com/go-ole/go-ole/variables.go |   16 +
 .../src/github.com/go-ole/go-ole/variant.go   |  105 +
 .../github.com/go-ole/go-ole/variant_386.go   |   11 +
 .../github.com/go-ole/go-ole/variant_amd64.go |   12 +
 .../src/github.com/go-ole/go-ole/vt_string.go |   58 +
 .../src/github.com/go-ole/go-ole/winrt.go     |   99 +
 .../src/github.com/go-ole/go-ole/winrt_doc.go |   36 +
 .../src/github.com/shirou/gopsutil/LICENSE    |   27 +
 .../src/github.com/shirou/gopsutil/cpu/cpu.go |   76 +
 .../shirou/gopsutil/cpu/cpu_darwin.go         |  106 +
 .../shirou/gopsutil/cpu/cpu_darwin_cgo.go     |  107 +
 .../shirou/gopsutil/cpu/cpu_darwin_nocgo.go   |   14 +
 .../shirou/gopsutil/cpu/cpu_freebsd.go        |  147 +
 .../shirou/gopsutil/cpu/cpu_linux.go          |  244 ++
 .../shirou/gopsutil/cpu/cpu_unix.go           |   59 +
 .../shirou/gopsutil/cpu/cpu_windows.go        |  105 +
 .../github.com/shirou/gopsutil/host/host.go   |   38 +
 .../shirou/gopsutil/host/host_darwin.go       |  152 +
 .../shirou/gopsutil/host/host_darwin_amd64.go |   19 +
 .../shirou/gopsutil/host/host_freebsd.go      |  196 ++
 .../gopsutil/host/host_freebsd_amd64.go       |   41 +
 .../shirou/gopsutil/host/host_linux.go        |  431 +++
 .../shirou/gopsutil/host/host_linux_386.go    |   44 +
 .../shirou/gopsutil/host/host_linux_amd64.go  |   42 +
 .../shirou/gopsutil/host/host_linux_arm.go    |   42 +
 .../shirou/gopsutil/host/host_windows.go      |  135 +
 .../shirou/gopsutil/host/types_darwin.go      |   17 +
 .../shirou/gopsutil/host/types_freebsd.go     |   43 +
 .../shirou/gopsutil/host/types_linux.go       |   45 +
 .../shirou/gopsutil/internal/common/binary.go |  634 ++++
 .../shirou/gopsutil/internal/common/common.go |  279 ++
 .../gopsutil/internal/common/common_darwin.go |   70 +
 .../internal/common/common_freebsd.go         |   70 +
 .../gopsutil/internal/common/common_linux.go  |    3 +
 .../gopsutil/internal/common/common_unix.go   |   66 +
 .../internal/common/common_windows.go         |  110 +
 .../src/github.com/shirou/gopsutil/mem/mem.go |   64 +
 .../shirou/gopsutil/mem/mem_darwin.go         |   69 +
 .../shirou/gopsutil/mem/mem_darwin_cgo.go     |   53 +
 .../shirou/gopsutil/mem/mem_darwin_nocgo.go   |   88 +
 .../shirou/gopsutil/mem/mem_freebsd.go        |  134 +
 .../shirou/gopsutil/mem/mem_linux.go          |  100 +
 .../shirou/gopsutil/mem/mem_windows.go        |   50 +
 .../src/github.com/shirou/gopsutil/net/net.go |  243 ++
 .../shirou/gopsutil/net/net_darwin.go         |  114 +
 .../shirou/gopsutil/net/net_freebsd.go        |  108 +
 .../shirou/gopsutil/net/net_linux.go          |  620 ++++
 .../shirou/gopsutil/net/net_unix.go           |   68 +
 .../shirou/gopsutil/net/net_windows.go        |  116 +
 .../shirou/gopsutil/process/process.go        |  167 ++
 .../shirou/gopsutil/process/process_darwin.go |  451 +++
 .../gopsutil/process/process_darwin_amd64.go  |  234 ++
 .../gopsutil/process/process_freebsd.go       |  336 +++
 .../gopsutil/process/process_freebsd_386.go   |  141 +
 .../gopsutil/process/process_freebsd_amd64.go |  192 ++
 .../shirou/gopsutil/process/process_linux.go  |  767 +++++
 .../gopsutil/process/process_linux_386.go     |    9 +
 .../gopsutil/process/process_linux_amd64.go   |    9 +
 .../gopsutil/process/process_linux_arm.go     |    9 +
 .../shirou/gopsutil/process/process_posix.go  |  117 +
 .../gopsutil/process/process_windows.go       |  357 +++
 .../shirou/gopsutil/process/types_darwin.go   |  160 +
 .../shirou/gopsutil/process/types_freebsd.go  |   95 +
 .../src/github.com/shirou/w32/AUTHORS         |   16 +
 .../src/github.com/shirou/w32/LICENSE         |   23 +
 .../src/github.com/shirou/w32/README.md       |   33 +
 .../src/github.com/shirou/w32/advapi32.go     |  299 ++
 .../src/github.com/shirou/w32/comctl32.go     |  109 +
 .../src/github.com/shirou/w32/comdlg32.go     |   38 +
 .../src/github.com/shirou/w32/constants.go    | 2661 +++++++++++++++++
 .../src/github.com/shirou/w32/dwmapi.go       |  254 ++
 .../src/github.com/shirou/w32/gdi32.go        |  509 ++++
 .../src/github.com/shirou/w32/gdiplus.go      |  175 ++
 .../src/github.com/shirou/w32/idispatch.go    |   43 +
 .../src/github.com/shirou/w32/istream.go      |   31 +
 .../src/github.com/shirou/w32/iunknown.go     |   27 +
 .../src/github.com/shirou/w32/kernel32.go     |  314 ++
 .../src/github.com/shirou/w32/ole32.go        |   63 +
 .../src/github.com/shirou/w32/oleaut32.go     |   48 +
 .../src/github.com/shirou/w32/opengl32.go     |   72 +
 .../src/github.com/shirou/w32/psapi.go        |   25 +
 .../src/github.com/shirou/w32/shell32.go      |  153 +
 .../src/github.com/shirou/w32/typedef.go      |  901 ++++++
 .../src/github.com/shirou/w32/user32.go       |  948 ++++++
 .../src/github.com/shirou/w32/utils.go        |  201 ++
 .../src/github.com/shirou/w32/vars.go         |   13 +
 138 files changed, 19382 insertions(+)
 create mode 100644 Godeps/_workspace/src/github.com/StackExchange/wmi/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/StackExchange/wmi/README.md
 create mode 100644 Godeps/_workspace/src/github.com/StackExchange/wmi/wmi.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/.travis.yml
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ChangeLog.md
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/README.md
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/appveyor.yml
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/com.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/com_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/connect.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/constants.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/error.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/error_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/error_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/guid.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ole.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/go-get.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/oleutil.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearray.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_func.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayconversion.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayslices.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/utility.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/variables.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/variant.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/variant_386.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/variant_amd64.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/vt_string.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/winrt.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/winrt_doc.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/binary.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_darwin.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_freebsd.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_linux.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_unix.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_freebsd.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/AUTHORS
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/README.md
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/advapi32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/comctl32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/comdlg32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/constants.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/dwmapi.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/gdi32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/gdiplus.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/idispatch.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/istream.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/iunknown.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/kernel32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/ole32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/oleaut32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/opengl32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/psapi.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/shell32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/typedef.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/user32.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/utils.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/w32/vars.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 403994f9ec..6bc5c2f33f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -17,6 +17,10 @@
 		"github.com/golang/protobuf/protoc-gen-go"
 	],
 	"Deps": [
+		{
+			"ImportPath": "github.com/StackExchange/wmi",
+			"Rev": "f3e2bae1e0cb5aef83e319133eabfee30013a4a5"
+		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/invoke",
 			"Comment": "v0.2.0-rc0",
@@ -340,6 +344,16 @@
 			"ImportPath": "github.com/dustin/go-humanize",
 			"Rev": "c20a8bde38c8f5ba06f6600edf473705c96829d1"
 		},
+		{
+			"ImportPath": "github.com/go-ole/go-ole",
+			"Comment": "v1.2.0-10-g572eabb",
+			"Rev": "572eabb84c424e76a0d39d31510dd7dfd62f70b2"
+		},
+		{
+			"ImportPath": "github.com/go-ole/go-ole/oleutil",
+			"Comment": "v1.2.0-10-g572eabb",
+			"Rev": "572eabb84c424e76a0d39d31510dd7dfd62f70b2"
+		},
 		{
 			"ImportPath": "github.com/godbus/dbus",
 			"Comment": "v3-6-ga1b8ba5",
@@ -421,6 +435,40 @@
 			"Comment": "v1.4-2-g300106c",
 			"Rev": "300106c228d52c8941d4b3de6054a6062a86dda3"
 		},
+		{
+			"ImportPath": "github.com/shirou/gopsutil/cpu",
+			"Comment": "v2.0.0-10-g9ef3410",
+			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+		},
+		{
+			"ImportPath": "github.com/shirou/gopsutil/host",
+			"Comment": "v2.0.0-10-g9ef3410",
+			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+		},
+		{
+			"ImportPath": "github.com/shirou/gopsutil/internal/common",
+			"Comment": "v2.0.0-10-g9ef3410",
+			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+		},
+		{
+			"ImportPath": "github.com/shirou/gopsutil/mem",
+			"Comment": "v2.0.0-10-g9ef3410",
+			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+		},
+		{
+			"ImportPath": "github.com/shirou/gopsutil/net",
+			"Comment": "v2.0.0-10-g9ef3410",
+			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+		},
+		{
+			"ImportPath": "github.com/shirou/gopsutil/process",
+			"Comment": "v2.0.0-10-g9ef3410",
+			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+		},
+		{
+			"ImportPath": "github.com/shirou/w32",
+			"Rev": "3c9377fc6748f222729a8270fe2775d149a249ad"
+		},
 		{
 			"ImportPath": "github.com/shurcooL/sanitized_anchor_name",
 			"Rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77"
diff --git a/Godeps/_workspace/src/github.com/StackExchange/wmi/LICENSE b/Godeps/_workspace/src/github.com/StackExchange/wmi/LICENSE
new file mode 100644
index 0000000000..ae80b67209
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/StackExchange/wmi/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Stack Exchange
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/StackExchange/wmi/README.md b/Godeps/_workspace/src/github.com/StackExchange/wmi/README.md
new file mode 100644
index 0000000000..3d5f67e149
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/StackExchange/wmi/README.md
@@ -0,0 +1,4 @@
+wmi
+===
+
+Package wmi provides a WQL interface for WMI on Windows.
diff --git a/Godeps/_workspace/src/github.com/StackExchange/wmi/wmi.go b/Godeps/_workspace/src/github.com/StackExchange/wmi/wmi.go
new file mode 100644
index 0000000000..b931ca57af
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/StackExchange/wmi/wmi.go
@@ -0,0 +1,416 @@
+// +build windows
+
+/*
+Package wmi provides a WQL interface for WMI on Windows.
+
+Example code to print names of running processes:
+
+	type Win32_Process struct {
+		Name string
+	}
+
+	func main() {
+		var dst []Win32_Process
+		q := wmi.CreateQuery(&dst, "")
+		err := wmi.Query(q, &dst)
+		if err != nil {
+			log.Fatal(err)
+		}
+		for i, v := range dst {
+			println(i, v.Name)
+		}
+	}
+
+*/
+package wmi
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"log"
+	"os"
+	"reflect"
+	"runtime"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/go-ole/go-ole"
+	"github.com/go-ole/go-ole/oleutil"
+)
+
+var l = log.New(os.Stdout, "", log.LstdFlags)
+
+var (
+	ErrInvalidEntityType = errors.New("wmi: invalid entity type")
+	lock                 sync.Mutex
+)
+
+// QueryNamespace invokes Query with the given namespace on the local machine.
+func QueryNamespace(query string, dst interface{}, namespace string) error {
+	return Query(query, dst, nil, namespace)
+}
+
+// Query runs the WQL query and appends the values to dst.
+//
+// dst must have type *[]S or *[]*S, for some struct type S. Fields selected in
+// the query must have the same name in dst. Supported types are all signed and
+// unsigned integers, time.Time, string, bool, or a pointer to one of those.
+// Array types are not supported.
+//
+// By default, the local machine and default namespace are used. These can be
+// changed using connectServerArgs. See
+// http://msdn.microsoft.com/en-us/library/aa393720.aspx for details.
+//
+// Query is a wrapper around DefaultClient.Query.
+func Query(query string, dst interface{}, connectServerArgs ...interface{}) error {
+	return DefaultClient.Query(query, dst, connectServerArgs...)
+}
+
+// A Client is an WMI query client.
+//
+// Its zero value (DefaultClient) is a usable client.
+type Client struct {
+	// NonePtrZero specifies if nil values for fields which aren't pointers
+	// should be returned as the field types zero value.
+	//
+	// Setting this to true allows stucts without pointer fields to be used
+	// without the risk failure should a nil value returned from WMI.
+	NonePtrZero bool
+
+	// PtrNil specifies if nil values for pointer fields should be returned
+	// as nil.
+	//
+	// Setting this to true will set pointer fields to nil where WMI
+	// returned nil, otherwise the types zero value will be returned.
+	PtrNil bool
+
+	// AllowMissingFields specifies that struct fields not present in the
+	// query result should not result in an error.
+	//
+	// Setting this to true allows custom queries to be used with full
+	// struct definitions instead of having to define multiple structs.
+	AllowMissingFields bool
+}
+
+// DefaultClient is the default Client and is used by Query, QueryNamespace
+var DefaultClient = &Client{}
+
+// Query runs the WQL query and appends the values to dst.
+//
+// dst must have type *[]S or *[]*S, for some struct type S. Fields selected in
+// the query must have the same name in dst. Supported types are all signed and
+// unsigned integers, time.Time, string, bool, or a pointer to one of those.
+// Array types are not supported.
+//
+// By default, the local machine and default namespace are used. These can be
+// changed using connectServerArgs. See
+// http://msdn.microsoft.com/en-us/library/aa393720.aspx for details.
+func (c *Client) Query(query string, dst interface{}, connectServerArgs ...interface{}) error {
+	dv := reflect.ValueOf(dst)
+	if dv.Kind() != reflect.Ptr || dv.IsNil() {
+		return ErrInvalidEntityType
+	}
+	dv = dv.Elem()
+	mat, elemType := checkMultiArg(dv)
+	if mat == multiArgTypeInvalid {
+		return ErrInvalidEntityType
+	}
+
+	lock.Lock()
+	defer lock.Unlock()
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	err := ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
+	if err != nil {
+		oleerr := err.(*ole.OleError)
+		// S_FALSE           = 0x00000001 // CoInitializeEx was already called on this thread
+		if oleerr.Code() != ole.S_OK && oleerr.Code() != 0x00000001 {
+			return err
+		}
+	} else {
+		// Only invoke CoUninitialize if the thread was not initizlied before.
+		// This will allow other go packages based on go-ole play along
+		// with this library.
+		defer ole.CoUninitialize()
+	}
+
+	unknown, err := oleutil.CreateObject("WbemScripting.SWbemLocator")
+	if err != nil {
+		return err
+	}
+	defer unknown.Release()
+
+	wmi, err := unknown.QueryInterface(ole.IID_IDispatch)
+	if err != nil {
+		return err
+	}
+	defer wmi.Release()
+
+	// service is a SWbemServices
+	serviceRaw, err := oleutil.CallMethod(wmi, "ConnectServer", connectServerArgs...)
+	if err != nil {
+		return err
+	}
+	service := serviceRaw.ToIDispatch()
+	defer serviceRaw.Clear()
+
+	// result is a SWBemObjectSet
+	resultRaw, err := oleutil.CallMethod(service, "ExecQuery", query)
+	if err != nil {
+		return err
+	}
+	result := resultRaw.ToIDispatch()
+	defer resultRaw.Clear()
+
+	count, err := oleInt64(result, "Count")
+	if err != nil {
+		return err
+	}
+
+	// Initialize a slice with Count capacity
+	dv.Set(reflect.MakeSlice(dv.Type(), 0, int(count)))
+
+	var errFieldMismatch error
+	for i := int64(0); i < count; i++ {
+		err := func() error {
+			// item is a SWbemObject, but really a Win32_Process
+			itemRaw, err := oleutil.CallMethod(result, "ItemIndex", i)
+			if err != nil {
+				return err
+			}
+			item := itemRaw.ToIDispatch()
+			defer itemRaw.Clear()
+
+			ev := reflect.New(elemType)
+			if err = c.loadEntity(ev.Interface(), item); err != nil {
+				if _, ok := err.(*ErrFieldMismatch); ok {
+					// We continue loading entities even in the face of field mismatch errors.
+					// If we encounter any other error, that other error is returned. Otherwise,
+					// an ErrFieldMismatch is returned.
+					errFieldMismatch = err
+				} else {
+					return err
+				}
+			}
+			if mat != multiArgTypeStructPtr {
+				ev = ev.Elem()
+			}
+			dv.Set(reflect.Append(dv, ev))
+			return nil
+		}()
+		if err != nil {
+			return err
+		}
+	}
+	return errFieldMismatch
+}
+
+// ErrFieldMismatch is returned when a field is to be loaded into a different
+// type than the one it was stored from, or when a field is missing or
+// unexported in the destination struct.
+// StructType is the type of the struct pointed to by the destination argument.
+type ErrFieldMismatch struct {
+	StructType reflect.Type
+	FieldName  string
+	Reason     string
+}
+
+func (e *ErrFieldMismatch) Error() string {
+	return fmt.Sprintf("wmi: cannot load field %q into a %q: %s",
+		e.FieldName, e.StructType, e.Reason)
+}
+
+var timeType = reflect.TypeOf(time.Time{})
+
+// loadEntity loads a SWbemObject into a struct pointer.
+func (c *Client) loadEntity(dst interface{}, src *ole.IDispatch) (errFieldMismatch error) {
+	v := reflect.ValueOf(dst).Elem()
+	for i := 0; i < v.NumField(); i++ {
+		f := v.Field(i)
+		of := f
+		isPtr := f.Kind() == reflect.Ptr
+		if isPtr {
+			ptr := reflect.New(f.Type().Elem())
+			f.Set(ptr)
+			f = f.Elem()
+		}
+		n := v.Type().Field(i).Name
+		if !f.CanSet() {
+			return &ErrFieldMismatch{
+				StructType: of.Type(),
+				FieldName:  n,
+				Reason:     "CanSet() is false",
+			}
+		}
+		prop, err := oleutil.GetProperty(src, n)
+		if err != nil {
+			if !c.AllowMissingFields {
+				errFieldMismatch = &ErrFieldMismatch{
+					StructType: of.Type(),
+					FieldName:  n,
+					Reason:     "no such struct field",
+				}
+			}
+			continue
+		}
+		defer prop.Clear()
+
+		switch val := prop.Value().(type) {
+		case int8, int16, int32, int64, int:
+			v := reflect.ValueOf(val).Int()
+			switch f.Kind() {
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				f.SetInt(v)
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+				f.SetUint(uint64(v))
+			default:
+				return &ErrFieldMismatch{
+					StructType: of.Type(),
+					FieldName:  n,
+					Reason:     "not an integer class",
+				}
+			}
+		case uint8, uint16, uint32, uint64:
+			v := reflect.ValueOf(val).Uint()
+			switch f.Kind() {
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				f.SetInt(int64(v))
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+				f.SetUint(v)
+			default:
+				return &ErrFieldMismatch{
+					StructType: of.Type(),
+					FieldName:  n,
+					Reason:     "not an integer class",
+				}
+			}
+		case string:
+			switch f.Kind() {
+			case reflect.String:
+				f.SetString(val)
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				iv, err := strconv.ParseInt(val, 10, 64)
+				if err != nil {
+					return err
+				}
+				f.SetInt(iv)
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+				uv, err := strconv.ParseUint(val, 10, 64)
+				if err != nil {
+					return err
+				}
+				f.SetUint(uv)
+			case reflect.Struct:
+				switch f.Type() {
+				case timeType:
+					if len(val) == 25 {
+						mins, err := strconv.Atoi(val[22:])
+						if err != nil {
+							return err
+						}
+						val = val[:22] + fmt.Sprintf("%02d%02d", mins/60, mins%60)
+					}
+					t, err := time.Parse("20060102150405.000000-0700", val)
+					if err != nil {
+						return err
+					}
+					f.Set(reflect.ValueOf(t))
+				}
+			}
+		case bool:
+			switch f.Kind() {
+			case reflect.Bool:
+				f.SetBool(val)
+			default:
+				return &ErrFieldMismatch{
+					StructType: of.Type(),
+					FieldName:  n,
+					Reason:     "not a bool",
+				}
+			}
+		default:
+			typeof := reflect.TypeOf(val)
+			if typeof == nil && (isPtr || c.NonePtrZero) {
+				if (isPtr && c.PtrNil) || (!isPtr && c.NonePtrZero) {
+					of.Set(reflect.Zero(of.Type()))
+				}
+				break
+			}
+			return &ErrFieldMismatch{
+				StructType: of.Type(),
+				FieldName:  n,
+				Reason:     fmt.Sprintf("unsupported type (%T)", val),
+			}
+		}
+	}
+	return errFieldMismatch
+}
+
+type multiArgType int
+
+const (
+	multiArgTypeInvalid multiArgType = iota
+	multiArgTypeStruct
+	multiArgTypeStructPtr
+)
+
+// checkMultiArg checks that v has type []S, []*S for some struct type S.
+//
+// It returns what category the slice's elements are, and the reflect.Type
+// that represents S.
+func checkMultiArg(v reflect.Value) (m multiArgType, elemType reflect.Type) {
+	if v.Kind() != reflect.Slice {
+		return multiArgTypeInvalid, nil
+	}
+	elemType = v.Type().Elem()
+	switch elemType.Kind() {
+	case reflect.Struct:
+		return multiArgTypeStruct, elemType
+	case reflect.Ptr:
+		elemType = elemType.Elem()
+		if elemType.Kind() == reflect.Struct {
+			return multiArgTypeStructPtr, elemType
+		}
+	}
+	return multiArgTypeInvalid, nil
+}
+
+func oleInt64(item *ole.IDispatch, prop string) (int64, error) {
+	v, err := oleutil.GetProperty(item, prop)
+	if err != nil {
+		return 0, err
+	}
+	defer v.Clear()
+
+	i := int64(v.Val)
+	return i, nil
+}
+
+// CreateQuery returns a WQL query string that queries all columns of src. where
+// is an optional string that is appended to the query, to be used with WHERE
+// clauses. In such a case, the "WHERE" string should appear at the beginning.
+func CreateQuery(src interface{}, where string) string {
+	var b bytes.Buffer
+	b.WriteString("SELECT ")
+	s := reflect.Indirect(reflect.ValueOf(src))
+	t := s.Type()
+	if s.Kind() == reflect.Slice {
+		t = t.Elem()
+	}
+	if t.Kind() != reflect.Struct {
+		return ""
+	}
+	var fields []string
+	for i := 0; i < t.NumField(); i++ {
+		fields = append(fields, t.Field(i).Name)
+	}
+	b.WriteString(strings.Join(fields, ", "))
+	b.WriteString(" FROM ")
+	b.WriteString(t.Name())
+	b.WriteString(" " + where)
+	return b.String()
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/.travis.yml b/Godeps/_workspace/src/github.com/go-ole/go-ole/.travis.yml
new file mode 100644
index 0000000000..0c2c02bdf2
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/.travis.yml
@@ -0,0 +1,9 @@
+language: go
+sudo: false
+
+go:
+  - 1.1
+  - 1.2
+  - 1.3
+  - 1.4
+  - tip
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ChangeLog.md b/Godeps/_workspace/src/github.com/go-ole/go-ole/ChangeLog.md
new file mode 100644
index 0000000000..4ba6a8c64d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/ChangeLog.md
@@ -0,0 +1,49 @@
+# Version 1.x.x
+
+* **Add more test cases and reference new test COM server project.** (Placeholder for future additions)
+
+# Version 1.2.0-alphaX
+
+**Minimum supported version is now Go 1.4. Go 1.1 support is deprecated, but should still build.**
+
+ * Added CI configuration for Travis-CI and AppVeyor.
+ * Added test InterfaceID and ClassID for the COM Test Server project.
+ * Added more inline documentation (#83).
+ * Added IEnumVARIANT implementation (#88).
+ * Added IEnumVARIANT test cases (#99, #100, #101).
+ * Added support for retrieving `time.Time` from VARIANT (#92).
+ * Added test case for IUnknown (#64).
+ * Added test case for IDispatch (#64).
+ * Added test cases for scalar variants (#64, #76).
+
+# Version 1.1.1
+
+ * Fixes for Linux build.
+ * Fixes for Windows build.
+
+# Version 1.1.0
+
+The change to provide building on all platforms is a new feature. The increase in minor version reflects that and allows those who wish to stay on 1.0.x to continue to do so. Support for 1.0.x will be limited to bug fixes.
+
+ * Move GUID out of variables.go into its own file to make new documentation available.
+ * Move OleError out of ole.go into its own file to make new documentation available.
+ * Add documentation to utility functions.
+ * Add documentation to variant receiver functions.
+ * Add documentation to ole structures.
+ * Make variant available to other systems outside of Windows.
+ * Make OLE structures available to other systems outside of Windows.
+
+## New Features
+
+ * Library should now be built on all platforms supported by Go. Library will NOOP on any platform that is not Windows.
+ * More functions are now documented and available on godoc.org.
+
+# Version 1.0.1
+
+ 1. Fix package references from repository location change.
+
+# Version 1.0.0
+
+This version is stable enough for use. The COM API is still incomplete, but provides enough functionality for accessing COM servers using IDispatch interface.
+
+There is no changelog for this version. Check commits for history.
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/README.md b/Godeps/_workspace/src/github.com/go-ole/go-ole/README.md
new file mode 100644
index 0000000000..0ea9db33c7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/README.md
@@ -0,0 +1,46 @@
+#Go OLE
+
+[![Build status](https://ci.appveyor.com/api/projects/status/qr0u2sf7q43us9fj?svg=true)](https://ci.appveyor.com/project/jacobsantos/go-ole-jgs28)
+[![Build Status](https://travis-ci.org/go-ole/go-ole.svg?branch=master)](https://travis-ci.org/go-ole/go-ole)
+[![GoDoc](https://godoc.org/github.com/go-ole/go-ole?status.svg)](https://godoc.org/github.com/go-ole/go-ole)
+
+Go bindings for Windows COM using shared libraries instead of cgo.
+
+By Yasuhiro Matsumoto.
+
+## Install
+
+To experiment with go-ole, you can just compile and run the example program:
+
+```
+go get github.com/go-ole/go-ole
+cd /path/to/go-ole/
+go test
+
+cd /path/to/go-ole/example/excel
+go run excel.go
+```
+
+## Continuous Integration
+
+Continuous integration configuration has been added for both Travis-CI and AppVeyor. You will have to add these to your own account for your fork in order for it to run.
+
+**Travis-CI**
+
+Travis-CI was added to check builds on Linux to ensure that `go get` works when cross building. Currently, Travis-CI is not used to test cross-building, but this may be changed in the future. It is also not currently possible to test the library on Linux, since COM API is specific to Windows and it is not currently possible to run a COM server on Linux or even connect to a remote COM server.
+
+**AppVeyor**
+
+AppVeyor is used to build on Windows using the (in-development) test COM server. It is currently only used to test the build and ensure that the code works on Windows. It will be used to register a COM server and then run the test cases based on the test COM server.
+
+The tests currently do run and do pass and this should be maintained with commits.
+
+##Versioning
+
+Go OLE uses [semantic versioning](http://semver.org) for version numbers, which is similar to the version contract of the Go language. Which means that the major version will always maintain backwards compatibility with minor versions. Minor versions will only add new additions and changes. Fixes will always be in patch. 
+
+This contract should allow you to upgrade to new minor and patch versions without breakage or modifications to your existing code. Leave a ticket, if there is breakage, so that it could be fixed.
+
+##LICENSE
+
+Under the MIT License: http://mattn.mit-license.org/2013
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/appveyor.yml b/Godeps/_workspace/src/github.com/go-ole/go-ole/appveyor.yml
new file mode 100644
index 0000000000..e66dd31a1d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/appveyor.yml
@@ -0,0 +1,63 @@
+# Notes:
+#   - Minimal appveyor.yml file is an empty file. All sections are optional.
+#   - Indent each level of configuration with 2 spaces. Do not use tabs!
+#   - All section names are case-sensitive.
+#   - Section names should be unique on each level.
+
+version: "1.3.0.{build}-alpha-{branch}"
+
+os: Windows Server 2012 R2
+
+branches:
+  only:
+    - master
+    - v1.2
+    - v1.1
+    - v1.0
+
+skip_tags: true
+
+clone_folder: c:\gopath\src\github.com\go-ole\go-ole
+
+environment:
+  GOPATH: c:\gopath
+  matrix:
+  - GOARCH: amd64
+    GOVERSION: 1.4
+    GOROOT: c:\go
+    DOWNLOADPLATFORM: "x64"
+
+install:
+  - choco install mingw
+  - SET PATH=c:\tools\mingw64\bin;%PATH%
+  # - Download COM Server
+  - ps: Start-FileDownload "https://github.com/go-ole/test-com-server/releases/download/v1.0.2/test-com-server-${env:DOWNLOADPLATFORM}.zip"
+  - 7z e test-com-server-%DOWNLOADPLATFORM%.zip -oc:\gopath\src\github.com\go-ole\go-ole > NUL
+  - c:\gopath\src\github.com\go-ole\go-ole\build\register-assembly.bat
+  # - set
+  - go version
+  - go env
+  - c:\gopath\src\github.com\go-ole\go-ole\build\compile-go.bat
+  - go tool dist install -v cmd/8a
+  - go tool dist install -v cmd/8c
+  - go tool dist install -v cmd/8g
+  - go tool dist install -v cmd/8l
+  - go tool dist install -v cmd/6a
+  - go tool dist install -v cmd/6c
+  - go tool dist install -v cmd/6g
+  - go tool dist install -v cmd/6l
+  - go get -u golang.org/x/tools/cmd/cover
+  - go get -u golang.org/x/tools/cmd/godoc
+  - go get -u golang.org/x/tools/cmd/stringer
+
+build_script:
+  - cd c:\gopath\src\github.com\go-ole\go-ole
+  - go get -v -t ./...
+  - go build
+  - go test -v -cover ./...
+
+# disable automatic tests
+test: off
+
+# disable deployment
+deploy: off
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/com.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/com.go
new file mode 100644
index 0000000000..f224fa069a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/com.go
@@ -0,0 +1,329 @@
+// +build windows
+
+package ole
+
+import (
+	"errors"
+	"syscall"
+	"time"
+	"unicode/utf16"
+	"unsafe"
+)
+
+var (
+	procCoInitialize, _            = modole32.FindProc("CoInitialize")
+	procCoInitializeEx, _          = modole32.FindProc("CoInitializeEx")
+	procCoUninitialize, _          = modole32.FindProc("CoUninitialize")
+	procCoCreateInstance, _        = modole32.FindProc("CoCreateInstance")
+	procCoTaskMemFree, _           = modole32.FindProc("CoTaskMemFree")
+	procCLSIDFromProgID, _         = modole32.FindProc("CLSIDFromProgID")
+	procCLSIDFromString, _         = modole32.FindProc("CLSIDFromString")
+	procStringFromCLSID, _         = modole32.FindProc("StringFromCLSID")
+	procStringFromIID, _           = modole32.FindProc("StringFromIID")
+	procIIDFromString, _           = modole32.FindProc("IIDFromString")
+	procGetUserDefaultLCID, _      = modkernel32.FindProc("GetUserDefaultLCID")
+	procCopyMemory, _              = modkernel32.FindProc("RtlMoveMemory")
+	procVariantInit, _             = modoleaut32.FindProc("VariantInit")
+	procVariantClear, _            = modoleaut32.FindProc("VariantClear")
+	procVariantTimeToSystemTime, _ = modoleaut32.FindProc("VariantTimeToSystemTime")
+	procSysAllocString, _          = modoleaut32.FindProc("SysAllocString")
+	procSysAllocStringLen, _       = modoleaut32.FindProc("SysAllocStringLen")
+	procSysFreeString, _           = modoleaut32.FindProc("SysFreeString")
+	procSysStringLen, _            = modoleaut32.FindProc("SysStringLen")
+	procCreateDispTypeInfo, _      = modoleaut32.FindProc("CreateDispTypeInfo")
+	procCreateStdDispatch, _       = modoleaut32.FindProc("CreateStdDispatch")
+	procGetActiveObject, _         = modoleaut32.FindProc("GetActiveObject")
+
+	procGetMessageW, _      = moduser32.FindProc("GetMessageW")
+	procDispatchMessageW, _ = moduser32.FindProc("DispatchMessageW")
+)
+
+// coInitialize initializes COM library on current thread.
+//
+// MSDN documentation suggests that this function should not be called. Call
+// CoInitializeEx() instead. The reason has to do with threading and this
+// function is only for single-threaded apartments.
+//
+// That said, most users of the library have gotten away with just this
+// function. If you are experiencing threading issues, then use
+// CoInitializeEx().
+func coInitialize() (err error) {
+	// http://msdn.microsoft.com/en-us/library/windows/desktop/ms678543(v=vs.85).aspx
+	// Suggests that no value should be passed to CoInitialized.
+	// Could just be Call() since the parameter is optional. <-- Needs testing to be sure.
+	hr, _, _ := procCoInitialize.Call(uintptr(0))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// coInitializeEx initializes COM library with concurrency model.
+func coInitializeEx(coinit uint32) (err error) {
+	// http://msdn.microsoft.com/en-us/library/windows/desktop/ms695279(v=vs.85).aspx
+	// Suggests that the first parameter is not only optional but should always be NULL.
+	hr, _, _ := procCoInitializeEx.Call(uintptr(0), uintptr(coinit))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// CoInitialize initializes COM library on current thread.
+//
+// MSDN documentation suggests that this function should not be called. Call
+// CoInitializeEx() instead. The reason has to do with threading and this
+// function is only for single-threaded apartments.
+//
+// That said, most users of the library have gotten away with just this
+// function. If you are experiencing threading issues, then use
+// CoInitializeEx().
+func CoInitialize(p uintptr) (err error) {
+	// p is ignored and won't be used.
+	// Avoid any variable not used errors.
+	p = uintptr(0)
+	return coInitialize()
+}
+
+// CoInitializeEx initializes COM library with concurrency model.
+func CoInitializeEx(p uintptr, coinit uint32) (err error) {
+	// Avoid any variable not used errors.
+	p = uintptr(0)
+	return coInitializeEx(coinit)
+}
+
+// CoUninitialize uninitializes COM Library.
+func CoUninitialize() {
+	procCoUninitialize.Call()
+}
+
+// CoTaskMemFree frees memory pointer.
+func CoTaskMemFree(memptr uintptr) {
+	procCoTaskMemFree.Call(memptr)
+}
+
+// CLSIDFromProgID retrieves Class Identifier with the given Program Identifier.
+//
+// The Programmatic Identifier must be registered, because it will be looked up
+// in the Windows Registry. The registry entry has the following keys: CLSID,
+// Insertable, Protocol and Shell
+// (https://msdn.microsoft.com/en-us/library/dd542719(v=vs.85).aspx).
+//
+// programID identifies the class id with less precision and is not guaranteed
+// to be unique. These are usually found in the registry under
+// HKEY_LOCAL_MACHINE\SOFTWARE\Classes, usually with the format of
+// "Program.Component.Version" with version being optional.
+//
+// CLSIDFromProgID in Windows API.
+func CLSIDFromProgID(progId string) (clsid *GUID, err error) {
+	var guid GUID
+	lpszProgID := uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(progId)))
+	hr, _, _ := procCLSIDFromProgID.Call(lpszProgID, uintptr(unsafe.Pointer(&guid)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	clsid = &guid
+	return
+}
+
+// CLSIDFromString retrieves Class ID from string representation.
+//
+// This is technically the string version of the GUID and will convert the
+// string to object.
+//
+// CLSIDFromString in Windows API.
+func CLSIDFromString(str string) (clsid *GUID, err error) {
+	var guid GUID
+	lpsz := uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(str)))
+	hr, _, _ := procCLSIDFromString.Call(lpsz, uintptr(unsafe.Pointer(&guid)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	clsid = &guid
+	return
+}
+
+// StringFromCLSID returns GUID formated string from GUID object.
+func StringFromCLSID(clsid *GUID) (str string, err error) {
+	var p *uint16
+	hr, _, _ := procStringFromCLSID.Call(uintptr(unsafe.Pointer(clsid)), uintptr(unsafe.Pointer(&p)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	str = LpOleStrToString(p)
+	return
+}
+
+// IIDFromString returns GUID from program ID.
+func IIDFromString(progId string) (clsid *GUID, err error) {
+	var guid GUID
+	lpsz := uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(progId)))
+	hr, _, _ := procIIDFromString.Call(lpsz, uintptr(unsafe.Pointer(&guid)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	clsid = &guid
+	return
+}
+
+// StringFromIID returns GUID formatted string from GUID object.
+func StringFromIID(iid *GUID) (str string, err error) {
+	var p *uint16
+	hr, _, _ := procStringFromIID.Call(uintptr(unsafe.Pointer(iid)), uintptr(unsafe.Pointer(&p)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	str = LpOleStrToString(p)
+	return
+}
+
+// CreateInstance of single uninitialized object with GUID.
+func CreateInstance(clsid *GUID, iid *GUID) (unk *IUnknown, err error) {
+	if iid == nil {
+		iid = IID_IUnknown
+	}
+	hr, _, _ := procCoCreateInstance.Call(
+		uintptr(unsafe.Pointer(clsid)),
+		0,
+		CLSCTX_SERVER,
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(&unk)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// GetActiveObject retrieves pointer to active object.
+func GetActiveObject(clsid *GUID, iid *GUID) (unk *IUnknown, err error) {
+	if iid == nil {
+		iid = IID_IUnknown
+	}
+	hr, _, _ := procGetActiveObject.Call(
+		uintptr(unsafe.Pointer(clsid)),
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(&unk)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// VariantInit initializes variant.
+func VariantInit(v *VARIANT) (err error) {
+	hr, _, _ := procVariantInit.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// VariantClear clears value in Variant settings to VT_EMPTY.
+func VariantClear(v *VARIANT) (err error) {
+	hr, _, _ := procVariantClear.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// SysAllocString allocates memory for string and copies string into memory.
+func SysAllocString(v string) (ss *int16) {
+	pss, _, _ := procSysAllocString.Call(uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(v))))
+	ss = (*int16)(unsafe.Pointer(pss))
+	return
+}
+
+// SysAllocStringLen copies up to length of given string returning pointer.
+func SysAllocStringLen(v string) (ss *int16) {
+	utf16 := utf16.Encode([]rune(v + "\x00"))
+	ptr := &utf16[0]
+
+	pss, _, _ := procSysAllocStringLen.Call(uintptr(unsafe.Pointer(ptr)), uintptr(len(utf16)-1))
+	ss = (*int16)(unsafe.Pointer(pss))
+	return
+}
+
+// SysFreeString frees string system memory. This must be called with SysAllocString.
+func SysFreeString(v *int16) (err error) {
+	hr, _, _ := procSysFreeString.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// SysStringLen is the length of the system allocated string.
+func SysStringLen(v *int16) uint32 {
+	l, _, _ := procSysStringLen.Call(uintptr(unsafe.Pointer(v)))
+	return uint32(l)
+}
+
+// CreateStdDispatch provides default IDispatch implementation for IUnknown.
+//
+// This handles default IDispatch implementation for objects. It haves a few
+// limitations with only supporting one language. It will also only return
+// default exception codes.
+func CreateStdDispatch(unk *IUnknown, v uintptr, ptinfo *IUnknown) (disp *IDispatch, err error) {
+	hr, _, _ := procCreateStdDispatch.Call(
+		uintptr(unsafe.Pointer(unk)),
+		v,
+		uintptr(unsafe.Pointer(ptinfo)),
+		uintptr(unsafe.Pointer(&disp)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// CreateDispTypeInfo provides default ITypeInfo implementation for IDispatch.
+//
+// This will not handle the full implementation of the interface.
+func CreateDispTypeInfo(idata *INTERFACEDATA) (pptinfo *IUnknown, err error) {
+	hr, _, _ := procCreateDispTypeInfo.Call(
+		uintptr(unsafe.Pointer(idata)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(unsafe.Pointer(&pptinfo)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// copyMemory moves location of a block of memory.
+func copyMemory(dest unsafe.Pointer, src unsafe.Pointer, length uint32) {
+	procCopyMemory.Call(uintptr(dest), uintptr(src), uintptr(length))
+}
+
+// GetUserDefaultLCID retrieves current user default locale.
+func GetUserDefaultLCID() (lcid uint32) {
+	ret, _, _ := procGetUserDefaultLCID.Call()
+	lcid = uint32(ret)
+	return
+}
+
+// GetMessage in message queue from runtime.
+//
+// This function appears to block. PeekMessage does not block.
+func GetMessage(msg *Msg, hwnd uint32, MsgFilterMin uint32, MsgFilterMax uint32) (ret int32, err error) {
+	r0, _, err := procGetMessageW.Call(uintptr(unsafe.Pointer(msg)), uintptr(hwnd), uintptr(MsgFilterMin), uintptr(MsgFilterMax))
+	ret = int32(r0)
+	return
+}
+
+// DispatchMessage to window procedure.
+func DispatchMessage(msg *Msg) (ret int32) {
+	r0, _, _ := procDispatchMessageW.Call(uintptr(unsafe.Pointer(msg)))
+	ret = int32(r0)
+	return
+}
+
+// GetVariantDate converts COM Variant Time value to Go time.Time.
+func GetVariantDate(value float64) (time.Time, error) {
+	var st syscall.Systemtime
+	r, _, _ := procVariantTimeToSystemTime.Call(uintptr(unsafe.Pointer(&value)), uintptr(unsafe.Pointer(&st)))
+	if r != 0 {
+		return time.Date(int(st.Year), time.Month(st.Month), int(st.Day), int(st.Hour), int(st.Minute), int(st.Second), int(st.Milliseconds/1000), nil), nil
+	}
+	return time.Now(), errors.New("Could not convert to time, passing current time.")
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/com_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/com_func.go
new file mode 100644
index 0000000000..425aad3233
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/com_func.go
@@ -0,0 +1,174 @@
+// +build !windows
+
+package ole
+
+import (
+	"time"
+	"unsafe"
+)
+
+// coInitialize initializes COM library on current thread.
+//
+// MSDN documentation suggests that this function should not be called. Call
+// CoInitializeEx() instead. The reason has to do with threading and this
+// function is only for single-threaded apartments.
+//
+// That said, most users of the library have gotten away with just this
+// function. If you are experiencing threading issues, then use
+// CoInitializeEx().
+func coInitialize() error {
+	return NewError(E_NOTIMPL)
+}
+
+// coInitializeEx initializes COM library with concurrency model.
+func coInitializeEx(coinit uint32) error {
+	return NewError(E_NOTIMPL)
+}
+
+// CoInitialize initializes COM library on current thread.
+//
+// MSDN documentation suggests that this function should not be called. Call
+// CoInitializeEx() instead. The reason has to do with threading and this
+// function is only for single-threaded apartments.
+//
+// That said, most users of the library have gotten away with just this
+// function. If you are experiencing threading issues, then use
+// CoInitializeEx().
+func CoInitialize(p uintptr) error {
+	return NewError(E_NOTIMPL)
+}
+
+// CoInitializeEx initializes COM library with concurrency model.
+func CoInitializeEx(p uintptr, coinit uint32) error {
+	return NewError(E_NOTIMPL)
+}
+
+// CoUninitialize uninitializes COM Library.
+func CoUninitialize() {}
+
+// CoTaskMemFree frees memory pointer.
+func CoTaskMemFree(memptr uintptr) {}
+
+// CLSIDFromProgID retrieves Class Identifier with the given Program Identifier.
+//
+// The Programmatic Identifier must be registered, because it will be looked up
+// in the Windows Registry. The registry entry has the following keys: CLSID,
+// Insertable, Protocol and Shell
+// (https://msdn.microsoft.com/en-us/library/dd542719(v=vs.85).aspx).
+//
+// programID identifies the class id with less precision and is not guaranteed
+// to be unique. These are usually found in the registry under
+// HKEY_LOCAL_MACHINE\SOFTWARE\Classes, usually with the format of
+// "Program.Component.Version" with version being optional.
+//
+// CLSIDFromProgID in Windows API.
+func CLSIDFromProgID(progId string) (*GUID, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// CLSIDFromString retrieves Class ID from string representation.
+//
+// This is technically the string version of the GUID and will convert the
+// string to object.
+//
+// CLSIDFromString in Windows API.
+func CLSIDFromString(str string) (*GUID, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// StringFromCLSID returns GUID formated string from GUID object.
+func StringFromCLSID(clsid *GUID) (string, error) {
+	return "", NewError(E_NOTIMPL)
+}
+
+// IIDFromString returns GUID from program ID.
+func IIDFromString(progId string) (*GUID, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// StringFromIID returns GUID formatted string from GUID object.
+func StringFromIID(iid *GUID) (string, error) {
+	return "", NewError(E_NOTIMPL)
+}
+
+// CreateInstance of single uninitialized object with GUID.
+func CreateInstance(clsid *GUID, iid *GUID) (*IUnknown, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// GetActiveObject retrieves pointer to active object.
+func GetActiveObject(clsid *GUID, iid *GUID) (*IUnknown, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// VariantInit initializes variant.
+func VariantInit(v *VARIANT) error {
+	return NewError(E_NOTIMPL)
+}
+
+// VariantClear clears value in Variant settings to VT_EMPTY.
+func VariantClear(v *VARIANT) error {
+	return NewError(E_NOTIMPL)
+}
+
+// SysAllocString allocates memory for string and copies string into memory.
+func SysAllocString(v string) *int16 {
+	u := int16(0)
+	return &u
+}
+
+// SysAllocStringLen copies up to length of given string returning pointer.
+func SysAllocStringLen(v string) *int16 {
+	u := int16(0)
+	return &u
+}
+
+// SysFreeString frees string system memory. This must be called with SysAllocString.
+func SysFreeString(v *int16) error {
+	return NewError(E_NOTIMPL)
+}
+
+// SysStringLen is the length of the system allocated string.
+func SysStringLen(v *int16) uint32 {
+	return uint32(0)
+}
+
+// CreateStdDispatch provides default IDispatch implementation for IUnknown.
+//
+// This handles default IDispatch implementation for objects. It haves a few
+// limitations with only supporting one language. It will also only return
+// default exception codes.
+func CreateStdDispatch(unk *IUnknown, v uintptr, ptinfo *IUnknown) (*IDispatch, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// CreateDispTypeInfo provides default ITypeInfo implementation for IDispatch.
+//
+// This will not handle the full implementation of the interface.
+func CreateDispTypeInfo(idata *INTERFACEDATA) (*IUnknown, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// copyMemory moves location of a block of memory.
+func copyMemory(dest unsafe.Pointer, src unsafe.Pointer, length uint32) {}
+
+// GetUserDefaultLCID retrieves current user default locale.
+func GetUserDefaultLCID() uint32 {
+	return uint32(0)
+}
+
+// GetMessage in message queue from runtime.
+//
+// This function appears to block. PeekMessage does not block.
+func GetMessage(msg *Msg, hwnd uint32, MsgFilterMin uint32, MsgFilterMax uint32) (int32, error) {
+	return int32(0), NewError(E_NOTIMPL)
+}
+
+// DispatchMessage to window procedure.
+func DispatchMessage(msg *Msg) int32 {
+	return int32(0)
+}
+
+func GetVariantDate(value float64) (time.Time, error) {
+	return time.Now(), NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/connect.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/connect.go
new file mode 100644
index 0000000000..b2ac2ec67a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/connect.go
@@ -0,0 +1,192 @@
+package ole
+
+// Connection contains IUnknown for fluent interface interaction.
+//
+// Deprecated. Use oleutil package instead.
+type Connection struct {
+	Object *IUnknown // Access COM
+}
+
+// Initialize COM.
+func (*Connection) Initialize() (err error) {
+	return coInitialize()
+}
+
+// Uninitialize COM.
+func (*Connection) Uninitialize() {
+	CoUninitialize()
+}
+
+// Create IUnknown object based first on ProgId and then from String.
+func (c *Connection) Create(progId string) (err error) {
+	var clsid *GUID
+	clsid, err = CLSIDFromProgID(progId)
+	if err != nil {
+		clsid, err = CLSIDFromString(progId)
+		if err != nil {
+			return
+		}
+	}
+
+	unknown, err := CreateInstance(clsid, IID_IUnknown)
+	if err != nil {
+		return
+	}
+	c.Object = unknown
+
+	return
+}
+
+// Release IUnknown object.
+func (c *Connection) Release() {
+	c.Object.Release()
+}
+
+// Load COM object from list of programIDs or strings.
+func (c *Connection) Load(names ...string) (errors []error) {
+	var tempErrors []error = make([]error, len(names))
+	var numErrors int = 0
+	for _, name := range names {
+		err := c.Create(name)
+		if err != nil {
+			tempErrors = append(tempErrors, err)
+			numErrors += 1
+			continue
+		}
+		break
+	}
+
+	copy(errors, tempErrors[0:numErrors])
+	return
+}
+
+// Dispatch returns Dispatch object.
+func (c *Connection) Dispatch() (object *Dispatch, err error) {
+	dispatch, err := c.Object.QueryInterface(IID_IDispatch)
+	if err != nil {
+		return
+	}
+	object = &Dispatch{dispatch}
+	return
+}
+
+// Dispatch stores IDispatch object.
+type Dispatch struct {
+	Object *IDispatch // Dispatch object.
+}
+
+// Call method on IDispatch with parameters.
+func (d *Dispatch) Call(method string, params ...interface{}) (result *VARIANT, err error) {
+	id, err := d.GetId(method)
+	if err != nil {
+		return
+	}
+
+	result, err = d.Invoke(id, DISPATCH_METHOD, params)
+	return
+}
+
+// MustCall method on IDispatch with parameters.
+func (d *Dispatch) MustCall(method string, params ...interface{}) (result *VARIANT) {
+	id, err := d.GetId(method)
+	if err != nil {
+		panic(err)
+	}
+
+	result, err = d.Invoke(id, DISPATCH_METHOD, params)
+	if err != nil {
+		panic(err)
+	}
+
+	return
+}
+
+// Get property on IDispatch with parameters.
+func (d *Dispatch) Get(name string, params ...interface{}) (result *VARIANT, err error) {
+	id, err := d.GetId(name)
+	if err != nil {
+		return
+	}
+	result, err = d.Invoke(id, DISPATCH_PROPERTYGET, params)
+	return
+}
+
+// MustGet property on IDispatch with parameters.
+func (d *Dispatch) MustGet(name string, params ...interface{}) (result *VARIANT) {
+	id, err := d.GetId(name)
+	if err != nil {
+		panic(err)
+	}
+
+	result, err = d.Invoke(id, DISPATCH_PROPERTYGET, params)
+	if err != nil {
+		panic(err)
+	}
+	return
+}
+
+// Set property on IDispatch with parameters.
+func (d *Dispatch) Set(name string, params ...interface{}) (result *VARIANT, err error) {
+	id, err := d.GetId(name)
+	if err != nil {
+		return
+	}
+	result, err = d.Invoke(id, DISPATCH_PROPERTYPUT, params)
+	return
+}
+
+// MustSet property on IDispatch with parameters.
+func (d *Dispatch) MustSet(name string, params ...interface{}) (result *VARIANT) {
+	id, err := d.GetId(name)
+	if err != nil {
+		panic(err)
+	}
+
+	result, err = d.Invoke(id, DISPATCH_PROPERTYPUT, params)
+	if err != nil {
+		panic(err)
+	}
+	return
+}
+
+// GetId retrieves ID of name on IDispatch.
+func (d *Dispatch) GetId(name string) (id int32, err error) {
+	var dispid []int32
+	dispid, err = d.Object.GetIDsOfName([]string{name})
+	if err != nil {
+		return
+	}
+	id = dispid[0]
+	return
+}
+
+// GetIds retrieves all IDs of names on IDispatch.
+func (d *Dispatch) GetIds(names ...string) (dispid []int32, err error) {
+	dispid, err = d.Object.GetIDsOfName(names)
+	return
+}
+
+// Invoke IDispatch on DisplayID of dispatch type with parameters.
+//
+// There have been problems where if send cascading params..., it would error
+// out because the parameters would be empty.
+func (d *Dispatch) Invoke(id int32, dispatch int16, params []interface{}) (result *VARIANT, err error) {
+	if len(params) < 1 {
+		result, err = d.Object.Invoke(id, dispatch)
+	} else {
+		result, err = d.Object.Invoke(id, dispatch, params...)
+	}
+	return
+}
+
+// Release IDispatch object.
+func (d *Dispatch) Release() {
+	d.Object.Release()
+}
+
+// Connect initializes COM and attempts to load IUnknown based on given names.
+func Connect(names ...string) (connection *Connection) {
+	connection.Initialize()
+	connection.Load(names...)
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/constants.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/constants.go
new file mode 100644
index 0000000000..fd0c6d74b0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/constants.go
@@ -0,0 +1,153 @@
+package ole
+
+const (
+	CLSCTX_INPROC_SERVER   = 1
+	CLSCTX_INPROC_HANDLER  = 2
+	CLSCTX_LOCAL_SERVER    = 4
+	CLSCTX_INPROC_SERVER16 = 8
+	CLSCTX_REMOTE_SERVER   = 16
+	CLSCTX_ALL             = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER
+	CLSCTX_INPROC          = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER
+	CLSCTX_SERVER          = CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER
+)
+
+const (
+	COINIT_APARTMENTTHREADED = 0x2
+	COINIT_MULTITHREADED     = 0x0
+	COINIT_DISABLE_OLE1DDE   = 0x4
+	COINIT_SPEED_OVER_MEMORY = 0x8
+)
+
+const (
+	DISPATCH_METHOD         = 1
+	DISPATCH_PROPERTYGET    = 2
+	DISPATCH_PROPERTYPUT    = 4
+	DISPATCH_PROPERTYPUTREF = 8
+)
+
+const (
+	S_OK           = 0x00000000
+	E_UNEXPECTED   = 0x8000FFFF
+	E_NOTIMPL      = 0x80004001
+	E_OUTOFMEMORY  = 0x8007000E
+	E_INVALIDARG   = 0x80070057
+	E_NOINTERFACE  = 0x80004002
+	E_POINTER      = 0x80004003
+	E_HANDLE       = 0x80070006
+	E_ABORT        = 0x80004004
+	E_FAIL         = 0x80004005
+	E_ACCESSDENIED = 0x80070005
+	E_PENDING      = 0x8000000A
+
+	CO_E_CLASSSTRING = 0x800401F3
+)
+
+const (
+	CC_FASTCALL = iota
+	CC_CDECL
+	CC_MSCPASCAL
+	CC_PASCAL = CC_MSCPASCAL
+	CC_MACPASCAL
+	CC_STDCALL
+	CC_FPFASTCALL
+	CC_SYSCALL
+	CC_MPWCDECL
+	CC_MPWPASCAL
+	CC_MAX = CC_MPWPASCAL
+)
+
+type VT uint16
+
+const (
+	VT_EMPTY           VT = 0x0
+	VT_NULL            VT = 0x1
+	VT_I2              VT = 0x2
+	VT_I4              VT = 0x3
+	VT_R4              VT = 0x4
+	VT_R8              VT = 0x5
+	VT_CY              VT = 0x6
+	VT_DATE            VT = 0x7
+	VT_BSTR            VT = 0x8
+	VT_DISPATCH        VT = 0x9
+	VT_ERROR           VT = 0xa
+	VT_BOOL            VT = 0xb
+	VT_VARIANT         VT = 0xc
+	VT_UNKNOWN         VT = 0xd
+	VT_DECIMAL         VT = 0xe
+	VT_I1              VT = 0x10
+	VT_UI1             VT = 0x11
+	VT_UI2             VT = 0x12
+	VT_UI4             VT = 0x13
+	VT_I8              VT = 0x14
+	VT_UI8             VT = 0x15
+	VT_INT             VT = 0x16
+	VT_UINT            VT = 0x17
+	VT_VOID            VT = 0x18
+	VT_HRESULT         VT = 0x19
+	VT_PTR             VT = 0x1a
+	VT_SAFEARRAY       VT = 0x1b
+	VT_CARRAY          VT = 0x1c
+	VT_USERDEFINED     VT = 0x1d
+	VT_LPSTR           VT = 0x1e
+	VT_LPWSTR          VT = 0x1f
+	VT_RECORD          VT = 0x24
+	VT_INT_PTR         VT = 0x25
+	VT_UINT_PTR        VT = 0x26
+	VT_FILETIME        VT = 0x40
+	VT_BLOB            VT = 0x41
+	VT_STREAM          VT = 0x42
+	VT_STORAGE         VT = 0x43
+	VT_STREAMED_OBJECT VT = 0x44
+	VT_STORED_OBJECT   VT = 0x45
+	VT_BLOB_OBJECT     VT = 0x46
+	VT_CF              VT = 0x47
+	VT_CLSID           VT = 0x48
+	VT_BSTR_BLOB       VT = 0xfff
+	VT_VECTOR          VT = 0x1000
+	VT_ARRAY           VT = 0x2000
+	VT_BYREF           VT = 0x4000
+	VT_RESERVED        VT = 0x8000
+	VT_ILLEGAL         VT = 0xffff
+	VT_ILLEGALMASKED   VT = 0xfff
+	VT_TYPEMASK        VT = 0xfff
+)
+
+const (
+	DISPID_UNKNOWN     = -1
+	DISPID_VALUE       = 0
+	DISPID_PROPERTYPUT = -3
+	DISPID_NEWENUM     = -4
+	DISPID_EVALUATE    = -5
+	DISPID_CONSTRUCTOR = -6
+	DISPID_DESTRUCTOR  = -7
+	DISPID_COLLECT     = -8
+)
+
+const (
+	TKIND_ENUM      = 1
+	TKIND_RECORD    = 2
+	TKIND_MODULE    = 3
+	TKIND_INTERFACE = 4
+	TKIND_DISPATCH  = 5
+	TKIND_COCLASS   = 6
+	TKIND_ALIAS     = 7
+	TKIND_UNION     = 8
+	TKIND_MAX       = 9
+)
+
+// Safe Array Feature Flags
+
+const (
+	FADF_AUTO        = 0x0001
+	FADF_STATIC      = 0x0002
+	FADF_EMBEDDED    = 0x0004
+	FADF_FIXEDSIZE   = 0x0010
+	FADF_RECORD      = 0x0020
+	FADF_HAVEIID     = 0x0040
+	FADF_HAVEVARTYPE = 0x0080
+	FADF_BSTR        = 0x0100
+	FADF_UNKNOWN     = 0x0200
+	FADF_DISPATCH    = 0x0400
+	FADF_VARIANT     = 0x0800
+	FADF_RESERVED    = 0xF008
+)
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/error.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/error.go
new file mode 100644
index 0000000000..096b456d3a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/error.go
@@ -0,0 +1,51 @@
+package ole
+
+// OleError stores COM errors.
+type OleError struct {
+	hr          uintptr
+	description string
+	subError    error
+}
+
+// NewError creates new error with HResult.
+func NewError(hr uintptr) *OleError {
+	return &OleError{hr: hr}
+}
+
+// NewErrorWithDescription creates new COM error with HResult and description.
+func NewErrorWithDescription(hr uintptr, description string) *OleError {
+	return &OleError{hr: hr, description: description}
+}
+
+// NewErrorWithSubError creates new COM error with parent error.
+func NewErrorWithSubError(hr uintptr, description string, err error) *OleError {
+	return &OleError{hr: hr, description: description, subError: err}
+}
+
+// Code is the HResult.
+func (v *OleError) Code() uintptr {
+	return uintptr(v.hr)
+}
+
+// String description, either manually set or format message with error code.
+func (v *OleError) String() string {
+	if v.description != "" {
+		return errstr(int(v.hr)) + " (" + v.description + ")"
+	}
+	return errstr(int(v.hr))
+}
+
+// Error implements error interface.
+func (v *OleError) Error() string {
+	return v.String()
+}
+
+// Description retrieves error summary, if there is one.
+func (v *OleError) Description() string {
+	return v.description
+}
+
+// SubError returns parent error, if there is one.
+func (v *OleError) SubError() error {
+	return v.subError
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/error_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/error_func.go
new file mode 100644
index 0000000000..8a2ffaa272
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/error_func.go
@@ -0,0 +1,8 @@
+// +build !windows
+
+package ole
+
+// errstr converts error code to string.
+func errstr(errno int) string {
+	return ""
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/error_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/error_windows.go
new file mode 100644
index 0000000000..d0e8e68595
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/error_windows.go
@@ -0,0 +1,24 @@
+// +build windows
+
+package ole
+
+import (
+	"fmt"
+	"syscall"
+	"unicode/utf16"
+)
+
+// errstr converts error code to string.
+func errstr(errno int) string {
+	// ask windows for the remaining errors
+	var flags uint32 = syscall.FORMAT_MESSAGE_FROM_SYSTEM | syscall.FORMAT_MESSAGE_ARGUMENT_ARRAY | syscall.FORMAT_MESSAGE_IGNORE_INSERTS
+	b := make([]uint16, 300)
+	n, err := syscall.FormatMessage(flags, 0, uint32(errno), 0, b, nil)
+	if err != nil {
+		return fmt.Sprintf("error %d (FormatMessage failed with: %v)", errno, err)
+	}
+	// trim terminating \r and \n
+	for ; n > 0 && (b[n-1] == '\n' || b[n-1] == '\r'); n-- {
+	}
+	return string(utf16.Decode(b[:n]))
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/guid.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/guid.go
new file mode 100644
index 0000000000..609ef0bfe3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/guid.go
@@ -0,0 +1,118 @@
+package ole
+
+var (
+	// IID_NULL is null Interface ID, used when no other Interface ID is known.
+	IID_NULL = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
+
+	// IID_IUnknown is for IUnknown interfaces.
+	IID_IUnknown = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+
+	// IID_IDispatch is for IDispatch interfaces.
+	IID_IDispatch = &GUID{0x00020400, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+
+	// IID_IEnumVariant is for IEnumVariant interfaces
+	IID_IEnumVariant = &GUID{0x00020404, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+
+	// IID_IConnectionPointContainer is for IConnectionPointContainer interfaces.
+	IID_IConnectionPointContainer = &GUID{0xB196B284, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+
+	// IID_IConnectionPoint is for IConnectionPoint interfaces.
+	IID_IConnectionPoint = &GUID{0xB196B286, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+
+	// IID_IInspectable is for IInspectable interfaces.
+	IID_IInspectable = &GUID{0xaf86e2e0, 0xb12d, 0x4c6a, [8]byte{0x9c, 0x5a, 0xd7, 0xaa, 0x65, 0x10, 0x1e, 0x90}}
+
+	// IID_IProvideClassInfo is for IProvideClassInfo interfaces.
+	IID_IProvideClassInfo = &GUID{0xb196b283, 0xbab4, 0x101a, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+)
+
+// These are for testing and not part of any library.
+var (
+	// IID_ICOMTestString is for ICOMTestString interfaces.
+	//
+	// {E0133EB4-C36F-469A-9D3D-C66B84BE19ED}
+	IID_ICOMTestString = &GUID{0xe0133eb4, 0xc36f, 0x469a, [8]byte{0x9d, 0x3d, 0xc6, 0x6b, 0x84, 0xbe, 0x19, 0xed}}
+
+	// IID_ICOMTestInt8 is for ICOMTestInt8 interfaces.
+	//
+	// {BEB06610-EB84-4155-AF58-E2BFF53608B4}
+	IID_ICOMTestInt8 = &GUID{0xbeb06610, 0xeb84, 0x4155, [8]byte{0xaf, 0x58, 0xe2, 0xbf, 0xf5, 0x36, 0x80, 0xb4}}
+
+	// IID_ICOMTestInt16 is for ICOMTestInt16 interfaces.
+	//
+	// {DAA3F9FA-761E-4976-A860-8364CE55F6FC}
+	IID_ICOMTestInt16 = &GUID{0xdaa3f9fa, 0x761e, 0x4976, [8]byte{0xa8, 0x60, 0x83, 0x64, 0xce, 0x55, 0xf6, 0xfc}}
+
+	// IID_ICOMTestInt32 is for ICOMTestInt32 interfaces.
+	//
+	// {E3DEDEE7-38A2-4540-91D1-2EEF1D8891B0}
+	IID_ICOMTestInt32 = &GUID{0xe3dedee7, 0x38a2, 0x4540, [8]byte{0x91, 0xd1, 0x2e, 0xef, 0x1d, 0x88, 0x91, 0xb0}}
+
+	// IID_ICOMTestInt64 is for ICOMTestInt64 interfaces.
+	//
+	// {8D437CBC-B3ED-485C-BC32-C336432A1623}
+	IID_ICOMTestInt64 = &GUID{0x8d437cbc, 0xb3ed, 0x485c, [8]byte{0xbc, 0x32, 0xc3, 0x36, 0x43, 0x2a, 0x16, 0x23}}
+
+	// IID_ICOMTestFloat is for ICOMTestFloat interfaces.
+	//
+	// {BF1ED004-EA02-456A-AA55-2AC8AC6B054C}
+	IID_ICOMTestFloat = &GUID{0xbf1ed004, 0xea02, 0x456a, [8]byte{0xaa, 0x55, 0x2a, 0xc8, 0xac, 0x6b, 0x5, 0x4c}}
+
+	// IID_ICOMTestDouble is for ICOMTestDouble interfaces.
+	//
+	// {BF908A81-8687-4E93-999F-D86FAB284BA0}
+	IID_ICOMTestDouble = &GUID{0xbf908a81, 0x8687, 0x4e93, [8]byte{0x99, 0x9f, 0xd8, 0x6f, 0xab, 0x28, 0x4b, 0xa0}}
+
+	// IID_ICOMTestBoolean is for ICOMTestBoolean interfaces.
+	//
+	// {D530E7A6-4EE8-40D1-8931-3D63B8605001}
+	IID_ICOMTestBoolean = &GUID{0xd530e7a6, 0x4ee8, 0x40d1, [8]byte{0x89, 0x31, 0x3d, 0x63, 0xb8, 0x60, 0x50, 0x10}}
+
+	// IID_ICOMEchoTestObject is for ICOMEchoTestObject interfaces.
+	//
+	// {6485B1EF-D780-4834-A4FE-1EBB51746CA3}
+	IID_ICOMEchoTestObject = &GUID{0x6485b1ef, 0xd780, 0x4834, [8]byte{0xa4, 0xfe, 0x1e, 0xbb, 0x51, 0x74, 0x6c, 0xa3}}
+
+	// IID_ICOMTestTypes is for ICOMTestTypes interfaces.
+	//
+	// {CCA8D7AE-91C0-4277-A8B3-FF4EDF28D3C0}
+	IID_ICOMTestTypes = &GUID{0xcca8d7ae, 0x91c0, 0x4277, [8]byte{0xa8, 0xb3, 0xff, 0x4e, 0xdf, 0x28, 0xd3, 0xc0}}
+
+	// CLSID_COMEchoTestObject is for COMEchoTestObject class.
+	//
+	// {3C24506A-AE9E-4D50-9157-EF317281F1B0}
+	CLSID_COMEchoTestObject = &GUID{0x3c24506a, 0xae9e, 0x4d50, [8]byte{0x91, 0x57, 0xef, 0x31, 0x72, 0x81, 0xf1, 0xb0}}
+
+	// CLSID_COMTestScalarClass is for COMTestScalarClass class.
+	//
+	// {865B85C5-0334-4AC6-9EF6-AACEC8FC5E86}
+	CLSID_COMTestScalarClass = &GUID{0x865b85c5, 0x0334, 0x4ac6, [8]byte{0x9e, 0xf6, 0xaa, 0xce, 0xc8, 0xfc, 0x5e, 0x86}}
+)
+
+// GUID is Windows API specific GUID type.
+//
+// This exists to match Windows GUID type for direct passing for COM.
+// Format is in xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxxxxxx.
+type GUID struct {
+	Data1 uint32
+	Data2 uint16
+	Data3 uint16
+	Data4 [8]byte
+}
+
+// IsEqualGUID compares two GUID.
+//
+// Not constant time comparison.
+func IsEqualGUID(guid1 *GUID, guid2 *GUID) bool {
+	return guid1.Data1 == guid2.Data1 &&
+		guid1.Data2 == guid2.Data2 &&
+		guid1.Data3 == guid2.Data3 &&
+		guid1.Data4[0] == guid2.Data4[0] &&
+		guid1.Data4[1] == guid2.Data4[1] &&
+		guid1.Data4[2] == guid2.Data4[2] &&
+		guid1.Data4[3] == guid2.Data4[3] &&
+		guid1.Data4[4] == guid2.Data4[4] &&
+		guid1.Data4[5] == guid2.Data4[5] &&
+		guid1.Data4[6] == guid2.Data4[6] &&
+		guid1.Data4[7] == guid2.Data4[7]
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint.go
new file mode 100644
index 0000000000..9e6c49f41f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint.go
@@ -0,0 +1,20 @@
+package ole
+
+import "unsafe"
+
+type IConnectionPoint struct {
+	IUnknown
+}
+
+type IConnectionPointVtbl struct {
+	IUnknownVtbl
+	GetConnectionInterface      uintptr
+	GetConnectionPointContainer uintptr
+	Advise                      uintptr
+	Unadvise                    uintptr
+	EnumConnections             uintptr
+}
+
+func (v *IConnectionPoint) VTable() *IConnectionPointVtbl {
+	return (*IConnectionPointVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_func.go
new file mode 100644
index 0000000000..5414dc3cd3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_func.go
@@ -0,0 +1,21 @@
+// +build !windows
+
+package ole
+
+import "unsafe"
+
+func (v *IConnectionPoint) GetConnectionInterface(piid **GUID) int32 {
+	return int32(0)
+}
+
+func (v *IConnectionPoint) Advise(unknown *IUnknown) (uint32, error) {
+	return uint32(0), NewError(E_NOTIMPL)
+}
+
+func (v *IConnectionPoint) Unadvise(cookie uint32) error {
+	return NewError(E_NOTIMPL)
+}
+
+func (v *IConnectionPoint) EnumConnections(p *unsafe.Pointer) (err error) {
+	return NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_windows.go
new file mode 100644
index 0000000000..32bc183248
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_windows.go
@@ -0,0 +1,43 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func (v *IConnectionPoint) GetConnectionInterface(piid **GUID) int32 {
+	// XXX: This doesn't look like it does what it's supposed to
+	return release((*IUnknown)(unsafe.Pointer(v)))
+}
+
+func (v *IConnectionPoint) Advise(unknown *IUnknown) (cookie uint32, err error) {
+	hr, _, _ := syscall.Syscall(
+		v.VTable().Advise,
+		3,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(unknown)),
+		uintptr(unsafe.Pointer(&cookie)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (v *IConnectionPoint) Unadvise(cookie uint32) (err error) {
+	hr, _, _ := syscall.Syscall(
+		v.VTable().Unadvise,
+		2,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(cookie),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (v *IConnectionPoint) EnumConnections(p *unsafe.Pointer) error {
+	return NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer.go
new file mode 100644
index 0000000000..165860d199
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer.go
@@ -0,0 +1,17 @@
+package ole
+
+import "unsafe"
+
+type IConnectionPointContainer struct {
+	IUnknown
+}
+
+type IConnectionPointContainerVtbl struct {
+	IUnknownVtbl
+	EnumConnectionPoints uintptr
+	FindConnectionPoint  uintptr
+}
+
+func (v *IConnectionPointContainer) VTable() *IConnectionPointContainerVtbl {
+	return (*IConnectionPointContainerVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go
new file mode 100644
index 0000000000..5dfa42aaeb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go
@@ -0,0 +1,11 @@
+// +build !windows
+
+package ole
+
+func (v *IConnectionPointContainer) EnumConnectionPoints(points interface{}) error {
+	return NewError(E_NOTIMPL)
+}
+
+func (v *IConnectionPointContainer) FindConnectionPoint(iid *GUID, point **IConnectionPoint) error {
+	return NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go
new file mode 100644
index 0000000000..ad30d79efc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go
@@ -0,0 +1,25 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func (v *IConnectionPointContainer) EnumConnectionPoints(points interface{}) error {
+	return NewError(E_NOTIMPL)
+}
+
+func (v *IConnectionPointContainer) FindConnectionPoint(iid *GUID, point **IConnectionPoint) (err error) {
+	hr, _, _ := syscall.Syscall(
+		v.VTable().FindConnectionPoint,
+		3,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(point)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch.go
new file mode 100644
index 0000000000..d4af124092
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch.go
@@ -0,0 +1,94 @@
+package ole
+
+import "unsafe"
+
+type IDispatch struct {
+	IUnknown
+}
+
+type IDispatchVtbl struct {
+	IUnknownVtbl
+	GetTypeInfoCount uintptr
+	GetTypeInfo      uintptr
+	GetIDsOfNames    uintptr
+	Invoke           uintptr
+}
+
+func (v *IDispatch) VTable() *IDispatchVtbl {
+	return (*IDispatchVtbl)(unsafe.Pointer(v.RawVTable))
+}
+
+func (v *IDispatch) GetIDsOfName(names []string) (dispid []int32, err error) {
+	dispid, err = getIDsOfName(v, names)
+	return
+}
+
+func (v *IDispatch) Invoke(dispid int32, dispatch int16, params ...interface{}) (result *VARIANT, err error) {
+	result, err = invoke(v, dispid, dispatch, params...)
+	return
+}
+
+func (v *IDispatch) GetTypeInfoCount() (c uint32, err error) {
+	c, err = getTypeInfoCount(v)
+	return
+}
+
+func (v *IDispatch) GetTypeInfo() (tinfo *ITypeInfo, err error) {
+	tinfo, err = getTypeInfo(v)
+	return
+}
+
+// GetSingleIDOfName is a helper that returns single display ID for IDispatch name.
+//
+// This replaces the common pattern of attempting to get a single name from the list of available
+// IDs. It gives the first ID, if it is available.
+func (v *IDispatch) GetSingleIDOfName(name string) (displayID int32, err error) {
+	var displayIDs []int32
+	displayIDs, err = v.GetIDsOfName([]string{name})
+	if err != nil {
+		return
+	}
+	displayID = displayIDs[0]
+	return
+}
+
+// InvokeWithOptionalArgs accepts arguments as an array, works like Invoke.
+//
+// Accepts name and will attempt to retrieve Display ID to pass to Invoke.
+//
+// Passing params as an array is a workaround that could be fixed in later versions of Go that
+// prevent passing empty params. During testing it was discovered that this is an acceptable way of
+// getting around not being able to pass params normally.
+func (v *IDispatch) InvokeWithOptionalArgs(name string, dispatch int16, params []interface{}) (result *VARIANT, err error) {
+	displayID, err := v.GetSingleIDOfName(name)
+	if err != nil {
+		return
+	}
+
+	if len(params) < 1 {
+		result, err = v.Invoke(displayID, dispatch)
+	} else {
+		result, err = v.Invoke(displayID, dispatch, params...)
+	}
+
+	return
+}
+
+// CallMethod invokes named function with arguments on object.
+func (v *IDispatch) CallMethod(name string, params ...interface{}) (*VARIANT, error) {
+	return v.InvokeWithOptionalArgs(name, DISPATCH_METHOD, params)
+}
+
+// GetProperty retrieves the property with the name with the ability to pass arguments.
+//
+// Most of the time you will not need to pass arguments as most objects do not allow for this
+// feature. Or at least, should not allow for this feature. Some servers don't follow best practices
+// and this is provided for those edge cases.
+func (v *IDispatch) GetProperty(name string, params ...interface{}) (*VARIANT, error) {
+	return v.InvokeWithOptionalArgs(name, DISPATCH_PROPERTYGET, params)
+}
+
+// PutProperty attempts to mutate a property in the object.
+func (v *IDispatch) PutProperty(name string, params ...interface{}) (*VARIANT, error) {
+	return v.InvokeWithOptionalArgs(name, DISPATCH_PROPERTYPUT, params)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_func.go
new file mode 100644
index 0000000000..b8fbbe319f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_func.go
@@ -0,0 +1,19 @@
+// +build !windows
+
+package ole
+
+func getIDsOfName(disp *IDispatch, names []string) ([]int32, error) {
+	return []int32{}, NewError(E_NOTIMPL)
+}
+
+func getTypeInfoCount(disp *IDispatch) (uint32, error) {
+	return uint32(0), NewError(E_NOTIMPL)
+}
+
+func getTypeInfo(disp *IDispatch) (*ITypeInfo, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+func invoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{}) (*VARIANT, error) {
+	return nil, NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_windows.go
new file mode 100644
index 0000000000..bb73690382
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_windows.go
@@ -0,0 +1,193 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"time"
+	"unsafe"
+)
+
+func getIDsOfName(disp *IDispatch, names []string) (dispid []int32, err error) {
+	wnames := make([]*uint16, len(names))
+	for i := 0; i < len(names); i++ {
+		wnames[i] = syscall.StringToUTF16Ptr(names[i])
+	}
+	dispid = make([]int32, len(names))
+	namelen := uint32(len(names))
+	hr, _, _ := syscall.Syscall6(
+		disp.VTable().GetIDsOfNames,
+		6,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(unsafe.Pointer(IID_NULL)),
+		uintptr(unsafe.Pointer(&wnames[0])),
+		uintptr(namelen),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(unsafe.Pointer(&dispid[0])))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func getTypeInfoCount(disp *IDispatch) (c uint32, err error) {
+	hr, _, _ := syscall.Syscall(
+		disp.VTable().GetTypeInfoCount,
+		2,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(unsafe.Pointer(&c)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func getTypeInfo(disp *IDispatch) (tinfo *ITypeInfo, err error) {
+	hr, _, _ := syscall.Syscall(
+		disp.VTable().GetTypeInfo,
+		3,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(unsafe.Pointer(&tinfo)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func invoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{}) (result *VARIANT, err error) {
+	var dispparams DISPPARAMS
+
+	if dispatch&DISPATCH_PROPERTYPUT != 0 {
+		dispnames := [1]int32{DISPID_PROPERTYPUT}
+		dispparams.rgdispidNamedArgs = uintptr(unsafe.Pointer(&dispnames[0]))
+		dispparams.cNamedArgs = 1
+	}
+	var vargs []VARIANT
+	if len(params) > 0 {
+		vargs = make([]VARIANT, len(params))
+		for i, v := range params {
+			//n := len(params)-i-1
+			n := len(params) - i - 1
+			VariantInit(&vargs[n])
+			switch vv := v.(type) {
+			case bool:
+				if vv {
+					vargs[n] = NewVariant(VT_BOOL, 0xffff)
+				} else {
+					vargs[n] = NewVariant(VT_BOOL, 0)
+				}
+			case *bool:
+				vargs[n] = NewVariant(VT_BOOL|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*bool)))))
+			case uint8:
+				vargs[n] = NewVariant(VT_I1, int64(v.(uint8)))
+			case *uint8:
+				vargs[n] = NewVariant(VT_I1|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint8)))))
+			case int8:
+				vargs[n] = NewVariant(VT_I1, int64(v.(int8)))
+			case *int8:
+				vargs[n] = NewVariant(VT_I1|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint8)))))
+			case int16:
+				vargs[n] = NewVariant(VT_I2, int64(v.(int16)))
+			case *int16:
+				vargs[n] = NewVariant(VT_I2|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int16)))))
+			case uint16:
+				vargs[n] = NewVariant(VT_UI2, int64(v.(uint16)))
+			case *uint16:
+				vargs[n] = NewVariant(VT_UI2|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint16)))))
+			case int32:
+				vargs[n] = NewVariant(VT_I4, int64(v.(int32)))
+			case *int32:
+				vargs[n] = NewVariant(VT_I4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int32)))))
+			case uint32:
+				vargs[n] = NewVariant(VT_UI4, int64(v.(uint32)))
+			case *uint32:
+				vargs[n] = NewVariant(VT_UI4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint32)))))
+			case int64:
+				vargs[n] = NewVariant(VT_I8, int64(v.(int64)))
+			case *int64:
+				vargs[n] = NewVariant(VT_I8|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int64)))))
+			case uint64:
+				vargs[n] = NewVariant(VT_UI8, int64(uintptr(v.(uint64))))
+			case *uint64:
+				vargs[n] = NewVariant(VT_UI8|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint64)))))
+			case int:
+				vargs[n] = NewVariant(VT_I4, int64(v.(int)))
+			case *int:
+				vargs[n] = NewVariant(VT_I4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int)))))
+			case uint:
+				vargs[n] = NewVariant(VT_UI4, int64(v.(uint)))
+			case *uint:
+				vargs[n] = NewVariant(VT_UI4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint)))))
+			case float32:
+				vargs[n] = NewVariant(VT_R4, *(*int64)(unsafe.Pointer(&vv)))
+			case *float32:
+				vargs[n] = NewVariant(VT_R4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*float32)))))
+			case float64:
+				vargs[n] = NewVariant(VT_R8, *(*int64)(unsafe.Pointer(&vv)))
+			case *float64:
+				vargs[n] = NewVariant(VT_R8|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*float64)))))
+			case string:
+				vargs[n] = NewVariant(VT_BSTR, int64(uintptr(unsafe.Pointer(SysAllocStringLen(v.(string))))))
+			case *string:
+				vargs[n] = NewVariant(VT_BSTR|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*string)))))
+			case time.Time:
+				s := vv.Format("2006-01-02 15:04:05")
+				vargs[n] = NewVariant(VT_BSTR, int64(uintptr(unsafe.Pointer(SysAllocStringLen(s)))))
+			case *time.Time:
+				s := vv.Format("2006-01-02 15:04:05")
+				vargs[n] = NewVariant(VT_BSTR|VT_BYREF, int64(uintptr(unsafe.Pointer(&s))))
+			case *IDispatch:
+				vargs[n] = NewVariant(VT_DISPATCH, int64(uintptr(unsafe.Pointer(v.(*IDispatch)))))
+			case **IDispatch:
+				vargs[n] = NewVariant(VT_DISPATCH|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(**IDispatch)))))
+			case nil:
+				vargs[n] = NewVariant(VT_NULL, 0)
+			case *VARIANT:
+				vargs[n] = NewVariant(VT_VARIANT|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*VARIANT)))))
+			case []byte:
+				safeByteArray := safeArrayFromByteSlice(v.([]byte))
+				vargs[n] = NewVariant(VT_ARRAY|VT_UI1, int64(uintptr(unsafe.Pointer(safeByteArray))))
+				defer VariantClear(&vargs[n])
+			case []string:
+				safeByteArray := safeArrayFromStringSlice(v.([]string))
+				vargs[n] = NewVariant(VT_ARRAY|VT_BSTR, int64(uintptr(unsafe.Pointer(safeByteArray))))
+				defer VariantClear(&vargs[n])
+			default:
+				panic("unknown type")
+			}
+		}
+		dispparams.rgvarg = uintptr(unsafe.Pointer(&vargs[0]))
+		dispparams.cArgs = uint32(len(params))
+	}
+
+	result = new(VARIANT)
+	var excepInfo EXCEPINFO
+	VariantInit(result)
+	hr, _, _ := syscall.Syscall9(
+		disp.VTable().Invoke,
+		9,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(dispid),
+		uintptr(unsafe.Pointer(IID_NULL)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(dispatch),
+		uintptr(unsafe.Pointer(&dispparams)),
+		uintptr(unsafe.Pointer(result)),
+		uintptr(unsafe.Pointer(&excepInfo)),
+		0)
+	if hr != 0 {
+		err = NewErrorWithSubError(hr, BstrToString(excepInfo.bstrDescription), excepInfo)
+	}
+	for i, varg := range vargs {
+		n := len(params) - i - 1
+		if varg.VT == VT_BSTR && varg.Val != 0 {
+			SysFreeString(((*int16)(unsafe.Pointer(uintptr(varg.Val)))))
+		}
+		if varg.VT == (VT_BSTR|VT_BYREF) && varg.Val != 0 {
+			*(params[n].(*string)) = LpOleStrToString(*(**uint16)(unsafe.Pointer(uintptr(varg.Val))))
+		}
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant.go
new file mode 100644
index 0000000000..2433897544
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant.go
@@ -0,0 +1,19 @@
+package ole
+
+import "unsafe"
+
+type IEnumVARIANT struct {
+	IUnknown
+}
+
+type IEnumVARIANTVtbl struct {
+	IUnknownVtbl
+	Next  uintptr
+	Skip  uintptr
+	Reset uintptr
+	Clone uintptr
+}
+
+func (v *IEnumVARIANT) VTable() *IEnumVARIANTVtbl {
+	return (*IEnumVARIANTVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_func.go
new file mode 100644
index 0000000000..c14848199c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_func.go
@@ -0,0 +1,19 @@
+// +build !windows
+
+package ole
+
+func (enum *IEnumVARIANT) Clone() (*IEnumVARIANT, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+func (enum *IEnumVARIANT) Reset() error {
+	return NewError(E_NOTIMPL)
+}
+
+func (enum *IEnumVARIANT) Skip(celt uint) error {
+	return NewError(E_NOTIMPL)
+}
+
+func (enum *IEnumVARIANT) Next(celt uint) (VARIANT, uint, error) {
+	return NewVariant(VT_NULL, int64(0)), 0, NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_windows.go
new file mode 100644
index 0000000000..4781f3b8b0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_windows.go
@@ -0,0 +1,63 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func (enum *IEnumVARIANT) Clone() (cloned *IEnumVARIANT, err error) {
+	hr, _, _ := syscall.Syscall(
+		enum.VTable().Clone,
+		2,
+		uintptr(unsafe.Pointer(enum)),
+		uintptr(unsafe.Pointer(&cloned)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (enum *IEnumVARIANT) Reset() (err error) {
+	hr, _, _ := syscall.Syscall(
+		enum.VTable().Reset,
+		1,
+		uintptr(unsafe.Pointer(enum)),
+		0,
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (enum *IEnumVARIANT) Skip(celt uint) (err error) {
+	hr, _, _ := syscall.Syscall(
+		enum.VTable().Skip,
+		2,
+		uintptr(unsafe.Pointer(enum)),
+		uintptr(celt),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (enum *IEnumVARIANT) Next(celt uint) (array VARIANT, length uint, err error) {
+	hr, _, _ := syscall.Syscall6(
+		enum.VTable().Next,
+		4,
+		uintptr(unsafe.Pointer(enum)),
+		uintptr(celt),
+		uintptr(unsafe.Pointer(&array)),
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable.go
new file mode 100644
index 0000000000..f4a19e253a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable.go
@@ -0,0 +1,18 @@
+package ole
+
+import "unsafe"
+
+type IInspectable struct {
+	IUnknown
+}
+
+type IInspectableVtbl struct {
+	IUnknownVtbl
+	GetIIds             uintptr
+	GetRuntimeClassName uintptr
+	GetTrustLevel       uintptr
+}
+
+func (v *IInspectable) VTable() *IInspectableVtbl {
+	return (*IInspectableVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_func.go
new file mode 100644
index 0000000000..348829bf06
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_func.go
@@ -0,0 +1,15 @@
+// +build !windows
+
+package ole
+
+func (v *IInspectable) GetIids() ([]*GUID, error) {
+	return []*GUID{}, NewError(E_NOTIMPL)
+}
+
+func (v *IInspectable) GetRuntimeClassName() (string, error) {
+	return "", NewError(E_NOTIMPL)
+}
+
+func (v *IInspectable) GetTrustLevel() (uint32, error) {
+	return uint32(0), NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_windows.go
new file mode 100644
index 0000000000..4519a4aa44
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_windows.go
@@ -0,0 +1,72 @@
+// +build windows
+
+package ole
+
+import (
+	"bytes"
+	"encoding/binary"
+	"reflect"
+	"syscall"
+	"unsafe"
+)
+
+func (v *IInspectable) GetIids() (iids []*GUID, err error) {
+	var count uint32
+	var array uintptr
+	hr, _, _ := syscall.Syscall(
+		v.VTable().GetIIds,
+		3,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(&count)),
+		uintptr(unsafe.Pointer(&array)))
+	if hr != 0 {
+		err = NewError(hr)
+		return
+	}
+	defer CoTaskMemFree(array)
+
+	iids = make([]*GUID, count)
+	byteCount := count * uint32(unsafe.Sizeof(GUID{}))
+	slicehdr := reflect.SliceHeader{Data: array, Len: int(byteCount), Cap: int(byteCount)}
+	byteSlice := *(*[]byte)(unsafe.Pointer(&slicehdr))
+	reader := bytes.NewReader(byteSlice)
+	for i := range iids {
+		guid := GUID{}
+		err = binary.Read(reader, binary.LittleEndian, &guid)
+		if err != nil {
+			return
+		}
+		iids[i] = &guid
+	}
+	return
+}
+
+func (v *IInspectable) GetRuntimeClassName() (s string, err error) {
+	var hstring HString
+	hr, _, _ := syscall.Syscall(
+		v.VTable().GetRuntimeClassName,
+		2,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(&hstring)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+		return
+	}
+	s = hstring.String()
+	DeleteHString(hstring)
+	return
+}
+
+func (v *IInspectable) GetTrustLevel() (level uint32, err error) {
+	hr, _, _ := syscall.Syscall(
+		v.VTable().GetTrustLevel,
+		2,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(&level)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo.go
new file mode 100644
index 0000000000..25f3a6f24a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo.go
@@ -0,0 +1,21 @@
+package ole
+
+import "unsafe"
+
+type IProvideClassInfo struct {
+	IUnknown
+}
+
+type IProvideClassInfoVtbl struct {
+	IUnknownVtbl
+	GetClassInfo uintptr
+}
+
+func (v *IProvideClassInfo) VTable() *IProvideClassInfoVtbl {
+	return (*IProvideClassInfoVtbl)(unsafe.Pointer(v.RawVTable))
+}
+
+func (v *IProvideClassInfo) GetClassInfo() (cinfo *ITypeInfo, err error) {
+	cinfo, err = getClassInfo(v)
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_func.go
new file mode 100644
index 0000000000..7e3cb63ea7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_func.go
@@ -0,0 +1,7 @@
+// +build !windows
+
+package ole
+
+func getClassInfo(disp *IProvideClassInfo) (tinfo *ITypeInfo, err error) {
+	return nil, NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_windows.go
new file mode 100644
index 0000000000..2ad0163949
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_windows.go
@@ -0,0 +1,21 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func getClassInfo(disp *IProvideClassInfo) (tinfo *ITypeInfo, err error) {
+	hr, _, _ := syscall.Syscall(
+		disp.VTable().GetClassInfo,
+		2,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(unsafe.Pointer(&tinfo)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo.go
new file mode 100644
index 0000000000..dd3c5e21bb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo.go
@@ -0,0 +1,34 @@
+package ole
+
+import "unsafe"
+
+type ITypeInfo struct {
+	IUnknown
+}
+
+type ITypeInfoVtbl struct {
+	IUnknownVtbl
+	GetTypeAttr          uintptr
+	GetTypeComp          uintptr
+	GetFuncDesc          uintptr
+	GetVarDesc           uintptr
+	GetNames             uintptr
+	GetRefTypeOfImplType uintptr
+	GetImplTypeFlags     uintptr
+	GetIDsOfNames        uintptr
+	Invoke               uintptr
+	GetDocumentation     uintptr
+	GetDllEntry          uintptr
+	GetRefTypeInfo       uintptr
+	AddressOfMember      uintptr
+	CreateInstance       uintptr
+	GetMops              uintptr
+	GetContainingTypeLib uintptr
+	ReleaseTypeAttr      uintptr
+	ReleaseFuncDesc      uintptr
+	ReleaseVarDesc       uintptr
+}
+
+func (v *ITypeInfo) VTable() *ITypeInfoVtbl {
+	return (*ITypeInfoVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_func.go
new file mode 100644
index 0000000000..8364a659ba
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_func.go
@@ -0,0 +1,7 @@
+// +build !windows
+
+package ole
+
+func (v *ITypeInfo) GetTypeAttr() (*TYPEATTR, error) {
+	return nil, NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_windows.go
new file mode 100644
index 0000000000..54782b3da5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_windows.go
@@ -0,0 +1,21 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func (v *ITypeInfo) GetTypeAttr() (tattr *TYPEATTR, err error) {
+	hr, _, _ := syscall.Syscall(
+		uintptr(v.VTable().GetTypeAttr),
+		2,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(&tattr)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown.go
new file mode 100644
index 0000000000..108f28ea61
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown.go
@@ -0,0 +1,57 @@
+package ole
+
+import "unsafe"
+
+type IUnknown struct {
+	RawVTable *interface{}
+}
+
+type IUnknownVtbl struct {
+	QueryInterface uintptr
+	AddRef         uintptr
+	Release        uintptr
+}
+
+type UnknownLike interface {
+	QueryInterface(iid *GUID) (disp *IDispatch, err error)
+	AddRef() int32
+	Release() int32
+}
+
+func (v *IUnknown) VTable() *IUnknownVtbl {
+	return (*IUnknownVtbl)(unsafe.Pointer(v.RawVTable))
+}
+
+func (v *IUnknown) PutQueryInterface(interfaceID *GUID, obj interface{}) error {
+	return reflectQueryInterface(v, v.VTable().QueryInterface, interfaceID, obj)
+}
+
+func (v *IUnknown) IDispatch(interfaceID *GUID) (dispatch *IDispatch, err error) {
+	err = v.PutQueryInterface(interfaceID, &dispatch)
+	return
+}
+
+func (v *IUnknown) IEnumVARIANT(interfaceID *GUID) (enum *IEnumVARIANT, err error) {
+	err = v.PutQueryInterface(interfaceID, &enum)
+	return
+}
+
+func (v *IUnknown) QueryInterface(iid *GUID) (*IDispatch, error) {
+	return queryInterface(v, iid)
+}
+
+func (v *IUnknown) MustQueryInterface(iid *GUID) (disp *IDispatch) {
+	unk, err := queryInterface(v, iid)
+	if err != nil {
+		panic(err)
+	}
+	return unk
+}
+
+func (v *IUnknown) AddRef() int32 {
+	return addRef(v)
+}
+
+func (v *IUnknown) Release() int32 {
+	return release(v)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_func.go
new file mode 100644
index 0000000000..d0a62cfd73
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_func.go
@@ -0,0 +1,19 @@
+// +build !windows
+
+package ole
+
+func reflectQueryInterface(self interface{}, method uintptr, interfaceID *GUID, obj interface{}) (err error) {
+	return NewError(E_NOTIMPL)
+}
+
+func queryInterface(unk *IUnknown, iid *GUID) (disp *IDispatch, err error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+func addRef(unk *IUnknown) int32 {
+	return 0
+}
+
+func release(unk *IUnknown) int32 {
+	return 0
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_windows.go
new file mode 100644
index 0000000000..ede5bb8c17
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_windows.go
@@ -0,0 +1,58 @@
+// +build windows
+
+package ole
+
+import (
+	"reflect"
+	"syscall"
+	"unsafe"
+)
+
+func reflectQueryInterface(self interface{}, method uintptr, interfaceID *GUID, obj interface{}) (err error) {
+	selfValue := reflect.ValueOf(self).Elem()
+	objValue := reflect.ValueOf(obj).Elem()
+
+	hr, _, _ := syscall.Syscall(
+		method,
+		3,
+		selfValue.UnsafeAddr(),
+		uintptr(unsafe.Pointer(interfaceID)),
+		objValue.Addr().Pointer())
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func queryInterface(unk *IUnknown, iid *GUID) (disp *IDispatch, err error) {
+	hr, _, _ := syscall.Syscall(
+		unk.VTable().QueryInterface,
+		3,
+		uintptr(unsafe.Pointer(unk)),
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(&disp)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func addRef(unk *IUnknown) int32 {
+	ret, _, _ := syscall.Syscall(
+		unk.VTable().AddRef,
+		1,
+		uintptr(unsafe.Pointer(unk)),
+		0,
+		0)
+	return int32(ret)
+}
+
+func release(unk *IUnknown) int32 {
+	ret, _, _ := syscall.Syscall(
+		unk.VTable().Release,
+		1,
+		uintptr(unsafe.Pointer(unk)),
+		0,
+		0)
+	return int32(ret)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ole.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/ole.go
new file mode 100644
index 0000000000..b92b4ea189
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/ole.go
@@ -0,0 +1,147 @@
+package ole
+
+import (
+	"fmt"
+	"strings"
+)
+
+// DISPPARAMS are the arguments that passed to methods or property.
+type DISPPARAMS struct {
+	rgvarg            uintptr
+	rgdispidNamedArgs uintptr
+	cArgs             uint32
+	cNamedArgs        uint32
+}
+
+// EXCEPINFO defines exception info.
+type EXCEPINFO struct {
+	wCode             uint16
+	wReserved         uint16
+	bstrSource        *uint16
+	bstrDescription   *uint16
+	bstrHelpFile      *uint16
+	dwHelpContext     uint32
+	pvReserved        uintptr
+	pfnDeferredFillIn uintptr
+	scode             uint32
+}
+
+// String convert EXCEPINFO to string.
+func (e EXCEPINFO) String() string {
+	var src, desc, hlp string
+	if e.bstrSource == nil {
+		src = "<nil>"
+	} else {
+		src = BstrToString(e.bstrSource)
+	}
+
+	if e.bstrDescription == nil {
+		desc = "<nil>"
+	} else {
+		desc = BstrToString(e.bstrDescription)
+	}
+
+	if e.bstrHelpFile == nil {
+		hlp = "<nil>"
+	} else {
+		hlp = BstrToString(e.bstrHelpFile)
+	}
+
+	return fmt.Sprintf(
+		"wCode: %#x, bstrSource: %v, bstrDescription: %v, bstrHelpFile: %v, dwHelpContext: %#x, scode: %#x",
+		e.wCode, src, desc, hlp, e.dwHelpContext, e.scode,
+	)
+}
+
+// Error implements error interface and returns error string.
+func (e EXCEPINFO) Error() string {
+	if e.bstrDescription != nil {
+		return strings.TrimSpace(BstrToString(e.bstrDescription))
+	}
+
+	src := "Unknown"
+	if e.bstrSource != nil {
+		src = BstrToString(e.bstrSource)
+	}
+
+	code := e.scode
+	if e.wCode != 0 {
+		code = uint32(e.wCode)
+	}
+
+	return fmt.Sprintf("%v: %#x", src, code)
+}
+
+// PARAMDATA defines parameter data type.
+type PARAMDATA struct {
+	Name *int16
+	Vt   uint16
+}
+
+// METHODDATA defines method info.
+type METHODDATA struct {
+	Name     *uint16
+	Data     *PARAMDATA
+	Dispid   int32
+	Meth     uint32
+	CC       int32
+	CArgs    uint32
+	Flags    uint16
+	VtReturn uint32
+}
+
+// INTERFACEDATA defines interface info.
+type INTERFACEDATA struct {
+	MethodData *METHODDATA
+	CMembers   uint32
+}
+
+// Point is 2D vector type.
+type Point struct {
+	X int32
+	Y int32
+}
+
+// Msg is message between processes.
+type Msg struct {
+	Hwnd    uint32
+	Message uint32
+	Wparam  int32
+	Lparam  int32
+	Time    uint32
+	Pt      Point
+}
+
+// TYPEDESC defines data type.
+type TYPEDESC struct {
+	Hreftype uint32
+	VT       uint16
+}
+
+// IDLDESC defines IDL info.
+type IDLDESC struct {
+	DwReserved uint32
+	WIDLFlags  uint16
+}
+
+// TYPEATTR defines type info.
+type TYPEATTR struct {
+	Guid             GUID
+	Lcid             uint32
+	dwReserved       uint32
+	MemidConstructor int32
+	MemidDestructor  int32
+	LpstrSchema      *uint16
+	CbSizeInstance   uint32
+	Typekind         int32
+	CFuncs           uint16
+	CVars            uint16
+	CImplTypes       uint16
+	CbSizeVft        uint16
+	CbAlignment      uint16
+	WTypeFlags       uint16
+	WMajorVerNum     uint16
+	WMinorVerNum     uint16
+	TdescAlias       TYPEDESC
+	IdldescType      IDLDESC
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection.go
new file mode 100644
index 0000000000..60df73cda0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection.go
@@ -0,0 +1,100 @@
+// +build windows
+
+package oleutil
+
+import (
+	"reflect"
+	"unsafe"
+
+	ole "github.com/go-ole/go-ole"
+)
+
+type stdDispatch struct {
+	lpVtbl  *stdDispatchVtbl
+	ref     int32
+	iid     *ole.GUID
+	iface   interface{}
+	funcMap map[string]int32
+}
+
+type stdDispatchVtbl struct {
+	pQueryInterface   uintptr
+	pAddRef           uintptr
+	pRelease          uintptr
+	pGetTypeInfoCount uintptr
+	pGetTypeInfo      uintptr
+	pGetIDsOfNames    uintptr
+	pInvoke           uintptr
+}
+
+func dispQueryInterface(this *ole.IUnknown, iid *ole.GUID, punk **ole.IUnknown) uint32 {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	*punk = nil
+	if ole.IsEqualGUID(iid, ole.IID_IUnknown) ||
+		ole.IsEqualGUID(iid, ole.IID_IDispatch) {
+		dispAddRef(this)
+		*punk = this
+		return ole.S_OK
+	}
+	if ole.IsEqualGUID(iid, pthis.iid) {
+		dispAddRef(this)
+		*punk = this
+		return ole.S_OK
+	}
+	return ole.E_NOINTERFACE
+}
+
+func dispAddRef(this *ole.IUnknown) int32 {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	pthis.ref++
+	return pthis.ref
+}
+
+func dispRelease(this *ole.IUnknown) int32 {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	pthis.ref--
+	return pthis.ref
+}
+
+func dispGetIDsOfNames(this *ole.IUnknown, iid *ole.GUID, wnames []*uint16, namelen int, lcid int, pdisp []int32) uintptr {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	names := make([]string, len(wnames))
+	for i := 0; i < len(names); i++ {
+		names[i] = ole.LpOleStrToString(wnames[i])
+	}
+	for n := 0; n < namelen; n++ {
+		if id, ok := pthis.funcMap[names[n]]; ok {
+			pdisp[n] = id
+		}
+	}
+	return ole.S_OK
+}
+
+func dispGetTypeInfoCount(pcount *int) uintptr {
+	if pcount != nil {
+		*pcount = 0
+	}
+	return ole.S_OK
+}
+
+func dispGetTypeInfo(ptypeif *uintptr) uintptr {
+	return ole.E_NOTIMPL
+}
+
+func dispInvoke(this *ole.IDispatch, dispid int32, riid *ole.GUID, lcid int, flags int16, dispparams *ole.DISPPARAMS, result *ole.VARIANT, pexcepinfo *ole.EXCEPINFO, nerr *uint) uintptr {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	found := ""
+	for name, id := range pthis.funcMap {
+		if id == dispid {
+			found = name
+		}
+	}
+	if found != "" {
+		rv := reflect.ValueOf(pthis.iface).Elem()
+		rm := rv.MethodByName(found)
+		rr := rm.Call([]reflect.Value{})
+		println(len(rr))
+		return ole.S_OK
+	}
+	return ole.E_NOTIMPL
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_func.go
new file mode 100644
index 0000000000..8818fb8275
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_func.go
@@ -0,0 +1,10 @@
+// +build !windows
+
+package oleutil
+
+import ole "github.com/go-ole/go-ole"
+
+// ConnectObject creates a connection point between two services for communication.
+func ConnectObject(disp *ole.IDispatch, iid *ole.GUID, idisp interface{}) (uint32, error) {
+	return 0, ole.NewError(ole.E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_windows.go
new file mode 100644
index 0000000000..6b5c059993
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_windows.go
@@ -0,0 +1,57 @@
+// +build windows
+
+package oleutil
+
+import (
+	"reflect"
+	"syscall"
+	"unsafe"
+
+	ole "github.com/go-ole/go-ole"
+)
+
+// ConnectObject creates a connection point between two services for communication.
+func ConnectObject(disp *ole.IDispatch, iid *ole.GUID, idisp interface{}) (cookie uint32, err error) {
+	unknown, err := disp.QueryInterface(ole.IID_IConnectionPointContainer)
+	if err != nil {
+		return
+	}
+
+	container := (*ole.IConnectionPointContainer)(unsafe.Pointer(unknown))
+	var point *ole.IConnectionPoint
+	err = container.FindConnectionPoint(iid, &point)
+	if err != nil {
+		return
+	}
+	if edisp, ok := idisp.(*ole.IUnknown); ok {
+		cookie, err = point.Advise(edisp)
+		container.Release()
+		if err != nil {
+			return
+		}
+	}
+	rv := reflect.ValueOf(disp).Elem()
+	if rv.Type().Kind() == reflect.Struct {
+		dest := &stdDispatch{}
+		dest.lpVtbl = &stdDispatchVtbl{}
+		dest.lpVtbl.pQueryInterface = syscall.NewCallback(dispQueryInterface)
+		dest.lpVtbl.pAddRef = syscall.NewCallback(dispAddRef)
+		dest.lpVtbl.pRelease = syscall.NewCallback(dispRelease)
+		dest.lpVtbl.pGetTypeInfoCount = syscall.NewCallback(dispGetTypeInfoCount)
+		dest.lpVtbl.pGetTypeInfo = syscall.NewCallback(dispGetTypeInfo)
+		dest.lpVtbl.pGetIDsOfNames = syscall.NewCallback(dispGetIDsOfNames)
+		dest.lpVtbl.pInvoke = syscall.NewCallback(dispInvoke)
+		dest.iface = disp
+		dest.iid = iid
+		cookie, err = point.Advise((*ole.IUnknown)(unsafe.Pointer(dest)))
+		container.Release()
+		if err != nil {
+			point.Release()
+			return
+		}
+	}
+
+	container.Release()
+
+	return 0, ole.NewError(ole.E_INVALIDARG)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/go-get.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/go-get.go
new file mode 100644
index 0000000000..58347628f2
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/go-get.go
@@ -0,0 +1,6 @@
+// This file is here so go get succeeds as without it errors with:
+// no buildable Go source files in ...
+//
+// +build !windows
+
+package oleutil
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/oleutil.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/oleutil.go
new file mode 100644
index 0000000000..55e072a636
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/oleutil.go
@@ -0,0 +1,89 @@
+package oleutil
+
+import ole "github.com/go-ole/go-ole"
+
+// ClassIDFrom retrieves class ID whether given is program ID or application string.
+func ClassIDFrom(programID string) (classID *ole.GUID, err error) {
+	return ole.ClassIDFrom(programID)
+}
+
+// CreateObject creates object from programID based on interface type.
+//
+// Only supports IUnknown.
+//
+// Program ID can be either program ID or application string.
+func CreateObject(programID string) (unknown *ole.IUnknown, err error) {
+	classID, err := ole.ClassIDFrom(programID)
+	if err != nil {
+		return
+	}
+
+	unknown, err = ole.CreateInstance(classID, ole.IID_IUnknown)
+	if err != nil {
+		return
+	}
+
+	return
+}
+
+// GetActiveObject retrieves active object for program ID and interface ID based
+// on interface type.
+//
+// Only supports IUnknown.
+//
+// Program ID can be either program ID or application string.
+func GetActiveObject(programID string) (unknown *ole.IUnknown, err error) {
+	classID, err := ole.ClassIDFrom(programID)
+	if err != nil {
+		return
+	}
+
+	unknown, err = ole.GetActiveObject(classID, ole.IID_IUnknown)
+	if err != nil {
+		return
+	}
+
+	return
+}
+
+// CallMethod calls method on IDispatch with parameters.
+func CallMethod(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT, err error) {
+	return disp.InvokeWithOptionalArgs(name, ole.DISPATCH_METHOD, params)
+}
+
+// MustCallMethod calls method on IDispatch with parameters or panics.
+func MustCallMethod(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT) {
+	r, err := CallMethod(disp, name, params...)
+	if err != nil {
+		panic(err.Error())
+	}
+	return r
+}
+
+// GetProperty retrieves property from IDispatch.
+func GetProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT, err error) {
+	return disp.InvokeWithOptionalArgs(name, ole.DISPATCH_PROPERTYGET, params)
+}
+
+// MustGetProperty retrieves property from IDispatch or panics.
+func MustGetProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT) {
+	r, err := GetProperty(disp, name, params...)
+	if err != nil {
+		panic(err.Error())
+	}
+	return r
+}
+
+// PutProperty mutates property.
+func PutProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT, err error) {
+	return disp.InvokeWithOptionalArgs(name, ole.DISPATCH_PROPERTYPUT, params)
+}
+
+// MustPutProperty mutates property or panics.
+func MustPutProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT) {
+	r, err := PutProperty(disp, name, params...)
+	if err != nil {
+		panic(err.Error())
+	}
+	return r
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray.go
new file mode 100644
index 0000000000..a5201b56c3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray.go
@@ -0,0 +1,27 @@
+// Package is meant to retrieve and process safe array data returned from COM.
+
+package ole
+
+// SafeArrayBound defines the SafeArray boundaries.
+type SafeArrayBound struct {
+	Elements   uint32
+	LowerBound int32
+}
+
+// SafeArray is how COM handles arrays.
+type SafeArray struct {
+	Dimensions   uint16
+	FeaturesFlag uint16
+	ElementsSize uint32
+	LocksAmount  uint32
+	Data         uint32
+	Bounds       [16]byte
+}
+
+// SAFEARRAY is obsolete, exists for backwards compatibility.
+// Use SafeArray
+type SAFEARRAY SafeArray
+
+// SAFEARRAYBOUND is obsolete, exists for backwards compatibility.
+// Use SafeArrayBound
+type SAFEARRAYBOUND SafeArrayBound
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_func.go
new file mode 100644
index 0000000000..8ff0baa41d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_func.go
@@ -0,0 +1,211 @@
+// +build !windows
+
+package ole
+
+import (
+	"unsafe"
+)
+
+// safeArrayAccessData returns raw array pointer.
+//
+// AKA: SafeArrayAccessData in Windows API.
+func safeArrayAccessData(safearray *SafeArray) (uintptr, error) {
+	return uintptr(0), NewError(E_NOTIMPL)
+}
+
+// safeArrayUnaccessData releases raw array.
+//
+// AKA: SafeArrayUnaccessData in Windows API.
+func safeArrayUnaccessData(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayAllocData allocates SafeArray.
+//
+// AKA: SafeArrayAllocData in Windows API.
+func safeArrayAllocData(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayAllocDescriptor allocates SafeArray.
+//
+// AKA: SafeArrayAllocDescriptor in Windows API.
+func safeArrayAllocDescriptor(dimensions uint32) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayAllocDescriptorEx allocates SafeArray.
+//
+// AKA: SafeArrayAllocDescriptorEx in Windows API.
+func safeArrayAllocDescriptorEx(variantType VT, dimensions uint32) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCopy returns copy of SafeArray.
+//
+// AKA: SafeArrayCopy in Windows API.
+func safeArrayCopy(original *SafeArray) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCopyData duplicates SafeArray into another SafeArray object.
+//
+// AKA: SafeArrayCopyData in Windows API.
+func safeArrayCopyData(original *SafeArray, duplicate *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayCreate creates SafeArray.
+//
+// AKA: SafeArrayCreate in Windows API.
+func safeArrayCreate(variantType VT, dimensions uint32, bounds *SafeArrayBound) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCreateEx creates SafeArray.
+//
+// AKA: SafeArrayCreateEx in Windows API.
+func safeArrayCreateEx(variantType VT, dimensions uint32, bounds *SafeArrayBound, extra uintptr) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCreateVector creates SafeArray.
+//
+// AKA: SafeArrayCreateVector in Windows API.
+func safeArrayCreateVector(variantType VT, lowerBound int32, length uint32) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCreateVectorEx creates SafeArray.
+//
+// AKA: SafeArrayCreateVectorEx in Windows API.
+func safeArrayCreateVectorEx(variantType VT, lowerBound int32, length uint32, extra uintptr) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayDestroy destroys SafeArray object.
+//
+// AKA: SafeArrayDestroy in Windows API.
+func safeArrayDestroy(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayDestroyData destroys SafeArray object.
+//
+// AKA: SafeArrayDestroyData in Windows API.
+func safeArrayDestroyData(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayDestroyDescriptor destroys SafeArray object.
+//
+// AKA: SafeArrayDestroyDescriptor in Windows API.
+func safeArrayDestroyDescriptor(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayGetDim is the amount of dimensions in the SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetDim in Windows API.
+func safeArrayGetDim(safearray *SafeArray) (*uint32, error) {
+	u := uint32(0)
+	return &u, NewError(E_NOTIMPL)
+}
+
+// safeArrayGetElementSize is the element size in bytes.
+//
+// AKA: SafeArrayGetElemsize in Windows API.
+func safeArrayGetElementSize(safearray *SafeArray) (*uint32, error) {
+	u := uint32(0)
+	return &u, NewError(E_NOTIMPL)
+}
+
+// safeArrayGetElement retrieves element at given index.
+func safeArrayGetElement(safearray *SafeArray, index int64, pv unsafe.Pointer) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayGetElement retrieves element at given index and converts to string.
+func safeArrayGetElementString(safearray *SafeArray, index int64) (string, error) {
+	return "", NewError(E_NOTIMPL)
+}
+
+// safeArrayGetIID is the InterfaceID of the elements in the SafeArray.
+//
+// AKA: SafeArrayGetIID in Windows API.
+func safeArrayGetIID(safearray *SafeArray) (*GUID, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayGetLBound returns lower bounds of SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetLBound in Windows API.
+func safeArrayGetLBound(safearray *SafeArray, dimension uint32) (int64, error) {
+	return int64(0), NewError(E_NOTIMPL)
+}
+
+// safeArrayGetUBound returns upper bounds of SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetUBound in Windows API.
+func safeArrayGetUBound(safearray *SafeArray, dimension uint32) (int64, error) {
+	return int64(0), NewError(E_NOTIMPL)
+}
+
+// safeArrayGetVartype returns data type of SafeArray.
+//
+// AKA: SafeArrayGetVartype in Windows API.
+func safeArrayGetVartype(safearray *SafeArray) (uint16, error) {
+	return uint16(0), NewError(E_NOTIMPL)
+}
+
+// safeArrayLock locks SafeArray for reading to modify SafeArray.
+//
+// This must be called during some calls to ensure that another process does not
+// read or write to the SafeArray during editing.
+//
+// AKA: SafeArrayLock in Windows API.
+func safeArrayLock(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayUnlock unlocks SafeArray for reading.
+//
+// AKA: SafeArrayUnlock in Windows API.
+func safeArrayUnlock(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayPutElement stores the data element at the specified location in the
+// array.
+//
+// AKA: SafeArrayPutElement in Windows API.
+func safeArrayPutElement(safearray *SafeArray, index int64, element uintptr) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayGetRecordInfo accesses IRecordInfo info for custom types.
+//
+// AKA: SafeArrayGetRecordInfo in Windows API.
+//
+// XXX: Must implement IRecordInfo interface for this to return.
+func safeArrayGetRecordInfo(safearray *SafeArray) (interface{}, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArraySetRecordInfo mutates IRecordInfo info for custom types.
+//
+// AKA: SafeArraySetRecordInfo in Windows API.
+//
+// XXX: Must implement IRecordInfo interface for this to return.
+func safeArraySetRecordInfo(safearray *SafeArray, recordInfo interface{}) error {
+	return NewError(E_NOTIMPL)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_windows.go
new file mode 100644
index 0000000000..b27936e24e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_windows.go
@@ -0,0 +1,337 @@
+// +build windows
+
+package ole
+
+import (
+	"unsafe"
+)
+
+var (
+	procSafeArrayAccessData, _        = modoleaut32.FindProc("SafeArrayAccessData")
+	procSafeArrayAllocData, _         = modoleaut32.FindProc("SafeArrayAllocData")
+	procSafeArrayAllocDescriptor, _   = modoleaut32.FindProc("SafeArrayAllocDescriptor")
+	procSafeArrayAllocDescriptorEx, _ = modoleaut32.FindProc("SafeArrayAllocDescriptorEx")
+	procSafeArrayCopy, _              = modoleaut32.FindProc("SafeArrayCopy")
+	procSafeArrayCopyData, _          = modoleaut32.FindProc("SafeArrayCopyData")
+	procSafeArrayCreate, _            = modoleaut32.FindProc("SafeArrayCreate")
+	procSafeArrayCreateEx, _          = modoleaut32.FindProc("SafeArrayCreateEx")
+	procSafeArrayCreateVector, _      = modoleaut32.FindProc("SafeArrayCreateVector")
+	procSafeArrayCreateVectorEx, _    = modoleaut32.FindProc("SafeArrayCreateVectorEx")
+	procSafeArrayDestroy, _           = modoleaut32.FindProc("SafeArrayDestroy")
+	procSafeArrayDestroyData, _       = modoleaut32.FindProc("SafeArrayDestroyData")
+	procSafeArrayDestroyDescriptor, _ = modoleaut32.FindProc("SafeArrayDestroyDescriptor")
+	procSafeArrayGetDim, _            = modoleaut32.FindProc("SafeArrayGetDim")
+	procSafeArrayGetElement, _        = modoleaut32.FindProc("SafeArrayGetElement")
+	procSafeArrayGetElemsize, _       = modoleaut32.FindProc("SafeArrayGetElemsize")
+	procSafeArrayGetIID, _            = modoleaut32.FindProc("SafeArrayGetIID")
+	procSafeArrayGetLBound, _         = modoleaut32.FindProc("SafeArrayGetLBound")
+	procSafeArrayGetUBound, _         = modoleaut32.FindProc("SafeArrayGetUBound")
+	procSafeArrayGetVartype, _        = modoleaut32.FindProc("SafeArrayGetVartype")
+	procSafeArrayLock, _              = modoleaut32.FindProc("SafeArrayLock")
+	procSafeArrayPtrOfIndex, _        = modoleaut32.FindProc("SafeArrayPtrOfIndex")
+	procSafeArrayUnaccessData, _      = modoleaut32.FindProc("SafeArrayUnaccessData")
+	procSafeArrayUnlock, _            = modoleaut32.FindProc("SafeArrayUnlock")
+	procSafeArrayPutElement, _        = modoleaut32.FindProc("SafeArrayPutElement")
+	//procSafeArrayRedim, _             = modoleaut32.FindProc("SafeArrayRedim") // TODO
+	//procSafeArraySetIID, _            = modoleaut32.FindProc("SafeArraySetIID") // TODO
+	procSafeArrayGetRecordInfo, _ = modoleaut32.FindProc("SafeArrayGetRecordInfo")
+	procSafeArraySetRecordInfo, _ = modoleaut32.FindProc("SafeArraySetRecordInfo")
+)
+
+// safeArrayAccessData returns raw array pointer.
+//
+// AKA: SafeArrayAccessData in Windows API.
+// Todo: Test
+func safeArrayAccessData(safearray *SafeArray) (element uintptr, err error) {
+	err = convertHresultToError(
+		procSafeArrayAccessData.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&element))))
+	return
+}
+
+// safeArrayUnaccessData releases raw array.
+//
+// AKA: SafeArrayUnaccessData in Windows API.
+func safeArrayUnaccessData(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayUnaccessData.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayAllocData allocates SafeArray.
+//
+// AKA: SafeArrayAllocData in Windows API.
+func safeArrayAllocData(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayAllocData.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayAllocDescriptor allocates SafeArray.
+//
+// AKA: SafeArrayAllocDescriptor in Windows API.
+func safeArrayAllocDescriptor(dimensions uint32) (safearray *SafeArray, err error) {
+	err = convertHresultToError(
+		procSafeArrayAllocDescriptor.Call(uintptr(dimensions), uintptr(unsafe.Pointer(&safearray))))
+	return
+}
+
+// safeArrayAllocDescriptorEx allocates SafeArray.
+//
+// AKA: SafeArrayAllocDescriptorEx in Windows API.
+func safeArrayAllocDescriptorEx(variantType VT, dimensions uint32) (safearray *SafeArray, err error) {
+	err = convertHresultToError(
+		procSafeArrayAllocDescriptorEx.Call(
+			uintptr(variantType),
+			uintptr(dimensions),
+			uintptr(unsafe.Pointer(&safearray))))
+	return
+}
+
+// safeArrayCopy returns copy of SafeArray.
+//
+// AKA: SafeArrayCopy in Windows API.
+func safeArrayCopy(original *SafeArray) (safearray *SafeArray, err error) {
+	err = convertHresultToError(
+		procSafeArrayCopy.Call(
+			uintptr(unsafe.Pointer(original)),
+			uintptr(unsafe.Pointer(&safearray))))
+	return
+}
+
+// safeArrayCopyData duplicates SafeArray into another SafeArray object.
+//
+// AKA: SafeArrayCopyData in Windows API.
+func safeArrayCopyData(original *SafeArray, duplicate *SafeArray) (err error) {
+	err = convertHresultToError(
+		procSafeArrayCopyData.Call(
+			uintptr(unsafe.Pointer(original)),
+			uintptr(unsafe.Pointer(duplicate))))
+	return
+}
+
+// safeArrayCreate creates SafeArray.
+//
+// AKA: SafeArrayCreate in Windows API.
+func safeArrayCreate(variantType VT, dimensions uint32, bounds *SafeArrayBound) (safearray *SafeArray, err error) {
+	sa, _, err := procSafeArrayCreate.Call(
+		uintptr(variantType),
+		uintptr(dimensions),
+		uintptr(unsafe.Pointer(bounds)))
+	safearray = (*SafeArray)(unsafe.Pointer(&sa))
+	return
+}
+
+// safeArrayCreateEx creates SafeArray.
+//
+// AKA: SafeArrayCreateEx in Windows API.
+func safeArrayCreateEx(variantType VT, dimensions uint32, bounds *SafeArrayBound, extra uintptr) (safearray *SafeArray, err error) {
+	sa, _, err := procSafeArrayCreateEx.Call(
+		uintptr(variantType),
+		uintptr(dimensions),
+		uintptr(unsafe.Pointer(bounds)),
+		extra)
+	safearray = (*SafeArray)(unsafe.Pointer(sa))
+	return
+}
+
+// safeArrayCreateVector creates SafeArray.
+//
+// AKA: SafeArrayCreateVector in Windows API.
+func safeArrayCreateVector(variantType VT, lowerBound int32, length uint32) (safearray *SafeArray, err error) {
+	sa, _, err := procSafeArrayCreateVector.Call(
+		uintptr(variantType),
+		uintptr(lowerBound),
+		uintptr(length))
+	safearray = (*SafeArray)(unsafe.Pointer(sa))
+	return
+}
+
+// safeArrayCreateVectorEx creates SafeArray.
+//
+// AKA: SafeArrayCreateVectorEx in Windows API.
+func safeArrayCreateVectorEx(variantType VT, lowerBound int32, length uint32, extra uintptr) (safearray *SafeArray, err error) {
+	sa, _, err := procSafeArrayCreateVectorEx.Call(
+		uintptr(variantType),
+		uintptr(lowerBound),
+		uintptr(length),
+		extra)
+	safearray = (*SafeArray)(unsafe.Pointer(sa))
+	return
+}
+
+// safeArrayDestroy destroys SafeArray object.
+//
+// AKA: SafeArrayDestroy in Windows API.
+func safeArrayDestroy(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayDestroy.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayDestroyData destroys SafeArray object.
+//
+// AKA: SafeArrayDestroyData in Windows API.
+func safeArrayDestroyData(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayDestroyData.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayDestroyDescriptor destroys SafeArray object.
+//
+// AKA: SafeArrayDestroyDescriptor in Windows API.
+func safeArrayDestroyDescriptor(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayDestroyDescriptor.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayGetDim is the amount of dimensions in the SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetDim in Windows API.
+func safeArrayGetDim(safearray *SafeArray) (dimensions *uint32, err error) {
+	l, _, err := procSafeArrayGetDim.Call(uintptr(unsafe.Pointer(safearray)))
+	dimensions = (*uint32)(unsafe.Pointer(l))
+	return
+}
+
+// safeArrayGetElementSize is the element size in bytes.
+//
+// AKA: SafeArrayGetElemsize in Windows API.
+func safeArrayGetElementSize(safearray *SafeArray) (length *uint32, err error) {
+	l, _, err := procSafeArrayGetElemsize.Call(uintptr(unsafe.Pointer(safearray)))
+	length = (*uint32)(unsafe.Pointer(l))
+	return
+}
+
+// safeArrayGetElement retrieves element at given index.
+func safeArrayGetElement(safearray *SafeArray, index int64, pv unsafe.Pointer) error {
+	return convertHresultToError(
+		procSafeArrayGetElement.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&index)),
+			uintptr(pv)))
+}
+
+// safeArrayGetElementString retrieves element at given index and converts to string.
+func safeArrayGetElementString(safearray *SafeArray, index int64) (str string, err error) {
+	var element *int16
+	err = convertHresultToError(
+		procSafeArrayGetElement.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&index)),
+			uintptr(unsafe.Pointer(&element))))
+	str = BstrToString(*(**uint16)(unsafe.Pointer(&element)))
+	SysFreeString(element)
+	return
+}
+
+// safeArrayGetIID is the InterfaceID of the elements in the SafeArray.
+//
+// AKA: SafeArrayGetIID in Windows API.
+func safeArrayGetIID(safearray *SafeArray) (guid *GUID, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetIID.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&guid))))
+	return
+}
+
+// safeArrayGetLBound returns lower bounds of SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetLBound in Windows API.
+func safeArrayGetLBound(safearray *SafeArray, dimension uint32) (lowerBound int64, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetLBound.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(dimension),
+			uintptr(unsafe.Pointer(&lowerBound))))
+	return
+}
+
+// safeArrayGetUBound returns upper bounds of SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetUBound in Windows API.
+func safeArrayGetUBound(safearray *SafeArray, dimension uint32) (upperBound int64, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetUBound.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(dimension),
+			uintptr(unsafe.Pointer(&upperBound))))
+	return
+}
+
+// safeArrayGetVartype returns data type of SafeArray.
+//
+// AKA: SafeArrayGetVartype in Windows API.
+func safeArrayGetVartype(safearray *SafeArray) (varType uint16, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetVartype.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&varType))))
+	return
+}
+
+// safeArrayLock locks SafeArray for reading to modify SafeArray.
+//
+// This must be called during some calls to ensure that another process does not
+// read or write to the SafeArray during editing.
+//
+// AKA: SafeArrayLock in Windows API.
+func safeArrayLock(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayLock.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayUnlock unlocks SafeArray for reading.
+//
+// AKA: SafeArrayUnlock in Windows API.
+func safeArrayUnlock(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayUnlock.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayPutElement stores the data element at the specified location in the
+// array.
+//
+// AKA: SafeArrayPutElement in Windows API.
+func safeArrayPutElement(safearray *SafeArray, index int64, element uintptr) (err error) {
+	err = convertHresultToError(
+		procSafeArrayPutElement.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&index)),
+			uintptr(unsafe.Pointer(element))))
+	return
+}
+
+// safeArrayGetRecordInfo accesses IRecordInfo info for custom types.
+//
+// AKA: SafeArrayGetRecordInfo in Windows API.
+//
+// XXX: Must implement IRecordInfo interface for this to return.
+func safeArrayGetRecordInfo(safearray *SafeArray) (recordInfo interface{}, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetRecordInfo.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&recordInfo))))
+	return
+}
+
+// safeArraySetRecordInfo mutates IRecordInfo info for custom types.
+//
+// AKA: SafeArraySetRecordInfo in Windows API.
+//
+// XXX: Must implement IRecordInfo interface for this to return.
+func safeArraySetRecordInfo(safearray *SafeArray, recordInfo interface{}) (err error) {
+	err = convertHresultToError(
+		procSafeArraySetRecordInfo.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&recordInfo))))
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayconversion.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayconversion.go
new file mode 100644
index 0000000000..ffeb2b97b0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayconversion.go
@@ -0,0 +1,140 @@
+// Helper for converting SafeArray to array of objects.
+
+package ole
+
+import (
+	"unsafe"
+)
+
+type SafeArrayConversion struct {
+	Array *SafeArray
+}
+
+func (sac *SafeArrayConversion) ToStringArray() (strings []string) {
+	totalElements, _ := sac.TotalElements(0)
+	strings = make([]string, totalElements)
+
+	for i := int64(0); i < totalElements; i++ {
+		strings[int32(i)], _ = safeArrayGetElementString(sac.Array, i)
+	}
+
+	return
+}
+
+func (sac *SafeArrayConversion) ToByteArray() (bytes []byte) {
+	totalElements, _ := sac.TotalElements(0)
+	bytes = make([]byte, totalElements)
+
+	for i := int64(0); i < totalElements; i++ {
+		safeArrayGetElement(sac.Array, i, unsafe.Pointer(&bytes[int32(i)]))
+	}
+
+	return
+}
+
+func (sac *SafeArrayConversion) ToValueArray() (values []interface{}) {
+	totalElements, _ := sac.TotalElements(0)
+	values = make([]interface{}, totalElements)
+	vt, _ := safeArrayGetVartype(sac.Array)
+
+	for i := 0; i < int(totalElements); i++ {
+		switch VT(vt) {
+		case VT_BOOL:
+			var v bool
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_I1:
+			var v int8
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_I2:
+			var v int16
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_I4:
+			var v int32
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_I8:
+			var v int64
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_UI1:
+			var v uint8
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_UI2:
+			var v uint16
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_UI4:
+			var v uint32
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_UI8:
+			var v uint64
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_R4:
+			var v float32
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_R8:
+			var v float64
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_BSTR:
+			var v string
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_VARIANT:
+			var v VARIANT
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v.Value()
+		default:
+			// TODO
+		}
+	}
+
+	return
+}
+
+func (sac *SafeArrayConversion) GetType() (varType uint16, err error) {
+	return safeArrayGetVartype(sac.Array)
+}
+
+func (sac *SafeArrayConversion) GetDimensions() (dimensions *uint32, err error) {
+	return safeArrayGetDim(sac.Array)
+}
+
+func (sac *SafeArrayConversion) GetSize() (length *uint32, err error) {
+	return safeArrayGetElementSize(sac.Array)
+}
+
+func (sac *SafeArrayConversion) TotalElements(index uint32) (totalElements int64, err error) {
+	if index < 1 {
+		index = 1
+	}
+
+	// Get array bounds
+	var LowerBounds int64
+	var UpperBounds int64
+
+	LowerBounds, err = safeArrayGetLBound(sac.Array, index)
+	if err != nil {
+		return
+	}
+
+	UpperBounds, err = safeArrayGetUBound(sac.Array, index)
+	if err != nil {
+		return
+	}
+
+	totalElements = UpperBounds - LowerBounds + 1
+	return
+}
+
+// Release Safe Array memory
+func (sac *SafeArrayConversion) Release() {
+	safeArrayDestroy(sac.Array)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayslices.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayslices.go
new file mode 100644
index 0000000000..a9fa885f1d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayslices.go
@@ -0,0 +1,33 @@
+// +build windows
+
+package ole
+
+import (
+	"unsafe"
+)
+
+func safeArrayFromByteSlice(slice []byte) *SafeArray {
+	array, _ := safeArrayCreateVector(VT_UI1, 0, uint32(len(slice)))
+
+	if array == nil {
+		panic("Could not convert []byte to SAFEARRAY")
+	}
+
+	for i, v := range slice {
+		safeArrayPutElement(array, int64(i), uintptr(unsafe.Pointer(&v)))
+	}
+	return array
+}
+
+func safeArrayFromStringSlice(slice []string) *SafeArray {
+	array, _ := safeArrayCreateVector(VT_BSTR, 0, uint32(len(slice)))
+
+	if array == nil {
+		panic("Could not convert []string to SAFEARRAY")
+	}
+	// SysAllocStringLen(s)
+	for i, v := range slice {
+		safeArrayPutElement(array, int64(i), uintptr(unsafe.Pointer(SysAllocStringLen(v))))
+	}
+	return array
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/utility.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/utility.go
new file mode 100644
index 0000000000..99ee82dc34
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/utility.go
@@ -0,0 +1,101 @@
+package ole
+
+import (
+	"unicode/utf16"
+	"unsafe"
+)
+
+// ClassIDFrom retrieves class ID whether given is program ID or application string.
+//
+// Helper that provides check against both Class ID from Program ID and Class ID from string. It is
+// faster, if you know which you are using, to use the individual functions, but this will check
+// against available functions for you.
+func ClassIDFrom(programID string) (classID *GUID, err error) {
+	classID, err = CLSIDFromProgID(programID)
+	if err != nil {
+		classID, err = CLSIDFromString(programID)
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+// BytePtrToString converts byte pointer to a Go string.
+func BytePtrToString(p *byte) string {
+	a := (*[10000]uint8)(unsafe.Pointer(p))
+	i := 0
+	for a[i] != 0 {
+		i++
+	}
+	return string(a[:i])
+}
+
+// UTF16PtrToString is alias for LpOleStrToString.
+//
+// Kept for compatibility reasons.
+func UTF16PtrToString(p *uint16) string {
+	return LpOleStrToString(p)
+}
+
+// LpOleStrToString converts COM Unicode to Go string.
+func LpOleStrToString(p *uint16) string {
+	if p == nil {
+		return ""
+	}
+
+	length := lpOleStrLen(p)
+	a := make([]uint16, length)
+
+	ptr := unsafe.Pointer(p)
+
+	for i := 0; i < int(length); i++ {
+		a[i] = *(*uint16)(ptr)
+		ptr = unsafe.Pointer(uintptr(ptr) + 2)
+	}
+
+	return string(utf16.Decode(a))
+}
+
+// BstrToString converts COM binary string to Go string.
+func BstrToString(p *uint16) string {
+	if p == nil {
+		return ""
+	}
+	length := SysStringLen((*int16)(unsafe.Pointer(p)))
+	a := make([]uint16, length)
+
+	ptr := unsafe.Pointer(p)
+
+	for i := 0; i < int(length); i++ {
+		a[i] = *(*uint16)(ptr)
+		ptr = unsafe.Pointer(uintptr(ptr) + 2)
+	}
+	return string(utf16.Decode(a))
+}
+
+// lpOleStrLen returns the length of Unicode string.
+func lpOleStrLen(p *uint16) (length int64) {
+	if p == nil {
+		return 0
+	}
+
+	ptr := unsafe.Pointer(p)
+
+	for i := 0; ; i++ {
+		if 0 == *(*uint16)(ptr) {
+			length = int64(i)
+			break
+		}
+		ptr = unsafe.Pointer(uintptr(ptr) + 2)
+	}
+	return
+}
+
+// convertHresultToError converts syscall to error, if call is unsuccessful.
+func convertHresultToError(hr uintptr, r2 uintptr, ignore error) (err error) {
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/variables.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/variables.go
new file mode 100644
index 0000000000..ebe00f1cfc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/variables.go
@@ -0,0 +1,16 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+)
+
+var (
+	modcombase     = syscall.NewLazyDLL("combase.dll")
+	modkernel32, _ = syscall.LoadDLL("kernel32.dll")
+	modole32, _    = syscall.LoadDLL("ole32.dll")
+	modoleaut32, _ = syscall.LoadDLL("oleaut32.dll")
+	modmsvcrt, _   = syscall.LoadDLL("msvcrt.dll")
+	moduser32, _   = syscall.LoadDLL("user32.dll")
+)
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/variant.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/variant.go
new file mode 100644
index 0000000000..36969725eb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/variant.go
@@ -0,0 +1,105 @@
+package ole
+
+import "unsafe"
+
+// NewVariant returns new variant based on type and value.
+func NewVariant(vt VT, val int64) VARIANT {
+	return VARIANT{VT: vt, Val: val}
+}
+
+// ToIUnknown converts Variant to Unknown object.
+func (v *VARIANT) ToIUnknown() *IUnknown {
+	if v.VT != VT_UNKNOWN {
+		return nil
+	}
+	return (*IUnknown)(unsafe.Pointer(uintptr(v.Val)))
+}
+
+// ToIDispatch converts variant to dispatch object.
+func (v *VARIANT) ToIDispatch() *IDispatch {
+	if v.VT != VT_DISPATCH {
+		return nil
+	}
+	return (*IDispatch)(unsafe.Pointer(uintptr(v.Val)))
+}
+
+// ToArray converts variant to SafeArray helper.
+func (v *VARIANT) ToArray() *SafeArrayConversion {
+	if v.VT != VT_SAFEARRAY {
+		if v.VT&VT_ARRAY == 0 {
+			return nil
+		}
+	}
+	var safeArray *SafeArray = (*SafeArray)(unsafe.Pointer(uintptr(v.Val)))
+	return &SafeArrayConversion{safeArray}
+}
+
+// ToString converts variant to Go string.
+func (v *VARIANT) ToString() string {
+	if v.VT != VT_BSTR {
+		return ""
+	}
+	return BstrToString(*(**uint16)(unsafe.Pointer(&v.Val)))
+}
+
+// Clear the memory of variant object.
+func (v *VARIANT) Clear() error {
+	return VariantClear(v)
+}
+
+// Value returns variant value based on its type.
+//
+// Currently supported types: 2- and 4-byte integers, strings, bools.
+// Note that 64-bit integers, datetimes, and other types are stored as strings
+// and will be returned as strings.
+//
+// Needs to be further converted, because this returns an interface{}.
+func (v *VARIANT) Value() interface{} {
+	switch v.VT {
+	case VT_I1:
+		return int8(v.Val)
+	case VT_UI1:
+		return uint8(v.Val)
+	case VT_I2:
+		return int16(v.Val)
+	case VT_UI2:
+		return uint16(v.Val)
+	case VT_I4:
+		return int32(v.Val)
+	case VT_UI4:
+		return uint32(v.Val)
+	case VT_I8:
+		return int64(v.Val)
+	case VT_UI8:
+		return uint64(v.Val)
+	case VT_INT:
+		return int(v.Val)
+	case VT_UINT:
+		return uint(v.Val)
+	case VT_INT_PTR:
+		return uintptr(v.Val) // TODO
+	case VT_UINT_PTR:
+		return uintptr(v.Val)
+	case VT_R4:
+		return *(*float32)(unsafe.Pointer(&v.Val))
+	case VT_R8:
+		return *(*float64)(unsafe.Pointer(&v.Val))
+	case VT_BSTR:
+		return v.ToString()
+	case VT_DATE:
+		// VT_DATE type will either return float64 or time.Time.
+		d := float64(v.Val)
+		date, err := GetVariantDate(d)
+		if err != nil {
+			return d
+		}
+		return date
+	case VT_UNKNOWN:
+		return v.ToIUnknown()
+	case VT_DISPATCH:
+		return v.ToIDispatch()
+	case VT_BOOL:
+		return v.Val != 0
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_386.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_386.go
new file mode 100644
index 0000000000..e73736bf39
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_386.go
@@ -0,0 +1,11 @@
+// +build 386
+
+package ole
+
+type VARIANT struct {
+	VT         VT     //  2
+	wReserved1 uint16 //  4
+	wReserved2 uint16 //  6
+	wReserved3 uint16 //  8
+	Val        int64  // 16
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_amd64.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_amd64.go
new file mode 100644
index 0000000000..dccdde1323
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_amd64.go
@@ -0,0 +1,12 @@
+// +build amd64
+
+package ole
+
+type VARIANT struct {
+	VT         VT      //  2
+	wReserved1 uint16  //  4
+	wReserved2 uint16  //  6
+	wReserved3 uint16  //  8
+	Val        int64   // 16
+	_          [8]byte // 24
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/vt_string.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/vt_string.go
new file mode 100644
index 0000000000..729b4a04dd
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/vt_string.go
@@ -0,0 +1,58 @@
+// generated by stringer -output vt_string.go -type VT; DO NOT EDIT
+
+package ole
+
+import "fmt"
+
+const (
+	_VT_name_0 = "VT_EMPTYVT_NULLVT_I2VT_I4VT_R4VT_R8VT_CYVT_DATEVT_BSTRVT_DISPATCHVT_ERRORVT_BOOLVT_VARIANTVT_UNKNOWNVT_DECIMAL"
+	_VT_name_1 = "VT_I1VT_UI1VT_UI2VT_UI4VT_I8VT_UI8VT_INTVT_UINTVT_VOIDVT_HRESULTVT_PTRVT_SAFEARRAYVT_CARRAYVT_USERDEFINEDVT_LPSTRVT_LPWSTR"
+	_VT_name_2 = "VT_RECORDVT_INT_PTRVT_UINT_PTR"
+	_VT_name_3 = "VT_FILETIMEVT_BLOBVT_STREAMVT_STORAGEVT_STREAMED_OBJECTVT_STORED_OBJECTVT_BLOB_OBJECTVT_CFVT_CLSID"
+	_VT_name_4 = "VT_BSTR_BLOBVT_VECTOR"
+	_VT_name_5 = "VT_ARRAY"
+	_VT_name_6 = "VT_BYREF"
+	_VT_name_7 = "VT_RESERVED"
+	_VT_name_8 = "VT_ILLEGAL"
+)
+
+var (
+	_VT_index_0 = [...]uint8{0, 8, 15, 20, 25, 30, 35, 40, 47, 54, 65, 73, 80, 90, 100, 110}
+	_VT_index_1 = [...]uint8{0, 5, 11, 17, 23, 28, 34, 40, 47, 54, 64, 70, 82, 91, 105, 113, 122}
+	_VT_index_2 = [...]uint8{0, 9, 19, 30}
+	_VT_index_3 = [...]uint8{0, 11, 18, 27, 37, 55, 71, 85, 90, 98}
+	_VT_index_4 = [...]uint8{0, 12, 21}
+	_VT_index_5 = [...]uint8{0, 8}
+	_VT_index_6 = [...]uint8{0, 8}
+	_VT_index_7 = [...]uint8{0, 11}
+	_VT_index_8 = [...]uint8{0, 10}
+)
+
+func (i VT) String() string {
+	switch {
+	case 0 <= i && i <= 14:
+		return _VT_name_0[_VT_index_0[i]:_VT_index_0[i+1]]
+	case 16 <= i && i <= 31:
+		i -= 16
+		return _VT_name_1[_VT_index_1[i]:_VT_index_1[i+1]]
+	case 36 <= i && i <= 38:
+		i -= 36
+		return _VT_name_2[_VT_index_2[i]:_VT_index_2[i+1]]
+	case 64 <= i && i <= 72:
+		i -= 64
+		return _VT_name_3[_VT_index_3[i]:_VT_index_3[i+1]]
+	case 4095 <= i && i <= 4096:
+		i -= 4095
+		return _VT_name_4[_VT_index_4[i]:_VT_index_4[i+1]]
+	case i == 8192:
+		return _VT_name_5
+	case i == 16384:
+		return _VT_name_6
+	case i == 32768:
+		return _VT_name_7
+	case i == 65535:
+		return _VT_name_8
+	default:
+		return fmt.Sprintf("VT(%d)", i)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt.go
new file mode 100644
index 0000000000..4e9eca7324
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt.go
@@ -0,0 +1,99 @@
+// +build windows
+
+package ole
+
+import (
+	"reflect"
+	"syscall"
+	"unicode/utf8"
+	"unsafe"
+)
+
+var (
+	procRoInitialize              = modcombase.NewProc("RoInitialize")
+	procRoActivateInstance        = modcombase.NewProc("RoActivateInstance")
+	procRoGetActivationFactory    = modcombase.NewProc("RoGetActivationFactory")
+	procWindowsCreateString       = modcombase.NewProc("WindowsCreateString")
+	procWindowsDeleteString       = modcombase.NewProc("WindowsDeleteString")
+	procWindowsGetStringRawBuffer = modcombase.NewProc("WindowsGetStringRawBuffer")
+)
+
+func RoInitialize(thread_type uint32) (err error) {
+	hr, _, _ := procRoInitialize.Call(uintptr(thread_type))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func RoActivateInstance(clsid string) (ins *IInspectable, err error) {
+	hClsid, err := NewHString(clsid)
+	if err != nil {
+		return nil, err
+	}
+	defer DeleteHString(hClsid)
+
+	hr, _, _ := procRoActivateInstance.Call(
+		uintptr(unsafe.Pointer(hClsid)),
+		uintptr(unsafe.Pointer(&ins)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func RoGetActivationFactory(clsid string, iid *GUID) (ins *IInspectable, err error) {
+	hClsid, err := NewHString(clsid)
+	if err != nil {
+		return nil, err
+	}
+	defer DeleteHString(hClsid)
+
+	hr, _, _ := procRoGetActivationFactory.Call(
+		uintptr(unsafe.Pointer(hClsid)),
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(&ins)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// HString is handle string for pointers.
+type HString uintptr
+
+// NewHString returns a new HString for Go string.
+func NewHString(s string) (hstring HString, err error) {
+	u16 := syscall.StringToUTF16Ptr(s)
+	len := uint32(utf8.RuneCountInString(s))
+	hr, _, _ := procWindowsCreateString.Call(
+		uintptr(unsafe.Pointer(u16)),
+		uintptr(len),
+		uintptr(unsafe.Pointer(&hstring)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// DeleteHString deletes HString.
+func DeleteHString(hstring HString) (err error) {
+	hr, _, _ := procWindowsDeleteString.Call(uintptr(hstring))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// String returns Go string value of HString.
+func (h HString) String() string {
+	var u16buf uintptr
+	var u16len uint32
+	u16buf, _, _ = procWindowsGetStringRawBuffer.Call(
+		uintptr(h),
+		uintptr(unsafe.Pointer(&u16len)))
+
+	u16hdr := reflect.SliceHeader{Data: u16buf, Len: int(u16len), Cap: int(u16len)}
+	u16 := *(*[]uint16)(unsafe.Pointer(&u16hdr))
+	return syscall.UTF16ToString(u16)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt_doc.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt_doc.go
new file mode 100644
index 0000000000..52e6d74c9a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt_doc.go
@@ -0,0 +1,36 @@
+// +build !windows
+
+package ole
+
+// RoInitialize
+func RoInitialize(thread_type uint32) (err error) {
+	return NewError(E_NOTIMPL)
+}
+
+// RoActivateInstance
+func RoActivateInstance(clsid string) (ins *IInspectable, err error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// RoGetActivationFactory
+func RoGetActivationFactory(clsid string, iid *GUID) (ins *IInspectable, err error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// HString is handle string for pointers.
+type HString uintptr
+
+// NewHString returns a new HString for Go string.
+func NewHString(s string) (hstring HString, err error) {
+	return HString(uintptr(0)), NewError(E_NOTIMPL)
+}
+
+// DeleteHString deletes HString.
+func DeleteHString(hstring HString) (err error) {
+	return NewError(E_NOTIMPL)
+}
+
+// String returns Go string value of HString.
+func (h HString) String() string {
+	return ""
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/LICENSE b/Godeps/_workspace/src/github.com/shirou/gopsutil/LICENSE
new file mode 100644
index 0000000000..602b2c098e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/LICENSE
@@ -0,0 +1,27 @@
+gopsutil is distributed under BSD license reproduced below.
+
+Copyright (c) 2014, WAKAYAMA Shirou
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of the gopsutil authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go
new file mode 100644
index 0000000000..71535094d4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go
@@ -0,0 +1,76 @@
+package cpu
+
+import (
+	"encoding/json"
+	"runtime"
+	"strconv"
+	"strings"
+)
+
+type TimesStat struct {
+	CPU       string  `json:"cpu"`
+	User      float64 `json:"user"`
+	System    float64 `json:"system"`
+	Idle      float64 `json:"idle"`
+	Nice      float64 `json:"nice"`
+	Iowait    float64 `json:"iowait"`
+	Irq       float64 `json:"irq"`
+	Softirq   float64 `json:"softirq"`
+	Steal     float64 `json:"steal"`
+	Guest     float64 `json:"guest"`
+	GuestNice float64 `json:"guestNice"`
+	Stolen    float64 `json:"stolen"`
+}
+
+type InfoStat struct {
+	CPU        int32    `json:"cpu"`
+	VendorID   string   `json:"vendorId"`
+	Family     string   `json:"family"`
+	Model      string   `json:"model"`
+	Stepping   int32    `json:"stepping"`
+	PhysicalID string   `json:"physicalId"`
+	CoreID     string   `json:"coreId"`
+	Cores      int32    `json:"cores"`
+	ModelName  string   `json:"modelName"`
+	Mhz        float64  `json:"mhz"`
+	CacheSize  int32    `json:"cacheSize"`
+	Flags      []string `json:"flags"`
+}
+
+var lastCPUTimes []TimesStat
+var lastPerCPUTimes []TimesStat
+
+func Counts(logical bool) (int, error) {
+	return runtime.NumCPU(), nil
+}
+
+func (c TimesStat) String() string {
+	v := []string{
+		`"cpu":"` + c.CPU + `"`,
+		`"user":` + strconv.FormatFloat(c.User, 'f', 1, 64),
+		`"system":` + strconv.FormatFloat(c.System, 'f', 1, 64),
+		`"idle":` + strconv.FormatFloat(c.Idle, 'f', 1, 64),
+		`"nice":` + strconv.FormatFloat(c.Nice, 'f', 1, 64),
+		`"iowait":` + strconv.FormatFloat(c.Iowait, 'f', 1, 64),
+		`"irq":` + strconv.FormatFloat(c.Irq, 'f', 1, 64),
+		`"softirq":` + strconv.FormatFloat(c.Softirq, 'f', 1, 64),
+		`"steal":` + strconv.FormatFloat(c.Steal, 'f', 1, 64),
+		`"guest":` + strconv.FormatFloat(c.Guest, 'f', 1, 64),
+		`"guestNice":` + strconv.FormatFloat(c.GuestNice, 'f', 1, 64),
+		`"stolen":` + strconv.FormatFloat(c.Stolen, 'f', 1, 64),
+	}
+
+	return `{` + strings.Join(v, ",") + `}`
+}
+
+// Total returns the total number of seconds in a CPUTimesStat
+func (c TimesStat) Total() float64 {
+	total := c.User + c.System + c.Nice + c.Iowait + c.Irq + c.Softirq + c.Steal +
+		c.Guest + c.GuestNice + c.Idle + c.Stolen
+	return total
+}
+
+func (c InfoStat) String() string {
+	s, _ := json.Marshal(c)
+	return string(s)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go
new file mode 100644
index 0000000000..fbb74a821f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go
@@ -0,0 +1,106 @@
+// +build darwin
+
+package cpu
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+)
+
+// sys/resource.h
+const (
+	CPUser    = 0
+	CPNice    = 1
+	CPSys     = 2
+	CPIntr    = 3
+	CPIdle    = 4
+	CPUStates = 5
+)
+
+// default value. from time.h
+var ClocksPerSec = float64(128)
+
+func Times(percpu bool) ([]TimesStat, error) {
+	if percpu {
+		return perCPUTimes()
+	}
+
+	return allCPUTimes()
+}
+
+// Returns only one CPUInfoStat on FreeBSD
+func Info() ([]InfoStat, error) {
+	var ret []InfoStat
+	sysctl, err := exec.LookPath("/usr/sbin/sysctl")
+	if err != nil {
+		return ret, err
+	}
+	out, err := exec.Command(sysctl, "machdep.cpu").Output()
+	if err != nil {
+		return ret, err
+	}
+
+	c := InfoStat{}
+	for _, line := range strings.Split(string(out), "\n") {
+		values := strings.Fields(line)
+		if len(values) < 1 {
+			continue
+		}
+
+		t, err := strconv.ParseInt(values[1], 10, 64)
+		// err is not checked here because some value is string.
+		if strings.HasPrefix(line, "machdep.cpu.brand_string") {
+			c.ModelName = strings.Join(values[1:], " ")
+		} else if strings.HasPrefix(line, "machdep.cpu.family") {
+			c.Family = values[1]
+		} else if strings.HasPrefix(line, "machdep.cpu.model") {
+			c.Model = values[1]
+		} else if strings.HasPrefix(line, "machdep.cpu.stepping") {
+			if err != nil {
+				return ret, err
+			}
+			c.Stepping = int32(t)
+		} else if strings.HasPrefix(line, "machdep.cpu.features") {
+			for _, v := range values[1:] {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if strings.HasPrefix(line, "machdep.cpu.leaf7_features") {
+			for _, v := range values[1:] {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if strings.HasPrefix(line, "machdep.cpu.extfeatures") {
+			for _, v := range values[1:] {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if strings.HasPrefix(line, "machdep.cpu.core_count") {
+			if err != nil {
+				return ret, err
+			}
+			c.Cores = int32(t)
+		} else if strings.HasPrefix(line, "machdep.cpu.cache.size") {
+			if err != nil {
+				return ret, err
+			}
+			c.CacheSize = int32(t)
+		} else if strings.HasPrefix(line, "machdep.cpu.vendor") {
+			c.VendorID = values[1]
+		}
+	}
+
+	// Use the rated frequency of the CPU. This is a static value and does not
+	// account for low power or Turbo Boost modes.
+	out, err = exec.Command(sysctl, "hw.cpufrequency").Output()
+	if err != nil {
+		return ret, err
+	}
+
+	values := strings.Fields(string(out))
+	mhz, err := strconv.ParseFloat(values[1], 64)
+	if err != nil {
+		return ret, err
+	}
+	c.Mhz = mhz / 1000000.0
+
+	return append(ret, c), nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
new file mode 100644
index 0000000000..ee59fefc06
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
@@ -0,0 +1,107 @@
+// +build darwin
+// +build cgo
+
+package cpu
+
+/*
+#include <stdlib.h>
+#include <sys/sysctl.h>
+#include <sys/mount.h>
+#include <mach/mach_init.h>
+#include <mach/mach_host.h>
+#include <mach/host_info.h>
+#include <libproc.h>
+#include <mach/processor_info.h>
+#include <mach/vm_map.h>
+*/
+import "C"
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"unsafe"
+)
+
+// these CPU times for darwin is borrowed from influxdb/telegraf.
+
+func perCPUTimes() ([]TimesStat, error) {
+	var (
+		count   C.mach_msg_type_number_t
+		cpuload *C.processor_cpu_load_info_data_t
+		ncpu    C.natural_t
+	)
+
+	status := C.host_processor_info(C.host_t(C.mach_host_self()),
+		C.PROCESSOR_CPU_LOAD_INFO,
+		&ncpu,
+		(*C.processor_info_array_t)(unsafe.Pointer(&cpuload)),
+		&count)
+
+	if status != C.KERN_SUCCESS {
+		return nil, fmt.Errorf("host_processor_info error=%d", status)
+	}
+
+	// jump through some cgo casting hoops and ensure we properly free
+	// the memory that cpuload points to
+	target := C.vm_map_t(C.mach_task_self_)
+	address := C.vm_address_t(uintptr(unsafe.Pointer(cpuload)))
+	defer C.vm_deallocate(target, address, C.vm_size_t(ncpu))
+
+	// the body of struct processor_cpu_load_info
+	// aka processor_cpu_load_info_data_t
+	var cpu_ticks [C.CPU_STATE_MAX]uint32
+
+	// copy the cpuload array to a []byte buffer
+	// where we can binary.Read the data
+	size := int(ncpu) * binary.Size(cpu_ticks)
+	buf := C.GoBytes(unsafe.Pointer(cpuload), C.int(size))
+
+	bbuf := bytes.NewBuffer(buf)
+
+	var ret []TimesStat
+
+	for i := 0; i < int(ncpu); i++ {
+		err := binary.Read(bbuf, binary.LittleEndian, &cpu_ticks)
+		if err != nil {
+			return nil, err
+		}
+
+		c := TimesStat{
+			CPU:    fmt.Sprintf("cpu%d", i),
+			User:   float64(cpu_ticks[C.CPU_STATE_USER]) / ClocksPerSec,
+			System: float64(cpu_ticks[C.CPU_STATE_SYSTEM]) / ClocksPerSec,
+			Nice:   float64(cpu_ticks[C.CPU_STATE_NICE]) / ClocksPerSec,
+			Idle:   float64(cpu_ticks[C.CPU_STATE_IDLE]) / ClocksPerSec,
+		}
+
+		ret = append(ret, c)
+	}
+
+	return ret, nil
+}
+
+func allCPUTimes() ([]TimesStat, error) {
+	var count C.mach_msg_type_number_t = C.HOST_CPU_LOAD_INFO_COUNT
+	var cpuload C.host_cpu_load_info_data_t
+
+	status := C.host_statistics(C.host_t(C.mach_host_self()),
+		C.HOST_CPU_LOAD_INFO,
+		C.host_info_t(unsafe.Pointer(&cpuload)),
+		&count)
+
+	if status != C.KERN_SUCCESS {
+		return nil, fmt.Errorf("host_statistics error=%d", status)
+	}
+
+	c := TimesStat{
+		CPU:    "cpu-total",
+		User:   float64(cpuload.cpu_ticks[C.CPU_STATE_USER]) / ClocksPerSec,
+		System: float64(cpuload.cpu_ticks[C.CPU_STATE_SYSTEM]) / ClocksPerSec,
+		Nice:   float64(cpuload.cpu_ticks[C.CPU_STATE_NICE]) / ClocksPerSec,
+		Idle:   float64(cpuload.cpu_ticks[C.CPU_STATE_IDLE]) / ClocksPerSec,
+	}
+
+	return []TimesStat{c}, nil
+
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
new file mode 100644
index 0000000000..242b4a8e79
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
@@ -0,0 +1,14 @@
+// +build darwin
+// +build !cgo
+
+package cpu
+
+import "github.com/shirou/gopsutil/internal/common"
+
+func perCPUTimes() ([]TimesStat, error) {
+	return []TimesStat{}, common.ErrNotImplementedError
+}
+
+func allCPUTimes() ([]TimesStat, error) {
+	return []TimesStat{}, common.ErrNotImplementedError
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
new file mode 100644
index 0000000000..ce1adf3c16
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
@@ -0,0 +1,147 @@
+// +build freebsd
+
+package cpu
+
+import (
+	"fmt"
+	"os/exec"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// sys/resource.h
+const (
+	CPUser    = 0
+	CPNice    = 1
+	CPSys     = 2
+	CPIntr    = 3
+	CPIdle    = 4
+	CPUStates = 5
+)
+
+var ClocksPerSec = float64(128)
+
+func init() {
+	getconf, err := exec.LookPath("/usr/bin/getconf")
+	if err != nil {
+		return
+	}
+	out, err := exec.Command(getconf, "CLK_TCK").Output()
+	// ignore errors
+	if err == nil {
+		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
+		if err == nil {
+			ClocksPerSec = float64(i)
+		}
+	}
+}
+
+func Times(percpu bool) ([]TimesStat, error) {
+	var ret []TimesStat
+
+	var sysctlCall string
+	var ncpu int
+	if percpu {
+		sysctlCall = "kern.cp_times"
+		ncpu, _ = Counts(true)
+	} else {
+		sysctlCall = "kern.cp_time"
+		ncpu = 1
+	}
+
+	cpuTimes, err := common.DoSysctrl(sysctlCall)
+	if err != nil {
+		return ret, err
+	}
+
+	for i := 0; i < ncpu; i++ {
+		offset := CPUStates * i
+		user, err := strconv.ParseFloat(cpuTimes[CPUser+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+		nice, err := strconv.ParseFloat(cpuTimes[CPNice+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+		sys, err := strconv.ParseFloat(cpuTimes[CPSys+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+		idle, err := strconv.ParseFloat(cpuTimes[CPIdle+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+		intr, err := strconv.ParseFloat(cpuTimes[CPIntr+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+
+		c := TimesStat{
+			User:   float64(user / ClocksPerSec),
+			Nice:   float64(nice / ClocksPerSec),
+			System: float64(sys / ClocksPerSec),
+			Idle:   float64(idle / ClocksPerSec),
+			Irq:    float64(intr / ClocksPerSec),
+		}
+		if !percpu {
+			c.CPU = "cpu-total"
+		} else {
+			c.CPU = fmt.Sprintf("cpu%d", i)
+		}
+
+		ret = append(ret, c)
+	}
+
+	return ret, nil
+}
+
+// Returns only one CPUInfoStat on FreeBSD
+func Info() ([]InfoStat, error) {
+	filename := "/var/run/dmesg.boot"
+	lines, _ := common.ReadLines(filename)
+
+	var ret []InfoStat
+
+	c := InfoStat{}
+	for _, line := range lines {
+		if matches := regexp.MustCompile(`CPU:\s+(.+) \(([\d.]+).+\)`).FindStringSubmatch(line); matches != nil {
+			c.ModelName = matches[1]
+			t, err := strconv.ParseFloat(matches[2], 64)
+			if err != nil {
+				return ret, nil
+			}
+			c.Mhz = t
+		} else if matches := regexp.MustCompile(`Origin = "(.+)"  Id = (.+)  Family = (.+)  Model = (.+)  Stepping = (.+)`).FindStringSubmatch(line); matches != nil {
+			c.VendorID = matches[1]
+			c.Family = matches[3]
+			c.Model = matches[4]
+			t, err := strconv.ParseInt(matches[5], 10, 32)
+			if err != nil {
+				return ret, nil
+			}
+			c.Stepping = int32(t)
+		} else if matches := regexp.MustCompile(`Features=.+<(.+)>`).FindStringSubmatch(line); matches != nil {
+			for _, v := range strings.Split(matches[1], ",") {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if matches := regexp.MustCompile(`Features2=[a-f\dx]+<(.+)>`).FindStringSubmatch(line); matches != nil {
+			for _, v := range strings.Split(matches[1], ",") {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if matches := regexp.MustCompile(`Logical CPUs per core: (\d+)`).FindStringSubmatch(line); matches != nil {
+			// FIXME: no this line?
+			t, err := strconv.ParseInt(matches[1], 10, 32)
+			if err != nil {
+				return ret, nil
+			}
+			c.Cores = int32(t)
+		}
+
+	}
+
+	return append(ret, c), nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
new file mode 100644
index 0000000000..975b75c072
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
@@ -0,0 +1,244 @@
+// +build linux
+
+package cpu
+
+import (
+	"errors"
+	"fmt"
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var cpu_tick = float64(100)
+
+func init() {
+	getconf, err := exec.LookPath("/usr/bin/getconf")
+	if err != nil {
+		return
+	}
+	out, err := exec.Command(getconf, "CLK_TCK").Output()
+	// ignore errors
+	if err == nil {
+		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
+		if err == nil {
+			cpu_tick = float64(i)
+		}
+	}
+}
+
+func Times(percpu bool) ([]TimesStat, error) {
+	filename := common.HostProc("stat")
+	var lines = []string{}
+	if percpu {
+		var startIdx uint = 1
+		for {
+			linen, _ := common.ReadLinesOffsetN(filename, startIdx, 1)
+			line := linen[0]
+			if !strings.HasPrefix(line, "cpu") {
+				break
+			}
+			lines = append(lines, line)
+			startIdx++
+		}
+	} else {
+		lines, _ = common.ReadLinesOffsetN(filename, 0, 1)
+	}
+
+	ret := make([]TimesStat, 0, len(lines))
+
+	for _, line := range lines {
+		ct, err := parseStatLine(line)
+		if err != nil {
+			continue
+		}
+		ret = append(ret, *ct)
+
+	}
+	return ret, nil
+}
+
+func sysCPUPath(cpu int32, relPath string) string {
+	return common.HostSys(fmt.Sprintf("devices/system/cpu/cpu%d", cpu), relPath)
+}
+
+func finishCPUInfo(c *InfoStat) error {
+	if c.Mhz == 0 {
+		lines, err := common.ReadLines(sysCPUPath(c.CPU, "cpufreq/cpuinfo_max_freq"))
+		if err == nil {
+			value, err := strconv.ParseFloat(lines[0], 64)
+			if err != nil {
+				return err
+			}
+			c.Mhz = value
+		}
+	}
+	if len(c.CoreID) == 0 {
+		lines, err := common.ReadLines(sysCPUPath(c.CPU, "topology/coreId"))
+		if err == nil {
+			c.CoreID = lines[0]
+		}
+	}
+	return nil
+}
+
+// CPUInfo on linux will return 1 item per physical thread.
+//
+// CPUs have three levels of counting: sockets, cores, threads.
+// Cores with HyperThreading count as having 2 threads per core.
+// Sockets often come with many physical CPU cores.
+// For example a single socket board with two cores each with HT will
+// return 4 CPUInfoStat structs on Linux and the "Cores" field set to 1.
+func Info() ([]InfoStat, error) {
+	filename := common.HostProc("cpuinfo")
+	lines, _ := common.ReadLines(filename)
+
+	var ret []InfoStat
+
+	c := InfoStat{CPU: -1, Cores: 1}
+	for _, line := range lines {
+		fields := strings.Split(line, ":")
+		if len(fields) < 2 {
+			continue
+		}
+		key := strings.TrimSpace(fields[0])
+		value := strings.TrimSpace(fields[1])
+
+		switch key {
+		case "processor":
+			if c.CPU >= 0 {
+				err := finishCPUInfo(&c)
+				if err != nil {
+					return ret, err
+				}
+				ret = append(ret, c)
+			}
+			c = InfoStat{Cores: 1}
+			t, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return ret, err
+			}
+			c.CPU = int32(t)
+		case "vendorId", "vendor_id":
+			c.VendorID = value
+		case "cpu family":
+			c.Family = value
+		case "model":
+			c.Model = value
+		case "model name":
+			c.ModelName = value
+		case "stepping":
+			t, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return ret, err
+			}
+			c.Stepping = int32(t)
+		case "cpu MHz":
+			t, err := strconv.ParseFloat(value, 64)
+			if err != nil {
+				return ret, err
+			}
+			c.Mhz = t
+		case "cache size":
+			t, err := strconv.ParseInt(strings.Replace(value, " KB", "", 1), 10, 64)
+			if err != nil {
+				return ret, err
+			}
+			c.CacheSize = int32(t)
+		case "physical id":
+			c.PhysicalID = value
+		case "core id":
+			c.CoreID = value
+		case "flags", "Features":
+			c.Flags = strings.FieldsFunc(value, func(r rune) bool {
+				return r == ',' || r == ' '
+			})
+		}
+	}
+	if c.CPU >= 0 {
+		err := finishCPUInfo(&c)
+		if err != nil {
+			return ret, err
+		}
+		ret = append(ret, c)
+	}
+	return ret, nil
+}
+
+func parseStatLine(line string) (*TimesStat, error) {
+	fields := strings.Fields(line)
+
+	if strings.HasPrefix(fields[0], "cpu") == false {
+		//		return CPUTimesStat{}, e
+		return nil, errors.New("not contain cpu")
+	}
+
+	cpu := fields[0]
+	if cpu == "cpu" {
+		cpu = "cpu-total"
+	}
+	user, err := strconv.ParseFloat(fields[1], 64)
+	if err != nil {
+		return nil, err
+	}
+	nice, err := strconv.ParseFloat(fields[2], 64)
+	if err != nil {
+		return nil, err
+	}
+	system, err := strconv.ParseFloat(fields[3], 64)
+	if err != nil {
+		return nil, err
+	}
+	idle, err := strconv.ParseFloat(fields[4], 64)
+	if err != nil {
+		return nil, err
+	}
+	iowait, err := strconv.ParseFloat(fields[5], 64)
+	if err != nil {
+		return nil, err
+	}
+	irq, err := strconv.ParseFloat(fields[6], 64)
+	if err != nil {
+		return nil, err
+	}
+	softirq, err := strconv.ParseFloat(fields[7], 64)
+	if err != nil {
+		return nil, err
+	}
+
+	ct := &TimesStat{
+		CPU:     cpu,
+		User:    float64(user) / cpu_tick,
+		Nice:    float64(nice) / cpu_tick,
+		System:  float64(system) / cpu_tick,
+		Idle:    float64(idle) / cpu_tick,
+		Iowait:  float64(iowait) / cpu_tick,
+		Irq:     float64(irq) / cpu_tick,
+		Softirq: float64(softirq) / cpu_tick,
+	}
+	if len(fields) > 8 { // Linux >= 2.6.11
+		steal, err := strconv.ParseFloat(fields[8], 64)
+		if err != nil {
+			return nil, err
+		}
+		ct.Steal = float64(steal) / cpu_tick
+	}
+	if len(fields) > 9 { // Linux >= 2.6.24
+		guest, err := strconv.ParseFloat(fields[9], 64)
+		if err != nil {
+			return nil, err
+		}
+		ct.Guest = float64(guest) / cpu_tick
+	}
+	if len(fields) > 10 { // Linux >= 3.2.0
+		guestNice, err := strconv.ParseFloat(fields[10], 64)
+		if err != nil {
+			return nil, err
+		}
+		ct.GuestNice = float64(guestNice) / cpu_tick
+	}
+
+	return ct, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go
new file mode 100644
index 0000000000..9f1ea4d772
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go
@@ -0,0 +1,59 @@
+// +build linux freebsd darwin
+
+package cpu
+
+import (
+	"fmt"
+	"time"
+)
+
+func Percent(interval time.Duration, percpu bool) ([]float64, error) {
+	getAllBusy := func(t TimesStat) (float64, float64) {
+		busy := t.User + t.System + t.Nice + t.Iowait + t.Irq +
+			t.Softirq + t.Steal + t.Guest + t.GuestNice + t.Stolen
+		return busy + t.Idle, busy
+	}
+
+	calculate := func(t1, t2 TimesStat) float64 {
+		t1All, t1Busy := getAllBusy(t1)
+		t2All, t2Busy := getAllBusy(t2)
+
+		if t2Busy <= t1Busy {
+			return 0
+		}
+		if t2All <= t1All {
+			return 1
+		}
+		return (t2Busy - t1Busy) / (t2All - t1All) * 100
+	}
+
+	// Get CPU usage at the start of the interval.
+	cpuTimes1, err := Times(percpu)
+	if err != nil {
+		return nil, err
+	}
+
+	if interval > 0 {
+		time.Sleep(interval)
+	}
+
+	// And at the end of the interval.
+	cpuTimes2, err := Times(percpu)
+	if err != nil {
+		return nil, err
+	}
+
+	// Make sure the CPU measurements have the same length.
+	if len(cpuTimes1) != len(cpuTimes2) {
+		return nil, fmt.Errorf(
+			"received two CPU counts: %d != %d",
+			len(cpuTimes1), len(cpuTimes2),
+		)
+	}
+
+	ret := make([]float64, len(cpuTimes1))
+	for i, t := range cpuTimes2 {
+		ret[i] = calculate(cpuTimes1[i], t)
+	}
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go
new file mode 100644
index 0000000000..fbd25e6057
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go
@@ -0,0 +1,105 @@
+// +build windows
+
+package cpu
+
+import (
+	"fmt"
+	"syscall"
+	"time"
+	"unsafe"
+
+	"github.com/StackExchange/wmi"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+type Win32_Processor struct {
+	LoadPercentage            *uint16
+	Family                    uint16
+	Manufacturer              string
+	Name                      string
+	NumberOfLogicalProcessors uint32
+	ProcessorID               *string
+	Stepping                  *string
+	MaxClockSpeed             uint32
+}
+
+// TODO: Get percpu
+func Times(percpu bool) ([]TimesStat, error) {
+	var ret []TimesStat
+
+	var lpIdleTime common.FILETIME
+	var lpKernelTime common.FILETIME
+	var lpUserTime common.FILETIME
+	r, _, _ := common.ProcGetSystemTimes.Call(
+		uintptr(unsafe.Pointer(&lpIdleTime)),
+		uintptr(unsafe.Pointer(&lpKernelTime)),
+		uintptr(unsafe.Pointer(&lpUserTime)))
+	if r == 0 {
+		return ret, syscall.GetLastError()
+	}
+
+	LOT := float64(0.0000001)
+	HIT := (LOT * 4294967296.0)
+	idle := ((HIT * float64(lpIdleTime.DwHighDateTime)) + (LOT * float64(lpIdleTime.DwLowDateTime)))
+	user := ((HIT * float64(lpUserTime.DwHighDateTime)) + (LOT * float64(lpUserTime.DwLowDateTime)))
+	kernel := ((HIT * float64(lpKernelTime.DwHighDateTime)) + (LOT * float64(lpKernelTime.DwLowDateTime)))
+	system := (kernel - idle)
+
+	ret = append(ret, TimesStat{
+		Idle:   float64(idle),
+		User:   float64(user),
+		System: float64(system),
+	})
+	return ret, nil
+}
+
+func Info() ([]InfoStat, error) {
+	var ret []InfoStat
+	var dst []Win32_Processor
+	q := wmi.CreateQuery(&dst, "")
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return ret, err
+	}
+
+	var procID string
+	for i, l := range dst {
+		procID = ""
+		if l.ProcessorID != nil {
+			procID = *l.ProcessorID
+		}
+
+		cpu := InfoStat{
+			CPU:        int32(i),
+			Family:     fmt.Sprintf("%d", l.Family),
+			VendorID:   l.Manufacturer,
+			ModelName:  l.Name,
+			Cores:      int32(l.NumberOfLogicalProcessors),
+			PhysicalID: procID,
+			Mhz:        float64(l.MaxClockSpeed),
+			Flags:      []string{},
+		}
+		ret = append(ret, cpu)
+	}
+
+	return ret, nil
+}
+
+func Percent(interval time.Duration, percpu bool) ([]float64, error) {
+	var ret []float64
+	var dst []Win32_Processor
+	q := wmi.CreateQuery(&dst, "")
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return ret, err
+	}
+	for _, l := range dst {
+		// use range but windows can only get one percent.
+		if l.LoadPercentage == nil {
+			continue
+		}
+		ret = append(ret, float64(*l.LoadPercentage))
+	}
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go
new file mode 100644
index 0000000000..150eb60a7d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go
@@ -0,0 +1,38 @@
+package host
+
+import (
+	"encoding/json"
+)
+
+// A HostInfoStat describes the host status.
+// This is not in the psutil but it useful.
+type InfoStat struct {
+	Hostname             string `json:"hostname"`
+	Uptime               uint64 `json:"uptime"`
+	BootTime             uint64 `json:"bootTime"`
+	Procs                uint64 `json:"procs"`           // number of processes
+	OS                   string `json:"os"`              // ex: freebsd, linux
+	Platform             string `json:"platform"`        // ex: ubuntu, linuxmint
+	PlatformFamily       string `json:"platformFamily"` // ex: debian, rhel
+	PlatformVersion      string `json:"platformVersion"`
+	VirtualizationSystem string `json:"virtualizationSystem"`
+	VirtualizationRole   string `json:"virtualizationRole"` // guest or host
+
+}
+
+type UserStat struct {
+	User     string `json:"user"`
+	Terminal string `json:"terminal"`
+	Host     string `json:"host"`
+	Started  int    `json:"started"`
+}
+
+func (h InfoStat) String() string {
+	s, _ := json.Marshal(h)
+	return string(s)
+}
+
+func (u UserStat) String() string {
+	s, _ := json.Marshal(u)
+	return string(s)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go
new file mode 100644
index 0000000000..f4a8c36a26
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go
@@ -0,0 +1,152 @@
+// +build darwin
+
+package host
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// from utmpx.h
+const USER_PROCESS = 7
+
+func Info() (*InfoStat, error) {
+	ret := &InfoStat{
+		OS:             runtime.GOOS,
+		PlatformFamily: "darwin",
+	}
+
+	hostname, err := os.Hostname()
+	if err == nil {
+		ret.Hostname = hostname
+	}
+
+	platform, family, version, err := PlatformInformation()
+	if err == nil {
+		ret.Platform = platform
+		ret.PlatformFamily = family
+		ret.PlatformVersion = version
+	}
+	system, role, err := Virtualization()
+	if err == nil {
+		ret.VirtualizationSystem = system
+		ret.VirtualizationRole = role
+	}
+
+	boot, err := BootTime()
+	if err == nil {
+		ret.BootTime = boot
+		ret.Uptime = uptime(boot)
+	}
+
+	return ret, nil
+}
+
+func BootTime() (uint64, error) {
+	values, err := common.DoSysctrl("kern.boottime")
+	if err != nil {
+		return 0, err
+	}
+	// ex: { sec = 1392261637, usec = 627534 } Thu Feb 13 12:20:37 2014
+	v := strings.Replace(values[2], ",", "", 1)
+	boottime, err := strconv.ParseInt(v, 10, 64)
+	if err != nil {
+		return 0, err
+	}
+
+	return uint64(boottime), nil
+}
+
+func uptime(boot uint64) uint64 {
+	return uint64(time.Now().Unix()) - boot
+}
+
+func Uptime() (uint64, error) {
+	boot, err := BootTime()
+	if err != nil {
+		return 0, err
+	}
+	return uptime(boot), nil
+}
+
+func Users() ([]UserStat, error) {
+	utmpfile := "/var/run/utmpx"
+	var ret []UserStat
+
+	file, err := os.Open(utmpfile)
+	if err != nil {
+		return ret, err
+	}
+
+	buf, err := ioutil.ReadAll(file)
+	if err != nil {
+		return ret, err
+	}
+
+	u := Utmpx{}
+	entrySize := int(unsafe.Sizeof(u))
+	count := len(buf) / entrySize
+
+	for i := 0; i < count; i++ {
+		b := buf[i*entrySize : i*entrySize+entrySize]
+
+		var u Utmpx
+		br := bytes.NewReader(b)
+		err := binary.Read(br, binary.LittleEndian, &u)
+		if err != nil {
+			continue
+		}
+		if u.Type != USER_PROCESS {
+			continue
+		}
+		user := UserStat{
+			User:     common.IntToString(u.User[:]),
+			Terminal: common.IntToString(u.Line[:]),
+			Host:     common.IntToString(u.Host[:]),
+			Started:  int(u.Tv.Sec),
+		}
+		ret = append(ret, user)
+	}
+
+	return ret, nil
+
+}
+
+func PlatformInformation() (string, string, string, error) {
+	platform := ""
+	family := ""
+	version := ""
+
+	uname, err := exec.LookPath("uname")
+	if err != nil {
+		return "", "", "", err
+	}
+	out, err := exec.Command(uname, "-s").Output()
+	if err == nil {
+		platform = strings.ToLower(strings.TrimSpace(string(out)))
+	}
+
+	out, err = exec.Command(uname, "-r").Output()
+	if err == nil {
+		version = strings.ToLower(strings.TrimSpace(string(out)))
+	}
+
+	return platform, family, version, nil
+}
+
+func Virtualization() (string, string, error) {
+	system := ""
+	role := ""
+
+	return system, role, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go
new file mode 100644
index 0000000000..c3596f9f5e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go
@@ -0,0 +1,19 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+package host
+
+type Utmpx struct {
+	User      [256]int8
+	ID        [4]int8
+	Line      [32]int8
+	Pid       int32
+	Type      int16
+	Pad_cgo_0 [6]byte
+	Tv        Timeval
+	Host      [256]int8
+	Pad       [16]uint32
+}
+type Timeval struct {
+	Sec int32
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go
new file mode 100644
index 0000000000..06142e1c80
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go
@@ -0,0 +1,196 @@
+// +build freebsd
+
+package host
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+const (
+	UTNameSize = 16 /* see MAXLOGNAME in <sys/param.h> */
+	UTLineSize = 8
+	UTHostSize = 16
+)
+
+func Info() (*InfoStat, error) {
+	ret := &InfoStat{
+		OS:             runtime.GOOS,
+		PlatformFamily: "freebsd",
+	}
+
+	hostname, err := os.Hostname()
+	if err == nil {
+		ret.Hostname = hostname
+	}
+
+	platform, family, version, err := PlatformInformation()
+	if err == nil {
+		ret.Platform = platform
+		ret.PlatformFamily = family
+		ret.PlatformVersion = version
+	}
+	system, role, err := Virtualization()
+	if err == nil {
+		ret.VirtualizationSystem = system
+		ret.VirtualizationRole = role
+	}
+
+	boot, err := BootTime()
+	if err == nil {
+		ret.BootTime = boot
+		ret.Uptime = uptime(boot)
+	}
+
+	return ret, nil
+}
+
+func BootTime() (uint64, error) {
+	values, err := common.DoSysctrl("kern.boottime")
+	if err != nil {
+		return 0, err
+	}
+	// ex: { sec = 1392261637, usec = 627534 } Thu Feb 13 12:20:37 2014
+	v := strings.Replace(values[2], ",", "", 1)
+
+	boottime, err := strconv.ParseUint(v, 10, 64)
+	if err != nil {
+		return 0, err
+	}
+
+	return boottime, nil
+}
+
+func uptime(boot uint64) uint64 {
+	return uint64(time.Now().Unix()) - boot
+}
+
+func Uptime() (uint64, error) {
+	boot, err := BootTime()
+	if err != nil {
+		return 0, err
+	}
+	return uptime(boot), nil
+}
+
+func Users() ([]UserStat, error) {
+	utmpfile := "/var/run/utx.active"
+	if !common.PathExists(utmpfile) {
+		utmpfile = "/var/run/utmp" // before 9.0
+		return getUsersFromUtmp(utmpfile)
+	}
+
+	var ret []UserStat
+	file, err := os.Open(utmpfile)
+	if err != nil {
+		return ret, err
+	}
+
+	buf, err := ioutil.ReadAll(file)
+	if err != nil {
+		return ret, err
+	}
+
+	u := Utmpx{}
+	entrySize := int(unsafe.Sizeof(u)) - 3
+	entrySize = 197 // TODO: why should 197
+	count := len(buf) / entrySize
+
+	for i := 0; i < count; i++ {
+		b := buf[i*entrySize : i*entrySize+entrySize]
+		var u Utmpx
+		br := bytes.NewReader(b)
+		err := binary.Read(br, binary.LittleEndian, &u)
+		if err != nil || u.Type != 4 {
+			continue
+		}
+		sec := (binary.LittleEndian.Uint32(u.Tv.Sec[:])) / 2 // TODO:
+		user := UserStat{
+			User:     common.IntToString(u.User[:]),
+			Terminal: common.IntToString(u.Line[:]),
+			Host:     common.IntToString(u.Host[:]),
+			Started:  int(sec),
+		}
+
+		ret = append(ret, user)
+	}
+
+	return ret, nil
+
+}
+
+func PlatformInformation() (string, string, string, error) {
+	platform := ""
+	family := ""
+	version := ""
+	uname, err := exec.LookPath("uname")
+	if err != nil {
+		return "", "", "", err
+	}
+
+	out, err := exec.Command(uname, "-s").Output()
+	if err == nil {
+		platform = strings.ToLower(strings.TrimSpace(string(out)))
+	}
+
+	out, err = exec.Command(uname, "-r").Output()
+	if err == nil {
+		version = strings.ToLower(strings.TrimSpace(string(out)))
+	}
+
+	return platform, family, version, nil
+}
+
+func Virtualization() (string, string, error) {
+	system := ""
+	role := ""
+
+	return system, role, nil
+}
+
+// before 9.0
+func getUsersFromUtmp(utmpfile string) ([]UserStat, error) {
+	var ret []UserStat
+	file, err := os.Open(utmpfile)
+	if err != nil {
+		return ret, err
+	}
+	buf, err := ioutil.ReadAll(file)
+	if err != nil {
+		return ret, err
+	}
+
+	u := Utmp{}
+	entrySize := int(unsafe.Sizeof(u))
+	count := len(buf) / entrySize
+
+	for i := 0; i < count; i++ {
+		b := buf[i*entrySize : i*entrySize+entrySize]
+		var u Utmp
+		br := bytes.NewReader(b)
+		err := binary.Read(br, binary.LittleEndian, &u)
+		if err != nil || u.Time == 0 {
+			continue
+		}
+		user := UserStat{
+			User:     common.IntToString(u.Name[:]),
+			Terminal: common.IntToString(u.Line[:]),
+			Host:     common.IntToString(u.Host[:]),
+			Started:  int(u.Time),
+		}
+
+		ret = append(ret, user)
+	}
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
new file mode 100644
index 0000000000..9a4c0a47ac
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
@@ -0,0 +1,41 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package host
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Utmp struct {
+	Line [8]int8
+	Name [16]int8
+	Host [16]int8
+	Time int32
+}
+type Utmpx struct {
+	Type int16
+	Tv   Timeval
+	ID   [8]int8
+	Pid  int32
+	User [32]int8
+	Line [16]int8
+	Host [125]int8
+	//	Host [128]int8
+	//	X__ut_spare [64]int8
+}
+type Timeval struct {
+	Sec  [4]byte
+	Usec [3]byte
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go
new file mode 100644
index 0000000000..f56906c28f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go
@@ -0,0 +1,431 @@
+// +build linux
+
+package host
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"regexp"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+type LSB struct {
+	ID          string
+	Release     string
+	Codename    string
+	Description string
+}
+
+// from utmp.h
+const USER_PROCESS = 7
+
+func Info() (*InfoStat, error) {
+	ret := &InfoStat{
+		OS: runtime.GOOS,
+	}
+
+	hostname, err := os.Hostname()
+	if err == nil {
+		ret.Hostname = hostname
+	}
+
+	platform, family, version, err := PlatformInformation()
+	if err == nil {
+		ret.Platform = platform
+		ret.PlatformFamily = family
+		ret.PlatformVersion = version
+	}
+	system, role, err := Virtualization()
+	if err == nil {
+		ret.VirtualizationSystem = system
+		ret.VirtualizationRole = role
+	}
+	boot, err := BootTime()
+	if err == nil {
+		ret.BootTime = boot
+		ret.Uptime = uptime(boot)
+	}
+
+	return ret, nil
+}
+
+// BootTime returns the system boot time expressed in seconds since the epoch.
+func BootTime() (uint64, error) {
+	filename := common.HostProc("stat")
+	lines, err := common.ReadLines(filename)
+	if err != nil {
+		return 0, err
+	}
+	for _, line := range lines {
+		if strings.HasPrefix(line, "btime") {
+			f := strings.Fields(line)
+			if len(f) != 2 {
+				return 0, fmt.Errorf("wrong btime format")
+			}
+			b, err := strconv.ParseInt(f[1], 10, 64)
+			if err != nil {
+				return 0, err
+			}
+			return uint64(b), nil
+		}
+	}
+
+	return 0, fmt.Errorf("could not find btime")
+}
+
+func uptime(boot uint64) uint64 {
+	return uint64(time.Now().Unix()) - boot
+}
+
+func Uptime() (uint64, error) {
+	boot, err := BootTime()
+	if err != nil {
+		return 0, err
+	}
+	return uptime(boot), nil
+}
+
+func Users() ([]UserStat, error) {
+	utmpfile := "/var/run/utmp"
+
+	file, err := os.Open(utmpfile)
+	if err != nil {
+		return nil, err
+	}
+
+	buf, err := ioutil.ReadAll(file)
+	if err != nil {
+		return nil, err
+	}
+
+	u := utmp{}
+	entrySize := int(unsafe.Sizeof(u))
+	count := len(buf) / entrySize
+
+	ret := make([]UserStat, 0, count)
+
+	for i := 0; i < count; i++ {
+		b := buf[i*entrySize : i*entrySize+entrySize]
+
+		var u utmp
+		br := bytes.NewReader(b)
+		err := binary.Read(br, binary.LittleEndian, &u)
+		if err != nil {
+			continue
+		}
+		if u.Type != USER_PROCESS {
+			continue
+		}
+		user := UserStat{
+			User:     common.IntToString(u.User[:]),
+			Terminal: common.IntToString(u.Line[:]),
+			Host:     common.IntToString(u.Host[:]),
+			Started:  int(u.Tv.TvSec),
+		}
+		ret = append(ret, user)
+	}
+
+	return ret, nil
+
+}
+
+func getLSB() (*LSB, error) {
+	ret := &LSB{}
+	if common.PathExists(common.HostEtc("lsb-release")) {
+		contents, err := common.ReadLines(common.HostEtc("lsb-release"))
+		if err != nil {
+			return ret, err // return empty
+		}
+		for _, line := range contents {
+			field := strings.Split(line, "=")
+			if len(field) < 2 {
+				continue
+			}
+			switch field[0] {
+			case "DISTRIB_ID":
+				ret.ID = field[1]
+			case "DISTRIB_RELEASE":
+				ret.Release = field[1]
+			case "DISTRIB_CODENAME":
+				ret.Codename = field[1]
+			case "DISTRIB_DESCRIPTION":
+				ret.Description = field[1]
+			}
+		}
+	} else if common.PathExists("/usr/bin/lsb_release") {
+		lsb_release, err := exec.LookPath("/usr/bin/lsb_release")
+		if err != nil {
+			return ret, err
+		}
+		out, err := exec.Command(lsb_release).Output()
+		if err != nil {
+			return ret, err
+		}
+		for _, line := range strings.Split(string(out), "\n") {
+			field := strings.Split(line, ":")
+			if len(field) < 2 {
+				continue
+			}
+			switch field[0] {
+			case "Distributor ID":
+				ret.ID = field[1]
+			case "Release":
+				ret.Release = field[1]
+			case "Codename":
+				ret.Codename = field[1]
+			case "Description":
+				ret.Description = field[1]
+			}
+		}
+
+	}
+
+	return ret, nil
+}
+
+func PlatformInformation() (platform string, family string, version string, err error) {
+
+	lsb, err := getLSB()
+	if err != nil {
+		lsb = &LSB{}
+	}
+
+	if common.PathExists(common.HostEtc("oracle-release")) {
+		platform = "oracle"
+		contents, err := common.ReadLines(common.HostEtc("oracle-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+		}
+
+	} else if common.PathExists(common.HostEtc("enterprise-release")) {
+		platform = "oracle"
+		contents, err := common.ReadLines(common.HostEtc("enterprise-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+		}
+	} else if common.PathExists(common.HostEtc("debian_version")) {
+		if lsb.ID == "Ubuntu" {
+			platform = "ubuntu"
+			version = lsb.Release
+		} else if lsb.ID == "LinuxMint" {
+			platform = "linuxmint"
+			version = lsb.Release
+		} else {
+			if common.PathExists("/usr/bin/raspi-config") {
+				platform = "raspbian"
+			} else {
+				platform = "debian"
+			}
+			contents, err := common.ReadLines(common.HostEtc("debian_version"))
+			if err == nil {
+				version = contents[0]
+			}
+		}
+	} else if common.PathExists(common.HostEtc("redhat-release")) {
+		contents, err := common.ReadLines(common.HostEtc("redhat-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+			platform = getRedhatishPlatform(contents)
+		}
+	} else if common.PathExists(common.HostEtc("system-release")) {
+		contents, err := common.ReadLines(common.HostEtc("system-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+			platform = getRedhatishPlatform(contents)
+		}
+	} else if common.PathExists(common.HostEtc("gentoo-release")) {
+		platform = "gentoo"
+		contents, err := common.ReadLines(common.HostEtc("gentoo-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+		}
+	} else if common.PathExists(common.HostEtc("SuSE-release")) {
+		contents, err := common.ReadLines(common.HostEtc("SuSE-release"))
+		if err == nil {
+			version = getSuseVersion(contents)
+			platform = getSusePlatform(contents)
+		}
+		// TODO: slackware detecion
+	} else if common.PathExists(common.HostEtc("arch-release")) {
+		platform = "arch"
+		version = lsb.Release
+	} else if lsb.ID == "RedHat" {
+		platform = "redhat"
+		version = lsb.Release
+	} else if lsb.ID == "Amazon" {
+		platform = "amazon"
+		version = lsb.Release
+	} else if lsb.ID == "ScientificSL" {
+		platform = "scientific"
+		version = lsb.Release
+	} else if lsb.ID == "XenServer" {
+		platform = "xenserver"
+		version = lsb.Release
+	} else if lsb.ID != "" {
+		platform = strings.ToLower(lsb.ID)
+		version = lsb.Release
+	}
+
+	switch platform {
+	case "debian", "ubuntu", "linuxmint", "raspbian":
+		family = "debian"
+	case "fedora":
+		family = "fedora"
+	case "oracle", "centos", "redhat", "scientific", "enterpriseenterprise", "amazon", "xenserver", "cloudlinux", "ibm_powerkvm":
+		family = "rhel"
+	case "suse", "opensuse":
+		family = "suse"
+	case "gentoo":
+		family = "gentoo"
+	case "slackware":
+		family = "slackware"
+	case "arch":
+		family = "arch"
+	case "exherbo":
+		family = "exherbo"
+	}
+
+	return platform, family, version, nil
+
+}
+
+func getRedhatishVersion(contents []string) string {
+	c := strings.ToLower(strings.Join(contents, ""))
+
+	if strings.Contains(c, "rawhide") {
+		return "rawhide"
+	}
+	if matches := regexp.MustCompile(`release (\d[\d.]*)`).FindStringSubmatch(c); matches != nil {
+		return matches[1]
+	}
+	return ""
+}
+
+func getRedhatishPlatform(contents []string) string {
+	c := strings.ToLower(strings.Join(contents, ""))
+
+	if strings.Contains(c, "red hat") {
+		return "redhat"
+	}
+	f := strings.Split(c, " ")
+
+	return f[0]
+}
+
+func getSuseVersion(contents []string) string {
+	version := ""
+	for _, line := range contents {
+		if matches := regexp.MustCompile(`VERSION = ([\d.]+)`).FindStringSubmatch(line); matches != nil {
+			version = matches[1]
+		} else if matches := regexp.MustCompile(`PATCHLEVEL = ([\d]+)`).FindStringSubmatch(line); matches != nil {
+			version = version + "." + matches[1]
+		}
+	}
+	return version
+}
+
+func getSusePlatform(contents []string) string {
+	c := strings.ToLower(strings.Join(contents, ""))
+	if strings.Contains(c, "opensuse") {
+		return "opensuse"
+	}
+	return "suse"
+}
+
+func Virtualization() (string, string, error) {
+	var system string
+	var role string
+
+	filename := common.HostProc("xen")
+	if common.PathExists(filename) {
+		system = "xen"
+		role = "guest" // assume guest
+
+		if common.PathExists(filename + "/capabilities") {
+			contents, err := common.ReadLines(filename + "/capabilities")
+			if err == nil {
+				if common.StringsHas(contents, "control_d") {
+					role = "host"
+				}
+			}
+		}
+	}
+
+	filename = common.HostProc("modules")
+	if common.PathExists(filename) {
+		contents, err := common.ReadLines(filename)
+		if err == nil {
+			if common.StringsContains(contents, "kvm") {
+				system = "kvm"
+				role = "host"
+			} else if common.StringsContains(contents, "vboxdrv") {
+				system = "vbox"
+				role = "host"
+			} else if common.StringsContains(contents, "vboxguest") {
+				system = "vbox"
+				role = "guest"
+			}
+		}
+	}
+
+	filename = common.HostProc("cpuinfo")
+	if common.PathExists(filename) {
+		contents, err := common.ReadLines(filename)
+		if err == nil {
+			if common.StringsHas(contents, "QEMU Virtual CPU") ||
+				common.StringsHas(contents, "Common KVM processor") ||
+				common.StringsHas(contents, "Common 32-bit KVM processor") {
+				system = "kvm"
+				role = "guest"
+			}
+		}
+	}
+
+	filename = common.HostProc()
+	if common.PathExists(filename + "/bc/0") {
+		system = "openvz"
+		role = "host"
+	} else if common.PathExists(filename + "/vz") {
+		system = "openvz"
+		role = "guest"
+	}
+
+	// not use dmidecode because it requires root
+	if common.PathExists(filename + "/self/status") {
+		contents, err := common.ReadLines(filename + "/self/status")
+		if err == nil {
+
+			if common.StringsHas(contents, "s_context:") ||
+				common.StringsHas(contents, "VxID:") {
+				system = "linux-vserver"
+			}
+			// TODO: guest or host
+		}
+	}
+
+	if common.PathExists(filename + "/self/cgroup") {
+		contents, err := common.ReadLines(filename + "/self/cgroup")
+		if err == nil {
+			if common.StringsHas(contents, "lxc") ||
+				common.StringsHas(contents, "docker") {
+				system = "lxc"
+				role = "guest"
+			} else if common.PathExists("/usr/bin/lxc-version") { // TODO: which
+				system = "lxc"
+				role = "host"
+			}
+		}
+	}
+
+	return system, role, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go
new file mode 100644
index 0000000000..cab9feed41
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go
@@ -0,0 +1,44 @@
+// ATTENTION - FILE MANUAL FIXED AFTER CGO.
+// Fixed line: Tv		_Ctype_struct_timeval -> Tv		UtTv
+// Created by cgo -godefs, MANUAL FIXED
+// cgo -godefs types_linux.go
+
+package host
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type utmp struct {
+	Type      int16
+	Pad_cgo_0 [2]byte
+	Pid       int32
+	Line      [32]int8
+	ID        [4]int8
+	User      [32]int8
+	Host      [256]int8
+	Exit      exit_status
+	Session   int32
+	Tv        UtTv
+	Addr_v6   [4]int32
+	X__unused [20]int8
+}
+type exit_status struct {
+	Termination int16
+	Exit        int16
+}
+type UtTv struct {
+	TvSec  int32
+	TvUsec int32
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go
new file mode 100644
index 0000000000..180394bbf4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go
@@ -0,0 +1,42 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package host
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type utmp struct {
+	Type              int16
+	Pad_cgo_0         [2]byte
+	Pid               int32
+	Line              [32]int8
+	ID                [4]int8
+	User              [32]int8
+	Host              [256]int8
+	Exit              exit_status
+	Session           int32
+	Tv                UtTv
+	Addr_v6           [4]int32
+	X__glibc_reserved [20]int8
+}
+type exit_status struct {
+	Termination int16
+	Exit        int16
+}
+type UtTv struct {
+	TvSec  int32
+	TvUsec int32
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go
new file mode 100644
index 0000000000..5f7e168b61
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go
@@ -0,0 +1,42 @@
+// +build linux
+// +build arm
+
+package host
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type utmp struct {
+	Type              int16
+	Pad_cgo_0         [2]byte
+	Pid               int32
+	Line              [32]int8
+	ID                [4]int8
+	User              [32]int8
+	Host              [256]int8
+	Exit              exit_status
+	Session           int32
+	Tv                UtTv
+	Addr_v6           [4]int32
+	X__glibc_reserved [20]int8
+}
+type exit_status struct {
+	Termination int16
+	Exit        int16
+}
+type UtTv struct {
+	TvSec  int32
+	TvUsec int32
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go
new file mode 100644
index 0000000000..29f900c6e2
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go
@@ -0,0 +1,135 @@
+// +build windows
+
+package host
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"strings"
+	"time"
+
+	"github.com/StackExchange/wmi"
+
+	"github.com/shirou/gopsutil/internal/common"
+	process "github.com/shirou/gopsutil/process"
+)
+
+var (
+	procGetSystemTimeAsFileTime = common.Modkernel32.NewProc("GetSystemTimeAsFileTime")
+	osInfo                      *Win32_OperatingSystem
+)
+
+type Win32_OperatingSystem struct {
+	Version        string
+	Caption        string
+	ProductType    uint32
+	BuildNumber    string
+	LastBootUpTime time.Time
+}
+
+func Info() (*InfoStat, error) {
+	ret := &InfoStat{
+		OS: runtime.GOOS,
+	}
+
+	hostname, err := os.Hostname()
+	if err == nil {
+		ret.Hostname = hostname
+	}
+
+	platform, family, version, err := PlatformInformation()
+	if err == nil {
+		ret.Platform = platform
+		ret.PlatformFamily = family
+		ret.PlatformVersion = version
+	} else {
+		return ret, err
+	}
+
+	boot, err := BootTime()
+	if err == nil {
+		ret.BootTime = boot
+		ret.Uptime = uptime(boot)
+	}
+
+	procs, err := process.Pids()
+	if err != nil {
+		return ret, err
+	}
+
+	ret.Procs = uint64(len(procs))
+
+	return ret, nil
+}
+
+func GetOSInfo() (Win32_OperatingSystem, error) {
+	var dst []Win32_OperatingSystem
+	q := wmi.CreateQuery(&dst, "")
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return Win32_OperatingSystem{}, err
+	}
+
+	osInfo = &dst[0]
+
+	return dst[0], nil
+}
+
+func BootTime() (uint64, error) {
+	if osInfo == nil {
+		_, err := GetOSInfo()
+		if err != nil {
+			return 0, err
+		}
+	}
+	now := time.Now()
+	t := osInfo.LastBootUpTime.Local()
+	return uint64(now.Sub(t).Seconds()), nil
+}
+
+func uptime(boot uint64) uint64 {
+	return uint64(time.Now().Unix()) - boot
+}
+
+func Uptime() (uint64, error) {
+	boot, err := BootTime()
+	if err != nil {
+		return 0, err
+	}
+	return uptime(boot), nil
+}
+
+func PlatformInformation() (platform string, family string, version string, err error) {
+	if osInfo == nil {
+		_, err = GetOSInfo()
+		if err != nil {
+			return
+		}
+	}
+
+	// Platform
+	platform = strings.Trim(osInfo.Caption, " ")
+
+	// PlatformFamily
+	switch osInfo.ProductType {
+	case 1:
+		family = "Standalone Workstation"
+	case 2:
+		family = "Server (Domain Controller)"
+	case 3:
+		family = "Server"
+	}
+
+	// Platform Version
+	version = fmt.Sprintf("%s Build %s", osInfo.Version, osInfo.BuildNumber)
+
+	return
+}
+
+func Users() ([]UserStat, error) {
+
+	var ret []UserStat
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go
new file mode 100644
index 0000000000..b858227885
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go
@@ -0,0 +1,17 @@
+// +build ignore
+// plus hand editing about timeval
+
+/*
+Input to cgo -godefs.
+*/
+
+package host
+
+/*
+#include <sys/time.h>
+#include <utmpx.h>
+*/
+import "C"
+
+type Utmpx C.struct_utmpx
+type Timeval C.struct_timeval
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go
new file mode 100644
index 0000000000..113b22eeaf
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go
@@ -0,0 +1,43 @@
+// +build ignore
+
+/*
+Input to cgo -godefs.
+*/
+
+package host
+
+/*
+#define KERNEL
+#include <sys/types.h>
+#include <sys/time.h>
+#include <utmpx.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+type Utmp C.struct_utmp
+type Utmpx C.struct_utmpx
+type Timeval C.struct_timeval
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go
new file mode 100644
index 0000000000..928545515c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go
@@ -0,0 +1,45 @@
+// +build ignore
+
+/*
+Input to cgo -godefs.
+*/
+
+package host
+
+/*
+#define KERNEL
+#include <sys/types.h>
+#include <utmp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+type utmp C.struct_utmp
+type exit_status C.struct_exit_status
+type UtTv struct {
+	TvSec  int32
+	TvUsec int32
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/binary.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/binary.go
new file mode 100644
index 0000000000..9b5dc55b49
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/binary.go
@@ -0,0 +1,634 @@
+package common
+
+// Copyright 2009 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package binary implements simple translation between numbers and byte
+// sequences and encoding and decoding of varints.
+//
+// Numbers are translated by reading and writing fixed-size values.
+// A fixed-size value is either a fixed-size arithmetic
+// type (int8, uint8, int16, float32, complex64, ...)
+// or an array or struct containing only fixed-size values.
+//
+// The varint functions encode and decode single integer values using
+// a variable-length encoding; smaller values require fewer bytes.
+// For a specification, see
+// http://code.google.com/apis/protocolbuffers/docs/encoding.html.
+//
+// This package favors simplicity over efficiency. Clients that require
+// high-performance serialization, especially for large data structures,
+// should look at more advanced solutions such as the encoding/gob
+// package or protocol buffers.
+import (
+	"errors"
+	"io"
+	"math"
+	"reflect"
+)
+
+// A ByteOrder specifies how to convert byte sequences into
+// 16-, 32-, or 64-bit unsigned integers.
+type ByteOrder interface {
+	Uint16([]byte) uint16
+	Uint32([]byte) uint32
+	Uint64([]byte) uint64
+	PutUint16([]byte, uint16)
+	PutUint32([]byte, uint32)
+	PutUint64([]byte, uint64)
+	String() string
+}
+
+// LittleEndian is the little-endian implementation of ByteOrder.
+var LittleEndian littleEndian
+
+// BigEndian is the big-endian implementation of ByteOrder.
+var BigEndian bigEndian
+
+type littleEndian struct{}
+
+func (littleEndian) Uint16(b []byte) uint16 { return uint16(b[0]) | uint16(b[1])<<8 }
+
+func (littleEndian) PutUint16(b []byte, v uint16) {
+	b[0] = byte(v)
+	b[1] = byte(v >> 8)
+}
+
+func (littleEndian) Uint32(b []byte) uint32 {
+	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+}
+
+func (littleEndian) PutUint32(b []byte, v uint32) {
+	b[0] = byte(v)
+	b[1] = byte(v >> 8)
+	b[2] = byte(v >> 16)
+	b[3] = byte(v >> 24)
+}
+
+func (littleEndian) Uint64(b []byte) uint64 {
+	return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
+		uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+}
+
+func (littleEndian) PutUint64(b []byte, v uint64) {
+	b[0] = byte(v)
+	b[1] = byte(v >> 8)
+	b[2] = byte(v >> 16)
+	b[3] = byte(v >> 24)
+	b[4] = byte(v >> 32)
+	b[5] = byte(v >> 40)
+	b[6] = byte(v >> 48)
+	b[7] = byte(v >> 56)
+}
+
+func (littleEndian) String() string { return "LittleEndian" }
+
+func (littleEndian) GoString() string { return "binary.LittleEndian" }
+
+type bigEndian struct{}
+
+func (bigEndian) Uint16(b []byte) uint16 { return uint16(b[1]) | uint16(b[0])<<8 }
+
+func (bigEndian) PutUint16(b []byte, v uint16) {
+	b[0] = byte(v >> 8)
+	b[1] = byte(v)
+}
+
+func (bigEndian) Uint32(b []byte) uint32 {
+	return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
+}
+
+func (bigEndian) PutUint32(b []byte, v uint32) {
+	b[0] = byte(v >> 24)
+	b[1] = byte(v >> 16)
+	b[2] = byte(v >> 8)
+	b[3] = byte(v)
+}
+
+func (bigEndian) Uint64(b []byte) uint64 {
+	return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
+		uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
+}
+
+func (bigEndian) PutUint64(b []byte, v uint64) {
+	b[0] = byte(v >> 56)
+	b[1] = byte(v >> 48)
+	b[2] = byte(v >> 40)
+	b[3] = byte(v >> 32)
+	b[4] = byte(v >> 24)
+	b[5] = byte(v >> 16)
+	b[6] = byte(v >> 8)
+	b[7] = byte(v)
+}
+
+func (bigEndian) String() string { return "BigEndian" }
+
+func (bigEndian) GoString() string { return "binary.BigEndian" }
+
+// Read reads structured binary data from r into data.
+// Data must be a pointer to a fixed-size value or a slice
+// of fixed-size values.
+// Bytes read from r are decoded using the specified byte order
+// and written to successive fields of the data.
+// When reading into structs, the field data for fields with
+// blank (_) field names is skipped; i.e., blank field names
+// may be used for padding.
+// When reading into a struct, all non-blank fields must be exported.
+func Read(r io.Reader, order ByteOrder, data interface{}) error {
+	// Fast path for basic types and slices.
+	if n := intDataSize(data); n != 0 {
+		var b [8]byte
+		var bs []byte
+		if n > len(b) {
+			bs = make([]byte, n)
+		} else {
+			bs = b[:n]
+		}
+		if _, err := io.ReadFull(r, bs); err != nil {
+			return err
+		}
+		switch data := data.(type) {
+		case *int8:
+			*data = int8(b[0])
+		case *uint8:
+			*data = b[0]
+		case *int16:
+			*data = int16(order.Uint16(bs))
+		case *uint16:
+			*data = order.Uint16(bs)
+		case *int32:
+			*data = int32(order.Uint32(bs))
+		case *uint32:
+			*data = order.Uint32(bs)
+		case *int64:
+			*data = int64(order.Uint64(bs))
+		case *uint64:
+			*data = order.Uint64(bs)
+		case []int8:
+			for i, x := range bs { // Easier to loop over the input for 8-bit values.
+				data[i] = int8(x)
+			}
+		case []uint8:
+			copy(data, bs)
+		case []int16:
+			for i := range data {
+				data[i] = int16(order.Uint16(bs[2*i:]))
+			}
+		case []uint16:
+			for i := range data {
+				data[i] = order.Uint16(bs[2*i:])
+			}
+		case []int32:
+			for i := range data {
+				data[i] = int32(order.Uint32(bs[4*i:]))
+			}
+		case []uint32:
+			for i := range data {
+				data[i] = order.Uint32(bs[4*i:])
+			}
+		case []int64:
+			for i := range data {
+				data[i] = int64(order.Uint64(bs[8*i:]))
+			}
+		case []uint64:
+			for i := range data {
+				data[i] = order.Uint64(bs[8*i:])
+			}
+		}
+		return nil
+	}
+
+	// Fallback to reflect-based decoding.
+	v := reflect.ValueOf(data)
+	size := -1
+	switch v.Kind() {
+	case reflect.Ptr:
+		v = v.Elem()
+		size = dataSize(v)
+	case reflect.Slice:
+		size = dataSize(v)
+	}
+	if size < 0 {
+		return errors.New("binary.Read: invalid type " + reflect.TypeOf(data).String())
+	}
+	d := &decoder{order: order, buf: make([]byte, size)}
+	if _, err := io.ReadFull(r, d.buf); err != nil {
+		return err
+	}
+	d.value(v)
+	return nil
+}
+
+// Write writes the binary representation of data into w.
+// Data must be a fixed-size value or a slice of fixed-size
+// values, or a pointer to such data.
+// Bytes written to w are encoded using the specified byte order
+// and read from successive fields of the data.
+// When writing structs, zero values are written for fields
+// with blank (_) field names.
+func Write(w io.Writer, order ByteOrder, data interface{}) error {
+	// Fast path for basic types and slices.
+	if n := intDataSize(data); n != 0 {
+		var b [8]byte
+		var bs []byte
+		if n > len(b) {
+			bs = make([]byte, n)
+		} else {
+			bs = b[:n]
+		}
+		switch v := data.(type) {
+		case *int8:
+			bs = b[:1]
+			b[0] = byte(*v)
+		case int8:
+			bs = b[:1]
+			b[0] = byte(v)
+		case []int8:
+			for i, x := range v {
+				bs[i] = byte(x)
+			}
+		case *uint8:
+			bs = b[:1]
+			b[0] = *v
+		case uint8:
+			bs = b[:1]
+			b[0] = byte(v)
+		case []uint8:
+			bs = v
+		case *int16:
+			bs = b[:2]
+			order.PutUint16(bs, uint16(*v))
+		case int16:
+			bs = b[:2]
+			order.PutUint16(bs, uint16(v))
+		case []int16:
+			for i, x := range v {
+				order.PutUint16(bs[2*i:], uint16(x))
+			}
+		case *uint16:
+			bs = b[:2]
+			order.PutUint16(bs, *v)
+		case uint16:
+			bs = b[:2]
+			order.PutUint16(bs, v)
+		case []uint16:
+			for i, x := range v {
+				order.PutUint16(bs[2*i:], x)
+			}
+		case *int32:
+			bs = b[:4]
+			order.PutUint32(bs, uint32(*v))
+		case int32:
+			bs = b[:4]
+			order.PutUint32(bs, uint32(v))
+		case []int32:
+			for i, x := range v {
+				order.PutUint32(bs[4*i:], uint32(x))
+			}
+		case *uint32:
+			bs = b[:4]
+			order.PutUint32(bs, *v)
+		case uint32:
+			bs = b[:4]
+			order.PutUint32(bs, v)
+		case []uint32:
+			for i, x := range v {
+				order.PutUint32(bs[4*i:], x)
+			}
+		case *int64:
+			bs = b[:8]
+			order.PutUint64(bs, uint64(*v))
+		case int64:
+			bs = b[:8]
+			order.PutUint64(bs, uint64(v))
+		case []int64:
+			for i, x := range v {
+				order.PutUint64(bs[8*i:], uint64(x))
+			}
+		case *uint64:
+			bs = b[:8]
+			order.PutUint64(bs, *v)
+		case uint64:
+			bs = b[:8]
+			order.PutUint64(bs, v)
+		case []uint64:
+			for i, x := range v {
+				order.PutUint64(bs[8*i:], x)
+			}
+		}
+		_, err := w.Write(bs)
+		return err
+	}
+
+	// Fallback to reflect-based encoding.
+	v := reflect.Indirect(reflect.ValueOf(data))
+	size := dataSize(v)
+	if size < 0 {
+		return errors.New("binary.Write: invalid type " + reflect.TypeOf(data).String())
+	}
+	buf := make([]byte, size)
+	e := &encoder{order: order, buf: buf}
+	e.value(v)
+	_, err := w.Write(buf)
+	return err
+}
+
+// Size returns how many bytes Write would generate to encode the value v, which
+// must be a fixed-size value or a slice of fixed-size values, or a pointer to such data.
+// If v is neither of these, Size returns -1.
+func Size(v interface{}) int {
+	return dataSize(reflect.Indirect(reflect.ValueOf(v)))
+}
+
+// dataSize returns the number of bytes the actual data represented by v occupies in memory.
+// For compound structures, it sums the sizes of the elements. Thus, for instance, for a slice
+// it returns the length of the slice times the element size and does not count the memory
+// occupied by the header. If the type of v is not acceptable, dataSize returns -1.
+func dataSize(v reflect.Value) int {
+	if v.Kind() == reflect.Slice {
+		if s := sizeof(v.Type().Elem()); s >= 0 {
+			return s * v.Len()
+		}
+		return -1
+	}
+	return sizeof(v.Type())
+}
+
+// sizeof returns the size >= 0 of variables for the given type or -1 if the type is not acceptable.
+func sizeof(t reflect.Type) int {
+	switch t.Kind() {
+	case reflect.Array:
+		if s := sizeof(t.Elem()); s >= 0 {
+			return s * t.Len()
+		}
+
+	case reflect.Struct:
+		sum := 0
+		for i, n := 0, t.NumField(); i < n; i++ {
+			s := sizeof(t.Field(i).Type)
+			if s < 0 {
+				return -1
+			}
+			sum += s
+		}
+		return sum
+
+	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
+		reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
+		reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128, reflect.Ptr:
+		return int(t.Size())
+	}
+
+	return -1
+}
+
+type coder struct {
+	order ByteOrder
+	buf   []byte
+}
+
+type decoder coder
+type encoder coder
+
+func (d *decoder) uint8() uint8 {
+	x := d.buf[0]
+	d.buf = d.buf[1:]
+	return x
+}
+
+func (e *encoder) uint8(x uint8) {
+	e.buf[0] = x
+	e.buf = e.buf[1:]
+}
+
+func (d *decoder) uint16() uint16 {
+	x := d.order.Uint16(d.buf[0:2])
+	d.buf = d.buf[2:]
+	return x
+}
+
+func (e *encoder) uint16(x uint16) {
+	e.order.PutUint16(e.buf[0:2], x)
+	e.buf = e.buf[2:]
+}
+
+func (d *decoder) uint32() uint32 {
+	x := d.order.Uint32(d.buf[0:4])
+	d.buf = d.buf[4:]
+	return x
+}
+
+func (e *encoder) uint32(x uint32) {
+	e.order.PutUint32(e.buf[0:4], x)
+	e.buf = e.buf[4:]
+}
+
+func (d *decoder) uint64() uint64 {
+	x := d.order.Uint64(d.buf[0:8])
+	d.buf = d.buf[8:]
+	return x
+}
+
+func (e *encoder) uint64(x uint64) {
+	e.order.PutUint64(e.buf[0:8], x)
+	e.buf = e.buf[8:]
+}
+
+func (d *decoder) int8() int8 { return int8(d.uint8()) }
+
+func (e *encoder) int8(x int8) { e.uint8(uint8(x)) }
+
+func (d *decoder) int16() int16 { return int16(d.uint16()) }
+
+func (e *encoder) int16(x int16) { e.uint16(uint16(x)) }
+
+func (d *decoder) int32() int32 { return int32(d.uint32()) }
+
+func (e *encoder) int32(x int32) { e.uint32(uint32(x)) }
+
+func (d *decoder) int64() int64 { return int64(d.uint64()) }
+
+func (e *encoder) int64(x int64) { e.uint64(uint64(x)) }
+
+func (d *decoder) value(v reflect.Value) {
+	switch v.Kind() {
+	case reflect.Array:
+		l := v.Len()
+		for i := 0; i < l; i++ {
+			d.value(v.Index(i))
+		}
+
+	case reflect.Struct:
+		t := v.Type()
+		l := v.NumField()
+		for i := 0; i < l; i++ {
+			// Note: Calling v.CanSet() below is an optimization.
+			// It would be sufficient to check the field name,
+			// but creating the StructField info for each field is
+			// costly (run "go test -bench=ReadStruct" and compare
+			// results when making changes to this code).
+			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
+				d.value(v)
+			} else {
+				d.skip(v)
+			}
+		}
+
+	case reflect.Slice:
+		l := v.Len()
+		for i := 0; i < l; i++ {
+			d.value(v.Index(i))
+		}
+
+	case reflect.Int8:
+		v.SetInt(int64(d.int8()))
+	case reflect.Int16:
+		v.SetInt(int64(d.int16()))
+	case reflect.Int32:
+		v.SetInt(int64(d.int32()))
+	case reflect.Int64:
+		v.SetInt(d.int64())
+
+	case reflect.Uint8:
+		v.SetUint(uint64(d.uint8()))
+	case reflect.Uint16:
+		v.SetUint(uint64(d.uint16()))
+	case reflect.Uint32:
+		v.SetUint(uint64(d.uint32()))
+	case reflect.Uint64:
+		v.SetUint(d.uint64())
+
+	case reflect.Float32:
+		v.SetFloat(float64(math.Float32frombits(d.uint32())))
+	case reflect.Float64:
+		v.SetFloat(math.Float64frombits(d.uint64()))
+
+	case reflect.Complex64:
+		v.SetComplex(complex(
+			float64(math.Float32frombits(d.uint32())),
+			float64(math.Float32frombits(d.uint32())),
+		))
+	case reflect.Complex128:
+		v.SetComplex(complex(
+			math.Float64frombits(d.uint64()),
+			math.Float64frombits(d.uint64()),
+		))
+	}
+}
+
+func (e *encoder) value(v reflect.Value) {
+	switch v.Kind() {
+	case reflect.Array:
+		l := v.Len()
+		for i := 0; i < l; i++ {
+			e.value(v.Index(i))
+		}
+
+	case reflect.Struct:
+		t := v.Type()
+		l := v.NumField()
+		for i := 0; i < l; i++ {
+			// see comment for corresponding code in decoder.value()
+			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
+				e.value(v)
+			} else {
+				e.skip(v)
+			}
+		}
+
+	case reflect.Slice:
+		l := v.Len()
+		for i := 0; i < l; i++ {
+			e.value(v.Index(i))
+		}
+
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		switch v.Type().Kind() {
+		case reflect.Int8:
+			e.int8(int8(v.Int()))
+		case reflect.Int16:
+			e.int16(int16(v.Int()))
+		case reflect.Int32:
+			e.int32(int32(v.Int()))
+		case reflect.Int64:
+			e.int64(v.Int())
+		}
+
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		switch v.Type().Kind() {
+		case reflect.Uint8:
+			e.uint8(uint8(v.Uint()))
+		case reflect.Uint16:
+			e.uint16(uint16(v.Uint()))
+		case reflect.Uint32:
+			e.uint32(uint32(v.Uint()))
+		case reflect.Uint64:
+			e.uint64(v.Uint())
+		}
+
+	case reflect.Float32, reflect.Float64:
+		switch v.Type().Kind() {
+		case reflect.Float32:
+			e.uint32(math.Float32bits(float32(v.Float())))
+		case reflect.Float64:
+			e.uint64(math.Float64bits(v.Float()))
+		}
+
+	case reflect.Complex64, reflect.Complex128:
+		switch v.Type().Kind() {
+		case reflect.Complex64:
+			x := v.Complex()
+			e.uint32(math.Float32bits(float32(real(x))))
+			e.uint32(math.Float32bits(float32(imag(x))))
+		case reflect.Complex128:
+			x := v.Complex()
+			e.uint64(math.Float64bits(real(x)))
+			e.uint64(math.Float64bits(imag(x)))
+		}
+	}
+}
+
+func (d *decoder) skip(v reflect.Value) {
+	d.buf = d.buf[dataSize(v):]
+}
+
+func (e *encoder) skip(v reflect.Value) {
+	n := dataSize(v)
+	for i := range e.buf[0:n] {
+		e.buf[i] = 0
+	}
+	e.buf = e.buf[n:]
+}
+
+// intDataSize returns the size of the data required to represent the data when encoded.
+// It returns zero if the type cannot be implemented by the fast path in Read or Write.
+func intDataSize(data interface{}) int {
+	switch data := data.(type) {
+	case int8, *int8, *uint8:
+		return 1
+	case []int8:
+		return len(data)
+	case []uint8:
+		return len(data)
+	case int16, *int16, *uint16:
+		return 2
+	case []int16:
+		return 2 * len(data)
+	case []uint16:
+		return 2 * len(data)
+	case int32, *int32, *uint32:
+		return 4
+	case []int32:
+		return 4 * len(data)
+	case []uint32:
+		return 4 * len(data)
+	case int64, *int64, *uint64:
+		return 8
+	case []int64:
+		return 8 * len(data)
+	case []uint64:
+		return 8 * len(data)
+	}
+	return 0
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common.go
new file mode 100644
index 0000000000..d9dce5cac3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common.go
@@ -0,0 +1,279 @@
+package common
+
+//
+// gopsutil is a port of psutil(http://pythonhosted.org/psutil/).
+// This covers these architectures.
+//  - linux (amd64, arm)
+//  - freebsd (amd64)
+//  - windows (amd64)
+import (
+	"bufio"
+	"errors"
+	"io/ioutil"
+	"net/url"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"reflect"
+	"runtime"
+	"strconv"
+	"strings"
+)
+
+type Invoker interface {
+	Command(string, ...string) ([]byte, error)
+}
+
+type Invoke struct{}
+
+func (i Invoke) Command(name string, arg ...string) ([]byte, error) {
+	return exec.Command(name, arg...).Output()
+}
+
+type FakeInvoke struct {
+	CommandExpectedDir string // CommandExpectedDir specifies dir which includes expected outputs.
+	Suffix             string // Suffix species expected file name suffix such as "fail"
+	Error              error  // If Error specfied, return the error.
+}
+
+// Command in FakeInvoke returns from expected file if exists.
+func (i FakeInvoke) Command(name string, arg ...string) ([]byte, error) {
+	if i.Error != nil {
+		return []byte{}, i.Error
+	}
+
+	arch := runtime.GOOS
+
+	fname := strings.Join(append([]string{name}, arg...), "")
+	fname = url.QueryEscape(fname)
+	var dir string
+	if i.CommandExpectedDir == "" {
+		dir = "expected"
+	} else {
+		dir = i.CommandExpectedDir
+	}
+	fpath := path.Join(dir, arch, fname)
+	if i.Suffix != "" {
+		fpath += "_" + i.Suffix
+	}
+	if PathExists(fpath) {
+		return ioutil.ReadFile(fpath)
+	}
+	return exec.Command(name, arg...).Output()
+}
+
+var ErrNotImplementedError = errors.New("not implemented yet")
+
+// ReadLines reads contents from a file and splits them by new lines.
+// A convenience wrapper to ReadLinesOffsetN(filename, 0, -1).
+func ReadLines(filename string) ([]string, error) {
+	return ReadLinesOffsetN(filename, 0, -1)
+}
+
+// ReadLines reads contents from file and splits them by new line.
+// The offset tells at which line number to start.
+// The count determines the number of lines to read (starting from offset):
+//   n >= 0: at most n lines
+//   n < 0: whole file
+func ReadLinesOffsetN(filename string, offset uint, n int) ([]string, error) {
+	f, err := os.Open(filename)
+	if err != nil {
+		return []string{""}, err
+	}
+	defer f.Close()
+
+	var ret []string
+
+	r := bufio.NewReader(f)
+	for i := 0; i < n+int(offset) || n < 0; i++ {
+		line, err := r.ReadString('\n')
+		if err != nil {
+			break
+		}
+		if i < int(offset) {
+			continue
+		}
+		ret = append(ret, strings.Trim(line, "\n"))
+	}
+
+	return ret, nil
+}
+
+func IntToString(orig []int8) string {
+	ret := make([]byte, len(orig))
+	size := -1
+	for i, o := range orig {
+		if o == 0 {
+			size = i
+			break
+		}
+		ret[i] = byte(o)
+	}
+	if size == -1 {
+		size = len(orig)
+	}
+
+	return string(ret[0:size])
+}
+
+func ByteToString(orig []byte) string {
+	n := -1
+	l := -1
+	for i, b := range orig {
+		// skip left side null
+		if l == -1 && b == 0 {
+			continue
+		}
+		if l == -1 {
+			l = i
+		}
+
+		if b == 0 {
+			break
+		}
+		n = i + 1
+	}
+	if n == -1 {
+		return string(orig)
+	}
+	return string(orig[l:n])
+}
+
+// ReadInts reads contents from single line file and returns them as []int32.
+func ReadInts(filename string) ([]int64, error) {
+	f, err := os.Open(filename)
+	if err != nil {
+		return []int64{}, err
+	}
+	defer f.Close()
+
+	var ret []int64
+
+	r := bufio.NewReader(f)
+
+	// The int files that this is concerned with should only be one liners.
+	line, err := r.ReadString('\n')
+	if err != nil {
+		return []int64{}, err
+	}
+
+	i, err := strconv.ParseInt(strings.Trim(line, "\n"), 10, 32)
+	if err != nil {
+		return []int64{}, err
+	}
+	ret = append(ret, i)
+
+	return ret, nil
+}
+
+// Parse to int32 without error
+func mustParseInt32(val string) int32 {
+	vv, _ := strconv.ParseInt(val, 10, 32)
+	return int32(vv)
+}
+
+// Parse to uint64 without error
+func mustParseUint64(val string) uint64 {
+	vv, _ := strconv.ParseInt(val, 10, 64)
+	return uint64(vv)
+}
+
+// Parse to Float64 without error
+func mustParseFloat64(val string) float64 {
+	vv, _ := strconv.ParseFloat(val, 64)
+	return vv
+}
+
+// StringsHas checks the target string slice contains src or not
+func StringsHas(target []string, src string) bool {
+	for _, t := range target {
+		if strings.TrimSpace(t) == src {
+			return true
+		}
+	}
+	return false
+}
+
+// StringsContains checks the src in any string of the target string slice
+func StringsContains(target []string, src string) bool {
+	for _, t := range target {
+		if strings.Contains(t, src) {
+			return true
+		}
+	}
+	return false
+}
+
+// IntContains checks the src in any int of the target int slice.
+func IntContains(target []int, src int) bool {
+	for _, t := range target {
+		if src == t {
+			return true
+		}
+	}
+	return false
+}
+
+// get struct attributes.
+// This method is used only for debugging platform dependent code.
+func attributes(m interface{}) map[string]reflect.Type {
+	typ := reflect.TypeOf(m)
+	if typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+	}
+
+	attrs := make(map[string]reflect.Type)
+	if typ.Kind() != reflect.Struct {
+		return nil
+	}
+
+	for i := 0; i < typ.NumField(); i++ {
+		p := typ.Field(i)
+		if !p.Anonymous {
+			attrs[p.Name] = p.Type
+		}
+	}
+
+	return attrs
+}
+
+func PathExists(filename string) bool {
+	if _, err := os.Stat(filename); err == nil {
+		return true
+	}
+	return false
+}
+
+//GetEnv retrieves the environment variable key. If it does not exist it returns the default.
+func GetEnv(key string, dfault string, combineWith ...string) string {
+	value := os.Getenv(key)
+	if value == "" {
+		value = dfault
+	}
+
+	switch len(combineWith) {
+	case 0:
+		return value
+	case 1:
+		return filepath.Join(value, combineWith[0])
+	default:
+		all := make([]string, len(combineWith)+1)
+		all[0] = value
+		copy(all[1:], combineWith)
+		return filepath.Join(all...)
+	}
+	panic("invalid switch case")
+}
+
+func HostProc(combineWith ...string) string {
+	return GetEnv("HOST_PROC", "/proc", combineWith...)
+}
+
+func HostSys(combineWith ...string) string {
+	return GetEnv("HOST_SYS", "/sys", combineWith...)
+}
+
+func HostEtc(combineWith ...string) string {
+	return GetEnv("HOST_ETC", "/etc", combineWith...)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_darwin.go
new file mode 100644
index 0000000000..2e1552aeee
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_darwin.go
@@ -0,0 +1,70 @@
+// +build darwin
+
+package common
+
+import (
+	"os"
+	"os/exec"
+	"strings"
+	"syscall"
+	"unsafe"
+)
+
+func DoSysctrl(mib string) ([]string, error) {
+	err := os.Setenv("LC_ALL", "C")
+	if err != nil {
+		return []string{}, err
+	}
+
+	sysctl, err := exec.LookPath("/usr/sbin/sysctl")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := exec.Command(sysctl, "-n", mib).Output()
+	if err != nil {
+		return []string{}, err
+	}
+	v := strings.Replace(string(out), "{ ", "", 1)
+	v = strings.Replace(string(v), " }", "", 1)
+	values := strings.Fields(string(v))
+
+	return values, nil
+}
+
+func CallSyscall(mib []int32) ([]byte, uint64, error) {
+	miblen := uint64(len(mib))
+
+	// get required buffer size
+	length := uint64(0)
+	_, _, err := syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(unsafe.Pointer(&mib[0])),
+		uintptr(miblen),
+		0,
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if err != 0 {
+		var b []byte
+		return b, length, err
+	}
+	if length == 0 {
+		var b []byte
+		return b, length, err
+	}
+	// get proc info itself
+	buf := make([]byte, length)
+	_, _, err = syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(unsafe.Pointer(&mib[0])),
+		uintptr(miblen),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if err != 0 {
+		return buf, length, err
+	}
+
+	return buf, length, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_freebsd.go
new file mode 100644
index 0000000000..dfdcebd8d7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_freebsd.go
@@ -0,0 +1,70 @@
+// +build freebsd
+
+package common
+
+import (
+	"os"
+	"os/exec"
+	"strings"
+	"syscall"
+	"unsafe"
+)
+
+func DoSysctrl(mib string) ([]string, error) {
+	err := os.Setenv("LC_ALL", "C")
+	if err != nil {
+		return []string{}, err
+	}
+	sysctl, err := exec.LookPath("/sbin/sysctl")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := exec.Command(sysctl, "-n", mib).Output()
+	if err != nil {
+		return []string{}, err
+	}
+	v := strings.Replace(string(out), "{ ", "", 1)
+	v = strings.Replace(string(v), " }", "", 1)
+	values := strings.Fields(string(v))
+
+	return values, nil
+}
+
+func CallSyscall(mib []int32) ([]byte, uint64, error) {
+	mibptr := unsafe.Pointer(&mib[0])
+	miblen := uint64(len(mib))
+
+	// get required buffer size
+	length := uint64(0)
+	_, _, err := syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(mibptr),
+		uintptr(miblen),
+		0,
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if err != 0 {
+		var b []byte
+		return b, length, err
+	}
+	if length == 0 {
+		var b []byte
+		return b, length, err
+	}
+	// get proc info itself
+	buf := make([]byte, length)
+	_, _, err = syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(mibptr),
+		uintptr(miblen),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if err != 0 {
+		return buf, length, err
+	}
+
+	return buf, length, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_linux.go
new file mode 100644
index 0000000000..0a122e9d6a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_linux.go
@@ -0,0 +1,3 @@
+// +build linux
+
+package common
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_unix.go
new file mode 100644
index 0000000000..6622eecc2e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_unix.go
@@ -0,0 +1,66 @@
+// +build linux freebsd darwin
+
+package common
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+)
+
+func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
+	var cmd []string
+	if pid == 0 { // will get from all processes.
+		cmd = []string{"-a", "-n", "-P"}
+	} else {
+		cmd = []string{"-a", "-n", "-P", "-p", strconv.Itoa(int(pid))}
+	}
+	cmd = append(cmd, args...)
+	lsof, err := exec.LookPath("lsof")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := invoke.Command(lsof, cmd...)
+	if err != nil {
+		// if no pid found, lsof returnes code 1.
+		if err.Error() == "exit status 1" && len(out) == 0 {
+			return []string{}, nil
+		}
+	}
+	lines := strings.Split(string(out), "\n")
+
+	var ret []string
+	for _, l := range lines[1:] {
+		if len(l) == 0 {
+			continue
+		}
+		ret = append(ret, l)
+	}
+	return ret, nil
+}
+
+func CallPgrep(invoke Invoker, pid int32) ([]int32, error) {
+	var cmd []string
+	cmd = []string{"-P", strconv.Itoa(int(pid))}
+	pgrep, err := exec.LookPath("pgrep")
+	if err != nil {
+		return []int32{}, err
+	}
+	out, err := invoke.Command(pgrep, cmd...)
+	if err != nil {
+		return []int32{}, err
+	}
+	lines := strings.Split(string(out), "\n")
+	ret := make([]int32, 0, len(lines))
+	for _, l := range lines {
+		if len(l) == 0 {
+			continue
+		}
+		i, err := strconv.Atoi(l)
+		if err != nil {
+			continue
+		}
+		ret = append(ret, int32(i))
+	}
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_windows.go
new file mode 100644
index 0000000000..d727378cbe
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_windows.go
@@ -0,0 +1,110 @@
+// +build windows
+
+package common
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// for double values
+type PDH_FMT_COUNTERVALUE_DOUBLE struct {
+	CStatus     uint32
+	DoubleValue float64
+}
+
+// for 64 bit integer values
+type PDH_FMT_COUNTERVALUE_LARGE struct {
+	CStatus    uint32
+	LargeValue int64
+}
+
+// for long values
+type PDH_FMT_COUNTERVALUE_LONG struct {
+	CStatus   uint32
+	LongValue int32
+	padding   [4]byte
+}
+
+// windows system const
+const (
+	ERROR_SUCCESS        = 0
+	ERROR_FILE_NOT_FOUND = 2
+	DRIVE_REMOVABLE      = 2
+	DRIVE_FIXED          = 3
+	HKEY_LOCAL_MACHINE   = 0x80000002
+	RRF_RT_REG_SZ        = 0x00000002
+	RRF_RT_REG_DWORD     = 0x00000010
+	PDH_FMT_LONG         = 0x00000100
+	PDH_FMT_DOUBLE       = 0x00000200
+	PDH_FMT_LARGE        = 0x00000400
+	PDH_INVALID_DATA     = 0xc0000bc6
+	PDH_INVALID_HANDLE   = 0xC0000bbc
+	PDH_NO_DATA          = 0x800007d5
+)
+
+var (
+	Modkernel32 = syscall.NewLazyDLL("kernel32.dll")
+	ModNt       = syscall.NewLazyDLL("ntdll.dll")
+	ModPdh      = syscall.NewLazyDLL("pdh.dll")
+
+	ProcGetSystemTimes           = Modkernel32.NewProc("GetSystemTimes")
+	ProcNtQuerySystemInformation = ModNt.NewProc("NtQuerySystemInformation")
+	PdhOpenQuery                 = ModPdh.NewProc("PdhOpenQuery")
+	PdhAddCounter                = ModPdh.NewProc("PdhAddCounterW")
+	PdhCollectQueryData          = ModPdh.NewProc("PdhCollectQueryData")
+	PdhGetFormattedCounterValue  = ModPdh.NewProc("PdhGetFormattedCounterValue")
+	PdhCloseQuery                = ModPdh.NewProc("PdhCloseQuery")
+)
+
+type FILETIME struct {
+	DwLowDateTime  uint32
+	DwHighDateTime uint32
+}
+
+// borrowed from net/interface_windows.go
+func BytePtrToString(p *uint8) string {
+	a := (*[10000]uint8)(unsafe.Pointer(p))
+	i := 0
+	for a[i] != 0 {
+		i++
+	}
+	return string(a[:i])
+}
+
+// CounterInfo
+// copied from https://github.com/mackerelio/mackerel-agent/
+type CounterInfo struct {
+	PostName    string
+	CounterName string
+	Counter     syscall.Handle
+}
+
+// CreateQuery XXX
+// copied from https://github.com/mackerelio/mackerel-agent/
+func CreateQuery() (syscall.Handle, error) {
+	var query syscall.Handle
+	r, _, err := PdhOpenQuery.Call(0, 0, uintptr(unsafe.Pointer(&query)))
+	if r != 0 {
+		return 0, err
+	}
+	return query, nil
+}
+
+// CreateCounter XXX
+func CreateCounter(query syscall.Handle, pname, cname string) (*CounterInfo, error) {
+	var counter syscall.Handle
+	r, _, err := PdhAddCounter.Call(
+		uintptr(query),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(cname))),
+		0,
+		uintptr(unsafe.Pointer(&counter)))
+	if r != 0 {
+		return nil, err
+	}
+	return &CounterInfo{
+		PostName:    pname,
+		CounterName: cname,
+		Counter:     counter,
+	}, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go
new file mode 100644
index 0000000000..5f122d11b1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go
@@ -0,0 +1,64 @@
+package mem
+
+import (
+	"encoding/json"
+)
+
+// Memory usage statistics. Total, Available and Used contain numbers of bytes
+// for human consumption.
+//
+// The other fields in this struct contain kernel specific values.
+type VirtualMemoryStat struct {
+	// Total amount of RAM on this system
+	Total uint64 `json:"total"`
+
+	// RAM available for programs to allocate
+	//
+	// This value is computed from the kernel specific values.
+	Available uint64 `json:"available"`
+
+	// RAM used by programs
+	//
+	// This value is computed from the kernel specific values.
+	Used uint64 `json:"used"`
+
+	// Percentage of RAM used by programs
+	//
+	// This value is computed from the kernel specific values.
+	UsedPercent float64 `json:"usedPercent"`
+
+	// This is the kernel's notion of free memory; RAM chips whose bits nobody
+	// cares about the value of right now. For a human consumable number,
+	// Available is what you really want.
+	Free uint64 `json:"free"`
+
+	// OS X / BSD specific numbers:
+	// http://www.macyourself.com/2010/02/17/what-is-free-wired-active-and-inactive-system-memory-ram/
+	Active   uint64 `json:"active"`
+	Inactive uint64 `json:"inactive"`
+	Wired    uint64 `json:"wired"`
+
+	// Linux specific numbers
+	// https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s2-proc-meminfo.html
+	Buffers uint64 `json:"buffers"`
+	Cached  uint64 `json:"cached"`
+}
+
+type SwapMemoryStat struct {
+	Total       uint64  `json:"total"`
+	Used        uint64  `json:"used"`
+	Free        uint64  `json:"free"`
+	UsedPercent float64 `json:"usedPercent"`
+	Sin         uint64  `json:"sin"`
+	Sout        uint64  `json:"sout"`
+}
+
+func (m VirtualMemoryStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
+
+func (m SwapMemoryStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go
new file mode 100644
index 0000000000..922b05cb4f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go
@@ -0,0 +1,69 @@
+// +build darwin
+
+package mem
+
+import (
+	"encoding/binary"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func getHwMemsize() (uint64, error) {
+	totalString, err := syscall.Sysctl("hw.memsize")
+	if err != nil {
+		return 0, err
+	}
+
+	// syscall.sysctl() helpfully assumes the result is a null-terminated string and
+	// removes the last byte of the result if it's 0 :/
+	totalString += "\x00"
+
+	total := uint64(binary.LittleEndian.Uint64([]byte(totalString)))
+
+	return total, nil
+}
+
+// SwapMemory returns swapinfo.
+func SwapMemory() (*SwapMemoryStat, error) {
+	var ret *SwapMemoryStat
+
+	swapUsage, err := common.DoSysctrl("vm.swapusage")
+	if err != nil {
+		return ret, err
+	}
+
+	total := strings.Replace(swapUsage[2], "M", "", 1)
+	used := strings.Replace(swapUsage[5], "M", "", 1)
+	free := strings.Replace(swapUsage[8], "M", "", 1)
+
+	total_v, err := strconv.ParseFloat(total, 64)
+	if err != nil {
+		return nil, err
+	}
+	used_v, err := strconv.ParseFloat(used, 64)
+	if err != nil {
+		return nil, err
+	}
+	free_v, err := strconv.ParseFloat(free, 64)
+	if err != nil {
+		return nil, err
+	}
+
+	u := float64(0)
+	if total_v != 0 {
+		u = ((total_v - free_v) / total_v) * 100.0
+	}
+
+	// vm.swapusage shows "M", multiply 1000
+	ret = &SwapMemoryStat{
+		Total:       uint64(total_v * 1000),
+		Used:        uint64(used_v * 1000),
+		Free:        uint64(free_v * 1000),
+		UsedPercent: u,
+	}
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go
new file mode 100644
index 0000000000..461631976e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go
@@ -0,0 +1,53 @@
+// +build darwin
+// +build cgo
+
+package mem
+
+/*
+#include <mach/mach_host.h>
+*/
+import "C"
+
+import (
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+// VirtualMemory returns VirtualmemoryStat.
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	count := C.mach_msg_type_number_t(C.HOST_VM_INFO_COUNT)
+	var vmstat C.vm_statistics_data_t
+
+	status := C.host_statistics(C.host_t(C.mach_host_self()),
+		C.HOST_VM_INFO,
+		C.host_info_t(unsafe.Pointer(&vmstat)),
+		&count)
+
+	if status != C.KERN_SUCCESS {
+		return nil, fmt.Errorf("host_statistics error=%d", status)
+	}
+
+	pageSize := uint64(syscall.Getpagesize())
+	total, err := getHwMemsize()
+	if err != nil {
+		return nil, err
+	}
+	totalCount := C.natural_t(total / pageSize)
+
+	availableCount := vmstat.inactive_count + vmstat.free_count
+	usedPercent := 100 * float64(totalCount-availableCount) / float64(totalCount)
+
+	usedCount := totalCount - availableCount
+
+	return &VirtualMemoryStat{
+		Total:       total,
+		Available:   pageSize * uint64(availableCount),
+		Used:        pageSize * uint64(usedCount),
+		UsedPercent: usedPercent,
+		Free:        pageSize * uint64(vmstat.free_count),
+		Active:      pageSize * uint64(vmstat.active_count),
+		Inactive:    pageSize * uint64(vmstat.inactive_count),
+		Wired:       pageSize * uint64(vmstat.wire_count),
+	}, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
new file mode 100644
index 0000000000..7094802d9a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
@@ -0,0 +1,88 @@
+// +build darwin
+// +build !cgo
+
+package mem
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+	"syscall"
+)
+
+// Runs vm_stat and returns Free and inactive pages
+func getVMStat(vms *VirtualMemoryStat) error {
+	vm_stat, err := exec.LookPath("vm_stat")
+	if err != nil {
+		return err
+	}
+	out, err := exec.Command(vm_stat).Output()
+	if err != nil {
+		return err
+	}
+	return parseVMStat(string(out), vms)
+}
+
+func parseVMStat(out string, vms *VirtualMemoryStat) error {
+	var err error
+
+	lines := strings.Split(out, "\n")
+	pagesize := uint64(syscall.Getpagesize())
+	for _, line := range lines {
+		fields := strings.Split(line, ":")
+		if len(fields) < 2 {
+			continue
+		}
+		key := strings.TrimSpace(fields[0])
+		value := strings.Trim(fields[1], " .")
+		switch key {
+		case "Pages free":
+			free, e := strconv.ParseUint(value, 10, 64)
+			if e != nil {
+				err = e
+			}
+			vms.Free = free * pagesize
+		case "Pages inactive":
+			inactive, e := strconv.ParseUint(value, 10, 64)
+			if e != nil {
+				err = e
+			}
+			vms.Inactive = inactive * pagesize
+		case "Pages active":
+			active, e := strconv.ParseUint(value, 10, 64)
+			if e != nil {
+				err = e
+			}
+			vms.Active = active * pagesize
+		case "Pages wired down":
+			wired, e := strconv.ParseUint(value, 10, 64)
+			if e != nil {
+				err = e
+			}
+			vms.Wired = wired * pagesize
+		}
+	}
+	return err
+}
+
+// VirtualMemory returns VirtualmemoryStat.
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	ret := &VirtualMemoryStat{}
+
+	total, err := getHwMemsize()
+	if err != nil {
+		return nil, err
+	}
+	err = getVMStat(ret)
+	if err != nil {
+		return nil, err
+	}
+
+	ret.Available = ret.Free + ret.Inactive
+	ret.Total = total
+
+	ret.Used = ret.Total - ret.Available
+	ret.UsedPercent = 100 * float64(ret.Used) / float64(ret.Total)
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go
new file mode 100644
index 0000000000..7194057674
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go
@@ -0,0 +1,134 @@
+// +build freebsd
+
+package mem
+
+import (
+	"errors"
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	pageSize, err := common.DoSysctrl("vm.stats.vm.v_page_size")
+	if err != nil {
+		return nil, err
+	}
+	p, err := strconv.ParseUint(pageSize[0], 10, 64)
+	if err != nil {
+		return nil, err
+	}
+
+	pageCount, err := common.DoSysctrl("vm.stats.vm.v_page_count")
+	if err != nil {
+		return nil, err
+	}
+	free, err := common.DoSysctrl("vm.stats.vm.v_free_count")
+	if err != nil {
+		return nil, err
+	}
+	active, err := common.DoSysctrl("vm.stats.vm.v_active_count")
+	if err != nil {
+		return nil, err
+	}
+	inactive, err := common.DoSysctrl("vm.stats.vm.v_inactive_count")
+	if err != nil {
+		return nil, err
+	}
+	cache, err := common.DoSysctrl("vm.stats.vm.v_cache_count")
+	if err != nil {
+		return nil, err
+	}
+	buffer, err := common.DoSysctrl("vfs.bufspace")
+	if err != nil {
+		return nil, err
+	}
+	wired, err := common.DoSysctrl("vm.stats.vm.v_wire_count")
+	if err != nil {
+		return nil, err
+	}
+
+	parsed := make([]uint64, 0, 7)
+	vv := []string{
+		pageCount[0],
+		free[0],
+		active[0],
+		inactive[0],
+		cache[0],
+		buffer[0],
+		wired[0],
+	}
+	for _, target := range vv {
+		t, err := strconv.ParseUint(target, 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		parsed = append(parsed, t)
+	}
+
+	ret := &VirtualMemoryStat{
+		Total:    parsed[0] * p,
+		Free:     parsed[1] * p,
+		Active:   parsed[2] * p,
+		Inactive: parsed[3] * p,
+		Cached:   parsed[4] * p,
+		Buffers:  parsed[5],
+		Wired:    parsed[6] * p,
+	}
+
+	ret.Available = ret.Inactive + ret.Cached + ret.Free
+	ret.Used = ret.Total - ret.Available
+	ret.UsedPercent = float64(ret.Used) / float64(ret.Total) * 100.0
+
+	return ret, nil
+}
+
+// Return swapinfo
+// FreeBSD can have multiple swap devices. but use only first device
+func SwapMemory() (*SwapMemoryStat, error) {
+	swapinfo, err := exec.LookPath("swapinfo")
+	if err != nil {
+		return nil, err
+	}
+
+	out, err := exec.Command(swapinfo).Output()
+	if err != nil {
+		return nil, err
+	}
+	for _, line := range strings.Split(string(out), "\n") {
+		values := strings.Fields(line)
+		// skip title line
+		if len(values) == 0 || values[0] == "Device" {
+			continue
+		}
+
+		u := strings.Replace(values[4], "%", "", 1)
+		total_v, err := strconv.ParseUint(values[1], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		used_v, err := strconv.ParseUint(values[2], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		free_v, err := strconv.ParseUint(values[3], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		up_v, err := strconv.ParseFloat(u, 64)
+		if err != nil {
+			return nil, err
+		}
+
+		return &SwapMemoryStat{
+			Total:       total_v,
+			Used:        used_v,
+			Free:        free_v,
+			UsedPercent: up_v,
+		}, nil
+	}
+
+	return nil, errors.New("no swap devices found")
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go
new file mode 100644
index 0000000000..899da83dff
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go
@@ -0,0 +1,100 @@
+// +build linux
+
+package mem
+
+import (
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	filename := common.HostProc("meminfo")
+	lines, _ := common.ReadLines(filename)
+	// flag if MemAvailable is in /proc/meminfo (kernel 3.14+)
+	memavail := false
+
+	ret := &VirtualMemoryStat{}
+	for _, line := range lines {
+		fields := strings.Split(line, ":")
+		if len(fields) != 2 {
+			continue
+		}
+		key := strings.TrimSpace(fields[0])
+		value := strings.TrimSpace(fields[1])
+		value = strings.Replace(value, " kB", "", -1)
+
+		t, err := strconv.ParseUint(value, 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		switch key {
+		case "MemTotal":
+			ret.Total = t * 1024
+		case "MemFree":
+			ret.Free = t * 1024
+		case "MemAvailable":
+			memavail = true
+			ret.Available = t * 1024
+		case "Buffers":
+			ret.Buffers = t * 1024
+		case "Cached":
+			ret.Cached = t * 1024
+		case "Active":
+			ret.Active = t * 1024
+		case "Inactive":
+			ret.Inactive = t * 1024
+		}
+	}
+	if !memavail {
+		ret.Available = ret.Free + ret.Buffers + ret.Cached
+	}
+	ret.Used = ret.Total - ret.Available
+	ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0
+
+	return ret, nil
+}
+
+func SwapMemory() (*SwapMemoryStat, error) {
+	sysinfo := &syscall.Sysinfo_t{}
+
+	if err := syscall.Sysinfo(sysinfo); err != nil {
+		return nil, err
+	}
+	ret := &SwapMemoryStat{
+		Total: uint64(sysinfo.Totalswap),
+		Free:  uint64(sysinfo.Freeswap),
+	}
+	ret.Used = ret.Total - ret.Free
+	//check Infinity
+	if ret.Total != 0 {
+		ret.UsedPercent = float64(ret.Total-ret.Free) / float64(ret.Total) * 100.0
+	} else {
+		ret.UsedPercent = 0
+	}
+	filename := common.HostProc("vmstat")
+	lines, _ := common.ReadLines(filename)
+	for _, l := range lines {
+		fields := strings.Fields(l)
+		if len(fields) < 2 {
+			continue
+		}
+		switch fields[0] {
+		case "pswpin":
+			value, err := strconv.ParseUint(fields[1], 10, 64)
+			if err != nil {
+				continue
+			}
+			ret.Sin = value * 4 * 1024
+		case "pswpout":
+			value, err := strconv.ParseUint(fields[1], 10, 64)
+			if err != nil {
+				continue
+			}
+			ret.Sout = value * 4 * 1024
+		}
+	}
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go
new file mode 100644
index 0000000000..045af49e39
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go
@@ -0,0 +1,50 @@
+// +build windows
+
+package mem
+
+import (
+	"syscall"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var (
+	procGlobalMemoryStatusEx = common.Modkernel32.NewProc("GlobalMemoryStatusEx")
+)
+
+type memoryStatusEx struct {
+	cbSize                  uint32
+	dwMemoryLoad            uint32
+	ullTotalPhys            uint64 // in bytes
+	ullAvailPhys            uint64
+	ullTotalPageFile        uint64
+	ullAvailPageFile        uint64
+	ullTotalVirtual         uint64
+	ullAvailVirtual         uint64
+	ullAvailExtendedVirtual uint64
+}
+
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	var memInfo memoryStatusEx
+	memInfo.cbSize = uint32(unsafe.Sizeof(memInfo))
+	mem, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(&memInfo)))
+	if mem == 0 {
+		return nil, syscall.GetLastError()
+	}
+
+	ret := &VirtualMemoryStat{
+		Total:       memInfo.ullTotalPhys,
+		Available:   memInfo.ullAvailPhys,
+		UsedPercent: float64(memInfo.dwMemoryLoad),
+	}
+
+	ret.Used = ret.Total - ret.Available
+	return ret, nil
+}
+
+func SwapMemory() (*SwapMemoryStat, error) {
+	ret := &SwapMemoryStat{}
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go
new file mode 100644
index 0000000000..60f1069c85
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go
@@ -0,0 +1,243 @@
+package net
+
+import (
+	"encoding/json"
+	"fmt"
+	"net"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var invoke common.Invoker
+
+func init() {
+	invoke = common.Invoke{}
+}
+
+type IOCountersStat struct {
+	Name        string `json:"name"`         // interface name
+	BytesSent   uint64 `json:"bytesSent"`   // number of bytes sent
+	BytesRecv   uint64 `json:"bytesRecv"`   // number of bytes received
+	PacketsSent uint64 `json:"packetsSent"` // number of packets sent
+	PacketsRecv uint64 `json:"packetsRecv"` // number of packets received
+	Errin       uint64 `json:"errin"`        // total number of errors while receiving
+	Errout      uint64 `json:"errout"`       // total number of errors while sending
+	Dropin      uint64 `json:"dropin"`       // total number of incoming packets which were dropped
+	Dropout     uint64 `json:"dropout"`      // total number of outgoing packets which were dropped (always 0 on OSX and BSD)
+}
+
+// Addr is implemented compatibility to psutil
+type Addr struct {
+	IP   string `json:"ip"`
+	Port uint32 `json:"port"`
+}
+
+type ConnectionStat struct {
+	Fd     uint32 `json:"fd"`
+	Family uint32 `json:"family"`
+	Type   uint32 `json:"type"`
+	Laddr  Addr   `json:"localaddr"`
+	Raddr  Addr   `json:"remoteaddr"`
+	Status string `json:"status"`
+	Pid    int32  `json:"pid"`
+}
+
+// System wide stats about different network protocols
+type ProtoCountersStat struct {
+	Protocol string           `json:"protocol"`
+	Stats    map[string]int64 `json:"stats"`
+}
+
+// NetInterfaceAddr is designed for represent interface addresses
+type InterfaceAddr struct {
+	Addr string `json:"addr"`
+}
+
+type InterfaceStat struct {
+	MTU          int             `json:"mtu"`          // maximum transmission unit
+	Name         string          `json:"name"`         // e.g., "en0", "lo0", "eth0.100"
+	HardwareAddr string          `json:"hardwareaddr"` // IEEE MAC-48, EUI-48 and EUI-64 form
+	Flags        []string        `json:"flags"`        // e.g., FlagUp, FlagLoopback, FlagMulticast
+	Addrs        []InterfaceAddr `json:"addrs"`
+}
+
+type FilterStat struct {
+	ConnTrackCount int64 `json:"conntrackCount"`
+	ConnTrackMax   int64 `json:"conntrackMax"`
+}
+
+var constMap = map[string]int{
+	"TCP":  syscall.SOCK_STREAM,
+	"UDP":  syscall.SOCK_DGRAM,
+	"IPv4": syscall.AF_INET,
+	"IPv6": syscall.AF_INET6,
+}
+
+func (n IOCountersStat) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func (n ConnectionStat) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func (n ProtoCountersStat) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func (a Addr) String() string {
+	s, _ := json.Marshal(a)
+	return string(s)
+}
+
+func (n InterfaceStat) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func (n InterfaceAddr) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func Interfaces() ([]InterfaceStat, error) {
+	is, err := net.Interfaces()
+	if err != nil {
+		return nil, err
+	}
+	ret := make([]InterfaceStat, 0, len(is))
+	for _, ifi := range is {
+
+		var flags []string
+		if ifi.Flags&net.FlagUp != 0 {
+			flags = append(flags, "up")
+		}
+		if ifi.Flags&net.FlagBroadcast != 0 {
+			flags = append(flags, "broadcast")
+		}
+		if ifi.Flags&net.FlagLoopback != 0 {
+			flags = append(flags, "loopback")
+		}
+		if ifi.Flags&net.FlagPointToPoint != 0 {
+			flags = append(flags, "pointtopoint")
+		}
+		if ifi.Flags&net.FlagMulticast != 0 {
+			flags = append(flags, "multicast")
+		}
+
+		r := InterfaceStat{
+			Name:         ifi.Name,
+			MTU:          ifi.MTU,
+			HardwareAddr: ifi.HardwareAddr.String(),
+			Flags:        flags,
+		}
+		addrs, err := ifi.Addrs()
+		if err == nil {
+			r.Addrs = make([]InterfaceAddr, 0, len(addrs))
+			for _, addr := range addrs {
+				r.Addrs = append(r.Addrs, InterfaceAddr{
+					Addr: addr.String(),
+				})
+			}
+
+		}
+		ret = append(ret, r)
+	}
+
+	return ret, nil
+}
+
+func getIOCountersAll(n []IOCountersStat) ([]IOCountersStat, error) {
+	r := IOCountersStat{
+		Name: "all",
+	}
+	for _, nic := range n {
+		r.BytesRecv += nic.BytesRecv
+		r.PacketsRecv += nic.PacketsRecv
+		r.Errin += nic.Errin
+		r.Dropin += nic.Dropin
+		r.BytesSent += nic.BytesSent
+		r.PacketsSent += nic.PacketsSent
+		r.Errout += nic.Errout
+		r.Dropout += nic.Dropout
+	}
+
+	return []IOCountersStat{r}, nil
+}
+
+func parseNetLine(line string) (ConnectionStat, error) {
+	f := strings.Fields(line)
+	if len(f) < 9 {
+		return ConnectionStat{}, fmt.Errorf("wrong line,%s", line)
+	}
+
+	pid, err := strconv.Atoi(f[1])
+	if err != nil {
+		return ConnectionStat{}, err
+	}
+	fd, err := strconv.Atoi(strings.Trim(f[3], "u"))
+	if err != nil {
+		return ConnectionStat{}, fmt.Errorf("unknown fd, %s", f[3])
+	}
+	netFamily, ok := constMap[f[4]]
+	if !ok {
+		return ConnectionStat{}, fmt.Errorf("unknown family, %s", f[4])
+	}
+	netType, ok := constMap[f[7]]
+	if !ok {
+		return ConnectionStat{}, fmt.Errorf("unknown type, %s", f[7])
+	}
+
+	laddr, raddr, err := parseNetAddr(f[8])
+	if err != nil {
+		return ConnectionStat{}, fmt.Errorf("failed to parse netaddr, %s", f[8])
+	}
+
+	n := ConnectionStat{
+		Fd:     uint32(fd),
+		Family: uint32(netFamily),
+		Type:   uint32(netType),
+		Laddr:  laddr,
+		Raddr:  raddr,
+		Pid:    int32(pid),
+	}
+	if len(f) == 10 {
+		n.Status = strings.Trim(f[9], "()")
+	}
+
+	return n, nil
+}
+
+func parseNetAddr(line string) (laddr Addr, raddr Addr, err error) {
+	parse := func(l string) (Addr, error) {
+		host, port, err := net.SplitHostPort(l)
+		if err != nil {
+			return Addr{}, fmt.Errorf("wrong addr, %s", l)
+		}
+		lport, err := strconv.Atoi(port)
+		if err != nil {
+			return Addr{}, err
+		}
+		return Addr{IP: host, Port: uint32(lport)}, nil
+	}
+
+	addrs := strings.Split(line, "->")
+	if len(addrs) == 0 {
+		return laddr, raddr, fmt.Errorf("wrong netaddr, %s", line)
+	}
+	laddr, err = parse(addrs[0])
+	if len(addrs) == 2 { // remote addr exists
+		raddr, err = parse(addrs[1])
+		if err != nil {
+			return laddr, raddr, err
+		}
+	}
+
+	return laddr, raddr, err
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go
new file mode 100644
index 0000000000..4fa358a38c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go
@@ -0,0 +1,114 @@
+// +build darwin
+
+package net
+
+import (
+	"errors"
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// example of netstat -idbn output on yosemite
+// Name  Mtu   Network       Address            Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
+// lo0   16384 <Link#1>                        869107     0  169411755   869107     0  169411755     0   0
+// lo0   16384 ::1/128     ::1                 869107     -  169411755   869107     -  169411755     -   -
+// lo0   16384 127           127.0.0.1         869107     -  169411755   869107     -  169411755     -   -
+func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	netstat, err := exec.LookPath("/usr/sbin/netstat")
+	if err != nil {
+		return nil, err
+	}
+	out, err := exec.Command(netstat, "-ibdnW").Output()
+	if err != nil {
+		return nil, err
+	}
+
+	lines := strings.Split(string(out), "\n")
+	ret := make([]IOCountersStat, 0, len(lines)-1)
+	exists := make([]string, 0, len(ret))
+
+	for _, line := range lines {
+		values := strings.Fields(line)
+		if len(values) < 1 || values[0] == "Name" {
+			// skip first line
+			continue
+		}
+		if common.StringsHas(exists, values[0]) {
+			// skip if already get
+			continue
+		}
+		exists = append(exists, values[0])
+
+		base := 1
+		// sometimes Address is ommitted
+		if len(values) < 11 {
+			base = 0
+		}
+
+		parsed := make([]uint64, 0, 7)
+		vv := []string{
+			values[base+3], // Ipkts == PacketsRecv
+			values[base+4], // Ierrs == Errin
+			values[base+5], // Ibytes == BytesRecv
+			values[base+6], // Opkts == PacketsSent
+			values[base+7], // Oerrs == Errout
+			values[base+8], // Obytes == BytesSent
+		}
+		if len(values) == 12 {
+			vv = append(vv, values[base+10])
+		}
+
+		for _, target := range vv {
+			if target == "-" {
+				parsed = append(parsed, 0)
+				continue
+			}
+
+			t, err := strconv.ParseUint(target, 10, 64)
+			if err != nil {
+				return nil, err
+			}
+			parsed = append(parsed, t)
+		}
+
+		n := IOCountersStat{
+			Name:        values[0],
+			PacketsRecv: parsed[0],
+			Errin:       parsed[1],
+			BytesRecv:   parsed[2],
+			PacketsSent: parsed[3],
+			Errout:      parsed[4],
+			BytesSent:   parsed[5],
+		}
+		if len(parsed) == 7 {
+			n.Dropout = parsed[6]
+		}
+		ret = append(ret, n)
+	}
+
+	if pernic == false {
+		return getIOCountersAll(ret)
+	}
+
+	return ret, nil
+}
+
+// NetIOCountersByFile is an method which is added just a compatibility for linux.
+func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
+	return IOCounters(pernic)
+}
+
+func FilterCounters() ([]FilterStat, error) {
+	return nil, errors.New("NetFilterCounters not implemented for darwin")
+}
+
+// NetProtoCounters returns network statistics for the entire system
+// If protocols is empty then all protocols are returned, otherwise
+// just the protocols in the list are returned.
+// Not Implemented for Darwin
+func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
+	return nil, errors.New("NetProtoCounters not implemented for darwin")
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go
new file mode 100644
index 0000000000..3a67b4af4a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go
@@ -0,0 +1,108 @@
+// +build freebsd
+
+package net
+
+import (
+	"errors"
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	netstat, err := exec.LookPath("/usr/bin/netstat")
+	if err != nil {
+		return nil, err
+	}
+	out, err := exec.Command(netstat, "-ibdnW").Output()
+	if err != nil {
+		return nil, err
+	}
+
+	lines := strings.Split(string(out), "\n")
+	ret := make([]IOCountersStat, 0, len(lines)-1)
+	exists := make([]string, 0, len(ret))
+
+	for _, line := range lines {
+		values := strings.Fields(line)
+		if len(values) < 1 || values[0] == "Name" {
+			continue
+		}
+		if common.StringsHas(exists, values[0]) {
+			// skip if already get
+			continue
+		}
+		exists = append(exists, values[0])
+
+		if len(values) < 12 {
+			continue
+		}
+		base := 1
+		// sometimes Address is ommitted
+		if len(values) < 13 {
+			base = 0
+		}
+
+		parsed := make([]uint64, 0, 8)
+		vv := []string{
+			values[base+3],  // PacketsRecv
+			values[base+4],  // Errin
+			values[base+5],  // Dropin
+			values[base+6],  // BytesRecvn
+			values[base+7],  // PacketSent
+			values[base+8],  // Errout
+			values[base+9],  // BytesSent
+			values[base+11], // Dropout
+		}
+		for _, target := range vv {
+			if target == "-" {
+				parsed = append(parsed, 0)
+				continue
+			}
+
+			t, err := strconv.ParseUint(target, 10, 64)
+			if err != nil {
+				return nil, err
+			}
+			parsed = append(parsed, t)
+		}
+
+		n := IOCountersStat{
+			Name:        values[0],
+			PacketsRecv: parsed[0],
+			Errin:       parsed[1],
+			Dropin:      parsed[2],
+			BytesRecv:   parsed[3],
+			PacketsSent: parsed[4],
+			Errout:      parsed[5],
+			BytesSent:   parsed[6],
+			Dropout:     parsed[7],
+		}
+		ret = append(ret, n)
+	}
+
+	if pernic == false {
+		return getIOCountersAll(ret)
+	}
+
+	return ret, nil
+}
+
+// NetIOCountersByFile is an method which is added just a compatibility for linux.
+func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
+	return IOCounters(pernic)
+}
+
+func FilterCounters() ([]FilterStat, error) {
+	return nil, errors.New("NetFilterCounters not implemented for freebsd")
+}
+
+// NetProtoCounters returns network statistics for the entire system
+// If protocols is empty then all protocols are returned, otherwise
+// just the protocols in the list are returned.
+// Not Implemented for FreeBSD
+func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
+	return nil, errors.New("NetProtoCounters not implemented for freebsd")
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go
new file mode 100644
index 0000000000..e0247714fe
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go
@@ -0,0 +1,620 @@
+// +build linux
+
+package net
+
+import (
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"os"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// NetIOCounters returnes network I/O statistics for every network
+// interface installed on the system.  If pernic argument is false,
+// return only sum of all information (which name is 'all'). If true,
+// every network interface installed on the system is returned
+// separately.
+func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	filename := common.HostProc("net/dev")
+	return IOCountersByFile(pernic, filename)
+}
+
+func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
+	lines, err := common.ReadLines(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	statlen := len(lines) - 1
+
+	ret := make([]IOCountersStat, 0, statlen)
+
+	for _, line := range lines[2:] {
+		parts := strings.SplitN(line, ":", 2)
+		if len(parts) != 2 {
+			continue
+		}
+		interfaceName := strings.TrimSpace(parts[0])
+		if interfaceName == "" {
+			continue
+		}
+
+		fields := strings.Fields(strings.TrimSpace(parts[1]))
+		bytesRecv, err := strconv.ParseUint(fields[0], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		packetsRecv, err := strconv.ParseUint(fields[1], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		errIn, err := strconv.ParseUint(fields[2], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		dropIn, err := strconv.ParseUint(fields[3], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		bytesSent, err := strconv.ParseUint(fields[8], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		packetsSent, err := strconv.ParseUint(fields[9], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		errOut, err := strconv.ParseUint(fields[10], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		dropOut, err := strconv.ParseUint(fields[13], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+
+		nic := IOCountersStat{
+			Name:        interfaceName,
+			BytesRecv:   bytesRecv,
+			PacketsRecv: packetsRecv,
+			Errin:       errIn,
+			Dropin:      dropIn,
+			BytesSent:   bytesSent,
+			PacketsSent: packetsSent,
+			Errout:      errOut,
+			Dropout:     dropOut,
+		}
+		ret = append(ret, nic)
+	}
+
+	if pernic == false {
+		return getIOCountersAll(ret)
+	}
+
+	return ret, nil
+}
+
+var netProtocols = []string{
+	"ip",
+	"icmp",
+	"icmpmsg",
+	"tcp",
+	"udp",
+	"udplite",
+}
+
+// NetProtoCounters returns network statistics for the entire system
+// If protocols is empty then all protocols are returned, otherwise
+// just the protocols in the list are returned.
+// Available protocols:
+//   ip,icmp,icmpmsg,tcp,udp,udplite
+func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
+	if len(protocols) == 0 {
+		protocols = netProtocols
+	}
+
+	stats := make([]ProtoCountersStat, 0, len(protocols))
+	protos := make(map[string]bool, len(protocols))
+	for _, p := range protocols {
+		protos[p] = true
+	}
+
+	filename := common.HostProc("net/snmp")
+	lines, err := common.ReadLines(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	linecount := len(lines)
+	for i := 0; i < linecount; i++ {
+		line := lines[i]
+		r := strings.IndexRune(line, ':')
+		if r == -1 {
+			return nil, errors.New(filename + " is not fomatted correctly, expected ':'.")
+		}
+		proto := strings.ToLower(line[:r])
+		if !protos[proto] {
+			// skip protocol and data line
+			i++
+			continue
+		}
+
+		// Read header line
+		statNames := strings.Split(line[r+2:], " ")
+
+		// Read data line
+		i++
+		statValues := strings.Split(lines[i][r+2:], " ")
+		if len(statNames) != len(statValues) {
+			return nil, errors.New(filename + " is not fomatted correctly, expected same number of columns.")
+		}
+		stat := ProtoCountersStat{
+			Protocol: proto,
+			Stats:    make(map[string]int64, len(statNames)),
+		}
+		for j := range statNames {
+			value, err := strconv.ParseInt(statValues[j], 10, 64)
+			if err != nil {
+				return nil, err
+			}
+			stat.Stats[statNames[j]] = value
+		}
+		stats = append(stats, stat)
+	}
+	return stats, nil
+}
+
+// NetFilterCounters returns iptables conntrack statistics
+// the currently in use conntrack count and the max.
+// If the file does not exist or is invalid it will return nil.
+func FilterCounters() ([]FilterStat, error) {
+	countfile := common.HostProc("sys/net/netfilter/nf_conntrackCount")
+	maxfile := common.HostProc("sys/net/netfilter/nf_conntrackMax")
+
+	count, err := common.ReadInts(countfile)
+
+	if err != nil {
+		return nil, err
+	}
+	stats := make([]FilterStat, 0, 1)
+
+	max, err := common.ReadInts(maxfile)
+	if err != nil {
+		return nil, err
+	}
+
+	payload := FilterStat{
+		ConnTrackCount: count[0],
+		ConnTrackMax:   max[0],
+	}
+
+	stats = append(stats, payload)
+	return stats, nil
+}
+
+// http://students.mimuw.edu.pl/lxr/source/include/net/tcp_states.h
+var TCPStatuses = map[string]string{
+	"01": "ESTABLISHED",
+	"02": "SYN_SENT",
+	"03": "SYN_RECV",
+	"04": "FIN_WAIT1",
+	"05": "FIN_WAIT2",
+	"06": "TIME_WAIT",
+	"07": "CLOSE",
+	"08": "CLOSE_WAIT",
+	"09": "LAST_ACK",
+	"0A": "LISTEN",
+	"0B": "CLOSING",
+}
+
+type netConnectionKindType struct {
+	family   uint32
+	sockType uint32
+	filename string
+}
+
+var kindTCP4 = netConnectionKindType{
+	family:   syscall.AF_INET,
+	sockType: syscall.SOCK_STREAM,
+	filename: "tcp",
+}
+var kindTCP6 = netConnectionKindType{
+	family:   syscall.AF_INET6,
+	sockType: syscall.SOCK_STREAM,
+	filename: "tcp6",
+}
+var kindUDP4 = netConnectionKindType{
+	family:   syscall.AF_INET,
+	sockType: syscall.SOCK_DGRAM,
+	filename: "udp",
+}
+var kindUDP6 = netConnectionKindType{
+	family:   syscall.AF_INET6,
+	sockType: syscall.SOCK_DGRAM,
+	filename: "udp6",
+}
+var kindUNIX = netConnectionKindType{
+	family:   syscall.AF_UNIX,
+	filename: "unix",
+}
+
+var netConnectionKindMap = map[string][]netConnectionKindType{
+	"all":   []netConnectionKindType{kindTCP4, kindTCP6, kindUDP4, kindUDP6, kindUNIX},
+	"tcp":   []netConnectionKindType{kindTCP4, kindTCP6},
+	"tcp4":  []netConnectionKindType{kindTCP4},
+	"tcp6":  []netConnectionKindType{kindTCP6},
+	"udp":   []netConnectionKindType{kindUDP4, kindUDP6},
+	"udp4":  []netConnectionKindType{kindUDP4},
+	"udp6":  []netConnectionKindType{kindUDP6},
+	"unix":  []netConnectionKindType{kindUNIX},
+	"inet":  []netConnectionKindType{kindTCP4, kindTCP6, kindUDP4, kindUDP6},
+	"inet4": []netConnectionKindType{kindTCP4, kindUDP4},
+	"inet6": []netConnectionKindType{kindTCP6, kindUDP6},
+}
+
+type inodeMap struct {
+	pid int32
+	fd  uint32
+}
+
+type connTmp struct {
+	fd       uint32
+	family   uint32
+	sockType uint32
+	laddr    Addr
+	raddr    Addr
+	status   string
+	pid      int32
+	boundPid int32
+	path     string
+}
+
+// Return a list of network connections opened.
+func Connections(kind string) ([]ConnectionStat, error) {
+	return ConnectionsPid(kind, 0)
+}
+
+// Return a list of network connections opened by a process.
+func ConnectionsPid(kind string, pid int32) ([]ConnectionStat, error) {
+	tmap, ok := netConnectionKindMap[kind]
+	if !ok {
+		return nil, fmt.Errorf("invalid kind, %s", kind)
+	}
+	root := common.HostProc()
+	var err error
+	var inodes map[string][]inodeMap
+	if pid == 0 {
+		inodes, err = getProcInodesAll(root)
+	} else {
+		inodes, err = getProcInodes(root, pid)
+		if len(inodes) == 0 {
+			// no connection for the pid
+			return []ConnectionStat{}, nil
+		}
+	}
+	if err != nil {
+		return nil, fmt.Errorf("cound not get pid(s), %d", pid)
+	}
+
+	dupCheckMap := make(map[string]bool)
+	var ret []ConnectionStat
+
+	for _, t := range tmap {
+		var path string
+		var ls []connTmp
+		path = fmt.Sprintf("%s/net/%s", root, t.filename)
+		switch t.family {
+		case syscall.AF_INET:
+			fallthrough
+		case syscall.AF_INET6:
+			ls, err = processInet(path, t, inodes, pid)
+		case syscall.AF_UNIX:
+			ls, err = processUnix(path, t, inodes, pid)
+		}
+		if err != nil {
+			return nil, err
+		}
+		for _, c := range ls {
+			conn := ConnectionStat{
+				Fd:     c.fd,
+				Family: c.family,
+				Type:   c.sockType,
+				Laddr:  c.laddr,
+				Raddr:  c.raddr,
+				Status: c.status,
+				Pid:    c.pid,
+			}
+			if c.pid == 0 {
+				conn.Pid = c.boundPid
+			} else {
+				conn.Pid = c.pid
+			}
+			// check duplicate using JSON format
+			json := conn.String()
+			_, exists := dupCheckMap[json]
+			if !exists {
+				ret = append(ret, conn)
+				dupCheckMap[json] = true
+			}
+		}
+
+	}
+
+	return ret, nil
+}
+
+// getProcInodes returnes fd of the pid.
+func getProcInodes(root string, pid int32) (map[string][]inodeMap, error) {
+	ret := make(map[string][]inodeMap)
+
+	dir := fmt.Sprintf("%s/%d/fd", root, pid)
+	files, err := ioutil.ReadDir(dir)
+	if err != nil {
+		return ret, nil
+	}
+	for _, fd := range files {
+		inodePath := fmt.Sprintf("%s/%d/fd/%s", root, pid, fd.Name())
+
+		inode, err := os.Readlink(inodePath)
+		if err != nil {
+			continue
+		}
+		if !strings.HasPrefix(inode, "socket:[") {
+			continue
+		}
+		// the process is using a socket
+		l := len(inode)
+		inode = inode[8 : l-1]
+		_, ok := ret[inode]
+		if !ok {
+			ret[inode] = make([]inodeMap, 0)
+		}
+		fd, err := strconv.Atoi(fd.Name())
+		if err != nil {
+			continue
+		}
+
+		i := inodeMap{
+			pid: pid,
+			fd:  uint32(fd),
+		}
+		ret[inode] = append(ret[inode], i)
+	}
+	return ret, nil
+}
+
+// Pids retunres all pids.
+// Note: this is a copy of process_linux.Pids()
+// FIXME: Import process occures import cycle.
+// move to common made other platform breaking. Need consider.
+func Pids() ([]int32, error) {
+	var ret []int32
+
+	d, err := os.Open(common.HostProc())
+	if err != nil {
+		return nil, err
+	}
+	defer d.Close()
+
+	fnames, err := d.Readdirnames(-1)
+	if err != nil {
+		return nil, err
+	}
+	for _, fname := range fnames {
+		pid, err := strconv.ParseInt(fname, 10, 32)
+		if err != nil {
+			// if not numeric name, just skip
+			continue
+		}
+		ret = append(ret, int32(pid))
+	}
+
+	return ret, nil
+}
+
+func getProcInodesAll(root string) (map[string][]inodeMap, error) {
+	pids, err := Pids()
+	if err != nil {
+		return nil, err
+	}
+	ret := make(map[string][]inodeMap)
+
+	for _, pid := range pids {
+		t, err := getProcInodes(root, pid)
+		if err != nil {
+			return ret, err
+		}
+		if len(t) == 0 {
+			continue
+		}
+		// TODO: update ret.
+		ret = updateMap(ret, t)
+	}
+	return ret, nil
+}
+
+// decodeAddress decode addresse represents addr in proc/net/*
+// ex:
+// "0500000A:0016" -> "10.0.0.5", 22
+// "0085002452100113070057A13F025401:0035" -> "2400:8500:1301:1052:a157:7:154:23f", 53
+func decodeAddress(family uint32, src string) (Addr, error) {
+	t := strings.Split(src, ":")
+	if len(t) != 2 {
+		return Addr{}, fmt.Errorf("does not contain port, %s", src)
+	}
+	addr := t[0]
+	port, err := strconv.ParseInt("0x"+t[1], 0, 64)
+	if err != nil {
+		return Addr{}, fmt.Errorf("invalid port, %s", src)
+	}
+	decoded, err := hex.DecodeString(addr)
+	if err != nil {
+		return Addr{}, fmt.Errorf("decode error, %s", err)
+	}
+	var ip net.IP
+	// Assumes this is little_endian
+	if family == syscall.AF_INET {
+		ip = net.IP(Reverse(decoded))
+	} else { // IPv6
+		ip, err = parseIPv6HexString(decoded)
+		if err != nil {
+			return Addr{}, err
+		}
+	}
+	return Addr{
+		IP:   ip.String(),
+		Port: uint32(port),
+	}, nil
+}
+
+// Reverse reverses array of bytes.
+func Reverse(s []byte) []byte {
+	for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 {
+		s[i], s[j] = s[j], s[i]
+	}
+	return s
+}
+
+// parseIPv6HexString parse array of bytes to IPv6 string
+func parseIPv6HexString(src []byte) (net.IP, error) {
+	if len(src) != 16 {
+		return nil, fmt.Errorf("invalid IPv6 string")
+	}
+
+	buf := make([]byte, 0, 16)
+	for i := 0; i < len(src); i += 4 {
+		r := Reverse(src[i : i+4])
+		buf = append(buf, r...)
+	}
+	return net.IP(buf), nil
+}
+
+func processInet(file string, kind netConnectionKindType, inodes map[string][]inodeMap, filterPid int32) ([]connTmp, error) {
+
+	if strings.HasSuffix(file, "6") && !common.PathExists(file) {
+		// IPv6 not supported, return empty.
+		return []connTmp{}, nil
+	}
+	lines, err := common.ReadLines(file)
+	if err != nil {
+		return nil, err
+	}
+	var ret []connTmp
+	// skip first line
+	for _, line := range lines[1:] {
+		l := strings.Fields(line)
+		if len(l) < 10 {
+			continue
+		}
+		laddr := l[1]
+		raddr := l[2]
+		status := l[3]
+		inode := l[9]
+		pid := int32(0)
+		fd := uint32(0)
+		i, exists := inodes[inode]
+		if exists {
+			pid = i[0].pid
+			fd = i[0].fd
+		}
+		if filterPid > 0 && filterPid != pid {
+			continue
+		}
+		if kind.sockType == syscall.SOCK_STREAM {
+			status = TCPStatuses[status]
+		} else {
+			status = "NONE"
+		}
+		la, err := decodeAddress(kind.family, laddr)
+		if err != nil {
+			continue
+		}
+		ra, err := decodeAddress(kind.family, raddr)
+		if err != nil {
+			continue
+		}
+
+		ret = append(ret, connTmp{
+			fd:       fd,
+			family:   kind.family,
+			sockType: kind.sockType,
+			laddr:    la,
+			raddr:    ra,
+			status:   status,
+			pid:      pid,
+		})
+	}
+
+	return ret, nil
+}
+
+func processUnix(file string, kind netConnectionKindType, inodes map[string][]inodeMap, filterPid int32) ([]connTmp, error) {
+	lines, err := common.ReadLines(file)
+	if err != nil {
+		return nil, err
+	}
+
+	var ret []connTmp
+	// skip first line
+	for _, line := range lines[1:] {
+		tokens := strings.Fields(line)
+		if len(tokens) < 6 {
+			continue
+		}
+		st, err := strconv.Atoi(tokens[4])
+		if err != nil {
+			return nil, err
+		}
+
+		inode := tokens[6]
+
+		var pairs []inodeMap
+		pairs, exists := inodes[inode]
+		if !exists {
+			pairs = []inodeMap{
+				inodeMap{},
+			}
+		}
+		for _, pair := range pairs {
+			if filterPid > 0 && filterPid != pair.pid {
+				continue
+			}
+			var path string
+			if len(tokens) == 8 {
+				path = tokens[len(tokens)-1]
+			}
+			ret = append(ret, connTmp{
+				fd:       pair.fd,
+				family:   kind.family,
+				sockType: uint32(st),
+				laddr: Addr{
+					IP: path,
+				},
+				pid:    pair.pid,
+				status: "NONE",
+				path:   path,
+			})
+		}
+	}
+
+	return ret, nil
+}
+
+func updateMap(src map[string][]inodeMap, add map[string][]inodeMap) map[string][]inodeMap {
+	for key, value := range add {
+		a, exists := src[key]
+		if !exists {
+			src[key] = value
+			continue
+		}
+		src[key] = append(a, value...)
+	}
+	return src
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go
new file mode 100644
index 0000000000..45de6b17de
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go
@@ -0,0 +1,68 @@
+// +build freebsd darwin
+
+package net
+
+import (
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// Return a list of network connections opened.
+func Connections(kind string) ([]ConnectionStat, error) {
+	return ConnectionsPid(kind, 0)
+}
+
+// Return a list of network connections opened by a process.
+func ConnectionsPid(kind string, pid int32) ([]ConnectionStat, error) {
+	var ret []ConnectionStat
+
+	args := []string{"-i"}
+	switch strings.ToLower(kind) {
+	default:
+		fallthrough
+	case "":
+		fallthrough
+	case "all":
+		fallthrough
+	case "inet":
+		args = append(args, "tcp", "-i", "udp")
+	case "inet4":
+		args = append(args, "4")
+	case "inet6":
+		args = append(args, "6")
+	case "tcp":
+		args = append(args, "tcp")
+	case "tcp4":
+		args = append(args, "4tcp")
+	case "tcp6":
+		args = append(args, "6tcp")
+	case "udp":
+		args = append(args, "udp")
+	case "udp4":
+		args = append(args, "6udp")
+	case "udp6":
+		args = append(args, "6udp")
+	case "unix":
+		return ret, common.ErrNotImplementedError
+	}
+
+	r, err := common.CallLsof(invoke, pid, args...)
+	if err != nil {
+		return nil, err
+	}
+	for _, rr := range r {
+		if strings.HasPrefix(rr, "COMMAND") {
+			continue
+		}
+		n, err := parseNetLine(rr)
+		if err != nil {
+
+			continue
+		}
+
+		ret = append(ret, n)
+	}
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go
new file mode 100644
index 0000000000..f125260c4d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go
@@ -0,0 +1,116 @@
+// +build windows
+
+package net
+
+import (
+	"errors"
+	"net"
+	"os"
+	"syscall"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var (
+	modiphlpapi             = syscall.NewLazyDLL("iphlpapi.dll")
+	procGetExtendedTCPTable = modiphlpapi.NewProc("GetExtendedTcpTable")
+	procGetExtendedUDPTable = modiphlpapi.NewProc("GetExtendedUdpTable")
+)
+
+const (
+	TCPTableBasicListener = iota
+	TCPTableBasicConnections
+	TCPTableBasicAll
+	TCPTableOwnerPIDListener
+	TCPTableOwnerPIDConnections
+	TCPTableOwnerPIDAll
+	TCPTableOwnerModuleListener
+	TCPTableOwnerModuleConnections
+	TCPTableOwnerModuleAll
+)
+
+func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	ifs, err := net.Interfaces()
+	if err != nil {
+		return nil, err
+	}
+
+	ai, err := getAdapterList()
+	if err != nil {
+		return nil, err
+	}
+	var ret []IOCountersStat
+
+	for _, ifi := range ifs {
+		name := ifi.Name
+		for ; ai != nil; ai = ai.Next {
+			name = common.BytePtrToString(&ai.Description[0])
+			c := IOCountersStat{
+				Name: name,
+			}
+
+			row := syscall.MibIfRow{Index: ai.Index}
+			e := syscall.GetIfEntry(&row)
+			if e != nil {
+				return nil, os.NewSyscallError("GetIfEntry", e)
+			}
+			c.BytesSent = uint64(row.OutOctets)
+			c.BytesRecv = uint64(row.InOctets)
+			c.PacketsSent = uint64(row.OutUcastPkts)
+			c.PacketsRecv = uint64(row.InUcastPkts)
+			c.Errin = uint64(row.InErrors)
+			c.Errout = uint64(row.OutErrors)
+			c.Dropin = uint64(row.InDiscards)
+			c.Dropout = uint64(row.OutDiscards)
+
+			ret = append(ret, c)
+		}
+	}
+
+	if pernic == false {
+		return getIOCountersAll(ret)
+	}
+	return ret, nil
+}
+
+// NetIOCountersByFile is an method which is added just a compatibility for linux.
+func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
+	return IOCounters(pernic)
+}
+
+// Return a list of network connections opened by a process
+func Connections(kind string) ([]ConnectionStat, error) {
+	var ret []ConnectionStat
+
+	return ret, common.ErrNotImplementedError
+}
+
+// borrowed from src/pkg/net/interface_windows.go
+func getAdapterList() (*syscall.IpAdapterInfo, error) {
+	b := make([]byte, 1000)
+	l := uint32(len(b))
+	a := (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
+	err := syscall.GetAdaptersInfo(a, &l)
+	if err == syscall.ERROR_BUFFER_OVERFLOW {
+		b = make([]byte, l)
+		a = (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
+		err = syscall.GetAdaptersInfo(a, &l)
+	}
+	if err != nil {
+		return nil, os.NewSyscallError("GetAdaptersInfo", err)
+	}
+	return a, nil
+}
+
+func FilterCounters() ([]FilterStat, error) {
+	return nil, errors.New("NetFilterCounters not implemented for windows")
+}
+
+// NetProtoCounters returns network statistics for the entire system
+// If protocols is empty then all protocols are returned, otherwise
+// just the protocols in the list are returned.
+// Not Implemented for Windows
+func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
+	return nil, errors.New("NetProtoCounters not implemented for windows")
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
new file mode 100644
index 0000000000..4b69224340
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
@@ -0,0 +1,167 @@
+package process
+
+import (
+	"encoding/json"
+	"runtime"
+	"time"
+
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/mem"
+)
+
+var invoke common.Invoker
+
+func init() {
+	invoke = common.Invoke{}
+}
+
+type Process struct {
+	Pid            int32 `json:"pid"`
+	name           string
+	status         string
+	parent         int32
+	numCtxSwitches *NumCtxSwitchesStat
+	uids           []int32
+	gids           []int32
+	numThreads     int32
+	memInfo        *MemoryInfoStat
+
+	lastCPUTimes *cpu.TimesStat
+	lastCPUTime  time.Time
+}
+
+type OpenFilesStat struct {
+	Path string `json:"path"`
+	Fd   uint64 `json:"fd"`
+}
+
+type MemoryInfoStat struct {
+	RSS  uint64 `json:"rss"`  // bytes
+	VMS  uint64 `json:"vms"`  // bytes
+	Swap uint64 `json:"swap"` // bytes
+}
+
+type RlimitStat struct {
+	Resource int32 `json:"resource"`
+	Soft     int32 `json:"soft"`
+	Hard     int32 `json:"hard"`
+}
+
+type IOCountersStat struct {
+	ReadCount  uint64 `json:"readCount"`
+	WriteCount uint64 `json:"writeCount"`
+	ReadBytes  uint64 `json:"readBytes"`
+	WriteBytes uint64 `json:"writeBytes"`
+}
+
+type NumCtxSwitchesStat struct {
+	Voluntary   int64 `json:"voluntary"`
+	Involuntary int64 `json:"involuntary"`
+}
+
+func (p Process) String() string {
+	s, _ := json.Marshal(p)
+	return string(s)
+}
+
+func (o OpenFilesStat) String() string {
+	s, _ := json.Marshal(o)
+	return string(s)
+}
+
+func (m MemoryInfoStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
+
+func (r RlimitStat) String() string {
+	s, _ := json.Marshal(r)
+	return string(s)
+}
+
+func (i IOCountersStat) String() string {
+	s, _ := json.Marshal(i)
+	return string(s)
+}
+
+func (p NumCtxSwitchesStat) String() string {
+	s, _ := json.Marshal(p)
+	return string(s)
+}
+
+func PidExists(pid int32) (bool, error) {
+	pids, err := Pids()
+	if err != nil {
+		return false, err
+	}
+
+	for _, i := range pids {
+		if i == pid {
+			return true, err
+		}
+	}
+
+	return false, err
+}
+
+// If interval is 0, return difference from last call(non-blocking).
+// If interval > 0, wait interval sec and return diffrence between start and end.
+func (p *Process) Percent(interval time.Duration) (float64, error) {
+	cpuTimes, err := p.Times()
+	if err != nil {
+		return 0, err
+	}
+	now := time.Now()
+
+	if interval > 0 {
+		p.lastCPUTimes = cpuTimes
+		p.lastCPUTime = now
+		time.Sleep(interval)
+		cpuTimes, err = p.Times()
+		now = time.Now()
+		if err != nil {
+			return 0, err
+		}
+	} else {
+		if p.lastCPUTimes == nil {
+			// invoked first time
+			p.lastCPUTimes = cpuTimes
+			p.lastCPUTime = now
+			return 0, nil
+		}
+	}
+
+	numcpu := runtime.NumCPU()
+	delta := (now.Sub(p.lastCPUTime).Seconds()) * float64(numcpu)
+	ret := calculatePercent(p.lastCPUTimes, cpuTimes, delta, numcpu)
+	p.lastCPUTimes = cpuTimes
+	p.lastCPUTime = now
+	return ret, nil
+}
+
+func calculatePercent(t1, t2 *cpu.TimesStat, delta float64, numcpu int) float64 {
+	if delta == 0 {
+		return 0
+	}
+	delta_proc := t2.Total() - t1.Total()
+	overall_percent := ((delta_proc / delta) * 100) * float64(numcpu)
+	return overall_percent
+}
+
+// MemoryPercent returns how many percent of the total RAM this process uses
+func (p *Process) MemoryPercent() (float32, error) {
+	machineMemory, err := mem.VirtualMemory()
+	if err != nil {
+		return 0, err
+	}
+	total := machineMemory.Total
+
+	processMemory, err := p.MemoryInfo()
+	if err != nil {
+		return 0, err
+	}
+	used := processMemory.RSS
+
+	return (100 * float32(used) / float32(total)), nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go
new file mode 100644
index 0000000000..cea0803e6d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go
@@ -0,0 +1,451 @@
+// +build darwin
+
+package process
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"os/exec"
+	"strconv"
+	"strings"
+	"syscall"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
+)
+
+// copied from sys/sysctl.h
+const (
+	CTLKern          = 1  // "high kernel": proc, limits
+	KernProc         = 14 // struct: process entries
+	KernProcPID      = 1  // by process id
+	KernProcProc     = 8  // only return procs
+	KernProcAll      = 0  // everything
+	KernProcPathname = 12 // path to executable
+)
+
+const (
+	ClockTicks = 100 // C.sysconf(C._SC_CLK_TCK)
+)
+
+type _Ctype_struct___0 struct {
+	Pad uint64
+}
+
+// MemoryInfoExStat is different between OSes
+type MemoryInfoExStat struct {
+}
+
+type MemoryMapsStat struct {
+}
+
+func Pids() ([]int32, error) {
+	var ret []int32
+
+	pids, err := callPs("pid", 0, false)
+	if err != nil {
+		return ret, err
+	}
+
+	for _, pid := range pids {
+		v, err := strconv.Atoi(pid[0])
+		if err != nil {
+			return ret, err
+		}
+		ret = append(ret, int32(v))
+	}
+
+	return ret, nil
+}
+
+func (p *Process) Ppid() (int32, error) {
+	r, err := callPs("ppid", p.Pid, false)
+	v, err := strconv.Atoi(r[0][0])
+	if err != nil {
+		return 0, err
+	}
+
+	return int32(v), err
+}
+func (p *Process) Name() (string, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return "", err
+	}
+
+	return common.IntToString(k.Proc.P_comm[:]), nil
+}
+func (p *Process) Exe() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+
+// Cmdline returns the command line arguments of the process as a string with
+// each argument separated by 0x20 ascii character.
+func (p *Process) Cmdline() (string, error) {
+	r, err := callPs("command", p.Pid, false)
+	if err != nil {
+		return "", err
+	}
+	return strings.Join(r[0], " "), err
+}
+
+// CmdlineSlice returns the command line arguments of the process as a slice with each
+// element being an argument. Because of current deficiencies in the way that the command
+// line arguments are found, single arguments that have spaces in the will actually be
+// reported as two separate items. In order to do something better CGO would be needed
+// to use the native darwin functions.
+func (p *Process) CmdlineSlice() ([]string, error) {
+	r, err := callPs("command", p.Pid, false)
+	if err != nil {
+		return nil, err
+	}
+	return r[0], err
+}
+func (p *Process) CreateTime() (int64, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Cwd() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Parent() (*Process, error) {
+	rr, err := common.CallLsof(invoke, p.Pid, "-FR")
+	if err != nil {
+		return nil, err
+	}
+	for _, r := range rr {
+		if strings.HasPrefix(r, "p") { // skip if process
+			continue
+		}
+		l := string(r)
+		v, err := strconv.Atoi(strings.Replace(l, "R", "", 1))
+		if err != nil {
+			return nil, err
+		}
+		return NewProcess(int32(v))
+	}
+	return nil, fmt.Errorf("could not find parent line")
+}
+func (p *Process) Status() (string, error) {
+	r, err := callPs("state", p.Pid, false)
+	if err != nil {
+		return "", err
+	}
+
+	return r[0][0], err
+}
+func (p *Process) Uids() ([]int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+
+	// See: http://unix.superglobalmegacorp.com/Net2/newsrc/sys/ucred.h.html
+	userEffectiveUID := int32(k.Eproc.Ucred.UID)
+
+	return []int32{userEffectiveUID}, nil
+}
+func (p *Process) Gids() ([]int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+
+	gids := make([]int32, 0, 3)
+	gids = append(gids, int32(k.Eproc.Pcred.P_rgid), int32(k.Eproc.Ucred.Ngroups), int32(k.Eproc.Pcred.P_svgid))
+
+	return gids, nil
+}
+func (p *Process) Terminal() (string, error) {
+	return "", common.ErrNotImplementedError
+	/*
+		k, err := p.getKProc()
+		if err != nil {
+			return "", err
+		}
+
+		ttyNr := uint64(k.Eproc.Tdev)
+		termmap, err := getTerminalMap()
+		if err != nil {
+			return "", err
+		}
+
+		return termmap[ttyNr], nil
+	*/
+}
+func (p *Process) Nice() (int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return 0, err
+	}
+	return int32(k.Proc.P_nice), nil
+}
+func (p *Process) IOnice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Rlimit() ([]RlimitStat, error) {
+	var rlimit []RlimitStat
+	return rlimit, common.ErrNotImplementedError
+}
+func (p *Process) IOCounters() (*IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumFDs() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) NumThreads() (int32, error) {
+	r, err := callPs("utime,stime", p.Pid, true)
+	if err != nil {
+		return 0, err
+	}
+	return int32(len(r)), nil
+}
+func (p *Process) Threads() (map[string]string, error) {
+	ret := make(map[string]string, 0)
+	return ret, common.ErrNotImplementedError
+}
+
+func convertCPUTimes(s string) (ret float64, err error) {
+	var t int
+	var _tmp string
+	if strings.Contains(s, ":") {
+		_t := strings.Split(s, ":")
+		hour, err := strconv.Atoi(_t[0])
+		if err != nil {
+			return ret, err
+		}
+		t += hour * 60 * 100
+		_tmp = _t[1]
+	} else {
+		_tmp = s
+	}
+
+	_t := strings.Split(_tmp, ".")
+	if err != nil {
+		return ret, err
+	}
+	h, err := strconv.Atoi(_t[0])
+	t += h * 100
+	h, err = strconv.Atoi(_t[1])
+	t += h
+	return float64(t) / ClockTicks, nil
+}
+func (p *Process) Times() (*cpu.TimesStat, error) {
+	r, err := callPs("utime,stime", p.Pid, false)
+
+	if err != nil {
+		return nil, err
+	}
+
+	utime, err := convertCPUTimes(r[0][0])
+	if err != nil {
+		return nil, err
+	}
+	stime, err := convertCPUTimes(r[0][1])
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &cpu.TimesStat{
+		CPU:    "cpu",
+		User:   utime,
+		System: stime,
+	}
+	return ret, nil
+}
+func (p *Process) CPUAffinity() ([]int32, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
+	r, err := callPs("rss,vsize,pagein", p.Pid, false)
+	if err != nil {
+		return nil, err
+	}
+	rss, err := strconv.Atoi(r[0][0])
+	if err != nil {
+		return nil, err
+	}
+	vms, err := strconv.Atoi(r[0][1])
+	if err != nil {
+		return nil, err
+	}
+	pagein, err := strconv.Atoi(r[0][2])
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &MemoryInfoStat{
+		RSS:  uint64(rss) * 1024,
+		VMS:  uint64(vms) * 1024,
+		Swap: uint64(pagein),
+	}
+
+	return ret, nil
+}
+func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Children() ([]*Process, error) {
+	pids, err := common.CallPgrep(invoke, p.Pid)
+	if err != nil {
+		return nil, err
+	}
+	ret := make([]*Process, 0, len(pids))
+	for _, pid := range pids {
+		np, err := NewProcess(pid)
+		if err != nil {
+			return nil, err
+		}
+		ret = append(ret, np)
+	}
+	return ret, nil
+}
+
+func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Connections() ([]net.ConnectionStat, error) {
+	return net.ConnectionsPid("all", p.Pid)
+}
+
+func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) IsRunning() (bool, error) {
+	return true, common.ErrNotImplementedError
+}
+func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
+	var ret []MemoryMapsStat
+	return &ret, common.ErrNotImplementedError
+}
+
+func processes() ([]Process, error) {
+	results := make([]Process, 0, 50)
+
+	mib := []int32{CTLKern, KernProc, KernProcAll, 0}
+	buf, length, err := common.CallSyscall(mib)
+	if err != nil {
+		return results, err
+	}
+
+	// get kinfo_proc size
+	k := KinfoProc{}
+	procinfoLen := int(unsafe.Sizeof(k))
+	count := int(length / uint64(procinfoLen))
+	/*
+		fmt.Println(length, procinfoLen, count)
+		b := buf[0*procinfoLen : 0*procinfoLen+procinfoLen]
+		fmt.Println(b)
+		kk, err := parseKinfoProc(b)
+		fmt.Printf("%#v", kk)
+	*/
+
+	// parse buf to procs
+	for i := 0; i < count; i++ {
+		b := buf[i*procinfoLen : i*procinfoLen+procinfoLen]
+		k, err := parseKinfoProc(b)
+		if err != nil {
+			continue
+		}
+		p, err := NewProcess(int32(k.Proc.P_pid))
+		if err != nil {
+			continue
+		}
+		results = append(results, *p)
+	}
+
+	return results, nil
+}
+
+func parseKinfoProc(buf []byte) (KinfoProc, error) {
+	var k KinfoProc
+	br := bytes.NewReader(buf)
+
+	err := common.Read(br, binary.LittleEndian, &k)
+	if err != nil {
+		return k, err
+	}
+
+	return k, nil
+}
+
+// Returns a proc as defined here:
+// http://unix.superglobalmegacorp.com/Net2/newsrc/sys/kinfo_proc.h.html
+func (p *Process) getKProc() (*KinfoProc, error) {
+	mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid}
+	procK := KinfoProc{}
+	length := uint64(unsafe.Sizeof(procK))
+	buf := make([]byte, length)
+	_, _, syserr := syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(unsafe.Pointer(&mib[0])),
+		uintptr(len(mib)),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if syserr != 0 {
+		return nil, syserr
+	}
+	k, err := parseKinfoProc(buf)
+	if err != nil {
+		return nil, err
+	}
+
+	return &k, nil
+}
+
+func NewProcess(pid int32) (*Process, error) {
+	p := &Process{Pid: pid}
+
+	return p, nil
+}
+
+// call ps command.
+// Return value deletes Header line(you must not input wrong arg).
+// And splited by Space. Caller have responsibility to manage.
+// If passed arg pid is 0, get information from all process.
+func callPs(arg string, pid int32, threadOption bool) ([][]string, error) {
+	bin, err := exec.LookPath("ps")
+	if err != nil {
+		return [][]string{}, err
+	}
+
+	var cmd []string
+	if pid == 0 { // will get from all processes.
+		cmd = []string{"-ax", "-o", arg}
+	} else if threadOption {
+		cmd = []string{"-x", "-o", arg, "-M", "-p", strconv.Itoa(int(pid))}
+	} else {
+		cmd = []string{"-x", "-o", arg, "-p", strconv.Itoa(int(pid))}
+	}
+	out, err := invoke.Command(bin, cmd...)
+	if err != nil {
+		return [][]string{}, err
+	}
+	lines := strings.Split(string(out), "\n")
+
+	var ret [][]string
+	for _, l := range lines[1:] {
+		var lr []string
+		for _, r := range strings.Split(l, " ") {
+			if r == "" {
+				continue
+			}
+			lr = append(lr, strings.TrimSpace(r))
+		}
+		if len(lr) != 0 {
+			ret = append(ret, lr)
+		}
+	}
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go
new file mode 100644
index 0000000000..f8e922385b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go
@@ -0,0 +1,234 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+package process
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type UGid_t uint32
+
+type KinfoProc struct {
+	Proc  ExternProc
+	Eproc Eproc
+}
+
+type Eproc struct {
+	Paddr     *uint64
+	Sess      *Session
+	Pcred     Upcred
+	Ucred     Uucred
+	Pad_cgo_0 [4]byte
+	Vm        Vmspace
+	Ppid      int32
+	Pgid      int32
+	Jobc      int16
+	Pad_cgo_1 [2]byte
+	Tdev      int32
+	Tpgid     int32
+	Pad_cgo_2 [4]byte
+	Tsess     *Session
+	Wmesg     [8]int8
+	Xsize     int32
+	Xrssize   int16
+	Xccount   int16
+	Xswrss    int16
+	Pad_cgo_3 [2]byte
+	Flag      int32
+	Login     [12]int8
+	Spare     [4]int32
+	Pad_cgo_4 [4]byte
+}
+
+type Proc struct{}
+
+type Session struct{}
+
+type ucred struct {
+	Link  _Ctype_struct___0
+	Ref   uint64
+	Posix Posix_cred
+	Label *Label
+	Audit Au_session
+}
+
+type Uucred struct {
+	Ref       int32
+	UID       uint32
+	Ngroups   int16
+	Pad_cgo_0 [2]byte
+	Groups    [16]uint32
+}
+
+type Upcred struct {
+	Pc_lock   [72]int8
+	Pc_ucred  *ucred
+	P_ruid    uint32
+	P_svuid   uint32
+	P_rgid    uint32
+	P_svgid   uint32
+	P_refcnt  int32
+	Pad_cgo_0 [4]byte
+}
+
+type Vmspace struct {
+	Dummy     int32
+	Pad_cgo_0 [4]byte
+	Dummy2    *int8
+	Dummy3    [5]int32
+	Pad_cgo_1 [4]byte
+	Dummy4    [3]*int8
+}
+
+type Sigacts struct{}
+
+type ExternProc struct {
+	P_un        [16]byte
+	P_vmspace   uint64
+	P_sigacts   uint64
+	Pad_cgo_0   [3]byte
+	P_flag      int32
+	P_stat      int8
+	P_pid       int32
+	P_oppid     int32
+	P_dupfd     int32
+	Pad_cgo_1   [4]byte
+	User_stack  uint64
+	Exit_thread uint64
+	P_debugger  int32
+	Sigwait     int32
+	P_estcpu    uint32
+	P_cpticks   int32
+	P_pctcpu    uint32
+	Pad_cgo_2   [4]byte
+	P_wchan     uint64
+	P_wmesg     uint64
+	P_swtime    uint32
+	P_slptime   uint32
+	P_realtimer Itimerval
+	P_rtime     Timeval
+	P_uticks    uint64
+	P_sticks    uint64
+	P_iticks    uint64
+	P_traceflag int32
+	Pad_cgo_3   [4]byte
+	P_tracep    uint64
+	P_siglist   int32
+	Pad_cgo_4   [4]byte
+	P_textvp    uint64
+	P_holdcnt   int32
+	P_sigmask   uint32
+	P_sigignore uint32
+	P_sigcatch  uint32
+	P_priority  uint8
+	P_usrpri    uint8
+	P_nice      int8
+	P_comm      [17]int8
+	Pad_cgo_5   [4]byte
+	P_pgrp      uint64
+	P_addr      uint64
+	P_xstat     uint16
+	P_acflag    uint16
+	Pad_cgo_6   [4]byte
+	P_ru        uint64
+}
+
+type Itimerval struct {
+	Interval Timeval
+	Value    Timeval
+}
+
+type Vnode struct{}
+
+type Pgrp struct{}
+
+type UserStruct struct{}
+
+type Au_session struct {
+	Aia_p *AuditinfoAddr
+	Mask  AuMask
+}
+
+type Posix_cred struct {
+	UID       uint32
+	Ruid      uint32
+	Svuid     uint32
+	Ngroups   int16
+	Pad_cgo_0 [2]byte
+	Groups    [16]uint32
+	Rgid      uint32
+	Svgid     uint32
+	Gmuid     uint32
+	Flags     int32
+}
+
+type Label struct{}
+
+type AuditinfoAddr struct {
+	Auid   uint32
+	Mask   AuMask
+	Termid AuTidAddr
+	Asid   int32
+	Flags  uint64
+}
+type AuMask struct {
+	Success uint32
+	Failure uint32
+}
+type AuTidAddr struct {
+	Port int32
+	Type uint32
+	Addr [4]uint32
+}
+
+type UcredQueue struct {
+	Next *ucred
+	Prev **ucred
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go
new file mode 100644
index 0000000000..5362128e6e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go
@@ -0,0 +1,336 @@
+// +build freebsd
+
+package process
+
+import (
+	"bytes"
+	"encoding/binary"
+	"strings"
+	"syscall"
+
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	net "github.com/shirou/gopsutil/net"
+)
+
+// MemoryInfoExStat is different between OSes
+type MemoryInfoExStat struct {
+}
+
+type MemoryMapsStat struct {
+}
+
+func Pids() ([]int32, error) {
+	var ret []int32
+	procs, err := processes()
+	if err != nil {
+		return ret, nil
+	}
+
+	for _, p := range procs {
+		ret = append(ret, p.Pid)
+	}
+
+	return ret, nil
+}
+
+func (p *Process) Ppid() (int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return 0, err
+	}
+
+	return k.Ppid, nil
+}
+func (p *Process) Name() (string, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return "", err
+	}
+
+	return common.IntToString(k.Comm[:]), nil
+}
+func (p *Process) Exe() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+
+func (p *Process) Cmdline() (string, error) {
+	mib := []int32{CTLKern, KernProc, KernProcArgs, p.Pid}
+	buf, _, err := common.CallSyscall(mib)
+	if err != nil {
+		return "", err
+	}
+	ret := strings.FieldsFunc(string(buf), func(r rune) bool {
+		if r == '\u0000' {
+			return true
+		}
+		return false
+	})
+
+	return strings.Join(ret, " "), nil
+}
+
+func (p *Process) CmdlineSlice() ([]string, error) {
+	mib := []int32{CTLKern, KernProc, KernProcArgs, p.Pid}
+	buf, _, err := common.CallSyscall(mib)
+	if err != nil {
+		return nil, err
+	}
+	if len(buf) == 0 {
+		return nil, nil
+	}
+	if buf[len(buf)-1] == 0 {
+		buf = buf[:len(buf)-1]
+	}
+	parts := bytes.Split(buf, []byte{0})
+	var strParts []string
+	for _, p := range parts {
+		strParts = append(strParts, string(p))
+	}
+
+	return strParts, nil
+}
+func (p *Process) CreateTime() (int64, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Cwd() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Parent() (*Process, error) {
+	return p, common.ErrNotImplementedError
+}
+func (p *Process) Status() (string, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return "", err
+	}
+	var s string
+	switch k.Stat {
+	case SIDL:
+		s = "I"
+	case SRUN:
+		s = "R"
+	case SSLEEP:
+		s = "S"
+	case SSTOP:
+		s = "T"
+	case SZOMB:
+		s = "Z"
+	case SWAIT:
+		s = "W"
+	case SLOCK:
+		s = "L"
+	}
+
+	return s, nil
+}
+func (p *Process) Uids() ([]int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+
+	uids := make([]int32, 0, 3)
+
+	uids = append(uids, int32(k.Ruid), int32(k.Uid), int32(k.Svuid))
+
+	return uids, nil
+}
+func (p *Process) Gids() ([]int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+
+	gids := make([]int32, 0, 3)
+	gids = append(gids, int32(k.Rgid), int32(k.Ngroups), int32(k.Svgid))
+
+	return gids, nil
+}
+func (p *Process) Terminal() (string, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return "", err
+	}
+
+	ttyNr := uint64(k.Tdev)
+
+	termmap, err := getTerminalMap()
+	if err != nil {
+		return "", err
+	}
+
+	return termmap[ttyNr], nil
+}
+func (p *Process) Nice() (int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return 0, err
+	}
+	return int32(k.Nice), nil
+}
+func (p *Process) IOnice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Rlimit() ([]RlimitStat, error) {
+	var rlimit []RlimitStat
+	return rlimit, common.ErrNotImplementedError
+}
+func (p *Process) IOCounters() (*IOCountersStat, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+	return &IOCountersStat{
+		ReadCount:  uint64(k.Rusage.Inblock),
+		WriteCount: uint64(k.Rusage.Oublock),
+	}, nil
+}
+func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumFDs() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) NumThreads() (int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return 0, err
+	}
+
+	return k.Numthreads, nil
+}
+func (p *Process) Threads() (map[string]string, error) {
+	ret := make(map[string]string, 0)
+	return ret, common.ErrNotImplementedError
+}
+func (p *Process) Times() (*cpu.TimesStat, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+	return &cpu.TimesStat{
+		CPU:    "cpu",
+		User:   float64(k.Rusage.Utime.Sec) + float64(k.Rusage.Utime.Usec)/1000000,
+		System: float64(k.Rusage.Stime.Sec) + float64(k.Rusage.Stime.Usec)/1000000,
+	}, nil
+}
+func (p *Process) CPUAffinity() ([]int32, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+	v, err := syscall.Sysctl("vm.stats.vm.v_page_size")
+	if err != nil {
+		return nil, err
+	}
+	pageSize := common.LittleEndian.Uint16([]byte(v))
+
+	return &MemoryInfoStat{
+		RSS: uint64(k.Rssize) * uint64(pageSize),
+		VMS: uint64(k.Size),
+	}, nil
+}
+func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Children() ([]*Process, error) {
+	pids, err := common.CallPgrep(invoke, p.Pid)
+	if err != nil {
+		return nil, err
+	}
+	ret := make([]*Process, 0, len(pids))
+	for _, pid := range pids {
+		np, err := NewProcess(pid)
+		if err != nil {
+			return nil, err
+		}
+		ret = append(ret, np)
+	}
+	return ret, nil
+}
+
+func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Connections() ([]net.ConnectionStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) IsRunning() (bool, error) {
+	return true, common.ErrNotImplementedError
+}
+func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
+	var ret []MemoryMapsStat
+	return &ret, common.ErrNotImplementedError
+}
+
+func processes() ([]Process, error) {
+	results := make([]Process, 0, 50)
+
+	mib := []int32{CTLKern, KernProc, KernProcProc, 0}
+	buf, length, err := common.CallSyscall(mib)
+	if err != nil {
+		return results, err
+	}
+
+	// get kinfo_proc size
+	count := int(length / uint64(sizeOfKinfoProc))
+
+	// parse buf to procs
+	for i := 0; i < count; i++ {
+		b := buf[i*sizeOfKinfoProc : (i+1)*sizeOfKinfoProc]
+		k, err := parseKinfoProc(b)
+		if err != nil {
+			continue
+		}
+		p, err := NewProcess(int32(k.Pid))
+		if err != nil {
+			continue
+		}
+
+		results = append(results, *p)
+	}
+
+	return results, nil
+}
+
+func parseKinfoProc(buf []byte) (KinfoProc, error) {
+	var k KinfoProc
+	br := bytes.NewReader(buf)
+	err := common.Read(br, binary.LittleEndian, &k)
+	return k, err
+}
+
+func (p *Process) getKProc() (*KinfoProc, error) {
+	mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid}
+
+	buf, length, err := common.CallSyscall(mib)
+	if err != nil {
+		return nil, err
+	}
+	if length != sizeOfKinfoProc {
+		return nil, err
+	}
+
+	k, err := parseKinfoProc(buf)
+	if err != nil {
+		return nil, err
+	}
+	return &k, nil
+}
+
+func NewProcess(pid int32) (*Process, error) {
+	p := &Process{Pid: pid}
+
+	return p, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go
new file mode 100644
index 0000000000..201f714601
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go
@@ -0,0 +1,141 @@
+// +build freebsd
+// +build 386
+
+package process
+
+// copied from sys/sysctl.h
+const (
+	CTLKern          = 1  // "high kernel": proc, limits
+	KernProc         = 14 // struct: process entries
+	KernProcPID      = 1  // by process id
+	KernProcProc     = 8  // only return procs
+	KernProcPathname = 12 // path to executable
+	KernProcArgs     = 7  // get/set arguments/proctitle
+)
+
+const (
+	SIDL   = 1
+	SRUN   = 2
+	SSLEEP = 3
+	SSTOP  = 4
+	SZOMB  = 5
+	SWAIT  = 6
+	SLOCK  = 7
+)
+
+const (
+	sizeOfKinfoVmentry = 0x244 // TODO: really?
+	sizeOfKinfoProc    = 0x220
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+// copied from sys/user.h
+type KinfoProc struct {
+	Structsize   int32
+	Layout       int32
+	Args         int32
+	Paddr        int32
+	Addr         int32
+	Tracep       int32
+	Textvp       int32
+	Fd           int32
+	Vmspace      int32
+	Wchan        int32
+	Pid          int32
+	Ppid         int32
+	Pgid         int32
+	Tpgid        int32
+	Sid          int32
+	Tsid         int32
+	Jobc         [2]byte
+	SpareShort1  [2]byte
+	Tdev         int32
+	Siglist      [16]byte
+	Sigmask      [16]byte
+	Sigignore    [16]byte
+	Sigcatch     [16]byte
+	Uid          int32
+	Ruid         int32
+	Svuid        int32
+	Rgid         int32
+	Svgid        int32
+	Ngroups      int16
+	SpareShort2  [2]byte
+	Groups       [64]byte
+	Size         int32
+	Rssize       int32
+	Swrss        int32
+	Tsize        int32
+	Dsize        int32
+	Ssize        int32
+	Xstat        [2]byte
+	Acflag       [2]byte
+	Pctcpu       int32
+	Estcpu       int32
+	Slptime      int32
+	Swtime       int32
+	Cow          int32
+	Runtime      int64
+	Start        [8]byte
+	Childtime    [8]byte
+	Flag         int32
+	Kflag        int32
+	Traceflag    int32
+	Stat         int8
+	Nice         [1]byte
+	Lock         [1]byte
+	Rqindex      [1]byte
+	Oncpu        [1]byte
+	Lastcpu      [1]byte
+	Ocomm        [17]byte
+	Wmesg        [9]byte
+	Login        [18]byte
+	Lockname     [9]byte
+	Comm         [20]int8
+	Emul         [17]byte
+	Sparestrings [68]byte
+	Spareints    [36]byte
+	CrFlags      int32
+	Jid          int32
+	Numthreads   int32
+	Tid          int32
+	Pri          int32
+	Rusage       Rusage
+	RusageCh     [72]byte
+	Pcb          int32
+	Kstack       int32
+	Udata        int32
+	Tdaddr       int32
+	Spareptrs    [24]byte
+	Spareint64s  [48]byte
+	Sflag        int32
+	Tdflags      int32
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
new file mode 100644
index 0000000000..79e2ba8816
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
@@ -0,0 +1,192 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package process
+
+const (
+	CTLKern			= 1
+	KernProc		= 14
+	KernProcPID		= 1
+	KernProcProc		= 8
+	KernProcPathname	= 12
+	KernProcArgs		= 7
+)
+
+const (
+	sizeofPtr	= 0x8
+	sizeofShort	= 0x2
+	sizeofInt	= 0x4
+	sizeofLong	= 0x8
+	sizeofLongLong	= 0x8
+)
+
+const (
+	sizeOfKinfoVmentry	= 0x488
+	sizeOfKinfoProc		= 0x440
+)
+
+const (
+	SIDL	= 1
+	SRUN	= 2
+	SSLEEP	= 3
+	SSTOP	= 4
+	SZOMB	= 5
+	SWAIT	= 6
+	SLOCK	= 7
+)
+
+type (
+	_C_short	int16
+	_C_int		int32
+	_C_long		int64
+	_C_long_long	int64
+)
+
+type Timespec struct {
+	Sec	int64
+	Nsec	int64
+}
+
+type Timeval struct {
+	Sec	int64
+	Usec	int64
+}
+
+type Rusage struct {
+	Utime		Timeval
+	Stime		Timeval
+	Maxrss		int64
+	Ixrss		int64
+	Idrss		int64
+	Isrss		int64
+	Minflt		int64
+	Majflt		int64
+	Nswap		int64
+	Inblock		int64
+	Oublock		int64
+	Msgsnd		int64
+	Msgrcv		int64
+	Nsignals	int64
+	Nvcsw		int64
+	Nivcsw		int64
+}
+
+type Rlimit struct {
+	Cur	int64
+	Max	int64
+}
+
+type KinfoProc struct {
+	Structsize	int32
+	Layout		int32
+	Args		int64 /* pargs */
+	Paddr		int64 /* proc */
+	Addr		int64 /* user */
+	Tracep		int64 /* vnode */
+	Textvp		int64 /* vnode */
+	Fd		int64 /* filedesc */
+	Vmspace		int64 /* vmspace */
+	Wchan		int64
+	Pid		int32
+	Ppid		int32
+	Pgid		int32
+	Tpgid		int32
+	Sid		int32
+	Tsid		int32
+	Jobc		int16
+	Spare_short1	int16
+	Tdev		uint32
+	Siglist		[16]byte /* sigset */
+	Sigmask		[16]byte /* sigset */
+	Sigignore	[16]byte /* sigset */
+	Sigcatch	[16]byte /* sigset */
+	Uid		uint32
+	Ruid		uint32
+	Svuid		uint32
+	Rgid		uint32
+	Svgid		uint32
+	Ngroups		int16
+	Spare_short2	int16
+	Groups		[16]uint32
+	Size		uint64
+	Rssize		int64
+	Swrss		int64
+	Tsize		int64
+	Dsize		int64
+	Ssize		int64
+	Xstat		uint16
+	Acflag		uint16
+	Pctcpu		uint32
+	Estcpu		uint32
+	Slptime		uint32
+	Swtime		uint32
+	Cow		uint32
+	Runtime		uint64
+	Start		Timeval
+	Childtime	Timeval
+	Flag		int64
+	Kiflag		int64
+	Traceflag	int32
+	Stat		int8
+	Nice		int8
+	Lock		int8
+	Rqindex		int8
+	Oncpu		uint8
+	Lastcpu		uint8
+	Tdname		[17]int8
+	Wmesg		[9]int8
+	Login		[18]int8
+	Lockname	[9]int8
+	Comm		[20]int8
+	Emul		[17]int8
+	Loginclass	[18]int8
+	Sparestrings	[50]int8
+	Spareints	[7]int32
+	Flag2		int32
+	Fibnum		int32
+	Cr_flags	uint32
+	Jid		int32
+	Numthreads	int32
+	Tid		int32
+	Pri		Priority
+	Rusage		Rusage
+	Rusage_ch	Rusage
+	Pcb		int64 /* pcb */
+	Kstack		int64
+	Udata		int64
+	Tdaddr		int64 /* thread */
+	Spareptrs	[6]int64
+	Sparelongs	[12]int64
+	Sflag		int64
+	Tdflags		int64
+}
+
+type Priority struct {
+	Class	uint8
+	Level	uint8
+	Native	uint8
+	User	uint8
+}
+
+type KinfoVmentry struct {
+	Structsize		int32
+	Type			int32
+	Start			uint64
+	End			uint64
+	Offset			uint64
+	Vn_fileid		uint64
+	Vn_fsid			uint32
+	Flags			int32
+	Resident		int32
+	Private_resident	int32
+	Protection		int32
+	Ref_count		int32
+	Shadow_count		int32
+	Vn_type			int32
+	Vn_size			uint64
+	Vn_rdev			uint32
+	Vn_mode			uint16
+	Status			uint16
+	X_kve_ispare		[12]int32
+	Path			[1024]int8
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
new file mode 100644
index 0000000000..ae300412c2
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
@@ -0,0 +1,767 @@
+// +build linux
+
+package process
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/host"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
+)
+
+var ErrorNoChildren = errors.New("process does not have children")
+
+const (
+	PrioProcess = 0 // linux/resource.h
+)
+
+// MemoryInfoExStat is different between OSes
+type MemoryInfoExStat struct {
+	RSS    uint64 `json:"rss"`    // bytes
+	VMS    uint64 `json:"vms"`    // bytes
+	Shared uint64 `json:"shared"` // bytes
+	Text   uint64 `json:"text"`   // bytes
+	Lib    uint64 `json:"lib"`    // bytes
+	Data   uint64 `json:"data"`   // bytes
+	Dirty  uint64 `json:"dirty"`  // bytes
+}
+
+func (m MemoryInfoExStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
+
+type MemoryMapsStat struct {
+	Path         string `json:"path"`
+	Rss          uint64 `json:"rss"`
+	Size         uint64 `json:"size"`
+	Pss          uint64 `json:"pss"`
+	SharedClean  uint64 `json:"sharedClean"`
+	SharedDirty  uint64 `json:"sharedDirty"`
+	PrivateClean uint64 `json:"privateClean"`
+	PrivateDirty uint64 `json:"privateDirty"`
+	Referenced   uint64 `json:"referenced"`
+	Anonymous    uint64 `json:"anonymous"`
+	Swap         uint64 `json:"swap"`
+}
+
+// String returns JSON value of the process.
+func (m MemoryMapsStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
+
+// NewProcess creates a new Process instance, it only stores the pid and
+// checks that the process exists. Other method on Process can be used
+// to get more information about the process. An error will be returned
+// if the process does not exist.
+func NewProcess(pid int32) (*Process, error) {
+	p := &Process{
+		Pid: int32(pid),
+	}
+	file, err := os.Open(common.HostProc(strconv.Itoa(int(p.Pid))))
+	defer file.Close()
+	return p, err
+}
+
+// Ppid returns Parent Process ID of the process.
+func (p *Process) Ppid() (int32, error) {
+	_, ppid, _, _, _, err := p.fillFromStat()
+	if err != nil {
+		return -1, err
+	}
+	return ppid, nil
+}
+
+// Name returns name of the process.
+func (p *Process) Name() (string, error) {
+	if p.name == "" {
+		if err := p.fillFromStatus(); err != nil {
+			return "", err
+		}
+	}
+	return p.name, nil
+}
+
+// Exe returns executable path of the process.
+func (p *Process) Exe() (string, error) {
+	return p.fillFromExe()
+}
+
+// Cmdline returns the command line arguments of the process as a string with
+// each argument separated by 0x20 ascii character.
+func (p *Process) Cmdline() (string, error) {
+	return p.fillFromCmdline()
+}
+
+// CmdlineSlice returns the command line arguments of the process as a slice with each
+// element being an argument.
+func (p *Process) CmdlineSlice() ([]string, error) {
+	return p.fillSliceFromCmdline()
+}
+
+// CreateTime returns created time of the process in seconds since the epoch, in UTC.
+func (p *Process) CreateTime() (int64, error) {
+	_, _, _, createTime, _, err := p.fillFromStat()
+	if err != nil {
+		return 0, err
+	}
+	return createTime, nil
+}
+
+// Cwd returns current working directory of the process.
+func (p *Process) Cwd() (string, error) {
+	return p.fillFromCwd()
+}
+
+// Parent returns parent Process of the process.
+func (p *Process) Parent() (*Process, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return nil, err
+	}
+	if p.parent == 0 {
+		return nil, fmt.Errorf("wrong number of parents")
+	}
+	return NewProcess(p.parent)
+}
+
+// Status returns the process status.
+// Return value could be one of these.
+// R: Running S: Sleep T: Stop I: Idle
+// Z: Zombie W: Wait L: Lock
+// The charactor is same within all supported platforms.
+func (p *Process) Status() (string, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return "", err
+	}
+	return p.status, nil
+}
+
+// Uids returns user ids of the process as a slice of the int
+func (p *Process) Uids() ([]int32, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return []int32{}, err
+	}
+	return p.uids, nil
+}
+
+// Gids returns group ids of the process as a slice of the int
+func (p *Process) Gids() ([]int32, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return []int32{}, err
+	}
+	return p.gids, nil
+}
+
+// Terminal returns a terminal which is associated with the process.
+func (p *Process) Terminal() (string, error) {
+	terminal, _, _, _, _, err := p.fillFromStat()
+	if err != nil {
+		return "", err
+	}
+	return terminal, nil
+}
+
+// Nice returns a nice value (priority).
+// Notice: gopsutil can not set nice value.
+func (p *Process) Nice() (int32, error) {
+	_, _, _, _, nice, err := p.fillFromStat()
+	if err != nil {
+		return 0, err
+	}
+	return nice, nil
+}
+
+// IOnice returns process I/O nice value (priority).
+func (p *Process) IOnice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+
+// Rlimit returns Resource Limits.
+func (p *Process) Rlimit() ([]RlimitStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+// IOCounters returns IO Counters.
+func (p *Process) IOCounters() (*IOCountersStat, error) {
+	return p.fillFromIO()
+}
+
+// NumCtxSwitches returns the number of the context switches of the process.
+func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return nil, err
+	}
+	return p.numCtxSwitches, nil
+}
+
+// NumFDs returns the number of File Descriptors used by the process.
+func (p *Process) NumFDs() (int32, error) {
+	numFds, _, err := p.fillFromfd()
+	return numFds, err
+}
+
+// NumThreads returns the number of threads used by the process.
+func (p *Process) NumThreads() (int32, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return 0, err
+	}
+	return p.numThreads, nil
+}
+
+// Threads returns a map of threads
+//
+// Notice: Not implemented yet. always returns empty map.
+func (p *Process) Threads() (map[string]string, error) {
+	ret := make(map[string]string, 0)
+	return ret, nil
+}
+
+// Times returns CPU times of the process.
+func (p *Process) Times() (*cpu.TimesStat, error) {
+	_, _, cpuTimes, _, _, err := p.fillFromStat()
+	if err != nil {
+		return nil, err
+	}
+	return cpuTimes, nil
+}
+
+// CPUAffinity returns CPU affinity of the process.
+//
+// Notice: Not implemented yet.
+func (p *Process) CPUAffinity() ([]int32, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+// MemoryInfo returns platform in-dependend memory information, such as RSS, VMS and Swap
+func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
+	meminfo, _, err := p.fillFromStatm()
+	if err != nil {
+		return nil, err
+	}
+	return meminfo, nil
+}
+
+// MemoryInfoEx returns platform dependend memory information.
+func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
+	_, memInfoEx, err := p.fillFromStatm()
+	if err != nil {
+		return nil, err
+	}
+	return memInfoEx, nil
+}
+
+// Children returns a slice of Process of the process.
+func (p *Process) Children() ([]*Process, error) {
+	pids, err := common.CallPgrep(invoke, p.Pid)
+	if err != nil {
+		if pids == nil || len(pids) == 0 {
+			return nil, ErrorNoChildren
+		}
+		return nil, err
+	}
+	ret := make([]*Process, 0, len(pids))
+	for _, pid := range pids {
+		np, err := NewProcess(pid)
+		if err != nil {
+			return nil, err
+		}
+		ret = append(ret, np)
+	}
+	return ret, nil
+}
+
+// OpenFiles returns a slice of OpenFilesStat opend by the process.
+// OpenFilesStat includes a file path and file descriptor.
+func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
+	_, ofs, err := p.fillFromfd()
+	if err != nil {
+		return nil, err
+	}
+	ret := make([]OpenFilesStat, len(ofs))
+	for i, o := range ofs {
+		ret[i] = *o
+	}
+
+	return ret, nil
+}
+
+// Connections returns a slice of net.ConnectionStat used by the process.
+// This returns all kind of the connection. This measn TCP, UDP or UNIX.
+func (p *Process) Connections() ([]net.ConnectionStat, error) {
+	return net.ConnectionsPid("all", p.Pid)
+}
+
+// NetIOCounters returns NetIOCounters of the process.
+func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
+	filename := common.HostProc(strconv.Itoa(int(p.Pid)), "net/dev")
+	return net.IOCountersByFile(pernic, filename)
+}
+
+// IsRunning returns whether the process is running or not.
+// Not implemented yet.
+func (p *Process) IsRunning() (bool, error) {
+	return true, common.ErrNotImplementedError
+}
+
+// MemoryMaps get memory maps from /proc/(pid)/smaps
+func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
+	pid := p.Pid
+	var ret []MemoryMapsStat
+	smapsPath := common.HostProc(strconv.Itoa(int(pid)), "smaps")
+	contents, err := ioutil.ReadFile(smapsPath)
+	if err != nil {
+		return nil, err
+	}
+	lines := strings.Split(string(contents), "\n")
+
+	// function of parsing a block
+	getBlock := func(first_line []string, block []string) (MemoryMapsStat, error) {
+		m := MemoryMapsStat{}
+		m.Path = first_line[len(first_line)-1]
+
+		for _, line := range block {
+			if strings.Contains(line, "VmFlags") {
+				continue
+			}
+			field := strings.Split(line, ":")
+			if len(field) < 2 {
+				continue
+			}
+			v := strings.Trim(field[1], " kB") // remove last "kB"
+			t, err := strconv.ParseUint(v, 10, 64)
+			if err != nil {
+				return m, err
+			}
+
+			switch field[0] {
+			case "Size":
+				m.Size = t
+			case "Rss":
+				m.Rss = t
+			case "Pss":
+				m.Pss = t
+			case "Shared_Clean":
+				m.SharedClean = t
+			case "Shared_Dirty":
+				m.SharedDirty = t
+			case "Private_Clean":
+				m.PrivateClean = t
+			case "Private_Dirty":
+				m.PrivateDirty = t
+			case "Referenced":
+				m.Referenced = t
+			case "Anonymous":
+				m.Anonymous = t
+			case "Swap":
+				m.Swap = t
+			}
+		}
+		return m, nil
+	}
+
+	blocks := make([]string, 16)
+	for _, line := range lines {
+		field := strings.Split(line, " ")
+		if strings.HasSuffix(field[0], ":") == false {
+			// new block section
+			if len(blocks) > 0 {
+				g, err := getBlock(field, blocks)
+				if err != nil {
+					return &ret, err
+				}
+				ret = append(ret, g)
+			}
+			// starts new block
+			blocks = make([]string, 16)
+		} else {
+			blocks = append(blocks, line)
+		}
+	}
+
+	return &ret, nil
+}
+
+/**
+** Internal functions
+**/
+
+// Get num_fds from /proc/(pid)/fd
+func (p *Process) fillFromfd() (int32, []*OpenFilesStat, error) {
+	pid := p.Pid
+	statPath := common.HostProc(strconv.Itoa(int(pid)), "fd")
+	d, err := os.Open(statPath)
+	if err != nil {
+		return 0, nil, err
+	}
+	defer d.Close()
+	fnames, err := d.Readdirnames(-1)
+	numFDs := int32(len(fnames))
+
+	var openfiles []*OpenFilesStat
+	for _, fd := range fnames {
+		fpath := filepath.Join(statPath, fd)
+		filepath, err := os.Readlink(fpath)
+		if err != nil {
+			continue
+		}
+		t, err := strconv.ParseUint(fd, 10, 64)
+		if err != nil {
+			return numFDs, openfiles, err
+		}
+		o := &OpenFilesStat{
+			Path: filepath,
+			Fd:   t,
+		}
+		openfiles = append(openfiles, o)
+	}
+
+	return numFDs, openfiles, nil
+}
+
+// Get cwd from /proc/(pid)/cwd
+func (p *Process) fillFromCwd() (string, error) {
+	pid := p.Pid
+	cwdPath := common.HostProc(strconv.Itoa(int(pid)), "cwd")
+	cwd, err := os.Readlink(cwdPath)
+	if err != nil {
+		return "", err
+	}
+	return string(cwd), nil
+}
+
+// Get exe from /proc/(pid)/exe
+func (p *Process) fillFromExe() (string, error) {
+	pid := p.Pid
+	exePath := common.HostProc(strconv.Itoa(int(pid)), "exe")
+	exe, err := os.Readlink(exePath)
+	if err != nil {
+		return "", err
+	}
+	return string(exe), nil
+}
+
+// Get cmdline from /proc/(pid)/cmdline
+func (p *Process) fillFromCmdline() (string, error) {
+	pid := p.Pid
+	cmdPath := common.HostProc(strconv.Itoa(int(pid)), "cmdline")
+	cmdline, err := ioutil.ReadFile(cmdPath)
+	if err != nil {
+		return "", err
+	}
+	ret := strings.FieldsFunc(string(cmdline), func(r rune) bool {
+		if r == '\u0000' {
+			return true
+		}
+		return false
+	})
+
+	return strings.Join(ret, " "), nil
+}
+
+func (p *Process) fillSliceFromCmdline() ([]string, error) {
+	pid := p.Pid
+	cmdPath := common.HostProc(strconv.Itoa(int(pid)), "cmdline")
+	cmdline, err := ioutil.ReadFile(cmdPath)
+	if err != nil {
+		return nil, err
+	}
+	if len(cmdline) == 0 {
+		return nil, nil
+	}
+	if cmdline[len(cmdline)-1] == 0 {
+		cmdline = cmdline[:len(cmdline)-1]
+	}
+	parts := bytes.Split(cmdline, []byte{0})
+	var strParts []string
+	for _, p := range parts {
+		strParts = append(strParts, string(p))
+	}
+
+	return strParts, nil
+}
+
+// Get IO status from /proc/(pid)/io
+func (p *Process) fillFromIO() (*IOCountersStat, error) {
+	pid := p.Pid
+	ioPath := common.HostProc(strconv.Itoa(int(pid)), "io")
+	ioline, err := ioutil.ReadFile(ioPath)
+	if err != nil {
+		return nil, err
+	}
+	lines := strings.Split(string(ioline), "\n")
+	ret := &IOCountersStat{}
+
+	for _, line := range lines {
+		field := strings.Fields(line)
+		if len(field) < 2 {
+			continue
+		}
+		t, err := strconv.ParseUint(field[1], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		param := field[0]
+		if strings.HasSuffix(param, ":") {
+			param = param[:len(param)-1]
+		}
+		switch param {
+		case "syscr":
+			ret.ReadCount = t
+		case "syscw":
+			ret.WriteCount = t
+		case "readBytes":
+			ret.ReadBytes = t
+		case "writeBytes":
+			ret.WriteBytes = t
+		}
+	}
+
+	return ret, nil
+}
+
+// Get memory info from /proc/(pid)/statm
+func (p *Process) fillFromStatm() (*MemoryInfoStat, *MemoryInfoExStat, error) {
+	pid := p.Pid
+	memPath := common.HostProc(strconv.Itoa(int(pid)), "statm")
+	contents, err := ioutil.ReadFile(memPath)
+	if err != nil {
+		return nil, nil, err
+	}
+	fields := strings.Split(string(contents), " ")
+
+	vms, err := strconv.ParseUint(fields[0], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	rss, err := strconv.ParseUint(fields[1], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	memInfo := &MemoryInfoStat{
+		RSS: rss * PageSize,
+		VMS: vms * PageSize,
+	}
+
+	shared, err := strconv.ParseUint(fields[2], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	text, err := strconv.ParseUint(fields[3], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	lib, err := strconv.ParseUint(fields[4], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	dirty, err := strconv.ParseUint(fields[5], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	memInfoEx := &MemoryInfoExStat{
+		RSS:    rss * PageSize,
+		VMS:    vms * PageSize,
+		Shared: shared * PageSize,
+		Text:   text * PageSize,
+		Lib:    lib * PageSize,
+		Dirty:  dirty * PageSize,
+	}
+
+	return memInfo, memInfoEx, nil
+}
+
+// Get various status from /proc/(pid)/status
+func (p *Process) fillFromStatus() error {
+	pid := p.Pid
+	statPath := common.HostProc(strconv.Itoa(int(pid)), "status")
+	contents, err := ioutil.ReadFile(statPath)
+	if err != nil {
+		return err
+	}
+	lines := strings.Split(string(contents), "\n")
+	p.numCtxSwitches = &NumCtxSwitchesStat{}
+	p.memInfo = &MemoryInfoStat{}
+	for _, line := range lines {
+		tabParts := strings.SplitN(line, "\t", 2)
+		if len(tabParts) < 2 {
+			continue
+		}
+		value := tabParts[1]
+		switch strings.TrimRight(tabParts[0], ":") {
+		case "Name":
+			p.name = strings.Trim(value, " \t")
+		case "State":
+			p.status = value[0:1]
+		case "PPid", "Ppid":
+			pval, err := strconv.ParseInt(value, 10, 32)
+			if err != nil {
+				return err
+			}
+			p.parent = int32(pval)
+		case "Uid":
+			p.uids = make([]int32, 0, 4)
+			for _, i := range strings.Split(value, "\t") {
+				v, err := strconv.ParseInt(i, 10, 32)
+				if err != nil {
+					return err
+				}
+				p.uids = append(p.uids, int32(v))
+			}
+		case "Gid":
+			p.gids = make([]int32, 0, 4)
+			for _, i := range strings.Split(value, "\t") {
+				v, err := strconv.ParseInt(i, 10, 32)
+				if err != nil {
+					return err
+				}
+				p.gids = append(p.gids, int32(v))
+			}
+		case "Threads":
+			v, err := strconv.ParseInt(value, 10, 32)
+			if err != nil {
+				return err
+			}
+			p.numThreads = int32(v)
+		case "voluntary_ctxt_switches":
+			v, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.numCtxSwitches.Voluntary = v
+		case "nonvoluntary_ctxt_switches":
+			v, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.numCtxSwitches.Involuntary = v
+		case "VmRSS":
+			value := strings.Trim(value, " kB") // remove last "kB"
+			v, err := strconv.ParseUint(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.memInfo.RSS = v * 1024
+		case "VmSize":
+			value := strings.Trim(value, " kB") // remove last "kB"
+			v, err := strconv.ParseUint(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.memInfo.VMS = v * 1024
+		case "VmSwap":
+			value := strings.Trim(value, " kB") // remove last "kB"
+			v, err := strconv.ParseUint(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.memInfo.Swap = v * 1024
+		}
+
+	}
+	return nil
+}
+
+func (p *Process) fillFromStat() (string, int32, *cpu.TimesStat, int64, int32, error) {
+	pid := p.Pid
+	statPath := common.HostProc(strconv.Itoa(int(pid)), "stat")
+	contents, err := ioutil.ReadFile(statPath)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+	fields := strings.Fields(string(contents))
+
+	i := 1
+	for !strings.HasSuffix(fields[i], ")") {
+		i++
+	}
+
+	termmap, err := getTerminalMap()
+	terminal := ""
+	if err == nil {
+		t, err := strconv.ParseUint(fields[i+5], 10, 64)
+		if err != nil {
+			return "", 0, nil, 0, 0, err
+		}
+		terminal = termmap[t]
+	}
+
+	ppid, err := strconv.ParseInt(fields[i+2], 10, 32)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+	utime, err := strconv.ParseFloat(fields[i+12], 64)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+
+	stime, err := strconv.ParseFloat(fields[i+13], 64)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+
+	cpuTimes := &cpu.TimesStat{
+		CPU:    "cpu",
+		User:   float64(utime / ClockTicks),
+		System: float64(stime / ClockTicks),
+	}
+
+	bootTime, _ := host.BootTime()
+	t, err := strconv.ParseUint(fields[i+20], 10, 64)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+	ctime := (t / uint64(ClockTicks)) + uint64(bootTime)
+	createTime := int64(ctime * 1000)
+
+	//	p.Nice = mustParseInt32(fields[18])
+	// use syscall instead of parse Stat file
+	snice, _ := syscall.Getpriority(PrioProcess, int(pid))
+	nice := int32(snice) // FIXME: is this true?
+
+	return terminal, int32(ppid), cpuTimes, createTime, nice, nil
+}
+
+// Pids returns a slice of process ID list which are running now.
+func Pids() ([]int32, error) {
+	var ret []int32
+
+	d, err := os.Open(common.HostProc())
+	if err != nil {
+		return nil, err
+	}
+	defer d.Close()
+
+	fnames, err := d.Readdirnames(-1)
+	if err != nil {
+		return nil, err
+	}
+	for _, fname := range fnames {
+		pid, err := strconv.ParseInt(fname, 10, 32)
+		if err != nil {
+			// if not numeric name, just skip
+			continue
+		}
+		ret = append(ret, int32(pid))
+	}
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go
new file mode 100644
index 0000000000..541b854c75
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go
@@ -0,0 +1,9 @@
+// +build linux
+// +build 386
+
+package process
+
+const (
+	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
+	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
+)
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go
new file mode 100644
index 0000000000..b4a4ce8b7c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go
@@ -0,0 +1,9 @@
+// +build linux
+// +build amd64
+
+package process
+
+const (
+	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
+	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
+)
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go
new file mode 100644
index 0000000000..c6123a4891
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go
@@ -0,0 +1,9 @@
+// +build linux
+// +build arm
+
+package process
+
+const (
+	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
+	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
+)
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
new file mode 100644
index 0000000000..8853118ac6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
@@ -0,0 +1,117 @@
+// +build linux freebsd darwin
+
+package process
+
+import (
+	"os"
+	"os/exec"
+	"os/user"
+	"strconv"
+	"strings"
+	"syscall"
+)
+
+// POSIX
+func getTerminalMap() (map[uint64]string, error) {
+	ret := make(map[uint64]string)
+	var termfiles []string
+
+	d, err := os.Open("/dev")
+	if err != nil {
+		return nil, err
+	}
+	defer d.Close()
+
+	devnames, err := d.Readdirnames(-1)
+	for _, devname := range devnames {
+		if strings.HasPrefix(devname, "/dev/tty") {
+			termfiles = append(termfiles, "/dev/tty/"+devname)
+		}
+	}
+
+	ptsd, err := os.Open("/dev/pts")
+	if err != nil {
+		return nil, err
+	}
+	defer ptsd.Close()
+
+	ptsnames, err := ptsd.Readdirnames(-1)
+	for _, ptsname := range ptsnames {
+		termfiles = append(termfiles, "/dev/pts/"+ptsname)
+	}
+
+	for _, name := range termfiles {
+		stat := syscall.Stat_t{}
+		if err = syscall.Stat(name, &stat); err != nil {
+			return nil, err
+		}
+		rdev := uint64(stat.Rdev)
+		ret[rdev] = strings.Replace(name, "/dev", "", -1)
+	}
+	return ret, nil
+}
+
+// SendSignal sends a syscall.Signal to the process.
+// Currently, SIGSTOP, SIGCONT, SIGTERM and SIGKILL are supported.
+func (p *Process) SendSignal(sig syscall.Signal) error {
+	sigAsStr := "INT"
+	switch sig {
+	case syscall.SIGSTOP:
+		sigAsStr = "STOP"
+	case syscall.SIGCONT:
+		sigAsStr = "CONT"
+	case syscall.SIGTERM:
+		sigAsStr = "TERM"
+	case syscall.SIGKILL:
+		sigAsStr = "KILL"
+	}
+
+	kill, err := exec.LookPath("kill")
+	if err != nil {
+		return err
+	}
+	cmd := exec.Command(kill, "-s", sigAsStr, strconv.Itoa(int(p.Pid)))
+	cmd.Stderr = os.Stderr
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Suspend sends SIGSTOP to the process.
+func (p *Process) Suspend() error {
+	return p.SendSignal(syscall.SIGSTOP)
+}
+
+// Resume sends SIGCONT to the process.
+func (p *Process) Resume() error {
+	return p.SendSignal(syscall.SIGCONT)
+}
+
+// Terminate sends SIGTERM to the process.
+func (p *Process) Terminate() error {
+	return p.SendSignal(syscall.SIGTERM)
+}
+
+// Kill sends SIGKILL to the process.
+func (p *Process) Kill() error {
+	return p.SendSignal(syscall.SIGKILL)
+}
+
+// Username returns a username of the process.
+func (p *Process) Username() (string, error) {
+	uids, err := p.Uids()
+	if err != nil {
+		return "", err
+	}
+	if len(uids) > 0 {
+		u, err := user.LookupId(strconv.Itoa(int(uids[0])))
+		if err != nil {
+			return "", err
+		}
+		return u.Username, nil
+	}
+	return "", nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go
new file mode 100644
index 0000000000..3176cde05a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go
@@ -0,0 +1,357 @@
+// +build windows
+
+package process
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+	"syscall"
+	"time"
+	"unsafe"
+
+	"github.com/StackExchange/wmi"
+	"github.com/shirou/w32"
+
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	net "github.com/shirou/gopsutil/net"
+)
+
+const (
+	NoMoreFiles   = 0x12
+	MaxPathLength = 260
+)
+
+type SystemProcessInformation struct {
+	NextEntryOffset   uint64
+	NumberOfThreads   uint64
+	Reserved1         [48]byte
+	Reserved2         [3]byte
+	UniqueProcessID   uintptr
+	Reserved3         uintptr
+	HandleCount       uint64
+	Reserved4         [4]byte
+	Reserved5         [11]byte
+	PeakPagefileUsage uint64
+	PrivatePageCount  uint64
+	Reserved6         [6]uint64
+}
+
+// Memory_info_ex is different between OSes
+type MemoryInfoExStat struct {
+}
+
+type MemoryMapsStat struct {
+}
+
+type Win32_Process struct {
+	Name           string
+	ExecutablePath *string
+	CommandLine    *string
+	Priority       uint32
+	CreationDate   *time.Time
+	ProcessID      uint32
+	ThreadCount    uint32
+
+	/*
+		CSCreationClassName   string
+		CSName                string
+		Caption               *string
+		CreationClassName     string
+		Description           *string
+		ExecutionState        *uint16
+		HandleCount           uint32
+		KernelModeTime        uint64
+		MaximumWorkingSetSize *uint32
+		MinimumWorkingSetSize *uint32
+		OSCreationClassName   string
+		OSName                string
+		OtherOperationCount   uint64
+		OtherTransferCount    uint64
+		PageFaults            uint32
+		PageFileUsage         uint32
+		ParentProcessID       uint32
+		PeakPageFileUsage     uint32
+		PeakVirtualSize       uint64
+		PeakWorkingSetSize    uint32
+		PrivatePageCount      uint64
+		ReadOperationCount    uint64
+		ReadTransferCount     uint64
+		Status                *string
+		TerminationDate       *time.Time
+		UserModeTime          uint64
+		WorkingSetSize        uint64
+		WriteOperationCount   uint64
+		WriteTransferCount    uint64
+	*/
+}
+
+func Pids() ([]int32, error) {
+	var ret []int32
+
+	procs, err := processes()
+	if err != nil {
+		return ret, nil
+	}
+
+	for _, proc := range procs {
+		ret = append(ret, proc.Pid)
+	}
+
+	return ret, nil
+}
+
+func (p *Process) Ppid() (int32, error) {
+	ret, _, _, err := p.getFromSnapProcess(p.Pid)
+	if err != nil {
+		return 0, err
+	}
+	return ret, nil
+}
+
+func GetWin32Proc(pid int32) ([]Win32_Process, error) {
+	var dst []Win32_Process
+	query := fmt.Sprintf("WHERE ProcessId = %d", pid)
+	q := wmi.CreateQuery(&dst, query)
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return []Win32_Process{}, fmt.Errorf("could not get win32Proc: %s", err)
+	}
+	if len(dst) != 1 {
+		return []Win32_Process{}, fmt.Errorf("could not get win32Proc: empty")
+	}
+	return dst, nil
+}
+
+func (p *Process) Name() (string, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return "", fmt.Errorf("could not get Name: %s", err)
+	}
+	return dst[0].Name, nil
+}
+func (p *Process) Exe() (string, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return "", fmt.Errorf("could not get ExecutablePath: %s", err)
+	}
+	return *dst[0].ExecutablePath, nil
+}
+func (p *Process) Cmdline() (string, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return "", fmt.Errorf("could not get CommandLine: %s", err)
+	}
+	return *dst[0].CommandLine, nil
+}
+
+// CmdlineSlice returns the command line arguments of the process as a slice with each
+// element being an argument. This merely returns the CommandLine informations passed
+// to the process split on the 0x20 ASCII character.
+func (p *Process) CmdlineSlice() ([]string, error) {
+	cmdline, err := p.Cmdline()
+	if err != nil {
+		return nil, err
+	}
+	return strings.Split(cmdline, " "), nil
+}
+
+func (p *Process) CreateTime() (int64, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return 0, fmt.Errorf("could not get CreationDate: %s", err)
+	}
+	date := *dst[0].CreationDate
+	return date.Unix(), nil
+}
+
+func (p *Process) Cwd() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Parent() (*Process, error) {
+	return p, common.ErrNotImplementedError
+}
+func (p *Process) Status() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Username() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Uids() ([]int32, error) {
+	var uids []int32
+
+	return uids, common.ErrNotImplementedError
+}
+func (p *Process) Gids() ([]int32, error) {
+	var gids []int32
+	return gids, common.ErrNotImplementedError
+}
+func (p *Process) Terminal() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+
+// Nice returnes priority in Windows
+func (p *Process) Nice() (int32, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return 0, fmt.Errorf("could not get Priority: %s", err)
+	}
+	return int32(dst[0].Priority), nil
+}
+func (p *Process) IOnice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Rlimit() ([]RlimitStat, error) {
+	var rlimit []RlimitStat
+
+	return rlimit, common.ErrNotImplementedError
+}
+func (p *Process) IOCounters() (*IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumFDs() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) NumThreads() (int32, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return 0, fmt.Errorf("could not get ThreadCount: %s", err)
+	}
+	return int32(dst[0].ThreadCount), nil
+}
+func (p *Process) Threads() (map[string]string, error) {
+	ret := make(map[string]string, 0)
+	return ret, common.ErrNotImplementedError
+}
+func (p *Process) Times() (*cpu.TimesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) CPUAffinity() ([]int32, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Children() ([]*Process, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Connections() ([]net.ConnectionStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) IsRunning() (bool, error) {
+	return true, common.ErrNotImplementedError
+}
+
+func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
+	var ret []MemoryMapsStat
+	return &ret, common.ErrNotImplementedError
+}
+
+func NewProcess(pid int32) (*Process, error) {
+	p := &Process{Pid: pid}
+
+	return p, nil
+}
+
+func (p *Process) SendSignal(sig syscall.Signal) error {
+	return common.ErrNotImplementedError
+}
+
+func (p *Process) Suspend() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Resume() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Terminate() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Kill() error {
+	return common.ErrNotImplementedError
+}
+
+func (p *Process) getFromSnapProcess(pid int32) (int32, int32, string, error) {
+	snap := w32.CreateToolhelp32Snapshot(w32.TH32CS_SNAPPROCESS, uint32(pid))
+	if snap == 0 {
+		return 0, 0, "", syscall.GetLastError()
+	}
+	defer w32.CloseHandle(snap)
+	var pe32 w32.PROCESSENTRY32
+	pe32.DwSize = uint32(unsafe.Sizeof(pe32))
+	if w32.Process32First(snap, &pe32) == false {
+		return 0, 0, "", syscall.GetLastError()
+	}
+
+	if pe32.Th32ProcessID == uint32(pid) {
+		szexe := syscall.UTF16ToString(pe32.SzExeFile[:])
+		return int32(pe32.Th32ParentProcessID), int32(pe32.CntThreads), szexe, nil
+	}
+
+	for w32.Process32Next(snap, &pe32) {
+		if pe32.Th32ProcessID == uint32(pid) {
+			szexe := syscall.UTF16ToString(pe32.SzExeFile[:])
+			return int32(pe32.Th32ParentProcessID), int32(pe32.CntThreads), szexe, nil
+		}
+	}
+	return 0, 0, "", errors.New("Couldn't find pid:" + string(pid))
+}
+
+// Get processes
+func processes() ([]*Process, error) {
+
+	var dst []Win32_Process
+	q := wmi.CreateQuery(&dst, "")
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return []*Process{}, err
+	}
+	if len(dst) == 0 {
+		return []*Process{}, fmt.Errorf("could not get Process")
+	}
+	results := make([]*Process, 0, len(dst))
+	for _, proc := range dst {
+		p, err := NewProcess(int32(proc.ProcessID))
+		if err != nil {
+			continue
+		}
+		results = append(results, p)
+	}
+
+	return results, nil
+}
+
+func getProcInfo(pid int32) (*SystemProcessInformation, error) {
+	initialBufferSize := uint64(0x4000)
+	bufferSize := initialBufferSize
+	buffer := make([]byte, bufferSize)
+
+	var sysProcInfo SystemProcessInformation
+	ret, _, _ := common.ProcNtQuerySystemInformation.Call(
+		uintptr(unsafe.Pointer(&sysProcInfo)),
+		uintptr(unsafe.Pointer(&buffer[0])),
+		uintptr(unsafe.Pointer(&bufferSize)),
+		uintptr(unsafe.Pointer(&bufferSize)))
+	if ret != 0 {
+		return nil, syscall.GetLastError()
+	}
+
+	return &sysProcInfo, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go
new file mode 100644
index 0000000000..21216cd09a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go
@@ -0,0 +1,160 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Hand Writing
+// - all pointer in ExternProc to uint64
+
+// +build ignore
+
+/*
+Input to cgo -godefs.
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+// +godefs map struct_ [16]byte /* in6_addr */
+
+package process
+
+/*
+#define __DARWIN_UNIX03 0
+#define KERNEL
+#define _DARWIN_USE_64_BIT_INODE
+#include <dirent.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <termios.h>
+#include <unistd.h>
+#include <mach/mach.h>
+#include <mach/message.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <net/bpf.h>
+#include <net/if_dl.h>
+#include <net/if_var.h>
+#include <net/route.h>
+#include <netinet/in.h>
+
+#include <sys/sysctl.h>
+#include <sys/ucred.h>
+#include <sys/proc.h>
+#include <sys/time.h>
+#include <sys/_types/_timeval.h>
+#include <sys/appleapiopts.h>
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <bsm/audit.h>
+#include <sys/queue.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+struct ucred_queue {
+        struct ucred *tqe_next;
+        struct ucred **tqe_prev;
+        TRACEBUF
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type UGid_t C.gid_t
+
+type KinfoProc C.struct_kinfo_proc
+
+type Eproc C.struct_eproc
+
+type Proc C.struct_proc
+
+type Session C.struct_session
+
+type ucred C.struct_ucred
+
+type Uucred C.struct__ucred
+
+type Upcred C.struct__pcred
+
+type Vmspace C.struct_vmspace
+
+type Sigacts C.struct_sigacts
+
+type ExternProc C.struct_extern_proc
+
+type Itimerval C.struct_itimerval
+
+type Vnode C.struct_vnode
+
+type Pgrp C.struct_pgrp
+
+type UserStruct C.struct_user
+
+type Au_session C.struct_au_session
+
+type Posix_cred C.struct_posix_cred
+
+type Label C.struct_label
+
+type AuditinfoAddr C.struct_auditinfo_addr
+type AuMask C.struct_au_mask
+type AuTidAddr C.struct_au_tid_addr
+
+// TAILQ(ucred)
+type UcredQueue C.struct_ucred_queue
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_freebsd.go
new file mode 100644
index 0000000000..aa7b3462de
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_freebsd.go
@@ -0,0 +1,95 @@
+// +build ignore
+
+// We still need editing by hands.
+// go tool cgo -godefs types_freebsd.go | sed 's/\*int64/int64/' | sed 's/\*byte/int64/'  > process_freebsd_amd64.go
+
+/*
+Input to cgo -godefs.
+*/
+
+// +godefs map struct_pargs int64 /* pargs */
+// +godefs map struct_proc int64 /* proc */
+// +godefs map struct_user int64 /* user */
+// +godefs map struct_vnode int64 /* vnode */
+// +godefs map struct_vnode int64 /* vnode */
+// +godefs map struct_filedesc int64 /* filedesc */
+// +godefs map struct_vmspace int64 /* vmspace */
+// +godefs map struct_pcb int64 /* pcb */
+// +godefs map struct_thread int64 /* thread */
+// +godefs map struct___sigset [16]byte /* sigset */
+
+package process
+
+/*
+#include <sys/types.h>
+#include <sys/user.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	CTLKern          = 1  // "high kernel": proc, limits
+	KernProc         = 14 // struct: process entries
+	KernProcPID      = 1  // by process id
+	KernProcProc     = 8  // only return procs
+	KernProcPathname = 12 // path to executable
+	KernProcArgs     = 7  // get/set arguments/proctitle
+)
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+const (
+	sizeOfKinfoVmentry = C.sizeof_struct_kinfo_vmentry
+	sizeOfKinfoProc    = C.sizeof_struct_kinfo_proc
+)
+
+// from sys/proc.h
+const (
+	SIDL   = 1 /* Process being created by fork. */
+	SRUN   = 2 /* Currently runnable. */
+	SSLEEP = 3 /* Sleeping on an address. */
+	SSTOP  = 4 /* Process debugging or suspension. */
+	SZOMB  = 5 /* Awaiting collection by parent. */
+	SWAIT  = 6 /* Waiting for interrupt. */
+	SLOCK  = 7 /* Blocked on a lock. */
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type KinfoProc C.struct_kinfo_proc
+
+type Priority C.struct_priority
+
+type KinfoVmentry C.struct_kinfo_vmentry
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/AUTHORS b/Godeps/_workspace/src/github.com/shirou/w32/AUTHORS
new file mode 100644
index 0000000000..c0785e8203
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/AUTHORS
@@ -0,0 +1,16 @@
+# This is the official list of 'w32' authors for copyright purposes.
+
+# Names should be added to this file as
+#   Name or Organization <email address>
+# The email address is not required for organizations.
+
+# Please keep the list sorted.
+
+# Contributors
+# ============
+
+Allen Dang <allengnr@gmail.com>
+Benny Siegert <bsiegert@gmail.com>
+Bruno Bigras <bigras.bruno@gmail.com>
+Gerald Rosenberg <gerald.rosenberg@gmail.com>
+Michael Henke
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/LICENSE b/Godeps/_workspace/src/github.com/shirou/w32/LICENSE
new file mode 100644
index 0000000000..9f36608c87
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2010-2012 The w32 Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/README.md b/Godeps/_workspace/src/github.com/shirou/w32/README.md
new file mode 100644
index 0000000000..ed196e7661
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/README.md
@@ -0,0 +1,33 @@
+About w32
+==========
+
+w32 is a wrapper of windows apis for the Go Programming Language.
+
+It wraps win32 apis to "Go style" to make them easier to use.
+
+Setup
+=====
+
+1. Make sure you have a working Go installation and build environment, 
+   see this go-nuts post for details:
+   http://groups.google.com/group/golang-nuts/msg/5c87630a84f4fd0c
+   
+   Updated versions of the Windows Go build are available here:
+   http://code.google.com/p/gomingw/downloads/list
+   
+2. Create a "gopath" directory if you do not have one yet and set the
+   GOPATH variable accordingly. For example:
+   mkdir -p go-externals/src
+   export GOPATH=${PWD}/go-externals
+
+3. go get github.com/AllenDang/w32
+
+4. go install github.com/AllenDang/w32...
+
+Contribute
+==========
+
+Contributions in form of design, code, documentation, bug reporting or other
+ways you see fit are very welcome.
+
+Thank You!
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/advapi32.go b/Godeps/_workspace/src/github.com/shirou/w32/advapi32.go
new file mode 100644
index 0000000000..2f8a4fe010
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/advapi32.go
@@ -0,0 +1,299 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"errors"
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modadvapi32 = syscall.NewLazyDLL("advapi32.dll")
+
+	procRegCreateKeyEx = modadvapi32.NewProc("RegCreateKeyExW")
+	procRegOpenKeyEx   = modadvapi32.NewProc("RegOpenKeyExW")
+	procRegCloseKey    = modadvapi32.NewProc("RegCloseKey")
+	procRegGetValue    = modadvapi32.NewProc("RegGetValueW")
+	procRegEnumKeyEx   = modadvapi32.NewProc("RegEnumKeyExW")
+	//	procRegSetKeyValue     = modadvapi32.NewProc("RegSetKeyValueW")
+	procRegSetValueEx      = modadvapi32.NewProc("RegSetValueExW")
+	procOpenEventLog       = modadvapi32.NewProc("OpenEventLogW")
+	procReadEventLog       = modadvapi32.NewProc("ReadEventLogW")
+	procCloseEventLog      = modadvapi32.NewProc("CloseEventLog")
+	procOpenSCManager      = modadvapi32.NewProc("OpenSCManagerW")
+	procCloseServiceHandle = modadvapi32.NewProc("CloseServiceHandle")
+	procOpenService        = modadvapi32.NewProc("OpenServiceW")
+	procStartService       = modadvapi32.NewProc("StartServiceW")
+	procControlService     = modadvapi32.NewProc("ControlService")
+)
+
+func RegCreateKey(hKey HKEY, subKey string) HKEY {
+	var result HKEY
+	ret, _, _ := procRegCreateKeyEx.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(0),
+		uintptr(0),
+		uintptr(0),
+		uintptr(KEY_ALL_ACCESS),
+		uintptr(0),
+		uintptr(unsafe.Pointer(&result)),
+		uintptr(0))
+	_ = ret
+	return result
+}
+
+func RegOpenKeyEx(hKey HKEY, subKey string, samDesired uint32) HKEY {
+	var result HKEY
+	ret, _, _ := procRegOpenKeyEx.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(0),
+		uintptr(samDesired),
+		uintptr(unsafe.Pointer(&result)))
+
+	if ret != ERROR_SUCCESS {
+		panic(fmt.Sprintf("RegOpenKeyEx(%d, %s, %d) failed", hKey, subKey, samDesired))
+	}
+	return result
+}
+
+func RegCloseKey(hKey HKEY) error {
+	var err error
+	ret, _, _ := procRegCloseKey.Call(
+		uintptr(hKey))
+
+	if ret != ERROR_SUCCESS {
+		err = errors.New("RegCloseKey failed")
+	}
+	return err
+}
+
+func RegGetRaw(hKey HKEY, subKey string, value string) []byte {
+	var bufLen uint32
+	var valptr unsafe.Pointer
+	if len(value) > 0 {
+		valptr = unsafe.Pointer(syscall.StringToUTF16Ptr(value))
+	}
+	procRegGetValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(valptr),
+		uintptr(RRF_RT_ANY),
+		0,
+		0,
+		uintptr(unsafe.Pointer(&bufLen)))
+
+	if bufLen == 0 {
+		return nil
+	}
+
+	buf := make([]byte, bufLen)
+	ret, _, _ := procRegGetValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(valptr),
+		uintptr(RRF_RT_ANY),
+		0,
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&bufLen)))
+
+	if ret != ERROR_SUCCESS {
+		return nil
+	}
+
+	return buf
+}
+
+func RegSetBinary(hKey HKEY, subKey string, value []byte) (errno int) {
+	var lptr, vptr unsafe.Pointer
+	if len(subKey) > 0 {
+		lptr = unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))
+	}
+	if len(value) > 0 {
+		vptr = unsafe.Pointer(&value[0])
+	}
+	ret, _, _ := procRegSetValueEx.Call(
+		uintptr(hKey),
+		uintptr(lptr),
+		uintptr(0),
+		uintptr(REG_BINARY),
+		uintptr(vptr),
+		uintptr(len(value)))
+
+	return int(ret)
+}
+
+func RegGetString(hKey HKEY, subKey string, value string) string {
+	var bufLen uint32
+	procRegGetValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(value))),
+		uintptr(RRF_RT_REG_SZ),
+		0,
+		0,
+		uintptr(unsafe.Pointer(&bufLen)))
+
+	if bufLen == 0 {
+		return ""
+	}
+
+	buf := make([]uint16, bufLen)
+	ret, _, _ := procRegGetValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(value))),
+		uintptr(RRF_RT_REG_SZ),
+		0,
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&bufLen)))
+
+	if ret != ERROR_SUCCESS {
+		return ""
+	}
+
+	return syscall.UTF16ToString(buf)
+}
+
+/*
+func RegSetKeyValue(hKey HKEY, subKey string, valueName string, dwType uint32, data uintptr, cbData uint16) (errno int) {
+	ret, _, _ := procRegSetKeyValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(valueName))),
+		uintptr(dwType),
+		data,
+		uintptr(cbData))
+
+	return int(ret)
+}
+*/
+
+func RegEnumKeyEx(hKey HKEY, index uint32) string {
+	var bufLen uint32 = 255
+	buf := make([]uint16, bufLen)
+	procRegEnumKeyEx.Call(
+		uintptr(hKey),
+		uintptr(index),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&bufLen)),
+		0,
+		0,
+		0,
+		0)
+	return syscall.UTF16ToString(buf)
+}
+
+func OpenEventLog(servername string, sourcename string) HANDLE {
+	ret, _, _ := procOpenEventLog.Call(
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(servername))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(sourcename))))
+
+	return HANDLE(ret)
+}
+
+func ReadEventLog(eventlog HANDLE, readflags, recordoffset uint32, buffer []byte, numberofbytestoread uint32, bytesread, minnumberofbytesneeded *uint32) bool {
+	ret, _, _ := procReadEventLog.Call(
+		uintptr(eventlog),
+		uintptr(readflags),
+		uintptr(recordoffset),
+		uintptr(unsafe.Pointer(&buffer[0])),
+		uintptr(numberofbytestoread),
+		uintptr(unsafe.Pointer(bytesread)),
+		uintptr(unsafe.Pointer(minnumberofbytesneeded)))
+
+	return ret != 0
+}
+
+func CloseEventLog(eventlog HANDLE) bool {
+	ret, _, _ := procCloseEventLog.Call(
+		uintptr(eventlog))
+
+	return ret != 0
+}
+
+func OpenSCManager(lpMachineName, lpDatabaseName string, dwDesiredAccess uint32) (HANDLE, error) {
+	var p1, p2 uintptr
+	if len(lpMachineName) > 0 {
+		p1 = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpMachineName)))
+	}
+	if len(lpDatabaseName) > 0 {
+		p2 = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpDatabaseName)))
+	}
+	ret, _, _ := procOpenSCManager.Call(
+		p1,
+		p2,
+		uintptr(dwDesiredAccess))
+
+	if ret == 0 {
+		return 0, syscall.GetLastError()
+	}
+
+	return HANDLE(ret), nil
+}
+
+func CloseServiceHandle(hSCObject HANDLE) error {
+	ret, _, _ := procCloseServiceHandle.Call(uintptr(hSCObject))
+	if ret == 0 {
+		return syscall.GetLastError()
+	}
+	return nil
+}
+
+func OpenService(hSCManager HANDLE, lpServiceName string, dwDesiredAccess uint32) (HANDLE, error) {
+	ret, _, _ := procOpenService.Call(
+		uintptr(hSCManager),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpServiceName))),
+		uintptr(dwDesiredAccess))
+
+	if ret == 0 {
+		return 0, syscall.GetLastError()
+	}
+
+	return HANDLE(ret), nil
+}
+
+func StartService(hService HANDLE, lpServiceArgVectors []string) error {
+	l := len(lpServiceArgVectors)
+	var ret uintptr
+	if l == 0 {
+		ret, _, _ = procStartService.Call(
+			uintptr(hService),
+			0,
+			0)
+	} else {
+		lpArgs := make([]uintptr, l)
+		for i := 0; i < l; i++ {
+			lpArgs[i] = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpServiceArgVectors[i])))
+		}
+
+		ret, _, _ = procStartService.Call(
+			uintptr(hService),
+			uintptr(l),
+			uintptr(unsafe.Pointer(&lpArgs[0])))
+	}
+
+	if ret == 0 {
+		return syscall.GetLastError()
+	}
+
+	return nil
+}
+
+func ControlService(hService HANDLE, dwControl uint32, lpServiceStatus *SERVICE_STATUS) bool {
+	if lpServiceStatus == nil {
+		panic("ControlService:lpServiceStatus cannot be nil")
+	}
+
+	ret, _, _ := procControlService.Call(
+		uintptr(hService),
+		uintptr(dwControl),
+		uintptr(unsafe.Pointer(lpServiceStatus)))
+
+	return ret != 0
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/comctl32.go b/Godeps/_workspace/src/github.com/shirou/w32/comctl32.go
new file mode 100644
index 0000000000..4f4e6b53a5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/comctl32.go
@@ -0,0 +1,109 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modcomctl32 = syscall.NewLazyDLL("comctl32.dll")
+
+	procInitCommonControlsEx    = modcomctl32.NewProc("InitCommonControlsEx")
+	procImageList_Create        = modcomctl32.NewProc("ImageList_Create")
+	procImageList_Destroy       = modcomctl32.NewProc("ImageList_Destroy")
+	procImageList_GetImageCount = modcomctl32.NewProc("ImageList_GetImageCount")
+	procImageList_SetImageCount = modcomctl32.NewProc("ImageList_SetImageCount")
+	procImageList_Add           = modcomctl32.NewProc("ImageList_Add")
+	procImageList_ReplaceIcon   = modcomctl32.NewProc("ImageList_ReplaceIcon")
+	procImageList_Remove        = modcomctl32.NewProc("ImageList_Remove")
+	procTrackMouseEvent         = modcomctl32.NewProc("_TrackMouseEvent")
+)
+
+func InitCommonControlsEx(lpInitCtrls *INITCOMMONCONTROLSEX) bool {
+	ret, _, _ := procInitCommonControlsEx.Call(
+		uintptr(unsafe.Pointer(lpInitCtrls)))
+
+	return ret != 0
+}
+
+func ImageList_Create(cx, cy int, flags uint, cInitial, cGrow int) HIMAGELIST {
+	ret, _, _ := procImageList_Create.Call(
+		uintptr(cx),
+		uintptr(cy),
+		uintptr(flags),
+		uintptr(cInitial),
+		uintptr(cGrow))
+
+	if ret == 0 {
+		panic("Create image list failed")
+	}
+
+	return HIMAGELIST(ret)
+}
+
+func ImageList_Destroy(himl HIMAGELIST) bool {
+	ret, _, _ := procImageList_Destroy.Call(
+		uintptr(himl))
+
+	return ret != 0
+}
+
+func ImageList_GetImageCount(himl HIMAGELIST) int {
+	ret, _, _ := procImageList_GetImageCount.Call(
+		uintptr(himl))
+
+	return int(ret)
+}
+
+func ImageList_SetImageCount(himl HIMAGELIST, uNewCount uint) bool {
+	ret, _, _ := procImageList_SetImageCount.Call(
+		uintptr(himl),
+		uintptr(uNewCount))
+
+	return ret != 0
+}
+
+func ImageList_Add(himl HIMAGELIST, hbmImage, hbmMask HBITMAP) int {
+	ret, _, _ := procImageList_Add.Call(
+		uintptr(himl),
+		uintptr(hbmImage),
+		uintptr(hbmMask))
+
+	return int(ret)
+}
+
+func ImageList_ReplaceIcon(himl HIMAGELIST, i int, hicon HICON) int {
+	ret, _, _ := procImageList_ReplaceIcon.Call(
+		uintptr(himl),
+		uintptr(i),
+		uintptr(hicon))
+
+	return int(ret)
+}
+
+func ImageList_AddIcon(himl HIMAGELIST, hicon HICON) int {
+	return ImageList_ReplaceIcon(himl, -1, hicon)
+}
+
+func ImageList_Remove(himl HIMAGELIST, i int) bool {
+	ret, _, _ := procImageList_Remove.Call(
+		uintptr(himl),
+		uintptr(i))
+
+	return ret != 0
+}
+
+func ImageList_RemoveAll(himl HIMAGELIST) bool {
+	return ImageList_Remove(himl, -1)
+}
+
+func TrackMouseEvent(tme *TRACKMOUSEEVENT) bool {
+	ret, _, _ := procTrackMouseEvent.Call(
+		uintptr(unsafe.Pointer(tme)))
+
+	return ret != 0
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/comdlg32.go b/Godeps/_workspace/src/github.com/shirou/w32/comdlg32.go
new file mode 100644
index 0000000000..37bc98581d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/comdlg32.go
@@ -0,0 +1,38 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modcomdlg32 = syscall.NewLazyDLL("comdlg32.dll")
+
+	procGetSaveFileName      = modcomdlg32.NewProc("GetSaveFileNameW")
+	procGetOpenFileName      = modcomdlg32.NewProc("GetOpenFileNameW")
+	procCommDlgExtendedError = modcomdlg32.NewProc("CommDlgExtendedError")
+)
+
+func GetOpenFileName(ofn *OPENFILENAME) bool {
+	ret, _, _ := procGetOpenFileName.Call(
+		uintptr(unsafe.Pointer(ofn)))
+
+	return ret != 0
+}
+
+func GetSaveFileName(ofn *OPENFILENAME) bool {
+	ret, _, _ := procGetSaveFileName.Call(
+		uintptr(unsafe.Pointer(ofn)))
+
+	return ret != 0
+}
+
+func CommDlgExtendedError() uint {
+	ret, _, _ := procCommDlgExtendedError.Call()
+
+	return uint(ret)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/constants.go b/Godeps/_workspace/src/github.com/shirou/w32/constants.go
new file mode 100644
index 0000000000..62d2d4b318
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/constants.go
@@ -0,0 +1,2661 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+const (
+	FALSE = 0
+	TRUE  = 1
+)
+
+const (
+	NO_ERROR                         = 0
+	ERROR_SUCCESS                    = 0
+	ERROR_FILE_NOT_FOUND             = 2
+	ERROR_PATH_NOT_FOUND             = 3
+	ERROR_ACCESS_DENIED              = 5
+	ERROR_INVALID_HANDLE             = 6
+	ERROR_BAD_FORMAT                 = 11
+	ERROR_INVALID_NAME               = 123
+	ERROR_MORE_DATA                  = 234
+	ERROR_NO_MORE_ITEMS              = 259
+	ERROR_INVALID_SERVICE_CONTROL    = 1052
+	ERROR_SERVICE_REQUEST_TIMEOUT    = 1053
+	ERROR_SERVICE_NO_THREAD          = 1054
+	ERROR_SERVICE_DATABASE_LOCKED    = 1055
+	ERROR_SERVICE_ALREADY_RUNNING    = 1056
+	ERROR_SERVICE_DISABLED           = 1058
+	ERROR_SERVICE_DOES_NOT_EXIST     = 1060
+	ERROR_SERVICE_CANNOT_ACCEPT_CTRL = 1061
+	ERROR_SERVICE_NOT_ACTIVE         = 1062
+	ERROR_DATABASE_DOES_NOT_EXIST    = 1065
+	ERROR_SERVICE_DEPENDENCY_FAIL    = 1068
+	ERROR_SERVICE_LOGON_FAILED       = 1069
+	ERROR_SERVICE_MARKED_FOR_DELETE  = 1072
+	ERROR_SERVICE_DEPENDENCY_DELETED = 1075
+)
+
+const (
+	SE_ERR_FNF             = 2
+	SE_ERR_PNF             = 3
+	SE_ERR_ACCESSDENIED    = 5
+	SE_ERR_OOM             = 8
+	SE_ERR_DLLNOTFOUND     = 32
+	SE_ERR_SHARE           = 26
+	SE_ERR_ASSOCINCOMPLETE = 27
+	SE_ERR_DDETIMEOUT      = 28
+	SE_ERR_DDEFAIL         = 29
+	SE_ERR_DDEBUSY         = 30
+	SE_ERR_NOASSOC         = 31
+)
+
+const (
+	CW_USEDEFAULT = ^0x7fffffff
+)
+
+// ShowWindow constants
+const (
+	SW_HIDE            = 0
+	SW_NORMAL          = 1
+	SW_SHOWNORMAL      = 1
+	SW_SHOWMINIMIZED   = 2
+	SW_MAXIMIZE        = 3
+	SW_SHOWMAXIMIZED   = 3
+	SW_SHOWNOACTIVATE  = 4
+	SW_SHOW            = 5
+	SW_MINIMIZE        = 6
+	SW_SHOWMINNOACTIVE = 7
+	SW_SHOWNA          = 8
+	SW_RESTORE         = 9
+	SW_SHOWDEFAULT     = 10
+	SW_FORCEMINIMIZE   = 11
+)
+
+// Window class styles
+const (
+	CS_VREDRAW         = 0x00000001
+	CS_HREDRAW         = 0x00000002
+	CS_KEYCVTWINDOW    = 0x00000004
+	CS_DBLCLKS         = 0x00000008
+	CS_OWNDC           = 0x00000020
+	CS_CLASSDC         = 0x00000040
+	CS_PARENTDC        = 0x00000080
+	CS_NOKEYCVT        = 0x00000100
+	CS_NOCLOSE         = 0x00000200
+	CS_SAVEBITS        = 0x00000800
+	CS_BYTEALIGNCLIENT = 0x00001000
+	CS_BYTEALIGNWINDOW = 0x00002000
+	CS_GLOBALCLASS     = 0x00004000
+	CS_IME             = 0x00010000
+	CS_DROPSHADOW      = 0x00020000
+)
+
+// Predefined cursor constants
+const (
+	IDC_ARROW       = 32512
+	IDC_IBEAM       = 32513
+	IDC_WAIT        = 32514
+	IDC_CROSS       = 32515
+	IDC_UPARROW     = 32516
+	IDC_SIZENWSE    = 32642
+	IDC_SIZENESW    = 32643
+	IDC_SIZEWE      = 32644
+	IDC_SIZENS      = 32645
+	IDC_SIZEALL     = 32646
+	IDC_NO          = 32648
+	IDC_HAND        = 32649
+	IDC_APPSTARTING = 32650
+	IDC_HELP        = 32651
+	IDC_ICON        = 32641
+	IDC_SIZE        = 32640
+)
+
+// Predefined icon constants
+const (
+	IDI_APPLICATION = 32512
+	IDI_HAND        = 32513
+	IDI_QUESTION    = 32514
+	IDI_EXCLAMATION = 32515
+	IDI_ASTERISK    = 32516
+	IDI_WINLOGO     = 32517
+	IDI_WARNING     = IDI_EXCLAMATION
+	IDI_ERROR       = IDI_HAND
+	IDI_INFORMATION = IDI_ASTERISK
+)
+
+// Button style constants
+const (
+	BS_3STATE          = 5
+	BS_AUTO3STATE      = 6
+	BS_AUTOCHECKBOX    = 3
+	BS_AUTORADIOBUTTON = 9
+	BS_BITMAP          = 128
+	BS_BOTTOM          = 0X800
+	BS_CENTER          = 0X300
+	BS_CHECKBOX        = 2
+	BS_DEFPUSHBUTTON   = 1
+	BS_GROUPBOX        = 7
+	BS_ICON            = 64
+	BS_LEFT            = 256
+	BS_LEFTTEXT        = 32
+	BS_MULTILINE       = 0X2000
+	BS_NOTIFY          = 0X4000
+	BS_OWNERDRAW       = 0XB
+	BS_PUSHBUTTON      = 0
+	BS_PUSHLIKE        = 4096
+	BS_RADIOBUTTON     = 4
+	BS_RIGHT           = 512
+	BS_RIGHTBUTTON     = 32
+	BS_TEXT            = 0
+	BS_TOP             = 0X400
+	BS_USERBUTTON      = 8
+	BS_VCENTER         = 0XC00
+	BS_FLAT            = 0X8000
+)
+
+// Button state constants
+const (
+	BST_CHECKED       = 1
+	BST_INDETERMINATE = 2
+	BST_UNCHECKED     = 0
+	BST_FOCUS         = 8
+	BST_PUSHED        = 4
+)
+
+// Predefined brushes constants
+const (
+	COLOR_3DDKSHADOW              = 21
+	COLOR_3DFACE                  = 15
+	COLOR_3DHILIGHT               = 20
+	COLOR_3DHIGHLIGHT             = 20
+	COLOR_3DLIGHT                 = 22
+	COLOR_BTNHILIGHT              = 20
+	COLOR_3DSHADOW                = 16
+	COLOR_ACTIVEBORDER            = 10
+	COLOR_ACTIVECAPTION           = 2
+	COLOR_APPWORKSPACE            = 12
+	COLOR_BACKGROUND              = 1
+	COLOR_DESKTOP                 = 1
+	COLOR_BTNFACE                 = 15
+	COLOR_BTNHIGHLIGHT            = 20
+	COLOR_BTNSHADOW               = 16
+	COLOR_BTNTEXT                 = 18
+	COLOR_CAPTIONTEXT             = 9
+	COLOR_GRAYTEXT                = 17
+	COLOR_HIGHLIGHT               = 13
+	COLOR_HIGHLIGHTTEXT           = 14
+	COLOR_INACTIVEBORDER          = 11
+	COLOR_INACTIVECAPTION         = 3
+	COLOR_INACTIVECAPTIONTEXT     = 19
+	COLOR_INFOBK                  = 24
+	COLOR_INFOTEXT                = 23
+	COLOR_MENU                    = 4
+	COLOR_MENUTEXT                = 7
+	COLOR_SCROLLBAR               = 0
+	COLOR_WINDOW                  = 5
+	COLOR_WINDOWFRAME             = 6
+	COLOR_WINDOWTEXT              = 8
+	COLOR_HOTLIGHT                = 26
+	COLOR_GRADIENTACTIVECAPTION   = 27
+	COLOR_GRADIENTINACTIVECAPTION = 28
+)
+
+// Button message constants
+const (
+	BM_CLICK    = 245
+	BM_GETCHECK = 240
+	BM_GETIMAGE = 246
+	BM_GETSTATE = 242
+	BM_SETCHECK = 241
+	BM_SETIMAGE = 247
+	BM_SETSTATE = 243
+	BM_SETSTYLE = 244
+)
+
+// Button notifications
+const (
+	BN_CLICKED       = 0
+	BN_PAINT         = 1
+	BN_HILITE        = 2
+	BN_PUSHED        = BN_HILITE
+	BN_UNHILITE      = 3
+	BN_UNPUSHED      = BN_UNHILITE
+	BN_DISABLE       = 4
+	BN_DOUBLECLICKED = 5
+	BN_DBLCLK        = BN_DOUBLECLICKED
+	BN_SETFOCUS      = 6
+	BN_KILLFOCUS     = 7
+)
+
+// GetWindowLong and GetWindowLongPtr constants
+const (
+	GWL_EXSTYLE     = -20
+	GWL_STYLE       = -16
+	GWL_WNDPROC     = -4
+	GWLP_WNDPROC    = -4
+	GWL_HINSTANCE   = -6
+	GWLP_HINSTANCE  = -6
+	GWL_HWNDPARENT  = -8
+	GWLP_HWNDPARENT = -8
+	GWL_ID          = -12
+	GWLP_ID         = -12
+	GWL_USERDATA    = -21
+	GWLP_USERDATA   = -21
+)
+
+// Window style constants
+const (
+	WS_OVERLAPPED       = 0X00000000
+	WS_POPUP            = 0X80000000
+	WS_CHILD            = 0X40000000
+	WS_MINIMIZE         = 0X20000000
+	WS_VISIBLE          = 0X10000000
+	WS_DISABLED         = 0X08000000
+	WS_CLIPSIBLINGS     = 0X04000000
+	WS_CLIPCHILDREN     = 0X02000000
+	WS_MAXIMIZE         = 0X01000000
+	WS_CAPTION          = 0X00C00000
+	WS_BORDER           = 0X00800000
+	WS_DLGFRAME         = 0X00400000
+	WS_VSCROLL          = 0X00200000
+	WS_HSCROLL          = 0X00100000
+	WS_SYSMENU          = 0X00080000
+	WS_THICKFRAME       = 0X00040000
+	WS_GROUP            = 0X00020000
+	WS_TABSTOP          = 0X00010000
+	WS_MINIMIZEBOX      = 0X00020000
+	WS_MAXIMIZEBOX      = 0X00010000
+	WS_TILED            = 0X00000000
+	WS_ICONIC           = 0X20000000
+	WS_SIZEBOX          = 0X00040000
+	WS_OVERLAPPEDWINDOW = 0X00000000 | 0X00C00000 | 0X00080000 | 0X00040000 | 0X00020000 | 0X00010000
+	WS_POPUPWINDOW      = 0X80000000 | 0X00800000 | 0X00080000
+	WS_CHILDWINDOW      = 0X40000000
+)
+
+// Extended window style constants
+const (
+	WS_EX_DLGMODALFRAME    = 0X00000001
+	WS_EX_NOPARENTNOTIFY   = 0X00000004
+	WS_EX_TOPMOST          = 0X00000008
+	WS_EX_ACCEPTFILES      = 0X00000010
+	WS_EX_TRANSPARENT      = 0X00000020
+	WS_EX_MDICHILD         = 0X00000040
+	WS_EX_TOOLWINDOW       = 0X00000080
+	WS_EX_WINDOWEDGE       = 0X00000100
+	WS_EX_CLIENTEDGE       = 0X00000200
+	WS_EX_CONTEXTHELP      = 0X00000400
+	WS_EX_RIGHT            = 0X00001000
+	WS_EX_LEFT             = 0X00000000
+	WS_EX_RTLREADING       = 0X00002000
+	WS_EX_LTRREADING       = 0X00000000
+	WS_EX_LEFTSCROLLBAR    = 0X00004000
+	WS_EX_RIGHTSCROLLBAR   = 0X00000000
+	WS_EX_CONTROLPARENT    = 0X00010000
+	WS_EX_STATICEDGE       = 0X00020000
+	WS_EX_APPWINDOW        = 0X00040000
+	WS_EX_OVERLAPPEDWINDOW = 0X00000100 | 0X00000200
+	WS_EX_PALETTEWINDOW    = 0X00000100 | 0X00000080 | 0X00000008
+	WS_EX_LAYERED          = 0X00080000
+	WS_EX_NOINHERITLAYOUT  = 0X00100000
+	WS_EX_LAYOUTRTL        = 0X00400000
+	WS_EX_NOACTIVATE       = 0X08000000
+)
+
+// Window message constants
+const (
+	WM_APP                    = 32768
+	WM_ACTIVATE               = 6
+	WM_ACTIVATEAPP            = 28
+	WM_AFXFIRST               = 864
+	WM_AFXLAST                = 895
+	WM_ASKCBFORMATNAME        = 780
+	WM_CANCELJOURNAL          = 75
+	WM_CANCELMODE             = 31
+	WM_CAPTURECHANGED         = 533
+	WM_CHANGECBCHAIN          = 781
+	WM_CHAR                   = 258
+	WM_CHARTOITEM             = 47
+	WM_CHILDACTIVATE          = 34
+	WM_CLEAR                  = 771
+	WM_CLOSE                  = 16
+	WM_COMMAND                = 273
+	WM_COMMNOTIFY             = 68 /* OBSOLETE */
+	WM_COMPACTING             = 65
+	WM_COMPAREITEM            = 57
+	WM_CONTEXTMENU            = 123
+	WM_COPY                   = 769
+	WM_COPYDATA               = 74
+	WM_CREATE                 = 1
+	WM_CTLCOLORBTN            = 309
+	WM_CTLCOLORDLG            = 310
+	WM_CTLCOLOREDIT           = 307
+	WM_CTLCOLORLISTBOX        = 308
+	WM_CTLCOLORMSGBOX         = 306
+	WM_CTLCOLORSCROLLBAR      = 311
+	WM_CTLCOLORSTATIC         = 312
+	WM_CUT                    = 768
+	WM_DEADCHAR               = 259
+	WM_DELETEITEM             = 45
+	WM_DESTROY                = 2
+	WM_DESTROYCLIPBOARD       = 775
+	WM_DEVICECHANGE           = 537
+	WM_DEVMODECHANGE          = 27
+	WM_DISPLAYCHANGE          = 126
+	WM_DRAWCLIPBOARD          = 776
+	WM_DRAWITEM               = 43
+	WM_DROPFILES              = 563
+	WM_ENABLE                 = 10
+	WM_ENDSESSION             = 22
+	WM_ENTERIDLE              = 289
+	WM_ENTERMENULOOP          = 529
+	WM_ENTERSIZEMOVE          = 561
+	WM_ERASEBKGND             = 20
+	WM_EXITMENULOOP           = 530
+	WM_EXITSIZEMOVE           = 562
+	WM_FONTCHANGE             = 29
+	WM_GETDLGCODE             = 135
+	WM_GETFONT                = 49
+	WM_GETHOTKEY              = 51
+	WM_GETICON                = 127
+	WM_GETMINMAXINFO          = 36
+	WM_GETTEXT                = 13
+	WM_GETTEXTLENGTH          = 14
+	WM_HANDHELDFIRST          = 856
+	WM_HANDHELDLAST           = 863
+	WM_HELP                   = 83
+	WM_HOTKEY                 = 786
+	WM_HSCROLL                = 276
+	WM_HSCROLLCLIPBOARD       = 782
+	WM_ICONERASEBKGND         = 39
+	WM_INITDIALOG             = 272
+	WM_INITMENU               = 278
+	WM_INITMENUPOPUP          = 279
+	WM_INPUT                  = 0X00FF
+	WM_INPUTLANGCHANGE        = 81
+	WM_INPUTLANGCHANGEREQUEST = 80
+	WM_KEYDOWN                = 256
+	WM_KEYUP                  = 257
+	WM_KILLFOCUS              = 8
+	WM_MDIACTIVATE            = 546
+	WM_MDICASCADE             = 551
+	WM_MDICREATE              = 544
+	WM_MDIDESTROY             = 545
+	WM_MDIGETACTIVE           = 553
+	WM_MDIICONARRANGE         = 552
+	WM_MDIMAXIMIZE            = 549
+	WM_MDINEXT                = 548
+	WM_MDIREFRESHMENU         = 564
+	WM_MDIRESTORE             = 547
+	WM_MDISETMENU             = 560
+	WM_MDITILE                = 550
+	WM_MEASUREITEM            = 44
+	WM_GETOBJECT              = 0X003D
+	WM_CHANGEUISTATE          = 0X0127
+	WM_UPDATEUISTATE          = 0X0128
+	WM_QUERYUISTATE           = 0X0129
+	WM_UNINITMENUPOPUP        = 0X0125
+	WM_MENURBUTTONUP          = 290
+	WM_MENUCOMMAND            = 0X0126
+	WM_MENUGETOBJECT          = 0X0124
+	WM_MENUDRAG               = 0X0123
+	WM_APPCOMMAND             = 0X0319
+	WM_MENUCHAR               = 288
+	WM_MENUSELECT             = 287
+	WM_MOVE                   = 3
+	WM_MOVING                 = 534
+	WM_NCACTIVATE             = 134
+	WM_NCCALCSIZE             = 131
+	WM_NCCREATE               = 129
+	WM_NCDESTROY              = 130
+	WM_NCHITTEST              = 132
+	WM_NCLBUTTONDBLCLK        = 163
+	WM_NCLBUTTONDOWN          = 161
+	WM_NCLBUTTONUP            = 162
+	WM_NCMBUTTONDBLCLK        = 169
+	WM_NCMBUTTONDOWN          = 167
+	WM_NCMBUTTONUP            = 168
+	WM_NCXBUTTONDOWN          = 171
+	WM_NCXBUTTONUP            = 172
+	WM_NCXBUTTONDBLCLK        = 173
+	WM_NCMOUSEHOVER           = 0X02A0
+	WM_NCMOUSELEAVE           = 0X02A2
+	WM_NCMOUSEMOVE            = 160
+	WM_NCPAINT                = 133
+	WM_NCRBUTTONDBLCLK        = 166
+	WM_NCRBUTTONDOWN          = 164
+	WM_NCRBUTTONUP            = 165
+	WM_NEXTDLGCTL             = 40
+	WM_NEXTMENU               = 531
+	WM_NOTIFY                 = 78
+	WM_NOTIFYFORMAT           = 85
+	WM_NULL                   = 0
+	WM_PAINT                  = 15
+	WM_PAINTCLIPBOARD         = 777
+	WM_PAINTICON              = 38
+	WM_PALETTECHANGED         = 785
+	WM_PALETTEISCHANGING      = 784
+	WM_PARENTNOTIFY           = 528
+	WM_PASTE                  = 770
+	WM_PENWINFIRST            = 896
+	WM_PENWINLAST             = 911
+	WM_POWER                  = 72
+	WM_POWERBROADCAST         = 536
+	WM_PRINT                  = 791
+	WM_PRINTCLIENT            = 792
+	WM_QUERYDRAGICON          = 55
+	WM_QUERYENDSESSION        = 17
+	WM_QUERYNEWPALETTE        = 783
+	WM_QUERYOPEN              = 19
+	WM_QUEUESYNC              = 35
+	WM_QUIT                   = 18
+	WM_RENDERALLFORMATS       = 774
+	WM_RENDERFORMAT           = 773
+	WM_SETCURSOR              = 32
+	WM_SETFOCUS               = 7
+	WM_SETFONT                = 48
+	WM_SETHOTKEY              = 50
+	WM_SETICON                = 128
+	WM_SETREDRAW              = 11
+	WM_SETTEXT                = 12
+	WM_SETTINGCHANGE          = 26
+	WM_SHOWWINDOW             = 24
+	WM_SIZE                   = 5
+	WM_SIZECLIPBOARD          = 779
+	WM_SIZING                 = 532
+	WM_SPOOLERSTATUS          = 42
+	WM_STYLECHANGED           = 125
+	WM_STYLECHANGING          = 124
+	WM_SYSCHAR                = 262
+	WM_SYSCOLORCHANGE         = 21
+	WM_SYSCOMMAND             = 274
+	WM_SYSDEADCHAR            = 263
+	WM_SYSKEYDOWN             = 260
+	WM_SYSKEYUP               = 261
+	WM_TCARD                  = 82
+	WM_THEMECHANGED           = 794
+	WM_TIMECHANGE             = 30
+	WM_TIMER                  = 275
+	WM_UNDO                   = 772
+	WM_USER                   = 1024
+	WM_USERCHANGED            = 84
+	WM_VKEYTOITEM             = 46
+	WM_VSCROLL                = 277
+	WM_VSCROLLCLIPBOARD       = 778
+	WM_WINDOWPOSCHANGED       = 71
+	WM_WINDOWPOSCHANGING      = 70
+	WM_WININICHANGE           = 26
+	WM_KEYFIRST               = 256
+	WM_KEYLAST                = 264
+	WM_SYNCPAINT              = 136
+	WM_MOUSEACTIVATE          = 33
+	WM_MOUSEMOVE              = 512
+	WM_LBUTTONDOWN            = 513
+	WM_LBUTTONUP              = 514
+	WM_LBUTTONDBLCLK          = 515
+	WM_RBUTTONDOWN            = 516
+	WM_RBUTTONUP              = 517
+	WM_RBUTTONDBLCLK          = 518
+	WM_MBUTTONDOWN            = 519
+	WM_MBUTTONUP              = 520
+	WM_MBUTTONDBLCLK          = 521
+	WM_MOUSEWHEEL             = 522
+	WM_MOUSEFIRST             = 512
+	WM_XBUTTONDOWN            = 523
+	WM_XBUTTONUP              = 524
+	WM_XBUTTONDBLCLK          = 525
+	WM_MOUSELAST              = 525
+	WM_MOUSEHOVER             = 0X2A1
+	WM_MOUSELEAVE             = 0X2A3
+	WM_CLIPBOARDUPDATE        = 0x031D
+)
+
+// WM_ACTIVATE
+const (
+	WA_INACTIVE    = 0
+	WA_ACTIVE      = 1
+	WA_CLICKACTIVE = 2
+)
+
+const LF_FACESIZE = 32
+
+// Font weight constants
+const (
+	FW_DONTCARE   = 0
+	FW_THIN       = 100
+	FW_EXTRALIGHT = 200
+	FW_ULTRALIGHT = FW_EXTRALIGHT
+	FW_LIGHT      = 300
+	FW_NORMAL     = 400
+	FW_REGULAR    = 400
+	FW_MEDIUM     = 500
+	FW_SEMIBOLD   = 600
+	FW_DEMIBOLD   = FW_SEMIBOLD
+	FW_BOLD       = 700
+	FW_EXTRABOLD  = 800
+	FW_ULTRABOLD  = FW_EXTRABOLD
+	FW_HEAVY      = 900
+	FW_BLACK      = FW_HEAVY
+)
+
+// Charset constants
+const (
+	ANSI_CHARSET        = 0
+	DEFAULT_CHARSET     = 1
+	SYMBOL_CHARSET      = 2
+	SHIFTJIS_CHARSET    = 128
+	HANGEUL_CHARSET     = 129
+	HANGUL_CHARSET      = 129
+	GB2312_CHARSET      = 134
+	CHINESEBIG5_CHARSET = 136
+	GREEK_CHARSET       = 161
+	TURKISH_CHARSET     = 162
+	HEBREW_CHARSET      = 177
+	ARABIC_CHARSET      = 178
+	BALTIC_CHARSET      = 186
+	RUSSIAN_CHARSET     = 204
+	THAI_CHARSET        = 222
+	EASTEUROPE_CHARSET  = 238
+	OEM_CHARSET         = 255
+	JOHAB_CHARSET       = 130
+	VIETNAMESE_CHARSET  = 163
+	MAC_CHARSET         = 77
+)
+
+// Font output precision constants
+const (
+	OUT_DEFAULT_PRECIS   = 0
+	OUT_STRING_PRECIS    = 1
+	OUT_CHARACTER_PRECIS = 2
+	OUT_STROKE_PRECIS    = 3
+	OUT_TT_PRECIS        = 4
+	OUT_DEVICE_PRECIS    = 5
+	OUT_RASTER_PRECIS    = 6
+	OUT_TT_ONLY_PRECIS   = 7
+	OUT_OUTLINE_PRECIS   = 8
+	OUT_PS_ONLY_PRECIS   = 10
+)
+
+// Font clipping precision constants
+const (
+	CLIP_DEFAULT_PRECIS   = 0
+	CLIP_CHARACTER_PRECIS = 1
+	CLIP_STROKE_PRECIS    = 2
+	CLIP_MASK             = 15
+	CLIP_LH_ANGLES        = 16
+	CLIP_TT_ALWAYS        = 32
+	CLIP_EMBEDDED         = 128
+)
+
+// Font output quality constants
+const (
+	DEFAULT_QUALITY        = 0
+	DRAFT_QUALITY          = 1
+	PROOF_QUALITY          = 2
+	NONANTIALIASED_QUALITY = 3
+	ANTIALIASED_QUALITY    = 4
+	CLEARTYPE_QUALITY      = 5
+)
+
+// Font pitch constants
+const (
+	DEFAULT_PITCH  = 0
+	FIXED_PITCH    = 1
+	VARIABLE_PITCH = 2
+)
+
+// Font family constants
+const (
+	FF_DECORATIVE = 80
+	FF_DONTCARE   = 0
+	FF_MODERN     = 48
+	FF_ROMAN      = 16
+	FF_SCRIPT     = 64
+	FF_SWISS      = 32
+)
+
+// DeviceCapabilities capabilities
+const (
+	DC_FIELDS            = 1
+	DC_PAPERS            = 2
+	DC_PAPERSIZE         = 3
+	DC_MINEXTENT         = 4
+	DC_MAXEXTENT         = 5
+	DC_BINS              = 6
+	DC_DUPLEX            = 7
+	DC_SIZE              = 8
+	DC_EXTRA             = 9
+	DC_VERSION           = 10
+	DC_DRIVER            = 11
+	DC_BINNAMES          = 12
+	DC_ENUMRESOLUTIONS   = 13
+	DC_FILEDEPENDENCIES  = 14
+	DC_TRUETYPE          = 15
+	DC_PAPERNAMES        = 16
+	DC_ORIENTATION       = 17
+	DC_COPIES            = 18
+	DC_BINADJUST         = 19
+	DC_EMF_COMPLIANT     = 20
+	DC_DATATYPE_PRODUCED = 21
+	DC_COLLATE           = 22
+	DC_MANUFACTURER      = 23
+	DC_MODEL             = 24
+	DC_PERSONALITY       = 25
+	DC_PRINTRATE         = 26
+	DC_PRINTRATEUNIT     = 27
+	DC_PRINTERMEM        = 28
+	DC_MEDIAREADY        = 29
+	DC_STAPLE            = 30
+	DC_PRINTRATEPPM      = 31
+	DC_COLORDEVICE       = 32
+	DC_NUP               = 33
+	DC_MEDIATYPENAMES    = 34
+	DC_MEDIATYPES        = 35
+)
+
+// GetDeviceCaps index constants
+const (
+	DRIVERVERSION   = 0
+	TECHNOLOGY      = 2
+	HORZSIZE        = 4
+	VERTSIZE        = 6
+	HORZRES         = 8
+	VERTRES         = 10
+	LOGPIXELSX      = 88
+	LOGPIXELSY      = 90
+	BITSPIXEL       = 12
+	PLANES          = 14
+	NUMBRUSHES      = 16
+	NUMPENS         = 18
+	NUMFONTS        = 22
+	NUMCOLORS       = 24
+	NUMMARKERS      = 20
+	ASPECTX         = 40
+	ASPECTY         = 42
+	ASPECTXY        = 44
+	PDEVICESIZE     = 26
+	CLIPCAPS        = 36
+	SIZEPALETTE     = 104
+	NUMRESERVED     = 106
+	COLORRES        = 108
+	PHYSICALWIDTH   = 110
+	PHYSICALHEIGHT  = 111
+	PHYSICALOFFSETX = 112
+	PHYSICALOFFSETY = 113
+	SCALINGFACTORX  = 114
+	SCALINGFACTORY  = 115
+	VREFRESH        = 116
+	DESKTOPHORZRES  = 118
+	DESKTOPVERTRES  = 117
+	BLTALIGNMENT    = 119
+	SHADEBLENDCAPS  = 120
+	COLORMGMTCAPS   = 121
+	RASTERCAPS      = 38
+	CURVECAPS       = 28
+	LINECAPS        = 30
+	POLYGONALCAPS   = 32
+	TEXTCAPS        = 34
+)
+
+// GetDeviceCaps TECHNOLOGY constants
+const (
+	DT_PLOTTER    = 0
+	DT_RASDISPLAY = 1
+	DT_RASPRINTER = 2
+	DT_RASCAMERA  = 3
+	DT_CHARSTREAM = 4
+	DT_METAFILE   = 5
+	DT_DISPFILE   = 6
+)
+
+// GetDeviceCaps SHADEBLENDCAPS constants
+const (
+	SB_NONE          = 0x00
+	SB_CONST_ALPHA   = 0x01
+	SB_PIXEL_ALPHA   = 0x02
+	SB_PREMULT_ALPHA = 0x04
+	SB_GRAD_RECT     = 0x10
+	SB_GRAD_TRI      = 0x20
+)
+
+// GetDeviceCaps COLORMGMTCAPS constants
+const (
+	CM_NONE       = 0x00
+	CM_DEVICE_ICM = 0x01
+	CM_GAMMA_RAMP = 0x02
+	CM_CMYK_COLOR = 0x04
+)
+
+// GetDeviceCaps RASTERCAPS constants
+const (
+	RC_BANDING      = 2
+	RC_BITBLT       = 1
+	RC_BITMAP64     = 8
+	RC_DI_BITMAP    = 128
+	RC_DIBTODEV     = 512
+	RC_FLOODFILL    = 4096
+	RC_GDI20_OUTPUT = 16
+	RC_PALETTE      = 256
+	RC_SCALING      = 4
+	RC_STRETCHBLT   = 2048
+	RC_STRETCHDIB   = 8192
+	RC_DEVBITS      = 0x8000
+	RC_OP_DX_OUTPUT = 0x4000
+)
+
+// GetDeviceCaps CURVECAPS constants
+const (
+	CC_NONE       = 0
+	CC_CIRCLES    = 1
+	CC_PIE        = 2
+	CC_CHORD      = 4
+	CC_ELLIPSES   = 8
+	CC_WIDE       = 16
+	CC_STYLED     = 32
+	CC_WIDESTYLED = 64
+	CC_INTERIORS  = 128
+	CC_ROUNDRECT  = 256
+)
+
+// GetDeviceCaps LINECAPS constants
+const (
+	LC_NONE       = 0
+	LC_POLYLINE   = 2
+	LC_MARKER     = 4
+	LC_POLYMARKER = 8
+	LC_WIDE       = 16
+	LC_STYLED     = 32
+	LC_WIDESTYLED = 64
+	LC_INTERIORS  = 128
+)
+
+// GetDeviceCaps POLYGONALCAPS constants
+const (
+	PC_NONE        = 0
+	PC_POLYGON     = 1
+	PC_POLYPOLYGON = 256
+	PC_PATHS       = 512
+	PC_RECTANGLE   = 2
+	PC_WINDPOLYGON = 4
+	PC_SCANLINE    = 8
+	PC_TRAPEZOID   = 4
+	PC_WIDE        = 16
+	PC_STYLED      = 32
+	PC_WIDESTYLED  = 64
+	PC_INTERIORS   = 128
+)
+
+// GetDeviceCaps TEXTCAPS constants
+const (
+	TC_OP_CHARACTER = 1
+	TC_OP_STROKE    = 2
+	TC_CP_STROKE    = 4
+	TC_CR_90        = 8
+	TC_CR_ANY       = 16
+	TC_SF_X_YINDEP  = 32
+	TC_SA_DOUBLE    = 64
+	TC_SA_INTEGER   = 128
+	TC_SA_CONTIN    = 256
+	TC_EA_DOUBLE    = 512
+	TC_IA_ABLE      = 1024
+	TC_UA_ABLE      = 2048
+	TC_SO_ABLE      = 4096
+	TC_RA_ABLE      = 8192
+	TC_VA_ABLE      = 16384
+	TC_RESERVED     = 32768
+	TC_SCROLLBLT    = 65536
+)
+
+// Static control styles
+const (
+	SS_BITMAP          = 14
+	SS_BLACKFRAME      = 7
+	SS_BLACKRECT       = 4
+	SS_CENTER          = 1
+	SS_CENTERIMAGE     = 512
+	SS_EDITCONTROL     = 0x2000
+	SS_ENHMETAFILE     = 15
+	SS_ETCHEDFRAME     = 18
+	SS_ETCHEDHORZ      = 16
+	SS_ETCHEDVERT      = 17
+	SS_GRAYFRAME       = 8
+	SS_GRAYRECT        = 5
+	SS_ICON            = 3
+	SS_LEFT            = 0
+	SS_LEFTNOWORDWRAP  = 0xc
+	SS_NOPREFIX        = 128
+	SS_NOTIFY          = 256
+	SS_OWNERDRAW       = 0xd
+	SS_REALSIZECONTROL = 0x040
+	SS_REALSIZEIMAGE   = 0x800
+	SS_RIGHT           = 2
+	SS_RIGHTJUST       = 0x400
+	SS_SIMPLE          = 11
+	SS_SUNKEN          = 4096
+	SS_WHITEFRAME      = 9
+	SS_WHITERECT       = 6
+	SS_USERITEM        = 10
+	SS_TYPEMASK        = 0x0000001F
+	SS_ENDELLIPSIS     = 0x00004000
+	SS_PATHELLIPSIS    = 0x00008000
+	SS_WORDELLIPSIS    = 0x0000C000
+	SS_ELLIPSISMASK    = 0x0000C000
+)
+
+// Edit styles
+const (
+	ES_LEFT        = 0x0000
+	ES_CENTER      = 0x0001
+	ES_RIGHT       = 0x0002
+	ES_MULTILINE   = 0x0004
+	ES_UPPERCASE   = 0x0008
+	ES_LOWERCASE   = 0x0010
+	ES_PASSWORD    = 0x0020
+	ES_AUTOVSCROLL = 0x0040
+	ES_AUTOHSCROLL = 0x0080
+	ES_NOHIDESEL   = 0x0100
+	ES_OEMCONVERT  = 0x0400
+	ES_READONLY    = 0x0800
+	ES_WANTRETURN  = 0x1000
+	ES_NUMBER      = 0x2000
+)
+
+// Edit notifications
+const (
+	EN_SETFOCUS     = 0x0100
+	EN_KILLFOCUS    = 0x0200
+	EN_CHANGE       = 0x0300
+	EN_UPDATE       = 0x0400
+	EN_ERRSPACE     = 0x0500
+	EN_MAXTEXT      = 0x0501
+	EN_HSCROLL      = 0x0601
+	EN_VSCROLL      = 0x0602
+	EN_ALIGN_LTR_EC = 0x0700
+	EN_ALIGN_RTL_EC = 0x0701
+)
+
+// Edit messages
+const (
+	EM_GETSEL              = 0x00B0
+	EM_SETSEL              = 0x00B1
+	EM_GETRECT             = 0x00B2
+	EM_SETRECT             = 0x00B3
+	EM_SETRECTNP           = 0x00B4
+	EM_SCROLL              = 0x00B5
+	EM_LINESCROLL          = 0x00B6
+	EM_SCROLLCARET         = 0x00B7
+	EM_GETMODIFY           = 0x00B8
+	EM_SETMODIFY           = 0x00B9
+	EM_GETLINECOUNT        = 0x00BA
+	EM_LINEINDEX           = 0x00BB
+	EM_SETHANDLE           = 0x00BC
+	EM_GETHANDLE           = 0x00BD
+	EM_GETTHUMB            = 0x00BE
+	EM_LINELENGTH          = 0x00C1
+	EM_REPLACESEL          = 0x00C2
+	EM_GETLINE             = 0x00C4
+	EM_LIMITTEXT           = 0x00C5
+	EM_CANUNDO             = 0x00C6
+	EM_UNDO                = 0x00C7
+	EM_FMTLINES            = 0x00C8
+	EM_LINEFROMCHAR        = 0x00C9
+	EM_SETTABSTOPS         = 0x00CB
+	EM_SETPASSWORDCHAR     = 0x00CC
+	EM_EMPTYUNDOBUFFER     = 0x00CD
+	EM_GETFIRSTVISIBLELINE = 0x00CE
+	EM_SETREADONLY         = 0x00CF
+	EM_SETWORDBREAKPROC    = 0x00D0
+	EM_GETWORDBREAKPROC    = 0x00D1
+	EM_GETPASSWORDCHAR     = 0x00D2
+	EM_SETMARGINS          = 0x00D3
+	EM_GETMARGINS          = 0x00D4
+	EM_SETLIMITTEXT        = EM_LIMITTEXT
+	EM_GETLIMITTEXT        = 0x00D5
+	EM_POSFROMCHAR         = 0x00D6
+	EM_CHARFROMPOS         = 0x00D7
+	EM_SETIMESTATUS        = 0x00D8
+	EM_GETIMESTATUS        = 0x00D9
+	EM_SETCUEBANNER        = 0x1501
+	EM_GETCUEBANNER        = 0x1502
+)
+
+const (
+	CCM_FIRST            = 0x2000
+	CCM_LAST             = CCM_FIRST + 0x200
+	CCM_SETBKCOLOR       = 8193
+	CCM_SETCOLORSCHEME   = 8194
+	CCM_GETCOLORSCHEME   = 8195
+	CCM_GETDROPTARGET    = 8196
+	CCM_SETUNICODEFORMAT = 8197
+	CCM_GETUNICODEFORMAT = 8198
+	CCM_SETVERSION       = 0x2007
+	CCM_GETVERSION       = 0x2008
+	CCM_SETNOTIFYWINDOW  = 0x2009
+	CCM_SETWINDOWTHEME   = 0x200b
+	CCM_DPISCALE         = 0x200c
+)
+
+// Common controls styles
+const (
+	CCS_TOP           = 1
+	CCS_NOMOVEY       = 2
+	CCS_BOTTOM        = 3
+	CCS_NORESIZE      = 4
+	CCS_NOPARENTALIGN = 8
+	CCS_ADJUSTABLE    = 32
+	CCS_NODIVIDER     = 64
+	CCS_VERT          = 128
+	CCS_LEFT          = 129
+	CCS_NOMOVEX       = 130
+	CCS_RIGHT         = 131
+)
+
+// ProgressBar messages
+const (
+	PROGRESS_CLASS  = "msctls_progress32"
+	PBM_SETPOS      = WM_USER + 2
+	PBM_DELTAPOS    = WM_USER + 3
+	PBM_SETSTEP     = WM_USER + 4
+	PBM_STEPIT      = WM_USER + 5
+	PBM_SETRANGE32  = 1030
+	PBM_GETRANGE    = 1031
+	PBM_GETPOS      = 1032
+	PBM_SETBARCOLOR = 1033
+	PBM_SETBKCOLOR  = CCM_SETBKCOLOR
+	PBS_SMOOTH      = 1
+	PBS_VERTICAL    = 4
+)
+
+// GetOpenFileName and GetSaveFileName extended flags
+const (
+	OFN_EX_NOPLACESBAR = 0x00000001
+)
+
+// GetOpenFileName and GetSaveFileName flags
+const (
+	OFN_ALLOWMULTISELECT     = 0x00000200
+	OFN_CREATEPROMPT         = 0x00002000
+	OFN_DONTADDTORECENT      = 0x02000000
+	OFN_ENABLEHOOK           = 0x00000020
+	OFN_ENABLEINCLUDENOTIFY  = 0x00400000
+	OFN_ENABLESIZING         = 0x00800000
+	OFN_ENABLETEMPLATE       = 0x00000040
+	OFN_ENABLETEMPLATEHANDLE = 0x00000080
+	OFN_EXPLORER             = 0x00080000
+	OFN_EXTENSIONDIFFERENT   = 0x00000400
+	OFN_FILEMUSTEXIST        = 0x00001000
+	OFN_FORCESHOWHIDDEN      = 0x10000000
+	OFN_HIDEREADONLY         = 0x00000004
+	OFN_LONGNAMES            = 0x00200000
+	OFN_NOCHANGEDIR          = 0x00000008
+	OFN_NODEREFERENCELINKS   = 0x00100000
+	OFN_NOLONGNAMES          = 0x00040000
+	OFN_NONETWORKBUTTON      = 0x00020000
+	OFN_NOREADONLYRETURN     = 0x00008000
+	OFN_NOTESTFILECREATE     = 0x00010000
+	OFN_NOVALIDATE           = 0x00000100
+	OFN_OVERWRITEPROMPT      = 0x00000002
+	OFN_PATHMUSTEXIST        = 0x00000800
+	OFN_READONLY             = 0x00000001
+	OFN_SHAREAWARE           = 0x00004000
+	OFN_SHOWHELP             = 0x00000010
+)
+
+//SHBrowseForFolder flags
+const (
+	BIF_RETURNONLYFSDIRS    = 0x00000001
+	BIF_DONTGOBELOWDOMAIN   = 0x00000002
+	BIF_STATUSTEXT          = 0x00000004
+	BIF_RETURNFSANCESTORS   = 0x00000008
+	BIF_EDITBOX             = 0x00000010
+	BIF_VALIDATE            = 0x00000020
+	BIF_NEWDIALOGSTYLE      = 0x00000040
+	BIF_BROWSEINCLUDEURLS   = 0x00000080
+	BIF_USENEWUI            = BIF_EDITBOX | BIF_NEWDIALOGSTYLE
+	BIF_UAHINT              = 0x00000100
+	BIF_NONEWFOLDERBUTTON   = 0x00000200
+	BIF_NOTRANSLATETARGETS  = 0x00000400
+	BIF_BROWSEFORCOMPUTER   = 0x00001000
+	BIF_BROWSEFORPRINTER    = 0x00002000
+	BIF_BROWSEINCLUDEFILES  = 0x00004000
+	BIF_SHAREABLE           = 0x00008000
+	BIF_BROWSEFILEJUNCTIONS = 0x00010000
+)
+
+//MessageBox flags
+const (
+	MB_OK                = 0x00000000
+	MB_OKCANCEL          = 0x00000001
+	MB_ABORTRETRYIGNORE  = 0x00000002
+	MB_YESNOCANCEL       = 0x00000003
+	MB_YESNO             = 0x00000004
+	MB_RETRYCANCEL       = 0x00000005
+	MB_CANCELTRYCONTINUE = 0x00000006
+	MB_ICONHAND          = 0x00000010
+	MB_ICONQUESTION      = 0x00000020
+	MB_ICONEXCLAMATION   = 0x00000030
+	MB_ICONASTERISK      = 0x00000040
+	MB_USERICON          = 0x00000080
+	MB_ICONWARNING       = MB_ICONEXCLAMATION
+	MB_ICONERROR         = MB_ICONHAND
+	MB_ICONINFORMATION   = MB_ICONASTERISK
+	MB_ICONSTOP          = MB_ICONHAND
+	MB_DEFBUTTON1        = 0x00000000
+	MB_DEFBUTTON2        = 0x00000100
+	MB_DEFBUTTON3        = 0x00000200
+	MB_DEFBUTTON4        = 0x00000300
+)
+
+//COM
+const (
+	E_INVALIDARG  = 0x80070057
+	E_OUTOFMEMORY = 0x8007000E
+	E_UNEXPECTED  = 0x8000FFFF
+)
+
+const (
+	S_OK               = 0
+	S_FALSE            = 0x0001
+	RPC_E_CHANGED_MODE = 0x80010106
+)
+
+// GetSystemMetrics constants
+const (
+	SM_CXSCREEN             = 0
+	SM_CYSCREEN             = 1
+	SM_CXVSCROLL            = 2
+	SM_CYHSCROLL            = 3
+	SM_CYCAPTION            = 4
+	SM_CXBORDER             = 5
+	SM_CYBORDER             = 6
+	SM_CXDLGFRAME           = 7
+	SM_CYDLGFRAME           = 8
+	SM_CYVTHUMB             = 9
+	SM_CXHTHUMB             = 10
+	SM_CXICON               = 11
+	SM_CYICON               = 12
+	SM_CXCURSOR             = 13
+	SM_CYCURSOR             = 14
+	SM_CYMENU               = 15
+	SM_CXFULLSCREEN         = 16
+	SM_CYFULLSCREEN         = 17
+	SM_CYKANJIWINDOW        = 18
+	SM_MOUSEPRESENT         = 19
+	SM_CYVSCROLL            = 20
+	SM_CXHSCROLL            = 21
+	SM_DEBUG                = 22
+	SM_SWAPBUTTON           = 23
+	SM_RESERVED1            = 24
+	SM_RESERVED2            = 25
+	SM_RESERVED3            = 26
+	SM_RESERVED4            = 27
+	SM_CXMIN                = 28
+	SM_CYMIN                = 29
+	SM_CXSIZE               = 30
+	SM_CYSIZE               = 31
+	SM_CXFRAME              = 32
+	SM_CYFRAME              = 33
+	SM_CXMINTRACK           = 34
+	SM_CYMINTRACK           = 35
+	SM_CXDOUBLECLK          = 36
+	SM_CYDOUBLECLK          = 37
+	SM_CXICONSPACING        = 38
+	SM_CYICONSPACING        = 39
+	SM_MENUDROPALIGNMENT    = 40
+	SM_PENWINDOWS           = 41
+	SM_DBCSENABLED          = 42
+	SM_CMOUSEBUTTONS        = 43
+	SM_CXFIXEDFRAME         = SM_CXDLGFRAME
+	SM_CYFIXEDFRAME         = SM_CYDLGFRAME
+	SM_CXSIZEFRAME          = SM_CXFRAME
+	SM_CYSIZEFRAME          = SM_CYFRAME
+	SM_SECURE               = 44
+	SM_CXEDGE               = 45
+	SM_CYEDGE               = 46
+	SM_CXMINSPACING         = 47
+	SM_CYMINSPACING         = 48
+	SM_CXSMICON             = 49
+	SM_CYSMICON             = 50
+	SM_CYSMCAPTION          = 51
+	SM_CXSMSIZE             = 52
+	SM_CYSMSIZE             = 53
+	SM_CXMENUSIZE           = 54
+	SM_CYMENUSIZE           = 55
+	SM_ARRANGE              = 56
+	SM_CXMINIMIZED          = 57
+	SM_CYMINIMIZED          = 58
+	SM_CXMAXTRACK           = 59
+	SM_CYMAXTRACK           = 60
+	SM_CXMAXIMIZED          = 61
+	SM_CYMAXIMIZED          = 62
+	SM_NETWORK              = 63
+	SM_CLEANBOOT            = 67
+	SM_CXDRAG               = 68
+	SM_CYDRAG               = 69
+	SM_SHOWSOUNDS           = 70
+	SM_CXMENUCHECK          = 71
+	SM_CYMENUCHECK          = 72
+	SM_SLOWMACHINE          = 73
+	SM_MIDEASTENABLED       = 74
+	SM_MOUSEWHEELPRESENT    = 75
+	SM_XVIRTUALSCREEN       = 76
+	SM_YVIRTUALSCREEN       = 77
+	SM_CXVIRTUALSCREEN      = 78
+	SM_CYVIRTUALSCREEN      = 79
+	SM_CMONITORS            = 80
+	SM_SAMEDISPLAYFORMAT    = 81
+	SM_IMMENABLED           = 82
+	SM_CXFOCUSBORDER        = 83
+	SM_CYFOCUSBORDER        = 84
+	SM_TABLETPC             = 86
+	SM_MEDIACENTER          = 87
+	SM_STARTER              = 88
+	SM_SERVERR2             = 89
+	SM_CMETRICS             = 91
+	SM_REMOTESESSION        = 0x1000
+	SM_SHUTTINGDOWN         = 0x2000
+	SM_REMOTECONTROL        = 0x2001
+	SM_CARETBLINKINGENABLED = 0x2002
+)
+
+const (
+	CLSCTX_INPROC_SERVER   = 1
+	CLSCTX_INPROC_HANDLER  = 2
+	CLSCTX_LOCAL_SERVER    = 4
+	CLSCTX_INPROC_SERVER16 = 8
+	CLSCTX_REMOTE_SERVER   = 16
+	CLSCTX_ALL             = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER
+	CLSCTX_INPROC          = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER
+	CLSCTX_SERVER          = CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER
+)
+
+const (
+	COINIT_APARTMENTTHREADED = 0x2
+	COINIT_MULTITHREADED     = 0x0
+	COINIT_DISABLE_OLE1DDE   = 0x4
+	COINIT_SPEED_OVER_MEMORY = 0x8
+)
+
+const (
+	DISPATCH_METHOD         = 1
+	DISPATCH_PROPERTYGET    = 2
+	DISPATCH_PROPERTYPUT    = 4
+	DISPATCH_PROPERTYPUTREF = 8
+)
+
+const (
+	CC_FASTCALL = iota
+	CC_CDECL
+	CC_MSCPASCAL
+	CC_PASCAL = CC_MSCPASCAL
+	CC_MACPASCAL
+	CC_STDCALL
+	CC_FPFASTCALL
+	CC_SYSCALL
+	CC_MPWCDECL
+	CC_MPWPASCAL
+	CC_MAX = CC_MPWPASCAL
+)
+
+const (
+	VT_EMPTY           = 0x0
+	VT_NULL            = 0x1
+	VT_I2              = 0x2
+	VT_I4              = 0x3
+	VT_R4              = 0x4
+	VT_R8              = 0x5
+	VT_CY              = 0x6
+	VT_DATE            = 0x7
+	VT_BSTR            = 0x8
+	VT_DISPATCH        = 0x9
+	VT_ERROR           = 0xa
+	VT_BOOL            = 0xb
+	VT_VARIANT         = 0xc
+	VT_UNKNOWN         = 0xd
+	VT_DECIMAL         = 0xe
+	VT_I1              = 0x10
+	VT_UI1             = 0x11
+	VT_UI2             = 0x12
+	VT_UI4             = 0x13
+	VT_I8              = 0x14
+	VT_UI8             = 0x15
+	VT_INT             = 0x16
+	VT_UINT            = 0x17
+	VT_VOID            = 0x18
+	VT_HRESULT         = 0x19
+	VT_PTR             = 0x1a
+	VT_SAFEARRAY       = 0x1b
+	VT_CARRAY          = 0x1c
+	VT_USERDEFINED     = 0x1d
+	VT_LPSTR           = 0x1e
+	VT_LPWSTR          = 0x1f
+	VT_RECORD          = 0x24
+	VT_INT_PTR         = 0x25
+	VT_UINT_PTR        = 0x26
+	VT_FILETIME        = 0x40
+	VT_BLOB            = 0x41
+	VT_STREAM          = 0x42
+	VT_STORAGE         = 0x43
+	VT_STREAMED_OBJECT = 0x44
+	VT_STORED_OBJECT   = 0x45
+	VT_BLOB_OBJECT     = 0x46
+	VT_CF              = 0x47
+	VT_CLSID           = 0x48
+	VT_BSTR_BLOB       = 0xfff
+	VT_VECTOR          = 0x1000
+	VT_ARRAY           = 0x2000
+	VT_BYREF           = 0x4000
+	VT_RESERVED        = 0x8000
+	VT_ILLEGAL         = 0xffff
+	VT_ILLEGALMASKED   = 0xfff
+	VT_TYPEMASK        = 0xfff
+)
+
+const (
+	DISPID_UNKNOWN     = -1
+	DISPID_VALUE       = 0
+	DISPID_PROPERTYPUT = -3
+	DISPID_NEWENUM     = -4
+	DISPID_EVALUATE    = -5
+	DISPID_CONSTRUCTOR = -6
+	DISPID_DESTRUCTOR  = -7
+	DISPID_COLLECT     = -8
+)
+
+const (
+	MONITOR_DEFAULTTONULL    = 0x00000000
+	MONITOR_DEFAULTTOPRIMARY = 0x00000001
+	MONITOR_DEFAULTTONEAREST = 0x00000002
+
+	MONITORINFOF_PRIMARY = 0x00000001
+)
+
+const (
+	CCHDEVICENAME = 32
+	CCHFORMNAME   = 32
+)
+
+const (
+	IDOK       = 1
+	IDCANCEL   = 2
+	IDABORT    = 3
+	IDRETRY    = 4
+	IDIGNORE   = 5
+	IDYES      = 6
+	IDNO       = 7
+	IDCLOSE    = 8
+	IDHELP     = 9
+	IDTRYAGAIN = 10
+	IDCONTINUE = 11
+	IDTIMEOUT  = 32000
+)
+
+// Generic WM_NOTIFY notification codes
+const (
+	NM_FIRST           = 0
+	NM_OUTOFMEMORY     = NM_FIRST - 1
+	NM_CLICK           = NM_FIRST - 2
+	NM_DBLCLK          = NM_FIRST - 3
+	NM_RETURN          = NM_FIRST - 4
+	NM_RCLICK          = NM_FIRST - 5
+	NM_RDBLCLK         = NM_FIRST - 6
+	NM_SETFOCUS        = NM_FIRST - 7
+	NM_KILLFOCUS       = NM_FIRST - 8
+	NM_CUSTOMDRAW      = NM_FIRST - 12
+	NM_HOVER           = NM_FIRST - 13
+	NM_NCHITTEST       = NM_FIRST - 14
+	NM_KEYDOWN         = NM_FIRST - 15
+	NM_RELEASEDCAPTURE = NM_FIRST - 16
+	NM_SETCURSOR       = NM_FIRST - 17
+	NM_CHAR            = NM_FIRST - 18
+	NM_TOOLTIPSCREATED = NM_FIRST - 19
+	NM_LAST            = NM_FIRST - 99
+)
+
+// ListView messages
+const (
+	LVM_FIRST                    = 0x1000
+	LVM_GETITEMCOUNT             = LVM_FIRST + 4
+	LVM_SETIMAGELIST             = LVM_FIRST + 3
+	LVM_GETIMAGELIST             = LVM_FIRST + 2
+	LVM_GETITEM                  = LVM_FIRST + 75
+	LVM_SETITEM                  = LVM_FIRST + 76
+	LVM_INSERTITEM               = LVM_FIRST + 77
+	LVM_DELETEITEM               = LVM_FIRST + 8
+	LVM_DELETEALLITEMS           = LVM_FIRST + 9
+	LVM_GETCALLBACKMASK          = LVM_FIRST + 10
+	LVM_SETCALLBACKMASK          = LVM_FIRST + 11
+	LVM_SETUNICODEFORMAT         = CCM_SETUNICODEFORMAT
+	LVM_GETNEXTITEM              = LVM_FIRST + 12
+	LVM_FINDITEM                 = LVM_FIRST + 83
+	LVM_GETITEMRECT              = LVM_FIRST + 14
+	LVM_GETSTRINGWIDTH           = LVM_FIRST + 87
+	LVM_HITTEST                  = LVM_FIRST + 18
+	LVM_ENSUREVISIBLE            = LVM_FIRST + 19
+	LVM_SCROLL                   = LVM_FIRST + 20
+	LVM_REDRAWITEMS              = LVM_FIRST + 21
+	LVM_ARRANGE                  = LVM_FIRST + 22
+	LVM_EDITLABEL                = LVM_FIRST + 118
+	LVM_GETEDITCONTROL           = LVM_FIRST + 24
+	LVM_GETCOLUMN                = LVM_FIRST + 95
+	LVM_SETCOLUMN                = LVM_FIRST + 96
+	LVM_INSERTCOLUMN             = LVM_FIRST + 97
+	LVM_DELETECOLUMN             = LVM_FIRST + 28
+	LVM_GETCOLUMNWIDTH           = LVM_FIRST + 29
+	LVM_SETCOLUMNWIDTH           = LVM_FIRST + 30
+	LVM_GETHEADER                = LVM_FIRST + 31
+	LVM_CREATEDRAGIMAGE          = LVM_FIRST + 33
+	LVM_GETVIEWRECT              = LVM_FIRST + 34
+	LVM_GETTEXTCOLOR             = LVM_FIRST + 35
+	LVM_SETTEXTCOLOR             = LVM_FIRST + 36
+	LVM_GETTEXTBKCOLOR           = LVM_FIRST + 37
+	LVM_SETTEXTBKCOLOR           = LVM_FIRST + 38
+	LVM_GETTOPINDEX              = LVM_FIRST + 39
+	LVM_GETCOUNTPERPAGE          = LVM_FIRST + 40
+	LVM_GETORIGIN                = LVM_FIRST + 41
+	LVM_UPDATE                   = LVM_FIRST + 42
+	LVM_SETITEMSTATE             = LVM_FIRST + 43
+	LVM_GETITEMSTATE             = LVM_FIRST + 44
+	LVM_GETITEMTEXT              = LVM_FIRST + 115
+	LVM_SETITEMTEXT              = LVM_FIRST + 116
+	LVM_SETITEMCOUNT             = LVM_FIRST + 47
+	LVM_SORTITEMS                = LVM_FIRST + 48
+	LVM_SETITEMPOSITION32        = LVM_FIRST + 49
+	LVM_GETSELECTEDCOUNT         = LVM_FIRST + 50
+	LVM_GETITEMSPACING           = LVM_FIRST + 51
+	LVM_GETISEARCHSTRING         = LVM_FIRST + 117
+	LVM_SETICONSPACING           = LVM_FIRST + 53
+	LVM_SETEXTENDEDLISTVIEWSTYLE = LVM_FIRST + 54
+	LVM_GETEXTENDEDLISTVIEWSTYLE = LVM_FIRST + 55
+	LVM_GETSUBITEMRECT           = LVM_FIRST + 56
+	LVM_SUBITEMHITTEST           = LVM_FIRST + 57
+	LVM_SETCOLUMNORDERARRAY      = LVM_FIRST + 58
+	LVM_GETCOLUMNORDERARRAY      = LVM_FIRST + 59
+	LVM_SETHOTITEM               = LVM_FIRST + 60
+	LVM_GETHOTITEM               = LVM_FIRST + 61
+	LVM_SETHOTCURSOR             = LVM_FIRST + 62
+	LVM_GETHOTCURSOR             = LVM_FIRST + 63
+	LVM_APPROXIMATEVIEWRECT      = LVM_FIRST + 64
+	LVM_SETWORKAREAS             = LVM_FIRST + 65
+	LVM_GETWORKAREAS             = LVM_FIRST + 70
+	LVM_GETNUMBEROFWORKAREAS     = LVM_FIRST + 73
+	LVM_GETSELECTIONMARK         = LVM_FIRST + 66
+	LVM_SETSELECTIONMARK         = LVM_FIRST + 67
+	LVM_SETHOVERTIME             = LVM_FIRST + 71
+	LVM_GETHOVERTIME             = LVM_FIRST + 72
+	LVM_SETTOOLTIPS              = LVM_FIRST + 74
+	LVM_GETTOOLTIPS              = LVM_FIRST + 78
+	LVM_SORTITEMSEX              = LVM_FIRST + 81
+	LVM_SETBKIMAGE               = LVM_FIRST + 138
+	LVM_GETBKIMAGE               = LVM_FIRST + 139
+	LVM_SETSELECTEDCOLUMN        = LVM_FIRST + 140
+	LVM_SETVIEW                  = LVM_FIRST + 142
+	LVM_GETVIEW                  = LVM_FIRST + 143
+	LVM_INSERTGROUP              = LVM_FIRST + 145
+	LVM_SETGROUPINFO             = LVM_FIRST + 147
+	LVM_GETGROUPINFO             = LVM_FIRST + 149
+	LVM_REMOVEGROUP              = LVM_FIRST + 150
+	LVM_MOVEGROUP                = LVM_FIRST + 151
+	LVM_GETGROUPCOUNT            = LVM_FIRST + 152
+	LVM_GETGROUPINFOBYINDEX      = LVM_FIRST + 153
+	LVM_MOVEITEMTOGROUP          = LVM_FIRST + 154
+	LVM_GETGROUPRECT             = LVM_FIRST + 98
+	LVM_SETGROUPMETRICS          = LVM_FIRST + 155
+	LVM_GETGROUPMETRICS          = LVM_FIRST + 156
+	LVM_ENABLEGROUPVIEW          = LVM_FIRST + 157
+	LVM_SORTGROUPS               = LVM_FIRST + 158
+	LVM_INSERTGROUPSORTED        = LVM_FIRST + 159
+	LVM_REMOVEALLGROUPS          = LVM_FIRST + 160
+	LVM_HASGROUP                 = LVM_FIRST + 161
+	LVM_GETGROUPSTATE            = LVM_FIRST + 92
+	LVM_GETFOCUSEDGROUP          = LVM_FIRST + 93
+	LVM_SETTILEVIEWINFO          = LVM_FIRST + 162
+	LVM_GETTILEVIEWINFO          = LVM_FIRST + 163
+	LVM_SETTILEINFO              = LVM_FIRST + 164
+	LVM_GETTILEINFO              = LVM_FIRST + 165
+	LVM_SETINSERTMARK            = LVM_FIRST + 166
+	LVM_GETINSERTMARK            = LVM_FIRST + 167
+	LVM_INSERTMARKHITTEST        = LVM_FIRST + 168
+	LVM_GETINSERTMARKRECT        = LVM_FIRST + 169
+	LVM_SETINSERTMARKCOLOR       = LVM_FIRST + 170
+	LVM_GETINSERTMARKCOLOR       = LVM_FIRST + 171
+	LVM_SETINFOTIP               = LVM_FIRST + 173
+	LVM_GETSELECTEDCOLUMN        = LVM_FIRST + 174
+	LVM_ISGROUPVIEWENABLED       = LVM_FIRST + 175
+	LVM_GETOUTLINECOLOR          = LVM_FIRST + 176
+	LVM_SETOUTLINECOLOR          = LVM_FIRST + 177
+	LVM_CANCELEDITLABEL          = LVM_FIRST + 179
+	LVM_MAPINDEXTOID             = LVM_FIRST + 180
+	LVM_MAPIDTOINDEX             = LVM_FIRST + 181
+	LVM_ISITEMVISIBLE            = LVM_FIRST + 182
+	LVM_GETNEXTITEMINDEX         = LVM_FIRST + 211
+)
+
+// ListView notifications
+const (
+	LVN_FIRST = -100
+
+	LVN_ITEMCHANGING      = LVN_FIRST - 0
+	LVN_ITEMCHANGED       = LVN_FIRST - 1
+	LVN_INSERTITEM        = LVN_FIRST - 2
+	LVN_DELETEITEM        = LVN_FIRST - 3
+	LVN_DELETEALLITEMS    = LVN_FIRST - 4
+	LVN_BEGINLABELEDITA   = LVN_FIRST - 5
+	LVN_BEGINLABELEDITW   = LVN_FIRST - 75
+	LVN_ENDLABELEDITA     = LVN_FIRST - 6
+	LVN_ENDLABELEDITW     = LVN_FIRST - 76
+	LVN_COLUMNCLICK       = LVN_FIRST - 8
+	LVN_BEGINDRAG         = LVN_FIRST - 9
+	LVN_BEGINRDRAG        = LVN_FIRST - 11
+	LVN_ODCACHEHINT       = LVN_FIRST - 13
+	LVN_ODFINDITEMA       = LVN_FIRST - 52
+	LVN_ODFINDITEMW       = LVN_FIRST - 79
+	LVN_ITEMACTIVATE      = LVN_FIRST - 14
+	LVN_ODSTATECHANGED    = LVN_FIRST - 15
+	LVN_HOTTRACK          = LVN_FIRST - 21
+	LVN_GETDISPINFO       = LVN_FIRST - 77
+	LVN_SETDISPINFO       = LVN_FIRST - 78
+	LVN_KEYDOWN           = LVN_FIRST - 55
+	LVN_MARQUEEBEGIN      = LVN_FIRST - 56
+	LVN_GETINFOTIP        = LVN_FIRST - 58
+	LVN_INCREMENTALSEARCH = LVN_FIRST - 63
+	LVN_BEGINSCROLL       = LVN_FIRST - 80
+	LVN_ENDSCROLL         = LVN_FIRST - 81
+)
+
+// ListView LVNI constants
+const (
+	LVNI_ALL         = 0
+	LVNI_FOCUSED     = 1
+	LVNI_SELECTED    = 2
+	LVNI_CUT         = 4
+	LVNI_DROPHILITED = 8
+	LVNI_ABOVE       = 256
+	LVNI_BELOW       = 512
+	LVNI_TOLEFT      = 1024
+	LVNI_TORIGHT     = 2048
+)
+
+// ListView styles
+const (
+	LVS_ICON            = 0x0000
+	LVS_REPORT          = 0x0001
+	LVS_SMALLICON       = 0x0002
+	LVS_LIST            = 0x0003
+	LVS_TYPEMASK        = 0x0003
+	LVS_SINGLESEL       = 0x0004
+	LVS_SHOWSELALWAYS   = 0x0008
+	LVS_SORTASCENDING   = 0x0010
+	LVS_SORTDESCENDING  = 0x0020
+	LVS_SHAREIMAGELISTS = 0x0040
+	LVS_NOLABELWRAP     = 0x0080
+	LVS_AUTOARRANGE     = 0x0100
+	LVS_EDITLABELS      = 0x0200
+	LVS_OWNERDATA       = 0x1000
+	LVS_NOSCROLL        = 0x2000
+	LVS_TYPESTYLEMASK   = 0xfc00
+	LVS_ALIGNTOP        = 0x0000
+	LVS_ALIGNLEFT       = 0x0800
+	LVS_ALIGNMASK       = 0x0c00
+	LVS_OWNERDRAWFIXED  = 0x0400
+	LVS_NOCOLUMNHEADER  = 0x4000
+	LVS_NOSORTHEADER    = 0x8000
+)
+
+// ListView extended styles
+const (
+	LVS_EX_GRIDLINES        = 0x00000001
+	LVS_EX_SUBITEMIMAGES    = 0x00000002
+	LVS_EX_CHECKBOXES       = 0x00000004
+	LVS_EX_TRACKSELECT      = 0x00000008
+	LVS_EX_HEADERDRAGDROP   = 0x00000010
+	LVS_EX_FULLROWSELECT    = 0x00000020
+	LVS_EX_ONECLICKACTIVATE = 0x00000040
+	LVS_EX_TWOCLICKACTIVATE = 0x00000080
+	LVS_EX_FLATSB           = 0x00000100
+	LVS_EX_REGIONAL         = 0x00000200
+	LVS_EX_INFOTIP          = 0x00000400
+	LVS_EX_UNDERLINEHOT     = 0x00000800
+	LVS_EX_UNDERLINECOLD    = 0x00001000
+	LVS_EX_MULTIWORKAREAS   = 0x00002000
+	LVS_EX_LABELTIP         = 0x00004000
+	LVS_EX_BORDERSELECT     = 0x00008000
+	LVS_EX_DOUBLEBUFFER     = 0x00010000
+	LVS_EX_HIDELABELS       = 0x00020000
+	LVS_EX_SINGLEROW        = 0x00040000
+	LVS_EX_SNAPTOGRID       = 0x00080000
+	LVS_EX_SIMPLESELECT     = 0x00100000
+)
+
+// ListView column flags
+const (
+	LVCF_FMT     = 0x0001
+	LVCF_WIDTH   = 0x0002
+	LVCF_TEXT    = 0x0004
+	LVCF_SUBITEM = 0x0008
+	LVCF_IMAGE   = 0x0010
+	LVCF_ORDER   = 0x0020
+)
+
+// ListView column format constants
+const (
+	LVCFMT_LEFT            = 0x0000
+	LVCFMT_RIGHT           = 0x0001
+	LVCFMT_CENTER          = 0x0002
+	LVCFMT_JUSTIFYMASK     = 0x0003
+	LVCFMT_IMAGE           = 0x0800
+	LVCFMT_BITMAP_ON_RIGHT = 0x1000
+	LVCFMT_COL_HAS_IMAGES  = 0x8000
+)
+
+// ListView item flags
+const (
+	LVIF_TEXT        = 0x00000001
+	LVIF_IMAGE       = 0x00000002
+	LVIF_PARAM       = 0x00000004
+	LVIF_STATE       = 0x00000008
+	LVIF_INDENT      = 0x00000010
+	LVIF_NORECOMPUTE = 0x00000800
+	LVIF_GROUPID     = 0x00000100
+	LVIF_COLUMNS     = 0x00000200
+)
+
+// ListView item states
+const (
+	LVIS_FOCUSED        = 1
+	LVIS_SELECTED       = 2
+	LVIS_CUT            = 4
+	LVIS_DROPHILITED    = 8
+	LVIS_OVERLAYMASK    = 0xF00
+	LVIS_STATEIMAGEMASK = 0xF000
+)
+
+// ListView hit test constants
+const (
+	LVHT_NOWHERE         = 0x00000001
+	LVHT_ONITEMICON      = 0x00000002
+	LVHT_ONITEMLABEL     = 0x00000004
+	LVHT_ONITEMSTATEICON = 0x00000008
+	LVHT_ONITEM          = LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON
+
+	LVHT_ABOVE   = 0x00000008
+	LVHT_BELOW   = 0x00000010
+	LVHT_TORIGHT = 0x00000020
+	LVHT_TOLEFT  = 0x00000040
+)
+
+// ListView image list types
+const (
+	LVSIL_NORMAL      = 0
+	LVSIL_SMALL       = 1
+	LVSIL_STATE       = 2
+	LVSIL_GROUPHEADER = 3
+)
+
+// InitCommonControlsEx flags
+const (
+	ICC_LISTVIEW_CLASSES   = 1
+	ICC_TREEVIEW_CLASSES   = 2
+	ICC_BAR_CLASSES        = 4
+	ICC_TAB_CLASSES        = 8
+	ICC_UPDOWN_CLASS       = 16
+	ICC_PROGRESS_CLASS     = 32
+	ICC_HOTKEY_CLASS       = 64
+	ICC_ANIMATE_CLASS      = 128
+	ICC_WIN95_CLASSES      = 255
+	ICC_DATE_CLASSES       = 256
+	ICC_USEREX_CLASSES     = 512
+	ICC_COOL_CLASSES       = 1024
+	ICC_INTERNET_CLASSES   = 2048
+	ICC_PAGESCROLLER_CLASS = 4096
+	ICC_NATIVEFNTCTL_CLASS = 8192
+	INFOTIPSIZE            = 1024
+	ICC_STANDARD_CLASSES   = 0x00004000
+	ICC_LINK_CLASS         = 0x00008000
+)
+
+// Dialog Codes
+const (
+	DLGC_WANTARROWS      = 0x0001
+	DLGC_WANTTAB         = 0x0002
+	DLGC_WANTALLKEYS     = 0x0004
+	DLGC_WANTMESSAGE     = 0x0004
+	DLGC_HASSETSEL       = 0x0008
+	DLGC_DEFPUSHBUTTON   = 0x0010
+	DLGC_UNDEFPUSHBUTTON = 0x0020
+	DLGC_RADIOBUTTON     = 0x0040
+	DLGC_WANTCHARS       = 0x0080
+	DLGC_STATIC          = 0x0100
+	DLGC_BUTTON          = 0x2000
+)
+
+// Get/SetWindowWord/Long offsets for use with WC_DIALOG windows
+const (
+	DWL_MSGRESULT = 0
+	DWL_DLGPROC   = 4
+	DWL_USER      = 8
+)
+
+// Registry predefined keys
+const (
+	HKEY_CLASSES_ROOT     HKEY = 0x80000000
+	HKEY_CURRENT_USER     HKEY = 0x80000001
+	HKEY_LOCAL_MACHINE    HKEY = 0x80000002
+	HKEY_USERS            HKEY = 0x80000003
+	HKEY_PERFORMANCE_DATA HKEY = 0x80000004
+	HKEY_CURRENT_CONFIG   HKEY = 0x80000005
+	HKEY_DYN_DATA         HKEY = 0x80000006
+)
+
+// Registry Key Security and Access Rights
+const (
+	KEY_ALL_ACCESS         = 0xF003F
+	KEY_CREATE_SUB_KEY     = 0x0004
+	KEY_ENUMERATE_SUB_KEYS = 0x0008
+	KEY_NOTIFY             = 0x0010
+	KEY_QUERY_VALUE        = 0x0001
+	KEY_SET_VALUE          = 0x0002
+	KEY_READ               = 0x20019
+	KEY_WRITE              = 0x20006
+)
+
+const (
+	NFR_ANSI    = 1
+	NFR_UNICODE = 2
+	NF_QUERY    = 3
+	NF_REQUERY  = 4
+)
+
+// Registry value types
+const (
+	RRF_RT_REG_NONE         = 0x00000001
+	RRF_RT_REG_SZ           = 0x00000002
+	RRF_RT_REG_EXPAND_SZ    = 0x00000004
+	RRF_RT_REG_BINARY       = 0x00000008
+	RRF_RT_REG_DWORD        = 0x00000010
+	RRF_RT_REG_MULTI_SZ     = 0x00000020
+	RRF_RT_REG_QWORD        = 0x00000040
+	RRF_RT_DWORD            = (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD)
+	RRF_RT_QWORD            = (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD)
+	RRF_RT_ANY              = 0x0000ffff
+	RRF_NOEXPAND            = 0x10000000
+	RRF_ZEROONFAILURE       = 0x20000000
+	REG_PROCESS_APPKEY      = 0x00000001
+	REG_MUI_STRING_TRUNCATE = 0x00000001
+)
+
+// PeekMessage wRemoveMsg value
+const (
+	PM_NOREMOVE = 0x000
+	PM_REMOVE   = 0x001
+	PM_NOYIELD  = 0x002
+)
+
+// ImageList flags
+const (
+	ILC_MASK             = 0x00000001
+	ILC_COLOR            = 0x00000000
+	ILC_COLORDDB         = 0x000000FE
+	ILC_COLOR4           = 0x00000004
+	ILC_COLOR8           = 0x00000008
+	ILC_COLOR16          = 0x00000010
+	ILC_COLOR24          = 0x00000018
+	ILC_COLOR32          = 0x00000020
+	ILC_PALETTE          = 0x00000800
+	ILC_MIRROR           = 0x00002000
+	ILC_PERITEMMIRROR    = 0x00008000
+	ILC_ORIGINALSIZE     = 0x00010000
+	ILC_HIGHQUALITYSCALE = 0x00020000
+)
+
+// Keystroke Message Flags
+const (
+	KF_EXTENDED = 0x0100
+	KF_DLGMODE  = 0x0800
+	KF_MENUMODE = 0x1000
+	KF_ALTDOWN  = 0x2000
+	KF_REPEAT   = 0x4000
+	KF_UP       = 0x8000
+)
+
+// Virtual-Key Codes
+const (
+	VK_LBUTTON             = 0x01
+	VK_RBUTTON             = 0x02
+	VK_CANCEL              = 0x03
+	VK_MBUTTON             = 0x04
+	VK_XBUTTON1            = 0x05
+	VK_XBUTTON2            = 0x06
+	VK_BACK                = 0x08
+	VK_TAB                 = 0x09
+	VK_CLEAR               = 0x0C
+	VK_RETURN              = 0x0D
+	VK_SHIFT               = 0x10
+	VK_CONTROL             = 0x11
+	VK_MENU                = 0x12
+	VK_PAUSE               = 0x13
+	VK_CAPITAL             = 0x14
+	VK_KANA                = 0x15
+	VK_HANGEUL             = 0x15
+	VK_HANGUL              = 0x15
+	VK_JUNJA               = 0x17
+	VK_FINAL               = 0x18
+	VK_HANJA               = 0x19
+	VK_KANJI               = 0x19
+	VK_ESCAPE              = 0x1B
+	VK_CONVERT             = 0x1C
+	VK_NONCONVERT          = 0x1D
+	VK_ACCEPT              = 0x1E
+	VK_MODECHANGE          = 0x1F
+	VK_SPACE               = 0x20
+	VK_PRIOR               = 0x21
+	VK_NEXT                = 0x22
+	VK_END                 = 0x23
+	VK_HOME                = 0x24
+	VK_LEFT                = 0x25
+	VK_UP                  = 0x26
+	VK_RIGHT               = 0x27
+	VK_DOWN                = 0x28
+	VK_SELECT              = 0x29
+	VK_PRINT               = 0x2A
+	VK_EXECUTE             = 0x2B
+	VK_SNAPSHOT            = 0x2C
+	VK_INSERT              = 0x2D
+	VK_DELETE              = 0x2E
+	VK_HELP                = 0x2F
+	VK_LWIN                = 0x5B
+	VK_RWIN                = 0x5C
+	VK_APPS                = 0x5D
+	VK_SLEEP               = 0x5F
+	VK_NUMPAD0             = 0x60
+	VK_NUMPAD1             = 0x61
+	VK_NUMPAD2             = 0x62
+	VK_NUMPAD3             = 0x63
+	VK_NUMPAD4             = 0x64
+	VK_NUMPAD5             = 0x65
+	VK_NUMPAD6             = 0x66
+	VK_NUMPAD7             = 0x67
+	VK_NUMPAD8             = 0x68
+	VK_NUMPAD9             = 0x69
+	VK_MULTIPLY            = 0x6A
+	VK_ADD                 = 0x6B
+	VK_SEPARATOR           = 0x6C
+	VK_SUBTRACT            = 0x6D
+	VK_DECIMAL             = 0x6E
+	VK_DIVIDE              = 0x6F
+	VK_F1                  = 0x70
+	VK_F2                  = 0x71
+	VK_F3                  = 0x72
+	VK_F4                  = 0x73
+	VK_F5                  = 0x74
+	VK_F6                  = 0x75
+	VK_F7                  = 0x76
+	VK_F8                  = 0x77
+	VK_F9                  = 0x78
+	VK_F10                 = 0x79
+	VK_F11                 = 0x7A
+	VK_F12                 = 0x7B
+	VK_F13                 = 0x7C
+	VK_F14                 = 0x7D
+	VK_F15                 = 0x7E
+	VK_F16                 = 0x7F
+	VK_F17                 = 0x80
+	VK_F18                 = 0x81
+	VK_F19                 = 0x82
+	VK_F20                 = 0x83
+	VK_F21                 = 0x84
+	VK_F22                 = 0x85
+	VK_F23                 = 0x86
+	VK_F24                 = 0x87
+	VK_NUMLOCK             = 0x90
+	VK_SCROLL              = 0x91
+	VK_OEM_NEC_EQUAL       = 0x92
+	VK_OEM_FJ_JISHO        = 0x92
+	VK_OEM_FJ_MASSHOU      = 0x93
+	VK_OEM_FJ_TOUROKU      = 0x94
+	VK_OEM_FJ_LOYA         = 0x95
+	VK_OEM_FJ_ROYA         = 0x96
+	VK_LSHIFT              = 0xA0
+	VK_RSHIFT              = 0xA1
+	VK_LCONTROL            = 0xA2
+	VK_RCONTROL            = 0xA3
+	VK_LMENU               = 0xA4
+	VK_RMENU               = 0xA5
+	VK_BROWSER_BACK        = 0xA6
+	VK_BROWSER_FORWARD     = 0xA7
+	VK_BROWSER_REFRESH     = 0xA8
+	VK_BROWSER_STOP        = 0xA9
+	VK_BROWSER_SEARCH      = 0xAA
+	VK_BROWSER_FAVORITES   = 0xAB
+	VK_BROWSER_HOME        = 0xAC
+	VK_VOLUME_MUTE         = 0xAD
+	VK_VOLUME_DOWN         = 0xAE
+	VK_VOLUME_UP           = 0xAF
+	VK_MEDIA_NEXT_TRACK    = 0xB0
+	VK_MEDIA_PREV_TRACK    = 0xB1
+	VK_MEDIA_STOP          = 0xB2
+	VK_MEDIA_PLAY_PAUSE    = 0xB3
+	VK_LAUNCH_MAIL         = 0xB4
+	VK_LAUNCH_MEDIA_SELECT = 0xB5
+	VK_LAUNCH_APP1         = 0xB6
+	VK_LAUNCH_APP2         = 0xB7
+	VK_OEM_1               = 0xBA
+	VK_OEM_PLUS            = 0xBB
+	VK_OEM_COMMA           = 0xBC
+	VK_OEM_MINUS           = 0xBD
+	VK_OEM_PERIOD          = 0xBE
+	VK_OEM_2               = 0xBF
+	VK_OEM_3               = 0xC0
+	VK_OEM_4               = 0xDB
+	VK_OEM_5               = 0xDC
+	VK_OEM_6               = 0xDD
+	VK_OEM_7               = 0xDE
+	VK_OEM_8               = 0xDF
+	VK_OEM_AX              = 0xE1
+	VK_OEM_102             = 0xE2
+	VK_ICO_HELP            = 0xE3
+	VK_ICO_00              = 0xE4
+	VK_PROCESSKEY          = 0xE5
+	VK_ICO_CLEAR           = 0xE6
+	VK_OEM_RESET           = 0xE9
+	VK_OEM_JUMP            = 0xEA
+	VK_OEM_PA1             = 0xEB
+	VK_OEM_PA2             = 0xEC
+	VK_OEM_PA3             = 0xED
+	VK_OEM_WSCTRL          = 0xEE
+	VK_OEM_CUSEL           = 0xEF
+	VK_OEM_ATTN            = 0xF0
+	VK_OEM_FINISH          = 0xF1
+	VK_OEM_COPY            = 0xF2
+	VK_OEM_AUTO            = 0xF3
+	VK_OEM_ENLW            = 0xF4
+	VK_OEM_BACKTAB         = 0xF5
+	VK_ATTN                = 0xF6
+	VK_CRSEL               = 0xF7
+	VK_EXSEL               = 0xF8
+	VK_EREOF               = 0xF9
+	VK_PLAY                = 0xFA
+	VK_ZOOM                = 0xFB
+	VK_NONAME              = 0xFC
+	VK_PA1                 = 0xFD
+	VK_OEM_CLEAR           = 0xFE
+)
+
+// Registry Value Types
+const (
+	REG_NONE                       = 0
+	REG_SZ                         = 1
+	REG_EXPAND_SZ                  = 2
+	REG_BINARY                     = 3
+	REG_DWORD                      = 4
+	REG_DWORD_LITTLE_ENDIAN        = 4
+	REG_DWORD_BIG_ENDIAN           = 5
+	REG_LINK                       = 6
+	REG_MULTI_SZ                   = 7
+	REG_RESOURCE_LIST              = 8
+	REG_FULL_RESOURCE_DESCRIPTOR   = 9
+	REG_RESOURCE_REQUIREMENTS_LIST = 10
+	REG_QWORD                      = 11
+	REG_QWORD_LITTLE_ENDIAN        = 11
+)
+
+// Tooltip styles
+const (
+	TTS_ALWAYSTIP      = 0x01
+	TTS_NOPREFIX       = 0x02
+	TTS_NOANIMATE      = 0x10
+	TTS_NOFADE         = 0x20
+	TTS_BALLOON        = 0x40
+	TTS_CLOSE          = 0x80
+	TTS_USEVISUALSTYLE = 0x100
+)
+
+// Tooltip messages
+const (
+	TTM_ACTIVATE        = (WM_USER + 1)
+	TTM_SETDELAYTIME    = (WM_USER + 3)
+	TTM_ADDTOOL         = (WM_USER + 50)
+	TTM_DELTOOL         = (WM_USER + 51)
+	TTM_NEWTOOLRECT     = (WM_USER + 52)
+	TTM_RELAYEVENT      = (WM_USER + 7)
+	TTM_GETTOOLINFO     = (WM_USER + 53)
+	TTM_SETTOOLINFO     = (WM_USER + 54)
+	TTM_HITTEST         = (WM_USER + 55)
+	TTM_GETTEXT         = (WM_USER + 56)
+	TTM_UPDATETIPTEXT   = (WM_USER + 57)
+	TTM_GETTOOLCOUNT    = (WM_USER + 13)
+	TTM_ENUMTOOLS       = (WM_USER + 58)
+	TTM_GETCURRENTTOOL  = (WM_USER + 59)
+	TTM_WINDOWFROMPOINT = (WM_USER + 16)
+	TTM_TRACKACTIVATE   = (WM_USER + 17)
+	TTM_TRACKPOSITION   = (WM_USER + 18)
+	TTM_SETTIPBKCOLOR   = (WM_USER + 19)
+	TTM_SETTIPTEXTCOLOR = (WM_USER + 20)
+	TTM_GETDELAYTIME    = (WM_USER + 21)
+	TTM_GETTIPBKCOLOR   = (WM_USER + 22)
+	TTM_GETTIPTEXTCOLOR = (WM_USER + 23)
+	TTM_SETMAXTIPWIDTH  = (WM_USER + 24)
+	TTM_GETMAXTIPWIDTH  = (WM_USER + 25)
+	TTM_SETMARGIN       = (WM_USER + 26)
+	TTM_GETMARGIN       = (WM_USER + 27)
+	TTM_POP             = (WM_USER + 28)
+	TTM_UPDATE          = (WM_USER + 29)
+	TTM_GETBUBBLESIZE   = (WM_USER + 30)
+	TTM_ADJUSTRECT      = (WM_USER + 31)
+	TTM_SETTITLE        = (WM_USER + 33)
+	TTM_POPUP           = (WM_USER + 34)
+	TTM_GETTITLE        = (WM_USER + 35)
+)
+
+// Tooltip icons
+const (
+	TTI_NONE          = 0
+	TTI_INFO          = 1
+	TTI_WARNING       = 2
+	TTI_ERROR         = 3
+	TTI_INFO_LARGE    = 4
+	TTI_WARNING_LARGE = 5
+	TTI_ERROR_LARGE   = 6
+)
+
+// Tooltip notifications
+const (
+	TTN_FIRST       = -520
+	TTN_LAST        = -549
+	TTN_GETDISPINFO = (TTN_FIRST - 10)
+	TTN_SHOW        = (TTN_FIRST - 1)
+	TTN_POP         = (TTN_FIRST - 2)
+	TTN_LINKCLICK   = (TTN_FIRST - 3)
+	TTN_NEEDTEXT    = TTN_GETDISPINFO
+)
+
+const (
+	TTF_IDISHWND    = 0x0001
+	TTF_CENTERTIP   = 0x0002
+	TTF_RTLREADING  = 0x0004
+	TTF_SUBCLASS    = 0x0010
+	TTF_TRACK       = 0x0020
+	TTF_ABSOLUTE    = 0x0080
+	TTF_TRANSPARENT = 0x0100
+	TTF_PARSELINKS  = 0x1000
+	TTF_DI_SETITEM  = 0x8000
+)
+
+const (
+	SWP_NOSIZE         = 0x0001
+	SWP_NOMOVE         = 0x0002
+	SWP_NOZORDER       = 0x0004
+	SWP_NOREDRAW       = 0x0008
+	SWP_NOACTIVATE     = 0x0010
+	SWP_FRAMECHANGED   = 0x0020
+	SWP_SHOWWINDOW     = 0x0040
+	SWP_HIDEWINDOW     = 0x0080
+	SWP_NOCOPYBITS     = 0x0100
+	SWP_NOOWNERZORDER  = 0x0200
+	SWP_NOSENDCHANGING = 0x0400
+	SWP_DRAWFRAME      = SWP_FRAMECHANGED
+	SWP_NOREPOSITION   = SWP_NOOWNERZORDER
+	SWP_DEFERERASE     = 0x2000
+	SWP_ASYNCWINDOWPOS = 0x4000
+)
+
+// Predefined window handles
+const (
+	HWND_BROADCAST = HWND(0xFFFF)
+	HWND_BOTTOM    = HWND(1)
+	HWND_NOTOPMOST = ^HWND(1) // -2
+	HWND_TOP       = HWND(0)
+	HWND_TOPMOST   = ^HWND(0) // -1
+	HWND_DESKTOP   = HWND(0)
+	HWND_MESSAGE   = ^HWND(2) // -3
+)
+
+// Pen types
+const (
+	PS_COSMETIC  = 0x00000000
+	PS_GEOMETRIC = 0x00010000
+	PS_TYPE_MASK = 0x000F0000
+)
+
+// Pen styles
+const (
+	PS_SOLID       = 0
+	PS_DASH        = 1
+	PS_DOT         = 2
+	PS_DASHDOT     = 3
+	PS_DASHDOTDOT  = 4
+	PS_NULL        = 5
+	PS_INSIDEFRAME = 6
+	PS_USERSTYLE   = 7
+	PS_ALTERNATE   = 8
+	PS_STYLE_MASK  = 0x0000000F
+)
+
+// Pen cap types
+const (
+	PS_ENDCAP_ROUND  = 0x00000000
+	PS_ENDCAP_SQUARE = 0x00000100
+	PS_ENDCAP_FLAT   = 0x00000200
+	PS_ENDCAP_MASK   = 0x00000F00
+)
+
+// Pen join types
+const (
+	PS_JOIN_ROUND = 0x00000000
+	PS_JOIN_BEVEL = 0x00001000
+	PS_JOIN_MITER = 0x00002000
+	PS_JOIN_MASK  = 0x0000F000
+)
+
+// Hatch styles
+const (
+	HS_HORIZONTAL = 0
+	HS_VERTICAL   = 1
+	HS_FDIAGONAL  = 2
+	HS_BDIAGONAL  = 3
+	HS_CROSS      = 4
+	HS_DIAGCROSS  = 5
+)
+
+// Stock Logical Objects
+const (
+	WHITE_BRUSH         = 0
+	LTGRAY_BRUSH        = 1
+	GRAY_BRUSH          = 2
+	DKGRAY_BRUSH        = 3
+	BLACK_BRUSH         = 4
+	NULL_BRUSH          = 5
+	HOLLOW_BRUSH        = NULL_BRUSH
+	WHITE_PEN           = 6
+	BLACK_PEN           = 7
+	NULL_PEN            = 8
+	OEM_FIXED_FONT      = 10
+	ANSI_FIXED_FONT     = 11
+	ANSI_VAR_FONT       = 12
+	SYSTEM_FONT         = 13
+	DEVICE_DEFAULT_FONT = 14
+	DEFAULT_PALETTE     = 15
+	SYSTEM_FIXED_FONT   = 16
+	DEFAULT_GUI_FONT    = 17
+	DC_BRUSH            = 18
+	DC_PEN              = 19
+)
+
+// Brush styles
+const (
+	BS_SOLID         = 0
+	BS_NULL          = 1
+	BS_HOLLOW        = BS_NULL
+	BS_HATCHED       = 2
+	BS_PATTERN       = 3
+	BS_INDEXED       = 4
+	BS_DIBPATTERN    = 5
+	BS_DIBPATTERNPT  = 6
+	BS_PATTERN8X8    = 7
+	BS_DIBPATTERN8X8 = 8
+	BS_MONOPATTERN   = 9
+)
+
+// TRACKMOUSEEVENT flags
+const (
+	TME_HOVER     = 0x00000001
+	TME_LEAVE     = 0x00000002
+	TME_NONCLIENT = 0x00000010
+	TME_QUERY     = 0x40000000
+	TME_CANCEL    = 0x80000000
+
+	HOVER_DEFAULT = 0xFFFFFFFF
+)
+
+// WM_NCHITTEST and MOUSEHOOKSTRUCT Mouse Position Codes
+const (
+	HTERROR       = (-2)
+	HTTRANSPARENT = (-1)
+	HTNOWHERE     = 0
+	HTCLIENT      = 1
+	HTCAPTION     = 2
+	HTSYSMENU     = 3
+	HTGROWBOX     = 4
+	HTSIZE        = HTGROWBOX
+	HTMENU        = 5
+	HTHSCROLL     = 6
+	HTVSCROLL     = 7
+	HTMINBUTTON   = 8
+	HTMAXBUTTON   = 9
+	HTLEFT        = 10
+	HTRIGHT       = 11
+	HTTOP         = 12
+	HTTOPLEFT     = 13
+	HTTOPRIGHT    = 14
+	HTBOTTOM      = 15
+	HTBOTTOMLEFT  = 16
+	HTBOTTOMRIGHT = 17
+	HTBORDER      = 18
+	HTREDUCE      = HTMINBUTTON
+	HTZOOM        = HTMAXBUTTON
+	HTSIZEFIRST   = HTLEFT
+	HTSIZELAST    = HTBOTTOMRIGHT
+	HTOBJECT      = 19
+	HTCLOSE       = 20
+	HTHELP        = 21
+)
+
+// DrawText[Ex] format flags
+const (
+	DT_TOP                  = 0x00000000
+	DT_LEFT                 = 0x00000000
+	DT_CENTER               = 0x00000001
+	DT_RIGHT                = 0x00000002
+	DT_VCENTER              = 0x00000004
+	DT_BOTTOM               = 0x00000008
+	DT_WORDBREAK            = 0x00000010
+	DT_SINGLELINE           = 0x00000020
+	DT_EXPANDTABS           = 0x00000040
+	DT_TABSTOP              = 0x00000080
+	DT_NOCLIP               = 0x00000100
+	DT_EXTERNALLEADING      = 0x00000200
+	DT_CALCRECT             = 0x00000400
+	DT_NOPREFIX             = 0x00000800
+	DT_INTERNAL             = 0x00001000
+	DT_EDITCONTROL          = 0x00002000
+	DT_PATH_ELLIPSIS        = 0x00004000
+	DT_END_ELLIPSIS         = 0x00008000
+	DT_MODIFYSTRING         = 0x00010000
+	DT_RTLREADING           = 0x00020000
+	DT_WORD_ELLIPSIS        = 0x00040000
+	DT_NOFULLWIDTHCHARBREAK = 0x00080000
+	DT_HIDEPREFIX           = 0x00100000
+	DT_PREFIXONLY           = 0x00200000
+)
+
+const CLR_INVALID = 0xFFFFFFFF
+
+// Background Modes
+const (
+	TRANSPARENT = 1
+	OPAQUE      = 2
+	BKMODE_LAST = 2
+)
+
+// Global Memory Flags
+const (
+	GMEM_FIXED          = 0x0000
+	GMEM_MOVEABLE       = 0x0002
+	GMEM_NOCOMPACT      = 0x0010
+	GMEM_NODISCARD      = 0x0020
+	GMEM_ZEROINIT       = 0x0040
+	GMEM_MODIFY         = 0x0080
+	GMEM_DISCARDABLE    = 0x0100
+	GMEM_NOT_BANKED     = 0x1000
+	GMEM_SHARE          = 0x2000
+	GMEM_DDESHARE       = 0x2000
+	GMEM_NOTIFY         = 0x4000
+	GMEM_LOWER          = GMEM_NOT_BANKED
+	GMEM_VALID_FLAGS    = 0x7F72
+	GMEM_INVALID_HANDLE = 0x8000
+	GHND                = (GMEM_MOVEABLE | GMEM_ZEROINIT)
+	GPTR                = (GMEM_FIXED | GMEM_ZEROINIT)
+)
+
+// Ternary raster operations
+const (
+	SRCCOPY        = 0x00CC0020
+	SRCPAINT       = 0x00EE0086
+	SRCAND         = 0x008800C6
+	SRCINVERT      = 0x00660046
+	SRCERASE       = 0x00440328
+	NOTSRCCOPY     = 0x00330008
+	NOTSRCERASE    = 0x001100A6
+	MERGECOPY      = 0x00C000CA
+	MERGEPAINT     = 0x00BB0226
+	PATCOPY        = 0x00F00021
+	PATPAINT       = 0x00FB0A09
+	PATINVERT      = 0x005A0049
+	DSTINVERT      = 0x00550009
+	BLACKNESS      = 0x00000042
+	WHITENESS      = 0x00FF0062
+	NOMIRRORBITMAP = 0x80000000
+	CAPTUREBLT     = 0x40000000
+)
+
+// Clipboard formats
+const (
+	CF_TEXT            = 1
+	CF_BITMAP          = 2
+	CF_METAFILEPICT    = 3
+	CF_SYLK            = 4
+	CF_DIF             = 5
+	CF_TIFF            = 6
+	CF_OEMTEXT         = 7
+	CF_DIB             = 8
+	CF_PALETTE         = 9
+	CF_PENDATA         = 10
+	CF_RIFF            = 11
+	CF_WAVE            = 12
+	CF_UNICODETEXT     = 13
+	CF_ENHMETAFILE     = 14
+	CF_HDROP           = 15
+	CF_LOCALE          = 16
+	CF_DIBV5           = 17
+	CF_MAX             = 18
+	CF_OWNERDISPLAY    = 0x0080
+	CF_DSPTEXT         = 0x0081
+	CF_DSPBITMAP       = 0x0082
+	CF_DSPMETAFILEPICT = 0x0083
+	CF_DSPENHMETAFILE  = 0x008E
+	CF_PRIVATEFIRST    = 0x0200
+	CF_PRIVATELAST     = 0x02FF
+	CF_GDIOBJFIRST     = 0x0300
+	CF_GDIOBJLAST      = 0x03FF
+)
+
+// Bitmap compression formats
+const (
+	BI_RGB       = 0
+	BI_RLE8      = 1
+	BI_RLE4      = 2
+	BI_BITFIELDS = 3
+	BI_JPEG      = 4
+	BI_PNG       = 5
+)
+
+// SetDIBitsToDevice fuColorUse
+const (
+	DIB_PAL_COLORS = 1
+	DIB_RGB_COLORS = 0
+)
+
+const (
+	STANDARD_RIGHTS_REQUIRED = 0x000F
+)
+
+// Service Control Manager object specific access types
+const (
+	SC_MANAGER_CONNECT            = 0x0001
+	SC_MANAGER_CREATE_SERVICE     = 0x0002
+	SC_MANAGER_ENUMERATE_SERVICE  = 0x0004
+	SC_MANAGER_LOCK               = 0x0008
+	SC_MANAGER_QUERY_LOCK_STATUS  = 0x0010
+	SC_MANAGER_MODIFY_BOOT_CONFIG = 0x0020
+	SC_MANAGER_ALL_ACCESS         = STANDARD_RIGHTS_REQUIRED | SC_MANAGER_CONNECT | SC_MANAGER_CREATE_SERVICE | SC_MANAGER_ENUMERATE_SERVICE | SC_MANAGER_LOCK | SC_MANAGER_QUERY_LOCK_STATUS | SC_MANAGER_MODIFY_BOOT_CONFIG
+)
+
+// Service Types (Bit Mask)
+const (
+	SERVICE_KERNEL_DRIVER       = 0x00000001
+	SERVICE_FILE_SYSTEM_DRIVER  = 0x00000002
+	SERVICE_ADAPTER             = 0x00000004
+	SERVICE_RECOGNIZER_DRIVER   = 0x00000008
+	SERVICE_DRIVER              = SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_RECOGNIZER_DRIVER
+	SERVICE_WIN32_OWN_PROCESS   = 0x00000010
+	SERVICE_WIN32_SHARE_PROCESS = 0x00000020
+	SERVICE_WIN32               = SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS
+	SERVICE_INTERACTIVE_PROCESS = 0x00000100
+	SERVICE_TYPE_ALL            = SERVICE_WIN32 | SERVICE_ADAPTER | SERVICE_DRIVER | SERVICE_INTERACTIVE_PROCESS
+)
+
+// Service State -- for CurrentState
+const (
+	SERVICE_STOPPED          = 0x00000001
+	SERVICE_START_PENDING    = 0x00000002
+	SERVICE_STOP_PENDING     = 0x00000003
+	SERVICE_RUNNING          = 0x00000004
+	SERVICE_CONTINUE_PENDING = 0x00000005
+	SERVICE_PAUSE_PENDING    = 0x00000006
+	SERVICE_PAUSED           = 0x00000007
+)
+
+// Controls Accepted  (Bit Mask)
+const (
+	SERVICE_ACCEPT_STOP                  = 0x00000001
+	SERVICE_ACCEPT_PAUSE_CONTINUE        = 0x00000002
+	SERVICE_ACCEPT_SHUTDOWN              = 0x00000004
+	SERVICE_ACCEPT_PARAMCHANGE           = 0x00000008
+	SERVICE_ACCEPT_NETBINDCHANGE         = 0x00000010
+	SERVICE_ACCEPT_HARDWAREPROFILECHANGE = 0x00000020
+	SERVICE_ACCEPT_POWEREVENT            = 0x00000040
+	SERVICE_ACCEPT_SESSIONCHANGE         = 0x00000080
+	SERVICE_ACCEPT_PRESHUTDOWN           = 0x00000100
+	SERVICE_ACCEPT_TIMECHANGE            = 0x00000200
+	SERVICE_ACCEPT_TRIGGEREVENT          = 0x00000400
+)
+
+// Service object specific access type
+const (
+	SERVICE_QUERY_CONFIG         = 0x0001
+	SERVICE_CHANGE_CONFIG        = 0x0002
+	SERVICE_QUERY_STATUS         = 0x0004
+	SERVICE_ENUMERATE_DEPENDENTS = 0x0008
+	SERVICE_START                = 0x0010
+	SERVICE_STOP                 = 0x0020
+	SERVICE_PAUSE_CONTINUE       = 0x0040
+	SERVICE_INTERROGATE          = 0x0080
+	SERVICE_USER_DEFINED_CONTROL = 0x0100
+
+	SERVICE_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED |
+		SERVICE_QUERY_CONFIG |
+		SERVICE_CHANGE_CONFIG |
+		SERVICE_QUERY_STATUS |
+		SERVICE_ENUMERATE_DEPENDENTS |
+		SERVICE_START |
+		SERVICE_STOP |
+		SERVICE_PAUSE_CONTINUE |
+		SERVICE_INTERROGATE |
+		SERVICE_USER_DEFINED_CONTROL
+)
+
+// MapVirtualKey maptypes
+const (
+	MAPVK_VK_TO_CHAR   = 2
+	MAPVK_VK_TO_VSC    = 0
+	MAPVK_VSC_TO_VK    = 1
+	MAPVK_VSC_TO_VK_EX = 3
+)
+
+// ReadEventLog Flags
+const (
+	EVENTLOG_SEEK_READ       = 0x0002
+	EVENTLOG_SEQUENTIAL_READ = 0x0001
+	EVENTLOG_FORWARDS_READ   = 0x0004
+	EVENTLOG_BACKWARDS_READ  = 0x0008
+)
+
+// CreateToolhelp32Snapshot flags
+const (
+	TH32CS_SNAPHEAPLIST = 0x00000001
+	TH32CS_SNAPPROCESS  = 0x00000002
+	TH32CS_SNAPTHREAD   = 0x00000004
+	TH32CS_SNAPMODULE   = 0x00000008
+	TH32CS_SNAPMODULE32 = 0x00000010
+	TH32CS_INHERIT      = 0x80000000
+	TH32CS_SNAPALL      = TH32CS_SNAPHEAPLIST | TH32CS_SNAPMODULE | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD
+)
+
+const (
+	MAX_MODULE_NAME32 = 255
+	MAX_PATH          = 260
+)
+
+const (
+	FOREGROUND_BLUE            = 0x0001
+	FOREGROUND_GREEN           = 0x0002
+	FOREGROUND_RED             = 0x0004
+	FOREGROUND_INTENSITY       = 0x0008
+	BACKGROUND_BLUE            = 0x0010
+	BACKGROUND_GREEN           = 0x0020
+	BACKGROUND_RED             = 0x0040
+	BACKGROUND_INTENSITY       = 0x0080
+	COMMON_LVB_LEADING_BYTE    = 0x0100
+	COMMON_LVB_TRAILING_BYTE   = 0x0200
+	COMMON_LVB_GRID_HORIZONTAL = 0x0400
+	COMMON_LVB_GRID_LVERTICAL  = 0x0800
+	COMMON_LVB_GRID_RVERTICAL  = 0x1000
+	COMMON_LVB_REVERSE_VIDEO   = 0x4000
+	COMMON_LVB_UNDERSCORE      = 0x8000
+)
+
+// Flags used by the DWM_BLURBEHIND structure to indicate
+// which of its members contain valid information.
+const (
+	DWM_BB_ENABLE                = 0x00000001 //     A value for the fEnable member has been specified.
+	DWM_BB_BLURREGION            = 0x00000002 //     A value for the hRgnBlur member has been specified.
+	DWM_BB_TRANSITIONONMAXIMIZED = 0x00000004 //     A value for the fTransitionOnMaximized member has been specified.
+)
+
+// Flags used by the DwmEnableComposition  function
+// to change the state of Desktop Window Manager (DWM) composition.
+const (
+	DWM_EC_DISABLECOMPOSITION = 0 //     Disable composition
+	DWM_EC_ENABLECOMPOSITION  = 1 //     Enable composition
+)
+
+// enum-lite implementation for the following constant structure
+type DWM_SHOWCONTACT int32
+
+const (
+	DWMSC_DOWN      = 0x00000001
+	DWMSC_UP        = 0x00000002
+	DWMSC_DRAG      = 0x00000004
+	DWMSC_HOLD      = 0x00000008
+	DWMSC_PENBARREL = 0x00000010
+	DWMSC_NONE      = 0x00000000
+	DWMSC_ALL       = 0xFFFFFFFF
+)
+
+// enum-lite implementation for the following constant structure
+type DWM_SOURCE_FRAME_SAMPLING int32
+
+// TODO: need to verify this construction
+// Flags used by the DwmSetPresentParameters function
+// to specify the frame sampling type
+const (
+	DWM_SOURCE_FRAME_SAMPLING_POINT = iota + 1
+	DWM_SOURCE_FRAME_SAMPLING_COVERAGE
+	DWM_SOURCE_FRAME_SAMPLING_LAST
+)
+
+// Flags used by the DWM_THUMBNAIL_PROPERTIES structure to
+// indicate which of its members contain valid information.
+const (
+	DWM_TNP_RECTDESTINATION      = 0x00000001 //    A value for the rcDestination member has been specified
+	DWM_TNP_RECTSOURCE           = 0x00000002 //    A value for the rcSource member has been specified
+	DWM_TNP_OPACITY              = 0x00000004 //    A value for the opacity member has been specified
+	DWM_TNP_VISIBLE              = 0x00000008 //    A value for the fVisible member has been specified
+	DWM_TNP_SOURCECLIENTAREAONLY = 0x00000010 //    A value for the fSourceClientAreaOnly member has been specified
+)
+
+// enum-lite implementation for the following constant structure
+type DWMFLIP3DWINDOWPOLICY int32
+
+// TODO: need to verify this construction
+// Flags used by the DwmSetWindowAttribute function
+// to specify the Flip3D window policy
+const (
+	DWMFLIP3D_DEFAULT = iota + 1
+	DWMFLIP3D_EXCLUDEBELOW
+	DWMFLIP3D_EXCLUDEABOVE
+	DWMFLIP3D_LAST
+)
+
+// enum-lite implementation for the following constant structure
+type DWMNCRENDERINGPOLICY int32
+
+// TODO: need to verify this construction
+// Flags used by the DwmSetWindowAttribute function
+// to specify the non-client area rendering policy
+const (
+	DWMNCRP_USEWINDOWSTYLE = iota + 1
+	DWMNCRP_DISABLED
+	DWMNCRP_ENABLED
+	DWMNCRP_LAST
+)
+
+// enum-lite implementation for the following constant structure
+type DWMTRANSITION_OWNEDWINDOW_TARGET int32
+
+const (
+	DWMTRANSITION_OWNEDWINDOW_NULL       = -1
+	DWMTRANSITION_OWNEDWINDOW_REPOSITION = 0
+)
+
+// enum-lite implementation for the following constant structure
+type DWMWINDOWATTRIBUTE int32
+
+// TODO: need to verify this construction
+// Flags used by the DwmGetWindowAttribute and DwmSetWindowAttribute functions
+// to specify window attributes for non-client rendering
+const (
+	DWMWA_NCRENDERING_ENABLED = iota + 1
+	DWMWA_NCRENDERING_POLICY
+	DWMWA_TRANSITIONS_FORCEDISABLED
+	DWMWA_ALLOW_NCPAINT
+	DWMWA_CAPTION_BUTTON_BOUNDS
+	DWMWA_NONCLIENT_RTL_LAYOUT
+	DWMWA_FORCE_ICONIC_REPRESENTATION
+	DWMWA_FLIP3D_POLICY
+	DWMWA_EXTENDED_FRAME_BOUNDS
+	DWMWA_HAS_ICONIC_BITMAP
+	DWMWA_DISALLOW_PEEK
+	DWMWA_EXCLUDED_FROM_PEEK
+	DWMWA_CLOAK
+	DWMWA_CLOAKED
+	DWMWA_FREEZE_REPRESENTATION
+	DWMWA_LAST
+)
+
+// enum-lite implementation for the following constant structure
+type GESTURE_TYPE int32
+
+// TODO: use iota?
+// Identifies the gesture type
+const (
+	GT_PEN_TAP                 = 0
+	GT_PEN_DOUBLETAP           = 1
+	GT_PEN_RIGHTTAP            = 2
+	GT_PEN_PRESSANDHOLD        = 3
+	GT_PEN_PRESSANDHOLDABORT   = 4
+	GT_TOUCH_TAP               = 5
+	GT_TOUCH_DOUBLETAP         = 6
+	GT_TOUCH_RIGHTTAP          = 7
+	GT_TOUCH_PRESSANDHOLD      = 8
+	GT_TOUCH_PRESSANDHOLDABORT = 9
+	GT_TOUCH_PRESSANDTAP       = 10
+)
+
+// Icons
+const (
+	ICON_SMALL  = 0
+	ICON_BIG    = 1
+	ICON_SMALL2 = 2
+)
+
+const (
+	SIZE_RESTORED  = 0
+	SIZE_MINIMIZED = 1
+	SIZE_MAXIMIZED = 2
+	SIZE_MAXSHOW   = 3
+	SIZE_MAXHIDE   = 4
+)
+
+// XButton values
+const (
+	XBUTTON1 = 1
+	XBUTTON2 = 2
+)
+
+// Devmode
+const (
+	DM_SPECVERSION = 0x0401
+
+	DM_ORIENTATION        = 0x00000001
+	DM_PAPERSIZE          = 0x00000002
+	DM_PAPERLENGTH        = 0x00000004
+	DM_PAPERWIDTH         = 0x00000008
+	DM_SCALE              = 0x00000010
+	DM_POSITION           = 0x00000020
+	DM_NUP                = 0x00000040
+	DM_DISPLAYORIENTATION = 0x00000080
+	DM_COPIES             = 0x00000100
+	DM_DEFAULTSOURCE      = 0x00000200
+	DM_PRINTQUALITY       = 0x00000400
+	DM_COLOR              = 0x00000800
+	DM_DUPLEX             = 0x00001000
+	DM_YRESOLUTION        = 0x00002000
+	DM_TTOPTION           = 0x00004000
+	DM_COLLATE            = 0x00008000
+	DM_FORMNAME           = 0x00010000
+	DM_LOGPIXELS          = 0x00020000
+	DM_BITSPERPEL         = 0x00040000
+	DM_PELSWIDTH          = 0x00080000
+	DM_PELSHEIGHT         = 0x00100000
+	DM_DISPLAYFLAGS       = 0x00200000
+	DM_DISPLAYFREQUENCY   = 0x00400000
+	DM_ICMMETHOD          = 0x00800000
+	DM_ICMINTENT          = 0x01000000
+	DM_MEDIATYPE          = 0x02000000
+	DM_DITHERTYPE         = 0x04000000
+	DM_PANNINGWIDTH       = 0x08000000
+	DM_PANNINGHEIGHT      = 0x10000000
+	DM_DISPLAYFIXEDOUTPUT = 0x20000000
+)
+
+// ChangeDisplaySettings
+const (
+	CDS_UPDATEREGISTRY  = 0x00000001
+	CDS_TEST            = 0x00000002
+	CDS_FULLSCREEN      = 0x00000004
+	CDS_GLOBAL          = 0x00000008
+	CDS_SET_PRIMARY     = 0x00000010
+	CDS_VIDEOPARAMETERS = 0x00000020
+	CDS_RESET           = 0x40000000
+	CDS_NORESET         = 0x10000000
+
+	DISP_CHANGE_SUCCESSFUL  = 0
+	DISP_CHANGE_RESTART     = 1
+	DISP_CHANGE_FAILED      = -1
+	DISP_CHANGE_BADMODE     = -2
+	DISP_CHANGE_NOTUPDATED  = -3
+	DISP_CHANGE_BADFLAGS    = -4
+	DISP_CHANGE_BADPARAM    = -5
+	DISP_CHANGE_BADDUALVIEW = -6
+)
+
+const (
+	ENUM_CURRENT_SETTINGS  = 0xFFFFFFFF
+	ENUM_REGISTRY_SETTINGS = 0xFFFFFFFE
+)
+
+// PIXELFORMATDESCRIPTOR
+const (
+	PFD_TYPE_RGBA       = 0
+	PFD_TYPE_COLORINDEX = 1
+
+	PFD_MAIN_PLANE     = 0
+	PFD_OVERLAY_PLANE  = 1
+	PFD_UNDERLAY_PLANE = -1
+
+	PFD_DOUBLEBUFFER         = 0x00000001
+	PFD_STEREO               = 0x00000002
+	PFD_DRAW_TO_WINDOW       = 0x00000004
+	PFD_DRAW_TO_BITMAP       = 0x00000008
+	PFD_SUPPORT_GDI          = 0x00000010
+	PFD_SUPPORT_OPENGL       = 0x00000020
+	PFD_GENERIC_FORMAT       = 0x00000040
+	PFD_NEED_PALETTE         = 0x00000080
+	PFD_NEED_SYSTEM_PALETTE  = 0x00000100
+	PFD_SWAP_EXCHANGE        = 0x00000200
+	PFD_SWAP_COPY            = 0x00000400
+	PFD_SWAP_LAYER_BUFFERS   = 0x00000800
+	PFD_GENERIC_ACCELERATED  = 0x00001000
+	PFD_SUPPORT_DIRECTDRAW   = 0x00002000
+	PFD_DIRECT3D_ACCELERATED = 0x00004000
+	PFD_SUPPORT_COMPOSITION  = 0x00008000
+
+	PFD_DEPTH_DONTCARE        = 0x20000000
+	PFD_DOUBLEBUFFER_DONTCARE = 0x40000000
+	PFD_STEREO_DONTCARE       = 0x80000000
+)
+
+const (
+	INPUT_MOUSE    = 0
+	INPUT_KEYBOARD = 1
+	INPUT_HARDWARE = 2
+)
+
+const (
+	MOUSEEVENTF_ABSOLUTE        = 0x8000
+	MOUSEEVENTF_HWHEEL          = 0x01000
+	MOUSEEVENTF_MOVE            = 0x0001
+	MOUSEEVENTF_MOVE_NOCOALESCE = 0x2000
+	MOUSEEVENTF_LEFTDOWN        = 0x0002
+	MOUSEEVENTF_LEFTUP          = 0x0004
+	MOUSEEVENTF_RIGHTDOWN       = 0x0008
+	MOUSEEVENTF_RIGHTUP         = 0x0010
+	MOUSEEVENTF_MIDDLEDOWN      = 0x0020
+	MOUSEEVENTF_MIDDLEUP        = 0x0040
+	MOUSEEVENTF_VIRTUALDESK     = 0x4000
+	MOUSEEVENTF_WHEEL           = 0x0800
+	MOUSEEVENTF_XDOWN           = 0x0080
+	MOUSEEVENTF_XUP             = 0x0100
+)
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/dwmapi.go b/Godeps/_workspace/src/github.com/shirou/w32/dwmapi.go
new file mode 100644
index 0000000000..eb656d1874
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/dwmapi.go
@@ -0,0 +1,254 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+// DEFINED IN THE DWM API BUT NOT IMPLEMENTED BY MS:
+// DwmAttachMilContent
+// DwmDetachMilContent
+// DwmEnableComposition
+// DwmGetGraphicsStreamClient
+// DwmGetGraphicsStreamTransformHint
+
+var (
+	moddwmapi = syscall.NewLazyDLL("dwmapi.dll")
+
+	procDwmDefWindowProc                 = moddwmapi.NewProc("DwmDefWindowProc")
+	procDwmEnableBlurBehindWindow        = moddwmapi.NewProc("DwmEnableBlurBehindWindow")
+	procDwmEnableMMCSS                   = moddwmapi.NewProc("DwmEnableMMCSS")
+	procDwmExtendFrameIntoClientArea     = moddwmapi.NewProc("DwmExtendFrameIntoClientArea")
+	procDwmFlush                         = moddwmapi.NewProc("DwmFlush")
+	procDwmGetColorizationColor          = moddwmapi.NewProc("DwmGetColorizationColor")
+	procDwmGetCompositionTimingInfo      = moddwmapi.NewProc("DwmGetCompositionTimingInfo")
+	procDwmGetTransportAttributes        = moddwmapi.NewProc("DwmGetTransportAttributes")
+	procDwmGetWindowAttribute            = moddwmapi.NewProc("DwmGetWindowAttribute")
+	procDwmInvalidateIconicBitmaps       = moddwmapi.NewProc("DwmInvalidateIconicBitmaps")
+	procDwmIsCompositionEnabled          = moddwmapi.NewProc("DwmIsCompositionEnabled")
+	procDwmModifyPreviousDxFrameDuration = moddwmapi.NewProc("DwmModifyPreviousDxFrameDuration")
+	procDwmQueryThumbnailSourceSize      = moddwmapi.NewProc("DwmQueryThumbnailSourceSize")
+	procDwmRegisterThumbnail             = moddwmapi.NewProc("DwmRegisterThumbnail")
+	procDwmRenderGesture                 = moddwmapi.NewProc("DwmRenderGesture")
+	procDwmSetDxFrameDuration            = moddwmapi.NewProc("DwmSetDxFrameDuration")
+	procDwmSetIconicLivePreviewBitmap    = moddwmapi.NewProc("DwmSetIconicLivePreviewBitmap")
+	procDwmSetIconicThumbnail            = moddwmapi.NewProc("DwmSetIconicThumbnail")
+	procDwmSetPresentParameters          = moddwmapi.NewProc("DwmSetPresentParameters")
+	procDwmSetWindowAttribute            = moddwmapi.NewProc("DwmSetWindowAttribute")
+	procDwmShowContact                   = moddwmapi.NewProc("DwmShowContact")
+	procDwmTetherContact                 = moddwmapi.NewProc("DwmTetherContact")
+	procDwmTransitionOwnedWindow         = moddwmapi.NewProc("DwmTransitionOwnedWindow")
+	procDwmUnregisterThumbnail           = moddwmapi.NewProc("DwmUnregisterThumbnail")
+	procDwmUpdateThumbnailProperties     = moddwmapi.NewProc("DwmUpdateThumbnailProperties")
+)
+
+func DwmDefWindowProc(hWnd HWND, msg uint, wParam, lParam uintptr) (bool, uint) {
+	var result uint
+	ret, _, _ := procDwmDefWindowProc.Call(
+		uintptr(hWnd),
+		uintptr(msg),
+		wParam,
+		lParam,
+		uintptr(unsafe.Pointer(&result)))
+	return ret != 0, result
+}
+
+func DwmEnableBlurBehindWindow(hWnd HWND, pBlurBehind *DWM_BLURBEHIND) HRESULT {
+	ret, _, _ := procDwmEnableBlurBehindWindow.Call(
+		uintptr(hWnd),
+		uintptr(unsafe.Pointer(pBlurBehind)))
+	return HRESULT(ret)
+}
+
+func DwmEnableMMCSS(fEnableMMCSS bool) HRESULT {
+	ret, _, _ := procDwmEnableMMCSS.Call(
+		uintptr(BoolToBOOL(fEnableMMCSS)))
+	return HRESULT(ret)
+}
+
+func DwmExtendFrameIntoClientArea(hWnd HWND, pMarInset *MARGINS) HRESULT {
+	ret, _, _ := procDwmExtendFrameIntoClientArea.Call(
+		uintptr(hWnd),
+		uintptr(unsafe.Pointer(pMarInset)))
+	return HRESULT(ret)
+}
+
+func DwmFlush() HRESULT {
+	ret, _, _ := procDwmFlush.Call()
+	return HRESULT(ret)
+}
+
+func DwmGetColorizationColor(pcrColorization *uint32, pfOpaqueBlend *BOOL) HRESULT {
+	ret, _, _ := procDwmGetColorizationColor.Call(
+		uintptr(unsafe.Pointer(pcrColorization)),
+		uintptr(unsafe.Pointer(pfOpaqueBlend)))
+	return HRESULT(ret)
+}
+
+func DwmGetCompositionTimingInfo(hWnd HWND, pTimingInfo *DWM_TIMING_INFO) HRESULT {
+	ret, _, _ := procDwmGetCompositionTimingInfo.Call(
+		uintptr(hWnd),
+		uintptr(unsafe.Pointer(pTimingInfo)))
+	return HRESULT(ret)
+}
+
+func DwmGetTransportAttributes(pfIsRemoting *BOOL, pfIsConnected *BOOL, pDwGeneration *uint32) HRESULT {
+	ret, _, _ := procDwmGetTransportAttributes.Call(
+		uintptr(unsafe.Pointer(pfIsRemoting)),
+		uintptr(unsafe.Pointer(pfIsConnected)),
+		uintptr(unsafe.Pointer(pDwGeneration)))
+	return HRESULT(ret)
+}
+
+// TODO: verify handling of variable arguments
+func DwmGetWindowAttribute(hWnd HWND, dwAttribute uint32) (pAttribute interface{}, result HRESULT) {
+	var pvAttribute, pvAttrSize uintptr
+	switch dwAttribute {
+	case DWMWA_NCRENDERING_ENABLED:
+		v := new(BOOL)
+		pAttribute = v
+		pvAttribute = uintptr(unsafe.Pointer(v))
+		pvAttrSize = unsafe.Sizeof(*v)
+	case DWMWA_CAPTION_BUTTON_BOUNDS, DWMWA_EXTENDED_FRAME_BOUNDS:
+		v := new(RECT)
+		pAttribute = v
+		pvAttribute = uintptr(unsafe.Pointer(v))
+		pvAttrSize = unsafe.Sizeof(*v)
+	case DWMWA_CLOAKED:
+		panic(fmt.Sprintf("DwmGetWindowAttribute(%d) is not currently supported.", dwAttribute))
+	default:
+		panic(fmt.Sprintf("DwmGetWindowAttribute(%d) is not valid.", dwAttribute))
+	}
+
+	ret, _, _ := procDwmGetWindowAttribute.Call(
+		uintptr(hWnd),
+		uintptr(dwAttribute),
+		pvAttribute,
+		pvAttrSize)
+	result = HRESULT(ret)
+	return
+}
+
+func DwmInvalidateIconicBitmaps(hWnd HWND) HRESULT {
+	ret, _, _ := procDwmInvalidateIconicBitmaps.Call(
+		uintptr(hWnd))
+	return HRESULT(ret)
+}
+
+func DwmIsCompositionEnabled(pfEnabled *BOOL) HRESULT {
+	ret, _, _ := procDwmIsCompositionEnabled.Call(
+		uintptr(unsafe.Pointer(pfEnabled)))
+	return HRESULT(ret)
+}
+
+func DwmModifyPreviousDxFrameDuration(hWnd HWND, cRefreshes int, fRelative bool) HRESULT {
+	ret, _, _ := procDwmModifyPreviousDxFrameDuration.Call(
+		uintptr(hWnd),
+		uintptr(cRefreshes),
+		uintptr(BoolToBOOL(fRelative)))
+	return HRESULT(ret)
+}
+
+func DwmQueryThumbnailSourceSize(hThumbnail HTHUMBNAIL, pSize *SIZE) HRESULT {
+	ret, _, _ := procDwmQueryThumbnailSourceSize.Call(
+		uintptr(hThumbnail),
+		uintptr(unsafe.Pointer(pSize)))
+	return HRESULT(ret)
+}
+
+func DwmRegisterThumbnail(hWndDestination HWND, hWndSource HWND, phThumbnailId *HTHUMBNAIL) HRESULT {
+	ret, _, _ := procDwmRegisterThumbnail.Call(
+		uintptr(hWndDestination),
+		uintptr(hWndSource),
+		uintptr(unsafe.Pointer(phThumbnailId)))
+	return HRESULT(ret)
+}
+
+func DwmRenderGesture(gt GESTURE_TYPE, cContacts uint, pdwPointerID *uint32, pPoints *POINT) {
+	procDwmRenderGesture.Call(
+		uintptr(gt),
+		uintptr(cContacts),
+		uintptr(unsafe.Pointer(pdwPointerID)),
+		uintptr(unsafe.Pointer(pPoints)))
+	return
+}
+
+func DwmSetDxFrameDuration(hWnd HWND, cRefreshes int) HRESULT {
+	ret, _, _ := procDwmSetDxFrameDuration.Call(
+		uintptr(hWnd),
+		uintptr(cRefreshes))
+	return HRESULT(ret)
+}
+
+func DwmSetIconicLivePreviewBitmap(hWnd HWND, hbmp HBITMAP, pptClient *POINT, dwSITFlags uint32) HRESULT {
+	ret, _, _ := procDwmSetIconicLivePreviewBitmap.Call(
+		uintptr(hWnd),
+		uintptr(hbmp),
+		uintptr(unsafe.Pointer(pptClient)),
+		uintptr(dwSITFlags))
+	return HRESULT(ret)
+}
+
+func DwmSetIconicThumbnail(hWnd HWND, hbmp HBITMAP, dwSITFlags uint32) HRESULT {
+	ret, _, _ := procDwmSetIconicThumbnail.Call(
+		uintptr(hWnd),
+		uintptr(hbmp),
+		uintptr(dwSITFlags))
+	return HRESULT(ret)
+}
+
+func DwmSetPresentParameters(hWnd HWND, pPresentParams *DWM_PRESENT_PARAMETERS) HRESULT {
+	ret, _, _ := procDwmSetPresentParameters.Call(
+		uintptr(hWnd),
+		uintptr(unsafe.Pointer(pPresentParams)))
+	return HRESULT(ret)
+}
+
+func DwmSetWindowAttribute(hWnd HWND, dwAttribute uint32, pvAttribute LPCVOID, cbAttribute uint32) HRESULT {
+	ret, _, _ := procDwmSetWindowAttribute.Call(
+		uintptr(hWnd),
+		uintptr(dwAttribute),
+		uintptr(pvAttribute),
+		uintptr(cbAttribute))
+	return HRESULT(ret)
+}
+
+func DwmShowContact(dwPointerID uint32, eShowContact DWM_SHOWCONTACT) {
+	procDwmShowContact.Call(
+		uintptr(dwPointerID),
+		uintptr(eShowContact))
+	return
+}
+
+func DwmTetherContact(dwPointerID uint32, fEnable bool, ptTether POINT) {
+	procDwmTetherContact.Call(
+		uintptr(dwPointerID),
+		uintptr(BoolToBOOL(fEnable)),
+		uintptr(unsafe.Pointer(&ptTether)))
+	return
+}
+
+func DwmTransitionOwnedWindow(hWnd HWND, target DWMTRANSITION_OWNEDWINDOW_TARGET) {
+	procDwmTransitionOwnedWindow.Call(
+		uintptr(hWnd),
+		uintptr(target))
+	return
+}
+
+func DwmUnregisterThumbnail(hThumbnailId HTHUMBNAIL) HRESULT {
+	ret, _, _ := procDwmUnregisterThumbnail.Call(
+		uintptr(hThumbnailId))
+	return HRESULT(ret)
+}
+
+func DwmUpdateThumbnailProperties(hThumbnailId HTHUMBNAIL, ptnProperties *DWM_THUMBNAIL_PROPERTIES) HRESULT {
+	ret, _, _ := procDwmUpdateThumbnailProperties.Call(
+		uintptr(hThumbnailId),
+		uintptr(unsafe.Pointer(ptnProperties)))
+	return HRESULT(ret)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/gdi32.go b/Godeps/_workspace/src/github.com/shirou/w32/gdi32.go
new file mode 100644
index 0000000000..6f377e8e4c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/gdi32.go
@@ -0,0 +1,509 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modgdi32 = syscall.NewLazyDLL("gdi32.dll")
+
+	procGetDeviceCaps             = modgdi32.NewProc("GetDeviceCaps")
+	procDeleteObject              = modgdi32.NewProc("DeleteObject")
+	procCreateFontIndirect        = modgdi32.NewProc("CreateFontIndirectW")
+	procAbortDoc                  = modgdi32.NewProc("AbortDoc")
+	procBitBlt                    = modgdi32.NewProc("BitBlt")
+	procCloseEnhMetaFile          = modgdi32.NewProc("CloseEnhMetaFile")
+	procCopyEnhMetaFile           = modgdi32.NewProc("CopyEnhMetaFileW")
+	procCreateBrushIndirect       = modgdi32.NewProc("CreateBrushIndirect")
+	procCreateCompatibleDC        = modgdi32.NewProc("CreateCompatibleDC")
+	procCreateDC                  = modgdi32.NewProc("CreateDCW")
+	procCreateDIBSection          = modgdi32.NewProc("CreateDIBSection")
+	procCreateEnhMetaFile         = modgdi32.NewProc("CreateEnhMetaFileW")
+	procCreateIC                  = modgdi32.NewProc("CreateICW")
+	procDeleteDC                  = modgdi32.NewProc("DeleteDC")
+	procDeleteEnhMetaFile         = modgdi32.NewProc("DeleteEnhMetaFile")
+	procEllipse                   = modgdi32.NewProc("Ellipse")
+	procEndDoc                    = modgdi32.NewProc("EndDoc")
+	procEndPage                   = modgdi32.NewProc("EndPage")
+	procExtCreatePen              = modgdi32.NewProc("ExtCreatePen")
+	procGetEnhMetaFile            = modgdi32.NewProc("GetEnhMetaFileW")
+	procGetEnhMetaFileHeader      = modgdi32.NewProc("GetEnhMetaFileHeader")
+	procGetObject                 = modgdi32.NewProc("GetObjectW")
+	procGetStockObject            = modgdi32.NewProc("GetStockObject")
+	procGetTextExtentExPoint      = modgdi32.NewProc("GetTextExtentExPointW")
+	procGetTextExtentPoint32      = modgdi32.NewProc("GetTextExtentPoint32W")
+	procGetTextMetrics            = modgdi32.NewProc("GetTextMetricsW")
+	procLineTo                    = modgdi32.NewProc("LineTo")
+	procMoveToEx                  = modgdi32.NewProc("MoveToEx")
+	procPlayEnhMetaFile           = modgdi32.NewProc("PlayEnhMetaFile")
+	procRectangle                 = modgdi32.NewProc("Rectangle")
+	procResetDC                   = modgdi32.NewProc("ResetDCW")
+	procSelectObject              = modgdi32.NewProc("SelectObject")
+	procSetBkMode                 = modgdi32.NewProc("SetBkMode")
+	procSetBrushOrgEx             = modgdi32.NewProc("SetBrushOrgEx")
+	procSetStretchBltMode         = modgdi32.NewProc("SetStretchBltMode")
+	procSetTextColor              = modgdi32.NewProc("SetTextColor")
+	procSetBkColor                = modgdi32.NewProc("SetBkColor")
+	procStartDoc                  = modgdi32.NewProc("StartDocW")
+	procStartPage                 = modgdi32.NewProc("StartPage")
+	procStretchBlt                = modgdi32.NewProc("StretchBlt")
+	procSetDIBitsToDevice         = modgdi32.NewProc("SetDIBitsToDevice")
+	procChoosePixelFormat         = modgdi32.NewProc("ChoosePixelFormat")
+	procDescribePixelFormat       = modgdi32.NewProc("DescribePixelFormat")
+	procGetEnhMetaFilePixelFormat = modgdi32.NewProc("GetEnhMetaFilePixelFormat")
+	procGetPixelFormat            = modgdi32.NewProc("GetPixelFormat")
+	procSetPixelFormat            = modgdi32.NewProc("SetPixelFormat")
+	procSwapBuffers               = modgdi32.NewProc("SwapBuffers")
+)
+
+func GetDeviceCaps(hdc HDC, index int) int {
+	ret, _, _ := procGetDeviceCaps.Call(
+		uintptr(hdc),
+		uintptr(index))
+
+	return int(ret)
+}
+
+func DeleteObject(hObject HGDIOBJ) bool {
+	ret, _, _ := procDeleteObject.Call(
+		uintptr(hObject))
+
+	return ret != 0
+}
+
+func CreateFontIndirect(logFont *LOGFONT) HFONT {
+	ret, _, _ := procCreateFontIndirect.Call(
+		uintptr(unsafe.Pointer(logFont)))
+
+	return HFONT(ret)
+}
+
+func AbortDoc(hdc HDC) int {
+	ret, _, _ := procAbortDoc.Call(
+		uintptr(hdc))
+
+	return int(ret)
+}
+
+func BitBlt(hdcDest HDC, nXDest, nYDest, nWidth, nHeight int, hdcSrc HDC, nXSrc, nYSrc int, dwRop uint) {
+	ret, _, _ := procBitBlt.Call(
+		uintptr(hdcDest),
+		uintptr(nXDest),
+		uintptr(nYDest),
+		uintptr(nWidth),
+		uintptr(nHeight),
+		uintptr(hdcSrc),
+		uintptr(nXSrc),
+		uintptr(nYSrc),
+		uintptr(dwRop))
+
+	if ret == 0 {
+		panic("BitBlt failed")
+	}
+}
+
+func CloseEnhMetaFile(hdc HDC) HENHMETAFILE {
+	ret, _, _ := procCloseEnhMetaFile.Call(
+		uintptr(hdc))
+
+	return HENHMETAFILE(ret)
+}
+
+func CopyEnhMetaFile(hemfSrc HENHMETAFILE, lpszFile *uint16) HENHMETAFILE {
+	ret, _, _ := procCopyEnhMetaFile.Call(
+		uintptr(hemfSrc),
+		uintptr(unsafe.Pointer(lpszFile)))
+
+	return HENHMETAFILE(ret)
+}
+
+func CreateBrushIndirect(lplb *LOGBRUSH) HBRUSH {
+	ret, _, _ := procCreateBrushIndirect.Call(
+		uintptr(unsafe.Pointer(lplb)))
+
+	return HBRUSH(ret)
+}
+
+func CreateCompatibleDC(hdc HDC) HDC {
+	ret, _, _ := procCreateCompatibleDC.Call(
+		uintptr(hdc))
+
+	if ret == 0 {
+		panic("Create compatible DC failed")
+	}
+
+	return HDC(ret)
+}
+
+func CreateDC(lpszDriver, lpszDevice, lpszOutput *uint16, lpInitData *DEVMODE) HDC {
+	ret, _, _ := procCreateDC.Call(
+		uintptr(unsafe.Pointer(lpszDriver)),
+		uintptr(unsafe.Pointer(lpszDevice)),
+		uintptr(unsafe.Pointer(lpszOutput)),
+		uintptr(unsafe.Pointer(lpInitData)))
+
+	return HDC(ret)
+}
+
+func CreateDIBSection(hdc HDC, pbmi *BITMAPINFO, iUsage uint, ppvBits *unsafe.Pointer, hSection HANDLE, dwOffset uint) HBITMAP {
+	ret, _, _ := procCreateDIBSection.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(pbmi)),
+		uintptr(iUsage),
+		uintptr(unsafe.Pointer(ppvBits)),
+		uintptr(hSection),
+		uintptr(dwOffset))
+
+	return HBITMAP(ret)
+}
+
+func CreateEnhMetaFile(hdcRef HDC, lpFilename *uint16, lpRect *RECT, lpDescription *uint16) HDC {
+	ret, _, _ := procCreateEnhMetaFile.Call(
+		uintptr(hdcRef),
+		uintptr(unsafe.Pointer(lpFilename)),
+		uintptr(unsafe.Pointer(lpRect)),
+		uintptr(unsafe.Pointer(lpDescription)))
+
+	return HDC(ret)
+}
+
+func CreateIC(lpszDriver, lpszDevice, lpszOutput *uint16, lpdvmInit *DEVMODE) HDC {
+	ret, _, _ := procCreateIC.Call(
+		uintptr(unsafe.Pointer(lpszDriver)),
+		uintptr(unsafe.Pointer(lpszDevice)),
+		uintptr(unsafe.Pointer(lpszOutput)),
+		uintptr(unsafe.Pointer(lpdvmInit)))
+
+	return HDC(ret)
+}
+
+func DeleteDC(hdc HDC) bool {
+	ret, _, _ := procDeleteDC.Call(
+		uintptr(hdc))
+
+	return ret != 0
+}
+
+func DeleteEnhMetaFile(hemf HENHMETAFILE) bool {
+	ret, _, _ := procDeleteEnhMetaFile.Call(
+		uintptr(hemf))
+
+	return ret != 0
+}
+
+func Ellipse(hdc HDC, nLeftRect, nTopRect, nRightRect, nBottomRect int) bool {
+	ret, _, _ := procEllipse.Call(
+		uintptr(hdc),
+		uintptr(nLeftRect),
+		uintptr(nTopRect),
+		uintptr(nRightRect),
+		uintptr(nBottomRect))
+
+	return ret != 0
+}
+
+func EndDoc(hdc HDC) int {
+	ret, _, _ := procEndDoc.Call(
+		uintptr(hdc))
+
+	return int(ret)
+}
+
+func EndPage(hdc HDC) int {
+	ret, _, _ := procEndPage.Call(
+		uintptr(hdc))
+
+	return int(ret)
+}
+
+func ExtCreatePen(dwPenStyle, dwWidth uint, lplb *LOGBRUSH, dwStyleCount uint, lpStyle *uint) HPEN {
+	ret, _, _ := procExtCreatePen.Call(
+		uintptr(dwPenStyle),
+		uintptr(dwWidth),
+		uintptr(unsafe.Pointer(lplb)),
+		uintptr(dwStyleCount),
+		uintptr(unsafe.Pointer(lpStyle)))
+
+	return HPEN(ret)
+}
+
+func GetEnhMetaFile(lpszMetaFile *uint16) HENHMETAFILE {
+	ret, _, _ := procGetEnhMetaFile.Call(
+		uintptr(unsafe.Pointer(lpszMetaFile)))
+
+	return HENHMETAFILE(ret)
+}
+
+func GetEnhMetaFileHeader(hemf HENHMETAFILE, cbBuffer uint, lpemh *ENHMETAHEADER) uint {
+	ret, _, _ := procGetEnhMetaFileHeader.Call(
+		uintptr(hemf),
+		uintptr(cbBuffer),
+		uintptr(unsafe.Pointer(lpemh)))
+
+	return uint(ret)
+}
+
+func GetObject(hgdiobj HGDIOBJ, cbBuffer uintptr, lpvObject unsafe.Pointer) int {
+	ret, _, _ := procGetObject.Call(
+		uintptr(hgdiobj),
+		uintptr(cbBuffer),
+		uintptr(lpvObject))
+
+	return int(ret)
+}
+
+func GetStockObject(fnObject int) HGDIOBJ {
+	ret, _, _ := procGetDeviceCaps.Call(
+		uintptr(fnObject))
+
+	return HGDIOBJ(ret)
+}
+
+func GetTextExtentExPoint(hdc HDC, lpszStr *uint16, cchString, nMaxExtent int, lpnFit, alpDx *int, lpSize *SIZE) bool {
+	ret, _, _ := procGetTextExtentExPoint.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lpszStr)),
+		uintptr(cchString),
+		uintptr(nMaxExtent),
+		uintptr(unsafe.Pointer(lpnFit)),
+		uintptr(unsafe.Pointer(alpDx)),
+		uintptr(unsafe.Pointer(lpSize)))
+
+	return ret != 0
+}
+
+func GetTextExtentPoint32(hdc HDC, lpString *uint16, c int, lpSize *SIZE) bool {
+	ret, _, _ := procGetTextExtentPoint32.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lpString)),
+		uintptr(c),
+		uintptr(unsafe.Pointer(lpSize)))
+
+	return ret != 0
+}
+
+func GetTextMetrics(hdc HDC, lptm *TEXTMETRIC) bool {
+	ret, _, _ := procGetTextMetrics.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lptm)))
+
+	return ret != 0
+}
+
+func LineTo(hdc HDC, nXEnd, nYEnd int) bool {
+	ret, _, _ := procLineTo.Call(
+		uintptr(hdc),
+		uintptr(nXEnd),
+		uintptr(nYEnd))
+
+	return ret != 0
+}
+
+func MoveToEx(hdc HDC, x, y int, lpPoint *POINT) bool {
+	ret, _, _ := procMoveToEx.Call(
+		uintptr(hdc),
+		uintptr(x),
+		uintptr(y),
+		uintptr(unsafe.Pointer(lpPoint)))
+
+	return ret != 0
+}
+
+func PlayEnhMetaFile(hdc HDC, hemf HENHMETAFILE, lpRect *RECT) bool {
+	ret, _, _ := procPlayEnhMetaFile.Call(
+		uintptr(hdc),
+		uintptr(hemf),
+		uintptr(unsafe.Pointer(lpRect)))
+
+	return ret != 0
+}
+
+func Rectangle(hdc HDC, nLeftRect, nTopRect, nRightRect, nBottomRect int) bool {
+	ret, _, _ := procRectangle.Call(
+		uintptr(hdc),
+		uintptr(nLeftRect),
+		uintptr(nTopRect),
+		uintptr(nRightRect),
+		uintptr(nBottomRect))
+
+	return ret != 0
+}
+
+func ResetDC(hdc HDC, lpInitData *DEVMODE) HDC {
+	ret, _, _ := procResetDC.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lpInitData)))
+
+	return HDC(ret)
+}
+
+func SelectObject(hdc HDC, hgdiobj HGDIOBJ) HGDIOBJ {
+	ret, _, _ := procSelectObject.Call(
+		uintptr(hdc),
+		uintptr(hgdiobj))
+
+	if ret == 0 {
+		panic("SelectObject failed")
+	}
+
+	return HGDIOBJ(ret)
+}
+
+func SetBkMode(hdc HDC, iBkMode int) int {
+	ret, _, _ := procSetBkMode.Call(
+		uintptr(hdc),
+		uintptr(iBkMode))
+
+	if ret == 0 {
+		panic("SetBkMode failed")
+	}
+
+	return int(ret)
+}
+
+func SetBrushOrgEx(hdc HDC, nXOrg, nYOrg int, lppt *POINT) bool {
+	ret, _, _ := procSetBrushOrgEx.Call(
+		uintptr(hdc),
+		uintptr(nXOrg),
+		uintptr(nYOrg),
+		uintptr(unsafe.Pointer(lppt)))
+
+	return ret != 0
+}
+
+func SetStretchBltMode(hdc HDC, iStretchMode int) int {
+	ret, _, _ := procSetStretchBltMode.Call(
+		uintptr(hdc),
+		uintptr(iStretchMode))
+
+	return int(ret)
+}
+
+func SetTextColor(hdc HDC, crColor COLORREF) COLORREF {
+	ret, _, _ := procSetTextColor.Call(
+		uintptr(hdc),
+		uintptr(crColor))
+
+	if ret == CLR_INVALID {
+		panic("SetTextColor failed")
+	}
+
+	return COLORREF(ret)
+}
+
+func SetBkColor(hdc HDC, crColor COLORREF) COLORREF {
+	ret, _, _ := procSetBkColor.Call(
+		uintptr(hdc),
+		uintptr(crColor))
+
+	if ret == CLR_INVALID {
+		panic("SetBkColor failed")
+	}
+
+	return COLORREF(ret)
+}
+
+func StartDoc(hdc HDC, lpdi *DOCINFO) int {
+	ret, _, _ := procStartDoc.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lpdi)))
+
+	return int(ret)
+}
+
+func StartPage(hdc HDC) int {
+	ret, _, _ := procStartPage.Call(
+		uintptr(hdc))
+
+	return int(ret)
+}
+
+func StretchBlt(hdcDest HDC, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest int, hdcSrc HDC, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc int, dwRop uint) {
+	ret, _, _ := procStretchBlt.Call(
+		uintptr(hdcDest),
+		uintptr(nXOriginDest),
+		uintptr(nYOriginDest),
+		uintptr(nWidthDest),
+		uintptr(nHeightDest),
+		uintptr(hdcSrc),
+		uintptr(nXOriginSrc),
+		uintptr(nYOriginSrc),
+		uintptr(nWidthSrc),
+		uintptr(nHeightSrc),
+		uintptr(dwRop))
+
+	if ret == 0 {
+		panic("StretchBlt failed")
+	}
+}
+
+func SetDIBitsToDevice(hdc HDC, xDest, yDest, dwWidth, dwHeight, xSrc, ySrc int, uStartScan, cScanLines uint, lpvBits []byte, lpbmi *BITMAPINFO, fuColorUse uint) int {
+	ret, _, _ := procSetDIBitsToDevice.Call(
+		uintptr(hdc),
+		uintptr(xDest),
+		uintptr(yDest),
+		uintptr(dwWidth),
+		uintptr(dwHeight),
+		uintptr(xSrc),
+		uintptr(ySrc),
+		uintptr(uStartScan),
+		uintptr(cScanLines),
+		uintptr(unsafe.Pointer(&lpvBits[0])),
+		uintptr(unsafe.Pointer(lpbmi)),
+		uintptr(fuColorUse))
+
+	return int(ret)
+}
+
+func ChoosePixelFormat(hdc HDC, pfd *PIXELFORMATDESCRIPTOR) int {
+	ret, _, _ := procChoosePixelFormat.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return int(ret)
+}
+
+func DescribePixelFormat(hdc HDC, iPixelFormat int, nBytes uint, pfd *PIXELFORMATDESCRIPTOR) int {
+	ret, _, _ := procDescribePixelFormat.Call(
+		uintptr(hdc),
+		uintptr(iPixelFormat),
+		uintptr(nBytes),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return int(ret)
+}
+
+func GetEnhMetaFilePixelFormat(hemf HENHMETAFILE, cbBuffer uint32, pfd *PIXELFORMATDESCRIPTOR) uint {
+	ret, _, _ := procGetEnhMetaFilePixelFormat.Call(
+		uintptr(hemf),
+		uintptr(cbBuffer),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return uint(ret)
+}
+
+func GetPixelFormat(hdc HDC) int {
+	ret, _, _ := procGetPixelFormat.Call(
+		uintptr(hdc),
+	)
+	return int(ret)
+}
+
+func SetPixelFormat(hdc HDC, iPixelFormat int, pfd *PIXELFORMATDESCRIPTOR) bool {
+	ret, _, _ := procSetPixelFormat.Call(
+		uintptr(hdc),
+		uintptr(iPixelFormat),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return ret == TRUE
+}
+
+func SwapBuffers(hdc HDC) bool {
+	ret, _, _ := procSwapBuffers.Call(uintptr(hdc))
+	return ret == TRUE
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/gdiplus.go b/Godeps/_workspace/src/github.com/shirou/w32/gdiplus.go
new file mode 100644
index 0000000000..f3a8fca4d1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/gdiplus.go
@@ -0,0 +1,175 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"errors"
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+const (
+	Ok                        = 0
+	GenericError              = 1
+	InvalidParameter          = 2
+	OutOfMemory               = 3
+	ObjectBusy                = 4
+	InsufficientBuffer        = 5
+	NotImplemented            = 6
+	Win32Error                = 7
+	WrongState                = 8
+	Aborted                   = 9
+	FileNotFound              = 10
+	ValueOverflow             = 11
+	AccessDenied              = 12
+	UnknownImageFormat        = 13
+	FontFamilyNotFound        = 14
+	FontStyleNotFound         = 15
+	NotTrueTypeFont           = 16
+	UnsupportedGdiplusVersion = 17
+	GdiplusNotInitialized     = 18
+	PropertyNotFound          = 19
+	PropertyNotSupported      = 20
+	ProfileNotFound           = 21
+)
+
+func GetGpStatus(s int32) string {
+	switch s {
+	case Ok:
+		return "Ok"
+	case GenericError:
+		return "GenericError"
+	case InvalidParameter:
+		return "InvalidParameter"
+	case OutOfMemory:
+		return "OutOfMemory"
+	case ObjectBusy:
+		return "ObjectBusy"
+	case InsufficientBuffer:
+		return "InsufficientBuffer"
+	case NotImplemented:
+		return "NotImplemented"
+	case Win32Error:
+		return "Win32Error"
+	case WrongState:
+		return "WrongState"
+	case Aborted:
+		return "Aborted"
+	case FileNotFound:
+		return "FileNotFound"
+	case ValueOverflow:
+		return "ValueOverflow"
+	case AccessDenied:
+		return "AccessDenied"
+	case UnknownImageFormat:
+		return "UnknownImageFormat"
+	case FontFamilyNotFound:
+		return "FontFamilyNotFound"
+	case FontStyleNotFound:
+		return "FontStyleNotFound"
+	case NotTrueTypeFont:
+		return "NotTrueTypeFont"
+	case UnsupportedGdiplusVersion:
+		return "UnsupportedGdiplusVersion"
+	case GdiplusNotInitialized:
+		return "GdiplusNotInitialized"
+	case PropertyNotFound:
+		return "PropertyNotFound"
+	case PropertyNotSupported:
+		return "PropertyNotSupported"
+	case ProfileNotFound:
+		return "ProfileNotFound"
+	}
+	return "Unknown Status Value"
+}
+
+var (
+	token uintptr
+
+	modgdiplus = syscall.NewLazyDLL("gdiplus.dll")
+
+	procGdipCreateBitmapFromFile     = modgdiplus.NewProc("GdipCreateBitmapFromFile")
+	procGdipCreateBitmapFromHBITMAP  = modgdiplus.NewProc("GdipCreateBitmapFromHBITMAP")
+	procGdipCreateHBITMAPFromBitmap  = modgdiplus.NewProc("GdipCreateHBITMAPFromBitmap")
+	procGdipCreateBitmapFromResource = modgdiplus.NewProc("GdipCreateBitmapFromResource")
+	procGdipCreateBitmapFromStream   = modgdiplus.NewProc("GdipCreateBitmapFromStream")
+	procGdipDisposeImage             = modgdiplus.NewProc("GdipDisposeImage")
+	procGdiplusShutdown              = modgdiplus.NewProc("GdiplusShutdown")
+	procGdiplusStartup               = modgdiplus.NewProc("GdiplusStartup")
+)
+
+func GdipCreateBitmapFromFile(filename string) (*uintptr, error) {
+	var bitmap *uintptr
+	ret, _, _ := procGdipCreateBitmapFromFile.Call(
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(filename))),
+		uintptr(unsafe.Pointer(&bitmap)))
+
+	if ret != Ok {
+		return nil, errors.New(fmt.Sprintf("GdipCreateBitmapFromFile failed with status '%s' for file '%s'", GetGpStatus(int32(ret)), filename))
+	}
+
+	return bitmap, nil
+}
+
+func GdipCreateBitmapFromResource(instance HINSTANCE, resId *uint16) (*uintptr, error) {
+	var bitmap *uintptr
+	ret, _, _ := procGdipCreateBitmapFromResource.Call(
+		uintptr(instance),
+		uintptr(unsafe.Pointer(resId)),
+		uintptr(unsafe.Pointer(&bitmap)))
+
+	if ret != Ok {
+		return nil, errors.New(fmt.Sprintf("GdiCreateBitmapFromResource failed with status '%s'", GetGpStatus(int32(ret))))
+	}
+
+	return bitmap, nil
+}
+
+func GdipCreateBitmapFromStream(stream *IStream) (*uintptr, error) {
+	var bitmap *uintptr
+	ret, _, _ := procGdipCreateBitmapFromStream.Call(
+		uintptr(unsafe.Pointer(stream)),
+		uintptr(unsafe.Pointer(&bitmap)))
+
+	if ret != Ok {
+		return nil, errors.New(fmt.Sprintf("GdipCreateBitmapFromStream failed with status '%s'", GetGpStatus(int32(ret))))
+	}
+
+	return bitmap, nil
+}
+
+func GdipCreateHBITMAPFromBitmap(bitmap *uintptr, background uint32) (HBITMAP, error) {
+	var hbitmap HBITMAP
+	ret, _, _ := procGdipCreateHBITMAPFromBitmap.Call(
+		uintptr(unsafe.Pointer(bitmap)),
+		uintptr(unsafe.Pointer(&hbitmap)),
+		uintptr(background))
+
+	if ret != Ok {
+		return 0, errors.New(fmt.Sprintf("GdipCreateHBITMAPFromBitmap failed with status '%s'", GetGpStatus(int32(ret))))
+	}
+
+	return hbitmap, nil
+}
+
+func GdipDisposeImage(image *uintptr) {
+	procGdipDisposeImage.Call(uintptr(unsafe.Pointer(image)))
+}
+
+func GdiplusShutdown() {
+	procGdiplusShutdown.Call(token)
+}
+
+func GdiplusStartup(input *GdiplusStartupInput, output *GdiplusStartupOutput) {
+	ret, _, _ := procGdiplusStartup.Call(
+		uintptr(unsafe.Pointer(&token)),
+		uintptr(unsafe.Pointer(input)),
+		uintptr(unsafe.Pointer(output)))
+
+	if ret != Ok {
+		panic("GdiplusStartup failed with status " + GetGpStatus(int32(ret)))
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/idispatch.go b/Godeps/_workspace/src/github.com/shirou/w32/idispatch.go
new file mode 100644
index 0000000000..41634a6488
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/idispatch.go
@@ -0,0 +1,43 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"unsafe"
+)
+
+type pIDispatchVtbl struct {
+	pQueryInterface   uintptr
+	pAddRef           uintptr
+	pRelease          uintptr
+	pGetTypeInfoCount uintptr
+	pGetTypeInfo      uintptr
+	pGetIDsOfNames    uintptr
+	pInvoke           uintptr
+}
+
+type IDispatch struct {
+	lpVtbl *pIDispatchVtbl
+}
+
+func (this *IDispatch) QueryInterface(id *GUID) *IDispatch {
+	return ComQueryInterface((*IUnknown)(unsafe.Pointer(this)), id)
+}
+
+func (this *IDispatch) AddRef() int32 {
+	return ComAddRef((*IUnknown)(unsafe.Pointer(this)))
+}
+
+func (this *IDispatch) Release() int32 {
+	return ComRelease((*IUnknown)(unsafe.Pointer(this)))
+}
+
+func (this *IDispatch) GetIDsOfName(names []string) []int32 {
+	return ComGetIDsOfName(this, names)
+}
+
+func (this *IDispatch) Invoke(dispid int32, dispatch int16, params ...interface{}) *VARIANT {
+	return ComInvoke(this, dispid, dispatch, params...)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/istream.go b/Godeps/_workspace/src/github.com/shirou/w32/istream.go
new file mode 100644
index 0000000000..2b840c3b09
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/istream.go
@@ -0,0 +1,31 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"unsafe"
+)
+
+type pIStreamVtbl struct {
+	pQueryInterface uintptr
+	pAddRef         uintptr
+	pRelease        uintptr
+}
+
+type IStream struct {
+	lpVtbl *pIStreamVtbl
+}
+
+func (this *IStream) QueryInterface(id *GUID) *IDispatch {
+	return ComQueryInterface((*IUnknown)(unsafe.Pointer(this)), id)
+}
+
+func (this *IStream) AddRef() int32 {
+	return ComAddRef((*IUnknown)(unsafe.Pointer(this)))
+}
+
+func (this *IStream) Release() int32 {
+	return ComRelease((*IUnknown)(unsafe.Pointer(this)))
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/iunknown.go b/Godeps/_workspace/src/github.com/shirou/w32/iunknown.go
new file mode 100644
index 0000000000..d63ff1bbca
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/iunknown.go
@@ -0,0 +1,27 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+type pIUnknownVtbl struct {
+	pQueryInterface uintptr
+	pAddRef         uintptr
+	pRelease        uintptr
+}
+
+type IUnknown struct {
+	lpVtbl *pIUnknownVtbl
+}
+
+func (this *IUnknown) QueryInterface(id *GUID) *IDispatch {
+	return ComQueryInterface(this, id)
+}
+
+func (this *IUnknown) AddRef() int32 {
+	return ComAddRef(this)
+}
+
+func (this *IUnknown) Release() int32 {
+	return ComRelease(this)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/kernel32.go b/Godeps/_workspace/src/github.com/shirou/w32/kernel32.go
new file mode 100644
index 0000000000..891ec1578b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/kernel32.go
@@ -0,0 +1,314 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modkernel32 = syscall.NewLazyDLL("kernel32.dll")
+
+	procGetModuleHandle            = modkernel32.NewProc("GetModuleHandleW")
+	procMulDiv                     = modkernel32.NewProc("MulDiv")
+	procGetConsoleWindow           = modkernel32.NewProc("GetConsoleWindow")
+	procGetCurrentThread           = modkernel32.NewProc("GetCurrentThread")
+	procGetLogicalDrives           = modkernel32.NewProc("GetLogicalDrives")
+	procGetUserDefaultLCID         = modkernel32.NewProc("GetUserDefaultLCID")
+	procLstrlen                    = modkernel32.NewProc("lstrlenW")
+	procLstrcpy                    = modkernel32.NewProc("lstrcpyW")
+	procGlobalAlloc                = modkernel32.NewProc("GlobalAlloc")
+	procGlobalFree                 = modkernel32.NewProc("GlobalFree")
+	procGlobalLock                 = modkernel32.NewProc("GlobalLock")
+	procGlobalUnlock               = modkernel32.NewProc("GlobalUnlock")
+	procMoveMemory                 = modkernel32.NewProc("RtlMoveMemory")
+	procFindResource               = modkernel32.NewProc("FindResourceW")
+	procSizeofResource             = modkernel32.NewProc("SizeofResource")
+	procLockResource               = modkernel32.NewProc("LockResource")
+	procLoadResource               = modkernel32.NewProc("LoadResource")
+	procGetLastError               = modkernel32.NewProc("GetLastError")
+	procOpenProcess                = modkernel32.NewProc("OpenProcess")
+	procTerminateProcess           = modkernel32.NewProc("TerminateProcess")
+	procCloseHandle                = modkernel32.NewProc("CloseHandle")
+	procCreateToolhelp32Snapshot   = modkernel32.NewProc("CreateToolhelp32Snapshot")
+	procModule32First              = modkernel32.NewProc("Module32FirstW")
+	procModule32Next               = modkernel32.NewProc("Module32NextW")
+	procProcess32First             = modkernel32.NewProc("Process32FirstW")
+	procProcess32Next              = modkernel32.NewProc("Process32NextW")
+	procGetSystemTimes             = modkernel32.NewProc("GetSystemTimes")
+	procGetConsoleScreenBufferInfo = modkernel32.NewProc("GetConsoleScreenBufferInfo")
+	procSetConsoleTextAttribute    = modkernel32.NewProc("SetConsoleTextAttribute")
+	procGetDiskFreeSpaceEx         = modkernel32.NewProc("GetDiskFreeSpaceExW")
+	procGetProcessTimes            = modkernel32.NewProc("GetProcessTimes")
+)
+
+func GetModuleHandle(modulename string) HINSTANCE {
+	var mn uintptr
+	if modulename == "" {
+		mn = 0
+	} else {
+		mn = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(modulename)))
+	}
+	ret, _, _ := procGetModuleHandle.Call(mn)
+	return HINSTANCE(ret)
+}
+
+func MulDiv(number, numerator, denominator int) int {
+	ret, _, _ := procMulDiv.Call(
+		uintptr(number),
+		uintptr(numerator),
+		uintptr(denominator))
+
+	return int(ret)
+}
+
+func GetConsoleWindow() HWND {
+	ret, _, _ := procGetConsoleWindow.Call()
+
+	return HWND(ret)
+}
+
+func GetCurrentThread() HANDLE {
+	ret, _, _ := procGetCurrentThread.Call()
+
+	return HANDLE(ret)
+}
+
+func GetLogicalDrives() uint32 {
+	ret, _, _ := procGetLogicalDrives.Call()
+
+	return uint32(ret)
+}
+
+func GetUserDefaultLCID() uint32 {
+	ret, _, _ := procGetUserDefaultLCID.Call()
+
+	return uint32(ret)
+}
+
+func Lstrlen(lpString *uint16) int {
+	ret, _, _ := procLstrlen.Call(uintptr(unsafe.Pointer(lpString)))
+
+	return int(ret)
+}
+
+func Lstrcpy(buf []uint16, lpString *uint16) {
+	procLstrcpy.Call(
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(lpString)))
+}
+
+func GlobalAlloc(uFlags uint, dwBytes uint32) HGLOBAL {
+	ret, _, _ := procGlobalAlloc.Call(
+		uintptr(uFlags),
+		uintptr(dwBytes))
+
+	if ret == 0 {
+		panic("GlobalAlloc failed")
+	}
+
+	return HGLOBAL(ret)
+}
+
+func GlobalFree(hMem HGLOBAL) {
+	ret, _, _ := procGlobalFree.Call(uintptr(hMem))
+
+	if ret != 0 {
+		panic("GlobalFree failed")
+	}
+}
+
+func GlobalLock(hMem HGLOBAL) unsafe.Pointer {
+	ret, _, _ := procGlobalLock.Call(uintptr(hMem))
+
+	if ret == 0 {
+		panic("GlobalLock failed")
+	}
+
+	return unsafe.Pointer(ret)
+}
+
+func GlobalUnlock(hMem HGLOBAL) bool {
+	ret, _, _ := procGlobalUnlock.Call(uintptr(hMem))
+
+	return ret != 0
+}
+
+func MoveMemory(destination, source unsafe.Pointer, length uint32) {
+	procMoveMemory.Call(
+		uintptr(unsafe.Pointer(destination)),
+		uintptr(source),
+		uintptr(length))
+}
+
+func FindResource(hModule HMODULE, lpName, lpType *uint16) (HRSRC, error) {
+	ret, _, _ := procFindResource.Call(
+		uintptr(hModule),
+		uintptr(unsafe.Pointer(lpName)),
+		uintptr(unsafe.Pointer(lpType)))
+
+	if ret == 0 {
+		return 0, syscall.GetLastError()
+	}
+
+	return HRSRC(ret), nil
+}
+
+func SizeofResource(hModule HMODULE, hResInfo HRSRC) uint32 {
+	ret, _, _ := procSizeofResource.Call(
+		uintptr(hModule),
+		uintptr(hResInfo))
+
+	if ret == 0 {
+		panic("SizeofResource failed")
+	}
+
+	return uint32(ret)
+}
+
+func LockResource(hResData HGLOBAL) unsafe.Pointer {
+	ret, _, _ := procLockResource.Call(uintptr(hResData))
+
+	if ret == 0 {
+		panic("LockResource failed")
+	}
+
+	return unsafe.Pointer(ret)
+}
+
+func LoadResource(hModule HMODULE, hResInfo HRSRC) HGLOBAL {
+	ret, _, _ := procLoadResource.Call(
+		uintptr(hModule),
+		uintptr(hResInfo))
+
+	if ret == 0 {
+		panic("LoadResource failed")
+	}
+
+	return HGLOBAL(ret)
+}
+
+func GetLastError() uint32 {
+	ret, _, _ := procGetLastError.Call()
+	return uint32(ret)
+}
+
+func OpenProcess(desiredAccess uint32, inheritHandle bool, processId uint32) HANDLE {
+	inherit := 0
+	if inheritHandle {
+		inherit = 1
+	}
+
+	ret, _, _ := procOpenProcess.Call(
+		uintptr(desiredAccess),
+		uintptr(inherit),
+		uintptr(processId))
+	return HANDLE(ret)
+}
+
+func TerminateProcess(hProcess HANDLE, uExitCode uint) bool {
+	ret, _, _ := procTerminateProcess.Call(
+		uintptr(hProcess),
+		uintptr(uExitCode))
+	return ret != 0
+}
+
+func CloseHandle(object HANDLE) bool {
+	ret, _, _ := procCloseHandle.Call(
+		uintptr(object))
+	return ret != 0
+}
+
+func CreateToolhelp32Snapshot(flags, processId uint32) HANDLE {
+	ret, _, _ := procCreateToolhelp32Snapshot.Call(
+		uintptr(flags),
+		uintptr(processId))
+
+	if ret <= 0 {
+		return HANDLE(0)
+	}
+
+	return HANDLE(ret)
+}
+
+func Module32First(snapshot HANDLE, me *MODULEENTRY32) bool {
+	ret, _, _ := procModule32First.Call(
+		uintptr(snapshot),
+		uintptr(unsafe.Pointer(me)))
+
+	return ret != 0
+}
+
+func Module32Next(snapshot HANDLE, me *MODULEENTRY32) bool {
+	ret, _, _ := procModule32Next.Call(
+		uintptr(snapshot),
+		uintptr(unsafe.Pointer(me)))
+
+	return ret != 0
+}
+func Process32First(snapshot HANDLE, pe *PROCESSENTRY32) bool {
+	ret, _, _ := procProcess32First.Call(
+		uintptr(snapshot),
+		uintptr(unsafe.Pointer(pe)))
+
+	return ret != 0
+}
+
+func Process32Next(snapshot HANDLE, pe *PROCESSENTRY32) bool {
+	ret, _, _ := procProcess32Next.Call(
+		uintptr(snapshot),
+		uintptr(unsafe.Pointer(pe)))
+
+	return ret != 0
+}
+func GetSystemTimes(lpIdleTime, lpKernelTime, lpUserTime *FILETIME) bool {
+	ret, _, _ := procGetSystemTimes.Call(
+		uintptr(unsafe.Pointer(lpIdleTime)),
+		uintptr(unsafe.Pointer(lpKernelTime)),
+		uintptr(unsafe.Pointer(lpUserTime)))
+
+	return ret != 0
+}
+
+func GetProcessTimes(hProcess HANDLE, lpCreationTime, lpExitTime, lpKernelTime, lpUserTime *FILETIME) bool {
+	ret, _, _ := procGetProcessTimes.Call(
+		uintptr(hProcess),
+		uintptr(unsafe.Pointer(lpCreationTime)),
+		uintptr(unsafe.Pointer(lpExitTime)),
+		uintptr(unsafe.Pointer(lpKernelTime)),
+		uintptr(unsafe.Pointer(lpUserTime)))
+
+	return ret != 0
+}
+
+func GetConsoleScreenBufferInfo(hConsoleOutput HANDLE) *CONSOLE_SCREEN_BUFFER_INFO {
+	var csbi CONSOLE_SCREEN_BUFFER_INFO
+	ret, _, _ := procGetConsoleScreenBufferInfo.Call(
+		uintptr(hConsoleOutput),
+		uintptr(unsafe.Pointer(&csbi)))
+	if ret == 0 {
+		return nil
+	}
+	return &csbi
+}
+
+func SetConsoleTextAttribute(hConsoleOutput HANDLE, wAttributes uint16) bool {
+	ret, _, _ := procSetConsoleTextAttribute.Call(
+		uintptr(hConsoleOutput),
+		uintptr(wAttributes))
+	return ret != 0
+}
+
+func GetDiskFreeSpaceEx(dirName string) (r bool,
+	freeBytesAvailable, totalNumberOfBytes, totalNumberOfFreeBytes uint64) {
+	ret, _, _ := procGetDiskFreeSpaceEx.Call(
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(dirName))),
+		uintptr(unsafe.Pointer(&freeBytesAvailable)),
+		uintptr(unsafe.Pointer(&totalNumberOfBytes)),
+		uintptr(unsafe.Pointer(&totalNumberOfFreeBytes)))
+	return ret != 0,
+		freeBytesAvailable, totalNumberOfBytes, totalNumberOfFreeBytes
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/ole32.go b/Godeps/_workspace/src/github.com/shirou/w32/ole32.go
new file mode 100644
index 0000000000..a7f79b550d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/ole32.go
@@ -0,0 +1,63 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modole32 = syscall.NewLazyDLL("ole32.dll")
+
+	procCoInitializeEx        = modole32.NewProc("CoInitializeEx")
+	procCoInitialize          = modole32.NewProc("CoInitialize")
+	procCoUninitialize        = modole32.NewProc("CoUninitialize")
+	procCreateStreamOnHGlobal = modole32.NewProc("CreateStreamOnHGlobal")
+)
+
+func CoInitializeEx(coInit uintptr) HRESULT {
+	ret, _, _ := procCoInitializeEx.Call(
+		0,
+		coInit)
+
+	switch uint32(ret) {
+	case E_INVALIDARG:
+		panic("CoInitializeEx failed with E_INVALIDARG")
+	case E_OUTOFMEMORY:
+		panic("CoInitializeEx failed with E_OUTOFMEMORY")
+	case E_UNEXPECTED:
+		panic("CoInitializeEx failed with E_UNEXPECTED")
+	}
+
+	return HRESULT(ret)
+}
+
+func CoInitialize() {
+	procCoInitialize.Call(0)
+}
+
+func CoUninitialize() {
+	procCoUninitialize.Call()
+}
+
+func CreateStreamOnHGlobal(hGlobal HGLOBAL, fDeleteOnRelease bool) *IStream {
+	stream := new(IStream)
+	ret, _, _ := procCreateStreamOnHGlobal.Call(
+		uintptr(hGlobal),
+		uintptr(BoolToBOOL(fDeleteOnRelease)),
+		uintptr(unsafe.Pointer(&stream)))
+
+	switch uint32(ret) {
+	case E_INVALIDARG:
+		panic("CreateStreamOnHGlobal failed with E_INVALIDARG")
+	case E_OUTOFMEMORY:
+		panic("CreateStreamOnHGlobal failed with E_OUTOFMEMORY")
+	case E_UNEXPECTED:
+		panic("CreateStreamOnHGlobal failed with E_UNEXPECTED")
+	}
+
+	return stream
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/oleaut32.go b/Godeps/_workspace/src/github.com/shirou/w32/oleaut32.go
new file mode 100644
index 0000000000..0eeeab7246
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/oleaut32.go
@@ -0,0 +1,48 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modoleaut32 = syscall.NewLazyDLL("oleaut32")
+
+	procVariantInit        = modoleaut32.NewProc("VariantInit")
+	procSysAllocString     = modoleaut32.NewProc("SysAllocString")
+	procSysFreeString      = modoleaut32.NewProc("SysFreeString")
+	procSysStringLen       = modoleaut32.NewProc("SysStringLen")
+	procCreateDispTypeInfo = modoleaut32.NewProc("CreateDispTypeInfo")
+	procCreateStdDispatch  = modoleaut32.NewProc("CreateStdDispatch")
+)
+
+func VariantInit(v *VARIANT) {
+	hr, _, _ := procVariantInit.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		panic("Invoke VariantInit error.")
+	}
+	return
+}
+
+func SysAllocString(v string) (ss *int16) {
+	pss, _, _ := procSysAllocString.Call(uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(v))))
+	ss = (*int16)(unsafe.Pointer(pss))
+	return
+}
+
+func SysFreeString(v *int16) {
+	hr, _, _ := procSysFreeString.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		panic("Invoke SysFreeString error.")
+	}
+	return
+}
+
+func SysStringLen(v *int16) uint {
+	l, _, _ := procSysStringLen.Call(uintptr(unsafe.Pointer(v)))
+	return uint(l)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/opengl32.go b/Godeps/_workspace/src/github.com/shirou/w32/opengl32.go
new file mode 100644
index 0000000000..7363bb10ad
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/opengl32.go
@@ -0,0 +1,72 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modopengl32 = syscall.NewLazyDLL("opengl32.dll")
+
+	procwglCreateContext      = modopengl32.NewProc("wglCreateContext")
+	procwglCreateLayerContext = modopengl32.NewProc("wglCreateLayerContext")
+	procwglDeleteContext      = modopengl32.NewProc("wglDeleteContext")
+	procwglGetProcAddress     = modopengl32.NewProc("wglGetProcAddress")
+	procwglMakeCurrent        = modopengl32.NewProc("wglMakeCurrent")
+	procwglShareLists         = modopengl32.NewProc("wglShareLists")
+)
+
+func WglCreateContext(hdc HDC) HGLRC {
+	ret, _, _ := procwglCreateContext.Call(
+		uintptr(hdc),
+	)
+
+	return HGLRC(ret)
+}
+
+func WglCreateLayerContext(hdc HDC, iLayerPlane int) HGLRC {
+	ret, _, _ := procwglCreateLayerContext.Call(
+		uintptr(hdc),
+		uintptr(iLayerPlane),
+	)
+
+	return HGLRC(ret)
+}
+
+func WglDeleteContext(hglrc HGLRC) bool {
+	ret, _, _ := procwglDeleteContext.Call(
+		uintptr(hglrc),
+	)
+
+	return ret == TRUE
+}
+
+func WglGetProcAddress(szProc string) uintptr {
+	ret, _, _ := procwglGetProcAddress.Call(
+		uintptr(unsafe.Pointer(syscall.StringBytePtr(szProc))),
+	)
+
+	return ret
+}
+
+func WglMakeCurrent(hdc HDC, hglrc HGLRC) bool {
+	ret, _, _ := procwglMakeCurrent.Call(
+		uintptr(hdc),
+		uintptr(hglrc),
+	)
+
+	return ret == TRUE
+}
+
+func WglShareLists(hglrc1, hglrc2 HGLRC) bool {
+	ret, _, _ := procwglShareLists.Call(
+		uintptr(hglrc1),
+		uintptr(hglrc2),
+	)
+
+	return ret == TRUE
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/psapi.go b/Godeps/_workspace/src/github.com/shirou/w32/psapi.go
new file mode 100644
index 0000000000..bd1e12627c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/psapi.go
@@ -0,0 +1,25 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modpsapi = syscall.NewLazyDLL("psapi.dll")
+
+	procEnumProcesses = modpsapi.NewProc("EnumProcesses")
+)
+
+func EnumProcesses(processIds []uint32, cb uint32, bytesReturned *uint32) bool {
+	ret, _, _ := procEnumProcesses.Call(
+		uintptr(unsafe.Pointer(&processIds[0])),
+		uintptr(cb),
+		uintptr(unsafe.Pointer(bytesReturned)))
+
+	return ret != 0
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/shell32.go b/Godeps/_workspace/src/github.com/shirou/w32/shell32.go
new file mode 100644
index 0000000000..0923b8b61d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/shell32.go
@@ -0,0 +1,153 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"errors"
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modshell32 = syscall.NewLazyDLL("shell32.dll")
+
+	procSHBrowseForFolder   = modshell32.NewProc("SHBrowseForFolderW")
+	procSHGetPathFromIDList = modshell32.NewProc("SHGetPathFromIDListW")
+	procDragAcceptFiles     = modshell32.NewProc("DragAcceptFiles")
+	procDragQueryFile       = modshell32.NewProc("DragQueryFileW")
+	procDragQueryPoint      = modshell32.NewProc("DragQueryPoint")
+	procDragFinish          = modshell32.NewProc("DragFinish")
+	procShellExecute        = modshell32.NewProc("ShellExecuteW")
+	procExtractIcon         = modshell32.NewProc("ExtractIconW")
+)
+
+func SHBrowseForFolder(bi *BROWSEINFO) uintptr {
+	ret, _, _ := procSHBrowseForFolder.Call(uintptr(unsafe.Pointer(bi)))
+
+	return ret
+}
+
+func SHGetPathFromIDList(idl uintptr) string {
+	buf := make([]uint16, 1024)
+	procSHGetPathFromIDList.Call(
+		idl,
+		uintptr(unsafe.Pointer(&buf[0])))
+
+	return syscall.UTF16ToString(buf)
+}
+
+func DragAcceptFiles(hwnd HWND, accept bool) {
+	procDragAcceptFiles.Call(
+		uintptr(hwnd),
+		uintptr(BoolToBOOL(accept)))
+}
+
+func DragQueryFile(hDrop HDROP, iFile uint) (fileName string, fileCount uint) {
+	ret, _, _ := procDragQueryFile.Call(
+		uintptr(hDrop),
+		uintptr(iFile),
+		0,
+		0)
+
+	fileCount = uint(ret)
+
+	if iFile != 0xFFFFFFFF {
+		buf := make([]uint16, fileCount+1)
+
+		ret, _, _ := procDragQueryFile.Call(
+			uintptr(hDrop),
+			uintptr(iFile),
+			uintptr(unsafe.Pointer(&buf[0])),
+			uintptr(fileCount+1))
+
+		if ret == 0 {
+			panic("Invoke DragQueryFile error.")
+		}
+
+		fileName = syscall.UTF16ToString(buf)
+	}
+
+	return
+}
+
+func DragQueryPoint(hDrop HDROP) (x, y int, isClientArea bool) {
+	var pt POINT
+	ret, _, _ := procDragQueryPoint.Call(
+		uintptr(hDrop),
+		uintptr(unsafe.Pointer(&pt)))
+
+	return int(pt.X), int(pt.Y), (ret == 1)
+}
+
+func DragFinish(hDrop HDROP) {
+	procDragFinish.Call(uintptr(hDrop))
+}
+
+func ShellExecute(hwnd HWND, lpOperation, lpFile, lpParameters, lpDirectory string, nShowCmd int) error {
+	var op, param, directory uintptr
+	if len(lpOperation) != 0 {
+		op = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpOperation)))
+	}
+	if len(lpParameters) != 0 {
+		param = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpParameters)))
+	}
+	if len(lpDirectory) != 0 {
+		directory = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpDirectory)))
+	}
+
+	ret, _, _ := procShellExecute.Call(
+		uintptr(hwnd),
+		op,
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpFile))),
+		param,
+		directory,
+		uintptr(nShowCmd))
+
+	errorMsg := ""
+	if ret != 0 && ret <= 32 {
+		switch int(ret) {
+		case ERROR_FILE_NOT_FOUND:
+			errorMsg = "The specified file was not found."
+		case ERROR_PATH_NOT_FOUND:
+			errorMsg = "The specified path was not found."
+		case ERROR_BAD_FORMAT:
+			errorMsg = "The .exe file is invalid (non-Win32 .exe or error in .exe image)."
+		case SE_ERR_ACCESSDENIED:
+			errorMsg = "The operating system denied access to the specified file."
+		case SE_ERR_ASSOCINCOMPLETE:
+			errorMsg = "The file name association is incomplete or invalid."
+		case SE_ERR_DDEBUSY:
+			errorMsg = "The DDE transaction could not be completed because other DDE transactions were being processed."
+		case SE_ERR_DDEFAIL:
+			errorMsg = "The DDE transaction failed."
+		case SE_ERR_DDETIMEOUT:
+			errorMsg = "The DDE transaction could not be completed because the request timed out."
+		case SE_ERR_DLLNOTFOUND:
+			errorMsg = "The specified DLL was not found."
+		case SE_ERR_NOASSOC:
+			errorMsg = "There is no application associated with the given file name extension. This error will also be returned if you attempt to print a file that is not printable."
+		case SE_ERR_OOM:
+			errorMsg = "There was not enough memory to complete the operation."
+		case SE_ERR_SHARE:
+			errorMsg = "A sharing violation occurred."
+		default:
+			errorMsg = fmt.Sprintf("Unknown error occurred with error code %v", ret)
+		}
+	} else {
+		return nil
+	}
+
+	return errors.New(errorMsg)
+}
+
+func ExtractIcon(lpszExeFileName string, nIconIndex int) HICON {
+	ret, _, _ := procExtractIcon.Call(
+		0,
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpszExeFileName))),
+		uintptr(nIconIndex))
+
+	return HICON(ret)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/typedef.go b/Godeps/_workspace/src/github.com/shirou/w32/typedef.go
new file mode 100644
index 0000000000..65f5111292
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/typedef.go
@@ -0,0 +1,901 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"unsafe"
+)
+
+// From MSDN: Windows Data Types
+// http://msdn.microsoft.com/en-us/library/s3f49ktz.aspx
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa383751.aspx
+// ATOM                  WORD
+// BOOL                  int32
+// BOOLEAN               byte
+// BYTE                  byte
+// CCHAR                 int8
+// CHAR                  int8
+// COLORREF              DWORD
+// DWORD                 uint32
+// DWORDLONG             ULONGLONG
+// DWORD_PTR             ULONG_PTR
+// DWORD32               uint32
+// DWORD64               uint64
+// FLOAT                 float32
+// HACCEL                HANDLE
+// HALF_PTR              struct{} // ???
+// HANDLE                PVOID
+// HBITMAP               HANDLE
+// HBRUSH                HANDLE
+// HCOLORSPACE           HANDLE
+// HCONV                 HANDLE
+// HCONVLIST             HANDLE
+// HCURSOR               HANDLE
+// HDC                   HANDLE
+// HDDEDATA              HANDLE
+// HDESK                 HANDLE
+// HDROP                 HANDLE
+// HDWP                  HANDLE
+// HENHMETAFILE          HANDLE
+// HFILE                 HANDLE
+// HFONT                 HANDLE
+// HGDIOBJ               HANDLE
+// HGLOBAL               HANDLE
+// HHOOK                 HANDLE
+// HICON                 HANDLE
+// HINSTANCE             HANDLE
+// HKEY                  HANDLE
+// HKL                   HANDLE
+// HLOCAL                HANDLE
+// HMENU                 HANDLE
+// HMETAFILE             HANDLE
+// HMODULE               HANDLE
+// HPALETTE              HANDLE
+// HPEN                  HANDLE
+// HRESULT               int32
+// HRGN                  HANDLE
+// HSZ                   HANDLE
+// HWINSTA               HANDLE
+// HWND                  HANDLE
+// INT                   int32
+// INT_PTR               uintptr
+// INT8                  int8
+// INT16                 int16
+// INT32                 int32
+// INT64                 int64
+// LANGID                WORD
+// LCID                  DWORD
+// LCTYPE                DWORD
+// LGRPID                DWORD
+// LONG                  int32
+// LONGLONG              int64
+// LONG_PTR              uintptr
+// LONG32                int32
+// LONG64                int64
+// LPARAM                LONG_PTR
+// LPBOOL                *BOOL
+// LPBYTE                *BYTE
+// LPCOLORREF            *COLORREF
+// LPCSTR                *int8
+// LPCTSTR               LPCWSTR
+// LPCVOID               unsafe.Pointer
+// LPCWSTR               *WCHAR
+// LPDWORD               *DWORD
+// LPHANDLE              *HANDLE
+// LPINT                 *INT
+// LPLONG                *LONG
+// LPSTR                 *CHAR
+// LPTSTR                LPWSTR
+// LPVOID                unsafe.Pointer
+// LPWORD                *WORD
+// LPWSTR                *WCHAR
+// LRESULT               LONG_PTR
+// PBOOL                 *BOOL
+// PBOOLEAN              *BOOLEAN
+// PBYTE                 *BYTE
+// PCHAR                 *CHAR
+// PCSTR                 *CHAR
+// PCTSTR                PCWSTR
+// PCWSTR                *WCHAR
+// PDWORD                *DWORD
+// PDWORDLONG            *DWORDLONG
+// PDWORD_PTR            *DWORD_PTR
+// PDWORD32              *DWORD32
+// PDWORD64              *DWORD64
+// PFLOAT                *FLOAT
+// PHALF_PTR             *HALF_PTR
+// PHANDLE               *HANDLE
+// PHKEY                 *HKEY
+// PINT_PTR              *INT_PTR
+// PINT8                 *INT8
+// PINT16                *INT16
+// PINT32                *INT32
+// PINT64                *INT64
+// PLCID                 *LCID
+// PLONG                 *LONG
+// PLONGLONG             *LONGLONG
+// PLONG_PTR             *LONG_PTR
+// PLONG32               *LONG32
+// PLONG64               *LONG64
+// POINTER_32            struct{} // ???
+// POINTER_64            struct{} // ???
+// POINTER_SIGNED        uintptr
+// POINTER_UNSIGNED      uintptr
+// PSHORT                *SHORT
+// PSIZE_T               *SIZE_T
+// PSSIZE_T              *SSIZE_T
+// PSTR                  *CHAR
+// PTBYTE                *TBYTE
+// PTCHAR                *TCHAR
+// PTSTR                 PWSTR
+// PUCHAR                *UCHAR
+// PUHALF_PTR            *UHALF_PTR
+// PUINT                 *UINT
+// PUINT_PTR             *UINT_PTR
+// PUINT8                *UINT8
+// PUINT16               *UINT16
+// PUINT32               *UINT32
+// PUINT64               *UINT64
+// PULONG                *ULONG
+// PULONGLONG            *ULONGLONG
+// PULONG_PTR            *ULONG_PTR
+// PULONG32              *ULONG32
+// PULONG64              *ULONG64
+// PUSHORT               *USHORT
+// PVOID                 unsafe.Pointer
+// PWCHAR                *WCHAR
+// PWORD                 *WORD
+// PWSTR                 *WCHAR
+// QWORD                 uint64
+// SC_HANDLE             HANDLE
+// SC_LOCK               LPVOID
+// SERVICE_STATUS_HANDLE HANDLE
+// SHORT                 int16
+// SIZE_T                ULONG_PTR
+// SSIZE_T               LONG_PTR
+// TBYTE                 WCHAR
+// TCHAR                 WCHAR
+// UCHAR                 uint8
+// UHALF_PTR             struct{} // ???
+// UINT                  uint32
+// UINT_PTR              uintptr
+// UINT8                 uint8
+// UINT16                uint16
+// UINT32                uint32
+// UINT64                uint64
+// ULONG                 uint32
+// ULONGLONG             uint64
+// ULONG_PTR             uintptr
+// ULONG32               uint32
+// ULONG64               uint64
+// USHORT                uint16
+// USN                   LONGLONG
+// WCHAR                 uint16
+// WORD                  uint16
+// WPARAM                UINT_PTR
+type (
+	ATOM            uint16
+	BOOL            int32
+	COLORREF        uint32
+	DWM_FRAME_COUNT uint64
+	HACCEL          HANDLE
+	HANDLE          uintptr
+	HBITMAP         HANDLE
+	HBRUSH          HANDLE
+	HCURSOR         HANDLE
+	HDC             HANDLE
+	HDROP           HANDLE
+	HDWP            HANDLE
+	HENHMETAFILE    HANDLE
+	HFONT           HANDLE
+	HGDIOBJ         HANDLE
+	HGLOBAL         HANDLE
+	HGLRC           HANDLE
+	HICON           HANDLE
+	HIMAGELIST      HANDLE
+	HINSTANCE       HANDLE
+	HKEY            HANDLE
+	HKL             HANDLE
+	HMENU           HANDLE
+	HMODULE         HANDLE
+	HMONITOR        HANDLE
+	HPEN            HANDLE
+	HRESULT         int32
+	HRGN            HANDLE
+	HRSRC           HANDLE
+	HTHUMBNAIL      HANDLE
+	HWND            HANDLE
+	LPCVOID         unsafe.Pointer
+	PVOID           unsafe.Pointer
+	QPC_TIME        uint64
+)
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162805.aspx
+type POINT struct {
+	X, Y int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162897.aspx
+type RECT struct {
+	Left, Top, Right, Bottom int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms633577.aspx
+type WNDCLASSEX struct {
+	Size       uint32
+	Style      uint32
+	WndProc    uintptr
+	ClsExtra   int32
+	WndExtra   int32
+	Instance   HINSTANCE
+	Icon       HICON
+	Cursor     HCURSOR
+	Background HBRUSH
+	MenuName   *uint16
+	ClassName  *uint16
+	IconSm     HICON
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms644958.aspx
+type MSG struct {
+	Hwnd    HWND
+	Message uint32
+	WParam  uintptr
+	LParam  uintptr
+	Time    uint32
+	Pt      POINT
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145037.aspx
+type LOGFONT struct {
+	Height         int32
+	Width          int32
+	Escapement     int32
+	Orientation    int32
+	Weight         int32
+	Italic         byte
+	Underline      byte
+	StrikeOut      byte
+	CharSet        byte
+	OutPrecision   byte
+	ClipPrecision  byte
+	Quality        byte
+	PitchAndFamily byte
+	FaceName       [LF_FACESIZE]uint16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646839.aspx
+type OPENFILENAME struct {
+	StructSize      uint32
+	Owner           HWND
+	Instance        HINSTANCE
+	Filter          *uint16
+	CustomFilter    *uint16
+	MaxCustomFilter uint32
+	FilterIndex     uint32
+	File            *uint16
+	MaxFile         uint32
+	FileTitle       *uint16
+	MaxFileTitle    uint32
+	InitialDir      *uint16
+	Title           *uint16
+	Flags           uint32
+	FileOffset      uint16
+	FileExtension   uint16
+	DefExt          *uint16
+	CustData        uintptr
+	FnHook          uintptr
+	TemplateName    *uint16
+	PvReserved      unsafe.Pointer
+	DwReserved      uint32
+	FlagsEx         uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773205.aspx
+type BROWSEINFO struct {
+	Owner        HWND
+	Root         *uint16
+	DisplayName  *uint16
+	Title        *uint16
+	Flags        uint32
+	CallbackFunc uintptr
+	LParam       uintptr
+	Image        int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa373931.aspx
+type GUID struct {
+	Data1 uint32
+	Data2 uint16
+	Data3 uint16
+	Data4 [8]byte
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms221627.aspx
+type VARIANT struct {
+	VT         uint16 //  2
+	WReserved1 uint16 //  4
+	WReserved2 uint16 //  6
+	WReserved3 uint16 //  8
+	Val        int64  // 16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms221416.aspx
+type DISPPARAMS struct {
+	Rgvarg            uintptr
+	RgdispidNamedArgs uintptr
+	CArgs             uint32
+	CNamedArgs        uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms221133.aspx
+type EXCEPINFO struct {
+	WCode             uint16
+	WReserved         uint16
+	BstrSource        *uint16
+	BstrDescription   *uint16
+	BstrHelpFile      *uint16
+	DwHelpContext     uint32
+	PvReserved        uintptr
+	PfnDeferredFillIn uintptr
+	Scode             int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145035.aspx
+type LOGBRUSH struct {
+	LbStyle uint32
+	LbColor COLORREF
+	LbHatch uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183565.aspx
+type DEVMODE struct {
+	DmDeviceName       [CCHDEVICENAME]uint16
+	DmSpecVersion      uint16
+	DmDriverVersion    uint16
+	DmSize             uint16
+	DmDriverExtra      uint16
+	DmFields           uint32
+	DmOrientation      int16
+	DmPaperSize        int16
+	DmPaperLength      int16
+	DmPaperWidth       int16
+	DmScale            int16
+	DmCopies           int16
+	DmDefaultSource    int16
+	DmPrintQuality     int16
+	DmColor            int16
+	DmDuplex           int16
+	DmYResolution      int16
+	DmTTOption         int16
+	DmCollate          int16
+	DmFormName         [CCHFORMNAME]uint16
+	DmLogPixels        uint16
+	DmBitsPerPel       uint32
+	DmPelsWidth        uint32
+	DmPelsHeight       uint32
+	DmDisplayFlags     uint32
+	DmDisplayFrequency uint32
+	DmICMMethod        uint32
+	DmICMIntent        uint32
+	DmMediaType        uint32
+	DmDitherType       uint32
+	DmReserved1        uint32
+	DmReserved2        uint32
+	DmPanningWidth     uint32
+	DmPanningHeight    uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183376.aspx
+type BITMAPINFOHEADER struct {
+	BiSize          uint32
+	BiWidth         int32
+	BiHeight        int32
+	BiPlanes        uint16
+	BiBitCount      uint16
+	BiCompression   uint32
+	BiSizeImage     uint32
+	BiXPelsPerMeter int32
+	BiYPelsPerMeter int32
+	BiClrUsed       uint32
+	BiClrImportant  uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162938.aspx
+type RGBQUAD struct {
+	RgbBlue     byte
+	RgbGreen    byte
+	RgbRed      byte
+	RgbReserved byte
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183375.aspx
+type BITMAPINFO struct {
+	BmiHeader BITMAPINFOHEADER
+	BmiColors *RGBQUAD
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183371.aspx
+type BITMAP struct {
+	BmType       int32
+	BmWidth      int32
+	BmHeight     int32
+	BmWidthBytes int32
+	BmPlanes     uint16
+	BmBitsPixel  uint16
+	BmBits       unsafe.Pointer
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183567.aspx
+type DIBSECTION struct {
+	DsBm        BITMAP
+	DsBmih      BITMAPINFOHEADER
+	DsBitfields [3]uint32
+	DshSection  HANDLE
+	DsOffset    uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162607.aspx
+type ENHMETAHEADER struct {
+	IType          uint32
+	NSize          uint32
+	RclBounds      RECT
+	RclFrame       RECT
+	DSignature     uint32
+	NVersion       uint32
+	NBytes         uint32
+	NRecords       uint32
+	NHandles       uint16
+	SReserved      uint16
+	NDescription   uint32
+	OffDescription uint32
+	NPalEntries    uint32
+	SzlDevice      SIZE
+	SzlMillimeters SIZE
+	CbPixelFormat  uint32
+	OffPixelFormat uint32
+	BOpenGL        uint32
+	SzlMicrometers SIZE
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145106.aspx
+type SIZE struct {
+	CX, CY int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145132.aspx
+type TEXTMETRIC struct {
+	TmHeight           int32
+	TmAscent           int32
+	TmDescent          int32
+	TmInternalLeading  int32
+	TmExternalLeading  int32
+	TmAveCharWidth     int32
+	TmMaxCharWidth     int32
+	TmWeight           int32
+	TmOverhang         int32
+	TmDigitizedAspectX int32
+	TmDigitizedAspectY int32
+	TmFirstChar        uint16
+	TmLastChar         uint16
+	TmDefaultChar      uint16
+	TmBreakChar        uint16
+	TmItalic           byte
+	TmUnderlined       byte
+	TmStruckOut        byte
+	TmPitchAndFamily   byte
+	TmCharSet          byte
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183574.aspx
+type DOCINFO struct {
+	CbSize       int32
+	LpszDocName  *uint16
+	LpszOutput   *uint16
+	LpszDatatype *uint16
+	FwType       uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb775514.aspx
+type NMHDR struct {
+	HwndFrom HWND
+	IdFrom   uintptr
+	Code     uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774743.aspx
+type LVCOLUMN struct {
+	Mask       uint32
+	Fmt        int32
+	Cx         int32
+	PszText    *uint16
+	CchTextMax int32
+	ISubItem   int32
+	IImage     int32
+	IOrder     int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774760.aspx
+type LVITEM struct {
+	Mask       uint32
+	IItem      int32
+	ISubItem   int32
+	State      uint32
+	StateMask  uint32
+	PszText    *uint16
+	CchTextMax int32
+	IImage     int32
+	LParam     uintptr
+	IIndent    int32
+	IGroupId   int32
+	CColumns   uint32
+	PuColumns  uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774754.aspx
+type LVHITTESTINFO struct {
+	Pt       POINT
+	Flags    uint32
+	IItem    int32
+	ISubItem int32
+	IGroup   int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774771.aspx
+type NMITEMACTIVATE struct {
+	Hdr       NMHDR
+	IItem     int32
+	ISubItem  int32
+	UNewState uint32
+	UOldState uint32
+	UChanged  uint32
+	PtAction  POINT
+	LParam    uintptr
+	UKeyFlags uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774773.aspx
+type NMLISTVIEW struct {
+	Hdr       NMHDR
+	IItem     int32
+	ISubItem  int32
+	UNewState uint32
+	UOldState uint32
+	UChanged  uint32
+	PtAction  POINT
+	LParam    uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774780.aspx
+type NMLVDISPINFO struct {
+	Hdr  NMHDR
+	Item LVITEM
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb775507.aspx
+type INITCOMMONCONTROLSEX struct {
+	DwSize uint32
+	DwICC  uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb760256.aspx
+type TOOLINFO struct {
+	CbSize     uint32
+	UFlags     uint32
+	Hwnd       HWND
+	UId        uintptr
+	Rect       RECT
+	Hinst      HINSTANCE
+	LpszText   *uint16
+	LParam     uintptr
+	LpReserved unsafe.Pointer
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms645604.aspx
+type TRACKMOUSEEVENT struct {
+	CbSize      uint32
+	DwFlags     uint32
+	HwndTrack   HWND
+	DwHoverTime uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms534067.aspx
+type GdiplusStartupInput struct {
+	GdiplusVersion           uint32
+	DebugEventCallback       uintptr
+	SuppressBackgroundThread BOOL
+	SuppressExternalCodecs   BOOL
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms534068.aspx
+type GdiplusStartupOutput struct {
+	NotificationHook   uintptr
+	NotificationUnhook uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162768.aspx
+type PAINTSTRUCT struct {
+	Hdc         HDC
+	FErase      BOOL
+	RcPaint     RECT
+	FRestore    BOOL
+	FIncUpdate  BOOL
+	RgbReserved [32]byte
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa363646.aspx
+type EVENTLOGRECORD struct {
+	Length              uint32
+	Reserved            uint32
+	RecordNumber        uint32
+	TimeGenerated       uint32
+	TimeWritten         uint32
+	EventID             uint32
+	EventType           uint16
+	NumStrings          uint16
+	EventCategory       uint16
+	ReservedFlags       uint16
+	ClosingRecordNumber uint32
+	StringOffset        uint32
+	UserSidLength       uint32
+	UserSidOffset       uint32
+	DataLength          uint32
+	DataOffset          uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms685996.aspx
+type SERVICE_STATUS struct {
+	DwServiceType             uint32
+	DwCurrentState            uint32
+	DwControlsAccepted        uint32
+	DwWin32ExitCode           uint32
+	DwServiceSpecificExitCode uint32
+	DwCheckPoint              uint32
+	DwWaitHint                uint32
+}
+type PROCESSENTRY32 struct {
+	DwSize              uint32
+	CntUsage            uint32
+	Th32ProcessID       uint32
+	Th32DefaultHeapID   uintptr
+	Th32ModuleID        uint32
+	CntThreads          uint32
+	Th32ParentProcessID uint32
+	PcPriClassBase      int32
+	DwFlags             uint32
+	SzExeFile           [MAX_PATH]uint16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms684225.aspx
+type MODULEENTRY32 struct {
+	Size         uint32
+	ModuleID     uint32
+	ProcessID    uint32
+	GlblcntUsage uint32
+	ProccntUsage uint32
+	ModBaseAddr  *uint8
+	ModBaseSize  uint32
+	HModule      HMODULE
+	SzModule     [MAX_MODULE_NAME32 + 1]uint16
+	SzExePath    [MAX_PATH]uint16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms724284.aspx
+type FILETIME struct {
+	DwLowDateTime  uint32
+	DwHighDateTime uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682119.aspx
+type COORD struct {
+	X, Y int16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms686311.aspx
+type SMALL_RECT struct {
+	Left, Top, Right, Bottom int16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682093.aspx
+type CONSOLE_SCREEN_BUFFER_INFO struct {
+	DwSize              COORD
+	DwCursorPosition    COORD
+	WAttributes         uint16
+	SrWindow            SMALL_RECT
+	DwMaximumWindowSize COORD
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773244.aspx
+type MARGINS struct {
+	CxLeftWidth, CxRightWidth, CyTopHeight, CyBottomHeight int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969500.aspx
+type DWM_BLURBEHIND struct {
+	DwFlags                uint32
+	fEnable                BOOL
+	hRgnBlur               HRGN
+	fTransitionOnMaximized BOOL
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969501.aspx
+type DWM_PRESENT_PARAMETERS struct {
+	cbSize             uint32
+	fQueue             BOOL
+	cRefreshStart      DWM_FRAME_COUNT
+	cBuffer            uint32
+	fUseSourceRate     BOOL
+	rateSource         UNSIGNED_RATIO
+	cRefreshesPerFrame uint32
+	eSampling          DWM_SOURCE_FRAME_SAMPLING
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969502.aspx
+type DWM_THUMBNAIL_PROPERTIES struct {
+	dwFlags               uint32
+	rcDestination         RECT
+	rcSource              RECT
+	opacity               byte
+	fVisible              BOOL
+	fSourceClientAreaOnly BOOL
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969503.aspx
+type DWM_TIMING_INFO struct {
+	cbSize                 uint32
+	rateRefresh            UNSIGNED_RATIO
+	qpcRefreshPeriod       QPC_TIME
+	rateCompose            UNSIGNED_RATIO
+	qpcVBlank              QPC_TIME
+	cRefresh               DWM_FRAME_COUNT
+	cDXRefresh             uint32
+	qpcCompose             QPC_TIME
+	cFrame                 DWM_FRAME_COUNT
+	cDXPresent             uint32
+	cRefreshFrame          DWM_FRAME_COUNT
+	cFrameSubmitted        DWM_FRAME_COUNT
+	cDXPresentSubmitted    uint32
+	cFrameConfirmed        DWM_FRAME_COUNT
+	cDXPresentConfirmed    uint32
+	cRefreshConfirmed      DWM_FRAME_COUNT
+	cDXRefreshConfirmed    uint32
+	cFramesLate            DWM_FRAME_COUNT
+	cFramesOutstanding     uint32
+	cFrameDisplayed        DWM_FRAME_COUNT
+	qpcFrameDisplayed      QPC_TIME
+	cRefreshFrameDisplayed DWM_FRAME_COUNT
+	cFrameComplete         DWM_FRAME_COUNT
+	qpcFrameComplete       QPC_TIME
+	cFramePending          DWM_FRAME_COUNT
+	qpcFramePending        QPC_TIME
+	cFramesDisplayed       DWM_FRAME_COUNT
+	cFramesComplete        DWM_FRAME_COUNT
+	cFramesPending         DWM_FRAME_COUNT
+	cFramesAvailable       DWM_FRAME_COUNT
+	cFramesDropped         DWM_FRAME_COUNT
+	cFramesMissed          DWM_FRAME_COUNT
+	cRefreshNextDisplayed  DWM_FRAME_COUNT
+	cRefreshNextPresented  DWM_FRAME_COUNT
+	cRefreshesDisplayed    DWM_FRAME_COUNT
+	cRefreshesPresented    DWM_FRAME_COUNT
+	cRefreshStarted        DWM_FRAME_COUNT
+	cPixelsReceived        uint64
+	cPixelsDrawn           uint64
+	cBuffersEmpty          DWM_FRAME_COUNT
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd389402.aspx
+type MilMatrix3x2D struct {
+	S_11, S_12, S_21, S_22 float64
+	DX, DY                 float64
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969505.aspx
+type UNSIGNED_RATIO struct {
+	uiNumerator   uint32
+	uiDenominator uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms632603.aspx
+type CREATESTRUCT struct {
+	CreateParams uintptr
+	Instance     HINSTANCE
+	Menu         HMENU
+	Parent       HWND
+	Cy, Cx       int32
+	Y, X         int32
+	Style        int32
+	Name         *uint16
+	Class        *uint16
+	dwExStyle    uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145065.aspx
+type MONITORINFO struct {
+	CbSize    uint32
+	RcMonitor RECT
+	RcWork    RECT
+	DwFlags   uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145066.aspx
+type MONITORINFOEX struct {
+	MONITORINFO
+	SzDevice [CCHDEVICENAME]uint16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd368826.aspx
+type PIXELFORMATDESCRIPTOR struct {
+	Size                   uint16
+	Version                uint16
+	DwFlags                uint32
+	IPixelType             byte
+	ColorBits              byte
+	RedBits, RedShift      byte
+	GreenBits, GreenShift  byte
+	BlueBits, BlueShift    byte
+	AlphaBits, AlphaShift  byte
+	AccumBits              byte
+	AccumRedBits           byte
+	AccumGreenBits         byte
+	AccumBlueBits          byte
+	AccumAlphaBits         byte
+	DepthBits, StencilBits byte
+	AuxBuffers             byte
+	ILayerType             byte
+	Reserved               byte
+	DwLayerMask            uint32
+	DwVisibleMask          uint32
+	DwDamageMask           uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646270(v=vs.85).aspx
+type INPUT struct {
+	Type uint32
+	Mi   MOUSEINPUT
+	Ki   KEYBDINPUT
+	Hi   HARDWAREINPUT
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646273(v=vs.85).aspx
+type MOUSEINPUT struct {
+	Dx          int32
+	Dy          int32
+	MouseData   uint32
+	DwFlags     uint32
+	Time        uint32
+	DwExtraInfo uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646271(v=vs.85).aspx
+type KEYBDINPUT struct {
+	WVk         uint16
+	WScan       uint16
+	DwFlags     uint32
+	Time        uint32
+	DwExtraInfo uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646269(v=vs.85).aspx
+type HARDWAREINPUT struct {
+	UMsg    uint32
+	WParamL uint16
+	WParamH uint16
+}
+
+type KbdInput struct {
+	typ uint32
+	ki  KEYBDINPUT
+}
+
+type MouseInput struct {
+	typ uint32
+	mi  MOUSEINPUT
+}
+
+type HardwareInput struct {
+	typ uint32
+	hi  HARDWAREINPUT
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/user32.go b/Godeps/_workspace/src/github.com/shirou/w32/user32.go
new file mode 100644
index 0000000000..44b87726d1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/user32.go
@@ -0,0 +1,948 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	moduser32 = syscall.NewLazyDLL("user32.dll")
+
+	procRegisterClassEx               = moduser32.NewProc("RegisterClassExW")
+	procLoadIcon                      = moduser32.NewProc("LoadIconW")
+	procLoadCursor                    = moduser32.NewProc("LoadCursorW")
+	procShowWindow                    = moduser32.NewProc("ShowWindow")
+	procUpdateWindow                  = moduser32.NewProc("UpdateWindow")
+	procCreateWindowEx                = moduser32.NewProc("CreateWindowExW")
+	procAdjustWindowRect              = moduser32.NewProc("AdjustWindowRect")
+	procAdjustWindowRectEx            = moduser32.NewProc("AdjustWindowRectEx")
+	procDestroyWindow                 = moduser32.NewProc("DestroyWindow")
+	procDefWindowProc                 = moduser32.NewProc("DefWindowProcW")
+	procDefDlgProc                    = moduser32.NewProc("DefDlgProcW")
+	procPostQuitMessage               = moduser32.NewProc("PostQuitMessage")
+	procGetMessage                    = moduser32.NewProc("GetMessageW")
+	procTranslateMessage              = moduser32.NewProc("TranslateMessage")
+	procDispatchMessage               = moduser32.NewProc("DispatchMessageW")
+	procSendMessage                   = moduser32.NewProc("SendMessageW")
+	procPostMessage                   = moduser32.NewProc("PostMessageW")
+	procWaitMessage                   = moduser32.NewProc("WaitMessage")
+	procSetWindowText                 = moduser32.NewProc("SetWindowTextW")
+	procGetWindowTextLength           = moduser32.NewProc("GetWindowTextLengthW")
+	procGetWindowText                 = moduser32.NewProc("GetWindowTextW")
+	procGetWindowRect                 = moduser32.NewProc("GetWindowRect")
+	procMoveWindow                    = moduser32.NewProc("MoveWindow")
+	procScreenToClient                = moduser32.NewProc("ScreenToClient")
+	procCallWindowProc                = moduser32.NewProc("CallWindowProcW")
+	procSetWindowLong                 = moduser32.NewProc("SetWindowLongW")
+	procSetWindowLongPtr              = moduser32.NewProc("SetWindowLongW")
+	procGetWindowLong                 = moduser32.NewProc("GetWindowLongW")
+	procGetWindowLongPtr              = moduser32.NewProc("GetWindowLongW")
+	procEnableWindow                  = moduser32.NewProc("EnableWindow")
+	procIsWindowEnabled               = moduser32.NewProc("IsWindowEnabled")
+	procIsWindowVisible               = moduser32.NewProc("IsWindowVisible")
+	procSetFocus                      = moduser32.NewProc("SetFocus")
+	procInvalidateRect                = moduser32.NewProc("InvalidateRect")
+	procGetClientRect                 = moduser32.NewProc("GetClientRect")
+	procGetDC                         = moduser32.NewProc("GetDC")
+	procReleaseDC                     = moduser32.NewProc("ReleaseDC")
+	procSetCapture                    = moduser32.NewProc("SetCapture")
+	procReleaseCapture                = moduser32.NewProc("ReleaseCapture")
+	procGetWindowThreadProcessId      = moduser32.NewProc("GetWindowThreadProcessId")
+	procMessageBox                    = moduser32.NewProc("MessageBoxW")
+	procGetSystemMetrics              = moduser32.NewProc("GetSystemMetrics")
+	procCopyRect                      = moduser32.NewProc("CopyRect")
+	procEqualRect                     = moduser32.NewProc("EqualRect")
+	procInflateRect                   = moduser32.NewProc("InflateRect")
+	procIntersectRect                 = moduser32.NewProc("IntersectRect")
+	procIsRectEmpty                   = moduser32.NewProc("IsRectEmpty")
+	procOffsetRect                    = moduser32.NewProc("OffsetRect")
+	procPtInRect                      = moduser32.NewProc("PtInRect")
+	procSetRect                       = moduser32.NewProc("SetRect")
+	procSetRectEmpty                  = moduser32.NewProc("SetRectEmpty")
+	procSubtractRect                  = moduser32.NewProc("SubtractRect")
+	procUnionRect                     = moduser32.NewProc("UnionRect")
+	procCreateDialogParam             = moduser32.NewProc("CreateDialogParamW")
+	procDialogBoxParam                = moduser32.NewProc("DialogBoxParamW")
+	procGetDlgItem                    = moduser32.NewProc("GetDlgItem")
+	procDrawIcon                      = moduser32.NewProc("DrawIcon")
+	procClientToScreen                = moduser32.NewProc("ClientToScreen")
+	procIsDialogMessage               = moduser32.NewProc("IsDialogMessageW")
+	procIsWindow                      = moduser32.NewProc("IsWindow")
+	procEndDialog                     = moduser32.NewProc("EndDialog")
+	procPeekMessage                   = moduser32.NewProc("PeekMessageW")
+	procTranslateAccelerator          = moduser32.NewProc("TranslateAcceleratorW")
+	procSetWindowPos                  = moduser32.NewProc("SetWindowPos")
+	procFillRect                      = moduser32.NewProc("FillRect")
+	procDrawText                      = moduser32.NewProc("DrawTextW")
+	procAddClipboardFormatListener    = moduser32.NewProc("AddClipboardFormatListener")
+	procRemoveClipboardFormatListener = moduser32.NewProc("RemoveClipboardFormatListener")
+	procOpenClipboard                 = moduser32.NewProc("OpenClipboard")
+	procCloseClipboard                = moduser32.NewProc("CloseClipboard")
+	procEnumClipboardFormats          = moduser32.NewProc("EnumClipboardFormats")
+	procGetClipboardData              = moduser32.NewProc("GetClipboardData")
+	procSetClipboardData              = moduser32.NewProc("SetClipboardData")
+	procEmptyClipboard                = moduser32.NewProc("EmptyClipboard")
+	procGetClipboardFormatName        = moduser32.NewProc("GetClipboardFormatNameW")
+	procIsClipboardFormatAvailable    = moduser32.NewProc("IsClipboardFormatAvailable")
+	procBeginPaint                    = moduser32.NewProc("BeginPaint")
+	procEndPaint                      = moduser32.NewProc("EndPaint")
+	procGetKeyboardState              = moduser32.NewProc("GetKeyboardState")
+	procMapVirtualKey                 = moduser32.NewProc("MapVirtualKeyExW")
+	procGetAsyncKeyState              = moduser32.NewProc("GetAsyncKeyState")
+	procToAscii                       = moduser32.NewProc("ToAscii")
+	procSwapMouseButton               = moduser32.NewProc("SwapMouseButton")
+	procGetCursorPos                  = moduser32.NewProc("GetCursorPos")
+	procSetCursorPos                  = moduser32.NewProc("SetCursorPos")
+	procSetCursor                     = moduser32.NewProc("SetCursor")
+	procCreateIcon                    = moduser32.NewProc("CreateIcon")
+	procDestroyIcon                   = moduser32.NewProc("DestroyIcon")
+	procMonitorFromPoint              = moduser32.NewProc("MonitorFromPoint")
+	procMonitorFromRect               = moduser32.NewProc("MonitorFromRect")
+	procMonitorFromWindow             = moduser32.NewProc("MonitorFromWindow")
+	procGetMonitorInfo                = moduser32.NewProc("GetMonitorInfoW")
+	procEnumDisplayMonitors           = moduser32.NewProc("EnumDisplayMonitors")
+	procEnumDisplaySettingsEx         = moduser32.NewProc("EnumDisplaySettingsExW")
+	procChangeDisplaySettingsEx       = moduser32.NewProc("ChangeDisplaySettingsExW")
+	procSendInput                     = moduser32.NewProc("SendInput")
+)
+
+func RegisterClassEx(wndClassEx *WNDCLASSEX) ATOM {
+	ret, _, _ := procRegisterClassEx.Call(uintptr(unsafe.Pointer(wndClassEx)))
+	return ATOM(ret)
+}
+
+func LoadIcon(instance HINSTANCE, iconName *uint16) HICON {
+	ret, _, _ := procLoadIcon.Call(
+		uintptr(instance),
+		uintptr(unsafe.Pointer(iconName)))
+
+	return HICON(ret)
+
+}
+
+func LoadCursor(instance HINSTANCE, cursorName *uint16) HCURSOR {
+	ret, _, _ := procLoadCursor.Call(
+		uintptr(instance),
+		uintptr(unsafe.Pointer(cursorName)))
+
+	return HCURSOR(ret)
+
+}
+
+func ShowWindow(hwnd HWND, cmdshow int) bool {
+	ret, _, _ := procShowWindow.Call(
+		uintptr(hwnd),
+		uintptr(cmdshow))
+
+	return ret != 0
+
+}
+
+func UpdateWindow(hwnd HWND) bool {
+	ret, _, _ := procUpdateWindow.Call(
+		uintptr(hwnd))
+	return ret != 0
+}
+
+func CreateWindowEx(exStyle uint, className, windowName *uint16,
+	style uint, x, y, width, height int, parent HWND, menu HMENU,
+	instance HINSTANCE, param unsafe.Pointer) HWND {
+	ret, _, _ := procCreateWindowEx.Call(
+		uintptr(exStyle),
+		uintptr(unsafe.Pointer(className)),
+		uintptr(unsafe.Pointer(windowName)),
+		uintptr(style),
+		uintptr(x),
+		uintptr(y),
+		uintptr(width),
+		uintptr(height),
+		uintptr(parent),
+		uintptr(menu),
+		uintptr(instance),
+		uintptr(param))
+
+	return HWND(ret)
+}
+
+func AdjustWindowRectEx(rect *RECT, style uint, menu bool, exStyle uint) bool {
+	ret, _, _ := procAdjustWindowRectEx.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(style),
+		uintptr(BoolToBOOL(menu)),
+		uintptr(exStyle))
+
+	return ret != 0
+}
+
+func AdjustWindowRect(rect *RECT, style uint, menu bool) bool {
+	ret, _, _ := procAdjustWindowRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(style),
+		uintptr(BoolToBOOL(menu)))
+
+	return ret != 0
+}
+
+func DestroyWindow(hwnd HWND) bool {
+	ret, _, _ := procDestroyWindow.Call(
+		uintptr(hwnd))
+
+	return ret != 0
+}
+
+func DefWindowProc(hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
+	ret, _, _ := procDefWindowProc.Call(
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret
+}
+
+func DefDlgProc(hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
+	ret, _, _ := procDefDlgProc.Call(
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret
+}
+
+func PostQuitMessage(exitCode int) {
+	procPostQuitMessage.Call(
+		uintptr(exitCode))
+}
+
+func GetMessage(msg *MSG, hwnd HWND, msgFilterMin, msgFilterMax uint32) int {
+	ret, _, _ := procGetMessage.Call(
+		uintptr(unsafe.Pointer(msg)),
+		uintptr(hwnd),
+		uintptr(msgFilterMin),
+		uintptr(msgFilterMax))
+
+	return int(ret)
+}
+
+func TranslateMessage(msg *MSG) bool {
+	ret, _, _ := procTranslateMessage.Call(
+		uintptr(unsafe.Pointer(msg)))
+
+	return ret != 0
+
+}
+
+func DispatchMessage(msg *MSG) uintptr {
+	ret, _, _ := procDispatchMessage.Call(
+		uintptr(unsafe.Pointer(msg)))
+
+	return ret
+
+}
+
+func SendMessage(hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
+	ret, _, _ := procSendMessage.Call(
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret
+}
+
+func PostMessage(hwnd HWND, msg uint32, wParam, lParam uintptr) bool {
+	ret, _, _ := procPostMessage.Call(
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret != 0
+}
+
+func WaitMessage() bool {
+	ret, _, _ := procWaitMessage.Call()
+	return ret != 0
+}
+
+func SetWindowText(hwnd HWND, text string) {
+	procSetWindowText.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(text))))
+}
+
+func GetWindowTextLength(hwnd HWND) int {
+	ret, _, _ := procGetWindowTextLength.Call(
+		uintptr(hwnd))
+
+	return int(ret)
+}
+
+func GetWindowText(hwnd HWND) string {
+	textLen := GetWindowTextLength(hwnd) + 1
+
+	buf := make([]uint16, textLen)
+	procGetWindowText.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(textLen))
+
+	return syscall.UTF16ToString(buf)
+}
+
+func GetWindowRect(hwnd HWND) *RECT {
+	var rect RECT
+	procGetWindowRect.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&rect)))
+
+	return &rect
+}
+
+func MoveWindow(hwnd HWND, x, y, width, height int, repaint bool) bool {
+	ret, _, _ := procMoveWindow.Call(
+		uintptr(hwnd),
+		uintptr(x),
+		uintptr(y),
+		uintptr(width),
+		uintptr(height),
+		uintptr(BoolToBOOL(repaint)))
+
+	return ret != 0
+
+}
+
+func ScreenToClient(hwnd HWND, x, y int) (X, Y int, ok bool) {
+	pt := POINT{X: int32(x), Y: int32(y)}
+	ret, _, _ := procScreenToClient.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&pt)))
+
+	return int(pt.X), int(pt.Y), ret != 0
+}
+
+func CallWindowProc(preWndProc uintptr, hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
+	ret, _, _ := procCallWindowProc.Call(
+		preWndProc,
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret
+}
+
+func SetWindowLong(hwnd HWND, index int, value uint32) uint32 {
+	ret, _, _ := procSetWindowLong.Call(
+		uintptr(hwnd),
+		uintptr(index),
+		uintptr(value))
+
+	return uint32(ret)
+}
+
+func SetWindowLongPtr(hwnd HWND, index int, value uintptr) uintptr {
+	ret, _, _ := procSetWindowLongPtr.Call(
+		uintptr(hwnd),
+		uintptr(index),
+		value)
+
+	return ret
+}
+
+func GetWindowLong(hwnd HWND, index int) int32 {
+	ret, _, _ := procGetWindowLong.Call(
+		uintptr(hwnd),
+		uintptr(index))
+
+	return int32(ret)
+}
+
+func GetWindowLongPtr(hwnd HWND, index int) uintptr {
+	ret, _, _ := procGetWindowLongPtr.Call(
+		uintptr(hwnd),
+		uintptr(index))
+
+	return ret
+}
+
+func EnableWindow(hwnd HWND, b bool) bool {
+	ret, _, _ := procEnableWindow.Call(
+		uintptr(hwnd),
+		uintptr(BoolToBOOL(b)))
+	return ret != 0
+}
+
+func IsWindowEnabled(hwnd HWND) bool {
+	ret, _, _ := procIsWindowEnabled.Call(
+		uintptr(hwnd))
+
+	return ret != 0
+}
+
+func IsWindowVisible(hwnd HWND) bool {
+	ret, _, _ := procIsWindowVisible.Call(
+		uintptr(hwnd))
+
+	return ret != 0
+}
+
+func SetFocus(hwnd HWND) HWND {
+	ret, _, _ := procSetFocus.Call(
+		uintptr(hwnd))
+
+	return HWND(ret)
+}
+
+func InvalidateRect(hwnd HWND, rect *RECT, erase bool) bool {
+	ret, _, _ := procInvalidateRect.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(BoolToBOOL(erase)))
+
+	return ret != 0
+}
+
+func GetClientRect(hwnd HWND) *RECT {
+	var rect RECT
+	ret, _, _ := procGetClientRect.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&rect)))
+
+	if ret == 0 {
+		panic(fmt.Sprintf("GetClientRect(%d) failed", hwnd))
+	}
+
+	return &rect
+}
+
+func GetDC(hwnd HWND) HDC {
+	ret, _, _ := procGetDC.Call(
+		uintptr(hwnd))
+
+	return HDC(ret)
+}
+
+func ReleaseDC(hwnd HWND, hDC HDC) bool {
+	ret, _, _ := procReleaseDC.Call(
+		uintptr(hwnd),
+		uintptr(hDC))
+
+	return ret != 0
+}
+
+func SetCapture(hwnd HWND) HWND {
+	ret, _, _ := procSetCapture.Call(
+		uintptr(hwnd))
+
+	return HWND(ret)
+}
+
+func ReleaseCapture() bool {
+	ret, _, _ := procReleaseCapture.Call()
+
+	return ret != 0
+}
+
+func GetWindowThreadProcessId(hwnd HWND) (HANDLE, int) {
+	var processId int
+	ret, _, _ := procGetWindowThreadProcessId.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&processId)))
+
+	return HANDLE(ret), processId
+}
+
+func MessageBox(hwnd HWND, title, caption string, flags uint) int {
+	ret, _, _ := procMessageBox.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(title))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(caption))),
+		uintptr(flags))
+
+	return int(ret)
+}
+
+func GetSystemMetrics(index int) int {
+	ret, _, _ := procGetSystemMetrics.Call(
+		uintptr(index))
+
+	return int(ret)
+}
+
+func CopyRect(dst, src *RECT) bool {
+	ret, _, _ := procCopyRect.Call(
+		uintptr(unsafe.Pointer(dst)),
+		uintptr(unsafe.Pointer(src)))
+
+	return ret != 0
+}
+
+func EqualRect(rect1, rect2 *RECT) bool {
+	ret, _, _ := procEqualRect.Call(
+		uintptr(unsafe.Pointer(rect1)),
+		uintptr(unsafe.Pointer(rect2)))
+
+	return ret != 0
+}
+
+func InflateRect(rect *RECT, dx, dy int) bool {
+	ret, _, _ := procInflateRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(dx),
+		uintptr(dy))
+
+	return ret != 0
+}
+
+func IntersectRect(dst, src1, src2 *RECT) bool {
+	ret, _, _ := procIntersectRect.Call(
+		uintptr(unsafe.Pointer(dst)),
+		uintptr(unsafe.Pointer(src1)),
+		uintptr(unsafe.Pointer(src2)))
+
+	return ret != 0
+}
+
+func IsRectEmpty(rect *RECT) bool {
+	ret, _, _ := procIsRectEmpty.Call(
+		uintptr(unsafe.Pointer(rect)))
+
+	return ret != 0
+}
+
+func OffsetRect(rect *RECT, dx, dy int) bool {
+	ret, _, _ := procOffsetRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(dx),
+		uintptr(dy))
+
+	return ret != 0
+}
+
+func PtInRect(rect *RECT, x, y int) bool {
+	pt := POINT{X: int32(x), Y: int32(y)}
+	ret, _, _ := procPtInRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(unsafe.Pointer(&pt)))
+
+	return ret != 0
+}
+
+func SetRect(rect *RECT, left, top, right, bottom int) bool {
+	ret, _, _ := procSetRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(left),
+		uintptr(top),
+		uintptr(right),
+		uintptr(bottom))
+
+	return ret != 0
+}
+
+func SetRectEmpty(rect *RECT) bool {
+	ret, _, _ := procSetRectEmpty.Call(
+		uintptr(unsafe.Pointer(rect)))
+
+	return ret != 0
+}
+
+func SubtractRect(dst, src1, src2 *RECT) bool {
+	ret, _, _ := procSubtractRect.Call(
+		uintptr(unsafe.Pointer(dst)),
+		uintptr(unsafe.Pointer(src1)),
+		uintptr(unsafe.Pointer(src2)))
+
+	return ret != 0
+}
+
+func UnionRect(dst, src1, src2 *RECT) bool {
+	ret, _, _ := procUnionRect.Call(
+		uintptr(unsafe.Pointer(dst)),
+		uintptr(unsafe.Pointer(src1)),
+		uintptr(unsafe.Pointer(src2)))
+
+	return ret != 0
+}
+
+func CreateDialog(hInstance HINSTANCE, lpTemplate *uint16, hWndParent HWND, lpDialogProc uintptr) HWND {
+	ret, _, _ := procCreateDialogParam.Call(
+		uintptr(hInstance),
+		uintptr(unsafe.Pointer(lpTemplate)),
+		uintptr(hWndParent),
+		lpDialogProc,
+		0)
+
+	return HWND(ret)
+}
+
+func DialogBox(hInstance HINSTANCE, lpTemplateName *uint16, hWndParent HWND, lpDialogProc uintptr) int {
+	ret, _, _ := procDialogBoxParam.Call(
+		uintptr(hInstance),
+		uintptr(unsafe.Pointer(lpTemplateName)),
+		uintptr(hWndParent),
+		lpDialogProc,
+		0)
+
+	return int(ret)
+}
+
+func GetDlgItem(hDlg HWND, nIDDlgItem int) HWND {
+	ret, _, _ := procGetDlgItem.Call(
+		uintptr(unsafe.Pointer(hDlg)),
+		uintptr(nIDDlgItem))
+
+	return HWND(ret)
+}
+
+func DrawIcon(hDC HDC, x, y int, hIcon HICON) bool {
+	ret, _, _ := procDrawIcon.Call(
+		uintptr(unsafe.Pointer(hDC)),
+		uintptr(x),
+		uintptr(y),
+		uintptr(unsafe.Pointer(hIcon)))
+
+	return ret != 0
+}
+
+func ClientToScreen(hwnd HWND, x, y int) (int, int) {
+	pt := POINT{X: int32(x), Y: int32(y)}
+
+	procClientToScreen.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&pt)))
+
+	return int(pt.X), int(pt.Y)
+}
+
+func IsDialogMessage(hwnd HWND, msg *MSG) bool {
+	ret, _, _ := procIsDialogMessage.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(msg)))
+
+	return ret != 0
+}
+
+func IsWindow(hwnd HWND) bool {
+	ret, _, _ := procIsWindow.Call(
+		uintptr(hwnd))
+
+	return ret != 0
+}
+
+func EndDialog(hwnd HWND, nResult uintptr) bool {
+	ret, _, _ := procEndDialog.Call(
+		uintptr(hwnd),
+		nResult)
+
+	return ret != 0
+}
+
+func PeekMessage(lpMsg *MSG, hwnd HWND, wMsgFilterMin, wMsgFilterMax, wRemoveMsg uint32) bool {
+	ret, _, _ := procPeekMessage.Call(
+		uintptr(unsafe.Pointer(lpMsg)),
+		uintptr(hwnd),
+		uintptr(wMsgFilterMin),
+		uintptr(wMsgFilterMax),
+		uintptr(wRemoveMsg))
+
+	return ret != 0
+}
+
+func TranslateAccelerator(hwnd HWND, hAccTable HACCEL, lpMsg *MSG) bool {
+	ret, _, _ := procTranslateMessage.Call(
+		uintptr(hwnd),
+		uintptr(hAccTable),
+		uintptr(unsafe.Pointer(lpMsg)))
+
+	return ret != 0
+}
+
+func SetWindowPos(hwnd, hWndInsertAfter HWND, x, y, cx, cy int, uFlags uint) bool {
+	ret, _, _ := procSetWindowPos.Call(
+		uintptr(hwnd),
+		uintptr(hWndInsertAfter),
+		uintptr(x),
+		uintptr(y),
+		uintptr(cx),
+		uintptr(cy),
+		uintptr(uFlags))
+
+	return ret != 0
+}
+
+func FillRect(hDC HDC, lprc *RECT, hbr HBRUSH) bool {
+	ret, _, _ := procFillRect.Call(
+		uintptr(hDC),
+		uintptr(unsafe.Pointer(lprc)),
+		uintptr(hbr))
+
+	return ret != 0
+}
+
+func DrawText(hDC HDC, text string, uCount int, lpRect *RECT, uFormat uint) int {
+	ret, _, _ := procDrawText.Call(
+		uintptr(hDC),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(text))),
+		uintptr(uCount),
+		uintptr(unsafe.Pointer(lpRect)),
+		uintptr(uFormat))
+
+	return int(ret)
+}
+
+func AddClipboardFormatListener(hwnd HWND) bool {
+	ret, _, _ := procAddClipboardFormatListener.Call(
+		uintptr(hwnd))
+	return ret != 0
+}
+
+func RemoveClipboardFormatListener(hwnd HWND) bool {
+	ret, _, _ := procRemoveClipboardFormatListener.Call(
+		uintptr(hwnd))
+	return ret != 0
+}
+
+func OpenClipboard(hWndNewOwner HWND) bool {
+	ret, _, _ := procOpenClipboard.Call(
+		uintptr(hWndNewOwner))
+	return ret != 0
+}
+
+func CloseClipboard() bool {
+	ret, _, _ := procCloseClipboard.Call()
+	return ret != 0
+}
+
+func EnumClipboardFormats(format uint) uint {
+	ret, _, _ := procEnumClipboardFormats.Call(
+		uintptr(format))
+	return uint(ret)
+}
+
+func GetClipboardData(uFormat uint) HANDLE {
+	ret, _, _ := procGetClipboardData.Call(
+		uintptr(uFormat))
+	return HANDLE(ret)
+}
+
+func SetClipboardData(uFormat uint, hMem HANDLE) HANDLE {
+	ret, _, _ := procSetClipboardData.Call(
+		uintptr(uFormat),
+		uintptr(hMem))
+	return HANDLE(ret)
+}
+
+func EmptyClipboard() bool {
+	ret, _, _ := procEmptyClipboard.Call()
+	return ret != 0
+}
+
+func GetClipboardFormatName(format uint) (string, bool) {
+	cchMaxCount := 255
+	buf := make([]uint16, cchMaxCount)
+	ret, _, _ := procGetClipboardFormatName.Call(
+		uintptr(format),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(cchMaxCount))
+
+	if ret > 0 {
+		return syscall.UTF16ToString(buf), true
+	}
+
+	return "Requested format does not exist or is predefined", false
+}
+
+func IsClipboardFormatAvailable(format uint) bool {
+	ret, _, _ := procIsClipboardFormatAvailable.Call(uintptr(format))
+	return ret != 0
+}
+
+func BeginPaint(hwnd HWND, paint *PAINTSTRUCT) HDC {
+	ret, _, _ := procBeginPaint.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(paint)))
+	return HDC(ret)
+}
+
+func EndPaint(hwnd HWND, paint *PAINTSTRUCT) {
+	procBeginPaint.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(paint)))
+}
+
+func GetKeyboardState(lpKeyState *[]byte) bool {
+	ret, _, _ := procGetKeyboardState.Call(
+		uintptr(unsafe.Pointer(&(*lpKeyState)[0])))
+	return ret != 0
+}
+
+func MapVirtualKeyEx(uCode, uMapType uint, dwhkl HKL) uint {
+	ret, _, _ := procMapVirtualKey.Call(
+		uintptr(uCode),
+		uintptr(uMapType),
+		uintptr(dwhkl))
+	return uint(ret)
+}
+
+func GetAsyncKeyState(vKey int) uint16 {
+	ret, _, _ := procGetAsyncKeyState.Call(uintptr(vKey))
+	return uint16(ret)
+}
+
+func ToAscii(uVirtKey, uScanCode uint, lpKeyState *byte, lpChar *uint16, uFlags uint) int {
+	ret, _, _ := procToAscii.Call(
+		uintptr(uVirtKey),
+		uintptr(uScanCode),
+		uintptr(unsafe.Pointer(lpKeyState)),
+		uintptr(unsafe.Pointer(lpChar)),
+		uintptr(uFlags))
+	return int(ret)
+}
+
+func SwapMouseButton(fSwap bool) bool {
+	ret, _, _ := procSwapMouseButton.Call(
+		uintptr(BoolToBOOL(fSwap)))
+	return ret != 0
+}
+
+func GetCursorPos() (x, y int, ok bool) {
+	pt := POINT{}
+	ret, _, _ := procGetCursorPos.Call(uintptr(unsafe.Pointer(&pt)))
+	return int(pt.X), int(pt.Y), ret != 0
+}
+
+func SetCursorPos(x, y int) bool {
+	ret, _, _ := procSetCursorPos.Call(
+		uintptr(x),
+		uintptr(y),
+	)
+	return ret != 0
+}
+
+func SetCursor(cursor HCURSOR) HCURSOR {
+	ret, _, _ := procSetCursor.Call(
+		uintptr(cursor),
+	)
+	return HCURSOR(ret)
+}
+
+func CreateIcon(instance HINSTANCE, nWidth, nHeight int, cPlanes, cBitsPerPixel byte, ANDbits, XORbits *byte) HICON {
+	ret, _, _ := procCreateIcon.Call(
+		uintptr(instance),
+		uintptr(nWidth),
+		uintptr(nHeight),
+		uintptr(cPlanes),
+		uintptr(cBitsPerPixel),
+		uintptr(unsafe.Pointer(ANDbits)),
+		uintptr(unsafe.Pointer(XORbits)),
+	)
+	return HICON(ret)
+}
+
+func DestroyIcon(icon HICON) bool {
+	ret, _, _ := procDestroyIcon.Call(
+		uintptr(icon),
+	)
+	return ret != 0
+}
+
+func MonitorFromPoint(x, y int, dwFlags uint32) HMONITOR {
+	ret, _, _ := procMonitorFromPoint.Call(
+		uintptr(x),
+		uintptr(y),
+		uintptr(dwFlags),
+	)
+	return HMONITOR(ret)
+}
+
+func MonitorFromRect(rc *RECT, dwFlags uint32) HMONITOR {
+	ret, _, _ := procMonitorFromRect.Call(
+		uintptr(unsafe.Pointer(rc)),
+		uintptr(dwFlags),
+	)
+	return HMONITOR(ret)
+}
+
+func MonitorFromWindow(hwnd HWND, dwFlags uint32) HMONITOR {
+	ret, _, _ := procMonitorFromWindow.Call(
+		uintptr(hwnd),
+		uintptr(dwFlags),
+	)
+	return HMONITOR(ret)
+}
+
+func GetMonitorInfo(hMonitor HMONITOR, lmpi *MONITORINFO) bool {
+	ret, _, _ := procGetMonitorInfo.Call(
+		uintptr(hMonitor),
+		uintptr(unsafe.Pointer(lmpi)),
+	)
+	return ret != 0
+}
+
+func EnumDisplayMonitors(hdc HDC, clip *RECT, fnEnum, dwData uintptr) bool {
+	ret, _, _ := procEnumDisplayMonitors.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(clip)),
+		fnEnum,
+		dwData,
+	)
+	return ret != 0
+}
+
+func EnumDisplaySettingsEx(szDeviceName *uint16, iModeNum uint32, devMode *DEVMODE, dwFlags uint32) bool {
+	ret, _, _ := procEnumDisplaySettingsEx.Call(
+		uintptr(unsafe.Pointer(szDeviceName)),
+		uintptr(iModeNum),
+		uintptr(unsafe.Pointer(devMode)),
+		uintptr(dwFlags),
+	)
+	return ret != 0
+}
+
+func ChangeDisplaySettingsEx(szDeviceName *uint16, devMode *DEVMODE, hwnd HWND, dwFlags uint32, lParam uintptr) int32 {
+	ret, _, _ := procChangeDisplaySettingsEx.Call(
+		uintptr(unsafe.Pointer(szDeviceName)),
+		uintptr(unsafe.Pointer(devMode)),
+		uintptr(hwnd),
+		uintptr(dwFlags),
+		lParam,
+	)
+	return int32(ret)
+}
+
+/* remove to build without cgo
+func SendInput(inputs []INPUT) uint32 {
+	var validInputs []C.INPUT
+
+	for _, oneInput := range inputs {
+		input := C.INPUT{_type: C.DWORD(oneInput.Type)}
+
+		switch oneInput.Type {
+		case INPUT_MOUSE:
+			(*MouseInput)(unsafe.Pointer(&input)).mi = oneInput.Mi
+		case INPUT_KEYBOARD:
+			(*KbdInput)(unsafe.Pointer(&input)).ki = oneInput.Ki
+		case INPUT_HARDWARE:
+			(*HardwareInput)(unsafe.Pointer(&input)).hi = oneInput.Hi
+		default:
+			panic("unkown type")
+		}
+
+		validInputs = append(validInputs, input)
+	}
+
+	ret, _, _ := procSendInput.Call(
+		uintptr(len(validInputs)),
+		uintptr(unsafe.Pointer(&validInputs[0])),
+		uintptr(unsafe.Sizeof(C.INPUT{})),
+	)
+	return uint32(ret)
+}
+*/
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/utils.go b/Godeps/_workspace/src/github.com/shirou/w32/utils.go
new file mode 100644
index 0000000000..4fb5b6c2c1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/utils.go
@@ -0,0 +1,201 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unicode/utf16"
+	"unsafe"
+)
+
+func MakeIntResource(id uint16) *uint16 {
+	return (*uint16)(unsafe.Pointer(uintptr(id)))
+}
+
+func LOWORD(dw uint32) uint16 {
+	return uint16(dw)
+}
+
+func HIWORD(dw uint32) uint16 {
+	return uint16(dw >> 16 & 0xffff)
+}
+
+func BoolToBOOL(value bool) BOOL {
+	if value {
+		return 1
+	}
+
+	return 0
+}
+
+func UTF16PtrToString(cstr *uint16) string {
+	if cstr != nil {
+		us := make([]uint16, 0, 256)
+		for p := uintptr(unsafe.Pointer(cstr)); ; p += 2 {
+			u := *(*uint16)(unsafe.Pointer(p))
+			if u == 0 {
+				return string(utf16.Decode(us))
+			}
+			us = append(us, u)
+		}
+	}
+
+	return ""
+}
+
+func ComAddRef(unknown *IUnknown) int32 {
+	ret, _, _ := syscall.Syscall(unknown.lpVtbl.pAddRef, 1,
+		uintptr(unsafe.Pointer(unknown)),
+		0,
+		0)
+	return int32(ret)
+}
+
+func ComRelease(unknown *IUnknown) int32 {
+	ret, _, _ := syscall.Syscall(unknown.lpVtbl.pRelease, 1,
+		uintptr(unsafe.Pointer(unknown)),
+		0,
+		0)
+	return int32(ret)
+}
+
+func ComQueryInterface(unknown *IUnknown, id *GUID) *IDispatch {
+	var disp *IDispatch
+	hr, _, _ := syscall.Syscall(unknown.lpVtbl.pQueryInterface, 3,
+		uintptr(unsafe.Pointer(unknown)),
+		uintptr(unsafe.Pointer(id)),
+		uintptr(unsafe.Pointer(&disp)))
+	if hr != 0 {
+		panic("Invoke QieryInterface error.")
+	}
+	return disp
+}
+
+func ComGetIDsOfName(disp *IDispatch, names []string) []int32 {
+	wnames := make([]*uint16, len(names))
+	dispid := make([]int32, len(names))
+	for i := 0; i < len(names); i++ {
+		wnames[i] = syscall.StringToUTF16Ptr(names[i])
+	}
+	hr, _, _ := syscall.Syscall6(disp.lpVtbl.pGetIDsOfNames, 6,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(unsafe.Pointer(IID_NULL)),
+		uintptr(unsafe.Pointer(&wnames[0])),
+		uintptr(len(names)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(unsafe.Pointer(&dispid[0])))
+	if hr != 0 {
+		panic("Invoke GetIDsOfName error.")
+	}
+	return dispid
+}
+
+func ComInvoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{}) (result *VARIANT) {
+	var dispparams DISPPARAMS
+
+	if dispatch&DISPATCH_PROPERTYPUT != 0 {
+		dispnames := [1]int32{DISPID_PROPERTYPUT}
+		dispparams.RgdispidNamedArgs = uintptr(unsafe.Pointer(&dispnames[0]))
+		dispparams.CNamedArgs = 1
+	}
+	var vargs []VARIANT
+	if len(params) > 0 {
+		vargs = make([]VARIANT, len(params))
+		for i, v := range params {
+			//n := len(params)-i-1
+			n := len(params) - i - 1
+			VariantInit(&vargs[n])
+			switch v.(type) {
+			case bool:
+				if v.(bool) {
+					vargs[n] = VARIANT{VT_BOOL, 0, 0, 0, 0xffff}
+				} else {
+					vargs[n] = VARIANT{VT_BOOL, 0, 0, 0, 0}
+				}
+			case *bool:
+				vargs[n] = VARIANT{VT_BOOL | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*bool))))}
+			case byte:
+				vargs[n] = VARIANT{VT_I1, 0, 0, 0, int64(v.(byte))}
+			case *byte:
+				vargs[n] = VARIANT{VT_I1 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*byte))))}
+			case int16:
+				vargs[n] = VARIANT{VT_I2, 0, 0, 0, int64(v.(int16))}
+			case *int16:
+				vargs[n] = VARIANT{VT_I2 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*int16))))}
+			case uint16:
+				vargs[n] = VARIANT{VT_UI2, 0, 0, 0, int64(v.(int16))}
+			case *uint16:
+				vargs[n] = VARIANT{VT_UI2 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*uint16))))}
+			case int, int32:
+				vargs[n] = VARIANT{VT_UI4, 0, 0, 0, int64(v.(int))}
+			case *int, *int32:
+				vargs[n] = VARIANT{VT_I4 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*int))))}
+			case uint, uint32:
+				vargs[n] = VARIANT{VT_UI4, 0, 0, 0, int64(v.(uint))}
+			case *uint, *uint32:
+				vargs[n] = VARIANT{VT_UI4 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*uint))))}
+			case int64:
+				vargs[n] = VARIANT{VT_I8, 0, 0, 0, v.(int64)}
+			case *int64:
+				vargs[n] = VARIANT{VT_I8 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*int64))))}
+			case uint64:
+				vargs[n] = VARIANT{VT_UI8, 0, 0, 0, int64(v.(uint64))}
+			case *uint64:
+				vargs[n] = VARIANT{VT_UI8 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*uint64))))}
+			case float32:
+				vargs[n] = VARIANT{VT_R4, 0, 0, 0, int64(v.(float32))}
+			case *float32:
+				vargs[n] = VARIANT{VT_R4 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*float32))))}
+			case float64:
+				vargs[n] = VARIANT{VT_R8, 0, 0, 0, int64(v.(float64))}
+			case *float64:
+				vargs[n] = VARIANT{VT_R8 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*float64))))}
+			case string:
+				vargs[n] = VARIANT{VT_BSTR, 0, 0, 0, int64(uintptr(unsafe.Pointer(SysAllocString(v.(string)))))}
+			case *string:
+				vargs[n] = VARIANT{VT_BSTR | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*string))))}
+			case *IDispatch:
+				vargs[n] = VARIANT{VT_DISPATCH, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*IDispatch))))}
+			case **IDispatch:
+				vargs[n] = VARIANT{VT_DISPATCH | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(**IDispatch))))}
+			case nil:
+				vargs[n] = VARIANT{VT_NULL, 0, 0, 0, 0}
+			case *VARIANT:
+				vargs[n] = VARIANT{VT_VARIANT | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*VARIANT))))}
+			default:
+				panic("unknown type")
+			}
+		}
+		dispparams.Rgvarg = uintptr(unsafe.Pointer(&vargs[0]))
+		dispparams.CArgs = uint32(len(params))
+	}
+
+	var ret VARIANT
+	var excepInfo EXCEPINFO
+	VariantInit(&ret)
+	hr, _, _ := syscall.Syscall9(disp.lpVtbl.pInvoke, 8,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(dispid),
+		uintptr(unsafe.Pointer(IID_NULL)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(dispatch),
+		uintptr(unsafe.Pointer(&dispparams)),
+		uintptr(unsafe.Pointer(&ret)),
+		uintptr(unsafe.Pointer(&excepInfo)),
+		0)
+	if hr != 0 {
+		if excepInfo.BstrDescription != nil {
+			bs := UTF16PtrToString(excepInfo.BstrDescription)
+			panic(bs)
+		}
+	}
+	for _, varg := range vargs {
+		if varg.VT == VT_BSTR && varg.Val != 0 {
+			SysFreeString(((*int16)(unsafe.Pointer(uintptr(varg.Val)))))
+		}
+	}
+	result = &ret
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/vars.go b/Godeps/_workspace/src/github.com/shirou/w32/vars.go
new file mode 100644
index 0000000000..2dab2e3963
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/w32/vars.go
@@ -0,0 +1,13 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+var (
+	IID_NULL                      = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
+	IID_IUnknown                  = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+	IID_IDispatch                 = &GUID{0x00020400, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+	IID_IConnectionPointContainer = &GUID{0xB196B284, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+	IID_IConnectionPoint          = &GUID{0xB196B286, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+)

From 48040419bea380a47d1e01be1b6eea84777bd903 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 21 Apr 2016 09:59:44 +0200
Subject: [PATCH 0144/1304] contributing: shorten github issue template

---
 .github/ISSUE_TEMPLATE.md | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 44ab977c7f..36cd699078 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,18 +1,8 @@
-**rkt**
+**Environment**
 
-output of `rkt version`
+Replace this with the output of:
 
-**Kernel**
-
-output of `uname -srm`
-
-**Distribution**
-
-content of `/etc/os-release`
-
-**systemd**
-
-output of `systemctl --version`
+`printf "$(rkt version)\n--\n$(uname -srm)\n--\n$(cat /etc/os-release)\n--\n$(systemctl --version)"`
 
 **What did you do?**
 

From 9d62321ce365d07810de4db3037c61c9a5bff866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 8 Apr 2016 14:48:49 +0200
Subject: [PATCH 0145/1304] rkt/image: render images on fetch

rkt was delaying rendering images to the tree store until they were
about to run for the first time which caused that first run to be slow
for big images.

This commit renders the image to the tree store at fetch time.

If the system doesn't support overlayfs, we don't render it because we
don't use the tree store when overlayfs is not used.

Startup time benchmark:

rkt run a Docker nginx image, pre-fetched. Size = 188MiB when unextracted
The insecure option `ondisk` was used.

command | time (rkt master) | time (rkt master + https://github.com/coreos/rkt/pull/2398)
--------|-------------------|---------------------------
1st time run | real 0m4.964s, user 0m3.570s, sys 0m0.813s | real 0m0.333s, user 0m0.097s, sys 0m0.050s
2nd time run | real 0m0.350s, user 0m0.063s, sys 0m0.077s | real 0m0.343s, user 0m0.073s, sys 0m0.070s
---
 rkt/image/fetcher.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index 5a9026a1c6..7583e56863 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -16,10 +16,12 @@ package image
 
 import (
 	"container/list"
+	"errors"
 	"fmt"
 	"net/url"
 	"runtime"
 
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
 	"github.com/coreos/rkt/stage0"
 	"github.com/coreos/rkt/store"
@@ -50,6 +52,11 @@ func (f *Fetcher) FetchImage(img string, ascPath string, imgType apps.AppImageTy
 			return "", err
 		}
 	}
+	if common.SupportsOverlay() {
+		if _, _, err := f.S.RenderTreeStore(hash, false); err != nil {
+			return "", errwrap.Wrap(errors.New("error rendering tree store"), err)
+		}
+	}
 	return hash, nil
 }
 

From 333b5ef7cc2aafa7ea6a7f7e391d42044c027374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 19 Apr 2016 14:34:25 +0200
Subject: [PATCH 0146/1304] functional tests: test render on fetch

---
 tests/rkt_image_dependencies_test.go | 107 +++++++++++++++++++++------
 1 file changed, 83 insertions(+), 24 deletions(-)

diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 2ac08805f7..11e1a2dcdb 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -18,9 +18,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/tests/testutils"
 	taas "github.com/coreos/rkt/tests/testutils/aci-server"
 )
@@ -62,20 +64,22 @@ const (
 `
 )
 
-// TestImageDependencies generates ACIs with a complex dependency tree and
-// fetches them via the discovery mechanism. Some dependencies are already
-// cached in the CAS, and some dependencies are fetched via the discovery
-// mechanism. This is to reproduce the scenario in explained in:
-// https://github.com/coreos/rkt/issues/1752#issue-117121841
-func TestImageDependencies(t *testing.T) {
-	tmpDir := createTempDirOrPanic("rkt-TestImageDeps-")
-	defer os.RemoveAll(tmpDir)
+var topImage string = "localhost/image-a"
 
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+type testImage struct {
+	shortName string
+	imageName string
+	deps      string
+	version   string
+	prefetch  bool
 
-	server := runServer(t, taas.GetDefaultServerSetup())
-	defer server.Close()
+	manifest string
+	fileName string
+}
+
+func generateComplexDependencyTree(t *testing.T, ctx *testutils.RktRunCtx) (map[string]string, []testImage) {
+	tmpDir := createTempDirOrPanic("rkt-TestImageDeps-")
+	defer os.RemoveAll(tmpDir)
 
 	baseImage := getInspectImagePath()
 	_ = importImageAndFetchHash(t, ctx, "", baseImage)
@@ -96,17 +100,7 @@ func TestImageDependencies(t *testing.T) {
 	// D->B
 	// D->E
 
-	topImage := "localhost/image-a"
-	imageList := []struct {
-		shortName string
-		imageName string
-		deps      string
-		version   string
-		prefetch  bool
-
-		manifest string
-		fileName string
-	}{
+	imageList := []testImage{
 		{
 			shortName: "a",
 			imageName: topImage,
@@ -161,10 +155,29 @@ func TestImageDependencies(t *testing.T) {
 
 		baseName := "image-" + img.shortName + ".aci"
 		img.fileName = patchACI(emptyImage, baseName, "--manifest", tmpManifest.Name())
-		defer os.Remove(img.fileName)
 		fileSet[baseName] = img.fileName
 	}
 
+	return fileSet, imageList
+}
+
+// TestImageDependencies generates ACIs with a complex dependency tree and
+// fetches them via the discovery mechanism. Some dependencies are already
+// cached in the CAS, and some dependencies are fetched via the discovery
+// mechanism. This is to reproduce the scenario in explained in:
+// https://github.com/coreos/rkt/issues/1752#issue-117121841
+func TestImageDependencies(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	server := runServer(t, taas.GetDefaultServerSetup())
+	defer server.Close()
+
+	fileSet, imageList := generateComplexDependencyTree(t, ctx)
+	for _, img := range imageList {
+		defer os.Remove(img.fileName)
+	}
+
 	if err := server.UpdateFileSet(fileSet); err != nil {
 		t.Fatalf("Failed to populate a file list in test aci server: %v", err)
 	}
@@ -198,3 +211,49 @@ func TestImageDependencies(t *testing.T) {
 
 	waitOrFail(t, child, 0)
 }
+
+func TestRenderOnFetch(t *testing.T) {
+	// If overlayfs is not supported, we don't render images on fetch
+	if !common.SupportsOverlay() {
+		t.Skip("Overlay fs not supported.")
+	}
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	server := runServer(t, taas.GetDefaultServerSetup())
+	defer server.Close()
+
+	fileSet, imageList := generateComplexDependencyTree(t, ctx)
+	for _, img := range imageList {
+		defer os.Remove(img.fileName)
+	}
+
+	if err := server.UpdateFileSet(fileSet); err != nil {
+		t.Fatalf("Failed to populate a file list in test aci server: %v", err)
+	}
+
+	for i := len(imageList) - 1; i >= 0; i-- {
+		img := imageList[i]
+		if img.prefetch {
+			t.Logf("Importing image %q: %q", img.imageName, img.fileName)
+			testImageShortHash := importImageAndFetchHash(t, ctx, "", img.fileName)
+			t.Logf("Imported image %q: %s", img.imageName, testImageShortHash)
+		}
+	}
+
+	fetchCmd := fmt.Sprintf("%s --debug --insecure-options=image,tls fetch %s", ctx.Cmd(), topImage)
+	child := spawnOrFail(t, fetchCmd)
+
+	treeStoreDir := filepath.Join(ctx.DataDir(), "cas", "tree")
+	trees, err := ioutil.ReadDir(treeStoreDir)
+	if err != nil {
+		panic(fmt.Sprintf("Cannot read tree store dir: %v", err))
+	}
+
+	// We expect 2 trees: stage1 and the image
+	if len(trees) != 2 {
+		t.Fatalf("Expected 2 trees but found %d", len(trees))
+	}
+
+	waitOrFail(t, child, 0)
+}

From 961568e948f705de1d6460763aeef2275b9aa9c0 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 21 Apr 2016 17:07:31 +0200
Subject: [PATCH 0147/1304] kvm: not experimental anymore

---
 Documentation/running-lkvm-stage1.md | 4 ++--
 configure.ac                         | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index 9111d887ee..d527421461 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -1,8 +1,8 @@
 # Running rkt with an LKVM stage1
 
-rkt has experimental support for executing pods with an [LKVM](https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+/master/README) [stage1](devel/architecture.md#stage-1). rkt employs this [alternative stage1](devel/stage1-implementors-guide.md) to run a pod within a virtual machine with its own operating system kernel and hypervisor isolation, rather than creating a container using Linux cgroups and namespaces.
+rkt has support for executing pods with an [LKVM](https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+/master/README) [stage1](devel/architecture.md#stage-1). rkt employs this [alternative stage1](devel/stage1-implementors-guide.md) to run a pod within a virtual machine with its own operating system kernel and hypervisor isolation, rather than creating a container using Linux cgroups and namespaces.
 
-The "experimental" label denotes that the LKVM stage1 does not yet implement all of the default stage1's features and semantics. While the same app container can be executed under isolation by either stage1, it may require different configuration, especially for networking. However, several deployments of the LKVM stage1 are operational outside of CoreOS, and we encourage testing of this feature and welcome your contributions.
+The LKVM stage1 does not yet implement all of the default stage1's features and semantics. While the same app container can be executed under isolation by either stage1, it may require different configuration, especially for networking. However, several deployments of the LKVM stage1 are operational outside of CoreOS, and we encourage testing of this feature and welcome your contributions.
 
 ## Getting started
 
diff --git a/configure.ac b/configure.ac
index 7b8fc4ef0d..d0e36073c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,8 +285,7 @@ RKT_ITERATE_FLAVORS([${RKT_STAGE1_FLAVORS}],[flavor],
                              [coreos],
                                      [RKT_COMMON_COREOS_PROGS],
                              [kvm],
-                                     [AC_MSG_WARN([* kvm is an experimental stage1 implementation, some features are missing])
-                                      AC_MSG_NOTICE([will build linux kernel and lkvm from source, make sure that all their build requirements are fulfilled])
+                                     [AC_MSG_NOTICE([will build linux kernel and lkvm from source, make sure that all their build requirements are fulfilled])
                                       RKT_COMMON_COREOS_PROGS
                                       RKT_REQ_PROG([PATCH],[patch],[patch])
                                       RKT_REQ_PROG([TAR],[tar],[tar])

From 27fa8b7d7dc26ef4c24221ebbe812aa5c974b540 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Tue, 19 Apr 2016 14:22:12 +0300
Subject: [PATCH 0148/1304] *: fix gofmt errors

Fixes gofmt errors throught the code.

Related to #2390
---
 common/apps/apps.go                  |  2 +-
 common/cgroup/cgroup.go              |  4 +--
 common/cgroup/cgroup_test.go         | 40 ++++++++++++++--------------
 common/common.go                     |  8 +++---
 networking/kvm.go                    |  2 +-
 networking/podenv.go                 |  2 +-
 pkg/keystore/keystoretest/keymap.go  | 12 ++++-----
 pkg/tar/tar_test.go                  | 20 +++++++-------
 rkt/cli_apps_test.go                 |  4 +--
 rkt/config/config_test.go            |  8 +++---
 rkt/config/stage1.go                 |  8 +++---
 rkt/image_list.go                    |  8 +++---
 rkt/pubkey/pubkey.go                 |  4 ++-
 rkt/stage1hash.go                    | 10 +++----
 stage0/arch.go                       |  2 +-
 store/store.go                       |  2 +-
 tests/rkt_api_service_test.go        |  6 ++---
 tests/rkt_image_dependencies_test.go |  2 +-
 tools/quickrm/main.go                |  6 ++---
 19 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/common/apps/apps.go b/common/apps/apps.go
index 5c9d687a9d..865c3aaf52 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -112,7 +112,7 @@ func (al *Apps) Validate() error {
 // Walk iterates on al.apps calling f for each app
 // walking stops if f returns an error, the error is simply returned
 func (al *Apps) Walk(f func(*App) error) error {
-	for i, _ := range al.apps {
+	for i := range al.apps {
 		// XXX(vc): note we supply f() with a pointer to the app instance in al.apps to enable modification by f()
 		if err := f(&al.apps[i]); err != nil {
 			return err
diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index 967485aedb..6866220c7c 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -41,8 +41,8 @@ var (
 		"memory": addMemoryLimit,
 	}
 	cgroupControllerRWFiles = map[string][]string{
-		"memory": []string{"memory.limit_in_bytes"},
-		"cpu":    []string{"cpu.cfs_quota_us"},
+		"memory": {"memory.limit_in_bytes"},
+		"cpu":    {"cpu.cfs_quota_us"},
 	}
 )
 
diff --git a/common/cgroup/cgroup_test.go b/common/cgroup/cgroup_test.go
index 55d8dd5908..92ec647532 100644
--- a/common/cgroup/cgroup_test.go
+++ b/common/cgroup/cgroup_test.go
@@ -65,36 +65,36 @@ net_prio	6	432	1`
 		{
 			input: strings.NewReader(cg1),
 			output: map[int][]string{
-				2: []string{"cpuset"},
-				3: []string{"cpu", "cpuacct"},
-				4: []string{"blkio"},
-				6: []string{"memory"},
-				7: []string{"devices"},
-				8: []string{"freezer"},
-				5: []string{"net_cls"},
+				2: {"cpuset"},
+				3: {"cpu", "cpuacct"},
+				4: {"blkio"},
+				6: {"memory"},
+				7: {"devices"},
+				8: {"freezer"},
+				5: {"net_cls"},
 			},
 		},
 		{
 			input: strings.NewReader(cg2),
 			output: map[int][]string{
-				8: []string{"cpuset"},
-				4: []string{"cpu", "cpuacct"},
-				2: []string{"blkio"},
-				3: []string{"devices"},
-				7: []string{"freezer"},
-				6: []string{"net_cls", "net_prio"},
-				5: []string{"perf_event"},
+				8: {"cpuset"},
+				4: {"cpu", "cpuacct"},
+				2: {"blkio"},
+				3: {"devices"},
+				7: {"freezer"},
+				6: {"net_cls", "net_prio"},
+				5: {"perf_event"},
 			},
 		},
 		{
 			input: strings.NewReader(cg3),
 			output: map[int][]string{
-				1: []string{"cpuset"},
-				4: []string{"cpu"},
-				2: []string{"blkio"},
-				3: []string{"devices"},
-				7: []string{"freezer"},
-				6: []string{"net_cls", "net_prio"},
+				1: {"cpuset"},
+				4: {"cpu"},
+				2: {"blkio"},
+				3: {"devices"},
+				7: {"freezer"},
+				6: {"net_cls", "net_prio"},
 			},
 		},
 	}
diff --git a/common/common.go b/common/common.go
index 2f05ba61b9..c557f0da7f 100644
--- a/common/common.go
+++ b/common/common.go
@@ -241,12 +241,12 @@ func (l *NetList) Strings() []string {
 	return list
 }
 
-func (l *NetList) StringsOnlyNames() []string {
-	var list []string
-	for k, _ := range l.mapping {
+func (l *NetList) StringsOnlyNames() (list []string) {
+	for k := range l.mapping {
 		list = append(list, k)
 	}
-	return list
+
+	return
 }
 
 // Check if host networking has been requested
diff --git a/networking/kvm.go b/networking/kvm.go
index f4a1117b74..aa302bd222 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -386,7 +386,7 @@ func kvmTransformFlannelNetwork(net *activeNet) error {
 		"type":   "host-local",
 		"subnet": fenv.sn.String(),
 		"routes": []cnitypes.Route{
-			cnitypes.Route{
+			{
 				Dst: *fenv.nw,
 			},
 		},
diff --git a/networking/podenv.go b/networking/podenv.go
index c6a31acd69..5fe95f4ed7 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -284,7 +284,7 @@ func missingNets(defined common.NetList, loaded []activeNet) []string {
 	}
 
 	var missing []string
-	for n, _ := range diff {
+	for n := range diff {
 		missing = append(missing, n)
 	}
 	return missing
diff --git a/pkg/keystore/keystoretest/keymap.go b/pkg/keystore/keystoretest/keymap.go
index 1fa0d0ff3e..03d3a2dddd 100644
--- a/pkg/keystore/keystoretest/keymap.go
+++ b/pkg/keystore/keystoretest/keymap.go
@@ -5,7 +5,7 @@
 package keystoretest
 
 var KeyMap = map[string]*KeyDetails{
-	"example.com": &KeyDetails{
+	"example.com": {
 		Fingerprint: `4d5b338b00c2935b90e50c16d71af6b1683451d2`,
 		ArmoredPublicKey: `-----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -93,7 +93,7 @@ VH9rpClNzRXrKWVqCk2JjaaXM0FEVJpZQeT74hfe+NVFKJQf
 =mdQJ
 -----END PGP PRIVATE KEY BLOCK-----`,
 	},
-	"coreos.com": &KeyDetails{
+	"coreos.com": {
 		Fingerprint: `78b3fd7a0089dd84abad6641cbf56f3df44ede02`,
 		ArmoredPublicKey: `-----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -181,7 +181,7 @@ nzYD7TV4jzDcRB4Zvnlqto+X76++XWM+fpVVWOZsIxkOv4TPbijQA5tXwZeiWj8U
 =Aa3W
 -----END PGP PRIVATE KEY BLOCK-----`,
 	},
-	"example.com/app": &KeyDetails{
+	"example.com/app": {
 		Fingerprint: `847157ec2524660482f8940beeafad1ea7040030`,
 		ArmoredPublicKey: `-----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -269,7 +269,7 @@ tvSbMuIwWPpUksGYZX38KHDEEkNuFUJ3/HLqf1n3zFQasWhxPPe4Ew==
 =iOdD
 -----END PGP PRIVATE KEY BLOCK-----`,
 	},
-	"acme.com": &KeyDetails{
+	"acme.com": {
 		Fingerprint: `0580ac91290ca2bcdebe122cfc5f8bda55abd47d`,
 		ArmoredPublicKey: `-----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -357,7 +357,7 @@ e+qZ6AxHGXjGKDYhVyWMVq0jAdRwgX9sLZMX0kTN
 =lHJX
 -----END PGP PRIVATE KEY BLOCK-----`,
 	},
-	"acme.com/services": &KeyDetails{
+	"acme.com/services": {
 		Fingerprint: `418d97e1f80fcc35c996249b2f13c45b30c346ea`,
 		ArmoredPublicKey: `-----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -445,7 +445,7 @@ coxZfgZRV90cDur+F6xLufAAsmabtSlHoejinL02/KF8NHU9prLv
 =lUpJ
 -----END PGP PRIVATE KEY BLOCK-----`,
 	},
-	"acme.com/services/web/nginx": &KeyDetails{
+	"acme.com/services/web/nginx": {
 		Fingerprint: `b555d08c15547bd283b9605578ca11a4fa553a28`,
 		ArmoredPublicKey: `-----BEGIN PGP PUBLIC KEY BLOCK-----
 
diff --git a/pkg/tar/tar_test.go b/pkg/tar/tar_test.go
index 541301564a..f24ea285de 100644
--- a/pkg/tar/tar_test.go
+++ b/pkg/tar/tar_test.go
@@ -603,16 +603,16 @@ func testExtractTarOverwrite(t *testing.T, extractTar func(io.Reader, string) er
 	err = extractTar(containerTar2, tmpdir)
 
 	expectedFiles := []*fileInfo{
-		&fileInfo{path: "hello.txt", typeflag: tar.TypeReg, size: 8, contents: "newhello"},
-		&fileInfo{path: "linktofile", typeflag: tar.TypeReg, size: 20},
-		&fileInfo{path: "linktodir", typeflag: tar.TypeReg, size: 20},
-		&fileInfo{path: "afolder", typeflag: tar.TypeReg, size: 8},
-		&fileInfo{path: "dirsymlinked", typeflag: tar.TypeDir},
-		&fileInfo{path: "afile", typeflag: tar.TypeDir},
-		&fileInfo{path: "filesymlinked", typeflag: tar.TypeReg, size: 5},
-		&fileInfo{path: "folder01", typeflag: tar.TypeDir},
-		&fileInfo{path: "folder01/file01", typeflag: tar.TypeReg, size: 5},
-		&fileInfo{path: "folder01/file02", typeflag: tar.TypeReg, size: 5},
+		{path: "hello.txt", typeflag: tar.TypeReg, size: 8, contents: "newhello"},
+		{path: "linktofile", typeflag: tar.TypeReg, size: 20},
+		{path: "linktodir", typeflag: tar.TypeReg, size: 20},
+		{path: "afolder", typeflag: tar.TypeReg, size: 8},
+		{path: "dirsymlinked", typeflag: tar.TypeDir},
+		{path: "afile", typeflag: tar.TypeDir},
+		{path: "filesymlinked", typeflag: tar.TypeReg, size: 5},
+		{path: "folder01", typeflag: tar.TypeDir},
+		{path: "folder01/file01", typeflag: tar.TypeReg, size: 5},
+		{path: "folder01/file02", typeflag: tar.TypeReg, size: 5},
 	}
 
 	err = checkExpectedFiles(tmpdir, fileInfoSliceToMap(expectedFiles))
diff --git a/rkt/cli_apps_test.go b/rkt/cli_apps_test.go
index 6df506b6ab..b82545077e 100644
--- a/rkt/cli_apps_test.go
+++ b/rkt/cli_apps_test.go
@@ -37,8 +37,8 @@ func TestParseAppArgs(t *testing.T) {
 			[]string{"example.com/foo", "example.com/bar", "example.com/baz"},
 			[][]string{
 				nil,
-				[]string{"--help"},
-				[]string{"--verbose"},
+				{"--help"},
+				{"--verbose"},
 			},
 			false,
 		},
diff --git a/rkt/config/config_test.go b/rkt/config/config_test.go
index 52ce69ba83..7476399075 100644
--- a/rkt/config/config_test.go
+++ b/rkt/config/config_test.go
@@ -110,7 +110,7 @@ func TestDockerAuthConfigFormat(t *testing.T) {
 		{`{"rktKind": "dockerAuth", "rktVersion": "v1", "registries": ["coreos.com"], "credentials": {"user": ""}}`, nil, true},
 		{`{"rktKind": "dockerAuth", "rktVersion": "v1", "registries": ["coreos.com"], "credentials": {"user": "bar"}}`, nil, true},
 		{`{"rktKind": "dockerAuth", "rktVersion": "v1", "registries": ["coreos.com"], "credentials": {"user": "bar", "password": ""}}`, nil, true},
-		{`{"rktKind": "dockerAuth", "rktVersion": "v1", "registries": ["coreos.com"], "credentials": {"user": "bar", "password": "baz"}}`, map[string]BasicCredentials{"coreos.com": BasicCredentials{User: "bar", Password: "baz"}}, false},
+		{`{"rktKind": "dockerAuth", "rktVersion": "v1", "registries": ["coreos.com"], "credentials": {"user": "bar", "password": "baz"}}`, map[string]BasicCredentials{"coreos.com": {User: "bar", Password: "baz"}}, false},
 	}
 	for _, tt := range tests {
 		cfg, err := getConfigFromContents(tt.contents, "dockerAuth")
@@ -275,15 +275,15 @@ func TestConfigLoading(t *testing.T) {
 		result[d] = h.Header()
 	}
 	expected := map[string]http.Header{
-		"endocode.com": http.Header{
+		"endocode.com": {
 			// local_user1:local_password1
 			authHeader: []string{"Basic bG9jYWxfdXNlcjE6bG9jYWxfcGFzc3dvcmQx"},
 		},
-		"coreos.com": http.Header{
+		"coreos.com": {
 			// system_user2:system_password2
 			authHeader: []string{"Basic c3lzdGVtX3VzZXIyOnN5c3RlbV9wYXNzd29yZDI="},
 		},
-		"tectonic.com": http.Header{
+		"tectonic.com": {
 			// local_user2:local_password2
 			authHeader: []string{"Basic bG9jYWxfdXNlcjI6bG9jYWxfcGFzc3dvcmQy"},
 		},
diff --git a/rkt/config/stage1.go b/rkt/config/stage1.go
index 79d206d627..ee6b32f6f2 100644
--- a/rkt/config/stage1.go
+++ b/rkt/config/stage1.go
@@ -33,10 +33,10 @@ type stage1V1 struct {
 
 var (
 	allowedSchemes = map[string]struct{}{
-		"file":   struct{}{},
-		"docker": struct{}{},
-		"http":   struct{}{},
-		"https":  struct{}{},
+		"file":   {},
+		"docker": {},
+		"http":   {},
+		"https":  {},
 	}
 )
 
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 7d3dd89d14..4cdefd9efd 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -71,10 +71,10 @@ var (
 	}
 
 	ImagesSortableFields = map[string]struct{}{
-		l(name):       struct{}{},
-		l(importTime): struct{}{},
-		l(lastUsed):   struct{}{},
-		l(size):       struct{}{},
+		l(name):       {},
+		l(importTime): {},
+		l(lastUsed):   {},
+		l(size):       {},
 	}
 )
 
diff --git a/rkt/pubkey/pubkey.go b/rkt/pubkey/pubkey.go
index 006954b44c..5d879c86e5 100644
--- a/rkt/pubkey/pubkey.go
+++ b/rkt/pubkey/pubkey.go
@@ -266,10 +266,12 @@ func displayKey(prefix, location string, key *os.File) error {
 		for _, sk := range k.Subkeys {
 			stdout.Printf("    Subkey fingerprint: %s", fingerToString(sk.PublicKey.Fingerprint))
 		}
-		for n, _ := range k.Identities {
+
+		for n := range k.Identities {
 			stdout.Printf("\t%s", n)
 		}
 	}
+
 	return nil
 }
 
diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index 4ad6374d26..56338133cd 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -110,35 +110,35 @@ var (
 	// this holds necessary data to generate the --stage1-* flags
 	// for each location kind
 	stage1FlagsData = map[stage1ImageLocationKind]*stage1FlagData{
-		stage1ImageLocationURL: &stage1FlagData{
+		stage1ImageLocationURL: {
 			kind: stage1ImageLocationURL,
 			flag: "stage1-url",
 			name: "stage1URL",
 			help: "a URL to an image to use as stage1",
 		},
 
-		stage1ImageLocationPath: &stage1FlagData{
+		stage1ImageLocationPath: {
 			kind: stage1ImageLocationPath,
 			flag: "stage1-path",
 			name: "stage1Path",
 			help: "an absolute or a relative path to an image to use as stage1",
 		},
 
-		stage1ImageLocationName: &stage1FlagData{
+		stage1ImageLocationName: {
 			kind: stage1ImageLocationName,
 			flag: "stage1-name",
 			name: "stage1Name",
 			help: "a name of an image to use as stage1",
 		},
 
-		stage1ImageLocationHash: &stage1FlagData{
+		stage1ImageLocationHash: {
 			kind: stage1ImageLocationHash,
 			flag: "stage1-hash",
 			name: "stage1Hash",
 			help: "a hash of an image to use as stage1",
 		},
 
-		stage1ImageLocationFromDir: &stage1FlagData{
+		stage1ImageLocationFromDir: {
 			kind: stage1ImageLocationFromDir,
 			flag: "stage1-from-dir",
 			name: "stage1FromDir",
diff --git a/stage0/arch.go b/stage0/arch.go
index 879c322a8d..441dacb742 100644
--- a/stage0/arch.go
+++ b/stage0/arch.go
@@ -15,5 +15,5 @@
 package stage0
 
 var ValidOSArch = map[string][]string{
-	"linux": []string{"amd64", "i386", "aarch64", "aarch64_be", "armv6l", "armv7l", "armv7b"},
+	"linux": {"amd64", "i386", "aarch64", "aarch64_be", "armv6l", "armv7l", "armv7b"},
 }
diff --git a/store/store.go b/store/store.go
index 8b7ded6450..ee226632a1 100644
--- a/store/store.go
+++ b/store/store.go
@@ -181,7 +181,7 @@ func (s *Store) populateSize() error {
 		}
 	}
 
-	for k, _ := range aciSizes {
+	for k := range aciSizes {
 		s.UpdateSize(k, aciSizes[k])
 		s.UpdateTreeStoreSize(k, tsSizes[k])
 	}
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index a527977046..0d0b9c94df 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -322,16 +322,16 @@ func TestAPIServiceListInspectPods(t *testing.T) {
 	}
 	pm := schema.BlankPodManifest()
 	pm.Apps = []schema.RuntimeApp{
-		schema.RuntimeApp{
+		{
 			Name: types.ACName("rkt-inspect"),
 			Image: schema.RuntimeImage{
 				Name: types.MustACIdentifier("coreos.com/rkt-inspect"),
 				ID:   *imgID,
 			},
-			Annotations: []types.Annotation{types.Annotation{Name: types.ACIdentifier("app-test"), Value: "app-test"}},
+			Annotations: []types.Annotation{{Name: types.ACIdentifier("app-test"), Value: "app-test"}},
 		},
 	}
-	pm.Annotations = []types.Annotation{types.Annotation{Name: types.ACIdentifier("test"), Value: "test"}}
+	pm.Annotations = []types.Annotation{{Name: types.ACIdentifier("test"), Value: "test"}}
 	manifestFile := generatePodManifestFile(t, pm)
 	defer os.Remove(manifestFile)
 
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 2ac08805f7..22a51c3416 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -140,7 +140,7 @@ func TestImageDependencies(t *testing.T) {
 		},
 	}
 
-	for i, _ := range imageList {
+	for i := range imageList {
 		// We need a reference rather than a new copy from "range"
 		// because we modify the content
 		img := &imageList[i]
diff --git a/tools/quickrm/main.go b/tools/quickrm/main.go
index aedcc12e21..c3dadb7586 100644
--- a/tools/quickrm/main.go
+++ b/tools/quickrm/main.go
@@ -100,15 +100,15 @@ func main() {
 
 func getItems() []items {
 	kinds := []*kindData{
-		&kindData{
+		{
 			option: "files",
 			proc:   &fileProcessor{},
 		},
-		&kindData{
+		{
 			option: "symlinks",
 			proc:   &symlinkProcessor{},
 		},
-		&kindData{
+		{
 			option: "dirs",
 			proc:   &dirProcessor{},
 		},

From 2a3c6dd549d0bc219bc09e7daa89a6d287acecce Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 22 Apr 2016 18:02:29 +0200
Subject: [PATCH 0149/1304] stage1: src: remove obsolete systemd configure
 flags

Symptoms:

configure: WARNING: unrecognized options: --disable-python-devel,
--disable-chkconfig, --disable-bootchart, --disable-gudev,
--disable-terminal
---
 stage1/usr_from_src/usr_from_src.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index 5dc3fdf608..748fe914a6 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -145,10 +145,8 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 	"$(abspath $(UFS_SYSTEMD_SRCDIR))/configure" \
 		$(call vl3,--quiet) \
 		--disable-dbus \
-		--disable-python-devel \
 		--disable-kmod \
 		--disable-blkid \
-		--disable-chkconfig \
 		--disable-selinux \
 		--disable-pam \
 		--disable-acl \
@@ -161,7 +159,6 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 		--disable-gnutls \
 		--disable-binfmt \
 		--disable-vconsole \
-		--disable-bootchart \
 		--disable-quotacheck \
 		--disable-tmpfiles \
 		--disable-sysusers \
@@ -179,12 +176,10 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 		--disable-networkd \
 		--disable-efi \
 		--disable-myhostname \
-		--disable-gudev \
 		--disable-manpages \
 		--disable-tests \
 		--disable-blkid \
 		--disable-hibernate \
-		--disable-terminal \
 		--disable-hwdb \
 		--disable-importd \
 		--disable-firstboot \

From 74f17ab91bee012e872e32a68188692fa97fb0cd Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Tue, 19 Apr 2016 11:45:49 +0300
Subject: [PATCH 0150/1304] stage1/init: improve documentation

Improves documentation and fixes a typo
---
 stage1/init/init.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index f2b43466ce..0488e31711 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -601,7 +601,6 @@ func stage1() int {
 		return 1
 	}
 
-	// mount host cgroups in the rkt mount namespace
 	if err := mountHostCgroups(enabledCgroups); err != nil {
 		log.FatalE("couldn't mount the host cgroups", err)
 		return 1
@@ -623,9 +622,9 @@ func stage1() int {
 		log.PrintE("continuing with per-app isolators disabled", err)
 	}
 
-	// kvm flavor has a bit different logic in handling pid vs ppid, for details look into #2389
-	// it does not require existance of "ppid", but instead registers current pid (which
-	// will be reused by lkvm binary) as an pod process pid used in entering
+	// KVM flavor has a bit different logic in handling pid vs ppid, for details look into #2389
+	// it doesn't require the existence of a "ppid", instead it registers the current pid (which
+	// will be reused by lkvm binary) as a pod process pid used during entering
 	pid_filename := "ppid"
 	if flavor == "kvm" {
 		pid_filename = "pid"
@@ -636,7 +635,6 @@ func stage1() int {
 		return 1
 	}
 
-	// prepare mounts for kvm flavor
 	if flavor == "kvm" {
 		if err := KvmPrepareMounts(s1Root, p); err != nil {
 			log.PrintE("could not prepare mounts", err)

From ed3afb63826a0229b0adc5b844e2252a6ecea996 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 25 Apr 2016 10:55:25 +0200
Subject: [PATCH 0151/1304] stage1/prepare-app: check for user namespace env

Currently prepare-app always bind mounts /sys non-recursively if the
non-unified cgroups hierarchy is present to prevent O(n2) behavior
caused by recursive mounting.

This optimization fails if a container is started in a user namespace
environment where the kernel prevents from mounting /sys
non-recursively.

This checks explicitely if we are in a user namespaced environment and
falls back to a recursive bind mount in this case.

Fixes #2490
---
 stage1/prepare-app/prepare-app.c | 85 +++++++++++++++++++++-----------
 1 file changed, 57 insertions(+), 28 deletions(-)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 2731ef54df..912c992394 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <dirent.h>
+#include <inttypes.h>
 
 #define err_out(_fmt, _args...)						\
 		fprintf(stderr, "Error: " _fmt "\n", ##_args);
@@ -52,6 +53,8 @@ static int exit_err;
 #define MACHINE_ID_LEN		lenof("0123456789abcdef0123456789ab")
 #define MACHINE_NAME_LEN	lenof("rkt-01234567-89ab-cdef-0123-456789ab")
 
+#define UNMAPPED ((uid_t) -1)
+
 #ifndef CGROUP2_SUPER_MAGIC
 #define CGROUP2_SUPER_MAGIC 0x63677270
 #endif
@@ -125,44 +128,78 @@ static int ensure_etc_hosts_exists(const char *root, int rootfd) {
 	return 0;
 }
 
+static void mount_at(const char *root, const mount_point *mnt)
+{
+	char to[4096];
+	exit_if(snprintf(to, sizeof(to), "%s/%s", root, mnt->target) >= sizeof(to),
+		"Path too long: \"%s\"", to);
+	pexit_if(mount(mnt->source, to, mnt->type,
+		       mnt->flags, mnt->options) == -1,
+		 "Mounting \"%s\" on \"%s\" failed", mnt->source, to);
+}
+
 static void mount_sys(const char *root)
 {
-	char from[4096];
+	int i;
 	char to[4096];
 	struct statfs fs;
 	DIR *dir = NULL;
 	struct dirent *d;
+	const mount_point mnt_rec = { "/sys", "sys", "bind", NULL, MS_BIND|MS_REC };
+	const mount_point sys_bind_table[] = {
+		{ "/sys", "sys", "bind", NULL, MS_BIND },
+		{ "/sys/fs/cgroup", "sys/fs/cgroup", "bind", NULL, MS_BIND },
+	};
 
 	pexit_if(statfs("/sys/fs/cgroup", &fs) != 0,
 	         "Cannot statfs /sys/fs/cgroup");
 	if (fs.f_type == (typeof(fs.f_type)) CGROUP2_SUPER_MAGIC) {
 		/* With the unified cgroup hierarchy, recursive bind mounts
 		 * are fine. */
-		exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
-			"Path too long: \"%s\"", to);
-		pexit_if(mount("/sys", to, "bind",
-			       MS_BIND | MS_REC, "NULL") == -1,
-				"Mounting \"%s\" on \"%s\" failed", "/sys", to);
+		mount_at(root, &mnt_rec);
 		return;
 	}
 
+	// For security reasons recent Linux kernels do not allow to bind-mount non-recursively
+	// if it would give read-write access to other subdirectories mounted as read-only.
+	// Hence we have to check if we are in a user namespaced environment and bind mount recursively instead.
+	if (access("/proc/1/uid_map", F_OK) == 0) {
+		FILE *f;
+		int k;
+		uid_t uid_base, uid_shift, uid_range;
+
+		pexit_if((f = fopen("/proc/1/uid_map", "re")) == NULL,
+			 "Unable to open /proc/1/uid_map");
+
+		if (sizeof(uid_t) == 4) {
+			k = fscanf(f, "%"PRIu32" %"PRIu32" %"PRIu32,
+				   &uid_base, &uid_shift, &uid_range);
+		} else {
+			k = fscanf(f, "%"PRIu16" %"PRIu16" %"PRIu16,
+				   &uid_base, &uid_shift, &uid_range);
+		}
+		pexit_if(fclose(f) != 0, "Unable to close /proc/1/uid_map");
+		pexit_if(k != 3, "Invalid uid_map format");
+
+		// do a recursive bind mount if we are in a user namespace having a parent namespace set,
+		// i.e. either one of uid base, shift, or the range is set, see user_namespaces(7).
+		if (uid_base != 0 || uid_shift != 0 || uid_range != UNMAPPED) {
+			mount_at(root, &mnt_rec);
+			return;
+		}
+	}
+
 	/* With cgroup-v1, rkt and systemd-nspawn add more cgroup
 	 * bind-mounts to control which files are read-only. To avoid
 	 * a quadratic progression, prepare-app does not bind mount
 	 * /sys recursively. See:
 	 * https://github.com/coreos/rkt/issues/2351 */
-	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
-		"Path too long: \"%s\"", to);
-	pexit_if(mount("/sys", to, "bind",
-		       MS_BIND, "NULL") == -1,
-			"Mounting \"%s\" on \"%s\" failed", "/sys", to);
+	for (i = 0; i < nelems(sys_bind_table); i++) {
+		mount_at(root, &sys_bind_table[i]);
+	}
 
 	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys/fs/cgroup") >= sizeof(to),
 		"Path too long: \"%s\"", to);
-	pexit_if(mount("/sys/fs/cgroup", to, "bind",
-		       MS_BIND, "NULL") == -1,
-			"Mounting \"%s\" on \"%s\" failed", "/sys/fs/cgroup", to);
-
 	pexit_if(!(dir = opendir(to)), "Failed to open directory \"%s\"", to)
 	errno = 0;
 	while ((d = readdir(dir))) {
@@ -173,13 +210,11 @@ static void mount_sys(const char *root)
 		if (strcmp(d->d_name, "..") == 0)
 			continue;
 
-		exit_if(snprintf(from, sizeof(from), "/sys/fs/cgroup/%s", d->d_name) >= sizeof(from),
-			"Path too long: \"%s\"", from);
-		exit_if(snprintf(to, sizeof(to), "%s/sys/fs/cgroup/%s", root, d->d_name) >= sizeof(to),
+		exit_if(snprintf(to, sizeof(to), "sys/fs/cgroup/%s", d->d_name) >= sizeof(to),
 			"Path too long: \"%s\"", to);
-		pexit_if(mount(from, to, "bind",
-			       MS_BIND, "NULL") == -1,
-				"Mounting \"%s\" on \"%s\" failed", from, to);
+
+		mount_point mnt = { to, to, "bind", NULL, MS_BIND };
+		mount_at(root, &mnt);
 	}
 	pexit_if(errno != 0, "Failed to read directory \"%s\"", to);
 	pexit_if(closedir(dir) != 0, "Failed to close directory");
@@ -317,13 +352,7 @@ int main(int argc, char *argv[])
 
 	/* Bind mount directories */
 	for (i = 0; i < nelems(dirs_mount_table); i++) {
-		const mount_point *mnt = &dirs_mount_table[i];
-
-		exit_if(snprintf(to, sizeof(to), "%s/%s", root, mnt->target) >= sizeof(to),
-			"Path too long: \"%s\"", to);
-		pexit_if(mount(mnt->source, to, mnt->type,
-			       mnt->flags, mnt->options) == -1,
-				"Mounting \"%s\" on \"%s\" failed", mnt->source, to);
+		mount_at(root, &dirs_mount_table[i]);
 	}
 
 	/* Bind mount /sys: handled differently, depending on cgroups */

From f4f115151491bd916f5b38a5da1fc2d226937c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 25 Apr 2016 19:55:23 +0200
Subject: [PATCH 0152/1304] api: fix image size reporting

We need to take into account the treestore size too.
---
 rkt/api_service.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 532d3254f1..3e217589cd 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -546,7 +546,7 @@ func aciInfoToV1AlphaAPIImage(store *store.Store, aciInfo *store.ACIInfo) (*v1al
 		Version:         version,
 		ImportTimestamp: aciInfo.ImportTime.Unix(),
 		Manifest:        manifest,
-		Size:            aciInfo.Size,
+		Size:            aciInfo.Size + aciInfo.TreeStoreSize,
 		Annotations:     convertAnnotationsToKeyValue(im.Annotations),
 	}, &im, nil
 }

From 1fede92eaebf30818a92cbdde71ae315cbf539d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 25 Apr 2016 19:59:47 +0200
Subject: [PATCH 0153/1304] functional tests: update TestImageSize

We're now rendering the image when we fetch it if we use overlay fs.
Take that into account in the test.
---
 tests/rkt_image_list_test.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/rkt_image_list_test.go b/tests/rkt_image_list_test.go
index 7e78c6ab9d..9cd4698a9f 100644
--- a/tests/rkt_image_list_test.go
+++ b/tests/rkt_image_list_test.go
@@ -22,6 +22,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/tests/testutils"
 )
@@ -77,14 +78,17 @@ func TestImageSize(t *testing.T) {
 
 	imageListCmd := fmt.Sprintf("%s image list --no-legend --full", ctx.Cmd())
 
-	// check that the printed size is the same as the actual image size
-	expectedStr := fmt.Sprintf("(?s)%s.*%d.*", imageHash, imageSize)
+	// if we don't support overlay fs, we don't render the image on fetch
+	if !common.SupportsOverlay() {
+		// check that the printed size is the same as the actual image size
+		expectedStr := fmt.Sprintf("(?s)%s.*%d.*", imageHash, imageSize)
 
-	runRktAndCheckRegexOutput(t, imageListCmd, expectedStr)
+		runRktAndCheckRegexOutput(t, imageListCmd, expectedStr)
 
-	// run the image, so rkt renders it in the tree store
-	runCmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), image)
-	spawnAndWaitOrFail(t, runCmd, 0)
+		// run the image, so rkt renders it in the tree store
+		runCmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), image)
+		spawnAndWaitOrFail(t, runCmd, 0)
+	}
 
 	tmpDir := createTempDirOrPanic("rkt_image_list_test")
 	defer os.RemoveAll(tmpDir)
@@ -113,7 +117,7 @@ func TestImageSize(t *testing.T) {
 	}
 
 	// check the size with the rendered image
-	expectedStr = fmt.Sprintf("(?s)%s.*%d.*", imageHash, imageSize+tsSize)
+	expectedStr := fmt.Sprintf("(?s)%s.*%d.*", imageHash, imageSize+tsSize)
 	runRktAndCheckRegexOutput(t, imageListCmd, expectedStr)
 
 	// gc the pod

From ff66c0f86e6205ab5518da1cfcf5843c3d78420e Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 21 Apr 2016 17:28:58 +0200
Subject: [PATCH 0154/1304] userns: not experimental anymore

---
 Documentation/devel/user-namespaces.md | 17 ++++++++++-------
 Documentation/subcommands/prepare.md   |  2 +-
 Documentation/subcommands/run.md       |  4 ++--
 rkt/prepare.go                         |  2 +-
 rkt/run.go                             |  2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Documentation/devel/user-namespaces.md b/Documentation/devel/user-namespaces.md
index 703837cc88..2281afc2e5 100644
--- a/Documentation/devel/user-namespaces.md
+++ b/Documentation/devel/user-namespaces.md
@@ -7,20 +7,23 @@ It can provide a better isolation and security: the privileged user `root` in th
 
 ## Implementation status
 
-rkt has an experimental implementation based on systemd-nspawn.
+rkt's implementation is based on systemd-nspawn.
 A pod can transparently use user IDs in the range 0-65535 and this range is mapped on the host to a high range chosen randomly.
 
 Before the pod is started, the ACIs are rendered to the filesystem and the owners of the files are set with `chown` in that high range.
 
-## Future work
+## Current limitations
 
-### Choosing the UID range
+### UID range allocation
 
 When starting several pods with user namespaces, they will each get a random UID range.
-In order to avoid collisions, it is planned to implement a locking
-mechanism so that two pods will always have a different UID range.
 
-### Working with overlayfs
+Although very unlikely, it is possible that two distincts containers get the same UID range.
+If this happens, user namespaces will not provide any additional isolation between the two containers, exactly like when user namespaces are not used.
+The two containers will however still not use the same UID range as the host, so using user namespaces is better than not using them.
+In order to avoid collisions, it is planned to implement a locking mechanism so that two pods will always have a different UID range.
+
+### Incompatible with overlayfs
 
 The initial implementation works only with `--no-overlay`.
 Ideally, preparing a pod should not have to iterate over all files to call `chown`.
@@ -28,7 +31,7 @@ Ideally, preparing a pod should not have to iterate over all files to call `chow
 It is planned to add kernel support for a mount option to shift the user IDs in the correct range (https://github.com/coreos/rkt/issues/1057).
 It would make it work with overlayfs.
 
-### Volumes
+### Inconvenient UID shift on volumes
 
 When mounting a volume from the host into the pod, the ownership of the files is not shifted, so it makes volumes difficult if not impossible to use with user namespaces.
 The same kernel support should help here too (https://github.com/coreos/rkt/issues/1057).
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 4456a44f46..38ae3a3c96 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -41,7 +41,7 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
 | `--port` | none | A port number (ex. `--port=NAME:HOSTPORT`) | Ports to expose on the host (requires [contained network](../networking.md#contained-mode)). |
-| `--private-users` |  `false` | `true` or `false` | Run within user namespaces (experimental) |
+| `--private-users` |  `false` | `true` or `false` | Run within user namespaces |
 | `--quiet` |  `false` | `true` or `false` | Suppress superfluous output on stdout, print only the UUID on success |
 | `--set-env` |  `` | An environment variable. Syntax `NAME=VALUE` | An environment variable to set for apps |
 | `--signature` |  `` | A file path | Local signature file to use in validating the preceding image |
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index b522ae44b3..d43046bfd8 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -350,7 +350,7 @@ For more details see the [hacking documentation](../hacking.md).
 | `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
 | `--port` | none | A port number (ex. `--port=NAME:HOSTPORT`) | Ports to expose on the host (requires [contained network](../networking.md#contained-mode)). |
-| `--private-users` |  `false` | `true` or `false` | Run within user namespaces (experimental). |
+| `--private-users` |  `false` | `true` or `false` | Run within user namespaces. |
 | `--set-env` | none | An environment variable (ex. `--set-env=NAME=VALUE`) | An environment variable to set for apps. |
 | `--signature` | none | A file path | Local signature file to use in validating the preceding image |
 | `--stage1-url` | none | URL with protocol | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported. |
@@ -364,4 +364,4 @@ For more details see the [hacking documentation](../hacking.md).
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
\ No newline at end of file
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/rkt/prepare.go b/rkt/prepare.go
index c62696a0bd..127d176113 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -58,7 +58,7 @@ func init() {
 	cmdPrepare.Flags().BoolVar(&flagQuiet, "quiet", false, "suppress superfluous output on stdout, print only the UUID on success")
 	cmdPrepare.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
 	cmdPrepare.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
-	cmdPrepare.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces (experimental).")
+	cmdPrepare.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
 	cmdPrepare.Flags().Var(&flagExplicitEnv, "set-env", "an environment variable to set for apps in the form name=value")
 	cmdPrepare.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
 	cmdPrepare.Flags().BoolVar(&flagNoStore, "no-store", false, "fetch images ignoring the local store")
diff --git a/rkt/run.go b/rkt/run.go
index f7537b4b33..01ba367925 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -79,7 +79,7 @@ func init() {
 	cmdRun.Flags().Lookup("net").NoOptDefVal = "default"
 	cmdRun.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
 	cmdRun.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
-	cmdRun.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces (experimental).")
+	cmdRun.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
 	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "an environment variable to set for apps in the form name=value")
 	cmdRun.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively. If true, only one image may be supplied.")
 	cmdRun.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf")

From 0e8debedf83af021603f2bd081932c2e26a39ef3 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 8 Apr 2016 13:44:16 +0200
Subject: [PATCH 0155/1304] doc: stage1-implementors-guide.md: clarify pid vs
 ppid

Clarify that only one file must be written among pid / ppid.

Reword the description. With the kvm flavor, the pid 1 of the container
was not visible on the host. The new wording does not make that
assumption.
---
 Documentation/devel/stage1-implementors-guide.md | 6 +++---
 rkt/pods.go                                      | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 926942fab5..357e8038bf 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -50,10 +50,10 @@ An alternative stage 1 could forego systemd-nspawn and systemd altogether, or re
 All that is required is an executable at the place indicated by the `coreos.com/rkt/stage1/run` entrypoint that knows how to apply the pod manifest and prepared ACI file-systems to good effect.
 
 The resolved entrypoint must inform rkt of its PID for the benefit of `rkt enter`.
-Stage 1 must write the host PIDs of the pod's process #1 and that process's parent to these two files, respectively:
+Stage 1 implementors have two options for doing so; only one must be implemented:
 
-* `/var/lib/rkt/pods/run/$uuid/pid`: the PID of the process that is PID 1 in the container.
-* `/var/lib/rkt/pods/run/$uuid/ppid`: the PID of the parent of the process that is PID 1 in the container.
+* `/var/lib/rkt/pods/run/$uuid/pid`: the PID of the process that will be given to the "enter" entrypoint.
+* `/var/lib/rkt/pods/run/$uuid/ppid`: the PID of the parent of the process that will be given to the "enter" entrypoint. That parent process must have exactly one child process.
 
 #### Arguments
 
diff --git a/rkt/pods.go b/rkt/pods.go
index 88a488455a..ec7e6b9023 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -909,8 +909,9 @@ func (p *pod) getPID() (int, error) {
 
 // getContainerPID1 returns the pid of the process with pid 1 in the pod.
 func (p *pod) getContainerPID1() (pid int, err error) {
-	// rkt supports two methods to find the container's PID 1:
-	// the pid file and the ppid file.
+	// rkt supports two methods to find the container's PID 1: the pid
+	// file and the ppid file.
+	// The ordering is not important and only one of them must be supplied.
 	// See Documentation/devel/stage1-implementors-guide.md
 	for {
 		var ppid int

From 2711408e47d1cb1e7202aa1e7a68dc553275a46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 21 Apr 2016 19:33:02 +0200
Subject: [PATCH 0156/1304] stage1/init/pod: fix typo

---
 stage1/init/common/pod.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index cf04ac2832..9ca0e35a29 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -457,7 +457,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 //   1. the hardcoded string "root"
 //   2. a path
 //   3. a number
-//   4. a name in reference to /etc/{group,passwod} in the image
+//   4. a name in reference to /etc/{group,passwd} in the image
 // See https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
 func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, privateUsers string) (int, int, error) {
 	app := ra.App

From 9b7774fc98a40f2653ef884045843b9804193fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 22 Apr 2016 18:06:40 +0200
Subject: [PATCH 0157/1304] stage1: use pure systemd to start apps in a pod

Up to this point, we were using appexec as a wrapper to the actual
binary to set up the environment for the apps in a pod. This commit
replaces appexec's functionality with pure systemd options:

appexec        | systemd option
------------   | -------------
chroot         | RootDirectory=
chdir          | WorkingDirectory=
setenv         | EnvironmentFile=
setresuid      | User=
setresgid      | Group=
setgroups      | SupplementaryGroups=
execvp         | ExecStart=
$PATH lookup   | implemented when writing the unit file
ELF diagnostic | not yet implemented

We're still using appexec (it'll be renamed in a follow-up commit) to
implement the `rkt enter` functionality.

Implementing this in systemd allows us to restrict the capabilities
granted to apps, including `CAP_SYS_ADMIN`.
---
 stage1/init/common/path.go                    |  25 +-
 stage1/init/common/pod.go                     | 224 ++++++++++++++----
 stage1/units/units/sysusers.service           |  12 +
 .../manifest.d/systemd.manifest               |   2 +
 stage1/usr_from_src/usr_from_src.mk           |   1 -
 tests/rkt_exec_test.go                        |  22 +-
 6 files changed, 220 insertions(+), 66 deletions(-)
 create mode 100644 stage1/units/units/sysusers.service

diff --git a/stage1/init/common/path.go b/stage1/init/common/path.go
index b869c22b83..140d5058cd 100644
--- a/stage1/init/common/path.go
+++ b/stage1/init/common/path.go
@@ -43,15 +43,28 @@ func ServiceUnitPath(root string, appName types.ACName) string {
 	return filepath.Join(common.Stage1RootfsPath(root), UnitsDir, ServiceUnitName(appName))
 }
 
-// RelEnvFilePath returns the path to the environment file for the given app name
-// relative to the pod's root.
-func RelEnvFilePath(appName types.ACName) string {
+// RelEnvFilePathAppexec returns the path to the environment file for the given
+// app name relative to the pod's root to be parsed by appexec.
+func RelEnvFilePathAppexec(appName types.ACName) string {
 	return filepath.Join(envDir, appName.String())
 }
 
-// EnvFilePath returns the path to the environment file for the given app name.
-func EnvFilePath(root string, appName types.ACName) string {
-	return filepath.Join(common.Stage1RootfsPath(root), RelEnvFilePath(appName))
+// EnvFilePathAppexec returns the path to the environment file for the given
+// app name to be parsed by appexec.
+func EnvFilePathAppexec(root string, appName types.ACName) string {
+	return filepath.Join(common.Stage1RootfsPath(root), RelEnvFilePathAppexec(appName))
+}
+
+// RelEnvFilePathSystemd returns the path to the environment file for the given
+// app name relative to the pod's root to be parsed by systemd.
+func RelEnvFilePathSystemd(appName types.ACName) string {
+	return filepath.Join(envDir, appName.String()) + "-systemd"
+}
+
+// EnvFilePathSystemd returns the path to the environment file for the given
+// app name to be parsed by systemd.
+func EnvFilePathSystemd(root string, appName types.ACName) string {
+	return EnvFilePathAppexec(root, appName) + "-systemd"
 }
 
 // ServiceWantPath returns the systemd default.target want symlink path for the
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 9ca0e35a29..11ca3ac451 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -60,35 +60,23 @@ var (
 		"HOME":    "/root",
 	}
 
-	// The list of default capabilities inside systemd-nspawn pod is available
-	// here: https://www.freedesktop.org/software/systemd/man/systemd-nspawn.html
-	nspawnCapabilities, _ = types.NewLinuxCapabilitiesRetainSet([]string{
+	// appDefaultCapabilities defines a restricted set of capabilities given to
+	// apps by default.
+	appDefaultCapabilities, _ = types.NewLinuxCapabilitiesRetainSet([]string{
+		"CAP_AUDIT_WRITE",
 		"CAP_CHOWN",
 		"CAP_DAC_OVERRIDE",
-		"CAP_DAC_READ_SEARCH",
-		"CAP_FOWNER",
 		"CAP_FSETID",
-		"CAP_IPC_OWNER",
+		"CAP_FOWNER",
 		"CAP_KILL",
-		"CAP_LEASE",
-		"CAP_LINUX_IMMUTABLE",
-		"CAP_NET_BIND_SERVICE",
-		"CAP_NET_BROADCAST",
+		"CAP_MKNOD",
 		"CAP_NET_RAW",
+		"CAP_NET_BIND_SERVICE",
+		"CAP_SETUID",
 		"CAP_SETGID",
-		"CAP_SETFCAP",
 		"CAP_SETPCAP",
-		"CAP_SETUID",
-		"CAP_SYS_ADMIN",
+		"CAP_SETFCAP",
 		"CAP_SYS_CHROOT",
-		"CAP_SYS_NICE",
-		"CAP_SYS_PTRACE",
-		"CAP_SYS_TTY_CONFIG",
-		"CAP_SYS_RESOURCE",
-		"CAP_SYS_BOOT",
-		"CAP_AUDIT_WRITE",
-		"CAP_AUDIT_CONTROL",
-		"CAP_MKNOD",
 	}...)
 )
 
@@ -276,6 +264,116 @@ func findHostPort(pm schema.PodManifest, name types.ACName) uint {
 	return port
 }
 
+// generateSysusers generates systemd sysusers files for a given app so that
+// corresponding entries in /etc/passwd and /etc/group are created in stage1.
+// This is needed to use the "User=" and "Group=" options in the systemd
+// service files of apps.
+// If there're several apps defining the same UIDs/GIDs, systemd will take care
+// of only generating one /etc/{passwd,group} entry
+func generateSysusers(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uid_ int, gid_ int) error {
+	app := ra.App
+	appName := ra.Name
+
+	if err := os.MkdirAll(path.Join(common.Stage1RootfsPath(p.Root), "usr/lib/sysusers.d"), 0755); err != nil {
+		return err
+	}
+
+	gids := append(app.SupplementaryGIDs, gid_)
+
+	// Create the Unix user and group
+	var sysusersConf []string
+
+	for _, g := range gids {
+		groupname := "gen" + strconv.Itoa(g)
+		sysusersConf = append(sysusersConf, fmt.Sprintf("g %s %d\n", groupname, g))
+	}
+
+	username := "gen" + strconv.Itoa(uid_)
+	sysusersConf = append(sysusersConf, fmt.Sprintf("u %s %d \"%s\"\n", username, uid_, username))
+
+	if err := ioutil.WriteFile(path.Join(common.Stage1RootfsPath(p.Root), "usr/lib/sysusers.d", ServiceUnitName(appName)+".conf"),
+		[]byte(strings.Join(sysusersConf, "\n")), 0640); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// lookupPathInsideApp returns the path (relative to the app rootfs) of the
+// given binary. It will look up on "paths" (also relative to the app rootfs)
+// and evaluate possible symlinks to check if the resulting path is actually
+// executable.
+func lookupPathInsideApp(bin string, paths string, appRootfs string) (string, error) {
+	pathsArr := filepath.SplitList(paths)
+	var appPathsArr []string
+	for _, p := range pathsArr {
+		appPathsArr = append(appPathsArr, filepath.Join(appRootfs, p))
+	}
+	for _, path := range appPathsArr {
+		binPath := filepath.Join(path, bin)
+		binAbsPath, err := filepath.Abs(binPath)
+		if err != nil {
+			return "", fmt.Errorf("unable to find absolute path for %s", binPath)
+		}
+		relPath := strings.TrimPrefix(binAbsPath, appRootfs)
+		d, err := os.Lstat(binAbsPath)
+		if err != nil {
+			continue
+		}
+		binRealPath, err := evaluateSymlinksInsideApp(appRootfs, relPath)
+		if err != nil {
+			return "", errwrap.Wrap(fmt.Errorf("could not evaluate path %v", binAbsPath), err)
+		}
+		binRealPath = filepath.Join(appRootfs, binRealPath)
+		d, err = os.Stat(binRealPath)
+		if err != nil {
+			continue
+		}
+		// Check the executable bit, inspired by os.exec.LookPath()
+		if m := d.Mode(); !m.IsDir() && m&0111 != 0 {
+			// The real path is executable, return the path relative to the app
+			return relPath, nil
+		}
+	}
+	return "", fmt.Errorf("unable to find %q in %q", bin, paths)
+}
+
+// appSearchPaths returns a list of paths where we should search for
+// non-absolute exec binaries
+func appSearchPaths(p *stage1commontypes.Pod, appRootfs string, app types.App) []string {
+	appEnv := app.Environment
+
+	if imgPath, ok := appEnv.Get("PATH"); ok {
+		return strings.Split(imgPath, ":")
+	}
+
+	// emulate exec(3) behavior, first check pod's directory and then the list
+	// of directories returned by confstr(_CS_PATH). That's typically
+	// "/bin:/usr/bin" so let's use that.
+	return []string{appRootfs, "/bin", "/usr/bin"}
+}
+
+// findBinPath takes a binary path and returns a the absolute path of the
+// binary relative to the app rootfs. This can be passed to ExecStart on the
+// app's systemd service file directly.
+func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App, bin string) (string, error) {
+	absRoot, err := filepath.Abs(p.Root)
+	if err != nil {
+		return "", errwrap.Wrap(errors.New("could not get pod's root absolute path"), err)
+	}
+
+	appRootfs := common.AppRootfsPath(absRoot, appName)
+	appPathDirs := appSearchPaths(p, appRootfs, app)
+	appPath := strings.Join(appPathDirs, ":")
+
+	binPath, err := lookupPathInsideApp(bin, appPath, appRootfs)
+	if err != nil {
+		return "", errwrap.Wrap(fmt.Errorf("error looking up %q", bin), err)
+	}
+
+	return strings.TrimPrefix(binPath, appRootfs), nil
+}
+
 // appToSystemd transforms the provided RuntimeApp+ImageManifest into systemd units
 func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive bool, flavor string, privateUsers string) error {
 	app := ra.App
@@ -298,8 +396,16 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		env.Set("AC_METADATA_URL", p.MetadataServiceURL)
 	}
 
-	if err := writeEnvFile(p, env, appName, privateUsers); err != nil {
-		return errwrap.Wrap(errors.New("unable to write environment file"), err)
+	// TODO(iaguis): make appexec use the same format as systemd
+	envFilePathSystemd := EnvFilePathSystemd(p.Root, appName)
+	envFilePathAppexec := EnvFilePathAppexec(p.Root, appName)
+
+	if err := writeEnvFile(p, env, appName, privateUsers, '\n', envFilePathSystemd); err != nil {
+		return errwrap.Wrap(errors.New("unable to write environment file for systemd"), err)
+	}
+
+	if err := writeEnvFile(p, env, appName, privateUsers, '\000', envFilePathAppexec); err != nil {
+		return errwrap.Wrap(errors.New("unable to write environment file for appexec"), err)
 	}
 
 	u, g, err := parseUserGroup(p, ra, privateUsers)
@@ -307,17 +413,43 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		return err
 	}
 
-	execWrap := []string{"/appexec", common.RelAppRootfsPath(appName), workDir, RelEnvFilePath(appName),
-		strconv.Itoa(u), generateGidArg(g, app.SupplementaryGIDs), "--"}
-	execStart := quoteExec(append(execWrap, app.Exec...))
+	if err := generateSysusers(p, ra, u, g); err != nil {
+		return errwrap.Wrap(errors.New("unable to generate sysusers"), err)
+	}
+
+	binPath := app.Exec[0]
+	if !filepath.IsAbs(binPath) {
+		binPath, err = findBinPath(p, appName, *app, binPath)
+		if err != nil {
+			return err
+		}
+	}
+
+	var supplementaryGroups []string
+	for _, g := range app.SupplementaryGIDs {
+		supplementaryGroups = append(supplementaryGroups, strconv.Itoa(g))
+	}
+
+	// TODO: read the RemoveSet as well. See
+	// https://github.com/coreos/rkt/issues/2348#issuecomment-211796840
+	capabilities := append(app.Isolators, appDefaultCapabilities.AsIsolator())
+	capabilitiesStr := GetAppCapabilities(capabilities)
+
+	execStart := append([]string{binPath}, app.Exec[1:]...)
+	execStartString := quoteExec(execStart)
 	opts := []*unit.UnitOption{
 		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Application=%v Image=%v", appName, imgName)),
 		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
 		unit.NewUnitOption("Unit", "Wants", fmt.Sprintf("reaper-%s.service", appName)),
 		unit.NewUnitOption("Service", "Restart", "no"),
-		unit.NewUnitOption("Service", "ExecStart", execStart),
-		unit.NewUnitOption("Service", "User", "0"),
-		unit.NewUnitOption("Service", "Group", "0"),
+		unit.NewUnitOption("Service", "ExecStart", execStartString),
+		unit.NewUnitOption("Service", "RootDirectory", common.RelAppRootfsPath(appName)),
+		unit.NewUnitOption("Service", "WorkingDirectory", workDir),
+		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePathSystemd(appName)),
+		unit.NewUnitOption("Service", "User", strconv.Itoa(u)),
+		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
+		unit.NewUnitOption("Service", "SupplementaryGroups", strings.Join(supplementaryGroups, " ")),
+		unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")),
 	}
 
 	if interactive {
@@ -330,13 +462,6 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		opts = append(opts, unit.NewUnitOption("Service", "SyslogIdentifier", filepath.Base(app.Exec[0])))
 	}
 
-	if flavor == "kvm" {
-		capabilities := append(app.Isolators, nspawnCapabilities.AsIsolator())
-		capabilitiesStr := GetAppCapabilities(capabilities)
-
-		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
-	}
-
 	// When an app fails, we shut down the pod
 	opts = append(opts, unit.NewUnitOption("Unit", "OnFailure", "halt.target"))
 
@@ -350,7 +475,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		default:
 			return fmt.Errorf("unrecognized eventHandler: %v", eh.Name)
 		}
-		exec := quoteExec(append(execWrap, eh.Exec...))
+		exec := quoteExec(eh.Exec)
 		opts = append(opts, unit.NewUnitOption("Service", typ, exec))
 	}
 
@@ -430,6 +555,9 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 	opts = append(opts, unit.NewUnitOption("Unit", "Requires", InstantiatedPrepareAppUnitName(appName)))
 	opts = append(opts, unit.NewUnitOption("Unit", "After", InstantiatedPrepareAppUnitName(appName)))
 
+	opts = append(opts, unit.NewUnitOption("Unit", "Requires", "sysusers.service"))
+	opts = append(opts, unit.NewUnitOption("Unit", "After", "sysusers.service"))
+
 	file, err := os.OpenFile(ServiceUnitPath(p.Root, appName), os.O_WRONLY|os.O_CREATE, 0644)
 	if err != nil {
 		return errwrap.Wrap(errors.New("failed to create service unit file"), err)
@@ -574,17 +702,17 @@ func writeShutdownService(p *stage1commontypes.Pod) error {
 // writeEnvFile creates an environment file for given app name, the minimum
 // required environment variables by the appc spec will be set to sensible
 // defaults here if they're not provided by env.
-func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types.ACName, privateUsers string) error {
+func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types.ACName, privateUsers string, separator byte, envFilePath string) error {
 	ef := bytes.Buffer{}
 
 	for dk, dv := range defaultEnv {
 		if _, exists := env.Get(dk); !exists {
-			fmt.Fprintf(&ef, "%s=%s\000", dk, dv)
+			fmt.Fprintf(&ef, "%s=%s%c", dk, dv, separator)
 		}
 	}
 
 	for _, e := range env {
-		fmt.Fprintf(&ef, "%s=%s\000", e.Name, e.Value)
+		fmt.Fprintf(&ef, "%s=%s%c", e.Name, e.Value, separator)
 	}
 
 	uidRange := uid.NewBlankUidRange()
@@ -592,7 +720,6 @@ func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types
 		return err
 	}
 
-	envFilePath := EnvFilePath(p.Root, appName)
 	if err := ioutil.WriteFile(envFilePath, ef.Bytes(), 0644); err != nil {
 		return err
 	}
@@ -623,12 +750,9 @@ func PodToSystemd(p *stage1commontypes.Pod, interactive bool, flavor string, pri
 	return nil
 }
 
-// evaluateAppMountPath tries to resolve symlinks within the path.
-// It returns the actual relative path for the given path.
-// TODO(yifan): This is a temporary fix for systemd-nspawn not handling symlink mounts well.
-// Could be removed when https://github.com/systemd/systemd/issues/2860 is resolved, and systemd
-// version is bumped.
-func evaluateAppMountPath(appRootfs, path string) (string, error) {
+// evaluateSymlinksInsideApp tries to resolve symlinks within the path.
+// It returns the actual path relative to the pod for the given path.
+func evaluateSymlinksInsideApp(appRootfs, path string) (string, error) {
 	link := appRootfs
 
 	paths := strings.Split(path, "/")
@@ -706,7 +830,11 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 		}
 
 		appRootfs := common.AppRootfsPath(absRoot, appName)
-		mntPath, err := evaluateAppMountPath(appRootfs, m.Path)
+
+		// TODO(yifan): This is a temporary fix for systemd-nspawn not handling symlink mounts well.
+		// Could be removed when https://github.com/systemd/systemd/issues/2860 is resolved, and systemd
+		// version is bumped.
+		mntPath, err := evaluateSymlinksInsideApp(appRootfs, m.Path)
 		if err != nil {
 			return nil, errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Path), err)
 		}
diff --git a/stage1/units/units/sysusers.service b/stage1/units/units/sysusers.service
new file mode 100644
index 0000000000..f8265def11
--- /dev/null
+++ b/stage1/units/units/sysusers.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Create /etc/passwd and /etc/group
+DefaultDependencies=false
+OnFailureJobMode=fail
+
+[Service]
+Type=oneshot
+Restart=no
+Environment="SYSTEMD_LOG_LEVEL=warning"
+ExecStart=/usr/bin/systemd-sysusers
+User=0
+Group=0
diff --git a/stage1/usr_from_coreos/manifest.d/systemd.manifest b/stage1/usr_from_coreos/manifest.d/systemd.manifest
index 8ba84bfc19..6f9ba518bf 100644
--- a/stage1/usr_from_coreos/manifest.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest.d/systemd.manifest
@@ -20,6 +20,8 @@ bin/systemd-sysusers
 bin/systemd-tmpfiles
 bin/systemd-tty-ask-password-agent
 lib
+lib64/libnss_files.so.2
+lib64/libnss_files-2.21.so
 lib64/ld-2.21.so
 lib64/ld-linux-x86-64.so.2
 lib64/libattr.so
diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index 748fe914a6..c543c91223 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -161,7 +161,6 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 		--disable-vconsole \
 		--disable-quotacheck \
 		--disable-tmpfiles \
-		--disable-sysusers \
 		--disable-randomseed \
 		--disable-backlight \
 		--disable-rfkill \
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 3bfde38594..4891e3a5d8 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -41,32 +41,32 @@ func TestRunOverrideExec(t *testing.T) {
 	defer ctx.Cleanup()
 
 	for _, tt := range []struct {
-		rktCmd       string
-		expectedLine string
+		rktCmd        string
+		expectedRegex string
 	}{
 		{
 			// Sanity check - make sure no --exec override prints the expected exec invocation
-			rktCmd:       fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s -- --print-exec", ctx.Cmd(), execImage),
-			expectedLine: "inspect execed as: /inspect",
+			rktCmd:        fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s -- --print-exec", ctx.Cmd(), execImage),
+			expectedRegex: "inspect execed as: /inspect",
 		},
 		{
 			// Now test overriding the entrypoint (which is a symlink to /inspect so should behave identically)
-			rktCmd:       fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec /inspect-link -- --print-exec", ctx.Cmd(), execImage),
-			expectedLine: "inspect execed as: /inspect-link",
+			rktCmd:        fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec /inspect-link -- --print-exec", ctx.Cmd(), execImage),
+			expectedRegex: "inspect execed as: /inspect-link",
 		},
 		{
 			// Test overriding the entrypoint with a relative path
-			rktCmd:       fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec inspect-link-bin -- --print-exec", ctx.Cmd(), execImage),
-			expectedLine: "inspect execed as: inspect-link-bin",
+			rktCmd:        fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec inspect-link-bin -- --print-exec", ctx.Cmd(), execImage),
+			expectedRegex: "inspect execed as: .*inspect-link-bin",
 		},
 
 		{
 			// Test overriding the entrypoint with a missing app section
-			rktCmd:       fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec /inspect -- --print-exec", ctx.Cmd(), noappImage),
-			expectedLine: "inspect execed as: /inspect",
+			rktCmd:        fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec /inspect -- --print-exec", ctx.Cmd(), noappImage),
+			expectedRegex: "inspect execed as: /inspect",
 		},
 	} {
-		runRktAndCheckOutput(t, tt.rktCmd, tt.expectedLine, false)
+		runRktAndCheckRegexOutput(t, tt.rktCmd, tt.expectedRegex)
 	}
 }
 

From c5a6bf702003011ee10305b96e4b8f5d541a794c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 22 Apr 2016 16:44:28 +0200
Subject: [PATCH 0158/1304] functional tests: add CAP_SYS_PTRACE to isolator
 tests

It's needed to read files via /proc/self/root.
---
 tests/rkt_app_isolator_test.go     | 7 ++++---
 tests/rkt_run_pod_manifest_test.go | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/rkt_app_isolator_test.go b/tests/rkt_app_isolator_test.go
index 3c36cce8bf..a6e8baff9a 100644
--- a/tests/rkt_app_isolator_test.go
+++ b/tests/rkt_app_isolator_test.go
@@ -30,12 +30,13 @@ const (
 	CPUQuota       = 800              // milli-cores
 )
 
+// We need CAP_SYS_PTRACE to escape the chroot
 var memoryTest = struct {
 	testName     string
 	aciBuildArgs []string
 }{
 	`Check memory isolator`,
-	[]string{"--exec=/inspect --print-memorylimit"},
+	[]string{"--exec=/inspect --print-memorylimit", "--capability=CAP_SYS_PTRACE"},
 }
 
 var cpuTest = struct {
@@ -43,7 +44,7 @@ var cpuTest = struct {
 	aciBuildArgs []string
 }{
 	`Check CPU quota`,
-	[]string{"--exec=/inspect --print-cpuquota"},
+	[]string{"--exec=/inspect --print-cpuquota", "--capability=CAP_SYS_PTRACE"},
 }
 
 var cgroupsTest = struct {
@@ -51,7 +52,7 @@ var cgroupsTest = struct {
 	aciBuildArgs []string
 }{
 	`Check cgroup mounts`,
-	[]string{"--exec=/inspect --check-cgroups"},
+	[]string{"--exec=/inspect --check-cgroups", "--capability=CAP_SYS_PTRACE"},
 }
 
 func TestAppIsolatorMemory(t *testing.T) {
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 90eff3d349..169971085e 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -431,6 +431,10 @@ func TestPodManifest(t *testing.T) {
 									Name:     "resource/cpu",
 									ValueRaw: rawRequestLimit("100", "100"),
 								},
+								{
+									Name:     "os/linux/capabilities-retain-set",
+									ValueRaw: rawValue(`{"set":["CAP_SYS_PTRACE"]}`),
+								},
 							},
 						},
 					},
@@ -459,6 +463,10 @@ func TestPodManifest(t *testing.T) {
 									// 4MB.
 									ValueRaw: rawRequestLimit("4194304", "4194304"),
 								},
+								{
+									Name:     "os/linux/capabilities-retain-set",
+									ValueRaw: rawValue(`{"set":["CAP_SYS_PTRACE"]}`),
+								},
 							},
 						},
 					},

From 38bbafbaeb63676fedc6de6ae45f7dd89ca5459e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 22 Apr 2016 16:25:05 +0200
Subject: [PATCH 0159/1304] stage1: rename appexec -> enterexec

---
 Documentation/devel/stage1-implementors-guide.md |  4 ++--
 stage1/enter/enter.c                             | 10 +++++-----
 stage1/enter_kvm/enter_kvm.go                    |  6 +++---
 stage1/{appexec => enterexec}/elf.h              |  0
 .../{appexec/appexec.c => enterexec/enterexec.c} |  0
 .../appexec.mk => enterexec/enterexec.mk}        |  0
 stage1/init/common/path.go                       | 16 ++++++++--------
 stage1/init/common/pod.go                        | 10 +++++-----
 stage1/secondary-stuff.mk                        |  2 +-
 9 files changed, 24 insertions(+), 24 deletions(-)
 rename stage1/{appexec => enterexec}/elf.h (100%)
 rename stage1/{appexec/appexec.c => enterexec/enterexec.c} (100%)
 rename stage1/{appexec/appexec.mk => enterexec/enterexec.mk} (100%)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 926942fab5..844905e005 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -77,8 +77,8 @@ Stage 1 must write the host PIDs of the pod's process #1 and that process's pare
 4. executes the resolved entrypoint relative to `/var/lib/rkt/pods/run/$uuid/stage1/rootfs`
 
 In the bundled rkt stage 1, the entrypoint is a statically-linked C program found at `/enter` within the stage 1 ACI rootfs.
-This program enters the namespaces of the systemd-nspawn container's PID 1 before executing the `/appexec` program.
-`appexec` then `chroot`s into the ACI's rootfs, loading the application and its environment.
+This program enters the namespaces of the systemd-nspawn container's PID 1 before executing the `/enterexec` program.
+`enterexec` then `chroot`s into the ACI's rootfs, loading the application and its environment.
 
 An alternative stage 1 would need to do whatever is appropriate for entering the application environment created by its own `coreos.com/rkt/stage1/run` entrypoint.
 
diff --git a/stage1/enter/enter.c b/stage1/enter/enter.c
index 163f7224a9..9d130e59c5 100644
--- a/stage1/enter/enter.c
+++ b/stage1/enter/enter.c
@@ -131,15 +131,15 @@ int main(int argc, char *argv[])
 		"Unable to fork");
 
 /* some stuff make the argv->args copy less cryptic */
-#define APPEXEC_ARGV_FWD_OFFSET	8
+#define ENTEREXEC_ARGV_FWD_OFFSET	8
 
 	if(child == 0) {
 		char		root[PATH_MAX];
 		char		env[PATH_MAX];
-		char		*args[APPEXEC_ARGV_FWD_OFFSET + argc - optind + 1 /* NULL terminator */];
+		char		*args[ENTEREXEC_ARGV_FWD_OFFSET + argc - optind + 1 /* NULL terminator */];
 		int		argsind;
 
-		/* Child goes on to execute /appexec */
+		/* Child goes on to execute /enterexec */
 
 		exit_if(snprintf(root, sizeof(root),
 				 "/opt/stage2/%s/rootfs", appname) == sizeof(root),
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
 				 "/rkt/env/%s", appname) == sizeof(env),
 			"Env path overflow");
 
-		args[0] = "/appexec";
+		args[0] = "/enterexec";
 		args[1] = root;
 		args[2] = "/";	/* TODO(vc): plumb this into app.WorkingDirectory */
 		args[3] = env;
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
 		args[5] = "0"; /* gid */
 		args[6] = "-e"; /* entering phase */
 		args[7] = "--";
-		argsind = APPEXEC_ARGV_FWD_OFFSET;
+		argsind = ENTEREXEC_ARGV_FWD_OFFSET;
 		while (optind < argc)
 			args[argsind++] = argv[optind++];
 
diff --git a/stage1/enter_kvm/enter_kvm.go b/stage1/enter_kvm/enter_kvm.go
index 5f6bdd7a76..612c1ddf89 100644
--- a/stage1/enter_kvm/enter_kvm.go
+++ b/stage1/enter_kvm/enter_kvm.go
@@ -181,11 +181,11 @@ func getPodDefaultIP(workDir string) (string, error) {
 	return "", fmt.Errorf("pod has no default network!")
 }
 
-func getAppexecArgs() []string {
+func getEnterexecArgs() []string {
 	// Documentation/devel/stage1-implementors-guide.md#arguments-1
 	// also from ../enter/enter.c
 	args := []string{
-		"/appexec",
+		"/enterexec",
 		fmt.Sprintf("/opt/stage2/%s/rootfs", appName),
 		"/", // as in ../enter/enter.c - this should be app.WorkingDirectory
 		fmt.Sprintf("/rkt/env/%s", appName),
@@ -230,7 +230,7 @@ func execSSH() error {
 		"-o", "LogLevel=quiet", // do not log minor informations
 		podDefaultIP,
 	}
-	args = append(args, getAppexecArgs()...)
+	args = append(args, getEnterexecArgs()...)
 
 	// this should not return in case of success
 	err = syscall.Exec(sshPath, args, os.Environ())
diff --git a/stage1/appexec/elf.h b/stage1/enterexec/elf.h
similarity index 100%
rename from stage1/appexec/elf.h
rename to stage1/enterexec/elf.h
diff --git a/stage1/appexec/appexec.c b/stage1/enterexec/enterexec.c
similarity index 100%
rename from stage1/appexec/appexec.c
rename to stage1/enterexec/enterexec.c
diff --git a/stage1/appexec/appexec.mk b/stage1/enterexec/enterexec.mk
similarity index 100%
rename from stage1/appexec/appexec.mk
rename to stage1/enterexec/enterexec.mk
diff --git a/stage1/init/common/path.go b/stage1/init/common/path.go
index 140d5058cd..51422e04c0 100644
--- a/stage1/init/common/path.go
+++ b/stage1/init/common/path.go
@@ -43,16 +43,16 @@ func ServiceUnitPath(root string, appName types.ACName) string {
 	return filepath.Join(common.Stage1RootfsPath(root), UnitsDir, ServiceUnitName(appName))
 }
 
-// RelEnvFilePathAppexec returns the path to the environment file for the given
-// app name relative to the pod's root to be parsed by appexec.
-func RelEnvFilePathAppexec(appName types.ACName) string {
+// RelEnvFilePathEnterexec returns the path to the environment file for the given
+// app name relative to the pod's root to be parsed by enterexec.
+func RelEnvFilePathEnterexec(appName types.ACName) string {
 	return filepath.Join(envDir, appName.String())
 }
 
-// EnvFilePathAppexec returns the path to the environment file for the given
-// app name to be parsed by appexec.
-func EnvFilePathAppexec(root string, appName types.ACName) string {
-	return filepath.Join(common.Stage1RootfsPath(root), RelEnvFilePathAppexec(appName))
+// EnvFilePathEnterexec returns the path to the environment file for the given
+// app name to be parsed by enterexec.
+func EnvFilePathEnterexec(root string, appName types.ACName) string {
+	return filepath.Join(common.Stage1RootfsPath(root), RelEnvFilePathEnterexec(appName))
 }
 
 // RelEnvFilePathSystemd returns the path to the environment file for the given
@@ -64,7 +64,7 @@ func RelEnvFilePathSystemd(appName types.ACName) string {
 // EnvFilePathSystemd returns the path to the environment file for the given
 // app name to be parsed by systemd.
 func EnvFilePathSystemd(root string, appName types.ACName) string {
-	return EnvFilePathAppexec(root, appName) + "-systemd"
+	return EnvFilePathEnterexec(root, appName) + "-systemd"
 }
 
 // ServiceWantPath returns the systemd default.target want symlink path for the
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 11ca3ac451..ca4089b761 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -105,7 +105,7 @@ func execEscape(i int, str string) string {
 // quoteExec returns an array of quoted strings appropriate for systemd execStart usage
 func quoteExec(exec []string) string {
 	if len(exec) == 0 {
-		// existing callers prefix {"/appexec", "/app/root", "/work/dir", "/env/file"} so this shouldn't occur.
+		// existing callers always include at least the binary so this shouldn't occur.
 		panic("empty exec")
 	}
 
@@ -396,16 +396,16 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		env.Set("AC_METADATA_URL", p.MetadataServiceURL)
 	}
 
-	// TODO(iaguis): make appexec use the same format as systemd
+	// TODO(iaguis): make enterexec use the same format as systemd
 	envFilePathSystemd := EnvFilePathSystemd(p.Root, appName)
-	envFilePathAppexec := EnvFilePathAppexec(p.Root, appName)
+	envFilePathEnterexec := EnvFilePathEnterexec(p.Root, appName)
 
 	if err := writeEnvFile(p, env, appName, privateUsers, '\n', envFilePathSystemd); err != nil {
 		return errwrap.Wrap(errors.New("unable to write environment file for systemd"), err)
 	}
 
-	if err := writeEnvFile(p, env, appName, privateUsers, '\000', envFilePathAppexec); err != nil {
-		return errwrap.Wrap(errors.New("unable to write environment file for appexec"), err)
+	if err := writeEnvFile(p, env, appName, privateUsers, '\000', envFilePathEnterexec); err != nil {
+		return errwrap.Wrap(errors.New("unable to write environment file for enterexec"), err)
 	}
 
 	u, g, err := parseUserGroup(p, ra, privateUsers)
diff --git a/stage1/secondary-stuff.mk b/stage1/secondary-stuff.mk
index 1366d29628..3acf76935c 100644
--- a/stage1/secondary-stuff.mk
+++ b/stage1/secondary-stuff.mk
@@ -1,6 +1,6 @@
 # aci directory should be the last one
 _S1_SS_SUBDIRS_ := \
-	appexec \
+	enterexec \
 	prepare-app \
 	enter \
 	enter_kvm \

From a2e11efa763d9979002c608fd06d0a48dd89735a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 25 Apr 2016 12:53:40 +0200
Subject: [PATCH 0160/1304] usr_from_src: copy libnss from the host

Now that we use the "User" and "Group" options of systemd to start
applications, we need to have libnss in the image.
---
 stage1/usr_from_src/libnss.mk       | 19 +++++++++++++++++++
 stage1/usr_from_src/usr_from_src.mk |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 stage1/usr_from_src/libnss.mk

diff --git a/stage1/usr_from_src/libnss.mk b/stage1/usr_from_src/libnss.mk
new file mode 100644
index 0000000000..497a235701
--- /dev/null
+++ b/stage1/usr_from_src/libnss.mk
@@ -0,0 +1,19 @@
+$(call setup-stamp-file,UFSN_STAMP)
+UFSN_LIBNSS_FILES_LINK := libnss_files.so.2
+# TODO: add this functionality to find-so-deps.mk
+UFSN_LIBS := $(shell ld --verbose | grep SEARCH_DIR | sed -e 's/SEARCH_DIR("=*\([^"]*\)");*/\1/g')
+UFSN_LIB_PATH := $(shell for l in $(UFSN_LIBS); do if [[ -e $${l}/$(UFSN_LIBNSS_FILES_LINK) ]]; then echo $${l}; break; fi; done)
+
+UFSN_LIBNSS_FILES_PATH := $(UFSN_LIB_PATH)/$(UFSN_LIBNSS_FILES_LINK)
+UFSN_LIBNSS_FILES_REALPATH := $(shell realpath $(UFSN_LIBNSS_FILES_PATH))
+UFSN_LIBNSS_FILES := $(shell basename UFSN_LIBNSS_FILES_REALPATH)
+
+UFSN_LIBNSS_FILES_ON_ACI := $(S1_RF_ACIROOTFSDIR)/usr/lib/$(UFSN_LIBNSS_FILES)
+
+S1_RF_SECONDARY_STAMPS += $(UFSN_STAMP)
+S1_RF_INSTALL_FILES += $(UFSN_LIBNSS_FILES_PATH):$(UFSN_LIBNSS_FILES_ON_ACI):-
+S1_RF_INSTALL_SYMLINKS += $(UFSN_LIBNSS_FILES):$(S1_RF_ACIROOTFSDIR)/usr/lib/$(UFSN_LIBNSS_FILES_LINK)
+
+$(call generate-stamp-rule,$(UFSN_STAMP),$(UFSN_LIBNSS_FILES_ON_ACI), $(S1_RF_ACIROOTFSDIR)/usr/lib/$(UFSN_LIBNSS_FILES_LINK))
+
+$(call undefine-namespaces,UFSN)
diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index c543c91223..65cedd1a1f 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -104,6 +104,7 @@ CLEAN_DIRS += \
 CLEAN_SYMLINKS += $(S1_RF_ACIROOTFSDIR)/flavor
 
 $(call inc-one,bash.mk)
+$(call inc-one,libnss.mk)
 
 # this makes sure everything is done - ACI rootfs is populated,
 # clean/deps/filelist are generated

From 53eaf22cc5e2aa04c7305804daca4754bc6b6e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 26 Apr 2016 11:40:54 +0200
Subject: [PATCH 0161/1304] stage1/init: shift sysusers directory and file

Also, refactor privateUsers logic a bit to avoid deserializing the file
many times.
---
 stage1/init/common/pod.go | 48 +++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index ca4089b761..f25b0d98d5 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -270,11 +270,15 @@ func findHostPort(pm schema.PodManifest, name types.ACName) uint {
 // service files of apps.
 // If there're several apps defining the same UIDs/GIDs, systemd will take care
 // of only generating one /etc/{passwd,group} entry
-func generateSysusers(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uid_ int, gid_ int) error {
+func generateSysusers(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uid_ int, gid_ int, uidRange *uid.UidRange) error {
+	var toShift []string
+
 	app := ra.App
 	appName := ra.Name
 
-	if err := os.MkdirAll(path.Join(common.Stage1RootfsPath(p.Root), "usr/lib/sysusers.d"), 0755); err != nil {
+	sysusersDir := path.Join(common.Stage1RootfsPath(p.Root), "usr/lib/sysusers.d")
+	toShift = append(toShift, sysusersDir)
+	if err := os.MkdirAll(sysusersDir, 0755); err != nil {
 		return err
 	}
 
@@ -291,11 +295,20 @@ func generateSysusers(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uid_ int,
 	username := "gen" + strconv.Itoa(uid_)
 	sysusersConf = append(sysusersConf, fmt.Sprintf("u %s %d \"%s\"\n", username, uid_, username))
 
-	if err := ioutil.WriteFile(path.Join(common.Stage1RootfsPath(p.Root), "usr/lib/sysusers.d", ServiceUnitName(appName)+".conf"),
-		[]byte(strings.Join(sysusersConf, "\n")), 0640); err != nil {
+	sysusersFile := path.Join(common.Stage1RootfsPath(p.Root), "usr/lib/sysusers.d", ServiceUnitName(appName)+".conf")
+	toShift = append(toShift, sysusersFile)
+	if err := ioutil.WriteFile(sysusersFile, []byte(strings.Join(sysusersConf, "\n")), 0640); err != nil {
 		return err
 	}
 
+	if uidRange.Shift != 0 && uidRange.Count != 0 {
+		for _, f := range toShift {
+			if err := os.Chown(f, int(uidRange.Shift), int(uidRange.Shift)); err != nil {
+				return err
+			}
+		}
+	}
+
 	return nil
 }
 
@@ -400,20 +413,25 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 	envFilePathSystemd := EnvFilePathSystemd(p.Root, appName)
 	envFilePathEnterexec := EnvFilePathEnterexec(p.Root, appName)
 
-	if err := writeEnvFile(p, env, appName, privateUsers, '\n', envFilePathSystemd); err != nil {
+	uidRange := uid.NewBlankUidRange()
+	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
+		return err
+	}
+
+	if err := writeEnvFile(p, env, appName, uidRange, '\n', envFilePathSystemd); err != nil {
 		return errwrap.Wrap(errors.New("unable to write environment file for systemd"), err)
 	}
 
-	if err := writeEnvFile(p, env, appName, privateUsers, '\000', envFilePathEnterexec); err != nil {
+	if err := writeEnvFile(p, env, appName, uidRange, '\000', envFilePathEnterexec); err != nil {
 		return errwrap.Wrap(errors.New("unable to write environment file for enterexec"), err)
 	}
 
-	u, g, err := parseUserGroup(p, ra, privateUsers)
+	u, g, err := parseUserGroup(p, ra, uidRange)
 	if err != nil {
 		return err
 	}
 
-	if err := generateSysusers(p, ra, u, g); err != nil {
+	if err := generateSysusers(p, ra, u, g, uidRange); err != nil {
 		return errwrap.Wrap(errors.New("unable to generate sysusers"), err)
 	}
 
@@ -587,18 +605,13 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 //   3. a number
 //   4. a name in reference to /etc/{group,passwd} in the image
 // See https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
-func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, privateUsers string) (int, int, error) {
+func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uidRange *uid.UidRange) (int, int, error) {
 	app := ra.App
 	appName := ra.Name
 
 	var uid_, gid_ int
 	var err error
 
-	uidRange := uid.NewBlankUidRange()
-	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
-		return -1, -1, errwrap.Wrap(errors.New("unable to deserialize uid range"), err)
-	}
-
 	switch {
 	case app.User == "root":
 		uid_ = 0
@@ -702,7 +715,7 @@ func writeShutdownService(p *stage1commontypes.Pod) error {
 // writeEnvFile creates an environment file for given app name, the minimum
 // required environment variables by the appc spec will be set to sensible
 // defaults here if they're not provided by env.
-func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types.ACName, privateUsers string, separator byte, envFilePath string) error {
+func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types.ACName, uidRange *uid.UidRange, separator byte, envFilePath string) error {
 	ef := bytes.Buffer{}
 
 	for dk, dv := range defaultEnv {
@@ -715,11 +728,6 @@ func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types
 		fmt.Fprintf(&ef, "%s=%s%c", e.Name, e.Value, separator)
 	}
 
-	uidRange := uid.NewBlankUidRange()
-	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
-		return err
-	}
-
 	if err := ioutil.WriteFile(envFilePath, ef.Bytes(), 0644); err != nil {
 		return err
 	}

From 3504f9822aa14524308492d744e2f87ea5b8774c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 26 Apr 2016 12:30:11 +0200
Subject: [PATCH 0162/1304] stage1/init: review changes

---
 stage1/init/common/pod.go | 78 ++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index f25b0d98d5..4f0b88e290 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -316,36 +316,31 @@ func generateSysusers(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uid_ int,
 // given binary. It will look up on "paths" (also relative to the app rootfs)
 // and evaluate possible symlinks to check if the resulting path is actually
 // executable.
-func lookupPathInsideApp(bin string, paths string, appRootfs string) (string, error) {
+func lookupPathInsideApp(bin string, paths string, appRootfs string, workDir string) (string, error) {
 	pathsArr := filepath.SplitList(paths)
 	var appPathsArr []string
 	for _, p := range pathsArr {
+		if !filepath.IsAbs(p) {
+			p = filepath.Join(workDir, p)
+		}
 		appPathsArr = append(appPathsArr, filepath.Join(appRootfs, p))
 	}
 	for _, path := range appPathsArr {
 		binPath := filepath.Join(path, bin)
-		binAbsPath, err := filepath.Abs(binPath)
-		if err != nil {
-			return "", fmt.Errorf("unable to find absolute path for %s", binPath)
-		}
-		relPath := strings.TrimPrefix(binAbsPath, appRootfs)
-		d, err := os.Lstat(binAbsPath)
-		if err != nil {
-			continue
-		}
-		binRealPath, err := evaluateSymlinksInsideApp(appRootfs, relPath)
+		stage2Path := strings.TrimPrefix(binPath, appRootfs)
+		binRealPath, err := evaluateSymlinksInsideApp(appRootfs, stage2Path)
 		if err != nil {
-			return "", errwrap.Wrap(fmt.Errorf("could not evaluate path %v", binAbsPath), err)
+			return "", errwrap.Wrap(fmt.Errorf("could not evaluate path %v", stage2Path), err)
 		}
 		binRealPath = filepath.Join(appRootfs, binRealPath)
-		d, err = os.Stat(binRealPath)
+		d, err := os.Stat(binRealPath)
 		if err != nil {
 			continue
 		}
 		// Check the executable bit, inspired by os.exec.LookPath()
 		if m := d.Mode(); !m.IsDir() && m&0111 != 0 {
 			// The real path is executable, return the path relative to the app
-			return relPath, nil
+			return stage2Path, nil
 		}
 	}
 	return "", fmt.Errorf("unable to find %q in %q", bin, paths)
@@ -353,38 +348,48 @@ func lookupPathInsideApp(bin string, paths string, appRootfs string) (string, er
 
 // appSearchPaths returns a list of paths where we should search for
 // non-absolute exec binaries
-func appSearchPaths(p *stage1commontypes.Pod, appRootfs string, app types.App) []string {
+func appSearchPaths(p *stage1commontypes.Pod, workDir string, app types.App) []string {
 	appEnv := app.Environment
 
 	if imgPath, ok := appEnv.Get("PATH"); ok {
 		return strings.Split(imgPath, ":")
 	}
 
-	// emulate exec(3) behavior, first check pod's directory and then the list
-	// of directories returned by confstr(_CS_PATH). That's typically
+	// emulate exec(3) behavior, first check working directory and then the
+	// list of directories returned by confstr(_CS_PATH). That's typically
 	// "/bin:/usr/bin" so let's use that.
-	return []string{appRootfs, "/bin", "/usr/bin"}
+	return []string{workDir, "/bin", "/usr/bin"}
 }
 
 // findBinPath takes a binary path and returns a the absolute path of the
 // binary relative to the app rootfs. This can be passed to ExecStart on the
 // app's systemd service file directly.
-func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App, bin string) (string, error) {
-	absRoot, err := filepath.Abs(p.Root)
-	if err != nil {
-		return "", errwrap.Wrap(errors.New("could not get pod's root absolute path"), err)
-	}
-
-	appRootfs := common.AppRootfsPath(absRoot, appName)
-	appPathDirs := appSearchPaths(p, appRootfs, app)
-	appPath := strings.Join(appPathDirs, ":")
+func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App, workDir string, bin string) (string, error) {
+	var binPath string
+	switch {
+	// absolute path, just use it
+	case filepath.IsAbs(bin):
+		binPath = bin
+	// non-absolute path containing a slash, look in the working dir
+	case strings.Contains(bin, "/"):
+		binPath = filepath.Join(workDir, bin)
+	// filename, search in the app's $PATH
+	default:
+		absRoot, err := filepath.Abs(p.Root)
+		if err != nil {
+			return "", errwrap.Wrap(errors.New("could not get pod's root absolute path"), err)
+		}
+		appRootfs := common.AppRootfsPath(absRoot, appName)
+		appPathDirs := appSearchPaths(p, workDir, app)
+		appPath := strings.Join(appPathDirs, ":")
 
-	binPath, err := lookupPathInsideApp(bin, appPath, appRootfs)
-	if err != nil {
-		return "", errwrap.Wrap(fmt.Errorf("error looking up %q", bin), err)
+		binPath, err = lookupPathInsideApp(bin, appPath, appRootfs, workDir)
+		if err != nil {
+			return "", errwrap.Wrap(fmt.Errorf("error looking up %q", bin), err)
+		}
 	}
 
-	return strings.TrimPrefix(binPath, appRootfs), nil
+	return binPath, nil
 }
 
 // appToSystemd transforms the provided RuntimeApp+ImageManifest into systemd units
@@ -435,12 +440,9 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		return errwrap.Wrap(errors.New("unable to generate sysusers"), err)
 	}
 
-	binPath := app.Exec[0]
-	if !filepath.IsAbs(binPath) {
-		binPath, err = findBinPath(p, appName, *app, binPath)
-		if err != nil {
-			return err
-		}
+	binPath, err := findBinPath(p, appName, *app, workDir, app.Exec[0])
+	if err != nil {
+		return err
 	}
 
 	var supplementaryGroups []string
@@ -759,7 +761,7 @@ func PodToSystemd(p *stage1commontypes.Pod, interactive bool, flavor string, pri
 }
 
 // evaluateSymlinksInsideApp tries to resolve symlinks within the path.
-// It returns the actual path relative to the pod for the given path.
+// It returns the actual path relative to the app rootfs for the given path.
 func evaluateSymlinksInsideApp(appRootfs, path string) (string, error) {
 	link := appRootfs
 

From ecfe030460fea3bef4a4b06766b1594ae8de046f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 26 Apr 2016 15:09:56 +0200
Subject: [PATCH 0163/1304] pkg,stage1: refactor exec bit check to
 fileutil.IsExecutable()

---
 pkg/fileutil/fileutil.go  | 11 +++++++++++
 stage1/init/common/pod.go |  8 ++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go
index c22d8ae7a6..15c5774cd4 100644
--- a/pkg/fileutil/fileutil.go
+++ b/pkg/fileutil/fileutil.go
@@ -225,3 +225,14 @@ func DirSize(path string) (int64, error) {
 
 	return 0, nil
 }
+
+// IsExecutable checks if the given path points to an executable file by
+// checking the executable bit. Inspired by os.exec.LookPath()
+func IsExecutable(path string) bool {
+	d, err := os.Stat(path)
+	if err == nil {
+		m := d.Mode()
+		return !m.IsDir() && m&0111 != 0
+	}
+	return false
+}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 4f0b88e290..700144da87 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -42,6 +42,7 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
+	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/pkg/uid"
 )
 
@@ -333,12 +334,7 @@ func lookupPathInsideApp(bin string, paths string, appRootfs string, workDir str
 			return "", errwrap.Wrap(fmt.Errorf("could not evaluate path %v", stage2Path), err)
 		}
 		binRealPath = filepath.Join(appRootfs, binRealPath)
-		d, err := os.Stat(binRealPath)
-		if err != nil {
-			continue
-		}
-		// Check the executable bit, inspired by os.exec.LookPath()
-		if m := d.Mode(); !m.IsDir() && m&0111 != 0 {
+		if fileutil.IsExecutable(binRealPath) {
 			// The real path is executable, return the path relative to the app
 			return stage2Path, nil
 		}

From 5385e8658342f0d4a83bd44cf1906da792704f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 26 Apr 2016 17:56:47 +0200
Subject: [PATCH 0164/1304] stage1: sort things

---
 stage1/secondary-stuff.mk                          | 10 +++++-----
 .../usr_from_coreos/manifest.d/journald.manifest   |  6 +++---
 stage1/usr_from_coreos/manifest.d/systemd.manifest | 14 +++++++-------
 stage1/usr_from_kvm/manifest.d/sshd.manifest       |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/stage1/secondary-stuff.mk b/stage1/secondary-stuff.mk
index 3acf76935c..e80be4ec8b 100644
--- a/stage1/secondary-stuff.mk
+++ b/stage1/secondary-stuff.mk
@@ -1,13 +1,13 @@
 # aci directory should be the last one
 _S1_SS_SUBDIRS_ := \
-	enterexec \
-	prepare-app \
 	enter \
 	enter_kvm \
-	net-plugins \
-	net \
-	init \
+	enterexec \
 	gc \
+	init \
+	net \
+	net-plugins \
+	prepare-app \
 	reaper \
 	units \
 	aci
diff --git a/stage1/usr_from_coreos/manifest.d/journald.manifest b/stage1/usr_from_coreos/manifest.d/journald.manifest
index 48541b712b..5db0061c21 100644
--- a/stage1/usr_from_coreos/manifest.d/journald.manifest
+++ b/stage1/usr_from_coreos/manifest.d/journald.manifest
@@ -1,5 +1,5 @@
+lib64/systemd/system/syslog.socket
+lib64/systemd/system/systemd-journald-audit.socket
+lib64/systemd/system/systemd-journald-dev-log.socket
 lib64/systemd/system/systemd-journald.service
 lib64/systemd/system/systemd-journald.socket
-lib64/systemd/system/systemd-journald-dev-log.socket
-lib64/systemd/system/systemd-journald-audit.socket
-lib64/systemd/system/syslog.socket
diff --git a/stage1/usr_from_coreos/manifest.d/systemd.manifest b/stage1/usr_from_coreos/manifest.d/systemd.manifest
index 6f9ba518bf..fca30bbdfd 100644
--- a/stage1/usr_from_coreos/manifest.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest.d/systemd.manifest
@@ -20,8 +20,6 @@ bin/systemd-sysusers
 bin/systemd-tmpfiles
 bin/systemd-tty-ask-password-agent
 lib
-lib64/libnss_files.so.2
-lib64/libnss_files-2.21.so
 lib64/ld-2.21.so
 lib64/ld-linux-x86-64.so.2
 lib64/libattr.so
@@ -34,10 +32,10 @@ lib64/libblkid.so
 lib64/libblkid.so.1
 lib64/libblkid.so.1.1.0
 lib64/libc-2.21.so
+lib64/libc.so.6
 lib64/libcap.so
 lib64/libcap.so.2
 lib64/libcap.so.2.24
-lib64/libc.so.6
 lib64/libgcc_s.so
 lib64/libgcc_s.so.1
 lib64/libgcrypt.so
@@ -46,12 +44,12 @@ lib64/libgcrypt.so.20.0.3
 lib64/libgpg-error.so
 lib64/libgpg-error.so.0
 lib64/libgpg-error.so.0.10.0
-lib64/libitm.so
-lib64/libitm.so.1
-lib64/libitm.so.1.0.0
 lib64/libip4tc.so
 lib64/libip4tc.so.0
 lib64/libip4tc.so.0.1.0
+lib64/libitm.so
+lib64/libitm.so.1
+lib64/libitm.so.1.0.0
 lib64/libkmod.so
 lib64/libkmod.so.2
 lib64/libkmod.so.2.2.11
@@ -61,6 +59,8 @@ lib64/liblzma.so.5.0.8
 lib64/libmount.so
 lib64/libmount.so.1
 lib64/libmount.so.1.1.0
+lib64/libnss_files-2.21.so
+lib64/libnss_files.so.2
 lib64/libpcre.so
 lib64/libpcre.so.1
 lib64/libpcre.so.1.2.4
@@ -81,6 +81,7 @@ lib64/libuuid.so.1.3.0
 lib64/libz.so
 lib64/libz.so.1
 lib64/libz.so.1.2.8
+lib64/systemd/system-sleep
 lib64/systemd/systemd
 lib64/systemd/systemd-ac-power
 lib64/systemd/systemd-activate
@@ -112,5 +113,4 @@ lib64/systemd/systemd-udevd
 lib64/systemd/systemd-update-done
 lib64/systemd/systemd-update-utmp
 lib64/systemd/systemd-vconsole-setup
-lib64/systemd/system-sleep
 lib64/systemd/user-generators
diff --git a/stage1/usr_from_kvm/manifest.d/sshd.manifest b/stage1/usr_from_kvm/manifest.d/sshd.manifest
index 3116bd7011..eece908803 100644
--- a/stage1/usr_from_kvm/manifest.d/sshd.manifest
+++ b/stage1/usr_from_kvm/manifest.d/sshd.manifest
@@ -1,7 +1,6 @@
-bin/chown
 bin/chmod
+bin/chown
 bin/ssh-keygen
-sbin/sshd
 lib64/libcrypt-2.21.so
 lib64/libcrypt.so.1
 lib64/libcrypto.so.1.0.0
@@ -17,3 +16,4 @@ lib64/libutil-2.21.so
 lib64/libutil.so.1
 lib64/libz.so.1
 lib64/libz.so.1.2.8
+sbin/sshd

From ef65bab1f1db7c6c5686acba1a1a1334cf63f271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 26 Apr 2016 18:00:58 +0200
Subject: [PATCH 0165/1304] stage1/init: mention spec issue about default
 capabilities

---
 stage1/init/common/pod.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 700144da87..52532f9b46 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -63,6 +63,7 @@ var (
 
 	// appDefaultCapabilities defines a restricted set of capabilities given to
 	// apps by default.
+	// See https://github.com/appc/spec/issues/598
 	appDefaultCapabilities, _ = types.NewLinuxCapabilitiesRetainSet([]string{
 		"CAP_AUDIT_WRITE",
 		"CAP_CHOWN",

From 8286aaf08982ace0ae9a228d15377c31b1df0804 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Tue, 26 Apr 2016 18:46:51 -0700
Subject: [PATCH 0166/1304] Documentation: Fix setup-data-dir.sh script
 location

---
 Documentation/trying-out-rkt.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index bd097e4480..138dbe6f3c 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -27,7 +27,7 @@ rkt ships with a simple script that can help set up the appropriate permissions
 ```
 sudo groupadd rkt
 export WHOAMI=$(whoami); sudo gpasswd -a $WHOAMI rkt
-sudo ./scripts/setup-data-dir.sh
+sudo ./dist/scripts/setup-data-dir.sh
 ```
 
 Trust the signing key for etcd images. This must be run as root as access to the keystore is restricted:

From 00679dd3a52cebec0ee66793ff19532eea841451 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 27 Apr 2016 12:20:18 +0200
Subject: [PATCH 0167/1304] tests: prepare to use go build constraints for test
 selection

---
 tests/functional.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional.mk b/tests/functional.mk
index 4d335c5a05..a866e2c5fc 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -77,11 +77,11 @@ CLEAN_SYMLINKS += \
 $(call forward-vars,$(FTST_FUNCTIONAL_TESTS_STAMP), \
 	FTST_RKT_PATH ACTOOL FTST_IMAGE FTST_EMPTY_IMAGE FTST_TEST_TMP ABS_GO \
 	FTST_INSPECT_BINARY GO_ENV GO_TEST_FUNC_ARGS REPO_PATH \
-	FTST_ACE_MAIN_IMAGE FTST_ACE_SIDEKICK_IMAGE FTST_SS1_IMAGE)
+	FTST_ACE_MAIN_IMAGE FTST_ACE_SIDEKICK_IMAGE RKT_STAGE1_DEFAULT_FLAVOR FTST_SS1_IMAGE)
 $(FTST_FUNCTIONAL_TESTS_STAMP): $(FTST_IMAGE) $(FTST_EMPTY_IMAGE) $(ACTOOL_STAMP) $(RKT_STAMP) $(FTST_ACE_MAIN_IMAGE) $(FTST_ACE_SIDEKICK_IMAGE) $(FTST_SS1_STAMP) | $(FTST_TEST_TMP) $(FTST_RKT_PATH) $(FTST_STAGE1_ALL_FLAVOR_SYMLINKS)
 	$(VQ) \
 	$(call vb,vt,GO TEST,$(REPO_PATH)/tests) \
-	sudo RKT="$(FTST_RKT_PATH)" ACTOOL="$(ACTOOL)" RKT_INSPECT_IMAGE="$(FTST_IMAGE)" RKT_EMPTY_IMAGE="$(FTST_EMPTY_IMAGE)" RKT_ACE_MAIN_IMAGE=$(FTST_ACE_MAIN_IMAGE) RKT_ACE_SIDEKICK_IMAGE=$(FTST_ACE_SIDEKICK_IMAGE) FUNCTIONAL_TMP="$(FTST_TEST_TMP)" INSPECT_BINARY="$(FTST_INSPECT_BINARY)" STUB_STAGE1="$(FTST_SS1_IMAGE)" $(GO_ENV) "$(ABS_GO)" test -timeout 30m -v $(GO_TEST_FUNC_ARGS) $(REPO_PATH)/tests
+	sudo RKT_STAGE1_DEFAULT_FLAVOR="$(RKT_STAGE1_DEFAULT_FLAVOR)" RKT="$(FTST_RKT_PATH)" ACTOOL="$(ACTOOL)" RKT_INSPECT_IMAGE="$(FTST_IMAGE)" RKT_EMPTY_IMAGE="$(FTST_EMPTY_IMAGE)" RKT_ACE_MAIN_IMAGE=$(FTST_ACE_MAIN_IMAGE) RKT_ACE_SIDEKICK_IMAGE=$(FTST_ACE_SIDEKICK_IMAGE) FUNCTIONAL_TMP="$(FTST_TEST_TMP)" INSPECT_BINARY="$(FTST_INSPECT_BINARY)" STUB_STAGE1="$(FTST_SS1_IMAGE)" $(GO_ENV) "$(ABS_GO)" test -tags $(RKT_STAGE1_DEFAULT_FLAVOR) -timeout 30m -v $(GO_TEST_FUNC_ARGS) $(REPO_PATH)/tests
 
 $(call forward-vars,$(FTST_IMAGE), \
 	FTST_IMAGE_ROOTFSDIR ACTOOL FTST_IMAGE_DIR)

From ae1a61b04e5cbf4f74cb055db8d397f5329b89b9 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 27 Apr 2016 12:20:48 +0200
Subject: [PATCH 0168/1304] tests: add interface to wrap test execution

---
 tests/testutils/test.go | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 tests/testutils/test.go

diff --git a/tests/testutils/test.go b/tests/testutils/test.go
new file mode 100644
index 0000000000..fde9e7e987
--- /dev/null
+++ b/tests/testutils/test.go
@@ -0,0 +1,32 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package testutils
+
+import "testing"
+
+// Test is the interface that wraps a test.
+// It is meant to be used for parametrized test fixtures.
+//
+// Execute executes the test.
+type Test interface {
+	Execute(*testing.T)
+}
+
+// TestFunc is a functional adapter to allow ordinary functions as test wrappers.
+type TestFunc func(*testing.T)
+
+func (f TestFunc) Execute(t *testing.T) {
+	f(t)
+}

From 53e9ba6878806df5b77c68c1043f9b365ae93610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 20 Apr 2016 17:14:29 +0200
Subject: [PATCH 0169/1304] scripts: generate a Debian Sid ACI instead of using
 the Docker hub

Instead of getting the Debian Sid image from the Docker hub (we don't
check its signature) we generate a Debian Sid ACI using debootstrap.

This is an intermediate step to having the rkt builder hosted by CoreOS
with a proper official signature.
---
 scripts/acbuild-rkt-builder.sh | 55 +++++++++++++---------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 135f2bc220..d656b1f68b 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -16,51 +16,37 @@ fi
 
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
-IMG=${IMG:-"debian"}
-IMG_VERSION=${IMG_VERSION:-"sid"}
-DOCKERIMG="$IMG:$IMG_VERSION"
-ACI_FILE=${ACI_FILE:-"./library-$IMG-$IMG_VERSION.aci"}
-OUT_ACI=${OUT_ACI:-"rkt-builder.aci"}
-ACI_NAME=${ACI_NAME:-"coreos.com/rkt/builder"}
+IMG_NAME="coreos.com/rkt/builder"
+IMG_VERSION=${VERSION:-"v1.4.0+git"}
+ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
 ACI_GOPATH=/go
-VERSION=${VERSION:-"v1.4.0+git"}
-echo "Version: $VERSION"
 
-echo "Building $ACI_FILE"
-
-check_tool acbuild
-check_tool docker2aci
-# check_tool actool
-
-if [ ! -f "$ACI_FILE" ]; then
-    docker2aci "docker://$DOCKERIMG"
-    # These base images don't always come with valid values
-    # actool patch-manifest -user 0 -group 0 --name $IMG-$IMG_VERSION --exec /bin/bash --replace $ACI_FILE
-fi
+DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev"
 
 acbuildend () {
     export EXIT=$?;
-    acbuild --debug end && exit $EXIT;
+    acbuild --debug end && rm -rf rootfs && exit $EXIT;
 }
 
-# If modify is specified, pass the modify flag to each command and don't use
-# acbuild begin, write or end otherwise build with a context, and setup a trap
-# to handle failures,
-if [ "$MODIFY" ]; then
-    FLAGS="--modify $MODIFY $FLAGS"
-    OUT_ACI=$MODIFY
-else
-    acbuild $FLAGS begin "$ACI_FILE"
-    trap acbuildend EXIT
-fi
+echo "Generating debian sid tree"
+
+mkdir rootfs
+debootstrap --force-check-gpg --variant=minbase --components=main --include="${DEBIAN_SID_DEPS}" sid rootfs http://httpredir.debian.org/debian/
+rm -rf rootfs/var/cache/apt/archives/*
+
+echo "Version: ${IMG_VERSION}"
+echo "Building ${ACI_FILE}"
+
+acbuild begin ./rootfs
+trap acbuildend EXIT
 
-acbuild $FLAGS set-name $ACI_NAME
-acbuild $FLAGS label add version $VERSION
+acbuild $FLAGS set-name $IMG_NAME
+acbuild $FLAGS label add version $IMG_VERSION
 acbuild $FLAGS set-user 0
 acbuild $FLAGS set-group 0
-acbuild $FLAGS environment add OS_VERSION $IMG_VERSION
+acbuild $FLAGS environment add OS_VERSION sid
 acbuild $FLAGS environment add GOPATH $ACI_GOPATH
 acbuild $FLAGS environment add BUILDDIR $BUILDDIR
 acbuild $FLAGS environment add SRC_DIR $SRC_DIR
@@ -68,9 +54,8 @@ acbuild $FLAGS mount add build-dir $BUILDDIR
 acbuild $FLAGS mount add src-dir $SRC_DIR
 acbuild $FLAGS set-working-dir $SRC_DIR
 acbuild $FLAGS copy "$(dirname $0)" /scripts
-acbuild $FLAGS run /bin/bash "/scripts/install-deps-$IMG-$IMG_VERSION.sh"
 acbuild $FLAGS run /bin/bash /scripts/install-appc-spec.sh
 acbuild $FLAGS set-exec /bin/bash /scripts/build-rkt.sh
 if [ -z "$MODIFY" ]; then
-    acbuild $FLAGS write --overwrite $OUT_ACI
+    acbuild write --overwrite $ACI_FILE
 fi

From feca930dd08fdab178aafad7409bf6fd477a71d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 20 Apr 2016 17:50:57 +0200
Subject: [PATCH 0170/1304] Documentation: update rkt-in-rkt docs

---
 Documentation/rkt-build-rkt.md | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/Documentation/rkt-build-rkt.md b/Documentation/rkt-build-rkt.md
index 71e3d405bf..010c989382 100644
--- a/Documentation/rkt-build-rkt.md
+++ b/Documentation/rkt-build-rkt.md
@@ -1,35 +1,19 @@
 # coreos.com/rkt/builder
 
 This container contains all build-time dependencies in order to build rkt.
-It currently can be built in one of two flavors: _Debian Sid_ or _Fedora 22_.
+It currently can be built in: _Debian Sid_.
 
 All commands assume you are running them in your local git checkout of rkt.
 
 ## Building coreos.com/rkt/builder using acbuild
 
 Requirements:
-- Go or `docker2aci`
 - rkt
 
-The file `scripts/acbuild-rkt-builder.sh` contains a simple bash script which will download a base docker image which is then converted into an ACI.
-Once the ACI has been downloaded, the manifest is patched.
-Next acbuild is run which creates an ACI that has all the required build dependencies for compiling `rkt`.
-
-If you want to change the base OS you can set it by using one of the following sets of variables:
-
-```
-export IMG=fedora
-export IMGVERSION=22
-```
-
-Or (default):
-
-```
-export IMG=debian
-export IMGVERSION=sid
-```
+The file `scripts/acbuild-rkt-builder.sh` contains a simple bash script which generates a Debian Sid tree and creates an ACI ready to build `rkt`.
 
 Running the build script:
+
 ```
 ./scripts/acbuild-rkt-builder.sh
 ```
@@ -41,6 +25,7 @@ Once that is finished there should be a `rkt-builder.aci` file in the current di
 Now that `rkt-builder.aci` has been built you have a container which will compile `rkt`.
 
 Put it into the rkt CAS:
+
 ```
 rkt fetch --insecure-options=image ./rkt-builder.aci
 ```
@@ -63,6 +48,7 @@ You should see rkt building in your rkt container, and once it's finished, the o
 # Building rkt in rkt one liners (sort of)
 
 If you don't want to bother with acbuild and want a simple one liner that uses rkt to build rkt,  you can install all the dependencies and build rkt from source in one line using bash in a container.
+Note that this fetches images from the Docker hub and doesn't check signatures.
 
 Set `SRC_DIR` to the absolute path to your git checkout of `rkt`:
 

From 07caad3e48e4ec37a7015886111824b1324f54c3 Mon Sep 17 00:00:00 2001
From: Simone Gotti <sgotti@sorint.it>
Date: Wed, 27 Apr 2016 12:35:22 +0200
Subject: [PATCH 0171/1304] functional tests: don't use gnupg for signing
 images

Some distros only provide gnupg2 (while others provides both version)
and the `gpg` command is a symlink to `gpg2`.

With gnupg >= 2.1 signing test images fails due to changes in the
secring handling (see
https://www.gnupg.org/faq/whats-new-in-2.1.html#nosecring)

To make tests work with gnupg >= 2.1 the `runSignImage` function should be
changed to do these steps:

* Create a temporary gnupg home (with secure permissions like 700).
* Copy the secring.gpg file to that gnupg home.
* Call gpg with this command line: `gpg --homedir %s --default-key %s --output %s --detach-sig %s`

If the gpg command is provided by gnupg2 it'll convert the secring to
the format required by the gpg-agent in the `private-keys-v1.d`
directory.

Additionally gpg2 will spawn a gpg-agent to handle the private
keys and there'll be an additional problem when the path to the
gpg-agent socket files is too long (see
http://comments.gmane.org/gmane.comp.encryption.gpg.devel/21073), so
it'll require a gnupg home inside a short path.

To avoid all of this, since the functional tests only require gpg for
signing tests images this patch uses the `golang.org/x/crypto/openpgp`
package.

Fixes #2424.
---
 tests/pubring.gpg  | Bin 2479 -> 0 bytes
 tests/rkt_tests.go |  49 +++++++++++++++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 8 deletions(-)
 delete mode 100644 tests/pubring.gpg

diff --git a/tests/pubring.gpg b/tests/pubring.gpg
deleted file mode 100644
index 74e068a410bc893426c0f6af3511c0e85c3f2a83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2479
zcmajfc{~%2AII@+h9PuJ$~jU(%{6jMmKwR)R}*D3=h%$O9L*>UC9>R6XwKY)MUKc_
zj-eu&BSb<a3g7Dc`~H5v$K%)c@%#7lc>nczJRh%Apdc8{2gn6N0CiAj_6r{Sfsc2{
z20#qGyCf!IYkT{Z3-5FKrzvV<O8m59qA#(yjcI|#zJ#6kE;w)q6Oh$qT?vRso?bV_
z&bU;^;+xlXgcDy1^}t;9ZZyjKglJcfENEevf{YV9dC{~GLp~BTsk&>(v(*pzW-8F$
z0YB5x7OsA&!6x_kCAG+lE1-yA_VAN+cg=$a4+H?c&9^2Cm+FVa&%B8~$cefFuNpN<
zVRrh+Hgg+}Q)R6#>NE*;@L6M>zRoo$51RS9nZmfY25}x|Y2`}_xd?Nxr!nghVyoGI
z(uA&re&ibct~&u@lps{LG3%8&!5Y+vunlth6zDj#M!Jgv>;eLSRTgG=3e1g2h6UjL
z13Z1*VMJd71$Ov%R|S}!H=Y9jF^2zZ4F5Skjt_M4ArbI!9MQ*s4%7ng0fGRs+@POt
z28na=2=GC8xj;N35D*`~0C+Em3kZ?|f<(gr{CqnPvR`hz99=SsSmxc5N!LY2HJIld
zE7v~K)AdOC98=xf;k8HpUKD}7s=q7_zb@ig;L^(=E0RAS(v;ea>28RmhB=j%s0=z{
z4aC;GdfDhv;VKMLVLp3egu`P?9`=<%7FKA_b9yG0%b9c<g(g=Mc=i@y?SfDaK|XF2
zZ!KX6tykicuBa4$m-L*pD9f+1VX$Ry{K%{`X_#&2iKxJA_Difn5VA=P%Nj&YXBV%9
z0}-nJhO3=y1x!4DB2zB+zEw(GoPm2Rc(Elvd~U?e?l|xeCQ42M^~Ft`Y8T#Xf=lu-
zbdJ2YT5|M_LwSXBP0o<wsd>=x9UIaG=9+!lA-Gap&FZXGN*M^iRr?>FPvN4I(YM<L
zb$UF8M#MZnR5ay7(0t;XJm+JRRXwZ~FJV>qg;M))j<2T{Hv&@pRP?jPO^LX@Zf{As
z6nm&1!B9qZxSuLy`Mzc3{;a6dw3}OPkIQl&{?NGpjIm{HIx@D<2`_m1u~=3dXNr?V
zTu25mr^~}P<7nwRoP4c#t(G1+J$XVp?%<AN*+*=L;U_M1w-shAethD0CWI}8Q;YV!
z_2ijX)+d5@p)On@UMs|=YeQs|d^cdCBm&jQ#Wh)m39f~o>hnp*MAC+Bhu>)h6`>fp
zY{(quE6`3YM4A@;rL`kxn=uavJyE>pb$d=LXG>@Bt#3TEawY2*PdZQ<yzd7mzP~x`
z_-{30k9oKBG(lu?r)Jhz=nL0~+RLS3jZgNIJtH2%v!8@!DupUXXv3V(l+UDv+lG}2
z-dql@GQ`Q;oqYrDFLETtEX#)>k4R~mQ39;a<eLh4NmZf~%USns5xnjEDGmqbc4J;=
zn1P3YNkM;LTRkU6<xYXb7%9P}1fHNP^!1fCrSq%qSDtlAysF>L6!VipkScwxzO<xI
z+9WkLxz!e^8&cmRd5ljfJipOL^JJk7KPxs;zt4HQ0)U~L_O`&h>9<-M%v2aZ9)7Fd
z)*PirzXBWh<`OYWJ-|Lc1~(13(fwebSO&RUAkhcYojq4AUVsro>oP6cT?xJ=C9pB_
z2g#pmQh%x`OOg5!wVBoo%f+MDB1}rzc}3yH_<{PJHKrcz?)!uPsI#H;4NTZnOvu9S
zxEV{9sJec=j0r+))@(aP1;{xOE0XWE)S<ti9Fw|NUj|6KN7{6G?X2aOdU_aCl^okq
z3g2@v5Uae4%Ksi>k+^A!T6Mb8Yal$;C|9qM`Hp2F!%A<4eQf0<mSpZ*dxhqVWpbQ_
zv0tD!B@!hU73I&lxG+Ho>{P3ynbY$J{^L28c{$k))uwK_#l9$M1#mqo(^n<T$!RI$
zq}lsq257-uv$`5j55MzGOkYNoWoNFSZ#=I=zfmCa0=L&_-(87q?wUxIkdt=0t$c5z
z4W+_!#3KaGnEe$s+u!92ruO@+!PNdCY-;~lwjaO#e`Py%N1x<il`zRN=3NI0be>$+
z1riCKwxM%n(UpYjXZ-|PYtr!x!`$i*&P^NcDHx)D_t8+fF}ute3|pfGzE~W9tsZ48
z#o6uBr{j{2EM$u7YHx|?I6#~3MJgAN`R}DgwgpvwR%3b{1~+BBlV+Cn<x;p4n1c!I
z?gBoW51s)?&FZOG_P0{+{2jCV>km%OJARdmnta+`d7PUb;|f>Mj}l3(N{lKTi*pXu
z69ujmIaSqOyqTKT6sxCE8E-VsNs&q0F2Bw(cm=OFaga~IiapZvpq##}!NguyYcZ-4
z>J}_49`G3a4Am6Odgdt{pxo~l1{Hsre_J}qWZg04v-uu&fo1v0tr5V#%l4Pi*4<-I
zMyv!LdkM@W)F3XNWh^lK>@T@6??)jT8sc|$2@^)s&TX6Pw-;r3WyERu@Vj2KndMB-
z_HuTU6&WjadD=K1$eYN=?$8B`9Z9YaX?{em63fa!+H5#NqL`FN5bE|5R6Yu^qskmP
z6l*JOk_LH}&7oqMq}8eMX%wyiyQ^IZO)=08HJC=c9KCZb#Hu0hwQy#3ZvzX83!5hu
zxLF*^Dp#d-)M1018yf7SSPWz?8%WhJ+1Uw~hGSH<9QR!gzdezFwC0A)kW3cGKJcdX
z3oCq~eqH*8dzf5!T3_x(Vq`Mv7WMrDjxI*NDB~+_tG?EJ=F$!Im5%=@+b>SP%J#RK
z^F-b)7$UxEz+^>|gbka%TYMiDT#70Ztv(Z0Wl6lyqX&xa>5K{P{dD3gu*qoH>T03M
zLdk1GQmLqQ;M3Eu%Dj1=hJ3#|Np71TLxADjUeK85r%pe9rX%Gwa29}xl9W9-2reTT
zM7>kKa=+~1t7jYijFm6})+N7|4YfyWX)*%Mks7X=MTx*lMqF>K+W6>OxuH5={pOoy
z$2X)(%&qKEb^W#UUFW#(&aD|h$Q{ycFN9}WjB0~fL=P?Ny<(puZ`WxcMS*4V$?7P6
zXveYWJoUj+^gZi!{5)GEf@0Bzj-epm_7qn)j(+lwhi^(}?kx8hKQOV&mRM!|fCcXK
H_^IYkPBLos

diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index a85740f28a..73a23077f2 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -33,6 +33,8 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/crypto/openpgp"
+
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/gexpect"
@@ -628,10 +630,8 @@ func serverHandler(t *testing.T, server *taas.Server) {
 	}
 }
 
-func runSignImage(t *testing.T, imageFile string, keyIndex int) string {
-	ascFile := fmt.Sprintf("%s.asc", imageFile)
-
-	// keys stored in tests/secring.gpg, tests/pubring.gpg, tests/key1.gpg, tests/key2.gpg
+func runSignImage(t *testing.T, imagePath string, keyIndex int) string {
+	// keys stored in tests/secring.gpg.
 	keyFingerprint := ""
 	switch keyIndex {
 	case 1:
@@ -642,10 +642,43 @@ func runSignImage(t *testing.T, imageFile string, keyIndex int) string {
 		panic("unknown key")
 	}
 
-	cmd := fmt.Sprintf("gpg --no-default-keyring --secret-keyring ./secring.gpg --keyring ./pubring.gpg --default-key %s --output %s --detach-sig %s",
-		keyFingerprint, ascFile, imageFile)
-	spawnAndWaitOrFail(t, cmd, 0)
-	return ascFile
+	secringFile, err := os.Open("./secring.gpg")
+	if err != nil {
+		t.Fatalf("Cannot open secring.gpg file: %v", err)
+	}
+	defer secringFile.Close()
+
+	entityList, err := openpgp.ReadKeyRing(secringFile)
+	if err != nil {
+		t.Fatalf("Failed to read secring.gpg file: %v", err)
+	}
+
+	var signingEntity *openpgp.Entity
+	for _, entity := range entityList {
+		if entity.PrivateKey.KeyIdShortString() == keyFingerprint {
+			signingEntity = entity
+		}
+	}
+
+	imageFile, err := os.Open(imagePath)
+	if err != nil {
+		t.Fatalf("Cannot open image file %s: %v", imagePath, err)
+	}
+	defer imageFile.Close()
+
+	ascPath := fmt.Sprintf("%s.asc", imagePath)
+	ascFile, err := os.Create(ascPath)
+	if err != nil {
+		t.Fatalf("Cannot create asc file %s: %v", ascPath, err)
+	}
+	defer ascFile.Close()
+
+	err = openpgp.ArmoredDetachSign(ascFile, signingEntity, imageFile, nil)
+	if err != nil {
+		t.Fatalf("Cannot create armored detached signature: %v", err)
+	}
+
+	return ascPath
 }
 
 func runRktTrust(t *testing.T, ctx *testutils.RktRunCtx, prefix string, keyIndex int) {

From 87cab04886eb4de0bec3b708aa321901de7edd83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 27 Apr 2016 15:43:42 +0200
Subject: [PATCH 0172/1304] functional tests: add CAP_SYS_PTRACE to TestUserns

It's needed to read /proc/1/root
---
 tests/rkt_userns_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
index 0067b1c009..680ba0d53b 100644
--- a/tests/rkt_userns_test.go
+++ b/tests/rkt_userns_test.go
@@ -58,7 +58,8 @@ func TestUserns(t *testing.T) {
 		t.Skip("User namespaces don't work on this host.")
 	}
 
-	image := patchTestACI("rkt-inspect-stat.aci", "--exec=/inspect --stat-file")
+	// we need CAP_SYS_PTRACE to read /proc/1/root
+	image := patchTestACI("rkt-inspect-stat.aci", "--exec=/inspect --stat-file", "--capability=CAP_SYS_PTRACE")
 	defer os.Remove(image)
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()

From 59a90f2912134739ba278bbcfacff7f098842aea Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Fri, 22 Apr 2016 14:28:02 +0300
Subject: [PATCH 0173/1304] rkt/image: remove 'get' from method names

Refactors 'rkt/image' to remove 'Get' from the method names.

Related to #2450
---
 rkt/image/dockerfetcher.go    |  4 ++--
 rkt/image/downloader.go       | 24 ++++++++++++------------
 rkt/image/fetcher.go          |  8 ++++----
 rkt/image/filefetcher.go      |  6 +++---
 rkt/image/httpfetcher.go      | 16 ++++++++--------
 rkt/image/httpops.go          |  4 ++--
 rkt/image/namefetcher.go      | 12 ++++++------
 rkt/image/resumablesession.go |  6 +++---
 rkt/image/validator.go        |  8 ++++----
 9 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/rkt/image/dockerfetcher.go b/rkt/image/dockerfetcher.go
index 658649a13f..c41c2e3ef6 100644
--- a/rkt/image/dockerfetcher.go
+++ b/rkt/image/dockerfetcher.go
@@ -46,9 +46,9 @@ type dockerFetcher struct {
 	Debug         bool
 }
 
-// GetHash uses docker2aci to download the image and convert it to
+// Hash uses docker2aci to download the image and convert it to
 // ACI, then stores it in the store and returns the hash.
-func (f *dockerFetcher) GetHash(u *url.URL) (string, error) {
+func (f *dockerFetcher) Hash(u *url.URL) (string, error) {
 	ensureLogger(f.Debug)
 	dockerURL, err := d2acommon.ParseDockerURL(path.Join(u.Host, u.Path))
 	if err != nil {
diff --git a/rkt/image/downloader.go b/rkt/image/downloader.go
index cc449745ad..06936b97f5 100644
--- a/rkt/image/downloader.go
+++ b/rkt/image/downloader.go
@@ -26,21 +26,21 @@ import (
 // downloadSession is an interface used by downloader for controlling
 // the downloading process.
 type downloadSession interface {
-	// GetClient returns a client used for handling the
+	// Client returns a client used for handling the
 	// requests. It is a good place for e.g. setting up a redirect
 	// handling.
-	GetClient() (*http.Client, error)
-	// GetRequest returns an HTTP request. Is is a good place to
+	Client() (*http.Client, error)
+	// Request returns an HTTP request. It is a good place to
 	// add some headers to a request.
-	GetRequest(u *url.URL) (*http.Request, error)
+	Request(u *url.URL) (*http.Request, error)
 	// HandleStatus is mostly used to check if the response has
 	// the required HTTP status. When this function returns either
 	// an error or a false value, then the downloader will skip
 	// getting contents of the response body.
 	HandleStatus(res *http.Response) (bool, error)
-	// GetBodyReader returns a reader used to get contents of the
+	// BodyReader returns a reader used to get contents of the
 	// response body.
-	GetBodyReader(*http.Response) (io.Reader, error)
+	BodyReader(*http.Response) (io.Reader, error)
 }
 
 // downloader has a rather obvious purpose - it downloads stuff.
@@ -53,11 +53,11 @@ type downloader struct {
 // a given writeSyncer instance.
 func (d *downloader) Download(u *url.URL, out writeSyncer) error {
 	d.ensureSession()
-	client, err := d.Session.GetClient()
+	client, err := d.Session.Client()
 	if err != nil {
 		return err
 	}
-	req, err := d.Session.GetRequest(u)
+	req, err := d.Session.Request(u)
 	if err != nil {
 		return err
 	}
@@ -71,7 +71,7 @@ func (d *downloader) Download(u *url.URL, out writeSyncer) error {
 		return err
 	}
 
-	reader, err := d.Session.GetBodyReader(res)
+	reader, err := d.Session.BodyReader(res)
 	if err != nil {
 		return err
 	}
@@ -98,15 +98,15 @@ func (d *downloader) ensureSession() {
 // response other than 200 as an error.
 type defaultDownloadSession struct{}
 
-func (s *defaultDownloadSession) GetBodyReader(res *http.Response) (io.Reader, error) {
+func (s *defaultDownloadSession) BodyReader(res *http.Response) (io.Reader, error) {
 	return res.Body, nil
 }
 
-func (s *defaultDownloadSession) GetClient() (*http.Client, error) {
+func (s *defaultDownloadSession) Client() (*http.Client, error) {
 	return http.DefaultClient, nil
 }
 
-func (s *defaultDownloadSession) GetRequest(u *url.URL) (*http.Request, error) {
+func (s *defaultDownloadSession) Request(u *url.URL) (*http.Request, error) {
 	req := &http.Request{
 		Method:     "GET",
 		URL:        u,
diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index 7583e56863..9450744024 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -239,7 +239,7 @@ func (f *Fetcher) maybeFetchHTTPURLFromRemote(rem *store.Remote, u *url.URL, a *
 			Debug:         f.Debug,
 			Headers:       f.Headers,
 		}
-		return hf.GetHash(u, a)
+		return hf.Hash(u, a)
 	}
 	return "", nil
 }
@@ -253,7 +253,7 @@ func (f *Fetcher) maybeFetchDockerURLFromRemote(u *url.URL) (string, error) {
 			S:             f.S,
 			Debug:         f.Debug,
 		}
-		return df.GetHash(u)
+		return df.Hash(u)
 	}
 	return "", nil
 }
@@ -266,7 +266,7 @@ func (f *Fetcher) fetchSingleImageByPath(path string, a *asc) (string, error) {
 		Ks:            f.Ks,
 		Debug:         f.Debug,
 	}
-	return ff.GetHash(path, a)
+	return ff.Hash(path, a)
 }
 
 type appBundle struct {
@@ -353,7 +353,7 @@ func (f *Fetcher) maybeFetchImageFromRemote(app *appBundle, a *asc) (string, err
 			Headers:            f.Headers,
 			TrustKeysFromHTTPS: f.TrustKeysFromHTTPS,
 		}
-		return nf.GetHash(app.App, a)
+		return nf.Hash(app.App, a)
 	}
 	return "", nil
 }
diff --git a/rkt/image/filefetcher.go b/rkt/image/filefetcher.go
index e41e0b094d..f88ee1c152 100644
--- a/rkt/image/filefetcher.go
+++ b/rkt/image/filefetcher.go
@@ -34,9 +34,9 @@ type fileFetcher struct {
 	Debug         bool
 }
 
-// GetHash opens a file, optionally verifies it against passed asc,
+// Hash opens a file, optionally verifies it against passed asc,
 // stores it in the store and returns the hash.
-func (f *fileFetcher) GetHash(aciPath string, a *asc) (string, error) {
+func (f *fileFetcher) Hash(aciPath string, a *asc) (string, error) {
 	ensureLogger(f.Debug)
 	absPath, err := filepath.Abs(aciPath)
 	if err != nil {
@@ -98,7 +98,7 @@ func (f *fileFetcher) getVerifiedFile(aciPath string, a *asc) (*os.File, error)
 
 	entity, err := validator.ValidateWithSignature(f.Ks, ascFile)
 	if err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("image %q verification failed", validator.GetImageName()), err)
+		return nil, errwrap.Wrap(fmt.Errorf("image %q verification failed", validator.ImageName()), err)
 	}
 	printIdentities(entity)
 
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index 2b256b5ed6..59dab6f464 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -37,9 +37,9 @@ type httpFetcher struct {
 	Headers       map[string]config.Headerer
 }
 
-// GetHash fetches the URL, optionally verifies it against passed asc,
+// Hash fetches the URL, optionally verifies it against passed asc,
 // stores it in the store and returns the hash.
-func (f *httpFetcher) GetHash(u *url.URL, a *asc) (string, error) {
+func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 	ensureLogger(f.Debug)
 	urlStr := u.String()
 
@@ -47,7 +47,7 @@ func (f *httpFetcher) GetHash(u *url.URL, a *asc) (string, error) {
 		log.Printf("fetching image from %s", urlStr)
 	}
 
-	aciFile, cd, err := f.fetchURL(u, a, f.getETag())
+	aciFile, cd, err := f.fetchURL(u, a, f.eTag())
 	if err != nil {
 		return "", err
 	}
@@ -104,7 +104,7 @@ func (f *httpFetcher) fetchURL(u *url.URL, a *asc, etag string) (readSeekCloser,
 	}
 
 	if f.InsecureFlags.SkipImageCheck() || f.Ks == nil {
-		o := f.getHTTPOps()
+		o := f.httpOps()
 		aciFile, cd, err := o.DownloadImageWithETag(u, etag)
 		if err != nil {
 			return nil, nil, err
@@ -116,7 +116,7 @@ func (f *httpFetcher) fetchURL(u *url.URL, a *asc, etag string) (readSeekCloser,
 }
 
 func (f *httpFetcher) fetchVerifiedURL(u *url.URL, a *asc, etag string) (readSeekCloser, *cacheData, error) {
-	o := f.getHTTPOps()
+	o := f.httpOps()
 	f.maybeOverrideAscFetcherWithRemote(o, u, a)
 	ascFile, retry, err := o.DownloadSignature(a)
 	if err != nil {
@@ -148,7 +148,7 @@ func (f *httpFetcher) fetchVerifiedURL(u *url.URL, a *asc, etag string) (readSee
 	return retAciFile, cd, nil
 }
 
-func (f *httpFetcher) getHTTPOps() *httpOps {
+func (f *httpFetcher) httpOps() *httpOps {
 	return &httpOps{
 		InsecureSkipTLSVerify: f.InsecureFlags.SkipTLSCheck(),
 		S:       f.S,
@@ -174,7 +174,7 @@ func (f *httpFetcher) validate(aciFile, ascFile io.ReadSeeker) error {
 	return nil
 }
 
-func (f *httpFetcher) getETag() string {
+func (f *httpFetcher) eTag() string {
 	if f.Rem != nil {
 		return f.Rem.ETag
 	}
@@ -187,5 +187,5 @@ func (f *httpFetcher) maybeOverrideAscFetcherWithRemote(o *httpOps, u *url.URL,
 	}
 	u2 := ascURLFromImgURL(u)
 	a.Location = u2.String()
-	a.Fetcher = o.GetAscRemoteFetcher()
+	a.Fetcher = o.AscRemoteFetcher()
 }
diff --git a/rkt/image/httpops.go b/rkt/image/httpops.go
index eb4dee6234..84137349e5 100644
--- a/rkt/image/httpops.go
+++ b/rkt/image/httpops.go
@@ -106,8 +106,8 @@ func (o *httpOps) DownloadImageWithETag(u *url.URL, etag string) (readSeekCloser
 	return retAciFile, session.Cd, nil
 }
 
-// GetAscRemoteFetcher provides a remoteAscFetcher for asc.
-func (o *httpOps) GetAscRemoteFetcher() *remoteAscFetcher {
+// AscRemoteFetcher provides a remoteAscFetcher for asc.
+func (o *httpOps) AscRemoteFetcher() *remoteAscFetcher {
 	ensureLogger(o.Debug)
 	f := func(u *url.URL, file *os.File) error {
 		switch u.Scheme {
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index da128379e3..1110251935 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -43,9 +43,9 @@ type nameFetcher struct {
 	TrustKeysFromHTTPS bool
 }
 
-// GetHash runs the discovery, fetches the image, optionally verifies
+// Hash runs the discovery, fetches the image, optionally verifies
 // it against passed asc, stores it in the store and returns the hash.
-func (f *nameFetcher) GetHash(app *discovery.App, a *asc) (string, error) {
+func (f *nameFetcher) Hash(app *discovery.App, a *asc) (string, error) {
 	ensureLogger(f.Debug)
 	name := app.Name.String()
 	log.Printf("searching for app image %s", name)
@@ -140,7 +140,7 @@ func (f *nameFetcher) fetch(app *discovery.App, aciURL string, a *asc) (readSeek
 	}
 
 	if f.InsecureFlags.SkipImageCheck() || f.Ks == nil {
-		o := f.getHTTPOps()
+		o := f.httpOps()
 		aciFile, cd, err := o.DownloadImage(u)
 		if err != nil {
 			return nil, nil, err
@@ -155,7 +155,7 @@ func (f *nameFetcher) fetchVerifiedURL(app *discovery.App, u *url.URL, a *asc) (
 	appName := app.Name.String()
 	f.maybeFetchPubKeys(appName)
 
-	o := f.getHTTPOps()
+	o := f.httpOps()
 	ascFile, retry, err := o.DownloadSignature(a)
 	if err != nil {
 		return nil, nil, err
@@ -281,10 +281,10 @@ func (f *nameFetcher) maybeOverrideAscFetcherWithRemote(ascURL string, a *asc) {
 		return
 	}
 	a.Location = ascURL
-	a.Fetcher = f.getHTTPOps().GetAscRemoteFetcher()
+	a.Fetcher = f.httpOps().AscRemoteFetcher()
 }
 
-func (f *nameFetcher) getHTTPOps() *httpOps {
+func (f *nameFetcher) httpOps() *httpOps {
 	return &httpOps{
 		InsecureSkipTLSVerify: f.InsecureFlags.SkipTLSCheck(),
 		S:       f.S,
diff --git a/rkt/image/resumablesession.go b/rkt/image/resumablesession.go
index 712d29bbe9..89bbef95cb 100644
--- a/rkt/image/resumablesession.go
+++ b/rkt/image/resumablesession.go
@@ -81,12 +81,12 @@ type resumableSession struct {
 	byteRangeSupported bool
 }
 
-func (s *resumableSession) GetClient() (*http.Client, error) {
+func (s *resumableSession) Client() (*http.Client, error) {
 	s.ensureClient()
 	return s.client, nil
 }
 
-func (s *resumableSession) GetRequest(u *url.URL) (*http.Request, error) {
+func (s *resumableSession) Request(u *url.URL) (*http.Request, error) {
 	s.u = u
 	if err := s.maybeSetupDownloadResume(u); err != nil {
 		return nil, err
@@ -116,7 +116,7 @@ func (s *resumableSession) HandleStatus(res *http.Response) (bool, error) {
 	}
 }
 
-func (s *resumableSession) GetBodyReader(res *http.Response) (io.Reader, error) {
+func (s *resumableSession) BodyReader(res *http.Response) (io.Reader, error) {
 	reader := getIoProgressReader(s.Label, res)
 	return reader, nil
 }
diff --git a/rkt/image/validator.go b/rkt/image/validator.go
index a9c0751632..78e1aa2d7b 100644
--- a/rkt/image/validator.go
+++ b/rkt/image/validator.go
@@ -49,15 +49,15 @@ func newValidator(image io.ReadSeeker) (*validator, error) {
 	return v, nil
 }
 
-// GetImageName returns image name as it is in the image manifest.
-func (v *validator) GetImageName() string {
+// ImageName returns image name as it is in the image manifest.
+func (v *validator) ImageName() string {
 	return v.manifest.Name.String()
 }
 
 // ValidateName checks if desired image name is actually the same as
 // the one in the image manifest.
 func (v *validator) ValidateName(imageName string) error {
-	name := v.GetImageName()
+	name := v.ImageName()
 	if name != imageName {
 		return fmt.Errorf("error when reading the app name: %q expected but %q found",
 			imageName, name)
@@ -92,7 +92,7 @@ func (v *validator) ValidateWithSignature(ks *keystore.Keystore, sig io.ReadSeek
 	if _, err := sig.Seek(0, 0); err != nil {
 		return nil, errwrap.Wrap(errors.New("error seeking signature file"), err)
 	}
-	entity, err := ks.CheckSignature(v.GetImageName(), v.image, sig)
+	entity, err := ks.CheckSignature(v.ImageName(), v.image, sig)
 	if err == pgperrors.ErrUnknownIssuer {
 		log.Print("If you expected the signing key to change, try running:")
 		log.Print("    rkt trust --prefix <image>")

From 9e117622850ba93215fbfd4b8e30744d02b0addc Mon Sep 17 00:00:00 2001
From: Wlodzimierz Borkowski <wlodzimierz.borkowski@intel.com>
Date: Wed, 27 Apr 2016 09:01:08 +0200
Subject: [PATCH 0174/1304] tests/TestSocketProxyd: removing double quotes from
 rkt cmd

The command is executed as a systemd unit and is not sent to
a shell and the double quotes were not interpreted by systemd-v219
on some old distros (like Fedora 22).

Fixes #2432
---
 Documentation/networking/overriding-defaults.md | 2 +-
 tests/rkt_socket_proxyd_test.go                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/networking/overriding-defaults.md b/Documentation/networking/overriding-defaults.md
index 9f54c9a0a4..4f44fbbfe8 100644
--- a/Documentation/networking/overriding-defaults.md
+++ b/Documentation/networking/overriding-defaults.md
@@ -17,7 +17,7 @@ rkt supports the `CNI_ARGS` variable through the command line argument `--net`.
 ### Syntax
 
 The syntax for passing arguments to a network looks like `--net="$networkname1:$arg1=$val1;$arg2=val2"`.
-The usage of double quotes is mandatory due to the `;` being used as separator within the arguments for a single network.
+When executed from a shell, you can use double quotes to avoid `;` being interpreted as a command separator by the shell.
 To allow the passing of arguments to different networks simply append the arguments to the network name with a colon (`:`), and separate the arguments by semicolon (`;`).
 All arguments can either be given in a single instance of the `--net`, or can be spread across multiple uses of `--net`.
 *Reminder:* the separator for the networks (and their arguments) within one `--net` instance is the comma `,`.
diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
index d35dc3ef9e..6d00e3e84f 100644
--- a/tests/rkt_socket_proxyd_test.go
+++ b/tests/rkt_socket_proxyd_test.go
@@ -102,7 +102,7 @@ func TestSocketProxyd(t *testing.T) {
 	unitsDir := "/run/systemd/system"
 	containerIP := "192.168.0.101"
 
-	cmd := fmt.Sprintf("%s --insecure-options=image --debug run --net=\"%s:IP=%s\" --port=test-port:%d --mds-register=false %s",
+	cmd := fmt.Sprintf("%s --insecure-options=image --debug run --net=%s:IP=%s --port=test-port:%d --mds-register=false %s",
 		ctx.Cmd(), nt.Name, containerIP, port, echoImage)
 
 	serviceContent := fmt.Sprintf(rktTestingEchoService, cmd)

From 7765590baa45f47a8e1c00096d6c4d9e011748a9 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 27 Apr 2016 16:45:12 +0200
Subject: [PATCH 0175/1304] tests: mark all existing tests for coreos flavor

---
 tests/rkt_ace_validator_test.go      | 2 ++
 tests/rkt_api_service_bench_test.go  | 2 ++
 tests/rkt_api_service_test.go        | 2 ++
 tests/rkt_app_isolator_test.go       | 2 ++
 tests/rkt_auth_test.go               | 2 ++
 tests/rkt_caps_test.go               | 2 ++
 tests/rkt_cat_manifest_test.go       | 2 ++
 tests/rkt_dns_test.go                | 2 ++
 tests/rkt_env_test.go                | 2 ++
 tests/rkt_error_output_test.go       | 2 ++
 tests/rkt_etc_hosts_test.go          | 2 ++
 tests/rkt_exec_test.go               | 2 ++
 tests/rkt_exit_test.go               | 2 ++
 tests/rkt_fetch_test.go              | 2 ++
 tests/rkt_gc_test.go                 | 2 ++
 tests/rkt_hostname_test.go           | 2 ++
 tests/rkt_image_cat_manifest_test.go | 2 ++
 tests/rkt_image_dependencies_test.go | 2 ++
 tests/rkt_image_export_test.go       | 2 ++
 tests/rkt_image_extract_test.go      | 2 ++
 tests/rkt_image_gc_test.go           | 2 ++
 tests/rkt_image_list_test.go         | 2 ++
 tests/rkt_image_render_test.go       | 2 ++
 tests/rkt_image_rm_test.go           | 2 ++
 tests/rkt_interactive_test.go        | 2 ++
 tests/rkt_list_test.go               | 2 ++
 tests/rkt_metadata_service_test.go   | 2 ++
 tests/rkt_mount_test.go              | 2 ++
 tests/rkt_net_test.go                | 2 ++
 tests/rkt_non_root_test.go           | 2 ++
 tests/rkt_os_arch_test.go            | 2 ++
 tests/rkt_pid_file_test.go           | 2 ++
 tests/rkt_root_commands_test.go      | 2 ++
 tests/rkt_run_pod_manifest_test.go   | 2 ++
 tests/rkt_run_user_group_test.go     | 2 ++
 tests/rkt_service_file_test.go       | 2 ++
 tests/rkt_socket_activation_test.go  | 2 ++
 tests/rkt_socket_proxyd_test.go      | 2 ++
 tests/rkt_stage1_loading_test.go     | 2 ++
 tests/rkt_supplementary_gids_test.go | 2 ++
 tests/rkt_trust_test.go              | 2 ++
 tests/rkt_userns_test.go             | 2 ++
 tests/rkt_volume_test.go             | 2 ++
 43 files changed, 86 insertions(+)

diff --git a/tests/rkt_ace_validator_test.go b/tests/rkt_ace_validator_test.go
index 7701f90d02..6232a2f87e 100644
--- a/tests/rkt_ace_validator_test.go
+++ b/tests/rkt_ace_validator_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_api_service_bench_test.go b/tests/rkt_api_service_bench_test.go
index 1104efdbbb..20715f18f2 100644
--- a/tests/rkt_api_service_bench_test.go
+++ b/tests/rkt_api_service_bench_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index cc712ab662..923dbcfd69 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_app_isolator_test.go b/tests/rkt_app_isolator_test.go
index a6e8baff9a..98b0b0e0a2 100644
--- a/tests/rkt_app_isolator_test.go
+++ b/tests/rkt_app_isolator_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_auth_test.go b/tests/rkt_auth_test.go
index cf0e6b6323..7fd8aad9f0 100644
--- a/tests/rkt_auth_test.go
+++ b/tests/rkt_auth_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index 8559244ef7..c5e5a06aac 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_cat_manifest_test.go b/tests/rkt_cat_manifest_test.go
index 2ec4aa0d1e..2d7b3cd959 100644
--- a/tests/rkt_cat_manifest_test.go
+++ b/tests/rkt_cat_manifest_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_dns_test.go b/tests/rkt_dns_test.go
index 6d80ff9e1c..a927432176 100644
--- a/tests/rkt_dns_test.go
+++ b/tests/rkt_dns_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_env_test.go b/tests/rkt_env_test.go
index 5a03c563dc..8e8de6af75 100644
--- a/tests/rkt_env_test.go
+++ b/tests/rkt_env_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_error_output_test.go b/tests/rkt_error_output_test.go
index 4299444dfa..f696eb06bb 100644
--- a/tests/rkt_error_output_test.go
+++ b/tests/rkt_error_output_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index 52f3ef8151..b3b3ec66d7 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 4891e3a5d8..df5efa121e 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_exit_test.go b/tests/rkt_exit_test.go
index 7733f2f9da..50477a3ad4 100644
--- a/tests/rkt_exit_test.go
+++ b/tests/rkt_exit_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 69634e4d2e..5b5885b43c 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 9a116c3353..d7711c1fe9 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_hostname_test.go b/tests/rkt_hostname_test.go
index 85d7b4c464..4042dfc986 100644
--- a/tests/rkt_hostname_test.go
+++ b/tests/rkt_hostname_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index ae210c86d7..54c58cf423 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 051b7c2f2e..ad14274c9d 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 50eba09988..f5e268ea5e 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_image_extract_test.go b/tests/rkt_image_extract_test.go
index 68df373f3c..37304c8df5 100644
--- a/tests/rkt_image_extract_test.go
+++ b/tests/rkt_image_extract_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_image_gc_test.go b/tests/rkt_image_gc_test.go
index dd4def6490..316f402b37 100644
--- a/tests/rkt_image_gc_test.go
+++ b/tests/rkt_image_gc_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_image_list_test.go b/tests/rkt_image_list_test.go
index 7e78c6ab9d..3870113e6c 100644
--- a/tests/rkt_image_list_test.go
+++ b/tests/rkt_image_list_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index a3dbd0a8f6..16a31c0d6f 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_image_rm_test.go b/tests/rkt_image_rm_test.go
index 1019fa85ca..46d6c21591 100644
--- a/tests/rkt_image_rm_test.go
+++ b/tests/rkt_image_rm_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_interactive_test.go b/tests/rkt_interactive_test.go
index 846d093c02..a20631d102 100644
--- a/tests/rkt_interactive_test.go
+++ b/tests/rkt_interactive_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index 80c49c807a..1927c8fb78 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_metadata_service_test.go b/tests/rkt_metadata_service_test.go
index 178b8abea4..29dc27c20e 100644
--- a/tests/rkt_metadata_service_test.go
+++ b/tests/rkt_metadata_service_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index a2b39569c0..2212b04cb5 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index cae2c00638..e42763b0d4 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index cc3c920ffd..4c96cab371 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 9430601911..d3d1514aaa 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_pid_file_test.go b/tests/rkt_pid_file_test.go
index 2aeda499b3..3f93ca1893 100644
--- a/tests/rkt_pid_file_test.go
+++ b/tests/rkt_pid_file_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_root_commands_test.go b/tests/rkt_root_commands_test.go
index 0efa6cdaa5..e0a80a5adc 100644
--- a/tests/rkt_root_commands_test.go
+++ b/tests/rkt_root_commands_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 169971085e..910e439b53 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
index 5c77158103..ed9a084585 100644
--- a/tests/rkt_run_user_group_test.go
+++ b/tests/rkt_run_user_group_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_service_file_test.go b/tests/rkt_service_file_test.go
index 608af67174..18424552e6 100644
--- a/tests/rkt_service_file_test.go
+++ b/tests/rkt_service_file_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_socket_activation_test.go b/tests/rkt_socket_activation_test.go
index 60d72ce261..f70622a8f2 100644
--- a/tests/rkt_socket_activation_test.go
+++ b/tests/rkt_socket_activation_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
index d35dc3ef9e..88a75e3d9a 100644
--- a/tests/rkt_socket_proxyd_test.go
+++ b/tests/rkt_socket_proxyd_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_stage1_loading_test.go b/tests/rkt_stage1_loading_test.go
index 316ba0cc79..0ff8a5e5ba 100644
--- a/tests/rkt_stage1_loading_test.go
+++ b/tests/rkt_stage1_loading_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_supplementary_gids_test.go b/tests/rkt_supplementary_gids_test.go
index 342c25f26b..0d9daa3b80 100644
--- a/tests/rkt_supplementary_gids_test.go
+++ b/tests/rkt_supplementary_gids_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_trust_test.go b/tests/rkt_trust_test.go
index f503499dd4..965ed2ea1e 100644
--- a/tests/rkt_trust_test.go
+++ b/tests/rkt_trust_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
index 0067b1c009..9233db949d 100644
--- a/tests/rkt_userns_test.go
+++ b/tests/rkt_userns_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 2d9d24bde1..30b403e7b5 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build coreos
+
 package main
 
 import (

From dc071307b44b7521fa95efcdf569c1f2e3a246b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 27 Apr 2016 17:26:49 +0200
Subject: [PATCH 0176/1304] stage1/init: copy systemd-sysusers on flavor host

We're using it in stage1 so we need to copy it from the host in the host
flaver.
---
 stage1/init/init.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index f2b43466ce..31def472e8 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -165,6 +165,10 @@ func installAssets() error {
 	if err != nil {
 		return err
 	}
+	systemdSysusersBin, err := common.LookupPath("systemd-sysusers", os.Getenv("PATH"))
+	if err != nil {
+		return err
+	}
 	bashBin, err := common.LookupPath("bash", os.Getenv("PATH"))
 	if err != nil {
 		return err
@@ -189,6 +193,7 @@ func installAssets() error {
 	assets := []string{
 		proj2aci.GetAssetString("/usr/lib/systemd/systemd", systemdBin),
 		proj2aci.GetAssetString("/usr/bin/systemctl", systemctlBin),
+		proj2aci.GetAssetString("/usr/bin/systemd-sysusers", systemdSysusersBin),
 		proj2aci.GetAssetString("/usr/lib/systemd/systemd-journald", systemdJournaldBin),
 		proj2aci.GetAssetString("/usr/bin/bash", bashBin),
 		proj2aci.GetAssetString(fmt.Sprintf("%s/systemd-journald.service", systemdUnitsPath), fmt.Sprintf("%s/systemd-journald.service", systemdUnitsPath)),

From ce8c2de5b650609472456d2f7c820aa5d7445f28 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 27 Apr 2016 16:47:12 +0200
Subject: [PATCH 0177/1304] tests: initially cover fly flavor

---
 tests/build-and-run-tests.sh |  4 +--
 tests/rkt_fly_test.go        | 54 ++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 tests/rkt_fly_test.go

diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index e4c13f1122..2f0ddb397a 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -58,7 +58,7 @@ function semaphoreCIConfiguration {
 }
 
 function checkFlavorValue {
-    FLAVORS="coreos host kvm none src"
+    FLAVORS="coreos host kvm none src fly"
     if [ -z "${RKT_STAGE1_USR_FROM}" ]; then
         set -
         echo "Flavor is not set"
@@ -112,7 +112,7 @@ function parseParameters {
 # Configure build
 function configure {
     case "${RKT_STAGE1_USR_FROM}" in
-        coreos|kvm)
+        coreos|kvm|fly)
         ./configure --with-stage1-flavors="${RKT_STAGE1_USR_FROM}" \
                 --with-stage1-default-flavor="${RKT_STAGE1_USR_FROM}" \
                 --enable-functional-tests --enable-tpm=auto \
diff --git a/tests/rkt_fly_test.go b/tests/rkt_fly_test.go
new file mode 100644
index 0000000000..7001a3580b
--- /dev/null
+++ b/tests/rkt_fly_test.go
@@ -0,0 +1,54 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build fly
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestFlyNetns(t *testing.T) {
+	testImageArgs := []string{"--exec=/inspect --print-netns"}
+	testImage := patchTestACI("rkt-inspect-stage1-fly.aci", testImageArgs...)
+	defer os.Remove(testImage)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s", ctx.Cmd(), testImage)
+	child := spawnOrFail(t, cmd)
+	ctx.RegisterChild(child)
+	defer waitOrFail(t, child, 0)
+
+	expectedRegex := `NetNS: (net:\[\d+\])`
+	result, out, err := expectRegexWithOutput(child, expectedRegex)
+	if err != nil {
+		t.Fatalf("Error: %v\nOutput: %v", err, out)
+	}
+
+	ns, err := os.Readlink("/proc/self/ns/net")
+	if err != nil {
+		t.Fatalf("Cannot evaluate NetNS symlink: %v", err)
+	}
+
+	if nsChanged := ns != result[1]; nsChanged {
+		t.Fatalf("container left host netns")
+	}
+}

From 3092d7520fb55fe6f232ad6cd4bac3c4b69f2fcd Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 27 Apr 2016 19:51:04 +0200
Subject: [PATCH 0178/1304] tests: enable src flavor with coreos tests

---
 tests/rkt_ace_validator_test.go      | 2 +-
 tests/rkt_api_service_bench_test.go  | 2 +-
 tests/rkt_api_service_test.go        | 2 +-
 tests/rkt_app_isolator_test.go       | 2 +-
 tests/rkt_auth_test.go               | 2 +-
 tests/rkt_caps_test.go               | 2 +-
 tests/rkt_cat_manifest_test.go       | 2 +-
 tests/rkt_dns_test.go                | 2 +-
 tests/rkt_env_test.go                | 2 +-
 tests/rkt_error_output_test.go       | 2 +-
 tests/rkt_etc_hosts_test.go          | 2 +-
 tests/rkt_exec_test.go               | 2 +-
 tests/rkt_exit_test.go               | 2 +-
 tests/rkt_fetch_test.go              | 2 +-
 tests/rkt_gc_test.go                 | 2 +-
 tests/rkt_hostname_test.go           | 2 +-
 tests/rkt_image_cat_manifest_test.go | 2 +-
 tests/rkt_image_dependencies_test.go | 2 +-
 tests/rkt_image_export_test.go       | 2 +-
 tests/rkt_image_extract_test.go      | 2 +-
 tests/rkt_image_gc_test.go           | 2 +-
 tests/rkt_image_list_test.go         | 2 +-
 tests/rkt_image_render_test.go       | 2 +-
 tests/rkt_image_rm_test.go           | 2 +-
 tests/rkt_interactive_test.go        | 2 +-
 tests/rkt_list_test.go               | 2 +-
 tests/rkt_metadata_service_test.go   | 2 +-
 tests/rkt_mount_test.go              | 2 +-
 tests/rkt_net_test.go                | 2 +-
 tests/rkt_non_root_test.go           | 2 +-
 tests/rkt_os_arch_test.go            | 2 +-
 tests/rkt_pid_file_test.go           | 2 +-
 tests/rkt_root_commands_test.go      | 2 +-
 tests/rkt_run_pod_manifest_test.go   | 2 +-
 tests/rkt_run_user_group_test.go     | 2 +-
 tests/rkt_service_file_test.go       | 2 +-
 tests/rkt_socket_activation_test.go  | 2 +-
 tests/rkt_socket_proxyd_test.go      | 2 +-
 tests/rkt_stage1_loading_test.go     | 2 +-
 tests/rkt_supplementary_gids_test.go | 2 +-
 tests/rkt_trust_test.go              | 2 +-
 tests/rkt_userns_test.go             | 2 +-
 tests/rkt_volume_test.go             | 2 +-
 43 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/tests/rkt_ace_validator_test.go b/tests/rkt_ace_validator_test.go
index 6232a2f87e..08f135e759 100644
--- a/tests/rkt_ace_validator_test.go
+++ b/tests/rkt_ace_validator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_api_service_bench_test.go b/tests/rkt_api_service_bench_test.go
index 20715f18f2..e33745efbc 100644
--- a/tests/rkt_api_service_bench_test.go
+++ b/tests/rkt_api_service_bench_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 923dbcfd69..0b69ee52b1 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_app_isolator_test.go b/tests/rkt_app_isolator_test.go
index 98b0b0e0a2..c89bfdbb80 100644
--- a/tests/rkt_app_isolator_test.go
+++ b/tests/rkt_app_isolator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_auth_test.go b/tests/rkt_auth_test.go
index 7fd8aad9f0..d3a7ccf88c 100644
--- a/tests/rkt_auth_test.go
+++ b/tests/rkt_auth_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index c5e5a06aac..a0a2aec818 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_cat_manifest_test.go b/tests/rkt_cat_manifest_test.go
index 2d7b3cd959..6189b97113 100644
--- a/tests/rkt_cat_manifest_test.go
+++ b/tests/rkt_cat_manifest_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_dns_test.go b/tests/rkt_dns_test.go
index a927432176..21903d8df5 100644
--- a/tests/rkt_dns_test.go
+++ b/tests/rkt_dns_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_env_test.go b/tests/rkt_env_test.go
index 8e8de6af75..da6b7a3804 100644
--- a/tests/rkt_env_test.go
+++ b/tests/rkt_env_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_error_output_test.go b/tests/rkt_error_output_test.go
index f696eb06bb..d9bf374708 100644
--- a/tests/rkt_error_output_test.go
+++ b/tests/rkt_error_output_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index b3b3ec66d7..8997b46990 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index df5efa121e..11aa2a872a 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_exit_test.go b/tests/rkt_exit_test.go
index 50477a3ad4..b4ecc244fa 100644
--- a/tests/rkt_exit_test.go
+++ b/tests/rkt_exit_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 5b5885b43c..c4e7ca3d7c 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index d7711c1fe9..bc53e7c2c0 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_hostname_test.go b/tests/rkt_hostname_test.go
index 4042dfc986..4c9508dd5a 100644
--- a/tests/rkt_hostname_test.go
+++ b/tests/rkt_hostname_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 54c58cf423..c83f1875d5 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index ad14274c9d..7437911a25 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index f5e268ea5e..19661781d2 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_image_extract_test.go b/tests/rkt_image_extract_test.go
index 37304c8df5..9ce3b36423 100644
--- a/tests/rkt_image_extract_test.go
+++ b/tests/rkt_image_extract_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_image_gc_test.go b/tests/rkt_image_gc_test.go
index 316f402b37..57c5adb2be 100644
--- a/tests/rkt_image_gc_test.go
+++ b/tests/rkt_image_gc_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_image_list_test.go b/tests/rkt_image_list_test.go
index 3870113e6c..99c894070f 100644
--- a/tests/rkt_image_list_test.go
+++ b/tests/rkt_image_list_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 16a31c0d6f..6168bbc930 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_image_rm_test.go b/tests/rkt_image_rm_test.go
index 46d6c21591..db3d593482 100644
--- a/tests/rkt_image_rm_test.go
+++ b/tests/rkt_image_rm_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_interactive_test.go b/tests/rkt_interactive_test.go
index a20631d102..7cb4fe4ea8 100644
--- a/tests/rkt_interactive_test.go
+++ b/tests/rkt_interactive_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index 1927c8fb78..271bf15d51 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_metadata_service_test.go b/tests/rkt_metadata_service_test.go
index 29dc27c20e..830b3c8218 100644
--- a/tests/rkt_metadata_service_test.go
+++ b/tests/rkt_metadata_service_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index 2212b04cb5..b3ea225dbf 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index e42763b0d4..d882c3c93a 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index 4c96cab371..e29ce946da 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index d3d1514aaa..7afb21732d 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_pid_file_test.go b/tests/rkt_pid_file_test.go
index 3f93ca1893..d9b88b5636 100644
--- a/tests/rkt_pid_file_test.go
+++ b/tests/rkt_pid_file_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_root_commands_test.go b/tests/rkt_root_commands_test.go
index e0a80a5adc..65917acee9 100644
--- a/tests/rkt_root_commands_test.go
+++ b/tests/rkt_root_commands_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 910e439b53..353a2e2bab 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
index ed9a084585..5de9e4f028 100644
--- a/tests/rkt_run_user_group_test.go
+++ b/tests/rkt_run_user_group_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_service_file_test.go b/tests/rkt_service_file_test.go
index 18424552e6..22205cefe2 100644
--- a/tests/rkt_service_file_test.go
+++ b/tests/rkt_service_file_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_socket_activation_test.go b/tests/rkt_socket_activation_test.go
index f70622a8f2..cd37a44b0f 100644
--- a/tests/rkt_socket_activation_test.go
+++ b/tests/rkt_socket_activation_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
index 88a75e3d9a..705e3d39ed 100644
--- a/tests/rkt_socket_proxyd_test.go
+++ b/tests/rkt_socket_proxyd_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_stage1_loading_test.go b/tests/rkt_stage1_loading_test.go
index 0ff8a5e5ba..68d58d15c1 100644
--- a/tests/rkt_stage1_loading_test.go
+++ b/tests/rkt_stage1_loading_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_supplementary_gids_test.go b/tests/rkt_supplementary_gids_test.go
index 0d9daa3b80..fef54a7c94 100644
--- a/tests/rkt_supplementary_gids_test.go
+++ b/tests/rkt_supplementary_gids_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_trust_test.go b/tests/rkt_trust_test.go
index 965ed2ea1e..1a50732512 100644
--- a/tests/rkt_trust_test.go
+++ b/tests/rkt_trust_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
index 9233db949d..20838ab216 100644
--- a/tests/rkt_userns_test.go
+++ b/tests/rkt_userns_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 30b403e7b5..2b8882bc27 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos
+// +build coreos src
 
 package main
 

From f4e7bf0753f12fdce5485a040098127a23a05d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 28 Apr 2016 10:34:48 +0200
Subject: [PATCH 0179/1304] rkt/image: render images only if we're root

To render images, we need access to the tree store directories and
capabilities to do a chroot.

We could allow the rkt group to access the tree store directories and
not do a chroot when rendering but since this rendering-on-fetch is just
an optimization, it's simpler to just skip the rendering if we fetch as
non-root.
---
 rkt/image/fetcher.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index 7583e56863..43cdbdd70e 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -19,6 +19,7 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+	"os"
 	"runtime"
 
 	"github.com/coreos/rkt/common"
@@ -52,7 +53,9 @@ func (f *Fetcher) FetchImage(img string, ascPath string, imgType apps.AppImageTy
 			return "", err
 		}
 	}
-	if common.SupportsOverlay() {
+	// we need to be able to do a chroot and access to the tree store
+	// directories, check if we're root
+	if common.SupportsOverlay() && os.Geteuid() == 0 {
 		if _, _, err := f.S.RenderTreeStore(hash, false); err != nil {
 			return "", errwrap.Wrap(errors.New("error rendering tree store"), err)
 		}

From 7c24738982814d364bf559bc616c0356a5195fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 28 Apr 2016 10:58:49 +0200
Subject: [PATCH 0180/1304] Documentation: update references to the Docker Hub

The Docker Hub index URL is not index.docker.io anymore, it is
registry-1.docker.io.

Also, fix the Docker Hub link so it goes to the user-facing page.
---
 Documentation/configuration.md         | 10 +++++-----
 Documentation/running-docker-images.md |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/configuration.md b/Documentation/configuration.md
index 4dd3be5f89..3e7a0f8247 100644
--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@@ -192,7 +192,7 @@ These fields must be specified and cannot be empty.
 
 Some popular Docker registries:
 
-* index.docker.io (Assumed as the default when no specific registry is named on the rkt command line, as in `docker:///redis`.)
+* registry-1.docker.io (Assumed as the default when no specific registry is named on the rkt command line, as in `docker:///redis`.)
 * quay.io
 * gcr.io
 
@@ -204,7 +204,7 @@ Example `dockerAuth` configuration:
 {
 	"rktKind": "dockerAuth",
 	"rktVersion": "v1",
-	"registries": ["index.docker.io", "quay.io"],
+	"registries": ["registry-1.docker.io", "quay.io"],
 	"credentials": {
 		"user": "foo",
 		"password": "bar"
@@ -224,7 +224,7 @@ For example, given this system configuration:
 {
 	"rktKind": "dockerAuth",
 	"rktVersion": "v1",
-	"registries": ["index.docker.io", "gcr.io", "quay.io"],
+	"registries": ["registry-1.docker.io", "gcr.io", "quay.io"],
 	"credentials": {
 		"user": "foo",
 		"password": "bar"
@@ -232,7 +232,7 @@ For example, given this system configuration:
 }
 ```
 
-If only this configuration file is provided, then when downloading images from either `index.docker.io`, `gcr.io`, or `quay.io`, `rkt` would use user `foo` and password `bar`.
+If only this configuration file is provided, then when downloading images from either `registry-1.docker.io`, `gcr.io`, or `quay.io`, `rkt` would use user `foo` and password `bar`.
 
 But with additional configuration provided in the local configuration directory, this can be overridden.
 For example, given the above system configuration and the following local configuration:
@@ -265,7 +265,7 @@ For example, given the above system configuration and the following local config
 }
 ```
 
-The result is that when downloading images from `index.docker.io`, `rkt` still sends user `foo` and password `bar`, but when downloading from `quay.io`, it uses user `baz` and password `quux`; and for `gcr.io` it will use user `goo` and password `gle`.
+The result is that when downloading images from `registry-1.docker.io`, `rkt` still sends user `foo` and password `bar`, but when downloading from `quay.io`, it uses user `baz` and password `quux`; and for `gcr.io` it will use user `goo` and password `gle`.
 
 Note that _within_ a particular configuration directory (either system or local), it is a syntax error for the same Docker registry to be defined in multiple files.
 
diff --git a/Documentation/running-docker-images.md b/Documentation/running-docker-images.md
index e05e01ef7e..84db2570db 100644
--- a/Documentation/running-docker-images.md
+++ b/Documentation/running-docker-images.md
@@ -45,7 +45,7 @@ Downloading layer: f2fb89b0a711a7178528c7785d247ba3572924353b0d5e23e9b28f0518253
 4:M 19 Apr 06:09:02.375 * The server is now ready to accept connections on port 6379
 ```
 
-This behaves similarly to the Docker client: if no specific registry is named, the [Docker Hub](https://index.docker.io/v1/) is used by default.
+This behaves similarly to the Docker client: if no specific registry is named, the [Docker Hub](https://hub.docker.com) is used by default.
 
 As with Docker, alternative registries can be used by specifying the registry as part of the image reference.
 For example, the following command will fetch an nginx Docker image hosted on quay.io:

From fa3544e00a8fcad83291cee44f66b50c18164b0a Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Tue, 19 Apr 2016 13:39:21 +0300
Subject: [PATCH 0181/1304] tests: check the returned err value

Checks the discarded error value.

Related to #2390
---
 tests/rkt_net_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index cae2c00638..895ef7cdc8 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -608,6 +608,10 @@ func testNetCustomNatConnectivity(t *testing.T, nt networkTemplateT) {
 
 	// Child connects to host
 	hostname, err := os.Hostname()
+	if err != nil {
+		panic(err)
+	}
+
 	go func() {
 		defer ga.Done()
 		testImageArgs := []string{fmt.Sprintf("--exec=/inspect --get-http=%v", httpGetAddr)}
@@ -623,6 +627,7 @@ func testNetCustomNatConnectivity(t *testing.T, nt networkTemplateT) {
 		if err != nil {
 			ga.Fatalf("Error: %v\nOutput: %v", err, out)
 		}
+
 		if result[1] != hostname {
 			ga.Fatalf("Hostname received by client `%v` doesn't match `%v`", result[1], hostname)
 		}

From d8de2c52e4bb257f8131411f64a7aca861777c6a Mon Sep 17 00:00:00 2001
From: Ilya Dmitrichenko <errordeveloper@gmail.com>
Date: Wed, 27 Apr 2016 14:58:05 +0100
Subject: [PATCH 0182/1304] Documentation: `--hostname` flag

It was missing for `rkt run`. This change also make
`rkt run-prepared` docs consistent with `rkt run`
about `--hostname` flag usage.
---
 Documentation/subcommands/run-prepared.md | 2 +-
 Documentation/subcommands/run.md          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run-prepared.md b/Documentation/subcommands/run-prepared.md
index dcf7b75ad3..7f8ba71eaa 100644
--- a/Documentation/subcommands/run-prepared.md
+++ b/Documentation/subcommands/run-prepared.md
@@ -48,7 +48,7 @@ c9fad0e6    etcd    coreos.com/etcd prepared
 | `--dns` |  `` | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times |
 | `--dns-opt` |  `` | Option as described in the options section in resolv.conf(5) | DNS option to write in `/etc/resolv.conf`. It can be specified several times |
 | `--dns-search` |  `` | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times |
-| `--hostname` |  `` | A host name | Pod's hostname. If empty, it will be "rkt-$PODUUID" |
+| `--hostname` | "rkt-$PODUUID" | A host name | Set pod's host name. |
 | `--interactive` |  `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied |
 | `--mds-register` |  `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net=(default|default-restricted|host)` |
 | `--net` |  `default` | A comma-separated list of networks. Syntax: `--net[=n[:args], ...]` | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively |
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index d43046bfd8..41351d3b52 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -340,6 +340,7 @@ For more details see the [hacking documentation](../hacking.md).
 | `--dns-opt` | none | DNS option  | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
+| `--hostname` | "rkt-$PODUUID" | A host name | Set pod's host name. |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
 | `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
 | `--mds-register` | `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net` as `default`, `default-restricted`, or `host`). |

From 2323c2b237fba49235f4816bcc0ebf66b88e8dec Mon Sep 17 00:00:00 2001
From: Michal Stachowski <michal.stachowski@outlook.com>
Date: Thu, 14 Apr 2016 11:53:51 +0000
Subject: [PATCH 0183/1304] kvm: prepare functional tests for support kvm

Prepare functional tests for support kvm.

Co-authored: @s-urbaniak <sergiusz.urbaniak@gmail.com>
---
 tests/README.md                       |   4 +-
 tests/build-and-run-tests.sh          |   2 +-
 tests/rkt_api_service_bench_test.go   |   2 +-
 tests/rkt_api_service_nspawn_test.go  |  27 ++
 tests/rkt_api_service_test.go         | 304 ++++++------
 tests/rkt_app_isolator_nspawn_test.go |  39 ++
 tests/rkt_app_isolator_test.go        |  16 +-
 tests/rkt_auth_test.go                |   2 +-
 tests/rkt_caps_kvm_test.go            |  27 ++
 tests/rkt_caps_nspawn_test.go         |  23 +
 tests/rkt_caps_test.go                |  82 ++--
 tests/rkt_cat_manifest_test.go        |   2 +-
 tests/rkt_env_test.go                 |   2 +-
 tests/rkt_error_output_test.go        |   2 +-
 tests/rkt_exec_test.go                |   2 +-
 tests/rkt_fetch_test.go               |   2 +-
 tests/rkt_gc_test.go                  |   2 +-
 tests/rkt_hostname_test.go            |   2 +-
 tests/rkt_image_cat_manifest_test.go  |   2 +-
 tests/rkt_image_dependencies_test.go  |   2 +-
 tests/rkt_image_export_test.go        |   2 +-
 tests/rkt_image_extract_test.go       |   2 +-
 tests/rkt_image_gc_test.go            |   2 +-
 tests/rkt_image_list_test.go          |   2 +-
 tests/rkt_image_render_test.go        |   2 +-
 tests/rkt_image_rm_test.go            |   2 +-
 tests/rkt_interactive_test.go         |   2 +-
 tests/rkt_list_test.go                |   2 +-
 tests/rkt_metadata_service_test.go    |   2 +-
 tests/rkt_net_kvm_test.go             |  30 ++
 tests/rkt_net_nspawn_test.go          |  59 +++
 tests/rkt_net_test.go                 | 645 ++++++++++++++------------
 tests/rkt_non_root_test.go            |   2 +-
 tests/rkt_os_arch_test.go             |   2 +-
 tests/rkt_pid_file_kvm_test.go        |  30 ++
 tests/rkt_pid_file_nspawn_test.go     |  30 ++
 tests/rkt_pid_file_test.go            | 135 +++---
 tests/rkt_root_commands_test.go       |   2 +-
 tests/rkt_service_file_test.go        |   2 +-
 tests/rkt_socket_activation_test.go   |   2 +-
 tests/rkt_socket_proxyd_test.go       |   2 +-
 tests/rkt_stage1_loading_test.go      |   2 +-
 tests/rkt_supplementary_gids_test.go  |   2 +-
 tests/rkt_trust_test.go               |   2 +-
 tests/rkt_userns_test.go              |  49 +-
 tests/rkt_volume_nspawn_test.go       |  23 +
 tests/rkt_volume_test.go              |  98 ++--
 47 files changed, 1006 insertions(+), 675 deletions(-)
 create mode 100644 tests/rkt_api_service_nspawn_test.go
 create mode 100644 tests/rkt_app_isolator_nspawn_test.go
 create mode 100644 tests/rkt_caps_kvm_test.go
 create mode 100644 tests/rkt_caps_nspawn_test.go
 create mode 100644 tests/rkt_net_kvm_test.go
 create mode 100644 tests/rkt_net_nspawn_test.go
 create mode 100644 tests/rkt_pid_file_kvm_test.go
 create mode 100644 tests/rkt_pid_file_nspawn_test.go
 create mode 100644 tests/rkt_volume_nspawn_test.go

diff --git a/tests/README.md b/tests/README.md
index 9b4c3dd24f..b05a09199c 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -36,7 +36,7 @@ sudo gpasswd -a runner rkt
 
 ```
 ./tests/build-and-run-tests.sh -f none -c
-./tests/build-and-run-tests.sh -f src -s v229 -c
+./tests/build-and-run-tests.sh -f kvm -c
 ```
 
 #### Thread 2
@@ -60,7 +60,7 @@ It would be possible to add more tests with the following commands:
 ```
 ./tests/build-and-run-tests.sh -f src -s v227 -c
 ./tests/build-and-run-tests.sh -f src -s master -c
-./tests/build-and-run-tests.sh -f kvm -c
+./tests/build-and-run-tests.sh -f src -s v229 -c
 ```
 
 #### build-and-run-tests.sh parameters description
diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index 2f0ddb397a..643fe18739 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -11,7 +11,7 @@ function cleanup {
                 sudo umount "${mp}"
             done
 
-            for link in $(ip link | grep rkt | cut -d':' -f2); do
+            for link in $(ip link | grep rkt | cut -d':' -f2 | cut -d'@' -f1); do
                 sudo ip link del "${link}"
             done
             sudo rm -rf /var/lib/cni/networks/*
diff --git a/tests/rkt_api_service_bench_test.go b/tests/rkt_api_service_bench_test.go
index e33745efbc..454996c363 100644
--- a/tests/rkt_api_service_bench_test.go
+++ b/tests/rkt_api_service_bench_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_api_service_nspawn_test.go b/tests/rkt_api_service_nspawn_test.go
new file mode 100644
index 0000000000..ac591ff6b8
--- /dev/null
+++ b/tests/rkt_api_service_nspawn_test.go
@@ -0,0 +1,27 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build coreos src
+
+package main
+
+import "testing"
+
+func TestAPIServiceListInspectPods(t *testing.T) {
+	NewAPIServiceListInspectPodsTest().Execute(t)
+}
+
+func TestAPIServiceCgroup(t *testing.T) {
+	NewAPIServiceCgroupTest().Execute(t)
+}
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 0b69ee52b1..cd6a7b8ad5 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
@@ -297,95 +297,97 @@ func TestAPIServiceGetInfo(t *testing.T) {
 	}
 }
 
-func TestAPIServiceListInspectPods(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+func NewAPIServiceListInspectPodsTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
 
-	svc := startAPIService(t, ctx)
-	defer stopAPIService(t, svc)
+		svc := startAPIService(t, ctx)
+		defer stopAPIService(t, svc)
 
-	c, conn := newAPIClientOrFail(t, "localhost:15441")
-	defer conn.Close()
+		c, conn := newAPIClientOrFail(t, "localhost:15441")
+		defer conn.Close()
 
-	resp, err := c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
+		resp, err := c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
 
-	if len(resp.Pods) != 0 {
-		t.Errorf("Unexpected result: %v, should see zero pods", resp.Pods)
-	}
+		if len(resp.Pods) != 0 {
+			t.Errorf("Unexpected result: %v, should see zero pods", resp.Pods)
+		}
 
-	patches := []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}
-	imageHash := patchImportAndFetchHash("rkt-inspect-print.aci", patches, t, ctx)
-	imgID, err := types.NewHash(imageHash)
-	if err != nil {
-		t.Fatalf("Cannot generate types.Hash from %v: %v", imageHash, err)
-	}
-	pm := schema.BlankPodManifest()
-	pm.Apps = []schema.RuntimeApp{
-		{
-			Name: types.ACName("rkt-inspect"),
-			Image: schema.RuntimeImage{
-				Name: types.MustACIdentifier("coreos.com/rkt-inspect"),
-				ID:   *imgID,
+		patches := []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}
+		imageHash := patchImportAndFetchHash("rkt-inspect-print.aci", patches, t, ctx)
+		imgID, err := types.NewHash(imageHash)
+		if err != nil {
+			t.Fatalf("Cannot generate types.Hash from %v: %v", imageHash, err)
+		}
+		pm := schema.BlankPodManifest()
+		pm.Apps = []schema.RuntimeApp{
+			{
+				Name: types.ACName("rkt-inspect"),
+				Image: schema.RuntimeImage{
+					Name: types.MustACIdentifier("coreos.com/rkt-inspect"),
+					ID:   *imgID,
+				},
+				Annotations: []types.Annotation{{Name: types.ACIdentifier("app-test"), Value: "app-test"}},
 			},
-			Annotations: []types.Annotation{{Name: types.ACIdentifier("app-test"), Value: "app-test"}},
-		},
-	}
-	pm.Annotations = []types.Annotation{{Name: types.ACIdentifier("test"), Value: "test"}}
-	manifestFile := generatePodManifestFile(t, pm)
-	defer os.Remove(manifestFile)
+		}
+		pm.Annotations = []types.Annotation{{Name: types.ACIdentifier("test"), Value: "test"}}
+		manifestFile := generatePodManifestFile(t, pm)
+		defer os.Remove(manifestFile)
 
-	runCmd := fmt.Sprintf("%s run --pod-manifest=%s", ctx.Cmd(), manifestFile)
-	waitOrFail(t, spawnOrFail(t, runCmd), 0)
+		runCmd := fmt.Sprintf("%s run --pod-manifest=%s", ctx.Cmd(), manifestFile)
+		waitOrFail(t, spawnOrFail(t, runCmd), 0)
 
-	time.Sleep(delta)
+		time.Sleep(delta)
 
-	gcCmd := fmt.Sprintf("%s gc --mark-only=true", ctx.Cmd())
-	waitOrFail(t, spawnOrFail(t, gcCmd), 0)
+		gcCmd := fmt.Sprintf("%s gc --mark-only=true", ctx.Cmd())
+		waitOrFail(t, spawnOrFail(t, gcCmd), 0)
 
-	gcTime := time.Now()
+		gcTime := time.Now()
 
-	// ListPods(detail=false).
-	resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
+		// ListPods(detail=false).
+		resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
 
-	if len(resp.Pods) == 0 {
-		t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
-	}
+		if len(resp.Pods) == 0 {
+			t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
+		}
+
+		for _, p := range resp.Pods {
+			checkPodBasicsWithGCTime(t, ctx, p, gcTime)
+
+			// Test InspectPod().
+			inspectResp, err := c.InspectPod(context.Background(), &v1alpha.InspectPodRequest{Id: p.Id})
+			if err != nil {
+				t.Fatalf("Unexpected error: %v", err)
+			}
+			checkPodDetails(t, ctx, inspectResp.Pod)
 
-	for _, p := range resp.Pods {
-		checkPodBasicsWithGCTime(t, ctx, p, gcTime)
+			// Test Apps.
+			for i, app := range p.Apps {
+				checkAnnotations(t, pm.Apps[i].Annotations, app.Annotations)
+			}
+		}
 
-		// Test InspectPod().
-		inspectResp, err := c.InspectPod(context.Background(), &v1alpha.InspectPodRequest{Id: p.Id})
+		// ListPods(detail=true).
+		resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{Detail: true})
 		if err != nil {
 			t.Fatalf("Unexpected error: %v", err)
 		}
-		checkPodDetails(t, ctx, inspectResp.Pod)
 
-		// Test Apps.
-		for i, app := range p.Apps {
-			checkAnnotations(t, pm.Apps[i].Annotations, app.Annotations)
+		if len(resp.Pods) == 0 {
+			t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
 		}
-	}
-
-	// ListPods(detail=true).
-	resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{Detail: true})
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-
-	if len(resp.Pods) == 0 {
-		t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
-	}
 
-	for _, p := range resp.Pods {
-		checkPodDetails(t, ctx, p)
-	}
+		for _, p := range resp.Pods {
+			checkPodDetails(t, ctx, p)
+		}
+	})
 }
 
 func TestAPIServiceListInspectImages(t *testing.T) {
@@ -445,105 +447,107 @@ func TestAPIServiceListInspectImages(t *testing.T) {
 	}
 }
 
-func TestAPIServiceCgroup(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+func NewAPIServiceCgroupTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
 
-	svc := startAPIService(t, ctx)
-	defer stopAPIService(t, svc)
+		svc := startAPIService(t, ctx)
+		defer stopAPIService(t, svc)
 
-	c, conn := newAPIClientOrFail(t, "localhost:15441")
-	defer conn.Close()
+		c, conn := newAPIClientOrFail(t, "localhost:15441")
+		defer conn.Close()
 
-	aciFileName := patchTestACI("rkt-inspect-interactive.aci", "--exec=/inspect --read-stdin")
-	defer os.Remove(aciFileName)
+		aciFileName := patchTestACI("rkt-inspect-interactive.aci", "--exec=/inspect --read-stdin")
+		defer os.Remove(aciFileName)
 
-	runCmd := fmt.Sprintf("%s --insecure-options=image run --interactive %s", ctx.Cmd(), aciFileName)
-	child := spawnOrFail(t, runCmd)
+		runCmd := fmt.Sprintf("%s --insecure-options=image run --interactive %s", ctx.Cmd(), aciFileName)
+		child := spawnOrFail(t, runCmd)
 
-	var resp *v1alpha.ListPodsResponse
-	var err error
-	done := make(chan struct{})
+		var resp *v1alpha.ListPodsResponse
+		var err error
+		done := make(chan struct{})
 
-	// Wait the pods to be running.
-	go func() {
-		for {
-			// ListPods(detail=false).
-			resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
-			if err != nil {
-				t.Fatalf("Unexpected error: %v", err)
-			}
+		// Wait the pods to be running.
+		go func() {
+			for {
+				// ListPods(detail=false).
+				resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
+				if err != nil {
+					t.Fatalf("Unexpected error: %v", err)
+				}
 
-			if len(resp.Pods) != 0 {
-				allRunning := true
-				for _, p := range resp.Pods {
-					if p.State != v1alpha.PodState_POD_STATE_RUNNING {
-						allRunning = false
-						break
+				if len(resp.Pods) != 0 {
+					allRunning := true
+					for _, p := range resp.Pods {
+						if p.State != v1alpha.PodState_POD_STATE_RUNNING {
+							allRunning = false
+							break
+						}
+					}
+					if allRunning {
+						t.Logf("Pods are running")
+						close(done)
+						return
 					}
 				}
-				if allRunning {
-					t.Logf("Pods are running")
-					close(done)
-					return
-				}
+				t.Logf("Pods are not in RUNNING state")
+				time.Sleep(time.Second)
 			}
-			t.Logf("Pods are not in RUNNING state")
-			time.Sleep(time.Second)
-		}
-	}()
+		}()
 
-	testutils.WaitOrTimeout(t, time.Second*30, done)
+		testutils.WaitOrTimeout(t, time.Second*30, done)
 
-	var cgroups []string
+		var cgroups []string
 
-	for _, p := range resp.Pods {
-		checkPodBasics(t, ctx, p)
+		for _, p := range resp.Pods {
+			checkPodBasics(t, ctx, p)
 
-		// Test InspectPod().
-		inspectResp, err := c.InspectPod(context.Background(), &v1alpha.InspectPodRequest{Id: p.Id})
+			// Test InspectPod().
+			inspectResp, err := c.InspectPod(context.Background(), &v1alpha.InspectPodRequest{Id: p.Id})
+			if err != nil {
+				t.Fatalf("Unexpected error: %v", err)
+			}
+			checkPodDetails(t, ctx, inspectResp.Pod)
+			if p.Cgroup != "" {
+				cgroups = append(cgroups, p.Cgroup)
+			}
+		}
+
+		// ListPods(detail=true). Filter according to the cgroup.
+		resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{
+			Detail:  true,
+			Filters: []*v1alpha.PodFilter{{Cgroups: cgroups}},
+		})
 		if err != nil {
 			t.Fatalf("Unexpected error: %v", err)
 		}
-		checkPodDetails(t, ctx, inspectResp.Pod)
-		if p.Cgroup != "" {
-			cgroups = append(cgroups, p.Cgroup)
-		}
-	}
-
-	// ListPods(detail=true). Filter according to the cgroup.
-	resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{
-		Detail:  true,
-		Filters: []*v1alpha.PodFilter{{Cgroups: cgroups}},
-	})
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-
-	if len(resp.Pods) == 0 {
-		t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
-	}
 
-	for _, p := range resp.Pods {
-		checkPodDetails(t, ctx, p)
-	}
+		if len(resp.Pods) == 0 {
+			t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
+		}
 
-	// Terminate the pod.
-	if err := child.SendLine("Good bye"); err != nil {
-		t.Fatalf("Failed to send message to the pod: %v", err)
-	}
-	waitOrFail(t, child, 0)
+		for _, p := range resp.Pods {
+			checkPodDetails(t, ctx, p)
+		}
 
-	// Check that there's no cgroups returned for non-running pods.
-	cgroups = []string{}
-	resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
-	for _, p := range resp.Pods {
-		checkPodBasics(t, ctx, p)
-		if p.Cgroup != "" {
-			cgroups = append(cgroups, p.Cgroup)
+		// Terminate the pod.
+		if err := child.SendLine("Good bye"); err != nil {
+			t.Fatalf("Failed to send message to the pod: %v", err)
 		}
-	}
-	if len(cgroups) != 0 {
-		t.Errorf("Unexpected cgroup returned by pods: %v", cgroups)
-	}
+		waitOrFail(t, child, 0)
+
+		// Check that there's no cgroups returned for non-running pods.
+		cgroups = []string{}
+		resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{})
+		for _, p := range resp.Pods {
+			checkPodBasics(t, ctx, p)
+			if p.Cgroup != "" {
+				cgroups = append(cgroups, p.Cgroup)
+			}
+		}
+		if len(cgroups) != 0 {
+			t.Errorf("Unexpected cgroup returned by pods: %v", cgroups)
+		}
+	})
 }
diff --git a/tests/rkt_app_isolator_nspawn_test.go b/tests/rkt_app_isolator_nspawn_test.go
new file mode 100644
index 0000000000..c7e53ee02d
--- /dev/null
+++ b/tests/rkt_app_isolator_nspawn_test.go
@@ -0,0 +1,39 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build coreos src
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestCgroups(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	t.Logf("Running test: %v", cgroupsTest.testName)
+
+	aciFileName := patchTestACI("rkt-inspect-isolators.aci", cgroupsTest.aciBuildArgs...)
+	defer os.Remove(aciFileName)
+
+	rktCmd := fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s", ctx.Cmd(), aciFileName)
+	expectedLine := "check-cgroups: SUCCESS"
+	runRktAndCheckOutput(t, rktCmd, expectedLine, false)
+}
diff --git a/tests/rkt_app_isolator_test.go b/tests/rkt_app_isolator_test.go
index c89bfdbb80..d5c6e441d3 100644
--- a/tests/rkt_app_isolator_test.go
+++ b/tests/rkt_app_isolator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
@@ -102,17 +102,3 @@ func TestAppIsolatorCPU(t *testing.T) {
 	expectedLine = "CPU Quota: " + strconv.Itoa(900)
 	runRktAndCheckOutput(t, rktCmd, expectedLine, false)
 }
-
-func TestCgroups(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	t.Logf("Running test: %v", cgroupsTest.testName)
-
-	aciFileName := patchTestACI("rkt-inspect-isolators.aci", cgroupsTest.aciBuildArgs...)
-	defer os.Remove(aciFileName)
-
-	rktCmd := fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s", ctx.Cmd(), aciFileName)
-	expectedLine := "check-cgroups: SUCCESS"
-	runRktAndCheckOutput(t, rktCmd, expectedLine, false)
-}
diff --git a/tests/rkt_auth_test.go b/tests/rkt_auth_test.go
index d3a7ccf88c..33fe70831b 100644
--- a/tests/rkt_auth_test.go
+++ b/tests/rkt_auth_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_caps_kvm_test.go b/tests/rkt_caps_kvm_test.go
new file mode 100644
index 0000000000..b30a108319
--- /dev/null
+++ b/tests/rkt_caps_kvm_test.go
@@ -0,0 +1,27 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build kvm
+
+package main
+
+import "testing"
+
+func TestCaps(t *testing.T) {
+	// KVM is running VMs as stage1 pods, so root has access to all VM options.
+	// The case with access to PID 1 is skipped...
+	// KVM flavor runs systemd stage1 with full capabilities in stage1 (pid=1)
+	// so expect every capability enabled
+	NewCapsTest(true, []int{2}).Execute(t)
+}
diff --git a/tests/rkt_caps_nspawn_test.go b/tests/rkt_caps_nspawn_test.go
new file mode 100644
index 0000000000..c85aa7216e
--- /dev/null
+++ b/tests/rkt_caps_nspawn_test.go
@@ -0,0 +1,23 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build coreos src
+
+package main
+
+import "testing"
+
+func TestCaps(t *testing.T) {
+	NewCapsTest(false, []int{1, 2}).Execute(t)
+}
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index a0a2aec818..961a50f7c8 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
@@ -75,46 +75,54 @@ var capsTests = []struct {
 	},
 }
 
-func TestCaps(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	for i, tt := range capsTests {
-		stage1Args := []string{"--exec=/inspect --print-caps-pid=1 --print-user"}
-		stage2Args := []string{"--exec=/inspect --print-caps-pid=0 --print-user"}
-		if tt.capIsolator != "" {
-			stage1Args = append(stage1Args, "--capability="+tt.capIsolator)
-			stage2Args = append(stage2Args, "--capability="+tt.capIsolator)
-		}
-		stage1FileName := patchTestACI("rkt-inspect-print-caps-stage1.aci", stage1Args...)
-		defer os.Remove(stage1FileName)
-		stage2FileName := patchTestACI("rkt-inspect-print-caps-stage2.aci", stage2Args...)
-		defer os.Remove(stage2FileName)
-		stageFileNames := []string{stage1FileName, stage2FileName}
-
-		for _, stage := range []int{1, 2} {
-			t.Logf("Running test #%v: %v [stage %v]", i, tt.testName, stage)
-
-			cmd := fmt.Sprintf("%s --debug --insecure-options=image run --mds-register=false --set-env=CAPABILITY=%d %s", ctx.Cmd(), int(tt.capa), stageFileNames[stage-1])
-			child := spawnOrFail(t, cmd)
-
-			expectedLine := tt.capa.String()
-			if (stage == 1 && tt.capInStage1Expected) || (stage == 2 && tt.capInStage2Expected) {
-				expectedLine += "=enabled"
-			} else {
-				expectedLine += "=disabled"
-			}
-			if err := expectWithOutput(child, expectedLine); err != nil {
-				t.Fatalf("Expected %q but not found: %v", expectedLine, err)
+// CommonTestCaps creates a new capabilities test fixture for the given stages.
+func NewCapsTest(hasStage1FullCaps bool, stages []int) testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		for i, tt := range capsTests {
+			stage1Args := []string{"--exec=/inspect --print-caps-pid=1 --print-user"}
+			stage2Args := []string{"--exec=/inspect --print-caps-pid=0 --print-user"}
+			if tt.capIsolator != "" {
+				stage1Args = append(stage1Args, "--capability="+tt.capIsolator)
+				stage2Args = append(stage2Args, "--capability="+tt.capIsolator)
 			}
+			stage1FileName := patchTestACI("rkt-inspect-print-caps-stage1.aci", stage1Args...)
+			defer os.Remove(stage1FileName)
+			stage2FileName := patchTestACI("rkt-inspect-print-caps-stage2.aci", stage2Args...)
+			defer os.Remove(stage2FileName)
+			stageFileNames := []string{stage1FileName, stage2FileName}
+
+			for _, stage := range stages {
+				t.Logf("Running test #%v: %v [stage %v]", i, tt.testName, stage)
 
-			if err := expectWithOutput(child, "User: uid=0 euid=0 gid=0 egid=0"); err != nil {
-				t.Fatalf("Expected user 0 but not found: %v", err)
+				cmd := fmt.Sprintf("%s --debug --insecure-options=image run --mds-register=false --set-env=CAPABILITY=%d %s", ctx.Cmd(), int(tt.capa), stageFileNames[stage-1])
+				child := spawnOrFail(t, cmd)
+
+				expectedLine := tt.capa.String()
+
+				capInStage1Expected := tt.capInStage1Expected || hasStage1FullCaps
+
+				if (stage == 1 && capInStage1Expected) || (stage == 2 && tt.capInStage2Expected) {
+					expectedLine += "=enabled"
+				} else {
+					expectedLine += "=disabled"
+				}
+
+				if err := expectWithOutput(child, expectedLine); err != nil {
+					t.Fatalf("Expected %q but not found: %v", expectedLine, err)
+				}
+
+				if err := expectWithOutput(child, "User: uid=0 euid=0 gid=0 egid=0"); err != nil {
+					t.Fatalf("Expected user 0 but not found: %v", err)
+				}
+
+				waitOrFail(t, child, 0)
 			}
-			waitOrFail(t, child, 0)
+			ctx.Reset()
 		}
-		ctx.Reset()
-	}
+	})
 }
 
 func TestCapsNonRoot(t *testing.T) {
diff --git a/tests/rkt_cat_manifest_test.go b/tests/rkt_cat_manifest_test.go
index 6189b97113..89a4c188d9 100644
--- a/tests/rkt_cat_manifest_test.go
+++ b/tests/rkt_cat_manifest_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_env_test.go b/tests/rkt_env_test.go
index da6b7a3804..4d4b583f01 100644
--- a/tests/rkt_env_test.go
+++ b/tests/rkt_env_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_error_output_test.go b/tests/rkt_error_output_test.go
index d9bf374708..153a15ea21 100644
--- a/tests/rkt_error_output_test.go
+++ b/tests/rkt_error_output_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 11aa2a872a..957f2beebb 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index c4e7ca3d7c..4834735668 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index bc53e7c2c0..c7b1b53b39 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_hostname_test.go b/tests/rkt_hostname_test.go
index 4c9508dd5a..a65ad8e3c6 100644
--- a/tests/rkt_hostname_test.go
+++ b/tests/rkt_hostname_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index c83f1875d5..7521a9377f 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 7437911a25..7751fb13cf 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 19661781d2..07ad79f79d 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_extract_test.go b/tests/rkt_image_extract_test.go
index 9ce3b36423..9c8d4fb77b 100644
--- a/tests/rkt_image_extract_test.go
+++ b/tests/rkt_image_extract_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_gc_test.go b/tests/rkt_image_gc_test.go
index 57c5adb2be..3f6e68c747 100644
--- a/tests/rkt_image_gc_test.go
+++ b/tests/rkt_image_gc_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_list_test.go b/tests/rkt_image_list_test.go
index 99c894070f..f9e2a262ed 100644
--- a/tests/rkt_image_list_test.go
+++ b/tests/rkt_image_list_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 6168bbc930..b04233e525 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_rm_test.go b/tests/rkt_image_rm_test.go
index db3d593482..160a01c1ee 100644
--- a/tests/rkt_image_rm_test.go
+++ b/tests/rkt_image_rm_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_interactive_test.go b/tests/rkt_interactive_test.go
index 7cb4fe4ea8..f9c92f9c3a 100644
--- a/tests/rkt_interactive_test.go
+++ b/tests/rkt_interactive_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index 271bf15d51..863eadc473 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_metadata_service_test.go b/tests/rkt_metadata_service_test.go
index 830b3c8218..5bd24a2dc3 100644
--- a/tests/rkt_metadata_service_test.go
+++ b/tests/rkt_metadata_service_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_net_kvm_test.go b/tests/rkt_net_kvm_test.go
new file mode 100644
index 0000000000..59ecb3680d
--- /dev/null
+++ b/tests/rkt_net_kvm_test.go
@@ -0,0 +1,30 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build kvm
+
+package main
+
+import "testing"
+
+func TestNetDefaultPortFwdConnectivity(t *testing.T) {
+	NewNetDefaultPortFwdConnectivityTest(
+		PortFwdCase{"172.16.28.1", "--net=default", true},
+	).Execute(t)
+}
+
+func TestNetCustomPtp(t *testing.T) {
+	// PTP means connection Point-To-Point. That is, connections to other pods/containers should be forbidden
+	NewNetCustomPtpTest(false)
+}
diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
new file mode 100644
index 0000000000..e436727351
--- /dev/null
+++ b/tests/rkt_net_nspawn_test.go
@@ -0,0 +1,59 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build coreos src
+
+package main
+
+import "testing"
+
+func TestNetHost(t *testing.T) {
+	NewNetHostTest().Execute(t)
+}
+
+func TestNetHostConnectivity(t *testing.T) {
+	NewNetHostConnectivityTest().Execute(t)
+}
+
+func TestNetDefaultPortFwdConnectivity(t *testing.T) {
+	NewNetDefaultPortFwdConnectivityTest(
+		PortFwdCase{"172.16.28.1", "--net=default", true},
+		PortFwdCase{"127.0.0.1", "--net=default", true},
+	).Execute(t)
+}
+
+func TestNetNone(t *testing.T) {
+	NewNetNoneTest().Execute(t)
+}
+
+func TestNetCustomMacvlan(t *testing.T) {
+	NewNetCustomMacvlanTest().Execute(t)
+}
+
+func TestNetCustomBridge(t *testing.T) {
+	NewNetCustomBridgeTest().Execute(t)
+}
+
+func TestNetOverride(t *testing.T) {
+	NewNetOverrideTest().Execute(t)
+}
+
+func TestNetCustomPtp(t *testing.T) {
+	// PTP means connection Point-To-Point. That is, connections to other pods/containers should be forbidden
+	NewNetCustomPtpTest(true).Execute(t)
+}
+
+func TestNetDefaultConnectivity(t *testing.T) {
+	NewNetDefaultConnectivityTest().Execute(t)
+}
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index d882c3c93a..3cb7c8d14f 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
@@ -35,33 +35,35 @@ import (
  * ---
  * Container must have the same network namespace as the host
  */
-func TestNetHost(t *testing.T) {
-	testImageArgs := []string{"--exec=/inspect --print-netns"}
-	testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
-	defer os.Remove(testImage)
+func NewNetHostTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		testImageArgs := []string{"--exec=/inspect --print-netns"}
+		testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+		defer os.Remove(testImage)
 
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
 
-	cmd := fmt.Sprintf("%s --net=host --debug --insecure-options=image run --mds-register=false %s", ctx.Cmd(), testImage)
-	child := spawnOrFail(t, cmd)
-	ctx.RegisterChild(child)
-	defer waitOrFail(t, child, 0)
+		cmd := fmt.Sprintf("%s --net=host --debug --insecure-options=image run --mds-register=false %s", ctx.Cmd(), testImage)
+		child := spawnOrFail(t, cmd)
+		ctx.RegisterChild(child)
+		defer waitOrFail(t, child, 0)
 
-	expectedRegex := `NetNS: (net:\[\d+\])`
-	result, out, err := expectRegexWithOutput(child, expectedRegex)
-	if err != nil {
-		t.Fatalf("Error: %v\nOutput: %v", err, out)
-	}
+		expectedRegex := `NetNS: (net:\[\d+\])`
+		result, out, err := expectRegexWithOutput(child, expectedRegex)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+		}
 
-	ns, err := os.Readlink("/proc/self/ns/net")
-	if err != nil {
-		t.Fatalf("Cannot evaluate NetNS symlink: %v", err)
-	}
+		ns, err := os.Readlink("/proc/self/ns/net")
+		if err != nil {
+			t.Fatalf("Cannot evaluate NetNS symlink: %v", err)
+		}
 
-	if nsChanged := ns != result[1]; nsChanged {
-		t.Fatalf("container left host netns")
-	}
+		if nsChanged := ns != result[1]; nsChanged {
+			t.Fatalf("container left host netns")
+		}
+	})
 }
 
 /*
@@ -70,52 +72,54 @@ func TestNetHost(t *testing.T) {
  * Container launches http server which must be reachable by the host via the
  * localhost address
  */
-func TestNetHostConnectivity(t *testing.T) {
-	logger.SetLogger(t)
+func NewNetHostConnectivityTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		logger.SetLogger(t)
 
-	httpPort, err := testutils.GetNextFreePort4()
-	if err != nil {
-		t.Fatalf("%v", err)
-	}
-	httpServeAddr := fmt.Sprintf("0.0.0.0:%v", httpPort)
-	httpGetAddr := fmt.Sprintf("http://127.0.0.1:%v", httpPort)
+		httpPort, err := testutils.GetNextFreePort4()
+		if err != nil {
+			t.Fatalf("%v", err)
+		}
+		httpServeAddr := fmt.Sprintf("0.0.0.0:%v", httpPort)
+		httpGetAddr := fmt.Sprintf("http://127.0.0.1:%v", httpPort)
 
-	testImageArgs := []string{"--exec=/inspect --serve-http=" + httpServeAddr}
-	testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
-	defer os.Remove(testImage)
+		testImageArgs := []string{"--exec=/inspect --serve-http=" + httpServeAddr}
+		testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+		defer os.Remove(testImage)
 
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
 
-	cmd := fmt.Sprintf("%s --net=host --debug --insecure-options=image run --mds-register=false %s", ctx.Cmd(), testImage)
-	child := spawnOrFail(t, cmd)
-	ctx.RegisterChild(child)
+		cmd := fmt.Sprintf("%s --net=host --debug --insecure-options=image run --mds-register=false %s", ctx.Cmd(), testImage)
+		child := spawnOrFail(t, cmd)
+		ctx.RegisterChild(child)
 
-	ga := testutils.NewGoroutineAssistant(t)
-	ga.Add(2)
+		ga := testutils.NewGoroutineAssistant(t)
+		ga.Add(2)
 
-	// Child opens the server
-	go func() {
-		defer ga.Done()
-		ga.WaitOrFail(child)
-	}()
+		// Child opens the server
+		go func() {
+			defer ga.Done()
+			ga.WaitOrFail(child)
+		}()
 
-	// Host connects to the child
-	go func() {
-		defer ga.Done()
-		expectedRegex := `serving on`
-		_, out, err := expectRegexWithOutput(child, expectedRegex)
-		if err != nil {
-			ga.Fatalf("Error: %v\nOutput: %v", err, out)
-		}
-		body, err := testutils.HTTPGet(httpGetAddr)
-		if err != nil {
-			ga.Fatalf("%v\n", err)
-		}
-		t.Logf("HTTP-Get received: %s", body)
-	}()
+		// Host connects to the child
+		go func() {
+			defer ga.Done()
+			expectedRegex := `serving on`
+			_, out, err := expectRegexWithOutput(child, expectedRegex)
+			if err != nil {
+				ga.Fatalf("Error: %v\nOutput: %v", err, out)
+			}
+			body, err := testutils.HTTPGet(httpGetAddr)
+			if err != nil {
+				ga.Fatalf("%v\n", err)
+			}
+			t.Logf("HTTP-Get received: %s", body)
+		}()
 
-	ga.Wait()
+		ga.Wait()
+	})
 }
 
 /*
@@ -123,45 +127,47 @@ func TestNetHostConnectivity(t *testing.T) {
  * ---
  * must be in an empty netns
  */
-func TestNetNone(t *testing.T) {
-	testImageArgs := []string{"--exec=/inspect --print-netns --print-iface-count"}
-	testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
-	defer os.Remove(testImage)
+func NewNetNoneTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		testImageArgs := []string{"--exec=/inspect --print-netns --print-iface-count"}
+		testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+		defer os.Remove(testImage)
 
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
 
-	cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=none --mds-register=false %s", ctx.Cmd(), testImage)
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=none --mds-register=false %s", ctx.Cmd(), testImage)
 
-	child := spawnOrFail(t, cmd)
-	defer waitOrFail(t, child, 0)
-	expectedRegex := `NetNS: (net:\[\d+\])`
-	result, out, err := expectRegexWithOutput(child, expectedRegex)
-	if err != nil {
-		t.Fatalf("Error: %v\nOutput: %v", err, out)
-	}
+		child := spawnOrFail(t, cmd)
+		defer waitOrFail(t, child, 0)
+		expectedRegex := `NetNS: (net:\[\d+\])`
+		result, out, err := expectRegexWithOutput(child, expectedRegex)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+		}
 
-	ns, err := os.Readlink("/proc/self/ns/net")
-	if err != nil {
-		t.Fatalf("Cannot evaluate NetNS symlink: %v", err)
-	}
+		ns, err := os.Readlink("/proc/self/ns/net")
+		if err != nil {
+			t.Fatalf("Cannot evaluate NetNS symlink: %v", err)
+		}
 
-	if nsChanged := ns != result[1]; !nsChanged {
-		t.Fatalf("container did not leave host netns")
-	}
+		if nsChanged := ns != result[1]; !nsChanged {
+			t.Fatalf("container did not leave host netns")
+		}
 
-	expectedRegex = `Interface count: (\d+)`
-	result, out, err = expectRegexWithOutput(child, expectedRegex)
-	if err != nil {
-		t.Fatalf("Error: %v\nOutput: %v", err, out)
-	}
-	ifaceCount, err := strconv.Atoi(result[1])
-	if err != nil {
-		t.Fatalf("Error parsing interface count: %v\nOutput: %v", err, out)
-	}
-	if ifaceCount != 1 {
-		t.Fatalf("Interface count must be 1 not %q", ifaceCount)
-	}
+		expectedRegex = `Interface count: (\d+)`
+		result, out, err = expectRegexWithOutput(child, expectedRegex)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+		}
+		ifaceCount, err := strconv.Atoi(result[1])
+		if err != nil {
+			t.Fatalf("Error parsing interface count: %v\nOutput: %v", err, out)
+		}
+		if ifaceCount != 1 {
+			t.Fatalf("Interface count must be 1 not %q", ifaceCount)
+		}
+	})
 }
 
 /*
@@ -210,71 +216,73 @@ func TestNetDefaultNetNS(t *testing.T) {
  * default network, which is NATed
  * TODO: test connection to host on an outside interface
  */
-func TestNetDefaultConnectivity(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	f := func(argument string) {
-		httpPort, err := testutils.GetNextFreePort4()
-		if err != nil {
-			t.Fatalf("%v", err)
-		}
-		httpServeAddr := fmt.Sprintf("0.0.0.0:%v", httpPort)
-		httpServeTimeout := 30
-
-		nonLoIPv4, err := testutils.GetNonLoIfaceIPv4()
-		if err != nil {
-			t.Fatalf("%v", err)
-		}
-		if nonLoIPv4 == "" {
-			t.Skipf("Can not find any NAT'able IPv4 on the host, skipping..")
-		}
-
-		httpGetAddr := fmt.Sprintf("http://%v:%v", nonLoIPv4, httpPort)
-		t.Log("Telling the child to connect via", httpGetAddr)
-
-		testImageArgs := []string{fmt.Sprintf("--exec=/inspect --get-http=%v", httpGetAddr)}
-		testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
-		defer os.Remove(testImage)
+func NewNetDefaultConnectivityTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
 
-		hostname, err := os.Hostname()
-		if err != nil {
-			t.Fatalf("Error getting hostname: %v", err)
-		}
-
-		ga := testutils.NewGoroutineAssistant(t)
-		ga.Add(2)
+		f := func(argument string) {
+			httpPort, err := testutils.GetNextFreePort4()
+			if err != nil {
+				t.Fatalf("%v", err)
+			}
+			httpServeAddr := fmt.Sprintf("0.0.0.0:%v", httpPort)
+			httpServeTimeout := 30
 
-		// Host opens the server
-		go func() {
-			defer ga.Done()
-			err := testutils.HTTPServe(httpServeAddr, httpServeTimeout)
+			nonLoIPv4, err := testutils.GetNonLoIfaceIPv4()
 			if err != nil {
-				ga.Fatalf("Error during HTTPServe: %v", err)
+				t.Fatalf("%v", err)
+			}
+			if nonLoIPv4 == "" {
+				t.Skipf("Can not find any NAT'able IPv4 on the host, skipping..")
 			}
-		}()
 
-		// Child connects to host
-		go func() {
-			defer ga.Done()
-			cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s --mds-register=false %s", ctx.Cmd(), argument, testImage)
-			child := ga.SpawnOrFail(cmd)
-			defer ga.WaitOrFail(child)
+			httpGetAddr := fmt.Sprintf("http://%v:%v", nonLoIPv4, httpPort)
+			t.Log("Telling the child to connect via", httpGetAddr)
+
+			testImageArgs := []string{fmt.Sprintf("--exec=/inspect --get-http=%v", httpGetAddr)}
+			testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+			defer os.Remove(testImage)
 
-			expectedRegex := `HTTP-Get received: (.*)\r`
-			result, out, err := expectRegexWithOutput(child, expectedRegex)
+			hostname, err := os.Hostname()
 			if err != nil {
-				ga.Fatalf("Error: %v\nOutput: %v", err, out)
-			}
-			if result[1] != hostname {
-				ga.Fatalf("Hostname received by client `%v` doesn't match `%v`", result[1], hostname)
+				t.Fatalf("Error getting hostname: %v", err)
 			}
-		}()
 
-		ga.Wait()
-	}
-	f("--net=default")
-	f("")
+			ga := testutils.NewGoroutineAssistant(t)
+			ga.Add(2)
+
+			// Host opens the server
+			go func() {
+				defer ga.Done()
+				err := testutils.HTTPServe(httpServeAddr, httpServeTimeout)
+				if err != nil {
+					ga.Fatalf("Error during HTTPServe: %v", err)
+				}
+			}()
+
+			// Child connects to host
+			go func() {
+				defer ga.Done()
+				cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s --mds-register=false %s", ctx.Cmd(), argument, testImage)
+				child := ga.SpawnOrFail(cmd)
+				defer ga.WaitOrFail(child)
+
+				expectedRegex := `HTTP-Get received: (.*)\r`
+				result, out, err := expectRegexWithOutput(child, expectedRegex)
+				if err != nil {
+					ga.Fatalf("Error: %v\nOutput: %v", err, out)
+				}
+				if result[1] != hostname {
+					ga.Fatalf("Hostname received by client `%v` doesn't match `%v`", result[1], hostname)
+				}
+			}()
+
+			ga.Wait()
+		}
+		f("--net=default")
+		f("")
+	})
 }
 
 /*
@@ -304,7 +312,7 @@ func TestNetDefaultRestrictedConnectivity(t *testing.T) {
 		cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s --mds-register=false %s", ctx.Cmd(), argument, testImage)
 		child := spawnOrFail(t, cmd)
 
-		expectedRegex := `IPv4: (.*)\r`
+		expectedRegex := `IPv4: (\d+\.\d+\.\d+\.\d+)`
 		result, out, err := expectRegexWithOutput(child, expectedRegex)
 		if err != nil {
 			t.Fatalf("Error: %v\nOutput: %v", err, out)
@@ -340,80 +348,95 @@ func TestNetDefaultRestrictedConnectivity(t *testing.T) {
 	f("--net=default-restricted")
 }
 
-/*
- * Default net port forwarding connectivity
- * ---
- * Container launches http server on all its interfaces
- * Host must be able to connect to container's http server on it's own interfaces
- */
-func TestNetDefaultPortFwdConnectivity(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+type PortFwdCase struct {
+	HttpGetIP     string
+	RktArg        string
+	ShouldSucceed bool
+}
+
+func (ct PortFwdCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
 
 	bannedPorts := make(map[int]struct{}, 0)
-	f := func(httpGetIP string, rktArg string, shouldSucceed bool) {
-		httpPort, err := testutils.GetNextFreePort4Banned(bannedPorts)
-		if err != nil {
-			t.Fatalf("%v", err)
-		}
-		bannedPorts[httpPort] = struct{}{}
+	httpPort, err := testutils.GetNextFreePort4Banned(bannedPorts)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
+	bannedPorts[httpPort] = struct{}{}
 
-		httpServeAddr := fmt.Sprintf("0.0.0.0:%d", httpPort)
-		testImageArgs := []string{
-			fmt.Sprintf("--ports=http,protocol=tcp,port=%d", httpPort),
-			fmt.Sprintf("--exec=/inspect --serve-http=%v", httpServeAddr),
-		}
-		testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
-		defer os.Remove(testImage)
+	httpServeAddr := fmt.Sprintf("0.0.0.0:%d", httpPort)
+	testImageArgs := []string{
+		fmt.Sprintf("--ports=http,protocol=tcp,port=%d", httpPort),
+		fmt.Sprintf("--exec=/inspect --serve-http=%v", httpServeAddr),
+	}
+	testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+	defer os.Remove(testImage)
 
-		cmd := fmt.Sprintf(
-			"%s --debug --insecure-options=image run --port=http:%d %s --mds-register=false %s",
-			ctx.Cmd(), httpPort, rktArg, testImage)
-		child := spawnOrFail(t, cmd)
+	cmd := fmt.Sprintf(
+		"%s --debug --insecure-options=image run --port=http:%d %s --mds-register=false %s",
+		ctx.Cmd(), httpPort, ct.RktArg, testImage)
+	child := spawnOrFail(t, cmd)
 
-		httpGetAddr := fmt.Sprintf("http://%v:%v", httpGetIP, httpPort)
+	httpGetAddr := fmt.Sprintf("http://%v:%v", ct.HttpGetIP, httpPort)
 
-		ga := testutils.NewGoroutineAssistant(t)
-		ga.Add(2)
+	ga := testutils.NewGoroutineAssistant(t)
+	ga.Add(2)
 
-		// Child opens the server
-		go func() {
-			defer ga.Done()
-			ga.WaitOrFail(child)
-		}()
+	// Child opens the server
+	go func() {
+		defer ga.Done()
+		ga.WaitOrFail(child)
+	}()
 
-		// Host connects to the child via the forward port on localhost
-		go func() {
-			defer ga.Done()
-			expectedRegex := `serving on`
-			_, out, err := expectRegexWithOutput(child, expectedRegex)
-			if err != nil {
-				ga.Fatalf("Error: %v\nOutput: %v", err, out)
-			}
-			body, err := testutils.HTTPGet(httpGetAddr)
-			switch {
-			case err != nil && shouldSucceed:
-				ga.Fatalf("%v\n", err)
-			case err == nil && !shouldSucceed:
-				ga.Fatalf("HTTP-Get to %q should have failed! But received %q", httpGetAddr, body)
-			case err != nil && !shouldSucceed:
-				child.Close()
-				fallthrough
-			default:
-				t.Logf("HTTP-Get received: %s", body)
-			}
-		}()
+	// Host connects to the child via the forward port on localhost
+	go func() {
+		defer ga.Done()
+		expectedRegex := `serving on`
+		_, out, err := expectRegexWithOutput(child, expectedRegex)
+		if err != nil {
+			ga.Fatalf("Error: %v\nOutput: %v", err, out)
+		}
+		body, err := testutils.HTTPGet(httpGetAddr)
+		switch {
+		case err != nil && ct.ShouldSucceed:
+			ga.Fatalf("%v\n", err)
+		case err == nil && !ct.ShouldSucceed:
+			ga.Fatalf("HTTP-Get to %q should have failed! But received %q", httpGetAddr, body)
+		case err != nil && !ct.ShouldSucceed:
+			child.Close()
+			fallthrough
+		default:
+			t.Logf("HTTP-Get received: %s", body)
+		}
+	}()
 
-		ga.Wait()
-	}
-	f("172.16.28.1", "--net=default", true)
-	f("127.0.0.1", "--net=default", true)
+	ga.Wait()
 
 	// TODO: ensure that default-restricted is not accessible from non-host
 	// f("172.16.28.1", "--net=default-restricted", true)
 	// f("127.0.0.1", "--net=default-restricted", true)
 }
 
+type portFwdTest []PortFwdCase
+
+func (ct portFwdTest) Execute(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for _, testCase := range ct {
+		testCase.Execute(t, ctx)
+	}
+}
+
+/*
+ * Default net port forwarding connectivity
+ * ---
+ * Container launches http server on all its interfaces
+ * Host must be able to connect to container's http server on it's own interfaces
+ */
+func NewNetDefaultPortFwdConnectivityTest(cases ...PortFwdCase) testutils.Test {
+	return portFwdTest(cases)
+}
+
 func writeNetwork(t *testing.T, net networkTemplateT, netd string) error {
 	var err error
 	path := filepath.Join(netd, net.Name+".conf")
@@ -526,7 +549,7 @@ func testNetCustomDual(t *testing.T, nt networkTemplateT) {
 			ga.Fatalf("Error: %v\nOutput: %v", err, out)
 		}
 		container1IPv4 <- result[1]
-		expectedRegex = `(rkt-.*): serving on`
+		expectedRegex = ` ([a-zA-Z0-9\-]*): serving on`
 		result, out, err = expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
 		if err != nil {
 			ga.Fatalf("Error: %v\nOutput: %v", err, out)
@@ -549,7 +572,7 @@ func testNetCustomDual(t *testing.T, nt networkTemplateT) {
 		defer ga.WaitOrFail(child)
 
 		expectedHostname := <-container1Hostname
-		expectedRegex := `HTTP-Get received: (.*)\r`
+		expectedRegex := `HTTP-Get received: (.*?)\r`
 		result, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 20*time.Second)
 		if err != nil {
 			ga.Fatalf("Error: %v\nOutput: %v", err, out)
@@ -620,7 +643,7 @@ func testNetCustomNatConnectivity(t *testing.T, nt networkTemplateT) {
 		child := ga.SpawnOrFail(cmd)
 		defer ga.WaitOrFail(child)
 
-		expectedRegex := `HTTP-Get received: (.*)\r`
+		expectedRegex := `HTTP-Get received: (.*?)\r`
 		result, out, err := expectRegexWithOutput(child, expectedRegex)
 		if err != nil {
 			ga.Fatalf("Error: %v\nOutput: %v", err, out)
@@ -633,115 +656,125 @@ func testNetCustomNatConnectivity(t *testing.T, nt networkTemplateT) {
 	ga.Wait()
 }
 
-func TestNetCustomPtp(t *testing.T) {
-	nt := networkTemplateT{
-		Name:   "ptp0",
-		Type:   "ptp",
-		IpMasq: true,
-		Ipam: ipamTemplateT{
-			Type:   "host-local",
-			Subnet: "11.11.1.0/24",
-			Routes: []map[string]string{
-				{"dst": "0.0.0.0/0"},
+func NewNetCustomPtpTest(runCustomDual bool) testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		nt := networkTemplateT{
+			Name:   "ptp0",
+			Type:   "ptp",
+			IpMasq: true,
+			Ipam: ipamTemplateT{
+				Type:   "host-local",
+				Subnet: "11.11.1.0/24",
+				Routes: []map[string]string{
+					{"dst": "0.0.0.0/0"},
+				},
 			},
-		},
-	}
-	testNetCustomNatConnectivity(t, nt)
-	testNetCustomDual(t, nt)
+		}
+		testNetCustomNatConnectivity(t, nt)
+		if runCustomDual {
+			testNetCustomDual(t, nt)
+		}
+	})
 }
 
-func TestNetCustomMacvlan(t *testing.T) {
-	iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
-	if err != nil {
-		t.Fatalf("Error while getting non-lo host interface: %v\n", err)
-	}
-	if iface.Name == "" {
-		t.Skipf("Cannot run test without non-lo host interface")
-	}
+func NewNetCustomMacvlanTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
+		if err != nil {
+			t.Fatalf("Error while getting non-lo host interface: %v\n", err)
+		}
+		if iface.Name == "" {
+			t.Skipf("Cannot run test without non-lo host interface")
+		}
 
-	nt := networkTemplateT{
-		Name:   "macvlan0",
-		Type:   "macvlan",
-		Master: iface.Name,
-		Ipam: ipamTemplateT{
-			Type:   "host-local",
-			Subnet: "11.11.2.0/24",
-		},
-	}
-	testNetCustomDual(t, nt)
+		nt := networkTemplateT{
+			Name:   "macvlan0",
+			Type:   "macvlan",
+			Master: iface.Name,
+			Ipam: ipamTemplateT{
+				Type:   "host-local",
+				Subnet: "11.11.2.0/24",
+			},
+		}
+		testNetCustomDual(t, nt)
+	})
 }
 
-func TestNetCustomBridge(t *testing.T) {
-	iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
-	if err != nil {
-		t.Fatalf("Error while getting non-lo host interface: %v\n", err)
-	}
-	if iface.Name == "" {
-		t.Skipf("Cannot run test without non-lo host interface")
-	}
+func NewNetCustomBridgeTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
+		if err != nil {
+			t.Fatalf("Error while getting non-lo host interface: %v\n", err)
+		}
+		if iface.Name == "" {
+			t.Skipf("Cannot run test without non-lo host interface")
+		}
 
-	nt := networkTemplateT{
-		Name:      "bridge0",
-		Type:      "bridge",
-		IpMasq:    true,
-		IsGateway: true,
-		Master:    iface.Name,
-		Ipam: ipamTemplateT{
-			Type:   "host-local",
-			Subnet: "11.11.3.0/24",
-			Routes: []map[string]string{
-				{"dst": "0.0.0.0/0"},
+		nt := networkTemplateT{
+			Name:      "bridge0",
+			Type:      "bridge",
+			IpMasq:    true,
+			IsGateway: true,
+			Master:    iface.Name,
+			Ipam: ipamTemplateT{
+				Type:   "host-local",
+				Subnet: "11.11.3.0/24",
+				Routes: []map[string]string{
+					{"dst": "0.0.0.0/0"},
+				},
 			},
-		},
-	}
-	testNetCustomNatConnectivity(t, nt)
-	testNetCustomDual(t, nt)
+		}
+		testNetCustomNatConnectivity(t, nt)
+		testNetCustomDual(t, nt)
+	})
 }
 
-func TestNetOverride(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+func NewNetOverrideTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
 
-	iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
-	if err != nil {
-		t.Fatalf("Error while getting non-lo host interface: %v\n", err)
-	}
-	if iface.Name == "" {
-		t.Skipf("Cannot run test without non-lo host interface")
-	}
+		iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
+		if err != nil {
+			t.Fatalf("Error while getting non-lo host interface: %v\n", err)
+		}
+		if iface.Name == "" {
+			t.Skipf("Cannot run test without non-lo host interface")
+		}
 
-	nt := networkTemplateT{
-		Name:   "overridemacvlan",
-		Type:   "macvlan",
-		Master: iface.Name,
-		Ipam: ipamTemplateT{
-			Type:   "host-local",
-			Subnet: "11.11.4.0/24",
-		},
-	}
+		nt := networkTemplateT{
+			Name:   "overridemacvlan",
+			Type:   "macvlan",
+			Master: iface.Name,
+			Ipam: ipamTemplateT{
+				Type:   "host-local",
+				Subnet: "11.11.4.0/24",
+			},
+		}
 
-	netdir := prepareTestNet(t, ctx, nt)
-	defer os.RemoveAll(netdir)
+		netdir := prepareTestNet(t, ctx, nt)
+		defer os.RemoveAll(netdir)
 
-	testImageArgs := []string{"--exec=/inspect --print-ipv4=eth0"}
-	testImage := patchTestACI("rkt-inspect-networking1.aci", testImageArgs...)
-	defer os.Remove(testImage)
+		testImageArgs := []string{"--exec=/inspect --print-ipv4=eth0"}
+		testImage := patchTestACI("rkt-inspect-networking1.aci", testImageArgs...)
+		defer os.Remove(testImage)
 
-	expectedIP := "11.11.4.244"
+		expectedIP := "11.11.4.244"
 
-	cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=all --net=\"%s:IP=%s\" --mds-register=false %s", ctx.Cmd(), nt.Name, expectedIP, testImage)
-	child := spawnOrFail(t, cmd)
-	defer waitOrFail(t, child, 0)
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=all --net=\"%s:IP=%s\" --mds-register=false %s", ctx.Cmd(), nt.Name, expectedIP, testImage)
+		child := spawnOrFail(t, cmd)
+		defer waitOrFail(t, child, 0)
 
-	expectedRegex := `IPv4: (\d+\.\d+\.\d+\.\d+)`
-	result, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
-	if err != nil {
-		t.Fatalf("Error: %v\nOutput: %v", err, out)
-		return
-	}
+		expectedRegex := `IPv4: (\d+\.\d+\.\d+\.\d+)`
+		result, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+			return
+		}
 
-	containerIP := result[1]
-	if expectedIP != containerIP {
-		t.Fatalf("overriding IP did not work: Got %q but expected %q", containerIP, expectedIP)
-	}
+		containerIP := result[1]
+		if expectedIP != containerIP {
+			t.Fatalf("overriding IP did not work: Got %q but expected %q", containerIP, expectedIP)
+		}
+	})
 }
diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index e29ce946da..3efe3abc3d 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 7afb21732d..7e46e85d01 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_pid_file_kvm_test.go b/tests/rkt_pid_file_kvm_test.go
new file mode 100644
index 0000000000..8252249b9d
--- /dev/null
+++ b/tests/rkt_pid_file_kvm_test.go
@@ -0,0 +1,30 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build kvm
+
+package main
+
+import "testing"
+
+var pidFileName = "pid"
+
+func TestPidFileDelayedStart(t *testing.T) {
+	NewPidFileDelayedStartTest(pidFileName)
+}
+
+func TestPidFileAbortedStart(t *testing.T) {
+	// For nspawn, the escape character is ^]^]^]. This process will exit with code 1
+	NewPidFileAbortedStartTest(pidFileName, "\001\170", 0)
+}
diff --git a/tests/rkt_pid_file_nspawn_test.go b/tests/rkt_pid_file_nspawn_test.go
new file mode 100644
index 0000000000..7860315124
--- /dev/null
+++ b/tests/rkt_pid_file_nspawn_test.go
@@ -0,0 +1,30 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build coreos src
+
+package main
+
+import "testing"
+
+var pidFileName = "ppid"
+
+func TestPidFileDelayedStart(t *testing.T) {
+	NewPidFileDelayedStartTest(pidFileName)
+}
+
+func TestPidFileAbortedStart(t *testing.T) {
+	// For nspawn, the escape character is ^]^]^]. This process will exit with code 1
+	NewPidFileAbortedStartTest(pidFileName, "\035\035\035", 1)
+}
diff --git a/tests/rkt_pid_file_test.go b/tests/rkt_pid_file_test.go
index d9b88b5636..f56ef2b050 100644
--- a/tests/rkt_pid_file_test.go
+++ b/tests/rkt_pid_file_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
@@ -29,7 +29,7 @@ import (
 	"github.com/coreos/rkt/tests/testutils"
 )
 
-func preparePidFileRace(t *testing.T, ctx *testutils.RktRunCtx, sleepImage string) (*gexpect.ExpectSubprocess, *gexpect.ExpectSubprocess, string, string) {
+func preparePidFileRace(t *testing.T, ctx *testutils.RktRunCtx, pidFileName, sleepImage string) (*gexpect.ExpectSubprocess, *gexpect.ExpectSubprocess, string, string) {
 	// Start the pod
 	runCmd := fmt.Sprintf("%s --debug --insecure-options=image run --mds-register=false --interactive %s", ctx.Cmd(), sleepImage)
 	runChild := spawnOrFail(t, runCmd)
@@ -46,14 +46,14 @@ func preparePidFileRace(t *testing.T, ctx *testutils.RktRunCtx, sleepImage strin
 	}
 	UUID := strings.Split(string(output), "\t")[0]
 
-	pidFileName := filepath.Join(ctx.DataDir(), "pods/run", UUID, "ppid")
-	if _, err := os.Stat(pidFileName); err != nil {
+	pidFileNamePath := filepath.Join(ctx.DataDir(), "pods/run", UUID, pidFileName)
+	if _, err := os.Stat(pidFileNamePath); err != nil {
 		t.Fatalf("Pid file missing: %v", err)
 	}
 
 	// Temporarily move the ppid file away
-	pidFileNameBackup := pidFileName + ".backup"
-	if err := os.Rename(pidFileName, pidFileNameBackup); err != nil {
+	pidFileNameBackup := pidFileNamePath + ".backup"
+	if err := os.Rename(pidFileNamePath, pidFileNameBackup); err != nil {
 		t.Fatalf("Cannot move ppid file away: %v", err)
 	}
 
@@ -65,69 +65,74 @@ func preparePidFileRace(t *testing.T, ctx *testutils.RktRunCtx, sleepImage strin
 	// Enter should be able to wait until the ppid file appears
 	time.Sleep(1 * time.Second)
 
-	return runChild, enterChild, pidFileName, pidFileNameBackup
+	return runChild, enterChild, pidFileNamePath, pidFileNameBackup
 }
 
 // Check that "enter" is able to wait for the ppid file to be created
-func TestPidFileDelayedStart(t *testing.T) {
-	sleepImage := patchTestACI("rkt-inspect-sleep.aci", "--exec=/inspect --read-stdin")
-	defer os.Remove(sleepImage)
-
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	runChild, enterChild, pidFileName, pidFileNameBackup := preparePidFileRace(t, ctx, sleepImage)
-
-	// Restore ppid file so the "enter" command can find it
-	if err := os.Rename(pidFileNameBackup, pidFileName); err != nil {
-		t.Fatalf("Cannot restore ppid file: %v", err)
-	}
-
-	// Now the "enter" command works and can complete
-	if err := expectWithOutput(enterChild, "RktEnterWorksFine"); err != nil {
-		t.Fatalf("Waited for enter to works but failed: %v", err)
-	}
-	if err := enterChild.Wait(); err != nil {
-		t.Fatalf("rkt enter didn't terminate correctly: %v", err)
-	}
-
-	// Terminate the pod
-	if err := runChild.SendLine("Bye"); err != nil {
-		t.Fatalf("rkt couldn't write to the container: %v", err)
-	}
-	if err := expectWithOutput(runChild, "Received text: Bye"); err != nil {
-		t.Fatalf("Expected Bye but not found: %v", err)
-	}
-	if err := runChild.Wait(); err != nil {
-		t.Fatalf("rkt didn't terminate correctly: %v", err)
-	}
+func NewPidFileDelayedStartTest(pidFileName string) testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		sleepImage := patchTestACI("rkt-inspect-sleep.aci", "--exec=/inspect --read-stdin")
+		defer os.Remove(sleepImage)
+
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		runChild, enterChild, pidFileName, pidFileNameBackup := preparePidFileRace(t, ctx, sleepImage, pidFileName)
+
+		// Restore ppid file so the "enter" command can find it
+		if err := os.Rename(pidFileNameBackup, pidFileName); err != nil {
+			t.Fatalf("Cannot restore ppid file: %v", err)
+		}
+
+		// Now the "enter" command works and can complete
+		if err := expectWithOutput(enterChild, "RktEnterWorksFine"); err != nil {
+			t.Fatalf("Waited for enter to works but failed: %v", err)
+		}
+		if err := enterChild.Wait(); err != nil {
+			t.Fatalf("rkt enter didn't terminate correctly: %v", err)
+		}
+
+		// Terminate the pod
+		if err := runChild.SendLine("Bye"); err != nil {
+			t.Fatalf("rkt couldn't write to the container: %v", err)
+		}
+		if err := expectWithOutput(runChild, "Received text: Bye"); err != nil {
+			t.Fatalf("Expected Bye but not found: %v", err)
+		}
+		if err := runChild.Wait(); err != nil {
+			t.Fatalf("rkt didn't terminate correctly: %v", err)
+		}
+	})
 }
 
 // Check that "enter" doesn't wait forever for the ppid file when the pod is terminated
-func TestPidFileAbortedStart(t *testing.T) {
-	sleepImage := patchTestACI("rkt-inspect-sleep.aci", "--exec=/inspect --read-stdin")
-	defer os.Remove(sleepImage)
-
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	runChild, enterChild, _, _ := preparePidFileRace(t, ctx, sleepImage)
-
-	// Terminate the pod with the escape sequence: ^]^]^]
-	if err := runChild.SendLine("\035\035\035"); err != nil {
-		t.Fatalf("Failed to terminate the pod: %v", err)
-	}
-	waitOrFail(t, runChild, 1)
-
-	// Now the "enter" command terminates quickly
-	before := time.Now()
-	if err := enterChild.Wait(); err.Error() != "exit status 1" {
-		t.Fatalf("rkt enter didn't terminate as expected: %v", err)
-	}
-	delay := time.Now().Sub(before)
-	t.Logf("rkt enter terminated %v after the pod was terminated", delay)
-	if delay > time.Second { // 1 second shall be enough: it takes less than 50ms on my computer
-		t.Fatalf("rkt enter didn't terminate quickly enough: %v", delay)
-	}
-
+func NewPidFileAbortedStartTest(pidFileName, escapeSequence string, processExitCode int) testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+
+		sleepImage := patchTestACI("rkt-inspect-sleep.aci", "--exec=/inspect --read-stdin")
+		defer os.Remove(sleepImage)
+
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		runChild, enterChild, _, _ := preparePidFileRace(t, ctx, sleepImage, pidFileName)
+
+		// Terminate the pod with the escape sequence
+		if err := runChild.SendLine(escapeSequence); err != nil {
+			t.Fatalf("Failed to terminate the pod: %v", err)
+		}
+		waitOrFail(t, runChild, processExitCode)
+
+		// Now the "enter" command terminates quickly
+		before := time.Now()
+		if err := enterChild.Wait(); err.Error() != "exit status 1" {
+			t.Fatalf("rkt enter didn't terminate as expected: %v", err)
+		}
+		delay := time.Now().Sub(before)
+		t.Logf("rkt enter terminated %v after the pod was terminated", delay)
+		if delay > time.Second {
+			// 1 second shall be enough: it takes less than 50ms on my computer
+			t.Fatalf("rkt enter didn't terminate quickly enough: %v", delay)
+		}
+	})
 }
diff --git a/tests/rkt_root_commands_test.go b/tests/rkt_root_commands_test.go
index 65917acee9..2a5c1d902c 100644
--- a/tests/rkt_root_commands_test.go
+++ b/tests/rkt_root_commands_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_service_file_test.go b/tests/rkt_service_file_test.go
index 22205cefe2..6150658748 100644
--- a/tests/rkt_service_file_test.go
+++ b/tests/rkt_service_file_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_socket_activation_test.go b/tests/rkt_socket_activation_test.go
index cd37a44b0f..6cf894f552 100644
--- a/tests/rkt_socket_activation_test.go
+++ b/tests/rkt_socket_activation_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
index 847cc95bb9..a4e723d989 100644
--- a/tests/rkt_socket_proxyd_test.go
+++ b/tests/rkt_socket_proxyd_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_stage1_loading_test.go b/tests/rkt_stage1_loading_test.go
index 68d58d15c1..18ba955ba4 100644
--- a/tests/rkt_stage1_loading_test.go
+++ b/tests/rkt_stage1_loading_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_supplementary_gids_test.go b/tests/rkt_supplementary_gids_test.go
index fef54a7c94..b715b9faf4 100644
--- a/tests/rkt_supplementary_gids_test.go
+++ b/tests/rkt_supplementary_gids_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_trust_test.go b/tests/rkt_trust_test.go
index 1a50732512..bf1b5ec8b8 100644
--- a/tests/rkt_trust_test.go
+++ b/tests/rkt_trust_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
index 41d5fa9234..639bc3be54 100644
--- a/tests/rkt_userns_test.go
+++ b/tests/rkt_userns_test.go
@@ -74,31 +74,36 @@ func TestUserns(t *testing.T) {
 			runCmd = strings.Replace(runCmd, "^FILE^", tt.file, -1)
 			runCmd = strings.Replace(runCmd, "^USERNS^", userNsOpt, -1)
 
-			t.Logf("Running 'run' test #%v: %v", i, runCmd)
-			child, err := gexpect.Spawn(runCmd)
-			if err != nil {
-				t.Fatalf("Cannot exec rkt #%v: %v", i, err)
-			}
+			if userNsOpt == "--private-users" {
+				t.Logf("Running 'run' test #%v: %v", i, runCmd)
+				child, err := gexpect.Spawn(runCmd)
+				if err != nil {
+					t.Fatalf("Cannot exec rkt #%v: %v", i, err)
+				}
 
-			err = expectWithOutput(child, tt.file+": mode: "+tt.expectMode)
-			if err != nil {
-				t.Fatalf("Expected %q but not found: %v", tt.expectMode, err)
-			}
-			err = expectWithOutput(child, tt.file+": user: "+tt.expectUid)
-			if err != nil {
-				t.Fatalf("Expected %q but not found: %v", tt.expectUid, err)
-			}
-			err = expectWithOutput(child, tt.file+": group: "+tt.expectGid)
-			if err != nil {
-				t.Fatalf("Expected %q but not found: %v", tt.expectGid, err)
-			}
+				expectedResult := tt.file + `: mode: (\w+.\w+.\w+)`
+				result, _, err := expectRegexWithOutput(child, expectedResult)
+				if err != nil || result[1] != tt.expectMode {
+					t.Fatalf("Expected %q but not found: %v", tt.expectMode, result)
+				}
+				expectedResult = tt.file + `: user: (\d)`
+				result, _, err = expectRegexWithOutput(child, expectedResult)
+				if err != nil || result[0] == tt.expectUid {
+					t.Fatalf("Expected %q but not found: %v", tt.expectUid, result)
+				}
+				expectedResult = tt.file + `: group: (\d)`
+				result, _, err = expectRegexWithOutput(child, expectedResult)
+				if err != nil || result[0] == tt.expectGid {
+					t.Fatalf("Expected %q but not found: %v", tt.expectGid, result)
+				}
 
-			err = child.Wait()
-			if err != nil {
-				t.Fatalf("rkt didn't terminate correctly: %v", err)
-			}
+				err = child.Wait()
+				if err != nil {
+					t.Fatalf("rkt didn't terminate correctly: %v", err)
+				}
 
-			ctx.Reset()
+				ctx.Reset()
+			}
 		}
 	}
 }
diff --git a/tests/rkt_volume_nspawn_test.go b/tests/rkt_volume_nspawn_test.go
new file mode 100644
index 0000000000..e850877ed9
--- /dev/null
+++ b/tests/rkt_volume_nspawn_test.go
@@ -0,0 +1,23 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build coreos src
+
+package main
+
+import "testing"
+
+func TestVolumes(t *testing.T) {
+	NewVolumesTest().Execute(t)
+}
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 2b8882bc27..7fd22e1a8b 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
@@ -96,55 +96,57 @@ var volTests = []struct {
 	},
 }
 
-func TestVolumes(t *testing.T) {
-	readFileImage := patchTestACI("rkt-inspect-read-file.aci", "--exec=/inspect --read-file")
-	defer os.Remove(readFileImage)
-	writeFileImage := patchTestACI("rkt-inspect-write-file.aci", "--exec=/inspect --write-file --read-file")
-	defer os.Remove(writeFileImage)
-	volRwReadFileImage := patchTestACI("rkt-inspect-vol-rw-read-file.aci", "--exec=/inspect --read-file", "--mounts=dir1,path=/dir1,readOnly=false")
-	defer os.Remove(volRwReadFileImage)
-	volRwWriteFileImage := patchTestACI("rkt-inspect-vol-rw-write-file.aci", "--exec=/inspect --write-file --read-file", "--mounts=dir1,path=/dir1,readOnly=false")
-	defer os.Remove(volRwWriteFileImage)
-	volRoReadFileImage := patchTestACI("rkt-inspect-vol-ro-read-file.aci", "--exec=/inspect --read-file", "--mounts=dir1,path=/dir1,readOnly=true")
-	defer os.Remove(volRoReadFileImage)
-	volRoWriteFileImage := patchTestACI("rkt-inspect-vol-ro-write-file.aci", "--exec=/inspect --write-file --read-file", "--mounts=dir1,path=/dir1,readOnly=true")
-	defer os.Remove(volRoWriteFileImage)
-	volAddMountRwImage := patchTestACI("rkt-inspect-vol-add-mount-rw.aci", "--exec=/inspect --write-file --read-file")
-	defer os.Remove(volAddMountRwImage)
-	volAddMountRoImage := patchTestACI("rkt-inspect-vol-add-mount-ro.aci", "--exec=/inspect --write-file --read-file")
-	defer os.Remove(volAddMountRoImage)
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	tmpdir := createTempDirOrPanic("rkt-tests.")
-	defer os.RemoveAll(tmpdir)
-
-	tmpfile := filepath.Join(tmpdir, "file")
-	if err := ioutil.WriteFile(tmpfile, []byte("host"), 0600); err != nil {
-		t.Fatalf("Cannot create temporary file: %v", err)
-	}
+func NewVolumesTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		readFileImage := patchTestACI("rkt-inspect-read-file.aci", "--exec=/inspect --read-file")
+		defer os.Remove(readFileImage)
+		writeFileImage := patchTestACI("rkt-inspect-write-file.aci", "--exec=/inspect --write-file --read-file")
+		defer os.Remove(writeFileImage)
+		volRwReadFileImage := patchTestACI("rkt-inspect-vol-rw-read-file.aci", "--exec=/inspect --read-file", "--mounts=dir1,path=/dir1,readOnly=false")
+		defer os.Remove(volRwReadFileImage)
+		volRwWriteFileImage := patchTestACI("rkt-inspect-vol-rw-write-file.aci", "--exec=/inspect --write-file --read-file", "--mounts=dir1,path=/dir1,readOnly=false")
+		defer os.Remove(volRwWriteFileImage)
+		volRoReadFileImage := patchTestACI("rkt-inspect-vol-ro-read-file.aci", "--exec=/inspect --read-file", "--mounts=dir1,path=/dir1,readOnly=true")
+		defer os.Remove(volRoReadFileImage)
+		volRoWriteFileImage := patchTestACI("rkt-inspect-vol-ro-write-file.aci", "--exec=/inspect --write-file --read-file", "--mounts=dir1,path=/dir1,readOnly=true")
+		defer os.Remove(volRoWriteFileImage)
+		volAddMountRwImage := patchTestACI("rkt-inspect-vol-add-mount-rw.aci", "--exec=/inspect --write-file --read-file")
+		defer os.Remove(volAddMountRwImage)
+		volAddMountRoImage := patchTestACI("rkt-inspect-vol-add-mount-ro.aci", "--exec=/inspect --write-file --read-file")
+		defer os.Remove(volAddMountRoImage)
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		tmpdir := createTempDirOrPanic("rkt-tests.")
+		defer os.RemoveAll(tmpdir)
+
+		tmpfile := filepath.Join(tmpdir, "file")
+		if err := ioutil.WriteFile(tmpfile, []byte("host"), 0600); err != nil {
+			t.Fatalf("Cannot create temporary file: %v", err)
+		}
 
-	for i, tt := range volTests {
-		cmd := strings.Replace(tt.rktCmd, "^TMPDIR^", tmpdir, -1)
-		cmd = strings.Replace(cmd, "^RKT_BIN^", ctx.Cmd(), -1)
-		cmd = strings.Replace(cmd, "^READ_FILE^", readFileImage, -1)
-		cmd = strings.Replace(cmd, "^WRITE_FILE^", writeFileImage, -1)
-		cmd = strings.Replace(cmd, "^VOL_RO_READ_FILE^", volRoReadFileImage, -1)
-		cmd = strings.Replace(cmd, "^VOL_RO_WRITE_FILE^", volRoWriteFileImage, -1)
-		cmd = strings.Replace(cmd, "^VOL_RW_READ_FILE^", volRwReadFileImage, -1)
-		cmd = strings.Replace(cmd, "^VOL_RW_WRITE_FILE^", volRwWriteFileImage, -1)
-		cmd = strings.Replace(cmd, "^VOL_ADD_MOUNT_RW^", volAddMountRwImage, -1)
-		cmd = strings.Replace(cmd, "^VOL_ADD_MOUNT_RO^", volAddMountRoImage, -1)
-
-		t.Logf("Running test #%v", i)
-		child := spawnOrFail(t, cmd)
-		defer waitOrFail(t, child, tt.expectedExit)
-
-		if err := expectTimeoutWithOutput(child, tt.expect, time.Minute); err != nil {
-			fmt.Printf("Command: %s\n", cmd)
-			t.Fatalf("Expected %q but not found #%v: %v", tt.expect, i, err)
+		for i, tt := range volTests {
+			cmd := strings.Replace(tt.rktCmd, "^TMPDIR^", tmpdir, -1)
+			cmd = strings.Replace(cmd, "^RKT_BIN^", ctx.Cmd(), -1)
+			cmd = strings.Replace(cmd, "^READ_FILE^", readFileImage, -1)
+			cmd = strings.Replace(cmd, "^WRITE_FILE^", writeFileImage, -1)
+			cmd = strings.Replace(cmd, "^VOL_RO_READ_FILE^", volRoReadFileImage, -1)
+			cmd = strings.Replace(cmd, "^VOL_RO_WRITE_FILE^", volRoWriteFileImage, -1)
+			cmd = strings.Replace(cmd, "^VOL_RW_READ_FILE^", volRwReadFileImage, -1)
+			cmd = strings.Replace(cmd, "^VOL_RW_WRITE_FILE^", volRwWriteFileImage, -1)
+			cmd = strings.Replace(cmd, "^VOL_ADD_MOUNT_RW^", volAddMountRwImage, -1)
+			cmd = strings.Replace(cmd, "^VOL_ADD_MOUNT_RO^", volAddMountRoImage, -1)
+
+			t.Logf("Running test #%v", i)
+			child := spawnOrFail(t, cmd)
+			defer waitOrFail(t, child, tt.expectedExit)
+
+			if err := expectTimeoutWithOutput(child, tt.expect, time.Minute); err != nil {
+				fmt.Printf("Command: %s\n", cmd)
+				t.Fatalf("Expected %q but not found #%v: %v", tt.expect, i, err)
+			}
 		}
-	}
+	})
 }
 
 var volDockerTests = []struct {

From 2bf0a5020d3409ee515744cebbb88de242629402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 1 Apr 2016 12:09:19 +0200
Subject: [PATCH 0184/1304] functional tests: capture SIGTERM in inspect

In TestService, we start a systemd service running a rkt image that
prints a message every second. Then we stop the unit and check it's not
in the service list.

This was working before because we weren't propagating the exit status
of apps in the pod to the outside.

Now that we do it, stopping the unit file means that SIGTERM will be
sent to nspawn, which will trigger a shutdown of systemd inside the pod,
which means SIGTERM will be sent to all the apps and that makes the
inspect binary exit with a non-zero status. Transient units that exit
with a failed status remain on the services list, so our test fails.

Capture SIGTERM in inspect and return 0 in that case, so the test
passes.
---
 tests/inspect/inspect.go       | 12 ++++++++++++
 tests/rkt_service_file_test.go |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 8e218181ea..dbc0bd4004 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"sort"
 	"strconv"
@@ -70,6 +71,7 @@ var (
 		ServeHTTPTimeout   int
 		PrintIfaceCount    bool
 		PrintAppAnnotation string
+		SilentSigterm      bool
 	}{}
 )
 
@@ -107,6 +109,7 @@ func init() {
 	globalFlagset.IntVar(&globalFlags.ServeHTTPTimeout, "serve-http-timeout", 30, "HTTP Timeout to wait for a client connection")
 	globalFlagset.BoolVar(&globalFlags.PrintIfaceCount, "print-iface-count", false, "Print the interface count")
 	globalFlagset.StringVar(&globalFlags.PrintAppAnnotation, "print-app-annotation", "", "Take an annotation name of the app, and prints its value")
+	globalFlagset.BoolVar(&globalFlags.SilentSigterm, "silent-sigterm", false, "Exit with a success exit status if we receive SIGTERM")
 }
 
 func in(list []int, el int) bool {
@@ -126,6 +129,15 @@ func main() {
 		os.Exit(1)
 	}
 
+	if globalFlags.SilentSigterm {
+		terminateCh := make(chan os.Signal, 1)
+		signal.Notify(terminateCh, syscall.SIGTERM)
+		go func() {
+			<-terminateCh
+			os.Exit(0)
+		}()
+	}
+
 	if globalFlags.PreSleep >= 0 {
 		time.Sleep(time.Duration(globalFlags.PreSleep) * time.Second)
 	}
diff --git a/tests/rkt_service_file_test.go b/tests/rkt_service_file_test.go
index 22205cefe2..0aeee23c9b 100644
--- a/tests/rkt_service_file_test.go
+++ b/tests/rkt_service_file_test.go
@@ -50,7 +50,10 @@ func TestServiceFile(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	opts := "-- --print-msg=HelloWorld --sleep=1000"
+	// we need to add --silent-sigterm so inspect terminates correctly and the
+	// transient service exits successfully so it disappears from the list of
+	// units
+	opts := "-- --silent-sigterm --print-msg=HelloWorld --sleep=1000"
 
 	cmd := fmt.Sprintf("%s --insecure-options=image run --mds-register=false --set-env=MESSAGE_LOOP=1000 %s %s", ctx.Cmd(), image, opts)
 	props := []sd_dbus.Property{

From 17f2bcff2e25175fd2798d70349a8cda94eca21e Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Thu, 28 Apr 2016 14:50:37 +0200
Subject: [PATCH 0185/1304] kvm: fix mounts regression

Cause - AppRootfsPath called with local "root" value was adding
stage1/rootfs twice. After this change this is made properly.

Fixes regression made in df53308, closes #2469
---
 stage1/init/kvm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index cb16b7f26d..19a8e689e5 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -97,7 +97,7 @@ func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.Runtim
 		default:
 			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, vol.Kind)
 		}
-		absAppRootfs, err := filepath.Abs(common.AppRootfsPath(root, appName))
+		absAppRootfs, err := filepath.Abs(common.AppRootfsPath(".", appName))
 		if err != nil {
 			return fmt.Errorf(`could not evaluate absolute path for application rootfs in app: %v`, appName)
 		}

From 8a9e8bdb9fe70ad319c6b6d4db1c4b5d175e0872 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 28 Apr 2016 15:48:13 +0200
Subject: [PATCH 0186/1304] tests: install bc on Semaphore for kvm

The kvm flavor needs 'bc' to build and 'bc' is not installed by default
on Semaphore. This was introduced by https://github.com/coreos/rkt/pull/2007
---
 tests/install-deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/install-deps.sh b/tests/install-deps.sh
index 1b6bff81f1..51baffa4f4 100755
--- a/tests/install-deps.sh
+++ b/tests/install-deps.sh
@@ -25,7 +25,7 @@ if [ "${CI-}" == true ] ; then
 		# install -y <dep>" after it.
 
 		sudo apt-get update -qq || true
-		sudo apt-get install -y libacl1-dev
+		sudo apt-get install -y libacl1-dev bc
 
 		# libmount: https://github.com/systemd/systemd/pull/986#issuecomment-138451264
 		sudo add-apt-repository --yes ppa:pitti/systemd-semaphore

From a011df57a9dd1f1c2b216e0ecc4770435e21b1ff Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Wed, 27 Apr 2016 10:28:13 -0400
Subject: [PATCH 0187/1304] docs: added benchmarks folder, benchmarks for
 v1.4.0

Added the `Documentation/benchmarks` folder which includes a README that
describes how rkt-monitor works and how to use it, and a file detailing
the results of running rkt-monitor on each current workload with rkt
v1.4.0.
---
 Documentation/benchmarks/README.md            | 29 +++++++++++
 .../benchmarks/rkt-1-4-0-benchmarks.md        | 49 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 Documentation/benchmarks/README.md
 create mode 100644 Documentation/benchmarks/rkt-1-4-0-benchmarks.md

diff --git a/Documentation/benchmarks/README.md b/Documentation/benchmarks/README.md
new file mode 100644
index 0000000000..a46fc58ce9
--- /dev/null
+++ b/Documentation/benchmarks/README.md
@@ -0,0 +1,29 @@
+# Benchmarks
+
+rkt has a utility called rkt-monitor that will run rkt with an example
+workload, and track the memory and CPU usage. It does this by exec'ing rkt with
+an ACI or pod manifest, watching the resource consumption for rkt and all
+children processes, and after a timeout killing rkt and printing the results.
+
+## Running the Benchmarks
+
+To run the benchmarks, one must have both a built version of rkt-monitor and an
+ACI or pod manifest. Additionally, rkt must be available on the `PATH`.
+
+To build rkt-monitor, `cd` to `tests/rkt-monitor` and run the `build` script in
+that directory.
+
+To build one of the provided workloads, run any of the `build-*` scripts in
+`tests/rkt-monitor`. All scripts require acbuild to be available on the current
+`PATH`. The script will produce either an ACI, or a directory with multiple
+ACIs and a pod manifest. In the case of the latter, the ACIs in the created
+directory must be imported into rkt's cas before running rkt-monitor, via the
+command `rkt fetch --insecure-options=image <newDirectory>/*`.
+
+With rkt-monitor and an ACI or a pod manifest, now the benchmarks can be run
+via `./rkt-monitor <workload>`.
+
+There are two flags available to influence how rkt-monitor runs. `-v` will
+print out the current resource usage of each process every second. `-d` can be
+used to specify a duration to run the tests for (default of 10s). For example,
+`-d 30s` will run the tests for 30 seconds.
diff --git a/Documentation/benchmarks/rkt-1-4-0-benchmarks.md b/Documentation/benchmarks/rkt-1-4-0-benchmarks.md
new file mode 100644
index 0000000000..1bf729988f
--- /dev/null
+++ b/Documentation/benchmarks/rkt-1-4-0-benchmarks.md
@@ -0,0 +1,49 @@
+```
+derek@proton ~> cat /proc/cpuinfo | grep "model name"
+model name  : Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz
+model name  : Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz
+model name  : Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz
+model name  : Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz
+derek@proton ~> uname -a                             
+Linux proton 4.4.6 #1-NixOS SMP Wed Mar 16 15:43:17 UTC 2016 x86_64 GNU/Linux
+```
+
+## v1.4.0
+
+### log-stresser.aci
+```
+derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor log-stresser.aci
+rkt(18493): seconds alive: 10  avg CPU: 28.314541%  avg Mem: 2 mB  peak Mem: 2 mB
+systemd(18515): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
+systemd-journal(18517): seconds alive: 9  avg CPU: 88.397098%  avg Mem: 7 mB  peak Mem: 7 mB
+worker(18521): seconds alive: 9  avg CPU: 7.330367%  avg Mem: 5 mB  peak Mem: 6 mB
+```
+
+### mem-stresser.aci
+```
+derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor mem-stresser.aci 
+worker(18634): seconds alive: 9  avg CPU: 98.550401%  avg Mem: 318 mB  peak Mem: 555 mB
+rkt(18599): seconds alive: 10  avg CPU: 3.583814%  avg Mem: 2 mB  peak Mem: 2 mB
+systemd(18628): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
+systemd-journal(18630): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB
+```
+
+### cpu-stresser.aci
+```
+derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor cpu-stresser.aci 
+rkt(18706): seconds alive: 10  avg CPU: 3.587050%  avg Mem: 2 mB  peak Mem: 2 mB
+systemd(18736): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
+systemd-journal(18740): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB
+worker(18744): seconds alive: 9  avg CPU: 88.937493%  avg Mem: 808 kB  peak Mem: 808 kB
+```
+
+### too-many-apps.podmanifest
+```
+derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor too-many-apps.podmanifest -d 30s
+# Identical (aside from PID) worker-binary lines removed
+rkt(17227): seconds alive: 20  avg CPU: 9.595387%  avg Mem: 3 mB  peak Mem: 20 mB
+systemd(17253): seconds alive: 17  avg CPU: 0.329028%  avg Mem: 16 mB  peak Mem: 16 mB
+systemd-journal(17255): seconds alive: 17  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB
+worker-binary(17883): seconds alive: 17  avg CPU: 0.000000%  avg Mem: 840 kB  peak Mem: 840 kB
+```
+

From 7afb953f2b9f4547e5d0c078f90e1530416a75de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 28 Apr 2016 16:26:42 +0200
Subject: [PATCH 0188/1304] functional tests: disable problematic tests

We just enabled functional testing for the KVM flavor but there're two
tests that currently don't pass: TestDockerVolumeSemantics and
TestNetLongName.

Disable building the files where those tests are included on the KVM
flavor for now.
---
 tests/rkt_net_test.go    | 3 ++-
 tests/rkt_volume_test.go | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index 98986e8505..5deae13e37 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// TODO: fix TestNetLongName on KVM and add the "kvm" build tag again
+// +build coreos src
 
 package main
 
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 7fd22e1a8b..a7ad758378 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// TODO: fix TestDockerVolumeSemantics on KVM and add the "kvm" build tag again
+// +build coreos src
 
 package main
 

From 9cd12c8407e7797008ca76e3fb60055d9a36a17c Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 28 Apr 2016 17:04:01 +0200
Subject: [PATCH 0189/1304] tests: disable TestNetLongName for kvm

---
 tests/rkt_net_nspawn_test.go | 17 +++++++++++++++++
 tests/rkt_net_test.go        | 19 +------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index e436727351..0662a8f5a3 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -57,3 +57,20 @@ func TestNetCustomPtp(t *testing.T) {
 func TestNetDefaultConnectivity(t *testing.T) {
 	NewNetDefaultConnectivityTest().Execute(t)
 }
+
+// TODO: fix this for kvm, see https://github.com/coreos/rkt/issues/2533
+func TestNetLongName(t *testing.T) {
+	nt := networkTemplateT{
+		Name:   "thisnameiswaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaytoolong",
+		Type:   "ptp",
+		IpMasq: true,
+		Ipam: ipamTemplateT{
+			Type:   "host-local",
+			Subnet: "11.11.6.0/24",
+			Routes: []map[string]string{
+				{"dst": "0.0.0.0/0"},
+			},
+		},
+	}
+	testNetCustomNatConnectivity(t, nt)
+}
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index 5deae13e37..f74dd4bf16 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// TODO: fix TestNetLongName on KVM and add the "kvm" build tag again
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
@@ -784,19 +783,3 @@ func NewNetOverrideTest() testutils.Test {
 		}
 	})
 }
-
-func TestNetLongName(t *testing.T) {
-	nt := networkTemplateT{
-		Name:   "thisnameiswaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaytoolong",
-		Type:   "ptp",
-		IpMasq: true,
-		Ipam: ipamTemplateT{
-			Type:   "host-local",
-			Subnet: "11.11.6.0/24",
-			Routes: []map[string]string{
-				{"dst": "0.0.0.0/0"},
-			},
-		},
-	}
-	testNetCustomNatConnectivity(t, nt)
-}

From 00fe69822c44b3c95ad2976a8e4fe417c20e3425 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 28 Apr 2016 16:52:13 +0200
Subject: [PATCH 0190/1304] tests: enable tests on the 'host' flavor

---
 tests/rkt_ace_validator_test.go       | 2 +-
 tests/rkt_api_service_bench_test.go   | 2 +-
 tests/rkt_api_service_nspawn_test.go  | 2 +-
 tests/rkt_api_service_test.go         | 2 +-
 tests/rkt_app_isolator_nspawn_test.go | 2 +-
 tests/rkt_app_isolator_test.go        | 2 +-
 tests/rkt_auth_test.go                | 2 +-
 tests/rkt_caps_nspawn_test.go         | 2 +-
 tests/rkt_caps_test.go                | 2 +-
 tests/rkt_cat_manifest_test.go        | 2 +-
 tests/rkt_dns_test.go                 | 2 +-
 tests/rkt_env_test.go                 | 2 +-
 tests/rkt_error_output_test.go        | 2 +-
 tests/rkt_etc_hosts_test.go           | 2 +-
 tests/rkt_exec_test.go                | 2 +-
 tests/rkt_exit_test.go                | 2 +-
 tests/rkt_fetch_test.go               | 2 +-
 tests/rkt_gc_test.go                  | 2 +-
 tests/rkt_hostname_test.go            | 2 +-
 tests/rkt_image_cat_manifest_test.go  | 2 +-
 tests/rkt_image_dependencies_test.go  | 2 +-
 tests/rkt_image_export_test.go        | 2 +-
 tests/rkt_image_extract_test.go       | 2 +-
 tests/rkt_image_gc_test.go            | 2 +-
 tests/rkt_image_list_test.go          | 2 +-
 tests/rkt_image_render_test.go        | 2 +-
 tests/rkt_image_rm_test.go            | 2 +-
 tests/rkt_interactive_test.go         | 2 +-
 tests/rkt_list_test.go                | 2 +-
 tests/rkt_metadata_service_test.go    | 2 +-
 tests/rkt_mount_test.go               | 2 +-
 tests/rkt_net_nspawn_test.go          | 2 +-
 tests/rkt_net_test.go                 | 2 +-
 tests/rkt_non_root_test.go            | 2 +-
 tests/rkt_os_arch_test.go             | 2 +-
 tests/rkt_pid_file_nspawn_test.go     | 2 +-
 tests/rkt_pid_file_test.go            | 2 +-
 tests/rkt_root_commands_test.go       | 2 +-
 tests/rkt_run_pod_manifest_test.go    | 2 +-
 tests/rkt_run_user_group_test.go      | 2 +-
 tests/rkt_service_file_test.go        | 2 +-
 tests/rkt_socket_activation_test.go   | 2 +-
 tests/rkt_socket_proxyd_test.go       | 2 +-
 tests/rkt_stage1_loading_test.go      | 2 +-
 tests/rkt_supplementary_gids_test.go  | 2 +-
 tests/rkt_trust_test.go               | 2 +-
 tests/rkt_userns_test.go              | 2 +-
 tests/rkt_volume_nspawn_test.go       | 2 +-
 tests/rkt_volume_test.go              | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/tests/rkt_ace_validator_test.go b/tests/rkt_ace_validator_test.go
index 08f135e759..c7adc5980d 100644
--- a/tests/rkt_ace_validator_test.go
+++ b/tests/rkt_ace_validator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_api_service_bench_test.go b/tests/rkt_api_service_bench_test.go
index 454996c363..bfa522439c 100644
--- a/tests/rkt_api_service_bench_test.go
+++ b/tests/rkt_api_service_bench_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_api_service_nspawn_test.go b/tests/rkt_api_service_nspawn_test.go
index ac591ff6b8..b23c01fee1 100644
--- a/tests/rkt_api_service_nspawn_test.go
+++ b/tests/rkt_api_service_nspawn_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index cd6a7b8ad5..753a9fc914 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_app_isolator_nspawn_test.go b/tests/rkt_app_isolator_nspawn_test.go
index c7e53ee02d..c0e6359526 100644
--- a/tests/rkt_app_isolator_nspawn_test.go
+++ b/tests/rkt_app_isolator_nspawn_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_app_isolator_test.go b/tests/rkt_app_isolator_test.go
index d5c6e441d3..8ef4cd8234 100644
--- a/tests/rkt_app_isolator_test.go
+++ b/tests/rkt_app_isolator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_auth_test.go b/tests/rkt_auth_test.go
index 33fe70831b..e1e28b03d6 100644
--- a/tests/rkt_auth_test.go
+++ b/tests/rkt_auth_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_caps_nspawn_test.go b/tests/rkt_caps_nspawn_test.go
index c85aa7216e..5c3f2e048b 100644
--- a/tests/rkt_caps_nspawn_test.go
+++ b/tests/rkt_caps_nspawn_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index 961a50f7c8..c9fb94be0f 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_cat_manifest_test.go b/tests/rkt_cat_manifest_test.go
index 89a4c188d9..0eb65c1de3 100644
--- a/tests/rkt_cat_manifest_test.go
+++ b/tests/rkt_cat_manifest_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_dns_test.go b/tests/rkt_dns_test.go
index 21903d8df5..9608c12248 100644
--- a/tests/rkt_dns_test.go
+++ b/tests/rkt_dns_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_env_test.go b/tests/rkt_env_test.go
index 4d4b583f01..8456d02204 100644
--- a/tests/rkt_env_test.go
+++ b/tests/rkt_env_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_error_output_test.go b/tests/rkt_error_output_test.go
index 153a15ea21..35555e1394 100644
--- a/tests/rkt_error_output_test.go
+++ b/tests/rkt_error_output_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index 8997b46990..24196cfeee 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 957f2beebb..f48a5b058e 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_exit_test.go b/tests/rkt_exit_test.go
index b4ecc244fa..1370005bbd 100644
--- a/tests/rkt_exit_test.go
+++ b/tests/rkt_exit_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 4834735668..d0c1a453a9 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index c7b1b53b39..00a1c83e78 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_hostname_test.go b/tests/rkt_hostname_test.go
index a65ad8e3c6..a1c007feaa 100644
--- a/tests/rkt_hostname_test.go
+++ b/tests/rkt_hostname_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 7521a9377f..10c26fd32c 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 7751fb13cf..f3f39fa000 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 07ad79f79d..c95eb068eb 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_extract_test.go b/tests/rkt_image_extract_test.go
index 9c8d4fb77b..25189db8ea 100644
--- a/tests/rkt_image_extract_test.go
+++ b/tests/rkt_image_extract_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_gc_test.go b/tests/rkt_image_gc_test.go
index 3f6e68c747..918e8ae114 100644
--- a/tests/rkt_image_gc_test.go
+++ b/tests/rkt_image_gc_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_list_test.go b/tests/rkt_image_list_test.go
index f9e2a262ed..d4f039edc0 100644
--- a/tests/rkt_image_list_test.go
+++ b/tests/rkt_image_list_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index b04233e525..ad272f15b2 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_image_rm_test.go b/tests/rkt_image_rm_test.go
index 160a01c1ee..86e81ac281 100644
--- a/tests/rkt_image_rm_test.go
+++ b/tests/rkt_image_rm_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_interactive_test.go b/tests/rkt_interactive_test.go
index f9c92f9c3a..d00902dd11 100644
--- a/tests/rkt_interactive_test.go
+++ b/tests/rkt_interactive_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index 863eadc473..117930c117 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_metadata_service_test.go b/tests/rkt_metadata_service_test.go
index 5bd24a2dc3..8c8e6d8b10 100644
--- a/tests/rkt_metadata_service_test.go
+++ b/tests/rkt_metadata_service_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index b3ea225dbf..a1f3585540 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index 0662a8f5a3..26203cb2d3 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index f74dd4bf16..3ab3cf0344 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index 3efe3abc3d..3d46c39377 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 7e46e85d01..0bfdf8c1b2 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_pid_file_nspawn_test.go b/tests/rkt_pid_file_nspawn_test.go
index 7860315124..d69fa0dfc1 100644
--- a/tests/rkt_pid_file_nspawn_test.go
+++ b/tests/rkt_pid_file_nspawn_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_pid_file_test.go b/tests/rkt_pid_file_test.go
index f56ef2b050..f8b558ee08 100644
--- a/tests/rkt_pid_file_test.go
+++ b/tests/rkt_pid_file_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_root_commands_test.go b/tests/rkt_root_commands_test.go
index 2a5c1d902c..e1f4ded28d 100644
--- a/tests/rkt_root_commands_test.go
+++ b/tests/rkt_root_commands_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 353a2e2bab..69a72d876a 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
index 5de9e4f028..f98962792e 100644
--- a/tests/rkt_run_user_group_test.go
+++ b/tests/rkt_run_user_group_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_service_file_test.go b/tests/rkt_service_file_test.go
index f806184b2e..0c8bad6ef0 100644
--- a/tests/rkt_service_file_test.go
+++ b/tests/rkt_service_file_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_socket_activation_test.go b/tests/rkt_socket_activation_test.go
index 6cf894f552..33985b6b62 100644
--- a/tests/rkt_socket_activation_test.go
+++ b/tests/rkt_socket_activation_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
index a4e723d989..d7f1a084c9 100644
--- a/tests/rkt_socket_proxyd_test.go
+++ b/tests/rkt_socket_proxyd_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_stage1_loading_test.go b/tests/rkt_stage1_loading_test.go
index 18ba955ba4..ec80852291 100644
--- a/tests/rkt_stage1_loading_test.go
+++ b/tests/rkt_stage1_loading_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_supplementary_gids_test.go b/tests/rkt_supplementary_gids_test.go
index b715b9faf4..2c68edd9f7 100644
--- a/tests/rkt_supplementary_gids_test.go
+++ b/tests/rkt_supplementary_gids_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_trust_test.go b/tests/rkt_trust_test.go
index bf1b5ec8b8..132f93e25c 100644
--- a/tests/rkt_trust_test.go
+++ b/tests/rkt_trust_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src kvm
+// +build host coreos src kvm
 
 package main
 
diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
index 639bc3be54..4b0106e653 100644
--- a/tests/rkt_userns_test.go
+++ b/tests/rkt_userns_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_volume_nspawn_test.go b/tests/rkt_volume_nspawn_test.go
index e850877ed9..bddf30554b 100644
--- a/tests/rkt_volume_nspawn_test.go
+++ b/tests/rkt_volume_nspawn_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build host coreos src
 
 package main
 
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index a7ad758378..a57366f368 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // TODO: fix TestDockerVolumeSemantics on KVM and add the "kvm" build tag again
-// +build coreos src
+// +build host coreos src
 
 package main
 

From b5bf7a0bb4187b83e678041cf1ec8595a3aff314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 29 Apr 2016 11:21:13 +0200
Subject: [PATCH 0191/1304] Revert "stage1/prepare-app: check for user
 namespace env"

This reverts commit ed3afb63826a0229b0adc5b844e2252a6ecea996.
---
 stage1/prepare-app/prepare-app.c | 85 +++++++++++---------------------
 1 file changed, 28 insertions(+), 57 deletions(-)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 912c992394..2731ef54df 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -23,7 +23,6 @@
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <dirent.h>
-#include <inttypes.h>
 
 #define err_out(_fmt, _args...)						\
 		fprintf(stderr, "Error: " _fmt "\n", ##_args);
@@ -53,8 +52,6 @@ static int exit_err;
 #define MACHINE_ID_LEN		lenof("0123456789abcdef0123456789ab")
 #define MACHINE_NAME_LEN	lenof("rkt-01234567-89ab-cdef-0123-456789ab")
 
-#define UNMAPPED ((uid_t) -1)
-
 #ifndef CGROUP2_SUPER_MAGIC
 #define CGROUP2_SUPER_MAGIC 0x63677270
 #endif
@@ -128,78 +125,44 @@ static int ensure_etc_hosts_exists(const char *root, int rootfd) {
 	return 0;
 }
 
-static void mount_at(const char *root, const mount_point *mnt)
-{
-	char to[4096];
-	exit_if(snprintf(to, sizeof(to), "%s/%s", root, mnt->target) >= sizeof(to),
-		"Path too long: \"%s\"", to);
-	pexit_if(mount(mnt->source, to, mnt->type,
-		       mnt->flags, mnt->options) == -1,
-		 "Mounting \"%s\" on \"%s\" failed", mnt->source, to);
-}
-
 static void mount_sys(const char *root)
 {
-	int i;
+	char from[4096];
 	char to[4096];
 	struct statfs fs;
 	DIR *dir = NULL;
 	struct dirent *d;
-	const mount_point mnt_rec = { "/sys", "sys", "bind", NULL, MS_BIND|MS_REC };
-	const mount_point sys_bind_table[] = {
-		{ "/sys", "sys", "bind", NULL, MS_BIND },
-		{ "/sys/fs/cgroup", "sys/fs/cgroup", "bind", NULL, MS_BIND },
-	};
 
 	pexit_if(statfs("/sys/fs/cgroup", &fs) != 0,
 	         "Cannot statfs /sys/fs/cgroup");
 	if (fs.f_type == (typeof(fs.f_type)) CGROUP2_SUPER_MAGIC) {
 		/* With the unified cgroup hierarchy, recursive bind mounts
 		 * are fine. */
-		mount_at(root, &mnt_rec);
+		exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
+			"Path too long: \"%s\"", to);
+		pexit_if(mount("/sys", to, "bind",
+			       MS_BIND | MS_REC, "NULL") == -1,
+				"Mounting \"%s\" on \"%s\" failed", "/sys", to);
 		return;
 	}
 
-	// For security reasons recent Linux kernels do not allow to bind-mount non-recursively
-	// if it would give read-write access to other subdirectories mounted as read-only.
-	// Hence we have to check if we are in a user namespaced environment and bind mount recursively instead.
-	if (access("/proc/1/uid_map", F_OK) == 0) {
-		FILE *f;
-		int k;
-		uid_t uid_base, uid_shift, uid_range;
-
-		pexit_if((f = fopen("/proc/1/uid_map", "re")) == NULL,
-			 "Unable to open /proc/1/uid_map");
-
-		if (sizeof(uid_t) == 4) {
-			k = fscanf(f, "%"PRIu32" %"PRIu32" %"PRIu32,
-				   &uid_base, &uid_shift, &uid_range);
-		} else {
-			k = fscanf(f, "%"PRIu16" %"PRIu16" %"PRIu16,
-				   &uid_base, &uid_shift, &uid_range);
-		}
-		pexit_if(fclose(f) != 0, "Unable to close /proc/1/uid_map");
-		pexit_if(k != 3, "Invalid uid_map format");
-
-		// do a recursive bind mount if we are in a user namespace having a parent namespace set,
-		// i.e. either one of uid base, shift, or the range is set, see user_namespaces(7).
-		if (uid_base != 0 || uid_shift != 0 || uid_range != UNMAPPED) {
-			mount_at(root, &mnt_rec);
-			return;
-		}
-	}
-
 	/* With cgroup-v1, rkt and systemd-nspawn add more cgroup
 	 * bind-mounts to control which files are read-only. To avoid
 	 * a quadratic progression, prepare-app does not bind mount
 	 * /sys recursively. See:
 	 * https://github.com/coreos/rkt/issues/2351 */
-	for (i = 0; i < nelems(sys_bind_table); i++) {
-		mount_at(root, &sys_bind_table[i]);
-	}
+	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
+		"Path too long: \"%s\"", to);
+	pexit_if(mount("/sys", to, "bind",
+		       MS_BIND, "NULL") == -1,
+			"Mounting \"%s\" on \"%s\" failed", "/sys", to);
 
 	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys/fs/cgroup") >= sizeof(to),
 		"Path too long: \"%s\"", to);
+	pexit_if(mount("/sys/fs/cgroup", to, "bind",
+		       MS_BIND, "NULL") == -1,
+			"Mounting \"%s\" on \"%s\" failed", "/sys/fs/cgroup", to);
+
 	pexit_if(!(dir = opendir(to)), "Failed to open directory \"%s\"", to)
 	errno = 0;
 	while ((d = readdir(dir))) {
@@ -210,11 +173,13 @@ static void mount_sys(const char *root)
 		if (strcmp(d->d_name, "..") == 0)
 			continue;
 
-		exit_if(snprintf(to, sizeof(to), "sys/fs/cgroup/%s", d->d_name) >= sizeof(to),
+		exit_if(snprintf(from, sizeof(from), "/sys/fs/cgroup/%s", d->d_name) >= sizeof(from),
+			"Path too long: \"%s\"", from);
+		exit_if(snprintf(to, sizeof(to), "%s/sys/fs/cgroup/%s", root, d->d_name) >= sizeof(to),
 			"Path too long: \"%s\"", to);
-
-		mount_point mnt = { to, to, "bind", NULL, MS_BIND };
-		mount_at(root, &mnt);
+		pexit_if(mount(from, to, "bind",
+			       MS_BIND, "NULL") == -1,
+				"Mounting \"%s\" on \"%s\" failed", from, to);
 	}
 	pexit_if(errno != 0, "Failed to read directory \"%s\"", to);
 	pexit_if(closedir(dir) != 0, "Failed to close directory");
@@ -352,7 +317,13 @@ int main(int argc, char *argv[])
 
 	/* Bind mount directories */
 	for (i = 0; i < nelems(dirs_mount_table); i++) {
-		mount_at(root, &dirs_mount_table[i]);
+		const mount_point *mnt = &dirs_mount_table[i];
+
+		exit_if(snprintf(to, sizeof(to), "%s/%s", root, mnt->target) >= sizeof(to),
+			"Path too long: \"%s\"", to);
+		pexit_if(mount(mnt->source, to, mnt->type,
+			       mnt->flags, mnt->options) == -1,
+				"Mounting \"%s\" on \"%s\" failed", mnt->source, to);
 	}
 
 	/* Bind mount /sys: handled differently, depending on cgroups */

From 3256dae2e25bb0227aa5151b6e3f416b6926a3cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 29 Apr 2016 11:21:18 +0200
Subject: [PATCH 0192/1304] Revert "stage1/prepare-app: avoid recursive
 bind-mounts on /sys"

This reverts commit 41948391606e5b3b03843f5b633f28dc47066077.
---
 stage1/prepare-app/prepare-app.c | 71 +-------------------------------
 1 file changed, 1 insertion(+), 70 deletions(-)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 2731ef54df..30d88173f5 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -21,8 +21,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/vfs.h>
-#include <dirent.h>
 
 #define err_out(_fmt, _args...)						\
 		fprintf(stderr, "Error: " _fmt "\n", ##_args);
@@ -52,10 +50,6 @@ static int exit_err;
 #define MACHINE_ID_LEN		lenof("0123456789abcdef0123456789ab")
 #define MACHINE_NAME_LEN	lenof("rkt-01234567-89ab-cdef-0123-456789ab")
 
-#ifndef CGROUP2_SUPER_MAGIC
-#define CGROUP2_SUPER_MAGIC 0x63677270
-#endif
-
 typedef struct _dir_op_t {
 	const char	*name;
 	mode_t		mode;
@@ -125,66 +119,6 @@ static int ensure_etc_hosts_exists(const char *root, int rootfd) {
 	return 0;
 }
 
-static void mount_sys(const char *root)
-{
-	char from[4096];
-	char to[4096];
-	struct statfs fs;
-	DIR *dir = NULL;
-	struct dirent *d;
-
-	pexit_if(statfs("/sys/fs/cgroup", &fs) != 0,
-	         "Cannot statfs /sys/fs/cgroup");
-	if (fs.f_type == (typeof(fs.f_type)) CGROUP2_SUPER_MAGIC) {
-		/* With the unified cgroup hierarchy, recursive bind mounts
-		 * are fine. */
-		exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
-			"Path too long: \"%s\"", to);
-		pexit_if(mount("/sys", to, "bind",
-			       MS_BIND | MS_REC, "NULL") == -1,
-				"Mounting \"%s\" on \"%s\" failed", "/sys", to);
-		return;
-	}
-
-	/* With cgroup-v1, rkt and systemd-nspawn add more cgroup
-	 * bind-mounts to control which files are read-only. To avoid
-	 * a quadratic progression, prepare-app does not bind mount
-	 * /sys recursively. See:
-	 * https://github.com/coreos/rkt/issues/2351 */
-	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
-		"Path too long: \"%s\"", to);
-	pexit_if(mount("/sys", to, "bind",
-		       MS_BIND, "NULL") == -1,
-			"Mounting \"%s\" on \"%s\" failed", "/sys", to);
-
-	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys/fs/cgroup") >= sizeof(to),
-		"Path too long: \"%s\"", to);
-	pexit_if(mount("/sys/fs/cgroup", to, "bind",
-		       MS_BIND, "NULL") == -1,
-			"Mounting \"%s\" on \"%s\" failed", "/sys/fs/cgroup", to);
-
-	pexit_if(!(dir = opendir(to)), "Failed to open directory \"%s\"", to)
-	errno = 0;
-	while ((d = readdir(dir))) {
-		if (d->d_type != DT_DIR)
-			continue;
-		if (strcmp(d->d_name, ".") == 0)
-			continue;
-		if (strcmp(d->d_name, "..") == 0)
-			continue;
-
-		exit_if(snprintf(from, sizeof(from), "/sys/fs/cgroup/%s", d->d_name) >= sizeof(from),
-			"Path too long: \"%s\"", from);
-		exit_if(snprintf(to, sizeof(to), "%s/sys/fs/cgroup/%s", root, d->d_name) >= sizeof(to),
-			"Path too long: \"%s\"", to);
-		pexit_if(mount(from, to, "bind",
-			       MS_BIND, "NULL") == -1,
-				"Mounting \"%s\" on \"%s\" failed", from, to);
-	}
-	pexit_if(errno != 0, "Failed to read directory \"%s\"", to);
-	pexit_if(closedir(dir) != 0, "Failed to close directory");
-}
-
 int main(int argc, char *argv[])
 {
 	static const char *unlink_paths[] = {
@@ -218,10 +152,10 @@ int main(int argc, char *argv[])
 	};
 	static const mount_point dirs_mount_table[] = {
 		{ "/proc", "/proc", "bind", NULL, MS_BIND|MS_REC },
+		{ "/sys", "/sys", "bind", NULL, MS_BIND|MS_REC },
 		{ "/dev/shm", "/dev/shm", "bind", NULL, MS_BIND },
 		{ "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND },
 		{ "/run/systemd/journal", "/run/systemd/journal", "bind", NULL, MS_BIND },
-		/* /sys is handled separately */
 	};
 	static const mount_point files_mount_table[] = {
 		{ "/etc/rkt-resolv.conf", "/etc/resolv.conf", "bind", NULL, MS_BIND },
@@ -326,9 +260,6 @@ int main(int argc, char *argv[])
 				"Mounting \"%s\" on \"%s\" failed", mnt->source, to);
 	}
 
-	/* Bind mount /sys: handled differently, depending on cgroups */
-	mount_sys(root);
-
 	/* Bind mount files, if the source exists */
 	for (i = 0; i < nelems(files_mount_table); i++) {
 		const mount_point *mnt = &files_mount_table[i];

From 7b408e8a3dafc16cf202e0bde7f449e1eaa6a6bf Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Fri, 29 Apr 2016 12:39:26 +0200
Subject: [PATCH 0193/1304] kvm: fix net long names

Update kvm flavor networking code with bits added in CNI.

Resolves #2533
Reverts #2538
---
 networking/kvm.go            | 12 +++++++-----
 tests/rkt_net_nspawn_test.go | 17 -----------------
 tests/rkt_net_test.go        | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index aa302bd222..2b23a844e1 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -29,6 +29,7 @@ import (
 
 	"github.com/appc/cni/pkg/ip"
 	cnitypes "github.com/appc/cni/pkg/types"
+	cniutils "github.com/appc/cni/pkg/utils"
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 	"github.com/vishvananda/netlink"
@@ -42,7 +43,6 @@ const (
 	defaultBrName     = "kvm-cni0"
 	defaultSubnetFile = "/run/flannel/subnet.env"
 	defaultMTU        = 1500
-	masqComment       = "rkt-lkvm masquerading"
 )
 
 type BridgeNetConf struct {
@@ -541,11 +541,12 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 		}
 
 		if n.conf.IPMasq {
-			chain := getChainName(podID.String(), n.conf.Name)
+			chain := cniutils.FormatChainName(n.conf.Name, podID.String())
+			comment := cniutils.FormatChainName(n.conf.Name, podID.String())
 			if err := ip.SetupIPMasq(&net.IPNet{
 				IP:   n.runtime.IP,
 				Mask: net.IPMask(n.runtime.Mask),
-			}, chain, masqComment); err != nil {
+			}, chain, comment); err != nil {
 				return nil, err
 			}
 		}
@@ -598,11 +599,12 @@ func (n *Networking) teardownKvmNets() {
 		}
 		// remove masquerading if it was prepared
 		if an.conf.IPMasq {
-			chain := getChainName(n.podID.String(), an.conf.Name)
+			chain := cniutils.FormatChainName(an.conf.Name, n.podID.String())
+			comment := cniutils.FormatChainName(an.conf.Name, n.podID.String())
 			err := ip.TeardownIPMasq(&net.IPNet{
 				IP:   an.runtime.IP,
 				Mask: net.IPMask(an.runtime.Mask),
-			}, chain, masqComment)
+			}, chain, comment)
 			if err != nil {
 				stderr.PrintE("error on removing masquerading", err)
 			}
diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index 0662a8f5a3..e436727351 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -57,20 +57,3 @@ func TestNetCustomPtp(t *testing.T) {
 func TestNetDefaultConnectivity(t *testing.T) {
 	NewNetDefaultConnectivityTest().Execute(t)
 }
-
-// TODO: fix this for kvm, see https://github.com/coreos/rkt/issues/2533
-func TestNetLongName(t *testing.T) {
-	nt := networkTemplateT{
-		Name:   "thisnameiswaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaytoolong",
-		Type:   "ptp",
-		IpMasq: true,
-		Ipam: ipamTemplateT{
-			Type:   "host-local",
-			Subnet: "11.11.6.0/24",
-			Routes: []map[string]string{
-				{"dst": "0.0.0.0/0"},
-			},
-		},
-	}
-	testNetCustomNatConnectivity(t, nt)
-}
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index f74dd4bf16..98986e8505 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -783,3 +783,19 @@ func NewNetOverrideTest() testutils.Test {
 		}
 	})
 }
+
+func TestNetLongName(t *testing.T) {
+	nt := networkTemplateT{
+		Name:   "thisnameiswaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaytoolong",
+		Type:   "ptp",
+		IpMasq: true,
+		Ipam: ipamTemplateT{
+			Type:   "host-local",
+			Subnet: "11.11.6.0/24",
+			Routes: []map[string]string{
+				{"dst": "0.0.0.0/0"},
+			},
+		},
+	}
+	testNetCustomNatConnectivity(t, nt)
+}

From 501f87b5cba21e9a366ade539b62f24c2c5f28ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 29 Apr 2016 13:50:53 +0200
Subject: [PATCH 0194/1304] ROADMAP: update

---
 ROADMAP.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 6a38af157a..04fbd596a6 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,20 +9,20 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-### rkt 1.5 (April)
+### rkt 1.6 (May)
 
 - enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
+- app-level seccomp support [#1614](https://github.com/coreos/rkt/issues/1614)
+- more isolation between stage1 and stage2 [#2483](https://github.com/coreos/rkt/issues/2483)
 - user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)
-- `rkt fly` as top-level command [#1889](https://github.com/coreos/rkt/issues/1889)
-- stage1 benchmarking [#1788](https://github.com/coreos/rkt/issues/1788)
-- rkt runs on Fedora with SELinux in enforcing mode
 
-### rkt 1.6 (May)
+### rkt 1.7 (May)
 
 - stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
 - IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
 - full integration with Kubernetes (aka "rktnetes")
 - full integration with `machinectl login` and `systemd-run` [#1463](https://github.com/coreos/rkt/issues/1463)
+- `rkt fly` as top-level command [#1889](https://github.com/coreos/rkt/issues/1889)
+- rkt runs on Fedora with SELinux in enforcing mode
 - packaged for more distributions
-  - Debian [#1307](https://github.com/coreos/rkt/issues/1307)
   - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)

From f0aa9a17b61013c261b247f089dfb0f43fc74615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 29 Apr 2016 14:24:01 +0200
Subject: [PATCH 0195/1304] CHANGELOG: add v1.5.0

---
 CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa51b1fced..6041b43dec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+## v1.5.0
+
+This release switches to pure systemd for running apps within a pod. This lays the foundation to implement enhanced isolation capabilities. For example, starting with v1.5.0, apps are started with more restricted capabilities. User namespace support and the KVM stage1 are not experimental anymore. Resource usage can be benchmarked using the new rkt-monitor tool.
+
+#### New features and UX changes
+
+- stage1: replace appexec with pure systemd ([#2493](https://github.com/coreos/rkt/pull/2493)). Replace functionality implemented in appexec with equivalent systemd options. This allows restricting the capabilities granted to apps in a pod and makes enabling other security features (per-app mount namespaces, seccomp filters...) easier.
+- stage1: restrict capabilities granted to apps ([#2493](https://github.com/coreos/rkt/pull/2493)). Apps in a pod receive now a [smaller set of capabilities](https://github.com/coreos/rkt/blob/v1.5.0/stage1/init/common/pod.go#L67).
+- rkt/image: render images on fetch ([#2398](https://github.com/coreos/rkt/pull/2398)). On systems with overlay fs support, rkt was delaying rendering images to the tree store until they were about to run for the first time which caused that first run to be slow for big images. When fetching as root, render the images right away so the first run is faster.
+
+#### Bug fixes
+
+- kvm: fix mounts regression ([#2530](https://github.com/coreos/rkt/pull/2530)). Cause - AppRootfsPath called with local "root" value was adding
+stage1/rootfs twice. After this change this is made properly.
+- rkt/image: strip "Authorization" on redirects to a different host ([#2465](https://github.com/coreos/rkt/pull/2465)). We now don't pass the "Authorization" header if the redirect goes to a different host, it can leak sensitive information to unexpected third parties.
+- stage1/init: interpret the string "root" as UID/GID 0 ([#2458](https://github.com/coreos/rkt/pull/2458)). This is a special case and it should work even if the image doesn't have /etc/passwd or /etc/group.
+
+#### Improved documentation
+
+- added benchmarks folder, benchmarks for v1.4.0 ([#2520](https://github.com/coreos/rkt/pull/2520)). Added the `Documentation/benchmarks` folder which includes a README that describes how rkt-monitor works and how to use it, and a file detailing the results of running rkt-monitor on each current workload with rkt v1.4.0.
+- minor documentation fixes ([#2455](https://github.com/coreos/rkt/pull/2455), [#2528](https://github.com/coreos/rkt/pull/2528), [#2511](https://github.com/coreos/rkt/pull/2511)).
+
+#### Testing
+
+- kvm: enable functional tests for kvm ([#2007](https://github.com/coreos/rkt/pull/2007)). This includes initial support for running functional tests on the `kvm` flavor.
+
+#### Other changes
+
+- benchmarks: added rkt-monitor benchmarks ([#2324](https://github.com/coreos/rkt/pull/2324)). This includes the code for a golang binary that can start rkt and watch its resource usage and bash scripts for generating a handful of test scenarios.
+- scripts: generate a Debian Sid ACI instead of using the Docker hub image ([#2471](https://github.com/coreos/rkt/pull/2471)). This is the first step to having an official release builder.
+- pkg/sys: add SYS_SYNCFS definition for ppc64/ppc64le ([#2443](https://github.com/coreos/rkt/pull/2443)). Added missing SYS_SYNCFS definition for ppc64 and ppc64le, fixing build failures on those architectures.
+- userns: not experimental anymore ([#2486](https://github.com/coreos/rkt/pull/2486)). Although it requires doing a recursive chown for each app, user namespaces work fine and shouldn't be marked as experimental.
+- kvm: not experimental anymore ([#2485](https://github.com/coreos/rkt/pull/2485)). The kvm flavor was initially introduced in rkt v0.8.0, no reason to mark it as experimental.
+
 ## v1.4.0
 
 This release includes a number of new features and bugfixes like a new config subcommand, man page, and bash completion generation during build time.

From 8aecf0a559417e134803c017d6bf74826486e7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 29 Apr 2016 14:24:18 +0200
Subject: [PATCH 0196/1304] version: bump to v1.5.0

---
 Documentation/getting-started-ubuntu.md | 6 +++---
 Documentation/running-fly-stage1.md     | 4 ++--
 Documentation/running-lkvm-stage1.md    | 4 ++--
 Documentation/subcommands/prepare.md    | 2 +-
 Documentation/subcommands/version.md    | 2 +-
 Documentation/trying-out-rkt.md         | 6 +++---
 configure.ac                            | 2 +-
 scripts/acbuild-rkt-builder.sh          | 2 +-
 scripts/build-rir.sh                    | 2 +-
 tests/empty-image/manifest              | 2 +-
 tests/image/manifest                    | 2 +-
 tests/rkt_exec_test.go                  | 2 +-
 tests/rkt_image_cat_manifest_test.go    | 2 +-
 tests/rkt_image_export_test.go          | 2 +-
 tests/rkt_image_render_test.go          | 2 +-
 tests/rkt_os_arch_test.go               | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
index 99bb2deb81..36506da88e 100644
--- a/Documentation/getting-started-ubuntu.md
+++ b/Documentation/getting-started-ubuntu.md
@@ -15,9 +15,9 @@ vagrant up --provider virtualbox
 vagrant ssh
 sudo -s
 
-wget https://github.com/coreos/rkt/releases/download/v1.4.0/rkt-v1.4.0.tar.gz
-tar xzvf rkt-v1.4.0.tar.gz
-cd rkt-v1.4.0
+wget https://github.com/coreos/rkt/releases/download/v1.5.0/rkt-v1.5.0.tar.gz
+tar xzvf rkt-v1.5.0.tar.gz
+cd rkt-v1.5.0
 ./rkt help
 ```
 
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 7eff0faff9..978adec66e 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.4.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.5.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.4.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.5.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index d527421461..839d14af73 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.4.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.5.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.4.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.5.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 38ae3a3c96..8d0ea0c609 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.4.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.5.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 2c6cb0464a..97257bfdf3 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.4.0
+rkt Version: 1.5.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 138dbe6f3c..57b3361122 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool, and is currently supported on amd64 Linux. A
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.4.0/rkt-v1.4.0.tar.gz
-tar xzvf rkt-v1.4.0.tar.gz
-cd rkt-v1.4.0
+wget https://github.com/coreos/rkt/releases/download/v1.5.0/rkt-v1.5.0.tar.gz
+tar xzvf rkt-v1.5.0.tar.gz
+cd rkt-v1.5.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index d0e36073c0..c726780570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.4.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.5.0], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index d656b1f68b..fd8507d68b 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.4.0+git"}
+IMG_VERSION=${VERSION:-"v1.5.0"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index e9880faa53..d48396b494 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.4.0+git}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.5.0}"
 
 mkdir -p $BUILDDIR
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index c661ca5d17..39f923d290 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.4.0"
+            "value": "1.5.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 7d81c25d1f..14be72f2c8 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.4.0"
+            "value": "1.5.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index f48a5b058e..5c1a5bc11b 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.4.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.5.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 10c26fd32c..9908721e5c 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.4.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index c95eb068eb..2b36d5e04a 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.4.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index ad272f15b2..0510a9bab7 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.4.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 0bfdf8c1b2..adc9b91d30 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.4.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 4bcd4f2cc3e3e837c4a0bf65a9e0730dacab4fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 29 Apr 2016 14:24:18 +0200
Subject: [PATCH 0197/1304] version: bump to v1.5.0+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index c726780570..af0ff4c83e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.5.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.5.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index fd8507d68b..1cbe97ef0d 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.5.0"}
+IMG_VERSION=${VERSION:-"v1.5.0+git"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index d48396b494..d2632ce380 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.5.0}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.5.0+git}"
 
 mkdir -p $BUILDDIR
 

From b927a2464e332ac3f01d76c5c4eaaa822927db5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 29 Apr 2016 18:06:27 +0200
Subject: [PATCH 0198/1304] stage1/init: remove redundant slice

We can just list the values.
---
 stage1/init/common/pod.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 52532f9b46..1f83674670 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -64,7 +64,7 @@ var (
 	// appDefaultCapabilities defines a restricted set of capabilities given to
 	// apps by default.
 	// See https://github.com/appc/spec/issues/598
-	appDefaultCapabilities, _ = types.NewLinuxCapabilitiesRetainSet([]string{
+	appDefaultCapabilities, _ = types.NewLinuxCapabilitiesRetainSet(
 		"CAP_AUDIT_WRITE",
 		"CAP_CHOWN",
 		"CAP_DAC_OVERRIDE",
@@ -78,8 +78,7 @@ var (
 		"CAP_SETGID",
 		"CAP_SETPCAP",
 		"CAP_SETFCAP",
-		"CAP_SYS_CHROOT",
-	}...)
+		"CAP_SYS_CHROOT")
 )
 
 // execEscape uses Golang's string quoting for ", \, \n, and regex for special cases

From 056412c7075783edcce6362bd56933f7f522e7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 29 Apr 2016 18:24:14 +0200
Subject: [PATCH 0199/1304] rkt: don't bail if dataDir doesn't exist when
 evaluating symlinks

It will be created later.
---
 rkt/rkt.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rkt/rkt.go b/rkt/rkt.go
index 1577f3c343..2551f0ad89 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -290,8 +290,12 @@ func calculateDataDir() string {
 	// Resolve symlinks
 	realDataDir, err := filepath.EvalSymlinks(dataDir)
 	if err != nil {
-		stderr.PrintE(fmt.Sprintf("cannot evaluate dataDir %q real path", dataDir), err)
-		os.Exit(1)
+		if os.IsNotExist(err) {
+			realDataDir = dataDir
+		} else {
+			stderr.PrintE(fmt.Sprintf("cannot evaluate dataDir %q real path", dataDir), err)
+			os.Exit(1)
+		}
 	}
 	// If above fails, then use the default.
 	return realDataDir

From c812e245d963249a67fa5a420c1d479e5685468f Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Fri, 29 Apr 2016 15:03:10 +0200
Subject: [PATCH 0200/1304] kvm: fix docker volume semantics

Closes #2534
Reverts #2535
---
 stage1/init/common/mount.go |  8 +++----
 stage1/init/common/pod.go   | 10 ++++----
 stage1/init/kvm.go          | 47 ++++++++++++++-----------------------
 tests/rkt_volume_test.go    |  3 +--
 4 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 2f264b422a..2a9f6e5bf3 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -32,7 +32,7 @@ import (
 // whether it is an implicit empty volume converted from a Docker image.
 type mountWrapper struct {
 	schema.Mount
-	dockerImplicit bool
+	DockerImplicit bool
 }
 
 func isMPReadOnly(mountPoints []types.MountPoint, name types.ACName) bool {
@@ -76,7 +76,7 @@ func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume
 		genMnts = append(genMnts,
 			mountWrapper{
 				Mount:          m,
-				dockerImplicit: false,
+				DockerImplicit: false,
 			})
 	}
 
@@ -114,7 +114,7 @@ func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume
 						Volume: uniqName,
 						Path:   mp.Path,
 					},
-					dockerImplicit: dockerImplicit,
+					DockerImplicit: dockerImplicit,
 				})
 		} else {
 			genMnts = append(genMnts,
@@ -123,7 +123,7 @@ func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume
 						Volume: vol.Name,
 						Path:   mp.Path,
 					},
-					dockerImplicit: false,
+					DockerImplicit: false,
 				})
 		}
 	}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 1f83674670..e428ee286a 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -329,7 +329,7 @@ func lookupPathInsideApp(bin string, paths string, appRootfs string, workDir str
 	for _, path := range appPathsArr {
 		binPath := filepath.Join(path, bin)
 		stage2Path := strings.TrimPrefix(binPath, appRootfs)
-		binRealPath, err := evaluateSymlinksInsideApp(appRootfs, stage2Path)
+		binRealPath, err := EvaluateSymlinksInsideApp(appRootfs, stage2Path)
 		if err != nil {
 			return "", errwrap.Wrap(fmt.Errorf("could not evaluate path %v", stage2Path), err)
 		}
@@ -756,9 +756,9 @@ func PodToSystemd(p *stage1commontypes.Pod, interactive bool, flavor string, pri
 	return nil
 }
 
-// evaluateSymlinksInsideApp tries to resolve symlinks within the path.
+// EvaluateSymlinksInsideApp tries to resolve symlinks within the path.
 // It returns the actual path relative to the app rootfs for the given path.
-func evaluateSymlinksInsideApp(appRootfs, path string) (string, error) {
+func EvaluateSymlinksInsideApp(appRootfs, path string) (string, error) {
 	link := appRootfs
 
 	paths := strings.Split(path, "/")
@@ -840,13 +840,13 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 		// TODO(yifan): This is a temporary fix for systemd-nspawn not handling symlink mounts well.
 		// Could be removed when https://github.com/systemd/systemd/issues/2860 is resolved, and systemd
 		// version is bumped.
-		mntPath, err := evaluateSymlinksInsideApp(appRootfs, m.Path)
+		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Path)
 		if err != nil {
 			return nil, errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Path), err)
 		}
 		mntAbsPath := filepath.Join(appRootfs, mntPath)
 
-		if err := PrepareMountpoints(shPath, mntAbsPath, &vol, m.dockerImplicit); err != nil {
+		if err := PrepareMountpoints(shPath, mntAbsPath, &vol, m.DockerImplicit); err != nil {
 			return nil, err
 		}
 
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index 19a8e689e5..34ee9afb6b 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -21,8 +21,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strconv"
-	"strings"
 	"syscall"
 
 	"github.com/appc/spec/schema"
@@ -70,21 +68,24 @@ func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.Runtim
 	for _, m := range mounts {
 		vol := vols[m.Volume]
 
-		if vol.Kind == "empty" {
-			p := filepath.Join(sharedVolPath, vol.Name.String())
-			if err := os.MkdirAll(p, stage1initcommon.SharedVolPerm); err != nil {
-				return errwrap.Wrap(fmt.Errorf("could not create shared volume %q", vol.Name), err)
-			}
-			if err := os.Chown(p, *vol.UID, *vol.GID); err != nil {
-				return errwrap.Wrap(fmt.Errorf("could not change owner of %q", p), err)
-			}
-			mod, err := strconv.ParseUint(*vol.Mode, 8, 32)
-			if err != nil {
-				return errwrap.Wrap(fmt.Errorf("invalid mode %q for volume %q", *vol.Mode, vol.Name), err)
-			}
-			if err := os.Chmod(p, os.FileMode(mod)); err != nil {
-				return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", p), err)
-			}
+		absRoot, err := filepath.Abs(p.Root) // Absolute path to the pod's rootfs.
+		if err != nil {
+			return errwrap.Wrap(errors.New("could not get pod's root absolute path"), err)
+		}
+
+		absAppRootfs := common.AppRootfsPath(absRoot, appName)
+		if err != nil {
+			return fmt.Errorf(`could not evaluate absolute path for application rootfs in app: %v`, appName)
+		}
+
+		mntPath, err := stage1initcommon.EvaluateSymlinksInsideApp(absAppRootfs, m.Path)
+		if err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Path), err)
+		}
+		absDestination := filepath.Join(absAppRootfs, mntPath)
+		shPath := filepath.Join(sharedVolPath, vol.Name.String())
+		if err := stage1initcommon.PrepareMountpoints(shPath, absDestination, &vol, m.DockerImplicit); err != nil {
+			return err
 		}
 
 		readOnly := stage1initcommon.IsMountReadOnly(vol, app.MountPoints)
@@ -97,18 +98,6 @@ func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.Runtim
 		default:
 			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, vol.Kind)
 		}
-		absAppRootfs, err := filepath.Abs(common.AppRootfsPath(".", appName))
-		if err != nil {
-			return fmt.Errorf(`could not evaluate absolute path for application rootfs in app: %v`, appName)
-		}
-
-		absDestination, err := filepath.Abs(filepath.Join(absAppRootfs, m.Path))
-		if err != nil {
-			return fmt.Errorf(`could not evaluate absolute path for application volume path %q in: %v`, m.Path, appName)
-		}
-		if !strings.HasPrefix(absDestination, absAppRootfs) {
-			return fmt.Errorf("path escapes app's root: %v", absDestination)
-		}
 		if cleanedSource, err := filepath.EvalSymlinks(source); err != nil {
 			return errwrap.Wrap(fmt.Errorf("could not resolve symlink for source: %v", source), err)
 		} else if err := ensureDestinationExists(cleanedSource, absDestination); err != nil {
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index a57366f368..1577ff3fa9 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// TODO: fix TestDockerVolumeSemantics on KVM and add the "kvm" build tag again
-// +build host coreos src
+// +build host coreos src kvm
 
 package main
 

From 8ec7ff5878ff07cb7120810ea6153e803509ea06 Mon Sep 17 00:00:00 2001
From: Shaya Potter <spotter@gmail.com>
Date: Thu, 21 Apr 2016 05:33:39 -0700
Subject: [PATCH 0201/1304] Add Cgroup filter to match all of a pod's sub
 cgroups

---
 api/v1alpha/api.pb.go | 192 +++++++++++++++++++++---------------------
 api/v1alpha/api.proto |   4 +
 rkt/api_service.go    |  17 ++++
 3 files changed, 119 insertions(+), 94 deletions(-)

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index d801049bec..5c4bbf0883 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -407,6 +407,9 @@ type PodFilter struct {
 	Annotations []*KeyValue `protobuf:"bytes,6,rep,name=annotations" json:"annotations,omitempty"`
 	// If not empty, the pods whose cgroup are listed will be returned.
 	Cgroups []string `protobuf:"bytes,7,rep,name=cgroups" json:"cgroups,omitempty"`
+	// If not empty, the pods whose these cgroup belong to will be returned.
+	// i.e. the pod's cgroup is a prefix of the specified cgroup
+	PodSubCgroups []string `protobuf:"bytes,8,rep,name=pod_sub_cgroups" json:"pod_sub_cgroups,omitempty"`
 }
 
 func (m *PodFilter) Reset()                    { *m = PodFilter{} }
@@ -1138,98 +1141,99 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1481 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xcd, 0x72, 0xdb, 0x46,
-	0x12, 0x36, 0x7f, 0xc0, 0x9f, 0x26, 0x4d, 0x91, 0x23, 0xd9, 0xa2, 0xe8, 0x3f, 0x19, 0xbb, 0xeb,
-	0xf2, 0xea, 0xa0, 0xdd, 0xc8, 0x8e, 0x2f, 0xa9, 0x4a, 0x99, 0x96, 0x20, 0x15, 0x63, 0x89, 0x64,
-	0xd1, 0xb4, 0x2b, 0x3e, 0xa1, 0x20, 0x72, 0x28, 0xa3, 0x04, 0x02, 0x08, 0x00, 0xca, 0x56, 0x8e,
-	0x39, 0xe5, 0x96, 0x47, 0xc8, 0x33, 0xe4, 0x94, 0x63, 0xde, 0x25, 0x55, 0x79, 0x8f, 0xf4, 0x0c,
-	0x06, 0xc0, 0x00, 0x04, 0x0f, 0xb9, 0x89, 0xdd, 0x3d, 0x5f, 0x7f, 0xdd, 0xd3, 0xfd, 0x0d, 0x04,
-	0x75, 0xc3, 0x35, 0x0f, 0x5d, 0xcf, 0x09, 0x1c, 0x52, 0xbd, 0xf9, 0xca, 0xb0, 0xdc, 0x4f, 0x86,
-	0xfa, 0x1a, 0x1a, 0x83, 0xa5, 0x71, 0x45, 0x4f, 0x1d, 0x6f, 0x69, 0x04, 0x64, 0x1f, 0xca, 0xc1,
-	0xad, 0x4b, 0xbb, 0x85, 0xfd, 0xc2, 0xf3, 0xd6, 0x11, 0x39, 0x14, 0x61, 0x87, 0x3c, 0x66, 0x8a,
-	0x1e, 0xb2, 0x05, 0xd5, 0x1b, 0xea, 0xf9, 0xa6, 0x63, 0x77, 0x8b, 0x18, 0x54, 0x57, 0xff, 0x28,
-	0x80, 0xc2, 0xdd, 0xe4, 0xbf, 0xd0, 0xb8, 0x34, 0x7c, 0xaa, 0x2f, 0x38, 0x16, 0xc7, 0x68, 0x1c,
-	0xed, 0xa4, 0x31, 0x44, 0x1e, 0x80, 0xa2, 0x39, 0x0f, 0x01, 0x48, 0x13, 0xca, 0xb6, 0xb1, 0xa4,
-	0xdd, 0x12, 0xff, 0x25, 0xe1, 0x97, 0xb9, 0xa1, 0x0b, 0x6d, 0x73, 0xe9, 0x3a, 0x5e, 0xa0, 0x07,
-	0xe6, 0x92, 0xfa, 0x81, 0xb1, 0x74, 0xbb, 0x0a, 0x7a, 0x4a, 0xa4, 0x0d, 0xb5, 0xa5, 0x61, 0x9b,
-	0x0b, 0x34, 0x76, 0x2b, 0x68, 0x69, 0x32, 0x28, 0xdf, 0xfc, 0x91, 0x76, 0xab, 0xdc, 0xff, 0x0c,
-	0x1a, 0x86, 0x6d, 0x3b, 0x81, 0x11, 0x20, 0x9a, 0xdf, 0xad, 0xed, 0x97, 0x90, 0x4f, 0x27, 0xe6,
-	0xf3, 0x96, 0xde, 0x7e, 0x30, 0xac, 0x15, 0x55, 0x5f, 0x40, 0x75, 0x48, 0x83, 0xcf, 0x8e, 0x77,
-	0x1d, 0x73, 0x29, 0x44, 0xcc, 0x4c, 0xf7, 0xe6, 0x65, 0xc2, 0x13, 0x7f, 0xbd, 0x0a, 0x79, 0xaa,
-	0xbf, 0x14, 0xa0, 0xd4, 0x77, 0xdd, 0xcc, 0x89, 0x47, 0xa0, 0x98, 0xac, 0x4c, 0x7e, 0xa4, 0x71,
-	0xd4, 0x4a, 0x17, 0x8f, 0xed, 0x55, 0xb0, 0x80, 0x20, 0xac, 0xb5, 0x25, 0x71, 0x41, 0xa4, 0x77,
-	0xcc, 0x41, 0x3a, 0x50, 0xa7, 0x5f, 0xcc, 0x40, 0x9f, 0x39, 0x73, 0xca, 0x1b, 0xd0, 0xc9, 0x96,
-	0xa1, 0x6c, 0x2a, 0xe3, 0xe7, 0x22, 0x94, 0xc6, 0xce, 0x5c, 0xf4, 0x36, 0xe4, 0xd3, 0x80, 0x92,
-	0x2b, 0x1a, 0xdd, 0xd9, 0x9c, 0x1d, 0x4f, 0x85, 0xd9, 0x7b, 0x50, 0x36, 0x5c, 0xd7, 0xc7, 0xc4,
-	0x2c, 0x47, 0x53, 0xa6, 0x47, 0x54, 0xa8, 0xd9, 0x61, 0x97, 0x22, 0x0e, 0xed, 0xd8, 0x1f, 0xb5,
-	0x6f, 0xfd, 0x46, 0x32, 0xe4, 0xab, 0x1b, 0xc8, 0x93, 0x16, 0x54, 0x66, 0x57, 0x9e, 0xb3, 0x72,
-	0xf1, 0x9a, 0x18, 0x71, 0xac, 0x62, 0xe6, 0x51, 0xe4, 0x34, 0xd7, 0x71, 0x94, 0xea, 0xfc, 0x3e,
-	0xd1, 0x86, 0xfc, 0x3d, 0x61, 0x03, 0x6e, 0xdb, 0x81, 0xe6, 0xd5, 0x4c, 0x5f, 0x1a, 0xde, 0x75,
-	0x68, 0x6d, 0x30, 0xab, 0xfa, 0x0c, 0x6a, 0x31, 0x32, 0xb6, 0x00, 0xff, 0x16, 0xfd, 0xb8, 0x0b,
-	0xca, 0x0d, 0xb3, 0x8a, 0xd9, 0xfd, 0xad, 0x00, 0x75, 0x2c, 0xfe, 0xd4, 0xb4, 0x02, 0xea, 0xb1,
-	0x48, 0x73, 0xee, 0x63, 0x64, 0x09, 0x23, 0x9f, 0x42, 0x85, 0x37, 0xcb, 0xc7, 0xd0, 0x52, 0x7e,
-	0xb7, 0x3a, 0x6c, 0xa3, 0x5c, 0x9d, 0x5d, 0xbf, 0x8f, 0x3d, 0x65, 0xa7, 0xd0, 0xc4, 0xef, 0x5f,
-	0x67, 0x40, 0x65, 0x6e, 0xba, 0x07, 0x77, 0x45, 0xdf, 0x44, 0xa4, 0xc2, 0xcd, 0x99, 0xc6, 0x54,
-	0x36, 0x35, 0x06, 0xf7, 0x21, 0x6c, 0x4c, 0xd8, 0xbc, 0xba, 0xfa, 0x67, 0x21, 0x5a, 0xd9, 0x1c,
-	0xd6, 0x78, 0x01, 0xae, 0x47, 0x17, 0xe6, 0x17, 0xc1, 0x9b, 0x37, 0x92, 0x2f, 0xa5, 0xcc, 0x12,
-	0xa3, 0xae, 0xe9, 0x2d, 0x52, 0x8a, 0x49, 0x62, 0xb5, 0x96, 0x71, 0x49, 0xad, 0xcd, 0xe3, 0x45,
-	0xee, 0x43, 0x2b, 0xdc, 0x43, 0xd6, 0xe8, 0x05, 0x66, 0xe6, 0x37, 0x5c, 0x22, 0xbb, 0xb0, 0x15,
-	0xdb, 0x2f, 0x29, 0xee, 0xfe, 0x3f, 0x5c, 0x3f, 0xc6, 0x70, 0xb1, 0xb2, 0x2c, 0xc1, 0xb0, 0xce,
-	0x8b, 0xfc, 0x15, 0x8b, 0x3c, 0xb3, 0x9c, 0x4b, 0xc3, 0x3a, 0xb5, 0x8c, 0x2b, 0x9f, 0x15, 0x39,
-	0x37, 0x3d, 0x71, 0x89, 0x7b, 0xd0, 0xf1, 0x6f, 0xfd, 0x80, 0x2e, 0x71, 0x4b, 0xec, 0x85, 0x79,
-	0xa5, 0x33, 0x57, 0x31, 0x12, 0x0b, 0xcb, 0x99, 0x19, 0x96, 0xec, 0x09, 0x75, 0x05, 0x69, 0xae,
-	0x7c, 0xea, 0xc9, 0x8e, 0x50, 0x5f, 0x58, 0x5d, 0xb6, 0x4f, 0x67, 0x2b, 0x0f, 0x95, 0x8b, 0x25,
-	0xe3, 0xea, 0xc2, 0x56, 0xf9, 0x5e, 0xe0, 0xad, 0xfc, 0x40, 0xc7, 0x56, 0xf9, 0xfa, 0xc2, 0x73,
-	0x96, 0xfa, 0xa7, 0x20, 0x70, 0x7d, 0x5e, 0x76, 0x4d, 0xf5, 0xa0, 0x3c, 0xb0, 0x17, 0x0e, 0xd9,
-	0x86, 0x86, 0x77, 0x1d, 0xe8, 0x91, 0x66, 0x85, 0x0c, 0x71, 0x2a, 0x71, 0x32, 0x66, 0x7a, 0x4a,
-	0x29, 0x59, 0x28, 0x2a, 0x70, 0x6c, 0x0c, 0x79, 0x1d, 0xe0, 0x00, 0xf3, 0x42, 0x45, 0xf2, 0x72,
-	0x46, 0x35, 0xa5, 0x2e, 0x60, 0x4e, 0x45, 0xbb, 0xa1, 0xf6, 0x66, 0x99, 0xe6, 0x5e, 0x2e, 0xd3,
-	0x19, 0x81, 0x65, 0xf4, 0x45, 0x42, 0xfc, 0xc5, 0x84, 0x94, 0x27, 0x2a, 0x91, 0x27, 0x50, 0x9e,
-	0x1b, 0x81, 0xb1, 0x59, 0x55, 0x02, 0x68, 0x70, 0x54, 0x31, 0x6d, 0x4f, 0x41, 0x61, 0x99, 0xc3,
-	0x79, 0xcb, 0x4f, 0x2d, 0x06, 0x32, 0x1c, 0x3f, 0x5c, 0x38, 0x79, 0xf2, 0xd8, 0x0a, 0x9b, 0xf6,
-	0x8c, 0xea, 0x12, 0x05, 0xb4, 0xad, 0xec, 0xc0, 0xb4, 0x42, 0x1b, 0x97, 0x76, 0xb5, 0x0d, 0xad,
-	0x33, 0x1a, 0xb0, 0x06, 0x4f, 0xe8, 0x0f, 0x2b, 0x94, 0x13, 0xf5, 0x10, 0xb6, 0x62, 0x8b, 0xef,
-	0xe2, 0x40, 0x51, 0xf2, 0x00, 0x05, 0x19, 0x7f, 0x8b, 0x87, 0xe6, 0x6e, 0xa2, 0xb5, 0x68, 0x54,
-	0x4f, 0x61, 0xeb, 0xdc, 0xf4, 0x03, 0x5c, 0x56, 0x5f, 0x40, 0x90, 0x7f, 0x41, 0x75, 0xc1, 0xab,
-	0x08, 0xd9, 0x37, 0x24, 0xf6, 0x89, 0x08, 0xa0, 0x10, 0xcd, 0x69, 0x60, 0x98, 0x16, 0x6f, 0x5e,
-	0x0d, 0xf3, 0xb6, 0x13, 0x1c, 0x91, 0x18, 0x65, 0xd2, 0x75, 0xe6, 0x11, 0x4a, 0x53, 0x46, 0x51,
-	0x9f, 0x40, 0x67, 0x60, 0xfb, 0x2e, 0x9d, 0xb1, 0x23, 0x51, 0x66, 0x49, 0x92, 0xd5, 0xff, 0x01,
-	0x91, 0x03, 0x04, 0xe4, 0x1e, 0x0a, 0xb5, 0x33, 0x17, 0xa5, 0xa4, 0x11, 0xbf, 0x83, 0x0e, 0x63,
-	0xc0, 0x77, 0x3e, 0xae, 0xe5, 0x3f, 0xd9, 0x5a, 0xb2, 0xef, 0x6c, 0x7e, 0x35, 0x2f, 0x81, 0xc8,
-	0x58, 0x22, 0xf9, 0x63, 0xa8, 0x70, 0xd5, 0x8a, 0xb0, 0x32, 0xcf, 0x96, 0xfa, 0x14, 0xb6, 0x05,
-	0x65, 0xfe, 0x3b, 0xaf, 0xaa, 0xaf, 0x61, 0x27, 0x1d, 0x22, 0xa0, 0xe3, 0x07, 0xb1, 0x90, 0xf7,
-	0x20, 0xaa, 0xdf, 0xc0, 0x36, 0xe3, 0x43, 0x6d, 0x3e, 0x3e, 0x71, 0x75, 0xff, 0x86, 0x4a, 0x58,
-	0xdd, 0xda, 0x47, 0x84, 0x34, 0x8b, 0xea, 0x2b, 0xd8, 0x49, 0x1f, 0x4e, 0xca, 0xa1, 0xdc, 0xb2,
-	0x56, 0x0e, 0x0f, 0x54, 0x6f, 0xf9, 0x70, 0x9d, 0x3b, 0x57, 0x71, 0x3e, 0x6c, 0x13, 0x76, 0x5f,
-	0x8f, 0x9f, 0x4d, 0x14, 0xc8, 0x48, 0xd9, 0xc5, 0x0e, 0xe1, 0x1c, 0x5b, 0xa6, 0xcd, 0xe7, 0xb8,
-	0xf0, 0x5c, 0x61, 0x07, 0x16, 0x8e, 0x65, 0x39, 0x9f, 0xf9, 0x0c, 0xd7, 0x32, 0x73, 0xad, 0xe4,
-	0xcc, 0x35, 0x17, 0x4b, 0x75, 0x9f, 0x4f, 0x71, 0x98, 0x5a, 0xb0, 0x8d, 0x91, 0xb9, 0x82, 0x1f,
-	0x50, 0xa8, 0x27, 0x1f, 0x5b, 0x5d, 0xec, 0xea, 0x45, 0xff, 0x4c, 0xd3, 0xa7, 0x1f, 0xc7, 0x9a,
-	0xfe, 0x7e, 0x78, 0xa2, 0x9d, 0x0e, 0x86, 0xda, 0x49, 0xfb, 0x0e, 0x6a, 0xc9, 0x96, 0xe4, 0xe9,
-	0x8f, 0xc7, 0xc7, 0xed, 0x02, 0x3e, 0x35, 0x1d, 0xc9, 0x78, 0x32, 0x3a, 0x7e, 0xab, 0x4d, 0xda,
-	0x45, 0x24, 0xd2, 0x92, 0xcc, 0xa3, 0xe3, 0x41, 0xbb, 0x74, 0x30, 0x86, 0x5a, 0xfc, 0xcd, 0xb1,
-	0x0b, 0xdb, 0x08, 0xa0, 0xbf, 0x9b, 0xf6, 0xa7, 0xe9, 0x24, 0x88, 0x97, 0x38, 0x26, 0xef, 0x87,
-	0xc3, 0xc1, 0xf0, 0x0c, 0xd3, 0xec, 0x40, 0x3b, 0x31, 0x6b, 0xdf, 0x0f, 0xa6, 0x18, 0x5c, 0x3c,
-	0xf8, 0xab, 0x00, 0xb5, 0xf8, 0x69, 0x44, 0xc8, 0xf1, 0xe8, 0x24, 0x07, 0x12, 0xcf, 0x26, 0x0e,
-	0xed, 0xe2, 0xcd, 0xe4, 0xe3, 0x08, 0x11, 0x53, 0xe1, 0xe3, 0x89, 0x36, 0xee, 0x4f, 0x58, 0xaa,
-	0x22, 0x8a, 0x33, 0xc9, 0x3a, 0x10, 0xa6, 0xc4, 0x98, 0x25, 0xf6, 0x88, 0x59, 0x19, 0xa7, 0x6d,
-	0x2f, 0x31, 0xf7, 0xdf, 0x8c, 0x26, 0x48, 0x2d, 0x3a, 0xd6, 0x56, 0x32, 0xc9, 0x43, 0xe2, 0x95,
-	0x74, 0x8e, 0x13, 0xed, 0x5c, 0x9b, 0x32, 0xb0, 0x6a, 0x3a, 0xc7, 0x59, 0x7f, 0xf2, 0x06, 0x5b,
-	0xd8, 0xae, 0x1d, 0xfc, 0x5e, 0x84, 0x7a, 0x22, 0x76, 0x78, 0x43, 0xda, 0x07, 0x6d, 0x38, 0x5d,
-	0xbf, 0xa1, 0x07, 0xb0, 0x2b, 0x79, 0x18, 0x52, 0xcc, 0xbf, 0x80, 0x1f, 0x53, 0x8f, 0xf3, 0x9d,
-	0x11, 0x6b, 0xac, 0xbd, 0x07, 0xf7, 0x33, 0x31, 0x48, 0x85, 0xfb, 0x4a, 0x28, 0x17, 0xf7, 0x32,
-	0x3e, 0x51, 0x4e, 0x19, 0x77, 0x67, 0x3f, 0xe3, 0x12, 0xdc, 0xf5, 0xe3, 0xd1, 0xf9, 0xb9, 0x76,
-	0xcc, 0xa2, 0x94, 0x0c, 0xb8, 0xb8, 0xce, 0x49, 0xd8, 0x90, 0x34, 0x38, 0xf3, 0x09, 0xf0, 0x2a,
-	0x6b, 0xb0, 0xe4, 0x0a, 0xa7, 0x6a, 0x70, 0x31, 0x0e, 0x29, 0xd7, 0xc8, 0x43, 0xe8, 0xae, 0xb9,
-	0x27, 0xda, 0xc5, 0xe8, 0x03, 0x7a, 0xeb, 0x47, 0x3f, 0x95, 0xf1, 0x6b, 0x6b, 0x75, 0x69, 0x99,
-	0xb3, 0xfe, 0x78, 0x40, 0xbe, 0x85, 0xaa, 0x10, 0x74, 0xb2, 0x9b, 0xbc, 0x76, 0x29, 0xd1, 0xef,
-	0x75, 0xd7, 0x1d, 0xe1, 0xd6, 0xa8, 0x77, 0x48, 0x1f, 0x6a, 0x91, 0x30, 0x93, 0x24, 0x2e, 0xa3,
-	0xf9, 0xbd, 0xbd, 0x1c, 0x4f, 0x0c, 0x71, 0x06, 0x90, 0x48, 0x31, 0xe9, 0x49, 0x0f, 0x48, 0x46,
-	0xc0, 0x7b, 0x0f, 0x72, 0x7d, 0x32, 0x50, 0x22, 0xab, 0x12, 0xd0, 0x9a, 0x6e, 0x4b, 0x40, 0xeb,
-	0x3a, 0x8c, 0x40, 0x17, 0xd0, 0x94, 0x65, 0x94, 0x3c, 0xcc, 0xe6, 0x95, 0x05, 0xb8, 0xf7, 0x68,
-	0x83, 0x37, 0x86, 0x1b, 0x41, 0x53, 0x56, 0x48, 0x09, 0x2e, 0x47, 0x75, 0x25, 0xb8, 0x3c, 0x59,
-	0x55, 0xef, 0xfc, 0xbf, 0x40, 0x5e, 0xf3, 0x4b, 0x63, 0xfa, 0x95, 0xbe, 0x34, 0x49, 0x4c, 0xd3,
-	0x97, 0x26, 0x4b, 0x1d, 0x43, 0xb8, 0xac, 0xf0, 0x7f, 0x40, 0x5f, 0xfc, 0x1d, 0x00, 0x00, 0xff,
-	0xff, 0x4d, 0xcd, 0xc6, 0xd5, 0x8d, 0x0e, 0x00, 0x00,
+	// 1492 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xcf, 0x6e, 0xdb, 0xc6,
+	0x13, 0x8e, 0xfe, 0x4b, 0x23, 0x45, 0x96, 0xd6, 0x4e, 0x2c, 0x2b, 0xff, 0x1c, 0xfe, 0x7e, 0x0d,
+	0x52, 0x1f, 0xdc, 0xd6, 0x49, 0x73, 0x29, 0x50, 0x44, 0xb1, 0x69, 0x43, 0x8d, 0x2d, 0x09, 0x8a,
+	0x62, 0x34, 0x27, 0x82, 0x92, 0x56, 0x0e, 0x61, 0x8a, 0x64, 0x49, 0xca, 0x89, 0x7b, 0xec, 0xa9,
+	0xb7, 0x3e, 0x42, 0x1f, 0xa3, 0xc7, 0xde, 0xfb, 0x18, 0x05, 0xfa, 0x1e, 0x9d, 0x5d, 0x2e, 0xc9,
+	0x25, 0x45, 0x1d, 0x7a, 0xb3, 0x66, 0x66, 0xbf, 0xf9, 0x66, 0x76, 0xe6, 0x5b, 0x1a, 0x6a, 0xba,
+	0x63, 0x1c, 0x3a, 0xae, 0xed, 0xdb, 0xa4, 0x72, 0xf3, 0x8d, 0x6e, 0x3a, 0x1f, 0x75, 0xe5, 0x35,
+	0xd4, 0xfb, 0x4b, 0xfd, 0x8a, 0x9e, 0xda, 0xee, 0x52, 0xf7, 0xc9, 0x3e, 0x14, 0xfd, 0x5b, 0x87,
+	0x76, 0x72, 0xfb, 0xb9, 0xe7, 0xcd, 0x23, 0x72, 0x28, 0xc2, 0x0e, 0x79, 0xcc, 0x04, 0x3d, 0x64,
+	0x0b, 0x2a, 0x37, 0xd4, 0xf5, 0x0c, 0xdb, 0xea, 0xe4, 0x31, 0xa8, 0xa6, 0xfc, 0x99, 0x83, 0x12,
+	0x77, 0x93, 0x2f, 0xa1, 0x3e, 0xd5, 0x3d, 0xaa, 0x2d, 0x38, 0x16, 0xc7, 0xa8, 0x1f, 0xed, 0x24,
+	0x31, 0x44, 0x1e, 0x80, 0xbc, 0x31, 0x0f, 0x00, 0x48, 0x03, 0x8a, 0x96, 0xbe, 0xa4, 0x9d, 0x02,
+	0xff, 0x25, 0xe1, 0x17, 0xb9, 0xa1, 0x03, 0x2d, 0x63, 0xe9, 0xd8, 0xae, 0xaf, 0xf9, 0xc6, 0x92,
+	0x7a, 0xbe, 0xbe, 0x74, 0x3a, 0x25, 0xf4, 0x14, 0x48, 0x0b, 0xaa, 0x4b, 0xdd, 0x32, 0x16, 0x68,
+	0xec, 0x94, 0xd1, 0xd2, 0x60, 0x50, 0x9e, 0xf1, 0x33, 0xed, 0x54, 0xb8, 0xff, 0x19, 0xd4, 0x75,
+	0xcb, 0xb2, 0x7d, 0xdd, 0x47, 0x34, 0xaf, 0x53, 0xdd, 0x2f, 0x20, 0x9f, 0x76, 0xc4, 0xe7, 0x2d,
+	0xbd, 0xbd, 0xd4, 0xcd, 0x15, 0x55, 0x5e, 0x40, 0x65, 0x40, 0xfd, 0x4f, 0xb6, 0x7b, 0x1d, 0x71,
+	0xc9, 0x85, 0xcc, 0x0c, 0xe7, 0xe6, 0x65, 0xcc, 0x13, 0x7f, 0xbd, 0x0a, 0x78, 0x2a, 0xbf, 0xe5,
+	0xa0, 0xd0, 0x73, 0x9c, 0xd4, 0x89, 0x47, 0x50, 0x32, 0x58, 0x99, 0xfc, 0x48, 0xfd, 0xa8, 0x99,
+	0x2c, 0x1e, 0xdb, 0x5b, 0xc2, 0x02, 0xfc, 0xa0, 0xd6, 0xa6, 0xc4, 0x05, 0x91, 0xde, 0x31, 0x07,
+	0x69, 0x43, 0x8d, 0x7e, 0x36, 0x7c, 0x6d, 0x66, 0xcf, 0x29, 0x6f, 0x40, 0x3b, 0x5d, 0x46, 0x69,
+	0x53, 0x19, 0xbf, 0xe6, 0xa1, 0x30, 0xb2, 0xe7, 0xa2, 0xb7, 0x01, 0x9f, 0x3a, 0x14, 0x1c, 0xd1,
+	0xe8, 0xf6, 0xe6, 0xec, 0x78, 0x2a, 0xc8, 0xde, 0x85, 0xa2, 0xee, 0x38, 0x1e, 0x26, 0x66, 0x39,
+	0x1a, 0x32, 0x3d, 0xa2, 0x40, 0xd5, 0x0a, 0xba, 0x14, 0x72, 0x68, 0x45, 0xfe, 0xb0, 0x7d, 0xeb,
+	0x37, 0x92, 0x22, 0x5f, 0xd9, 0x40, 0x9e, 0x34, 0xa1, 0x3c, 0xbb, 0x72, 0xed, 0x95, 0x83, 0xd7,
+	0xc4, 0x88, 0x63, 0x15, 0x33, 0x97, 0x22, 0xa7, 0xb9, 0x86, 0xa3, 0x54, 0xe3, 0xf7, 0x89, 0x36,
+	0xe4, 0xef, 0x0a, 0x1b, 0x70, 0xdb, 0x0e, 0x34, 0xae, 0x66, 0xda, 0x52, 0x77, 0xaf, 0x03, 0x6b,
+	0x9d, 0x59, 0x95, 0x67, 0x50, 0x8d, 0x90, 0xb1, 0x05, 0xf8, 0xb7, 0xe8, 0xc7, 0x5d, 0x28, 0xdd,
+	0x30, 0xab, 0x98, 0xdd, 0xbf, 0x72, 0x50, 0xc3, 0xe2, 0x4f, 0x0d, 0xd3, 0xa7, 0x2e, 0x8b, 0x34,
+	0xe6, 0x1e, 0x46, 0x16, 0x30, 0xf2, 0x29, 0x94, 0x79, 0xb3, 0x3c, 0x0c, 0x2d, 0x64, 0x77, 0xab,
+	0xcd, 0x36, 0xca, 0xd1, 0xd8, 0xf5, 0x7b, 0xd8, 0x53, 0x76, 0x0a, 0x4d, 0xfc, 0xfe, 0x35, 0x06,
+	0x54, 0xe4, 0xa6, 0x7b, 0x70, 0x57, 0xf4, 0x4d, 0x44, 0x96, 0xb8, 0x39, 0xd5, 0x98, 0xf2, 0xa6,
+	0xc6, 0xe0, 0x3e, 0x04, 0x8d, 0x09, 0x9a, 0x57, 0x23, 0xbb, 0xb0, 0xe5, 0xd8, 0x73, 0xcd, 0x5b,
+	0x4d, 0xb5, 0xd0, 0xc1, 0x26, 0xbb, 0xa6, 0xfc, 0x9d, 0x0b, 0x77, 0x39, 0xa3, 0x1c, 0xbc, 0x19,
+	0xc7, 0xa5, 0x0b, 0xe3, 0xb3, 0x28, 0x88, 0x77, 0x98, 0x6f, 0xab, 0x4c, 0x1f, 0xa3, 0xae, 0xe9,
+	0x2d, 0x72, 0x8d, 0xd8, 0x63, 0x1b, 0x4c, 0x7d, 0x4a, 0xcd, 0xcd, 0x73, 0x47, 0xee, 0x43, 0x33,
+	0x58, 0x50, 0x76, 0x03, 0x0b, 0xcc, 0xcc, 0xaf, 0xbe, 0xc0, 0x88, 0x46, 0xf6, 0x29, 0x45, 0x51,
+	0xf8, 0x8f, 0x7b, 0xc9, 0x18, 0x2e, 0x56, 0xa6, 0x29, 0x18, 0xd6, 0x78, 0x91, 0xbf, 0x63, 0x91,
+	0x67, 0xa6, 0x3d, 0xd5, 0xcd, 0x53, 0x53, 0xbf, 0xf2, 0x58, 0x91, 0x73, 0xc3, 0x15, 0xb7, 0xbb,
+	0x07, 0x6d, 0xef, 0xd6, 0xf3, 0xe9, 0x12, 0xd7, 0xc7, 0x5a, 0x18, 0x57, 0x1a, 0x73, 0xe5, 0x43,
+	0x15, 0x31, 0xed, 0x99, 0x6e, 0xca, 0x9e, 0x40, 0x70, 0x90, 0xe6, 0xca, 0xa3, 0xae, 0xec, 0x08,
+	0x84, 0x87, 0xd5, 0x65, 0x79, 0x74, 0xb6, 0x72, 0x51, 0xd2, 0x58, 0x32, 0x2e, 0x3b, 0x6c, 0xc7,
+	0xef, 0xf9, 0xee, 0xca, 0xf3, 0x35, 0x6c, 0x95, 0xa7, 0x2d, 0x5c, 0x7b, 0xa9, 0x7d, 0xf4, 0x7d,
+	0xc7, 0xe3, 0x65, 0x57, 0x15, 0x17, 0x8a, 0x7d, 0x6b, 0x61, 0x93, 0x6d, 0xa8, 0xbb, 0xd7, 0xbe,
+	0x16, 0x8a, 0x59, 0xc0, 0x10, 0xc7, 0x15, 0x47, 0x66, 0xa6, 0x25, 0x24, 0x94, 0x85, 0xa2, 0x34,
+	0x47, 0xc6, 0x80, 0xd7, 0x01, 0x4e, 0x36, 0x2f, 0x54, 0x24, 0x2f, 0xa6, 0xe4, 0x54, 0xea, 0x02,
+	0xe6, 0x2c, 0xa9, 0x37, 0xd4, 0xda, 0xac, 0xdf, 0xdc, 0xcb, 0xf5, 0x3b, 0xa5, 0xbc, 0x8c, 0xbe,
+	0x48, 0x88, 0xbf, 0x98, 0xc2, 0xf2, 0x44, 0x05, 0xf2, 0x04, 0x8a, 0x73, 0xdd, 0xd7, 0x37, 0xcb,
+	0x8d, 0x0f, 0x75, 0x8e, 0x2a, 0xa6, 0xed, 0x29, 0x94, 0x58, 0xe6, 0x60, 0xde, 0xb2, 0x53, 0x8b,
+	0x81, 0x0c, 0xc6, 0x0f, 0x37, 0x51, 0x9e, 0x3c, 0xb6, 0xdb, 0x86, 0x35, 0xa3, 0x9a, 0x44, 0x01,
+	0x6d, 0x2b, 0xcb, 0x37, 0xcc, 0xc0, 0xc6, 0x35, 0x5f, 0x69, 0x41, 0xf3, 0x8c, 0xfa, 0xac, 0xc1,
+	0x63, 0xfa, 0xd3, 0x0a, 0x75, 0x46, 0x39, 0x84, 0xad, 0xc8, 0xe2, 0x39, 0x38, 0x50, 0x94, 0x3c,
+	0x40, 0xa5, 0xc6, 0xdf, 0xe2, 0x05, 0xba, 0x1b, 0x8b, 0x30, 0x1a, 0x95, 0x53, 0xd8, 0x3a, 0x37,
+	0x3c, 0x1f, 0xb7, 0xd8, 0x13, 0x10, 0xe4, 0x7f, 0x50, 0x59, 0xf0, 0x2a, 0x02, 0xf6, 0x75, 0x89,
+	0x7d, 0xac, 0x0e, 0xa8, 0x50, 0x73, 0xea, 0xeb, 0x86, 0xc9, 0x9b, 0x57, 0xc5, 0xbc, 0xad, 0x18,
+	0x47, 0x24, 0x46, 0xfd, 0xc4, 0xdd, 0x0c, 0x51, 0x1a, 0x32, 0x8a, 0xf2, 0x04, 0xda, 0x7d, 0xcb,
+	0x73, 0xe8, 0x8c, 0x1d, 0x09, 0x33, 0x4b, 0x5a, 0xad, 0x7c, 0x05, 0x44, 0x0e, 0x10, 0x90, 0x7b,
+	0xa8, 0xe0, 0xf6, 0x5c, 0x94, 0x92, 0x44, 0xfc, 0x01, 0xda, 0x8c, 0x01, 0xdf, 0xf9, 0xa8, 0x96,
+	0x2f, 0xd2, 0xb5, 0xa4, 0x1f, 0xe0, 0xec, 0x6a, 0x5e, 0x02, 0x91, 0xb1, 0x44, 0xf2, 0xc7, 0x50,
+	0xe6, 0x72, 0x16, 0x62, 0xa5, 0xde, 0x33, 0xe5, 0x29, 0x6c, 0x0b, 0xca, 0xfc, 0x77, 0x56, 0x55,
+	0xdf, 0xc2, 0x4e, 0x32, 0x44, 0x40, 0x47, 0x2f, 0x65, 0x2e, 0xeb, 0xa5, 0x54, 0xbe, 0x83, 0x6d,
+	0xc6, 0x87, 0x5a, 0x7c, 0x7c, 0xa2, 0xea, 0xfe, 0x0f, 0xe5, 0xa0, 0xba, 0xb5, 0xaf, 0x0b, 0x69,
+	0x16, 0x95, 0x57, 0xb0, 0x93, 0x3c, 0x1c, 0x97, 0x43, 0xb9, 0x65, 0xad, 0x1c, 0x1e, 0xa8, 0xdc,
+	0xf2, 0xe1, 0x3a, 0xb7, 0xaf, 0xa2, 0x7c, 0xd8, 0x26, 0x26, 0xb6, 0xd1, 0x7b, 0x8a, 0x02, 0x19,
+	0x4a, 0xbe, 0xd8, 0x21, 0x9c, 0x63, 0xd3, 0xb0, 0xf8, 0x1c, 0xe7, 0x9e, 0x97, 0xd8, 0x81, 0x85,
+	0x6d, 0x9a, 0xf6, 0x27, 0x3e, 0xc3, 0xd5, 0xd4, 0x5c, 0x97, 0x32, 0xe6, 0x9a, 0x8b, 0xa5, 0xb2,
+	0xcf, 0xa7, 0x38, 0x48, 0x2d, 0xd8, 0x46, 0xc8, 0x5c, 0xc1, 0x0f, 0x28, 0xd4, 0xe2, 0xaf, 0xb0,
+	0x0e, 0x76, 0xf5, 0xa2, 0x77, 0xa6, 0x6a, 0x93, 0x0f, 0x23, 0x55, 0x7b, 0x3f, 0x38, 0x51, 0x4f,
+	0xfb, 0x03, 0xf5, 0xa4, 0x75, 0x07, 0xb5, 0x64, 0x4b, 0xf2, 0xf4, 0x46, 0xa3, 0xe3, 0x56, 0x0e,
+	0xdf, 0xa0, 0xb6, 0x64, 0x3c, 0x19, 0x1e, 0xbf, 0x55, 0xc7, 0xad, 0x3c, 0x12, 0x69, 0x4a, 0xe6,
+	0xe1, 0x71, 0xbf, 0x55, 0x38, 0x18, 0x41, 0x35, 0xfa, 0x18, 0xd9, 0x85, 0x6d, 0x04, 0xd0, 0xde,
+	0x4d, 0x7a, 0x93, 0x64, 0x12, 0xc4, 0x8b, 0x1d, 0xe3, 0xf7, 0x83, 0x41, 0x7f, 0x70, 0x86, 0x69,
+	0x76, 0xa0, 0x15, 0x9b, 0xd5, 0x1f, 0xfb, 0x13, 0x0c, 0xce, 0x1f, 0xfc, 0x93, 0x83, 0x6a, 0xf4,
+	0x66, 0x22, 0xe4, 0x68, 0x78, 0x92, 0x01, 0x89, 0x67, 0x63, 0x87, 0x7a, 0xf1, 0x66, 0xfc, 0x61,
+	0x88, 0x88, 0x89, 0xf0, 0xd1, 0x58, 0x1d, 0xf5, 0xc6, 0x2c, 0x55, 0x1e, 0xc5, 0x99, 0xa4, 0x1d,
+	0x08, 0x53, 0x60, 0xcc, 0x62, 0x7b, 0xc8, 0xac, 0x88, 0xd3, 0xb6, 0x17, 0x9b, 0x7b, 0x6f, 0x86,
+	0x63, 0xa4, 0x16, 0x1e, 0x6b, 0x95, 0x52, 0xc9, 0x03, 0xe2, 0xe5, 0x64, 0x8e, 0x13, 0xf5, 0x5c,
+	0x9d, 0x30, 0xb0, 0x4a, 0x32, 0xc7, 0x59, 0x6f, 0xfc, 0x06, 0x5b, 0xd8, 0xaa, 0x1e, 0xfc, 0x91,
+	0x87, 0x5a, 0x2c, 0x76, 0x78, 0x43, 0xea, 0xa5, 0x3a, 0x98, 0xac, 0xdf, 0xd0, 0x03, 0xd8, 0x95,
+	0x3c, 0x0c, 0x29, 0xe2, 0x9f, 0xc3, 0xaf, 0xac, 0xc7, 0xd9, 0xce, 0x90, 0x35, 0xd6, 0xde, 0x85,
+	0xfb, 0xa9, 0x18, 0xa4, 0xc2, 0x7d, 0x05, 0x94, 0x8b, 0x7b, 0x29, 0x9f, 0x28, 0xa7, 0x88, 0xbb,
+	0xb3, 0x9f, 0x72, 0x09, 0xee, 0xda, 0xf1, 0xf0, 0xfc, 0x5c, 0x3d, 0x66, 0x51, 0xa5, 0x14, 0xb8,
+	0xb8, 0xce, 0x71, 0xd0, 0x90, 0x24, 0x38, 0xf3, 0x09, 0xf0, 0x0a, 0x6b, 0xb0, 0xe4, 0x0a, 0xa6,
+	0xaa, 0x7f, 0x31, 0x0a, 0x28, 0x57, 0xc9, 0x43, 0xe8, 0xac, 0xb9, 0xc7, 0xea, 0xc5, 0xf0, 0x12,
+	0xbd, 0xb5, 0xa3, 0x5f, 0x8a, 0xf8, 0x19, 0xb6, 0x9a, 0x9a, 0xc6, 0xac, 0x37, 0xea, 0x93, 0xef,
+	0xa1, 0x22, 0x04, 0x9d, 0xec, 0xc6, 0xaf, 0x5d, 0x42, 0xf4, 0xbb, 0x9d, 0x75, 0x47, 0xb0, 0x35,
+	0xca, 0x1d, 0xd2, 0x83, 0x6a, 0x28, 0xcc, 0x24, 0x8e, 0x4b, 0x69, 0x7e, 0x77, 0x2f, 0xc3, 0x13,
+	0x41, 0x9c, 0x01, 0xc4, 0x52, 0x4c, 0xba, 0xd2, 0x03, 0x92, 0x12, 0xf0, 0xee, 0x83, 0x4c, 0x9f,
+	0x0c, 0x14, 0xcb, 0xaa, 0x04, 0xb4, 0xa6, 0xdb, 0x12, 0xd0, 0xba, 0x0e, 0x23, 0xd0, 0x05, 0x34,
+	0x64, 0x19, 0x25, 0x0f, 0xd3, 0x79, 0x65, 0x01, 0xee, 0x3e, 0xda, 0xe0, 0x8d, 0xe0, 0x86, 0xd0,
+	0x90, 0x15, 0x52, 0x82, 0xcb, 0x50, 0x5d, 0x09, 0x2e, 0x4b, 0x56, 0x95, 0x3b, 0x5f, 0xe7, 0xc8,
+	0x6b, 0x7e, 0x69, 0x4c, 0xbf, 0x92, 0x97, 0x26, 0x89, 0x69, 0xf2, 0xd2, 0x64, 0xa9, 0x63, 0x08,
+	0xd3, 0x32, 0xff, 0xcf, 0xf4, 0xc5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x23, 0xef, 0x15,
+	0xa6, 0x0e, 0x00, 0x00,
 }
diff --git a/api/v1alpha/api.proto b/api/v1alpha/api.proto
index 51aa8e6865..80b870a3f3 100644
--- a/api/v1alpha/api.proto
+++ b/api/v1alpha/api.proto
@@ -217,6 +217,10 @@ message PodFilter {
 
         // If not empty, the pods whose cgroup are listed will be returned.
         repeated string cgroups = 7;
+
+        // If not empty, the pods whose these cgroup belong to will be returned.
+        // i.e. the pod's cgroup is a prefix of the specified cgroup
+        repeated string pod_sub_cgroups = 8;
 }
 
 // ImageFilter defines the condition that the returned images need to satisfy in ListImages().
diff --git a/rkt/api_service.go b/rkt/api_service.go
index 532d3254f1..aa453503ba 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -199,6 +199,23 @@ func satisfiesPodFilter(pod v1alpha.Pod, manifest schema.PodManifest, filter v1a
 		}
 	}
 
+	// Filter if pod's cgroup is a prefix of the passed in cgroup
+	if len(filter.PodSubCgroups) > 0 {
+		matched := false
+		if pod.Cgroup != "" {
+			for _, cgroup := range filter.PodSubCgroups {
+				if strings.HasPrefix(cgroup, pod.Cgroup) {
+					matched = true
+					break
+				}
+			}
+		}
+
+		if !matched {
+			return false
+		}
+	}
+
 	return true
 }
 

From 146dfc69a39a61d2f9e52761904b3d936c79363e Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Mon, 2 May 2016 13:04:36 +0300
Subject: [PATCH 0202/1304] rkt: test calculateDataDir

Add tests for calculateDataDir.

Fixes #2422
Fixes #2550
Fixes #2552
---
 rkt/rkt_test.go | 92 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 rkt/rkt_test.go

diff --git a/rkt/rkt_test.go b/rkt/rkt_test.go
new file mode 100644
index 0000000000..cf3bda3f78
--- /dev/null
+++ b/rkt/rkt_test.go
@@ -0,0 +1,92 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/pkg/log"
+)
+
+func TestCalculateDataDir(t *testing.T) {
+	// Used in calculateDataDir.
+	// TODO(tmrts): Restructure this pkg, specifically by using dependency
+	// injection, to eliminate these work-arounds.
+	stderr = log.New(os.Stderr, "TestCalculateDataDir", globalFlags.Debug)
+
+	_, err := getConfig()
+	if err != nil {
+		panic(fmt.Errorf("getConfig() got error %q", err))
+	}
+
+	if cachedConfig == nil {
+		panic(fmt.Errorf("getConfig() should've set `cachedConfig`"))
+	}
+
+	dirFlag := cmdRkt.PersistentFlags().Lookup("dir")
+	dirFlag.Changed = false
+	defDirFlagVal := dirFlag.Value.String()
+	defCfgDataDir := cachedConfig.Paths.DataDir
+
+	resetConfigState := func() {
+		cmdRkt.PersistentFlags().Set("dir", defDirFlagVal)
+		dirFlag.Changed = false
+
+		cachedConfig.Paths.DataDir = defCfgDataDir
+	}
+
+	tmpDir, err := ioutil.TempDir("", "")
+	if err != nil {
+		panic(fmt.Errorf("ioutil.TempDir(%q, %q) got error %q", "", "", err))
+	}
+	defer os.Remove(tmpDir)
+
+	// TODO(tmrts): Write a utility function that generates unused random paths.
+	// Example signature would be fileutils.GenerateUniquePath(prefix string) (string, error).
+	nonExistantDir, err := ioutil.TempDir("", "non-existant-")
+	if err != nil {
+		panic(fmt.Errorf("ioutil.TempDir(%q, %q) got error %q", "", "", err))
+	}
+	if err := os.Remove(nonExistantDir); err != nil {
+		panic(fmt.Errorf("os.Remove(%q) got error %q", nonExistantDir, err))
+	}
+
+	testCases := []struct {
+		flagDataDir   string
+		configDataDir string
+		out           string
+	}{
+		{"", "", defaultDataDir},
+		{"", tmpDir, tmpDir},
+		{tmpDir, "", tmpDir},
+		{nonExistantDir, "", nonExistantDir},
+		{"", nonExistantDir, nonExistantDir},
+	}
+
+	for _, tc := range testCases {
+		cmdRkt.PersistentFlags().Set("dir", tc.flagDataDir)
+
+		cachedConfig.Paths.DataDir = tc.configDataDir
+
+		if dataDir := calculateDataDir(); dataDir != tc.out {
+			t.Errorf("main.calculateDataDir() with setup %q, expected %q, got %q", tc, tc.out, dataDir)
+		}
+
+		resetConfigState()
+	}
+}

From bc1ce35b00e2644bb4162536a43ed4e359e3aeaf Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Fri, 29 Apr 2016 15:07:50 +0300
Subject: [PATCH 0203/1304] pkg/fileutil: test IsExecutable utility function

Adds tests for fileutil.IsExecutable function.

Fixes #2509
---
 pkg/fileutil/fileutil_test.go | 68 ++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/pkg/fileutil/fileutil_test.go b/pkg/fileutil/fileutil_test.go
index c5dd60d0bf..08e386734d 100644
--- a/pkg/fileutil/fileutil_test.go
+++ b/pkg/fileutil/fileutil_test.go
@@ -70,7 +70,7 @@ func TestCopyTree(t *testing.T) {
 	src := filepath.Join(td, "src")
 	dst := filepath.Join(td, "dst")
 	if err := os.MkdirAll(filepath.Join(td, "src"), 0755); err != nil {
-		t.Fatal(err)
+		panic(err)
 	}
 
 	tr := []tree{
@@ -117,3 +117,69 @@ func TestCopyTree(t *testing.T) {
 	}
 	checkTree(t, dst, tr)
 }
+
+func TestFileIsExecutable(t *testing.T) {
+	tempDir, err := ioutil.TempDir("", tstprefix)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tempDir)
+
+	testCases := []struct {
+		Permission   os.FileMode
+		IsExecutable bool
+	}{
+		{0200, false},
+		{0400, false},
+		{0600, false},
+		{0100, true},
+		{0300, true},
+		{0500, true},
+		{0700, true},
+
+		{0002, false},
+		{0004, false},
+		{0006, false},
+		{0001, true},
+		{0003, true},
+		{0005, true},
+		{0007, true},
+
+		{0020, false},
+		{0040, false},
+		{0060, false},
+		{0010, true},
+		{0030, true},
+		{0050, true},
+		{0070, true},
+
+		{0000, false},
+		{0222, false},
+		{0444, false},
+		{0666, false},
+
+		{0146, true},
+		{0661, true},
+	}
+
+	for _, tc := range testCases {
+		f, err := ioutil.TempFile(tempDir, "")
+		if err != nil {
+			panic(err)
+		}
+
+		if err := f.Chmod(tc.Permission); err != nil {
+			panic(err)
+		}
+
+		if err := f.Close(); err != nil {
+			panic(err)
+		}
+
+		path := f.Name()
+
+		if tc.IsExecutable != IsExecutable(path) {
+			t.Errorf("fileutil.IsExecutable(%q) with permissions %q, expected %v", path, tc.Permission, tc.IsExecutable)
+		}
+	}
+}

From fe806b242799377916867060dabfc7fd4328aff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20K=C3=BChl?= <chris@kinvolk.io>
Date: Mon, 2 May 2016 16:09:00 +0200
Subject: [PATCH 0204/1304] docs: remove leftover enter subcmd section

---
 Documentation/subcommands/enter.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Documentation/subcommands/enter.md b/Documentation/subcommands/enter.md
index 1bedb20512..758ade5782 100644
--- a/Documentation/subcommands/enter.md
+++ b/Documentation/subcommands/enter.md
@@ -16,10 +16,6 @@ bin   data  entrypoint.sh  home  lib64  mnt  proc  run   selinux  sys  usr
 boot  dev   etc            lib   media  opt  root  sbin  srv      tmp  var
 ```
 
-## Run a Pod in the Background
-
-Work in progress. Please contribute!
-
 ## Options
 
 | Flag | Default | Options | Description |

From c7bfd571b72b6f758297a76b7b1e9991e5883f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 2 May 2016 15:41:59 +0200
Subject: [PATCH 0205/1304] CHANGELOG: add v1.5.1

---
 CHANGELOG.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6041b43dec..e833732529 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## v1.5.1
+
+This release is a minor bug fix release.
+
+#### Bug fixes
+
+- rkt: fix bug where rkt errored out if the default data directory didn't exist [#2557](https://github.com/coreos/rkt/pull/2557).
+- kvm: fix docker volume semantics ([#2558](https://github.com/coreos/rkt/pull/2558)). When a Docker image exposes a mount point that is not mounted by a host volume, Docker volume semantics expect the files in the directory to be available to the application. This was not working properly in the kvm flavor and it's fixed now.
+- kvm: fix net long names ([#2543](https://github.com/coreos/rkt/pull/2543)). Handle network names that are longer than the maximum allowed by iptables in the kvm flavor.
+
+#### Other changes
+
+- minor tests and clean-ups (, [#2551](https://github.com/coreos/rkt/pull/2551)).
+
 ## v1.5.0
 
 This release switches to pure systemd for running apps within a pod. This lays the foundation to implement enhanced isolation capabilities. For example, starting with v1.5.0, apps are started with more restricted capabilities. User namespace support and the KVM stage1 are not experimental anymore. Resource usage can be benchmarked using the new rkt-monitor tool.

From ba45abd0afc0afaae16f3fdd5e6894461a42cbeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 2 May 2016 15:43:01 +0200
Subject: [PATCH 0206/1304] version: bump to v1.5.1

---
 Documentation/getting-started-ubuntu.md | 6 +++---
 Documentation/running-fly-stage1.md     | 4 ++--
 Documentation/running-lkvm-stage1.md    | 4 ++--
 Documentation/subcommands/prepare.md    | 2 +-
 Documentation/subcommands/version.md    | 2 +-
 Documentation/trying-out-rkt.md         | 6 +++---
 configure.ac                            | 2 +-
 scripts/acbuild-rkt-builder.sh          | 2 +-
 scripts/build-rir.sh                    | 2 +-
 tests/empty-image/manifest              | 2 +-
 tests/image/manifest                    | 2 +-
 tests/rkt_exec_test.go                  | 2 +-
 tests/rkt_image_cat_manifest_test.go    | 2 +-
 tests/rkt_image_export_test.go          | 2 +-
 tests/rkt_image_render_test.go          | 2 +-
 tests/rkt_os_arch_test.go               | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
index 36506da88e..ecf6d7090d 100644
--- a/Documentation/getting-started-ubuntu.md
+++ b/Documentation/getting-started-ubuntu.md
@@ -15,9 +15,9 @@ vagrant up --provider virtualbox
 vagrant ssh
 sudo -s
 
-wget https://github.com/coreos/rkt/releases/download/v1.5.0/rkt-v1.5.0.tar.gz
-tar xzvf rkt-v1.5.0.tar.gz
-cd rkt-v1.5.0
+wget https://github.com/coreos/rkt/releases/download/v1.5.1/rkt-v1.5.1.tar.gz
+tar xzvf rkt-v1.5.1.tar.gz
+cd rkt-v1.5.1
 ./rkt help
 ```
 
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 978adec66e..1ff6303ed2 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.5.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.5.1+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.5.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.5.1 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index 839d14af73..c80c8bf657 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.5.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.5.1+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.5.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.5.1 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 8d0ea0c609..9ab207a796 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.5.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.5.1
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 97257bfdf3..1ad445e790 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.5.0
+rkt Version: 1.5.1
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 57b3361122..f9e48b0b71 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool, and is currently supported on amd64 Linux. A
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.5.0/rkt-v1.5.0.tar.gz
-tar xzvf rkt-v1.5.0.tar.gz
-cd rkt-v1.5.0
+wget https://github.com/coreos/rkt/releases/download/v1.5.1/rkt-v1.5.1.tar.gz
+tar xzvf rkt-v1.5.1.tar.gz
+cd rkt-v1.5.1
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index af0ff4c83e..ab1b35ba5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.5.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.5.1], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 1cbe97ef0d..889c5f83c4 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.5.0+git"}
+IMG_VERSION=${VERSION:-"v1.5.1"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index d2632ce380..95268f2b46 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.5.0+git}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.5.1}"
 
 mkdir -p $BUILDDIR
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 39f923d290..d423df3965 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.5.0"
+            "value": "1.5.1"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 14be72f2c8..46b767e09e 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.5.0"
+            "value": "1.5.1"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 5c1a5bc11b..51c8702ce4 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.5.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.5.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 9908721e5c..f927ea4346 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 2b36d5e04a..219029118a 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 0510a9bab7..ab34c6254c 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index adc9b91d30..081196fccd 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.1"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 1d48c8fe388d95f8c10aaa09c4d9cf391a1d1a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 2 May 2016 15:43:01 +0200
Subject: [PATCH 0207/1304] version: bump to v1.5.1+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ab1b35ba5d..0f301fc0ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.5.1], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.5.1+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 889c5f83c4..72e6023dbb 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.5.1"}
+IMG_VERSION=${VERSION:-"v1.5.1+git"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 95268f2b46..d1e8dfb55f 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.5.1}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.5.1+git}"
 
 mkdir -p $BUILDDIR
 

From 4e35a0d1981d01e27185f02b0a98f4505c7bd50f Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 2 May 2016 17:54:48 +0200
Subject: [PATCH 0208/1304] changelog: correct minor tests entry

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e833732529..ec3106b63b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ This release is a minor bug fix release.
 
 #### Other changes
 
-- minor tests and clean-ups (, [#2551](https://github.com/coreos/rkt/pull/2551)).
+- minor tests and clean-ups ([#2551](https://github.com/coreos/rkt/pull/2551)).
 
 ## v1.5.0
 

From 9dcc645d29c9c3c6e1532b880f0faa090f16fd38 Mon Sep 17 00:00:00 2001
From: PI-Victor <ipalade@redhat.com>
Date: Sun, 1 May 2016 00:16:49 +0200
Subject: [PATCH 0209/1304] README: remove specific version from link to
 coreos-overlay repo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4fbf4049a..c11bab146c 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,6 @@ Due to a bug in the Linux kernel, using rkt's overlay support on top of an overl
 
 Due to a bug in the Linux kernel, rkt will not work when /var/lib/rkt is on btrfs ([#2175](https://github.com/coreos/rkt/issues/2175)).
 
-Due to a bug in the Linux kernel, using rkt's overlay support in conjunction with SELinux requires a set of patches that are only currently available on some Linux distributions (for example, [CoreOS Linux](https://github.com/coreos/coreos-overlay/tree/master/sys-kernel/coreos-sources/files/4.4)). Work is ongoing to merge this work into the mainline Linux kernel ([#1727](https://github.com/coreos/rkt/issues/1727#issuecomment-173203129)).
+Due to a bug in the Linux kernel, using rkt's overlay support in conjunction with SELinux requires a set of patches that are only currently available on some Linux distributions (for example, [CoreOS Linux](https://github.com/coreos/coreos-overlay/tree/master/sys-kernel/coreos-sources/files)). Work is ongoing to merge this work into the mainline Linux kernel ([#1727](https://github.com/coreos/rkt/issues/1727#issuecomment-173203129)).
 
 Linux 3.18+ is required to successfully garbage collect rkt pods when system services such as udevd are in a slave mount namespace (see [lazy umounts on unlinked files and directories](https://github.com/torvalds/linux/commit/8ed936b) and [#1922](https://github.com/coreos/rkt/issues/1922)).

From a29dc3fc3408ceb71ec6eece1d5a94add7c0d94e Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Mon, 2 May 2016 19:24:00 -0700
Subject: [PATCH 0210/1304] stage1: download CoreOS over HTTPS

---
 stage1/usr_from_coreos/coreos-common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index 72197709e7..b5bfa7798b 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -13,7 +13,7 @@ CCN_SYSTEMD_VERSION := v225
 # coreos image version
 CCN_IMG_RELEASE := 991.0.0
 # coreos image URL
-CCN_IMG_URL := http://alpha.release.core-os.net/amd64-usr/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
+CCN_IMG_URL := https://alpha.release.core-os.net/amd64-usr/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image
 CCN_DOWNLOADED_PXE := $(CCN_TMPDIR)/pxe.img
 CLEAN_FILES += \

From e983bc4a16de5efde14b785232707fd2f9d4bef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 27 Apr 2016 12:08:45 +0200
Subject: [PATCH 0211/1304] stage1/usr_from_coreos: use CoreOS 1032.0.0 with
 systemd v229

---
 stage1/usr_from_coreos/coreos-common.mk            | 4 ++--
 stage1/usr_from_coreos/manifest.d/systemd.manifest | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index b5bfa7798b..f864f56d6e 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -9,9 +9,9 @@ _CCN_INCLUDED_ := x
 $(call setup-tmp-dir,CCN_TMPDIR)
 
 # systemd version in coreos image
-CCN_SYSTEMD_VERSION := v225
+CCN_SYSTEMD_VERSION := v229
 # coreos image version
-CCN_IMG_RELEASE := 991.0.0
+CCN_IMG_RELEASE := 1032.0.0
 # coreos image URL
 CCN_IMG_URL := https://alpha.release.core-os.net/amd64-usr/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image
diff --git a/stage1/usr_from_coreos/manifest.d/systemd.manifest b/stage1/usr_from_coreos/manifest.d/systemd.manifest
index fca30bbdfd..51d5fbcd36 100644
--- a/stage1/usr_from_coreos/manifest.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest.d/systemd.manifest
@@ -61,6 +61,9 @@ lib64/libmount.so.1
 lib64/libmount.so.1.1.0
 lib64/libnss_files-2.21.so
 lib64/libnss_files.so.2
+lib64/libpam.so
+lib64/libpam.so.0
+lib64/libpam.so.0.84.1
 lib64/libpcre.so
 lib64/libpcre.so.1
 lib64/libpcre.so.1.2.4

From dd12c26ec90a9d5bc2fed3e4ef8f9c79935f56cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 3 May 2016 11:17:22 +0200
Subject: [PATCH 0212/1304] stage1/init: pass both UID and GID to UnshiftRange

Even if we only keep the unshifted UID (or only the GID), we need to
call UnshiftRange with both shifted parameters or we get a range error.
---
 stage1/init/common/pod.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index e428ee286a..b6477b1fef 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -620,7 +620,7 @@ func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uidRange *u
 			return -1, -1, errwrap.Wrap(fmt.Errorf("unable to get uid from file %q",
 				app.User), err)
 		}
-		uidReal, _, err := uidRange.UnshiftRange(stat.Uid, 0)
+		uidReal, _, err := uidRange.UnshiftRange(stat.Uid, stat.Gid)
 		if err != nil {
 			return -1, -1, errwrap.Wrap(errors.New("unable to determine real uid"), err)
 		}
@@ -646,7 +646,7 @@ func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uidRange *u
 			return -1, -1, errwrap.Wrap(fmt.Errorf("unable to get gid from file %q",
 				app.Group), err)
 		}
-		_, gidReal, err := uidRange.UnshiftRange(0, stat.Gid)
+		_, gidReal, err := uidRange.UnshiftRange(stat.Uid, stat.Gid)
 		if err != nil {
 			return -1, -1, errwrap.Wrap(errors.New("unable to determine real gid"), err)
 		}

From 84a1280b3c3f9424c3dd0bb42184450074cdb8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 26 Apr 2016 13:00:33 +0200
Subject: [PATCH 0213/1304] functional tests: run TestAppUserGroup with
 --private-users

To make sure sysusers entries are generated correctly.
---
 tests/rkt_run_user_group_test.go | 44 ++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
index f98962792e..8b8981a9b3 100644
--- a/tests/rkt_run_user_group_test.go
+++ b/tests/rkt_run_user_group_test.go
@@ -21,6 +21,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/tests/testutils"
 )
 
@@ -28,6 +29,8 @@ func TestAppUserGroup(t *testing.T) {
 	imageDummy := patchTestACI("rkt-inspect-dummy.aci", "--name=dummy")
 	defer os.Remove(imageDummy)
 
+	supportsUserNS := common.SupportsUserNS() && checkUserNS() == nil
+
 	for _, tt := range []struct {
 		imageParams []string
 		rktParams   string
@@ -101,23 +104,32 @@ func TestAppUserGroup(t *testing.T) {
 			image := patchTestACI("rkt-inspect-user-group.aci", tt.imageParams...)
 			defer os.Remove(image)
 
-			// run the user/group overriden app first
-			rktCmd := fmt.Sprintf(
-				"%s --insecure-options=image run %s %s %s",
-				ctx.Cmd(),
-				image, tt.rktParams,
-				imageDummy,
-			)
-			runRktAndCheckOutput(t, rktCmd, tt.expected, false)
+			userNSOpts := []string{""}
+			if supportsUserNS {
+				userNSOpts = append(userNSOpts, "--private-users --no-overlay")
+			}
+
+			for _, userNSOpt := range userNSOpts {
+				// run the user/group overriden app first
+				rktCmd := fmt.Sprintf(
+					"%s --debug --insecure-options=image run %s %s %s %s",
+					ctx.Cmd(),
+					userNSOpt,
+					image, tt.rktParams,
+					imageDummy,
+				)
+				runRktAndCheckOutput(t, rktCmd, tt.expected, false)
 
-			// run the user/group overriden app last
-			rktCmd = fmt.Sprintf(
-				"%s --insecure-options=image run %s %s %s",
-				ctx.Cmd(),
-				imageDummy,
-				image, tt.rktParams,
-			)
-			runRktAndCheckOutput(t, rktCmd, tt.expected, false)
+				// run the user/group overriden app last
+				rktCmd = fmt.Sprintf(
+					"%s --debug --insecure-options=image run %s %s %s %s",
+					ctx.Cmd(),
+					userNSOpt,
+					imageDummy,
+					image, tt.rktParams,
+				)
+				runRktAndCheckOutput(t, rktCmd, tt.expected, false)
+			}
 		}()
 	}
 }

From 748c62650033c0643e1bb483352c67dd0c3632e5 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 26 Apr 2016 17:40:36 +0200
Subject: [PATCH 0214/1304] user: implement resolvers for resolving user
 UIDs/GIDs

Currently resolving UIDs/GIDs is implemented in a single
private method in stage1/init/common/pod.go.

For future reuse/compositionality this is not the best solution. This
refactors resolving UIDs/GIDs in a new user package. It introduces
uid/gid resolvers capable of resolving those values from stat()ing a
file, looking up etc/passwd, or etc/group, or simply assigning static
uid/gid values.

Fixes #2439
Backports #2508
---
 pkg/aci/render.go                     |  10 +-
 pkg/fileutil/fileutil.go              |   4 +-
 pkg/fileutil/fileutil_test.go         |   8 +-
 pkg/tar/chroot.go                     |   6 +-
 pkg/tar/tar.go                        |   4 +-
 pkg/tar/tar_test.go                   |   6 +-
 pkg/user/doc.go                       |  17 ++
 pkg/user/resolver.go                  | 143 +++++++++++
 pkg/user/resolver_test.go             | 350 ++++++++++++++++++++++++++
 pkg/{uid/uid.go => user/uid_range.go} |   2 +-
 rkt/image_extract.go                  |   6 +-
 rkt/image_render.go                   |   4 +-
 rkt/prepare.go                        |   6 +-
 rkt/run.go                            |   6 +-
 stage0/run.go                         |   4 +-
 stage1/init/common/mount.go           |   4 +-
 stage1/init/common/pod.go             | 101 +++-----
 stage1_fly/run/main.go                |  52 ++++
 store/backup.go                       |   4 +-
 store/tree.go                         |   4 +-
 20 files changed, 641 insertions(+), 100 deletions(-)
 create mode 100644 pkg/user/doc.go
 create mode 100644 pkg/user/resolver.go
 create mode 100644 pkg/user/resolver_test.go
 rename pkg/{uid/uid.go => user/uid_range.go} (99%)

diff --git a/pkg/aci/render.go b/pkg/aci/render.go
index 9d8469cc6b..b7aebb9f6a 100644
--- a/pkg/aci/render.go
+++ b/pkg/aci/render.go
@@ -17,7 +17,7 @@ package aci
 import (
 	"errors"
 
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/hashicorp/errwrap"
 
 	ptar "github.com/coreos/rkt/pkg/tar"
@@ -28,7 +28,7 @@ import (
 
 // Given an imageID, start with the matching image available in the store,
 // build its dependency list and render it inside dir
-func RenderACIWithImageID(imageID types.Hash, dir string, ap acirenderer.ACIRegistry, uidRange *uid.UidRange) error {
+func RenderACIWithImageID(imageID types.Hash, dir string, ap acirenderer.ACIRegistry, uidRange *user.UidRange) error {
 	renderedACI, err := acirenderer.GetRenderedACIWithImageID(imageID, ap)
 	if err != nil {
 		return err
@@ -38,7 +38,7 @@ func RenderACIWithImageID(imageID types.Hash, dir string, ap acirenderer.ACIRegi
 
 // Given an image app name and optional labels, get the best matching image
 // available in the store, build its dependency list and render it inside dir
-func RenderACI(name types.ACIdentifier, labels types.Labels, dir string, ap acirenderer.ACIRegistry, uidRange *uid.UidRange) error {
+func RenderACI(name types.ACIdentifier, labels types.Labels, dir string, ap acirenderer.ACIRegistry, uidRange *user.UidRange) error {
 	renderedACI, err := acirenderer.GetRenderedACI(name, labels, ap)
 	if err != nil {
 		return err
@@ -48,7 +48,7 @@ func RenderACI(name types.ACIdentifier, labels types.Labels, dir string, ap acir
 
 // Given an already populated dependency list, it will extract, under the provided
 // directory, the rendered ACI
-func RenderACIFromList(imgs acirenderer.Images, dir string, ap acirenderer.ACIProvider, uidRange *uid.UidRange) error {
+func RenderACIFromList(imgs acirenderer.Images, dir string, ap acirenderer.ACIProvider, uidRange *user.UidRange) error {
 	renderedACI, err := acirenderer.GetRenderedACIFromList(imgs, ap)
 	if err != nil {
 		return err
@@ -61,7 +61,7 @@ func RenderACIFromList(imgs acirenderer.Images, dir string, ap acirenderer.ACIPr
 // The manifest will be extracted from the upper ACI.
 // No file overwriting is done as it should usually be called
 // providing an empty directory.
-func renderImage(renderedACI acirenderer.RenderedACI, dir string, ap acirenderer.ACIProvider, uidRange *uid.UidRange) error {
+func renderImage(renderedACI acirenderer.RenderedACI, dir string, ap acirenderer.ACIProvider, uidRange *user.UidRange) error {
 	for _, ra := range renderedACI {
 		rs, err := ap.ReadStream(ra.Key)
 		if err != nil {
diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go
index 15c5774cd4..9b22e5e12f 100644
--- a/pkg/fileutil/fileutil.go
+++ b/pkg/fileutil/fileutil.go
@@ -22,7 +22,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 
 	"github.com/appc/spec/pkg/device"
 )
@@ -60,7 +60,7 @@ func CopySymlink(src, dest string) error {
 	return nil
 }
 
-func CopyTree(src, dest string, uidRange *uid.UidRange) error {
+func CopyTree(src, dest string, uidRange *user.UidRange) error {
 	cleanSrc := filepath.Clean(src)
 
 	dirs := make(map[string][]syscall.Timespec)
diff --git a/pkg/fileutil/fileutil_test.go b/pkg/fileutil/fileutil_test.go
index 08e386734d..aa68ac9b28 100644
--- a/pkg/fileutil/fileutil_test.go
+++ b/pkg/fileutil/fileutil_test.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 )
 
 const tstprefix = "fileutil-test"
@@ -95,7 +95,7 @@ func TestCopyTree(t *testing.T) {
 	createTree(t, src, tr)
 
 	// absolute paths
-	if err := CopyTree(src, dst, uid.NewBlankUidRange()); err != nil {
+	if err := CopyTree(src, dst, user.NewBlankUidRange()); err != nil {
 		t.Fatal(err)
 	}
 	checkTree(t, dst, tr)
@@ -106,13 +106,13 @@ func TestCopyTree(t *testing.T) {
 	}
 
 	dst = "dst-rel1"
-	if err := CopyTree("././src/", dst, uid.NewBlankUidRange()); err != nil {
+	if err := CopyTree("././src/", dst, user.NewBlankUidRange()); err != nil {
 		t.Fatal(err)
 	}
 	checkTree(t, dst, tr)
 
 	dst = "./dst-rel2"
-	if err := CopyTree("./src", dst, uid.NewBlankUidRange()); err != nil {
+	if err := CopyTree("./src", dst, user.NewBlankUidRange()); err != nil {
 		t.Fatal(err)
 	}
 	checkTree(t, dst, tr)
diff --git a/pkg/tar/chroot.go b/pkg/tar/chroot.go
index c30fad8670..d835fdd155 100644
--- a/pkg/tar/chroot.go
+++ b/pkg/tar/chroot.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/coreos/rkt/pkg/multicall"
 	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/hashicorp/errwrap"
 )
 
@@ -68,7 +68,7 @@ func extractTarCommand() error {
 		return errwrap.Wrap(errors.New("error parsing uidShift argument"), err)
 	}
 
-	uidRange := &uid.UidRange{Shift: uint32(us), Count: uint32(uc)}
+	uidRange := &user.UidRange{Shift: uint32(us), Count: uint32(uc)}
 
 	if err := syscall.Chroot(dir); err != nil {
 		return errwrap.Wrap(fmt.Errorf("failed to chroot in %s", dir), err)
@@ -101,7 +101,7 @@ func extractTarCommand() error {
 // If overwrite is true, existing files will be overwritten.
 // The extraction is executed by fork/exec()ing a new process. The new process
 // needs the CAP_SYS_CHROOT capability.
-func ExtractTar(rs io.Reader, dir string, overwrite bool, uidRange *uid.UidRange, pwl PathWhitelistMap) error {
+func ExtractTar(rs io.Reader, dir string, overwrite bool, uidRange *user.UidRange, pwl PathWhitelistMap) error {
 	r, w, err := os.Pipe()
 	if err != nil {
 		return err
diff --git a/pkg/tar/tar.go b/pkg/tar/tar.go
index 1b20706d05..0d8f27ad87 100644
--- a/pkg/tar/tar.go
+++ b/pkg/tar/tar.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/appc/spec/pkg/device"
 	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/hashicorp/errwrap"
 )
 
@@ -41,7 +41,7 @@ type PathWhitelistMap map[string]struct{}
 
 type FilePermissionsEditor func(string, int, int, byte, os.FileInfo) error
 
-func NewUidShiftingFilePermEditor(uidRange *uid.UidRange) (FilePermissionsEditor, error) {
+func NewUidShiftingFilePermEditor(uidRange *user.UidRange) (FilePermissionsEditor, error) {
 	if os.Geteuid() != 0 {
 		return func(_ string, _, _ int, _ byte, _ os.FileInfo) error {
 			// The files are owned by the current user on creation.
diff --git a/pkg/tar/tar_test.go b/pkg/tar/tar_test.go
index f24ea285de..0363ad86c6 100644
--- a/pkg/tar/tar_test.go
+++ b/pkg/tar/tar_test.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/coreos/rkt/pkg/multicall"
 	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 )
 
 func init() {
@@ -792,7 +792,7 @@ func extractTarHelper(rdr io.Reader, target string) error {
 }
 
 func extractTarHelperPWL(rdr io.Reader, target string, pwl PathWhitelistMap) error {
-	return ExtractTar(rdr, target, false, uid.NewBlankUidRange(), pwl)
+	return ExtractTar(rdr, target, false, user.NewBlankUidRange(), pwl)
 }
 
 func extractTarInsecureHelper(rdr io.Reader, target string) error {
@@ -800,7 +800,7 @@ func extractTarInsecureHelper(rdr io.Reader, target string) error {
 }
 
 func extractTarInsecureHelperPWL(rdr io.Reader, target string, pwl PathWhitelistMap) error {
-	editor, err := NewUidShiftingFilePermEditor(uid.NewBlankUidRange())
+	editor, err := NewUidShiftingFilePermEditor(user.NewBlankUidRange())
 	if err != nil {
 		return err
 	}
diff --git a/pkg/user/doc.go b/pkg/user/doc.go
new file mode 100644
index 0000000000..6396db1c4e
--- /dev/null
+++ b/pkg/user/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package user allows resolving user UIDs/GIDs using various methods.
+// It also provides an implementation for shifting UIDs/GIDs.
+package user
diff --git a/pkg/user/resolver.go b/pkg/user/resolver.go
new file mode 100644
index 0000000000..855c59a430
--- /dev/null
+++ b/pkg/user/resolver.go
@@ -0,0 +1,143 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package user
+
+import (
+	"errors"
+	"fmt"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/coreos/rkt/pkg/group"
+	"github.com/coreos/rkt/pkg/passwd"
+	"github.com/hashicorp/errwrap"
+)
+
+// Resolver defines the interface for resolving a UID/GID.
+type Resolver interface {
+	IDs() (uid int, gid int, err error)
+}
+
+type idsFromEtc struct {
+	rootPath string
+	username string
+	group    string
+}
+
+// IDsFromEtc returns a new UID/GID resolver by parsing etc/passwd, and etc/group
+// relative from the given rootPath looking for the given username, or group.
+// If username is empty string the etc/passwd lookup will be ommitted.
+// If group is empty string the etc/group lookup will be ommitted.
+func IDsFromEtc(rootPath, username, group string) (Resolver, error) {
+	return idsFromEtc{
+		rootPath: rootPath,
+		username: username,
+		group:    group,
+	}, nil
+}
+
+func (e idsFromEtc) IDs() (uid int, gid int, err error) {
+	uid, gid = -1, -1
+
+	uid, err = passwd.LookupUidFromFile(
+		e.username,
+		filepath.Join(e.rootPath, "etc/passwd"),
+	)
+
+	if e.username != "" && err != nil {
+		return
+	}
+
+	gid, err = group.LookupGidFromFile(
+		e.group,
+		filepath.Join(e.rootPath, "etc/group"),
+	)
+
+	if e.group != "" && err != nil {
+		return
+	}
+
+	return uid, gid, nil
+}
+
+type idsFromStat struct {
+	path string
+	r    *UidRange
+}
+
+// IDsFromStat returns a new UID/GID resolver deriving the UID/GID from file attributes
+// and unshifts the UID/GID if the given range is not nil.
+// If the given id does not start with a slash "/" an error is returned.
+func IDsFromStat(rootPath, file string, r *UidRange) (Resolver, error) {
+	if strings.HasPrefix(file, "/") {
+		return idsFromStat{filepath.Join(rootPath, file), r}, nil
+	}
+
+	return nil, fmt.Errorf("invalid filename %q", file)
+}
+
+func (s idsFromStat) IDs() (int, int, error) {
+	var stat syscall.Stat_t
+
+	if err := syscall.Lstat(s.path, &stat); err != nil {
+		return -1, -1, errwrap.Wrap(
+			fmt.Errorf("unable to stat file %q", s.path),
+			err,
+		)
+	}
+
+	if s.r == nil {
+		return int(stat.Uid), int(stat.Gid), nil
+	}
+
+	uid, _, err := s.r.UnshiftRange(stat.Uid, stat.Gid)
+	if err != nil {
+		return -1, -1, errwrap.Wrap(errors.New("unable to determine real uid"), err)
+	}
+
+	_, gid, err := s.r.UnshiftRange(stat.Uid, stat.Gid)
+	if err != nil {
+		return -1, -1, errwrap.Wrap(errors.New("unable to determine real gid"), err)
+	}
+
+	return int(uid), int(gid), nil
+}
+
+// numericIDs is the struct that always resolves to uid=i and gid=i.
+type numericIDs struct {
+	i int
+}
+
+// NumericIDs returns a resolver that will resolve constant UID/GID values.
+// If the given id equals to "root" the resolver always resolves UID=0 and GID=0.
+// If the given id is a numeric literal i it always resolves UID=i and GID=i.
+// If the given id is neither "root" nor a numeric literal an error is returned.
+func NumericIDs(id string) (Resolver, error) {
+	if id == "root" {
+		return numericIDs{0}, nil
+	}
+
+	if i, err := strconv.Atoi(id); err == nil {
+		return numericIDs{i}, nil
+	}
+
+	return nil, fmt.Errorf("invalid id %q", id)
+}
+
+func (n numericIDs) IDs() (int, int, error) {
+	return n.i, n.i, nil
+}
diff --git a/pkg/user/resolver_test.go b/pkg/user/resolver_test.go
new file mode 100644
index 0000000000..db97a475d2
--- /dev/null
+++ b/pkg/user/resolver_test.go
@@ -0,0 +1,350 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package user_test
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strconv"
+	"testing"
+
+	osuser "os/user"
+
+	"github.com/coreos/rkt/pkg/user"
+)
+
+const (
+	maxInt = int(^uint(0) >> 1)
+	minInt = -maxInt - 1
+)
+
+func TestNumeric(t *testing.T) {
+	for i, tt := range []struct {
+		id string
+
+		// expected
+		err      bool
+		uid, gid int
+	}{
+		{
+			id:  "foo",
+			err: true,
+		},
+		{
+			id:  "",
+			err: true,
+		},
+		{
+			id:  "root",
+			uid: 0, gid: 0,
+		},
+		{
+			id:  "0",
+			uid: 0, gid: 0,
+		},
+		{
+			id:  "1",
+			uid: 1, gid: 1,
+		},
+		{
+			id:  strconv.Itoa(minInt),
+			uid: minInt, gid: minInt,
+		},
+		{
+			id:  strconv.Itoa(maxInt),
+			uid: maxInt, gid: maxInt,
+		},
+		{
+			id:  "9223372036854775808", // overflow (64bit) int by one
+			err: true,
+		},
+		{
+			id:  "-9223372036854775809", // overflow (64bit) int by one
+			err: true,
+		},
+		{
+			id:  "-1",
+			uid: -1, gid: -1,
+		},
+	} {
+		gen, err := user.NumericIDs(tt.id)
+		if err == nil && tt.err {
+			t.Errorf("test %d: expected err but got none", i)
+		}
+
+		if err != nil {
+			continue
+		}
+
+		uid, gid, err := gen.IDs()
+		if err != nil {
+			panic(err) // must not happen
+		}
+
+		if uid != tt.uid {
+			t.Errorf("test %d: expected uid %d but got %d", i, tt.uid, uid)
+		}
+
+		if gid != tt.gid {
+			t.Errorf("test %d: expected gid %d but got %d", i, tt.gid, gid)
+		}
+	}
+}
+
+func TestFromEtc(t *testing.T) {
+	root, err := ioutil.TempDir("", "rkt-TestFromEtc-")
+	if err != nil {
+		panic(err)
+	}
+
+	defer os.RemoveAll(root)
+
+	if err := os.Mkdir(
+		filepath.Join(root, "etc"),
+		0700,
+	); err != nil {
+		panic(err)
+	}
+
+	if err := ioutil.WriteFile(
+		filepath.Join(root, "etc/passwd"),
+		[]byte(`u1:xxx:1000:100:::`),
+		0600,
+	); err != nil {
+		panic(err)
+	}
+
+	if err := ioutil.WriteFile(
+		filepath.Join(root, "etc/group"),
+		[]byte(`g1:xxx:100:u1`),
+		0600,
+	); err != nil {
+		panic(err)
+	}
+
+	for i, tt := range []struct {
+		username, group string
+
+		// expected
+		err      bool
+		uid, gid int
+	}{
+		{
+			uid: -1,
+			gid: -1,
+			err: false,
+		},
+		{
+			username: "unknown",
+
+			uid: -1,
+			gid: -1,
+			err: true,
+		},
+		{
+			group: "unknown",
+
+			uid: -1,
+			gid: -1,
+			err: true,
+		},
+		{
+			username: "u1",
+
+			uid: 1000,
+			gid: -1,
+			err: false,
+		},
+		{
+			username: "u1",
+			group:    "unknown",
+
+			uid: 1000,
+			gid: -1,
+			err: true,
+		},
+		{
+			group: "g1",
+
+			uid: -1,
+			gid: 100,
+			err: false,
+		},
+		{
+			username: "unknown",
+			group:    "g1",
+
+			uid: -1,
+			gid: -1,
+			err: true,
+		},
+		{
+			username: "u1",
+			group:    "g1",
+
+			uid: 1000,
+			gid: 100,
+			err: false,
+		},
+	} {
+		gen, err := user.IDsFromEtc(root, tt.username, tt.group)
+		if err != nil {
+			panic(err)
+		}
+
+		uid, gid, err := gen.IDs()
+		if err == nil && tt.err {
+			t.Errorf("test %d: expected err but got none", i)
+		}
+
+		if err != nil && !tt.err {
+			t.Errorf("test %d: expected no err but got one", i)
+		}
+
+		if uid != tt.uid {
+			t.Errorf("test %d: expected uid %d but got %d", i, tt.uid, uid)
+		}
+
+		if gid != tt.gid {
+			t.Errorf("test %d: expected gid %d but got %d", i, tt.gid, gid)
+		}
+	}
+}
+
+func TestStat(t *testing.T) {
+	tmp, err := ioutil.TempFile("", "rkt-TestStat-")
+	if err != nil {
+		panic(err)
+	}
+
+	defer os.Remove(tmp.Name())
+
+	rng := user.NewBlankUidRange()
+	rng.SetRandomUidRange(100)
+
+	u, err := osuser.Current()
+	if err != nil {
+		panic(err)
+	}
+
+	procUid, err := strconv.Atoi(u.Uid)
+	if err != nil {
+		panic(err)
+	}
+
+	procGid, err := strconv.Atoi(u.Gid)
+	if err != nil {
+		panic(err)
+	}
+
+	for i, tt := range []struct {
+		root, path string
+
+		// expected
+		errIDs, err bool
+		uid, gid    int
+	}{
+		{
+			root: "",
+			path: "",
+
+			err: true,
+		},
+		{
+			root: "unknown",
+			path: "",
+
+			err: true,
+		},
+		{
+			root: "",
+			path: "unknown",
+
+			err: true,
+		},
+		{
+			root: "",
+			path: tmp.Name(),
+
+			uid: procUid,
+			gid: procGid,
+		},
+		{
+			root: "/",
+			path: tmp.Name(),
+
+			uid: procUid,
+			gid: procGid,
+		},
+		{
+			root: "unknown",
+			path: tmp.Name(),
+
+			errIDs: true,
+			uid:    -1,
+			gid:    -1,
+		},
+		{
+			root: filepath.Dir(tmp.Name()),
+			path: "",
+
+			err: true,
+		},
+		{
+			root: filepath.Dir(tmp.Name()),
+			path: "/" + filepath.Base(tmp.Name()),
+
+			uid: procUid,
+			gid: procGid,
+		},
+		{
+			root: filepath.Dir(tmp.Name()),
+			path: "/unknown",
+
+			errIDs: true,
+			uid:    -1,
+			gid:    -1,
+		},
+		{
+			root: filepath.Dir(tmp.Name()),
+			path: "unknown",
+
+			err: true,
+		},
+	} {
+		gen, err := user.IDsFromStat(tt.root, tt.path, nil)
+		if err == nil && tt.err {
+			t.Errorf("test %d: expected error but got one", i)
+		}
+
+		if err != nil {
+			continue
+		}
+
+		uid, gid, err := gen.IDs()
+		if err == nil && tt.errIDs {
+			t.Errorf("test %d: expected err but got none", i)
+		}
+
+		if uid != tt.uid {
+			t.Errorf("test %d: expected uid %d but got %d", i, tt.uid, uid)
+		}
+
+		if gid != tt.gid {
+			t.Errorf("test %d: expected gid %d but got %d", i, tt.gid, gid)
+		}
+	}
+}
diff --git a/pkg/uid/uid.go b/pkg/user/uid_range.go
similarity index 99%
rename from pkg/uid/uid.go
rename to pkg/user/uid_range.go
index 79843df4ef..4f99abab85 100644
--- a/pkg/uid/uid.go
+++ b/pkg/user/uid_range.go
@@ -15,7 +15,7 @@
 // For how the uidshift and uidcount are generated please check:
 // http://cgit.freedesktop.org/systemd/systemd/commit/?id=03cfe0d51499e86b1573d1
 
-package uid
+package user
 
 import (
 	"errors"
diff --git a/rkt/image_extract.go b/rkt/image_extract.go
index 6fa2b906c5..e90df89817 100644
--- a/rkt/image_extract.go
+++ b/rkt/image_extract.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/pkg/tar"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/store"
 
 	"github.com/spf13/cobra"
@@ -124,7 +124,7 @@ func runImageExtract(cmd *cobra.Command, args []string) (exit int) {
 		}
 	}
 
-	if err := tar.ExtractTar(aci, extractDir, false, uid.NewBlankUidRange(), nil); err != nil {
+	if err := tar.ExtractTar(aci, extractDir, false, user.NewBlankUidRange(), nil); err != nil {
 		stderr.PrintE("error extracting ACI", err)
 		return 1
 	}
@@ -134,7 +134,7 @@ func runImageExtract(cmd *cobra.Command, args []string) (exit int) {
 		if err := os.Rename(rootfsDir, absOutputDir); err != nil {
 			if e, ok := err.(*os.LinkError); ok && e.Err == syscall.EXDEV {
 				// it's on a different device, fall back to copying
-				if err := fileutil.CopyTree(rootfsDir, absOutputDir, uid.NewBlankUidRange()); err != nil {
+				if err := fileutil.CopyTree(rootfsDir, absOutputDir, user.NewBlankUidRange()); err != nil {
 					stderr.PrintE("error copying ACI rootfs", err)
 					return 1
 				}
diff --git a/rkt/image_render.go b/rkt/image_render.go
index 9d374e9f1c..43b4426251 100644
--- a/rkt/image_render.go
+++ b/rkt/image_render.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 
 	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/store"
 
 	"github.com/spf13/cobra"
@@ -127,7 +127,7 @@ func runImageRender(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	cachedTreePath := s.GetTreeStoreRootFS(id)
-	if err := fileutil.CopyTree(cachedTreePath, rootfsOutDir, uid.NewBlankUidRange()); err != nil {
+	if err := fileutil.CopyTree(cachedTreePath, rootfsOutDir, user.NewBlankUidRange()); err != nil {
 		stderr.PrintE("error copying ACI rootfs", err)
 		return 1
 	}
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 127d176113..061028411e 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -22,7 +22,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/lock"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/rkt/image"
 	"github.com/coreos/rkt/stage0"
 	"github.com/coreos/rkt/store"
@@ -81,7 +81,7 @@ func init() {
 func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 	var err error
 	origStdout := os.Stdout
-	privateUsers := uid.NewBlankUidRange()
+	privateUsers := user.NewBlankUidRange()
 	if flagQuiet {
 		if os.Stdout, err = os.Open("/dev/null"); err != nil {
 			stderr.PrintE("unable to open /dev/null", err)
@@ -99,7 +99,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 			stderr.Print("--private-users is not supported, kernel compiled without user namespace support")
 			return 1
 		}
-		privateUsers.SetRandomUidRange(uid.DefaultRangeCount)
+		privateUsers.SetRandomUidRange(user.DefaultRangeCount)
 	}
 
 	if err = parseApps(&rktApps, args, cmd.Flags(), true); err != nil {
diff --git a/rkt/run.go b/rkt/run.go
index 01ba367925..3762d307ba 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -25,7 +25,7 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/label"
 	"github.com/coreos/rkt/pkg/lock"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/rkt/image"
 	"github.com/coreos/rkt/stage0"
 	"github.com/coreos/rkt/store"
@@ -114,7 +114,7 @@ func init() {
 }
 
 func runRun(cmd *cobra.Command, args []string) (exit int) {
-	privateUsers := uid.NewBlankUidRange()
+	privateUsers := user.NewBlankUidRange()
 	err := parseApps(&rktApps, args, cmd.Flags(), true)
 	if err != nil {
 		stderr.PrintE("error parsing app image arguments", err)
@@ -131,7 +131,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 			stderr.Print("--private-users is not supported, kernel compiled without user namespace support")
 			return 1
 		}
-		privateUsers.SetRandomUidRange(uid.DefaultRangeCount)
+		privateUsers.SetRandomUidRange(user.DefaultRangeCount)
 	}
 
 	if len(flagPorts) > 0 && flagNet.None() {
diff --git a/stage0/run.go b/stage0/run.go
index cbacd50fd7..a9a1dd9647 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -47,7 +47,7 @@ import (
 	"github.com/coreos/rkt/pkg/label"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/pkg/tpm"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/store"
 	"github.com/coreos/rkt/version"
 	"github.com/hashicorp/errwrap"
@@ -76,7 +76,7 @@ type PrepareConfig struct {
 	UseOverlay         bool                // prepare pod with overlay fs
 	SkipTreeStoreCheck bool                // skip checking the treestore before rendering
 	PodManifest        string              // use the pod manifest specified by the user, this will ignore flags such as '--volume', '--port', etc.
-	PrivateUsers       *uid.UidRange       // User namespaces
+	PrivateUsers       *user.UidRange      // User namespaces
 }
 
 // configuration parameters needed by Run
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 2a9f6e5bf3..43c8f8d011 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -21,7 +21,7 @@ import (
 	"syscall"
 
 	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -158,7 +158,7 @@ func PrepareMountpoints(volPath string, targetPath string, vol *types.Volume, do
 			Uid = int(fi.Sys().(*syscall.Stat_t).Uid)
 			Gid = int(fi.Sys().(*syscall.Stat_t).Gid)
 
-			if err := fileutil.CopyTree(targetPath, volPath, uid.NewBlankUidRange()); err != nil {
+			if err := fileutil.CopyTree(targetPath, volPath, user.NewBlankUidRange()); err != nil {
 				return errwrap.Wrap(fmt.Errorf("error copying image files to empty volume %q", volPath), err)
 			}
 		}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index b6477b1fef..11b077c075 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -28,11 +28,8 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"syscall"
 
 	"github.com/coreos/rkt/pkg/acl"
-	"github.com/coreos/rkt/pkg/group"
-	"github.com/coreos/rkt/pkg/passwd"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 
 	"github.com/appc/spec/schema"
@@ -43,7 +40,7 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 )
 
 const (
@@ -271,7 +268,7 @@ func findHostPort(pm schema.PodManifest, name types.ACName) uint {
 // service files of apps.
 // If there're several apps defining the same UIDs/GIDs, systemd will take care
 // of only generating one /etc/{passwd,group} entry
-func generateSysusers(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uid_ int, gid_ int, uidRange *uid.UidRange) error {
+func generateSysusers(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uid_ int, gid_ int, uidRange *user.UidRange) error {
 	var toShift []string
 
 	app := ra.App
@@ -414,7 +411,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 	envFilePathSystemd := EnvFilePathSystemd(p.Root, appName)
 	envFilePathEnterexec := EnvFilePathEnterexec(p.Root, appName)
 
-	uidRange := uid.NewBlankUidRange()
+	uidRange := user.NewBlankUidRange()
 	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
 		return err
 	}
@@ -603,66 +600,48 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 //   3. a number
 //   4. a name in reference to /etc/{group,passwd} in the image
 // See https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
-func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uidRange *uid.UidRange) (int, int, error) {
-	app := ra.App
-	appName := ra.Name
-
-	var uid_, gid_ int
+func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uidRange *user.UidRange) (int, int, error) {
+	var uidResolver, gidResolver user.Resolver
+	var uid, gid int
 	var err error
 
-	switch {
-	case app.User == "root":
-		uid_ = 0
-	case strings.HasPrefix(app.User, "/"):
-		var stat syscall.Stat_t
-		if err = syscall.Lstat(filepath.Join(common.AppRootfsPath(p.Root, appName),
-			app.User), &stat); err != nil {
-			return -1, -1, errwrap.Wrap(fmt.Errorf("unable to get uid from file %q",
-				app.User), err)
-		}
-		uidReal, _, err := uidRange.UnshiftRange(stat.Uid, stat.Gid)
-		if err != nil {
-			return -1, -1, errwrap.Wrap(errors.New("unable to determine real uid"), err)
-		}
-		uid_ = int(uidReal)
-	default:
-		uid_, err = strconv.Atoi(app.User)
-		if err != nil {
-			uid_, err = passwd.LookupUidFromFile(app.User,
-				filepath.Join(common.AppRootfsPath(p.Root, appName), "etc/passwd"))
-			if err != nil {
-				return -1, -1, errwrap.Wrap(fmt.Errorf("cannot lookup user %q", app.User), err)
-			}
-		}
+	root := common.AppRootfsPath(p.Root, ra.Name)
+
+	uidResolver, err = user.NumericIDs(ra.App.User)
+	if err != nil {
+		uidResolver, err = user.IDsFromStat(root, ra.App.User, uidRange)
 	}
 
-	switch {
-	case app.Group == "root":
-		gid_ = 0
-	case strings.HasPrefix(app.Group, "/"):
-		var stat syscall.Stat_t
-		if err = syscall.Lstat(filepath.Join(common.AppRootfsPath(p.Root, appName),
-			app.Group), &stat); err != nil {
-			return -1, -1, errwrap.Wrap(fmt.Errorf("unable to get gid from file %q",
-				app.Group), err)
-		}
-		_, gidReal, err := uidRange.UnshiftRange(stat.Uid, stat.Gid)
-		if err != nil {
-			return -1, -1, errwrap.Wrap(errors.New("unable to determine real gid"), err)
-		}
-		gid_ = int(gidReal)
-	default:
-		gid_, err = strconv.Atoi(app.Group)
-		if err != nil {
-			gid_, err = group.LookupGidFromFile(app.Group,
-				filepath.Join(common.AppRootfsPath(p.Root, appName), "etc/group"))
-			if err != nil {
-				return -1, -1, errwrap.Wrap(fmt.Errorf("cannot lookup group %q", app.Group), err)
-			}
-		}
+	if err != nil {
+		uidResolver, err = user.IDsFromEtc(root, ra.App.User, "")
+	}
+
+	if err != nil { // give up
+		return -1, -1, errwrap.Wrap(fmt.Errorf("invalid user %q", ra.App.User), err)
+	}
+
+	if uid, _, err = uidResolver.IDs(); err != nil {
+		return -1, -1, errwrap.Wrap(fmt.Errorf("failed to configure user %q", ra.App.User), err)
+	}
+
+	gidResolver, err = user.NumericIDs(ra.App.Group)
+	if err != nil {
+		gidResolver, err = user.IDsFromStat(root, ra.App.Group, uidRange)
+	}
+
+	if err != nil {
+		gidResolver, err = user.IDsFromEtc(root, "", ra.App.Group)
+	}
+
+	if err != nil { // give up
+		return -1, -1, errwrap.Wrap(fmt.Errorf("invalid group %q", ra.App.Group), err)
+	}
+
+	if _, gid, err = gidResolver.IDs(); err != nil {
+		return -1, -1, errwrap.Wrap(fmt.Errorf("failed to configure group %q", ra.App.Group), err)
 	}
 
-	return uid_, gid_, nil
+	return uid, gid, nil
 }
 
 func writeShutdownService(p *stage1commontypes.Pod) error {
@@ -713,7 +692,7 @@ func writeShutdownService(p *stage1commontypes.Pod) error {
 // writeEnvFile creates an environment file for given app name, the minimum
 // required environment variables by the appc spec will be set to sensible
 // defaults here if they're not provided by env.
-func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types.ACName, uidRange *uid.UidRange, separator byte, envFilePath string) error {
+func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types.ACName, uidRange *user.UidRange, separator byte, envFilePath string) error {
 	ef := bytes.Buffer{}
 
 	for dk, dv := range defaultEnv {
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index dd7e8dbd3f..396ef39ebd 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -22,6 +22,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"syscall"
 
@@ -32,6 +33,7 @@ import (
 	"github.com/coreos/rkt/common"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/sys"
+	"github.com/coreos/rkt/pkg/user"
 	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 )
@@ -337,6 +339,39 @@ func stage1() int {
 		return 1
 	}
 
+	var uidResolver, gidResolver user.Resolver
+	var uid, gid int
+
+	uidResolver, err = user.NumericIDs(ra.App.User)
+	if err != nil {
+		uidResolver, err = user.IDsFromStat(rfs, ra.App.User, nil)
+	}
+
+	if err != nil { // give up
+		log.PrintE(fmt.Sprintf("invalid user %q", ra.App.User), err)
+		return 1
+	}
+
+	if uid, _, err = uidResolver.IDs(); err != nil {
+		log.PrintE(fmt.Sprintf("failed to configure user %q", ra.App.User), err)
+		return 1
+	}
+
+	gidResolver, err = user.NumericIDs(ra.App.Group)
+	if err != nil {
+		gidResolver, err = user.IDsFromStat(rfs, ra.App.Group, nil)
+	}
+
+	if err != nil { // give up
+		log.PrintE(fmt.Sprintf("invalid group %q", ra.App.Group), err)
+		return 1
+	}
+
+	if _, gid, err = gidResolver.IDs(); err != nil {
+		log.PrintE(fmt.Sprintf("failed to configure group %q", ra.App.Group), err)
+		return 1
+	}
+
 	diag.Printf("chroot to %q", rfs)
 	if err := syscall.Chroot(rfs); err != nil {
 		log.PrintE("can't chroot", err)
@@ -348,6 +383,23 @@ func stage1() int {
 		return 1
 	}
 
+	// lock the current goroutine to its current OS thread.
+	// This will force the subsequent syscalls to be executed in the same OS thread as Setresuid, and Setresgid,
+	// see https://github.com/golang/go/issues/1435#issuecomment-66054163.
+	runtime.LockOSThread()
+
+	diag.Printf("setting uid %d gid %d", uid, gid)
+
+	if err := syscall.Setresgid(gid, gid, gid); err != nil {
+		log.PrintE(fmt.Sprintf("can't set gid %d", gid), err)
+		return 1
+	}
+
+	if err := syscall.Setresuid(uid, uid, uid); err != nil {
+		log.PrintE(fmt.Sprintf("can't set uid %d", uid), err)
+		return 1
+	}
+
 	diag.Printf("execing %q in %q", args, rfs)
 	err = stage1common.WithClearedCloExec(lfd, func() error {
 		return syscall.Exec(args[0], args, env)
diff --git a/store/backup.go b/store/backup.go
index b6c02e4938..dfda1cf1ef 100644
--- a/store/backup.go
+++ b/store/backup.go
@@ -21,7 +21,7 @@ import (
 	"strconv"
 
 	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 )
 
 // createBackup backs a database up in a given directory. It basically
@@ -37,7 +37,7 @@ func createBackup(dbDir, backupsDir string, limit int) error {
 	if err := os.MkdirAll(backupsDir, defaultPathPerm); err != nil {
 		return err
 	}
-	if err := fileutil.CopyTree(dbDir, tmpBackupDir, uid.NewBlankUidRange()); err != nil {
+	if err := fileutil.CopyTree(dbDir, tmpBackupDir, user.NewBlankUidRange()); err != nil {
 		return err
 	}
 	defer os.RemoveAll(tmpBackupDir)
diff --git a/store/tree.go b/store/tree.go
index f098cf5f36..56f9a578a5 100644
--- a/store/tree.go
+++ b/store/tree.go
@@ -33,7 +33,7 @@ import (
 	"github.com/coreos/rkt/pkg/aci"
 	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/pkg/uid"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/hashicorp/errwrap"
 )
 
@@ -66,7 +66,7 @@ func (ts *TreeStore) Write(id string, key string, s *Store) (string, error) {
 	if err := os.MkdirAll(treepath, 0755); err != nil {
 		return "", errwrap.Wrap(fmt.Errorf("cannot create treestore directory %s", treepath), err)
 	}
-	err = aci.RenderACIWithImageID(*imageID, treepath, s, uid.NewBlankUidRange())
+	err = aci.RenderACIWithImageID(*imageID, treepath, s, user.NewBlankUidRange())
 	if err != nil {
 		return "", errwrap.Wrap(errors.New("cannot render aci"), err)
 	}

From 45ca65de765e919b27575f36d43b93ac3daaa561 Mon Sep 17 00:00:00 2001
From: Shaya Potter <spotter@gmail.com>
Date: Mon, 2 May 2016 14:22:27 -0700
Subject: [PATCH 0215/1304] tests: add PodSubCgroup filter test to Cgroup
 filter test

---
 tests/rkt_api_service_test.go | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 753a9fc914..2a5769b765 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
 	"reflect"
 	"strings"
 	"syscall"
@@ -499,6 +500,7 @@ func NewAPIServiceCgroupTest() testutils.Test {
 		testutils.WaitOrTimeout(t, time.Second*30, done)
 
 		var cgroups []string
+		var subcgroups []string
 
 		for _, p := range resp.Pods {
 			checkPodBasics(t, ctx, p)
@@ -511,6 +513,7 @@ func NewAPIServiceCgroupTest() testutils.Test {
 			checkPodDetails(t, ctx, inspectResp.Pod)
 			if p.Cgroup != "" {
 				cgroups = append(cgroups, p.Cgroup)
+				subcgroups = append(subcgroups, filepath.Join(p.Cgroup, "system.slice"))
 			}
 		}
 
@@ -531,6 +534,22 @@ func NewAPIServiceCgroupTest() testutils.Test {
 			checkPodDetails(t, ctx, p)
 		}
 
+		resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{
+			Detail:  true,
+			Filters: []*v1alpha.PodFilter{{PodSubCgroups: subcgroups}},
+		})
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		if len(resp.Pods) == 0 {
+			t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
+		}
+
+		for _, p := range resp.Pods {
+			checkPodDetails(t, ctx, p)
+		}
+
 		// Terminate the pod.
 		if err := child.SendLine("Good bye"); err != nil {
 			t.Fatalf("Failed to send message to the pod: %v", err)

From 7bb2b5e85b8903242361d47ddc42403308f3200f Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 3 May 2016 14:02:53 +0200
Subject: [PATCH 0216/1304] docs: FirewallD caveat on Fedora

---
 Documentation/distributions.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 6b86e3fa00..079eabd5ea 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -34,16 +34,19 @@ Or permanently disabled by editing `/etc/selinux/config`:
 SELINUX=permissive
 ```
 
-#### Caveat: firewall
+#### Caveat: firewalld
 
-The default firewall rules can block the traffic from rkt pods.
-See [#2206](https://github.com/coreos/rkt/issues/2206).
-As a workaround, they can be removed:
+Fedora uses [firewalld](https://fedoraproject.org/wiki/FirewallD) to dynamically define firewall zones.
+rkt is [not yet fully integrated with firewalld](https://github.com/coreos/rkt/issues/2206).
+The default firewalld rules may interfere with the network connectivity of rkt pods.
+To work around this, add a firewalld rule to allow pod traffic:
 ```
-sudo iptables -F
-sudo iptables -F -t nat
+sudo firewall-cmd --add-source=172.16.28.0/24 --zone=trusted
 ```
 
+172.16.28.0/24 is the subnet of the [default pod network](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md#the-default-network). The command must be adapted when rkt is configured to use a [different network](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md#setting-up-additional-networks) with a different subnet.
+
+
 ## Arch
 
 rkt is available in the [Arch User Repository (AUR)](https://aur.archlinux.org/packages/rkt).

From 22897d1cbabf613b0a1ff2bf370f420805a0a627 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 3 May 2016 14:06:32 +0200
Subject: [PATCH 0217/1304] README.md: add a link to distributions.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c11bab146c..12611baa68 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@ Check out the [roadmap](ROADMAP.md) for more details on the future of rkt.
 ## Trying out rkt
 
 To get started quickly using rkt for the first time, start with the ["trying out rkt" document](Documentation/trying-out-rkt.md).
+Also check [rkt support on your Linux distribution](Documentation/distributions.md).
 For an end-to-end example of building an application from scratch and running it with rkt, check out the [getting started guide](Documentation/getting-started-guide.md).
 
 ## Getting help with rkt

From d745a599ec8d5822f783ae53cbdd494062500f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 4 May 2016 15:02:04 +0200
Subject: [PATCH 0218/1304] Documentation: how to update coreos flavor stage1

This adds instructions to update the CoreOS image use to build the
coreos flavor stage1.

We usually want to do this to get a newer version of systemd.
---
 Documentation/devel/update-coreos-stage1.md | 129 ++++++++++++++++++++
 Documentation/hacking.md                    |   4 +
 2 files changed, 133 insertions(+)
 create mode 100644 Documentation/devel/update-coreos-stage1.md

diff --git a/Documentation/devel/update-coreos-stage1.md b/Documentation/devel/update-coreos-stage1.md
new file mode 100644
index 0000000000..b51e138cb7
--- /dev/null
+++ b/Documentation/devel/update-coreos-stage1.md
@@ -0,0 +1,129 @@
+# Update coreos flavor stage1
+
+This guide will guide you through updating the version of the coreos flavor of stage1.
+We usually want to do this to update the systemd version used by the stage1.
+
+The process is quite manual because it's not done often, but improvements are welcomed.
+
+## Extract the root filesystem of the image
+
+Let's assume you want to update from version 991.0.0 to version 1032.0.0.
+
+First, you need to download and verify the image.
+Make sure you trust the [CoreOS Image Signing Key](https://coreos.com/security/image-signing-key/).
+
+Since 1032.0.0 is currently only available in the Alpha channel, we'll use the alpha URL:
+
+```
+$ mkdir /tmp/coreos-image
+$ curl -O https://alpha.release.core-os.net/amd64-usr/1032.0.0/coreos_production_pxe_image.cpio.gz
+  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+                                 Dload  Upload   Total   Spent    Left  Speed
+100  222M  100  222M    0     0  7769k      0  0:00:29  0:00:29 --:--:-- 7790k
+$ curl -O http://alpha.release.core-os.net/amd64-usr/1032.0.0/coreos_production_pxe_image.cpio.gz.sig
+  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+                                 Dload  Upload   Total   Spent    Left  Speed
+100   543  100   543    0     0    495      0  0:00:01  0:00:01 --:--:--   495
+$ gpg --verify coreos_production_pxe_image.cpio.gz.sig
+gpg: assuming signed data in 'coreos_production_pxe_image.cpio.gz'
+gpg: Signature made Thu 28 Apr 2016 04:54:00 AM CEST using RSA key ID 1CB5FA26
+gpg: checking the trustdb
+gpg: marginals needed: 3  completes needed: 1  trust model: PGP
+gpg: depth: 0  valid:   5  signed:   5  trust: 0-, 0q, 0n, 0m, 0f, 5u
+gpg: depth: 1  valid:   5  signed:   0  trust: 3-, 0q, 0n, 0m, 2f, 0u
+gpg: next trustdb check due at 2017-01-19
+gpg: Good signature from "CoreOS Buildbot (Offical Builds) <buildbot@coreos.com>" [ultimate]
+```
+
+Then you need to extract it:
+
+```
+$ gunzip coreos_production_pxe_image.cpio.gz
+$ cpio -i < coreos_production_pxe_image.cpio
+457785 blocks
+$ unsquashfs usr.squashfs
+Parallel unsquashfs: Using 4 processors
+13445 inodes (14861 blocks) to write
+
+
+write_xattr: could not write xattr security.capability for file squashfs-root/bin/arping because you're not superuser!
+
+write_xattr: to avoid this error message, either specify -user-xattrs, -no-xattrs, or run as superuser!
+
+Further error messages of this type are suppressed!
+[======================================================================================================================================-] 14861/14861 100%
+
+created 12391 files
+created 1989 directories
+created 722 symlinks
+created 0 devices
+created 0 fifos
+```
+
+You should have now the rootfs of the image in the `squashfs-root` directory.
+
+## Update the manifest files
+
+Back to the rkt repo, in the directory `stage1/usr_from_coreos/manifest.d`, there are some manifest files that define which files are copied from the CoreOS image to the stage1 image.
+
+You need to go through all of them and check that the files listed correspond to files that are in the actual rootfs of the image (which we extracted in the previous step).
+
+Usually, there are some updated libraries which need an update on their version numbers.
+In our case, there are no updates and all the files mentioned in the manifest are present in the updated CoreOS image.
+
+## Update the coreos flavor version used by the build system
+
+In the file `stage1/usr_from_coreos/coreos-common.mk`, we define which CoreOS image version we use for the coreos flavor.
+Update `CCN_IMG_RELEASE` to 1032.0.0 and `CCN_SYSTEMD_VERSION` to the systemd version shipped with the image (in our case, v229).
+
+```diff
+diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
+index b5bfa77..f864f56 100644
+--- a/stage1/usr_from_coreos/coreos-common.mk
++++ b/stage1/usr_from_coreos/coreos-common.mk
+@@ -9,9 +9,9 @@ _CCN_INCLUDED_ := x
+ $(call setup-tmp-dir,CCN_TMPDIR)
+ 
+ # systemd version in coreos image
+-CCN_SYSTEMD_VERSION := v225
++CCN_SYSTEMD_VERSION := v229
+ # coreos image version
+-CCN_IMG_RELEASE := 991.0.0
++CCN_IMG_RELEASE := 1032.0.0
+ # coreos image URL
+ CCN_IMG_URL := https://alpha.release.core-os.net/amd64-usr/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
+ # path to downloaded pxe image
+```
+
+## Check that things work
+
+Once you're finished updating the manifest files and `coreos-common.mk`, do a clean build and try to run rkt.
+If there are some new libraries missing from the image, you need to add them to the correspoding manifest file.
+
+For example, this update breaks systemd.
+When you try to run rkt, you get this error:
+
+```
+/usr/lib/systemd/systemd: error while loading shared libraries: libpam.so.0: cannot open shared object file: No such file or directory
+```
+
+This means that we need to add libpam to the systemd manifest file:
+
+```diff
+diff --git a/stage1/usr_from_coreos/manifest.d/systemd.manifest b/stage1/usr_from_coreos/manifest.d/systemd.manifest
+index fca30bb..51d5fbc 100644
+--- a/stage1/usr_from_coreos/manifest.d/systemd.manifest
++++ b/stage1/usr_from_coreos/manifest.d/systemd.manifest
+@@ -61,6 +61,9 @@ lib64/libmount.so.1
+ lib64/libmount.so.1.1.0
+ lib64/libnss_files-2.21.so
+ lib64/libnss_files.so.2
++lib64/libpam.so
++lib64/libpam.so.0
++lib64/libpam.so.0.84.1
+ lib64/libpcre.so
+ lib64/libpcre.so.1
+ lib64/libpcre.so.1.2.4
+```
+
+After those two patches, the update is complete and rkt works fine with the new image.
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 3cd36ce0e2..a87f958b57 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -89,6 +89,10 @@ rkt expects stage1 images to be signed except in the following cases:
 * `--stage1-{name,hash}` is used and the image is already in the store
 * `--stage1-{url,path,from-dir}` is used and the image is in the default directory configured at build time
 
+### Updating the coreos flavor stage1
+
+Follow the instructions on [Update coreos flavor stage1](devel/update-coreos-stage1.md).
+
 ## Managing dependencies
 
 rkt uses [`godep`](https://github.com/tools/godep) to manage third-party dependencies.

From 861593fc57c7b24f4be7828e303a87616844ec2b Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 4 May 2016 15:13:09 +0200
Subject: [PATCH 0219/1304] Documentation: update Arch Linux documentation

Partially fixes #2202
---
 Documentation/distributions.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 6b86e3fa00..d30cb918e9 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -46,8 +46,10 @@ sudo iptables -F -t nat
 
 ## Arch
 
-rkt is available in the [Arch User Repository (AUR)](https://aur.archlinux.org/packages/rkt).
-Installing instructions are available in the [AUR installing packages documentation](https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages) or you can use an [AUR helper](https://wiki.archlinux.org/index.php/AUR_helpers).
+rkt is available in the [Community Repository](https://www.archlinux.org/packages/community/x86_64/rkt/) and can be installed using pacman:
+```
+sudo pacman -S rkt
+```
 
 ## Void
 

From 4586596b40016a42e96a1d2bc746bd7e77df1e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20K=C3=BChl?= <chris@kinvolk.io>
Date: Fri, 6 May 2016 14:54:07 +0200
Subject: [PATCH 0220/1304] docs: remove indef articles from start of arg doc
 strings

---
 rkt/prepare.go    |  2 +-
 rkt/run.go        |  2 +-
 rkt/stage1hash.go | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rkt/prepare.go b/rkt/prepare.go
index 061028411e..8b537128cb 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -59,7 +59,7 @@ func init() {
 	cmdPrepare.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
 	cmdPrepare.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
 	cmdPrepare.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
-	cmdPrepare.Flags().Var(&flagExplicitEnv, "set-env", "an environment variable to set for apps in the form name=value")
+	cmdPrepare.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for apps in the form name=value")
 	cmdPrepare.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
 	cmdPrepare.Flags().BoolVar(&flagNoStore, "no-store", false, "fetch images ignoring the local store")
 	cmdPrepare.Flags().StringVar(&flagPodManifest, "pod-manifest", "", "the path to the pod manifest. If it's non-empty, then only '--quiet' and '--no-overlay' will have effect")
diff --git a/rkt/run.go b/rkt/run.go
index 3762d307ba..6f1198c7d1 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -80,7 +80,7 @@ func init() {
 	cmdRun.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
 	cmdRun.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
 	cmdRun.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
-	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "an environment variable to set for apps in the form name=value")
+	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for apps in the form name=value")
 	cmdRun.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively. If true, only one image may be supplied.")
 	cmdRun.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf")
 	cmdRun.Flags().Var(&flagDNSSearch, "dns-search", "DNS search domains to write in /etc/resolv.conf")
diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index 56338133cd..fdb6362bd0 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -114,35 +114,35 @@ var (
 			kind: stage1ImageLocationURL,
 			flag: "stage1-url",
 			name: "stage1URL",
-			help: "a URL to an image to use as stage1",
+			help: "URL to an image to use as stage1",
 		},
 
 		stage1ImageLocationPath: {
 			kind: stage1ImageLocationPath,
 			flag: "stage1-path",
 			name: "stage1Path",
-			help: "an absolute or a relative path to an image to use as stage1",
+			help: "absolute or relative path to an image to use as stage1",
 		},
 
 		stage1ImageLocationName: {
 			kind: stage1ImageLocationName,
 			flag: "stage1-name",
 			name: "stage1Name",
-			help: "a name of an image to use as stage1",
+			help: "name of an image to use as stage1",
 		},
 
 		stage1ImageLocationHash: {
 			kind: stage1ImageLocationHash,
 			flag: "stage1-hash",
 			name: "stage1Hash",
-			help: "a hash of an image to use as stage1",
+			help: "hash of an image to use as stage1",
 		},
 
 		stage1ImageLocationFromDir: {
 			kind: stage1ImageLocationFromDir,
 			flag: "stage1-from-dir",
 			name: "stage1FromDir",
-			help: "a filename of an image in stage1 images directory to use as stage1",
+			help: "filename of an image in stage1 images directory to use as stage1",
 		},
 	}
 	// location to stage1 image overridden by one of --stage1-*

From e6072e481f6916a443209a54045e1bf93568afba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20K=C3=BChl?= <chris@kinvolk.io>
Date: Fri, 6 May 2016 14:54:56 +0200
Subject: [PATCH 0221/1304] docs: fix rkt run-prepared's --interactive doc
 string

---
 rkt/run_prepared.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index 075bf616d6..787f1f95b2 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -44,7 +44,7 @@ func init() {
 	cmdRunPrepared.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf")
 	cmdRunPrepared.Flags().Var(&flagDNSSearch, "dns-search", "DNS search domains to write in /etc/resolv.conf")
 	cmdRunPrepared.Flags().Var(&flagDNSOpt, "dns-opt", "DNS options to write in /etc/resolv.conf")
-	cmdRunPrepared.Flags().BoolVar(&flagInteractive, "interactive", false, "the pod is interactive")
+	cmdRunPrepared.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively")
 	cmdRunPrepared.Flags().BoolVar(&flagMDSRegister, "mds-register", false, "register pod with metadata service")
 	cmdRunPrepared.Flags().StringVar(&flagHostname, "hostname", "", `pod's hostname. If empty, it will be "rkt-$PODUUID"`)
 }

From c59f791a3dcac3566538544529aa7910ac00a4c3 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Mon, 9 May 2016 10:49:53 +0300
Subject: [PATCH 0222/1304] stage0: check and create /etc

Checks '/etc' before writing to '/etc/rkt-resolv.conf'
and create it with default permissions if it doesn't exist.
---
 stage0/run.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/stage0/run.go b/stage0/run.go
index a9a1dd9647..ed1d45e6af 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -415,6 +415,12 @@ func addResolvConf(cfg RunConfig, rootfs string) {
 	}
 	content += "\n"
 
+	if err := os.Mkdir(filepath.Join(rootfs, "etc"), defaultRegularDirPerm); err != nil {
+		if !os.IsExist(err) {
+			log.Fatalf("error creating dir %q: %v\n", "/etc", err)
+		}
+	}
+
 	if err := ioutil.WriteFile(filepath.Join(rootfs, "etc/rkt-resolv.conf"), []byte(content), 0644); err != nil {
 		log.Fatalf("error writing /etc/rkt-resolv.conf: %v\n", err)
 	}

From dc8b2fb9a9dca2251d62b0724dea830d1bf21da5 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal.rostecki@gmail.com>
Date: Sat, 7 May 2016 20:18:26 +0200
Subject: [PATCH 0223/1304] lkvm: Bump the version of upstream repository

glibc >= 2.23 deprecated the readdir_r usage in favor
of readdir. Build of lkvm is treating warnings as errors,
so it's impossible to build rkt with kvm flawor with the
newest glibc.

That was fixed in the upstream commit[1].

Also, the another commit[2] fixed an issue with dead lock
on reboot, so dead_lock_fix patch isn't needed anymore.

[1] https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+/d62653e177597251c24494a6dda60acd6d846671
[2] https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+/e8cb90fb9697da24cdf553a1b8cf120f94c20832

Fixes #2594

Signed-off-by: Michal Rostecki <michal.rostecki@gmail.com>
---
 stage1/usr_from_kvm/lkvm.mk                   |  2 +-
 .../lkvm/patches/dead_lock_fix.patch          | 53 -------------------
 2 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 stage1/usr_from_kvm/lkvm/patches/dead_lock_fix.patch

diff --git a/stage1/usr_from_kvm/lkvm.mk b/stage1/usr_from_kvm/lkvm.mk
index c7a60e4e78..81ded66447 100644
--- a/stage1/usr_from_kvm/lkvm.mk
+++ b/stage1/usr_from_kvm/lkvm.mk
@@ -5,7 +5,7 @@ LKVM_BINARY := $(LKVM_SRCDIR)/lkvm-static
 LKVM_ACI_BINARY := $(S1_RF_ACIROOTFSDIR)/lkvm
 LKVM_GIT := https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool
 # just last published version (for reproducible builds), not for any other reason
-LKVM_VERSION := 3c8aec9e2b5066412390559629dabeb7816ee8f2
+LKVM_VERSION := d62653e177597251c24494a6dda60acd6d846671
 
 LKVM_STUFFDIR := $(MK_SRCDIR)/lkvm
 LKVM_PATCHESDIR := $(LKVM_STUFFDIR)/patches
diff --git a/stage1/usr_from_kvm/lkvm/patches/dead_lock_fix.patch b/stage1/usr_from_kvm/lkvm/patches/dead_lock_fix.patch
deleted file mode 100644
index 67b56da31f..0000000000
--- a/stage1/usr_from_kvm/lkvm/patches/dead_lock_fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/builtin-run.c b/builtin-run.c
-index 54e03be..fab97e0 100644
---- a/builtin-run.c
-+++ b/builtin-run.c
-@@ -633,16 +633,38 @@ static struct kvm *kvm_cmd_run_init(int argc, const char **argv)
- 
- static int kvm_cmd_run_work(struct kvm *kvm)
- {
--	int i;
--	void *ret = NULL;
--
--	for (i = 0; i < kvm->nrcpus; i++) {
--		if (pthread_create(&kvm->cpus[i]->thread, NULL, kvm_cpu_thread, kvm->cpus[i]) != 0)
--			die("unable to create KVM VCPU thread");
--	}
--
--	/* Only VCPU #0 is going to exit by itself when shutting down */
--	return pthread_join(kvm->cpus[0]->thread, &ret);
-+        int i;
-+        int exit_status = 0;
-+
-+        for (i = 0; i < kvm->nrcpus; i++) {
-+                if (pthread_create(&kvm->cpus[i]->thread, NULL, kvm_cpu_thread, kvm->cpus[i]) != 0)
-+                        die("unable to create KVM VCPU thread");
-+        }
-+
-+        /*
-+         * Only VCPU #0 is going to exit by itself when shutting down
-+         *
-+         * BUT It's not actually true for reboot sequence
-+         * Reboot is sending SIGKVMEXIT signal to all cpus
-+         * and that is causing race condition on removing
-+         * devices (which are pausing exiting cpus).
-+         * This piece of code waits for death of all
-+         * cpu threads
-+         */
-+         for (i = 0; i < kvm->nrcpus; i++) {
-+
-+                void* thrstatus = NULL;
-+
-+                int retval = pthread_join(kvm->cpus[i]->thread, &thrstatus);
-+
-+                if (retval != 0)
-+                        die("unable to end KVM VCPU thread");
-+
-+                /* Set exit status if one of vcpus returns error code > 0 */
-+                if ((intptr_t) thrstatus != 0)
-+                        exit_status = (intptr_t) thrstatus;
-+        }
-+        return exit_status;
- }
- 
- static void kvm_cmd_run_exit(struct kvm *kvm, int guest_ret)

From 023ee1fa3d88ddcc671be159e3efdb4b21ac5a61 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 13 Apr 2016 23:13:10 +0200
Subject: [PATCH 0224/1304] net/portfwd: choose network according to ipmasq

When a network has ipmasq enabled, CNI generates masquerading rules for
the networks subnet. These rules are appended, so the first network is
the most upper one. Hence, rkt needs to use the address of first
masqueraded network as packets will always hit this subnet's CNI rule
first.

If no network has ipmasq enabled, we default to the previous behavior of
using the last loaded network, which is either the default or
default-restricted network.
---
 Documentation/networking/overview.md |  8 ++++++
 networking/kvm.go                    |  6 +++-
 networking/networking.go             | 43 ++++++++++++++++++++++------
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/Documentation/networking/overview.md b/Documentation/networking/overview.md
index 964aff3941..02a280d338 100644
--- a/Documentation/networking/overview.md
+++ b/Documentation/networking/overview.md
@@ -332,6 +332,14 @@ The pod's TCP port 80 can be mapped to an arbitrary port on the host during rkt
 
 Now, any traffic arriving on host's TCP port 8888 will be forwarded to the pod on port 80.
 
+### Network used for forwarded ports
+
+The network that will be chosen for the port forwarding depends on the _ipMasq_ setting of the configured networks.
+If at least one of them has _ipMasq_ enabled, the forwarded traffic will be passed through the first loaded network that has IP masquerading enabled.
+If no network is masqueraded, the last loaded network will be used.
+As a reminder, the sort order of the loaded networks is detailed in the chapter about [setting up additional networks](#setting-up-additional-networks).
+
+### Socket Activation
 rkt also supports socket activation.
 This is documented in [Socket-activated service](../using-rkt-with-systemd.md#socket-activated-service).
 
diff --git a/networking/kvm.go b/networking/kvm.go
index 2b23a844e1..0329cf3ee9 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -552,7 +552,11 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 		}
 		network.nets[i] = n
 	}
-	err := network.forwardPorts(fps, network.GetDefaultIP())
+	defaultIP, err := network.GetDefaultIP()
+	if err != nil {
+		return nil, err
+	}
+	err = network.forwardPorts(fps, defaultIP)
 	if err != nil {
 		return nil, err
 	}
diff --git a/networking/networking.go b/networking/networking.go
index a7d0ba15f7..c985bec60b 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -121,7 +121,11 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 			if err = n.enableDefaultLocalnetRouting(); err != nil {
 				return err
 			}
-			if err := n.forwardPorts(fps, n.GetDefaultIP()); err != nil {
+			defaultIP, err := n.GetDefaultIP()
+			if err != nil {
+				return err
+			}
+			if err := n.forwardPorts(fps, defaultIP); err != nil {
 				n.unforwardPorts()
 				return err
 			}
@@ -229,18 +233,41 @@ func Load(podRoot string, podID *types.UUID) (*Networking, error) {
 	}, nil
 }
 
-func (n *Networking) GetDefaultIP() net.IP {
-	if len(n.nets) == 0 {
-		return nil
+// GetDefaultNet iterates through all loaded networks and returns either
+// the first network that has masquerading enabled,
+// or the last network in case there is no masqueraded one,
+// or an error if no network was loaded.
+func (n *Networking) GetDefaultNet() (*activeNet, error) {
+	numberNets := len(n.nets)
+	if numberNets == 0 {
+		return nil, fmt.Errorf("no networks found")
+	}
+	for _, net := range n.nets {
+		if net.IPMasq() {
+			return &net, nil
+		}
 	}
-	return n.nets[len(n.nets)-1].runtime.IP
+	return &n.nets[numberNets-1], nil
 }
 
+// GetDefaultIP uses GetDefaultNet() to determine the default network and then
+// returns the Pod's IP of that network.
+func (n *Networking) GetDefaultIP() (net.IP, error) {
+	net, err := n.GetDefaultNet()
+	if err != nil {
+		return nil, err
+	}
+	return net.runtime.IP, nil
+}
+
+// GetDefaultHostIP uses GetDefaultNet() to determine the default network and then
+// returns the Host's IP of that network.
 func (n *Networking) GetDefaultHostIP() (net.IP, error) {
-	if len(n.nets) == 0 {
-		return nil, fmt.Errorf("no networks found")
+	net, err := n.GetDefaultNet()
+	if err != nil {
+		return nil, err
 	}
-	return n.nets[len(n.nets)-1].runtime.HostIP, nil
+	return net.runtime.HostIP, nil
 }
 
 // GetIfacesByIP searches for and returns the interfaces with the given IP

From 993b93350f9ceef70c9209ef8b6e1c909501d41f Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 14 Apr 2016 12:17:46 +0200
Subject: [PATCH 0225/1304] net/portfwd: allow host/pod port to differ

---
 networking/portfwd.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/networking/portfwd.go b/networking/portfwd.go
index acdd9c4a4d..db43d27871 100644
--- a/networking/portfwd.go
+++ b/networking/portfwd.go
@@ -22,7 +22,7 @@ import (
 	"github.com/coreos/go-iptables/iptables"
 )
 
-func (e *podEnv) forwardPorts(fps []ForwardedPort, defIP net.IP) error {
+func (e *podEnv) forwardPorts(fps []ForwardedPort, podIP net.IP) error {
 	if len(fps) == 0 {
 		return nil
 	}
@@ -70,9 +70,9 @@ func (e *podEnv) forwardPorts(fps []ForwardedPort, defIP net.IP) error {
 
 	for _, p := range fps {
 
-		dst := fmt.Sprintf("%v:%v", defIP, p.PodPort)
-		dstIP := fmt.Sprintf("%v", defIP)
-		dport := strconv.Itoa(int(p.HostPort))
+		socketPod := fmt.Sprintf("%v:%v", podIP, p.PodPort)
+		dstPortHost := strconv.Itoa(int(p.HostPort))
+		dstPortPod := strconv.Itoa(int(p.PodPort))
 
 		for _, r := range []struct {
 			chain string
@@ -82,9 +82,9 @@ func (e *podEnv) forwardPorts(fps []ForwardedPort, defIP net.IP) error {
 				chainDNAT,
 				[]string{
 					"-p", p.Protocol,
-					"--dport", dport,
+					"--dport", dstPortHost,
 					"-j", "DNAT",
-					"--to-destination", dst,
+					"--to-destination", socketPod,
 				},
 			},
 			{ // Rewrite the source for connections to localhost on the host
@@ -92,8 +92,8 @@ func (e *podEnv) forwardPorts(fps []ForwardedPort, defIP net.IP) error {
 				[]string{
 					"-p", p.Protocol,
 					"-s", "127.0.0.1",
-					"-d", dstIP,
-					"--dport", dport,
+					"-d", podIP.String(),
+					"--dport", dstPortPod,
 					"-j", "MASQUERADE",
 				},
 			},

From 90f8bfd799593b62bc638f34c21d006060c2b26b Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 27 Apr 2016 10:38:15 +0200
Subject: [PATCH 0226/1304] net/portfwd: refactor related methods

---
 networking/kvm.go        |  5 ++--
 networking/networking.go | 51 +++-------------------------------------
 networking/portfwd.go    | 45 +++++++++++++++++++++++++++++++++++
 stage1/init/init.go      |  2 +-
 4 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index 0329cf3ee9..7753680234 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -552,12 +552,11 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 		}
 		network.nets[i] = n
 	}
-	defaultIP, err := network.GetDefaultIP()
+	podIP, err := network.GetForwardableNetPodIP()
 	if err != nil {
 		return nil, err
 	}
-	err = network.forwardPorts(fps, defaultIP)
-	if err != nil {
+	if err := network.forwardPorts(fps, podIP); err != nil {
 		return nil, err
 	}
 
diff --git a/networking/networking.go b/networking/networking.go
index c985bec60b..61ec25c0c4 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -40,14 +40,6 @@ const (
 	selfNetNS     = "/proc/self/ns/net"
 )
 
-// ForwardedPort describes a port that will be
-// forwarded (mapped) from the host to the pod
-type ForwardedPort struct {
-	Protocol string
-	HostPort uint
-	PodPort  uint
-}
-
 // Networking describes the networking details of a pod.
 type Networking struct {
 	podEnv
@@ -121,11 +113,11 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 			if err = n.enableDefaultLocalnetRouting(); err != nil {
 				return err
 			}
-			defaultIP, err := n.GetDefaultIP()
+			podIP, err := n.GetForwardableNetPodIP()
 			if err != nil {
 				return err
 			}
-			if err := n.forwardPorts(fps, defaultIP); err != nil {
+			if err := n.forwardPorts(fps, podIP); err != nil {
 				n.unforwardPorts()
 				return err
 			}
@@ -145,7 +137,7 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 func (n *Networking) enableDefaultLocalnetRouting() error {
 	routeLocalnetFormat := ""
 
-	defaultHostIP, err := n.GetDefaultHostIP()
+	defaultHostIP, err := n.GetForwardableNetHostIP()
 	if err != nil {
 		return err
 	}
@@ -233,43 +225,6 @@ func Load(podRoot string, podID *types.UUID) (*Networking, error) {
 	}, nil
 }
 
-// GetDefaultNet iterates through all loaded networks and returns either
-// the first network that has masquerading enabled,
-// or the last network in case there is no masqueraded one,
-// or an error if no network was loaded.
-func (n *Networking) GetDefaultNet() (*activeNet, error) {
-	numberNets := len(n.nets)
-	if numberNets == 0 {
-		return nil, fmt.Errorf("no networks found")
-	}
-	for _, net := range n.nets {
-		if net.IPMasq() {
-			return &net, nil
-		}
-	}
-	return &n.nets[numberNets-1], nil
-}
-
-// GetDefaultIP uses GetDefaultNet() to determine the default network and then
-// returns the Pod's IP of that network.
-func (n *Networking) GetDefaultIP() (net.IP, error) {
-	net, err := n.GetDefaultNet()
-	if err != nil {
-		return nil, err
-	}
-	return net.runtime.IP, nil
-}
-
-// GetDefaultHostIP uses GetDefaultNet() to determine the default network and then
-// returns the Host's IP of that network.
-func (n *Networking) GetDefaultHostIP() (net.IP, error) {
-	net, err := n.GetDefaultNet()
-	if err != nil {
-		return nil, err
-	}
-	return net.runtime.HostIP, nil
-}
-
 // GetIfacesByIP searches for and returns the interfaces with the given IP
 // Disregards the subnet mask since not every net.IP object contains
 // On success it will return the list of found interfaces
diff --git a/networking/portfwd.go b/networking/portfwd.go
index db43d27871..3eb1bf4110 100644
--- a/networking/portfwd.go
+++ b/networking/portfwd.go
@@ -22,6 +22,51 @@ import (
 	"github.com/coreos/go-iptables/iptables"
 )
 
+// ForwardedPort describes a port that will be
+// forwarded (mapped) from the host to the pod
+type ForwardedPort struct {
+	Protocol string
+	HostPort uint
+	PodPort  uint
+}
+
+// GetForwardableNet iterates through all loaded networks and returns either
+// the first network that has masquerading enabled,
+// or the last network in case there is no masqueraded one,
+// or an error if no network was loaded.
+func (n *Networking) GetForwardableNet() (*activeNet, error) {
+	numberNets := len(n.nets)
+	if numberNets == 0 {
+		return nil, fmt.Errorf("no networks found")
+	}
+	for _, net := range n.nets {
+		if net.IPMasq() {
+			return &net, nil
+		}
+	}
+	return &n.nets[numberNets-1], nil
+}
+
+// GetForwardableNetPodIP uses GetForwardableNet() to determine the default network and then
+// returns the Pod's IP of that network.
+func (n *Networking) GetForwardableNetPodIP() (net.IP, error) {
+	net, err := n.GetForwardableNet()
+	if err != nil {
+		return nil, err
+	}
+	return net.runtime.IP, nil
+}
+
+// GetForwardableNetHostIP uses GetForwardableNet() to determine the default network and then
+// returns the Host's IP of that network.
+func (n *Networking) GetForwardableNetHostIP() (net.IP, error) {
+	net, err := n.GetForwardableNet()
+	if err != nil {
+		return nil, err
+	}
+	return net.runtime.HostIP, nil
+}
+
 func (e *podEnv) forwardPorts(fps []ForwardedPort, podIP net.IP) error {
 	if len(fps) == 0 {
 		return nil
diff --git a/stage1/init/init.go b/stage1/init/init.go
index cdcb7d5c20..94f2730218 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -532,7 +532,7 @@ func stage1() int {
 		}
 
 		if len(mdsToken) > 0 {
-			hostIP, err := n.GetDefaultHostIP()
+			hostIP, err := n.GetForwardableNetHostIP()
 			if err != nil {
 				log.PrintE("failed to get default Host IP", err)
 				return 1

From 9678c97fc6c6400c6be11866eeb16f69b68cff23 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 6 Apr 2016 19:14:07 +0200
Subject: [PATCH 0227/1304] tests/net: add more port forwarding cases

* bridged network
* different host port than application port
---
 tests/rkt_net_kvm_test.go    |  6 ++---
 tests/rkt_net_nspawn_test.go | 14 +++++++---
 tests/rkt_net_test.go        | 51 +++++++++++++++++++++++++++++-------
 3 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/tests/rkt_net_kvm_test.go b/tests/rkt_net_kvm_test.go
index 59ecb3680d..79acb909b8 100644
--- a/tests/rkt_net_kvm_test.go
+++ b/tests/rkt_net_kvm_test.go
@@ -18,9 +18,9 @@ package main
 
 import "testing"
 
-func TestNetDefaultPortFwdConnectivity(t *testing.T) {
-	NewNetDefaultPortFwdConnectivityTest(
-		PortFwdCase{"172.16.28.1", "--net=default", true},
+func TestNetPortFwdConnectivity(t *testing.T) {
+	NewNetPortFwdConnectivityTest(
+		defaultSamePortFwdCase,
 	).Execute(t)
 }
 
diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index a32a3bc93e..905c5a588d 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -26,10 +26,16 @@ func TestNetHostConnectivity(t *testing.T) {
 	NewNetHostConnectivityTest().Execute(t)
 }
 
-func TestNetDefaultPortFwdConnectivity(t *testing.T) {
-	NewNetDefaultPortFwdConnectivityTest(
-		PortFwdCase{"172.16.28.1", "--net=default", true},
-		PortFwdCase{"127.0.0.1", "--net=default", true},
+func TestNetPortFwdConnectivity(t *testing.T) {
+	NewNetPortFwdConnectivityTest(
+		defaultSamePortFwdCase,
+		defaultDiffPortFwdCase,
+		defaultLoSamePortFwdCase,
+		defaultLoDiffPortFwdCase,
+		bridgeSamePortFwdCase,
+		bridgeDiffPortFwdCase,
+		bridgeLoSamePortFwdCase,
+		bridgeLoDiffPortFwdCase,
 	).Execute(t)
 }
 
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index 6c69fb3669..58eb30b4a7 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -350,24 +350,60 @@ func TestNetDefaultRestrictedConnectivity(t *testing.T) {
 
 type PortFwdCase struct {
 	HttpGetIP     string
+	HttpServePort int
 	RktArg        string
 	ShouldSucceed bool
 }
 
+var (
+	bannedPorts = make(map[int]struct{}, 0)
+
+	defaultSamePortFwdCase   = PortFwdCase{"172.16.28.1", 0, "--net=default", true}
+	defaultDiffPortFwdCase   = PortFwdCase{"172.16.28.1", 1024, "--net=default", true}
+	defaultLoSamePortFwdCase = PortFwdCase{"127.0.0.1", 0, "--net=default", true}
+	defaultLoDiffPortFwdCase = PortFwdCase{"127.0.0.1", 1014, "--net=default", true}
+
+	portFwdBridge = networkTemplateT{
+		Name:      "bridge1",
+		Type:      "bridge",
+		Bridge:    "bridge1",
+		IpMasq:    true,
+		IsGateway: true,
+		Ipam: ipamTemplateT{
+			Type:   "host-local",
+			Subnet: "11.11.5.0/24",
+			Routes: []map[string]string{
+				{"dst": "0.0.0.0/0"},
+			},
+		},
+	}
+	bridgeSamePortFwdCase   = PortFwdCase{"11.11.5.1", 0, "--net=" + portFwdBridge.Name, true}
+	bridgeDiffPortFwdCase   = PortFwdCase{"11.11.5.1", 1024, "--net=" + portFwdBridge.Name, true}
+	bridgeLoSamePortFwdCase = PortFwdCase{"127.0.0.1", 0, "--net=" + portFwdBridge.Name, true}
+	bridgeLoDiffPortFwdCase = PortFwdCase{"127.0.0.1", 1024, "--net=" + portFwdBridge.Name, true}
+)
+
 func (ct PortFwdCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
+	netdir := prepareTestNet(t, ctx, portFwdBridge)
+	defer os.RemoveAll(netdir)
 
-	bannedPorts := make(map[int]struct{}, 0)
 	httpPort, err := testutils.GetNextFreePort4Banned(bannedPorts)
 	if err != nil {
 		t.Fatalf("%v", err)
 	}
 	bannedPorts[httpPort] = struct{}{}
 
-	httpServeAddr := fmt.Sprintf("0.0.0.0:%d", httpPort)
+	httpServePort := ct.HttpServePort
+	if httpServePort == 0 {
+		httpServePort = httpPort
+	}
+
+	httpServeAddr := fmt.Sprintf("0.0.0.0:%d", httpServePort)
 	testImageArgs := []string{
-		fmt.Sprintf("--ports=http,protocol=tcp,port=%d", httpPort),
+		fmt.Sprintf("--ports=http,protocol=tcp,port=%d", httpServePort),
 		fmt.Sprintf("--exec=/inspect --serve-http=%v", httpServeAddr),
 	}
+	t.Logf("testImageArgs: %v", testImageArgs)
 	testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
 	defer os.Remove(testImage)
 
@@ -410,10 +446,6 @@ func (ct PortFwdCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
 	}()
 
 	ga.Wait()
-
-	// TODO: ensure that default-restricted is not accessible from non-host
-	// f("172.16.28.1", "--net=default-restricted", true)
-	// f("127.0.0.1", "--net=default-restricted", true)
 }
 
 type portFwdTest []PortFwdCase
@@ -428,12 +460,12 @@ func (ct portFwdTest) Execute(t *testing.T) {
 }
 
 /*
- * Default net port forwarding connectivity
+ * Net port forwarding connectivity
  * ---
  * Container launches http server on all its interfaces
  * Host must be able to connect to container's http server on it's own interfaces
  */
-func NewNetDefaultPortFwdConnectivityTest(cases ...PortFwdCase) testutils.Test {
+func NewNetPortFwdConnectivityTest(cases ...PortFwdCase) testutils.Test {
 	return portFwdTest(cases)
 }
 
@@ -465,6 +497,7 @@ type networkTemplateT struct {
 	Master    string `json:"master,omitempty"`
 	IpMasq    bool
 	IsGateway bool
+	Bridge    string `json:"bridge,omitempty"`
 	Ipam      ipamTemplateT
 }
 

From f6fcfb66362459042a216267bbc77f28994e6729 Mon Sep 17 00:00:00 2001
From: Matthias Jahn <matthias.jahn@peerigon.com>
Date: Tue, 10 May 2016 16:31:59 +0200
Subject: [PATCH 0228/1304] docs: Change getting started guide to build a
 static binary

Current build command would not work after #2506

Fixes #2584
---
 Documentation/getting-started-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index 98f654447d..3c2bb4f33f 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -28,7 +28,7 @@ Next we need to build our application.
 We are going to statically link our app so we can ship an App Container Image with no external dependencies.
 
 ```
-$ CGO_ENABLED=0 GOOS=linux go build -o hello -a -tags netgo -ldflags '-w' .
+$ CGO_ENABLED=0 go build -ldflags '-extldflags "-static"'
 ```
 
 Before proceeding, verify that the produced binary is statically linked:

From 495d5f65927273658601e71f89dc63a45b2a3dd8 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <mrostecki@mirantis.com>
Date: Tue, 10 May 2016 17:54:14 +0200
Subject: [PATCH 0229/1304] build: check for openssl headers for kvm flavor

To use kernel sources during kvm flavor build, openssl headers
are needed.

Also update information about dependencies in documentation.
---
 Documentation/dependencies.md | 5 ++++-
 Documentation/hacking.md      | 3 ++-
 configure.ac                  | 6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Documentation/dependencies.md b/Documentation/dependencies.md
index 4efbe99463..f8339a7a79 100644
--- a/Documentation/dependencies.md
+++ b/Documentation/dependencies.md
@@ -52,7 +52,10 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
 * patch
 * tar
 * xz
-* build dependencies for kernel
+* [build dependencies for kernel](https://www.kernel.org/doc/Documentation/Changes)
+  * bc
+  * binutils
+  * openssl
 * build dependencies for lkvm
 
 ### Specific dependencies for the src flavor
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index a87f958b57..5477f4945c 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -33,7 +33,7 @@ Alternatively, you can build rkt in a Docker container with the following comman
 Replace `$SRC` with the absolute path to your rkt source code:
 
 ```
-# docker run -v $SRC:/opt/rkt -i -t golang:1.5 /bin/bash -c "apt-get update && apt-get install -y coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc && cd /opt/rkt && go get github.com/appc/spec/... && ./autogen.sh && ./configure && make"
+# docker run -v $SRC:/opt/rkt -i -t golang:1.5 /bin/bash -c "apt-get update && apt-get install -y coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc libacl1-dev libtspi-dev libssl-dev && cd /opt/rkt && go get github.com/appc/spec/... && ./autogen.sh && ./configure && make"
 ```
 
 ### Building systemd in stage1 from source
@@ -69,6 +69,7 @@ If building with docker, these must be added to the `apt-get install` command.
 * xz-utils
 * patch
 * bc
+* libssl-dev
 
 ### Alternative stage1 paths
 
diff --git a/configure.ac b/configure.ac
index 0f301fc0ba..bdba629c22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,7 +289,11 @@ RKT_ITERATE_FLAVORS([${RKT_STAGE1_FLAVORS}],[flavor],
                                       RKT_COMMON_COREOS_PROGS
                                       RKT_REQ_PROG([PATCH],[patch],[patch])
                                       RKT_REQ_PROG([TAR],[tar],[tar])
-                                      RKT_REQ_PROG([XZ],[xz],[xz])],
+                                      RKT_REQ_PROG([XZ],[xz],[xz])
+                                      AC_CHECK_HEADER([openssl/bio.h],
+                                                      [],
+                                                      [AC_MSG_ERROR([** No development headers for openssl found])],
+                                                      [AC_INCLUDES_DEFAULT])],
                              [host],
                                      [],
                              [fly],

From 316f400a598d6de041c887844b517fc50133035a Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Wed, 11 May 2016 11:29:32 +0300
Subject: [PATCH 0230/1304] tests: simplify for loop conditions

For loop invocation is simplified to comply with `gofmt -s`
---
 tests/rkt-monitor/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt-monitor/main.go b/tests/rkt-monitor/main.go
index 300a1cbf29..8679aa3344 100644
--- a/tests/rkt-monitor/main.go
+++ b/tests/rkt-monitor/main.go
@@ -114,7 +114,7 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
 	go func() {
-		for _ = range c {
+		for range c {
 			err := killAllChildren(int32(execCmd.Process.Pid))
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)

From 27fea8451b427b1891fc22bee5a2971c0856f368 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Fri, 22 Apr 2016 15:13:57 +0300
Subject: [PATCH 0231/1304] tests: invoke gofmt with simplify-code flag

Enables code simplification checks of gofmt.

Related to #2462
---
 tests/tests.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests.mk b/tests/tests.mk
index b462e3af21..4ac27d653b 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -16,7 +16,7 @@ $(TST_SHORT_TESTS_STAMP):
 	$(VQ) \
 	set -e; \
 	$(call vb,vt,GOFMT,$(TST_GOFMT_DIRS)) \
-	res=$$($(GOFMT) -l $(TST_GOFMT_DIRS)); \
+	res=$$($(GOFMT) -s -l $(TST_GOFMT_DIRS)); \
 	if [ -n "$${res}" ]; then echo -e "gofmt checking failed:\n$${res}"; exit 1; fi; \
 	$(call vb,vt,GO VET,$(TST_GO_VET_PACKAGES)) \
 	res=$$($(GO_ENV) "$(GO)" vet $(TST_GO_VET_PACKAGES)); \

From b8ee0d658e12eef4bc2c4fee372091cd1e321ccc Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Tue, 19 Apr 2016 10:12:03 +0300
Subject: [PATCH 0232/1304] rkt: simplify if-else chains and spacing

Refactors the if-else chains for readability

Fixes #2421
---
 rkt/rkt.go | 67 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/rkt/rkt.go b/rkt/rkt.go
index 2551f0ad89..775d768243 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -107,7 +107,9 @@ func (d *absDir) Set(str string) error {
 	if err != nil {
 		return err
 	}
+
 	*d = (absDir)(dir)
+
 	return nil
 }
 
@@ -181,7 +183,9 @@ func init() {
 
 func getTabOutWithWriter(writer io.Writer) *tabwriter.Writer {
 	aTabOut := new(tabwriter.Writer)
+
 	aTabOut.Init(writer, 0, 8, 1, '\t', 0)
+
 	return aTabOut
 }
 
@@ -203,6 +207,7 @@ func ensureSuperuser(cf func(cmd *cobra.Command, args []string)) func(cmd *cobra
 			cmdExitCode = 1
 			return
 		}
+
 		cf(cmd, args)
 	}
 }
@@ -255,6 +260,7 @@ func getDataDir() string {
 	if cachedDataDir == "" {
 		cachedDataDir = calculateDataDir()
 	}
+
 	return cachedDataDir
 }
 
@@ -262,29 +268,29 @@ func calculateDataDir() string {
 	var dataDir string
 
 	// If --dir parameter is passed, then use this value.
-	if dirFlag := cmdRkt.PersistentFlags().Lookup("dir"); dirFlag != nil {
-		if dirFlag.Changed {
-			dataDir = globalFlags.Dir
-		}
-	} else {
+	dirFlag := cmdRkt.PersistentFlags().Lookup("dir")
+	if dirFlag == nil {
 		// should not happen
 		panic(`"--dir" flag not found`)
 	}
 
+	if dirFlag.Changed {
+		dataDir = globalFlags.Dir
+	}
+
 	// If above fails, then try to get the value from configuration.
 	if dataDir == "" {
-		if config, err := getConfig(); err != nil {
+		config, err := getConfig()
+		if err != nil {
 			stderr.PrintE("cannot get configuration", err)
 			os.Exit(1)
-		} else {
-			if config.Paths.DataDir != "" {
-				dataDir = config.Paths.DataDir
-			}
 		}
-	}
 
-	if dataDir == "" {
-		dataDir = defaultDataDir
+		if config.Paths.DataDir != "" {
+			dataDir = config.Paths.DataDir
+		} else {
+			dataDir = defaultDataDir
+		}
 	}
 
 	// Resolve symlinks
@@ -297,26 +303,33 @@ func calculateDataDir() string {
 			os.Exit(1)
 		}
 	}
+
 	// If above fails, then use the default.
 	return realDataDir
 }
 
 func getConfig() (*config.Config, error) {
-	if cachedConfig == nil {
-		dirs := []string{
-			globalFlags.SystemConfigDir,
-			globalFlags.LocalConfigDir,
-		}
-		if globalFlags.UserConfigDir != "" {
-			dirs = append(dirs, globalFlags.UserConfigDir)
-		}
-		cfg, err := config.GetConfigFrom(dirs...)
-		if err != nil {
-			return nil, err
-		}
-		cachedConfig = cfg
+	if cachedConfig != nil {
+		return cachedConfig, nil
+	}
+
+	dirs := []string{
+		globalFlags.SystemConfigDir,
+		globalFlags.LocalConfigDir,
 	}
-	return cachedConfig, nil
+
+	if globalFlags.UserConfigDir != "" {
+		dirs = append(dirs, globalFlags.UserConfigDir)
+	}
+
+	cfg, err := config.GetConfigFrom(dirs...)
+	if err != nil {
+		return nil, err
+	}
+
+	cachedConfig = cfg
+
+	return cfg, nil
 }
 
 func lockDir() string {

From 5991563ec1062071ba088339c1f5311630251d54 Mon Sep 17 00:00:00 2001
From: Matthias <matthaias@users.noreply.github.com>
Date: Wed, 11 May 2016 13:28:39 +0200
Subject: [PATCH 0233/1304] docs: Add example to run multiple apps in one pod
 (#2609)

* docs: Add example to run multiple apps in one pod

A example was missing how to run multiple apps in one pod

Fixes #2583

* docs: Change level of "run multiple apps in same pod", add preamble

"run multiple apps in same pod" should be higher level

Fixes #2583
---
 Documentation/subcommands/run.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 41351d3b52..8ed9571535 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -25,6 +25,13 @@ rkt will automatically [fetch](fetch.md) them if they're not present in the loca
 # rkt --insecure-options=image run docker://quay.io/coreos/etcd:v2.0.0
 ```
 
+## Run multiple applications in the same pod
+
+Multiple applications can be run in a pod by passing multiple images to the run command:
+```
+# rkt run example.com/app1 example.com/app2
+```
+
 ## Overriding Executable to launch
 
 Application images include an `exec` field that specifies the executable to launch.

From e7393a40793bf16376419fa5d7bb65bfc9cdb5f1 Mon Sep 17 00:00:00 2001
From: ian Clark <ian.clark@virtucrypt.com>
Date: Tue, 3 May 2016 15:36:16 -0500
Subject: [PATCH 0234/1304] stage1/prepare-app/prepare-app.c: Parse UUIDs of 32
 character length

The proper format of UUIDs is the format of 8-4-4-4-12. Updating this to follow
the correct format (which is generated by a third-party package).

Issue #2573
---
 stage1/prepare-app/prepare-app.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 30d88173f5..beaf54792e 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -47,8 +47,8 @@ static int exit_err;
 #define lenof(_str) \
 	(sizeof(_str) - 1)
 
-#define MACHINE_ID_LEN		lenof("0123456789abcdef0123456789ab")
-#define MACHINE_NAME_LEN	lenof("rkt-01234567-89ab-cdef-0123-456789ab")
+#define MACHINE_ID_LEN		lenof("0123456789abcdef0123456789abcdef")
+#define MACHINE_NAME_LEN	lenof("rkt-01234567-89ab-cdef-0123-456789abcdef")
 
 typedef struct _dir_op_t {
 	const char	*name;
@@ -77,7 +77,7 @@ static int get_machine_name(char *out, int out_len) {
 	pgoto_if(close(fd) != 0,
 		_fail, "Error closing \"/etc/machine-id\"");
 	goto_if(snprintf(out, out_len,
-			"rkt-%.8s-%.4s-%.4s-%.4s-%.8s",
+			"rkt-%.8s-%.4s-%.4s-%.4s-%.12s",
 			buf, buf+8, buf+12, buf+16, buf+20) >= out_len,
 		_fail, "Error constructing machine name");
 

From de1e896c14c7698e06b48cafa69efe156a31713d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 9 May 2016 14:50:06 +0200
Subject: [PATCH 0235/1304] stage1/init: create a new mount ns for each app

Up to this point, you could escape the app's chroot easily by using a
simple program downloaded from the internet [[1]][1]. To avoid this, we
now create a new mount namespace per each app.

You can still escape the chroot if you have CAP_SYS_PTRACE and access
`/proc/1/root` but this fixes the issue for images that don't need this
capability.

[1]: http://www.unixwiz.net/techtips/chroot-practices.html
---
 stage1/init/common/pod.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 11b077c075..8f64b5cd3f 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -457,6 +457,9 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "Restart", "no"),
 		unit.NewUnitOption("Service", "ExecStart", execStartString),
 		unit.NewUnitOption("Service", "RootDirectory", common.RelAppRootfsPath(appName)),
+		// MountFlags=shared creates a new mount namespace and (as unintuitive
+		// as it might seem) makes sure the mount is slave+shared.
+		unit.NewUnitOption("Service", "MountFlags", "shared"),
 		unit.NewUnitOption("Service", "WorkingDirectory", workDir),
 		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePathSystemd(appName)),
 		unit.NewUnitOption("Service", "User", strconv.Itoa(u)),

From 2b468df4d7801b77e032cfab95314e82c3233105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 11 May 2016 16:35:50 +0200
Subject: [PATCH 0236/1304] functional tests: test reading a file written in
 another app

---
 tests/rkt_volume_test.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 1577ff3fa9..406afef649 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -94,6 +94,11 @@ var volTests = []struct {
 		`<<<1>>>`,
 		0,
 	},
+	{
+		`/bin/sh -c "export FILE=/dir1/file CONTENT=1 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --volume=dir1,kind=host,source=^TMPDIR^ --inherit-env=true ^VOL_RW_WRITE_FILE_ONLY^ ^VOL_RO_READ_FILE_ONLY^ --exec /inspect -- --pre-sleep=1 --read-file"`,
+		`<<<1>>>`,
+		0,
+	},
 }
 
 func NewVolumesTest() testutils.Test {
@@ -106,6 +111,10 @@ func NewVolumesTest() testutils.Test {
 		defer os.Remove(volRwReadFileImage)
 		volRwWriteFileImage := patchTestACI("rkt-inspect-vol-rw-write-file.aci", "--exec=/inspect --write-file --read-file", "--mounts=dir1,path=/dir1,readOnly=false")
 		defer os.Remove(volRwWriteFileImage)
+		volRwWriteFileOnlyImage := patchTestACI("rkt-inspect-vol-rw-write-file-only.aci", "--exec=/inspect --write-file", "--mounts=dir1,path=/dir1,readOnly=false")
+		defer os.Remove(volRwWriteFileOnlyImage)
+		volRoReadFileOnlyImage := patchTestACI("rkt-inspect-vol-ro-read-file-only.aci", "--name=coreos.com/rkt-inspect-2", "--exec=/inspect --read-file", "--mounts=dir1,path=/dir1,readOnly=true")
+		defer os.Remove(volRoReadFileOnlyImage)
 		volRoReadFileImage := patchTestACI("rkt-inspect-vol-ro-read-file.aci", "--exec=/inspect --read-file", "--mounts=dir1,path=/dir1,readOnly=true")
 		defer os.Remove(volRoReadFileImage)
 		volRoWriteFileImage := patchTestACI("rkt-inspect-vol-ro-write-file.aci", "--exec=/inspect --write-file --read-file", "--mounts=dir1,path=/dir1,readOnly=true")
@@ -134,6 +143,8 @@ func NewVolumesTest() testutils.Test {
 			cmd = strings.Replace(cmd, "^VOL_RO_WRITE_FILE^", volRoWriteFileImage, -1)
 			cmd = strings.Replace(cmd, "^VOL_RW_READ_FILE^", volRwReadFileImage, -1)
 			cmd = strings.Replace(cmd, "^VOL_RW_WRITE_FILE^", volRwWriteFileImage, -1)
+			cmd = strings.Replace(cmd, "^VOL_RW_WRITE_FILE_ONLY^", volRwWriteFileOnlyImage, -1)
+			cmd = strings.Replace(cmd, "^VOL_RO_READ_FILE_ONLY^", volRoReadFileOnlyImage, -1)
 			cmd = strings.Replace(cmd, "^VOL_ADD_MOUNT_RW^", volAddMountRwImage, -1)
 			cmd = strings.Replace(cmd, "^VOL_ADD_MOUNT_RO^", volAddMountRoImage, -1)
 

From e04ad9246f51aaf3cd93bc18551a78c7f16dad73 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@coreos.com>
Date: Tue, 10 May 2016 17:38:17 -0700
Subject: [PATCH 0237/1304] stage1: Fix segfault in enterexec

Prior to this commit, if `rkt enter` was executed without the `TERM`
environment variable set, a segfault could occur.
This commit treats an empty TERM environment variable as meaning 'xterm'
and avoids the segfault.
---
 stage1/enterexec/enterexec.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/stage1/enterexec/enterexec.c b/stage1/enterexec/enterexec.c
index 72ec9d3bb1..36079235a2 100644
--- a/stage1/enterexec/enterexec.c
+++ b/stage1/enterexec/enterexec.c
@@ -214,7 +214,15 @@ static void load_env(const char *env_file, const char *keep_env_file, int enteri
 
 	set_env(env_file);
 	set_env(keep_env_file);
-	if (entering) setenv("TERM", term, 1);
+	if (entering) {
+		// enter is typically interactive; ensure we always have a sane enough term
+		// variable.
+		if (term == NULL) {
+			setenv("TERM", "vt100", 1);
+		} else {
+			setenv("TERM", term, 1);
+		}
+	}
 }
 
 /* Parse a comma-separated list of numeric gids from str, returns an malloc'd

From 59150b9d1d1b61481fb6d41cdd246554a32e8bd7 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 28 Apr 2016 18:46:47 -0700
Subject: [PATCH 0238/1304] api: Return the pods even when we failed to get
 every information of it.

---
 rkt/api_service.go | 188 +++++++++++++++++++--------------------------
 1 file changed, 79 insertions(+), 109 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 532d3254f1..786957ab9f 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -241,15 +241,9 @@ func getPodManifest(p *pod) (*schema.PodManifest, []byte, error) {
 }
 
 // getApplist returns a list of apps in the pod.
-func getApplist(p *pod) ([]*v1alpha.App, error) {
+func getApplist(manifest *schema.PodManifest) []*v1alpha.App {
 	var apps []*v1alpha.App
-	applist, err := p.getApps()
-	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to get app list for pod %q", p.uuid), err)
-		return nil, err
-	}
-
-	for _, app := range applist {
+	for _, app := range manifest.Apps {
 		img := &v1alpha.Image{
 			BaseFormat: &v1alpha.ImageFormat{
 				// Only support appc image now. If it's a docker image, then it
@@ -268,7 +262,7 @@ func getApplist(p *pod) ([]*v1alpha.App, error) {
 			// State and exit code are not returned in 'ListPods()'.
 		})
 	}
-	return apps, nil
+	return apps
 }
 
 // getNetworks returns the list of the info of the network that the pod belongs to.
@@ -286,29 +280,30 @@ func getNetworks(p *pod) []*v1alpha.Network {
 
 // getBasicPod returns *v1alpha.Pod with basic pod information, it also returns a *schema.PodManifest
 // object.
-func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest, error) {
+func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest) {
 	pod := &v1alpha.Pod{Id: p.uuid.String(), Pid: -1}
 
-	// If a pod is in Embryo, Preparing, AbortedPrepare state,
-	// only id and state will be returned.
-	//
-	// If a pod is in other states, the pod manifest and
-	// apps will be returned when 'detailed' is true in the request.
-	//
-	// Valid pid and networks are only returned when a pod is in Running.
+	manifest, data, err := getPodManifest(p)
+	if err != nil {
+		stderr.PrintE(fmt.Sprintf("failed to get the pod manifest for pod %q", p.uuid), err)
+	} else {
+		pod.Manifest = data
+		pod.Annotations = convertAnnotationsToKeyValue(manifest.Annotations)
+		pod.Apps = getApplist(manifest)
+	}
+
 	switch p.getState() {
 	case Embryo:
 		pod.State = v1alpha.PodState_POD_STATE_EMBRYO
-		return pod, nil, nil
+		// When a pod is in embryo state, there is not much
+		// information to return.
+		return pod, manifest
 	case Preparing:
 		pod.State = v1alpha.PodState_POD_STATE_PREPARING
-		return pod, nil, nil
 	case AbortedPrepare:
 		pod.State = v1alpha.PodState_POD_STATE_ABORTED_PREPARE
-		return pod, nil, nil
 	case Prepared:
 		pod.State = v1alpha.PodState_POD_STATE_PREPARED
-		return pod, nil, nil
 	case Running:
 		pod.State = v1alpha.PodState_POD_STATE_RUNNING
 		pod.Networks = getNetworks(p)
@@ -320,45 +315,35 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest, error) {
 		pod.State = v1alpha.PodState_POD_STATE_GARBAGE
 	default:
 		pod.State = v1alpha.PodState_POD_STATE_UNDEFINED
-		return pod, nil, nil
+		return pod, manifest
 	}
 
 	createdAt, err := p.getCreationTime()
 	if err != nil {
-		return nil, nil, err
+		stderr.PrintE(fmt.Sprintf("failed to get the creation time for pod %q", p.uuid), err)
+	} else if !createdAt.IsZero() {
+		pod.CreatedAt = createdAt.UnixNano()
 	}
 
 	startedAt, err := p.getStartTime()
 	if err != nil {
-		return nil, nil, err
-	}
+		stderr.PrintE(fmt.Sprintf("failed to get the start time for pod %q", p.uuid), err)
+	} else if !startedAt.IsZero() {
+		pod.StartedAt = startedAt.UnixNano()
 
-	gcMarkedAt, err := p.getGCMarkedTime()
-	if err != nil {
-		return nil, nil, err
 	}
 
-	pod.CreatedAt = createdAt.UnixNano()
-	pod.StartedAt = startedAt.UnixNano()
-	pod.GcMarkedAt = gcMarkedAt.UnixNano()
-
-	manifest, data, err := getPodManifest(p)
+	gcMarkedAt, err := p.getGCMarkedTime()
 	if err != nil {
-		return nil, nil, err
+		stderr.PrintE(fmt.Sprintf("failed to get the gc marked time for pod %q", p.uuid), err)
+	} else if !gcMarkedAt.IsZero() {
+		pod.GcMarkedAt = gcMarkedAt.UnixNano()
 	}
 
-	apps, err := getApplist(p)
+	pid, err := p.getPID()
 	if err != nil {
-		return nil, nil, err
-	}
-
-	if pod.State == v1alpha.PodState_POD_STATE_RUNNING ||
-		pod.State == v1alpha.PodState_POD_STATE_DELETING ||
-		pod.State == v1alpha.PodState_POD_STATE_EXITED {
-		pid, err := p.getPID()
-		if err != nil {
-			return nil, nil, err
-		}
+		stderr.PrintE(fmt.Sprintf("failed to get the PID for pod %q", p.uuid), err)
+	} else {
 		pod.Pid = int32(pid)
 	}
 
@@ -366,36 +351,29 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest, error) {
 		// Get cgroup for the "name=systemd" controller.
 		pid, err := p.getContainerPID1()
 		if err != nil {
-			return nil, nil, err
-		}
-		cgroup, err := cgroup.GetCgroupPathByPid(pid, "name=systemd")
-		if err != nil {
-			return nil, nil, err
+			stderr.PrintE(fmt.Sprintf("failed to get the container PID1 for pod %q", p.uuid), err)
+		} else {
+			cgroup, err := cgroup.GetCgroupPathByPid(pid, "name=systemd")
+			if err != nil {
+				stderr.PrintE(fmt.Sprintf("failed to get the cgroup path for pod %q", p.uuid), err)
+			} else {
+				// If the stage1 systemd > v226, it will put the PID1 into "init.scope"
+				// implicit scope unit in the root slice.
+				// See https://github.com/coreos/rkt/pull/2331#issuecomment-203540543
+				//
+				// TODO(yifan): Revisit this when using unified cgroup hierarchy.
+				pod.Cgroup = strings.TrimSuffix(cgroup, "/init.scope")
+			}
 		}
-
-		// If the stage1 systemd > v226, it will put the PID1 into "init.scope"
-		// implicit scope unit in the root slice.
-		// See https://github.com/coreos/rkt/pull/2331#issuecomment-203540543
-		//
-		// TODO(yifan): Revisit this when using unified cgroup hierarchy.
-		pod.Cgroup = strings.TrimSuffix(cgroup, "/init.scope")
 	}
 
-	pod.Manifest = data
-	pod.Apps = apps
-	pod.Annotations = convertAnnotationsToKeyValue(manifest.Annotations)
-
-	return pod, manifest, nil
+	return pod, manifest
 }
 
 func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPodsRequest) (*v1alpha.ListPodsResponse, error) {
 	var pods []*v1alpha.Pod
 	if err := walkPods(includeMostDirs, func(p *pod) {
-		pod, manifest, err := getBasicPod(p)
-		if err != nil { // Do not return partial pods.
-			stderr.PrintE(fmt.Sprintf("failed to get basic pod information for pod with uuid: %v", p.uuid), err)
-			return
-		}
+		pod, manifest := getBasicPod(p)
 
 		// Filters are combined with 'OR'.
 		if !satisfiesAnyPodFilters(pod, manifest, request.Filters) {
@@ -403,10 +381,7 @@ func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPo
 		}
 
 		if request.Detail {
-			if err := fillAppInfo(s.store, p, pod); err != nil { // Do not return partial pods.
-				stderr.PrintE(fmt.Sprintf("failed to fill app information for pod with uuid: %v", p.uuid), err)
-				return
-			}
+			fillAppInfo(s.store, p, pod)
 		} else {
 			pod.Manifest = nil
 		}
@@ -419,25 +394,36 @@ func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPo
 }
 
 // fillAppInfo fills the apps' state and image info of the pod.
-func fillAppInfo(store *store.Store, p *pod, v1pod *v1alpha.Pod) error {
-	statusDir, err := p.getStatusDir()
-	if err != nil {
-		stderr.PrintE("failed to get pod exit status directory", err)
-		return err
+func fillAppInfo(store *store.Store, p *pod, v1pod *v1alpha.Pod) {
+	switch v1pod.State {
+	case v1alpha.PodState_POD_STATE_UNDEFINED:
+		return
+	case v1alpha.PodState_POD_STATE_EMBRYO:
+		return
 	}
 
 	for _, app := range v1pod.Apps {
+		readStatus := false
+
+		if p.isRunning() {
+			readStatus = true
+			app.State = v1alpha.AppState_APP_STATE_RUNNING
+		} else if p.afterRun() {
+			readStatus = true
+			app.State = v1alpha.AppState_APP_STATE_EXITED
+		} else {
+			app.State = v1alpha.AppState_APP_STATE_UNDEFINED
+		}
+
 		// Fill app's image info (id, name, version).
 		fullImageID, err := store.ResolveKey(app.Image.Id)
 		if err != nil {
 			stderr.PrintE(fmt.Sprintf("failed to resolve the image ID %q", app.Image.Id), err)
-			return err
 		}
 
 		im, err := p.getAppImageManifest(*types.MustACName(app.Name))
 		if err != nil {
 			stderr.PrintE(fmt.Sprintf("failed to get image manifests for app %q", app.Name), err)
-			return err
 		}
 
 		version, ok := im.Labels.Get("version")
@@ -459,32 +445,21 @@ func fillAppInfo(store *store.Store, p *pod, v1pod *v1alpha.Pod) error {
 			// info from store.
 		}
 
-		// Fill app's state and exit code.
-		value, err := p.readIntFromFile(filepath.Join(statusDir, app.Name))
-		if err == nil {
-			app.State = v1alpha.AppState_APP_STATE_EXITED
-			app.ExitCode = int32(value)
-			continue
-		}
-
-		if !os.IsNotExist(err) {
-			stderr.PrintE(fmt.Sprintf("failed to read status for app %q", app.Name), err)
-			return err
-		}
-		// If status file does not exit, that means the
-		// app is either running or aborted.
-		//
-		// FIXME(yifan): This is not acttually true, the app can be aborted while
-		// the pod is still running if the spec changes.
-		switch p.getState() {
-		case Running:
-			app.State = v1alpha.AppState_APP_STATE_RUNNING
-		default:
-			app.State = v1alpha.AppState_APP_STATE_UNDEFINED
+		if readStatus {
+			// Fill app's state and exit code.
+			statusDir, err := p.getStatusDir()
+			if err != nil {
+				stderr.PrintE("failed to get pod exit status directory", err)
+			} else {
+				value, err := p.readIntFromFile(filepath.Join(statusDir, app.Name))
+				if err != nil && !os.IsNotExist(err) {
+					stderr.PrintE(fmt.Sprintf("failed to read status for app %q", app.Name), err)
+				} else {
+					app.ExitCode = int32(value)
+				}
+			}
 		}
-
 	}
-	return nil
 }
 
 func (s *v1AlphaAPIServer) InspectPod(ctx context.Context, request *v1alpha.InspectPodRequest) (*v1alpha.InspectPodResponse, error) {
@@ -501,15 +476,10 @@ func (s *v1AlphaAPIServer) InspectPod(ctx context.Context, request *v1alpha.Insp
 	}
 	defer p.Close()
 
-	pod, _, err := getBasicPod(p)
-	if err != nil {
-		return nil, err
-	}
+	pod, _ := getBasicPod(p)
 
 	// Fill the extra pod info that is not available in ListPods(detail=false).
-	if err := fillAppInfo(s.store, p, pod); err != nil {
-		return nil, err
-	}
+	fillAppInfo(s.store, p, pod)
 
 	return &v1alpha.InspectPodResponse{Pod: pod}, nil
 }

From 93615518ab773e08f588860e54d6203730084a34 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Fri, 6 May 2016 16:12:34 -0700
Subject: [PATCH 0239/1304] test: Update rkt api service tests.

---
 tests/rkt_api_service_test.go | 132 ++++++++++++++++++++++------------
 tests/rkt_tests.go            |  18 +++--
 2 files changed, 96 insertions(+), 54 deletions(-)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index cd6a7b8ad5..dd592dcd98 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -100,23 +100,35 @@ func checkPodState(t *testing.T, rawState string, apiState v1alpha.PodState) {
 	t.Errorf("Pod state returned by api-service (%q) is not equivalent to the state returned by 'rkt status' (%q)", apiState, rawState)
 }
 
-func checkPodApps(t *testing.T, rawApps map[string]*appInfo, apiApps []*v1alpha.App, hasAppState bool) {
+func checkPodApps(t *testing.T, rawPod *podInfo, apiApps []*v1alpha.App, hasAppState bool) {
+	rawApps := rawPod.apps
 	if len(rawApps) != len(apiApps) {
 		t.Errorf("Expected %d apps, saw %d apps returned by api service %v", len(rawApps), len(apiApps), apiApps)
 	}
 
 	for _, app := range apiApps {
-		if appInfo, ok := rawApps[app.Name]; ok {
-			if hasAppState && appInfo.exitCode != int(app.ExitCode) {
-				t.Errorf("Expected %v, saw %v", appInfo.exitCode, app.ExitCode)
-			}
-			// Image hash in the pod manifest can be partial hash.
-			if !strings.HasPrefix(app.Image.Id, appInfo.image.id) {
-				t.Errorf("Expected partial hash of %q, saw %q", appInfo.image.id, app.Image.Id)
-			}
-		} else {
-			t.Errorf("Expected app (name: %q) in the app list", appInfo.name)
+		appInfo, ok := rawApps[app.Name]
+		if !ok {
+			t.Errorf("Expected app (name: %q) in the app list", app.Name)
+			continue
+		}
+
+		appACName := types.MustACName(app.Name)
+		runtimeApp := rawPod.manifest.Apps.Get(*appACName)
+		if runtimeApp == nil {
+			t.Errorf("Expected app (name: %q) in the pod manifest", app.Name)
+		}
+
+		if hasAppState && appInfo.exitCode != int(app.ExitCode) {
+			t.Errorf("Expected %v, saw %v", appInfo.exitCode, app.ExitCode)
 		}
+		// Image hash in the pod manifest can be partial hash.
+		if !strings.HasPrefix(app.Image.Id, appInfo.image.id) {
+			t.Errorf("Expected partial hash of %q, saw %q", appInfo.image.id, app.Image.Id)
+		}
+
+		// Check app annotations.
+		checkAnnotations(t, runtimeApp.Annotations, app.Annotations)
 	}
 }
 
@@ -162,7 +174,7 @@ func checkPod(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, hasAppStat
 		t.Errorf("API service returned an incorrect GC marked time. Got %q, Expect: %q", actualTime, expectedGCTime)
 	}
 	checkPodState(t, podInfo.state, p.State)
-	checkPodApps(t, podInfo.apps, p.Apps, hasAppState)
+	checkPodApps(t, podInfo, p.Apps, hasAppState)
 	checkPodNetworks(t, podInfo.networks, p.Networks)
 
 	expectedCgroupSuffix := ""
@@ -176,19 +188,17 @@ func checkPod(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, hasAppStat
 		t.Errorf("Expected the cgroup suffix to have %q, but saw %q", expectedCgroupSuffix, p.Cgroup)
 	}
 
-	if hasManifest {
-		var mfst schema.PodManifest
-		err := json.Unmarshal(podInfo.manifest, &mfst)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if mfst.Annotations != nil {
-			checkAnnotations(t, mfst.Annotations, p.Annotations)
-		}
+	if hasManifest && podInfo.manifest.Annotations != nil {
+		checkAnnotations(t, podInfo.manifest.Annotations, p.Annotations)
 	}
 
-	if hasManifest && !bytes.Equal(podInfo.manifest, p.Manifest) {
-		t.Errorf("Expected %q, saw %q", string(podInfo.manifest), string(p.Manifest))
+	msft, err := json.Marshal(podInfo.manifest)
+	if err != nil {
+		t.Errorf("Cannot marshal manifest: %v", err)
+	}
+
+	if hasManifest && !bytes.Equal(msft, p.Manifest) {
+		t.Errorf("Expected %q, saw %q", string(msft), string(p.Manifest))
 	} else if !hasManifest && p.Manifest != nil {
 		t.Errorf("Expected nil manifest")
 	}
@@ -323,23 +333,62 @@ func NewAPIServiceListInspectPodsTest() testutils.Test {
 		if err != nil {
 			t.Fatalf("Cannot generate types.Hash from %v: %v", imageHash, err)
 		}
-		pm := schema.BlankPodManifest()
-		pm.Apps = []schema.RuntimeApp{
+
+		podManifests := []struct {
+			mfst             schema.PodManifest
+			net              string
+			expectedExitCode int
+		}{
 			{
-				Name: types.ACName("rkt-inspect"),
-				Image: schema.RuntimeImage{
-					Name: types.MustACIdentifier("coreos.com/rkt-inspect"),
-					ID:   *imgID,
+				// 1, Good pod.
+				schema.PodManifest{
+					ACKind:    schema.PodManifestKind,
+					ACVersion: schema.AppContainerVersion,
+					Apps: []schema.RuntimeApp{
+						{
+							Name: types.ACName("rkt-inspect"),
+							Image: schema.RuntimeImage{
+								Name: types.MustACIdentifier("coreos.com/rkt-inspect"),
+								ID:   *imgID,
+							},
+							Annotations: []types.Annotation{{Name: types.ACIdentifier("app-test"), Value: "app-test"}},
+						},
+					},
+					Annotations: []types.Annotation{
+						{Name: types.ACIdentifier("test"), Value: "test"},
+					},
 				},
-				Annotations: []types.Annotation{{Name: types.ACIdentifier("app-test"), Value: "app-test"}},
+				"default",
+				0,
+			},
+			{
+				// 2, Bad pod, won't be launched correctly.
+				schema.PodManifest{
+					ACKind:    schema.PodManifestKind,
+					ACVersion: schema.AppContainerVersion,
+					Apps: []schema.RuntimeApp{
+						{
+							Name: types.ACName("rkt-inspect"),
+							Image: schema.RuntimeImage{
+								Name: types.MustACIdentifier("coreos.com/rkt-inspect"),
+								ID:   *imgID,
+							},
+						},
+					},
+				},
+				"non-existed-network",
+				1,
 			},
 		}
-		pm.Annotations = []types.Annotation{{Name: types.ACIdentifier("test"), Value: "test"}}
-		manifestFile := generatePodManifestFile(t, pm)
-		defer os.Remove(manifestFile)
 
-		runCmd := fmt.Sprintf("%s run --pod-manifest=%s", ctx.Cmd(), manifestFile)
-		waitOrFail(t, spawnOrFail(t, runCmd), 0)
+		// Launch the pods.
+		for _, entry := range podManifests {
+			manifestFile := generatePodManifestFile(t, &entry.mfst)
+			defer os.Remove(manifestFile)
+
+			runCmd := fmt.Sprintf("%s run --net=%s --pod-manifest=%s", ctx.Cmd(), entry.net, manifestFile)
+			waitOrFail(t, spawnOrFail(t, runCmd), entry.expectedExitCode)
+		}
 
 		time.Sleep(delta)
 
@@ -354,8 +403,8 @@ func NewAPIServiceListInspectPodsTest() testutils.Test {
 			t.Fatalf("Unexpected error: %v", err)
 		}
 
-		if len(resp.Pods) == 0 {
-			t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
+		if len(resp.Pods) != len(podManifests) {
+			t.Errorf("Unexpected result: %v, should see %v pods", len(resp.Pods), len(podManifests))
 		}
 
 		for _, p := range resp.Pods {
@@ -367,11 +416,6 @@ func NewAPIServiceListInspectPodsTest() testutils.Test {
 				t.Fatalf("Unexpected error: %v", err)
 			}
 			checkPodDetails(t, ctx, inspectResp.Pod)
-
-			// Test Apps.
-			for i, app := range p.Apps {
-				checkAnnotations(t, pm.Apps[i].Annotations, app.Annotations)
-			}
 		}
 
 		// ListPods(detail=true).
@@ -380,8 +424,8 @@ func NewAPIServiceListInspectPodsTest() testutils.Test {
 			t.Fatalf("Unexpected error: %v", err)
 		}
 
-		if len(resp.Pods) == 0 {
-			t.Errorf("Unexpected result: %v, should see non-zero pods", resp.Pods)
+		if len(resp.Pods) != len(podManifests) {
+			t.Errorf("Unexpected result: %v, should see %v pods", len(resp.Pods), len(podManifests))
 		}
 
 		for _, p := range resp.Pods {
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 73a23077f2..09f3fc878d 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -417,7 +417,7 @@ type podInfo struct {
 	state     string
 	apps      map[string]*appInfo
 	networks  map[string]*networkInfo
-	manifest  []byte
+	manifest  *schema.PodManifest
 	createdAt int64
 	startedAt int64
 }
@@ -435,7 +435,8 @@ func parsePodInfoOutput(t *testing.T, result string, p *podInfo) {
 	for _, line := range lines {
 		tuples := strings.SplitN(line, "=", 2)
 		if len(tuples) != 2 {
-			t.Fatalf("Unexpected line: %v", line)
+			t.Logf("Unexpected line: %v", line)
+			continue
 		}
 
 		switch tuples[0] {
@@ -521,6 +522,7 @@ func getPodDir(t *testing.T, ctx *testutils.RktRunCtx, podID string) string {
 func getPodInfo(t *testing.T, ctx *testutils.RktRunCtx, podID string) *podInfo {
 	p := &podInfo{
 		id:       podID,
+		pid:      -1,
 		apps:     make(map[string]*appInfo),
 		networks: make(map[string]*networkInfo),
 	}
@@ -532,14 +534,13 @@ func getPodInfo(t *testing.T, ctx *testutils.RktRunCtx, podID string) *podInfo {
 	}
 
 	// Trim the last '\n' character.
-	p.manifest = bytes.TrimSpace(output)
+	mfst := bytes.TrimSpace(output)
 
 	// Fill app infos.
-	var manifest schema.PodManifest
-	if err := json.Unmarshal(p.manifest, &manifest); err != nil {
+	if err := json.Unmarshal(mfst, &p.manifest); err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
-	for _, app := range manifest.Apps {
+	for _, app := range p.manifest.Apps {
 		appName := app.Name.String()
 		p.apps[appName] = &appInfo{
 			name: appName,
@@ -549,10 +550,7 @@ func getPodInfo(t *testing.T, ctx *testutils.RktRunCtx, podID string) *podInfo {
 	}
 
 	// Fill other infos.
-	output, err = exec.Command("/bin/bash", "-c", fmt.Sprintf("%s status %s", ctx.Cmd(), podID)).CombinedOutput()
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
+	output, _ = exec.Command("/bin/bash", "-c", fmt.Sprintf("%s status %s", ctx.Cmd(), podID)).CombinedOutput()
 	parsePodInfoOutput(t, string(output), p)
 
 	return p

From e1ba9ef00f553ebc97cdecba1916b5af5d3a33b0 Mon Sep 17 00:00:00 2001
From: Chance Zibolski <chance.zibolski@coreos.com>
Date: Wed, 20 Apr 2016 14:48:16 -0700
Subject: [PATCH 0240/1304] dist: Update tmpfiles to create /etc/rkt

By creating this directory, users can run `rkt trust` without being
root, if the user is in the rkt group.
---
 dist/init/systemd/tmpfiles.d/rkt.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dist/init/systemd/tmpfiles.d/rkt.conf b/dist/init/systemd/tmpfiles.d/rkt.conf
index 00f37580b7..406172741e 100644
--- a/dist/init/systemd/tmpfiles.d/rkt.conf
+++ b/dist/init/systemd/tmpfiles.d/rkt.conf
@@ -22,3 +22,5 @@ d /var/lib/rkt/pods/prepared 2750 root rkt
 d /var/lib/rkt/pods/run 2750 root rkt
 d /var/lib/rkt/pods/exited-garbage 2750 root rkt
 d /var/lib/rkt/pods/garbage 2750 root rkt
+
+d /etc/rkt 2770 root rkt-admin

From f2c25434468838a019c0c73fce246e253fbecb37 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 12 May 2016 01:21:51 +0200
Subject: [PATCH 0241/1304] tests: print proper output for TestAceValidator

This allows to debug https://github.com/coreos/rkt/issues/2171 properly.
---
 tests/rkt_ace_validator_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_ace_validator_test.go b/tests/rkt_ace_validator_test.go
index c7adc5980d..fc8a514d10 100644
--- a/tests/rkt_ace_validator_test.go
+++ b/tests/rkt_ace_validator_test.go
@@ -56,16 +56,18 @@ func TestAceValidator(t *testing.T) {
 	child := spawnOrFail(t, rktCmd)
 	defer waitOrFail(t, child, 0)
 
+	out := ""
 	for _, set := range expected {
 		for len(set) > 0 {
-			results, _, err := expectRegexWithOutput(child, pattern)
+			results, o, err := expectRegexWithOutput(child, pattern)
+			out += o
 			if err != nil {
 				var keys []string
 				for k := range set {
 					keys = append(keys, fmt.Sprintf("%q", k))
 				}
 				ex := strings.Join(keys, " or ")
-				t.Fatalf("Expected %s, but not found: %v", ex, err)
+				t.Fatalf("Expected %s, but not found: %v\nOutput: %v", ex, err, out)
 			}
 			if len(results) != 2 {
 				t.Fatalf("Unexpected regex results, expected a whole match and one submatch, got %#v", results)

From 2ce4abb1940d8de97f674472b7c2383f42d403ae Mon Sep 17 00:00:00 2001
From: Matthias Jahn <matthias.jahn@peerigon.com>
Date: Thu, 12 May 2016 08:52:26 +0200
Subject: [PATCH 0242/1304] scripts: add libtspi-dev

Now the install script can be reused e.g. for the 'build with docker' part

Fixes #2215
---
 scripts/install-deps-debian-sid.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install-deps-debian-sid.sh b/scripts/install-deps-debian-sid.sh
index 0db2db2ed5..b4edb2c102 100755
--- a/scripts/install-deps-debian-sid.sh
+++ b/scripts/install-deps-debian-sid.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev"
+DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libtspi-dev"
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update

From 78c9d76fe5ca19e07e9fdc9c5b5f8e64188a28ac Mon Sep 17 00:00:00 2001
From: Matthias Jahn <matthias.jahn@peerigon.com>
Date: Thu, 12 May 2016 08:55:08 +0200
Subject: [PATCH 0243/1304] docs: change docker img to debian:sid, install deps
 via script

"build with docker" and "build with rkt" should use same deps and img

Fixes #2215
---
 Documentation/hacking.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 5477f4945c..539e812950 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -33,7 +33,7 @@ Alternatively, you can build rkt in a Docker container with the following comman
 Replace `$SRC` with the absolute path to your rkt source code:
 
 ```
-# docker run -v $SRC:/opt/rkt -i -t golang:1.5 /bin/bash -c "apt-get update && apt-get install -y coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc libacl1-dev libtspi-dev libssl-dev && cd /opt/rkt && go get github.com/appc/spec/... && ./autogen.sh && ./configure && make"
+# docker run -v $SRC:/opt/rkt debian:sid /bin/bash -c "cd /opt/rkt && ./scripts/install-deps-debian-sid.sh go get github.com/appc/spec/... && ./autogen.sh && ./configure && make"
 ```
 
 ### Building systemd in stage1 from source

From 7e796e85668d222f0ea4895cf0b016791d68940b Mon Sep 17 00:00:00 2001
From: Matthias Jahn <matthias.jahn@peerigon.com>
Date: Thu, 12 May 2016 09:08:40 +0200
Subject: [PATCH 0244/1304] docs: fixed build with docker cmd (forgot &&
 between two cmds)

Without "&&" the cmd is not correct

Fixes #2215
---
 Documentation/hacking.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 539e812950..56180eed6a 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -33,7 +33,7 @@ Alternatively, you can build rkt in a Docker container with the following comman
 Replace `$SRC` with the absolute path to your rkt source code:
 
 ```
-# docker run -v $SRC:/opt/rkt debian:sid /bin/bash -c "cd /opt/rkt && ./scripts/install-deps-debian-sid.sh go get github.com/appc/spec/... && ./autogen.sh && ./configure && make"
+# docker run -v $SRC:/opt/rkt debian:sid /bin/bash -c "cd /opt/rkt && ./scripts/install-deps-debian-sid.sh && go get github.com/appc/spec/... && ./autogen.sh && ./configure && make"
 ```
 
 ### Building systemd in stage1 from source

From bccd93a59d0df87ad85a1312b428c5d5af5d4bf5 Mon Sep 17 00:00:00 2001
From: Tamer TAS <tmrts@users.noreply.github.com>
Date: Thu, 12 May 2016 11:30:48 +0300
Subject: [PATCH 0245/1304] docs: add instructions for nixos (#2614)

Adds instructions for installing rkt on NixOS.

Related to #2202
---
 Documentation/distributions.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index f872138711..22df43dd35 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -54,6 +54,16 @@ rkt is available in the [Community Repository](https://www.archlinux.org/package
 sudo pacman -S rkt
 ```
 
+## NixOS
+
+rkt can be installed on NixOS using the following command:
+
+```
+nix-env -iA rkt
+```
+
+The source for the rkt.nix expression can be found on [GitHub](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/virtualization/rkt/default.nix)
+
 ## Void
 
 rkt is available in the [official binary packages](http://www.voidlinux.eu/packages/) for the Void Linux distribution.

From 01f08f1af219640f76d0eb3580ad0ae79d2e02a6 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 12 May 2016 11:36:44 +0200
Subject: [PATCH 0246/1304] godeps: update cni to v0.2.3

Fixes #2580
---
 Godeps/Godeps.json                            | 68 +++++++++----------
 .../appc/cni/plugins/main/bridge/bridge.go    | 23 +++++--
 .../appc/cni/plugins/main/ptp/ptp.go          |  6 +-
 3 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 6bc5c2f33f..b8c1333117 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -23,88 +23,88 @@
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/invoke",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/ip",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/ipam",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/ns",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/skel",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/types",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/pkg/utils",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/dhcp",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local/backend",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local/backend/disk",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/main/bridge",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/main/ipvlan",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/main/macvlan",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/main/ptp",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/meta/flannel",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/cni/plugins/meta/tuning",
-			"Comment": "v0.2.0-rc0",
-			"Rev": "0046767be795f629180e0713b71822b731531997"
+			"Comment": "v0.2.3",
+			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib",
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go
index e4bc106c00..e87eb726fc 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go
@@ -238,14 +238,29 @@ func cmdDel(args *skel.CmdArgs) error {
 		return err
 	}
 
-	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
-	if err != nil {
+	if err := ipam.ExecDel(n.IPAM.Type, args.StdinData); err != nil {
 		return err
 	}
 
-	return ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
-		return ip.DelLinkByName(args.IfName)
+	var ipn *net.IPNet
+	err = ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
+		var err error
+		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
+		return err
 	})
+	if err != nil {
+		return err
+	}
+
+	if n.IPMasq {
+		chain := utils.FormatChainName(n.Name, args.ContainerID)
+		comment := utils.FormatComment(n.Name, args.ContainerID)
+		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
+			return err
+		}
+	}
+
+	return nil
 }
 
 func main() {
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go
index 3035c643f7..05b3b2a324 100644
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go
+++ b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go
@@ -195,6 +195,10 @@ func cmdDel(args *skel.CmdArgs) error {
 		return fmt.Errorf("failed to load netconf: %v", err)
 	}
 
+	if err := ipam.ExecDel(conf.IPAM.Type, args.StdinData); err != nil {
+		return err
+	}
+
 	var ipn *net.IPNet
 	err := ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
 		var err error
@@ -213,7 +217,7 @@ func cmdDel(args *skel.CmdArgs) error {
 		}
 	}
 
-	return ipam.ExecDel(conf.IPAM.Type, args.StdinData)
+	return nil
 }
 
 func main() {

From 44d1f4e5068901d1c026073c621490c0f9ef81ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 12 May 2016 11:40:48 +0200
Subject: [PATCH 0247/1304] fuctional tests: check that each app is in a
 different mount ns

---
 tests/inspect/inspect.go  | 21 ++++++++++++++++++++
 tests/rkt_mountns_test.go | 41 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 tests/rkt_mountns_test.go

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index dbc0bd4004..485d53e8e1 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -72,6 +72,7 @@ var (
 		PrintIfaceCount    bool
 		PrintAppAnnotation string
 		SilentSigterm      bool
+		CheckMountNS       bool
 	}{}
 )
 
@@ -110,6 +111,7 @@ func init() {
 	globalFlagset.BoolVar(&globalFlags.PrintIfaceCount, "print-iface-count", false, "Print the interface count")
 	globalFlagset.StringVar(&globalFlags.PrintAppAnnotation, "print-app-annotation", "", "Take an annotation name of the app, and prints its value")
 	globalFlagset.BoolVar(&globalFlags.SilentSigterm, "silent-sigterm", false, "Exit with a success exit status if we receive SIGTERM")
+	globalFlagset.BoolVar(&globalFlags.CheckMountNS, "check-mountns", false, "Check if app's mount ns is different than stage1's. Requires CAP_SYS_PTRACE")
 }
 
 func in(list []int, el int) bool {
@@ -474,5 +476,24 @@ func main() {
 		fmt.Printf("Annotation %s=%s\n", globalFlags.PrintAppAnnotation, body)
 	}
 
+	if globalFlags.CheckMountNS {
+		appMountNS, err := os.Readlink("/proc/self/ns/mnt")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%v\n", err)
+			os.Exit(1)
+		}
+		s1MountNS, err := os.Readlink("/proc/1/ns/mnt")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%v\n", err)
+			os.Exit(1)
+		}
+		if appMountNS != s1MountNS {
+			fmt.Println("check-mountns: DIFFERENT")
+		} else {
+			fmt.Println("check-mountns: IDENTICAL")
+			os.Exit(1)
+		}
+	}
+
 	os.Exit(globalFlags.ExitCode)
 }
diff --git a/tests/rkt_mountns_test.go b/tests/rkt_mountns_test.go
new file mode 100644
index 0000000000..d7bdf98a92
--- /dev/null
+++ b/tests/rkt_mountns_test.go
@@ -0,0 +1,41 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src kvm
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestMountNSApp(t *testing.T) {
+	image := patchTestACI("rkt-test-mount-ns-app.aci", "--exec=/inspect --check-mountns", "--capability=CAP_SYS_PTRACE")
+	defer os.Remove(image)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	rktCmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), image)
+
+	expectedLine := "check-mountns: DIFFERENT"
+	runRktAndCheckOutput(t, rktCmd, expectedLine, false)
+}
+
+func TestSharedSlave(t *testing.T) {
+}

From affb06c6aa11bea1c06ed5545d20c4dbcd0f2690 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 11 May 2016 17:00:00 +0200
Subject: [PATCH 0248/1304] Bump Godeps to appc/spec 0.8.0

---
 Godeps/Godeps.json                            |  52 ++---
 .../src/github.com/appc/spec/ace/build_aci    |   4 +-
 ..._main.json => image_manifest_main.json.in} |   8 +-
 ...k.json => image_manifest_sidekick.json.in} |   8 +-
 .../src/github.com/appc/spec/ace/validator.go |  80 +++----
 .../github.com/appc/spec/actool/discover.go   |  31 ++-
 .../github.com/appc/spec/actool/manifest.go   |  30 ++-
 .../appc/spec/discovery/discovery.go          |  73 +++----
 .../github.com/appc/spec/discovery/http.go    |  26 +--
 .../github.com/appc/spec/discovery/myapp.html |  15 --
 .../appc/spec/discovery/myapp2.html           |  15 --
 .../appc/spec/pkg/device/device_linux.go      |  33 +++
 .../appc/spec/pkg/device/device_posix.go      |   2 +-
 .../src/github.com/appc/spec/schema/image.go  |   2 +-
 .../src/github.com/appc/spec/schema/pod.go    |   2 +-
 .../github.com/appc/spec/schema/version.go    |   2 +-
 Godeps/_workspace/src/go4.org/LICENSE         | 202 ++++++++++++++++++
 .../pkg => go4.org}/errorutil/highlight.go    |   0
 18 files changed, 403 insertions(+), 182 deletions(-)
 rename Godeps/_workspace/src/github.com/appc/spec/ace/{image_manifest_main.json => image_manifest_main.json.in} (91%)
 rename Godeps/_workspace/src/github.com/appc/spec/ace/{image_manifest_sidekick.json => image_manifest_sidekick.json.in} (70%)
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/discovery/myapp.html
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/discovery/myapp2.html
 create mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_linux.go
 create mode 100644 Godeps/_workspace/src/go4.org/LICENSE
 rename Godeps/_workspace/src/{github.com/camlistore/camlistore/pkg => go4.org}/errorutil/highlight.go (100%)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index b8c1333117..62e046a18d 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -163,62 +163,58 @@
 		},
 		{
 			"ImportPath": "github.com/appc/spec/ace",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/aci",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/actool",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/discovery",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/acirenderer",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/device",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/tarheader",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/common",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/lastditch",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/types",
-			"Comment": "v0.7.4",
-			"Rev": "0875c991a496fe2b65ed296551c667b199a6bfb8"
-		},
-		{
-			"ImportPath": "github.com/camlistore/camlistore/pkg/errorutil",
-			"Rev": "9868aa0f8d8a93ff0b30ff0de46cc351b6b88b30"
+			"Comment": "v0.8.0",
+			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
 		},
 		{
 			"ImportPath": "github.com/camlistore/go4/lock",
@@ -497,6 +493,10 @@
 			"ImportPath": "github.com/vishvananda/netlink/nl",
 			"Rev": "ecf47fd5739b3d2c3daf7c89c4b9715a2605c21b"
 		},
+		{
+			"ImportPath": "go4.org/errorutil",
+			"Rev": "03efcb870d84809319ea509714dd6d19a1498483"
+		},
 		{
 			"ImportPath": "golang.org/x/crypto/cast5",
 			"Rev": "a7ead6ddf06233883deca151dffaef2effbf498f"
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/build_aci b/Godeps/_workspace/src/github.com/appc/spec/ace/build_aci
index 5baae5b297..ebfc225661 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/build_aci
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/build_aci
@@ -6,6 +6,8 @@ set -eu
 
 PREFIX="ace"
 : ${NO_SIGNATURE=}
+GOOS="$(go env GOOS)"
+GOARCH="$(go env GOARCH)"
 
 if ! [[ $0 =~ "${PREFIX}/build_aci" ]]; then 
 	echo "invoke from repository root" 1>&2
@@ -20,7 +22,7 @@ for typ in main sidekick; do
 	layoutdir="bin/ace-${typ}-layout"
 	mkdir -p ${layoutdir}/rootfs/opt/acvalidator
 	cp bin/ace-validator ${layoutdir}/rootfs/
-	cp ${PREFIX}/image_manifest_${typ}.json ${layoutdir}/manifest
+	sed -e "s/@GOOS@/$GOOS/" -e "s/@GOARCH@/$GOARCH/" < ${PREFIX}/image_manifest_${typ}.json.in > ${layoutdir}/manifest
 	# now build the tarball, and sign it
 	pushd ${layoutdir} >/dev/null
 		# Set a consistent timestamp so we get a consistent hash
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
similarity index 91%
rename from Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json
rename to Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
index f3173b7d34..3f4f11abd5 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,11 +1,11 @@
 {
-    "acVersion": "0.7.4",
+    "acVersion": "0.8.0",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.7.4" },
-        { "name": "os", "value": "linux" },
-        { "name": "arch", "value": "amd64" }
+        { "name": "version", "value": "0.8.0" },
+        { "name": "os", "value": "@GOOS@" },
+        { "name": "arch", "value": "@GOARCH@" }
     ],
     "app": {
         "exec": [
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
similarity index 70%
rename from Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json
rename to Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index f5d08f1173..a227de9000 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,11 +1,11 @@
 {
-    "acVersion": "0.7.4",
+    "acVersion": "0.8.0",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.7.4" },
-        { "name": "os", "value": "linux" },
-        { "name": "arch", "value": "amd64" }
+        { "name": "version", "value": "0.8.0" },
+        { "name": "os", "value": "@GOOS@" },
+        { "name": "arch", "value": "@GOARCH@" }
     ],
     "app": {
         "exec": [
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go b/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go
index 5c53a22542..420ae78897 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go
@@ -226,7 +226,7 @@ func ValidateMountpoints(wmp map[string]types.MountPoint) results {
 	return r
 }
 
-func metadataRequest(req *http.Request) ([]byte, error) {
+func metadataRequest(req *http.Request, expectedContentType string) ([]byte, error) {
 	cli := http.Client{
 		Timeout: 100 * time.Millisecond,
 	}
@@ -242,6 +242,11 @@ func metadataRequest(req *http.Request) ([]byte, error) {
 		return nil, fmt.Errorf("Get %s failed with %v", req.URL, resp.StatusCode)
 	}
 
+	if respContentType := resp.Header.Get("Content-Type"); respContentType != expectedContentType {
+		return nil, fmt.Errorf("`%s` did not respond with expected Content-Type header.  Expected %s, received %s",
+			req.RequestURI, expectedContentType, respContentType)
+	}
+
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("Get %s failed on body read: %v", req.URL, err)
@@ -250,27 +255,28 @@ func metadataRequest(req *http.Request) ([]byte, error) {
 	return body, nil
 }
 
-func metadataGet(metadataURL, path string) ([]byte, error) {
+func metadataGet(metadataURL, path string, expectedContentType string) ([]byte, error) {
 	uri := metadataURL + metadataPathBase + path
 	req, err := http.NewRequest("GET", uri, nil)
 	if err != nil {
 		panic(err)
 	}
-	return metadataRequest(req)
+
+	return metadataRequest(req, expectedContentType)
 }
 
-func metadataPost(metadataURL, path string, body []byte) ([]byte, error) {
+func metadataPost(metadataURL, path string, body []byte, expectedContentType string) ([]byte, error) {
 	uri := metadataURL + metadataPathBase + path
 	req, err := http.NewRequest("POST", uri, bytes.NewBuffer(body))
 	if err != nil {
 		panic(err)
 	}
-	req.Header.Set("Content-Type", "text/plan")
+	req.Header.Set("Content-Type", "text/plain")
 
-	return metadataRequest(req)
+	return metadataRequest(req, expectedContentType)
 }
 
-func metadataPostForm(metadataURL, path string, data url.Values) ([]byte, error) {
+func metadataPostForm(metadataURL, path string, data url.Values, expectedContentType string) ([]byte, error) {
 	uri := metadataURL + metadataPathBase + path
 	req, err := http.NewRequest("POST", uri, strings.NewReader(data.Encode()))
 	if err != nil {
@@ -278,7 +284,7 @@ func metadataPostForm(metadataURL, path string, data url.Values) ([]byte, error)
 	}
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 
-	return metadataRequest(req)
+	return metadataRequest(req, expectedContentType)
 }
 
 func validatePodAnnotations(metadataURL string, pm *schema.PodManifest) results {
@@ -286,28 +292,14 @@ func validatePodAnnotations(metadataURL string, pm *schema.PodManifest) results
 
 	var actualAnnots types.Annotations
 
-	annots, err := metadataGet(metadataURL, "/pod/annotations/")
+	annotJson, err := metadataGet(metadataURL, "/pod/annotations/", "application/json")
 	if err != nil {
 		return append(r, err)
 	}
 
-	for _, key := range strings.Split(string(annots), "\n") {
-		if key == "" {
-			continue
-		}
-
-		val, err := metadataGet(metadataURL, "/pod/annotations/"+key)
-		if err != nil {
-			r = append(r, err)
-		}
-
-		name, err := types.NewACIdentifier(key)
-		if err != nil {
-			r = append(r, fmt.Errorf("invalid annotation name: %v", err))
-			continue
-		}
-
-		actualAnnots.Set(*name, string(val))
+	err = json.Unmarshal(annotJson, actualAnnots)
+	if err != nil {
+		return append(r, err)
 	}
 
 	if !reflect.DeepEqual(actualAnnots, pm.Annotations) {
@@ -320,7 +312,7 @@ func validatePodAnnotations(metadataURL string, pm *schema.PodManifest) results
 func validatePodMetadata(metadataURL string, pm *schema.PodManifest) results {
 	r := results{}
 
-	uuid, err := metadataGet(metadataURL, "/pod/uuid")
+	uuid, err := metadataGet(metadataURL, "/pod/uuid", "text/plain; charset=us-ascii")
 	if err != nil {
 		return append(r, err)
 	}
@@ -349,28 +341,14 @@ func validateAppAnnotations(metadataURL string, pm *schema.PodManifest, app *sch
 
 	var actualAnnots types.Annotations
 
-	annots, err := metadataGet(metadataURL, "/apps/"+string(app.Name)+"/annotations/")
+	annotJson, err := metadataGet(metadataURL, "/apps/"+string(app.Name)+"/annotations", "application/json")
 	if err != nil {
 		return append(r, err)
 	}
 
-	for _, key := range strings.Split(string(annots), "\n") {
-		if key == "" {
-			continue
-		}
-
-		val, err := metadataGet(metadataURL, "/apps/"+string(app.Name)+"/annotations/"+key)
-		if err != nil {
-			r = append(r, err)
-		}
-
-		lbl, err := types.NewACIdentifier(key)
-		if err != nil {
-			r = append(r, fmt.Errorf("invalid annotation name: %v", err))
-			continue
-		}
-
-		actualAnnots.Set(*lbl, string(val))
+	err = json.Unmarshal(annotJson, actualAnnots)
+	if err != nil {
+		return append(r, err)
 	}
 
 	if !reflect.DeepEqual(actualAnnots, expectedAnnots) {
@@ -384,7 +362,7 @@ func validateAppAnnotations(metadataURL string, pm *schema.PodManifest, app *sch
 func validateAppMetadata(metadataURL string, pm *schema.PodManifest, app *schema.RuntimeApp) results {
 	r := results{}
 
-	am, err := metadataGet(metadataURL, "/apps/"+app.Name.String()+"/image/manifest")
+	am, err := metadataGet(metadataURL, "/apps/"+app.Name.String()+"/image/manifest", "application/json")
 	if err != nil {
 		return append(r, err)
 	}
@@ -394,7 +372,7 @@ func validateAppMetadata(metadataURL string, pm *schema.PodManifest, app *schema
 		return append(r, fmt.Errorf("failed to JSON-decode %q manifest: %v", app.Name.String(), err))
 	}
 
-	id, err := metadataGet(metadataURL, "/apps/"+app.Name.String()+"/image/id")
+	id, err := metadataGet(metadataURL, "/apps/"+app.Name.String()+"/image/id", "text/plain; charset=us-ascii")
 	if err != nil {
 		r = append(r, err)
 	}
@@ -411,7 +389,7 @@ func validateSigning(metadataURL string, pm *schema.PodManifest) results {
 	r := results{}
 
 	// Get our UUID
-	uuid, err := metadataGet(metadataURL, "/pod/uuid")
+	uuid, err := metadataGet(metadataURL, "/pod/uuid", "text/plain; charset=us-ascii")
 	if err != nil {
 		return append(r, err)
 	}
@@ -421,7 +399,7 @@ func validateSigning(metadataURL string, pm *schema.PodManifest) results {
 	// Sign
 	sig, err := metadataPostForm(metadataURL, "/pod/hmac/sign", url.Values{
 		"content": []string{plaintext},
-	})
+	}, "text/plain; charset=us-ascii")
 	if err != nil {
 		return append(r, err)
 	}
@@ -431,7 +409,7 @@ func validateSigning(metadataURL string, pm *schema.PodManifest) results {
 		"content":   []string{plaintext},
 		"uuid":      []string{string(uuid)},
 		"signature": []string{string(sig)},
-	})
+	}, "text/plain; charset=us-ascii")
 
 	if err != nil {
 		return append(r, err)
@@ -448,7 +426,7 @@ func ValidateMetadataSvc() results {
 		return append(r, fmt.Errorf("AC_METADATA_URL is not set"))
 	}
 
-	pod, err := metadataGet(metadataURL, "/pod/manifest")
+	pod, err := metadataGet(metadataURL, "/pod/manifest", "application/json")
 	if err != nil {
 		return append(r, err)
 	}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go b/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go
index cfccb76b29..f91f526d7b 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go
@@ -60,29 +60,44 @@ func runDiscover(args []string) (exit int) {
 		}
 		insecure := discovery.InsecureNone
 		if transportFlags.Insecure {
-			insecure = discovery.InsecureTls | discovery.InsecureHttp
+			insecure = discovery.InsecureTLS | discovery.InsecureHTTP
 		}
-		eps, attempts, err := discovery.DiscoverEndpoints(*app, nil, insecure)
+		eps, attempts, err := discovery.DiscoverACIEndpoints(*app, nil, insecure)
 		if err != nil {
-			stderr("error fetching %s: %s", name, err)
+			stderr("error fetching endpoints for %s: %s", name, err)
 			return 1
 		}
 		for _, a := range attempts {
-			fmt.Printf("discover walk: prefix: %s error: %v\n", a.Prefix, a.Error)
+			fmt.Printf("discover endpoints walk: prefix: %s error: %v\n", a.Prefix, a.Error)
 		}
+		publicKeys, attempts, err := discovery.DiscoverPublicKeys(*app, nil, insecure)
+		if err != nil {
+			stderr("error fetching public keys for %s: %s", name, err)
+			return 1
+		}
+		for _, a := range attempts {
+			fmt.Printf("discover public keys walk: prefix: %s error: %v\n", a.Prefix, a.Error)
+		}
+
+		type discoveryData struct {
+			ACIEndpoints []discovery.ACIEndpoint
+			PublicKeys   []string
+		}
+
 		if outputJson {
-			jsonBytes, err := json.MarshalIndent(&eps, "", "    ")
+			dd := discoveryData{ACIEndpoints: eps, PublicKeys: publicKeys}
+			jsonBytes, err := json.MarshalIndent(dd, "", "    ")
 			if err != nil {
 				stderr("error generating JSON: %s", err)
 				return 1
 			}
 			fmt.Println(string(jsonBytes))
 		} else {
-			for _, aciEndpoint := range eps.ACIEndpoints {
+			for _, aciEndpoint := range eps {
 				fmt.Printf("ACI: %s, ASC: %s\n", aciEndpoint.ACI, aciEndpoint.ASC)
 			}
-			if len(eps.Keys) > 0 {
-				fmt.Println("Keys: " + strings.Join(eps.Keys, ","))
+			if len(publicKeys) > 0 {
+				fmt.Println("PublicKeys: " + strings.Join(publicKeys, ","))
 			}
 		}
 	}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go b/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go
index d09f11f60c..94eff16a4c 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go
@@ -47,6 +47,7 @@ var (
 	patchGroup             string
 	patchSupplementaryGIDs string
 	patchCaps              string
+	patchRevokeCaps        string
 	patchMounts            string
 	patchPorts             string
 	patchIsolators         string
@@ -63,6 +64,7 @@ var (
 		  [--exec="/app --debug"]
 		  [--user=uid] [--group=gid]
 		  [--capability=CAP_SYS_ADMIN,CAP_NET_ADMIN]
+		  [--revoke-capability=CAP_SYS_CHROOT,CAP_MKNOD]
 		  [--mounts=work,path=/opt,readOnly=true[:work2,...]]
 		  [--ports=query,protocol=tcp,port=8080[:query2,...]]
 		  [--supplementary-groups=gid1,gid2,...]
@@ -92,7 +94,8 @@ func init() {
 	cmdPatchManifest.Flags.StringVar(&patchUser, "user", "", "Replace user")
 	cmdPatchManifest.Flags.StringVar(&patchGroup, "group", "", "Replace group")
 	cmdPatchManifest.Flags.StringVar(&patchSupplementaryGIDs, "supplementary-groups", "", "Replace supplementary groups, expects a comma-separated list.")
-	cmdPatchManifest.Flags.StringVar(&patchCaps, "capability", "", "Replace capability")
+	cmdPatchManifest.Flags.StringVar(&patchCaps, "capability", "", "Set the capability remain set")
+	cmdPatchManifest.Flags.StringVar(&patchRevokeCaps, "revoke-capability", "", "Set the capability remove set")
 	cmdPatchManifest.Flags.StringVar(&patchMounts, "mounts", "", "Replace mount points")
 	cmdPatchManifest.Flags.StringVar(&patchPorts, "ports", "", "Replace ports")
 	cmdPatchManifest.Flags.StringVar(&patchIsolators, "isolators", "", "Replace isolators")
@@ -161,7 +164,14 @@ func patchManifest(im *schema.ImageManifest) error {
 		app.Exec = strings.Split(patchExec, " ")
 	}
 
-	if patchUser != "" || patchGroup != "" || patchSupplementaryGIDs != "" || patchCaps != "" || patchMounts != "" || patchPorts != "" || patchIsolators != "" {
+	if patchUser != "" ||
+		patchGroup != "" ||
+		patchSupplementaryGIDs != "" ||
+		patchCaps != "" ||
+		patchRevokeCaps != "" ||
+		patchMounts != "" ||
+		patchPorts != "" ||
+		patchIsolators != "" {
 		// ...but if we still don't have an app and the user is trying
 		// to patch one of its other parameters, it's an error
 		if app == nil {
@@ -192,7 +202,7 @@ func patchManifest(im *schema.ImageManifest) error {
 	if patchCaps != "" {
 		isolator := app.Isolators.GetByName(types.LinuxCapabilitiesRetainSetName)
 		if isolator != nil {
-			return fmt.Errorf("isolator already exists")
+			return fmt.Errorf("isolator already exists (os/linux/capabilities-retain-set)")
 		}
 
 		// Instantiate a Isolator with the content specified by the --capability
@@ -203,6 +213,20 @@ func patchManifest(im *schema.ImageManifest) error {
 		}
 		app.Isolators = append(app.Isolators, caps.AsIsolator())
 	}
+	if patchRevokeCaps != "" {
+		isolator := app.Isolators.GetByName(types.LinuxCapabilitiesRevokeSetName)
+		if isolator != nil {
+			return fmt.Errorf("isolator already exists (os/linux/capabilities-remove-set)")
+		}
+
+		// Instantiate a Isolator with the content specified by the --revoke-capability
+		// parameter.
+		caps, err := types.NewLinuxCapabilitiesRevokeSet(strings.Split(patchRevokeCaps, ",")...)
+		if err != nil {
+			return fmt.Errorf("cannot parse capability %q: %v", patchRevokeCaps, err)
+		}
+		app.Isolators = append(app.Isolators, caps.AsIsolator())
+	}
 
 	if patchMounts != "" {
 		mounts := strings.Split(patchMounts, ":")
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go
index 39931d215c..b2dc659541 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go
@@ -37,15 +37,17 @@ type ACIEndpoint struct {
 	ASC string
 }
 
-type Endpoints struct {
+// A struct containing both discovered endpoints and keys. Used to avoid
+// function duplication (one for endpoints and one for keys, so to avoid two
+// doDiscover, two DiscoverWalkFunc)
+type discoveryData struct {
 	ACIEndpoints []ACIEndpoint
-	Keys         []string
+	PublicKeys   []string
 }
 
-func (e *Endpoints) Append(ep Endpoints) {
-	e.ACIEndpoints = append(e.ACIEndpoints, ep.ACIEndpoints...)
-	e.Keys = append(e.Keys, ep.Keys...)
-}
+type ACIEndpoints []ACIEndpoint
+
+type PublicKeys []string
 
 const (
 	defaultVersion = "latest"
@@ -124,7 +126,7 @@ func createTemplateVars(app App) []string {
 	return tplVars
 }
 
-func doDiscover(pre string, hostHeaders map[string]http.Header, app App, insecure InsecureOption) (*Endpoints, error) {
+func doDiscover(pre string, hostHeaders map[string]http.Header, app App, insecure InsecureOption) (*discoveryData, error) {
 	app = *app.Copy()
 	if app.Labels["version"] == "" {
 		app.Labels["version"] = defaultVersion
@@ -140,7 +142,7 @@ func doDiscover(pre string, hostHeaders map[string]http.Header, app App, insecur
 
 	tplVars := createTemplateVars(app)
 
-	de := &Endpoints{}
+	dd := &discoveryData{}
 
 	for _, m := range meta {
 		if !strings.HasPrefix(app.Name.String(), m.prefix) {
@@ -159,41 +161,37 @@ func doDiscover(pre string, hostHeaders map[string]http.Header, app App, insecur
 			if !ok {
 				continue
 			}
-			de.ACIEndpoints = append(de.ACIEndpoints, ACIEndpoint{ACI: aci, ASC: asc})
+			dd.ACIEndpoints = append(dd.ACIEndpoints, ACIEndpoint{ACI: aci, ASC: asc})
 
 		case "ac-discovery-pubkeys":
-			de.Keys = append(de.Keys, m.uri)
+			dd.PublicKeys = append(dd.PublicKeys, m.uri)
 		}
 	}
 
-	return de, nil
+	return dd, nil
 }
 
 // DiscoverWalk will make HTTPS requests to find discovery meta tags and
 // optionally will use HTTP if insecure is set. hostHeaders specifies the
 // header to apply depending on the host (e.g. authentication). Based on the
 // response of the discoverFn it will continue to recurse up the tree.
-func DiscoverWalk(app App, hostHeaders map[string]http.Header, insecure InsecureOption, discoverFn DiscoverWalkFunc) (err error) {
-	var (
-		eps *Endpoints
-	)
-
+func DiscoverWalk(app App, hostHeaders map[string]http.Header, insecure InsecureOption, discoverFn DiscoverWalkFunc) (dd *discoveryData, err error) {
 	parts := strings.Split(string(app.Name), "/")
 	for i := range parts {
 		end := len(parts) - i
 		pre := strings.Join(parts[:end], "/")
 
-		eps, err = doDiscover(pre, hostHeaders, app, insecure)
-		if derr := discoverFn(pre, eps, err); derr != nil {
-			return derr
+		dd, err = doDiscover(pre, hostHeaders, app, insecure)
+		if derr := discoverFn(pre, dd, err); derr != nil {
+			return dd, derr
 		}
 	}
 
-	return
+	return nil, fmt.Errorf("discovery failed")
 }
 
 // DiscoverWalkFunc can stop a DiscoverWalk by returning non-nil error.
-type DiscoverWalkFunc func(prefix string, eps *Endpoints, err error) error
+type DiscoverWalkFunc func(prefix string, dd *discoveryData, err error) error
 
 // FailedAttempt represents a failed discovery attempt. This is for debugging
 // and user feedback.
@@ -202,59 +200,58 @@ type FailedAttempt struct {
 	Error  error
 }
 
-func walker(out *Endpoints, attempts *[]FailedAttempt, testFn DiscoverWalkFunc) DiscoverWalkFunc {
-	return func(pre string, eps *Endpoints, err error) error {
+func walker(attempts *[]FailedAttempt, testFn DiscoverWalkFunc) DiscoverWalkFunc {
+	return func(pre string, dd *discoveryData, err error) error {
 		if err != nil {
 			*attempts = append(*attempts, FailedAttempt{pre, err})
 			return nil
 		}
-		out.Append(*eps)
-		if err := testFn(pre, eps, err); err != nil {
+		if err := testFn(pre, dd, err); err != nil {
 			return err
 		}
 		return nil
 	}
 }
 
-// DiscoverEndpoints will make HTTPS requests to find the ac-discovery meta
+// DiscoverACIEndpoints will make HTTPS requests to find the ac-discovery meta
 // tags and optionally will use HTTP if insecure is set. hostHeaders
 // specifies the header to apply depending on the host (e.g. authentication).
 // It will not give up until it has exhausted the path or found an image
 // discovery.
-func DiscoverEndpoints(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (out *Endpoints, attempts []FailedAttempt, err error) {
-	out = &Endpoints{}
-	testFn := func(pre string, eps *Endpoints, err error) error {
-		if len(out.ACIEndpoints) != 0 {
+func DiscoverACIEndpoints(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (ACIEndpoints, []FailedAttempt, error) {
+	testFn := func(pre string, dd *discoveryData, err error) error {
+		if len(dd.ACIEndpoints) != 0 {
 			return errEnough
 		}
 		return nil
 	}
 
-	err = DiscoverWalk(app, hostHeaders, insecure, walker(out, &attempts, testFn))
+	attempts := []FailedAttempt{}
+	dd, err := DiscoverWalk(app, hostHeaders, insecure, walker(&attempts, testFn))
 	if err != nil && err != errEnough {
 		return nil, attempts, err
 	}
 
-	return out, attempts, nil
+	return dd.ACIEndpoints, attempts, nil
 }
 
 // DiscoverPublicKey will make HTTPS requests to find the ac-public-keys meta
 // tags and optionally will use HTTP if insecure is set. hostHeaders
 // specifies the header to apply depending on the host (e.g. authentication).
 // It will not give up until it has exhausted the path or found an public key.
-func DiscoverPublicKeys(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (out *Endpoints, attempts []FailedAttempt, err error) {
-	out = &Endpoints{}
-	testFn := func(pre string, eps *Endpoints, err error) error {
-		if len(out.Keys) != 0 {
+func DiscoverPublicKeys(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (PublicKeys, []FailedAttempt, error) {
+	testFn := func(pre string, dd *discoveryData, err error) error {
+		if len(dd.PublicKeys) != 0 {
 			return errEnough
 		}
 		return nil
 	}
 
-	err = DiscoverWalk(app, hostHeaders, insecure, walker(out, &attempts, testFn))
+	attempts := []FailedAttempt{}
+	dd, err := DiscoverWalk(app, hostHeaders, insecure, walker(&attempts, testFn))
 	if err != nil && err != errEnough {
 		return nil, attempts, err
 	}
 
-	return out, attempts, nil
+	return dd.PublicKeys, attempts, nil
 }
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/http.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/http.go
index a00d535c15..430bcc61cf 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/http.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/discovery/http.go
@@ -33,19 +33,19 @@ const (
 const (
 	InsecureNone InsecureOption = 0
 
-	InsecureTls InsecureOption = 1 << iota
-	InsecureHttp
+	InsecureTLS InsecureOption = 1 << iota
+	InsecureHTTP
 )
 
 var (
 	// Client is the default http.Client used for discovery requests.
 	Client            *http.Client
-	ClientInsecureTls *http.Client
+	ClientInsecureTLS *http.Client
 
 	// httpDo is the internal object used by discovery to retrieve URLs; it is
 	// defined here so it can be overridden for testing
 	httpDo            httpDoer
-	httpDoInsecureTls httpDoer
+	httpDoInsecureTLS httpDoer
 )
 
 // httpDoer is an interface used to wrap http.Client for real requests and
@@ -66,13 +66,13 @@ func init() {
 	}
 	httpDo = Client
 
-	// copy for InsecureTls
-	tInsecureTls := *t
-	tInsecureTls.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
-	ClientInsecureTls = &http.Client{
-		Transport: &tInsecureTls,
+	// copy for InsecureTLS
+	tInsecureTLS := *t
+	tInsecureTLS.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+	ClientInsecureTLS = &http.Client{
+		Transport: &tInsecureTLS,
 	}
-	httpDoInsecureTls = ClientInsecureTls
+	httpDoInsecureTLS = ClientInsecureTLS
 }
 
 func httpsOrHTTP(name string, hostHeaders map[string]http.Header, insecure InsecureOption) (urlStr string, body io.ReadCloser, err error) {
@@ -90,8 +90,8 @@ func httpsOrHTTP(name string, hostHeaders map[string]http.Header, insecure Insec
 		if hostHeader, ok := hostHeaders[u.Host]; ok {
 			req.Header = hostHeader
 		}
-		if insecure&InsecureTls != 0 {
-			res, err = httpDoInsecureTls.Do(req)
+		if insecure&InsecureTLS != 0 {
+			res, err = httpDoInsecureTLS.Do(req)
 			return
 		}
 		res, err = httpDo.Do(req)
@@ -104,7 +104,7 @@ func httpsOrHTTP(name string, hostHeaders map[string]http.Header, insecure Insec
 	}
 	urlStr, res, err := fetch("https")
 	if err != nil || res.StatusCode != http.StatusOK {
-		if insecure&InsecureHttp != 0 {
+		if insecure&InsecureHTTP != 0 {
 			closeBody(res)
 			urlStr, res, err = fetch("http")
 		}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/myapp.html b/Godeps/_workspace/src/github.com/appc/spec/discovery/myapp.html
deleted file mode 100644
index 10c80eb64b..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/myapp.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-	<title>My app</title>
-	<meta name="ac-discovery" content="example.com https://storage.example.com/{name}-{version}.{ext}?torrent">
-	<meta name="ac-discovery" content="example.com hdfs://storage.example.com/{name}-{version}.{ext}">
-	<meta name="ac-discovery-cas-prefix" content="example.com https://storage.example.com/cas/">
-	<meta name="ac-discovery-pubkeys" content="example.com https://example.com/pubkeys.gpg">
-</head>
-
-<body>
-	<h1>My App</h1>
-</body>
-</html>
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/myapp2.html b/Godeps/_workspace/src/github.com/appc/spec/discovery/myapp2.html
deleted file mode 100644
index 270b4c670e..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/myapp2.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-	<title>My app</title>
-	<meta name="ac-discovery" content="example.com https://storage.example.com/{name}-{version}-{os}-{arch}.{ext}">
-	<meta name="ac-discovery" content="example.com https://storage.example.com/{name}-{version}.{ext}">
-	<meta name="ac-discovery-cas-prefix" content="example.com https://storage.example.com/cas/">
-	<meta name="ac-discovery-pubkeys" content="example.com https://example.com/pubkeys.gpg">
-</head>
-
-<body>
-	<h1>My App</h1>
-</body>
-</html>
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_linux.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_linux.go
new file mode 100644
index 0000000000..4f895cd76e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_linux.go
@@ -0,0 +1,33 @@
+// Copyright 2016 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build linux
+
+package device
+
+// with glibc/sysdeps/unix/sysv/linux/sys/sysmacros.h as reference
+
+func Major(rdev uint64) uint {
+	return uint((rdev>>8)&0xfff) | (uint(rdev>>32) & ^uint(0xfff))
+}
+
+func Minor(rdev uint64) uint {
+	return uint(rdev&0xff) | uint(uint32(rdev>>12) & ^uint32(0xff))
+}
+
+func Makedev(maj uint, min uint) uint64 {
+	return uint64(min&0xff) | (uint64(maj&0xfff) << 8) |
+		((uint64(min) & ^uint64(0xff)) << 12) |
+		((uint64(maj) & ^uint64(0xfff)) << 32)
+}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_posix.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_posix.go
index a0bdd774f8..c2e1b31697 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_posix.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_posix.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build linux freebsd netbsd openbsd darwin
+// +build freebsd netbsd openbsd darwin
 
 package device
 
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/image.go b/Godeps/_workspace/src/github.com/appc/spec/schema/image.go
index 5aa536fd84..fac4c794c3 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/image.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/image.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/appc/spec/schema/types"
 
-	"github.com/camlistore/camlistore/pkg/errorutil"
+	"go4.org/errorutil"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go b/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
index 4046816efa..b8699315f0 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/appc/spec/schema/types"
 
-	"github.com/camlistore/camlistore/pkg/errorutil"
+	"go4.org/errorutil"
 )
 
 const PodManifestKind = types.ACKind("PodManifest")
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
index 01c13bc09b..04b92edb02 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.7.4"
+	version string = "0.8.0"
 )
 
 var (
diff --git a/Godeps/_workspace/src/go4.org/LICENSE b/Godeps/_workspace/src/go4.org/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/Godeps/_workspace/src/go4.org/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/errorutil/highlight.go b/Godeps/_workspace/src/go4.org/errorutil/highlight.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/errorutil/highlight.go
rename to Godeps/_workspace/src/go4.org/errorutil/highlight.go

From f899dd7b79d3b75444f04a51ba2e81b9f3f38558 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 11 May 2016 17:04:36 +0200
Subject: [PATCH 0249/1304] rkt: fix compilation with appc/spec 0.8.0

The fixes are necessary since the introduction of the following changes:
- https://github.com/appc/spec/pull/561
- https://github.com/appc/spec/pull/576
---
 rkt/image/namefetcher.go | 16 ++++++++--------
 rkt/pubkey/pubkey.go     |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 1110251935..9bdc75d757 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -61,16 +61,16 @@ func (f *nameFetcher) Hash(app *discovery.App, a *asc) (string, error) {
 	return f.fetchImageFromEndpoints(app, ep, a, latest)
 }
 
-func (f *nameFetcher) discoverApp(app *discovery.App) (*discovery.Endpoints, error) {
+func (f *nameFetcher) discoverApp(app *discovery.App) (discovery.ACIEndpoints, error) {
 	insecure := discovery.InsecureNone
 	if f.InsecureFlags.SkipTLSCheck() {
-		insecure = insecure | discovery.InsecureTls
+		insecure = insecure | discovery.InsecureTLS
 	}
 	if f.InsecureFlags.AllowHTTP() {
-		insecure = insecure | discovery.InsecureHttp
+		insecure = insecure | discovery.InsecureHTTP
 	}
 	hostHeaders := config.ResolveAuthPerHost(f.Headers)
-	ep, attempts, err := discovery.DiscoverEndpoints(*app, hostHeaders, insecure)
+	ep, attempts, err := discovery.DiscoverACIEndpoints(*app, hostHeaders, insecure)
 	if f.Debug {
 		for _, a := range attempts {
 			log.PrintE(fmt.Sprintf("meta tag 'ac-discovery' not found on %s", a.Prefix), a.Error)
@@ -79,19 +79,19 @@ func (f *nameFetcher) discoverApp(app *discovery.App) (*discovery.Endpoints, err
 	if err != nil {
 		return nil, err
 	}
-	if len(ep.ACIEndpoints) == 0 {
+	if len(ep) == 0 {
 		return nil, fmt.Errorf("no endpoints discovered")
 	}
 	return ep, nil
 }
 
-func (f *nameFetcher) fetchImageFromEndpoints(app *discovery.App, ep *discovery.Endpoints, a *asc, latest bool) (string, error) {
+func (f *nameFetcher) fetchImageFromEndpoints(app *discovery.App, ep discovery.ACIEndpoints, a *asc, latest bool) (string, error) {
 	ensureLogger(f.Debug)
 	// TODO(krnowak): we should probably try all the endpoints,
 	// for this we need to clone "a" and call
 	// maybeOverrideAscFetcherWithRemote on the clone
-	aciURL := ep.ACIEndpoints[0].ACI
-	ascURL := ep.ACIEndpoints[0].ASC
+	aciURL := ep[0].ACI
+	ascURL := ep[0].ASC
 	log.Printf("remote fetching from URL %q", aciURL)
 	f.maybeOverrideAscFetcherWithRemote(ascURL, a)
 	return f.fetchImageFromSingleEndpoint(app, aciURL, a, latest)
diff --git a/rkt/pubkey/pubkey.go b/rkt/pubkey/pubkey.go
index 5d879c86e5..41d604fc72 100644
--- a/rkt/pubkey/pubkey.go
+++ b/rkt/pubkey/pubkey.go
@@ -157,12 +157,12 @@ func (m *Manager) metaDiscoverPubKeyLocations(prefix string) ([]string, error) {
 	hostHeaders := config.ResolveAuthPerHost(m.AuthPerHost)
 	insecure := discovery.InsecureNone
 	if m.InsecureAllowHTTP {
-		insecure = insecure | discovery.InsecureHttp
+		insecure = insecure | discovery.InsecureHTTP
 	}
 	if m.InsecureSkipTLSCheck {
-		insecure = insecure | discovery.InsecureTls
+		insecure = insecure | discovery.InsecureTLS
 	}
-	ep, attempts, err := discovery.DiscoverPublicKeys(*app, hostHeaders, insecure)
+	keys, attempts, err := discovery.DiscoverPublicKeys(*app, hostHeaders, insecure)
 	if err != nil {
 		return nil, err
 	}
@@ -173,7 +173,7 @@ func (m *Manager) metaDiscoverPubKeyLocations(prefix string) ([]string, error) {
 		}
 	}
 
-	return ep.Keys, nil
+	return keys, nil
 }
 
 // getPubKey retrieves a public key (if remote), and verifies it's a gpg key

From f804c9be6451b4e8a7cffa5d287725dff6823b3b Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 12 May 2016 00:06:56 +0200
Subject: [PATCH 0250/1304] tests: ACE: fix compilation with appc/spec 0.8.0

The fixes are necessary since the introduction of the following changes:
- https://github.com/appc/spec/pull/569
---
 tests/functional.mk | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/functional.mk b/tests/functional.mk
index a866e2c5fc..73cb535c0e 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -10,11 +10,11 @@ FTST_IMAGE_MANIFEST := $(FTST_IMAGE_DIR)/manifest
 FTST_IMAGE_TEST_DIRS := $(FTST_IMAGE_ROOTFSDIR)/dir1 $(FTST_IMAGE_ROOTFSDIR)/dir2 $(FTST_IMAGE_ROOTFSDIR)/bin $(FTST_IMAGE_ROOTFSDIR)/etc
 FTST_ACE_MAIN_IMAGE_DIR := $(FTST_TMPDIR)/ace-main
 FTST_ACE_MAIN_IMAGE := $(FTST_TMPDIR)/rkt-ace-validator-main.aci
-FTST_ACE_MAIN_IMAGE_MANIFEST_SRC := Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json
+FTST_ACE_MAIN_IMAGE_MANIFEST_SRC := Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
 FTST_ACE_MAIN_IMAGE_MANIFEST := $(FTST_ACE_MAIN_IMAGE_DIR)/manifest
 FTST_ACE_SIDEKICK_IMAGE_DIR := $(FTST_TMPDIR)/ace-sidekick
 FTST_ACE_SIDEKICK_IMAGE := $(FTST_TMPDIR)/rkt-ace-validator-sidekick.aci
-FTST_ACE_SIDEKICK_IMAGE_MANIFEST_SRC := Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json
+FTST_ACE_SIDEKICK_IMAGE_MANIFEST_SRC := Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
 FTST_ACE_SIDEKICK_IMAGE_MANIFEST := $(FTST_ACE_SIDEKICK_IMAGE_DIR)/manifest
 FTST_INSPECT_BINARY := $(FTST_TMPDIR)/inspect
 FTST_ACI_INSPECT := $(FTST_IMAGE_ROOTFSDIR)/inspect
@@ -39,8 +39,6 @@ INSTALL_FILES += \
 	$(FTST_IMAGE_MANIFEST_SRC):$(FTST_IMAGE_MANIFEST):- \
 	$(FTST_INSPECT_BINARY):$(FTST_ACI_INSPECT):- \
 	$(FTST_EMPTY_IMAGE_MANIFEST_SRC):$(FTST_EMPTY_IMAGE_MANIFEST):- \
-	$(FTST_ACE_MAIN_IMAGE_MANIFEST_SRC):$(FTST_ACE_MAIN_IMAGE_MANIFEST):- \
-	$(FTST_ACE_SIDEKICK_IMAGE_MANIFEST_SRC):$(FTST_ACE_SIDEKICK_IMAGE_MANIFEST):- \
 	$(FTST_ECHO_SERVER_BINARY):$(FTST_ACI_ECHO_SERVER):-
 CREATE_DIRS += \
 	$(FTST_IMAGE_DIR) \
@@ -145,8 +143,16 @@ include makelib/build_go_bin.mk
 # 1 - image
 # 2 - aci directory
 # 3 - ace validator
+# 4 - manifest.json.in
 define FTST_GENERATE_ACE_IMAGE
 
+$$(call forward-vars,$2/manifest,ABS_GO)
+$2/manifest: $4 | $2
+	$$(VQ) \
+	$$(call vb,v2,GEN,$$(call vsp,$$@)) \
+	GOARCH="$$$$($$(ABS_GO) env GOARCH)"; \
+	sed -e "s/@GOOS@/linux/" -e "s/@GOARCH@/$$$$GOARCH/" <$$< >$$@
+
 $$(call forward-vars,$1,ACTOOL)
 $1: $2/manifest $2/rootfs/ace-validator | $2/rootfs/opt/acvalidator
 	$$(VQ) \
@@ -155,10 +161,10 @@ $1: $2/manifest $2/rootfs/ace-validator | $2/rootfs/opt/acvalidator
 
 CREATE_DIRS += $2 $$(call dir-chain,$2,rootfs/opt/acvalidator)
 INSTALL_FILES += $3:$2/rootfs/ace-validator:-
-CLEAN_FILES += $1
+CLEAN_FILES += $1 $2/manifest
 endef
 
-$(eval $(call FTST_GENERATE_ACE_IMAGE,$(FTST_ACE_MAIN_IMAGE),$(FTST_ACE_MAIN_IMAGE_DIR),$(FTST_ACE_BINARY)))
-$(eval $(call FTST_GENERATE_ACE_IMAGE,$(FTST_ACE_SIDEKICK_IMAGE),$(FTST_ACE_SIDEKICK_IMAGE_DIR),$(FTST_ACE_BINARY)))
+$(eval $(call FTST_GENERATE_ACE_IMAGE,$(FTST_ACE_MAIN_IMAGE),$(FTST_ACE_MAIN_IMAGE_DIR),$(FTST_ACE_BINARY),$(FTST_ACE_MAIN_IMAGE_MANIFEST_SRC)))
+$(eval $(call FTST_GENERATE_ACE_IMAGE,$(FTST_ACE_SIDEKICK_IMAGE),$(FTST_ACE_SIDEKICK_IMAGE_DIR),$(FTST_ACE_BINARY),$(FTST_ACE_SIDEKICK_IMAGE_MANIFEST_SRC)))
 
 $(call undefine-namespaces,FTST)

From 92f06816551068bcfb755d7b18aa8381611f73e5 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 12 May 2016 12:04:48 +0200
Subject: [PATCH 0251/1304] metadata-service: ACE: fix compilation with
 appc/spec 0.8.0

The fixes are necessary since the introduction of the following changes:
- https://github.com/appc/spec/pull/451
---
 rkt/metadata_service.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rkt/metadata_service.go b/rkt/metadata_service.go
index f0fc05e9a6..4855c42906 100644
--- a/rkt/metadata_service.go
+++ b/rkt/metadata_service.go
@@ -309,7 +309,7 @@ func appGet(h func(http.ResponseWriter, *http.Request, *schema.PodManifest, *sch
 func handlePodAnnotations(w http.ResponseWriter, r *http.Request, pm *schema.PodManifest) {
 	defer r.Body.Close()
 
-	w.Header().Add("Content-Type", "text/plain")
+	w.Header().Add("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 
 	for k := range pm.Annotations {
@@ -335,7 +335,7 @@ func handlePodAnnotation(w http.ResponseWriter, r *http.Request, pm *schema.PodM
 		return
 	}
 
-	w.Header().Add("Content-Type", "text/plain")
+	w.Header().Add("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 	w.Write([]byte(v))
 }
@@ -363,7 +363,7 @@ func handlePodUUID(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	w.Header().Add("Content-Type", "text/plain")
+	w.Header().Add("Content-Type", "text/plain; charset=us-ascii")
 	w.WriteHeader(http.StatusOK)
 	w.Write([]byte(uuid.String()))
 }
@@ -395,7 +395,7 @@ func handleAppAnnotations(w http.ResponseWriter, r *http.Request, pm *schema.Pod
 		return
 	}
 
-	w.Header().Add("Content-Type", "text/plain")
+	w.Header().Add("Content-Type", "text/plain; charset=us-ascii")
 	w.WriteHeader(http.StatusOK)
 
 	for _, annot := range mergeAppAnnotations(im, pm, an) {
@@ -431,7 +431,7 @@ func handleAppAnnotation(w http.ResponseWriter, r *http.Request, pm *schema.PodM
 		return
 	}
 
-	w.Header().Add("Content-Type", "text/plain")
+	w.Header().Add("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 	w.Write([]byte(v))
 }
@@ -458,7 +458,7 @@ func handleAppID(w http.ResponseWriter, r *http.Request, pm *schema.PodManifest,
 		return
 	}
 
-	w.Header().Add("Content-Type", "text/plain")
+	w.Header().Add("Content-Type", "text/plain; charset=us-ascii")
 	w.WriteHeader(http.StatusOK)
 	app := pm.Apps.Get(*an)
 	if app == nil {
@@ -501,7 +501,7 @@ func handlePodSign(w http.ResponseWriter, r *http.Request) {
 	h.Write([]byte(content))
 
 	// Send back HMAC as the signature
-	w.Header().Add("Content-Type", "text/plain")
+	w.Header().Add("Content-Type", "text/plain; charset=us-ascii")
 	w.WriteHeader(http.StatusOK)
 	enc := base64.NewEncoder(base64.StdEncoding, w)
 	enc.Write(h.Sum(nil))

From dcbdfbf7f609f967915f14358284bbd3660c09f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 12 May 2016 14:35:27 +0200
Subject: [PATCH 0252/1304] functional tests: ignore ACE validator test

After https://github.com/appc/spec/pull/451, the spec changed regarding
the metadata service.

Since its use is not widespread, let's disable the test for now and fix
it later.
---
 tests/rkt_ace_validator_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_ace_validator_test.go b/tests/rkt_ace_validator_test.go
index fc8a514d10..820b396679 100644
--- a/tests/rkt_ace_validator_test.go
+++ b/tests/rkt_ace_validator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build host coreos src
+// +build ignore
 
 package main
 

From 2f6911d8220508a33ed258d2563216c9267cd6ca Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 6 May 2016 14:53:45 +0200
Subject: [PATCH 0253/1304] stage1: capabilities: implement both remain set and
 remove set

---
 stage1/init/common/pod.go | 112 +++++++++++++++++++++++++++-----------
 1 file changed, 80 insertions(+), 32 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 8f64b5cd3f..a525009a16 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -57,25 +57,6 @@ var (
 		"LOGNAME": "root",
 		"HOME":    "/root",
 	}
-
-	// appDefaultCapabilities defines a restricted set of capabilities given to
-	// apps by default.
-	// See https://github.com/appc/spec/issues/598
-	appDefaultCapabilities, _ = types.NewLinuxCapabilitiesRetainSet(
-		"CAP_AUDIT_WRITE",
-		"CAP_CHOWN",
-		"CAP_DAC_OVERRIDE",
-		"CAP_FSETID",
-		"CAP_FOWNER",
-		"CAP_KILL",
-		"CAP_MKNOD",
-		"CAP_NET_RAW",
-		"CAP_NET_BIND_SERVICE",
-		"CAP_SETUID",
-		"CAP_SETGID",
-		"CAP_SETPCAP",
-		"CAP_SETFCAP",
-		"CAP_SYS_CHROOT")
 )
 
 // execEscape uses Golang's string quoting for ", \, \n, and regex for special cases
@@ -443,10 +424,10 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		supplementaryGroups = append(supplementaryGroups, strconv.Itoa(g))
 	}
 
-	// TODO: read the RemoveSet as well. See
-	// https://github.com/coreos/rkt/issues/2348#issuecomment-211796840
-	capabilities := append(app.Isolators, appDefaultCapabilities.AsIsolator())
-	capabilitiesStr := GetAppCapabilities(capabilities)
+	capabilitiesStr, err := getAppCapabilities(app.Isolators)
+	if err != nil {
+		return err
+	}
 
 	execStart := append([]string{binPath}, app.Exec[1:]...)
 	execStartString := quoteExec(execStart)
@@ -853,7 +834,11 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 		args = append(args, strings.Join(opt, ""))
 	}
 
-	capList := strings.Join(GetAppCapabilities(app.Isolators), ",")
+	capabilitiesStr, err := getAppCapabilities(app.Isolators)
+	if err != nil {
+		return nil, err
+	}
+	capList := strings.Join(capabilitiesStr, ",")
 	args = append(args, "--capability="+capList)
 
 	return args, nil
@@ -941,18 +926,81 @@ func GetMachineID(p *stage1commontypes.Pod) string {
 	return "rkt-" + p.UUID.String()
 }
 
-// GetAppCapabilities is a filter which returns a string slice of valid Linux capabilities
-// It requires list of available isolators
-func GetAppCapabilities(isolators types.Isolators) []string {
-	var caps []string
+// getAppCapabilities computes the set of Linux capabilities that an app
+// should have based on its isolators. Only the following capabalities matter:
+// - os/linux/capabilities-retain-set
+// - os/linux/capabilities-remove-set
+//
+// The resulting capabilities are generated following the rules from the spec:
+// See: https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators
+func getAppCapabilities(isolators types.Isolators) ([]string, error) {
+	var capsToRetain []string
+	var capsToRemove []string
+
+	// Default caps defined in
+	// https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators
+	appDefaultCapabilities := []string{
+		"CAP_AUDIT_WRITE",
+		"CAP_CHOWN",
+		"CAP_DAC_OVERRIDE",
+		"CAP_FSETID",
+		"CAP_FOWNER",
+		"CAP_KILL",
+		"CAP_MKNOD",
+		"CAP_NET_RAW",
+		"CAP_NET_BIND_SERVICE",
+		"CAP_SETUID",
+		"CAP_SETGID",
+		"CAP_SETPCAP",
+		"CAP_SETFCAP",
+		"CAP_SYS_CHROOT",
+	}
 
+	// Iterate over the isolators defined in
+	// https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators
+	// Only read the capababilities isolators:
+	// - os/linux/capabilities-retain-set
+	// - os/linux/capabilities-remove-set
 	for _, isolator := range isolators {
-		if capSet, ok := isolator.Value().(types.LinuxCapabilitiesSet); ok &&
-			isolator.Name == types.LinuxCapabilitiesRetainSetName {
-			caps = append(caps, parseLinuxCapabilitiesSet(capSet)...)
+		if capSet, ok := isolator.Value().(types.LinuxCapabilitiesSet); ok {
+			switch isolator.Name {
+			case types.LinuxCapabilitiesRetainSetName:
+				capsToRetain = append(capsToRetain, parseLinuxCapabilitiesSet(capSet)...)
+			case types.LinuxCapabilitiesRevokeSetName:
+				capsToRemove = append(capsToRemove, parseLinuxCapabilitiesSet(capSet)...)
+			}
+		}
+	}
+
+	// appc/spec does not allow to have both the retain set and the remove
+	// set defined.
+	if len(capsToRetain) > 0 && len(capsToRemove) > 0 {
+		return nil, errors.New("cannot have both os/linux/capabilities-retain-set and os/linux/capabilities-remove-set")
+	}
+
+	// Neither the retain set or the remove set are defined
+	if len(capsToRetain) == 0 && len(capsToRemove) == 0 {
+		return appDefaultCapabilities, nil
+	}
+
+	if len(capsToRetain) > 0 {
+		return capsToRetain, nil
+	}
+
+	if len(capsToRemove) == 0 {
+		panic("len(capsToRetain) is negative. This cannot happen.")
+	}
+
+	caps := appDefaultCapabilities
+	for _, rc := range capsToRemove {
+		// backward loop to be safe against deletion
+		for i := len(caps) - 1; i >= 0; i-- {
+			if caps[i] == rc {
+				caps = append(caps[:i], caps[i+1:]...)
+			}
 		}
 	}
-	return caps
+	return caps, nil
 }
 
 // parseLinuxCapabilitySet parses a LinuxCapabilitiesSet into string slice

From ad2fb5d702c0f24c6f5d1a46fedc76ee555fd80d Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Sat, 7 May 2016 02:09:44 +0200
Subject: [PATCH 0254/1304] tests: TestCapsSeveralApp: new test

TestCapsSeveralApp run a pod with 12 apps with various capability
definitions and test that each app is executed with the correct caps.
---
 tests/inspect/inspect.go |  14 +-
 tests/rkt_caps_test.go   | 298 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 306 insertions(+), 6 deletions(-)

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 485d53e8e1..ad76b27845 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -42,6 +42,7 @@ var (
 		CheckTty           bool
 		PrintExec          bool
 		PrintMsg           string
+		SuffixMsg          string
 		PrintEnv           string
 		PrintCapsPid       int
 		PrintUser          bool
@@ -81,6 +82,7 @@ func init() {
 	globalFlagset.BoolVar(&globalFlags.CheckTty, "check-tty", false, "Check if stdin is a terminal")
 	globalFlagset.BoolVar(&globalFlags.PrintExec, "print-exec", false, "Print the command we were execed as (i.e. argv[0])")
 	globalFlagset.StringVar(&globalFlags.PrintMsg, "print-msg", "", "Print the message given as parameter")
+	globalFlagset.StringVar(&globalFlags.SuffixMsg, "suffix-msg", "", "Print this suffix after some commands")
 	globalFlagset.StringVar(&globalFlags.CheckCwd, "check-cwd", "", "Check if the current working directory is the one specified")
 	globalFlagset.StringVar(&globalFlags.PrintEnv, "print-env", "", "Print the specified environment variable")
 	globalFlagset.IntVar(&globalFlags.PrintCapsPid, "print-caps-pid", -1, "Print capabilities of the specified pid (or current process if pid=0)")
@@ -188,10 +190,10 @@ func main() {
 			fmt.Fprintf(os.Stderr, "Cannot get caps: %v\n", err)
 			os.Exit(1)
 		}
-		fmt.Printf("Capability set: effective: %s\n", caps.StringCap(capability.EFFECTIVE))
-		fmt.Printf("Capability set: permitted: %s\n", caps.StringCap(capability.PERMITTED))
-		fmt.Printf("Capability set: inheritable: %s\n", caps.StringCap(capability.INHERITABLE))
-		fmt.Printf("Capability set: bounding: %s\n", caps.StringCap(capability.BOUNDING))
+		fmt.Printf("Capability set: effective: %s (%s)\n", caps.StringCap(capability.EFFECTIVE), globalFlags.SuffixMsg)
+		fmt.Printf("Capability set: permitted: %s (%s)\n", caps.StringCap(capability.PERMITTED), globalFlags.SuffixMsg)
+		fmt.Printf("Capability set: inheritable: %s (%s)\n", caps.StringCap(capability.INHERITABLE), globalFlags.SuffixMsg)
+		fmt.Printf("Capability set: bounding: %s (%s)\n", caps.StringCap(capability.BOUNDING), globalFlags.SuffixMsg)
 
 		if capStr := os.Getenv("CAPABILITY"); capStr != "" {
 			capInt, err := strconv.Atoi(capStr)
@@ -201,9 +203,9 @@ func main() {
 			}
 			c := capability.Cap(capInt)
 			if caps.Get(capability.BOUNDING, c) {
-				fmt.Printf("%v=enabled\n", c.String())
+				fmt.Printf("%v=enabled (%s)\n", c.String(), globalFlags.SuffixMsg)
 			} else {
-				fmt.Printf("%v=disabled\n", c.String())
+				fmt.Printf("%v=disabled (%s)\n", c.String(), globalFlags.SuffixMsg)
 			}
 		}
 	}
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index c9fb94be0f..d8fce6b1e0 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -19,12 +19,310 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 	"testing"
 
 	"github.com/coreos/rkt/tests/testutils"
 	"github.com/syndtr/gocapability/capability"
 )
 
+func TestCapsSeveralApp(t *testing.T) {
+	// All the following images are launched together in the same pod
+	var appCapsTests = []struct {
+		// constants
+		testName     string // name of the image
+		capRemainSet string // if != "x", value passed to actool patch-manifest --capability=
+		capRemoveSet string // if != "x", value passed to actool patch-manifest --revoke-capability=
+		expected     string // caps bounding set as printed by gocapability
+
+		// set during the test
+		imageFile string
+	}{
+		// Testing without isolators
+		{
+			testName:     "image-none",
+			capRemainSet: "x",
+			capRemoveSet: "x",
+			expected: strings.Join([]string{
+				"chown",
+				"dac_override",
+				"fowner",
+				"fsetid",
+				"kill",
+				"setgid",
+				"setuid",
+				"setpcap",
+				"net_bind_service",
+				"net_raw",
+				"sys_chroot",
+				"mknod",
+				"audit_write",
+				"setfcap",
+			}, ", "),
+		},
+		// Testing remain set
+		{
+			testName:     "image-only-one-cap",
+			capRemainSet: "CAP_NET_ADMIN",
+			capRemoveSet: "x",
+			expected:     "net_admin",
+		},
+		{
+			testName:     "image-only-one-cap-from-default",
+			capRemainSet: "CAP_CHOWN",
+			capRemoveSet: "x",
+			expected:     "chown",
+		},
+		{
+			testName: "image-some-caps",
+			capRemainSet: strings.Join([]string{
+				"CAP_CHOWN",
+				"CAP_FOWNER",
+				"CAP_SYS_ADMIN",
+				"CAP_NET_ADMIN",
+			}, ","),
+			capRemoveSet: "x",
+			expected: strings.Join([]string{
+				"chown",
+				"fowner",
+				"net_admin",
+				"sys_admin",
+			}, ", "),
+		},
+		{
+			testName: "image-caps-from-nspawn-default",
+			capRemainSet: strings.Join([]string{
+				"CAP_CHOWN",
+				"CAP_DAC_OVERRIDE",
+				"CAP_DAC_READ_SEARCH",
+				"CAP_FOWNER",
+				"CAP_FSETID",
+				"CAP_IPC_OWNER",
+				"CAP_KILL",
+				"CAP_LEASE",
+				"CAP_LINUX_IMMUTABLE",
+				"CAP_NET_BIND_SERVICE",
+				"CAP_NET_BROADCAST",
+				"CAP_NET_RAW",
+				"CAP_SETGID",
+				"CAP_SETFCAP",
+				"CAP_SETPCAP",
+				"CAP_SETUID",
+				"CAP_SYS_ADMIN",
+				"CAP_SYS_CHROOT",
+				"CAP_SYS_NICE",
+				"CAP_SYS_PTRACE",
+				"CAP_SYS_TTY_CONFIG",
+				"CAP_SYS_RESOURCE",
+				"CAP_SYS_BOOT",
+				"CAP_AUDIT_WRITE",
+				"CAP_AUDIT_CONTROL",
+			}, ","),
+			capRemoveSet: "x",
+			expected: strings.Join([]string{
+				"chown",
+				"dac_override",
+				"dac_read_search",
+				"fowner",
+				"fsetid",
+				"kill",
+				"setgid",
+				"setuid",
+				"setpcap",
+				"linux_immutable",
+				"net_bind_service",
+				"net_broadcast",
+				"net_raw",
+				"ipc_owner",
+				"sys_chroot",
+				"sys_ptrace",
+				"sys_admin",
+				"sys_boot",
+				"sys_nice",
+				"sys_resource",
+				"sys_tty_config",
+				"lease",
+				"audit_write",
+				"audit_control",
+				"setfcap",
+			}, ", "),
+		},
+		// Testing revoke set
+		{
+			testName:     "image-revoke-one-from-default",
+			capRemainSet: "x",
+			capRemoveSet: "CAP_CHOWN",
+			expected: strings.Join([]string{
+				"dac_override, fowner, fsetid, kill, setgid, setuid, setpcap, net_bind_service, net_raw, sys_chroot, mknod, audit_write, setfcap",
+			}, ", "),
+		},
+		{
+			testName:     "image-revoke-one-already-revoked",
+			capRemainSet: "x",
+			capRemoveSet: "CAP_SYS_ADMIN",
+			expected: strings.Join([]string{
+				"chown",
+				"dac_override",
+				"fowner",
+				"fsetid",
+				"kill",
+				"setgid",
+				"setuid",
+				"setpcap",
+				"net_bind_service",
+				"net_raw",
+				"sys_chroot",
+				"mknod",
+				"audit_write",
+				"setfcap",
+			}, ", "),
+		},
+		{
+			testName:     "image-revoke-two",
+			capRemainSet: "x",
+			capRemoveSet: "CAP_CHOWN,CAP_SYS_ADMIN",
+			expected: strings.Join([]string{
+				"dac_override",
+				"fowner",
+				"fsetid",
+				"kill",
+				"setgid",
+				"setuid",
+				"setpcap",
+				"net_bind_service",
+				"net_raw",
+				"sys_chroot",
+				"mknod",
+				"audit_write",
+				"setfcap",
+			}, ", "),
+		},
+		{
+			testName:     "image-revoke-all",
+			capRemainSet: "x",
+			capRemoveSet: strings.Join([]string{
+				"CAP_AUDIT_WRITE",
+				"CAP_CHOWN",
+				"CAP_DAC_OVERRIDE",
+				"CAP_FSETID",
+				"CAP_FOWNER",
+				"CAP_KILL",
+				"CAP_MKNOD",
+				"CAP_NET_RAW",
+				"CAP_NET_BIND_SERVICE",
+				"CAP_SETUID",
+				"CAP_SETGID",
+				"CAP_SETPCAP",
+				"CAP_SETFCAP",
+				"CAP_SYS_CHROOT",
+			}, ","),
+			expected: "",
+		},
+		{
+			testName:     "image-revoke-all-but-one",
+			capRemainSet: "x",
+			capRemoveSet: strings.Join([]string{
+				"CAP_AUDIT_WRITE",
+				"CAP_CHOWN",
+				"CAP_DAC_OVERRIDE",
+				"CAP_FSETID",
+				"CAP_FOWNER",
+				"CAP_KILL",
+				"CAP_MKNOD",
+				"CAP_NET_RAW",
+				"CAP_NET_BIND_SERVICE",
+				"CAP_SETUID",
+				"CAP_SETGID",
+				"CAP_SETPCAP",
+				"CAP_SETFCAP",
+			}, ","),
+			expected: "sys_chroot",
+		},
+		{
+			testName:     "image-revoke-all-plus-one",
+			capRemainSet: "x",
+			capRemoveSet: strings.Join([]string{
+				"CAP_AUDIT_WRITE",
+				"CAP_CHOWN",
+				"CAP_DAC_OVERRIDE",
+				"CAP_FSETID",
+				"CAP_FOWNER",
+				"CAP_KILL",
+				"CAP_MKNOD",
+				"CAP_NET_RAW",
+				"CAP_NET_BIND_SERVICE",
+				"CAP_SETUID",
+				"CAP_SETGID",
+				"CAP_SETPCAP",
+				"CAP_SETFCAP",
+				"CAP_SYS_CHROOT",
+				"CAP_SYS_ADMIN",
+			}, ","),
+			expected: "",
+		},
+		// Testing with an empty remain set or an empty remove set
+		// TODO(alban): "actool patch-manifest" cannot generate those images for now
+		//{
+		//	testName:     "image-remain-set-empty",
+		//	capRemainSet: "",
+		//	capRemoveSet: "x",
+		//	expected:     "",
+		//},
+		//{
+		//	testName:     "image-revoke-none",
+		//	capRemainSet: "x",
+		//	capRemoveSet: "",
+		//	expected:     "TODO(alban)",
+		//},
+	}
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for i, tt := range appCapsTests {
+		patches := []string{
+			fmt.Sprintf("--name=%s", tt.testName),
+			fmt.Sprintf("--exec=/inspect --print-caps-pid=0 --suffix-msg=%s", tt.testName),
+		}
+		if tt.capRemainSet != "x" {
+			patches = append(patches, "--capability="+tt.capRemainSet)
+		}
+		if tt.capRemoveSet != "x" {
+			patches = append(patches, "--revoke-capability="+tt.capRemoveSet)
+		}
+		imageFile := patchTestACI(tt.testName+".aci", patches...)
+		defer os.Remove(imageFile)
+		appCapsTests[i].imageFile = imageFile
+		t.Logf("Built image %q", imageFile)
+	}
+
+	// Generate the rkt arguments to launch all the apps in the same pod
+	rktArgs := ""
+	for _, tt := range appCapsTests {
+		rktArgs += " " + tt.imageFile
+	}
+	cmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), rktArgs)
+
+	// Ideally, the test would run the pod only one time, but all
+	// apps' output is mixed together without ordering guarantees, so
+	// it makes it impossible to call all the expectWithOutput() in
+	// the correct order.
+	for _, tt := range appCapsTests {
+		t.Logf("Checking caps for %q", tt.testName)
+		child := spawnOrFail(t, cmd)
+
+		expected := fmt.Sprintf("Capability set: bounding: %s (%s)",
+			tt.expected, tt.testName)
+		if err := expectWithOutput(child, expected); err != nil {
+			t.Fatalf("Expected %q but not found: %v", expected, err)
+		}
+
+		waitOrFail(t, child, 0)
+
+		ctx.RunGC()
+	}
+}
+
 var capsTests = []struct {
 	testName            string
 	capIsolator         string

From 4a30cee695ba9f4cf5742a5ebedd5ad613d2ecad Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Fri, 13 May 2016 10:46:04 +0300
Subject: [PATCH 0255/1304] godep: update appc/spec to v0.8.1

---
 Godeps/Godeps.json                            | 46 +++++++++----------
 .../appc/spec/ace/image_manifest_main.json.in |  4 +-
 .../spec/ace/image_manifest_sidekick.json.in  |  4 +-
 .../src/github.com/appc/spec/schema/pod.go    | 11 +++--
 .../github.com/appc/spec/schema/version.go    |  2 +-
 5 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 62e046a18d..ea6ae03d68 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/rkt",
 	"GoVersion": "go1.5",
-	"GodepVersion": "v60",
+	"GodepVersion": "v62",
 	"Packages": [
 		"./...",
 		"github.com/appc/spec/actool",
@@ -163,58 +163,58 @@
 		},
 		{
 			"ImportPath": "github.com/appc/spec/ace",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/aci",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/actool",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/discovery",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/acirenderer",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/device",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/tarheader",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/common",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/lastditch",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/types",
-			"Comment": "v0.8.0",
-			"Rev": "09a93af33cd0691f49e2d18689af16a1432b13e4"
+			"Comment": "v0.8.1",
+			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
 		{
 			"ImportPath": "github.com/camlistore/go4/lock",
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
index 3f4f11abd5..511e2a5359 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.0",
+    "acVersion": "0.8.1",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.0" },
+        { "name": "version", "value": "0.8.1" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index a227de9000..9020e4f10d 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.0",
+    "acVersion": "0.8.1",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.0" },
+        { "name": "version", "value": "0.8.1" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go b/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
index b8699315f0..d4792ff3b4 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
@@ -152,11 +152,12 @@ func (r Mount) assertValid() error {
 
 // RuntimeApp describes an application referenced in a PodManifest
 type RuntimeApp struct {
-	Name        types.ACName      `json:"name"`
-	Image       RuntimeImage      `json:"image"`
-	App         *types.App        `json:"app,omitempty"`
-	Mounts      []Mount           `json:"mounts,omitempty"`
-	Annotations types.Annotations `json:"annotations,omitempty"`
+	Name           types.ACName      `json:"name"`
+	Image          RuntimeImage      `json:"image"`
+	App            *types.App        `json:"app,omitempty"`
+	ReadOnlyRootFS bool              `json:"readOnlyRootFS,omitempty"`
+	Mounts         []Mount           `json:"mounts,omitempty"`
+	Annotations    types.Annotations `json:"annotations,omitempty"`
 }
 
 // RuntimeImage describes an image referenced in a RuntimeApp
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
index 04b92edb02..eaa5f8bfdc 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.0"
+	version string = "0.8.1"
 )
 
 var (

From b55c7d74b842248dff103fca77c861253ef5122d Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Wed, 11 May 2016 13:49:47 +0300
Subject: [PATCH 0256/1304] docs: sort subcommand descriptions

---
 Documentation/subcommands/run.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 8ed9571535..36a43a3d69 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -361,11 +361,11 @@ For more details see the [hacking documentation](../hacking.md).
 | `--private-users` |  `false` | `true` or `false` | Run within user namespaces. |
 | `--set-env` | none | An environment variable (ex. `--set-env=NAME=VALUE`) | An environment variable to set for apps. |
 | `--signature` | none | A file path | Local signature file to use in validating the preceding image |
-| `--stage1-url` | none | URL with protocol | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported. |
-| `--stage1-path` | none | Absolute or relative path | A path to a stage1 image. |
-| `--stage1-name` | none | Image name (ex. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A name of a stage1 image. Will perform a discovery if the image is not in the store. |
-| `--stage1-hash` | none | Image hash (ex. `--stage1-hash=sha512-dedce9f5ea50`) | A hash of a stage1 image. The image must exist in the store. |
 | `--stage1-from-dir` | none | Image name (ex. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A stage1 image file name to search for inside the default stage1 images directory. |
+| `--stage1-hash` | none | Image hash (ex. `--stage1-hash=sha512-dedce9f5ea50`) | A hash of a stage1 image. The image must exist in the store. |
+| `--stage1-name` | none | Image name (ex. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A name of a stage1 image. Will perform a discovery if the image is not in the store. |
+| `--stage1-path` | none | Absolute or relative path | A path to a stage1 image. |
+| `--stage1-url` | none | URL with protocol | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported. |
 | `--store-only` | `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md). |
 | `--uuid-file-save` | none | A file path | Write out the pod UUID to a file. |
 | `--volume` |  none | Volume syntax (ex. `--volume NAME,kind=KIND,source=PATH,readOnly=BOOL`) | Volumes to make available in the pod. See [Mount Volumes into a Pod](#mount-volumes-into-a-pod). |

From a644d42ef19e4f0b266cc7cbd6174762d4c1ec31 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Wed, 11 May 2016 14:13:19 +0300
Subject: [PATCH 0257/1304] stage1: implement read-only rootfs

Using the Pod manifest `readOnlyRootFS` option mounts the rootfs of the app
as read-only using systemd-exec unit option `ReadOnlyDirectories`.

Uses `ReadWriteDirectories` systemd-exec unit option for mounting
read-write volumes.

Fixes #2487
---
 stage1/init/common/pod.go          |  31 ++++
 tests/rkt_run_pod_manifest_test.go | 284 +++++++++++++++++++++++++++++
 2 files changed, 315 insertions(+)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index a525009a16..ee9b756129 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -449,6 +449,37 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")),
 	}
 
+	if ra.ReadOnlyRootFS {
+		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", "/"))
+	}
+
+	// TODO(tmrts): Extract this logic into a utility function.
+	vols := make(map[types.ACName]types.Volume)
+	for _, v := range p.Manifest.Volumes {
+		vols[v.Name] = v
+	}
+
+	absRoot, err := filepath.Abs(p.Root) // Absolute path to the pod's rootfs.
+	if err != nil {
+		return err
+	}
+	appRootfs := common.AppRootfsPath(absRoot, appName)
+
+	rwDirs := []string{}
+	imageManifest := p.Images[appName.String()]
+	for _, m := range GenerateMounts(ra, vols, imageManifest) {
+		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Path)
+		if err != nil {
+			return err
+		}
+
+		if !IsMountReadOnly(vols[m.Volume], app.MountPoints) {
+			rwDirs = append(rwDirs, mntPath)
+		}
+	}
+
+	opts = append(opts, unit.NewUnitOption("Service", "ReadWriteDirectories", strings.Join(rwDirs, " ")))
+
 	if interactive {
 		opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "tty"))
 		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "tty"))
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 69a72d876a..15f105c136 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -143,6 +143,31 @@ func TestPodManifest(t *testing.T) {
 			"dir1",
 			"",
 		},
+		{
+			// Simple read from read-only rootfs.
+			[]imagePatch{
+				{"rkt-test-run-read-only-rootfs-pod-manifest-read.aci", []string{}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", "/dir1/file"},
+							},
+						},
+						ReadOnlyRootFS: true,
+					},
+				},
+			},
+			0,
+			"dir1",
+			"",
+		},
 		{
 			// Simple read after write with *empty* volume mounted.
 			[]imagePatch{
@@ -180,6 +205,44 @@ func TestPodManifest(t *testing.T) {
 			"empty:foo",
 			"",
 		},
+		{
+			// Simple read from read-only rootfs after write with *empty* volume mounted.
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-read-only-rootfs-empty-vol-rw.aci", []string{}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--write-file", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", "/dir1/file"},
+								{"CONTENT", "empty:foo"},
+							},
+							MountPoints: []types.MountPoint{
+								{"dir1", "/dir1", false},
+							},
+						},
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{
+						Name: "dir1",
+						Kind: "empty",
+						Mode: stringP("0755"),
+						UID:  intP(0),
+						GID:  intP(0),
+					},
+				},
+			},
+			0,
+			"empty:foo",
+			"",
+		},
 		{
 			// Stat directory in a *empty* volume mounted.
 			[]imagePatch{
@@ -216,6 +279,43 @@ func TestPodManifest(t *testing.T) {
 			"(?s)/dir1: mode: d--x-w--wx.*" + "/dir1: user: 9991.*" + "/dir1: group: 9992",
 			"",
 		},
+		{
+			// Stat directory in a *empty* volume mounted using a read-only rootfs.
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-read-only-rootfs-empty-vol-stat.aci", []string{}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--stat-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", "/dir1"},
+							},
+							MountPoints: []types.MountPoint{
+								{"dir1", "/dir1", false},
+							},
+						},
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{
+						Name: "dir1",
+						Kind: "empty",
+						Mode: stringP("0123"),
+						UID:  intP(9991),
+						GID:  intP(9992),
+					},
+				},
+			},
+			0,
+			"(?s)/dir1: mode: d--x-w--wx.*" + "/dir1: user: 9991.*" + "/dir1: group: 9992",
+			"",
+		},
 		{
 			// Simple read after write with volume mounted.
 			[]imagePatch{
@@ -247,6 +347,38 @@ func TestPodManifest(t *testing.T) {
 			"host:foo",
 			"",
 		},
+		{
+			// Simple read after write with volume mounted in a read-only rootfs.
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-read-only-rootfs-vol-rw.aci", []string{}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--write-file", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", "/dir1/file"},
+								{"CONTENT", "host:foo"},
+							},
+							MountPoints: []types.MountPoint{
+								{"dir1", "/dir1", false},
+							},
+						},
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+				},
+			},
+			0,
+			"host:foo",
+			"",
+		},
 		{
 			// Simple read after write with read-only mount point, should fail.
 			[]imagePatch{
@@ -278,6 +410,38 @@ func TestPodManifest(t *testing.T) {
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
+		{
+			// Simple read after write with read-only mount point in a read-only rootfs, should fail.
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-read-only-rootfs-vol-ro.aci", []string{}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--write-file", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", "/dir1/file"},
+								{"CONTENT", "bar"},
+							},
+							MountPoints: []types.MountPoint{
+								{"dir1", "/dir1", true},
+							},
+						},
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+				},
+			},
+			1,
+			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
+			"",
+		},
 		{
 			// Simple read after write with volume mounted.
 			// Override the image's mount point spec. This should fail as the volume is
@@ -311,6 +475,40 @@ func TestPodManifest(t *testing.T) {
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
+		{
+			// Simple read after write with volume mounted in a read-only rootfs.
+			// Override the image's mount point spec. This should fail as the volume is
+			// read-only in pod manifest, (which will override the mount point in both image/pod manifest).
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-vol-rw-override.aci", []string{"--mounts=dir1,path=/dir1,readOnly=false"}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--write-file", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", "/dir1/file"},
+								{"CONTENT", "bar"},
+							},
+							MountPoints: []types.MountPoint{
+								{"dir1", "/dir1", false},
+							},
+						},
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{"dir1", "host", tmpdir, &boolTrue, nil, nil, nil},
+				},
+			},
+			1,
+			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
+			"",
+		},
 		{
 			// Simple read after write with volume mounted.
 			// Override the image's mount point spec.
@@ -343,6 +541,39 @@ func TestPodManifest(t *testing.T) {
 			"host:bar",
 			"",
 		},
+		{
+			// Simple read after write with volume mounted in a read-only rootfs.
+			// Override the image's mount point spec.
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-read-only-rootfs-vol-rw-override.aci", []string{"--mounts=dir1,path=/dir1,readOnly=true"}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--write-file", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", "/dir2/file"},
+								{"CONTENT", "host:bar"},
+							},
+							MountPoints: []types.MountPoint{
+								{"dir1", "/dir2", false},
+							},
+						},
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+				},
+			},
+			0,
+			"host:bar",
+			"",
+		},
 		{
 			// Simple read after write with volume mounted, no apps in pod manifest.
 			[]imagePatch{
@@ -366,6 +597,32 @@ func TestPodManifest(t *testing.T) {
 			"host:baz",
 			"",
 		},
+		{
+			// Simple read after write with volume mounted in a read-only rootfs, no apps in pod manifest.
+			[]imagePatch{
+				{
+					"rkt-test-run-pod-manifest-read-only-rootfs-vol-rw-no-app.aci",
+					[]string{
+						"--exec=/inspect --write-file --read-file --file-name=/dir1/file --content=host:baz",
+						"--mounts=dir1,path=/dir1,readOnly=false",
+					},
+				},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name:           baseAppName,
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+				},
+			},
+			1,
+			`Cannot write to file "/dir1/host": open /dir1/host: read-only file system`,
+			"",
+		},
 		{
 			// Simple read after write with volume mounted, no apps in pod manifest.
 			// This should succeed even the mount point in image manifest is readOnly,
@@ -415,6 +672,33 @@ func TestPodManifest(t *testing.T) {
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
+		{
+			// Simple read after write in read-only rootfs with read-only volume mounted, no apps in pod manifest.
+			// This should fail as the volume is read-only.
+			[]imagePatch{
+				{
+					"rkt-test-run-pod-manifest-read-only-rootfs-vol-ro-no-app.aci",
+					[]string{
+						"--exec=/inspect --write-file --read-file --file-name=/dir1/file --content=baz",
+						"--mounts=dir1,path=/dir1,readOnly=false",
+					},
+				},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name:           baseAppName,
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{"dir1", "host", tmpdir, &boolTrue, nil, nil, nil},
+				},
+			},
+			1,
+			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
+			"",
+		},
 		{
 			// Print CPU quota, which should be overwritten by the pod manifest.
 			[]imagePatch{

From 25266779c2f9d02561ffc8dfd0520cd1e699977e Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Fri, 13 May 2016 12:15:55 +0300
Subject: [PATCH 0258/1304] tests/rkt-run-pod-manifest: contain test failures

Tests shouldn't fail completely when a case fails
---
 tests/rkt_run_pod_manifest_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 15f105c136..c494b250e7 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -1068,7 +1068,8 @@ func TestPodManifest(t *testing.T) {
 
 		if tt.expectedResult != "" {
 			if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
-				t.Fatalf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
+				t.Errorf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
+				continue
 			}
 		}
 		waitOrFail(t, child, tt.expectedExit)
@@ -1085,7 +1086,8 @@ func TestPodManifest(t *testing.T) {
 
 		if tt.expectedResult != "" {
 			if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
-				t.Fatalf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
+				t.Errorf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
+				continue
 			}
 		}
 

From e46dcddf7252151dac5bcf798ca30aa1fd2c86d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 13 May 2016 13:18:38 +0200
Subject: [PATCH 0259/1304] stage1/init: use path relative to stage1 in
 Read.*Directories

Systemd doesn't take paths relative to RootDirectory when specifying
ReadWriteDirectories and ReadOnlyDirectories.
---
 stage1/init/common/pod.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index ee9b756129..0f5db3808e 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -450,7 +450,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 	}
 
 	if ra.ReadOnlyRootFS {
-		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", "/"))
+		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", common.RelAppRootfsPath(appName)))
 	}
 
 	// TODO(tmrts): Extract this logic into a utility function.
@@ -474,7 +474,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		}
 
 		if !IsMountReadOnly(vols[m.Volume], app.MountPoints) {
-			rwDirs = append(rwDirs, mntPath)
+			rwDirs = append(rwDirs, filepath.Join(common.RelAppRootfsPath(appName), mntPath))
 		}
 	}
 

From 93293d996742ccf104aa04d1ea8345ddedd8d3cd Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Fri, 13 May 2016 14:15:35 +0200
Subject: [PATCH 0260/1304] kvm: fix flannel network info

Closes #2604
---
 networking/kvm.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index 7753680234..cf2a5ef4e5 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -35,7 +35,6 @@ import (
 	"github.com/vishvananda/netlink"
 
 	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/networking/netinfo"
 	"github.com/coreos/rkt/networking/tuntap"
 )
 
@@ -397,12 +396,11 @@ func kvmTransformFlannelNetwork(net *activeNet) error {
 		return errwrap.Wrap(errors.New("error in marshaling generated network settings"), err)
 	}
 
+	net.runtime.IP4 = &cnitypes.IPConfig{}
 	*net = activeNet{
 		confBytes: bytes,
 		conf:      &NetConf{},
-		runtime: &netinfo.NetInfo{
-			IP4: &cnitypes.IPConfig{},
-		},
+		runtime:   net.runtime,
 	}
 	net.conf.Name = n.Name
 	net.conf.Type = n.Delegate["type"].(string)

From ec22d5b50e3295980fb2df02e39c6abdc4fe58a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 13 May 2016 14:37:02 +0200
Subject: [PATCH 0261/1304] functional tests: fix pod manifest tests for RO
 rootfs

---
 tests/rkt_run_pod_manifest_test.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index c494b250e7..2b46ee6cb7 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -580,7 +580,7 @@ func TestPodManifest(t *testing.T) {
 				{
 					"rkt-test-run-pod-manifest-vol-rw-no-app.aci",
 					[]string{
-						"--exec=/inspect --write-file --read-file --file-name=/dir1/file --content=host:baz",
+						"--exec=/inspect --write-file --read-file --file-name=/dir1/file --content=host:baw",
 						"--mounts=dir1,path=/dir1,readOnly=false",
 					},
 				},
@@ -594,7 +594,7 @@ func TestPodManifest(t *testing.T) {
 				},
 			},
 			0,
-			"host:baz",
+			"host:baw",
 			"",
 		},
 		{
@@ -619,14 +619,14 @@ func TestPodManifest(t *testing.T) {
 					{"dir1", "host", tmpdir, nil, nil, nil, nil},
 				},
 			},
-			1,
-			`Cannot write to file "/dir1/host": open /dir1/host: read-only file system`,
+			0,
+			"host:baz",
 			"",
 		},
 		{
 			// Simple read after write with volume mounted, no apps in pod manifest.
 			// This should succeed even the mount point in image manifest is readOnly,
-			// because it is overrided by the volume's readOnly.
+			// because it is overriden by the volume's readOnly.
 			[]imagePatch{
 				{
 					"rkt-test-run-pod-manifest-vol-ro-no-app.aci",

From 5c0c31d6a4e5af25e3cc77473c15b641d3f3fe9e Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Fri, 13 May 2016 16:20:39 +0200
Subject: [PATCH 0262/1304] ROADMAP: update

---
 ROADMAP.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 04fbd596a6..d04c5ab900 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,14 +9,12 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-### rkt 1.6 (May)
+### rkt 1.7 (May)
 
 - enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
 - app-level seccomp support [#1614](https://github.com/coreos/rkt/issues/1614)
-- more isolation between stage1 and stage2 [#2483](https://github.com/coreos/rkt/issues/2483)
-- user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)
 
-### rkt 1.7 (May)
+### rkt 1.8 (June)
 
 - stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
 - IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
@@ -26,3 +24,4 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 - rkt runs on Fedora with SELinux in enforcing mode
 - packaged for more distributions
   - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)
+- user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)

From c2fc06a98644d378fac2b261f860bb48a7ddb300 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Fri, 13 May 2016 17:35:52 +0200
Subject: [PATCH 0263/1304] CHANGELOG: add v1.6.0

---
 CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec3106b63b..b6a3f2e88d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+## v1.6.0
+
+This release focuses on security enhancements. It provides additional isolators, creating a new mount namespace per app. Also a new version of CoreOS 1032.0.0 with systemd v229 is being used in stage1.
+
+#### New features and UX changes
+
+- stage1: implement read-only rootfs ([#2624](https://github.com/coreos/rkt/pull/2624)). Using the Pod manifest readOnlyRootFS option mounts the rootfs of the app as read-only using systemd-exec unit option ReadOnlyDirectories, see [appc/spec](https://github.com/appc/spec/blob/master/spec/pods.md#pod-manifest-schema).
+- stage1: capabilities: implement both remain set and remove set ([#2589](https://github.com/coreos/rkt/pull/2589)). It follows the [Linux Isolators semantics from the App Container Executor spec](https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators), as modified by [appc/spec#600](https://github.com/appc/spec/pull/600).
+- stage1/init: create a new mount ns for each app ([#2603](https://github.com/coreos/rkt/pull/2603)). Up to this point, you could escape the app's chroot easily by using a simple program downloaded from the internet [1](http://www.unixwiz.net/techtips/chroot-practices.html). To avoid this, we now create a new mount namespace per each app.
+- api: Return the pods even when we failed getting information about them ([#2593](https://github.com/coreos/rkt/pull/2593)).
+- stage1/usr_from_coreos: use CoreOS 1032.0.0 with systemd v229 ([#2514](https://github.com/coreos/rkt/pull/2514)).
+
+#### Bug fixes
+
+- kvm: fix flannel network info ([#2625](https://github.com/coreos/rkt/pull/2625)). It wasn't saving the network information on disk.
+- stage1: Machine name wasn't being populated with the full UUID ([#2575](https://github.com/coreos/rkt/pull/2575)).
+- rkt: Some simple arg doc string fixes ([#2588](https://github.com/coreos/rkt/pull/2588)). Remove some unnecessary indefinite articles from the start of argument doc strings and fixes the arg doc string for run-prepared's --interactive flag.
+- stage1: Fix segfault in enterexec ([#2608](https://github.com/coreos/rkt/pull/2608)). This happened if rkt enter was executed without the TERM environment variable set.
+- net: fix port forwarding behavior with custom CNI ipMasq'ed networks and allow different hostPort:podPort combinations ([#2387](https://github.com/coreos/rkt/pull/2387)).
+- stage0: check and create /etc ([#2599](https://github.com/coreos/rkt/pull/2599)). Checks '/etc' before writing to '/etc/rkt-resolv.conf' and creates it with default permissions if it doesn't exist.
+
+#### Other changes
+
+- godep: update cni to v0.2.3 ([#2618](https://github.com/coreos/rkt/pull/2618)).
+- godep: update appc/spec to v0.8.1 ([#2623](https://github.com/coreos/rkt/pull/2623), [#2611](https://github.com/coreos/rkt/pull/2611)).
+- dist: Update tmpfiles to create /etc/rkt ([#2472](https://github.com/coreos/rkt/pull/2472)). By creating this directory, users can run `rkt trust` without being root, if the user is in the rkt group.
+- Invoke gofmt with simplify-code flag ([#2489](https://github.com/coreos/rkt/pull/2489)). Enables code simplification checks of gofmt.
+- Implement composable uid/gid generators ([#2510](https://github.com/coreos/rkt/pull/2510)). This cleans up the code a bit and implements uid/gid functionality for rkt fly.
+- stage1: download CoreOS over HTTPS ([#2568](https://github.com/coreos/rkt/pull/2568)). 
+- Documentation updates ([#2555](https://github.com/coreos/rkt/pull/2555), [#2609](https://github.com/coreos/rkt/pull/2609), [#2605](https://github.com/coreos/rkt/pull/2605), [#2578](https://github.com/coreos/rkt/pull/2578), [#2614](https://github.com/coreos/rkt/pull/2614), [#2579](https://github.com/coreos/rkt/pull/2579), [#2570](https://github.com/coreos/rkt/pull/2570)).
+- Test improvements ([#2613](https://github.com/coreos/rkt/pull/2613), [#2566](https://github.com/coreos/rkt/pull/2566), [#2508](https://github.com/coreos/rkt/pull/2508)).
+
 ## v1.5.1
 
 This release is a minor bug fix release.

From 14437382a98e5ebeb6cafb57cff445370e3f7d56 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Fri, 13 May 2016 17:36:43 +0200
Subject: [PATCH 0264/1304] version: bump to v1.6.0

---
 Documentation/getting-started-ubuntu.md | 6 +++---
 Documentation/running-fly-stage1.md     | 4 ++--
 Documentation/running-lkvm-stage1.md    | 4 ++--
 Documentation/subcommands/prepare.md    | 2 +-
 Documentation/subcommands/version.md    | 2 +-
 Documentation/trying-out-rkt.md         | 6 +++---
 configure.ac                            | 2 +-
 scripts/acbuild-rkt-builder.sh          | 2 +-
 scripts/build-rir.sh                    | 2 +-
 tests/empty-image/manifest              | 2 +-
 tests/image/manifest                    | 2 +-
 tests/rkt_exec_test.go                  | 2 +-
 tests/rkt_image_cat_manifest_test.go    | 2 +-
 tests/rkt_image_export_test.go          | 2 +-
 tests/rkt_image_render_test.go          | 2 +-
 tests/rkt_os_arch_test.go               | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
index ecf6d7090d..2b53e27848 100644
--- a/Documentation/getting-started-ubuntu.md
+++ b/Documentation/getting-started-ubuntu.md
@@ -15,9 +15,9 @@ vagrant up --provider virtualbox
 vagrant ssh
 sudo -s
 
-wget https://github.com/coreos/rkt/releases/download/v1.5.1/rkt-v1.5.1.tar.gz
-tar xzvf rkt-v1.5.1.tar.gz
-cd rkt-v1.5.1
+wget https://github.com/coreos/rkt/releases/download/v1.6.0/rkt-v1.6.0.tar.gz
+tar xzvf rkt-v1.6.0.tar.gz
+cd rkt-v1.6.0
 ./rkt help
 ```
 
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 1ff6303ed2..1d145e8031 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.5.1+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.6.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.5.1 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.6.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index c80c8bf657..d75391b533 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.5.1+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.6.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.5.1 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.6.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 9ab207a796..5e55a81f8c 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.5.1
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.6.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 1ad445e790..56b5c9c937 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.5.1
+rkt Version: 1.6.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index f9e48b0b71..96736c4aa1 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool, and is currently supported on amd64 Linux. A
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.5.1/rkt-v1.5.1.tar.gz
-tar xzvf rkt-v1.5.1.tar.gz
-cd rkt-v1.5.1
+wget https://github.com/coreos/rkt/releases/download/v1.6.0/rkt-v1.6.0.tar.gz
+tar xzvf rkt-v1.6.0.tar.gz
+cd rkt-v1.6.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index bdba629c22..dba4a9bcce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.5.1+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.6.0], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 72e6023dbb..94f40d38b0 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.5.1+git"}
+IMG_VERSION=${VERSION:-"v1.6.0"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index d1e8dfb55f..9f225e8471 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.5.1+git}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.6.0}"
 
 mkdir -p $BUILDDIR
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index d423df3965..7ef4622e87 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.5.1"
+            "value": "1.6.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 46b767e09e..d4abdfe4dc 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.5.1"
+            "value": "1.6.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 51c8702ce4..b9e3be307d 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.5.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.6.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index f927ea4346..9831833c66 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.6.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 219029118a..80a203961b 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.6.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index ab34c6254c..191b7d6388 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.6.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 081196fccd..172a80d74e 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.5.1"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.6.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 0faae55f62f7874f022a9b89843ff8703f91295a Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Fri, 13 May 2016 17:20:29 +0200
Subject: [PATCH 0265/1304] version: bump to v1.6.0+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index dba4a9bcce..dce34b5c9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.6.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.6.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 94f40d38b0..d3bb62a776 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.6.0"}
+IMG_VERSION=${VERSION:-"v1.6.0+git"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 9f225e8471..6f771b6bda 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.6.0}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.6.0+git}"
 
 mkdir -p $BUILDDIR
 

From 4e0cfd012d4073d817b8469b56d79241b74f00e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20K=C3=BChl?= <chris@kinvolk.io>
Date: Fri, 6 May 2016 16:14:08 +0200
Subject: [PATCH 0266/1304] docs: add containerd to comparison doc

---
 Documentation/rkt-vs-docker-process-model.png | Bin 105884 -> 37744 bytes
 Documentation/rkt-vs-other-projects.md        |  28 +++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Documentation/rkt-vs-docker-process-model.png b/Documentation/rkt-vs-docker-process-model.png
index b40ad1915a7c40eb6565dfd0e5826200c6455693..4348157c002e1f14f2416a1f2a2820a3162479f2 100644
GIT binary patch
literal 37744
zcmeF3Wl&tt7T^;?2pZgi1`jSlf)ijM5ZoOC4DK?x6WoHkyGwBQ;7)LN7+eS0;k|uZ
ze_qvo-Q5pcbql5%ZujZar_Vj-*XK@<th5*k;s?Z6uU?^i6Bm(x_391wt5>hP;NhSx
z@>`tf&|k1dLQ+DnUR6dQ-Rr%5^-A#7HxVI4r`Lz6Z{5s$ZriBS4#154Jxjj@LuP1X
zX>0tsbHPuI<8gQ8H8F@W@-?!?pTJ=21}>F)u;uCfiqWq*SKF#&b4SiUz-x#H{~vH#
zY9iZtiXCtTwC!#rktCHO0xKf;;$o$cP155x#C(m8_TrKe1o&IRzHIa^f$uNqM@(l8
z@q!Qh$JJjj#zzW6_RlL4`!znc+L{9JWe?EC#&`cEK@}NkHW{7U0R77zNVC6Q|6`2j
z@dTA&4HOOhWfDbS&cQ%&m-wah=>5T7p}{35pQ>L78t4^@xb)_QprkNr=#g?!*!+e#
zFXj(z%yfM@j0h<m3@dF_Xa3NC^}tGNkNQu2KtCIZ3IarxZ(`J7MMz2D&F88pNs6N4
z9ng}So9SDW3$f{xxgJf;%$hU<!U#C;nh7|}cWt!|p_8C-gN}jt^r6_FZ0wVFV<Y$V
z*&tIBb(&LWsYYGd<i%~w>Wqe!Lm!D}v+J?z%0W_c@_C`@`z^X@9S|KvN=gbG$~JOh
z4zAw_C*HxZ0)gu4`Un!%5b7+K_K$;xlR5M0Kc;^E#0EO+;aRzr2JIK-H}(;`mPE%K
zwLKnLc^;fU-t-ArKIMi(XMx4%eU?Q{`ie}p8+N8dZNuX%I=x<u#C?kW^JgavLqo&&
zJsTl9_gTe7Mf=L!?Ck8|V7fAE-*>2203j-BjS5}wa>zukB+=I8!7Nks58JeNxgYeY
zV~3L12Ol;_p2RO5X8P(Z7PjM<bii}Xx7*2T@w2fo_3!`8Yins8<;kRj!%`=uc}nR-
zalX%&dp;a!XEHG{f$&^~e<GVqav*O^$_Ol-noFl}jW5|xN?EkdzI(Q}eif(=&n^cF
zw8_SXVYOZMD6bnv-A5vl;^N{O@!5b*<m;ESIv~zPYhMC>w|Yo7HUD_&Z^6BmiwVh=
zv+nQ0RJO~`JGYIaDPP#Ekb|9g0HJtmw6wJIgxjj1fp+gVODm68oB`tw7vo}}okDJU
z*ZrwN%drfh@Hyr(PPQK_Pmk9RkO<HF4Wey^O(vH0<K}Z|D_zlr+s$Yh7hf_LdY$E+
zh3~qp)^dE%&7cn5Rb#27FrwnGW)nyrcEy%65?Bp`AzMtId$Nyc_od}6SL)Z}5gt>X
z(pRWkSvffrb1L5=*f}`3fr9H*rqe|?nK9`Ku^qeDLDXpptU4DViiRSS?QrCDTHmN2
zMm?_B>PGn?IT|@K@zM<xCFSK-MiqXTN6qIW;cX)nM2s;}mW{i&t@m3@O~UWLbd!(?
z{2WPtyr90`5qO$wd3rboy@5jxq>^bC+XH?UVBE7sxaF2imrj<SrcCjjwVx1~Jm<YX
z_IxrkQe1Rguy|C<)F%2Sdot<#KHK6uwY$-f{4||QnxculCag$?HA2mCB~o3fX(Dt(
z)4kTDU3S_)Dd*L(9~VXN^(pTQCps`<Ua!!0zf`(zT6q{@>GD3SI4Emsl<~Zqv}}90
zGK;=AtR8iwx%0do)M<tZ3hB!d4QXB&1ht+M)h$>y-CnHR&D1T1FtzTklxsFjM4^6p
zx<6k+7b9G&wORp}HG#Q7PY>5kx92;Mc6p$J_29hc(}TPEBg?$&oMC)J6uDUA6Qu3w
zyzk4(Z0i+!-5_HVSIqqLqJq}~NUq4+U5{JpNIvDK%4KS0y3<s<9{rAo?5nix8_9j;
z9_Sq2hpv3Kz%j|=$vXj<r}U@$zI1_{gMB&x;q0a`$z5bufA;-On(GMNw3R1h;o&my
z19weCBmd=;!uuzP%|`DRAeGPk{f+=Ano7!c2zIsU>5q&DD~rZyvChN54#e~6_^AQ9
zp<J)o%HA*<Lx%~#oc$Q%Uloe}$_V&@N+#`aX@md78`Y1(q%BK)5&%X4XU=N74zCDY
zFWN;205lSnIz$8UQIIwE!+Fp8$(PaAT1!hx>@~%J^LbLqGvNDCfv4uC&0ms)*Yp6~
z>(|%&uip`_PG)`9@wna6F4Spusw5EbXy)0=iC*mEzpCVb+hV9&Tt8-*U|y(#fSVxP
zHddq+TWQ&k$s87E*8@<kfd_+{*l&@qnDE|AJ<S=VJ0RgQUd*N(+YmHeFS|ap^j*qO
zY0{0{4$zg~l-p!OhK%?(t`_Y^9se9R9xz_dwmnV@2w+luKbgh77EI_iyxgDmuwL8C
zPrn)^X7h}3UG;v~8(j-=yIul8@Wtl8-de9~OHf-ib=pIHc*ZD(xF=WHD2E(2?rZcw
zOhFsL_dJKp<%fN35uUBbt&rwlUS@Cu41hPm1YkLvbgP)wFLv8pi@#(6@eCT<vg_L;
zsRyz4G2dXfjQ{+ieB_gOe|v-Ux&-P4>RQhHsv_ucPKjtT@rY=ygaWllNi6w=tbecJ
z{p@}xa3gdL^;?7QGO|ep&WG3-iH#*71xzcMpCj<udixSHxHcAu{r<uZw44pl5%uDA
z^wG%SeV&8g$<X{kU(mM^Apph}P`y7-f4Ug3qDdEY34I&Nfc59Pd52FslTv_9U=tyf
zrI#zblK{5MOTX==hpE}S_cz(Y{BN@sd3<EPi7uob;_NV6xxB&yE01#mt0_O$rn7;T
zb`lI=xvEkicL#~^YhRcS=C6;B*KLrEsjx(p{lVXcdE|?O{Fx73Xgyr3T$f@Eo@@TN
z_otCR?R3#5aOOo8629E7p?c!|a@u-yU4f)^WeD2z!Bf`bXVc@sEoO5rJ7t%n!Xf=U
zVV~99klp5q)?KX_6GSWfRLNWzbGl&F#%GiM<L2xg8yFwRmGzac^)$@tW+!|n*467u
z^w>X=Sbw#odc+p*-N}+kermH&Z*}iF3K7DJ9dVk#nawb>V?*026FT%^Nep%L!8_{3
zxnz-~UR6QNALbG>tRF7&1uhXgq0Ymy+&t4Q#TDG3-EenV?s*hD=k$ff91lB`Ihv&7
zHzN7#4!qk#BY}ez%*bGjeiHIt_+Sk3T$+36R&Q(h5!UIG<r6g)1)GcN>x&M=lJXh%
zmBbzRI6&Z|hc+Kj{-mU$wYAiSXR^fusM+YOyly#m=O4qtjT`aPy@_z!Bo7jZ`EB4c
zZoi#q<gyj+$VTADj6v*o-f@-T`~HlLIdnh!o-EXZt&v!B?!E)-39rX!=A9@`4^9`#
z+B{r`)7PkcV$Kz}>U1eDzF=+%y35^QYb|Tfb!`6xe7^!&+*aX^z6zHEjg@`o%>)O*
z))RlG8+=T_xeV7Dtbn8+fsQIM_ErLRFpY0)`PT);)|(%F^!Q(S>K_*+7gdImbn$dQ
zx5u4-92z3Uv%q7=18IW5*qVXNr1f>^`+bKPw{m%ZCKGj=S-Y^<X_=7|SmyO3_~s3b
zlo5n+e1p~a@J{;N1EYFDdRrXYg{YkpGC3Q>hz=3B9#C6x(f4(Y*!ktSUM1Fmr$dBr
zjnr%-wCT~o{1f|f?Smxrp%)wg4bavbW=sp=Dc~~}$@fAlvb|V>hXZ-Zn>(nJ$8FCx
zJbWiG;>+E(=$55|E=pjrU}9|?B*gHD0F|ix*Y!VPDY3RH$q^hVP=c}O-hUkb8-g~9
zJ|8gH`zb$Veex9b4Wb@^im@9$V->@En8w=32fZ&;@CNCpQa|p#BoY79?Wk)H#`4E@
zZcV0%jXS?~YH_EC%*e8Kvic$$qON}Di#y#6()7Ej{AQb8*9l_h%_!|mR5nCH8A?3#
zmHTZ@J|<=C4Ytk}ETcYpyn(}32>1Y79*iI33aqk5(g(r_sr6uosQ{aNiqRy#z`=pP
z>)cJmV@Mozydz1mMukA1mj{FG#wb6r02tRa5*LSa)eqMl?m<;u^mwz>^}}*?72F@#
z;PLQ>nhEWOSol4So|sJ=RuaB+q9DHE!ju04xFK=b{n!`!9>Ch`h_<Yt0wg7NI}!3s
zP$Nu}1ZTDfF&XP85Fy?+)G=?{eCp~)y(T;ILY+-WY*X|>_p_F%?tjx6`W6rkO$jpU
z;f?V!>&xoY>0r`c1*3z-_d-99CUcJN2o)kB^1tg8XET&l)?6Pza+XVBem{Y&$)g&C
zSVwmTr#Ho+71T>6vhn^a-`6FZ!XF$T#jVGM_Ck;(OjR~rIik^kME$s>3N<M=r|mpb
zu{GT}%$?zqGLa{(bitZNJ71&vF5l@*C8Ix(dVh05>5Fd3VixmP!{QP{sn6)o>c-&2
zjJ0<6S;K1W%IJ~`I{<t@=F==d1DeZ+{R)62$~k~bNxQK~JG{CwM8D;K2lBz!82MLK
zC^By8zrtw482AD7ck8gAiy?AHu`ulQHgpJbCItt2xrC#uV6Y#4U6wtrkkH@?XK4>5
zAC=I>4kZN#?DCPEiRcIu@B5$PVIz|OKNiRoaj+<Kn!oL3JZ5RO&gF)NaoM7KEztM{
z9W7E$4i;BU3d@`8wU34zmCsl7C;q!H^>Gvm6P<^`ihE((!`pm}%=I!XNy7!)VE)ie
z3@oD9j2zJjhb?zwk^wchZQ#Z3_|X;muEg9&2C&v%eUkqLQA;NbE(Kr=-$HDzD}aRD
zd$a)qkS}M84(NnjAE(oBTT9?jq>4}7{nQ1m<J7A#1AQ~GWa9Vj>Y+(rn>Bq7!u7{l
z*2E0b08&H1-!5}l6BEpzlBx_yvlNTl%y`V}36<*+b2vEog4T9qs9-r%-V-lS>5p1i
z+!93_bbkE<0iS#|`&Y9RX`*2C&|U+8sIk7W9dr@x`b!Wn!o?<gR|0IE!#f>NOgeX%
z3DCpEbXdUF{#{!L<YD+on#0Wf36wF<2?Q!M<Lj|2ot8%zN7L=0!jfA@KKW>L!4(T@
zm>_4i$eJY~g~x|tA|D&I?}W#IS`G7&h<^<a3;uDxqmMTc-7hO440e_#M(e))TuT-U
zf4py1XwL|nbTJB^7B$6o9L`A>mf1FfObS_;s?*rnK8{KapGZp>%<u!ZbJw*$Vx16(
z-T4p@CA?~_ivKAGrJQDD@t{6voES*TjiDKa*Ft>)*)J}?>V;u>x07Ng-PsZl<qV`N
zKw^`x$FLdA(^s^%1k$xamX7Zdxit6Xza@06Id3^5jJ`jFAy^DYLniZ6BWykHKY73P
zLj=QVIqLNqlGGV0C*68%f_LYuF8{DOB+dLzQ>$-Pdy!Ck@kXa%sJJTl0!<)I(41zQ
zmbc>9MZR?SlNXho6YD_G{DRB*s^8w&v612XWhf$}ET*Ue*f0_JkLt%omXdvb`K|kT
z^7>$W`~J1eA0KVL@5{#PRV|z90f!d(*nl=(8`5q!P0QE6>BR;Etr<~*tu5oOM43<E
z|DtxfcRh?@Vt^R{?Ix~hi$C!U#ZFOOy$D@)GanBsy!FK;zoQLsVa#_2E8ASR?ed9x
zxdh5}L{bHQ>6Z1ghgHLD^3wHs8=rpC@<evUWGP4lTD0-F`f2BPUrGN+&IrPbnM!Ow
zBW*SU`rhjape?qcfme2ih=V;6+!1dR_c~8DlB$YSYCPx_(ZY`58N<f)E8g4CxXG+w
zAV-ID`JEpqJ*Nin#(7!RWx48PFeaFSuRHvGr#<2AdsGN>;d{tnnRPrLE|*nTxrF8p
zL%b$z+DgZSA6MxjUSj~nC(8uQzQza*eErrzl8le#c7#6%@D?^PNQcq<j`#Y#$8l;Z
zbrGKEBoz;_1<AmdVBBil&@<M3DSDw=L>^ZPzo;!^cb{J=CE7WXj=VJfdY6=ozwm+p
z4Zs{?O2Ry?Sc4rhc)U7dEZb1LfjlBj*B|EA=X;iGX}X`&Uzz!Y+u(kkL+JqH^>l;<
z-4W@(?p@3-F%}`N&$#%JvOdsVWT>e>?+2NX6C>L4jj^#HdweB~BK*3J0m~`Ix&Dmr
zn%stv9?xqK!;&Abm*yNVujH@4EU@t_f7-|S&*p!b(;4P|3!YMIzo`=h!ocfN6J372
z2{-dO(PY7EXX`rq1G}gnqfgOe#J~*ux7rUM9~ljZ+aEC=csg*7>)5oTCZx(5hffen
zdgYsmy5@HAMicjJBF@0o=mzFO2C8;a1p9~hd{UMIIWk!{SiE6_7=pL{s{X4IK6Gy+
zr2pC@v(~$2@aieTQo_BZFS0iHiYAIG8fD1E0#p@!S4Rv;k+YXYR{Ih(ou-NqBsYe{
zSf4Se(1V>H`ElB2zR%f&BpA<=X7q5wdm_HnzQ*OfVSbTH)y6Y);B1sd+hC)M@fYf)
z@xW8sQRV)1sHv%sWwYqY%-CrvdowS_N%}qiK74|L2lSZ_j@jnZ5Tl<vCLrv?)-e&_
zF1wS@ZZ9|fF4wy&jo{{?+E$UdmL@=Jvtgz4R~a4^th)Z{`d!a55^TY_d4?u=J+~b0
zUt24*u1<D%Ls|ZxhyVi>io231CT!Fz|I8)xZM;wy;9J$Kn~O;qD?16zTV@w#&7ihS
zDPA)?)l>J+^>HNwJrjLHyncz2;9O%bj={+Z?NEllYdG(y_k}aKdf|L*I?h9csQ(?B
zQgTd0r3%}gR>(_=X6Pb}p;Wja4KR^s5q-)DU1d`buZohm-J_*}F~|P`oJu`^r+0}D
z5c-1KD=h<G{juJ{zBiM4|JNZQo)1lEXbziiR{=NqE=`Dvrj7rokBp}(8HXBvBH_kz
zd%f^&@2dk8J*qHnYbHOrbHz(ihU?Fa!muLLn8@&8p3r>7tqxpHfqBBk%XLG&NVZ9@
zwP+;r&)ObUqrABAJBQ*0xR?61l=VywF~pplX*L7?lA2D+4RCmza>PS^)`Y%nuugsF
z`%so9sD}xC;QgIdDTM+<8fKV!7?xt;AxS*v{2-eC`p1lmN>e#_L8glB;%65Jy__Wk
z!7|P+dWsCsU`8C^C8rCsVAJ(+<TWnl{a+igjtpH&8horj{d)=jB6WfwjIr;cpb4e9
z=ldh|Vd^hd`yS`b%71^tucHV>juVjjEhC(aeD@#N_=N&W4+EH$VxDimz<PZ@`<$|=
z9FnaPk=)pG@EjE0?eYFwmY!!OXQO5HTlob6wUri3UfCinM8x_h0Q6pmV#%z3heZFr
z{og;oP(#Pt5m(B10T!`vpPzFMEz{~RcxV3?X!94bBA6Gz5*lsw7toX)l+FbI6L1QS
zAVBHr7kO-&7a;V1FEv1PB&rA+g8V~l8ph{@=)k4;_djJOi?o9_+lDK?eL0{F6mrUG
z&T5om|Dy{u?-b}7N7?1j%DzxjaL9AO-neX9`eNprDbVH=awYE<1IlVbNiEjwrLx(J
znUn57n>YWzs{gZQ|2I@Uwi6oMtFmm362ZHb#A)@Zj4t=t4h_C%I4{AiSbZMWinPHW
zfZ8B*4X3RBwT9Ky&o|vIfNj`4@0!fCTUjA9#n7_>??nt_Q`<6@v-pJxHpWtu$FD0^
zQ!Cfvy@oW|P+!4`F55OPrK?l|e?jkkmd2+wnqKO>LDgq0yw`m?qJ-sU=So~LLIZ;i
zv(S2rIa^~cx-S0Bq>v7ut36gab#vf)VKA1&A<%Bi<vpg?1prp0y>MkriWJ6QC}Y)g
z>A<ROcKYGia`vgys$l{_A8Dhg5SuJ=2X+8;em3^vU?+*w!cj^xzNr^i#{q?@`B1{D
zWkJbv4fBdVeDEBnzy)fsd{TlB02$2LTM^PaSj6Q5<K-&$x^BfJsPOr)May<cboe~n
zQDx54AM6AgJK0-VR;D#C-pxMktk{%Qk)5_ILw!!5*BuJ<Oku1JVblG)==mKA!zt$Q
zFn*Nfauq|i+km1MENgQBVx&j}XQ9D``0TNUj<sR6qpj4zOjDx<_^|#x2i{mH0e0)m
zo`glJnR?Yw!`)ANyPWuuf%C1I>D>5bdFMLG{c=}E3*g)M3c72{4t9P{6#2F&f^b^O
zQFyGA<F6jWil0B%m!{wTq!V!RRB;$dEZdHVZ~94{ehCt8V{)I5J!;Vy;PH(bI}*4J
zv)k@kI!;c%zTH1|Yk#VbHi29-ovoa<-YJmORyppJ=AdF2tJin4^FL*oIqiR$J$|Pn
zsW}@X#gbcbb!Mh{UVDTivbZ|nxb#OU#m#MC^DZkHJ|?EVsCs#?*8P}F#mZ7PmYQfs
zvu&S)+RV+Rwzy?`rR-0dQBF6IZQyEdQpt1o`wkq6c{GQcvD=n|3TO*O`_!s-q%o&?
zDE5eTQpx?MrOaTcAd-H|Z20(Tf2o>QMqpYg#oC^Xs8aQ}XVU<C>wS`$rLlc?Kn(cv
zu#)FJp$e<12pN%8ty-H>?ZQaez#Y!nXWpCoIn3eK@=pR6UK}QunXd4k%he7(0NXZI
zZj0{5)XMA!y2E7*W&_L?ZVm}&Yiz2EABP%_CKqUZq2{vwf!KW_mc%)bPQc*l%H)UG
z2V##-cHYO(;clgQ6wURbQND$S*AM!I7c3Sq`<xSiT)#gE_G(5IuXB38TrDoxg%(@(
z@W_~|FmvZ0TM@etD5YMv#?>!57S0nFG(EO4yiv@hEHn5kt8&@F=0-Bkp|tWCqXY1l
z0%Y8<FNgz=uxA?q5bpx6bzRgJ^X;jr95d6UE1jo5>{fp_i`wo@R9J26>F`<q#;T|F
zeko59tz3#d`plQv9)nCA(@5_geGQwWTw+g|r|UxgF$|$(ez5FHsMGM>;n9Nfb;N<x
zDKq8TiSPXH-zKN5D%^j3?kJbOX4v0hsc_h&m}yomvd<w}y1kdbE`Mrld|F(4(?l08
zFc7Przi=~Q=HaEgU}mS)X5~4~Vv8Sp_q4RNUj~V=gPsR%wb-A*hODWseIRz7?~_-`
z9CILbcxs&<@ElPhbkrsA%`!QaC&;-ewVSDnA#tszOXi-Nt$Qqcw^)08KXm!DSLa58
z8Em<%y^%CiQr)<CIC_K<gvb`?n1=pq_jfYF=TdDm?q;dhWVyZl10Del{cJPshThmv
zf{mn|mc-BQlRv{orf2RRds%44gKj8C)15n%JogkHLB)RtN^iRi%kJoQK))1pKqAnc
zFJ^zCWdz$;#J0LNVg3e%lKkg_S65z659G1e19Wrr&B(F&vDVdnMdbU(iIY|RGH_C|
z=GNS?sS1CaUhYQU#W!E_w$NbZ8X62r-*=6V0=K{>^bW_1qgRqc7{~*MfH~r(I|`c6
zdyBeh;}7xXpx9#`E${h1tCt=6Lk1r&QTdjgk8HA8$l39*3<`KRKG!|O$5XJ=?w2(}
zg+B5b8B_`mMTiMy?Ru5{V{6|}ZoEb}s<>^7QH9$+@ZkE1KRrROfa|EV4E$3=b7{D4
zL9olgV~jKfFP@^+Zd$1<{gXv5TfTp}In_Rw%78O>WUrBq^(E)h_5i)kwAjiDmEn=$
z>|b4xu;RzNw;n(`H?`VXOG}7<+vR0uTad(La)^8Ko%@s7zFC&8?L}I~6P)Wdo%ENF
zCP7dK<~Z{B!Nyxs%pAMwtd4LkUJ&T`F)>CuN!J${QynNgX>C;0w(~JL%vJ0wK20ji
zbm*v%hy6skV8S5<cO1^^O9B%;`78?9#vC@)$6ss0?knxBfJ=^7iQfktS9-oc%rxt{
z=4Ow=p*ybT;5wCwIy|1lp<v<BSEm+_qB8ayzHaej_m{^yhN#Sl=1RTP`)Ht@@A^9)
z@Q=unJdd1lz)#w6o(Y!5Icf8KMfqmf59Wx~=H&^+8V<if#WwSTl`58@6Uwt6^CEmt
z2sx7{luxhfD3OCtw6>b09dkJ#{rhs`!w378HN4w#egsNWP!g!4RpcvZ4e&8#yln~-
zL9v@oe{xDTv`qYHQA2{csAU}+g2?jGkfUkBxSGJ`^dT;c+a$JuEAfz@v-P5=m|f-X
zJYAVpL)jd5ydL;-o=EBDc5LxHy=?m*>y<7og<nKaoy?sofS1Vy-E<3w0~@PqX+d+0
zY?>PfcCO_=maMmH84iD98ps<2-KxdUC0(U{`vIM&Z?lzp74lm`wCIus?wL5j>INog
zB9d!x!@Q$Ku&%RfSBKfI)Gyh++P8zP_wA44k4oe%NL_sy`@FeeWF9B(ZQWMAxTEM$
zSnf8bCu?0Cx5`69#6pR&21pzz6?x|Vqu2Q0%Z-h3m7Lufb&kU!S)!yCS=e%pl$TnN
z3(|J^?G_2qH5}V;H*d^Qwb;DjCWqb!Uj;{<wK)8E`2)|S*<^xP3OcBVd_FgC5zqLO
z_LSoi*r2jjt0Vp^9xMZ^0iu%H<`)vA?ueA4Q*HnfI8cRWrHWw1JFe^rc3=vA`INfI
zuN#drcT<Kha6|AEzv@Mxb(H%g?ndRrsb&-@p24X_HD>VoxA@oBY=$L&l%44ci_G&^
z13HE2-_G_)N=YKW@m|zw<R6wQ+g@*T=A;}jN#SYJ613uaw@1(2wB<Jbv>g(0!=G>J
zG{~t(s_`I&6hZ%p$)yF_VDPAIT%W1~%E>cU|3pe@{C<ad7hCVwO68%M-UNVpkXffs
z4v%QN6;>51{K^O=59hH^XQd0EFNm0}$j0s?+?IfdyJ>rTz(%MkT$xHbZmJd(pZQ(J
z{#31w)LQyD<b1>iMIL<7Ke#)=!=)0s$-srmUsbl{kpTCNx~Dsg@*#?eq%68WA75{T
zAE3)~Ti8l=;HYZ&urB}I<WW%`GNIna2#WDrs+ZI_U)>pDOQV-*`by6=vKW_iu&=en
zBW;g@s+y7V*139;lg@@B=aTRS9Pd!!Bl~BJ!WS>->jjkpOnpKuiF*QS4U_Aw!|~4<
z$}W~kOrzvcaPl^mdzfR?C`Q>`82xKnS1XKFP;pmlheunM3w#I<TD#VdvU%<Avqy9j
zMq!9E<>ilyea)kG8^u;mhMA`gU&_o^_!g>U6y}VRzojGkzba!GPF}F`>dy;YKJtfj
z!MOWYm>XZ%ah1(3q7}3~p$iCiBgzI*3Rvt(t>>!(;tVyTKSjbikmtsYBC%nSGmM%J
z>fdG&9Q~#ce<bnE>cmn8X3!LGuMeujv=5`uivK-o%JK9>I$5D61mCa+5lz{^xhMbf
zYG|vfVe;%An_4ocWUKvvL}wa%Y-L$lQaiEH`4;R{o0VHWH&F%*YRy~X<c?&7?!vua
z@{Mj3s}Q(@!S!{crT`R^FNEX5yBp0y=zKV%Df#KqLq|I%Qu@=KeH^fIcNvz|ux3vl
zsX8!KQWIz;bN*q)^P95){8C=4tyCNzLl7ir>3GFm!e3d6LY*&IM%DSMX<>*l=7@KR
zM9kTky0*lu3v={tE_5Q1VNYCvL%&Ey-SgV_kv-LOQ|}4U4_jyew9v!;_bY0cj6iyS
zT0scI?T(QQ#)|z(p1ymvZ|GeSISlNoO6s-80>P&5GM*vlRWr7SS*=>Lthr;#W4?j?
zg1gjNEsC=$%O!!clbm8MBl?Lia4>rJ<Dj|PrL^*=!-=3XQX3QEsgK#TF>@{#LU_3)
zTw6DBsV-{O{A48`d_T`~U;kPsZ^!5|x5kd${(Ycve;XYNQ(=-s5db@s`-kpr-O@&_
z=k<=qu$52c;8n`>HbrcHI*<ihsqFE}_2Kbz5R*llcanhCT2kG-_$5m~otj$V86VE^
zk6_J*7S!8Z0H*VyRCX!W^hta6xbUO<-c6;2@@heq)MY{v(C}kir09tjgMhV;jul6h
z9Y+&-Y~Jin;@RKZw728DF6or7flTHO0&zD-MBheD4cOzMf2}Jd1DH8CvT0k`;+(#_
zBoK8wMJnGz*5z1ORZU(&Ij=QQuc4?cajBU$to>tpJk$>`i<*P99z0^1S>-Z_&gt?H
zWa-9`cx33iTj$&d3Tw86+0JOWRx>OarnZEUWlkB#YeeK9KXe(*#i3vN2(-LCbn!Ig
zXzpa_bUQYaLMY`uCt{GqNbU?A<%QrYwnDJlKH<EUjkOYBF<FQ{N=f{j`QA}ncLCLN
z3zT8GYzpzK(PoOdmRJz*F~h{wO#55#p0c%<qpF)dnCo4fBV~WsFx|u5Q&cFdRrNjr
zoKV=?hS;jnp6*i*nO7V$T|L2udOYek-eIG((k>yzkmJ<alP;;Uee&Z=qXO<7<k@D&
z)D<NERHeCZP2Gz%NjMA+VYMv8m74UPbbl~mhTg+&jNZX7F5d5J*4i;tg2b1UI2)^4
zKp+oy=l2yt+R<CtG9NuvhePlKRyh`2N*b1bxa?Zpgi>QQ87lY<|El!mfn)L+#JT<<
z5cjDzHsb@>a|$RDK&d0ry))KE1Kn40A6(KgVYH_4xjv;a%uwEV_^Gyyar)s68hdsf
z6Re!$9$A&$$FGpkIZY|1xiuHx9w?RFMU$Mp(fEDkE^5|>Ze`@3dsO@j8YOE*+5(uP
zLrLGY=PFP)*joO2{m_*er{YsPT<RSq?ZZN+5f%)U-ENxXL2wYhpcH!qAi~HYF<(pS
zK41h>a=m;aGD!S7S07MU->l|8I5gXMzxvSJBoWOp4lruB66l08y#y`pn0j0rNveWr
zmmN#O05Vp$@=taWueQ=DKV$y*30uq?t0wC>=iyq55-3e!>g<~-!+lj^oYGcd*k_^9
zP`n6}M<>ne7?6egM@*23QSOp+Wn0y<_S8TA9%!fp6l8V9M@CF@y^Av-h*WCbps<V5
z*b55;Drd6l|BT(dbKjACY&EHH9kJ>+8K64FnFiiF=~K$1w(SAUn4LE(maouWb9^m%
zI@SuR&Kx>d;dX9Dq7%Q(CFrv4jjMVLhqOeAQ?11RMdg>b*+=j&as*(TF}2N*AU&Dx
zFxZ!QI&}KKPdCP$s}EK?FS<?#%i<+T{b}bayE{?)*rct1CfgPT6Z+mriWD<7^D4a-
zZOk!Q%{X>`rZsb4lfb@e)dYyQ{{)h`nTM+;xjL52m#zs@(LjcYD`5(`;Pm)n4hbu0
z*t8W$kZV0A4o5jbl#($2rd-`e@q!aQGd_H8egcIkHM>~J7raS?boLn*B^3<3s7>@H
zBZqRie#ZJFx)+$NfeOmyW<`|JUeGBld?<hub?lhd{10;Z7wPI}hc-7*6`j2(Ma<}b
z=5kd?W!o<?S=lp}W0#AielegZ07?_1w5-`xUWjcgmBBmvws+9X)YMj^&N7T-#t414
z8Ws*2Z&gAvq>Fg=e8I>{L5Vj4AtpAq;qd{oV}nv%oOBm<c=M?aK8Gyw_)e^j0DE|N
zxU9C81Dk{h*PCA~BQn<erf2M&fI4fGED~CjcXsB(K|5t-;2BW>3#F>0E0+-%t~bfi
zN}7EyrUWg1Ati$8S?h{=kB|$c(*I<I{m^R2;LwUs(JwR>C`bxbWaL=!f3*UhOE3MT
z6921v7^ot>{j^_DK0#R4=aNox^8tz%8Y4r4>KC5kg7#%=Bs#PYd_4uK7t*153qtiv
znyK<%t)b99`r(sVgZ_z5z2IS?fD;Cx<;B85p_T}=55Qk&;m!-ONuj5<=;FK3Bd32B
zc#@Js`(W+N`~F`R>J3$s;Mem1YQ=x98b#+Y#CWMxc&M6SF<f2%RcJxt|5x?@IaLcf
z0~(%JJfi^qezVoka=U*&%hc{8hvQ|O3+ORZAF<NJRDl=+>fZuzDSc@RSNdP6M*;WH
zv%eBa>Md&Rt0Hc211EwL$%_^fUEhyV6rXLPdmrqS3}(+4(E3Y5qkcV2y-Nar8zR>%
zY`!0g1^RnIl5-C`vV9W|q34&#!?)@z)5Vgo_C!s7l0nrJ84w0ZFXvxcvn(=<A|wTX
zh;GH*pNDTiUq2{KIedTf>({>^;=i_=AUeh_dUh6kL(!iX<|g|YYF1doxyr&XHd=-&
zbTjM{m(jko<lvuBi_L17GA($qhwY!w;+MLVa$jr`!SUx3hR^ZpC@*Z*8~hRKW?k!x
z6kqH=nh($C3)}L=nNa!Mz1va2YWvb{XP2$AO4D*sUn2uwu+krmB)2&Y?NpG{i#ryk
zF~L-#4$ZiRh)~765aiGt^*mj{4^Xz8^ZMI2k#^`5#Lqco^M6s%P-1%XQdJlWm-0O2
zy#?pSE}YlL6+OdPeke(fl2H+M_+tbef1;UtUvUC9*MKat50+z=W83CPy+~R9*R_)3
zTT$q$7p%|}4VLx-g)(?Unnh!kQYGZHEZJ)V5O^C5ij&)Fdt>8c>!HiLw7hZ0V}Ib!
zQC(rL-?A{sk6L2R1LuP@IT>fw87aYOXq;PqdNzCsE~M00>`el2j)x!fSb7o6mk)Vf
zpA{W}Zw(jJSFG$74wCO7U3thC<!dX=zkh>!Viz=}grk%79OgVbU+Ki3JQS6pSb~#2
zfciJR`G?<}b2cbx92~hRfp<-OHJwd@%#2MPQCk}37?x#sdQr=)#bihhX%C$=Yt@L-
z)EcK5G<6PoQOfM!$$Uuoti_wo4=umv%J&d{_?hN=Pd2s_hUh@MuXuJ4C2!IAwcXz8
zy2~}b9yiX)ZZbdxq8eakRPN9eTI49erT0stt!4b-EYlF|3kkD5UbIk6&Pr$XU01nU
z;tWq+4GR{-v9xJ(HE1AERN4lhlvsnBTRYe_Zr$4Y5<I~9*GzUA2kJmtOE(*>tP)|W
z<HND*!a>8)634pM#^o?P*)=%Dm`2ZGwVf-%g%$V9-P5wh<{lcSKgi)LP=4-yz<{}=
zlcsLyU|!KYT(%sV!a4NUX@#GBQ3kBBjZ;!=W2kIhicbw1UD{;iwUH;-FnDZK2aWp<
zF4Bga;%RCD_mY+b(ls{Vlz+3QVPH=aKy6b-@Zskj3LoO_w~Wyb*#0wx%xBKEpU4GT
ztqNTyV^BVk-`=(tC^t}^bgwfkX9Rvgk>r?Zz~<QS${G#r`70C)_DDtvB*2bfnm<Gd
zbninwiETXGQ?ks#f78ZiA@QSjl~`dL#Qx^(?cm<zQfaw`^^=q1Z%&LWlVMycw8!%S
z7b{t}`&AaO1rN%pvv&2)nJb9F#tpQc*7Z<%a%_Z}P+5H}4)V#(6}XGS7X!6acJQ^>
zhwuRBb+1!5sOpQ(<k{Tfc=iWEyI*r0cry>4*$uY!gc61lhb#2HLE>m=OUfjJKDfo9
zClx>M!lpn0t$R{1?lT26HPTzs3V<|IB|xj|qR1!mmRrT$MLvM8Z`c_*bm1vSf)+45
z;qBh^jS{Yxxmo^BHtM|!ow29c8cq7;k@M+zn`P@TTV>2frSk!P?b3p$4)2{?S&d)E
z+rp}nDW#}NC2QfvNB`fg&APHD(~RWBOLCL%8k$!A{v9dcGHQzgZ)*MgNw%l~`mnFf
zf?M20g=$N}tWVzmsp<VCpeK2I9V;}LM|)*gIeBm@;F=_r3-CLFowG0i$K0_x-U?;z
z5*h`dk!L`y7;qRj*2nvC%xGs$!GZSOcXNCM5iLP{HFN$s8gd~YR@=ab6R}wIn1p&(
z41Q__fX~-o;j9=VMA~uy+0Qh%@rW_#6g1=y!$&@iQE)=|2pBO@)mI<pr19sR4ca2V
zmy?ZA!xJ*wWDv-zZF@YN*n$R&35J-BgX{v89~s!-AV%kp&dC@7={mL3eQbnZ93lmJ
z&uwpFgmCmLdj{0k0z-C#(Iy3v-?EWwl)fKtt9(PZG;eVfpGmabc9ih_hETifw##Up
z*QdEP&+xKPe<&~#>f!9epvOX&1X@k{F^&1~H4jRMh1J`uy!Nyz$;a#i{d=yV*7sa}
zZ@$O@$`V_8Ged{)_y^M2V_AJ%-wyOI7@<_J4iRPNr7E$Pg^Enp(U23g6u*HJiOewQ
z7RcvjG^B`}Fv~>8W6xN8xUq;{G?Xc?ZBybPuk6*MSw-Y(){(sa+`W$SzBXewV0m$q
zzvhXCjXA~Dd>n@}%hP{h_y?tr+kPaAWlfL#{b*=(0K?Igo)WmEMXb?R{oRMJjRxhC
zoYS{m-4Zz%aA>rH>OQT}xd@hur^f^8@ph(E?b%9kbGLVMs~x00GO!db*xoe=1uMJN
z8yzM(`jm&suy-YLnbM-E5-V<-iU(ZY-#8@2?_bk#E&*9k>tROJDu*A|V?G6W!vN2T
zE2m@9s_}y#=pVgqV1Z<ygnb6Ew9yfJXN%eO8hG44c?kt4^r0FO-*}EnbbzP3EB;fl
z&fY(r&#k0%e~J}?E<*yO-soeyU0eYg?SD9MBNV08r--(V6@v}-7pz&SU&1le)q}ev
z=&`+=9&w`_gR&|w01r0QF}Q>jYLi70d)xTZE;hUit%^-4S|lOXS<|NqucA~(SGM|K
zC0WL*(E%?|%tbW5e}~1CswM<vWO+Z*=IpJ);UkBB<z-Ak%S{%o5uf93;Sk1vv{3mP
z<4@e_!Z?oXV^t|x&-a}gao%seZ)vmPu|B=N3yb)RyltQ{q4ofXT81@sTt=e_Tmxr>
zx*fK&@ZUte8X=W4^dlXxkBJJAPWxfD5btV85fdHG+9?jKYLf*pKAU`?EP#S+Y!(6S
zxLX@b4u7JtT*PU+6I4>w-HL^WgNHZ13XY47=72;!MYayC#}*B%6n&PLO^8ac8f*a=
zhBinM88gO0UF`1PQ8HRs@7cc4$ldG2W`U|{)y7_*u53{|uybXjp?vFEpx{SL*|toN
z?8xKe*2P+W9tEL%A1n6kBq45jKw0Gt5`ZiE6S=v(KMBZMc=tO#LdR+fXHh7#ZR5f&
z5&tp`d5I2*atgxb&^ET==Ho2^(Ln#K`O&?s(I@gbS*7J=GV9B8vqhxs{q8&~o;e9g
zhgy{`i|yWayPiBdxi5})XrSqHvj>Uq-4Y`Hs-M<BT6#FA>Icn5;fREVOa%`+fLmN6
zBq^4lv`IHnB`!`hky?5k+GI^1elqS0XgZ!ht6XVv4MM$3Gj|{4)=1s|rg3$}W%oOn
z=~FUIO*E&)j)*$OvHt5dJQnk*>*)oYIc>a$X2@(vuTOm>gS+m|v2;>txoE}${DnxH
z&5ZUwXX6n}(W(!n>=j=$*m6mdt}Yq!^(iH78#SWzLMS!Fyl<X;;loh8Z4>GuRl#`|
z2evvoLMX97{XjX}s5Tn)G563BF#@<-EZJdGEh{e779pc~2J5P!wu#AX=Uuj8!mwt>
zVTGPj*e8DT#=5}*k4N67q>rbY>!sRqYPE&Sbnhb6N%wMP%4~lF)%?yYgE0{Y)_`t)
zlx*Hr^CPb5Z=;Vbnx4R>hH!JHh@(&D<cu*4_x(|o9Meth`|Y%xGRYG)i!pf%7S0m)
zePVO;a6(Hrv7mrvgY1G#h9$Yyfgv53rBmd|dGfsXSJgg}7FNM=kcQ<-&+fMYVRpV2
zm`w$`hfEblf$sG11HkAeQV&j3q-|{@_m1MLl+oJZi<`&hH)4>~a$)X)ReTL|L){_s
za;w^<#&<V%da8sgjRJ2+X$_g_oC+G`Qh!MH{p`W1o#JrTHxMY^3G7Fdy+FeIh{t$%
zMwBxShZBgKX!y{Lys*mDuUD(Clsj#dYvI8;dPguXc;BZe*#&SZTx|OK_+9%F+32g3
zGb`m-JS0rGQ~)8%L%8i>O?%9&4_3ll^q0XK6QZ5{^*Wlp24#DE!)~S5D%6YA)^@96
zkWfCcdc9IG=D4Z$h3+7nVw-2*=YS?f#eUD?QarX5tRShp7?}zZP@G*@M9hQ`tFRZD
zz=U#I!)irkTx~9W=sU+f!@4CUjStOdqteYK`T`kMJ%h+yJ2SI05W$JmVOe+|AG_GF
zzg2(-A&wse2GL>4kEf@x%Nbl9014l*t7LN#92K;<nVtgY9m}pIL<MPZa^3i-u3t@q
zTg!+e?udO2NBpI%8lOxCPuf~ptxxzqQXT!p=$(uO$n@JR!Y)3Tn{BH<#p^C?Xl_eE
z`jX(*p8c$e(S7Ctp)S2{zJSa#6=48g5&$-UaCM^~p0N^i^cxv<(mbHbBqV&suf#G+
zCh)f_G(xbpS!H5`P1zX0!UdQ{6XhQr*J4}Vgdle0?a`;>4`*MKjj6y_9I`=1+`uP9
zmI&^-;G%qJV15k6MB_Y*4m0Z%P{$fvrpf3)tCg8sLl&t6t2$><+Q5$ft}<Zw(VukZ
zz9`p}9Ey8npppOP<g~07)IAFkVDBpiZ*eH|AjQ7o(RiBFd{fM@?47GU7slVnDVkZU
zaRkk;|K|ih<-;2YXXrjhyK{>;19ULALS9ZebfZa$B(ZV~(ERca777{N*I5gHy%qoW
z|GjmpEBf}&Ov?FN1}R6|pk!6izv{*QSLTI<0L_g=Z8N98zesm>pUbHlLrMl-=0;@C
zxsf<yP12_qBxC8hz6=zl)bP&{$z&;>bGJYK%50*f1TgaiWCSj^(JHeno@JseQzF+I
zdYXn>eVz5;eB;5yYVyjQ1~QrhV1a-#{cE<7S+<hp`PDLaJ&RUlnM;Z2c4&HGlBdXu
z-k%0t^F#b?VT66ovo+d_Fz%So$@U;6CJ*ymf-f0jhw)%b3AuQgzO!NdK3w)U?Arfe
z9T|My#4NP)>9r40@hTRe1kR?2z1c@eB50VoiwS!{cpWsDBM~g9{hV~E#0$rwdxs*>
z<dNyyKUW3)r|$0g!z-xL8c|<l_JXkgkG{@JgA4P#w7Yb$jL$matLS9Ejzug^BO62T
z#(;QC|C<ePe=96!qs;IiSFjz3FNZz*y+T8qy-p2HeAvVkcMkZnT((|&+q%k|eMnk@
zT;WH(`z?pP4huk`0T~^B;q_2W7tN5ttoImc<kxy~D{sCFb8Gurq(cP@eG)-C`mudN
z3(CX#^&PyFHDGtkRvc2);$B#pl({RZBIzI%?*%@v|7I8`?Z&o|r+F(yN^*RV6<pZg
zhZMO|S7Q1SKc-?rJIt~pl=%2^O~#a-O;+Oj-V0J72s;l=^T*)=`2Uy5|NDb|ER+?L
zVJNt~uzNIb4ye)AbY!BwSZ`7oElQ~67k9_})101PutR}bf`#?2?+f4%D5!#fHN6ee
z@{gu}sI`D5#ZqBr#>Uprmz2vI8s=hSVs6^1s#sODwZXJ>bPpuQlrKh;-G$A$bX-HU
znycz5RsT(UM2L-zZ8?$i%_Lvt>kDyrLtr-_W44uwOG_P!Rm!DvfXY7jK}AJH-6gPW
zIC6#M<sb(KhjC&2mKFKg&DwdLN<^N_@|ES?{p1>Im&)ZgiM7c_`T1$-Op8@x4;u~a
ziORoe&a}=u)vqfFcBtnYt%XY=2MWax>=J}i1n9el(Bo{ETbOR?au0GiiU<MIJhHG5
z-w;eTtd41u#d@1E=xf_1(#QzF&okvZ$8CKD?Kk}Z4@f_vijwwvtJ`M1dGKDfGfTlp
zlU~|y&t@L;0l}4U0p8Y$Bksm@*Fkfa;fw!#7r;e_d#zTH(>3PJn1dZAbs-~@!^S(6
zMtvh>N9rTisoz8};uMp~#1tp<`yW8Fi(y~}M=7}X<@+6M2a05oNl-5_Wq!6s0DUr8
zWB-~J0*Kl&T7;KrHO=VJlXeB5%9zNW@G;8x!l9T#Uv+5a$*rxN(=s8?IbJgJgXT*&
z(K17-%@seA>F5}u<i=AumAzx!!LPGhK31Aawj@{oXlmNOW&al+0YxOMk}@1N4Lco3
z3oqKR1=O>uIk{hx;TR83TWucuE44+n&E}o3kJ10#IIA)EgHdNPNu?vv=JBu?`B9jg
zA?nr9Dx#<$2sHTf2nFm}UItnq2<{Rs>I@B%T>dibzMe6@6sEj|`^sBlQWc^S(^%M5
zv}jWOv(YM<<+St60=(?ZFzR4Tw(NjM1kJL?TWV~ZB)81#blppv`p)=U42l=D)9(_=
zp9YI-n__`OB8DAMwon%~B2Z_ZY!+C5ae5`n!_>zy^SKeSZDl*iSvM^CB}JhA4Zn#)
zdpn?i@U&n^OJj2TK7@0oVOoR0ZDCn;l2wv<Wq&fNJ!=Gx(Hg;7w}VOyUx;f(*viro
zbwTHTF-Px}mt&{dUY?5zu^sx7;=-;r3jiJ2(#|59Df$4DPlYRATQq|jO052lUqdsf
zAf7Vj5jj~l?7>4Zv-{QHl5%7^UW>*0af_8!J~<pfXCOK`M!K^d<bXg5VQ$-zjWZ=0
zWN{$vt=Dk~(AQrex#f7<&3}?@c2`BfR?#`EX5zryvtCf>`=d~uzZHlmBw)9L2Sq!v
z2;r@!0wcmjgG-y4u~+IdR3wI_%j(C#@B&99&Z&l3Wh;=F`W(UG4G^NY;=K7D#2DjC
zna6ebr8b=@J1=u?m~G48n&rXG1&h^9?0pi~m{PKaGOLiy91w99t9bB0c~*3r=OGSX
z*bPzveanfwkH)1*WQ1ry-N3<ZdY>!HvthwdQIf9{)I9N+IRj9AD^#f7Tsaf=K~~S<
z__*lvJ^t85;;bfL7ZG~`#3KFlP4h(f0!o#mhA-sy&0urqFy9wXt*~USoQY@3WLd$d
z507|uOro`yrrO*iz(mvi+mY?*s;2P$TMA1*X7aOkpJA{Owe;1kT*{NNrK`+5{U5OY
zU6Wz*zGeg8$qJ807J)HaXw2nO6HXHoA<Kx?S+@k|JorfOVPL6VhzD$gc(*WF{O~Yr
zKB!#Wg+2+_)N<%SeN2r?ydhmN{zTg5YVXgZ+bIYd@gRT5Gy|4jI%pZaK|d%N-o0Ud
z%1ULc$NAa3cFCg*HbNyiV5~luPp>uy*#D~Rh|Eaii7<EOXL7fVg`CN4xM}rEl31@j
zNG^SFO|>kOQW@3WfJ?B!jg3D_Y}xHF1d|vIU;HFt!C7gv3nH)>J;5`(UP;$F8d-MD
z;j!5vvIyRubw&637kz-n2H8wBG}-Hv3W_@Fd-tf0dA&U|r5f&n9D_Xo!*;LN7C*@G
zhVRd#9a*FMa4oJ7dkTT7u%8$#ZcjtwF<WJ>?$T9eZqa!F0y;IdhkC(ctl8_@1ReJw
z4_;5t+`-q%(w4Jr3Zw1x+GsXGGSZHO&${Ll#+&&RpYfq$sZ1`58RqM2BV`E5VKxKt
z+RQ9R{oG((<4WQWtj#$?jisK5Qfp2(U87@A>r_m-RUIuoY*zSh5=c+p#R{)M3#8{y
zbo5<bwl%NO7T5qVbX0D|ESx_;WM%oD#!7&F3q=@i3#I2E^3R*4{O|aPwz1RaKXGRp
z3gh~4j!*&?nji1hw!kzBdCPU6kj!g>5FVjFU)419dohuHt7fUP`8V0UHF>-CK1aG9
zzjh7x$sk<NZH7GX<hg9&_^vI07#%&GO=DH+zkwc79KeaW8jCVADVxVy;VeD@Lf#_7
zW`JX>YNG=&t5kzvrx3YLyLPtIWQF`YeLQ@DdZVDGaj-+oBXd&_-G<CCT1UY*%FSD7
zfyL7J6|z0WIJdvOOp=^ml=VrD_v79jSW9xzLb*;6@b<Q>qV+AP(xlV|b*L3>*1khe
ze<}0op6r6s)8$93QNJ_O@5jpJjK`IQ{5zrdKpv0FF<Z`2<XXi}!C_UlJjN=Iw|b5u
z`fm!2_nb&GJi455jV}rIIXl_LHOk)_Dl&iV3w%p76q0wG9Rr%KZ+Fr)%!hs($&EWr
zr$0WoeLzP$3t&9ElU``503Pw{XDRMuxn7w?=K{#V9^0?SgjPK^I8P4W_47Qe?`%DR
zZ9zD0cN>tnMkJ{@d=qj=p<iM!_0X%kgS|<%;1;K;vvo(2MYx}R5n!!-JQD*r^2BCK
zp@gA?`y)O!jA}T~sz$am*Gzno&<WNbE*+lB_F~_O4zFr#feZBgZQCUd>HG#I_#YV%
zG0D3G*n}x!OIU=rgzN@yW;CekAIxDtbXZW(xE7x6IX$BH_pqf%7sDyXId{d?g#Hz1
zvM+`N4@<04`CCV{+Fh@4uvK<OJlfq$D>OTEu!#FG{~*ED3}<BVhlJEteEocs%7JDx
zz}STWfUEu`mLz8#5KDlK{1lFiIKj#@pD2XRz;@@s={mwpgBJ6orabe2{$|h<9dgZK
z24beU3BH(O!NVft>4p3BXbQk%!{l9Hepp=Fz^KmSjZhe-+3PRBGkloUpOIlXs1KNq
z#wQGdw}%#x{XBp3bDwj{%Koav{`$I*eGJTR_v?%W&h}%;Nhj)pmX-Mlxy|HHrKaqB
zY7n`EBfqla2R@e?PWl^udIAEe5QxY{fK&SEL$(eiHVf*7H((5R-ax{?o64@n`Pn|C
z@%^NZ@!_C8+7!-42}?7o#!G!`M@_Jlvx|DnNgIU=LNbW`^s1?86Y$m!Ii1V+duN7j
z+`37!)J@MHh2{yN$F*(g%JRzYT*U14_X^FxzlQ*38u6|}VKJXh6+J|xYL+P^e=0ER
zgq(+aJP(XjQrnZ8LQ!?B!RSf<>xP4}gyGH>cmxlKf;o_$c8#sftA2yI=_f>2%*VU)
zJ7Jmp8;zwr@zD}kurwYT>fGTEG~m>S1?gZH-0TzgB9+BRTgrL_*6gvU(7@D)!~twz
zz2~VX(t;s*FH-zB3e&(E$%M^zo}ow$E5<}*Rc7)5S}p3o$kcENIo41f`7d<EoOZnU
zz-su%H>yr^pul^}a;n{%<A;`!C6ZZ_fubxbkj|$fNkKDEOwieV97_#w7arKd@248P
z3Wq(KzJG2_P$<c<G#c?ZI(&_nYbarm^I7RjVfZ^y+Ue^(;{Va!TSry7h2evOba#q?
zpmazood@X#>F)0GkOI=((hbtxDc#*5NOM4t&iT0adaus>*8HZ{n)zc~uCw$zXMcO|
zcjx;&?|ybZ<V)*R6pK)^sAEpl8^rG{4sF4-i1n(<Y9A1Mp%cuvx~Sfrpl7d3)-KU!
zcM-Vv%8;(FG%S{PBbY_gb4^LZ5G2*%CbpD$*5-fW?@H%$3=GlaFv?yt@P^BV5`G>8
zuN64@^x(#mLx1E6l${U>BC9dgq9x2qgqN#j?#(7m44A*;ZX~+4TN_gYCvK+-gEy`J
zCS2N2N<xZ{nI)rW>OxqjYCg682M>#e-`dF(Zsrm9k+(db^~Q=Daf>88XfGeFf4JsI
zLMyg*8`y;WWwGtFx<ekt6#`r~mV^LNTfeL&o9Em<35<vx3xZj2pf^2qiVx$v4?jqt
zRyqpEbh+_QsvEE{q`=qDDTY+t;ugE~$rND4skn9cP)=c8a#$~(eG90*P6}*<+jt5a
zLKs&%AczfL4_@UR=B+gixv9HKG0?;~63nQ}F+t2A`@XIg&fitfQpqe-Yri46e@lIn
zpnd^PG7LdHWfe^{3H4ql8=W)36Vjatxxt$C?S<SUbu5!>ojM)aJq1wQ@XCyR<0kyo
zQ#%5ax}Liqw|pknem0yJd50Lrp!cri2*(Ita$-x$`DHbopO267S_<wsaSV4_8ff;Q
z7M=Q`X_gUU<~fzH5*(i%kDkKY(y|I4sxLCjf<!;deFLiiXedBfta_C$J`kNAbBN+%
zE*UoxDPks*E-zUxH#&uH8crrT=}tDG5)VNJJU<c6Q|d4p#x{6<*hs`nKN7>Yc7CXS
zVgfqFFh+?C_bgv5hUE*nAYa8&<l#t85pzN4SeSAeuD$LaP&odX(O#jhq?8;@%|3qA
z<q@C!viuI?CqDm0z?ElQYRnM6=0qLB_dP<i661cQP-))~wb->dW%fgg^Mj0TGJ>X~
zMUxzK5GctgFVslRrot#$-dKZ_$tAquC03J&)TGAHOL!M*-x#$8f{i#66c^Go5Q=Bo
zsE)cW3)I+9@Q1M__%`Q7A=0%_4fKospIheuAZgx~A;_|sdj0jKG8dj`eQ$h`krN$9
zX!F&kQz_4UwaJ%uC9p8PT1tc^**n{dh+*m7XBPOS63A+MGoi_KYL<&+Dg9)q$MSxb
zd4cbdG)WP)NljN_gVJvTRi4A`3ZA2|B1`DZD&rT))oO=?0M1KzSsn0kwX?W{0qkRZ
zag!n~Lxa3=4KlnQ?!yU@;{&uB>~o2^oxgD62qo{(Rbdm59$5M4dWRAjy+**hOhxWU
z;HI~_l2_Efe9dpZKvov|(MTCF$FuH=vT6jJh`V#JM14(cPV@|Fy*ua!#r<l6hDyvH
zy^U&{*!Y{TOZ@L&MUM}+^qgHBVn(R7L{th`#d1RHwb{_EGjm;qFAudX+*Tze?Y^_E
zsrNX1b;Qyk!TqHzVt=6T-YQ}Jpa2D&Kni1jg)*77d%iSOGaZ0{20C8tkLTwd<>(55
zXG^n`;Io!{a5HMri3&|bgD!b3=XYR2R|KAo_iC9@p)$Bq8Q`8cTrB^<D!4c<@8O#n
zQM0zWsI$1kXZORj?GbiNUccA7c(^#yUdO%HD&ZsNE1Y`%WRF<6v8y4w3|oI2akWBi
z_F=xrihf+eOOXFK6k^a}DG97$^^#b}gdOcjyIE!3Z%~67<cF)SyRcso71!Kf8P?D*
zL{#8>H^6KAS~)wLq}S2jP96i-P&OA`MW8RJE0ZE=^#o3@L0!d@0+ltMzShoqe@(nE
zTNM!3d7MOmF>+hDlREm+xTOa^#6ADj+c$I+xFo|;83iZVapAgBU(~94L^;b0&h>{9
zUt6s+L_^F3bvfZgjf`&M^tiY#NUhWcIcI0*8_#1FC~uCzgY;V&-Qb34Ek7nEciRRH
z<Kq`FysQLn6<@KLCHkeFa9gBXcPz>41xd#1wOk*hV);ydh#35dE*;d{`<e9oPTH;$
z;{DRFE4uQhWzGd%9iw9#myrbV=0<4oiY+zTfi+=**CI<D=lr|f)zQT9EjpCvGXoDt
z#l*Lt7}H&9qWYPhzvjq{%$$3T-Q|gQspdHb`t)EF4Ck}1H$N!5QcYHoLr=$xneStP
z*n=a1JuuvGQ#bUzx=?_Kl(DXo@3Y<tTQJiOrR6y&Vq&^J@yW}CQCn)oG9cOurnG7^
zcyy`CDn0ecX~gIb07s+q259l1ujXuUV&%u@!=`Yv_2(;%O7rqch|xB&bvjNeyQKg{
zx!kbvj*G5<`RJ(gS>nz;Irh9DR-$>9!vs%;xdJ5E)~dM738spTSOQkMVFF!aD6jK+
zUAb}?#wzB};5>>i^<4q(6qW&5bjPobD~*)8gK{3;YHVgyu{v!M9)6(*GeKVok&(vv
zr5R>>W>cB%Yx)EKy$SQR_Zrv?W3m7KE>I71wHeJoAF@y*F8fsqWJ8FfRA3ZSLQ;w*
zPM5S!_L`WNW~kJWt+-oXPD=|9kMs<2tM-x0{x=A1M-3Vh_{rn^*3E-MGvQMv0v*2|
zGYTOKC8nYvhO;9&(#pmO<?jhFeDo>Cs=6k@p^O3D9}%%XJmFx)08pWo@^*$`0qb=J
zgte_WZ_Cz%KTs}#3QXWkF_r3P@T)m3ZUU4K&rMVIUi%3OoY&iJ+}?Ef!Mi9#xBemj
z=hI1<krYf{M%M#ptw2D4^<SBR!c&8wlMDMgloJG_o_?Yg`W;yv#R5<^6Q)#J#y?QG
zD?tDm_SA%*{{6=QU`-FeX5jOQ!u3CZuSik=eEZ((B=-nv|MwSAvHJJrU&Y!v^b<Y_
zbYPBwms=8)J~SniNgR<tU%BewPe)f?xk9;bt4yhhX4qi8Z>j0f;xtLMu(m!-L6s{J
zB?D#T<aC#;D3Ed&MKn+XU}plGvI-wY->heLK`0VeyoJvD#ofF1@OcDobIITkfx^3X
z)i?`iCY`eDtHAL7*&={8{p)1+9VktkK)HAg0VhsA%DT5wuM5sAGZ2kL-4<UH^^d?f
zA5HABNXycoBA!1j$pV0t!3Vy@e?sPw7QkbBX{F6Sg8T%c9*-*<;%g57iN<R_9#^)=
zq6MT3elu5aC;)7}Xj(Hb{R5Nyo(w$J#8!6u!{Ty=j~M+ttg6Ews3{PE8f^ZvNwaG(
zuX(=8qzULLCW;?VwxFP#b<)`_RGv?XDF54;F??1YBU2OR4CJIzI7$*mN+-91+kIh?
z?UiE(#QoX<U)M1kUZsAEZGtuk;S?77rAoiD#@;eu(p}_fNQ{$G+c*_d3hgqK&j$#n
zp^~HR_-PzKv3UMP^QTs9|F|uR1sD`HtVevAUQ+Hn9N4n$d<t*fFMh<A<)lP)T2hp3
zFsX&0lQXG1L$qO}XMoOuul8H#7%bRH^$;}q(}2E@bcQZtF42oWI&F(E&}olsXVw0&
zNro;Eutl9HSs3u=7(05zmjNb7<<ABt09q1hOQDGT4||Vs1NJ^eb4mR(a1H4(aLu<N
zc6l)p5a(+Gbh~=3R+``1W%cxcF1Au^8Ud}$SK();DS-N2lRq+kV_sff8eh%G@5uO=
z#G`Pje<<P?^_l@d?sBx{{(7G<AxfraYs*+wQ88x9)^#&Zb!n-=0oboCL~)SBO8~Ug
zFIr>yaiqG)F+{V70U8sJ3Y5+ZX8G1u$MFmrOB4}2>xprn1_24dJ>#LoZvp6}&mSbx
zMcb#@IjHU%iF+@O)Yd&Oc7hN2!YnGSl(Hegt)plCHf~OS9=aXj^Zl9$=|#;A78Xmp
zs;!4Wz>{>GNbe)R?6}Q}TULD?_68GtI0!RvW520<vGP(50LCBn_#klwWo5E%XrYLN
zI5fvNclahccOc)6j3O3JJ=<Jv=N?^`+adCx4KQT*F+eGSx1~s{W>8Xcspe>~#K&up
zZhyJJ2lp}9Y#~(^UL->faE|&82Z~nv!gX{;7_ze>G<o$2FS}3+blN<_)u3aq3oPf#
zJK_MbOrXa%SuNJOC1eByz;PP(VQ>Q9m?|7eR69e|AGAb8{nKH|II=1$C+K!RXS0&$
zLDyviG0ja-PvNR1Wxxfjy9J6Yo9Su@6P5siY1UMrn3%Z+{*;<=_fGe54N+B4n8-t`
zsi|r8jFl#N%MS^WFnt<&8GbHjGZ#+q`h{6j*3}u`17fpHdemWoncwmN!<qF+u+`xx
zK!VFME$_8@o?hOTeF!E}iH)n*NoA=SuB%vV8+J+Zyj)()Z)9Orp?o1{2~duPo?oYJ
z3`a`Kwk?a}&d+9WbnoPobpVmcM;uyJMP=(@Z*Q*|y7l4yrU_sUM2drK1a?7!+LeYu
zs-drGKZz5t8iy`|FP5=`Igu`qnVQ!gg%;yXNBmw4e|fT<#BLEk8bi&~PmJ<x;8DFZ
z<*kG93)nM?8NK0T_LaU&&G5{rqo$))K9U|7NT=MV+TzB>g>gphs7ED8;+M@j<+@Nz
z+TpzC?{zo?7wA+=9ebZSgfdZmXtSJWA>D^U4~1O_IsVu*wKJYA%%a1z&~6usKaj;o
zKn#<AR5i+Hy)%{>bm~5Nfxs;M+FYRFVbMT}pVPvT|3cV7+1>D)vCCy_EyWLl=Rjmn
z0}$~7DSKgNP&dWiaJ6r~<Q>ey>Es&6dbbk7YYZ`j)WVg;qL(mAeyE#18LhhYqa9p|
z)l+6Hsw!JC_j?kLm;J3~n*APJ=^k5;#p!8#a&4C-T@$8a9Yp+IZI5GSuEo+?1Upd4
z9WE%ix>c>RVuWE;^QdiKb$lI@du)%R{lvP^!g0tOg(KiywdTsGhQ|K>>mFm)^~#dg
z{%<`ZYSpZ^!THGPvo>}9q`*00vE>*<Ynl*_DfO1*rO<EF)^f@o=qv3BKV_sl>LzHP
zVvn#4m+D2rI^RQ7j#9<WtDFO~xwRWO>&0H7m)KL>)ZJZ4^%(oUCbhaq%Q?c_DfFZu
zOcL7X1Y$>%4!?cyirohu@RRKGLhnHugLqkCL&HtzsJ~Nxg@5jvK?=!l1^}}91a0^J
zvgT?)47B<!Y!5sLW)~in=zH8of{y1r-5_-@HkFKJjOTck=p#j??FQQIsZZqfsO3ar
zhJG`noM}zH)2%MY!HN)iZ}1T&Q!5tS4h4Vd92L-h1ZYjVZa`(jy<PuA(d_fFqZ;TE
zuZ+19qr_i+Ce99+PvSkF>-vcdhvBr*i1O@BxwNzIa1!LrL3vkmN3HvrxeaqgBW{3y
zjtK(&qS9(+<>wIf1J=^EMX;2YOG*PKY<3oa*xx+{9*ha7eHXiH7k|2Jf=04&T}Qj{
z`6e%6wg~{ND-4WESA2<?@jP#9#SwG4)!V2NES=iiO&e}T?6B#z28UK#egff$JT(J!
zKW@juiQXT!x(&hD@I+qh*D=|X&U?i+&5!t1K9uqXG_hVBxHpgCjwTD*@UIh4T?{RM
z$NlcE*w^Mb<?1rl9j_*;&-xgO$M3<qjB`3WYw1$c1J$*@?7ZS~$T6gKx@ONguGurf
ziPkq=HLITdYIS8%r;d=98!`BP8;#V2-i1f8TkrO&KhC<oVo4wJOfQ%n@@&Q?&~6ji
z^3G)#*<u+04*~gv_g4g-c2_r5#mkT~tJ5=!@&SV`@J8aXb=|v#n=N9UlprFr?VleY
zXT-goZJW)j^#)NM7l&OWyDG`#{@<#a2$OZnuXQfl73!7_`NJV>SqnO|x<B+1@3x{g
zALEltP#G?Ife^^`5nf%#&dbYf2aC_j%ftpQtrg>>fy4L_1lwpy&3@9&TGyX>eO3-Q
z8Qt`AJuZibSNeu>RzIPGa`rgy&F?_#t>I_HtL2^>U8lrbrS*ow7Z=1l$V~LBTMB2y
zZRMU%RVT-6G>yPp;hqM)RZ&)LQFp1?SoYGuT2&fU8y~1YNE&R#(F1G!4v?mGNl_0c
z;hv#e=~v;=k0tSYQ4f9WR=4czP|x++1Cx{Xl~m%IGoWuQaz*e0MkhO#bzziVL>0#9
zv%B4MV?p0;v74lzPjw-LFtK;0P0W0zPdn+-xnlrL&#wHh2#6re?Tw#+5agC>NH8%{
zJ=ZZ9W2xA7S05xg;Q*tp-Y|^AxgB>O4qC4&8JAKdB7I*@BaebazI{JjsCfH{kK*Dn
zB&+E*Y5H(7u$p>m$Wqg6_cD{m`C6Bh`R;o(gE%S@sM^bfznPTV)=_BJXzDracZ)6O
znum{2dEOjN$VWO`xM#A@n+?tnY-G!vO%loNd}&IkA^kc1Y*D@VbuFA1M2l@<P#>ZE
z^lYyPS(|-tQk&xIiM2ITm}w7F>&AyUzOL2fOP>w!Io%JGge>_}$($ewR{pd<5M(8g
zS#~Oj<DLXGFF5vv8#)Sfs~^^TRqB~Y-j0x11|;oH1N;sB&jZFcU;K@#4*)pFZZ<{U
z4meb>tU<p5%Sa$P%Ctx%Z7iYTe={#0V-=q<k<f36J-b0=JVpMfxam2KlK*tbR;c4)
z7hrg%N6YNe&07L;ng;m1W<n7{i?>VeVt;Nf;$2&ag3~o>hwpY)ULLA(KR`LBM)JRJ
z*so=8lw4sSM&-<2M{SDdZ#F6PdPw^;-phM-uEw3{fWG`=or@4RP5<I<zs9rcFc*I~
zw{q?}Y#Tz@-@KZ^Pir@SPQ2{GS@_)&A?NwwaGuhp6ZJj;5H~29z<Bl=ZC+omnk1Km
zlWfVsb~gyQM}(QW(}jA2e8g8Rw1ATM7`*~rqptQ&K4MGqER7J+@b>cbZaN#%sYR#O
zq>#$w`HYbOy5Crhd2G#lP+8NrN%{0msZqU^IB@tin5_zd8Zq>o1$v&O6X6;lc~_Wq
z<9+2_K-+ehLbh+Y97ZwGzJA8Ef!V~!#rA_1T;=cP>-CR1Oi!+`{S50z%31Z2!OYs-
ztVNaaH8qCkd)Z~DL=P7IXSzZM#uVF+WVqK6_N%MF^{`{iI}L+UMfrI%!<w7+RthaA
zw;-l{vSK=lW5KOtEWTw;ug(J~ijexCVYLcg%Hu=9AoLO&TN-_(>Riq3B$2_ph~dhN
z&@QA72%_i>4QqRJzn7Jx(<;D13U*xBzGV^Dy`(Yj)0HEOb?f^sxZ>YWTJFW!HenA2
z$bqE<nVO&am#{uey`7e*RVsJG(t8Z70hD`9N0;}W9EM4RY6v|ulPW#%VSt=krxe`m
zPF}(yqY>(;!@0#EPwWQko=zRcPKoD6c-ju<ft!9_akl5vf~zST%BDWWAtUC5J5Z&=
z&if<moey($7yEN`?Ck`7{>%$u6QO!O%-HQx!m2QJWJ|HOR{E6b{GmSeK4bDpp>r{5
zi9xRA_B=WS%cCNhXaVoIs#v=<F|d82)6JUJoq8dm&Ur{|+i$kJY=e5Ty9d9q_Nb{6
zP|*qZHp+Mt1|Rzcy81zHtc#{J%yprJX^v>>%Api8UIcVRht(KsvZauMC7;O_9FJrd
z-JSIYdZ{{8sF@$WqjIb?$KklKd9JPJROXP*S(i{iUu_SU2z`@J<@{x-dVU=XVBB3*
zi;%wH#1x)yEG8+%$2Ce?O*K;p9)}}YOV{JUCK<xvWFJ2hg6bvc1V6<O3D2oX4x+qc
zIL|7r=qEP)Af^dptvc?El~OT%|49|WjyTi%YY%Bc&IpX~UWKT}lJJ&!<=BW1w`fah
z-AtZP(ZPpj#kCxuQDC`h0CwcI!Y{(1gL*C2R%S}2w^mdPoJ8?TZC*3hlV(+hEHgb+
zvUPXp0;c^s`0DW008g^ck%MFg=XDsUiK+_1d0^6WorHFc+Ej*|xmwOx9M*k<dMyTr
zlQnuYb3JtjO6fc$w?S~c-H+m&K9~>g)^e)k<<4Hatw6%;Xw!O4Yb)4^`xr99$43@g
zfZe_nhY3c3L5UhcL0TXR4H}6(G}QDJ><ksQ)sTn}ugB2m6?)=kihul!04_=5^tOK>
zLz@7ZT&t3eE1m=j#YeN>m6%tjwPED$duy(h=KD&9bb(#noF9JS-6ognN^;wAMxkhv
zqzg1*3~ya-y_RBE#<z|>TuuodDmXYb{^;&U^pCrxPWM=R=c*K5E`OyfClcXu;bE+h
zh}t=A!k?nn-V!n&c4s+5Mx2>S0k2eTK_ykBKR%k#`<^;NL!bgl7w2|oC3l7Ttpk&T
zGMg%sG5RM&ME!IBV=J!}ii2i?w@DI`r*Is?i!7aYoh{#T&tAHxMRK}J9W7$FW2D+J
z8Z|^8?r|a<9(`FwfTJB1<hp~alilI0R}HCIUArQ&VC_D>KW5gDqFAx{zQ-s3w&78Y
z4R%tK2#>m7Z;Rq^Fn#?rsB1`$c~MYPBo9l|cOr>*?O6ve^*l>O>NNTH4pbyR^0+ZZ
z6hxIA3Dt=t_6(_YMj_%XqnLC7M`OC^2C(Sl9@rQrORy>_uABn@kOx`nN=%NDaD33e
z*}Rw*)6lg;4;aodmc~zDqY?uNqvE_TL)Yy6CPvX$ii_)->L8!pBalJg+RS`9nzetV
zbAp-QSabJL(gj9c8!{^L38Ft}*i^AopNge$<7Y#TD(9g!<14?SFsZnT=cj%Sd5;)7
z5dJaOTSvQQS?fHFP+axH3#RR5<6@y)hn4UV+=uYEG>k)d&1_!`Re3AW#118$jz62b
zbi@-zC+gV-*Pf=T)x?$$7WsEQ#1@S+He<$T#0;Z0jdvh-mpFwpH~?^3e#dJrWk^&$
z{6%mnE-=w&%^0VQPqN@dOYZP0Z5|V}vmv<fL5!pyJJxb3`_sI@>!X2CBqQ?gdS59=
z#8a|aDW-@ysXjV?H9;<LscheogM)*jV{>{{9mB;uh#dxLpAMc+HPv-DG1|Q;#qOIa
zCkuZu<ovmOa;&?Lj9su{NJ%AWUFydXZf!7z9dU1U4+w*}-PpBT>cEQc+(24fq`!4V
zg+kv8Io?%NhGS!mCB)#(6lla(maq6(<|jqC$_ScNJvZf<hKIn^echjd#-cRqNUh*)
zeV2q`w6&+<KPU!*C0D>bq~b@Ue(Rwty)Wx8yCbM>q#`+XBWgJU#-|N;8{H4sEVen1
z-XEaSuA^bZdw;#7DG!Qwi`5Dw4!hHEDY9!y4#5n-rxO%~#eV?@J7ZbQnVmIIaZ6uC
zFaNE1wN}?Lyov=|hzG^(>FRlR)=NsSh?F@#4iAS-hvMZ>Ol+_&Un$Y!p{QOHLyM0u
z`7Mq~zLxjp9qoj9K6U8>CieG+nPb3A(QD(Fxk}wim19%=9wf@Cm5(7DRrngS=xdQk
zJyOLKZ50*ua`*cTQ>sO?WYQI?^bZrGSj?;)D2T;0QJh7(fhSjKxKWA9y4CSuqEAqI
zg$o%&F&xb%ur#g6pm)?%%`A%TX}AFL&&$jLFnMU*AD?+%eru&)@Shlcj>+7av9{E&
zS$diFvm>@L(G5thL?<Yn!ZBRt{FRTO8eKRb3E6jvCZt(#BIypn>}=r<=JK0}+_hhd
zV692ZR6N0EghiOf$f67J;fjIaygYe*{9M53!T~fZ7CmQh$go?jyJBQrl8@i|iGxNz
z!b{vud>s>C2YH?iUwx0!r7+K`mh#hGDzxVtj8(X~aw2dGE9ip^=j)cNeD9?T>4fM7
z9cNb~FD{M}<L$k|B40JHpE%YqoLxqF4gd5oX4W5AL4*0w>T-lh*kt(4V8mSV;CdLV
z`M^#vw4ab;vD;k9PB6)J+1R_)2o4_v&q|%s)k4#Ej}3QCc5SoNI=717ou!Kaw-Mt=
zFMNZjA-ZqRddsW;y;}8!;WGvC+tr1ibPhGwmtn}aH9C41@Ng!MoB5Ulsw)Qwrz&m7
zf`I>MI1dD*V8<EW_4J|>Y5ll^D^1Ya<;)s7<?}*_okO=eh#yHGINMBSemWM_gjoee
z-Ij{TibA~u!=5ddjT3|Z((USGGidlb^>&g;+A%A7{rlI70z|QnpbNEE9G6dG;xEG=
zZ(Cuy8IVFi;_F4AG$B-ry)V#h=K*fCSSir!SI2P*jljU~FjtlDxC@&1W&YV-BsrCG
zf{F4p-cxkESGRrVn};z4^Ye2+bl=pj_3l7fki-mouuTE}jsBalt%A%ht6>*g3iMg%
zE}F(61}fbx-xj*}BOH7&tS*O|HV9w$u}a=I&c03-J5t0JFgxl?te=U0&N~=8>1b2|
zs|ru3R|PxHOVxS2L$|922^>DkOXQYj(ZlmIQcUV-*9u+}`nUl@5rFIarsv&T33xg>
z|M@2%$ac~`ieTELrPrtOYph+f2Z6;g21}0Kiuy>>uiQy;Hl27gZnLjujW^g&Ff*R3
z)Hkl4o7eZM)Nw7wS}z3<L6S1>W*4+^sMiU!El)u_LZ;ZPFfc}9CeMVtU6#s`QpPIy
z;fRO)S)!*?NHbx#%49Mw896irZ|3t2LJ3{TS3ZITx0svsQM+yR@@+!nF5Q|25;pzj
zcbEov=AAOaZPZCrt*qv68Cz-eSU8y1)VucyOl(t!hYTx8#hX93UK7r8uwkB~^osxj
ziNIO7{uYIIZU6)eAfS>i?_H>~32>>8frfL;FF^vqW}n-`@8PHpz%1L5D5gp2)Rz+B
z3dJY4UvakWCWwdG44wOH;9Y~Cuh_6sN2ifTMhpm!RyS|b&lBOMPAlJmOg>ILXy1XZ
zzcg|i@tqS_h_*Ho`wRdVSpd*;A3Suu?ecLCoQ78M%8^V<hcS7nyJtx{tllbI&?E5O
z4Pbqru*bKlp}s1KnC$?X<$x$RBGmc#WgtZJ4$_3@agncATS4qoN$*GO0-?d8G|vM-
zXDR?ObA&GFYm1kc|IX>1%mm0meufE9m+FHJ%+)?`cvDy~4Pd4uj|z{NBw(uSEbl{~
zyNgwR$PC73@RD6`ZmKroAGk3YE>MD;7ug&CLal%Q!|d@KJ>ILAf6xWMdB?|CdRi8)
zKY5fFk$AuY1}KNU_yc9e@KFNr<o_pL4pEH4%Uhx<DlD`^#-r~8chFXdAzCg}7mAIl
z9#GNII6pD>62$t8b5Z_Z!|ELX&{v!=@?|nuVD)9WyM<qq^$6GO($dl<NVkt-dU{%G
zq!{JJm==tLgv8Pw!`ZTO^8h>a{3$UsHT2axGM$?+tQ)(->oNyEES1zpDkI}5G;lA}
zk5x1hu4+G}YYE^<K4NpTc@rwmo4T7sPhPNjDnNRW1;XGcMhPd<0zdej0Eq&?bp7T%
zb3nHDH?4&4k-+0;ol5e5w1ZseBLT9ZteWy?qXhzwzhmSD|Is==`hezc7C~9#!k<@m
z{UOEsZ=N_5K$CrSou2;lDzH9sC`du--=)r|M;uDyT||A(Q(sSxBd|XY1_QTE!H!|E
z3qDrKJsc=<nn4LGKnLNxfkFv3o6N&?r9*CW1KNoC7F6W_SQkJm7$A*Ml)nB;8huCi
z2_e<k1)+bj9llb0IV}R5O_0-XP_-&_*(T+BRcvpcs`dz={6k9lJgly?wD-hKyF7c~
zw$tww|J-e-J#y3F7X6XOdpO=Q*_tMTLCHV2#9N~JlbCW`t$BzNZg7!8T&;qcvIMf@
z%Yu({akX+4WbZp`C1V8MAp~*GM<&Eru6Mh=0RS1#Zs*Y>*9aFL4@gqQ(a;;0R<RRz
z<HMHi<A(6_+aos=XoOH=pSOyG5Z)B?9%*m^0<;|hkJjolF^-C@4k5_<xBVzkFc<<)
zpkR7po>1Uy>{`nu)Wh^_tg;J=YPuwR`0J~`Kd9xQe1oxCj@gL+NdY|esfR(JU5}<D
z{req%{ZK;5J0nZPhG!TAy!D^-WQ;)CddhzIf1f<@!NMggpdKfdt-^fF{_h`tlJw4a
z!6<$r2t0Yt?DKPbbg>nD^QEN3s(h=ZrN#MMCv20$_Q;xvzo*^JxmA<van{+{8E&KL
zfbiox2y&kYex?3a|5&GYS?vI$0|6)*=j+qmW{$G9wpA`}Zi=UYkD%*F8n4Ch@W#<#
z>PfKB76O@f`%`)Wx#K6RJVoJ8pb@$mm`z5WX;kR@muR<e9exS??s9Rcwb<s>W~TIl
zw*&}vS1HvrV`u+>Y~P4_gh_x7?b383#ZL*N0E<AY!0s9byd$<=z|F0JL8o=ec;s`E
zYEW8Qn%+-U<_Z9MPhs|X5Je5?_KC*5?6^|7xs6B;Uhs^2xZt;>Hz%R~aElll(MBsz
z0azu24W>F?kUtrY&1e8;lG=ystgtXQ_p3{3adB};c6OI6Vx!kX>u}=hF5}_kIQOD-
z3CH~z1}{qhFZRR{u%LJ(6w<GYL#4zmXxShIMMVR7GO5?elggyiYTJb}^4W+){$p=1
z4wpkL6ZUXG)TdluQsr*qe8sJ-O5)<;Pz!}sRTIk6PgF>hTNe_Ng@_Gv49p|;7#0EU
zQmmHl%w3y84#6j{iT8YY(&gZ3S=n%5Ju4?S<gx~Be|Nu596R9trjLd~21I7;llgEF
z{MMoJucmS>@#Y%Nmr1RhnNdl3W0&=?dw6(G@&n+7)I>$Uu8FFzX2{fW^(8RroRb*9
z;;P3m+pO>`mg{xt_G*wEZuCYhM!%H&K&8G}Kv5zO6<1}w%;hz#yM@Vwvql|}E19rR
zq+AR)DtA{s^KEN5g|AP(^;#<R8o2K6`X`Q5fff>u!lJU8nwfcmCmji|`xN|3_vNv%
z3>`kmd{ysuiRc1wp5%NdJL397=P^JOw#^7XN5Y%ZhLufbWOq4SvP~{aSjZT~ZKh_L
z7V8MW%LmSrygZ_K?HBhA7P<?e`9uC<t4H3;?Tqy<Zk;;~(pMIIpbTng7+g`kd^s2l
zR}5G-g^c_S1L?iUV#Q{IUbKg5ohz*-=V9R1xo<Aozy%6{0XUg!!h#=1()qxRN6*rE
z+$LP&*`>_@E<kvs&2cxHLA!a*C2e|F#n$d%?lmb6HNu!l!>eg&633DnxfLS8u}Lpj
za`Hm00gsz=NUIi?7;@YG{yz9eMh0j%O6>VDR5Uce19G5-JBP9@iyP4ujPDHfgb}ys
zAb2ZrE++ufp?}fks=8(Acz7VG=N!Bxr}fegs2Jxu1zkZQT}q#-IxffuhlJr|1?!Y8
zRW+ll;%sQng`>s({fpbp{q08io<iX!#k1MN`Q*28hdu&rEpv{ehmPk9GmW$<TI{xI
zAR3t_On8?$$I|GLvcxxXpe_jG<fzDnjp<Kc+7z|7<LTKCnpXQ2wWZn`irg4EtF5yZ
zbzFywMf13MACy<B`>`#1v&`c8BFESF<c~ma-L*Q1x0F!}>wG`=m)^crq?&*2A`_^=
zT4Ax<-bPcBKDP62_KwdZwTjxrczx||?Q1c#@B?o1_1m()=AH?dsfy_cu37^`MmAKl
zpIgJi_UZh<MP9CA5Z9di10?EBC9)QP%WN?#iUBcA_yq%8@j^1Y1>8?nvaGMOd$Idw
zZ6I=c@x9PuZCbHxGV<KArm=S-?oDjI86%$NO*kJ4P$jNQE|MmaSWRvlkc5Qfa!yX~
z*E;+>>k3W<1Qk;qc_^jJCSn=G3L>K^#^x3boTeM#2f7d)&(0UO&vmLOR2RTvTB*)X
zXZ#nJ3bRR!RY$1}1`l?Z0SupCGeZt_mal!$t<w$Kn%#SJ<I}J22hZ<I91a%wZ7TMH
zgPgOodt2S74oFukhG1#1AxYSEkoK<}`_4vpgAt`y`+Qd+A(jI<i08ATI>#Lym1<7~
zJ7dJI4{TN{yYZw*O*dR*>*i#M7a{4-b+*cG=BJ%K_AVI~Te23?c&GJ$F1w*J5-ij>
zHr{=s_zA!7I9DSEQD<?eMAm*ahwo*-e6KqTz1U!?o4mow)MysLNFd+tI0MUrWQ?Qq
z*{)-H_1-2MIdTZ^&34)SX`XVU`$%g1)ha~yTQfBx)cp&Ib&kn*Fc_bN1yY^DRJw6B
z3uN3EN~2($9NBrr6jLT*e1kCLJ{s(WT1fkWklBKx+<Eqbyx!l8t*kt+?7OZTkSi)K
z9=uMTaxRokE@E4t#J@6~B8R~tXM#1gAB!zM#mUpi^(-wkY7ETzj_}!ZuN>QYxiYP}
z7gO^CWKQ~`x~+@vX69w>lv8^gn|X$}P}?-2D#q~)`_mM{54|NJV<yGReI54r2p_AD
zmPl?+nHWx-Cf;@Sw$AG^u~jc{&yH3`wCa_jW2Ke08R@vrp4bLG++8-R@sW+0di#b)
zc<pC__ou9G#=>{ZWRYCigvJjBTu+wi?x;ICWmjs;p0${fF1_wGuFn8byhNh*w2&+*
zz7Y6Pb);E*ca!<b1H5d%%7J_T^df2Cq5F`Ff8ZP3t6L}JVyeaTBefkd792yc`>K(S
z>b;*p(Gx+@BDgY40kUyuB)Ii=?h7R{KjY|BKR6R1j=d9R6rc2ElNMJ@Ii=L$M}os4
zGfbK4n7LACjcR@WmN#OIaF*+nrXqq!C1L7#GIB|f9F<o!M4~L+_eqUIz5mv=<|d7;
zxK>1TTEq(7<-pfBwCH@qI?xdfn9yM=)b+08u=vEi7@DSB(Ri|LgHE@?0+}-by5HV%
zO1z$xMn{734=;?l|FVB-0Yl-`;&*}|7@o&F-4K3tcK*$US5aG{DM6Oh_1k@MhJFPx
zX2Vo8&_@DSnMb7)i0YLlYffD}H%b?$I$&`Dt6$N`lV^;nc`Wty;Cn6^CZFRh<QHnU
z9XHPVP3GZfve!B<lJZuz!{ao{P%xNFipiF(L}L)(kQET*tieJfP^yuEi$>lr7Ui#9
zk28v>-=;{)WzxJ$4zAYifNtX><B^|*-qK9lp%aiJi>Aqt(-3BkDx4(Q#Dc~Od-Ksu
zQhwV^>(h+;N7(O~TI!>(<HvobPO=A-TX5(<{>&QrR%M7>@Kalr_k2xA_O`}aSK8`S
z#%#~qLS4aq!i0-Mp~z7f9SMsicaSmNWVyPqD`Byuvt(n8eNsy|Qc^)pg16=A>Px%A
z+(B3<@Oj}8I*FbfN)~1~h7$FqxK>~$huOzhMZ>L6fCdi+8XO6Z325+nXgfGOJ)+p|
ziR}{;g((Do5O+1Bel?90;(+m~fYHZYLHWgQ<09dD&}0S<GfKh~BP`ZJ6zyW{aDmUs
zRAb0kz*MtSOJ0Oo^$YU_)xC!1=WWnLMxW?*X|AVht#3j#QhtncqCH#?DX-+HK0mW)
znkmTfpOWvLIz|uql3f~deGn(;Paas!e9M&PF~4#>CUtXD$8?;HlC18u*HcXV0;Pd$
zkTXWhRzZWk-;+uoDGsC^Ac@2rkV$Ze#mA%vHFK2kV>o{ofh@Ag+ZR#V0|~jdX5__U
zIG9>G8*Ue{qcNEjE7G?A>VgpaT_Q;A^dlcQs<u>~q|1eWrzKC!Y+uD`$bnFPyhfrC
zbf%o7*KM%&303X%*)-!cx4E7pftI{Lq_hHeTmr~VAtq1V%#mt<{ESCCLI(<xRy{5~
zYv(6za6i7_-<5E*fP3-r4v{lV%xx>$d^zU2FotSjbV+EZp!!Q*=P55{AqARy$!L6&
zK|>B=sl9qt<bs*k3b-QGH|wII20ghJM|I+zNH%h{alKYfeEqIcA%9_$dTv7g*Kc4(
z+gW|cRP1n<_tZ}}Eh6YprPv;DUK|1$hM&ND;ny?E>D6>mc}Ql(%3)~*lO^nUd!}OG
z$?AJ}&z&)Heu<1HAgC~B#fcjEkbEai?iXfCf|I_dyr}9=vr5c`O|+kVt8tE;sQ8w4
zYLO$bs+P&1t{j13Sb(OEU1>4Pn4YkZE7R6WAp}B#R&t(-r6W;wV^MC;io&;2=3bJK
zyN<VkIOiU9$lX+H3sc}PBuTjKE=2D9fC+-%u7eJ#$SKbga^tC8xNCYhk1C;2uob;h
zRoHVs$zZQ7uej^1lx)plt#?wz-)7a;&@jWKKa-3Mxx`7k_L>i)Tylx(*suunBs9un
zsqu);qav{v9FwWLEA~aMqlrQPRN6$6SnaI$;LmYGif=lU&R4F>Lp!?jIxf@1+@!#!
z{_EnykFMhL8=K^#y69;}S^TBWpCn}m_iU%ZJ}w$~QfEe9{WZrCUV1+0j;%*{4i;2}
zs6Tt0N3#Yts^B%eGuAs=y{4W+!5~pH&*;8TQYLYAI<F~EOSRtwybhUF@m3%(;*Hgh
zx)~(X;5ZNx+t+ugr$&SES62FQvhEX#9@6j%@H!TJ)sdP;MU&~tIF1E8uy6Kai?d77
zTK8gFsny-~>RUGix9QAgUxKMb5deA1lD+KkRuCD^sVSXi3mTLfwa%<*lPXx%e<7E{
zY)~~Wb62HE*nAPko0=)CzE7GTsr<BsuyApS_F*ib0F!bvohul7uj>e2RUjlkZhhfy
zmxS@n*iKghy3Pf1QrtzCwZ-)FizE>G{RCv^bQHdH-i9A66KEObaZ)zQh7>8eP-~l9
z;u12zzh7&Sy0b-ix0|y6K{u-ghxCf+!ltt%WbTmb_DEC5fZx*%2({l&spD^Oi2~oR
zvETG@65VE5z`nMz3mFnaqGh|=9R>P_*M(3vct|VXo%V@)N=lm3c*!Igc_gjeR@#ms
z_V+yPE{jKB&j$g@$@NTxcf|2~A0~fv1rQ+-I#28U#&*pc9Ydil|HX#?XJ+7*>kGSg
zP|ZQgWRn+4AC|#^T^`Fy1)4Ej%j)%78+jt4B?)6QMG{2v1d<a4AD^RsWEvY(I($Dc
zQKMd7GM?aOZLT=SK%2s2(^zPv9P{cj-Ew66^DPpO@~Wk5y?o7aEI}cGtczbGnK$6C
zk$DTqKo=^e+BY(H^}9=uw%Ri8O;x~QlaDr-t@flAF4-=ddPQ(BkGW%GK~o@>%Xv_e
zgp>cB^6%szz{w32`TX0XC%_Mx<JqIpdLQfj0@-r0mSLaB)b4Dh#iNQZ9s6(B7w~$c
z{?B^HfBVY<86tqgDRJ5}Y5B|52K?Z4EV6=6lF|Pco%f@{f4p)sPoI$y8Q^gJCw>Ea
z`T_w93k$))Y-S)MGDN_Y5w8!ah5~Q{|Mo_w{T@-?0vKq7W?H%PJxOiyNCKbZOBZRm
zs6>7yBHzEP^8|YLFaJRCY<OmMHQkfC_=0o6W2wg2Azyl6?}LmG*(x+}`M2|iwQOrh
z|Jw(aiwH}{hXH%WVB~-5`osrba_#$>2VcP)v(12?vYmN|fDi2Z0xezJ;J<vzzi|XI
zv&X_UWmo?WHb5g|DB%!%UjOx~M}Qz1SQsY`sUeSG!!L8T18HI5^56V=0DKkwN<c2E
znp?u-x3tvdKw6&;8nk~?KJm#x#89Gygik#GEiDoND#-sIDqbvpJ<o5oa1~u+9pzjo
zT9DugrnKF#j<{P%*}^S6HN=&ai~4dSZt+iH)}XN7vp037%_;qSGW|wP8Qj?VRt=R_
z-y-o|N#sNDKM;)11l|r4WDCFL?6TJd8G+?<B>s~p*y!RSf=aaORg_e}l~_UnKyN5*
zxWj%&Z}@<YeM#Ss_*-qGfsGP%|DsIx@92#zfZp&)+6(<=P|C;tc~U!R`dc3B*g*dr
zjsE<*LB)YAqMIRXM8D;6`3Nrk&x!}a+i}w21h+N}hI2T-*HB&UqjISJ4m%*J{p88N
zdHRq;13SX`HWKs7k()aeHErVy_iM|eBEs`b5(lf3?n?6Q6F4ZK0e`ssH+q?=f20DK
zh9rN3wX9`Ph0B*zBSk9NatG_~_1$ZY8At#V0xevjYt)PO(|jBh?H9jNZm6wESVU+6
zt}7oW`z`>4czhE|DLYKkNS)aU&&^9Xa=h7<{8p7hasd&NOz`rUC-FEuAmO&p<$ZSE
zcI139KO4SWU00TBb_8CwB$eA~A4o>J0e1B%ThJ(2(DJ}`K&0>o;p2q$IIuAMyt%HO
zrepN`%*a9>JPYUHagxJN^%VoHKC2qpXmc#{d6oCijHayTQ~7tMxmC>Lyt|z?2)Pxz
z(Rxz(pr2Awn5xg;JZ4^_NTnw1kWU(Rxpw~c{`2DwXSr1Srsj;DoY<2hG7jkQDpH?6
z{xg;lzBAf(I^D{$C0W^~KGge$JUDc8lzmAu)44y3i{C#9sInF@n7pO+0Gt>rUk#$;
zxb&536R#D0QrEj@bS{1v2^vjS#zqap$t<rgdhA8Tk(mROC+gCBDE_vh03Ymg4c;zz
z93;k8m#q<tJnFE#12bTYbyGXD^-QkdOX1<dMUw@t9JQ6YoDpve*!gA!{BZ9qRyJHf
znel_*mWm1rL~FmkZuqMYka0qV$xSJb{($oL4Z&aT^Uq@lbN-%{SM)&%N>r(YPKR)B
zXZ*f`aX3lEI*<_^hCqJ%Cn0nf&?iu+y0-r@wzoI792tgcQE}P<p1RATNm`peDR`r~
zzVhtq6ulePU_kNA;^^=UYRuFx?X|LZ2<dyMJbvEty71s%^=gHk8BNtEUMBj;!l`BY
zg}-ho%Z%Y;>$<bHdne>e&h5H{;wx#}j`lI80t+YPQU__9_dLUFSSPWId>p*Tu&%o=
znq_fyb6zO>&HgHrK(aTm@1le}!3A*xMsw(^&Ude4uzY5=`vr-6&DpteY64Q{1Ktv;
zN^PAt8(i9M$U)*HkqD{fuX{*N(N{LManKkvA3qO~zBuUb;yiF!PFRJgb1@{)zpWDi
zhM>fE(4^EqW~6Rzcd)jrRruV*FIuy%wQn*%-s608S;zR^f3ZhgNBzS3V$&&*3H|PQ
zaDl}n|0G^b)e@SV&aHUNU4I??9)DL0aKSYklxQQ~k)MECo8&jtw*MxOb?m-VUR)i1
z&q1$#&1Wz7kdKoO&*wfDZd!ZHxo)XA)gN_@;ja%nxxISLtGs&9_Le8eiq0`5`U+pc
zRP=8I_;Cq%0fW>qr)JmfyL${CPfJ$ZoH5@C{3!4W>Ry5c(eBxQ6ATm#=+WJa3iSJB
z%E#UvDGtnHF&Mr7l?y{aR|J@zFx}pK`qlj($6gX(oB!{=@VjgVy_Z^y10M9HiBIe%
z&8Avfui1a~e2uJW(`EzMnr=(8pHaidVOVQEZNQBXX5d<Dz!oj=zuNaC2}nwYl#LH1
zvG%GB7s${cG2a#99C2CwzCt{1eF$FnBmHMwABD#i;%k#k%73rI_#_Y579>^q`wD^c
zxI!G4P8$CjsX!Cz18F~D#(epGg%Aa@P-xz-Cj2cA0wAq^HznO~NhN?Rvi>*4^En~-
z`QpEy`M@AP<8~ebKq2g@tO-jA6O()Z8fGjDqblg5V@mpGus(rCFZG5F-W*KeuSd<;
z($2`tBtOEE@*3cN4g1fQ@vjbJ36#umRYyJWzuqCR0+j4TMhfabiz8419>$CLi-eiq
zHjR-kK-y+(#s5-1f$qm6D|mN)m+SOf+V5IG+M{lqUuz8Tl|UtsMKsvUjO5o+0DS3&
zPgc<PKPz5rXghEe29SRN&&<ql%x$f#XgAq@^IdLmF!@m>)K(9^snu$B9lyT5M$&TZ
z7@#PiCSZsCuh2N^Yu9J{&WB5Hxxv?t+98KWM|C43BYo}Pauc*Gt4v1K9UL6A_vMC$
z5NU%8W#|8^h8u1ot4Vmt`-)DLGVRn^`@@wM3*hQ$&M=9b{2Ghdg@HJ_lDxcEcXIkG
z2~>G6*<gNaYBoTi-d>~igWE#>aT{cJmykmd7F!&Rddk)}SkHzZ{=cqbk2$6ecV|j8
z7E7Zjl?}5um7f<MkC(!%=c}x$sv#y8n2zQ6a1Ty-Z4dykt8`~d{Bb*gfXV$_j(E&1
zwf782Dvf6zxGfZvm&1;m?5w1$Y^0bk10LQjirD+|Qz^e-1OR#+M_N2CUM%Kv`C}rr
zpjl8&dFJXWXlPgfTUg<}vFYi}{rqNSvADAH+`KV3!rjD$Z1+Lu^Mm;)h(t>(Mp@v>
zrcmrV!v9PYge8}MHC3oMv#?+eME#%gFE1~*K5eyH<R~sEAh0Z(;RHN=v=g8&f_vW!
z`p-}f0mqOyfO~xBj#UD0E{`{A0r{iVAeFa!?<|xAHos`pjp(o@x^*MNz8Nssoye^<
zpDyZPRpKvks(1UDhi)HR#;2I?xj$2K&jX8Xo&fDX<*cltlDv?+Dj^o}{7f)No0E-g
zCqdTZ{NUKlBFY&!<ivZulg*cI+gwpGUUn84=nGq;+7Xi{Ih@MP`FU$Umt)5PmT5rp
zOujtx>#jzvWd(q9qowJD;=|y6mCOINfC%V5Lom$|knQbFo+4MxckK-)xi@P&X>x`n
zr@pc4JZe526Glg+5$Xu^MM&ib`q%1PKDU#cBl=>8X4CO3@@<_)$9_B}?E~)7Jx99w
zH_iu%=twv)J5`!7dwFP$GwRefVPreIZN8C_Q;eG};2Y;v#?);8Re&bsbCr|JKJBB3
zxO^fGH3^U(aAMqSFIY7d=8??VxT@?nKu7q{WYf|YMhn$u!i=-}4q?tbw?Df0berrp
z0?-qyo8q8D^z*)Hs1K>jbNoB#fT2EB(PF<DoF2dy-}yIp;0NV@lKjXX5d6&^06=7e
zJ0MHt{-BYKzialb)4vv=>pIp1eLmso?2EUgoo^>k5vsPtmVpF2V<}<Tid^0i1<5tB
z6=98xBlvRN6hah!WO7jN)~)QD<T!2(5qg#SMlvspZ|=50GeYp<(%7cOd%LQc{vi->
zxWkqf^k>6Q{+oMGUS-JCfaq{Ecf@3ed%5g0^C3jya$>5fp3+tlvU?eUGVX8kM(StS
zOsfS__og=FWpBF{0?*ISBSmN0lmisBw6tbsb8026CX{l=Up4fJWuxt8(<2dl&!AD=
zrID(WxYJY|bVLtHMW77^!&8&~8oC6z-q1d8qSKs<C%?!ezYK%P;j0+ULy<<FV0$TT
zH4*dSj+#KuJJL!4USr#0Sj5$xf2k&uwbTitArIq|ArKxk>^~z?5W~OVoI5Kk=)FJ)
zdNvWU?+};Y{?dt8;@Zu<Y>f_oqkw1qGBo1_n&`>DWHJ&x#zm(lFYIiDGx@~&s-`cJ
zwBW?GH!L#V<r&nsphi6A?Gq6lC|~F(DJcJfztLMK4IzOn%s^%<nmwKp<Z<<ga&Mk$
z$^ExIEL@T5o=Ocx3BLZe+EZ^gAgsQ@$IfB}=)bx_WUjzxAJIg(+$;yJ(_&1dFlSS(
zZd1iXtk~flp8<qPzpUDzVWmLZuslH;T>{2JEhNfn3gudw6#1u{h3xp5sD*C(?$V@_
zrlM2TWm68llNNa95&2DmTEFHsA82Ii#Ifpp0AAatuY}A67MV|x-37JHpnNm~eQW-q
zp;3@WI=S;HZ7l!jHpfD#_s252d)co1LZdRtPfd`LV@Y(WJXqP7;F#czzAzrISdHXa
zxH<s|NEHXeFlI_-Gp=<^Q?Z1t5qmRIy7enpU{tVvzarzW`pFskln3a4L9VX(A3=|4
zJ)~TYeGypH-tq$3%dw7DQ|o3V{H{MT_;vn(9%KJ+K#z=%&?C4ay%k;<GU<*QrfF(I
zyP0bt3}Dw3pEbU$0@F-%zUHr;Kt><50qQHEvuPhy6P=LcX&Tj5ZkNN;)bD_nU%(`s
zmqm$p-g~ng0maZMah+Prq}5j{S2<L?HM5RnPCsh4gpvD|^SJH`#TAp3(x9I?4NS|c
z!t0!g>)@2|IBBjPXZ(z--j8mLc>zPU(4%rDFQ!9*f#hC|TdE!CO&?okQN3K;S}X)n
zNU7c|9vE|^n<lTZLK28g0BL^DBZYl`y@F!pkOHvjS)j;RuRUs+JtzMUT3avD4-&rP
zR~pCq|GOWMQ~KWl%BDJ~!ejuD>~+hlFNN>$zw!QRt;cP`cS-=az{aQgcQf<2XJ`c6
zxJHDd|E2{1%%Ot9GvDt1+W+5TWPmwWYo#%hVDT?d6++eiPW1SI=J(B)2m%0jtaD5t
z{IWT)aSNsb01qAyiQo5zm;j~{R3F9${cB19ps;noufiEki~g-3?>+)$dtprx_U{M=
zq90s=v|p?8|MlX4EU?JiFaFH;e*jdi00&fEXpVB_{x#&INhnpkcV&ZGYS?}Sy#RyD
zrxU0KPEV4;uYm@X^4%ApDEc-GsK3EV8O%UY{O$5^eyc4OK>kF{X-IbcmX<mcNUQgm
z2KKkwb|V3nI-i+%#Lj>k{PlrE0a%K_MB+E}iLBz$QvZMP{$H`)13HQfzo~)Z&)g@#
OA8}C`ky0UD-~R>B2!!$g

literal 105884
zcmeEuWmuHm+O}eVg&-xZpme8ngLHRygXGYN0n*aV&@nI|-3%(-H8hOUH4F_yej`3U
zy7&9;WB>U6e8=%Ue_-Ig=U(eRuR5=5U26p^DM&rIOLX_zwQCQgUy7?-yM|74?b;15
zjN7RHKyAq)QNOOcs7Q%kE9oa$yLL_ZnzXoxn#c9c**iXX(9Gi<c5ZIs>o`hpUI#wG
z!o|h9bseuYw^-y>C|VhmX{x)zSEI7}kalcbhu{KkTLg9=(xjNzF(1mWX8K_A`Ib_#
zo&*{OhSkg0AK_GcLNSX}E|ztGEw-4H#e@NLL~l}s-^#N&o|WD(tg|Ptuc2Z5-~LFG
z7j`NVaWT{+uq5SC8y!>=uJ7!cs$R*wr=Yv2;kg)!8ly6y<@qjRmX-G8C<4+3htks!
zT)&AWeC@{%VVrNLH0M7)zHGj>fYrtQT<Yo);?`LSZXu|7YPbb1qQCrL&AVrj2`82p
zhYMRc!v#YPF?%F$=xc6Vz)8FJ<EfddU#S0n8)0vZZQn|PQCghqH|t-c9;^TD*@!sm
zxf%B`j`eJ^r&d+k&3?=*C-t>Z5!=%GsNT~H{QTA6Or2kV2oqp`JGCO<8R9@agCF0B
z<csO65V0Tgd?nVB#z!+-U>&mPxkGK^beJ~_plfyw!g(YTm7Y|^m+ftkAteNBSU?Z0
zfiSfugk%-a4nG48y}wm_;-WvBa7$4?-Kjk5exdxkWjl5F(8|sLm!*X(jIcXDb4O{5
z(Io<6RXMyMOcSQ~3nbLAD$*_MeC7J*xDc-bT?Ygpl71gds{e$mPaU^;Wy%<vtVWo@
zx4aIk{pox=Rptho#(9zx#`q-d70A~DVsVY$u(gk<cq^qQYUp#a#hX>BOTDAHREh1e
zP9}A{SEfhR>~&Dx;gIMz`~^G2nI*pQL#Qy@t>V)P!!xt5C5}DLWG{1y$u?S##C<<~
zs&39w0uI2&8Y`5xn8$+3!hdU$FbG4-U#hxPU*3F44z9!eB)iw3UVVQx?tCI_je71G
zH9cTDe;xy^|CR|nMyEea?8VXZyc)EzAM<q_K+Ao4rIjCv&>RHjp%r8D`lSZc%xKU-
zh=gO4dyM6KY9%Fe&sTHv!@@|n%NZ|2w8@XS*EMeno<D;V+_7wAd=;rqcHx@aO_$2@
z2YkG5TfXnEd-llQ05W^5pNE4$?i=^*vmT_0y>|N0??lFDOaC}%wb(M={pa{b%!A*l
zY2YbitPwtCQZu#R3dgzJ!=_YvN+<>=JbdO1+~g4+(|oGxr|ge#O3Bv#(q<Ieyl;iw
z+-jm+WNxTKiY8nvEUg~eukxdXiMgh`OeX1kc_D7en^Jk}rvX@^kzQh#qD#m{>bkW*
z(k;f$&(og;jAl?r5KzbiRr)WuHXl*!#mKN)T{g^zWP77=)16>2PD7!-Qgh`O@C`ps
zcRkU_(aO%`CpYKuYrW;YW+F}04Y9df^;zy<|Fp0l8t{@e;PcyvIiJI0W&bmo55-E*
z!#h!`hlMY|Y)V3<)jp^EMYaNrTSfE_9km+GdzM0j9{N+n#w*@@gl9xTp)4|-pM|ob
zLJy4soS#Ovb;tGWPWRV1%esyQhLzHA-re1s5<E6Iy7&C^mta}8^rP%YCHL)EzMxkh
z)*7k{Awy9LU)2?4bdw)%qK@68f#H>t-uv#Z<J#dUjGtKikX8ULZmn5kxtzfsX}tQ#
z#d|-@&TuxQW9}KZe<lbYu2a2Wc+oz^Uq^meffTr0xUBH+Nhe=^Xh`h-n)K#8E^4j{
zFQRiRQFEpB^(r9wIag_d)$K?R^%#Xm-hovV+_Tmo^u1VsMl5bFH04ocGuDjjyK6Ta
zu`te=kUmLxeM?KBmZSc7Z90eVtJbZP%BUy=|8^|b&}bRHEhZ!UB<>VzDNR(AWvpTr
z<uzWIz==V0yl0%X>eCo|1})OS`_K@l4<By=3#nROh=bCw*WX@Q$m<$3(u?`dEmqz+
zwsx)LERK_9{BV}Msj7+{BGbpG7#`2DPV{X?!N-2zkyCAD@d$6_Gqy2~R;iz6`~#?r
z3JiWeY3&&gn<41(;o=A4vEqh45(Nx2G7J{X@7LKRTIo<j7MuL_oeY;dkAWQP1#UGU
zo6B?Z;EIuT@tUyvPOdF1Wjj)$NO5IxtDTr^pGOfnAQ?&Pj9Hinp(0;;kD4G2%4}C1
zn~F;WEpqgfi&{4l2R)<WYwivq1{IuS<m+CDcqdu719qTy-nNaA-`PnjR%1zbmy~g-
z0UaJ^soV$8F)BPNXSQ~Vgfk10!gTGD3Te<ObHm;3%0M<Th+C&ie8xnPA55!`XT5_5
z(D6R_`x`2|OUaVMkM%)Qdp$QyJo>H=m1Zs-J%K=uHyicJ4pNt;gd}>t?AGccb?_~)
zCrUHEMU)R5owH<{NADKx7JHT}#&-%%T4B$UJe#eMxxp@mUS6@m1wFp44pMKR3jFfu
zWWN@8p`p%RGaj6^uGmJaLk_)|JBVKK6e&42`jAz-`@*8;)Is#(ndIMyzk0U4xz<go
zYN*x$m?p>2eOK>dxeVVuJs2SMhm0jG?*NR!R@|kN`|>U>4Fb)E)UNhh6t@?!whpap
zPLp*PZaFM%RMN9!Vl%b95U)k|zKSqux=$*#3ajGS;}LV|vq~}fAsm@pTYcX3W{u1o
z#_n+-d@{Z2g>#NsQjN@a`S)j=wh2rJ{4=Z#4PM|S+$K7RaU@*h>y9_vsS3zEt_C`b
z3g>~l_L20W6=^o6EROrNyV^p;{0`96l_K&!JB&k&F;ZSuEnPn0PSf^A+@!I`c}qL9
z(E>N}X=8fAI!q>k^#)BP(_<~?CmiDmX7^Kz?}zcgXcg7%dJE_BQ;fim6cfS}D(bc5
zyFG_A>&;Isc%*CL$P;wvE_{yxv*xzBMNtYB?!%^CFP^d~qQ@P9XJ58p^$IhuTy?*Z
z**_Y+$d^gwbyzJ1KI|HrTbVyz!RK*0p4^+iF!Fq2;*A1RYd2``bnekeYtiO-LMcw@
zy4kEe<b^S3F&;H0ykeW%^yKX6eglsCMD2n`bGtLcVfcBSRe|I8v2Wi<B&u0)&)?9Z
z_v<J6M`Qz*<Yr6LN8oKO#F>=~)akB6MJZ=Oy&$`kN`C9XxfDdotGTAk7Yc$+Tlug!
z#KV)_wO#7ib!ImR@H;0wex!DJSyr*x>|LrH_XQK*g?E0>a9ndrC(J~Dc0&A@R@6to
z-r*}BJFG21F3vY;=LXzf0DV)=re}uOA5T!HCVQRhzbG8H3-%!o=ip*7^BLU`*K9WI
ziCG@2^31vTSSd(*kJX?7<MRvg6oCaSd;CoB;|^}oE(#x_Q}zX{KCLh@@l_5I(I3OD
zR-%26^oS!+vObWyOT1*3KE-jzGtBOoZ&GK2c`~bCK#gd^fs?0@6v&!4?lNVWCBz;N
zKNd}yuq%115ou&#ur;SHWZQgAdA$eFS5!E|$F8N%Ic(#sLT@N*dY1p*GFTK&Y3@g%
z=)4A68}>w==&s8H<8Nb1q@<48sOW;jd=7$JmTxIGL6l35ISouV=xiZ8M>tg;F4h^%
zT<eQD@lp}T+wcKRy~EX$w;&MLtiCnSWiLwBK$8Gn=El+x6?N6b=@Ch@Q$%sk*Qy4E
z(D+jKvklOcE+!Mlm{eNosEK8WzApV1P_;gHr-T%bz~-sDki(L#ra|SlJ|94j-J;P$
zoE!n><b;ePq^2~+)z;@Vf+cQUa1&u7UQnwfTXi&U<+l|<%?;yjS4$?Rj;{Muc5^$G
zZ8{3YLZq}mC(l^HKe*2HH4_)=Mf{BKKS)L`%@guMZOa|O?nuFc`f2Mz1AhYd)8szu
zhAI!`_S+N|OH)U-2_=1$TvT1?gh3x}cE5P1-GMv~<N;Tpc-A`<C)754ivJ@x2(RE^
z05f7;yfYi{Q&QFm3_oP^jG$tmFX9$ijiX=OV`fQsmC)8^XC>Zxx7^p+BtaMfo`0H~
zfs-s|;0aF;x4P+jU8&;S%-LXI0^z`D(_BV_ER)Gv{aYw>R<fVgx70xW;r`$)soB(n
ztP`VccuPnD_5*ApVwb%|aTE3T^>z8*l_pBY$YA{~aN__>cMU-&R~PF_X_-3bni7sr
zLWkPgkcm$gu%4P?|0UiYP;FePxpDsue-I5i2xTBedsR{oE!W=^bDMkDuWey$rB_&n
zH;Pq_9rM|zP4JFx`0<(|38qJ~XMAmo*O=_TG&PqGuJmxs*4c;IRv~O)RdgT!pj!hs
zF%@xT!`?%oEBM`r@pfA$Q;zQk0OOj{Nx27MSl^87TDYouV5KpB_72ln379OH*rf4J
z81&gR3&a}ICK#q96uYV|VX<Lik0mCqV&7^3nlf{U-`-GN%sKrH;;;w%NO1`rucPwi
zZQtFtU`&{@Wp9BwL`#sDQ}^g`=khn1oy9ZhCO7HW0=zK^E(Z(38&jUJ(v)875}6TO
zGE#l!XU+zB-BLXk8um3l)J7K7j;fGMiF=U(Rjcb^1~<qnsJgLTWB{bj9M;d-6Q3ep
z?h(&54aYkwEiNB<(HO>$tH#q0yYx&&a5`GYjCyusOaoLD5@KS;;Dva;=m!wb(U~l4
zQ<;$4?g>cU?}B@+nSG#>2)KT->V?5&G<3nrd&yG3)m?gMFzLAj@<vE#yV)VVj!8d6
zW`=XQ74mpG2i_1@s;;f@mFP{lJOGXEZHR+|Yz*zznbmol{ppx)8+mZ(L6MVXf9Ki5
zjl_OYls8jdS~SZ`wW<WA4G<KsLLFP8`PZW3rvY(0{I-#C4jc?6pSn99FT2Ay<2!zH
z8WbmS>^>UNOu{c;`ru|_3VX@9bJFl>dfYB*%7%aWm0e3>u{GpJU~{&2n8Zl9K^Qdn
znlOmPy+XW$I}F)YKJen^0#?~R!92wet8!%uDBynYOMyromFn)Z*E(33S6v1&FjsQi
zMf%-^$tlMk^v3Oc)zd3Vk3SSY_9m^G*<vc}O27fiSGdd9^++x97lAVCC=OCY@AFWQ
zw-qqgDPCLzU9c?8*e;oh$h#!%I+RHI&K%C97lO{&Wo{U&clHZbb`9~}GY5GL$nKo3
ztFMvYmJGyW0F+lmI-K;SDz6+m@RTxkkVhSjGS%9J*ES8g0!$(jkB()@?_ndGve=hQ
z_1WjDb?#`;w=3|#XLNVtssiizw{eg!po~54H_zm81go5*dGjIVEm%e7HClpRFV34@
zTbEa@j;0p*yPXV5-7h5j2uFS`jx%{LWXCqcT;h4L3N)WV1|FLv7t6XAvR>-!R73|L
zv*XCnU3aSB0J95j{bms#Nb{0F?(^qJF}$UBI{J-y@-@4h@i-fP$wJvGvMwHt$EG#*
z^XW<_eZ&uiXlj5Ma9v+6pHGOb>Z5**kWx#%{mgwOH8G(Y8Qc4N^}y;_O{?OdL&5k^
zSq1VFd5NLR^0}h628}uGW=*EK!3#l~$XKrYaFTg<Shyaq)b9+T@zFN9&^Kli#cz_n
zo|nf3TXuDh$n&WU#1{v{inVD{`{|vD*AkNOgLB?FTbEF(TC&z3Qg;Y*d^Y8TQii*1
zn8vuq<W~fB?`|U14h5&%S!;19SvqI&3l5&bHhl)_^M1A1?5JT0UJV8q^J)x&i=#bB
zS&!S|1DmqY^-)}j6f-+ye!Oi3dLVEneJ!Q(iGHKfS!@!@osWOA>j;|4zgTHSgNdE^
z=1)fqgn~|d$#0W!EvF=$LP1i@e7>>9&gDGGSp|ynD)`)C^vULOnwmlx+m3kTsn+)$
zXA@#nLr`MwX&ZS?S<XO3of19woSe1ZM8sGTW!((v(=P9_Qmtnpi_a=ec2>X7*Ud_v
zt?%QIS%ZW8#HuaZ7;<Z?HI*l3GY#Wb`eFd@)>r0JRJ!=k<Rjw+047k0z^<<9M`jn1
zsPuDHRb|w6qE(QfPeWl)(XOi9g&sDBHa}y90g?wO+0Zvdu5Ve`+wnhT9yWC!P==;!
z*Ec-$ULp7DTr+DZ1kD|(LQHnNpTgAWPS;jBzAl>Cx{>#)&S^U>Ddi3gCg@O#Pi<!)
zB<a#ke^o24q0Qa78A-4ao=Xbi=WTgBR*5(V7z0Wt8HlY(A8$+uYcbL8o=@#md1@^+
zO&gQEal$Zllx;r_WF62tLfLaDD`w`n5%Ev)-FuOqLBhZP?Muq-`^Qq{(nO1=w+<rT
zkM53lpSaIiBU)88ShQkr6nO`RJEa?B7bz7h<RjnS@0JQ6+k07j@L{R3SC85OW7dy|
zE+0t>#1Tat-@lb22qexbE~clc|LS4Xwtmh`{8jW+bt&zgJz(^`sO?gYqE|#}BipR{
z;}Gl<pJg=jA!rh{AJ!DNAHE|NjJ=-*Q>bcp{iU_2XK^}{%#=ePRFu8Vo_IXrT||)J
z2-k;uV$*#<^?9Lt?T|-g7IUX>vq;Vm*FCEt%qS*NB5n8d<mmhH!0O%&-*v+hzFpGu
zX1|70UTpWx6hpqPm6L@syBaZ}ruK=*%BqKo38^X1PpwDaKN#p&THc^`Nvnj0HgDvR
zwTk@We^{>!GyD=gMyzS!+xinwTdsWg*!*)gu8((NrKWXUk!{auQD$L8BI^FE{pqHE
z%G7s9<^`<7{I`@>BGZ4_GITSSE7)yd!s+3&X$fzkcRNiVI}Uk|6N$~AH*B4pv9$$y
zoi{@d9o0Eq0(=IRb8`bE4eO9m`L}MJB0e>#4$_Gc;*WR^kyX_(4xV)OE5+}vSf=4k
zMI6@IWYvD1P=fc@YeM1gHLOQ;$Xq}|TsE$KOJ&unKm*9ERkwd+?cRP_<m$qNLl2)5
z@giyR$pX+0T&oW$wI`mY7vDc>d%X8)3P5jIR6hSems6{8Fhllity)L*(prFItmg2;
zo$i8JFe-7d3i4ZLKcIXn8IIZQN96lRV3Y$2gzj6-4Ej|nGM_k9^1dSZp;lMGwGan5
zD1=%EU3nEAd#^0h8}RdU-aK2Ed>Z9>R!kHfj%708?S1hsIEN>L^x_cZRa}@bu5z(e
zXS4_^8s@s<l~%K!ULV;e+9Dfot!6>k3Z8#5YyUo3i&;Y2=GjH9^A~amav<<D?6Ucw
zzTRVQJ-dg=vvTvBZEira4G*?Sqpn&}s5|RkigXM?hfb+he~;YL6Z7P|6SNlemfC`E
zMsd~eeT-xV*VKmY)^VC^5-!*xs#y{=X)kOiCaA-m7A9-D{r77bMog_Jm%ypaeqbRo
zyO-<`saIhh2INxH&83wmF31;JE_-3vl&B!?n8Ri&kVo^mekM!ZzUw5IU{v$o^kGU(
zrAsEcD=krS)8ONdwdV12HE)6fr>J*WT^sot@WWz+4xYl}zY7n--FH3C^(WT73#Vc4
z!P_{b#Gh<}=*I&!;vDaUE=}=^a<P({pv?M1B5xQzs*)zlR(kmZJx?NxtDI#u3r(4t
zrmCwVx)-}Tax$#LUgN!&h2#XOrVdlwd>4{{gjmrJp0@nb9NPQUTd-;9xYWe*+u_u%
z{+>@>M_o1a1?Bn6$(TLrwwW!hfzWbgy-^LDy|IF!x&-2{S#a`nn)rgimxh~oFpitS
z84{kiZavs#QZ|-zkXyHcrTT+w-L{VtNS-?cKSN*^k90WNZ6;AulYRB0zEJ!?x~v}9
z)S5cX$XVm7f_E@fdvbO#?XXnDOi4IRsM@M{faE`ozN9|!wdXsIt_3s7d8_R-=h~l^
z*?Z0^qDmTF?L>zNO~^Ct^U=hbYJ@t9jHdi1qXDCM+bBAN^e)8eYP4{nNDC{w?!q@y
z$5m;oSUkS$j%+3BzalV)gzZm@+Zr#XdtSUd@O*-M<qU1_zLRg)!Zx!2@fCkrc)%y6
z?wtol)wS{<%{ew1F-J{=BW{c5-?Jm@e2{pStxyy=va^RLMd2C*m_4t~m|~T5lD>Vo
zC<E%$UNpVW^Z-eCs#1;dKjKYa&FArlhev~y)S)Z;K%Z*+xH85(udW73sFMUfz~ZDW
z$kD&q<Zu|g&UwlI3PxORm@+JR_Z2<trFpy4W}V#9jq@JShnoY9k_z*Ivlyw>La*d$
zHp2F2%|o1bz7P5p0}YNwPMF(ROi3+)FvL;&C$lZ@F+hyA_3l+#d1aBW^jlCNei@M~
z`fM+mkw~k&{dO<>)!Nixo=BNN%Cy;nHp>Fmj;i<A_zV#<YV2caMpcwnbww*>So(5j
z>O?=jLW%zFaW-eYh~Oft4heO~$k_vVgjEmYgV>-xhstLL^=x|pXZ9_=;ndNmc=Ki}
zW?({R$<Jvu1T>d&i%ejYIt_b_x{{%Xh!_K~cz2@=t={%PX!gc6@g+kX)eUlv%gESQ
zfRqTE`=hPNipg(p76sDKTQ-%<eNO<i>PTEVD<Z=oOpK77kR|ejG=9HTKw7$P&2AOQ
zl)_j9S<>Gt5I~%=*NNv3_Bpu!lnRm!SJZ@N^$rW$9$JPYc4n8r-er!714UR4hpKJ}
z!I4==**I@C?lM>XIKZ@su<SQWn!y^}+U|Mvu?*>*)qt|YZWpD#ciGRp?OJ9q9U+Dt
zUiRrMMkIu&bOt?H;t}&-)gRl>aY|SVSf~owBkxIo{Ck|A>n_4K0}60rv4`7T3!Z9y
zJUy_CXr5E5>S5EDSSn+`RN48Q1ncJmThD)GQwh0EHodWJdLtiLR$JeH()8|}O&t07
zDQ0>hjg*+Y7Rl81s_KE8ZSoTb`VtuuW-lLTHNvOpGf<s&{lO$*v~C=?y4;-g2mGTF
zp3B+_=h#<m&&+q?@YX?;yIY1ucib6c>b-Jb?IpMLxU_0Go$GeYoHg9>MTE!K=^`cR
zx#Jg__u6K&)GFna?(Uq>yUCiJNb8V27zk~fvfNXQJ05tmQ#yk+6}~XyV=xQPr^p^x
zm`u2Lpe~?j7qM|93Y5yRcOj;1TmHkHNf9U=hVHa;EgtlrO+2=^NMGFo7#HnEd-hq_
z8CnTVn%-D;e<!m(0}K;O94M`0Rtq*ew05~z=6%NA3f@7h*_F4LCJcI+m*+E=Xf4N5
zhm0Zq=__~cdT@zoYa*C&4;t=Ls=FR^uRoaLyM|L&!J=~EKzfSY&lcJ&qCubO79vFE
zAx9p*Us>2H<W9&Ju%PBa07u!_R!ZMfo#0HGS*Pzt_yiUsK#Fa>Z#MvEjEr9zBmj<l
zt^=F78wk%&X5Uzw;^u-Vp}k-q$~eNFG6FML`k|G!guASFq}o9`jlbggu3Odv!rTDQ
z%*I`3h)&$9X>#8R=Pu8kI8sFZz`l2;z~JHhy2qYNbpMPbbzxSU(>Sfp8p-c!?}sPb
zOA&SL*)TGn^=TpYo5>LB`cu*YJp<>`$@_h_v+{=%uj@#`63;(<FY!ggvz70DAx<x`
z5m?9ktVS_q&ykTgAiUGJ?<Zo{C>UrLu#8FWAS$I`^0mWeS9&=3{3eAzj&sx#zSC8z
z+@k`^$Up%uc1<5dF82jZYu$Lgmg{iEg;r`JCA<9Eo$mJfZk(^g=~Q%W7RZTlZ1k^R
zvk|nPiAEMo!V7zsmO_|Yzc0L7jl!jNxe%SvSBbq0@hLSEGBqdJ;_mhwD8RAX#jc6O
zC{wYR+@l6fosJ~5`g5<&eSU19R#IE-I{uU=DS>IvzMk!_P|36ly`esKupQ{@?U^Tn
z_xWd1r6N35Tc(^;y+a2^+>-if1((|)>xT=I96(LLX`#(YQzvd|Fr2zG$U3e~)t}nB
z*M7eM!COe;^m}<Gnl7WslC^>3BSE@#u1|8G(ugWwFAQh)oXL)fxo+I<yL~lG))i&Y
z5hXk4$xaw9K(?dzi$8Ra?0~bT{oYLXxR1^JU1JgoCaxZF_!xlER_w`7)w4%~bBJg&
z$*hEtgXM3_>(?I~I@ljzqaUsq?!7r#*B^=PGOst{!ogLNUpt@oEi+893bTKsqK@Y|
zu9r#6C-%CI|7mroy@ElLNoSYWc&dNgV}{t$z)nH)Gzw%UfD^{)4Q?#jJ>4zoCPar}
z7PCM`*ra^+5T$3TANHtuzyZ2QUPc(*+-3NqNd1#cj~DwM)7;}^d!eavWesrtO#=2<
zmuUk@>$u>zpQ_J9qx84(@gsS<aN`a#hi8vDYKBgmHzXT6QR|(*=o-Vvy^vby<K#47
zs~G5)mwQLz36Oil^i)SNC_9a6l2DpAy<x%KY^W<-Bl{6K<GLwm?+|(POW$%9STUnM
z7<f#ntu}n;G<kUS+yIN~z$2`x`L*ctj(1F*<){h?(Z+VZil=_7qROq<H#0$Dgbp*4
zmY-OAKl@2qMbqJqukdMM^8zzjat*h#GvR|P_lP%`?%GqIBpKT%Ml|lhp>M?Z!s(l`
zI0V_mwUIM%VsR%15|M;^FI1pXf{zaB$lA9HP92trtBgW1LR559*k8%7c1D4EgKa#g
z7xeGlJp;Upc)q*lDJ1ap+{x4zCiKzaB*iQ&rqfU6U{;(+ROc5S*8)1xb`P+UywSi2
z=Z6x4E^_@@gVh%!dx$SgKeA+trnJ<u>nJ!j@<gpHH%4foe}zpC-e;&VTA-aLUD#}^
zErxa#QR+djS8!rsjBBh)%1jQv)Ub*W758T~R_e!hR;lru4yNS48*e_R_{b^A?<jY<
zJk_K~gkoBX`qX|#jk2E*JM+x#uFX61Jf;)z4~xjS0^1s3ERttm6Ay=0-a<G6J)0oT
zfozcWQQ*1ru4`*q@Ms&@$Fwl!^2~MQn+(nQm*9h=plTfCemyWmv}{rfRx?I&+{DU|
zbXqtCh?$i9gC$^@Ov%naT$aLD54mJ`%nbZwa`9J%Xc<2+=$WnEYsC2XlETXI$rD%5
z;ZG~!ju%AvA_kp9C)Fy%)Og}wd5=WP$er#T9Ac*Ay!#C7^UZ1uO!h1{{i?wT0lf9)
z^uTWg4SxQn>Z339S-w<=Zn6m0l$Y(iYpfX!KR5mUavHz3<FWrbQcNCT**!Tp(95j9
zNqzAnRJQN$Z1$W9aV{Gg%sHlmnzQ{)Uh!*Fr{?8p`7nQ%V_<tlZy1`z@K$3n1Q71~
zGIVv%*ML<#DKQoh>NTtQ@CZL8EF4_2B{1CQ7u)SSZuR+heN5N~Ex}HC#X`5S=psi%
z$}wIM$SP#7h`;c&ph?m7+~o%VQ908`S}36x&ioX*VZK0&6GpyD)IzQ^s@UQZ@v}PS
zetm$7hJ6?iJIi5|xK>g_Wh8NjD}t$h=EHeY2gGaOaULw8Mt_S{A#oF_m$*BWzg9lI
zyR_nV9uog}`f|D>vY0b)5>8O6S=z%vIztH)@OXoqeY=}_n~@Aq@3j>507Mt27|gju
z#3?N3p7VK>3_|01(y6OF(*F26zIwQI*38=dLS1D01pmsAIXP&6nN402$kq#ZyC;{`
zidr0NE~E)6@=e0~UbP#F5cJ<4_-=gYT|qa>?gBaruZ%Q)F>egxjO}ImJ2QEWj#dHF
zEZuD)U}=&O{vhLoINp;RHv_Bh9yfe?b(##WGX731O-}sn)a}J9I=EZ4Al%r{#kR2p
z?4!To9ww$W{DV-6UinaAblh#bH*9@CWx_7YrB_RL7Q{vLeIZ|fj@m-pqP%s-9A_&p
z)d9$6$TPXu?=7ck4-NPYXKeI9x|*<tZN8#$hS0GV*`uPB9LEQVWDA~KtqjvgGGxh2
z_{n?l=gR`khwLu3Jd4C29S-j`jRPDvdB;8Fry4+J2lndx`g%ksqS%kx##?7kRekBQ
z5CqrH8BwbOWN;`oe=9s7R#)c~$}Hr}u6|(twzk%Oz^e!B1D2IFD7dtpU-@1K4FN_b
z+j$`@JW?kPQ410m$~Q_l$38VS4m1LrAxJvYS||T4%mdNO?v~r89+keR<XDze&Yv>-
zoH0TJ5JCBq6<$NrSIuCssX%Bz$q0m0kLr(EjF2{=gl&_iiwPC&F9|(SX&~H|tEgJ?
zRFG(3;&l+L6r3!sbu*xUEWc^h)*+mrHqP<g2ryPGOza&y8z%PFXR;r{67Il9VO#!G
zD}gwi&i>-HYPb_ubHYJw>MIUdZN5Zo(fE4U9r2Rd!`!1wtGiUfdmu2GnrlUrXi6Be
zogLA{ME#8+jX43JK*xN0jwNq|4DR{$_0AZet-I3}Z^<aGO+R)jXB9<_M&r0}-i9uT
ze|ydhdPqk5zz*7d=4AcV&va7$G{m`bu3SK1S^sdg0UZ_-6B@r(Da^x)e85x3QN%G=
zTfLt>U{21ii1HmW))|GH>+3T=Iw=k=tCn8n+;MTrZA|IskJ5eKk8=Z1J%(~<y7yi=
zn#N^q3W9nB`MfWwcsf;z?#cL!Ecn$sCwg=r*BXJb$^8?N+nmhJml@DEK^sem?p)MT
z(Pz$pgaw;V)4tqlv~Wi=F9&Ta&C_DA{o@Rn<y9T*s$lV?zGbVPRbcTTn&J{EdYPU8
zyR%d!`@Lq7G^QfKzwF#FH$co<eVSTliOa-wd)IL#?Jxpb_K77Da<9R!4}Yw7nKYsO
z_DmC3r4_me<}F@bp!=y#{}ml`n|Sajxc!BA1=#{t@IJ-xm3znm2_HZBuzOFoEcKK0
zI8?*?tb3QfnM;WP*OxuOC$CfFGIh6w-}mXPi+d?@dUKC@?W^dtDon+3-D1a}HEe&q
zJZ6C0b7|<la>c2>Q`-<K^9jO4Egoy47LT9Aa-|OxI+vHEd{_9gA<K4Kq1vOyf*+}y
zC*3ka2U**l=P5$1>a1%W&7`V#V6H<dxy01`50VnKsbMLP=A=an-=LzlVx)3x=))jU
z1|joVOB6NX*`vid_W2w#cO&SWEg#|mY1B(qsyp9?+CU9PBz!OZ44II#w=9{<=_pma
z>zB;HJQtO3PEQ`<lXvQRupj!<1;(SVuR!A*A8wd7?EwV#zs27Bx|NesEvlcSPnc-U
z#7+~jG43z@nXs-W)VU3FvN}0|zHP9nRE=4=$USM@Z#big8^-;;(OV3OQhb_AEy2F?
zI+^tGA?qj&cYn>f$>eHfxxsE8|4~im0riM!d)+(<7^l}nZn&#K%&elNUlzV)BdM0L
zenLhk^NY2Jt@qltkQwR_kf4x{=UWMKXujJCfL(<cXRYC+Ud|U}V#@uM@@n;Fae!It
zC`h^cvfIVJ5nCIWYX6HUWc1uggiumTvKY&Z)rIb&zwoOH)X>R61b1C96*JDc!jt>v
zy;{})OIjVbv+ABNow}jHrE>_h52V|lQhcbN%-0PG-{(ty`In!hOuaQNwtRsqixGx8
zVN~3CdR0SAQ-0#JMXPOCjngGn@-hxk#rfFLG6hvoZ+C7hbf;Fe&Y)_1I+jnz=RKY$
z#oX{J_CVP(bD3F1)V1>74RCH$vz$}{Mo5F~-Q6G>0Zj2odecrmiltkQO|#E(WB6}B
z1Z#T?Ohi@3^sp~Jlgl%H)Gpm@?^Jnb{JSxZ%M_&r{gQsFwSAPy+%B@Yz{BQqPWs8a
zA4Qw5Yt?l^QV^C`$pBUUP{=I>RM~0Y;BZ8{v?%nP??z3>Xmeg?6-C2%SETv|RZ|*f
zy;axjYQqVaTpWNB5OeRrzH#5Qysx0Xf|AaxuuTN2v*oWU_n^ehURczEZS4RcXTBPl
ztw{6~$bh4WY2ZiT{u9xiD@1iZ>Yw|iz4V@6yUA!>e1f80%EDK**l~%+L4(Gf@|u?l
z-DiYB7)KUYoV3ND<@kdpk49Q7@OUpO@|hipCP$A}D3rd4yHkphXk&VRLWMPVRnOF?
z=zM+MfRb_VQ%I_g@s9UY<pPpEf}G|AkFku$jyN^SFK2TtI*g$sCPqgg<dL4f%Hq9c
zd~kW+#G!CpZF!EBQBIdM<Jx-9u4Jw@{}z;M`qK?{lkOQ~=b0yGzAXN#u`Mp;bKyvd
zhwmi-wJ~Y>b!%P77%#$X)JkAkD(<9W0m5riQBzI@KQvPUA0c0ru#cppPiG>GIvCpD
zC!gvF@o5cjE@B=!YmOLHhIq&~dWl*^{_Y|SSi~^1IOR%H)#F$$yk)r`25?p>3QmB%
z*Kf24z4UrARu&LHva)-$aXcN9y0v7^B<*NRy*2_~X$fy$9`iuu7u6;?W0Io2<2`;T
za%ba4Vsq8j^sPzw_#LqE8q1ta%q-)=*Tf?8D8*zUF+t;z$pO&Q?(V5g!IUqiD<OPB
zI{w-oT6=S_y|}7b*^oe@4F^0x{shT^exk;jsPP)le9xf!o~2SM6DFU7u7^&LH-5TP
z8iAP8fL;azk&a3%qDO#sz13K<UWZFV;U+U=J}e-F?b#s!lP;v*Bwj`D2{mzCYP0Qq
zbym1dq@RHK%$<t#I_FB~!mQXN3ay*`JR)^~SJFeQ)|k||>=jUX%dUVM;4oYExQ7ho
zqg0wu%Y2$~GEJ4(7-c2bpcqTz6CX~zWN3CmIO%f;o-VZ$y<v~!1Uk`a#Q>mIbgXVj
zP@-3A^tRX|h)_{C7OoQtn3G<urGT^OEF7YWNcOXHR*f=^RJzj@)qCxSu?AI$drnH1
zN7V5UfKGqO{%ky*En>rpziQRS^j_sT!5FP!&0XsIzY?(3ZnSnpXB2~vpudEq`*NPa
z`3VD$gu#s;dG*1BxtQcRjbiXcbJt748j`);hEMMBn0;HWP}@nZX8I0ZE-VT+_-U1d
zceIl|8K`D9zfKXwv@G%Pw<Lj>^ewrzJU`P}qeu4R6Tlw^LZJiv{^E)&tl+&Ieh^c5
zV;@Hye!e7S;w+Z?IHRxG!YuR#@<v<GJ?A!bvBjQA)%?6d^_aHZ9iE_fkA3zjSwRYx
z<BC)AeR$+)w1zi<y+pQ4T`{a$=|#$!F1g1N>ZPJ(b+t7Ut`S+{el@voyJtY4^M`QU
z{L#*%+aQss?B{D#FhU-q#EE0dr-G`BX=#|{tP*v)>fW0?Pb9~-@ZY|LX4T+79UZWs
zGFsAT&b#gU?HcoG;USure;N&{bofHdo@YSklE*yJWAD^?ctBo~`(&$62cl2iJT9-H
zmlDvw!6?`a_~apdLADJT>Wh({`^&k!7LLBzc*az$J{f9T{cK3QuRR<wu6*ygs9He(
zME>mhU&LxO1{Of!F{wxxv?@&c7IYP~|8HBUf6V~3c>d3${=wi^9`KJc{9_RRt3UWC
zeqEwxBSuk>Rs(k_U%EG;_;+~|OSmQA^%>bkg~;36=OZF&Sx;WS4n+g{ovcx^on|uO
zi;Vr7T8YjGcx->OJZF4_bT%?0q5JdlH?Xj&=|b6D{7Y+$Cq|Skq6P#&2bVCTUo`jU
zVtBwai~`V<R1X!0NS!EVSeT+{vsu8OqGQDvg+gzcd{9tBZJv-8R#5O$H6U22jTM;u
zH~0DSx+naA5bMt={9_FNpz)_J{e#9oX#B5E@gGO=k7@j48vmHa|1bH2tKaq9J?<#{
zf1^-Ou(XX14TXrnCnJ6|rs24veGw!n**{%_tMhe<*h0{WN}HwO*??^*H9DWCt@Y2v
z0X_^Ckx9%|+~9w;p^v<13H-Y|de7zgK^Sd7-l{CBpU=v9{TkF<m3`9bi7@cC@Vz@4
zNOz@st`q^ELQ4t#XMI!xg(?iGZOG++_DnvpxL)<t!%S2E0H3MFB#-j?PeG9?e2Wf(
z4XFBbzjZz+F)UaY0A(@Ygoi^(OP;D-H5XkAcy^bA&crHt{xn=E_71hh3WJyChlc1x
z0qvh#Ii4`LEDq$#3Z;Vz=0%V~sc3RP>G0}0S_q8!cFsWo;WmW)vfSr%uE8T!UK4>`
z`Lj=1_1<xPxF&8?{@sHri2uSOIbgkd_{C3hn|kjiljkC=s+j{88Zw_k6~ijBHWQI}
z_41fE&nn0-tWvSM=`ufXAoX_Gl9pZ2*FL<t!cKSvPbqe5mnj7MOa58oxU?_3nb>8~
z9#?$)&*=_U-SQE=KYDX9Yt|oNe@7?s=eKHKPdz@XdD-*vYkS{i>3yN@E4f@l3%+x#
z4naVcF3lDf%@#^8F2Ys)=qglkdZI`FlB!RD?ByXs+PPqtd{<^O-WuY2I!EBgvZd7F
zh{yPA3n<@pBn@B5d-yAipW7*-(X1bYgI*${<@1NGo<oMw*_PG)7@V3MA_M30W$NS?
z&d2zHMZhS*$53~JgiB2yRqPNUdgi13(Nb2<zjs3YnR}oT0^Y#aigN;<VH)aN_tzd%
zhv{4?s0U5P2N^I&u5#DGC$*5@{b#?X_Y-v9s@IKgqsjj@z4%oO`{ULY;_Fm2O-^~Z
z|Lx9?XmU!!5B_b2|KraVcGTkpvh$w&x5pX1i5C2?JR|)Mi^v)w=dIuSjQ)dD#);kk
z{ccv?(70b`0sQ{&zkJ%3dwoY{pn&#|?Xv%J{cnI0GjbmOhcW;5j;}3I(0ED8i~Llg
z|9pGP&F8*9^Su9kuq!nAag5#!v)kPLPlEj$aw?j&8~<&@Z%Nm1V$+pXvHqUyzxt%V
zCBPygP5$>w|2@RN331?NV#a=0@|*v3{nza%Y)}5fIKRR1plZ39YdMPh?!VoMQakkj
zHsb#aYWE*x`j4vpmig7E|6f#XTkLP^`Zok}KrN#O>u$5vx3_9QhLR@{<x84A_8Cyt
zFMsLz6SrHnZ`s@i9&lcrlJP$bGXMk4`Xa0wBZ%jh_0ZC_kjBz_nH2okLYYBeR8?T`
z_U|RsUp^=K7SS8GI<3EEBiw=W4YNA}&|koc`VJOVi_H)Vru%=iG!?zqce-(fMAUw)
z^L_Ynx0UE0-If0~$CuAhaX@v=PKn@`Q}{KBe;a_e4&|ZJ&TfwI|Cbw4hjsvE;xd{3
zH<wrVd>hQTK9hQ18C<Gvn%3FuU%UHGFzinNQtzTdiCT!q|NOeJCXSN&QqgeB0$!f`
z_+528McNQ64pNFgCLBP6^6-+^=ULE-adZDY9=NIp5Q;A5YI6x%5z0LI!_g|B+@))l
zcxnlKi_B1o_m(x!9~V*cc&+qq_4bWF{?~=S{hUv1S1g15&L@>h_B8papET%y_mG88
zT5g)trQTZqSdN;O{G_T_+rMGUkM*($r-`2?kmC1+`a~4o`kU`Y^!_K_Err7H1{2Uo
zZR;Ou*HVc3f<o?x@#nX+Xs4bl@`eB2&VMCzj60~sD65#?OQY9sMn6YQt^8S6zUp1n
zi>Rh+5WWB3-{DFca2nLzeDkWV=vYR%R_HIJ)v*87m$ooohpikWG{kWue^Yc<eUyeZ
zY}Ms2{kuqWVqb$mg2;i=)BGH@TdFy12E3dcWPMc*?t{D&3rft4(a=hzG@vF_4i21A
zv=JKL_2zu<AIY%Zacox3OMv`oAA<om&qxbO)bOqkpk92Phv(Msu~8jBn%Ey>XoMb_
zbSBugo`IUYn+wOtX;W2+SgQOEhZ!lTk0#VR9;{cm_OtAK;R$h`!0n<ER(LlN;Y|}V
zKXpHai^nzHEse;$E_^J=PE_DkIjy!8j`Ro_%#vLsiPHTp=aITPiQoX!+v@GxlMYq(
z+!tV7wW^i$2POv4{`2tyC>|yFq}M#s0ley@S4w?5&20wg(1(X;vm?v&a`&av@jr>Y
zd(i7^3vzs@v6XCHyazP*)MS8ZxZ8;gpgWMl_AdNFoH<1C7#=ceKplW~Seoko)hkp<
z{+ak|fcnHKgmR=ohalJDrr;%FOm9hF0$ZAgyq<!>VNR(iy?TXnhy1{BE0KO9Azy-P
zjG2$y68h2U##VDv&2HZKL8z7|=3i*Nrbp}E%+*b4{>bmLG?-H|=A2ud#;=NeuBpqK
zXUG{}$-JEw+%KE|*ZBzC!<(A4s8#qBDhNx5yRmgYO(qsI<0DYPQ>TJCW{jvj(qt-e
z{c<Lasxz~TZd*3QUS--cF!n^hyuff&B&2Wyx>0ZcV20f0;{`jVuhisK#}9eCyYo#Z
z{gWM+5G9M?+XwTOCA^*z&d$$&Ij5J;112vU4tPEB-2Jna$UP3bV+it8W_j)P7mp5l
z#)BmerqPaCN7}>ojV23M9yaV+BD<$vt_`62%6w&R1Z~da;%?S0aK}(FSM!kpYEx4i
zD>;-L1v*veOP@>S^w@T-#$=Q6Si@7FQlFQn&z*xXZo5c`iKS0Hwo4WcnQn>wv_>?Q
z(3vyBc?xwoY-%($*D<y4b?bpYCp&H1&qB1a@8mmntEn??Y7kA7JRGU^Z7vVV$Cq2P
zzCV5_TV3E%G<T2RVV1mD1tW@j<1}Hdxd_kvCD<*jdeC|ov$uGq?W>HZk%6w&KKRG>
znzR1zzQ7M;>;aFRQ*GyXolL{e^doc6b%M{)NnQ3FJC2%|M=fiq6u$94`{;TI<Vt%|
zUhdw-Aedm<K~41$Px|L34i*$Sx2D*k5jL=TtQn${Kw_3#U@T!@o>shPo4y!LFCny{
zVW@2tfrATSA{^UbA8MwT=sOr@3VUZuFHyC-xR|_jcTr0tR7XG2Eax<)T1TxjZrmcp
zsJj>+FP>mj1lzibhQM^0eO&?rC)R*Q_4ZFs38zQ##+r+Ji~4F(Kn%O;da4giR6jaD
zMx^vo3Vn<c#{7l~<4qtQ%iS(9s(AXhEH;&xd-ZTUv<XJ**Y<pwsLPo?rFPncKjUt6
zPyV^>8Mv|WaRyGu!^+27BGC-{=*CC05ug6<?gNr_-CDEFkLdG#-ThrFr=scO(#9(X
zsMT<QrF8~B``j0^`X8HH_0l}E>@U-qPj$lO4P8|1j#5K7{Zo9$o>8N)jj@_d?ztCo
zM^%9zpnSn<o8Me&0EK^T`KobXG*l8N<NPHtLoR}{?#k_G-9v#2pEoFwqJN@IyKW}|
zcF#inZfvN~8Ld-SmD31q$B6eDO3ILHauE&x>DFIXqdasMe${~E80xr*ix-IG$^rEc
z4m|3%@dmtJ<xm`lyq*pl3)EJtPqO~L((Nr>-7Rbl3p?)={qwdCia~H3@Gz#3+W-`h
zE{Mb~GR^#S_^Ld`;~tcDXW*EM#<EA6)|j0Z&oOP+nO^hUZERxRV|beHeU0N5>cp;X
zxUfok%kFsel!0gWhqvt~_@x>Nxg8$kIjj%uA>RGhd89oRRH$iV)N7P{y$^WLv?A{f
z)Y=B=&0yUf@n;h$9DljRg_{1sGwvS&Dd5%h^9Av*k)IM=uiM|s@#&Q{ZHz1%qEkcd
zLh(VMjv=W?XwDa;*{dkZ@zJ{c4nj4<Y(^kv)*!Q6S`^>e-9z>^<AEnW=ya+4?d`JE
zU~qZ!?C3fu%Es5;c$eHXJ8sbRYbI$Z{^vs}U0NLm@~>yP{3|>B?UFsU<$ArRk;B5!
z@C~85{^}<|=w`C(;B1SeH&xIqcC*>Y_G21i#_YS=D?GX3oDavh%Haz-{Pq$S?x^Ol
zF{w!_>zYQu>W(A-Ug<c>U;9<o_c1--7;WF7AqERJ)R5L&Dy+q~pB|F)<`?>{Q7i*K
z)($c4{*n4WAqy};CdzW7j`*l20e2_8$anR93$jT7d>0y6p+$&$NiLVK0M6O?CEj@N
z2D7hm#l(mTLJwB5y~KTTEWCN1PuOTi4|pm2vP`0SrX=X;TrB+-lB!Dd@AZ4>>!%iX
zNrRhV+U`n%jnYSy1kH-xm77LvsKNApY_O?a1=lzX$9)`J-d{4bQ`DFh#iM0Lunssl
zv*8B)3hk>NKN4Nn{z|-$P-*Y5aE&#Rovhx{#iS#H1Onsu6;}9{8N>uPvtc91fw@wM
z42FF$dvaMW>)Fi$d*I$7`W^lqmyQoASQVEg6}|tM7;HaX!!>sa#@o=WAL?&!C-Xe<
zD*)rqCVb1btMn@InO|ML>*g|H>MVLNu3<*Ci^3mBsqTq0TgxIZIh#DaM&Q^~dlZgp
zG`5_i{o2})S-tm1%}rS9(O~*^3=;tpZ=s6?s^y0adF!G1A@4<5Z|a<_8g;N)>K2ci
zttbM-PNjSsZ`SVqJ-EO6oNxMt4izpLVrBG(iC(h&{Lfv0dGIe^4_%{~Tjknu)a-T0
zytnUrHm$(OYul~6Igs60{_g!$-+PK*MN6i{p7yVE_N2DD;ZsW$<JiFF{Xs`a!0qVz
zCyix0$Bl*vEr7AAz~as0`*qs_)4Nqq`)zFSHY)6A5m6BIVE*uG+UY`PXSSYQP9BZi
zM}dD4Cw={lwXu?th;QzvDH_7f1hpOE&Qls85u8nS2D-F#2&0Pgz{zqISHI!)Tre)<
z11-UJs!EmpevJ23399ets-`pJ<FX={+fy|-DpfcpBOQklVC6a-)&ypZMH16gv?wL-
zagXi6OY%H%UYNxM<2N~edFQ>*Ck8Arud>P%WEiryud+ho1b7B7i+TOQ9jC-HPGK9G
z67+y?gN^Tx!n^!C*JlqQ>d;<*&?5r!*qGF@w~v?R{h0+;8X=Ro&aY6%FaYhpEGP3z
z@xL<ax%o7(v`U&x_0w+kahd)bWy}5J&&~~R*%}4XP}^CXrq~r#jpLmIQx|(?aL!Lw
zj^8x$Ez9>_0$uQ)Z|>xWE){XnZM1Hu6&3lHYQW10v$3*%G>Jphe6}x}(*RR^*b1Qw
zVn-6%MyXLH@uYxZ>7!-bJjZ?n<Dq}ODy~l*?eW*Z?g0x)`o+E~H$@Q0t1&gTIG7_e
zF(#z~G(dY!zAmKYqeLq%IeFX3xQ&|6?|Ue3W)iJ~&e7DvcQ2T?Hs-DAN8={r0=`(;
z4@Fp_j&8agPFTMhi?&lj63ct`2Fu#<uG7q1Wa}jQrT&F#?nzIS!tPVdzgWMk-SrK`
zA!&m=t@>#m-pAa2%@B+I)xFYsBmIZU(}R$_^%n7wJ!=LX0=L|PK0ZMmjgWY)ru?s2
zi3K7<njwCSyD~%W&chlZ7UK440BqD{-t;ikpL7?!-A4AWUVrc!8ag}1x6fS#TFS}I
zEmk&W*LYSH)QXhgH?bz^WJ0sJ??1kLIMk?9DL8yfo8P>q82=o6rvG7oKfge`LWhG6
z8~e}P;kCPbs%gVVbqru>Icle~K%{1@V3n+$onHpc)R8NEs6f%GRHZ-%6>R+z=Ch(V
zaW=QoN6SYI0@#)cL*#j&rwr5rb2=4AM{H9xj1Hng&L(n9Q&mZJAUq*5{)=2)ySr8Z
zYHJ4a8dIV-i6tNj)L~HIF{pzV!lb@3Aptt%A4{LzQK!}1O$86`9FMK5gBD%r@b9YF
zvz=ZKWgwuJ$-aLfe36pVB)V+%E?*mLfXqGgQ&DYTEDz@^&{bGSPGJ^6Mq>vCt0fr=
zUz~Puf~M>d3#ZjNQnh<Z4NU2j)YN^<n${&6mm;Wro6|cT%u!T2(+5I2gb%GC+(YTY
z`;%PiDXo#VZ=3^rg<Qh*VU9%#?uSG2Lh0-_<#Q$?d&c00@c7GQzk$+(&_{<53O{8C
zwX>mBPZHx_HnaKx<wWa!#-?0u<&1G?gaj&lIuAh!E->uTsaX|Gkp#|$NY3vRYc&i_
zfGdRO5Dvmq>?fZVihuv6=QhpM7YW#N=3t?dMM~iyppNIkP4i-|GVGoFH9Q*nBkLID
zJmC6zGo|`LnnM&B#74#po25x5teV(tE#2j%_f0VTO{ba@8<%XeVqW)SiwSOp4}_Q<
z)x@ze!6#jort1M>w)jkheCq*0;pldU<b7&_iFqKTbF>@efWb`2>GGm#g`ro7nien^
zs7XmfML-ZyC&;{#HoSeq*n79y*q-%B7~T|JCRoo&d2TdmngDbwPfaX7*Viif&Nqb!
zPdy`jO6|`bL_UN#!10EDZ91hBz+4r}cIbgg8Cri^vf8<QU&Zm_;N1wqmqSO~^9;}z
z`Uv0GP~E@Gdop6+3=`j!uQQ(Jue|T037R`BO|>|gw1OAjjHXgvrczml5Z6=gkx|z4
z|E$G0)!t(>#C5Ow4@C}qT@T(Bg6nt<XY8gd<)p!5+&72sNGJpG=BI!K>jPVAxKc5+
zQHBBY1VVGKR_V0Up$|N(p)6z=CD_%a^)EJ3(`%*#-e~kttEYz9?>hUhdmYsGf~Ow%
zj|pW<qW?I#>?IttA<@s^qp$ef9p2F`g+XqELPI)slE<of%9IEK#RL*yE)7q0%y2t{
zL84H`CF)QLx{Y8pQ`G4ihef*1m$w%186jVMdg&H<c(nQU+zukbFc6(*zz4+5Oe5|4
z-YjluwXCxsVf~43ndk&_?CyGUNSm(9L7#E!0TZNx3Nkstvz}q{FM<)E@Z<@>*PVs<
z*A;jl#Yp_Mp&E?>nktL7z06)Oi(K|(hLllf;7oC_RjQ0Ge_Aj)(hR9bnAzER7vpk{
zi9kxhxV|1^1tvv+^3{d+)u;f@i8^V?hNfkIvQcFeH?{Jbebwq6QyEJjoAl)|zUkqV
z%}|^siO{F11Z`t}e0xJ(#uHa*<uL@+e$)88G8ee33YHdFCqb!mgMm9)GgOBx1Q!+g
z<02D7a3%Qi!1%uV<s(uO<rqtusLy9;=E}h6EQ8N4^hA-{e};Ivd%a}98iuHo*`-&`
zY-)jQ1*^-0)jN9?io<@!_d~4>)#G|)8l?0zf;YS#`qSr~xkfd)597gS^BPOKCx~ic
zB`pR`hXU@?+uvCg6#{p?4V2NOoI@F4?{zd`rJqD+XV`JMhX$56MqPYE=6y)A3*|iR
z^-NWzOw(@n>;#-Lzp#&D<)69$1<#Y6vZ6gb^#7iM&lve>Val_@6RbpIfH*sU*v8I7
zC{yZNlA76D>OgpJB&g!o5wE1Ws8Tt>0MM5H3945bGY&@)MZpiTsiEU2Sq!|XF2Qw+
zj<Zj-qL;A8>Aq1ok6RewKyIr;OO%O)a_P}!l%@vu1z=n-BQ23lf*VTT8@}FoXImt}
zUS26R`Jzu;myu{qv@0>PTE`WMw{Y7gvYeHyVrpC?bPNx7*4T{!cML@VDmPX~)@+6h
z6<_cy13ayYBs3XlHnm|ztE^ISPapkJo+5quZKV6HFX|LaHiH>QKwoClf}(e$dE-Id
zCxuiS0D-o_R;K!{!cZ;w`}Hc-#@qjgy|<2vs_p)V1wlkg5kWve=>}<#QUs)P=#-8D
z=`K-Fy1S$si6I7t5T(02q`PaV-?8y|?t6Xzec!d7e_Vqz=bU}*YsY8rYwvyDr^iF(
zTpKU$Xh(jP>8FY!537sfC{S^2XAIT`bMbU<s?g7Vo88tqob#zLPq>58E%lvaXD-DM
zCDqn@J=c^R9d1-LVEn*P8F(i-O>|8fa<d$R_Tq(xp~qC2zRPECg)Z0-hxdKVY`!m<
z_fzlQ`<XT3@dV<b4co99EreFUJ@WKQ`)vT7+>k|Jv1jRkQ=9PSy8>XIA)>7Hl|CES
zaxIJqXB90y9g(&^+l@RB2&y19xx6h<Ea7taoP9MtTvLr<!Yu2Boz+^*77)JKI|UOk
zFv{q^=8PyR_pE4JL}jnGAJVw%hj(dI<(jpct~V#c^x02iM~nH{jj_aZD;eqX`8B3x
zz3Stt!i&mhpnE~hx7L8bo%jRvrAYDpyDMDHKTTAM85-9`UoRv!Y}&a<S+GQ&?PQ5r
zmD?VGaB(Pk!hx{YgQ+5S4*v{OfW`=Zq#Q2%QdFmM=`;Db;!{6k$9a(ERP~W<wVZSp
zmm9K<I>+u#q5JsJ9LUddLE627p`=sEk9%~WFLEX}cWl}{6RI)6;c7k+Y|pNwg3mP*
z-NX#8gF?q!D!X8erR(dtQerVLK!mnV1f0QZL>gx3{&sa%HI9sc58KJgG2MEQcfCOO
z$(M>f$|vr*@@6a?zt+<J?KoUIYi#XaNIniY>+VL%NLR7Eq8Z@o0<+@(b0Kkp&TpzA
zZ-A~{-h)LECMnW7#EfXi5(^v2;L3qj_xG*~u9;F~K^vfxn1nJvcxAVuO^HbmT|<N2
z%UaDQWaM5FC)4O57S|fbJ{ApQ1@M->I*ASL*lqK&!~lmV?|=+yQ|3>awGAmuy9p`Y
zujd7IBE5~}(y|G^1iT0p3G9OL_F4UzYY2GiQ51P|WO6#;N#4<&g-KN<KhpvuNOm#S
zN3{X!Pggoyhwo<JXS#ThGdMWd9GC#Jg~1&_3;{SyvCRbEf{W<s+(8!)ONS1|nnjA!
z=4vgL^O!I8EBmuK%jreQ@#CvWZOHZ~+HAcQ9h)k=v%YVS+nmcsn6&OTFE)o8DNCiT
zW818cYtelhoRdD0W1@XS^cREEfSkd~SA0pxHwN47=r_mO8L86bvL_Fw&L(;S{}8YL
zIY70Q@`CtTf6P?w)eBWmri+TYQ4S1oo(sgvF_oLId`}`p!n9eDl#c!N1!(&Hu3Ykk
ziule3mWCctokoXj*DVziG%P9MtZf2l85K!zyd2Cj-EI@|63S)fdr*A*Y&s%qWRoa3
zHnoJmR-@XG7Q({ZU%0?OJ$1`z=~cm`)u-PgEA`Ftoj#>4^aRpI{#3j{`KmMoC~AJ>
zx)5W(gqyj4s$N5O5xZsZ&=NWn6_x48E{oVc+5s8X)dNeSsuexZ#;nL3AR`nC6Xz>X
z6Y2KAeZ_=}bAo8DPEr48Q|aOXzNtzhwBAW~j!Jp{oq=kxLQV&zWNgbPPz@gNOYUcB
zrw_I+CEhgtm=F3bp&f^`UWbAh@zJv!(Hd@gP@E5R37&SSDf?N(u^BB-nBjcsT@^n)
zBPB6Wqk&3Iq^UedE5M1wyJnAeODc!72#07Zn;~ae-!z*LVGIx6=b1$(>~HX-k74YS
zxExvp_0xRZK*Z0we;J@%nDf0{XGwRHnUFz<F}2!wmiGEo`Ds#eo7phkg@B6#A_>Te
z(f!PgDx3)YVG1cQ&7LDtcmV2Utf}&v9#?p7%;k%?rFxOs28?}V%Gv*5wJxgM{!S#d
zKce_&DDD^JwOgd)*RXGg2tT^>>;+})o`>|qu!RIx8^bR0@Oe&>=2)kSz1nHkyNexr
zNk<);nyzhcuNR&R<DFZO4_ot&`RtX(Nu=Oxz<Y8B{DQI0wfg+?cL_3)FLNwP(FP=|
znD=Hy36)+sCwfXtPacrUkoGi>0n;^d^A;_}Gz!9MMk31O3TV-;bK4hei~_ylw_uyS
zO=@<myW`KGiD}&1Q!rL7i@|H?m_IEz@0}TRahdxYgkoj*Assl7X=SOzM#<hx+@n`6
z9k>U#!!!S2xv|%t&+(3w7nTe~tSJpNgWFOBmco@0EoEpmNT3G=eTYR}xwcRwaf6TQ
zLAo^$i%YjF(uusr3nVsVmzEpG3-;C(?sm4;W=+kv<U2JRfattI+=C6bf;U0s4PrKI
zk1Tx#DAhs}hX(mS<`1Zju9%G@A$k8oRWV3h-Yk^0H)*M6&|et(iF}-nOS#D^9Dj{l
zI$o#TI6=n*_xDjo3J5LcuAzY^+^-_wb<a?}n*~a>&05##Cc}i&bi|TU!C7y*0wZzZ
z0dWO*fI-^^HA2b@->%;@dAh2moniN^0dU;GY3OMZY99_hJsll2g@O`a^kH|>gz;DS
zu<(0i=d%Zp-D#5jaHz^K6>(ED4eJ*`7DP;VI*Rm!tk+PGMWGDU-We%gC({_|1*+Pc
z(Nt8Z-tzaktKSn1g8sK1E#5FLCnmcDbn%>gG3L>bOJZ3L{ZzlHKCN<DZM-@>lv9Ny
zzTtl(Slc}JBf7>AgCV^_|7vaFsq5HwdaRwc=pL_JLh6c3x?OH$Za|rNO?x1(P#w+|
zxGd`Mi0&Y8mN}+AX?_!PRR6bCVn;-xj$aPc>GIUD25WD$cLkc_F3iTJdRZD|F8dj<
zNU#oB3<GjtGT$O87eCS1%FZeb7XQqnz!sWd?lZC)7E80b!DvvPU6EAwD`9f;VGkV1
zuqCVrt%+jkT-4pddXc7zQ#_^Z0K9~0clvp>9iwq1WEEPX_^K93oD(uIk}x+?*r}Sr
zKiw6^@9ZdP<S=Bxc_+d26gyb7D(J%`1@BxjcQc0&EtxL->qswBi>=lj@tk$W1~6)m
z6!2z*A4mz6u^zifs>ZtmKg0pQNhsbgH|eo>-TgKDJv&1`{{3cu_|$B<JNP6nHZ^_#
zJ<sgM1Az9*2&u~0)ZhUN>bB<RR(>U?cR&(lv8lRQD57k+<#H_v3~`J?5cpXPqNt%i
zZhUvuZ_WW*><O!XQIJP|gt~XZ+SqbZl6@wZwl9I#+?F_y{>jZ3U5LVD<AUY2bhMxo
zJR`6!)LoO|NTlMiPw(SFL#N>>H+hfV>}LU}of|lMM``(58MyOUT#F=9wowbz8Fv@W
zyQmxD^3^KueTd5^GyhdDqgHkeq0Ml_Z4v#&sQHw9<F-KUvjvY+C!MGc0$aN$EDHOF
z$R~;YWt$4Kxg|IpMt)jwjn=k~T}^L-VLo03+w@J<39hXdeshw&cal1BA`95_!Z(ij
zT68kAQQmb9Ae9Qoqb7C!IdCg8^%5;(j6ztv*HXN@$Zq<zRt9m8^t6{$Vu8u={BB0A
zzz9Q#6Kcfc(qXzh1?Hp8&Nx!9ZZq=jQDgS@RjfgrYB1lcroz!nv*?wl&Nf_5J>Ygq
za-KwUkFiuIu@`PSWpC>Y^vF44J@?!dR{i-jJ1MmM<MW07EI3_IfBHauz6ZOmzmxBJ
zSZwP1Gh*FLW6~`mLx0NMsSlQaP9YgIQ)aeRBlip*>}BDLY#usQYwaLQ*d#Q8w15t4
z-wOK63ou`o`(#c6NUM`VmIIj{H?mc}TglztPd=-_RB_8+(}6=g94XmS{rymMe0bQL
zyP0X0Bl-)<&8V@8_ze5p^TbHgtyXg5(~Xchr5S^a@}O{WdjVRDsmdkuR`+Ibb;QrH
zM_%O=I!BtRU>fpz<9NLr<bY{%XnxYorJrfMw@I{A@MP<Wp+C=B=(qQG{3;8WM`VRy
zzF0|8;JEK}Zwm$Y$)KytsMj$0^rkp^IVh3QYj>B<rPDxbZxzH5FtGngP#RW7#stUO
zo-~Xk-YUy{<=1>aiW>CtE9E%bg}jLsRx7EX$y|7LYqf(<hd~?>6H!FATbB0E=k?ek
z)@F|5sQW#yPe3@C7v%HUfw&!@o>aLBwW@xZT^;Pg!BFm^tuxHb2KnSB(wK(EJ_J_L
z*ZS<yVtR|AUsDY}!8>nHZgs`i5#<$RrNZF7*1u{I91v~b%c*T=6PsO-643h{RnaAu
zK$}j96h-|*jUg`4RHKaMfJg(awR3yxQDQqEJDf7{Nr6h3)1p!7<kuCP=%*%Nr2b%a
zli@?ZU<Yl3Xi;a@TgF7Ww#Tql!C2y{0GM9?ueCfwT6Jr+c;sfmI>}}v$nP<@!>3Re
zZC02t>j>z?Kyd)buv1bl4_yrStIWNSTVcS^Byll;hQKllesijZ#mMglQ5+BO%MVDZ
z?`dD@mm8<r2fJTU_8wAXtpR5jkk%%?bYe0DvTmE@T3s{$xK*IMt6kA!Vy}zaZtvMv
zUiDgSp<7Z|4NPTC7sX7Qb6Afz@heNFg{sUrq}omNbeuxaoCvEt@40jM&E<eO{)%Z?
z&V$I}e1A87?q7o7sX>hJ<}=>ArEi{%WA4Hz)0p*ZbESzPa0K<j?h1ZMy{j_u)Wf!C
zHlVtwTp9g+<^rDlL9P(Ty~_jXh0B3XaYl@oc4ZDI20!dvhJb=Y;kB~#;sV3EZ%EFR
zqD1M&9$5#sI-i*~i^RG0m%g=)y;c)OggJ6Zy~%i;rV?K#P4e&B5YKA{Xiiw4ZN5wL
zj#Ry5ui@ulaDNAGU}x~yFTw#?e$Eh*cz{<8eN-KAvrh<Sy;VYMpOU}#irc^2a#7Rx
zK2@gLJ^6d9n^Q)0rm=$>?}@qIR@c0h=YAZ#X;9$5@w(A)E>A!v{)=kFV^)_bPvU%i
zUFy^Ep#qbm(It`4@cg**^?7P%se3=U@apzM!4=PNV^ytAPjfCtfL%D;XMlwtVoWE-
z)hVamLb}2(wdneGqr6z3g%J5cGWBR}9m5QIWo7kyCebGwECm$eqi_ps!m>Id`7ejD
zjMmTGY>2wb*V5h3x;cq$dmjkL3(k<JZCM4~x0gREx>(Yefxf(dk=}j1l-I;x<R>h8
zsEc${ma?Pp-A6Lw4$rbNY*t~yJZ6QmVpJMY<QN9$f!9V?n8k$};L=X*Sf=01oW)|X
z8vt&g+h`*Rk1YPe$Yc&3LZM@EVJxLR>h-0lW9<*@RNsWO39Quw)qNCq2#-pU#&&?z
z!HP95>-jl%6Qa9iJ)*=ul~)wm+t$H8er;C(qlNVHA_jRGWGK1zIVI`3M%+<YBIn}H
zWWHU-Z^NA#l@svO_;k_>dX~gG2&S4R#imBNyaxWECyztyz+G_r<y`@)1s%QG?FpAo
zDsF75tCd|gCf7i69=ZlHQ=pTP6`1e6s+ON73E3^w)FNN8j~1k160q+fK_}y6Q0)C+
z^~7Lxi1GTgSpu<>_$M9{BI{cZ+>2?r$adv;A|f{K>%P`RTOv6#kMeygE`+F!$wx|u
zh=59eIk|$ao*_S&{^{JHm$BC+T(_*7j0?XZDdp!l1qKB`E)$N_Uw3($^O^#?&mrd*
zo2o>cPIT|4&9zSR-ZVwtKNU5`-iX+ek{%S>_8Tn~-~y=S*LAD_(yAamaNKxvJ8nd6
zw7$AY5sx~?lx{rHQ=fAR*^&VPwCigH<&%%r#_<+r9>d$UDJvE1;8t`SD<y-|5=u_i
z_U66#t1`1gEev4~7x<DbY8q+<W^F98nWa19VN)@R$Ii^ICgNPTj5XzYX&i#|@CT*N
zXJQ?W#6$W(f{wembEgz<y)45M38{X)PD<?~;NrP9Yu+Rxn6MfGi}D2A-SyjA95?{5
z6}qGKd&bVqhp!ZM23Xb0Ikkw{Bsyu)&8w}fQkKDu%Z_Dbd!>ln<KT%;-j)UtTLk*b
zyPqvkNWug^?4fGfN3NxhYa(VyhdRr26In<WMbGRCr#_*;YJ*#5Jz}8Qb*pS(hH^zZ
zNxuFleZuafMkwNLG5u-*F<H4Ax>yCGi+Ve1*l3>_b-%HRPqSug{KTsp69rZ>*r*=m
zQK!qTRehJ5s36lP@6Ii|P3D|ecH7G8uXSOT;i%|y$#kl65c+MkO8eGdo-&F-(33^$
zl&Qf;Pz@tKHZ>3wLo+t=CV~eLzyj|Eg)15ybSuEA@mLeOV4dyT9uY;LN5Y7{4l~_c
z?R2nY-kl1~cwo@lDYDZsEe?-33V0$AZa{o)pgqR8k*gRBKYxoiX;X&MD^Oa8<Ohn+
zSk252B~f2^9yWxXptWA0Wfug84^F=In&gC)EEKEygpxJ14MfjhprNu&Zs%Av9#=i#
ztdqY_ecGn7c>gmSOskJac9ia@@Rj|-0*yCuC|GM}f7MOkJY{!?%0PY5zVj%=Nt+g7
z1BLwBg@Wo!$K9|tBg!`Xa2G#B5;$QE)wGt9@NN1B_AzG;kSP-MQfSXC<=JY#fp!gt
z)uHKJrt%@LeQ?5~laDpp7cz&FU~Jx6Y5t`-3eOs0O6KDSl%#J~Fh_q{lb+W|8Vp4}
zubT$fH8EJP?|zBjg=;v}4xN&&WOFO*hYK%Qwlt{pci>FoygMeqUX<)@Cc}Rt75m&F
zH<ku|QTT;pQd!i{&weBAfVi3k_&TTLO`)c{6cq53%y3#&mX@4}(AZRgc%GFAf8QtO
zrMiT`kBXwqouq)PvY#mImlGS+O?{*<nnaB$74E+^h?AuzYUIDDbvDfxM%39kni`K6
z!5BK4TAu8X1rGJS0((erKIb8XvMhIxZoBL3T*8V5F2$OQ9Gw;3GtuOHMt=uFrn9~P
z-G67yW#nG;G9iI)#kT76yRjS^eJw---368`GtD6md-JS5?&1W<C~1QJOT$>lGMmc7
ztQEPE)1FS@w_fr7rdC0`LqR)5W_=>!eP=gD1GQ=$gWO+DxRekZBh^X0d3J%RT{z9V
z*M4BSh!zNBLq6oew`2q=XO)GzTuH<FB8qXTc@!?K_Fw8Ls+s8I+r5Y8xH}cC!$xa3
z&uoWll~<$q;S*<$d#sCcSV=#CL(eX9!sUkL$(&i#ow7IhA@<B2I0Z~VI1MMRF{Q6J
z?`@(?|B3y+u|w82w3h6kZ(?s!{LM2EQAfQ#WP&hJ+N574OS*b-qJL@K$Leu>Uns>l
z-PPULNeiYij#*r^lduv`3gMmVtjuq-(D2ZS13^J!FHz-vd=|A#BA4vO#@J7Z522mq
zBU2J{wpzl5-3B}NU6hno{LzYtvfIB7xbwm#<A2K0Z7t6n(b+(a=yz<Z?UKDM#_@yi
zV^c#n(mAyJMpMCO81>t~6G=$)$cwgvTP=Qqt#tmmxGQ~3q+F$KCHT#sH%CGJ9s(~N
zz4Sg%vjBiEAPJ_G!96sY*R)(pn1r;b(nwoM!Nm}IFQv)+F{5<gEYuUFt<RUxr!O?g
z3VtTYcX^}nSVvn|$0qDv0*c9G32UYR&so^%0Xs39$X(Oc&k=X@qV9L6Z(?v2vdsIK
z&h*UFd9ZJHd^DPZnuM49TuaD(#L%Wb?6eAobUX%w8|g$;tio&UfHST|Dar?&vFXM$
z+CSiX9GAKWYT8>lUsHQhrD?Y)Mx3Mx%4F=`>ODFlyMg;zf(vI+?H!dp8sGe2x%%t=
zFk<*YI(3&HpXq=YEI;ay3(j*^N>#?_{zzbWsk<wYxYl-_g2#5y<3z~aVv$57fqb6_
z$Eou;I$*zJ*4Tv<ErYmrSE3B#O-_Y=K<(HiY{E*{?`@~FOp(TkihGuxJNx$h*6VPn
z%Wlobdo;h?FoVc9hi4zjeSNp=Y(k%GZ60r~4Ar0u=X^Y7R@r5;7EpHC5s}W=R3j%A
z1-9PAj@Z<DjW$e}5?^Ig>@%~4LY-9s#ns!jaZwtUI5>O@{C+f#iF;^VY24my(Y)7B
zy2_?Tk=e+<i@?D!DH`1OCqr=!QHo*PbI1i(vg5v$lKbXkeC%WYLzU*GJld5@*ybFr
z))PhTqW+isly=r35-Dd>HMp6R;I_B1NlX}V%hKI#mP9ZE5}&>&MP)X{5;CEl{RXSA
zC+$zlSJVjiM3)iwD!lciTVapqB^Zhs)<Se^9ZF<cYpuM>_Kq{E6slVxB1C@GUE;f0
z5zs<?xu+G~@MvLcsj%r}CBtYu6X<g)hjEXKnyP@cGk&PCuDgZ2^Yny?bn>G-{w(rn
zJng9D@uL+wX`%^Xhf(b!$&!)@BUPe)?E>W>ykAC?6iMYPdr)<20s>9v()k246bUy{
zz$n6vdm_FwmQ@&KKX9o*1&AYj(fVBYesWh}1e~CKE<Urde5ku2*&F&LbcoZ)kG64J
zN-J|SZ;YUlsn2<~4Y(R8081Y4@Gcg3LpOnbBK26EjUs4{#mHZJN~a^oS>PjAR3~6L
zNn&l!PVBH+Obz`Dm5I-Z-e))r2>&UFe#qlh4dJ+si4}J=O(1ewFJkv}6mL*3@5sYO
zDf_D+mQdl-(JJ*VU;E7wM;E_t?XNOYV_{?bd)id{YiH~CMpt3F#3+#oB9BFK&`;;W
ziB=!*SywBZtL$Qrnl#P2aUDNyY&jk#U_YG6JRertoVG~{bBj(I)gARJ37d6KrWKQt
zIn7r%T6enMEz2~SI)KZq&>KT|y)ATFB`Jh5$@pxFCi+NP*mrCZc(>n^4IX<(n9Wvx
zv<K-{;+W?=8RTuMqpO^mP4ajhL#lD9Zls4sZkBkQQ*e91^0rZnJvv-1n1jwJlfPhq
zBm*LFA>xiVUimDL`*`6(46+qzubRWOS!C`ZFaKqjPktU|ZQi}E+J7St`F#GI{fKsr
zzlQg@z$5O(#Ghl7Z<Zk<AVx@iyxWN%QWAS-5pNmPKFDxNv5nVxaJOUB-L1Q$YSRO*
zkIS&Xik8-S45-arjvRdZX%*m8@Yp~g2lsak0`f_Zy^vj|4<kMJS~|J(;%IUey)-Ho
zhQH7$y0^wLV4bc$uoWId*@N}F)wfpg@p2W&V&2Ll4lYaew@&K9WtcWtSz9odTkB47
zC>5rtOt9_rU5)ZyyUx17FRD}ns2y6-1KX8OHI#Xs!i&Js)B`@pKXuzZsmMV{vwr%w
z7h$s-K|ZLL<IIn`it+>$%ZGd0yOjFpYEHJ|WE8V<e6MRR?#53uG@NK=5%QkMc@G!Y
zqU-f#pJcjkv8@Uc%2Xb0Z@rYc>Frbjb2@(#zTwmIGhp|61H@6IZ>k@K8VPdf11U<O
z(8i+iT}e3w&(YMOEwpw;Lw~iBkat(Sw#1!nx8gPF>RM^SBsSJ4)}8e+3ZmaB*K1zo
zq~BtSL)(~9_YNGs5^d~nj-+$H!Q?}{LAf#7q?PTT0fi}@w*npq1m(Q-dO&wA+0sai
zgzu9E&HG=w_}xc7r<w6DAs$q#5(E-<1+K^FKPK`1eqss++8ZrUdEV<ok`Q-w!c5)e
zpIZIRbUFgW^xbV58hppCz{a2wr^lY#$SUm1sxWZNm+cC^1fn>vC?=izIVRQDIn}Y!
zpG^uJcW@6mrT<BY0dY_|kTfNWG!<F^aH@|zhtL)M{HCedRLrZO0~bxEg=K%eCy^b!
zYM=*Fv-rPV4M5LxG63=tK!!AYfweeov2grN0|JUyJ31NF<l(wl#wJ05`>Jdr{ncN*
zlLfrM8(DD1eOBS|wj{%ZD@*;xtOFz<B+Fp_Sf!<wh_}H~!L*iEH7`blopfaxw;@23
zk-eg(Eo|slUhCHO?oVR>`=?K6XTG|&RW;1Aiw@NAQ`E%fC;H)kgc5iPBM|CB>rDrR
zV`;{69hkiT1X|yuYOKstcNs<hM5&Q^^&GQgfcY$Zn&nnG-VJ*y?rVuX;Bg_MeUsA%
zej)#H&jd;osIgBfgKB*O4V1m3AqMbJIZ?bX;6Z<c@7t#yLu3)U!KKDe^>8s#W~a@}
zmmVU`-E^2y$-Bn752<+DEZFx_{WouF2Vr03&g~pQSgd!bQmO{pT|my!#&vCf#a%xc
zP%q)t!(wL#b^$fyCJ1G?G!Zmh=Z2UZ27^qWy4UHg@3sDUe+nQj#@`Mi2q3shz*aJt
z`}S&H-6((&mdLeZcCgbMc>`r<b5OHMr@B+<z+ZVXDuk{S+ddNtrw$x2#gj1IE0FM;
z>{jB1tVw1fN!Uz)=p$LFs)=nvH)|#}`NXfpfu4fo-(*tGbj9Fh9L?BUfE2gOeviLM
z0TiSq_Zd~SDu1rRaBdxai$H%CdvhcB7~I(N2h)9}pILn3oKXF2&*~1dkst02>j?<B
z3unU#y?vxoA&u>-6a%X86*YZRP7`A#%6?t#?P{Fc#J)D>7EfCI5X$AEN|fYP0^WfD
zq0N7dswDvAXFOo@9qMIDi#vqhi;sV6F(5c<W%a3ra3Xw9_f}?kWm>yW4dR3RiiPr>
zPwl$owUdhmHg&Nh*t9Q4&q)5d_FXj~(3N*Nw{8GxS#x22#Tb3N{lmvdB4(P8_-Ld9
zrh3q>5H?m0T&Glf2}p6919RiwQv4rEp%w%D7PlOjV9m%XoEDk(v%UGMfPLGtpF8Lo
zjmXbLnD(pw?5|C~LI5!BNX+wEMmVO^uM7X&;_pv0IoA-xWw=d#&({05TP6Ui$+Hr2
zCCd8yM!$$mx^+8cKO(&8KbHAlfBuia|4_=`fBuhy|C7OAj^qDhTC5i4`Qe#*=Y?s8
zb49v)zw!^0^OfQDZq|c~ie6^Zi-LfoL*pM~B*3W0<3q3T8GakDp9Vt|IT!O}N~Vh$
z(>Q}Ec6$KsLQ4xwCeK7_500AoiD|$x4;44I^3H2x*~vHqhR2ewk%?TRv&P-IG7I2c
zg{L;Yh^$GXD_oC+!h_dNg?WlF-R%cWY5|@f<U9Il0?0w5FX58E-so2!DcCzus~zlN
zI@w*O<Pmv#-6Tg0i#l>X7vt6s=hria6c&^)^zy#xLTyjiB^W%X$NSxgb~4RymZ?$H
z!7w|e%{bwD8Cu2{jJ?-?JT6ZA;a2fMVkAcwiwib7k=o!HUn<H^+k2bIYpH1M=m=G&
zVA9z5JlWcnw}si(xu*OcsM<#|HY}*M^Ia}~<c}?XMVAuDFeY2He&)Po8FjhTB4m-L
zK>XdAdA&k({u*wUMVq|UE&oxYE7O%UJ%FhZMEafG*Sv=4XB27=cTcB5C7%RkPVT*G
zO*K0W0(Z_CnE#|CWCZc9VNpEQown8wrgLpemdl(1#V!(Ce;H@5ZN!VW!$%&HnD%hG
z43AXEMd(&bS;sbr=0_QipcyW+i~{piL3Zv%#SpJ})1O27Uq0Z+<JcgAou*&?3pb8R
ztz-&aCYD%zPSLe1GB@AM9ik6TZR2NUhrpE(v-61B!+z9(0wePu-5X;vl6K$ygtw=q
zfQ<YID=r=NFUR&LaJ}Y5hA7JDkU#Ks?bMCZWRdTK#axmK>qJqQd%mmb=qIz&sd(AM
zG}fPs|C_kq*7oMZ8S(n1T(-A=0Lx$O_=6+7?gK8c$x{^cZ}j~7=_@KAG)TnD_`mM>
z@CFb{KAw^LRqOaK&qY9*K)sz}yCiJ#e?9o!QveU4J1YK1^zh&2)B%8YlTLC3zbO9i
zU;KE~OCW~BzfKJLzgAM82%rcDt%yIR?*Dwp|FQ6j`2NlO|FQ62#s7a&_^*opKSlmG
zg?jh2o<vCVp9WEbpXuyR5ADC$S*zs{V;!xQTDQ9Krw?H!LomB-<l>V=-cYs?m2&(B
zcFMkd^p$>-pJJK<LX~th1$h*NCCjT}nSrkBF<)^sY##)}wDaCOc^|%MDmd@m8$Q$q
za#yH3qd5PGhHjQU@Y*Tm-$((qnThA!jnrLdD}zho(+*gR2+CZsyDx4d6qG`gu9xld
zJ(<mckfF*_wz!MUTWB!b*i{E@oDb816By6UlUv*}ewHtNR<CE?S5|vFrD3ai`F3Xt
zcjISxFUX2Uo-u8Hg9@YZc&T=^sHw(ju0^PGf{f$G%&qS@P0;^d41mqF#Y3#2AM6l-
z7`2)(K6CDFl16+U#9bA$#hLcxSF}6^^>lq77QZDx*`ak5T!4b5aj`R?+fZ)t>G;PA
zj0+HVw`#fNl<^-O+;3<df=1)x{bq!q0;(cPpzk@2Gc;e^ng^jRQ{M8!c<&h1@My?P
zx^4}X#ORrn@4y8v4-WK4vxO%oqMBW_$K9<y@n9aBv~w5<9s6Xwj|uWmlZq`nvrYR<
z&4xa~^NBCxpOTw0dao}6>lGef*AJ|n943>l8MKc%NR5rxWDOle%*?AU+Ht&IKw)Hz
z<5|}UxAzSEab-vfVsy9G>C>>jEjaod?FuPE8`7kVE!yAq`@0-Ie2nb+ew4vE@+P8~
z&!*9#P#5+|#Ed@a`W^Up_z^;l$YdUORQu@idE4$%RUg%mpiBgjkib8gKD9UB5(CBY
zaarN~z&yEAAzb@~Ur<XF`PQvxV<Fcvl=wlif}XqC=-vNxi`zHpfTSS(9pr!f@`{VD
zrvs3PmRR4fR>mvn=x^Bc<{khDqTc=9yMN9B0GKKg00c$kCMf^Fq`x%w6Ob-Imw5hv
z{p|L(IFQd!4lDcqUWLDD`kPo?<eRcS6siA4*zZdnDFBd0CpLC9^Y%|vczp!0QX{t9
zUsV4SKWngox}iw&jlapcViSITA*cfITK7HmZ%Y2{0xbab?Td%m|I@>+{@=rVKu|tD
z$GNhf|4eKVfM1;{#Gd>&O@DLiwh{m%RY-6B8)3h$_f!U00}D$h`d9b#^Nat9;lHx-
ze`5HrdhkCn{8x?s|ARH$b{V|=FUC;N7SSm$ur-GcF?c0?AZ!db_q74H!y-y`avF+d
zk<{F`kx|C9UcLU_!W)<t0$;LApI$HyHq6i<-uz4scr;3WS~5?;d_;+8Myd9$F8)^L
zfK6+G-laWAc(bGlXQS(Yno$d%LXy!7H7GAu+n%+Pdyi|xFv@~c6|VqwH&)9YpY=4u
zk*0xxfi?yKTef79&41?TAAUf7ZIEkY{lZT6gC8b@Xt1q_R#C)y!;Ba}G+voFH$hQ}
ziudwca;iIlG|;`4EoW`8BHjrd$l3V`<fy^?AoDCp8C0Q}1Q0rY7dQz$Jme-5Nf|{#
z^s0Y_Dwsq`be~%LnRIB%OKqq1m-a7+%{C$3Yy4w;oNEJ9tNcY$X2XSvV`V1&T23%f
zIRw;Z9<fB2o0rGw^XvorIs9N;PCZK05~)c%gc~@O>&%5j%rktkDT1bFfrx>Z68yJP
zy{C{p>S#4~IrRQk#YTtTk*)3#R^zDC9_Q~drB}aZ*Y5-zhk+#k(?32o9f0d)csE3F
zmdRkQf6cz0Hd}>rI&CR2JyE)(paHT$K|w*Y$LK~ITEAf0s{RO}{a)DRPC0m7DewVz
z7`_HXg_xi6L_wU-Jm^Yu4{%@-;Q3(dLE<2Ora8F$0g2O&i!IoO_xlNAnXcE4PpHD=
zLoU_!o!OG~Ve~mNRX%V`6%PS$Bm<OLB2kaeNE@}>WP{W<1rmDDkLTkhn6L7Wm=}3J
za80IjT55|;WEa-28WrlB4qo`;V$FP6p3by3n1|=ZPAJIPItYqXwP;iL)4~Jz$d|X7
z(We*QdYM)ToJl6Yv^dl<<oimMGRtMom7~L-)Hy!2Jm^v>IQr5<_#==gd+H_BK8V#}
z#xXkSUiI=)zt!avW3nwk;3T3&T~@gTh6r##l7wbH^6`=OYtOo)n%QIa7$w58h~_5-
ztb@RwZcNsBTz)+Uhech%_JE#uBL^(Yyxq@h+bwyz=ytgY<Mi06mA`9Lq@=3(<icQp
zf@(rQb!{W*DC)-d3)K=mFVrv`2nH@JK|u=qz&TG36d5y_WdPdTvV2=GB^GI3^0OTF
zd^|<G11w*b)o#?ZRLs5Z@>w2w-&ODcoT`(}C}&h3P4g-ja(fI;+>7_0hwp)n)&su3
z==~u9!kps)R+h6HoXQ46oa*83ZQ})CGt^Ho4IOW?MSCXL#n3gha$8&O7@4-;7h#Jg
z8~;1~ge{fA5|hL#ff!j)TfFM<euxwP9mIujA+{Q2Q>}L|PUl%{SWi{I?^kyQX5>i$
zwVNe5Uq*=$!Gb!IP`i!r@bKj559Lv2m`TGo><NXgjM)M9Py=;+BGmd6WHUWYZ`Qhd
z8b-(cJ(CL-N_ny7eQ`EX2&x?jgOW)Dm3P)p-Hoa`!b*a*hYIR#fL)73WVq<aRH{<G
zkAujdF4!KHEz_pzd#--S9CWDFWL-k9JPvW#nyL=Y+|6gdIZ-wilMtKQwiZO8nA2y3
zIk2~ux%1!;X!IH)|M*aVQ=v&=%jF|?EoY=S{8`SvU`E@?svG+X@Pa+}RWy(-^WM5e
zWJ3^l_^oJV!lu#IT_KxDP42$$yE>LxU#hkh8tUNM!OUWzlxv-Krrs~Q=9e{2iIOIA
z&5H-%{F=@-urn|5Mn38`@?rPH-*%CBKlqFqheyGA|K-aAzp2mUI``r6pXzIz6^=~_
z@?}}BpK+g9QQ#<?DqhLYJ$!`RmaYsB=~SgN^t7s*P$sIvI~!si^VpTK(|#p7V=q=(
zWhalFjt*268}%1T@rC`M(63&RJKlPAwt*!!qhQ^(>Am3nZ+O<T1t6~lnFBn=*1;Tb
zN><dHtsgruO^VQENxr1+WI=r2gRTgx#YTwOZC8hpNPkLU-h%Owy35wXljim{Y3rji
zN^tU{Kp@!GC_f>1kf!KM-rl*#HyZZ#`EPXT#X<9`VrbE7lnAJv*=O%IAB}tIB4R*w
z(3r}JM`!m`EB?*Po<Fv)@LMs#*HmW2n<J>M`@N$0Van8AHSaD9UwqsltLhFZy$f_m
zXj>)oyLC{Iyo54nLfJMx-<4UX+(?Rvh!{{HSaX|a%oANk*qvC<T8rPee77d9_`(>0
zXu;*t2NdC@D{AyEygs1Ot1T!EPpLLisobe@&`=!cd93a^R^EK>rc_Uxe6=LR6qyv0
zd_ZaDo16QHy*yGp=N&dROxsN>h4@ZeNl|eg;{n&JERcJd37KdRFS*@92@U&E#ag+7
ztn5sCcej9QpLFEuiZu!4Q7CpLTX&OfjhF|jEYGdbKUoaG{)3;+WW1*#6Jg@;>l44O
zSJ3ptW2!-!d@_N)4dai@BB%qqSI(yYy#~d4vQ;8uy&yCy+S&kUeNIB5Y6NQ|Mm(x&
zhg3#7Y3oN#S6a<U>@v5xZrX-FG(3_KI4^4qc_c)jUDA_7>V!%cqKKco;Ca`+-uCKw
zaxjt>LDrrKP}j{g`Lb%bO{XFuqiHcA6lzo~8m}OM(O9RHbC}`FwDW<7`rbNa^mTly
z<|ym@A@kuN4?qv}@l%4VSKjH{<Qvw_k3Br~X|)@wA#fqB*bCE5Z)-SsYz^v{EKSZ~
zap#7Vk2YCqF@dJgn}-gChX^jzqU3Xpr5m5GD=0X!otejM1wJ1kv1r~rxR7|$9Uxgh
z985PTeUU^=MiLZPr#UJfsm0)sSC>@+SNt@U-_$2@p&7!8UJKsrcK?*x`xpsZ5^#^N
zH*Q0{1tsn>N83j($Xu?cPM4&bEw9$Pofg{4QCSEtw0HRKBGa3D_N@z^9&VttHC9`#
zp<{672!3f^Ey*4_1@~!{JpL`!2uRop4_8)+v$8+cbL35Rs+FCHiIM0=;+c%``Se<i
zvmEq$kC&hA_kQyHd_geX5h$5dU0A6;UE5DWoWIyotf}EGhm1{qZk<MOu#tQ2pcw7O
zeir$uiEgx((k+h51!g);<JJ|^OEt+2IFLY>DI^-~H<c!Dq5OQp?6;yavlCZmy{I~Z
zGw~`~7ZmMla@|#{p1j(drf<6J3f(cXYm2ivT%NmSF$8@qk3@KZ)wqnU@u7*FXvM=W
zqpi~UqZ*5b*?ZLCs#dNdjl#|B37nXnq8sOrPp!Z7Z$<IC98@KiDTySi$?*j`BwLK=
z%o8c(^yRJXcRe^tzOhD?wsL9b6B=LqEK$MCm_warBk^(NS6IBA+VfM2ua70htrN!%
z)h}{3^Cs?8POg?(9m95FzZZoFU~It!YXpky?wciv@ZttfD@Yy0ns80|6lDQT1hp4S
z7rvDDZs-#~Js<bowf36G;;pb)sGoK7IMddIR8^Z=TmTJJc~aFk25W;Bi$B0dn`V#7
z<CwO*MLg0TROsHXT^r7(!_1#_DGJDttLrH4h^#(w;9{ja`0^<Fu<}Si;efW8qxJbU
z04Hs8jz^6GW~S^Gg6h~ooxwxyP)rfT*GDZ7N<2}uTGTeT`Im&()9De!@pMo%2a5Dl
znf@*_5t$K2t<n6^RoNt<K|=k+q7vw>`EbDOAiygj+CfrM(KUYXG=(|ju2@~}YaXMu
zB`?)*e&y0a^_s;mRC{4XJ<#ARFL74ps#OsCUg@X$&d~i<`ce<elZdLfUNp*`=at7(
zbiSB;QfqFZLkFo7%fbzu67y;wlq9Z6B_vqI0c{<mUaduo8_q`Uq376}`MG_t3<WJl
z`a~A1L#ox?GX%GyVCIKP<3$+lgBbYOw)t*ge*Vjipp{)&9ez$r!)t|Q%pduwyEjg4
zUI^cv$Qu>(zWf4_!L}V$zOQly_6E~ZSS~cI(umm;=}f{jG^cuc%-uUHv<Ga=%UXF*
zLjzRBrm0}L7iBvwOO5W@F&J67lj;(i@ro+e)7RC@HO}^k`Lv2kt19^e_35>0v*O^a
zdcK?n6;^;vL$utYxkVCQNImS$A6jzP$m3!1IP1Jk-t~puaj}s#(oyi)3uq)P_TXYB
zf^*@6%I2NPLij-ChZ1IHGmqyP3yN)he#KiISOJM#E|67Dw$rw0baRry&jB|%MFBm1
z_pBaIm?-xfre;ShDO(dn<(k@jttYlM1tYPQ<KGnaZkRD*<Oo|!r5FAS)Ojf}$R<YH
z6&zeUU#%eY##3Dy&60NPuC#H{)p3yj$ktpN;nwBVmtGuxOUT!~!lm8mFk@ojOwfHI
zx?aC0g!RVcAg>0LWrQ&+h56%Ak__k6ZK-qP)qs1=Y^c&|gG9V#`)y|f;Tnlj`kT>{
z*5&55rxXe>*-C@+4U+tt!CZlI6WqJvZmsZYvCKJT!f>n?ujHeK?P`b|YT(s+2%NDy
z8{v0K)+HhhOrO8UJ!fA#3Gc77K_3qiCZt(esWw}i)Va?cjdvqA?Znl!a=ph4=*G}c
zatEize^L2*kYpOw9e}Jig*_L03zf^~G=Z%!jv{%y9-drtVDPlrdJtk&+m3_gQu<aX
zl!MF&6698>FPtGM^1e*`+}a(o8BVlEzHRDC8m_atv~vp>)$pzH%4W3`jHLFlzAr=K
ze6g>v1V^aT`C!(E)T_f1lZa>Ea<+}#?!pt{dijfK0vY+T%@-tV`ts_jo|fv{ZBZkZ
z@L%m`016OHy;;N9zBqbb|3F23mNq52VuZR6qbtVWK4A-Hy}U6#b-LeWyf!>UcoZck
z%OJ2hTpP6Tc-!e9-$T1(JyvDxUHT@MYSZH{O*?Nav<3Fty^Nqd-o|C3rv`iQvRH?j
zBQ43(bXsHmxEqW2-I9?Og}*+Y85me1qrn5m0uHB4?|s=+5E#WQD5JT3)O;HE21hlP
zJJDnx)s};r#!J_s9b@r+e*fkRiHPowWuOs=Y70a1y|C^0koVDBV4App1_slrR(Z;P
zKaPLt!DK~ZhC4&J&J?Rs!g4JmI}l6}17L9OgLwSSGHWlXc#cHpJ~66u2_O8Od_`2m
zDVA3=^@*tBdroi8SBZ41loTWn<7GB4$c~f_EJf^=b)pV}{B(VC?YyrRqV|{~=T<N9
z>$6u{9<99##%rd}ccrUhV;;&)gqmFFdsvwoMjNz6n?kHjCR0t@GXwA)KHpA%aNxHS
zBalk6n5QW2yeM9(%_CXIGEU*EtyernJptpADIAYg#9?M?7+Q`>x)^MW#Y=P%O+)uZ
zV(kgTHLOcFDpwz(sXp2-%$lEyVcdEP9hNa4*~g0yO5B-=T9~$sAzoSIbIEP4)4!iH
zW*87So+Dpje`07bXS*ejT`V&d*agjKYs+6>o6lF%9xy5$v^=8nuMIN0U3D?ETDR+b
zNzrE1gf5*aY)k1JDK0L}U=MSD<<?YLOF%bl*!k+FG~5+L(R{#jQW);Lq~)4_MkKy6
zw#FoVDRS(p9i32cW9yw+mI(m#NpZJDHNsv4vDPATM=51#Y3Wv^&Y*{|^WyxSvaAJY
zcsB)eic^TAG}8Inou{#HXkXsIE#M(P?dG_3WTU#7dYrtvDP*ndQZ?fUTUF+T)uy{G
z9qw6H&%bergA>p~h>8jOL(fd{)kn65`h1AlEu*D8Srot^ks*1Zjk*;3w8P*#;O<(U
z-)+6u5NDAnd8;-vX*JKCd+n}Q_|QqX_oJmJW+f@^fzl*A-aOlQa^GjS{ov9(n6G0>
z3+}U1JwSxezVM>+EMh+Q>!WCl;|5LD)j8<&L3CSjS2*Edwj0nVKAzZc@D_>2Xj2R3
zsy6Jk6$2J_ZVzW|3=?qB>Vw!+9Aas@%%Wb}xO<yP@EhL8x1?8a0I}b+h(q`!Dxx8K
z+k`|TI$SS-UR8Vu4)>@A&8DOI@NT5a*~F@F-|goxo>+^}vrKq=Jd&lK%%%~$9~7^z
zI^kx$m;=&|Vv=x{n!*#?tu<C*GT+M0<1y+~Q@qF>yx8nv-(XtO4m+>U5#P8FWVAir
z5wX)c8G~?|xjCgr=b=@*<srTwp~`c2jx}Ud*D!I4vWQ*1ggu(0+*h(h?}skJOBaie
z2KZJdG%?!)h^g1;hx0)>yGh&oW5uBXqwVL>)XDfZ*1}^JS!TydImB+IS?AOE8yAep
z(_0;#bvgcYpvwY@wo9D|H<MFNZfs?y_WQe>Q&89~yOntbnRr^GUCtJdXIe7s9^-1t
ziU*a9=c!%O#k2?OgW5(ecA8^1#uq4nQtd}NCyjPE8?wN8m0DFj{9vtn`}Eu+R2MUf
ziTO^jQf+|6G>|0-CM)bgN6rW)B*hPpFsX1pSe3S>T%Iyq&Rmnyq8xr5a&2zW=bl^b
zOPg}5GzvwLR>=Vz?h$ou$Kz&%JlKO<IhfzV`m?4XhHi1fB2M!sQ$@{f*b*$6r|ae6
zVKo^lyUs(4!J+t{P0-4jKp>E6E)?p0CwEn6G1hB1VC-2S@%btT_eaif5^%&Y^9RLN
zuZUo#3JguhUlY%6I+BF|tQR;bJQ&tbRAiscu?zOieO>1?o2gK@pJ}JI^K2#_2hs^g
zG>Bc50zj85A5-~wmr5ho;|%5=>Pl7h+G!dw&I`jA(^QM%pC%#iMTtd;lWbMVnIKMy
z?A00Q(~cQm!JG)iHW+Dc)*sG+YTYm_obD>?>>4J!w@#iD+Z+e4bTVfQ8)J&yrV0mh
z*o_`X0wVaq0`U#TIL6VK2IAwv64|$EA<0QAi!s7M7}YKAvATl^-O6ga>w`qW!%&+q
z-b%>i8#_RGFt@BYq2_(Ah@ouBDENu*)^zH?(ZvWgo#ZnEW<F8mx{e%mdOnz~!E8Ef
z7t2xeoG5F@Ow7p?^OhBi;$`wz9-a6mm%{@om*tKR?5F!4s}Z5+FQp%HOk;^T?b(CH
z%X#ydK<B2NDA9Ba7ALbj@$ca|%BM_n{H&rEnN#K{VM!MdSFJ80S`VyeSe(?h^Omc$
zV#HSQXW%L7;Y2A5*~}d6py+9cD+Xm3$)@*-!$uh!ezOC@kdK>-;2K|8l!JeOa3NTO
zHLBFt!^NtGih*q%rRa`ey=n@GVR(sG(fW?yLjo^$v!R5KR&z~M<Xk3<D?B4$!d-*?
z!bd_rF$l%aYr*fzY+74eM?<5)o7ODXDU1hw2L=WhF#3za%pB9(8}#I#m(J%7beA~9
zZ~0Qfq(W3HX)p{Q4Q~m?#@Q@ToUdkzg|IhLGZE?|(OH{%huiJxd1$eAH`7KDy7ZU*
z$x1%7>Bw!5WLcyYYL9h<N2Slt2i{FqJ8Etx(YC|peg9}XNS-1n>jjT(sp%ABj)fZ`
z95z!qjlOdJ#?In=AoVePRcBZu&+!9JhoZpAQgu{AIlSP3dnAPVI28nqHB3V0KFaNP
zX>;j46x|tvdV~rtgyjWo;kR`q@-tk{ZyE}waCEPU+K^^VV!yjgn%06p=|CS5c4Y-R
zwhcieOXI4$6YNIz15lZf9lFQPGy<HhxjH&-uQEZW7X45ol9-GAdq#2L*##VP<=irD
zR4<cx@ngVb_g2Tw)|0RjN1M54=#9p3HJvn=+DT~AH`w#U-OZ}sQ+B+w|L%-dEKPm$
zEwx<Xel`nx*cX<)jcS%m(DEWo`?kdXH)nwycFRKSP`Om{gcDeam2^WZ)b7GnpB}bn
z-CbGQJSxTCTWg{12;^%6fzwV74zcWrozme870g=Pz+}jnoeuSf8_$f?66#&HV9|_T
zt=cb`+j*<Eo$)=_9tI@D9$OS?!IH%G8%|woMU3#r4!CJ(a^f|$B*d7Q1Pnu*hP1&R
zOwk8tbY!(YzN%(L56qezViU${2l?Yl??C8L6;8)icPdWYpdxVO!Cd|;>E`!T+kJHy
zBPH8V_hCikKm_X>U95&F^0fgM?*t7HH|V&9a%s8qMxde`t@4g#y7PuANm3aDsFSts
z%XRRCudC}7sS*bRe*1IuMVyu2Mq6}JkQbafvJLW{QWuz)F7){rzS>-&V|;Z!-myn!
z+aL_xJ4{pGIUJ2)Xgb=Uw2pf^B{z0~u9TM)L${-X@}yng<ntZP{MC_6G1<0|6v4T(
z!rYHvSycns;qmz9C+F|_(NZlNPU8Tlu_dZn@ddUxT4i$A*4b)OaeQgl{ib;R6m4BD
z55ybftdJ>OeTlums?d)WUzbDE>f%R2;vk)*E@QLX{B*o-%R=2odrF&vRg&JKV!x{_
zapI+14W)?)%6X_J@d|(#ToI?w1t(oKb=olz$FlZi=4Z@m4o?Lh$*w#Ujxs_daod;k
zL87!2*sPr6kkHv3?)$h9?RAsGxC`^#1Zg1-_Ci?rZM^rFxj0xOvHi^Mt+@g6@q@Dh
z&H+Z&$_^eX=^UTgJ)jfj3B<iO1GIG1yV1Gur1DDX!?W+D4^!xhH}VDr5hLGMc;}s)
zWGKO$7aDEbOSL;n2GPWq)CV6^J@2Yno_LbKm!Kd)X^?2CNeY^Toxze-mWZS<7;lXM
z6K=-`iDdZISRN<E-sM(^MyBt!51?!@3u;rraqTm;_4ZZLq`CV{GnxK03<()imF@U2
zKI5^*txUypzO4tU*leK|??<wZPrhL*pkqY6kb<CLw9F3r!I!SR)F@b^v>e|fE6Dwu
zo`~R$YG)XBMNTIu8F5xRn~t2hISjstc$;S*p`{0cXha?t^oa=p{Z&*w0UpQd#7eCD
zD$;^^Tr&8pkGQYVQOS;?yQE-%`)bO+W=h3xuJn8mDn_F8pb`pZzs;EkBz8%f#T~yD
z4{Kk{$880BSWn7Ob!c4*07WhiOP{HRCGQ^{*=^{7tIIFWPWBvHeHr?$7ZgGc)Q;00
zc__;dp4A&!H20<%RjXR8eU`sq+2gr~iIFg|7GIrdM`X<HB5j|m0P<C8{qy>-7tg&?
z2~P|2FcjO~b}qgWF(BQ{NOQ~0<<aMx9b{(7@9tADouToy;2nEiZM0<yyA)I^T)-|M
z<OFrUGM5SpW-;$d;w|ql<o@32w8m+d+4x-AhGs1Lbxrw=>Om$H5f8We^xCR^f?d}=
zyM=illh9gX-hEGe`oQt9s?ftUiz*;AnY?g1cO4sy6iNjKS<9}PRU2r*Hq+t{Q>Q%M
z@5Vkx_Yeo#(FbEX>$Ig{x1vA-sp9QjB^uDvSu6$j+aMRkXV<*m0B2gUud37CeQ`B8
zjgLO9!P`0-{E~cbooi1DW+0j2mh79kF=<udsZ>}@npii@Yxni_m5YI^e9G)A^!>k3
zQj9nVZXT)W3n$n%bPR4#@>i8Vd;&Y)B-idU<4<;fJ`@8}KHW!OkWgEek<)Hh{o)aS
zJRCVmW-*Yd^Yp2glTK+rWwlmG0G(m7GX_Vyza&HsKaojO7G6Z|yOEWCszf{t3{ucr
z&|yh4E2?|rn!`Sf4SV%!G#+!1x0B#o#4=eTv*^R4?{@HYtBZT-X?0+2{($m($8Eh~
z?H}3r?+ISgyUf=kfg)xXh?9sxqu|2v=$fIkRl;pm8R~n1^)Usj54dYfD?!<(D8ck)
zE$_Hmld~);7$-oH_ml0)x)j9WwzYQ25l|1?uLYR;0--h)w7`OIS6lI9jN_y8Qn0V4
z6j#AYSO?HBDhO}ct;-(ukzwp@Xva77p@F+<Aw~D56M!9a70p)+Y9`E%Wo7i}il4(h
z{}DCHvyW^ZC7z06ncT^XSKT<7mpp)g;7tcaMi<VFONG(-5L163^K7hzAnj|Rb@{Hs
z;s$NT_Qu==)Ko-1?vgQ<!r31wjFP&}qXvmKIl5-W`c*m0*Bdk=naK0zt#cF)oidQd
z3&W3kWs4rCcZx2Ig)h2r<f>2QADo|wHKAD#y(*kUNYwyF(iHlg2$8Xa``(PMWzs{-
zlRu}vgvKJYy?C8C#OkRxX4|iP@uh}=ME?ezb$+?4e39O!^ZfeULfkTR@#Y8V*qq>2
z$)!-}Rs)ZTl?#tjVPNd8`;1{VM$E9Mlj{U>m-Y)tVF=nVn=@hTaJ3j6dVYmPwPa!1
zV>a%-1^<1>P(g^_?;4id9tf<mH0o7qL60_%P6wGFABy%(?DE7V&N)#PFFGBvzk0pB
z<Znp`Xf41;S~vXSJ46E*K%T*bl{t6(UZ{|Z*jjydmcK-w(7nJylcS|TgC#N5b~AOQ
z@%`4NaV6{5wZ<}&V74P08&V_qrl9nkyJE~RQb&YdY&IgF{f!FD&ANHzKu%mMaUTOQ
zo3HC7dXWU1ZT8ze19W(5<-@M;0rR)mf3wt}$`HI@LqQkb?tqaC3`~m5?Ve{H-#4Od
zF8StY?yBX`cPFuVaB@FAvOB=ftJ97<0`*=y`1D4G-hCj{!fn@m_iKDqe)8T?Zxv_T
zmh!#MafNaK6ZGC1aZ?T`=Ue@vs<Ts<3^nV8oLd$Z-b^x2lB21El7yWijjm@c;zwFr
zZezJ7JbAvyAfnUggK>TS!iHOYmk3olZdk+h`31reFPBLYpQ@_riEJ73oKZoin6!L*
zx@A>p*&`IK#ivH0Rp{pA3q)-ZJoAH{CH&>N>Z!=QMJ3<j=?seC1qYtR%S4+`-e0Gg
zxl~zmbJRGcUiC3c1BG@kUE1V<n20QuKOS_kLsx29O-c133hh?Ea>=g*nimI?j-5z`
z%>QHWE#soxx;J1!QY8cd2?3>BTBJsi?v_TnQM$vHt^sM3Zs{CAMQT8rp?g4bB!-^h
zz0q?N&vTyt`}zI7&$r=b=H7d+z4o=%-g~WUtr%F|Uy%8l=g?Fm8##@J>lna}J&er2
z0r!PZ3w2hU2JheS=}?FXcc#Ahku6*^GHY}<-`8{Iw4!+M3gyxR72u#uW$|SH#M#GA
zob$+BNb#A5`%@=6&7cM8;u-_Mr%+CfTZ#XEd{JZC-GF5pPFkkAMe8ayeyUZ~8zS2<
zHy&ntW{Ip+SG)?J(0cj}&lC?BC?#RhLMvQzCy+H3rAd7Gw;z9NV@gg-<Y{IY12X_w
zf+V^@{H&y&Gk5m7uV^U*BfjPhb?q~Fi{H!Xcp{UXX*khSR8qpdb&R4=oL!mpVwXFP
z+(XQqCg)YFtIZAupi+k1$-D*>j{PNOPShg<2lnZN3Bp%f<d2L<<kPba3jwE(#=fCD
z#!^*T%)ZqXCeUsB66UgjW%8)yN&K<%4v~BK?v-|{>ln$uE=wE9Ztt!L+TTC$%T@fm
z195D0uhQ|Afj`gHK`BtOHOJvYV&PsNuV|swFu{S#VO@9Doj>=XKLx=pR$?2lr~^wS
z{We-@3e&=<Cby~{ejO@w<j+p_(e5OIRh8P)5v`X>H0*gpWLGp59?|C-k4IB{Zt`5m
zEZkj^qqbLB<g85Z@J_UA7F`V(qq4|1kyG0>4PlS0-thO;-glNHdSC!ChFk)J4S8;2
z7&DrslLTddal5&SN&ux(nhf8B&Ta;2Mg}&0S;tF`XcD_mVJPIej8sWDWt%b(v~+r8
z+SNLio}Z$r0@-@^QK6)vQx7bZ#mEq)1{{%*+IiL@lpr9>f>Wnr{~9@tR~Nym#U_ln
zW&0Jog}$(nhnXhL0isL2>495-gMdf~%nIZ-k2807c3v8b{b+josDec`%_ZEe>!kk+
zQaQlw+uPON6X*N`QW%&>_w~0c3Y6v?SJXDuRF!E&ZYc=&7KZy+L1}XXQ`#1_)B0r_
z3~)MjR0in(j+yLxj=7C83WyS3yxbW5Sh8FA=CeX&uKLZPDvd`WSnLSr>v<{PhsK*%
zLb^^ZS9Eo=R9?icm-xr$xD>5+X5$t+tK(jx5}@GJH7b(i{D{NU>}xxbOR71JI4#lQ
z7hlPfxWbPA@_BNHh~+eTc;HK#y2s#%Y4O6Ukh)X29bTnhaO**L#|%y)V~qJ1ku1f>
z71}<EioS;h3%(KFzzMBgW_B=j1fw=tAnjYh6<5Kv`Y&I2(h^_`d&!n#h?m)CyZ<)~
z059g73Ldjn`JRDN81l5YKng5Qz_9xP%bT!sOqw*iUzJ6yD&S)+3oMm<5GQYv9gA5t
z&2Xy06JhfF{yPp!P(RPHS?N}8UT<2Q5L^RGcue?)gzWS_EDb#>JJSB{Q9)>D&7+VZ
zt6Z3bEmvf7kLqd?t2rg4)vIk)pSKFNHsv`}N#}6~nK=&o89?$g<Yku86o;L{2<92`
zj$Jj{Bxbpb_nD#nq;QYnkv5>$*N+!NNK;p1DU3nfejX`Etk3L%4>lrgZrN<;OvaZM
z!@lz(-H<MyE58{h<X_h6ZL<!Rfju0mTHJn{n9ws()j57>Qvv?yBm$g-iy>?-0a3RZ
z1bCx33j6t&U{F?;0$2>k-77l4Ip%fSQ^Gi%F#o#S9|GprRl`oF9N)s|mVf|Wd{!WW
z3Byx?)2RHi7W3imB}{NxM|DZP|Ix0uj*P(luQ*`=hY2{01M%KHpJb^SWl#7JWs!V~
zoE<w1C8p|qjkJ~?KF1ZD<)4^4i`*viE8RI1>vY_4;P_M3;&H6j3`_oYlTp>eeKwRi
z`lsfi8_E0&-3V0Ko?ztfyK%e+?4}fXN+T=Dcv><AHbyF?>dX4earvC?`U{G-9o<8A
z&`U1pth+t26=WQmLn=_^QKs>|PO)z7k*O+s4#JfkxU5GmoM6pqJ9b}_Lb39eA!mgX
z_;ar#0Tl(39iB0sI<IX|`3w|$nGx{gj~?wm8_6j?E>E6hil8>U^FZ>6K0x9cVwf<n
zsdUno+^a>`NaA&zv@G%P>hMfk8$k>Z2ts?Q_Vm;IT$?R>0H$nw0IIjYLZ??wd3#D5
zShp$aiCIW2d@b$*p|F+EQpCRAi4O?+hP$s&w=`17Y0|3%i`*nSW1^FG*YjOU>Y-)j
z#=#(8gQ8IbIQW*c4z+mJchP9wJBAuG_veY_t8}hqaB2qDet+L!CBwIRCxO!OdR^y>
zU_FoIt;1^YiF>!S?gTvc7hganHpXFf5=*=5(!P-s@1+i+Wao~8I+VrK<fi^%PWHDj
zgVySY1F+DYcbPrZ?KJ*h`8k5SkRNSzprcug3D=-E<D-OXZx}~>xcB~$PaBdi1by<T
z*DO>?SN@%#T~^_xYJWae37>bV8VSB6cie|_^DbK#(2+yx<nk|1rpnveXK1}rNnOT5
zQPNT|7OsXkPRSHzIjR%IhTsX*fZqFAWzo4f>MMpn8f#C6rq&b~1dl9rM`P|tRJC5O
zK1M<U2jM0L#<+ExEl_9$jxzfRBdg@8C14<F3%iD=XnKKzqWeHtz}5RzLuNcvcluHU
zACl%N$t%=P<RZ01E)?QxsrcDVePWlIQq3sO-kcge=EC?APA%kc{U#TL?PHyBStTn*
zldM_3NwHfJMPQVhoNN_VVej%~>488>>q3zoG0_IM`V&*){#u5zH}zqUvJ@V>K>Sf>
zP65S@!qPIHd%q&l`<SsRSGhh`OgowtDND#nE$tK-&l@0W<w{NtAH{lRGdZd?L37D)
zUK+R`9+1YQS1Nd_aCm%;xUHLz|Me<)G1thQDE-)lgp3v5_AX7LXRcMrVH;Z!C*Y}G
zb;(h|cejb-_8lPx@+<h}%esCZtBXT}I>XS%0guep3TWvDg}Gy;)1Pb-)!{MLgFXdX
z0mK1?hYW8vsh*tDu4VKnULfGU9TtX!4p&MgWAam>#fxSh<|Jv=W-1M&gbtUsasc;-
znL!j=L3cb#RR&+q(Mhfi61r=6ttw<}M{z3fO?}Ts$z!TZ#vT(WtjWuh6s6quHBy(O
zY#!ErH8SKl@O?!Ktq&u!P3^U;gE^99HG-x|p%%}@Gil(s17EjU*G9B1>(HHaAwvCa
zPwb2!3`qeGd~mYwB$`<0e=NQ)F6Os*kyjclu2EZb`*8<)Xp9}{6`-H{952g9z&Pnw
z@VnvV>%$n?{$n>8cB5!AA<Oj=WUKhsUw-YA0JALbg@Y0Mf*e^LTP+Gwlsm08=vI+p
zXSip#j~~)_u~<!Wy$Na}A-0U4ybzwmWLz8&1=NpoIQF4_z5QZ}XImb9ZNlDc`~lTa
zNO5~&EM`dNx`JUrs(9nkyzB1bhSh>L-Sxp37%ml87{6!0m~}Z&TSK$vPUvus?vj3W
z_`YHi-<3MX%hohwdC`;c*d+7(neMCyZcpAwYW08f+~L`C6V&D4aN0P|1KIC{b>Q|i
zc<aC;-nYE+I3;8Ss1etT;n<O3cN#LP8g5Hq=|2T6Aa1-Fw=eG9I^^GDvfJ0UYhIj%
zo;VxEOoE%yU0|1>Hl_afdUK<_i7Of<1~pDvE-vMi7VF>2>-A20)razR;eb0f#h}RU
z$Y;$3gFfE*r1q|>Knmc`hrhyaSXlKDkLr~Me6*Zggb~{a84?F}h397&PI1C5-Ue5B
z<8NVvM*`?Q;m=KvV*dhVARO-Hh%dZFIX?<*+E0KYXIAOe*HP`3@4d^mA(XCqs^ybr
zNlT!3VYw=bkgV~sQ6RLXROuV4CSI^BXTuQ*L<EdTVj^@HP9=T!G3lhwDCSdp!Wm8P
zKWEJ&)*>MWhbpWQNIxhfjtixyQk&3psH#GG+4`a#-z@LCg!nl4M(mlYURH=x#E!e5
zaMKucPhB0vtp~!Ciwcb*z8|CPv3z>v!-ui%b*_fwsdZ;b&W7W!q6oNXMe>w4K+V+9
z^r=$N1yY#<D;UWg-f-q+npsY#MMo5ocIQbBvePsa=Dw|3YuwB)eOqE`_*r>8&TJs3
z*r2&iaYXM?y)iYTu~)yaszm=z(%=T$jUveRR6TgFu;hDl0Zv)*?LAzV7W8=gMY|lh
zhrFhucIwr|59m2^HEfIf8L9ZKeZDfP(CO^ey&62V&B=i8cItu6sh!8`U-Q+$<KKpl
zNRz_y1fY$+o&#Ek$ES#tE6zDmRG9r_uMhJtRWTOJOWZD~eKi3R&S7~{>nSXvsis1%
zjhr{!sE!X(PW2Uu+%U;dO_zYH<nE~8w+Lbn8g!btu8)>^e=IUjg&~R7EYS(ylF$)X
zzwM?E3dn+B@zMLz4R3R&#}+&Iv|pQ<&FQ0V;;TedmJE~xMENK38sVM~0J%?o8#C72
zcw7T0sHJO@v;osli$6gd&1sd`Q>bv)!o%g4K6XZNC`FN77G7BpeYlJK6q=%{&v`dG
zWt?G6x&lrnS{2BzNW`veHOqH7fXZ_6v3sO&QJ2DInk7}Em>0cw2n~zKlZc?<`hEpT
z(dCYH>ykQ|rx88Q)$dQ9F0rwgY!t6=kJ_PjcDmyevu(+7oFV=WA$kD=#By%I550T8
zrB<k<SI*Wc?`h{Su77bMH_jBFy2BdyG`Br*S<f!~sBt0@2C$+ASChOxyc(Aq!1|o;
zePOYZdHuAgwF8x@Vob#Yfek|2Jm!zt3rPd$_gbh*?AT+v?+zz#6O(20vKR;L<-L{`
zypOMT^!A#t4MJ4F^pnodz70>JQOB<=wH|4vZj8lUK}zL|X3ZuJ=I7u%bLo8gHy1#^
z6QT$Mn-wlj8sFrjn`Tpru<7GbOoF*ky<Z|cv`aT0tV$kX8_ICqnLo#Y1#AvvOb4vi
zzH3@mptSA=YzqVDugQi!TknsL{i4*a&utbNA~@<=C18!CILO^$Ve}#8&I=X|>QW6w
z%_P+v-&<4gyTTKAc}AH8qig2w>7kc|3wePccB-L`f?35vaBPX1bN-Dki%R7PpSjs%
z7`wYsa>RWF<@}<9wb$?V-&O_Y=ZrZUWbvp7i(u?F8yBPRkKli+P1>+SzD)c$-Bl7P
zAGNm(6j#e5P3jp}(EotR(ot+hzi0F?#EydH;qj)$1a~-iUrB)onO2|`>1{tW?7mXE
z=Ij>pxup#Re%=7y8(f-ddeB_)`O)zM#MfpB#3?H4#Ys(DgBZa03bMiEm3+!q=~Nb9
z6Lj@0&Cd473w@XEyV<s$U1CD+eAG*UY{Px_9~YmtQ}|%BKw!)6^LUNhT^y%u_iBkQ
zZj>#e3^Ke?a1Q?uvr*6$KFqj#GhwJYL0rl#IxN;_Iz)~y?A;-;j%of<^!BF*!|r>a
z?dbFQU^PL@ujTPos91Q@uJev94wc5vG=DbOY4~U)dtb5(@5@!DJ^jL)FP7a)y+>x?
zjMD>^Avl*?PdSS1hM68v!4h#*1_z0*C)9no@&OWEAf(6TXYDPOFYTHc=LhOZyS;ng
z1Psy3YommH-f5z|H<Mn9`hFAPRsmB4kB`_?gR=8wb(?k+2c;QbDuO&zD-7a~^oQMe
z4d(fkxvP^ay<x5rJ0Cs_W0q~F<=2n;P{GoRSB{?PcnU;Z?&H=D6t+jd>pJ4-{&4{P
z4ai~(EAbq%=f{lAv<CBhCseviO~qq)Cm&&s#hlqBZ`Sl_e%?%%7-l}n4J*BJ=Pjk&
zvPp9@!T~=+l3kO#4ztsFF<KMfM8DR2lQej#rUTY_3!+!vW3_Ol)#_Govz&s54s~6H
z!n$lvpjQ<q^ne#t*gG;k<ATq2&Z!rmpuasf$v{$i$#T)+(HjVFPx*Ho<Z^Nest#@z
ziTyQnJAK#7`^Z+?y(apjlA@1~w6~d(X!2a*?AA&3r%8EQ9s`MCAc9+X#%)zE0buu=
zaWK#vb;<sgb&V{WTyD2(pY^V?y-lsaDMkhP7*tf;IqW^3!3d{vNq(+@L&8*pYp%`;
z50(H)g<fJKo)T!UIVY~@Qbl)f$>DB5g`0_OP4CpHWm4h0FM{~~#h=TGvCJ05cbal;
z<X2>CCn8OcBM1jAu-xQ$gC^V{_PDY3J4wT&g|?l`1t=@WwE@WIT&tC=n?WEq?E6QL
zL!3zSxvpX0E9`mVGBXk19v3$oxbfC-7X?+4Op(eDbstY?87VgKm5(gB^g-7ZvztPz
z8UUS>ez?mNGlh&`;_kANdihCInBU3VCwc6B4*a4tJ(3fC{4S5n7F_v}Y{nOZ`8pRI
zR^tVoqK(HtS|pZcDVtb)?L(>-MerZ!gDrnc9-sd4&aP_tW{S4NaBW+bZ)?_x4y$>q
zg_kfoiyftqI8r6_MYil&vyo^Qj8(c<d!}Ar+*)Y9w_``?%>su=hLeP5q4iDLUfI<n
zZ#MEw7RTz+!jJ*(nQzfkyS6=Ct4{{8V`?`)r${@mitZG}A1gH5SD{<)p)yV{ypz6}
zs$KHgOub^U2FH%S=h?MRyZOo8AgeMxhdQH}VNXRIT0)No0egBLze}|-qA7RsVWNWx
zqHeMIuOP0e-s1CB1-+sII?Ji@b9#)}W^nOXKlxtSp5w&)O@jlp=n}L@6T$a1mTB*z
z{D|KB@<q{#E~KokGl93-(;X?nk)n4nV?)Hg^V2b(v#IeqOTUCw^eDRGGH2gRrwo>_
zgHdamki2!+Q6?28kW*1<;^=Er_~7J`;r*<Kg@NtV+oHWm(S1sA<oZoE-0Koxy8FJ1
zPcj>gzYQP*^CdOh`#*L1>kFcK^F2BZq>)#$!hvvf{sBxq;r^XFRD(N)%&-Srh?t^~
zB|3u*Njj0=QQ0K&EjQk-$4%$oCv>`|I8zbUl6B%#8!(q8A<Pdh?1kJ5(82aNjy9A;
ztKfSL#g9u01>Dh_a&g(~MSCL(6^r9*<Y1LKIHCPMZAFddiX#FzR9BK6uviq=O{(%1
zv_7RS+$Ad0UrIy==L`=mFB+h~qU_(8FVjFIW?XNW^oCmAom4klo_v(P_gPnXeGe>b
z2;KGdAr#<%_K))OWT<D98x_gau!9*UER7cK;v2plp5t%~32TCwe?;#W>=J~1sti)t
zOhVQlzTaH!1m&y<=9mOz&&%njM0)WHzn&Yq?%f+lsK%tj;!jh!ad+{frF|}L!JVz3
zfK<(=u}u;?7r6=r4;PQ3OR2025##Ta8+^a!iV}4(J$uU5TidGE<#aq0zb24JJ>2Kd
zH7I`%AfCGnz*x1{^HqKVrPY$<q}3acuzW*GUdo#X9uJGc7->l5Y8cgO<a0cyXym5V
zb{Y-DDsAT$n=Xf4jd2N@>v|D;*{5RxzU|Y!1}wCV9@!>;fuVA7*hHiEPTlt1DgK`J
z9dU{HGS&yd0SP*iePyi8Eq2KIdM8x+MAed2Aw26h0UcvRkf*7J%(|s74l~^I^YNR^
ztNN;*9OAzDCAr=+r_8vnfu(ESGYR<`2z|Fkx3Dn7{J6FDi4!cb`X!y_gFuFtlcWyz
z)AcgG_0uj)4A-mQZArpGb(Z9HU#Fi}9Z9tV@el6w5c8#JaBx_f8?0>CLvU=BzB$_3
zxU*!NE>2sFq4`bh)LNxioX6BoV!$a*BBAhMTq>`!Lk8@rgSs&>ej8G}_-WCagp$EE
zxjxUb-i?_20EXbu^rGqg=W&)_0_wj6M)}*V^Z6g$r1VeLG7wyhej&^C^l`4P{3wgI
z)KGfS-DXJR&W>aml{EA51ZraUQ-9koRB6pl`g;HFTd!WZjLIfobcN0haW8uNE=Z~W
z-XV@rjhK9kSMzk)?13)<biJ^s>y6IQYonu{8-x=q^=qyI9^Jlb+?2bS`+FUAbP^JQ
zs>R=>R;(kwFul~!Y$}OD5E5*bdjoOH)ubQLe8V1&@0aMYfTdyhVir~&!mB@UVD^xO
z;VT+8*0+oMH0B;C2KhV)Yc<SP1sAuYjK0N>H=RpRuu3;0JdWp{y2zSf-(KY_zqZ7Y
zQ{KlNN|`)0Jdcak)fxtO*O#<82IHYbvy6u%D|SSvoWDyL0Z||y@vjGWMo^{(6s)Y~
zZZ8N=9AG<OF@sCUpxx|POc$5BwIbt3iEvY<RNK-hZUk=E+2crVuq4CHAgq$Q@-0v?
zsU&?4+^+WS@eCK=UBA^yv^AFsRO1!l4XtGaN=exzZZuaQsnm-d`N79_S6RwrFR|VJ
z9nB)FaJMin>^f54<p>_!^|HM!ew41k^J59P4qH4;@{|PW9nOies#$&VJ+uv>(7>F8
zZM;EZ5wm9B^dwx!6tVK@*7sJt@(6ZyQUlsusMZXJzvnv*Ve+Fw9geQv=nb>F^!2eP
zZsVgj;Db4Fa500&nh6xnYO95+*=qQkIh}3m`del7hu;#8(+~1m)0XuTcw^RXB(i(v
zjTC<3PhD1^gk5b!f<p?FLg^Q1DW#cN2$a_1Vg*Gj)<h80{oqU!*c3Cvlnj-%Gc_)@
zxbs*H;&FKWc$-^k8s}AC+RKPUOW}MLnYg_60Zt!1-Gu(;htn|6-ZA}t_@}42{5wN0
z7qzsTVI?>XGo_B=*@gXX=8NX~Z~W`@gxNjm(%I9SHCea{9{Tmy_@d{QO6*Wo3X}=v
zd{#Jp0r^@r#frm&$8gtCJB95n(sHL%*BZSa*0>T|KS1}5$K^a8#$a_GM~Gp>0JYSR
zEcBz#f+${aXB4AerzSlUljZZqJ+#VNB7D~sf5_kENIFF_x@i|2or!_GUlQJl*A<k7
z35`n&uz@Tmjws6JP72jO7*28~SZLqf7LKFZ+;4X?t&084x<F5RrnX88N2IoEncL!9
z7N#1onfP>WO?;(lIJtwyiv?d}G)TW)$EbZxSy|L8w`9K@JnE^x&#Zi76ou4Ua7u0W
zm9I)N8OoMoWx2!MH6l@Go**G+n|+Ak;;HOjg_QCru7FOZ&YwQ{V)cqfQFrHL*+H5R
zzr4PBC3EQ2p7eCKmbNFg-oS@BzQ9a{1i24NC2QVIyzV83h>BPyx&pD2(RVSQBmHNM
zq9b9w%|~$S@==#-36a_ps9TO+z4zhPyZSwIt8dz-C}ccFn!W_msXy+0oM=|7X<k)Y
z#CbUuq||6FAo4;M=IVxj|Hx<NE>%@ym&@@^!DQg_Ab&$iQK7hv&#k)CDk<pAbQX68
z2V3nX87!ENaM<LBZV8uXT3aUfv|OuG7$s$>&4|p%%5MdMu(03G3qGxlW*x^<iU_Fl
z3y4uZHf*wpjFuEa@|kVd9p&U)wq)-Pv>dWv93stC!XKC-w{dn9n%KYCLk&Fyl01b}
zj<%OU<E+8mIp*yV{$z5-+gP_AgTP@B57Ua2B#*{?`qMcpTUwri0^cyh_kq{G3z~@O
zz=7o5ztU1cG?&7X>X7;iRI%H~`)qaAP|xj}RApr;#@ix*y_s-&w&bDe>j6|-&KkjC
znG*Lh%3%_hm01_8Bh^2Ao8*#Z7SL}hQrb|%+rgPNK`mZICcm)5Lu6|?2o4L{^iDXf
zpPB8zVNo51)Yj+#IC0RERBmcq+`awnbaC-ZQgux}t0ce0gNiPuV$IwN$}NXSJ31wM
z0ghIsVDiw53Y#NSTkA8jsWeQ~mow)u?c78=uU$q^GN>hSG7N^#JuikB3AT!yfO$oP
z1*)qvOkoMJobi*%Fuj^al_wvt)4H8g7*AouISfR_LL)$^1PI7O!+C%0qIWlDEVt2V
zrs(au-QWO|b`Zbq{glgcK?8Q=cok{kakJCIR+r})l_$!~+qHmwkt88Mrb7j)i=#B`
zXutfz1iAH?9o%7QS4pH}XkOHH#dHI^VkK(w#)-ijh9K9I$vObl|4!_BZ5^Ch^%coy
zpFGHa`>^dIYW!sU;g;E|J(ltZe>oM~g4)M@(xgii@Z1x`hsJhzgWp3Q$ae~nyrw+X
znWe7I^cxNnVml^}qtS~g4b4*=G#kgVN!4W~tj$uIM<V5PF9V=o)hj+z_7PMvRr~tr
zr%Wbh2JG(PVkkom*jb{v6SXqNd=@3iY#=&^0|PhK5Zqmofo*vh-67^L7+0WeS<`*Q
z^AeuJQG}n<={&|3azhc($oZ9Ju{R+g&PHqWO+eDImubjZ*bbh_Dd!iyHI8!~;qfsp
z|J1Q|sf;ENd0^0_R`O~>`skgdQSGRSaUe9jnV>YR!6T^Ik5l$S@LxN!zADP#PF@~o
z{~p)YEYaJCM~f1XByX=I#gX~pbwr}c2b&K%N*FT^1Cxau6_8*S@&y0wP8Ld%6amcG
zFD^t&!p9V4qv>7_gA3BtJAxZs3-OLTT|6HQb6kd1XACqQASq0LYxM=p4e8mbSI0L7
zR}B*=8JO{vaGJFZQV6cAT~%fmVJf~Q&SC!~A(Y$C<wMvlfu}J$o13t;#DLD7MNiXO
zoV(Qy;Yz9pM|c})n3SkYY_dFu7<(-%Nv4hU@45CzSl7Jl_3FGsl<rM@urb^VqLn^`
zIOtJexkrhK)_e{f4BhVK%Nf7IXqpuBUMYY<Fh96}IZNbj_=+oa{j#L}NQFOmC9;#X
zD~JcRJ5Hcqc9m5Q46^)i44(U*7Z#N&zFCg3V5ya(=i4~g%@wzrS$`dtWFKoFFj4tn
zukIRM#bxh{i;H$VUwO*i52Sn3STGf)q2ea#U~n09r>b<hf4!oV6zpHc+h^Io9@?K{
z(`?;%BMh`+M)_j&i5&W|br6P3a&eR0_u@lXZ=Elwv_xNbVW6JH$;ZdjoO#%)W@k7p
zXeP9{EKvQ3H&9Dq4xTF!xOlhb-c-3uj5T%o=Q;EQu@*xIklqoG`H|*r4d-+0tE7E0
zz2o)L+`P6ld8M%}i*Bz54`10}Gqrb5irr^o;)>@<QzTbmzfM_Ztns)TFD@a$Q(i@7
znu|bzs8XF|=%nWhg~>@FXs5=#iOZmRF*hgYE7$|ee<W@f2^)Z&+N=SG#m$C1i;Y@!
z#;^6zLvcoAuA5ES31j6WS%(FKMw<jRLPn>tlK}y_yLFDy#!1GGH7DzbQvK-3>G7y%
zn=a41Pa;Z|Ee~qjdLl#FeF=tN>R@Rydy}e~c0=JRB40jMo3^hrY8%pwT*Z2mD<AnI
z_Q4Oo1M#VDyWw#oG+)&Vg_clHq#e-pC9zE$<smzsFywYWUfU;YOqBDFeABdAuT!Me
z3rR1ej?|`wd>K;<Oyjl8<`RM1xahlBemzX>dTH{0y3PpmNxz+QSqU}E@&4^`EzcJ3
zs*1g2iLvD+ZV9(MD>)wxb7h_Vlt5!X5ajq`_6A=vFSGten45Sr4EdF8V%WXivyeKa
zO7_xjPFqFT-Ec>9MOPgUiDtzy&-aavx2Be>*-iH98hK!O4Jop#IPA-FD*EGf;IHE-
z|A7iV$xRQvk+tTP0v+g^izl?Ug#_13A&#iD!)GO)<<7docNfJc)cj`)D#`~WBu3(f
z*{W6^vn;sUpIkt;A^Bp&TQ)0gg)(`_8is3D*@xVb!?GoEF|MKxiOXPNZCzt<(wMEi
zl~b<Z3{^(Fs*b*;FPg?_FdPKOtJE;<F4`tt7RC0<(c)M$NA_X4B`7Advk(V}CIxr)
zC3Wd<+{?(wn2ieKOkwjse3XHT=J|M9?SH&S#Q1n$Cu6NrUBX-emM%Bd9P8VH@i4M_
zL^SoQC2grU)zg+Q*s`=}`OO*>4omp^8BVQ*O;&Ye8wOs*1ds7>cxaNRkiim<vd73&
zCSxp;?xR?s^oMh~;y^M97d`HS5O6`1omE;rRBC6!wZ}x}M0=|fr1nBfU}wmPR%J3N
zeDcbHY?bfE9p95LogkTffr;AWX|zL<g4qYm@?PzZyFGh6y?g;{hfkMzIr>HriRrdU
zytf9n#gAurIbh|Fa*xcy$g631Po8o%mck2w+AyFn{M%pb!yJhbON~!VJ_1OF)R}W<
z#Ad|X4-32IhNb>W`Dt9~_{QGlXAfBl^nmESamA;x2!-r6XPDa4SZ!rx<r=vQo{n17
z(_h&Yfy2zVLI)FVo~<oTeBhY1ffL*!z6Qf(tJBqrs(k~l{aEe_O1+s?Rho-s#$QR!
zCB6RMrvsmY`_7IHoZ6G{DiwoIPEL53K$Pq9d8vTgK@D6h;@JuqWYLF)hB{7EJNnAy
z6bmkO(UF*mABVX!-Kk@5Me1$Dfi%j=cilA=aP5HeyH74a#2G~*zZ)txY!E+KGFnff
z$l21qvY{xU9P4iz`A>G0jI+w62AS>kc$JzMuRd>4<7?>P42n}qd)vy$w8bFTVAePl
z##!46rrR&&W10Qgg9n$h9dAe#wR4lh4Bh&rsih3lhsCf`lp{DJ6M`kVy7r$GcUx!+
zG~2n)zDVt28{`u_e7FL=5kBb0X?69NJM=4X?PqvAhy(B!sxc$AuiBJi0!$yG%>Kv5
zA5gKN+2I?a9)`8HgE>Q{Faq5G^8&p(<|RLTr6vwbLL2Ei#RyvQqhcTpS*P;-6&-?S
zEe0--@S~KIF&*jQVWYm&6(f76YJDg0rjn#JWSB48C$CxCv2nmhMDdTgI4_?2XLMf$
zG;25ezG8DX9n9Bcg$A4Od=G2?4rJqTK7{zVv%-ADG!>$HEm|#f@s%XFf;)RiSZ|On
zuBMF{ZJQN@C2<0|?55yl%(R-+mVt?3i`>XnSdo$eHwF00s<XbrX_3hxs|FWam4Bl$
ztl_AO-v}m^Xgs1D&G}D8mcM<QaR^8a*L4Dda|77K4q~<;sV$RW47sFFefj27T)*m7
z15RmQ&hC}>CE?V<X$--g){M97G%;f%q2gSxhanZT@e+|yvy078%qicSr4wqP!6d_H
z+bj=j=rxt~>dRYwyrE2?JUXYlkm%UqUWIksrUnO?TV0=J8Wymh?LwWd9C_~t=F9{x
zr<8hfbCkh02X&9Gm{k`gUi&ZVO<#r`L)vh>3()v>V|78Hy^0D7KGIM9h2L@!-QMu&
z+%Jg}EYHX=bq-p?O4-n&PLC2&i3We-)pvb?#nQ~dAiIw>iN`0Sol%)Cgs9eK&&h3|
zD(_)OFMSswP54Gf7TMQiDQqx(OL>sWj^d7vN70l>))&6W=LHv$nhJ{R01wMRSnejj
zAG*HovzoU^uRSl%-(hy=C;NvMaAHli>vECD0+tq^Iipi6|1>5grSTp3qrC9M1-3O(
z$~mua(RWpm15M6~-lYl`hOhG;lCqUnee7Hyd3#b8melxS*22C<Wf7)YpSzshWOr!r
zCUX+zg0N)E)ZE-vxx9zm+cqb{Z6G}SFMSApKn{c!cNnBMG0fhi4{pB4$FxS3$c`+H
zNm(e%t5WR+V@^kB%<oHa$&JS|@87bW(YKwU!dFs>^Hs=$*TDc!fXZ6}gc*Cv5ZPpX
z>{i-po_vXOq!Qv@cgUkJd`lO#3laP>0!`-8dv7aC^>UHOIgM(v(7b9zYVjyR|FM1a
z?<yjH>)g);B4-E$MZ9U)SP{X@#b)%nqlXztr}(Kxh2`be8!S>yIQl)-b(4v5OXyfI
zIoC%0{gFdD+X;!f-WX)bB{w6<!!UbgbVgRz;$2FSx*k<y^7gka$u)U&LWeekn^Pj1
zH7kM`CKN96s*chF#fNQitv9D#h749y({7e@+x_-3|M&#@g#VbJ>-of@+x6ghOcF5x
z84?+DtkF>*X~*7DVDTBmci(uZoJm3c0zVJ11#hfeG1d#H(@WFIqReEp77!FfDV2nJ
z=aIo%Q3djy`NRF24`gK8c|K|6=G0Xh9X+lZXqqf&oJj~c@YK_>shSi;(bbI~tF9jD
z?H#_-9a|+t?i+8ex!cv7qdbSgasA+r{wPXvo`<M~5|ExXr`Jo+r%Tr}@hmIn4M?sv
za$Uk(?y~6+&T6VjRaxd?RI43vsxe`;&CEtOWT9V&&BwXeTMjK2^QErgs(&+A(t4!y
zik;w%%<Q3CV5asmHQy@lq<?abt)RwI&`N#UR=<_t_CZ9Fd_>YS7@Mx9hmX}>mwA=8
zRE%Q*I~U~h%ak48?hQ|{{?Wy3kIsO?UJ<Sq(*Lq-FJJ@$1_6a%MiY#6HEMQhVPH6!
zX>?%KUKHm(GjcL6CFLYqX-@y<;SQ!=F4#LwE^F3;qnN}8i7U8Kd!bv@ecyIVDqT_U
zT#1`Mq283aMUb^eOHPU&1KXl&xQ9f*ubQAfjpD`K1So5N^MiM^1^={B=M_@&talg6
zt_MFL83pE9lP|`_NOaA$YIntVqe#{5{8ihZBMh!RgY}x^h?fk+0m1L2UX2I~2}OWo
zh+Z}CR<i;3Bd9{9jrv?iyIh?=fA|Mld<T~43fCulEE2;E=b0w5`?rl{Zrq(uy?^xm
zosy9#!}RgJ<Nvb6f%n*`0==IY9LeIrdoB+ufjwlFR*t%0qWLz&A=Jz*ckuAFR#A;K
zeCQ8KlRs4d0_GC%iXJ05Y5F;A3;iLOpmH*eS=6?-9>Rv2;VUaE>p^Y!1PJ+$AD#bm
z_KXAa^790s>ZJ@wM&oO|?h6tJF%Rb9eg4j4$@1w)##-;hMZ-B!&(`=61<`=3Wdm&2
z{}95T^K%~%2_@eRj$1&TIKG%|u9cN=lJ661rR_1xgD+pcY!CAz$(rQapW{v_WQ}r%
zba{9~2>0NDiVZ|q4J7{!56{}8-v)-t;H*S|*9r;3I+g&hi4aDC7BmXKcJRGgWLt%m
zrhn#F1qcaD@{5bPqAK%UB-iV@cj}6q4G}JNVgSw9Qk}-g9dC5Fbs8uQdRLI})j}d@
zJLbRZ2nN=B9w1KfXldv*$na7Jl7>h=!zD`qohw7!mqj|r*sBxkHVh=G>QgEoB9KU=
zxaDDHIoeuAg5d(2r#aP_ubrJ;y+WEnRz$Oc+Ky>J0NM{<fNHR{gl`+?$+7E9lm9b9
z2OM<?z5lKvpbRo#)CR%r1$c}ZLEQIRCFN)Pu3tS2nRNdQdKxCWw?4LGuuxZ;99AO6
zymqSoH0l`@HFYls8(SxMd0%dPJ@_K7j(4eVCsV?DY{pWL2AUILX;sQ(@+|9g%z^S;
z+S+-Y_~C>RQ)70P^<U8k81J_jO|b~GA=08A>s|^^pGMjw?JWUe!fVe~qyXk1_KTf?
zc3q>LfL~fzIp!d_Qx#DO*QWIEtYY!MS$3WT=g*ZCECi^^SQ~ZF>ebiQ7?g*#%HyXC
zHoNyQBP9XR_-0~B1=?z-8#ZjK>OkfGs%rXgiWfXeY#IU^9VG<Hl3`&IN3EC!GG#KR
z3qjde=(+@N!;-le&XfK8*$IF}N*3T;Sa-Or4}@D{;K@a8Ta$#P*v1TV_ApY*|A$n5
zr*HPfpRHbv^m-st@EV4HZ<_c_0zG_U6AZ7D$_Yqa2<Tz>Z|*GsfvqI~Vd?0UP$eKA
zPOO)NH^$vg4z`|<ycH-3ww=`JK;AA?m4N?QYUn)h0U>pkfGsI&bhiQOc|E*j7;p%e
zwV1mOPz#~lp<$eVF3LZg+u*kVODm;j^0PKzCv+RrMZAm0;u`!jA7riEbcBKD|LAmO
zD#&F*Te%023TO?RQSMM<P4V6NQqX_21I*Ry_zMiInM}&!|A!oZNHhaat(^3{rTo)M
z{Ix3>0(J#5;YlI?Z04VX4Z6T|{BJM#<JkjcVBUxF^6~ynr_MhEx<>TBuKlGJ|C8FE
zs}S^Gbj|cu#!A85gL38UL{4V>^Xl}J_?vDc8`8pK>Ru2Z-ktKc>XsNLMW2#~W%Fn8
zF?(yH(^{2;=YK)``Z9*m3U$~^g$x%rLxHz4=j+XV#)Ry|Y>M@Z89B;D%y|q5U_B*~
zQ&c=w()s2G2kS0%EJSDMF!TR&RU2a}D*#2IcLRq79Jk*l)ELuaKqKR<T)iz90CtAo
z>V9yw&kcpy=~5HjlfAo)uXco?xcG%zS<=ge^?h1$2jT8t^}w8iKdr!x;&L47O9C@P
zLPg|O2wLrbLhbk)(8{8OC~zd{SCeLu%yzHqUDCkI>e!Ngf^%5>o+HCn#$QDwZEpg`
zvY#p+#8-dvMB4zo*7B0ZpvHXr;(9?pk0WaH)A3Pv6ydig!}wI8Kh`toE%v3{z?kTi
zl2dhNUw*Vd@zOlo-|{n4GX023;H2F8^zx*#dy(3mD<3pyWT?Z~R(-YSSL848Yk!Oc
zfIlQ@4J93W>?o}7d&`jWxF_d@Bh&38c(G(u#e-9q@&MG^lFIRFyU=DIeut7063MFJ
zx)?&aYhX};<n8z$xAxB&=?B#pS(O!|!D~r0M=jDbYnrqg_llnX>}e2YrnO@#2TMeR
zrw9_ibY{ldIH)lCPvi7j4?{++Z9V5r_)D&o$>l(VSN_TCo*YT0t#!XQHlAVO@l_7e
zQ;D$;UEeg;?B4uA_f9W{=~Axp42x~1AG{VVJ=5@f*23!{+mHYKLtW{E0SsmCYa^^G
zbe`0`tvizHyRegdHx0bnb)_mru5=$li(8{$%IDh?-ThQqka9S>By#(Qe?p>ZT3R^w
zJ(tLM?Co1fF6^9={8pDrV*pgw2uO3Dd(v%sD&4i8G~eFq2q9z1afehde0<j2?7JBK
z)`2nncRKJt!5io>iDA&?29^Ut(Ek778J!L6bq-)fZR|9E6Y2i}@xS_o&kgu-A3ZPB
zpCkAGw{L<3fHOE5&E)$37Yifz7_hzgO&9zAs<iZ9zy6*LXgFzn=#OfQ|0y}pQy}U@
z>HCeK&ELTvzdC>Z>%_`H!~H`!+~-!#zcmg>5FqJ8TyXnY7wHc)IWO>Fo3p6B93l7L
zS@QqdZqzK`?2!85W*ndI&2MMu*QW<(3|0bF`M>X||Dk|C{|v^W01h~2MK4VKACBEw
zuj!M3hBNb(js9QSWvm4>0c!^1o5Xqa`j@fvUjv*UWyjV3Qvrc?KLVP-{67`^Pig*7
z1^*2>fM@?7P{F8_SyV2tgo$qk*G&5qCihrT=dJn3JTJ(2_!Cg(?}O0fo6|MUGcR#z
zy)q=YsgxN06N7{C&VuA_-~Pf7WrOM5xFwUjySsZDKfCDvX2kR8r&$gHw_sBkKDIgB
zh7%FeN%#e8)1G4#_#3l=A6x}+fYl%=;1)4ca9CJavrUpmsg|dbOjuFea(kwh;PB5i
zOdN~3z5o5zq3<0vDq-iba!c5>&ss6v7Yixd|12j%Ps{|sr25kwDlC$Fre8wHC=?_S
z;EQF$;o;%BlL5yYq9pHTcF(A10W1u}<n!4UCdoPp<on#xEI%!J0=E`9Q+tpDepo==
z$=z&2a{)_^KCn}0@kl?_Ip8%j0cqNmD%v6-5_K65^b1Kd!cdMfm#@C2#>gEMVP#{J
z@5C5|W3en)RrIT!{Vtdluj7sAX>wB1(dnY|Vg{?0EZGlSdvpyrjV}e~gfQJ<YuAbs
z6W=0kqhbXJ0e{J<l{ktY)g-(GFD4q&_V=d7=xQBZ+9e6j!;^c=H<;G}cNvz+zR&*C
zrJ+~B5<?569T-ru^yDO-4dv72l<OjFALX+-UX>UIK4wEPBwM*MiCwvH4py<)==q~}
z``jjY;ENmYR>mmMF&8YOf-L?6p@B)e!&_Wvg~dXlvMDO4?xQSuPDfrpZ+T0ZES$HP
zC8)7?rzDve|54ZPpp3taPw)XnpTnUHi$Fq?5L#4<=<jg?BepRJ#%@?jJuoh|*9S`O
zR8Nr){mMD~h3C8+8R>VN<_BWljtE-STqXE@QSzEPcz&LArVw7RNd*+H9kUbo!QuU{
zR_KR(fvx}+;dCO3_Sf6b3FX`~Vqw4(Em&#(oXg*H^B<q)O#mBs;w<I!%PO9G%eiNu
zNjzW~B`ZryofF@A>-_hdUk3u}ywyywg7KeleC~Z0FrS<iz;+TMBlwek{G4=uzMdWp
zShu!Qp{&2_Gyd_GbHi^92h3{inAZP<_-iTtJt?673Gu%e!ZU6EpC<mtqWc9w|NmUh
z^djg6&|g4rlM2c&Nl!4=*#qmbK}6{cCwD^Lys(1G{l@Ws;2_@F#`3#W(U1D8Q6Nkc
z*j;W%Wlwh_Vf08^U_qFS^59-|j@U@JD#qTkgGr~#f2-?B&j%nl!-7KoPlU^}OlHqb
z0E3mcvL2S1B~p2qFRSZs&ua9#rPY`Kui0yGT=}=FJRob#@EM<gFc8>y1_mv;ErlGC
z<B65dt`)P3on$duV-2ztE50WFpR6%B9Vjr@aW~BP2mY;uYw&Hrk-Eaq`sL^L>%#+B
zX}9~(;$aNyM2xsHOgpJmj5E~vY(&!ml|L)s{(_$$ZPUA)jmTQD^T&wr+0~5lUmhWR
z3M};c1_LErS_>~6-)nRd8UICBdCn3M+X7Z4nmotvhilSGDyLHw>|S5N@WF2}L=kAS
zcG5xMU!}N>*%@8>l<KE~%iRuU22(zaj1<I)k2H)X9(6xCIM~t9ToZ$O+}X>qw%AQs
zP9)!U-Fp_b^6)R0>kll=@CRhzFf)-b{X+<q!5|k;K}|>XK|fto_&_DTumAER+g2<$
zqX{h?Ay0$QOEd~41V>3ZY`US+_n1G>Vd2Yo{QW{;*LDd=4;_@KQH8|}6ii-I4zKc7
zy(X9z7%mhv1Ej$Gs9d9oS;J$;x#8u9$gY2dm!3>}T}+z3?aU$`;JgQ_hyd`l#d6zt
zkg&=7K_ESRu$)q-m`<o@*00bqOV-%5Ok=D~8)Pt@!WDa8>5(Mf)rjH0*LpA(nN5+l
zk%l3=K^;~36jqXg4govE7gUlg7BQY-#zPqYo}=#Pm>cZkkj%R$ZbZnE99!k!1kl%q
z6puyhcx>z(I(8gb(v#Du#ANBK&w8}C_s;!CkDjnUHn4VFk}wMNTv&B4omh?7_4Lft
zg)NRz7zdnSC{y>%sx0sxVY+x&$_Ut5O1^%{=YDRofid-9Z|WCImc478cCgAUi-GSq
z2oar1_bTcL^!5~bk$tBTp)B>!n8IT$2W<X>>7$=Vd-U%yrv!@cvtKvWdJm0z@3PQP
z5gctQy!Q-iV%Ck~hc*UZC%N793}=F-sRD;X2K|5p4=zp?LWKCNHuSZ~HMeA01oAX?
zGn=kdNxx(*-NJ4h+&*RdSIL_*|DyWI&r8-|EYewAD+kBN$r>V#{kQg>RjcKy{G3`6
zEfCDnGj25XBkchtf1zPZl9rv%$Wf(=EuA~$19YC6M+Xr(RLOwPE?;x?4jb{jFS}P0
zj>t!CCfg(z>}GEJ>zGLUA)}_8?nC6V-~!Wx62njac_0M@Z_n3mqAD)wZznAHHolf_
z0b=oGK4-|UBSJGRkQvRp=@@WkNp<s+Qjy1AT?usTf>tBUVDQA@mkFnpJ%mf~2IO6Q
zw+~)x8Hi(A^W$!kA|p<wWxTFv*2}lq4TE+O1!DWIXDWz+HLe1}A%6S|?nspA^@f=r
zMy_!G?cwz)1Y2nPXIOQmkR0oJ_8$6K1BeOh!qhuEaDDwcD4@h=Q1>I`IOj2ef(htH
zq|p1bx=;#zTK`fXuo4$T*4$_M3ci+vR`pimULW0AF~$u=dN{k_pbysJBcvK^O~S@R
zJVzMNHjv-hsZj5ROyOTL0d67X8`eqn%kCEbK6`%M0t4qqPKhsnPUS-|wI_@+5aT6Z
z&|S3Svdqu9p~~IW>sX$x?HvzJ3-Cjoyyw2Lc$7A>rPxb$M%oGNLDezP^U`q%pMd+b
zX>2zm;Q$+7^r(kz5;+A$K|;0tz#e0y<7`}Y`<I08UQP|KJe9=5zxda2O)T0JLHTAt
z8#_Kc%!vHjL(ZLPm4O7S856i`vA>f5B4Xz!Y6aiE)Xme?8#lk&80x1RAnBK{RX_D^
zd(S_wjTU7G@N1X6bU^r}mEH(X-D!(2da`;n%;wUU-V9B<Bc@6mtdE4g53Zx*(4G)i
z5|7{4Fr@Ls)AVG}=#~`N$hbD?U0-6Yq~29#Br)S-um73jYJT|rAJV#i)y5-;B@Xl9
z*~PLA52j0>s1&z?XU|@bDB|vR53J_SjrN_ct}cByXJBVqpjq#TY6<midK=^W&Tm<K
zE4xOzX@t>>F32+hz5{B+V!WYXv^9ov+^lnBlE1%k13H9lRAIerGQE$TeYZG%`x82o
zC2eBUgAiseM?RNlxQG4b!Tw3(d<#ktOy+ra)$Yh(gJ??BQ-9J^4V@l$_t+@?SeIjh
z%pAevxK~g`j?r~xB|nWR^MW1bHy6;o)9O*8D+q;Ls%m@GOEv=8!qV7{nfaFa5Hjdu
z1*at{ds{F5>bqV()z4}-EFfP^v~*6P=o`s&8qDd?HftA|f`Zz`_pZhrs{t#godJHW
z6~;jIuOEJ5P)*PiHmBlgGpy*VrUFg4j$-aSXdwJmA1FC7{?Im1X@Jv7MB!;%I7wEe
zUYvayZ6{tOQE;$=sK9G=Z{9jyy14#0qBI9e7PZzz^7ra^^idsv?IZPG8}!5?R&$x1
z&@s+!+c>frcB{B}pz}b`y#&o6yy<70pW0jMXRSAk6!xGiu}$zd153W$9jkZ3lJWE@
zjZNAG^9ssaBit4;PP;a6(G_Jy>t*0vav#EEhcrp~4UvcZPgKXo-^d(AAfeVKUf#`t
z{gs>T$;+2Fw8d(~D`^c%EiE4vZ5`rPj1bj&3|v^Nk}@#Ea+#hv84eVR11sB7>I-x5
z%WKn$NR*ea??kr&nE*3j)J;i;V=05?X7W(kw$)*Tjf!==%iW4p7vUpYEPK~*mYf<!
z^TS7j(p)6=i~J7`#qcOLP_r2&CWk8pf~Qdui&ZvGq0bpD{o;#7kb2c-UyKs4r2pmu
z&=6b?Nh8Wz58!!m-0~j$Y<M}Tf5?AZul5P@2$s!*G7y;Jn5zxjKCpnIZ51}@iVZb*
z4~`UZZS_?#!Nw|$KX>c&*MfmS+N&S@PUMXO?RE+qJaY9T^19W}6278=gs+zxL~HcK
z%b0CfWS;PvtEY$#{&XZf7-vNsABnD#8=Zlt-(|U3M)TnuaT&FN!{OEPI(Ze@(0=JA
z#XA*4b4p#@922Ko)5uU`@mQ*(iU<Y4q~eXo9^LV#ueUOncO5qZP&Zek%oj?+CB9lo
zq(Z*Lrs4`x+Sb+SNTR0?$S+IDy<V<<)n}Am_)zaUhu|F}^2~ida$ATR<^~jo2+-bp
z@tNSb%W^NN&q<U>D0Px<uf*?GC5cK283%$#<ZjelLE#$0?auZjP>*-F5MIynb;oWm
zZTBl_F)Bj_*1+v!4Ua}zTGFvVS)~vjSbKN1!T$BmGJ0ct2_>ZsA|Ko_p_Utc?<_I+
zFb|Z+(uF(UP*vAU1w4zL#vZyeum}LyD|i1+@HF%nU--MrO0gjLyzkCknDw4ZI>p%g
z4+X1E3>4q!;583Hn17=`uw;w@?S_E7fZ(4E15+U3vv^#~7K_>5fV6{GbKK>&x!K`(
z9U_tIvZ{WPdiNXC4q78g=eZEFqyBJ9zK{xJP5E%RE0MGQ9SD+14@}(aShK3>kX1T@
zgvQHf7>U|Q^0Euj6thpvzpdU*#g=u04827N%o_MLH)C#Ebz2&8vatJU>3Gm*lCkIu
zAmVsKcE4|LSM4wyczcw~yy73cvo*iF-`@+baJ1D+<Y2mT?5d|X-d^7naxtq%n7j0+
zM`TmgGQgWJJY)^$sb;sCo?L(y#Ydkz%?UCHVl$p10ek^a1I5F-8Z^GF-dN>JygfI7
z=<3y-YRHz79YU0rC{S=kBP(DpS$634c6m8v>L<gG_5P_jG}8jI@ZE;vAvonHy?elN
zOd*`(TI*prLbY3(d`KG*-aVrET47=Fp+W~%vpZ1PM21!fIo(farfpl=hK(Tnt3J1t
zf56Ta_pMvD8Hpm}SX%x3QdusV&4eKU60fc7Gxx5%Tsl83+y=f=UY_KFA0(5FDt2Hm
z{0V8qx|oWxwl8WR8c!IfEb4V-&G#EUcT>Hks*K6zR)<7g^g_85+zWJ8Ta_63P|D_>
z*%1*M1v({?8<%v&KgRPLSuKgMCd@@47TDVAWg1E}Ry)8hJq@PNkoJ={{E!Lo-9nvw
zrA(BIzTHBU(0cO|h}Ib8SC1O$B`S#_gTY&Xt4b@Jyglt4zCq5#k?1I!oTDY1D74DC
zf1LA5V|c#<!Zib(n~ZW?S=*E?f(TD-Tw3fOl|^$OzxJC>XL6n<O)qZRyPB>^g{|@E
zf_In@Bu}eefZ6plzgN^;&}8FM#%NSU>--*9d?IAA=47l~T;)VOin3VaRR`FhL{voC
zug{;%bpj#Y6}q$>*HDIN{pLyJc^uaM@St(aL6x-^U+v}lw!46-_rxsS98Q1iz!r=6
z7~Nbv2|j#V!sDer*f#pvC^_sz?D71BUhQQG?df`dqnvNDOQrpHBU33i+2`vv=Bn{z
zy-!D1I8_cS9qjIOm2-c_^QYaW<_Q_zhw&crnm=!wSaY1qZBP)sG0DeQjuJJH(d2d*
zLiXQal%ouOCd#5}{IJnvYWTa8m&|kFeK~Deq28G2rC3^rw66d&)sKCqO)+RdT%1Rn
zX|J@qE3xeHvSLiYv$1l}U;sCa^wci<sB^2-1GU(!xSo@+c$=M4(%N2n|LN1*H0lg1
z#UKXE8Qrgy4+&eC5o0AzqV;7<PpmhZZbB9G(TfJ$W9{ASx~VP$){(WSrz~yu<J0_1
z54I9%)J`{-SDSXVhHpJgDrnN_MXm|)#Epot^BZfSHBsYFS|s47N=K*Ye6%&(qNnL-
z&ow01Mqe@O0z10Q@KeT?tKh8_t>aWe@RQyPRTi&v<dsGjm{BPoWW+Z|fqeUDUEi?k
zFkkqyg1|{vN0r*rvd#XdLcUZVqAS14<4<q;7%01IjnnZ@IIB9<5U|&@i>RV3<u(zY
zkBnnLp8<aB*Q-cew7J6@$QLFWiTJ&qgyULWA#L{!@TsVQ&UOh%E!=;e=VE0-QFU=m
zr20~)`;gd*N$CCy&(!HPgUx5<X30lsc3zd!$<r!xJ}6Ug0Q_BzeHz&R!MuKt^QOPW
zyuATzpIYO4rpc0B8@KO#{G|9AS(SNUD5?u0HYB^?tOjqln=j+x07AjxiQok%SZA}8
zI2@t&ie#+jmWzwCK#lY5V>F83$Z|OQm9^t-Z|A^UHs)528b<Y=0Uk%nQ)m<VbdJsK
zZV3*R02N0K5sm5QnV}8X)I~44WJh5WTSw#+!}XmrWwpHi|Il>aaY?rS+rKl*%F3qZ
zu1w9HJ0~{Wd*Rm1mEy>q14$cJ&fHteEpAlYWaZuiaUqtXA}TIKLFD27-oNKx{<?U<
zb)KJb9PeYZe&vP5UBJI}X#zuTD|9W_W=aOaH>_A(@g?$HN1j1{$LsO~|NMnG{F8yt
z0KpQV3MFRXBSi$>PJri_6Q&~`-~-aa%zV&FrQ+L4>*Ug+3BMLpKYHDdjS|_Tw8?3q
z%BxjdvN>7F-m2>Jxg^f#^q1kKFDqhs^E}#Yu=+K+@7Id+EVDt0fC99d_w{(8Fy%YH
z$@KLWC2V!S3P>}x_1CHU>}BYMm0FPs-m!+d2$qMxHz=U*?a^#Hn!i-$EWdc}&*$hz
zmj=(l#osO!ncDdpZ=24BoIMqeTa+M8&O?H8IXa1j=95&1ckpCJp|xod*{&I%pApgq
z_K#X_U~!?b;G?}0d&J<zB1KI5#CkhZGiRfI6y^11A@JZu3~x=Tg)-3@-MJ|w^<^*G
zZ|NttBliF60Is$EczLlMP3Omuhg#E^J|-aZq@SYz{bLOx)bnTBZC-E{&8q~{tlPTJ
zI1*0u<E$6AB{rpdBEGrm**Apj>V6PfmZ=K1Je#WV!fzRX-1qw@=u0paSOdC>($6t{
zng52AV<>X!^|RnfIw)(`PT2!K&nDMtW8UVkm8u=*)Z=FBowO;9W4e*CARkPlv>AA@
zK^!haSu700p+%v8Gpz7a-0JDK7D@wmC~ZGsXXdBNDAEts*E0{v<2uW5?>Z%~`sy`{
z^qIjp-mU4aatq)Y(O`vL@|{m#la`idAQcEtKqJ9giT#rM#*giaawpx2lG6xO^&iCg
ztiL+QOTc@gS3YHCjVCoK995Mvn3~f8=}jMQY9WxZUaD#xq9L(Pa$?@Dsv0FMOhug{
zEVungA<{OOFkVlPL*d!+2p{ruX2(Cj&yoXs(`PNXMTxZQ<3^=K2f>iuA#0I*5sUt{
zFRnGZz(!!N%+pu#<m!gCoq3AeIkJ3T+42hJ8(Q%6s!F35s;s;tEbXHSd{)t`4t#c&
z6nEF^c!A0pKLT4jj_?tLK1-ENh!ZOh*{o}v=ZOe<O<)@$3jyY&SA2#_)CQD9u~e-A
zN}MH4N^jbWisrla?+YS1A5^8!r#5T-WSZ_PZNBy}1?J(Lf=X^-Equt_I%}^?OZt{D
zIIAqn$}QEo!*Qmq6wC5cni&OdDVzM7o7QzE8kTKqQFWlKFA_U2TaU6&IW>!J2Sqsf
zm8AKurj4IpX8yq(jSc<4o0jUeL&ADdJ=XmC0czXV5#9dteDO{uU7mKMgTniO2~k<x
z8+t9zdNl?7{b$h~Cy3nD#37mOAUi~eo7Jq}=syvJ5lvQ5E<q}d($T$1(H$w^_1aT<
z6Uo*07+N`W;cxcB##F822T2wFb!9t*cxmMjp{vf(A|OHyAKtB(Y|siv_)ecFx0GzT
z<PWYz5pLcY0a8$-5yYI+n*>QAiTm1uq(4wZvAbOdq?{wa`?jA%RSK^pZ;f@E(4=v)
zV2zl!#^_?ZM)`c~P4Slh(^aV5IhXUnDtW4%%4yA-S$SI9;hRy!6qp!v;6eS|!5@SW
zeBV?_a2}}JDEjK8YfBvEnhB&Xx2XKugVV$nEa{dab6_A@H<(Vg5D~BAJw0}t=RF#Y
zWE(w52XGB)esS7}Pb*A}t!KJik!O?wtd-0NjotFQyF$ltEIynyKb@H)`n_mH;3C~8
zo3zHdl+bD4a}C-|860{a>|l>Mdz28n<Q#t_W@utwJ?pcvM=1GBFlIX)6R)YWsia>R
zysgKYz*|%4aGLD}T3MnYpL9eUvI$0xU-u^wURk=0D&?{s3Pzl-$UM5EpC~PHwk@-g
zSGuz_bWDIS{NsROz`Xf6q|q@G{2f8^9sF6p;@@q5+7}j<SCL}6|I1fkV}%ayK#FV)
zLepkbt6V;uDXpZ{MvNCiEda+0vM6Ql9UWHoc~1&?melJr$&4+ER`2qL=VGhZcpW+v
z_t_;lmkFEqj+L@s{&|twZcs_vf;F<7crPtw0z(+I6Fw7oB8KJ<_LZ;w2ClddQ>tzw
z>xCIEyf=NZ*dBrt0ahM$|NOuV`(@=FCW6n~ZzzSfD+X%Iuf@=b;JPgZ7=0G<1p_$;
z-N}P-3tO`{MgD~DVKx~^ptJv0O?K&fntAEe$4l-sD_lplnA}B!rZS_|#@RP*2c&FP
z-7G<_3jCadhH;Qr9>=1^?!w`Y4x>dDw9>N_AxjR1LVWwijB~}JlEr|dsD|6{tDI>o
zkMU8df@~3mq4vJ%wjUqt*eG`(R&)utvz)9dmwO4EG2d-6MNKV>Q&Nu=)K(Mkf()wF
zU)QUj6;B-f@YC^^C$c<O*jn^JYvxTY{<$4QaFkEzrC~G?nXlZ!0;hiy=w!wOHvS%F
z16#9om_VX6&3<YBzj=FP?S)FMNjYooO}LNyPT12_H@-`3xZ*6-CxuaLm$E}gWdyPi
z3JANO5jeCLA8IHOH1LWW=F(L%i+DY9befb}bH2^K_E@uD<}=+u&i!G!it^13g7&HP
zO|t$0pa0ch7nBzK=&ByvBU?sxBU9s7oa)^4?ArN>&${BeVJeB?Tl|Jti(bJy;Ff)9
z>S^JPoXc`=mvFWJf}hOEAD7%d{>xzsa<g^{%ySFb`V*pelou6SOmclVPfr(jAm}N0
zrhiU&iU2oKj?7SWy3d&IV+Dr56kF5d3`Rkl{fJ%9U)9`hhGE{Q)ohi?C@>Fb9@Rle
zcsQBwP9E!gICI*(4-t}^KS(W2kdIHg`NDcXI0(;XB^`^mZyRJelw?JOHB*-4d?rWz
zgPralX}y(-YQ7bx*1)J3ynS-E93M<KC{|i_hKEQ->VQH}wT>uGU8UmbybGIwgkb3P
zj069<+>nr9yK&f<MS%~x)7i=T2}YVbgN@s$!uKDV%`=UIq(c;ALzGhTL2wkKP~5Qt
z7#;5!MD0QCO^e2?HNi_TRd&IDe8DFQ5trCQjnSrdl(@^Mp<!98t>D*PSKQO>s5`Ze
znF<jVl6DJuiw-5+v5~(~!pP;$(#k-c*Ax6}_b*Fnu%C}ezA4e8Q$R2>sUU@L4G&ln
zw=MEzbwB-xar`AEjvC?QnVKzes^MK2&1jq6Xj*%vNlz5>%kKpelm2Vr)b3w+-1e`t
zezZ__F3=U{>dwddcu}{!$!5f8*<MhAzvaFd46oy&yMLV9-G=~a_B8a`TrX<(%2ZWR
zC^(DJ7nW7=?-&;!Hf)npDtR+{`OmhsB~MK<sDwY2PNEVKRRLqjYteR;=2<DI%<?}W
zOn`ZQ71;7X4i6h3HO&3=EUsSSh-~1>l@Sq&%1UIJ<5ga7_ow&D?yO+X*#rUlP}64`
zuIGagx~d6G==b}95t!tOE=*4lRlXJQmZY=~MHL^H{f{2-fesVc78wBGd%mA6Y(6=@
z`Bd>CpXr1Kg_XHeBj0JOgMBmTQB*QF!=)GU<wYqCUyL-)FwK?ZN(BbiL+{N)B1mrF
zLmjbVrw@n|sPnD*lk@tA>7$+@qTUWpnEZ!b{W2}_RaV*Wv_<k9KtppSu`k@}yD!Ri
zrO1Q5yOp|Dg4g1@2|U|P><M*yA<MHRTFNXq{TrV@8VS(PDe)!07T~;Rlhj4CE6FA$
zbZl<vjk56VnK~y3he~JzhS&QWiVFgYM>UWF?If;2Yfm0k^2&KO+vaTj=ABOC=pkiK
zZ0mf0WT9>{?KFbqnkuD#+`4GOGfA|^scI}&&8M?|#W&G!+Otz}dUEUvZnhW3EdGGo
zfWrnGveh#dJdnX^fS~k_dwTmNkOV=Z#=Cn&x8=}S!zvRuyR)rvm2>(*x;zK_9x-ma
zbC+DrJUGBn6;&WuT4V2*SrT`Fy5EbQVNK{cXw71@@VVMar5l5GO50e2RqBWT{wNtQ
zG|9v_?!1Zd(Ei^k^oi-rauGs{CqI_yU51xaG=56gBhSP4#{_ocL3)Q#zaJHlUl(m-
z$g{)s64^DCQt~Ad)3Q=62%9S1Q`$a=*ohC94|Q*A-TD-}Qp-WyD`phR2h_R`|7xKw
z!i6!S9Yz}Y#o>P_p~>`4Av9=09~}|afokM09lUkmB7#iTx9_4CJ4d~o-lB3)2~qdG
zuzR{CNwR=vhi`@1!<K(oM3t>i$<(o8s#03lCt$o8a!Z@(F4=EJRri{GufX}F_NFSu
zKtKU@rmf_sEvn71a^30J4}mn9`9+N}JlQ7n<W#EoYGrDSP(-Vpodw)w@RojCp};5a
zUNF!}$1xgrhGvZ<&7akb>$FU@6T;-i#She7-|Bj|F-NVh8q$kX?)7N9BS<dpKfJWw
zTFvL2HPn!Lc-qst2%k#fyG@h*V?&L#GCGZL{Z<E#HSXB&sYLRcU=P<uMHTlwlNe=4
zLgu-F0=VBWqeH%$`%$5@)14YlPP-lKm%sb&X-1#zEIIWuQDF{MK5?)JJjo94%vmJF
zj-IGrMFx|ST501TlI7{}g%UB1#gvO{wxv212q_y0F*^s0k5*TLK!7<f>F`y|SBphJ
zlXf<;c{#1HMH+b%v<NmU=X|GlEC+<w)Dc9Imx^}f$rIV)nJexGrkVESL5pCp>+Pc|
zXj?5U!wTD)f{H@BLTg$NS_cWO@MvqS9K=$5()6Aw**Z6A>D6YQTkODQ)fI)A?`kpc
zEl;-ppr`)r<-AQF*h@!A-Ka?Utd?@lyMs8L@R5Z#0>&teeXotaVCLH2aWwU5p!`PV
z!Rb{tENc%i@a5#5#EVb*?S|!WaQyR1P^;YU?_xmdt4sNiwCSv+mGUIPfyRq0<eZY}
z#|40}MD=G+wc`IBJfa`f)YlrIT|BSj=jAurPnWmr?0Itecd4ge;*HB1hX4g7MP$nm
zBRE*1N%8eVL5ZTPoIx!K9#eDX$a{usFYUZj!<%jgz0!Y8tbC%9S1*ovyy7Q{`u}$H
zm%yd!5N*0<oa#)cWgs}I6KOD~rre7QwLT`PxJbKVDP)_++HvPA4LUP1Q-DbsjX!9S
z!9^+rlkh~C=hn^Ryb#65?xMWH7#r8aX&p?4S%K{8%4kr{GS#xF(lM3Ml0o$}u&O#Z
zX=&v$!Ed3))HL3lzBD21{H@(i2xAhAQ<hR6-3^g{)ou4>Pny%DUf7`8!i(|3ucP@5
z=kh$-U|Hkn5X+)m*|9n<^G2Wh>RL-RX`fE6gd%0?<ZJ?wC--flOPPW)h30=NJr4O^
zhFJ3;NZjJv$3b9I5~`<T8Rvx8vkN6vMsc?@v<z$PeLNEon7REfrWN_>>)~NqQ9Y1k
z@G{ak{nmLq?R62xP0rBU->PPzKMr@IwBI#gzI;}C?4IJ>UTUA>Mbt2kFj>Zdk!|rZ
zMBZ%F;-6d(qIJ5v)Nq=M8yNOx1dZ8tVH6xr<8)^}50a3%z3Sl76y81WL+hKVCWWGh
z_cWBmvO4R?i<hSsj)n{YFTi`6q2zlZ0FrK~_v=zNXPPp1j?4hBaQ^XVf5YGXUgw1|
z*hAV$kD3TE*{7~#tBOSCOiC>l6Q?h~GF7Ta-#QG0{pNnSFRC-QCX6c`1|^0A`Farx
zUsv`SoksU!*LEAh*;BIcpti*$&MmJ4&0|sf03Z7`a%FgadXL8<O+fZ_pTaMPHaKMM
zZ{FM`!~Hev<Lw*AHV*l-_$imqSvBtMWPH{N#ik^y^!MLjmi@FQy|~pi{lPiD<QqF|
z4Si;Ybg{!VgGd|i7VKF*Bf9wluW~kZPjfPZOo!h*u0y-@vn4H;*37RN9K2b8oZLvT
zsEU~5@9^j-Azs9=7rYBSnXxDomVbPTMD4vuqu&wlaBf9=ia-jFih`%5<|MD*R}Vw8
zfw(=2h%negouAwzH3|D{$ci({mB>8M68Qq?*tpOlfR$IR*0fsg8=fQv+8Nf2Z3t?-
z_OsO~aC5OSmw#G53eJ0Ef^8l5u=`IW`qJXXL7A@4M2ei2z{cqZ*Gb_EW<85dN#8!3
zt43>)U->2LRk=038H00bQoWbDrK{4yO48%Uw%vz@A>-0pL;HHfzIk58@WjU;$3pBG
zbEjK$hEvTtKcX(1`!T>2mFecUI<w0koIgK^<fD~G$A~KflK46_1{$TLHx9Gottk=4
zg6@RWv?t%B#Z>q8@*TW5oa<*ht3$UIyZovsixCuw@tTjtH;$wRUrG2J>~<XLDV?Y&
zA$sdd?b+qusNJ3a<zQ81lUHdUu%3QuuW{u=C@qH3+ZuHq*2p<k^qr?8k9&b~4pv+`
zxe{!Fd+#q^f9c3`(UKTF83I;rDSU#ce23ffAi{rwG&05abZj38^2ucAady<~E%efn
z9+zu2y-uWB>Dh(L*betb$8hi}=aWr~9y<|&n@i~5cW#-Z+D3I#qy0j8$5a)E(6%hk
z9LE<hZfK}lRKBzZmTh3_x#mfgo2bM6V~&_T=Ar%7ilmQM(laGMnH&=HC|9Kif)xk4
zA<87tLBt;oLR$R9CA^qn#N$a?vS4RX(2@D*=503<8&w-c0piE=G38Tm!mA5Mg!US0
zZB=Jj!)8^m&H=!u-R4?3imp)M*KN7b@a-+#p+cgE0h!ignZxQ9E}Ch)XnP#CYGcsW
z5@a|D{!>}sg}a1*W$ARQxJKb^Fqc7_nC(^q{h%GZJLRW??X4jEVMyJhKz`Gcl6VL4
z>ig8&gI8hL7txaL4alwfY9!2tb7^1HrY&OU!6-^B&%!gLS>5{6MY{?7%5P?jDdL=E
z!{p{aGq}J6kR!cQ7EcxYpSI#UtL0-{5?0(|5*|>D5LyN+azyGJ|AqM<RPJG<zDxZ)
zie!~2tj!W-Q3G10`L*fIraAgvsrN>+s89wM)6=Z0J?je&fLmQ35B&A$sg3aZWJdWD
zhuV=l=HuUjN^w(>8n3rgedVt{DxY(kz)NNMWlX!&jOtZczS1kt+>p(!Y<s+{hWE0r
zxkSRN@gVpxO2hAR8#j1K3)dD%LKnkvC47IQlwSEvd-G-Nu5ngBl(S)_Hpn!3=7E3p
z@*n1YTO72fuCe{`A~`y(ct(#~hpMY#2bw%iXq#x}a5HS~5pB&m>7w=p?Y9MQpI*CY
zzH(pq_N{hCAFbaam;QRebx9U&L`<kV30Q{+f+MZrZ4fll3u=B#{W^cy-OP%&W>18=
zF5Qq|yp_nP_4LBMWW5nW7(-Y8kb;|d=6rwnDlyB#HE%v7kCd4?ltT!~<Le55)o*or
zw&maNg*Mcfm-GU9a=vXR5-5(NkHA|miOEaJJW?*JUX-m~`LqM3&!oVCut^V8z#-<Z
zG$z;FVm}&M@?3d&_OSxC7E9x$hglX4ZVru0-P|kA9u*c&Un<qUIA4Tv`RD-arscCN
z&O>s&uuho<vxuI~P~7VN%JbBnh+o0B;Za+49}2fVg#3-MbWi?>@z}PyJGlMPUhLj&
zL|8^bFF<xTU;fl4f#gJ2*s_*@8Iv9^@s_1{pJ;FQo=x@XJYF@lBFoAt3C>rEj%o}C
zwQxGYQjZ!ZJYhpnRJxn3ynqYM;&BV%>!z_!RlS`_si)3q+}DP+qIv@eq<g>`Q{`O?
z0*y7_r1gsfCfa9pIzaN~Vfy;Lc3+#^%~f3mCHlI?({dt9nE0!j^cDZz|GkxFv~Tem
zA{WEMK^hhXCI;<8>7aS4sYStFJqEmhVdukjbR4)GN>b4<zh@(tp~jRn8F9H$r2-x?
zB?8aBGG*!`{!&R+dLMmDy5E`z)o&2<3L9zfG(lwB1bi{Kub+s+{(}vLl)$(PFYa+H
zkEJ(J$32yA3N&HvY@czbk!uEHAH$06QSIm>FwO6)%686IHwvdv{b7=WqLNaWW@V^v
zK+vRf%ZS?@X*;T1g}!Ntv`vDYq1=k^83*uk0Ae*>#nS?io#?o0&mxY_yx(;nmVBji
zA;h^;J?_1L;2?^fppUovW?n|CAFvBpKJ^8Le47Z2p#i>aoLi+y4Y4Oj5?k}|%gm>Z
z_&OS<hSZRGew#XYCn2{M5{K_og-jmvF;Kio;p%mv5=Zaf70P~h_c<=#7_J=+dW5qS
zjvzh4t?m{%gBQ67Y79K@Pu7y&s@BpKc%NWzub1Vhf<rUw4xpYD(ngtIzwW-3EKE{!
z8QtlY`9<kA7=(SZ1}|oeyxFw!83wHxas|Od;=g9`k-l_IANLRY`eFFKDxFxR4zozs
zY?grR<BL>EQ?{-UYAmflvgYzO@J5IDQF}9|Twe8fMoRpxeAf^$!J3+}$07HmzoeDZ
zUFQEPY^E51kps4HXitW*c7c?~T(h~S4<N~Hu9=P;{x<+~h+T90QPoY2zinC50eye7
zEb_tIFo#op6wF`D)$r;%BG~wwT(xSf_=D<CC#=J^mUf_~Cr<wh!Av{fxKZjPpw8;N
zhtB{7xQ}gcQb-}#oaS}!n*uyiQN`TjNP}VP&chjQrDp$X($K4L=Pa@+)W!an2?+4g
z@1)SGBF~Gpu*pjbR(AJQd2d?U=I$Qnb68cz+o7T(#gz{C{u+GdcF#tp>v7K-v}Cwm
z2{2u0Jy0y0U$H31oYUgGa!(1LNTr}TZNx7rr2SxE738|p{oS*su{&VeGmi|LbB3Hq
z(O*Eu&~wU$18e$fynm@F|G2b&aOaJ@bz}XKSrZ&?nCyMM?6N;bEAe@9m~nP>KCQdD
zgH%nct@yrI1>X=65eZD_T^6aPO&#b0Glm5_EYnPSB+h5sWFJ2{m(B5cz|Rl!OD+lJ
zfJp-{R}HMS;XS@9B+piKJTE03k}UL;v9e>mtFn(O%6{!BYOBn4hAkulEKvmIkUxz0
zaKHZ+gP-!%ED9z{;rSvMeqg|G*#jeXz`i9s9BUxktvoO$4672io=M(vNfU{=`G~3f
zJlOxM`TRs_`6}3C!%ce1jy@|%jW}iw1Egb~3BauzcUqZ8W%@5<I=ehtjonmw3TzS@
z3y%+#ebiQ1_;3Ij8v6p*ZOo*5mhx42^w*`A@6oeKwYncIYW+`>tv0dQ8#f*WXNzOl
z(F$>$;lytFxL}n5IUdUn{kBW|OFr7M@auE`zFMF(_BfBI!TS_9=@Gq_QHz-BIRQ?=
zzKr2p2aR}vNXoXpf*UO@fbb?EUmcZ)tegd!zc}^TwFGo4U^~O!3&f7}wW7!J<);Ie
zlb^knQmt<IqNc<AFJb@`%bv<8JRF?NwbGYDnMr^X?2KAM(LooV2K7;YDDjMDNi;<q
zEOn7vGY8g~@f?>|ZM3S)j)Qz!o_o0&2J>d7TC1Fv$Qx`^<O^#d2VuqJ)wx@l0e-8z
zUiGHpBIrejx|uUKz@kHN_g6EY$sXC8Ww4-!jmRdyccdHh;ZpzU(LTX`K;iKr5L^|e
z^{0%{@qr+~O~WN8SnbZR4R^rC(eLnM@@cNL`_H!OROD(LD6-MnSv~_x8+99A%P!`0
zSB+71aSlg5vdjj$nM<(aEGnmX<q;8XP+xSHvO?szYKHT;yU06&{^Kp#7-2{LY+7Ew
zX?{8K>`#v$HDm8T&vxwXvDW20!S&vreP*TJ4GQJ%U_h41&GVl93bJgnZYSKw{~n*n
z+!A&%Oo?|@&J7G*!oMe#<mzgsN~zRgnwtnO!~n&r4qH8rX>MH0Z}bFY!)t&5%qAoc
zURCg5syI2P6EbXjGPyEir?X(P+orkjB6KI@CS27@h70X3${P2T4yPKq@rWUHV!8gd
z2vBc$XeeBb$H7^YDhz=<gq?*f6GI_NPCc>jMmWp^I%GSIJVC~&2x3=0gukmVY2Dh_
zRqQxzrq-<0o9!QM<X43j!k?^xgyS<nH;$ktW0O1Sv;Kb$C35_5C#RQs1<ly4@FfKa
zcHi!SqeisgB0S!U2`O`?_ddk6B$dE_Rdtu(9{i^aOnh;M-ezRCznq@rg(y91VeN|@
z7{nd}24e?!ZTAlZX(2Os%J2XoRv~f8yH4Tyod}QB{NcL|<c{>LViumH;}WaTB6sc&
zzc5Bj6>E&sl*-m&E$Pm`j2KaJz=SqC;)-}qdrD^h26mfNp)YY}H+cUrA+eaYWvJGO
zZ!LdP$Wa-$ZTycTeSaeiam~JzGq;zjID6r#`qbgUB${wK<$YPZAC&fEC(~+g)=4f>
zSV-jyQG@n<FV5-(v1!YdZQDpJ>?}iOZggH;vwpM}`t48?I!?ar?1Yq57RPt1R=I-A
zlyHs-)ER=l%}i?#ba>D3ah=^re^8%3P%c!@famm8sUr0BCgzG)z2QOAGk%m<rK;*b
z^G@=;x|zza$)~dHNf49O#3(o9T39colz-V*CxWEK@Vsv{o00UHZrkme<zgs*_*&E`
zWOpD{q_oAh`rJfs%*v@WeBO&um=`x3sdF*s7R}v>$ot@-d#Id+@U{dw#hwA2ddZhP
z@g2p){5{FS^H6UcrS{eKlZ?202a3n>Gc#M<|9+tdHgDBjk`CW;HKc;>W%0aGE^gj}
z7T9xl1ijQYYJFfU`Rx^wCOi1)(Xh(%j`FKz1^-~b31FNjOJcD?Y{2vkY%X~FEx#+S
zUn{#D|ExHFu(Ao<GEmbvz?|vrZd7n;74<zDUBU0n$$D;sr7ZdCDKY!q5o`BPovV%S
z9W3L17bmhB|06DLrxjGl-V)bk*9U~WI(Zdk;sm%b0yFS!WMq=Ahs_6BqSm_=u7>!`
zZAD(5#3u^}l4ou@)IrlX+t2w8|D<o{hkB|SX+?vymVq|`Wo(-mBhjtQ3Wc5b?~DRp
z=1Gj~*%kk;L>GZckMMdNCD#k|e&voNUa!5;yjedO>%uU3-)QzhWPc-Gt~%*Q5st-O
zq;M%9->=1wBV5(zhgDP;zxI>6stkfXrL#N@0~9FJn{spW<(QWqTh~JWr?0)1N52{N
z<^<t6P+RsM`hUDgKw9|Ma!g6epvSZpuldXAyviWAh#2#o@+$S)Oe51ut?GmRG*ODo
zRIUWG^#c;HNUlLhp*gFrR`Kx?9@VHIAp;gQ)I8!>-y55Ffe)L0GOi`3HoGXc)cP3j
zotfW$?{$h#JFrb>;tRuMRUU6PKUWHPuQpaN>c%8r*DOIl`^Q*jx7WO>FIxn{oVN}7
z_lI=0m_g@f-~8MTh*RwK-c`}u<Rdg+{I5WRNv>eOk<Ra>j+YK_bb_Nf6ex+~)02R{
zl-ln<!n%gnaR~v|DT5A98d$`aD&L+gUs8X^KG4Ad;6z6b_2vf`mu_HE=WSTq3A+nE
zr|*!hsQTw-!?j)S(k`n69$hNlt0;2rsCz%?vm!d}%agFhqK*glKlx#=W?*_~EnesD
zAS=|;j(9oBLzdkM+?4ldc!>JyZcUBQkB65(P~|Kz|4*6oS7c|8yA&a4)2#f^C^Pq%
z1vM~HQx)Bg2-yl--b@#b^<fKB$4jRwcAYGlv?-c4W(}3q^BiVY2z}oJin-($1ItE{
z?|{dDO68%<$n_%Hbn>9ns@>_&#nIth1bZCZORIkrK=nUH#AbPR#%{^0hrCxCI%h9o
z#A`29<;v8sFz##eM*=_v9UE%oUMB|%rDMLTwc|wp<mX7g9+x;fw_47}D0=o8u|ifN
zRbxl~3VAm0Hj*<)q8e!Zo_kVCit`{oNI>HGdfKIKQ$m}jaM^=umT#T&52^({FGkK>
zv=x0)IMb-1d&<xwd)pwDaXI3o$z_nW_buXJyF|Zw6mtbMT{MpcWmqcy#q52I4K+UB
zX4>Q3>O5Gsd_!67?jggC96hqmoj>tkNEXc|UsIW>9G@mdtraF^0mIe(oU?h~Wd7Gw
zm@?{}P0c!#*go0hy;in)Y(Ldhwm)R!4m{^!^2{i&1gDyezb?%0e`l&WV+eTAibP${
zU2&T&9r4dkj*!~^`vEz>GI!vJmg`LK(EEO7Z{AKl=x<Z;6U*$liZMrXd<I6*_{t-+
za6d?EYfQoz3XNk=MtkEigVu-hbKIr`4w-N-_+^^ljhvji+ScLC7lDpldDstgA8;X0
zKTl$^Cunk$qv6G>7%PCDJwu%pZI;$}t9v<9Le|rxtc-_u#Q9@RdnYu;fMf6HCx0`n
zxzuN;l#<2)(cr3Z$3V@;#J0du90flA!sO_4vHuN3SkWVk`)#g=nfZNNFfqoL0!#bH
z)uVlVpN?p1LyBXA97!)0wAd$x{qp@hUuil6v7o&-bqj5|$krEKQAM;DO4FM20F9lZ
zS{H}DrIk;Ahtx}B+m^&7%V1uKdW<Gd?;60??sIVxYA$r;80UbD6rBL$x{TMf1ka>%
zyxyV#b5jhS#p5jJv7w)~Hk7QJC_`8EDPKz(m|eQxLVQWXo%k#_)#GPjgI{T>Wd?AJ
zBDdeq_!IF@?((5FPK#b%!CBO6!EUls7wmRCsx{Lo(vE#VAL!N|na9{EiQU+wmo?D%
z`E5~(v)*=yx%fp@5rN3bPvl#Hf0T*v+ddNJ8$b6xW!1_URn*dcsC#9$NXqn?bWYcN
z95Sk|xxc~p!PI`K@sBk&HoXH%k@3lAotX^=@>oejT!=TB#kq;U?qvlXz3F5O@<x{r
zWU&Hkq-YIZ76=JK*fMXtg%*s-0OF%V!_KvoC~a*z3VO>9YrXy(yM|cY_MWwQ*)baw
z__sEhCqtnMQz*?4e|yo(PN<!$lz`dM$UHGg8__=5{u-W|vQ9Vnrp#OkxX;SqNBs@x
z{+=7)vpg)1$+;W3Na_CL@#|?+QZ$z77^3^n(G$t)z=~1-wu3Nc_?&}JeS@V#z+ST?
zX1w7ZCfqn^<1ODh{CN)3>U=7%$z9#KlGWjUa6;}Yz&x6*ZOan=n=&{jz^V|PGEkp?
z#)!8@dbH)di)heYuYXN4lDGPd=A0@F^Lt;;I9toPJRdq?iPF8M-)ZO`?1EicxP9S1
zR*tb`cfn8%1*3>oUcL1E4!;3c4p9@4<fvMC5taj%tg^b&AaOl~lS^w$G)d^mWW?DO
z$II{hpUlS#|H%t67t}YF-|WzE%{fNo#r1G-Fpb(Sw1#YMZu;`7k2QaIQb_)lTDYb$
zW-z0k&)oLlT<(J%vaA)GU5n8%LwcxePi+k_pGN(F-1iAR-Or-u1y>K{^aQnx<e#kK
z4qG+>i~W;V?Z3MxPi{Ppqa9&=YrsBo6``<w8-|a(m{MuXI9qct{r2`Lw#)V1##vB3
zQ-F>uy*Ose8Z=_Hq&&m=X0n0$E}BnZJ}{Jz@nLQ!6Ar*2d1HrJZzM^evHFLzre<{E
z+2ma1y~2>Uz54~+=2lku<yk?e)@@Q9vWD?Ju}!=-qN6E|7?YwFgYB?prz;`UE_7VF
zuFY4jHy45@|D-NcZ|9k^==4kMQhQ_q)6F^C67J;Bvsk%kW}k8vpPxUk;UDOlsTrfI
zLO=ZJ>8n;UJ_xQBmlEUm-rv3qN@ai(&I=~cvWXiyfQQl|2?5C4l&gb<t9BnIj(m;<
zWP3N11}fe84XM#Bao*u@Nu|4ugGzS=1Tj|JyFo6kZNrH~LSFavmyPag7fW?oIB50#
z5y~N1ge0N4O*;+1910)o>IIFEsWlvx@Lm+H@y$Hrd3)hP<+qgM2ppfFI3yA3?pEsm
z_TinFTc9&7$|IoGJb92~APl+o4qnyq+`gltqYBx|-LK$gov*vit=cltWW?dDNbV4-
ziEeTOaY!jyzpEZSQb*r)GXIq2y!BHgpu^HNc+sbcnv(-IXRc8q3~8x88=ku;I6O{~
z&pA_~k(ok&Q8;A!w?530x>gQ9Rnar+o}LR0e6g3Y@^jQW!jV`!^Ux&d8=)fLiUG$m
zhGsR0oVKXl*ZIsI7VB63#-H8;6LZ7_GY80eJ?_*Jcm+p(-7Wv2ccvwr(%LIjm#7=`
zRjc_%A{z8!4V5Jcy0=;r8L28e9`x`7HL6<7$tF+l-<vqH?3{fk(FT(|(35M!a!!Ee
zYB#bJNkxbZpI8FF;FK+epY&hJs#%Uq_W_`ri`3!SqEvD#qi9?4?h5A_i~}@ZhUNTp
zMNC7vEGFe3>;Wp$15*A?xXp#|1~D}fovo^TEjgLcuEe>PO$4o9Bf%o)H^aSc`Si&t
zE)%7Os<V)HDcYI;^b7HkFu{Z!p<arqq;}Zmo?DYj7N<<@=>`)d)S{CwFWAs1%_<5T
z(GRSFvhsa;(Wy~rWm8n#@gr5&X0cZ3>di|J`3md)l=_b<xa5=|qlM@3`(a&SrlaBu
z->eVMpL+<00OhR?F>}sazv7F%Br?5}_?Gb>-D(goqK*NVVH_%2_;VCEQ=y@)xvpDr
z(jl79x6lwL=28?uSm&Z+{q%oa&;tU2ouY#+-YIdmV$uRO&P{aIgX&B20gm)IL;<BH
z<JH^Rc6PEgFG0A%rrO1Ry2b37g>@^nao@PYUVN}{)6iY-env8dM=m@3v*P+lO`R~J
zrucPx4ts9H&G^m3GXx1}2diUi`}wQb%a!#NM0fDC9<)8L2ygB%1h1Cx4>J!L$ZLOr
z_W5s!F=0-BCVL9K^~$HCloKVI6Z)vnovbtVj$Oq&ur|p<QOP)u+uO~9fN3{U-NWz!
zEex2|Dz|^z@tk1>7UhXL?H5(~E@L+;L(kRpvV9aX0|k1yTornx!fI!ct>Dn<Q~Eq5
zRE<VfN90NIum5g{4Jj@h?r8*(ezc)**&nm8|I5=9ISuGr4f|%LTT~4D5$h7F9<-m1
zPKyX~!^u{+cR`=EtgN_HszQQr&FS8GX3t;maf+29<cZ&-mIckjrG<+RH%Fulnhi$u
ztHB#`Ex-y%7^%A@#1Z1%^L^g{gQ$C?^_;VuUfy0`HXwS@X-Y(u=d^2|>VAB=Ez(0d
zCs2dCq{pKgew3ms(Q&Z7cq>C@Jq;f^eo^k@FM&g9SoWrUK9SRo*JDk(;-OPW#r=P0
zx>>Gy%KfWkmHG>%gkq8VUec`C5J>k^$#ywg{$+iZ4DKqshrJdK;#X>lAL;g=TcMzQ
z;FrT!+p;}YRzAc(vMIdtZ|U_9gZ9nloqjmkmfCB$ed)5^1~)fWN}9;UkZiooVK+Lw
zU`dS%*#Z*BR+wp%^hkA&c?Bt<(Us|O-<OUL&d4SUm>shQRvpiVRe5|=#4*DZHL~!c
zjX#xZ5TTXcTOq3<pLGM>wyKXYBBQyWrf!sMRcmp<)B$|nCl7Q2wc>^~#P$!!yln#o
z@1pyag(fO%ii%5q3>gylRO6872+cdN@jL|1hR?pe33E<&HMO;8ScF?Lz#7N@PB3lp
z@yWsjRKpIaNGu5{eiz&BR>K|Gl~CWfV)yfbtW_$#bhG+3rR3TmCUzG49&b^_8Y>08
z0c(g!<w$aw$Wnp=Bk%%2+MrT`!_A%)JsrBrMd)Jck^#LVd-OQ_*<C9JyU6~bp&^78
zZ}nHob*CO@ix+;=l~!TNNcbCXxOO=M{*dzlG#nlnK^PTUG@+Tc8DHhZxQ4pI>~f!D
z>2r&(93i?>H`)|I(+$dA>AW?{rJabYLN13&D|eC^!;#+|cco&Q&?omc6xv#q<eOAI
z(|O(V+Ly%T9#ncKYgF`B?)@KK^zLoOR)%Et%y)>szOmCn(ElC<=T(|{-rwXKK?uW?
z`Rz@yt<8vs&Y!V+`Yh4bA6!0^AT7lv_u9UEq~Sh4$yQ&I5iD)eAtSw!hfr@~o%yN_
z)H=C+!=TDKU|GG?l8DxV6x!PP*!GI<xH5tv^`{-RX`j-{c1yh?uLP)$0s*$vX+(zW
z*H3Tr)hJ=e!IQj!XHIg~zjiSe^$kJ23?Vcc>UGuLxa8blO%3<k2#%tv+$#4#4SQ0n
zGXBPEav1E78Q#Sfa<cX}CF}9)19F+&-sfZd0X6$hah?x9edKx&ZZ_f*`A_ja=^mfj
z58w}BdRpd!^3M#(S(~%Tb`Qa+QZz9CxrOSq^T&}D!KrbFHKGCQaZTPP`2NTbXTs#>
zM3H>I{Lo|#6UwVbUqKSuLr)GD{E%pI@x1k7duP{&*3&u5K?dJ}*K}=qyonMP4DyF{
z3Pbgan_W{ubJbKio1=zKnx0+Fh0cRSeeSl(COE47ReH_G14^!!>c6xa`h@&}_T5L1
zgir}wo}ySfjZRLf$kx>$O`_6!u*tL9oVwP%M*S@{FY!yh{y-H`+RG~^b2X2BOH{{c
z)(R@|+#-dg6?>#H#H024w^G^E0poCdeDWp8DK39-xPt$_*P=3MJrQ9iTh&O6H95vz
z3x_VI(Oy}?QdTAyTDv1=Tl~l9wgM;huBzmyAI6dU0V;r_2fgo-6m&<fW2gDfL?h%;
z1C7sZr0V0W7@ojKRSEkALu2v68onQ@*+`NtL9fR&^lq#)hR!^&VjsMoT^y~G9CMpR
zCclHXqGUxWoc2-jXNpjgA4bJQLm-6v^Tu#~`*ytx-6L*6KdP&(8$CYLVzsSCh+hLP
z>IEsxo@43gj4fae2u8-N_yA*CA13Xo2xV^#yxP<T(^^M;${|x*`PX*dc=|5iZ<CHa
z`z1PjW2G~i%eI}lFCBUK)rDoot7qALhW^h_P-a3P0-&(v1Vu16OEnLCHUgN5J5ySC
zrEO{?F4}&5SEDGBzf~1nFbX<8e*DNSVMsN@iZ{k<{QQ4sS>26C%z7I-w8S6ImG4tq
zi=P0LOkEA;MAg3u<j#kiHzV!=^?(T(!$;DgC-@JGHTUgI%tod;vRov?CM;k2*&jA1
zJaw0`tJtm+hV6Eo4la(t(=D;{#h6+H1l*uz5H8}BZc%jpL!im#7wN{*p?CjedW<kD
zI8yB`y;~flkQh<reYGM=x3}#IQT$9uB+FRT$0_l;^t}8#JX4+=0*|R3nIYsI-Yi0s
za^U<#qYpiuxpeUbomB)xwN}Q=toG4(CvT(Xz~Y0LpTH}N3l#}OZHFia8c;TBGPe`*
zPBSG-=-+!pw)h50gwDE$x$0hc@O&vwe(?_Kc18+TvN|=6hklvZ`}Ok!HnyY%&VI$l
zKFq#j3sA_kCazH4S$A5{>`xU9^`aOe!SZ39HN`cRqnLdwlbAs2Nn{gDFqK1QBrx5I
z_q)Eo2L@)hopJ6%VWad0+UPq^gW_BN2K3FT>I(Iy!M7jVsHi{{8&&zIc_(X2q;yxM
zW^`-LNk%9<n;AJ7B<&8Ul1N+j6Dc7Tts&B3d6ZCP=;quV0KZR@o$7xeg9{H#{=NO_
zgIB=1^#C$MlI|e{hxVH5`W#Qsief!l<bT?0uTuP$h#Tn~a<Ud?KDCtHDFkg%9l$QD
za8hg}Th)Pl*_7wIaMbz%;>|37CkT2y$JUaXihNbm+4(BVJP$(tcSltO!QH3H(0XZY
zV{OzBs#ZB93%z`9FPAJ_w-2_bF401~_YK<W>joy*t^y`2#eC*>l4@Ne2O{dS9KV}E
zW+gc1<#b;B@Z=0~-*-9Os!S(!P8Rrx*Ndzzwbx=yuktwEvg0j^!0e3A8k-gA6ukX~
z$-aGa>M7KTBRVUl6da5t_nwXRB!(MQMMM~$jS@+jb2==MbsYj&w;hH<y_iZIsPUZz
zF1~@5f^Qk8w+<Kn(5D5KCdb;B=+jr1>gNY>|G3;wnLW>N@!I+&Jy#bOuRRvMrlzL6
zr1;4Goj(5d@AgU}?e$&7X%R;u>iG%E3Fp^-OY=K~C~v#kVU*?Os@jY3{8W`Z*&t%V
zNMe?qn}xuhvfE(?vNSu-obC81%<|dfRTN9!tJW1Wi$NRwm$joN3(@sZo?%SY9{F{M
zvgUM62zm0=2E<hG1ID2~JRN5(-m6HMojYBUU)K7jIYCIPa|xa!_AU3@7UMxbRbNe4
zi7C7l$iKq0HKH~gOsM$k?@-Z(T)y~!WyiH07QF#NKIZ&+0f!D^!_HY3?R7}Ke2XdW
zLyxw5Wbm?cF(jSv4kD;qyjZ*Wy1Q}Ib24}^5*2$*cl|btNBG}h3xjM<Tr*H_oJaAc
zRsV&LUfz^qu1`&(-|=&Ccp`y2X{pG3r@?2j8u@1^Z*#5(FFjQSWEzi?iecNHIV9y}
zIn3vc2~x8tY}CWydM@u(Nu}k2;AT|R=7z2eBo5?hb<RqjK2Z|QDIoaGQ<F*~#HBxM
zTf^5DUmF}zQ`<|bZOQ?ihOU^_EY1?@3tX4QcXkU8RKHn*%!Zq`TI&Jk<!hRSf{>cM
zL%fo!h@k1VJo8aI@N3;4OmG8n{rSMuBJDFiw-A$k<Bp<K(Sf5#RqI^Tu{`1+T|YYz
zz4ze!^1k!*U^K?v&dMuHZ_tAiJ>g>I30-E$OH~Kud8#;vEo>Qt)T9s6`eJjDq+k%7
z$&jl96832OxrIKxmia8FRlGH8a9681eu9nhS}ki?W#x%xKlQ^x9L8B}PyG<mZclh;
zVISh+QEmE4B_(4mWsu#t=j%m2vzI~pZ>;6|5-MV~(zs^%05gD{H%)6(KJp-`Gw$LS
zO{TpUt%yC}lY8wVpj?S{4pkF1nxH`HCLhn}dBlUs=;hMbmftdky`M+$Vaf7{l^IY`
zVec=3<5~G!`-69>VN>C4|4i8AuPq>;9#*)qT?_T_x37re)I~d<(RUgY{l#zm<Uhr*
z#sv_oP2hY#LBeO`hcL3<r~P>5W8dZmYGk@W1n_9o(0*g#W<#%iS!H;@TYWa=ylJo2
z&Y+5tT*P#VCA`vbC3+Ef(O@-L_ezA6yT?e;l9|bWyHl+kdZfCj-<3QGM0mtR2v~cz
zLDH%I8H)GrL-y^6K2w0LCHU^b#J7Pfydg)Onk9On56u*y;b42*UH&r?`zM}__E(=f
zP=;J(U(M_=8E|2ILV_aa;57!h4S0zSR>IGXW3ScQ3B^1{koMKTF?mg5Hxq>rH3#RZ
zT>R1+XZ_*<RcLf5DUcaT=sd=9Lz&`u4%f9yq53y+j48ntj)4#_3MUT51^WRaHhtH`
zlCx?I#sxMN7cIGX?mU@>vQ{W`F;VxXFu?W>vvOuEw4JJ-Z87I?7=y*H434s>zCo|e
z^W+e4w4L=BCRN`^69@1^eVy0xHbJhw!{=qGOKf2TFvKzNGc7GP)5NFWq=n6$&*Nk=
zm-^VIsxhSFxpWhRt7T2KoQ+5k&hk2Jh?hKjT<_LY-d^xg3i%P~P?>a-$ISl8;$BYV
zGYd{YwbGp47anN#*WxT`e>1x-Bchdd-P|e3&r>rV{D3MSGB%b(=LnLT`0ii-|15yj
zff!_mg}7O;ja_eZF@Nw0!|_53?%2@de4Z5fTl<Yhg~_V;%?e<0tE%B<eDw2HB^f7H
z#L#P&>hyA9R>EBPzHYu*T$UV}G8tozloL8A7Iix5J}<kxRH_tF=jIsr4V|>s<@GWB
z?+TT3@q%fg*#MZNbtSFn;QmpYj!A2m#&xv<L53TN;kun=?7A(g;*tFhbQi>AibSnG
z6jRf`E0=myOjZ#!11&~aRTugWKa!M*FtuL%Ef4qGPe)K@mNT7h?=)0$MaOQmRw^JT
z(o42DdDd<G4&O~cpvi~_Gky&O`cV01g~&}NLfF&E64VD_RC2f*5iRzN+HulDwwXt1
z8Y=&+7I8b`u0RnU9*yl6+2vLRw)hK+h^(fh=88Y5_<HZ1S({5ghQ$R~6$~x4f#n6Z
zNUW0ym@%1{Iwkr^w7<1Wt5`e~#ml`w2uj^FHn4xiQRIG{MmV<&b|H1{gTzZ%U;_gh
zgI1S%2z-OtdQo;Tm`7^P??+UnCU6Rj0`R1(fU&#E?81)~T#isIpgCn-mcfz4{{gMu
zs$FJ0VMqp~{aCqHsC`k-JLSg;14FXpKk*fxgUnUKj+&L~DG|5KiB732gRW>~tLl9x
z$Hrmyg4v3oHM)zIv;#+$r44b;Xc}n5Jua)OG@`tizDm7;+VGe!CfH;p=*`#FS#SR#
zRrtk_l!ZDTpKutbq}&DdmXggkIyMRjZCB#nxruwCmF1=?Cr~m~_H+koQe8kba?`BP
zjS|G$9ESOMHW<PAM4lJC9fQ#F9kepJE`tQcd<3)leYyB5J=MTm4mO{~ne8Sg4;;M=
zpKpYiZ<q>swqIY<s(tnIU>tK?*ADnqh2b1jAa|6z@7354YILtnZ2Nc5m!xhk0;y&7
zRAg8HVRhwpjkkMsHtTR_8veR!IC5>{3G^Rr-59wDSbN@Cl#guw;zFg_bRq|G+VY0J
zL+i%lP+HKHpJyPZyKT{DXZ}v8?~_bz<<tx5x>t!aRzHaye46o>QxSj%kJ&3X^Q3T0
zUFDdfH(=@|6)FGq{fglH<hRet7o`7n**@DorUZb=`O}b-_!Rf)jf!XIk2>8IBoh{C
z?Yj|$K7^X;g~eK^b=vIsXd1<+C4F0=ax`Ke%_9E+L+YrYWn_0|XXJ^b3WI%&2S6&W
z>5O$TL0{bJ7F^`8c%UG~O8)w<9Q>Dt(nFF`NZ`7F|AUW>V0{;?4mBnL6J|^HZWoW0
zT;ZjJ9ft8jc8>-Ibigrm!ScIp@x};!%n!m}wA|Jd2}KkqmY^r>bl72FObvB!S@vV@
zCTRrk$AMbqB3pqeTOvRN0{zATNB;Y%1~GZ%(HB9KhjrjDcb6V^WD|Tt(JOwumjwg%
zPhN~DSXggch@(0@U<**Bp)0&b%|n&BiT4;5do=dY6p)|ha9eNCJLmtF``4Jx@I4CI
z;)S2Svvu0@SHSgH4g`L>o?)g6PNRPy8kOv;#!}e-<XJthy_8QZw6v?gTEFA|U{c;)
z>BE<|Q+(Z!DA7#${$lq+>$axrIE+O!D7AXFc=>*no897t^{d>ZNy+5DoH@$Vk=Vk9
zFLaH}dDv-td$SeLc+)nrUzGA@&QE_Hsahi=;qiM}ED(~I54gLcoq`7K3<)uaoOcJ!
zN2jV@OE_)Psa*$WmWOUh<B4&hravLk-A;PrO}G_O$@RB`DVh7B4ev<M;1L-N|ET>u
zElLj2@QH^5<~OK2`nfD#`%h=cFf@HAJHt3^`QlCedOiccz0<fiwc3@5Uoa|3eP0{&
zZF27>He9W9q>IW7UaSsf633C7)W+)3DPd>r=dyQy8^KYHLtj5V`+cS_91bn%!i#*y
zO5MEI>XC(BG3V#?L?0K-wZd#7j@-V>l-Jj1Qv#ql1%mzC6i<a+i)jTDpmbmSxjN95
z`1;8t`iwL#S;JvxqAgqQwzatN24dNEBSs~96;jtLjR7>`ealc@$-!?K*MvWMShwJ$
z%;Le2e$OctJiJO3x0K%GX6-#csR+sbjNX+n60>6a?DF)gRN$8MGJ*K4G1{JbuyZj)
zX&Swi?|s<Z$?w#@wiWlpZ8SSoR@cAnP*yK1bW+GQr0730>ouRqr-6T4g!z^Maha?d
zFHH8!nbH<dtIB9K-ED~S=}z?JR4qzYCemKob90>+5YUQuxyTBq85Ui6|B#098?$zu
zcDALqhRQ9g9SDBRQ#L^m;HD$s_2cZPo{wTT*<g(c)ni0eD_sr@p*79<4l?S?twW2L
z2!PX2`zu%f^Rlc@p7t#KDPA31JG8*iCfitq0`2>5jtR$CPZiqH=v97UG|GB#WEW`X
zk7l<RN&Df(_)Dw&dtJC;@zjr(Gnp=Iub5qxVOyt1+_n!B@dewJNFvLg%$Db1YSGKb
zMJb*G{e)pQm(}*1C)uR{xKnytVdEo{7r{W?VF>zhfNdRcp=H86+E+^B*4CYQdXIs5
zFc=zEXkF4`ZfB-?m;*_a%S&r=-4K?asIyEB-aBpNFr_Ef{S8hq3;5!e{}bTNJ!(HD
zN3YVaxkYxmxJWAR6SGGQII4M04;x}MHaV>hf5?~bhO7j&=#NIk4Nu1|IhTaDSk$R1
zG{M4zFu_)?MUs_PpLMnt)5Banhr*@@h->;8V`efhLq@GH+O<_~zW1+;O15jvC7*J<
zF~A}1oIV};5FJ=B>|W@+>1<hHQeJGGi!b{0N6yCzcQ&-yt^UB!Fh%i=|Hvjw5<3Ij
zr5$2VptS8Q$z!Q5ZAe~XLSgo|iE1fWJ;?9Ur8E|<kO6SAGwYwEkYcMC9}eliC?_d4
z&aVDM&iJOc;Svz6j@S09OuIs&gx#$O=`FvwfuBr8`QQj8tj&!#F=+j?NRV9+_|JRC
zeH~5bTRB|gB*M=p;Ji2C_U;IPtwN~x<F5WnQI{K@?iOwpB|Wb+oJAc`iu4j5)*2SH
zwjc(3n2;ar2J8WB@n2NDk}{j(oypCH`+x1dby!r}_Xn&93W|UjNTZZ=cN=u4G)i|#
z3j<;yUBZweU4wLoL3a)v0uloZ3^BmK@E-7n_bdGF`{(;U&*hJKW`=X-?7jAiz1Ci9
zePC@4yD1%E`p*uBab_;kcd|t7zbCl|yGIAVwKSZ%YH4Pc95yST7CyqGq0mg1tD?Vm
z03DkpN>~}S%81+i;ul(-1U_8NR#Jk+Z?`hC*ce7$Bs`qtUb?R?BYDnluaowXcV@J~
z_u|-9@?i(brtsG?MM3MEd<wUFZvvGeivkZ`X!;1scoQQ;1_sfaghtP`(cPB*vdN3G
z#Yba#k_u!_v+d<U{lJ21Y42Ssq<7~v??#)_86VLtmrg}Oy<;kmrlfZ&K_bx@QzC?>
zc0oczYZJ_=?q34LR6eKxhz=cCz^=tUG9gn?P!R3DlpZr_XTa!@Z9f1jH-A+a^~7Do
zCfs*2JC$d(#47c`*=rkqb-!iP!f4_-5)x;xRBijvsA^*Kvi56^=GncrypGnx9SEz4
z`C5AWP~H(uH=-)ej3>W;9J2p9n`ly*SuECTCtrqlX0EP217=(-lJtSC)X!;eO=l$2
z`N5i+P@shYk>BB>Cz{@4)g`uOrwWmJ7!S9DfVsC5IO2G}%~8oX<SKfAuy&pYFwf{s
zZ`_XI4nPc1C1XL&A7iZ(ZU{bRYDczhoANyrIM;5q5WFQ4#`V1j>pj-p7U`G%y@}=~
zW*bI<;6~HT!O6_4iKP7(-d`igns1LG+6FRLd<U`t1S-!X>1EYh$Gr%tJTRcbo2{^-
zyp@~e<W@~g<-tDG9wIXREOMWW{ZzlY*{TvzjC!xD8p6U;nl4ijgS9Vl6?3^E#TcfX
zTbGvei3#7zMfG5S=NZOG%(k-AhxkUIHAlLy=<#&w><#-%$h36TK8K<0lSCzI50SEC
zPqxW9RJ?;1T+#Zhq{^FM!J~CW7r%l^pOVSRq3+?NLVM04?`j}xVX;#9Gm0*0Hhpy+
z)9m)=R$uG&`8jS)k!JwvVUj9iL5j*%drS3Kwr|uy#e>f|$8*xZ<~rf|<kRtZ*Us8=
z-S2pZ`dTxDel^Okd1G@-MA6$GEz2sUdI+xSVM=Dm4=!EUVrrRm$f~89n((2T+SN-G
zk*F0MjJ2d(7!zxm*T(~8u-ZcG!2P{W(_3G@rxcLc*a$KS>AIl1!OY3lP9GnAK`&t9
zL9<bO4rC06!dO5CMTu5aV)YK#HgVzLrFVvU)L04$ptHg_F|=ArQA11nZ>|!)bV7d6
zGBrj`WGAv8avagUyO<s3$8v<|6}98<6P53J%xfkP@^}go1Fc`xHrq)T9p7nJbZ$S7
zA|-Tc5FJGMq-S`SEKVqBG~W6g%-T<9U&ri`6XdHdrKQ7pWbpjOPOP4qLodvF$i5>)
zre~Dte0eXT7Bn|1-82tugk0h@8P3;b6He=1Z*{L{u+Eb#wy02bwyKknTS?vI5inMR
z7Hit&87$`<IhiSyuep-HkG$0-{Geaab-YjadEx5PWab}$5e#%x#U!`xX;9aCE)VOY
zpVf=>9a@ejv#>+7%_cML>T}Ub<6aTtR}W@;#U);CeL2P;?&psFHp$37%X3&MdMQWl
zpgAUd!{uu+)R28<BsHL^wP5C=Yf!tzI5j=yoMtV=CsUglb+DdsSe!Pl=Ct4{-;fRO
zq_mDJ)XSYWZv)X<;2%MIjqTnaN^cz{G&~V<Il34^ot~UI?G_rfv;1U%KcxSGcn-C%
zZ!u<uG=VJMoOz9|^CJ3v_f);u!6a&6FLQn>M#Ka`Z6-%zt6^0=LQ?d~dw&HNL>eBQ
zKm#4(ZbCfqud*%ZzzwEZ++PjH!rx*MKuv{W2~m$Z;L2uNO)bb1gMLKt!0PXPy1F(0
zR=m+Dy`!M@Hl9*hJNY1?f~IY|4|msHvO9ilDKK6wu>n=2={Klqr%O3hK1p!x7MO!r
z#i*}dNzof5<E!*E%Cr6^kYCqol}!m3%TNy8bRNx#s`{|GpO(^g@kjHP3zb~HJ{_AZ
zu~hGy<UzFa*O1UPym5o9g~mfp%}^opwkb=U<Sy_`N?S9d*n2#knI2^Hpv*<^$P>1W
z>$!!!ct68jCnp9=RO}C+awulp8dsZQPscSZdMiFDHY$3|+Y+6XG4%ruo_6h%AEvBW
zSack>^3|@ND2oxG#ad+TrD1>tXbi-=UJ58N2wYP-0zbrOn=EzQ)X%>}+Kt?+X=dwK
zb*&`X|6yt`YP#4kkM%&Zb-TKhq&fsG-5&&&3^3%?ZE_kaEDkUgrj56<vbP`AcXpAJ
z>)(Zdqr*cQ?GiXT<r?eck|B}eQ|GnUw);B=kA|Na!EY9Q32N&Qa@?HpH&k-2*5^r8
zV%<$uHT8O+9YsIGbEiOU)`edS1IpJfi1W2ROGMcCNGn<2F|BeBw*cuN1JNBM)7+Ew
zAeBWpJLSB)yg5nfvR`2y)izF0Y*hMS%8(OHR~SzPPaRKWvHCHYA8#+<zTU9cw!p-^
z2DRUY_+K(@WgS!wTbLB~-0dN9x|E2hikiB!Ef|yb$y0=8--YUs<HaEIw%aUM3XG?R
z=RL%SB>4(!xpi~)gNrqsS#w*o5p^2NJMQ2G$j*f$y0)1Nj>f5ITT(Z>pQkuK`_G0^
z`GwF1Hw87@m8(fn)F^3EaBBK4Z?II?Oy4SXx4*9mS#~tH{MpXf253qAL`{X@Jf>&7
zFIf=Z`ybiDu5JhGCc-?NZ?T%!5X}PR>M$>maYp{NMdxLO7iNSk1>tL?a@R<aFQ*dr
z(GfnR=8Gg^5Pu&dda}Ydq{2IOvZK}?-b`ek)YhC7UjQ%s65^V!PHcI2aTD%qa|v3;
zgWk!y<coqhLYlUHCwwK2zzVwJ<@{HN)}Jx0Ke}X`aF6Qw2^(#2Rn@3OIIoEY0OlBH
z`aUKyl5~xSr86h;_3@*^On~{wOrEznt#|YBj29I!z-x6<PkAVyKs@Ei&`>ws3J0s!
z=Mzk*h7^E5$*X1;k9Ug4r(*y60{ndCfXTY;;JZ8`e>G|)aG`ub%bEoXZr)PYs7k73
zaU4d!$4Re-X)<6ST_ajsXMrI|lb=_BS+uv<VXuUh=U2=P#X#$>$5QM#SC-93vr+nF
zDj9Ff7Yl}t^Ls>S3tFBGr3=9BSW57Ir1VFZ*pnsv<;5?Gut$j!{h%0++=?~H_1G0l
zhAuC}&&Q{;gf+~ufO_rgU7wV)RqwT1nwct+>w^}ISdw8%aWi4Z)Z>??>X-0N&;4!M
zf0BZM=F@li)oiAud=Hvt69&!n%L7f(gVqplvv?rtU2L&VOn>y`JG+L<JJn7v6I?^a
zX#HIEjV=W%+5VjjAzrpT-m9{%SIga%XRqTc3L*<33kN5-2@U`@qwK<(kmoO*3jaZU
z8vW_u%CAZ_R!_FCRr_};T+;c$oexP;BR92|3hJuZoRNvdR+L<l;yK=t3}UXJ&C_%Y
zm+*gIz@IY_&%v?KfpO}0S6Ru-UIMdtH8&S|2?)H&MbB2@s0H%mGrV8zyLEiGxD!^z
zMN_B4k$*7rFKjXW{Jes-;qkWGr&zAp#pLF|)-!SMD@8F=+yz@{<^^KTK-FH7mFh7p
zl(fisGv$m)(G;mODC|p(mDDyQ8W9q@8x2{oANvTg$OhUfl+Ls>sY`jKZ2OKz3pML&
zaHq|Ua71z$)~aQ9b1T5yN2@RdPJR&&0M=MqCzn18#mi6q`tC+Atu~QdeUR6J0(3iw
zFRE?X)900{sK-jAQQBm**}-Am(RGRwr({bOVBuP)a?X3l2}#Ei_&+aHrI<n5;eDw?
z1IssSPZ~E%zdi^3Apcr$>^J<8f8I`|0JPf9SPC&8#-^H<_p^zq?gfizwY7S?<p>-~
z{?B9n{HUq|bfjloySWd5yIHb0w7_+6{Rl4A=6}7=uewwjiAs_U**Xn@?fCx1PN0K)
z5g%N?31IY)8?mXDJWjptF)j=C<z2E)A;8Thg1l#8m8Bi`%q|%j#06wIfyQCw<A&lg
zVxvy565f32^M&8(@^ip`6*!;1S&v&-{$Jp|Cp5(Xh;i}VI@v#I^yjqyCi{1~W3Z7D
zZlDt73<mn+AAW!uyYT2|*XKWF_q014uLD3Vd^#j&QT)$G`-uab;CEN}H(;9o88I+r
zpp7*t%hf+R5T7|t@ecq+#jpL@src;c#sToWrr`Il&ro=OJ)cS$;EfO1-T!)>9YC5{
zNx845k>l6z2<`#2R(`qg>vyM-l7J5&jbm#1le5_1&mm$T!=T;!;{0#dy^RM*Q_<VU
z{x55cjR~|2$GtIgf}C_F0fB#fJBD5Tj}1>F(SL0CzbgGNrSmr%S~56%yIq=L>D}kF
zh5H9Q#T7pwfvoE&xC-KiE-1Mt$@x38hTQ@rt^X+>moz3JHBbtW6Jopc9cl=w<>$~f
zW%?;rX?4Es^Hoca*{ac689tdycTP;M&ShqUn&DEb!JI-w{MuFtrcuw|QiyY{MZQII
z7#jmS?Nx(mjQ);{sp&i^r$6FdUS1xf$AONNRP#*9ZDIeP7N`M$S7S@Mi)0G60ZZ(?
zeZ&#*Q$tAO_$4GH+}*1$9a(jSN8&ktx0GGEDfshj2w;^h(PP_ZpUim|GlH>aeEhkT
zo!#2~JqaOwK}2E@E}a#<%bQP*$Fl6Fe$660WZW4D4Ap@d$v;w_j5P&|TYoH<yE5oi
z-=#OK3P2(B-<1Azy<%sBC2=a(C4GnRLrLUa{PUQ1Z^iOh4;f@XYmK+B^C&w=q(aub
zB~AIGJ$3Cvam9gNQyxDyT^*evaunr=oMaRG@x!+WdU(7`GfKuvaaWVgMJips=DH>9
zsCWh?sQir^Kt-VI*Y1OK1Wl~&AI%?#RW4bFpo3R=E&d6FdNM+Xx`wNP`q1~Gy7}C;
zZH1ppT0AGnyC`F~u}yf$=KBN@&(fFb@EU1_^0He_O#aDTZ^gx-C3?n=gp~&hYSpT<
zILeZ~QYybr`s6ZcHa|qOSW9O|C#qhyyF%ir8+|5pk(lKd?%}v@5fyo;>GrJTa6Njg
z*+<cr(+tA>6VCNl5w6uXLf8+@&*68pFLoN&R4A?bZoDEEn)?!uq8Q=&l*ShtUHC^U
zNZ>Xa#pzDnX3|{emU;TnNo-|Tnf0GY8h>i%pTl$Zd-v|0pMZdX%a>2~K>Bc_W!LBR
zzfH<_nx5S5{lG}#&R=MIno;l-j{=xK^=0aD^ybtH{+!CgW1LhcF023hDqtV_-w&Qi
zqW@_4CpY~@qW{?DZ29|-ZT>&WHetjbH_uRq;x$;em>-8ZPI@c^hpz?=x=fJ6S9|{m
zCucK$u+(`oE^2LKbI`srQmm_5n!LsI95CZEx+;YK(DNtC9x$FSv1>M(NNK@faCgi3
zk<H+%ZBs98VuF84QCJQJYmD4BeCjBdZ|eEx4p7A~5SeqBW;g@*IJn&bs;6=m%|mfB
zMKd6mktIA>AqvF`7TF5{P$h6i_(^|SODZg^IZ%pY>la7Fk;98|!~DEFGCuG9EjHCp
zxz8Bnf#E*6uY!B(a35l~6hUHIUFq6B4=XLhVBO*AD|oa|t8FfvT<&*+sK;byE|Qp-
zxV-hK1uka@iu!(-?!}8C`3+2Zx*<vnX?SU@uYKQv)5Z0&$WIr(%9j<Ia**14#hA{t
z&+EY@PXOeoNb0%zsZJtQ834D#1GP{wdqWmt+g@@KgahK`z$8r;jwJUeNA~LbMp9+q
zlh;4U!w<U`|F)*T?1=tY5MUb8S%CNR(y5r^x4pyP*Brm=(*>LwPdG^OET8=kRS48>
z0jSbZ@xg!Z1%6YK$6^pRdAwWoI^y#Dmj@Fv0tP!}+~(9J`g_^@wr&A1yOXHo-hXk0
z!<2y~$C)=XK9!yR9&1`TK$xw`qoA__n}0Di;1<f?<0Cygj(W1kr>Z@Uz#!4)TmSN4
z8g+ou_bW&KsH{2j>LnI{Fttdr)PD&QP#wouueWtJox1*iud=i~K$xZ4BVv)$S@$o}
z;M@c#t!&5pll9KlX`TS;-G3~23Vr@#!N2A9AMgHS!N0}vpYQ(PYrz(I_{`Z#)$cL3
z`r>{MS?B^&ahc@JK^97%p#-O5;l2~)(5D2bp8Zv4$+H5UH0skZGdQux$Oj0lsc<DS
zq_j7~aukwOBBgJBd0o)qhfgXLI~K6l+-i4D@pXUBiHa6e)29aI7z!kI)pJEhGii*x
zdZc9uj$}OO_ZauWawp%K^loqIQ}eY}&RFm<A2>q=inm=6F5f>~g^1`@VbO=Wj;0IS
zQ|e{FJ=Z3qC^5-b3eOezQ(W&mhrvJ(Xv%q49P*!NrhkQ8{wA@z0<@cA&X%z-a@~gI
zxiVCvOrIE$z|sI~7(s<jQXA2V`}WDces-3r@=L?vUehFcHCdtiu0~k+nSd<6hA-4l
z4M}z=*#N-0rq|+Eo-v7Y7_9^?>YX#TWi6xz0<r?Cz<tziq=}MLQQ~G<7;|S^voHrg
z*Jz?iUi{KmS|O^1w}u^e*H=>P+yX(>25?Bi`1nlVVZY~AEL0+NH!Day=h#dQiae-4
z!wmRw-)bTIn53#Z=)Z%Biq4p*Xs^SqbiCH%vT7W<@Jh*_1j$&*x+oWyA^4)`qx7^3
z0Tzh{frIZkxf($u`rb!p(1vOP)67~&e@xrdZ8*3(&t^-;b#Jaw$*5BGRntvzfBU-W
zG>Wu!!Nv0w8rP(s02YX$#(D89FFvdbL+gg6QZNG(X>Yii`aGQdBfqnXHn==AL&0b#
zO-vqx5+*xOXXRXjM@ZZ0N+6v8jE=4=j^)hF$isW=kNd6C+Ave&Sli#VDLgeE?^E!F
zN>r^nHjRy8#Y&8fA=zioGVPuL=RUU%jD!>FEhgtpt_w=P7an^=<qFtaV{;j~Gglml
zq>0bkxp?T{Mo9p;V0y<P_gB$C8u=-ldGg(2BL+C9k|;DJ<&Lj-0<e#0B98rW_T@i+
zXPOkC=G5bL?0=}(e?H?2fx~K69Y@g98^>Ewc`Qx^HJP(clAh9hfK_p*d;t|be3M~G
z&S51A>6D)08S!nmrxsnRUPB7gQVNz%F$63@v(=xo(B~>mmc7RiBdLG0>J#b(eGrL^
zHWqC^K)wu0)wPip?e~N$Zc_4xs>yyB3uI6Clr%q`F&i8)oTi1eSmpWVi&@6(v!;%=
z(?#JkgrUvXxkG^T;ppT@6_+2`Uz1x%p0x!!`PQ&zDdS(q!2jaLWA4RnfDvJk-nHNU
zW0{g?z+0fX2F^6t+W0C^wmESpR&@`SRvUX!H*plsI`#M{xQ+T&Vi@$r!;f$5bFyn|
zE!{c?C*NmmXcoM=^JuSKDgN=kZu-R<Th#vYlX}(pL)ychTlw1d*FJPat1M$xLE^sL
zwi`ZwWKx5N3!f0xC`+~4JQ(s1UT8<N;gYEVDbRb&?Ky%EMBANax3q^!J1wrJ8T1;u
z@%fm;7j)|~<wYZdyJz*va|FESa6)h53e378NFeZ0I?%PZF}{vF_<W~|nEInfjSUG2
zWYp3nClRzT8YywS8%Ouc4wT5r$&a1`VN$fNljpS&&G~7!rm|ZuhapI)@EXFyA8-0i
zf82579nYCCId0pPOEXdU8fM{;m>XWgV;9;h^$mICs~2}ZHawecI9l$u0*#c-rdD6r
zye~qjlE)@!IvxwR7!CWH()PN|&8j}wQR7d;!ttZpZSc9*s4aB|Vx=!nI7sk<^NzX#
zKm0w8>vn1@*9!sb^5@&_Ln328q|`tU9W!buWQ`G?>}AOvNT^d`i+=eUOXmWUvZ!H-
z(pqoqW2mL7sVUUNBCaSgI$;qikqAjXoQV^wk7f8Q46D<fch?xv{t8!qWsJUUrKiaf
zo32az*gJ#Rb|t*~bLfypZA33n@}nKEX}PyH6epwB9h+tORgG1-(rLcUzFH50ob%p5
z)5hpIK?ZM2D|w$kGQFu<U%mxoXq?88s*>V(1PhS8-S%cv&2V_GOA^sXpfSY-#J=7u
zitfp))j97)hyu^=XykO}krx!$r*y0=^Ew(I8XS6YzAm$P5!u9B2DRkucakgi*-acV
z8w;Z8%svb;2?~!YMX--rY`Z+}m<}|#;$uqNQ<r14;Ed4WC$M$sv#|BjNA*I#LI#oh
zr4$=q)!jid1MKCg>83T^FqQyshd!z$y}80MR4*>0N`XI}KAXYL(DFWGsQH6upJh^!
zcJq4<-H{aCZFu@q{1Z09y=mH{TR3)#W)*dJ3g$!SX@aHwBPER$CT+lb=%w@epw*S>
zCZIzY@3A(UmHy)Z;V&oPr*caRZh%!K)&7{BkTfc)r1vA^`gB}%QkD;zAup~OPBSI#
ze0K3+T@*1$j)`g8pVEUO_|aIBi!B@3uKUt#p#@XL)yy3scbe?jB1LF3BuczmQ%i(i
z^KjE<TeM<7KL+Mf`{nT__ey;6l;IP6uKCNXG1qTSBHgW=QxmW#gsEa89wT#XVKLt}
zHaqw$sk`}?zPsm{M?Qztu5COsX`C)y*)Xy1+2%?AY)p;imvn^;)Vou|pz}{9_~$D7
zO|pLSgob-fP;`e6iRgaRL35HNv*F{#{y5wkG<>7Ri{KPceMGq~S?h!1)ehknLtM16
zwi%BUJ8Ed|ZoVVEG~hGll>RVdLx+E5!^X8Sh0nlH3{1RYH?*BkJHrh>Kx*-)%GYwT
zX{>rel!6r1vB@T4E?vpc(5$1n{xnpP=xRsk{3g$;=bq@Eo^$gjmC#H}-Mjk~Us?O3
z9so8%&_t?N;Z&ZCU|An$Jv4w1mEzNVq|9}jo5+W;HJknj={U&i-0#^msc9;7>~7fe
zJd7AKo~Tnpkz2ocT!#GaI`zW6?pDaoAh!3~6=E*gMkMr3dePIR#CNtVhYnJYo=gnI
zb|&yp&YlA+RF)`Ucqgi*bhbZ?_uQJpGQMa58%r|nEqkipoxfZzd_7Y8$IuuRJvo*j
zk-K8EAD7vwLnU}CPX&7GIZ&=4a@#6HyH0m7LBR9d18sjr5B;)FQfp1yRP#=*iE_Dk
zyRfyPF*msnT<SvBlXgCa%Qsp@Qp)c<TAR;QNZ9wac@{seJ7@RI#mL2WEN?kfQ_Sk+
zh5Hl2l(&SlVSzv%>xfHATNC3HAX|gG)VAgUn9nYYBE~5dMatWu>@HtgD09Aq7s%{+
zR-)$Ym~ZN>d-%s`u$;Hg#Woqy4tBE`bs1D0+IjyD&K5Abs?As%vMq0{`xeto^k~Dc
zc@t@qK<pVQ>N3<Kfq&z@{H`HGwboiQ@~G>UODjFRz(aV8$9<Dldhg4%bh{P3r-EC&
zU)i1{)EGI@w#{C>T`=XCPL0ktYRS48v0FO6x$JGVk`WvaU*dnvx9Tntc!?Bwqbp{5
z`KXtB@QKPx6X3K8ILqcBzWFDs{zElMEBQGo2r(DetdW)s8Vd$GZA}N!D+(Td^x{^q
zE+XK35hdBMb|)QHZ&0-nXu7vO#^Qg$V9KbnOs7#<foaOL*FZk9n-sh$o*cm-7K1Lo
z#BC$Yx4$0iC`JWkdam>yv-GmG%V56Ff-Y?+{WFnJs39P;1{5<T)zVP8%fcxIBFnDi
zcCnsM_P~g^EDlSky9nv$w#*=}Qi#&j+D0A%zXs?7V+gr9VKn!qCVdVi*RN9`;M%Eq
zbiO7JmVPJ<WWU%uS*rl&irR!7m!DIDqZADKp6ZL$*Ee&CspGeGF;+cb5`-~CI_aZ8
zg>x+Ltw%#9Xp*n&(6i$zd*$8|ar?3>;H)qj=+V~;h0obr>o^+uj_;B|!o3>p^t&fM
znH@HJOlA;z*g0}ZZa3XXhdj1c@ja%hQ2_L9Yu0H8Mm?lhnh-sKk3~fYN+LFc@p8Tp
zHcjI=A$6~;J0A-BFQJm|F)_6ZdUP~SmEtJ67NlG5^Oy%S7qF3()_6%G&9`;qK%*kG
zJKczhe4f4|9|7tvT_XVMY19a$fU<ZU<OWh!M85Q9X`D5^W$K6=7#4B1syC)5@RlQ|
z=-yE-ZN?Wxd@BirFcx7eUesV4ENN?RYtx(bp)U}Pt2DeS278V8@B%>M@&L6~6?F1`
zWiL|o%1DG*Yg2TSpg7!VdqzQFj~qC&mRk{($_AS6dx0)HIBi>UyIBzT5J<ho_m~?o
zZ%i|nkmTNn7qRH8ZSCJCxN};MmP@@{cH4ekTfe9oPLI8HoaKRkKKryZu^u5zPEJnr
zBT0n)qeqW;Fd0{omH@V`dg{Zv>PoIpd?p>Hl17|4BdUA}JT>F2J>`x{8HFWA9Wf7A
zNKzaLj>h^SWOokB<F-dMN>GNxZ~zsXdk9ooJ!rqQTdD6;;-R?eRx%rGTATi6dxZX_
z#rnr^7W^Bb;Jpcg#uvpr`NmCYy+kIVi2(Aow!zUfMv9teKZ<F~B2w*p`ouB?%GBDM
zFkvOk`5K*M*~8)lcgI9b)K2BN--6>a(#5#)`hB_bm$$_jnA*uRuh!0`NXOOMEvIob
zRh4R%v*GU~-s<jtn!6e?=>=@JcaHth(`4^1!TR3wE9tu=0BliMeWG6*&}Q=RC2{oU
zx5YfR`5pXZhpU#wckx%S_%cJHqV=CfJZH{UMr-00c7=-4$NBG0l+j7FJuo$;u1d!e
z9;u)o!~WE?#h(W#XmOzafzw$rf3wD@e53yz>8(mhpq`ZJI-~tEjz_5FsJ!tW^sRmE
z{Nc@whU*#<P%dYd_t|U9_qDZA6&A?k-X;YiMV2z5*_lPeU_tQesKE-Fq#Z^P-mn}M
zde=_POqJqOVz1rHXG|+vpMu>})uqk-V$sI(=F&~4t@X5xUprg<LH<&IrV?y%F%|;b
z*8zIqB0+p+>V#RiljTpZyDJn=-+z)Zo-vSYV}7@+B$>!e?a3`Jyzj{aY&rhB=XGPL
zp>%myJd{Db-+Zl9L|v@vQ_1Yea#(Ct_=dX^#tL4C)ce?x@sg`VcKLuFaSyyCGEmL^
zF{Ur(`h8kN$zn7*{L=1$)LnYEiuSgqJ$furgZd0dZ6lrTB)*mf9gpNBOih#m*^aLZ
zWl(M|1&K+bQrD3++{ZVyV(mgm{h$mzO<0&XhCc>2w(`mgGMm{#+;4LP19;y8jtH(p
zgGFo;6(^c(pH}y~>dYzjH@QZlOU=Iz1#ET?D3bBLrn$I8NJLC#6DYx7W`!$#OZt1L
z_<anV#Al=ETd*L0JLFngZU5RN(#&qnb!x1<9_dlt7v$rKB9K<}#WZy?7&tAMzh2QW
zT59dDp`pPfqn_dTVZJc7mNI{gXtt)=t01V*ZJ=5fQANVNTAoM8PYc~C8Ub0kh>xLr
zwDQ`nvp8Fi2kfwsZ{K$`Q@V%|36YZ`vlNkvgBO(S*xsP;pTZNh^m#0O)6k<krnCJz
z+g?eYj7Qs3k+!6s5-0sB>wc0_Nhd@InS$D3fRwvOrxH_XHzN5_)oZ(|gL^wv?1JYB
zqf(t`Pt8OOy%Lrs4?p*2ftlNT<p-(MMbn6M?*jCCj|oagtu6MEW$E;IN`EEan4@TU
zldaU$s)cbbBu1gsCQG5Uqq3Yix1xkS5g8L1P`2n<xzS@$42|gH(rt>HBONI#bJ`Q3
zE@wkcj_)>@q9hAbX$q9kOZS7V$fvXVU$Jl{)W#{`3}zJ<fx|Iq?r}K{FP$|1{GTYR
z_(zQJhv@?aBzucc2DJ?C)#1Wfw#TWQDl#z7N}oY%O={?Zn6c)MsKW(jicONsO3X!G
z<g(TKt3wr1{YO1GF1dq_er+$hb)%~*J64fE){AF+Rew&trCh--Q!c`!otLq+-73db
zf3wHGwTw8o&i1J0gQcgTfy{$E=TG?OtFfe&M_FXOP747f-3Z%eunv~0mt6>YIM2Gr
z+}hT*FBs5Ph+pn*_6o0j+-^t}#BTx%k}BQ|G6j7u8ZqP%6IFUw*2T_7Sx;ErBtlX+
z>3<a&Pf4W82zM6aU~{t%AX;Oq-YWg^y1H{rke16ri!VMV^y5Q9p9MK0dk!Ja8?2mY
zk2_;|35VG3+P+t&+EeAGPSa;LMC^poeHQsOLoJl(TpopLM}C#Pu#T()`Vk~0Y$#vI
z92KBH`Juw1@6}z8i!&Nhql)7_jw{1CYis>X>il{)a4$xWC6mUcswZ$z#x8!l^UQi&
zMz?L7kKuM6yAY%SR5X$yWfGToHyu^$0~&cj4{g8<v^J91=;77vx<2?8wA5jrYc!jY
zHSsl`2<`EtN|jW{IHs8BJp6Llhpn~YKCa(4m2)JF`RC4&<H<afP(SB)<8mx5<9rki
zBbEdqUDFf=QT^ES?>jrxZ|d&Jv^b6ItjHA=WQ1nb_AHfcHqAatb|CT9omCv#AWo;7
z*Ci`?uDRpJ@{U|9$`Tnvet~MF`6JG)tDSZCrz};3mp|f1S?O81Jk!dOeV1ICbDtQ)
z;0Bch(9S+x>9mEmy#AJkvD|*jfR>AaPs&VP_8fjIb36T)ne|98XKJ5xTn#kSPH2A!
z7V05#huGUMUn>VjJEBdXKfP{S-jv9kOGBTzpNGfDCfm9qkgG<g`@R*aRis(C+^!QA
znNJvH_2Xr7lb~H5s_vsYO4IUNEEDnO;23-dXO5$~Q4#YyPS}Sa`iG~dE8<{F6BbG4
z4BifqP43oWnPQqhjC~Foh6TvVBt)T|;C}XUs;UV68Ulx;2AcGXd8x~5pI9mDRoB?O
zR%Q(^G!_w9${JJ&kH!&UU_Zn$d1PB0@INB>$46rVfTK8b5t3kmO3k<t7C51Y7+o<_
zJdMiUTN-xq%3CuQRpZnFt%fT(Q}h9?*F6`)IcVs=wk>SB1=C#&k!YasV_LCnYSOHz
zxA{gkmBDTHE*O5!!PWe-gCW1O-rLLn*b1LGcDI%MKE}nxL7TYF6(s1Ii7xfUOtpBG
z3GWZO2PJc)BH*+tBaDw$i$rMbX-!un25S0u*WN>SGU}E^K2QHhpt;b6M8%nR$L>5G
zX<n%LIPmSFK#khI*sg*;n=T11g+h@)4mDs(l2z~YOWDv3-1lU11dYJSk4X5<j%0#w
z@z`dWFC_h_QC9M>QWVd{u2A#EOc!bn&iXxI=cj(zgcNo!1A$3ASr*>UL^O+d>rcZJ
ze|KtPeQ#DDwX=t}nj=l4S<g0JYBMtqisg6y9Gd16xP`i}%DX>|)hjeC*&umdMseTP
zhBaNm5tRO#56u(yQM;rnNrM3QeP)JM$va;!Kp9oJt-L)Y-T9Nohq}7D+@d0<SNXwa
z?#776TGYKL6vBXCzV}XR3mhL0ua23EK}_em(oUk=mFRF`hGp2>_=E)AxLVW6J|)q6
zIIWR(OQeowMdI(wx@l$F4x?#eg>s57rVBL%-0No+f5F)~oq+fIB01!UySQwB_*T}Q
zy-~>k0U$-6OGZS-)BZ4(9FOp|i3}~k$Hf))Zf7aqB1MhwdO|cn6<Hh>V4yKmjy<?^
zD@UxS1YB#kGHYS%BQZq6@=4JBhlxj8{-%Ll@R(2Q{q~vSqvtW@Er%|Z0f}B+jM2u2
zu~S{@okgZsWrZ$9lnGOdzv$z7AR~2}8f?;SVCL}HTI@Zlf!Cq*xa2r9QXvb9S1(eA
zYV+1`5yXB{?boa^(`e2$jhN6enJ7P?fFU**T&%}its3<~pH@5I(((56V-VZz%6gkr
zZfj|@@ptvdmjUp<(XJ`RM@q3bLtT&fqT`-`Z+Ak$rlLA}A<m`Z?{ib>-G5hbKxCGT
z>XSEW=W1zb={Bb|0FBvIG(#MTFZ<NVM?+(<zFJg(A#wln=ehzg`iWuN1-@5ek=d;>
zK=*8yPw?U<^A#;=*8;mxecn2+2@<y=E7IuYPi+Kz+;8BDWeP$tXV6GCaW#v_(2jPl
z<pfJ}iAG^4+1O;n`Wvn#1ziTlJPwxBbLa7|u>1FY^_PR5Mle+-BN{qWmR2i)cBxRO
zXdWWU$ZvD~2GX)21O1}IhlAl`)b(ulL@O2ACre!B>f}*&^Qr2YecbacQm87PwX^~@
zh5l-{HA`0P?WktKvebgC`@k7YP~=7ytfW4#$q&_@F%xDzy#n#RibZF=ST_YOp3LCV
z?+coA*hR~^>J{B__8Pn>h2H!^`=rQE{4!>&1Q<g-?zB+$dRfDIP-{7jz+TbTRs?aR
z^-$g(UjZ$B`I6_xv%ouvwKjc}+BdxF7UQc7%;t+f@LR`Uzcx;Sv|uSVXE}oG6(R__
z)<f-i*_8BgkXp+&sk%GSS_kZ&Q;n;4wb^#*udvyTtpgx78P9mZbfQ-dL^>mGP!`R|
zbNl(iFabfdYr#IPKEbF4^CMv-v?Wz97|cdQF~8jS&E%UlMX-PX;t<izI#QaliZ}!p
zXKqb&)t4@>uDtWh%x`PX?Z|fw9b!_47?cQ>K_GB1&G~Fb=h;IS&1^DfeB;JOmg3I#
z=7Kb%49~9R6&5d4{S%EO8?c^3a*+<mY47>AdXX(qDN}$ASl2e`KKxUd&o2t6Wj_Ko
zPY&krxWgg9&AnxgxCiwxP?VPxr)S_H*rPaHLT<aX;!=rtf{MlvA08N|NFr;WiFjF|
z3<9P2Wy_z}Bd;{O9FO!oLNwinx>dYi>z;6`G!#_!t>pf@%j51KTh*LLYubU(o3~77
zwMr!Vb(FLd(1%?NFc)v@x<}Dz?=BkTqr&IUb6q)VFG{$NDGVr<Gnui8jzC6UmZ@p~
zT?`E!6rztRFz|}X1;5uou;1un<P>5B9}0L|xo~bbtMWl(T+Eo8Lxp$hr&gc$i8)CP
zAZgRh%Z5uKDY~;EcZus2wEZ0%e5O@$&%O8zIRwai&w1%EU6*ahgZZX<S&4wVg1FP5
z8C$Z|h}Vusai7UfeHP4G_RF3A<WO3V)vIx3bzETH>_FcbVC_9ExtFe-l3d}-f+6{|
zC?n&Cf+ch6^~h`T9uHF<;X#y#Y}Itq)+|KJ$)QITMs7Xt)5PyCz!&4ypENUP6Fu{O
z6fnOclb*q{EfOm&A28r(JuW%r<n1#S@g?9fc(AfqPlSS(spb=?%F1^5>E3PS_ODVm
z(0Wkkd5)eDYS+et<vx^L@yg?PAM=hbL8FC<N6TKCT$WRC=4kDxf;?imtnNk6&uK=V
znsS2QwFQvow=q0ufC0PiTG20CKnnG5ih$~gUwD9wLO+COC^ksAjVIDfo(|VF<zt%G
zKsQ8YEjF;!Fh{J!<;&P-dbTy0=5maixcl8p`)C!hu1&2f15w)BdByK`z7ngFD(MW$
zKmd+m8l)Uz8RAe-d?H`UlV9%K#M#axL8|oL?lPZkK1I6+$^8C0mjA+37HSe@Y$?U?
zX3{W@cfh*0&}epg_EzJpE=?hl1xMKE=0o;a{ZyFCmHg${_cE$FKD^IR@=W(MrtNKq
zO2+UWtEXU}@4f;E!2v<P#P1V3=l2lPq-hR6eNvN}gCV(DTHZi??1Osspr`X^qpA4T
zu8%e`m|a7oI<+5)Ee{*H(l_IkBBJPb%DE4|S3WeW3=Uf1(XZzv!{rSgCxUrBn%B@M
z+zGW!7Mfkdxf#{Y^ZjkT)Rc?qMohlB3gdR}1CMxJQUi)X`L@LT{jd2>-nVf8%zN$1
zNmRtVyg>P+VM<NJ#Z7CEjE+1sc%yhAynsy}npC6{*oQ56dj+HfHPj84zl2sYQ>?pz
zi+AIjfW=;0&Aelda**!=7TLy?&zo(}PCMOb*uaPg<EB{fl#kE=`2gwI9v!h{944Hz
zS<Qw$!cUb3pm#Np%SwuY`Ze|Ka((x^3oI=>*2rb1Z##c&Lb*(vbY*;?x#1Z%naBII
z_#HhVYR{<0{h(mpdL$?$lgAbuTujd<l8E}wn?!if@lDQ)Ls2(w2sGqG{sn*5N*G+9
zUFMpLi%NMJp>B(4F{ECiu);Oq^kT0NI`Ys5H62VkEFDI>c{ffy4*t+_KMJI`$WWSd
z9iCJy=$dCL;Mefc-L{2hxa$3DlG)_j%pl$teBS&zwR&V$M*=tHB7V1~z``&ecV`!P
zaKlqV0Hf=8@802fhw-%a=Dt#c-iNW>4rtBE$pMX2IHnH1{LC%&BdC9mDF!sc7@=J8
zNt)1m;th!_F{s1v9^A&m8qpQuCh-PRus2T%KPVUw$V?Re)S8pOac|6dvBQkIOhm{!
zzDfsQn3;n#beAO(`DMqzdp1OW8$}p;SP|zmsBb7MC6;ibe4P8vrYMRgK!5yhQaXYa
zx}Cfb2UYNHU2PmK&b(~C8U)G^2FpOzwREfX#SXd(>S+r}p|5)1yqM{>1|4?I*xSZ@
zo2y2&ObyGpC3~jY_4(vFS8kxIzGk{U?taK)hFTMFoJ$n^s?c=sB`%?<D#7%U&?UIH
z=|U3SY*ODg5p!g$rkycEwL(AMGZs8y!h+xn^gIAby9VK-g-VpdwV&S_PB!fl;Y+J}
zYJK(U9=z!PAaVOM{F`-d11LuT^cgOCqkv)_+vJ7sykHsloH*t0J6}M1uw&-r=DwNp
z|CZJ|?;urHw!Js1!!wvBTvWYeGDX)aNR#NxypD>izCYuX>oRtCL3-X?NjkcIa2Qcx
zWm7rF9nihCsN&Z!ah+9w|0=2CTiqn%(T#|$L7R&s4uq(epRYY0x1)KT#9kK)g>AMI
zc_W&ucUGB}VOeh}{gue=#JrAXcBT&tmz%2XyzZ;fN|cw%_w$xC2~I{MV>%w%f@W(I
zDPf{TjGD=JQIpp2`lH(0c9gXA`%ap26GV5n`}aJgz&qcRrr?R98~zi9!ETdXb$Rcm
zbG-~hw7T=g;jl%WIt0YSY<@+Gsvnc^s5Z`$bL*5Mh-06H^;+x=Z01^%HwvWf3t9Gh
z^;X;CA$xvOwpM*5#P!`%raJsTFsKE<A}amrKnt#SRt+~Dt>b*?Qh*LQr7m-zyE%cg
zMIOz;T80y9!fv`bN)*`g^<B&Y!~*4{@PY`~EgxROBMUM7gAAl!FNJlpV>xRJ=$^F<
zRXRu1oC{B$j<;6fflbfqTQD!d`ipZovTQ+jy-z(Qqq>TbJXBJCiSThX+lKN!O^Q}o
zmc!?`E1|*zh{0DQE&-Iu&pVa*)wy%mce})?*k=;vtKwQqSCKBRSQyFe;WX;@PEvH5
zV=Rs_2IcEYgiF1>T>Do82IQm?yY;z14{`|AvCz()ehtwPB?bu1n!1V&v`&F#qB(|N
zj=Og;qgY>JwJbE+OoM*VG&v3;!gGh9g7xM?rK8VoZ?1jK?6P`^LOgbbHsEu`ON9=f
z%6Zbo4V^`<hIJijC68^`Q{H08U8a0oZ04U~8HoQ7?_N>{Gju6%fD~p9-TOS^^c}6M
zr7u>#p3z{Q2ki|6l{Gv)qR!Qvvg`;U2{QEB;u$9>4>u74YxNNn#E7I|c+6!xbxdUj
zV@A{DXKszXFTs;Rc(1j=v?c_#`pxJPN?d{cS#`#stdqTI4F?|^Tf|2e=Z^M%wW9m|
zlRDS2=UxVyk8q|A!C}!LoyS{+HI=ZO{{9PIU5MUPw^hp!O#=3t(>h$~DQ9GhJjGF$
zC6rzA9D@8Pjz{6Gj*#Ulu6REwed_p`x{}L&*Ib6c;C+X+dJe-7mq{R<yhXso<S>#o
zrj#eRZon;@jiLbGr#bmyB(yvEU@;A0ebg)MO6M5MqLE03%xHV3RPz|wG}D@r<h0rK
zL#B6#Shmq1viG1OkhW6v2pp&j^!b?`X2|atbg8vLqAw_IB?=cYjA(8i`gii>>3N3I
z&>G6^3`=|SO&Ugwdnt@xHXNxfXU#0&^5YSqt_9k0ZC<2FIc!zwPAc0L3`>@S&3%lj
zy8)#X-hk>;){wi|wgrmpt?ODo8R|-hYM@gx6m}Pr**?OCYi%?AG}X(b!1?WQfXBBs
zY{}*fc)n(9!~Lh%fJ(Aa!LCkbsh1wyIfB!8?Pd?vq9|A3qQ!TaLzRQMmyvr_bP634
zVg-37V{_muJ~TKVen@NQbr)FZ<gO?krBbA`LGNwnC7`sIl=kX=Tu1Jd@PNt+3NpX&
zky#XZ6N@sJQYr@Pey`Fe^v-ngZbhN+4@|q4X8BMW$!$sQjp)fW<J<!u!_AM{k@dOi
z)9%7lVB`25>-!M3*#yI|Z`%_^M$-vj={@ZQT(+h=7rGNstIApB!czrtUK)O?DG<bq
znwr<&KL&W+(yQD;$(q(%>K2W@LdI;>N&(%?z3$bgE9Hw#Rvab$5uH=ld0bIkTJ5Eg
zq~xNIv^Z67p*XU+*Z<>CZy7|@+^8SJF#+}aW<rx2ETtr7av=X!??O1b1$~8WcHu=g
z95p@5m5J^yK`<FcB?ddKm>xan(DRn3T;i;N<@B-1d}xX%!eF>bB>`47AUQQBxnT?g
z(Y$+S>B;K)*mhzxnp=)O=gkyiCM4$iY|_(?5*|WtJ8zlq@<sEVglM&|@Dk*=U}VfU
z8{xj4S2J#-ohza<>$N;~P~VBe6cNmXyVJ4e&xNpF^8dCG{U6Doasf82YUXn7r$y<0
z{f>YZh*w;GdHNyyFHez9JcrXZFw%EQ73M$B5+5GN;4q$?^kVs+LH*;SDn0OEm$H(x
z@-F{MyHEjUk}5uYnq&K`y7n6Y9xR{8!g6-{;Lm}IM*%arN5Ffkp8Vw(|9?+Hyc;ds
zd)@r(c@=jmdDbe(Q%@>A#hU;+byVERJiR>K-EcZjRluxv1#i2XgNYP=Xcz2NGr=!*
z?8Et1V-`)^WbHkxGI0Zo*HWh#0u$YgL&gyW8wcplQb=(s1|P>or|$!&E39PP_fI<&
z0_tRTG2$|=HWtj+kO09fkBEmS)tJ-j=P5Rp2g2{Lp0Z*6)f*GO2RO(6{<1N@aO^Kj
z`4{6k<N$^~GX&T1%<RaYY&R_djFy5-z3TU(&|ihe*H;Ztw}LJvZ?F71no|aWe;mx8
z{?JGJFB3^%1SXPA{Xp*@kNG{$?5+%0`%9OiS^sS!>cB)4$%((8nFsunObz~kl!@?X
zJ;V8ziDUv3dA8g_00hDRlF-xMQ5?G(pC!`&kCf1p`+=-s%yc!W*A=G_?N?f@e*jhv
zACFQ0-zJg`Oe9f|^V_T6iT3M&eJ=qk=joulMEEZgQ3TZc(tj-YJ2n4f!C(3F7j4t<
zf3aX#I7Sr&NkR_gW)Y)4zxc;VE*%C!2=N6jxkv6X<CZSN<612ah{ctQ0R*R6DNZSI
z^x`P{_}EyP{gfz&v!~)8&6+;l0&+8uw|Qt(D!Z%b(iMqXTs?iiz4?9ZfMRbt95TUY
z7N{DJ%^jJKh-IL&K@)I-q&4q#FA{f=>8DUoW6|6J)7D>MGMVDs^RY8Bnr;oBf9{s-
z`=c%_;IxqLx%2i{28M>ZBE=fe;^^C6{^ee>@Sl<`ttaloS9bO4)ro4miK@77p&v7@
zA1hBs^|z<#9I9C?z*jB?+G56B{zkaxpC>jeaqfi3EsxK8d~8tWClkHLMGxb%8E)8*
dq^KZ7Q^taN#K)OojOTzqnMaBbA@_}5{6DJv0VMzc

diff --git a/Documentation/rkt-vs-other-projects.md b/Documentation/rkt-vs-other-projects.md
index 5a237560c7..233ee9122b 100644
--- a/Documentation/rkt-vs-other-projects.md
+++ b/Documentation/rkt-vs-other-projects.md
@@ -6,6 +6,7 @@ This document describes how rkt compares to various other projects in the contai
   * [Process Model](#process-model)
   * [Privilege Separation](#privilege-separation)
 * [rkt vs runC](#rkt-vs-runc)
+* [rkt vs containerd](#rkt-vs-containerd)
 * [rkt vs LXC/LXD](#rkt-vs-lxclxd)
 * [rkt vs OpenVZ](#rkt-vs-openvz)
 * [rkt vs systemd-nspawn](#rkt-vs-systemd-nspawn)
@@ -14,7 +15,7 @@ This document describes how rkt compares to various other projects in the contai
 
 ## rkt vs Docker
 
-The Docker Engine is an application container runtime implemented as a central monolithic API daemon.
+The Docker Engine is an application container runtime implemented as a central API daemon.
 Docker can resolve a ["Docker Image"](https://github.com/docker/docker/blob/master/image/spec/v1.md) name, such as `quay.io/coreos/etcd`, and download, execute, and monitor the application container.
 Functionally, this is all similar to rkt; however, along with "Docker Images", rkt can also download and run "App Container Images" (ACIs) specified by the [App Container Specification](https://github.com/appc/spec) (appc).
 
@@ -22,14 +23,21 @@ Besides also supporting ACIs, rkt has a substantially different architecture tha
 
 #### Process Model
 
-At the time of writing, the Docker Engine daemon downloads container images, launches container processes, exposes a remote API, and acts as a log collection daemon, all in a centralized process running as root.
+Prior to Docker version 1.11, the Docker Engine daemon downloaded container images, launched container processes, exposed a remote API, and acted as a log collection daemon, all in a centralized process running as root.
+
 While such a centralized architecture is convenient for deployment, it does not follow best practices for Unix process and privilege separation; further, it makes Docker difficult to properly integrate with Linux init systems such as upstart and systemd.
-Since running a Docker container from the command line (i.e. using `docker run`) just talks to the Docker daemon API, which is in turn responsible for creating the container, init systems are unable to directly track the life of the actual container process.
 
-rkt has no centralized "init" daemon, instead launching containers directly from client commands, making it compatible with init systems such as systemd, upstart, and others.
+Since version 1.11, the Docker daemon no longer handles the execution of containers itself.
+Instead, this is now handled by [containerd][containerd-github].
+More precisely, the Docker daemon prepares the image as an [Open Container Image](https://www.opencontainers.org/) (OCI) bundle and makes an API call to containerd to start the OCI bundle.
+containerd then starts the container using [runC][runc-github].
 
 ![rkt-vs-docker-process-model](rkt-vs-docker-process-model.png)
 
+Since running a Docker container from the command line (i.e. using `docker run`) just talks to the Docker daemon API, which is in turn directly or indirectly — via containerd — responsible for creating the container, init systems are unable to directly track the life of the actual container process.
+
+rkt has no centralized "init" daemon, instead launching containers directly from client commands, making it compatible with init systems such as systemd, upstart, and others.
+
 #### Privilege Separation
 
 rkt uses standard Unix group permissions to allow privilege separation between different operations.
@@ -51,6 +59,18 @@ As rkt does not have a centralized daemon it can also be easily integrated with
 [runc-github]: https://github.com/opencontainers/runc
 [oci-spec-github]: https://github.com/opencontainers/specs
 
+## rkt vs containerd
+
+[containerd][containerd-github] is a daemon to control runC.
+It has a command-line tool called `ctr` which is used to interact with the containerd daemon.
+This makes the containerd process model similar to that of the Docker process model, illustrated above.
+
+Unlike the Docker daemon it has a reduced feature set; not supporting image download, for example.
+
+rkt has no centralized daemon to manage containers, instead launching containers directly from client commands, making it compatible with init systems such as systemd, upstart, and others.
+
+[containerd-github]: https://github.com/docker/containerd
+
 ## rkt vs LXC/LXD
 
 LXC is a system container runtime designed to execute "full system containers", which generally consist of a full operating system image.

From 051d4887fac9ee607c7a43e86039bd915e098873 Mon Sep 17 00:00:00 2001
From: Michal Stachowski <michal.stachowski@outlook.com>
Date: Sat, 30 Apr 2016 12:13:49 +0200
Subject: [PATCH 0267/1304] Add additional options for developers in
 build-and-run-tests.sh script

This patch enables running builds w/o testing and using not commited
changes for builds
---
 tests/README.md              |  6 +++--
 tests/build-and-run-tests.sh | 43 +++++++++++++++++++++++++++---------
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index b05a09199c..62a1c53c5f 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -66,11 +66,13 @@ It would be possible to add more tests with the following commands:
 #### build-and-run-tests.sh parameters description
 
 The build script has the following parameters:
+- `-c` - Run cleanup. Cleanup has two phases: *after build* and *after tests*. In the *after build* phase, this script removes artifacts from external dependencies (like kernel sources in the `kvm` flavor). In the  *after tests* phase, it removes `rkt` build artifacts and (if the build is running on CI or if the `-x` flag is used) it unmounts the remaining `rkt` mountpoints, removes unused `rkt` NICs and flushes the current state of IPAM IP reservation.
+- `-d` - Run build based on current state of local rkt repository instead of commited changes.
 - `-f` - Select flavor for rkt. You can choose only one from the following list: "`coreos`, `host`, `kvm`, `none`, `src`".
+- `-j` - Build without running unit and functional tests. Artifacts are available after build.
 - `-s` - Systemd version. You can choose `master` or a tag from the [systemd GitHub repository](https://github.com/systemd/systemd).
-- `-c` - Run cleanup. Cleanup has two phases: *after build* and *after tests*. In the *after build* phase, this script removes artifacts from external dependencies (like kernel sources in the `kvm` flavor). In the  *after tests* phase, it removes `rkt` build artifacts and (if the build is running on CI or if the `-x` flag is used) it unmounts the remaining `rkt` mountpoints, removes unused `rkt` NICs and flushes the current state of IPAM IP reservation.
-- `-x` - Force after-test cleanup on a non-CI system. **WARNING: This flag can affect your system. Use with caution.**
 - `-u` - Show usage message and exit.
+- `-x` - Force after-test cleanup on a non-CI system. **WARNING: This flag can affect your system. Use with caution.**
 
 ### Platform
 
diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index 643fe18739..109257ebf8 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -74,7 +74,7 @@ function checkFlavorValue {
 
 # Parse user provided parameters
 function parseParameters {
-    while getopts "f:s:cxu" option; do
+    while getopts "f:s:cxujd" option; do
         case ${option} in
         f)
             RKT_STAGE1_USR_FROM="${OPTARG}"
@@ -98,6 +98,12 @@ function parseParameters {
             PRECLEANUP=true
             POSTCLEANUP=true
             ;;
+        j)
+            JUSTBUILD=true
+            ;;
+        d)
+            DIRTYBUILD=true
+            ;;
         \?)
             set -
             echo "Invalid parameter -${OPTARG}"
@@ -158,9 +164,10 @@ function build {
     if [[ ${PRECLEANUP} == true ]]; then
         rm -rf "${BUILD_DIR}/tmp/usr_from_${RKT_STAGE1_USR_FROM}"
     fi
-
-    make check
-    make "-j${CORES}" clean
+    if [[ ${JUSTBUILD} != true ]]; then
+        make check
+        make "-j${CORES}" clean
+    fi
 }
 
 # Prepare build directory name
@@ -185,21 +192,35 @@ function detectChanges {
     fi
 }
 
-# Clone source code into build directory
-function cloneCode {
-    detectChanges
-    git clone ../ "${BUILD_DIR}"
+# Copy source code into build directory
+function copyCode {
+    if [[ $(whereis -b rsync | awk '{print $2}') != "" ]]; then
+        rsync -aq ../ ${BUILD_DIR} --exclude=".git*" --exclude=builds --exclude-from=../.gitignore
+    else
+        echo "Cannot find `rsync`, which is required by this shell script"
+        exit 1
+    fi
+}
+
+# Set source code into build directory and enter into it
+function setCodeInBuildEnv {
+    if [[ ${DIRTYBUILD} == '' ]]; then
+        detectChanges
+    fi
+    copyCode
     pushd "${BUILD_DIR}"
 }
 
 # Show usage
 function usage {
     echo "build-and-run-tests.sh usage:"
+    echo -e "-c\tCleanup"
+    echo -e "-d\tUse unsaved changes for build"
     echo -e "-f\tSelect flavor"
+    echo -e "-j\tDon't run tests after build"
     echo -e "-s\tSystemd version"
-    echo -e "-c\tCleanup"
-    echo -e "-x\tUse with '-c' to force cleanup on non-CI systems"
     echo -e "-u\tShow this message"
+    echo -e "-x\tUse with '-c' to force cleanup on non-CI systems"
 }
 
 # Prepare build environment
@@ -247,7 +268,7 @@ function main {
 
     prepareBuildEnv
     cd builds
-    cloneCode
+    setCodeInBuildEnv
 
     if [ ${SRC_CHANGES} -gt 0 ]; then
         build

From 49101417abd7c4aa910b3d7e89bcf96f5e7532fd Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gmail.com>
Date: Sun, 15 May 2016 18:50:22 -0700
Subject: [PATCH 0268/1304] rkt: handle symlink in calculateDataDir test

Fixes TestCalculateDataDir failure triggered when /var/lib/rkt
is a symlink.
---
 rkt/rkt_test.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/rkt/rkt_test.go b/rkt/rkt_test.go
index cf3bda3f78..098b3f1d49 100644
--- a/rkt/rkt_test.go
+++ b/rkt/rkt_test.go
@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/coreos/rkt/pkg/log"
@@ -83,8 +84,17 @@ func TestCalculateDataDir(t *testing.T) {
 
 		cachedConfig.Paths.DataDir = tc.configDataDir
 
-		if dataDir := calculateDataDir(); dataDir != tc.out {
-			t.Errorf("main.calculateDataDir() with setup %q, expected %q, got %q", tc, tc.out, dataDir)
+		realDataDir, err := filepath.EvalSymlinks(tc.out)
+		if err != nil {
+			if os.IsNotExist(err) {
+				realDataDir = tc.out
+			} else {
+				panic(fmt.Errorf("filepath.EvalSymlinks(%q) got error %q", tc.out, err))
+			}
+		}
+
+		if dataDir := calculateDataDir(); dataDir != realDataDir {
+			t.Errorf("main.calculateDataDir() with setup %q, expected %q, got %q", tc, realDataDir, dataDir)
 		}
 
 		resetConfigState()

From f23b69d8bc7c122484c68ca9ca9ce5ee6c1b56cd Mon Sep 17 00:00:00 2001
From: Faraz Fazli <farazfazli@gmail.com>
Date: Mon, 16 May 2016 02:16:41 -0400
Subject: [PATCH 0269/1304] docs: fix duplicate word

Fixes the word "network" appearing twice instead of once when explaining the default contained network argument.
---
 Documentation/subcommands/run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 36a43a3d69..77defacc1d 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -295,7 +295,7 @@ The `run` subcommand features the `--net` argument which takes options to config
 
 ### Default contained networking
 
-When the argument is not given, `--net=default` is automatically assumed and the default contained network network will be loaded.
+When the argument is not given, `--net=default` is automatically assumed and the default contained network will be loaded.
 
 ### Host networking
 

From 5b6a3c4ad3770e57d909fd51a60ed1845df04829 Mon Sep 17 00:00:00 2001
From: Faraz Fazli <farazfazli@gmail.com>
Date: Mon, 16 May 2016 07:05:39 -0400
Subject: [PATCH 0270/1304] docs: updated Ubuntu link

* Update Ubuntu link in docs
* Update getting-started-ubuntu.md
---
 Documentation/getting-started-ubuntu.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
index 2b53e27848..73bbaec11b 100644
--- a/Documentation/getting-started-ubuntu.md
+++ b/Documentation/getting-started-ubuntu.md
@@ -1,11 +1,11 @@
-# Getting Started with rkt on Ubuntu Vivid
+# Getting Started with rkt on Ubuntu Wily
 
-The following guide will show you how to build and run the sample [etcd ACI](https://github.com/coreos/etcd/releases/download/v2.0.9/etcd-v2.0.9-linux-amd64.aci) on the standard vagrantcloud.com [box for Ubuntu Vivid](https://vagrantcloud.com/ubuntu/boxes/vivid64).
+The following guide will show you how to build and run the sample [etcd ACI](https://github.com/coreos/etcd/releases/download/v2.0.9/etcd-v2.0.9-linux-amd64.aci) on the standard vagrantcloud.com [box for Ubuntu Wily](https://vagrantcloud.com/ubuntu/boxes/wily64).
 
-## Download and start an Ubuntu Vivid box
+## Download and start an Ubuntu Wily box
 
 ```
-vagrant init ubuntu/vivid64
+vagrant init ubuntu/wily64
 vagrant up --provider virtualbox
 ```
 

From 85236f894e681013c284e21c0457b2dcd0ed8fd1 Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@intel.com>
Date: Mon, 16 May 2016 13:48:58 +0200
Subject: [PATCH 0271/1304] kvm: fix logging network plugin type

---
 networking/kvm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index cf2a5ef4e5..55a8f611b9 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -143,7 +143,7 @@ func kvmSetupNetAddressing(network *Networking, n activeNet, ifName string) erro
 	output, err := network.execNetPlugin("ADD", &n, ifName)
 	n.conf.Type = original_type
 	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("problem executing network plugin %q (%q)", n.conf.Type, ifName), err)
+		return errwrap.Wrap(fmt.Errorf("problem executing network plugin %q (%q)", n.conf.IPAM.Type, ifName), err)
 	}
 
 	result := cnitypes.Result{}

From f41e37d028eaf53f2d349a6a0850c6bdf0232006 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 17 May 2016 11:56:01 +0200
Subject: [PATCH 0272/1304] MAINTAINERS: add Tamer Tas @tmrts

---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 935b563112..b8303539e0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6,5 +6,6 @@ Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle)
 Krzesimir Nowak <krzesimir.nowak@coreos.com> (@krnowak)
 Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak)
 Stefan Junker <stefan.junker@coreos.com> (@steveeJ)
+Tamer Tas <tamer.tas@coreos.com> (@tmrts)
 Vito Caputo <vito.caputo@coreos.com> (@vcaputo)
 Yifan Gu <yifan.gu@coreos.com> (@yifan-gu)

From 129d3ade49f612d35d54c951ce6fef5d29ed5831 Mon Sep 17 00:00:00 2001
From: Matthias <matthaias@users.noreply.github.com>
Date: Tue, 17 May 2016 13:01:45 +0200
Subject: [PATCH 0273/1304] docs: improve CONTRIBUTING and test docs (#2637)

* docs: improve CONTRIBUTING and test docs

Some links were outdated and ./configure is not available w/o ./autogen.sh

* docs: split "manually running the tests" to a section each type
---
 CONTRIBUTING.md |  4 ++--
 tests/README.md | 26 +++++++++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 868581b8bf..f60d2daf39 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,7 +25,7 @@ are very busy and read the mailing lists.
 ### Getting Started
 
 - Fork the repository on GitHub
-- Read the [README](README.md) for build and test instructions
+- Read [`building rkt`](Documentation/hacking.md#building-rkt) for build and [`manually-running-the-tests`](tests/README.md#manually-running-the-tests) for test instructions
 - Play with the project, submit bugs, submit patches!
 
 ### Contribution Flow
@@ -36,7 +36,7 @@ This is a rough outline of what a contributor's workflow looks like:
 - Make commits of logical units.
 - Make sure your commit messages are in the proper format (see below).
 - Push your changes to a topic branch in your fork of the repository.
-- Make sure the tests pass, and add any new tests as appropriate.
+- Make sure the [tests](tests/README.md#manually-running-the-tests) pass, and add any new tests as appropriate.
 - Submit a pull request to the original repository.
 - Submit a comment with the sole content "@reviewer PTAL" (please take a look) in GitHub
   and replace "@reviewer" with the correct recipient.
diff --git a/tests/README.md b/tests/README.md
index b05a09199c..b449e3b227 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -77,20 +77,32 @@ The build script has the following parameters:
 Select `Ubuntu 14.04 LTS v1503 (beta with Docker support)`.
 The platform with *Docker support* means the tests will run in a VM.
 
-## Manually running the functional tests
+## Manually running the tests
 
-Make sure to pass `--enable-functional-tests` to the configure script, then, after building the project, you can run the tests.
+The tests can be run manually. There is a rule to run unit, functional and all tests.
+
+### Unit tests
+
+The unit tests can be run with `make unit-check` after you [built](../Documentation/hacking.md#building-rkt) the project.
+
+### Functional tests
+
+The functional tests require to pass `--enable-functional-tests` to the configure script, then, after building the project, you can run the tests.
 
 ```
+./autogen.sh
 ./configure --enable-functional-tests
 make -j4
-make check
+make functional-check
 ```
 
-For more details about the `--enable-functional-tests` parameter, see [configure script parameters documentation](build-configure.md).
-The snippet above will run both unit and functional tests.
-If you want to run only functional tests, use `make functional-check`.
-There is also a counterpart target for running unit tests only - it is named `unit-check`.
+For more details about the `--enable-functional-tests` parameter, see [configure script parameters documentation](../Documentation/build-configure.md#--enable-functional-tests).
+
+### All tests
+
+To run all tests, see [functional tests](./README.md#functional-tests) to configure and build it with functional tests enabled. Instead of `make functional-check` you have to call `make check` to run all tests.
+
+### Passing additional parameters
 
 You can use a `GO_TEST_FUNC_ARGS` variable to pass additional parameters to `go test`.
 This is mostly useful for running only the selected functional tests.

From 9048b3d2a98a6f87406b8437d50f69c6a0ce09fe Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Tue, 17 May 2016 12:57:09 +0200
Subject: [PATCH 0274/1304] tests: update pattern to skip more doc/img files

This commit adds more patterns to DOC_CHANGE_PATTERN, skipping
testing on image changes and more top-level files.
Closes #2642

Signed-off-by: Luca Bruno <lucab@debian.org>
---
 tests/build-and-run-tests.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index 643fe18739..e9d429851c 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -234,8 +234,10 @@ function main {
 
     DOC_CHANGE_PATTERN="\
             -e ^Documentation/ \
-            -e ^(README|ROADMAP|CONTRIBUTING|CHANGELOG)$ \
+            -e ^logos/ \
+            -e ^(MAINTAINERS|LICENSE|DCO)$ \
             -e \.md$\
+            -e \.(jpeg|jpg|png|svg)$\
     "
 
     buildFolder

From e4b5ae6b8ffc03108596011bb731eab7117a2b81 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Tue, 17 May 2016 15:47:50 +0200
Subject: [PATCH 0275/1304] build: fix `manpages` and `bash-completion` targets

This commit fixes `manpages` and `bash-completion` targets, passing
go-related variables to build commands.
Closes #2494
---
 rkt/rkt.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rkt/rkt.mk b/rkt/rkt.mk
index bbcb67b839..e04e893dbd 100644
--- a/rkt/rkt.mk
+++ b/rkt/rkt.mk
@@ -31,11 +31,11 @@ include makelib/build_go_bin.mk
 
 manpages: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/manpages/
-	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | xargs go run rkt/manpages_gen.go
+	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | $(GO_ENV) xargs "$(GO)" run rkt/manpages_gen.go
 
 bash-completion: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/bash_completion/
-	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | xargs go run rkt/bash_completion_gen.go
+	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | $(GO_ENV) xargs "$(GO)" run rkt/bash_completion_gen.go
 
 protobuf:
 	scripts/genproto.sh

From e9fb3a6ae6a98adcb8e97d9f90d665414bc9487c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Tue, 17 May 2016 15:55:34 +0200
Subject: [PATCH 0276/1304] build: git ignore `dist` directory

`dist` directory contains build artifacts generated by `manpages`,
`bash-completion` and other build targets.
Not relevant for source versioning, ignoring.
---
 .gitignore | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c94a463e9..c432aeeeb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,14 @@
 *~
 
+.vagrant
+/.config.args
 /Makefile
+/acbuild
 /autom4te.cache
+/build-rir*
+/build-rkt*
 /config.log
 /config.status
-/.config.args
 /configure
-/build-rkt*
-/build-rir*
-.vagrant
+/dist
 /tags
-/acbuild

From 4def159eb9fabc47e397da349e27a0328e1dfa27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 17 May 2016 13:02:01 +0200
Subject: [PATCH 0277/1304] stage1/init: work around cgroup/SCM_CREDENTIALS
 race

There's a race[1][1] on systemd that causes the systemd unit name not
getting written to the journal for short-lived non-root services.

To provide a way to identify an app within a pod in the logs, we set
`SyslogIdentifierp` to the app name as a workaround.

This causes processes forked by the app and pre/post start hooks to be
identified as the app, but it was already happening before we removed
appexec[2][2] with the binary exec'd by the app instead of the app name.

In theory we could remove that and we'll get the binary name of each
process executed in the pod as the syslog identifier, but then this
workaround would not *work*.

Setting the app name as the identifier is already an improvement over
the previous situation.

[1]: https://github.com/systemd/systemd/issues/2913
[2]: https://github.com/coreos/rkt/pull/2493
---
 stage1/init/common/pod.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 0f5db3808e..3dad4c9bc9 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -447,6 +447,11 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
 		unit.NewUnitOption("Service", "SupplementaryGroups", strings.Join(supplementaryGroups, " ")),
 		unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")),
+		// This helps working around a race
+		// (https://github.com/systemd/systemd/issues/2913) that causes the
+		// systemd unit name not getting written to the journal if the unit is
+		// short-lived and runs as non-root.
+		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
 	}
 
 	if ra.ReadOnlyRootFS {
@@ -487,7 +492,6 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 	} else {
 		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "journal+console"))
 		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "journal+console"))
-		opts = append(opts, unit.NewUnitOption("Service", "SyslogIdentifier", filepath.Base(app.Exec[0])))
 	}
 
 	// When an app fails, we shut down the pod

From 828db6e8ee985e44d6f535dbf2bbf147c81b01d2 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 17 May 2016 17:23:39 +0200
Subject: [PATCH 0278/1304] tests: increase timeout from 30min to 45min

We added more tests recently, such as TestCapsSeveralApp.
---
 tests/functional.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional.mk b/tests/functional.mk
index 73cb535c0e..e90d8d6c42 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -79,7 +79,7 @@ $(call forward-vars,$(FTST_FUNCTIONAL_TESTS_STAMP), \
 $(FTST_FUNCTIONAL_TESTS_STAMP): $(FTST_IMAGE) $(FTST_EMPTY_IMAGE) $(ACTOOL_STAMP) $(RKT_STAMP) $(FTST_ACE_MAIN_IMAGE) $(FTST_ACE_SIDEKICK_IMAGE) $(FTST_SS1_STAMP) | $(FTST_TEST_TMP) $(FTST_RKT_PATH) $(FTST_STAGE1_ALL_FLAVOR_SYMLINKS)
 	$(VQ) \
 	$(call vb,vt,GO TEST,$(REPO_PATH)/tests) \
-	sudo RKT_STAGE1_DEFAULT_FLAVOR="$(RKT_STAGE1_DEFAULT_FLAVOR)" RKT="$(FTST_RKT_PATH)" ACTOOL="$(ACTOOL)" RKT_INSPECT_IMAGE="$(FTST_IMAGE)" RKT_EMPTY_IMAGE="$(FTST_EMPTY_IMAGE)" RKT_ACE_MAIN_IMAGE=$(FTST_ACE_MAIN_IMAGE) RKT_ACE_SIDEKICK_IMAGE=$(FTST_ACE_SIDEKICK_IMAGE) FUNCTIONAL_TMP="$(FTST_TEST_TMP)" INSPECT_BINARY="$(FTST_INSPECT_BINARY)" STUB_STAGE1="$(FTST_SS1_IMAGE)" $(GO_ENV) "$(ABS_GO)" test -tags $(RKT_STAGE1_DEFAULT_FLAVOR) -timeout 30m -v $(GO_TEST_FUNC_ARGS) $(REPO_PATH)/tests
+	sudo RKT_STAGE1_DEFAULT_FLAVOR="$(RKT_STAGE1_DEFAULT_FLAVOR)" RKT="$(FTST_RKT_PATH)" ACTOOL="$(ACTOOL)" RKT_INSPECT_IMAGE="$(FTST_IMAGE)" RKT_EMPTY_IMAGE="$(FTST_EMPTY_IMAGE)" RKT_ACE_MAIN_IMAGE=$(FTST_ACE_MAIN_IMAGE) RKT_ACE_SIDEKICK_IMAGE=$(FTST_ACE_SIDEKICK_IMAGE) FUNCTIONAL_TMP="$(FTST_TEST_TMP)" INSPECT_BINARY="$(FTST_INSPECT_BINARY)" STUB_STAGE1="$(FTST_SS1_IMAGE)" $(GO_ENV) "$(ABS_GO)" test -tags $(RKT_STAGE1_DEFAULT_FLAVOR) -timeout 45m -v $(GO_TEST_FUNC_ARGS) $(REPO_PATH)/tests
 
 $(call forward-vars,$(FTST_IMAGE), \
 	FTST_IMAGE_ROOTFSDIR ACTOOL FTST_IMAGE_DIR)

From 78091ebc0f2452bb03485c680bae15ee824752bb Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 18 May 2016 10:07:22 +0200
Subject: [PATCH 0279/1304] build: only ignore specific sub-directories in
 `dist`

Refine `.gitignore` to only ignore bash_completion and manpages
artifacts. Reinstate the toplevel `dist` directory, as it contains
some other tracked data.
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c432aeeeb2..bda6043d3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,6 @@
 /config.log
 /config.status
 /configure
-/dist
+/dist/bash_completion
+/dist/manpages
 /tags

From a9550dd44c474898aa1ee34e5b035d61de58ce13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Tue, 17 May 2016 16:11:38 +0200
Subject: [PATCH 0280/1304] Transforming flannel network in kvmTeardown

---
 networking/kvm.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/networking/kvm.go b/networking/kvm.go
index cf2a5ef4e5..f8af5b5bc8 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -569,6 +569,13 @@ extend Networking struct with methods to clean up kvm specific network configura
 // removing tuntap interface and releasing its ip from IPAM plugin
 func (n *Networking) teardownKvmNets() {
 	for _, an := range n.nets {
+		if an.conf.Type == "flannel" {
+			if err := kvmTransformFlannelNetwork(&an); err != nil {
+				stderr.PrintE("error transforming flannel network", err)
+				continue
+			}
+		}
+
 		switch an.conf.Type {
 		case "ptp", "bridge":
 			// remove tuntap interface

From 6d57e40ec909824cc1be5207e1b816c580f7fc70 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 18 May 2016 11:06:40 +0200
Subject: [PATCH 0281/1304] build: fix building on non-English locales

`depsgen` works on file lists and globs, consuming `stat` output
to calculate dependencies. This commit adds an explicit C locale
setting to avoid build failures on non-English locales.
---
 tools/depsgen/globcmd.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/depsgen/globcmd.go b/tools/depsgen/globcmd.go
index 7a66751249..a54bd22b72 100644
--- a/tools/depsgen/globcmd.go
+++ b/tools/depsgen/globcmd.go
@@ -31,7 +31,7 @@ const (
 	// given set of wildcards. See globMakeWildcard.
 	globMakeFunction = `$(strip \
         $(eval _DEPS_GEN_FG_ := $(strip !!!WILDCARDS!!!)) \
-        $(if $(_DEPS_GEN_FG_),$(shell stat --format "%n: %F" $(_DEPS_GEN_FG_) | grep -e 'regular file$$' | cut -f1 -d:)))
+        $(if $(_DEPS_GEN_FG_),$(shell LC_ALL=C stat --format "%n: %F" $(_DEPS_GEN_FG_) | grep -e 'regular file$$' | cut -f1 -d:)))
 `
 	// globMakeWildcard is a template for call wildcard function
 	// for in a given directory with a given suffix. This wildcard

From a78ad02dc663ed3c9b591577d926544c15c64876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 18 May 2016 10:12:26 +0200
Subject: [PATCH 0282/1304] Documentation: document per-app logs

Also, update logs examples.
---
 Documentation/commands.md | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 4786242554..3c6258b5a0 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -92,7 +92,7 @@ To read the logs of a running pod, get the pod's machine name from `machinectl`:
 ```
 $ machinectl
 MACHINE                                  CLASS     SERVICE
-rkt-132f9d56-0e3f-4d1e-ba86-68efd488bb62 container nspawn
+rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4 container rkt
 
 1 machines listed.
 ```
@@ -100,16 +100,27 @@ rkt-132f9d56-0e3f-4d1e-ba86-68efd488bb62 container nspawn
 or `rkt list --full`
 
 ```
-# rkt list --full
-UUID					APP	IMAGE NAME		IMAGE ID		STATE	NETWORKS
-132f9d56-0e3f-4d1e-ba86-68efd488bb62	etcd	coreos.com/etcd:v2.0.10 sha512-c03b055d02e5	running
+$ rkt list --full
+UUID                                  APP    IMAGE NAME                              IMAGE ID             STATE    CREATED                             STARTED                             NETWORKS
+bc3c1451-2e81-45c6-aeb0-807db44e31b4  etcd   coreos.com/etcd:v2.3.4                  sha512-7f05a10f6d2c  running  2016-05-18 10:07:35.312 +0200 CEST  2016-05-18 10:07:35.405 +0200 CEST  default:ip4=172.16.28.83
+                                      redis  registry-1.docker.io/library/redis:3.2  sha512-6eaaf936bc76
 ```
 
 The pod's machine name will be the pod's UUID prefixed with `rkt-`.
 Given this machine name, logs can be retrieved by `journalctl`:
 
 ```
-# journalctl -M rkt-132f9d56-0e3f-4d1e-ba86-68efd488bb62
+$ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4
+[...]
+```
+
+To get logs from one app in the pod:
 
+```
+$ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4 -t etcd
+[...]
+$ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4 -t redis
 [...]
 ```
+
+Additionaly, logs can be programmatically accessed via the [sd-journal API](https://www.freedesktop.org/software/systemd/man/sd-journal.html).

From 9732ab555cacc014821839f0938cfcf6988da3e5 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 18 May 2016 14:22:57 +0200
Subject: [PATCH 0283/1304] tests/config: implement functional tests

This commit introduces functional tests for the config subcommand.

Fixes partially #2410
---
 tests/rkt_api_service_test.go |   1 +
 tests/rkt_auth_test.go        |  37 +--
 tests/rkt_config_test.go      | 483 ++++++++++++++++++++++++++++++++++
 tests/rkt_tests.go            |  48 ++++
 tests/testutils/ctx.go        |   5 +
 5 files changed, 547 insertions(+), 27 deletions(-)
 create mode 100644 tests/rkt_config_test.go

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index fe41f42aec..201de5017d 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -301,6 +301,7 @@ func TestAPIServiceGetInfo(t *testing.T) {
 		Dir:             ctx.DataDir(),
 		SystemConfigDir: ctx.SystemDir(),
 		LocalConfigDir:  ctx.LocalDir(),
+		UserConfigDir:   ctx.UserDir(),
 		InsecureFlags:   "none",
 	}
 	if !reflect.DeepEqual(resp.Info.GlobalFlags, expectedGlobalFlags) {
diff --git a/tests/rkt_auth_test.go b/tests/rkt_auth_test.go
index e1e28b03d6..f4c1c49e24 100644
--- a/tests/rkt_auth_test.go
+++ b/tests/rkt_auth_test.go
@@ -18,7 +18,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -91,9 +90,9 @@ func testAuthGeneric(t *testing.T, auth taas.AuthType, tests []genericAuthTest)
 		case authConfDirNone:
 			// no config to write
 		case authConfDirLocal:
-			writeConfig(t, ctx.LocalDir(), "test.json", server.Conf)
+			writeConfig(t, authDir(ctx.LocalDir()), "test.json", server.Conf)
 		case authConfDirSystem:
-			writeConfig(t, ctx.SystemDir(), "test.json", server.Conf)
+			writeConfig(t, authDir(ctx.SystemDir()), "test.json", server.Conf)
 		default:
 			panic("Wrong config directory")
 		}
@@ -118,9 +117,9 @@ func TestAuthOverride(t *testing.T) {
 		{getInvalidOAuthConfig(server.Conf), server.Conf, "invalid-system-valid-local", authFailedDownload, authSuccessfulDownload},
 	}
 	for _, tt := range tests {
-		writeConfig(t, ctx.SystemDir(), "test.json", tt.systemConfig)
+		writeConfig(t, authDir(ctx.SystemDir()), "test.json", tt.systemConfig)
 		expectedRunRkt(ctx, t, server.URL, tt.name+"-1", tt.resultBeforeOverride)
-		writeConfig(t, ctx.LocalDir(), "test.json", tt.localConfig)
+		writeConfig(t, authDir(ctx.LocalDir()), "test.json", tt.localConfig)
 		expectedRunRkt(ctx, t, server.URL, tt.name+"-2", tt.resultAfterOverride)
 		ctx.Reset()
 	}
@@ -136,10 +135,10 @@ func TestAuthIgnore(t *testing.T) {
 func testAuthIgnoreBogusFiles(t *testing.T, server *taas.Server) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
-	writeConfig(t, ctx.SystemDir(), "README", "This is system config")
-	writeConfig(t, ctx.LocalDir(), "README", "This is local config")
-	writeConfig(t, ctx.SystemDir(), "test.notjson", server.Conf)
-	writeConfig(t, ctx.LocalDir(), "test.notjson", server.Conf)
+	writeConfig(t, authDir(ctx.SystemDir()), "README", "This is system config")
+	writeConfig(t, authDir(ctx.LocalDir()), "README", "This is local config")
+	writeConfig(t, authDir(ctx.SystemDir()), "test.notjson", server.Conf)
+	writeConfig(t, authDir(ctx.LocalDir()), "test.notjson", server.Conf)
 	expectedRunRkt(ctx, t, server.URL, "oauth-bogus-files", authFailedDownload)
 }
 
@@ -148,8 +147,8 @@ func testAuthIgnoreSubdirectories(t *testing.T, server *taas.Server) {
 	defer ctx.Cleanup()
 	localSubdir := filepath.Join(ctx.LocalDir(), "subdir")
 	systemSubdir := filepath.Join(ctx.SystemDir(), "subdir")
-	writeConfig(t, localSubdir, "test.json", server.Conf)
-	writeConfig(t, systemSubdir, "test.json", server.Conf)
+	writeConfig(t, authDir(localSubdir), "test.json", server.Conf)
+	writeConfig(t, authDir(systemSubdir), "test.json", server.Conf)
 	expectedRunRkt(ctx, t, server.URL, "oauth-subdirectories", authFailedDownload)
 }
 
@@ -194,22 +193,6 @@ func expectedRunRkt(ctx *testutils.RktRunCtx, t *testing.T, host, testName, line
 	}
 }
 
-func writeConfig(t *testing.T, baseDir, filename, contents string) {
-	dir := authDir(baseDir)
-	if err := os.MkdirAll(dir, 0755); err != nil {
-		t.Fatalf("Failed to create config directory %q: %v", dir, err)
-	}
-	path := filepath.Join(dir, filename)
-	os.Remove(path)
-	if err := ioutil.WriteFile(path, []byte(contents), 0644); err != nil {
-		t.Fatalf("Failed to write file %q: %v", path, err)
-	}
-}
-
-func authDir(confDir string) string {
-	return filepath.Join(confDir, "auth.d")
-}
-
 func getInvalidOAuthConfig(conf string) string {
 	return strings.Replace(conf, "sometoken", "someobviouslywrongtoken", 1)
 }
diff --git a/tests/rkt_config_test.go b/tests/rkt_config_test.go
new file mode 100644
index 0000000000..00a85e91fa
--- /dev/null
+++ b/tests/rkt_config_test.go
@@ -0,0 +1,483 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src kvm
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+type basic struct {
+	User     string `json:"user"`
+	Password string `json:"password"`
+}
+
+type oauth struct {
+	Token string `json:"token"`
+}
+
+type credentials struct {
+	*basic
+	*oauth
+}
+
+type auth struct {
+	Type        string      `json:"type,omitempty"`
+	Registries  []string    `json:"registries,omitempty"`
+	Domains     []string    `json:"domains,omitempty"`
+	Credentials credentials `json:"credentials"`
+}
+
+type paths struct {
+	Data         string `json:"data,omitempty"`
+	Stage1Images string `json:"stage1-images,omitempty"`
+}
+
+type stage1 struct {
+	Name     string `json:"name,omitempty"`
+	Version  string `json:"version,omitempty"`
+	Location string `json:"location,omitempty"`
+}
+
+type cfg struct {
+	*auth
+	*paths
+	*stage1
+
+	RktVersion string `json:"rktVersion"`
+	RktKind    string `json:"rktKind"`
+}
+
+type stageCfg struct {
+	Stage0 []cfg `json:"stage0"`
+}
+
+func (s stageCfg) search(x cfg) int {
+	var c cfg
+	var i int
+
+	for i, c = range s.Stage0 {
+		if reflect.DeepEqual(c, x) {
+			return i
+		}
+	}
+
+	return -1
+}
+
+func TestConfig(t *testing.T) {
+	for i, tt := range []struct {
+		configFunc func(*testutils.RktRunCtx)
+		expected   []cfg
+	}{
+		{ // one auth domain
+			configFunc: func(ctx *testutils.RktRunCtx) {
+				writeConfig(t, authDir(ctx.LocalDir()), "basic.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "auth",
+						auth: &auth{
+							Type:    "basic",
+							Domains: []string{"coreos.com"},
+							Credentials: credentials{
+								basic: &basic{"user", "userPassword"},
+							},
+						},
+					},
+				))
+			},
+			expected: []cfg{
+				{
+					RktVersion: "v1",
+					RktKind:    "auth",
+					auth: &auth{
+						Type:    "basic",
+						Domains: []string{"coreos.com"},
+						Credentials: credentials{
+							basic: &basic{"user", "userPassword"},
+						},
+					},
+				},
+			},
+		},
+
+		{ // one docker auth registry
+			configFunc: func(ctx *testutils.RktRunCtx) {
+				writeConfig(t, authDir(ctx.LocalDir()), "docker.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "dockerAuth",
+						auth: &auth{
+							Registries: []string{"quay.io"},
+							Credentials: credentials{
+								basic: &basic{"docker", "dockerPassword"},
+							},
+						},
+					},
+				))
+			},
+			expected: []cfg{
+				{
+					RktVersion: "v1",
+					RktKind:    "dockerAuth",
+					auth: &auth{
+						Registries: []string{"quay.io"},
+						Credentials: credentials{
+							basic: &basic{"docker", "dockerPassword"},
+						},
+					},
+				},
+			},
+		},
+
+		{ // one paths entry
+			configFunc: func(ctx *testutils.RktRunCtx) {
+				writeConfig(t, pathsDir(ctx.LocalDir()), "paths.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "paths",
+						paths: &paths{
+							Data:         "/home/me/rkt/data",
+							Stage1Images: "/home/me/rkt/stage1-images",
+						},
+					},
+				))
+			},
+			expected: []cfg{
+				{
+					RktVersion: "v1",
+					RktKind:    "paths",
+					paths: &paths{
+						Data:         "/home/me/rkt/data",
+						Stage1Images: "/home/me/rkt/stage1-images",
+					},
+				},
+			},
+		},
+
+		{ // overwrite paths entry in user dir
+			configFunc: func(ctx *testutils.RktRunCtx) {
+				writeConfig(t, pathsDir(ctx.SystemDir()), "paths.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "paths",
+						paths: &paths{
+							Data:         "/usr/lib/rkt/data",
+							Stage1Images: "/usr/lib/rkt/stage1-images",
+						},
+					},
+				))
+				writeConfig(t, pathsDir(ctx.UserDir()), "paths.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "paths",
+						paths: &paths{
+							Data: "/home/me/rkt/data",
+						},
+					},
+				))
+			},
+			expected: []cfg{
+				{
+					RktVersion: "v1",
+					RktKind:    "paths",
+					paths: &paths{
+						Data:         "/home/me/rkt/data",
+						Stage1Images: "/usr/lib/rkt/stage1-images",
+					},
+				},
+			},
+		},
+
+		{ // one stage1 entry
+			configFunc: func(ctx *testutils.RktRunCtx) {
+				writeConfig(t, stage1Dir(ctx.LocalDir()), "stage1.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "stage1",
+						stage1: &stage1{
+							Name:     "example.com/rkt/stage1",
+							Version:  "1.2.3",
+							Location: "http://example.com/download/stage1.aci",
+						},
+					},
+				))
+			},
+			expected: []cfg{
+				{
+					RktVersion: "v1",
+					RktKind:    "stage1",
+					stage1: &stage1{
+						Name:     "example.com/rkt/stage1",
+						Version:  "1.2.3",
+						Location: "http://example.com/download/stage1.aci",
+					},
+				},
+			},
+		},
+
+		{ // overwrite stage1 entry
+			configFunc: func(ctx *testutils.RktRunCtx) {
+				writeConfig(t, stage1Dir(ctx.LocalDir()), "stage1.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "stage1",
+						stage1: &stage1{
+							Name:     "example.com/rkt/stage1",
+							Version:  "1.2.3",
+							Location: "http://example.com/download/stage1.aci",
+						},
+					},
+				))
+				writeConfig(t, stage1Dir(ctx.UserDir()), "stage1.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "stage1",
+						stage1: &stage1{
+							Location: "http://localhost:8080/stage1.aci",
+						},
+					},
+				))
+			},
+			expected: []cfg{
+				{
+					RktVersion: "v1",
+					RktKind:    "stage1",
+					stage1: &stage1{
+						Name:     "example.com/rkt/stage1",
+						Version:  "1.2.3",
+						Location: "http://localhost:8080/stage1.aci",
+					},
+				},
+			},
+		},
+
+		{ // two auth domains, two docker registries
+			configFunc: func(ctx *testutils.RktRunCtx) {
+				writeConfig(t, authDir(ctx.UserDir()), "basic.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "auth",
+						auth: &auth{
+							Type:    "basic",
+							Domains: []string{"tectonic.com", "coreos.com"},
+							Credentials: credentials{
+								basic: &basic{"user", "userPassword"},
+							},
+						},
+					},
+				))
+				writeConfig(t, authDir(ctx.UserDir()), "docker.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "dockerAuth",
+						auth: &auth{
+							Registries: []string{"quay.io", "gcr.io"},
+							Credentials: credentials{
+								basic: &basic{"docker", "dockerPassword"},
+							},
+						},
+					},
+				))
+			},
+			expected: []cfg{
+				{
+					RktVersion: "v1",
+					RktKind:    "auth",
+					auth: &auth{
+						Type:    "basic",
+						Domains: []string{"tectonic.com"},
+						Credentials: credentials{
+							basic: &basic{"user", "userPassword"},
+						},
+					},
+				},
+				{
+					RktVersion: "v1",
+					RktKind:    "auth",
+					auth: &auth{
+						Type:    "basic",
+						Domains: []string{"coreos.com"},
+						Credentials: credentials{
+							basic: &basic{"user", "userPassword"},
+						},
+					},
+				},
+				{
+					RktVersion: "v1",
+					RktKind:    "dockerAuth",
+					auth: &auth{
+						Registries: []string{"quay.io"},
+						Credentials: credentials{
+							basic: &basic{"docker", "dockerPassword"},
+						},
+					},
+				},
+				{
+					RktVersion: "v1",
+					RktKind:    "dockerAuth",
+					auth: &auth{
+						Registries: []string{"gcr.io"},
+						Credentials: credentials{
+							basic: &basic{"docker", "dockerPassword"},
+						},
+					},
+				},
+			},
+		},
+
+		{ // overwrite one auth domain, one dockerAuth registry in user dir
+			configFunc: func(ctx *testutils.RktRunCtx) {
+				writeConfig(t, authDir(ctx.SystemDir()), "basic.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "auth",
+						auth: &auth{
+							Type:    "basic",
+							Domains: []string{"tectonic.com", "coreos.com"},
+							Credentials: credentials{
+								basic: &basic{"user", "userPassword"},
+							},
+						},
+					},
+				))
+
+				writeConfig(t, authDir(ctx.UserDir()), "basic.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "auth",
+						auth: &auth{
+							Type:    "oauth",
+							Domains: []string{"tectonic.com"},
+							Credentials: credentials{
+								oauth: &oauth{"someToken"},
+							},
+						},
+					},
+				))
+
+				writeConfig(t, authDir(ctx.SystemDir()), "docker.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "dockerAuth",
+						auth: &auth{
+							Registries: []string{"quay.io", "gcr.io"},
+							Credentials: credentials{
+								basic: &basic{"docker", "dockerPassword"},
+							},
+						},
+					},
+				))
+
+				writeConfig(t, authDir(ctx.UserDir()), "docker.json", mustMarshalJSON(
+					cfg{
+						RktVersion: "v1",
+						RktKind:    "dockerAuth",
+						auth: &auth{
+							Registries: []string{"gcr.io"},
+							Credentials: credentials{
+								basic: &basic{"over", "written"},
+							},
+						},
+					},
+				))
+			},
+			expected: []cfg{
+				{
+					RktVersion: "v1",
+					RktKind:    "auth",
+					auth: &auth{
+						Type:    "oauth",
+						Domains: []string{"tectonic.com"},
+						Credentials: credentials{
+							oauth: &oauth{"someToken"},
+						},
+					},
+				},
+				{
+					RktVersion: "v1",
+					RktKind:    "auth",
+					auth: &auth{
+						Type:    "basic",
+						Domains: []string{"coreos.com"},
+						Credentials: credentials{
+							basic: &basic{"user", "userPassword"},
+						},
+					},
+				},
+				{
+					RktVersion: "v1",
+					RktKind:    "dockerAuth",
+					auth: &auth{
+						Registries: []string{"quay.io"},
+						Credentials: credentials{
+							basic: &basic{"docker", "dockerPassword"},
+						},
+					},
+				},
+				{
+					RktVersion: "v1",
+					RktKind:    "dockerAuth",
+					auth: &auth{
+						Registries: []string{"gcr.io"},
+						Credentials: credentials{
+							basic: &basic{"over", "written"},
+						},
+					},
+				},
+			},
+		},
+	} {
+		func() {
+			ctx := testutils.NewRktRunCtx()
+			defer ctx.Cleanup()
+
+			tt.configFunc(ctx)
+
+			rktCmd := ctx.Cmd() + " --debug --insecure-options=image config"
+			out, status := runRkt(t, rktCmd, nobodyUid, 0)
+
+			if status != 0 {
+				panic(fmt.Errorf("test %d: expected exit status code 0, got %d", i, status))
+			}
+
+			var got stageCfg
+			if err := json.Unmarshal([]byte(out), &got); err != nil {
+				panic(err)
+			}
+
+			for ii, e := range tt.expected {
+				if got.search(e) < 0 {
+					t.Errorf("test %d, expected to find config %d but didn't", i, ii)
+				}
+			}
+		}()
+	}
+}
+
+func mustMarshalJSON(data interface{}) string {
+	buf, err := json.Marshal(data)
+	if err != nil {
+		panic(err)
+	}
+
+	return string(buf)
+}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 09f3fc878d..93d1670594 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -312,6 +312,31 @@ func runRktAsUidGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, exp
 	}
 }
 
+func runRkt(t *testing.T, rktCmd string, uid, gid int) (string, int) {
+	child, err := gexpect.Command(rktCmd)
+	if err != nil {
+		t.Fatalf("cannot exec rkt: %v", err)
+	}
+	if gid != 0 {
+		child.Cmd.SysProcAttr = &syscall.SysProcAttr{}
+		child.Cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}
+	}
+
+	err = child.Start()
+	if err != nil {
+		t.Fatalf("cannot start rkt: %v", err)
+	}
+
+	_, linesChan := child.AsyncInteractChannels()
+
+	var buf bytes.Buffer
+	for line := range linesChan {
+		buf.WriteString(line + "\n") // reappend newline
+	}
+
+	return buf.String(), getExitStatus(child.Wait())
+}
+
 func startRktAsGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, gid int) *gexpect.ExpectSubprocess {
 	child, err := gexpect.Command(rktCmd)
 	if err != nil {
@@ -733,3 +758,26 @@ func checkUserNS() error {
 	// Check if it really works
 	return exec.Command("/bin/bash", "-c", "unshare -U true").Run()
 }
+
+func authDir(confDir string) string {
+	return filepath.Join(confDir, "auth.d")
+}
+
+func pathsDir(confDir string) string {
+	return filepath.Join(confDir, "paths.d")
+}
+
+func stage1Dir(confDir string) string {
+	return filepath.Join(confDir, "stage1.d")
+}
+
+func writeConfig(t *testing.T, dir, filename, contents string) {
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		t.Fatalf("Failed to create config directory %q: %v", dir, err)
+	}
+	path := filepath.Join(dir, filename)
+	os.Remove(path)
+	if err := ioutil.WriteFile(path, []byte(contents), 0644); err != nil {
+		t.Fatalf("Failed to write file %q: %v", path, err)
+	}
+}
diff --git a/tests/testutils/ctx.go b/tests/testutils/ctx.go
index 5174cf76e0..65c969acc2 100644
--- a/tests/testutils/ctx.go
+++ b/tests/testutils/ctx.go
@@ -96,6 +96,7 @@ func NewRktRunCtx() *RktRunCtx {
 			newDirDesc("datadir-", "data", "dir"),
 			newDirDesc("localdir-", "local configuration", "local-config"),
 			newDirDesc("systemdir-", "system configuration", "system-config"),
+			newDirDesc("userdir-", "user configuration", "user-config"),
 		},
 	}
 }
@@ -121,6 +122,10 @@ func (ctx *RktRunCtx) SystemDir() string {
 	return ctx.dir(2)
 }
 
+func (ctx *RktRunCtx) UserDir() string {
+	return ctx.dir(3)
+}
+
 func (ctx *RktRunCtx) dir(idx int) string {
 	ctx.ensureValid()
 	if idx < len(ctx.directories) {

From f6372a067cb0a301a66e1a2a5c63c271b2fc90e6 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 18 May 2016 14:36:14 -0700
Subject: [PATCH 0284/1304] stage1: update CoreOS image signing key

---
 stage1/usr_from_coreos/cache.sh | 102 ++++++++++++++++++++++++--------
 1 file changed, 77 insertions(+), 25 deletions(-)

diff --git a/stage1/usr_from_coreos/cache.sh b/stage1/usr_from_coreos/cache.sh
index f0b0552f1d..15fbfd5fcd 100755
--- a/stage1/usr_from_coreos/cache.sh
+++ b/stage1/usr_from_coreos/cache.sh
@@ -11,6 +11,13 @@ if [ ${V} -eq 3 ]; then
 fi
 
 # coreos gpg signing key
+# pub   4096R/93D2DCB4 2013-09-06
+# uid       [ unknown] CoreOS Buildbot (Offical Builds) <buildbot@coreos.com>
+# sub   4096R/74E7E361 2013-09-06 [expired: 2014-09-06]
+# sub   4096R/E5676EFC 2014-09-08 [expired: 2015-09-08]
+# sub   4096R/1CB5FA26 2015-08-31 [expires: 2017-08-30]
+# sub   4096R/B58844F1 2015-11-20 [revoked: 2016-05-16]
+# sub   4096R/2E16137F 2016-05-16 [expires: 2017-05-16]
 GPG_LONG_ID="50E0885593D2DCB4"
 GPG_KEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v2
@@ -162,31 +169,76 @@ VGQ9BcAh8oxz1QcPQXr7TCk8+cikSemQrVmqJPq2rvdVpZIzF91ZCpAfT28e0y/a
 DxbrfS83Ytk+90dQOR8rStGNVnrwT/LeMn1ytV7oK8e2sIj1HFUYENQxy5jVjR3Q
 tcTbVoOYLvZ83/wanc4GaZnxZ7cJguuKFdqCR5kq4b7acjeQ8a76hrYI57Z+5JDs
 L+aOgGfCqCDx2IL/bRiwY1pNDfTCPhSSC054yydG3g6pUGk9Kpfj+oA8XrasvR+d
-D4d7a2cUZRKXU29817isfLNjqZMiJ/7LA11I6DeQgPaRK+kAEQEAAYkERAQYAQgA
-DwUCVk9/CAIbAgUJAeEzgAIpCRBQ4IhVk9LctMFdIAQZAQgABgUCVk9/CAAKCRCG
-M/sTtYhE8RLLD/0bK5unOEb1RsuzCqL7IWPr+Z6i7smZ0tmrTF58a3St64DjR3WY
-uv/RnhYyh8xCtBod7ZoIl2S+Azavevx22KWXPQgRtwhlCJFsnDoG9C5Kj0BqUrty
-k+9nlGeIMOUPjMJJocEaB9yHZs7J9KFNyqpEY7x2XW6HTDihsBdaOUu814g6C4gL
-iXydwbQMzU2Crefc1w/fWhSxjqiyUlKp571jeauWuUdtbQmwk/Kvq9yreHkEWN4M
-Hs2HuBwwBmbj0KDFFDA2u6oUvGlRTfwomTiryXDr1tOgiySucdFVrx+6zPBMcqlX
-qsVDsx8sr+u7PzIsHO9NT+P3wYQpmWhwKCjLX5KN6Xv3d0aAr7OYEacrED1sqndI
-fXjM5EcouLFtw/YESA7Px8iRggFVFDN0GY3hfoPJgHpiJj2KYyuVvNe8dXpsjOdP
-pFbhTPI1CoA12woT4vGtfxcI9u/uc7m5rQDJI+FCR9OtUYvtDUqtE/XYjqPXzkbg
-tRy+zwjpTTdxn48OaizVU3JOW+OQwW4q/4Wk6T6nzNTpQDHUmIdxsAAbZjBJwkE4
-Qkgtl8iUjS0hUX05ixLUwn0ZuGjeLcK9O/rqynPDqd9gdeKo5fTJ91RhJxoBSFcr
-j21tPOa0PhE/2Zza24AVZIX5+AweD9pie8QIkZLMk6yrvRFqs2YrHUrc5emkD/4l
-GsZpfSAKWCdc+iE5pL434yMlp73rhi+40mbCiXMOgavdWPZSDcVe+7fYENx0tqUy
-GZj2qKluOBtxTeovrsFVllF9fxzixBthKddA6IcDQdTb076t/Ez51jX1z/GRPzn8
-yWkDEvi3L9mfKtfuD4BRzjaVw8TtNzuFuwz2PQDDBtFXqYMklA67cdjvYdffO7Me
-yKlNjKAutXOr/Or70rKkk2wZLYtSeJIDRwUSsPdKncbGLEKvfoBKOcOmjfZKjnYp
-IDDNqAsMrJLIwyo+6NSUtq84Gba6QjPYLvJ9g4P299dIYzFxu/0Zy4q9QgfjJOav
-3GUQT1fRhqqRS11ffXFqClJKqsKSChcPhNhK5wt6Ab6PVbd9RQhI8ImLQ81PWn70
-8rOr1dQTQfPvJrHBBrEolUw/0y7SxPmQZUkYlXiT6bvsUa2n2f4ZzIgtYtZ5JSuo
-qcut/jmeUQE1TUUyG+9HVMfmhlhjNO0pDiFdSAgjk+DyTd5lUVz3tPGFliIDq7O/
-sgDq6xtSlGKvQt/gRoYstrillyxfIVqR10C2t2kCBXKSX3uQmbx3OaX8JtZ2uMjm
-KZb2iovfSf8qLSu49qrsNS9Etqvda0EXqaHeX+K8NjENoQEdXZUnBRJg9VVa0HkP
-iFSFIwF8IPWewm0DocZil66bp/wrHVsJkw7AwE/zJg==
-=0DIT
+D4d7a2cUZRKXU29817isfLNjqZMiJ/7LA11I6DeQgPaRK+kAEQEAAYkCHwQoAQgA
+CQUCVzocNwIdAgAKCRBQ4IhVk9LctGVfEADBBSjZq858OE932M9FUyt5fsYQ1p/O
+6zoHlCyGyyDdXNu2aDGvhjUVBd3RbjHW87FiiwggubZ/GidCSUmv/et26MAzqthl
+5CJgi0yvb5p2KeiJvbTPZEN+WVitAlEsmN5FuUzD2Q7BlBhFunwaN39A27f1r3av
+qfy6AoFsTIiYHVP85HscCaDYc2SpZNAJYV4ZcascuLye2UkUm3fSSaYLCjtlVg0m
+Wkcjp7rZFQxqlQqSjVGarozxOYgI+HgKaqYF9+zJsh+26kmyHRdQY+Pznpt+PXjt
+EQVsdzh5pqr4w4J8CnYTJKQQO4T08cfo13pfFzgqBGo4ftXOkLLDS3ZgFHgx00fg
+70MGYYAgNME7BJog+pO5vthwfhQO6pMT08axC8sAWD0wia362VDNG5Kg4TQHFARu
+Ao51e+NvxF8cGi0g1zBEfGMCFwlAlQOYcI9bpk1xx+Z8P3Y8dnpRdg8VK2ZRNsf/
+CggNXrgjQ2cEOrEsda5lG/NXbNqdDiygBHc1wgnoidABOHMT483WKMw3GBao3JLF
+L0njULRguJgTuyI9ie8HLH/vfYWXq7t5o5sYM+bxAiJDDX+F/dp+gbomXjDE/wJ/
+jFOz/7Cp9WoLYttpWFpWPl4UTDvfyPzn9kKT/57OC7OMFZH2a3LxwEfaGTgDOvA5
+QbxS5txqnkpPcokERAQYAQgADwUCVk9/CAIbAgUJAeEzgAIpCRBQ4IhVk9LctMFd
+IAQZAQgABgUCVk9/CAAKCRCGM/sTtYhE8RLLD/0bK5unOEb1RsuzCqL7IWPr+Z6i
+7smZ0tmrTF58a3St64DjR3WYuv/RnhYyh8xCtBod7ZoIl2S+Azavevx22KWXPQgR
+twhlCJFsnDoG9C5Kj0BqUrtyk+9nlGeIMOUPjMJJocEaB9yHZs7J9KFNyqpEY7x2
+XW6HTDihsBdaOUu814g6C4gLiXydwbQMzU2Crefc1w/fWhSxjqiyUlKp571jeauW
+uUdtbQmwk/Kvq9yreHkEWN4MHs2HuBwwBmbj0KDFFDA2u6oUvGlRTfwomTiryXDr
+1tOgiySucdFVrx+6zPBMcqlXqsVDsx8sr+u7PzIsHO9NT+P3wYQpmWhwKCjLX5KN
+6Xv3d0aAr7OYEacrED1sqndIfXjM5EcouLFtw/YESA7Px8iRggFVFDN0GY3hfoPJ
+gHpiJj2KYyuVvNe8dXpsjOdPpFbhTPI1CoA12woT4vGtfxcI9u/uc7m5rQDJI+FC
+R9OtUYvtDUqtE/XYjqPXzkbgtRy+zwjpTTdxn48OaizVU3JOW+OQwW4q/4Wk6T6n
+zNTpQDHUmIdxsAAbZjBJwkE4Qkgtl8iUjS0hUX05ixLUwn0ZuGjeLcK9O/rqynPD
+qd9gdeKo5fTJ91RhJxoBSFcrj21tPOa0PhE/2Zza24AVZIX5+AweD9pie8QIkZLM
+k6yrvRFqs2YrHUrc5emkD/4lGsZpfSAKWCdc+iE5pL434yMlp73rhi+40mbCiXMO
+gavdWPZSDcVe+7fYENx0tqUyGZj2qKluOBtxTeovrsFVllF9fxzixBthKddA6IcD
+QdTb076t/Ez51jX1z/GRPzn8yWkDEvi3L9mfKtfuD4BRzjaVw8TtNzuFuwz2PQDD
+BtFXqYMklA67cdjvYdffO7MeyKlNjKAutXOr/Or70rKkk2wZLYtSeJIDRwUSsPdK
+ncbGLEKvfoBKOcOmjfZKjnYpIDDNqAsMrJLIwyo+6NSUtq84Gba6QjPYLvJ9g4P2
+99dIYzFxu/0Zy4q9QgfjJOav3GUQT1fRhqqRS11ffXFqClJKqsKSChcPhNhK5wt6
+Ab6PVbd9RQhI8ImLQ81PWn708rOr1dQTQfPvJrHBBrEolUw/0y7SxPmQZUkYlXiT
+6bvsUa2n2f4ZzIgtYtZ5JSuoqcut/jmeUQE1TUUyG+9HVMfmhlhjNO0pDiFdSAgj
+k+DyTd5lUVz3tPGFliIDq7O/sgDq6xtSlGKvQt/gRoYstrillyxfIVqR10C2t2kC
+BXKSX3uQmbx3OaX8JtZ2uMjmKZb2iovfSf8qLSu49qrsNS9Etqvda0EXqaHeX+K8
+NjENoQEdXZUnBRJg9VVa0HkPiFSFIwF8IPWewm0DocZil66bp/wrHVsJkw7AwE/z
+JrkCDQRXOi4eARAA+cAKfT0IoViuCxqa6uPteVC8/qp8ZiEPri0neCt+khngPpCX
+9JseOyRJEzwt9+31XgzsCWlfW5BWrLBd3F4caRqucu3ZnE68Qtrw6kcOsJ8LSiok
+/uu1XnXW1mgpRxlu0i83YVM6+BrIXroP22SWVxkDkAXDlgvFmIvrh9TG43uSRjmg
+riSnJ7EOgDXDrZ5mTlnlGHb6EGpHJHoJsfp3JdBAh4oNGBBHf5fZZhBiUIJSGwbL
+g8oEzOuycNor9mEiJPaAyPm22braWRgvX7beOca60eNGIuQSZ8ML3G6rog/pNdbN
+gLf1hvrfl7NJCJJ0iB7BPYw8e5+xPEHNLrJI6NjFCbD0dlHnuq79ePc9bPQALa/6
+lIICOCAZJYDCf7S2dHqkHCOnr8F2A2qwAqP5IlVqdS7sSy7D9wDDYis7jlMw8vVW
+jqcL6MNxJDk3h/0ns7Ad5TNfJnLUnUbYWeH5QYbPsGgqQomhSWBvhCZkILnE7Rpb
+tjl55/CvTXN1L6jyi9qJeSoWORjwhTlACKDzlsLRTO24sM/KjKDajYrqU3CRVDQG
+gQL0yU3qDz/mql+awQAMUS9ckaf/ohBM8SrCandNvE/+as426Mf6/FH6R7kntJpp
+YQZJMwq0XlyueadWs8xrCjrXnXFijvrVkaZhlCfJRZPEdI76hGscRp8Sr6kAEQEA
+AYkERAQYAQgADwUCVzouHgIbAgUJAeEzgAIpCRBQ4IhVk9LctMFdIAQZAQgABgUC
+VzouHgAKCRBI+blqLhYTf6o8D/0WqjCOqB4rAv29MGpz5SZbk57TbQrKfjneSDVe
+CsvgofUBL6z9yA2jEanIh76Lo6r5ZnvF8I4pDImiRCjhZ+4vDOKaO5yvrNKruusr
++ZA6DDPwjlhnRPqW8Sm1YGl1VqAqQEjib4I7dbGb5qpR/PkAj64UDtLtbMfx6Zb9
+B9ZJvYEiWUbAEQWUohRhw6vT/qS07GrKgG35JFiJKrNPSFEh/YOLKq+vLVZwDKX9
+1Tvabs3MuNFIavuMiGaoqv4/JVRA1Iw3E9zCsXgFhIfQll4XvrrPXiGAllFzaqX2
+9PnvqMngjPRDTh+jHNUjFv8MNvhs1o3jc1pQAJT5JIpPQJJpbnNnrYoCJoBO0kfJ
+04zEDznHkuVbLRn2pxWsCrF2Agwm4GB3YSenEW8AKcmtS4ov0Yaw5csY3fXUDXjB
+aPR9dweNWT/kaY5V4NUwOutecnZ0o0yDc57GGIjFhTcULMdOCE6DbSTfljqcoAoP
+IydzQ4rlMdmTkiM5k2F/jDHCURersqF8Naro7Nx2fKokPrLKUst+pFBBwbeTO9tW
+EbOnl/ypHeRW9XA31sZ0yvvSwUrWnHC+UDpHPzvaAGleAOK7gGyJehVIw9BhgZB1
+LplkbkGgpS8L/3CAcaQ488MP5NK0peO+ED/ocNhi1tC/cHbLXtDiz/eG/1rIdxkO
+h3D61WiyD/42Oj2h4BHt5qTS12By95po4avzgqaV3PFYi9Rx6tBvzwnD7x2UeGk4
+wzFdb2V4LWoe6bqMokxbUMWJgP5faWDT6/urhBt4GYcBxX0b3l9qBs20hP5JVHGX
+208gOW5cjfHrTNiHiY4/CbQrbAdO24CUYZtYEmDNdHN+KHrlLLjkf0v5yGjVK2XB
+qs8l6upA7xBGHAF7U/XkLYrvyusqqWdvdGHGHthbLBzjceO+4N+lb6RyHRuF6kgb
+LdCcaKfCMUs/v1ZXgYGhdk7NWFHFDoF8DByHwluoihd10OudGPFg7ydTc6+V3kt9
+SN1/iQbk2/rHffI1tm28MfBvN+K/Da+Y+EAqTbUDHl6O30mSGZjLl1xJxvWoezU9
+8TdPCxy7L9XRFfqZlBJAo8cxRIPHpqKIaRy0wn616xCDfUSQ9NBLlDITL4d7tNvD
+C9hLpehFKMKIEct5WDfaQIWQe2o1fjVsU2Is2wXVmdi9A7X3q7yWVA766zQTxQO6
+1TcgyoJM9k2DxncsmwXIa8oD6KP4VYtrtsx8r4VXPEjHucCjPe+qgyY65wBPXSl5
+U21AiUuGGegFQwRD6L7ZqT3K5JLDlK/kkaV3l8i0onfJ+5CytOB2T6QPQnJ4Ynch
+K9w3EiyDrgzl0IpotQXxOBGHoCtcxUZvkNeOIxAb8QwkWnhgkljMyQ==
+=nV4h
 -----END PGP PUBLIC KEY BLOCK-----
 "
 

From 431af6cde3f3448d9321ae654eb1dcab97e433e5 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 19 May 2016 16:49:18 +0200
Subject: [PATCH 0285/1304] tests: TestServiceFile: increase timeout to 15s

TestServiceFile was previously waiting 10 seconds. In our test on Fedora
23, it was taking 11 seconds. This made the test fail. This patch
increases the delay to 15 seconds. It should be enough.
---
 tests/rkt_service_file_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_service_file_test.go b/tests/rkt_service_file_test.go
index 0c8bad6ef0..3f7cc98a17 100644
--- a/tests/rkt_service_file_test.go
+++ b/tests/rkt_service_file_test.go
@@ -88,8 +88,8 @@ func TestServiceFile(t *testing.T) {
 		t.Fatalf("Test unit not found in list")
 	}
 
-	// Run the unit for 10 seconds. You can check the logs manually in journalctl
-	time.Sleep(10 * time.Second)
+	// Run the unit for 15 seconds. You can check the logs manually in journalctl
+	time.Sleep(15 * time.Second)
 
 	// Stop the unit
 	_, err = conn.StopUnit(target, "replace", reschan)

From 6a355ebefec9feca918673f64f447991ec19d17f Mon Sep 17 00:00:00 2001
From: Alex Hornung <alex@alexhornung.com>
Date: Thu, 14 Apr 2016 22:13:56 +0100
Subject: [PATCH 0286/1304] config: add AWS authentication mechanism

This adds support for AWS authentication as a config auth mechanism to
be able to, for example, access private Amazon S3 buckets.

Fixes: #2161
---
 Documentation/configuration.md                |  22 +-
 Godeps/Godeps.json                            |  90 ++
 .../src/github.com/aws/aws-sdk-go/LICENSE.txt | 202 +++++
 .../src/github.com/aws/aws-sdk-go/NOTICE.txt  |   3 +
 .../aws/aws-sdk-go/aws/awserr/error.go        | 124 +++
 .../aws/aws-sdk-go/aws/awserr/types.go        | 197 ++++
 .../aws/aws-sdk-go/aws/awsutil/copy.go        | 100 +++
 .../aws/aws-sdk-go/aws/awsutil/equal.go       |  27 +
 .../aws/aws-sdk-go/aws/awsutil/path_value.go  | 222 +++++
 .../aws/aws-sdk-go/aws/awsutil/prettify.go    | 103 +++
 .../aws-sdk-go/aws/awsutil/string_value.go    |  89 ++
 .../aws/client/metadata/client_info.go        |  12 +
 .../github.com/aws/aws-sdk-go/aws/config.go   | 311 +++++++
 .../aws/aws-sdk-go/aws/convert_types.go       | 357 ++++++++
 .../aws/credentials/chain_provider.go         | 100 +++
 .../aws-sdk-go/aws/credentials/credentials.go | 223 +++++
 .../aws/credentials/env_provider.go           |  77 ++
 .../aws-sdk-go/aws/credentials/example.ini    |  12 +
 .../shared_credentials_provider.go            | 151 ++++
 .../aws/credentials/static_provider.go        |  48 +
 .../github.com/aws/aws-sdk-go/aws/errors.go   |  17 +
 .../github.com/aws/aws-sdk-go/aws/logger.go   | 112 +++
 .../aws/aws-sdk-go/aws/request/handlers.go    | 187 ++++
 .../aws/aws-sdk-go/aws/request/request.go     | 302 +++++++
 .../aws/request/request_pagination.go         | 104 +++
 .../aws/aws-sdk-go/aws/request/retryer.go     |  82 ++
 .../github.com/aws/aws-sdk-go/aws/types.go    |  88 ++
 .../github.com/aws/aws-sdk-go/aws/version.go  |   8 +
 .../aws-sdk-go/private/protocol/rest/build.go | 257 ++++++
 .../private/protocol/rest/payload.go          |  45 +
 .../private/protocol/rest/unmarshal.go        | 193 ++++
 .../private/signer/v4/header_rules.go         |  82 ++
 .../aws/aws-sdk-go/private/signer/v4/v4.go    | 438 +++++++++
 .../src/github.com/go-ini/ini/.gitignore      |   4 +
 .../src/github.com/go-ini/ini/LICENSE         | 191 ++++
 .../src/github.com/go-ini/ini/Makefile        |  12 +
 .../src/github.com/go-ini/ini/README.md       | 632 +++++++++++++
 .../src/github.com/go-ini/ini/README_ZH.md    | 619 +++++++++++++
 .../src/github.com/go-ini/ini/ini.go          | 465 ++++++++++
 .../src/github.com/go-ini/ini/key.go          | 616 +++++++++++++
 .../src/github.com/go-ini/ini/parser.go       | 312 +++++++
 .../src/github.com/go-ini/ini/section.go      | 177 ++++
 .../src/github.com/go-ini/ini/struct.go       | 351 ++++++++
 .../src/github.com/gopherjs/gopherjs/LICENSE  |  24 +
 .../src/github.com/gopherjs/gopherjs/js/js.go | 168 ++++
 .../jmespath/go-jmespath/.gitignore           |   4 +
 .../jmespath/go-jmespath/.travis.yml          |   9 +
 .../github.com/jmespath/go-jmespath/LICENSE   |  13 +
 .../github.com/jmespath/go-jmespath/Makefile  |  44 +
 .../github.com/jmespath/go-jmespath/README.md |   7 +
 .../github.com/jmespath/go-jmespath/api.go    |  49 +
 .../go-jmespath/astnodetype_string.go         |  16 +
 .../jmespath/go-jmespath/functions.go         | 842 ++++++++++++++++++
 .../jmespath/go-jmespath/interpreter.go       | 418 +++++++++
 .../github.com/jmespath/go-jmespath/lexer.go  | 420 +++++++++
 .../github.com/jmespath/go-jmespath/parser.go | 603 +++++++++++++
 .../jmespath/go-jmespath/toktype_string.go    |  16 +
 .../github.com/jmespath/go-jmespath/util.go   | 185 ++++
 .../src/github.com/jtolds/gls/LICENSE         |  18 +
 .../src/github.com/jtolds/gls/README.md       |  89 ++
 .../src/github.com/jtolds/gls/context.go      | 144 +++
 .../src/github.com/jtolds/gls/gen_sym.go      |  13 +
 .../src/github.com/jtolds/gls/id_pool.go      |  34 +
 .../src/github.com/jtolds/gls/stack_tags.go   |  43 +
 .../github.com/jtolds/gls/stack_tags_js.go    | 101 +++
 .../github.com/jtolds/gls/stack_tags_main.go  |  61 ++
 .../smartystreets/assertions/.gitignore       |   3 +
 .../smartystreets/assertions/.travis.yml      |  14 +
 .../smartystreets/assertions/CONTRIBUTING.md  |  12 +
 .../smartystreets/assertions/LICENSE.md       |  23 +
 .../smartystreets/assertions/README.md        | 575 ++++++++++++
 .../assertions/assertions.goconvey            |   3 +
 .../smartystreets/assertions/collections.go   | 244 +++++
 .../smartystreets/assertions/doc.go           | 105 +++
 .../smartystreets/assertions/equality.go      | 280 ++++++
 .../smartystreets/assertions/filter.go        |  23 +
 .../internal/go-render/render/render.go       | 477 ++++++++++
 .../internal/oglematchers/.gitignore          |   5 +
 .../internal/oglematchers/.travis.yml         |   4 +
 .../assertions/internal/oglematchers/LICENSE  | 202 +++++
 .../internal/oglematchers/README.md           |  58 ++
 .../internal/oglematchers/all_of.go           |  70 ++
 .../assertions/internal/oglematchers/any.go   |  32 +
 .../internal/oglematchers/any_of.go           |  94 ++
 .../internal/oglematchers/contains.go         |  61 ++
 .../internal/oglematchers/deep_equals.go      |  88 ++
 .../internal/oglematchers/elements_are.go     |  91 ++
 .../internal/oglematchers/equals.go           | 541 +++++++++++
 .../assertions/internal/oglematchers/error.go |  51 ++
 .../internal/oglematchers/greater_or_equal.go |  39 +
 .../internal/oglematchers/greater_than.go     |  39 +
 .../internal/oglematchers/has_same_type_as.go |  37 +
 .../internal/oglematchers/has_substr.go       |  46 +
 .../internal/oglematchers/identical_to.go     | 134 +++
 .../internal/oglematchers/less_or_equal.go    |  41 +
 .../internal/oglematchers/less_than.go        | 152 ++++
 .../internal/oglematchers/matcher.go          |  86 ++
 .../internal/oglematchers/matches_regexp.go   |  69 ++
 .../internal/oglematchers/new_matcher.go      |  43 +
 .../assertions/internal/oglematchers/not.go   |  53 ++
 .../internal/oglematchers/panics.go           |  74 ++
 .../internal/oglematchers/pointee.go          |  65 ++
 .../oglematchers/transform_description.go     |  36 +
 .../smartystreets/assertions/messages.go      |  93 ++
 .../smartystreets/assertions/panic.go         | 115 +++
 .../smartystreets/assertions/quantity.go      | 141 +++
 .../smartystreets/assertions/serializer.go    |  69 ++
 .../smartystreets/assertions/strings.go       | 227 +++++
 .../smartystreets/assertions/time.go          | 202 +++++
 .../smartystreets/assertions/type.go          | 112 +++
 .../smartystreets/goconvey/LICENSE.md         |  23 +
 .../goconvey/convey/assertions.go             |  68 ++
 .../smartystreets/goconvey/convey/context.go  | 272 ++++++
 .../goconvey/convey/convey.goconvey           |   4 +
 .../goconvey/convey/discovery.go              | 103 +++
 .../smartystreets/goconvey/convey/doc.go      | 218 +++++
 .../goconvey/convey/gotest/utils.go           |  28 +
 .../smartystreets/goconvey/convey/init.go     |  81 ++
 .../goconvey/convey/nilReporter.go            |  15 +
 .../goconvey/convey/reporting/console.go      |  16 +
 .../goconvey/convey/reporting/doc.go          |   5 +
 .../goconvey/convey/reporting/dot.go          |  40 +
 .../goconvey/convey/reporting/gotest.go       |  33 +
 .../goconvey/convey/reporting/init.go         |  94 ++
 .../goconvey/convey/reporting/json.go         |  88 ++
 .../goconvey/convey/reporting/printer.go      |  57 ++
 .../goconvey/convey/reporting/problems.go     |  80 ++
 .../goconvey/convey/reporting/reporter.go     |  39 +
 .../convey/reporting/reporting.goconvey       |   2 +
 .../goconvey/convey/reporting/reports.go      | 179 ++++
 .../goconvey/convey/reporting/statistics.go   | 108 +++
 .../goconvey/convey/reporting/story.go        |  73 ++
 rkt/config/auth.go                            | 115 ++-
 rkt/config/auth_test.go                       |  54 ++
 rkt/config/config.go                          |   5 +-
 rkt/config/config_test.go                     |   4 +-
 rkt/fetch_test.go                             |   7 +-
 rkt/image/httpops.go                          |  14 +-
 rkt/image/resumablesession.go                 |  19 +-
 139 files changed, 17837 insertions(+), 21 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go
 create mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/.gitignore
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/Makefile
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/README.md
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/ini.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/key.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/parser.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/section.go
 create mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/struct.go
 create mode 100644 Godeps/_workspace/src/github.com/gopherjs/gopherjs/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go
 create mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go
 create mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/README.md
 create mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/context.go
 create mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go
 create mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go
 create mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go
 create mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go
 create mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/README.md
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/time.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/type.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/LICENSE.md
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go
 create mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go
 create mode 100644 rkt/config/auth_test.go

diff --git a/Documentation/configuration.md b/Documentation/configuration.md
index 3e7a0f8247..04249af6ae 100644
--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@@ -65,7 +65,7 @@ This field must be specified and cannot be empty.
 The `credentials` field is defined by the `type` field.
 It should hold all the data that are needed for successful authentication with the given hosts.
 
-This version of auth configuration supports two methods - basic HTTP authentication and OAuth Bearer Token.
+This version of auth configuration supports three methods - basic HTTP authentication, OAuth Bearer Token, and AWS v4 authentication.
 
 Basic HTTP authentication requires two things - a user and a password.
 To use this type, define `type` as `basic` and the `credentials` field as a map with two keys - `user` and `password`.
@@ -106,6 +106,26 @@ For example:
 }
 ```
 
+AWS v4 authentication requires three things - an access key ID, a secret access key and an AWS region. If the region is left empty, it will be determined automatically from the URL/domain.
+To use this type, define `type` as `aws` and the `credentials` field as a map with two or three keys - `accessKeyID` and `secretAccessKey` are mandatory, whilst `awsRegion` is optional and can be left empty.
+For example:
+
+`/etc/rkt/auth.d/coreos-aws.json`:
+
+```json
+{
+	"rktKind": "auth",
+	"rktVersion": "v1",
+	"domains": ["my-s3-bucket.s3.amazonaws.com"],
+	"type": "aws",
+	"credentials": {
+		"accessKeyID": "foo",
+		"secretAccessKey": "bar",
+		"awsRegion": "us-east-1"
+	}
+}
+```
+
 ##### Override semantics
 
 Overriding is done for each domain.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index ea6ae03d68..e58a951fae 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -216,6 +216,46 @@
 			"Comment": "v0.8.1",
 			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
 		},
+		{
+			"ImportPath": "github.com/aws/aws-sdk-go/aws",
+			"Comment": "v1.1.7",
+			"Rev": "13a12060f716145019378a10e2806c174356b857"
+		},
+		{
+			"ImportPath": "github.com/aws/aws-sdk-go/aws/awserr",
+			"Comment": "v1.1.7",
+			"Rev": "13a12060f716145019378a10e2806c174356b857"
+		},
+		{
+			"ImportPath": "github.com/aws/aws-sdk-go/aws/awsutil",
+			"Comment": "v1.1.7",
+			"Rev": "13a12060f716145019378a10e2806c174356b857"
+		},
+		{
+			"ImportPath": "github.com/aws/aws-sdk-go/aws/client/metadata",
+			"Comment": "v1.1.7",
+			"Rev": "13a12060f716145019378a10e2806c174356b857"
+		},
+		{
+			"ImportPath": "github.com/aws/aws-sdk-go/aws/credentials",
+			"Comment": "v1.1.7",
+			"Rev": "13a12060f716145019378a10e2806c174356b857"
+		},
+		{
+			"ImportPath": "github.com/aws/aws-sdk-go/aws/request",
+			"Comment": "v1.1.7",
+			"Rev": "13a12060f716145019378a10e2806c174356b857"
+		},
+		{
+			"ImportPath": "github.com/aws/aws-sdk-go/private/protocol/rest",
+			"Comment": "v1.1.7",
+			"Rev": "13a12060f716145019378a10e2806c174356b857"
+		},
+		{
+			"ImportPath": "github.com/aws/aws-sdk-go/private/signer/v4",
+			"Comment": "v1.1.7",
+			"Rev": "13a12060f716145019378a10e2806c174356b857"
+		},
 		{
 			"ImportPath": "github.com/camlistore/go4/lock",
 			"Rev": "9ba773eba85ab9e258ff516630f7f6474bc4535b"
@@ -340,6 +380,11 @@
 			"ImportPath": "github.com/dustin/go-humanize",
 			"Rev": "c20a8bde38c8f5ba06f6600edf473705c96829d1"
 		},
+		{
+			"ImportPath": "github.com/go-ini/ini",
+			"Comment": "v1.11.0",
+			"Rev": "12f418cc7edc5a618a51407b7ac1f1f512139df3"
+		},
 		{
 			"ImportPath": "github.com/go-ole/go-ole",
 			"Comment": "v1.2.0-10-g572eabb",
@@ -388,6 +433,11 @@
 			"ImportPath": "github.com/google/btree",
 			"Rev": "f06e229e679911bb31a04e07ac891115822e37c3"
 		},
+		{
+			"ImportPath": "github.com/gopherjs/gopherjs/js",
+			"Comment": "go1.5-45-g19e100e",
+			"Rev": "19e100e9652485a76176bc5fd2669f57d3a2743c"
+		},
 		{
 			"ImportPath": "github.com/gorilla/context",
 			"Rev": "50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da"
@@ -408,6 +458,16 @@
 			"ImportPath": "github.com/inconshreveable/mousetrap",
 			"Rev": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
 		},
+		{
+			"ImportPath": "github.com/jmespath/go-jmespath",
+			"Comment": "0.2.2-12-g0b12d6b",
+			"Rev": "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"
+		},
+		{
+			"ImportPath": "github.com/jtolds/gls",
+			"Comment": "v4.2.0",
+			"Rev": "8ddce2a84170772b95dd5d576c48d517b22cac63"
+		},
 		{
 			"ImportPath": "github.com/kballard/go-shellquote",
 			"Rev": "e5c918b80c17694cbc49aab32a759f9a40067f5d"
@@ -469,6 +529,36 @@
 			"ImportPath": "github.com/shurcooL/sanitized_anchor_name",
 			"Rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77"
 		},
+		{
+			"ImportPath": "github.com/smartystreets/assertions",
+			"Comment": "1.6.0-6-g40711f7",
+			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
+		},
+		{
+			"ImportPath": "github.com/smartystreets/assertions/internal/go-render/render",
+			"Comment": "1.6.0-6-g40711f7",
+			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
+		},
+		{
+			"ImportPath": "github.com/smartystreets/assertions/internal/oglematchers",
+			"Comment": "1.6.0-6-g40711f7",
+			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
+		},
+		{
+			"ImportPath": "github.com/smartystreets/goconvey/convey",
+			"Comment": "1.6.1-20-gcc5d85f",
+			"Rev": "cc5d85f4f15bd2163abf0fe6e6753356dde72aa2"
+		},
+		{
+			"ImportPath": "github.com/smartystreets/goconvey/convey/gotest",
+			"Comment": "1.6.1-20-gcc5d85f",
+			"Rev": "cc5d85f4f15bd2163abf0fe6e6753356dde72aa2"
+		},
+		{
+			"ImportPath": "github.com/smartystreets/goconvey/convey/reporting",
+			"Comment": "1.6.1-20-gcc5d85f",
+			"Rev": "cc5d85f4f15bd2163abf0fe6e6753356dde72aa2"
+		},
 		{
 			"ImportPath": "github.com/spf13/cobra",
 			"Rev": "4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f"
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt
new file mode 100644
index 0000000000..5f14d1162e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt
@@ -0,0 +1,3 @@
+AWS SDK for Go
+Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
+Copyright 2014-2015 Stripe, Inc.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go
new file mode 100644
index 0000000000..cbc6bb1c0b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go
@@ -0,0 +1,124 @@
+// Package awserr represents API error interface accessors for the SDK.
+package awserr
+
+// An Error wraps lower level errors with code, message and an original error.
+// The underlying concrete error type may also satisfy other interfaces which
+// can be to used to obtain more specific information about the error.
+//
+// Calling Error() or String() will always include the full information about
+// an error based on its underlying type.
+//
+// Example:
+//
+//     output, err := s3manage.Upload(svc, input, opts)
+//     if err != nil {
+//         if awsErr, ok := err.(awserr.Error); ok {
+//             // Get error details
+//             log.Println("Error:", awsErr.Code(), awsErr.Message())
+//
+//             // Prints out full error message, including original error if there was one.
+//             log.Println("Error:", awsErr.Error())
+//
+//             // Get original error
+//             if origErr := awsErr.OrigErr(); origErr != nil {
+//                 // operate on original error.
+//             }
+//         } else {
+//             fmt.Println(err.Error())
+//         }
+//     }
+//
+type Error interface {
+	// Satisfy the generic error interface.
+	error
+
+	// Returns the short phrase depicting the classification of the error.
+	Code() string
+
+	// Returns the error details message.
+	Message() string
+
+	// Returns the original error if one was set.  Nil is returned if not set.
+	OrigErr() error
+}
+
+// BatchError is a batch of errors which also wraps lower level errors with code, message,
+// and original errors. Calling Error() will only return the error that is at the end
+// of the list.
+type BatchError interface {
+	// Satisfy the generic error interface.
+	error
+
+	// Returns the short phrase depicting the classification of the error.
+	Code() string
+
+	// Returns the error details message.
+	Message() string
+
+	// Returns the original error if one was set.  Nil is returned if not set.
+	OrigErrs() []error
+}
+
+// New returns an Error object described by the code, message, and origErr.
+//
+// If origErr satisfies the Error interface it will not be wrapped within a new
+// Error object and will instead be returned.
+func New(code, message string, origErr error) Error {
+	return newBaseError(code, message, origErr)
+}
+
+// NewBatchError returns an baseError with an expectation of an array of errors
+func NewBatchError(code, message string, errs []error) BatchError {
+	return newBaseErrors(code, message, errs)
+}
+
+// A RequestFailure is an interface to extract request failure information from
+// an Error such as the request ID of the failed request returned by a service.
+// RequestFailures may not always have a requestID value if the request failed
+// prior to reaching the service such as a connection error.
+//
+// Example:
+//
+//     output, err := s3manage.Upload(svc, input, opts)
+//     if err != nil {
+//         if reqerr, ok := err.(RequestFailure); ok {
+//             log.Println("Request failed", reqerr.Code(), reqerr.Message(), reqerr.RequestID())
+//         } else {
+//             log.Println("Error:", err.Error())
+//         }
+//     }
+//
+// Combined with awserr.Error:
+//
+//    output, err := s3manage.Upload(svc, input, opts)
+//    if err != nil {
+//        if awsErr, ok := err.(awserr.Error); ok {
+//            // Generic AWS Error with Code, Message, and original error (if any)
+//            fmt.Println(awsErr.Code(), awsErr.Message(), awsErr.OrigErr())
+//
+//            if reqErr, ok := err.(awserr.RequestFailure); ok {
+//                // A service error occurred
+//                fmt.Println(reqErr.StatusCode(), reqErr.RequestID())
+//            }
+//        } else {
+//            fmt.Println(err.Error())
+//        }
+//    }
+//
+type RequestFailure interface {
+	Error
+
+	// The status code of the HTTP response.
+	StatusCode() int
+
+	// The request ID returned by the service for a request failure. This will
+	// be empty if no request ID is available such as the request failed due
+	// to a connection error.
+	RequestID() string
+}
+
+// NewRequestFailure returns a new request error wrapper for the given Error
+// provided.
+func NewRequestFailure(err Error, statusCode int, reqID string) RequestFailure {
+	return newRequestError(err, statusCode, reqID)
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go
new file mode 100644
index 0000000000..605f73c5d6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go
@@ -0,0 +1,197 @@
+package awserr
+
+import "fmt"
+
+// SprintError returns a string of the formatted error code.
+//
+// Both extra and origErr are optional.  If they are included their lines
+// will be added, but if they are not included their lines will be ignored.
+func SprintError(code, message, extra string, origErr error) string {
+	msg := fmt.Sprintf("%s: %s", code, message)
+	if extra != "" {
+		msg = fmt.Sprintf("%s\n\t%s", msg, extra)
+	}
+	if origErr != nil {
+		msg = fmt.Sprintf("%s\ncaused by: %s", msg, origErr.Error())
+	}
+	return msg
+}
+
+// A baseError wraps the code and message which defines an error. It also
+// can be used to wrap an original error object.
+//
+// Should be used as the root for errors satisfying the awserr.Error. Also
+// for any error which does not fit into a specific error wrapper type.
+type baseError struct {
+	// Classification of error
+	code string
+
+	// Detailed information about error
+	message string
+
+	// Optional original error this error is based off of. Allows building
+	// chained errors.
+	errs []error
+}
+
+// newBaseError returns an error object for the code, message, and err.
+//
+// code is a short no whitespace phrase depicting the classification of
+// the error that is being created.
+//
+// message is the free flow string containing detailed information about the error.
+//
+// origErr is the error object which will be nested under the new error to be returned.
+func newBaseError(code, message string, origErr error) *baseError {
+	b := &baseError{
+		code:    code,
+		message: message,
+	}
+
+	if origErr != nil {
+		b.errs = append(b.errs, origErr)
+	}
+
+	return b
+}
+
+// newBaseErrors returns an error object for the code, message, and errors.
+//
+// code is a short no whitespace phrase depicting the classification of
+// the error that is being created.
+//
+// message is the free flow string containing detailed information about the error.
+//
+// origErrs is the error objects which will be nested under the new errors to be returned.
+func newBaseErrors(code, message string, origErrs []error) *baseError {
+	b := &baseError{
+		code:    code,
+		message: message,
+		errs:    origErrs,
+	}
+
+	return b
+}
+
+// Error returns the string representation of the error.
+//
+// See ErrorWithExtra for formatting.
+//
+// Satisfies the error interface.
+func (b baseError) Error() string {
+	size := len(b.errs)
+	if size > 0 {
+		return SprintError(b.code, b.message, "", errorList(b.errs))
+	}
+
+	return SprintError(b.code, b.message, "", nil)
+}
+
+// String returns the string representation of the error.
+// Alias for Error to satisfy the stringer interface.
+func (b baseError) String() string {
+	return b.Error()
+}
+
+// Code returns the short phrase depicting the classification of the error.
+func (b baseError) Code() string {
+	return b.code
+}
+
+// Message returns the error details message.
+func (b baseError) Message() string {
+	return b.message
+}
+
+// OrigErr returns the original error if one was set. Nil is returned if no error
+// was set. This only returns the first element in the list. If the full list is
+// needed, use BatchError
+func (b baseError) OrigErr() error {
+	if size := len(b.errs); size > 0 {
+		return b.errs[0]
+	}
+
+	return nil
+}
+
+// OrigErrs returns the original errors if one was set. An empty slice is returned if
+// no error was set:w
+func (b baseError) OrigErrs() []error {
+	return b.errs
+}
+
+// So that the Error interface type can be included as an anonymous field
+// in the requestError struct and not conflict with the error.Error() method.
+type awsError Error
+
+// A requestError wraps a request or service error.
+//
+// Composed of baseError for code, message, and original error.
+type requestError struct {
+	awsError
+	statusCode int
+	requestID  string
+}
+
+// newRequestError returns a wrapped error with additional information for request
+// status code, and service requestID.
+//
+// Should be used to wrap all request which involve service requests. Even if
+// the request failed without a service response, but had an HTTP status code
+// that may be meaningful.
+//
+// Also wraps original errors via the baseError.
+func newRequestError(err Error, statusCode int, requestID string) *requestError {
+	return &requestError{
+		awsError:   err,
+		statusCode: statusCode,
+		requestID:  requestID,
+	}
+}
+
+// Error returns the string representation of the error.
+// Satisfies the error interface.
+func (r requestError) Error() string {
+	extra := fmt.Sprintf("status code: %d, request id: %s",
+		r.statusCode, r.requestID)
+	return SprintError(r.Code(), r.Message(), extra, r.OrigErr())
+}
+
+// String returns the string representation of the error.
+// Alias for Error to satisfy the stringer interface.
+func (r requestError) String() string {
+	return r.Error()
+}
+
+// StatusCode returns the wrapped status code for the error
+func (r requestError) StatusCode() int {
+	return r.statusCode
+}
+
+// RequestID returns the wrapped requestID
+func (r requestError) RequestID() string {
+	return r.requestID
+}
+
+// An error list that satisfies the golang interface
+type errorList []error
+
+// Error returns the string representation of the error.
+//
+// Satisfies the error interface.
+func (e errorList) Error() string {
+	msg := ""
+	// How do we want to handle the array size being zero
+	if size := len(e); size > 0 {
+		for i := 0; i < size; i++ {
+			msg += fmt.Sprintf("%s", e[i].Error())
+			// We check the next index to see if it is within the slice.
+			// If it is, then we append a newline. We do this, because unit tests
+			// could be broken with the additional '\n'
+			if i+1 < size {
+				msg += "\n"
+			}
+		}
+	}
+	return msg
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
new file mode 100644
index 0000000000..8429470b9d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
@@ -0,0 +1,100 @@
+package awsutil
+
+import (
+	"io"
+	"reflect"
+)
+
+// Copy deeply copies a src structure to dst. Useful for copying request and
+// response structures.
+//
+// Can copy between structs of different type, but will only copy fields which
+// are assignable, and exist in both structs. Fields which are not assignable,
+// or do not exist in both structs are ignored.
+func Copy(dst, src interface{}) {
+	dstval := reflect.ValueOf(dst)
+	if !dstval.IsValid() {
+		panic("Copy dst cannot be nil")
+	}
+
+	rcopy(dstval, reflect.ValueOf(src), true)
+}
+
+// CopyOf returns a copy of src while also allocating the memory for dst.
+// src must be a pointer type or this operation will fail.
+func CopyOf(src interface{}) (dst interface{}) {
+	dsti := reflect.New(reflect.TypeOf(src).Elem())
+	dst = dsti.Interface()
+	rcopy(dsti, reflect.ValueOf(src), true)
+	return
+}
+
+// rcopy performs a recursive copy of values from the source to destination.
+//
+// root is used to skip certain aspects of the copy which are not valid
+// for the root node of a object.
+func rcopy(dst, src reflect.Value, root bool) {
+	if !src.IsValid() {
+		return
+	}
+
+	switch src.Kind() {
+	case reflect.Ptr:
+		if _, ok := src.Interface().(io.Reader); ok {
+			if dst.Kind() == reflect.Ptr && dst.Elem().CanSet() {
+				dst.Elem().Set(src)
+			} else if dst.CanSet() {
+				dst.Set(src)
+			}
+		} else {
+			e := src.Type().Elem()
+			if dst.CanSet() && !src.IsNil() {
+				dst.Set(reflect.New(e))
+			}
+			if src.Elem().IsValid() {
+				// Keep the current root state since the depth hasn't changed
+				rcopy(dst.Elem(), src.Elem(), root)
+			}
+		}
+	case reflect.Struct:
+		t := dst.Type()
+		for i := 0; i < t.NumField(); i++ {
+			name := t.Field(i).Name
+			srcVal := src.FieldByName(name)
+			dstVal := dst.FieldByName(name)
+			if srcVal.IsValid() && dstVal.CanSet() {
+				rcopy(dstVal, srcVal, false)
+			}
+		}
+	case reflect.Slice:
+		if src.IsNil() {
+			break
+		}
+
+		s := reflect.MakeSlice(src.Type(), src.Len(), src.Cap())
+		dst.Set(s)
+		for i := 0; i < src.Len(); i++ {
+			rcopy(dst.Index(i), src.Index(i), false)
+		}
+	case reflect.Map:
+		if src.IsNil() {
+			break
+		}
+
+		s := reflect.MakeMap(src.Type())
+		dst.Set(s)
+		for _, k := range src.MapKeys() {
+			v := src.MapIndex(k)
+			v2 := reflect.New(v.Type()).Elem()
+			rcopy(v2, v, false)
+			dst.SetMapIndex(k, v2)
+		}
+	default:
+		// Assign the value if possible. If its not assignable, the value would
+		// need to be converted and the impact of that may be unexpected, or is
+		// not compatible with the dst type.
+		if src.Type().AssignableTo(dst.Type()) {
+			dst.Set(src)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
new file mode 100644
index 0000000000..59fa4a558a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
@@ -0,0 +1,27 @@
+package awsutil
+
+import (
+	"reflect"
+)
+
+// DeepEqual returns if the two values are deeply equal like reflect.DeepEqual.
+// In addition to this, this method will also dereference the input values if
+// possible so the DeepEqual performed will not fail if one parameter is a
+// pointer and the other is not.
+//
+// DeepEqual will not perform indirection of nested values of the input parameters.
+func DeepEqual(a, b interface{}) bool {
+	ra := reflect.Indirect(reflect.ValueOf(a))
+	rb := reflect.Indirect(reflect.ValueOf(b))
+
+	if raValid, rbValid := ra.IsValid(), rb.IsValid(); !raValid && !rbValid {
+		// If the elements are both nil, and of the same type the are equal
+		// If they are of different types they are not equal
+		return reflect.TypeOf(a) == reflect.TypeOf(b)
+	} else if raValid != rbValid {
+		// Both values must be valid to be equal
+		return false
+	}
+
+	return reflect.DeepEqual(ra.Interface(), rb.Interface())
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
new file mode 100644
index 0000000000..4d2a01e8c4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
@@ -0,0 +1,222 @@
+package awsutil
+
+import (
+	"reflect"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/jmespath/go-jmespath"
+)
+
+var indexRe = regexp.MustCompile(`(.+)\[(-?\d+)?\]$`)
+
+// rValuesAtPath returns a slice of values found in value v. The values
+// in v are explored recursively so all nested values are collected.
+func rValuesAtPath(v interface{}, path string, createPath, caseSensitive, nilTerm bool) []reflect.Value {
+	pathparts := strings.Split(path, "||")
+	if len(pathparts) > 1 {
+		for _, pathpart := range pathparts {
+			vals := rValuesAtPath(v, pathpart, createPath, caseSensitive, nilTerm)
+			if len(vals) > 0 {
+				return vals
+			}
+		}
+		return nil
+	}
+
+	values := []reflect.Value{reflect.Indirect(reflect.ValueOf(v))}
+	components := strings.Split(path, ".")
+	for len(values) > 0 && len(components) > 0 {
+		var index *int64
+		var indexStar bool
+		c := strings.TrimSpace(components[0])
+		if c == "" { // no actual component, illegal syntax
+			return nil
+		} else if caseSensitive && c != "*" && strings.ToLower(c[0:1]) == c[0:1] {
+			// TODO normalize case for user
+			return nil // don't support unexported fields
+		}
+
+		// parse this component
+		if m := indexRe.FindStringSubmatch(c); m != nil {
+			c = m[1]
+			if m[2] == "" {
+				index = nil
+				indexStar = true
+			} else {
+				i, _ := strconv.ParseInt(m[2], 10, 32)
+				index = &i
+				indexStar = false
+			}
+		}
+
+		nextvals := []reflect.Value{}
+		for _, value := range values {
+			// pull component name out of struct member
+			if value.Kind() != reflect.Struct {
+				continue
+			}
+
+			if c == "*" { // pull all members
+				for i := 0; i < value.NumField(); i++ {
+					if f := reflect.Indirect(value.Field(i)); f.IsValid() {
+						nextvals = append(nextvals, f)
+					}
+				}
+				continue
+			}
+
+			value = value.FieldByNameFunc(func(name string) bool {
+				if c == name {
+					return true
+				} else if !caseSensitive && strings.ToLower(name) == strings.ToLower(c) {
+					return true
+				}
+				return false
+			})
+
+			if nilTerm && value.Kind() == reflect.Ptr && len(components[1:]) == 0 {
+				if !value.IsNil() {
+					value.Set(reflect.Zero(value.Type()))
+				}
+				return []reflect.Value{value}
+			}
+
+			if createPath && value.Kind() == reflect.Ptr && value.IsNil() {
+				// TODO if the value is the terminus it should not be created
+				// if the value to be set to its position is nil.
+				value.Set(reflect.New(value.Type().Elem()))
+				value = value.Elem()
+			} else {
+				value = reflect.Indirect(value)
+			}
+
+			if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
+				if !createPath && value.IsNil() {
+					value = reflect.ValueOf(nil)
+				}
+			}
+
+			if value.IsValid() {
+				nextvals = append(nextvals, value)
+			}
+		}
+		values = nextvals
+
+		if indexStar || index != nil {
+			nextvals = []reflect.Value{}
+			for _, value := range values {
+				value := reflect.Indirect(value)
+				if value.Kind() != reflect.Slice {
+					continue
+				}
+
+				if indexStar { // grab all indices
+					for i := 0; i < value.Len(); i++ {
+						idx := reflect.Indirect(value.Index(i))
+						if idx.IsValid() {
+							nextvals = append(nextvals, idx)
+						}
+					}
+					continue
+				}
+
+				// pull out index
+				i := int(*index)
+				if i >= value.Len() { // check out of bounds
+					if createPath {
+						// TODO resize slice
+					} else {
+						continue
+					}
+				} else if i < 0 { // support negative indexing
+					i = value.Len() + i
+				}
+				value = reflect.Indirect(value.Index(i))
+
+				if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
+					if !createPath && value.IsNil() {
+						value = reflect.ValueOf(nil)
+					}
+				}
+
+				if value.IsValid() {
+					nextvals = append(nextvals, value)
+				}
+			}
+			values = nextvals
+		}
+
+		components = components[1:]
+	}
+	return values
+}
+
+// ValuesAtPath returns a list of values at the case insensitive lexical
+// path inside of a structure.
+func ValuesAtPath(i interface{}, path string) ([]interface{}, error) {
+	result, err := jmespath.Search(path, i)
+	if err != nil {
+		return nil, err
+	}
+
+	v := reflect.ValueOf(result)
+	if !v.IsValid() || (v.Kind() == reflect.Ptr && v.IsNil()) {
+		return nil, nil
+	}
+	if s, ok := result.([]interface{}); ok {
+		return s, err
+	}
+	if v.Kind() == reflect.Map && v.Len() == 0 {
+		return nil, nil
+	}
+	if v.Kind() == reflect.Slice {
+		out := make([]interface{}, v.Len())
+		for i := 0; i < v.Len(); i++ {
+			out[i] = v.Index(i).Interface()
+		}
+		return out, nil
+	}
+
+	return []interface{}{result}, nil
+}
+
+// SetValueAtPath sets a value at the case insensitive lexical path inside
+// of a structure.
+func SetValueAtPath(i interface{}, path string, v interface{}) {
+	if rvals := rValuesAtPath(i, path, true, false, v == nil); rvals != nil {
+		for _, rval := range rvals {
+			if rval.Kind() == reflect.Ptr && rval.IsNil() {
+				continue
+			}
+			setValue(rval, v)
+		}
+	}
+}
+
+func setValue(dstVal reflect.Value, src interface{}) {
+	if dstVal.Kind() == reflect.Ptr {
+		dstVal = reflect.Indirect(dstVal)
+	}
+	srcVal := reflect.ValueOf(src)
+
+	if !srcVal.IsValid() { // src is literal nil
+		if dstVal.CanAddr() {
+			// Convert to pointer so that pointer's value can be nil'ed
+			//                     dstVal = dstVal.Addr()
+		}
+		dstVal.Set(reflect.Zero(dstVal.Type()))
+
+	} else if srcVal.Kind() == reflect.Ptr {
+		if srcVal.IsNil() {
+			srcVal = reflect.Zero(dstVal.Type())
+		} else {
+			srcVal = reflect.ValueOf(src).Elem()
+		}
+		dstVal.Set(srcVal)
+	} else {
+		dstVal.Set(srcVal)
+	}
+
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
new file mode 100644
index 0000000000..0de3eaa0f6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
@@ -0,0 +1,103 @@
+package awsutil
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"reflect"
+	"strings"
+)
+
+// Prettify returns the string representation of a value.
+func Prettify(i interface{}) string {
+	var buf bytes.Buffer
+	prettify(reflect.ValueOf(i), 0, &buf)
+	return buf.String()
+}
+
+// prettify will recursively walk value v to build a textual
+// representation of the value.
+func prettify(v reflect.Value, indent int, buf *bytes.Buffer) {
+	for v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+
+	switch v.Kind() {
+	case reflect.Struct:
+		strtype := v.Type().String()
+		if strtype == "time.Time" {
+			fmt.Fprintf(buf, "%s", v.Interface())
+			break
+		} else if strings.HasPrefix(strtype, "io.") {
+			buf.WriteString("<buffer>")
+			break
+		}
+
+		buf.WriteString("{\n")
+
+		names := []string{}
+		for i := 0; i < v.Type().NumField(); i++ {
+			name := v.Type().Field(i).Name
+			f := v.Field(i)
+			if name[0:1] == strings.ToLower(name[0:1]) {
+				continue // ignore unexported fields
+			}
+			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice || f.Kind() == reflect.Map) && f.IsNil() {
+				continue // ignore unset fields
+			}
+			names = append(names, name)
+		}
+
+		for i, n := range names {
+			val := v.FieldByName(n)
+			buf.WriteString(strings.Repeat(" ", indent+2))
+			buf.WriteString(n + ": ")
+			prettify(val, indent+2, buf)
+
+			if i < len(names)-1 {
+				buf.WriteString(",\n")
+			}
+		}
+
+		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
+	case reflect.Slice:
+		nl, id, id2 := "", "", ""
+		if v.Len() > 3 {
+			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
+		}
+		buf.WriteString("[" + nl)
+		for i := 0; i < v.Len(); i++ {
+			buf.WriteString(id2)
+			prettify(v.Index(i), indent+2, buf)
+
+			if i < v.Len()-1 {
+				buf.WriteString("," + nl)
+			}
+		}
+
+		buf.WriteString(nl + id + "]")
+	case reflect.Map:
+		buf.WriteString("{\n")
+
+		for i, k := range v.MapKeys() {
+			buf.WriteString(strings.Repeat(" ", indent+2))
+			buf.WriteString(k.String() + ": ")
+			prettify(v.MapIndex(k), indent+2, buf)
+
+			if i < v.Len()-1 {
+				buf.WriteString(",\n")
+			}
+		}
+
+		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
+	default:
+		format := "%v"
+		switch v.Interface().(type) {
+		case string:
+			format = "%q"
+		case io.ReadSeeker, io.Reader:
+			format = "buffer(%p)"
+		}
+		fmt.Fprintf(buf, format, v.Interface())
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
new file mode 100644
index 0000000000..b6432f1a11
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
@@ -0,0 +1,89 @@
+package awsutil
+
+import (
+	"bytes"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// StringValue returns the string representation of a value.
+func StringValue(i interface{}) string {
+	var buf bytes.Buffer
+	stringValue(reflect.ValueOf(i), 0, &buf)
+	return buf.String()
+}
+
+func stringValue(v reflect.Value, indent int, buf *bytes.Buffer) {
+	for v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+
+	switch v.Kind() {
+	case reflect.Struct:
+		buf.WriteString("{\n")
+
+		names := []string{}
+		for i := 0; i < v.Type().NumField(); i++ {
+			name := v.Type().Field(i).Name
+			f := v.Field(i)
+			if name[0:1] == strings.ToLower(name[0:1]) {
+				continue // ignore unexported fields
+			}
+			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice) && f.IsNil() {
+				continue // ignore unset fields
+			}
+			names = append(names, name)
+		}
+
+		for i, n := range names {
+			val := v.FieldByName(n)
+			buf.WriteString(strings.Repeat(" ", indent+2))
+			buf.WriteString(n + ": ")
+			stringValue(val, indent+2, buf)
+
+			if i < len(names)-1 {
+				buf.WriteString(",\n")
+			}
+		}
+
+		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
+	case reflect.Slice:
+		nl, id, id2 := "", "", ""
+		if v.Len() > 3 {
+			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
+		}
+		buf.WriteString("[" + nl)
+		for i := 0; i < v.Len(); i++ {
+			buf.WriteString(id2)
+			stringValue(v.Index(i), indent+2, buf)
+
+			if i < v.Len()-1 {
+				buf.WriteString("," + nl)
+			}
+		}
+
+		buf.WriteString(nl + id + "]")
+	case reflect.Map:
+		buf.WriteString("{\n")
+
+		for i, k := range v.MapKeys() {
+			buf.WriteString(strings.Repeat(" ", indent+2))
+			buf.WriteString(k.String() + ": ")
+			stringValue(v.MapIndex(k), indent+2, buf)
+
+			if i < v.Len()-1 {
+				buf.WriteString(",\n")
+			}
+		}
+
+		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
+	default:
+		format := "%v"
+		switch v.Interface().(type) {
+		case string:
+			format = "%q"
+		}
+		fmt.Fprintf(buf, format, v.Interface())
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
new file mode 100644
index 0000000000..4778056ddf
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
@@ -0,0 +1,12 @@
+package metadata
+
+// ClientInfo wraps immutable data from the client.Client structure.
+type ClientInfo struct {
+	ServiceName   string
+	APIVersion    string
+	Endpoint      string
+	SigningName   string
+	SigningRegion string
+	JSONVersion   string
+	TargetPrefix  string
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go
new file mode 100644
index 0000000000..9e83e9260a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go
@@ -0,0 +1,311 @@
+package aws
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws/credentials"
+)
+
+// UseServiceDefaultRetries instructs the config to use the service's own default
+// number of retries. This will be the default action if Config.MaxRetries
+// is nil also.
+const UseServiceDefaultRetries = -1
+
+// RequestRetryer is an alias for a type that implements the request.Retryer interface.
+type RequestRetryer interface{}
+
+// A Config provides service configuration for service clients. By default,
+// all clients will use the {defaults.DefaultConfig} structure.
+type Config struct {
+	// Enables verbose error printing of all credential chain errors.
+	// Should be used when wanting to see all errors while attempting to retreive
+	// credentials.
+	CredentialsChainVerboseErrors *bool
+
+	// The credentials object to use when signing requests. Defaults to
+	// a chain of credential providers to search for credentials in environment
+	// variables, shared credential file, and EC2 Instance Roles.
+	Credentials *credentials.Credentials
+
+	// An optional endpoint URL (hostname only or fully qualified URI)
+	// that overrides the default generated endpoint for a client. Set this
+	// to `""` to use the default generated endpoint.
+	//
+	// @note You must still provide a `Region` value when specifying an
+	//   endpoint for a client.
+	Endpoint *string
+
+	// The region to send requests to. This parameter is required and must
+	// be configured globally or on a per-client basis unless otherwise
+	// noted. A full list of regions is found in the "Regions and Endpoints"
+	// document.
+	//
+	// @see http://docs.aws.amazon.com/general/latest/gr/rande.html
+	//   AWS Regions and Endpoints
+	Region *string
+
+	// Set this to `true` to disable SSL when sending requests. Defaults
+	// to `false`.
+	DisableSSL *bool
+
+	// The HTTP client to use when sending requests. Defaults to
+	// `http.DefaultClient`.
+	HTTPClient *http.Client
+
+	// An integer value representing the logging level. The default log level
+	// is zero (LogOff), which represents no logging. To enable logging set
+	// to a LogLevel Value.
+	LogLevel *LogLevelType
+
+	// The logger writer interface to write logging messages to. Defaults to
+	// standard out.
+	Logger Logger
+
+	// The maximum number of times that a request will be retried for failures.
+	// Defaults to -1, which defers the max retry setting to the service specific
+	// configuration.
+	MaxRetries *int
+
+	// Retryer guides how HTTP requests should be retried in case of recoverable failures.
+	//
+	// When nil or the value does not implement the request.Retryer interface,
+	// the request.DefaultRetryer will be used.
+	//
+	// When both Retryer and MaxRetries are non-nil, the former is used and
+	// the latter ignored.
+	//
+	// To set the Retryer field in a type-safe manner and with chaining, use
+	// the request.WithRetryer helper function:
+	//
+	//   cfg := request.WithRetryer(aws.NewConfig(), myRetryer)
+	//
+	Retryer RequestRetryer
+
+	// Disables semantic parameter validation, which validates input for missing
+	// required fields and/or other semantic request input errors.
+	DisableParamValidation *bool
+
+	// Disables the computation of request and response checksums, e.g.,
+	// CRC32 checksums in Amazon DynamoDB.
+	DisableComputeChecksums *bool
+
+	// Set this to `true` to force the request to use path-style addressing,
+	// i.e., `http://s3.amazonaws.com/BUCKET/KEY`. By default, the S3 client will
+	// use virtual hosted bucket addressing when possible
+	// (`http://BUCKET.s3.amazonaws.com/KEY`).
+	//
+	// @note This configuration option is specific to the Amazon S3 service.
+	// @see http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
+	//   Amazon S3: Virtual Hosting of Buckets
+	S3ForcePathStyle *bool
+
+	// Set this to `true` to disable the EC2Metadata client from overriding the
+	// default http.Client's Timeout. This is helpful if you do not want the EC2Metadata
+	// client to create a new http.Client. This options is only meaningful if you're not
+	// already using a custom HTTP client with the SDK. Enabled by default.
+	//
+	// Must be set and provided to the session.New() in order to disable the EC2Metadata
+	// overriding the timeout for default credentials chain.
+	//
+	// Example:
+	//    sess := session.New(aws.NewConfig().WithEC2MetadataDiableTimeoutOverride(true))
+	//    svc := s3.New(sess)
+	//
+	EC2MetadataDisableTimeoutOverride *bool
+
+	SleepDelay func(time.Duration)
+}
+
+// NewConfig returns a new Config pointer that can be chained with builder methods to
+// set multiple configuration values inline without using pointers.
+//
+//     svc := s3.New(aws.NewConfig().WithRegion("us-west-2").WithMaxRetries(10))
+//
+func NewConfig() *Config {
+	return &Config{}
+}
+
+// WithCredentialsChainVerboseErrors sets a config verbose errors boolean and returning
+// a Config pointer.
+func (c *Config) WithCredentialsChainVerboseErrors(verboseErrs bool) *Config {
+	c.CredentialsChainVerboseErrors = &verboseErrs
+	return c
+}
+
+// WithCredentials sets a config Credentials value returning a Config pointer
+// for chaining.
+func (c *Config) WithCredentials(creds *credentials.Credentials) *Config {
+	c.Credentials = creds
+	return c
+}
+
+// WithEndpoint sets a config Endpoint value returning a Config pointer for
+// chaining.
+func (c *Config) WithEndpoint(endpoint string) *Config {
+	c.Endpoint = &endpoint
+	return c
+}
+
+// WithRegion sets a config Region value returning a Config pointer for
+// chaining.
+func (c *Config) WithRegion(region string) *Config {
+	c.Region = &region
+	return c
+}
+
+// WithDisableSSL sets a config DisableSSL value returning a Config pointer
+// for chaining.
+func (c *Config) WithDisableSSL(disable bool) *Config {
+	c.DisableSSL = &disable
+	return c
+}
+
+// WithHTTPClient sets a config HTTPClient value returning a Config pointer
+// for chaining.
+func (c *Config) WithHTTPClient(client *http.Client) *Config {
+	c.HTTPClient = client
+	return c
+}
+
+// WithMaxRetries sets a config MaxRetries value returning a Config pointer
+// for chaining.
+func (c *Config) WithMaxRetries(max int) *Config {
+	c.MaxRetries = &max
+	return c
+}
+
+// WithDisableParamValidation sets a config DisableParamValidation value
+// returning a Config pointer for chaining.
+func (c *Config) WithDisableParamValidation(disable bool) *Config {
+	c.DisableParamValidation = &disable
+	return c
+}
+
+// WithDisableComputeChecksums sets a config DisableComputeChecksums value
+// returning a Config pointer for chaining.
+func (c *Config) WithDisableComputeChecksums(disable bool) *Config {
+	c.DisableComputeChecksums = &disable
+	return c
+}
+
+// WithLogLevel sets a config LogLevel value returning a Config pointer for
+// chaining.
+func (c *Config) WithLogLevel(level LogLevelType) *Config {
+	c.LogLevel = &level
+	return c
+}
+
+// WithLogger sets a config Logger value returning a Config pointer for
+// chaining.
+func (c *Config) WithLogger(logger Logger) *Config {
+	c.Logger = logger
+	return c
+}
+
+// WithS3ForcePathStyle sets a config S3ForcePathStyle value returning a Config
+// pointer for chaining.
+func (c *Config) WithS3ForcePathStyle(force bool) *Config {
+	c.S3ForcePathStyle = &force
+	return c
+}
+
+// WithEC2MetadataDisableTimeoutOverride sets a config EC2MetadataDisableTimeoutOverride value
+// returning a Config pointer for chaining.
+func (c *Config) WithEC2MetadataDisableTimeoutOverride(enable bool) *Config {
+	c.EC2MetadataDisableTimeoutOverride = &enable
+	return c
+}
+
+// WithSleepDelay overrides the function used to sleep while waiting for the
+// next retry. Defaults to time.Sleep.
+func (c *Config) WithSleepDelay(fn func(time.Duration)) *Config {
+	c.SleepDelay = fn
+	return c
+}
+
+// MergeIn merges the passed in configs into the existing config object.
+func (c *Config) MergeIn(cfgs ...*Config) {
+	for _, other := range cfgs {
+		mergeInConfig(c, other)
+	}
+}
+
+func mergeInConfig(dst *Config, other *Config) {
+	if other == nil {
+		return
+	}
+
+	if other.CredentialsChainVerboseErrors != nil {
+		dst.CredentialsChainVerboseErrors = other.CredentialsChainVerboseErrors
+	}
+
+	if other.Credentials != nil {
+		dst.Credentials = other.Credentials
+	}
+
+	if other.Endpoint != nil {
+		dst.Endpoint = other.Endpoint
+	}
+
+	if other.Region != nil {
+		dst.Region = other.Region
+	}
+
+	if other.DisableSSL != nil {
+		dst.DisableSSL = other.DisableSSL
+	}
+
+	if other.HTTPClient != nil {
+		dst.HTTPClient = other.HTTPClient
+	}
+
+	if other.LogLevel != nil {
+		dst.LogLevel = other.LogLevel
+	}
+
+	if other.Logger != nil {
+		dst.Logger = other.Logger
+	}
+
+	if other.MaxRetries != nil {
+		dst.MaxRetries = other.MaxRetries
+	}
+
+	if other.Retryer != nil {
+		dst.Retryer = other.Retryer
+	}
+
+	if other.DisableParamValidation != nil {
+		dst.DisableParamValidation = other.DisableParamValidation
+	}
+
+	if other.DisableComputeChecksums != nil {
+		dst.DisableComputeChecksums = other.DisableComputeChecksums
+	}
+
+	if other.S3ForcePathStyle != nil {
+		dst.S3ForcePathStyle = other.S3ForcePathStyle
+	}
+
+	if other.EC2MetadataDisableTimeoutOverride != nil {
+		dst.EC2MetadataDisableTimeoutOverride = other.EC2MetadataDisableTimeoutOverride
+	}
+
+	if other.SleepDelay != nil {
+		dst.SleepDelay = other.SleepDelay
+	}
+}
+
+// Copy will return a shallow copy of the Config object. If any additional
+// configurations are provided they will be merged into the new config returned.
+func (c *Config) Copy(cfgs ...*Config) *Config {
+	dst := &Config{}
+	dst.MergeIn(c)
+
+	for _, cfg := range cfgs {
+		dst.MergeIn(cfg)
+	}
+
+	return dst
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go
new file mode 100644
index 0000000000..d6a7b08dff
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go
@@ -0,0 +1,357 @@
+package aws
+
+import "time"
+
+// String returns a pointer to of the string value passed in.
+func String(v string) *string {
+	return &v
+}
+
+// StringValue returns the value of the string pointer passed in or
+// "" if the pointer is nil.
+func StringValue(v *string) string {
+	if v != nil {
+		return *v
+	}
+	return ""
+}
+
+// StringSlice converts a slice of string values into a slice of
+// string pointers
+func StringSlice(src []string) []*string {
+	dst := make([]*string, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// StringValueSlice converts a slice of string pointers into a slice of
+// string values
+func StringValueSlice(src []*string) []string {
+	dst := make([]string, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// StringMap converts a string map of string values into a string
+// map of string pointers
+func StringMap(src map[string]string) map[string]*string {
+	dst := make(map[string]*string)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// StringValueMap converts a string map of string pointers into a string
+// map of string values
+func StringValueMap(src map[string]*string) map[string]string {
+	dst := make(map[string]string)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Bool returns a pointer to of the bool value passed in.
+func Bool(v bool) *bool {
+	return &v
+}
+
+// BoolValue returns the value of the bool pointer passed in or
+// false if the pointer is nil.
+func BoolValue(v *bool) bool {
+	if v != nil {
+		return *v
+	}
+	return false
+}
+
+// BoolSlice converts a slice of bool values into a slice of
+// bool pointers
+func BoolSlice(src []bool) []*bool {
+	dst := make([]*bool, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// BoolValueSlice converts a slice of bool pointers into a slice of
+// bool values
+func BoolValueSlice(src []*bool) []bool {
+	dst := make([]bool, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// BoolMap converts a string map of bool values into a string
+// map of bool pointers
+func BoolMap(src map[string]bool) map[string]*bool {
+	dst := make(map[string]*bool)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// BoolValueMap converts a string map of bool pointers into a string
+// map of bool values
+func BoolValueMap(src map[string]*bool) map[string]bool {
+	dst := make(map[string]bool)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Int returns a pointer to of the int value passed in.
+func Int(v int) *int {
+	return &v
+}
+
+// IntValue returns the value of the int pointer passed in or
+// 0 if the pointer is nil.
+func IntValue(v *int) int {
+	if v != nil {
+		return *v
+	}
+	return 0
+}
+
+// IntSlice converts a slice of int values into a slice of
+// int pointers
+func IntSlice(src []int) []*int {
+	dst := make([]*int, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// IntValueSlice converts a slice of int pointers into a slice of
+// int values
+func IntValueSlice(src []*int) []int {
+	dst := make([]int, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// IntMap converts a string map of int values into a string
+// map of int pointers
+func IntMap(src map[string]int) map[string]*int {
+	dst := make(map[string]*int)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// IntValueMap converts a string map of int pointers into a string
+// map of int values
+func IntValueMap(src map[string]*int) map[string]int {
+	dst := make(map[string]int)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Int64 returns a pointer to of the int64 value passed in.
+func Int64(v int64) *int64 {
+	return &v
+}
+
+// Int64Value returns the value of the int64 pointer passed in or
+// 0 if the pointer is nil.
+func Int64Value(v *int64) int64 {
+	if v != nil {
+		return *v
+	}
+	return 0
+}
+
+// Int64Slice converts a slice of int64 values into a slice of
+// int64 pointers
+func Int64Slice(src []int64) []*int64 {
+	dst := make([]*int64, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// Int64ValueSlice converts a slice of int64 pointers into a slice of
+// int64 values
+func Int64ValueSlice(src []*int64) []int64 {
+	dst := make([]int64, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// Int64Map converts a string map of int64 values into a string
+// map of int64 pointers
+func Int64Map(src map[string]int64) map[string]*int64 {
+	dst := make(map[string]*int64)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// Int64ValueMap converts a string map of int64 pointers into a string
+// map of int64 values
+func Int64ValueMap(src map[string]*int64) map[string]int64 {
+	dst := make(map[string]int64)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Float64 returns a pointer to of the float64 value passed in.
+func Float64(v float64) *float64 {
+	return &v
+}
+
+// Float64Value returns the value of the float64 pointer passed in or
+// 0 if the pointer is nil.
+func Float64Value(v *float64) float64 {
+	if v != nil {
+		return *v
+	}
+	return 0
+}
+
+// Float64Slice converts a slice of float64 values into a slice of
+// float64 pointers
+func Float64Slice(src []float64) []*float64 {
+	dst := make([]*float64, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// Float64ValueSlice converts a slice of float64 pointers into a slice of
+// float64 values
+func Float64ValueSlice(src []*float64) []float64 {
+	dst := make([]float64, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// Float64Map converts a string map of float64 values into a string
+// map of float64 pointers
+func Float64Map(src map[string]float64) map[string]*float64 {
+	dst := make(map[string]*float64)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// Float64ValueMap converts a string map of float64 pointers into a string
+// map of float64 values
+func Float64ValueMap(src map[string]*float64) map[string]float64 {
+	dst := make(map[string]float64)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Time returns a pointer to of the time.Time value passed in.
+func Time(v time.Time) *time.Time {
+	return &v
+}
+
+// TimeValue returns the value of the time.Time pointer passed in or
+// time.Time{} if the pointer is nil.
+func TimeValue(v *time.Time) time.Time {
+	if v != nil {
+		return *v
+	}
+	return time.Time{}
+}
+
+// TimeSlice converts a slice of time.Time values into a slice of
+// time.Time pointers
+func TimeSlice(src []time.Time) []*time.Time {
+	dst := make([]*time.Time, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// TimeValueSlice converts a slice of time.Time pointers into a slice of
+// time.Time values
+func TimeValueSlice(src []*time.Time) []time.Time {
+	dst := make([]time.Time, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// TimeMap converts a string map of time.Time values into a string
+// map of time.Time pointers
+func TimeMap(src map[string]time.Time) map[string]*time.Time {
+	dst := make(map[string]*time.Time)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// TimeValueMap converts a string map of time.Time pointers into a string
+// map of time.Time values
+func TimeValueMap(src map[string]*time.Time) map[string]time.Time {
+	dst := make(map[string]time.Time)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
new file mode 100644
index 0000000000..857311f64c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
@@ -0,0 +1,100 @@
+package credentials
+
+import (
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+var (
+	// ErrNoValidProvidersFoundInChain Is returned when there are no valid
+	// providers in the ChainProvider.
+	//
+	// This has been deprecated. For verbose error messaging set
+	// aws.Config.CredentialsChainVerboseErrors to true
+	//
+	// @readonly
+	ErrNoValidProvidersFoundInChain = awserr.New("NoCredentialProviders",
+		`no valid providers in chain. Deprecated. 
+	For verbose messaging see aws.Config.CredentialsChainVerboseErrors`,
+		nil)
+)
+
+// A ChainProvider will search for a provider which returns credentials
+// and cache that provider until Retrieve is called again.
+//
+// The ChainProvider provides a way of chaining multiple providers together
+// which will pick the first available using priority order of the Providers
+// in the list.
+//
+// If none of the Providers retrieve valid credentials Value, ChainProvider's
+// Retrieve() will return the error ErrNoValidProvidersFoundInChain.
+//
+// If a Provider is found which returns valid credentials Value ChainProvider
+// will cache that Provider for all calls to IsExpired(), until Retrieve is
+// called again.
+//
+// Example of ChainProvider to be used with an EnvProvider and EC2RoleProvider.
+// In this example EnvProvider will first check if any credentials are available
+// vai the environment variables. If there are none ChainProvider will check
+// the next Provider in the list, EC2RoleProvider in this case. If EC2RoleProvider
+// does not return any credentials ChainProvider will return the error
+// ErrNoValidProvidersFoundInChain
+//
+//     creds := NewChainCredentials(
+//         []Provider{
+//             &EnvProvider{},
+//             &EC2RoleProvider{
+//                 Client: ec2metadata.New(sess),
+//             },
+//         })
+//
+//     // Usage of ChainCredentials with aws.Config
+//     svc := ec2.New(&aws.Config{Credentials: creds})
+//
+type ChainProvider struct {
+	Providers     []Provider
+	curr          Provider
+	VerboseErrors bool
+}
+
+// NewChainCredentials returns a pointer to a new Credentials object
+// wrapping a chain of providers.
+func NewChainCredentials(providers []Provider) *Credentials {
+	return NewCredentials(&ChainProvider{
+		Providers: append([]Provider{}, providers...),
+	})
+}
+
+// Retrieve returns the credentials value or error if no provider returned
+// without error.
+//
+// If a provider is found it will be cached and any calls to IsExpired()
+// will return the expired state of the cached provider.
+func (c *ChainProvider) Retrieve() (Value, error) {
+	var errs []error
+	for _, p := range c.Providers {
+		creds, err := p.Retrieve()
+		if err == nil {
+			c.curr = p
+			return creds, nil
+		}
+		errs = append(errs, err)
+	}
+	c.curr = nil
+
+	var err error
+	err = ErrNoValidProvidersFoundInChain
+	if c.VerboseErrors {
+		err = awserr.NewBatchError("NoCredentialProviders", "no valid providers in chain", errs)
+	}
+	return Value{}, err
+}
+
+// IsExpired will returned the expired state of the currently cached provider
+// if there is one.  If there is no current provider, true will be returned.
+func (c *ChainProvider) IsExpired() bool {
+	if c.curr != nil {
+		return c.curr.IsExpired()
+	}
+
+	return true
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
new file mode 100644
index 0000000000..7b8ebf5f9d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
@@ -0,0 +1,223 @@
+// Package credentials provides credential retrieval and management
+//
+// The Credentials is the primary method of getting access to and managing
+// credentials Values. Using dependency injection retrieval of the credential
+// values is handled by a object which satisfies the Provider interface.
+//
+// By default the Credentials.Get() will cache the successful result of a
+// Provider's Retrieve() until Provider.IsExpired() returns true. At which
+// point Credentials will call Provider's Retrieve() to get new credential Value.
+//
+// The Provider is responsible for determining when credentials Value have expired.
+// It is also important to note that Credentials will always call Retrieve the
+// first time Credentials.Get() is called.
+//
+// Example of using the environment variable credentials.
+//
+//     creds := NewEnvCredentials()
+//
+//     // Retrieve the credentials value
+//     credValue, err := creds.Get()
+//     if err != nil {
+//         // handle error
+//     }
+//
+// Example of forcing credentials to expire and be refreshed on the next Get().
+// This may be helpful to proactively expire credentials and refresh them sooner
+// than they would naturally expire on their own.
+//
+//     creds := NewCredentials(&EC2RoleProvider{})
+//     creds.Expire()
+//     credsValue, err := creds.Get()
+//     // New credentials will be retrieved instead of from cache.
+//
+//
+// Custom Provider
+//
+// Each Provider built into this package also provides a helper method to generate
+// a Credentials pointer setup with the provider. To use a custom Provider just
+// create a type which satisfies the Provider interface and pass it to the
+// NewCredentials method.
+//
+//     type MyProvider struct{}
+//     func (m *MyProvider) Retrieve() (Value, error) {...}
+//     func (m *MyProvider) IsExpired() bool {...}
+//
+//     creds := NewCredentials(&MyProvider{})
+//     credValue, err := creds.Get()
+//
+package credentials
+
+import (
+	"sync"
+	"time"
+)
+
+// AnonymousCredentials is an empty Credential object that can be used as
+// dummy placeholder credentials for requests that do not need signed.
+//
+// This Credentials can be used to configure a service to not sign requests
+// when making service API calls. For example, when accessing public
+// s3 buckets.
+//
+//     svc := s3.New(&aws.Config{Credentials: AnonymousCredentials})
+//     // Access public S3 buckets.
+//
+// @readonly
+var AnonymousCredentials = NewStaticCredentials("", "", "")
+
+// A Value is the AWS credentials value for individual credential fields.
+type Value struct {
+	// AWS Access key ID
+	AccessKeyID string
+
+	// AWS Secret Access Key
+	SecretAccessKey string
+
+	// AWS Session Token
+	SessionToken string
+
+	// Provider used to get credentials
+	ProviderName string
+}
+
+// A Provider is the interface for any component which will provide credentials
+// Value. A provider is required to manage its own Expired state, and what to
+// be expired means.
+//
+// The Provider should not need to implement its own mutexes, because
+// that will be managed by Credentials.
+type Provider interface {
+	// Refresh returns nil if it successfully retrieved the value.
+	// Error is returned if the value were not obtainable, or empty.
+	Retrieve() (Value, error)
+
+	// IsExpired returns if the credentials are no longer valid, and need
+	// to be retrieved.
+	IsExpired() bool
+}
+
+// A Expiry provides shared expiration logic to be used by credentials
+// providers to implement expiry functionality.
+//
+// The best method to use this struct is as an anonymous field within the
+// provider's struct.
+//
+// Example:
+//     type EC2RoleProvider struct {
+//         Expiry
+//         ...
+//     }
+type Expiry struct {
+	// The date/time when to expire on
+	expiration time.Time
+
+	// If set will be used by IsExpired to determine the current time.
+	// Defaults to time.Now if CurrentTime is not set.  Available for testing
+	// to be able to mock out the current time.
+	CurrentTime func() time.Time
+}
+
+// SetExpiration sets the expiration IsExpired will check when called.
+//
+// If window is greater than 0 the expiration time will be reduced by the
+// window value.
+//
+// Using a window is helpful to trigger credentials to expire sooner than
+// the expiration time given to ensure no requests are made with expired
+// tokens.
+func (e *Expiry) SetExpiration(expiration time.Time, window time.Duration) {
+	e.expiration = expiration
+	if window > 0 {
+		e.expiration = e.expiration.Add(-window)
+	}
+}
+
+// IsExpired returns if the credentials are expired.
+func (e *Expiry) IsExpired() bool {
+	if e.CurrentTime == nil {
+		e.CurrentTime = time.Now
+	}
+	return e.expiration.Before(e.CurrentTime())
+}
+
+// A Credentials provides synchronous safe retrieval of AWS credentials Value.
+// Credentials will cache the credentials value until they expire. Once the value
+// expires the next Get will attempt to retrieve valid credentials.
+//
+// Credentials is safe to use across multiple goroutines and will manage the
+// synchronous state so the Providers do not need to implement their own
+// synchronization.
+//
+// The first Credentials.Get() will always call Provider.Retrieve() to get the
+// first instance of the credentials Value. All calls to Get() after that
+// will return the cached credentials Value until IsExpired() returns true.
+type Credentials struct {
+	creds        Value
+	forceRefresh bool
+	m            sync.Mutex
+
+	provider Provider
+}
+
+// NewCredentials returns a pointer to a new Credentials with the provider set.
+func NewCredentials(provider Provider) *Credentials {
+	return &Credentials{
+		provider:     provider,
+		forceRefresh: true,
+	}
+}
+
+// Get returns the credentials value, or error if the credentials Value failed
+// to be retrieved.
+//
+// Will return the cached credentials Value if it has not expired. If the
+// credentials Value has expired the Provider's Retrieve() will be called
+// to refresh the credentials.
+//
+// If Credentials.Expire() was called the credentials Value will be force
+// expired, and the next call to Get() will cause them to be refreshed.
+func (c *Credentials) Get() (Value, error) {
+	c.m.Lock()
+	defer c.m.Unlock()
+
+	if c.isExpired() {
+		creds, err := c.provider.Retrieve()
+		if err != nil {
+			return Value{}, err
+		}
+		c.creds = creds
+		c.forceRefresh = false
+	}
+
+	return c.creds, nil
+}
+
+// Expire expires the credentials and forces them to be retrieved on the
+// next call to Get().
+//
+// This will override the Provider's expired state, and force Credentials
+// to call the Provider's Retrieve().
+func (c *Credentials) Expire() {
+	c.m.Lock()
+	defer c.m.Unlock()
+
+	c.forceRefresh = true
+}
+
+// IsExpired returns if the credentials are no longer valid, and need
+// to be retrieved.
+//
+// If the Credentials were forced to be expired with Expire() this will
+// reflect that override.
+func (c *Credentials) IsExpired() bool {
+	c.m.Lock()
+	defer c.m.Unlock()
+
+	return c.isExpired()
+}
+
+// isExpired helper method wrapping the definition of expired credentials.
+func (c *Credentials) isExpired() bool {
+	return c.forceRefresh || c.provider.IsExpired()
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
new file mode 100644
index 0000000000..96655bc46a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
@@ -0,0 +1,77 @@
+package credentials
+
+import (
+	"os"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+// EnvProviderName provides a name of Env provider
+const EnvProviderName = "EnvProvider"
+
+var (
+	// ErrAccessKeyIDNotFound is returned when the AWS Access Key ID can't be
+	// found in the process's environment.
+	//
+	// @readonly
+	ErrAccessKeyIDNotFound = awserr.New("EnvAccessKeyNotFound", "AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment", nil)
+
+	// ErrSecretAccessKeyNotFound is returned when the AWS Secret Access Key
+	// can't be found in the process's environment.
+	//
+	// @readonly
+	ErrSecretAccessKeyNotFound = awserr.New("EnvSecretNotFound", "AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment", nil)
+)
+
+// A EnvProvider retrieves credentials from the environment variables of the
+// running process. Environment credentials never expire.
+//
+// Environment variables used:
+//
+// * Access Key ID:     AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY
+// * Secret Access Key: AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY
+type EnvProvider struct {
+	retrieved bool
+}
+
+// NewEnvCredentials returns a pointer to a new Credentials object
+// wrapping the environment variable provider.
+func NewEnvCredentials() *Credentials {
+	return NewCredentials(&EnvProvider{})
+}
+
+// Retrieve retrieves the keys from the environment.
+func (e *EnvProvider) Retrieve() (Value, error) {
+	e.retrieved = false
+
+	id := os.Getenv("AWS_ACCESS_KEY_ID")
+	if id == "" {
+		id = os.Getenv("AWS_ACCESS_KEY")
+	}
+
+	secret := os.Getenv("AWS_SECRET_ACCESS_KEY")
+	if secret == "" {
+		secret = os.Getenv("AWS_SECRET_KEY")
+	}
+
+	if id == "" {
+		return Value{ProviderName: EnvProviderName}, ErrAccessKeyIDNotFound
+	}
+
+	if secret == "" {
+		return Value{ProviderName: EnvProviderName}, ErrSecretAccessKeyNotFound
+	}
+
+	e.retrieved = true
+	return Value{
+		AccessKeyID:     id,
+		SecretAccessKey: secret,
+		SessionToken:    os.Getenv("AWS_SESSION_TOKEN"),
+		ProviderName:    EnvProviderName,
+	}, nil
+}
+
+// IsExpired returns if the credentials have been retrieved.
+func (e *EnvProvider) IsExpired() bool {
+	return !e.retrieved
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini
new file mode 100644
index 0000000000..7fc91d9d20
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini
@@ -0,0 +1,12 @@
+[default]
+aws_access_key_id = accessKey
+aws_secret_access_key = secret
+aws_session_token = token
+
+[no_token]
+aws_access_key_id = accessKey
+aws_secret_access_key = secret
+
+[with_colon]
+aws_access_key_id: accessKey
+aws_secret_access_key: secret
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
new file mode 100644
index 0000000000..7fb7cbf0db
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
@@ -0,0 +1,151 @@
+package credentials
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/go-ini/ini"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+// SharedCredsProviderName provides a name of SharedCreds provider
+const SharedCredsProviderName = "SharedCredentialsProvider"
+
+var (
+	// ErrSharedCredentialsHomeNotFound is emitted when the user directory cannot be found.
+	//
+	// @readonly
+	ErrSharedCredentialsHomeNotFound = awserr.New("UserHomeNotFound", "user home directory not found.", nil)
+)
+
+// A SharedCredentialsProvider retrieves credentials from the current user's home
+// directory, and keeps track if those credentials are expired.
+//
+// Profile ini file example: $HOME/.aws/credentials
+type SharedCredentialsProvider struct {
+	// Path to the shared credentials file.
+	//
+	// If empty will look for "AWS_SHARED_CREDENTIALS_FILE" env variable. If the
+	// env value is empty will default to current user's home directory.
+	// Linux/OSX: "$HOME/.aws/credentials"
+	// Windows:   "%USERPROFILE%\.aws\credentials"
+	Filename string
+
+	// AWS Profile to extract credentials from the shared credentials file. If empty
+	// will default to environment variable "AWS_PROFILE" or "default" if
+	// environment variable is also not set.
+	Profile string
+
+	// retrieved states if the credentials have been successfully retrieved.
+	retrieved bool
+}
+
+// NewSharedCredentials returns a pointer to a new Credentials object
+// wrapping the Profile file provider.
+func NewSharedCredentials(filename, profile string) *Credentials {
+	return NewCredentials(&SharedCredentialsProvider{
+		Filename: filename,
+		Profile:  profile,
+	})
+}
+
+// Retrieve reads and extracts the shared credentials from the current
+// users home directory.
+func (p *SharedCredentialsProvider) Retrieve() (Value, error) {
+	p.retrieved = false
+
+	filename, err := p.filename()
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, err
+	}
+
+	creds, err := loadProfile(filename, p.profile())
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, err
+	}
+
+	p.retrieved = true
+	return creds, nil
+}
+
+// IsExpired returns if the shared credentials have expired.
+func (p *SharedCredentialsProvider) IsExpired() bool {
+	return !p.retrieved
+}
+
+// loadProfiles loads from the file pointed to by shared credentials filename for profile.
+// The credentials retrieved from the profile will be returned or error. Error will be
+// returned if it fails to read from the file, or the data is invalid.
+func loadProfile(filename, profile string) (Value, error) {
+	config, err := ini.Load(filename)
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to load shared credentials file", err)
+	}
+	iniProfile, err := config.GetSection(profile)
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to get profile", err)
+	}
+
+	id, err := iniProfile.GetKey("aws_access_key_id")
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsAccessKey",
+			fmt.Sprintf("shared credentials %s in %s did not contain aws_access_key_id", profile, filename),
+			err)
+	}
+
+	secret, err := iniProfile.GetKey("aws_secret_access_key")
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsSecret",
+			fmt.Sprintf("shared credentials %s in %s did not contain aws_secret_access_key", profile, filename),
+			nil)
+	}
+
+	// Default to empty string if not found
+	token := iniProfile.Key("aws_session_token")
+
+	return Value{
+		AccessKeyID:     id.String(),
+		SecretAccessKey: secret.String(),
+		SessionToken:    token.String(),
+		ProviderName:    SharedCredsProviderName,
+	}, nil
+}
+
+// filename returns the filename to use to read AWS shared credentials.
+//
+// Will return an error if the user's home directory path cannot be found.
+func (p *SharedCredentialsProvider) filename() (string, error) {
+	if p.Filename == "" {
+		if p.Filename = os.Getenv("AWS_SHARED_CREDENTIALS_FILE"); p.Filename != "" {
+			return p.Filename, nil
+		}
+
+		homeDir := os.Getenv("HOME") // *nix
+		if homeDir == "" {           // Windows
+			homeDir = os.Getenv("USERPROFILE")
+		}
+		if homeDir == "" {
+			return "", ErrSharedCredentialsHomeNotFound
+		}
+
+		p.Filename = filepath.Join(homeDir, ".aws", "credentials")
+	}
+
+	return p.Filename, nil
+}
+
+// profile returns the AWS shared credentials profile.  If empty will read
+// environment variable "AWS_PROFILE". If that is not set profile will
+// return "default".
+func (p *SharedCredentialsProvider) profile() string {
+	if p.Profile == "" {
+		p.Profile = os.Getenv("AWS_PROFILE")
+	}
+	if p.Profile == "" {
+		p.Profile = "default"
+	}
+
+	return p.Profile
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
new file mode 100644
index 0000000000..71189e733d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
@@ -0,0 +1,48 @@
+package credentials
+
+import (
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+// StaticProviderName provides a name of Static provider
+const StaticProviderName = "StaticProvider"
+
+var (
+	// ErrStaticCredentialsEmpty is emitted when static credentials are empty.
+	//
+	// @readonly
+	ErrStaticCredentialsEmpty = awserr.New("EmptyStaticCreds", "static credentials are empty", nil)
+)
+
+// A StaticProvider is a set of credentials which are set pragmatically,
+// and will never expire.
+type StaticProvider struct {
+	Value
+}
+
+// NewStaticCredentials returns a pointer to a new Credentials object
+// wrapping a static credentials value provider.
+func NewStaticCredentials(id, secret, token string) *Credentials {
+	return NewCredentials(&StaticProvider{Value: Value{
+		AccessKeyID:     id,
+		SecretAccessKey: secret,
+		SessionToken:    token,
+	}})
+}
+
+// Retrieve returns the credentials or error if the credentials are invalid.
+func (s *StaticProvider) Retrieve() (Value, error) {
+	if s.AccessKeyID == "" || s.SecretAccessKey == "" {
+		return Value{ProviderName: StaticProviderName}, ErrStaticCredentialsEmpty
+	}
+
+	s.Value.ProviderName = StaticProviderName
+	return s.Value, nil
+}
+
+// IsExpired returns if the credentials are expired.
+//
+// For StaticProvider, the credentials never expired.
+func (s *StaticProvider) IsExpired() bool {
+	return false
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go
new file mode 100644
index 0000000000..5766361686
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go
@@ -0,0 +1,17 @@
+package aws
+
+import "github.com/aws/aws-sdk-go/aws/awserr"
+
+var (
+	// ErrMissingRegion is an error that is returned if region configuration is
+	// not found.
+	//
+	// @readonly
+	ErrMissingRegion = awserr.New("MissingRegion", "could not find region configuration", nil)
+
+	// ErrMissingEndpoint is an error that is returned if an endpoint cannot be
+	// resolved for a service.
+	//
+	// @readonly
+	ErrMissingEndpoint = awserr.New("MissingEndpoint", "'Endpoint' configuration is required for this service", nil)
+)
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go
new file mode 100644
index 0000000000..db87188e20
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go
@@ -0,0 +1,112 @@
+package aws
+
+import (
+	"log"
+	"os"
+)
+
+// A LogLevelType defines the level logging should be performed at. Used to instruct
+// the SDK which statements should be logged.
+type LogLevelType uint
+
+// LogLevel returns the pointer to a LogLevel. Should be used to workaround
+// not being able to take the address of a non-composite literal.
+func LogLevel(l LogLevelType) *LogLevelType {
+	return &l
+}
+
+// Value returns the LogLevel value or the default value LogOff if the LogLevel
+// is nil. Safe to use on nil value LogLevelTypes.
+func (l *LogLevelType) Value() LogLevelType {
+	if l != nil {
+		return *l
+	}
+	return LogOff
+}
+
+// Matches returns true if the v LogLevel is enabled by this LogLevel. Should be
+// used with logging sub levels. Is safe to use on nil value LogLevelTypes. If
+// LogLevel is nill, will default to LogOff comparison.
+func (l *LogLevelType) Matches(v LogLevelType) bool {
+	c := l.Value()
+	return c&v == v
+}
+
+// AtLeast returns true if this LogLevel is at least high enough to satisfies v.
+// Is safe to use on nil value LogLevelTypes. If LogLevel is nill, will default
+// to LogOff comparison.
+func (l *LogLevelType) AtLeast(v LogLevelType) bool {
+	c := l.Value()
+	return c >= v
+}
+
+const (
+	// LogOff states that no logging should be performed by the SDK. This is the
+	// default state of the SDK, and should be use to disable all logging.
+	LogOff LogLevelType = iota * 0x1000
+
+	// LogDebug state that debug output should be logged by the SDK. This should
+	// be used to inspect request made and responses received.
+	LogDebug
+)
+
+// Debug Logging Sub Levels
+const (
+	// LogDebugWithSigning states that the SDK should log request signing and
+	// presigning events. This should be used to log the signing details of
+	// requests for debugging. Will also enable LogDebug.
+	LogDebugWithSigning LogLevelType = LogDebug | (1 << iota)
+
+	// LogDebugWithHTTPBody states the SDK should log HTTP request and response
+	// HTTP bodys in addition to the headers and path. This should be used to
+	// see the body content of requests and responses made while using the SDK
+	// Will also enable LogDebug.
+	LogDebugWithHTTPBody
+
+	// LogDebugWithRequestRetries states the SDK should log when service requests will
+	// be retried. This should be used to log when you want to log when service
+	// requests are being retried. Will also enable LogDebug.
+	LogDebugWithRequestRetries
+
+	// LogDebugWithRequestErrors states the SDK should log when service requests fail
+	// to build, send, validate, or unmarshal.
+	LogDebugWithRequestErrors
+)
+
+// A Logger is a minimalistic interface for the SDK to log messages to. Should
+// be used to provide custom logging writers for the SDK to use.
+type Logger interface {
+	Log(...interface{})
+}
+
+// A LoggerFunc is a convenience type to convert a function taking a variadic
+// list of arguments and wrap it so the Logger interface can be used.
+//
+// Example:
+//     s3.New(sess, &aws.Config{Logger: aws.LoggerFunc(func(args ...interface{}) {
+//         fmt.Fprintln(os.Stdout, args...)
+//     })})
+type LoggerFunc func(...interface{})
+
+// Log calls the wrapped function with the arguments provided
+func (f LoggerFunc) Log(args ...interface{}) {
+	f(args...)
+}
+
+// NewDefaultLogger returns a Logger which will write log messages to stdout, and
+// use same formatting runes as the stdlib log.Logger
+func NewDefaultLogger() Logger {
+	return &defaultLogger{
+		logger: log.New(os.Stdout, "", log.LstdFlags),
+	}
+}
+
+// A defaultLogger provides a minimalistic logger satisfying the Logger interface.
+type defaultLogger struct {
+	logger *log.Logger
+}
+
+// Log logs the parameters to the stdlib logger. See log.Println.
+func (l defaultLogger) Log(args ...interface{}) {
+	l.logger.Println(args...)
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go
new file mode 100644
index 0000000000..5279c19c09
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go
@@ -0,0 +1,187 @@
+package request
+
+import (
+	"fmt"
+	"strings"
+)
+
+// A Handlers provides a collection of request handlers for various
+// stages of handling requests.
+type Handlers struct {
+	Validate         HandlerList
+	Build            HandlerList
+	Sign             HandlerList
+	Send             HandlerList
+	ValidateResponse HandlerList
+	Unmarshal        HandlerList
+	UnmarshalMeta    HandlerList
+	UnmarshalError   HandlerList
+	Retry            HandlerList
+	AfterRetry       HandlerList
+}
+
+// Copy returns of this handler's lists.
+func (h *Handlers) Copy() Handlers {
+	return Handlers{
+		Validate:         h.Validate.copy(),
+		Build:            h.Build.copy(),
+		Sign:             h.Sign.copy(),
+		Send:             h.Send.copy(),
+		ValidateResponse: h.ValidateResponse.copy(),
+		Unmarshal:        h.Unmarshal.copy(),
+		UnmarshalError:   h.UnmarshalError.copy(),
+		UnmarshalMeta:    h.UnmarshalMeta.copy(),
+		Retry:            h.Retry.copy(),
+		AfterRetry:       h.AfterRetry.copy(),
+	}
+}
+
+// Clear removes callback functions for all handlers
+func (h *Handlers) Clear() {
+	h.Validate.Clear()
+	h.Build.Clear()
+	h.Send.Clear()
+	h.Sign.Clear()
+	h.Unmarshal.Clear()
+	h.UnmarshalMeta.Clear()
+	h.UnmarshalError.Clear()
+	h.ValidateResponse.Clear()
+	h.Retry.Clear()
+	h.AfterRetry.Clear()
+}
+
+// A HandlerListRunItem represents an entry in the HandlerList which
+// is being run.
+type HandlerListRunItem struct {
+	Index   int
+	Handler NamedHandler
+	Request *Request
+}
+
+// A HandlerList manages zero or more handlers in a list.
+type HandlerList struct {
+	list []NamedHandler
+
+	// Called after each request handler in the list is called. If set
+	// and the func returns true the HandlerList will continue to iterate
+	// over the request handlers. If false is returned the HandlerList
+	// will stop iterating.
+	//
+	// Should be used if extra logic to be performed between each handler
+	// in the list. This can be used to terminate a list's iteration
+	// based on a condition such as error like, HandlerListStopOnError.
+	// Or for logging like HandlerListLogItem.
+	AfterEachFn func(item HandlerListRunItem) bool
+}
+
+// A NamedHandler is a struct that contains a name and function callback.
+type NamedHandler struct {
+	Name string
+	Fn   func(*Request)
+}
+
+// copy creates a copy of the handler list.
+func (l *HandlerList) copy() HandlerList {
+	n := HandlerList{
+		AfterEachFn: l.AfterEachFn,
+	}
+	n.list = append([]NamedHandler{}, l.list...)
+	return n
+}
+
+// Clear clears the handler list.
+func (l *HandlerList) Clear() {
+	l.list = []NamedHandler{}
+}
+
+// Len returns the number of handlers in the list.
+func (l *HandlerList) Len() int {
+	return len(l.list)
+}
+
+// PushBack pushes handler f to the back of the handler list.
+func (l *HandlerList) PushBack(f func(*Request)) {
+	l.list = append(l.list, NamedHandler{"__anonymous", f})
+}
+
+// PushFront pushes handler f to the front of the handler list.
+func (l *HandlerList) PushFront(f func(*Request)) {
+	l.list = append([]NamedHandler{{"__anonymous", f}}, l.list...)
+}
+
+// PushBackNamed pushes named handler f to the back of the handler list.
+func (l *HandlerList) PushBackNamed(n NamedHandler) {
+	l.list = append(l.list, n)
+}
+
+// PushFrontNamed pushes named handler f to the front of the handler list.
+func (l *HandlerList) PushFrontNamed(n NamedHandler) {
+	l.list = append([]NamedHandler{n}, l.list...)
+}
+
+// Remove removes a NamedHandler n
+func (l *HandlerList) Remove(n NamedHandler) {
+	newlist := []NamedHandler{}
+	for _, m := range l.list {
+		if m.Name != n.Name {
+			newlist = append(newlist, m)
+		}
+	}
+	l.list = newlist
+}
+
+// Run executes all handlers in the list with a given request object.
+func (l *HandlerList) Run(r *Request) {
+	for i, h := range l.list {
+		h.Fn(r)
+		item := HandlerListRunItem{
+			Index: i, Handler: h, Request: r,
+		}
+		if l.AfterEachFn != nil && !l.AfterEachFn(item) {
+			return
+		}
+	}
+}
+
+// HandlerListLogItem logs the request handler and the state of the
+// request's Error value. Always returns true to continue iterating
+// request handlers in a HandlerList.
+func HandlerListLogItem(item HandlerListRunItem) bool {
+	if item.Request.Config.Logger == nil {
+		return true
+	}
+	item.Request.Config.Logger.Log("DEBUG: RequestHandler",
+		item.Index, item.Handler.Name, item.Request.Error)
+
+	return true
+}
+
+// HandlerListStopOnError returns false to stop the HandlerList iterating
+// over request handlers if Request.Error is not nil. True otherwise
+// to continue iterating.
+func HandlerListStopOnError(item HandlerListRunItem) bool {
+	return item.Request.Error == nil
+}
+
+// MakeAddToUserAgentHandler will add the name/version pair to the User-Agent request
+// header. If the extra parameters are provided they will be added as metadata to the
+// name/version pair resulting in the following format.
+// "name/version (extra0; extra1; ...)"
+// The user agent part will be concatenated with this current request's user agent string.
+func MakeAddToUserAgentHandler(name, version string, extra ...string) func(*Request) {
+	ua := fmt.Sprintf("%s/%s", name, version)
+	if len(extra) > 0 {
+		ua += fmt.Sprintf(" (%s)", strings.Join(extra, "; "))
+	}
+	return func(r *Request) {
+		AddToUserAgent(r, ua)
+	}
+}
+
+// MakeAddToUserAgentFreeFormHandler adds the input to the User-Agent request header.
+// The input string will be concatenated with the current request's user agent string.
+func MakeAddToUserAgentFreeFormHandler(s string) func(*Request) {
+	return func(r *Request) {
+		AddToUserAgent(r, s)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go
new file mode 100644
index 0000000000..85eead3d51
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go
@@ -0,0 +1,302 @@
+package request
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"reflect"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/client/metadata"
+)
+
+// A Request is the service request to be made.
+type Request struct {
+	Config     aws.Config
+	ClientInfo metadata.ClientInfo
+	Handlers   Handlers
+
+	Retryer
+	Time             time.Time
+	ExpireTime       time.Duration
+	Operation        *Operation
+	HTTPRequest      *http.Request
+	HTTPResponse     *http.Response
+	Body             io.ReadSeeker
+	BodyStart        int64 // offset from beginning of Body that the request body starts
+	Params           interface{}
+	Error            error
+	Data             interface{}
+	RequestID        string
+	RetryCount       int
+	Retryable        *bool
+	RetryDelay       time.Duration
+	NotHoist         bool
+	SignedHeaderVals http.Header
+
+	built bool
+}
+
+// An Operation is the service API operation to be made.
+type Operation struct {
+	Name       string
+	HTTPMethod string
+	HTTPPath   string
+	*Paginator
+}
+
+// Paginator keeps track of pagination configuration for an API operation.
+type Paginator struct {
+	InputTokens     []string
+	OutputTokens    []string
+	LimitToken      string
+	TruncationToken string
+}
+
+// New returns a new Request pointer for the service API
+// operation and parameters.
+//
+// Params is any value of input parameters to be the request payload.
+// Data is pointer value to an object which the request's response
+// payload will be deserialized to.
+func New(cfg aws.Config, clientInfo metadata.ClientInfo, handlers Handlers,
+	retryer Retryer, operation *Operation, params interface{}, data interface{}) *Request {
+
+	method := operation.HTTPMethod
+	if method == "" {
+		method = "POST"
+	}
+	p := operation.HTTPPath
+	if p == "" {
+		p = "/"
+	}
+
+	httpReq, _ := http.NewRequest(method, "", nil)
+	httpReq.URL, _ = url.Parse(clientInfo.Endpoint + p)
+
+	r := &Request{
+		Config:     cfg,
+		ClientInfo: clientInfo,
+		Handlers:   handlers.Copy(),
+
+		Retryer:     retryer,
+		Time:        time.Now(),
+		ExpireTime:  0,
+		Operation:   operation,
+		HTTPRequest: httpReq,
+		Body:        nil,
+		Params:      params,
+		Error:       nil,
+		Data:        data,
+	}
+	r.SetBufferBody([]byte{})
+
+	return r
+}
+
+// WillRetry returns if the request's can be retried.
+func (r *Request) WillRetry() bool {
+	return r.Error != nil && aws.BoolValue(r.Retryable) && r.RetryCount < r.MaxRetries()
+}
+
+// ParamsFilled returns if the request's parameters have been populated
+// and the parameters are valid. False is returned if no parameters are
+// provided or invalid.
+func (r *Request) ParamsFilled() bool {
+	return r.Params != nil && reflect.ValueOf(r.Params).Elem().IsValid()
+}
+
+// DataFilled returns true if the request's data for response deserialization
+// target has been set and is a valid. False is returned if data is not
+// set, or is invalid.
+func (r *Request) DataFilled() bool {
+	return r.Data != nil && reflect.ValueOf(r.Data).Elem().IsValid()
+}
+
+// SetBufferBody will set the request's body bytes that will be sent to
+// the service API.
+func (r *Request) SetBufferBody(buf []byte) {
+	r.SetReaderBody(bytes.NewReader(buf))
+}
+
+// SetStringBody sets the body of the request to be backed by a string.
+func (r *Request) SetStringBody(s string) {
+	r.SetReaderBody(strings.NewReader(s))
+}
+
+// SetReaderBody will set the request's body reader.
+func (r *Request) SetReaderBody(reader io.ReadSeeker) {
+	r.HTTPRequest.Body = ioutil.NopCloser(reader)
+	r.Body = reader
+}
+
+// Presign returns the request's signed URL. Error will be returned
+// if the signing fails.
+func (r *Request) Presign(expireTime time.Duration) (string, error) {
+	r.ExpireTime = expireTime
+	r.NotHoist = false
+	r.Sign()
+	if r.Error != nil {
+		return "", r.Error
+	}
+	return r.HTTPRequest.URL.String(), nil
+}
+
+// PresignRequest behaves just like presign, but hoists all headers and signs them.
+// Also returns the signed hash back to the user
+func (r *Request) PresignRequest(expireTime time.Duration) (string, http.Header, error) {
+	r.ExpireTime = expireTime
+	r.NotHoist = true
+	r.Sign()
+	if r.Error != nil {
+		return "", nil, r.Error
+	}
+	return r.HTTPRequest.URL.String(), r.SignedHeaderVals, nil
+}
+
+func debugLogReqError(r *Request, stage string, retrying bool, err error) {
+	if !r.Config.LogLevel.Matches(aws.LogDebugWithRequestErrors) {
+		return
+	}
+
+	retryStr := "not retrying"
+	if retrying {
+		retryStr = "will retry"
+	}
+
+	r.Config.Logger.Log(fmt.Sprintf("DEBUG: %s %s/%s failed, %s, error %v",
+		stage, r.ClientInfo.ServiceName, r.Operation.Name, retryStr, err))
+}
+
+// Build will build the request's object so it can be signed and sent
+// to the service. Build will also validate all the request's parameters.
+// Anny additional build Handlers set on this request will be run
+// in the order they were set.
+//
+// The request will only be built once. Multiple calls to build will have
+// no effect.
+//
+// If any Validate or Build errors occur the build will stop and the error
+// which occurred will be returned.
+func (r *Request) Build() error {
+	if !r.built {
+		r.Error = nil
+		r.Handlers.Validate.Run(r)
+		if r.Error != nil {
+			debugLogReqError(r, "Validate Request", false, r.Error)
+			return r.Error
+		}
+		r.Handlers.Build.Run(r)
+		if r.Error != nil {
+			debugLogReqError(r, "Build Request", false, r.Error)
+			return r.Error
+		}
+		r.built = true
+	}
+
+	return r.Error
+}
+
+// Sign will sign the request retuning error if errors are encountered.
+//
+// Send will build the request prior to signing. All Sign Handlers will
+// be executed in the order they were set.
+func (r *Request) Sign() error {
+	r.Build()
+	if r.Error != nil {
+		debugLogReqError(r, "Build Request", false, r.Error)
+		return r.Error
+	}
+
+	r.Handlers.Sign.Run(r)
+	return r.Error
+}
+
+// Send will send the request returning error if errors are encountered.
+//
+// Send will sign the request prior to sending. All Send Handlers will
+// be executed in the order they were set.
+func (r *Request) Send() error {
+	for {
+		r.Sign()
+		if r.Error != nil {
+			return r.Error
+		}
+
+		if aws.BoolValue(r.Retryable) {
+			if r.Config.LogLevel.Matches(aws.LogDebugWithRequestRetries) {
+				r.Config.Logger.Log(fmt.Sprintf("DEBUG: Retrying Request %s/%s, attempt %d",
+					r.ClientInfo.ServiceName, r.Operation.Name, r.RetryCount))
+			}
+
+			// Closing response body. Since we are setting a new request to send off, this
+			// response will get squashed and leaked.
+			r.HTTPResponse.Body.Close()
+
+			// Re-seek the body back to the original point in for a retry so that
+			// send will send the body's contents again in the upcoming request.
+			r.Body.Seek(r.BodyStart, 0)
+			r.HTTPRequest.Body = ioutil.NopCloser(r.Body)
+		}
+		r.Retryable = nil
+
+		r.Handlers.Send.Run(r)
+		if r.Error != nil {
+			err := r.Error
+			r.Handlers.Retry.Run(r)
+			r.Handlers.AfterRetry.Run(r)
+			if r.Error != nil {
+				debugLogReqError(r, "Send Request", false, r.Error)
+				return r.Error
+			}
+			debugLogReqError(r, "Send Request", true, err)
+			continue
+		}
+
+		r.Handlers.UnmarshalMeta.Run(r)
+		r.Handlers.ValidateResponse.Run(r)
+		if r.Error != nil {
+			err := r.Error
+			r.Handlers.UnmarshalError.Run(r)
+			r.Handlers.Retry.Run(r)
+			r.Handlers.AfterRetry.Run(r)
+			if r.Error != nil {
+				debugLogReqError(r, "Validate Response", false, r.Error)
+				return r.Error
+			}
+			debugLogReqError(r, "Validate Response", true, err)
+			continue
+		}
+
+		r.Handlers.Unmarshal.Run(r)
+		if r.Error != nil {
+			err := r.Error
+			r.Handlers.Retry.Run(r)
+			r.Handlers.AfterRetry.Run(r)
+			if r.Error != nil {
+				debugLogReqError(r, "Unmarshal Response", false, r.Error)
+				return r.Error
+			}
+			debugLogReqError(r, "Unmarshal Response", true, err)
+			continue
+		}
+
+		break
+	}
+
+	return nil
+}
+
+// AddToUserAgent adds the string to the end of the request's current user agent.
+func AddToUserAgent(r *Request, s string) {
+	curUA := r.HTTPRequest.Header.Get("User-Agent")
+	if len(curUA) > 0 {
+		s = curUA + " " + s
+	}
+	r.HTTPRequest.Header.Set("User-Agent", s)
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
new file mode 100644
index 0000000000..2939ec473f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
@@ -0,0 +1,104 @@
+package request
+
+import (
+	"reflect"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
+)
+
+//type Paginater interface {
+//	HasNextPage() bool
+//	NextPage() *Request
+//	EachPage(fn func(data interface{}, isLastPage bool) (shouldContinue bool)) error
+//}
+
+// HasNextPage returns true if this request has more pages of data available.
+func (r *Request) HasNextPage() bool {
+	return len(r.nextPageTokens()) > 0
+}
+
+// nextPageTokens returns the tokens to use when asking for the next page of
+// data.
+func (r *Request) nextPageTokens() []interface{} {
+	if r.Operation.Paginator == nil {
+		return nil
+	}
+
+	if r.Operation.TruncationToken != "" {
+		tr, _ := awsutil.ValuesAtPath(r.Data, r.Operation.TruncationToken)
+		if len(tr) == 0 {
+			return nil
+		}
+
+		switch v := tr[0].(type) {
+		case *bool:
+			if !aws.BoolValue(v) {
+				return nil
+			}
+		case bool:
+			if v == false {
+				return nil
+			}
+		}
+	}
+
+	tokens := []interface{}{}
+	tokenAdded := false
+	for _, outToken := range r.Operation.OutputTokens {
+		v, _ := awsutil.ValuesAtPath(r.Data, outToken)
+		if len(v) > 0 {
+			tokens = append(tokens, v[0])
+			tokenAdded = true
+		} else {
+			tokens = append(tokens, nil)
+		}
+	}
+	if !tokenAdded {
+		return nil
+	}
+
+	return tokens
+}
+
+// NextPage returns a new Request that can be executed to return the next
+// page of result data. Call .Send() on this request to execute it.
+func (r *Request) NextPage() *Request {
+	tokens := r.nextPageTokens()
+	if len(tokens) == 0 {
+		return nil
+	}
+
+	data := reflect.New(reflect.TypeOf(r.Data).Elem()).Interface()
+	nr := New(r.Config, r.ClientInfo, r.Handlers, r.Retryer, r.Operation, awsutil.CopyOf(r.Params), data)
+	for i, intok := range nr.Operation.InputTokens {
+		awsutil.SetValueAtPath(nr.Params, intok, tokens[i])
+	}
+	return nr
+}
+
+// EachPage iterates over each page of a paginated request object. The fn
+// parameter should be a function with the following sample signature:
+//
+//   func(page *T, lastPage bool) bool {
+//       return true // return false to stop iterating
+//   }
+//
+// Where "T" is the structure type matching the output structure of the given
+// operation. For example, a request object generated by
+// DynamoDB.ListTablesRequest() would expect to see dynamodb.ListTablesOutput
+// as the structure "T". The lastPage value represents whether the page is
+// the last page of data or not. The return value of this function should
+// return true to keep iterating or false to stop.
+func (r *Request) EachPage(fn func(data interface{}, isLastPage bool) (shouldContinue bool)) error {
+	for page := r; page != nil; page = page.NextPage() {
+		if err := page.Send(); err != nil {
+			return err
+		}
+		if getNextPage := fn(page.Data, !page.HasNextPage()); !getNextPage {
+			return page.Error
+		}
+	}
+
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go
new file mode 100644
index 0000000000..ab6fff5ac8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go
@@ -0,0 +1,82 @@
+package request
+
+import (
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+// Retryer is an interface to control retry logic for a given service.
+// The default implementation used by most services is the service.DefaultRetryer
+// structure, which contains basic retry logic using exponential backoff.
+type Retryer interface {
+	RetryRules(*Request) time.Duration
+	ShouldRetry(*Request) bool
+	MaxRetries() int
+}
+
+// WithRetryer sets a config Retryer value to the given Config returning it
+// for chaining.
+func WithRetryer(cfg *aws.Config, retryer Retryer) *aws.Config {
+	cfg.Retryer = retryer
+	return cfg
+}
+
+// retryableCodes is a collection of service response codes which are retry-able
+// without any further action.
+var retryableCodes = map[string]struct{}{
+	"RequestError":                           {},
+	"RequestTimeout":                         {},
+	"ProvisionedThroughputExceededException": {},
+	"Throttling":                             {},
+	"ThrottlingException":                    {},
+	"RequestLimitExceeded":                   {},
+	"RequestThrottled":                       {},
+	"LimitExceededException":                 {}, // Deleting 10+ DynamoDb tables at once
+	"TooManyRequestsException":               {}, // Lambda functions
+}
+
+// credsExpiredCodes is a collection of error codes which signify the credentials
+// need to be refreshed. Expired tokens require refreshing of credentials, and
+// resigning before the request can be retried.
+var credsExpiredCodes = map[string]struct{}{
+	"ExpiredToken":          {},
+	"ExpiredTokenException": {},
+	"RequestExpired":        {}, // EC2 Only
+}
+
+func isCodeRetryable(code string) bool {
+	if _, ok := retryableCodes[code]; ok {
+		return true
+	}
+
+	return isCodeExpiredCreds(code)
+}
+
+func isCodeExpiredCreds(code string) bool {
+	_, ok := credsExpiredCodes[code]
+	return ok
+}
+
+// IsErrorRetryable returns whether the error is retryable, based on its Code.
+// Returns false if the request has no Error set.
+func (r *Request) IsErrorRetryable() bool {
+	if r.Error != nil {
+		if err, ok := r.Error.(awserr.Error); ok {
+			return isCodeRetryable(err.Code())
+		}
+	}
+	return false
+}
+
+// IsErrorExpired returns whether the error code is a credential expiry error.
+// Returns false if the request has no Error set.
+func (r *Request) IsErrorExpired() bool {
+	if r.Error != nil {
+		if err, ok := r.Error.(awserr.Error); ok {
+			return isCodeExpiredCreds(err.Code())
+		}
+	}
+	return false
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go
new file mode 100644
index 0000000000..0f067c57f4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go
@@ -0,0 +1,88 @@
+package aws
+
+import (
+	"io"
+	"sync"
+)
+
+// ReadSeekCloser wraps a io.Reader returning a ReaderSeekerCloser
+func ReadSeekCloser(r io.Reader) ReaderSeekerCloser {
+	return ReaderSeekerCloser{r}
+}
+
+// ReaderSeekerCloser represents a reader that can also delegate io.Seeker and
+// io.Closer interfaces to the underlying object if they are available.
+type ReaderSeekerCloser struct {
+	r io.Reader
+}
+
+// Read reads from the reader up to size of p. The number of bytes read, and
+// error if it occurred will be returned.
+//
+// If the reader is not an io.Reader zero bytes read, and nil error will be returned.
+//
+// Performs the same functionality as io.Reader Read
+func (r ReaderSeekerCloser) Read(p []byte) (int, error) {
+	switch t := r.r.(type) {
+	case io.Reader:
+		return t.Read(p)
+	}
+	return 0, nil
+}
+
+// Seek sets the offset for the next Read to offset, interpreted according to
+// whence: 0 means relative to the origin of the file, 1 means relative to the
+// current offset, and 2 means relative to the end. Seek returns the new offset
+// and an error, if any.
+//
+// If the ReaderSeekerCloser is not an io.Seeker nothing will be done.
+func (r ReaderSeekerCloser) Seek(offset int64, whence int) (int64, error) {
+	switch t := r.r.(type) {
+	case io.Seeker:
+		return t.Seek(offset, whence)
+	}
+	return int64(0), nil
+}
+
+// Close closes the ReaderSeekerCloser.
+//
+// If the ReaderSeekerCloser is not an io.Closer nothing will be done.
+func (r ReaderSeekerCloser) Close() error {
+	switch t := r.r.(type) {
+	case io.Closer:
+		return t.Close()
+	}
+	return nil
+}
+
+// A WriteAtBuffer provides a in memory buffer supporting the io.WriterAt interface
+// Can be used with the s3manager.Downloader to download content to a buffer
+// in memory. Safe to use concurrently.
+type WriteAtBuffer struct {
+	buf []byte
+	m   sync.Mutex
+}
+
+// WriteAt writes a slice of bytes to a buffer starting at the position provided
+// The number of bytes written will be returned, or error. Can overwrite previous
+// written slices if the write ats overlap.
+func (b *WriteAtBuffer) WriteAt(p []byte, pos int64) (n int, err error) {
+	b.m.Lock()
+	defer b.m.Unlock()
+
+	expLen := pos + int64(len(p))
+	if int64(len(b.buf)) < expLen {
+		newBuf := make([]byte, expLen)
+		copy(newBuf, b.buf)
+		b.buf = newBuf
+	}
+	copy(b.buf[pos:], p)
+	return len(p), nil
+}
+
+// Bytes returns a slice of bytes written to the buffer.
+func (b *WriteAtBuffer) Bytes() []byte {
+	b.m.Lock()
+	defer b.m.Unlock()
+	return b.buf[:len(b.buf):len(b.buf)]
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go
new file mode 100644
index 0000000000..669da2d695
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go
@@ -0,0 +1,8 @@
+// Package aws provides core functionality for making requests to AWS services.
+package aws
+
+// SDKName is the name of this AWS SDK
+const SDKName = "aws-sdk-go"
+
+// SDKVersion is the version of this SDK
+const SDKVersion = "1.1.7"
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
new file mode 100644
index 0000000000..5469edb60b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
@@ -0,0 +1,257 @@
+// Package rest provides RESTful serialization of AWS requests and responses.
+package rest
+
+import (
+	"bytes"
+	"encoding/base64"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"path"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
+)
+
+// RFC822 returns an RFC822 formatted timestamp for AWS protocols
+const RFC822 = "Mon, 2 Jan 2006 15:04:05 GMT"
+
+// Whether the byte value can be sent without escaping in AWS URLs
+var noEscape [256]bool
+
+var errValueNotSet = fmt.Errorf("value not set")
+
+func init() {
+	for i := 0; i < len(noEscape); i++ {
+		// AWS expects every character except these to be escaped
+		noEscape[i] = (i >= 'A' && i <= 'Z') ||
+			(i >= 'a' && i <= 'z') ||
+			(i >= '0' && i <= '9') ||
+			i == '-' ||
+			i == '.' ||
+			i == '_' ||
+			i == '~'
+	}
+}
+
+// BuildHandler is a named request handler for building rest protocol requests
+var BuildHandler = request.NamedHandler{Name: "awssdk.rest.Build", Fn: Build}
+
+// Build builds the REST component of a service request.
+func Build(r *request.Request) {
+	if r.ParamsFilled() {
+		v := reflect.ValueOf(r.Params).Elem()
+		buildLocationElements(r, v)
+		buildBody(r, v)
+	}
+}
+
+func buildLocationElements(r *request.Request, v reflect.Value) {
+	query := r.HTTPRequest.URL.Query()
+
+	for i := 0; i < v.NumField(); i++ {
+		m := v.Field(i)
+		if n := v.Type().Field(i).Name; n[0:1] == strings.ToLower(n[0:1]) {
+			continue
+		}
+
+		if m.IsValid() {
+			field := v.Type().Field(i)
+			name := field.Tag.Get("locationName")
+			if name == "" {
+				name = field.Name
+			}
+			if m.Kind() == reflect.Ptr {
+				m = m.Elem()
+			}
+			if !m.IsValid() {
+				continue
+			}
+
+			var err error
+			switch field.Tag.Get("location") {
+			case "headers": // header maps
+				err = buildHeaderMap(&r.HTTPRequest.Header, m, field.Tag.Get("locationName"))
+			case "header":
+				err = buildHeader(&r.HTTPRequest.Header, m, name)
+			case "uri":
+				err = buildURI(r.HTTPRequest.URL, m, name)
+			case "querystring":
+				err = buildQueryString(query, m, name)
+			}
+			r.Error = err
+		}
+		if r.Error != nil {
+			return
+		}
+	}
+
+	r.HTTPRequest.URL.RawQuery = query.Encode()
+	updatePath(r.HTTPRequest.URL, r.HTTPRequest.URL.Path)
+}
+
+func buildBody(r *request.Request, v reflect.Value) {
+	if field, ok := v.Type().FieldByName("_"); ok {
+		if payloadName := field.Tag.Get("payload"); payloadName != "" {
+			pfield, _ := v.Type().FieldByName(payloadName)
+			if ptag := pfield.Tag.Get("type"); ptag != "" && ptag != "structure" {
+				payload := reflect.Indirect(v.FieldByName(payloadName))
+				if payload.IsValid() && payload.Interface() != nil {
+					switch reader := payload.Interface().(type) {
+					case io.ReadSeeker:
+						r.SetReaderBody(reader)
+					case []byte:
+						r.SetBufferBody(reader)
+					case string:
+						r.SetStringBody(reader)
+					default:
+						r.Error = awserr.New("SerializationError",
+							"failed to encode REST request",
+							fmt.Errorf("unknown payload type %s", payload.Type()))
+					}
+				}
+			}
+		}
+	}
+}
+
+func buildHeader(header *http.Header, v reflect.Value, name string) error {
+	str, err := convertType(v)
+	if err == errValueNotSet {
+		return nil
+	} else if err != nil {
+		return awserr.New("SerializationError", "failed to encode REST request", err)
+	}
+
+	header.Add(name, str)
+
+	return nil
+}
+
+func buildHeaderMap(header *http.Header, v reflect.Value, prefix string) error {
+	for _, key := range v.MapKeys() {
+		str, err := convertType(v.MapIndex(key))
+		if err == errValueNotSet {
+			continue
+		} else if err != nil {
+			return awserr.New("SerializationError", "failed to encode REST request", err)
+
+		}
+
+		header.Add(prefix+key.String(), str)
+	}
+	return nil
+}
+
+func buildURI(u *url.URL, v reflect.Value, name string) error {
+	value, err := convertType(v)
+	if err == errValueNotSet {
+		return nil
+	} else if err != nil {
+		return awserr.New("SerializationError", "failed to encode REST request", err)
+	}
+
+	uri := u.Path
+	uri = strings.Replace(uri, "{"+name+"}", EscapePath(value, true), -1)
+	uri = strings.Replace(uri, "{"+name+"+}", EscapePath(value, false), -1)
+	u.Path = uri
+
+	return nil
+}
+
+func buildQueryString(query url.Values, v reflect.Value, name string) error {
+	switch value := v.Interface().(type) {
+	case []*string:
+		for _, item := range value {
+			query.Add(name, *item)
+		}
+	case map[string]*string:
+		for key, item := range value {
+			query.Add(key, *item)
+		}
+	case map[string][]*string:
+		for key, items := range value {
+			for _, item := range items {
+				query.Add(key, *item)
+			}
+		}
+	default:
+		str, err := convertType(v)
+		if err == errValueNotSet {
+			return nil
+		} else if err != nil {
+			return awserr.New("SerializationError", "failed to encode REST request", err)
+		}
+		query.Set(name, str)
+	}
+
+	return nil
+}
+
+func updatePath(url *url.URL, urlPath string) {
+	scheme, query := url.Scheme, url.RawQuery
+
+	hasSlash := strings.HasSuffix(urlPath, "/")
+
+	// clean up path
+	urlPath = path.Clean(urlPath)
+	if hasSlash && !strings.HasSuffix(urlPath, "/") {
+		urlPath += "/"
+	}
+
+	// get formatted URL minus scheme so we can build this into Opaque
+	url.Scheme, url.Path, url.RawQuery = "", "", ""
+	s := url.String()
+	url.Scheme = scheme
+	url.RawQuery = query
+
+	// build opaque URI
+	url.Opaque = s + urlPath
+}
+
+// EscapePath escapes part of a URL path in Amazon style
+func EscapePath(path string, encodeSep bool) string {
+	var buf bytes.Buffer
+	for i := 0; i < len(path); i++ {
+		c := path[i]
+		if noEscape[c] || (c == '/' && !encodeSep) {
+			buf.WriteByte(c)
+		} else {
+			buf.WriteByte('%')
+			buf.WriteString(strings.ToUpper(strconv.FormatUint(uint64(c), 16)))
+		}
+	}
+	return buf.String()
+}
+
+func convertType(v reflect.Value) (string, error) {
+	v = reflect.Indirect(v)
+	if !v.IsValid() {
+		return "", errValueNotSet
+	}
+
+	var str string
+	switch value := v.Interface().(type) {
+	case string:
+		str = value
+	case []byte:
+		str = base64.StdEncoding.EncodeToString(value)
+	case bool:
+		str = strconv.FormatBool(value)
+	case int64:
+		str = strconv.FormatInt(value, 10)
+	case float64:
+		str = strconv.FormatFloat(value, 'f', -1, 64)
+	case time.Time:
+		str = value.UTC().Format(RFC822)
+	default:
+		err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
+		return "", err
+	}
+	return str, nil
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
new file mode 100644
index 0000000000..4366de2e1e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
@@ -0,0 +1,45 @@
+package rest
+
+import "reflect"
+
+// PayloadMember returns the payload field member of i if there is one, or nil.
+func PayloadMember(i interface{}) interface{} {
+	if i == nil {
+		return nil
+	}
+
+	v := reflect.ValueOf(i).Elem()
+	if !v.IsValid() {
+		return nil
+	}
+	if field, ok := v.Type().FieldByName("_"); ok {
+		if payloadName := field.Tag.Get("payload"); payloadName != "" {
+			field, _ := v.Type().FieldByName(payloadName)
+			if field.Tag.Get("type") != "structure" {
+				return nil
+			}
+
+			payload := v.FieldByName(payloadName)
+			if payload.IsValid() || (payload.Kind() == reflect.Ptr && !payload.IsNil()) {
+				return payload.Interface()
+			}
+		}
+	}
+	return nil
+}
+
+// PayloadType returns the type of a payload field member of i if there is one, or "".
+func PayloadType(i interface{}) string {
+	v := reflect.Indirect(reflect.ValueOf(i))
+	if !v.IsValid() {
+		return ""
+	}
+	if field, ok := v.Type().FieldByName("_"); ok {
+		if payloadName := field.Tag.Get("payload"); payloadName != "" {
+			if member, ok := v.Type().FieldByName(payloadName); ok {
+				return member.Tag.Get("type")
+			}
+		}
+	}
+	return ""
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
new file mode 100644
index 0000000000..ba46f5bc9f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
@@ -0,0 +1,193 @@
+package rest
+
+import (
+	"encoding/base64"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
+)
+
+// UnmarshalHandler is a named request handler for unmarshaling rest protocol requests
+var UnmarshalHandler = request.NamedHandler{Name: "awssdk.rest.Unmarshal", Fn: Unmarshal}
+
+// UnmarshalMetaHandler is a named request handler for unmarshaling rest protocol request metadata
+var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.rest.UnmarshalMeta", Fn: UnmarshalMeta}
+
+// Unmarshal unmarshals the REST component of a response in a REST service.
+func Unmarshal(r *request.Request) {
+	if r.DataFilled() {
+		v := reflect.Indirect(reflect.ValueOf(r.Data))
+		unmarshalBody(r, v)
+	}
+}
+
+// UnmarshalMeta unmarshals the REST metadata of a response in a REST service
+func UnmarshalMeta(r *request.Request) {
+	r.RequestID = r.HTTPResponse.Header.Get("X-Amzn-Requestid")
+	if r.RequestID == "" {
+		// Alternative version of request id in the header
+		r.RequestID = r.HTTPResponse.Header.Get("X-Amz-Request-Id")
+	}
+	if r.DataFilled() {
+		v := reflect.Indirect(reflect.ValueOf(r.Data))
+		unmarshalLocationElements(r, v)
+	}
+}
+
+func unmarshalBody(r *request.Request, v reflect.Value) {
+	if field, ok := v.Type().FieldByName("_"); ok {
+		if payloadName := field.Tag.Get("payload"); payloadName != "" {
+			pfield, _ := v.Type().FieldByName(payloadName)
+			if ptag := pfield.Tag.Get("type"); ptag != "" && ptag != "structure" {
+				payload := v.FieldByName(payloadName)
+				if payload.IsValid() {
+					switch payload.Interface().(type) {
+					case []byte:
+						b, err := ioutil.ReadAll(r.HTTPResponse.Body)
+						if err != nil {
+							r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+						} else {
+							payload.Set(reflect.ValueOf(b))
+						}
+					case *string:
+						b, err := ioutil.ReadAll(r.HTTPResponse.Body)
+						if err != nil {
+							r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+						} else {
+							str := string(b)
+							payload.Set(reflect.ValueOf(&str))
+						}
+					default:
+						switch payload.Type().String() {
+						case "io.ReadSeeker":
+							payload.Set(reflect.ValueOf(aws.ReadSeekCloser(r.HTTPResponse.Body)))
+						case "aws.ReadSeekCloser", "io.ReadCloser":
+							payload.Set(reflect.ValueOf(r.HTTPResponse.Body))
+						default:
+							r.Error = awserr.New("SerializationError",
+								"failed to decode REST response",
+								fmt.Errorf("unknown payload type %s", payload.Type()))
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+func unmarshalLocationElements(r *request.Request, v reflect.Value) {
+	for i := 0; i < v.NumField(); i++ {
+		m, field := v.Field(i), v.Type().Field(i)
+		if n := field.Name; n[0:1] == strings.ToLower(n[0:1]) {
+			continue
+		}
+
+		if m.IsValid() {
+			name := field.Tag.Get("locationName")
+			if name == "" {
+				name = field.Name
+			}
+
+			switch field.Tag.Get("location") {
+			case "statusCode":
+				unmarshalStatusCode(m, r.HTTPResponse.StatusCode)
+			case "header":
+				err := unmarshalHeader(m, r.HTTPResponse.Header.Get(name))
+				if err != nil {
+					r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+					break
+				}
+			case "headers":
+				prefix := field.Tag.Get("locationName")
+				err := unmarshalHeaderMap(m, r.HTTPResponse.Header, prefix)
+				if err != nil {
+					r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+					break
+				}
+			}
+		}
+		if r.Error != nil {
+			return
+		}
+	}
+}
+
+func unmarshalStatusCode(v reflect.Value, statusCode int) {
+	if !v.IsValid() {
+		return
+	}
+
+	switch v.Interface().(type) {
+	case *int64:
+		s := int64(statusCode)
+		v.Set(reflect.ValueOf(&s))
+	}
+}
+
+func unmarshalHeaderMap(r reflect.Value, headers http.Header, prefix string) error {
+	switch r.Interface().(type) {
+	case map[string]*string: // we only support string map value types
+		out := map[string]*string{}
+		for k, v := range headers {
+			k = http.CanonicalHeaderKey(k)
+			if strings.HasPrefix(strings.ToLower(k), strings.ToLower(prefix)) {
+				out[k[len(prefix):]] = &v[0]
+			}
+		}
+		r.Set(reflect.ValueOf(out))
+	}
+	return nil
+}
+
+func unmarshalHeader(v reflect.Value, header string) error {
+	if !v.IsValid() || (header == "" && v.Elem().Kind() != reflect.String) {
+		return nil
+	}
+
+	switch v.Interface().(type) {
+	case *string:
+		v.Set(reflect.ValueOf(&header))
+	case []byte:
+		b, err := base64.StdEncoding.DecodeString(header)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&b))
+	case *bool:
+		b, err := strconv.ParseBool(header)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&b))
+	case *int64:
+		i, err := strconv.ParseInt(header, 10, 64)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&i))
+	case *float64:
+		f, err := strconv.ParseFloat(header, 64)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&f))
+	case *time.Time:
+		t, err := time.Parse(RFC822, header)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&t))
+	default:
+		err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
+		return err
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go
new file mode 100644
index 0000000000..244c86da05
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go
@@ -0,0 +1,82 @@
+package v4
+
+import (
+	"net/http"
+	"strings"
+)
+
+// validator houses a set of rule needed for validation of a
+// string value
+type rules []rule
+
+// rule interface allows for more flexible rules and just simply
+// checks whether or not a value adheres to that rule
+type rule interface {
+	IsValid(value string) bool
+}
+
+// IsValid will iterate through all rules and see if any rules
+// apply to the value and supports nested rules
+func (r rules) IsValid(value string) bool {
+	for _, rule := range r {
+		if rule.IsValid(value) {
+			return true
+		}
+	}
+	return false
+}
+
+// mapRule generic rule for maps
+type mapRule map[string]struct{}
+
+// IsValid for the map rule satisfies whether it exists in the map
+func (m mapRule) IsValid(value string) bool {
+	_, ok := m[value]
+	return ok
+}
+
+// whitelist is a generic rule for whitelisting
+type whitelist struct {
+	rule
+}
+
+// IsValid for whitelist checks if the value is within the whitelist
+func (w whitelist) IsValid(value string) bool {
+	return w.rule.IsValid(value)
+}
+
+// blacklist is a generic rule for blacklisting
+type blacklist struct {
+	rule
+}
+
+// IsValid for whitelist checks if the value is within the whitelist
+func (b blacklist) IsValid(value string) bool {
+	return !b.rule.IsValid(value)
+}
+
+type patterns []string
+
+// IsValid for patterns checks each pattern and returns if a match has
+// been found
+func (p patterns) IsValid(value string) bool {
+	for _, pattern := range p {
+		if strings.HasPrefix(http.CanonicalHeaderKey(value), pattern) {
+			return true
+		}
+	}
+	return false
+}
+
+// inclusiveRules rules allow for rules to depend on one another
+type inclusiveRules []rule
+
+// IsValid will return true if all rules are true
+func (r inclusiveRules) IsValid(value string) bool {
+	for _, rule := range r {
+		if !rule.IsValid(value) {
+			return false
+		}
+	}
+	return true
+}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
new file mode 100644
index 0000000000..14b0c66161
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
@@ -0,0 +1,438 @@
+// Package v4 implements signing for AWS V4 signer
+package v4
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/private/protocol/rest"
+)
+
+const (
+	authHeaderPrefix = "AWS4-HMAC-SHA256"
+	timeFormat       = "20060102T150405Z"
+	shortTimeFormat  = "20060102"
+)
+
+var ignoredHeaders = rules{
+	blacklist{
+		mapRule{
+			"Content-Length": struct{}{},
+			"User-Agent":     struct{}{},
+		},
+	},
+}
+
+// requiredSignedHeaders is a whitelist for build canonical headers.
+var requiredSignedHeaders = rules{
+	whitelist{
+		mapRule{
+			"Cache-Control":                                               struct{}{},
+			"Content-Disposition":                                         struct{}{},
+			"Content-Encoding":                                            struct{}{},
+			"Content-Language":                                            struct{}{},
+			"Content-Md5":                                                 struct{}{},
+			"Content-Type":                                                struct{}{},
+			"Expires":                                                     struct{}{},
+			"If-Match":                                                    struct{}{},
+			"If-Modified-Since":                                           struct{}{},
+			"If-None-Match":                                               struct{}{},
+			"If-Unmodified-Since":                                         struct{}{},
+			"Range":                                                       struct{}{},
+			"X-Amz-Acl":                                                   struct{}{},
+			"X-Amz-Copy-Source":                                           struct{}{},
+			"X-Amz-Copy-Source-If-Match":                                  struct{}{},
+			"X-Amz-Copy-Source-If-Modified-Since":                         struct{}{},
+			"X-Amz-Copy-Source-If-None-Match":                             struct{}{},
+			"X-Amz-Copy-Source-If-Unmodified-Since":                       struct{}{},
+			"X-Amz-Copy-Source-Range":                                     struct{}{},
+			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Algorithm": struct{}{},
+			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key":       struct{}{},
+			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key-Md5":   struct{}{},
+			"X-Amz-Grant-Full-control":                                    struct{}{},
+			"X-Amz-Grant-Read":                                            struct{}{},
+			"X-Amz-Grant-Read-Acp":                                        struct{}{},
+			"X-Amz-Grant-Write":                                           struct{}{},
+			"X-Amz-Grant-Write-Acp":                                       struct{}{},
+			"X-Amz-Metadata-Directive":                                    struct{}{},
+			"X-Amz-Mfa":                                                   struct{}{},
+			"X-Amz-Request-Payer":                                         struct{}{},
+			"X-Amz-Server-Side-Encryption":                                struct{}{},
+			"X-Amz-Server-Side-Encryption-Aws-Kms-Key-Id":                 struct{}{},
+			"X-Amz-Server-Side-Encryption-Customer-Algorithm":             struct{}{},
+			"X-Amz-Server-Side-Encryption-Customer-Key":                   struct{}{},
+			"X-Amz-Server-Side-Encryption-Customer-Key-Md5":               struct{}{},
+			"X-Amz-Storage-Class":                                         struct{}{},
+			"X-Amz-Website-Redirect-Location":                             struct{}{},
+		},
+	},
+	patterns{"X-Amz-Meta-"},
+}
+
+// allowedHoisting is a whitelist for build query headers. The boolean value
+// represents whether or not it is a pattern.
+var allowedQueryHoisting = inclusiveRules{
+	blacklist{requiredSignedHeaders},
+	patterns{"X-Amz-"},
+}
+
+type signer struct {
+	Request     *http.Request
+	Time        time.Time
+	ExpireTime  time.Duration
+	ServiceName string
+	Region      string
+	CredValues  credentials.Value
+	Credentials *credentials.Credentials
+	Query       url.Values
+	Body        io.ReadSeeker
+	Debug       aws.LogLevelType
+	Logger      aws.Logger
+
+	isPresign          bool
+	formattedTime      string
+	formattedShortTime string
+
+	signedHeaders    string
+	canonicalHeaders string
+	canonicalString  string
+	credentialString string
+	stringToSign     string
+	signature        string
+	authorization    string
+	notHoist         bool
+	signedHeaderVals http.Header
+}
+
+// Sign requests with signature version 4.
+//
+// Will sign the requests with the service config's Credentials object
+// Signing is skipped if the credentials is the credentials.AnonymousCredentials
+// object.
+func Sign(req *request.Request) {
+	// If the request does not need to be signed ignore the signing of the
+	// request if the AnonymousCredentials object is used.
+	if req.Config.Credentials == credentials.AnonymousCredentials {
+		return
+	}
+
+	region := req.ClientInfo.SigningRegion
+	if region == "" {
+		region = aws.StringValue(req.Config.Region)
+	}
+
+	name := req.ClientInfo.SigningName
+	if name == "" {
+		name = req.ClientInfo.ServiceName
+	}
+
+	s := signer{
+		Request:     req.HTTPRequest,
+		Time:        req.Time,
+		ExpireTime:  req.ExpireTime,
+		Query:       req.HTTPRequest.URL.Query(),
+		Body:        req.Body,
+		ServiceName: name,
+		Region:      region,
+		Credentials: req.Config.Credentials,
+		Debug:       req.Config.LogLevel.Value(),
+		Logger:      req.Config.Logger,
+		notHoist:    req.NotHoist,
+	}
+
+	req.Error = s.sign()
+	req.SignedHeaderVals = s.signedHeaderVals
+}
+
+func (v4 *signer) sign() error {
+	if v4.ExpireTime != 0 {
+		v4.isPresign = true
+	}
+
+	if v4.isRequestSigned() {
+		if !v4.Credentials.IsExpired() {
+			// If the request is already signed, and the credentials have not
+			// expired yet ignore the signing request.
+			return nil
+		}
+
+		// The credentials have expired for this request. The current signing
+		// is invalid, and needs to be request because the request will fail.
+		if v4.isPresign {
+			v4.removePresign()
+			// Update the request's query string to ensure the values stays in
+			// sync in the case retrieving the new credentials fails.
+			v4.Request.URL.RawQuery = v4.Query.Encode()
+		}
+	}
+
+	var err error
+	v4.CredValues, err = v4.Credentials.Get()
+	if err != nil {
+		return err
+	}
+
+	if v4.isPresign {
+		v4.Query.Set("X-Amz-Algorithm", authHeaderPrefix)
+		if v4.CredValues.SessionToken != "" {
+			v4.Query.Set("X-Amz-Security-Token", v4.CredValues.SessionToken)
+		} else {
+			v4.Query.Del("X-Amz-Security-Token")
+		}
+	} else if v4.CredValues.SessionToken != "" {
+		v4.Request.Header.Set("X-Amz-Security-Token", v4.CredValues.SessionToken)
+	}
+
+	v4.build()
+
+	if v4.Debug.Matches(aws.LogDebugWithSigning) {
+		v4.logSigningInfo()
+	}
+
+	return nil
+}
+
+const logSignInfoMsg = `DEBUG: Request Signiture:
+---[ CANONICAL STRING  ]-----------------------------
+%s
+---[ STRING TO SIGN ]--------------------------------
+%s%s
+-----------------------------------------------------`
+const logSignedURLMsg = `
+---[ SIGNED URL ]------------------------------------
+%s`
+
+func (v4 *signer) logSigningInfo() {
+	signedURLMsg := ""
+	if v4.isPresign {
+		signedURLMsg = fmt.Sprintf(logSignedURLMsg, v4.Request.URL.String())
+	}
+	msg := fmt.Sprintf(logSignInfoMsg, v4.canonicalString, v4.stringToSign, signedURLMsg)
+	v4.Logger.Log(msg)
+}
+
+func (v4 *signer) build() {
+
+	v4.buildTime()             // no depends
+	v4.buildCredentialString() // no depends
+
+	unsignedHeaders := v4.Request.Header
+	if v4.isPresign {
+		if !v4.notHoist {
+			urlValues := url.Values{}
+			urlValues, unsignedHeaders = buildQuery(allowedQueryHoisting, unsignedHeaders) // no depends
+			for k := range urlValues {
+				v4.Query[k] = urlValues[k]
+			}
+		}
+	}
+
+	v4.buildCanonicalHeaders(ignoredHeaders, unsignedHeaders)
+	v4.buildCanonicalString() // depends on canon headers / signed headers
+	v4.buildStringToSign()    // depends on canon string
+	v4.buildSignature()       // depends on string to sign
+
+	if v4.isPresign {
+		v4.Request.URL.RawQuery += "&X-Amz-Signature=" + v4.signature
+	} else {
+		parts := []string{
+			authHeaderPrefix + " Credential=" + v4.CredValues.AccessKeyID + "/" + v4.credentialString,
+			"SignedHeaders=" + v4.signedHeaders,
+			"Signature=" + v4.signature,
+		}
+		v4.Request.Header.Set("Authorization", strings.Join(parts, ", "))
+	}
+}
+
+func (v4 *signer) buildTime() {
+	v4.formattedTime = v4.Time.UTC().Format(timeFormat)
+	v4.formattedShortTime = v4.Time.UTC().Format(shortTimeFormat)
+
+	if v4.isPresign {
+		duration := int64(v4.ExpireTime / time.Second)
+		v4.Query.Set("X-Amz-Date", v4.formattedTime)
+		v4.Query.Set("X-Amz-Expires", strconv.FormatInt(duration, 10))
+	} else {
+		v4.Request.Header.Set("X-Amz-Date", v4.formattedTime)
+	}
+}
+
+func (v4 *signer) buildCredentialString() {
+	v4.credentialString = strings.Join([]string{
+		v4.formattedShortTime,
+		v4.Region,
+		v4.ServiceName,
+		"aws4_request",
+	}, "/")
+
+	if v4.isPresign {
+		v4.Query.Set("X-Amz-Credential", v4.CredValues.AccessKeyID+"/"+v4.credentialString)
+	}
+}
+
+func buildQuery(r rule, header http.Header) (url.Values, http.Header) {
+	query := url.Values{}
+	unsignedHeaders := http.Header{}
+	for k, h := range header {
+		if r.IsValid(k) {
+			query[k] = h
+		} else {
+			unsignedHeaders[k] = h
+		}
+	}
+
+	return query, unsignedHeaders
+}
+func (v4 *signer) buildCanonicalHeaders(r rule, header http.Header) {
+	var headers []string
+	headers = append(headers, "host")
+	for k, v := range header {
+		canonicalKey := http.CanonicalHeaderKey(k)
+		if !r.IsValid(canonicalKey) {
+			continue // ignored header
+		}
+
+		lowerCaseKey := strings.ToLower(k)
+		headers = append(headers, lowerCaseKey)
+
+		if v4.signedHeaderVals == nil {
+			v4.signedHeaderVals = make(http.Header)
+		}
+		v4.signedHeaderVals[lowerCaseKey] = v
+	}
+	sort.Strings(headers)
+
+	v4.signedHeaders = strings.Join(headers, ";")
+
+	if v4.isPresign {
+		v4.Query.Set("X-Amz-SignedHeaders", v4.signedHeaders)
+	}
+
+	headerValues := make([]string, len(headers))
+	for i, k := range headers {
+		if k == "host" {
+			headerValues[i] = "host:" + v4.Request.URL.Host
+		} else {
+			headerValues[i] = k + ":" +
+				strings.Join(v4.Request.Header[http.CanonicalHeaderKey(k)], ",")
+		}
+	}
+
+	v4.canonicalHeaders = strings.Join(headerValues, "\n")
+}
+
+func (v4 *signer) buildCanonicalString() {
+	v4.Request.URL.RawQuery = strings.Replace(v4.Query.Encode(), "+", "%20", -1)
+	uri := v4.Request.URL.Opaque
+	if uri != "" {
+		uri = "/" + strings.Join(strings.Split(uri, "/")[3:], "/")
+	} else {
+		uri = v4.Request.URL.Path
+	}
+	if uri == "" {
+		uri = "/"
+	}
+
+	if v4.ServiceName != "s3" {
+		uri = rest.EscapePath(uri, false)
+	}
+
+	v4.canonicalString = strings.Join([]string{
+		v4.Request.Method,
+		uri,
+		v4.Request.URL.RawQuery,
+		v4.canonicalHeaders + "\n",
+		v4.signedHeaders,
+		v4.bodyDigest(),
+	}, "\n")
+}
+
+func (v4 *signer) buildStringToSign() {
+	v4.stringToSign = strings.Join([]string{
+		authHeaderPrefix,
+		v4.formattedTime,
+		v4.credentialString,
+		hex.EncodeToString(makeSha256([]byte(v4.canonicalString))),
+	}, "\n")
+}
+
+func (v4 *signer) buildSignature() {
+	secret := v4.CredValues.SecretAccessKey
+	date := makeHmac([]byte("AWS4"+secret), []byte(v4.formattedShortTime))
+	region := makeHmac(date, []byte(v4.Region))
+	service := makeHmac(region, []byte(v4.ServiceName))
+	credentials := makeHmac(service, []byte("aws4_request"))
+	signature := makeHmac(credentials, []byte(v4.stringToSign))
+	v4.signature = hex.EncodeToString(signature)
+}
+
+func (v4 *signer) bodyDigest() string {
+	hash := v4.Request.Header.Get("X-Amz-Content-Sha256")
+	if hash == "" {
+		if v4.isPresign && v4.ServiceName == "s3" {
+			hash = "UNSIGNED-PAYLOAD"
+		} else if v4.Body == nil {
+			hash = hex.EncodeToString(makeSha256([]byte{}))
+		} else {
+			hash = hex.EncodeToString(makeSha256Reader(v4.Body))
+		}
+		v4.Request.Header.Add("X-Amz-Content-Sha256", hash)
+	}
+	return hash
+}
+
+// isRequestSigned returns if the request is currently signed or presigned
+func (v4 *signer) isRequestSigned() bool {
+	if v4.isPresign && v4.Query.Get("X-Amz-Signature") != "" {
+		return true
+	}
+	if v4.Request.Header.Get("Authorization") != "" {
+		return true
+	}
+
+	return false
+}
+
+// unsign removes signing flags for both signed and presigned requests.
+func (v4 *signer) removePresign() {
+	v4.Query.Del("X-Amz-Algorithm")
+	v4.Query.Del("X-Amz-Signature")
+	v4.Query.Del("X-Amz-Security-Token")
+	v4.Query.Del("X-Amz-Date")
+	v4.Query.Del("X-Amz-Expires")
+	v4.Query.Del("X-Amz-Credential")
+	v4.Query.Del("X-Amz-SignedHeaders")
+}
+
+func makeHmac(key []byte, data []byte) []byte {
+	hash := hmac.New(sha256.New, key)
+	hash.Write(data)
+	return hash.Sum(nil)
+}
+
+func makeSha256(data []byte) []byte {
+	hash := sha256.New()
+	hash.Write(data)
+	return hash.Sum(nil)
+}
+
+func makeSha256Reader(reader io.ReadSeeker) []byte {
+	hash := sha256.New()
+	start, _ := reader.Seek(0, 1)
+	defer reader.Seek(start, 0)
+
+	io.Copy(hash, reader)
+	return hash.Sum(nil)
+}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/.gitignore b/Godeps/_workspace/src/github.com/go-ini/ini/.gitignore
new file mode 100644
index 0000000000..7adca9439c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/.gitignore
@@ -0,0 +1,4 @@
+testdata/conf_out.ini
+ini.sublime-project
+ini.sublime-workspace
+testdata/conf_reflect.ini
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE b/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/Makefile b/Godeps/_workspace/src/github.com/go-ini/ini/Makefile
new file mode 100644
index 0000000000..ac034e5258
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/Makefile
@@ -0,0 +1,12 @@
+.PHONY: build test bench vet
+
+build: vet bench
+
+test:
+	go test -v -cover -race
+
+bench:
+	go test -v -cover -race -test.bench=. -test.benchmem
+
+vet:
+	go vet
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README.md b/Godeps/_workspace/src/github.com/go-ini/ini/README.md
new file mode 100644
index 0000000000..a87cca2328
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/README.md
@@ -0,0 +1,632 @@
+ini [![Build Status](https://drone.io/github.com/go-ini/ini/status.png)](https://drone.io/github.com/go-ini/ini/latest) [![](http://gocover.io/_badge/github.com/go-ini/ini)](http://gocover.io/github.com/go-ini/ini)
+===
+
+![](https://avatars0.githubusercontent.com/u/10216035?v=3&s=200)
+
+Package ini provides INI file read and write functionality in Go.
+
+[简体中文](README_ZH.md)
+
+## Feature
+
+- Load multiple data sources(`[]byte` or file) with overwrites.
+- Read with recursion values.
+- Read with parent-child sections.
+- Read with auto-increment key names.
+- Read with multiple-line values.
+- Read with tons of helper methods.
+- Read and convert values to Go types.
+- Read and **WRITE** comments of sections and keys.
+- Manipulate sections, keys and comments with ease.
+- Keep sections and keys in order as you parse and save.
+
+## Installation
+
+To use a tagged revision:
+
+	go get gopkg.in/ini.v1
+
+To use with latest changes:
+
+	go get github.com/go-ini/ini
+
+Please add `-u` flag to update in the future.
+
+### Testing
+
+If you want to test on your machine, please apply `-t` flag:
+
+	go get -t gopkg.in/ini.v1
+
+Please add `-u` flag to update in the future.
+
+## Getting Started
+
+### Loading from data sources
+
+A **Data Source** is either raw data in type `[]byte` or a file name with type `string` and you can load **as many as** data sources you want. Passing other types will simply return an error.
+
+```go
+cfg, err := ini.Load([]byte("raw data"), "filename")
+```
+
+Or start with an empty object:
+
+```go
+cfg := ini.Empty()
+```
+
+When you cannot decide how many data sources to load at the beginning, you still able to **Append()** them later.
+
+```go
+err := cfg.Append("other file", []byte("other raw data"))
+```
+
+If you have a list of files with possibilities that some of them may not available at the time, and you don't know exactly which ones, you can use `LooseLoad` to ignore nonexistent files without returning error.
+
+```go
+cfg, err := ini.LooseLoad("filename", "filename_404")
+```
+
+The cool thing is, whenever the file is available to load while you're calling `Reload` method, it will be counted as usual.
+
+### Working with sections
+
+To get a section, you would need to:
+
+```go
+section, err := cfg.GetSection("section name")
+```
+
+For a shortcut for default section, just give an empty string as name:
+
+```go
+section, err := cfg.GetSection("")
+```
+
+When you're pretty sure the section exists, following code could make your life easier:
+
+```go
+section := cfg.Section("")
+```
+
+What happens when the section somehow does not exist? Don't panic, it automatically creates and returns a new section to you.
+
+To create a new section:
+
+```go
+err := cfg.NewSection("new section")
+```
+
+To get a list of sections or section names:
+
+```go
+sections := cfg.Sections()
+names := cfg.SectionStrings()
+```
+
+### Working with keys
+
+To get a key under a section:
+
+```go
+key, err := cfg.Section("").GetKey("key name")
+```
+
+Same rule applies to key operations:
+
+```go
+key := cfg.Section("").Key("key name")
+```
+
+To check if a key exists:
+
+```go
+yes := cfg.Section("").HasKey("key name")
+```
+
+To create a new key:
+
+```go
+err := cfg.Section("").NewKey("name", "value")
+```
+
+To get a list of keys or key names:
+
+```go
+keys := cfg.Section("").Keys()
+names := cfg.Section("").KeyStrings()
+```
+
+To get a clone hash of keys and corresponding values:
+
+```go
+hash := cfg.GetSection("").KeysHash()
+```
+
+### Working with values
+
+To get a string value:
+
+```go
+val := cfg.Section("").Key("key name").String()
+```
+
+To validate key value on the fly:
+
+```go
+val := cfg.Section("").Key("key name").Validate(func(in string) string {
+	if len(in) == 0 {
+		return "default"
+	}
+	return in
+})
+```
+
+If you do not want any auto-transformation (such as recursive read) for the values, you can get raw value directly (this way you get much better performance):
+
+```go
+val := cfg.Section("").Key("key name").Value()
+```
+
+To check if raw value exists:
+
+```go
+yes := cfg.Section("").HasValue("test value")
+```
+
+To get value with types:
+
+```go
+// For boolean values:
+// true when value is: 1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On
+// false when value is: 0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off
+v, err = cfg.Section("").Key("BOOL").Bool()
+v, err = cfg.Section("").Key("FLOAT64").Float64()
+v, err = cfg.Section("").Key("INT").Int()
+v, err = cfg.Section("").Key("INT64").Int64()
+v, err = cfg.Section("").Key("UINT").Uint()
+v, err = cfg.Section("").Key("UINT64").Uint64()
+v, err = cfg.Section("").Key("TIME").TimeFormat(time.RFC3339)
+v, err = cfg.Section("").Key("TIME").Time() // RFC3339
+
+v = cfg.Section("").Key("BOOL").MustBool()
+v = cfg.Section("").Key("FLOAT64").MustFloat64()
+v = cfg.Section("").Key("INT").MustInt()
+v = cfg.Section("").Key("INT64").MustInt64()
+v = cfg.Section("").Key("UINT").MustUint()
+v = cfg.Section("").Key("UINT64").MustUint64()
+v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339)
+v = cfg.Section("").Key("TIME").MustTime() // RFC3339
+
+// Methods start with Must also accept one argument for default value
+// when key not found or fail to parse value to given type.
+// Except method MustString, which you have to pass a default value.
+
+v = cfg.Section("").Key("String").MustString("default")
+v = cfg.Section("").Key("BOOL").MustBool(true)
+v = cfg.Section("").Key("FLOAT64").MustFloat64(1.25)
+v = cfg.Section("").Key("INT").MustInt(10)
+v = cfg.Section("").Key("INT64").MustInt64(99)
+v = cfg.Section("").Key("UINT").MustUint(3)
+v = cfg.Section("").Key("UINT64").MustUint64(6)
+v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339, time.Now())
+v = cfg.Section("").Key("TIME").MustTime(time.Now()) // RFC3339
+```
+
+What if my value is three-line long?
+
+```ini
+[advance]
+ADDRESS = """404 road,
+NotFound, State, 5000
+Earth"""
+```
+
+Not a problem!
+
+```go
+cfg.Section("advance").Key("ADDRESS").String()
+
+/* --- start ---
+404 road,
+NotFound, State, 5000
+Earth
+------  end  --- */
+```
+
+That's cool, how about continuation lines?
+
+```ini
+[advance]
+two_lines = how about \
+	continuation lines?
+lots_of_lines = 1 \
+	2 \
+	3 \
+	4
+```
+
+Piece of cake!
+
+```go
+cfg.Section("advance").Key("two_lines").String() // how about continuation lines?
+cfg.Section("advance").Key("lots_of_lines").String() // 1 2 3 4
+```
+
+Note that single quotes around values will be stripped:
+
+```ini
+foo = "some value" // foo: some value
+bar = 'some value' // bar: some value
+```
+
+That's all? Hmm, no.
+
+#### Helper methods of working with values
+
+To get value with given candidates:
+
+```go
+v = cfg.Section("").Key("STRING").In("default", []string{"str", "arr", "types"})
+v = cfg.Section("").Key("FLOAT64").InFloat64(1.1, []float64{1.25, 2.5, 3.75})
+v = cfg.Section("").Key("INT").InInt(5, []int{10, 20, 30})
+v = cfg.Section("").Key("INT64").InInt64(10, []int64{10, 20, 30})
+v = cfg.Section("").Key("UINT").InUint(4, []int{3, 6, 9})
+v = cfg.Section("").Key("UINT64").InUint64(8, []int64{3, 6, 9})
+v = cfg.Section("").Key("TIME").InTimeFormat(time.RFC3339, time.Now(), []time.Time{time1, time2, time3})
+v = cfg.Section("").Key("TIME").InTime(time.Now(), []time.Time{time1, time2, time3}) // RFC3339
+```
+
+Default value will be presented if value of key is not in candidates you given, and default value does not need be one of candidates.
+
+To validate value in a given range:
+
+```go
+vals = cfg.Section("").Key("FLOAT64").RangeFloat64(0.0, 1.1, 2.2)
+vals = cfg.Section("").Key("INT").RangeInt(0, 10, 20)
+vals = cfg.Section("").Key("INT64").RangeInt64(0, 10, 20)
+vals = cfg.Section("").Key("UINT").RangeUint(0, 3, 9)
+vals = cfg.Section("").Key("UINT64").RangeUint64(0, 3, 9)
+vals = cfg.Section("").Key("TIME").RangeTimeFormat(time.RFC3339, time.Now(), minTime, maxTime)
+vals = cfg.Section("").Key("TIME").RangeTime(time.Now(), minTime, maxTime) // RFC3339
+```
+
+##### Auto-split values into a slice
+
+To use zero value of type for invalid inputs:
+
+```go
+// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
+// Input: how, 2.2, are, you -> [0.0 2.2 0.0 0.0]
+vals = cfg.Section("").Key("STRINGS").Strings(",")
+vals = cfg.Section("").Key("FLOAT64S").Float64s(",")
+vals = cfg.Section("").Key("INTS").Ints(",")
+vals = cfg.Section("").Key("INT64S").Int64s(",")
+vals = cfg.Section("").Key("UINTS").Uints(",")
+vals = cfg.Section("").Key("UINT64S").Uint64s(",")
+vals = cfg.Section("").Key("TIMES").Times(",")
+```
+
+To exclude invalid values out of result slice:
+
+```go
+// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
+// Input: how, 2.2, are, you -> [2.2]
+vals = cfg.Section("").Key("FLOAT64S").ValidFloat64s(",")
+vals = cfg.Section("").Key("INTS").ValidInts(",")
+vals = cfg.Section("").Key("INT64S").ValidInt64s(",")
+vals = cfg.Section("").Key("UINTS").ValidUints(",")
+vals = cfg.Section("").Key("UINT64S").ValidUint64s(",")
+vals = cfg.Section("").Key("TIMES").ValidTimes(",")
+```
+
+Or to return nothing but error when have invalid inputs:
+
+```go
+// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
+// Input: how, 2.2, are, you -> error
+vals = cfg.Section("").Key("FLOAT64S").StrictFloat64s(",")
+vals = cfg.Section("").Key("INTS").StrictInts(",")
+vals = cfg.Section("").Key("INT64S").StrictInt64s(",")
+vals = cfg.Section("").Key("UINTS").StrictUints(",")
+vals = cfg.Section("").Key("UINT64S").StrictUint64s(",")
+vals = cfg.Section("").Key("TIMES").StrictTimes(",")
+```
+
+### Save your configuration
+
+Finally, it's time to save your configuration to somewhere.
+
+A typical way to save configuration is writing it to a file:
+
+```go
+// ...
+err = cfg.SaveTo("my.ini")
+err = cfg.SaveToIndent("my.ini", "\t")
+```
+
+Another way to save is writing to a `io.Writer` interface:
+
+```go
+// ...
+cfg.WriteTo(writer)
+cfg.WriteToIndent(writer, "\t")
+```
+
+## Advanced Usage
+
+### Recursive Values
+
+For all value of keys, there is a special syntax `%(<name>)s`, where `<name>` is the key name in same section or default section, and `%(<name>)s` will be replaced by corresponding value(empty string if key not found). You can use this syntax at most 99 level of recursions.
+
+```ini
+NAME = ini
+
+[author]
+NAME = Unknwon
+GITHUB = https://github.com/%(NAME)s
+
+[package]
+FULL_NAME = github.com/go-ini/%(NAME)s
+```
+
+```go
+cfg.Section("author").Key("GITHUB").String()		// https://github.com/Unknwon
+cfg.Section("package").Key("FULL_NAME").String()	// github.com/go-ini/ini
+```
+
+### Parent-child Sections
+
+You can use `.` in section name to indicate parent-child relationship between two or more sections. If the key not found in the child section, library will try again on its parent section until there is no parent section.
+
+```ini
+NAME = ini
+VERSION = v1
+IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
+
+[package]
+CLONE_URL = https://%(IMPORT_PATH)s
+
+[package.sub]
+```
+
+```go
+cfg.Section("package.sub").Key("CLONE_URL").String()	// https://gopkg.in/ini.v1
+```
+
+### Auto-increment Key Names
+
+If key name is `-` in data source, then it would be seen as special syntax for auto-increment key name start from 1, and every section is independent on counter.
+
+```ini
+[features]
+-: Support read/write comments of keys and sections
+-: Support auto-increment of key names
+-: Support load multiple files to overwrite key values
+```
+
+```go
+cfg.Section("features").KeyStrings()	// []{"#1", "#2", "#3"}
+```
+
+### Map To Struct
+
+Want more objective way to play with INI? Cool.
+
+```ini
+Name = Unknwon
+age = 21
+Male = true
+Born = 1993-01-01T20:17:05Z
+
+[Note]
+Content = Hi is a good man!
+Cities = HangZhou, Boston
+```
+
+```go
+type Note struct {
+	Content string
+	Cities  []string
+}
+
+type Person struct {
+	Name string
+	Age  int `ini:"age"`
+	Male bool
+	Born time.Time
+	Note
+	Created time.Time `ini:"-"`
+}
+
+func main() {
+	cfg, err := ini.Load("path/to/ini")
+	// ...
+	p := new(Person)
+	err = cfg.MapTo(p)
+	// ...
+
+	// Things can be simpler.
+	err = ini.MapTo(p, "path/to/ini")
+	// ...
+
+	// Just map a section? Fine.
+	n := new(Note)
+	err = cfg.Section("Note").MapTo(n)
+	// ...
+}
+```
+
+Can I have default value for field? Absolutely.
+
+Assign it before you map to struct. It will keep the value as it is if the key is not presented or got wrong type.
+
+```go
+// ...
+p := &Person{
+	Name: "Joe",
+}
+// ...
+```
+
+It's really cool, but what's the point if you can't give me my file back from struct?
+
+### Reflect From Struct
+
+Why not?
+
+```go
+type Embeded struct {
+	Dates  []time.Time `delim:"|"`
+	Places []string
+	None   []int
+}
+
+type Author struct {
+	Name      string `ini:"NAME"`
+	Male      bool
+	Age       int
+	GPA       float64
+	NeverMind string `ini:"-"`
+	*Embeded
+}
+
+func main() {
+	a := &Author{"Unknwon", true, 21, 2.8, "",
+		&Embeded{
+			[]time.Time{time.Now(), time.Now()},
+			[]string{"HangZhou", "Boston"},
+			[]int{},
+		}}
+	cfg := ini.Empty()
+	err = ini.ReflectFrom(cfg, a)
+	// ...
+}
+```
+
+So, what do I get?
+
+```ini
+NAME = Unknwon
+Male = true
+Age = 21
+GPA = 2.8
+
+[Embeded]
+Dates = 2015-08-07T22:14:22+08:00|2015-08-07T22:14:22+08:00
+Places = HangZhou,Boston
+None =
+```
+
+#### Name Mapper
+
+To save your time and make your code cleaner, this library supports [`NameMapper`](https://gowalker.org/gopkg.in/ini.v1#NameMapper) between struct field and actual section and key name.
+
+There are 2 built-in name mappers:
+
+- `AllCapsUnderscore`: it converts to format `ALL_CAPS_UNDERSCORE` then match section or key.
+- `TitleUnderscore`: it converts to format `title_underscore` then match section or key.
+
+To use them:
+
+```go
+type Info struct {
+	PackageName string
+}
+
+func main() {
+	err = ini.MapToWithMapper(&Info{}, ini.TitleUnderscore, []byte("package_name=ini"))
+	// ...
+
+	cfg, err := ini.Load([]byte("PACKAGE_NAME=ini"))
+	// ...
+	info := new(Info)
+	cfg.NameMapper = ini.AllCapsUnderscore
+	err = cfg.MapTo(info)
+	// ...
+}
+```
+
+Same rules of name mapper apply to `ini.ReflectFromWithMapper` function.
+
+#### Other Notes On Map/Reflect
+
+Any embedded struct is treated as a section by default, and there is no automatic parent-child relations in map/reflect feature:
+
+```go
+type Child struct {
+	Age string
+}
+
+type Parent struct {
+	Name string
+	Child
+}
+
+type Config struct {
+	City string
+	Parent
+}
+```
+
+Example configuration:
+
+```ini
+City = Boston
+
+[Parent]
+Name = Unknwon
+
+[Child]
+Age = 21
+```
+
+What if, yes, I'm paranoid, I want embedded struct to be in the same section. Well, all roads lead to Rome.
+
+```go
+type Child struct {
+	Age string
+}
+
+type Parent struct {
+	Name string
+	Child `ini:"Parent"`
+}
+
+type Config struct {
+	City string
+	Parent
+}
+```
+
+Example configuration:
+
+```ini
+City = Boston
+
+[Parent]
+Name = Unknwon
+Age = 21
+```
+
+## Getting Help
+
+- [API Documentation](https://gowalker.org/gopkg.in/ini.v1)
+- [File An Issue](https://github.com/go-ini/ini/issues/new)
+
+## FAQs
+
+### What does `BlockMode` field do?
+
+By default, library lets you read and write values so we need a locker to make sure your data is safe. But in cases that you are very sure about only reading data through the library, you can set `cfg.BlockMode = false` to speed up read operations about **50-70%** faster.
+
+### Why another INI library?
+
+Many people are using my another INI library [goconfig](https://github.com/Unknwon/goconfig), so the reason for this one is I would like to make more Go style code. Also when you set `cfg.BlockMode = false`, this one is about **10-30%** faster.
+
+To make those changes I have to confirm API broken, so it's safer to keep it in another place and start using `gopkg.in` to version my package at this time.(PS: shorter import path)
+
+## License
+
+This project is under Apache v2 License. See the [LICENSE](LICENSE) file for the full license text.
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md b/Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md
new file mode 100644
index 0000000000..75c10051a1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md
@@ -0,0 +1,619 @@
+本包提供了 Go 语言中读写 INI 文件的功能。
+
+## 功能特性
+
+- 支持覆盖加载多个数据源（`[]byte` 或文件）
+- 支持递归读取键值
+- 支持读取父子分区
+- 支持读取自增键名
+- 支持读取多行的键值
+- 支持大量辅助方法
+- 支持在读取时直接转换为 Go 语言类型
+- 支持读取和 **写入** 分区和键的注释
+- 轻松操作分区、键值和注释
+- 在保存文件时分区和键值会保持原有的顺序
+
+## 下载安装
+
+使用一个特定版本：
+
+    go get gopkg.in/ini.v1
+
+使用最新版：
+
+	go get github.com/go-ini/ini
+
+如需更新请添加 `-u` 选项。
+
+### 测试安装
+
+如果您想要在自己的机器上运行测试，请使用 `-t` 标记：
+
+	go get -t gopkg.in/ini.v1
+
+如需更新请添加 `-u` 选项。
+
+## 开始使用
+
+### 从数据源加载
+
+一个 **数据源** 可以是 `[]byte` 类型的原始数据，或 `string` 类型的文件路径。您可以加载 **任意多个** 数据源。如果您传递其它类型的数据源，则会直接返回错误。
+
+```go
+cfg, err := ini.Load([]byte("raw data"), "filename")
+```
+
+或者从一个空白的文件开始：
+
+```go
+cfg := ini.Empty()
+```
+
+当您在一开始无法决定需要加载哪些数据源时，仍可以使用 **Append()** 在需要的时候加载它们。
+
+```go
+err := cfg.Append("other file", []byte("other raw data"))
+```
+
+当您想要加载一系列文件，但是不能够确定其中哪些文件是不存在的，可以通过调用函数 `LooseLoad` 来忽略它们（`Load` 会因为文件不存在而返回错误）：
+
+```go
+cfg, err := ini.LooseLoad("filename", "filename_404")
+```
+
+更牛逼的是，当那些之前不存在的文件在重新调用 `Reload` 方法的时候突然出现了，那么它们会被正常加载。
+
+### 操作分区（Section）
+
+获取指定分区：
+
+```go
+section, err := cfg.GetSection("section name")
+```
+
+如果您想要获取默认分区，则可以用空字符串代替分区名：
+
+```go
+section, err := cfg.GetSection("")
+```
+
+当您非常确定某个分区是存在的，可以使用以下简便方法：
+
+```go
+section := cfg.Section("")
+```
+
+如果不小心判断错了，要获取的分区其实是不存在的，那会发生什么呢？没事的，它会自动创建并返回一个对应的分区对象给您。
+
+创建一个分区：
+
+```go
+err := cfg.NewSection("new section")
+```
+
+获取所有分区对象或名称：
+
+```go
+sections := cfg.Sections()
+names := cfg.SectionStrings()
+```
+
+### 操作键（Key）
+
+获取某个分区下的键：
+
+```go
+key, err := cfg.Section("").GetKey("key name")
+```
+
+和分区一样，您也可以直接获取键而忽略错误处理：
+
+```go
+key := cfg.Section("").Key("key name")
+```
+
+判断某个键是否存在：
+
+```go
+yes := cfg.Section("").HasKey("key name")
+```
+
+创建一个新的键：
+
+```go
+err := cfg.Section("").NewKey("name", "value")
+```
+
+获取分区下的所有键或键名：
+
+```go
+keys := cfg.Section("").Keys()
+names := cfg.Section("").KeyStrings()
+```
+
+获取分区下的所有键值对的克隆：
+
+```go
+hash := cfg.GetSection("").KeysHash()
+```
+
+### 操作键值（Value）
+
+获取一个类型为字符串（string）的值：
+
+```go
+val := cfg.Section("").Key("key name").String()
+```
+
+获取值的同时通过自定义函数进行处理验证：
+
+```go
+val := cfg.Section("").Key("key name").Validate(func(in string) string {
+	if len(in) == 0 {
+		return "default"
+	}
+	return in
+})
+```
+
+如果您不需要任何对值的自动转变功能（例如递归读取），可以直接获取原值（这种方式性能最佳）：
+
+```go
+val := cfg.Section("").Key("key name").Value()
+```
+
+判断某个原值是否存在：
+
+```go
+yes := cfg.Section("").HasValue("test value")
+```
+
+获取其它类型的值：
+
+```go
+// 布尔值的规则：
+// true 当值为：1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On
+// false 当值为：0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off
+v, err = cfg.Section("").Key("BOOL").Bool()
+v, err = cfg.Section("").Key("FLOAT64").Float64()
+v, err = cfg.Section("").Key("INT").Int()
+v, err = cfg.Section("").Key("INT64").Int64()
+v, err = cfg.Section("").Key("UINT").Uint()
+v, err = cfg.Section("").Key("UINT64").Uint64()
+v, err = cfg.Section("").Key("TIME").TimeFormat(time.RFC3339)
+v, err = cfg.Section("").Key("TIME").Time() // RFC3339
+
+v = cfg.Section("").Key("BOOL").MustBool()
+v = cfg.Section("").Key("FLOAT64").MustFloat64()
+v = cfg.Section("").Key("INT").MustInt()
+v = cfg.Section("").Key("INT64").MustInt64()
+v = cfg.Section("").Key("UINT").MustUint()
+v = cfg.Section("").Key("UINT64").MustUint64()
+v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339)
+v = cfg.Section("").Key("TIME").MustTime() // RFC3339
+
+// 由 Must 开头的方法名允许接收一个相同类型的参数来作为默认值，
+// 当键不存在或者转换失败时，则会直接返回该默认值。
+// 但是，MustString 方法必须传递一个默认值。
+
+v = cfg.Seciont("").Key("String").MustString("default")
+v = cfg.Section("").Key("BOOL").MustBool(true)
+v = cfg.Section("").Key("FLOAT64").MustFloat64(1.25)
+v = cfg.Section("").Key("INT").MustInt(10)
+v = cfg.Section("").Key("INT64").MustInt64(99)
+v = cfg.Section("").Key("UINT").MustUint(3)
+v = cfg.Section("").Key("UINT64").MustUint64(6)
+v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339, time.Now())
+v = cfg.Section("").Key("TIME").MustTime(time.Now()) // RFC3339
+```
+
+如果我的值有好多行怎么办？
+
+```ini
+[advance]
+ADDRESS = """404 road,
+NotFound, State, 5000
+Earth"""
+```
+
+嗯哼？小 case！
+
+```go
+cfg.Section("advance").Key("ADDRESS").String()
+
+/* --- start ---
+404 road,
+NotFound, State, 5000
+Earth
+------  end  --- */
+```
+
+赞爆了！那要是我属于一行的内容写不下想要写到第二行怎么办？
+
+```ini
+[advance]
+two_lines = how about \
+	continuation lines?
+lots_of_lines = 1 \
+	2 \
+	3 \
+	4
+```
+
+简直是小菜一碟！
+
+```go
+cfg.Section("advance").Key("two_lines").String() // how about continuation lines?
+cfg.Section("advance").Key("lots_of_lines").String() // 1 2 3 4
+```
+
+需要注意的是，值两侧的单引号会被自动剔除：
+
+```ini
+foo = "some value" // foo: some value
+bar = 'some value' // bar: some value
+```
+
+这就是全部了？哈哈，当然不是。
+
+#### 操作键值的辅助方法
+
+获取键值时设定候选值：
+
+```go
+v = cfg.Section("").Key("STRING").In("default", []string{"str", "arr", "types"})
+v = cfg.Section("").Key("FLOAT64").InFloat64(1.1, []float64{1.25, 2.5, 3.75})
+v = cfg.Section("").Key("INT").InInt(5, []int{10, 20, 30})
+v = cfg.Section("").Key("INT64").InInt64(10, []int64{10, 20, 30})
+v = cfg.Section("").Key("UINT").InUint(4, []int{3, 6, 9})
+v = cfg.Section("").Key("UINT64").InUint64(8, []int64{3, 6, 9})
+v = cfg.Section("").Key("TIME").InTimeFormat(time.RFC3339, time.Now(), []time.Time{time1, time2, time3})
+v = cfg.Section("").Key("TIME").InTime(time.Now(), []time.Time{time1, time2, time3}) // RFC3339
+```
+
+如果获取到的值不是候选值的任意一个，则会返回默认值，而默认值不需要是候选值中的一员。
+
+验证获取的值是否在指定范围内：
+
+```go
+vals = cfg.Section("").Key("FLOAT64").RangeFloat64(0.0, 1.1, 2.2)
+vals = cfg.Section("").Key("INT").RangeInt(0, 10, 20)
+vals = cfg.Section("").Key("INT64").RangeInt64(0, 10, 20)
+vals = cfg.Section("").Key("UINT").RangeUint(0, 3, 9)
+vals = cfg.Section("").Key("UINT64").RangeUint64(0, 3, 9)
+vals = cfg.Section("").Key("TIME").RangeTimeFormat(time.RFC3339, time.Now(), minTime, maxTime)
+vals = cfg.Section("").Key("TIME").RangeTime(time.Now(), minTime, maxTime) // RFC3339
+```
+
+##### 自动分割键值到切片（slice）
+
+当存在无效输入时，使用零值代替：
+
+```go
+// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
+// Input: how, 2.2, are, you -> [0.0 2.2 0.0 0.0]
+vals = cfg.Section("").Key("STRINGS").Strings(",")
+vals = cfg.Section("").Key("FLOAT64S").Float64s(",")
+vals = cfg.Section("").Key("INTS").Ints(",")
+vals = cfg.Section("").Key("INT64S").Int64s(",")
+vals = cfg.Section("").Key("UINTS").Uints(",")
+vals = cfg.Section("").Key("UINT64S").Uint64s(",")
+vals = cfg.Section("").Key("TIMES").Times(",")
+```
+
+从结果切片中剔除无效输入：
+
+```go
+// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
+// Input: how, 2.2, are, you -> [2.2]
+vals = cfg.Section("").Key("FLOAT64S").ValidFloat64s(",")
+vals = cfg.Section("").Key("INTS").ValidInts(",")
+vals = cfg.Section("").Key("INT64S").ValidInt64s(",")
+vals = cfg.Section("").Key("UINTS").ValidUints(",")
+vals = cfg.Section("").Key("UINT64S").ValidUint64s(",")
+vals = cfg.Section("").Key("TIMES").ValidTimes(",")
+```
+
+当存在无效输入时，直接返回错误：
+
+```go
+// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
+// Input: how, 2.2, are, you -> error
+vals = cfg.Section("").Key("FLOAT64S").StrictFloat64s(",")
+vals = cfg.Section("").Key("INTS").StrictInts(",")
+vals = cfg.Section("").Key("INT64S").StrictInt64s(",")
+vals = cfg.Section("").Key("UINTS").StrictUints(",")
+vals = cfg.Section("").Key("UINT64S").StrictUint64s(",")
+vals = cfg.Section("").Key("TIMES").StrictTimes(",")
+```
+
+### 保存配置
+
+终于到了这个时刻，是时候保存一下配置了。
+
+比较原始的做法是输出配置到某个文件：
+
+```go
+// ...
+err = cfg.SaveTo("my.ini")
+err = cfg.SaveToIndent("my.ini", "\t")
+```
+
+另一个比较高级的做法是写入到任何实现 `io.Writer` 接口的对象中：
+
+```go
+// ...
+cfg.WriteTo(writer)
+cfg.WriteToIndent(writer, "\t")
+```
+
+### 高级用法
+
+#### 递归读取键值
+
+在获取所有键值的过程中，特殊语法 `%(<name>)s` 会被应用，其中 `<name>` 可以是相同分区或者默认分区下的键名。字符串 `%(<name>)s` 会被相应的键值所替代，如果指定的键不存在，则会用空字符串替代。您可以最多使用 99 层的递归嵌套。
+
+```ini
+NAME = ini
+
+[author]
+NAME = Unknwon
+GITHUB = https://github.com/%(NAME)s
+
+[package]
+FULL_NAME = github.com/go-ini/%(NAME)s
+```
+
+```go
+cfg.Section("author").Key("GITHUB").String()		// https://github.com/Unknwon
+cfg.Section("package").Key("FULL_NAME").String()	// github.com/go-ini/ini
+```
+
+#### 读取父子分区
+
+您可以在分区名称中使用 `.` 来表示两个或多个分区之间的父子关系。如果某个键在子分区中不存在，则会去它的父分区中再次寻找，直到没有父分区为止。
+
+```ini
+NAME = ini
+VERSION = v1
+IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
+
+[package]
+CLONE_URL = https://%(IMPORT_PATH)s
+
+[package.sub]
+```
+
+```go
+cfg.Section("package.sub").Key("CLONE_URL").String()	// https://gopkg.in/ini.v1
+```
+
+#### 读取自增键名
+
+如果数据源中的键名为 `-`，则认为该键使用了自增键名的特殊语法。计数器从 1 开始，并且分区之间是相互独立的。
+
+```ini
+[features]
+-: Support read/write comments of keys and sections
+-: Support auto-increment of key names
+-: Support load multiple files to overwrite key values
+```
+
+```go
+cfg.Section("features").KeyStrings()	// []{"#1", "#2", "#3"}
+```
+
+### 映射到结构
+
+想要使用更加面向对象的方式玩转 INI 吗？好主意。
+
+```ini
+Name = Unknwon
+age = 21
+Male = true
+Born = 1993-01-01T20:17:05Z
+
+[Note]
+Content = Hi is a good man!
+Cities = HangZhou, Boston
+```
+
+```go
+type Note struct {
+	Content string
+	Cities  []string
+}
+
+type Person struct {
+	Name string
+	Age  int `ini:"age"`
+	Male bool
+	Born time.Time
+	Note
+	Created time.Time `ini:"-"`
+}
+
+func main() {
+	cfg, err := ini.Load("path/to/ini")
+	// ...
+	p := new(Person)
+	err = cfg.MapTo(p)
+	// ...
+
+	// 一切竟可以如此的简单。
+	err = ini.MapTo(p, "path/to/ini")
+	// ...
+
+	// 嗯哼？只需要映射一个分区吗？
+	n := new(Note)
+	err = cfg.Section("Note").MapTo(n)
+	// ...
+}
+```
+
+结构的字段怎么设置默认值呢？很简单，只要在映射之前对指定字段进行赋值就可以了。如果键未找到或者类型错误，该值不会发生改变。
+
+```go
+// ...
+p := &Person{
+	Name: "Joe",
+}
+// ...
+```
+
+这样玩 INI 真的好酷啊！然而，如果不能还给我原来的配置文件，有什么卵用？
+
+### 从结构反射
+
+可是，我有说不能吗？
+
+```go
+type Embeded struct {
+	Dates  []time.Time `delim:"|"`
+	Places []string
+	None   []int
+}
+
+type Author struct {
+	Name      string `ini:"NAME"`
+	Male      bool
+	Age       int
+	GPA       float64
+	NeverMind string `ini:"-"`
+	*Embeded
+}
+
+func main() {
+	a := &Author{"Unknwon", true, 21, 2.8, "",
+		&Embeded{
+			[]time.Time{time.Now(), time.Now()},
+			[]string{"HangZhou", "Boston"},
+			[]int{},
+		}}
+	cfg := ini.Empty()
+	err = ini.ReflectFrom(cfg, a)
+	// ...
+}
+```
+
+瞧瞧，奇迹发生了。
+
+```ini
+NAME = Unknwon
+Male = true
+Age = 21
+GPA = 2.8
+
+[Embeded]
+Dates = 2015-08-07T22:14:22+08:00|2015-08-07T22:14:22+08:00
+Places = HangZhou,Boston
+None =
+```
+
+#### 名称映射器（Name Mapper）
+
+为了节省您的时间并简化代码，本库支持类型为 [`NameMapper`](https://gowalker.org/gopkg.in/ini.v1#NameMapper) 的名称映射器，该映射器负责结构字段名与分区名和键名之间的映射。
+
+目前有 2 款内置的映射器：
+
+- `AllCapsUnderscore`：该映射器将字段名转换至格式 `ALL_CAPS_UNDERSCORE` 后再去匹配分区名和键名。
+- `TitleUnderscore`：该映射器将字段名转换至格式 `title_underscore` 后再去匹配分区名和键名。
+
+使用方法：
+
+```go
+type Info struct{
+	PackageName string
+}
+
+func main() {
+	err = ini.MapToWithMapper(&Info{}, ini.TitleUnderscore, []byte("package_name=ini"))
+	// ...
+
+	cfg, err := ini.Load([]byte("PACKAGE_NAME=ini"))
+	// ...
+	info := new(Info)
+	cfg.NameMapper = ini.AllCapsUnderscore
+	err = cfg.MapTo(info)
+	// ...
+}
+```
+
+使用函数 `ini.ReflectFromWithMapper` 时也可应用相同的规则。
+
+#### 映射/反射的其它说明
+
+任何嵌入的结构都会被默认认作一个不同的分区，并且不会自动产生所谓的父子分区关联：
+
+```go
+type Child struct {
+	Age string
+}
+
+type Parent struct {
+	Name string
+	Child
+}
+
+type Config struct {
+	City string
+	Parent
+}
+```
+
+示例配置文件：
+
+```ini
+City = Boston
+
+[Parent]
+Name = Unknwon
+
+[Child]
+Age = 21
+```
+
+很好，但是，我就是要嵌入结构也在同一个分区。好吧，你爹是李刚！
+
+```go
+type Child struct {
+	Age string
+}
+
+type Parent struct {
+	Name string
+	Child `ini:"Parent"`
+}
+
+type Config struct {
+	City string
+	Parent
+}
+```
+
+示例配置文件：
+
+```ini
+City = Boston
+
+[Parent]
+Name = Unknwon
+Age = 21
+```
+
+## 获取帮助
+
+- [API 文档](https://gowalker.org/gopkg.in/ini.v1)
+- [创建工单](https://github.com/go-ini/ini/issues/new)
+
+## 常见问题
+
+### 字段 `BlockMode` 是什么？
+
+默认情况下，本库会在您进行读写操作时采用锁机制来确保数据时间。但在某些情况下，您非常确定只进行读操作。此时，您可以通过设置 `cfg.BlockMode = false` 来将读操作提升大约 **50-70%** 的性能。
+
+### 为什么要写另一个 INI 解析库？
+
+许多人都在使用我的 [goconfig](https://github.com/Unknwon/goconfig) 来完成对 INI 文件的操作，但我希望使用更加 Go 风格的代码。并且当您设置 `cfg.BlockMode = false` 时，会有大约 **10-30%** 的性能提升。
+
+为了做出这些改变，我必须对 API 进行破坏，所以新开一个仓库是最安全的做法。除此之外，本库直接使用 `gopkg.in` 来进行版本化发布。（其实真相是导入路径更短了）
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/ini.go b/Godeps/_workspace/src/github.com/go-ini/ini/ini.go
new file mode 100644
index 0000000000..f186148aad
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/ini.go
@@ -0,0 +1,465 @@
+// Copyright 2014 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// Package ini provides INI file read and write functionality in Go.
+package ini
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"regexp"
+	"runtime"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+)
+
+const (
+	// Name for default section. You can use this constant or the string literal.
+	// In most of cases, an empty string is all you need to access the section.
+	DEFAULT_SECTION = "DEFAULT"
+
+	// Maximum allowed depth when recursively substituing variable names.
+	_DEPTH_VALUES = 99
+	_VERSION      = "1.11.0"
+)
+
+// Version returns current package version literal.
+func Version() string {
+	return _VERSION
+}
+
+var (
+	// Delimiter to determine or compose a new line.
+	// This variable will be changed to "\r\n" automatically on Windows
+	// at package init time.
+	LineBreak = "\n"
+
+	// Variable regexp pattern: %(variable)s
+	varPattern = regexp.MustCompile(`%\(([^\)]+)\)s`)
+
+	// Indicate whether to align "=" sign with spaces to produce pretty output
+	// or reduce all possible spaces for compact format.
+	PrettyFormat = true
+
+	// Explicitly write DEFAULT section header
+	DefaultHeader = false
+)
+
+func init() {
+	if runtime.GOOS == "windows" {
+		LineBreak = "\r\n"
+	}
+}
+
+func inSlice(str string, s []string) bool {
+	for _, v := range s {
+		if str == v {
+			return true
+		}
+	}
+	return false
+}
+
+// dataSource is an interface that returns object which can be read and closed.
+type dataSource interface {
+	ReadCloser() (io.ReadCloser, error)
+}
+
+// sourceFile represents an object that contains content on the local file system.
+type sourceFile struct {
+	name string
+}
+
+func (s sourceFile) ReadCloser() (_ io.ReadCloser, err error) {
+	return os.Open(s.name)
+}
+
+type bytesReadCloser struct {
+	reader io.Reader
+}
+
+func (rc *bytesReadCloser) Read(p []byte) (n int, err error) {
+	return rc.reader.Read(p)
+}
+
+func (rc *bytesReadCloser) Close() error {
+	return nil
+}
+
+// sourceData represents an object that contains content in memory.
+type sourceData struct {
+	data []byte
+}
+
+func (s *sourceData) ReadCloser() (io.ReadCloser, error) {
+	return &bytesReadCloser{bytes.NewReader(s.data)}, nil
+}
+
+// File represents a combination of a or more INI file(s) in memory.
+type File struct {
+	// Should make things safe, but sometimes doesn't matter.
+	BlockMode bool
+	// Make sure data is safe in multiple goroutines.
+	lock sync.RWMutex
+
+	// Allow combination of multiple data sources.
+	dataSources []dataSource
+	// Actual data is stored here.
+	sections map[string]*Section
+
+	// To keep data in order.
+	sectionList []string
+
+	// Whether the parser should ignore nonexistent files or return error.
+	looseMode bool
+
+	NameMapper
+}
+
+// newFile initializes File object with given data sources.
+func newFile(dataSources []dataSource, looseMode bool) *File {
+	return &File{
+		BlockMode:   true,
+		dataSources: dataSources,
+		sections:    make(map[string]*Section),
+		sectionList: make([]string, 0, 10),
+		looseMode:   looseMode,
+	}
+}
+
+func parseDataSource(source interface{}) (dataSource, error) {
+	switch s := source.(type) {
+	case string:
+		return sourceFile{s}, nil
+	case []byte:
+		return &sourceData{s}, nil
+	default:
+		return nil, fmt.Errorf("error parsing data source: unknown type '%s'", s)
+	}
+}
+
+func loadSources(looseMode bool, source interface{}, others ...interface{}) (_ *File, err error) {
+	sources := make([]dataSource, len(others)+1)
+	sources[0], err = parseDataSource(source)
+	if err != nil {
+		return nil, err
+	}
+	for i := range others {
+		sources[i+1], err = parseDataSource(others[i])
+		if err != nil {
+			return nil, err
+		}
+	}
+	f := newFile(sources, looseMode)
+	if err = f.Reload(); err != nil {
+		return nil, err
+	}
+	return f, nil
+}
+
+// Load loads and parses from INI data sources.
+// Arguments can be mixed of file name with string type, or raw data in []byte.
+// It will return error if list contains nonexistent files.
+func Load(source interface{}, others ...interface{}) (*File, error) {
+	return loadSources(false, source, others...)
+}
+
+// LooseLoad has exactly same functionality as Load function
+// except it ignores nonexistent files instead of returning error.
+func LooseLoad(source interface{}, others ...interface{}) (*File, error) {
+	return loadSources(true, source, others...)
+}
+
+// Empty returns an empty file object.
+func Empty() *File {
+	// Ignore error here, we sure our data is good.
+	f, _ := Load([]byte(""))
+	return f
+}
+
+// NewSection creates a new section.
+func (f *File) NewSection(name string) (*Section, error) {
+	if len(name) == 0 {
+		return nil, errors.New("error creating new section: empty section name")
+	}
+
+	if f.BlockMode {
+		f.lock.Lock()
+		defer f.lock.Unlock()
+	}
+
+	if inSlice(name, f.sectionList) {
+		return f.sections[name], nil
+	}
+
+	f.sectionList = append(f.sectionList, name)
+	f.sections[name] = newSection(f, name)
+	return f.sections[name], nil
+}
+
+// NewSections creates a list of sections.
+func (f *File) NewSections(names ...string) (err error) {
+	for _, name := range names {
+		if _, err = f.NewSection(name); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// GetSection returns section by given name.
+func (f *File) GetSection(name string) (*Section, error) {
+	if len(name) == 0 {
+		name = DEFAULT_SECTION
+	}
+
+	if f.BlockMode {
+		f.lock.RLock()
+		defer f.lock.RUnlock()
+	}
+
+	sec := f.sections[name]
+	if sec == nil {
+		return nil, fmt.Errorf("section '%s' does not exist", name)
+	}
+	return sec, nil
+}
+
+// Section assumes named section exists and returns a zero-value when not.
+func (f *File) Section(name string) *Section {
+	sec, err := f.GetSection(name)
+	if err != nil {
+		// Note: It's OK here because the only possible error is empty section name,
+		// but if it's empty, this piece of code won't be executed.
+		sec, _ = f.NewSection(name)
+		return sec
+	}
+	return sec
+}
+
+// Section returns list of Section.
+func (f *File) Sections() []*Section {
+	sections := make([]*Section, len(f.sectionList))
+	for i := range f.sectionList {
+		sections[i] = f.Section(f.sectionList[i])
+	}
+	return sections
+}
+
+// SectionStrings returns list of section names.
+func (f *File) SectionStrings() []string {
+	list := make([]string, len(f.sectionList))
+	copy(list, f.sectionList)
+	return list
+}
+
+// DeleteSection deletes a section.
+func (f *File) DeleteSection(name string) {
+	if f.BlockMode {
+		f.lock.Lock()
+		defer f.lock.Unlock()
+	}
+
+	if len(name) == 0 {
+		name = DEFAULT_SECTION
+	}
+
+	for i, s := range f.sectionList {
+		if s == name {
+			f.sectionList = append(f.sectionList[:i], f.sectionList[i+1:]...)
+			delete(f.sections, name)
+			return
+		}
+	}
+}
+
+func (f *File) reload(s dataSource) error {
+	r, err := s.ReadCloser()
+	if err != nil {
+		return err
+	}
+	defer r.Close()
+
+	return f.parse(r)
+}
+
+// Reload reloads and parses all data sources.
+func (f *File) Reload() (err error) {
+	for _, s := range f.dataSources {
+		if err = f.reload(s); err != nil {
+			// In loose mode, we create an empty default section for nonexistent files.
+			if os.IsNotExist(err) && f.looseMode {
+				f.parse(bytes.NewBuffer(nil))
+				continue
+			}
+			return err
+		}
+	}
+	return nil
+}
+
+// Append appends one or more data sources and reloads automatically.
+func (f *File) Append(source interface{}, others ...interface{}) error {
+	ds, err := parseDataSource(source)
+	if err != nil {
+		return err
+	}
+	f.dataSources = append(f.dataSources, ds)
+	for _, s := range others {
+		ds, err = parseDataSource(s)
+		if err != nil {
+			return err
+		}
+		f.dataSources = append(f.dataSources, ds)
+	}
+	return f.Reload()
+}
+
+// WriteToIndent writes content into io.Writer with given indention.
+// If PrettyFormat has been set to be true,
+// it will align "=" sign with spaces under each section.
+func (f *File) WriteToIndent(w io.Writer, indent string) (n int64, err error) {
+	equalSign := "="
+	if PrettyFormat {
+		equalSign = " = "
+	}
+
+	// Use buffer to make sure target is safe until finish encoding.
+	buf := bytes.NewBuffer(nil)
+	for i, sname := range f.sectionList {
+		sec := f.Section(sname)
+		if len(sec.Comment) > 0 {
+			if sec.Comment[0] != '#' && sec.Comment[0] != ';' {
+				sec.Comment = "; " + sec.Comment
+			}
+			if _, err = buf.WriteString(sec.Comment + LineBreak); err != nil {
+				return 0, err
+			}
+		}
+
+		if i > 0 || DefaultHeader {
+			if _, err = buf.WriteString("[" + sname + "]" + LineBreak); err != nil {
+				return 0, err
+			}
+		} else {
+			// Write nothing if default section is empty
+			if len(sec.keyList) == 0 {
+				continue
+			}
+		}
+
+		// Count and generate alignment length and buffer spaces
+		alignLength := 0
+		if PrettyFormat {
+			for i := 0; i < len(sec.keyList); i++ {
+				if len(sec.keyList[i]) > alignLength {
+					alignLength = len(sec.keyList[i])
+				}
+			}
+		}
+		alignSpaces := bytes.Repeat([]byte(" "), alignLength)
+
+		for _, kname := range sec.keyList {
+			key := sec.Key(kname)
+			if len(key.Comment) > 0 {
+				if len(indent) > 0 && sname != DEFAULT_SECTION {
+					buf.WriteString(indent)
+				}
+				if key.Comment[0] != '#' && key.Comment[0] != ';' {
+					key.Comment = "; " + key.Comment
+				}
+				if _, err = buf.WriteString(key.Comment + LineBreak); err != nil {
+					return 0, err
+				}
+			}
+
+			if len(indent) > 0 && sname != DEFAULT_SECTION {
+				buf.WriteString(indent)
+			}
+
+			switch {
+			case key.isAutoIncr:
+				kname = "-"
+			case strings.ContainsAny(kname, "\"=:"):
+				kname = "`" + kname + "`"
+			case strings.Contains(kname, "`"):
+				kname = `"""` + kname + `"""`
+			}
+			if _, err = buf.WriteString(kname); err != nil {
+				return 0, err
+			}
+
+			// Write out alignment spaces before "=" sign
+			if PrettyFormat {
+				buf.Write(alignSpaces[:alignLength-len(kname)])
+			}
+
+			val := key.value
+			// In case key value contains "\n", "`", "\"", "#" or ";"
+			if strings.ContainsAny(val, "\n`") {
+				val = `"""` + val + `"""`
+			} else if strings.ContainsAny(val, "#;") {
+				val = "`" + val + "`"
+			}
+			if _, err = buf.WriteString(equalSign + val + LineBreak); err != nil {
+				return 0, err
+			}
+		}
+
+		// Put a line between sections
+		if _, err = buf.WriteString(LineBreak); err != nil {
+			return 0, err
+		}
+	}
+
+	return buf.WriteTo(w)
+}
+
+// WriteTo writes file content into io.Writer.
+func (f *File) WriteTo(w io.Writer) (int64, error) {
+	return f.WriteToIndent(w, "")
+}
+
+// SaveToIndent writes content to file system with given value indention.
+func (f *File) SaveToIndent(filename, indent string) error {
+	// Note: Because we are truncating with os.Create,
+	// 	so it's safer to save to a temporary file location and rename afte done.
+	tmpPath := filename + "." + strconv.Itoa(time.Now().Nanosecond()) + ".tmp"
+	defer os.Remove(tmpPath)
+
+	fw, err := os.Create(tmpPath)
+	if err != nil {
+		return err
+	}
+
+	if _, err = f.WriteToIndent(fw, indent); err != nil {
+		fw.Close()
+		return err
+	}
+	fw.Close()
+
+	// Remove old file and rename the new one.
+	os.Remove(filename)
+	return os.Rename(tmpPath, filename)
+}
+
+// SaveTo writes content to file system.
+func (f *File) SaveTo(filename string) error {
+	return f.SaveToIndent(filename, "")
+}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/key.go b/Godeps/_workspace/src/github.com/go-ini/ini/key.go
new file mode 100644
index 0000000000..7cbccd38e6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/key.go
@@ -0,0 +1,616 @@
+// Copyright 2014 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package ini
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// Key represents a key under a section.
+type Key struct {
+	s          *Section
+	Comment    string
+	name       string
+	value      string
+	isAutoIncr bool
+}
+
+// Name returns name of key.
+func (k *Key) Name() string {
+	return k.name
+}
+
+// Value returns raw value of key for performance purpose.
+func (k *Key) Value() string {
+	return k.value
+}
+
+// String returns string representation of value.
+func (k *Key) String() string {
+	val := k.value
+	if strings.Index(val, "%") == -1 {
+		return val
+	}
+
+	for i := 0; i < _DEPTH_VALUES; i++ {
+		vr := varPattern.FindString(val)
+		if len(vr) == 0 {
+			break
+		}
+
+		// Take off leading '%(' and trailing ')s'.
+		noption := strings.TrimLeft(vr, "%(")
+		noption = strings.TrimRight(noption, ")s")
+
+		// Search in the same section.
+		nk, err := k.s.GetKey(noption)
+		if err != nil {
+			// Search again in default section.
+			nk, _ = k.s.f.Section("").GetKey(noption)
+		}
+
+		// Substitute by new value and take off leading '%(' and trailing ')s'.
+		val = strings.Replace(val, vr, nk.value, -1)
+	}
+	return val
+}
+
+// Validate accepts a validate function which can
+// return modifed result as key value.
+func (k *Key) Validate(fn func(string) string) string {
+	return fn(k.String())
+}
+
+// parseBool returns the boolean value represented by the string.
+//
+// It accepts 1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On,
+// 0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off.
+// Any other value returns an error.
+func parseBool(str string) (value bool, err error) {
+	switch str {
+	case "1", "t", "T", "true", "TRUE", "True", "YES", "yes", "Yes", "y", "ON", "on", "On":
+		return true, nil
+	case "0", "f", "F", "false", "FALSE", "False", "NO", "no", "No", "n", "OFF", "off", "Off":
+		return false, nil
+	}
+	return false, fmt.Errorf("parsing \"%s\": invalid syntax", str)
+}
+
+// Bool returns bool type value.
+func (k *Key) Bool() (bool, error) {
+	return parseBool(k.String())
+}
+
+// Float64 returns float64 type value.
+func (k *Key) Float64() (float64, error) {
+	return strconv.ParseFloat(k.String(), 64)
+}
+
+// Int returns int type value.
+func (k *Key) Int() (int, error) {
+	return strconv.Atoi(k.String())
+}
+
+// Int64 returns int64 type value.
+func (k *Key) Int64() (int64, error) {
+	return strconv.ParseInt(k.String(), 10, 64)
+}
+
+// Uint returns uint type valued.
+func (k *Key) Uint() (uint, error) {
+	u, e := strconv.ParseUint(k.String(), 10, 64)
+	return uint(u), e
+}
+
+// Uint64 returns uint64 type value.
+func (k *Key) Uint64() (uint64, error) {
+	return strconv.ParseUint(k.String(), 10, 64)
+}
+
+// Duration returns time.Duration type value.
+func (k *Key) Duration() (time.Duration, error) {
+	return time.ParseDuration(k.String())
+}
+
+// TimeFormat parses with given format and returns time.Time type value.
+func (k *Key) TimeFormat(format string) (time.Time, error) {
+	return time.Parse(format, k.String())
+}
+
+// Time parses with RFC3339 format and returns time.Time type value.
+func (k *Key) Time() (time.Time, error) {
+	return k.TimeFormat(time.RFC3339)
+}
+
+// MustString returns default value if key value is empty.
+func (k *Key) MustString(defaultVal string) string {
+	val := k.String()
+	if len(val) == 0 {
+		return defaultVal
+	}
+	return val
+}
+
+// MustBool always returns value without error,
+// it returns false if error occurs.
+func (k *Key) MustBool(defaultVal ...bool) bool {
+	val, err := k.Bool()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustFloat64 always returns value without error,
+// it returns 0.0 if error occurs.
+func (k *Key) MustFloat64(defaultVal ...float64) float64 {
+	val, err := k.Float64()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustInt always returns value without error,
+// it returns 0 if error occurs.
+func (k *Key) MustInt(defaultVal ...int) int {
+	val, err := k.Int()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustInt64 always returns value without error,
+// it returns 0 if error occurs.
+func (k *Key) MustInt64(defaultVal ...int64) int64 {
+	val, err := k.Int64()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustUint always returns value without error,
+// it returns 0 if error occurs.
+func (k *Key) MustUint(defaultVal ...uint) uint {
+	val, err := k.Uint()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustUint64 always returns value without error,
+// it returns 0 if error occurs.
+func (k *Key) MustUint64(defaultVal ...uint64) uint64 {
+	val, err := k.Uint64()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustDuration always returns value without error,
+// it returns zero value if error occurs.
+func (k *Key) MustDuration(defaultVal ...time.Duration) time.Duration {
+	val, err := k.Duration()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustTimeFormat always parses with given format and returns value without error,
+// it returns zero value if error occurs.
+func (k *Key) MustTimeFormat(format string, defaultVal ...time.Time) time.Time {
+	val, err := k.TimeFormat(format)
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustTime always parses with RFC3339 format and returns value without error,
+// it returns zero value if error occurs.
+func (k *Key) MustTime(defaultVal ...time.Time) time.Time {
+	return k.MustTimeFormat(time.RFC3339, defaultVal...)
+}
+
+// In always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) In(defaultVal string, candidates []string) string {
+	val := k.String()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InFloat64 always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InFloat64(defaultVal float64, candidates []float64) float64 {
+	val := k.MustFloat64()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InInt always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InInt(defaultVal int, candidates []int) int {
+	val := k.MustInt()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InInt64 always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InInt64(defaultVal int64, candidates []int64) int64 {
+	val := k.MustInt64()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InUint always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InUint(defaultVal uint, candidates []uint) uint {
+	val := k.MustUint()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InUint64 always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InUint64(defaultVal uint64, candidates []uint64) uint64 {
+	val := k.MustUint64()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InTimeFormat always parses with given format and returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InTimeFormat(format string, defaultVal time.Time, candidates []time.Time) time.Time {
+	val := k.MustTimeFormat(format)
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InTime always parses with RFC3339 format and returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InTime(defaultVal time.Time, candidates []time.Time) time.Time {
+	return k.InTimeFormat(time.RFC3339, defaultVal, candidates)
+}
+
+// RangeFloat64 checks if value is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeFloat64(defaultVal, min, max float64) float64 {
+	val := k.MustFloat64()
+	if val < min || val > max {
+		return defaultVal
+	}
+	return val
+}
+
+// RangeInt checks if value is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeInt(defaultVal, min, max int) int {
+	val := k.MustInt()
+	if val < min || val > max {
+		return defaultVal
+	}
+	return val
+}
+
+// RangeInt64 checks if value is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeInt64(defaultVal, min, max int64) int64 {
+	val := k.MustInt64()
+	if val < min || val > max {
+		return defaultVal
+	}
+	return val
+}
+
+// RangeTimeFormat checks if value with given format is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeTimeFormat(format string, defaultVal, min, max time.Time) time.Time {
+	val := k.MustTimeFormat(format)
+	if val.Unix() < min.Unix() || val.Unix() > max.Unix() {
+		return defaultVal
+	}
+	return val
+}
+
+// RangeTime checks if value with RFC3339 format is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeTime(defaultVal, min, max time.Time) time.Time {
+	return k.RangeTimeFormat(time.RFC3339, defaultVal, min, max)
+}
+
+// Strings returns list of string divided by given delimiter.
+func (k *Key) Strings(delim string) []string {
+	str := k.String()
+	if len(str) == 0 {
+		return []string{}
+	}
+
+	vals := strings.Split(str, delim)
+	for i := range vals {
+		vals[i] = strings.TrimSpace(vals[i])
+	}
+	return vals
+}
+
+// Float64s returns list of float64 divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Float64s(delim string) []float64 {
+	vals, _ := k.getFloat64s(delim, true, false)
+	return vals
+}
+
+// Ints returns list of int divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Ints(delim string) []int {
+	vals, _ := k.getInts(delim, true, false)
+	return vals
+}
+
+// Int64s returns list of int64 divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Int64s(delim string) []int64 {
+	vals, _ := k.getInt64s(delim, true, false)
+	return vals
+}
+
+// Uints returns list of uint divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Uints(delim string) []uint {
+	vals, _ := k.getUints(delim, true, false)
+	return vals
+}
+
+// Uint64s returns list of uint64 divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Uint64s(delim string) []uint64 {
+	vals, _ := k.getUint64s(delim, true, false)
+	return vals
+}
+
+// TimesFormat parses with given format and returns list of time.Time divided by given delimiter.
+// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
+func (k *Key) TimesFormat(format, delim string) []time.Time {
+	vals, _ := k.getTimesFormat(format, delim, true, false)
+	return vals
+}
+
+// Times parses with RFC3339 format and returns list of time.Time divided by given delimiter.
+// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
+func (k *Key) Times(delim string) []time.Time {
+	return k.TimesFormat(time.RFC3339, delim)
+}
+
+// ValidFloat64s returns list of float64 divided by given delimiter. If some value is not float, then
+// it will not be included to result list.
+func (k *Key) ValidFloat64s(delim string) []float64 {
+	vals, _ := k.getFloat64s(delim, false, false)
+	return vals
+}
+
+// ValidInts returns list of int divided by given delimiter. If some value is not integer, then it will
+// not be included to result list.
+func (k *Key) ValidInts(delim string) []int {
+	vals, _ := k.getInts(delim, false, false)
+	return vals
+}
+
+// ValidInt64s returns list of int64 divided by given delimiter. If some value is not 64-bit integer,
+// then it will not be included to result list.
+func (k *Key) ValidInt64s(delim string) []int64 {
+	vals, _ := k.getInt64s(delim, false, false)
+	return vals
+}
+
+// ValidUints returns list of uint divided by given delimiter. If some value is not unsigned integer,
+// then it will not be included to result list.
+func (k *Key) ValidUints(delim string) []uint {
+	vals, _ := k.getUints(delim, false, false)
+	return vals
+}
+
+// ValidUint64s returns list of uint64 divided by given delimiter. If some value is not 64-bit unsigned
+// integer, then it will not be included to result list.
+func (k *Key) ValidUint64s(delim string) []uint64 {
+	vals, _ := k.getUint64s(delim, false, false)
+	return vals
+}
+
+// ValidTimesFormat parses with given format and returns list of time.Time divided by given delimiter.
+func (k *Key) ValidTimesFormat(format, delim string) []time.Time {
+	vals, _ := k.getTimesFormat(format, delim, false, false)
+	return vals
+}
+
+// ValidTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter.
+func (k *Key) ValidTimes(delim string) []time.Time {
+	return k.ValidTimesFormat(time.RFC3339, delim)
+}
+
+// StrictFloat64s returns list of float64 divided by given delimiter or error on first invalid input.
+func (k *Key) StrictFloat64s(delim string) ([]float64, error) {
+	return k.getFloat64s(delim, false, true)
+}
+
+// StrictInts returns list of int divided by given delimiter or error on first invalid input.
+func (k *Key) StrictInts(delim string) ([]int, error) {
+	return k.getInts(delim, false, true)
+}
+
+// StrictInt64s returns list of int64 divided by given delimiter or error on first invalid input.
+func (k *Key) StrictInt64s(delim string) ([]int64, error) {
+	return k.getInt64s(delim, false, true)
+}
+
+// StrictUints returns list of uint divided by given delimiter or error on first invalid input.
+func (k *Key) StrictUints(delim string) ([]uint, error) {
+	return k.getUints(delim, false, true)
+}
+
+// StrictUint64s returns list of uint64 divided by given delimiter or error on first invalid input.
+func (k *Key) StrictUint64s(delim string) ([]uint64, error) {
+	return k.getUint64s(delim, false, true)
+}
+
+// StrictTimesFormat parses with given format and returns list of time.Time divided by given delimiter
+// or error on first invalid input.
+func (k *Key) StrictTimesFormat(format, delim string) ([]time.Time, error) {
+	return k.getTimesFormat(format, delim, false, true)
+}
+
+// StrictTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter
+// or error on first invalid input.
+func (k *Key) StrictTimes(delim string) ([]time.Time, error) {
+	return k.StrictTimesFormat(time.RFC3339, delim)
+}
+
+// getFloat64s returns list of float64 divided by given delimiter.
+func (k *Key) getFloat64s(delim string, addInvalid, returnOnInvalid bool) ([]float64, error) {
+	strs := k.Strings(delim)
+	vals := make([]float64, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.ParseFloat(str, 64)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// getInts returns list of int divided by given delimiter.
+func (k *Key) getInts(delim string, addInvalid, returnOnInvalid bool) ([]int, error) {
+	strs := k.Strings(delim)
+	vals := make([]int, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.Atoi(str)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// getInt64s returns list of int64 divided by given delimiter.
+func (k *Key) getInt64s(delim string, addInvalid, returnOnInvalid bool) ([]int64, error) {
+	strs := k.Strings(delim)
+	vals := make([]int64, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.ParseInt(str, 10, 64)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// getUints returns list of uint divided by given delimiter.
+func (k *Key) getUints(delim string, addInvalid, returnOnInvalid bool) ([]uint, error) {
+	strs := k.Strings(delim)
+	vals := make([]uint, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.ParseUint(str, 10, 0)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, uint(val))
+		}
+	}
+	return vals, nil
+}
+
+// getUint64s returns list of uint64 divided by given delimiter.
+func (k *Key) getUint64s(delim string, addInvalid, returnOnInvalid bool) ([]uint64, error) {
+	strs := k.Strings(delim)
+	vals := make([]uint64, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.ParseUint(str, 10, 64)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// getTimesFormat parses with given format and returns list of time.Time divided by given delimiter.
+func (k *Key) getTimesFormat(format, delim string, addInvalid, returnOnInvalid bool) ([]time.Time, error) {
+	strs := k.Strings(delim)
+	vals := make([]time.Time, 0, len(strs))
+	for _, str := range strs {
+		val, err := time.Parse(format, str)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// SetValue changes key value.
+func (k *Key) SetValue(v string) {
+	if k.s.f.BlockMode {
+		k.s.f.lock.Lock()
+		defer k.s.f.lock.Unlock()
+	}
+
+	k.value = v
+	k.s.keysHash[k.name] = v
+}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/parser.go b/Godeps/_workspace/src/github.com/go-ini/ini/parser.go
new file mode 100644
index 0000000000..1c1bf91f0e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/parser.go
@@ -0,0 +1,312 @@
+// Copyright 2015 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package ini
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"io"
+	"strconv"
+	"strings"
+	"unicode"
+)
+
+type tokenType int
+
+const (
+	_TOKEN_INVALID tokenType = iota
+	_TOKEN_COMMENT
+	_TOKEN_SECTION
+	_TOKEN_KEY
+)
+
+type parser struct {
+	buf     *bufio.Reader
+	isEOF   bool
+	count   int
+	comment *bytes.Buffer
+}
+
+func newParser(r io.Reader) *parser {
+	return &parser{
+		buf:     bufio.NewReader(r),
+		count:   1,
+		comment: &bytes.Buffer{},
+	}
+}
+
+// BOM handles header of BOM-UTF8 format.
+// http://en.wikipedia.org/wiki/Byte_order_mark#Representations_of_byte_order_marks_by_encoding
+func (p *parser) BOM() error {
+	mask, err := p.buf.Peek(3)
+	if err != nil && err != io.EOF {
+		return err
+	} else if len(mask) < 3 {
+		return nil
+	} else if mask[0] == 239 && mask[1] == 187 && mask[2] == 191 {
+		p.buf.Read(mask)
+	}
+	return nil
+}
+
+func (p *parser) readUntil(delim byte) ([]byte, error) {
+	data, err := p.buf.ReadBytes(delim)
+	if err != nil {
+		if err == io.EOF {
+			p.isEOF = true
+		} else {
+			return nil, err
+		}
+	}
+	return data, nil
+}
+
+func cleanComment(in []byte) ([]byte, bool) {
+	i := bytes.IndexAny(in, "#;")
+	if i == -1 {
+		return nil, false
+	}
+	return in[i:], true
+}
+
+func readKeyName(in []byte) (string, int, error) {
+	line := string(in)
+
+	// Check if key name surrounded by quotes.
+	var keyQuote string
+	if line[0] == '"' {
+		if len(line) > 6 && string(line[0:3]) == `"""` {
+			keyQuote = `"""`
+		} else {
+			keyQuote = `"`
+		}
+	} else if line[0] == '`' {
+		keyQuote = "`"
+	}
+
+	// Get out key name
+	endIdx := -1
+	if len(keyQuote) > 0 {
+		startIdx := len(keyQuote)
+		// FIXME: fail case -> """"""name"""=value
+		pos := strings.Index(line[startIdx:], keyQuote)
+		if pos == -1 {
+			return "", -1, fmt.Errorf("missing closing key quote: %s", line)
+		}
+		pos += startIdx
+
+		// Find key-value delimiter
+		i := strings.IndexAny(line[pos+startIdx:], "=:")
+		if i < 0 {
+			return "", -1, fmt.Errorf("key-value delimiter not found: %s", line)
+		}
+		endIdx = pos + i
+		return strings.TrimSpace(line[startIdx:pos]), endIdx + startIdx + 1, nil
+	}
+
+	endIdx = strings.IndexAny(line, "=:")
+	if endIdx < 0 {
+		return "", -1, fmt.Errorf("key-value delimiter not found: %s", line)
+	}
+	return strings.TrimSpace(line[0:endIdx]), endIdx + 1, nil
+}
+
+func (p *parser) readMultilines(line, val, valQuote string) (string, error) {
+	for {
+		data, err := p.readUntil('\n')
+		if err != nil {
+			return "", err
+		}
+		next := string(data)
+
+		pos := strings.LastIndex(next, valQuote)
+		if pos > -1 {
+			val += next[:pos]
+
+			comment, has := cleanComment([]byte(next[pos:]))
+			if has {
+				p.comment.Write(bytes.TrimSpace(comment))
+			}
+			break
+		}
+		val += next
+		if p.isEOF {
+			return "", fmt.Errorf("missing closing key quote from '%s' to '%s'", line, next)
+		}
+	}
+	return val, nil
+}
+
+func (p *parser) readContinuationLines(val string) (string, error) {
+	for {
+		data, err := p.readUntil('\n')
+		if err != nil {
+			return "", err
+		}
+		next := strings.TrimSpace(string(data))
+
+		if len(next) == 0 {
+			break
+		}
+		val += next
+		if val[len(val)-1] != '\\' {
+			break
+		}
+		val = val[:len(val)-1]
+	}
+	return val, nil
+}
+
+// hasSurroundedQuote check if and only if the first and last characters
+// are quotes \" or \'.
+// It returns false if any other parts also contain same kind of quotes.
+func hasSurroundedQuote(in string, quote byte) bool {
+	return len(in) > 2 && in[0] == quote && in[len(in)-1] == quote &&
+		strings.IndexByte(in[1:], quote) == len(in)-2
+}
+
+func (p *parser) readValue(in []byte) (string, error) {
+	line := strings.TrimLeftFunc(string(in), unicode.IsSpace)
+	if len(line) == 0 {
+		return "", nil
+	}
+
+	var valQuote string
+	if len(line) > 3 && string(line[0:3]) == `"""` {
+		valQuote = `"""`
+	} else if line[0] == '`' {
+		valQuote = "`"
+	}
+
+	if len(valQuote) > 0 {
+		startIdx := len(valQuote)
+		pos := strings.LastIndex(line[startIdx:], valQuote)
+		// Check for multi-line value
+		if pos == -1 {
+			return p.readMultilines(line, line[startIdx:], valQuote)
+		}
+
+		return line[startIdx : pos+startIdx], nil
+	}
+
+	// Won't be able to reach here if value only contains whitespace.
+	line = strings.TrimSpace(line)
+
+	// Check continuation lines
+	if line[len(line)-1] == '\\' {
+		return p.readContinuationLines(line[:len(line)-1])
+	}
+
+	i := strings.IndexAny(line, "#;")
+	if i > -1 {
+		p.comment.WriteString(line[i:])
+		line = strings.TrimSpace(line[:i])
+	}
+
+	// Trim single quotes
+	if hasSurroundedQuote(line, '\'') ||
+		hasSurroundedQuote(line, '"') {
+		line = line[1 : len(line)-1]
+	}
+	return line, nil
+}
+
+// parse parses data through an io.Reader.
+func (f *File) parse(reader io.Reader) (err error) {
+	p := newParser(reader)
+	if err = p.BOM(); err != nil {
+		return fmt.Errorf("BOM: %v", err)
+	}
+
+	// Ignore error because default section name is never empty string.
+	section, _ := f.NewSection(DEFAULT_SECTION)
+
+	var line []byte
+	for !p.isEOF {
+		line, err = p.readUntil('\n')
+		if err != nil {
+			return err
+		}
+
+		line = bytes.TrimLeftFunc(line, unicode.IsSpace)
+		if len(line) == 0 {
+			continue
+		}
+
+		// Comments
+		if line[0] == '#' || line[0] == ';' {
+			// Note: we do not care ending line break,
+			// it is needed for adding second line,
+			// so just clean it once at the end when set to value.
+			p.comment.Write(line)
+			continue
+		}
+
+		// Section
+		if line[0] == '[' {
+			// Read to the next ']' (TODO: support quoted strings)
+			closeIdx := bytes.IndexByte(line, ']')
+			if closeIdx == -1 {
+				return fmt.Errorf("unclosed section: %s", line)
+			}
+
+			section, err = f.NewSection(string(line[1:closeIdx]))
+			if err != nil {
+				return err
+			}
+
+			comment, has := cleanComment(line[closeIdx+1:])
+			if has {
+				p.comment.Write(comment)
+			}
+
+			section.Comment = strings.TrimSpace(p.comment.String())
+
+			// Reset aotu-counter and comments
+			p.comment.Reset()
+			p.count = 1
+			continue
+		}
+
+		kname, offset, err := readKeyName(line)
+		if err != nil {
+			return err
+		}
+
+		// Auto increment.
+		isAutoIncr := false
+		if kname == "-" {
+			isAutoIncr = true
+			kname = "#" + strconv.Itoa(p.count)
+			p.count++
+		}
+
+		key, err := section.NewKey(kname, "")
+		if err != nil {
+			return err
+		}
+		key.isAutoIncr = isAutoIncr
+
+		value, err := p.readValue(line[offset:])
+		if err != nil {
+			return err
+		}
+		key.SetValue(value)
+		key.Comment = strings.TrimSpace(p.comment.String())
+		p.comment.Reset()
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/section.go b/Godeps/_workspace/src/github.com/go-ini/ini/section.go
new file mode 100644
index 0000000000..ed8cbdb54a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/section.go
@@ -0,0 +1,177 @@
+// Copyright 2014 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package ini
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+)
+
+// Section represents a config section.
+type Section struct {
+	f        *File
+	Comment  string
+	name     string
+	keys     map[string]*Key
+	keyList  []string
+	keysHash map[string]string
+}
+
+func newSection(f *File, name string) *Section {
+	return &Section{f, "", name, make(map[string]*Key), make([]string, 0, 10), make(map[string]string)}
+}
+
+// Name returns name of Section.
+func (s *Section) Name() string {
+	return s.name
+}
+
+// NewKey creates a new key to given section.
+func (s *Section) NewKey(name, val string) (*Key, error) {
+	if len(name) == 0 {
+		return nil, errors.New("error creating new key: empty key name")
+	}
+
+	if s.f.BlockMode {
+		s.f.lock.Lock()
+		defer s.f.lock.Unlock()
+	}
+
+	if inSlice(name, s.keyList) {
+		s.keys[name].value = val
+		return s.keys[name], nil
+	}
+
+	s.keyList = append(s.keyList, name)
+	s.keys[name] = &Key{s, "", name, val, false}
+	s.keysHash[name] = val
+	return s.keys[name], nil
+}
+
+// GetKey returns key in section by given name.
+func (s *Section) GetKey(name string) (*Key, error) {
+	// FIXME: change to section level lock?
+	if s.f.BlockMode {
+		s.f.lock.RLock()
+	}
+	key := s.keys[name]
+	if s.f.BlockMode {
+		s.f.lock.RUnlock()
+	}
+
+	if key == nil {
+		// Check if it is a child-section.
+		sname := s.name
+		for {
+			if i := strings.LastIndex(sname, "."); i > -1 {
+				sname = sname[:i]
+				sec, err := s.f.GetSection(sname)
+				if err != nil {
+					continue
+				}
+				return sec.GetKey(name)
+			} else {
+				break
+			}
+		}
+		return nil, fmt.Errorf("error when getting key of section '%s': key '%s' not exists", s.name, name)
+	}
+	return key, nil
+}
+
+// HasKey returns true if section contains a key with given name.
+func (s *Section) HasKey(name string) bool {
+	key, _ := s.GetKey(name)
+	return key != nil
+}
+
+// Haskey is a backwards-compatible name for HasKey.
+func (s *Section) Haskey(name string) bool {
+	return s.HasKey(name)
+}
+
+// HasValue returns true if section contains given raw value.
+func (s *Section) HasValue(value string) bool {
+	if s.f.BlockMode {
+		s.f.lock.RLock()
+		defer s.f.lock.RUnlock()
+	}
+
+	for _, k := range s.keys {
+		if value == k.value {
+			return true
+		}
+	}
+	return false
+}
+
+// Key assumes named Key exists in section and returns a zero-value when not.
+func (s *Section) Key(name string) *Key {
+	key, err := s.GetKey(name)
+	if err != nil {
+		// It's OK here because the only possible error is empty key name,
+		// but if it's empty, this piece of code won't be executed.
+		key, _ = s.NewKey(name, "")
+		return key
+	}
+	return key
+}
+
+// Keys returns list of keys of section.
+func (s *Section) Keys() []*Key {
+	keys := make([]*Key, len(s.keyList))
+	for i := range s.keyList {
+		keys[i] = s.Key(s.keyList[i])
+	}
+	return keys
+}
+
+// KeyStrings returns list of key names of section.
+func (s *Section) KeyStrings() []string {
+	list := make([]string, len(s.keyList))
+	copy(list, s.keyList)
+	return list
+}
+
+// KeysHash returns keys hash consisting of names and values.
+func (s *Section) KeysHash() map[string]string {
+	if s.f.BlockMode {
+		s.f.lock.RLock()
+		defer s.f.lock.RUnlock()
+	}
+
+	hash := map[string]string{}
+	for key, value := range s.keysHash {
+		hash[key] = value
+	}
+	return hash
+}
+
+// DeleteKey deletes a key from section.
+func (s *Section) DeleteKey(name string) {
+	if s.f.BlockMode {
+		s.f.lock.Lock()
+		defer s.f.lock.Unlock()
+	}
+
+	for i, k := range s.keyList {
+		if k == name {
+			s.keyList = append(s.keyList[:i], s.keyList[i+1:]...)
+			delete(s.keys, name)
+			return
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/struct.go b/Godeps/_workspace/src/github.com/go-ini/ini/struct.go
new file mode 100644
index 0000000000..3fb92c3962
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/go-ini/ini/struct.go
@@ -0,0 +1,351 @@
+// Copyright 2014 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package ini
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"reflect"
+	"time"
+	"unicode"
+)
+
+// NameMapper represents a ini tag name mapper.
+type NameMapper func(string) string
+
+// Built-in name getters.
+var (
+	// AllCapsUnderscore converts to format ALL_CAPS_UNDERSCORE.
+	AllCapsUnderscore NameMapper = func(raw string) string {
+		newstr := make([]rune, 0, len(raw))
+		for i, chr := range raw {
+			if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
+				if i > 0 {
+					newstr = append(newstr, '_')
+				}
+			}
+			newstr = append(newstr, unicode.ToUpper(chr))
+		}
+		return string(newstr)
+	}
+	// TitleUnderscore converts to format title_underscore.
+	TitleUnderscore NameMapper = func(raw string) string {
+		newstr := make([]rune, 0, len(raw))
+		for i, chr := range raw {
+			if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
+				if i > 0 {
+					newstr = append(newstr, '_')
+				}
+				chr -= ('A' - 'a')
+			}
+			newstr = append(newstr, chr)
+		}
+		return string(newstr)
+	}
+)
+
+func (s *Section) parseFieldName(raw, actual string) string {
+	if len(actual) > 0 {
+		return actual
+	}
+	if s.f.NameMapper != nil {
+		return s.f.NameMapper(raw)
+	}
+	return raw
+}
+
+func parseDelim(actual string) string {
+	if len(actual) > 0 {
+		return actual
+	}
+	return ","
+}
+
+var reflectTime = reflect.TypeOf(time.Now()).Kind()
+
+// setWithProperType sets proper value to field based on its type,
+// but it does not return error for failing parsing,
+// because we want to use default value that is already assigned to strcut.
+func setWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string) error {
+	switch t.Kind() {
+	case reflect.String:
+		if len(key.String()) == 0 {
+			return nil
+		}
+		field.SetString(key.String())
+	case reflect.Bool:
+		boolVal, err := key.Bool()
+		if err != nil {
+			return nil
+		}
+		field.SetBool(boolVal)
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		durationVal, err := key.Duration()
+		// Skip zero value
+		if err == nil && int(durationVal) > 0 {
+			field.Set(reflect.ValueOf(durationVal))
+			return nil
+		}
+
+		intVal, err := key.Int64()
+		if err != nil || intVal == 0 {
+			return nil
+		}
+		field.SetInt(intVal)
+	//	byte is an alias for uint8, so supporting uint8 breaks support for byte
+	case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		durationVal, err := key.Duration()
+		if err == nil {
+			field.Set(reflect.ValueOf(durationVal))
+			return nil
+		}
+
+		uintVal, err := key.Uint64()
+		if err != nil {
+			return nil
+		}
+		field.SetUint(uintVal)
+
+	case reflect.Float64:
+		floatVal, err := key.Float64()
+		if err != nil {
+			return nil
+		}
+		field.SetFloat(floatVal)
+	case reflectTime:
+		timeVal, err := key.Time()
+		if err != nil {
+			return nil
+		}
+		field.Set(reflect.ValueOf(timeVal))
+	case reflect.Slice:
+		vals := key.Strings(delim)
+		numVals := len(vals)
+		if numVals == 0 {
+			return nil
+		}
+
+		sliceOf := field.Type().Elem().Kind()
+
+		var times []time.Time
+		if sliceOf == reflectTime {
+			times = key.Times(delim)
+		}
+
+		slice := reflect.MakeSlice(field.Type(), numVals, numVals)
+		for i := 0; i < numVals; i++ {
+			switch sliceOf {
+			case reflectTime:
+				slice.Index(i).Set(reflect.ValueOf(times[i]))
+			default:
+				slice.Index(i).Set(reflect.ValueOf(vals[i]))
+			}
+		}
+		field.Set(slice)
+	default:
+		return fmt.Errorf("unsupported type '%s'", t)
+	}
+	return nil
+}
+
+func (s *Section) mapTo(val reflect.Value) error {
+	if val.Kind() == reflect.Ptr {
+		val = val.Elem()
+	}
+	typ := val.Type()
+
+	for i := 0; i < typ.NumField(); i++ {
+		field := val.Field(i)
+		tpField := typ.Field(i)
+
+		tag := tpField.Tag.Get("ini")
+		if tag == "-" {
+			continue
+		}
+
+		fieldName := s.parseFieldName(tpField.Name, tag)
+		if len(fieldName) == 0 || !field.CanSet() {
+			continue
+		}
+
+		isAnonymous := tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous
+		isStruct := tpField.Type.Kind() == reflect.Struct
+		if isAnonymous {
+			field.Set(reflect.New(tpField.Type.Elem()))
+		}
+
+		if isAnonymous || isStruct {
+			if sec, err := s.f.GetSection(fieldName); err == nil {
+				if err = sec.mapTo(field); err != nil {
+					return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
+				}
+				continue
+			}
+		}
+
+		if key, err := s.GetKey(fieldName); err == nil {
+			if err = setWithProperType(tpField.Type, key, field, parseDelim(tpField.Tag.Get("delim"))); err != nil {
+				return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
+			}
+		}
+	}
+	return nil
+}
+
+// MapTo maps section to given struct.
+func (s *Section) MapTo(v interface{}) error {
+	typ := reflect.TypeOf(v)
+	val := reflect.ValueOf(v)
+	if typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+		val = val.Elem()
+	} else {
+		return errors.New("cannot map to non-pointer struct")
+	}
+
+	return s.mapTo(val)
+}
+
+// MapTo maps file to given struct.
+func (f *File) MapTo(v interface{}) error {
+	return f.Section("").MapTo(v)
+}
+
+// MapTo maps data sources to given struct with name mapper.
+func MapToWithMapper(v interface{}, mapper NameMapper, source interface{}, others ...interface{}) error {
+	cfg, err := Load(source, others...)
+	if err != nil {
+		return err
+	}
+	cfg.NameMapper = mapper
+	return cfg.MapTo(v)
+}
+
+// MapTo maps data sources to given struct.
+func MapTo(v, source interface{}, others ...interface{}) error {
+	return MapToWithMapper(v, nil, source, others...)
+}
+
+// reflectWithProperType does the opposite thing with setWithProperType.
+func reflectWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string) error {
+	switch t.Kind() {
+	case reflect.String:
+		key.SetValue(field.String())
+	case reflect.Bool,
+		reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
+		reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
+		reflect.Float64,
+		reflectTime:
+		key.SetValue(fmt.Sprint(field))
+	case reflect.Slice:
+		vals := field.Slice(0, field.Len())
+		if field.Len() == 0 {
+			return nil
+		}
+
+		var buf bytes.Buffer
+		isTime := fmt.Sprint(field.Type()) == "[]time.Time"
+		for i := 0; i < field.Len(); i++ {
+			if isTime {
+				buf.WriteString(vals.Index(i).Interface().(time.Time).Format(time.RFC3339))
+			} else {
+				buf.WriteString(fmt.Sprint(vals.Index(i)))
+			}
+			buf.WriteString(delim)
+		}
+		key.SetValue(buf.String()[:buf.Len()-1])
+	default:
+		return fmt.Errorf("unsupported type '%s'", t)
+	}
+	return nil
+}
+
+func (s *Section) reflectFrom(val reflect.Value) error {
+	if val.Kind() == reflect.Ptr {
+		val = val.Elem()
+	}
+	typ := val.Type()
+
+	for i := 0; i < typ.NumField(); i++ {
+		field := val.Field(i)
+		tpField := typ.Field(i)
+
+		tag := tpField.Tag.Get("ini")
+		if tag == "-" {
+			continue
+		}
+
+		fieldName := s.parseFieldName(tpField.Name, tag)
+		if len(fieldName) == 0 || !field.CanSet() {
+			continue
+		}
+
+		if (tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous) ||
+			(tpField.Type.Kind() == reflect.Struct) {
+			// Note: The only error here is section doesn't exist.
+			sec, err := s.f.GetSection(fieldName)
+			if err != nil {
+				// Note: fieldName can never be empty here, ignore error.
+				sec, _ = s.f.NewSection(fieldName)
+			}
+			if err = sec.reflectFrom(field); err != nil {
+				return fmt.Errorf("error reflecting field(%s): %v", fieldName, err)
+			}
+			continue
+		}
+
+		// Note: Same reason as secion.
+		key, err := s.GetKey(fieldName)
+		if err != nil {
+			key, _ = s.NewKey(fieldName, "")
+		}
+		if err = reflectWithProperType(tpField.Type, key, field, parseDelim(tpField.Tag.Get("delim"))); err != nil {
+			return fmt.Errorf("error reflecting field(%s): %v", fieldName, err)
+		}
+
+	}
+	return nil
+}
+
+// ReflectFrom reflects secion from given struct.
+func (s *Section) ReflectFrom(v interface{}) error {
+	typ := reflect.TypeOf(v)
+	val := reflect.ValueOf(v)
+	if typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+		val = val.Elem()
+	} else {
+		return errors.New("cannot reflect from non-pointer struct")
+	}
+
+	return s.reflectFrom(val)
+}
+
+// ReflectFrom reflects file from given struct.
+func (f *File) ReflectFrom(v interface{}) error {
+	return f.Section("").ReflectFrom(v)
+}
+
+// ReflectFrom reflects data sources from given struct with name mapper.
+func ReflectFromWithMapper(cfg *File, v interface{}, mapper NameMapper) error {
+	cfg.NameMapper = mapper
+	return cfg.ReflectFrom(v)
+}
+
+// ReflectFrom reflects data sources from given struct.
+func ReflectFrom(cfg *File, v interface{}) error {
+	return ReflectFromWithMapper(cfg, v, nil)
+}
diff --git a/Godeps/_workspace/src/github.com/gopherjs/gopherjs/LICENSE b/Godeps/_workspace/src/github.com/gopherjs/gopherjs/LICENSE
new file mode 100644
index 0000000000..d496fef109
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gopherjs/gopherjs/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2013 Richard Musiol. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go b/Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go
new file mode 100644
index 0000000000..5367d3d0fa
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go
@@ -0,0 +1,168 @@
+// Package js provides functions for interacting with native JavaScript APIs. Calls to these functions are treated specially by GopherJS and translated directly to their corresponding JavaScript syntax.
+//
+// Use MakeWrapper to expose methods to JavaScript. When passing values directly, the following type conversions are performed:
+//
+//  | Go type               | JavaScript type       | Conversions back to interface{} |
+//  | --------------------- | --------------------- | ------------------------------- |
+//  | bool                  | Boolean               | bool                            |
+//  | integers and floats   | Number                | float64                         |
+//  | string                | String                | string                          |
+//  | []int8                | Int8Array             | []int8                          |
+//  | []int16               | Int16Array            | []int16                         |
+//  | []int32, []int        | Int32Array            | []int                           |
+//  | []uint8               | Uint8Array            | []uint8                         |
+//  | []uint16              | Uint16Array           | []uint16                        |
+//  | []uint32, []uint      | Uint32Array           | []uint                          |
+//  | []float32             | Float32Array          | []float32                       |
+//  | []float64             | Float64Array          | []float64                       |
+//  | all other slices      | Array                 | []interface{}                   |
+//  | arrays                | see slice type        | see slice type                  |
+//  | functions             | Function              | func(...interface{}) *js.Object |
+//  | time.Time             | Date                  | time.Time                       |
+//  | -                     | instanceof Node       | *js.Object                      |
+//  | maps, structs         | instanceof Object     | map[string]interface{}          |
+//
+// Additionally, for a struct containing a *js.Object field, only the content of the field will be passed to JavaScript and vice versa.
+package js
+
+// Object is a container for a native JavaScript object. Calls to its methods are treated specially by GopherJS and translated directly to their JavaScript syntax. A nil pointer to Object is equal to JavaScript's "null". Object can not be used as a map key.
+type Object struct{ object *Object }
+
+// Get returns the object's property with the given key.
+func (o *Object) Get(key string) *Object { return o.object.Get(key) }
+
+// Set assigns the value to the object's property with the given key.
+func (o *Object) Set(key string, value interface{}) { o.object.Set(key, value) }
+
+// Delete removes the object's property with the given key.
+func (o *Object) Delete(key string) { o.object.Delete(key) }
+
+// Length returns the object's "length" property, converted to int.
+func (o *Object) Length() int { return o.object.Length() }
+
+// Index returns the i'th element of an array.
+func (o *Object) Index(i int) *Object { return o.object.Index(i) }
+
+// SetIndex sets the i'th element of an array.
+func (o *Object) SetIndex(i int, value interface{}) { o.object.SetIndex(i, value) }
+
+// Call calls the object's method with the given name.
+func (o *Object) Call(name string, args ...interface{}) *Object { return o.object.Call(name, args...) }
+
+// Invoke calls the object itself. This will fail if it is not a function.
+func (o *Object) Invoke(args ...interface{}) *Object { return o.object.Invoke(args...) }
+
+// New creates a new instance of this type object. This will fail if it not a function (constructor).
+func (o *Object) New(args ...interface{}) *Object { return o.object.New(args...) }
+
+// Bool returns the object converted to bool according to JavaScript type conversions.
+func (o *Object) Bool() bool { return o.object.Bool() }
+
+// String returns the object converted to string according to JavaScript type conversions.
+func (o *Object) String() string { return o.object.String() }
+
+// Int returns the object converted to int according to JavaScript type conversions (parseInt).
+func (o *Object) Int() int { return o.object.Int() }
+
+// Int64 returns the object converted to int64 according to JavaScript type conversions (parseInt).
+func (o *Object) Int64() int64 { return o.object.Int64() }
+
+// Uint64 returns the object converted to uint64 according to JavaScript type conversions (parseInt).
+func (o *Object) Uint64() uint64 { return o.object.Uint64() }
+
+// Float returns the object converted to float64 according to JavaScript type conversions (parseFloat).
+func (o *Object) Float() float64 { return o.object.Float() }
+
+// Interface returns the object converted to interface{}. See GopherJS' README for details.
+func (o *Object) Interface() interface{} { return o.object.Interface() }
+
+// Unsafe returns the object as an uintptr, which can be converted via unsafe.Pointer. Not intended for public use.
+func (o *Object) Unsafe() uintptr { return o.object.Unsafe() }
+
+// Error encapsulates JavaScript errors. Those are turned into a Go panic and may be recovered, giving an *Error that holds the JavaScript error object.
+type Error struct {
+	*Object
+}
+
+// Error returns the message of the encapsulated JavaScript error object.
+func (err *Error) Error() string {
+	return "JavaScript error: " + err.Get("message").String()
+}
+
+// Stack returns the stack property of the encapsulated JavaScript error object.
+func (err *Error) Stack() string {
+	return err.Get("stack").String()
+}
+
+// Global gives JavaScript's global object ("window" for browsers and "GLOBAL" for Node.js).
+var Global *Object
+
+// Module gives the value of the "module" variable set by Node.js. Hint: Set a module export with 'js.Module.Get("exports").Set("exportName", ...)'.
+var Module *Object
+
+// Undefined gives the JavaScript value "undefined".
+var Undefined *Object
+
+// Debugger gets compiled to JavaScript's "debugger;" statement.
+func Debugger() {}
+
+// InternalObject returns the internal JavaScript object that represents i. Not intended for public use.
+func InternalObject(i interface{}) *Object {
+	return nil
+}
+
+// MakeFunc wraps a function and gives access to the values of JavaScript's "this" and "arguments" keywords.
+func MakeFunc(func(this *Object, arguments []*Object) interface{}) *Object {
+	return nil
+}
+
+// Keys returns the keys of the given JavaScript object.
+func Keys(o *Object) []string {
+	if o == nil || o == Undefined {
+		return nil
+	}
+	a := Global.Get("Object").Call("keys", o)
+	s := make([]string, a.Length())
+	for i := 0; i < a.Length(); i++ {
+		s[i] = a.Index(i).String()
+	}
+	return s
+}
+
+// MakeWrapper creates a JavaScript object which has wrappers for the exported methods of i. Use explicit getter and setter methods to expose struct fields to JavaScript.
+func MakeWrapper(i interface{}) *Object {
+	v := InternalObject(i)
+	o := Global.Get("Object").New()
+	o.Set("__internal_object__", v)
+	methods := v.Get("constructor").Get("methods")
+	for i := 0; i < methods.Length(); i++ {
+		m := methods.Index(i)
+		if m.Get("pkg").String() != "" { // not exported
+			continue
+		}
+		o.Set(m.Get("name").String(), func(args ...*Object) *Object {
+			return Global.Call("$externalizeFunction", v.Get(m.Get("prop").String()), m.Get("typ"), true).Call("apply", v, args)
+		})
+	}
+	return o
+}
+
+// NewArrayBuffer creates a JavaScript ArrayBuffer from a byte slice.
+func NewArrayBuffer(b []byte) *Object {
+	slice := InternalObject(b)
+	offset := slice.Get("$offset").Int()
+	length := slice.Get("$length").Int()
+	return slice.Get("$array").Get("buffer").Call("slice", offset, offset+length)
+}
+
+// M is a simple map type. It is intended as a shorthand for JavaScript objects (before conversion).
+type M map[string]interface{}
+
+// S is a simple slice type. It is intended as a shorthand for JavaScript arrays (before conversion).
+type S []interface{}
+
+func init() {
+	// avoid dead code elimination
+	e := Error{}
+	_ = e
+}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore
new file mode 100644
index 0000000000..531fcc11c7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore
@@ -0,0 +1,4 @@
+jpgo
+jmespath-fuzz.zip
+cpu.out
+go-jmespath.test
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml
new file mode 100644
index 0000000000..1f98077570
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml
@@ -0,0 +1,9 @@
+language: go
+
+sudo: false
+
+go:
+  - 1.4
+
+install: go get -v -t ./...
+script: make test
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
new file mode 100644
index 0000000000..b03310a91f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
@@ -0,0 +1,13 @@
+Copyright 2015 James Saryerwinnie
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile
new file mode 100644
index 0000000000..a828d2848f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile
@@ -0,0 +1,44 @@
+
+CMD = jpgo
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  test                    to run all the tests"
+	@echo "  build                   to build the library and jp executable"
+	@echo "  generate                to run codegen"
+
+
+generate:
+	go generate ./...
+
+build:
+	rm -f $(CMD)
+	go build ./...
+	rm -f cmd/$(CMD)/$(CMD) && cd cmd/$(CMD)/ && go build ./...
+	mv cmd/$(CMD)/$(CMD) .
+
+test:
+	go test -v ./...
+
+check:
+	go vet ./...
+	@echo "golint ./..."
+	@lint=`golint ./...`; \
+	lint=`echo "$$lint" | grep -v "astnodetype_string.go" | grep -v "toktype_string.go"`; \
+	echo "$$lint"; \
+	if [ "$$lint" != "" ]; then exit 1; fi
+
+htmlc:
+	go test -coverprofile="/tmp/jpcov"  && go tool cover -html="/tmp/jpcov" && unlink /tmp/jpcov
+
+buildfuzz:
+	go-fuzz-build github.com/jmespath/go-jmespath/fuzz
+
+fuzz: buildfuzz
+	go-fuzz -bin=./jmespath-fuzz.zip -workdir=fuzz/testdata
+
+bench:
+	go test -bench . -cpuprofile cpu.out
+
+pprof-cpu:
+	go tool pprof ./go-jmespath.test ./cpu.out
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md
new file mode 100644
index 0000000000..187ef676dc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md
@@ -0,0 +1,7 @@
+# go-jmespath - A JMESPath implementation in Go
+
+[![Build Status](https://img.shields.io/travis/jmespath/go-jmespath.svg)](https://travis-ci.org/jmespath/go-jmespath)
+
+
+
+See http://jmespath.org for more info.
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go
new file mode 100644
index 0000000000..9cfa988bc5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go
@@ -0,0 +1,49 @@
+package jmespath
+
+import "strconv"
+
+// JmesPath is the epresentation of a compiled JMES path query. A JmesPath is
+// safe for concurrent use by multiple goroutines.
+type JMESPath struct {
+	ast  ASTNode
+	intr *treeInterpreter
+}
+
+// Compile parses a JMESPath expression and returns, if successful, a JMESPath
+// object that can be used to match against data.
+func Compile(expression string) (*JMESPath, error) {
+	parser := NewParser()
+	ast, err := parser.Parse(expression)
+	if err != nil {
+		return nil, err
+	}
+	jmespath := &JMESPath{ast: ast, intr: newInterpreter()}
+	return jmespath, nil
+}
+
+// MustCompile is like Compile but panics if the expression cannot be parsed.
+// It simplifies safe initialization of global variables holding compiled
+// JMESPaths.
+func MustCompile(expression string) *JMESPath {
+	jmespath, err := Compile(expression)
+	if err != nil {
+		panic(`jmespath: Compile(` + strconv.Quote(expression) + `): ` + err.Error())
+	}
+	return jmespath
+}
+
+// Search evaluates a JMESPath expression against input data and returns the result.
+func (jp *JMESPath) Search(data interface{}) (interface{}, error) {
+	return jp.intr.Execute(jp.ast, data)
+}
+
+// Search evaluates a JMESPath expression against input data and returns the result.
+func Search(expression string, data interface{}) (interface{}, error) {
+	intr := newInterpreter()
+	parser := NewParser()
+	ast, err := parser.Parse(expression)
+	if err != nil {
+		return nil, err
+	}
+	return intr.Execute(ast, data)
+}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go
new file mode 100644
index 0000000000..1cd2d239c9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go
@@ -0,0 +1,16 @@
+// generated by stringer -type astNodeType; DO NOT EDIT
+
+package jmespath
+
+import "fmt"
+
+const _astNodeType_name = "ASTEmptyASTComparatorASTCurrentNodeASTExpRefASTFunctionExpressionASTFieldASTFilterProjectionASTFlattenASTIdentityASTIndexASTIndexExpressionASTKeyValPairASTLiteralASTMultiSelectHashASTMultiSelectListASTOrExpressionASTAndExpressionASTNotExpressionASTPipeASTProjectionASTSubexpressionASTSliceASTValueProjection"
+
+var _astNodeType_index = [...]uint16{0, 8, 21, 35, 44, 65, 73, 92, 102, 113, 121, 139, 152, 162, 180, 198, 213, 229, 245, 252, 265, 281, 289, 307}
+
+func (i astNodeType) String() string {
+	if i < 0 || i >= astNodeType(len(_astNodeType_index)-1) {
+		return fmt.Sprintf("astNodeType(%d)", i)
+	}
+	return _astNodeType_name[_astNodeType_index[i]:_astNodeType_index[i+1]]
+}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go
new file mode 100644
index 0000000000..9b7cd89b4b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go
@@ -0,0 +1,842 @@
+package jmespath
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"math"
+	"reflect"
+	"sort"
+	"strconv"
+	"strings"
+	"unicode/utf8"
+)
+
+type jpFunction func(arguments []interface{}) (interface{}, error)
+
+type jpType string
+
+const (
+	jpUnknown     jpType = "unknown"
+	jpNumber      jpType = "number"
+	jpString      jpType = "string"
+	jpArray       jpType = "array"
+	jpObject      jpType = "object"
+	jpArrayNumber jpType = "array[number]"
+	jpArrayString jpType = "array[string]"
+	jpExpref      jpType = "expref"
+	jpAny         jpType = "any"
+)
+
+type functionEntry struct {
+	name      string
+	arguments []argSpec
+	handler   jpFunction
+	hasExpRef bool
+}
+
+type argSpec struct {
+	types    []jpType
+	variadic bool
+}
+
+type byExprString struct {
+	intr     *treeInterpreter
+	node     ASTNode
+	items    []interface{}
+	hasError bool
+}
+
+func (a *byExprString) Len() int {
+	return len(a.items)
+}
+func (a *byExprString) Swap(i, j int) {
+	a.items[i], a.items[j] = a.items[j], a.items[i]
+}
+func (a *byExprString) Less(i, j int) bool {
+	first, err := a.intr.Execute(a.node, a.items[i])
+	if err != nil {
+		a.hasError = true
+		// Return a dummy value.
+		return true
+	}
+	ith, ok := first.(string)
+	if !ok {
+		a.hasError = true
+		return true
+	}
+	second, err := a.intr.Execute(a.node, a.items[j])
+	if err != nil {
+		a.hasError = true
+		// Return a dummy value.
+		return true
+	}
+	jth, ok := second.(string)
+	if !ok {
+		a.hasError = true
+		return true
+	}
+	return ith < jth
+}
+
+type byExprFloat struct {
+	intr     *treeInterpreter
+	node     ASTNode
+	items    []interface{}
+	hasError bool
+}
+
+func (a *byExprFloat) Len() int {
+	return len(a.items)
+}
+func (a *byExprFloat) Swap(i, j int) {
+	a.items[i], a.items[j] = a.items[j], a.items[i]
+}
+func (a *byExprFloat) Less(i, j int) bool {
+	first, err := a.intr.Execute(a.node, a.items[i])
+	if err != nil {
+		a.hasError = true
+		// Return a dummy value.
+		return true
+	}
+	ith, ok := first.(float64)
+	if !ok {
+		a.hasError = true
+		return true
+	}
+	second, err := a.intr.Execute(a.node, a.items[j])
+	if err != nil {
+		a.hasError = true
+		// Return a dummy value.
+		return true
+	}
+	jth, ok := second.(float64)
+	if !ok {
+		a.hasError = true
+		return true
+	}
+	return ith < jth
+}
+
+type functionCaller struct {
+	functionTable map[string]functionEntry
+}
+
+func newFunctionCaller() *functionCaller {
+	caller := &functionCaller{}
+	caller.functionTable = map[string]functionEntry{
+		"length": {
+			name: "length",
+			arguments: []argSpec{
+				{types: []jpType{jpString, jpArray, jpObject}},
+			},
+			handler: jpfLength,
+		},
+		"starts_with": {
+			name: "starts_with",
+			arguments: []argSpec{
+				{types: []jpType{jpString}},
+				{types: []jpType{jpString}},
+			},
+			handler: jpfStartsWith,
+		},
+		"abs": {
+			name: "abs",
+			arguments: []argSpec{
+				{types: []jpType{jpNumber}},
+			},
+			handler: jpfAbs,
+		},
+		"avg": {
+			name: "avg",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayNumber}},
+			},
+			handler: jpfAvg,
+		},
+		"ceil": {
+			name: "ceil",
+			arguments: []argSpec{
+				{types: []jpType{jpNumber}},
+			},
+			handler: jpfCeil,
+		},
+		"contains": {
+			name: "contains",
+			arguments: []argSpec{
+				{types: []jpType{jpArray, jpString}},
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfContains,
+		},
+		"ends_with": {
+			name: "ends_with",
+			arguments: []argSpec{
+				{types: []jpType{jpString}},
+				{types: []jpType{jpString}},
+			},
+			handler: jpfEndsWith,
+		},
+		"floor": {
+			name: "floor",
+			arguments: []argSpec{
+				{types: []jpType{jpNumber}},
+			},
+			handler: jpfFloor,
+		},
+		"map": {
+			name: "amp",
+			arguments: []argSpec{
+				{types: []jpType{jpExpref}},
+				{types: []jpType{jpArray}},
+			},
+			handler:   jpfMap,
+			hasExpRef: true,
+		},
+		"max": {
+			name: "max",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayNumber, jpArrayString}},
+			},
+			handler: jpfMax,
+		},
+		"merge": {
+			name: "merge",
+			arguments: []argSpec{
+				{types: []jpType{jpObject}, variadic: true},
+			},
+			handler: jpfMerge,
+		},
+		"max_by": {
+			name: "max_by",
+			arguments: []argSpec{
+				{types: []jpType{jpArray}},
+				{types: []jpType{jpExpref}},
+			},
+			handler:   jpfMaxBy,
+			hasExpRef: true,
+		},
+		"sum": {
+			name: "sum",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayNumber}},
+			},
+			handler: jpfSum,
+		},
+		"min": {
+			name: "min",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayNumber, jpArrayString}},
+			},
+			handler: jpfMin,
+		},
+		"min_by": {
+			name: "min_by",
+			arguments: []argSpec{
+				{types: []jpType{jpArray}},
+				{types: []jpType{jpExpref}},
+			},
+			handler:   jpfMinBy,
+			hasExpRef: true,
+		},
+		"type": {
+			name: "type",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfType,
+		},
+		"keys": {
+			name: "keys",
+			arguments: []argSpec{
+				{types: []jpType{jpObject}},
+			},
+			handler: jpfKeys,
+		},
+		"values": {
+			name: "values",
+			arguments: []argSpec{
+				{types: []jpType{jpObject}},
+			},
+			handler: jpfValues,
+		},
+		"sort": {
+			name: "sort",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayString, jpArrayNumber}},
+			},
+			handler: jpfSort,
+		},
+		"sort_by": {
+			name: "sort_by",
+			arguments: []argSpec{
+				{types: []jpType{jpArray}},
+				{types: []jpType{jpExpref}},
+			},
+			handler:   jpfSortBy,
+			hasExpRef: true,
+		},
+		"join": {
+			name: "join",
+			arguments: []argSpec{
+				{types: []jpType{jpString}},
+				{types: []jpType{jpArrayString}},
+			},
+			handler: jpfJoin,
+		},
+		"reverse": {
+			name: "reverse",
+			arguments: []argSpec{
+				{types: []jpType{jpArray, jpString}},
+			},
+			handler: jpfReverse,
+		},
+		"to_array": {
+			name: "to_array",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfToArray,
+		},
+		"to_string": {
+			name: "to_string",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfToString,
+		},
+		"to_number": {
+			name: "to_number",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfToNumber,
+		},
+		"not_null": {
+			name: "not_null",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}, variadic: true},
+			},
+			handler: jpfNotNull,
+		},
+	}
+	return caller
+}
+
+func (e *functionEntry) resolveArgs(arguments []interface{}) ([]interface{}, error) {
+	if len(e.arguments) == 0 {
+		return arguments, nil
+	}
+	if !e.arguments[len(e.arguments)-1].variadic {
+		if len(e.arguments) != len(arguments) {
+			return nil, errors.New("incorrect number of args")
+		}
+		for i, spec := range e.arguments {
+			userArg := arguments[i]
+			err := spec.typeCheck(userArg)
+			if err != nil {
+				return nil, err
+			}
+		}
+		return arguments, nil
+	}
+	if len(arguments) < len(e.arguments) {
+		return nil, errors.New("Invalid arity.")
+	}
+	return arguments, nil
+}
+
+func (a *argSpec) typeCheck(arg interface{}) error {
+	for _, t := range a.types {
+		switch t {
+		case jpNumber:
+			if _, ok := arg.(float64); ok {
+				return nil
+			}
+		case jpString:
+			if _, ok := arg.(string); ok {
+				return nil
+			}
+		case jpArray:
+			if isSliceType(arg) {
+				return nil
+			}
+		case jpObject:
+			if _, ok := arg.(map[string]interface{}); ok {
+				return nil
+			}
+		case jpArrayNumber:
+			if _, ok := toArrayNum(arg); ok {
+				return nil
+			}
+		case jpArrayString:
+			if _, ok := toArrayStr(arg); ok {
+				return nil
+			}
+		case jpAny:
+			return nil
+		case jpExpref:
+			if _, ok := arg.(expRef); ok {
+				return nil
+			}
+		}
+	}
+	return fmt.Errorf("Invalid type for: %v, expected: %#v", arg, a.types)
+}
+
+func (f *functionCaller) CallFunction(name string, arguments []interface{}, intr *treeInterpreter) (interface{}, error) {
+	entry, ok := f.functionTable[name]
+	if !ok {
+		return nil, errors.New("unknown function: " + name)
+	}
+	resolvedArgs, err := entry.resolveArgs(arguments)
+	if err != nil {
+		return nil, err
+	}
+	if entry.hasExpRef {
+		var extra []interface{}
+		extra = append(extra, intr)
+		resolvedArgs = append(extra, resolvedArgs...)
+	}
+	return entry.handler(resolvedArgs)
+}
+
+func jpfAbs(arguments []interface{}) (interface{}, error) {
+	num := arguments[0].(float64)
+	return math.Abs(num), nil
+}
+
+func jpfLength(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0]
+	if c, ok := arg.(string); ok {
+		return float64(utf8.RuneCountInString(c)), nil
+	} else if isSliceType(arg) {
+		v := reflect.ValueOf(arg)
+		return float64(v.Len()), nil
+	} else if c, ok := arg.(map[string]interface{}); ok {
+		return float64(len(c)), nil
+	}
+	return nil, errors.New("could not compute length()")
+}
+
+func jpfStartsWith(arguments []interface{}) (interface{}, error) {
+	search := arguments[0].(string)
+	prefix := arguments[1].(string)
+	return strings.HasPrefix(search, prefix), nil
+}
+
+func jpfAvg(arguments []interface{}) (interface{}, error) {
+	// We've already type checked the value so we can safely use
+	// type assertions.
+	args := arguments[0].([]interface{})
+	length := float64(len(args))
+	numerator := 0.0
+	for _, n := range args {
+		numerator += n.(float64)
+	}
+	return numerator / length, nil
+}
+func jpfCeil(arguments []interface{}) (interface{}, error) {
+	val := arguments[0].(float64)
+	return math.Ceil(val), nil
+}
+func jpfContains(arguments []interface{}) (interface{}, error) {
+	search := arguments[0]
+	el := arguments[1]
+	if searchStr, ok := search.(string); ok {
+		if elStr, ok := el.(string); ok {
+			return strings.Index(searchStr, elStr) != -1, nil
+		}
+		return false, nil
+	}
+	// Otherwise this is a generic contains for []interface{}
+	general := search.([]interface{})
+	for _, item := range general {
+		if item == el {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+func jpfEndsWith(arguments []interface{}) (interface{}, error) {
+	search := arguments[0].(string)
+	suffix := arguments[1].(string)
+	return strings.HasSuffix(search, suffix), nil
+}
+func jpfFloor(arguments []interface{}) (interface{}, error) {
+	val := arguments[0].(float64)
+	return math.Floor(val), nil
+}
+func jpfMap(arguments []interface{}) (interface{}, error) {
+	intr := arguments[0].(*treeInterpreter)
+	exp := arguments[1].(expRef)
+	node := exp.ref
+	arr := arguments[2].([]interface{})
+	mapped := make([]interface{}, 0, len(arr))
+	for _, value := range arr {
+		current, err := intr.Execute(node, value)
+		if err != nil {
+			return nil, err
+		}
+		mapped = append(mapped, current)
+	}
+	return mapped, nil
+}
+func jpfMax(arguments []interface{}) (interface{}, error) {
+	if items, ok := toArrayNum(arguments[0]); ok {
+		if len(items) == 0 {
+			return nil, nil
+		}
+		if len(items) == 1 {
+			return items[0], nil
+		}
+		best := items[0]
+		for _, item := range items[1:] {
+			if item > best {
+				best = item
+			}
+		}
+		return best, nil
+	}
+	// Otherwise we're dealing with a max() of strings.
+	items, _ := toArrayStr(arguments[0])
+	if len(items) == 0 {
+		return nil, nil
+	}
+	if len(items) == 1 {
+		return items[0], nil
+	}
+	best := items[0]
+	for _, item := range items[1:] {
+		if item > best {
+			best = item
+		}
+	}
+	return best, nil
+}
+func jpfMerge(arguments []interface{}) (interface{}, error) {
+	final := make(map[string]interface{})
+	for _, m := range arguments {
+		mapped := m.(map[string]interface{})
+		for key, value := range mapped {
+			final[key] = value
+		}
+	}
+	return final, nil
+}
+func jpfMaxBy(arguments []interface{}) (interface{}, error) {
+	intr := arguments[0].(*treeInterpreter)
+	arr := arguments[1].([]interface{})
+	exp := arguments[2].(expRef)
+	node := exp.ref
+	if len(arr) == 0 {
+		return nil, nil
+	} else if len(arr) == 1 {
+		return arr[0], nil
+	}
+	start, err := intr.Execute(node, arr[0])
+	if err != nil {
+		return nil, err
+	}
+	switch t := start.(type) {
+	case float64:
+		bestVal := t
+		bestItem := arr[0]
+		for _, item := range arr[1:] {
+			result, err := intr.Execute(node, item)
+			if err != nil {
+				return nil, err
+			}
+			current, ok := result.(float64)
+			if !ok {
+				return nil, errors.New("invalid type, must be number")
+			}
+			if current > bestVal {
+				bestVal = current
+				bestItem = item
+			}
+		}
+		return bestItem, nil
+	case string:
+		bestVal := t
+		bestItem := arr[0]
+		for _, item := range arr[1:] {
+			result, err := intr.Execute(node, item)
+			if err != nil {
+				return nil, err
+			}
+			current, ok := result.(string)
+			if !ok {
+				return nil, errors.New("invalid type, must be string")
+			}
+			if current > bestVal {
+				bestVal = current
+				bestItem = item
+			}
+		}
+		return bestItem, nil
+	default:
+		return nil, errors.New("invalid type, must be number of string")
+	}
+}
+func jpfSum(arguments []interface{}) (interface{}, error) {
+	items, _ := toArrayNum(arguments[0])
+	sum := 0.0
+	for _, item := range items {
+		sum += item
+	}
+	return sum, nil
+}
+
+func jpfMin(arguments []interface{}) (interface{}, error) {
+	if items, ok := toArrayNum(arguments[0]); ok {
+		if len(items) == 0 {
+			return nil, nil
+		}
+		if len(items) == 1 {
+			return items[0], nil
+		}
+		best := items[0]
+		for _, item := range items[1:] {
+			if item < best {
+				best = item
+			}
+		}
+		return best, nil
+	}
+	items, _ := toArrayStr(arguments[0])
+	if len(items) == 0 {
+		return nil, nil
+	}
+	if len(items) == 1 {
+		return items[0], nil
+	}
+	best := items[0]
+	for _, item := range items[1:] {
+		if item < best {
+			best = item
+		}
+	}
+	return best, nil
+}
+
+func jpfMinBy(arguments []interface{}) (interface{}, error) {
+	intr := arguments[0].(*treeInterpreter)
+	arr := arguments[1].([]interface{})
+	exp := arguments[2].(expRef)
+	node := exp.ref
+	if len(arr) == 0 {
+		return nil, nil
+	} else if len(arr) == 1 {
+		return arr[0], nil
+	}
+	start, err := intr.Execute(node, arr[0])
+	if err != nil {
+		return nil, err
+	}
+	if t, ok := start.(float64); ok {
+		bestVal := t
+		bestItem := arr[0]
+		for _, item := range arr[1:] {
+			result, err := intr.Execute(node, item)
+			if err != nil {
+				return nil, err
+			}
+			current, ok := result.(float64)
+			if !ok {
+				return nil, errors.New("invalid type, must be number")
+			}
+			if current < bestVal {
+				bestVal = current
+				bestItem = item
+			}
+		}
+		return bestItem, nil
+	} else if t, ok := start.(string); ok {
+		bestVal := t
+		bestItem := arr[0]
+		for _, item := range arr[1:] {
+			result, err := intr.Execute(node, item)
+			if err != nil {
+				return nil, err
+			}
+			current, ok := result.(string)
+			if !ok {
+				return nil, errors.New("invalid type, must be string")
+			}
+			if current < bestVal {
+				bestVal = current
+				bestItem = item
+			}
+		}
+		return bestItem, nil
+	} else {
+		return nil, errors.New("invalid type, must be number of string")
+	}
+}
+func jpfType(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0]
+	if _, ok := arg.(float64); ok {
+		return "number", nil
+	}
+	if _, ok := arg.(string); ok {
+		return "string", nil
+	}
+	if _, ok := arg.([]interface{}); ok {
+		return "array", nil
+	}
+	if _, ok := arg.(map[string]interface{}); ok {
+		return "object", nil
+	}
+	if arg == nil {
+		return "null", nil
+	}
+	if arg == true || arg == false {
+		return "boolean", nil
+	}
+	return nil, errors.New("unknown type")
+}
+func jpfKeys(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0].(map[string]interface{})
+	collected := make([]interface{}, 0, len(arg))
+	for key := range arg {
+		collected = append(collected, key)
+	}
+	return collected, nil
+}
+func jpfValues(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0].(map[string]interface{})
+	collected := make([]interface{}, 0, len(arg))
+	for _, value := range arg {
+		collected = append(collected, value)
+	}
+	return collected, nil
+}
+func jpfSort(arguments []interface{}) (interface{}, error) {
+	if items, ok := toArrayNum(arguments[0]); ok {
+		d := sort.Float64Slice(items)
+		sort.Stable(d)
+		final := make([]interface{}, len(d))
+		for i, val := range d {
+			final[i] = val
+		}
+		return final, nil
+	}
+	// Otherwise we're dealing with sort()'ing strings.
+	items, _ := toArrayStr(arguments[0])
+	d := sort.StringSlice(items)
+	sort.Stable(d)
+	final := make([]interface{}, len(d))
+	for i, val := range d {
+		final[i] = val
+	}
+	return final, nil
+}
+func jpfSortBy(arguments []interface{}) (interface{}, error) {
+	intr := arguments[0].(*treeInterpreter)
+	arr := arguments[1].([]interface{})
+	exp := arguments[2].(expRef)
+	node := exp.ref
+	if len(arr) == 0 {
+		return arr, nil
+	} else if len(arr) == 1 {
+		return arr, nil
+	}
+	start, err := intr.Execute(node, arr[0])
+	if err != nil {
+		return nil, err
+	}
+	if _, ok := start.(float64); ok {
+		sortable := &byExprFloat{intr, node, arr, false}
+		sort.Stable(sortable)
+		if sortable.hasError {
+			return nil, errors.New("error in sort_by comparison")
+		}
+		return arr, nil
+	} else if _, ok := start.(string); ok {
+		sortable := &byExprString{intr, node, arr, false}
+		sort.Stable(sortable)
+		if sortable.hasError {
+			return nil, errors.New("error in sort_by comparison")
+		}
+		return arr, nil
+	} else {
+		return nil, errors.New("invalid type, must be number of string")
+	}
+}
+func jpfJoin(arguments []interface{}) (interface{}, error) {
+	sep := arguments[0].(string)
+	// We can't just do arguments[1].([]string), we have to
+	// manually convert each item to a string.
+	arrayStr := []string{}
+	for _, item := range arguments[1].([]interface{}) {
+		arrayStr = append(arrayStr, item.(string))
+	}
+	return strings.Join(arrayStr, sep), nil
+}
+func jpfReverse(arguments []interface{}) (interface{}, error) {
+	if s, ok := arguments[0].(string); ok {
+		r := []rune(s)
+		for i, j := 0, len(r)-1; i < len(r)/2; i, j = i+1, j-1 {
+			r[i], r[j] = r[j], r[i]
+		}
+		return string(r), nil
+	}
+	items := arguments[0].([]interface{})
+	length := len(items)
+	reversed := make([]interface{}, length)
+	for i, item := range items {
+		reversed[length-(i+1)] = item
+	}
+	return reversed, nil
+}
+func jpfToArray(arguments []interface{}) (interface{}, error) {
+	if _, ok := arguments[0].([]interface{}); ok {
+		return arguments[0], nil
+	}
+	return arguments[:1:1], nil
+}
+func jpfToString(arguments []interface{}) (interface{}, error) {
+	if v, ok := arguments[0].(string); ok {
+		return v, nil
+	}
+	result, err := json.Marshal(arguments[0])
+	if err != nil {
+		return nil, err
+	}
+	return string(result), nil
+}
+func jpfToNumber(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0]
+	if v, ok := arg.(float64); ok {
+		return v, nil
+	}
+	if v, ok := arg.(string); ok {
+		conv, err := strconv.ParseFloat(v, 64)
+		if err != nil {
+			return nil, nil
+		}
+		return conv, nil
+	}
+	if _, ok := arg.([]interface{}); ok {
+		return nil, nil
+	}
+	if _, ok := arg.(map[string]interface{}); ok {
+		return nil, nil
+	}
+	if arg == nil {
+		return nil, nil
+	}
+	if arg == true || arg == false {
+		return nil, nil
+	}
+	return nil, errors.New("unknown type")
+}
+func jpfNotNull(arguments []interface{}) (interface{}, error) {
+	for _, arg := range arguments {
+		if arg != nil {
+			return arg, nil
+		}
+	}
+	return nil, nil
+}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go
new file mode 100644
index 0000000000..13c74604c2
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go
@@ -0,0 +1,418 @@
+package jmespath
+
+import (
+	"errors"
+	"reflect"
+	"unicode"
+	"unicode/utf8"
+)
+
+/* This is a tree based interpreter.  It walks the AST and directly
+   interprets the AST to search through a JSON document.
+*/
+
+type treeInterpreter struct {
+	fCall *functionCaller
+}
+
+func newInterpreter() *treeInterpreter {
+	interpreter := treeInterpreter{}
+	interpreter.fCall = newFunctionCaller()
+	return &interpreter
+}
+
+type expRef struct {
+	ref ASTNode
+}
+
+// Execute takes an ASTNode and input data and interprets the AST directly.
+// It will produce the result of applying the JMESPath expression associated
+// with the ASTNode to the input data "value".
+func (intr *treeInterpreter) Execute(node ASTNode, value interface{}) (interface{}, error) {
+	switch node.nodeType {
+	case ASTComparator:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		right, err := intr.Execute(node.children[1], value)
+		if err != nil {
+			return nil, err
+		}
+		switch node.value {
+		case tEQ:
+			return objsEqual(left, right), nil
+		case tNE:
+			return !objsEqual(left, right), nil
+		}
+		leftNum, ok := left.(float64)
+		if !ok {
+			return nil, nil
+		}
+		rightNum, ok := right.(float64)
+		if !ok {
+			return nil, nil
+		}
+		switch node.value {
+		case tGT:
+			return leftNum > rightNum, nil
+		case tGTE:
+			return leftNum >= rightNum, nil
+		case tLT:
+			return leftNum < rightNum, nil
+		case tLTE:
+			return leftNum <= rightNum, nil
+		}
+	case ASTExpRef:
+		return expRef{ref: node.children[0]}, nil
+	case ASTFunctionExpression:
+		resolvedArgs := []interface{}{}
+		for _, arg := range node.children {
+			current, err := intr.Execute(arg, value)
+			if err != nil {
+				return nil, err
+			}
+			resolvedArgs = append(resolvedArgs, current)
+		}
+		return intr.fCall.CallFunction(node.value.(string), resolvedArgs, intr)
+	case ASTField:
+		if m, ok := value.(map[string]interface{}); ok {
+			key := node.value.(string)
+			return m[key], nil
+		}
+		return intr.fieldFromStruct(node.value.(string), value)
+	case ASTFilterProjection:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, nil
+		}
+		sliceType, ok := left.([]interface{})
+		if !ok {
+			if isSliceType(left) {
+				return intr.filterProjectionWithReflection(node, left)
+			}
+			return nil, nil
+		}
+		compareNode := node.children[2]
+		collected := []interface{}{}
+		for _, element := range sliceType {
+			result, err := intr.Execute(compareNode, element)
+			if err != nil {
+				return nil, err
+			}
+			if !isFalse(result) {
+				current, err := intr.Execute(node.children[1], element)
+				if err != nil {
+					return nil, err
+				}
+				if current != nil {
+					collected = append(collected, current)
+				}
+			}
+		}
+		return collected, nil
+	case ASTFlatten:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, nil
+		}
+		sliceType, ok := left.([]interface{})
+		if !ok {
+			// If we can't type convert to []interface{}, there's
+			// a chance this could still work via reflection if we're
+			// dealing with user provided types.
+			if isSliceType(left) {
+				return intr.flattenWithReflection(left)
+			}
+			return nil, nil
+		}
+		flattened := []interface{}{}
+		for _, element := range sliceType {
+			if elementSlice, ok := element.([]interface{}); ok {
+				flattened = append(flattened, elementSlice...)
+			} else if isSliceType(element) {
+				reflectFlat := []interface{}{}
+				v := reflect.ValueOf(element)
+				for i := 0; i < v.Len(); i++ {
+					reflectFlat = append(reflectFlat, v.Index(i).Interface())
+				}
+				flattened = append(flattened, reflectFlat...)
+			} else {
+				flattened = append(flattened, element)
+			}
+		}
+		return flattened, nil
+	case ASTIdentity, ASTCurrentNode:
+		return value, nil
+	case ASTIndex:
+		if sliceType, ok := value.([]interface{}); ok {
+			index := node.value.(int)
+			if index < 0 {
+				index += len(sliceType)
+			}
+			if index < len(sliceType) && index >= 0 {
+				return sliceType[index], nil
+			}
+			return nil, nil
+		}
+		// Otherwise try via reflection.
+		rv := reflect.ValueOf(value)
+		if rv.Kind() == reflect.Slice {
+			index := node.value.(int)
+			if index < 0 {
+				index += rv.Len()
+			}
+			if index < rv.Len() && index >= 0 {
+				v := rv.Index(index)
+				return v.Interface(), nil
+			}
+		}
+		return nil, nil
+	case ASTKeyValPair:
+		return intr.Execute(node.children[0], value)
+	case ASTLiteral:
+		return node.value, nil
+	case ASTMultiSelectHash:
+		if value == nil {
+			return nil, nil
+		}
+		collected := make(map[string]interface{})
+		for _, child := range node.children {
+			current, err := intr.Execute(child, value)
+			if err != nil {
+				return nil, err
+			}
+			key := child.value.(string)
+			collected[key] = current
+		}
+		return collected, nil
+	case ASTMultiSelectList:
+		if value == nil {
+			return nil, nil
+		}
+		collected := []interface{}{}
+		for _, child := range node.children {
+			current, err := intr.Execute(child, value)
+			if err != nil {
+				return nil, err
+			}
+			collected = append(collected, current)
+		}
+		return collected, nil
+	case ASTOrExpression:
+		matched, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		if isFalse(matched) {
+			matched, err = intr.Execute(node.children[1], value)
+			if err != nil {
+				return nil, err
+			}
+		}
+		return matched, nil
+	case ASTAndExpression:
+		matched, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		if isFalse(matched) {
+			return matched, nil
+		}
+		return intr.Execute(node.children[1], value)
+	case ASTNotExpression:
+		matched, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		if isFalse(matched) {
+			return true, nil
+		}
+		return false, nil
+	case ASTPipe:
+		result := value
+		var err error
+		for _, child := range node.children {
+			result, err = intr.Execute(child, result)
+			if err != nil {
+				return nil, err
+			}
+		}
+		return result, nil
+	case ASTProjection:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		sliceType, ok := left.([]interface{})
+		if !ok {
+			if isSliceType(left) {
+				return intr.projectWithReflection(node, left)
+			}
+			return nil, nil
+		}
+		collected := []interface{}{}
+		var current interface{}
+		for _, element := range sliceType {
+			current, err = intr.Execute(node.children[1], element)
+			if err != nil {
+				return nil, err
+			}
+			if current != nil {
+				collected = append(collected, current)
+			}
+		}
+		return collected, nil
+	case ASTSubexpression, ASTIndexExpression:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		return intr.Execute(node.children[1], left)
+	case ASTSlice:
+		sliceType, ok := value.([]interface{})
+		if !ok {
+			if isSliceType(value) {
+				return intr.sliceWithReflection(node, value)
+			}
+			return nil, nil
+		}
+		parts := node.value.([]*int)
+		sliceParams := make([]sliceParam, 3)
+		for i, part := range parts {
+			if part != nil {
+				sliceParams[i].Specified = true
+				sliceParams[i].N = *part
+			}
+		}
+		return slice(sliceType, sliceParams)
+	case ASTValueProjection:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, nil
+		}
+		mapType, ok := left.(map[string]interface{})
+		if !ok {
+			return nil, nil
+		}
+		values := make([]interface{}, len(mapType))
+		for _, value := range mapType {
+			values = append(values, value)
+		}
+		collected := []interface{}{}
+		for _, element := range values {
+			current, err := intr.Execute(node.children[1], element)
+			if err != nil {
+				return nil, err
+			}
+			if current != nil {
+				collected = append(collected, current)
+			}
+		}
+		return collected, nil
+	}
+	return nil, errors.New("Unknown AST node: " + node.nodeType.String())
+}
+
+func (intr *treeInterpreter) fieldFromStruct(key string, value interface{}) (interface{}, error) {
+	rv := reflect.ValueOf(value)
+	first, n := utf8.DecodeRuneInString(key)
+	fieldName := string(unicode.ToUpper(first)) + key[n:]
+	if rv.Kind() == reflect.Struct {
+		v := rv.FieldByName(fieldName)
+		if !v.IsValid() {
+			return nil, nil
+		}
+		return v.Interface(), nil
+	} else if rv.Kind() == reflect.Ptr {
+		// Handle multiple levels of indirection?
+		if rv.IsNil() {
+			return nil, nil
+		}
+		rv = rv.Elem()
+		v := rv.FieldByName(fieldName)
+		if !v.IsValid() {
+			return nil, nil
+		}
+		return v.Interface(), nil
+	}
+	return nil, nil
+}
+
+func (intr *treeInterpreter) flattenWithReflection(value interface{}) (interface{}, error) {
+	v := reflect.ValueOf(value)
+	flattened := []interface{}{}
+	for i := 0; i < v.Len(); i++ {
+		element := v.Index(i).Interface()
+		if reflect.TypeOf(element).Kind() == reflect.Slice {
+			// Then insert the contents of the element
+			// slice into the flattened slice,
+			// i.e flattened = append(flattened, mySlice...)
+			elementV := reflect.ValueOf(element)
+			for j := 0; j < elementV.Len(); j++ {
+				flattened = append(
+					flattened, elementV.Index(j).Interface())
+			}
+		} else {
+			flattened = append(flattened, element)
+		}
+	}
+	return flattened, nil
+}
+
+func (intr *treeInterpreter) sliceWithReflection(node ASTNode, value interface{}) (interface{}, error) {
+	v := reflect.ValueOf(value)
+	parts := node.value.([]*int)
+	sliceParams := make([]sliceParam, 3)
+	for i, part := range parts {
+		if part != nil {
+			sliceParams[i].Specified = true
+			sliceParams[i].N = *part
+		}
+	}
+	final := []interface{}{}
+	for i := 0; i < v.Len(); i++ {
+		element := v.Index(i).Interface()
+		final = append(final, element)
+	}
+	return slice(final, sliceParams)
+}
+
+func (intr *treeInterpreter) filterProjectionWithReflection(node ASTNode, value interface{}) (interface{}, error) {
+	compareNode := node.children[2]
+	collected := []interface{}{}
+	v := reflect.ValueOf(value)
+	for i := 0; i < v.Len(); i++ {
+		element := v.Index(i).Interface()
+		result, err := intr.Execute(compareNode, element)
+		if err != nil {
+			return nil, err
+		}
+		if !isFalse(result) {
+			current, err := intr.Execute(node.children[1], element)
+			if err != nil {
+				return nil, err
+			}
+			if current != nil {
+				collected = append(collected, current)
+			}
+		}
+	}
+	return collected, nil
+}
+
+func (intr *treeInterpreter) projectWithReflection(node ASTNode, value interface{}) (interface{}, error) {
+	collected := []interface{}{}
+	v := reflect.ValueOf(value)
+	for i := 0; i < v.Len(); i++ {
+		element := v.Index(i).Interface()
+		result, err := intr.Execute(node.children[1], element)
+		if err != nil {
+			return nil, err
+		}
+		if result != nil {
+			collected = append(collected, result)
+		}
+	}
+	return collected, nil
+}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go
new file mode 100644
index 0000000000..817900c8f5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go
@@ -0,0 +1,420 @@
+package jmespath
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+	"unicode/utf8"
+)
+
+type token struct {
+	tokenType tokType
+	value     string
+	position  int
+	length    int
+}
+
+type tokType int
+
+const eof = -1
+
+// Lexer contains information about the expression being tokenized.
+type Lexer struct {
+	expression string       // The expression provided by the user.
+	currentPos int          // The current position in the string.
+	lastWidth  int          // The width of the current rune.  This
+	buf        bytes.Buffer // Internal buffer used for building up values.
+}
+
+// SyntaxError is the main error used whenever a lexing or parsing error occurs.
+type SyntaxError struct {
+	msg        string // Error message displayed to user
+	Expression string // Expression that generated a SyntaxError
+	Offset     int    // The location in the string where the error occurred
+}
+
+func (e SyntaxError) Error() string {
+	// In the future, it would be good to underline the specific
+	// location where the error occurred.
+	return "SyntaxError: " + e.msg
+}
+
+// HighlightLocation will show where the syntax error occurred.
+// It will place a "^" character on a line below the expression
+// at the point where the syntax error occurred.
+func (e SyntaxError) HighlightLocation() string {
+	return e.Expression + "\n" + strings.Repeat(" ", e.Offset) + "^"
+}
+
+//go:generate stringer -type=tokType
+const (
+	tUnknown tokType = iota
+	tStar
+	tDot
+	tFilter
+	tFlatten
+	tLparen
+	tRparen
+	tLbracket
+	tRbracket
+	tLbrace
+	tRbrace
+	tOr
+	tPipe
+	tNumber
+	tUnquotedIdentifier
+	tQuotedIdentifier
+	tComma
+	tColon
+	tLT
+	tLTE
+	tGT
+	tGTE
+	tEQ
+	tNE
+	tJSONLiteral
+	tStringLiteral
+	tCurrent
+	tExpref
+	tAnd
+	tNot
+	tEOF
+)
+
+var basicTokens = map[rune]tokType{
+	'.': tDot,
+	'*': tStar,
+	',': tComma,
+	':': tColon,
+	'{': tLbrace,
+	'}': tRbrace,
+	']': tRbracket, // tLbracket not included because it could be "[]"
+	'(': tLparen,
+	')': tRparen,
+	'@': tCurrent,
+}
+
+// Bit mask for [a-zA-Z_] shifted down 64 bits to fit in a single uint64.
+// When using this bitmask just be sure to shift the rune down 64 bits
+// before checking against identifierStartBits.
+const identifierStartBits uint64 = 576460745995190270
+
+// Bit mask for [a-zA-Z0-9], 128 bits -> 2 uint64s.
+var identifierTrailingBits = [2]uint64{287948901175001088, 576460745995190270}
+
+var whiteSpace = map[rune]bool{
+	' ': true, '\t': true, '\n': true, '\r': true,
+}
+
+func (t token) String() string {
+	return fmt.Sprintf("Token{%+v, %s, %d, %d}",
+		t.tokenType, t.value, t.position, t.length)
+}
+
+// NewLexer creates a new JMESPath lexer.
+func NewLexer() *Lexer {
+	lexer := Lexer{}
+	return &lexer
+}
+
+func (lexer *Lexer) next() rune {
+	if lexer.currentPos >= len(lexer.expression) {
+		lexer.lastWidth = 0
+		return eof
+	}
+	r, w := utf8.DecodeRuneInString(lexer.expression[lexer.currentPos:])
+	lexer.lastWidth = w
+	lexer.currentPos += w
+	return r
+}
+
+func (lexer *Lexer) back() {
+	lexer.currentPos -= lexer.lastWidth
+}
+
+func (lexer *Lexer) peek() rune {
+	t := lexer.next()
+	lexer.back()
+	return t
+}
+
+// tokenize takes an expression and returns corresponding tokens.
+func (lexer *Lexer) tokenize(expression string) ([]token, error) {
+	var tokens []token
+	lexer.expression = expression
+	lexer.currentPos = 0
+	lexer.lastWidth = 0
+loop:
+	for {
+		r := lexer.next()
+		if identifierStartBits&(1<<(uint64(r)-64)) > 0 {
+			t := lexer.consumeUnquotedIdentifier()
+			tokens = append(tokens, t)
+		} else if val, ok := basicTokens[r]; ok {
+			// Basic single char token.
+			t := token{
+				tokenType: val,
+				value:     string(r),
+				position:  lexer.currentPos - lexer.lastWidth,
+				length:    1,
+			}
+			tokens = append(tokens, t)
+		} else if r == '-' || (r >= '0' && r <= '9') {
+			t := lexer.consumeNumber()
+			tokens = append(tokens, t)
+		} else if r == '[' {
+			t := lexer.consumeLBracket()
+			tokens = append(tokens, t)
+		} else if r == '"' {
+			t, err := lexer.consumeQuotedIdentifier()
+			if err != nil {
+				return tokens, err
+			}
+			tokens = append(tokens, t)
+		} else if r == '\'' {
+			t, err := lexer.consumeRawStringLiteral()
+			if err != nil {
+				return tokens, err
+			}
+			tokens = append(tokens, t)
+		} else if r == '`' {
+			t, err := lexer.consumeLiteral()
+			if err != nil {
+				return tokens, err
+			}
+			tokens = append(tokens, t)
+		} else if r == '|' {
+			t := lexer.matchOrElse(r, '|', tOr, tPipe)
+			tokens = append(tokens, t)
+		} else if r == '<' {
+			t := lexer.matchOrElse(r, '=', tLTE, tLT)
+			tokens = append(tokens, t)
+		} else if r == '>' {
+			t := lexer.matchOrElse(r, '=', tGTE, tGT)
+			tokens = append(tokens, t)
+		} else if r == '!' {
+			t := lexer.matchOrElse(r, '=', tNE, tNot)
+			tokens = append(tokens, t)
+		} else if r == '=' {
+			t := lexer.matchOrElse(r, '=', tEQ, tUnknown)
+			tokens = append(tokens, t)
+		} else if r == '&' {
+			t := lexer.matchOrElse(r, '&', tAnd, tExpref)
+			tokens = append(tokens, t)
+		} else if r == eof {
+			break loop
+		} else if _, ok := whiteSpace[r]; ok {
+			// Ignore whitespace
+		} else {
+			return tokens, lexer.syntaxError(fmt.Sprintf("Unknown char: %s", strconv.QuoteRuneToASCII(r)))
+		}
+	}
+	tokens = append(tokens, token{tEOF, "", len(lexer.expression), 0})
+	return tokens, nil
+}
+
+// Consume characters until the ending rune "r" is reached.
+// If the end of the expression is reached before seeing the
+// terminating rune "r", then an error is returned.
+// If no error occurs then the matching substring is returned.
+// The returned string will not include the ending rune.
+func (lexer *Lexer) consumeUntil(end rune) (string, error) {
+	start := lexer.currentPos
+	current := lexer.next()
+	for current != end && current != eof {
+		if current == '\\' && lexer.peek() != eof {
+			lexer.next()
+		}
+		current = lexer.next()
+	}
+	if lexer.lastWidth == 0 {
+		// Then we hit an EOF so we never reached the closing
+		// delimiter.
+		return "", SyntaxError{
+			msg:        "Unclosed delimiter: " + string(end),
+			Expression: lexer.expression,
+			Offset:     len(lexer.expression),
+		}
+	}
+	return lexer.expression[start : lexer.currentPos-lexer.lastWidth], nil
+}
+
+func (lexer *Lexer) consumeLiteral() (token, error) {
+	start := lexer.currentPos
+	value, err := lexer.consumeUntil('`')
+	if err != nil {
+		return token{}, err
+	}
+	value = strings.Replace(value, "\\`", "`", -1)
+	return token{
+		tokenType: tJSONLiteral,
+		value:     value,
+		position:  start,
+		length:    len(value),
+	}, nil
+}
+
+func (lexer *Lexer) consumeRawStringLiteral() (token, error) {
+	start := lexer.currentPos
+	currentIndex := start
+	current := lexer.next()
+	for current != '\'' && lexer.peek() != eof {
+		if current == '\\' && lexer.peek() == '\'' {
+			chunk := lexer.expression[currentIndex : lexer.currentPos-1]
+			lexer.buf.WriteString(chunk)
+			lexer.buf.WriteString("'")
+			lexer.next()
+			currentIndex = lexer.currentPos
+		}
+		current = lexer.next()
+	}
+	if lexer.lastWidth == 0 {
+		// Then we hit an EOF so we never reached the closing
+		// delimiter.
+		return token{}, SyntaxError{
+			msg:        "Unclosed delimiter: '",
+			Expression: lexer.expression,
+			Offset:     len(lexer.expression),
+		}
+	}
+	if currentIndex < lexer.currentPos {
+		lexer.buf.WriteString(lexer.expression[currentIndex : lexer.currentPos-1])
+	}
+	value := lexer.buf.String()
+	// Reset the buffer so it can reused again.
+	lexer.buf.Reset()
+	return token{
+		tokenType: tStringLiteral,
+		value:     value,
+		position:  start,
+		length:    len(value),
+	}, nil
+}
+
+func (lexer *Lexer) syntaxError(msg string) SyntaxError {
+	return SyntaxError{
+		msg:        msg,
+		Expression: lexer.expression,
+		Offset:     lexer.currentPos - 1,
+	}
+}
+
+// Checks for a two char token, otherwise matches a single character
+// token. This is used whenever a two char token overlaps a single
+// char token, e.g. "||" -> tPipe, "|" -> tOr.
+func (lexer *Lexer) matchOrElse(first rune, second rune, matchedType tokType, singleCharType tokType) token {
+	start := lexer.currentPos - lexer.lastWidth
+	nextRune := lexer.next()
+	var t token
+	if nextRune == second {
+		t = token{
+			tokenType: matchedType,
+			value:     string(first) + string(second),
+			position:  start,
+			length:    2,
+		}
+	} else {
+		lexer.back()
+		t = token{
+			tokenType: singleCharType,
+			value:     string(first),
+			position:  start,
+			length:    1,
+		}
+	}
+	return t
+}
+
+func (lexer *Lexer) consumeLBracket() token {
+	// There's three options here:
+	// 1. A filter expression "[?"
+	// 2. A flatten operator "[]"
+	// 3. A bare rbracket "["
+	start := lexer.currentPos - lexer.lastWidth
+	nextRune := lexer.next()
+	var t token
+	if nextRune == '?' {
+		t = token{
+			tokenType: tFilter,
+			value:     "[?",
+			position:  start,
+			length:    2,
+		}
+	} else if nextRune == ']' {
+		t = token{
+			tokenType: tFlatten,
+			value:     "[]",
+			position:  start,
+			length:    2,
+		}
+	} else {
+		t = token{
+			tokenType: tLbracket,
+			value:     "[",
+			position:  start,
+			length:    1,
+		}
+		lexer.back()
+	}
+	return t
+}
+
+func (lexer *Lexer) consumeQuotedIdentifier() (token, error) {
+	start := lexer.currentPos
+	value, err := lexer.consumeUntil('"')
+	if err != nil {
+		return token{}, err
+	}
+	var decoded string
+	asJSON := []byte("\"" + value + "\"")
+	if err := json.Unmarshal([]byte(asJSON), &decoded); err != nil {
+		return token{}, err
+	}
+	return token{
+		tokenType: tQuotedIdentifier,
+		value:     decoded,
+		position:  start - 1,
+		length:    len(decoded),
+	}, nil
+}
+
+func (lexer *Lexer) consumeUnquotedIdentifier() token {
+	// Consume runes until we reach the end of an unquoted
+	// identifier.
+	start := lexer.currentPos - lexer.lastWidth
+	for {
+		r := lexer.next()
+		if r < 0 || r > 128 || identifierTrailingBits[uint64(r)/64]&(1<<(uint64(r)%64)) == 0 {
+			lexer.back()
+			break
+		}
+	}
+	value := lexer.expression[start:lexer.currentPos]
+	return token{
+		tokenType: tUnquotedIdentifier,
+		value:     value,
+		position:  start,
+		length:    lexer.currentPos - start,
+	}
+}
+
+func (lexer *Lexer) consumeNumber() token {
+	// Consume runes until we reach something that's not a number.
+	start := lexer.currentPos - lexer.lastWidth
+	for {
+		r := lexer.next()
+		if r < '0' || r > '9' {
+			lexer.back()
+			break
+		}
+	}
+	value := lexer.expression[start:lexer.currentPos]
+	return token{
+		tokenType: tNumber,
+		value:     value,
+		position:  start,
+		length:    lexer.currentPos - start,
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go
new file mode 100644
index 0000000000..1240a17552
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go
@@ -0,0 +1,603 @@
+package jmespath
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+type astNodeType int
+
+//go:generate stringer -type astNodeType
+const (
+	ASTEmpty astNodeType = iota
+	ASTComparator
+	ASTCurrentNode
+	ASTExpRef
+	ASTFunctionExpression
+	ASTField
+	ASTFilterProjection
+	ASTFlatten
+	ASTIdentity
+	ASTIndex
+	ASTIndexExpression
+	ASTKeyValPair
+	ASTLiteral
+	ASTMultiSelectHash
+	ASTMultiSelectList
+	ASTOrExpression
+	ASTAndExpression
+	ASTNotExpression
+	ASTPipe
+	ASTProjection
+	ASTSubexpression
+	ASTSlice
+	ASTValueProjection
+)
+
+// ASTNode represents the abstract syntax tree of a JMESPath expression.
+type ASTNode struct {
+	nodeType astNodeType
+	value    interface{}
+	children []ASTNode
+}
+
+func (node ASTNode) String() string {
+	return node.PrettyPrint(0)
+}
+
+// PrettyPrint will pretty print the parsed AST.
+// The AST is an implementation detail and this pretty print
+// function is provided as a convenience method to help with
+// debugging.  You should not rely on its output as the internal
+// structure of the AST may change at any time.
+func (node ASTNode) PrettyPrint(indent int) string {
+	spaces := strings.Repeat(" ", indent)
+	output := fmt.Sprintf("%s%s {\n", spaces, node.nodeType)
+	nextIndent := indent + 2
+	if node.value != nil {
+		if converted, ok := node.value.(fmt.Stringer); ok {
+			// Account for things like comparator nodes
+			// that are enums with a String() method.
+			output += fmt.Sprintf("%svalue: %s\n", strings.Repeat(" ", nextIndent), converted.String())
+		} else {
+			output += fmt.Sprintf("%svalue: %#v\n", strings.Repeat(" ", nextIndent), node.value)
+		}
+	}
+	lastIndex := len(node.children)
+	if lastIndex > 0 {
+		output += fmt.Sprintf("%schildren: {\n", strings.Repeat(" ", nextIndent))
+		childIndent := nextIndent + 2
+		for _, elem := range node.children {
+			output += elem.PrettyPrint(childIndent)
+		}
+	}
+	output += fmt.Sprintf("%s}\n", spaces)
+	return output
+}
+
+var bindingPowers = map[tokType]int{
+	tEOF:                0,
+	tUnquotedIdentifier: 0,
+	tQuotedIdentifier:   0,
+	tRbracket:           0,
+	tRparen:             0,
+	tComma:              0,
+	tRbrace:             0,
+	tNumber:             0,
+	tCurrent:            0,
+	tExpref:             0,
+	tColon:              0,
+	tPipe:               1,
+	tOr:                 2,
+	tAnd:                3,
+	tEQ:                 5,
+	tLT:                 5,
+	tLTE:                5,
+	tGT:                 5,
+	tGTE:                5,
+	tNE:                 5,
+	tFlatten:            9,
+	tStar:               20,
+	tFilter:             21,
+	tDot:                40,
+	tNot:                45,
+	tLbrace:             50,
+	tLbracket:           55,
+	tLparen:             60,
+}
+
+// Parser holds state about the current expression being parsed.
+type Parser struct {
+	expression string
+	tokens     []token
+	index      int
+}
+
+// NewParser creates a new JMESPath parser.
+func NewParser() *Parser {
+	p := Parser{}
+	return &p
+}
+
+// Parse will compile a JMESPath expression.
+func (p *Parser) Parse(expression string) (ASTNode, error) {
+	lexer := NewLexer()
+	p.expression = expression
+	p.index = 0
+	tokens, err := lexer.tokenize(expression)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	p.tokens = tokens
+	parsed, err := p.parseExpression(0)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	if p.current() != tEOF {
+		return ASTNode{}, p.syntaxError(fmt.Sprintf(
+			"Unexpected token at the end of the expresssion: %s", p.current()))
+	}
+	return parsed, nil
+}
+
+func (p *Parser) parseExpression(bindingPower int) (ASTNode, error) {
+	var err error
+	leftToken := p.lookaheadToken(0)
+	p.advance()
+	leftNode, err := p.nud(leftToken)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	currentToken := p.current()
+	for bindingPower < bindingPowers[currentToken] {
+		p.advance()
+		leftNode, err = p.led(currentToken, leftNode)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		currentToken = p.current()
+	}
+	return leftNode, nil
+}
+
+func (p *Parser) parseIndexExpression() (ASTNode, error) {
+	if p.lookahead(0) == tColon || p.lookahead(1) == tColon {
+		return p.parseSliceExpression()
+	}
+	indexStr := p.lookaheadToken(0).value
+	parsedInt, err := strconv.Atoi(indexStr)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	indexNode := ASTNode{nodeType: ASTIndex, value: parsedInt}
+	p.advance()
+	if err := p.match(tRbracket); err != nil {
+		return ASTNode{}, err
+	}
+	return indexNode, nil
+}
+
+func (p *Parser) parseSliceExpression() (ASTNode, error) {
+	parts := []*int{nil, nil, nil}
+	index := 0
+	current := p.current()
+	for current != tRbracket && index < 3 {
+		if current == tColon {
+			index++
+			p.advance()
+		} else if current == tNumber {
+			parsedInt, err := strconv.Atoi(p.lookaheadToken(0).value)
+			if err != nil {
+				return ASTNode{}, err
+			}
+			parts[index] = &parsedInt
+			p.advance()
+		} else {
+			return ASTNode{}, p.syntaxError(
+				"Expected tColon or tNumber" + ", received: " + p.current().String())
+		}
+		current = p.current()
+	}
+	if err := p.match(tRbracket); err != nil {
+		return ASTNode{}, err
+	}
+	return ASTNode{
+		nodeType: ASTSlice,
+		value:    parts,
+	}, nil
+}
+
+func (p *Parser) match(tokenType tokType) error {
+	if p.current() == tokenType {
+		p.advance()
+		return nil
+	}
+	return p.syntaxError("Expected " + tokenType.String() + ", received: " + p.current().String())
+}
+
+func (p *Parser) led(tokenType tokType, node ASTNode) (ASTNode, error) {
+	switch tokenType {
+	case tDot:
+		if p.current() != tStar {
+			right, err := p.parseDotRHS(bindingPowers[tDot])
+			return ASTNode{
+				nodeType: ASTSubexpression,
+				children: []ASTNode{node, right},
+			}, err
+		}
+		p.advance()
+		right, err := p.parseProjectionRHS(bindingPowers[tDot])
+		return ASTNode{
+			nodeType: ASTValueProjection,
+			children: []ASTNode{node, right},
+		}, err
+	case tPipe:
+		right, err := p.parseExpression(bindingPowers[tPipe])
+		return ASTNode{nodeType: ASTPipe, children: []ASTNode{node, right}}, err
+	case tOr:
+		right, err := p.parseExpression(bindingPowers[tOr])
+		return ASTNode{nodeType: ASTOrExpression, children: []ASTNode{node, right}}, err
+	case tAnd:
+		right, err := p.parseExpression(bindingPowers[tAnd])
+		return ASTNode{nodeType: ASTAndExpression, children: []ASTNode{node, right}}, err
+	case tLparen:
+		name := node.value
+		var args []ASTNode
+		for p.current() != tRparen {
+			expression, err := p.parseExpression(0)
+			if err != nil {
+				return ASTNode{}, err
+			}
+			if p.current() == tComma {
+				if err := p.match(tComma); err != nil {
+					return ASTNode{}, err
+				}
+			}
+			args = append(args, expression)
+		}
+		if err := p.match(tRparen); err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{
+			nodeType: ASTFunctionExpression,
+			value:    name,
+			children: args,
+		}, nil
+	case tFilter:
+		return p.parseFilter(node)
+	case tFlatten:
+		left := ASTNode{nodeType: ASTFlatten, children: []ASTNode{node}}
+		right, err := p.parseProjectionRHS(bindingPowers[tFlatten])
+		return ASTNode{
+			nodeType: ASTProjection,
+			children: []ASTNode{left, right},
+		}, err
+	case tEQ, tNE, tGT, tGTE, tLT, tLTE:
+		right, err := p.parseExpression(bindingPowers[tokenType])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{
+			nodeType: ASTComparator,
+			value:    tokenType,
+			children: []ASTNode{node, right},
+		}, nil
+	case tLbracket:
+		tokenType := p.current()
+		var right ASTNode
+		var err error
+		if tokenType == tNumber || tokenType == tColon {
+			right, err = p.parseIndexExpression()
+			if err != nil {
+				return ASTNode{}, err
+			}
+			return p.projectIfSlice(node, right)
+		}
+		// Otherwise this is a projection.
+		if err := p.match(tStar); err != nil {
+			return ASTNode{}, err
+		}
+		if err := p.match(tRbracket); err != nil {
+			return ASTNode{}, err
+		}
+		right, err = p.parseProjectionRHS(bindingPowers[tStar])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{
+			nodeType: ASTProjection,
+			children: []ASTNode{node, right},
+		}, nil
+	}
+	return ASTNode{}, p.syntaxError("Unexpected token: " + tokenType.String())
+}
+
+func (p *Parser) nud(token token) (ASTNode, error) {
+	switch token.tokenType {
+	case tJSONLiteral:
+		var parsed interface{}
+		err := json.Unmarshal([]byte(token.value), &parsed)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{nodeType: ASTLiteral, value: parsed}, nil
+	case tStringLiteral:
+		return ASTNode{nodeType: ASTLiteral, value: token.value}, nil
+	case tUnquotedIdentifier:
+		return ASTNode{
+			nodeType: ASTField,
+			value:    token.value,
+		}, nil
+	case tQuotedIdentifier:
+		node := ASTNode{nodeType: ASTField, value: token.value}
+		if p.current() == tLparen {
+			return ASTNode{}, p.syntaxErrorToken("Can't have quoted identifier as function name.", token)
+		}
+		return node, nil
+	case tStar:
+		left := ASTNode{nodeType: ASTIdentity}
+		var right ASTNode
+		var err error
+		if p.current() == tRbracket {
+			right = ASTNode{nodeType: ASTIdentity}
+		} else {
+			right, err = p.parseProjectionRHS(bindingPowers[tStar])
+		}
+		return ASTNode{nodeType: ASTValueProjection, children: []ASTNode{left, right}}, err
+	case tFilter:
+		return p.parseFilter(ASTNode{nodeType: ASTIdentity})
+	case tLbrace:
+		return p.parseMultiSelectHash()
+	case tFlatten:
+		left := ASTNode{
+			nodeType: ASTFlatten,
+			children: []ASTNode{{nodeType: ASTIdentity}},
+		}
+		right, err := p.parseProjectionRHS(bindingPowers[tFlatten])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{nodeType: ASTProjection, children: []ASTNode{left, right}}, nil
+	case tLbracket:
+		tokenType := p.current()
+		//var right ASTNode
+		if tokenType == tNumber || tokenType == tColon {
+			right, err := p.parseIndexExpression()
+			if err != nil {
+				return ASTNode{}, nil
+			}
+			return p.projectIfSlice(ASTNode{nodeType: ASTIdentity}, right)
+		} else if tokenType == tStar && p.lookahead(1) == tRbracket {
+			p.advance()
+			p.advance()
+			right, err := p.parseProjectionRHS(bindingPowers[tStar])
+			if err != nil {
+				return ASTNode{}, err
+			}
+			return ASTNode{
+				nodeType: ASTProjection,
+				children: []ASTNode{{nodeType: ASTIdentity}, right},
+			}, nil
+		} else {
+			return p.parseMultiSelectList()
+		}
+	case tCurrent:
+		return ASTNode{nodeType: ASTCurrentNode}, nil
+	case tExpref:
+		expression, err := p.parseExpression(bindingPowers[tExpref])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{nodeType: ASTExpRef, children: []ASTNode{expression}}, nil
+	case tNot:
+		expression, err := p.parseExpression(bindingPowers[tNot])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{nodeType: ASTNotExpression, children: []ASTNode{expression}}, nil
+	case tLparen:
+		expression, err := p.parseExpression(0)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		if err := p.match(tRparen); err != nil {
+			return ASTNode{}, err
+		}
+		return expression, nil
+	case tEOF:
+		return ASTNode{}, p.syntaxErrorToken("Incomplete expression", token)
+	}
+
+	return ASTNode{}, p.syntaxErrorToken("Invalid token: "+token.tokenType.String(), token)
+}
+
+func (p *Parser) parseMultiSelectList() (ASTNode, error) {
+	var expressions []ASTNode
+	for {
+		expression, err := p.parseExpression(0)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		expressions = append(expressions, expression)
+		if p.current() == tRbracket {
+			break
+		}
+		err = p.match(tComma)
+		if err != nil {
+			return ASTNode{}, err
+		}
+	}
+	err := p.match(tRbracket)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	return ASTNode{
+		nodeType: ASTMultiSelectList,
+		children: expressions,
+	}, nil
+}
+
+func (p *Parser) parseMultiSelectHash() (ASTNode, error) {
+	var children []ASTNode
+	for {
+		keyToken := p.lookaheadToken(0)
+		if err := p.match(tUnquotedIdentifier); err != nil {
+			if err := p.match(tQuotedIdentifier); err != nil {
+				return ASTNode{}, p.syntaxError("Expected tQuotedIdentifier or tUnquotedIdentifier")
+			}
+		}
+		keyName := keyToken.value
+		err := p.match(tColon)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		value, err := p.parseExpression(0)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		node := ASTNode{
+			nodeType: ASTKeyValPair,
+			value:    keyName,
+			children: []ASTNode{value},
+		}
+		children = append(children, node)
+		if p.current() == tComma {
+			err := p.match(tComma)
+			if err != nil {
+				return ASTNode{}, nil
+			}
+		} else if p.current() == tRbrace {
+			err := p.match(tRbrace)
+			if err != nil {
+				return ASTNode{}, nil
+			}
+			break
+		}
+	}
+	return ASTNode{
+		nodeType: ASTMultiSelectHash,
+		children: children,
+	}, nil
+}
+
+func (p *Parser) projectIfSlice(left ASTNode, right ASTNode) (ASTNode, error) {
+	indexExpr := ASTNode{
+		nodeType: ASTIndexExpression,
+		children: []ASTNode{left, right},
+	}
+	if right.nodeType == ASTSlice {
+		right, err := p.parseProjectionRHS(bindingPowers[tStar])
+		return ASTNode{
+			nodeType: ASTProjection,
+			children: []ASTNode{indexExpr, right},
+		}, err
+	}
+	return indexExpr, nil
+}
+func (p *Parser) parseFilter(node ASTNode) (ASTNode, error) {
+	var right, condition ASTNode
+	var err error
+	condition, err = p.parseExpression(0)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	if err := p.match(tRbracket); err != nil {
+		return ASTNode{}, err
+	}
+	if p.current() == tFlatten {
+		right = ASTNode{nodeType: ASTIdentity}
+	} else {
+		right, err = p.parseProjectionRHS(bindingPowers[tFilter])
+		if err != nil {
+			return ASTNode{}, err
+		}
+	}
+
+	return ASTNode{
+		nodeType: ASTFilterProjection,
+		children: []ASTNode{node, right, condition},
+	}, nil
+}
+
+func (p *Parser) parseDotRHS(bindingPower int) (ASTNode, error) {
+	lookahead := p.current()
+	if tokensOneOf([]tokType{tQuotedIdentifier, tUnquotedIdentifier, tStar}, lookahead) {
+		return p.parseExpression(bindingPower)
+	} else if lookahead == tLbracket {
+		if err := p.match(tLbracket); err != nil {
+			return ASTNode{}, err
+		}
+		return p.parseMultiSelectList()
+	} else if lookahead == tLbrace {
+		if err := p.match(tLbrace); err != nil {
+			return ASTNode{}, err
+		}
+		return p.parseMultiSelectHash()
+	}
+	return ASTNode{}, p.syntaxError("Expected identifier, lbracket, or lbrace")
+}
+
+func (p *Parser) parseProjectionRHS(bindingPower int) (ASTNode, error) {
+	current := p.current()
+	if bindingPowers[current] < 10 {
+		return ASTNode{nodeType: ASTIdentity}, nil
+	} else if current == tLbracket {
+		return p.parseExpression(bindingPower)
+	} else if current == tFilter {
+		return p.parseExpression(bindingPower)
+	} else if current == tDot {
+		err := p.match(tDot)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return p.parseDotRHS(bindingPower)
+	} else {
+		return ASTNode{}, p.syntaxError("Error")
+	}
+}
+
+func (p *Parser) lookahead(number int) tokType {
+	return p.lookaheadToken(number).tokenType
+}
+
+func (p *Parser) current() tokType {
+	return p.lookahead(0)
+}
+
+func (p *Parser) lookaheadToken(number int) token {
+	return p.tokens[p.index+number]
+}
+
+func (p *Parser) advance() {
+	p.index++
+}
+
+func tokensOneOf(elements []tokType, token tokType) bool {
+	for _, elem := range elements {
+		if elem == token {
+			return true
+		}
+	}
+	return false
+}
+
+func (p *Parser) syntaxError(msg string) SyntaxError {
+	return SyntaxError{
+		msg:        msg,
+		Expression: p.expression,
+		Offset:     p.lookaheadToken(0).position,
+	}
+}
+
+// Create a SyntaxError based on the provided token.
+// This differs from syntaxError() which creates a SyntaxError
+// based on the current lookahead token.
+func (p *Parser) syntaxErrorToken(msg string, t token) SyntaxError {
+	return SyntaxError{
+		msg:        msg,
+		Expression: p.expression,
+		Offset:     t.position,
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go
new file mode 100644
index 0000000000..dae79cbdf3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go
@@ -0,0 +1,16 @@
+// generated by stringer -type=tokType; DO NOT EDIT
+
+package jmespath
+
+import "fmt"
+
+const _tokType_name = "tUnknowntStartDottFiltertFlattentLparentRparentLbrackettRbrackettLbracetRbracetOrtPipetNumbertUnquotedIdentifiertQuotedIdentifiertCommatColontLTtLTEtGTtGTEtEQtNEtJSONLiteraltStringLiteraltCurrenttExpreftAndtNottEOF"
+
+var _tokType_index = [...]uint8{0, 8, 13, 17, 24, 32, 39, 46, 55, 64, 71, 78, 81, 86, 93, 112, 129, 135, 141, 144, 148, 151, 155, 158, 161, 173, 187, 195, 202, 206, 210, 214}
+
+func (i tokType) String() string {
+	if i < 0 || i >= tokType(len(_tokType_index)-1) {
+		return fmt.Sprintf("tokType(%d)", i)
+	}
+	return _tokType_name[_tokType_index[i]:_tokType_index[i+1]]
+}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go
new file mode 100644
index 0000000000..ddc1b7d7d4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go
@@ -0,0 +1,185 @@
+package jmespath
+
+import (
+	"errors"
+	"reflect"
+)
+
+// IsFalse determines if an object is false based on the JMESPath spec.
+// JMESPath defines false values to be any of:
+// - An empty string array, or hash.
+// - The boolean value false.
+// - nil
+func isFalse(value interface{}) bool {
+	switch v := value.(type) {
+	case bool:
+		return !v
+	case []interface{}:
+		return len(v) == 0
+	case map[string]interface{}:
+		return len(v) == 0
+	case string:
+		return len(v) == 0
+	case nil:
+		return true
+	}
+	// Try the reflection cases before returning false.
+	rv := reflect.ValueOf(value)
+	switch rv.Kind() {
+	case reflect.Struct:
+		// A struct type will never be false, even if
+		// all of its values are the zero type.
+		return false
+	case reflect.Slice, reflect.Map:
+		return rv.Len() == 0
+	case reflect.Ptr:
+		if rv.IsNil() {
+			return true
+		}
+		// If it's a pointer type, we'll try to deref the pointer
+		// and evaluate the pointer value for isFalse.
+		element := rv.Elem()
+		return isFalse(element.Interface())
+	}
+	return false
+}
+
+// ObjsEqual is a generic object equality check.
+// It will take two arbitrary objects and recursively determine
+// if they are equal.
+func objsEqual(left interface{}, right interface{}) bool {
+	return reflect.DeepEqual(left, right)
+}
+
+// SliceParam refers to a single part of a slice.
+// A slice consists of a start, a stop, and a step, similar to
+// python slices.
+type sliceParam struct {
+	N         int
+	Specified bool
+}
+
+// Slice supports [start:stop:step] style slicing that's supported in JMESPath.
+func slice(slice []interface{}, parts []sliceParam) ([]interface{}, error) {
+	computed, err := computeSliceParams(len(slice), parts)
+	if err != nil {
+		return nil, err
+	}
+	start, stop, step := computed[0], computed[1], computed[2]
+	result := []interface{}{}
+	if step > 0 {
+		for i := start; i < stop; i += step {
+			result = append(result, slice[i])
+		}
+	} else {
+		for i := start; i > stop; i += step {
+			result = append(result, slice[i])
+		}
+	}
+	return result, nil
+}
+
+func computeSliceParams(length int, parts []sliceParam) ([]int, error) {
+	var start, stop, step int
+	if !parts[2].Specified {
+		step = 1
+	} else if parts[2].N == 0 {
+		return nil, errors.New("Invalid slice, step cannot be 0")
+	} else {
+		step = parts[2].N
+	}
+	var stepValueNegative bool
+	if step < 0 {
+		stepValueNegative = true
+	} else {
+		stepValueNegative = false
+	}
+
+	if !parts[0].Specified {
+		if stepValueNegative {
+			start = length - 1
+		} else {
+			start = 0
+		}
+	} else {
+		start = capSlice(length, parts[0].N, step)
+	}
+
+	if !parts[1].Specified {
+		if stepValueNegative {
+			stop = -1
+		} else {
+			stop = length
+		}
+	} else {
+		stop = capSlice(length, parts[1].N, step)
+	}
+	return []int{start, stop, step}, nil
+}
+
+func capSlice(length int, actual int, step int) int {
+	if actual < 0 {
+		actual += length
+		if actual < 0 {
+			if step < 0 {
+				actual = -1
+			} else {
+				actual = 0
+			}
+		}
+	} else if actual >= length {
+		if step < 0 {
+			actual = length - 1
+		} else {
+			actual = length
+		}
+	}
+	return actual
+}
+
+// ToArrayNum converts an empty interface type to a slice of float64.
+// If any element in the array cannot be converted, then nil is returned
+// along with a second value of false.
+func toArrayNum(data interface{}) ([]float64, bool) {
+	// Is there a better way to do this with reflect?
+	if d, ok := data.([]interface{}); ok {
+		result := make([]float64, len(d))
+		for i, el := range d {
+			item, ok := el.(float64)
+			if !ok {
+				return nil, false
+			}
+			result[i] = item
+		}
+		return result, true
+	}
+	return nil, false
+}
+
+// ToArrayStr converts an empty interface type to a slice of strings.
+// If any element in the array cannot be converted, then nil is returned
+// along with a second value of false.  If the input data could be entirely
+// converted, then the converted data, along with a second value of true,
+// will be returned.
+func toArrayStr(data interface{}) ([]string, bool) {
+	// Is there a better way to do this with reflect?
+	if d, ok := data.([]interface{}); ok {
+		result := make([]string, len(d))
+		for i, el := range d {
+			item, ok := el.(string)
+			if !ok {
+				return nil, false
+			}
+			result[i] = item
+		}
+		return result, true
+	}
+	return nil, false
+}
+
+func isSliceType(v interface{}) bool {
+	if v == nil {
+		return false
+	}
+	return reflect.TypeOf(v).Kind() == reflect.Slice
+}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/LICENSE b/Godeps/_workspace/src/github.com/jtolds/gls/LICENSE
new file mode 100644
index 0000000000..9b4a822d92
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jtolds/gls/LICENSE
@@ -0,0 +1,18 @@
+Copyright (c) 2013, Space Monkey, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/README.md b/Godeps/_workspace/src/github.com/jtolds/gls/README.md
new file mode 100644
index 0000000000..4ebb692fb1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jtolds/gls/README.md
@@ -0,0 +1,89 @@
+gls
+===
+
+Goroutine local storage
+
+### IMPORTANT NOTE ###
+
+It is my duty to point you to https://blog.golang.org/context, which is how 
+Google solves all of the problems you'd perhaps consider using this package
+for at scale. 
+
+One downside to Google's approach is that *all* of your functions must have
+a new first argument, but after clearing that hurdle everything else is much
+better.
+
+If you aren't interested in this warning, read on.
+
+### Huhwaht? Why? ###
+
+Every so often, a thread shows up on the
+[golang-nuts](https://groups.google.com/d/forum/golang-nuts) asking for some
+form of goroutine-local-storage, or some kind of goroutine id, or some kind of
+context. There are a few valid use cases for goroutine-local-storage, one of
+the most prominent being log line context. One poster was interested in being
+able to log an HTTP request context id in every log line in the same goroutine
+as the incoming HTTP request, without having to change every library and
+function call he was interested in logging.
+
+This would be pretty useful. Provided that you could get some kind of
+goroutine-local-storage, you could call
+[log.SetOutput](http://golang.org/pkg/log/#SetOutput) with your own logging
+writer that checks goroutine-local-storage for some context information and
+adds that context to your log lines.
+
+But alas, Andrew Gerrand's typically diplomatic answer to the question of
+goroutine-local variables was:
+
+> We wouldn't even be having this discussion if thread local storage wasn't
+> useful. But every feature comes at a cost, and in my opinion the cost of
+> threadlocals far outweighs their benefits. They're just not a good fit for
+> Go.
+
+So, yeah, that makes sense. That's a pretty good reason for why the language
+won't support a specific and (relatively) unuseful feature that requires some
+runtime changes, just for the sake of a little bit of log improvement.
+
+But does Go require runtime changes?
+
+### How it works ###
+
+Go has pretty fantastic introspective and reflective features, but one thing Go
+doesn't give you is any kind of access to the stack pointer, or frame pointer,
+or goroutine id, or anything contextual about your current stack. It gives you
+access to your list of callers, but only along with program counters, which are
+fixed at compile time.
+
+But it does give you the stack.
+
+So, we define 16 special functions and embed base-16 tags into the stack using
+the call order of those 16 functions. Then, we can read our tags back out of
+the stack looking at the callers list.
+
+We then use these tags as an index into a traditional map for implementing
+this library.
+
+### What are people saying? ###
+
+"Wow, that's horrifying."
+
+"This is the most terrible thing I have seen in a very long time."
+
+"Where is it getting a context from? Is this serializing all the requests? 
+What the heck is the client being bound to? What are these tags? Why does he 
+need callers? Oh god no. No no no."
+
+### Docs ###
+
+Please see the docs at http://godoc.org/github.com/jtolds/gls
+
+### Related ###
+
+If you're okay relying on the string format of the current runtime stacktrace 
+including a unique goroutine id (not guaranteed by the spec or anything, but 
+very unlikely to change within a Go release), you might be able to squeeze 
+out a bit more performance by using this similar library, inspired by some 
+code Brad Fitzpatrick wrote for debugging his HTTP/2 library: 
+https://github.com/tylerb/gls (in contrast, jtolds/gls doesn't require 
+any knowledge of the string format of the runtime stacktrace, which 
+probably adds unnecessary overhead).
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/context.go b/Godeps/_workspace/src/github.com/jtolds/gls/context.go
new file mode 100644
index 0000000000..90cfcf7db1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jtolds/gls/context.go
@@ -0,0 +1,144 @@
+// Package gls implements goroutine-local storage.
+package gls
+
+import (
+	"sync"
+)
+
+const (
+	maxCallers = 64
+)
+
+var (
+	stackTagPool   = &idPool{}
+	mgrRegistry    = make(map[*ContextManager]bool)
+	mgrRegistryMtx sync.RWMutex
+)
+
+// Values is simply a map of key types to value types. Used by SetValues to
+// set multiple values at once.
+type Values map[interface{}]interface{}
+
+// ContextManager is the main entrypoint for interacting with
+// Goroutine-local-storage. You can have multiple independent ContextManagers
+// at any given time. ContextManagers are usually declared globally for a given
+// class of context variables. You should use NewContextManager for
+// construction.
+type ContextManager struct {
+	mtx    sync.RWMutex
+	values map[uint]Values
+}
+
+// NewContextManager returns a brand new ContextManager. It also registers the
+// new ContextManager in the ContextManager registry which is used by the Go
+// method. ContextManagers are typically defined globally at package scope.
+func NewContextManager() *ContextManager {
+	mgr := &ContextManager{values: make(map[uint]Values)}
+	mgrRegistryMtx.Lock()
+	defer mgrRegistryMtx.Unlock()
+	mgrRegistry[mgr] = true
+	return mgr
+}
+
+// Unregister removes a ContextManager from the global registry, used by the
+// Go method. Only intended for use when you're completely done with a
+// ContextManager. Use of Unregister at all is rare.
+func (m *ContextManager) Unregister() {
+	mgrRegistryMtx.Lock()
+	defer mgrRegistryMtx.Unlock()
+	delete(mgrRegistry, m)
+}
+
+// SetValues takes a collection of values and a function to call for those
+// values to be set in. Anything further down the stack will have the set
+// values available through GetValue. SetValues will add new values or replace
+// existing values of the same key and will not mutate or change values for
+// previous stack frames.
+// SetValues is slow (makes a copy of all current and new values for the new
+// gls-context) in order to reduce the amount of lookups GetValue requires.
+func (m *ContextManager) SetValues(new_values Values, context_call func()) {
+	if len(new_values) == 0 {
+		context_call()
+		return
+	}
+
+	tags := readStackTags(1)
+
+	m.mtx.Lock()
+	values := new_values
+	for _, tag := range tags {
+		if existing_values, ok := m.values[tag]; ok {
+			// oh, we found existing values, let's make a copy
+			values = make(Values, len(existing_values)+len(new_values))
+			for key, val := range existing_values {
+				values[key] = val
+			}
+			for key, val := range new_values {
+				values[key] = val
+			}
+			break
+		}
+	}
+	new_tag := stackTagPool.Acquire()
+	m.values[new_tag] = values
+	m.mtx.Unlock()
+	defer func() {
+		m.mtx.Lock()
+		delete(m.values, new_tag)
+		m.mtx.Unlock()
+		stackTagPool.Release(new_tag)
+	}()
+
+	addStackTag(new_tag, context_call)
+}
+
+// GetValue will return a previously set value, provided that the value was set
+// by SetValues somewhere higher up the stack. If the value is not found, ok
+// will be false.
+func (m *ContextManager) GetValue(key interface{}) (value interface{}, ok bool) {
+
+	tags := readStackTags(1)
+	m.mtx.RLock()
+	defer m.mtx.RUnlock()
+	for _, tag := range tags {
+		if values, ok := m.values[tag]; ok {
+			value, ok := values[key]
+			return value, ok
+		}
+	}
+	return "", false
+}
+
+func (m *ContextManager) getValues() Values {
+	tags := readStackTags(2)
+	m.mtx.RLock()
+	defer m.mtx.RUnlock()
+	for _, tag := range tags {
+		if values, ok := m.values[tag]; ok {
+			return values
+		}
+	}
+	return nil
+}
+
+// Go preserves ContextManager values and Goroutine-local-storage across new
+// goroutine invocations. The Go method makes a copy of all existing values on
+// all registered context managers and makes sure they are still set after
+// kicking off the provided function in a new goroutine. If you don't use this
+// Go method instead of the standard 'go' keyword, you will lose values in
+// ContextManagers, as goroutines have brand new stacks.
+func Go(cb func()) {
+	mgrRegistryMtx.RLock()
+	defer mgrRegistryMtx.RUnlock()
+
+	for mgr, _ := range mgrRegistry {
+		values := mgr.getValues()
+		if len(values) > 0 {
+			mgr_copy := mgr
+			cb_copy := cb
+			cb = func() { mgr_copy.SetValues(values, cb_copy) }
+		}
+	}
+
+	go cb()
+}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go b/Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go
new file mode 100644
index 0000000000..8d5fc24d4a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go
@@ -0,0 +1,13 @@
+package gls
+
+var (
+	symPool = &idPool{}
+)
+
+// ContextKey is a throwaway value you can use as a key to a ContextManager
+type ContextKey struct{ id uint }
+
+// GenSym will return a brand new, never-before-used ContextKey
+func GenSym() ContextKey {
+	return ContextKey{id: symPool.Acquire()}
+}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go b/Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go
new file mode 100644
index 0000000000..b7974ae002
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go
@@ -0,0 +1,34 @@
+package gls
+
+// though this could probably be better at keeping ids smaller, the goal of
+// this class is to keep a registry of the smallest unique integer ids
+// per-process possible
+
+import (
+	"sync"
+)
+
+type idPool struct {
+	mtx      sync.Mutex
+	released []uint
+	max_id   uint
+}
+
+func (p *idPool) Acquire() (id uint) {
+	p.mtx.Lock()
+	defer p.mtx.Unlock()
+	if len(p.released) > 0 {
+		id = p.released[len(p.released)-1]
+		p.released = p.released[:len(p.released)-1]
+		return id
+	}
+	id = p.max_id
+	p.max_id++
+	return id
+}
+
+func (p *idPool) Release(id uint) {
+	p.mtx.Lock()
+	defer p.mtx.Unlock()
+	p.released = append(p.released, id)
+}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go
new file mode 100644
index 0000000000..9b8e39ba7c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go
@@ -0,0 +1,43 @@
+package gls
+
+// so, basically, we're going to encode integer tags in base-16 on the stack
+
+const (
+	bitWidth = 4
+)
+
+func addStackTag(tag uint, context_call func()) {
+	if context_call == nil {
+		return
+	}
+	markS(tag, context_call)
+}
+
+func markS(tag uint, cb func()) { _m(tag, cb) }
+func mark0(tag uint, cb func()) { _m(tag, cb) }
+func mark1(tag uint, cb func()) { _m(tag, cb) }
+func mark2(tag uint, cb func()) { _m(tag, cb) }
+func mark3(tag uint, cb func()) { _m(tag, cb) }
+func mark4(tag uint, cb func()) { _m(tag, cb) }
+func mark5(tag uint, cb func()) { _m(tag, cb) }
+func mark6(tag uint, cb func()) { _m(tag, cb) }
+func mark7(tag uint, cb func()) { _m(tag, cb) }
+func mark8(tag uint, cb func()) { _m(tag, cb) }
+func mark9(tag uint, cb func()) { _m(tag, cb) }
+func markA(tag uint, cb func()) { _m(tag, cb) }
+func markB(tag uint, cb func()) { _m(tag, cb) }
+func markC(tag uint, cb func()) { _m(tag, cb) }
+func markD(tag uint, cb func()) { _m(tag, cb) }
+func markE(tag uint, cb func()) { _m(tag, cb) }
+func markF(tag uint, cb func()) { _m(tag, cb) }
+
+var pc_lookup = make(map[uintptr]int8, 17)
+var mark_lookup [16]func(uint, func())
+
+func _m(tag_remainder uint, cb func()) {
+	if tag_remainder == 0 {
+		cb()
+	} else {
+		mark_lookup[tag_remainder&0xf](tag_remainder>>bitWidth, cb)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go
new file mode 100644
index 0000000000..21d5595926
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go
@@ -0,0 +1,101 @@
+// +build js
+
+package gls
+
+// This file is used for GopherJS builds, which don't have normal runtime support
+
+import (
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/gopherjs/gopherjs/js"
+)
+
+var stackRE = regexp.MustCompile("\\s+at (\\S*) \\([^:]+:(\\d+):(\\d+)")
+
+func findPtr() uintptr {
+	jsStack := js.Global.Get("Error").New().Get("stack").Call("split", "\n")
+	for i := 1; i < jsStack.Get("length").Int(); i++ {
+		item := jsStack.Index(i).String()
+		matches := stackRE.FindAllStringSubmatch(item, -1)
+		if matches == nil {
+			return 0
+		}
+		pkgPath := matches[0][1]
+		if strings.HasPrefix(pkgPath, "$packages.github.com/jtolds/gls.mark") {
+			line, _ := strconv.Atoi(matches[0][2])
+			char, _ := strconv.Atoi(matches[0][3])
+			x := (uintptr(line) << 16) | uintptr(char)
+			return x
+		}
+	}
+
+	return 0
+}
+
+func init() {
+	setEntries := func(f func(uint, func()), v int8) {
+		var ptr uintptr
+		f(0, func() {
+			ptr = findPtr()
+		})
+		pc_lookup[ptr] = v
+		if v >= 0 {
+			mark_lookup[v] = f
+		}
+	}
+	setEntries(markS, -0x1)
+	setEntries(mark0, 0x0)
+	setEntries(mark1, 0x1)
+	setEntries(mark2, 0x2)
+	setEntries(mark3, 0x3)
+	setEntries(mark4, 0x4)
+	setEntries(mark5, 0x5)
+	setEntries(mark6, 0x6)
+	setEntries(mark7, 0x7)
+	setEntries(mark8, 0x8)
+	setEntries(mark9, 0x9)
+	setEntries(markA, 0xa)
+	setEntries(markB, 0xb)
+	setEntries(markC, 0xc)
+	setEntries(markD, 0xd)
+	setEntries(markE, 0xe)
+	setEntries(markF, 0xf)
+}
+
+func currentStack(skip int) (stack []uintptr) {
+	jsStack := js.Global.Get("Error").New().Get("stack").Call("split", "\n")
+	for i := skip + 2; i < jsStack.Get("length").Int(); i++ {
+		item := jsStack.Index(i).String()
+		matches := stackRE.FindAllStringSubmatch(item, -1)
+		if matches == nil {
+			return stack
+		}
+		line, _ := strconv.Atoi(matches[0][2])
+		char, _ := strconv.Atoi(matches[0][3])
+		x := (uintptr(line) << 16) | uintptr(char)&0xffff
+		stack = append(stack, x)
+	}
+
+	return stack
+}
+
+func readStackTags(skip int) (tags []uint) {
+	stack := currentStack(skip)
+	var current_tag uint
+	for _, pc := range stack {
+		val, ok := pc_lookup[pc]
+		if !ok {
+			continue
+		}
+		if val < 0 {
+			tags = append(tags, current_tag)
+			current_tag = 0
+			continue
+		}
+		current_tag <<= bitWidth
+		current_tag += uint(val)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go
new file mode 100644
index 0000000000..cb302b9ef6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go
@@ -0,0 +1,61 @@
+// +build !js
+
+package gls
+
+// This file is used for standard Go builds, which have the expected runtime support
+
+import (
+	"reflect"
+	"runtime"
+)
+
+func init() {
+	setEntries := func(f func(uint, func()), v int8) {
+		pc_lookup[reflect.ValueOf(f).Pointer()] = v
+		if v >= 0 {
+			mark_lookup[v] = f
+		}
+	}
+	setEntries(markS, -0x1)
+	setEntries(mark0, 0x0)
+	setEntries(mark1, 0x1)
+	setEntries(mark2, 0x2)
+	setEntries(mark3, 0x3)
+	setEntries(mark4, 0x4)
+	setEntries(mark5, 0x5)
+	setEntries(mark6, 0x6)
+	setEntries(mark7, 0x7)
+	setEntries(mark8, 0x8)
+	setEntries(mark9, 0x9)
+	setEntries(markA, 0xa)
+	setEntries(markB, 0xb)
+	setEntries(markC, 0xc)
+	setEntries(markD, 0xd)
+	setEntries(markE, 0xe)
+	setEntries(markF, 0xf)
+}
+
+func currentStack(skip int) []uintptr {
+	stack := make([]uintptr, maxCallers)
+	return stack[:runtime.Callers(3+skip, stack)]
+}
+
+func readStackTags(skip int) (tags []uint) {
+	stack := currentStack(skip)
+	var current_tag uint
+	for _, pc := range stack {
+		pc = runtime.FuncForPC(pc).Entry()
+		val, ok := pc_lookup[pc]
+		if !ok {
+			continue
+		}
+		if val < 0 {
+			tags = append(tags, current_tag)
+			current_tag = 0
+			continue
+		}
+		current_tag <<= bitWidth
+		current_tag += uint(val)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore b/Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore
new file mode 100644
index 0000000000..6ad551742d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+Thumbs.db
+/.idea
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml b/Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml
new file mode 100644
index 0000000000..44217c9733
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml
@@ -0,0 +1,14 @@
+language: go
+
+go:
+  - 1.2
+  - 1.3
+  - 1.4
+  - 1.5
+
+install:
+  - go get -t ./...
+
+script: go test -v
+
+sudo: false
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md
new file mode 100644
index 0000000000..1820ecb331
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+# Contributing
+
+In general, the code posted to the [SmartyStreets github organization](https://github.com/smartystreets) is created to solve specific problems at SmartyStreets that are ancillary to our core products in the address verification industry and may or may not be useful to other organizations or developers. Our reason for posting said code isn't necessarily to solicit feedback or contributions from the community but more as a showcase of some of the approaches to solving problems we have adopted.
+
+Having stated that, we do consider issues raised by other githubbers as well as contributions submitted via pull requests. When submitting such a pull request, please follow these guidelines:
+
+- _Look before you leap:_ If the changes you plan to make are significant, it's in everyone's best interest for you to discuss them with a SmartyStreets team member prior to opening a pull request.
+- _License and ownership:_ If modifying the `LICENSE.md` file, limit your changes to fixing typographical mistakes. Do NOT modify the actual terms in the license or the copyright by **SmartyStreets, LLC**. Code submitted to SmartyStreets projects becomes property of SmartyStreets and must be compatible with the associated license.
+- _Testing:_ If the code you are submitting resides in packages/modules covered by automated tests, be sure to add passing tests that cover your changes and assert expected behavior and state. Submit the additional test cases as part of your change set.
+- _Style:_ Match your approach to **naming** and **formatting** with the surrounding code. Basically, the code you submit shouldn't stand out.
+  - "Naming" refers to such constructs as variables, methods, functions, classes, structs, interfaces, packages, modules, directories, files, etc...
+  - "Formatting" refers to such constructs as whitespace, horizontal line length, vertical function length, vertical file length, indentation, curly braces, etc...
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md
new file mode 100644
index 0000000000..8ea6f94552
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md
@@ -0,0 +1,23 @@
+Copyright (c) 2016 SmartyStreets, LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.
+
+NOTE: Various optional and subordinate components carry their own licensing
+requirements and restrictions.  Use of those components is subject to the terms
+and conditions outlined the respective license of each component.
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/README.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/README.md
new file mode 100644
index 0000000000..58383bb00a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/README.md
@@ -0,0 +1,575 @@
+# assertions
+--
+    import "github.com/smartystreets/assertions"
+
+Package assertions contains the implementations for all assertions which are
+referenced in goconvey's `convey` package
+(github.com/smartystreets/goconvey/convey) and gunit
+(github.com/smartystreets/gunit) for use with the So(...) method. They can also
+be used in traditional Go test functions and even in applications.
+
+Many of the assertions lean heavily on work done by Aaron Jacobs in his
+excellent oglematchers library. (https://github.com/jacobsa/oglematchers) The
+ShouldResemble assertion leans heavily on work done by Daniel Jacques in his
+very helpful go-render library. (https://github.com/luci/go-render)
+
+## Usage
+
+#### func  GoConveyMode
+
+```go
+func GoConveyMode(yes bool)
+```
+GoConveyMode provides control over JSON serialization of failures. When using
+the assertions in this package from the convey package JSON results are very
+helpful and can be rendered in a DIFF view. In that case, this function will be
+called with a true value to enable the JSON serialization. By default, the
+assertions in this package will not serializer a JSON result, making standalone
+ussage more convenient.
+
+#### func  ShouldAlmostEqual
+
+```go
+func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string
+```
+ShouldAlmostEqual makes sure that two parameters are close enough to being
+equal. The acceptable delta may be specified with a third argument, or a very
+small default delta will be used.
+
+#### func  ShouldBeBetween
+
+```go
+func ShouldBeBetween(actual interface{}, expected ...interface{}) string
+```
+ShouldBeBetween receives exactly three parameters: an actual value, a lower
+bound, and an upper bound. It ensures that the actual value is between both
+bounds (but not equal to either of them).
+
+#### func  ShouldBeBetweenOrEqual
+
+```go
+func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string
+```
+ShouldBeBetweenOrEqual receives exactly three parameters: an actual value, a
+lower bound, and an upper bound. It ensures that the actual value is between
+both bounds or equal to one of them.
+
+#### func  ShouldBeBlank
+
+```go
+func ShouldBeBlank(actual interface{}, expected ...interface{}) string
+```
+ShouldBeBlank receives exactly 1 string parameter and ensures that it is equal
+to "".
+
+#### func  ShouldBeChronological
+
+```go
+func ShouldBeChronological(actual interface{}, expected ...interface{}) string
+```
+ShouldBeChronological receives a []time.Time slice and asserts that the are in
+chronological order starting with the first time.Time as the earliest.
+
+#### func  ShouldBeEmpty
+
+```go
+func ShouldBeEmpty(actual interface{}, expected ...interface{}) string
+```
+ShouldBeEmpty receives a single parameter (actual) and determines whether or not
+calling len(actual) would return `0`. It obeys the rules specified by the len
+function for determining length: http://golang.org/pkg/builtin/#len
+
+#### func  ShouldBeFalse
+
+```go
+func ShouldBeFalse(actual interface{}, expected ...interface{}) string
+```
+ShouldBeFalse receives a single parameter and ensures that it is false.
+
+#### func  ShouldBeGreaterThan
+
+```go
+func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string
+```
+ShouldBeGreaterThan receives exactly two parameters and ensures that the first
+is greater than the second.
+
+#### func  ShouldBeGreaterThanOrEqualTo
+
+```go
+func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) string
+```
+ShouldBeGreaterThanOrEqualTo receives exactly two parameters and ensures that
+the first is greater than or equal to the second.
+
+#### func  ShouldBeIn
+
+```go
+func ShouldBeIn(actual interface{}, expected ...interface{}) string
+```
+ShouldBeIn receives at least 2 parameters. The first is a proposed member of the
+collection that is passed in either as the second parameter, or of the
+collection that is comprised of all the remaining parameters. This assertion
+ensures that the proposed member is in the collection (using ShouldEqual).
+
+#### func  ShouldBeLessThan
+
+```go
+func ShouldBeLessThan(actual interface{}, expected ...interface{}) string
+```
+ShouldBeLessThan receives exactly two parameters and ensures that the first is
+less than the second.
+
+#### func  ShouldBeLessThanOrEqualTo
+
+```go
+func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) string
+```
+ShouldBeLessThan receives exactly two parameters and ensures that the first is
+less than or equal to the second.
+
+#### func  ShouldBeNil
+
+```go
+func ShouldBeNil(actual interface{}, expected ...interface{}) string
+```
+ShouldBeNil receives a single parameter and ensures that it is nil.
+
+#### func  ShouldBeTrue
+
+```go
+func ShouldBeTrue(actual interface{}, expected ...interface{}) string
+```
+ShouldBeTrue receives a single parameter and ensures that it is true.
+
+#### func  ShouldBeZeroValue
+
+```go
+func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string
+```
+ShouldBeZeroValue receives a single parameter and ensures that it is the Go
+equivalent of the default value, or "zero" value.
+
+#### func  ShouldContain
+
+```go
+func ShouldContain(actual interface{}, expected ...interface{}) string
+```
+ShouldContain receives exactly two parameters. The first is a slice and the
+second is a proposed member. Membership is determined using ShouldEqual.
+
+#### func  ShouldContainKey
+
+```go
+func ShouldContainKey(actual interface{}, expected ...interface{}) string
+```
+ShouldContainKey receives exactly two parameters. The first is a map and the
+second is a proposed key. Keys are compared with a simple '=='.
+
+#### func  ShouldContainSubstring
+
+```go
+func ShouldContainSubstring(actual interface{}, expected ...interface{}) string
+```
+ShouldContainSubstring receives exactly 2 string parameters and ensures that the
+first contains the second as a substring.
+
+#### func  ShouldEndWith
+
+```go
+func ShouldEndWith(actual interface{}, expected ...interface{}) string
+```
+ShouldEndWith receives exactly 2 string parameters and ensures that the first
+ends with the second.
+
+#### func  ShouldEqual
+
+```go
+func ShouldEqual(actual interface{}, expected ...interface{}) string
+```
+ShouldEqual receives exactly two parameters and does an equality check.
+
+#### func  ShouldEqualTrimSpace
+
+```go
+func ShouldEqualTrimSpace(actual interface{}, expected ...interface{}) string
+```
+ShouldEqualTrimSpace receives exactly 2 string parameters and ensures that the
+first is equal to the second after removing all leading and trailing whitespace
+using strings.TrimSpace(first).
+
+#### func  ShouldEqualWithout
+
+```go
+func ShouldEqualWithout(actual interface{}, expected ...interface{}) string
+```
+ShouldEqualWithout receives exactly 3 string parameters and ensures that the
+first is equal to the second after removing all instances of the third from the
+first using strings.Replace(first, third, "", -1).
+
+#### func  ShouldHappenAfter
+
+```go
+func ShouldHappenAfter(actual interface{}, expected ...interface{}) string
+```
+ShouldHappenAfter receives exactly 2 time.Time arguments and asserts that the
+first happens after the second.
+
+#### func  ShouldHappenBefore
+
+```go
+func ShouldHappenBefore(actual interface{}, expected ...interface{}) string
+```
+ShouldHappenBefore receives exactly 2 time.Time arguments and asserts that the
+first happens before the second.
+
+#### func  ShouldHappenBetween
+
+```go
+func ShouldHappenBetween(actual interface{}, expected ...interface{}) string
+```
+ShouldHappenBetween receives exactly 3 time.Time arguments and asserts that the
+first happens between (not on) the second and third.
+
+#### func  ShouldHappenOnOrAfter
+
+```go
+func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string
+```
+ShouldHappenOnOrAfter receives exactly 2 time.Time arguments and asserts that
+the first happens on or after the second.
+
+#### func  ShouldHappenOnOrBefore
+
+```go
+func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string
+```
+ShouldHappenOnOrBefore receives exactly 2 time.Time arguments and asserts that
+the first happens on or before the second.
+
+#### func  ShouldHappenOnOrBetween
+
+```go
+func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string
+```
+ShouldHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that
+the first happens between or on the second and third.
+
+#### func  ShouldHappenWithin
+
+```go
+func ShouldHappenWithin(actual interface{}, expected ...interface{}) string
+```
+ShouldHappenWithin receives a time.Time, a time.Duration, and a time.Time (3
+arguments) and asserts that the first time.Time happens within or on the
+duration specified relative to the other time.Time.
+
+#### func  ShouldHaveLength
+
+```go
+func ShouldHaveLength(actual interface{}, expected ...interface{}) string
+```
+ShouldHaveLength receives 2 parameters. The first is a collection to check the
+length of, the second being the expected length. It obeys the rules specified by
+the len function for determining length: http://golang.org/pkg/builtin/#len
+
+#### func  ShouldHaveSameTypeAs
+
+```go
+func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string
+```
+ShouldHaveSameTypeAs receives exactly two parameters and compares their
+underlying types for equality.
+
+#### func  ShouldImplement
+
+```go
+func ShouldImplement(actual interface{}, expectedList ...interface{}) string
+```
+ShouldImplement receives exactly two parameters and ensures that the first
+implements the interface type of the second.
+
+#### func  ShouldNotAlmostEqual
+
+```go
+func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string
+```
+ShouldNotAlmostEqual is the inverse of ShouldAlmostEqual
+
+#### func  ShouldNotBeBetween
+
+```go
+func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string
+```
+ShouldNotBeBetween receives exactly three parameters: an actual value, a lower
+bound, and an upper bound. It ensures that the actual value is NOT between both
+bounds.
+
+#### func  ShouldNotBeBetweenOrEqual
+
+```go
+func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) string
+```
+ShouldNotBeBetweenOrEqual receives exactly three parameters: an actual value, a
+lower bound, and an upper bound. It ensures that the actual value is nopt
+between the bounds nor equal to either of them.
+
+#### func  ShouldNotBeBlank
+
+```go
+func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string
+```
+ShouldNotBeBlank receives exactly 1 string parameter and ensures that it is
+equal to "".
+
+#### func  ShouldNotBeEmpty
+
+```go
+func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string
+```
+ShouldNotBeEmpty receives a single parameter (actual) and determines whether or
+not calling len(actual) would return a value greater than zero. It obeys the
+rules specified by the `len` function for determining length:
+http://golang.org/pkg/builtin/#len
+
+#### func  ShouldNotBeIn
+
+```go
+func ShouldNotBeIn(actual interface{}, expected ...interface{}) string
+```
+ShouldNotBeIn receives at least 2 parameters. The first is a proposed member of
+the collection that is passed in either as the second parameter, or of the
+collection that is comprised of all the remaining parameters. This assertion
+ensures that the proposed member is NOT in the collection (using ShouldEqual).
+
+#### func  ShouldNotBeNil
+
+```go
+func ShouldNotBeNil(actual interface{}, expected ...interface{}) string
+```
+ShouldNotBeNil receives a single parameter and ensures that it is not nil.
+
+#### func  ShouldNotContain
+
+```go
+func ShouldNotContain(actual interface{}, expected ...interface{}) string
+```
+ShouldNotContain receives exactly two parameters. The first is a slice and the
+second is a proposed member. Membership is determinied using ShouldEqual.
+
+#### func  ShouldNotContainKey
+
+```go
+func ShouldNotContainKey(actual interface{}, expected ...interface{}) string
+```
+ShouldNotContainKey receives exactly two parameters. The first is a map and the
+second is a proposed absent key. Keys are compared with a simple '=='.
+
+#### func  ShouldNotContainSubstring
+
+```go
+func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) string
+```
+ShouldNotContainSubstring receives exactly 2 string parameters and ensures that
+the first does NOT contain the second as a substring.
+
+#### func  ShouldNotEndWith
+
+```go
+func ShouldNotEndWith(actual interface{}, expected ...interface{}) string
+```
+ShouldEndWith receives exactly 2 string parameters and ensures that the first
+does not end with the second.
+
+#### func  ShouldNotEqual
+
+```go
+func ShouldNotEqual(actual interface{}, expected ...interface{}) string
+```
+ShouldNotEqual receives exactly two parameters and does an inequality check.
+
+#### func  ShouldNotHappenOnOrBetween
+
+```go
+func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) string
+```
+ShouldNotHappenOnOrBetween receives exactly 3 time.Time arguments and asserts
+that the first does NOT happen between or on the second or third.
+
+#### func  ShouldNotHappenWithin
+
+```go
+func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string
+```
+ShouldNotHappenWithin receives a time.Time, a time.Duration, and a time.Time (3
+arguments) and asserts that the first time.Time does NOT happen within or on the
+duration specified relative to the other time.Time.
+
+#### func  ShouldNotHaveSameTypeAs
+
+```go
+func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string
+```
+ShouldNotHaveSameTypeAs receives exactly two parameters and compares their
+underlying types for inequality.
+
+#### func  ShouldNotImplement
+
+```go
+func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string
+```
+ShouldNotImplement receives exactly two parameters and ensures that the first
+does NOT implement the interface type of the second.
+
+#### func  ShouldNotPanic
+
+```go
+func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string)
+```
+ShouldNotPanic receives a void, niladic function and expects to execute the
+function without any panic.
+
+#### func  ShouldNotPanicWith
+
+```go
+func ShouldNotPanicWith(actual interface{}, expected ...interface{}) (message string)
+```
+ShouldNotPanicWith receives a void, niladic function and expects to recover a
+panic whose content differs from the second argument.
+
+#### func  ShouldNotPointTo
+
+```go
+func ShouldNotPointTo(actual interface{}, expected ...interface{}) string
+```
+ShouldNotPointTo receives exactly two parameters and checks to see that they
+point to different addresess.
+
+#### func  ShouldNotResemble
+
+```go
+func ShouldNotResemble(actual interface{}, expected ...interface{}) string
+```
+ShouldNotResemble receives exactly two parameters and does an inverse deep equal
+check (see reflect.DeepEqual)
+
+#### func  ShouldNotStartWith
+
+```go
+func ShouldNotStartWith(actual interface{}, expected ...interface{}) string
+```
+ShouldNotStartWith receives exactly 2 string parameters and ensures that the
+first does not start with the second.
+
+#### func  ShouldPanic
+
+```go
+func ShouldPanic(actual interface{}, expected ...interface{}) (message string)
+```
+ShouldPanic receives a void, niladic function and expects to recover a panic.
+
+#### func  ShouldPanicWith
+
+```go
+func ShouldPanicWith(actual interface{}, expected ...interface{}) (message string)
+```
+ShouldPanicWith receives a void, niladic function and expects to recover a panic
+with the second argument as the content.
+
+#### func  ShouldPointTo
+
+```go
+func ShouldPointTo(actual interface{}, expected ...interface{}) string
+```
+ShouldPointTo receives exactly two parameters and checks to see that they point
+to the same address.
+
+#### func  ShouldResemble
+
+```go
+func ShouldResemble(actual interface{}, expected ...interface{}) string
+```
+ShouldResemble receives exactly two parameters and does a deep equal check (see
+reflect.DeepEqual)
+
+#### func  ShouldStartWith
+
+```go
+func ShouldStartWith(actual interface{}, expected ...interface{}) string
+```
+ShouldStartWith receives exactly 2 string parameters and ensures that the first
+starts with the second.
+
+#### func  So
+
+```go
+func So(actual interface{}, assert assertion, expected ...interface{}) (bool, string)
+```
+So is a convenience function (as opposed to an inconvenience function?) for
+running assertions on arbitrary arguments in any context, be it for testing or
+even application logging. It allows you to perform assertion-like behavior (and
+get nicely formatted messages detailing discrepancies) but without the program
+blowing up or panicking. All that is required is to import this package and call
+`So` with one of the assertions exported by this package as the second
+parameter. The first return parameter is a boolean indicating if the assertion
+was true. The second return parameter is the well-formatted message showing why
+an assertion was incorrect, or blank if the assertion was correct.
+
+Example:
+
+    if ok, message := So(x, ShouldBeGreaterThan, y); !ok {
+         log.Println(message)
+    }
+
+#### type Assertion
+
+```go
+type Assertion struct {
+}
+```
+
+
+#### func  New
+
+```go
+func New(t testingT) *Assertion
+```
+New swallows the *testing.T struct and prints failed assertions using t.Error.
+Example: assertions.New(t).So(1, should.Equal, 1)
+
+#### func (*Assertion) Failed
+
+```go
+func (this *Assertion) Failed() bool
+```
+Failed reports whether any calls to So (on this Assertion instance) have failed.
+
+#### func (*Assertion) So
+
+```go
+func (this *Assertion) So(actual interface{}, assert assertion, expected ...interface{}) bool
+```
+So calls the standalone So function and additionally, calls t.Error in failure
+scenarios.
+
+#### type FailureView
+
+```go
+type FailureView struct {
+	Message  string `json:"Message"`
+	Expected string `json:"Expected"`
+	Actual   string `json:"Actual"`
+}
+```
+
+This struct is also declared in
+github.com/smartystreets/goconvey/convey/reporting. The json struct tags should
+be equal in both declarations.
+
+#### type Serializer
+
+```go
+type Serializer interface {
+	// contains filtered or unexported methods
+}
+```
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey b/Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey
new file mode 100644
index 0000000000..e76cf275d4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey
@@ -0,0 +1,3 @@
+#ignore
+-timeout=1s
+-coverpkg=github.com/smartystreets/assertions,github.com/smartystreets/assertions/internal/oglematchers
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go
new file mode 100644
index 0000000000..d7f407e913
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go
@@ -0,0 +1,244 @@
+package assertions
+
+import (
+	"fmt"
+	"reflect"
+
+	"github.com/smartystreets/assertions/internal/oglematchers"
+)
+
+// ShouldContain receives exactly two parameters. The first is a slice and the
+// second is a proposed member. Membership is determined using ShouldEqual.
+func ShouldContain(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	if matchError := oglematchers.Contains(expected[0]).Matches(actual); matchError != nil {
+		typeName := reflect.TypeOf(actual)
+
+		if fmt.Sprintf("%v", matchError) == "which is not a slice or array" {
+			return fmt.Sprintf(shouldHaveBeenAValidCollection, typeName)
+		}
+		return fmt.Sprintf(shouldHaveContained, typeName, expected[0])
+	}
+	return success
+}
+
+// ShouldNotContain receives exactly two parameters. The first is a slice and the
+// second is a proposed member. Membership is determinied using ShouldEqual.
+func ShouldNotContain(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+	typeName := reflect.TypeOf(actual)
+
+	if matchError := oglematchers.Contains(expected[0]).Matches(actual); matchError != nil {
+		if fmt.Sprintf("%v", matchError) == "which is not a slice or array" {
+			return fmt.Sprintf(shouldHaveBeenAValidCollection, typeName)
+		}
+		return success
+	}
+	return fmt.Sprintf(shouldNotHaveContained, typeName, expected[0])
+}
+
+// ShouldContainKey receives exactly two parameters. The first is a map and the
+// second is a proposed key. Keys are compared with a simple '=='.
+func ShouldContainKey(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	keys, isMap := mapKeys(actual)
+	if !isMap {
+		return fmt.Sprintf(shouldHaveBeenAValidMap, reflect.TypeOf(actual))
+	}
+
+	if !keyFound(keys, expected[0]) {
+		return fmt.Sprintf(shouldHaveContainedKey, reflect.TypeOf(actual), expected)
+	}
+
+	return ""
+}
+
+// ShouldNotContainKey receives exactly two parameters. The first is a map and the
+// second is a proposed absent key. Keys are compared with a simple '=='.
+func ShouldNotContainKey(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	keys, isMap := mapKeys(actual)
+	if !isMap {
+		return fmt.Sprintf(shouldHaveBeenAValidMap, reflect.TypeOf(actual))
+	}
+
+	if keyFound(keys, expected[0]) {
+		return fmt.Sprintf(shouldNotHaveContainedKey, reflect.TypeOf(actual), expected)
+	}
+
+	return ""
+}
+
+func mapKeys(m interface{}) ([]reflect.Value, bool) {
+	value := reflect.ValueOf(m)
+	if value.Kind() != reflect.Map {
+		return nil, false
+	}
+	return value.MapKeys(), true
+}
+func keyFound(keys []reflect.Value, expectedKey interface{}) bool {
+	found := false
+	for _, key := range keys {
+		if key.Interface() == expectedKey {
+			found = true
+		}
+	}
+	return found
+}
+
+// ShouldBeIn receives at least 2 parameters. The first is a proposed member of the collection
+// that is passed in either as the second parameter, or of the collection that is comprised
+// of all the remaining parameters. This assertion ensures that the proposed member is in
+// the collection (using ShouldEqual).
+func ShouldBeIn(actual interface{}, expected ...interface{}) string {
+	if fail := atLeast(1, expected); fail != success {
+		return fail
+	}
+
+	if len(expected) == 1 {
+		return shouldBeIn(actual, expected[0])
+	}
+	return shouldBeIn(actual, expected)
+}
+func shouldBeIn(actual interface{}, expected interface{}) string {
+	if matchError := oglematchers.Contains(actual).Matches(expected); matchError != nil {
+		return fmt.Sprintf(shouldHaveBeenIn, actual, reflect.TypeOf(expected))
+	}
+	return success
+}
+
+// ShouldNotBeIn receives at least 2 parameters. The first is a proposed member of the collection
+// that is passed in either as the second parameter, or of the collection that is comprised
+// of all the remaining parameters. This assertion ensures that the proposed member is NOT in
+// the collection (using ShouldEqual).
+func ShouldNotBeIn(actual interface{}, expected ...interface{}) string {
+	if fail := atLeast(1, expected); fail != success {
+		return fail
+	}
+
+	if len(expected) == 1 {
+		return shouldNotBeIn(actual, expected[0])
+	}
+	return shouldNotBeIn(actual, expected)
+}
+func shouldNotBeIn(actual interface{}, expected interface{}) string {
+	if matchError := oglematchers.Contains(actual).Matches(expected); matchError == nil {
+		return fmt.Sprintf(shouldNotHaveBeenIn, actual, reflect.TypeOf(expected))
+	}
+	return success
+}
+
+// ShouldBeEmpty receives a single parameter (actual) and determines whether or not
+// calling len(actual) would return `0`. It obeys the rules specified by the len
+// function for determining length: http://golang.org/pkg/builtin/#len
+func ShouldBeEmpty(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	}
+
+	if actual == nil {
+		return success
+	}
+
+	value := reflect.ValueOf(actual)
+	switch value.Kind() {
+	case reflect.Slice:
+		if value.Len() == 0 {
+			return success
+		}
+	case reflect.Chan:
+		if value.Len() == 0 {
+			return success
+		}
+	case reflect.Map:
+		if value.Len() == 0 {
+			return success
+		}
+	case reflect.String:
+		if value.Len() == 0 {
+			return success
+		}
+	case reflect.Ptr:
+		elem := value.Elem()
+		kind := elem.Kind()
+		if (kind == reflect.Slice || kind == reflect.Array) && elem.Len() == 0 {
+			return success
+		}
+	}
+
+	return fmt.Sprintf(shouldHaveBeenEmpty, actual)
+}
+
+// ShouldNotBeEmpty receives a single parameter (actual) and determines whether or not
+// calling len(actual) would return a value greater than zero. It obeys the rules
+// specified by the `len` function for determining length: http://golang.org/pkg/builtin/#len
+func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	}
+
+	if empty := ShouldBeEmpty(actual, expected...); empty != success {
+		return success
+	}
+	return fmt.Sprintf(shouldNotHaveBeenEmpty, actual)
+}
+
+// ShouldHaveLength receives 2 parameters. The first is a collection to check
+// the length of, the second being the expected length. It obeys the rules
+// specified by the len function for determining length:
+// http://golang.org/pkg/builtin/#len
+func ShouldHaveLength(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	var expectedLen int64
+	lenValue := reflect.ValueOf(expected[0])
+	switch lenValue.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		expectedLen = lenValue.Int()
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		expectedLen = int64(lenValue.Uint())
+	default:
+		return fmt.Sprintf(shouldHaveBeenAValidInteger, reflect.TypeOf(expected[0]))
+	}
+
+	if expectedLen < 0 {
+		return fmt.Sprintf(shouldHaveBeenAValidLength, expected[0])
+	}
+
+	value := reflect.ValueOf(actual)
+	switch value.Kind() {
+	case reflect.Slice,
+		reflect.Chan,
+		reflect.Map,
+		reflect.String:
+		if int64(value.Len()) == expectedLen {
+			return success
+		} else {
+			return fmt.Sprintf(shouldHaveHadLength, actual, value.Len(), expectedLen)
+		}
+	case reflect.Ptr:
+		elem := value.Elem()
+		kind := elem.Kind()
+		if kind == reflect.Slice || kind == reflect.Array {
+			if int64(elem.Len()) == expectedLen {
+				return success
+			} else {
+				return fmt.Sprintf(shouldHaveHadLength, actual, elem.Len(), expectedLen)
+			}
+		}
+	}
+	return fmt.Sprintf(shouldHaveBeenAValidCollection, reflect.TypeOf(actual))
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go
new file mode 100644
index 0000000000..5720fc298c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go
@@ -0,0 +1,105 @@
+// Package assertions contains the implementations for all assertions which
+// are referenced in goconvey's `convey` package
+// (github.com/smartystreets/goconvey/convey) and gunit (github.com/smartystreets/gunit)
+// for use with the So(...) method.
+// They can also be used in traditional Go test functions and even in
+// applications.
+//
+// Many of the assertions lean heavily on work done by Aaron Jacobs in his excellent oglematchers library.
+// (https://github.com/jacobsa/oglematchers)
+// The ShouldResemble assertion leans heavily on work done by Daniel Jacques in his very helpful go-render library.
+// (https://github.com/luci/go-render)
+package assertions
+
+import (
+	"fmt"
+	"runtime"
+)
+
+// By default we use a no-op serializer. The actual Serializer provides a JSON
+// representation of failure results on selected assertions so the goconvey
+// web UI can display a convenient diff.
+var serializer Serializer = new(noopSerializer)
+
+// GoConveyMode provides control over JSON serialization of failures. When
+// using the assertions in this package from the convey package JSON results
+// are very helpful and can be rendered in a DIFF view. In that case, this function
+// will be called with a true value to enable the JSON serialization. By default,
+// the assertions in this package will not serializer a JSON result, making
+// standalone ussage more convenient.
+func GoConveyMode(yes bool) {
+	if yes {
+		serializer = newSerializer()
+	} else {
+		serializer = new(noopSerializer)
+	}
+}
+
+type testingT interface {
+	Error(args ...interface{})
+}
+
+type Assertion struct {
+	t      testingT
+	failed bool
+}
+
+// New swallows the *testing.T struct and prints failed assertions using t.Error.
+// Example: assertions.New(t).So(1, should.Equal, 1)
+func New(t testingT) *Assertion {
+	return &Assertion{t: t}
+}
+
+// Failed reports whether any calls to So (on this Assertion instance) have failed.
+func (this *Assertion) Failed() bool {
+	return this.failed
+}
+
+// So calls the standalone So function and additionally, calls t.Error in failure scenarios.
+func (this *Assertion) So(actual interface{}, assert assertion, expected ...interface{}) bool {
+	ok, result := So(actual, assert, expected...)
+	if !ok {
+		this.failed = true
+		_, file, line, _ := runtime.Caller(1)
+		this.t.Error(fmt.Sprintf("\n%s:%d\n%s", file, line, result))
+	}
+	return ok
+}
+
+// So is a convenience function (as opposed to an inconvenience function?)
+// for running assertions on arbitrary arguments in any context, be it for testing or even
+// application logging. It allows you to perform assertion-like behavior (and get nicely
+// formatted messages detailing discrepancies) but without the program blowing up or panicking.
+// All that is required is to import this package and call `So` with one of the assertions
+// exported by this package as the second parameter.
+// The first return parameter is a boolean indicating if the assertion was true. The second
+// return parameter is the well-formatted message showing why an assertion was incorrect, or
+// blank if the assertion was correct.
+//
+// Example:
+//
+//   if ok, message := So(x, ShouldBeGreaterThan, y); !ok {
+//        log.Println(message)
+//   }
+//
+func So(actual interface{}, assert assertion, expected ...interface{}) (bool, string) {
+	if result := so(actual, assert, expected...); len(result) == 0 {
+		return true, result
+	} else {
+		return false, result
+	}
+}
+
+// so is like So, except that it only returns the string message, which is blank if the
+// assertion passed. Used to facilitate testing.
+func so(actual interface{}, assert func(interface{}, ...interface{}) string, expected ...interface{}) string {
+	return assert(actual, expected...)
+}
+
+// assertion is an alias for a function with a signature that the So()
+// function can handle. Any future or custom assertions should conform to this
+// method signature. The return value should be an empty string if the assertion
+// passes and a well-formed failure message if not.
+type assertion func(actual interface{}, expected ...interface{}) string
+
+////////////////////////////////////////////////////////////////////////////
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go
new file mode 100644
index 0000000000..2b6049c37d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go
@@ -0,0 +1,280 @@
+package assertions
+
+import (
+	"errors"
+	"fmt"
+	"math"
+	"reflect"
+	"strings"
+
+	"github.com/smartystreets/assertions/internal/oglematchers"
+	"github.com/smartystreets/assertions/internal/go-render/render"
+)
+
+// default acceptable delta for ShouldAlmostEqual
+const defaultDelta = 0.0000000001
+
+// ShouldEqual receives exactly two parameters and does an equality check.
+func ShouldEqual(actual interface{}, expected ...interface{}) string {
+	if message := need(1, expected); message != success {
+		return message
+	}
+	return shouldEqual(actual, expected[0])
+}
+func shouldEqual(actual, expected interface{}) (message string) {
+	defer func() {
+		if r := recover(); r != nil {
+			message = serializer.serialize(expected, actual, fmt.Sprintf(shouldHaveBeenEqual, expected, actual))
+			return
+		}
+	}()
+
+	if matchError := oglematchers.Equals(expected).Matches(actual); matchError != nil {
+		expectedSyntax := fmt.Sprintf("%v", expected)
+		actualSyntax := fmt.Sprintf("%v", actual)
+		if expectedSyntax == actualSyntax && reflect.TypeOf(expected) != reflect.TypeOf(actual) {
+			message = fmt.Sprintf(shouldHaveBeenEqualTypeMismatch, expected, expected, actual, actual)
+		} else {
+			message = fmt.Sprintf(shouldHaveBeenEqual, expected, actual)
+		}
+		message = serializer.serialize(expected, actual, message)
+		return
+	}
+
+	return success
+}
+
+// ShouldNotEqual receives exactly two parameters and does an inequality check.
+func ShouldNotEqual(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	} else if ShouldEqual(actual, expected[0]) == success {
+		return fmt.Sprintf(shouldNotHaveBeenEqual, actual, expected[0])
+	}
+	return success
+}
+
+// ShouldAlmostEqual makes sure that two parameters are close enough to being equal.
+// The acceptable delta may be specified with a third argument,
+// or a very small default delta will be used.
+func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string {
+	actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...)
+
+	if err != "" {
+		return err
+	}
+
+	if math.Abs(actualFloat-expectedFloat) <= deltaFloat {
+		return success
+	} else {
+		return fmt.Sprintf(shouldHaveBeenAlmostEqual, actualFloat, expectedFloat)
+	}
+}
+
+// ShouldNotAlmostEqual is the inverse of ShouldAlmostEqual
+func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string {
+	actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...)
+
+	if err != "" {
+		return err
+	}
+
+	if math.Abs(actualFloat-expectedFloat) > deltaFloat {
+		return success
+	} else {
+		return fmt.Sprintf(shouldHaveNotBeenAlmostEqual, actualFloat, expectedFloat)
+	}
+}
+
+func cleanAlmostEqualInput(actual interface{}, expected ...interface{}) (float64, float64, float64, string) {
+	deltaFloat := 0.0000000001
+
+	if len(expected) == 0 {
+		return 0.0, 0.0, 0.0, "This assertion requires exactly one comparison value and an optional delta (you provided neither)"
+	} else if len(expected) == 2 {
+		delta, err := getFloat(expected[1])
+
+		if err != nil {
+			return 0.0, 0.0, 0.0, "delta must be a numerical type"
+		}
+
+		deltaFloat = delta
+	} else if len(expected) > 2 {
+		return 0.0, 0.0, 0.0, "This assertion requires exactly one comparison value and an optional delta (you provided more values)"
+	}
+
+	actualFloat, err := getFloat(actual)
+
+	if err != nil {
+		return 0.0, 0.0, 0.0, err.Error()
+	}
+
+	expectedFloat, err := getFloat(expected[0])
+
+	if err != nil {
+		return 0.0, 0.0, 0.0, err.Error()
+	}
+
+	return actualFloat, expectedFloat, deltaFloat, ""
+}
+
+// returns the float value of any real number, or error if it is not a numerical type
+func getFloat(num interface{}) (float64, error) {
+	numValue := reflect.ValueOf(num)
+	numKind := numValue.Kind()
+
+	if numKind == reflect.Int ||
+		numKind == reflect.Int8 ||
+		numKind == reflect.Int16 ||
+		numKind == reflect.Int32 ||
+		numKind == reflect.Int64 {
+		return float64(numValue.Int()), nil
+	} else if numKind == reflect.Uint ||
+		numKind == reflect.Uint8 ||
+		numKind == reflect.Uint16 ||
+		numKind == reflect.Uint32 ||
+		numKind == reflect.Uint64 {
+		return float64(numValue.Uint()), nil
+	} else if numKind == reflect.Float32 ||
+		numKind == reflect.Float64 {
+		return numValue.Float(), nil
+	} else {
+		return 0.0, errors.New("must be a numerical type, but was " + numKind.String())
+	}
+}
+
+// ShouldResemble receives exactly two parameters and does a deep equal check (see reflect.DeepEqual)
+func ShouldResemble(actual interface{}, expected ...interface{}) string {
+	if message := need(1, expected); message != success {
+		return message
+	}
+
+	if matchError := oglematchers.DeepEquals(expected[0]).Matches(actual); matchError != nil {
+		return serializer.serializeDetailed(expected[0], actual,
+			fmt.Sprintf(shouldHaveResembled, render.Render(expected[0]), render.Render(actual)))
+	}
+
+	return success
+}
+
+// ShouldNotResemble receives exactly two parameters and does an inverse deep equal check (see reflect.DeepEqual)
+func ShouldNotResemble(actual interface{}, expected ...interface{}) string {
+	if message := need(1, expected); message != success {
+		return message
+	} else if ShouldResemble(actual, expected[0]) == success {
+		return fmt.Sprintf(shouldNotHaveResembled, render.Render(actual), render.Render(expected[0]))
+	}
+	return success
+}
+
+// ShouldPointTo receives exactly two parameters and checks to see that they point to the same address.
+func ShouldPointTo(actual interface{}, expected ...interface{}) string {
+	if message := need(1, expected); message != success {
+		return message
+	}
+	return shouldPointTo(actual, expected[0])
+
+}
+func shouldPointTo(actual, expected interface{}) string {
+	actualValue := reflect.ValueOf(actual)
+	expectedValue := reflect.ValueOf(expected)
+
+	if ShouldNotBeNil(actual) != success {
+		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "first", "nil")
+	} else if ShouldNotBeNil(expected) != success {
+		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "second", "nil")
+	} else if actualValue.Kind() != reflect.Ptr {
+		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "first", "not")
+	} else if expectedValue.Kind() != reflect.Ptr {
+		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "second", "not")
+	} else if ShouldEqual(actualValue.Pointer(), expectedValue.Pointer()) != success {
+		actualAddress := reflect.ValueOf(actual).Pointer()
+		expectedAddress := reflect.ValueOf(expected).Pointer()
+		return serializer.serialize(expectedAddress, actualAddress, fmt.Sprintf(shouldHavePointedTo,
+			actual, actualAddress,
+			expected, expectedAddress))
+	}
+	return success
+}
+
+// ShouldNotPointTo receives exactly two parameters and checks to see that they point to different addresess.
+func ShouldNotPointTo(actual interface{}, expected ...interface{}) string {
+	if message := need(1, expected); message != success {
+		return message
+	}
+	compare := ShouldPointTo(actual, expected[0])
+	if strings.HasPrefix(compare, shouldBePointers) {
+		return compare
+	} else if compare == success {
+		return fmt.Sprintf(shouldNotHavePointedTo, actual, expected[0], reflect.ValueOf(actual).Pointer())
+	}
+	return success
+}
+
+// ShouldBeNil receives a single parameter and ensures that it is nil.
+func ShouldBeNil(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	} else if actual == nil {
+		return success
+	} else if interfaceHasNilValue(actual) {
+		return success
+	}
+	return fmt.Sprintf(shouldHaveBeenNil, actual)
+}
+func interfaceHasNilValue(actual interface{}) bool {
+	value := reflect.ValueOf(actual)
+	kind := value.Kind()
+	nilable := kind == reflect.Slice ||
+		kind == reflect.Chan ||
+		kind == reflect.Func ||
+		kind == reflect.Ptr ||
+		kind == reflect.Map
+
+	// Careful: reflect.Value.IsNil() will panic unless it's an interface, chan, map, func, slice, or ptr
+	// Reference: http://golang.org/pkg/reflect/#Value.IsNil
+	return nilable && value.IsNil()
+}
+
+// ShouldNotBeNil receives a single parameter and ensures that it is not nil.
+func ShouldNotBeNil(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	} else if ShouldBeNil(actual) == success {
+		return fmt.Sprintf(shouldNotHaveBeenNil, actual)
+	}
+	return success
+}
+
+// ShouldBeTrue receives a single parameter and ensures that it is true.
+func ShouldBeTrue(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	} else if actual != true {
+		return fmt.Sprintf(shouldHaveBeenTrue, actual)
+	}
+	return success
+}
+
+// ShouldBeFalse receives a single parameter and ensures that it is false.
+func ShouldBeFalse(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	} else if actual != false {
+		return fmt.Sprintf(shouldHaveBeenFalse, actual)
+	}
+	return success
+}
+
+// ShouldBeZeroValue receives a single parameter and ensures that it is
+// the Go equivalent of the default value, or "zero" value.
+func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	}
+	zeroVal := reflect.Zero(reflect.TypeOf(actual)).Interface()
+	if !reflect.DeepEqual(zeroVal, actual) {
+		return serializer.serialize(zeroVal, actual, fmt.Sprintf(shouldHaveBeenZeroValue, actual))
+	}
+	return success
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go
new file mode 100644
index 0000000000..ee368a97ed
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go
@@ -0,0 +1,23 @@
+package assertions
+
+import "fmt"
+
+const (
+	success                = ""
+	needExactValues        = "This assertion requires exactly %d comparison values (you provided %d)."
+	needNonEmptyCollection = "This assertion requires at least 1 comparison value (you provided 0)."
+)
+
+func need(needed int, expected []interface{}) string {
+	if len(expected) != needed {
+		return fmt.Sprintf(needExactValues, needed, len(expected))
+	}
+	return success
+}
+
+func atLeast(minimum int, expected []interface{}) string {
+	if len(expected) < 1 {
+		return needNonEmptyCollection
+	}
+	return success
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go
new file mode 100644
index 0000000000..23b7a58676
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go
@@ -0,0 +1,477 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package render
+
+import (
+	"bytes"
+	"fmt"
+	"reflect"
+	"sort"
+	"strconv"
+)
+
+var builtinTypeMap = map[reflect.Kind]string{
+	reflect.Bool:       "bool",
+	reflect.Complex128: "complex128",
+	reflect.Complex64:  "complex64",
+	reflect.Float32:    "float32",
+	reflect.Float64:    "float64",
+	reflect.Int16:      "int16",
+	reflect.Int32:      "int32",
+	reflect.Int64:      "int64",
+	reflect.Int8:       "int8",
+	reflect.Int:        "int",
+	reflect.String:     "string",
+	reflect.Uint16:     "uint16",
+	reflect.Uint32:     "uint32",
+	reflect.Uint64:     "uint64",
+	reflect.Uint8:      "uint8",
+	reflect.Uint:       "uint",
+	reflect.Uintptr:    "uintptr",
+}
+
+var builtinTypeSet = map[string]struct{}{}
+
+func init() {
+	for _, v := range builtinTypeMap {
+		builtinTypeSet[v] = struct{}{}
+	}
+}
+
+var typeOfString = reflect.TypeOf("")
+var typeOfInt = reflect.TypeOf(int(1))
+var typeOfUint = reflect.TypeOf(uint(1))
+var typeOfFloat = reflect.TypeOf(10.1)
+
+// Render converts a structure to a string representation. Unline the "%#v"
+// format string, this resolves pointer types' contents in structs, maps, and
+// slices/arrays and prints their field values.
+func Render(v interface{}) string {
+	buf := bytes.Buffer{}
+	s := (*traverseState)(nil)
+	s.render(&buf, 0, reflect.ValueOf(v), false)
+	return buf.String()
+}
+
+// renderPointer is called to render a pointer value.
+//
+// This is overridable so that the test suite can have deterministic pointer
+// values in its expectations.
+var renderPointer = func(buf *bytes.Buffer, p uintptr) {
+	fmt.Fprintf(buf, "0x%016x", p)
+}
+
+// traverseState is used to note and avoid recursion as struct members are being
+// traversed.
+//
+// traverseState is allowed to be nil. Specifically, the root state is nil.
+type traverseState struct {
+	parent *traverseState
+	ptr    uintptr
+}
+
+func (s *traverseState) forkFor(ptr uintptr) *traverseState {
+	for cur := s; cur != nil; cur = cur.parent {
+		if ptr == cur.ptr {
+			return nil
+		}
+	}
+
+	fs := &traverseState{
+		parent: s,
+		ptr:    ptr,
+	}
+	return fs
+}
+
+func (s *traverseState) render(buf *bytes.Buffer, ptrs int, v reflect.Value, implicit bool) {
+	if v.Kind() == reflect.Invalid {
+		buf.WriteString("nil")
+		return
+	}
+	vt := v.Type()
+
+	// If the type being rendered is a potentially recursive type (a type that
+	// can contain itself as a member), we need to avoid recursion.
+	//
+	// If we've already seen this type before, mark that this is the case and
+	// write a recursion placeholder instead of actually rendering it.
+	//
+	// If we haven't seen it before, fork our `seen` tracking so any higher-up
+	// renderers will also render it at least once, then mark that we've seen it
+	// to avoid recursing on lower layers.
+	pe := uintptr(0)
+	vk := vt.Kind()
+	switch vk {
+	case reflect.Ptr:
+		// Since structs and arrays aren't pointers, they can't directly be
+		// recursed, but they can contain pointers to themselves. Record their
+		// pointer to avoid this.
+		switch v.Elem().Kind() {
+		case reflect.Struct, reflect.Array:
+			pe = v.Pointer()
+		}
+
+	case reflect.Slice, reflect.Map:
+		pe = v.Pointer()
+	}
+	if pe != 0 {
+		s = s.forkFor(pe)
+		if s == nil {
+			buf.WriteString("<REC(")
+			if !implicit {
+				writeType(buf, ptrs, vt)
+			}
+			buf.WriteString(")>")
+			return
+		}
+	}
+
+	isAnon := func(t reflect.Type) bool {
+		if t.Name() != "" {
+			if _, ok := builtinTypeSet[t.Name()]; !ok {
+				return false
+			}
+		}
+		return t.Kind() != reflect.Interface
+	}
+
+	switch vk {
+	case reflect.Struct:
+		if !implicit {
+			writeType(buf, ptrs, vt)
+		}
+		structAnon := vt.Name() == ""
+		buf.WriteRune('{')
+		for i := 0; i < vt.NumField(); i++ {
+			if i > 0 {
+				buf.WriteString(", ")
+			}
+			anon := structAnon && isAnon(vt.Field(i).Type)
+
+			if !anon {
+				buf.WriteString(vt.Field(i).Name)
+				buf.WriteRune(':')
+			}
+
+			s.render(buf, 0, v.Field(i), anon)
+		}
+		buf.WriteRune('}')
+
+	case reflect.Slice:
+		if v.IsNil() {
+			if !implicit {
+				writeType(buf, ptrs, vt)
+				buf.WriteString("(nil)")
+			} else {
+				buf.WriteString("nil")
+			}
+			return
+		}
+		fallthrough
+
+	case reflect.Array:
+		if !implicit {
+			writeType(buf, ptrs, vt)
+		}
+		anon := vt.Name() == "" && isAnon(vt.Elem())
+		buf.WriteString("{")
+		for i := 0; i < v.Len(); i++ {
+			if i > 0 {
+				buf.WriteString(", ")
+			}
+
+			s.render(buf, 0, v.Index(i), anon)
+		}
+		buf.WriteRune('}')
+
+	case reflect.Map:
+		if !implicit {
+			writeType(buf, ptrs, vt)
+		}
+		if v.IsNil() {
+			buf.WriteString("(nil)")
+		} else {
+			buf.WriteString("{")
+
+			mkeys := v.MapKeys()
+			tryAndSortMapKeys(vt, mkeys)
+
+			kt := vt.Key()
+			keyAnon := typeOfString.ConvertibleTo(kt) || typeOfInt.ConvertibleTo(kt) || typeOfUint.ConvertibleTo(kt) || typeOfFloat.ConvertibleTo(kt)
+			valAnon := vt.Name() == "" && isAnon(vt.Elem())
+			for i, mk := range mkeys {
+				if i > 0 {
+					buf.WriteString(", ")
+				}
+
+				s.render(buf, 0, mk, keyAnon)
+				buf.WriteString(":")
+				s.render(buf, 0, v.MapIndex(mk), valAnon)
+			}
+			buf.WriteRune('}')
+		}
+
+	case reflect.Ptr:
+		ptrs++
+		fallthrough
+	case reflect.Interface:
+		if v.IsNil() {
+			writeType(buf, ptrs, v.Type())
+			buf.WriteString("(nil)")
+		} else {
+			s.render(buf, ptrs, v.Elem(), false)
+		}
+
+	case reflect.Chan, reflect.Func, reflect.UnsafePointer:
+		writeType(buf, ptrs, vt)
+		buf.WriteRune('(')
+		renderPointer(buf, v.Pointer())
+		buf.WriteRune(')')
+
+	default:
+		tstr := vt.String()
+		implicit = implicit || (ptrs == 0 && builtinTypeMap[vk] == tstr)
+		if !implicit {
+			writeType(buf, ptrs, vt)
+			buf.WriteRune('(')
+		}
+
+		switch vk {
+		case reflect.String:
+			fmt.Fprintf(buf, "%q", v.String())
+		case reflect.Bool:
+			fmt.Fprintf(buf, "%v", v.Bool())
+
+		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			fmt.Fprintf(buf, "%d", v.Int())
+
+		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+			fmt.Fprintf(buf, "%d", v.Uint())
+
+		case reflect.Float32, reflect.Float64:
+			fmt.Fprintf(buf, "%g", v.Float())
+
+		case reflect.Complex64, reflect.Complex128:
+			fmt.Fprintf(buf, "%g", v.Complex())
+		}
+
+		if !implicit {
+			buf.WriteRune(')')
+		}
+	}
+}
+
+func writeType(buf *bytes.Buffer, ptrs int, t reflect.Type) {
+	parens := ptrs > 0
+	switch t.Kind() {
+	case reflect.Chan, reflect.Func, reflect.UnsafePointer:
+		parens = true
+	}
+
+	if parens {
+		buf.WriteRune('(')
+		for i := 0; i < ptrs; i++ {
+			buf.WriteRune('*')
+		}
+	}
+
+	switch t.Kind() {
+	case reflect.Ptr:
+		if ptrs == 0 {
+			// This pointer was referenced from within writeType (e.g., as part of
+			// rendering a list), and so hasn't had its pointer asterisk accounted
+			// for.
+			buf.WriteRune('*')
+		}
+		writeType(buf, 0, t.Elem())
+
+	case reflect.Interface:
+		if n := t.Name(); n != "" {
+			buf.WriteString(t.String())
+		} else {
+			buf.WriteString("interface{}")
+		}
+
+	case reflect.Array:
+		buf.WriteRune('[')
+		buf.WriteString(strconv.FormatInt(int64(t.Len()), 10))
+		buf.WriteRune(']')
+		writeType(buf, 0, t.Elem())
+
+	case reflect.Slice:
+		if t == reflect.SliceOf(t.Elem()) {
+			buf.WriteString("[]")
+			writeType(buf, 0, t.Elem())
+		} else {
+			// Custom slice type, use type name.
+			buf.WriteString(t.String())
+		}
+
+	case reflect.Map:
+		if t == reflect.MapOf(t.Key(), t.Elem()) {
+			buf.WriteString("map[")
+			writeType(buf, 0, t.Key())
+			buf.WriteRune(']')
+			writeType(buf, 0, t.Elem())
+		} else {
+			// Custom map type, use type name.
+			buf.WriteString(t.String())
+		}
+
+	default:
+		buf.WriteString(t.String())
+	}
+
+	if parens {
+		buf.WriteRune(')')
+	}
+}
+
+type cmpFn func(a, b reflect.Value) int
+
+type sortableValueSlice struct {
+	cmp      cmpFn
+	elements []reflect.Value
+}
+
+func (s sortableValueSlice) Len() int {
+	return len(s.elements)
+}
+
+func (s sortableValueSlice) Less(i, j int) bool {
+	return s.cmp(s.elements[i], s.elements[j]) < 0
+}
+
+func (s sortableValueSlice) Swap(i, j int) {
+	s.elements[i], s.elements[j] = s.elements[j], s.elements[i]
+}
+
+// cmpForType returns a cmpFn which sorts the data for some type t in the same
+// order that a go-native map key is compared for equality.
+func cmpForType(t reflect.Type) cmpFn {
+	switch t.Kind() {
+	case reflect.String:
+		return func(av, bv reflect.Value) int {
+			a, b := av.String(), bv.String()
+			if a < b {
+				return -1
+			} else if a > b {
+				return 1
+			}
+			return 0
+		}
+
+	case reflect.Bool:
+		return func(av, bv reflect.Value) int {
+			a, b := av.Bool(), bv.Bool()
+			if !a && b {
+				return -1
+			} else if a && !b {
+				return 1
+			}
+			return 0
+		}
+
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return func(av, bv reflect.Value) int {
+			a, b := av.Int(), bv.Int()
+			if a < b {
+				return -1
+			} else if a > b {
+				return 1
+			}
+			return 0
+		}
+
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32,
+		reflect.Uint64, reflect.Uintptr, reflect.UnsafePointer:
+		return func(av, bv reflect.Value) int {
+			a, b := av.Uint(), bv.Uint()
+			if a < b {
+				return -1
+			} else if a > b {
+				return 1
+			}
+			return 0
+		}
+
+	case reflect.Float32, reflect.Float64:
+		return func(av, bv reflect.Value) int {
+			a, b := av.Float(), bv.Float()
+			if a < b {
+				return -1
+			} else if a > b {
+				return 1
+			}
+			return 0
+		}
+
+	case reflect.Interface:
+		return func(av, bv reflect.Value) int {
+			a, b := av.InterfaceData(), bv.InterfaceData()
+			if a[0] < b[0] {
+				return -1
+			} else if a[0] > b[0] {
+				return 1
+			}
+			if a[1] < b[1] {
+				return -1
+			} else if a[1] > b[1] {
+				return 1
+			}
+			return 0
+		}
+
+	case reflect.Complex64, reflect.Complex128:
+		return func(av, bv reflect.Value) int {
+			a, b := av.Complex(), bv.Complex()
+			if real(a) < real(b) {
+				return -1
+			} else if real(a) > real(b) {
+				return 1
+			}
+			if imag(a) < imag(b) {
+				return -1
+			} else if imag(a) > imag(b) {
+				return 1
+			}
+			return 0
+		}
+
+	case reflect.Ptr, reflect.Chan:
+		return func(av, bv reflect.Value) int {
+			a, b := av.Pointer(), bv.Pointer()
+			if a < b {
+				return -1
+			} else if a > b {
+				return 1
+			}
+			return 0
+		}
+
+	case reflect.Struct:
+		cmpLst := make([]cmpFn, t.NumField())
+		for i := range cmpLst {
+			cmpLst[i] = cmpForType(t.Field(i).Type)
+		}
+		return func(a, b reflect.Value) int {
+			for i, cmp := range cmpLst {
+				if rslt := cmp(a.Field(i), b.Field(i)); rslt != 0 {
+					return rslt
+				}
+			}
+			return 0
+		}
+	}
+
+	return nil
+}
+
+func tryAndSortMapKeys(mt reflect.Type, k []reflect.Value) {
+	if cmp := cmpForType(mt.Key()); cmp != nil {
+		sort.Sort(sortableValueSlice{cmp, k})
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore
new file mode 100644
index 0000000000..dd8fc7468f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore
@@ -0,0 +1,5 @@
+*.6
+6.out
+_obj/
+_test/
+_testmain.go
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml
new file mode 100644
index 0000000000..b97211926e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml
@@ -0,0 +1,4 @@
+# Cf. http://docs.travis-ci.com/user/getting-started/
+# Cf. http://docs.travis-ci.com/user/languages/go/
+
+language: go
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md
new file mode 100644
index 0000000000..215a2bb7a8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md
@@ -0,0 +1,58 @@
+[![GoDoc](https://godoc.org/github.com/smartystreets/assertions/internal/oglematchers?status.svg)](https://godoc.org/github.com/smartystreets/assertions/internal/oglematchers)
+
+`oglematchers` is a package for the Go programming language containing a set of
+matchers, useful in a testing or mocking framework, inspired by and mostly
+compatible with [Google Test][googletest] for C++ and
+[Google JS Test][google-js-test]. The package is used by the
+[ogletest][ogletest] testing framework and [oglemock][oglemock] mocking
+framework, which may be more directly useful to you, but can be generically used
+elsewhere as well.
+
+A "matcher" is simply an object with a `Matches` method defining a set of golang
+values matched by the matcher, and a `Description` method describing that set.
+For example, here are some matchers:
+
+```go
+// Numbers
+Equals(17.13)
+LessThan(19)
+
+// Strings
+Equals("taco")
+HasSubstr("burrito")
+MatchesRegex("t.*o")
+
+// Combining matchers
+AnyOf(LessThan(17), GreaterThan(19))
+```
+
+There are lots more; see [here][reference] for a reference. You can also add
+your own simply by implementing the `oglematchers.Matcher` interface.
+
+
+Installation
+------------
+
+First, make sure you have installed Go 1.0.2 or newer. See
+[here][golang-install] for instructions.
+
+Use the following command to install `oglematchers` and keep it up to date:
+
+    go get -u github.com/smartystreets/assertions/internal/oglematchers
+
+
+Documentation
+-------------
+
+See [here][reference] for documentation. Alternatively, you can install the
+package and then use `godoc`:
+
+    godoc github.com/smartystreets/assertions/internal/oglematchers
+
+
+[reference]: http://godoc.org/github.com/smartystreets/assertions/internal/oglematchers
+[golang-install]: http://golang.org/doc/install.html
+[googletest]: http://code.google.com/p/googletest/
+[google-js-test]: http://code.google.com/p/google-js-test/
+[ogletest]: http://github.com/smartystreets/assertions/internal/ogletest
+[oglemock]: http://github.com/smartystreets/assertions/internal/oglemock
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go
new file mode 100644
index 0000000000..d93a974044
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go
@@ -0,0 +1,70 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"strings"
+)
+
+// AllOf accepts a set of matchers S and returns a matcher that follows the
+// algorithm below when considering a candidate c:
+//
+//  1. Return true if for every Matcher m in S, m matches c.
+//
+//  2. Otherwise, if there is a matcher m in S such that m returns a fatal
+//     error for c, return that matcher's error message.
+//
+//  3. Otherwise, return false with the error from some wrapped matcher.
+//
+// This is akin to a logical AND operation for matchers.
+func AllOf(matchers ...Matcher) Matcher {
+	return &allOfMatcher{matchers}
+}
+
+type allOfMatcher struct {
+	wrappedMatchers []Matcher
+}
+
+func (m *allOfMatcher) Description() string {
+	// Special case: the empty set.
+	if len(m.wrappedMatchers) == 0 {
+		return "is anything"
+	}
+
+	// Join the descriptions for the wrapped matchers.
+	wrappedDescs := make([]string, len(m.wrappedMatchers))
+	for i, wrappedMatcher := range m.wrappedMatchers {
+		wrappedDescs[i] = wrappedMatcher.Description()
+	}
+
+	return strings.Join(wrappedDescs, ", and ")
+}
+
+func (m *allOfMatcher) Matches(c interface{}) (err error) {
+	for _, wrappedMatcher := range m.wrappedMatchers {
+		if wrappedErr := wrappedMatcher.Matches(c); wrappedErr != nil {
+			err = wrappedErr
+
+			// If the error is fatal, return immediately with this error.
+			_, ok := wrappedErr.(*FatalError)
+			if ok {
+				return
+			}
+		}
+	}
+
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go
new file mode 100644
index 0000000000..f6991ec102
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go
@@ -0,0 +1,32 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+// Any returns a matcher that matches any value.
+func Any() Matcher {
+	return &anyMatcher{}
+}
+
+type anyMatcher struct {
+}
+
+func (m *anyMatcher) Description() string {
+	return "is anything"
+}
+
+func (m *anyMatcher) Matches(c interface{}) error {
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go
new file mode 100644
index 0000000000..2918b51f21
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go
@@ -0,0 +1,94 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// AnyOf accepts a set of values S and returns a matcher that follows the
+// algorithm below when considering a candidate c:
+//
+//  1. If there exists a value m in S such that m implements the Matcher
+//     interface and m matches c, return true.
+//
+//  2. Otherwise, if there exists a value v in S such that v does not implement
+//     the Matcher interface and the matcher Equals(v) matches c, return true.
+//
+//  3. Otherwise, if there is a value m in S such that m implements the Matcher
+//     interface and m returns a fatal error for c, return that fatal error.
+//
+//  4. Otherwise, return false.
+//
+// This is akin to a logical OR operation for matchers, with non-matchers x
+// being treated as Equals(x).
+func AnyOf(vals ...interface{}) Matcher {
+	// Get ahold of a type variable for the Matcher interface.
+	var dummy *Matcher
+	matcherType := reflect.TypeOf(dummy).Elem()
+
+	// Create a matcher for each value, or use the value itself if it's already a
+	// matcher.
+	wrapped := make([]Matcher, len(vals))
+	for i, v := range vals {
+		t := reflect.TypeOf(v)
+		if t != nil && t.Implements(matcherType) {
+			wrapped[i] = v.(Matcher)
+		} else {
+			wrapped[i] = Equals(v)
+		}
+	}
+
+	return &anyOfMatcher{wrapped}
+}
+
+type anyOfMatcher struct {
+	wrapped []Matcher
+}
+
+func (m *anyOfMatcher) Description() string {
+	wrappedDescs := make([]string, len(m.wrapped))
+	for i, matcher := range m.wrapped {
+		wrappedDescs[i] = matcher.Description()
+	}
+
+	return fmt.Sprintf("or(%s)", strings.Join(wrappedDescs, ", "))
+}
+
+func (m *anyOfMatcher) Matches(c interface{}) (err error) {
+	err = errors.New("")
+
+	// Try each matcher in turn.
+	for _, matcher := range m.wrapped {
+		wrappedErr := matcher.Matches(c)
+
+		// Return immediately if there's a match.
+		if wrappedErr == nil {
+			err = nil
+			return
+		}
+
+		// Note the fatal error, if any.
+		if _, isFatal := wrappedErr.(*FatalError); isFatal {
+			err = wrappedErr
+		}
+	}
+
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go
new file mode 100644
index 0000000000..87f107d392
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go
@@ -0,0 +1,61 @@
+// Copyright 2012 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// Return a matcher that matches arrays slices with at least one element that
+// matches the supplied argument. If the argument x is not itself a Matcher,
+// this is equivalent to Contains(Equals(x)).
+func Contains(x interface{}) Matcher {
+	var result containsMatcher
+	var ok bool
+
+	if result.elementMatcher, ok = x.(Matcher); !ok {
+		result.elementMatcher = DeepEquals(x)
+	}
+
+	return &result
+}
+
+type containsMatcher struct {
+	elementMatcher Matcher
+}
+
+func (m *containsMatcher) Description() string {
+	return fmt.Sprintf("contains: %s", m.elementMatcher.Description())
+}
+
+func (m *containsMatcher) Matches(candidate interface{}) error {
+	// The candidate must be a slice or an array.
+	v := reflect.ValueOf(candidate)
+	if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
+		return NewFatalError("which is not a slice or array")
+	}
+
+	// Check each element.
+	for i := 0; i < v.Len(); i++ {
+		elem := v.Index(i)
+		if matchErr := m.elementMatcher.Matches(elem.Interface()); matchErr == nil {
+			return nil
+		}
+	}
+
+	return fmt.Errorf("")
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go
new file mode 100644
index 0000000000..1d91baef32
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go
@@ -0,0 +1,88 @@
+// Copyright 2012 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"reflect"
+)
+
+var byteSliceType reflect.Type = reflect.TypeOf([]byte{})
+
+// DeepEquals returns a matcher that matches based on 'deep equality', as
+// defined by the reflect package. This matcher requires that values have
+// identical types to x.
+func DeepEquals(x interface{}) Matcher {
+	return &deepEqualsMatcher{x}
+}
+
+type deepEqualsMatcher struct {
+	x interface{}
+}
+
+func (m *deepEqualsMatcher) Description() string {
+	xDesc := fmt.Sprintf("%v", m.x)
+	xValue := reflect.ValueOf(m.x)
+
+	// Special case: fmt.Sprintf presents nil slices as "[]", but
+	// reflect.DeepEqual makes a distinction between nil and empty slices. Make
+	// this less confusing.
+	if xValue.Kind() == reflect.Slice && xValue.IsNil() {
+		xDesc = "<nil slice>"
+	}
+
+	return fmt.Sprintf("deep equals: %s", xDesc)
+}
+
+func (m *deepEqualsMatcher) Matches(c interface{}) error {
+	// Make sure the types match.
+	ct := reflect.TypeOf(c)
+	xt := reflect.TypeOf(m.x)
+
+	if ct != xt {
+		return NewFatalError(fmt.Sprintf("which is of type %v", ct))
+	}
+
+	// Special case: handle byte slices more efficiently.
+	cValue := reflect.ValueOf(c)
+	xValue := reflect.ValueOf(m.x)
+
+	if ct == byteSliceType && !cValue.IsNil() && !xValue.IsNil() {
+		xBytes := m.x.([]byte)
+		cBytes := c.([]byte)
+
+		if bytes.Equal(cBytes, xBytes) {
+			return nil
+		}
+
+		return errors.New("")
+	}
+
+	// Defer to the reflect package.
+	if reflect.DeepEqual(m.x, c) {
+		return nil
+	}
+
+	// Special case: if the comparison failed because c is the nil slice, given
+	// an indication of this (since its value is printed as "[]").
+	if cValue.Kind() == reflect.Slice && cValue.IsNil() {
+		return errors.New("which is nil")
+	}
+
+	return errors.New("")
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go
new file mode 100644
index 0000000000..2941847c70
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go
@@ -0,0 +1,91 @@
+// Copyright 2012 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// Given a list of arguments M, ElementsAre returns a matcher that matches
+// arrays and slices A where all of the following hold:
+//
+//  *  A is the same length as M.
+//
+//  *  For each i < len(A) where M[i] is a matcher, A[i] matches M[i].
+//
+//  *  For each i < len(A) where M[i] is not a matcher, A[i] matches
+//     Equals(M[i]).
+//
+func ElementsAre(M ...interface{}) Matcher {
+	// Copy over matchers, or convert to Equals(x) for non-matcher x.
+	subMatchers := make([]Matcher, len(M))
+	for i, x := range M {
+		if matcher, ok := x.(Matcher); ok {
+			subMatchers[i] = matcher
+			continue
+		}
+
+		subMatchers[i] = Equals(x)
+	}
+
+	return &elementsAreMatcher{subMatchers}
+}
+
+type elementsAreMatcher struct {
+	subMatchers []Matcher
+}
+
+func (m *elementsAreMatcher) Description() string {
+	subDescs := make([]string, len(m.subMatchers))
+	for i, sm := range m.subMatchers {
+		subDescs[i] = sm.Description()
+	}
+
+	return fmt.Sprintf("elements are: [%s]", strings.Join(subDescs, ", "))
+}
+
+func (m *elementsAreMatcher) Matches(candidates interface{}) error {
+	// The candidate must be a slice or an array.
+	v := reflect.ValueOf(candidates)
+	if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
+		return NewFatalError("which is not a slice or array")
+	}
+
+	// The length must be correct.
+	if v.Len() != len(m.subMatchers) {
+		return errors.New(fmt.Sprintf("which is of length %d", v.Len()))
+	}
+
+	// Check each element.
+	for i, subMatcher := range m.subMatchers {
+		c := v.Index(i)
+		if matchErr := subMatcher.Matches(c.Interface()); matchErr != nil {
+			// Return an errors indicating which element doesn't match. If the
+			// matcher error was fatal, make this one fatal too.
+			err := errors.New(fmt.Sprintf("whose element %d doesn't match", i))
+			if _, isFatal := matchErr.(*FatalError); isFatal {
+				err = NewFatalError(err.Error())
+			}
+
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go
new file mode 100644
index 0000000000..a510707b3c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go
@@ -0,0 +1,541 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+	"math"
+	"reflect"
+)
+
+// Equals(x) returns a matcher that matches values v such that v and x are
+// equivalent. This includes the case when the comparison v == x using Go's
+// built-in comparison operator is legal (except for structs, which this
+// matcher does not support), but for convenience the following rules also
+// apply:
+//
+//  *  Type checking is done based on underlying types rather than actual
+//     types, so that e.g. two aliases for string can be compared:
+//
+//         type stringAlias1 string
+//         type stringAlias2 string
+//
+//         a := "taco"
+//         b := stringAlias1("taco")
+//         c := stringAlias2("taco")
+//
+//         ExpectTrue(a == b)  // Legal, passes
+//         ExpectTrue(b == c)  // Illegal, doesn't compile
+//
+//         ExpectThat(a, Equals(b))  // Passes
+//         ExpectThat(b, Equals(c))  // Passes
+//
+//  *  Values of numeric type are treated as if they were abstract numbers, and
+//     compared accordingly. Therefore Equals(17) will match int(17),
+//     int16(17), uint(17), float32(17), complex64(17), and so on.
+//
+// If you want a stricter matcher that contains no such cleverness, see
+// IdenticalTo instead.
+//
+// Arrays are supported by this matcher, but do not participate in the
+// exceptions above. Two arrays compared with this matcher must have identical
+// types, and their element type must itself be comparable according to Go's ==
+// operator.
+func Equals(x interface{}) Matcher {
+	v := reflect.ValueOf(x)
+
+	// This matcher doesn't support structs.
+	if v.Kind() == reflect.Struct {
+		panic(fmt.Sprintf("oglematchers.Equals: unsupported kind %v", v.Kind()))
+	}
+
+	// The == operator is not defined for non-nil slices.
+	if v.Kind() == reflect.Slice && v.Pointer() != uintptr(0) {
+		panic(fmt.Sprintf("oglematchers.Equals: non-nil slice"))
+	}
+
+	return &equalsMatcher{v}
+}
+
+type equalsMatcher struct {
+	expectedValue reflect.Value
+}
+
+////////////////////////////////////////////////////////////////////////
+// Numeric types
+////////////////////////////////////////////////////////////////////////
+
+func isSignedInteger(v reflect.Value) bool {
+	k := v.Kind()
+	return k >= reflect.Int && k <= reflect.Int64
+}
+
+func isUnsignedInteger(v reflect.Value) bool {
+	k := v.Kind()
+	return k >= reflect.Uint && k <= reflect.Uintptr
+}
+
+func isInteger(v reflect.Value) bool {
+	return isSignedInteger(v) || isUnsignedInteger(v)
+}
+
+func isFloat(v reflect.Value) bool {
+	k := v.Kind()
+	return k == reflect.Float32 || k == reflect.Float64
+}
+
+func isComplex(v reflect.Value) bool {
+	k := v.Kind()
+	return k == reflect.Complex64 || k == reflect.Complex128
+}
+
+func checkAgainstInt64(e int64, c reflect.Value) (err error) {
+	err = errors.New("")
+
+	switch {
+	case isSignedInteger(c):
+		if c.Int() == e {
+			err = nil
+		}
+
+	case isUnsignedInteger(c):
+		u := c.Uint()
+		if u <= math.MaxInt64 && int64(u) == e {
+			err = nil
+		}
+
+	// Turn around the various floating point types so that the checkAgainst*
+	// functions for them can deal with precision issues.
+	case isFloat(c), isComplex(c):
+		return Equals(c.Interface()).Matches(e)
+
+	default:
+		err = NewFatalError("which is not numeric")
+	}
+
+	return
+}
+
+func checkAgainstUint64(e uint64, c reflect.Value) (err error) {
+	err = errors.New("")
+
+	switch {
+	case isSignedInteger(c):
+		i := c.Int()
+		if i >= 0 && uint64(i) == e {
+			err = nil
+		}
+
+	case isUnsignedInteger(c):
+		if c.Uint() == e {
+			err = nil
+		}
+
+	// Turn around the various floating point types so that the checkAgainst*
+	// functions for them can deal with precision issues.
+	case isFloat(c), isComplex(c):
+		return Equals(c.Interface()).Matches(e)
+
+	default:
+		err = NewFatalError("which is not numeric")
+	}
+
+	return
+}
+
+func checkAgainstFloat32(e float32, c reflect.Value) (err error) {
+	err = errors.New("")
+
+	switch {
+	case isSignedInteger(c):
+		if float32(c.Int()) == e {
+			err = nil
+		}
+
+	case isUnsignedInteger(c):
+		if float32(c.Uint()) == e {
+			err = nil
+		}
+
+	case isFloat(c):
+		// Compare using float32 to avoid a false sense of precision; otherwise
+		// e.g. Equals(float32(0.1)) won't match float32(0.1).
+		if float32(c.Float()) == e {
+			err = nil
+		}
+
+	case isComplex(c):
+		comp := c.Complex()
+		rl := real(comp)
+		im := imag(comp)
+
+		// Compare using float32 to avoid a false sense of precision; otherwise
+		// e.g. Equals(float32(0.1)) won't match (0.1 + 0i).
+		if im == 0 && float32(rl) == e {
+			err = nil
+		}
+
+	default:
+		err = NewFatalError("which is not numeric")
+	}
+
+	return
+}
+
+func checkAgainstFloat64(e float64, c reflect.Value) (err error) {
+	err = errors.New("")
+
+	ck := c.Kind()
+
+	switch {
+	case isSignedInteger(c):
+		if float64(c.Int()) == e {
+			err = nil
+		}
+
+	case isUnsignedInteger(c):
+		if float64(c.Uint()) == e {
+			err = nil
+		}
+
+	// If the actual value is lower precision, turn the comparison around so we
+	// apply the low-precision rules. Otherwise, e.g. Equals(0.1) may not match
+	// float32(0.1).
+	case ck == reflect.Float32 || ck == reflect.Complex64:
+		return Equals(c.Interface()).Matches(e)
+
+		// Otherwise, compare with double precision.
+	case isFloat(c):
+		if c.Float() == e {
+			err = nil
+		}
+
+	case isComplex(c):
+		comp := c.Complex()
+		rl := real(comp)
+		im := imag(comp)
+
+		if im == 0 && rl == e {
+			err = nil
+		}
+
+	default:
+		err = NewFatalError("which is not numeric")
+	}
+
+	return
+}
+
+func checkAgainstComplex64(e complex64, c reflect.Value) (err error) {
+	err = errors.New("")
+	realPart := real(e)
+	imaginaryPart := imag(e)
+
+	switch {
+	case isInteger(c) || isFloat(c):
+		// If we have no imaginary part, then we should just compare against the
+		// real part. Otherwise, we can't be equal.
+		if imaginaryPart != 0 {
+			return
+		}
+
+		return checkAgainstFloat32(realPart, c)
+
+	case isComplex(c):
+		// Compare using complex64 to avoid a false sense of precision; otherwise
+		// e.g. Equals(0.1 + 0i) won't match float32(0.1).
+		if complex64(c.Complex()) == e {
+			err = nil
+		}
+
+	default:
+		err = NewFatalError("which is not numeric")
+	}
+
+	return
+}
+
+func checkAgainstComplex128(e complex128, c reflect.Value) (err error) {
+	err = errors.New("")
+	realPart := real(e)
+	imaginaryPart := imag(e)
+
+	switch {
+	case isInteger(c) || isFloat(c):
+		// If we have no imaginary part, then we should just compare against the
+		// real part. Otherwise, we can't be equal.
+		if imaginaryPart != 0 {
+			return
+		}
+
+		return checkAgainstFloat64(realPart, c)
+
+	case isComplex(c):
+		if c.Complex() == e {
+			err = nil
+		}
+
+	default:
+		err = NewFatalError("which is not numeric")
+	}
+
+	return
+}
+
+////////////////////////////////////////////////////////////////////////
+// Other types
+////////////////////////////////////////////////////////////////////////
+
+func checkAgainstBool(e bool, c reflect.Value) (err error) {
+	if c.Kind() != reflect.Bool {
+		err = NewFatalError("which is not a bool")
+		return
+	}
+
+	err = errors.New("")
+	if c.Bool() == e {
+		err = nil
+	}
+	return
+}
+
+func checkAgainstChan(e reflect.Value, c reflect.Value) (err error) {
+	// Create a description of e's type, e.g. "chan int".
+	typeStr := fmt.Sprintf("%s %s", e.Type().ChanDir(), e.Type().Elem())
+
+	// Make sure c is a chan of the correct type.
+	if c.Kind() != reflect.Chan ||
+		c.Type().ChanDir() != e.Type().ChanDir() ||
+		c.Type().Elem() != e.Type().Elem() {
+		err = NewFatalError(fmt.Sprintf("which is not a %s", typeStr))
+		return
+	}
+
+	err = errors.New("")
+	if c.Pointer() == e.Pointer() {
+		err = nil
+	}
+	return
+}
+
+func checkAgainstFunc(e reflect.Value, c reflect.Value) (err error) {
+	// Make sure c is a function.
+	if c.Kind() != reflect.Func {
+		err = NewFatalError("which is not a function")
+		return
+	}
+
+	err = errors.New("")
+	if c.Pointer() == e.Pointer() {
+		err = nil
+	}
+	return
+}
+
+func checkAgainstMap(e reflect.Value, c reflect.Value) (err error) {
+	// Make sure c is a map.
+	if c.Kind() != reflect.Map {
+		err = NewFatalError("which is not a map")
+		return
+	}
+
+	err = errors.New("")
+	if c.Pointer() == e.Pointer() {
+		err = nil
+	}
+	return
+}
+
+func checkAgainstPtr(e reflect.Value, c reflect.Value) (err error) {
+	// Create a description of e's type, e.g. "*int".
+	typeStr := fmt.Sprintf("*%v", e.Type().Elem())
+
+	// Make sure c is a pointer of the correct type.
+	if c.Kind() != reflect.Ptr ||
+		c.Type().Elem() != e.Type().Elem() {
+		err = NewFatalError(fmt.Sprintf("which is not a %s", typeStr))
+		return
+	}
+
+	err = errors.New("")
+	if c.Pointer() == e.Pointer() {
+		err = nil
+	}
+	return
+}
+
+func checkAgainstSlice(e reflect.Value, c reflect.Value) (err error) {
+	// Create a description of e's type, e.g. "[]int".
+	typeStr := fmt.Sprintf("[]%v", e.Type().Elem())
+
+	// Make sure c is a slice of the correct type.
+	if c.Kind() != reflect.Slice ||
+		c.Type().Elem() != e.Type().Elem() {
+		err = NewFatalError(fmt.Sprintf("which is not a %s", typeStr))
+		return
+	}
+
+	err = errors.New("")
+	if c.Pointer() == e.Pointer() {
+		err = nil
+	}
+	return
+}
+
+func checkAgainstString(e reflect.Value, c reflect.Value) (err error) {
+	// Make sure c is a string.
+	if c.Kind() != reflect.String {
+		err = NewFatalError("which is not a string")
+		return
+	}
+
+	err = errors.New("")
+	if c.String() == e.String() {
+		err = nil
+	}
+	return
+}
+
+func checkAgainstArray(e reflect.Value, c reflect.Value) (err error) {
+	// Create a description of e's type, e.g. "[2]int".
+	typeStr := fmt.Sprintf("%v", e.Type())
+
+	// Make sure c is the correct type.
+	if c.Type() != e.Type() {
+		err = NewFatalError(fmt.Sprintf("which is not %s", typeStr))
+		return
+	}
+
+	// Check for equality.
+	if e.Interface() != c.Interface() {
+		err = errors.New("")
+		return
+	}
+
+	return
+}
+
+func checkAgainstUnsafePointer(e reflect.Value, c reflect.Value) (err error) {
+	// Make sure c is a pointer.
+	if c.Kind() != reflect.UnsafePointer {
+		err = NewFatalError("which is not a unsafe.Pointer")
+		return
+	}
+
+	err = errors.New("")
+	if c.Pointer() == e.Pointer() {
+		err = nil
+	}
+	return
+}
+
+func checkForNil(c reflect.Value) (err error) {
+	err = errors.New("")
+
+	// Make sure it is legal to call IsNil.
+	switch c.Kind() {
+	case reflect.Invalid:
+	case reflect.Chan:
+	case reflect.Func:
+	case reflect.Interface:
+	case reflect.Map:
+	case reflect.Ptr:
+	case reflect.Slice:
+
+	default:
+		err = NewFatalError("which cannot be compared to nil")
+		return
+	}
+
+	// Ask whether the value is nil. Handle a nil literal (kind Invalid)
+	// specially, since it's not legal to call IsNil there.
+	if c.Kind() == reflect.Invalid || c.IsNil() {
+		err = nil
+	}
+	return
+}
+
+////////////////////////////////////////////////////////////////////////
+// Public implementation
+////////////////////////////////////////////////////////////////////////
+
+func (m *equalsMatcher) Matches(candidate interface{}) error {
+	e := m.expectedValue
+	c := reflect.ValueOf(candidate)
+	ek := e.Kind()
+
+	switch {
+	case ek == reflect.Bool:
+		return checkAgainstBool(e.Bool(), c)
+
+	case isSignedInteger(e):
+		return checkAgainstInt64(e.Int(), c)
+
+	case isUnsignedInteger(e):
+		return checkAgainstUint64(e.Uint(), c)
+
+	case ek == reflect.Float32:
+		return checkAgainstFloat32(float32(e.Float()), c)
+
+	case ek == reflect.Float64:
+		return checkAgainstFloat64(e.Float(), c)
+
+	case ek == reflect.Complex64:
+		return checkAgainstComplex64(complex64(e.Complex()), c)
+
+	case ek == reflect.Complex128:
+		return checkAgainstComplex128(complex128(e.Complex()), c)
+
+	case ek == reflect.Chan:
+		return checkAgainstChan(e, c)
+
+	case ek == reflect.Func:
+		return checkAgainstFunc(e, c)
+
+	case ek == reflect.Map:
+		return checkAgainstMap(e, c)
+
+	case ek == reflect.Ptr:
+		return checkAgainstPtr(e, c)
+
+	case ek == reflect.Slice:
+		return checkAgainstSlice(e, c)
+
+	case ek == reflect.String:
+		return checkAgainstString(e, c)
+
+	case ek == reflect.Array:
+		return checkAgainstArray(e, c)
+
+	case ek == reflect.UnsafePointer:
+		return checkAgainstUnsafePointer(e, c)
+
+	case ek == reflect.Invalid:
+		return checkForNil(c)
+	}
+
+	panic(fmt.Sprintf("equalsMatcher.Matches: unexpected kind: %v", ek))
+}
+
+func (m *equalsMatcher) Description() string {
+	// Special case: handle nil.
+	if !m.expectedValue.IsValid() {
+		return "is nil"
+	}
+
+	return fmt.Sprintf("%v", m.expectedValue.Interface())
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go
new file mode 100644
index 0000000000..8a078e36d8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go
@@ -0,0 +1,51 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+// Error returns a matcher that matches non-nil values implementing the
+// built-in error interface for whom the return value of Error() matches the
+// supplied matcher.
+//
+// For example:
+//
+//     err := errors.New("taco burrito")
+//
+//     Error(Equals("taco burrito"))  // matches err
+//     Error(HasSubstr("taco"))       // matches err
+//     Error(HasSubstr("enchilada"))  // doesn't match err
+//
+func Error(m Matcher) Matcher {
+	return &errorMatcher{m}
+}
+
+type errorMatcher struct {
+	wrappedMatcher Matcher
+}
+
+func (m *errorMatcher) Description() string {
+	return "error " + m.wrappedMatcher.Description()
+}
+
+func (m *errorMatcher) Matches(c interface{}) error {
+	// Make sure that c is an error.
+	e, ok := c.(error)
+	if !ok {
+		return NewFatalError("which is not an error")
+	}
+
+	// Pass on the error text to the wrapped matcher.
+	return m.wrappedMatcher.Matches(e.Error())
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go
new file mode 100644
index 0000000000..4b9d103a38
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go
@@ -0,0 +1,39 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// GreaterOrEqual returns a matcher that matches integer, floating point, or
+// strings values v such that v >= x. Comparison is not defined between numeric
+// and string types, but is defined between all integer and floating point
+// types.
+//
+// x must itself be an integer, floating point, or string type; otherwise,
+// GreaterOrEqual will panic.
+func GreaterOrEqual(x interface{}) Matcher {
+	desc := fmt.Sprintf("greater than or equal to %v", x)
+
+	// Special case: make it clear that strings are strings.
+	if reflect.TypeOf(x).Kind() == reflect.String {
+		desc = fmt.Sprintf("greater than or equal to \"%s\"", x)
+	}
+
+	return transformDescription(Not(LessThan(x)), desc)
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go
new file mode 100644
index 0000000000..3eef32178f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go
@@ -0,0 +1,39 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// GreaterThan returns a matcher that matches integer, floating point, or
+// strings values v such that v > x. Comparison is not defined between numeric
+// and string types, but is defined between all integer and floating point
+// types.
+//
+// x must itself be an integer, floating point, or string type; otherwise,
+// GreaterThan will panic.
+func GreaterThan(x interface{}) Matcher {
+	desc := fmt.Sprintf("greater than %v", x)
+
+	// Special case: make it clear that strings are strings.
+	if reflect.TypeOf(x).Kind() == reflect.String {
+		desc = fmt.Sprintf("greater than \"%s\"", x)
+	}
+
+	return transformDescription(Not(LessOrEqual(x)), desc)
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go
new file mode 100644
index 0000000000..3b286f7321
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go
@@ -0,0 +1,37 @@
+// Copyright 2015 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// HasSameTypeAs returns a matcher that matches values with exactly the same
+// type as the supplied prototype.
+func HasSameTypeAs(p interface{}) Matcher {
+	expected := reflect.TypeOf(p)
+	pred := func(c interface{}) error {
+		actual := reflect.TypeOf(c)
+		if actual != expected {
+			return fmt.Errorf("which has type %v", actual)
+		}
+
+		return nil
+	}
+
+	return NewMatcher(pred, fmt.Sprintf("has type %v", expected))
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go
new file mode 100644
index 0000000000..bf5bd6ae6d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go
@@ -0,0 +1,46 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// HasSubstr returns a matcher that matches strings containing s as a
+// substring.
+func HasSubstr(s string) Matcher {
+	return NewMatcher(
+		func(c interface{}) error { return hasSubstr(s, c) },
+		fmt.Sprintf("has substring \"%s\"", s))
+}
+
+func hasSubstr(needle string, c interface{}) error {
+	v := reflect.ValueOf(c)
+	if v.Kind() != reflect.String {
+		return NewFatalError("which is not a string")
+	}
+
+	// Perform the substring search.
+	haystack := v.String()
+	if strings.Contains(haystack, needle) {
+		return nil
+	}
+
+	return errors.New("")
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go
new file mode 100644
index 0000000000..ae6460ed96
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go
@@ -0,0 +1,134 @@
+// Copyright 2012 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+)
+
+// Is the type comparable according to the definition here?
+//
+//     http://weekly.golang.org/doc/go_spec.html#Comparison_operators
+//
+func isComparable(t reflect.Type) bool {
+	switch t.Kind() {
+	case reflect.Array:
+		return isComparable(t.Elem())
+
+	case reflect.Struct:
+		for i := 0; i < t.NumField(); i++ {
+			if !isComparable(t.Field(i).Type) {
+				return false
+			}
+		}
+
+		return true
+
+	case reflect.Slice, reflect.Map, reflect.Func:
+		return false
+	}
+
+	return true
+}
+
+// Should the supplied type be allowed as an argument to IdenticalTo?
+func isLegalForIdenticalTo(t reflect.Type) (bool, error) {
+	// Allow the zero type.
+	if t == nil {
+		return true, nil
+	}
+
+	// Reference types are always okay; we compare pointers.
+	switch t.Kind() {
+	case reflect.Slice, reflect.Map, reflect.Func, reflect.Chan:
+		return true, nil
+	}
+
+	// Reject other non-comparable types.
+	if !isComparable(t) {
+		return false, errors.New(fmt.Sprintf("%v is not comparable", t))
+	}
+
+	return true, nil
+}
+
+// IdenticalTo(x) returns a matcher that matches values v with type identical
+// to x such that:
+//
+//  1. If v and x are of a reference type (slice, map, function, channel), then
+//     they are either both nil or are references to the same object.
+//
+//  2. Otherwise, if v and x are not of a reference type but have a valid type,
+//     then v == x.
+//
+// If v and x are both the invalid type (which results from the predeclared nil
+// value, or from nil interface variables), then the matcher is satisfied.
+//
+// This function will panic if x is of a value type that is not comparable. For
+// example, x cannot be an array of functions.
+func IdenticalTo(x interface{}) Matcher {
+	t := reflect.TypeOf(x)
+
+	// Reject illegal arguments.
+	if ok, err := isLegalForIdenticalTo(t); !ok {
+		panic("IdenticalTo: " + err.Error())
+	}
+
+	return &identicalToMatcher{x}
+}
+
+type identicalToMatcher struct {
+	x interface{}
+}
+
+func (m *identicalToMatcher) Description() string {
+	t := reflect.TypeOf(m.x)
+	return fmt.Sprintf("identical to <%v> %v", t, m.x)
+}
+
+func (m *identicalToMatcher) Matches(c interface{}) error {
+	// Make sure the candidate's type is correct.
+	t := reflect.TypeOf(m.x)
+	if ct := reflect.TypeOf(c); t != ct {
+		return NewFatalError(fmt.Sprintf("which is of type %v", ct))
+	}
+
+	// Special case: two values of the invalid type are always identical.
+	if t == nil {
+		return nil
+	}
+
+	// Handle reference types.
+	switch t.Kind() {
+	case reflect.Slice, reflect.Map, reflect.Func, reflect.Chan:
+		xv := reflect.ValueOf(m.x)
+		cv := reflect.ValueOf(c)
+		if xv.Pointer() == cv.Pointer() {
+			return nil
+		}
+
+		return errors.New("which is not an identical reference")
+	}
+
+	// Are the values equal?
+	if m.x == c {
+		return nil
+	}
+
+	return errors.New("")
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go
new file mode 100644
index 0000000000..8402cdeaf0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go
@@ -0,0 +1,41 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// LessOrEqual returns a matcher that matches integer, floating point, or
+// strings values v such that v <= x. Comparison is not defined between numeric
+// and string types, but is defined between all integer and floating point
+// types.
+//
+// x must itself be an integer, floating point, or string type; otherwise,
+// LessOrEqual will panic.
+func LessOrEqual(x interface{}) Matcher {
+	desc := fmt.Sprintf("less than or equal to %v", x)
+
+	// Special case: make it clear that strings are strings.
+	if reflect.TypeOf(x).Kind() == reflect.String {
+		desc = fmt.Sprintf("less than or equal to \"%s\"", x)
+	}
+
+	// Put LessThan last so that its error messages will be used in the event of
+	// failure.
+	return transformDescription(AnyOf(Equals(x), LessThan(x)), desc)
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go
new file mode 100644
index 0000000000..8258e45d99
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go
@@ -0,0 +1,152 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+	"math"
+	"reflect"
+)
+
+// LessThan returns a matcher that matches integer, floating point, or strings
+// values v such that v < x. Comparison is not defined between numeric and
+// string types, but is defined between all integer and floating point types.
+//
+// x must itself be an integer, floating point, or string type; otherwise,
+// LessThan will panic.
+func LessThan(x interface{}) Matcher {
+	v := reflect.ValueOf(x)
+	kind := v.Kind()
+
+	switch {
+	case isInteger(v):
+	case isFloat(v):
+	case kind == reflect.String:
+
+	default:
+		panic(fmt.Sprintf("LessThan: unexpected kind %v", kind))
+	}
+
+	return &lessThanMatcher{v}
+}
+
+type lessThanMatcher struct {
+	limit reflect.Value
+}
+
+func (m *lessThanMatcher) Description() string {
+	// Special case: make it clear that strings are strings.
+	if m.limit.Kind() == reflect.String {
+		return fmt.Sprintf("less than \"%s\"", m.limit.String())
+	}
+
+	return fmt.Sprintf("less than %v", m.limit.Interface())
+}
+
+func compareIntegers(v1, v2 reflect.Value) (err error) {
+	err = errors.New("")
+
+	switch {
+	case isSignedInteger(v1) && isSignedInteger(v2):
+		if v1.Int() < v2.Int() {
+			err = nil
+		}
+		return
+
+	case isSignedInteger(v1) && isUnsignedInteger(v2):
+		if v1.Int() < 0 || uint64(v1.Int()) < v2.Uint() {
+			err = nil
+		}
+		return
+
+	case isUnsignedInteger(v1) && isSignedInteger(v2):
+		if v1.Uint() <= math.MaxInt64 && int64(v1.Uint()) < v2.Int() {
+			err = nil
+		}
+		return
+
+	case isUnsignedInteger(v1) && isUnsignedInteger(v2):
+		if v1.Uint() < v2.Uint() {
+			err = nil
+		}
+		return
+	}
+
+	panic(fmt.Sprintf("compareIntegers: %v %v", v1, v2))
+}
+
+func getFloat(v reflect.Value) float64 {
+	switch {
+	case isSignedInteger(v):
+		return float64(v.Int())
+
+	case isUnsignedInteger(v):
+		return float64(v.Uint())
+
+	case isFloat(v):
+		return v.Float()
+	}
+
+	panic(fmt.Sprintf("getFloat: %v", v))
+}
+
+func (m *lessThanMatcher) Matches(c interface{}) (err error) {
+	v1 := reflect.ValueOf(c)
+	v2 := m.limit
+
+	err = errors.New("")
+
+	// Handle strings as a special case.
+	if v1.Kind() == reflect.String && v2.Kind() == reflect.String {
+		if v1.String() < v2.String() {
+			err = nil
+		}
+		return
+	}
+
+	// If we get here, we require that we are dealing with integers or floats.
+	v1Legal := isInteger(v1) || isFloat(v1)
+	v2Legal := isInteger(v2) || isFloat(v2)
+	if !v1Legal || !v2Legal {
+		err = NewFatalError("which is not comparable")
+		return
+	}
+
+	// Handle the various comparison cases.
+	switch {
+	// Both integers
+	case isInteger(v1) && isInteger(v2):
+		return compareIntegers(v1, v2)
+
+	// At least one float32
+	case v1.Kind() == reflect.Float32 || v2.Kind() == reflect.Float32:
+		if float32(getFloat(v1)) < float32(getFloat(v2)) {
+			err = nil
+		}
+		return
+
+	// At least one float64
+	case v1.Kind() == reflect.Float64 || v2.Kind() == reflect.Float64:
+		if getFloat(v1) < getFloat(v2) {
+			err = nil
+		}
+		return
+	}
+
+	// We shouldn't get here.
+	panic(fmt.Sprintf("lessThanMatcher.Matches: Shouldn't get here: %v %v", v1, v2))
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go
new file mode 100644
index 0000000000..78159a0727
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go
@@ -0,0 +1,86 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package oglematchers provides a set of matchers useful in a testing or
+// mocking framework. These matchers are inspired by and mostly compatible with
+// Google Test for C++ and Google JS Test.
+//
+// This package is used by github.com/smartystreets/assertions/internal/ogletest and
+// github.com/smartystreets/assertions/internal/oglemock, which may be more directly useful if you're not
+// writing your own testing package or defining your own matchers.
+package oglematchers
+
+// A Matcher is some predicate implicitly defining a set of values that it
+// matches. For example, GreaterThan(17) matches all numeric values greater
+// than 17, and HasSubstr("taco") matches all strings with the substring
+// "taco".
+//
+// Matchers are typically exposed to tests via constructor functions like
+// HasSubstr. In order to implement such a function you can either define your
+// own matcher type or use NewMatcher.
+type Matcher interface {
+	// Check whether the supplied value belongs to the the set defined by the
+	// matcher. Return a non-nil error if and only if it does not.
+	//
+	// The error describes why the value doesn't match. The error text is a
+	// relative clause that is suitable for being placed after the value. For
+	// example, a predicate that matches strings with a particular substring may,
+	// when presented with a numerical value, return the following error text:
+	//
+	//     "which is not a string"
+	//
+	// Then the failure message may look like:
+	//
+	//     Expected: has substring "taco"
+	//     Actual:   17, which is not a string
+	//
+	// If the error is self-apparent based on the description of the matcher, the
+	// error text may be empty (but the error still non-nil). For example:
+	//
+	//     Expected: 17
+	//     Actual:   19
+	//
+	// If you are implementing a new matcher, see also the documentation on
+	// FatalError.
+	Matches(candidate interface{}) error
+
+	// Description returns a string describing the property that values matching
+	// this matcher have, as a verb phrase where the subject is the value. For
+	// example, "is greather than 17" or "has substring "taco"".
+	Description() string
+}
+
+// FatalError is an implementation of the error interface that may be returned
+// from matchers, indicating the error should be propagated. Returning a
+// *FatalError indicates that the matcher doesn't process values of the
+// supplied type, or otherwise doesn't know how to handle the value.
+//
+// For example, if GreaterThan(17) returned false for the value "taco" without
+// a fatal error, then Not(GreaterThan(17)) would return true. This is
+// technically correct, but is surprising and may mask failures where the wrong
+// sort of matcher is accidentally used. Instead, GreaterThan(17) can return a
+// fatal error, which will be propagated by Not().
+type FatalError struct {
+	errorText string
+}
+
+// NewFatalError creates a FatalError struct with the supplied error text.
+func NewFatalError(s string) *FatalError {
+	return &FatalError{s}
+}
+
+func (e *FatalError) Error() string {
+	return e.errorText
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go
new file mode 100644
index 0000000000..1ed63f30c4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go
@@ -0,0 +1,69 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"regexp"
+)
+
+// MatchesRegexp returns a matcher that matches strings and byte slices whose
+// contents match the supplied regular expression. The semantics are those of
+// regexp.Match. In particular, that means the match is not implicitly anchored
+// to the ends of the string: MatchesRegexp("bar") will match "foo bar baz".
+func MatchesRegexp(pattern string) Matcher {
+	re, err := regexp.Compile(pattern)
+	if err != nil {
+		panic("MatchesRegexp: " + err.Error())
+	}
+
+	return &matchesRegexpMatcher{re}
+}
+
+type matchesRegexpMatcher struct {
+	re *regexp.Regexp
+}
+
+func (m *matchesRegexpMatcher) Description() string {
+	return fmt.Sprintf("matches regexp \"%s\"", m.re.String())
+}
+
+func (m *matchesRegexpMatcher) Matches(c interface{}) (err error) {
+	v := reflect.ValueOf(c)
+	isString := v.Kind() == reflect.String
+	isByteSlice := v.Kind() == reflect.Slice && v.Elem().Kind() == reflect.Uint8
+
+	err = errors.New("")
+
+	switch {
+	case isString:
+		if m.re.MatchString(v.String()) {
+			err = nil
+		}
+
+	case isByteSlice:
+		if m.re.Match(v.Bytes()) {
+			err = nil
+		}
+
+	default:
+		err = NewFatalError("which is not a string or []byte")
+	}
+
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go
new file mode 100644
index 0000000000..c9d8398ee6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go
@@ -0,0 +1,43 @@
+// Copyright 2015 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+// Create a matcher with the given description and predicate function, which
+// will be invoked to handle calls to Matchers.
+//
+// Using this constructor may be a convenience over defining your own type that
+// implements Matcher if you do not need any logic in your Description method.
+func NewMatcher(
+	predicate func(interface{}) error,
+	description string) Matcher {
+	return &predicateMatcher{
+		predicate:   predicate,
+		description: description,
+	}
+}
+
+type predicateMatcher struct {
+	predicate   func(interface{}) error
+	description string
+}
+
+func (pm *predicateMatcher) Matches(c interface{}) error {
+	return pm.predicate(c)
+}
+
+func (pm *predicateMatcher) Description() string {
+	return pm.description
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go
new file mode 100644
index 0000000000..623789fe28
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go
@@ -0,0 +1,53 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+)
+
+// Not returns a matcher that inverts the set of values matched by the wrapped
+// matcher. It does not transform the result for values for which the wrapped
+// matcher returns a fatal error.
+func Not(m Matcher) Matcher {
+	return &notMatcher{m}
+}
+
+type notMatcher struct {
+	wrapped Matcher
+}
+
+func (m *notMatcher) Matches(c interface{}) (err error) {
+	err = m.wrapped.Matches(c)
+
+	// Did the wrapped matcher say yes?
+	if err == nil {
+		return errors.New("")
+	}
+
+	// Did the wrapped matcher return a fatal error?
+	if _, isFatal := err.(*FatalError); isFatal {
+		return err
+	}
+
+	// The wrapped matcher returned a non-fatal error.
+	return nil
+}
+
+func (m *notMatcher) Description() string {
+	return fmt.Sprintf("not(%s)", m.wrapped.Description())
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go
new file mode 100644
index 0000000000..d2cfc97869
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go
@@ -0,0 +1,74 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+)
+
+// Panics matches zero-arg functions which, when invoked, panic with an error
+// that matches the supplied matcher.
+//
+// NOTE(jacobsa): This matcher cannot detect the case where the function panics
+// using panic(nil), by design of the language. See here for more info:
+//
+//     http://goo.gl/9aIQL
+//
+func Panics(m Matcher) Matcher {
+	return &panicsMatcher{m}
+}
+
+type panicsMatcher struct {
+	wrappedMatcher Matcher
+}
+
+func (m *panicsMatcher) Description() string {
+	return "panics with: " + m.wrappedMatcher.Description()
+}
+
+func (m *panicsMatcher) Matches(c interface{}) (err error) {
+	// Make sure c is a zero-arg function.
+	v := reflect.ValueOf(c)
+	if v.Kind() != reflect.Func || v.Type().NumIn() != 0 {
+		err = NewFatalError("which is not a zero-arg function")
+		return
+	}
+
+	// Call the function and check its panic error.
+	defer func() {
+		if e := recover(); e != nil {
+			err = m.wrappedMatcher.Matches(e)
+
+			// Set a clearer error message if the matcher said no.
+			if err != nil {
+				wrappedClause := ""
+				if err.Error() != "" {
+					wrappedClause = ", " + err.Error()
+				}
+
+				err = errors.New(fmt.Sprintf("which panicked with: %v%s", e, wrappedClause))
+			}
+		}
+	}()
+
+	v.Call([]reflect.Value{})
+
+	// If we get here, the function didn't panic.
+	err = errors.New("which didn't panic")
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go
new file mode 100644
index 0000000000..c5383f2402
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go
@@ -0,0 +1,65 @@
+// Copyright 2012 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+)
+
+// Return a matcher that matches non-nil pointers whose pointee matches the
+// wrapped matcher.
+func Pointee(m Matcher) Matcher {
+	return &pointeeMatcher{m}
+}
+
+type pointeeMatcher struct {
+	wrapped Matcher
+}
+
+func (m *pointeeMatcher) Matches(c interface{}) (err error) {
+	// Make sure the candidate is of the appropriate type.
+	cv := reflect.ValueOf(c)
+	if !cv.IsValid() || cv.Kind() != reflect.Ptr {
+		return NewFatalError("which is not a pointer")
+	}
+
+	// Make sure the candidate is non-nil.
+	if cv.IsNil() {
+		return NewFatalError("")
+	}
+
+	// Defer to the wrapped matcher. Fix up empty errors so that failure messages
+	// are more helpful than just printing a pointer for "Actual".
+	pointee := cv.Elem().Interface()
+	err = m.wrapped.Matches(pointee)
+	if err != nil && err.Error() == "" {
+		s := fmt.Sprintf("whose pointee is %v", pointee)
+
+		if _, ok := err.(*FatalError); ok {
+			err = NewFatalError(s)
+		} else {
+			err = errors.New(s)
+		}
+	}
+
+	return err
+}
+
+func (m *pointeeMatcher) Description() string {
+	return fmt.Sprintf("pointee(%s)", m.wrapped.Description())
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go
new file mode 100644
index 0000000000..f79d0c03db
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go
@@ -0,0 +1,36 @@
+// Copyright 2011 Aaron Jacobs. All Rights Reserved.
+// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package oglematchers
+
+// transformDescription returns a matcher that is equivalent to the supplied
+// one, except that it has the supplied description instead of the one attached
+// to the existing matcher.
+func transformDescription(m Matcher, newDesc string) Matcher {
+	return &transformDescriptionMatcher{newDesc, m}
+}
+
+type transformDescriptionMatcher struct {
+	desc string
+	wrappedMatcher Matcher
+}
+
+func (m *transformDescriptionMatcher) Description() string {
+	return m.desc
+}
+
+func (m *transformDescriptionMatcher) Matches(c interface{}) error {
+	return m.wrappedMatcher.Matches(c)
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go
new file mode 100644
index 0000000000..9c57ab2b8b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go
@@ -0,0 +1,93 @@
+package assertions
+
+const ( // equality
+	shouldHaveBeenEqual             = "Expected: '%v'\nActual:   '%v'\n(Should be equal)"
+	shouldNotHaveBeenEqual          = "Expected     '%v'\nto NOT equal '%v'\n(but it did)!"
+	shouldHaveBeenEqualTypeMismatch = "Expected: '%v' (%T)\nActual:   '%v' (%T)\n(Should be equal, type mismatch)"
+	shouldHaveBeenAlmostEqual       = "Expected '%v' to almost equal '%v' (but it didn't)!"
+	shouldHaveNotBeenAlmostEqual    = "Expected '%v' to NOT almost equal '%v' (but it did)!"
+	shouldHaveResembled             = "Expected: '%s'\nActual:   '%s'\n(Should resemble)!"
+	shouldNotHaveResembled          = "Expected        '%#v'\nto NOT resemble '%#v'\n(but it did)!"
+	shouldBePointers                = "Both arguments should be pointers "
+	shouldHaveBeenNonNilPointer     = shouldBePointers + "(the %s was %s)!"
+	shouldHavePointedTo             = "Expected '%+v' (address: '%v') and '%+v' (address: '%v') to be the same address (but their weren't)!"
+	shouldNotHavePointedTo          = "Expected '%+v' and '%+v' to be different references (but they matched: '%v')!"
+	shouldHaveBeenNil               = "Expected: nil\nActual:   '%v'"
+	shouldNotHaveBeenNil            = "Expected '%+v' to NOT be nil (but it was)!"
+	shouldHaveBeenTrue              = "Expected: true\nActual:   %v"
+	shouldHaveBeenFalse             = "Expected: false\nActual:   %v"
+	shouldHaveBeenZeroValue         = "'%+v' should have been the zero value" //"Expected: (zero value)\nActual:   %v"
+)
+
+const ( // quantity comparisons
+	shouldHaveBeenGreater            = "Expected '%v' to be greater than '%v' (but it wasn't)!"
+	shouldHaveBeenGreaterOrEqual     = "Expected '%v' to be greater than or equal to '%v' (but it wasn't)!"
+	shouldHaveBeenLess               = "Expected '%v' to be less than '%v' (but it wasn't)!"
+	shouldHaveBeenLessOrEqual        = "Expected '%v' to be less than or equal to '%v' (but it wasn't)!"
+	shouldHaveBeenBetween            = "Expected '%v' to be between '%v' and '%v' (but it wasn't)!"
+	shouldNotHaveBeenBetween         = "Expected '%v' NOT to be between '%v' and '%v' (but it was)!"
+	shouldHaveDifferentUpperAndLower = "The lower and upper bounds must be different values (they were both '%v')."
+	shouldHaveBeenBetweenOrEqual     = "Expected '%v' to be between '%v' and '%v' or equal to one of them (but it wasn't)!"
+	shouldNotHaveBeenBetweenOrEqual  = "Expected '%v' NOT to be between '%v' and '%v' or equal to one of them (but it was)!"
+)
+
+const ( // collections
+	shouldHaveContained            = "Expected the container (%v) to contain: '%v' (but it didn't)!"
+	shouldNotHaveContained         = "Expected the container (%v) NOT to contain: '%v' (but it did)!"
+	shouldHaveContainedKey         = "Expected the %v to contain the key: %v (but it didn't)!"
+	shouldNotHaveContainedKey      = "Expected the %v NOT to contain the key: %v (but it did)!"
+	shouldHaveBeenIn               = "Expected '%v' to be in the container (%v), but it wasn't!"
+	shouldNotHaveBeenIn            = "Expected '%v' NOT to be in the container (%v), but it was!"
+	shouldHaveBeenAValidCollection = "You must provide a valid container (was %v)!"
+	shouldHaveBeenAValidMap        = "You must provide a valid map type (was %v)!"
+	shouldHaveBeenEmpty            = "Expected %+v to be empty (but it wasn't)!"
+	shouldNotHaveBeenEmpty         = "Expected %+v to NOT be empty (but it was)!"
+	shouldHaveBeenAValidInteger    = "You must provide a valid integer (was %v)!"
+	shouldHaveBeenAValidLength     = "You must provide a valid positive integer (was %v)!"
+	shouldHaveHadLength            = "Expected %+v (length: %v) to have length equal to '%v', but it wasn't!"
+)
+
+const ( // strings
+	shouldHaveStartedWith           = "Expected      '%v'\nto start with '%v'\n(but it didn't)!"
+	shouldNotHaveStartedWith        = "Expected          '%v'\nNOT to start with '%v'\n(but it did)!"
+	shouldHaveEndedWith             = "Expected    '%v'\nto end with '%v'\n(but it didn't)!"
+	shouldNotHaveEndedWith          = "Expected        '%v'\nNOT to end with '%v'\n(but it did)!"
+	shouldAllBeStrings              = "All arguments to this assertion must be strings (you provided: %v)."
+	shouldBothBeStrings             = "Both arguments to this assertion must be strings (you provided %v and %v)."
+	shouldBeString                  = "The argument to this assertion must be a string (you provided %v)."
+	shouldHaveContainedSubstring    = "Expected '%s' to contain substring '%s' (but it didn't)!"
+	shouldNotHaveContainedSubstring = "Expected '%s' NOT to contain substring '%s' (but it did)!"
+	shouldHaveBeenBlank             = "Expected '%s' to be blank (but it wasn't)!"
+	shouldNotHaveBeenBlank          = "Expected value to NOT be blank (but it was)!"
+)
+
+const ( // panics
+	shouldUseVoidNiladicFunction = "You must provide a void, niladic function as the first argument!"
+	shouldHavePanickedWith       = "Expected func() to panic with '%v' (but it panicked with '%v')!"
+	shouldHavePanicked           = "Expected func() to panic (but it didn't)!"
+	shouldNotHavePanicked        = "Expected func() NOT to panic (error: '%+v')!"
+	shouldNotHavePanickedWith    = "Expected func() NOT to panic with '%v' (but it did)!"
+)
+
+const ( // type checking
+	shouldHaveBeenA    = "Expected '%v' to be: '%v' (but was: '%v')!"
+	shouldNotHaveBeenA = "Expected '%v' to NOT be: '%v' (but it was)!"
+
+	shouldHaveImplemented             = "Expected: '%v interface support'\nActual:   '%v' does not implement the interface!"
+	shouldNotHaveImplemented          = "Expected         '%v'\nto NOT implement '%v'\n(but it did)!"
+	shouldCompareWithInterfacePointer = "The expected value must be a pointer to an interface type (eg. *fmt.Stringer)"
+	shouldNotBeNilActual              = "The actual value was 'nil' and should be a value or a pointer to a value!"
+)
+
+const ( // time comparisons
+	shouldUseTimes                   = "You must provide time instances as arguments to this assertion."
+	shouldUseTimeSlice               = "You must provide a slice of time instances as the first argument to this assertion."
+	shouldUseDurationAndTime         = "You must provide a duration and a time as arguments to this assertion."
+	shouldHaveHappenedBefore         = "Expected '%v' to happen before '%v' (it happened '%v' after)!"
+	shouldHaveHappenedAfter          = "Expected '%v' to happen after '%v' (it happened '%v' before)!"
+	shouldHaveHappenedBetween        = "Expected '%v' to happen between '%v' and '%v' (it happened '%v' outside threshold)!"
+	shouldNotHaveHappenedOnOrBetween = "Expected '%v' to NOT happen on or between '%v' and '%v' (but it did)!"
+
+	// format params: incorrect-index, previous-index, previous-time, incorrect-index, incorrect-time
+	shouldHaveBeenChronological = "The 'Time' at index [%d] should have happened after the previous one (but it didn't!):\n  [%d]: %s\n  [%d]: %s (see, it happened before!)"
+)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go
new file mode 100644
index 0000000000..7e75db1784
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go
@@ -0,0 +1,115 @@
+package assertions
+
+import "fmt"
+
+// ShouldPanic receives a void, niladic function and expects to recover a panic.
+func ShouldPanic(actual interface{}, expected ...interface{}) (message string) {
+	if fail := need(0, expected); fail != success {
+		return fail
+	}
+
+	action, _ := actual.(func())
+
+	if action == nil {
+		message = shouldUseVoidNiladicFunction
+		return
+	}
+
+	defer func() {
+		recovered := recover()
+		if recovered == nil {
+			message = shouldHavePanicked
+		} else {
+			message = success
+		}
+	}()
+	action()
+
+	return
+}
+
+// ShouldNotPanic receives a void, niladic function and expects to execute the function without any panic.
+func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string) {
+	if fail := need(0, expected); fail != success {
+		return fail
+	}
+
+	action, _ := actual.(func())
+
+	if action == nil {
+		message = shouldUseVoidNiladicFunction
+		return
+	}
+
+	defer func() {
+		recovered := recover()
+		if recovered != nil {
+			message = fmt.Sprintf(shouldNotHavePanicked, recovered)
+		} else {
+			message = success
+		}
+	}()
+	action()
+
+	return
+}
+
+// ShouldPanicWith receives a void, niladic function and expects to recover a panic with the second argument as the content.
+func ShouldPanicWith(actual interface{}, expected ...interface{}) (message string) {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	action, _ := actual.(func())
+
+	if action == nil {
+		message = shouldUseVoidNiladicFunction
+		return
+	}
+
+	defer func() {
+		recovered := recover()
+		if recovered == nil {
+			message = shouldHavePanicked
+		} else {
+			if equal := ShouldEqual(recovered, expected[0]); equal != success {
+				message = serializer.serialize(expected[0], recovered, fmt.Sprintf(shouldHavePanickedWith, expected[0], recovered))
+			} else {
+				message = success
+			}
+		}
+	}()
+	action()
+
+	return
+}
+
+// ShouldNotPanicWith receives a void, niladic function and expects to recover a panic whose content differs from the second argument.
+func ShouldNotPanicWith(actual interface{}, expected ...interface{}) (message string) {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	action, _ := actual.(func())
+
+	if action == nil {
+		message = shouldUseVoidNiladicFunction
+		return
+	}
+
+	defer func() {
+		recovered := recover()
+		if recovered == nil {
+			message = success
+		} else {
+			if equal := ShouldEqual(recovered, expected[0]); equal == success {
+				message = fmt.Sprintf(shouldNotHavePanickedWith, expected[0])
+			} else {
+				message = success
+			}
+		}
+	}()
+	action()
+
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go
new file mode 100644
index 0000000000..f28b0a062b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go
@@ -0,0 +1,141 @@
+package assertions
+
+import (
+	"fmt"
+
+	"github.com/smartystreets/assertions/internal/oglematchers"
+)
+
+// ShouldBeGreaterThan receives exactly two parameters and ensures that the first is greater than the second.
+func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	if matchError := oglematchers.GreaterThan(expected[0]).Matches(actual); matchError != nil {
+		return fmt.Sprintf(shouldHaveBeenGreater, actual, expected[0])
+	}
+	return success
+}
+
+// ShouldBeGreaterThanOrEqualTo receives exactly two parameters and ensures that the first is greater than or equal to the second.
+func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	} else if matchError := oglematchers.GreaterOrEqual(expected[0]).Matches(actual); matchError != nil {
+		return fmt.Sprintf(shouldHaveBeenGreaterOrEqual, actual, expected[0])
+	}
+	return success
+}
+
+// ShouldBeLessThan receives exactly two parameters and ensures that the first is less than the second.
+func ShouldBeLessThan(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	} else if matchError := oglematchers.LessThan(expected[0]).Matches(actual); matchError != nil {
+		return fmt.Sprintf(shouldHaveBeenLess, actual, expected[0])
+	}
+	return success
+}
+
+// ShouldBeLessThan receives exactly two parameters and ensures that the first is less than or equal to the second.
+func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	} else if matchError := oglematchers.LessOrEqual(expected[0]).Matches(actual); matchError != nil {
+		return fmt.Sprintf(shouldHaveBeenLessOrEqual, actual, expected[0])
+	}
+	return success
+}
+
+// ShouldBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound.
+// It ensures that the actual value is between both bounds (but not equal to either of them).
+func ShouldBeBetween(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	lower, upper, fail := deriveBounds(expected)
+
+	if fail != success {
+		return fail
+	} else if !isBetween(actual, lower, upper) {
+		return fmt.Sprintf(shouldHaveBeenBetween, actual, lower, upper)
+	}
+	return success
+}
+
+// ShouldNotBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound.
+// It ensures that the actual value is NOT between both bounds.
+func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	lower, upper, fail := deriveBounds(expected)
+
+	if fail != success {
+		return fail
+	} else if isBetween(actual, lower, upper) {
+		return fmt.Sprintf(shouldNotHaveBeenBetween, actual, lower, upper)
+	}
+	return success
+}
+func deriveBounds(values []interface{}) (lower interface{}, upper interface{}, fail string) {
+	lower = values[0]
+	upper = values[1]
+
+	if ShouldNotEqual(lower, upper) != success {
+		return nil, nil, fmt.Sprintf(shouldHaveDifferentUpperAndLower, lower)
+	} else if ShouldBeLessThan(lower, upper) != success {
+		lower, upper = upper, lower
+	}
+	return lower, upper, success
+}
+func isBetween(value, lower, upper interface{}) bool {
+	if ShouldBeGreaterThan(value, lower) != success {
+		return false
+	} else if ShouldBeLessThan(value, upper) != success {
+		return false
+	}
+	return true
+}
+
+// ShouldBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound.
+// It ensures that the actual value is between both bounds or equal to one of them.
+func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	lower, upper, fail := deriveBounds(expected)
+
+	if fail != success {
+		return fail
+	} else if !isBetweenOrEqual(actual, lower, upper) {
+		return fmt.Sprintf(shouldHaveBeenBetweenOrEqual, actual, lower, upper)
+	}
+	return success
+}
+
+// ShouldNotBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound.
+// It ensures that the actual value is nopt between the bounds nor equal to either of them.
+func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	lower, upper, fail := deriveBounds(expected)
+
+	if fail != success {
+		return fail
+	} else if isBetweenOrEqual(actual, lower, upper) {
+		return fmt.Sprintf(shouldNotHaveBeenBetweenOrEqual, actual, lower, upper)
+	}
+	return success
+}
+
+func isBetweenOrEqual(value, lower, upper interface{}) bool {
+	if ShouldBeGreaterThanOrEqualTo(value, lower) != success {
+		return false
+	} else if ShouldBeLessThanOrEqualTo(value, upper) != success {
+		return false
+	}
+	return true
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go
new file mode 100644
index 0000000000..90ae3e3b69
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go
@@ -0,0 +1,69 @@
+package assertions
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/smartystreets/assertions/internal/go-render/render"
+)
+
+type Serializer interface {
+	serialize(expected, actual interface{}, message string) string
+	serializeDetailed(expected, actual interface{}, message string) string
+}
+
+type failureSerializer struct{}
+
+func (self *failureSerializer) serializeDetailed(expected, actual interface{}, message string) string {
+	view := FailureView{
+		Message:  message,
+		Expected: render.Render(expected),
+		Actual:   render.Render(actual),
+	}
+	serialized, err := json.Marshal(view)
+	if err != nil {
+		return message
+	}
+	return string(serialized)
+}
+
+func (self *failureSerializer) serialize(expected, actual interface{}, message string) string {
+	view := FailureView{
+		Message:  message,
+		Expected: fmt.Sprintf("%+v", expected),
+		Actual:   fmt.Sprintf("%+v", actual),
+	}
+	serialized, err := json.Marshal(view)
+	if err != nil {
+		return message
+	}
+	return string(serialized)
+}
+
+func newSerializer() *failureSerializer {
+	return &failureSerializer{}
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// This struct is also declared in github.com/smartystreets/goconvey/convey/reporting.
+// The json struct tags should be equal in both declarations.
+type FailureView struct {
+	Message  string `json:"Message"`
+	Expected string `json:"Expected"`
+	Actual   string `json:"Actual"`
+}
+
+///////////////////////////////////////////////////////
+
+// noopSerializer just gives back the original message. This is useful when we are using
+// the assertions from a context other than the web UI, that requires the JSON structure
+// provided by the failureSerializer.
+type noopSerializer struct{}
+
+func (self *noopSerializer) serialize(expected, actual interface{}, message string) string {
+	return message
+}
+func (self *noopSerializer) serializeDetailed(expected, actual interface{}, message string) string {
+	return message
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go
new file mode 100644
index 0000000000..dbc3f04790
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go
@@ -0,0 +1,227 @@
+package assertions
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// ShouldStartWith receives exactly 2 string parameters and ensures that the first starts with the second.
+func ShouldStartWith(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	value, valueIsString := actual.(string)
+	prefix, prefixIsString := expected[0].(string)
+
+	if !valueIsString || !prefixIsString {
+		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
+	}
+
+	return shouldStartWith(value, prefix)
+}
+func shouldStartWith(value, prefix string) string {
+	if !strings.HasPrefix(value, prefix) {
+		shortval := value
+		if len(shortval) > len(prefix) {
+			shortval = shortval[:len(prefix)] + "..."
+		}
+		return serializer.serialize(prefix, shortval, fmt.Sprintf(shouldHaveStartedWith, value, prefix))
+	}
+	return success
+}
+
+// ShouldNotStartWith receives exactly 2 string parameters and ensures that the first does not start with the second.
+func ShouldNotStartWith(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	value, valueIsString := actual.(string)
+	prefix, prefixIsString := expected[0].(string)
+
+	if !valueIsString || !prefixIsString {
+		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
+	}
+
+	return shouldNotStartWith(value, prefix)
+}
+func shouldNotStartWith(value, prefix string) string {
+	if strings.HasPrefix(value, prefix) {
+		if value == "" {
+			value = "<empty>"
+		}
+		if prefix == "" {
+			prefix = "<empty>"
+		}
+		return fmt.Sprintf(shouldNotHaveStartedWith, value, prefix)
+	}
+	return success
+}
+
+// ShouldEndWith receives exactly 2 string parameters and ensures that the first ends with the second.
+func ShouldEndWith(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	value, valueIsString := actual.(string)
+	suffix, suffixIsString := expected[0].(string)
+
+	if !valueIsString || !suffixIsString {
+		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
+	}
+
+	return shouldEndWith(value, suffix)
+}
+func shouldEndWith(value, suffix string) string {
+	if !strings.HasSuffix(value, suffix) {
+		shortval := value
+		if len(shortval) > len(suffix) {
+			shortval = "..." + shortval[len(shortval)-len(suffix):]
+		}
+		return serializer.serialize(suffix, shortval, fmt.Sprintf(shouldHaveEndedWith, value, suffix))
+	}
+	return success
+}
+
+// ShouldEndWith receives exactly 2 string parameters and ensures that the first does not end with the second.
+func ShouldNotEndWith(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	value, valueIsString := actual.(string)
+	suffix, suffixIsString := expected[0].(string)
+
+	if !valueIsString || !suffixIsString {
+		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
+	}
+
+	return shouldNotEndWith(value, suffix)
+}
+func shouldNotEndWith(value, suffix string) string {
+	if strings.HasSuffix(value, suffix) {
+		if value == "" {
+			value = "<empty>"
+		}
+		if suffix == "" {
+			suffix = "<empty>"
+		}
+		return fmt.Sprintf(shouldNotHaveEndedWith, value, suffix)
+	}
+	return success
+}
+
+// ShouldContainSubstring receives exactly 2 string parameters and ensures that the first contains the second as a substring.
+func ShouldContainSubstring(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	long, longOk := actual.(string)
+	short, shortOk := expected[0].(string)
+
+	if !longOk || !shortOk {
+		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
+	}
+
+	if !strings.Contains(long, short) {
+		return serializer.serialize(expected[0], actual, fmt.Sprintf(shouldHaveContainedSubstring, long, short))
+	}
+	return success
+}
+
+// ShouldNotContainSubstring receives exactly 2 string parameters and ensures that the first does NOT contain the second as a substring.
+func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	long, longOk := actual.(string)
+	short, shortOk := expected[0].(string)
+
+	if !longOk || !shortOk {
+		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
+	}
+
+	if strings.Contains(long, short) {
+		return fmt.Sprintf(shouldNotHaveContainedSubstring, long, short)
+	}
+	return success
+}
+
+// ShouldBeBlank receives exactly 1 string parameter and ensures that it is equal to "".
+func ShouldBeBlank(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	}
+	value, ok := actual.(string)
+	if !ok {
+		return fmt.Sprintf(shouldBeString, reflect.TypeOf(actual))
+	}
+	if value != "" {
+		return serializer.serialize("", value, fmt.Sprintf(shouldHaveBeenBlank, value))
+	}
+	return success
+}
+
+// ShouldNotBeBlank receives exactly 1 string parameter and ensures that it is equal to "".
+func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	}
+	value, ok := actual.(string)
+	if !ok {
+		return fmt.Sprintf(shouldBeString, reflect.TypeOf(actual))
+	}
+	if value == "" {
+		return shouldNotHaveBeenBlank
+	}
+	return success
+}
+
+// ShouldEqualWithout receives exactly 3 string parameters and ensures that the first is equal to the second
+// after removing all instances of the third from the first using strings.Replace(first, third, "", -1).
+func ShouldEqualWithout(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	actualString, ok1 := actual.(string)
+	expectedString, ok2 := expected[0].(string)
+	replace, ok3 := expected[1].(string)
+
+	if !ok1 || !ok2 || !ok3 {
+		return fmt.Sprintf(shouldAllBeStrings, []reflect.Type{
+			reflect.TypeOf(actual),
+			reflect.TypeOf(expected[0]),
+			reflect.TypeOf(expected[1]),
+		})
+	}
+
+	replaced := strings.Replace(actualString, replace, "", -1)
+	if replaced == expectedString {
+		return ""
+	}
+
+	return fmt.Sprintf("Expected '%s' to equal '%s' but without any '%s' (but it didn't).", actualString, expectedString, replace)
+}
+
+// ShouldEqualTrimSpace receives exactly 2 string parameters and ensures that the first is equal to the second
+// after removing all leading and trailing whitespace using strings.TrimSpace(first).
+func ShouldEqualTrimSpace(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	actualString, valueIsString := actual.(string)
+	_, value2IsString := expected[0].(string)
+
+	if !valueIsString || !value2IsString {
+		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
+	}
+
+	actualString = strings.TrimSpace(actualString)
+	return ShouldEqual(actualString, expected[0])
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/time.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/time.go
new file mode 100644
index 0000000000..7e05026143
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/time.go
@@ -0,0 +1,202 @@
+package assertions
+
+import (
+	"fmt"
+	"time"
+)
+
+// ShouldHappenBefore receives exactly 2 time.Time arguments and asserts that the first happens before the second.
+func ShouldHappenBefore(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+	actualTime, firstOk := actual.(time.Time)
+	expectedTime, secondOk := expected[0].(time.Time)
+
+	if !firstOk || !secondOk {
+		return shouldUseTimes
+	}
+
+	if !actualTime.Before(expectedTime) {
+		return fmt.Sprintf(shouldHaveHappenedBefore, actualTime, expectedTime, actualTime.Sub(expectedTime))
+	}
+
+	return success
+}
+
+// ShouldHappenOnOrBefore receives exactly 2 time.Time arguments and asserts that the first happens on or before the second.
+func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+	actualTime, firstOk := actual.(time.Time)
+	expectedTime, secondOk := expected[0].(time.Time)
+
+	if !firstOk || !secondOk {
+		return shouldUseTimes
+	}
+
+	if actualTime.Equal(expectedTime) {
+		return success
+	}
+	return ShouldHappenBefore(actualTime, expectedTime)
+}
+
+// ShouldHappenAfter receives exactly 2 time.Time arguments and asserts that the first happens after the second.
+func ShouldHappenAfter(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+	actualTime, firstOk := actual.(time.Time)
+	expectedTime, secondOk := expected[0].(time.Time)
+
+	if !firstOk || !secondOk {
+		return shouldUseTimes
+	}
+	if !actualTime.After(expectedTime) {
+		return fmt.Sprintf(shouldHaveHappenedAfter, actualTime, expectedTime, expectedTime.Sub(actualTime))
+	}
+	return success
+}
+
+// ShouldHappenOnOrAfter receives exactly 2 time.Time arguments and asserts that the first happens on or after the second.
+func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+	actualTime, firstOk := actual.(time.Time)
+	expectedTime, secondOk := expected[0].(time.Time)
+
+	if !firstOk || !secondOk {
+		return shouldUseTimes
+	}
+	if actualTime.Equal(expectedTime) {
+		return success
+	}
+	return ShouldHappenAfter(actualTime, expectedTime)
+}
+
+// ShouldHappenBetween receives exactly 3 time.Time arguments and asserts that the first happens between (not on) the second and third.
+func ShouldHappenBetween(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	actualTime, firstOk := actual.(time.Time)
+	min, secondOk := expected[0].(time.Time)
+	max, thirdOk := expected[1].(time.Time)
+
+	if !firstOk || !secondOk || !thirdOk {
+		return shouldUseTimes
+	}
+
+	if !actualTime.After(min) {
+		return fmt.Sprintf(shouldHaveHappenedBetween, actualTime, min, max, min.Sub(actualTime))
+	}
+	if !actualTime.Before(max) {
+		return fmt.Sprintf(shouldHaveHappenedBetween, actualTime, min, max, actualTime.Sub(max))
+	}
+	return success
+}
+
+// ShouldHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first happens between or on the second and third.
+func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	actualTime, firstOk := actual.(time.Time)
+	min, secondOk := expected[0].(time.Time)
+	max, thirdOk := expected[1].(time.Time)
+
+	if !firstOk || !secondOk || !thirdOk {
+		return shouldUseTimes
+	}
+	if actualTime.Equal(min) || actualTime.Equal(max) {
+		return success
+	}
+	return ShouldHappenBetween(actualTime, min, max)
+}
+
+// ShouldNotHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first
+// does NOT happen between or on the second or third.
+func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	actualTime, firstOk := actual.(time.Time)
+	min, secondOk := expected[0].(time.Time)
+	max, thirdOk := expected[1].(time.Time)
+
+	if !firstOk || !secondOk || !thirdOk {
+		return shouldUseTimes
+	}
+	if actualTime.Equal(min) || actualTime.Equal(max) {
+		return fmt.Sprintf(shouldNotHaveHappenedOnOrBetween, actualTime, min, max)
+	}
+	if actualTime.After(min) && actualTime.Before(max) {
+		return fmt.Sprintf(shouldNotHaveHappenedOnOrBetween, actualTime, min, max)
+	}
+	return success
+}
+
+// ShouldHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments)
+// and asserts that the first time.Time happens within or on the duration specified relative to
+// the other time.Time.
+func ShouldHappenWithin(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	actualTime, firstOk := actual.(time.Time)
+	tolerance, secondOk := expected[0].(time.Duration)
+	threshold, thirdOk := expected[1].(time.Time)
+
+	if !firstOk || !secondOk || !thirdOk {
+		return shouldUseDurationAndTime
+	}
+
+	min := threshold.Add(-tolerance)
+	max := threshold.Add(tolerance)
+	return ShouldHappenOnOrBetween(actualTime, min, max)
+}
+
+// ShouldNotHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments)
+// and asserts that the first time.Time does NOT happen within or on the duration specified relative to
+// the other time.Time.
+func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string {
+	if fail := need(2, expected); fail != success {
+		return fail
+	}
+	actualTime, firstOk := actual.(time.Time)
+	tolerance, secondOk := expected[0].(time.Duration)
+	threshold, thirdOk := expected[1].(time.Time)
+
+	if !firstOk || !secondOk || !thirdOk {
+		return shouldUseDurationAndTime
+	}
+
+	min := threshold.Add(-tolerance)
+	max := threshold.Add(tolerance)
+	return ShouldNotHappenOnOrBetween(actualTime, min, max)
+}
+
+// ShouldBeChronological receives a []time.Time slice and asserts that the are
+// in chronological order starting with the first time.Time as the earliest.
+func ShouldBeChronological(actual interface{}, expected ...interface{}) string {
+	if fail := need(0, expected); fail != success {
+		return fail
+	}
+
+	times, ok := actual.([]time.Time)
+	if !ok {
+		return shouldUseTimeSlice
+	}
+
+	var previous time.Time
+	for i, current := range times {
+		if i > 0 && current.Before(previous) {
+			return fmt.Sprintf(shouldHaveBeenChronological,
+				i, i-1, previous.String(), i, current.String())
+		}
+		previous = current
+	}
+	return ""
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/type.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/type.go
new file mode 100644
index 0000000000..3fc00f68cd
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/assertions/type.go
@@ -0,0 +1,112 @@
+package assertions
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// ShouldHaveSameTypeAs receives exactly two parameters and compares their underlying types for equality.
+func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	first := reflect.TypeOf(actual)
+	second := reflect.TypeOf(expected[0])
+
+	if equal := ShouldEqual(first, second); equal != success {
+		return serializer.serialize(second, first, fmt.Sprintf(shouldHaveBeenA, actual, second, first))
+	}
+	return success
+}
+
+// ShouldNotHaveSameTypeAs receives exactly two parameters and compares their underlying types for inequality.
+func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string {
+	if fail := need(1, expected); fail != success {
+		return fail
+	}
+
+	first := reflect.TypeOf(actual)
+	second := reflect.TypeOf(expected[0])
+
+	if equal := ShouldEqual(first, second); equal == success {
+		return fmt.Sprintf(shouldNotHaveBeenA, actual, second)
+	}
+	return success
+}
+
+// ShouldImplement receives exactly two parameters and ensures
+// that the first implements the interface type of the second.
+func ShouldImplement(actual interface{}, expectedList ...interface{}) string {
+	if fail := need(1, expectedList); fail != success {
+		return fail
+	}
+
+	expected := expectedList[0]
+	if fail := ShouldBeNil(expected); fail != success {
+		return shouldCompareWithInterfacePointer
+	}
+
+	if fail := ShouldNotBeNil(actual); fail != success {
+		return shouldNotBeNilActual
+	}
+
+	var actualType reflect.Type
+	if reflect.TypeOf(actual).Kind() != reflect.Ptr {
+		actualType = reflect.PtrTo(reflect.TypeOf(actual))
+	} else {
+		actualType = reflect.TypeOf(actual)
+	}
+
+	expectedType := reflect.TypeOf(expected)
+	if fail := ShouldNotBeNil(expectedType); fail != success {
+		return shouldCompareWithInterfacePointer
+	}
+
+	expectedInterface := expectedType.Elem()
+
+	if actualType == nil {
+		return fmt.Sprintf(shouldHaveImplemented, expectedInterface, actual)
+	}
+
+	if !actualType.Implements(expectedInterface) {
+		return fmt.Sprintf(shouldHaveImplemented, expectedInterface, actualType)
+	}
+	return success
+}
+
+// ShouldNotImplement receives exactly two parameters and ensures
+// that the first does NOT implement the interface type of the second.
+func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string {
+	if fail := need(1, expectedList); fail != success {
+		return fail
+	}
+
+	expected := expectedList[0]
+	if fail := ShouldBeNil(expected); fail != success {
+		return shouldCompareWithInterfacePointer
+	}
+
+	if fail := ShouldNotBeNil(actual); fail != success {
+		return shouldNotBeNilActual
+	}
+
+	var actualType reflect.Type
+	if reflect.TypeOf(actual).Kind() != reflect.Ptr {
+		actualType = reflect.PtrTo(reflect.TypeOf(actual))
+	} else {
+		actualType = reflect.TypeOf(actual)
+	}
+
+	expectedType := reflect.TypeOf(expected)
+	if fail := ShouldNotBeNil(expectedType); fail != success {
+		return shouldCompareWithInterfacePointer
+	}
+
+	expectedInterface := expectedType.Elem()
+
+	if actualType.Implements(expectedInterface) {
+		return fmt.Sprintf(shouldNotHaveImplemented, actualType, expectedInterface)
+	}
+	return success
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/LICENSE.md b/Godeps/_workspace/src/github.com/smartystreets/goconvey/LICENSE.md
new file mode 100644
index 0000000000..3f87a40e77
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/LICENSE.md
@@ -0,0 +1,23 @@
+Copyright (c) 2016 SmartyStreets, LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+NOTE: Various optional and subordinate components carry their own licensing
+requirements and restrictions.  Use of those components is subject to the terms
+and conditions outlined the respective license of each component.
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go
new file mode 100644
index 0000000000..1e87b826df
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go
@@ -0,0 +1,68 @@
+package convey
+
+import "github.com/smartystreets/assertions"
+
+var (
+	ShouldEqual          = assertions.ShouldEqual
+	ShouldNotEqual       = assertions.ShouldNotEqual
+	ShouldAlmostEqual    = assertions.ShouldAlmostEqual
+	ShouldNotAlmostEqual = assertions.ShouldNotAlmostEqual
+	ShouldResemble       = assertions.ShouldResemble
+	ShouldNotResemble    = assertions.ShouldNotResemble
+	ShouldPointTo        = assertions.ShouldPointTo
+	ShouldNotPointTo     = assertions.ShouldNotPointTo
+	ShouldBeNil          = assertions.ShouldBeNil
+	ShouldNotBeNil       = assertions.ShouldNotBeNil
+	ShouldBeTrue         = assertions.ShouldBeTrue
+	ShouldBeFalse        = assertions.ShouldBeFalse
+	ShouldBeZeroValue    = assertions.ShouldBeZeroValue
+
+	ShouldBeGreaterThan          = assertions.ShouldBeGreaterThan
+	ShouldBeGreaterThanOrEqualTo = assertions.ShouldBeGreaterThanOrEqualTo
+	ShouldBeLessThan             = assertions.ShouldBeLessThan
+	ShouldBeLessThanOrEqualTo    = assertions.ShouldBeLessThanOrEqualTo
+	ShouldBeBetween              = assertions.ShouldBeBetween
+	ShouldNotBeBetween           = assertions.ShouldNotBeBetween
+	ShouldBeBetweenOrEqual       = assertions.ShouldBeBetweenOrEqual
+	ShouldNotBeBetweenOrEqual    = assertions.ShouldNotBeBetweenOrEqual
+
+	ShouldContain       = assertions.ShouldContain
+	ShouldNotContain    = assertions.ShouldNotContain
+	ShouldContainKey    = assertions.ShouldContainKey
+	ShouldNotContainKey = assertions.ShouldNotContainKey
+	ShouldBeIn          = assertions.ShouldBeIn
+	ShouldNotBeIn       = assertions.ShouldNotBeIn
+	ShouldBeEmpty       = assertions.ShouldBeEmpty
+	ShouldNotBeEmpty    = assertions.ShouldNotBeEmpty
+	ShouldHaveLength    = assertions.ShouldHaveLength
+
+	ShouldStartWith           = assertions.ShouldStartWith
+	ShouldNotStartWith        = assertions.ShouldNotStartWith
+	ShouldEndWith             = assertions.ShouldEndWith
+	ShouldNotEndWith          = assertions.ShouldNotEndWith
+	ShouldBeBlank             = assertions.ShouldBeBlank
+	ShouldNotBeBlank          = assertions.ShouldNotBeBlank
+	ShouldContainSubstring    = assertions.ShouldContainSubstring
+	ShouldNotContainSubstring = assertions.ShouldNotContainSubstring
+
+	ShouldPanic        = assertions.ShouldPanic
+	ShouldNotPanic     = assertions.ShouldNotPanic
+	ShouldPanicWith    = assertions.ShouldPanicWith
+	ShouldNotPanicWith = assertions.ShouldNotPanicWith
+
+	ShouldHaveSameTypeAs    = assertions.ShouldHaveSameTypeAs
+	ShouldNotHaveSameTypeAs = assertions.ShouldNotHaveSameTypeAs
+	ShouldImplement         = assertions.ShouldImplement
+	ShouldNotImplement      = assertions.ShouldNotImplement
+
+	ShouldHappenBefore         = assertions.ShouldHappenBefore
+	ShouldHappenOnOrBefore     = assertions.ShouldHappenOnOrBefore
+	ShouldHappenAfter          = assertions.ShouldHappenAfter
+	ShouldHappenOnOrAfter      = assertions.ShouldHappenOnOrAfter
+	ShouldHappenBetween        = assertions.ShouldHappenBetween
+	ShouldHappenOnOrBetween    = assertions.ShouldHappenOnOrBetween
+	ShouldNotHappenOnOrBetween = assertions.ShouldNotHappenOnOrBetween
+	ShouldHappenWithin         = assertions.ShouldHappenWithin
+	ShouldNotHappenWithin      = assertions.ShouldNotHappenWithin
+	ShouldBeChronological      = assertions.ShouldBeChronological
+)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go
new file mode 100644
index 0000000000..2c75c2d7b1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go
@@ -0,0 +1,272 @@
+package convey
+
+import (
+	"fmt"
+
+	"github.com/jtolds/gls"
+	"github.com/smartystreets/goconvey/convey/reporting"
+)
+
+type conveyErr struct {
+	fmt    string
+	params []interface{}
+}
+
+func (e *conveyErr) Error() string {
+	return fmt.Sprintf(e.fmt, e.params...)
+}
+
+func conveyPanic(fmt string, params ...interface{}) {
+	panic(&conveyErr{fmt, params})
+}
+
+const (
+	missingGoTest = `Top-level calls to Convey(...) need a reference to the *testing.T.
+		Hint: Convey("description here", t, func() { /* notice that the second argument was the *testing.T (t)! */ }) `
+	extraGoTest    = `Only the top-level call to Convey(...) needs a reference to the *testing.T.`
+	noStackContext = "Convey operation made without context on goroutine stack.\n" +
+		"Hint: Perhaps you meant to use `Convey(..., func(c C){...})` ?"
+	differentConveySituations = "Different set of Convey statements on subsequent pass!\nDid not expect %#v."
+	multipleIdenticalConvey   = "Multiple convey suites with identical names: %#v"
+)
+
+const (
+	failureHalt = "___FAILURE_HALT___"
+
+	nodeKey = "node"
+)
+
+///////////////////////////////// Stack Context /////////////////////////////////
+
+func getCurrentContext() *context {
+	ctx, ok := ctxMgr.GetValue(nodeKey)
+	if ok {
+		return ctx.(*context)
+	}
+	return nil
+}
+
+func mustGetCurrentContext() *context {
+	ctx := getCurrentContext()
+	if ctx == nil {
+		conveyPanic(noStackContext)
+	}
+	return ctx
+}
+
+//////////////////////////////////// Context ////////////////////////////////////
+
+// context magically handles all coordination of Convey's and So assertions.
+//
+// It is tracked on the stack as goroutine-local-storage with the gls package,
+// or explicitly if the user decides to call convey like:
+//
+//   Convey(..., func(c C) {
+//     c.So(...)
+//   })
+//
+// This implements the `C` interface.
+type context struct {
+	reporter reporting.Reporter
+
+	children map[string]*context
+
+	resets []func()
+
+	executedOnce   bool
+	expectChildRun *bool
+	complete       bool
+
+	focus       bool
+	failureMode FailureMode
+}
+
+// rootConvey is the main entry point to a test suite. This is called when
+// there's no context in the stack already, and items must contain a `t` object,
+// or this panics.
+func rootConvey(items ...interface{}) {
+	entry := discover(items)
+
+	if entry.Test == nil {
+		conveyPanic(missingGoTest)
+	}
+
+	expectChildRun := true
+	ctx := &context{
+		reporter: buildReporter(),
+
+		children: make(map[string]*context),
+
+		expectChildRun: &expectChildRun,
+
+		focus:       entry.Focus,
+		failureMode: defaultFailureMode.combine(entry.FailMode),
+	}
+	ctxMgr.SetValues(gls.Values{nodeKey: ctx}, func() {
+		ctx.reporter.BeginStory(reporting.NewStoryReport(entry.Test))
+		defer ctx.reporter.EndStory()
+
+		for ctx.shouldVisit() {
+			ctx.conveyInner(entry.Situation, entry.Func)
+			expectChildRun = true
+		}
+	})
+}
+
+//////////////////////////////////// Methods ////////////////////////////////////
+
+func (ctx *context) SkipConvey(items ...interface{}) {
+	ctx.Convey(items, skipConvey)
+}
+
+func (ctx *context) FocusConvey(items ...interface{}) {
+	ctx.Convey(items, focusConvey)
+}
+
+func (ctx *context) Convey(items ...interface{}) {
+	entry := discover(items)
+
+	// we're a branch, or leaf (on the wind)
+	if entry.Test != nil {
+		conveyPanic(extraGoTest)
+	}
+	if ctx.focus && !entry.Focus {
+		return
+	}
+
+	var inner_ctx *context
+	if ctx.executedOnce {
+		var ok bool
+		inner_ctx, ok = ctx.children[entry.Situation]
+		if !ok {
+			conveyPanic(differentConveySituations, entry.Situation)
+		}
+	} else {
+		if _, ok := ctx.children[entry.Situation]; ok {
+			conveyPanic(multipleIdenticalConvey, entry.Situation)
+		}
+		inner_ctx = &context{
+			reporter: ctx.reporter,
+
+			children: make(map[string]*context),
+
+			expectChildRun: ctx.expectChildRun,
+
+			focus:       entry.Focus,
+			failureMode: ctx.failureMode.combine(entry.FailMode),
+		}
+		ctx.children[entry.Situation] = inner_ctx
+	}
+
+	if inner_ctx.shouldVisit() {
+		ctxMgr.SetValues(gls.Values{nodeKey: inner_ctx}, func() {
+			inner_ctx.conveyInner(entry.Situation, entry.Func)
+		})
+	}
+}
+
+func (ctx *context) SkipSo(stuff ...interface{}) {
+	ctx.assertionReport(reporting.NewSkipReport())
+}
+
+func (ctx *context) So(actual interface{}, assert assertion, expected ...interface{}) {
+	if result := assert(actual, expected...); result == assertionSuccess {
+		ctx.assertionReport(reporting.NewSuccessReport())
+	} else {
+		ctx.assertionReport(reporting.NewFailureReport(result))
+	}
+}
+
+func (ctx *context) Reset(action func()) {
+	/* TODO: Failure mode configuration */
+	ctx.resets = append(ctx.resets, action)
+}
+
+func (ctx *context) Print(items ...interface{}) (int, error) {
+	fmt.Fprint(ctx.reporter, items...)
+	return fmt.Print(items...)
+}
+
+func (ctx *context) Println(items ...interface{}) (int, error) {
+	fmt.Fprintln(ctx.reporter, items...)
+	return fmt.Println(items...)
+}
+
+func (ctx *context) Printf(format string, items ...interface{}) (int, error) {
+	fmt.Fprintf(ctx.reporter, format, items...)
+	return fmt.Printf(format, items...)
+}
+
+//////////////////////////////////// Private ////////////////////////////////////
+
+// shouldVisit returns true iff we should traverse down into a Convey. Note
+// that just because we don't traverse a Convey this time, doesn't mean that
+// we may not traverse it on a subsequent pass.
+func (c *context) shouldVisit() bool {
+	return !c.complete && *c.expectChildRun
+}
+
+// conveyInner is the function which actually executes the user's anonymous test
+// function body. At this point, Convey or RootConvey has decided that this
+// function should actually run.
+func (ctx *context) conveyInner(situation string, f func(C)) {
+	// Record/Reset state for next time.
+	defer func() {
+		ctx.executedOnce = true
+
+		// This is only needed at the leaves, but there's no harm in also setting it
+		// when returning from branch Convey's
+		*ctx.expectChildRun = false
+	}()
+
+	// Set up+tear down our scope for the reporter
+	ctx.reporter.Enter(reporting.NewScopeReport(situation))
+	defer ctx.reporter.Exit()
+
+	// Recover from any panics in f, and assign the `complete` status for this
+	// node of the tree.
+	defer func() {
+		ctx.complete = true
+		if problem := recover(); problem != nil {
+			if problem, ok := problem.(*conveyErr); ok {
+				panic(problem)
+			}
+			if problem != failureHalt {
+				ctx.reporter.Report(reporting.NewErrorReport(problem))
+			}
+		} else {
+			for _, child := range ctx.children {
+				if !child.complete {
+					ctx.complete = false
+					return
+				}
+			}
+		}
+	}()
+
+	// Resets are registered as the `f` function executes, so nil them here.
+	// All resets are run in registration order (FIFO).
+	ctx.resets = []func(){}
+	defer func() {
+		for _, r := range ctx.resets {
+			// panics handled by the previous defer
+			r()
+		}
+	}()
+
+	if f == nil {
+		// if f is nil, this was either a Convey(..., nil), or a SkipConvey
+		ctx.reporter.Report(reporting.NewSkipReport())
+	} else {
+		f(ctx)
+	}
+}
+
+// assertionReport is a helper for So and SkipSo which makes the report and
+// then possibly panics, depending on the current context's failureMode.
+func (ctx *context) assertionReport(r *reporting.AssertionResult) {
+	ctx.reporter.Report(r)
+	if r.Failure != "" && ctx.failureMode == FailureHalts {
+		panic(failureHalt)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey
new file mode 100644
index 0000000000..a2d9327dc9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey
@@ -0,0 +1,4 @@
+#ignore
+-timeout=1s
+#-covermode=count
+#-coverpkg=github.com/smartystreets/goconvey/convey,github.com/smartystreets/goconvey/convey/gotest,github.com/smartystreets/goconvey/convey/reporting
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go
new file mode 100644
index 0000000000..eb8d4cb2ce
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go
@@ -0,0 +1,103 @@
+package convey
+
+type actionSpecifier uint8
+
+const (
+	noSpecifier actionSpecifier = iota
+	skipConvey
+	focusConvey
+)
+
+type suite struct {
+	Situation string
+	Test      t
+	Focus     bool
+	Func      func(C) // nil means skipped
+	FailMode  FailureMode
+}
+
+func newSuite(situation string, failureMode FailureMode, f func(C), test t, specifier actionSpecifier) *suite {
+	ret := &suite{
+		Situation: situation,
+		Test:      test,
+		Func:      f,
+		FailMode:  failureMode,
+	}
+	switch specifier {
+	case skipConvey:
+		ret.Func = nil
+	case focusConvey:
+		ret.Focus = true
+	}
+	return ret
+}
+
+func discover(items []interface{}) *suite {
+	name, items := parseName(items)
+	test, items := parseGoTest(items)
+	failure, items := parseFailureMode(items)
+	action, items := parseAction(items)
+	specifier, items := parseSpecifier(items)
+
+	if len(items) != 0 {
+		conveyPanic(parseError)
+	}
+
+	return newSuite(name, failure, action, test, specifier)
+}
+func item(items []interface{}) interface{} {
+	if len(items) == 0 {
+		conveyPanic(parseError)
+	}
+	return items[0]
+}
+func parseName(items []interface{}) (string, []interface{}) {
+	if name, parsed := item(items).(string); parsed {
+		return name, items[1:]
+	}
+	conveyPanic(parseError)
+	panic("never get here")
+}
+func parseGoTest(items []interface{}) (t, []interface{}) {
+	if test, parsed := item(items).(t); parsed {
+		return test, items[1:]
+	}
+	return nil, items
+}
+func parseFailureMode(items []interface{}) (FailureMode, []interface{}) {
+	if mode, parsed := item(items).(FailureMode); parsed {
+		return mode, items[1:]
+	}
+	return FailureInherits, items
+}
+func parseAction(items []interface{}) (func(C), []interface{}) {
+	switch x := item(items).(type) {
+	case nil:
+		return nil, items[1:]
+	case func(C):
+		return x, items[1:]
+	case func():
+		return func(C) { x() }, items[1:]
+	}
+	conveyPanic(parseError)
+	panic("never get here")
+}
+func parseSpecifier(items []interface{}) (actionSpecifier, []interface{}) {
+	if len(items) == 0 {
+		return noSpecifier, items
+	}
+	if spec, ok := items[0].(actionSpecifier); ok {
+		return spec, items[1:]
+	}
+	conveyPanic(parseError)
+	panic("never get here")
+}
+
+// This interface allows us to pass the *testing.T struct
+// throughout the internals of this package without ever
+// having to import the "testing" package.
+type t interface {
+	Fail()
+}
+
+const parseError = "You must provide a name (string), then a *testing.T (if in outermost scope), an optional FailureMode, and then an action (func())."
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go
new file mode 100644
index 0000000000..2562ce4c28
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go
@@ -0,0 +1,218 @@
+// Package convey contains all of the public-facing entry points to this project.
+// This means that it should never be required of the user to import any other
+// packages from this project as they serve internal purposes.
+package convey
+
+import "github.com/smartystreets/goconvey/convey/reporting"
+
+////////////////////////////////// suite //////////////////////////////////
+
+// C is the Convey context which you can optionally obtain in your action
+// by calling Convey like:
+//
+//   Convey(..., func(c C) {
+//     ...
+//   })
+//
+// See the documentation on Convey for more details.
+//
+// All methods in this context behave identically to the global functions of the
+// same name in this package.
+type C interface {
+	Convey(items ...interface{})
+	SkipConvey(items ...interface{})
+	FocusConvey(items ...interface{})
+
+	So(actual interface{}, assert assertion, expected ...interface{})
+	SkipSo(stuff ...interface{})
+
+	Reset(action func())
+
+	Println(items ...interface{}) (int, error)
+	Print(items ...interface{}) (int, error)
+	Printf(format string, items ...interface{}) (int, error)
+}
+
+// Convey is the method intended for use when declaring the scopes of
+// a specification. Each scope has a description and a func() which may contain
+// other calls to Convey(), Reset() or Should-style assertions. Convey calls can
+// be nested as far as you see fit.
+//
+// IMPORTANT NOTE: The top-level Convey() within a Test method
+// must conform to the following signature:
+//
+//     Convey(description string, t *testing.T, action func())
+//
+// All other calls should look like this (no need to pass in *testing.T):
+//
+//     Convey(description string, action func())
+//
+// Don't worry, goconvey will panic if you get it wrong so you can fix it.
+//
+// Additionally, you may explicitly obtain access to the Convey context by doing:
+//
+//     Convey(description string, action func(c C))
+//
+// You may need to do this if you want to pass the context through to a
+// goroutine, or to close over the context in a handler to a library which
+// calls your handler in a goroutine (httptest comes to mind).
+//
+// All Convey()-blocks also accept an optional parameter of FailureMode which sets
+// how goconvey should treat failures for So()-assertions in the block and
+// nested blocks. See the constants in this file for the available options.
+//
+// By default it will inherit from its parent block and the top-level blocks
+// default to the FailureHalts setting.
+//
+// This parameter is inserted before the block itself:
+//
+//     Convey(description string, t *testing.T, mode FailureMode, action func())
+//     Convey(description string, mode FailureMode, action func())
+//
+// See the examples package for, well, examples.
+func Convey(items ...interface{}) {
+	if ctx := getCurrentContext(); ctx == nil {
+		rootConvey(items...)
+	} else {
+		ctx.Convey(items...)
+	}
+}
+
+// SkipConvey is analagous to Convey except that the scope is not executed
+// (which means that child scopes defined within this scope are not run either).
+// The reporter will be notified that this step was skipped.
+func SkipConvey(items ...interface{}) {
+	Convey(append(items, skipConvey)...)
+}
+
+// FocusConvey is has the inverse effect of SkipConvey. If the top-level
+// Convey is changed to `FocusConvey`, only nested scopes that are defined
+// with FocusConvey will be run. The rest will be ignored completely. This
+// is handy when debugging a large suite that runs a misbehaving function
+// repeatedly as you can disable all but one of that function
+// without swaths of `SkipConvey` calls, just a targeted chain of calls
+// to FocusConvey.
+func FocusConvey(items ...interface{}) {
+	Convey(append(items, focusConvey)...)
+}
+
+// Reset registers a cleanup function to be run after each Convey()
+// in the same scope. See the examples package for a simple use case.
+func Reset(action func()) {
+	mustGetCurrentContext().Reset(action)
+}
+
+/////////////////////////////////// Assertions ///////////////////////////////////
+
+// assertion is an alias for a function with a signature that the convey.So()
+// method can handle. Any future or custom assertions should conform to this
+// method signature. The return value should be an empty string if the assertion
+// passes and a well-formed failure message if not.
+type assertion func(actual interface{}, expected ...interface{}) string
+
+const assertionSuccess = ""
+
+// So is the means by which assertions are made against the system under test.
+// The majority of exported names in the assertions package begin with the word
+// 'Should' and describe how the first argument (actual) should compare with any
+// of the final (expected) arguments. How many final arguments are accepted
+// depends on the particular assertion that is passed in as the assert argument.
+// See the examples package for use cases and the assertions package for
+// documentation on specific assertion methods. A failing assertion will
+// cause t.Fail() to be invoked--you should never call this method (or other
+// failure-inducing methods) in your test code. Leave that to GoConvey.
+func So(actual interface{}, assert assertion, expected ...interface{}) {
+	mustGetCurrentContext().So(actual, assert, expected...)
+}
+
+// SkipSo is analagous to So except that the assertion that would have been passed
+// to So is not executed and the reporter is notified that the assertion was skipped.
+func SkipSo(stuff ...interface{}) {
+	mustGetCurrentContext().SkipSo()
+}
+
+// FailureMode is a type which determines how the So() blocks should fail
+// if their assertion fails. See constants further down for acceptable values
+type FailureMode string
+
+const (
+
+	// FailureContinues is a failure mode which prevents failing
+	// So()-assertions from halting Convey-block execution, instead
+	// allowing the test to continue past failing So()-assertions.
+	FailureContinues FailureMode = "continue"
+
+	// FailureHalts is the default setting for a top-level Convey()-block
+	// and will cause all failing So()-assertions to halt further execution
+	// in that test-arm and continue on to the next arm.
+	FailureHalts FailureMode = "halt"
+
+	// FailureInherits is the default setting for failure-mode, it will
+	// default to the failure-mode of the parent block. You should never
+	// need to specify this mode in your tests..
+	FailureInherits FailureMode = "inherits"
+)
+
+func (f FailureMode) combine(other FailureMode) FailureMode {
+	if other == FailureInherits {
+		return f
+	}
+	return other
+}
+
+var defaultFailureMode FailureMode = FailureHalts
+
+// SetDefaultFailureMode allows you to specify the default failure mode
+// for all Convey blocks. It is meant to be used in an init function to
+// allow the default mode to be changdd across all tests for an entire packgae
+// but it can be used anywhere.
+func SetDefaultFailureMode(mode FailureMode) {
+	if mode == FailureContinues || mode == FailureHalts {
+		defaultFailureMode = mode
+	} else {
+		panic("You may only use the constants named 'FailureContinues' and 'FailureHalts' as default failure modes.")
+	}
+}
+
+//////////////////////////////////// Print functions ////////////////////////////////////
+
+// Print is analogous to fmt.Print (and it even calls fmt.Print). It ensures that
+// output is aligned with the corresponding scopes in the web UI.
+func Print(items ...interface{}) (written int, err error) {
+	return mustGetCurrentContext().Print(items...)
+}
+
+// Print is analogous to fmt.Println (and it even calls fmt.Println). It ensures that
+// output is aligned with the corresponding scopes in the web UI.
+func Println(items ...interface{}) (written int, err error) {
+	return mustGetCurrentContext().Println(items...)
+}
+
+// Print is analogous to fmt.Printf (and it even calls fmt.Printf). It ensures that
+// output is aligned with the corresponding scopes in the web UI.
+func Printf(format string, items ...interface{}) (written int, err error) {
+	return mustGetCurrentContext().Printf(format, items...)
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// SuppressConsoleStatistics prevents automatic printing of console statistics.
+// Calling PrintConsoleStatistics explicitly will force printing of statistics.
+func SuppressConsoleStatistics() {
+	reporting.SuppressConsoleStatistics()
+}
+
+// ConsoleStatistics may be called at any time to print assertion statistics.
+// Generally, the best place to do this would be in a TestMain function,
+// after all tests have been run. Something like this:
+//
+// func TestMain(m *testing.M) {
+//     convey.SuppressConsoleStatistics()
+//     result := m.Run()
+//     convey.PrintConsoleStatistics()
+//     os.Exit(result)
+// }
+//
+func PrintConsoleStatistics() {
+	reporting.PrintConsoleStatistics()
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go
new file mode 100644
index 0000000000..3a5c848a44
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go
@@ -0,0 +1,28 @@
+// Package gotest contains internal functionality. Although this package
+// contains one or more exported names it is not intended for public
+// consumption. See the examples package for how to use this project.
+package gotest
+
+import (
+	"runtime"
+	"strings"
+)
+
+func ResolveExternalCaller() (file string, line int, name string) {
+	var caller_id uintptr
+	callers := runtime.Callers(0, callStack)
+
+	for x := 0; x < callers; x++ {
+		caller_id, file, line, _ = runtime.Caller(x)
+		if strings.HasSuffix(file, "_test.go") || strings.HasSuffix(file, "_tests.go") {
+			name = runtime.FuncForPC(caller_id).Name()
+			return
+		}
+	}
+	file, line, name = "<unkown file>", -1, "<unknown name>"
+	return // panic?
+}
+
+const maxStackDepth = 100 // This had better be enough...
+
+var callStack []uintptr = make([]uintptr, maxStackDepth, maxStackDepth)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go
new file mode 100644
index 0000000000..1d77ff3dcd
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go
@@ -0,0 +1,81 @@
+package convey
+
+import (
+	"flag"
+	"os"
+
+	"github.com/jtolds/gls"
+	"github.com/smartystreets/assertions"
+	"github.com/smartystreets/goconvey/convey/reporting"
+)
+
+func init() {
+	assertions.GoConveyMode(true)
+
+	declareFlags()
+
+	ctxMgr = gls.NewContextManager()
+}
+
+func declareFlags() {
+	flag.BoolVar(&json, "convey-json", false, "When true, emits results in JSON blocks. Default: 'false'")
+	flag.BoolVar(&silent, "convey-silent", false, "When true, all output from GoConvey is suppressed.")
+	flag.BoolVar(&story, "convey-story", false, "When true, emits story output, otherwise emits dot output. When not provided, this flag mirros the value of the '-test.v' flag")
+
+	if noStoryFlagProvided() {
+		story = verboseEnabled
+	}
+
+	// FYI: flag.Parse() is called from the testing package.
+}
+
+func noStoryFlagProvided() bool {
+	return !story && !storyDisabled
+}
+
+func buildReporter() reporting.Reporter {
+	selectReporter := os.Getenv("GOCONVEY_REPORTER")
+
+	switch {
+	case testReporter != nil:
+		return testReporter
+	case json || selectReporter == "json":
+		return reporting.BuildJsonReporter()
+	case silent || selectReporter == "silent":
+		return reporting.BuildSilentReporter()
+	case selectReporter == "dot":
+		// Story is turned on when verbose is set, so we need to check for dot reporter first.
+		return reporting.BuildDotReporter()
+	case story || selectReporter == "story":
+		return reporting.BuildStoryReporter()
+	default:
+		return reporting.BuildDotReporter()
+	}
+}
+
+var (
+	ctxMgr *gls.ContextManager
+
+	// only set by internal tests
+	testReporter reporting.Reporter
+)
+
+var (
+	json   bool
+	silent bool
+	story  bool
+
+	verboseEnabled = flagFound("-test.v=true")
+	storyDisabled  = flagFound("-story=false")
+)
+
+// flagFound parses the command line args manually for flags defined in other
+// packages. Like the '-v' flag from the "testing" package, for instance.
+func flagFound(flagValue string) bool {
+	for _, arg := range os.Args {
+		if arg == flagValue {
+			return true
+		}
+	}
+	return false
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go
new file mode 100644
index 0000000000..777b2a5122
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go
@@ -0,0 +1,15 @@
+package convey
+
+import (
+	"github.com/smartystreets/goconvey/convey/reporting"
+)
+
+type nilReporter struct{}
+
+func (self *nilReporter) BeginStory(story *reporting.StoryReport)  {}
+func (self *nilReporter) Enter(scope *reporting.ScopeReport)       {}
+func (self *nilReporter) Report(report *reporting.AssertionResult) {}
+func (self *nilReporter) Exit()                                    {}
+func (self *nilReporter) EndStory()                                {}
+func (self *nilReporter) Write(p []byte) (int, error)              { return len(p), nil }
+func newNilReporter() *nilReporter                                 { return &nilReporter{} }
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go
new file mode 100644
index 0000000000..7bf67dbb2b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go
@@ -0,0 +1,16 @@
+package reporting
+
+import (
+	"fmt"
+	"io"
+)
+
+type console struct{}
+
+func (self *console) Write(p []byte) (n int, err error) {
+	return fmt.Print(string(p))
+}
+
+func NewConsole() io.Writer {
+	return new(console)
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go
new file mode 100644
index 0000000000..a37d001946
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go
@@ -0,0 +1,5 @@
+// Package reporting contains internal functionality related
+// to console reporting and output. Although this package has
+// exported names is not intended for public consumption. See the
+// examples package for how to use this project.
+package reporting
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go
new file mode 100644
index 0000000000..47d57c6b0d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go
@@ -0,0 +1,40 @@
+package reporting
+
+import "fmt"
+
+type dot struct{ out *Printer }
+
+func (self *dot) BeginStory(story *StoryReport) {}
+
+func (self *dot) Enter(scope *ScopeReport) {}
+
+func (self *dot) Report(report *AssertionResult) {
+	if report.Error != nil {
+		fmt.Print(redColor)
+		self.out.Insert(dotError)
+	} else if report.Failure != "" {
+		fmt.Print(yellowColor)
+		self.out.Insert(dotFailure)
+	} else if report.Skipped {
+		fmt.Print(yellowColor)
+		self.out.Insert(dotSkip)
+	} else {
+		fmt.Print(greenColor)
+		self.out.Insert(dotSuccess)
+	}
+	fmt.Print(resetColor)
+}
+
+func (self *dot) Exit() {}
+
+func (self *dot) EndStory() {}
+
+func (self *dot) Write(content []byte) (written int, err error) {
+	return len(content), nil // no-op
+}
+
+func NewDotReporter(out *Printer) *dot {
+	self := new(dot)
+	self.out = out
+	return self
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go
new file mode 100644
index 0000000000..c396e16b17
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go
@@ -0,0 +1,33 @@
+package reporting
+
+type gotestReporter struct{ test T }
+
+func (self *gotestReporter) BeginStory(story *StoryReport) {
+	self.test = story.Test
+}
+
+func (self *gotestReporter) Enter(scope *ScopeReport) {}
+
+func (self *gotestReporter) Report(r *AssertionResult) {
+	if !passed(r) {
+		self.test.Fail()
+	}
+}
+
+func (self *gotestReporter) Exit() {}
+
+func (self *gotestReporter) EndStory() {
+	self.test = nil
+}
+
+func (self *gotestReporter) Write(content []byte) (written int, err error) {
+	return len(content), nil // no-op
+}
+
+func NewGoTestReporter() *gotestReporter {
+	return new(gotestReporter)
+}
+
+func passed(r *AssertionResult) bool {
+	return r.Error == nil && r.Failure == ""
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go
new file mode 100644
index 0000000000..44d080e90e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go
@@ -0,0 +1,94 @@
+package reporting
+
+import (
+	"os"
+	"runtime"
+	"strings"
+)
+
+func init() {
+	if !isColorableTerminal() {
+		monochrome()
+	}
+
+	if runtime.GOOS == "windows" {
+		success, failure, error_ = dotSuccess, dotFailure, dotError
+	}
+}
+
+func BuildJsonReporter() Reporter {
+	out := NewPrinter(NewConsole())
+	return NewReporters(
+		NewGoTestReporter(),
+		NewJsonReporter(out))
+}
+func BuildDotReporter() Reporter {
+	out := NewPrinter(NewConsole())
+	return NewReporters(
+		NewGoTestReporter(),
+		NewDotReporter(out),
+		NewProblemReporter(out),
+		consoleStatistics)
+}
+func BuildStoryReporter() Reporter {
+	out := NewPrinter(NewConsole())
+	return NewReporters(
+		NewGoTestReporter(),
+		NewStoryReporter(out),
+		NewProblemReporter(out),
+		consoleStatistics)
+}
+func BuildSilentReporter() Reporter {
+	out := NewPrinter(NewConsole())
+	return NewReporters(
+		NewGoTestReporter(),
+		NewSilentProblemReporter(out))
+}
+
+var (
+	newline         = "\n"
+	success         = "✔"
+	failure         = "✘"
+	error_          = "🔥"
+	skip            = "⚠"
+	dotSuccess      = "."
+	dotFailure      = "x"
+	dotError        = "E"
+	dotSkip         = "S"
+	errorTemplate   = "* %s \nLine %d: - %v \n%s\n"
+	failureTemplate = "* %s \nLine %d:\n%s\n"
+)
+
+var (
+	greenColor  = "\033[32m"
+	yellowColor = "\033[33m"
+	redColor    = "\033[31m"
+	resetColor  = "\033[0m"
+)
+
+var consoleStatistics = NewStatisticsReporter(NewPrinter(NewConsole()))
+
+func SuppressConsoleStatistics() { consoleStatistics.Suppress() }
+func PrintConsoleStatistics()    { consoleStatistics.PrintSummary() }
+
+// QuiteMode disables all console output symbols. This is only meant to be used
+// for tests that are internal to goconvey where the output is distracting or
+// otherwise not needed in the test output.
+func QuietMode() {
+	success, failure, error_, skip, dotSuccess, dotFailure, dotError, dotSkip = "", "", "", "", "", "", "", ""
+}
+
+func monochrome() {
+	greenColor, yellowColor, redColor, resetColor = "", "", "", ""
+}
+
+func isColorableTerminal() bool {
+	return strings.Contains(os.Getenv("TERM"), "color")
+}
+
+// This interface allows us to pass the *testing.T struct
+// throughout the internals of this tool without ever
+// having to import the "testing" package.
+type T interface {
+	Fail()
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go
new file mode 100644
index 0000000000..f8526979f8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go
@@ -0,0 +1,88 @@
+// TODO: under unit test
+
+package reporting
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+)
+
+type JsonReporter struct {
+	out        *Printer
+	currentKey []string
+	current    *ScopeResult
+	index      map[string]*ScopeResult
+	scopes     []*ScopeResult
+}
+
+func (self *JsonReporter) depth() int { return len(self.currentKey) }
+
+func (self *JsonReporter) BeginStory(story *StoryReport) {}
+
+func (self *JsonReporter) Enter(scope *ScopeReport) {
+	self.currentKey = append(self.currentKey, scope.Title)
+	ID := strings.Join(self.currentKey, "|")
+	if _, found := self.index[ID]; !found {
+		next := newScopeResult(scope.Title, self.depth(), scope.File, scope.Line)
+		self.scopes = append(self.scopes, next)
+		self.index[ID] = next
+	}
+	self.current = self.index[ID]
+}
+
+func (self *JsonReporter) Report(report *AssertionResult) {
+	self.current.Assertions = append(self.current.Assertions, report)
+}
+
+func (self *JsonReporter) Exit() {
+	self.currentKey = self.currentKey[:len(self.currentKey)-1]
+}
+
+func (self *JsonReporter) EndStory() {
+	self.report()
+	self.reset()
+}
+func (self *JsonReporter) report() {
+	scopes := []string{}
+	for _, scope := range self.scopes {
+		serialized, err := json.Marshal(scope)
+		if err != nil {
+			self.out.Println(jsonMarshalFailure)
+			panic(err)
+		}
+		var buffer bytes.Buffer
+		json.Indent(&buffer, serialized, "", "  ")
+		scopes = append(scopes, buffer.String())
+	}
+	self.out.Print(fmt.Sprintf("%s\n%s,\n%s\n", OpenJson, strings.Join(scopes, ","), CloseJson))
+}
+func (self *JsonReporter) reset() {
+	self.scopes = []*ScopeResult{}
+	self.index = map[string]*ScopeResult{}
+	self.currentKey = nil
+}
+
+func (self *JsonReporter) Write(content []byte) (written int, err error) {
+	self.current.Output += string(content)
+	return len(content), nil
+}
+
+func NewJsonReporter(out *Printer) *JsonReporter {
+	self := new(JsonReporter)
+	self.out = out
+	self.reset()
+	return self
+}
+
+const OpenJson = ">->->OPEN-JSON->->->"   // "⌦"
+const CloseJson = "<-<-<-CLOSE-JSON<-<-<" // "⌫"
+const jsonMarshalFailure = `
+
+GOCONVEY_JSON_MARSHALL_FAILURE: There was an error when attempting to convert test results to JSON.
+Please file a bug report and reference the code that caused this failure if possible.
+
+Here's the panic:
+
+`
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go
new file mode 100644
index 0000000000..6d4a879c40
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go
@@ -0,0 +1,57 @@
+package reporting
+
+import (
+	"fmt"
+	"io"
+	"strings"
+)
+
+type Printer struct {
+	out    io.Writer
+	prefix string
+}
+
+func (self *Printer) Println(message string, values ...interface{}) {
+	formatted := self.format(message, values...) + newline
+	self.out.Write([]byte(formatted))
+}
+
+func (self *Printer) Print(message string, values ...interface{}) {
+	formatted := self.format(message, values...)
+	self.out.Write([]byte(formatted))
+}
+
+func (self *Printer) Insert(text string) {
+	self.out.Write([]byte(text))
+}
+
+func (self *Printer) format(message string, values ...interface{}) string {
+	var formatted string
+	if len(values) == 0 {
+		formatted = self.prefix + message
+	} else {
+		formatted = self.prefix + fmt.Sprintf(message, values...)
+	}
+	indented := strings.Replace(formatted, newline, newline+self.prefix, -1)
+	return strings.TrimRight(indented, space)
+}
+
+func (self *Printer) Indent() {
+	self.prefix += pad
+}
+
+func (self *Printer) Dedent() {
+	if len(self.prefix) >= padLength {
+		self.prefix = self.prefix[:len(self.prefix)-padLength]
+	}
+}
+
+func NewPrinter(out io.Writer) *Printer {
+	self := new(Printer)
+	self.out = out
+	return self
+}
+
+const space = " "
+const pad = space + space
+const padLength = len(pad)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go
new file mode 100644
index 0000000000..9ae493ac3b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go
@@ -0,0 +1,80 @@
+package reporting
+
+import "fmt"
+
+type problem struct {
+	silent   bool
+	out      *Printer
+	errors   []*AssertionResult
+	failures []*AssertionResult
+}
+
+func (self *problem) BeginStory(story *StoryReport) {}
+
+func (self *problem) Enter(scope *ScopeReport) {}
+
+func (self *problem) Report(report *AssertionResult) {
+	if report.Error != nil {
+		self.errors = append(self.errors, report)
+	} else if report.Failure != "" {
+		self.failures = append(self.failures, report)
+	}
+}
+
+func (self *problem) Exit() {}
+
+func (self *problem) EndStory() {
+	self.show(self.showErrors, redColor)
+	self.show(self.showFailures, yellowColor)
+	self.prepareForNextStory()
+}
+func (self *problem) show(display func(), color string) {
+	if !self.silent {
+		fmt.Print(color)
+	}
+	display()
+	if !self.silent {
+		fmt.Print(resetColor)
+	}
+	self.out.Dedent()
+}
+func (self *problem) showErrors() {
+	for i, e := range self.errors {
+		if i == 0 {
+			self.out.Println("\nErrors:\n")
+			self.out.Indent()
+		}
+		self.out.Println(errorTemplate, e.File, e.Line, e.Error, e.StackTrace)
+	}
+}
+func (self *problem) showFailures() {
+	for i, f := range self.failures {
+		if i == 0 {
+			self.out.Println("\nFailures:\n")
+			self.out.Indent()
+		}
+		self.out.Println(failureTemplate, f.File, f.Line, f.Failure)
+	}
+}
+
+func (self *problem) Write(content []byte) (written int, err error) {
+	return len(content), nil // no-op
+}
+
+func NewProblemReporter(out *Printer) *problem {
+	self := new(problem)
+	self.out = out
+	self.prepareForNextStory()
+	return self
+}
+
+func NewSilentProblemReporter(out *Printer) *problem {
+	self := NewProblemReporter(out)
+	self.silent = true
+	return self
+}
+
+func (self *problem) prepareForNextStory() {
+	self.errors = []*AssertionResult{}
+	self.failures = []*AssertionResult{}
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go
new file mode 100644
index 0000000000..cce6c5e438
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go
@@ -0,0 +1,39 @@
+package reporting
+
+import "io"
+
+type Reporter interface {
+	BeginStory(story *StoryReport)
+	Enter(scope *ScopeReport)
+	Report(r *AssertionResult)
+	Exit()
+	EndStory()
+	io.Writer
+}
+
+type reporters struct{ collection []Reporter }
+
+func (self *reporters) BeginStory(s *StoryReport) { self.foreach(func(r Reporter) { r.BeginStory(s) }) }
+func (self *reporters) Enter(s *ScopeReport)      { self.foreach(func(r Reporter) { r.Enter(s) }) }
+func (self *reporters) Report(a *AssertionResult) { self.foreach(func(r Reporter) { r.Report(a) }) }
+func (self *reporters) Exit()                     { self.foreach(func(r Reporter) { r.Exit() }) }
+func (self *reporters) EndStory()                 { self.foreach(func(r Reporter) { r.EndStory() }) }
+
+func (self *reporters) Write(contents []byte) (written int, err error) {
+	self.foreach(func(r Reporter) {
+		written, err = r.Write(contents)
+	})
+	return written, err
+}
+
+func (self *reporters) foreach(action func(Reporter)) {
+	for _, r := range self.collection {
+		action(r)
+	}
+}
+
+func NewReporters(collection ...Reporter) *reporters {
+	self := new(reporters)
+	self.collection = collection
+	return self
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey
new file mode 100644
index 0000000000..79982854b5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey
@@ -0,0 +1,2 @@
+#ignore
+-timeout=1s
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go
new file mode 100644
index 0000000000..712e6ade62
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go
@@ -0,0 +1,179 @@
+package reporting
+
+import (
+	"encoding/json"
+	"fmt"
+	"runtime"
+	"strings"
+
+	"github.com/smartystreets/goconvey/convey/gotest"
+)
+
+////////////////// ScopeReport ////////////////////
+
+type ScopeReport struct {
+	Title string
+	File  string
+	Line  int
+}
+
+func NewScopeReport(title string) *ScopeReport {
+	file, line, _ := gotest.ResolveExternalCaller()
+	self := new(ScopeReport)
+	self.Title = title
+	self.File = file
+	self.Line = line
+	return self
+}
+
+////////////////// ScopeResult ////////////////////
+
+type ScopeResult struct {
+	Title      string
+	File       string
+	Line       int
+	Depth      int
+	Assertions []*AssertionResult
+	Output     string
+}
+
+func newScopeResult(title string, depth int, file string, line int) *ScopeResult {
+	self := new(ScopeResult)
+	self.Title = title
+	self.Depth = depth
+	self.File = file
+	self.Line = line
+	self.Assertions = []*AssertionResult{}
+	return self
+}
+
+/////////////////// StoryReport /////////////////////
+
+type StoryReport struct {
+	Test T
+	Name string
+	File string
+	Line int
+}
+
+func NewStoryReport(test T) *StoryReport {
+	file, line, name := gotest.ResolveExternalCaller()
+	name = removePackagePath(name)
+	self := new(StoryReport)
+	self.Test = test
+	self.Name = name
+	self.File = file
+	self.Line = line
+	return self
+}
+
+// name comes in looking like "github.com/smartystreets/goconvey/examples.TestName".
+// We only want the stuff after the last '.', which is the name of the test function.
+func removePackagePath(name string) string {
+	parts := strings.Split(name, ".")
+	return parts[len(parts)-1]
+}
+
+/////////////////// FailureView ////////////////////////
+
+// This struct is also declared in github.com/smartystreets/assertions.
+// The json struct tags should be equal in both declarations.
+type FailureView struct {
+	Message  string `json:"Message"`
+	Expected string `json:"Expected"`
+	Actual   string `json:"Actual"`
+}
+
+////////////////////AssertionResult //////////////////////
+
+type AssertionResult struct {
+	File       string
+	Line       int
+	Expected   string
+	Actual     string
+	Failure    string
+	Error      interface{}
+	StackTrace string
+	Skipped    bool
+}
+
+func NewFailureReport(failure string) *AssertionResult {
+	report := new(AssertionResult)
+	report.File, report.Line = caller()
+	report.StackTrace = stackTrace()
+	parseFailure(failure, report)
+	return report
+}
+func parseFailure(failure string, report *AssertionResult) {
+	view := new(FailureView)
+	err := json.Unmarshal([]byte(failure), view)
+	if err == nil {
+		report.Failure = view.Message
+		report.Expected = view.Expected
+		report.Actual = view.Actual
+	} else {
+		report.Failure = failure
+	}
+}
+func NewErrorReport(err interface{}) *AssertionResult {
+	report := new(AssertionResult)
+	report.File, report.Line = caller()
+	report.StackTrace = fullStackTrace()
+	report.Error = fmt.Sprintf("%v", err)
+	return report
+}
+func NewSuccessReport() *AssertionResult {
+	return new(AssertionResult)
+}
+func NewSkipReport() *AssertionResult {
+	report := new(AssertionResult)
+	report.File, report.Line = caller()
+	report.StackTrace = fullStackTrace()
+	report.Skipped = true
+	return report
+}
+
+func caller() (file string, line int) {
+	file, line, _ = gotest.ResolveExternalCaller()
+	return
+}
+
+func stackTrace() string {
+	buffer := make([]byte, 1024*64)
+	n := runtime.Stack(buffer, false)
+	return removeInternalEntries(string(buffer[:n]))
+}
+func fullStackTrace() string {
+	buffer := make([]byte, 1024*64)
+	n := runtime.Stack(buffer, true)
+	return removeInternalEntries(string(buffer[:n]))
+}
+func removeInternalEntries(stack string) string {
+	lines := strings.Split(stack, newline)
+	filtered := []string{}
+	for _, line := range lines {
+		if !isExternal(line) {
+			filtered = append(filtered, line)
+		}
+	}
+	return strings.Join(filtered, newline)
+}
+func isExternal(line string) bool {
+	for _, p := range internalPackages {
+		if strings.Contains(line, p) {
+			return true
+		}
+	}
+	return false
+}
+
+// NOTE: any new packages that host goconvey packages will need to be added here!
+// An alternative is to scan the goconvey directory and then exclude stuff like
+// the examples package but that's nasty too.
+var internalPackages = []string{
+	"goconvey/assertions",
+	"goconvey/convey",
+	"goconvey/execution",
+	"goconvey/gotest",
+	"goconvey/reporting",
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go
new file mode 100644
index 0000000000..c3ccd056a0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go
@@ -0,0 +1,108 @@
+package reporting
+
+import (
+	"fmt"
+	"sync"
+)
+
+func (self *statistics) BeginStory(story *StoryReport) {}
+
+func (self *statistics) Enter(scope *ScopeReport) {}
+
+func (self *statistics) Report(report *AssertionResult) {
+	self.Lock()
+	defer self.Unlock()
+
+	if !self.failing && report.Failure != "" {
+		self.failing = true
+	}
+	if !self.erroring && report.Error != nil {
+		self.erroring = true
+	}
+	if report.Skipped {
+		self.skipped += 1
+	} else {
+		self.total++
+	}
+}
+
+func (self *statistics) Exit() {}
+
+func (self *statistics) EndStory() {
+	self.Lock()
+	defer self.Unlock()
+
+	if !self.suppressed {
+		self.printSummaryLocked()
+	}
+}
+
+func (self *statistics) Suppress() {
+	self.Lock()
+	defer self.Unlock()
+	self.suppressed = true
+}
+
+func (self *statistics) PrintSummary() {
+	self.Lock()
+	defer self.Unlock()
+	self.printSummaryLocked()
+}
+
+func (self *statistics) printSummaryLocked() {
+	self.reportAssertionsLocked()
+	self.reportSkippedSectionsLocked()
+	self.completeReportLocked()
+}
+func (self *statistics) reportAssertionsLocked() {
+	self.decideColorLocked()
+	self.out.Print("\n%d total %s", self.total, plural("assertion", self.total))
+}
+func (self *statistics) decideColorLocked() {
+	if self.failing && !self.erroring {
+		fmt.Print(yellowColor)
+	} else if self.erroring {
+		fmt.Print(redColor)
+	} else {
+		fmt.Print(greenColor)
+	}
+}
+func (self *statistics) reportSkippedSectionsLocked() {
+	if self.skipped > 0 {
+		fmt.Print(yellowColor)
+		self.out.Print(" (one or more sections skipped)")
+	}
+}
+func (self *statistics) completeReportLocked() {
+	fmt.Print(resetColor)
+	self.out.Print("\n")
+	self.out.Print("\n")
+}
+
+func (self *statistics) Write(content []byte) (written int, err error) {
+	return len(content), nil // no-op
+}
+
+func NewStatisticsReporter(out *Printer) *statistics {
+	self := statistics{}
+	self.out = out
+	return &self
+}
+
+type statistics struct {
+	sync.Mutex
+
+	out        *Printer
+	total      int
+	failing    bool
+	erroring   bool
+	skipped    int
+	suppressed bool
+}
+
+func plural(word string, count int) string {
+	if count == 1 {
+		return word
+	}
+	return word + "s"
+}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go
new file mode 100644
index 0000000000..9e73c971f8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go
@@ -0,0 +1,73 @@
+// TODO: in order for this reporter to be completely honest
+// we need to retrofit to be more like the json reporter such that:
+// 1. it maintains ScopeResult collections, which count assertions
+// 2. it reports only after EndStory(), so that all tick marks
+//    are placed near the appropriate title.
+// 3. Under unit test
+
+package reporting
+
+import (
+	"fmt"
+	"strings"
+)
+
+type story struct {
+	out        *Printer
+	titlesById map[string]string
+	currentKey []string
+}
+
+func (self *story) BeginStory(story *StoryReport) {}
+
+func (self *story) Enter(scope *ScopeReport) {
+	self.out.Indent()
+
+	self.currentKey = append(self.currentKey, scope.Title)
+	ID := strings.Join(self.currentKey, "|")
+
+	if _, found := self.titlesById[ID]; !found {
+		self.out.Println("")
+		self.out.Print(scope.Title)
+		self.out.Insert(" ")
+		self.titlesById[ID] = scope.Title
+	}
+}
+
+func (self *story) Report(report *AssertionResult) {
+	if report.Error != nil {
+		fmt.Print(redColor)
+		self.out.Insert(error_)
+	} else if report.Failure != "" {
+		fmt.Print(yellowColor)
+		self.out.Insert(failure)
+	} else if report.Skipped {
+		fmt.Print(yellowColor)
+		self.out.Insert(skip)
+	} else {
+		fmt.Print(greenColor)
+		self.out.Insert(success)
+	}
+	fmt.Print(resetColor)
+}
+
+func (self *story) Exit() {
+	self.out.Dedent()
+	self.currentKey = self.currentKey[:len(self.currentKey)-1]
+}
+
+func (self *story) EndStory() {
+	self.titlesById = make(map[string]string)
+	self.out.Println("\n")
+}
+
+func (self *story) Write(content []byte) (written int, err error) {
+	return len(content), nil // no-op
+}
+
+func NewStoryReporter(out *Printer) *story {
+	self := new(story)
+	self.out = out
+	self.titlesById = make(map[string]string)
+	return self
+}
diff --git a/rkt/config/auth.go b/rkt/config/auth.go
index 384f82bf9e..6f2f70c79e 100644
--- a/rkt/config/auth.go
+++ b/rkt/config/auth.go
@@ -18,11 +18,21 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/client/metadata"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/private/signer/v4"
+	"io"
 	"net/http"
+	"strings"
+	"time"
 )
 
 const (
-	authHeader string = "Authorization"
+	authHeader       string = "Authorization"
+	defaultAWSRegion string = "us-east-1"
+	awsS3Service     string = "s3"
 )
 
 type authV1JsonParser struct{}
@@ -42,6 +52,12 @@ type oauthV1 struct {
 	Token string `json:"token"`
 }
 
+type awsV1 struct {
+	AccessKeyID     string `json:"accessKeyID"`
+	SecretAccessKey string `json:"secretAccessKey"`
+	Region          string `json:"awsRegion"`
+}
+
 type dockerAuthV1JsonParser struct{}
 
 type dockerAuthV1 struct {
@@ -59,7 +75,7 @@ type basicAuthHeaderer struct {
 	auth basicV1
 }
 
-func (h *basicAuthHeaderer) Header() http.Header {
+func (h *basicAuthHeaderer) GetHeader() http.Header {
 	headers := make(http.Header)
 	creds := []byte(fmt.Sprintf("%s:%s", h.auth.User, h.auth.Password))
 	encodedCreds := base64.StdEncoding.EncodeToString(creds)
@@ -68,17 +84,90 @@ func (h *basicAuthHeaderer) Header() http.Header {
 	return headers
 }
 
+func (h *basicAuthHeaderer) SignRequest(r *http.Request) *http.Request {
+	r.Header.Set(authHeader, h.GetHeader().Get(authHeader))
+
+	return r
+}
+
 type oAuthBearerTokenHeaderer struct {
 	auth oauthV1
 }
 
-func (h *oAuthBearerTokenHeaderer) Header() http.Header {
+func (h *oAuthBearerTokenHeaderer) GetHeader() http.Header {
 	headers := make(http.Header)
 	headers.Add(authHeader, "Bearer "+h.auth.Token)
 
 	return headers
 }
 
+func (h *oAuthBearerTokenHeaderer) SignRequest(r *http.Request) *http.Request {
+	r.Header.Set(authHeader, h.GetHeader().Get(authHeader))
+
+	return r
+}
+
+type awsAuthHeaderer struct {
+	accessKeyID     string
+	secretAccessKey string
+	region          string
+}
+
+func (h *awsAuthHeaderer) GetHeader() http.Header {
+	return make(http.Header)
+}
+
+func (h *awsAuthHeaderer) SignRequest(r *http.Request) *http.Request {
+	region := h.region
+
+	var body io.ReadSeeker
+	if r.Body != nil {
+		body = r.Body.(io.ReadSeeker)
+	}
+
+	if len(region) == 0 {
+		region = guessAWSRegion(r.URL.Host)
+	}
+	v4.Sign(&request.Request{
+		ClientInfo: metadata.ClientInfo{
+			SigningRegion: region,
+			SigningName:   awsS3Service,
+		},
+		Config: aws.Config{
+			Credentials: credentials.NewStaticCredentials(h.accessKeyID, h.secretAccessKey, ""),
+		},
+		HTTPRequest: r,
+		Body:        body,
+		Time:        time.Now(),
+	})
+
+	return r
+}
+
+func guessAWSRegion(host string) string {
+	// Separate out potential :<port>
+	hostParts := strings.Split(host, ":")
+	host = strings.ToLower(hostParts[0])
+
+	parts := strings.Split(host, ".")
+
+	if len(parts) < 3 || parts[len(parts)-2] != "amazonaws" {
+		return defaultAWSRegion
+	}
+
+	// Try to guess region based on url, but if nothing
+	// matches, just fall back to defaultAWSRegion.
+	if strings.HasSuffix(host, "s3.amazonaws.com") || strings.HasSuffix(host, "s3-external-1.amazonaws.com") {
+		return "us-east-1"
+	} else if len(parts) > 3 && strings.HasPrefix(parts[len(parts)-3], "s3-") {
+		return parts[len(parts)-3][3:]
+	} else if len(parts) > 4 && parts[len(parts)-4] == "s3" {
+		return parts[len(parts)-3]
+	} else {
+		return defaultAWSRegion
+	}
+}
+
 func (p *authV1JsonParser) parse(config *Config, raw []byte) error {
 	var auth authV1
 	if err := json.Unmarshal(raw, &auth); err != nil {
@@ -99,6 +188,8 @@ func (p *authV1JsonParser) parse(config *Config, raw []byte) error {
 		headerer, err = p.getBasicV1Headerer(auth.Credentials)
 	case "oauth":
 		headerer, err = p.getOAuthV1Headerer(auth.Credentials)
+	case "aws":
+		headerer, err = p.getAWSV1Headerer(auth.Credentials)
 	default:
 		err = fmt.Errorf("unknown auth type: %q", auth.Type)
 	}
@@ -140,6 +231,24 @@ func (p *authV1JsonParser) getOAuthV1Headerer(raw json.RawMessage) (Headerer, er
 	}, nil
 }
 
+func (p *authV1JsonParser) getAWSV1Headerer(raw json.RawMessage) (Headerer, error) {
+	var aws awsV1
+	if err := json.Unmarshal(raw, &aws); err != nil {
+		return nil, err
+	}
+	if len(aws.AccessKeyID) == 0 {
+		return nil, fmt.Errorf("no AWS Access Key ID specified")
+	}
+	if len(aws.SecretAccessKey) == 0 {
+		return nil, fmt.Errorf("no AWS Secret Access Key specified")
+	}
+	return &awsAuthHeaderer{
+		accessKeyID:     aws.AccessKeyID,
+		secretAccessKey: aws.SecretAccessKey,
+		region:          aws.Region,
+	}, nil
+}
+
 func (p *dockerAuthV1JsonParser) parse(config *Config, raw []byte) error {
 	var auth dockerAuthV1
 	if err := json.Unmarshal(raw, &auth); err != nil {
diff --git a/rkt/config/auth_test.go b/rkt/config/auth_test.go
new file mode 100644
index 0000000000..d4ff638262
--- /dev/null
+++ b/rkt/config/auth_test.go
@@ -0,0 +1,54 @@
+// Copyright 2015 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package config
+
+import (
+	"testing"
+)
+
+func TestGuessAWSRegion(t *testing.T) {
+	tests := []struct {
+		host   string
+		region string
+	}{
+		{"foo.s3.amazonaws.com", "us-east-1"},
+		{"foo.s3-external-1.amazonaws.com", "us-east-1"},
+		{"foo.bar.s3.amazonaws.com", "us-east-1"},
+		{"foo.s3-us-west-1.amazonaws.com", "us-west-1"},
+		{"foo.bar.baz.s3-us-west-2.amazonaws.com", "us-west-2"},
+		{"foo.s3-eu-west-1.amazonaws.com", "eu-west-1"},
+		{"foo.s3.eu-central-1.amazonaws.com", "eu-central-1"},
+		{"foo.bar.s3.eu-central-1.amazonaws.com", "eu-central-1"},
+		{"foo.s3-eu-central-1.amazonaws.com", "eu-central-1"},
+		{"foo.s3-ap-northeast-1.amazonaws.com", "ap-northeast-1"},
+		{"foo.s3.ap-northeast-2.amazonaws.com", "ap-northeast-2"},
+		{"foo.s3-ap-northeast-2.amazonaws.com", "ap-northeast-2"},
+		{"foo.bar.s3-ap-northeast-2.amazonaws.com", "ap-northeast-2"},
+		{"foo.s3-ap-southeast-1.amazonaws.com", "ap-southeast-1"},
+		{"foo.bar.baz.s3-ap-southeast-2.amazonaws.com", "ap-southeast-2"},
+		{"foo.s3-sa-east-1.amazonaws.com", "sa-east-1"},
+		{"foo.s3-ap-southeast-1.amazonaws.com:443", "ap-southeast-1"},
+		{"foo.bar.baz.s3-us-west-2.amazonaws.com:80", "us-west-2"},
+		{"foo.s3.eu-central-1.amazonaws.com:443", "eu-central-1"},
+		{"entirely.unrecognized.url", defaultAWSRegion},
+	}
+
+	for _, tt := range tests {
+		region := guessAWSRegion(tt.host)
+		if region != tt.region {
+			t.Errorf("Got unexpected result for %s: %s (expected: %s)", tt.host, region, tt.region)
+		}
+	}
+}
diff --git a/rkt/config/config.go b/rkt/config/config.go
index 5349c240ea..2603adeecc 100644
--- a/rkt/config/config.go
+++ b/rkt/config/config.go
@@ -32,7 +32,8 @@ import (
 // Headerer is an interface for getting additional HTTP headers to use
 // when downloading data (images, signatures).
 type Headerer interface {
-	Header() http.Header
+	GetHeader() http.Header
+	SignRequest(r *http.Request) *http.Request
 }
 
 // BasicCredentials holds typical credentials used for authentication
@@ -165,7 +166,7 @@ var (
 func ResolveAuthPerHost(authPerHost map[string]Headerer) map[string]http.Header {
 	hostHeaders := make(map[string]http.Header, len(authPerHost))
 	for k, v := range authPerHost {
-		hostHeaders[k] = v.Header()
+		hostHeaders[k] = v.GetHeader()
 	}
 	return hostHeaders
 }
diff --git a/rkt/config/config_test.go b/rkt/config/config_test.go
index 7476399075..845fe2ce59 100644
--- a/rkt/config/config_test.go
+++ b/rkt/config/config_test.go
@@ -79,7 +79,7 @@ func TestAuthConfigFormat(t *testing.T) {
 		} else if !tt.fail {
 			result := make(map[string]http.Header)
 			for k, v := range cfg.AuthPerHost {
-				result[k] = v.Header()
+				result[k] = v.GetHeader()
 			}
 			if !reflect.DeepEqual(result, tt.expected) {
 				t.Error("Got unexpected results\nResult:\n", result, "\n\nExpected:\n", tt.expected)
@@ -272,7 +272,7 @@ func TestConfigLoading(t *testing.T) {
 	}
 	result := make(map[string]http.Header)
 	for d, h := range cfg.AuthPerHost {
-		result[d] = h.Header()
+		result[d] = h.GetHeader()
 	}
 	expected := map[string]http.Header{
 		"endocode.com": {
diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index a594cfc23d..1c7600a52a 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -146,10 +146,15 @@ type testHeaderer struct {
 	h http.Header
 }
 
-func (h *testHeaderer) Header() http.Header {
+func (h *testHeaderer) GetHeader() http.Header {
 	return h.h
 }
 
+func (h *testHeaderer) SignRequest(r *http.Request) *http.Request {
+	r.Header.Set("Authorization", h.GetHeader().Get("Authorization"))
+	return r
+}
+
 func TestDownloading(t *testing.T) {
 	dir, err := ioutil.TempDir("", "download-image")
 	if err != nil {
diff --git a/rkt/image/httpops.go b/rkt/image/httpops.go
index 84137349e5..87553aafe9 100644
--- a/rkt/image/httpops.go
+++ b/rkt/image/httpops.go
@@ -137,6 +137,7 @@ func (o *httpOps) getSession(u *url.URL, file *os.File, label, etag string) *res
 	return &resumableSession{
 		InsecureSkipTLSVerify: o.InsecureSkipTLSVerify,
 		Headers:               o.getHeaders(u, etag),
+		Headerers:             o.Headers,
 		File:                  file,
 		ETagFilePath:          eTagFilePath,
 		Label:                 label,
@@ -150,22 +151,13 @@ func (o *httpOps) getDownloader(session downloadSession) *downloader {
 }
 
 func (o *httpOps) getHeaders(u *url.URL, etag string) http.Header {
-	options := o.getHeadersForURL(u)
+	options := o.getHeadersForURL(u, etag)
 	if etag != "" {
 		options.Add("If-None-Match", etag)
 	}
 	return options
 }
 
-func (o *httpOps) getHeadersForURL(u *url.URL) http.Header {
-	// Send credentials only over secure channel
-	// TODO(krnowak): This could be controlled with another
-	// insecure flag.
-	if u.Scheme == "https" {
-		if hostOpts, ok := o.Headers[u.Host]; ok {
-			return hostOpts.Header()
-		}
-	}
-
+func (o *httpOps) getHeadersForURL(u *url.URL, etag string) http.Header {
 	return make(http.Header)
 }
diff --git a/rkt/image/resumablesession.go b/rkt/image/resumablesession.go
index 89bbef95cb..eabb5025c2 100644
--- a/rkt/image/resumablesession.go
+++ b/rkt/image/resumablesession.go
@@ -26,6 +26,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/coreos/rkt/rkt/config"
 	"github.com/coreos/rkt/version"
 )
 
@@ -58,8 +59,10 @@ type resumableSession struct {
 	// validation should be skipped.
 	InsecureSkipTLSVerify bool
 	// Headers are HTTP headers to be added to the HTTP
-	// request. Used for authentication.
+	// request. Used for ETAG.
 	Headers http.Header
+	// Headerers used for authentication.
+	Headerers map[string]config.Headerer
 	// File possibly holds the downloaded data - it is used for
 	// resuming interrupted downloads.
 	File *os.File
@@ -311,6 +314,20 @@ func (s *resumableSession) httpRequest(method string, u *url.URL) *http.Request
 
 	s.setHTTPHeaders(req, false)
 
+	// Send credentials only over secure channel
+	// TODO(krnowak): This could be controlled with another
+	// insecure flag.
+	if req.URL.Scheme != "https" {
+		return req
+	}
+
+	if hostOpts, ok := s.Headerers[req.URL.Host]; ok {
+		req = hostOpts.SignRequest(req)
+		if req == nil {
+			panic("Req is nil!")
+		}
+	}
+
 	return req
 }
 

From cdf24a2311e0fb6bbe832c9612be0597d2a66191 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Thu, 19 May 2016 10:25:16 -0700
Subject: [PATCH 0287/1304] store/tree.go: fix multiple things

1. fix slice make, capacity instead of length
2. preallocate slice with capacity to avoid slice growth with append
3. simplify return type
---
 store/tree.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/store/tree.go b/store/tree.go
index 56f9a578a5..5eb8ebcd9a 100644
--- a/store/tree.go
+++ b/store/tree.go
@@ -293,13 +293,13 @@ func FileInfoFromHeader(hdr *tar.Header) *fileInfo {
 		Devmajor: hdr.Devmajor,
 		Devminor: hdr.Devminor,
 	}
-	keys := make([]string, len(hdr.Xattrs))
+	keys := make([]string, 0, len(hdr.Xattrs))
 	for k := range hdr.Xattrs {
 		keys = append(keys, k)
 	}
 	sort.Strings(keys)
 
-	xattrs := make([]xattr, 0)
+	xattrs := make([]xattr, 0, len(keys))
 	for _, k := range keys {
 		xattrs = append(xattrs, xattr{Name: k, Value: hdr.Xattrs[k]})
 	}
@@ -373,10 +373,7 @@ func buildWalker(root string, aw specaci.ArchiveWriter) filepath.WalkFunc {
 			r = nil
 		}
 
-		if err := aw.AddFile(hdr, r); err != nil {
-			return err
-		}
-		return nil
+		return aw.AddFile(hdr, r)
 	}
 }
 

From c4abdbba6e1f804f657205c1baf1ec69230ac95c Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Thu, 19 May 2016 15:23:04 +0300
Subject: [PATCH 0288/1304] *: validate git commit messages

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ca1563148..27d821075a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,15 @@ go:
   - 1.6
 
 before_install:
+ - go get -u github.com/coreos/git-validation
+ - git-validation -run subsystem-in-subject,short-subject,dangling-whitespace
+
+install:
  - sudo apt-get update -qq
  - sudo apt-get install -y cpio realpath squashfs-tools
  - sudo apt-get install -y build-essential
  - sudo apt-get install -y libacl1-dev
 
-install: true
-
 script:
  - ./autogen.sh
  # Build host and fly to ensure we build stage1 init. We don't build everything

From e3e9721a7d151bf19f066b48490720df7af5f379 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Mon, 23 May 2016 13:46:28 +0200
Subject: [PATCH 0289/1304] stage0: complain and abort on conflicting CLI flags
 (#2666)

When a pod manifest is passed to rkt other conflicting
CLI flags are discarded, so far in a silent way.
This commit makes the issue explicit and aborts when conflicting
flags are specified together with `--pod-manifest`.

Fixes #2418
---
 rkt/prepare.go            |  4 ++-
 rkt/run.go                |  4 ++-
 tests/rkt_prepare_test.go | 63 +++++++++++++++++++++++++++++++++++++++
 tests/rkt_run_test.go     | 63 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 132 insertions(+), 2 deletions(-)
 create mode 100644 tests/rkt_prepare_test.go
 create mode 100644 tests/rkt_run_test.go

diff --git a/rkt/prepare.go b/rkt/prepare.go
index 8b537128cb..46ee3ecf9b 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -107,7 +107,9 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagInheritEnv || !flagExplicitEnv.IsEmpty() || flagStoreOnly || flagNoStore) {
+	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagInheritEnv || !flagExplicitEnv.IsEmpty() || flagStoreOnly || flagNoStore ||
+		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" || (*appExec)(&rktApps).String() != "" ||
+		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "") {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
 		return 1
 	}
diff --git a/rkt/run.go b/rkt/run.go
index 6f1198c7d1..c82029adb4 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -148,7 +148,9 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagInheritEnv || !flagExplicitEnv.IsEmpty() || rktApps.Count() > 0 || flagStoreOnly || flagNoStore) {
+	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagInheritEnv || !flagExplicitEnv.IsEmpty() || rktApps.Count() > 0 || flagStoreOnly || flagNoStore ||
+		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" || (*appExec)(&rktApps).String() != "" ||
+		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "") {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
 		return 1
 	}
diff --git a/tests/rkt_prepare_test.go b/tests/rkt_prepare_test.go
new file mode 100644
index 0000000000..538f5e9c0a
--- /dev/null
+++ b/tests/rkt_prepare_test.go
@@ -0,0 +1,63 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src kvm
+
+package main
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+// TestPrepareConflictingFlags tests that 'rkt prepare' will complain and abort
+// if conflicting flags are specified together with a pod manifest.
+func TestPrepareConflictingFlags(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	prepareConflictingFlagsMsg := "conflicting flags set with --pod-manifest (see --help)"
+	podManifestFlag := "--pod-manifest=/dev/null"
+	conflictingFlags := []struct {
+		flag string
+		args string
+	}{
+		{"--inherit-env", ""},
+		{"--no-store", ""},
+		{"--store-only", ""},
+		{"--port=", "foo:80"},
+		{"--set-env=", "foo=bar"},
+		{"--volume=", "foo,kind=host,source=/tmp"},
+		{"--mount=", "volume=foo,target=/tmp --volume=foo,kind=host,source=/tmp"},
+	}
+	imageConflictingFlags := []struct {
+		flag string
+		args string
+	}{
+		{"--exec=", "/bin/sh"},
+		{"--user=", "user_foo"},
+		{"--group=", "group_foo"},
+	}
+
+	for _, cf := range conflictingFlags {
+		cmd := fmt.Sprintf("%s prepare %s %s%s", ctx.Cmd(), podManifestFlag, cf.flag, cf.args)
+		runRktAndCheckOutput(t, cmd, prepareConflictingFlagsMsg, true)
+	}
+	for _, icf := range imageConflictingFlags {
+		cmd := fmt.Sprintf("%s prepare dummy-image.aci %s %s%s", ctx.Cmd(), podManifestFlag, icf.flag, icf.args)
+		runRktAndCheckOutput(t, cmd, prepareConflictingFlagsMsg, true)
+	}
+}
diff --git a/tests/rkt_run_test.go b/tests/rkt_run_test.go
new file mode 100644
index 0000000000..6d321bb20e
--- /dev/null
+++ b/tests/rkt_run_test.go
@@ -0,0 +1,63 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src kvm
+
+package main
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+// TestRunConflictingFlags tests that 'rkt run' will complain and abort
+// if conflicting flags are specified together with a pod manifest.
+func TestRunConflictingFlags(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	runConflictingFlagsMsg := "conflicting flags set with --pod-manifest (see --help)"
+	podManifestFlag := "--pod-manifest=/dev/null"
+	conflictingFlags := []struct {
+		flag string
+		args string
+	}{
+		{"--inherit-env", ""},
+		{"--no-store", ""},
+		{"--store-only", ""},
+		{"--port=", "foo:80"},
+		{"--set-env=", "foo=bar"},
+		{"--volume=", "foo,kind=host,source=/tmp"},
+		{"--mount=", "volume=foo,target=/tmp --volume=foo,kind=host,source=/tmp"},
+	}
+	imageConflictingFlags := []struct {
+		flag string
+		args string
+	}{
+		{"--exec=", "/bin/sh"},
+		{"--user=", "user_foo"},
+		{"--group=", "group_foo"},
+	}
+
+	for _, cf := range conflictingFlags {
+		cmd := fmt.Sprintf("%s run %s %s%s", ctx.Cmd(), podManifestFlag, cf.flag, cf.args)
+		runRktAndCheckOutput(t, cmd, runConflictingFlagsMsg, true)
+	}
+	for _, icf := range imageConflictingFlags {
+		cmd := fmt.Sprintf("%s run dummy-image.aci %s %s%s", ctx.Cmd(), podManifestFlag, icf.flag, icf.args)
+		runRktAndCheckOutput(t, cmd, runConflictingFlagsMsg, true)
+	}
+}

From 300a43ac38cbf85f44bfe9c558539c9dd0bd1e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 18 May 2016 11:11:48 +0200
Subject: [PATCH 0290/1304] stage1: clean up pod cgroups on GC

After a pod exits, there'll be some leftover directories in
/sys/fs/cgroup.

This commit cleans them up on GC.
---
 common/cgroup/cgroup.go |  2 +-
 stage1/gc/gc.go         | 70 +++++++++++++++++++++++++++++++++++++++--
 stage1/init/init.go     | 16 ++++++----
 3 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index 6866220c7c..d30fc03c30 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -375,7 +375,7 @@ func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup st
 	// Mount RW knobs we need to make the enabled isolators work
 	for _, c := range controllers {
 		cPath := filepath.Join(cgroupTmpfs, c)
-		subcgroupPath := filepath.Join(cPath, subcgroup)
+		subcgroupPath := filepath.Join(cPath, subcgroup, "system.slice")
 
 		// Workaround for https://github.com/coreos/rkt/issues/1210
 		if c == "cpuset" {
diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index 991d0082c9..25672a669d 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -19,9 +19,12 @@ package main
 import (
 	"errors"
 	"flag"
+	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
+	"sort"
 	"strings"
 	"syscall"
 
@@ -33,8 +36,13 @@ import (
 	rktlog "github.com/coreos/rkt/pkg/log"
 )
 
+const (
+	cgroupFsPath = "/sys/fs/cgroup"
+)
+
 var (
 	debug bool
+	log   *rktlog.Logger = rktlog.New(os.Stderr, "stage1 gc", debug)
 )
 
 func init() {
@@ -49,8 +57,6 @@ func init() {
 func main() {
 	flag.Parse()
 
-	log := rktlog.New(os.Stderr, "stage1 gc", debug)
-
 	podID, err := types.NewUUID(flag.Arg(0))
 	if err != nil {
 		log.Fatal("UUID is missing or malformed")
@@ -60,6 +66,10 @@ func main() {
 		log.PrintE("error removing journal link", err)
 	}
 
+	if err := cleanupCgroups(); err != nil {
+		log.PrintE("error cleaning up cgroups", err)
+	}
+
 	if err := gcNetworking(podID); err != nil {
 		log.FatalE("", err)
 	}
@@ -104,3 +114,59 @@ func removeJournalLink(uuid *types.UUID) error {
 	}
 	return err
 }
+
+type dirsByLength []string
+
+func (c dirsByLength) Len() int           { return len(c) }
+func (c dirsByLength) Less(i, j int) bool { return len(c[i]) < len(c[j]) }
+func (c dirsByLength) Swap(i, j int)      { c[i], c[j] = c[j], c[i] }
+
+func cleanupCgroups() error {
+	b, err := ioutil.ReadFile("subcgroup")
+	if err != nil {
+		return errwrap.Wrap(errors.New("error reading subcgroup file"), err)
+	}
+	subcgroup := string(b)
+
+	f, err := os.Open(cgroupFsPath)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	ns, err := f.Readdirnames(0)
+	if err != nil {
+		return err
+	}
+	var cgroupDirs []string
+	for _, c := range ns {
+		scPath := filepath.Join(cgroupFsPath, c, subcgroup)
+		walkCgroupDirs := func(path string, info os.FileInfo, err error) error {
+			// if the subcgroup is already removed, we're fine
+			if os.IsNotExist(err) {
+				return nil
+			}
+			if err != nil {
+				return err
+			}
+			mode := info.Mode()
+			if mode.IsDir() {
+				cgroupDirs = append(cgroupDirs, path)
+			}
+			return nil
+		}
+		if err := filepath.Walk(scPath, walkCgroupDirs); err != nil {
+			log.PrintE(fmt.Sprintf("error walking subcgroup %q", scPath), err)
+			continue
+		}
+	}
+
+	// remove descendants before ancestors
+	sort.Sort(sort.Reverse(dirsByLength(cgroupDirs)))
+	for _, d := range cgroupDirs {
+		if err := os.RemoveAll(d); err != nil {
+			log.PrintE(fmt.Sprintf("error removing subcgroup %q", d), err)
+		}
+	}
+
+	return nil
+}
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 94f2730218..b98f84bcd7 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -619,6 +619,11 @@ func stage1() int {
 	machineID := stage1initcommon.GetMachineID(p)
 	subcgroup, err := getContainerSubCgroup(machineID)
 	if err == nil {
+		if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
+			[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
+			log.FatalE("cannot write subcgroup file", err)
+			return 1
+		}
 		if err := mountContainerCgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
 			log.PrintE("couldn't mount the container cgroups", err)
 			return 1
@@ -729,7 +734,7 @@ func getContainerSubCgroup(machineID string) (string, error) {
 		if err != nil {
 			return "", errwrap.Wrap(errors.New("could not get unit name"), err)
 		}
-		subcgroup = filepath.Join(slicePath, unit, "system.slice")
+		subcgroup = filepath.Join(slicePath, unit)
 	} else {
 		escapedmID := strings.Replace(machineID, "-", "\\x2d", -1)
 		machineDir := "machine-" + escapedmID + ".scope"
@@ -737,7 +742,7 @@ func getContainerSubCgroup(machineID string) (string, error) {
 			// we are not in the final cgroup yet: systemd-nspawn will move us
 			// to the correct cgroup later during registration so we can't
 			// look it up in /proc/self/cgroup
-			subcgroup = filepath.Join("machine.slice", machineDir, "system.slice")
+			subcgroup = filepath.Join("machine.slice", machineDir)
 		} else {
 			// when registration is disabled the container will be directly
 			// under the current cgroup so we can look it up in /proc/self/cgroup
@@ -748,11 +753,10 @@ func getContainerSubCgroup(machineID string) (string, error) {
 			// systemd-nspawn won't work if we are in the root cgroup. In addition,
 			// we want all rkt instances to be in distinct cgroups. Create a
 			// subcgroup and add ourselves to it.
-			ownCgroupPath = filepath.Join(ownCgroupPath, machineDir)
-			if err := cgroup.JoinSubcgroup("systemd", ownCgroupPath); err != nil {
-				return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", ownCgroupPath), err)
+			subcgroup = filepath.Join(ownCgroupPath, machineDir)
+			if err := cgroup.JoinSubcgroup("systemd", subcgroup); err != nil {
+				return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", subcgroup), err)
 			}
-			subcgroup = filepath.Join(ownCgroupPath, "system.slice")
 		}
 	}
 

From 3a779ef0aa9f34efebf7ad0540e49993f37dbdc0 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 13 May 2016 15:02:42 +0200
Subject: [PATCH 0291/1304] tests: check current working directory

Add a new test to check that the WorkingDirectory specified in the ACI
manifest is used.
---
 tests/inspect/inspect.go           | 11 ++++-------
 tests/rkt_run_pod_manifest_test.go | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index ad76b27845..6d05ba5891 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -47,7 +47,7 @@ var (
 		PrintCapsPid       int
 		PrintUser          bool
 		PrintGroups        bool
-		CheckCwd           string
+		PrintCwd           bool
 		ExitCode           int
 		ReadFile           bool
 		WriteFile          bool
@@ -83,7 +83,7 @@ func init() {
 	globalFlagset.BoolVar(&globalFlags.PrintExec, "print-exec", false, "Print the command we were execed as (i.e. argv[0])")
 	globalFlagset.StringVar(&globalFlags.PrintMsg, "print-msg", "", "Print the message given as parameter")
 	globalFlagset.StringVar(&globalFlags.SuffixMsg, "suffix-msg", "", "Print this suffix after some commands")
-	globalFlagset.StringVar(&globalFlags.CheckCwd, "check-cwd", "", "Check if the current working directory is the one specified")
+	globalFlagset.BoolVar(&globalFlags.PrintCwd, "print-cwd", false, "Print the current working directory")
 	globalFlagset.StringVar(&globalFlags.PrintEnv, "print-env", "", "Print the specified environment variable")
 	globalFlagset.IntVar(&globalFlags.PrintCapsPid, "print-caps-pid", -1, "Print capabilities of the specified pid (or current process if pid=0)")
 	globalFlagset.BoolVar(&globalFlags.PrintUser, "print-user", false, "Print uid and gid")
@@ -285,16 +285,13 @@ func main() {
 		fmt.Printf("%s: group: %v\n", fileName, fi.Sys().(*syscall.Stat_t).Gid)
 	}
 
-	if globalFlags.CheckCwd != "" {
+	if globalFlags.PrintCwd {
 		wd, err := os.Getwd()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Cannot get working directory: %v\n", err)
 			os.Exit(1)
 		}
-		if wd != globalFlags.CheckCwd {
-			fmt.Fprintf(os.Stderr, "Working directory: %q. Expected: %q.\n", wd, globalFlags.CheckCwd)
-			os.Exit(1)
-		}
+		fmt.Printf("cwd: %s\n", wd)
 	}
 
 	if globalFlags.Sleep >= 0 {
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 2b46ee6cb7..7ff003ca63 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -119,6 +119,28 @@ func TestPodManifest(t *testing.T) {
 			`'"[$]`,
 			"",
 		},
+		{
+			// Working directory.
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-working-directory.aci", []string{}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:             []string{"/inspect", "--print-cwd"},
+							User:             "0",
+							Group:            "0",
+							WorkingDirectory: "/dir1",
+						},
+					},
+				},
+			},
+			0,
+			"cwd: /dir1",
+			"",
+		},
 		{
 			// Simple read.
 			[]imagePatch{

From a97a0d327a9f6455cd245414e6b0ba3a98659d3b Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 23 May 2016 13:35:18 -0700
Subject: [PATCH 0292/1304] tests/rkt_api_service_test.go: Also check PID when
 polling the pod.

This fixes the flaky test where pod is RUNNING but pid file and
network info files are not ready.
---
 tests/rkt_api_service_test.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index fe41f42aec..f4885600de 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -153,7 +153,11 @@ func checkPodNetworks(t *testing.T, rawNets map[string]*networkInfo, apiNets []*
 
 // Check the pod's information by 'rkt status'.
 func checkPod(t *testing.T, ctx *testutils.RktRunCtx, p *v1alpha.Pod, hasAppState, hasManifest bool, expectedGCTime time.Time) {
+	t.Logf("API Pod info: %v", p)
+
 	podInfo := getPodInfo(t, ctx, p.Id)
+	t.Logf("Pod info: %+v", podInfo)
+
 	if podInfo.id != p.Id {
 		t.Errorf("Expected %q, saw %q", podInfo.id, p.Id)
 	}
@@ -525,7 +529,7 @@ func NewAPIServiceCgroupTest() testutils.Test {
 				if len(resp.Pods) != 0 {
 					allRunning := true
 					for _, p := range resp.Pods {
-						if p.State != v1alpha.PodState_POD_STATE_RUNNING {
+						if p.State != v1alpha.PodState_POD_STATE_RUNNING || p.Pid == -1 {
 							allRunning = false
 							break
 						}

From 7825ddb98015bfa678f83a6f5310e8337325c8d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 24 May 2016 13:07:35 +0200
Subject: [PATCH 0293/1304] Revert "Revert "stage1/prepare-app: avoid recursive
 bind-mounts on /sys""

This reverts commit 3256dae2e25bb0227aa5151b6e3f416b6926a3cc.
---
 stage1/prepare-app/prepare-app.c | 71 +++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index beaf54792e..7f14874704 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -21,6 +21,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/vfs.h>
+#include <dirent.h>
 
 #define err_out(_fmt, _args...)						\
 		fprintf(stderr, "Error: " _fmt "\n", ##_args);
@@ -50,6 +52,10 @@ static int exit_err;
 #define MACHINE_ID_LEN		lenof("0123456789abcdef0123456789abcdef")
 #define MACHINE_NAME_LEN	lenof("rkt-01234567-89ab-cdef-0123-456789abcdef")
 
+#ifndef CGROUP2_SUPER_MAGIC
+#define CGROUP2_SUPER_MAGIC 0x63677270
+#endif
+
 typedef struct _dir_op_t {
 	const char	*name;
 	mode_t		mode;
@@ -119,6 +125,66 @@ static int ensure_etc_hosts_exists(const char *root, int rootfd) {
 	return 0;
 }
 
+static void mount_sys(const char *root)
+{
+	char from[4096];
+	char to[4096];
+	struct statfs fs;
+	DIR *dir = NULL;
+	struct dirent *d;
+
+	pexit_if(statfs("/sys/fs/cgroup", &fs) != 0,
+	         "Cannot statfs /sys/fs/cgroup");
+	if (fs.f_type == (typeof(fs.f_type)) CGROUP2_SUPER_MAGIC) {
+		/* With the unified cgroup hierarchy, recursive bind mounts
+		 * are fine. */
+		exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
+			"Path too long: \"%s\"", to);
+		pexit_if(mount("/sys", to, "bind",
+			       MS_BIND | MS_REC, "NULL") == -1,
+				"Mounting \"%s\" on \"%s\" failed", "/sys", to);
+		return;
+	}
+
+	/* With cgroup-v1, rkt and systemd-nspawn add more cgroup
+	 * bind-mounts to control which files are read-only. To avoid
+	 * a quadratic progression, prepare-app does not bind mount
+	 * /sys recursively. See:
+	 * https://github.com/coreos/rkt/issues/2351 */
+	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
+		"Path too long: \"%s\"", to);
+	pexit_if(mount("/sys", to, "bind",
+		       MS_BIND, "NULL") == -1,
+			"Mounting \"%s\" on \"%s\" failed", "/sys", to);
+
+	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys/fs/cgroup") >= sizeof(to),
+		"Path too long: \"%s\"", to);
+	pexit_if(mount("/sys/fs/cgroup", to, "bind",
+		       MS_BIND, "NULL") == -1,
+			"Mounting \"%s\" on \"%s\" failed", "/sys/fs/cgroup", to);
+
+	pexit_if(!(dir = opendir(to)), "Failed to open directory \"%s\"", to)
+	errno = 0;
+	while ((d = readdir(dir))) {
+		if (d->d_type != DT_DIR)
+			continue;
+		if (strcmp(d->d_name, ".") == 0)
+			continue;
+		if (strcmp(d->d_name, "..") == 0)
+			continue;
+
+		exit_if(snprintf(from, sizeof(from), "/sys/fs/cgroup/%s", d->d_name) >= sizeof(from),
+			"Path too long: \"%s\"", from);
+		exit_if(snprintf(to, sizeof(to), "%s/sys/fs/cgroup/%s", root, d->d_name) >= sizeof(to),
+			"Path too long: \"%s\"", to);
+		pexit_if(mount(from, to, "bind",
+			       MS_BIND, "NULL") == -1,
+				"Mounting \"%s\" on \"%s\" failed", from, to);
+	}
+	pexit_if(errno != 0, "Failed to read directory \"%s\"", to);
+	pexit_if(closedir(dir) != 0, "Failed to close directory");
+}
+
 int main(int argc, char *argv[])
 {
 	static const char *unlink_paths[] = {
@@ -152,10 +218,10 @@ int main(int argc, char *argv[])
 	};
 	static const mount_point dirs_mount_table[] = {
 		{ "/proc", "/proc", "bind", NULL, MS_BIND|MS_REC },
-		{ "/sys", "/sys", "bind", NULL, MS_BIND|MS_REC },
 		{ "/dev/shm", "/dev/shm", "bind", NULL, MS_BIND },
 		{ "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND },
 		{ "/run/systemd/journal", "/run/systemd/journal", "bind", NULL, MS_BIND },
+		/* /sys is handled separately */
 	};
 	static const mount_point files_mount_table[] = {
 		{ "/etc/rkt-resolv.conf", "/etc/resolv.conf", "bind", NULL, MS_BIND },
@@ -260,6 +326,9 @@ int main(int argc, char *argv[])
 				"Mounting \"%s\" on \"%s\" failed", mnt->source, to);
 	}
 
+	/* Bind mount /sys: handled differently, depending on cgroups */
+	mount_sys(root);
+
 	/* Bind mount files, if the source exists */
 	for (i = 0; i < nelems(files_mount_table); i++) {
 		const mount_point *mnt = &files_mount_table[i];

From d18fe507ae3d77109bec3f33260c130b79c6faa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 24 May 2016 13:07:39 +0200
Subject: [PATCH 0294/1304] Revert "Revert "stage1/prepare-app: check for user
 namespace env""

This reverts commit b5bf7a0bb4187b83e678041cf1ec8595a3aff314.
---
 stage1/prepare-app/prepare-app.c | 85 +++++++++++++++++++++-----------
 1 file changed, 57 insertions(+), 28 deletions(-)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 7f14874704..0c722f07bf 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <dirent.h>
+#include <inttypes.h>
 
 #define err_out(_fmt, _args...)						\
 		fprintf(stderr, "Error: " _fmt "\n", ##_args);
@@ -52,6 +53,8 @@ static int exit_err;
 #define MACHINE_ID_LEN		lenof("0123456789abcdef0123456789abcdef")
 #define MACHINE_NAME_LEN	lenof("rkt-01234567-89ab-cdef-0123-456789abcdef")
 
+#define UNMAPPED ((uid_t) -1)
+
 #ifndef CGROUP2_SUPER_MAGIC
 #define CGROUP2_SUPER_MAGIC 0x63677270
 #endif
@@ -125,44 +128,78 @@ static int ensure_etc_hosts_exists(const char *root, int rootfd) {
 	return 0;
 }
 
+static void mount_at(const char *root, const mount_point *mnt)
+{
+	char to[4096];
+	exit_if(snprintf(to, sizeof(to), "%s/%s", root, mnt->target) >= sizeof(to),
+		"Path too long: \"%s\"", to);
+	pexit_if(mount(mnt->source, to, mnt->type,
+		       mnt->flags, mnt->options) == -1,
+		 "Mounting \"%s\" on \"%s\" failed", mnt->source, to);
+}
+
 static void mount_sys(const char *root)
 {
-	char from[4096];
+	int i;
 	char to[4096];
 	struct statfs fs;
 	DIR *dir = NULL;
 	struct dirent *d;
+	const mount_point mnt_rec = { "/sys", "sys", "bind", NULL, MS_BIND|MS_REC };
+	const mount_point sys_bind_table[] = {
+		{ "/sys", "sys", "bind", NULL, MS_BIND },
+		{ "/sys/fs/cgroup", "sys/fs/cgroup", "bind", NULL, MS_BIND },
+	};
 
 	pexit_if(statfs("/sys/fs/cgroup", &fs) != 0,
 	         "Cannot statfs /sys/fs/cgroup");
 	if (fs.f_type == (typeof(fs.f_type)) CGROUP2_SUPER_MAGIC) {
 		/* With the unified cgroup hierarchy, recursive bind mounts
 		 * are fine. */
-		exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
-			"Path too long: \"%s\"", to);
-		pexit_if(mount("/sys", to, "bind",
-			       MS_BIND | MS_REC, "NULL") == -1,
-				"Mounting \"%s\" on \"%s\" failed", "/sys", to);
+		mount_at(root, &mnt_rec);
 		return;
 	}
 
+	// For security reasons recent Linux kernels do not allow to bind-mount non-recursively
+	// if it would give read-write access to other subdirectories mounted as read-only.
+	// Hence we have to check if we are in a user namespaced environment and bind mount recursively instead.
+	if (access("/proc/1/uid_map", F_OK) == 0) {
+		FILE *f;
+		int k;
+		uid_t uid_base, uid_shift, uid_range;
+
+		pexit_if((f = fopen("/proc/1/uid_map", "re")) == NULL,
+			 "Unable to open /proc/1/uid_map");
+
+		if (sizeof(uid_t) == 4) {
+			k = fscanf(f, "%"PRIu32" %"PRIu32" %"PRIu32,
+				   &uid_base, &uid_shift, &uid_range);
+		} else {
+			k = fscanf(f, "%"PRIu16" %"PRIu16" %"PRIu16,
+				   &uid_base, &uid_shift, &uid_range);
+		}
+		pexit_if(fclose(f) != 0, "Unable to close /proc/1/uid_map");
+		pexit_if(k != 3, "Invalid uid_map format");
+
+		// do a recursive bind mount if we are in a user namespace having a parent namespace set,
+		// i.e. either one of uid base, shift, or the range is set, see user_namespaces(7).
+		if (uid_base != 0 || uid_shift != 0 || uid_range != UNMAPPED) {
+			mount_at(root, &mnt_rec);
+			return;
+		}
+	}
+
 	/* With cgroup-v1, rkt and systemd-nspawn add more cgroup
 	 * bind-mounts to control which files are read-only. To avoid
 	 * a quadratic progression, prepare-app does not bind mount
 	 * /sys recursively. See:
 	 * https://github.com/coreos/rkt/issues/2351 */
-	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys") >= sizeof(to),
-		"Path too long: \"%s\"", to);
-	pexit_if(mount("/sys", to, "bind",
-		       MS_BIND, "NULL") == -1,
-			"Mounting \"%s\" on \"%s\" failed", "/sys", to);
+	for (i = 0; i < nelems(sys_bind_table); i++) {
+		mount_at(root, &sys_bind_table[i]);
+	}
 
 	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys/fs/cgroup") >= sizeof(to),
 		"Path too long: \"%s\"", to);
-	pexit_if(mount("/sys/fs/cgroup", to, "bind",
-		       MS_BIND, "NULL") == -1,
-			"Mounting \"%s\" on \"%s\" failed", "/sys/fs/cgroup", to);
-
 	pexit_if(!(dir = opendir(to)), "Failed to open directory \"%s\"", to)
 	errno = 0;
 	while ((d = readdir(dir))) {
@@ -173,13 +210,11 @@ static void mount_sys(const char *root)
 		if (strcmp(d->d_name, "..") == 0)
 			continue;
 
-		exit_if(snprintf(from, sizeof(from), "/sys/fs/cgroup/%s", d->d_name) >= sizeof(from),
-			"Path too long: \"%s\"", from);
-		exit_if(snprintf(to, sizeof(to), "%s/sys/fs/cgroup/%s", root, d->d_name) >= sizeof(to),
+		exit_if(snprintf(to, sizeof(to), "sys/fs/cgroup/%s", d->d_name) >= sizeof(to),
 			"Path too long: \"%s\"", to);
-		pexit_if(mount(from, to, "bind",
-			       MS_BIND, "NULL") == -1,
-				"Mounting \"%s\" on \"%s\" failed", from, to);
+
+		mount_point mnt = { to, to, "bind", NULL, MS_BIND };
+		mount_at(root, &mnt);
 	}
 	pexit_if(errno != 0, "Failed to read directory \"%s\"", to);
 	pexit_if(closedir(dir) != 0, "Failed to close directory");
@@ -317,13 +352,7 @@ int main(int argc, char *argv[])
 
 	/* Bind mount directories */
 	for (i = 0; i < nelems(dirs_mount_table); i++) {
-		const mount_point *mnt = &dirs_mount_table[i];
-
-		exit_if(snprintf(to, sizeof(to), "%s/%s", root, mnt->target) >= sizeof(to),
-			"Path too long: \"%s\"", to);
-		pexit_if(mount(mnt->source, to, mnt->type,
-			       mnt->flags, mnt->options) == -1,
-				"Mounting \"%s\" on \"%s\" failed", mnt->source, to);
+		mount_at(root, &dirs_mount_table[i]);
 	}
 
 	/* Bind mount /sys: handled differently, depending on cgroups */

From 2954a5814635027887bf6c77b2708a5502d89d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 24 May 2016 13:11:42 +0200
Subject: [PATCH 0295/1304] stage1/prepare-app: don't mount /sys/fs/cgroup in
 stage2

The previous two patches make rkt not do a recursive bind-mount on /sys
unless we use user namespaces (the kernel doesn't allow that). However,
SELinux doesn't allow mounting `/sys/fs/cgroup` manually in that case.

Since the spec doesn't say apps should have a view of /sys/fs/cgroup,
let's not mount it in stage2.
---
 stage1/prepare-app/prepare-app.c | 40 ++++----------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 0c722f07bf..db42773a4b 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -140,23 +140,16 @@ static void mount_at(const char *root, const mount_point *mnt)
 
 static void mount_sys(const char *root)
 {
-	int i;
-	char to[4096];
 	struct statfs fs;
-	DIR *dir = NULL;
-	struct dirent *d;
-	const mount_point mnt_rec = { "/sys", "sys", "bind", NULL, MS_BIND|MS_REC };
-	const mount_point sys_bind_table[] = {
-		{ "/sys", "sys", "bind", NULL, MS_BIND },
-		{ "/sys/fs/cgroup", "sys/fs/cgroup", "bind", NULL, MS_BIND },
-	};
+	const mount_point sys_bind_rec = { "/sys", "sys", "bind", NULL, MS_BIND|MS_REC };
+	const mount_point sys_bind = { "/sys", "sys", "bind", NULL, MS_BIND };
 
 	pexit_if(statfs("/sys/fs/cgroup", &fs) != 0,
 	         "Cannot statfs /sys/fs/cgroup");
 	if (fs.f_type == (typeof(fs.f_type)) CGROUP2_SUPER_MAGIC) {
 		/* With the unified cgroup hierarchy, recursive bind mounts
 		 * are fine. */
-		mount_at(root, &mnt_rec);
+		mount_at(root, &sys_bind_rec);
 		return;
 	}
 
@@ -184,7 +177,7 @@ static void mount_sys(const char *root)
 		// do a recursive bind mount if we are in a user namespace having a parent namespace set,
 		// i.e. either one of uid base, shift, or the range is set, see user_namespaces(7).
 		if (uid_base != 0 || uid_shift != 0 || uid_range != UNMAPPED) {
-			mount_at(root, &mnt_rec);
+			mount_at(root, &sys_bind_rec);
 			return;
 		}
 	}
@@ -194,30 +187,7 @@ static void mount_sys(const char *root)
 	 * a quadratic progression, prepare-app does not bind mount
 	 * /sys recursively. See:
 	 * https://github.com/coreos/rkt/issues/2351 */
-	for (i = 0; i < nelems(sys_bind_table); i++) {
-		mount_at(root, &sys_bind_table[i]);
-	}
-
-	exit_if(snprintf(to, sizeof(to), "%s/%s", root, "sys/fs/cgroup") >= sizeof(to),
-		"Path too long: \"%s\"", to);
-	pexit_if(!(dir = opendir(to)), "Failed to open directory \"%s\"", to)
-	errno = 0;
-	while ((d = readdir(dir))) {
-		if (d->d_type != DT_DIR)
-			continue;
-		if (strcmp(d->d_name, ".") == 0)
-			continue;
-		if (strcmp(d->d_name, "..") == 0)
-			continue;
-
-		exit_if(snprintf(to, sizeof(to), "sys/fs/cgroup/%s", d->d_name) >= sizeof(to),
-			"Path too long: \"%s\"", to);
-
-		mount_point mnt = { to, to, "bind", NULL, MS_BIND };
-		mount_at(root, &mnt);
-	}
-	pexit_if(errno != 0, "Failed to read directory \"%s\"", to);
-	pexit_if(closedir(dir) != 0, "Failed to close directory");
+	mount_at(root, &sys_bind);
 }
 
 int main(int argc, char *argv[])

From 376ce85b46683288b7a262197497d2993fca9cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 18 May 2016 12:36:45 +0200
Subject: [PATCH 0296/1304] functional tests: add a test for cleaning cgroups

---
 tests/rkt_gc_nspawn_test.go | 76 +++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 tests/rkt_gc_nspawn_test.go

diff --git a/tests/rkt_gc_nspawn_test.go b/tests/rkt_gc_nspawn_test.go
new file mode 100644
index 0000000000..5324ba0b4c
--- /dev/null
+++ b/tests/rkt_gc_nspawn_test.go
@@ -0,0 +1,76 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func getPodCgroups(shortUUID string) ([]string, error) {
+	var podCgroups []string
+	walkCgroups := func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.Mode().IsDir() && strings.Contains(path, shortUUID) {
+			podCgroups = append(podCgroups, path)
+		}
+		return nil
+	}
+	if err := filepath.Walk("/sys/fs/cgroup", walkCgroups); err != nil {
+		return nil, err
+	}
+	return podCgroups, nil
+}
+
+func TestGCCgroup(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	imagePath := patchImportAndFetchHash("inspect-gc-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
+	defer os.Remove(imagePath)
+	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
+	uuid := runRktAndGetUUID(t, cmd)
+	shortUUID := strings.Split(uuid, "-")[0]
+
+	cmd = fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), shortUUID)
+	runRktAndCheckOutput(t, cmd, "", false)
+
+	cgs, err := getPodCgroups(shortUUID)
+	if err != nil {
+		t.Fatalf("error getting pod cgroups: %v", err)
+	}
+	if len(cgs) == 0 {
+		t.Fatalf("expected pod cgroup directories after run, but found none")
+	}
+
+	runGC(t, ctx)
+
+	cgs, err = getPodCgroups(shortUUID)
+	if err != nil {
+		t.Fatalf("error getting pod cgroups: %v", err)
+	}
+	if len(cgs) > 0 {
+		t.Fatalf(fmt.Sprintf("expected no pod cgroup directories after GC, but found %d: %v", len(cgs), cgs))
+	}
+}

From 91c39caf793d1060b6bda1a99e145f87de9b69ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 23 May 2016 11:23:13 +0200
Subject: [PATCH 0297/1304] functional tests: add tests for rkt rm

---
 tests/rkt_rm_nspawn_test.go | 59 +++++++++++++++++++++++++++
 tests/rkt_rm_test.go        | 81 +++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)
 create mode 100644 tests/rkt_rm_nspawn_test.go
 create mode 100644 tests/rkt_rm_test.go

diff --git a/tests/rkt_rm_nspawn_test.go b/tests/rkt_rm_nspawn_test.go
new file mode 100644
index 0000000000..eb7e3205c1
--- /dev/null
+++ b/tests/rkt_rm_nspawn_test.go
@@ -0,0 +1,59 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestRmCgroup(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	imagePath := patchImportAndFetchHash("inspect-rm-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
+	defer os.Remove(imagePath)
+	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
+	uuid := runRktAndGetUUID(t, cmd)
+	shortUUID := strings.Split(uuid, "-")[0]
+
+	cmd = fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), shortUUID)
+	runRktAndCheckOutput(t, cmd, "", false)
+
+	cgs, err := getPodCgroups(shortUUID)
+	if err != nil {
+		t.Fatalf("error getting pod cgroups: %v", err)
+	}
+	if len(cgs) == 0 {
+		t.Fatalf("expected pod cgroup directories after run, but found none")
+	}
+
+	rmCmd := fmt.Sprintf("%s rm %s", ctx.Cmd(), shortUUID)
+	spawnAndWaitOrFail(t, rmCmd, 0)
+
+	cgs, err = getPodCgroups(shortUUID)
+	if err != nil {
+		t.Fatalf("error getting pod cgroups: %v", err)
+	}
+	if len(cgs) > 0 {
+		t.Fatalf(fmt.Sprintf("expected no pod cgroup directories after GC, but found %d: %v", len(cgs), cgs))
+	}
+}
diff --git a/tests/rkt_rm_test.go b/tests/rkt_rm_test.go
new file mode 100644
index 0000000000..f677aa86d7
--- /dev/null
+++ b/tests/rkt_rm_test.go
@@ -0,0 +1,81 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src kvm
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestRm(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	var uuids []string
+
+	img := patchTestACI("inspect-rm-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}...)
+	defer os.Remove(img)
+	prepareCmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), img)
+
+	// Finished pod.
+	uuid := runRktAndGetUUID(t, prepareCmd)
+	runPreparedCmd := fmt.Sprintf("%s --insecure-options=image run-prepared %s", ctx.Cmd(), uuid)
+	runRktAndCheckOutput(t, runPreparedCmd, "", false)
+
+	uuids = append(uuids, uuid)
+
+	// Prepared pod.
+	uuid = runRktAndGetUUID(t, prepareCmd)
+	uuids = append(uuids, uuid)
+
+	podDirs := []string{
+		filepath.Join(ctx.DataDir(), "pods", "run"),
+		filepath.Join(ctx.DataDir(), "pods", "prepared"),
+	}
+
+	for _, dir := range podDirs {
+		pods, err := ioutil.ReadDir(dir)
+		if err != nil {
+			t.Fatalf("cannot read pods directory %q: %v", dir, err)
+		}
+		if len(pods) == 0 {
+			t.Fatalf("pods should still exist in directory %q: %v", dir, pods)
+		}
+	}
+
+	for _, u := range uuids {
+		cmd := fmt.Sprintf("%s rm %s", ctx.Cmd(), u)
+		spawnAndWaitOrFail(t, cmd, 0)
+	}
+
+	podDirs = append(podDirs, filepath.Join(ctx.DataDir(), "pods", "exited-garbage"))
+
+	for _, dir := range podDirs {
+		pods, err := ioutil.ReadDir(dir)
+		if err != nil {
+			t.Fatalf("cannot read pods directory %q: %v", dir, err)
+		}
+		if len(pods) != 0 {
+			t.Errorf("no pods should exist in directory %q, but found: %v", dir, pods)
+		}
+	}
+}

From 24f133405aa990bef9b03245d2c3f5b86282832b Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Mon, 23 May 2016 16:35:26 +0200
Subject: [PATCH 0298/1304] MAINTAINERS: add Luca Bruno (@lucab)

---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index b8303539e0..1df9151f47 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,6 +4,7 @@ Derek Gonyeo <derek.gonyeo@coreos.com> (@dgonyeo)
 Iago López Galeiras <iago.lopez@coreos.com> (@iaguis)
 Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle)
 Krzesimir Nowak <krzesimir.nowak@coreos.com> (@krnowak)
+Luca Bruno <luca.bruno@coreos.com> (@lucab)
 Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak)
 Stefan Junker <stefan.junker@coreos.com> (@steveeJ)
 Tamer Tas <tamer.tas@coreos.com> (@tmrts)

From 99ae3bec39a1e3e923ffb64a4779f326c82e165d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 24 May 2016 11:03:43 +0200
Subject: [PATCH 0299/1304] rkt: fix panic on rm a non-existing pod with
 uuid-file

We were trusting that the value in the uuid file referred to an existing
pod, which caused a panic if that wasn't the case.

In this commit we resolve the UUID to check if the pod actually exists.

Also, make rm's behavior consistent between caling it with a pod UUID
and with `--uuid-file`:

* Print a similar error message
* Set the exit status to 1 if we fail to remove any pod
---
 rkt/rm.go   | 10 ++++++----
 rkt/uuid.go |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/rkt/rm.go b/rkt/rm.go
index 7d29188eb0..8c9816b32f 100644
--- a/rkt/rm.go
+++ b/rkt/rm.go
@@ -43,20 +43,23 @@ func runRm(cmd *cobra.Command, args []string) (exit int) {
 	var podUUIDs []*types.UUID
 	var err error
 
+	ret := 0
 	switch {
 	case len(args) == 0 && flagUUIDFile != "":
 		podUUID, err = readUUIDFromFile(flagUUIDFile)
 		if err != nil {
-			stderr.PrintE("unable to read UUID from file", err)
-			return 1
+			stderr.PrintE("unable to resolve UUID from file", err)
+			ret = 1
+		} else {
+			podUUIDs = append(podUUIDs, podUUID)
 		}
-		podUUIDs = append(podUUIDs, podUUID)
 
 	case len(args) > 0 && flagUUIDFile == "":
 		for _, uuid := range args {
 			podUUID, err := resolveUUID(uuid)
 			if err != nil {
 				stderr.PrintE("unable to resolve UUID", err)
+				ret = 1
 			} else {
 				podUUIDs = append(podUUIDs, podUUID)
 			}
@@ -67,7 +70,6 @@ func runRm(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	ret := 0
 	for _, podUUID = range podUUIDs {
 		p, err := getPod(podUUID)
 		if err != nil {
diff --git a/rkt/uuid.go b/rkt/uuid.go
index 5d86f3d115..3969beeb60 100644
--- a/rkt/uuid.go
+++ b/rkt/uuid.go
@@ -77,7 +77,7 @@ func readUUIDFromFile(path string) (*types.UUID, error) {
 	}
 	uuid = bytes.TrimSpace(uuid)
 
-	return types.NewUUID(string(uuid))
+	return resolveUUID(string(uuid))
 }
 
 func writeUUIDToFile(uuid *types.UUID, path string) error {

From 4c9e24ea62d1685a2e1124cef9e4cac84cec23fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 24 May 2016 11:34:03 +0200
Subject: [PATCH 0300/1304] functional tests: add tests for rkt rm

---
 tests/rkt_rm_test.go | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/rkt_rm_test.go b/tests/rkt_rm_test.go
index f677aa86d7..38ef516001 100644
--- a/tests/rkt_rm_test.go
+++ b/tests/rkt_rm_test.go
@@ -79,3 +79,24 @@ func TestRm(t *testing.T) {
 		}
 	}
 }
+
+func TestRmInvalid(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	nonexistentUUID := "0f746094-3438-42bc-ab37-3cf85f132e60"
+	tmpDir := createTempDirOrPanic("rkt_rm_test")
+	defer os.RemoveAll(tmpDir)
+	uuidFile := filepath.Join(tmpDir, "uuid-file")
+	if err := ioutil.WriteFile(uuidFile, []byte(nonexistentUUID), 0600); err != nil {
+		t.Fatalf("cannot write uuid-file: %v", err)
+	}
+
+	expected := fmt.Sprintf("no matches found for %q", nonexistentUUID)
+
+	cmd := fmt.Sprintf("%s rm %s", ctx.Cmd(), nonexistentUUID)
+	runRktAndCheckOutput(t, cmd, expected, true)
+
+	cmd = fmt.Sprintf("%s rm --uuid-file=%s", ctx.Cmd(), uuidFile)
+	runRktAndCheckOutput(t, cmd, expected, true)
+}

From 47c897b5a7fa920a986c74572c1bf65bf08deac7 Mon Sep 17 00:00:00 2001
From: Matthias Jahn <matthias.jahn@peerigon.com>
Date: Thu, 12 May 2016 14:37:12 +0200
Subject: [PATCH 0301/1304] docs: add 'journalctl -m _MACHINE_ID' to docs

Docs only showed a way to access logs from running container

Fixes #1528
---
 Documentation/commands.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 3c6258b5a0..19e9ce852c 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -124,3 +124,15 @@ $ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4 -t redis
 ```
 
 Additionaly, logs can be programmatically accessed via the [sd-journal API](https://www.freedesktop.org/software/systemd/man/sd-journal.html).
+
+##### Stopped pod
+
+To read the logs of a stopped pod, use:
+
+```
+journalctl -m _MACHINE_ID=132f9d560e3f4d1eba8668efd488bb62
+
+[...]
+```
+
+On some distributions such as Ubuntu, persistent journal storage is not enabled by default. In this case, it is not possible to get the logs of a stopped pod. Persistent journal storage can be enabled with `sudo mkdir /var/log/journal` before starting the pods.

From 93c53711b903e8cf29bc7d77ea86a79eb9612d34 Mon Sep 17 00:00:00 2001
From: Tamer TAS <tmrts@users.noreply.github.com>
Date: Tue, 24 May 2016 19:43:23 +0300
Subject: [PATCH 0302/1304] git-validation: disable short-subject validation

Complains when the commit is a merge commit, it shouldn't!

Discovered in  #2684

cc @lucab
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 27d821075a..fc02f1fd7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ go:
 
 before_install:
  - go get -u github.com/coreos/git-validation
- - git-validation -run subsystem-in-subject,short-subject,dangling-whitespace
+ - git-validation -run subsystem-in-subject,dangling-whitespace
 
 install:
  - sudo apt-get update -qq

From 18b43b3cf96900ff1cd346f1abd3914d684ea3e4 Mon Sep 17 00:00:00 2001
From: Wlodzimierz Borkowski <wlodzimierz.borkowski@intel.com>
Date: Fri, 6 May 2016 08:55:52 +0200
Subject: [PATCH 0303/1304] tests: rkt-monitor add new statistics

New statistics for load average and boot/stop time measure of container.
Diferences are measured in a nanoseconds. Godeps updated as well.
Change network from 'host' to 'default-restricted' since kvm flavor
can't create this type.
---
 .../benchmarks/rkt-1-4-0-benchmarks.md        | 13 ++++
 Godeps/Godeps.json                            |  5 ++
 .../github.com/shirou/gopsutil/load/load.go   | 35 +++++++++
 .../shirou/gopsutil/load/load_darwin.go       | 67 ++++++++++++++++
 .../shirou/gopsutil/load/load_freebsd.go      | 65 ++++++++++++++++
 .../shirou/gopsutil/load/load_linux.go        | 78 +++++++++++++++++++
 .../shirou/gopsutil/load/load_windows.go      | 19 +++++
 tests/rkt-monitor/README.md                   |  3 +
 tests/rkt-monitor/main.go                     | 19 ++++-
 9 files changed, 301 insertions(+), 3 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go
 create mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go

diff --git a/Documentation/benchmarks/rkt-1-4-0-benchmarks.md b/Documentation/benchmarks/rkt-1-4-0-benchmarks.md
index 1bf729988f..ffed74e972 100644
--- a/Documentation/benchmarks/rkt-1-4-0-benchmarks.md
+++ b/Documentation/benchmarks/rkt-1-4-0-benchmarks.md
@@ -17,6 +17,10 @@ rkt(18493): seconds alive: 10  avg CPU: 28.314541%  avg Mem: 2 mB  peak Mem: 2 m
 systemd(18515): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(18517): seconds alive: 9  avg CPU: 88.397098%  avg Mem: 7 mB  peak Mem: 7 mB
 worker(18521): seconds alive: 9  avg CPU: 7.330367%  avg Mem: 5 mB  peak Mem: 6 mB
+load average in a container: Load1: 0.390000 Load5: 0.120000 Load15: 0.080000
+container start time: 250721ns
+container stop time: 17332926ns
+
 ```
 
 ### mem-stresser.aci
@@ -26,6 +30,9 @@ worker(18634): seconds alive: 9  avg CPU: 98.550401%  avg Mem: 318 mB  peak Mem:
 rkt(18599): seconds alive: 10  avg CPU: 3.583814%  avg Mem: 2 mB  peak Mem: 2 mB
 systemd(18628): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(18630): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB
+load average in a container: Load1: 0.310000 Load5: 0.150000 Load15: 0.090000
+container start time: 259746ns
+container stop time: 17593446ns
 ```
 
 ### cpu-stresser.aci
@@ -35,6 +42,9 @@ rkt(18706): seconds alive: 10  avg CPU: 3.587050%  avg Mem: 2 mB  peak Mem: 2 mB
 systemd(18736): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(18740): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB
 worker(18744): seconds alive: 9  avg CPU: 88.937493%  avg Mem: 808 kB  peak Mem: 808 kB
+load average in a container: Load1: 0.310000 Load5: 0.130000 Load15: 0.080000
+container start time: 296570ns
+container stop time: 16124700ns
 ```
 
 ### too-many-apps.podmanifest
@@ -45,5 +55,8 @@ rkt(17227): seconds alive: 20  avg CPU: 9.595387%  avg Mem: 3 mB  peak Mem: 20 m
 systemd(17253): seconds alive: 17  avg CPU: 0.329028%  avg Mem: 16 mB  peak Mem: 16 mB
 systemd-journal(17255): seconds alive: 17  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB
 worker-binary(17883): seconds alive: 17  avg CPU: 0.000000%  avg Mem: 840 kB  peak Mem: 840 kB
+load average: Load1: 0.480000 Load5: 0.350000 Load15: 0.300000
+container start time: 528476ns
+container stop time: 4522346ns
 ```
 
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index e58a951fae..89f430688c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -506,6 +506,11 @@
 			"Comment": "v2.0.0-10-g9ef3410",
 			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
 		},
+		{
+			"ImportPath": "github.com/shirou/gopsutil/load",
+			"Comment": "v2.0.0-10-g9ef3410",
+			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/mem",
 			"Comment": "v2.0.0-10-g9ef3410",
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go
new file mode 100644
index 0000000000..dfe32a1e81
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go
@@ -0,0 +1,35 @@
+package load
+
+import (
+	"encoding/json"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var invoke common.Invoker
+
+func init() {
+	invoke = common.Invoke{}
+}
+
+type AvgStat struct {
+	Load1  float64 `json:"load1"`
+	Load5  float64 `json:"load5"`
+	Load15 float64 `json:"load15"`
+}
+
+func (l AvgStat) String() string {
+	s, _ := json.Marshal(l)
+	return string(s)
+}
+
+type MiscStat struct {
+	ProcsRunning int `json:"procsRunning"`
+	ProcsBlocked int `json:"procsBlocked"`
+	Ctxt         int `json:"ctxt"`
+}
+
+func (m MiscStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go
new file mode 100644
index 0000000000..34e0653aed
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go
@@ -0,0 +1,67 @@
+// +build darwin
+
+package load
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+	values, err := common.DoSysctrl("vm.loadavg")
+	if err != nil {
+		return nil, err
+	}
+
+	load1, err := strconv.ParseFloat(values[0], 64)
+	if err != nil {
+		return nil, err
+	}
+	load5, err := strconv.ParseFloat(values[1], 64)
+	if err != nil {
+		return nil, err
+	}
+	load15, err := strconv.ParseFloat(values[2], 64)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &AvgStat{
+		Load1:  float64(load1),
+		Load5:  float64(load5),
+		Load15: float64(load15),
+	}
+
+	return ret, nil
+}
+
+// Misc returnes miscellaneous host-wide statistics.
+// darwin use ps command to get process running/blocked count.
+// Almost same as FreeBSD implementation, but state is different.
+// U means 'Uninterruptible Sleep'.
+func Misc() (*MiscStat, error) {
+	bin, err := exec.LookPath("ps")
+	if err != nil {
+		return nil, err
+	}
+	out, err := invoke.Command(bin, "axo", "state")
+	if err != nil {
+		return nil, err
+	}
+	lines := strings.Split(string(out), "\n")
+
+	ret := MiscStat{}
+	for _, l := range lines {
+		if strings.Contains(l, "R") {
+			ret.ProcsRunning++
+		} else if strings.Contains(l, "U") {
+			// uninterruptible sleep == blocked
+			ret.ProcsBlocked++
+		}
+	}
+
+	return &ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go
new file mode 100644
index 0000000000..6d3a0bafab
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go
@@ -0,0 +1,65 @@
+// +build freebsd
+
+package load
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+	values, err := common.DoSysctrl("vm.loadavg")
+	if err != nil {
+		return nil, err
+	}
+
+	load1, err := strconv.ParseFloat(values[0], 64)
+	if err != nil {
+		return nil, err
+	}
+	load5, err := strconv.ParseFloat(values[1], 64)
+	if err != nil {
+		return nil, err
+	}
+	load15, err := strconv.ParseFloat(values[2], 64)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &AvgStat{
+		Load1:  float64(load1),
+		Load5:  float64(load5),
+		Load15: float64(load15),
+	}
+
+	return ret, nil
+}
+
+// Misc returnes miscellaneous host-wide statistics.
+// darwin use ps command to get process running/blocked count.
+// Almost same as Darwin implementation, but state is different.
+func Misc() (*MiscStat, error) {
+	bin, err := exec.LookPath("ps")
+	if err != nil {
+		return nil, err
+	}
+	out, err := invoke.Command(bin, "axo", "state")
+	if err != nil {
+		return nil, err
+	}
+	lines := strings.Split(string(out), "\n")
+
+	ret := MiscStat{}
+	for _, l := range lines {
+		if strings.Contains(l, "R") {
+			ret.ProcsRunning++
+		} else if strings.Contains(l, "D") {
+			ret.ProcsBlocked++
+		}
+	}
+
+	return &ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go
new file mode 100644
index 0000000000..c455397bf8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go
@@ -0,0 +1,78 @@
+// +build linux
+
+package load
+
+import (
+	"io/ioutil"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+	filename := common.HostProc("loadavg")
+	line, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	values := strings.Fields(string(line))
+
+	load1, err := strconv.ParseFloat(values[0], 64)
+	if err != nil {
+		return nil, err
+	}
+	load5, err := strconv.ParseFloat(values[1], 64)
+	if err != nil {
+		return nil, err
+	}
+	load15, err := strconv.ParseFloat(values[2], 64)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &AvgStat{
+		Load1:  load1,
+		Load5:  load5,
+		Load15: load15,
+	}
+
+	return ret, nil
+}
+
+// Misc returnes miscellaneous host-wide statistics.
+// Note: the name should be changed near future.
+func Misc() (*MiscStat, error) {
+	filename := common.HostProc("stat")
+	out, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &MiscStat{}
+	lines := strings.Split(string(out), "\n")
+	for _, line := range lines {
+		fields := strings.Fields(line)
+		if len(fields) != 2 {
+			continue
+		}
+		v, err := strconv.ParseInt(fields[1], 10, 64)
+		if err != nil {
+			continue
+		}
+		switch fields[0] {
+		case "procs_running":
+			ret.ProcsRunning = int(v)
+		case "procs_blocked":
+			ret.ProcsBlocked = int(v)
+		case "ctxt":
+			ret.Ctxt = int(v)
+		default:
+			continue
+		}
+
+	}
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go
new file mode 100644
index 0000000000..c45c15442c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go
@@ -0,0 +1,19 @@
+// +build windows
+
+package load
+
+import (
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+	ret := AvgStat{}
+
+	return &ret, common.ErrNotImplementedError
+}
+
+func Misc() (*MiscStat, error) {
+	ret := MiscStat{}
+
+	return &ret, common.ErrNotImplementedError
+}
diff --git a/tests/rkt-monitor/README.md b/tests/rkt-monitor/README.md
index e600f5d746..09214b2411 100644
--- a/tests/rkt-monitor/README.md
+++ b/tests/rkt-monitor/README.md
@@ -40,4 +40,7 @@ rkt(13261): seconds alive: 10  avg CPU: 33.113897%  avg Mem: 4 kB  peak Mem: 4 k
 systemd(13302): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(13303): seconds alive: 9  avg CPU: 68.004584%  avg Mem: 7 mB  peak Mem: 7 mB
 worker(13307): seconds alive: 9  avg CPU: 13.004088%  avg Mem: 1 mB  peak Mem: 1 mB
+load average in a container: Load1: 0.280000 Load5: 0.250000 Load15: 0.200000
+container start time: 315621ns
+container stop time: 17280555ns
 ```
diff --git a/tests/rkt-monitor/main.go b/tests/rkt-monitor/main.go
index 8679aa3344..c3191e21e4 100644
--- a/tests/rkt-monitor/main.go
+++ b/tests/rkt-monitor/main.go
@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/appc/spec/schema"
+	"github.com/shirou/gopsutil/load"
 	"github.com/shirou/gopsutil/process"
 	"github.com/spf13/cobra"
 )
@@ -97,24 +98,28 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 
 	var execCmd *exec.Cmd
 	if podManifest {
-		execCmd = exec.Command("rkt", "run", "--pod-manifest", args[0], "--net=host")
+		execCmd = exec.Command("rkt", "run", "--pod-manifest", args[0], "--net=default-restricted")
 	} else {
-		execCmd = exec.Command("rkt", "run", args[0], "--insecure-options=image", "--net=host")
+		execCmd = exec.Command("rkt", "run", args[0], "--insecure-options=image", "--net=default-restricted")
 	}
 	if flagShowOutput {
 		execCmd.Stdout = os.Stdout
 		execCmd.Stderr = os.Stderr
 	}
+
+	containerStarting := time.Now()
+
 	err = execCmd.Start()
 	if err != nil {
 		fmt.Printf("%v\n", err)
 		os.Exit(1)
 	}
+	containerStarted := time.Now()
 
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
 	go func() {
-		for range c {
+		for _ = range c {
 			err := killAllChildren(int32(execCmd.Process.Pid))
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
@@ -149,10 +154,14 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 		time.Sleep(time.Second)
 	}
 
+	loadAvg, err := load.Avg()
+
+	containerStopping := time.Now()
 	err = killAllChildren(int32(execCmd.Process.Pid))
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
 	}
+	containerStoped := time.Now()
 
 	for _, processHistory := range usages {
 		var avgCPU float64
@@ -172,6 +181,10 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 
 		fmt.Printf("%s(%d): seconds alive: %d  avg CPU: %f%%  avg Mem: %s  peak Mem: %s\n", processHistory[0].Name, processHistory[0].Pid, len(processHistory), avgCPU, formatSize(avgMem), formatSize(peakMem))
 	}
+	fmt.Printf("load average: Load1: %f Load5: %f Load15: %f\n", loadAvg.Load1, loadAvg.Load5, loadAvg.Load15)
+
+	fmt.Printf("container start time: %dns\n", containerStarted.Sub(containerStarting).Nanoseconds())
+	fmt.Printf("container stop time: %dns\n", containerStoped.Sub(containerStopping).Nanoseconds())
 }
 
 func killAllChildren(pid int32) error {

From febc6c6e186e8ea0ec2f396e31d25e01215ba686 Mon Sep 17 00:00:00 2001
From: Wlodzimierz Borkowski <wlodzimierz.borkowski@intel.com>
Date: Thu, 12 May 2016 15:53:43 +0200
Subject: [PATCH 0304/1304] tests: save interval data measures to csv file

Save data to csv - useful for plot a graph of usage.
Add a flag command for additional validation.
Fix some docs regarding to rkt-monitor.
---
 .../benchmarks/rkt-1-4-0-benchmarks.md        |  6 +--
 tests/rkt-monitor/main.go                     | 46 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/Documentation/benchmarks/rkt-1-4-0-benchmarks.md b/Documentation/benchmarks/rkt-1-4-0-benchmarks.md
index ffed74e972..1bbffa3488 100644
--- a/Documentation/benchmarks/rkt-1-4-0-benchmarks.md
+++ b/Documentation/benchmarks/rkt-1-4-0-benchmarks.md
@@ -17,7 +17,7 @@ rkt(18493): seconds alive: 10  avg CPU: 28.314541%  avg Mem: 2 mB  peak Mem: 2 m
 systemd(18515): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(18517): seconds alive: 9  avg CPU: 88.397098%  avg Mem: 7 mB  peak Mem: 7 mB
 worker(18521): seconds alive: 9  avg CPU: 7.330367%  avg Mem: 5 mB  peak Mem: 6 mB
-load average in a container: Load1: 0.390000 Load5: 0.120000 Load15: 0.080000
+load average: Load1: 0.390000 Load5: 0.120000 Load15: 0.080000
 container start time: 250721ns
 container stop time: 17332926ns
 
@@ -30,7 +30,7 @@ worker(18634): seconds alive: 9  avg CPU: 98.550401%  avg Mem: 318 mB  peak Mem:
 rkt(18599): seconds alive: 10  avg CPU: 3.583814%  avg Mem: 2 mB  peak Mem: 2 mB
 systemd(18628): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(18630): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB
-load average in a container: Load1: 0.310000 Load5: 0.150000 Load15: 0.090000
+load average: Load1: 0.310000 Load5: 0.150000 Load15: 0.090000
 container start time: 259746ns
 container stop time: 17593446ns
 ```
@@ -42,7 +42,7 @@ rkt(18706): seconds alive: 10  avg CPU: 3.587050%  avg Mem: 2 mB  peak Mem: 2 mB
 systemd(18736): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(18740): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB
 worker(18744): seconds alive: 9  avg CPU: 88.937493%  avg Mem: 808 kB  peak Mem: 808 kB
-load average in a container: Load1: 0.310000 Load5: 0.130000 Load15: 0.080000
+load average: Load1: 0.310000 Load5: 0.130000 Load15: 0.080000
 container start time: 296570ns
 container stop time: 16124700ns
 ```
diff --git a/tests/rkt-monitor/main.go b/tests/rkt-monitor/main.go
index c3191e21e4..0eb0bde78a 100644
--- a/tests/rkt-monitor/main.go
+++ b/tests/rkt-monitor/main.go
@@ -15,7 +15,9 @@
 package main
 
 import (
+	"encoding/csv"
 	"encoding/json"
+	"flag"
 	"fmt"
 	"os"
 	"os/exec"
@@ -44,6 +46,7 @@ var (
 	flagVerbose    bool
 	flagDuration   string
 	flagShowOutput bool
+	saveToCsv      bool
 
 	cmdRktMonitor = &cobra.Command{
 		Use:     "rkt-monitor IMAGE",
@@ -59,6 +62,9 @@ func init() {
 	cmdRktMonitor.Flags().BoolVarP(&flagVerbose, "verbose", "v", false, "Print current usage every second")
 	cmdRktMonitor.Flags().StringVarP(&flagDuration, "duration", "d", "10s", "How long to run the ACI")
 	cmdRktMonitor.Flags().BoolVarP(&flagShowOutput, "show-output", "o", false, "Display rkt's stdout and stderr")
+	cmdRktMonitor.Flags().BoolVarP(&saveToCsv, "to-file", "f", false, "Save benchmark results to benchmark.csv file")
+
+	flag.Parse()
 }
 
 func main() {
@@ -119,7 +125,7 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
 	go func() {
-		for _ = range c {
+		for range c {
 			err := killAllChildren(int32(execCmd.Process.Pid))
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
@@ -131,6 +137,9 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 	usages := make(map[int32][]*ProcessStatus)
 
 	timeToStop := time.Now().Add(d)
+
+	records := [][]string{{"Time", "PID name", "PID number", "RSS", "CPU"}} // csv headers
+
 	for time.Now().Before(timeToStop) {
 		usage, err := getUsage(int32(execCmd.Process.Pid))
 		if err != nil {
@@ -140,6 +149,10 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 			printUsage(usage)
 		}
 
+		if saveToCsv {
+			records = addRecords(usage, records)
+		}
+
 		for _, ps := range usage {
 			usages[ps.Pid] = append(usages[ps.Pid], ps)
 		}
@@ -181,6 +194,14 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 
 		fmt.Printf("%s(%d): seconds alive: %d  avg CPU: %f%%  avg Mem: %s  peak Mem: %s\n", processHistory[0].Name, processHistory[0].Pid, len(processHistory), avgCPU, formatSize(avgMem), formatSize(peakMem))
 	}
+
+	if saveToCsv {
+		saveRecords(records)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Can't write to a file: %v\n", err)
+		}
+	}
+
 	fmt.Printf("load average: Load1: %f Load5: %f Load15: %f\n", loadAvg.Load1, loadAvg.Load5, loadAvg.Load15)
 
 	fmt.Printf("container start time: %dns\n", containerStarted.Sub(containerStarting).Nanoseconds())
@@ -296,3 +317,26 @@ func printUsage(statuses []*ProcessStatus) {
 	}
 	fmt.Printf("\n")
 }
+
+func addRecords(statuses []*ProcessStatus, records [][]string) [][]string {
+	for _, s := range statuses {
+		records = append(records, []string{time.Now().String(), s.Name, strconv.Itoa(int(s.Pid)), formatSize(s.RSS), strconv.FormatFloat(s.CPU, 'g', 1, 64)})
+	}
+	return records
+}
+
+func saveRecords(records [][]string) error {
+	csvFile, err := os.Create("benchmark.csv")
+	defer csvFile.Close()
+	if err != nil {
+		return err
+	}
+
+	w := csv.NewWriter(csvFile)
+	w.WriteAll(records)
+	if err := w.Error(); err != nil {
+		return err
+	}
+
+	return nil
+}

From e828bb5de7c2d031acf8ebca958fc45880be8d65 Mon Sep 17 00:00:00 2001
From: Wlodzimierz Borkowski <wlodzimierz.borkowski@intel.com>
Date: Wed, 18 May 2016 16:08:48 +0200
Subject: [PATCH 0305/1304] tests: add new flag for repetitions number, docs
 update

---
 Documentation/benchmarks/README.md |  10 +-
 tests/rkt-monitor/README.md        |   2 +
 tests/rkt-monitor/main.go          | 191 ++++++++++++++++-------------
 3 files changed, 117 insertions(+), 86 deletions(-)

diff --git a/Documentation/benchmarks/README.md b/Documentation/benchmarks/README.md
index a46fc58ce9..f626b571a2 100644
--- a/Documentation/benchmarks/README.md
+++ b/Documentation/benchmarks/README.md
@@ -23,7 +23,9 @@ command `rkt fetch --insecure-options=image <newDirectory>/*`.
 With rkt-monitor and an ACI or a pod manifest, now the benchmarks can be run
 via `./rkt-monitor <workload>`.
 
-There are two flags available to influence how rkt-monitor runs. `-v` will
-print out the current resource usage of each process every second. `-d` can be
-used to specify a duration to run the tests for (default of 10s). For example,
-`-d 30s` will run the tests for 30 seconds.
+There are four flags available to influence how rkt-monitor runs. `-r ` set the
+number of benchmark experiment repetitions, `-f` save output to files in a
+temporary directory with `rkt_benchmark` prefix, `-v` will print out the current
+resource usage of each process every second. `-d` can be used to specify a
+duration to run the tests for (default of 10s). For example, `-d 30s` will run
+the tests for 30 seconds.
diff --git a/tests/rkt-monitor/README.md b/tests/rkt-monitor/README.md
index 09214b2411..1beda661fb 100644
--- a/tests/rkt-monitor/README.md
+++ b/tests/rkt-monitor/README.md
@@ -14,8 +14,10 @@ Examples:
 rkt-monitor mem-stresser.aci -v -d 30s
 
 Flags:
+  -f, --to-file[=false]: Save benchmark results to files in a temp dir
   -d, --duration="10s": How long to run the ACI
   -h, --help[=false]: help for rkt-monitor
+  -r, --repetitions=1: Numbers of benchmark repetitions
   -o, --show-output[=false]: Display rkt's stdout and stderr
   -v, --verbose[=false]: Print current usage every second
 ```
diff --git a/tests/rkt-monitor/main.go b/tests/rkt-monitor/main.go
index 0eb0bde78a..0803ece332 100644
--- a/tests/rkt-monitor/main.go
+++ b/tests/rkt-monitor/main.go
@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -43,10 +44,11 @@ type ProcessStatus struct {
 var (
 	pidMap map[int32]*process.Process
 
-	flagVerbose    bool
-	flagDuration   string
-	flagShowOutput bool
-	saveToCsv      bool
+	flagVerbose          bool
+	flagDuration         string
+	flagShowOutput       bool
+	flagSaveToCsv        bool
+	flagRepetitionNumber int
 
 	cmdRktMonitor = &cobra.Command{
 		Use:     "rkt-monitor IMAGE",
@@ -60,9 +62,10 @@ func init() {
 	pidMap = make(map[int32]*process.Process)
 
 	cmdRktMonitor.Flags().BoolVarP(&flagVerbose, "verbose", "v", false, "Print current usage every second")
+	cmdRktMonitor.Flags().IntVarP(&flagRepetitionNumber, "repetitions", "r", 1, "Numbers of benchmark repetitions")
 	cmdRktMonitor.Flags().StringVarP(&flagDuration, "duration", "d", "10s", "How long to run the ACI")
 	cmdRktMonitor.Flags().BoolVarP(&flagShowOutput, "show-output", "o", false, "Display rkt's stdout and stderr")
-	cmdRktMonitor.Flags().BoolVarP(&saveToCsv, "to-file", "f", false, "Save benchmark results to benchmark.csv file")
+	cmdRktMonitor.Flags().BoolVarP(&flagSaveToCsv, "to-file", "f", false, "Save benchmark results to files in a temp dir")
 
 	flag.Parse()
 }
@@ -103,109 +106,133 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 	}
 
 	var execCmd *exec.Cmd
-	if podManifest {
-		execCmd = exec.Command("rkt", "run", "--pod-manifest", args[0], "--net=default-restricted")
-	} else {
-		execCmd = exec.Command("rkt", "run", args[0], "--insecure-options=image", "--net=default-restricted")
-	}
-	if flagShowOutput {
-		execCmd.Stdout = os.Stdout
-		execCmd.Stderr = os.Stderr
-	}
+	var loadAvg *load.AvgStat
+	var containerStarting, containerStarted, containerStopping, containerStopped time.Time
 
-	containerStarting := time.Now()
+	records := [][]string{{"Time", "PID name", "PID number", "RSS", "CPU"}}             // csv headers
+	summaryRecords := [][]string{{"Load1", "Load5", "Load15", "StartTime", "StopTime"}} // csv summary headers
 
-	err = execCmd.Start()
-	if err != nil {
-		fmt.Printf("%v\n", err)
-		os.Exit(1)
-	}
-	containerStarted := time.Now()
+	for i := 0; i < flagRepetitionNumber; i++ {
+		containerStarting = time.Now()
 
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt)
-	go func() {
-		for range c {
-			err := killAllChildren(int32(execCmd.Process.Pid))
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
-			}
+		if podManifest {
+			execCmd = exec.Command("rkt", "run", "--pod-manifest", args[0], "--net=default-restricted")
+		} else {
+			execCmd = exec.Command("rkt", "run", args[0], "--insecure-options=image", "--net=default-restricted")
+		}
+
+		if flagShowOutput {
+			execCmd.Stdout = os.Stdout
+			execCmd.Stderr = os.Stderr
+		}
+
+		err = execCmd.Start()
+		containerStarted = time.Now()
+		if err != nil {
+			fmt.Printf("%v\n", err)
 			os.Exit(1)
 		}
-	}()
 
-	usages := make(map[int32][]*ProcessStatus)
+		c := make(chan os.Signal, 1)
+		signal.Notify(c, os.Interrupt)
+		go func() {
+			for range c {
+				err := killAllChildren(int32(execCmd.Process.Pid))
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
+				}
+				os.Exit(1)
+			}
+		}()
 
-	timeToStop := time.Now().Add(d)
+		usages := make(map[int32][]*ProcessStatus)
 
-	records := [][]string{{"Time", "PID name", "PID number", "RSS", "CPU"}} // csv headers
+		timeToStop := time.Now().Add(d)
 
-	for time.Now().Before(timeToStop) {
-		usage, err := getUsage(int32(execCmd.Process.Pid))
-		if err != nil {
-			panic(err)
-		}
-		if flagVerbose {
-			printUsage(usage)
-		}
+		for time.Now().Before(timeToStop) {
+			usage, err := getUsage(int32(execCmd.Process.Pid))
+			if err != nil {
+				panic(err)
+			}
+			if flagVerbose {
+				printUsage(usage)
+			}
 
-		if saveToCsv {
-			records = addRecords(usage, records)
+			if flagSaveToCsv {
+				records = addRecords(usage, records)
+			}
+
+			for _, ps := range usage {
+				usages[ps.Pid] = append(usages[ps.Pid], ps)
+			}
+
+			_, err = process.NewProcess(int32(execCmd.Process.Pid))
+			if err != nil {
+				// process.Process.IsRunning is not implemented yet
+				fmt.Fprintf(os.Stderr, "rkt exited prematurely\n")
+				break
+			}
+
+			time.Sleep(time.Second)
 		}
 
-		for _, ps := range usage {
-			usages[ps.Pid] = append(usages[ps.Pid], ps)
+		loadAvg, err = load.Avg()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "measure load avg failed: %v\n", err)
 		}
 
-		_, err = process.NewProcess(int32(execCmd.Process.Pid))
+		containerStopping = time.Now()
+		err = killAllChildren(int32(execCmd.Process.Pid))
+		containerStopped = time.Now()
 		if err != nil {
-			// process.Process.IsRunning is not implemented yet
-			fmt.Fprintf(os.Stderr, "rkt exited prematurely\n")
-			break
+			fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
 		}
 
-		time.Sleep(time.Second)
-	}
+		for _, processHistory := range usages {
+			var avgCPU float64
+			var avgMem uint64
+			var peakMem uint64
+
+			for _, p := range processHistory {
+				avgCPU += p.CPU
+				avgMem += p.RSS
+				if peakMem < p.RSS {
+					peakMem = p.RSS
+				}
+			}
 
-	loadAvg, err := load.Avg()
+			avgCPU = avgCPU / float64(len(processHistory))
+			avgMem = avgMem / uint64(len(processHistory))
 
-	containerStopping := time.Now()
-	err = killAllChildren(int32(execCmd.Process.Pid))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
-	}
-	containerStoped := time.Now()
-
-	for _, processHistory := range usages {
-		var avgCPU float64
-		var avgMem uint64
-		var peakMem uint64
-
-		for _, p := range processHistory {
-			avgCPU += p.CPU
-			avgMem += p.RSS
-			if peakMem < p.RSS {
-				peakMem = p.RSS
+			if !flagSaveToCsv {
+				fmt.Printf("%s(%d): seconds alive: %d  avg CPU: %f%%  avg Mem: %s  peak Mem: %s\n", processHistory[0].Name, processHistory[0].Pid, len(processHistory), avgCPU, formatSize(avgMem), formatSize(peakMem))
 			}
 		}
 
-		avgCPU = avgCPU / float64(len(processHistory))
-		avgMem = avgMem / uint64(len(processHistory))
-
-		fmt.Printf("%s(%d): seconds alive: %d  avg CPU: %f%%  avg Mem: %s  peak Mem: %s\n", processHistory[0].Name, processHistory[0].Pid, len(processHistory), avgCPU, formatSize(avgMem), formatSize(peakMem))
+		if flagSaveToCsv {
+			summaryRecords = append(summaryRecords, []string{
+				strconv.FormatFloat(loadAvg.Load1, 'g', 3, 64),
+				strconv.FormatFloat(loadAvg.Load5, 'g', 3, 64),
+				strconv.FormatFloat(loadAvg.Load15, 'g', 3, 64),
+				strconv.FormatInt(containerStarted.Sub(containerStarting).Nanoseconds(), 10),
+				strconv.FormatInt(containerStopped.Sub(containerStopping).Nanoseconds(), 10)})
+		} else {
+			fmt.Printf("load average: Load1: %f Load5: %f Load15: %f\n", loadAvg.Load1, loadAvg.Load5, loadAvg.Load15)
+			fmt.Printf("container start time: %dns\n", containerStarted.Sub(containerStarting).Nanoseconds())
+			fmt.Printf("container stop time: %dns\n", containerStopped.Sub(containerStopping).Nanoseconds())
+		}
 	}
 
-	if saveToCsv {
-		saveRecords(records)
+	if flagSaveToCsv {
+		err = saveRecords(records, "rkt_benchmark_interval_")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Can't write to a file: %v\n", err)
 		}
+		err = saveRecords(summaryRecords, "rkt_benchmark_summary_")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Can't write to a summary file: %v\n", err)
+		}
 	}
-
-	fmt.Printf("load average: Load1: %f Load5: %f Load15: %f\n", loadAvg.Load1, loadAvg.Load5, loadAvg.Load15)
-
-	fmt.Printf("container start time: %dns\n", containerStarted.Sub(containerStarting).Nanoseconds())
-	fmt.Printf("container stop time: %dns\n", containerStoped.Sub(containerStopping).Nanoseconds())
 }
 
 func killAllChildren(pid int32) error {
@@ -325,8 +352,8 @@ func addRecords(statuses []*ProcessStatus, records [][]string) [][]string {
 	return records
 }
 
-func saveRecords(records [][]string) error {
-	csvFile, err := os.Create("benchmark.csv")
+func saveRecords(records [][]string, prefix string) error {
+	csvFile, err := ioutil.TempFile("", prefix)
 	defer csvFile.Close()
 	if err != nil {
 		return err

From 66bb5c5392d8a7f765658e547ba8b51369dcf59b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 20 May 2016 21:54:19 +0200
Subject: [PATCH 0306/1304] stage1: restrict access to procfs and sysfs paths

Many procfs and sysfs endpoints are currently not namespace-aware
and can be used by malicious pods to manipulate host state
and escape the sandboxing.
This commit introduces an initial mitigation, by marking those
paths as read-only or inaccessible to containers.
---
 stage1/init/common/pod.go | 37 +++++++++++++++++++++++++++++++++++++
 tests/rkt_mount_test.go   | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 3dad4c9bc9..dbf63b4c9d 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -454,6 +454,43 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
 	}
 
+	// Restrict access to some security-sensitive paths under /proc and /sys.
+	// Those entries can be hidden or just made read-only to app.
+	roPaths := []string{
+		"/proc/sys/kernel/core_pattern",
+		"/proc/sys/kernel/modprobe",
+		"/proc/sys/vm/panic_on_oom",
+		"/proc/sysrq-trigger",
+		"/sys/block/",
+		"/sys/bus/",
+		"/sys/class/",
+		"/sys/dev/",
+		"/sys/devices/",
+		"/sys/kernel/",
+	}
+	hiddenPaths := []string{
+		// TODO(lucab): file-paths restrictions need support in systemd first
+		//"/proc/config.gz",
+		//"/proc/kallsyms",
+		//"/proc/sched_debug",
+		//"/proc/kcore",
+		//"/proc/kmem",
+		//"/proc/mem",
+		"/sys/firmware/",
+		"/sys/fs/",
+		"/sys/hypervisor/",
+		"/sys/module/",
+		"/sys/power/",
+	}
+	// Paths prefixed with "-" are ignored if they do not exist:
+	// [https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ReadWriteDirectories=]
+	for _, p := range hiddenPaths {
+		opts = append(opts, unit.NewUnitOption("Service", "InaccessibleDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
+	}
+	for _, p := range roPaths {
+		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
+	}
+
 	if ra.ReadOnlyRootFS {
 		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", common.RelAppRootfsPath(appName)))
 	}
diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index a1f3585540..d93c72ed9a 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -102,3 +102,35 @@ func TestMountSymlink(t *testing.T) {
 		}
 	}
 }
+
+// TestProcFSRestrictions checks that access to sensitive paths under
+// /proc and /sys is correctly restricted:
+// https://github.com/coreos/rkt/issues/2484
+func TestProcFSRestrictions(t *testing.T) {
+	// check access to read-only paths
+	roEntry := "/proc/sysrq-trigger"
+	testContent := "h"
+	roImage := patchTestACI("rkt-inspect-write-procfs.aci", fmt.Sprintf("--exec=/inspect --write-file --file-name %s --content %s", roEntry, testContent))
+	defer os.Remove(roImage)
+
+	roCtx := testutils.NewRktRunCtx()
+	defer roCtx.Cleanup()
+
+	roCmd := fmt.Sprintf("%s --insecure-options=image run %s", roCtx.Cmd(), roImage)
+
+	roExpectedLine := fmt.Sprintf("Cannot write to file \"%s\"", roEntry)
+	runRktAndCheckOutput(t, roCmd, roExpectedLine, true)
+
+	// check access to inaccessible paths
+	hiddenEntry := "/sys/firmware/"
+	hiddenImage := patchTestACI("rkt-inspect-stat-procfs.aci", fmt.Sprintf("--exec=/inspect --stat-file --file-name %s", hiddenEntry))
+	defer os.Remove(hiddenImage)
+
+	hiddenCtx := testutils.NewRktRunCtx()
+	defer hiddenCtx.Cleanup()
+
+	hiddenCmd := fmt.Sprintf("%s --insecure-options=image run %s", hiddenCtx.Cmd(), hiddenImage)
+
+	hiddenExpectedLine := fmt.Sprintf("%s: mode: d---------", hiddenEntry)
+	runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
+}

From 8f14d4df13fcbe4a237178e946ac6e5b7c5c5954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 25 May 2016 12:09:16 +0200
Subject: [PATCH 0307/1304] git-validation: check only the HEAD commit

Travis fails because git-validation also checks Godeps changes.

Let's check only HEAD until
https://github.com/coreos/git-validation/issues/4 is solved.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fc02f1fd7c..e8ea25c50d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ go:
 
 before_install:
  - go get -u github.com/coreos/git-validation
- - git-validation -run subsystem-in-subject,dangling-whitespace
+ - git-validation -run subsystem-in-subject,dangling-whitespace -range HEAD^..
 
 install:
  - sudo apt-get update -qq

From dd2b775844932d21ad307c3b96ee10f09f12dfdd Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Wed, 25 May 2016 13:42:36 +0200
Subject: [PATCH 0308/1304] build: Find also blackbox tests for unit-check

We were only checking the packages that had non-empty TestGoFiles
field returned by "go list". But the TestGoFiles contains only files
that have the same package as the non-test files in the same
directory. The test files with the different package name are in the
XTestGoFiles field, which we did not handle before.

This makes go test to run the test for pkg/selinux and pkg/user
packages too.
---
 makelib/misc.mk | 11 ++++++-----
 tests/tests.mk  | 15 ++++++---------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/makelib/misc.mk b/makelib/misc.mk
index ba6b6b4720..fcd0dfc15f 100644
--- a/makelib/misc.mk
+++ b/makelib/misc.mk
@@ -165,11 +165,11 @@ $(eval $(call setup-custom-dep-file,$1,$(MK_PATH)$2))
 endef
 
 # Returns all not-excluded directories inside $REPO_PATH that have
-# nonzero files matching given "go list -f {{.ITEM}}".
+# nonzero files matching given "go list -f {{.ITEM1}} {{.ITEM2}}...".
 # 1 - where to look for files (./... to look for all files inside the project)
-# 2 - a "go list -f {{.ITEM}}" item (GoFiles, TestGoFiles, etc)
+# 2 - a list of "go list -f {{.ITEM}}" items (GoFiles, TestGoFiles, etc)
 # 3 - space-separated list of excluded directories
-# Example: $(call go-find-directories,./...,TestGoFiles,tests)
+# Example: $(call go-find-directories,./...,TestGoFiles XTestGoFiles,tests)
 define go-find-directories
 $(strip \
 	$(eval _MISC_GFD_ESCAPED_SRCDIR := $(MK_TOPLEVEL_ABS_SRCDIR)) \
@@ -177,8 +177,9 @@ $(strip \
 	$(eval _MISC_GFD_ESCAPED_SRCDIR := $(subst /,\/,$(_MISC_GFD_ESCAPED_SRCDIR))) \
 	$(eval _MISC_GFD_SPACE_ :=) \
 	$(eval _MISC_GFD_SPACE_ +=) \
-	$(eval _MISC_GFD_FILES_ := $(shell $(GO_ENV) "$(GO)" list -f '{{.ImportPath}} {{.$2}}' $1 | \
-		grep --invert-match '\[\]' | \
+	$(eval _MISC_GFD_GO_LIST_ITEMS_ := $(foreach i,$2,{{.$i}})) \
+	$(eval _MISC_GFD_FILES_ := $(shell $(GO_ENV) "$(GO)" list -f '{{.ImportPath}} $(_MISC_GFD_GO_LIST_ITEMS_)' $1 | \
+		grep '\[[^]]' | \
 		sed -e 's/.*$(_MISC_GFD_ESCAPED_SRCDIR)\///' -e 's/[[:space:]]*\[.*\]$$//' \
 		$(if $3,| grep --invert-match '^\($(subst $(_MISC_GFD_SPACE_),\|,$3)\)'))) \
 	$(_MISC_GFD_FILES_) \
diff --git a/tests/tests.mk b/tests/tests.mk
index 4ac27d653b..2eaef12f4d 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -1,18 +1,15 @@
 $(call setup-stamp-file,TST_SHORT_TESTS_STAMP,/short-tests)
 
-TST_DIRS_WITH_GOFILES := $(call go-find-directories,$(GO_TEST_PACKAGES),GoFiles)
-TST_DIRS_WITH_TESTGOFILES := $(call go-find-directories,$(GO_TEST_PACKAGES),TestGoFiles,tests)
-
 # gofmt takes list of directories
-TST_GOFMT_DIRS := $(foreach d,$(TST_DIRS_WITH_GOFILES),./$d)
 # go vet and go test take a list of packages
-TST_GO_VET_PACKAGES := $(foreach d,$(TST_DIRS_WITH_GOFILES),$(REPO_PATH)/$d)
-TST_GO_TEST_PACKAGES := $(foreach d,$(TST_DIRS_WITH_TESTGOFILES),$(REPO_PATH)/$d)
-
 $(call forward-vars,$(TST_SHORT_TESTS_STAMP), \
-	GOFMT TST_GOFMT_DIRS GO_ENV GO TST_GO_VET_PACKAGES RKT_TAGS \
-	TST_GO_TEST_PACKAGES)
+	GOFMT GO_ENV GO RKT_TAGS)
 $(TST_SHORT_TESTS_STAMP):
+	$(eval TST_DIRS_WITH_GOFILES := $(call go-find-directories,$(GO_TEST_PACKAGES),GoFiles))
+	$(eval TST_DIRS_WITH_TESTGOFILES := $(call go-find-directories,$(GO_TEST_PACKAGES),TestGoFiles XTestGoFiles,tests))
+	$(eval TST_GOFMT_DIRS := $(foreach d,$(TST_DIRS_WITH_GOFILES),./$d))
+	$(eval TST_GO_VET_PACKAGES := $(foreach d,$(TST_DIRS_WITH_GOFILES),$(REPO_PATH)/$d))
+	$(eval TST_GO_TEST_PACKAGES := $(foreach d,$(TST_DIRS_WITH_TESTGOFILES),$(REPO_PATH)/$d))
 	$(VQ) \
 	set -e; \
 	$(call vb,vt,GOFMT,$(TST_GOFMT_DIRS)) \

From 9b651d6202947578039dbe9e2206745163b086bd Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Wed, 25 May 2016 18:27:18 +0200
Subject: [PATCH 0309/1304] travis: really remove git validation

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e8ea25c50d..a61b4039b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,6 @@ go:
   - 1.5.3
   - 1.6
 
-before_install:
- - go get -u github.com/coreos/git-validation
- - git-validation -run subsystem-in-subject,dangling-whitespace -range HEAD^..
-
 install:
  - sudo apt-get update -qq
  - sudo apt-get install -y cpio realpath squashfs-tools

From 752236fde53a1ae0b66dd3023155a81fae4adc9a Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek.gonyeo@coreos.com>
Date: Sun, 15 May 2016 20:52:02 -0400
Subject: [PATCH 0310/1304] docs: added instructions for installing a newer rkt
 in coreos

Added Documentation/install-rkt-in-coreos.md, which details a systemd
oneshot unit file that downloads and extracts rkt to /opt. Added a
reference to this file in Documentation/distributions.md.
---
 Documentation/distributions.md         |  2 ++
 Documentation/install-rkt-in-coreos.md | 38 ++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 Documentation/install-rkt-in-coreos.md

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 22df43dd35..9b4ecd788e 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -5,6 +5,8 @@
 rkt is an integral part of CoreOS, installed with the operating system.
 The [CoreOS releases page](https://coreos.com/releases/) lists the version of rkt available in each CoreOS release channel.
 
+If the version of rkt included in CoreOS is too old, it's fairly trivial to fetch the desired version [via a systemd unit](Documentation/install-rkt-in-coreos.md)
+
 ## Fedora
 
 rkt is packaged in the development version of Fedora, [Rawhide](https://fedoraproject.org/wiki/Releases/Rawhide):
diff --git a/Documentation/install-rkt-in-coreos.md b/Documentation/install-rkt-in-coreos.md
new file mode 100644
index 0000000000..484f09c3cc
--- /dev/null
+++ b/Documentation/install-rkt-in-coreos.md
@@ -0,0 +1,38 @@
+# Installing a different version of rkt in CoreOS
+
+If a different version of rkt is required than what ships with CoreOS, a
+oneshot systemd unit can be used to download and install an alternate version
+on boot.
+
+The following unit will use curl to download rkt, its signature, and the CoreOS
+app signing key. The downloaded rkt is then verified with its signature, and
+extracted to /opt/rkt.
+
+```
+[Unit]
+Description=rkt installer
+Requires=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/mkdir -p /opt/rkt
+ExecStart=/usr/bin/curl --silent -L -o /opt/rkt.tar.gz <rkt-url>
+ExecStart=/usr/bin/curl --silent -L -o /opt/rkt.tar.gz.sig <rkt-sig-url>
+ExecStart=/usr/bin/curl --silent -L -o /opt/coreos-app-signing-key.gpg https://coreos.com/dist/pubkeys/app-signing-pubkey.gpg
+ExecStart=/usr/bin/gpg --keyring /tmp/gpg-keyring --no-default-keyring --import /opt/coreos-app-signing-key.gpg
+ExecStart=/usr/bin/gpg --keyring /tmp/gpg-keyring --no-default-keyring --verify /opt/rkt.tar.gz.sig /opt/rkt.tar.gz
+ExecStart=/usr/bin/tar --strip-components=1 -xf /opt/rkt.tar.gz -C /opt/rkt
+```
+
+The URLs in this unit must be filled in before the unit is installed. Valid
+URLs can be found on [rkt's releases page][1].
+
+This unit should be installed with either [ignition][2] or a [cloud config][3].
+Other units being added can then contain a `After=rkt-install.service` (or
+whatever the service was named) to delay their running until rkt has been
+installed.
+
+[1]: https://github.com/coreos/rkt/releases
+[2]: https://coreos.com/ignition/docs/latest/
+[3]: https://coreos.com/os/docs/latest/cloud-config.html

From 29c8b8603b28a807dc94dadef9ec42f95f9c9430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Doma=C5=84ski?= <kamil@domanski.co>
Date: Sun, 8 May 2016 22:43:13 +0200
Subject: [PATCH 0311/1304] disable OverlayFS by default when working on
 certain filesystems

---
 common/common.go | 23 +++++++++++++++++++++++
 rkt/prepare.go   |  2 +-
 rkt/run.go       |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/common/common.go b/common/common.go
index c557f0da7f..4320edfd0a 100644
--- a/common/common.go
+++ b/common/common.go
@@ -25,6 +25,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"syscall"
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema/types"
@@ -56,6 +57,11 @@ const (
 	DefaultSystemConfigDir = "/usr/lib/rkt"
 )
 
+const (
+	FsMagicAUFS = int64(0x61756673) // https://goo.gl/CBwx43
+	FsMagicZFS  = int64(0x2FC12FC1) // https://goo.gl/xTvzO5
+)
+
 // Stage1ImagePath returns the path where the stage1 app image (unpacked ACI) is rooted,
 // (i.e. where its contents are extracted during stage0).
 func Stage1ImagePath(root string) string {
@@ -314,3 +320,20 @@ func SystemdVersion(systemdBinaryPath string) (int, error) {
 
 	return version, nil
 }
+
+// FSSupportsOverlay checks whether the filesystem under which
+// a specified path resides is compatible with OverlayFS
+func FSSupportsOverlay(path string) bool {
+	var data syscall.Statfs_t
+	err := syscall.Statfs(path, &data)
+	if err != nil {
+		return false
+	}
+
+	if data.Type == FsMagicAUFS ||
+		data.Type == FsMagicZFS {
+		return false
+	}
+
+	return true
+}
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 46ee3ecf9b..8bcb22f809 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -170,7 +170,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 
 	pcfg := stage0.PrepareConfig{
 		CommonConfig:       &cfg,
-		UseOverlay:         !flagNoOverlay && common.SupportsOverlay(),
+		UseOverlay:         !flagNoOverlay && common.SupportsOverlay() && common.FSSupportsOverlay(getDataDir()),
 		PrivateUsers:       privateUsers,
 		SkipTreeStoreCheck: globalFlags.InsecureFlags.SkipOnDiskCheck(),
 	}
diff --git a/rkt/run.go b/rkt/run.go
index c82029adb4..f0756d8bf4 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -235,7 +235,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 
 	pcfg := stage0.PrepareConfig{
 		CommonConfig:       &cfg,
-		UseOverlay:         !flagNoOverlay && common.SupportsOverlay(),
+		UseOverlay:         !flagNoOverlay && common.SupportsOverlay() && common.FSSupportsOverlay(getDataDir()),
 		PrivateUsers:       privateUsers,
 		SkipTreeStoreCheck: globalFlags.InsecureFlags.SkipOnDiskCheck(),
 	}

From ea619cab0fb916d7b2e6590b3109e28672e18537 Mon Sep 17 00:00:00 2001
From: Nick Owens <mischief@coreos.com>
Date: Wed, 25 May 2016 15:27:34 -0700
Subject: [PATCH 0312/1304] dist: fix "other" permissions so rkt list can work
 without root/rkt-admin

without this, a user in the rkt group can't do an operation like 'rkt
list' due to the permissions on /etc/rkt.

core@core2 ~ $ id
uid=500(core) gid=500(core) groups=500(core),10(wheel),233(docker),248(systemd-journal),250(portage),251(rkt),253(fleet) context=system_u:system_r:kernel_t:s0
core@core2 ~ $ rkt list
list: cannot get configuration: stat /etc/rkt/paths.d: permission denied
core@core2 ~ $ ls -ld /etc/rkt
drwxrws---. 3 root rkt-admin 4096 Jan 21 10:34 /etc/rkt
---
 dist/init/systemd/tmpfiles.d/rkt.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/init/systemd/tmpfiles.d/rkt.conf b/dist/init/systemd/tmpfiles.d/rkt.conf
index 406172741e..e24c8ad097 100644
--- a/dist/init/systemd/tmpfiles.d/rkt.conf
+++ b/dist/init/systemd/tmpfiles.d/rkt.conf
@@ -23,4 +23,4 @@ d /var/lib/rkt/pods/run 2750 root rkt
 d /var/lib/rkt/pods/exited-garbage 2750 root rkt
 d /var/lib/rkt/pods/garbage 2750 root rkt
 
-d /etc/rkt 2770 root rkt-admin
+d /etc/rkt 2775 root rkt-admin

From f9c3f392f8b2e66fec3ec860b5b8a4604285e6c1 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 26 May 2016 12:53:16 +0200
Subject: [PATCH 0313/1304] Godeps: remove unused dependencies

Seems these were inadvertently added in #2428
---
 Godeps/Godeps.json                            |  42 +-
 .../src/github.com/gopherjs/gopherjs/js/js.go | 168 -----
 .../src/github.com/jtolds/gls/LICENSE         |  18 -
 .../src/github.com/jtolds/gls/README.md       |  89 ---
 .../src/github.com/jtolds/gls/context.go      | 144 -----
 .../src/github.com/jtolds/gls/gen_sym.go      |  13 -
 .../src/github.com/jtolds/gls/id_pool.go      |  34 --
 .../src/github.com/jtolds/gls/stack_tags.go   |  43 --
 .../github.com/jtolds/gls/stack_tags_js.go    | 101 ---
 .../github.com/jtolds/gls/stack_tags_main.go  |  61 --
 .../smartystreets/assertions/.gitignore       |   3 -
 .../smartystreets/assertions/.travis.yml      |  14 -
 .../smartystreets/assertions/CONTRIBUTING.md  |  12 -
 .../smartystreets/assertions/LICENSE.md       |  23 -
 .../smartystreets/assertions/README.md        | 575 ------------------
 .../assertions/assertions.goconvey            |   3 -
 .../smartystreets/assertions/collections.go   | 244 --------
 .../smartystreets/assertions/doc.go           | 105 ----
 .../smartystreets/assertions/equality.go      | 280 ---------
 .../smartystreets/assertions/filter.go        |  23 -
 .../internal/go-render/render/render.go       | 477 ---------------
 .../internal/oglematchers/.gitignore          |   5 -
 .../internal/oglematchers/.travis.yml         |   4 -
 .../assertions/internal/oglematchers/LICENSE  | 202 ------
 .../internal/oglematchers/README.md           |  58 --
 .../internal/oglematchers/all_of.go           |  70 ---
 .../assertions/internal/oglematchers/any.go   |  32 -
 .../internal/oglematchers/any_of.go           |  94 ---
 .../internal/oglematchers/contains.go         |  61 --
 .../internal/oglematchers/deep_equals.go      |  88 ---
 .../internal/oglematchers/elements_are.go     |  91 ---
 .../internal/oglematchers/equals.go           | 541 ----------------
 .../assertions/internal/oglematchers/error.go |  51 --
 .../internal/oglematchers/greater_or_equal.go |  39 --
 .../internal/oglematchers/greater_than.go     |  39 --
 .../internal/oglematchers/has_same_type_as.go |  37 --
 .../internal/oglematchers/has_substr.go       |  46 --
 .../internal/oglematchers/identical_to.go     | 134 ----
 .../internal/oglematchers/less_or_equal.go    |  41 --
 .../internal/oglematchers/less_than.go        | 152 -----
 .../internal/oglematchers/matcher.go          |  86 ---
 .../internal/oglematchers/matches_regexp.go   |  69 ---
 .../internal/oglematchers/new_matcher.go      |  43 --
 .../assertions/internal/oglematchers/not.go   |  53 --
 .../internal/oglematchers/panics.go           |  74 ---
 .../internal/oglematchers/pointee.go          |  65 --
 .../oglematchers/transform_description.go     |  36 --
 .../smartystreets/assertions/messages.go      |  93 ---
 .../smartystreets/assertions/panic.go         | 115 ----
 .../smartystreets/assertions/quantity.go      | 141 -----
 .../smartystreets/assertions/serializer.go    |  69 ---
 .../smartystreets/assertions/strings.go       | 227 -------
 .../smartystreets/assertions/time.go          | 202 ------
 .../smartystreets/assertions/type.go          | 112 ----
 .../smartystreets/goconvey/LICENSE.md         |  23 -
 .../goconvey/convey/assertions.go             |  68 ---
 .../smartystreets/goconvey/convey/context.go  | 272 ---------
 .../goconvey/convey/convey.goconvey           |   4 -
 .../goconvey/convey/discovery.go              | 103 ----
 .../smartystreets/goconvey/convey/doc.go      | 218 -------
 .../goconvey/convey/gotest/utils.go           |  28 -
 .../smartystreets/goconvey/convey/init.go     |  81 ---
 .../goconvey/convey/nilReporter.go            |  15 -
 .../goconvey/convey/reporting/console.go      |  16 -
 .../goconvey/convey/reporting/doc.go          |   5 -
 .../goconvey/convey/reporting/dot.go          |  40 --
 .../goconvey/convey/reporting/gotest.go       |  33 -
 .../goconvey/convey/reporting/init.go         |  94 ---
 .../goconvey/convey/reporting/json.go         |  88 ---
 .../goconvey/convey/reporting/printer.go      |  57 --
 .../goconvey/convey/reporting/problems.go     |  80 ---
 .../goconvey/convey/reporting/reporter.go     |  39 --
 .../convey/reporting/reporting.goconvey       |   2 -
 .../goconvey/convey/reporting/reports.go      | 179 ------
 .../goconvey/convey/reporting/statistics.go   | 108 ----
 .../goconvey/convey/reporting/story.go        |  73 ---
 76 files changed, 1 insertion(+), 7267 deletions(-)
 delete mode 100644 Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/context.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/time.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/type.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/LICENSE.md
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index e58a951fae..1e59f33be5 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/rkt",
 	"GoVersion": "go1.5",
-	"GodepVersion": "v62",
+	"GodepVersion": "v71",
 	"Packages": [
 		"./...",
 		"github.com/appc/spec/actool",
@@ -433,11 +433,6 @@
 			"ImportPath": "github.com/google/btree",
 			"Rev": "f06e229e679911bb31a04e07ac891115822e37c3"
 		},
-		{
-			"ImportPath": "github.com/gopherjs/gopherjs/js",
-			"Comment": "go1.5-45-g19e100e",
-			"Rev": "19e100e9652485a76176bc5fd2669f57d3a2743c"
-		},
 		{
 			"ImportPath": "github.com/gorilla/context",
 			"Rev": "50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da"
@@ -463,11 +458,6 @@
 			"Comment": "0.2.2-12-g0b12d6b",
 			"Rev": "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"
 		},
-		{
-			"ImportPath": "github.com/jtolds/gls",
-			"Comment": "v4.2.0",
-			"Rev": "8ddce2a84170772b95dd5d576c48d517b22cac63"
-		},
 		{
 			"ImportPath": "github.com/kballard/go-shellquote",
 			"Rev": "e5c918b80c17694cbc49aab32a759f9a40067f5d"
@@ -529,36 +519,6 @@
 			"ImportPath": "github.com/shurcooL/sanitized_anchor_name",
 			"Rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77"
 		},
-		{
-			"ImportPath": "github.com/smartystreets/assertions",
-			"Comment": "1.6.0-6-g40711f7",
-			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/assertions/internal/go-render/render",
-			"Comment": "1.6.0-6-g40711f7",
-			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/assertions/internal/oglematchers",
-			"Comment": "1.6.0-6-g40711f7",
-			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/goconvey/convey",
-			"Comment": "1.6.1-20-gcc5d85f",
-			"Rev": "cc5d85f4f15bd2163abf0fe6e6753356dde72aa2"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/goconvey/convey/gotest",
-			"Comment": "1.6.1-20-gcc5d85f",
-			"Rev": "cc5d85f4f15bd2163abf0fe6e6753356dde72aa2"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/goconvey/convey/reporting",
-			"Comment": "1.6.1-20-gcc5d85f",
-			"Rev": "cc5d85f4f15bd2163abf0fe6e6753356dde72aa2"
-		},
 		{
 			"ImportPath": "github.com/spf13/cobra",
 			"Rev": "4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f"
diff --git a/Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go b/Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go
deleted file mode 100644
index 5367d3d0fa..0000000000
--- a/Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Package js provides functions for interacting with native JavaScript APIs. Calls to these functions are treated specially by GopherJS and translated directly to their corresponding JavaScript syntax.
-//
-// Use MakeWrapper to expose methods to JavaScript. When passing values directly, the following type conversions are performed:
-//
-//  | Go type               | JavaScript type       | Conversions back to interface{} |
-//  | --------------------- | --------------------- | ------------------------------- |
-//  | bool                  | Boolean               | bool                            |
-//  | integers and floats   | Number                | float64                         |
-//  | string                | String                | string                          |
-//  | []int8                | Int8Array             | []int8                          |
-//  | []int16               | Int16Array            | []int16                         |
-//  | []int32, []int        | Int32Array            | []int                           |
-//  | []uint8               | Uint8Array            | []uint8                         |
-//  | []uint16              | Uint16Array           | []uint16                        |
-//  | []uint32, []uint      | Uint32Array           | []uint                          |
-//  | []float32             | Float32Array          | []float32                       |
-//  | []float64             | Float64Array          | []float64                       |
-//  | all other slices      | Array                 | []interface{}                   |
-//  | arrays                | see slice type        | see slice type                  |
-//  | functions             | Function              | func(...interface{}) *js.Object |
-//  | time.Time             | Date                  | time.Time                       |
-//  | -                     | instanceof Node       | *js.Object                      |
-//  | maps, structs         | instanceof Object     | map[string]interface{}          |
-//
-// Additionally, for a struct containing a *js.Object field, only the content of the field will be passed to JavaScript and vice versa.
-package js
-
-// Object is a container for a native JavaScript object. Calls to its methods are treated specially by GopherJS and translated directly to their JavaScript syntax. A nil pointer to Object is equal to JavaScript's "null". Object can not be used as a map key.
-type Object struct{ object *Object }
-
-// Get returns the object's property with the given key.
-func (o *Object) Get(key string) *Object { return o.object.Get(key) }
-
-// Set assigns the value to the object's property with the given key.
-func (o *Object) Set(key string, value interface{}) { o.object.Set(key, value) }
-
-// Delete removes the object's property with the given key.
-func (o *Object) Delete(key string) { o.object.Delete(key) }
-
-// Length returns the object's "length" property, converted to int.
-func (o *Object) Length() int { return o.object.Length() }
-
-// Index returns the i'th element of an array.
-func (o *Object) Index(i int) *Object { return o.object.Index(i) }
-
-// SetIndex sets the i'th element of an array.
-func (o *Object) SetIndex(i int, value interface{}) { o.object.SetIndex(i, value) }
-
-// Call calls the object's method with the given name.
-func (o *Object) Call(name string, args ...interface{}) *Object { return o.object.Call(name, args...) }
-
-// Invoke calls the object itself. This will fail if it is not a function.
-func (o *Object) Invoke(args ...interface{}) *Object { return o.object.Invoke(args...) }
-
-// New creates a new instance of this type object. This will fail if it not a function (constructor).
-func (o *Object) New(args ...interface{}) *Object { return o.object.New(args...) }
-
-// Bool returns the object converted to bool according to JavaScript type conversions.
-func (o *Object) Bool() bool { return o.object.Bool() }
-
-// String returns the object converted to string according to JavaScript type conversions.
-func (o *Object) String() string { return o.object.String() }
-
-// Int returns the object converted to int according to JavaScript type conversions (parseInt).
-func (o *Object) Int() int { return o.object.Int() }
-
-// Int64 returns the object converted to int64 according to JavaScript type conversions (parseInt).
-func (o *Object) Int64() int64 { return o.object.Int64() }
-
-// Uint64 returns the object converted to uint64 according to JavaScript type conversions (parseInt).
-func (o *Object) Uint64() uint64 { return o.object.Uint64() }
-
-// Float returns the object converted to float64 according to JavaScript type conversions (parseFloat).
-func (o *Object) Float() float64 { return o.object.Float() }
-
-// Interface returns the object converted to interface{}. See GopherJS' README for details.
-func (o *Object) Interface() interface{} { return o.object.Interface() }
-
-// Unsafe returns the object as an uintptr, which can be converted via unsafe.Pointer. Not intended for public use.
-func (o *Object) Unsafe() uintptr { return o.object.Unsafe() }
-
-// Error encapsulates JavaScript errors. Those are turned into a Go panic and may be recovered, giving an *Error that holds the JavaScript error object.
-type Error struct {
-	*Object
-}
-
-// Error returns the message of the encapsulated JavaScript error object.
-func (err *Error) Error() string {
-	return "JavaScript error: " + err.Get("message").String()
-}
-
-// Stack returns the stack property of the encapsulated JavaScript error object.
-func (err *Error) Stack() string {
-	return err.Get("stack").String()
-}
-
-// Global gives JavaScript's global object ("window" for browsers and "GLOBAL" for Node.js).
-var Global *Object
-
-// Module gives the value of the "module" variable set by Node.js. Hint: Set a module export with 'js.Module.Get("exports").Set("exportName", ...)'.
-var Module *Object
-
-// Undefined gives the JavaScript value "undefined".
-var Undefined *Object
-
-// Debugger gets compiled to JavaScript's "debugger;" statement.
-func Debugger() {}
-
-// InternalObject returns the internal JavaScript object that represents i. Not intended for public use.
-func InternalObject(i interface{}) *Object {
-	return nil
-}
-
-// MakeFunc wraps a function and gives access to the values of JavaScript's "this" and "arguments" keywords.
-func MakeFunc(func(this *Object, arguments []*Object) interface{}) *Object {
-	return nil
-}
-
-// Keys returns the keys of the given JavaScript object.
-func Keys(o *Object) []string {
-	if o == nil || o == Undefined {
-		return nil
-	}
-	a := Global.Get("Object").Call("keys", o)
-	s := make([]string, a.Length())
-	for i := 0; i < a.Length(); i++ {
-		s[i] = a.Index(i).String()
-	}
-	return s
-}
-
-// MakeWrapper creates a JavaScript object which has wrappers for the exported methods of i. Use explicit getter and setter methods to expose struct fields to JavaScript.
-func MakeWrapper(i interface{}) *Object {
-	v := InternalObject(i)
-	o := Global.Get("Object").New()
-	o.Set("__internal_object__", v)
-	methods := v.Get("constructor").Get("methods")
-	for i := 0; i < methods.Length(); i++ {
-		m := methods.Index(i)
-		if m.Get("pkg").String() != "" { // not exported
-			continue
-		}
-		o.Set(m.Get("name").String(), func(args ...*Object) *Object {
-			return Global.Call("$externalizeFunction", v.Get(m.Get("prop").String()), m.Get("typ"), true).Call("apply", v, args)
-		})
-	}
-	return o
-}
-
-// NewArrayBuffer creates a JavaScript ArrayBuffer from a byte slice.
-func NewArrayBuffer(b []byte) *Object {
-	slice := InternalObject(b)
-	offset := slice.Get("$offset").Int()
-	length := slice.Get("$length").Int()
-	return slice.Get("$array").Get("buffer").Call("slice", offset, offset+length)
-}
-
-// M is a simple map type. It is intended as a shorthand for JavaScript objects (before conversion).
-type M map[string]interface{}
-
-// S is a simple slice type. It is intended as a shorthand for JavaScript arrays (before conversion).
-type S []interface{}
-
-func init() {
-	// avoid dead code elimination
-	e := Error{}
-	_ = e
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/LICENSE b/Godeps/_workspace/src/github.com/jtolds/gls/LICENSE
deleted file mode 100644
index 9b4a822d92..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright (c) 2013, Space Monkey, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/README.md b/Godeps/_workspace/src/github.com/jtolds/gls/README.md
deleted file mode 100644
index 4ebb692fb1..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-gls
-===
-
-Goroutine local storage
-
-### IMPORTANT NOTE ###
-
-It is my duty to point you to https://blog.golang.org/context, which is how 
-Google solves all of the problems you'd perhaps consider using this package
-for at scale. 
-
-One downside to Google's approach is that *all* of your functions must have
-a new first argument, but after clearing that hurdle everything else is much
-better.
-
-If you aren't interested in this warning, read on.
-
-### Huhwaht? Why? ###
-
-Every so often, a thread shows up on the
-[golang-nuts](https://groups.google.com/d/forum/golang-nuts) asking for some
-form of goroutine-local-storage, or some kind of goroutine id, or some kind of
-context. There are a few valid use cases for goroutine-local-storage, one of
-the most prominent being log line context. One poster was interested in being
-able to log an HTTP request context id in every log line in the same goroutine
-as the incoming HTTP request, without having to change every library and
-function call he was interested in logging.
-
-This would be pretty useful. Provided that you could get some kind of
-goroutine-local-storage, you could call
-[log.SetOutput](http://golang.org/pkg/log/#SetOutput) with your own logging
-writer that checks goroutine-local-storage for some context information and
-adds that context to your log lines.
-
-But alas, Andrew Gerrand's typically diplomatic answer to the question of
-goroutine-local variables was:
-
-> We wouldn't even be having this discussion if thread local storage wasn't
-> useful. But every feature comes at a cost, and in my opinion the cost of
-> threadlocals far outweighs their benefits. They're just not a good fit for
-> Go.
-
-So, yeah, that makes sense. That's a pretty good reason for why the language
-won't support a specific and (relatively) unuseful feature that requires some
-runtime changes, just for the sake of a little bit of log improvement.
-
-But does Go require runtime changes?
-
-### How it works ###
-
-Go has pretty fantastic introspective and reflective features, but one thing Go
-doesn't give you is any kind of access to the stack pointer, or frame pointer,
-or goroutine id, or anything contextual about your current stack. It gives you
-access to your list of callers, but only along with program counters, which are
-fixed at compile time.
-
-But it does give you the stack.
-
-So, we define 16 special functions and embed base-16 tags into the stack using
-the call order of those 16 functions. Then, we can read our tags back out of
-the stack looking at the callers list.
-
-We then use these tags as an index into a traditional map for implementing
-this library.
-
-### What are people saying? ###
-
-"Wow, that's horrifying."
-
-"This is the most terrible thing I have seen in a very long time."
-
-"Where is it getting a context from? Is this serializing all the requests? 
-What the heck is the client being bound to? What are these tags? Why does he 
-need callers? Oh god no. No no no."
-
-### Docs ###
-
-Please see the docs at http://godoc.org/github.com/jtolds/gls
-
-### Related ###
-
-If you're okay relying on the string format of the current runtime stacktrace 
-including a unique goroutine id (not guaranteed by the spec or anything, but 
-very unlikely to change within a Go release), you might be able to squeeze 
-out a bit more performance by using this similar library, inspired by some 
-code Brad Fitzpatrick wrote for debugging his HTTP/2 library: 
-https://github.com/tylerb/gls (in contrast, jtolds/gls doesn't require 
-any knowledge of the string format of the runtime stacktrace, which 
-probably adds unnecessary overhead).
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/context.go b/Godeps/_workspace/src/github.com/jtolds/gls/context.go
deleted file mode 100644
index 90cfcf7db1..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/context.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Package gls implements goroutine-local storage.
-package gls
-
-import (
-	"sync"
-)
-
-const (
-	maxCallers = 64
-)
-
-var (
-	stackTagPool   = &idPool{}
-	mgrRegistry    = make(map[*ContextManager]bool)
-	mgrRegistryMtx sync.RWMutex
-)
-
-// Values is simply a map of key types to value types. Used by SetValues to
-// set multiple values at once.
-type Values map[interface{}]interface{}
-
-// ContextManager is the main entrypoint for interacting with
-// Goroutine-local-storage. You can have multiple independent ContextManagers
-// at any given time. ContextManagers are usually declared globally for a given
-// class of context variables. You should use NewContextManager for
-// construction.
-type ContextManager struct {
-	mtx    sync.RWMutex
-	values map[uint]Values
-}
-
-// NewContextManager returns a brand new ContextManager. It also registers the
-// new ContextManager in the ContextManager registry which is used by the Go
-// method. ContextManagers are typically defined globally at package scope.
-func NewContextManager() *ContextManager {
-	mgr := &ContextManager{values: make(map[uint]Values)}
-	mgrRegistryMtx.Lock()
-	defer mgrRegistryMtx.Unlock()
-	mgrRegistry[mgr] = true
-	return mgr
-}
-
-// Unregister removes a ContextManager from the global registry, used by the
-// Go method. Only intended for use when you're completely done with a
-// ContextManager. Use of Unregister at all is rare.
-func (m *ContextManager) Unregister() {
-	mgrRegistryMtx.Lock()
-	defer mgrRegistryMtx.Unlock()
-	delete(mgrRegistry, m)
-}
-
-// SetValues takes a collection of values and a function to call for those
-// values to be set in. Anything further down the stack will have the set
-// values available through GetValue. SetValues will add new values or replace
-// existing values of the same key and will not mutate or change values for
-// previous stack frames.
-// SetValues is slow (makes a copy of all current and new values for the new
-// gls-context) in order to reduce the amount of lookups GetValue requires.
-func (m *ContextManager) SetValues(new_values Values, context_call func()) {
-	if len(new_values) == 0 {
-		context_call()
-		return
-	}
-
-	tags := readStackTags(1)
-
-	m.mtx.Lock()
-	values := new_values
-	for _, tag := range tags {
-		if existing_values, ok := m.values[tag]; ok {
-			// oh, we found existing values, let's make a copy
-			values = make(Values, len(existing_values)+len(new_values))
-			for key, val := range existing_values {
-				values[key] = val
-			}
-			for key, val := range new_values {
-				values[key] = val
-			}
-			break
-		}
-	}
-	new_tag := stackTagPool.Acquire()
-	m.values[new_tag] = values
-	m.mtx.Unlock()
-	defer func() {
-		m.mtx.Lock()
-		delete(m.values, new_tag)
-		m.mtx.Unlock()
-		stackTagPool.Release(new_tag)
-	}()
-
-	addStackTag(new_tag, context_call)
-}
-
-// GetValue will return a previously set value, provided that the value was set
-// by SetValues somewhere higher up the stack. If the value is not found, ok
-// will be false.
-func (m *ContextManager) GetValue(key interface{}) (value interface{}, ok bool) {
-
-	tags := readStackTags(1)
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-	for _, tag := range tags {
-		if values, ok := m.values[tag]; ok {
-			value, ok := values[key]
-			return value, ok
-		}
-	}
-	return "", false
-}
-
-func (m *ContextManager) getValues() Values {
-	tags := readStackTags(2)
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-	for _, tag := range tags {
-		if values, ok := m.values[tag]; ok {
-			return values
-		}
-	}
-	return nil
-}
-
-// Go preserves ContextManager values and Goroutine-local-storage across new
-// goroutine invocations. The Go method makes a copy of all existing values on
-// all registered context managers and makes sure they are still set after
-// kicking off the provided function in a new goroutine. If you don't use this
-// Go method instead of the standard 'go' keyword, you will lose values in
-// ContextManagers, as goroutines have brand new stacks.
-func Go(cb func()) {
-	mgrRegistryMtx.RLock()
-	defer mgrRegistryMtx.RUnlock()
-
-	for mgr, _ := range mgrRegistry {
-		values := mgr.getValues()
-		if len(values) > 0 {
-			mgr_copy := mgr
-			cb_copy := cb
-			cb = func() { mgr_copy.SetValues(values, cb_copy) }
-		}
-	}
-
-	go cb()
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go b/Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go
deleted file mode 100644
index 8d5fc24d4a..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package gls
-
-var (
-	symPool = &idPool{}
-)
-
-// ContextKey is a throwaway value you can use as a key to a ContextManager
-type ContextKey struct{ id uint }
-
-// GenSym will return a brand new, never-before-used ContextKey
-func GenSym() ContextKey {
-	return ContextKey{id: symPool.Acquire()}
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go b/Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go
deleted file mode 100644
index b7974ae002..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package gls
-
-// though this could probably be better at keeping ids smaller, the goal of
-// this class is to keep a registry of the smallest unique integer ids
-// per-process possible
-
-import (
-	"sync"
-)
-
-type idPool struct {
-	mtx      sync.Mutex
-	released []uint
-	max_id   uint
-}
-
-func (p *idPool) Acquire() (id uint) {
-	p.mtx.Lock()
-	defer p.mtx.Unlock()
-	if len(p.released) > 0 {
-		id = p.released[len(p.released)-1]
-		p.released = p.released[:len(p.released)-1]
-		return id
-	}
-	id = p.max_id
-	p.max_id++
-	return id
-}
-
-func (p *idPool) Release(id uint) {
-	p.mtx.Lock()
-	defer p.mtx.Unlock()
-	p.released = append(p.released, id)
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go
deleted file mode 100644
index 9b8e39ba7c..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package gls
-
-// so, basically, we're going to encode integer tags in base-16 on the stack
-
-const (
-	bitWidth = 4
-)
-
-func addStackTag(tag uint, context_call func()) {
-	if context_call == nil {
-		return
-	}
-	markS(tag, context_call)
-}
-
-func markS(tag uint, cb func()) { _m(tag, cb) }
-func mark0(tag uint, cb func()) { _m(tag, cb) }
-func mark1(tag uint, cb func()) { _m(tag, cb) }
-func mark2(tag uint, cb func()) { _m(tag, cb) }
-func mark3(tag uint, cb func()) { _m(tag, cb) }
-func mark4(tag uint, cb func()) { _m(tag, cb) }
-func mark5(tag uint, cb func()) { _m(tag, cb) }
-func mark6(tag uint, cb func()) { _m(tag, cb) }
-func mark7(tag uint, cb func()) { _m(tag, cb) }
-func mark8(tag uint, cb func()) { _m(tag, cb) }
-func mark9(tag uint, cb func()) { _m(tag, cb) }
-func markA(tag uint, cb func()) { _m(tag, cb) }
-func markB(tag uint, cb func()) { _m(tag, cb) }
-func markC(tag uint, cb func()) { _m(tag, cb) }
-func markD(tag uint, cb func()) { _m(tag, cb) }
-func markE(tag uint, cb func()) { _m(tag, cb) }
-func markF(tag uint, cb func()) { _m(tag, cb) }
-
-var pc_lookup = make(map[uintptr]int8, 17)
-var mark_lookup [16]func(uint, func())
-
-func _m(tag_remainder uint, cb func()) {
-	if tag_remainder == 0 {
-		cb()
-	} else {
-		mark_lookup[tag_remainder&0xf](tag_remainder>>bitWidth, cb)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go
deleted file mode 100644
index 21d5595926..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// +build js
-
-package gls
-
-// This file is used for GopherJS builds, which don't have normal runtime support
-
-import (
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/gopherjs/gopherjs/js"
-)
-
-var stackRE = regexp.MustCompile("\\s+at (\\S*) \\([^:]+:(\\d+):(\\d+)")
-
-func findPtr() uintptr {
-	jsStack := js.Global.Get("Error").New().Get("stack").Call("split", "\n")
-	for i := 1; i < jsStack.Get("length").Int(); i++ {
-		item := jsStack.Index(i).String()
-		matches := stackRE.FindAllStringSubmatch(item, -1)
-		if matches == nil {
-			return 0
-		}
-		pkgPath := matches[0][1]
-		if strings.HasPrefix(pkgPath, "$packages.github.com/jtolds/gls.mark") {
-			line, _ := strconv.Atoi(matches[0][2])
-			char, _ := strconv.Atoi(matches[0][3])
-			x := (uintptr(line) << 16) | uintptr(char)
-			return x
-		}
-	}
-
-	return 0
-}
-
-func init() {
-	setEntries := func(f func(uint, func()), v int8) {
-		var ptr uintptr
-		f(0, func() {
-			ptr = findPtr()
-		})
-		pc_lookup[ptr] = v
-		if v >= 0 {
-			mark_lookup[v] = f
-		}
-	}
-	setEntries(markS, -0x1)
-	setEntries(mark0, 0x0)
-	setEntries(mark1, 0x1)
-	setEntries(mark2, 0x2)
-	setEntries(mark3, 0x3)
-	setEntries(mark4, 0x4)
-	setEntries(mark5, 0x5)
-	setEntries(mark6, 0x6)
-	setEntries(mark7, 0x7)
-	setEntries(mark8, 0x8)
-	setEntries(mark9, 0x9)
-	setEntries(markA, 0xa)
-	setEntries(markB, 0xb)
-	setEntries(markC, 0xc)
-	setEntries(markD, 0xd)
-	setEntries(markE, 0xe)
-	setEntries(markF, 0xf)
-}
-
-func currentStack(skip int) (stack []uintptr) {
-	jsStack := js.Global.Get("Error").New().Get("stack").Call("split", "\n")
-	for i := skip + 2; i < jsStack.Get("length").Int(); i++ {
-		item := jsStack.Index(i).String()
-		matches := stackRE.FindAllStringSubmatch(item, -1)
-		if matches == nil {
-			return stack
-		}
-		line, _ := strconv.Atoi(matches[0][2])
-		char, _ := strconv.Atoi(matches[0][3])
-		x := (uintptr(line) << 16) | uintptr(char)&0xffff
-		stack = append(stack, x)
-	}
-
-	return stack
-}
-
-func readStackTags(skip int) (tags []uint) {
-	stack := currentStack(skip)
-	var current_tag uint
-	for _, pc := range stack {
-		val, ok := pc_lookup[pc]
-		if !ok {
-			continue
-		}
-		if val < 0 {
-			tags = append(tags, current_tag)
-			current_tag = 0
-			continue
-		}
-		current_tag <<= bitWidth
-		current_tag += uint(val)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go
deleted file mode 100644
index cb302b9ef6..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// +build !js
-
-package gls
-
-// This file is used for standard Go builds, which have the expected runtime support
-
-import (
-	"reflect"
-	"runtime"
-)
-
-func init() {
-	setEntries := func(f func(uint, func()), v int8) {
-		pc_lookup[reflect.ValueOf(f).Pointer()] = v
-		if v >= 0 {
-			mark_lookup[v] = f
-		}
-	}
-	setEntries(markS, -0x1)
-	setEntries(mark0, 0x0)
-	setEntries(mark1, 0x1)
-	setEntries(mark2, 0x2)
-	setEntries(mark3, 0x3)
-	setEntries(mark4, 0x4)
-	setEntries(mark5, 0x5)
-	setEntries(mark6, 0x6)
-	setEntries(mark7, 0x7)
-	setEntries(mark8, 0x8)
-	setEntries(mark9, 0x9)
-	setEntries(markA, 0xa)
-	setEntries(markB, 0xb)
-	setEntries(markC, 0xc)
-	setEntries(markD, 0xd)
-	setEntries(markE, 0xe)
-	setEntries(markF, 0xf)
-}
-
-func currentStack(skip int) []uintptr {
-	stack := make([]uintptr, maxCallers)
-	return stack[:runtime.Callers(3+skip, stack)]
-}
-
-func readStackTags(skip int) (tags []uint) {
-	stack := currentStack(skip)
-	var current_tag uint
-	for _, pc := range stack {
-		pc = runtime.FuncForPC(pc).Entry()
-		val, ok := pc_lookup[pc]
-		if !ok {
-			continue
-		}
-		if val < 0 {
-			tags = append(tags, current_tag)
-			current_tag = 0
-			continue
-		}
-		current_tag <<= bitWidth
-		current_tag += uint(val)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore b/Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore
deleted file mode 100644
index 6ad551742d..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.DS_Store
-Thumbs.db
-/.idea
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml b/Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml
deleted file mode 100644
index 44217c9733..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: go
-
-go:
-  - 1.2
-  - 1.3
-  - 1.4
-  - 1.5
-
-install:
-  - go get -t ./...
-
-script: go test -v
-
-sudo: false
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md
deleted file mode 100644
index 1820ecb331..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Contributing
-
-In general, the code posted to the [SmartyStreets github organization](https://github.com/smartystreets) is created to solve specific problems at SmartyStreets that are ancillary to our core products in the address verification industry and may or may not be useful to other organizations or developers. Our reason for posting said code isn't necessarily to solicit feedback or contributions from the community but more as a showcase of some of the approaches to solving problems we have adopted.
-
-Having stated that, we do consider issues raised by other githubbers as well as contributions submitted via pull requests. When submitting such a pull request, please follow these guidelines:
-
-- _Look before you leap:_ If the changes you plan to make are significant, it's in everyone's best interest for you to discuss them with a SmartyStreets team member prior to opening a pull request.
-- _License and ownership:_ If modifying the `LICENSE.md` file, limit your changes to fixing typographical mistakes. Do NOT modify the actual terms in the license or the copyright by **SmartyStreets, LLC**. Code submitted to SmartyStreets projects becomes property of SmartyStreets and must be compatible with the associated license.
-- _Testing:_ If the code you are submitting resides in packages/modules covered by automated tests, be sure to add passing tests that cover your changes and assert expected behavior and state. Submit the additional test cases as part of your change set.
-- _Style:_ Match your approach to **naming** and **formatting** with the surrounding code. Basically, the code you submit shouldn't stand out.
-  - "Naming" refers to such constructs as variables, methods, functions, classes, structs, interfaces, packages, modules, directories, files, etc...
-  - "Formatting" refers to such constructs as whitespace, horizontal line length, vertical function length, vertical file length, indentation, curly braces, etc...
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md
deleted file mode 100644
index 8ea6f94552..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2016 SmartyStreets, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
-
-NOTE: Various optional and subordinate components carry their own licensing
-requirements and restrictions.  Use of those components is subject to the terms
-and conditions outlined the respective license of each component.
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/README.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/README.md
deleted file mode 100644
index 58383bb00a..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/README.md
+++ /dev/null
@@ -1,575 +0,0 @@
-# assertions
---
-    import "github.com/smartystreets/assertions"
-
-Package assertions contains the implementations for all assertions which are
-referenced in goconvey's `convey` package
-(github.com/smartystreets/goconvey/convey) and gunit
-(github.com/smartystreets/gunit) for use with the So(...) method. They can also
-be used in traditional Go test functions and even in applications.
-
-Many of the assertions lean heavily on work done by Aaron Jacobs in his
-excellent oglematchers library. (https://github.com/jacobsa/oglematchers) The
-ShouldResemble assertion leans heavily on work done by Daniel Jacques in his
-very helpful go-render library. (https://github.com/luci/go-render)
-
-## Usage
-
-#### func  GoConveyMode
-
-```go
-func GoConveyMode(yes bool)
-```
-GoConveyMode provides control over JSON serialization of failures. When using
-the assertions in this package from the convey package JSON results are very
-helpful and can be rendered in a DIFF view. In that case, this function will be
-called with a true value to enable the JSON serialization. By default, the
-assertions in this package will not serializer a JSON result, making standalone
-ussage more convenient.
-
-#### func  ShouldAlmostEqual
-
-```go
-func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldAlmostEqual makes sure that two parameters are close enough to being
-equal. The acceptable delta may be specified with a third argument, or a very
-small default delta will be used.
-
-#### func  ShouldBeBetween
-
-```go
-func ShouldBeBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldBeBetween receives exactly three parameters: an actual value, a lower
-bound, and an upper bound. It ensures that the actual value is between both
-bounds (but not equal to either of them).
-
-#### func  ShouldBeBetweenOrEqual
-
-```go
-func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldBeBetweenOrEqual receives exactly three parameters: an actual value, a
-lower bound, and an upper bound. It ensures that the actual value is between
-both bounds or equal to one of them.
-
-#### func  ShouldBeBlank
-
-```go
-func ShouldBeBlank(actual interface{}, expected ...interface{}) string
-```
-ShouldBeBlank receives exactly 1 string parameter and ensures that it is equal
-to "".
-
-#### func  ShouldBeChronological
-
-```go
-func ShouldBeChronological(actual interface{}, expected ...interface{}) string
-```
-ShouldBeChronological receives a []time.Time slice and asserts that the are in
-chronological order starting with the first time.Time as the earliest.
-
-#### func  ShouldBeEmpty
-
-```go
-func ShouldBeEmpty(actual interface{}, expected ...interface{}) string
-```
-ShouldBeEmpty receives a single parameter (actual) and determines whether or not
-calling len(actual) would return `0`. It obeys the rules specified by the len
-function for determining length: http://golang.org/pkg/builtin/#len
-
-#### func  ShouldBeFalse
-
-```go
-func ShouldBeFalse(actual interface{}, expected ...interface{}) string
-```
-ShouldBeFalse receives a single parameter and ensures that it is false.
-
-#### func  ShouldBeGreaterThan
-
-```go
-func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string
-```
-ShouldBeGreaterThan receives exactly two parameters and ensures that the first
-is greater than the second.
-
-#### func  ShouldBeGreaterThanOrEqualTo
-
-```go
-func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) string
-```
-ShouldBeGreaterThanOrEqualTo receives exactly two parameters and ensures that
-the first is greater than or equal to the second.
-
-#### func  ShouldBeIn
-
-```go
-func ShouldBeIn(actual interface{}, expected ...interface{}) string
-```
-ShouldBeIn receives at least 2 parameters. The first is a proposed member of the
-collection that is passed in either as the second parameter, or of the
-collection that is comprised of all the remaining parameters. This assertion
-ensures that the proposed member is in the collection (using ShouldEqual).
-
-#### func  ShouldBeLessThan
-
-```go
-func ShouldBeLessThan(actual interface{}, expected ...interface{}) string
-```
-ShouldBeLessThan receives exactly two parameters and ensures that the first is
-less than the second.
-
-#### func  ShouldBeLessThanOrEqualTo
-
-```go
-func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) string
-```
-ShouldBeLessThan receives exactly two parameters and ensures that the first is
-less than or equal to the second.
-
-#### func  ShouldBeNil
-
-```go
-func ShouldBeNil(actual interface{}, expected ...interface{}) string
-```
-ShouldBeNil receives a single parameter and ensures that it is nil.
-
-#### func  ShouldBeTrue
-
-```go
-func ShouldBeTrue(actual interface{}, expected ...interface{}) string
-```
-ShouldBeTrue receives a single parameter and ensures that it is true.
-
-#### func  ShouldBeZeroValue
-
-```go
-func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string
-```
-ShouldBeZeroValue receives a single parameter and ensures that it is the Go
-equivalent of the default value, or "zero" value.
-
-#### func  ShouldContain
-
-```go
-func ShouldContain(actual interface{}, expected ...interface{}) string
-```
-ShouldContain receives exactly two parameters. The first is a slice and the
-second is a proposed member. Membership is determined using ShouldEqual.
-
-#### func  ShouldContainKey
-
-```go
-func ShouldContainKey(actual interface{}, expected ...interface{}) string
-```
-ShouldContainKey receives exactly two parameters. The first is a map and the
-second is a proposed key. Keys are compared with a simple '=='.
-
-#### func  ShouldContainSubstring
-
-```go
-func ShouldContainSubstring(actual interface{}, expected ...interface{}) string
-```
-ShouldContainSubstring receives exactly 2 string parameters and ensures that the
-first contains the second as a substring.
-
-#### func  ShouldEndWith
-
-```go
-func ShouldEndWith(actual interface{}, expected ...interface{}) string
-```
-ShouldEndWith receives exactly 2 string parameters and ensures that the first
-ends with the second.
-
-#### func  ShouldEqual
-
-```go
-func ShouldEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldEqual receives exactly two parameters and does an equality check.
-
-#### func  ShouldEqualTrimSpace
-
-```go
-func ShouldEqualTrimSpace(actual interface{}, expected ...interface{}) string
-```
-ShouldEqualTrimSpace receives exactly 2 string parameters and ensures that the
-first is equal to the second after removing all leading and trailing whitespace
-using strings.TrimSpace(first).
-
-#### func  ShouldEqualWithout
-
-```go
-func ShouldEqualWithout(actual interface{}, expected ...interface{}) string
-```
-ShouldEqualWithout receives exactly 3 string parameters and ensures that the
-first is equal to the second after removing all instances of the third from the
-first using strings.Replace(first, third, "", -1).
-
-#### func  ShouldHappenAfter
-
-```go
-func ShouldHappenAfter(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenAfter receives exactly 2 time.Time arguments and asserts that the
-first happens after the second.
-
-#### func  ShouldHappenBefore
-
-```go
-func ShouldHappenBefore(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenBefore receives exactly 2 time.Time arguments and asserts that the
-first happens before the second.
-
-#### func  ShouldHappenBetween
-
-```go
-func ShouldHappenBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenBetween receives exactly 3 time.Time arguments and asserts that the
-first happens between (not on) the second and third.
-
-#### func  ShouldHappenOnOrAfter
-
-```go
-func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenOnOrAfter receives exactly 2 time.Time arguments and asserts that
-the first happens on or after the second.
-
-#### func  ShouldHappenOnOrBefore
-
-```go
-func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenOnOrBefore receives exactly 2 time.Time arguments and asserts that
-the first happens on or before the second.
-
-#### func  ShouldHappenOnOrBetween
-
-```go
-func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that
-the first happens between or on the second and third.
-
-#### func  ShouldHappenWithin
-
-```go
-func ShouldHappenWithin(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenWithin receives a time.Time, a time.Duration, and a time.Time (3
-arguments) and asserts that the first time.Time happens within or on the
-duration specified relative to the other time.Time.
-
-#### func  ShouldHaveLength
-
-```go
-func ShouldHaveLength(actual interface{}, expected ...interface{}) string
-```
-ShouldHaveLength receives 2 parameters. The first is a collection to check the
-length of, the second being the expected length. It obeys the rules specified by
-the len function for determining length: http://golang.org/pkg/builtin/#len
-
-#### func  ShouldHaveSameTypeAs
-
-```go
-func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string
-```
-ShouldHaveSameTypeAs receives exactly two parameters and compares their
-underlying types for equality.
-
-#### func  ShouldImplement
-
-```go
-func ShouldImplement(actual interface{}, expectedList ...interface{}) string
-```
-ShouldImplement receives exactly two parameters and ensures that the first
-implements the interface type of the second.
-
-#### func  ShouldNotAlmostEqual
-
-```go
-func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldNotAlmostEqual is the inverse of ShouldAlmostEqual
-
-#### func  ShouldNotBeBetween
-
-```go
-func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeBetween receives exactly three parameters: an actual value, a lower
-bound, and an upper bound. It ensures that the actual value is NOT between both
-bounds.
-
-#### func  ShouldNotBeBetweenOrEqual
-
-```go
-func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeBetweenOrEqual receives exactly three parameters: an actual value, a
-lower bound, and an upper bound. It ensures that the actual value is nopt
-between the bounds nor equal to either of them.
-
-#### func  ShouldNotBeBlank
-
-```go
-func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeBlank receives exactly 1 string parameter and ensures that it is
-equal to "".
-
-#### func  ShouldNotBeEmpty
-
-```go
-func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeEmpty receives a single parameter (actual) and determines whether or
-not calling len(actual) would return a value greater than zero. It obeys the
-rules specified by the `len` function for determining length:
-http://golang.org/pkg/builtin/#len
-
-#### func  ShouldNotBeIn
-
-```go
-func ShouldNotBeIn(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeIn receives at least 2 parameters. The first is a proposed member of
-the collection that is passed in either as the second parameter, or of the
-collection that is comprised of all the remaining parameters. This assertion
-ensures that the proposed member is NOT in the collection (using ShouldEqual).
-
-#### func  ShouldNotBeNil
-
-```go
-func ShouldNotBeNil(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeNil receives a single parameter and ensures that it is not nil.
-
-#### func  ShouldNotContain
-
-```go
-func ShouldNotContain(actual interface{}, expected ...interface{}) string
-```
-ShouldNotContain receives exactly two parameters. The first is a slice and the
-second is a proposed member. Membership is determinied using ShouldEqual.
-
-#### func  ShouldNotContainKey
-
-```go
-func ShouldNotContainKey(actual interface{}, expected ...interface{}) string
-```
-ShouldNotContainKey receives exactly two parameters. The first is a map and the
-second is a proposed absent key. Keys are compared with a simple '=='.
-
-#### func  ShouldNotContainSubstring
-
-```go
-func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) string
-```
-ShouldNotContainSubstring receives exactly 2 string parameters and ensures that
-the first does NOT contain the second as a substring.
-
-#### func  ShouldNotEndWith
-
-```go
-func ShouldNotEndWith(actual interface{}, expected ...interface{}) string
-```
-ShouldEndWith receives exactly 2 string parameters and ensures that the first
-does not end with the second.
-
-#### func  ShouldNotEqual
-
-```go
-func ShouldNotEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldNotEqual receives exactly two parameters and does an inequality check.
-
-#### func  ShouldNotHappenOnOrBetween
-
-```go
-func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldNotHappenOnOrBetween receives exactly 3 time.Time arguments and asserts
-that the first does NOT happen between or on the second or third.
-
-#### func  ShouldNotHappenWithin
-
-```go
-func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string
-```
-ShouldNotHappenWithin receives a time.Time, a time.Duration, and a time.Time (3
-arguments) and asserts that the first time.Time does NOT happen within or on the
-duration specified relative to the other time.Time.
-
-#### func  ShouldNotHaveSameTypeAs
-
-```go
-func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string
-```
-ShouldNotHaveSameTypeAs receives exactly two parameters and compares their
-underlying types for inequality.
-
-#### func  ShouldNotImplement
-
-```go
-func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string
-```
-ShouldNotImplement receives exactly two parameters and ensures that the first
-does NOT implement the interface type of the second.
-
-#### func  ShouldNotPanic
-
-```go
-func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string)
-```
-ShouldNotPanic receives a void, niladic function and expects to execute the
-function without any panic.
-
-#### func  ShouldNotPanicWith
-
-```go
-func ShouldNotPanicWith(actual interface{}, expected ...interface{}) (message string)
-```
-ShouldNotPanicWith receives a void, niladic function and expects to recover a
-panic whose content differs from the second argument.
-
-#### func  ShouldNotPointTo
-
-```go
-func ShouldNotPointTo(actual interface{}, expected ...interface{}) string
-```
-ShouldNotPointTo receives exactly two parameters and checks to see that they
-point to different addresess.
-
-#### func  ShouldNotResemble
-
-```go
-func ShouldNotResemble(actual interface{}, expected ...interface{}) string
-```
-ShouldNotResemble receives exactly two parameters and does an inverse deep equal
-check (see reflect.DeepEqual)
-
-#### func  ShouldNotStartWith
-
-```go
-func ShouldNotStartWith(actual interface{}, expected ...interface{}) string
-```
-ShouldNotStartWith receives exactly 2 string parameters and ensures that the
-first does not start with the second.
-
-#### func  ShouldPanic
-
-```go
-func ShouldPanic(actual interface{}, expected ...interface{}) (message string)
-```
-ShouldPanic receives a void, niladic function and expects to recover a panic.
-
-#### func  ShouldPanicWith
-
-```go
-func ShouldPanicWith(actual interface{}, expected ...interface{}) (message string)
-```
-ShouldPanicWith receives a void, niladic function and expects to recover a panic
-with the second argument as the content.
-
-#### func  ShouldPointTo
-
-```go
-func ShouldPointTo(actual interface{}, expected ...interface{}) string
-```
-ShouldPointTo receives exactly two parameters and checks to see that they point
-to the same address.
-
-#### func  ShouldResemble
-
-```go
-func ShouldResemble(actual interface{}, expected ...interface{}) string
-```
-ShouldResemble receives exactly two parameters and does a deep equal check (see
-reflect.DeepEqual)
-
-#### func  ShouldStartWith
-
-```go
-func ShouldStartWith(actual interface{}, expected ...interface{}) string
-```
-ShouldStartWith receives exactly 2 string parameters and ensures that the first
-starts with the second.
-
-#### func  So
-
-```go
-func So(actual interface{}, assert assertion, expected ...interface{}) (bool, string)
-```
-So is a convenience function (as opposed to an inconvenience function?) for
-running assertions on arbitrary arguments in any context, be it for testing or
-even application logging. It allows you to perform assertion-like behavior (and
-get nicely formatted messages detailing discrepancies) but without the program
-blowing up or panicking. All that is required is to import this package and call
-`So` with one of the assertions exported by this package as the second
-parameter. The first return parameter is a boolean indicating if the assertion
-was true. The second return parameter is the well-formatted message showing why
-an assertion was incorrect, or blank if the assertion was correct.
-
-Example:
-
-    if ok, message := So(x, ShouldBeGreaterThan, y); !ok {
-         log.Println(message)
-    }
-
-#### type Assertion
-
-```go
-type Assertion struct {
-}
-```
-
-
-#### func  New
-
-```go
-func New(t testingT) *Assertion
-```
-New swallows the *testing.T struct and prints failed assertions using t.Error.
-Example: assertions.New(t).So(1, should.Equal, 1)
-
-#### func (*Assertion) Failed
-
-```go
-func (this *Assertion) Failed() bool
-```
-Failed reports whether any calls to So (on this Assertion instance) have failed.
-
-#### func (*Assertion) So
-
-```go
-func (this *Assertion) So(actual interface{}, assert assertion, expected ...interface{}) bool
-```
-So calls the standalone So function and additionally, calls t.Error in failure
-scenarios.
-
-#### type FailureView
-
-```go
-type FailureView struct {
-	Message  string `json:"Message"`
-	Expected string `json:"Expected"`
-	Actual   string `json:"Actual"`
-}
-```
-
-This struct is also declared in
-github.com/smartystreets/goconvey/convey/reporting. The json struct tags should
-be equal in both declarations.
-
-#### type Serializer
-
-```go
-type Serializer interface {
-	// contains filtered or unexported methods
-}
-```
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey b/Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey
deleted file mode 100644
index e76cf275d4..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey
+++ /dev/null
@@ -1,3 +0,0 @@
-#ignore
--timeout=1s
--coverpkg=github.com/smartystreets/assertions,github.com/smartystreets/assertions/internal/oglematchers
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go
deleted file mode 100644
index d7f407e913..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go
+++ /dev/null
@@ -1,244 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/smartystreets/assertions/internal/oglematchers"
-)
-
-// ShouldContain receives exactly two parameters. The first is a slice and the
-// second is a proposed member. Membership is determined using ShouldEqual.
-func ShouldContain(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	if matchError := oglematchers.Contains(expected[0]).Matches(actual); matchError != nil {
-		typeName := reflect.TypeOf(actual)
-
-		if fmt.Sprintf("%v", matchError) == "which is not a slice or array" {
-			return fmt.Sprintf(shouldHaveBeenAValidCollection, typeName)
-		}
-		return fmt.Sprintf(shouldHaveContained, typeName, expected[0])
-	}
-	return success
-}
-
-// ShouldNotContain receives exactly two parameters. The first is a slice and the
-// second is a proposed member. Membership is determinied using ShouldEqual.
-func ShouldNotContain(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	typeName := reflect.TypeOf(actual)
-
-	if matchError := oglematchers.Contains(expected[0]).Matches(actual); matchError != nil {
-		if fmt.Sprintf("%v", matchError) == "which is not a slice or array" {
-			return fmt.Sprintf(shouldHaveBeenAValidCollection, typeName)
-		}
-		return success
-	}
-	return fmt.Sprintf(shouldNotHaveContained, typeName, expected[0])
-}
-
-// ShouldContainKey receives exactly two parameters. The first is a map and the
-// second is a proposed key. Keys are compared with a simple '=='.
-func ShouldContainKey(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	keys, isMap := mapKeys(actual)
-	if !isMap {
-		return fmt.Sprintf(shouldHaveBeenAValidMap, reflect.TypeOf(actual))
-	}
-
-	if !keyFound(keys, expected[0]) {
-		return fmt.Sprintf(shouldHaveContainedKey, reflect.TypeOf(actual), expected)
-	}
-
-	return ""
-}
-
-// ShouldNotContainKey receives exactly two parameters. The first is a map and the
-// second is a proposed absent key. Keys are compared with a simple '=='.
-func ShouldNotContainKey(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	keys, isMap := mapKeys(actual)
-	if !isMap {
-		return fmt.Sprintf(shouldHaveBeenAValidMap, reflect.TypeOf(actual))
-	}
-
-	if keyFound(keys, expected[0]) {
-		return fmt.Sprintf(shouldNotHaveContainedKey, reflect.TypeOf(actual), expected)
-	}
-
-	return ""
-}
-
-func mapKeys(m interface{}) ([]reflect.Value, bool) {
-	value := reflect.ValueOf(m)
-	if value.Kind() != reflect.Map {
-		return nil, false
-	}
-	return value.MapKeys(), true
-}
-func keyFound(keys []reflect.Value, expectedKey interface{}) bool {
-	found := false
-	for _, key := range keys {
-		if key.Interface() == expectedKey {
-			found = true
-		}
-	}
-	return found
-}
-
-// ShouldBeIn receives at least 2 parameters. The first is a proposed member of the collection
-// that is passed in either as the second parameter, or of the collection that is comprised
-// of all the remaining parameters. This assertion ensures that the proposed member is in
-// the collection (using ShouldEqual).
-func ShouldBeIn(actual interface{}, expected ...interface{}) string {
-	if fail := atLeast(1, expected); fail != success {
-		return fail
-	}
-
-	if len(expected) == 1 {
-		return shouldBeIn(actual, expected[0])
-	}
-	return shouldBeIn(actual, expected)
-}
-func shouldBeIn(actual interface{}, expected interface{}) string {
-	if matchError := oglematchers.Contains(actual).Matches(expected); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenIn, actual, reflect.TypeOf(expected))
-	}
-	return success
-}
-
-// ShouldNotBeIn receives at least 2 parameters. The first is a proposed member of the collection
-// that is passed in either as the second parameter, or of the collection that is comprised
-// of all the remaining parameters. This assertion ensures that the proposed member is NOT in
-// the collection (using ShouldEqual).
-func ShouldNotBeIn(actual interface{}, expected ...interface{}) string {
-	if fail := atLeast(1, expected); fail != success {
-		return fail
-	}
-
-	if len(expected) == 1 {
-		return shouldNotBeIn(actual, expected[0])
-	}
-	return shouldNotBeIn(actual, expected)
-}
-func shouldNotBeIn(actual interface{}, expected interface{}) string {
-	if matchError := oglematchers.Contains(actual).Matches(expected); matchError == nil {
-		return fmt.Sprintf(shouldNotHaveBeenIn, actual, reflect.TypeOf(expected))
-	}
-	return success
-}
-
-// ShouldBeEmpty receives a single parameter (actual) and determines whether or not
-// calling len(actual) would return `0`. It obeys the rules specified by the len
-// function for determining length: http://golang.org/pkg/builtin/#len
-func ShouldBeEmpty(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	if actual == nil {
-		return success
-	}
-
-	value := reflect.ValueOf(actual)
-	switch value.Kind() {
-	case reflect.Slice:
-		if value.Len() == 0 {
-			return success
-		}
-	case reflect.Chan:
-		if value.Len() == 0 {
-			return success
-		}
-	case reflect.Map:
-		if value.Len() == 0 {
-			return success
-		}
-	case reflect.String:
-		if value.Len() == 0 {
-			return success
-		}
-	case reflect.Ptr:
-		elem := value.Elem()
-		kind := elem.Kind()
-		if (kind == reflect.Slice || kind == reflect.Array) && elem.Len() == 0 {
-			return success
-		}
-	}
-
-	return fmt.Sprintf(shouldHaveBeenEmpty, actual)
-}
-
-// ShouldNotBeEmpty receives a single parameter (actual) and determines whether or not
-// calling len(actual) would return a value greater than zero. It obeys the rules
-// specified by the `len` function for determining length: http://golang.org/pkg/builtin/#len
-func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	if empty := ShouldBeEmpty(actual, expected...); empty != success {
-		return success
-	}
-	return fmt.Sprintf(shouldNotHaveBeenEmpty, actual)
-}
-
-// ShouldHaveLength receives 2 parameters. The first is a collection to check
-// the length of, the second being the expected length. It obeys the rules
-// specified by the len function for determining length:
-// http://golang.org/pkg/builtin/#len
-func ShouldHaveLength(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	var expectedLen int64
-	lenValue := reflect.ValueOf(expected[0])
-	switch lenValue.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		expectedLen = lenValue.Int()
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		expectedLen = int64(lenValue.Uint())
-	default:
-		return fmt.Sprintf(shouldHaveBeenAValidInteger, reflect.TypeOf(expected[0]))
-	}
-
-	if expectedLen < 0 {
-		return fmt.Sprintf(shouldHaveBeenAValidLength, expected[0])
-	}
-
-	value := reflect.ValueOf(actual)
-	switch value.Kind() {
-	case reflect.Slice,
-		reflect.Chan,
-		reflect.Map,
-		reflect.String:
-		if int64(value.Len()) == expectedLen {
-			return success
-		} else {
-			return fmt.Sprintf(shouldHaveHadLength, actual, value.Len(), expectedLen)
-		}
-	case reflect.Ptr:
-		elem := value.Elem()
-		kind := elem.Kind()
-		if kind == reflect.Slice || kind == reflect.Array {
-			if int64(elem.Len()) == expectedLen {
-				return success
-			} else {
-				return fmt.Sprintf(shouldHaveHadLength, actual, elem.Len(), expectedLen)
-			}
-		}
-	}
-	return fmt.Sprintf(shouldHaveBeenAValidCollection, reflect.TypeOf(actual))
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go
deleted file mode 100644
index 5720fc298c..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Package assertions contains the implementations for all assertions which
-// are referenced in goconvey's `convey` package
-// (github.com/smartystreets/goconvey/convey) and gunit (github.com/smartystreets/gunit)
-// for use with the So(...) method.
-// They can also be used in traditional Go test functions and even in
-// applications.
-//
-// Many of the assertions lean heavily on work done by Aaron Jacobs in his excellent oglematchers library.
-// (https://github.com/jacobsa/oglematchers)
-// The ShouldResemble assertion leans heavily on work done by Daniel Jacques in his very helpful go-render library.
-// (https://github.com/luci/go-render)
-package assertions
-
-import (
-	"fmt"
-	"runtime"
-)
-
-// By default we use a no-op serializer. The actual Serializer provides a JSON
-// representation of failure results on selected assertions so the goconvey
-// web UI can display a convenient diff.
-var serializer Serializer = new(noopSerializer)
-
-// GoConveyMode provides control over JSON serialization of failures. When
-// using the assertions in this package from the convey package JSON results
-// are very helpful and can be rendered in a DIFF view. In that case, this function
-// will be called with a true value to enable the JSON serialization. By default,
-// the assertions in this package will not serializer a JSON result, making
-// standalone ussage more convenient.
-func GoConveyMode(yes bool) {
-	if yes {
-		serializer = newSerializer()
-	} else {
-		serializer = new(noopSerializer)
-	}
-}
-
-type testingT interface {
-	Error(args ...interface{})
-}
-
-type Assertion struct {
-	t      testingT
-	failed bool
-}
-
-// New swallows the *testing.T struct and prints failed assertions using t.Error.
-// Example: assertions.New(t).So(1, should.Equal, 1)
-func New(t testingT) *Assertion {
-	return &Assertion{t: t}
-}
-
-// Failed reports whether any calls to So (on this Assertion instance) have failed.
-func (this *Assertion) Failed() bool {
-	return this.failed
-}
-
-// So calls the standalone So function and additionally, calls t.Error in failure scenarios.
-func (this *Assertion) So(actual interface{}, assert assertion, expected ...interface{}) bool {
-	ok, result := So(actual, assert, expected...)
-	if !ok {
-		this.failed = true
-		_, file, line, _ := runtime.Caller(1)
-		this.t.Error(fmt.Sprintf("\n%s:%d\n%s", file, line, result))
-	}
-	return ok
-}
-
-// So is a convenience function (as opposed to an inconvenience function?)
-// for running assertions on arbitrary arguments in any context, be it for testing or even
-// application logging. It allows you to perform assertion-like behavior (and get nicely
-// formatted messages detailing discrepancies) but without the program blowing up or panicking.
-// All that is required is to import this package and call `So` with one of the assertions
-// exported by this package as the second parameter.
-// The first return parameter is a boolean indicating if the assertion was true. The second
-// return parameter is the well-formatted message showing why an assertion was incorrect, or
-// blank if the assertion was correct.
-//
-// Example:
-//
-//   if ok, message := So(x, ShouldBeGreaterThan, y); !ok {
-//        log.Println(message)
-//   }
-//
-func So(actual interface{}, assert assertion, expected ...interface{}) (bool, string) {
-	if result := so(actual, assert, expected...); len(result) == 0 {
-		return true, result
-	} else {
-		return false, result
-	}
-}
-
-// so is like So, except that it only returns the string message, which is blank if the
-// assertion passed. Used to facilitate testing.
-func so(actual interface{}, assert func(interface{}, ...interface{}) string, expected ...interface{}) string {
-	return assert(actual, expected...)
-}
-
-// assertion is an alias for a function with a signature that the So()
-// function can handle. Any future or custom assertions should conform to this
-// method signature. The return value should be an empty string if the assertion
-// passes and a well-formed failure message if not.
-type assertion func(actual interface{}, expected ...interface{}) string
-
-////////////////////////////////////////////////////////////////////////////
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go
deleted file mode 100644
index 2b6049c37d..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go
+++ /dev/null
@@ -1,280 +0,0 @@
-package assertions
-
-import (
-	"errors"
-	"fmt"
-	"math"
-	"reflect"
-	"strings"
-
-	"github.com/smartystreets/assertions/internal/oglematchers"
-	"github.com/smartystreets/assertions/internal/go-render/render"
-)
-
-// default acceptable delta for ShouldAlmostEqual
-const defaultDelta = 0.0000000001
-
-// ShouldEqual receives exactly two parameters and does an equality check.
-func ShouldEqual(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	}
-	return shouldEqual(actual, expected[0])
-}
-func shouldEqual(actual, expected interface{}) (message string) {
-	defer func() {
-		if r := recover(); r != nil {
-			message = serializer.serialize(expected, actual, fmt.Sprintf(shouldHaveBeenEqual, expected, actual))
-			return
-		}
-	}()
-
-	if matchError := oglematchers.Equals(expected).Matches(actual); matchError != nil {
-		expectedSyntax := fmt.Sprintf("%v", expected)
-		actualSyntax := fmt.Sprintf("%v", actual)
-		if expectedSyntax == actualSyntax && reflect.TypeOf(expected) != reflect.TypeOf(actual) {
-			message = fmt.Sprintf(shouldHaveBeenEqualTypeMismatch, expected, expected, actual, actual)
-		} else {
-			message = fmt.Sprintf(shouldHaveBeenEqual, expected, actual)
-		}
-		message = serializer.serialize(expected, actual, message)
-		return
-	}
-
-	return success
-}
-
-// ShouldNotEqual receives exactly two parameters and does an inequality check.
-func ShouldNotEqual(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	} else if ShouldEqual(actual, expected[0]) == success {
-		return fmt.Sprintf(shouldNotHaveBeenEqual, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldAlmostEqual makes sure that two parameters are close enough to being equal.
-// The acceptable delta may be specified with a third argument,
-// or a very small default delta will be used.
-func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string {
-	actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...)
-
-	if err != "" {
-		return err
-	}
-
-	if math.Abs(actualFloat-expectedFloat) <= deltaFloat {
-		return success
-	} else {
-		return fmt.Sprintf(shouldHaveBeenAlmostEqual, actualFloat, expectedFloat)
-	}
-}
-
-// ShouldNotAlmostEqual is the inverse of ShouldAlmostEqual
-func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string {
-	actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...)
-
-	if err != "" {
-		return err
-	}
-
-	if math.Abs(actualFloat-expectedFloat) > deltaFloat {
-		return success
-	} else {
-		return fmt.Sprintf(shouldHaveNotBeenAlmostEqual, actualFloat, expectedFloat)
-	}
-}
-
-func cleanAlmostEqualInput(actual interface{}, expected ...interface{}) (float64, float64, float64, string) {
-	deltaFloat := 0.0000000001
-
-	if len(expected) == 0 {
-		return 0.0, 0.0, 0.0, "This assertion requires exactly one comparison value and an optional delta (you provided neither)"
-	} else if len(expected) == 2 {
-		delta, err := getFloat(expected[1])
-
-		if err != nil {
-			return 0.0, 0.0, 0.0, "delta must be a numerical type"
-		}
-
-		deltaFloat = delta
-	} else if len(expected) > 2 {
-		return 0.0, 0.0, 0.0, "This assertion requires exactly one comparison value and an optional delta (you provided more values)"
-	}
-
-	actualFloat, err := getFloat(actual)
-
-	if err != nil {
-		return 0.0, 0.0, 0.0, err.Error()
-	}
-
-	expectedFloat, err := getFloat(expected[0])
-
-	if err != nil {
-		return 0.0, 0.0, 0.0, err.Error()
-	}
-
-	return actualFloat, expectedFloat, deltaFloat, ""
-}
-
-// returns the float value of any real number, or error if it is not a numerical type
-func getFloat(num interface{}) (float64, error) {
-	numValue := reflect.ValueOf(num)
-	numKind := numValue.Kind()
-
-	if numKind == reflect.Int ||
-		numKind == reflect.Int8 ||
-		numKind == reflect.Int16 ||
-		numKind == reflect.Int32 ||
-		numKind == reflect.Int64 {
-		return float64(numValue.Int()), nil
-	} else if numKind == reflect.Uint ||
-		numKind == reflect.Uint8 ||
-		numKind == reflect.Uint16 ||
-		numKind == reflect.Uint32 ||
-		numKind == reflect.Uint64 {
-		return float64(numValue.Uint()), nil
-	} else if numKind == reflect.Float32 ||
-		numKind == reflect.Float64 {
-		return numValue.Float(), nil
-	} else {
-		return 0.0, errors.New("must be a numerical type, but was " + numKind.String())
-	}
-}
-
-// ShouldResemble receives exactly two parameters and does a deep equal check (see reflect.DeepEqual)
-func ShouldResemble(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	}
-
-	if matchError := oglematchers.DeepEquals(expected[0]).Matches(actual); matchError != nil {
-		return serializer.serializeDetailed(expected[0], actual,
-			fmt.Sprintf(shouldHaveResembled, render.Render(expected[0]), render.Render(actual)))
-	}
-
-	return success
-}
-
-// ShouldNotResemble receives exactly two parameters and does an inverse deep equal check (see reflect.DeepEqual)
-func ShouldNotResemble(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	} else if ShouldResemble(actual, expected[0]) == success {
-		return fmt.Sprintf(shouldNotHaveResembled, render.Render(actual), render.Render(expected[0]))
-	}
-	return success
-}
-
-// ShouldPointTo receives exactly two parameters and checks to see that they point to the same address.
-func ShouldPointTo(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	}
-	return shouldPointTo(actual, expected[0])
-
-}
-func shouldPointTo(actual, expected interface{}) string {
-	actualValue := reflect.ValueOf(actual)
-	expectedValue := reflect.ValueOf(expected)
-
-	if ShouldNotBeNil(actual) != success {
-		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "first", "nil")
-	} else if ShouldNotBeNil(expected) != success {
-		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "second", "nil")
-	} else if actualValue.Kind() != reflect.Ptr {
-		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "first", "not")
-	} else if expectedValue.Kind() != reflect.Ptr {
-		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "second", "not")
-	} else if ShouldEqual(actualValue.Pointer(), expectedValue.Pointer()) != success {
-		actualAddress := reflect.ValueOf(actual).Pointer()
-		expectedAddress := reflect.ValueOf(expected).Pointer()
-		return serializer.serialize(expectedAddress, actualAddress, fmt.Sprintf(shouldHavePointedTo,
-			actual, actualAddress,
-			expected, expectedAddress))
-	}
-	return success
-}
-
-// ShouldNotPointTo receives exactly two parameters and checks to see that they point to different addresess.
-func ShouldNotPointTo(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	}
-	compare := ShouldPointTo(actual, expected[0])
-	if strings.HasPrefix(compare, shouldBePointers) {
-		return compare
-	} else if compare == success {
-		return fmt.Sprintf(shouldNotHavePointedTo, actual, expected[0], reflect.ValueOf(actual).Pointer())
-	}
-	return success
-}
-
-// ShouldBeNil receives a single parameter and ensures that it is nil.
-func ShouldBeNil(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	} else if actual == nil {
-		return success
-	} else if interfaceHasNilValue(actual) {
-		return success
-	}
-	return fmt.Sprintf(shouldHaveBeenNil, actual)
-}
-func interfaceHasNilValue(actual interface{}) bool {
-	value := reflect.ValueOf(actual)
-	kind := value.Kind()
-	nilable := kind == reflect.Slice ||
-		kind == reflect.Chan ||
-		kind == reflect.Func ||
-		kind == reflect.Ptr ||
-		kind == reflect.Map
-
-	// Careful: reflect.Value.IsNil() will panic unless it's an interface, chan, map, func, slice, or ptr
-	// Reference: http://golang.org/pkg/reflect/#Value.IsNil
-	return nilable && value.IsNil()
-}
-
-// ShouldNotBeNil receives a single parameter and ensures that it is not nil.
-func ShouldNotBeNil(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	} else if ShouldBeNil(actual) == success {
-		return fmt.Sprintf(shouldNotHaveBeenNil, actual)
-	}
-	return success
-}
-
-// ShouldBeTrue receives a single parameter and ensures that it is true.
-func ShouldBeTrue(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	} else if actual != true {
-		return fmt.Sprintf(shouldHaveBeenTrue, actual)
-	}
-	return success
-}
-
-// ShouldBeFalse receives a single parameter and ensures that it is false.
-func ShouldBeFalse(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	} else if actual != false {
-		return fmt.Sprintf(shouldHaveBeenFalse, actual)
-	}
-	return success
-}
-
-// ShouldBeZeroValue receives a single parameter and ensures that it is
-// the Go equivalent of the default value, or "zero" value.
-func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-	zeroVal := reflect.Zero(reflect.TypeOf(actual)).Interface()
-	if !reflect.DeepEqual(zeroVal, actual) {
-		return serializer.serialize(zeroVal, actual, fmt.Sprintf(shouldHaveBeenZeroValue, actual))
-	}
-	return success
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go
deleted file mode 100644
index ee368a97ed..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package assertions
-
-import "fmt"
-
-const (
-	success                = ""
-	needExactValues        = "This assertion requires exactly %d comparison values (you provided %d)."
-	needNonEmptyCollection = "This assertion requires at least 1 comparison value (you provided 0)."
-)
-
-func need(needed int, expected []interface{}) string {
-	if len(expected) != needed {
-		return fmt.Sprintf(needExactValues, needed, len(expected))
-	}
-	return success
-}
-
-func atLeast(minimum int, expected []interface{}) string {
-	if len(expected) < 1 {
-		return needNonEmptyCollection
-	}
-	return success
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go
deleted file mode 100644
index 23b7a58676..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go
+++ /dev/null
@@ -1,477 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package render
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"sort"
-	"strconv"
-)
-
-var builtinTypeMap = map[reflect.Kind]string{
-	reflect.Bool:       "bool",
-	reflect.Complex128: "complex128",
-	reflect.Complex64:  "complex64",
-	reflect.Float32:    "float32",
-	reflect.Float64:    "float64",
-	reflect.Int16:      "int16",
-	reflect.Int32:      "int32",
-	reflect.Int64:      "int64",
-	reflect.Int8:       "int8",
-	reflect.Int:        "int",
-	reflect.String:     "string",
-	reflect.Uint16:     "uint16",
-	reflect.Uint32:     "uint32",
-	reflect.Uint64:     "uint64",
-	reflect.Uint8:      "uint8",
-	reflect.Uint:       "uint",
-	reflect.Uintptr:    "uintptr",
-}
-
-var builtinTypeSet = map[string]struct{}{}
-
-func init() {
-	for _, v := range builtinTypeMap {
-		builtinTypeSet[v] = struct{}{}
-	}
-}
-
-var typeOfString = reflect.TypeOf("")
-var typeOfInt = reflect.TypeOf(int(1))
-var typeOfUint = reflect.TypeOf(uint(1))
-var typeOfFloat = reflect.TypeOf(10.1)
-
-// Render converts a structure to a string representation. Unline the "%#v"
-// format string, this resolves pointer types' contents in structs, maps, and
-// slices/arrays and prints their field values.
-func Render(v interface{}) string {
-	buf := bytes.Buffer{}
-	s := (*traverseState)(nil)
-	s.render(&buf, 0, reflect.ValueOf(v), false)
-	return buf.String()
-}
-
-// renderPointer is called to render a pointer value.
-//
-// This is overridable so that the test suite can have deterministic pointer
-// values in its expectations.
-var renderPointer = func(buf *bytes.Buffer, p uintptr) {
-	fmt.Fprintf(buf, "0x%016x", p)
-}
-
-// traverseState is used to note and avoid recursion as struct members are being
-// traversed.
-//
-// traverseState is allowed to be nil. Specifically, the root state is nil.
-type traverseState struct {
-	parent *traverseState
-	ptr    uintptr
-}
-
-func (s *traverseState) forkFor(ptr uintptr) *traverseState {
-	for cur := s; cur != nil; cur = cur.parent {
-		if ptr == cur.ptr {
-			return nil
-		}
-	}
-
-	fs := &traverseState{
-		parent: s,
-		ptr:    ptr,
-	}
-	return fs
-}
-
-func (s *traverseState) render(buf *bytes.Buffer, ptrs int, v reflect.Value, implicit bool) {
-	if v.Kind() == reflect.Invalid {
-		buf.WriteString("nil")
-		return
-	}
-	vt := v.Type()
-
-	// If the type being rendered is a potentially recursive type (a type that
-	// can contain itself as a member), we need to avoid recursion.
-	//
-	// If we've already seen this type before, mark that this is the case and
-	// write a recursion placeholder instead of actually rendering it.
-	//
-	// If we haven't seen it before, fork our `seen` tracking so any higher-up
-	// renderers will also render it at least once, then mark that we've seen it
-	// to avoid recursing on lower layers.
-	pe := uintptr(0)
-	vk := vt.Kind()
-	switch vk {
-	case reflect.Ptr:
-		// Since structs and arrays aren't pointers, they can't directly be
-		// recursed, but they can contain pointers to themselves. Record their
-		// pointer to avoid this.
-		switch v.Elem().Kind() {
-		case reflect.Struct, reflect.Array:
-			pe = v.Pointer()
-		}
-
-	case reflect.Slice, reflect.Map:
-		pe = v.Pointer()
-	}
-	if pe != 0 {
-		s = s.forkFor(pe)
-		if s == nil {
-			buf.WriteString("<REC(")
-			if !implicit {
-				writeType(buf, ptrs, vt)
-			}
-			buf.WriteString(")>")
-			return
-		}
-	}
-
-	isAnon := func(t reflect.Type) bool {
-		if t.Name() != "" {
-			if _, ok := builtinTypeSet[t.Name()]; !ok {
-				return false
-			}
-		}
-		return t.Kind() != reflect.Interface
-	}
-
-	switch vk {
-	case reflect.Struct:
-		if !implicit {
-			writeType(buf, ptrs, vt)
-		}
-		structAnon := vt.Name() == ""
-		buf.WriteRune('{')
-		for i := 0; i < vt.NumField(); i++ {
-			if i > 0 {
-				buf.WriteString(", ")
-			}
-			anon := structAnon && isAnon(vt.Field(i).Type)
-
-			if !anon {
-				buf.WriteString(vt.Field(i).Name)
-				buf.WriteRune(':')
-			}
-
-			s.render(buf, 0, v.Field(i), anon)
-		}
-		buf.WriteRune('}')
-
-	case reflect.Slice:
-		if v.IsNil() {
-			if !implicit {
-				writeType(buf, ptrs, vt)
-				buf.WriteString("(nil)")
-			} else {
-				buf.WriteString("nil")
-			}
-			return
-		}
-		fallthrough
-
-	case reflect.Array:
-		if !implicit {
-			writeType(buf, ptrs, vt)
-		}
-		anon := vt.Name() == "" && isAnon(vt.Elem())
-		buf.WriteString("{")
-		for i := 0; i < v.Len(); i++ {
-			if i > 0 {
-				buf.WriteString(", ")
-			}
-
-			s.render(buf, 0, v.Index(i), anon)
-		}
-		buf.WriteRune('}')
-
-	case reflect.Map:
-		if !implicit {
-			writeType(buf, ptrs, vt)
-		}
-		if v.IsNil() {
-			buf.WriteString("(nil)")
-		} else {
-			buf.WriteString("{")
-
-			mkeys := v.MapKeys()
-			tryAndSortMapKeys(vt, mkeys)
-
-			kt := vt.Key()
-			keyAnon := typeOfString.ConvertibleTo(kt) || typeOfInt.ConvertibleTo(kt) || typeOfUint.ConvertibleTo(kt) || typeOfFloat.ConvertibleTo(kt)
-			valAnon := vt.Name() == "" && isAnon(vt.Elem())
-			for i, mk := range mkeys {
-				if i > 0 {
-					buf.WriteString(", ")
-				}
-
-				s.render(buf, 0, mk, keyAnon)
-				buf.WriteString(":")
-				s.render(buf, 0, v.MapIndex(mk), valAnon)
-			}
-			buf.WriteRune('}')
-		}
-
-	case reflect.Ptr:
-		ptrs++
-		fallthrough
-	case reflect.Interface:
-		if v.IsNil() {
-			writeType(buf, ptrs, v.Type())
-			buf.WriteString("(nil)")
-		} else {
-			s.render(buf, ptrs, v.Elem(), false)
-		}
-
-	case reflect.Chan, reflect.Func, reflect.UnsafePointer:
-		writeType(buf, ptrs, vt)
-		buf.WriteRune('(')
-		renderPointer(buf, v.Pointer())
-		buf.WriteRune(')')
-
-	default:
-		tstr := vt.String()
-		implicit = implicit || (ptrs == 0 && builtinTypeMap[vk] == tstr)
-		if !implicit {
-			writeType(buf, ptrs, vt)
-			buf.WriteRune('(')
-		}
-
-		switch vk {
-		case reflect.String:
-			fmt.Fprintf(buf, "%q", v.String())
-		case reflect.Bool:
-			fmt.Fprintf(buf, "%v", v.Bool())
-
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			fmt.Fprintf(buf, "%d", v.Int())
-
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			fmt.Fprintf(buf, "%d", v.Uint())
-
-		case reflect.Float32, reflect.Float64:
-			fmt.Fprintf(buf, "%g", v.Float())
-
-		case reflect.Complex64, reflect.Complex128:
-			fmt.Fprintf(buf, "%g", v.Complex())
-		}
-
-		if !implicit {
-			buf.WriteRune(')')
-		}
-	}
-}
-
-func writeType(buf *bytes.Buffer, ptrs int, t reflect.Type) {
-	parens := ptrs > 0
-	switch t.Kind() {
-	case reflect.Chan, reflect.Func, reflect.UnsafePointer:
-		parens = true
-	}
-
-	if parens {
-		buf.WriteRune('(')
-		for i := 0; i < ptrs; i++ {
-			buf.WriteRune('*')
-		}
-	}
-
-	switch t.Kind() {
-	case reflect.Ptr:
-		if ptrs == 0 {
-			// This pointer was referenced from within writeType (e.g., as part of
-			// rendering a list), and so hasn't had its pointer asterisk accounted
-			// for.
-			buf.WriteRune('*')
-		}
-		writeType(buf, 0, t.Elem())
-
-	case reflect.Interface:
-		if n := t.Name(); n != "" {
-			buf.WriteString(t.String())
-		} else {
-			buf.WriteString("interface{}")
-		}
-
-	case reflect.Array:
-		buf.WriteRune('[')
-		buf.WriteString(strconv.FormatInt(int64(t.Len()), 10))
-		buf.WriteRune(']')
-		writeType(buf, 0, t.Elem())
-
-	case reflect.Slice:
-		if t == reflect.SliceOf(t.Elem()) {
-			buf.WriteString("[]")
-			writeType(buf, 0, t.Elem())
-		} else {
-			// Custom slice type, use type name.
-			buf.WriteString(t.String())
-		}
-
-	case reflect.Map:
-		if t == reflect.MapOf(t.Key(), t.Elem()) {
-			buf.WriteString("map[")
-			writeType(buf, 0, t.Key())
-			buf.WriteRune(']')
-			writeType(buf, 0, t.Elem())
-		} else {
-			// Custom map type, use type name.
-			buf.WriteString(t.String())
-		}
-
-	default:
-		buf.WriteString(t.String())
-	}
-
-	if parens {
-		buf.WriteRune(')')
-	}
-}
-
-type cmpFn func(a, b reflect.Value) int
-
-type sortableValueSlice struct {
-	cmp      cmpFn
-	elements []reflect.Value
-}
-
-func (s sortableValueSlice) Len() int {
-	return len(s.elements)
-}
-
-func (s sortableValueSlice) Less(i, j int) bool {
-	return s.cmp(s.elements[i], s.elements[j]) < 0
-}
-
-func (s sortableValueSlice) Swap(i, j int) {
-	s.elements[i], s.elements[j] = s.elements[j], s.elements[i]
-}
-
-// cmpForType returns a cmpFn which sorts the data for some type t in the same
-// order that a go-native map key is compared for equality.
-func cmpForType(t reflect.Type) cmpFn {
-	switch t.Kind() {
-	case reflect.String:
-		return func(av, bv reflect.Value) int {
-			a, b := av.String(), bv.String()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Bool:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Bool(), bv.Bool()
-			if !a && b {
-				return -1
-			} else if a && !b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Int(), bv.Int()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32,
-		reflect.Uint64, reflect.Uintptr, reflect.UnsafePointer:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Uint(), bv.Uint()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Float32, reflect.Float64:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Float(), bv.Float()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Interface:
-		return func(av, bv reflect.Value) int {
-			a, b := av.InterfaceData(), bv.InterfaceData()
-			if a[0] < b[0] {
-				return -1
-			} else if a[0] > b[0] {
-				return 1
-			}
-			if a[1] < b[1] {
-				return -1
-			} else if a[1] > b[1] {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Complex64, reflect.Complex128:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Complex(), bv.Complex()
-			if real(a) < real(b) {
-				return -1
-			} else if real(a) > real(b) {
-				return 1
-			}
-			if imag(a) < imag(b) {
-				return -1
-			} else if imag(a) > imag(b) {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Ptr, reflect.Chan:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Pointer(), bv.Pointer()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Struct:
-		cmpLst := make([]cmpFn, t.NumField())
-		for i := range cmpLst {
-			cmpLst[i] = cmpForType(t.Field(i).Type)
-		}
-		return func(a, b reflect.Value) int {
-			for i, cmp := range cmpLst {
-				if rslt := cmp(a.Field(i), b.Field(i)); rslt != 0 {
-					return rslt
-				}
-			}
-			return 0
-		}
-	}
-
-	return nil
-}
-
-func tryAndSortMapKeys(mt reflect.Type, k []reflect.Value) {
-	if cmp := cmpForType(mt.Key()); cmp != nil {
-		sort.Sort(sortableValueSlice{cmp, k})
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore
deleted file mode 100644
index dd8fc7468f..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.6
-6.out
-_obj/
-_test/
-_testmain.go
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml
deleted file mode 100644
index b97211926e..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cf. http://docs.travis-ci.com/user/getting-started/
-# Cf. http://docs.travis-ci.com/user/languages/go/
-
-language: go
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md
deleted file mode 100644
index 215a2bb7a8..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-[![GoDoc](https://godoc.org/github.com/smartystreets/assertions/internal/oglematchers?status.svg)](https://godoc.org/github.com/smartystreets/assertions/internal/oglematchers)
-
-`oglematchers` is a package for the Go programming language containing a set of
-matchers, useful in a testing or mocking framework, inspired by and mostly
-compatible with [Google Test][googletest] for C++ and
-[Google JS Test][google-js-test]. The package is used by the
-[ogletest][ogletest] testing framework and [oglemock][oglemock] mocking
-framework, which may be more directly useful to you, but can be generically used
-elsewhere as well.
-
-A "matcher" is simply an object with a `Matches` method defining a set of golang
-values matched by the matcher, and a `Description` method describing that set.
-For example, here are some matchers:
-
-```go
-// Numbers
-Equals(17.13)
-LessThan(19)
-
-// Strings
-Equals("taco")
-HasSubstr("burrito")
-MatchesRegex("t.*o")
-
-// Combining matchers
-AnyOf(LessThan(17), GreaterThan(19))
-```
-
-There are lots more; see [here][reference] for a reference. You can also add
-your own simply by implementing the `oglematchers.Matcher` interface.
-
-
-Installation
-------------
-
-First, make sure you have installed Go 1.0.2 or newer. See
-[here][golang-install] for instructions.
-
-Use the following command to install `oglematchers` and keep it up to date:
-
-    go get -u github.com/smartystreets/assertions/internal/oglematchers
-
-
-Documentation
--------------
-
-See [here][reference] for documentation. Alternatively, you can install the
-package and then use `godoc`:
-
-    godoc github.com/smartystreets/assertions/internal/oglematchers
-
-
-[reference]: http://godoc.org/github.com/smartystreets/assertions/internal/oglematchers
-[golang-install]: http://golang.org/doc/install.html
-[googletest]: http://code.google.com/p/googletest/
-[google-js-test]: http://code.google.com/p/google-js-test/
-[ogletest]: http://github.com/smartystreets/assertions/internal/ogletest
-[oglemock]: http://github.com/smartystreets/assertions/internal/oglemock
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go
deleted file mode 100644
index d93a974044..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"strings"
-)
-
-// AllOf accepts a set of matchers S and returns a matcher that follows the
-// algorithm below when considering a candidate c:
-//
-//  1. Return true if for every Matcher m in S, m matches c.
-//
-//  2. Otherwise, if there is a matcher m in S such that m returns a fatal
-//     error for c, return that matcher's error message.
-//
-//  3. Otherwise, return false with the error from some wrapped matcher.
-//
-// This is akin to a logical AND operation for matchers.
-func AllOf(matchers ...Matcher) Matcher {
-	return &allOfMatcher{matchers}
-}
-
-type allOfMatcher struct {
-	wrappedMatchers []Matcher
-}
-
-func (m *allOfMatcher) Description() string {
-	// Special case: the empty set.
-	if len(m.wrappedMatchers) == 0 {
-		return "is anything"
-	}
-
-	// Join the descriptions for the wrapped matchers.
-	wrappedDescs := make([]string, len(m.wrappedMatchers))
-	for i, wrappedMatcher := range m.wrappedMatchers {
-		wrappedDescs[i] = wrappedMatcher.Description()
-	}
-
-	return strings.Join(wrappedDescs, ", and ")
-}
-
-func (m *allOfMatcher) Matches(c interface{}) (err error) {
-	for _, wrappedMatcher := range m.wrappedMatchers {
-		if wrappedErr := wrappedMatcher.Matches(c); wrappedErr != nil {
-			err = wrappedErr
-
-			// If the error is fatal, return immediately with this error.
-			_, ok := wrappedErr.(*FatalError)
-			if ok {
-				return
-			}
-		}
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go
deleted file mode 100644
index f6991ec102..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-// Any returns a matcher that matches any value.
-func Any() Matcher {
-	return &anyMatcher{}
-}
-
-type anyMatcher struct {
-}
-
-func (m *anyMatcher) Description() string {
-	return "is anything"
-}
-
-func (m *anyMatcher) Matches(c interface{}) error {
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go
deleted file mode 100644
index 2918b51f21..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// AnyOf accepts a set of values S and returns a matcher that follows the
-// algorithm below when considering a candidate c:
-//
-//  1. If there exists a value m in S such that m implements the Matcher
-//     interface and m matches c, return true.
-//
-//  2. Otherwise, if there exists a value v in S such that v does not implement
-//     the Matcher interface and the matcher Equals(v) matches c, return true.
-//
-//  3. Otherwise, if there is a value m in S such that m implements the Matcher
-//     interface and m returns a fatal error for c, return that fatal error.
-//
-//  4. Otherwise, return false.
-//
-// This is akin to a logical OR operation for matchers, with non-matchers x
-// being treated as Equals(x).
-func AnyOf(vals ...interface{}) Matcher {
-	// Get ahold of a type variable for the Matcher interface.
-	var dummy *Matcher
-	matcherType := reflect.TypeOf(dummy).Elem()
-
-	// Create a matcher for each value, or use the value itself if it's already a
-	// matcher.
-	wrapped := make([]Matcher, len(vals))
-	for i, v := range vals {
-		t := reflect.TypeOf(v)
-		if t != nil && t.Implements(matcherType) {
-			wrapped[i] = v.(Matcher)
-		} else {
-			wrapped[i] = Equals(v)
-		}
-	}
-
-	return &anyOfMatcher{wrapped}
-}
-
-type anyOfMatcher struct {
-	wrapped []Matcher
-}
-
-func (m *anyOfMatcher) Description() string {
-	wrappedDescs := make([]string, len(m.wrapped))
-	for i, matcher := range m.wrapped {
-		wrappedDescs[i] = matcher.Description()
-	}
-
-	return fmt.Sprintf("or(%s)", strings.Join(wrappedDescs, ", "))
-}
-
-func (m *anyOfMatcher) Matches(c interface{}) (err error) {
-	err = errors.New("")
-
-	// Try each matcher in turn.
-	for _, matcher := range m.wrapped {
-		wrappedErr := matcher.Matches(c)
-
-		// Return immediately if there's a match.
-		if wrappedErr == nil {
-			err = nil
-			return
-		}
-
-		// Note the fatal error, if any.
-		if _, isFatal := wrappedErr.(*FatalError); isFatal {
-			err = wrappedErr
-		}
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go
deleted file mode 100644
index 87f107d392..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// Return a matcher that matches arrays slices with at least one element that
-// matches the supplied argument. If the argument x is not itself a Matcher,
-// this is equivalent to Contains(Equals(x)).
-func Contains(x interface{}) Matcher {
-	var result containsMatcher
-	var ok bool
-
-	if result.elementMatcher, ok = x.(Matcher); !ok {
-		result.elementMatcher = DeepEquals(x)
-	}
-
-	return &result
-}
-
-type containsMatcher struct {
-	elementMatcher Matcher
-}
-
-func (m *containsMatcher) Description() string {
-	return fmt.Sprintf("contains: %s", m.elementMatcher.Description())
-}
-
-func (m *containsMatcher) Matches(candidate interface{}) error {
-	// The candidate must be a slice or an array.
-	v := reflect.ValueOf(candidate)
-	if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
-		return NewFatalError("which is not a slice or array")
-	}
-
-	// Check each element.
-	for i := 0; i < v.Len(); i++ {
-		elem := v.Index(i)
-		if matchErr := m.elementMatcher.Matches(elem.Interface()); matchErr == nil {
-			return nil
-		}
-	}
-
-	return fmt.Errorf("")
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go
deleted file mode 100644
index 1d91baef32..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"reflect"
-)
-
-var byteSliceType reflect.Type = reflect.TypeOf([]byte{})
-
-// DeepEquals returns a matcher that matches based on 'deep equality', as
-// defined by the reflect package. This matcher requires that values have
-// identical types to x.
-func DeepEquals(x interface{}) Matcher {
-	return &deepEqualsMatcher{x}
-}
-
-type deepEqualsMatcher struct {
-	x interface{}
-}
-
-func (m *deepEqualsMatcher) Description() string {
-	xDesc := fmt.Sprintf("%v", m.x)
-	xValue := reflect.ValueOf(m.x)
-
-	// Special case: fmt.Sprintf presents nil slices as "[]", but
-	// reflect.DeepEqual makes a distinction between nil and empty slices. Make
-	// this less confusing.
-	if xValue.Kind() == reflect.Slice && xValue.IsNil() {
-		xDesc = "<nil slice>"
-	}
-
-	return fmt.Sprintf("deep equals: %s", xDesc)
-}
-
-func (m *deepEqualsMatcher) Matches(c interface{}) error {
-	// Make sure the types match.
-	ct := reflect.TypeOf(c)
-	xt := reflect.TypeOf(m.x)
-
-	if ct != xt {
-		return NewFatalError(fmt.Sprintf("which is of type %v", ct))
-	}
-
-	// Special case: handle byte slices more efficiently.
-	cValue := reflect.ValueOf(c)
-	xValue := reflect.ValueOf(m.x)
-
-	if ct == byteSliceType && !cValue.IsNil() && !xValue.IsNil() {
-		xBytes := m.x.([]byte)
-		cBytes := c.([]byte)
-
-		if bytes.Equal(cBytes, xBytes) {
-			return nil
-		}
-
-		return errors.New("")
-	}
-
-	// Defer to the reflect package.
-	if reflect.DeepEqual(m.x, c) {
-		return nil
-	}
-
-	// Special case: if the comparison failed because c is the nil slice, given
-	// an indication of this (since its value is printed as "[]").
-	if cValue.Kind() == reflect.Slice && cValue.IsNil() {
-		return errors.New("which is nil")
-	}
-
-	return errors.New("")
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go
deleted file mode 100644
index 2941847c70..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// Given a list of arguments M, ElementsAre returns a matcher that matches
-// arrays and slices A where all of the following hold:
-//
-//  *  A is the same length as M.
-//
-//  *  For each i < len(A) where M[i] is a matcher, A[i] matches M[i].
-//
-//  *  For each i < len(A) where M[i] is not a matcher, A[i] matches
-//     Equals(M[i]).
-//
-func ElementsAre(M ...interface{}) Matcher {
-	// Copy over matchers, or convert to Equals(x) for non-matcher x.
-	subMatchers := make([]Matcher, len(M))
-	for i, x := range M {
-		if matcher, ok := x.(Matcher); ok {
-			subMatchers[i] = matcher
-			continue
-		}
-
-		subMatchers[i] = Equals(x)
-	}
-
-	return &elementsAreMatcher{subMatchers}
-}
-
-type elementsAreMatcher struct {
-	subMatchers []Matcher
-}
-
-func (m *elementsAreMatcher) Description() string {
-	subDescs := make([]string, len(m.subMatchers))
-	for i, sm := range m.subMatchers {
-		subDescs[i] = sm.Description()
-	}
-
-	return fmt.Sprintf("elements are: [%s]", strings.Join(subDescs, ", "))
-}
-
-func (m *elementsAreMatcher) Matches(candidates interface{}) error {
-	// The candidate must be a slice or an array.
-	v := reflect.ValueOf(candidates)
-	if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
-		return NewFatalError("which is not a slice or array")
-	}
-
-	// The length must be correct.
-	if v.Len() != len(m.subMatchers) {
-		return errors.New(fmt.Sprintf("which is of length %d", v.Len()))
-	}
-
-	// Check each element.
-	for i, subMatcher := range m.subMatchers {
-		c := v.Index(i)
-		if matchErr := subMatcher.Matches(c.Interface()); matchErr != nil {
-			// Return an errors indicating which element doesn't match. If the
-			// matcher error was fatal, make this one fatal too.
-			err := errors.New(fmt.Sprintf("whose element %d doesn't match", i))
-			if _, isFatal := matchErr.(*FatalError); isFatal {
-				err = NewFatalError(err.Error())
-			}
-
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go
deleted file mode 100644
index a510707b3c..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go
+++ /dev/null
@@ -1,541 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"math"
-	"reflect"
-)
-
-// Equals(x) returns a matcher that matches values v such that v and x are
-// equivalent. This includes the case when the comparison v == x using Go's
-// built-in comparison operator is legal (except for structs, which this
-// matcher does not support), but for convenience the following rules also
-// apply:
-//
-//  *  Type checking is done based on underlying types rather than actual
-//     types, so that e.g. two aliases for string can be compared:
-//
-//         type stringAlias1 string
-//         type stringAlias2 string
-//
-//         a := "taco"
-//         b := stringAlias1("taco")
-//         c := stringAlias2("taco")
-//
-//         ExpectTrue(a == b)  // Legal, passes
-//         ExpectTrue(b == c)  // Illegal, doesn't compile
-//
-//         ExpectThat(a, Equals(b))  // Passes
-//         ExpectThat(b, Equals(c))  // Passes
-//
-//  *  Values of numeric type are treated as if they were abstract numbers, and
-//     compared accordingly. Therefore Equals(17) will match int(17),
-//     int16(17), uint(17), float32(17), complex64(17), and so on.
-//
-// If you want a stricter matcher that contains no such cleverness, see
-// IdenticalTo instead.
-//
-// Arrays are supported by this matcher, but do not participate in the
-// exceptions above. Two arrays compared with this matcher must have identical
-// types, and their element type must itself be comparable according to Go's ==
-// operator.
-func Equals(x interface{}) Matcher {
-	v := reflect.ValueOf(x)
-
-	// This matcher doesn't support structs.
-	if v.Kind() == reflect.Struct {
-		panic(fmt.Sprintf("oglematchers.Equals: unsupported kind %v", v.Kind()))
-	}
-
-	// The == operator is not defined for non-nil slices.
-	if v.Kind() == reflect.Slice && v.Pointer() != uintptr(0) {
-		panic(fmt.Sprintf("oglematchers.Equals: non-nil slice"))
-	}
-
-	return &equalsMatcher{v}
-}
-
-type equalsMatcher struct {
-	expectedValue reflect.Value
-}
-
-////////////////////////////////////////////////////////////////////////
-// Numeric types
-////////////////////////////////////////////////////////////////////////
-
-func isSignedInteger(v reflect.Value) bool {
-	k := v.Kind()
-	return k >= reflect.Int && k <= reflect.Int64
-}
-
-func isUnsignedInteger(v reflect.Value) bool {
-	k := v.Kind()
-	return k >= reflect.Uint && k <= reflect.Uintptr
-}
-
-func isInteger(v reflect.Value) bool {
-	return isSignedInteger(v) || isUnsignedInteger(v)
-}
-
-func isFloat(v reflect.Value) bool {
-	k := v.Kind()
-	return k == reflect.Float32 || k == reflect.Float64
-}
-
-func isComplex(v reflect.Value) bool {
-	k := v.Kind()
-	return k == reflect.Complex64 || k == reflect.Complex128
-}
-
-func checkAgainstInt64(e int64, c reflect.Value) (err error) {
-	err = errors.New("")
-
-	switch {
-	case isSignedInteger(c):
-		if c.Int() == e {
-			err = nil
-		}
-
-	case isUnsignedInteger(c):
-		u := c.Uint()
-		if u <= math.MaxInt64 && int64(u) == e {
-			err = nil
-		}
-
-	// Turn around the various floating point types so that the checkAgainst*
-	// functions for them can deal with precision issues.
-	case isFloat(c), isComplex(c):
-		return Equals(c.Interface()).Matches(e)
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstUint64(e uint64, c reflect.Value) (err error) {
-	err = errors.New("")
-
-	switch {
-	case isSignedInteger(c):
-		i := c.Int()
-		if i >= 0 && uint64(i) == e {
-			err = nil
-		}
-
-	case isUnsignedInteger(c):
-		if c.Uint() == e {
-			err = nil
-		}
-
-	// Turn around the various floating point types so that the checkAgainst*
-	// functions for them can deal with precision issues.
-	case isFloat(c), isComplex(c):
-		return Equals(c.Interface()).Matches(e)
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstFloat32(e float32, c reflect.Value) (err error) {
-	err = errors.New("")
-
-	switch {
-	case isSignedInteger(c):
-		if float32(c.Int()) == e {
-			err = nil
-		}
-
-	case isUnsignedInteger(c):
-		if float32(c.Uint()) == e {
-			err = nil
-		}
-
-	case isFloat(c):
-		// Compare using float32 to avoid a false sense of precision; otherwise
-		// e.g. Equals(float32(0.1)) won't match float32(0.1).
-		if float32(c.Float()) == e {
-			err = nil
-		}
-
-	case isComplex(c):
-		comp := c.Complex()
-		rl := real(comp)
-		im := imag(comp)
-
-		// Compare using float32 to avoid a false sense of precision; otherwise
-		// e.g. Equals(float32(0.1)) won't match (0.1 + 0i).
-		if im == 0 && float32(rl) == e {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstFloat64(e float64, c reflect.Value) (err error) {
-	err = errors.New("")
-
-	ck := c.Kind()
-
-	switch {
-	case isSignedInteger(c):
-		if float64(c.Int()) == e {
-			err = nil
-		}
-
-	case isUnsignedInteger(c):
-		if float64(c.Uint()) == e {
-			err = nil
-		}
-
-	// If the actual value is lower precision, turn the comparison around so we
-	// apply the low-precision rules. Otherwise, e.g. Equals(0.1) may not match
-	// float32(0.1).
-	case ck == reflect.Float32 || ck == reflect.Complex64:
-		return Equals(c.Interface()).Matches(e)
-
-		// Otherwise, compare with double precision.
-	case isFloat(c):
-		if c.Float() == e {
-			err = nil
-		}
-
-	case isComplex(c):
-		comp := c.Complex()
-		rl := real(comp)
-		im := imag(comp)
-
-		if im == 0 && rl == e {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstComplex64(e complex64, c reflect.Value) (err error) {
-	err = errors.New("")
-	realPart := real(e)
-	imaginaryPart := imag(e)
-
-	switch {
-	case isInteger(c) || isFloat(c):
-		// If we have no imaginary part, then we should just compare against the
-		// real part. Otherwise, we can't be equal.
-		if imaginaryPart != 0 {
-			return
-		}
-
-		return checkAgainstFloat32(realPart, c)
-
-	case isComplex(c):
-		// Compare using complex64 to avoid a false sense of precision; otherwise
-		// e.g. Equals(0.1 + 0i) won't match float32(0.1).
-		if complex64(c.Complex()) == e {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstComplex128(e complex128, c reflect.Value) (err error) {
-	err = errors.New("")
-	realPart := real(e)
-	imaginaryPart := imag(e)
-
-	switch {
-	case isInteger(c) || isFloat(c):
-		// If we have no imaginary part, then we should just compare against the
-		// real part. Otherwise, we can't be equal.
-		if imaginaryPart != 0 {
-			return
-		}
-
-		return checkAgainstFloat64(realPart, c)
-
-	case isComplex(c):
-		if c.Complex() == e {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-////////////////////////////////////////////////////////////////////////
-// Other types
-////////////////////////////////////////////////////////////////////////
-
-func checkAgainstBool(e bool, c reflect.Value) (err error) {
-	if c.Kind() != reflect.Bool {
-		err = NewFatalError("which is not a bool")
-		return
-	}
-
-	err = errors.New("")
-	if c.Bool() == e {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstChan(e reflect.Value, c reflect.Value) (err error) {
-	// Create a description of e's type, e.g. "chan int".
-	typeStr := fmt.Sprintf("%s %s", e.Type().ChanDir(), e.Type().Elem())
-
-	// Make sure c is a chan of the correct type.
-	if c.Kind() != reflect.Chan ||
-		c.Type().ChanDir() != e.Type().ChanDir() ||
-		c.Type().Elem() != e.Type().Elem() {
-		err = NewFatalError(fmt.Sprintf("which is not a %s", typeStr))
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstFunc(e reflect.Value, c reflect.Value) (err error) {
-	// Make sure c is a function.
-	if c.Kind() != reflect.Func {
-		err = NewFatalError("which is not a function")
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstMap(e reflect.Value, c reflect.Value) (err error) {
-	// Make sure c is a map.
-	if c.Kind() != reflect.Map {
-		err = NewFatalError("which is not a map")
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstPtr(e reflect.Value, c reflect.Value) (err error) {
-	// Create a description of e's type, e.g. "*int".
-	typeStr := fmt.Sprintf("*%v", e.Type().Elem())
-
-	// Make sure c is a pointer of the correct type.
-	if c.Kind() != reflect.Ptr ||
-		c.Type().Elem() != e.Type().Elem() {
-		err = NewFatalError(fmt.Sprintf("which is not a %s", typeStr))
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstSlice(e reflect.Value, c reflect.Value) (err error) {
-	// Create a description of e's type, e.g. "[]int".
-	typeStr := fmt.Sprintf("[]%v", e.Type().Elem())
-
-	// Make sure c is a slice of the correct type.
-	if c.Kind() != reflect.Slice ||
-		c.Type().Elem() != e.Type().Elem() {
-		err = NewFatalError(fmt.Sprintf("which is not a %s", typeStr))
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstString(e reflect.Value, c reflect.Value) (err error) {
-	// Make sure c is a string.
-	if c.Kind() != reflect.String {
-		err = NewFatalError("which is not a string")
-		return
-	}
-
-	err = errors.New("")
-	if c.String() == e.String() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstArray(e reflect.Value, c reflect.Value) (err error) {
-	// Create a description of e's type, e.g. "[2]int".
-	typeStr := fmt.Sprintf("%v", e.Type())
-
-	// Make sure c is the correct type.
-	if c.Type() != e.Type() {
-		err = NewFatalError(fmt.Sprintf("which is not %s", typeStr))
-		return
-	}
-
-	// Check for equality.
-	if e.Interface() != c.Interface() {
-		err = errors.New("")
-		return
-	}
-
-	return
-}
-
-func checkAgainstUnsafePointer(e reflect.Value, c reflect.Value) (err error) {
-	// Make sure c is a pointer.
-	if c.Kind() != reflect.UnsafePointer {
-		err = NewFatalError("which is not a unsafe.Pointer")
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkForNil(c reflect.Value) (err error) {
-	err = errors.New("")
-
-	// Make sure it is legal to call IsNil.
-	switch c.Kind() {
-	case reflect.Invalid:
-	case reflect.Chan:
-	case reflect.Func:
-	case reflect.Interface:
-	case reflect.Map:
-	case reflect.Ptr:
-	case reflect.Slice:
-
-	default:
-		err = NewFatalError("which cannot be compared to nil")
-		return
-	}
-
-	// Ask whether the value is nil. Handle a nil literal (kind Invalid)
-	// specially, since it's not legal to call IsNil there.
-	if c.Kind() == reflect.Invalid || c.IsNil() {
-		err = nil
-	}
-	return
-}
-
-////////////////////////////////////////////////////////////////////////
-// Public implementation
-////////////////////////////////////////////////////////////////////////
-
-func (m *equalsMatcher) Matches(candidate interface{}) error {
-	e := m.expectedValue
-	c := reflect.ValueOf(candidate)
-	ek := e.Kind()
-
-	switch {
-	case ek == reflect.Bool:
-		return checkAgainstBool(e.Bool(), c)
-
-	case isSignedInteger(e):
-		return checkAgainstInt64(e.Int(), c)
-
-	case isUnsignedInteger(e):
-		return checkAgainstUint64(e.Uint(), c)
-
-	case ek == reflect.Float32:
-		return checkAgainstFloat32(float32(e.Float()), c)
-
-	case ek == reflect.Float64:
-		return checkAgainstFloat64(e.Float(), c)
-
-	case ek == reflect.Complex64:
-		return checkAgainstComplex64(complex64(e.Complex()), c)
-
-	case ek == reflect.Complex128:
-		return checkAgainstComplex128(complex128(e.Complex()), c)
-
-	case ek == reflect.Chan:
-		return checkAgainstChan(e, c)
-
-	case ek == reflect.Func:
-		return checkAgainstFunc(e, c)
-
-	case ek == reflect.Map:
-		return checkAgainstMap(e, c)
-
-	case ek == reflect.Ptr:
-		return checkAgainstPtr(e, c)
-
-	case ek == reflect.Slice:
-		return checkAgainstSlice(e, c)
-
-	case ek == reflect.String:
-		return checkAgainstString(e, c)
-
-	case ek == reflect.Array:
-		return checkAgainstArray(e, c)
-
-	case ek == reflect.UnsafePointer:
-		return checkAgainstUnsafePointer(e, c)
-
-	case ek == reflect.Invalid:
-		return checkForNil(c)
-	}
-
-	panic(fmt.Sprintf("equalsMatcher.Matches: unexpected kind: %v", ek))
-}
-
-func (m *equalsMatcher) Description() string {
-	// Special case: handle nil.
-	if !m.expectedValue.IsValid() {
-		return "is nil"
-	}
-
-	return fmt.Sprintf("%v", m.expectedValue.Interface())
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go
deleted file mode 100644
index 8a078e36d8..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-// Error returns a matcher that matches non-nil values implementing the
-// built-in error interface for whom the return value of Error() matches the
-// supplied matcher.
-//
-// For example:
-//
-//     err := errors.New("taco burrito")
-//
-//     Error(Equals("taco burrito"))  // matches err
-//     Error(HasSubstr("taco"))       // matches err
-//     Error(HasSubstr("enchilada"))  // doesn't match err
-//
-func Error(m Matcher) Matcher {
-	return &errorMatcher{m}
-}
-
-type errorMatcher struct {
-	wrappedMatcher Matcher
-}
-
-func (m *errorMatcher) Description() string {
-	return "error " + m.wrappedMatcher.Description()
-}
-
-func (m *errorMatcher) Matches(c interface{}) error {
-	// Make sure that c is an error.
-	e, ok := c.(error)
-	if !ok {
-		return NewFatalError("which is not an error")
-	}
-
-	// Pass on the error text to the wrapped matcher.
-	return m.wrappedMatcher.Matches(e.Error())
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go
deleted file mode 100644
index 4b9d103a38..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// GreaterOrEqual returns a matcher that matches integer, floating point, or
-// strings values v such that v >= x. Comparison is not defined between numeric
-// and string types, but is defined between all integer and floating point
-// types.
-//
-// x must itself be an integer, floating point, or string type; otherwise,
-// GreaterOrEqual will panic.
-func GreaterOrEqual(x interface{}) Matcher {
-	desc := fmt.Sprintf("greater than or equal to %v", x)
-
-	// Special case: make it clear that strings are strings.
-	if reflect.TypeOf(x).Kind() == reflect.String {
-		desc = fmt.Sprintf("greater than or equal to \"%s\"", x)
-	}
-
-	return transformDescription(Not(LessThan(x)), desc)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go
deleted file mode 100644
index 3eef32178f..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// GreaterThan returns a matcher that matches integer, floating point, or
-// strings values v such that v > x. Comparison is not defined between numeric
-// and string types, but is defined between all integer and floating point
-// types.
-//
-// x must itself be an integer, floating point, or string type; otherwise,
-// GreaterThan will panic.
-func GreaterThan(x interface{}) Matcher {
-	desc := fmt.Sprintf("greater than %v", x)
-
-	// Special case: make it clear that strings are strings.
-	if reflect.TypeOf(x).Kind() == reflect.String {
-		desc = fmt.Sprintf("greater than \"%s\"", x)
-	}
-
-	return transformDescription(Not(LessOrEqual(x)), desc)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go
deleted file mode 100644
index 3b286f7321..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// HasSameTypeAs returns a matcher that matches values with exactly the same
-// type as the supplied prototype.
-func HasSameTypeAs(p interface{}) Matcher {
-	expected := reflect.TypeOf(p)
-	pred := func(c interface{}) error {
-		actual := reflect.TypeOf(c)
-		if actual != expected {
-			return fmt.Errorf("which has type %v", actual)
-		}
-
-		return nil
-	}
-
-	return NewMatcher(pred, fmt.Sprintf("has type %v", expected))
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go
deleted file mode 100644
index bf5bd6ae6d..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// HasSubstr returns a matcher that matches strings containing s as a
-// substring.
-func HasSubstr(s string) Matcher {
-	return NewMatcher(
-		func(c interface{}) error { return hasSubstr(s, c) },
-		fmt.Sprintf("has substring \"%s\"", s))
-}
-
-func hasSubstr(needle string, c interface{}) error {
-	v := reflect.ValueOf(c)
-	if v.Kind() != reflect.String {
-		return NewFatalError("which is not a string")
-	}
-
-	// Perform the substring search.
-	haystack := v.String()
-	if strings.Contains(haystack, needle) {
-		return nil
-	}
-
-	return errors.New("")
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go
deleted file mode 100644
index ae6460ed96..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-)
-
-// Is the type comparable according to the definition here?
-//
-//     http://weekly.golang.org/doc/go_spec.html#Comparison_operators
-//
-func isComparable(t reflect.Type) bool {
-	switch t.Kind() {
-	case reflect.Array:
-		return isComparable(t.Elem())
-
-	case reflect.Struct:
-		for i := 0; i < t.NumField(); i++ {
-			if !isComparable(t.Field(i).Type) {
-				return false
-			}
-		}
-
-		return true
-
-	case reflect.Slice, reflect.Map, reflect.Func:
-		return false
-	}
-
-	return true
-}
-
-// Should the supplied type be allowed as an argument to IdenticalTo?
-func isLegalForIdenticalTo(t reflect.Type) (bool, error) {
-	// Allow the zero type.
-	if t == nil {
-		return true, nil
-	}
-
-	// Reference types are always okay; we compare pointers.
-	switch t.Kind() {
-	case reflect.Slice, reflect.Map, reflect.Func, reflect.Chan:
-		return true, nil
-	}
-
-	// Reject other non-comparable types.
-	if !isComparable(t) {
-		return false, errors.New(fmt.Sprintf("%v is not comparable", t))
-	}
-
-	return true, nil
-}
-
-// IdenticalTo(x) returns a matcher that matches values v with type identical
-// to x such that:
-//
-//  1. If v and x are of a reference type (slice, map, function, channel), then
-//     they are either both nil or are references to the same object.
-//
-//  2. Otherwise, if v and x are not of a reference type but have a valid type,
-//     then v == x.
-//
-// If v and x are both the invalid type (which results from the predeclared nil
-// value, or from nil interface variables), then the matcher is satisfied.
-//
-// This function will panic if x is of a value type that is not comparable. For
-// example, x cannot be an array of functions.
-func IdenticalTo(x interface{}) Matcher {
-	t := reflect.TypeOf(x)
-
-	// Reject illegal arguments.
-	if ok, err := isLegalForIdenticalTo(t); !ok {
-		panic("IdenticalTo: " + err.Error())
-	}
-
-	return &identicalToMatcher{x}
-}
-
-type identicalToMatcher struct {
-	x interface{}
-}
-
-func (m *identicalToMatcher) Description() string {
-	t := reflect.TypeOf(m.x)
-	return fmt.Sprintf("identical to <%v> %v", t, m.x)
-}
-
-func (m *identicalToMatcher) Matches(c interface{}) error {
-	// Make sure the candidate's type is correct.
-	t := reflect.TypeOf(m.x)
-	if ct := reflect.TypeOf(c); t != ct {
-		return NewFatalError(fmt.Sprintf("which is of type %v", ct))
-	}
-
-	// Special case: two values of the invalid type are always identical.
-	if t == nil {
-		return nil
-	}
-
-	// Handle reference types.
-	switch t.Kind() {
-	case reflect.Slice, reflect.Map, reflect.Func, reflect.Chan:
-		xv := reflect.ValueOf(m.x)
-		cv := reflect.ValueOf(c)
-		if xv.Pointer() == cv.Pointer() {
-			return nil
-		}
-
-		return errors.New("which is not an identical reference")
-	}
-
-	// Are the values equal?
-	if m.x == c {
-		return nil
-	}
-
-	return errors.New("")
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go
deleted file mode 100644
index 8402cdeaf0..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// LessOrEqual returns a matcher that matches integer, floating point, or
-// strings values v such that v <= x. Comparison is not defined between numeric
-// and string types, but is defined between all integer and floating point
-// types.
-//
-// x must itself be an integer, floating point, or string type; otherwise,
-// LessOrEqual will panic.
-func LessOrEqual(x interface{}) Matcher {
-	desc := fmt.Sprintf("less than or equal to %v", x)
-
-	// Special case: make it clear that strings are strings.
-	if reflect.TypeOf(x).Kind() == reflect.String {
-		desc = fmt.Sprintf("less than or equal to \"%s\"", x)
-	}
-
-	// Put LessThan last so that its error messages will be used in the event of
-	// failure.
-	return transformDescription(AnyOf(Equals(x), LessThan(x)), desc)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go
deleted file mode 100644
index 8258e45d99..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"math"
-	"reflect"
-)
-
-// LessThan returns a matcher that matches integer, floating point, or strings
-// values v such that v < x. Comparison is not defined between numeric and
-// string types, but is defined between all integer and floating point types.
-//
-// x must itself be an integer, floating point, or string type; otherwise,
-// LessThan will panic.
-func LessThan(x interface{}) Matcher {
-	v := reflect.ValueOf(x)
-	kind := v.Kind()
-
-	switch {
-	case isInteger(v):
-	case isFloat(v):
-	case kind == reflect.String:
-
-	default:
-		panic(fmt.Sprintf("LessThan: unexpected kind %v", kind))
-	}
-
-	return &lessThanMatcher{v}
-}
-
-type lessThanMatcher struct {
-	limit reflect.Value
-}
-
-func (m *lessThanMatcher) Description() string {
-	// Special case: make it clear that strings are strings.
-	if m.limit.Kind() == reflect.String {
-		return fmt.Sprintf("less than \"%s\"", m.limit.String())
-	}
-
-	return fmt.Sprintf("less than %v", m.limit.Interface())
-}
-
-func compareIntegers(v1, v2 reflect.Value) (err error) {
-	err = errors.New("")
-
-	switch {
-	case isSignedInteger(v1) && isSignedInteger(v2):
-		if v1.Int() < v2.Int() {
-			err = nil
-		}
-		return
-
-	case isSignedInteger(v1) && isUnsignedInteger(v2):
-		if v1.Int() < 0 || uint64(v1.Int()) < v2.Uint() {
-			err = nil
-		}
-		return
-
-	case isUnsignedInteger(v1) && isSignedInteger(v2):
-		if v1.Uint() <= math.MaxInt64 && int64(v1.Uint()) < v2.Int() {
-			err = nil
-		}
-		return
-
-	case isUnsignedInteger(v1) && isUnsignedInteger(v2):
-		if v1.Uint() < v2.Uint() {
-			err = nil
-		}
-		return
-	}
-
-	panic(fmt.Sprintf("compareIntegers: %v %v", v1, v2))
-}
-
-func getFloat(v reflect.Value) float64 {
-	switch {
-	case isSignedInteger(v):
-		return float64(v.Int())
-
-	case isUnsignedInteger(v):
-		return float64(v.Uint())
-
-	case isFloat(v):
-		return v.Float()
-	}
-
-	panic(fmt.Sprintf("getFloat: %v", v))
-}
-
-func (m *lessThanMatcher) Matches(c interface{}) (err error) {
-	v1 := reflect.ValueOf(c)
-	v2 := m.limit
-
-	err = errors.New("")
-
-	// Handle strings as a special case.
-	if v1.Kind() == reflect.String && v2.Kind() == reflect.String {
-		if v1.String() < v2.String() {
-			err = nil
-		}
-		return
-	}
-
-	// If we get here, we require that we are dealing with integers or floats.
-	v1Legal := isInteger(v1) || isFloat(v1)
-	v2Legal := isInteger(v2) || isFloat(v2)
-	if !v1Legal || !v2Legal {
-		err = NewFatalError("which is not comparable")
-		return
-	}
-
-	// Handle the various comparison cases.
-	switch {
-	// Both integers
-	case isInteger(v1) && isInteger(v2):
-		return compareIntegers(v1, v2)
-
-	// At least one float32
-	case v1.Kind() == reflect.Float32 || v2.Kind() == reflect.Float32:
-		if float32(getFloat(v1)) < float32(getFloat(v2)) {
-			err = nil
-		}
-		return
-
-	// At least one float64
-	case v1.Kind() == reflect.Float64 || v2.Kind() == reflect.Float64:
-		if getFloat(v1) < getFloat(v2) {
-			err = nil
-		}
-		return
-	}
-
-	// We shouldn't get here.
-	panic(fmt.Sprintf("lessThanMatcher.Matches: Shouldn't get here: %v %v", v1, v2))
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go
deleted file mode 100644
index 78159a0727..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package oglematchers provides a set of matchers useful in a testing or
-// mocking framework. These matchers are inspired by and mostly compatible with
-// Google Test for C++ and Google JS Test.
-//
-// This package is used by github.com/smartystreets/assertions/internal/ogletest and
-// github.com/smartystreets/assertions/internal/oglemock, which may be more directly useful if you're not
-// writing your own testing package or defining your own matchers.
-package oglematchers
-
-// A Matcher is some predicate implicitly defining a set of values that it
-// matches. For example, GreaterThan(17) matches all numeric values greater
-// than 17, and HasSubstr("taco") matches all strings with the substring
-// "taco".
-//
-// Matchers are typically exposed to tests via constructor functions like
-// HasSubstr. In order to implement such a function you can either define your
-// own matcher type or use NewMatcher.
-type Matcher interface {
-	// Check whether the supplied value belongs to the the set defined by the
-	// matcher. Return a non-nil error if and only if it does not.
-	//
-	// The error describes why the value doesn't match. The error text is a
-	// relative clause that is suitable for being placed after the value. For
-	// example, a predicate that matches strings with a particular substring may,
-	// when presented with a numerical value, return the following error text:
-	//
-	//     "which is not a string"
-	//
-	// Then the failure message may look like:
-	//
-	//     Expected: has substring "taco"
-	//     Actual:   17, which is not a string
-	//
-	// If the error is self-apparent based on the description of the matcher, the
-	// error text may be empty (but the error still non-nil). For example:
-	//
-	//     Expected: 17
-	//     Actual:   19
-	//
-	// If you are implementing a new matcher, see also the documentation on
-	// FatalError.
-	Matches(candidate interface{}) error
-
-	// Description returns a string describing the property that values matching
-	// this matcher have, as a verb phrase where the subject is the value. For
-	// example, "is greather than 17" or "has substring "taco"".
-	Description() string
-}
-
-// FatalError is an implementation of the error interface that may be returned
-// from matchers, indicating the error should be propagated. Returning a
-// *FatalError indicates that the matcher doesn't process values of the
-// supplied type, or otherwise doesn't know how to handle the value.
-//
-// For example, if GreaterThan(17) returned false for the value "taco" without
-// a fatal error, then Not(GreaterThan(17)) would return true. This is
-// technically correct, but is surprising and may mask failures where the wrong
-// sort of matcher is accidentally used. Instead, GreaterThan(17) can return a
-// fatal error, which will be propagated by Not().
-type FatalError struct {
-	errorText string
-}
-
-// NewFatalError creates a FatalError struct with the supplied error text.
-func NewFatalError(s string) *FatalError {
-	return &FatalError{s}
-}
-
-func (e *FatalError) Error() string {
-	return e.errorText
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go
deleted file mode 100644
index 1ed63f30c4..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"regexp"
-)
-
-// MatchesRegexp returns a matcher that matches strings and byte slices whose
-// contents match the supplied regular expression. The semantics are those of
-// regexp.Match. In particular, that means the match is not implicitly anchored
-// to the ends of the string: MatchesRegexp("bar") will match "foo bar baz".
-func MatchesRegexp(pattern string) Matcher {
-	re, err := regexp.Compile(pattern)
-	if err != nil {
-		panic("MatchesRegexp: " + err.Error())
-	}
-
-	return &matchesRegexpMatcher{re}
-}
-
-type matchesRegexpMatcher struct {
-	re *regexp.Regexp
-}
-
-func (m *matchesRegexpMatcher) Description() string {
-	return fmt.Sprintf("matches regexp \"%s\"", m.re.String())
-}
-
-func (m *matchesRegexpMatcher) Matches(c interface{}) (err error) {
-	v := reflect.ValueOf(c)
-	isString := v.Kind() == reflect.String
-	isByteSlice := v.Kind() == reflect.Slice && v.Elem().Kind() == reflect.Uint8
-
-	err = errors.New("")
-
-	switch {
-	case isString:
-		if m.re.MatchString(v.String()) {
-			err = nil
-		}
-
-	case isByteSlice:
-		if m.re.Match(v.Bytes()) {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not a string or []byte")
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go
deleted file mode 100644
index c9d8398ee6..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-// Create a matcher with the given description and predicate function, which
-// will be invoked to handle calls to Matchers.
-//
-// Using this constructor may be a convenience over defining your own type that
-// implements Matcher if you do not need any logic in your Description method.
-func NewMatcher(
-	predicate func(interface{}) error,
-	description string) Matcher {
-	return &predicateMatcher{
-		predicate:   predicate,
-		description: description,
-	}
-}
-
-type predicateMatcher struct {
-	predicate   func(interface{}) error
-	description string
-}
-
-func (pm *predicateMatcher) Matches(c interface{}) error {
-	return pm.predicate(c)
-}
-
-func (pm *predicateMatcher) Description() string {
-	return pm.description
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go
deleted file mode 100644
index 623789fe28..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-)
-
-// Not returns a matcher that inverts the set of values matched by the wrapped
-// matcher. It does not transform the result for values for which the wrapped
-// matcher returns a fatal error.
-func Not(m Matcher) Matcher {
-	return &notMatcher{m}
-}
-
-type notMatcher struct {
-	wrapped Matcher
-}
-
-func (m *notMatcher) Matches(c interface{}) (err error) {
-	err = m.wrapped.Matches(c)
-
-	// Did the wrapped matcher say yes?
-	if err == nil {
-		return errors.New("")
-	}
-
-	// Did the wrapped matcher return a fatal error?
-	if _, isFatal := err.(*FatalError); isFatal {
-		return err
-	}
-
-	// The wrapped matcher returned a non-fatal error.
-	return nil
-}
-
-func (m *notMatcher) Description() string {
-	return fmt.Sprintf("not(%s)", m.wrapped.Description())
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go
deleted file mode 100644
index d2cfc97869..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-)
-
-// Panics matches zero-arg functions which, when invoked, panic with an error
-// that matches the supplied matcher.
-//
-// NOTE(jacobsa): This matcher cannot detect the case where the function panics
-// using panic(nil), by design of the language. See here for more info:
-//
-//     http://goo.gl/9aIQL
-//
-func Panics(m Matcher) Matcher {
-	return &panicsMatcher{m}
-}
-
-type panicsMatcher struct {
-	wrappedMatcher Matcher
-}
-
-func (m *panicsMatcher) Description() string {
-	return "panics with: " + m.wrappedMatcher.Description()
-}
-
-func (m *panicsMatcher) Matches(c interface{}) (err error) {
-	// Make sure c is a zero-arg function.
-	v := reflect.ValueOf(c)
-	if v.Kind() != reflect.Func || v.Type().NumIn() != 0 {
-		err = NewFatalError("which is not a zero-arg function")
-		return
-	}
-
-	// Call the function and check its panic error.
-	defer func() {
-		if e := recover(); e != nil {
-			err = m.wrappedMatcher.Matches(e)
-
-			// Set a clearer error message if the matcher said no.
-			if err != nil {
-				wrappedClause := ""
-				if err.Error() != "" {
-					wrappedClause = ", " + err.Error()
-				}
-
-				err = errors.New(fmt.Sprintf("which panicked with: %v%s", e, wrappedClause))
-			}
-		}
-	}()
-
-	v.Call([]reflect.Value{})
-
-	// If we get here, the function didn't panic.
-	err = errors.New("which didn't panic")
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go
deleted file mode 100644
index c5383f2402..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-)
-
-// Return a matcher that matches non-nil pointers whose pointee matches the
-// wrapped matcher.
-func Pointee(m Matcher) Matcher {
-	return &pointeeMatcher{m}
-}
-
-type pointeeMatcher struct {
-	wrapped Matcher
-}
-
-func (m *pointeeMatcher) Matches(c interface{}) (err error) {
-	// Make sure the candidate is of the appropriate type.
-	cv := reflect.ValueOf(c)
-	if !cv.IsValid() || cv.Kind() != reflect.Ptr {
-		return NewFatalError("which is not a pointer")
-	}
-
-	// Make sure the candidate is non-nil.
-	if cv.IsNil() {
-		return NewFatalError("")
-	}
-
-	// Defer to the wrapped matcher. Fix up empty errors so that failure messages
-	// are more helpful than just printing a pointer for "Actual".
-	pointee := cv.Elem().Interface()
-	err = m.wrapped.Matches(pointee)
-	if err != nil && err.Error() == "" {
-		s := fmt.Sprintf("whose pointee is %v", pointee)
-
-		if _, ok := err.(*FatalError); ok {
-			err = NewFatalError(s)
-		} else {
-			err = errors.New(s)
-		}
-	}
-
-	return err
-}
-
-func (m *pointeeMatcher) Description() string {
-	return fmt.Sprintf("pointee(%s)", m.wrapped.Description())
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go
deleted file mode 100644
index f79d0c03db..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-// transformDescription returns a matcher that is equivalent to the supplied
-// one, except that it has the supplied description instead of the one attached
-// to the existing matcher.
-func transformDescription(m Matcher, newDesc string) Matcher {
-	return &transformDescriptionMatcher{newDesc, m}
-}
-
-type transformDescriptionMatcher struct {
-	desc string
-	wrappedMatcher Matcher
-}
-
-func (m *transformDescriptionMatcher) Description() string {
-	return m.desc
-}
-
-func (m *transformDescriptionMatcher) Matches(c interface{}) error {
-	return m.wrappedMatcher.Matches(c)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go
deleted file mode 100644
index 9c57ab2b8b..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package assertions
-
-const ( // equality
-	shouldHaveBeenEqual             = "Expected: '%v'\nActual:   '%v'\n(Should be equal)"
-	shouldNotHaveBeenEqual          = "Expected     '%v'\nto NOT equal '%v'\n(but it did)!"
-	shouldHaveBeenEqualTypeMismatch = "Expected: '%v' (%T)\nActual:   '%v' (%T)\n(Should be equal, type mismatch)"
-	shouldHaveBeenAlmostEqual       = "Expected '%v' to almost equal '%v' (but it didn't)!"
-	shouldHaveNotBeenAlmostEqual    = "Expected '%v' to NOT almost equal '%v' (but it did)!"
-	shouldHaveResembled             = "Expected: '%s'\nActual:   '%s'\n(Should resemble)!"
-	shouldNotHaveResembled          = "Expected        '%#v'\nto NOT resemble '%#v'\n(but it did)!"
-	shouldBePointers                = "Both arguments should be pointers "
-	shouldHaveBeenNonNilPointer     = shouldBePointers + "(the %s was %s)!"
-	shouldHavePointedTo             = "Expected '%+v' (address: '%v') and '%+v' (address: '%v') to be the same address (but their weren't)!"
-	shouldNotHavePointedTo          = "Expected '%+v' and '%+v' to be different references (but they matched: '%v')!"
-	shouldHaveBeenNil               = "Expected: nil\nActual:   '%v'"
-	shouldNotHaveBeenNil            = "Expected '%+v' to NOT be nil (but it was)!"
-	shouldHaveBeenTrue              = "Expected: true\nActual:   %v"
-	shouldHaveBeenFalse             = "Expected: false\nActual:   %v"
-	shouldHaveBeenZeroValue         = "'%+v' should have been the zero value" //"Expected: (zero value)\nActual:   %v"
-)
-
-const ( // quantity comparisons
-	shouldHaveBeenGreater            = "Expected '%v' to be greater than '%v' (but it wasn't)!"
-	shouldHaveBeenGreaterOrEqual     = "Expected '%v' to be greater than or equal to '%v' (but it wasn't)!"
-	shouldHaveBeenLess               = "Expected '%v' to be less than '%v' (but it wasn't)!"
-	shouldHaveBeenLessOrEqual        = "Expected '%v' to be less than or equal to '%v' (but it wasn't)!"
-	shouldHaveBeenBetween            = "Expected '%v' to be between '%v' and '%v' (but it wasn't)!"
-	shouldNotHaveBeenBetween         = "Expected '%v' NOT to be between '%v' and '%v' (but it was)!"
-	shouldHaveDifferentUpperAndLower = "The lower and upper bounds must be different values (they were both '%v')."
-	shouldHaveBeenBetweenOrEqual     = "Expected '%v' to be between '%v' and '%v' or equal to one of them (but it wasn't)!"
-	shouldNotHaveBeenBetweenOrEqual  = "Expected '%v' NOT to be between '%v' and '%v' or equal to one of them (but it was)!"
-)
-
-const ( // collections
-	shouldHaveContained            = "Expected the container (%v) to contain: '%v' (but it didn't)!"
-	shouldNotHaveContained         = "Expected the container (%v) NOT to contain: '%v' (but it did)!"
-	shouldHaveContainedKey         = "Expected the %v to contain the key: %v (but it didn't)!"
-	shouldNotHaveContainedKey      = "Expected the %v NOT to contain the key: %v (but it did)!"
-	shouldHaveBeenIn               = "Expected '%v' to be in the container (%v), but it wasn't!"
-	shouldNotHaveBeenIn            = "Expected '%v' NOT to be in the container (%v), but it was!"
-	shouldHaveBeenAValidCollection = "You must provide a valid container (was %v)!"
-	shouldHaveBeenAValidMap        = "You must provide a valid map type (was %v)!"
-	shouldHaveBeenEmpty            = "Expected %+v to be empty (but it wasn't)!"
-	shouldNotHaveBeenEmpty         = "Expected %+v to NOT be empty (but it was)!"
-	shouldHaveBeenAValidInteger    = "You must provide a valid integer (was %v)!"
-	shouldHaveBeenAValidLength     = "You must provide a valid positive integer (was %v)!"
-	shouldHaveHadLength            = "Expected %+v (length: %v) to have length equal to '%v', but it wasn't!"
-)
-
-const ( // strings
-	shouldHaveStartedWith           = "Expected      '%v'\nto start with '%v'\n(but it didn't)!"
-	shouldNotHaveStartedWith        = "Expected          '%v'\nNOT to start with '%v'\n(but it did)!"
-	shouldHaveEndedWith             = "Expected    '%v'\nto end with '%v'\n(but it didn't)!"
-	shouldNotHaveEndedWith          = "Expected        '%v'\nNOT to end with '%v'\n(but it did)!"
-	shouldAllBeStrings              = "All arguments to this assertion must be strings (you provided: %v)."
-	shouldBothBeStrings             = "Both arguments to this assertion must be strings (you provided %v and %v)."
-	shouldBeString                  = "The argument to this assertion must be a string (you provided %v)."
-	shouldHaveContainedSubstring    = "Expected '%s' to contain substring '%s' (but it didn't)!"
-	shouldNotHaveContainedSubstring = "Expected '%s' NOT to contain substring '%s' (but it did)!"
-	shouldHaveBeenBlank             = "Expected '%s' to be blank (but it wasn't)!"
-	shouldNotHaveBeenBlank          = "Expected value to NOT be blank (but it was)!"
-)
-
-const ( // panics
-	shouldUseVoidNiladicFunction = "You must provide a void, niladic function as the first argument!"
-	shouldHavePanickedWith       = "Expected func() to panic with '%v' (but it panicked with '%v')!"
-	shouldHavePanicked           = "Expected func() to panic (but it didn't)!"
-	shouldNotHavePanicked        = "Expected func() NOT to panic (error: '%+v')!"
-	shouldNotHavePanickedWith    = "Expected func() NOT to panic with '%v' (but it did)!"
-)
-
-const ( // type checking
-	shouldHaveBeenA    = "Expected '%v' to be: '%v' (but was: '%v')!"
-	shouldNotHaveBeenA = "Expected '%v' to NOT be: '%v' (but it was)!"
-
-	shouldHaveImplemented             = "Expected: '%v interface support'\nActual:   '%v' does not implement the interface!"
-	shouldNotHaveImplemented          = "Expected         '%v'\nto NOT implement '%v'\n(but it did)!"
-	shouldCompareWithInterfacePointer = "The expected value must be a pointer to an interface type (eg. *fmt.Stringer)"
-	shouldNotBeNilActual              = "The actual value was 'nil' and should be a value or a pointer to a value!"
-)
-
-const ( // time comparisons
-	shouldUseTimes                   = "You must provide time instances as arguments to this assertion."
-	shouldUseTimeSlice               = "You must provide a slice of time instances as the first argument to this assertion."
-	shouldUseDurationAndTime         = "You must provide a duration and a time as arguments to this assertion."
-	shouldHaveHappenedBefore         = "Expected '%v' to happen before '%v' (it happened '%v' after)!"
-	shouldHaveHappenedAfter          = "Expected '%v' to happen after '%v' (it happened '%v' before)!"
-	shouldHaveHappenedBetween        = "Expected '%v' to happen between '%v' and '%v' (it happened '%v' outside threshold)!"
-	shouldNotHaveHappenedOnOrBetween = "Expected '%v' to NOT happen on or between '%v' and '%v' (but it did)!"
-
-	// format params: incorrect-index, previous-index, previous-time, incorrect-index, incorrect-time
-	shouldHaveBeenChronological = "The 'Time' at index [%d] should have happened after the previous one (but it didn't!):\n  [%d]: %s\n  [%d]: %s (see, it happened before!)"
-)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go
deleted file mode 100644
index 7e75db1784..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package assertions
-
-import "fmt"
-
-// ShouldPanic receives a void, niladic function and expects to recover a panic.
-func ShouldPanic(actual interface{}, expected ...interface{}) (message string) {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	action, _ := actual.(func())
-
-	if action == nil {
-		message = shouldUseVoidNiladicFunction
-		return
-	}
-
-	defer func() {
-		recovered := recover()
-		if recovered == nil {
-			message = shouldHavePanicked
-		} else {
-			message = success
-		}
-	}()
-	action()
-
-	return
-}
-
-// ShouldNotPanic receives a void, niladic function and expects to execute the function without any panic.
-func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string) {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	action, _ := actual.(func())
-
-	if action == nil {
-		message = shouldUseVoidNiladicFunction
-		return
-	}
-
-	defer func() {
-		recovered := recover()
-		if recovered != nil {
-			message = fmt.Sprintf(shouldNotHavePanicked, recovered)
-		} else {
-			message = success
-		}
-	}()
-	action()
-
-	return
-}
-
-// ShouldPanicWith receives a void, niladic function and expects to recover a panic with the second argument as the content.
-func ShouldPanicWith(actual interface{}, expected ...interface{}) (message string) {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	action, _ := actual.(func())
-
-	if action == nil {
-		message = shouldUseVoidNiladicFunction
-		return
-	}
-
-	defer func() {
-		recovered := recover()
-		if recovered == nil {
-			message = shouldHavePanicked
-		} else {
-			if equal := ShouldEqual(recovered, expected[0]); equal != success {
-				message = serializer.serialize(expected[0], recovered, fmt.Sprintf(shouldHavePanickedWith, expected[0], recovered))
-			} else {
-				message = success
-			}
-		}
-	}()
-	action()
-
-	return
-}
-
-// ShouldNotPanicWith receives a void, niladic function and expects to recover a panic whose content differs from the second argument.
-func ShouldNotPanicWith(actual interface{}, expected ...interface{}) (message string) {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	action, _ := actual.(func())
-
-	if action == nil {
-		message = shouldUseVoidNiladicFunction
-		return
-	}
-
-	defer func() {
-		recovered := recover()
-		if recovered == nil {
-			message = success
-		} else {
-			if equal := ShouldEqual(recovered, expected[0]); equal == success {
-				message = fmt.Sprintf(shouldNotHavePanickedWith, expected[0])
-			} else {
-				message = success
-			}
-		}
-	}()
-	action()
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go
deleted file mode 100644
index f28b0a062b..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-
-	"github.com/smartystreets/assertions/internal/oglematchers"
-)
-
-// ShouldBeGreaterThan receives exactly two parameters and ensures that the first is greater than the second.
-func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	if matchError := oglematchers.GreaterThan(expected[0]).Matches(actual); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenGreater, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldBeGreaterThanOrEqualTo receives exactly two parameters and ensures that the first is greater than or equal to the second.
-func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	} else if matchError := oglematchers.GreaterOrEqual(expected[0]).Matches(actual); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenGreaterOrEqual, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldBeLessThan receives exactly two parameters and ensures that the first is less than the second.
-func ShouldBeLessThan(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	} else if matchError := oglematchers.LessThan(expected[0]).Matches(actual); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenLess, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldBeLessThan receives exactly two parameters and ensures that the first is less than or equal to the second.
-func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	} else if matchError := oglematchers.LessOrEqual(expected[0]).Matches(actual); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenLessOrEqual, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound.
-// It ensures that the actual value is between both bounds (but not equal to either of them).
-func ShouldBeBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	lower, upper, fail := deriveBounds(expected)
-
-	if fail != success {
-		return fail
-	} else if !isBetween(actual, lower, upper) {
-		return fmt.Sprintf(shouldHaveBeenBetween, actual, lower, upper)
-	}
-	return success
-}
-
-// ShouldNotBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound.
-// It ensures that the actual value is NOT between both bounds.
-func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	lower, upper, fail := deriveBounds(expected)
-
-	if fail != success {
-		return fail
-	} else if isBetween(actual, lower, upper) {
-		return fmt.Sprintf(shouldNotHaveBeenBetween, actual, lower, upper)
-	}
-	return success
-}
-func deriveBounds(values []interface{}) (lower interface{}, upper interface{}, fail string) {
-	lower = values[0]
-	upper = values[1]
-
-	if ShouldNotEqual(lower, upper) != success {
-		return nil, nil, fmt.Sprintf(shouldHaveDifferentUpperAndLower, lower)
-	} else if ShouldBeLessThan(lower, upper) != success {
-		lower, upper = upper, lower
-	}
-	return lower, upper, success
-}
-func isBetween(value, lower, upper interface{}) bool {
-	if ShouldBeGreaterThan(value, lower) != success {
-		return false
-	} else if ShouldBeLessThan(value, upper) != success {
-		return false
-	}
-	return true
-}
-
-// ShouldBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound.
-// It ensures that the actual value is between both bounds or equal to one of them.
-func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	lower, upper, fail := deriveBounds(expected)
-
-	if fail != success {
-		return fail
-	} else if !isBetweenOrEqual(actual, lower, upper) {
-		return fmt.Sprintf(shouldHaveBeenBetweenOrEqual, actual, lower, upper)
-	}
-	return success
-}
-
-// ShouldNotBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound.
-// It ensures that the actual value is nopt between the bounds nor equal to either of them.
-func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	lower, upper, fail := deriveBounds(expected)
-
-	if fail != success {
-		return fail
-	} else if isBetweenOrEqual(actual, lower, upper) {
-		return fmt.Sprintf(shouldNotHaveBeenBetweenOrEqual, actual, lower, upper)
-	}
-	return success
-}
-
-func isBetweenOrEqual(value, lower, upper interface{}) bool {
-	if ShouldBeGreaterThanOrEqualTo(value, lower) != success {
-		return false
-	} else if ShouldBeLessThanOrEqualTo(value, upper) != success {
-		return false
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go
deleted file mode 100644
index 90ae3e3b69..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package assertions
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/smartystreets/assertions/internal/go-render/render"
-)
-
-type Serializer interface {
-	serialize(expected, actual interface{}, message string) string
-	serializeDetailed(expected, actual interface{}, message string) string
-}
-
-type failureSerializer struct{}
-
-func (self *failureSerializer) serializeDetailed(expected, actual interface{}, message string) string {
-	view := FailureView{
-		Message:  message,
-		Expected: render.Render(expected),
-		Actual:   render.Render(actual),
-	}
-	serialized, err := json.Marshal(view)
-	if err != nil {
-		return message
-	}
-	return string(serialized)
-}
-
-func (self *failureSerializer) serialize(expected, actual interface{}, message string) string {
-	view := FailureView{
-		Message:  message,
-		Expected: fmt.Sprintf("%+v", expected),
-		Actual:   fmt.Sprintf("%+v", actual),
-	}
-	serialized, err := json.Marshal(view)
-	if err != nil {
-		return message
-	}
-	return string(serialized)
-}
-
-func newSerializer() *failureSerializer {
-	return &failureSerializer{}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-// This struct is also declared in github.com/smartystreets/goconvey/convey/reporting.
-// The json struct tags should be equal in both declarations.
-type FailureView struct {
-	Message  string `json:"Message"`
-	Expected string `json:"Expected"`
-	Actual   string `json:"Actual"`
-}
-
-///////////////////////////////////////////////////////
-
-// noopSerializer just gives back the original message. This is useful when we are using
-// the assertions from a context other than the web UI, that requires the JSON structure
-// provided by the failureSerializer.
-type noopSerializer struct{}
-
-func (self *noopSerializer) serialize(expected, actual interface{}, message string) string {
-	return message
-}
-func (self *noopSerializer) serializeDetailed(expected, actual interface{}, message string) string {
-	return message
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go
deleted file mode 100644
index dbc3f04790..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go
+++ /dev/null
@@ -1,227 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// ShouldStartWith receives exactly 2 string parameters and ensures that the first starts with the second.
-func ShouldStartWith(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	value, valueIsString := actual.(string)
-	prefix, prefixIsString := expected[0].(string)
-
-	if !valueIsString || !prefixIsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	return shouldStartWith(value, prefix)
-}
-func shouldStartWith(value, prefix string) string {
-	if !strings.HasPrefix(value, prefix) {
-		shortval := value
-		if len(shortval) > len(prefix) {
-			shortval = shortval[:len(prefix)] + "..."
-		}
-		return serializer.serialize(prefix, shortval, fmt.Sprintf(shouldHaveStartedWith, value, prefix))
-	}
-	return success
-}
-
-// ShouldNotStartWith receives exactly 2 string parameters and ensures that the first does not start with the second.
-func ShouldNotStartWith(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	value, valueIsString := actual.(string)
-	prefix, prefixIsString := expected[0].(string)
-
-	if !valueIsString || !prefixIsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	return shouldNotStartWith(value, prefix)
-}
-func shouldNotStartWith(value, prefix string) string {
-	if strings.HasPrefix(value, prefix) {
-		if value == "" {
-			value = "<empty>"
-		}
-		if prefix == "" {
-			prefix = "<empty>"
-		}
-		return fmt.Sprintf(shouldNotHaveStartedWith, value, prefix)
-	}
-	return success
-}
-
-// ShouldEndWith receives exactly 2 string parameters and ensures that the first ends with the second.
-func ShouldEndWith(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	value, valueIsString := actual.(string)
-	suffix, suffixIsString := expected[0].(string)
-
-	if !valueIsString || !suffixIsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	return shouldEndWith(value, suffix)
-}
-func shouldEndWith(value, suffix string) string {
-	if !strings.HasSuffix(value, suffix) {
-		shortval := value
-		if len(shortval) > len(suffix) {
-			shortval = "..." + shortval[len(shortval)-len(suffix):]
-		}
-		return serializer.serialize(suffix, shortval, fmt.Sprintf(shouldHaveEndedWith, value, suffix))
-	}
-	return success
-}
-
-// ShouldEndWith receives exactly 2 string parameters and ensures that the first does not end with the second.
-func ShouldNotEndWith(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	value, valueIsString := actual.(string)
-	suffix, suffixIsString := expected[0].(string)
-
-	if !valueIsString || !suffixIsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	return shouldNotEndWith(value, suffix)
-}
-func shouldNotEndWith(value, suffix string) string {
-	if strings.HasSuffix(value, suffix) {
-		if value == "" {
-			value = "<empty>"
-		}
-		if suffix == "" {
-			suffix = "<empty>"
-		}
-		return fmt.Sprintf(shouldNotHaveEndedWith, value, suffix)
-	}
-	return success
-}
-
-// ShouldContainSubstring receives exactly 2 string parameters and ensures that the first contains the second as a substring.
-func ShouldContainSubstring(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	long, longOk := actual.(string)
-	short, shortOk := expected[0].(string)
-
-	if !longOk || !shortOk {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	if !strings.Contains(long, short) {
-		return serializer.serialize(expected[0], actual, fmt.Sprintf(shouldHaveContainedSubstring, long, short))
-	}
-	return success
-}
-
-// ShouldNotContainSubstring receives exactly 2 string parameters and ensures that the first does NOT contain the second as a substring.
-func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	long, longOk := actual.(string)
-	short, shortOk := expected[0].(string)
-
-	if !longOk || !shortOk {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	if strings.Contains(long, short) {
-		return fmt.Sprintf(shouldNotHaveContainedSubstring, long, short)
-	}
-	return success
-}
-
-// ShouldBeBlank receives exactly 1 string parameter and ensures that it is equal to "".
-func ShouldBeBlank(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-	value, ok := actual.(string)
-	if !ok {
-		return fmt.Sprintf(shouldBeString, reflect.TypeOf(actual))
-	}
-	if value != "" {
-		return serializer.serialize("", value, fmt.Sprintf(shouldHaveBeenBlank, value))
-	}
-	return success
-}
-
-// ShouldNotBeBlank receives exactly 1 string parameter and ensures that it is equal to "".
-func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-	value, ok := actual.(string)
-	if !ok {
-		return fmt.Sprintf(shouldBeString, reflect.TypeOf(actual))
-	}
-	if value == "" {
-		return shouldNotHaveBeenBlank
-	}
-	return success
-}
-
-// ShouldEqualWithout receives exactly 3 string parameters and ensures that the first is equal to the second
-// after removing all instances of the third from the first using strings.Replace(first, third, "", -1).
-func ShouldEqualWithout(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualString, ok1 := actual.(string)
-	expectedString, ok2 := expected[0].(string)
-	replace, ok3 := expected[1].(string)
-
-	if !ok1 || !ok2 || !ok3 {
-		return fmt.Sprintf(shouldAllBeStrings, []reflect.Type{
-			reflect.TypeOf(actual),
-			reflect.TypeOf(expected[0]),
-			reflect.TypeOf(expected[1]),
-		})
-	}
-
-	replaced := strings.Replace(actualString, replace, "", -1)
-	if replaced == expectedString {
-		return ""
-	}
-
-	return fmt.Sprintf("Expected '%s' to equal '%s' but without any '%s' (but it didn't).", actualString, expectedString, replace)
-}
-
-// ShouldEqualTrimSpace receives exactly 2 string parameters and ensures that the first is equal to the second
-// after removing all leading and trailing whitespace using strings.TrimSpace(first).
-func ShouldEqualTrimSpace(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	actualString, valueIsString := actual.(string)
-	_, value2IsString := expected[0].(string)
-
-	if !valueIsString || !value2IsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	actualString = strings.TrimSpace(actualString)
-	return ShouldEqual(actualString, expected[0])
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/time.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/time.go
deleted file mode 100644
index 7e05026143..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/time.go
+++ /dev/null
@@ -1,202 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-	"time"
-)
-
-// ShouldHappenBefore receives exactly 2 time.Time arguments and asserts that the first happens before the second.
-func ShouldHappenBefore(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	expectedTime, secondOk := expected[0].(time.Time)
-
-	if !firstOk || !secondOk {
-		return shouldUseTimes
-	}
-
-	if !actualTime.Before(expectedTime) {
-		return fmt.Sprintf(shouldHaveHappenedBefore, actualTime, expectedTime, actualTime.Sub(expectedTime))
-	}
-
-	return success
-}
-
-// ShouldHappenOnOrBefore receives exactly 2 time.Time arguments and asserts that the first happens on or before the second.
-func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	expectedTime, secondOk := expected[0].(time.Time)
-
-	if !firstOk || !secondOk {
-		return shouldUseTimes
-	}
-
-	if actualTime.Equal(expectedTime) {
-		return success
-	}
-	return ShouldHappenBefore(actualTime, expectedTime)
-}
-
-// ShouldHappenAfter receives exactly 2 time.Time arguments and asserts that the first happens after the second.
-func ShouldHappenAfter(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	expectedTime, secondOk := expected[0].(time.Time)
-
-	if !firstOk || !secondOk {
-		return shouldUseTimes
-	}
-	if !actualTime.After(expectedTime) {
-		return fmt.Sprintf(shouldHaveHappenedAfter, actualTime, expectedTime, expectedTime.Sub(actualTime))
-	}
-	return success
-}
-
-// ShouldHappenOnOrAfter receives exactly 2 time.Time arguments and asserts that the first happens on or after the second.
-func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	expectedTime, secondOk := expected[0].(time.Time)
-
-	if !firstOk || !secondOk {
-		return shouldUseTimes
-	}
-	if actualTime.Equal(expectedTime) {
-		return success
-	}
-	return ShouldHappenAfter(actualTime, expectedTime)
-}
-
-// ShouldHappenBetween receives exactly 3 time.Time arguments and asserts that the first happens between (not on) the second and third.
-func ShouldHappenBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	min, secondOk := expected[0].(time.Time)
-	max, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseTimes
-	}
-
-	if !actualTime.After(min) {
-		return fmt.Sprintf(shouldHaveHappenedBetween, actualTime, min, max, min.Sub(actualTime))
-	}
-	if !actualTime.Before(max) {
-		return fmt.Sprintf(shouldHaveHappenedBetween, actualTime, min, max, actualTime.Sub(max))
-	}
-	return success
-}
-
-// ShouldHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first happens between or on the second and third.
-func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	min, secondOk := expected[0].(time.Time)
-	max, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseTimes
-	}
-	if actualTime.Equal(min) || actualTime.Equal(max) {
-		return success
-	}
-	return ShouldHappenBetween(actualTime, min, max)
-}
-
-// ShouldNotHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first
-// does NOT happen between or on the second or third.
-func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	min, secondOk := expected[0].(time.Time)
-	max, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseTimes
-	}
-	if actualTime.Equal(min) || actualTime.Equal(max) {
-		return fmt.Sprintf(shouldNotHaveHappenedOnOrBetween, actualTime, min, max)
-	}
-	if actualTime.After(min) && actualTime.Before(max) {
-		return fmt.Sprintf(shouldNotHaveHappenedOnOrBetween, actualTime, min, max)
-	}
-	return success
-}
-
-// ShouldHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments)
-// and asserts that the first time.Time happens within or on the duration specified relative to
-// the other time.Time.
-func ShouldHappenWithin(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	tolerance, secondOk := expected[0].(time.Duration)
-	threshold, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseDurationAndTime
-	}
-
-	min := threshold.Add(-tolerance)
-	max := threshold.Add(tolerance)
-	return ShouldHappenOnOrBetween(actualTime, min, max)
-}
-
-// ShouldNotHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments)
-// and asserts that the first time.Time does NOT happen within or on the duration specified relative to
-// the other time.Time.
-func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	tolerance, secondOk := expected[0].(time.Duration)
-	threshold, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseDurationAndTime
-	}
-
-	min := threshold.Add(-tolerance)
-	max := threshold.Add(tolerance)
-	return ShouldNotHappenOnOrBetween(actualTime, min, max)
-}
-
-// ShouldBeChronological receives a []time.Time slice and asserts that the are
-// in chronological order starting with the first time.Time as the earliest.
-func ShouldBeChronological(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	times, ok := actual.([]time.Time)
-	if !ok {
-		return shouldUseTimeSlice
-	}
-
-	var previous time.Time
-	for i, current := range times {
-		if i > 0 && current.Before(previous) {
-			return fmt.Sprintf(shouldHaveBeenChronological,
-				i, i-1, previous.String(), i, current.String())
-		}
-		previous = current
-	}
-	return ""
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/type.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/type.go
deleted file mode 100644
index 3fc00f68cd..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/type.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// ShouldHaveSameTypeAs receives exactly two parameters and compares their underlying types for equality.
-func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	first := reflect.TypeOf(actual)
-	second := reflect.TypeOf(expected[0])
-
-	if equal := ShouldEqual(first, second); equal != success {
-		return serializer.serialize(second, first, fmt.Sprintf(shouldHaveBeenA, actual, second, first))
-	}
-	return success
-}
-
-// ShouldNotHaveSameTypeAs receives exactly two parameters and compares their underlying types for inequality.
-func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	first := reflect.TypeOf(actual)
-	second := reflect.TypeOf(expected[0])
-
-	if equal := ShouldEqual(first, second); equal == success {
-		return fmt.Sprintf(shouldNotHaveBeenA, actual, second)
-	}
-	return success
-}
-
-// ShouldImplement receives exactly two parameters and ensures
-// that the first implements the interface type of the second.
-func ShouldImplement(actual interface{}, expectedList ...interface{}) string {
-	if fail := need(1, expectedList); fail != success {
-		return fail
-	}
-
-	expected := expectedList[0]
-	if fail := ShouldBeNil(expected); fail != success {
-		return shouldCompareWithInterfacePointer
-	}
-
-	if fail := ShouldNotBeNil(actual); fail != success {
-		return shouldNotBeNilActual
-	}
-
-	var actualType reflect.Type
-	if reflect.TypeOf(actual).Kind() != reflect.Ptr {
-		actualType = reflect.PtrTo(reflect.TypeOf(actual))
-	} else {
-		actualType = reflect.TypeOf(actual)
-	}
-
-	expectedType := reflect.TypeOf(expected)
-	if fail := ShouldNotBeNil(expectedType); fail != success {
-		return shouldCompareWithInterfacePointer
-	}
-
-	expectedInterface := expectedType.Elem()
-
-	if actualType == nil {
-		return fmt.Sprintf(shouldHaveImplemented, expectedInterface, actual)
-	}
-
-	if !actualType.Implements(expectedInterface) {
-		return fmt.Sprintf(shouldHaveImplemented, expectedInterface, actualType)
-	}
-	return success
-}
-
-// ShouldNotImplement receives exactly two parameters and ensures
-// that the first does NOT implement the interface type of the second.
-func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string {
-	if fail := need(1, expectedList); fail != success {
-		return fail
-	}
-
-	expected := expectedList[0]
-	if fail := ShouldBeNil(expected); fail != success {
-		return shouldCompareWithInterfacePointer
-	}
-
-	if fail := ShouldNotBeNil(actual); fail != success {
-		return shouldNotBeNilActual
-	}
-
-	var actualType reflect.Type
-	if reflect.TypeOf(actual).Kind() != reflect.Ptr {
-		actualType = reflect.PtrTo(reflect.TypeOf(actual))
-	} else {
-		actualType = reflect.TypeOf(actual)
-	}
-
-	expectedType := reflect.TypeOf(expected)
-	if fail := ShouldNotBeNil(expectedType); fail != success {
-		return shouldCompareWithInterfacePointer
-	}
-
-	expectedInterface := expectedType.Elem()
-
-	if actualType.Implements(expectedInterface) {
-		return fmt.Sprintf(shouldNotHaveImplemented, actualType, expectedInterface)
-	}
-	return success
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/LICENSE.md b/Godeps/_workspace/src/github.com/smartystreets/goconvey/LICENSE.md
deleted file mode 100644
index 3f87a40e77..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/LICENSE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2016 SmartyStreets, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-NOTE: Various optional and subordinate components carry their own licensing
-requirements and restrictions.  Use of those components is subject to the terms
-and conditions outlined the respective license of each component.
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go
deleted file mode 100644
index 1e87b826df..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package convey
-
-import "github.com/smartystreets/assertions"
-
-var (
-	ShouldEqual          = assertions.ShouldEqual
-	ShouldNotEqual       = assertions.ShouldNotEqual
-	ShouldAlmostEqual    = assertions.ShouldAlmostEqual
-	ShouldNotAlmostEqual = assertions.ShouldNotAlmostEqual
-	ShouldResemble       = assertions.ShouldResemble
-	ShouldNotResemble    = assertions.ShouldNotResemble
-	ShouldPointTo        = assertions.ShouldPointTo
-	ShouldNotPointTo     = assertions.ShouldNotPointTo
-	ShouldBeNil          = assertions.ShouldBeNil
-	ShouldNotBeNil       = assertions.ShouldNotBeNil
-	ShouldBeTrue         = assertions.ShouldBeTrue
-	ShouldBeFalse        = assertions.ShouldBeFalse
-	ShouldBeZeroValue    = assertions.ShouldBeZeroValue
-
-	ShouldBeGreaterThan          = assertions.ShouldBeGreaterThan
-	ShouldBeGreaterThanOrEqualTo = assertions.ShouldBeGreaterThanOrEqualTo
-	ShouldBeLessThan             = assertions.ShouldBeLessThan
-	ShouldBeLessThanOrEqualTo    = assertions.ShouldBeLessThanOrEqualTo
-	ShouldBeBetween              = assertions.ShouldBeBetween
-	ShouldNotBeBetween           = assertions.ShouldNotBeBetween
-	ShouldBeBetweenOrEqual       = assertions.ShouldBeBetweenOrEqual
-	ShouldNotBeBetweenOrEqual    = assertions.ShouldNotBeBetweenOrEqual
-
-	ShouldContain       = assertions.ShouldContain
-	ShouldNotContain    = assertions.ShouldNotContain
-	ShouldContainKey    = assertions.ShouldContainKey
-	ShouldNotContainKey = assertions.ShouldNotContainKey
-	ShouldBeIn          = assertions.ShouldBeIn
-	ShouldNotBeIn       = assertions.ShouldNotBeIn
-	ShouldBeEmpty       = assertions.ShouldBeEmpty
-	ShouldNotBeEmpty    = assertions.ShouldNotBeEmpty
-	ShouldHaveLength    = assertions.ShouldHaveLength
-
-	ShouldStartWith           = assertions.ShouldStartWith
-	ShouldNotStartWith        = assertions.ShouldNotStartWith
-	ShouldEndWith             = assertions.ShouldEndWith
-	ShouldNotEndWith          = assertions.ShouldNotEndWith
-	ShouldBeBlank             = assertions.ShouldBeBlank
-	ShouldNotBeBlank          = assertions.ShouldNotBeBlank
-	ShouldContainSubstring    = assertions.ShouldContainSubstring
-	ShouldNotContainSubstring = assertions.ShouldNotContainSubstring
-
-	ShouldPanic        = assertions.ShouldPanic
-	ShouldNotPanic     = assertions.ShouldNotPanic
-	ShouldPanicWith    = assertions.ShouldPanicWith
-	ShouldNotPanicWith = assertions.ShouldNotPanicWith
-
-	ShouldHaveSameTypeAs    = assertions.ShouldHaveSameTypeAs
-	ShouldNotHaveSameTypeAs = assertions.ShouldNotHaveSameTypeAs
-	ShouldImplement         = assertions.ShouldImplement
-	ShouldNotImplement      = assertions.ShouldNotImplement
-
-	ShouldHappenBefore         = assertions.ShouldHappenBefore
-	ShouldHappenOnOrBefore     = assertions.ShouldHappenOnOrBefore
-	ShouldHappenAfter          = assertions.ShouldHappenAfter
-	ShouldHappenOnOrAfter      = assertions.ShouldHappenOnOrAfter
-	ShouldHappenBetween        = assertions.ShouldHappenBetween
-	ShouldHappenOnOrBetween    = assertions.ShouldHappenOnOrBetween
-	ShouldNotHappenOnOrBetween = assertions.ShouldNotHappenOnOrBetween
-	ShouldHappenWithin         = assertions.ShouldHappenWithin
-	ShouldNotHappenWithin      = assertions.ShouldNotHappenWithin
-	ShouldBeChronological      = assertions.ShouldBeChronological
-)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go
deleted file mode 100644
index 2c75c2d7b1..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go
+++ /dev/null
@@ -1,272 +0,0 @@
-package convey
-
-import (
-	"fmt"
-
-	"github.com/jtolds/gls"
-	"github.com/smartystreets/goconvey/convey/reporting"
-)
-
-type conveyErr struct {
-	fmt    string
-	params []interface{}
-}
-
-func (e *conveyErr) Error() string {
-	return fmt.Sprintf(e.fmt, e.params...)
-}
-
-func conveyPanic(fmt string, params ...interface{}) {
-	panic(&conveyErr{fmt, params})
-}
-
-const (
-	missingGoTest = `Top-level calls to Convey(...) need a reference to the *testing.T.
-		Hint: Convey("description here", t, func() { /* notice that the second argument was the *testing.T (t)! */ }) `
-	extraGoTest    = `Only the top-level call to Convey(...) needs a reference to the *testing.T.`
-	noStackContext = "Convey operation made without context on goroutine stack.\n" +
-		"Hint: Perhaps you meant to use `Convey(..., func(c C){...})` ?"
-	differentConveySituations = "Different set of Convey statements on subsequent pass!\nDid not expect %#v."
-	multipleIdenticalConvey   = "Multiple convey suites with identical names: %#v"
-)
-
-const (
-	failureHalt = "___FAILURE_HALT___"
-
-	nodeKey = "node"
-)
-
-///////////////////////////////// Stack Context /////////////////////////////////
-
-func getCurrentContext() *context {
-	ctx, ok := ctxMgr.GetValue(nodeKey)
-	if ok {
-		return ctx.(*context)
-	}
-	return nil
-}
-
-func mustGetCurrentContext() *context {
-	ctx := getCurrentContext()
-	if ctx == nil {
-		conveyPanic(noStackContext)
-	}
-	return ctx
-}
-
-//////////////////////////////////// Context ////////////////////////////////////
-
-// context magically handles all coordination of Convey's and So assertions.
-//
-// It is tracked on the stack as goroutine-local-storage with the gls package,
-// or explicitly if the user decides to call convey like:
-//
-//   Convey(..., func(c C) {
-//     c.So(...)
-//   })
-//
-// This implements the `C` interface.
-type context struct {
-	reporter reporting.Reporter
-
-	children map[string]*context
-
-	resets []func()
-
-	executedOnce   bool
-	expectChildRun *bool
-	complete       bool
-
-	focus       bool
-	failureMode FailureMode
-}
-
-// rootConvey is the main entry point to a test suite. This is called when
-// there's no context in the stack already, and items must contain a `t` object,
-// or this panics.
-func rootConvey(items ...interface{}) {
-	entry := discover(items)
-
-	if entry.Test == nil {
-		conveyPanic(missingGoTest)
-	}
-
-	expectChildRun := true
-	ctx := &context{
-		reporter: buildReporter(),
-
-		children: make(map[string]*context),
-
-		expectChildRun: &expectChildRun,
-
-		focus:       entry.Focus,
-		failureMode: defaultFailureMode.combine(entry.FailMode),
-	}
-	ctxMgr.SetValues(gls.Values{nodeKey: ctx}, func() {
-		ctx.reporter.BeginStory(reporting.NewStoryReport(entry.Test))
-		defer ctx.reporter.EndStory()
-
-		for ctx.shouldVisit() {
-			ctx.conveyInner(entry.Situation, entry.Func)
-			expectChildRun = true
-		}
-	})
-}
-
-//////////////////////////////////// Methods ////////////////////////////////////
-
-func (ctx *context) SkipConvey(items ...interface{}) {
-	ctx.Convey(items, skipConvey)
-}
-
-func (ctx *context) FocusConvey(items ...interface{}) {
-	ctx.Convey(items, focusConvey)
-}
-
-func (ctx *context) Convey(items ...interface{}) {
-	entry := discover(items)
-
-	// we're a branch, or leaf (on the wind)
-	if entry.Test != nil {
-		conveyPanic(extraGoTest)
-	}
-	if ctx.focus && !entry.Focus {
-		return
-	}
-
-	var inner_ctx *context
-	if ctx.executedOnce {
-		var ok bool
-		inner_ctx, ok = ctx.children[entry.Situation]
-		if !ok {
-			conveyPanic(differentConveySituations, entry.Situation)
-		}
-	} else {
-		if _, ok := ctx.children[entry.Situation]; ok {
-			conveyPanic(multipleIdenticalConvey, entry.Situation)
-		}
-		inner_ctx = &context{
-			reporter: ctx.reporter,
-
-			children: make(map[string]*context),
-
-			expectChildRun: ctx.expectChildRun,
-
-			focus:       entry.Focus,
-			failureMode: ctx.failureMode.combine(entry.FailMode),
-		}
-		ctx.children[entry.Situation] = inner_ctx
-	}
-
-	if inner_ctx.shouldVisit() {
-		ctxMgr.SetValues(gls.Values{nodeKey: inner_ctx}, func() {
-			inner_ctx.conveyInner(entry.Situation, entry.Func)
-		})
-	}
-}
-
-func (ctx *context) SkipSo(stuff ...interface{}) {
-	ctx.assertionReport(reporting.NewSkipReport())
-}
-
-func (ctx *context) So(actual interface{}, assert assertion, expected ...interface{}) {
-	if result := assert(actual, expected...); result == assertionSuccess {
-		ctx.assertionReport(reporting.NewSuccessReport())
-	} else {
-		ctx.assertionReport(reporting.NewFailureReport(result))
-	}
-}
-
-func (ctx *context) Reset(action func()) {
-	/* TODO: Failure mode configuration */
-	ctx.resets = append(ctx.resets, action)
-}
-
-func (ctx *context) Print(items ...interface{}) (int, error) {
-	fmt.Fprint(ctx.reporter, items...)
-	return fmt.Print(items...)
-}
-
-func (ctx *context) Println(items ...interface{}) (int, error) {
-	fmt.Fprintln(ctx.reporter, items...)
-	return fmt.Println(items...)
-}
-
-func (ctx *context) Printf(format string, items ...interface{}) (int, error) {
-	fmt.Fprintf(ctx.reporter, format, items...)
-	return fmt.Printf(format, items...)
-}
-
-//////////////////////////////////// Private ////////////////////////////////////
-
-// shouldVisit returns true iff we should traverse down into a Convey. Note
-// that just because we don't traverse a Convey this time, doesn't mean that
-// we may not traverse it on a subsequent pass.
-func (c *context) shouldVisit() bool {
-	return !c.complete && *c.expectChildRun
-}
-
-// conveyInner is the function which actually executes the user's anonymous test
-// function body. At this point, Convey or RootConvey has decided that this
-// function should actually run.
-func (ctx *context) conveyInner(situation string, f func(C)) {
-	// Record/Reset state for next time.
-	defer func() {
-		ctx.executedOnce = true
-
-		// This is only needed at the leaves, but there's no harm in also setting it
-		// when returning from branch Convey's
-		*ctx.expectChildRun = false
-	}()
-
-	// Set up+tear down our scope for the reporter
-	ctx.reporter.Enter(reporting.NewScopeReport(situation))
-	defer ctx.reporter.Exit()
-
-	// Recover from any panics in f, and assign the `complete` status for this
-	// node of the tree.
-	defer func() {
-		ctx.complete = true
-		if problem := recover(); problem != nil {
-			if problem, ok := problem.(*conveyErr); ok {
-				panic(problem)
-			}
-			if problem != failureHalt {
-				ctx.reporter.Report(reporting.NewErrorReport(problem))
-			}
-		} else {
-			for _, child := range ctx.children {
-				if !child.complete {
-					ctx.complete = false
-					return
-				}
-			}
-		}
-	}()
-
-	// Resets are registered as the `f` function executes, so nil them here.
-	// All resets are run in registration order (FIFO).
-	ctx.resets = []func(){}
-	defer func() {
-		for _, r := range ctx.resets {
-			// panics handled by the previous defer
-			r()
-		}
-	}()
-
-	if f == nil {
-		// if f is nil, this was either a Convey(..., nil), or a SkipConvey
-		ctx.reporter.Report(reporting.NewSkipReport())
-	} else {
-		f(ctx)
-	}
-}
-
-// assertionReport is a helper for So and SkipSo which makes the report and
-// then possibly panics, depending on the current context's failureMode.
-func (ctx *context) assertionReport(r *reporting.AssertionResult) {
-	ctx.reporter.Report(r)
-	if r.Failure != "" && ctx.failureMode == FailureHalts {
-		panic(failureHalt)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey
deleted file mode 100644
index a2d9327dc9..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey
+++ /dev/null
@@ -1,4 +0,0 @@
-#ignore
--timeout=1s
-#-covermode=count
-#-coverpkg=github.com/smartystreets/goconvey/convey,github.com/smartystreets/goconvey/convey/gotest,github.com/smartystreets/goconvey/convey/reporting
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go
deleted file mode 100644
index eb8d4cb2ce..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package convey
-
-type actionSpecifier uint8
-
-const (
-	noSpecifier actionSpecifier = iota
-	skipConvey
-	focusConvey
-)
-
-type suite struct {
-	Situation string
-	Test      t
-	Focus     bool
-	Func      func(C) // nil means skipped
-	FailMode  FailureMode
-}
-
-func newSuite(situation string, failureMode FailureMode, f func(C), test t, specifier actionSpecifier) *suite {
-	ret := &suite{
-		Situation: situation,
-		Test:      test,
-		Func:      f,
-		FailMode:  failureMode,
-	}
-	switch specifier {
-	case skipConvey:
-		ret.Func = nil
-	case focusConvey:
-		ret.Focus = true
-	}
-	return ret
-}
-
-func discover(items []interface{}) *suite {
-	name, items := parseName(items)
-	test, items := parseGoTest(items)
-	failure, items := parseFailureMode(items)
-	action, items := parseAction(items)
-	specifier, items := parseSpecifier(items)
-
-	if len(items) != 0 {
-		conveyPanic(parseError)
-	}
-
-	return newSuite(name, failure, action, test, specifier)
-}
-func item(items []interface{}) interface{} {
-	if len(items) == 0 {
-		conveyPanic(parseError)
-	}
-	return items[0]
-}
-func parseName(items []interface{}) (string, []interface{}) {
-	if name, parsed := item(items).(string); parsed {
-		return name, items[1:]
-	}
-	conveyPanic(parseError)
-	panic("never get here")
-}
-func parseGoTest(items []interface{}) (t, []interface{}) {
-	if test, parsed := item(items).(t); parsed {
-		return test, items[1:]
-	}
-	return nil, items
-}
-func parseFailureMode(items []interface{}) (FailureMode, []interface{}) {
-	if mode, parsed := item(items).(FailureMode); parsed {
-		return mode, items[1:]
-	}
-	return FailureInherits, items
-}
-func parseAction(items []interface{}) (func(C), []interface{}) {
-	switch x := item(items).(type) {
-	case nil:
-		return nil, items[1:]
-	case func(C):
-		return x, items[1:]
-	case func():
-		return func(C) { x() }, items[1:]
-	}
-	conveyPanic(parseError)
-	panic("never get here")
-}
-func parseSpecifier(items []interface{}) (actionSpecifier, []interface{}) {
-	if len(items) == 0 {
-		return noSpecifier, items
-	}
-	if spec, ok := items[0].(actionSpecifier); ok {
-		return spec, items[1:]
-	}
-	conveyPanic(parseError)
-	panic("never get here")
-}
-
-// This interface allows us to pass the *testing.T struct
-// throughout the internals of this package without ever
-// having to import the "testing" package.
-type t interface {
-	Fail()
-}
-
-const parseError = "You must provide a name (string), then a *testing.T (if in outermost scope), an optional FailureMode, and then an action (func())."
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go
deleted file mode 100644
index 2562ce4c28..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Package convey contains all of the public-facing entry points to this project.
-// This means that it should never be required of the user to import any other
-// packages from this project as they serve internal purposes.
-package convey
-
-import "github.com/smartystreets/goconvey/convey/reporting"
-
-////////////////////////////////// suite //////////////////////////////////
-
-// C is the Convey context which you can optionally obtain in your action
-// by calling Convey like:
-//
-//   Convey(..., func(c C) {
-//     ...
-//   })
-//
-// See the documentation on Convey for more details.
-//
-// All methods in this context behave identically to the global functions of the
-// same name in this package.
-type C interface {
-	Convey(items ...interface{})
-	SkipConvey(items ...interface{})
-	FocusConvey(items ...interface{})
-
-	So(actual interface{}, assert assertion, expected ...interface{})
-	SkipSo(stuff ...interface{})
-
-	Reset(action func())
-
-	Println(items ...interface{}) (int, error)
-	Print(items ...interface{}) (int, error)
-	Printf(format string, items ...interface{}) (int, error)
-}
-
-// Convey is the method intended for use when declaring the scopes of
-// a specification. Each scope has a description and a func() which may contain
-// other calls to Convey(), Reset() or Should-style assertions. Convey calls can
-// be nested as far as you see fit.
-//
-// IMPORTANT NOTE: The top-level Convey() within a Test method
-// must conform to the following signature:
-//
-//     Convey(description string, t *testing.T, action func())
-//
-// All other calls should look like this (no need to pass in *testing.T):
-//
-//     Convey(description string, action func())
-//
-// Don't worry, goconvey will panic if you get it wrong so you can fix it.
-//
-// Additionally, you may explicitly obtain access to the Convey context by doing:
-//
-//     Convey(description string, action func(c C))
-//
-// You may need to do this if you want to pass the context through to a
-// goroutine, or to close over the context in a handler to a library which
-// calls your handler in a goroutine (httptest comes to mind).
-//
-// All Convey()-blocks also accept an optional parameter of FailureMode which sets
-// how goconvey should treat failures for So()-assertions in the block and
-// nested blocks. See the constants in this file for the available options.
-//
-// By default it will inherit from its parent block and the top-level blocks
-// default to the FailureHalts setting.
-//
-// This parameter is inserted before the block itself:
-//
-//     Convey(description string, t *testing.T, mode FailureMode, action func())
-//     Convey(description string, mode FailureMode, action func())
-//
-// See the examples package for, well, examples.
-func Convey(items ...interface{}) {
-	if ctx := getCurrentContext(); ctx == nil {
-		rootConvey(items...)
-	} else {
-		ctx.Convey(items...)
-	}
-}
-
-// SkipConvey is analagous to Convey except that the scope is not executed
-// (which means that child scopes defined within this scope are not run either).
-// The reporter will be notified that this step was skipped.
-func SkipConvey(items ...interface{}) {
-	Convey(append(items, skipConvey)...)
-}
-
-// FocusConvey is has the inverse effect of SkipConvey. If the top-level
-// Convey is changed to `FocusConvey`, only nested scopes that are defined
-// with FocusConvey will be run. The rest will be ignored completely. This
-// is handy when debugging a large suite that runs a misbehaving function
-// repeatedly as you can disable all but one of that function
-// without swaths of `SkipConvey` calls, just a targeted chain of calls
-// to FocusConvey.
-func FocusConvey(items ...interface{}) {
-	Convey(append(items, focusConvey)...)
-}
-
-// Reset registers a cleanup function to be run after each Convey()
-// in the same scope. See the examples package for a simple use case.
-func Reset(action func()) {
-	mustGetCurrentContext().Reset(action)
-}
-
-/////////////////////////////////// Assertions ///////////////////////////////////
-
-// assertion is an alias for a function with a signature that the convey.So()
-// method can handle. Any future or custom assertions should conform to this
-// method signature. The return value should be an empty string if the assertion
-// passes and a well-formed failure message if not.
-type assertion func(actual interface{}, expected ...interface{}) string
-
-const assertionSuccess = ""
-
-// So is the means by which assertions are made against the system under test.
-// The majority of exported names in the assertions package begin with the word
-// 'Should' and describe how the first argument (actual) should compare with any
-// of the final (expected) arguments. How many final arguments are accepted
-// depends on the particular assertion that is passed in as the assert argument.
-// See the examples package for use cases and the assertions package for
-// documentation on specific assertion methods. A failing assertion will
-// cause t.Fail() to be invoked--you should never call this method (or other
-// failure-inducing methods) in your test code. Leave that to GoConvey.
-func So(actual interface{}, assert assertion, expected ...interface{}) {
-	mustGetCurrentContext().So(actual, assert, expected...)
-}
-
-// SkipSo is analagous to So except that the assertion that would have been passed
-// to So is not executed and the reporter is notified that the assertion was skipped.
-func SkipSo(stuff ...interface{}) {
-	mustGetCurrentContext().SkipSo()
-}
-
-// FailureMode is a type which determines how the So() blocks should fail
-// if their assertion fails. See constants further down for acceptable values
-type FailureMode string
-
-const (
-
-	// FailureContinues is a failure mode which prevents failing
-	// So()-assertions from halting Convey-block execution, instead
-	// allowing the test to continue past failing So()-assertions.
-	FailureContinues FailureMode = "continue"
-
-	// FailureHalts is the default setting for a top-level Convey()-block
-	// and will cause all failing So()-assertions to halt further execution
-	// in that test-arm and continue on to the next arm.
-	FailureHalts FailureMode = "halt"
-
-	// FailureInherits is the default setting for failure-mode, it will
-	// default to the failure-mode of the parent block. You should never
-	// need to specify this mode in your tests..
-	FailureInherits FailureMode = "inherits"
-)
-
-func (f FailureMode) combine(other FailureMode) FailureMode {
-	if other == FailureInherits {
-		return f
-	}
-	return other
-}
-
-var defaultFailureMode FailureMode = FailureHalts
-
-// SetDefaultFailureMode allows you to specify the default failure mode
-// for all Convey blocks. It is meant to be used in an init function to
-// allow the default mode to be changdd across all tests for an entire packgae
-// but it can be used anywhere.
-func SetDefaultFailureMode(mode FailureMode) {
-	if mode == FailureContinues || mode == FailureHalts {
-		defaultFailureMode = mode
-	} else {
-		panic("You may only use the constants named 'FailureContinues' and 'FailureHalts' as default failure modes.")
-	}
-}
-
-//////////////////////////////////// Print functions ////////////////////////////////////
-
-// Print is analogous to fmt.Print (and it even calls fmt.Print). It ensures that
-// output is aligned with the corresponding scopes in the web UI.
-func Print(items ...interface{}) (written int, err error) {
-	return mustGetCurrentContext().Print(items...)
-}
-
-// Print is analogous to fmt.Println (and it even calls fmt.Println). It ensures that
-// output is aligned with the corresponding scopes in the web UI.
-func Println(items ...interface{}) (written int, err error) {
-	return mustGetCurrentContext().Println(items...)
-}
-
-// Print is analogous to fmt.Printf (and it even calls fmt.Printf). It ensures that
-// output is aligned with the corresponding scopes in the web UI.
-func Printf(format string, items ...interface{}) (written int, err error) {
-	return mustGetCurrentContext().Printf(format, items...)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-// SuppressConsoleStatistics prevents automatic printing of console statistics.
-// Calling PrintConsoleStatistics explicitly will force printing of statistics.
-func SuppressConsoleStatistics() {
-	reporting.SuppressConsoleStatistics()
-}
-
-// ConsoleStatistics may be called at any time to print assertion statistics.
-// Generally, the best place to do this would be in a TestMain function,
-// after all tests have been run. Something like this:
-//
-// func TestMain(m *testing.M) {
-//     convey.SuppressConsoleStatistics()
-//     result := m.Run()
-//     convey.PrintConsoleStatistics()
-//     os.Exit(result)
-// }
-//
-func PrintConsoleStatistics() {
-	reporting.PrintConsoleStatistics()
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go
deleted file mode 100644
index 3a5c848a44..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Package gotest contains internal functionality. Although this package
-// contains one or more exported names it is not intended for public
-// consumption. See the examples package for how to use this project.
-package gotest
-
-import (
-	"runtime"
-	"strings"
-)
-
-func ResolveExternalCaller() (file string, line int, name string) {
-	var caller_id uintptr
-	callers := runtime.Callers(0, callStack)
-
-	for x := 0; x < callers; x++ {
-		caller_id, file, line, _ = runtime.Caller(x)
-		if strings.HasSuffix(file, "_test.go") || strings.HasSuffix(file, "_tests.go") {
-			name = runtime.FuncForPC(caller_id).Name()
-			return
-		}
-	}
-	file, line, name = "<unkown file>", -1, "<unknown name>"
-	return // panic?
-}
-
-const maxStackDepth = 100 // This had better be enough...
-
-var callStack []uintptr = make([]uintptr, maxStackDepth, maxStackDepth)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go
deleted file mode 100644
index 1d77ff3dcd..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package convey
-
-import (
-	"flag"
-	"os"
-
-	"github.com/jtolds/gls"
-	"github.com/smartystreets/assertions"
-	"github.com/smartystreets/goconvey/convey/reporting"
-)
-
-func init() {
-	assertions.GoConveyMode(true)
-
-	declareFlags()
-
-	ctxMgr = gls.NewContextManager()
-}
-
-func declareFlags() {
-	flag.BoolVar(&json, "convey-json", false, "When true, emits results in JSON blocks. Default: 'false'")
-	flag.BoolVar(&silent, "convey-silent", false, "When true, all output from GoConvey is suppressed.")
-	flag.BoolVar(&story, "convey-story", false, "When true, emits story output, otherwise emits dot output. When not provided, this flag mirros the value of the '-test.v' flag")
-
-	if noStoryFlagProvided() {
-		story = verboseEnabled
-	}
-
-	// FYI: flag.Parse() is called from the testing package.
-}
-
-func noStoryFlagProvided() bool {
-	return !story && !storyDisabled
-}
-
-func buildReporter() reporting.Reporter {
-	selectReporter := os.Getenv("GOCONVEY_REPORTER")
-
-	switch {
-	case testReporter != nil:
-		return testReporter
-	case json || selectReporter == "json":
-		return reporting.BuildJsonReporter()
-	case silent || selectReporter == "silent":
-		return reporting.BuildSilentReporter()
-	case selectReporter == "dot":
-		// Story is turned on when verbose is set, so we need to check for dot reporter first.
-		return reporting.BuildDotReporter()
-	case story || selectReporter == "story":
-		return reporting.BuildStoryReporter()
-	default:
-		return reporting.BuildDotReporter()
-	}
-}
-
-var (
-	ctxMgr *gls.ContextManager
-
-	// only set by internal tests
-	testReporter reporting.Reporter
-)
-
-var (
-	json   bool
-	silent bool
-	story  bool
-
-	verboseEnabled = flagFound("-test.v=true")
-	storyDisabled  = flagFound("-story=false")
-)
-
-// flagFound parses the command line args manually for flags defined in other
-// packages. Like the '-v' flag from the "testing" package, for instance.
-func flagFound(flagValue string) bool {
-	for _, arg := range os.Args {
-		if arg == flagValue {
-			return true
-		}
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go
deleted file mode 100644
index 777b2a5122..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package convey
-
-import (
-	"github.com/smartystreets/goconvey/convey/reporting"
-)
-
-type nilReporter struct{}
-
-func (self *nilReporter) BeginStory(story *reporting.StoryReport)  {}
-func (self *nilReporter) Enter(scope *reporting.ScopeReport)       {}
-func (self *nilReporter) Report(report *reporting.AssertionResult) {}
-func (self *nilReporter) Exit()                                    {}
-func (self *nilReporter) EndStory()                                {}
-func (self *nilReporter) Write(p []byte) (int, error)              { return len(p), nil }
-func newNilReporter() *nilReporter                                 { return &nilReporter{} }
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go
deleted file mode 100644
index 7bf67dbb2b..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package reporting
-
-import (
-	"fmt"
-	"io"
-)
-
-type console struct{}
-
-func (self *console) Write(p []byte) (n int, err error) {
-	return fmt.Print(string(p))
-}
-
-func NewConsole() io.Writer {
-	return new(console)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go
deleted file mode 100644
index a37d001946..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Package reporting contains internal functionality related
-// to console reporting and output. Although this package has
-// exported names is not intended for public consumption. See the
-// examples package for how to use this project.
-package reporting
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go
deleted file mode 100644
index 47d57c6b0d..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package reporting
-
-import "fmt"
-
-type dot struct{ out *Printer }
-
-func (self *dot) BeginStory(story *StoryReport) {}
-
-func (self *dot) Enter(scope *ScopeReport) {}
-
-func (self *dot) Report(report *AssertionResult) {
-	if report.Error != nil {
-		fmt.Print(redColor)
-		self.out.Insert(dotError)
-	} else if report.Failure != "" {
-		fmt.Print(yellowColor)
-		self.out.Insert(dotFailure)
-	} else if report.Skipped {
-		fmt.Print(yellowColor)
-		self.out.Insert(dotSkip)
-	} else {
-		fmt.Print(greenColor)
-		self.out.Insert(dotSuccess)
-	}
-	fmt.Print(resetColor)
-}
-
-func (self *dot) Exit() {}
-
-func (self *dot) EndStory() {}
-
-func (self *dot) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewDotReporter(out *Printer) *dot {
-	self := new(dot)
-	self.out = out
-	return self
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go
deleted file mode 100644
index c396e16b17..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package reporting
-
-type gotestReporter struct{ test T }
-
-func (self *gotestReporter) BeginStory(story *StoryReport) {
-	self.test = story.Test
-}
-
-func (self *gotestReporter) Enter(scope *ScopeReport) {}
-
-func (self *gotestReporter) Report(r *AssertionResult) {
-	if !passed(r) {
-		self.test.Fail()
-	}
-}
-
-func (self *gotestReporter) Exit() {}
-
-func (self *gotestReporter) EndStory() {
-	self.test = nil
-}
-
-func (self *gotestReporter) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewGoTestReporter() *gotestReporter {
-	return new(gotestReporter)
-}
-
-func passed(r *AssertionResult) bool {
-	return r.Error == nil && r.Failure == ""
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go
deleted file mode 100644
index 44d080e90e..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package reporting
-
-import (
-	"os"
-	"runtime"
-	"strings"
-)
-
-func init() {
-	if !isColorableTerminal() {
-		monochrome()
-	}
-
-	if runtime.GOOS == "windows" {
-		success, failure, error_ = dotSuccess, dotFailure, dotError
-	}
-}
-
-func BuildJsonReporter() Reporter {
-	out := NewPrinter(NewConsole())
-	return NewReporters(
-		NewGoTestReporter(),
-		NewJsonReporter(out))
-}
-func BuildDotReporter() Reporter {
-	out := NewPrinter(NewConsole())
-	return NewReporters(
-		NewGoTestReporter(),
-		NewDotReporter(out),
-		NewProblemReporter(out),
-		consoleStatistics)
-}
-func BuildStoryReporter() Reporter {
-	out := NewPrinter(NewConsole())
-	return NewReporters(
-		NewGoTestReporter(),
-		NewStoryReporter(out),
-		NewProblemReporter(out),
-		consoleStatistics)
-}
-func BuildSilentReporter() Reporter {
-	out := NewPrinter(NewConsole())
-	return NewReporters(
-		NewGoTestReporter(),
-		NewSilentProblemReporter(out))
-}
-
-var (
-	newline         = "\n"
-	success         = "✔"
-	failure         = "✘"
-	error_          = "🔥"
-	skip            = "⚠"
-	dotSuccess      = "."
-	dotFailure      = "x"
-	dotError        = "E"
-	dotSkip         = "S"
-	errorTemplate   = "* %s \nLine %d: - %v \n%s\n"
-	failureTemplate = "* %s \nLine %d:\n%s\n"
-)
-
-var (
-	greenColor  = "\033[32m"
-	yellowColor = "\033[33m"
-	redColor    = "\033[31m"
-	resetColor  = "\033[0m"
-)
-
-var consoleStatistics = NewStatisticsReporter(NewPrinter(NewConsole()))
-
-func SuppressConsoleStatistics() { consoleStatistics.Suppress() }
-func PrintConsoleStatistics()    { consoleStatistics.PrintSummary() }
-
-// QuiteMode disables all console output symbols. This is only meant to be used
-// for tests that are internal to goconvey where the output is distracting or
-// otherwise not needed in the test output.
-func QuietMode() {
-	success, failure, error_, skip, dotSuccess, dotFailure, dotError, dotSkip = "", "", "", "", "", "", "", ""
-}
-
-func monochrome() {
-	greenColor, yellowColor, redColor, resetColor = "", "", "", ""
-}
-
-func isColorableTerminal() bool {
-	return strings.Contains(os.Getenv("TERM"), "color")
-}
-
-// This interface allows us to pass the *testing.T struct
-// throughout the internals of this tool without ever
-// having to import the "testing" package.
-type T interface {
-	Fail()
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go
deleted file mode 100644
index f8526979f8..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// TODO: under unit test
-
-package reporting
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
-type JsonReporter struct {
-	out        *Printer
-	currentKey []string
-	current    *ScopeResult
-	index      map[string]*ScopeResult
-	scopes     []*ScopeResult
-}
-
-func (self *JsonReporter) depth() int { return len(self.currentKey) }
-
-func (self *JsonReporter) BeginStory(story *StoryReport) {}
-
-func (self *JsonReporter) Enter(scope *ScopeReport) {
-	self.currentKey = append(self.currentKey, scope.Title)
-	ID := strings.Join(self.currentKey, "|")
-	if _, found := self.index[ID]; !found {
-		next := newScopeResult(scope.Title, self.depth(), scope.File, scope.Line)
-		self.scopes = append(self.scopes, next)
-		self.index[ID] = next
-	}
-	self.current = self.index[ID]
-}
-
-func (self *JsonReporter) Report(report *AssertionResult) {
-	self.current.Assertions = append(self.current.Assertions, report)
-}
-
-func (self *JsonReporter) Exit() {
-	self.currentKey = self.currentKey[:len(self.currentKey)-1]
-}
-
-func (self *JsonReporter) EndStory() {
-	self.report()
-	self.reset()
-}
-func (self *JsonReporter) report() {
-	scopes := []string{}
-	for _, scope := range self.scopes {
-		serialized, err := json.Marshal(scope)
-		if err != nil {
-			self.out.Println(jsonMarshalFailure)
-			panic(err)
-		}
-		var buffer bytes.Buffer
-		json.Indent(&buffer, serialized, "", "  ")
-		scopes = append(scopes, buffer.String())
-	}
-	self.out.Print(fmt.Sprintf("%s\n%s,\n%s\n", OpenJson, strings.Join(scopes, ","), CloseJson))
-}
-func (self *JsonReporter) reset() {
-	self.scopes = []*ScopeResult{}
-	self.index = map[string]*ScopeResult{}
-	self.currentKey = nil
-}
-
-func (self *JsonReporter) Write(content []byte) (written int, err error) {
-	self.current.Output += string(content)
-	return len(content), nil
-}
-
-func NewJsonReporter(out *Printer) *JsonReporter {
-	self := new(JsonReporter)
-	self.out = out
-	self.reset()
-	return self
-}
-
-const OpenJson = ">->->OPEN-JSON->->->"   // "⌦"
-const CloseJson = "<-<-<-CLOSE-JSON<-<-<" // "⌫"
-const jsonMarshalFailure = `
-
-GOCONVEY_JSON_MARSHALL_FAILURE: There was an error when attempting to convert test results to JSON.
-Please file a bug report and reference the code that caused this failure if possible.
-
-Here's the panic:
-
-`
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go
deleted file mode 100644
index 6d4a879c40..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package reporting
-
-import (
-	"fmt"
-	"io"
-	"strings"
-)
-
-type Printer struct {
-	out    io.Writer
-	prefix string
-}
-
-func (self *Printer) Println(message string, values ...interface{}) {
-	formatted := self.format(message, values...) + newline
-	self.out.Write([]byte(formatted))
-}
-
-func (self *Printer) Print(message string, values ...interface{}) {
-	formatted := self.format(message, values...)
-	self.out.Write([]byte(formatted))
-}
-
-func (self *Printer) Insert(text string) {
-	self.out.Write([]byte(text))
-}
-
-func (self *Printer) format(message string, values ...interface{}) string {
-	var formatted string
-	if len(values) == 0 {
-		formatted = self.prefix + message
-	} else {
-		formatted = self.prefix + fmt.Sprintf(message, values...)
-	}
-	indented := strings.Replace(formatted, newline, newline+self.prefix, -1)
-	return strings.TrimRight(indented, space)
-}
-
-func (self *Printer) Indent() {
-	self.prefix += pad
-}
-
-func (self *Printer) Dedent() {
-	if len(self.prefix) >= padLength {
-		self.prefix = self.prefix[:len(self.prefix)-padLength]
-	}
-}
-
-func NewPrinter(out io.Writer) *Printer {
-	self := new(Printer)
-	self.out = out
-	return self
-}
-
-const space = " "
-const pad = space + space
-const padLength = len(pad)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go
deleted file mode 100644
index 9ae493ac3b..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package reporting
-
-import "fmt"
-
-type problem struct {
-	silent   bool
-	out      *Printer
-	errors   []*AssertionResult
-	failures []*AssertionResult
-}
-
-func (self *problem) BeginStory(story *StoryReport) {}
-
-func (self *problem) Enter(scope *ScopeReport) {}
-
-func (self *problem) Report(report *AssertionResult) {
-	if report.Error != nil {
-		self.errors = append(self.errors, report)
-	} else if report.Failure != "" {
-		self.failures = append(self.failures, report)
-	}
-}
-
-func (self *problem) Exit() {}
-
-func (self *problem) EndStory() {
-	self.show(self.showErrors, redColor)
-	self.show(self.showFailures, yellowColor)
-	self.prepareForNextStory()
-}
-func (self *problem) show(display func(), color string) {
-	if !self.silent {
-		fmt.Print(color)
-	}
-	display()
-	if !self.silent {
-		fmt.Print(resetColor)
-	}
-	self.out.Dedent()
-}
-func (self *problem) showErrors() {
-	for i, e := range self.errors {
-		if i == 0 {
-			self.out.Println("\nErrors:\n")
-			self.out.Indent()
-		}
-		self.out.Println(errorTemplate, e.File, e.Line, e.Error, e.StackTrace)
-	}
-}
-func (self *problem) showFailures() {
-	for i, f := range self.failures {
-		if i == 0 {
-			self.out.Println("\nFailures:\n")
-			self.out.Indent()
-		}
-		self.out.Println(failureTemplate, f.File, f.Line, f.Failure)
-	}
-}
-
-func (self *problem) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewProblemReporter(out *Printer) *problem {
-	self := new(problem)
-	self.out = out
-	self.prepareForNextStory()
-	return self
-}
-
-func NewSilentProblemReporter(out *Printer) *problem {
-	self := NewProblemReporter(out)
-	self.silent = true
-	return self
-}
-
-func (self *problem) prepareForNextStory() {
-	self.errors = []*AssertionResult{}
-	self.failures = []*AssertionResult{}
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go
deleted file mode 100644
index cce6c5e438..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package reporting
-
-import "io"
-
-type Reporter interface {
-	BeginStory(story *StoryReport)
-	Enter(scope *ScopeReport)
-	Report(r *AssertionResult)
-	Exit()
-	EndStory()
-	io.Writer
-}
-
-type reporters struct{ collection []Reporter }
-
-func (self *reporters) BeginStory(s *StoryReport) { self.foreach(func(r Reporter) { r.BeginStory(s) }) }
-func (self *reporters) Enter(s *ScopeReport)      { self.foreach(func(r Reporter) { r.Enter(s) }) }
-func (self *reporters) Report(a *AssertionResult) { self.foreach(func(r Reporter) { r.Report(a) }) }
-func (self *reporters) Exit()                     { self.foreach(func(r Reporter) { r.Exit() }) }
-func (self *reporters) EndStory()                 { self.foreach(func(r Reporter) { r.EndStory() }) }
-
-func (self *reporters) Write(contents []byte) (written int, err error) {
-	self.foreach(func(r Reporter) {
-		written, err = r.Write(contents)
-	})
-	return written, err
-}
-
-func (self *reporters) foreach(action func(Reporter)) {
-	for _, r := range self.collection {
-		action(r)
-	}
-}
-
-func NewReporters(collection ...Reporter) *reporters {
-	self := new(reporters)
-	self.collection = collection
-	return self
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey
deleted file mode 100644
index 79982854b5..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey
+++ /dev/null
@@ -1,2 +0,0 @@
-#ignore
--timeout=1s
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go
deleted file mode 100644
index 712e6ade62..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go
+++ /dev/null
@@ -1,179 +0,0 @@
-package reporting
-
-import (
-	"encoding/json"
-	"fmt"
-	"runtime"
-	"strings"
-
-	"github.com/smartystreets/goconvey/convey/gotest"
-)
-
-////////////////// ScopeReport ////////////////////
-
-type ScopeReport struct {
-	Title string
-	File  string
-	Line  int
-}
-
-func NewScopeReport(title string) *ScopeReport {
-	file, line, _ := gotest.ResolveExternalCaller()
-	self := new(ScopeReport)
-	self.Title = title
-	self.File = file
-	self.Line = line
-	return self
-}
-
-////////////////// ScopeResult ////////////////////
-
-type ScopeResult struct {
-	Title      string
-	File       string
-	Line       int
-	Depth      int
-	Assertions []*AssertionResult
-	Output     string
-}
-
-func newScopeResult(title string, depth int, file string, line int) *ScopeResult {
-	self := new(ScopeResult)
-	self.Title = title
-	self.Depth = depth
-	self.File = file
-	self.Line = line
-	self.Assertions = []*AssertionResult{}
-	return self
-}
-
-/////////////////// StoryReport /////////////////////
-
-type StoryReport struct {
-	Test T
-	Name string
-	File string
-	Line int
-}
-
-func NewStoryReport(test T) *StoryReport {
-	file, line, name := gotest.ResolveExternalCaller()
-	name = removePackagePath(name)
-	self := new(StoryReport)
-	self.Test = test
-	self.Name = name
-	self.File = file
-	self.Line = line
-	return self
-}
-
-// name comes in looking like "github.com/smartystreets/goconvey/examples.TestName".
-// We only want the stuff after the last '.', which is the name of the test function.
-func removePackagePath(name string) string {
-	parts := strings.Split(name, ".")
-	return parts[len(parts)-1]
-}
-
-/////////////////// FailureView ////////////////////////
-
-// This struct is also declared in github.com/smartystreets/assertions.
-// The json struct tags should be equal in both declarations.
-type FailureView struct {
-	Message  string `json:"Message"`
-	Expected string `json:"Expected"`
-	Actual   string `json:"Actual"`
-}
-
-////////////////////AssertionResult //////////////////////
-
-type AssertionResult struct {
-	File       string
-	Line       int
-	Expected   string
-	Actual     string
-	Failure    string
-	Error      interface{}
-	StackTrace string
-	Skipped    bool
-}
-
-func NewFailureReport(failure string) *AssertionResult {
-	report := new(AssertionResult)
-	report.File, report.Line = caller()
-	report.StackTrace = stackTrace()
-	parseFailure(failure, report)
-	return report
-}
-func parseFailure(failure string, report *AssertionResult) {
-	view := new(FailureView)
-	err := json.Unmarshal([]byte(failure), view)
-	if err == nil {
-		report.Failure = view.Message
-		report.Expected = view.Expected
-		report.Actual = view.Actual
-	} else {
-		report.Failure = failure
-	}
-}
-func NewErrorReport(err interface{}) *AssertionResult {
-	report := new(AssertionResult)
-	report.File, report.Line = caller()
-	report.StackTrace = fullStackTrace()
-	report.Error = fmt.Sprintf("%v", err)
-	return report
-}
-func NewSuccessReport() *AssertionResult {
-	return new(AssertionResult)
-}
-func NewSkipReport() *AssertionResult {
-	report := new(AssertionResult)
-	report.File, report.Line = caller()
-	report.StackTrace = fullStackTrace()
-	report.Skipped = true
-	return report
-}
-
-func caller() (file string, line int) {
-	file, line, _ = gotest.ResolveExternalCaller()
-	return
-}
-
-func stackTrace() string {
-	buffer := make([]byte, 1024*64)
-	n := runtime.Stack(buffer, false)
-	return removeInternalEntries(string(buffer[:n]))
-}
-func fullStackTrace() string {
-	buffer := make([]byte, 1024*64)
-	n := runtime.Stack(buffer, true)
-	return removeInternalEntries(string(buffer[:n]))
-}
-func removeInternalEntries(stack string) string {
-	lines := strings.Split(stack, newline)
-	filtered := []string{}
-	for _, line := range lines {
-		if !isExternal(line) {
-			filtered = append(filtered, line)
-		}
-	}
-	return strings.Join(filtered, newline)
-}
-func isExternal(line string) bool {
-	for _, p := range internalPackages {
-		if strings.Contains(line, p) {
-			return true
-		}
-	}
-	return false
-}
-
-// NOTE: any new packages that host goconvey packages will need to be added here!
-// An alternative is to scan the goconvey directory and then exclude stuff like
-// the examples package but that's nasty too.
-var internalPackages = []string{
-	"goconvey/assertions",
-	"goconvey/convey",
-	"goconvey/execution",
-	"goconvey/gotest",
-	"goconvey/reporting",
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go
deleted file mode 100644
index c3ccd056a0..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package reporting
-
-import (
-	"fmt"
-	"sync"
-)
-
-func (self *statistics) BeginStory(story *StoryReport) {}
-
-func (self *statistics) Enter(scope *ScopeReport) {}
-
-func (self *statistics) Report(report *AssertionResult) {
-	self.Lock()
-	defer self.Unlock()
-
-	if !self.failing && report.Failure != "" {
-		self.failing = true
-	}
-	if !self.erroring && report.Error != nil {
-		self.erroring = true
-	}
-	if report.Skipped {
-		self.skipped += 1
-	} else {
-		self.total++
-	}
-}
-
-func (self *statistics) Exit() {}
-
-func (self *statistics) EndStory() {
-	self.Lock()
-	defer self.Unlock()
-
-	if !self.suppressed {
-		self.printSummaryLocked()
-	}
-}
-
-func (self *statistics) Suppress() {
-	self.Lock()
-	defer self.Unlock()
-	self.suppressed = true
-}
-
-func (self *statistics) PrintSummary() {
-	self.Lock()
-	defer self.Unlock()
-	self.printSummaryLocked()
-}
-
-func (self *statistics) printSummaryLocked() {
-	self.reportAssertionsLocked()
-	self.reportSkippedSectionsLocked()
-	self.completeReportLocked()
-}
-func (self *statistics) reportAssertionsLocked() {
-	self.decideColorLocked()
-	self.out.Print("\n%d total %s", self.total, plural("assertion", self.total))
-}
-func (self *statistics) decideColorLocked() {
-	if self.failing && !self.erroring {
-		fmt.Print(yellowColor)
-	} else if self.erroring {
-		fmt.Print(redColor)
-	} else {
-		fmt.Print(greenColor)
-	}
-}
-func (self *statistics) reportSkippedSectionsLocked() {
-	if self.skipped > 0 {
-		fmt.Print(yellowColor)
-		self.out.Print(" (one or more sections skipped)")
-	}
-}
-func (self *statistics) completeReportLocked() {
-	fmt.Print(resetColor)
-	self.out.Print("\n")
-	self.out.Print("\n")
-}
-
-func (self *statistics) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewStatisticsReporter(out *Printer) *statistics {
-	self := statistics{}
-	self.out = out
-	return &self
-}
-
-type statistics struct {
-	sync.Mutex
-
-	out        *Printer
-	total      int
-	failing    bool
-	erroring   bool
-	skipped    int
-	suppressed bool
-}
-
-func plural(word string, count int) string {
-	if count == 1 {
-		return word
-	}
-	return word + "s"
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go
deleted file mode 100644
index 9e73c971f8..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// TODO: in order for this reporter to be completely honest
-// we need to retrofit to be more like the json reporter such that:
-// 1. it maintains ScopeResult collections, which count assertions
-// 2. it reports only after EndStory(), so that all tick marks
-//    are placed near the appropriate title.
-// 3. Under unit test
-
-package reporting
-
-import (
-	"fmt"
-	"strings"
-)
-
-type story struct {
-	out        *Printer
-	titlesById map[string]string
-	currentKey []string
-}
-
-func (self *story) BeginStory(story *StoryReport) {}
-
-func (self *story) Enter(scope *ScopeReport) {
-	self.out.Indent()
-
-	self.currentKey = append(self.currentKey, scope.Title)
-	ID := strings.Join(self.currentKey, "|")
-
-	if _, found := self.titlesById[ID]; !found {
-		self.out.Println("")
-		self.out.Print(scope.Title)
-		self.out.Insert(" ")
-		self.titlesById[ID] = scope.Title
-	}
-}
-
-func (self *story) Report(report *AssertionResult) {
-	if report.Error != nil {
-		fmt.Print(redColor)
-		self.out.Insert(error_)
-	} else if report.Failure != "" {
-		fmt.Print(yellowColor)
-		self.out.Insert(failure)
-	} else if report.Skipped {
-		fmt.Print(yellowColor)
-		self.out.Insert(skip)
-	} else {
-		fmt.Print(greenColor)
-		self.out.Insert(success)
-	}
-	fmt.Print(resetColor)
-}
-
-func (self *story) Exit() {
-	self.out.Dedent()
-	self.currentKey = self.currentKey[:len(self.currentKey)-1]
-}
-
-func (self *story) EndStory() {
-	self.titlesById = make(map[string]string)
-	self.out.Println("\n")
-}
-
-func (self *story) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewStoryReporter(out *Printer) *story {
-	self := new(story)
-	self.out = out
-	self.titlesById = make(map[string]string)
-	return self
-}

From 30b5fcd26cde187343de09923b10d527196f0f1c Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 25 May 2016 08:41:15 -0700
Subject: [PATCH 0314/1304] godep: update appc/spec to v0.8.3

---
 Godeps/Godeps.json                            | 44 +++++++++----------
 .../appc/spec/ace/image_manifest_main.json.in |  4 +-
 .../spec/ace/image_manifest_sidekick.json.in  |  4 +-
 .../src/github.com/appc/spec/ace/validator.go | 16 ++++---
 .../github.com/appc/spec/actool/manifest.go   | 14 +++++-
 .../schema/types/isolator_linux_specific.go   | 20 +++++++++
 .../spec/schema/types/isolator_resources.go   |  8 ++--
 .../github.com/appc/spec/schema/version.go    |  2 +-
 8 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 1e59f33be5..7ebe374eff 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -163,58 +163,58 @@
 		},
 		{
 			"ImportPath": "github.com/appc/spec/ace",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/aci",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/actool",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/discovery",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/acirenderer",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/device",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/tarheader",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/common",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/lastditch",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/types",
-			"Comment": "v0.8.1",
-			"Rev": "b889d03467ae08bb6c13241762a64305b69bcf82"
+			"Comment": "v0.8.3",
+			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
 		},
 		{
 			"ImportPath": "github.com/aws/aws-sdk-go/aws",
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
index 511e2a5359..60e6417be7 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.1",
+    "acVersion": "0.8.3",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.1" },
+        { "name": "version", "value": "0.8.3" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index 9020e4f10d..ed09f46a6e 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.1",
+    "acVersion": "0.8.3",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.1" },
+        { "name": "version", "value": "0.8.3" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go b/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go
index 420ae78897..fdd27ac222 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go
@@ -243,8 +243,8 @@ func metadataRequest(req *http.Request, expectedContentType string) ([]byte, err
 	}
 
 	if respContentType := resp.Header.Get("Content-Type"); respContentType != expectedContentType {
-		return nil, fmt.Errorf("`%s` did not respond with expected Content-Type header.  Expected %s, received %s",
-			req.RequestURI, expectedContentType, respContentType)
+		return nil, fmt.Errorf("`%v` did not respond with expected Content-Type header.  Expected %s, received %s",
+			req.URL, expectedContentType, respContentType)
 	}
 
 	body, err := ioutil.ReadAll(resp.Body)
@@ -292,12 +292,12 @@ func validatePodAnnotations(metadataURL string, pm *schema.PodManifest) results
 
 	var actualAnnots types.Annotations
 
-	annotJson, err := metadataGet(metadataURL, "/pod/annotations/", "application/json")
+	annotJson, err := metadataGet(metadataURL, "/pod/annotations", "application/json")
 	if err != nil {
 		return append(r, err)
 	}
 
-	err = json.Unmarshal(annotJson, actualAnnots)
+	err = json.Unmarshal(annotJson, &actualAnnots)
 	if err != nil {
 		return append(r, err)
 	}
@@ -338,6 +338,9 @@ func validateAppAnnotations(metadataURL string, pm *schema.PodManifest, app *sch
 	for _, annot := range a.Annotations {
 		expectedAnnots.Set(annot.Name, annot.Value)
 	}
+	if len(expectedAnnots) == 0 {
+		expectedAnnots = nil
+	}
 
 	var actualAnnots types.Annotations
 
@@ -346,10 +349,13 @@ func validateAppAnnotations(metadataURL string, pm *schema.PodManifest, app *sch
 		return append(r, err)
 	}
 
-	err = json.Unmarshal(annotJson, actualAnnots)
+	err = json.Unmarshal(annotJson, &actualAnnots)
 	if err != nil {
 		return append(r, err)
 	}
+	if len(actualAnnots) == 0 {
+		actualAnnots = nil
+	}
 
 	if !reflect.DeepEqual(actualAnnots, expectedAnnots) {
 		err := fmt.Errorf("%v annotations mismatch: %v vs %v", app.Name, actualAnnots, expectedAnnots)
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go b/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go
index 94eff16a4c..46662167dc 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go
@@ -258,7 +258,19 @@ func patchManifest(im *schema.ImageManifest) error {
 				return fmt.Errorf("cannot parse isolator %q: %v", is, err)
 			}
 
-			if _, ok := types.ResourceIsolatorNames[name]; !ok {
+			_, ok := types.ResourceIsolatorNames[name]
+
+			if name == types.LinuxNoNewPrivilegesName {
+				ok = true
+				kv := strings.Split(is, ",")
+				if len(kv) != 2 {
+					return fmt.Errorf("isolator %s: invalid format", name)
+				}
+
+				isolatorStr = fmt.Sprintf(`{ "name": "%s", "value": %s }`, name, kv[1])
+			}
+
+			if !ok {
 				return fmt.Errorf("isolator %s is not supported for patching", name)
 			}
 
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go
index b390ed9187..678e0bf1f4 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go
@@ -22,6 +22,7 @@ import (
 const (
 	LinuxCapabilitiesRetainSetName = "os/linux/capabilities-retain-set"
 	LinuxCapabilitiesRevokeSetName = "os/linux/capabilities-remove-set"
+	LinuxNoNewPrivilegesName       = "os/linux/no-new-privileges"
 )
 
 var LinuxIsolatorNames = make(map[ACIdentifier]struct{})
@@ -30,12 +31,31 @@ func init() {
 	for name, con := range map[ACIdentifier]IsolatorValueConstructor{
 		LinuxCapabilitiesRevokeSetName: func() IsolatorValue { return &LinuxCapabilitiesRevokeSet{} },
 		LinuxCapabilitiesRetainSetName: func() IsolatorValue { return &LinuxCapabilitiesRetainSet{} },
+		LinuxNoNewPrivilegesName:       func() IsolatorValue { v := LinuxNoNewPrivileges(false); return &v },
 	} {
 		AddIsolatorName(name, LinuxIsolatorNames)
 		AddIsolatorValueConstructor(name, con)
 	}
 }
 
+type LinuxNoNewPrivileges bool
+
+func (l LinuxNoNewPrivileges) AssertValid() error {
+	return nil
+}
+
+func (l *LinuxNoNewPrivileges) UnmarshalJSON(b []byte) error {
+	var v bool
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	*l = LinuxNoNewPrivileges(v)
+
+	return nil
+}
+
 type LinuxCapabilitiesSet interface {
 	Set() []LinuxCapability
 	AssertValid() error
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
index 2ac5130d1c..d97827b96f 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
@@ -155,8 +155,8 @@ func NewResourceCPUIsolator(request, limit string) (*ResourceCPU, error) {
 	res := &ResourceCPU{
 		ResourceBase{
 			resourceValue{
-				Request: req,
-				Limit:   lim,
+				Request: &req,
+				Limit:   &lim,
 			},
 		},
 	}
@@ -209,8 +209,8 @@ func NewResourceMemoryIsolator(request, limit string) (*ResourceMemory, error) {
 	res := &ResourceMemory{
 		ResourceBase{
 			resourceValue{
-				Request: req,
-				Limit:   lim,
+				Request: &req,
+				Limit:   &lim,
 			},
 		},
 	}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
index eaa5f8bfdc..1cba342bb2 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.1"
+	version string = "0.8.3"
 )
 
 var (

From 1dffd7a96bea8ebe99cee468f0beddf838a0669b Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 25 May 2016 08:59:40 -0700
Subject: [PATCH 0315/1304] godep: update k8s.io/kubernetes to v1.3.0-alpha.4

---
 Godeps/Godeps.json                            |   24 +-
 .../src/github.com/gogo/protobuf/LICENSE      |   36 +
 .../github.com/gogo/protobuf/proto/Makefile   |   43 +
 .../github.com/gogo/protobuf/proto/clone.go   |  228 +++
 .../github.com/gogo/protobuf/proto/decode.go  |  872 +++++++++++
 .../gogo/protobuf/proto/decode_gogo.go        |  175 +++
 .../github.com/gogo/protobuf/proto/encode.go  | 1335 +++++++++++++++++
 .../gogo/protobuf/proto/encode_gogo.go        |  354 +++++
 .../github.com/gogo/protobuf/proto/equal.go   |  266 ++++
 .../gogo/protobuf/proto/extensions.go         |  519 +++++++
 .../gogo/protobuf/proto/extensions_gogo.go    |  221 +++
 .../src/github.com/gogo/protobuf/proto/lib.go |  883 +++++++++++
 .../gogo/protobuf/proto/lib_gogo.go           |   40 +
 .../gogo/protobuf/proto/message_set.go        |  280 ++++
 .../gogo/protobuf/proto/pointer_reflect.go    |  479 ++++++
 .../gogo/protobuf/proto/pointer_unsafe.go     |  266 ++++
 .../protobuf/proto/pointer_unsafe_gogo.go     |  108 ++
 .../gogo/protobuf/proto/properties.go         |  915 +++++++++++
 .../gogo/protobuf/proto/properties_gogo.go    |   64 +
 .../gogo/protobuf/proto/skip_gogo.go          |  117 ++
 .../github.com/gogo/protobuf/proto/text.go    |  793 ++++++++++
 .../gogo/protobuf/proto/text_gogo.go          |   55 +
 .../gogo/protobuf/proto/text_parser.go        |  841 +++++++++++
 Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE |   28 +
 .../math/dec/inf => gopkg.in/inf.v0}/dec.go   |    0
 .../dec/inf => gopkg.in/inf.v0}/rounder.go    |    0
 .../_workspace/src/k8s.io/kubernetes/LICENSE  |    2 +-
 .../pkg/api/resource/deep_copy_generated.go   |   55 +
 .../pkg/api/resource/generated.pb.go          |  371 +++++
 .../pkg/api/resource/generated.proto          |  109 ++
 .../kubernetes/pkg/api/resource/quantity.go   |  166 +-
 .../pkg/api/resource/quantity_proto.go        |   78 +
 .../kubernetes/pkg/api/resource/scale_int.go  |   95 ++
 .../kubernetes/pkg/api/resource/suffix.go     |    4 +-
 .../k8s.io/kubernetes/pkg/conversion/OWNERS   |    5 +
 .../kubernetes/pkg/conversion/cloner.go       |  237 +++
 .../kubernetes/pkg/conversion/converter.go    |  951 ++++++++++++
 .../pkg/conversion/deep_copy_generated.go     |  185 +++
 .../kubernetes/pkg/conversion/deep_equal.go   |   36 +
 .../k8s.io/kubernetes/pkg/conversion/doc.go   |   24 +
 .../kubernetes/pkg/conversion/helper.go       |   39 +
 .../third_party/forked/reflect/LICENSE        |   27 +
 .../third_party/forked/reflect/deep_equal.go  |  388 +++++
 .../speter.net/go/exp/math/dec/inf/LICENSE    |   57 -
 44 files changed, 11683 insertions(+), 88 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go
 create mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
 create mode 100644 Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE
 rename Godeps/_workspace/src/{speter.net/go/exp/math/dec/inf => gopkg.in/inf.v0}/dec.go (100%)
 rename Godeps/_workspace/src/{speter.net/go/exp/math/dec/inf => gopkg.in/inf.v0}/rounder.go (100%)
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.proto
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/scale_int.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/OWNERS
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/cloner.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/converter.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/doc.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/helper.go
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
 create mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
 delete mode 100644 Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 7ebe374eff..f671e155bd 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -405,6 +405,11 @@
 			"Comment": "v3-6-ga1b8ba5163b7",
 			"Rev": "a1b8ba5163b7f041b22761461eabd02b70d1f824"
 		},
+		{
+			"ImportPath": "github.com/gogo/protobuf/proto",
+			"Comment": "v0.1-125-g82d16f7",
+			"Rev": "82d16f734d6d871204a3feb1a73cb220cc92574c"
+		},
 		{
 			"ImportPath": "github.com/golang/protobuf/proto",
 			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
@@ -647,14 +652,25 @@
 			"ImportPath": "google.golang.org/grpc/transport",
 			"Rev": "5da22b92e9485c15a6b284d52cc54d6580864c99"
 		},
+		{
+			"ImportPath": "gopkg.in/inf.v0",
+			"Comment": "v0.9.0",
+			"Rev": "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"
+		},
 		{
 			"ImportPath": "k8s.io/kubernetes/pkg/api/resource",
-			"Comment": "v0.12.0-270-g53ec66caf4e9",
-			"Rev": "53ec66caf4e952a1384ec93b9f0cde37616e4caf"
+			"Comment": "v1.3.0-alpha.4",
+			"Rev": "9990f843cd62caa90445cf76b07d63ba7b5c86fd"
+		},
+		{
+			"ImportPath": "k8s.io/kubernetes/pkg/conversion",
+			"Comment": "v1.3.0-alpha.4",
+			"Rev": "9990f843cd62caa90445cf76b07d63ba7b5c86fd"
 		},
 		{
-			"ImportPath": "speter.net/go/exp/math/dec/inf",
-			"Rev": "42ca6cd68aa922bc3f32f1e056e61b65945d9ad7"
+			"ImportPath": "k8s.io/kubernetes/third_party/forked/reflect",
+			"Comment": "v1.3.0-alpha.4",
+			"Rev": "9990f843cd62caa90445cf76b07d63ba7b5c86fd"
 		}
 	]
 }
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE b/Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE
new file mode 100644
index 0000000000..335e38e19b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE
@@ -0,0 +1,36 @@
+Extensions for Protocol Buffers to create more go like structures.
+
+Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+http://github.com/gogo/protobuf/gogoproto
+
+Go support for Protocol Buffers - Google's data interchange format
+
+Copyright 2010 The Go Authors.  All rights reserved.
+https://github.com/golang/protobuf
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile
new file mode 100644
index 0000000000..23a6b17344
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile
@@ -0,0 +1,43 @@
+# Go support for Protocol Buffers - Google's data interchange format
+#
+# Copyright 2010 The Go Authors.  All rights reserved.
+# https://github.com/golang/protobuf
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+install:
+	go install
+
+test: install generate-test-pbs
+	go test
+
+
+generate-test-pbs:
+	make install
+	make -C testdata
+	protoc-min-version --version="3.0.0" --proto_path=.:../../../../ --gogo_out=. proto3_proto/proto3.proto
+	make
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go
new file mode 100644
index 0000000000..79edb86119
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go
@@ -0,0 +1,228 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2011 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Protocol buffer deep copy and merge.
+// TODO: RawMessage.
+
+package proto
+
+import (
+	"log"
+	"reflect"
+	"strings"
+)
+
+// Clone returns a deep copy of a protocol buffer.
+func Clone(pb Message) Message {
+	in := reflect.ValueOf(pb)
+	if in.IsNil() {
+		return pb
+	}
+
+	out := reflect.New(in.Type().Elem())
+	// out is empty so a merge is a deep copy.
+	mergeStruct(out.Elem(), in.Elem())
+	return out.Interface().(Message)
+}
+
+// Merge merges src into dst.
+// Required and optional fields that are set in src will be set to that value in dst.
+// Elements of repeated fields will be appended.
+// Merge panics if src and dst are not the same type, or if dst is nil.
+func Merge(dst, src Message) {
+	in := reflect.ValueOf(src)
+	out := reflect.ValueOf(dst)
+	if out.IsNil() {
+		panic("proto: nil destination")
+	}
+	if in.Type() != out.Type() {
+		// Explicit test prior to mergeStruct so that mistyped nils will fail
+		panic("proto: type mismatch")
+	}
+	if in.IsNil() {
+		// Merging nil into non-nil is a quiet no-op
+		return
+	}
+	mergeStruct(out.Elem(), in.Elem())
+}
+
+func mergeStruct(out, in reflect.Value) {
+	sprop := GetProperties(in.Type())
+	for i := 0; i < in.NumField(); i++ {
+		f := in.Type().Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
+	}
+
+	if emIn, ok := in.Addr().Interface().(extensionsMap); ok {
+		emOut := out.Addr().Interface().(extensionsMap)
+		mergeExtension(emOut.ExtensionMap(), emIn.ExtensionMap())
+	} else if emIn, ok := in.Addr().Interface().(extensionsBytes); ok {
+		emOut := out.Addr().Interface().(extensionsBytes)
+		bIn := emIn.GetExtensions()
+		bOut := emOut.GetExtensions()
+		*bOut = append(*bOut, *bIn...)
+	}
+
+	uf := in.FieldByName("XXX_unrecognized")
+	if !uf.IsValid() {
+		return
+	}
+	uin := uf.Bytes()
+	if len(uin) > 0 {
+		out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...))
+	}
+}
+
+// mergeAny performs a merge between two values of the same type.
+// viaPtr indicates whether the values were indirected through a pointer (implying proto2).
+// prop is set if this is a struct field (it may be nil).
+func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
+	if in.Type() == protoMessageType {
+		if !in.IsNil() {
+			if out.IsNil() {
+				out.Set(reflect.ValueOf(Clone(in.Interface().(Message))))
+			} else {
+				Merge(out.Interface().(Message), in.Interface().(Message))
+			}
+		}
+		return
+	}
+	switch in.Kind() {
+	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
+		reflect.String, reflect.Uint32, reflect.Uint64:
+		if !viaPtr && isProto3Zero(in) {
+			return
+		}
+		out.Set(in)
+	case reflect.Interface:
+		// Probably a oneof field; copy non-nil values.
+		if in.IsNil() {
+			return
+		}
+		// Allocate destination if it is not set, or set to a different type.
+		// Otherwise we will merge as normal.
+		if out.IsNil() || out.Elem().Type() != in.Elem().Type() {
+			out.Set(reflect.New(in.Elem().Elem().Type())) // interface -> *T -> T -> new(T)
+		}
+		mergeAny(out.Elem(), in.Elem(), false, nil)
+	case reflect.Map:
+		if in.Len() == 0 {
+			return
+		}
+		if out.IsNil() {
+			out.Set(reflect.MakeMap(in.Type()))
+		}
+		// For maps with value types of *T or []byte we need to deep copy each value.
+		elemKind := in.Type().Elem().Kind()
+		for _, key := range in.MapKeys() {
+			var val reflect.Value
+			switch elemKind {
+			case reflect.Ptr:
+				val = reflect.New(in.Type().Elem().Elem())
+				mergeAny(val, in.MapIndex(key), false, nil)
+			case reflect.Slice:
+				val = in.MapIndex(key)
+				val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
+			default:
+				val = in.MapIndex(key)
+			}
+			out.SetMapIndex(key, val)
+		}
+	case reflect.Ptr:
+		if in.IsNil() {
+			return
+		}
+		if out.IsNil() {
+			out.Set(reflect.New(in.Elem().Type()))
+		}
+		mergeAny(out.Elem(), in.Elem(), true, nil)
+	case reflect.Slice:
+		if in.IsNil() {
+			return
+		}
+		if in.Type().Elem().Kind() == reflect.Uint8 {
+			// []byte is a scalar bytes field, not a repeated field.
+
+			// Edge case: if this is in a proto3 message, a zero length
+			// bytes field is considered the zero value, and should not
+			// be merged.
+			if prop != nil && prop.proto3 && in.Len() == 0 {
+				return
+			}
+
+			// Make a deep copy.
+			// Append to []byte{} instead of []byte(nil) so that we never end up
+			// with a nil result.
+			out.SetBytes(append([]byte{}, in.Bytes()...))
+			return
+		}
+		n := in.Len()
+		if out.IsNil() {
+			out.Set(reflect.MakeSlice(in.Type(), 0, n))
+		}
+		switch in.Type().Elem().Kind() {
+		case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
+			reflect.String, reflect.Uint32, reflect.Uint64:
+			out.Set(reflect.AppendSlice(out, in))
+		default:
+			for i := 0; i < n; i++ {
+				x := reflect.Indirect(reflect.New(in.Type().Elem()))
+				mergeAny(x, in.Index(i), false, nil)
+				out.Set(reflect.Append(out, x))
+			}
+		}
+	case reflect.Struct:
+		mergeStruct(out, in)
+	default:
+		// unknown type, so not a protocol buffer
+		log.Printf("proto: don't know how to copy %v", in)
+	}
+}
+
+func mergeExtension(out, in map[int32]Extension) {
+	for extNum, eIn := range in {
+		eOut := Extension{desc: eIn.desc}
+		if eIn.value != nil {
+			v := reflect.New(reflect.TypeOf(eIn.value)).Elem()
+			mergeAny(v, reflect.ValueOf(eIn.value), false, nil)
+			eOut.value = v.Interface()
+		}
+		if eIn.enc != nil {
+			eOut.enc = make([]byte, len(eIn.enc))
+			copy(eOut.enc, eIn.enc)
+		}
+
+		out[extNum] = eOut
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go
new file mode 100644
index 0000000000..cb5b213f9b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go
@@ -0,0 +1,872 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Routines for decoding protocol buffer data to construct in-memory representations.
+ */
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"reflect"
+)
+
+// errOverflow is returned when an integer is too large to be represented.
+var errOverflow = errors.New("proto: integer overflow")
+
+// ErrInternalBadWireType is returned by generated code when an incorrect
+// wire type is encountered. It does not get returned to user code.
+var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
+
+// The fundamental decoders that interpret bytes on the wire.
+// Those that take integer types all return uint64 and are
+// therefore of type valueDecoder.
+
+// DecodeVarint reads a varint-encoded integer from the slice.
+// It returns the integer and the number of bytes consumed, or
+// zero if there is not enough.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func DecodeVarint(buf []byte) (x uint64, n int) {
+	// x, n already 0
+	for shift := uint(0); shift < 64; shift += 7 {
+		if n >= len(buf) {
+			return 0, 0
+		}
+		b := uint64(buf[n])
+		n++
+		x |= (b & 0x7F) << shift
+		if (b & 0x80) == 0 {
+			return x, n
+		}
+	}
+
+	// The number is too large to represent in a 64-bit value.
+	return 0, 0
+}
+
+// DecodeVarint reads a varint-encoded integer from the Buffer.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func (p *Buffer) DecodeVarint() (x uint64, err error) {
+	// x, err already 0
+
+	i := p.index
+	l := len(p.buf)
+
+	for shift := uint(0); shift < 64; shift += 7 {
+		if i >= l {
+			err = io.ErrUnexpectedEOF
+			return
+		}
+		b := p.buf[i]
+		i++
+		x |= (uint64(b) & 0x7F) << shift
+		if b < 0x80 {
+			p.index = i
+			return
+		}
+	}
+
+	// The number is too large to represent in a 64-bit value.
+	err = errOverflow
+	return
+}
+
+// DecodeFixed64 reads a 64-bit integer from the Buffer.
+// This is the format for the
+// fixed64, sfixed64, and double protocol buffer types.
+func (p *Buffer) DecodeFixed64() (x uint64, err error) {
+	// x, err already 0
+	i := p.index + 8
+	if i < 0 || i > len(p.buf) {
+		err = io.ErrUnexpectedEOF
+		return
+	}
+	p.index = i
+
+	x = uint64(p.buf[i-8])
+	x |= uint64(p.buf[i-7]) << 8
+	x |= uint64(p.buf[i-6]) << 16
+	x |= uint64(p.buf[i-5]) << 24
+	x |= uint64(p.buf[i-4]) << 32
+	x |= uint64(p.buf[i-3]) << 40
+	x |= uint64(p.buf[i-2]) << 48
+	x |= uint64(p.buf[i-1]) << 56
+	return
+}
+
+// DecodeFixed32 reads a 32-bit integer from the Buffer.
+// This is the format for the
+// fixed32, sfixed32, and float protocol buffer types.
+func (p *Buffer) DecodeFixed32() (x uint64, err error) {
+	// x, err already 0
+	i := p.index + 4
+	if i < 0 || i > len(p.buf) {
+		err = io.ErrUnexpectedEOF
+		return
+	}
+	p.index = i
+
+	x = uint64(p.buf[i-4])
+	x |= uint64(p.buf[i-3]) << 8
+	x |= uint64(p.buf[i-2]) << 16
+	x |= uint64(p.buf[i-1]) << 24
+	return
+}
+
+// DecodeZigzag64 reads a zigzag-encoded 64-bit integer
+// from the Buffer.
+// This is the format used for the sint64 protocol buffer type.
+func (p *Buffer) DecodeZigzag64() (x uint64, err error) {
+	x, err = p.DecodeVarint()
+	if err != nil {
+		return
+	}
+	x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63)
+	return
+}
+
+// DecodeZigzag32 reads a zigzag-encoded 32-bit integer
+// from  the Buffer.
+// This is the format used for the sint32 protocol buffer type.
+func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
+	x, err = p.DecodeVarint()
+	if err != nil {
+		return
+	}
+	x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31))
+	return
+}
+
+// These are not ValueDecoders: they produce an array of bytes or a string.
+// bytes, embedded messages
+
+// DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
+// This is the format used for the bytes protocol buffer
+// type and for embedded messages.
+func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) {
+	n, err := p.DecodeVarint()
+	if err != nil {
+		return nil, err
+	}
+
+	nb := int(n)
+	if nb < 0 {
+		return nil, fmt.Errorf("proto: bad byte length %d", nb)
+	}
+	end := p.index + nb
+	if end < p.index || end > len(p.buf) {
+		return nil, io.ErrUnexpectedEOF
+	}
+
+	if !alloc {
+		// todo: check if can get more uses of alloc=false
+		buf = p.buf[p.index:end]
+		p.index += nb
+		return
+	}
+
+	buf = make([]byte, nb)
+	copy(buf, p.buf[p.index:])
+	p.index += nb
+	return
+}
+
+// DecodeStringBytes reads an encoded string from the Buffer.
+// This is the format used for the proto2 string type.
+func (p *Buffer) DecodeStringBytes() (s string, err error) {
+	buf, err := p.DecodeRawBytes(false)
+	if err != nil {
+		return
+	}
+	return string(buf), nil
+}
+
+// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
+// If the protocol buffer has extensions, and the field matches, add it as an extension.
+// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
+func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
+	oi := o.index
+
+	err := o.skip(t, tag, wire)
+	if err != nil {
+		return err
+	}
+
+	if !unrecField.IsValid() {
+		return nil
+	}
+
+	ptr := structPointer_Bytes(base, unrecField)
+
+	// Add the skipped field to struct field
+	obuf := o.buf
+
+	o.buf = *ptr
+	o.EncodeVarint(uint64(tag<<3 | wire))
+	*ptr = append(o.buf, obuf[oi:o.index]...)
+
+	o.buf = obuf
+
+	return nil
+}
+
+// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
+func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
+
+	var u uint64
+	var err error
+
+	switch wire {
+	case WireVarint:
+		_, err = o.DecodeVarint()
+	case WireFixed64:
+		_, err = o.DecodeFixed64()
+	case WireBytes:
+		_, err = o.DecodeRawBytes(false)
+	case WireFixed32:
+		_, err = o.DecodeFixed32()
+	case WireStartGroup:
+		for {
+			u, err = o.DecodeVarint()
+			if err != nil {
+				break
+			}
+			fwire := int(u & 0x7)
+			if fwire == WireEndGroup {
+				break
+			}
+			ftag := int(u >> 3)
+			err = o.skip(t, ftag, fwire)
+			if err != nil {
+				break
+			}
+		}
+	default:
+		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
+	}
+	return err
+}
+
+// Unmarshaler is the interface representing objects that can
+// unmarshal themselves.  The method should reset the receiver before
+// decoding starts.  The argument points to data that may be
+// overwritten, so implementations should not keep references to the
+// buffer.
+type Unmarshaler interface {
+	Unmarshal([]byte) error
+}
+
+// Unmarshal parses the protocol buffer representation in buf and places the
+// decoded result in pb.  If the struct underlying pb does not match
+// the data in buf, the results can be unpredictable.
+//
+// Unmarshal resets pb before starting to unmarshal, so any
+// existing data in pb is always removed. Use UnmarshalMerge
+// to preserve and append to existing data.
+func Unmarshal(buf []byte, pb Message) error {
+	pb.Reset()
+	return UnmarshalMerge(buf, pb)
+}
+
+// UnmarshalMerge parses the protocol buffer representation in buf and
+// writes the decoded result to pb.  If the struct underlying pb does not match
+// the data in buf, the results can be unpredictable.
+//
+// UnmarshalMerge merges into existing data in pb.
+// Most code should use Unmarshal instead.
+func UnmarshalMerge(buf []byte, pb Message) error {
+	// If the object can unmarshal itself, let it.
+	if u, ok := pb.(Unmarshaler); ok {
+		return u.Unmarshal(buf)
+	}
+	return NewBuffer(buf).Unmarshal(pb)
+}
+
+// DecodeMessage reads a count-delimited message from the Buffer.
+func (p *Buffer) DecodeMessage(pb Message) error {
+	enc, err := p.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+	return NewBuffer(enc).Unmarshal(pb)
+}
+
+// DecodeGroup reads a tag-delimited group from the Buffer.
+func (p *Buffer) DecodeGroup(pb Message) error {
+	typ, base, err := getbase(pb)
+	if err != nil {
+		return err
+	}
+	return p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), true, base)
+}
+
+// Unmarshal parses the protocol buffer representation in the
+// Buffer and places the decoded result in pb.  If the struct
+// underlying pb does not match the data in the buffer, the results can be
+// unpredictable.
+func (p *Buffer) Unmarshal(pb Message) error {
+	// If the object can unmarshal itself, let it.
+	if u, ok := pb.(Unmarshaler); ok {
+		err := u.Unmarshal(p.buf[p.index:])
+		p.index = len(p.buf)
+		return err
+	}
+
+	typ, base, err := getbase(pb)
+	if err != nil {
+		return err
+	}
+
+	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
+
+	if collectStats {
+		stats.Decode++
+	}
+
+	return err
+}
+
+// unmarshalType does the work of unmarshaling a structure.
+func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
+	var state errorState
+	required, reqFields := prop.reqCount, uint64(0)
+
+	var err error
+	for err == nil && o.index < len(o.buf) {
+		oi := o.index
+		var u uint64
+		u, err = o.DecodeVarint()
+		if err != nil {
+			break
+		}
+		wire := int(u & 0x7)
+		if wire == WireEndGroup {
+			if is_group {
+				return nil // input is satisfied
+			}
+			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
+		}
+		tag := int(u >> 3)
+		if tag <= 0 {
+			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
+		}
+		fieldnum, ok := prop.decoderTags.get(tag)
+		if !ok {
+			// Maybe it's an extension?
+			if prop.extendable {
+				if e := structPointer_Interface(base, st).(extendableProto); isExtensionField(e, int32(tag)) {
+					if err = o.skip(st, tag, wire); err == nil {
+						if ee, eok := e.(extensionsMap); eok {
+							ext := ee.ExtensionMap()[int32(tag)] // may be missing
+							ext.enc = append(ext.enc, o.buf[oi:o.index]...)
+							ee.ExtensionMap()[int32(tag)] = ext
+						} else if ee, eok := e.(extensionsBytes); eok {
+							ext := ee.GetExtensions()
+							*ext = append(*ext, o.buf[oi:o.index]...)
+						}
+					}
+					continue
+				}
+			}
+			// Maybe it's a oneof?
+			if prop.oneofUnmarshaler != nil {
+				m := structPointer_Interface(base, st).(Message)
+				// First return value indicates whether tag is a oneof field.
+				ok, err = prop.oneofUnmarshaler(m, tag, wire, o)
+				if err == ErrInternalBadWireType {
+					// Map the error to something more descriptive.
+					// Do the formatting here to save generated code space.
+					err = fmt.Errorf("bad wiretype for oneof field in %T", m)
+				}
+				if ok {
+					continue
+				}
+			}
+			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
+			continue
+		}
+		p := prop.Prop[fieldnum]
+
+		if p.dec == nil {
+			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
+			continue
+		}
+		dec := p.dec
+		if wire != WireStartGroup && wire != p.WireType {
+			if wire == WireBytes && p.packedDec != nil {
+				// a packable field
+				dec = p.packedDec
+			} else {
+				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
+				continue
+			}
+		}
+		decErr := dec(o, p, base)
+		if decErr != nil && !state.shouldContinue(decErr, p) {
+			err = decErr
+		}
+		if err == nil && p.Required {
+			// Successfully decoded a required field.
+			if tag <= 64 {
+				// use bitmap for fields 1-64 to catch field reuse.
+				var mask uint64 = 1 << uint64(tag-1)
+				if reqFields&mask == 0 {
+					// new required field
+					reqFields |= mask
+					required--
+				}
+			} else {
+				// This is imprecise. It can be fooled by a required field
+				// with a tag > 64 that is encoded twice; that's very rare.
+				// A fully correct implementation would require allocating
+				// a data structure, which we would like to avoid.
+				required--
+			}
+		}
+	}
+	if err == nil {
+		if is_group {
+			return io.ErrUnexpectedEOF
+		}
+		if state.err != nil {
+			return state.err
+		}
+		if required > 0 {
+			// Not enough information to determine the exact field. If we use extra
+			// CPU, we could determine the field only if the missing required field
+			// has a tag <= 64 and we check reqFields.
+			return &RequiredNotSetError{"{Unknown}"}
+		}
+	}
+	return err
+}
+
+// Individual type decoders
+// For each,
+//	u is the decoded value,
+//	v is a pointer to the field (pointer) in the struct
+
+// Sizes of the pools to allocate inside the Buffer.
+// The goal is modest amortization and allocation
+// on at least 16-byte boundaries.
+const (
+	boolPoolSize   = 16
+	uint32PoolSize = 8
+	uint64PoolSize = 4
+)
+
+// Decode a bool.
+func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	if len(o.bools) == 0 {
+		o.bools = make([]bool, boolPoolSize)
+	}
+	o.bools[0] = u != 0
+	*structPointer_Bool(base, p.field) = &o.bools[0]
+	o.bools = o.bools[1:]
+	return nil
+}
+
+func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	*structPointer_BoolVal(base, p.field) = u != 0
+	return nil
+}
+
+// Decode an int32.
+func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
+	return nil
+}
+
+func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
+	return nil
+}
+
+// Decode an int64.
+func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word64_Set(structPointer_Word64(base, p.field), o, u)
+	return nil
+}
+
+func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
+	return nil
+}
+
+// Decode a string.
+func (o *Buffer) dec_string(p *Properties, base structPointer) error {
+	s, err := o.DecodeStringBytes()
+	if err != nil {
+		return err
+	}
+	*structPointer_String(base, p.field) = &s
+	return nil
+}
+
+func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
+	s, err := o.DecodeStringBytes()
+	if err != nil {
+		return err
+	}
+	*structPointer_StringVal(base, p.field) = s
+	return nil
+}
+
+// Decode a slice of bytes ([]byte).
+func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	*structPointer_Bytes(base, p.field) = b
+	return nil
+}
+
+// Decode a slice of bools ([]bool).
+func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	v := structPointer_BoolSlice(base, p.field)
+	*v = append(*v, u != 0)
+	return nil
+}
+
+// Decode a slice of bools ([]bool) in packed format.
+func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
+	v := structPointer_BoolSlice(base, p.field)
+
+	nn, err := o.DecodeVarint()
+	if err != nil {
+		return err
+	}
+	nb := int(nn) // number of bytes of encoded bools
+	fin := o.index + nb
+	if fin < o.index {
+		return errOverflow
+	}
+
+	y := *v
+	for o.index < fin {
+		u, err := p.valDec(o)
+		if err != nil {
+			return err
+		}
+		y = append(y, u != 0)
+	}
+
+	*v = y
+	return nil
+}
+
+// Decode a slice of int32s ([]int32).
+func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	structPointer_Word32Slice(base, p.field).Append(uint32(u))
+	return nil
+}
+
+// Decode a slice of int32s ([]int32) in packed format.
+func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Slice(base, p.field)
+
+	nn, err := o.DecodeVarint()
+	if err != nil {
+		return err
+	}
+	nb := int(nn) // number of bytes of encoded int32s
+
+	fin := o.index + nb
+	if fin < o.index {
+		return errOverflow
+	}
+	for o.index < fin {
+		u, err := p.valDec(o)
+		if err != nil {
+			return err
+		}
+		v.Append(uint32(u))
+	}
+	return nil
+}
+
+// Decode a slice of int64s ([]int64).
+func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+
+	structPointer_Word64Slice(base, p.field).Append(u)
+	return nil
+}
+
+// Decode a slice of int64s ([]int64) in packed format.
+func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64Slice(base, p.field)
+
+	nn, err := o.DecodeVarint()
+	if err != nil {
+		return err
+	}
+	nb := int(nn) // number of bytes of encoded int64s
+
+	fin := o.index + nb
+	if fin < o.index {
+		return errOverflow
+	}
+	for o.index < fin {
+		u, err := p.valDec(o)
+		if err != nil {
+			return err
+		}
+		v.Append(u)
+	}
+	return nil
+}
+
+// Decode a slice of strings ([]string).
+func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
+	s, err := o.DecodeStringBytes()
+	if err != nil {
+		return err
+	}
+	v := structPointer_StringSlice(base, p.field)
+	*v = append(*v, s)
+	return nil
+}
+
+// Decode a slice of slice of bytes ([][]byte).
+func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	v := structPointer_BytesSlice(base, p.field)
+	*v = append(*v, b)
+	return nil
+}
+
+// Decode a map field.
+func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
+	raw, err := o.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+	oi := o.index       // index at the end of this map entry
+	o.index -= len(raw) // move buffer back to start of map entry
+
+	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
+	if mptr.Elem().IsNil() {
+		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
+	}
+	v := mptr.Elem() // map[K]V
+
+	// Prepare addressable doubly-indirect placeholders for the key and value types.
+	// See enc_new_map for why.
+	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
+	keybase := toStructPointer(keyptr.Addr())                  // **K
+
+	var valbase structPointer
+	var valptr reflect.Value
+	switch p.mtype.Elem().Kind() {
+	case reflect.Slice:
+		// []byte
+		var dummy []byte
+		valptr = reflect.ValueOf(&dummy)  // *[]byte
+		valbase = toStructPointer(valptr) // *[]byte
+	case reflect.Ptr:
+		// message; valptr is **Msg; need to allocate the intermediate pointer
+		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
+		valptr.Set(reflect.New(valptr.Type().Elem()))
+		valbase = toStructPointer(valptr)
+	default:
+		// everything else
+		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
+		valbase = toStructPointer(valptr.Addr())                   // **V
+	}
+
+	// Decode.
+	// This parses a restricted wire format, namely the encoding of a message
+	// with two fields. See enc_new_map for the format.
+	for o.index < oi {
+		// tagcode for key and value properties are always a single byte
+		// because they have tags 1 and 2.
+		tagcode := o.buf[o.index]
+		o.index++
+		switch tagcode {
+		case p.mkeyprop.tagcode[0]:
+			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
+				return err
+			}
+		case p.mvalprop.tagcode[0]:
+			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
+				return err
+			}
+		default:
+			// TODO: Should we silently skip this instead?
+			return fmt.Errorf("proto: bad map data tag %d", raw[0])
+		}
+	}
+	keyelem, valelem := keyptr.Elem(), valptr.Elem()
+	if !keyelem.IsValid() || !valelem.IsValid() {
+		// We did not decode the key or the value in the map entry.
+		// Either way, it's an invalid map entry.
+		return fmt.Errorf("proto: bad map data: missing key/val")
+	}
+
+	v.SetMapIndex(keyelem, valelem)
+	return nil
+}
+
+// Decode a group.
+func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
+	bas := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(bas) {
+		// allocate new nested message
+		bas = toStructPointer(reflect.New(p.stype))
+		structPointer_SetStructPointer(base, p.field, bas)
+	}
+	return o.unmarshalType(p.stype, p.sprop, true, bas)
+}
+
+// Decode an embedded message.
+func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
+	raw, e := o.DecodeRawBytes(false)
+	if e != nil {
+		return e
+	}
+
+	bas := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(bas) {
+		// allocate new nested message
+		bas = toStructPointer(reflect.New(p.stype))
+		structPointer_SetStructPointer(base, p.field, bas)
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		iv := structPointer_Interface(bas, p.stype)
+		return iv.(Unmarshaler).Unmarshal(raw)
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	err = o.unmarshalType(p.stype, p.sprop, false, bas)
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
+
+// Decode a slice of embedded messages.
+func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
+	return o.dec_slice_struct(p, false, base)
+}
+
+// Decode a slice of embedded groups.
+func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
+	return o.dec_slice_struct(p, true, base)
+}
+
+// Decode a slice of structs ([]*struct).
+func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
+	v := reflect.New(p.stype)
+	bas := toStructPointer(v)
+	structPointer_StructPointerSlice(base, p.field).Append(bas)
+
+	if is_group {
+		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
+		return err
+	}
+
+	raw, err := o.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		iv := v.Interface()
+		return iv.(Unmarshaler).Unmarshal(raw)
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
+
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go
new file mode 100644
index 0000000000..6a77aad766
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go
@@ -0,0 +1,175 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"reflect"
+)
+
+// Decode a reference to a struct pointer.
+func (o *Buffer) dec_ref_struct_message(p *Properties, base structPointer) (err error) {
+	raw, e := o.DecodeRawBytes(false)
+	if e != nil {
+		return e
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		panic("not supported, since this is a pointer receiver")
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	bas := structPointer_FieldPointer(base, p.field)
+
+	err = o.unmarshalType(p.stype, p.sprop, false, bas)
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
+
+// Decode a slice of references to struct pointers ([]struct).
+func (o *Buffer) dec_slice_ref_struct(p *Properties, is_group bool, base structPointer) error {
+	newBas := appendStructPointer(base, p.field, p.sstype)
+
+	if is_group {
+		panic("not supported, maybe in future, if requested.")
+	}
+
+	raw, err := o.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		panic("not supported, since this is not a pointer receiver.")
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	err = o.unmarshalType(p.stype, p.sprop, is_group, newBas)
+
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
+
+// Decode a slice of references to struct pointers.
+func (o *Buffer) dec_slice_ref_struct_message(p *Properties, base structPointer) error {
+	return o.dec_slice_ref_struct(p, false, base)
+}
+
+func setPtrCustomType(base structPointer, f field, v interface{}) {
+	if v == nil {
+		return
+	}
+	structPointer_SetStructPointer(base, f, structPointer(reflect.ValueOf(v).Pointer()))
+}
+
+func setCustomType(base structPointer, f field, value interface{}) {
+	if value == nil {
+		return
+	}
+	v := reflect.ValueOf(value).Elem()
+	t := reflect.TypeOf(value).Elem()
+	kind := t.Kind()
+	switch kind {
+	case reflect.Slice:
+		slice := reflect.MakeSlice(t, v.Len(), v.Cap())
+		reflect.Copy(slice, v)
+		oldHeader := structPointer_GetSliceHeader(base, f)
+		oldHeader.Data = slice.Pointer()
+		oldHeader.Len = v.Len()
+		oldHeader.Cap = v.Cap()
+	default:
+		l := 1
+		size := reflect.TypeOf(value).Elem().Size()
+		if kind == reflect.Array {
+			l = reflect.TypeOf(value).Elem().Len()
+			size = reflect.TypeOf(value).Size()
+		}
+		total := int(size) * l
+		structPointer_Copy(toStructPointer(reflect.ValueOf(value)), structPointer_Add(base, f), total)
+	}
+}
+
+func (o *Buffer) dec_custom_bytes(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	i := reflect.New(p.ctype.Elem()).Interface()
+	custom := (i).(Unmarshaler)
+	if err := custom.Unmarshal(b); err != nil {
+		return err
+	}
+	setPtrCustomType(base, p.field, custom)
+	return nil
+}
+
+func (o *Buffer) dec_custom_ref_bytes(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	i := reflect.New(p.ctype).Interface()
+	custom := (i).(Unmarshaler)
+	if err := custom.Unmarshal(b); err != nil {
+		return err
+	}
+	if custom != nil {
+		setCustomType(base, p.field, custom)
+	}
+	return nil
+}
+
+// Decode a slice of bytes ([]byte) into a slice of custom types.
+func (o *Buffer) dec_custom_slice_bytes(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	i := reflect.New(p.ctype.Elem()).Interface()
+	custom := (i).(Unmarshaler)
+	if err := custom.Unmarshal(b); err != nil {
+		return err
+	}
+	newBas := appendStructPointer(base, p.field, p.ctype)
+
+	setCustomType(newBas, 0, custom)
+
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
new file mode 100644
index 0000000000..7321e1aae1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
@@ -0,0 +1,1335 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Routines for encoding data into the wire format for protocol buffers.
+ */
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"sort"
+)
+
+// RequiredNotSetError is the error returned if Marshal is called with
+// a protocol buffer struct whose required fields have not
+// all been initialized. It is also the error returned if Unmarshal is
+// called with an encoded protocol buffer that does not include all the
+// required fields.
+//
+// When printed, RequiredNotSetError reports the first unset required field in a
+// message. If the field cannot be precisely determined, it is reported as
+// "{Unknown}".
+type RequiredNotSetError struct {
+	field string
+}
+
+func (e *RequiredNotSetError) Error() string {
+	return fmt.Sprintf("proto: required field %q not set", e.field)
+}
+
+var (
+	// errRepeatedHasNil is the error returned if Marshal is called with
+	// a struct with a repeated field containing a nil element.
+	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
+
+	// ErrNil is the error returned if Marshal is called with nil.
+	ErrNil = errors.New("proto: Marshal called with nil")
+)
+
+// The fundamental encoders that put bytes on the wire.
+// Those that take integer types all accept uint64 and are
+// therefore of type valueEncoder.
+
+const maxVarintBytes = 10 // maximum length of a varint
+
+// EncodeVarint returns the varint encoding of x.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+// Not used by the package itself, but helpful to clients
+// wishing to use the same encoding.
+func EncodeVarint(x uint64) []byte {
+	var buf [maxVarintBytes]byte
+	var n int
+	for n = 0; x > 127; n++ {
+		buf[n] = 0x80 | uint8(x&0x7F)
+		x >>= 7
+	}
+	buf[n] = uint8(x)
+	n++
+	return buf[0:n]
+}
+
+// EncodeVarint writes a varint-encoded integer to the Buffer.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func (p *Buffer) EncodeVarint(x uint64) error {
+	for x >= 1<<7 {
+		p.buf = append(p.buf, uint8(x&0x7f|0x80))
+		x >>= 7
+	}
+	p.buf = append(p.buf, uint8(x))
+	return nil
+}
+
+func sizeVarint(x uint64) (n int) {
+	for {
+		n++
+		x >>= 7
+		if x == 0 {
+			break
+		}
+	}
+	return n
+}
+
+// EncodeFixed64 writes a 64-bit integer to the Buffer.
+// This is the format for the
+// fixed64, sfixed64, and double protocol buffer types.
+func (p *Buffer) EncodeFixed64(x uint64) error {
+	p.buf = append(p.buf,
+		uint8(x),
+		uint8(x>>8),
+		uint8(x>>16),
+		uint8(x>>24),
+		uint8(x>>32),
+		uint8(x>>40),
+		uint8(x>>48),
+		uint8(x>>56))
+	return nil
+}
+
+func sizeFixed64(x uint64) int {
+	return 8
+}
+
+// EncodeFixed32 writes a 32-bit integer to the Buffer.
+// This is the format for the
+// fixed32, sfixed32, and float protocol buffer types.
+func (p *Buffer) EncodeFixed32(x uint64) error {
+	p.buf = append(p.buf,
+		uint8(x),
+		uint8(x>>8),
+		uint8(x>>16),
+		uint8(x>>24))
+	return nil
+}
+
+func sizeFixed32(x uint64) int {
+	return 4
+}
+
+// EncodeZigzag64 writes a zigzag-encoded 64-bit integer
+// to the Buffer.
+// This is the format used for the sint64 protocol buffer type.
+func (p *Buffer) EncodeZigzag64(x uint64) error {
+	// use signed number to get arithmetic right shift.
+	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+
+func sizeZigzag64(x uint64) int {
+	return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+
+// EncodeZigzag32 writes a zigzag-encoded 32-bit integer
+// to the Buffer.
+// This is the format used for the sint32 protocol buffer type.
+func (p *Buffer) EncodeZigzag32(x uint64) error {
+	// use signed number to get arithmetic right shift.
+	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
+}
+
+func sizeZigzag32(x uint64) int {
+	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
+}
+
+// EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
+// This is the format used for the bytes protocol buffer
+// type and for embedded messages.
+func (p *Buffer) EncodeRawBytes(b []byte) error {
+	p.EncodeVarint(uint64(len(b)))
+	p.buf = append(p.buf, b...)
+	return nil
+}
+
+func sizeRawBytes(b []byte) int {
+	return sizeVarint(uint64(len(b))) +
+		len(b)
+}
+
+// EncodeStringBytes writes an encoded string to the Buffer.
+// This is the format used for the proto2 string type.
+func (p *Buffer) EncodeStringBytes(s string) error {
+	p.EncodeVarint(uint64(len(s)))
+	p.buf = append(p.buf, s...)
+	return nil
+}
+
+func sizeStringBytes(s string) int {
+	return sizeVarint(uint64(len(s))) +
+		len(s)
+}
+
+// Marshaler is the interface representing objects that can marshal themselves.
+type Marshaler interface {
+	Marshal() ([]byte, error)
+}
+
+// Marshal takes the protocol buffer
+// and encodes it into the wire format, returning the data.
+func Marshal(pb Message) ([]byte, error) {
+	// Can the object marshal itself?
+	if m, ok := pb.(Marshaler); ok {
+		return m.Marshal()
+	}
+	p := NewBuffer(nil)
+	err := p.Marshal(pb)
+	var state errorState
+	if err != nil && !state.shouldContinue(err, nil) {
+		return nil, err
+	}
+	if p.buf == nil && err == nil {
+		// Return a non-nil slice on success.
+		return []byte{}, nil
+	}
+	return p.buf, err
+}
+
+// EncodeMessage writes the protocol buffer to the Buffer,
+// prefixed by a varint-encoded length.
+func (p *Buffer) EncodeMessage(pb Message) error {
+	t, base, err := getbase(pb)
+	if structPointer_IsNil(base) {
+		return ErrNil
+	}
+	if err == nil {
+		var state errorState
+		err = p.enc_len_struct(GetProperties(t.Elem()), base, &state)
+	}
+	return err
+}
+
+// Marshal takes the protocol buffer
+// and encodes it into the wire format, writing the result to the
+// Buffer.
+func (p *Buffer) Marshal(pb Message) error {
+	// Can the object marshal itself?
+	if m, ok := pb.(Marshaler); ok {
+		data, err := m.Marshal()
+		if err != nil {
+			return err
+		}
+		p.buf = append(p.buf, data...)
+		return nil
+	}
+
+	t, base, err := getbase(pb)
+	if structPointer_IsNil(base) {
+		return ErrNil
+	}
+	if err == nil {
+		err = p.enc_struct(GetProperties(t.Elem()), base)
+	}
+
+	if collectStats {
+		stats.Encode++
+	}
+
+	return err
+}
+
+// Size returns the encoded size of a protocol buffer.
+func Size(pb Message) (n int) {
+	// Can the object marshal itself?  If so, Size is slow.
+	// TODO: add Size to Marshaler, or add a Sizer interface.
+	if m, ok := pb.(Marshaler); ok {
+		b, _ := m.Marshal()
+		return len(b)
+	}
+
+	t, base, err := getbase(pb)
+	if structPointer_IsNil(base) {
+		return 0
+	}
+	if err == nil {
+		n = size_struct(GetProperties(t.Elem()), base)
+	}
+
+	if collectStats {
+		stats.Size++
+	}
+
+	return
+}
+
+// Individual type encoders.
+
+// Encode a bool.
+func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
+	v := *structPointer_Bool(base, p.field)
+	if v == nil {
+		return ErrNil
+	}
+	x := 0
+	if *v {
+		x = 1
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
+	v := *structPointer_BoolVal(base, p.field)
+	if !v {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, 1)
+	return nil
+}
+
+func size_bool(p *Properties, base structPointer) int {
+	v := *structPointer_Bool(base, p.field)
+	if v == nil {
+		return 0
+	}
+	return len(p.tagcode) + 1 // each bool takes exactly one byte
+}
+
+func size_proto3_bool(p *Properties, base structPointer) int {
+	v := *structPointer_BoolVal(base, p.field)
+	if !v && !p.oneof {
+		return 0
+	}
+	return len(p.tagcode) + 1 // each bool takes exactly one byte
+}
+
+// Encode an int32.
+func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return ErrNil
+	}
+	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
+	if x == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_int32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return 0
+	}
+	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+func size_proto3_int32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
+	if x == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+// Encode a uint32.
+// Exactly the same as int32, except for no sign extension.
+func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return ErrNil
+	}
+	x := word32_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	if x == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_uint32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return 0
+	}
+	x := word32_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+func size_proto3_uint32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	if x == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+// Encode an int64.
+func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64(base, p.field)
+	if word64_IsNil(v) {
+		return ErrNil
+	}
+	x := word64_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, x)
+	return nil
+}
+
+func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	if x == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, x)
+	return nil
+}
+
+func size_int64(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word64(base, p.field)
+	if word64_IsNil(v) {
+		return 0
+	}
+	x := word64_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(x)
+	return
+}
+
+func size_proto3_int64(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	if x == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += p.valSize(x)
+	return
+}
+
+// Encode a string.
+func (o *Buffer) enc_string(p *Properties, base structPointer) error {
+	v := *structPointer_String(base, p.field)
+	if v == nil {
+		return ErrNil
+	}
+	x := *v
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeStringBytes(x)
+	return nil
+}
+
+func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
+	v := *structPointer_StringVal(base, p.field)
+	if v == "" {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeStringBytes(v)
+	return nil
+}
+
+func size_string(p *Properties, base structPointer) (n int) {
+	v := *structPointer_String(base, p.field)
+	if v == nil {
+		return 0
+	}
+	x := *v
+	n += len(p.tagcode)
+	n += sizeStringBytes(x)
+	return
+}
+
+func size_proto3_string(p *Properties, base structPointer) (n int) {
+	v := *structPointer_StringVal(base, p.field)
+	if v == "" && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeStringBytes(v)
+	return
+}
+
+// All protocol buffer fields are nillable, but be careful.
+func isNil(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
+		return v.IsNil()
+	}
+	return false
+}
+
+// Encode a message struct.
+func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	structp := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return ErrNil
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, err := m.Marshal()
+		if err != nil && !state.shouldContinue(err, nil) {
+			return err
+		}
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(data)
+		return state.err
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	return o.enc_len_struct(p.sprop, structp, &state)
+}
+
+func size_struct_message(p *Properties, base structPointer) int {
+	structp := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return 0
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, _ := m.Marshal()
+		n0 := len(p.tagcode)
+		n1 := sizeRawBytes(data)
+		return n0 + n1
+	}
+
+	n0 := len(p.tagcode)
+	n1 := size_struct(p.sprop, structp)
+	n2 := sizeVarint(uint64(n1)) // size of encoded length
+	return n0 + n1 + n2
+}
+
+// Encode a group struct.
+func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
+	var state errorState
+	b := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(b) {
+		return ErrNil
+	}
+
+	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
+	err := o.enc_struct(p.sprop, b)
+	if err != nil && !state.shouldContinue(err, nil) {
+		return err
+	}
+	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
+	return state.err
+}
+
+func size_struct_group(p *Properties, base structPointer) (n int) {
+	b := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(b) {
+		return 0
+	}
+
+	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
+	n += size_struct(p.sprop, b)
+	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
+	return
+}
+
+// Encode a slice of bools ([]bool).
+func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return ErrNil
+	}
+	for _, x := range s {
+		o.buf = append(o.buf, p.tagcode...)
+		v := uint64(0)
+		if x {
+			v = 1
+		}
+		p.valEnc(o, v)
+	}
+	return nil
+}
+
+func size_slice_bool(p *Properties, base structPointer) int {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return 0
+	}
+	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
+}
+
+// Encode a slice of bools ([]bool) in packed format.
+func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
+	for _, x := range s {
+		v := uint64(0)
+		if x {
+			v = 1
+		}
+		p.valEnc(o, v)
+	}
+	return nil
+}
+
+func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(l))
+	n += l // each bool takes exactly one byte
+	return
+}
+
+// Encode a slice of bytes ([]byte).
+func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(s)
+	return nil
+}
+
+func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
+	s := *structPointer_Bytes(base, p.field)
+	if len(s) == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(s)
+	return nil
+}
+
+func size_slice_byte(p *Properties, base structPointer) (n int) {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeRawBytes(s)
+	return
+}
+
+func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
+	s := *structPointer_Bytes(base, p.field)
+	if len(s) == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeRawBytes(s)
+	return
+}
+
+// Encode a slice of int32s ([]int32).
+func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		p.valEnc(o, uint64(x))
+	}
+	return nil
+}
+
+func size_slice_int32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	for i := 0; i < l; i++ {
+		n += len(p.tagcode)
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		n += p.valSize(uint64(x))
+	}
+	return
+}
+
+// Encode a slice of int32s ([]int32) in packed format.
+func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	// TODO: Reuse a Buffer.
+	buf := NewBuffer(nil)
+	for i := 0; i < l; i++ {
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		p.valEnc(buf, uint64(x))
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(len(buf.buf)))
+	o.buf = append(o.buf, buf.buf...)
+	return nil
+}
+
+func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	var bufSize int
+	for i := 0; i < l; i++ {
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		bufSize += p.valSize(uint64(x))
+	}
+
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(bufSize))
+	n += bufSize
+	return
+}
+
+// Encode a slice of uint32s ([]uint32).
+// Exactly the same as int32, except for no sign extension.
+func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		x := s.Index(i)
+		p.valEnc(o, uint64(x))
+	}
+	return nil
+}
+
+func size_slice_uint32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	for i := 0; i < l; i++ {
+		n += len(p.tagcode)
+		x := s.Index(i)
+		n += p.valSize(uint64(x))
+	}
+	return
+}
+
+// Encode a slice of uint32s ([]uint32) in packed format.
+// Exactly the same as int32, except for no sign extension.
+func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	// TODO: Reuse a Buffer.
+	buf := NewBuffer(nil)
+	for i := 0; i < l; i++ {
+		p.valEnc(buf, uint64(s.Index(i)))
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(len(buf.buf)))
+	o.buf = append(o.buf, buf.buf...)
+	return nil
+}
+
+func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	var bufSize int
+	for i := 0; i < l; i++ {
+		bufSize += p.valSize(uint64(s.Index(i)))
+	}
+
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(bufSize))
+	n += bufSize
+	return
+}
+
+// Encode a slice of int64s ([]int64).
+func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		p.valEnc(o, s.Index(i))
+	}
+	return nil
+}
+
+func size_slice_int64(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	for i := 0; i < l; i++ {
+		n += len(p.tagcode)
+		n += p.valSize(s.Index(i))
+	}
+	return
+}
+
+// Encode a slice of int64s ([]int64) in packed format.
+func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	// TODO: Reuse a Buffer.
+	buf := NewBuffer(nil)
+	for i := 0; i < l; i++ {
+		p.valEnc(buf, s.Index(i))
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(len(buf.buf)))
+	o.buf = append(o.buf, buf.buf...)
+	return nil
+}
+
+func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	var bufSize int
+	for i := 0; i < l; i++ {
+		bufSize += p.valSize(s.Index(i))
+	}
+
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(bufSize))
+	n += bufSize
+	return
+}
+
+// Encode a slice of slice of bytes ([][]byte).
+func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
+	ss := *structPointer_BytesSlice(base, p.field)
+	l := len(ss)
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(ss[i])
+	}
+	return nil
+}
+
+func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
+	ss := *structPointer_BytesSlice(base, p.field)
+	l := len(ss)
+	if l == 0 {
+		return 0
+	}
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		n += sizeRawBytes(ss[i])
+	}
+	return
+}
+
+// Encode a slice of strings ([]string).
+func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
+	ss := *structPointer_StringSlice(base, p.field)
+	l := len(ss)
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeStringBytes(ss[i])
+	}
+	return nil
+}
+
+func size_slice_string(p *Properties, base structPointer) (n int) {
+	ss := *structPointer_StringSlice(base, p.field)
+	l := len(ss)
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		n += sizeStringBytes(ss[i])
+	}
+	return
+}
+
+// Encode a slice of message structs ([]*struct).
+func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+
+	for i := 0; i < l; i++ {
+		structp := s.Index(i)
+		if structPointer_IsNil(structp) {
+			return errRepeatedHasNil
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, err := m.Marshal()
+			if err != nil && !state.shouldContinue(err, nil) {
+				return err
+			}
+			o.buf = append(o.buf, p.tagcode...)
+			o.EncodeRawBytes(data)
+			continue
+		}
+
+		o.buf = append(o.buf, p.tagcode...)
+		err := o.enc_len_struct(p.sprop, structp, &state)
+		if err != nil && !state.shouldContinue(err, nil) {
+			if err == ErrNil {
+				return errRepeatedHasNil
+			}
+			return err
+		}
+	}
+	return state.err
+}
+
+func size_slice_struct_message(p *Properties, base structPointer) (n int) {
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		structp := s.Index(i)
+		if structPointer_IsNil(structp) {
+			return // return the size up to this point
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, _ := m.Marshal()
+			n += len(p.tagcode)
+			n += sizeRawBytes(data)
+			continue
+		}
+
+		n0 := size_struct(p.sprop, structp)
+		n1 := sizeVarint(uint64(n0)) // size of encoded length
+		n += n0 + n1
+	}
+	return
+}
+
+// Encode a slice of group structs ([]*struct).
+func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
+	var state errorState
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+
+	for i := 0; i < l; i++ {
+		b := s.Index(i)
+		if structPointer_IsNil(b) {
+			return errRepeatedHasNil
+		}
+
+		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
+
+		err := o.enc_struct(p.sprop, b)
+
+		if err != nil && !state.shouldContinue(err, nil) {
+			if err == ErrNil {
+				return errRepeatedHasNil
+			}
+			return err
+		}
+
+		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
+	}
+	return state.err
+}
+
+func size_slice_struct_group(p *Properties, base structPointer) (n int) {
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+
+	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
+	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
+	for i := 0; i < l; i++ {
+		b := s.Index(i)
+		if structPointer_IsNil(b) {
+			return // return size up to this point
+		}
+
+		n += size_struct(p.sprop, b)
+	}
+	return
+}
+
+// Encode an extension map.
+func (o *Buffer) enc_map(p *Properties, base structPointer) error {
+	v := *structPointer_ExtMap(base, p.field)
+	if err := encodeExtensionMap(v); err != nil {
+		return err
+	}
+	// Fast-path for common cases: zero or one extensions.
+	if len(v) <= 1 {
+		for _, e := range v {
+			o.buf = append(o.buf, e.enc...)
+		}
+		return nil
+	}
+
+	// Sort keys to provide a deterministic encoding.
+	keys := make([]int, 0, len(v))
+	for k := range v {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+
+	for _, k := range keys {
+		o.buf = append(o.buf, v[int32(k)].enc...)
+	}
+	return nil
+}
+
+func size_map(p *Properties, base structPointer) int {
+	v := *structPointer_ExtMap(base, p.field)
+	return sizeExtensionMap(v)
+}
+
+// Encode a map field.
+func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
+	var state errorState // XXX: or do we need to plumb this through?
+
+	/*
+		A map defined as
+			map<key_type, value_type> map_field = N;
+		is encoded in the same way as
+			message MapFieldEntry {
+				key_type key = 1;
+				value_type value = 2;
+			}
+			repeated MapFieldEntry map_field = N;
+	*/
+
+	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
+	if v.Len() == 0 {
+		return nil
+	}
+
+	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
+
+	enc := func() error {
+		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
+			return err
+		}
+		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	// Don't sort map keys. It is not required by the spec, and C++ doesn't do it.
+	for _, key := range v.MapKeys() {
+		val := v.MapIndex(key)
+
+		// The only illegal map entry values are nil message pointers.
+		if val.Kind() == reflect.Ptr && val.IsNil() {
+			return errors.New("proto: map has nil element")
+		}
+
+		keycopy.Set(key)
+		valcopy.Set(val)
+
+		o.buf = append(o.buf, p.tagcode...)
+		if err := o.enc_len_thing(enc, &state); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func size_new_map(p *Properties, base structPointer) int {
+	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
+
+	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
+
+	n := 0
+	for _, key := range v.MapKeys() {
+		val := v.MapIndex(key)
+		keycopy.Set(key)
+		valcopy.Set(val)
+
+		// Tag codes for key and val are the responsibility of the sub-sizer.
+		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
+		valsize := p.mvalprop.size(p.mvalprop, valbase)
+		entry := keysize + valsize
+		// Add on tag code and length of map entry itself.
+		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
+	}
+	return n
+}
+
+// mapEncodeScratch returns a new reflect.Value matching the map's value type,
+// and a structPointer suitable for passing to an encoder or sizer.
+func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
+	// Prepare addressable doubly-indirect placeholders for the key and value types.
+	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
+
+	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
+	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
+	keyptr.Set(keycopy.Addr())                                  //
+	keybase = toStructPointer(keyptr.Addr())                    // **K
+
+	// Value types are more varied and require special handling.
+	switch mapType.Elem().Kind() {
+	case reflect.Slice:
+		// []byte
+		var dummy []byte
+		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
+		valbase = toStructPointer(valcopy.Addr())
+	case reflect.Ptr:
+		// message; the generated field type is map[K]*Msg (so V is *Msg),
+		// so we only need one level of indirection.
+		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
+		valbase = toStructPointer(valcopy.Addr())
+	default:
+		// everything else
+		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
+		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
+		valptr.Set(valcopy.Addr())                                  //
+		valbase = toStructPointer(valptr.Addr())                    // **V
+	}
+	return
+}
+
+// Encode a struct.
+func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
+	var state errorState
+	// Encode fields in tag order so that decoders may use optimizations
+	// that depend on the ordering.
+	// https://developers.google.com/protocol-buffers/docs/encoding#order
+	for _, i := range prop.order {
+		p := prop.Prop[i]
+		if p.enc != nil {
+			err := p.enc(o, p, base)
+			if err != nil {
+				if err == ErrNil {
+					if p.Required && state.err == nil {
+						state.err = &RequiredNotSetError{p.Name}
+					}
+				} else if err == errRepeatedHasNil {
+					// Give more context to nil values in repeated fields.
+					return errors.New("repeated field " + p.OrigName + " has nil element")
+				} else if !state.shouldContinue(err, p) {
+					return err
+				}
+			}
+		}
+	}
+
+	// Do oneof fields.
+	if prop.oneofMarshaler != nil {
+		m := structPointer_Interface(base, prop.stype).(Message)
+		if err := prop.oneofMarshaler(m, o); err != nil {
+			return err
+		}
+	}
+
+	// Add unrecognized fields at the end.
+	if prop.unrecField.IsValid() {
+		v := *structPointer_Bytes(base, prop.unrecField)
+		if len(v) > 0 {
+			o.buf = append(o.buf, v...)
+		}
+	}
+
+	return state.err
+}
+
+func size_struct(prop *StructProperties, base structPointer) (n int) {
+	for _, i := range prop.order {
+		p := prop.Prop[i]
+		if p.size != nil {
+			n += p.size(p, base)
+		}
+	}
+
+	// Add unrecognized fields at the end.
+	if prop.unrecField.IsValid() {
+		v := *structPointer_Bytes(base, prop.unrecField)
+		n += len(v)
+	}
+
+	// Factor in any oneof fields.
+	// TODO: This could be faster and use less reflection.
+	if prop.oneofMarshaler != nil {
+		sv := reflect.ValueOf(structPointer_Interface(base, prop.stype)).Elem()
+		for i := 0; i < prop.stype.NumField(); i++ {
+			fv := sv.Field(i)
+			if fv.Kind() != reflect.Interface || fv.IsNil() {
+				continue
+			}
+			if prop.stype.Field(i).Tag.Get("protobuf_oneof") == "" {
+				continue
+			}
+			spv := fv.Elem()         // interface -> *T
+			sv := spv.Elem()         // *T -> T
+			sf := sv.Type().Field(0) // StructField inside T
+			var prop Properties
+			prop.Init(sf.Type, "whatever", sf.Tag.Get("protobuf"), &sf)
+			n += prop.size(&prop, toStructPointer(spv))
+		}
+	}
+
+	return
+}
+
+var zeroes [20]byte // longer than any conceivable sizeVarint
+
+// Encode a struct, preceded by its encoded length (as a varint).
+func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
+	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
+}
+
+// Encode something, preceded by its encoded length (as a varint).
+func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
+	iLen := len(o.buf)
+	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
+	iMsg := len(o.buf)
+	err := enc()
+	if err != nil && !state.shouldContinue(err, nil) {
+		return err
+	}
+	lMsg := len(o.buf) - iMsg
+	lLen := sizeVarint(uint64(lMsg))
+	switch x := lLen - (iMsg - iLen); {
+	case x > 0: // actual length is x bytes larger than the space we reserved
+		// Move msg x bytes right.
+		o.buf = append(o.buf, zeroes[:x]...)
+		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
+	case x < 0: // actual length is x bytes smaller than the space we reserved
+		// Move msg x bytes left.
+		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
+		o.buf = o.buf[:len(o.buf)+x] // x is negative
+	}
+	// Encode the length in the reserved space.
+	o.buf = o.buf[:iLen]
+	o.EncodeVarint(uint64(lMsg))
+	o.buf = o.buf[:len(o.buf)+lMsg]
+	return state.err
+}
+
+// errorState maintains the first error that occurs and updates that error
+// with additional context.
+type errorState struct {
+	err error
+}
+
+// shouldContinue reports whether encoding should continue upon encountering the
+// given error. If the error is RequiredNotSetError, shouldContinue returns true
+// and, if this is the first appearance of that error, remembers it for future
+// reporting.
+//
+// If prop is not nil, it may update any error with additional context about the
+// field with the error.
+func (s *errorState) shouldContinue(err error, prop *Properties) bool {
+	// Ignore unset required fields.
+	reqNotSet, ok := err.(*RequiredNotSetError)
+	if !ok {
+		return false
+	}
+	if s.err == nil {
+		if prop != nil {
+			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
+		}
+		s.err = err
+	}
+	return true
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go
new file mode 100644
index 0000000000..f77cfb1eea
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go
@@ -0,0 +1,354 @@
+// Extensions for Protocol Buffers to create more go like structures.
+//
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// http://github.com/golang/protobuf/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"reflect"
+)
+
+func NewRequiredNotSetError(field string) *RequiredNotSetError {
+	return &RequiredNotSetError{field}
+}
+
+type Sizer interface {
+	Size() int
+}
+
+func (o *Buffer) enc_ext_slice_byte(p *Properties, base structPointer) error {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil {
+		return ErrNil
+	}
+	o.buf = append(o.buf, s...)
+	return nil
+}
+
+func size_ext_slice_byte(p *Properties, base structPointer) (n int) {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil {
+		return 0
+	}
+	n += len(s)
+	return
+}
+
+// Encode a reference to bool pointer.
+func (o *Buffer) enc_ref_bool(p *Properties, base structPointer) error {
+	v := *structPointer_BoolVal(base, p.field)
+	x := 0
+	if v {
+		x = 1
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_ref_bool(p *Properties, base structPointer) int {
+	return len(p.tagcode) + 1 // each bool takes exactly one byte
+}
+
+// Encode a reference to int32 pointer.
+func (o *Buffer) enc_ref_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v))
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_ref_int32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v))
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+func (o *Buffer) enc_ref_uint32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_ref_uint32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+// Encode a reference to an int64 pointer.
+func (o *Buffer) enc_ref_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, x)
+	return nil
+}
+
+func size_ref_int64(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(x)
+	return
+}
+
+// Encode a reference to a string pointer.
+func (o *Buffer) enc_ref_string(p *Properties, base structPointer) error {
+	v := *structPointer_StringVal(base, p.field)
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeStringBytes(v)
+	return nil
+}
+
+func size_ref_string(p *Properties, base structPointer) (n int) {
+	v := *structPointer_StringVal(base, p.field)
+	n += len(p.tagcode)
+	n += sizeStringBytes(v)
+	return
+}
+
+// Encode a reference to a message struct.
+func (o *Buffer) enc_ref_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	structp := structPointer_GetRefStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return ErrNil
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, err := m.Marshal()
+		if err != nil && !state.shouldContinue(err, nil) {
+			return err
+		}
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(data)
+		return nil
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	return o.enc_len_struct(p.sprop, structp, &state)
+}
+
+//TODO this is only copied, please fix this
+func size_ref_struct_message(p *Properties, base structPointer) int {
+	structp := structPointer_GetRefStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return 0
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, _ := m.Marshal()
+		n0 := len(p.tagcode)
+		n1 := sizeRawBytes(data)
+		return n0 + n1
+	}
+
+	n0 := len(p.tagcode)
+	n1 := size_struct(p.sprop, structp)
+	n2 := sizeVarint(uint64(n1)) // size of encoded length
+	return n0 + n1 + n2
+}
+
+// Encode a slice of references to message struct pointers ([]struct).
+func (o *Buffer) enc_slice_ref_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	ss := structPointer_GetStructPointer(base, p.field)
+	ss1 := structPointer_GetRefStructPointer(ss, field(0))
+	size := p.stype.Size()
+	l := structPointer_Len(base, p.field)
+	for i := 0; i < l; i++ {
+		structp := structPointer_Add(ss1, field(uintptr(i)*size))
+		if structPointer_IsNil(structp) {
+			return errRepeatedHasNil
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, err := m.Marshal()
+			if err != nil && !state.shouldContinue(err, nil) {
+				return err
+			}
+			o.buf = append(o.buf, p.tagcode...)
+			o.EncodeRawBytes(data)
+			continue
+		}
+
+		o.buf = append(o.buf, p.tagcode...)
+		err := o.enc_len_struct(p.sprop, structp, &state)
+		if err != nil && !state.shouldContinue(err, nil) {
+			if err == ErrNil {
+				return errRepeatedHasNil
+			}
+			return err
+		}
+
+	}
+	return state.err
+}
+
+//TODO this is only copied, please fix this
+func size_slice_ref_struct_message(p *Properties, base structPointer) (n int) {
+	ss := structPointer_GetStructPointer(base, p.field)
+	ss1 := structPointer_GetRefStructPointer(ss, field(0))
+	size := p.stype.Size()
+	l := structPointer_Len(base, p.field)
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		structp := structPointer_Add(ss1, field(uintptr(i)*size))
+		if structPointer_IsNil(structp) {
+			return // return the size up to this point
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, _ := m.Marshal()
+			n += len(p.tagcode)
+			n += sizeRawBytes(data)
+			continue
+		}
+
+		n0 := size_struct(p.sprop, structp)
+		n1 := sizeVarint(uint64(n0)) // size of encoded length
+		n += n0 + n1
+	}
+	return
+}
+
+func (o *Buffer) enc_custom_bytes(p *Properties, base structPointer) error {
+	i := structPointer_InterfaceRef(base, p.field, p.ctype)
+	if i == nil {
+		return ErrNil
+	}
+	custom := i.(Marshaler)
+	data, err := custom.Marshal()
+	if err != nil {
+		return err
+	}
+	if data == nil {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(data)
+	return nil
+}
+
+func size_custom_bytes(p *Properties, base structPointer) (n int) {
+	n += len(p.tagcode)
+	i := structPointer_InterfaceRef(base, p.field, p.ctype)
+	if i == nil {
+		return 0
+	}
+	custom := i.(Marshaler)
+	data, _ := custom.Marshal()
+	n += sizeRawBytes(data)
+	return
+}
+
+func (o *Buffer) enc_custom_ref_bytes(p *Properties, base structPointer) error {
+	custom := structPointer_InterfaceAt(base, p.field, p.ctype).(Marshaler)
+	data, err := custom.Marshal()
+	if err != nil {
+		return err
+	}
+	if data == nil {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(data)
+	return nil
+}
+
+func size_custom_ref_bytes(p *Properties, base structPointer) (n int) {
+	n += len(p.tagcode)
+	i := structPointer_InterfaceAt(base, p.field, p.ctype)
+	if i == nil {
+		return 0
+	}
+	custom := i.(Marshaler)
+	data, _ := custom.Marshal()
+	n += sizeRawBytes(data)
+	return
+}
+
+func (o *Buffer) enc_custom_slice_bytes(p *Properties, base structPointer) error {
+	inter := structPointer_InterfaceRef(base, p.field, p.ctype)
+	if inter == nil {
+		return ErrNil
+	}
+	slice := reflect.ValueOf(inter)
+	l := slice.Len()
+	for i := 0; i < l; i++ {
+		v := slice.Index(i)
+		custom := v.Interface().(Marshaler)
+		data, err := custom.Marshal()
+		if err != nil {
+			return err
+		}
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(data)
+	}
+	return nil
+}
+
+func size_custom_slice_bytes(p *Properties, base structPointer) (n int) {
+	inter := structPointer_InterfaceRef(base, p.field, p.ctype)
+	if inter == nil {
+		return 0
+	}
+	slice := reflect.ValueOf(inter)
+	l := slice.Len()
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		v := slice.Index(i)
+		custom := v.Interface().(Marshaler)
+		data, _ := custom.Marshal()
+		n += sizeRawBytes(data)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
new file mode 100644
index 0000000000..cc3f2c95a7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
@@ -0,0 +1,266 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2011 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Protocol buffer comparison.
+
+package proto
+
+import (
+	"bytes"
+	"log"
+	"reflect"
+	"strings"
+)
+
+/*
+Equal returns true iff protocol buffers a and b are equal.
+The arguments must both be pointers to protocol buffer structs.
+
+Equality is defined in this way:
+  - Two messages are equal iff they are the same type,
+    corresponding fields are equal, unknown field sets
+    are equal, and extensions sets are equal.
+  - Two set scalar fields are equal iff their values are equal.
+    If the fields are of a floating-point type, remember that
+    NaN != x for all x, including NaN.
+  - Two repeated fields are equal iff their lengths are the same,
+    and their corresponding elements are equal (a "bytes" field,
+    although represented by []byte, is not a repeated field)
+  - Two unset fields are equal.
+  - Two unknown field sets are equal if their current
+    encoded state is equal.
+  - Two extension sets are equal iff they have corresponding
+    elements that are pairwise equal.
+  - Every other combination of things are not equal.
+
+The return value is undefined if a and b are not protocol buffers.
+*/
+func Equal(a, b Message) bool {
+	if a == nil || b == nil {
+		return a == b
+	}
+	v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	if v1.Kind() == reflect.Ptr {
+		if v1.IsNil() {
+			return v2.IsNil()
+		}
+		if v2.IsNil() {
+			return false
+		}
+		v1, v2 = v1.Elem(), v2.Elem()
+	}
+	if v1.Kind() != reflect.Struct {
+		return false
+	}
+	return equalStruct(v1, v2)
+}
+
+// v1 and v2 are known to have the same type.
+func equalStruct(v1, v2 reflect.Value) bool {
+	for i := 0; i < v1.NumField(); i++ {
+		f := v1.Type().Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		f1, f2 := v1.Field(i), v2.Field(i)
+		if f.Type.Kind() == reflect.Ptr {
+			if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
+				// both unset
+				continue
+			} else if n1 != n2 {
+				// set/unset mismatch
+				return false
+			}
+			b1, ok := f1.Interface().(raw)
+			if ok {
+				b2 := f2.Interface().(raw)
+				// RawMessage
+				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
+					return false
+				}
+				continue
+			}
+			f1, f2 = f1.Elem(), f2.Elem()
+		}
+		if !equalAny(f1, f2) {
+			return false
+		}
+	}
+
+	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
+		em2 := v2.FieldByName("XXX_extensions")
+		if !equalExtensions(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
+			return false
+		}
+	}
+
+	uf := v1.FieldByName("XXX_unrecognized")
+	if !uf.IsValid() {
+		return true
+	}
+
+	u1 := uf.Bytes()
+	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
+	if !bytes.Equal(u1, u2) {
+		return false
+	}
+
+	return true
+}
+
+// v1 and v2 are known to have the same type.
+func equalAny(v1, v2 reflect.Value) bool {
+	if v1.Type() == protoMessageType {
+		m1, _ := v1.Interface().(Message)
+		m2, _ := v2.Interface().(Message)
+		return Equal(m1, m2)
+	}
+	switch v1.Kind() {
+	case reflect.Bool:
+		return v1.Bool() == v2.Bool()
+	case reflect.Float32, reflect.Float64:
+		return v1.Float() == v2.Float()
+	case reflect.Int32, reflect.Int64:
+		return v1.Int() == v2.Int()
+	case reflect.Interface:
+		// Probably a oneof field; compare the inner values.
+		n1, n2 := v1.IsNil(), v2.IsNil()
+		if n1 || n2 {
+			return n1 == n2
+		}
+		e1, e2 := v1.Elem(), v2.Elem()
+		if e1.Type() != e2.Type() {
+			return false
+		}
+		return equalAny(e1, e2)
+	case reflect.Map:
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		for _, key := range v1.MapKeys() {
+			val2 := v2.MapIndex(key)
+			if !val2.IsValid() {
+				// This key was not found in the second map.
+				return false
+			}
+			if !equalAny(v1.MapIndex(key), val2) {
+				return false
+			}
+		}
+		return true
+	case reflect.Ptr:
+		return equalAny(v1.Elem(), v2.Elem())
+	case reflect.Slice:
+		if v1.Type().Elem().Kind() == reflect.Uint8 {
+			// short circuit: []byte
+			if v1.IsNil() != v2.IsNil() {
+				return false
+			}
+			return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
+		}
+
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		for i := 0; i < v1.Len(); i++ {
+			if !equalAny(v1.Index(i), v2.Index(i)) {
+				return false
+			}
+		}
+		return true
+	case reflect.String:
+		return v1.Interface().(string) == v2.Interface().(string)
+	case reflect.Struct:
+		return equalStruct(v1, v2)
+	case reflect.Uint32, reflect.Uint64:
+		return v1.Uint() == v2.Uint()
+	}
+
+	// unknown type, so not a protocol buffer
+	log.Printf("proto: don't know how to compare %v", v1)
+	return false
+}
+
+// base is the struct type that the extensions are based on.
+// em1 and em2 are extension maps.
+func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
+	if len(em1) != len(em2) {
+		return false
+	}
+
+	for extNum, e1 := range em1 {
+		e2, ok := em2[extNum]
+		if !ok {
+			return false
+		}
+
+		m1, m2 := e1.value, e2.value
+
+		if m1 != nil && m2 != nil {
+			// Both are unencoded.
+			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2)) {
+				return false
+			}
+			continue
+		}
+
+		// At least one is encoded. To do a semantically correct comparison
+		// we need to unmarshal them first.
+		var desc *ExtensionDesc
+		if m := extensionMaps[base]; m != nil {
+			desc = m[extNum]
+		}
+		if desc == nil {
+			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
+			continue
+		}
+		var err error
+		if m1 == nil {
+			m1, err = decodeExtension(e1.enc, desc)
+		}
+		if m2 == nil && err == nil {
+			m2, err = decodeExtension(e2.enc, desc)
+		}
+		if err != nil {
+			// The encoded form is invalid.
+			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
+			return false
+		}
+		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2)) {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
new file mode 100644
index 0000000000..9a6374fdbd
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
@@ -0,0 +1,519 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Types and routines for supporting protocol buffer extensions.
+ */
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+	"sync"
+)
+
+// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
+var ErrMissingExtension = errors.New("proto: missing extension")
+
+// ExtensionRange represents a range of message extensions for a protocol buffer.
+// Used in code generated by the protocol compiler.
+type ExtensionRange struct {
+	Start, End int32 // both inclusive
+}
+
+// extendableProto is an interface implemented by any protocol buffer that may be extended.
+type extendableProto interface {
+	Message
+	ExtensionRangeArray() []ExtensionRange
+}
+
+type extensionsMap interface {
+	extendableProto
+	ExtensionMap() map[int32]Extension
+}
+
+type extensionsBytes interface {
+	extendableProto
+	GetExtensions() *[]byte
+}
+
+var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
+
+// ExtensionDesc represents an extension specification.
+// Used in generated code from the protocol compiler.
+type ExtensionDesc struct {
+	ExtendedType  Message     // nil pointer to the type that is being extended
+	ExtensionType interface{} // nil pointer to the extension type
+	Field         int32       // field number
+	Name          string      // fully-qualified name of extension, for text formatting
+	Tag           string      // protobuf tag style
+}
+
+func (ed *ExtensionDesc) repeated() bool {
+	t := reflect.TypeOf(ed.ExtensionType)
+	return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
+}
+
+// Extension represents an extension in a message.
+type Extension struct {
+	// When an extension is stored in a message using SetExtension
+	// only desc and value are set. When the message is marshaled
+	// enc will be set to the encoded form of the message.
+	//
+	// When a message is unmarshaled and contains extensions, each
+	// extension will have only enc set. When such an extension is
+	// accessed using GetExtension (or GetExtensions) desc and value
+	// will be set.
+	desc  *ExtensionDesc
+	value interface{}
+	enc   []byte
+}
+
+// SetRawExtension is for testing only.
+func SetRawExtension(base extendableProto, id int32, b []byte) {
+	if ebase, ok := base.(extensionsMap); ok {
+		ebase.ExtensionMap()[id] = Extension{enc: b}
+	} else if ebase, ok := base.(extensionsBytes); ok {
+		clearExtension(base, id)
+		ext := ebase.GetExtensions()
+		*ext = append(*ext, b...)
+	} else {
+		panic("unreachable")
+	}
+}
+
+// isExtensionField returns true iff the given field number is in an extension range.
+func isExtensionField(pb extendableProto, field int32) bool {
+	for _, er := range pb.ExtensionRangeArray() {
+		if er.Start <= field && field <= er.End {
+			return true
+		}
+	}
+	return false
+}
+
+// checkExtensionTypes checks that the given extension is valid for pb.
+func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
+	// Check the extended type.
+	if a, b := reflect.TypeOf(pb), reflect.TypeOf(extension.ExtendedType); a != b {
+		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
+	}
+	// Check the range.
+	if !isExtensionField(pb, extension.Field) {
+		return errors.New("proto: bad extension number; not in declared ranges")
+	}
+	return nil
+}
+
+// extPropKey is sufficient to uniquely identify an extension.
+type extPropKey struct {
+	base  reflect.Type
+	field int32
+}
+
+var extProp = struct {
+	sync.RWMutex
+	m map[extPropKey]*Properties
+}{
+	m: make(map[extPropKey]*Properties),
+}
+
+func extensionProperties(ed *ExtensionDesc) *Properties {
+	key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
+
+	extProp.RLock()
+	if prop, ok := extProp.m[key]; ok {
+		extProp.RUnlock()
+		return prop
+	}
+	extProp.RUnlock()
+
+	extProp.Lock()
+	defer extProp.Unlock()
+	// Check again.
+	if prop, ok := extProp.m[key]; ok {
+		return prop
+	}
+
+	prop := new(Properties)
+	prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
+	extProp.m[key] = prop
+	return prop
+}
+
+// encodeExtensionMap encodes any unmarshaled (unencoded) extensions in m.
+func encodeExtensionMap(m map[int32]Extension) error {
+	for k, e := range m {
+		err := encodeExtension(&e)
+		if err != nil {
+			return err
+		}
+		m[k] = e
+	}
+	return nil
+}
+
+func encodeExtension(e *Extension) error {
+	if e.value == nil || e.desc == nil {
+		// Extension is only in its encoded form.
+		return nil
+	}
+	// We don't skip extensions that have an encoded form set,
+	// because the extension value may have been mutated after
+	// the last time this function was called.
+
+	et := reflect.TypeOf(e.desc.ExtensionType)
+	props := extensionProperties(e.desc)
+
+	p := NewBuffer(nil)
+	// If e.value has type T, the encoder expects a *struct{ X T }.
+	// Pass a *T with a zero field and hope it all works out.
+	x := reflect.New(et)
+	x.Elem().Set(reflect.ValueOf(e.value))
+	if err := props.enc(p, props, toStructPointer(x)); err != nil {
+		return err
+	}
+	e.enc = p.buf
+	return nil
+}
+
+func sizeExtensionMap(m map[int32]Extension) (n int) {
+	for _, e := range m {
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			n += len(e.enc)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		et := reflect.TypeOf(e.desc.ExtensionType)
+		props := extensionProperties(e.desc)
+
+		// If e.value has type T, the encoder expects a *struct{ X T }.
+		// Pass a *T with a zero field and hope it all works out.
+		x := reflect.New(et)
+		x.Elem().Set(reflect.ValueOf(e.value))
+		n += props.size(props, toStructPointer(x))
+	}
+	return
+}
+
+// HasExtension returns whether the given extension is present in pb.
+func HasExtension(pb extendableProto, extension *ExtensionDesc) bool {
+	// TODO: Check types, field numbers, etc.?
+	if epb, doki := pb.(extensionsMap); doki {
+		_, ok := epb.ExtensionMap()[extension.Field]
+		return ok
+	} else if epb, doki := pb.(extensionsBytes); doki {
+		ext := epb.GetExtensions()
+		buf := *ext
+		o := 0
+		for o < len(buf) {
+			tag, n := DecodeVarint(buf[o:])
+			fieldNum := int32(tag >> 3)
+			if int32(fieldNum) == extension.Field {
+				return true
+			}
+			wireType := int(tag & 0x7)
+			o += n
+			l, err := size(buf[o:], wireType)
+			if err != nil {
+				return false
+			}
+			o += l
+		}
+		return false
+	}
+	panic("unreachable")
+}
+
+func deleteExtension(pb extensionsBytes, theFieldNum int32, offset int) int {
+	ext := pb.GetExtensions()
+	for offset < len(*ext) {
+		tag, n1 := DecodeVarint((*ext)[offset:])
+		fieldNum := int32(tag >> 3)
+		wireType := int(tag & 0x7)
+		n2, err := size((*ext)[offset+n1:], wireType)
+		if err != nil {
+			panic(err)
+		}
+		newOffset := offset + n1 + n2
+		if fieldNum == theFieldNum {
+			*ext = append((*ext)[:offset], (*ext)[newOffset:]...)
+			return offset
+		}
+		offset = newOffset
+	}
+	return -1
+}
+
+func clearExtension(pb extendableProto, fieldNum int32) {
+	if epb, doki := pb.(extensionsMap); doki {
+		delete(epb.ExtensionMap(), fieldNum)
+	} else if epb, doki := pb.(extensionsBytes); doki {
+		offset := 0
+		for offset != -1 {
+			offset = deleteExtension(epb, fieldNum, offset)
+		}
+	} else {
+		panic("unreachable")
+	}
+}
+
+// ClearExtension removes the given extension from pb.
+func ClearExtension(pb extendableProto, extension *ExtensionDesc) {
+	// TODO: Check types, field numbers, etc.?
+	clearExtension(pb, extension.Field)
+}
+
+// GetExtension parses and returns the given extension of pb.
+// If the extension is not present it returns ErrMissingExtension.
+func GetExtension(pb extendableProto, extension *ExtensionDesc) (interface{}, error) {
+	if err := checkExtensionTypes(pb, extension); err != nil {
+		return nil, err
+	}
+
+	if epb, doki := pb.(extensionsMap); doki {
+		emap := epb.ExtensionMap()
+		e, ok := emap[extension.Field]
+		if !ok {
+			// defaultExtensionValue returns the default value or
+			// ErrMissingExtension if there is no default.
+			return defaultExtensionValue(extension)
+		}
+		if e.value != nil {
+			// Already decoded. Check the descriptor, though.
+			if e.desc != extension {
+				// This shouldn't happen. If it does, it means that
+				// GetExtension was called twice with two different
+				// descriptors with the same field number.
+				return nil, errors.New("proto: descriptor conflict")
+			}
+			return e.value, nil
+		}
+
+		v, err := decodeExtension(e.enc, extension)
+		if err != nil {
+			return nil, err
+		}
+
+		// Remember the decoded version and drop the encoded version.
+		// That way it is safe to mutate what we return.
+		e.value = v
+		e.desc = extension
+		e.enc = nil
+		emap[extension.Field] = e
+		return e.value, nil
+	} else if epb, doki := pb.(extensionsBytes); doki {
+		ext := epb.GetExtensions()
+		o := 0
+		for o < len(*ext) {
+			tag, n := DecodeVarint((*ext)[o:])
+			fieldNum := int32(tag >> 3)
+			wireType := int(tag & 0x7)
+			l, err := size((*ext)[o+n:], wireType)
+			if err != nil {
+				return nil, err
+			}
+			if int32(fieldNum) == extension.Field {
+				v, err := decodeExtension((*ext)[o:o+n+l], extension)
+				if err != nil {
+					return nil, err
+				}
+				return v, nil
+			}
+			o += n + l
+		}
+		return defaultExtensionValue(extension)
+	}
+	panic("unreachable")
+}
+
+// defaultExtensionValue returns the default value for extension.
+// If no default for an extension is defined ErrMissingExtension is returned.
+func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
+	t := reflect.TypeOf(extension.ExtensionType)
+	props := extensionProperties(extension)
+
+	sf, _, err := fieldDefault(t, props)
+	if err != nil {
+		return nil, err
+	}
+
+	if sf == nil || sf.value == nil {
+		// There is no default value.
+		return nil, ErrMissingExtension
+	}
+
+	if t.Kind() != reflect.Ptr {
+		// We do not need to return a Ptr, we can directly return sf.value.
+		return sf.value, nil
+	}
+
+	// We need to return an interface{} that is a pointer to sf.value.
+	value := reflect.New(t).Elem()
+	value.Set(reflect.New(value.Type().Elem()))
+	if sf.kind == reflect.Int32 {
+		// We may have an int32 or an enum, but the underlying data is int32.
+		// Since we can't set an int32 into a non int32 reflect.value directly
+		// set it as a int32.
+		value.Elem().SetInt(int64(sf.value.(int32)))
+	} else {
+		value.Elem().Set(reflect.ValueOf(sf.value))
+	}
+	return value.Interface(), nil
+}
+
+// decodeExtension decodes an extension encoded in b.
+func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
+	o := NewBuffer(b)
+
+	t := reflect.TypeOf(extension.ExtensionType)
+	rep := extension.repeated()
+
+	props := extensionProperties(extension)
+
+	// t is a pointer to a struct, pointer to basic type or a slice.
+	// Allocate a "field" to store the pointer/slice itself; the
+	// pointer/slice will be stored here. We pass
+	// the address of this field to props.dec.
+	// This passes a zero field and a *t and lets props.dec
+	// interpret it as a *struct{ x t }.
+	value := reflect.New(t).Elem()
+
+	for {
+		// Discard wire type and field number varint. It isn't needed.
+		if _, err := o.DecodeVarint(); err != nil {
+			return nil, err
+		}
+
+		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
+			return nil, err
+		}
+
+		if !rep || o.index >= len(o.buf) {
+			break
+		}
+	}
+	return value.Interface(), nil
+}
+
+// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
+// The returned slice has the same length as es; missing extensions will appear as nil elements.
+func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
+	epb, ok := pb.(extendableProto)
+	if !ok {
+		err = errors.New("proto: not an extendable proto")
+		return
+	}
+	extensions = make([]interface{}, len(es))
+	for i, e := range es {
+		extensions[i], err = GetExtension(epb, e)
+		if err == ErrMissingExtension {
+			err = nil
+		}
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+// SetExtension sets the specified extension of pb to the specified value.
+func SetExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
+	if err := checkExtensionTypes(pb, extension); err != nil {
+		return err
+	}
+	typ := reflect.TypeOf(extension.ExtensionType)
+	if typ != reflect.TypeOf(value) {
+		return errors.New("proto: bad extension value type")
+	}
+	// nil extension values need to be caught early, because the
+	// encoder can't distinguish an ErrNil due to a nil extension
+	// from an ErrNil due to a missing field. Extensions are
+	// always optional, so the encoder would just swallow the error
+	// and drop all the extensions from the encoded message.
+	if reflect.ValueOf(value).IsNil() {
+		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
+	}
+	return setExtension(pb, extension, value)
+}
+
+func setExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
+	if epb, doki := pb.(extensionsMap); doki {
+		epb.ExtensionMap()[extension.Field] = Extension{desc: extension, value: value}
+	} else if epb, doki := pb.(extensionsBytes); doki {
+		ClearExtension(pb, extension)
+		ext := epb.GetExtensions()
+		et := reflect.TypeOf(extension.ExtensionType)
+		props := extensionProperties(extension)
+		p := NewBuffer(nil)
+		x := reflect.New(et)
+		x.Elem().Set(reflect.ValueOf(value))
+		if err := props.enc(p, props, toStructPointer(x)); err != nil {
+			return err
+		}
+		*ext = append(*ext, p.buf...)
+	}
+	return nil
+}
+
+// A global registry of extensions.
+// The generated code will register the generated descriptors by calling RegisterExtension.
+
+var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
+
+// RegisterExtension is called from the generated code.
+func RegisterExtension(desc *ExtensionDesc) {
+	st := reflect.TypeOf(desc.ExtendedType).Elem()
+	m := extensionMaps[st]
+	if m == nil {
+		m = make(map[int32]*ExtensionDesc)
+		extensionMaps[st] = m
+	}
+	if _, ok := m[desc.Field]; ok {
+		panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
+	}
+	m[desc.Field] = desc
+}
+
+// RegisteredExtensions returns a map of the registered extensions of a
+// protocol buffer struct, indexed by the extension number.
+// The argument pb should be a nil pointer to the struct type.
+func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
+	return extensionMaps[reflect.TypeOf(pb).Elem()]
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go
new file mode 100644
index 0000000000..bd55fb68b6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go
@@ -0,0 +1,221 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"reflect"
+	"sort"
+	"strings"
+)
+
+func GetBoolExtension(pb extendableProto, extension *ExtensionDesc, ifnotset bool) bool {
+	if reflect.ValueOf(pb).IsNil() {
+		return ifnotset
+	}
+	value, err := GetExtension(pb, extension)
+	if err != nil {
+		return ifnotset
+	}
+	if value == nil {
+		return ifnotset
+	}
+	if value.(*bool) == nil {
+		return ifnotset
+	}
+	return *(value.(*bool))
+}
+
+func (this *Extension) Equal(that *Extension) bool {
+	return bytes.Equal(this.enc, that.enc)
+}
+
+func SizeOfExtensionMap(m map[int32]Extension) (n int) {
+	return sizeExtensionMap(m)
+}
+
+type sortableMapElem struct {
+	field int32
+	ext   Extension
+}
+
+func newSortableExtensionsFromMap(m map[int32]Extension) sortableExtensions {
+	s := make(sortableExtensions, 0, len(m))
+	for k, v := range m {
+		s = append(s, &sortableMapElem{field: k, ext: v})
+	}
+	return s
+}
+
+type sortableExtensions []*sortableMapElem
+
+func (this sortableExtensions) Len() int { return len(this) }
+
+func (this sortableExtensions) Swap(i, j int) { this[i], this[j] = this[j], this[i] }
+
+func (this sortableExtensions) Less(i, j int) bool { return this[i].field < this[j].field }
+
+func (this sortableExtensions) String() string {
+	sort.Sort(this)
+	ss := make([]string, len(this))
+	for i := range this {
+		ss[i] = fmt.Sprintf("%d: %v", this[i].field, this[i].ext)
+	}
+	return "map[" + strings.Join(ss, ",") + "]"
+}
+
+func StringFromExtensionsMap(m map[int32]Extension) string {
+	return newSortableExtensionsFromMap(m).String()
+}
+
+func StringFromExtensionsBytes(ext []byte) string {
+	m, err := BytesToExtensionsMap(ext)
+	if err != nil {
+		panic(err)
+	}
+	return StringFromExtensionsMap(m)
+}
+
+func EncodeExtensionMap(m map[int32]Extension, data []byte) (n int, err error) {
+	if err := encodeExtensionMap(m); err != nil {
+		return 0, err
+	}
+	keys := make([]int, 0, len(m))
+	for k := range m {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+	for _, k := range keys {
+		n += copy(data[n:], m[int32(k)].enc)
+	}
+	return n, nil
+}
+
+func GetRawExtension(m map[int32]Extension, id int32) ([]byte, error) {
+	if m[id].value == nil || m[id].desc == nil {
+		return m[id].enc, nil
+	}
+	if err := encodeExtensionMap(m); err != nil {
+		return nil, err
+	}
+	return m[id].enc, nil
+}
+
+func size(buf []byte, wire int) (int, error) {
+	switch wire {
+	case WireVarint:
+		_, n := DecodeVarint(buf)
+		return n, nil
+	case WireFixed64:
+		return 8, nil
+	case WireBytes:
+		v, n := DecodeVarint(buf)
+		return int(v) + n, nil
+	case WireFixed32:
+		return 4, nil
+	case WireStartGroup:
+		offset := 0
+		for {
+			u, n := DecodeVarint(buf[offset:])
+			fwire := int(u & 0x7)
+			offset += n
+			if fwire == WireEndGroup {
+				return offset, nil
+			}
+			s, err := size(buf[offset:], wire)
+			if err != nil {
+				return 0, err
+			}
+			offset += s
+		}
+	}
+	return 0, fmt.Errorf("proto: can't get size for unknown wire type %d", wire)
+}
+
+func BytesToExtensionsMap(buf []byte) (map[int32]Extension, error) {
+	m := make(map[int32]Extension)
+	i := 0
+	for i < len(buf) {
+		tag, n := DecodeVarint(buf[i:])
+		if n <= 0 {
+			return nil, fmt.Errorf("unable to decode varint")
+		}
+		fieldNum := int32(tag >> 3)
+		wireType := int(tag & 0x7)
+		l, err := size(buf[i+n:], wireType)
+		if err != nil {
+			return nil, err
+		}
+		end := i + int(l) + n
+		m[int32(fieldNum)] = Extension{enc: buf[i:end]}
+		i = end
+	}
+	return m, nil
+}
+
+func NewExtension(e []byte) Extension {
+	ee := Extension{enc: make([]byte, len(e))}
+	copy(ee.enc, e)
+	return ee
+}
+
+func (this Extension) GoString() string {
+	if this.enc == nil {
+		if err := encodeExtension(&this); err != nil {
+			panic(err)
+		}
+	}
+	return fmt.Sprintf("proto.NewExtension(%#v)", this.enc)
+}
+
+func SetUnsafeExtension(pb extendableProto, fieldNum int32, value interface{}) error {
+	typ := reflect.TypeOf(pb).Elem()
+	ext, ok := extensionMaps[typ]
+	if !ok {
+		return fmt.Errorf("proto: bad extended type; %s is not extendable", typ.String())
+	}
+	desc, ok := ext[fieldNum]
+	if !ok {
+		return errors.New("proto: bad extension number; not in declared ranges")
+	}
+	return setExtension(pb, desc, value)
+}
+
+func GetUnsafeExtension(pb extendableProto, fieldNum int32) (interface{}, error) {
+	typ := reflect.TypeOf(pb).Elem()
+	ext, ok := extensionMaps[typ]
+	if !ok {
+		return nil, fmt.Errorf("proto: bad extended type; %s is not extendable", typ.String())
+	}
+	desc, ok := ext[fieldNum]
+	if !ok {
+		return nil, fmt.Errorf("unregistered field number %d", fieldNum)
+	}
+	return GetExtension(pb, desc)
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
new file mode 100644
index 0000000000..8ffa91a3e9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
@@ -0,0 +1,883 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+Package proto converts data structures to and from the wire format of
+protocol buffers.  It works in concert with the Go source code generated
+for .proto files by the protocol compiler.
+
+A summary of the properties of the protocol buffer interface
+for a protocol buffer variable v:
+
+  - Names are turned from camel_case to CamelCase for export.
+  - There are no methods on v to set fields; just treat
+	them as structure fields.
+  - There are getters that return a field's value if set,
+	and return the field's default value if unset.
+	The getters work even if the receiver is a nil message.
+  - The zero value for a struct is its correct initialization state.
+	All desired fields must be set before marshaling.
+  - A Reset() method will restore a protobuf struct to its zero state.
+  - Non-repeated fields are pointers to the values; nil means unset.
+	That is, optional or required field int32 f becomes F *int32.
+  - Repeated fields are slices.
+  - Helper functions are available to aid the setting of fields.
+	msg.Foo = proto.String("hello") // set field
+  - Constants are defined to hold the default values of all fields that
+	have them.  They have the form Default_StructName_FieldName.
+	Because the getter methods handle defaulted values,
+	direct use of these constants should be rare.
+  - Enums are given type names and maps from names to values.
+	Enum values are prefixed by the enclosing message's name, or by the
+	enum's type name if it is a top-level enum. Enum types have a String
+	method, and a Enum method to assist in message construction.
+  - Nested messages, groups and enums have type names prefixed with the name of
+	the surrounding message type.
+  - Extensions are given descriptor names that start with E_,
+	followed by an underscore-delimited list of the nested messages
+	that contain it (if any) followed by the CamelCased name of the
+	extension field itself.  HasExtension, ClearExtension, GetExtension
+	and SetExtension are functions for manipulating extensions.
+  - Oneof field sets are given a single field in their message,
+	with distinguished wrapper types for each possible field value.
+  - Marshal and Unmarshal are functions to encode and decode the wire format.
+
+The simplest way to describe this is to see an example.
+Given file test.proto, containing
+
+	package example;
+
+	enum FOO { X = 17; }
+
+	message Test {
+	  required string label = 1;
+	  optional int32 type = 2 [default=77];
+	  repeated int64 reps = 3;
+	  optional group OptionalGroup = 4 {
+	    required string RequiredField = 5;
+	  }
+	  oneof union {
+	    int32 number = 6;
+	    string name = 7;
+	  }
+	}
+
+The resulting file, test.pb.go, is:
+
+	package example
+
+	import proto "github.com/gogo/protobuf/proto"
+	import math "math"
+
+	type FOO int32
+	const (
+		FOO_X FOO = 17
+	)
+	var FOO_name = map[int32]string{
+		17: "X",
+	}
+	var FOO_value = map[string]int32{
+		"X": 17,
+	}
+
+	func (x FOO) Enum() *FOO {
+		p := new(FOO)
+		*p = x
+		return p
+	}
+	func (x FOO) String() string {
+		return proto.EnumName(FOO_name, int32(x))
+	}
+	func (x *FOO) UnmarshalJSON(data []byte) error {
+		value, err := proto.UnmarshalJSONEnum(FOO_value, data)
+		if err != nil {
+			return err
+		}
+		*x = FOO(value)
+		return nil
+	}
+
+	type Test struct {
+		Label         *string             `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
+		Type          *int32              `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
+		Reps          []int64             `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
+		Optionalgroup *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
+		// Types that are valid to be assigned to Union:
+		//	*Test_Number
+		//	*Test_Name
+		Union            isTest_Union `protobuf_oneof:"union"`
+		XXX_unrecognized []byte       `json:"-"`
+	}
+	func (m *Test) Reset()         { *m = Test{} }
+	func (m *Test) String() string { return proto.CompactTextString(m) }
+	func (*Test) ProtoMessage() {}
+
+	type isTest_Union interface {
+		isTest_Union()
+	}
+
+	type Test_Number struct {
+		Number int32 `protobuf:"varint,6,opt,name=number"`
+	}
+	type Test_Name struct {
+		Name string `protobuf:"bytes,7,opt,name=name"`
+	}
+
+	func (*Test_Number) isTest_Union() {}
+	func (*Test_Name) isTest_Union()   {}
+
+	func (m *Test) GetUnion() isTest_Union {
+		if m != nil {
+			return m.Union
+		}
+		return nil
+	}
+	const Default_Test_Type int32 = 77
+
+	func (m *Test) GetLabel() string {
+		if m != nil && m.Label != nil {
+			return *m.Label
+		}
+		return ""
+	}
+
+	func (m *Test) GetType() int32 {
+		if m != nil && m.Type != nil {
+			return *m.Type
+		}
+		return Default_Test_Type
+	}
+
+	func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
+		if m != nil {
+			return m.Optionalgroup
+		}
+		return nil
+	}
+
+	type Test_OptionalGroup struct {
+		RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
+	}
+	func (m *Test_OptionalGroup) Reset()         { *m = Test_OptionalGroup{} }
+	func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
+
+	func (m *Test_OptionalGroup) GetRequiredField() string {
+		if m != nil && m.RequiredField != nil {
+			return *m.RequiredField
+		}
+		return ""
+	}
+
+	func (m *Test) GetNumber() int32 {
+		if x, ok := m.GetUnion().(*Test_Number); ok {
+			return x.Number
+		}
+		return 0
+	}
+
+	func (m *Test) GetName() string {
+		if x, ok := m.GetUnion().(*Test_Name); ok {
+			return x.Name
+		}
+		return ""
+	}
+
+	func init() {
+		proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
+	}
+
+To create and play with a Test object:
+
+	package main
+
+	import (
+		"log"
+
+		"github.com/gogo/protobuf/proto"
+		pb "./example.pb"
+	)
+
+	func main() {
+		test := &pb.Test{
+			Label: proto.String("hello"),
+			Type:  proto.Int32(17),
+			Optionalgroup: &pb.Test_OptionalGroup{
+				RequiredField: proto.String("good bye"),
+			},
+			Union: &pb.Test_Name{"fred"},
+		}
+		data, err := proto.Marshal(test)
+		if err != nil {
+			log.Fatal("marshaling error: ", err)
+		}
+		newTest := &pb.Test{}
+		err = proto.Unmarshal(data, newTest)
+		if err != nil {
+			log.Fatal("unmarshaling error: ", err)
+		}
+		// Now test and newTest contain the same data.
+		if test.GetLabel() != newTest.GetLabel() {
+			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
+		}
+		// Use a type switch to determine which oneof was set.
+		switch u := test.Union.(type) {
+		case *pb.Test_Number: // u.Number contains the number.
+		case *pb.Test_Name: // u.Name contains the string.
+		}
+		// etc.
+	}
+*/
+package proto
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"reflect"
+	"sort"
+	"strconv"
+	"sync"
+)
+
+// Message is implemented by generated protocol buffer messages.
+type Message interface {
+	Reset()
+	String() string
+	ProtoMessage()
+}
+
+// Stats records allocation details about the protocol buffer encoders
+// and decoders.  Useful for tuning the library itself.
+type Stats struct {
+	Emalloc uint64 // mallocs in encode
+	Dmalloc uint64 // mallocs in decode
+	Encode  uint64 // number of encodes
+	Decode  uint64 // number of decodes
+	Chit    uint64 // number of cache hits
+	Cmiss   uint64 // number of cache misses
+	Size    uint64 // number of sizes
+}
+
+// Set to true to enable stats collection.
+const collectStats = false
+
+var stats Stats
+
+// GetStats returns a copy of the global Stats structure.
+func GetStats() Stats { return stats }
+
+// A Buffer is a buffer manager for marshaling and unmarshaling
+// protocol buffers.  It may be reused between invocations to
+// reduce memory usage.  It is not necessary to use a Buffer;
+// the global functions Marshal and Unmarshal create a
+// temporary Buffer and are fine for most applications.
+type Buffer struct {
+	buf   []byte // encode/decode byte stream
+	index int    // write point
+
+	// pools of basic types to amortize allocation.
+	bools   []bool
+	uint32s []uint32
+	uint64s []uint64
+
+	// extra pools, only used with pointer_reflect.go
+	int32s   []int32
+	int64s   []int64
+	float32s []float32
+	float64s []float64
+}
+
+// NewBuffer allocates a new Buffer and initializes its internal data to
+// the contents of the argument slice.
+func NewBuffer(e []byte) *Buffer {
+	return &Buffer{buf: e}
+}
+
+// Reset resets the Buffer, ready for marshaling a new protocol buffer.
+func (p *Buffer) Reset() {
+	p.buf = p.buf[0:0] // for reading/writing
+	p.index = 0        // for reading
+}
+
+// SetBuf replaces the internal buffer with the slice,
+// ready for unmarshaling the contents of the slice.
+func (p *Buffer) SetBuf(s []byte) {
+	p.buf = s
+	p.index = 0
+}
+
+// Bytes returns the contents of the Buffer.
+func (p *Buffer) Bytes() []byte { return p.buf }
+
+/*
+ * Helper routines for simplifying the creation of optional fields of basic type.
+ */
+
+// Bool is a helper routine that allocates a new bool value
+// to store v and returns a pointer to it.
+func Bool(v bool) *bool {
+	return &v
+}
+
+// Int32 is a helper routine that allocates a new int32 value
+// to store v and returns a pointer to it.
+func Int32(v int32) *int32 {
+	return &v
+}
+
+// Int is a helper routine that allocates a new int32 value
+// to store v and returns a pointer to it, but unlike Int32
+// its argument value is an int.
+func Int(v int) *int32 {
+	p := new(int32)
+	*p = int32(v)
+	return p
+}
+
+// Int64 is a helper routine that allocates a new int64 value
+// to store v and returns a pointer to it.
+func Int64(v int64) *int64 {
+	return &v
+}
+
+// Float32 is a helper routine that allocates a new float32 value
+// to store v and returns a pointer to it.
+func Float32(v float32) *float32 {
+	return &v
+}
+
+// Float64 is a helper routine that allocates a new float64 value
+// to store v and returns a pointer to it.
+func Float64(v float64) *float64 {
+	return &v
+}
+
+// Uint32 is a helper routine that allocates a new uint32 value
+// to store v and returns a pointer to it.
+func Uint32(v uint32) *uint32 {
+	return &v
+}
+
+// Uint64 is a helper routine that allocates a new uint64 value
+// to store v and returns a pointer to it.
+func Uint64(v uint64) *uint64 {
+	return &v
+}
+
+// String is a helper routine that allocates a new string value
+// to store v and returns a pointer to it.
+func String(v string) *string {
+	return &v
+}
+
+// EnumName is a helper function to simplify printing protocol buffer enums
+// by name.  Given an enum map and a value, it returns a useful string.
+func EnumName(m map[int32]string, v int32) string {
+	s, ok := m[v]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(v))
+}
+
+// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
+// from their JSON-encoded representation. Given a map from the enum's symbolic
+// names to its int values, and a byte buffer containing the JSON-encoded
+// value, it returns an int32 that can be cast to the enum type by the caller.
+//
+// The function can deal with both JSON representations, numeric and symbolic.
+func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
+	if data[0] == '"' {
+		// New style: enums are strings.
+		var repr string
+		if err := json.Unmarshal(data, &repr); err != nil {
+			return -1, err
+		}
+		val, ok := m[repr]
+		if !ok {
+			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
+		}
+		return val, nil
+	}
+	// Old style: enums are ints.
+	var val int32
+	if err := json.Unmarshal(data, &val); err != nil {
+		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
+	}
+	return val, nil
+}
+
+// DebugPrint dumps the encoded data in b in a debugging format with a header
+// including the string s. Used in testing but made available for general debugging.
+func (p *Buffer) DebugPrint(s string, b []byte) {
+	var u uint64
+
+	obuf := p.buf
+	index := p.index
+	p.buf = b
+	p.index = 0
+	depth := 0
+
+	fmt.Printf("\n--- %s ---\n", s)
+
+out:
+	for {
+		for i := 0; i < depth; i++ {
+			fmt.Print("  ")
+		}
+
+		index := p.index
+		if index == len(p.buf) {
+			break
+		}
+
+		op, err := p.DecodeVarint()
+		if err != nil {
+			fmt.Printf("%3d: fetching op err %v\n", index, err)
+			break out
+		}
+		tag := op >> 3
+		wire := op & 7
+
+		switch wire {
+		default:
+			fmt.Printf("%3d: t=%3d unknown wire=%d\n",
+				index, tag, wire)
+			break out
+
+		case WireBytes:
+			var r []byte
+
+			r, err = p.DecodeRawBytes(false)
+			if err != nil {
+				break out
+			}
+			fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
+			if len(r) <= 6 {
+				for i := 0; i < len(r); i++ {
+					fmt.Printf(" %.2x", r[i])
+				}
+			} else {
+				for i := 0; i < 3; i++ {
+					fmt.Printf(" %.2x", r[i])
+				}
+				fmt.Printf(" ..")
+				for i := len(r) - 3; i < len(r); i++ {
+					fmt.Printf(" %.2x", r[i])
+				}
+			}
+			fmt.Printf("\n")
+
+		case WireFixed32:
+			u, err = p.DecodeFixed32()
+			if err != nil {
+				fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
+				break out
+			}
+			fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
+
+		case WireFixed64:
+			u, err = p.DecodeFixed64()
+			if err != nil {
+				fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
+				break out
+			}
+			fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
+
+		case WireVarint:
+			u, err = p.DecodeVarint()
+			if err != nil {
+				fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
+				break out
+			}
+			fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
+
+		case WireStartGroup:
+			fmt.Printf("%3d: t=%3d start\n", index, tag)
+			depth++
+
+		case WireEndGroup:
+			depth--
+			fmt.Printf("%3d: t=%3d end\n", index, tag)
+		}
+	}
+
+	if depth != 0 {
+		fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
+	}
+	fmt.Printf("\n")
+
+	p.buf = obuf
+	p.index = index
+}
+
+// SetDefaults sets unset protocol buffer fields to their default values.
+// It only modifies fields that are both unset and have defined defaults.
+// It recursively sets default values in any non-nil sub-messages.
+func SetDefaults(pb Message) {
+	setDefaults(reflect.ValueOf(pb), true, false)
+}
+
+// v is a pointer to a struct.
+func setDefaults(v reflect.Value, recur, zeros bool) {
+	v = v.Elem()
+
+	defaultMu.RLock()
+	dm, ok := defaults[v.Type()]
+	defaultMu.RUnlock()
+	if !ok {
+		dm = buildDefaultMessage(v.Type())
+		defaultMu.Lock()
+		defaults[v.Type()] = dm
+		defaultMu.Unlock()
+	}
+
+	for _, sf := range dm.scalars {
+		f := v.Field(sf.index)
+		if !f.IsNil() {
+			// field already set
+			continue
+		}
+		dv := sf.value
+		if dv == nil && !zeros {
+			// no explicit default, and don't want to set zeros
+			continue
+		}
+		fptr := f.Addr().Interface() // **T
+		// TODO: Consider batching the allocations we do here.
+		switch sf.kind {
+		case reflect.Bool:
+			b := new(bool)
+			if dv != nil {
+				*b = dv.(bool)
+			}
+			*(fptr.(**bool)) = b
+		case reflect.Float32:
+			f := new(float32)
+			if dv != nil {
+				*f = dv.(float32)
+			}
+			*(fptr.(**float32)) = f
+		case reflect.Float64:
+			f := new(float64)
+			if dv != nil {
+				*f = dv.(float64)
+			}
+			*(fptr.(**float64)) = f
+		case reflect.Int32:
+			// might be an enum
+			if ft := f.Type(); ft != int32PtrType {
+				// enum
+				f.Set(reflect.New(ft.Elem()))
+				if dv != nil {
+					f.Elem().SetInt(int64(dv.(int32)))
+				}
+			} else {
+				// int32 field
+				i := new(int32)
+				if dv != nil {
+					*i = dv.(int32)
+				}
+				*(fptr.(**int32)) = i
+			}
+		case reflect.Int64:
+			i := new(int64)
+			if dv != nil {
+				*i = dv.(int64)
+			}
+			*(fptr.(**int64)) = i
+		case reflect.String:
+			s := new(string)
+			if dv != nil {
+				*s = dv.(string)
+			}
+			*(fptr.(**string)) = s
+		case reflect.Uint8:
+			// exceptional case: []byte
+			var b []byte
+			if dv != nil {
+				db := dv.([]byte)
+				b = make([]byte, len(db))
+				copy(b, db)
+			} else {
+				b = []byte{}
+			}
+			*(fptr.(*[]byte)) = b
+		case reflect.Uint32:
+			u := new(uint32)
+			if dv != nil {
+				*u = dv.(uint32)
+			}
+			*(fptr.(**uint32)) = u
+		case reflect.Uint64:
+			u := new(uint64)
+			if dv != nil {
+				*u = dv.(uint64)
+			}
+			*(fptr.(**uint64)) = u
+		default:
+			log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
+		}
+	}
+
+	for _, ni := range dm.nested {
+		f := v.Field(ni)
+		// f is *T or []*T or map[T]*T
+		switch f.Kind() {
+		case reflect.Ptr:
+			if f.IsNil() {
+				continue
+			}
+			setDefaults(f, recur, zeros)
+
+		case reflect.Slice:
+			for i := 0; i < f.Len(); i++ {
+				e := f.Index(i)
+				if e.IsNil() {
+					continue
+				}
+				setDefaults(e, recur, zeros)
+			}
+
+		case reflect.Map:
+			for _, k := range f.MapKeys() {
+				e := f.MapIndex(k)
+				if e.IsNil() {
+					continue
+				}
+				setDefaults(e, recur, zeros)
+			}
+		}
+	}
+}
+
+var (
+	// defaults maps a protocol buffer struct type to a slice of the fields,
+	// with its scalar fields set to their proto-declared non-zero default values.
+	defaultMu sync.RWMutex
+	defaults  = make(map[reflect.Type]defaultMessage)
+
+	int32PtrType = reflect.TypeOf((*int32)(nil))
+)
+
+// defaultMessage represents information about the default values of a message.
+type defaultMessage struct {
+	scalars []scalarField
+	nested  []int // struct field index of nested messages
+}
+
+type scalarField struct {
+	index int          // struct field index
+	kind  reflect.Kind // element type (the T in *T or []T)
+	value interface{}  // the proto-declared default value, or nil
+}
+
+// t is a struct type.
+func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
+	sprop := GetProperties(t)
+	for _, prop := range sprop.Prop {
+		fi, ok := sprop.decoderTags.get(prop.Tag)
+		if !ok {
+			// XXX_unrecognized
+			continue
+		}
+		ft := t.Field(fi).Type
+
+		sf, nested, err := fieldDefault(ft, prop)
+		switch {
+		case err != nil:
+			log.Print(err)
+		case nested:
+			dm.nested = append(dm.nested, fi)
+		case sf != nil:
+			sf.index = fi
+			dm.scalars = append(dm.scalars, *sf)
+		}
+	}
+
+	return dm
+}
+
+// fieldDefault returns the scalarField for field type ft.
+// sf will be nil if the field can not have a default.
+// nestedMessage will be true if this is a nested message.
+// Note that sf.index is not set on return.
+func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
+	var canHaveDefault bool
+	switch ft.Kind() {
+	case reflect.Ptr:
+		if ft.Elem().Kind() == reflect.Struct {
+			nestedMessage = true
+		} else {
+			canHaveDefault = true // proto2 scalar field
+		}
+
+	case reflect.Slice:
+		switch ft.Elem().Kind() {
+		case reflect.Ptr:
+			nestedMessage = true // repeated message
+		case reflect.Uint8:
+			canHaveDefault = true // bytes field
+		}
+
+	case reflect.Map:
+		if ft.Elem().Kind() == reflect.Ptr {
+			nestedMessage = true // map with message values
+		}
+	}
+
+	if !canHaveDefault {
+		if nestedMessage {
+			return nil, true, nil
+		}
+		return nil, false, nil
+	}
+
+	// We now know that ft is a pointer or slice.
+	sf = &scalarField{kind: ft.Elem().Kind()}
+
+	// scalar fields without defaults
+	if !prop.HasDefault {
+		return sf, false, nil
+	}
+
+	// a scalar field: either *T or []byte
+	switch ft.Elem().Kind() {
+	case reflect.Bool:
+		x, err := strconv.ParseBool(prop.Default)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	case reflect.Float32:
+		x, err := strconv.ParseFloat(prop.Default, 32)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
+		}
+		sf.value = float32(x)
+	case reflect.Float64:
+		x, err := strconv.ParseFloat(prop.Default, 64)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	case reflect.Int32:
+		x, err := strconv.ParseInt(prop.Default, 10, 32)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
+		}
+		sf.value = int32(x)
+	case reflect.Int64:
+		x, err := strconv.ParseInt(prop.Default, 10, 64)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	case reflect.String:
+		sf.value = prop.Default
+	case reflect.Uint8:
+		// []byte (not *uint8)
+		sf.value = []byte(prop.Default)
+	case reflect.Uint32:
+		x, err := strconv.ParseUint(prop.Default, 10, 32)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
+		}
+		sf.value = uint32(x)
+	case reflect.Uint64:
+		x, err := strconv.ParseUint(prop.Default, 10, 64)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	default:
+		return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
+	}
+
+	return sf, false, nil
+}
+
+// Map fields may have key types of non-float scalars, strings and enums.
+// The easiest way to sort them in some deterministic order is to use fmt.
+// If this turns out to be inefficient we can always consider other options,
+// such as doing a Schwartzian transform.
+
+func mapKeys(vs []reflect.Value) sort.Interface {
+	s := mapKeySorter{
+		vs: vs,
+		// default Less function: textual comparison
+		less: func(a, b reflect.Value) bool {
+			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
+		},
+	}
+
+	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
+	// numeric keys are sorted numerically.
+	if len(vs) == 0 {
+		return s
+	}
+	switch vs[0].Kind() {
+	case reflect.Int32, reflect.Int64:
+		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
+	case reflect.Uint32, reflect.Uint64:
+		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
+	}
+
+	return s
+}
+
+type mapKeySorter struct {
+	vs   []reflect.Value
+	less func(a, b reflect.Value) bool
+}
+
+func (s mapKeySorter) Len() int      { return len(s.vs) }
+func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
+func (s mapKeySorter) Less(i, j int) bool {
+	return s.less(s.vs[i], s.vs[j])
+}
+
+// isProto3Zero reports whether v is a zero proto3 value.
+func isProto3Zero(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.Bool:
+		return !v.Bool()
+	case reflect.Int32, reflect.Int64:
+		return v.Int() == 0
+	case reflect.Uint32, reflect.Uint64:
+		return v.Uint() == 0
+	case reflect.Float32, reflect.Float64:
+		return v.Float() == 0
+	case reflect.String:
+		return v.String() == ""
+	}
+	return false
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go
new file mode 100644
index 0000000000..a6c2c06b23
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go
@@ -0,0 +1,40 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"encoding/json"
+	"strconv"
+)
+
+func MarshalJSONEnum(m map[int32]string, value int32) ([]byte, error) {
+	s, ok := m[value]
+	if !ok {
+		s = strconv.Itoa(int(value))
+	}
+	return json.Marshal(s)
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go
new file mode 100644
index 0000000000..e25e01e637
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go
@@ -0,0 +1,280 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Support for message sets.
+ */
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"reflect"
+	"sort"
+)
+
+// errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
+// A message type ID is required for storing a protocol buffer in a message set.
+var errNoMessageTypeID = errors.New("proto does not have a message type ID")
+
+// The first two types (_MessageSet_Item and messageSet)
+// model what the protocol compiler produces for the following protocol message:
+//   message MessageSet {
+//     repeated group Item = 1 {
+//       required int32 type_id = 2;
+//       required string message = 3;
+//     };
+//   }
+// That is the MessageSet wire format. We can't use a proto to generate these
+// because that would introduce a circular dependency between it and this package.
+
+type _MessageSet_Item struct {
+	TypeId  *int32 `protobuf:"varint,2,req,name=type_id"`
+	Message []byte `protobuf:"bytes,3,req,name=message"`
+}
+
+type messageSet struct {
+	Item             []*_MessageSet_Item `protobuf:"group,1,rep"`
+	XXX_unrecognized []byte
+	// TODO: caching?
+}
+
+// Make sure messageSet is a Message.
+var _ Message = (*messageSet)(nil)
+
+// messageTypeIder is an interface satisfied by a protocol buffer type
+// that may be stored in a MessageSet.
+type messageTypeIder interface {
+	MessageTypeId() int32
+}
+
+func (ms *messageSet) find(pb Message) *_MessageSet_Item {
+	mti, ok := pb.(messageTypeIder)
+	if !ok {
+		return nil
+	}
+	id := mti.MessageTypeId()
+	for _, item := range ms.Item {
+		if *item.TypeId == id {
+			return item
+		}
+	}
+	return nil
+}
+
+func (ms *messageSet) Has(pb Message) bool {
+	if ms.find(pb) != nil {
+		return true
+	}
+	return false
+}
+
+func (ms *messageSet) Unmarshal(pb Message) error {
+	if item := ms.find(pb); item != nil {
+		return Unmarshal(item.Message, pb)
+	}
+	if _, ok := pb.(messageTypeIder); !ok {
+		return errNoMessageTypeID
+	}
+	return nil // TODO: return error instead?
+}
+
+func (ms *messageSet) Marshal(pb Message) error {
+	msg, err := Marshal(pb)
+	if err != nil {
+		return err
+	}
+	if item := ms.find(pb); item != nil {
+		// reuse existing item
+		item.Message = msg
+		return nil
+	}
+
+	mti, ok := pb.(messageTypeIder)
+	if !ok {
+		return errNoMessageTypeID
+	}
+
+	mtid := mti.MessageTypeId()
+	ms.Item = append(ms.Item, &_MessageSet_Item{
+		TypeId:  &mtid,
+		Message: msg,
+	})
+	return nil
+}
+
+func (ms *messageSet) Reset()         { *ms = messageSet{} }
+func (ms *messageSet) String() string { return CompactTextString(ms) }
+func (*messageSet) ProtoMessage()     {}
+
+// Support for the message_set_wire_format message option.
+
+func skipVarint(buf []byte) []byte {
+	i := 0
+	for ; buf[i]&0x80 != 0; i++ {
+	}
+	return buf[i+1:]
+}
+
+// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
+// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
+func MarshalMessageSet(m map[int32]Extension) ([]byte, error) {
+	if err := encodeExtensionMap(m); err != nil {
+		return nil, err
+	}
+
+	// Sort extension IDs to provide a deterministic encoding.
+	// See also enc_map in encode.go.
+	ids := make([]int, 0, len(m))
+	for id := range m {
+		ids = append(ids, int(id))
+	}
+	sort.Ints(ids)
+
+	ms := &messageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
+	for _, id := range ids {
+		e := m[int32(id)]
+		// Remove the wire type and field number varint, as well as the length varint.
+		msg := skipVarint(skipVarint(e.enc))
+
+		ms.Item = append(ms.Item, &_MessageSet_Item{
+			TypeId:  Int32(int32(id)),
+			Message: msg,
+		})
+	}
+	return Marshal(ms)
+}
+
+// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
+// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
+func UnmarshalMessageSet(buf []byte, m map[int32]Extension) error {
+	ms := new(messageSet)
+	if err := Unmarshal(buf, ms); err != nil {
+		return err
+	}
+	for _, item := range ms.Item {
+		id := *item.TypeId
+		msg := item.Message
+
+		// Restore wire type and field number varint, plus length varint.
+		// Be careful to preserve duplicate items.
+		b := EncodeVarint(uint64(id)<<3 | WireBytes)
+		if ext, ok := m[id]; ok {
+			// Existing data; rip off the tag and length varint
+			// so we join the new data correctly.
+			// We can assume that ext.enc is set because we are unmarshaling.
+			o := ext.enc[len(b):]   // skip wire type and field number
+			_, n := DecodeVarint(o) // calculate length of length varint
+			o = o[n:]               // skip length varint
+			msg = append(o, msg...) // join old data and new data
+		}
+		b = append(b, EncodeVarint(uint64(len(msg)))...)
+		b = append(b, msg...)
+
+		m[id] = Extension{enc: b}
+	}
+	return nil
+}
+
+// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
+// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
+func MarshalMessageSetJSON(m map[int32]Extension) ([]byte, error) {
+	var b bytes.Buffer
+	b.WriteByte('{')
+
+	// Process the map in key order for deterministic output.
+	ids := make([]int32, 0, len(m))
+	for id := range m {
+		ids = append(ids, id)
+	}
+	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
+
+	for i, id := range ids {
+		ext := m[id]
+		if i > 0 {
+			b.WriteByte(',')
+		}
+
+		msd, ok := messageSetMap[id]
+		if !ok {
+			// Unknown type; we can't render it, so skip it.
+			continue
+		}
+		fmt.Fprintf(&b, `"[%s]":`, msd.name)
+
+		x := ext.value
+		if x == nil {
+			x = reflect.New(msd.t.Elem()).Interface()
+			if err := Unmarshal(ext.enc, x.(Message)); err != nil {
+				return nil, err
+			}
+		}
+		d, err := json.Marshal(x)
+		if err != nil {
+			return nil, err
+		}
+		b.Write(d)
+	}
+	b.WriteByte('}')
+	return b.Bytes(), nil
+}
+
+// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
+// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
+func UnmarshalMessageSetJSON(buf []byte, m map[int32]Extension) error {
+	// Common-case fast path.
+	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
+		return nil
+	}
+
+	// This is fairly tricky, and it's not clear that it is needed.
+	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
+}
+
+// A global registry of types that can be used in a MessageSet.
+
+var messageSetMap = make(map[int32]messageSetDesc)
+
+type messageSetDesc struct {
+	t    reflect.Type // pointer to struct
+	name string
+}
+
+// RegisterMessageSetType is called from the generated code.
+func RegisterMessageSetType(m Message, fieldNum int32, name string) {
+	messageSetMap[fieldNum] = messageSetDesc{
+		t:    reflect.TypeOf(m),
+		name: name,
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go
new file mode 100644
index 0000000000..749919d250
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go
@@ -0,0 +1,479 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2012 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// +build appengine
+
+// This file contains an implementation of proto field accesses using package reflect.
+// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
+// be used on App Engine.
+
+package proto
+
+import (
+	"math"
+	"reflect"
+)
+
+// A structPointer is a pointer to a struct.
+type structPointer struct {
+	v reflect.Value
+}
+
+// toStructPointer returns a structPointer equivalent to the given reflect value.
+// The reflect value must itself be a pointer to a struct.
+func toStructPointer(v reflect.Value) structPointer {
+	return structPointer{v}
+}
+
+// IsNil reports whether p is nil.
+func structPointer_IsNil(p structPointer) bool {
+	return p.v.IsNil()
+}
+
+// Interface returns the struct pointer as an interface value.
+func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
+	return p.v.Interface()
+}
+
+// A field identifies a field in a struct, accessible from a structPointer.
+// In this implementation, a field is identified by the sequence of field indices
+// passed to reflect's FieldByIndex.
+type field []int
+
+// toField returns a field equivalent to the given reflect field.
+func toField(f *reflect.StructField) field {
+	return f.Index
+}
+
+// invalidField is an invalid field identifier.
+var invalidField = field(nil)
+
+// IsValid reports whether the field identifier is valid.
+func (f field) IsValid() bool { return f != nil }
+
+// field returns the given field in the struct as a reflect value.
+func structPointer_field(p structPointer, f field) reflect.Value {
+	// Special case: an extension map entry with a value of type T
+	// passes a *T to the struct-handling code with a zero field,
+	// expecting that it will be treated as equivalent to *struct{ X T },
+	// which has the same memory layout. We have to handle that case
+	// specially, because reflect will panic if we call FieldByIndex on a
+	// non-struct.
+	if f == nil {
+		return p.v.Elem()
+	}
+
+	return p.v.Elem().FieldByIndex(f)
+}
+
+// ifield returns the given field in the struct as an interface value.
+func structPointer_ifield(p structPointer, f field) interface{} {
+	return structPointer_field(p, f).Addr().Interface()
+}
+
+// Bytes returns the address of a []byte field in the struct.
+func structPointer_Bytes(p structPointer, f field) *[]byte {
+	return structPointer_ifield(p, f).(*[]byte)
+}
+
+// BytesSlice returns the address of a [][]byte field in the struct.
+func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
+	return structPointer_ifield(p, f).(*[][]byte)
+}
+
+// Bool returns the address of a *bool field in the struct.
+func structPointer_Bool(p structPointer, f field) **bool {
+	return structPointer_ifield(p, f).(**bool)
+}
+
+// BoolVal returns the address of a bool field in the struct.
+func structPointer_BoolVal(p structPointer, f field) *bool {
+	return structPointer_ifield(p, f).(*bool)
+}
+
+// BoolSlice returns the address of a []bool field in the struct.
+func structPointer_BoolSlice(p structPointer, f field) *[]bool {
+	return structPointer_ifield(p, f).(*[]bool)
+}
+
+// String returns the address of a *string field in the struct.
+func structPointer_String(p structPointer, f field) **string {
+	return structPointer_ifield(p, f).(**string)
+}
+
+// StringVal returns the address of a string field in the struct.
+func structPointer_StringVal(p structPointer, f field) *string {
+	return structPointer_ifield(p, f).(*string)
+}
+
+// StringSlice returns the address of a []string field in the struct.
+func structPointer_StringSlice(p structPointer, f field) *[]string {
+	return structPointer_ifield(p, f).(*[]string)
+}
+
+// ExtMap returns the address of an extension map field in the struct.
+func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
+	return structPointer_ifield(p, f).(*map[int32]Extension)
+}
+
+// NewAt returns the reflect.Value for a pointer to a field in the struct.
+func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
+	return structPointer_field(p, f).Addr()
+}
+
+// SetStructPointer writes a *struct field in the struct.
+func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
+	structPointer_field(p, f).Set(q.v)
+}
+
+// GetStructPointer reads a *struct field in the struct.
+func structPointer_GetStructPointer(p structPointer, f field) structPointer {
+	return structPointer{structPointer_field(p, f)}
+}
+
+// StructPointerSlice the address of a []*struct field in the struct.
+func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
+	return structPointerSlice{structPointer_field(p, f)}
+}
+
+// A structPointerSlice represents the address of a slice of pointers to structs
+// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
+type structPointerSlice struct {
+	v reflect.Value
+}
+
+func (p structPointerSlice) Len() int                  { return p.v.Len() }
+func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
+func (p structPointerSlice) Append(q structPointer) {
+	p.v.Set(reflect.Append(p.v, q.v))
+}
+
+var (
+	int32Type   = reflect.TypeOf(int32(0))
+	uint32Type  = reflect.TypeOf(uint32(0))
+	float32Type = reflect.TypeOf(float32(0))
+	int64Type   = reflect.TypeOf(int64(0))
+	uint64Type  = reflect.TypeOf(uint64(0))
+	float64Type = reflect.TypeOf(float64(0))
+)
+
+// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
+// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
+type word32 struct {
+	v reflect.Value
+}
+
+// IsNil reports whether p is nil.
+func word32_IsNil(p word32) bool {
+	return p.v.IsNil()
+}
+
+// Set sets p to point at a newly allocated word with bits set to x.
+func word32_Set(p word32, o *Buffer, x uint32) {
+	t := p.v.Type().Elem()
+	switch t {
+	case int32Type:
+		if len(o.int32s) == 0 {
+			o.int32s = make([]int32, uint32PoolSize)
+		}
+		o.int32s[0] = int32(x)
+		p.v.Set(reflect.ValueOf(&o.int32s[0]))
+		o.int32s = o.int32s[1:]
+		return
+	case uint32Type:
+		if len(o.uint32s) == 0 {
+			o.uint32s = make([]uint32, uint32PoolSize)
+		}
+		o.uint32s[0] = x
+		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
+		o.uint32s = o.uint32s[1:]
+		return
+	case float32Type:
+		if len(o.float32s) == 0 {
+			o.float32s = make([]float32, uint32PoolSize)
+		}
+		o.float32s[0] = math.Float32frombits(x)
+		p.v.Set(reflect.ValueOf(&o.float32s[0]))
+		o.float32s = o.float32s[1:]
+		return
+	}
+
+	// must be enum
+	p.v.Set(reflect.New(t))
+	p.v.Elem().SetInt(int64(int32(x)))
+}
+
+// Get gets the bits pointed at by p, as a uint32.
+func word32_Get(p word32) uint32 {
+	elem := p.v.Elem()
+	switch elem.Kind() {
+	case reflect.Int32:
+		return uint32(elem.Int())
+	case reflect.Uint32:
+		return uint32(elem.Uint())
+	case reflect.Float32:
+		return math.Float32bits(float32(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
+func structPointer_Word32(p structPointer, f field) word32 {
+	return word32{structPointer_field(p, f)}
+}
+
+// A word32Val represents a field of type int32, uint32, float32, or enum.
+// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
+type word32Val struct {
+	v reflect.Value
+}
+
+// Set sets *p to x.
+func word32Val_Set(p word32Val, x uint32) {
+	switch p.v.Type() {
+	case int32Type:
+		p.v.SetInt(int64(x))
+		return
+	case uint32Type:
+		p.v.SetUint(uint64(x))
+		return
+	case float32Type:
+		p.v.SetFloat(float64(math.Float32frombits(x)))
+		return
+	}
+
+	// must be enum
+	p.v.SetInt(int64(int32(x)))
+}
+
+// Get gets the bits pointed at by p, as a uint32.
+func word32Val_Get(p word32Val) uint32 {
+	elem := p.v
+	switch elem.Kind() {
+	case reflect.Int32:
+		return uint32(elem.Int())
+	case reflect.Uint32:
+		return uint32(elem.Uint())
+	case reflect.Float32:
+		return math.Float32bits(float32(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
+func structPointer_Word32Val(p structPointer, f field) word32Val {
+	return word32Val{structPointer_field(p, f)}
+}
+
+// A word32Slice is a slice of 32-bit values.
+// That is, v.Type() is []int32, []uint32, []float32, or []enum.
+type word32Slice struct {
+	v reflect.Value
+}
+
+func (p word32Slice) Append(x uint32) {
+	n, m := p.v.Len(), p.v.Cap()
+	if n < m {
+		p.v.SetLen(n + 1)
+	} else {
+		t := p.v.Type().Elem()
+		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
+	}
+	elem := p.v.Index(n)
+	switch elem.Kind() {
+	case reflect.Int32:
+		elem.SetInt(int64(int32(x)))
+	case reflect.Uint32:
+		elem.SetUint(uint64(x))
+	case reflect.Float32:
+		elem.SetFloat(float64(math.Float32frombits(x)))
+	}
+}
+
+func (p word32Slice) Len() int {
+	return p.v.Len()
+}
+
+func (p word32Slice) Index(i int) uint32 {
+	elem := p.v.Index(i)
+	switch elem.Kind() {
+	case reflect.Int32:
+		return uint32(elem.Int())
+	case reflect.Uint32:
+		return uint32(elem.Uint())
+	case reflect.Float32:
+		return math.Float32bits(float32(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
+func structPointer_Word32Slice(p structPointer, f field) word32Slice {
+	return word32Slice{structPointer_field(p, f)}
+}
+
+// word64 is like word32 but for 64-bit values.
+type word64 struct {
+	v reflect.Value
+}
+
+func word64_Set(p word64, o *Buffer, x uint64) {
+	t := p.v.Type().Elem()
+	switch t {
+	case int64Type:
+		if len(o.int64s) == 0 {
+			o.int64s = make([]int64, uint64PoolSize)
+		}
+		o.int64s[0] = int64(x)
+		p.v.Set(reflect.ValueOf(&o.int64s[0]))
+		o.int64s = o.int64s[1:]
+		return
+	case uint64Type:
+		if len(o.uint64s) == 0 {
+			o.uint64s = make([]uint64, uint64PoolSize)
+		}
+		o.uint64s[0] = x
+		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
+		o.uint64s = o.uint64s[1:]
+		return
+	case float64Type:
+		if len(o.float64s) == 0 {
+			o.float64s = make([]float64, uint64PoolSize)
+		}
+		o.float64s[0] = math.Float64frombits(x)
+		p.v.Set(reflect.ValueOf(&o.float64s[0]))
+		o.float64s = o.float64s[1:]
+		return
+	}
+	panic("unreachable")
+}
+
+func word64_IsNil(p word64) bool {
+	return p.v.IsNil()
+}
+
+func word64_Get(p word64) uint64 {
+	elem := p.v.Elem()
+	switch elem.Kind() {
+	case reflect.Int64:
+		return uint64(elem.Int())
+	case reflect.Uint64:
+		return elem.Uint()
+	case reflect.Float64:
+		return math.Float64bits(elem.Float())
+	}
+	panic("unreachable")
+}
+
+func structPointer_Word64(p structPointer, f field) word64 {
+	return word64{structPointer_field(p, f)}
+}
+
+// word64Val is like word32Val but for 64-bit values.
+type word64Val struct {
+	v reflect.Value
+}
+
+func word64Val_Set(p word64Val, o *Buffer, x uint64) {
+	switch p.v.Type() {
+	case int64Type:
+		p.v.SetInt(int64(x))
+		return
+	case uint64Type:
+		p.v.SetUint(x)
+		return
+	case float64Type:
+		p.v.SetFloat(math.Float64frombits(x))
+		return
+	}
+	panic("unreachable")
+}
+
+func word64Val_Get(p word64Val) uint64 {
+	elem := p.v
+	switch elem.Kind() {
+	case reflect.Int64:
+		return uint64(elem.Int())
+	case reflect.Uint64:
+		return elem.Uint()
+	case reflect.Float64:
+		return math.Float64bits(elem.Float())
+	}
+	panic("unreachable")
+}
+
+func structPointer_Word64Val(p structPointer, f field) word64Val {
+	return word64Val{structPointer_field(p, f)}
+}
+
+type word64Slice struct {
+	v reflect.Value
+}
+
+func (p word64Slice) Append(x uint64) {
+	n, m := p.v.Len(), p.v.Cap()
+	if n < m {
+		p.v.SetLen(n + 1)
+	} else {
+		t := p.v.Type().Elem()
+		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
+	}
+	elem := p.v.Index(n)
+	switch elem.Kind() {
+	case reflect.Int64:
+		elem.SetInt(int64(int64(x)))
+	case reflect.Uint64:
+		elem.SetUint(uint64(x))
+	case reflect.Float64:
+		elem.SetFloat(float64(math.Float64frombits(x)))
+	}
+}
+
+func (p word64Slice) Len() int {
+	return p.v.Len()
+}
+
+func (p word64Slice) Index(i int) uint64 {
+	elem := p.v.Index(i)
+	switch elem.Kind() {
+	case reflect.Int64:
+		return uint64(elem.Int())
+	case reflect.Uint64:
+		return uint64(elem.Uint())
+	case reflect.Float64:
+		return math.Float64bits(float64(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+func structPointer_Word64Slice(p structPointer, f field) word64Slice {
+	return word64Slice{structPointer_field(p, f)}
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go
new file mode 100644
index 0000000000..e9be0fe92e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go
@@ -0,0 +1,266 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2012 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// +build !appengine
+
+// This file contains the implementation of the proto field accesses using package unsafe.
+
+package proto
+
+import (
+	"reflect"
+	"unsafe"
+)
+
+// NOTE: These type_Foo functions would more idiomatically be methods,
+// but Go does not allow methods on pointer types, and we must preserve
+// some pointer type for the garbage collector. We use these
+// funcs with clunky names as our poor approximation to methods.
+//
+// An alternative would be
+//	type structPointer struct { p unsafe.Pointer }
+// but that does not registerize as well.
+
+// A structPointer is a pointer to a struct.
+type structPointer unsafe.Pointer
+
+// toStructPointer returns a structPointer equivalent to the given reflect value.
+func toStructPointer(v reflect.Value) structPointer {
+	return structPointer(unsafe.Pointer(v.Pointer()))
+}
+
+// IsNil reports whether p is nil.
+func structPointer_IsNil(p structPointer) bool {
+	return p == nil
+}
+
+// Interface returns the struct pointer, assumed to have element type t,
+// as an interface value.
+func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
+	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
+}
+
+// A field identifies a field in a struct, accessible from a structPointer.
+// In this implementation, a field is identified by its byte offset from the start of the struct.
+type field uintptr
+
+// toField returns a field equivalent to the given reflect field.
+func toField(f *reflect.StructField) field {
+	return field(f.Offset)
+}
+
+// invalidField is an invalid field identifier.
+const invalidField = ^field(0)
+
+// IsValid reports whether the field identifier is valid.
+func (f field) IsValid() bool {
+	return f != ^field(0)
+}
+
+// Bytes returns the address of a []byte field in the struct.
+func structPointer_Bytes(p structPointer, f field) *[]byte {
+	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// BytesSlice returns the address of a [][]byte field in the struct.
+func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
+	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// Bool returns the address of a *bool field in the struct.
+func structPointer_Bool(p structPointer, f field) **bool {
+	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// BoolVal returns the address of a bool field in the struct.
+func structPointer_BoolVal(p structPointer, f field) *bool {
+	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// BoolSlice returns the address of a []bool field in the struct.
+func structPointer_BoolSlice(p structPointer, f field) *[]bool {
+	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// String returns the address of a *string field in the struct.
+func structPointer_String(p structPointer, f field) **string {
+	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// StringVal returns the address of a string field in the struct.
+func structPointer_StringVal(p structPointer, f field) *string {
+	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// StringSlice returns the address of a []string field in the struct.
+func structPointer_StringSlice(p structPointer, f field) *[]string {
+	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// ExtMap returns the address of an extension map field in the struct.
+func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
+	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// NewAt returns the reflect.Value for a pointer to a field in the struct.
+func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
+	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
+}
+
+// SetStructPointer writes a *struct field in the struct.
+func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
+	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
+}
+
+// GetStructPointer reads a *struct field in the struct.
+func structPointer_GetStructPointer(p structPointer, f field) structPointer {
+	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// StructPointerSlice the address of a []*struct field in the struct.
+func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
+	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
+type structPointerSlice []structPointer
+
+func (v *structPointerSlice) Len() int                  { return len(*v) }
+func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
+func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
+
+// A word32 is the address of a "pointer to 32-bit value" field.
+type word32 **uint32
+
+// IsNil reports whether *v is nil.
+func word32_IsNil(p word32) bool {
+	return *p == nil
+}
+
+// Set sets *v to point at a newly allocated word set to x.
+func word32_Set(p word32, o *Buffer, x uint32) {
+	if len(o.uint32s) == 0 {
+		o.uint32s = make([]uint32, uint32PoolSize)
+	}
+	o.uint32s[0] = x
+	*p = &o.uint32s[0]
+	o.uint32s = o.uint32s[1:]
+}
+
+// Get gets the value pointed at by *v.
+func word32_Get(p word32) uint32 {
+	return **p
+}
+
+// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
+func structPointer_Word32(p structPointer, f field) word32 {
+	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// A word32Val is the address of a 32-bit value field.
+type word32Val *uint32
+
+// Set sets *p to x.
+func word32Val_Set(p word32Val, x uint32) {
+	*p = x
+}
+
+// Get gets the value pointed at by p.
+func word32Val_Get(p word32Val) uint32 {
+	return *p
+}
+
+// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
+func structPointer_Word32Val(p structPointer, f field) word32Val {
+	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// A word32Slice is a slice of 32-bit values.
+type word32Slice []uint32
+
+func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
+func (v *word32Slice) Len() int           { return len(*v) }
+func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
+
+// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
+func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
+	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// word64 is like word32 but for 64-bit values.
+type word64 **uint64
+
+func word64_Set(p word64, o *Buffer, x uint64) {
+	if len(o.uint64s) == 0 {
+		o.uint64s = make([]uint64, uint64PoolSize)
+	}
+	o.uint64s[0] = x
+	*p = &o.uint64s[0]
+	o.uint64s = o.uint64s[1:]
+}
+
+func word64_IsNil(p word64) bool {
+	return *p == nil
+}
+
+func word64_Get(p word64) uint64 {
+	return **p
+}
+
+func structPointer_Word64(p structPointer, f field) word64 {
+	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// word64Val is like word32Val but for 64-bit values.
+type word64Val *uint64
+
+func word64Val_Set(p word64Val, o *Buffer, x uint64) {
+	*p = x
+}
+
+func word64Val_Get(p word64Val) uint64 {
+	return *p
+}
+
+func structPointer_Word64Val(p structPointer, f field) word64Val {
+	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// word64Slice is like word32Slice but for 64-bit values.
+type word64Slice []uint64
+
+func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
+func (v *word64Slice) Len() int           { return len(*v) }
+func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
+
+func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
+	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
new file mode 100644
index 0000000000..6bc85fa987
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
@@ -0,0 +1,108 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// +build !appengine
+
+// This file contains the implementation of the proto field accesses using package unsafe.
+
+package proto
+
+import (
+	"reflect"
+	"unsafe"
+)
+
+func structPointer_InterfaceAt(p structPointer, f field, t reflect.Type) interface{} {
+	point := unsafe.Pointer(uintptr(p) + uintptr(f))
+	r := reflect.NewAt(t, point)
+	return r.Interface()
+}
+
+func structPointer_InterfaceRef(p structPointer, f field, t reflect.Type) interface{} {
+	point := unsafe.Pointer(uintptr(p) + uintptr(f))
+	r := reflect.NewAt(t, point)
+	if r.Elem().IsNil() {
+		return nil
+	}
+	return r.Elem().Interface()
+}
+
+func copyUintPtr(oldptr, newptr uintptr, size int) {
+	oldbytes := make([]byte, 0)
+	oldslice := (*reflect.SliceHeader)(unsafe.Pointer(&oldbytes))
+	oldslice.Data = oldptr
+	oldslice.Len = size
+	oldslice.Cap = size
+	newbytes := make([]byte, 0)
+	newslice := (*reflect.SliceHeader)(unsafe.Pointer(&newbytes))
+	newslice.Data = newptr
+	newslice.Len = size
+	newslice.Cap = size
+	copy(newbytes, oldbytes)
+}
+
+func structPointer_Copy(oldptr structPointer, newptr structPointer, size int) {
+	copyUintPtr(uintptr(oldptr), uintptr(newptr), size)
+}
+
+func appendStructPointer(base structPointer, f field, typ reflect.Type) structPointer {
+	size := typ.Elem().Size()
+	oldHeader := structPointer_GetSliceHeader(base, f)
+	newLen := oldHeader.Len + 1
+	slice := reflect.MakeSlice(typ, newLen, newLen)
+	bas := toStructPointer(slice)
+	for i := 0; i < oldHeader.Len; i++ {
+		newElemptr := uintptr(bas) + uintptr(i)*size
+		oldElemptr := oldHeader.Data + uintptr(i)*size
+		copyUintPtr(oldElemptr, newElemptr, int(size))
+	}
+
+	oldHeader.Data = uintptr(bas)
+	oldHeader.Len = newLen
+	oldHeader.Cap = newLen
+
+	return structPointer(unsafe.Pointer(uintptr(unsafe.Pointer(bas)) + uintptr(uintptr(newLen-1)*size)))
+}
+
+func structPointer_FieldPointer(p structPointer, f field) structPointer {
+	return structPointer(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+func structPointer_GetRefStructPointer(p structPointer, f field) structPointer {
+	return structPointer((*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+func structPointer_GetSliceHeader(p structPointer, f field) *reflect.SliceHeader {
+	return (*reflect.SliceHeader)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+func structPointer_Add(p structPointer, size field) structPointer {
+	return structPointer(unsafe.Pointer(uintptr(p) + uintptr(size)))
+}
+
+func structPointer_Len(p structPointer, f field) int {
+	return len(*(*[]interface{})(unsafe.Pointer(structPointer_GetRefStructPointer(p, f))))
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
new file mode 100644
index 0000000000..4711057e2b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
@@ -0,0 +1,915 @@
+// Extensions for Protocol Buffers to create more go like structures.
+//
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Routines for encoding data into the wire format for protocol buffers.
+ */
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"reflect"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+const debug bool = false
+
+// Constants that identify the encoding of a value on the wire.
+const (
+	WireVarint     = 0
+	WireFixed64    = 1
+	WireBytes      = 2
+	WireStartGroup = 3
+	WireEndGroup   = 4
+	WireFixed32    = 5
+)
+
+const startSize = 10 // initial slice/string sizes
+
+// Encoders are defined in encode.go
+// An encoder outputs the full representation of a field, including its
+// tag and encoder type.
+type encoder func(p *Buffer, prop *Properties, base structPointer) error
+
+// A valueEncoder encodes a single integer in a particular encoding.
+type valueEncoder func(o *Buffer, x uint64) error
+
+// Sizers are defined in encode.go
+// A sizer returns the encoded size of a field, including its tag and encoder
+// type.
+type sizer func(prop *Properties, base structPointer) int
+
+// A valueSizer returns the encoded size of a single integer in a particular
+// encoding.
+type valueSizer func(x uint64) int
+
+// Decoders are defined in decode.go
+// A decoder creates a value from its wire representation.
+// Unrecognized subelements are saved in unrec.
+type decoder func(p *Buffer, prop *Properties, base structPointer) error
+
+// A valueDecoder decodes a single integer in a particular encoding.
+type valueDecoder func(o *Buffer) (x uint64, err error)
+
+// A oneofMarshaler does the marshaling for all oneof fields in a message.
+type oneofMarshaler func(Message, *Buffer) error
+
+// A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
+type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
+
+// tagMap is an optimization over map[int]int for typical protocol buffer
+// use-cases. Encoded protocol buffers are often in tag order with small tag
+// numbers.
+type tagMap struct {
+	fastTags []int
+	slowTags map[int]int
+}
+
+// tagMapFastLimit is the upper bound on the tag number that will be stored in
+// the tagMap slice rather than its map.
+const tagMapFastLimit = 1024
+
+func (p *tagMap) get(t int) (int, bool) {
+	if t > 0 && t < tagMapFastLimit {
+		if t >= len(p.fastTags) {
+			return 0, false
+		}
+		fi := p.fastTags[t]
+		return fi, fi >= 0
+	}
+	fi, ok := p.slowTags[t]
+	return fi, ok
+}
+
+func (p *tagMap) put(t int, fi int) {
+	if t > 0 && t < tagMapFastLimit {
+		for len(p.fastTags) < t+1 {
+			p.fastTags = append(p.fastTags, -1)
+		}
+		p.fastTags[t] = fi
+		return
+	}
+	if p.slowTags == nil {
+		p.slowTags = make(map[int]int)
+	}
+	p.slowTags[t] = fi
+}
+
+// StructProperties represents properties for all the fields of a struct.
+// decoderTags and decoderOrigNames should only be used by the decoder.
+type StructProperties struct {
+	Prop             []*Properties  // properties for each field
+	reqCount         int            // required count
+	decoderTags      tagMap         // map from proto tag to struct field number
+	decoderOrigNames map[string]int // map from original name to struct field number
+	order            []int          // list of struct field numbers in tag order
+	unrecField       field          // field id of the XXX_unrecognized []byte field
+	extendable       bool           // is this an extendable proto
+
+	oneofMarshaler   oneofMarshaler
+	oneofUnmarshaler oneofUnmarshaler
+	stype            reflect.Type
+
+	// OneofTypes contains information about the oneof fields in this message.
+	// It is keyed by the original name of a field.
+	OneofTypes map[string]*OneofProperties
+}
+
+// OneofProperties represents information about a specific field in a oneof.
+type OneofProperties struct {
+	Type  reflect.Type // pointer to generated struct type for this oneof field
+	Field int          // struct field number of the containing oneof in the message
+	Prop  *Properties
+}
+
+// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
+// See encode.go, (*Buffer).enc_struct.
+
+func (sp *StructProperties) Len() int { return len(sp.order) }
+func (sp *StructProperties) Less(i, j int) bool {
+	return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
+}
+func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
+
+// Properties represents the protocol-specific behavior of a single struct field.
+type Properties struct {
+	Name     string // name of the field, for error messages
+	OrigName string // original name before protocol compiler (always set)
+	Wire     string
+	WireType int
+	Tag      int
+	Required bool
+	Optional bool
+	Repeated bool
+	Packed   bool   // relevant for repeated primitives only
+	Enum     string // set for enum types only
+	proto3   bool   // whether this is known to be a proto3 field; set for []byte only
+	oneof    bool   // whether this is a oneof field
+
+	Default    string // default value
+	HasDefault bool   // whether an explicit default was provided
+	CustomType string
+	def_uint64 uint64
+
+	enc           encoder
+	valEnc        valueEncoder // set for bool and numeric types only
+	field         field
+	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
+	tagbuf        [8]byte
+	stype         reflect.Type      // set for struct types only
+	sstype        reflect.Type      // set for slices of structs types only
+	ctype         reflect.Type      // set for custom types only
+	sprop         *StructProperties // set for struct types only
+	isMarshaler   bool
+	isUnmarshaler bool
+
+	mtype    reflect.Type // set for map types only
+	mkeyprop *Properties  // set for map types only
+	mvalprop *Properties  // set for map types only
+
+	size    sizer
+	valSize valueSizer // set for bool and numeric types only
+
+	dec    decoder
+	valDec valueDecoder // set for bool and numeric types only
+
+	// If this is a packable field, this will be the decoder for the packed version of the field.
+	packedDec decoder
+}
+
+// String formats the properties in the protobuf struct field tag style.
+func (p *Properties) String() string {
+	s := p.Wire
+	s = ","
+	s += strconv.Itoa(p.Tag)
+	if p.Required {
+		s += ",req"
+	}
+	if p.Optional {
+		s += ",opt"
+	}
+	if p.Repeated {
+		s += ",rep"
+	}
+	if p.Packed {
+		s += ",packed"
+	}
+	if p.OrigName != p.Name {
+		s += ",name=" + p.OrigName
+	}
+	if p.proto3 {
+		s += ",proto3"
+	}
+	if p.oneof {
+		s += ",oneof"
+	}
+	if len(p.Enum) > 0 {
+		s += ",enum=" + p.Enum
+	}
+	if p.HasDefault {
+		s += ",def=" + p.Default
+	}
+	return s
+}
+
+// Parse populates p by parsing a string in the protobuf struct field tag style.
+func (p *Properties) Parse(s string) {
+	// "bytes,49,opt,name=foo,def=hello!"
+	fields := strings.Split(s, ",") // breaks def=, but handled below.
+	if len(fields) < 2 {
+		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
+		return
+	}
+
+	p.Wire = fields[0]
+	switch p.Wire {
+	case "varint":
+		p.WireType = WireVarint
+		p.valEnc = (*Buffer).EncodeVarint
+		p.valDec = (*Buffer).DecodeVarint
+		p.valSize = sizeVarint
+	case "fixed32":
+		p.WireType = WireFixed32
+		p.valEnc = (*Buffer).EncodeFixed32
+		p.valDec = (*Buffer).DecodeFixed32
+		p.valSize = sizeFixed32
+	case "fixed64":
+		p.WireType = WireFixed64
+		p.valEnc = (*Buffer).EncodeFixed64
+		p.valDec = (*Buffer).DecodeFixed64
+		p.valSize = sizeFixed64
+	case "zigzag32":
+		p.WireType = WireVarint
+		p.valEnc = (*Buffer).EncodeZigzag32
+		p.valDec = (*Buffer).DecodeZigzag32
+		p.valSize = sizeZigzag32
+	case "zigzag64":
+		p.WireType = WireVarint
+		p.valEnc = (*Buffer).EncodeZigzag64
+		p.valDec = (*Buffer).DecodeZigzag64
+		p.valSize = sizeZigzag64
+	case "bytes", "group":
+		p.WireType = WireBytes
+		// no numeric converter for non-numeric types
+	default:
+		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
+		return
+	}
+
+	var err error
+	p.Tag, err = strconv.Atoi(fields[1])
+	if err != nil {
+		return
+	}
+
+	for i := 2; i < len(fields); i++ {
+		f := fields[i]
+		switch {
+		case f == "req":
+			p.Required = true
+		case f == "opt":
+			p.Optional = true
+		case f == "rep":
+			p.Repeated = true
+		case f == "packed":
+			p.Packed = true
+		case strings.HasPrefix(f, "name="):
+			p.OrigName = f[5:]
+		case strings.HasPrefix(f, "enum="):
+			p.Enum = f[5:]
+		case f == "proto3":
+			p.proto3 = true
+		case f == "oneof":
+			p.oneof = true
+		case strings.HasPrefix(f, "def="):
+			p.HasDefault = true
+			p.Default = f[4:] // rest of string
+			if i+1 < len(fields) {
+				// Commas aren't escaped, and def is always last.
+				p.Default += "," + strings.Join(fields[i+1:], ",")
+				break
+			}
+		case strings.HasPrefix(f, "embedded="):
+			p.OrigName = strings.Split(f, "=")[1]
+		case strings.HasPrefix(f, "customtype="):
+			p.CustomType = strings.Split(f, "=")[1]
+		}
+	}
+}
+
+func logNoSliceEnc(t1, t2 reflect.Type) {
+	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
+}
+
+var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
+
+// Initialize the fields for encoding and decoding.
+func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
+	p.enc = nil
+	p.dec = nil
+	p.size = nil
+	if len(p.CustomType) > 0 {
+		p.setCustomEncAndDec(typ)
+		p.setTag(lockGetProp)
+		return
+	}
+	switch t1 := typ; t1.Kind() {
+	default:
+		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
+
+	// proto3 scalar types
+
+	case reflect.Bool:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_bool
+			p.dec = (*Buffer).dec_proto3_bool
+			p.size = size_proto3_bool
+		} else {
+			p.enc = (*Buffer).enc_ref_bool
+			p.dec = (*Buffer).dec_proto3_bool
+			p.size = size_ref_bool
+		}
+	case reflect.Int32:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_int32
+			p.dec = (*Buffer).dec_proto3_int32
+			p.size = size_proto3_int32
+		} else {
+			p.enc = (*Buffer).enc_ref_int32
+			p.dec = (*Buffer).dec_proto3_int32
+			p.size = size_ref_int32
+		}
+	case reflect.Uint32:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_uint32
+			p.dec = (*Buffer).dec_proto3_int32 // can reuse
+			p.size = size_proto3_uint32
+		} else {
+			p.enc = (*Buffer).enc_ref_uint32
+			p.dec = (*Buffer).dec_proto3_int32 // can reuse
+			p.size = size_ref_uint32
+		}
+	case reflect.Int64, reflect.Uint64:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_int64
+			p.dec = (*Buffer).dec_proto3_int64
+			p.size = size_proto3_int64
+		} else {
+			p.enc = (*Buffer).enc_ref_int64
+			p.dec = (*Buffer).dec_proto3_int64
+			p.size = size_ref_int64
+		}
+	case reflect.Float32:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
+			p.dec = (*Buffer).dec_proto3_int32
+			p.size = size_proto3_uint32
+		} else {
+			p.enc = (*Buffer).enc_ref_uint32 // can just treat them as bits
+			p.dec = (*Buffer).dec_proto3_int32
+			p.size = size_ref_uint32
+		}
+	case reflect.Float64:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
+			p.dec = (*Buffer).dec_proto3_int64
+			p.size = size_proto3_int64
+		} else {
+			p.enc = (*Buffer).enc_ref_int64 // can just treat them as bits
+			p.dec = (*Buffer).dec_proto3_int64
+			p.size = size_ref_int64
+		}
+	case reflect.String:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_string
+			p.dec = (*Buffer).dec_proto3_string
+			p.size = size_proto3_string
+		} else {
+			p.enc = (*Buffer).enc_ref_string
+			p.dec = (*Buffer).dec_proto3_string
+			p.size = size_ref_string
+		}
+	case reflect.Struct:
+		p.stype = typ
+		p.isMarshaler = isMarshaler(typ)
+		p.isUnmarshaler = isUnmarshaler(typ)
+		if p.Wire == "bytes" {
+			p.enc = (*Buffer).enc_ref_struct_message
+			p.dec = (*Buffer).dec_ref_struct_message
+			p.size = size_ref_struct_message
+		} else {
+			fmt.Fprintf(os.Stderr, "proto: no coders for struct %T\n", typ)
+		}
+
+	case reflect.Ptr:
+		switch t2 := t1.Elem(); t2.Kind() {
+		default:
+			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
+			break
+		case reflect.Bool:
+			p.enc = (*Buffer).enc_bool
+			p.dec = (*Buffer).dec_bool
+			p.size = size_bool
+		case reflect.Int32:
+			p.enc = (*Buffer).enc_int32
+			p.dec = (*Buffer).dec_int32
+			p.size = size_int32
+		case reflect.Uint32:
+			p.enc = (*Buffer).enc_uint32
+			p.dec = (*Buffer).dec_int32 // can reuse
+			p.size = size_uint32
+		case reflect.Int64, reflect.Uint64:
+			p.enc = (*Buffer).enc_int64
+			p.dec = (*Buffer).dec_int64
+			p.size = size_int64
+		case reflect.Float32:
+			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
+			p.dec = (*Buffer).dec_int32
+			p.size = size_uint32
+		case reflect.Float64:
+			p.enc = (*Buffer).enc_int64 // can just treat them as bits
+			p.dec = (*Buffer).dec_int64
+			p.size = size_int64
+		case reflect.String:
+			p.enc = (*Buffer).enc_string
+			p.dec = (*Buffer).dec_string
+			p.size = size_string
+		case reflect.Struct:
+			p.stype = t1.Elem()
+			p.isMarshaler = isMarshaler(t1)
+			p.isUnmarshaler = isUnmarshaler(t1)
+			if p.Wire == "bytes" {
+				p.enc = (*Buffer).enc_struct_message
+				p.dec = (*Buffer).dec_struct_message
+				p.size = size_struct_message
+			} else {
+				p.enc = (*Buffer).enc_struct_group
+				p.dec = (*Buffer).dec_struct_group
+				p.size = size_struct_group
+			}
+		}
+
+	case reflect.Slice:
+		switch t2 := t1.Elem(); t2.Kind() {
+		default:
+			logNoSliceEnc(t1, t2)
+			break
+		case reflect.Bool:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_bool
+				p.size = size_slice_packed_bool
+			} else {
+				p.enc = (*Buffer).enc_slice_bool
+				p.size = size_slice_bool
+			}
+			p.dec = (*Buffer).dec_slice_bool
+			p.packedDec = (*Buffer).dec_slice_packed_bool
+		case reflect.Int32:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_int32
+				p.size = size_slice_packed_int32
+			} else {
+				p.enc = (*Buffer).enc_slice_int32
+				p.size = size_slice_int32
+			}
+			p.dec = (*Buffer).dec_slice_int32
+			p.packedDec = (*Buffer).dec_slice_packed_int32
+		case reflect.Uint32:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_uint32
+				p.size = size_slice_packed_uint32
+			} else {
+				p.enc = (*Buffer).enc_slice_uint32
+				p.size = size_slice_uint32
+			}
+			p.dec = (*Buffer).dec_slice_int32
+			p.packedDec = (*Buffer).dec_slice_packed_int32
+		case reflect.Int64, reflect.Uint64:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_int64
+				p.size = size_slice_packed_int64
+			} else {
+				p.enc = (*Buffer).enc_slice_int64
+				p.size = size_slice_int64
+			}
+			p.dec = (*Buffer).dec_slice_int64
+			p.packedDec = (*Buffer).dec_slice_packed_int64
+		case reflect.Uint8:
+			p.enc = (*Buffer).enc_slice_byte
+			p.dec = (*Buffer).dec_slice_byte
+			p.size = size_slice_byte
+			// This is a []byte, which is either a bytes field,
+			// or the value of a map field. In the latter case,
+			// we always encode an empty []byte, so we should not
+			// use the proto3 enc/size funcs.
+			// f == nil iff this is the key/value of a map field.
+			if p.proto3 && f != nil {
+				p.enc = (*Buffer).enc_proto3_slice_byte
+				p.size = size_proto3_slice_byte
+			}
+		case reflect.Float32, reflect.Float64:
+			switch t2.Bits() {
+			case 32:
+				// can just treat them as bits
+				if p.Packed {
+					p.enc = (*Buffer).enc_slice_packed_uint32
+					p.size = size_slice_packed_uint32
+				} else {
+					p.enc = (*Buffer).enc_slice_uint32
+					p.size = size_slice_uint32
+				}
+				p.dec = (*Buffer).dec_slice_int32
+				p.packedDec = (*Buffer).dec_slice_packed_int32
+			case 64:
+				// can just treat them as bits
+				if p.Packed {
+					p.enc = (*Buffer).enc_slice_packed_int64
+					p.size = size_slice_packed_int64
+				} else {
+					p.enc = (*Buffer).enc_slice_int64
+					p.size = size_slice_int64
+				}
+				p.dec = (*Buffer).dec_slice_int64
+				p.packedDec = (*Buffer).dec_slice_packed_int64
+			default:
+				logNoSliceEnc(t1, t2)
+				break
+			}
+		case reflect.String:
+			p.enc = (*Buffer).enc_slice_string
+			p.dec = (*Buffer).dec_slice_string
+			p.size = size_slice_string
+		case reflect.Ptr:
+			switch t3 := t2.Elem(); t3.Kind() {
+			default:
+				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
+				break
+			case reflect.Struct:
+				p.stype = t2.Elem()
+				p.isMarshaler = isMarshaler(t2)
+				p.isUnmarshaler = isUnmarshaler(t2)
+				if p.Wire == "bytes" {
+					p.enc = (*Buffer).enc_slice_struct_message
+					p.dec = (*Buffer).dec_slice_struct_message
+					p.size = size_slice_struct_message
+				} else {
+					p.enc = (*Buffer).enc_slice_struct_group
+					p.dec = (*Buffer).dec_slice_struct_group
+					p.size = size_slice_struct_group
+				}
+			}
+		case reflect.Slice:
+			switch t2.Elem().Kind() {
+			default:
+				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
+				break
+			case reflect.Uint8:
+				p.enc = (*Buffer).enc_slice_slice_byte
+				p.dec = (*Buffer).dec_slice_slice_byte
+				p.size = size_slice_slice_byte
+			}
+		case reflect.Struct:
+			p.setSliceOfNonPointerStructs(t1)
+		}
+
+	case reflect.Map:
+		p.enc = (*Buffer).enc_new_map
+		p.dec = (*Buffer).dec_new_map
+		p.size = size_new_map
+
+		p.mtype = t1
+		p.mkeyprop = &Properties{}
+		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
+		p.mvalprop = &Properties{}
+		vtype := p.mtype.Elem()
+		if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
+			// The value type is not a message (*T) or bytes ([]byte),
+			// so we need encoders for the pointer to this type.
+			vtype = reflect.PtrTo(vtype)
+		}
+		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
+	}
+	p.setTag(lockGetProp)
+}
+
+func (p *Properties) setTag(lockGetProp bool) {
+	// precalculate tag code
+	wire := p.WireType
+	if p.Packed {
+		wire = WireBytes
+	}
+	x := uint32(p.Tag)<<3 | uint32(wire)
+	i := 0
+	for i = 0; x > 127; i++ {
+		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
+		x >>= 7
+	}
+	p.tagbuf[i] = uint8(x)
+	p.tagcode = p.tagbuf[0 : i+1]
+
+	if p.stype != nil {
+		if lockGetProp {
+			p.sprop = GetProperties(p.stype)
+		} else {
+			p.sprop = getPropertiesLocked(p.stype)
+		}
+	}
+}
+
+var (
+	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
+	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
+)
+
+// isMarshaler reports whether type t implements Marshaler.
+func isMarshaler(t reflect.Type) bool {
+	return t.Implements(marshalerType)
+}
+
+// isUnmarshaler reports whether type t implements Unmarshaler.
+func isUnmarshaler(t reflect.Type) bool {
+	return t.Implements(unmarshalerType)
+}
+
+// Init populates the properties from a protocol buffer struct tag.
+func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
+	p.init(typ, name, tag, f, true)
+}
+
+func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
+	// "bytes,49,opt,def=hello!"
+	p.Name = name
+	p.OrigName = name
+	if f != nil {
+		p.field = toField(f)
+	}
+	if tag == "" {
+		return
+	}
+	p.Parse(tag)
+	p.setEncAndDec(typ, f, lockGetProp)
+}
+
+var (
+	propertiesMu  sync.RWMutex
+	propertiesMap = make(map[reflect.Type]*StructProperties)
+)
+
+// GetProperties returns the list of properties for the type represented by t.
+// t must represent a generated struct type of a protocol message.
+func GetProperties(t reflect.Type) *StructProperties {
+	if t.Kind() != reflect.Struct {
+		panic("proto: type must have kind struct")
+	}
+
+	// Most calls to GetProperties in a long-running program will be
+	// retrieving details for types we have seen before.
+	propertiesMu.RLock()
+	sprop, ok := propertiesMap[t]
+	propertiesMu.RUnlock()
+	if ok {
+		if collectStats {
+			stats.Chit++
+		}
+		return sprop
+	}
+
+	propertiesMu.Lock()
+	sprop = getPropertiesLocked(t)
+	propertiesMu.Unlock()
+	return sprop
+}
+
+// getPropertiesLocked requires that propertiesMu is held.
+func getPropertiesLocked(t reflect.Type) *StructProperties {
+	if prop, ok := propertiesMap[t]; ok {
+		if collectStats {
+			stats.Chit++
+		}
+		return prop
+	}
+	if collectStats {
+		stats.Cmiss++
+	}
+
+	prop := new(StructProperties)
+	// in case of recursive protos, fill this in now.
+	propertiesMap[t] = prop
+
+	// build properties
+	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType)
+	prop.unrecField = invalidField
+	prop.Prop = make([]*Properties, t.NumField())
+	prop.order = make([]int, t.NumField())
+
+	isOneofMessage := false
+	for i := 0; i < t.NumField(); i++ {
+		f := t.Field(i)
+		p := new(Properties)
+		name := f.Name
+		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
+
+		if f.Name == "XXX_extensions" { // special case
+			if len(f.Tag.Get("protobuf")) > 0 {
+				p.enc = (*Buffer).enc_ext_slice_byte
+				p.dec = nil // not needed
+				p.size = size_ext_slice_byte
+			} else {
+				p.enc = (*Buffer).enc_map
+				p.dec = nil // not needed
+				p.size = size_map
+			}
+		}
+		if f.Name == "XXX_unrecognized" { // special case
+			prop.unrecField = toField(&f)
+		}
+		oneof := f.Tag.Get("protobuf_oneof") != "" // special case
+		if oneof {
+			isOneofMessage = true
+		}
+		prop.Prop[i] = p
+		prop.order[i] = i
+		if debug {
+			print(i, " ", f.Name, " ", t.String(), " ")
+			if p.Tag > 0 {
+				print(p.String())
+			}
+			print("\n")
+		}
+		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && !oneof {
+			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
+		}
+	}
+
+	// Re-order prop.order.
+	sort.Sort(prop)
+
+	type oneofMessage interface {
+		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), []interface{})
+	}
+	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); isOneofMessage && ok {
+		var oots []interface{}
+		prop.oneofMarshaler, prop.oneofUnmarshaler, oots = om.XXX_OneofFuncs()
+		prop.stype = t
+
+		// Interpret oneof metadata.
+		prop.OneofTypes = make(map[string]*OneofProperties)
+		for _, oot := range oots {
+			oop := &OneofProperties{
+				Type: reflect.ValueOf(oot).Type(), // *T
+				Prop: new(Properties),
+			}
+			sft := oop.Type.Elem().Field(0)
+			oop.Prop.Name = sft.Name
+			oop.Prop.Parse(sft.Tag.Get("protobuf"))
+			// There will be exactly one interface field that
+			// this new value is assignable to.
+			for i := 0; i < t.NumField(); i++ {
+				f := t.Field(i)
+				if f.Type.Kind() != reflect.Interface {
+					continue
+				}
+				if !oop.Type.AssignableTo(f.Type) {
+					continue
+				}
+				oop.Field = i
+				break
+			}
+			prop.OneofTypes[oop.Prop.OrigName] = oop
+		}
+	}
+
+	// build required counts
+	// build tags
+	reqCount := 0
+	prop.decoderOrigNames = make(map[string]int)
+	for i, p := range prop.Prop {
+		if strings.HasPrefix(p.Name, "XXX_") {
+			// Internal fields should not appear in tags/origNames maps.
+			// They are handled specially when encoding and decoding.
+			continue
+		}
+		if p.Required {
+			reqCount++
+		}
+		prop.decoderTags.put(p.Tag, i)
+		prop.decoderOrigNames[p.OrigName] = i
+	}
+	prop.reqCount = reqCount
+
+	return prop
+}
+
+// Return the Properties object for the x[0]'th field of the structure.
+func propByIndex(t reflect.Type, x []int) *Properties {
+	if len(x) != 1 {
+		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
+		return nil
+	}
+	prop := GetProperties(t)
+	return prop.Prop[x[0]]
+}
+
+// Get the address and type of a pointer to a struct from an interface.
+func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
+	if pb == nil {
+		err = ErrNil
+		return
+	}
+	// get the reflect type of the pointer to the struct.
+	t = reflect.TypeOf(pb)
+	// get the address of the struct.
+	value := reflect.ValueOf(pb)
+	b = toStructPointer(value)
+	return
+}
+
+// A global registry of enum types.
+// The generated code will register the generated maps by calling RegisterEnum.
+
+var enumValueMaps = make(map[string]map[string]int32)
+var enumStringMaps = make(map[string]map[int32]string)
+
+// RegisterEnum is called from the generated code to install the enum descriptor
+// maps into the global table to aid parsing text format protocol buffers.
+func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
+	if _, ok := enumValueMaps[typeName]; ok {
+		panic("proto: duplicate enum registered: " + typeName)
+	}
+	enumValueMaps[typeName] = valueMap
+	if _, ok := enumStringMaps[typeName]; ok {
+		panic("proto: duplicate enum registered: " + typeName)
+	}
+	enumStringMaps[typeName] = unusedNameMap
+}
+
+// EnumValueMap returns the mapping from names to integers of the
+// enum type enumType, or a nil if not found.
+func EnumValueMap(enumType string) map[string]int32 {
+	return enumValueMaps[enumType]
+}
+
+// A registry of all linked message types.
+// The string is a fully-qualified proto name ("pkg.Message").
+var (
+	protoTypes    = make(map[string]reflect.Type)
+	revProtoTypes = make(map[reflect.Type]string)
+)
+
+// RegisterType is called from generated code and maps from the fully qualified
+// proto name to the type (pointer to struct) of the protocol buffer.
+func RegisterType(x Message, name string) {
+	if _, ok := protoTypes[name]; ok {
+		// TODO: Some day, make this a panic.
+		log.Printf("proto: duplicate proto type registered: %s", name)
+		return
+	}
+	t := reflect.TypeOf(x)
+	protoTypes[name] = t
+	revProtoTypes[t] = name
+}
+
+// MessageName returns the fully-qualified proto name for the given message type.
+func MessageName(x Message) string { return revProtoTypes[reflect.TypeOf(x)] }
+
+// MessageType returns the message type (pointer to struct) for a named message.
+func MessageType(name string) reflect.Type { return protoTypes[name] }
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go
new file mode 100644
index 0000000000..8daf9f7768
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go
@@ -0,0 +1,64 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"fmt"
+	"os"
+	"reflect"
+)
+
+func (p *Properties) setCustomEncAndDec(typ reflect.Type) {
+	p.ctype = typ
+	if p.Repeated {
+		p.enc = (*Buffer).enc_custom_slice_bytes
+		p.dec = (*Buffer).dec_custom_slice_bytes
+		p.size = size_custom_slice_bytes
+	} else if typ.Kind() == reflect.Ptr {
+		p.enc = (*Buffer).enc_custom_bytes
+		p.dec = (*Buffer).dec_custom_bytes
+		p.size = size_custom_bytes
+	} else {
+		p.enc = (*Buffer).enc_custom_ref_bytes
+		p.dec = (*Buffer).dec_custom_ref_bytes
+		p.size = size_custom_ref_bytes
+	}
+}
+
+func (p *Properties) setSliceOfNonPointerStructs(typ reflect.Type) {
+	t2 := typ.Elem()
+	p.sstype = typ
+	p.stype = t2
+	p.isMarshaler = isMarshaler(t2)
+	p.isUnmarshaler = isUnmarshaler(t2)
+	p.enc = (*Buffer).enc_slice_ref_struct_message
+	p.dec = (*Buffer).dec_slice_ref_struct_message
+	p.size = size_slice_ref_struct_message
+	if p.Wire != "bytes" {
+		fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T \n", typ, t2)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go
new file mode 100644
index 0000000000..4fe7e0815c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go
@@ -0,0 +1,117 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"fmt"
+	"io"
+)
+
+func Skip(data []byte) (n int, err error) {
+	l := len(data)
+	index := 0
+	for index < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if index >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := data[index]
+			index++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for {
+				if index >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				index++
+				if data[index-1] < 0x80 {
+					break
+				}
+			}
+			return index, nil
+		case 1:
+			index += 8
+			return index, nil
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if index >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := data[index]
+				index++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			index += length
+			return index, nil
+		case 3:
+			for {
+				var innerWire uint64
+				var start int = index
+				for shift := uint(0); ; shift += 7 {
+					if index >= l {
+						return 0, io.ErrUnexpectedEOF
+					}
+					b := data[index]
+					index++
+					innerWire |= (uint64(b) & 0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				innerWireType := int(innerWire & 0x7)
+				if innerWireType == 4 {
+					break
+				}
+				next, err := Skip(data[start:])
+				if err != nil {
+					return 0, err
+				}
+				index = start + next
+			}
+			return index, nil
+		case 4:
+			return index, nil
+		case 5:
+			index += 4
+			return index, nil
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+	}
+	panic("unreachable")
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
new file mode 100644
index 0000000000..7c9ae90f95
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
@@ -0,0 +1,793 @@
+// Extensions for Protocol Buffers to create more go like structures.
+//
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+// Functions for writing the text protocol buffer format.
+
+import (
+	"bufio"
+	"bytes"
+	"encoding"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"math"
+	"reflect"
+	"sort"
+	"strings"
+)
+
+var (
+	newline         = []byte("\n")
+	spaces          = []byte("                                        ")
+	gtNewline       = []byte(">\n")
+	endBraceNewline = []byte("}\n")
+	backslashN      = []byte{'\\', 'n'}
+	backslashR      = []byte{'\\', 'r'}
+	backslashT      = []byte{'\\', 't'}
+	backslashDQ     = []byte{'\\', '"'}
+	backslashBS     = []byte{'\\', '\\'}
+	posInf          = []byte("inf")
+	negInf          = []byte("-inf")
+	nan             = []byte("nan")
+)
+
+type writer interface {
+	io.Writer
+	WriteByte(byte) error
+}
+
+// textWriter is an io.Writer that tracks its indentation level.
+type textWriter struct {
+	ind      int
+	complete bool // if the current position is a complete line
+	compact  bool // whether to write out as a one-liner
+	w        writer
+}
+
+func (w *textWriter) WriteString(s string) (n int, err error) {
+	if !strings.Contains(s, "\n") {
+		if !w.compact && w.complete {
+			w.writeIndent()
+		}
+		w.complete = false
+		return io.WriteString(w.w, s)
+	}
+	// WriteString is typically called without newlines, so this
+	// codepath and its copy are rare.  We copy to avoid
+	// duplicating all of Write's logic here.
+	return w.Write([]byte(s))
+}
+
+func (w *textWriter) Write(p []byte) (n int, err error) {
+	newlines := bytes.Count(p, newline)
+	if newlines == 0 {
+		if !w.compact && w.complete {
+			w.writeIndent()
+		}
+		n, err = w.w.Write(p)
+		w.complete = false
+		return n, err
+	}
+
+	frags := bytes.SplitN(p, newline, newlines+1)
+	if w.compact {
+		for i, frag := range frags {
+			if i > 0 {
+				if err := w.w.WriteByte(' '); err != nil {
+					return n, err
+				}
+				n++
+			}
+			nn, err := w.w.Write(frag)
+			n += nn
+			if err != nil {
+				return n, err
+			}
+		}
+		return n, nil
+	}
+
+	for i, frag := range frags {
+		if w.complete {
+			w.writeIndent()
+		}
+		nn, err := w.w.Write(frag)
+		n += nn
+		if err != nil {
+			return n, err
+		}
+		if i+1 < len(frags) {
+			if err := w.w.WriteByte('\n'); err != nil {
+				return n, err
+			}
+			n++
+		}
+	}
+	w.complete = len(frags[len(frags)-1]) == 0
+	return n, nil
+}
+
+func (w *textWriter) WriteByte(c byte) error {
+	if w.compact && c == '\n' {
+		c = ' '
+	}
+	if !w.compact && w.complete {
+		w.writeIndent()
+	}
+	err := w.w.WriteByte(c)
+	w.complete = c == '\n'
+	return err
+}
+
+func (w *textWriter) indent() { w.ind++ }
+
+func (w *textWriter) unindent() {
+	if w.ind == 0 {
+		log.Printf("proto: textWriter unindented too far")
+		return
+	}
+	w.ind--
+}
+
+func writeName(w *textWriter, props *Properties) error {
+	if _, err := w.WriteString(props.OrigName); err != nil {
+		return err
+	}
+	if props.Wire != "group" {
+		return w.WriteByte(':')
+	}
+	return nil
+}
+
+// raw is the interface satisfied by RawMessage.
+type raw interface {
+	Bytes() []byte
+}
+
+func writeStruct(w *textWriter, sv reflect.Value) error {
+	st := sv.Type()
+	sprops := GetProperties(st)
+	for i := 0; i < sv.NumField(); i++ {
+		fv := sv.Field(i)
+		props := sprops.Prop[i]
+		name := st.Field(i).Name
+
+		if strings.HasPrefix(name, "XXX_") {
+			// There are two XXX_ fields:
+			//   XXX_unrecognized []byte
+			//   XXX_extensions   map[int32]proto.Extension
+			// The first is handled here;
+			// the second is handled at the bottom of this function.
+			if name == "XXX_unrecognized" && !fv.IsNil() {
+				if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		if fv.Kind() == reflect.Ptr && fv.IsNil() {
+			// Field not filled in. This could be an optional field or
+			// a required field that wasn't filled in. Either way, there
+			// isn't anything we can show for it.
+			continue
+		}
+		if fv.Kind() == reflect.Slice && fv.IsNil() {
+			// Repeated field that is empty, or a bytes field that is unused.
+			continue
+		}
+
+		if props.Repeated && fv.Kind() == reflect.Slice {
+			// Repeated field.
+			for j := 0; j < fv.Len(); j++ {
+				if err := writeName(w, props); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+				}
+				v := fv.Index(j)
+				if v.Kind() == reflect.Ptr && v.IsNil() {
+					// A nil message in a repeated field is not valid,
+					// but we can handle that more gracefully than panicking.
+					if _, err := w.Write([]byte("<nil>\n")); err != nil {
+						return err
+					}
+					continue
+				}
+				if len(props.Enum) > 0 {
+					if err := writeEnum(w, v, props); err != nil {
+						return err
+					}
+				} else if err := writeAny(w, v, props); err != nil {
+					return err
+				}
+				if err := w.WriteByte('\n'); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		if fv.Kind() == reflect.Map {
+			// Map fields are rendered as a repeated struct with key/value fields.
+			keys := fv.MapKeys()
+			sort.Sort(mapKeys(keys))
+			for _, key := range keys {
+				val := fv.MapIndex(key)
+				if err := writeName(w, props); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+				}
+				// open struct
+				if err := w.WriteByte('<'); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte('\n'); err != nil {
+						return err
+					}
+				}
+				w.indent()
+				// key
+				if _, err := w.WriteString("key:"); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+				}
+				if err := writeAny(w, key, props.mkeyprop); err != nil {
+					return err
+				}
+				if err := w.WriteByte('\n'); err != nil {
+					return err
+				}
+				// nil values aren't legal, but we can avoid panicking because of them.
+				if val.Kind() != reflect.Ptr || !val.IsNil() {
+					// value
+					if _, err := w.WriteString("value:"); err != nil {
+						return err
+					}
+					if !w.compact {
+						if err := w.WriteByte(' '); err != nil {
+							return err
+						}
+					}
+					if err := writeAny(w, val, props.mvalprop); err != nil {
+						return err
+					}
+					if err := w.WriteByte('\n'); err != nil {
+						return err
+					}
+				}
+				// close struct
+				w.unindent()
+				if err := w.WriteByte('>'); err != nil {
+					return err
+				}
+				if err := w.WriteByte('\n'); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
+			// empty bytes field
+			continue
+		}
+		if props.proto3 && fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
+			// proto3 non-repeated scalar field; skip if zero value
+			if isProto3Zero(fv) {
+				continue
+			}
+		}
+
+		if fv.Kind() == reflect.Interface {
+			// Check if it is a oneof.
+			if st.Field(i).Tag.Get("protobuf_oneof") != "" {
+				// fv is nil, or holds a pointer to generated struct.
+				// That generated struct has exactly one field,
+				// which has a protobuf struct tag.
+				if fv.IsNil() {
+					continue
+				}
+				inner := fv.Elem().Elem() // interface -> *T -> T
+				tag := inner.Type().Field(0).Tag.Get("protobuf")
+				props.Parse(tag) // Overwrite the outer props.
+				// Write the value in the oneof, not the oneof itself.
+				fv = inner.Field(0)
+
+				// Special case to cope with malformed messages gracefully:
+				// If the value in the oneof is a nil pointer, don't panic
+				// in writeAny.
+				if fv.Kind() == reflect.Ptr && fv.IsNil() {
+					// Use errors.New so writeAny won't render quotes.
+					msg := errors.New("/* nil */")
+					fv = reflect.ValueOf(&msg).Elem()
+				}
+			}
+		}
+
+		if err := writeName(w, props); err != nil {
+			return err
+		}
+		if !w.compact {
+			if err := w.WriteByte(' '); err != nil {
+				return err
+			}
+		}
+		if b, ok := fv.Interface().(raw); ok {
+			if err := writeRaw(w, b.Bytes()); err != nil {
+				return err
+			}
+			continue
+		}
+
+		if len(props.Enum) > 0 {
+			if err := writeEnum(w, fv, props); err != nil {
+				return err
+			}
+		} else if err := writeAny(w, fv, props); err != nil {
+			return err
+		}
+
+		if err := w.WriteByte('\n'); err != nil {
+			return err
+		}
+	}
+
+	// Extensions (the XXX_extensions field).
+	pv := sv
+	if pv.CanAddr() {
+		pv = sv.Addr()
+	} else {
+		pv = reflect.New(sv.Type())
+		pv.Elem().Set(sv)
+	}
+	if pv.Type().Implements(extendableProtoType) {
+		if err := writeExtensions(w, pv); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// writeRaw writes an uninterpreted raw message.
+func writeRaw(w *textWriter, b []byte) error {
+	if err := w.WriteByte('<'); err != nil {
+		return err
+	}
+	if !w.compact {
+		if err := w.WriteByte('\n'); err != nil {
+			return err
+		}
+	}
+	w.indent()
+	if err := writeUnknownStruct(w, b); err != nil {
+		return err
+	}
+	w.unindent()
+	if err := w.WriteByte('>'); err != nil {
+		return err
+	}
+	return nil
+}
+
+// writeAny writes an arbitrary field.
+func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
+	v = reflect.Indirect(v)
+
+	if props != nil && len(props.CustomType) > 0 {
+		custom, ok := v.Interface().(Marshaler)
+		if ok {
+			data, err := custom.Marshal()
+			if err != nil {
+				return err
+			}
+			if err := writeString(w, string(data)); err != nil {
+				return err
+			}
+			return nil
+		}
+	}
+
+	// Floats have special cases.
+	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
+		x := v.Float()
+		var b []byte
+		switch {
+		case math.IsInf(x, 1):
+			b = posInf
+		case math.IsInf(x, -1):
+			b = negInf
+		case math.IsNaN(x):
+			b = nan
+		}
+		if b != nil {
+			_, err := w.Write(b)
+			return err
+		}
+		// Other values are handled below.
+	}
+
+	// We don't attempt to serialise every possible value type; only those
+	// that can occur in protocol buffers.
+	switch v.Kind() {
+	case reflect.Slice:
+		// Should only be a []byte; repeated fields are handled in writeStruct.
+		if err := writeString(w, string(v.Bytes())); err != nil {
+			return err
+		}
+	case reflect.String:
+		if err := writeString(w, v.String()); err != nil {
+			return err
+		}
+	case reflect.Struct:
+		// Required/optional group/message.
+		var bra, ket byte = '<', '>'
+		if props != nil && props.Wire == "group" {
+			bra, ket = '{', '}'
+		}
+		if err := w.WriteByte(bra); err != nil {
+			return err
+		}
+		if !w.compact {
+			if err := w.WriteByte('\n'); err != nil {
+				return err
+			}
+		}
+		w.indent()
+		if tm, ok := v.Interface().(encoding.TextMarshaler); ok {
+			text, err := tm.MarshalText()
+			if err != nil {
+				return err
+			}
+			if _, err = w.Write(text); err != nil {
+				return err
+			}
+		} else if err := writeStruct(w, v); err != nil {
+			return err
+		}
+		w.unindent()
+		if err := w.WriteByte(ket); err != nil {
+			return err
+		}
+	default:
+		_, err := fmt.Fprint(w, v.Interface())
+		return err
+	}
+	return nil
+}
+
+// equivalent to C's isprint.
+func isprint(c byte) bool {
+	return c >= 0x20 && c < 0x7f
+}
+
+// writeString writes a string in the protocol buffer text format.
+// It is similar to strconv.Quote except we don't use Go escape sequences,
+// we treat the string as a byte sequence, and we use octal escapes.
+// These differences are to maintain interoperability with the other
+// languages' implementations of the text format.
+func writeString(w *textWriter, s string) error {
+	// use WriteByte here to get any needed indent
+	if err := w.WriteByte('"'); err != nil {
+		return err
+	}
+	// Loop over the bytes, not the runes.
+	for i := 0; i < len(s); i++ {
+		var err error
+		// Divergence from C++: we don't escape apostrophes.
+		// There's no need to escape them, and the C++ parser
+		// copes with a naked apostrophe.
+		switch c := s[i]; c {
+		case '\n':
+			_, err = w.w.Write(backslashN)
+		case '\r':
+			_, err = w.w.Write(backslashR)
+		case '\t':
+			_, err = w.w.Write(backslashT)
+		case '"':
+			_, err = w.w.Write(backslashDQ)
+		case '\\':
+			_, err = w.w.Write(backslashBS)
+		default:
+			if isprint(c) {
+				err = w.w.WriteByte(c)
+			} else {
+				_, err = fmt.Fprintf(w.w, "\\%03o", c)
+			}
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return w.WriteByte('"')
+}
+
+func writeUnknownStruct(w *textWriter, data []byte) (err error) {
+	if !w.compact {
+		if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
+			return err
+		}
+	}
+	b := NewBuffer(data)
+	for b.index < len(b.buf) {
+		x, err := b.DecodeVarint()
+		if err != nil {
+			_, ferr := fmt.Fprintf(w, "/* %v */\n", err)
+			return ferr
+		}
+		wire, tag := x&7, x>>3
+		if wire == WireEndGroup {
+			w.unindent()
+			if _, werr := w.Write(endBraceNewline); werr != nil {
+				return werr
+			}
+			continue
+		}
+		if _, ferr := fmt.Fprint(w, tag); ferr != nil {
+			return ferr
+		}
+		if wire != WireStartGroup {
+			if err := w.WriteByte(':'); err != nil {
+				return err
+			}
+		}
+		if !w.compact || wire == WireStartGroup {
+			if err := w.WriteByte(' '); err != nil {
+				return err
+			}
+		}
+		switch wire {
+		case WireBytes:
+			buf, e := b.DecodeRawBytes(false)
+			if e == nil {
+				_, err = fmt.Fprintf(w, "%q", buf)
+			} else {
+				_, err = fmt.Fprintf(w, "/* %v */", e)
+			}
+		case WireFixed32:
+			x, err = b.DecodeFixed32()
+			err = writeUnknownInt(w, x, err)
+		case WireFixed64:
+			x, err = b.DecodeFixed64()
+			err = writeUnknownInt(w, x, err)
+		case WireStartGroup:
+			err = w.WriteByte('{')
+			w.indent()
+		case WireVarint:
+			x, err = b.DecodeVarint()
+			err = writeUnknownInt(w, x, err)
+		default:
+			_, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
+		}
+		if err != nil {
+			return err
+		}
+		if err := w.WriteByte('\n'); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func writeUnknownInt(w *textWriter, x uint64, err error) error {
+	if err == nil {
+		_, err = fmt.Fprint(w, x)
+	} else {
+		_, err = fmt.Fprintf(w, "/* %v */", err)
+	}
+	return err
+}
+
+type int32Slice []int32
+
+func (s int32Slice) Len() int           { return len(s) }
+func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// writeExtensions writes all the extensions in pv.
+// pv is assumed to be a pointer to a protocol message struct that is extendable.
+func writeExtensions(w *textWriter, pv reflect.Value) error {
+	emap := extensionMaps[pv.Type().Elem()]
+	ep := pv.Interface().(extendableProto)
+
+	// Order the extensions by ID.
+	// This isn't strictly necessary, but it will give us
+	// canonical output, which will also make testing easier.
+	var m map[int32]Extension
+	if em, ok := ep.(extensionsMap); ok {
+		m = em.ExtensionMap()
+	} else if em, ok := ep.(extensionsBytes); ok {
+		eb := em.GetExtensions()
+		var err error
+		m, err = BytesToExtensionsMap(*eb)
+		if err != nil {
+			return err
+		}
+	}
+
+	ids := make([]int32, 0, len(m))
+	for id := range m {
+		ids = append(ids, id)
+	}
+	sort.Sort(int32Slice(ids))
+
+	for _, extNum := range ids {
+		ext := m[extNum]
+		var desc *ExtensionDesc
+		if emap != nil {
+			desc = emap[extNum]
+		}
+		if desc == nil {
+			// Unknown extension.
+			if err := writeUnknownStruct(w, ext.enc); err != nil {
+				return err
+			}
+			continue
+		}
+
+		pb, err := GetExtension(ep, desc)
+		if err != nil {
+			return fmt.Errorf("failed getting extension: %v", err)
+		}
+
+		// Repeated extensions will appear as a slice.
+		if !desc.repeated() {
+			if err := writeExtension(w, desc.Name, pb); err != nil {
+				return err
+			}
+		} else {
+			v := reflect.ValueOf(pb)
+			for i := 0; i < v.Len(); i++ {
+				if err := writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
+					return err
+				}
+			}
+		}
+	}
+	return nil
+}
+
+func writeExtension(w *textWriter, name string, pb interface{}) error {
+	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
+		return err
+	}
+	if !w.compact {
+		if err := w.WriteByte(' '); err != nil {
+			return err
+		}
+	}
+	if err := writeAny(w, reflect.ValueOf(pb), nil); err != nil {
+		return err
+	}
+	if err := w.WriteByte('\n'); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (w *textWriter) writeIndent() {
+	if !w.complete {
+		return
+	}
+	remain := w.ind * 2
+	for remain > 0 {
+		n := remain
+		if n > len(spaces) {
+			n = len(spaces)
+		}
+		w.w.Write(spaces[:n])
+		remain -= n
+	}
+	w.complete = false
+}
+
+func marshalText(w io.Writer, pb Message, compact bool) error {
+	val := reflect.ValueOf(pb)
+	if pb == nil || val.IsNil() {
+		w.Write([]byte("<nil>"))
+		return nil
+	}
+	var bw *bufio.Writer
+	ww, ok := w.(writer)
+	if !ok {
+		bw = bufio.NewWriter(w)
+		ww = bw
+	}
+	aw := &textWriter{
+		w:        ww,
+		complete: true,
+		compact:  compact,
+	}
+
+	if tm, ok := pb.(encoding.TextMarshaler); ok {
+		text, err := tm.MarshalText()
+		if err != nil {
+			return err
+		}
+		if _, err = aw.Write(text); err != nil {
+			return err
+		}
+		if bw != nil {
+			return bw.Flush()
+		}
+		return nil
+	}
+	// Dereference the received pointer so we don't have outer < and >.
+	v := reflect.Indirect(val)
+	if err := writeStruct(aw, v); err != nil {
+		return err
+	}
+	if bw != nil {
+		return bw.Flush()
+	}
+	return nil
+}
+
+// MarshalText writes a given protocol buffer in text format.
+// The only errors returned are from w.
+func MarshalText(w io.Writer, pb Message) error {
+	return marshalText(w, pb, false)
+}
+
+// MarshalTextString is the same as MarshalText, but returns the string directly.
+func MarshalTextString(pb Message) string {
+	var buf bytes.Buffer
+	marshalText(&buf, pb, false)
+	return buf.String()
+}
+
+// CompactText writes a given protocol buffer in compact text format (one line).
+func CompactText(w io.Writer, pb Message) error { return marshalText(w, pb, true) }
+
+// CompactTextString is the same as CompactText, but returns the string directly.
+func CompactTextString(pb Message) string {
+	var buf bytes.Buffer
+	marshalText(&buf, pb, true)
+	return buf.String()
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go
new file mode 100644
index 0000000000..cdb23373c3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go
@@ -0,0 +1,55 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"fmt"
+	"reflect"
+)
+
+func writeEnum(w *textWriter, v reflect.Value, props *Properties) error {
+	m, ok := enumStringMaps[props.Enum]
+	if !ok {
+		if err := writeAny(w, v, props); err != nil {
+			return err
+		}
+	}
+	key := int32(0)
+	if v.Kind() == reflect.Ptr {
+		key = int32(v.Elem().Int())
+	} else {
+		key = int32(v.Int())
+	}
+	s, ok := m[key]
+	if !ok {
+		if err := writeAny(w, v, props); err != nil {
+			return err
+		}
+	}
+	_, err := fmt.Fprint(w, s)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
new file mode 100644
index 0000000000..f3909695ed
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
@@ -0,0 +1,841 @@
+// Extensions for Protocol Buffers to create more go like structures.
+//
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+// Functions for parsing the Text protocol buffer format.
+// TODO: message sets.
+
+import (
+	"encoding"
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+	"unicode/utf8"
+)
+
+type ParseError struct {
+	Message string
+	Line    int // 1-based line number
+	Offset  int // 0-based byte offset from start of input
+}
+
+func (p *ParseError) Error() string {
+	if p.Line == 1 {
+		// show offset only for first line
+		return fmt.Sprintf("line 1.%d: %v", p.Offset, p.Message)
+	}
+	return fmt.Sprintf("line %d: %v", p.Line, p.Message)
+}
+
+type token struct {
+	value    string
+	err      *ParseError
+	line     int    // line number
+	offset   int    // byte number from start of input, not start of line
+	unquoted string // the unquoted version of value, if it was a quoted string
+}
+
+func (t *token) String() string {
+	if t.err == nil {
+		return fmt.Sprintf("%q (line=%d, offset=%d)", t.value, t.line, t.offset)
+	}
+	return fmt.Sprintf("parse error: %v", t.err)
+}
+
+type textParser struct {
+	s            string // remaining input
+	done         bool   // whether the parsing is finished (success or error)
+	backed       bool   // whether back() was called
+	offset, line int
+	cur          token
+}
+
+func newTextParser(s string) *textParser {
+	p := new(textParser)
+	p.s = s
+	p.line = 1
+	p.cur.line = 1
+	return p
+}
+
+func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
+	pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
+	p.cur.err = pe
+	p.done = true
+	return pe
+}
+
+// Numbers and identifiers are matched by [-+._A-Za-z0-9]
+func isIdentOrNumberChar(c byte) bool {
+	switch {
+	case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
+		return true
+	case '0' <= c && c <= '9':
+		return true
+	}
+	switch c {
+	case '-', '+', '.', '_':
+		return true
+	}
+	return false
+}
+
+func isWhitespace(c byte) bool {
+	switch c {
+	case ' ', '\t', '\n', '\r':
+		return true
+	}
+	return false
+}
+
+func (p *textParser) skipWhitespace() {
+	i := 0
+	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
+		if p.s[i] == '#' {
+			// comment; skip to end of line or input
+			for i < len(p.s) && p.s[i] != '\n' {
+				i++
+			}
+			if i == len(p.s) {
+				break
+			}
+		}
+		if p.s[i] == '\n' {
+			p.line++
+		}
+		i++
+	}
+	p.offset += i
+	p.s = p.s[i:len(p.s)]
+	if len(p.s) == 0 {
+		p.done = true
+	}
+}
+
+func (p *textParser) advance() {
+	// Skip whitespace
+	p.skipWhitespace()
+	if p.done {
+		return
+	}
+
+	// Start of non-whitespace
+	p.cur.err = nil
+	p.cur.offset, p.cur.line = p.offset, p.line
+	p.cur.unquoted = ""
+	switch p.s[0] {
+	case '<', '>', '{', '}', ':', '[', ']', ';', ',':
+		// Single symbol
+		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
+	case '"', '\'':
+		// Quoted string
+		i := 1
+		for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
+			if p.s[i] == '\\' && i+1 < len(p.s) {
+				// skip escaped char
+				i++
+			}
+			i++
+		}
+		if i >= len(p.s) || p.s[i] != p.s[0] {
+			p.errorf("unmatched quote")
+			return
+		}
+		unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
+		if err != nil {
+			p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
+			return
+		}
+		p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
+		p.cur.unquoted = unq
+	default:
+		i := 0
+		for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
+			i++
+		}
+		if i == 0 {
+			p.errorf("unexpected byte %#x", p.s[0])
+			return
+		}
+		p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
+	}
+	p.offset += len(p.cur.value)
+}
+
+var (
+	errBadUTF8 = errors.New("proto: bad UTF-8")
+	errBadHex  = errors.New("proto: bad hexadecimal")
+)
+
+func unquoteC(s string, quote rune) (string, error) {
+	// This is based on C++'s tokenizer.cc.
+	// Despite its name, this is *not* parsing C syntax.
+	// For instance, "\0" is an invalid quoted string.
+
+	// Avoid allocation in trivial cases.
+	simple := true
+	for _, r := range s {
+		if r == '\\' || r == quote {
+			simple = false
+			break
+		}
+	}
+	if simple {
+		return s, nil
+	}
+
+	buf := make([]byte, 0, 3*len(s)/2)
+	for len(s) > 0 {
+		r, n := utf8.DecodeRuneInString(s)
+		if r == utf8.RuneError && n == 1 {
+			return "", errBadUTF8
+		}
+		s = s[n:]
+		if r != '\\' {
+			if r < utf8.RuneSelf {
+				buf = append(buf, byte(r))
+			} else {
+				buf = append(buf, string(r)...)
+			}
+			continue
+		}
+
+		ch, tail, err := unescape(s)
+		if err != nil {
+			return "", err
+		}
+		buf = append(buf, ch...)
+		s = tail
+	}
+	return string(buf), nil
+}
+
+func unescape(s string) (ch string, tail string, err error) {
+	r, n := utf8.DecodeRuneInString(s)
+	if r == utf8.RuneError && n == 1 {
+		return "", "", errBadUTF8
+	}
+	s = s[n:]
+	switch r {
+	case 'a':
+		return "\a", s, nil
+	case 'b':
+		return "\b", s, nil
+	case 'f':
+		return "\f", s, nil
+	case 'n':
+		return "\n", s, nil
+	case 'r':
+		return "\r", s, nil
+	case 't':
+		return "\t", s, nil
+	case 'v':
+		return "\v", s, nil
+	case '?':
+		return "?", s, nil // trigraph workaround
+	case '\'', '"', '\\':
+		return string(r), s, nil
+	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
+		if len(s) < 2 {
+			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
+		}
+		base := 8
+		ss := s[:2]
+		s = s[2:]
+		if r == 'x' || r == 'X' {
+			base = 16
+		} else {
+			ss = string(r) + ss
+		}
+		i, err := strconv.ParseUint(ss, base, 8)
+		if err != nil {
+			return "", "", err
+		}
+		return string([]byte{byte(i)}), s, nil
+	case 'u', 'U':
+		n := 4
+		if r == 'U' {
+			n = 8
+		}
+		if len(s) < n {
+			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
+		}
+
+		bs := make([]byte, n/2)
+		for i := 0; i < n; i += 2 {
+			a, ok1 := unhex(s[i])
+			b, ok2 := unhex(s[i+1])
+			if !ok1 || !ok2 {
+				return "", "", errBadHex
+			}
+			bs[i/2] = a<<4 | b
+		}
+		s = s[n:]
+		return string(bs), s, nil
+	}
+	return "", "", fmt.Errorf(`unknown escape \%c`, r)
+}
+
+// Adapted from src/pkg/strconv/quote.go.
+func unhex(b byte) (v byte, ok bool) {
+	switch {
+	case '0' <= b && b <= '9':
+		return b - '0', true
+	case 'a' <= b && b <= 'f':
+		return b - 'a' + 10, true
+	case 'A' <= b && b <= 'F':
+		return b - 'A' + 10, true
+	}
+	return 0, false
+}
+
+// Back off the parser by one token. Can only be done between calls to next().
+// It makes the next advance() a no-op.
+func (p *textParser) back() { p.backed = true }
+
+// Advances the parser and returns the new current token.
+func (p *textParser) next() *token {
+	if p.backed || p.done {
+		p.backed = false
+		return &p.cur
+	}
+	p.advance()
+	if p.done {
+		p.cur.value = ""
+	} else if len(p.cur.value) > 0 && p.cur.value[0] == '"' {
+		// Look for multiple quoted strings separated by whitespace,
+		// and concatenate them.
+		cat := p.cur
+		for {
+			p.skipWhitespace()
+			if p.done || p.s[0] != '"' {
+				break
+			}
+			p.advance()
+			if p.cur.err != nil {
+				return &p.cur
+			}
+			cat.value += " " + p.cur.value
+			cat.unquoted += p.cur.unquoted
+		}
+		p.done = false // parser may have seen EOF, but we want to return cat
+		p.cur = cat
+	}
+	return &p.cur
+}
+
+func (p *textParser) consumeToken(s string) error {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value != s {
+		p.back()
+		return p.errorf("expected %q, found %q", s, tok.value)
+	}
+	return nil
+}
+
+// Return a RequiredNotSetError indicating which required field was not set.
+func (p *textParser) missingRequiredFieldError(sv reflect.Value) *RequiredNotSetError {
+	st := sv.Type()
+	sprops := GetProperties(st)
+	for i := 0; i < st.NumField(); i++ {
+		if !isNil(sv.Field(i)) {
+			continue
+		}
+
+		props := sprops.Prop[i]
+		if props.Required {
+			return &RequiredNotSetError{fmt.Sprintf("%v.%v", st, props.OrigName)}
+		}
+	}
+	return &RequiredNotSetError{fmt.Sprintf("%v.<unknown field name>", st)} // should not happen
+}
+
+// Returns the index in the struct for the named field, as well as the parsed tag properties.
+func structFieldByName(sprops *StructProperties, name string) (int, *Properties, bool) {
+	i, ok := sprops.decoderOrigNames[name]
+	if ok {
+		return i, sprops.Prop[i], true
+	}
+	return -1, nil, false
+}
+
+// Consume a ':' from the input stream (if the next token is a colon),
+// returning an error if a colon is needed but not present.
+func (p *textParser) checkForColon(props *Properties, typ reflect.Type) *ParseError {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value != ":" {
+		// Colon is optional when the field is a group or message.
+		needColon := true
+		switch props.Wire {
+		case "group":
+			needColon = false
+		case "bytes":
+			// A "bytes" field is either a message, a string, or a repeated field;
+			// those three become *T, *string and []T respectively, so we can check for
+			// this field being a pointer to a non-string.
+			if typ.Kind() == reflect.Ptr {
+				// *T or *string
+				if typ.Elem().Kind() == reflect.String {
+					break
+				}
+			} else if typ.Kind() == reflect.Slice {
+				// []T or []*T
+				if typ.Elem().Kind() != reflect.Ptr {
+					break
+				}
+			} else if typ.Kind() == reflect.String {
+				// The proto3 exception is for a string field,
+				// which requires a colon.
+				break
+			}
+			needColon = false
+		}
+		if needColon {
+			return p.errorf("expected ':', found %q", tok.value)
+		}
+		p.back()
+	}
+	return nil
+}
+
+func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
+	st := sv.Type()
+	sprops := GetProperties(st)
+	reqCount := sprops.reqCount
+	var reqFieldErr error
+	fieldSet := make(map[string]bool)
+	// A struct is a sequence of "name: value", terminated by one of
+	// '>' or '}', or the end of the input.  A name may also be
+	// "[extension]".
+	for {
+		tok := p.next()
+		if tok.err != nil {
+			return tok.err
+		}
+		if tok.value == terminator {
+			break
+		}
+		if tok.value == "[" {
+			// Looks like an extension.
+			//
+			// TODO: Check whether we need to handle
+			// namespace rooted names (e.g. ".something.Foo").
+			tok = p.next()
+			if tok.err != nil {
+				return tok.err
+			}
+			var desc *ExtensionDesc
+			// This could be faster, but it's functional.
+			// TODO: Do something smarter than a linear scan.
+			for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
+				if d.Name == tok.value {
+					desc = d
+					break
+				}
+			}
+			if desc == nil {
+				return p.errorf("unrecognized extension %q", tok.value)
+			}
+			// Check the extension terminator.
+			tok = p.next()
+			if tok.err != nil {
+				return tok.err
+			}
+			if tok.value != "]" {
+				return p.errorf("unrecognized extension terminator %q", tok.value)
+			}
+
+			props := &Properties{}
+			props.Parse(desc.Tag)
+
+			typ := reflect.TypeOf(desc.ExtensionType)
+			if err := p.checkForColon(props, typ); err != nil {
+				return err
+			}
+
+			rep := desc.repeated()
+
+			// Read the extension structure, and set it in
+			// the value we're constructing.
+			var ext reflect.Value
+			if !rep {
+				ext = reflect.New(typ).Elem()
+			} else {
+				ext = reflect.New(typ.Elem()).Elem()
+			}
+			if err := p.readAny(ext, props); err != nil {
+				if _, ok := err.(*RequiredNotSetError); !ok {
+					return err
+				}
+				reqFieldErr = err
+			}
+			ep := sv.Addr().Interface().(extendableProto)
+			if !rep {
+				SetExtension(ep, desc, ext.Interface())
+			} else {
+				old, err := GetExtension(ep, desc)
+				var sl reflect.Value
+				if err == nil {
+					sl = reflect.ValueOf(old) // existing slice
+				} else {
+					sl = reflect.MakeSlice(typ, 0, 1)
+				}
+				sl = reflect.Append(sl, ext)
+				SetExtension(ep, desc, sl.Interface())
+			}
+			if err := p.consumeOptionalSeparator(); err != nil {
+				return err
+			}
+			continue
+		}
+
+		// This is a normal, non-extension field.
+		name := tok.value
+		var dst reflect.Value
+		fi, props, ok := structFieldByName(sprops, name)
+		if ok {
+			dst = sv.Field(fi)
+		} else if oop, ok := sprops.OneofTypes[name]; ok {
+			// It is a oneof.
+			props = oop.Prop
+			nv := reflect.New(oop.Type.Elem())
+			dst = nv.Elem().Field(0)
+			sv.Field(oop.Field).Set(nv)
+		}
+		if !dst.IsValid() {
+			return p.errorf("unknown field name %q in %v", name, st)
+		}
+
+		if dst.Kind() == reflect.Map {
+			// Consume any colon.
+			if err := p.checkForColon(props, dst.Type()); err != nil {
+				return err
+			}
+
+			// Construct the map if it doesn't already exist.
+			if dst.IsNil() {
+				dst.Set(reflect.MakeMap(dst.Type()))
+			}
+			key := reflect.New(dst.Type().Key()).Elem()
+			val := reflect.New(dst.Type().Elem()).Elem()
+
+			// The map entry should be this sequence of tokens:
+			//	< key : KEY value : VALUE >
+			// Technically the "key" and "value" could come in any order,
+			// but in practice they won't.
+
+			tok := p.next()
+			var terminator string
+			switch tok.value {
+			case "<":
+				terminator = ">"
+			case "{":
+				terminator = "}"
+			default:
+				return p.errorf("expected '{' or '<', found %q", tok.value)
+			}
+			if err := p.consumeToken("key"); err != nil {
+				return err
+			}
+			if err := p.consumeToken(":"); err != nil {
+				return err
+			}
+			if err := p.readAny(key, props.mkeyprop); err != nil {
+				return err
+			}
+			if err := p.consumeOptionalSeparator(); err != nil {
+				return err
+			}
+			if err := p.consumeToken("value"); err != nil {
+				return err
+			}
+			if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
+				return err
+			}
+			if err := p.readAny(val, props.mvalprop); err != nil {
+				return err
+			}
+			if err := p.consumeOptionalSeparator(); err != nil {
+				return err
+			}
+			if err := p.consumeToken(terminator); err != nil {
+				return err
+			}
+
+			dst.SetMapIndex(key, val)
+			continue
+		}
+
+		// Check that it's not already set if it's not a repeated field.
+		if !props.Repeated && fieldSet[name] {
+			return p.errorf("non-repeated field %q was repeated", name)
+		}
+
+		if err := p.checkForColon(props, dst.Type()); err != nil {
+			return err
+		}
+
+		// Parse into the field.
+		fieldSet[name] = true
+		if err := p.readAny(dst, props); err != nil {
+			if _, ok := err.(*RequiredNotSetError); !ok {
+				return err
+			}
+			reqFieldErr = err
+		} else if props.Required {
+			reqCount--
+		}
+
+		if err := p.consumeOptionalSeparator(); err != nil {
+			return err
+		}
+
+	}
+
+	if reqCount > 0 {
+		return p.missingRequiredFieldError(sv)
+	}
+	return reqFieldErr
+}
+
+// consumeOptionalSeparator consumes an optional semicolon or comma.
+// It is used in readStruct to provide backward compatibility.
+func (p *textParser) consumeOptionalSeparator() error {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value != ";" && tok.value != "," {
+		p.back()
+	}
+	return nil
+}
+
+func (p *textParser) readAny(v reflect.Value, props *Properties) error {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value == "" {
+		return p.errorf("unexpected EOF")
+	}
+	if len(props.CustomType) > 0 {
+		if props.Repeated {
+			t := reflect.TypeOf(v.Interface())
+			if t.Kind() == reflect.Slice {
+				tc := reflect.TypeOf(new(Marshaler))
+				ok := t.Elem().Implements(tc.Elem())
+				if ok {
+					fv := v
+					flen := fv.Len()
+					if flen == fv.Cap() {
+						nav := reflect.MakeSlice(v.Type(), flen, 2*flen+1)
+						reflect.Copy(nav, fv)
+						fv.Set(nav)
+					}
+					fv.SetLen(flen + 1)
+
+					// Read one.
+					p.back()
+					return p.readAny(fv.Index(flen), props)
+				}
+			}
+		}
+		if reflect.TypeOf(v.Interface()).Kind() == reflect.Ptr {
+			custom := reflect.New(props.ctype.Elem()).Interface().(Unmarshaler)
+			err := custom.Unmarshal([]byte(tok.unquoted))
+			if err != nil {
+				return p.errorf("%v %v: %v", err, v.Type(), tok.value)
+			}
+			v.Set(reflect.ValueOf(custom))
+		} else {
+			custom := reflect.New(reflect.TypeOf(v.Interface())).Interface().(Unmarshaler)
+			err := custom.Unmarshal([]byte(tok.unquoted))
+			if err != nil {
+				return p.errorf("%v %v: %v", err, v.Type(), tok.value)
+			}
+			v.Set(reflect.Indirect(reflect.ValueOf(custom)))
+		}
+		return nil
+	}
+	switch fv := v; fv.Kind() {
+	case reflect.Slice:
+		at := v.Type()
+		if at.Elem().Kind() == reflect.Uint8 {
+			// Special case for []byte
+			if tok.value[0] != '"' && tok.value[0] != '\'' {
+				// Deliberately written out here, as the error after
+				// this switch statement would write "invalid []byte: ...",
+				// which is not as user-friendly.
+				return p.errorf("invalid string: %v", tok.value)
+			}
+			bytes := []byte(tok.unquoted)
+			fv.Set(reflect.ValueOf(bytes))
+			return nil
+		}
+		// Repeated field.
+		if tok.value == "[" {
+			// Repeated field with list notation, like [1,2,3].
+			for {
+				fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
+				err := p.readAny(fv.Index(fv.Len()-1), props)
+				if err != nil {
+					return err
+				}
+				tok := p.next()
+				if tok.err != nil {
+					return tok.err
+				}
+				if tok.value == "]" {
+					break
+				}
+				if tok.value != "," {
+					return p.errorf("Expected ']' or ',' found %q", tok.value)
+				}
+			}
+			return nil
+		}
+		// One value of the repeated field.
+		p.back()
+		fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
+		return p.readAny(fv.Index(fv.Len()-1), props)
+	case reflect.Bool:
+		// Either "true", "false", 1 or 0.
+		switch tok.value {
+		case "true", "1":
+			fv.SetBool(true)
+			return nil
+		case "false", "0":
+			fv.SetBool(false)
+			return nil
+		}
+	case reflect.Float32, reflect.Float64:
+		v := tok.value
+		// Ignore 'f' for compatibility with output generated by C++, but don't
+		// remove 'f' when the value is "-inf" or "inf".
+		if strings.HasSuffix(v, "f") && tok.value != "-inf" && tok.value != "inf" {
+			v = v[:len(v)-1]
+		}
+		if f, err := strconv.ParseFloat(v, fv.Type().Bits()); err == nil {
+			fv.SetFloat(f)
+			return nil
+		}
+	case reflect.Int32:
+		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
+			fv.SetInt(x)
+			return nil
+		}
+
+		if len(props.Enum) == 0 {
+			break
+		}
+		m, ok := enumValueMaps[props.Enum]
+		if !ok {
+			break
+		}
+		x, ok := m[tok.value]
+		if !ok {
+			break
+		}
+		fv.SetInt(int64(x))
+		return nil
+	case reflect.Int64:
+		if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
+			fv.SetInt(x)
+			return nil
+		}
+
+	case reflect.Ptr:
+		// A basic field (indirected through pointer), or a repeated message/group
+		p.back()
+		fv.Set(reflect.New(fv.Type().Elem()))
+		return p.readAny(fv.Elem(), props)
+	case reflect.String:
+		if tok.value[0] == '"' || tok.value[0] == '\'' {
+			fv.SetString(tok.unquoted)
+			return nil
+		}
+	case reflect.Struct:
+		var terminator string
+		switch tok.value {
+		case "{":
+			terminator = "}"
+		case "<":
+			terminator = ">"
+		default:
+			return p.errorf("expected '{' or '<', found %q", tok.value)
+		}
+		// TODO: Handle nested messages which implement encoding.TextUnmarshaler.
+		return p.readStruct(fv, terminator)
+	case reflect.Uint32:
+		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
+			fv.SetUint(uint64(x))
+			return nil
+		}
+	case reflect.Uint64:
+		if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
+			fv.SetUint(x)
+			return nil
+		}
+	}
+	return p.errorf("invalid %v: %v", v.Type(), tok.value)
+}
+
+// UnmarshalText reads a protocol buffer in Text format. UnmarshalText resets pb
+// before starting to unmarshal, so any existing data in pb is always removed.
+// If a required field is not set and no other error occurs,
+// UnmarshalText returns *RequiredNotSetError.
+func UnmarshalText(s string, pb Message) error {
+	if um, ok := pb.(encoding.TextUnmarshaler); ok {
+		err := um.UnmarshalText([]byte(s))
+		return err
+	}
+	pb.Reset()
+	v := reflect.ValueOf(pb)
+	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
+		return pe
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE b/Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE
new file mode 100644
index 0000000000..87a5cede33
--- /dev/null
+++ b/Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2012 Péter Surányi. Portions Copyright (c) 2009 The Go
+Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/dec.go b/Godeps/_workspace/src/gopkg.in/inf.v0/dec.go
similarity index 100%
rename from Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/dec.go
rename to Godeps/_workspace/src/gopkg.in/inf.v0/dec.go
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder.go b/Godeps/_workspace/src/gopkg.in/inf.v0/rounder.go
similarity index 100%
rename from Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder.go
rename to Godeps/_workspace/src/gopkg.in/inf.v0/rounder.go
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE b/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
index d645695673..6b4d837a44 100644
--- a/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2014 The Kubernetes Authors All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
new file mode 100644
index 0000000000..6a34e2d434
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
@@ -0,0 +1,55 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package resource
+
+import (
+	inf_v0 "gopkg.in/inf.v0"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+)
+
+func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error {
+	if in.Amount != nil {
+		in, out := in.Amount, &out.Amount
+		*out = new(inf_v0.Dec)
+		if newVal, err := c.DeepCopy(*in); err != nil {
+			return err
+		} else {
+			**out = newVal.(inf_v0.Dec)
+		}
+	} else {
+		out.Amount = nil
+	}
+	out.Format = in.Format
+	return nil
+}
+
+func DeepCopy_resource_QuantityProto(in QuantityProto, out *QuantityProto, c *conversion.Cloner) error {
+	out.Format = in.Format
+	out.Scale = in.Scale
+	if in.Bigint != nil {
+		in, out := in.Bigint, &out.Bigint
+		*out = make([]byte, len(in))
+		copy(*out, in)
+	} else {
+		out.Bigint = nil
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.pb.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
new file mode 100644
index 0000000000..7484f92761
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
@@ -0,0 +1,371 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by protoc-gen-gogo.
+// source: k8s.io/kubernetes/pkg/api/resource/generated.proto
+// DO NOT EDIT!
+
+/*
+	Package resource is a generated protocol buffer package.
+
+	It is generated from these files:
+		k8s.io/kubernetes/pkg/api/resource/generated.proto
+
+	It has these top-level messages:
+		Quantity
+		QuantityProto
+*/
+package resource
+
+import proto "github.com/gogo/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import io "io"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+func (m *Quantity) Reset()      { *m = Quantity{} }
+func (*Quantity) ProtoMessage() {}
+
+func (m *QuantityProto) Reset()         { *m = QuantityProto{} }
+func (m *QuantityProto) String() string { return proto.CompactTextString(m) }
+func (*QuantityProto) ProtoMessage()    {}
+
+func init() {
+	proto.RegisterType((*Quantity)(nil), "k8s.io.kubernetes.pkg.api.resource.Quantity")
+	proto.RegisterType((*QuantityProto)(nil), "k8s.io.kubernetes.pkg.api.resource.QuantityProto")
+}
+func (m *QuantityProto) Marshal() (data []byte, err error) {
+	size := m.Size()
+	data = make([]byte, size)
+	n, err := m.MarshalTo(data)
+	if err != nil {
+		return nil, err
+	}
+	return data[:n], nil
+}
+
+func (m *QuantityProto) MarshalTo(data []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	data[i] = 0xa
+	i++
+	i = encodeVarintGenerated(data, i, uint64(len(m.Format)))
+	i += copy(data[i:], m.Format)
+	data[i] = 0x10
+	i++
+	i = encodeVarintGenerated(data, i, uint64(m.Scale))
+	if m.Bigint != nil {
+		data[i] = 0x1a
+		i++
+		i = encodeVarintGenerated(data, i, uint64(len(m.Bigint)))
+		i += copy(data[i:], m.Bigint)
+	}
+	return i, nil
+}
+
+func encodeFixed64Generated(data []byte, offset int, v uint64) int {
+	data[offset] = uint8(v)
+	data[offset+1] = uint8(v >> 8)
+	data[offset+2] = uint8(v >> 16)
+	data[offset+3] = uint8(v >> 24)
+	data[offset+4] = uint8(v >> 32)
+	data[offset+5] = uint8(v >> 40)
+	data[offset+6] = uint8(v >> 48)
+	data[offset+7] = uint8(v >> 56)
+	return offset + 8
+}
+func encodeFixed32Generated(data []byte, offset int, v uint32) int {
+	data[offset] = uint8(v)
+	data[offset+1] = uint8(v >> 8)
+	data[offset+2] = uint8(v >> 16)
+	data[offset+3] = uint8(v >> 24)
+	return offset + 4
+}
+func encodeVarintGenerated(data []byte, offset int, v uint64) int {
+	for v >= 1<<7 {
+		data[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	data[offset] = uint8(v)
+	return offset + 1
+}
+func (m *QuantityProto) Size() (n int) {
+	var l int
+	_ = l
+	l = len(m.Format)
+	n += 1 + l + sovGenerated(uint64(l))
+	n += 1 + sovGenerated(uint64(m.Scale))
+	if m.Bigint != nil {
+		l = len(m.Bigint)
+		n += 1 + l + sovGenerated(uint64(l))
+	}
+	return n
+}
+
+func sovGenerated(x uint64) (n int) {
+	for {
+		n++
+		x >>= 7
+		if x == 0 {
+			break
+		}
+	}
+	return n
+}
+func sozGenerated(x uint64) (n int) {
+	return sovGenerated(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+func (m *QuantityProto) Unmarshal(data []byte) error {
+	l := len(data)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowGenerated
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := data[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QuantityProto: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QuantityProto: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Format", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthGenerated
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Format = Format(data[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Scale", wireType)
+			}
+			m.Scale = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				m.Scale |= (int32(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Bigint", wireType)
+			}
+			var byteLen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				byteLen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if byteLen < 0 {
+				return ErrInvalidLengthGenerated
+			}
+			postIndex := iNdEx + byteLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Bigint = append(m.Bigint[:0], data[iNdEx:postIndex]...)
+			if m.Bigint == nil {
+				m.Bigint = []byte{}
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipGenerated(data[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthGenerated
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func skipGenerated(data []byte) (n int, err error) {
+	l := len(data)
+	iNdEx := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowGenerated
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := data[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if data[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+			return iNdEx, nil
+		case 1:
+			iNdEx += 8
+			return iNdEx, nil
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			iNdEx += length
+			if length < 0 {
+				return 0, ErrInvalidLengthGenerated
+			}
+			return iNdEx, nil
+		case 3:
+			for {
+				var innerWire uint64
+				var start int = iNdEx
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return 0, ErrIntOverflowGenerated
+					}
+					if iNdEx >= l {
+						return 0, io.ErrUnexpectedEOF
+					}
+					b := data[iNdEx]
+					iNdEx++
+					innerWire |= (uint64(b) & 0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				innerWireType := int(innerWire & 0x7)
+				if innerWireType == 4 {
+					break
+				}
+				next, err := skipGenerated(data[start:])
+				if err != nil {
+					return 0, err
+				}
+				iNdEx = start + next
+			}
+			return iNdEx, nil
+		case 4:
+			return iNdEx, nil
+		case 5:
+			iNdEx += 4
+			return iNdEx, nil
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+	}
+	panic("unreachable")
+}
+
+var (
+	ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowGenerated   = fmt.Errorf("proto: integer overflow")
+)
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.proto b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.proto
new file mode 100644
index 0000000000..34ede4581b
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.proto
@@ -0,0 +1,109 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+// This file was autogenerated by go-to-protobuf. Do not edit it manually!
+
+syntax = 'proto2';
+
+package k8s.io.kubernetes.pkg.api.resource;
+
+import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
+
+// Package-wide variables from generator "generated".
+option go_package = "resource";
+
+// Quantity is a fixed-point representation of a number.
+// It provides convenient marshaling/unmarshaling in JSON and YAML,
+// in addition to String() and Int64() accessors.
+// 
+// The serialization format is:
+// 
+// <quantity>        ::= <signedNumber><suffix>
+//   (Note that <suffix> may be empty, from the "" case in <decimalSI>.)
+// <digit>           ::= 0 | 1 | ... | 9
+// <digits>          ::= <digit> | <digit><digits>
+// <number>          ::= <digits> | <digits>.<digits> | <digits>. | .<digits>
+// <sign>            ::= "+" | "-"
+// <signedNumber>    ::= <number> | <sign><number>
+// <suffix>          ::= <binarySI> | <decimalExponent> | <decimalSI>
+// <binarySI>        ::= Ki | Mi | Gi | Ti | Pi | Ei
+//   (International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)
+// <decimalSI>       ::= m | "" | k | M | G | T | P | E
+//   (Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)
+// <decimalExponent> ::= "e" <signedNumber> | "E" <signedNumber>
+// 
+// No matter which of the three exponent forms is used, no quantity may represent
+// a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal
+// places. Numbers larger or more precise will be capped or rounded up.
+// (E.g.: 0.1m will rounded up to 1m.)
+// This may be extended in the future if we require larger or smaller quantities.
+// 
+// When a Quantity is parsed from a string, it will remember the type of suffix
+// it had, and will use the same type again when it is serialized.
+// 
+// Before serializing, Quantity will be put in "canonical form".
+// This means that Exponent/suffix will be adjusted up or down (with a
+// corresponding increase or decrease in Mantissa) such that:
+//   a. No precision is lost
+//   b. No fractional digits will be emitted
+//   c. The exponent (or suffix) is as large as possible.
+// The sign will be omitted unless the number is negative.
+// 
+// Examples:
+//   1.5 will be serialized as "1500m"
+//   1.5Gi will be serialized as "1536Mi"
+// 
+// NOTE: We reserve the right to amend this canonical format, perhaps to
+//   allow 1.5 to be canonical.
+// TODO: Remove above disclaimer after all bikeshedding about format is over,
+//   or after March 2015.
+// 
+// Note that the quantity will NEVER be internally represented by a
+// floating point number. That is the whole point of this exercise.
+// 
+// Non-canonical values will still parse as long as they are well formed,
+// but will be re-emitted in their canonical form. (So always use canonical
+// form, or don't diff.)
+// 
+// This format is intended to make it difficult to use these numbers without
+// writing some sort of special handling code in the hopes that that will
+// cause implementors to also use a fixed point implementation.
+// 
+// +protobuf=true
+// +protobuf.embed=QuantityProto
+// +protobuf.options.marshal=false
+// +protobuf.options.(gogoproto.goproto_stringer)=false
+message Quantity {
+  optional QuantityProto QuantityProto = 1;
+}
+
+// QuantityProto is a struct that is equivalent to Quantity, but intended for
+// protobuf marshalling/unmarshalling. It is generated into a serialization
+// that matches Quantity. Do not use in Go structs.
+// 
+// +protobuf=true
+message QuantityProto {
+  // The format of the quantity
+  optional string format = 1;
+
+  // The scale dimension of the value
+  optional int32 scale = 2;
+
+  // Bigint is serialized as a raw bytes array
+  optional bytes bigint = 3;
+}
+
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity.go
index 01a7e60a64..e61c8800ec 100644
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity.go
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 Google Inc. All rights reserved.
+Copyright 2014 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +24,8 @@ import (
 	"strings"
 
 	flag "github.com/spf13/pflag"
-	"speter.net/go/exp/math/dec/inf"
+
+	inf "gopkg.in/inf.v0"
 )
 
 // Quantity is a fixed-point representation of a number.
@@ -83,6 +84,11 @@ import (
 // This format is intended to make it difficult to use these numbers without
 // writing some sort of special handling code in the hopes that that will
 // cause implementors to also use a fixed point implementation.
+//
+// +protobuf=true
+// +protobuf.embed=QuantityProto
+// +protobuf.options.marshal=false
+// +protobuf.options.(gogoproto.goproto_stringer)=false
 type Quantity struct {
 	// Amount is public, so you can manipulate it if the accessor
 	// functions are not sufficient.
@@ -112,10 +118,27 @@ func MustParse(str string) Quantity {
 	return *q
 }
 
+// Scale is used for getting and setting the base-10 scaled value.
+// Base-2 scales are omitted for mathematical simplicity.
+// See Quantity.ScaledValue for more details.
+type Scale int
+
+const (
+	Nano  Scale = -9
+	Micro Scale = -6
+	Milli Scale = -3
+	Kilo  Scale = 3
+	Mega  Scale = 6
+	Giga  Scale = 9
+	Tera  Scale = 12
+	Peta  Scale = 15
+	Exa   Scale = 18
+)
+
 const (
 	// splitREString is used to separate a number from its suffix; as such,
 	// this is overly permissive, but that's OK-- it will be checked later.
-	splitREString = "^([+-]?[0-9.]+)([eEimkKMGTP]*[-+]?[0-9]*)$"
+	splitREString = "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
 )
 
 var (
@@ -171,7 +194,7 @@ func ParseQuantity(str string) (*Quantity, error) {
 
 	// So that no one but us has to think about suffixes, remove it.
 	if base == 10 {
-		amount.SetScale(amount.Scale() + inf.Scale(-exponent))
+		amount.SetScale(amount.Scale() + Scale(exponent).infScale())
 	} else if base == 2 {
 		// numericSuffix = 2 ** exponent
 		numericSuffix := big.NewInt(1).Lsh(bigOne, uint(exponent))
@@ -184,13 +207,14 @@ func ParseQuantity(str string) (*Quantity, error) {
 	if sign == -1 {
 		amount.Neg(amount)
 	}
-	// This rounds non-zero values up to the minimum representable
-	// value, under the theory that if you want some resources, you
-	// should get some resources, even if you asked for way too small
-	// of an amount.
-	// Arguably, this should be inf.RoundHalfUp (normal rounding), but
-	// that would have the side effect of rounding values < .5m to zero.
-	amount.Round(amount, 3, inf.RoundUp)
+
+	// This rounds non-zero values up to the minimum representable value, under the theory that
+	// if you want some resources, you should get some resources, even if you asked for way too small
+	// of an amount.  Arguably, this should be inf.RoundHalfUp (normal rounding), but that would have
+	// the side effect of rounding values < .5n to zero.
+	if v, ok := amount.Unscaled(); v != int64(0) || !ok {
+		amount.Round(amount, Nano.infScale(), inf.RoundUp)
+	}
 
 	// The max is just a simple cap.
 	if amount.Cmp(maxAllowed) > 0 {
@@ -237,6 +261,11 @@ func (q *Quantity) Canonicalize() (string, suffix) {
 		return "0", ""
 	}
 
+	// zero is zero always
+	if q.Amount.Cmp(&inf.Dec{}) == 0 {
+		return "0", ""
+	}
+
 	format := q.Format
 	switch format {
 	case DecimalExponent, DecimalSI:
@@ -294,6 +323,77 @@ func (q *Quantity) String() string {
 	return number + string(suffix)
 }
 
+// Cmp compares q and y and returns:
+//
+//   -1 if q <  y
+//    0 if q == y
+//   +1 if q >  y
+//
+func (q *Quantity) Cmp(y Quantity) int {
+	if q.Amount == nil {
+		if y.Amount == nil {
+			return 0
+		}
+		return -y.Amount.Sign()
+	}
+	if y.Amount == nil {
+		return q.Amount.Sign()
+	}
+	return q.Amount.Cmp(y.Amount)
+}
+
+func (q *Quantity) Add(y Quantity) error {
+	switch {
+	case y.Amount == nil:
+		// Adding 0: do nothing.
+	case q.Amount == nil:
+		q.Amount = &inf.Dec{}
+		return q.Add(y)
+	default:
+		// we want to preserve the format of the non-zero value
+		zero := &inf.Dec{}
+		if q.Amount.Cmp(zero) == 0 && y.Amount.Cmp(zero) != 0 {
+			q.Format = y.Format
+		}
+		q.Amount.Add(q.Amount, y.Amount)
+	}
+	return nil
+}
+
+func (q *Quantity) Sub(y Quantity) error {
+	switch {
+	case y.Amount == nil:
+		// Subtracting 0: do nothing.
+	case q.Amount == nil:
+		q.Amount = &inf.Dec{}
+		return q.Sub(y)
+	default:
+		// we want to preserve the format of the non-zero value
+		zero := &inf.Dec{}
+		if q.Amount.Cmp(zero) == 0 && y.Amount.Cmp(zero) != 0 {
+			q.Format = y.Format
+		}
+		q.Amount.Sub(q.Amount, y.Amount)
+	}
+	return nil
+}
+
+// Neg sets q to the negative value of y.
+// It updates the format of q to match y.
+func (q *Quantity) Neg(y Quantity) error {
+	switch {
+	case y.Amount == nil:
+		*q = y
+	case q.Amount == nil:
+		q.Amount = &inf.Dec{}
+		fallthrough
+	default:
+		q.Amount.Neg(y.Amount)
+		q.Format = y.Format
+	}
+	return nil
+}
+
 // MarshalJSON implements the json.Marshaller interface.
 func (q Quantity) MarshalJSON() ([]byte, error) {
 	return []byte(`"` + q.String() + `"`), nil
@@ -331,41 +431,52 @@ func NewMilliQuantity(value int64, format Format) *Quantity {
 	}
 }
 
+// NewScaledQuantity returns a new Quantity representing the given
+// value * 10^scale in DecimalSI format.
+func NewScaledQuantity(value int64, scale Scale) *Quantity {
+	return &Quantity{
+		Amount: inf.NewDec(value, scale.infScale()),
+		Format: DecimalSI,
+	}
+}
+
 // Value returns the value of q; any fractional part will be lost.
 func (q *Quantity) Value() int64 {
-	if q.Amount == nil {
-		return 0
-	}
-	tmp := &inf.Dec{}
-	return tmp.Round(q.Amount, 0, inf.RoundUp).UnscaledBig().Int64()
+	return q.ScaledValue(0)
 }
 
-// MilliValue returns the value of q * 1000; this could overflow an int64;
+// MilliValue returns the value of ceil(q * 1000); this could overflow an int64;
 // if that's a concern, call Value() first to verify the number is small enough.
 func (q *Quantity) MilliValue() int64 {
+	return q.ScaledValue(Milli)
+}
+
+// ScaledValue returns the value of ceil(q * 10^scale); this could overflow an int64.
+// To detect overflow, call Value() first and verify the expected magnitude.
+func (q *Quantity) ScaledValue(scale Scale) int64 {
 	if q.Amount == nil {
 		return 0
 	}
-	tmp := &inf.Dec{}
-	return tmp.Round(tmp.Mul(q.Amount, decThousand), 0, inf.RoundUp).UnscaledBig().Int64()
+	return scaledValue(q.Amount.UnscaledBig(), int(q.Amount.Scale()), int(scale.infScale()))
 }
 
 // Set sets q's value to be value.
 func (q *Quantity) Set(value int64) {
-	if q.Amount == nil {
-		q.Amount = &inf.Dec{}
-	}
-	q.Amount.SetUnscaled(value)
-	q.Amount.SetScale(0)
+	q.SetScaled(value, 0)
 }
 
 // SetMilli sets q's value to be value * 1/1000.
 func (q *Quantity) SetMilli(value int64) {
+	q.SetScaled(value, Milli)
+}
+
+// SetScaled sets q's value to be value * 10^scale
+func (q *Quantity) SetScaled(value int64, scale Scale) {
 	if q.Amount == nil {
 		q.Amount = &inf.Dec{}
 	}
 	q.Amount.SetUnscaled(value)
-	q.Amount.SetScale(3)
+	q.Amount.SetScale(scale.infScale())
 }
 
 // Copy is a convenience function that makes a deep copy for you. Non-deep
@@ -420,3 +531,8 @@ func QuantityFlag(flagName, defaultValue, description string) *Quantity {
 func NewQuantityFlagValue(q *Quantity) flag.Value {
 	return qFlag{q}
 }
+
+// infScale adapts a Scale value to an inf.Scale value.
+func (s Scale) infScale() inf.Scale {
+	return inf.Scale(-s) // inf.Scale is upside-down
+}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
new file mode 100644
index 0000000000..01d5c2997e
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
@@ -0,0 +1,78 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resource
+
+import (
+	"math/big"
+
+	inf "gopkg.in/inf.v0"
+)
+
+// QuantityProto is a struct that is equivalent to Quantity, but intended for
+// protobuf marshalling/unmarshalling. It is generated into a serialization
+// that matches Quantity. Do not use in Go structs.
+//
+// +protobuf=true
+type QuantityProto struct {
+	// The format of the quantity
+	Format Format `protobuf:"bytes,1,opt,name=format,casttype=Format"`
+	// The scale dimension of the value
+	Scale int32 `protobuf:"varint,2,opt,name=scale"`
+	// Bigint is serialized as a raw bytes array
+	Bigint []byte `protobuf:"bytes,3,opt,name=bigint"`
+}
+
+// ProtoTime returns the Time as a new ProtoTime value.
+func (q *Quantity) QuantityProto() *QuantityProto {
+	if q == nil {
+		return &QuantityProto{}
+	}
+	p := &QuantityProto{
+		Format: q.Format,
+	}
+	if q.Amount != nil {
+		p.Scale = int32(q.Amount.Scale())
+		p.Bigint = q.Amount.UnscaledBig().Bytes()
+	}
+	return p
+}
+
+// Size implements the protobuf marshalling interface.
+func (q *Quantity) Size() (n int) { return q.QuantityProto().Size() }
+
+// Reset implements the protobuf marshalling interface.
+func (q *Quantity) Unmarshal(data []byte) error {
+	p := QuantityProto{}
+	if err := p.Unmarshal(data); err != nil {
+		return err
+	}
+	q.Format = p.Format
+	b := big.NewInt(0)
+	b.SetBytes(p.Bigint)
+	q.Amount = inf.NewDecBig(b, inf.Scale(p.Scale))
+	return nil
+}
+
+// Marshal implements the protobuf marshalling interface.
+func (q *Quantity) Marshal() (data []byte, err error) {
+	return q.QuantityProto().Marshal()
+}
+
+// MarshalTo implements the protobuf marshalling interface.
+func (q *Quantity) MarshalTo(data []byte) (int, error) {
+	return q.QuantityProto().MarshalTo(data)
+}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/scale_int.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/scale_int.go
new file mode 100644
index 0000000000..173de1a217
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/scale_int.go
@@ -0,0 +1,95 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resource
+
+import (
+	"math"
+	"math/big"
+	"sync"
+)
+
+var (
+	// A sync pool to reduce allocation.
+	intPool  sync.Pool
+	maxInt64 = big.NewInt(math.MaxInt64)
+)
+
+func init() {
+	intPool.New = func() interface{} {
+		return &big.Int{}
+	}
+}
+
+// scaledValue scales given unscaled value from scale to new Scale and returns
+// an int64. It ALWAYS rounds up the result when scale down. The final result might
+// overflow.
+//
+// scale, newScale represents the scale of the unscaled decimal.
+// The mathematical value of the decimal is unscaled * 10**(-scale).
+func scaledValue(unscaled *big.Int, scale, newScale int) int64 {
+	dif := scale - newScale
+	if dif == 0 {
+		return unscaled.Int64()
+	}
+
+	// Handle scale up
+	// This is an easy case, we do not need to care about rounding and overflow.
+	// If any intermediate operation causes overflow, the result will overflow.
+	if dif < 0 {
+		return unscaled.Int64() * int64(math.Pow10(-dif))
+	}
+
+	// Handle scale down
+	// We have to be careful about the intermediate operations.
+
+	// fast path when unscaled < max.Int64 and exp(10,dif) < max.Int64
+	const log10MaxInt64 = 19
+	if unscaled.Cmp(maxInt64) < 0 && dif < log10MaxInt64 {
+		divide := int64(math.Pow10(dif))
+		result := unscaled.Int64() / divide
+		mod := unscaled.Int64() % divide
+		if mod != 0 {
+			return result + 1
+		}
+		return result
+	}
+
+	// We should only convert back to int64 when getting the result.
+	divisor := intPool.Get().(*big.Int)
+	exp := intPool.Get().(*big.Int)
+	result := intPool.Get().(*big.Int)
+	defer func() {
+		intPool.Put(divisor)
+		intPool.Put(exp)
+		intPool.Put(result)
+	}()
+
+	// divisor = 10^(dif)
+	// TODO: create loop up table if exp costs too much.
+	divisor.Exp(bigTen, exp.SetInt64(int64(dif)), nil)
+	// reuse exp
+	remainder := exp
+
+	// result = unscaled / divisor
+	// remainder = unscaled % divisor
+	result.DivMod(unscaled, divisor, remainder)
+	if remainder.Sign() != 0 {
+		return result.Int64() + 1
+	}
+
+	return result.Int64()
+}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/suffix.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/suffix.go
index 6f0dbd5f27..529712365d 100644
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/suffix.go
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/suffix.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 Google Inc. All rights reserved.
+Copyright 2014 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -83,6 +83,8 @@ func newSuffixer() suffixer {
 	// a suffix for 2^0.
 	sh.decSuffixes.addSuffix("", bePair{2, 0})
 
+	sh.decSuffixes.addSuffix("n", bePair{10, -9})
+	sh.decSuffixes.addSuffix("u", bePair{10, -6})
 	sh.decSuffixes.addSuffix("m", bePair{10, -3})
 	sh.decSuffixes.addSuffix("", bePair{10, 0})
 	sh.decSuffixes.addSuffix("k", bePair{10, 3})
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/OWNERS b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/OWNERS
new file mode 100644
index 0000000000..a046efc0c2
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/OWNERS
@@ -0,0 +1,5 @@
+assignees:
+  - derekwaynecarr
+  - lavalamp
+  - smarterclayton
+  - wojtek-t
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/cloner.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/cloner.go
new file mode 100644
index 0000000000..a8c5747132
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/cloner.go
@@ -0,0 +1,237 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conversion
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// Cloner knows how to copy one type to another.
+type Cloner struct {
+	// Map from the type to a function which can do the deep copy.
+	deepCopyFuncs          map[reflect.Type]reflect.Value
+	generatedDeepCopyFuncs map[reflect.Type]reflect.Value
+}
+
+// NewCloner creates a new Cloner object.
+func NewCloner() *Cloner {
+	c := &Cloner{
+		deepCopyFuncs:          map[reflect.Type]reflect.Value{},
+		generatedDeepCopyFuncs: map[reflect.Type]reflect.Value{},
+	}
+	if err := c.RegisterDeepCopyFunc(byteSliceDeepCopy); err != nil {
+		// If one of the deep-copy functions is malformed, detect it immediately.
+		panic(err)
+	}
+	return c
+}
+
+// Prevent recursing into every byte...
+func byteSliceDeepCopy(in []byte, out *[]byte, c *Cloner) error {
+	if in != nil {
+		*out = make([]byte, len(in))
+		copy(*out, in)
+	} else {
+		*out = nil
+	}
+	return nil
+}
+
+// Verifies whether a deep-copy function has a correct signature.
+func verifyDeepCopyFunctionSignature(ft reflect.Type) error {
+	if ft.Kind() != reflect.Func {
+		return fmt.Errorf("expected func, got: %v", ft)
+	}
+	if ft.NumIn() != 3 {
+		return fmt.Errorf("expected three 'in' params, got %v", ft)
+	}
+	if ft.NumOut() != 1 {
+		return fmt.Errorf("expected one 'out' param, got %v", ft)
+	}
+	if ft.In(1).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'in' param 1, got: %v", ft)
+	}
+	if ft.In(1).Elem() != ft.In(0) {
+		return fmt.Errorf("expected 'in' param 0 the same as param 1, got: %v", ft)
+	}
+	var forClonerType Cloner
+	if expected := reflect.TypeOf(&forClonerType); ft.In(2) != expected {
+		return fmt.Errorf("expected '%v' arg for 'in' param 2, got: '%v'", expected, ft.In(2))
+	}
+	var forErrorType error
+	// This convolution is necessary, otherwise TypeOf picks up on the fact
+	// that forErrorType is nil
+	errorType := reflect.TypeOf(&forErrorType).Elem()
+	if ft.Out(0) != errorType {
+		return fmt.Errorf("expected error return, got: %v", ft)
+	}
+	return nil
+}
+
+// RegisterGeneratedDeepCopyFunc registers a copying func with the Cloner.
+// deepCopyFunc must take three parameters: a type input, a pointer to a
+// type output, and a pointer to Cloner. It should return an error.
+//
+// Example:
+// c.RegisterGeneratedDeepCopyFunc(
+//         func(in Pod, out *Pod, c *Cloner) error {
+//                 // deep copy logic...
+//                 return nil
+//          })
+func (c *Cloner) RegisterDeepCopyFunc(deepCopyFunc interface{}) error {
+	fv := reflect.ValueOf(deepCopyFunc)
+	ft := fv.Type()
+	if err := verifyDeepCopyFunctionSignature(ft); err != nil {
+		return err
+	}
+	c.deepCopyFuncs[ft.In(0)] = fv
+	return nil
+}
+
+// Similar to RegisterDeepCopyFunc, but registers deep copy function that were
+// automatically generated.
+func (c *Cloner) RegisterGeneratedDeepCopyFunc(deepCopyFunc interface{}) error {
+	fv := reflect.ValueOf(deepCopyFunc)
+	ft := fv.Type()
+	if err := verifyDeepCopyFunctionSignature(ft); err != nil {
+		return err
+	}
+	c.generatedDeepCopyFuncs[ft.In(0)] = fv
+	return nil
+}
+
+// DeepCopy will perform a deep copy of a given object.
+func (c *Cloner) DeepCopy(in interface{}) (interface{}, error) {
+	// Can be invalid if we run DeepCopy(X) where X is a nil interface type.
+	// For example, we get an invalid value when someone tries to deep-copy
+	// a nil labels.Selector.
+	// This does not occur if X is nil and is a pointer to a concrete type.
+	if in == nil {
+		return nil, nil
+	}
+	inValue := reflect.ValueOf(in)
+	outValue, err := c.deepCopy(inValue)
+	if err != nil {
+		return nil, err
+	}
+	return outValue.Interface(), nil
+}
+
+func (c *Cloner) deepCopy(src reflect.Value) (reflect.Value, error) {
+	inType := src.Type()
+
+	if fv, ok := c.deepCopyFuncs[inType]; ok {
+		return c.customDeepCopy(src, fv)
+	}
+	if fv, ok := c.generatedDeepCopyFuncs[inType]; ok {
+		return c.customDeepCopy(src, fv)
+	}
+	return c.defaultDeepCopy(src)
+}
+
+func (c *Cloner) customDeepCopy(src, fv reflect.Value) (reflect.Value, error) {
+	outValue := reflect.New(src.Type())
+	args := []reflect.Value{src, outValue, reflect.ValueOf(c)}
+	result := fv.Call(args)[0].Interface()
+	// This convolution is necessary because nil interfaces won't convert
+	// to error.
+	if result == nil {
+		return outValue.Elem(), nil
+	}
+	return outValue.Elem(), result.(error)
+}
+
+func (c *Cloner) defaultDeepCopy(src reflect.Value) (reflect.Value, error) {
+	switch src.Kind() {
+	case reflect.Chan, reflect.Func, reflect.UnsafePointer, reflect.Uintptr:
+		return src, fmt.Errorf("cannot deep copy kind: %s", src.Kind())
+	case reflect.Array:
+		dst := reflect.New(src.Type())
+		for i := 0; i < src.Len(); i++ {
+			copyVal, err := c.deepCopy(src.Index(i))
+			if err != nil {
+				return src, err
+			}
+			dst.Elem().Index(i).Set(copyVal)
+		}
+		return dst.Elem(), nil
+	case reflect.Interface:
+		if src.IsNil() {
+			return src, nil
+		}
+		return c.deepCopy(src.Elem())
+	case reflect.Map:
+		if src.IsNil() {
+			return src, nil
+		}
+		dst := reflect.MakeMap(src.Type())
+		for _, k := range src.MapKeys() {
+			copyVal, err := c.deepCopy(src.MapIndex(k))
+			if err != nil {
+				return src, err
+			}
+			dst.SetMapIndex(k, copyVal)
+		}
+		return dst, nil
+	case reflect.Ptr:
+		if src.IsNil() {
+			return src, nil
+		}
+		dst := reflect.New(src.Type().Elem())
+		copyVal, err := c.deepCopy(src.Elem())
+		if err != nil {
+			return src, err
+		}
+		dst.Elem().Set(copyVal)
+		return dst, nil
+	case reflect.Slice:
+		if src.IsNil() {
+			return src, nil
+		}
+		dst := reflect.MakeSlice(src.Type(), 0, src.Len())
+		for i := 0; i < src.Len(); i++ {
+			copyVal, err := c.deepCopy(src.Index(i))
+			if err != nil {
+				return src, err
+			}
+			dst = reflect.Append(dst, copyVal)
+		}
+		return dst, nil
+	case reflect.Struct:
+		dst := reflect.New(src.Type())
+		for i := 0; i < src.NumField(); i++ {
+			if !dst.Elem().Field(i).CanSet() {
+				// Can't set private fields. At this point, the
+				// best we can do is a shallow copy. For
+				// example, time.Time is a value type with
+				// private members that can be shallow copied.
+				return src, nil
+			}
+			copyVal, err := c.deepCopy(src.Field(i))
+			if err != nil {
+				return src, err
+			}
+			dst.Elem().Field(i).Set(copyVal)
+		}
+		return dst.Elem(), nil
+
+	default:
+		// Value types like numbers, booleans, and strings.
+		return src, nil
+	}
+}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/converter.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/converter.go
new file mode 100644
index 0000000000..e045dcd2f7
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/converter.go
@@ -0,0 +1,951 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conversion
+
+import (
+	"fmt"
+	"reflect"
+)
+
+type typePair struct {
+	source reflect.Type
+	dest   reflect.Type
+}
+
+type typeNamePair struct {
+	fieldType reflect.Type
+	fieldName string
+}
+
+// DebugLogger allows you to get debugging messages if necessary.
+type DebugLogger interface {
+	Logf(format string, args ...interface{})
+}
+
+type NameFunc func(t reflect.Type) string
+
+var DefaultNameFunc = func(t reflect.Type) string { return t.Name() }
+
+type GenericConversionFunc func(a, b interface{}, scope Scope) (bool, error)
+
+// Converter knows how to convert one type to another.
+type Converter struct {
+	// Map from the conversion pair to a function which can
+	// do the conversion.
+	conversionFuncs          ConversionFuncs
+	generatedConversionFuncs ConversionFuncs
+
+	// genericConversions are called during normal conversion to offer a "fast-path"
+	// that avoids all reflection. These methods are not called outside of the .Convert()
+	// method.
+	genericConversions []GenericConversionFunc
+
+	// Set of conversions that should be treated as a no-op
+	ignoredConversions map[typePair]struct{}
+
+	// This is a map from a source field type and name, to a list of destination
+	// field type and name.
+	structFieldDests map[typeNamePair][]typeNamePair
+
+	// Allows for the opposite lookup of structFieldDests. So that SourceFromDest
+	// copy flag also works. So this is a map of destination field name, to potential
+	// source field name and type to look for.
+	structFieldSources map[typeNamePair][]typeNamePair
+
+	// Map from a type to a function which applies defaults.
+	defaultingFuncs map[reflect.Type]reflect.Value
+
+	// Similar to above, but function is stored as interface{}.
+	defaultingInterfaces map[reflect.Type]interface{}
+
+	// Map from an input type to a function which can apply a key name mapping
+	inputFieldMappingFuncs map[reflect.Type]FieldMappingFunc
+
+	// Map from an input type to a set of default conversion flags.
+	inputDefaultFlags map[reflect.Type]FieldMatchingFlags
+
+	// If non-nil, will be called to print helpful debugging info. Quite verbose.
+	Debug DebugLogger
+
+	// nameFunc is called to retrieve the name of a type; this name is used for the
+	// purpose of deciding whether two types match or not (i.e., will we attempt to
+	// do a conversion). The default returns the go type name.
+	nameFunc func(t reflect.Type) string
+}
+
+// NewConverter creates a new Converter object.
+func NewConverter(nameFn NameFunc) *Converter {
+	c := &Converter{
+		conversionFuncs:          NewConversionFuncs(),
+		generatedConversionFuncs: NewConversionFuncs(),
+		ignoredConversions:       make(map[typePair]struct{}),
+		defaultingFuncs:          make(map[reflect.Type]reflect.Value),
+		defaultingInterfaces:     make(map[reflect.Type]interface{}),
+		nameFunc:                 nameFn,
+		structFieldDests:         make(map[typeNamePair][]typeNamePair),
+		structFieldSources:       make(map[typeNamePair][]typeNamePair),
+
+		inputFieldMappingFuncs: make(map[reflect.Type]FieldMappingFunc),
+		inputDefaultFlags:      make(map[reflect.Type]FieldMatchingFlags),
+	}
+	c.RegisterConversionFunc(Convert_Slice_byte_To_Slice_byte)
+	return c
+}
+
+// AddGenericConversionFunc adds a function that accepts the ConversionFunc call pattern
+// (for two conversion types) to the converter. These functions are checked first during
+// a normal conversion, but are otherwise not called. Use AddConversionFuncs when registering
+// typed conversions.
+func (c *Converter) AddGenericConversionFunc(fn GenericConversionFunc) {
+	c.genericConversions = append(c.genericConversions, fn)
+}
+
+// WithConversions returns a Converter that is a copy of c but with the additional
+// fns merged on top.
+func (c *Converter) WithConversions(fns ConversionFuncs) *Converter {
+	copied := *c
+	copied.conversionFuncs = c.conversionFuncs.Merge(fns)
+	return &copied
+}
+
+// DefaultMeta returns the conversion FieldMappingFunc and meta for a given type.
+func (c *Converter) DefaultMeta(t reflect.Type) (FieldMatchingFlags, *Meta) {
+	return c.inputDefaultFlags[t], &Meta{
+		KeyNameMapping: c.inputFieldMappingFuncs[t],
+	}
+}
+
+// Convert_Slice_byte_To_Slice_byte prevents recursing into every byte
+func Convert_Slice_byte_To_Slice_byte(in *[]byte, out *[]byte, s Scope) error {
+	if *in == nil {
+		*out = nil
+		return nil
+	}
+	*out = make([]byte, len(*in))
+	copy(*out, *in)
+	return nil
+}
+
+// Scope is passed to conversion funcs to allow them to continue an ongoing conversion.
+// If multiple converters exist in the system, Scope will allow you to use the correct one
+// from a conversion function--that is, the one your conversion function was called by.
+type Scope interface {
+	// Call Convert to convert sub-objects. Note that if you call it with your own exact
+	// parameters, you'll run out of stack space before anything useful happens.
+	Convert(src, dest interface{}, flags FieldMatchingFlags) error
+
+	// DefaultConvert performs the default conversion, without calling a conversion func
+	// on the current stack frame. This makes it safe to call from a conversion func.
+	DefaultConvert(src, dest interface{}, flags FieldMatchingFlags) error
+
+	// If registered, returns a function applying defaults for objects of a given type.
+	// Used for automatically generating conversion functions.
+	DefaultingInterface(inType reflect.Type) (interface{}, bool)
+
+	// SrcTags and DestTags contain the struct tags that src and dest had, respectively.
+	// If the enclosing object was not a struct, then these will contain no tags, of course.
+	SrcTag() reflect.StructTag
+	DestTag() reflect.StructTag
+
+	// Flags returns the flags with which the conversion was started.
+	Flags() FieldMatchingFlags
+
+	// Meta returns any information originally passed to Convert.
+	Meta() *Meta
+}
+
+// FieldMappingFunc can convert an input field value into different values, depending on
+// the value of the source or destination struct tags.
+type FieldMappingFunc func(key string, sourceTag, destTag reflect.StructTag) (source string, dest string)
+
+func NewConversionFuncs() ConversionFuncs {
+	return ConversionFuncs{fns: make(map[typePair]reflect.Value)}
+}
+
+type ConversionFuncs struct {
+	fns map[typePair]reflect.Value
+}
+
+// Add adds the provided conversion functions to the lookup table - they must have the signature
+// `func(type1, type2, Scope) error`. Functions are added in the order passed and will override
+// previously registered pairs.
+func (c ConversionFuncs) Add(fns ...interface{}) error {
+	for _, fn := range fns {
+		fv := reflect.ValueOf(fn)
+		ft := fv.Type()
+		if err := verifyConversionFunctionSignature(ft); err != nil {
+			return err
+		}
+		c.fns[typePair{ft.In(0).Elem(), ft.In(1).Elem()}] = fv
+	}
+	return nil
+}
+
+// Merge returns a new ConversionFuncs that contains all conversions from
+// both other and c, with other conversions taking precedence.
+func (c ConversionFuncs) Merge(other ConversionFuncs) ConversionFuncs {
+	merged := NewConversionFuncs()
+	for k, v := range c.fns {
+		merged.fns[k] = v
+	}
+	for k, v := range other.fns {
+		merged.fns[k] = v
+	}
+	return merged
+}
+
+// Meta is supplied by Scheme, when it calls Convert.
+type Meta struct {
+	// KeyNameMapping is an optional function which may map the listed key (field name)
+	// into a source and destination value.
+	KeyNameMapping FieldMappingFunc
+}
+
+// scope contains information about an ongoing conversion.
+type scope struct {
+	converter *Converter
+	meta      *Meta
+	flags     FieldMatchingFlags
+
+	// srcStack & destStack are separate because they may not have a 1:1
+	// relationship.
+	srcStack  scopeStack
+	destStack scopeStack
+}
+
+type scopeStackElem struct {
+	tag   reflect.StructTag
+	value reflect.Value
+	key   string
+}
+
+type scopeStack []scopeStackElem
+
+func (s *scopeStack) pop() {
+	n := len(*s)
+	*s = (*s)[:n-1]
+}
+
+func (s *scopeStack) push(e scopeStackElem) {
+	*s = append(*s, e)
+}
+
+func (s *scopeStack) top() *scopeStackElem {
+	return &(*s)[len(*s)-1]
+}
+
+func (s scopeStack) describe() string {
+	desc := ""
+	if len(s) > 1 {
+		desc = "(" + s[1].value.Type().String() + ")"
+	}
+	for i, v := range s {
+		if i < 2 {
+			// First layer on stack is not real; second is handled specially above.
+			continue
+		}
+		if v.key == "" {
+			desc += fmt.Sprintf(".%v", v.value.Type())
+		} else {
+			desc += fmt.Sprintf(".%v", v.key)
+		}
+	}
+	return desc
+}
+
+func (s *scope) DefaultingInterface(inType reflect.Type) (interface{}, bool) {
+	value, found := s.converter.defaultingInterfaces[inType]
+	return value, found
+}
+
+// Formats src & dest as indices for printing.
+func (s *scope) setIndices(src, dest int) {
+	s.srcStack.top().key = fmt.Sprintf("[%v]", src)
+	s.destStack.top().key = fmt.Sprintf("[%v]", dest)
+}
+
+// Formats src & dest as map keys for printing.
+func (s *scope) setKeys(src, dest interface{}) {
+	s.srcStack.top().key = fmt.Sprintf(`["%v"]`, src)
+	s.destStack.top().key = fmt.Sprintf(`["%v"]`, dest)
+}
+
+// Convert continues a conversion.
+func (s *scope) Convert(src, dest interface{}, flags FieldMatchingFlags) error {
+	return s.converter.Convert(src, dest, flags, s.meta)
+}
+
+// DefaultConvert continues a conversion, performing a default conversion (no conversion func)
+// for the current stack frame.
+func (s *scope) DefaultConvert(src, dest interface{}, flags FieldMatchingFlags) error {
+	return s.converter.DefaultConvert(src, dest, flags, s.meta)
+}
+
+// SrcTag returns the tag of the struct containing the current source item, if any.
+func (s *scope) SrcTag() reflect.StructTag {
+	return s.srcStack.top().tag
+}
+
+// DestTag returns the tag of the struct containing the current dest item, if any.
+func (s *scope) DestTag() reflect.StructTag {
+	return s.destStack.top().tag
+}
+
+// Flags returns the flags with which the current conversion was started.
+func (s *scope) Flags() FieldMatchingFlags {
+	return s.flags
+}
+
+// Meta returns the meta object that was originally passed to Convert.
+func (s *scope) Meta() *Meta {
+	return s.meta
+}
+
+// describe prints the path to get to the current (source, dest) values.
+func (s *scope) describe() (src, dest string) {
+	return s.srcStack.describe(), s.destStack.describe()
+}
+
+// error makes an error that includes information about where we were in the objects
+// we were asked to convert.
+func (s *scope) errorf(message string, args ...interface{}) error {
+	srcPath, destPath := s.describe()
+	where := fmt.Sprintf("converting %v to %v: ", srcPath, destPath)
+	return fmt.Errorf(where+message, args...)
+}
+
+// Verifies whether a conversion function has a correct signature.
+func verifyConversionFunctionSignature(ft reflect.Type) error {
+	if ft.Kind() != reflect.Func {
+		return fmt.Errorf("expected func, got: %v", ft)
+	}
+	if ft.NumIn() != 3 {
+		return fmt.Errorf("expected three 'in' params, got: %v", ft)
+	}
+	if ft.NumOut() != 1 {
+		return fmt.Errorf("expected one 'out' param, got: %v", ft)
+	}
+	if ft.In(0).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'in' param 0, got: %v", ft)
+	}
+	if ft.In(1).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'in' param 1, got: %v", ft)
+	}
+	scopeType := Scope(nil)
+	if e, a := reflect.TypeOf(&scopeType).Elem(), ft.In(2); e != a {
+		return fmt.Errorf("expected '%v' arg for 'in' param 2, got '%v' (%v)", e, a, ft)
+	}
+	var forErrorType error
+	// This convolution is necessary, otherwise TypeOf picks up on the fact
+	// that forErrorType is nil.
+	errorType := reflect.TypeOf(&forErrorType).Elem()
+	if ft.Out(0) != errorType {
+		return fmt.Errorf("expected error return, got: %v", ft)
+	}
+	return nil
+}
+
+// RegisterConversionFunc registers a conversion func with the
+// Converter. conversionFunc must take three parameters: a pointer to the input
+// type, a pointer to the output type, and a conversion.Scope (which should be
+// used if recursive conversion calls are desired).  It must return an error.
+//
+// Example:
+// c.RegisterConversionFunc(
+//         func(in *Pod, out *v1.Pod, s Scope) error {
+//                 // conversion logic...
+//                 return nil
+//          })
+func (c *Converter) RegisterConversionFunc(conversionFunc interface{}) error {
+	return c.conversionFuncs.Add(conversionFunc)
+}
+
+// Similar to RegisterConversionFunc, but registers conversion function that were
+// automatically generated.
+func (c *Converter) RegisterGeneratedConversionFunc(conversionFunc interface{}) error {
+	return c.generatedConversionFuncs.Add(conversionFunc)
+}
+
+// RegisterIgnoredConversion registers a "no-op" for conversion, where any requested
+// conversion between from and to is ignored.
+func (c *Converter) RegisterIgnoredConversion(from, to interface{}) error {
+	typeFrom := reflect.TypeOf(from)
+	typeTo := reflect.TypeOf(to)
+	if reflect.TypeOf(from).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'from' param 0, got: %v", typeFrom)
+	}
+	if typeTo.Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'to' param 1, got: %v", typeTo)
+	}
+	c.ignoredConversions[typePair{typeFrom.Elem(), typeTo.Elem()}] = struct{}{}
+	return nil
+}
+
+// IsConversionIgnored returns true if the specified objects should be dropped during
+// conversion.
+func (c *Converter) IsConversionIgnored(inType, outType reflect.Type) bool {
+	_, found := c.ignoredConversions[typePair{inType, outType}]
+	return found
+}
+
+func (c *Converter) HasConversionFunc(inType, outType reflect.Type) bool {
+	_, found := c.conversionFuncs.fns[typePair{inType, outType}]
+	return found
+}
+
+func (c *Converter) ConversionFuncValue(inType, outType reflect.Type) (reflect.Value, bool) {
+	value, found := c.conversionFuncs.fns[typePair{inType, outType}]
+	return value, found
+}
+
+// SetStructFieldCopy registers a correspondence. Whenever a struct field is encountered
+// which has a type and name matching srcFieldType and srcFieldName, it wil be copied
+// into the field in the destination struct matching destFieldType & Name, if such a
+// field exists.
+// May be called multiple times, even for the same source field & type--all applicable
+// copies will be performed.
+func (c *Converter) SetStructFieldCopy(srcFieldType interface{}, srcFieldName string, destFieldType interface{}, destFieldName string) error {
+	st := reflect.TypeOf(srcFieldType)
+	dt := reflect.TypeOf(destFieldType)
+	srcKey := typeNamePair{st, srcFieldName}
+	destKey := typeNamePair{dt, destFieldName}
+	c.structFieldDests[srcKey] = append(c.structFieldDests[srcKey], destKey)
+	c.structFieldSources[destKey] = append(c.structFieldSources[destKey], srcKey)
+	return nil
+}
+
+// RegisterDefaultingFunc registers a value-defaulting func with the Converter.
+// defaultingFunc must take one parameters: a pointer to the input type.
+//
+// Example:
+// c.RegisteDefaultingFunc(
+//         func(in *v1.Pod) {
+//                 // defaulting logic...
+//          })
+func (c *Converter) RegisterDefaultingFunc(defaultingFunc interface{}) error {
+	fv := reflect.ValueOf(defaultingFunc)
+	ft := fv.Type()
+	if ft.Kind() != reflect.Func {
+		return fmt.Errorf("expected func, got: %v", ft)
+	}
+	if ft.NumIn() != 1 {
+		return fmt.Errorf("expected one 'in' param, got: %v", ft)
+	}
+	if ft.NumOut() != 0 {
+		return fmt.Errorf("expected zero 'out' params, got: %v", ft)
+	}
+	if ft.In(0).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'in' param 0, got: %v", ft)
+	}
+	inType := ft.In(0).Elem()
+	c.defaultingFuncs[inType] = fv
+	c.defaultingInterfaces[inType] = defaultingFunc
+	return nil
+}
+
+// RegisterInputDefaults registers a field name mapping function, used when converting
+// from maps to structs. Inputs to the conversion methods are checked for this type and a mapping
+// applied automatically if the input matches in. A set of default flags for the input conversion
+// may also be provided, which will be used when no explicit flags are requested.
+func (c *Converter) RegisterInputDefaults(in interface{}, fn FieldMappingFunc, defaultFlags FieldMatchingFlags) error {
+	fv := reflect.ValueOf(in)
+	ft := fv.Type()
+	if ft.Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer 'in' argument, got: %v", ft)
+	}
+	c.inputFieldMappingFuncs[ft] = fn
+	c.inputDefaultFlags[ft] = defaultFlags
+	return nil
+}
+
+// FieldMatchingFlags contains a list of ways in which struct fields could be
+// copied. These constants may be | combined.
+type FieldMatchingFlags int
+
+const (
+	// Loop through destination fields, search for matching source
+	// field to copy it from. Source fields with no corresponding
+	// destination field will be ignored. If SourceToDest is
+	// specified, this flag is ignored. If neither is specified,
+	// or no flags are passed, this flag is the default.
+	DestFromSource FieldMatchingFlags = 0
+	// Loop through source fields, search for matching dest field
+	// to copy it into. Destination fields with no corresponding
+	// source field will be ignored.
+	SourceToDest FieldMatchingFlags = 1 << iota
+	// Don't treat it as an error if the corresponding source or
+	// dest field can't be found.
+	IgnoreMissingFields
+	// Don't require type names to match.
+	AllowDifferentFieldTypeNames
+)
+
+// IsSet returns true if the given flag or combination of flags is set.
+func (f FieldMatchingFlags) IsSet(flag FieldMatchingFlags) bool {
+	if flag == DestFromSource {
+		// The bit logic doesn't work on the default value.
+		return f&SourceToDest != SourceToDest
+	}
+	return f&flag == flag
+}
+
+// Convert will translate src to dest if it knows how. Both must be pointers.
+// If no conversion func is registered and the default copying mechanism
+// doesn't work on this type pair, an error will be returned.
+// Read the comments on the various FieldMatchingFlags constants to understand
+// what the 'flags' parameter does.
+// 'meta' is given to allow you to pass information to conversion functions,
+// it is not used by Convert() other than storing it in the scope.
+// Not safe for objects with cyclic references!
+func (c *Converter) Convert(src, dest interface{}, flags FieldMatchingFlags, meta *Meta) error {
+	if len(c.genericConversions) > 0 {
+		// TODO: avoid scope allocation
+		s := &scope{converter: c, flags: flags, meta: meta}
+		for _, fn := range c.genericConversions {
+			if ok, err := fn(src, dest, s); ok {
+				return err
+			}
+		}
+	}
+	return c.doConversion(src, dest, flags, meta, c.convert)
+}
+
+// DefaultConvert will translate src to dest if it knows how. Both must be pointers.
+// No conversion func is used. If the default copying mechanism
+// doesn't work on this type pair, an error will be returned.
+// Read the comments on the various FieldMatchingFlags constants to understand
+// what the 'flags' parameter does.
+// 'meta' is given to allow you to pass information to conversion functions,
+// it is not used by DefaultConvert() other than storing it in the scope.
+// Not safe for objects with cyclic references!
+func (c *Converter) DefaultConvert(src, dest interface{}, flags FieldMatchingFlags, meta *Meta) error {
+	return c.doConversion(src, dest, flags, meta, c.defaultConvert)
+}
+
+type conversionFunc func(sv, dv reflect.Value, scope *scope) error
+
+func (c *Converter) doConversion(src, dest interface{}, flags FieldMatchingFlags, meta *Meta, f conversionFunc) error {
+	dv, err := EnforcePtr(dest)
+	if err != nil {
+		return err
+	}
+	if !dv.CanAddr() && !dv.CanSet() {
+		return fmt.Errorf("can't write to dest")
+	}
+	sv, err := EnforcePtr(src)
+	if err != nil {
+		return err
+	}
+	s := &scope{
+		converter: c,
+		flags:     flags,
+		meta:      meta,
+	}
+	// Leave something on the stack, so that calls to struct tag getters never fail.
+	s.srcStack.push(scopeStackElem{})
+	s.destStack.push(scopeStackElem{})
+	return f(sv, dv, s)
+}
+
+// callCustom calls 'custom' with sv & dv. custom must be a conversion function.
+func (c *Converter) callCustom(sv, dv, custom reflect.Value, scope *scope) error {
+	if !sv.CanAddr() {
+		sv2 := reflect.New(sv.Type())
+		sv2.Elem().Set(sv)
+		sv = sv2
+	} else {
+		sv = sv.Addr()
+	}
+	if !dv.CanAddr() {
+		if !dv.CanSet() {
+			return scope.errorf("can't addr or set dest.")
+		}
+		dvOrig := dv
+		dv := reflect.New(dvOrig.Type())
+		defer func() { dvOrig.Set(dv) }()
+	} else {
+		dv = dv.Addr()
+	}
+	args := []reflect.Value{sv, dv, reflect.ValueOf(scope)}
+	ret := custom.Call(args)[0].Interface()
+	// This convolution is necessary because nil interfaces won't convert
+	// to errors.
+	if ret == nil {
+		return nil
+	}
+	return ret.(error)
+}
+
+// convert recursively copies sv into dv, calling an appropriate conversion function if
+// one is registered.
+func (c *Converter) convert(sv, dv reflect.Value, scope *scope) error {
+	dt, st := dv.Type(), sv.Type()
+	// Apply default values.
+	if fv, ok := c.defaultingFuncs[st]; ok {
+		if c.Debug != nil {
+			c.Debug.Logf("Applying defaults for '%v'", st)
+		}
+		args := []reflect.Value{sv.Addr()}
+		fv.Call(args)
+	}
+
+	pair := typePair{st, dt}
+
+	// ignore conversions of this type
+	if _, ok := c.ignoredConversions[pair]; ok {
+		if c.Debug != nil {
+			c.Debug.Logf("Ignoring conversion of '%v' to '%v'", st, dt)
+		}
+		return nil
+	}
+
+	// Convert sv to dv.
+	if fv, ok := c.conversionFuncs.fns[pair]; ok {
+		if c.Debug != nil {
+			c.Debug.Logf("Calling custom conversion of '%v' to '%v'", st, dt)
+		}
+		return c.callCustom(sv, dv, fv, scope)
+	}
+	if fv, ok := c.generatedConversionFuncs.fns[pair]; ok {
+		if c.Debug != nil {
+			c.Debug.Logf("Calling generated conversion of '%v' to '%v'", st, dt)
+		}
+		return c.callCustom(sv, dv, fv, scope)
+	}
+
+	return c.defaultConvert(sv, dv, scope)
+}
+
+// defaultConvert recursively copies sv into dv. no conversion function is called
+// for the current stack frame (but conversion functions may be called for nested objects)
+func (c *Converter) defaultConvert(sv, dv reflect.Value, scope *scope) error {
+	dt, st := dv.Type(), sv.Type()
+
+	if !dv.CanSet() {
+		return scope.errorf("Cannot set dest. (Tried to deep copy something with unexported fields?)")
+	}
+
+	if !scope.flags.IsSet(AllowDifferentFieldTypeNames) && c.nameFunc(dt) != c.nameFunc(st) {
+		return scope.errorf(
+			"type names don't match (%v, %v), and no conversion 'func (%v, %v) error' registered.",
+			c.nameFunc(st), c.nameFunc(dt), st, dt)
+	}
+
+	switch st.Kind() {
+	case reflect.Map, reflect.Ptr, reflect.Slice, reflect.Interface, reflect.Struct:
+		// Don't copy these via assignment/conversion!
+	default:
+		// This should handle all simple types.
+		if st.AssignableTo(dt) {
+			dv.Set(sv)
+			return nil
+		}
+		if st.ConvertibleTo(dt) {
+			dv.Set(sv.Convert(dt))
+			return nil
+		}
+	}
+
+	if c.Debug != nil {
+		c.Debug.Logf("Trying to convert '%v' to '%v'", st, dt)
+	}
+
+	scope.srcStack.push(scopeStackElem{value: sv})
+	scope.destStack.push(scopeStackElem{value: dv})
+	defer scope.srcStack.pop()
+	defer scope.destStack.pop()
+
+	switch dv.Kind() {
+	case reflect.Struct:
+		return c.convertKV(toKVValue(sv), toKVValue(dv), scope)
+	case reflect.Slice:
+		if sv.IsNil() {
+			// Don't make a zero-length slice.
+			dv.Set(reflect.Zero(dt))
+			return nil
+		}
+		dv.Set(reflect.MakeSlice(dt, sv.Len(), sv.Cap()))
+		for i := 0; i < sv.Len(); i++ {
+			scope.setIndices(i, i)
+			if err := c.convert(sv.Index(i), dv.Index(i), scope); err != nil {
+				return err
+			}
+		}
+	case reflect.Ptr:
+		if sv.IsNil() {
+			// Don't copy a nil ptr!
+			dv.Set(reflect.Zero(dt))
+			return nil
+		}
+		dv.Set(reflect.New(dt.Elem()))
+		switch st.Kind() {
+		case reflect.Ptr, reflect.Interface:
+			return c.convert(sv.Elem(), dv.Elem(), scope)
+		default:
+			return c.convert(sv, dv.Elem(), scope)
+		}
+	case reflect.Map:
+		if sv.IsNil() {
+			// Don't copy a nil ptr!
+			dv.Set(reflect.Zero(dt))
+			return nil
+		}
+		dv.Set(reflect.MakeMap(dt))
+		for _, sk := range sv.MapKeys() {
+			dk := reflect.New(dt.Key()).Elem()
+			if err := c.convert(sk, dk, scope); err != nil {
+				return err
+			}
+			dkv := reflect.New(dt.Elem()).Elem()
+			scope.setKeys(sk.Interface(), dk.Interface())
+			// TODO:  sv.MapIndex(sk) may return a value with CanAddr() == false,
+			// because a map[string]struct{} does not allow a pointer reference.
+			// Calling a custom conversion function defined for the map value
+			// will panic. Example is PodInfo map[string]ContainerStatus.
+			if err := c.convert(sv.MapIndex(sk), dkv, scope); err != nil {
+				return err
+			}
+			dv.SetMapIndex(dk, dkv)
+		}
+	case reflect.Interface:
+		if sv.IsNil() {
+			// Don't copy a nil interface!
+			dv.Set(reflect.Zero(dt))
+			return nil
+		}
+		tmpdv := reflect.New(sv.Elem().Type()).Elem()
+		if err := c.convert(sv.Elem(), tmpdv, scope); err != nil {
+			return err
+		}
+		dv.Set(reflect.ValueOf(tmpdv.Interface()))
+		return nil
+	default:
+		return scope.errorf("couldn't copy '%v' into '%v'; didn't understand types", st, dt)
+	}
+	return nil
+}
+
+var stringType = reflect.TypeOf("")
+
+func toKVValue(v reflect.Value) kvValue {
+	switch v.Kind() {
+	case reflect.Struct:
+		return structAdaptor(v)
+	case reflect.Map:
+		if v.Type().Key().AssignableTo(stringType) {
+			return stringMapAdaptor(v)
+		}
+	}
+
+	return nil
+}
+
+// kvValue lets us write the same conversion logic to work with both maps
+// and structs. Only maps with string keys make sense for this.
+type kvValue interface {
+	// returns all keys, as a []string.
+	keys() []string
+	// Will just return "" for maps.
+	tagOf(key string) reflect.StructTag
+	// Will return the zero Value if the key doesn't exist.
+	value(key string) reflect.Value
+	// Maps require explicit setting-- will do nothing for structs.
+	// Returns false on failure.
+	confirmSet(key string, v reflect.Value) bool
+}
+
+type stringMapAdaptor reflect.Value
+
+func (a stringMapAdaptor) len() int {
+	return reflect.Value(a).Len()
+}
+
+func (a stringMapAdaptor) keys() []string {
+	v := reflect.Value(a)
+	keys := make([]string, v.Len())
+	for i, v := range v.MapKeys() {
+		if v.IsNil() {
+			continue
+		}
+		switch t := v.Interface().(type) {
+		case string:
+			keys[i] = t
+		}
+	}
+	return keys
+}
+
+func (a stringMapAdaptor) tagOf(key string) reflect.StructTag {
+	return ""
+}
+
+func (a stringMapAdaptor) value(key string) reflect.Value {
+	return reflect.Value(a).MapIndex(reflect.ValueOf(key))
+}
+
+func (a stringMapAdaptor) confirmSet(key string, v reflect.Value) bool {
+	return true
+}
+
+type structAdaptor reflect.Value
+
+func (a structAdaptor) len() int {
+	v := reflect.Value(a)
+	return v.Type().NumField()
+}
+
+func (a structAdaptor) keys() []string {
+	v := reflect.Value(a)
+	t := v.Type()
+	keys := make([]string, t.NumField())
+	for i := range keys {
+		keys[i] = t.Field(i).Name
+	}
+	return keys
+}
+
+func (a structAdaptor) tagOf(key string) reflect.StructTag {
+	v := reflect.Value(a)
+	field, ok := v.Type().FieldByName(key)
+	if ok {
+		return field.Tag
+	}
+	return ""
+}
+
+func (a structAdaptor) value(key string) reflect.Value {
+	v := reflect.Value(a)
+	return v.FieldByName(key)
+}
+
+func (a structAdaptor) confirmSet(key string, v reflect.Value) bool {
+	return true
+}
+
+// convertKV can convert things that consist of key/value pairs, like structs
+// and some maps.
+func (c *Converter) convertKV(skv, dkv kvValue, scope *scope) error {
+	if skv == nil || dkv == nil {
+		// TODO: add keys to stack to support really understandable error messages.
+		return fmt.Errorf("Unable to convert %#v to %#v", skv, dkv)
+	}
+
+	lister := dkv
+	if scope.flags.IsSet(SourceToDest) {
+		lister = skv
+	}
+
+	var mapping FieldMappingFunc
+	if scope.meta != nil && scope.meta.KeyNameMapping != nil {
+		mapping = scope.meta.KeyNameMapping
+	}
+
+	for _, key := range lister.keys() {
+		if found, err := c.checkField(key, skv, dkv, scope); found {
+			if err != nil {
+				return err
+			}
+			continue
+		}
+		stag := skv.tagOf(key)
+		dtag := dkv.tagOf(key)
+		skey := key
+		dkey := key
+		if mapping != nil {
+			skey, dkey = scope.meta.KeyNameMapping(key, stag, dtag)
+		}
+
+		df := dkv.value(dkey)
+		sf := skv.value(skey)
+		if !df.IsValid() || !sf.IsValid() {
+			switch {
+			case scope.flags.IsSet(IgnoreMissingFields):
+				// No error.
+			case scope.flags.IsSet(SourceToDest):
+				return scope.errorf("%v not present in dest", dkey)
+			default:
+				return scope.errorf("%v not present in src", skey)
+			}
+			continue
+		}
+		scope.srcStack.top().key = skey
+		scope.srcStack.top().tag = stag
+		scope.destStack.top().key = dkey
+		scope.destStack.top().tag = dtag
+		if err := c.convert(sf, df, scope); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// checkField returns true if the field name matches any of the struct
+// field copying rules. The error should be ignored if it returns false.
+func (c *Converter) checkField(fieldName string, skv, dkv kvValue, scope *scope) (bool, error) {
+	replacementMade := false
+	if scope.flags.IsSet(DestFromSource) {
+		df := dkv.value(fieldName)
+		if !df.IsValid() {
+			return false, nil
+		}
+		destKey := typeNamePair{df.Type(), fieldName}
+		// Check each of the potential source (type, name) pairs to see if they're
+		// present in sv.
+		for _, potentialSourceKey := range c.structFieldSources[destKey] {
+			sf := skv.value(potentialSourceKey.fieldName)
+			if !sf.IsValid() {
+				continue
+			}
+			if sf.Type() == potentialSourceKey.fieldType {
+				// Both the source's name and type matched, so copy.
+				scope.srcStack.top().key = potentialSourceKey.fieldName
+				scope.destStack.top().key = fieldName
+				if err := c.convert(sf, df, scope); err != nil {
+					return true, err
+				}
+				dkv.confirmSet(fieldName, df)
+				replacementMade = true
+			}
+		}
+		return replacementMade, nil
+	}
+
+	sf := skv.value(fieldName)
+	if !sf.IsValid() {
+		return false, nil
+	}
+	srcKey := typeNamePair{sf.Type(), fieldName}
+	// Check each of the potential dest (type, name) pairs to see if they're
+	// present in dv.
+	for _, potentialDestKey := range c.structFieldDests[srcKey] {
+		df := dkv.value(potentialDestKey.fieldName)
+		if !df.IsValid() {
+			continue
+		}
+		if df.Type() == potentialDestKey.fieldType {
+			// Both the dest's name and type matched, so copy.
+			scope.srcStack.top().key = fieldName
+			scope.destStack.top().key = potentialDestKey.fieldName
+			if err := c.convert(sf, df, scope); err != nil {
+				return true, err
+			}
+			dkv.confirmSet(potentialDestKey.fieldName, df)
+			replacementMade = true
+		}
+	}
+	return replacementMade, nil
+}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
new file mode 100644
index 0000000000..717feaf18f
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
@@ -0,0 +1,185 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package conversion
+
+import (
+	forked_reflect "k8s.io/kubernetes/third_party/forked/reflect"
+	reflect "reflect"
+)
+
+func DeepCopy_conversion_Cloner(in Cloner, out *Cloner, c *Cloner) error {
+	if in.deepCopyFuncs != nil {
+		in, out := in.deepCopyFuncs, &out.deepCopyFuncs
+		*out = make(map[reflect.Type]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.deepCopyFuncs = nil
+	}
+	if in.generatedDeepCopyFuncs != nil {
+		in, out := in.generatedDeepCopyFuncs, &out.generatedDeepCopyFuncs
+		*out = make(map[reflect.Type]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.generatedDeepCopyFuncs = nil
+	}
+	return nil
+}
+
+func DeepCopy_conversion_ConversionFuncs(in ConversionFuncs, out *ConversionFuncs, c *Cloner) error {
+	if in.fns != nil {
+		in, out := in.fns, &out.fns
+		*out = make(map[typePair]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typePair
+		}
+	} else {
+		out.fns = nil
+	}
+	return nil
+}
+
+func DeepCopy_conversion_Converter(in Converter, out *Converter, c *Cloner) error {
+	if err := DeepCopy_conversion_ConversionFuncs(in.conversionFuncs, &out.conversionFuncs, c); err != nil {
+		return err
+	}
+	if err := DeepCopy_conversion_ConversionFuncs(in.generatedConversionFuncs, &out.generatedConversionFuncs, c); err != nil {
+		return err
+	}
+	if in.genericConversions != nil {
+		in, out := in.genericConversions, &out.genericConversions
+		*out = make([]GenericConversionFunc, len(in))
+		for i := range in {
+			if newVal, err := c.DeepCopy(in[i]); err != nil {
+				return err
+			} else {
+				(*out)[i] = newVal.(GenericConversionFunc)
+			}
+		}
+	} else {
+		out.genericConversions = nil
+	}
+	if in.ignoredConversions != nil {
+		in, out := in.ignoredConversions, &out.ignoredConversions
+		*out = make(map[typePair]struct{})
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typePair
+		}
+	} else {
+		out.ignoredConversions = nil
+	}
+	if in.structFieldDests != nil {
+		in, out := in.structFieldDests, &out.structFieldDests
+		*out = make(map[typeNamePair][]typeNamePair)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typeNamePair
+		}
+	} else {
+		out.structFieldDests = nil
+	}
+	if in.structFieldSources != nil {
+		in, out := in.structFieldSources, &out.structFieldSources
+		*out = make(map[typeNamePair][]typeNamePair)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typeNamePair
+		}
+	} else {
+		out.structFieldSources = nil
+	}
+	if in.defaultingFuncs != nil {
+		in, out := in.defaultingFuncs, &out.defaultingFuncs
+		*out = make(map[reflect.Type]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.defaultingFuncs = nil
+	}
+	if in.defaultingInterfaces != nil {
+		in, out := in.defaultingInterfaces, &out.defaultingInterfaces
+		*out = make(map[reflect.Type]interface{})
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.defaultingInterfaces = nil
+	}
+	if in.inputFieldMappingFuncs != nil {
+		in, out := in.inputFieldMappingFuncs, &out.inputFieldMappingFuncs
+		*out = make(map[reflect.Type]FieldMappingFunc)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.inputFieldMappingFuncs = nil
+	}
+	if in.inputDefaultFlags != nil {
+		in, out := in.inputDefaultFlags, &out.inputDefaultFlags
+		*out = make(map[reflect.Type]FieldMatchingFlags)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.inputDefaultFlags = nil
+	}
+	if in.Debug == nil {
+		out.Debug = nil
+	} else if newVal, err := c.DeepCopy(in.Debug); err != nil {
+		return err
+	} else {
+		out.Debug = newVal.(DebugLogger)
+	}
+	if in.nameFunc == nil {
+		out.nameFunc = nil
+	} else if newVal, err := c.DeepCopy(in.nameFunc); err != nil {
+		return err
+	} else {
+		out.nameFunc = newVal.(func(reflect.Type) string)
+	}
+	return nil
+}
+
+func DeepCopy_conversion_Equalities(in Equalities, out *Equalities, c *Cloner) error {
+	if in.Equalities != nil {
+		in, out := in.Equalities, &out.Equalities
+		*out = make(forked_reflect.Equalities)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.Equalities = nil
+	}
+	return nil
+}
+
+func DeepCopy_conversion_Meta(in Meta, out *Meta, c *Cloner) error {
+	if in.KeyNameMapping == nil {
+		out.KeyNameMapping = nil
+	} else if newVal, err := c.DeepCopy(in.KeyNameMapping); err != nil {
+		return err
+	} else {
+		out.KeyNameMapping = newVal.(FieldMappingFunc)
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go
new file mode 100644
index 0000000000..7c3ed7cda1
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go
@@ -0,0 +1,36 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conversion
+
+import (
+	"k8s.io/kubernetes/third_party/forked/reflect"
+)
+
+// The code for this type must be located in third_party, since it forks from
+// go std lib. But for convenience, we expose the type here, too.
+type Equalities struct {
+	reflect.Equalities
+}
+
+// For convenience, panics on errrors
+func EqualitiesOrDie(funcs ...interface{}) Equalities {
+	e := Equalities{reflect.Equalities{}}
+	if err := e.AddFuncs(funcs...); err != nil {
+		panic(err)
+	}
+	return e
+}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/doc.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/doc.go
new file mode 100644
index 0000000000..3ef2eaba45
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/doc.go
@@ -0,0 +1,24 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package conversion provides go object versioning.
+//
+// Specifically, conversion provides a way for you to define multiple versions
+// of the same object. You may write functions which implement conversion logic,
+// but for the fields which did not change, copying is automated. This makes it
+// easy to modify the structures you use in memory without affecting the format
+// you store on disk or respond to in your external API calls.
+package conversion
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/helper.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/helper.go
new file mode 100644
index 0000000000..39f7826595
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/helper.go
@@ -0,0 +1,39 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conversion
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// EnforcePtr ensures that obj is a pointer of some sort. Returns a reflect.Value
+// of the dereferenced pointer, ensuring that it is settable/addressable.
+// Returns an error if this is not possible.
+func EnforcePtr(obj interface{}) (reflect.Value, error) {
+	v := reflect.ValueOf(obj)
+	if v.Kind() != reflect.Ptr {
+		if v.Kind() == reflect.Invalid {
+			return reflect.Value{}, fmt.Errorf("expected pointer, but got invalid kind")
+		}
+		return reflect.Value{}, fmt.Errorf("expected pointer, but got %v type", v.Type())
+	}
+	if v.IsNil() {
+		return reflect.Value{}, fmt.Errorf("expected pointer, but got nil")
+	}
+	return v.Elem(), nil
+}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
new file mode 100644
index 0000000000..9e45dbe1d2
--- /dev/null
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
@@ -0,0 +1,388 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package reflect is a fork of go's standard library reflection package, which
+// allows for deep equal with equality functions defined.
+package reflect
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// Equalities is a map from type to a function comparing two values of
+// that type.
+type Equalities map[reflect.Type]reflect.Value
+
+// For convenience, panics on errrors
+func EqualitiesOrDie(funcs ...interface{}) Equalities {
+	e := Equalities{}
+	if err := e.AddFuncs(funcs...); err != nil {
+		panic(err)
+	}
+	return e
+}
+
+// AddFuncs is a shortcut for multiple calls to AddFunc.
+func (e Equalities) AddFuncs(funcs ...interface{}) error {
+	for _, f := range funcs {
+		if err := e.AddFunc(f); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// AddFunc uses func as an equality function: it must take
+// two parameters of the same type, and return a boolean.
+func (e Equalities) AddFunc(eqFunc interface{}) error {
+	fv := reflect.ValueOf(eqFunc)
+	ft := fv.Type()
+	if ft.Kind() != reflect.Func {
+		return fmt.Errorf("expected func, got: %v", ft)
+	}
+	if ft.NumIn() != 2 {
+		return fmt.Errorf("expected three 'in' params, got: %v", ft)
+	}
+	if ft.NumOut() != 1 {
+		return fmt.Errorf("expected one 'out' param, got: %v", ft)
+	}
+	if ft.In(0) != ft.In(1) {
+		return fmt.Errorf("expected arg 1 and 2 to have same type, but got %v", ft)
+	}
+	var forReturnType bool
+	boolType := reflect.TypeOf(forReturnType)
+	if ft.Out(0) != boolType {
+		return fmt.Errorf("expected bool return, got: %v", ft)
+	}
+	e[ft.In(0)] = fv
+	return nil
+}
+
+// Below here is forked from go's reflect/deepequal.go
+
+// During deepValueEqual, must keep track of checks that are
+// in progress.  The comparison algorithm assumes that all
+// checks in progress are true when it reencounters them.
+// Visited comparisons are stored in a map indexed by visit.
+type visit struct {
+	a1  uintptr
+	a2  uintptr
+	typ reflect.Type
+}
+
+// unexportedTypePanic is thrown when you use this DeepEqual on something that has an
+// unexported type. It indicates a programmer error, so should not occur at runtime,
+// which is why it's not public and thus impossible to catch.
+type unexportedTypePanic []reflect.Type
+
+func (u unexportedTypePanic) Error() string { return u.String() }
+func (u unexportedTypePanic) String() string {
+	strs := make([]string, len(u))
+	for i, t := range u {
+		strs[i] = fmt.Sprintf("%v", t)
+	}
+	return "an unexported field was encountered, nested like this: " + strings.Join(strs, " -> ")
+}
+
+func makeUsefulPanic(v reflect.Value) {
+	if x := recover(); x != nil {
+		if u, ok := x.(unexportedTypePanic); ok {
+			u = append(unexportedTypePanic{v.Type()}, u...)
+			x = u
+		}
+		panic(x)
+	}
+}
+
+// Tests for deep equality using reflected types. The map argument tracks
+// comparisons that have already been seen, which allows short circuiting on
+// recursive types.
+func (e Equalities) deepValueEqual(v1, v2 reflect.Value, visited map[visit]bool, depth int) bool {
+	defer makeUsefulPanic(v1)
+
+	if !v1.IsValid() || !v2.IsValid() {
+		return v1.IsValid() == v2.IsValid()
+	}
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	if fv, ok := e[v1.Type()]; ok {
+		return fv.Call([]reflect.Value{v1, v2})[0].Bool()
+	}
+
+	hard := func(k reflect.Kind) bool {
+		switch k {
+		case reflect.Array, reflect.Map, reflect.Slice, reflect.Struct:
+			return true
+		}
+		return false
+	}
+
+	if v1.CanAddr() && v2.CanAddr() && hard(v1.Kind()) {
+		addr1 := v1.UnsafeAddr()
+		addr2 := v2.UnsafeAddr()
+		if addr1 > addr2 {
+			// Canonicalize order to reduce number of entries in visited.
+			addr1, addr2 = addr2, addr1
+		}
+
+		// Short circuit if references are identical ...
+		if addr1 == addr2 {
+			return true
+		}
+
+		// ... or already seen
+		typ := v1.Type()
+		v := visit{addr1, addr2, typ}
+		if visited[v] {
+			return true
+		}
+
+		// Remember for later.
+		visited[v] = true
+	}
+
+	switch v1.Kind() {
+	case reflect.Array:
+		// We don't need to check length here because length is part of
+		// an array's type, which has already been filtered for.
+		for i := 0; i < v1.Len(); i++ {
+			if !e.deepValueEqual(v1.Index(i), v2.Index(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Slice:
+		if (v1.IsNil() || v1.Len() == 0) != (v2.IsNil() || v2.Len() == 0) {
+			return false
+		}
+		if v1.IsNil() || v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		if v1.Pointer() == v2.Pointer() {
+			return true
+		}
+		for i := 0; i < v1.Len(); i++ {
+			if !e.deepValueEqual(v1.Index(i), v2.Index(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Interface:
+		if v1.IsNil() || v2.IsNil() {
+			return v1.IsNil() == v2.IsNil()
+		}
+		return e.deepValueEqual(v1.Elem(), v2.Elem(), visited, depth+1)
+	case reflect.Ptr:
+		return e.deepValueEqual(v1.Elem(), v2.Elem(), visited, depth+1)
+	case reflect.Struct:
+		for i, n := 0, v1.NumField(); i < n; i++ {
+			if !e.deepValueEqual(v1.Field(i), v2.Field(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Map:
+		if (v1.IsNil() || v1.Len() == 0) != (v2.IsNil() || v2.Len() == 0) {
+			return false
+		}
+		if v1.IsNil() || v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		if v1.Pointer() == v2.Pointer() {
+			return true
+		}
+		for _, k := range v1.MapKeys() {
+			if !e.deepValueEqual(v1.MapIndex(k), v2.MapIndex(k), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Func:
+		if v1.IsNil() && v2.IsNil() {
+			return true
+		}
+		// Can't do better than this:
+		return false
+	default:
+		// Normal equality suffices
+		if !v1.CanInterface() || !v2.CanInterface() {
+			panic(unexportedTypePanic{})
+		}
+		return v1.Interface() == v2.Interface()
+	}
+}
+
+// DeepEqual is like reflect.DeepEqual, but focused on semantic equality
+// instead of memory equality.
+//
+// It will use e's equality functions if it finds types that match.
+//
+// An empty slice *is* equal to a nil slice for our purposes; same for maps.
+//
+// Unexported field members cannot be compared and will cause an imformative panic; you must add an Equality
+// function for these types.
+func (e Equalities) DeepEqual(a1, a2 interface{}) bool {
+	if a1 == nil || a2 == nil {
+		return a1 == a2
+	}
+	v1 := reflect.ValueOf(a1)
+	v2 := reflect.ValueOf(a2)
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	return e.deepValueEqual(v1, v2, make(map[visit]bool), 0)
+}
+
+func (e Equalities) deepValueDerive(v1, v2 reflect.Value, visited map[visit]bool, depth int) bool {
+	defer makeUsefulPanic(v1)
+
+	if !v1.IsValid() || !v2.IsValid() {
+		return v1.IsValid() == v2.IsValid()
+	}
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	if fv, ok := e[v1.Type()]; ok {
+		return fv.Call([]reflect.Value{v1, v2})[0].Bool()
+	}
+
+	hard := func(k reflect.Kind) bool {
+		switch k {
+		case reflect.Array, reflect.Map, reflect.Slice, reflect.Struct:
+			return true
+		}
+		return false
+	}
+
+	if v1.CanAddr() && v2.CanAddr() && hard(v1.Kind()) {
+		addr1 := v1.UnsafeAddr()
+		addr2 := v2.UnsafeAddr()
+		if addr1 > addr2 {
+			// Canonicalize order to reduce number of entries in visited.
+			addr1, addr2 = addr2, addr1
+		}
+
+		// Short circuit if references are identical ...
+		if addr1 == addr2 {
+			return true
+		}
+
+		// ... or already seen
+		typ := v1.Type()
+		v := visit{addr1, addr2, typ}
+		if visited[v] {
+			return true
+		}
+
+		// Remember for later.
+		visited[v] = true
+	}
+
+	switch v1.Kind() {
+	case reflect.Array:
+		// We don't need to check length here because length is part of
+		// an array's type, which has already been filtered for.
+		for i := 0; i < v1.Len(); i++ {
+			if !e.deepValueDerive(v1.Index(i), v2.Index(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Slice:
+		if v1.IsNil() || v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() > v2.Len() {
+			return false
+		}
+		if v1.Pointer() == v2.Pointer() {
+			return true
+		}
+		for i := 0; i < v1.Len(); i++ {
+			if !e.deepValueDerive(v1.Index(i), v2.Index(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.String:
+		if v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() > v2.Len() {
+			return false
+		}
+		return v1.String() == v2.String()
+	case reflect.Interface:
+		if v1.IsNil() {
+			return true
+		}
+		return e.deepValueDerive(v1.Elem(), v2.Elem(), visited, depth+1)
+	case reflect.Ptr:
+		if v1.IsNil() {
+			return true
+		}
+		return e.deepValueDerive(v1.Elem(), v2.Elem(), visited, depth+1)
+	case reflect.Struct:
+		for i, n := 0, v1.NumField(); i < n; i++ {
+			if !e.deepValueDerive(v1.Field(i), v2.Field(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Map:
+		if v1.IsNil() || v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() > v2.Len() {
+			return false
+		}
+		if v1.Pointer() == v2.Pointer() {
+			return true
+		}
+		for _, k := range v1.MapKeys() {
+			if !e.deepValueDerive(v1.MapIndex(k), v2.MapIndex(k), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Func:
+		if v1.IsNil() && v2.IsNil() {
+			return true
+		}
+		// Can't do better than this:
+		return false
+	default:
+		// Normal equality suffices
+		if !v1.CanInterface() || !v2.CanInterface() {
+			panic(unexportedTypePanic{})
+		}
+		return v1.Interface() == v2.Interface()
+	}
+}
+
+// DeepDerivative is similar to DeepEqual except that unset fields in a1 are
+// ignored (not compared). This allows us to focus on the fields that matter to
+// the semantic comparison.
+//
+// The unset fields include a nil pointer and an empty string.
+func (e Equalities) DeepDerivative(a1, a2 interface{}) bool {
+	if a1 == nil {
+		return true
+	}
+	v1 := reflect.ValueOf(a1)
+	v2 := reflect.ValueOf(a2)
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	return e.deepValueDerive(v1, v2, make(map[visit]bool), 0)
+}
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE b/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE
deleted file mode 100644
index efa1aa1896..0000000000
--- a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/LICENSE
+++ /dev/null
@@ -1,57 +0,0 @@
-Copyright (c) 2012 Péter Surányi. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-Portions of inf.Dec's source code have been derived from Go and are
-covered by the following license:
-----------------------------------------------------------------------
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 2d23989c9b3866265577bc817409a4636876e68c Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 26 May 2016 11:32:51 +0200
Subject: [PATCH 0316/1304] deps: gogo/protobuf: use v0.2

Motivation is to vendor only tagged dependencies.
---
 Godeps/Godeps.json                            |  4 +--
 .../github.com/gogo/protobuf/proto/encode.go  | 26 ++++++-----------
 .../github.com/gogo/protobuf/proto/equal.go   | 28 +++++++++++++------
 .../gogo/protobuf/proto/extensions.go         |  3 +-
 .../src/github.com/gogo/protobuf/proto/lib.go | 15 ++++++++--
 .../gogo/protobuf/proto/properties.go         | 16 ++++++++---
 .../github.com/gogo/protobuf/proto/text.go    |  4 +--
 .../gogo/protobuf/proto/text_parser.go        | 24 ++++++++++------
 8 files changed, 73 insertions(+), 47 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index f671e155bd..eac3f2f9b1 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -407,8 +407,8 @@
 		},
 		{
 			"ImportPath": "github.com/gogo/protobuf/proto",
-			"Comment": "v0.1-125-g82d16f7",
-			"Rev": "82d16f734d6d871204a3feb1a73cb220cc92574c"
+			"Comment": "v0.2",
+			"Rev": "4168943e65a2802828518e95310aeeed6d84c4e5"
 		},
 		{
 			"ImportPath": "github.com/golang/protobuf/proto",
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
index 7321e1aae1..231b07401a 100644
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
@@ -105,6 +105,11 @@ func (p *Buffer) EncodeVarint(x uint64) error {
 	return nil
 }
 
+// SizeVarint returns the varint encoding size of an integer.
+func SizeVarint(x uint64) int {
+	return sizeVarint(x)
+}
+
 func sizeVarint(x uint64) (n int) {
 	for {
 		n++
@@ -1248,24 +1253,9 @@ func size_struct(prop *StructProperties, base structPointer) (n int) {
 	}
 
 	// Factor in any oneof fields.
-	// TODO: This could be faster and use less reflection.
-	if prop.oneofMarshaler != nil {
-		sv := reflect.ValueOf(structPointer_Interface(base, prop.stype)).Elem()
-		for i := 0; i < prop.stype.NumField(); i++ {
-			fv := sv.Field(i)
-			if fv.Kind() != reflect.Interface || fv.IsNil() {
-				continue
-			}
-			if prop.stype.Field(i).Tag.Get("protobuf_oneof") == "" {
-				continue
-			}
-			spv := fv.Elem()         // interface -> *T
-			sv := spv.Elem()         // *T -> T
-			sf := sv.Type().Field(0) // StructField inside T
-			var prop Properties
-			prop.Init(sf.Type, "whatever", sf.Tag.Get("protobuf"), &sf)
-			n += prop.size(&prop, toStructPointer(spv))
-		}
+	if prop.oneofSizer != nil {
+		m := structPointer_Interface(base, prop.stype).(Message)
+		n += prop.oneofSizer(m)
 	}
 
 	return
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
index cc3f2c95a7..f5db1def3c 100644
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
@@ -50,7 +50,9 @@ Equality is defined in this way:
     are equal, and extensions sets are equal.
   - Two set scalar fields are equal iff their values are equal.
     If the fields are of a floating-point type, remember that
-    NaN != x for all x, including NaN.
+    NaN != x for all x, including NaN. If the message is defined
+    in a proto3 .proto file, fields are not "set"; specifically,
+    zero length proto3 "bytes" fields are equal (nil == {}).
   - Two repeated fields are equal iff their lengths are the same,
     and their corresponding elements are equal (a "bytes" field,
     although represented by []byte, is not a repeated field)
@@ -88,6 +90,7 @@ func Equal(a, b Message) bool {
 
 // v1 and v2 are known to have the same type.
 func equalStruct(v1, v2 reflect.Value) bool {
+	sprop := GetProperties(v1.Type())
 	for i := 0; i < v1.NumField(); i++ {
 		f := v1.Type().Field(i)
 		if strings.HasPrefix(f.Name, "XXX_") {
@@ -113,7 +116,7 @@ func equalStruct(v1, v2 reflect.Value) bool {
 			}
 			f1, f2 = f1.Elem(), f2.Elem()
 		}
-		if !equalAny(f1, f2) {
+		if !equalAny(f1, f2, sprop.Prop[i]) {
 			return false
 		}
 	}
@@ -140,7 +143,8 @@ func equalStruct(v1, v2 reflect.Value) bool {
 }
 
 // v1 and v2 are known to have the same type.
-func equalAny(v1, v2 reflect.Value) bool {
+// prop may be nil.
+func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
 	if v1.Type() == protoMessageType {
 		m1, _ := v1.Interface().(Message)
 		m2, _ := v2.Interface().(Message)
@@ -163,7 +167,7 @@ func equalAny(v1, v2 reflect.Value) bool {
 		if e1.Type() != e2.Type() {
 			return false
 		}
-		return equalAny(e1, e2)
+		return equalAny(e1, e2, nil)
 	case reflect.Map:
 		if v1.Len() != v2.Len() {
 			return false
@@ -174,16 +178,22 @@ func equalAny(v1, v2 reflect.Value) bool {
 				// This key was not found in the second map.
 				return false
 			}
-			if !equalAny(v1.MapIndex(key), val2) {
+			if !equalAny(v1.MapIndex(key), val2, nil) {
 				return false
 			}
 		}
 		return true
 	case reflect.Ptr:
-		return equalAny(v1.Elem(), v2.Elem())
+		return equalAny(v1.Elem(), v2.Elem(), prop)
 	case reflect.Slice:
 		if v1.Type().Elem().Kind() == reflect.Uint8 {
 			// short circuit: []byte
+
+			// Edge case: if this is in a proto3 message, a zero length
+			// bytes field is considered the zero value.
+			if prop != nil && prop.proto3 && v1.Len() == 0 && v2.Len() == 0 {
+				return true
+			}
 			if v1.IsNil() != v2.IsNil() {
 				return false
 			}
@@ -194,7 +204,7 @@ func equalAny(v1, v2 reflect.Value) bool {
 			return false
 		}
 		for i := 0; i < v1.Len(); i++ {
-			if !equalAny(v1.Index(i), v2.Index(i)) {
+			if !equalAny(v1.Index(i), v2.Index(i), prop) {
 				return false
 			}
 		}
@@ -229,7 +239,7 @@ func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
 
 		if m1 != nil && m2 != nil {
 			// Both are unencoded.
-			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2)) {
+			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
 				return false
 			}
 			continue
@@ -257,7 +267,7 @@ func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
 			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
 			return false
 		}
-		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2)) {
+		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
 			return false
 		}
 	}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
index 9a6374fdbd..6180347e39 100644
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
@@ -403,7 +403,6 @@ func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
 	o := NewBuffer(b)
 
 	t := reflect.TypeOf(extension.ExtensionType)
-	rep := extension.repeated()
 
 	props := extensionProperties(extension)
 
@@ -425,7 +424,7 @@ func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
 			return nil, err
 		}
 
-		if !rep || o.index >= len(o.buf) {
+		if o.index >= len(o.buf) {
 			break
 		}
 	}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
index 8ffa91a3e9..2e35ae2d2a 100644
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
@@ -70,6 +70,12 @@ for a protocol buffer variable v:
 	with distinguished wrapper types for each possible field value.
   - Marshal and Unmarshal are functions to encode and decode the wire format.
 
+When the .proto file specifies `syntax="proto3"`, there are some differences:
+
+  - Non-repeated fields of non-message type are values instead of pointers.
+  - Getters are only generated for message and oneof fields.
+  - Enum types do not get an Enum method.
+
 The simplest way to describe this is to see an example.
 Given file test.proto, containing
 
@@ -229,6 +235,7 @@ To create and play with a Test object:
 		test := &pb.Test{
 			Label: proto.String("hello"),
 			Type:  proto.Int32(17),
+			Reps:  []int64{1, 2, 3},
 			Optionalgroup: &pb.Test_OptionalGroup{
 				RequiredField: proto.String("good bye"),
 			},
@@ -441,7 +448,7 @@ func (p *Buffer) DebugPrint(s string, b []byte) {
 	var u uint64
 
 	obuf := p.buf
-	index := p.index
+	sindex := p.index
 	p.buf = b
 	p.index = 0
 	depth := 0
@@ -536,7 +543,7 @@ out:
 	fmt.Printf("\n")
 
 	p.buf = obuf
-	p.index = index
+	p.index = sindex
 }
 
 // SetDefaults sets unset protocol buffer fields to their default values.
@@ -881,3 +888,7 @@ func isProto3Zero(v reflect.Value) bool {
 	}
 	return false
 }
+
+// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
+// to assert that that code is compatible with this version of the proto package.
+const GoGoProtoPackageIsVersion1 = true
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
index 4711057e2b..5e6a0b3ba7 100644
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
@@ -96,6 +96,9 @@ type oneofMarshaler func(Message, *Buffer) error
 // A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
 type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
 
+// A oneofSizer does the sizing for all oneof fields in a message.
+type oneofSizer func(Message) int
+
 // tagMap is an optimization over map[int]int for typical protocol buffer
 // use-cases. Encoded protocol buffers are often in tag order with small tag
 // numbers.
@@ -147,6 +150,7 @@ type StructProperties struct {
 
 	oneofMarshaler   oneofMarshaler
 	oneofUnmarshaler oneofUnmarshaler
+	oneofSizer       oneofSizer
 	stype            reflect.Type
 
 	// OneofTypes contains information about the oneof fields in this message.
@@ -174,6 +178,7 @@ func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order
 type Properties struct {
 	Name     string // name of the field, for error messages
 	OrigName string // original name before protocol compiler (always set)
+	JSONName string // name to use for JSON; determined by protoc
 	Wire     string
 	WireType int
 	Tag      int
@@ -233,8 +238,9 @@ func (p *Properties) String() string {
 	if p.Packed {
 		s += ",packed"
 	}
-	if p.OrigName != p.Name {
-		s += ",name=" + p.OrigName
+	s += ",name=" + p.OrigName
+	if p.JSONName != p.OrigName {
+		s += ",json=" + p.JSONName
 	}
 	if p.proto3 {
 		s += ",proto3"
@@ -314,6 +320,8 @@ func (p *Properties) Parse(s string) {
 			p.Packed = true
 		case strings.HasPrefix(f, "name="):
 			p.OrigName = f[5:]
+		case strings.HasPrefix(f, "json="):
+			p.JSONName = f[5:]
 		case strings.HasPrefix(f, "enum="):
 			p.Enum = f[5:]
 		case f == "proto3":
@@ -784,11 +792,11 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 	sort.Sort(prop)
 
 	type oneofMessage interface {
-		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), []interface{})
+		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
 	}
 	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); isOneofMessage && ok {
 		var oots []interface{}
-		prop.oneofMarshaler, prop.oneofUnmarshaler, oots = om.XXX_OneofFuncs()
+		prop.oneofMarshaler, prop.oneofUnmarshaler, prop.oneofSizer, oots = om.XXX_OneofFuncs()
 		prop.stype = t
 
 		// Interpret oneof metadata.
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
index 7c9ae90f95..e2b99b122d 100644
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
@@ -573,12 +573,12 @@ func writeUnknownStruct(w *textWriter, data []byte) (err error) {
 			return ferr
 		}
 		if wire != WireStartGroup {
-			if err := w.WriteByte(':'); err != nil {
+			if err = w.WriteByte(':'); err != nil {
 				return err
 			}
 		}
 		if !w.compact || wire == WireStartGroup {
-			if err := w.WriteByte(' '); err != nil {
+			if err = w.WriteByte(' '); err != nil {
 				return err
 			}
 		}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
index f3909695ed..61b4bc8cc8 100644
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
+++ b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
@@ -124,6 +124,14 @@ func isWhitespace(c byte) bool {
 	return false
 }
 
+func isQuote(c byte) bool {
+	switch c {
+	case '"', '\'':
+		return true
+	}
+	return false
+}
+
 func (p *textParser) skipWhitespace() {
 	i := 0
 	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
@@ -338,13 +346,13 @@ func (p *textParser) next() *token {
 	p.advance()
 	if p.done {
 		p.cur.value = ""
-	} else if len(p.cur.value) > 0 && p.cur.value[0] == '"' {
+	} else if len(p.cur.value) > 0 && isQuote(p.cur.value[0]) {
 		// Look for multiple quoted strings separated by whitespace,
 		// and concatenate them.
 		cat := p.cur
 		for {
 			p.skipWhitespace()
-			if p.done || p.s[0] != '"' {
+			if p.done || !isQuote(p.s[0]) {
 				break
 			}
 			p.advance()
@@ -724,15 +732,15 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) error {
 				if err != nil {
 					return err
 				}
-				tok := p.next()
-				if tok.err != nil {
-					return tok.err
+				ntok := p.next()
+				if ntok.err != nil {
+					return ntok.err
 				}
-				if tok.value == "]" {
+				if ntok.value == "]" {
 					break
 				}
-				if tok.value != "," {
-					return p.errorf("Expected ']' or ',' found %q", tok.value)
+				if ntok.value != "," {
+					return p.errorf("Expected ']' or ',' found %q", ntok.value)
 				}
 			}
 			return nil

From 130ae758570da1b5c0ae93ce15b97af7d1498c3d Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 26 May 2016 13:06:52 +0200
Subject: [PATCH 0317/1304] deps: appc/spec: 0.8.3 -> v0.8.4

---
 Godeps/Godeps.json                            | 46 +++++++++----------
 .../appc/spec/ace/image_manifest_main.json.in |  4 +-
 .../spec/ace/image_manifest_sidekick.json.in  |  4 +-
 .../spec/schema/types/isolator_resources.go   |  8 ++--
 .../github.com/appc/spec/schema/version.go    |  2 +-
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index eac3f2f9b1..2effffa85b 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/rkt",
 	"GoVersion": "go1.5",
-	"GodepVersion": "v71",
+	"GodepVersion": "v70",
 	"Packages": [
 		"./...",
 		"github.com/appc/spec/actool",
@@ -163,58 +163,58 @@
 		},
 		{
 			"ImportPath": "github.com/appc/spec/ace",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/aci",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/actool",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/discovery",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/acirenderer",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/device",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/pkg/tarheader",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/common",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/lastditch",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/appc/spec/schema/types",
-			"Comment": "v0.8.3",
-			"Rev": "db96f94ae6b227fe4d8288527ead8927181620f6"
+			"Comment": "v0.8.4",
+			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
 		},
 		{
 			"ImportPath": "github.com/aws/aws-sdk-go/aws",
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
index 60e6417be7..33157eeead 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.3",
+    "acVersion": "0.8.4",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.3" },
+        { "name": "version", "value": "0.8.4" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index ed09f46a6e..a69bbcf66b 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.3",
+    "acVersion": "0.8.4",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.3" },
+        { "name": "version", "value": "0.8.4" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
index d97827b96f..2ac5130d1c 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
@@ -155,8 +155,8 @@ func NewResourceCPUIsolator(request, limit string) (*ResourceCPU, error) {
 	res := &ResourceCPU{
 		ResourceBase{
 			resourceValue{
-				Request: &req,
-				Limit:   &lim,
+				Request: req,
+				Limit:   lim,
 			},
 		},
 	}
@@ -209,8 +209,8 @@ func NewResourceMemoryIsolator(request, limit string) (*ResourceMemory, error) {
 	res := &ResourceMemory{
 		ResourceBase{
 			resourceValue{
-				Request: &req,
-				Limit:   &lim,
+				Request: req,
+				Limit:   lim,
 			},
 		},
 	}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
index 1cba342bb2..029ebfac35 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.3"
+	version string = "0.8.4"
 )
 
 var (

From 7c9108b76c30368a4332c87654501dc8abe441bd Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 25 May 2016 17:30:43 +0200
Subject: [PATCH 0318/1304] scripts/godep-save: compat shebang

---
 scripts/godep-save | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/godep-save b/scripts/godep-save
index 076ee2d4a4..f488d575a1 100755
--- a/scripts/godep-save
+++ b/scripts/godep-save
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 # make sure we are running in a toplevel directory
 if ! [[ "$0" =~ "scripts/godep-save" ]]; then

From 1d40da6777d2bbcd91fd4c9b40e21069fc2336a3 Mon Sep 17 00:00:00 2001
From: Matthias Jahn <mail@matthaias.com>
Date: Thu, 26 May 2016 10:58:34 +0200
Subject: [PATCH 0319/1304] docs: use stageX consistently

Fixes #2610
---
 CHANGELOG.md                                  |  2 +-
 Documentation/devel/architecture.md           | 10 ++--
 Documentation/devel/pod-lifecycle.md          |  6 +--
 .../devel/stage1-implementors-guide.md        | 48 +++++++++----------
 Documentation/subcommands/run.md              |  2 +-
 stage0/run.go                                 |  4 +-
 stage1/README.md                              |  4 +-
 tests/rkt_caps_test.go                        |  2 +-
 8 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6a3f2e88d..2abcde86f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -482,7 +482,7 @@ rkt v0.10.0 is an incremental release with numerous bug fixes and a few small ne
 
 #### Improved documentation
 - [compare rkt and other projects](https://github.com/coreos/rkt/blob/master/Documentation/rkt-vs-other-projects.md) ([#1588](https://github.com/coreos/rkt/pull/1588))
-- [Stage 1 systemd Architecture](https://github.com/coreos/rkt/blob/master/Documentation/devel/architecture.md) ([#1631](https://github.com/coreos/rkt/pull/1631))
+- [Stage1 systemd Architecture](https://github.com/coreos/rkt/blob/master/Documentation/devel/architecture.md) ([#1631](https://github.com/coreos/rkt/pull/1631))
 - [packaging rkt in Linux distributions](https://github.com/coreos/rkt/blob/master/Documentation/packaging.md) ([#1511](https://github.com/coreos/rkt/pull/1511))
 
 #### Improved testing
diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index e3f54869b0..f6d11911d3 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -21,12 +21,12 @@ Until https://github.com/coreos/rkt/issues/572 is resolved, this should be consi
 The first stage is the actual `rkt` binary itself.
 When running a pod, this binary is responsible for performing a number of initial preparatory tasks:
 
-- Fetching the specified ACIs, including the stage 1 ACI of --stage1-{url,path,name,hash,from-dir} if specified.
+- Fetching the specified ACIs, including the stage1 ACI of --stage1-{url,path,name,hash,from-dir} if specified.
 - Generating a Pod UUID
 - Generating a Pod Manifest
 - Creating a filesystem for the pod
-- Setting up stage 1 and stage 2 directories in the filesystem
-- Unpacking the stage 1 ACI into the pod filesystem
+- Setting up stage1 and stage2 directories in the filesystem
+- Unpacking the stage1 ACI into the pod filesystem
 - Unpacking the ACIs and copying each app into the stage2 directories
 
 Given a run command such as:
@@ -61,7 +61,7 @@ At this point the stage0 execs `/stage1/rootfs/init` with the current working di
 ### Stage 1
 
 The next stage is a binary that the user trusts to set up cgroups, execute processes, and perform other operations as root on the host.
-This stage has the responsibility of taking the pod filesystem that was created by stage 0 and creating the necessary cgroups, namespaces and mounts to launch the pod.
+This stage has the responsibility of taking the pod filesystem that was created by stage0 and creating the necessary cgroups, namespaces and mounts to launch the pod.
 Specifically, it must:
 
 - Read the Image and Pod Manifests. The Image Manifest defines the default `exec` specifications of each application; the Pod Manifest defines the ordering of the units, as well as any overrides.
@@ -76,7 +76,7 @@ This process is slightly different for the qemu-kvm stage1 but a similar workflo
 
 ### Stage 1 systemd Architecture
 
-rkt's Stage 1 includes a very minimal systemd that takes care of launching the apps in each pod, apply per-app resource isolators and make sure the apps finish in an orderly manner.
+rkt's Stage1 includes a very minimal systemd that takes care of launching the apps in each pod, apply per-app resource isolators and make sure the apps finish in an orderly manner.
 
 We will now detail how the starting, shutdown, and exist status collection of the apps in a pod are implemented internally.
 
diff --git a/Documentation/devel/pod-lifecycle.md b/Documentation/devel/pod-lifecycle.md
index 0483e33006..7d1c6003da 100644
--- a/Documentation/devel/pod-lifecycle.md
+++ b/Documentation/devel/pod-lifecycle.md
@@ -72,9 +72,9 @@ Any directory in `$var/prepare` in an unlocked state is considered a failed prep
 `rkt run` and `rkt run-prepared` both arrive here with the pod at `$var/run/$uuid` while holding the exclusive lock.
 
 The pod is then executed while holding this lock.
-It is required that the stage 1 `coreos.com/rkt/stage1/run` entrypoint keep the file descriptor representing the exclusive lock open for the lifetime of the pod's process.
-All this requires is that the stage 1 implementation not close the inherited file descriptor.
-This is facilitated by supplying stage 1 its number in the RKT_LOCK_FD environment variable.
+It is required that the stage1 `coreos.com/rkt/stage1/run` entrypoint keep the file descriptor representing the exclusive lock open for the lifetime of the pod's process.
+All this requires is that the stage1 implementation not close the inherited file descriptor.
+This is facilitated by supplying stage1 its number in the RKT_LOCK_FD environment variable.
 
 What follows applies equally to `rkt run` and `rkt run-prepared`.
 
diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 222c929535..eda3915d68 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -1,4 +1,4 @@
-Stage 1 ACI implementor's guide
+Stage1 ACI implementor's guide
 =============================
 
 Background
@@ -6,23 +6,23 @@ Background
 
 rkt's execution of pods is divided roughly into three separate stages:
 
-1. Stage 0: discovering, fetching, verifying, storing, and compositing of both application (stage 2) and stage 1 images for execution.
-2. Stage 1: execution of the stage 1 image from within the composite image prepared by stage 0.
-3. Stage 2: execution of individual application images within the containment afforded by stage 1.
+1. Stage 0: discovering, fetching, verifying, storing, and compositing of both application (stage2) and stage1 images for execution.
+2. Stage 1: execution of the stage1 image from within the composite image prepared by stage0.
+3. Stage 2: execution of individual application images within the containment afforded by stage1.
 
-This separation of concerns is reflected in the file-system and layout of the composite image prepared by stage 0:
+This separation of concerns is reflected in the file-system and layout of the composite image prepared by stage0:
 
 1. Stage 0: `rkt` executable, and the pod manifest created at `/var/lib/rkt/pods/prepare/$uuid/pod`.
 2. Stage 1: `stage1.aci`, made available at `/var/lib/rkt/pods/run/$uuid/stage1` by `rkt run`.
 3. Stage 2: `$app.aci`, made available at `/var/lib/rkt/pods/run/$uuid/stage1/rootfs/opt/stage2/$appname` by `rkt run`, where `$appname` is the name of the app in the pod manifest.
 
-The stage 1 implementation is what creates the execution environment for the contained applications.
-This occurs via entrypoints from stage 0 on behalf of `rkt run` and `rkt enter`.
-These entrypoints are executable programs located via annotations from within the stage 1 ACI manifest, and executed from within the stage 1 of a given pod at `/var/lib/rkt/pods/$state/$uuid/stage1/rootfs`.
+The stage1 implementation is what creates the execution environment for the contained applications.
+This occurs via entrypoints from stage0 on behalf of `rkt run` and `rkt enter`.
+These entrypoints are executable programs located via annotations from within the stage1 ACI manifest, and executed from within the stage1 of a given pod at `/var/lib/rkt/pods/$state/$uuid/stage1/rootfs`.
 
-Stage 2 is the deployed application image.
-Stage 1 is the vehicle for getting there from stage 0.
-For any given pod instance, stage 1 may be replaced by a completely different implementation.
+Stage2 is the deployed application image.
+Stage1 is the vehicle for getting there from stage0.
+For any given pod instance, stage1 may be replaced by a completely different implementation.
 This allows users to employ different containment strategies on the same host running the same interchangeable ACIs.
 
 Entrypoints
@@ -30,7 +30,7 @@ Entrypoints
 
 ### `rkt run` => `coreos.com/rkt/stage1/run`
 
-1. rkt prepares the pod's stage 1 and stage 2 images and pod manifest under `/var/lib/rkt/pods/prepare/$uuid`, acquiring an exclusive advisory lock on the directory.
+1. rkt prepares the pod's stage1 and stage2 images and pod manifest under `/var/lib/rkt/pods/prepare/$uuid`, acquiring an exclusive advisory lock on the directory.
    Upon a successful preparation, the directory will be renamed to `/var/lib/rkt/pods/run/$uuid`.
 2. chdirs to `/var/lib/rkt/pods/run/$uuid`.
 3. resolves the `coreos.com/rkt/stage1/run` entrypoint via annotations found within `/var/lib/rkt/pods/run/$uuid/stage1/manifest`.
@@ -39,18 +39,18 @@ Entrypoints
 It is the responsibility of this entrypoint to consume the pod manifest and execute the constituent apps in the appropriate environments as specified by the pod manifest.
 
 The environment variable `RKT_LOCK_FD` contains the file descriptor number of the open directory handle for `/var/lib/rkt/pods/run/$uuid`.
-It is necessary that stage 1 leave this file descriptor open and in its locked state for the duration of the `rkt run`.
+It is necessary that stage1 leave this file descriptor open and in its locked state for the duration of the `rkt run`.
 
-In the bundled rkt stage 1 which includes systemd-nspawn and systemd, the entrypoint is a static Go program found at `/init` within the stage 1 ACI rootfs.
+In the bundled rkt stage1 which includes systemd-nspawn and systemd, the entrypoint is a static Go program found at `/init` within the stage1 ACI rootfs.
 The majority of its execution entails generating a systemd-nspawn argument list and writing systemd unit files for the constituent apps before executing systemd-nspawn.
-Systemd-nspawn then boots the stage 1 systemd with the just-written unit files for launching the contained apps.
+Systemd-nspawn then boots the stage1 systemd with the just-written unit files for launching the contained apps.
 The `/init` program's primary job is translating a pod manifest to systemd-nspawn systemd.services.
 
-An alternative stage 1 could forego systemd-nspawn and systemd altogether, or retain these and introduce something like novm or qemu-kvm for greater isolation by first starting a VM.
+An alternative stage1 could forego systemd-nspawn and systemd altogether, or retain these and introduce something like novm or qemu-kvm for greater isolation by first starting a VM.
 All that is required is an executable at the place indicated by the `coreos.com/rkt/stage1/run` entrypoint that knows how to apply the pod manifest and prepared ACI file-systems to good effect.
 
 The resolved entrypoint must inform rkt of its PID for the benefit of `rkt enter`.
-Stage 1 implementors have two options for doing so; only one must be implemented:
+Stage1 implementors have two options for doing so; only one must be implemented:
 
 * `/var/lib/rkt/pods/run/$uuid/pid`: the PID of the process that will be given to the "enter" entrypoint.
 * `/var/lib/rkt/pods/run/$uuid/ppid`: the PID of the parent of the process that will be given to the "enter" entrypoint. That parent process must have exactly one child process.
@@ -76,11 +76,11 @@ Stage 1 implementors have two options for doing so; only one must be implemented
 3. resolves the `coreos.com/rkt/stage1/enter` entrypoint via annotations found within `/var/lib/rkt/pods/run/$uuid/stage1/manifest`
 4. executes the resolved entrypoint relative to `/var/lib/rkt/pods/run/$uuid/stage1/rootfs`
 
-In the bundled rkt stage 1, the entrypoint is a statically-linked C program found at `/enter` within the stage 1 ACI rootfs.
+In the bundled rkt stage1, the entrypoint is a statically-linked C program found at `/enter` within the stage1 ACI rootfs.
 This program enters the namespaces of the systemd-nspawn container's PID 1 before executing the `/enterexec` program.
 `enterexec` then `chroot`s into the ACI's rootfs, loading the application and its environment.
 
-An alternative stage 1 would need to do whatever is appropriate for entering the application environment created by its own `coreos.com/rkt/stage1/run` entrypoint.
+An alternative stage1 would need to do whatever is appropriate for entering the application environment created by its own `coreos.com/rkt/stage1/run` entrypoint.
 
 #### Arguments
 
@@ -93,7 +93,7 @@ An alternative stage 1 would need to do whatever is appropriate for entering the
 
 ### `rkt gc` => `coreos.com/rkt/stage1/gc`
 
-The gc entrypoint deals with garbage collecting resources allocated by stage 1.
+The gc entrypoint deals with garbage collecting resources allocated by stage1.
 For example, it removes the network namespace of a pod.
 
 #### Arguments
@@ -112,7 +112,7 @@ The current version of the stage1 interface is 2.
 Examples
 --------
 
-### Stage 1 ACI manifest
+### Stage1 ACI manifest
 
 ```json
 {
@@ -156,8 +156,8 @@ Examples
 
 ## Filesystem Layout Assumptions
 
-The following paths are reserved for the stage 1 image, and they will be created during stage0.
-When creating a stage 1 image, developers SHOULD NOT create or use these paths in the image's filesystem.
+The following paths are reserved for the stage1 image, and they will be created during stage0.
+When creating a stage1 image, developers SHOULD NOT create or use these paths in the image's filesystem.
 
 ### opt/stage2
 
@@ -168,7 +168,7 @@ e.g. `/var/lib/rkt/pods/run/$uuid/stage1/rootfs/opt/stage2/$appname/rootfs`.
 ### rkt/status
 
 This directory path is used for storing the apps' exit statuses.
-For example, if an app named `foo` exits with status = `42`, stage 1 should write `42`
+For example, if an app named `foo` exits with status = `42`, stage1 should write `42`
 in `/var/lib/rkt/pods/run/$uuid/stage1/rootfs/rkt/status/foo`.
 Later the exit status can be retrieved and shown by `rkt status $uuid`.
 
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 77defacc1d..1ffb5b0629 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -320,7 +320,7 @@ For example, if you use systemd, you can [run rkt using `systemd-run`](https://g
 
 If you don't use systemd, you can use [daemon](http://www.libslack.org/daemon/) as an alternative.
 
-## Use a Custom Stage 1
+## Use a Custom Stage1
 
 rkt is designed and intended to be modular, using a [staged architecture](../devel/architecture.md).
 
diff --git a/stage0/run.go b/stage0/run.go
index ed1d45e6af..8c3acf9a46 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -20,7 +20,7 @@ package stage0
 // rkt is a reference implementation of the app container specification.
 //
 // Execution on rkt is divided into a number of stages, and the `rkt`
-// binary implements the first stage (stage 0)
+// binary implements the first stage (stage0)
 //
 
 import (
@@ -526,7 +526,7 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 		log.Fatalf("error clearing FD_CLOEXEC on lock fd")
 	}
 
-	tpmEvent := fmt.Sprintf("rkt: Rootfs: %s Manifest: %s Stage 1 args: %s", cfg.CommonConfig.RootHash, cfg.CommonConfig.ManifestData, strings.Join(args, " "))
+	tpmEvent := fmt.Sprintf("rkt: Rootfs: %s Manifest: %s Stage1 args: %s", cfg.CommonConfig.RootHash, cfg.CommonConfig.ManifestData, strings.Join(args, " "))
 	// If there's no TPM available or there's a failure for some other
 	// reason, ignore it and continue anyway. Long term we'll want policy
 	// that enforces TPM behaviour, but we don't have any infrastructure
diff --git a/stage1/README.md b/stage1/README.md
index 6afc0b8148..d0cfc70727 100644
--- a/stage1/README.md
+++ b/stage1/README.md
@@ -1,5 +1,5 @@
-Stage 1 build
+Stage1 build
 -------------
 
-Stage 1 build is invoked by the parent makefile by calling stage1.mk
+Stage1 build is invoked by the parent makefile by calling stage1.mk
 read the stage1.mk contents for details
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index d8fce6b1e0..b54057e0b5 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -393,7 +393,7 @@ func NewCapsTest(hasStage1FullCaps bool, stages []int) testutils.Test {
 			stageFileNames := []string{stage1FileName, stage2FileName}
 
 			for _, stage := range stages {
-				t.Logf("Running test #%v: %v [stage %v]", i, tt.testName, stage)
+				t.Logf("Running test #%v: %v [stage%v]", i, tt.testName, stage)
 
 				cmd := fmt.Sprintf("%s --debug --insecure-options=image run --mds-register=false --set-env=CAPABILITY=%d %s", ctx.Cmd(), int(tt.capa), stageFileNames[stage-1])
 				child := spawnOrFail(t, cmd)

From 78f273f1d4e7e129c84eff0040b900265222a1e4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 26 May 2016 11:53:50 +0200
Subject: [PATCH 0320/1304] docs: document capabilities usage

This commits introduces a walk-through guide for capabilities usage.
It is targeted to users, introducing them to Linux capabilities in
general, documenting the differences between the two available
isolators, and how to use them for building images.

Fixes #2648
---
 Documentation/capabilities-guide.md | 236 ++++++++++++++++++++++++++++
 1 file changed, 236 insertions(+)
 create mode 100644 Documentation/capabilities-guide.md

diff --git a/Documentation/capabilities-guide.md b/Documentation/capabilities-guide.md
new file mode 100644
index 0000000000..5ca541aec0
--- /dev/null
+++ b/Documentation/capabilities-guide.md
@@ -0,0 +1,236 @@
+# Capabilities Isolators Guide
+
+This document is a walk-through guide describing how to use rkt isolators for
+[Linux Capabilities](https://lwn.net/Kernel/Index/#Capabilities).
+
+* [About Linux Capabilities](#about-linux-capabilities)
+* [Default Capabilities](#default-capabilities)
+* [Capability Isolators](#capability-isolators)
+* [Usage Example](#usage-example)
+* [Recommendations](#recommendations)
+
+## About Linux Capabilities
+
+Linux capabilities are meant to be a modern evolution of traditional UNIX
+permissions checks.
+The goal is to split the permissions granted to privileged processes into a set
+of capabilities (eg. `CAP_NET_RAW` to open a raw socket), which can be
+separately handled and assigned to single threads.
+
+Processes can gain specific capabilities by either being run by superuser, or by
+having the setuid/setgid bits or specific file-capabilities set on their
+executable file.
+Once running, each process has a bounding set of capabilities which it can
+enable and use; such process cannot get further capabilities outside of this set.
+
+In the context of containers, capabilities are useful for:
+ * restricting the effective privileges of applications running as root
+ * allowing applications to perform specific privileged operations, without
+   having to run them as root
+
+For the complete list of existing Linux capabilities and a detailed description
+of this security mechanism, see [capabilities(7)](http://man7.org/linux/man-pages/man7/capabilities.7.html).
+
+## Default capabilities
+
+By default, rkt enforces [a default set of
+capabilities](https://github.com/appc/spec/blob/master/spec/ace.md#oslinuxcapabilities-remove-set)
+onto applications.
+This default set is tailored to stop applications from performing a large 
+variety of privileged actions, while not impacting their normal behavior.
+Operations which are typically not needed in containers and which may
+impact host state, eg. invoking `reboot(2)`, are denied in this way.
+
+However, this default set is mostly meant as a safety precaution against erratic
+and misbehaving applications, and will not suffice against tailored attacks.
+As such, it is recommended to fine-tune the capabilities bounding set using one
+of the customizable isolators available in rkt.
+
+## Capability Isolators
+
+When running Linux containers, rkt provides two mutually exclusive isolators
+to define the bounding set under which an application will be run:
+ * `os/linux/capabilities-retain-set`
+ * `os/linux/capabilities-remove-set`
+
+Those isolators cover different use-cases and employ different techniques to
+achieve the same goal of limiting available capabilities. As such, they cannot
+be used together at the same time, and recommended usage varies on a 
+case-by-case basis.
+
+As the granularity of capabilities varies for specific permission cases, a word
+of warning is needed in order to avoid a false sense of security.
+In many cases it is possible to abuse granted capabilities in order to
+completely subvert the sandbox: for example, `CAP_SYS_PTRACE` allows to access
+stage1 environment and `CAP_SYS_ADMIN` grants a broad range of privileges,
+effectively equivalent to root.
+Many other ways to maliciously transition across capabilities have already been
+[reported](https://forums.grsecurity.net/viewtopic.php?f=7&t=2522) too.
+
+### Retain-set
+
+`os/linux/capabilities-retain-set` allows for an additive approach to 
+capabilities: applications will be stripped of all capabilities, except the ones
+listed in this isolator.
+
+This whitelisting approach is useful for completely locking down environments
+and whenever application requirements (in terms of capabilities) are 
+well-defined in advance. It allows one to ensure that exactly and only the
+specified capabilities could ever be used.
+
+For example, an application that will only need to bind to port 80 as
+a privileged operation, will have `CAP_NET_BIND_SERVICE` as the only entry in
+its "retain-set".
+
+### Remove-set
+
+`os/linux/capabilities-remove-set` tackles capabilities in a subtractive way: 
+starting from the default set of capabilities, single entries can be further
+forbidden in order to prevent specific actions.
+
+This blacklisting approach is useful to somehow limit applications which have
+broad requirements in terms of privileged operations, in order to deny some
+potentially malicious operations.
+
+For example, an application that will need to perform multiple privileged 
+operations but is known to never open a raw socket, will have
+`CAP_NET_RAW` specified in its "remove-set".
+
+## Usage Example
+
+The goal of these examples is to show how to build ACI images with acbuild,
+where some capabilities are either explicitly blocked or allowed.
+For simplicity, the starting point will be the official Alpine Linux image from
+CoreOS which ships with `ping` and `nc` commands (from busybox). Those
+commands respectively requires `CAP_NET_RAW` and `CAP_NET_BIND_SERVICE`
+capabilities in order to perform privileged operations.
+To block their usage, capabilities bounding set
+can be manipulated via `os/linux/capabilities-remove-set` or 
+`os/linux/capabilities-retain-set`; both approaches are shown here.
+
+### Removing specific capabilities
+
+This example shows how to block `ping` only, by removing `CAP_NET_RAW` from 
+capabilities bounding set.
+
+First, a local image is built with an explicit "remove-set" isolator.
+This set contains the capabilities that need to be forbidden in order to block
+`ping` usage (and only that):
+
+```
+$ acbuild begin
+$ acbuild set-name localhost/caps-remove-set-example
+$ acbuild dependency add quay.io/coreos/alpine-sh
+$ acbuild set-exec -- /bin/sh
+$ echo '{ "set": ["CAP_NET_RAW"] }' | acbuild isolator add "os/linux/capabilities-remove-set" -
+$ acbuild write caps-remove-set-example.aci
+$ acbuild end
+```
+
+Once properly built, this image can be run in order to check that `ping` usage has
+been effectively disabled:
+```
+$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci 
+image: using image from file stage1-coreos.aci
+image: using image from file caps-remove-set-example.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # ping -c 1 8.8.8.8
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+ping: permission denied (are you root?)
+```
+
+This means that `CAP_NET_RAW` had been effectively disabled inside the container.
+At the same time, `CAP_NET_BIND_SERVICE` is still available in the default bounding
+set, so the `nc` command will be able to bind to port 80:
+```
+$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci 
+image: using image from file stage1-coreos.aci
+image: using image from file caps-remove-set-example.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # nc -v -l -p 80
+listening on [::]:80 ...
+```
+
+### Allowing specific capabilities
+
+In contrast to the example above, this one shows how to allow `ping` only, by
+removing all capabilities except `CAP_NET_RAW` from the bounding set.
+This means that all other privileged operations, including binding to port 80
+will be blocked.
+
+First, a local image is built with an explicit "retain-set" isolator.
+This set contains the capabilities that need to be enabled in order to allowed
+`ping` usage (and only that):
+
+```
+$ acbuild begin
+$ acbuild set-name localhost/caps-retain-set-example
+$ acbuild dependency add quay.io/coreos/alpine-sh
+$ acbuild set-exec -- /bin/sh
+$ echo '{ "set": ["CAP_NET_RAW"] }' | acbuild isolator add "os/linux/capabilities-retain-set" -
+$ acbuild write caps-retain-set-example.aci
+$ acbuild end
+```
+
+Once run, it can be easily verified that `ping` from inside the container is now
+functional:
+
+```
+$ sudo rkt run --interactive --insecure-options=image caps-retain-set-example.aci 
+image: using image from file stage1-coreos.aci
+image: using image from file caps-retain-set-example.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # ping -c 1 8.8.8.8
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+64 bytes from 8.8.8.8: seq=0 ttl=41 time=24.910 ms
+
+--- 8.8.8.8 ping statistics ---
+1 packets transmitted, 1 packets received, 0% packet loss
+round-trip min/avg/max = 24.910/24.910/24.910 ms
+```
+
+However, all others capabilities are now not anymore available to the application.
+For example, using `nc` to bind to port 80 will now result in a failure due to
+the missing `CAP_NET_BIND_SERVICE` capability:
+
+```
+$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci 
+image: using image from file stage1-coreos.aci
+image: using image from file caps-remove-set-example.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # nc -v -l -p 80
+nc: bind: Permission denied
+```
+
+## Recommendations
+
+As with most security features, capability isolators may require some
+application-specific tuning in order to be maximally effective. For this reason,
+for security-sensitive environments it is recommended to have a well-specified
+set of capabilities requirements and follow best practices:
+
+ 1. Always follow the principle of least privilege and, whenever possible,
+    avoid running applications as root
+ 2. Only grant the minimum set of capabilities needed by an application,
+    according to its typical usage
+ 3. Avoid granting overly generic capabilities. For example, `CAP_SYS_ADMIN` and
+    `CAP_SYS_PTRACE` are typically bad choices, as they open large attack
+    surfaces.
+ 4. Prefer a blacklisting approach, trying to keep the "retain-set" as small as
+    possible.

From cd4d086a87cd46668fe0ef9d2543286f150c579b Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek.gonyeo@coreos.com>
Date: Thu, 26 May 2016 10:43:58 -0700
Subject: [PATCH 0321/1304] godeps: use tagged release of
 github.com/shirou/gopsutil

Godeps also deleted a few other packages, no clue why but the project
seems to build fine without them.

The pakcages removed:
 - github.com/gopherjs/gopherjs/js
 - github.com/jtolds/gls
 - github.com/smartystreets/assertions
 - github.com/smartystreets/goconvey/convey
---
 Godeps/Godeps.json                            |  64 +-
 .../src/github.com/gopherjs/gopherjs/js/js.go | 168 -----
 .../src/github.com/jtolds/gls/LICENSE         |  18 -
 .../src/github.com/jtolds/gls/README.md       |  89 ---
 .../src/github.com/jtolds/gls/context.go      | 144 -----
 .../src/github.com/jtolds/gls/gen_sym.go      |  13 -
 .../src/github.com/jtolds/gls/id_pool.go      |  34 --
 .../src/github.com/jtolds/gls/stack_tags.go   |  43 --
 .../github.com/jtolds/gls/stack_tags_js.go    | 101 ---
 .../github.com/jtolds/gls/stack_tags_main.go  |  61 --
 .../shirou/gopsutil/cpu/cpu_linux.go          |   2 +-
 .../shirou/gopsutil/process/process.go        |   1 -
 .../shirou/gopsutil/process/process_linux.go  | 104 ++--
 .../shirou/gopsutil/process/process_posix.go  |  11 -
 .../smartystreets/assertions/.gitignore       |   3 -
 .../smartystreets/assertions/.travis.yml      |  14 -
 .../smartystreets/assertions/CONTRIBUTING.md  |  12 -
 .../smartystreets/assertions/LICENSE.md       |  23 -
 .../smartystreets/assertions/README.md        | 575 ------------------
 .../assertions/assertions.goconvey            |   3 -
 .../smartystreets/assertions/collections.go   | 244 --------
 .../smartystreets/assertions/doc.go           | 105 ----
 .../smartystreets/assertions/equality.go      | 280 ---------
 .../smartystreets/assertions/filter.go        |  23 -
 .../internal/go-render/render/render.go       | 477 ---------------
 .../internal/oglematchers/.gitignore          |   5 -
 .../internal/oglematchers/.travis.yml         |   4 -
 .../assertions/internal/oglematchers/LICENSE  | 202 ------
 .../internal/oglematchers/README.md           |  58 --
 .../internal/oglematchers/all_of.go           |  70 ---
 .../assertions/internal/oglematchers/any.go   |  32 -
 .../internal/oglematchers/any_of.go           |  94 ---
 .../internal/oglematchers/contains.go         |  61 --
 .../internal/oglematchers/deep_equals.go      |  88 ---
 .../internal/oglematchers/elements_are.go     |  91 ---
 .../internal/oglematchers/equals.go           | 541 ----------------
 .../assertions/internal/oglematchers/error.go |  51 --
 .../internal/oglematchers/greater_or_equal.go |  39 --
 .../internal/oglematchers/greater_than.go     |  39 --
 .../internal/oglematchers/has_same_type_as.go |  37 --
 .../internal/oglematchers/has_substr.go       |  46 --
 .../internal/oglematchers/identical_to.go     | 134 ----
 .../internal/oglematchers/less_or_equal.go    |  41 --
 .../internal/oglematchers/less_than.go        | 152 -----
 .../internal/oglematchers/matcher.go          |  86 ---
 .../internal/oglematchers/matches_regexp.go   |  69 ---
 .../internal/oglematchers/new_matcher.go      |  43 --
 .../assertions/internal/oglematchers/not.go   |  53 --
 .../internal/oglematchers/panics.go           |  74 ---
 .../internal/oglematchers/pointee.go          |  65 --
 .../oglematchers/transform_description.go     |  36 --
 .../smartystreets/assertions/messages.go      |  93 ---
 .../smartystreets/assertions/panic.go         | 115 ----
 .../smartystreets/assertions/quantity.go      | 141 -----
 .../smartystreets/assertions/serializer.go    |  69 ---
 .../smartystreets/assertions/strings.go       | 227 -------
 .../smartystreets/assertions/time.go          | 202 ------
 .../smartystreets/assertions/type.go          | 112 ----
 .../goconvey/convey/assertions.go             |  68 ---
 .../smartystreets/goconvey/convey/context.go  | 272 ---------
 .../goconvey/convey/convey.goconvey           |   4 -
 .../goconvey/convey/discovery.go              | 103 ----
 .../smartystreets/goconvey/convey/doc.go      | 218 -------
 .../goconvey/convey/gotest/utils.go           |  28 -
 .../smartystreets/goconvey/convey/init.go     |  81 ---
 .../goconvey/convey/nilReporter.go            |  15 -
 .../goconvey/convey/reporting/console.go      |  16 -
 .../goconvey/convey/reporting/doc.go          |   5 -
 .../goconvey/convey/reporting/dot.go          |  40 --
 .../goconvey/convey/reporting/gotest.go       |  33 -
 .../goconvey/convey/reporting/init.go         |  94 ---
 .../goconvey/convey/reporting/json.go         |  88 ---
 .../goconvey/convey/reporting/printer.go      |  57 --
 .../goconvey/convey/reporting/problems.go     |  80 ---
 .../goconvey/convey/reporting/reporter.go     |  39 --
 .../convey/reporting/reporting.goconvey       |   2 -
 .../goconvey/convey/reporting/reports.go      | 179 ------
 .../goconvey/convey/reporting/statistics.go   | 108 ----
 .../goconvey/convey/reporting/story.go        |  73 ---
 79 files changed, 48 insertions(+), 7337 deletions(-)
 delete mode 100644 Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/context.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go
 delete mode 100644 Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/time.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/assertions/type.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go
 delete mode 100644 Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index e58a951fae..66c18e843f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -433,11 +433,6 @@
 			"ImportPath": "github.com/google/btree",
 			"Rev": "f06e229e679911bb31a04e07ac891115822e37c3"
 		},
-		{
-			"ImportPath": "github.com/gopherjs/gopherjs/js",
-			"Comment": "go1.5-45-g19e100e",
-			"Rev": "19e100e9652485a76176bc5fd2669f57d3a2743c"
-		},
 		{
 			"ImportPath": "github.com/gorilla/context",
 			"Rev": "50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da"
@@ -463,11 +458,6 @@
 			"Comment": "0.2.2-12-g0b12d6b",
 			"Rev": "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"
 		},
-		{
-			"ImportPath": "github.com/jtolds/gls",
-			"Comment": "v4.2.0",
-			"Rev": "8ddce2a84170772b95dd5d576c48d517b22cac63"
-		},
 		{
 			"ImportPath": "github.com/kballard/go-shellquote",
 			"Rev": "e5c918b80c17694cbc49aab32a759f9a40067f5d"
@@ -493,33 +483,33 @@
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/cpu",
-			"Comment": "v2.0.0-10-g9ef3410",
-			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+			"Comment": "v2.0.0",
+			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/host",
-			"Comment": "v2.0.0-10-g9ef3410",
-			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+			"Comment": "v2.0.0",
+			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/internal/common",
-			"Comment": "v2.0.0-10-g9ef3410",
-			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+			"Comment": "v2.0.0",
+			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/mem",
-			"Comment": "v2.0.0-10-g9ef3410",
-			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+			"Comment": "v2.0.0",
+			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/net",
-			"Comment": "v2.0.0-10-g9ef3410",
-			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+			"Comment": "v2.0.0",
+			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/process",
-			"Comment": "v2.0.0-10-g9ef3410",
-			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+			"Comment": "v2.0.0",
+			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
 		},
 		{
 			"ImportPath": "github.com/shirou/w32",
@@ -529,36 +519,6 @@
 			"ImportPath": "github.com/shurcooL/sanitized_anchor_name",
 			"Rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77"
 		},
-		{
-			"ImportPath": "github.com/smartystreets/assertions",
-			"Comment": "1.6.0-6-g40711f7",
-			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/assertions/internal/go-render/render",
-			"Comment": "1.6.0-6-g40711f7",
-			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/assertions/internal/oglematchers",
-			"Comment": "1.6.0-6-g40711f7",
-			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/goconvey/convey",
-			"Comment": "1.6.1-20-gcc5d85f",
-			"Rev": "cc5d85f4f15bd2163abf0fe6e6753356dde72aa2"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/goconvey/convey/gotest",
-			"Comment": "1.6.1-20-gcc5d85f",
-			"Rev": "cc5d85f4f15bd2163abf0fe6e6753356dde72aa2"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/goconvey/convey/reporting",
-			"Comment": "1.6.1-20-gcc5d85f",
-			"Rev": "cc5d85f4f15bd2163abf0fe6e6753356dde72aa2"
-		},
 		{
 			"ImportPath": "github.com/spf13/cobra",
 			"Rev": "4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f"
diff --git a/Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go b/Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go
deleted file mode 100644
index 5367d3d0fa..0000000000
--- a/Godeps/_workspace/src/github.com/gopherjs/gopherjs/js/js.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Package js provides functions for interacting with native JavaScript APIs. Calls to these functions are treated specially by GopherJS and translated directly to their corresponding JavaScript syntax.
-//
-// Use MakeWrapper to expose methods to JavaScript. When passing values directly, the following type conversions are performed:
-//
-//  | Go type               | JavaScript type       | Conversions back to interface{} |
-//  | --------------------- | --------------------- | ------------------------------- |
-//  | bool                  | Boolean               | bool                            |
-//  | integers and floats   | Number                | float64                         |
-//  | string                | String                | string                          |
-//  | []int8                | Int8Array             | []int8                          |
-//  | []int16               | Int16Array            | []int16                         |
-//  | []int32, []int        | Int32Array            | []int                           |
-//  | []uint8               | Uint8Array            | []uint8                         |
-//  | []uint16              | Uint16Array           | []uint16                        |
-//  | []uint32, []uint      | Uint32Array           | []uint                          |
-//  | []float32             | Float32Array          | []float32                       |
-//  | []float64             | Float64Array          | []float64                       |
-//  | all other slices      | Array                 | []interface{}                   |
-//  | arrays                | see slice type        | see slice type                  |
-//  | functions             | Function              | func(...interface{}) *js.Object |
-//  | time.Time             | Date                  | time.Time                       |
-//  | -                     | instanceof Node       | *js.Object                      |
-//  | maps, structs         | instanceof Object     | map[string]interface{}          |
-//
-// Additionally, for a struct containing a *js.Object field, only the content of the field will be passed to JavaScript and vice versa.
-package js
-
-// Object is a container for a native JavaScript object. Calls to its methods are treated specially by GopherJS and translated directly to their JavaScript syntax. A nil pointer to Object is equal to JavaScript's "null". Object can not be used as a map key.
-type Object struct{ object *Object }
-
-// Get returns the object's property with the given key.
-func (o *Object) Get(key string) *Object { return o.object.Get(key) }
-
-// Set assigns the value to the object's property with the given key.
-func (o *Object) Set(key string, value interface{}) { o.object.Set(key, value) }
-
-// Delete removes the object's property with the given key.
-func (o *Object) Delete(key string) { o.object.Delete(key) }
-
-// Length returns the object's "length" property, converted to int.
-func (o *Object) Length() int { return o.object.Length() }
-
-// Index returns the i'th element of an array.
-func (o *Object) Index(i int) *Object { return o.object.Index(i) }
-
-// SetIndex sets the i'th element of an array.
-func (o *Object) SetIndex(i int, value interface{}) { o.object.SetIndex(i, value) }
-
-// Call calls the object's method with the given name.
-func (o *Object) Call(name string, args ...interface{}) *Object { return o.object.Call(name, args...) }
-
-// Invoke calls the object itself. This will fail if it is not a function.
-func (o *Object) Invoke(args ...interface{}) *Object { return o.object.Invoke(args...) }
-
-// New creates a new instance of this type object. This will fail if it not a function (constructor).
-func (o *Object) New(args ...interface{}) *Object { return o.object.New(args...) }
-
-// Bool returns the object converted to bool according to JavaScript type conversions.
-func (o *Object) Bool() bool { return o.object.Bool() }
-
-// String returns the object converted to string according to JavaScript type conversions.
-func (o *Object) String() string { return o.object.String() }
-
-// Int returns the object converted to int according to JavaScript type conversions (parseInt).
-func (o *Object) Int() int { return o.object.Int() }
-
-// Int64 returns the object converted to int64 according to JavaScript type conversions (parseInt).
-func (o *Object) Int64() int64 { return o.object.Int64() }
-
-// Uint64 returns the object converted to uint64 according to JavaScript type conversions (parseInt).
-func (o *Object) Uint64() uint64 { return o.object.Uint64() }
-
-// Float returns the object converted to float64 according to JavaScript type conversions (parseFloat).
-func (o *Object) Float() float64 { return o.object.Float() }
-
-// Interface returns the object converted to interface{}. See GopherJS' README for details.
-func (o *Object) Interface() interface{} { return o.object.Interface() }
-
-// Unsafe returns the object as an uintptr, which can be converted via unsafe.Pointer. Not intended for public use.
-func (o *Object) Unsafe() uintptr { return o.object.Unsafe() }
-
-// Error encapsulates JavaScript errors. Those are turned into a Go panic and may be recovered, giving an *Error that holds the JavaScript error object.
-type Error struct {
-	*Object
-}
-
-// Error returns the message of the encapsulated JavaScript error object.
-func (err *Error) Error() string {
-	return "JavaScript error: " + err.Get("message").String()
-}
-
-// Stack returns the stack property of the encapsulated JavaScript error object.
-func (err *Error) Stack() string {
-	return err.Get("stack").String()
-}
-
-// Global gives JavaScript's global object ("window" for browsers and "GLOBAL" for Node.js).
-var Global *Object
-
-// Module gives the value of the "module" variable set by Node.js. Hint: Set a module export with 'js.Module.Get("exports").Set("exportName", ...)'.
-var Module *Object
-
-// Undefined gives the JavaScript value "undefined".
-var Undefined *Object
-
-// Debugger gets compiled to JavaScript's "debugger;" statement.
-func Debugger() {}
-
-// InternalObject returns the internal JavaScript object that represents i. Not intended for public use.
-func InternalObject(i interface{}) *Object {
-	return nil
-}
-
-// MakeFunc wraps a function and gives access to the values of JavaScript's "this" and "arguments" keywords.
-func MakeFunc(func(this *Object, arguments []*Object) interface{}) *Object {
-	return nil
-}
-
-// Keys returns the keys of the given JavaScript object.
-func Keys(o *Object) []string {
-	if o == nil || o == Undefined {
-		return nil
-	}
-	a := Global.Get("Object").Call("keys", o)
-	s := make([]string, a.Length())
-	for i := 0; i < a.Length(); i++ {
-		s[i] = a.Index(i).String()
-	}
-	return s
-}
-
-// MakeWrapper creates a JavaScript object which has wrappers for the exported methods of i. Use explicit getter and setter methods to expose struct fields to JavaScript.
-func MakeWrapper(i interface{}) *Object {
-	v := InternalObject(i)
-	o := Global.Get("Object").New()
-	o.Set("__internal_object__", v)
-	methods := v.Get("constructor").Get("methods")
-	for i := 0; i < methods.Length(); i++ {
-		m := methods.Index(i)
-		if m.Get("pkg").String() != "" { // not exported
-			continue
-		}
-		o.Set(m.Get("name").String(), func(args ...*Object) *Object {
-			return Global.Call("$externalizeFunction", v.Get(m.Get("prop").String()), m.Get("typ"), true).Call("apply", v, args)
-		})
-	}
-	return o
-}
-
-// NewArrayBuffer creates a JavaScript ArrayBuffer from a byte slice.
-func NewArrayBuffer(b []byte) *Object {
-	slice := InternalObject(b)
-	offset := slice.Get("$offset").Int()
-	length := slice.Get("$length").Int()
-	return slice.Get("$array").Get("buffer").Call("slice", offset, offset+length)
-}
-
-// M is a simple map type. It is intended as a shorthand for JavaScript objects (before conversion).
-type M map[string]interface{}
-
-// S is a simple slice type. It is intended as a shorthand for JavaScript arrays (before conversion).
-type S []interface{}
-
-func init() {
-	// avoid dead code elimination
-	e := Error{}
-	_ = e
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/LICENSE b/Godeps/_workspace/src/github.com/jtolds/gls/LICENSE
deleted file mode 100644
index 9b4a822d92..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright (c) 2013, Space Monkey, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/README.md b/Godeps/_workspace/src/github.com/jtolds/gls/README.md
deleted file mode 100644
index 4ebb692fb1..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-gls
-===
-
-Goroutine local storage
-
-### IMPORTANT NOTE ###
-
-It is my duty to point you to https://blog.golang.org/context, which is how 
-Google solves all of the problems you'd perhaps consider using this package
-for at scale. 
-
-One downside to Google's approach is that *all* of your functions must have
-a new first argument, but after clearing that hurdle everything else is much
-better.
-
-If you aren't interested in this warning, read on.
-
-### Huhwaht? Why? ###
-
-Every so often, a thread shows up on the
-[golang-nuts](https://groups.google.com/d/forum/golang-nuts) asking for some
-form of goroutine-local-storage, or some kind of goroutine id, or some kind of
-context. There are a few valid use cases for goroutine-local-storage, one of
-the most prominent being log line context. One poster was interested in being
-able to log an HTTP request context id in every log line in the same goroutine
-as the incoming HTTP request, without having to change every library and
-function call he was interested in logging.
-
-This would be pretty useful. Provided that you could get some kind of
-goroutine-local-storage, you could call
-[log.SetOutput](http://golang.org/pkg/log/#SetOutput) with your own logging
-writer that checks goroutine-local-storage for some context information and
-adds that context to your log lines.
-
-But alas, Andrew Gerrand's typically diplomatic answer to the question of
-goroutine-local variables was:
-
-> We wouldn't even be having this discussion if thread local storage wasn't
-> useful. But every feature comes at a cost, and in my opinion the cost of
-> threadlocals far outweighs their benefits. They're just not a good fit for
-> Go.
-
-So, yeah, that makes sense. That's a pretty good reason for why the language
-won't support a specific and (relatively) unuseful feature that requires some
-runtime changes, just for the sake of a little bit of log improvement.
-
-But does Go require runtime changes?
-
-### How it works ###
-
-Go has pretty fantastic introspective and reflective features, but one thing Go
-doesn't give you is any kind of access to the stack pointer, or frame pointer,
-or goroutine id, or anything contextual about your current stack. It gives you
-access to your list of callers, but only along with program counters, which are
-fixed at compile time.
-
-But it does give you the stack.
-
-So, we define 16 special functions and embed base-16 tags into the stack using
-the call order of those 16 functions. Then, we can read our tags back out of
-the stack looking at the callers list.
-
-We then use these tags as an index into a traditional map for implementing
-this library.
-
-### What are people saying? ###
-
-"Wow, that's horrifying."
-
-"This is the most terrible thing I have seen in a very long time."
-
-"Where is it getting a context from? Is this serializing all the requests? 
-What the heck is the client being bound to? What are these tags? Why does he 
-need callers? Oh god no. No no no."
-
-### Docs ###
-
-Please see the docs at http://godoc.org/github.com/jtolds/gls
-
-### Related ###
-
-If you're okay relying on the string format of the current runtime stacktrace 
-including a unique goroutine id (not guaranteed by the spec or anything, but 
-very unlikely to change within a Go release), you might be able to squeeze 
-out a bit more performance by using this similar library, inspired by some 
-code Brad Fitzpatrick wrote for debugging his HTTP/2 library: 
-https://github.com/tylerb/gls (in contrast, jtolds/gls doesn't require 
-any knowledge of the string format of the runtime stacktrace, which 
-probably adds unnecessary overhead).
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/context.go b/Godeps/_workspace/src/github.com/jtolds/gls/context.go
deleted file mode 100644
index 90cfcf7db1..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/context.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Package gls implements goroutine-local storage.
-package gls
-
-import (
-	"sync"
-)
-
-const (
-	maxCallers = 64
-)
-
-var (
-	stackTagPool   = &idPool{}
-	mgrRegistry    = make(map[*ContextManager]bool)
-	mgrRegistryMtx sync.RWMutex
-)
-
-// Values is simply a map of key types to value types. Used by SetValues to
-// set multiple values at once.
-type Values map[interface{}]interface{}
-
-// ContextManager is the main entrypoint for interacting with
-// Goroutine-local-storage. You can have multiple independent ContextManagers
-// at any given time. ContextManagers are usually declared globally for a given
-// class of context variables. You should use NewContextManager for
-// construction.
-type ContextManager struct {
-	mtx    sync.RWMutex
-	values map[uint]Values
-}
-
-// NewContextManager returns a brand new ContextManager. It also registers the
-// new ContextManager in the ContextManager registry which is used by the Go
-// method. ContextManagers are typically defined globally at package scope.
-func NewContextManager() *ContextManager {
-	mgr := &ContextManager{values: make(map[uint]Values)}
-	mgrRegistryMtx.Lock()
-	defer mgrRegistryMtx.Unlock()
-	mgrRegistry[mgr] = true
-	return mgr
-}
-
-// Unregister removes a ContextManager from the global registry, used by the
-// Go method. Only intended for use when you're completely done with a
-// ContextManager. Use of Unregister at all is rare.
-func (m *ContextManager) Unregister() {
-	mgrRegistryMtx.Lock()
-	defer mgrRegistryMtx.Unlock()
-	delete(mgrRegistry, m)
-}
-
-// SetValues takes a collection of values and a function to call for those
-// values to be set in. Anything further down the stack will have the set
-// values available through GetValue. SetValues will add new values or replace
-// existing values of the same key and will not mutate or change values for
-// previous stack frames.
-// SetValues is slow (makes a copy of all current and new values for the new
-// gls-context) in order to reduce the amount of lookups GetValue requires.
-func (m *ContextManager) SetValues(new_values Values, context_call func()) {
-	if len(new_values) == 0 {
-		context_call()
-		return
-	}
-
-	tags := readStackTags(1)
-
-	m.mtx.Lock()
-	values := new_values
-	for _, tag := range tags {
-		if existing_values, ok := m.values[tag]; ok {
-			// oh, we found existing values, let's make a copy
-			values = make(Values, len(existing_values)+len(new_values))
-			for key, val := range existing_values {
-				values[key] = val
-			}
-			for key, val := range new_values {
-				values[key] = val
-			}
-			break
-		}
-	}
-	new_tag := stackTagPool.Acquire()
-	m.values[new_tag] = values
-	m.mtx.Unlock()
-	defer func() {
-		m.mtx.Lock()
-		delete(m.values, new_tag)
-		m.mtx.Unlock()
-		stackTagPool.Release(new_tag)
-	}()
-
-	addStackTag(new_tag, context_call)
-}
-
-// GetValue will return a previously set value, provided that the value was set
-// by SetValues somewhere higher up the stack. If the value is not found, ok
-// will be false.
-func (m *ContextManager) GetValue(key interface{}) (value interface{}, ok bool) {
-
-	tags := readStackTags(1)
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-	for _, tag := range tags {
-		if values, ok := m.values[tag]; ok {
-			value, ok := values[key]
-			return value, ok
-		}
-	}
-	return "", false
-}
-
-func (m *ContextManager) getValues() Values {
-	tags := readStackTags(2)
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-	for _, tag := range tags {
-		if values, ok := m.values[tag]; ok {
-			return values
-		}
-	}
-	return nil
-}
-
-// Go preserves ContextManager values and Goroutine-local-storage across new
-// goroutine invocations. The Go method makes a copy of all existing values on
-// all registered context managers and makes sure they are still set after
-// kicking off the provided function in a new goroutine. If you don't use this
-// Go method instead of the standard 'go' keyword, you will lose values in
-// ContextManagers, as goroutines have brand new stacks.
-func Go(cb func()) {
-	mgrRegistryMtx.RLock()
-	defer mgrRegistryMtx.RUnlock()
-
-	for mgr, _ := range mgrRegistry {
-		values := mgr.getValues()
-		if len(values) > 0 {
-			mgr_copy := mgr
-			cb_copy := cb
-			cb = func() { mgr_copy.SetValues(values, cb_copy) }
-		}
-	}
-
-	go cb()
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go b/Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go
deleted file mode 100644
index 8d5fc24d4a..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/gen_sym.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package gls
-
-var (
-	symPool = &idPool{}
-)
-
-// ContextKey is a throwaway value you can use as a key to a ContextManager
-type ContextKey struct{ id uint }
-
-// GenSym will return a brand new, never-before-used ContextKey
-func GenSym() ContextKey {
-	return ContextKey{id: symPool.Acquire()}
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go b/Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go
deleted file mode 100644
index b7974ae002..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/id_pool.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package gls
-
-// though this could probably be better at keeping ids smaller, the goal of
-// this class is to keep a registry of the smallest unique integer ids
-// per-process possible
-
-import (
-	"sync"
-)
-
-type idPool struct {
-	mtx      sync.Mutex
-	released []uint
-	max_id   uint
-}
-
-func (p *idPool) Acquire() (id uint) {
-	p.mtx.Lock()
-	defer p.mtx.Unlock()
-	if len(p.released) > 0 {
-		id = p.released[len(p.released)-1]
-		p.released = p.released[:len(p.released)-1]
-		return id
-	}
-	id = p.max_id
-	p.max_id++
-	return id
-}
-
-func (p *idPool) Release(id uint) {
-	p.mtx.Lock()
-	defer p.mtx.Unlock()
-	p.released = append(p.released, id)
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go
deleted file mode 100644
index 9b8e39ba7c..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package gls
-
-// so, basically, we're going to encode integer tags in base-16 on the stack
-
-const (
-	bitWidth = 4
-)
-
-func addStackTag(tag uint, context_call func()) {
-	if context_call == nil {
-		return
-	}
-	markS(tag, context_call)
-}
-
-func markS(tag uint, cb func()) { _m(tag, cb) }
-func mark0(tag uint, cb func()) { _m(tag, cb) }
-func mark1(tag uint, cb func()) { _m(tag, cb) }
-func mark2(tag uint, cb func()) { _m(tag, cb) }
-func mark3(tag uint, cb func()) { _m(tag, cb) }
-func mark4(tag uint, cb func()) { _m(tag, cb) }
-func mark5(tag uint, cb func()) { _m(tag, cb) }
-func mark6(tag uint, cb func()) { _m(tag, cb) }
-func mark7(tag uint, cb func()) { _m(tag, cb) }
-func mark8(tag uint, cb func()) { _m(tag, cb) }
-func mark9(tag uint, cb func()) { _m(tag, cb) }
-func markA(tag uint, cb func()) { _m(tag, cb) }
-func markB(tag uint, cb func()) { _m(tag, cb) }
-func markC(tag uint, cb func()) { _m(tag, cb) }
-func markD(tag uint, cb func()) { _m(tag, cb) }
-func markE(tag uint, cb func()) { _m(tag, cb) }
-func markF(tag uint, cb func()) { _m(tag, cb) }
-
-var pc_lookup = make(map[uintptr]int8, 17)
-var mark_lookup [16]func(uint, func())
-
-func _m(tag_remainder uint, cb func()) {
-	if tag_remainder == 0 {
-		cb()
-	} else {
-		mark_lookup[tag_remainder&0xf](tag_remainder>>bitWidth, cb)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go
deleted file mode 100644
index 21d5595926..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_js.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// +build js
-
-package gls
-
-// This file is used for GopherJS builds, which don't have normal runtime support
-
-import (
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/gopherjs/gopherjs/js"
-)
-
-var stackRE = regexp.MustCompile("\\s+at (\\S*) \\([^:]+:(\\d+):(\\d+)")
-
-func findPtr() uintptr {
-	jsStack := js.Global.Get("Error").New().Get("stack").Call("split", "\n")
-	for i := 1; i < jsStack.Get("length").Int(); i++ {
-		item := jsStack.Index(i).String()
-		matches := stackRE.FindAllStringSubmatch(item, -1)
-		if matches == nil {
-			return 0
-		}
-		pkgPath := matches[0][1]
-		if strings.HasPrefix(pkgPath, "$packages.github.com/jtolds/gls.mark") {
-			line, _ := strconv.Atoi(matches[0][2])
-			char, _ := strconv.Atoi(matches[0][3])
-			x := (uintptr(line) << 16) | uintptr(char)
-			return x
-		}
-	}
-
-	return 0
-}
-
-func init() {
-	setEntries := func(f func(uint, func()), v int8) {
-		var ptr uintptr
-		f(0, func() {
-			ptr = findPtr()
-		})
-		pc_lookup[ptr] = v
-		if v >= 0 {
-			mark_lookup[v] = f
-		}
-	}
-	setEntries(markS, -0x1)
-	setEntries(mark0, 0x0)
-	setEntries(mark1, 0x1)
-	setEntries(mark2, 0x2)
-	setEntries(mark3, 0x3)
-	setEntries(mark4, 0x4)
-	setEntries(mark5, 0x5)
-	setEntries(mark6, 0x6)
-	setEntries(mark7, 0x7)
-	setEntries(mark8, 0x8)
-	setEntries(mark9, 0x9)
-	setEntries(markA, 0xa)
-	setEntries(markB, 0xb)
-	setEntries(markC, 0xc)
-	setEntries(markD, 0xd)
-	setEntries(markE, 0xe)
-	setEntries(markF, 0xf)
-}
-
-func currentStack(skip int) (stack []uintptr) {
-	jsStack := js.Global.Get("Error").New().Get("stack").Call("split", "\n")
-	for i := skip + 2; i < jsStack.Get("length").Int(); i++ {
-		item := jsStack.Index(i).String()
-		matches := stackRE.FindAllStringSubmatch(item, -1)
-		if matches == nil {
-			return stack
-		}
-		line, _ := strconv.Atoi(matches[0][2])
-		char, _ := strconv.Atoi(matches[0][3])
-		x := (uintptr(line) << 16) | uintptr(char)&0xffff
-		stack = append(stack, x)
-	}
-
-	return stack
-}
-
-func readStackTags(skip int) (tags []uint) {
-	stack := currentStack(skip)
-	var current_tag uint
-	for _, pc := range stack {
-		val, ok := pc_lookup[pc]
-		if !ok {
-			continue
-		}
-		if val < 0 {
-			tags = append(tags, current_tag)
-			current_tag = 0
-			continue
-		}
-		current_tag <<= bitWidth
-		current_tag += uint(val)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go b/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go
deleted file mode 100644
index cb302b9ef6..0000000000
--- a/Godeps/_workspace/src/github.com/jtolds/gls/stack_tags_main.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// +build !js
-
-package gls
-
-// This file is used for standard Go builds, which have the expected runtime support
-
-import (
-	"reflect"
-	"runtime"
-)
-
-func init() {
-	setEntries := func(f func(uint, func()), v int8) {
-		pc_lookup[reflect.ValueOf(f).Pointer()] = v
-		if v >= 0 {
-			mark_lookup[v] = f
-		}
-	}
-	setEntries(markS, -0x1)
-	setEntries(mark0, 0x0)
-	setEntries(mark1, 0x1)
-	setEntries(mark2, 0x2)
-	setEntries(mark3, 0x3)
-	setEntries(mark4, 0x4)
-	setEntries(mark5, 0x5)
-	setEntries(mark6, 0x6)
-	setEntries(mark7, 0x7)
-	setEntries(mark8, 0x8)
-	setEntries(mark9, 0x9)
-	setEntries(markA, 0xa)
-	setEntries(markB, 0xb)
-	setEntries(markC, 0xc)
-	setEntries(markD, 0xd)
-	setEntries(markE, 0xe)
-	setEntries(markF, 0xf)
-}
-
-func currentStack(skip int) []uintptr {
-	stack := make([]uintptr, maxCallers)
-	return stack[:runtime.Callers(3+skip, stack)]
-}
-
-func readStackTags(skip int) (tags []uint) {
-	stack := currentStack(skip)
-	var current_tag uint
-	for _, pc := range stack {
-		pc = runtime.FuncForPC(pc).Entry()
-		val, ok := pc_lookup[pc]
-		if !ok {
-			continue
-		}
-		if val < 0 {
-			tags = append(tags, current_tag)
-			current_tag = 0
-			continue
-		}
-		current_tag <<= bitWidth
-		current_tag += uint(val)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
index 975b75c072..f7cf4c3649 100644
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
@@ -121,7 +121,7 @@ func Info() ([]InfoStat, error) {
 				return ret, err
 			}
 			c.CPU = int32(t)
-		case "vendorId", "vendor_id":
+		case "vendorId":
 			c.VendorID = value
 		case "cpu family":
 			c.Family = value
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
index 4b69224340..2b9d6854ee 100644
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
@@ -20,7 +20,6 @@ type Process struct {
 	Pid            int32 `json:"pid"`
 	name           string
 	status         string
-	parent         int32
 	numCtxSwitches *NumCtxSwitchesStat
 	uids           []int32
 	gids           []int32
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
index ae300412c2..e79ba36edd 100644
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -56,7 +57,6 @@ type MemoryMapsStat struct {
 	Swap         uint64 `json:"swap"`
 }
 
-// String returns JSON value of the process.
 func (m MemoryMapsStat) String() string {
 	s, _ := json.Marshal(m)
 	return string(s)
@@ -75,7 +75,6 @@ func NewProcess(pid int32) (*Process, error) {
 	return p, err
 }
 
-// Ppid returns Parent Process ID of the process.
 func (p *Process) Ppid() (int32, error) {
 	_, ppid, _, _, _, err := p.fillFromStat()
 	if err != nil {
@@ -83,8 +82,6 @@ func (p *Process) Ppid() (int32, error) {
 	}
 	return ppid, nil
 }
-
-// Name returns name of the process.
 func (p *Process) Name() (string, error) {
 	if p.name == "" {
 		if err := p.fillFromStatus(); err != nil {
@@ -93,8 +90,6 @@ func (p *Process) Name() (string, error) {
 	}
 	return p.name, nil
 }
-
-// Exe returns executable path of the process.
 func (p *Process) Exe() (string, error) {
 	return p.fillFromExe()
 }
@@ -111,7 +106,6 @@ func (p *Process) CmdlineSlice() ([]string, error) {
 	return p.fillSliceFromCmdline()
 }
 
-// CreateTime returns created time of the process in seconds since the epoch, in UTC.
 func (p *Process) CreateTime() (int64, error) {
 	_, _, _, createTime, _, err := p.fillFromStat()
 	if err != nil {
@@ -120,28 +114,23 @@ func (p *Process) CreateTime() (int64, error) {
 	return createTime, nil
 }
 
-// Cwd returns current working directory of the process.
 func (p *Process) Cwd() (string, error) {
 	return p.fillFromCwd()
 }
-
-// Parent returns parent Process of the process.
 func (p *Process) Parent() (*Process, error) {
-	err := p.fillFromStatus()
+	r, err := callLsof("R", p.Pid)
 	if err != nil {
 		return nil, err
 	}
-	if p.parent == 0 {
+	if len(r) != 1 { // TODO: pid 1
 		return nil, fmt.Errorf("wrong number of parents")
 	}
-	return NewProcess(p.parent)
+	v, err := strconv.Atoi(r[0])
+	if err != nil {
+		return nil, err
+	}
+	return NewProcess(int32(v))
 }
-
-// Status returns the process status.
-// Return value could be one of these.
-// R: Running S: Sleep T: Stop I: Idle
-// Z: Zombie W: Wait L: Lock
-// The charactor is same within all supported platforms.
 func (p *Process) Status() (string, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -149,8 +138,6 @@ func (p *Process) Status() (string, error) {
 	}
 	return p.status, nil
 }
-
-// Uids returns user ids of the process as a slice of the int
 func (p *Process) Uids() ([]int32, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -158,8 +145,6 @@ func (p *Process) Uids() ([]int32, error) {
 	}
 	return p.uids, nil
 }
-
-// Gids returns group ids of the process as a slice of the int
 func (p *Process) Gids() ([]int32, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -167,8 +152,6 @@ func (p *Process) Gids() ([]int32, error) {
 	}
 	return p.gids, nil
 }
-
-// Terminal returns a terminal which is associated with the process.
 func (p *Process) Terminal() (string, error) {
 	terminal, _, _, _, _, err := p.fillFromStat()
 	if err != nil {
@@ -176,9 +159,6 @@ func (p *Process) Terminal() (string, error) {
 	}
 	return terminal, nil
 }
-
-// Nice returns a nice value (priority).
-// Notice: gopsutil can not set nice value.
 func (p *Process) Nice() (int32, error) {
 	_, _, _, _, nice, err := p.fillFromStat()
 	if err != nil {
@@ -186,23 +166,15 @@ func (p *Process) Nice() (int32, error) {
 	}
 	return nice, nil
 }
-
-// IOnice returns process I/O nice value (priority).
 func (p *Process) IOnice() (int32, error) {
 	return 0, common.ErrNotImplementedError
 }
-
-// Rlimit returns Resource Limits.
 func (p *Process) Rlimit() ([]RlimitStat, error) {
 	return nil, common.ErrNotImplementedError
 }
-
-// IOCounters returns IO Counters.
 func (p *Process) IOCounters() (*IOCountersStat, error) {
 	return p.fillFromIO()
 }
-
-// NumCtxSwitches returns the number of the context switches of the process.
 func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -210,14 +182,10 @@ func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
 	}
 	return p.numCtxSwitches, nil
 }
-
-// NumFDs returns the number of File Descriptors used by the process.
 func (p *Process) NumFDs() (int32, error) {
 	numFds, _, err := p.fillFromfd()
 	return numFds, err
 }
-
-// NumThreads returns the number of threads used by the process.
 func (p *Process) NumThreads() (int32, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -225,16 +193,10 @@ func (p *Process) NumThreads() (int32, error) {
 	}
 	return p.numThreads, nil
 }
-
-// Threads returns a map of threads
-//
-// Notice: Not implemented yet. always returns empty map.
 func (p *Process) Threads() (map[string]string, error) {
 	ret := make(map[string]string, 0)
 	return ret, nil
 }
-
-// Times returns CPU times of the process.
 func (p *Process) Times() (*cpu.TimesStat, error) {
 	_, _, cpuTimes, _, _, err := p.fillFromStat()
 	if err != nil {
@@ -242,15 +204,9 @@ func (p *Process) Times() (*cpu.TimesStat, error) {
 	}
 	return cpuTimes, nil
 }
-
-// CPUAffinity returns CPU affinity of the process.
-//
-// Notice: Not implemented yet.
 func (p *Process) CPUAffinity() ([]int32, error) {
 	return nil, common.ErrNotImplementedError
 }
-
-// MemoryInfo returns platform in-dependend memory information, such as RSS, VMS and Swap
 func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
 	meminfo, _, err := p.fillFromStatm()
 	if err != nil {
@@ -258,8 +214,6 @@ func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
 	}
 	return meminfo, nil
 }
-
-// MemoryInfoEx returns platform dependend memory information.
 func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
 	_, memInfoEx, err := p.fillFromStatm()
 	if err != nil {
@@ -268,7 +222,6 @@ func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
 	return memInfoEx, nil
 }
 
-// Children returns a slice of Process of the process.
 func (p *Process) Children() ([]*Process, error) {
 	pids, err := common.CallPgrep(invoke, p.Pid)
 	if err != nil {
@@ -288,8 +241,6 @@ func (p *Process) Children() ([]*Process, error) {
 	return ret, nil
 }
 
-// OpenFiles returns a slice of OpenFilesStat opend by the process.
-// OpenFilesStat includes a file path and file descriptor.
 func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
 	_, ofs, err := p.fillFromfd()
 	if err != nil {
@@ -303,20 +254,15 @@ func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
 	return ret, nil
 }
 
-// Connections returns a slice of net.ConnectionStat used by the process.
-// This returns all kind of the connection. This measn TCP, UDP or UNIX.
 func (p *Process) Connections() ([]net.ConnectionStat, error) {
 	return net.ConnectionsPid("all", p.Pid)
 }
 
-// NetIOCounters returns NetIOCounters of the process.
 func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
 	filename := common.HostProc(strconv.Itoa(int(p.Pid)), "net/dev")
 	return net.IOCountersByFile(pernic, filename)
 }
 
-// IsRunning returns whether the process is running or not.
-// Not implemented yet.
 func (p *Process) IsRunning() (bool, error) {
 	return true, common.ErrNotImplementedError
 }
@@ -611,12 +557,6 @@ func (p *Process) fillFromStatus() error {
 			p.name = strings.Trim(value, " \t")
 		case "State":
 			p.status = value[0:1]
-		case "PPid", "Ppid":
-			pval, err := strconv.ParseInt(value, 10, 32)
-			if err != nil {
-				return err
-			}
-			p.parent = int32(pval)
 		case "Uid":
 			p.uids = make([]int32, 0, 4)
 			for _, i := range strings.Split(value, "\t") {
@@ -740,7 +680,6 @@ func (p *Process) fillFromStat() (string, int32, *cpu.TimesStat, int64, int32, e
 	return terminal, int32(ppid), cpuTimes, createTime, nice, nil
 }
 
-// Pids returns a slice of process ID list which are running now.
 func Pids() ([]int32, error) {
 	var ret []int32
 
@@ -765,3 +704,30 @@ func Pids() ([]int32, error) {
 
 	return ret, nil
 }
+
+func callLsof(arg string, pid int32) ([]string, error) {
+	var cmd []string
+	if pid == 0 { // will get from all processes.
+		cmd = []string{"-F" + arg}
+	} else {
+		cmd = []string{"-a", "-F" + arg, "-p", strconv.Itoa(int(pid))}
+	}
+	lsof, err := exec.LookPath("lsof")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := invoke.Command(lsof, cmd...)
+	if err != nil {
+		return []string{}, err
+	}
+	lines := strings.Split(string(out), "\n")
+
+	var ret []string
+	for _, l := range lines[1:] {
+		if strings.HasPrefix(l, arg) {
+			ret = append(ret, l[1:]) // delete first char
+		}
+	}
+
+	return ret, nil
+}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
index 8853118ac6..92353b8c5d 100644
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
@@ -51,8 +51,6 @@ func getTerminalMap() (map[uint64]string, error) {
 	return ret, nil
 }
 
-// SendSignal sends a syscall.Signal to the process.
-// Currently, SIGSTOP, SIGCONT, SIGTERM and SIGKILL are supported.
 func (p *Process) SendSignal(sig syscall.Signal) error {
 	sigAsStr := "INT"
 	switch sig {
@@ -80,27 +78,18 @@ func (p *Process) SendSignal(sig syscall.Signal) error {
 	return nil
 }
 
-// Suspend sends SIGSTOP to the process.
 func (p *Process) Suspend() error {
 	return p.SendSignal(syscall.SIGSTOP)
 }
-
-// Resume sends SIGCONT to the process.
 func (p *Process) Resume() error {
 	return p.SendSignal(syscall.SIGCONT)
 }
-
-// Terminate sends SIGTERM to the process.
 func (p *Process) Terminate() error {
 	return p.SendSignal(syscall.SIGTERM)
 }
-
-// Kill sends SIGKILL to the process.
 func (p *Process) Kill() error {
 	return p.SendSignal(syscall.SIGKILL)
 }
-
-// Username returns a username of the process.
 func (p *Process) Username() (string, error) {
 	uids, err := p.Uids()
 	if err != nil {
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore b/Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore
deleted file mode 100644
index 6ad551742d..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.DS_Store
-Thumbs.db
-/.idea
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml b/Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml
deleted file mode 100644
index 44217c9733..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: go
-
-go:
-  - 1.2
-  - 1.3
-  - 1.4
-  - 1.5
-
-install:
-  - go get -t ./...
-
-script: go test -v
-
-sudo: false
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md
deleted file mode 100644
index 1820ecb331..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/CONTRIBUTING.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Contributing
-
-In general, the code posted to the [SmartyStreets github organization](https://github.com/smartystreets) is created to solve specific problems at SmartyStreets that are ancillary to our core products in the address verification industry and may or may not be useful to other organizations or developers. Our reason for posting said code isn't necessarily to solicit feedback or contributions from the community but more as a showcase of some of the approaches to solving problems we have adopted.
-
-Having stated that, we do consider issues raised by other githubbers as well as contributions submitted via pull requests. When submitting such a pull request, please follow these guidelines:
-
-- _Look before you leap:_ If the changes you plan to make are significant, it's in everyone's best interest for you to discuss them with a SmartyStreets team member prior to opening a pull request.
-- _License and ownership:_ If modifying the `LICENSE.md` file, limit your changes to fixing typographical mistakes. Do NOT modify the actual terms in the license or the copyright by **SmartyStreets, LLC**. Code submitted to SmartyStreets projects becomes property of SmartyStreets and must be compatible with the associated license.
-- _Testing:_ If the code you are submitting resides in packages/modules covered by automated tests, be sure to add passing tests that cover your changes and assert expected behavior and state. Submit the additional test cases as part of your change set.
-- _Style:_ Match your approach to **naming** and **formatting** with the surrounding code. Basically, the code you submit shouldn't stand out.
-  - "Naming" refers to such constructs as variables, methods, functions, classes, structs, interfaces, packages, modules, directories, files, etc...
-  - "Formatting" refers to such constructs as whitespace, horizontal line length, vertical function length, vertical file length, indentation, curly braces, etc...
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md
deleted file mode 100644
index 8ea6f94552..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/LICENSE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2016 SmartyStreets, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
-
-NOTE: Various optional and subordinate components carry their own licensing
-requirements and restrictions.  Use of those components is subject to the terms
-and conditions outlined the respective license of each component.
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/README.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/README.md
deleted file mode 100644
index 58383bb00a..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/README.md
+++ /dev/null
@@ -1,575 +0,0 @@
-# assertions
---
-    import "github.com/smartystreets/assertions"
-
-Package assertions contains the implementations for all assertions which are
-referenced in goconvey's `convey` package
-(github.com/smartystreets/goconvey/convey) and gunit
-(github.com/smartystreets/gunit) for use with the So(...) method. They can also
-be used in traditional Go test functions and even in applications.
-
-Many of the assertions lean heavily on work done by Aaron Jacobs in his
-excellent oglematchers library. (https://github.com/jacobsa/oglematchers) The
-ShouldResemble assertion leans heavily on work done by Daniel Jacques in his
-very helpful go-render library. (https://github.com/luci/go-render)
-
-## Usage
-
-#### func  GoConveyMode
-
-```go
-func GoConveyMode(yes bool)
-```
-GoConveyMode provides control over JSON serialization of failures. When using
-the assertions in this package from the convey package JSON results are very
-helpful and can be rendered in a DIFF view. In that case, this function will be
-called with a true value to enable the JSON serialization. By default, the
-assertions in this package will not serializer a JSON result, making standalone
-ussage more convenient.
-
-#### func  ShouldAlmostEqual
-
-```go
-func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldAlmostEqual makes sure that two parameters are close enough to being
-equal. The acceptable delta may be specified with a third argument, or a very
-small default delta will be used.
-
-#### func  ShouldBeBetween
-
-```go
-func ShouldBeBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldBeBetween receives exactly three parameters: an actual value, a lower
-bound, and an upper bound. It ensures that the actual value is between both
-bounds (but not equal to either of them).
-
-#### func  ShouldBeBetweenOrEqual
-
-```go
-func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldBeBetweenOrEqual receives exactly three parameters: an actual value, a
-lower bound, and an upper bound. It ensures that the actual value is between
-both bounds or equal to one of them.
-
-#### func  ShouldBeBlank
-
-```go
-func ShouldBeBlank(actual interface{}, expected ...interface{}) string
-```
-ShouldBeBlank receives exactly 1 string parameter and ensures that it is equal
-to "".
-
-#### func  ShouldBeChronological
-
-```go
-func ShouldBeChronological(actual interface{}, expected ...interface{}) string
-```
-ShouldBeChronological receives a []time.Time slice and asserts that the are in
-chronological order starting with the first time.Time as the earliest.
-
-#### func  ShouldBeEmpty
-
-```go
-func ShouldBeEmpty(actual interface{}, expected ...interface{}) string
-```
-ShouldBeEmpty receives a single parameter (actual) and determines whether or not
-calling len(actual) would return `0`. It obeys the rules specified by the len
-function for determining length: http://golang.org/pkg/builtin/#len
-
-#### func  ShouldBeFalse
-
-```go
-func ShouldBeFalse(actual interface{}, expected ...interface{}) string
-```
-ShouldBeFalse receives a single parameter and ensures that it is false.
-
-#### func  ShouldBeGreaterThan
-
-```go
-func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string
-```
-ShouldBeGreaterThan receives exactly two parameters and ensures that the first
-is greater than the second.
-
-#### func  ShouldBeGreaterThanOrEqualTo
-
-```go
-func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) string
-```
-ShouldBeGreaterThanOrEqualTo receives exactly two parameters and ensures that
-the first is greater than or equal to the second.
-
-#### func  ShouldBeIn
-
-```go
-func ShouldBeIn(actual interface{}, expected ...interface{}) string
-```
-ShouldBeIn receives at least 2 parameters. The first is a proposed member of the
-collection that is passed in either as the second parameter, or of the
-collection that is comprised of all the remaining parameters. This assertion
-ensures that the proposed member is in the collection (using ShouldEqual).
-
-#### func  ShouldBeLessThan
-
-```go
-func ShouldBeLessThan(actual interface{}, expected ...interface{}) string
-```
-ShouldBeLessThan receives exactly two parameters and ensures that the first is
-less than the second.
-
-#### func  ShouldBeLessThanOrEqualTo
-
-```go
-func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) string
-```
-ShouldBeLessThan receives exactly two parameters and ensures that the first is
-less than or equal to the second.
-
-#### func  ShouldBeNil
-
-```go
-func ShouldBeNil(actual interface{}, expected ...interface{}) string
-```
-ShouldBeNil receives a single parameter and ensures that it is nil.
-
-#### func  ShouldBeTrue
-
-```go
-func ShouldBeTrue(actual interface{}, expected ...interface{}) string
-```
-ShouldBeTrue receives a single parameter and ensures that it is true.
-
-#### func  ShouldBeZeroValue
-
-```go
-func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string
-```
-ShouldBeZeroValue receives a single parameter and ensures that it is the Go
-equivalent of the default value, or "zero" value.
-
-#### func  ShouldContain
-
-```go
-func ShouldContain(actual interface{}, expected ...interface{}) string
-```
-ShouldContain receives exactly two parameters. The first is a slice and the
-second is a proposed member. Membership is determined using ShouldEqual.
-
-#### func  ShouldContainKey
-
-```go
-func ShouldContainKey(actual interface{}, expected ...interface{}) string
-```
-ShouldContainKey receives exactly two parameters. The first is a map and the
-second is a proposed key. Keys are compared with a simple '=='.
-
-#### func  ShouldContainSubstring
-
-```go
-func ShouldContainSubstring(actual interface{}, expected ...interface{}) string
-```
-ShouldContainSubstring receives exactly 2 string parameters and ensures that the
-first contains the second as a substring.
-
-#### func  ShouldEndWith
-
-```go
-func ShouldEndWith(actual interface{}, expected ...interface{}) string
-```
-ShouldEndWith receives exactly 2 string parameters and ensures that the first
-ends with the second.
-
-#### func  ShouldEqual
-
-```go
-func ShouldEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldEqual receives exactly two parameters and does an equality check.
-
-#### func  ShouldEqualTrimSpace
-
-```go
-func ShouldEqualTrimSpace(actual interface{}, expected ...interface{}) string
-```
-ShouldEqualTrimSpace receives exactly 2 string parameters and ensures that the
-first is equal to the second after removing all leading and trailing whitespace
-using strings.TrimSpace(first).
-
-#### func  ShouldEqualWithout
-
-```go
-func ShouldEqualWithout(actual interface{}, expected ...interface{}) string
-```
-ShouldEqualWithout receives exactly 3 string parameters and ensures that the
-first is equal to the second after removing all instances of the third from the
-first using strings.Replace(first, third, "", -1).
-
-#### func  ShouldHappenAfter
-
-```go
-func ShouldHappenAfter(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenAfter receives exactly 2 time.Time arguments and asserts that the
-first happens after the second.
-
-#### func  ShouldHappenBefore
-
-```go
-func ShouldHappenBefore(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenBefore receives exactly 2 time.Time arguments and asserts that the
-first happens before the second.
-
-#### func  ShouldHappenBetween
-
-```go
-func ShouldHappenBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenBetween receives exactly 3 time.Time arguments and asserts that the
-first happens between (not on) the second and third.
-
-#### func  ShouldHappenOnOrAfter
-
-```go
-func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenOnOrAfter receives exactly 2 time.Time arguments and asserts that
-the first happens on or after the second.
-
-#### func  ShouldHappenOnOrBefore
-
-```go
-func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenOnOrBefore receives exactly 2 time.Time arguments and asserts that
-the first happens on or before the second.
-
-#### func  ShouldHappenOnOrBetween
-
-```go
-func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that
-the first happens between or on the second and third.
-
-#### func  ShouldHappenWithin
-
-```go
-func ShouldHappenWithin(actual interface{}, expected ...interface{}) string
-```
-ShouldHappenWithin receives a time.Time, a time.Duration, and a time.Time (3
-arguments) and asserts that the first time.Time happens within or on the
-duration specified relative to the other time.Time.
-
-#### func  ShouldHaveLength
-
-```go
-func ShouldHaveLength(actual interface{}, expected ...interface{}) string
-```
-ShouldHaveLength receives 2 parameters. The first is a collection to check the
-length of, the second being the expected length. It obeys the rules specified by
-the len function for determining length: http://golang.org/pkg/builtin/#len
-
-#### func  ShouldHaveSameTypeAs
-
-```go
-func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string
-```
-ShouldHaveSameTypeAs receives exactly two parameters and compares their
-underlying types for equality.
-
-#### func  ShouldImplement
-
-```go
-func ShouldImplement(actual interface{}, expectedList ...interface{}) string
-```
-ShouldImplement receives exactly two parameters and ensures that the first
-implements the interface type of the second.
-
-#### func  ShouldNotAlmostEqual
-
-```go
-func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldNotAlmostEqual is the inverse of ShouldAlmostEqual
-
-#### func  ShouldNotBeBetween
-
-```go
-func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeBetween receives exactly three parameters: an actual value, a lower
-bound, and an upper bound. It ensures that the actual value is NOT between both
-bounds.
-
-#### func  ShouldNotBeBetweenOrEqual
-
-```go
-func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeBetweenOrEqual receives exactly three parameters: an actual value, a
-lower bound, and an upper bound. It ensures that the actual value is nopt
-between the bounds nor equal to either of them.
-
-#### func  ShouldNotBeBlank
-
-```go
-func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeBlank receives exactly 1 string parameter and ensures that it is
-equal to "".
-
-#### func  ShouldNotBeEmpty
-
-```go
-func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeEmpty receives a single parameter (actual) and determines whether or
-not calling len(actual) would return a value greater than zero. It obeys the
-rules specified by the `len` function for determining length:
-http://golang.org/pkg/builtin/#len
-
-#### func  ShouldNotBeIn
-
-```go
-func ShouldNotBeIn(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeIn receives at least 2 parameters. The first is a proposed member of
-the collection that is passed in either as the second parameter, or of the
-collection that is comprised of all the remaining parameters. This assertion
-ensures that the proposed member is NOT in the collection (using ShouldEqual).
-
-#### func  ShouldNotBeNil
-
-```go
-func ShouldNotBeNil(actual interface{}, expected ...interface{}) string
-```
-ShouldNotBeNil receives a single parameter and ensures that it is not nil.
-
-#### func  ShouldNotContain
-
-```go
-func ShouldNotContain(actual interface{}, expected ...interface{}) string
-```
-ShouldNotContain receives exactly two parameters. The first is a slice and the
-second is a proposed member. Membership is determinied using ShouldEqual.
-
-#### func  ShouldNotContainKey
-
-```go
-func ShouldNotContainKey(actual interface{}, expected ...interface{}) string
-```
-ShouldNotContainKey receives exactly two parameters. The first is a map and the
-second is a proposed absent key. Keys are compared with a simple '=='.
-
-#### func  ShouldNotContainSubstring
-
-```go
-func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) string
-```
-ShouldNotContainSubstring receives exactly 2 string parameters and ensures that
-the first does NOT contain the second as a substring.
-
-#### func  ShouldNotEndWith
-
-```go
-func ShouldNotEndWith(actual interface{}, expected ...interface{}) string
-```
-ShouldEndWith receives exactly 2 string parameters and ensures that the first
-does not end with the second.
-
-#### func  ShouldNotEqual
-
-```go
-func ShouldNotEqual(actual interface{}, expected ...interface{}) string
-```
-ShouldNotEqual receives exactly two parameters and does an inequality check.
-
-#### func  ShouldNotHappenOnOrBetween
-
-```go
-func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) string
-```
-ShouldNotHappenOnOrBetween receives exactly 3 time.Time arguments and asserts
-that the first does NOT happen between or on the second or third.
-
-#### func  ShouldNotHappenWithin
-
-```go
-func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string
-```
-ShouldNotHappenWithin receives a time.Time, a time.Duration, and a time.Time (3
-arguments) and asserts that the first time.Time does NOT happen within or on the
-duration specified relative to the other time.Time.
-
-#### func  ShouldNotHaveSameTypeAs
-
-```go
-func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string
-```
-ShouldNotHaveSameTypeAs receives exactly two parameters and compares their
-underlying types for inequality.
-
-#### func  ShouldNotImplement
-
-```go
-func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string
-```
-ShouldNotImplement receives exactly two parameters and ensures that the first
-does NOT implement the interface type of the second.
-
-#### func  ShouldNotPanic
-
-```go
-func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string)
-```
-ShouldNotPanic receives a void, niladic function and expects to execute the
-function without any panic.
-
-#### func  ShouldNotPanicWith
-
-```go
-func ShouldNotPanicWith(actual interface{}, expected ...interface{}) (message string)
-```
-ShouldNotPanicWith receives a void, niladic function and expects to recover a
-panic whose content differs from the second argument.
-
-#### func  ShouldNotPointTo
-
-```go
-func ShouldNotPointTo(actual interface{}, expected ...interface{}) string
-```
-ShouldNotPointTo receives exactly two parameters and checks to see that they
-point to different addresess.
-
-#### func  ShouldNotResemble
-
-```go
-func ShouldNotResemble(actual interface{}, expected ...interface{}) string
-```
-ShouldNotResemble receives exactly two parameters and does an inverse deep equal
-check (see reflect.DeepEqual)
-
-#### func  ShouldNotStartWith
-
-```go
-func ShouldNotStartWith(actual interface{}, expected ...interface{}) string
-```
-ShouldNotStartWith receives exactly 2 string parameters and ensures that the
-first does not start with the second.
-
-#### func  ShouldPanic
-
-```go
-func ShouldPanic(actual interface{}, expected ...interface{}) (message string)
-```
-ShouldPanic receives a void, niladic function and expects to recover a panic.
-
-#### func  ShouldPanicWith
-
-```go
-func ShouldPanicWith(actual interface{}, expected ...interface{}) (message string)
-```
-ShouldPanicWith receives a void, niladic function and expects to recover a panic
-with the second argument as the content.
-
-#### func  ShouldPointTo
-
-```go
-func ShouldPointTo(actual interface{}, expected ...interface{}) string
-```
-ShouldPointTo receives exactly two parameters and checks to see that they point
-to the same address.
-
-#### func  ShouldResemble
-
-```go
-func ShouldResemble(actual interface{}, expected ...interface{}) string
-```
-ShouldResemble receives exactly two parameters and does a deep equal check (see
-reflect.DeepEqual)
-
-#### func  ShouldStartWith
-
-```go
-func ShouldStartWith(actual interface{}, expected ...interface{}) string
-```
-ShouldStartWith receives exactly 2 string parameters and ensures that the first
-starts with the second.
-
-#### func  So
-
-```go
-func So(actual interface{}, assert assertion, expected ...interface{}) (bool, string)
-```
-So is a convenience function (as opposed to an inconvenience function?) for
-running assertions on arbitrary arguments in any context, be it for testing or
-even application logging. It allows you to perform assertion-like behavior (and
-get nicely formatted messages detailing discrepancies) but without the program
-blowing up or panicking. All that is required is to import this package and call
-`So` with one of the assertions exported by this package as the second
-parameter. The first return parameter is a boolean indicating if the assertion
-was true. The second return parameter is the well-formatted message showing why
-an assertion was incorrect, or blank if the assertion was correct.
-
-Example:
-
-    if ok, message := So(x, ShouldBeGreaterThan, y); !ok {
-         log.Println(message)
-    }
-
-#### type Assertion
-
-```go
-type Assertion struct {
-}
-```
-
-
-#### func  New
-
-```go
-func New(t testingT) *Assertion
-```
-New swallows the *testing.T struct and prints failed assertions using t.Error.
-Example: assertions.New(t).So(1, should.Equal, 1)
-
-#### func (*Assertion) Failed
-
-```go
-func (this *Assertion) Failed() bool
-```
-Failed reports whether any calls to So (on this Assertion instance) have failed.
-
-#### func (*Assertion) So
-
-```go
-func (this *Assertion) So(actual interface{}, assert assertion, expected ...interface{}) bool
-```
-So calls the standalone So function and additionally, calls t.Error in failure
-scenarios.
-
-#### type FailureView
-
-```go
-type FailureView struct {
-	Message  string `json:"Message"`
-	Expected string `json:"Expected"`
-	Actual   string `json:"Actual"`
-}
-```
-
-This struct is also declared in
-github.com/smartystreets/goconvey/convey/reporting. The json struct tags should
-be equal in both declarations.
-
-#### type Serializer
-
-```go
-type Serializer interface {
-	// contains filtered or unexported methods
-}
-```
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey b/Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey
deleted file mode 100644
index e76cf275d4..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/assertions.goconvey
+++ /dev/null
@@ -1,3 +0,0 @@
-#ignore
--timeout=1s
--coverpkg=github.com/smartystreets/assertions,github.com/smartystreets/assertions/internal/oglematchers
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go
deleted file mode 100644
index d7f407e913..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/collections.go
+++ /dev/null
@@ -1,244 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/smartystreets/assertions/internal/oglematchers"
-)
-
-// ShouldContain receives exactly two parameters. The first is a slice and the
-// second is a proposed member. Membership is determined using ShouldEqual.
-func ShouldContain(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	if matchError := oglematchers.Contains(expected[0]).Matches(actual); matchError != nil {
-		typeName := reflect.TypeOf(actual)
-
-		if fmt.Sprintf("%v", matchError) == "which is not a slice or array" {
-			return fmt.Sprintf(shouldHaveBeenAValidCollection, typeName)
-		}
-		return fmt.Sprintf(shouldHaveContained, typeName, expected[0])
-	}
-	return success
-}
-
-// ShouldNotContain receives exactly two parameters. The first is a slice and the
-// second is a proposed member. Membership is determinied using ShouldEqual.
-func ShouldNotContain(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	typeName := reflect.TypeOf(actual)
-
-	if matchError := oglematchers.Contains(expected[0]).Matches(actual); matchError != nil {
-		if fmt.Sprintf("%v", matchError) == "which is not a slice or array" {
-			return fmt.Sprintf(shouldHaveBeenAValidCollection, typeName)
-		}
-		return success
-	}
-	return fmt.Sprintf(shouldNotHaveContained, typeName, expected[0])
-}
-
-// ShouldContainKey receives exactly two parameters. The first is a map and the
-// second is a proposed key. Keys are compared with a simple '=='.
-func ShouldContainKey(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	keys, isMap := mapKeys(actual)
-	if !isMap {
-		return fmt.Sprintf(shouldHaveBeenAValidMap, reflect.TypeOf(actual))
-	}
-
-	if !keyFound(keys, expected[0]) {
-		return fmt.Sprintf(shouldHaveContainedKey, reflect.TypeOf(actual), expected)
-	}
-
-	return ""
-}
-
-// ShouldNotContainKey receives exactly two parameters. The first is a map and the
-// second is a proposed absent key. Keys are compared with a simple '=='.
-func ShouldNotContainKey(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	keys, isMap := mapKeys(actual)
-	if !isMap {
-		return fmt.Sprintf(shouldHaveBeenAValidMap, reflect.TypeOf(actual))
-	}
-
-	if keyFound(keys, expected[0]) {
-		return fmt.Sprintf(shouldNotHaveContainedKey, reflect.TypeOf(actual), expected)
-	}
-
-	return ""
-}
-
-func mapKeys(m interface{}) ([]reflect.Value, bool) {
-	value := reflect.ValueOf(m)
-	if value.Kind() != reflect.Map {
-		return nil, false
-	}
-	return value.MapKeys(), true
-}
-func keyFound(keys []reflect.Value, expectedKey interface{}) bool {
-	found := false
-	for _, key := range keys {
-		if key.Interface() == expectedKey {
-			found = true
-		}
-	}
-	return found
-}
-
-// ShouldBeIn receives at least 2 parameters. The first is a proposed member of the collection
-// that is passed in either as the second parameter, or of the collection that is comprised
-// of all the remaining parameters. This assertion ensures that the proposed member is in
-// the collection (using ShouldEqual).
-func ShouldBeIn(actual interface{}, expected ...interface{}) string {
-	if fail := atLeast(1, expected); fail != success {
-		return fail
-	}
-
-	if len(expected) == 1 {
-		return shouldBeIn(actual, expected[0])
-	}
-	return shouldBeIn(actual, expected)
-}
-func shouldBeIn(actual interface{}, expected interface{}) string {
-	if matchError := oglematchers.Contains(actual).Matches(expected); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenIn, actual, reflect.TypeOf(expected))
-	}
-	return success
-}
-
-// ShouldNotBeIn receives at least 2 parameters. The first is a proposed member of the collection
-// that is passed in either as the second parameter, or of the collection that is comprised
-// of all the remaining parameters. This assertion ensures that the proposed member is NOT in
-// the collection (using ShouldEqual).
-func ShouldNotBeIn(actual interface{}, expected ...interface{}) string {
-	if fail := atLeast(1, expected); fail != success {
-		return fail
-	}
-
-	if len(expected) == 1 {
-		return shouldNotBeIn(actual, expected[0])
-	}
-	return shouldNotBeIn(actual, expected)
-}
-func shouldNotBeIn(actual interface{}, expected interface{}) string {
-	if matchError := oglematchers.Contains(actual).Matches(expected); matchError == nil {
-		return fmt.Sprintf(shouldNotHaveBeenIn, actual, reflect.TypeOf(expected))
-	}
-	return success
-}
-
-// ShouldBeEmpty receives a single parameter (actual) and determines whether or not
-// calling len(actual) would return `0`. It obeys the rules specified by the len
-// function for determining length: http://golang.org/pkg/builtin/#len
-func ShouldBeEmpty(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	if actual == nil {
-		return success
-	}
-
-	value := reflect.ValueOf(actual)
-	switch value.Kind() {
-	case reflect.Slice:
-		if value.Len() == 0 {
-			return success
-		}
-	case reflect.Chan:
-		if value.Len() == 0 {
-			return success
-		}
-	case reflect.Map:
-		if value.Len() == 0 {
-			return success
-		}
-	case reflect.String:
-		if value.Len() == 0 {
-			return success
-		}
-	case reflect.Ptr:
-		elem := value.Elem()
-		kind := elem.Kind()
-		if (kind == reflect.Slice || kind == reflect.Array) && elem.Len() == 0 {
-			return success
-		}
-	}
-
-	return fmt.Sprintf(shouldHaveBeenEmpty, actual)
-}
-
-// ShouldNotBeEmpty receives a single parameter (actual) and determines whether or not
-// calling len(actual) would return a value greater than zero. It obeys the rules
-// specified by the `len` function for determining length: http://golang.org/pkg/builtin/#len
-func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	if empty := ShouldBeEmpty(actual, expected...); empty != success {
-		return success
-	}
-	return fmt.Sprintf(shouldNotHaveBeenEmpty, actual)
-}
-
-// ShouldHaveLength receives 2 parameters. The first is a collection to check
-// the length of, the second being the expected length. It obeys the rules
-// specified by the len function for determining length:
-// http://golang.org/pkg/builtin/#len
-func ShouldHaveLength(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	var expectedLen int64
-	lenValue := reflect.ValueOf(expected[0])
-	switch lenValue.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		expectedLen = lenValue.Int()
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		expectedLen = int64(lenValue.Uint())
-	default:
-		return fmt.Sprintf(shouldHaveBeenAValidInteger, reflect.TypeOf(expected[0]))
-	}
-
-	if expectedLen < 0 {
-		return fmt.Sprintf(shouldHaveBeenAValidLength, expected[0])
-	}
-
-	value := reflect.ValueOf(actual)
-	switch value.Kind() {
-	case reflect.Slice,
-		reflect.Chan,
-		reflect.Map,
-		reflect.String:
-		if int64(value.Len()) == expectedLen {
-			return success
-		} else {
-			return fmt.Sprintf(shouldHaveHadLength, actual, value.Len(), expectedLen)
-		}
-	case reflect.Ptr:
-		elem := value.Elem()
-		kind := elem.Kind()
-		if kind == reflect.Slice || kind == reflect.Array {
-			if int64(elem.Len()) == expectedLen {
-				return success
-			} else {
-				return fmt.Sprintf(shouldHaveHadLength, actual, elem.Len(), expectedLen)
-			}
-		}
-	}
-	return fmt.Sprintf(shouldHaveBeenAValidCollection, reflect.TypeOf(actual))
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go
deleted file mode 100644
index 5720fc298c..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/doc.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Package assertions contains the implementations for all assertions which
-// are referenced in goconvey's `convey` package
-// (github.com/smartystreets/goconvey/convey) and gunit (github.com/smartystreets/gunit)
-// for use with the So(...) method.
-// They can also be used in traditional Go test functions and even in
-// applications.
-//
-// Many of the assertions lean heavily on work done by Aaron Jacobs in his excellent oglematchers library.
-// (https://github.com/jacobsa/oglematchers)
-// The ShouldResemble assertion leans heavily on work done by Daniel Jacques in his very helpful go-render library.
-// (https://github.com/luci/go-render)
-package assertions
-
-import (
-	"fmt"
-	"runtime"
-)
-
-// By default we use a no-op serializer. The actual Serializer provides a JSON
-// representation of failure results on selected assertions so the goconvey
-// web UI can display a convenient diff.
-var serializer Serializer = new(noopSerializer)
-
-// GoConveyMode provides control over JSON serialization of failures. When
-// using the assertions in this package from the convey package JSON results
-// are very helpful and can be rendered in a DIFF view. In that case, this function
-// will be called with a true value to enable the JSON serialization. By default,
-// the assertions in this package will not serializer a JSON result, making
-// standalone ussage more convenient.
-func GoConveyMode(yes bool) {
-	if yes {
-		serializer = newSerializer()
-	} else {
-		serializer = new(noopSerializer)
-	}
-}
-
-type testingT interface {
-	Error(args ...interface{})
-}
-
-type Assertion struct {
-	t      testingT
-	failed bool
-}
-
-// New swallows the *testing.T struct and prints failed assertions using t.Error.
-// Example: assertions.New(t).So(1, should.Equal, 1)
-func New(t testingT) *Assertion {
-	return &Assertion{t: t}
-}
-
-// Failed reports whether any calls to So (on this Assertion instance) have failed.
-func (this *Assertion) Failed() bool {
-	return this.failed
-}
-
-// So calls the standalone So function and additionally, calls t.Error in failure scenarios.
-func (this *Assertion) So(actual interface{}, assert assertion, expected ...interface{}) bool {
-	ok, result := So(actual, assert, expected...)
-	if !ok {
-		this.failed = true
-		_, file, line, _ := runtime.Caller(1)
-		this.t.Error(fmt.Sprintf("\n%s:%d\n%s", file, line, result))
-	}
-	return ok
-}
-
-// So is a convenience function (as opposed to an inconvenience function?)
-// for running assertions on arbitrary arguments in any context, be it for testing or even
-// application logging. It allows you to perform assertion-like behavior (and get nicely
-// formatted messages detailing discrepancies) but without the program blowing up or panicking.
-// All that is required is to import this package and call `So` with one of the assertions
-// exported by this package as the second parameter.
-// The first return parameter is a boolean indicating if the assertion was true. The second
-// return parameter is the well-formatted message showing why an assertion was incorrect, or
-// blank if the assertion was correct.
-//
-// Example:
-//
-//   if ok, message := So(x, ShouldBeGreaterThan, y); !ok {
-//        log.Println(message)
-//   }
-//
-func So(actual interface{}, assert assertion, expected ...interface{}) (bool, string) {
-	if result := so(actual, assert, expected...); len(result) == 0 {
-		return true, result
-	} else {
-		return false, result
-	}
-}
-
-// so is like So, except that it only returns the string message, which is blank if the
-// assertion passed. Used to facilitate testing.
-func so(actual interface{}, assert func(interface{}, ...interface{}) string, expected ...interface{}) string {
-	return assert(actual, expected...)
-}
-
-// assertion is an alias for a function with a signature that the So()
-// function can handle. Any future or custom assertions should conform to this
-// method signature. The return value should be an empty string if the assertion
-// passes and a well-formed failure message if not.
-type assertion func(actual interface{}, expected ...interface{}) string
-
-////////////////////////////////////////////////////////////////////////////
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go
deleted file mode 100644
index 2b6049c37d..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/equality.go
+++ /dev/null
@@ -1,280 +0,0 @@
-package assertions
-
-import (
-	"errors"
-	"fmt"
-	"math"
-	"reflect"
-	"strings"
-
-	"github.com/smartystreets/assertions/internal/oglematchers"
-	"github.com/smartystreets/assertions/internal/go-render/render"
-)
-
-// default acceptable delta for ShouldAlmostEqual
-const defaultDelta = 0.0000000001
-
-// ShouldEqual receives exactly two parameters and does an equality check.
-func ShouldEqual(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	}
-	return shouldEqual(actual, expected[0])
-}
-func shouldEqual(actual, expected interface{}) (message string) {
-	defer func() {
-		if r := recover(); r != nil {
-			message = serializer.serialize(expected, actual, fmt.Sprintf(shouldHaveBeenEqual, expected, actual))
-			return
-		}
-	}()
-
-	if matchError := oglematchers.Equals(expected).Matches(actual); matchError != nil {
-		expectedSyntax := fmt.Sprintf("%v", expected)
-		actualSyntax := fmt.Sprintf("%v", actual)
-		if expectedSyntax == actualSyntax && reflect.TypeOf(expected) != reflect.TypeOf(actual) {
-			message = fmt.Sprintf(shouldHaveBeenEqualTypeMismatch, expected, expected, actual, actual)
-		} else {
-			message = fmt.Sprintf(shouldHaveBeenEqual, expected, actual)
-		}
-		message = serializer.serialize(expected, actual, message)
-		return
-	}
-
-	return success
-}
-
-// ShouldNotEqual receives exactly two parameters and does an inequality check.
-func ShouldNotEqual(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	} else if ShouldEqual(actual, expected[0]) == success {
-		return fmt.Sprintf(shouldNotHaveBeenEqual, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldAlmostEqual makes sure that two parameters are close enough to being equal.
-// The acceptable delta may be specified with a third argument,
-// or a very small default delta will be used.
-func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string {
-	actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...)
-
-	if err != "" {
-		return err
-	}
-
-	if math.Abs(actualFloat-expectedFloat) <= deltaFloat {
-		return success
-	} else {
-		return fmt.Sprintf(shouldHaveBeenAlmostEqual, actualFloat, expectedFloat)
-	}
-}
-
-// ShouldNotAlmostEqual is the inverse of ShouldAlmostEqual
-func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string {
-	actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...)
-
-	if err != "" {
-		return err
-	}
-
-	if math.Abs(actualFloat-expectedFloat) > deltaFloat {
-		return success
-	} else {
-		return fmt.Sprintf(shouldHaveNotBeenAlmostEqual, actualFloat, expectedFloat)
-	}
-}
-
-func cleanAlmostEqualInput(actual interface{}, expected ...interface{}) (float64, float64, float64, string) {
-	deltaFloat := 0.0000000001
-
-	if len(expected) == 0 {
-		return 0.0, 0.0, 0.0, "This assertion requires exactly one comparison value and an optional delta (you provided neither)"
-	} else if len(expected) == 2 {
-		delta, err := getFloat(expected[1])
-
-		if err != nil {
-			return 0.0, 0.0, 0.0, "delta must be a numerical type"
-		}
-
-		deltaFloat = delta
-	} else if len(expected) > 2 {
-		return 0.0, 0.0, 0.0, "This assertion requires exactly one comparison value and an optional delta (you provided more values)"
-	}
-
-	actualFloat, err := getFloat(actual)
-
-	if err != nil {
-		return 0.0, 0.0, 0.0, err.Error()
-	}
-
-	expectedFloat, err := getFloat(expected[0])
-
-	if err != nil {
-		return 0.0, 0.0, 0.0, err.Error()
-	}
-
-	return actualFloat, expectedFloat, deltaFloat, ""
-}
-
-// returns the float value of any real number, or error if it is not a numerical type
-func getFloat(num interface{}) (float64, error) {
-	numValue := reflect.ValueOf(num)
-	numKind := numValue.Kind()
-
-	if numKind == reflect.Int ||
-		numKind == reflect.Int8 ||
-		numKind == reflect.Int16 ||
-		numKind == reflect.Int32 ||
-		numKind == reflect.Int64 {
-		return float64(numValue.Int()), nil
-	} else if numKind == reflect.Uint ||
-		numKind == reflect.Uint8 ||
-		numKind == reflect.Uint16 ||
-		numKind == reflect.Uint32 ||
-		numKind == reflect.Uint64 {
-		return float64(numValue.Uint()), nil
-	} else if numKind == reflect.Float32 ||
-		numKind == reflect.Float64 {
-		return numValue.Float(), nil
-	} else {
-		return 0.0, errors.New("must be a numerical type, but was " + numKind.String())
-	}
-}
-
-// ShouldResemble receives exactly two parameters and does a deep equal check (see reflect.DeepEqual)
-func ShouldResemble(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	}
-
-	if matchError := oglematchers.DeepEquals(expected[0]).Matches(actual); matchError != nil {
-		return serializer.serializeDetailed(expected[0], actual,
-			fmt.Sprintf(shouldHaveResembled, render.Render(expected[0]), render.Render(actual)))
-	}
-
-	return success
-}
-
-// ShouldNotResemble receives exactly two parameters and does an inverse deep equal check (see reflect.DeepEqual)
-func ShouldNotResemble(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	} else if ShouldResemble(actual, expected[0]) == success {
-		return fmt.Sprintf(shouldNotHaveResembled, render.Render(actual), render.Render(expected[0]))
-	}
-	return success
-}
-
-// ShouldPointTo receives exactly two parameters and checks to see that they point to the same address.
-func ShouldPointTo(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	}
-	return shouldPointTo(actual, expected[0])
-
-}
-func shouldPointTo(actual, expected interface{}) string {
-	actualValue := reflect.ValueOf(actual)
-	expectedValue := reflect.ValueOf(expected)
-
-	if ShouldNotBeNil(actual) != success {
-		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "first", "nil")
-	} else if ShouldNotBeNil(expected) != success {
-		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "second", "nil")
-	} else if actualValue.Kind() != reflect.Ptr {
-		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "first", "not")
-	} else if expectedValue.Kind() != reflect.Ptr {
-		return fmt.Sprintf(shouldHaveBeenNonNilPointer, "second", "not")
-	} else if ShouldEqual(actualValue.Pointer(), expectedValue.Pointer()) != success {
-		actualAddress := reflect.ValueOf(actual).Pointer()
-		expectedAddress := reflect.ValueOf(expected).Pointer()
-		return serializer.serialize(expectedAddress, actualAddress, fmt.Sprintf(shouldHavePointedTo,
-			actual, actualAddress,
-			expected, expectedAddress))
-	}
-	return success
-}
-
-// ShouldNotPointTo receives exactly two parameters and checks to see that they point to different addresess.
-func ShouldNotPointTo(actual interface{}, expected ...interface{}) string {
-	if message := need(1, expected); message != success {
-		return message
-	}
-	compare := ShouldPointTo(actual, expected[0])
-	if strings.HasPrefix(compare, shouldBePointers) {
-		return compare
-	} else if compare == success {
-		return fmt.Sprintf(shouldNotHavePointedTo, actual, expected[0], reflect.ValueOf(actual).Pointer())
-	}
-	return success
-}
-
-// ShouldBeNil receives a single parameter and ensures that it is nil.
-func ShouldBeNil(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	} else if actual == nil {
-		return success
-	} else if interfaceHasNilValue(actual) {
-		return success
-	}
-	return fmt.Sprintf(shouldHaveBeenNil, actual)
-}
-func interfaceHasNilValue(actual interface{}) bool {
-	value := reflect.ValueOf(actual)
-	kind := value.Kind()
-	nilable := kind == reflect.Slice ||
-		kind == reflect.Chan ||
-		kind == reflect.Func ||
-		kind == reflect.Ptr ||
-		kind == reflect.Map
-
-	// Careful: reflect.Value.IsNil() will panic unless it's an interface, chan, map, func, slice, or ptr
-	// Reference: http://golang.org/pkg/reflect/#Value.IsNil
-	return nilable && value.IsNil()
-}
-
-// ShouldNotBeNil receives a single parameter and ensures that it is not nil.
-func ShouldNotBeNil(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	} else if ShouldBeNil(actual) == success {
-		return fmt.Sprintf(shouldNotHaveBeenNil, actual)
-	}
-	return success
-}
-
-// ShouldBeTrue receives a single parameter and ensures that it is true.
-func ShouldBeTrue(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	} else if actual != true {
-		return fmt.Sprintf(shouldHaveBeenTrue, actual)
-	}
-	return success
-}
-
-// ShouldBeFalse receives a single parameter and ensures that it is false.
-func ShouldBeFalse(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	} else if actual != false {
-		return fmt.Sprintf(shouldHaveBeenFalse, actual)
-	}
-	return success
-}
-
-// ShouldBeZeroValue receives a single parameter and ensures that it is
-// the Go equivalent of the default value, or "zero" value.
-func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-	zeroVal := reflect.Zero(reflect.TypeOf(actual)).Interface()
-	if !reflect.DeepEqual(zeroVal, actual) {
-		return serializer.serialize(zeroVal, actual, fmt.Sprintf(shouldHaveBeenZeroValue, actual))
-	}
-	return success
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go
deleted file mode 100644
index ee368a97ed..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/filter.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package assertions
-
-import "fmt"
-
-const (
-	success                = ""
-	needExactValues        = "This assertion requires exactly %d comparison values (you provided %d)."
-	needNonEmptyCollection = "This assertion requires at least 1 comparison value (you provided 0)."
-)
-
-func need(needed int, expected []interface{}) string {
-	if len(expected) != needed {
-		return fmt.Sprintf(needExactValues, needed, len(expected))
-	}
-	return success
-}
-
-func atLeast(minimum int, expected []interface{}) string {
-	if len(expected) < 1 {
-		return needNonEmptyCollection
-	}
-	return success
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go
deleted file mode 100644
index 23b7a58676..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/go-render/render/render.go
+++ /dev/null
@@ -1,477 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package render
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"sort"
-	"strconv"
-)
-
-var builtinTypeMap = map[reflect.Kind]string{
-	reflect.Bool:       "bool",
-	reflect.Complex128: "complex128",
-	reflect.Complex64:  "complex64",
-	reflect.Float32:    "float32",
-	reflect.Float64:    "float64",
-	reflect.Int16:      "int16",
-	reflect.Int32:      "int32",
-	reflect.Int64:      "int64",
-	reflect.Int8:       "int8",
-	reflect.Int:        "int",
-	reflect.String:     "string",
-	reflect.Uint16:     "uint16",
-	reflect.Uint32:     "uint32",
-	reflect.Uint64:     "uint64",
-	reflect.Uint8:      "uint8",
-	reflect.Uint:       "uint",
-	reflect.Uintptr:    "uintptr",
-}
-
-var builtinTypeSet = map[string]struct{}{}
-
-func init() {
-	for _, v := range builtinTypeMap {
-		builtinTypeSet[v] = struct{}{}
-	}
-}
-
-var typeOfString = reflect.TypeOf("")
-var typeOfInt = reflect.TypeOf(int(1))
-var typeOfUint = reflect.TypeOf(uint(1))
-var typeOfFloat = reflect.TypeOf(10.1)
-
-// Render converts a structure to a string representation. Unline the "%#v"
-// format string, this resolves pointer types' contents in structs, maps, and
-// slices/arrays and prints their field values.
-func Render(v interface{}) string {
-	buf := bytes.Buffer{}
-	s := (*traverseState)(nil)
-	s.render(&buf, 0, reflect.ValueOf(v), false)
-	return buf.String()
-}
-
-// renderPointer is called to render a pointer value.
-//
-// This is overridable so that the test suite can have deterministic pointer
-// values in its expectations.
-var renderPointer = func(buf *bytes.Buffer, p uintptr) {
-	fmt.Fprintf(buf, "0x%016x", p)
-}
-
-// traverseState is used to note and avoid recursion as struct members are being
-// traversed.
-//
-// traverseState is allowed to be nil. Specifically, the root state is nil.
-type traverseState struct {
-	parent *traverseState
-	ptr    uintptr
-}
-
-func (s *traverseState) forkFor(ptr uintptr) *traverseState {
-	for cur := s; cur != nil; cur = cur.parent {
-		if ptr == cur.ptr {
-			return nil
-		}
-	}
-
-	fs := &traverseState{
-		parent: s,
-		ptr:    ptr,
-	}
-	return fs
-}
-
-func (s *traverseState) render(buf *bytes.Buffer, ptrs int, v reflect.Value, implicit bool) {
-	if v.Kind() == reflect.Invalid {
-		buf.WriteString("nil")
-		return
-	}
-	vt := v.Type()
-
-	// If the type being rendered is a potentially recursive type (a type that
-	// can contain itself as a member), we need to avoid recursion.
-	//
-	// If we've already seen this type before, mark that this is the case and
-	// write a recursion placeholder instead of actually rendering it.
-	//
-	// If we haven't seen it before, fork our `seen` tracking so any higher-up
-	// renderers will also render it at least once, then mark that we've seen it
-	// to avoid recursing on lower layers.
-	pe := uintptr(0)
-	vk := vt.Kind()
-	switch vk {
-	case reflect.Ptr:
-		// Since structs and arrays aren't pointers, they can't directly be
-		// recursed, but they can contain pointers to themselves. Record their
-		// pointer to avoid this.
-		switch v.Elem().Kind() {
-		case reflect.Struct, reflect.Array:
-			pe = v.Pointer()
-		}
-
-	case reflect.Slice, reflect.Map:
-		pe = v.Pointer()
-	}
-	if pe != 0 {
-		s = s.forkFor(pe)
-		if s == nil {
-			buf.WriteString("<REC(")
-			if !implicit {
-				writeType(buf, ptrs, vt)
-			}
-			buf.WriteString(")>")
-			return
-		}
-	}
-
-	isAnon := func(t reflect.Type) bool {
-		if t.Name() != "" {
-			if _, ok := builtinTypeSet[t.Name()]; !ok {
-				return false
-			}
-		}
-		return t.Kind() != reflect.Interface
-	}
-
-	switch vk {
-	case reflect.Struct:
-		if !implicit {
-			writeType(buf, ptrs, vt)
-		}
-		structAnon := vt.Name() == ""
-		buf.WriteRune('{')
-		for i := 0; i < vt.NumField(); i++ {
-			if i > 0 {
-				buf.WriteString(", ")
-			}
-			anon := structAnon && isAnon(vt.Field(i).Type)
-
-			if !anon {
-				buf.WriteString(vt.Field(i).Name)
-				buf.WriteRune(':')
-			}
-
-			s.render(buf, 0, v.Field(i), anon)
-		}
-		buf.WriteRune('}')
-
-	case reflect.Slice:
-		if v.IsNil() {
-			if !implicit {
-				writeType(buf, ptrs, vt)
-				buf.WriteString("(nil)")
-			} else {
-				buf.WriteString("nil")
-			}
-			return
-		}
-		fallthrough
-
-	case reflect.Array:
-		if !implicit {
-			writeType(buf, ptrs, vt)
-		}
-		anon := vt.Name() == "" && isAnon(vt.Elem())
-		buf.WriteString("{")
-		for i := 0; i < v.Len(); i++ {
-			if i > 0 {
-				buf.WriteString(", ")
-			}
-
-			s.render(buf, 0, v.Index(i), anon)
-		}
-		buf.WriteRune('}')
-
-	case reflect.Map:
-		if !implicit {
-			writeType(buf, ptrs, vt)
-		}
-		if v.IsNil() {
-			buf.WriteString("(nil)")
-		} else {
-			buf.WriteString("{")
-
-			mkeys := v.MapKeys()
-			tryAndSortMapKeys(vt, mkeys)
-
-			kt := vt.Key()
-			keyAnon := typeOfString.ConvertibleTo(kt) || typeOfInt.ConvertibleTo(kt) || typeOfUint.ConvertibleTo(kt) || typeOfFloat.ConvertibleTo(kt)
-			valAnon := vt.Name() == "" && isAnon(vt.Elem())
-			for i, mk := range mkeys {
-				if i > 0 {
-					buf.WriteString(", ")
-				}
-
-				s.render(buf, 0, mk, keyAnon)
-				buf.WriteString(":")
-				s.render(buf, 0, v.MapIndex(mk), valAnon)
-			}
-			buf.WriteRune('}')
-		}
-
-	case reflect.Ptr:
-		ptrs++
-		fallthrough
-	case reflect.Interface:
-		if v.IsNil() {
-			writeType(buf, ptrs, v.Type())
-			buf.WriteString("(nil)")
-		} else {
-			s.render(buf, ptrs, v.Elem(), false)
-		}
-
-	case reflect.Chan, reflect.Func, reflect.UnsafePointer:
-		writeType(buf, ptrs, vt)
-		buf.WriteRune('(')
-		renderPointer(buf, v.Pointer())
-		buf.WriteRune(')')
-
-	default:
-		tstr := vt.String()
-		implicit = implicit || (ptrs == 0 && builtinTypeMap[vk] == tstr)
-		if !implicit {
-			writeType(buf, ptrs, vt)
-			buf.WriteRune('(')
-		}
-
-		switch vk {
-		case reflect.String:
-			fmt.Fprintf(buf, "%q", v.String())
-		case reflect.Bool:
-			fmt.Fprintf(buf, "%v", v.Bool())
-
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			fmt.Fprintf(buf, "%d", v.Int())
-
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			fmt.Fprintf(buf, "%d", v.Uint())
-
-		case reflect.Float32, reflect.Float64:
-			fmt.Fprintf(buf, "%g", v.Float())
-
-		case reflect.Complex64, reflect.Complex128:
-			fmt.Fprintf(buf, "%g", v.Complex())
-		}
-
-		if !implicit {
-			buf.WriteRune(')')
-		}
-	}
-}
-
-func writeType(buf *bytes.Buffer, ptrs int, t reflect.Type) {
-	parens := ptrs > 0
-	switch t.Kind() {
-	case reflect.Chan, reflect.Func, reflect.UnsafePointer:
-		parens = true
-	}
-
-	if parens {
-		buf.WriteRune('(')
-		for i := 0; i < ptrs; i++ {
-			buf.WriteRune('*')
-		}
-	}
-
-	switch t.Kind() {
-	case reflect.Ptr:
-		if ptrs == 0 {
-			// This pointer was referenced from within writeType (e.g., as part of
-			// rendering a list), and so hasn't had its pointer asterisk accounted
-			// for.
-			buf.WriteRune('*')
-		}
-		writeType(buf, 0, t.Elem())
-
-	case reflect.Interface:
-		if n := t.Name(); n != "" {
-			buf.WriteString(t.String())
-		} else {
-			buf.WriteString("interface{}")
-		}
-
-	case reflect.Array:
-		buf.WriteRune('[')
-		buf.WriteString(strconv.FormatInt(int64(t.Len()), 10))
-		buf.WriteRune(']')
-		writeType(buf, 0, t.Elem())
-
-	case reflect.Slice:
-		if t == reflect.SliceOf(t.Elem()) {
-			buf.WriteString("[]")
-			writeType(buf, 0, t.Elem())
-		} else {
-			// Custom slice type, use type name.
-			buf.WriteString(t.String())
-		}
-
-	case reflect.Map:
-		if t == reflect.MapOf(t.Key(), t.Elem()) {
-			buf.WriteString("map[")
-			writeType(buf, 0, t.Key())
-			buf.WriteRune(']')
-			writeType(buf, 0, t.Elem())
-		} else {
-			// Custom map type, use type name.
-			buf.WriteString(t.String())
-		}
-
-	default:
-		buf.WriteString(t.String())
-	}
-
-	if parens {
-		buf.WriteRune(')')
-	}
-}
-
-type cmpFn func(a, b reflect.Value) int
-
-type sortableValueSlice struct {
-	cmp      cmpFn
-	elements []reflect.Value
-}
-
-func (s sortableValueSlice) Len() int {
-	return len(s.elements)
-}
-
-func (s sortableValueSlice) Less(i, j int) bool {
-	return s.cmp(s.elements[i], s.elements[j]) < 0
-}
-
-func (s sortableValueSlice) Swap(i, j int) {
-	s.elements[i], s.elements[j] = s.elements[j], s.elements[i]
-}
-
-// cmpForType returns a cmpFn which sorts the data for some type t in the same
-// order that a go-native map key is compared for equality.
-func cmpForType(t reflect.Type) cmpFn {
-	switch t.Kind() {
-	case reflect.String:
-		return func(av, bv reflect.Value) int {
-			a, b := av.String(), bv.String()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Bool:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Bool(), bv.Bool()
-			if !a && b {
-				return -1
-			} else if a && !b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Int(), bv.Int()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32,
-		reflect.Uint64, reflect.Uintptr, reflect.UnsafePointer:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Uint(), bv.Uint()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Float32, reflect.Float64:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Float(), bv.Float()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Interface:
-		return func(av, bv reflect.Value) int {
-			a, b := av.InterfaceData(), bv.InterfaceData()
-			if a[0] < b[0] {
-				return -1
-			} else if a[0] > b[0] {
-				return 1
-			}
-			if a[1] < b[1] {
-				return -1
-			} else if a[1] > b[1] {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Complex64, reflect.Complex128:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Complex(), bv.Complex()
-			if real(a) < real(b) {
-				return -1
-			} else if real(a) > real(b) {
-				return 1
-			}
-			if imag(a) < imag(b) {
-				return -1
-			} else if imag(a) > imag(b) {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Ptr, reflect.Chan:
-		return func(av, bv reflect.Value) int {
-			a, b := av.Pointer(), bv.Pointer()
-			if a < b {
-				return -1
-			} else if a > b {
-				return 1
-			}
-			return 0
-		}
-
-	case reflect.Struct:
-		cmpLst := make([]cmpFn, t.NumField())
-		for i := range cmpLst {
-			cmpLst[i] = cmpForType(t.Field(i).Type)
-		}
-		return func(a, b reflect.Value) int {
-			for i, cmp := range cmpLst {
-				if rslt := cmp(a.Field(i), b.Field(i)); rslt != 0 {
-					return rslt
-				}
-			}
-			return 0
-		}
-	}
-
-	return nil
-}
-
-func tryAndSortMapKeys(mt reflect.Type, k []reflect.Value) {
-	if cmp := cmpForType(mt.Key()); cmp != nil {
-		sort.Sort(sortableValueSlice{cmp, k})
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore
deleted file mode 100644
index dd8fc7468f..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.6
-6.out
-_obj/
-_test/
-_testmain.go
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml
deleted file mode 100644
index b97211926e..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cf. http://docs.travis-ci.com/user/getting-started/
-# Cf. http://docs.travis-ci.com/user/languages/go/
-
-language: go
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md
deleted file mode 100644
index 215a2bb7a8..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-[![GoDoc](https://godoc.org/github.com/smartystreets/assertions/internal/oglematchers?status.svg)](https://godoc.org/github.com/smartystreets/assertions/internal/oglematchers)
-
-`oglematchers` is a package for the Go programming language containing a set of
-matchers, useful in a testing or mocking framework, inspired by and mostly
-compatible with [Google Test][googletest] for C++ and
-[Google JS Test][google-js-test]. The package is used by the
-[ogletest][ogletest] testing framework and [oglemock][oglemock] mocking
-framework, which may be more directly useful to you, but can be generically used
-elsewhere as well.
-
-A "matcher" is simply an object with a `Matches` method defining a set of golang
-values matched by the matcher, and a `Description` method describing that set.
-For example, here are some matchers:
-
-```go
-// Numbers
-Equals(17.13)
-LessThan(19)
-
-// Strings
-Equals("taco")
-HasSubstr("burrito")
-MatchesRegex("t.*o")
-
-// Combining matchers
-AnyOf(LessThan(17), GreaterThan(19))
-```
-
-There are lots more; see [here][reference] for a reference. You can also add
-your own simply by implementing the `oglematchers.Matcher` interface.
-
-
-Installation
-------------
-
-First, make sure you have installed Go 1.0.2 or newer. See
-[here][golang-install] for instructions.
-
-Use the following command to install `oglematchers` and keep it up to date:
-
-    go get -u github.com/smartystreets/assertions/internal/oglematchers
-
-
-Documentation
--------------
-
-See [here][reference] for documentation. Alternatively, you can install the
-package and then use `godoc`:
-
-    godoc github.com/smartystreets/assertions/internal/oglematchers
-
-
-[reference]: http://godoc.org/github.com/smartystreets/assertions/internal/oglematchers
-[golang-install]: http://golang.org/doc/install.html
-[googletest]: http://code.google.com/p/googletest/
-[google-js-test]: http://code.google.com/p/google-js-test/
-[ogletest]: http://github.com/smartystreets/assertions/internal/ogletest
-[oglemock]: http://github.com/smartystreets/assertions/internal/oglemock
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go
deleted file mode 100644
index d93a974044..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/all_of.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"strings"
-)
-
-// AllOf accepts a set of matchers S and returns a matcher that follows the
-// algorithm below when considering a candidate c:
-//
-//  1. Return true if for every Matcher m in S, m matches c.
-//
-//  2. Otherwise, if there is a matcher m in S such that m returns a fatal
-//     error for c, return that matcher's error message.
-//
-//  3. Otherwise, return false with the error from some wrapped matcher.
-//
-// This is akin to a logical AND operation for matchers.
-func AllOf(matchers ...Matcher) Matcher {
-	return &allOfMatcher{matchers}
-}
-
-type allOfMatcher struct {
-	wrappedMatchers []Matcher
-}
-
-func (m *allOfMatcher) Description() string {
-	// Special case: the empty set.
-	if len(m.wrappedMatchers) == 0 {
-		return "is anything"
-	}
-
-	// Join the descriptions for the wrapped matchers.
-	wrappedDescs := make([]string, len(m.wrappedMatchers))
-	for i, wrappedMatcher := range m.wrappedMatchers {
-		wrappedDescs[i] = wrappedMatcher.Description()
-	}
-
-	return strings.Join(wrappedDescs, ", and ")
-}
-
-func (m *allOfMatcher) Matches(c interface{}) (err error) {
-	for _, wrappedMatcher := range m.wrappedMatchers {
-		if wrappedErr := wrappedMatcher.Matches(c); wrappedErr != nil {
-			err = wrappedErr
-
-			// If the error is fatal, return immediately with this error.
-			_, ok := wrappedErr.(*FatalError)
-			if ok {
-				return
-			}
-		}
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go
deleted file mode 100644
index f6991ec102..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-// Any returns a matcher that matches any value.
-func Any() Matcher {
-	return &anyMatcher{}
-}
-
-type anyMatcher struct {
-}
-
-func (m *anyMatcher) Description() string {
-	return "is anything"
-}
-
-func (m *anyMatcher) Matches(c interface{}) error {
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go
deleted file mode 100644
index 2918b51f21..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/any_of.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// AnyOf accepts a set of values S and returns a matcher that follows the
-// algorithm below when considering a candidate c:
-//
-//  1. If there exists a value m in S such that m implements the Matcher
-//     interface and m matches c, return true.
-//
-//  2. Otherwise, if there exists a value v in S such that v does not implement
-//     the Matcher interface and the matcher Equals(v) matches c, return true.
-//
-//  3. Otherwise, if there is a value m in S such that m implements the Matcher
-//     interface and m returns a fatal error for c, return that fatal error.
-//
-//  4. Otherwise, return false.
-//
-// This is akin to a logical OR operation for matchers, with non-matchers x
-// being treated as Equals(x).
-func AnyOf(vals ...interface{}) Matcher {
-	// Get ahold of a type variable for the Matcher interface.
-	var dummy *Matcher
-	matcherType := reflect.TypeOf(dummy).Elem()
-
-	// Create a matcher for each value, or use the value itself if it's already a
-	// matcher.
-	wrapped := make([]Matcher, len(vals))
-	for i, v := range vals {
-		t := reflect.TypeOf(v)
-		if t != nil && t.Implements(matcherType) {
-			wrapped[i] = v.(Matcher)
-		} else {
-			wrapped[i] = Equals(v)
-		}
-	}
-
-	return &anyOfMatcher{wrapped}
-}
-
-type anyOfMatcher struct {
-	wrapped []Matcher
-}
-
-func (m *anyOfMatcher) Description() string {
-	wrappedDescs := make([]string, len(m.wrapped))
-	for i, matcher := range m.wrapped {
-		wrappedDescs[i] = matcher.Description()
-	}
-
-	return fmt.Sprintf("or(%s)", strings.Join(wrappedDescs, ", "))
-}
-
-func (m *anyOfMatcher) Matches(c interface{}) (err error) {
-	err = errors.New("")
-
-	// Try each matcher in turn.
-	for _, matcher := range m.wrapped {
-		wrappedErr := matcher.Matches(c)
-
-		// Return immediately if there's a match.
-		if wrappedErr == nil {
-			err = nil
-			return
-		}
-
-		// Note the fatal error, if any.
-		if _, isFatal := wrappedErr.(*FatalError); isFatal {
-			err = wrappedErr
-		}
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go
deleted file mode 100644
index 87f107d392..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/contains.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// Return a matcher that matches arrays slices with at least one element that
-// matches the supplied argument. If the argument x is not itself a Matcher,
-// this is equivalent to Contains(Equals(x)).
-func Contains(x interface{}) Matcher {
-	var result containsMatcher
-	var ok bool
-
-	if result.elementMatcher, ok = x.(Matcher); !ok {
-		result.elementMatcher = DeepEquals(x)
-	}
-
-	return &result
-}
-
-type containsMatcher struct {
-	elementMatcher Matcher
-}
-
-func (m *containsMatcher) Description() string {
-	return fmt.Sprintf("contains: %s", m.elementMatcher.Description())
-}
-
-func (m *containsMatcher) Matches(candidate interface{}) error {
-	// The candidate must be a slice or an array.
-	v := reflect.ValueOf(candidate)
-	if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
-		return NewFatalError("which is not a slice or array")
-	}
-
-	// Check each element.
-	for i := 0; i < v.Len(); i++ {
-		elem := v.Index(i)
-		if matchErr := m.elementMatcher.Matches(elem.Interface()); matchErr == nil {
-			return nil
-		}
-	}
-
-	return fmt.Errorf("")
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go
deleted file mode 100644
index 1d91baef32..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"reflect"
-)
-
-var byteSliceType reflect.Type = reflect.TypeOf([]byte{})
-
-// DeepEquals returns a matcher that matches based on 'deep equality', as
-// defined by the reflect package. This matcher requires that values have
-// identical types to x.
-func DeepEquals(x interface{}) Matcher {
-	return &deepEqualsMatcher{x}
-}
-
-type deepEqualsMatcher struct {
-	x interface{}
-}
-
-func (m *deepEqualsMatcher) Description() string {
-	xDesc := fmt.Sprintf("%v", m.x)
-	xValue := reflect.ValueOf(m.x)
-
-	// Special case: fmt.Sprintf presents nil slices as "[]", but
-	// reflect.DeepEqual makes a distinction between nil and empty slices. Make
-	// this less confusing.
-	if xValue.Kind() == reflect.Slice && xValue.IsNil() {
-		xDesc = "<nil slice>"
-	}
-
-	return fmt.Sprintf("deep equals: %s", xDesc)
-}
-
-func (m *deepEqualsMatcher) Matches(c interface{}) error {
-	// Make sure the types match.
-	ct := reflect.TypeOf(c)
-	xt := reflect.TypeOf(m.x)
-
-	if ct != xt {
-		return NewFatalError(fmt.Sprintf("which is of type %v", ct))
-	}
-
-	// Special case: handle byte slices more efficiently.
-	cValue := reflect.ValueOf(c)
-	xValue := reflect.ValueOf(m.x)
-
-	if ct == byteSliceType && !cValue.IsNil() && !xValue.IsNil() {
-		xBytes := m.x.([]byte)
-		cBytes := c.([]byte)
-
-		if bytes.Equal(cBytes, xBytes) {
-			return nil
-		}
-
-		return errors.New("")
-	}
-
-	// Defer to the reflect package.
-	if reflect.DeepEqual(m.x, c) {
-		return nil
-	}
-
-	// Special case: if the comparison failed because c is the nil slice, given
-	// an indication of this (since its value is printed as "[]").
-	if cValue.Kind() == reflect.Slice && cValue.IsNil() {
-		return errors.New("which is nil")
-	}
-
-	return errors.New("")
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go
deleted file mode 100644
index 2941847c70..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/elements_are.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// Given a list of arguments M, ElementsAre returns a matcher that matches
-// arrays and slices A where all of the following hold:
-//
-//  *  A is the same length as M.
-//
-//  *  For each i < len(A) where M[i] is a matcher, A[i] matches M[i].
-//
-//  *  For each i < len(A) where M[i] is not a matcher, A[i] matches
-//     Equals(M[i]).
-//
-func ElementsAre(M ...interface{}) Matcher {
-	// Copy over matchers, or convert to Equals(x) for non-matcher x.
-	subMatchers := make([]Matcher, len(M))
-	for i, x := range M {
-		if matcher, ok := x.(Matcher); ok {
-			subMatchers[i] = matcher
-			continue
-		}
-
-		subMatchers[i] = Equals(x)
-	}
-
-	return &elementsAreMatcher{subMatchers}
-}
-
-type elementsAreMatcher struct {
-	subMatchers []Matcher
-}
-
-func (m *elementsAreMatcher) Description() string {
-	subDescs := make([]string, len(m.subMatchers))
-	for i, sm := range m.subMatchers {
-		subDescs[i] = sm.Description()
-	}
-
-	return fmt.Sprintf("elements are: [%s]", strings.Join(subDescs, ", "))
-}
-
-func (m *elementsAreMatcher) Matches(candidates interface{}) error {
-	// The candidate must be a slice or an array.
-	v := reflect.ValueOf(candidates)
-	if v.Kind() != reflect.Slice && v.Kind() != reflect.Array {
-		return NewFatalError("which is not a slice or array")
-	}
-
-	// The length must be correct.
-	if v.Len() != len(m.subMatchers) {
-		return errors.New(fmt.Sprintf("which is of length %d", v.Len()))
-	}
-
-	// Check each element.
-	for i, subMatcher := range m.subMatchers {
-		c := v.Index(i)
-		if matchErr := subMatcher.Matches(c.Interface()); matchErr != nil {
-			// Return an errors indicating which element doesn't match. If the
-			// matcher error was fatal, make this one fatal too.
-			err := errors.New(fmt.Sprintf("whose element %d doesn't match", i))
-			if _, isFatal := matchErr.(*FatalError); isFatal {
-				err = NewFatalError(err.Error())
-			}
-
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go
deleted file mode 100644
index a510707b3c..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/equals.go
+++ /dev/null
@@ -1,541 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"math"
-	"reflect"
-)
-
-// Equals(x) returns a matcher that matches values v such that v and x are
-// equivalent. This includes the case when the comparison v == x using Go's
-// built-in comparison operator is legal (except for structs, which this
-// matcher does not support), but for convenience the following rules also
-// apply:
-//
-//  *  Type checking is done based on underlying types rather than actual
-//     types, so that e.g. two aliases for string can be compared:
-//
-//         type stringAlias1 string
-//         type stringAlias2 string
-//
-//         a := "taco"
-//         b := stringAlias1("taco")
-//         c := stringAlias2("taco")
-//
-//         ExpectTrue(a == b)  // Legal, passes
-//         ExpectTrue(b == c)  // Illegal, doesn't compile
-//
-//         ExpectThat(a, Equals(b))  // Passes
-//         ExpectThat(b, Equals(c))  // Passes
-//
-//  *  Values of numeric type are treated as if they were abstract numbers, and
-//     compared accordingly. Therefore Equals(17) will match int(17),
-//     int16(17), uint(17), float32(17), complex64(17), and so on.
-//
-// If you want a stricter matcher that contains no such cleverness, see
-// IdenticalTo instead.
-//
-// Arrays are supported by this matcher, but do not participate in the
-// exceptions above. Two arrays compared with this matcher must have identical
-// types, and their element type must itself be comparable according to Go's ==
-// operator.
-func Equals(x interface{}) Matcher {
-	v := reflect.ValueOf(x)
-
-	// This matcher doesn't support structs.
-	if v.Kind() == reflect.Struct {
-		panic(fmt.Sprintf("oglematchers.Equals: unsupported kind %v", v.Kind()))
-	}
-
-	// The == operator is not defined for non-nil slices.
-	if v.Kind() == reflect.Slice && v.Pointer() != uintptr(0) {
-		panic(fmt.Sprintf("oglematchers.Equals: non-nil slice"))
-	}
-
-	return &equalsMatcher{v}
-}
-
-type equalsMatcher struct {
-	expectedValue reflect.Value
-}
-
-////////////////////////////////////////////////////////////////////////
-// Numeric types
-////////////////////////////////////////////////////////////////////////
-
-func isSignedInteger(v reflect.Value) bool {
-	k := v.Kind()
-	return k >= reflect.Int && k <= reflect.Int64
-}
-
-func isUnsignedInteger(v reflect.Value) bool {
-	k := v.Kind()
-	return k >= reflect.Uint && k <= reflect.Uintptr
-}
-
-func isInteger(v reflect.Value) bool {
-	return isSignedInteger(v) || isUnsignedInteger(v)
-}
-
-func isFloat(v reflect.Value) bool {
-	k := v.Kind()
-	return k == reflect.Float32 || k == reflect.Float64
-}
-
-func isComplex(v reflect.Value) bool {
-	k := v.Kind()
-	return k == reflect.Complex64 || k == reflect.Complex128
-}
-
-func checkAgainstInt64(e int64, c reflect.Value) (err error) {
-	err = errors.New("")
-
-	switch {
-	case isSignedInteger(c):
-		if c.Int() == e {
-			err = nil
-		}
-
-	case isUnsignedInteger(c):
-		u := c.Uint()
-		if u <= math.MaxInt64 && int64(u) == e {
-			err = nil
-		}
-
-	// Turn around the various floating point types so that the checkAgainst*
-	// functions for them can deal with precision issues.
-	case isFloat(c), isComplex(c):
-		return Equals(c.Interface()).Matches(e)
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstUint64(e uint64, c reflect.Value) (err error) {
-	err = errors.New("")
-
-	switch {
-	case isSignedInteger(c):
-		i := c.Int()
-		if i >= 0 && uint64(i) == e {
-			err = nil
-		}
-
-	case isUnsignedInteger(c):
-		if c.Uint() == e {
-			err = nil
-		}
-
-	// Turn around the various floating point types so that the checkAgainst*
-	// functions for them can deal with precision issues.
-	case isFloat(c), isComplex(c):
-		return Equals(c.Interface()).Matches(e)
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstFloat32(e float32, c reflect.Value) (err error) {
-	err = errors.New("")
-
-	switch {
-	case isSignedInteger(c):
-		if float32(c.Int()) == e {
-			err = nil
-		}
-
-	case isUnsignedInteger(c):
-		if float32(c.Uint()) == e {
-			err = nil
-		}
-
-	case isFloat(c):
-		// Compare using float32 to avoid a false sense of precision; otherwise
-		// e.g. Equals(float32(0.1)) won't match float32(0.1).
-		if float32(c.Float()) == e {
-			err = nil
-		}
-
-	case isComplex(c):
-		comp := c.Complex()
-		rl := real(comp)
-		im := imag(comp)
-
-		// Compare using float32 to avoid a false sense of precision; otherwise
-		// e.g. Equals(float32(0.1)) won't match (0.1 + 0i).
-		if im == 0 && float32(rl) == e {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstFloat64(e float64, c reflect.Value) (err error) {
-	err = errors.New("")
-
-	ck := c.Kind()
-
-	switch {
-	case isSignedInteger(c):
-		if float64(c.Int()) == e {
-			err = nil
-		}
-
-	case isUnsignedInteger(c):
-		if float64(c.Uint()) == e {
-			err = nil
-		}
-
-	// If the actual value is lower precision, turn the comparison around so we
-	// apply the low-precision rules. Otherwise, e.g. Equals(0.1) may not match
-	// float32(0.1).
-	case ck == reflect.Float32 || ck == reflect.Complex64:
-		return Equals(c.Interface()).Matches(e)
-
-		// Otherwise, compare with double precision.
-	case isFloat(c):
-		if c.Float() == e {
-			err = nil
-		}
-
-	case isComplex(c):
-		comp := c.Complex()
-		rl := real(comp)
-		im := imag(comp)
-
-		if im == 0 && rl == e {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstComplex64(e complex64, c reflect.Value) (err error) {
-	err = errors.New("")
-	realPart := real(e)
-	imaginaryPart := imag(e)
-
-	switch {
-	case isInteger(c) || isFloat(c):
-		// If we have no imaginary part, then we should just compare against the
-		// real part. Otherwise, we can't be equal.
-		if imaginaryPart != 0 {
-			return
-		}
-
-		return checkAgainstFloat32(realPart, c)
-
-	case isComplex(c):
-		// Compare using complex64 to avoid a false sense of precision; otherwise
-		// e.g. Equals(0.1 + 0i) won't match float32(0.1).
-		if complex64(c.Complex()) == e {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-func checkAgainstComplex128(e complex128, c reflect.Value) (err error) {
-	err = errors.New("")
-	realPart := real(e)
-	imaginaryPart := imag(e)
-
-	switch {
-	case isInteger(c) || isFloat(c):
-		// If we have no imaginary part, then we should just compare against the
-		// real part. Otherwise, we can't be equal.
-		if imaginaryPart != 0 {
-			return
-		}
-
-		return checkAgainstFloat64(realPart, c)
-
-	case isComplex(c):
-		if c.Complex() == e {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not numeric")
-	}
-
-	return
-}
-
-////////////////////////////////////////////////////////////////////////
-// Other types
-////////////////////////////////////////////////////////////////////////
-
-func checkAgainstBool(e bool, c reflect.Value) (err error) {
-	if c.Kind() != reflect.Bool {
-		err = NewFatalError("which is not a bool")
-		return
-	}
-
-	err = errors.New("")
-	if c.Bool() == e {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstChan(e reflect.Value, c reflect.Value) (err error) {
-	// Create a description of e's type, e.g. "chan int".
-	typeStr := fmt.Sprintf("%s %s", e.Type().ChanDir(), e.Type().Elem())
-
-	// Make sure c is a chan of the correct type.
-	if c.Kind() != reflect.Chan ||
-		c.Type().ChanDir() != e.Type().ChanDir() ||
-		c.Type().Elem() != e.Type().Elem() {
-		err = NewFatalError(fmt.Sprintf("which is not a %s", typeStr))
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstFunc(e reflect.Value, c reflect.Value) (err error) {
-	// Make sure c is a function.
-	if c.Kind() != reflect.Func {
-		err = NewFatalError("which is not a function")
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstMap(e reflect.Value, c reflect.Value) (err error) {
-	// Make sure c is a map.
-	if c.Kind() != reflect.Map {
-		err = NewFatalError("which is not a map")
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstPtr(e reflect.Value, c reflect.Value) (err error) {
-	// Create a description of e's type, e.g. "*int".
-	typeStr := fmt.Sprintf("*%v", e.Type().Elem())
-
-	// Make sure c is a pointer of the correct type.
-	if c.Kind() != reflect.Ptr ||
-		c.Type().Elem() != e.Type().Elem() {
-		err = NewFatalError(fmt.Sprintf("which is not a %s", typeStr))
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstSlice(e reflect.Value, c reflect.Value) (err error) {
-	// Create a description of e's type, e.g. "[]int".
-	typeStr := fmt.Sprintf("[]%v", e.Type().Elem())
-
-	// Make sure c is a slice of the correct type.
-	if c.Kind() != reflect.Slice ||
-		c.Type().Elem() != e.Type().Elem() {
-		err = NewFatalError(fmt.Sprintf("which is not a %s", typeStr))
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstString(e reflect.Value, c reflect.Value) (err error) {
-	// Make sure c is a string.
-	if c.Kind() != reflect.String {
-		err = NewFatalError("which is not a string")
-		return
-	}
-
-	err = errors.New("")
-	if c.String() == e.String() {
-		err = nil
-	}
-	return
-}
-
-func checkAgainstArray(e reflect.Value, c reflect.Value) (err error) {
-	// Create a description of e's type, e.g. "[2]int".
-	typeStr := fmt.Sprintf("%v", e.Type())
-
-	// Make sure c is the correct type.
-	if c.Type() != e.Type() {
-		err = NewFatalError(fmt.Sprintf("which is not %s", typeStr))
-		return
-	}
-
-	// Check for equality.
-	if e.Interface() != c.Interface() {
-		err = errors.New("")
-		return
-	}
-
-	return
-}
-
-func checkAgainstUnsafePointer(e reflect.Value, c reflect.Value) (err error) {
-	// Make sure c is a pointer.
-	if c.Kind() != reflect.UnsafePointer {
-		err = NewFatalError("which is not a unsafe.Pointer")
-		return
-	}
-
-	err = errors.New("")
-	if c.Pointer() == e.Pointer() {
-		err = nil
-	}
-	return
-}
-
-func checkForNil(c reflect.Value) (err error) {
-	err = errors.New("")
-
-	// Make sure it is legal to call IsNil.
-	switch c.Kind() {
-	case reflect.Invalid:
-	case reflect.Chan:
-	case reflect.Func:
-	case reflect.Interface:
-	case reflect.Map:
-	case reflect.Ptr:
-	case reflect.Slice:
-
-	default:
-		err = NewFatalError("which cannot be compared to nil")
-		return
-	}
-
-	// Ask whether the value is nil. Handle a nil literal (kind Invalid)
-	// specially, since it's not legal to call IsNil there.
-	if c.Kind() == reflect.Invalid || c.IsNil() {
-		err = nil
-	}
-	return
-}
-
-////////////////////////////////////////////////////////////////////////
-// Public implementation
-////////////////////////////////////////////////////////////////////////
-
-func (m *equalsMatcher) Matches(candidate interface{}) error {
-	e := m.expectedValue
-	c := reflect.ValueOf(candidate)
-	ek := e.Kind()
-
-	switch {
-	case ek == reflect.Bool:
-		return checkAgainstBool(e.Bool(), c)
-
-	case isSignedInteger(e):
-		return checkAgainstInt64(e.Int(), c)
-
-	case isUnsignedInteger(e):
-		return checkAgainstUint64(e.Uint(), c)
-
-	case ek == reflect.Float32:
-		return checkAgainstFloat32(float32(e.Float()), c)
-
-	case ek == reflect.Float64:
-		return checkAgainstFloat64(e.Float(), c)
-
-	case ek == reflect.Complex64:
-		return checkAgainstComplex64(complex64(e.Complex()), c)
-
-	case ek == reflect.Complex128:
-		return checkAgainstComplex128(complex128(e.Complex()), c)
-
-	case ek == reflect.Chan:
-		return checkAgainstChan(e, c)
-
-	case ek == reflect.Func:
-		return checkAgainstFunc(e, c)
-
-	case ek == reflect.Map:
-		return checkAgainstMap(e, c)
-
-	case ek == reflect.Ptr:
-		return checkAgainstPtr(e, c)
-
-	case ek == reflect.Slice:
-		return checkAgainstSlice(e, c)
-
-	case ek == reflect.String:
-		return checkAgainstString(e, c)
-
-	case ek == reflect.Array:
-		return checkAgainstArray(e, c)
-
-	case ek == reflect.UnsafePointer:
-		return checkAgainstUnsafePointer(e, c)
-
-	case ek == reflect.Invalid:
-		return checkForNil(c)
-	}
-
-	panic(fmt.Sprintf("equalsMatcher.Matches: unexpected kind: %v", ek))
-}
-
-func (m *equalsMatcher) Description() string {
-	// Special case: handle nil.
-	if !m.expectedValue.IsValid() {
-		return "is nil"
-	}
-
-	return fmt.Sprintf("%v", m.expectedValue.Interface())
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go
deleted file mode 100644
index 8a078e36d8..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/error.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-// Error returns a matcher that matches non-nil values implementing the
-// built-in error interface for whom the return value of Error() matches the
-// supplied matcher.
-//
-// For example:
-//
-//     err := errors.New("taco burrito")
-//
-//     Error(Equals("taco burrito"))  // matches err
-//     Error(HasSubstr("taco"))       // matches err
-//     Error(HasSubstr("enchilada"))  // doesn't match err
-//
-func Error(m Matcher) Matcher {
-	return &errorMatcher{m}
-}
-
-type errorMatcher struct {
-	wrappedMatcher Matcher
-}
-
-func (m *errorMatcher) Description() string {
-	return "error " + m.wrappedMatcher.Description()
-}
-
-func (m *errorMatcher) Matches(c interface{}) error {
-	// Make sure that c is an error.
-	e, ok := c.(error)
-	if !ok {
-		return NewFatalError("which is not an error")
-	}
-
-	// Pass on the error text to the wrapped matcher.
-	return m.wrappedMatcher.Matches(e.Error())
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go
deleted file mode 100644
index 4b9d103a38..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// GreaterOrEqual returns a matcher that matches integer, floating point, or
-// strings values v such that v >= x. Comparison is not defined between numeric
-// and string types, but is defined between all integer and floating point
-// types.
-//
-// x must itself be an integer, floating point, or string type; otherwise,
-// GreaterOrEqual will panic.
-func GreaterOrEqual(x interface{}) Matcher {
-	desc := fmt.Sprintf("greater than or equal to %v", x)
-
-	// Special case: make it clear that strings are strings.
-	if reflect.TypeOf(x).Kind() == reflect.String {
-		desc = fmt.Sprintf("greater than or equal to \"%s\"", x)
-	}
-
-	return transformDescription(Not(LessThan(x)), desc)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go
deleted file mode 100644
index 3eef32178f..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// GreaterThan returns a matcher that matches integer, floating point, or
-// strings values v such that v > x. Comparison is not defined between numeric
-// and string types, but is defined between all integer and floating point
-// types.
-//
-// x must itself be an integer, floating point, or string type; otherwise,
-// GreaterThan will panic.
-func GreaterThan(x interface{}) Matcher {
-	desc := fmt.Sprintf("greater than %v", x)
-
-	// Special case: make it clear that strings are strings.
-	if reflect.TypeOf(x).Kind() == reflect.String {
-		desc = fmt.Sprintf("greater than \"%s\"", x)
-	}
-
-	return transformDescription(Not(LessOrEqual(x)), desc)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go
deleted file mode 100644
index 3b286f7321..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_same_type_as.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// HasSameTypeAs returns a matcher that matches values with exactly the same
-// type as the supplied prototype.
-func HasSameTypeAs(p interface{}) Matcher {
-	expected := reflect.TypeOf(p)
-	pred := func(c interface{}) error {
-		actual := reflect.TypeOf(c)
-		if actual != expected {
-			return fmt.Errorf("which has type %v", actual)
-		}
-
-		return nil
-	}
-
-	return NewMatcher(pred, fmt.Sprintf("has type %v", expected))
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go
deleted file mode 100644
index bf5bd6ae6d..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/has_substr.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// HasSubstr returns a matcher that matches strings containing s as a
-// substring.
-func HasSubstr(s string) Matcher {
-	return NewMatcher(
-		func(c interface{}) error { return hasSubstr(s, c) },
-		fmt.Sprintf("has substring \"%s\"", s))
-}
-
-func hasSubstr(needle string, c interface{}) error {
-	v := reflect.ValueOf(c)
-	if v.Kind() != reflect.String {
-		return NewFatalError("which is not a string")
-	}
-
-	// Perform the substring search.
-	haystack := v.String()
-	if strings.Contains(haystack, needle) {
-		return nil
-	}
-
-	return errors.New("")
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go
deleted file mode 100644
index ae6460ed96..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/identical_to.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-)
-
-// Is the type comparable according to the definition here?
-//
-//     http://weekly.golang.org/doc/go_spec.html#Comparison_operators
-//
-func isComparable(t reflect.Type) bool {
-	switch t.Kind() {
-	case reflect.Array:
-		return isComparable(t.Elem())
-
-	case reflect.Struct:
-		for i := 0; i < t.NumField(); i++ {
-			if !isComparable(t.Field(i).Type) {
-				return false
-			}
-		}
-
-		return true
-
-	case reflect.Slice, reflect.Map, reflect.Func:
-		return false
-	}
-
-	return true
-}
-
-// Should the supplied type be allowed as an argument to IdenticalTo?
-func isLegalForIdenticalTo(t reflect.Type) (bool, error) {
-	// Allow the zero type.
-	if t == nil {
-		return true, nil
-	}
-
-	// Reference types are always okay; we compare pointers.
-	switch t.Kind() {
-	case reflect.Slice, reflect.Map, reflect.Func, reflect.Chan:
-		return true, nil
-	}
-
-	// Reject other non-comparable types.
-	if !isComparable(t) {
-		return false, errors.New(fmt.Sprintf("%v is not comparable", t))
-	}
-
-	return true, nil
-}
-
-// IdenticalTo(x) returns a matcher that matches values v with type identical
-// to x such that:
-//
-//  1. If v and x are of a reference type (slice, map, function, channel), then
-//     they are either both nil or are references to the same object.
-//
-//  2. Otherwise, if v and x are not of a reference type but have a valid type,
-//     then v == x.
-//
-// If v and x are both the invalid type (which results from the predeclared nil
-// value, or from nil interface variables), then the matcher is satisfied.
-//
-// This function will panic if x is of a value type that is not comparable. For
-// example, x cannot be an array of functions.
-func IdenticalTo(x interface{}) Matcher {
-	t := reflect.TypeOf(x)
-
-	// Reject illegal arguments.
-	if ok, err := isLegalForIdenticalTo(t); !ok {
-		panic("IdenticalTo: " + err.Error())
-	}
-
-	return &identicalToMatcher{x}
-}
-
-type identicalToMatcher struct {
-	x interface{}
-}
-
-func (m *identicalToMatcher) Description() string {
-	t := reflect.TypeOf(m.x)
-	return fmt.Sprintf("identical to <%v> %v", t, m.x)
-}
-
-func (m *identicalToMatcher) Matches(c interface{}) error {
-	// Make sure the candidate's type is correct.
-	t := reflect.TypeOf(m.x)
-	if ct := reflect.TypeOf(c); t != ct {
-		return NewFatalError(fmt.Sprintf("which is of type %v", ct))
-	}
-
-	// Special case: two values of the invalid type are always identical.
-	if t == nil {
-		return nil
-	}
-
-	// Handle reference types.
-	switch t.Kind() {
-	case reflect.Slice, reflect.Map, reflect.Func, reflect.Chan:
-		xv := reflect.ValueOf(m.x)
-		cv := reflect.ValueOf(c)
-		if xv.Pointer() == cv.Pointer() {
-			return nil
-		}
-
-		return errors.New("which is not an identical reference")
-	}
-
-	// Are the values equal?
-	if m.x == c {
-		return nil
-	}
-
-	return errors.New("")
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go
deleted file mode 100644
index 8402cdeaf0..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// LessOrEqual returns a matcher that matches integer, floating point, or
-// strings values v such that v <= x. Comparison is not defined between numeric
-// and string types, but is defined between all integer and floating point
-// types.
-//
-// x must itself be an integer, floating point, or string type; otherwise,
-// LessOrEqual will panic.
-func LessOrEqual(x interface{}) Matcher {
-	desc := fmt.Sprintf("less than or equal to %v", x)
-
-	// Special case: make it clear that strings are strings.
-	if reflect.TypeOf(x).Kind() == reflect.String {
-		desc = fmt.Sprintf("less than or equal to \"%s\"", x)
-	}
-
-	// Put LessThan last so that its error messages will be used in the event of
-	// failure.
-	return transformDescription(AnyOf(Equals(x), LessThan(x)), desc)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go
deleted file mode 100644
index 8258e45d99..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/less_than.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"math"
-	"reflect"
-)
-
-// LessThan returns a matcher that matches integer, floating point, or strings
-// values v such that v < x. Comparison is not defined between numeric and
-// string types, but is defined between all integer and floating point types.
-//
-// x must itself be an integer, floating point, or string type; otherwise,
-// LessThan will panic.
-func LessThan(x interface{}) Matcher {
-	v := reflect.ValueOf(x)
-	kind := v.Kind()
-
-	switch {
-	case isInteger(v):
-	case isFloat(v):
-	case kind == reflect.String:
-
-	default:
-		panic(fmt.Sprintf("LessThan: unexpected kind %v", kind))
-	}
-
-	return &lessThanMatcher{v}
-}
-
-type lessThanMatcher struct {
-	limit reflect.Value
-}
-
-func (m *lessThanMatcher) Description() string {
-	// Special case: make it clear that strings are strings.
-	if m.limit.Kind() == reflect.String {
-		return fmt.Sprintf("less than \"%s\"", m.limit.String())
-	}
-
-	return fmt.Sprintf("less than %v", m.limit.Interface())
-}
-
-func compareIntegers(v1, v2 reflect.Value) (err error) {
-	err = errors.New("")
-
-	switch {
-	case isSignedInteger(v1) && isSignedInteger(v2):
-		if v1.Int() < v2.Int() {
-			err = nil
-		}
-		return
-
-	case isSignedInteger(v1) && isUnsignedInteger(v2):
-		if v1.Int() < 0 || uint64(v1.Int()) < v2.Uint() {
-			err = nil
-		}
-		return
-
-	case isUnsignedInteger(v1) && isSignedInteger(v2):
-		if v1.Uint() <= math.MaxInt64 && int64(v1.Uint()) < v2.Int() {
-			err = nil
-		}
-		return
-
-	case isUnsignedInteger(v1) && isUnsignedInteger(v2):
-		if v1.Uint() < v2.Uint() {
-			err = nil
-		}
-		return
-	}
-
-	panic(fmt.Sprintf("compareIntegers: %v %v", v1, v2))
-}
-
-func getFloat(v reflect.Value) float64 {
-	switch {
-	case isSignedInteger(v):
-		return float64(v.Int())
-
-	case isUnsignedInteger(v):
-		return float64(v.Uint())
-
-	case isFloat(v):
-		return v.Float()
-	}
-
-	panic(fmt.Sprintf("getFloat: %v", v))
-}
-
-func (m *lessThanMatcher) Matches(c interface{}) (err error) {
-	v1 := reflect.ValueOf(c)
-	v2 := m.limit
-
-	err = errors.New("")
-
-	// Handle strings as a special case.
-	if v1.Kind() == reflect.String && v2.Kind() == reflect.String {
-		if v1.String() < v2.String() {
-			err = nil
-		}
-		return
-	}
-
-	// If we get here, we require that we are dealing with integers or floats.
-	v1Legal := isInteger(v1) || isFloat(v1)
-	v2Legal := isInteger(v2) || isFloat(v2)
-	if !v1Legal || !v2Legal {
-		err = NewFatalError("which is not comparable")
-		return
-	}
-
-	// Handle the various comparison cases.
-	switch {
-	// Both integers
-	case isInteger(v1) && isInteger(v2):
-		return compareIntegers(v1, v2)
-
-	// At least one float32
-	case v1.Kind() == reflect.Float32 || v2.Kind() == reflect.Float32:
-		if float32(getFloat(v1)) < float32(getFloat(v2)) {
-			err = nil
-		}
-		return
-
-	// At least one float64
-	case v1.Kind() == reflect.Float64 || v2.Kind() == reflect.Float64:
-		if getFloat(v1) < getFloat(v2) {
-			err = nil
-		}
-		return
-	}
-
-	// We shouldn't get here.
-	panic(fmt.Sprintf("lessThanMatcher.Matches: Shouldn't get here: %v %v", v1, v2))
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go
deleted file mode 100644
index 78159a0727..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matcher.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package oglematchers provides a set of matchers useful in a testing or
-// mocking framework. These matchers are inspired by and mostly compatible with
-// Google Test for C++ and Google JS Test.
-//
-// This package is used by github.com/smartystreets/assertions/internal/ogletest and
-// github.com/smartystreets/assertions/internal/oglemock, which may be more directly useful if you're not
-// writing your own testing package or defining your own matchers.
-package oglematchers
-
-// A Matcher is some predicate implicitly defining a set of values that it
-// matches. For example, GreaterThan(17) matches all numeric values greater
-// than 17, and HasSubstr("taco") matches all strings with the substring
-// "taco".
-//
-// Matchers are typically exposed to tests via constructor functions like
-// HasSubstr. In order to implement such a function you can either define your
-// own matcher type or use NewMatcher.
-type Matcher interface {
-	// Check whether the supplied value belongs to the the set defined by the
-	// matcher. Return a non-nil error if and only if it does not.
-	//
-	// The error describes why the value doesn't match. The error text is a
-	// relative clause that is suitable for being placed after the value. For
-	// example, a predicate that matches strings with a particular substring may,
-	// when presented with a numerical value, return the following error text:
-	//
-	//     "which is not a string"
-	//
-	// Then the failure message may look like:
-	//
-	//     Expected: has substring "taco"
-	//     Actual:   17, which is not a string
-	//
-	// If the error is self-apparent based on the description of the matcher, the
-	// error text may be empty (but the error still non-nil). For example:
-	//
-	//     Expected: 17
-	//     Actual:   19
-	//
-	// If you are implementing a new matcher, see also the documentation on
-	// FatalError.
-	Matches(candidate interface{}) error
-
-	// Description returns a string describing the property that values matching
-	// this matcher have, as a verb phrase where the subject is the value. For
-	// example, "is greather than 17" or "has substring "taco"".
-	Description() string
-}
-
-// FatalError is an implementation of the error interface that may be returned
-// from matchers, indicating the error should be propagated. Returning a
-// *FatalError indicates that the matcher doesn't process values of the
-// supplied type, or otherwise doesn't know how to handle the value.
-//
-// For example, if GreaterThan(17) returned false for the value "taco" without
-// a fatal error, then Not(GreaterThan(17)) would return true. This is
-// technically correct, but is surprising and may mask failures where the wrong
-// sort of matcher is accidentally used. Instead, GreaterThan(17) can return a
-// fatal error, which will be propagated by Not().
-type FatalError struct {
-	errorText string
-}
-
-// NewFatalError creates a FatalError struct with the supplied error text.
-func NewFatalError(s string) *FatalError {
-	return &FatalError{s}
-}
-
-func (e *FatalError) Error() string {
-	return e.errorText
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go
deleted file mode 100644
index 1ed63f30c4..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/matches_regexp.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"regexp"
-)
-
-// MatchesRegexp returns a matcher that matches strings and byte slices whose
-// contents match the supplied regular expression. The semantics are those of
-// regexp.Match. In particular, that means the match is not implicitly anchored
-// to the ends of the string: MatchesRegexp("bar") will match "foo bar baz".
-func MatchesRegexp(pattern string) Matcher {
-	re, err := regexp.Compile(pattern)
-	if err != nil {
-		panic("MatchesRegexp: " + err.Error())
-	}
-
-	return &matchesRegexpMatcher{re}
-}
-
-type matchesRegexpMatcher struct {
-	re *regexp.Regexp
-}
-
-func (m *matchesRegexpMatcher) Description() string {
-	return fmt.Sprintf("matches regexp \"%s\"", m.re.String())
-}
-
-func (m *matchesRegexpMatcher) Matches(c interface{}) (err error) {
-	v := reflect.ValueOf(c)
-	isString := v.Kind() == reflect.String
-	isByteSlice := v.Kind() == reflect.Slice && v.Elem().Kind() == reflect.Uint8
-
-	err = errors.New("")
-
-	switch {
-	case isString:
-		if m.re.MatchString(v.String()) {
-			err = nil
-		}
-
-	case isByteSlice:
-		if m.re.Match(v.Bytes()) {
-			err = nil
-		}
-
-	default:
-		err = NewFatalError("which is not a string or []byte")
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go
deleted file mode 100644
index c9d8398ee6..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/new_matcher.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-// Create a matcher with the given description and predicate function, which
-// will be invoked to handle calls to Matchers.
-//
-// Using this constructor may be a convenience over defining your own type that
-// implements Matcher if you do not need any logic in your Description method.
-func NewMatcher(
-	predicate func(interface{}) error,
-	description string) Matcher {
-	return &predicateMatcher{
-		predicate:   predicate,
-		description: description,
-	}
-}
-
-type predicateMatcher struct {
-	predicate   func(interface{}) error
-	description string
-}
-
-func (pm *predicateMatcher) Matches(c interface{}) error {
-	return pm.predicate(c)
-}
-
-func (pm *predicateMatcher) Description() string {
-	return pm.description
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go
deleted file mode 100644
index 623789fe28..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/not.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-)
-
-// Not returns a matcher that inverts the set of values matched by the wrapped
-// matcher. It does not transform the result for values for which the wrapped
-// matcher returns a fatal error.
-func Not(m Matcher) Matcher {
-	return &notMatcher{m}
-}
-
-type notMatcher struct {
-	wrapped Matcher
-}
-
-func (m *notMatcher) Matches(c interface{}) (err error) {
-	err = m.wrapped.Matches(c)
-
-	// Did the wrapped matcher say yes?
-	if err == nil {
-		return errors.New("")
-	}
-
-	// Did the wrapped matcher return a fatal error?
-	if _, isFatal := err.(*FatalError); isFatal {
-		return err
-	}
-
-	// The wrapped matcher returned a non-fatal error.
-	return nil
-}
-
-func (m *notMatcher) Description() string {
-	return fmt.Sprintf("not(%s)", m.wrapped.Description())
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go
deleted file mode 100644
index d2cfc97869..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/panics.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-)
-
-// Panics matches zero-arg functions which, when invoked, panic with an error
-// that matches the supplied matcher.
-//
-// NOTE(jacobsa): This matcher cannot detect the case where the function panics
-// using panic(nil), by design of the language. See here for more info:
-//
-//     http://goo.gl/9aIQL
-//
-func Panics(m Matcher) Matcher {
-	return &panicsMatcher{m}
-}
-
-type panicsMatcher struct {
-	wrappedMatcher Matcher
-}
-
-func (m *panicsMatcher) Description() string {
-	return "panics with: " + m.wrappedMatcher.Description()
-}
-
-func (m *panicsMatcher) Matches(c interface{}) (err error) {
-	// Make sure c is a zero-arg function.
-	v := reflect.ValueOf(c)
-	if v.Kind() != reflect.Func || v.Type().NumIn() != 0 {
-		err = NewFatalError("which is not a zero-arg function")
-		return
-	}
-
-	// Call the function and check its panic error.
-	defer func() {
-		if e := recover(); e != nil {
-			err = m.wrappedMatcher.Matches(e)
-
-			// Set a clearer error message if the matcher said no.
-			if err != nil {
-				wrappedClause := ""
-				if err.Error() != "" {
-					wrappedClause = ", " + err.Error()
-				}
-
-				err = errors.New(fmt.Sprintf("which panicked with: %v%s", e, wrappedClause))
-			}
-		}
-	}()
-
-	v.Call([]reflect.Value{})
-
-	// If we get here, the function didn't panic.
-	err = errors.New("which didn't panic")
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go
deleted file mode 100644
index c5383f2402..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/pointee.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2012 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-)
-
-// Return a matcher that matches non-nil pointers whose pointee matches the
-// wrapped matcher.
-func Pointee(m Matcher) Matcher {
-	return &pointeeMatcher{m}
-}
-
-type pointeeMatcher struct {
-	wrapped Matcher
-}
-
-func (m *pointeeMatcher) Matches(c interface{}) (err error) {
-	// Make sure the candidate is of the appropriate type.
-	cv := reflect.ValueOf(c)
-	if !cv.IsValid() || cv.Kind() != reflect.Ptr {
-		return NewFatalError("which is not a pointer")
-	}
-
-	// Make sure the candidate is non-nil.
-	if cv.IsNil() {
-		return NewFatalError("")
-	}
-
-	// Defer to the wrapped matcher. Fix up empty errors so that failure messages
-	// are more helpful than just printing a pointer for "Actual".
-	pointee := cv.Elem().Interface()
-	err = m.wrapped.Matches(pointee)
-	if err != nil && err.Error() == "" {
-		s := fmt.Sprintf("whose pointee is %v", pointee)
-
-		if _, ok := err.(*FatalError); ok {
-			err = NewFatalError(s)
-		} else {
-			err = errors.New(s)
-		}
-	}
-
-	return err
-}
-
-func (m *pointeeMatcher) Description() string {
-	return fmt.Sprintf("pointee(%s)", m.wrapped.Description())
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go
deleted file mode 100644
index f79d0c03db..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2011 Aaron Jacobs. All Rights Reserved.
-// Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package oglematchers
-
-// transformDescription returns a matcher that is equivalent to the supplied
-// one, except that it has the supplied description instead of the one attached
-// to the existing matcher.
-func transformDescription(m Matcher, newDesc string) Matcher {
-	return &transformDescriptionMatcher{newDesc, m}
-}
-
-type transformDescriptionMatcher struct {
-	desc string
-	wrappedMatcher Matcher
-}
-
-func (m *transformDescriptionMatcher) Description() string {
-	return m.desc
-}
-
-func (m *transformDescriptionMatcher) Matches(c interface{}) error {
-	return m.wrappedMatcher.Matches(c)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go
deleted file mode 100644
index 9c57ab2b8b..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/messages.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package assertions
-
-const ( // equality
-	shouldHaveBeenEqual             = "Expected: '%v'\nActual:   '%v'\n(Should be equal)"
-	shouldNotHaveBeenEqual          = "Expected     '%v'\nto NOT equal '%v'\n(but it did)!"
-	shouldHaveBeenEqualTypeMismatch = "Expected: '%v' (%T)\nActual:   '%v' (%T)\n(Should be equal, type mismatch)"
-	shouldHaveBeenAlmostEqual       = "Expected '%v' to almost equal '%v' (but it didn't)!"
-	shouldHaveNotBeenAlmostEqual    = "Expected '%v' to NOT almost equal '%v' (but it did)!"
-	shouldHaveResembled             = "Expected: '%s'\nActual:   '%s'\n(Should resemble)!"
-	shouldNotHaveResembled          = "Expected        '%#v'\nto NOT resemble '%#v'\n(but it did)!"
-	shouldBePointers                = "Both arguments should be pointers "
-	shouldHaveBeenNonNilPointer     = shouldBePointers + "(the %s was %s)!"
-	shouldHavePointedTo             = "Expected '%+v' (address: '%v') and '%+v' (address: '%v') to be the same address (but their weren't)!"
-	shouldNotHavePointedTo          = "Expected '%+v' and '%+v' to be different references (but they matched: '%v')!"
-	shouldHaveBeenNil               = "Expected: nil\nActual:   '%v'"
-	shouldNotHaveBeenNil            = "Expected '%+v' to NOT be nil (but it was)!"
-	shouldHaveBeenTrue              = "Expected: true\nActual:   %v"
-	shouldHaveBeenFalse             = "Expected: false\nActual:   %v"
-	shouldHaveBeenZeroValue         = "'%+v' should have been the zero value" //"Expected: (zero value)\nActual:   %v"
-)
-
-const ( // quantity comparisons
-	shouldHaveBeenGreater            = "Expected '%v' to be greater than '%v' (but it wasn't)!"
-	shouldHaveBeenGreaterOrEqual     = "Expected '%v' to be greater than or equal to '%v' (but it wasn't)!"
-	shouldHaveBeenLess               = "Expected '%v' to be less than '%v' (but it wasn't)!"
-	shouldHaveBeenLessOrEqual        = "Expected '%v' to be less than or equal to '%v' (but it wasn't)!"
-	shouldHaveBeenBetween            = "Expected '%v' to be between '%v' and '%v' (but it wasn't)!"
-	shouldNotHaveBeenBetween         = "Expected '%v' NOT to be between '%v' and '%v' (but it was)!"
-	shouldHaveDifferentUpperAndLower = "The lower and upper bounds must be different values (they were both '%v')."
-	shouldHaveBeenBetweenOrEqual     = "Expected '%v' to be between '%v' and '%v' or equal to one of them (but it wasn't)!"
-	shouldNotHaveBeenBetweenOrEqual  = "Expected '%v' NOT to be between '%v' and '%v' or equal to one of them (but it was)!"
-)
-
-const ( // collections
-	shouldHaveContained            = "Expected the container (%v) to contain: '%v' (but it didn't)!"
-	shouldNotHaveContained         = "Expected the container (%v) NOT to contain: '%v' (but it did)!"
-	shouldHaveContainedKey         = "Expected the %v to contain the key: %v (but it didn't)!"
-	shouldNotHaveContainedKey      = "Expected the %v NOT to contain the key: %v (but it did)!"
-	shouldHaveBeenIn               = "Expected '%v' to be in the container (%v), but it wasn't!"
-	shouldNotHaveBeenIn            = "Expected '%v' NOT to be in the container (%v), but it was!"
-	shouldHaveBeenAValidCollection = "You must provide a valid container (was %v)!"
-	shouldHaveBeenAValidMap        = "You must provide a valid map type (was %v)!"
-	shouldHaveBeenEmpty            = "Expected %+v to be empty (but it wasn't)!"
-	shouldNotHaveBeenEmpty         = "Expected %+v to NOT be empty (but it was)!"
-	shouldHaveBeenAValidInteger    = "You must provide a valid integer (was %v)!"
-	shouldHaveBeenAValidLength     = "You must provide a valid positive integer (was %v)!"
-	shouldHaveHadLength            = "Expected %+v (length: %v) to have length equal to '%v', but it wasn't!"
-)
-
-const ( // strings
-	shouldHaveStartedWith           = "Expected      '%v'\nto start with '%v'\n(but it didn't)!"
-	shouldNotHaveStartedWith        = "Expected          '%v'\nNOT to start with '%v'\n(but it did)!"
-	shouldHaveEndedWith             = "Expected    '%v'\nto end with '%v'\n(but it didn't)!"
-	shouldNotHaveEndedWith          = "Expected        '%v'\nNOT to end with '%v'\n(but it did)!"
-	shouldAllBeStrings              = "All arguments to this assertion must be strings (you provided: %v)."
-	shouldBothBeStrings             = "Both arguments to this assertion must be strings (you provided %v and %v)."
-	shouldBeString                  = "The argument to this assertion must be a string (you provided %v)."
-	shouldHaveContainedSubstring    = "Expected '%s' to contain substring '%s' (but it didn't)!"
-	shouldNotHaveContainedSubstring = "Expected '%s' NOT to contain substring '%s' (but it did)!"
-	shouldHaveBeenBlank             = "Expected '%s' to be blank (but it wasn't)!"
-	shouldNotHaveBeenBlank          = "Expected value to NOT be blank (but it was)!"
-)
-
-const ( // panics
-	shouldUseVoidNiladicFunction = "You must provide a void, niladic function as the first argument!"
-	shouldHavePanickedWith       = "Expected func() to panic with '%v' (but it panicked with '%v')!"
-	shouldHavePanicked           = "Expected func() to panic (but it didn't)!"
-	shouldNotHavePanicked        = "Expected func() NOT to panic (error: '%+v')!"
-	shouldNotHavePanickedWith    = "Expected func() NOT to panic with '%v' (but it did)!"
-)
-
-const ( // type checking
-	shouldHaveBeenA    = "Expected '%v' to be: '%v' (but was: '%v')!"
-	shouldNotHaveBeenA = "Expected '%v' to NOT be: '%v' (but it was)!"
-
-	shouldHaveImplemented             = "Expected: '%v interface support'\nActual:   '%v' does not implement the interface!"
-	shouldNotHaveImplemented          = "Expected         '%v'\nto NOT implement '%v'\n(but it did)!"
-	shouldCompareWithInterfacePointer = "The expected value must be a pointer to an interface type (eg. *fmt.Stringer)"
-	shouldNotBeNilActual              = "The actual value was 'nil' and should be a value or a pointer to a value!"
-)
-
-const ( // time comparisons
-	shouldUseTimes                   = "You must provide time instances as arguments to this assertion."
-	shouldUseTimeSlice               = "You must provide a slice of time instances as the first argument to this assertion."
-	shouldUseDurationAndTime         = "You must provide a duration and a time as arguments to this assertion."
-	shouldHaveHappenedBefore         = "Expected '%v' to happen before '%v' (it happened '%v' after)!"
-	shouldHaveHappenedAfter          = "Expected '%v' to happen after '%v' (it happened '%v' before)!"
-	shouldHaveHappenedBetween        = "Expected '%v' to happen between '%v' and '%v' (it happened '%v' outside threshold)!"
-	shouldNotHaveHappenedOnOrBetween = "Expected '%v' to NOT happen on or between '%v' and '%v' (but it did)!"
-
-	// format params: incorrect-index, previous-index, previous-time, incorrect-index, incorrect-time
-	shouldHaveBeenChronological = "The 'Time' at index [%d] should have happened after the previous one (but it didn't!):\n  [%d]: %s\n  [%d]: %s (see, it happened before!)"
-)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go
deleted file mode 100644
index 7e75db1784..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/panic.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package assertions
-
-import "fmt"
-
-// ShouldPanic receives a void, niladic function and expects to recover a panic.
-func ShouldPanic(actual interface{}, expected ...interface{}) (message string) {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	action, _ := actual.(func())
-
-	if action == nil {
-		message = shouldUseVoidNiladicFunction
-		return
-	}
-
-	defer func() {
-		recovered := recover()
-		if recovered == nil {
-			message = shouldHavePanicked
-		} else {
-			message = success
-		}
-	}()
-	action()
-
-	return
-}
-
-// ShouldNotPanic receives a void, niladic function and expects to execute the function without any panic.
-func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string) {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	action, _ := actual.(func())
-
-	if action == nil {
-		message = shouldUseVoidNiladicFunction
-		return
-	}
-
-	defer func() {
-		recovered := recover()
-		if recovered != nil {
-			message = fmt.Sprintf(shouldNotHavePanicked, recovered)
-		} else {
-			message = success
-		}
-	}()
-	action()
-
-	return
-}
-
-// ShouldPanicWith receives a void, niladic function and expects to recover a panic with the second argument as the content.
-func ShouldPanicWith(actual interface{}, expected ...interface{}) (message string) {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	action, _ := actual.(func())
-
-	if action == nil {
-		message = shouldUseVoidNiladicFunction
-		return
-	}
-
-	defer func() {
-		recovered := recover()
-		if recovered == nil {
-			message = shouldHavePanicked
-		} else {
-			if equal := ShouldEqual(recovered, expected[0]); equal != success {
-				message = serializer.serialize(expected[0], recovered, fmt.Sprintf(shouldHavePanickedWith, expected[0], recovered))
-			} else {
-				message = success
-			}
-		}
-	}()
-	action()
-
-	return
-}
-
-// ShouldNotPanicWith receives a void, niladic function and expects to recover a panic whose content differs from the second argument.
-func ShouldNotPanicWith(actual interface{}, expected ...interface{}) (message string) {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	action, _ := actual.(func())
-
-	if action == nil {
-		message = shouldUseVoidNiladicFunction
-		return
-	}
-
-	defer func() {
-		recovered := recover()
-		if recovered == nil {
-			message = success
-		} else {
-			if equal := ShouldEqual(recovered, expected[0]); equal == success {
-				message = fmt.Sprintf(shouldNotHavePanickedWith, expected[0])
-			} else {
-				message = success
-			}
-		}
-	}()
-	action()
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go
deleted file mode 100644
index f28b0a062b..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/quantity.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-
-	"github.com/smartystreets/assertions/internal/oglematchers"
-)
-
-// ShouldBeGreaterThan receives exactly two parameters and ensures that the first is greater than the second.
-func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	if matchError := oglematchers.GreaterThan(expected[0]).Matches(actual); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenGreater, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldBeGreaterThanOrEqualTo receives exactly two parameters and ensures that the first is greater than or equal to the second.
-func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	} else if matchError := oglematchers.GreaterOrEqual(expected[0]).Matches(actual); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenGreaterOrEqual, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldBeLessThan receives exactly two parameters and ensures that the first is less than the second.
-func ShouldBeLessThan(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	} else if matchError := oglematchers.LessThan(expected[0]).Matches(actual); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenLess, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldBeLessThan receives exactly two parameters and ensures that the first is less than or equal to the second.
-func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	} else if matchError := oglematchers.LessOrEqual(expected[0]).Matches(actual); matchError != nil {
-		return fmt.Sprintf(shouldHaveBeenLessOrEqual, actual, expected[0])
-	}
-	return success
-}
-
-// ShouldBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound.
-// It ensures that the actual value is between both bounds (but not equal to either of them).
-func ShouldBeBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	lower, upper, fail := deriveBounds(expected)
-
-	if fail != success {
-		return fail
-	} else if !isBetween(actual, lower, upper) {
-		return fmt.Sprintf(shouldHaveBeenBetween, actual, lower, upper)
-	}
-	return success
-}
-
-// ShouldNotBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound.
-// It ensures that the actual value is NOT between both bounds.
-func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	lower, upper, fail := deriveBounds(expected)
-
-	if fail != success {
-		return fail
-	} else if isBetween(actual, lower, upper) {
-		return fmt.Sprintf(shouldNotHaveBeenBetween, actual, lower, upper)
-	}
-	return success
-}
-func deriveBounds(values []interface{}) (lower interface{}, upper interface{}, fail string) {
-	lower = values[0]
-	upper = values[1]
-
-	if ShouldNotEqual(lower, upper) != success {
-		return nil, nil, fmt.Sprintf(shouldHaveDifferentUpperAndLower, lower)
-	} else if ShouldBeLessThan(lower, upper) != success {
-		lower, upper = upper, lower
-	}
-	return lower, upper, success
-}
-func isBetween(value, lower, upper interface{}) bool {
-	if ShouldBeGreaterThan(value, lower) != success {
-		return false
-	} else if ShouldBeLessThan(value, upper) != success {
-		return false
-	}
-	return true
-}
-
-// ShouldBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound.
-// It ensures that the actual value is between both bounds or equal to one of them.
-func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	lower, upper, fail := deriveBounds(expected)
-
-	if fail != success {
-		return fail
-	} else if !isBetweenOrEqual(actual, lower, upper) {
-		return fmt.Sprintf(shouldHaveBeenBetweenOrEqual, actual, lower, upper)
-	}
-	return success
-}
-
-// ShouldNotBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound.
-// It ensures that the actual value is nopt between the bounds nor equal to either of them.
-func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	lower, upper, fail := deriveBounds(expected)
-
-	if fail != success {
-		return fail
-	} else if isBetweenOrEqual(actual, lower, upper) {
-		return fmt.Sprintf(shouldNotHaveBeenBetweenOrEqual, actual, lower, upper)
-	}
-	return success
-}
-
-func isBetweenOrEqual(value, lower, upper interface{}) bool {
-	if ShouldBeGreaterThanOrEqualTo(value, lower) != success {
-		return false
-	} else if ShouldBeLessThanOrEqualTo(value, upper) != success {
-		return false
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go
deleted file mode 100644
index 90ae3e3b69..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/serializer.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package assertions
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/smartystreets/assertions/internal/go-render/render"
-)
-
-type Serializer interface {
-	serialize(expected, actual interface{}, message string) string
-	serializeDetailed(expected, actual interface{}, message string) string
-}
-
-type failureSerializer struct{}
-
-func (self *failureSerializer) serializeDetailed(expected, actual interface{}, message string) string {
-	view := FailureView{
-		Message:  message,
-		Expected: render.Render(expected),
-		Actual:   render.Render(actual),
-	}
-	serialized, err := json.Marshal(view)
-	if err != nil {
-		return message
-	}
-	return string(serialized)
-}
-
-func (self *failureSerializer) serialize(expected, actual interface{}, message string) string {
-	view := FailureView{
-		Message:  message,
-		Expected: fmt.Sprintf("%+v", expected),
-		Actual:   fmt.Sprintf("%+v", actual),
-	}
-	serialized, err := json.Marshal(view)
-	if err != nil {
-		return message
-	}
-	return string(serialized)
-}
-
-func newSerializer() *failureSerializer {
-	return &failureSerializer{}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-// This struct is also declared in github.com/smartystreets/goconvey/convey/reporting.
-// The json struct tags should be equal in both declarations.
-type FailureView struct {
-	Message  string `json:"Message"`
-	Expected string `json:"Expected"`
-	Actual   string `json:"Actual"`
-}
-
-///////////////////////////////////////////////////////
-
-// noopSerializer just gives back the original message. This is useful when we are using
-// the assertions from a context other than the web UI, that requires the JSON structure
-// provided by the failureSerializer.
-type noopSerializer struct{}
-
-func (self *noopSerializer) serialize(expected, actual interface{}, message string) string {
-	return message
-}
-func (self *noopSerializer) serializeDetailed(expected, actual interface{}, message string) string {
-	return message
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go
deleted file mode 100644
index dbc3f04790..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/strings.go
+++ /dev/null
@@ -1,227 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// ShouldStartWith receives exactly 2 string parameters and ensures that the first starts with the second.
-func ShouldStartWith(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	value, valueIsString := actual.(string)
-	prefix, prefixIsString := expected[0].(string)
-
-	if !valueIsString || !prefixIsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	return shouldStartWith(value, prefix)
-}
-func shouldStartWith(value, prefix string) string {
-	if !strings.HasPrefix(value, prefix) {
-		shortval := value
-		if len(shortval) > len(prefix) {
-			shortval = shortval[:len(prefix)] + "..."
-		}
-		return serializer.serialize(prefix, shortval, fmt.Sprintf(shouldHaveStartedWith, value, prefix))
-	}
-	return success
-}
-
-// ShouldNotStartWith receives exactly 2 string parameters and ensures that the first does not start with the second.
-func ShouldNotStartWith(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	value, valueIsString := actual.(string)
-	prefix, prefixIsString := expected[0].(string)
-
-	if !valueIsString || !prefixIsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	return shouldNotStartWith(value, prefix)
-}
-func shouldNotStartWith(value, prefix string) string {
-	if strings.HasPrefix(value, prefix) {
-		if value == "" {
-			value = "<empty>"
-		}
-		if prefix == "" {
-			prefix = "<empty>"
-		}
-		return fmt.Sprintf(shouldNotHaveStartedWith, value, prefix)
-	}
-	return success
-}
-
-// ShouldEndWith receives exactly 2 string parameters and ensures that the first ends with the second.
-func ShouldEndWith(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	value, valueIsString := actual.(string)
-	suffix, suffixIsString := expected[0].(string)
-
-	if !valueIsString || !suffixIsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	return shouldEndWith(value, suffix)
-}
-func shouldEndWith(value, suffix string) string {
-	if !strings.HasSuffix(value, suffix) {
-		shortval := value
-		if len(shortval) > len(suffix) {
-			shortval = "..." + shortval[len(shortval)-len(suffix):]
-		}
-		return serializer.serialize(suffix, shortval, fmt.Sprintf(shouldHaveEndedWith, value, suffix))
-	}
-	return success
-}
-
-// ShouldEndWith receives exactly 2 string parameters and ensures that the first does not end with the second.
-func ShouldNotEndWith(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	value, valueIsString := actual.(string)
-	suffix, suffixIsString := expected[0].(string)
-
-	if !valueIsString || !suffixIsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	return shouldNotEndWith(value, suffix)
-}
-func shouldNotEndWith(value, suffix string) string {
-	if strings.HasSuffix(value, suffix) {
-		if value == "" {
-			value = "<empty>"
-		}
-		if suffix == "" {
-			suffix = "<empty>"
-		}
-		return fmt.Sprintf(shouldNotHaveEndedWith, value, suffix)
-	}
-	return success
-}
-
-// ShouldContainSubstring receives exactly 2 string parameters and ensures that the first contains the second as a substring.
-func ShouldContainSubstring(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	long, longOk := actual.(string)
-	short, shortOk := expected[0].(string)
-
-	if !longOk || !shortOk {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	if !strings.Contains(long, short) {
-		return serializer.serialize(expected[0], actual, fmt.Sprintf(shouldHaveContainedSubstring, long, short))
-	}
-	return success
-}
-
-// ShouldNotContainSubstring receives exactly 2 string parameters and ensures that the first does NOT contain the second as a substring.
-func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	long, longOk := actual.(string)
-	short, shortOk := expected[0].(string)
-
-	if !longOk || !shortOk {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	if strings.Contains(long, short) {
-		return fmt.Sprintf(shouldNotHaveContainedSubstring, long, short)
-	}
-	return success
-}
-
-// ShouldBeBlank receives exactly 1 string parameter and ensures that it is equal to "".
-func ShouldBeBlank(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-	value, ok := actual.(string)
-	if !ok {
-		return fmt.Sprintf(shouldBeString, reflect.TypeOf(actual))
-	}
-	if value != "" {
-		return serializer.serialize("", value, fmt.Sprintf(shouldHaveBeenBlank, value))
-	}
-	return success
-}
-
-// ShouldNotBeBlank receives exactly 1 string parameter and ensures that it is equal to "".
-func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-	value, ok := actual.(string)
-	if !ok {
-		return fmt.Sprintf(shouldBeString, reflect.TypeOf(actual))
-	}
-	if value == "" {
-		return shouldNotHaveBeenBlank
-	}
-	return success
-}
-
-// ShouldEqualWithout receives exactly 3 string parameters and ensures that the first is equal to the second
-// after removing all instances of the third from the first using strings.Replace(first, third, "", -1).
-func ShouldEqualWithout(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualString, ok1 := actual.(string)
-	expectedString, ok2 := expected[0].(string)
-	replace, ok3 := expected[1].(string)
-
-	if !ok1 || !ok2 || !ok3 {
-		return fmt.Sprintf(shouldAllBeStrings, []reflect.Type{
-			reflect.TypeOf(actual),
-			reflect.TypeOf(expected[0]),
-			reflect.TypeOf(expected[1]),
-		})
-	}
-
-	replaced := strings.Replace(actualString, replace, "", -1)
-	if replaced == expectedString {
-		return ""
-	}
-
-	return fmt.Sprintf("Expected '%s' to equal '%s' but without any '%s' (but it didn't).", actualString, expectedString, replace)
-}
-
-// ShouldEqualTrimSpace receives exactly 2 string parameters and ensures that the first is equal to the second
-// after removing all leading and trailing whitespace using strings.TrimSpace(first).
-func ShouldEqualTrimSpace(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	actualString, valueIsString := actual.(string)
-	_, value2IsString := expected[0].(string)
-
-	if !valueIsString || !value2IsString {
-		return fmt.Sprintf(shouldBothBeStrings, reflect.TypeOf(actual), reflect.TypeOf(expected[0]))
-	}
-
-	actualString = strings.TrimSpace(actualString)
-	return ShouldEqual(actualString, expected[0])
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/time.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/time.go
deleted file mode 100644
index 7e05026143..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/time.go
+++ /dev/null
@@ -1,202 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-	"time"
-)
-
-// ShouldHappenBefore receives exactly 2 time.Time arguments and asserts that the first happens before the second.
-func ShouldHappenBefore(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	expectedTime, secondOk := expected[0].(time.Time)
-
-	if !firstOk || !secondOk {
-		return shouldUseTimes
-	}
-
-	if !actualTime.Before(expectedTime) {
-		return fmt.Sprintf(shouldHaveHappenedBefore, actualTime, expectedTime, actualTime.Sub(expectedTime))
-	}
-
-	return success
-}
-
-// ShouldHappenOnOrBefore receives exactly 2 time.Time arguments and asserts that the first happens on or before the second.
-func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	expectedTime, secondOk := expected[0].(time.Time)
-
-	if !firstOk || !secondOk {
-		return shouldUseTimes
-	}
-
-	if actualTime.Equal(expectedTime) {
-		return success
-	}
-	return ShouldHappenBefore(actualTime, expectedTime)
-}
-
-// ShouldHappenAfter receives exactly 2 time.Time arguments and asserts that the first happens after the second.
-func ShouldHappenAfter(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	expectedTime, secondOk := expected[0].(time.Time)
-
-	if !firstOk || !secondOk {
-		return shouldUseTimes
-	}
-	if !actualTime.After(expectedTime) {
-		return fmt.Sprintf(shouldHaveHappenedAfter, actualTime, expectedTime, expectedTime.Sub(actualTime))
-	}
-	return success
-}
-
-// ShouldHappenOnOrAfter receives exactly 2 time.Time arguments and asserts that the first happens on or after the second.
-func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	expectedTime, secondOk := expected[0].(time.Time)
-
-	if !firstOk || !secondOk {
-		return shouldUseTimes
-	}
-	if actualTime.Equal(expectedTime) {
-		return success
-	}
-	return ShouldHappenAfter(actualTime, expectedTime)
-}
-
-// ShouldHappenBetween receives exactly 3 time.Time arguments and asserts that the first happens between (not on) the second and third.
-func ShouldHappenBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	min, secondOk := expected[0].(time.Time)
-	max, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseTimes
-	}
-
-	if !actualTime.After(min) {
-		return fmt.Sprintf(shouldHaveHappenedBetween, actualTime, min, max, min.Sub(actualTime))
-	}
-	if !actualTime.Before(max) {
-		return fmt.Sprintf(shouldHaveHappenedBetween, actualTime, min, max, actualTime.Sub(max))
-	}
-	return success
-}
-
-// ShouldHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first happens between or on the second and third.
-func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	min, secondOk := expected[0].(time.Time)
-	max, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseTimes
-	}
-	if actualTime.Equal(min) || actualTime.Equal(max) {
-		return success
-	}
-	return ShouldHappenBetween(actualTime, min, max)
-}
-
-// ShouldNotHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first
-// does NOT happen between or on the second or third.
-func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	min, secondOk := expected[0].(time.Time)
-	max, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseTimes
-	}
-	if actualTime.Equal(min) || actualTime.Equal(max) {
-		return fmt.Sprintf(shouldNotHaveHappenedOnOrBetween, actualTime, min, max)
-	}
-	if actualTime.After(min) && actualTime.Before(max) {
-		return fmt.Sprintf(shouldNotHaveHappenedOnOrBetween, actualTime, min, max)
-	}
-	return success
-}
-
-// ShouldHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments)
-// and asserts that the first time.Time happens within or on the duration specified relative to
-// the other time.Time.
-func ShouldHappenWithin(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	tolerance, secondOk := expected[0].(time.Duration)
-	threshold, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseDurationAndTime
-	}
-
-	min := threshold.Add(-tolerance)
-	max := threshold.Add(tolerance)
-	return ShouldHappenOnOrBetween(actualTime, min, max)
-}
-
-// ShouldNotHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments)
-// and asserts that the first time.Time does NOT happen within or on the duration specified relative to
-// the other time.Time.
-func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string {
-	if fail := need(2, expected); fail != success {
-		return fail
-	}
-	actualTime, firstOk := actual.(time.Time)
-	tolerance, secondOk := expected[0].(time.Duration)
-	threshold, thirdOk := expected[1].(time.Time)
-
-	if !firstOk || !secondOk || !thirdOk {
-		return shouldUseDurationAndTime
-	}
-
-	min := threshold.Add(-tolerance)
-	max := threshold.Add(tolerance)
-	return ShouldNotHappenOnOrBetween(actualTime, min, max)
-}
-
-// ShouldBeChronological receives a []time.Time slice and asserts that the are
-// in chronological order starting with the first time.Time as the earliest.
-func ShouldBeChronological(actual interface{}, expected ...interface{}) string {
-	if fail := need(0, expected); fail != success {
-		return fail
-	}
-
-	times, ok := actual.([]time.Time)
-	if !ok {
-		return shouldUseTimeSlice
-	}
-
-	var previous time.Time
-	for i, current := range times {
-		if i > 0 && current.Before(previous) {
-			return fmt.Sprintf(shouldHaveBeenChronological,
-				i, i-1, previous.String(), i, current.String())
-		}
-		previous = current
-	}
-	return ""
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/assertions/type.go b/Godeps/_workspace/src/github.com/smartystreets/assertions/type.go
deleted file mode 100644
index 3fc00f68cd..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/assertions/type.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package assertions
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// ShouldHaveSameTypeAs receives exactly two parameters and compares their underlying types for equality.
-func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	first := reflect.TypeOf(actual)
-	second := reflect.TypeOf(expected[0])
-
-	if equal := ShouldEqual(first, second); equal != success {
-		return serializer.serialize(second, first, fmt.Sprintf(shouldHaveBeenA, actual, second, first))
-	}
-	return success
-}
-
-// ShouldNotHaveSameTypeAs receives exactly two parameters and compares their underlying types for inequality.
-func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string {
-	if fail := need(1, expected); fail != success {
-		return fail
-	}
-
-	first := reflect.TypeOf(actual)
-	second := reflect.TypeOf(expected[0])
-
-	if equal := ShouldEqual(first, second); equal == success {
-		return fmt.Sprintf(shouldNotHaveBeenA, actual, second)
-	}
-	return success
-}
-
-// ShouldImplement receives exactly two parameters and ensures
-// that the first implements the interface type of the second.
-func ShouldImplement(actual interface{}, expectedList ...interface{}) string {
-	if fail := need(1, expectedList); fail != success {
-		return fail
-	}
-
-	expected := expectedList[0]
-	if fail := ShouldBeNil(expected); fail != success {
-		return shouldCompareWithInterfacePointer
-	}
-
-	if fail := ShouldNotBeNil(actual); fail != success {
-		return shouldNotBeNilActual
-	}
-
-	var actualType reflect.Type
-	if reflect.TypeOf(actual).Kind() != reflect.Ptr {
-		actualType = reflect.PtrTo(reflect.TypeOf(actual))
-	} else {
-		actualType = reflect.TypeOf(actual)
-	}
-
-	expectedType := reflect.TypeOf(expected)
-	if fail := ShouldNotBeNil(expectedType); fail != success {
-		return shouldCompareWithInterfacePointer
-	}
-
-	expectedInterface := expectedType.Elem()
-
-	if actualType == nil {
-		return fmt.Sprintf(shouldHaveImplemented, expectedInterface, actual)
-	}
-
-	if !actualType.Implements(expectedInterface) {
-		return fmt.Sprintf(shouldHaveImplemented, expectedInterface, actualType)
-	}
-	return success
-}
-
-// ShouldNotImplement receives exactly two parameters and ensures
-// that the first does NOT implement the interface type of the second.
-func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string {
-	if fail := need(1, expectedList); fail != success {
-		return fail
-	}
-
-	expected := expectedList[0]
-	if fail := ShouldBeNil(expected); fail != success {
-		return shouldCompareWithInterfacePointer
-	}
-
-	if fail := ShouldNotBeNil(actual); fail != success {
-		return shouldNotBeNilActual
-	}
-
-	var actualType reflect.Type
-	if reflect.TypeOf(actual).Kind() != reflect.Ptr {
-		actualType = reflect.PtrTo(reflect.TypeOf(actual))
-	} else {
-		actualType = reflect.TypeOf(actual)
-	}
-
-	expectedType := reflect.TypeOf(expected)
-	if fail := ShouldNotBeNil(expectedType); fail != success {
-		return shouldCompareWithInterfacePointer
-	}
-
-	expectedInterface := expectedType.Elem()
-
-	if actualType.Implements(expectedInterface) {
-		return fmt.Sprintf(shouldNotHaveImplemented, actualType, expectedInterface)
-	}
-	return success
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go
deleted file mode 100644
index 1e87b826df..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/assertions.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package convey
-
-import "github.com/smartystreets/assertions"
-
-var (
-	ShouldEqual          = assertions.ShouldEqual
-	ShouldNotEqual       = assertions.ShouldNotEqual
-	ShouldAlmostEqual    = assertions.ShouldAlmostEqual
-	ShouldNotAlmostEqual = assertions.ShouldNotAlmostEqual
-	ShouldResemble       = assertions.ShouldResemble
-	ShouldNotResemble    = assertions.ShouldNotResemble
-	ShouldPointTo        = assertions.ShouldPointTo
-	ShouldNotPointTo     = assertions.ShouldNotPointTo
-	ShouldBeNil          = assertions.ShouldBeNil
-	ShouldNotBeNil       = assertions.ShouldNotBeNil
-	ShouldBeTrue         = assertions.ShouldBeTrue
-	ShouldBeFalse        = assertions.ShouldBeFalse
-	ShouldBeZeroValue    = assertions.ShouldBeZeroValue
-
-	ShouldBeGreaterThan          = assertions.ShouldBeGreaterThan
-	ShouldBeGreaterThanOrEqualTo = assertions.ShouldBeGreaterThanOrEqualTo
-	ShouldBeLessThan             = assertions.ShouldBeLessThan
-	ShouldBeLessThanOrEqualTo    = assertions.ShouldBeLessThanOrEqualTo
-	ShouldBeBetween              = assertions.ShouldBeBetween
-	ShouldNotBeBetween           = assertions.ShouldNotBeBetween
-	ShouldBeBetweenOrEqual       = assertions.ShouldBeBetweenOrEqual
-	ShouldNotBeBetweenOrEqual    = assertions.ShouldNotBeBetweenOrEqual
-
-	ShouldContain       = assertions.ShouldContain
-	ShouldNotContain    = assertions.ShouldNotContain
-	ShouldContainKey    = assertions.ShouldContainKey
-	ShouldNotContainKey = assertions.ShouldNotContainKey
-	ShouldBeIn          = assertions.ShouldBeIn
-	ShouldNotBeIn       = assertions.ShouldNotBeIn
-	ShouldBeEmpty       = assertions.ShouldBeEmpty
-	ShouldNotBeEmpty    = assertions.ShouldNotBeEmpty
-	ShouldHaveLength    = assertions.ShouldHaveLength
-
-	ShouldStartWith           = assertions.ShouldStartWith
-	ShouldNotStartWith        = assertions.ShouldNotStartWith
-	ShouldEndWith             = assertions.ShouldEndWith
-	ShouldNotEndWith          = assertions.ShouldNotEndWith
-	ShouldBeBlank             = assertions.ShouldBeBlank
-	ShouldNotBeBlank          = assertions.ShouldNotBeBlank
-	ShouldContainSubstring    = assertions.ShouldContainSubstring
-	ShouldNotContainSubstring = assertions.ShouldNotContainSubstring
-
-	ShouldPanic        = assertions.ShouldPanic
-	ShouldNotPanic     = assertions.ShouldNotPanic
-	ShouldPanicWith    = assertions.ShouldPanicWith
-	ShouldNotPanicWith = assertions.ShouldNotPanicWith
-
-	ShouldHaveSameTypeAs    = assertions.ShouldHaveSameTypeAs
-	ShouldNotHaveSameTypeAs = assertions.ShouldNotHaveSameTypeAs
-	ShouldImplement         = assertions.ShouldImplement
-	ShouldNotImplement      = assertions.ShouldNotImplement
-
-	ShouldHappenBefore         = assertions.ShouldHappenBefore
-	ShouldHappenOnOrBefore     = assertions.ShouldHappenOnOrBefore
-	ShouldHappenAfter          = assertions.ShouldHappenAfter
-	ShouldHappenOnOrAfter      = assertions.ShouldHappenOnOrAfter
-	ShouldHappenBetween        = assertions.ShouldHappenBetween
-	ShouldHappenOnOrBetween    = assertions.ShouldHappenOnOrBetween
-	ShouldNotHappenOnOrBetween = assertions.ShouldNotHappenOnOrBetween
-	ShouldHappenWithin         = assertions.ShouldHappenWithin
-	ShouldNotHappenWithin      = assertions.ShouldNotHappenWithin
-	ShouldBeChronological      = assertions.ShouldBeChronological
-)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go
deleted file mode 100644
index 2c75c2d7b1..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/context.go
+++ /dev/null
@@ -1,272 +0,0 @@
-package convey
-
-import (
-	"fmt"
-
-	"github.com/jtolds/gls"
-	"github.com/smartystreets/goconvey/convey/reporting"
-)
-
-type conveyErr struct {
-	fmt    string
-	params []interface{}
-}
-
-func (e *conveyErr) Error() string {
-	return fmt.Sprintf(e.fmt, e.params...)
-}
-
-func conveyPanic(fmt string, params ...interface{}) {
-	panic(&conveyErr{fmt, params})
-}
-
-const (
-	missingGoTest = `Top-level calls to Convey(...) need a reference to the *testing.T.
-		Hint: Convey("description here", t, func() { /* notice that the second argument was the *testing.T (t)! */ }) `
-	extraGoTest    = `Only the top-level call to Convey(...) needs a reference to the *testing.T.`
-	noStackContext = "Convey operation made without context on goroutine stack.\n" +
-		"Hint: Perhaps you meant to use `Convey(..., func(c C){...})` ?"
-	differentConveySituations = "Different set of Convey statements on subsequent pass!\nDid not expect %#v."
-	multipleIdenticalConvey   = "Multiple convey suites with identical names: %#v"
-)
-
-const (
-	failureHalt = "___FAILURE_HALT___"
-
-	nodeKey = "node"
-)
-
-///////////////////////////////// Stack Context /////////////////////////////////
-
-func getCurrentContext() *context {
-	ctx, ok := ctxMgr.GetValue(nodeKey)
-	if ok {
-		return ctx.(*context)
-	}
-	return nil
-}
-
-func mustGetCurrentContext() *context {
-	ctx := getCurrentContext()
-	if ctx == nil {
-		conveyPanic(noStackContext)
-	}
-	return ctx
-}
-
-//////////////////////////////////// Context ////////////////////////////////////
-
-// context magically handles all coordination of Convey's and So assertions.
-//
-// It is tracked on the stack as goroutine-local-storage with the gls package,
-// or explicitly if the user decides to call convey like:
-//
-//   Convey(..., func(c C) {
-//     c.So(...)
-//   })
-//
-// This implements the `C` interface.
-type context struct {
-	reporter reporting.Reporter
-
-	children map[string]*context
-
-	resets []func()
-
-	executedOnce   bool
-	expectChildRun *bool
-	complete       bool
-
-	focus       bool
-	failureMode FailureMode
-}
-
-// rootConvey is the main entry point to a test suite. This is called when
-// there's no context in the stack already, and items must contain a `t` object,
-// or this panics.
-func rootConvey(items ...interface{}) {
-	entry := discover(items)
-
-	if entry.Test == nil {
-		conveyPanic(missingGoTest)
-	}
-
-	expectChildRun := true
-	ctx := &context{
-		reporter: buildReporter(),
-
-		children: make(map[string]*context),
-
-		expectChildRun: &expectChildRun,
-
-		focus:       entry.Focus,
-		failureMode: defaultFailureMode.combine(entry.FailMode),
-	}
-	ctxMgr.SetValues(gls.Values{nodeKey: ctx}, func() {
-		ctx.reporter.BeginStory(reporting.NewStoryReport(entry.Test))
-		defer ctx.reporter.EndStory()
-
-		for ctx.shouldVisit() {
-			ctx.conveyInner(entry.Situation, entry.Func)
-			expectChildRun = true
-		}
-	})
-}
-
-//////////////////////////////////// Methods ////////////////////////////////////
-
-func (ctx *context) SkipConvey(items ...interface{}) {
-	ctx.Convey(items, skipConvey)
-}
-
-func (ctx *context) FocusConvey(items ...interface{}) {
-	ctx.Convey(items, focusConvey)
-}
-
-func (ctx *context) Convey(items ...interface{}) {
-	entry := discover(items)
-
-	// we're a branch, or leaf (on the wind)
-	if entry.Test != nil {
-		conveyPanic(extraGoTest)
-	}
-	if ctx.focus && !entry.Focus {
-		return
-	}
-
-	var inner_ctx *context
-	if ctx.executedOnce {
-		var ok bool
-		inner_ctx, ok = ctx.children[entry.Situation]
-		if !ok {
-			conveyPanic(differentConveySituations, entry.Situation)
-		}
-	} else {
-		if _, ok := ctx.children[entry.Situation]; ok {
-			conveyPanic(multipleIdenticalConvey, entry.Situation)
-		}
-		inner_ctx = &context{
-			reporter: ctx.reporter,
-
-			children: make(map[string]*context),
-
-			expectChildRun: ctx.expectChildRun,
-
-			focus:       entry.Focus,
-			failureMode: ctx.failureMode.combine(entry.FailMode),
-		}
-		ctx.children[entry.Situation] = inner_ctx
-	}
-
-	if inner_ctx.shouldVisit() {
-		ctxMgr.SetValues(gls.Values{nodeKey: inner_ctx}, func() {
-			inner_ctx.conveyInner(entry.Situation, entry.Func)
-		})
-	}
-}
-
-func (ctx *context) SkipSo(stuff ...interface{}) {
-	ctx.assertionReport(reporting.NewSkipReport())
-}
-
-func (ctx *context) So(actual interface{}, assert assertion, expected ...interface{}) {
-	if result := assert(actual, expected...); result == assertionSuccess {
-		ctx.assertionReport(reporting.NewSuccessReport())
-	} else {
-		ctx.assertionReport(reporting.NewFailureReport(result))
-	}
-}
-
-func (ctx *context) Reset(action func()) {
-	/* TODO: Failure mode configuration */
-	ctx.resets = append(ctx.resets, action)
-}
-
-func (ctx *context) Print(items ...interface{}) (int, error) {
-	fmt.Fprint(ctx.reporter, items...)
-	return fmt.Print(items...)
-}
-
-func (ctx *context) Println(items ...interface{}) (int, error) {
-	fmt.Fprintln(ctx.reporter, items...)
-	return fmt.Println(items...)
-}
-
-func (ctx *context) Printf(format string, items ...interface{}) (int, error) {
-	fmt.Fprintf(ctx.reporter, format, items...)
-	return fmt.Printf(format, items...)
-}
-
-//////////////////////////////////// Private ////////////////////////////////////
-
-// shouldVisit returns true iff we should traverse down into a Convey. Note
-// that just because we don't traverse a Convey this time, doesn't mean that
-// we may not traverse it on a subsequent pass.
-func (c *context) shouldVisit() bool {
-	return !c.complete && *c.expectChildRun
-}
-
-// conveyInner is the function which actually executes the user's anonymous test
-// function body. At this point, Convey or RootConvey has decided that this
-// function should actually run.
-func (ctx *context) conveyInner(situation string, f func(C)) {
-	// Record/Reset state for next time.
-	defer func() {
-		ctx.executedOnce = true
-
-		// This is only needed at the leaves, but there's no harm in also setting it
-		// when returning from branch Convey's
-		*ctx.expectChildRun = false
-	}()
-
-	// Set up+tear down our scope for the reporter
-	ctx.reporter.Enter(reporting.NewScopeReport(situation))
-	defer ctx.reporter.Exit()
-
-	// Recover from any panics in f, and assign the `complete` status for this
-	// node of the tree.
-	defer func() {
-		ctx.complete = true
-		if problem := recover(); problem != nil {
-			if problem, ok := problem.(*conveyErr); ok {
-				panic(problem)
-			}
-			if problem != failureHalt {
-				ctx.reporter.Report(reporting.NewErrorReport(problem))
-			}
-		} else {
-			for _, child := range ctx.children {
-				if !child.complete {
-					ctx.complete = false
-					return
-				}
-			}
-		}
-	}()
-
-	// Resets are registered as the `f` function executes, so nil them here.
-	// All resets are run in registration order (FIFO).
-	ctx.resets = []func(){}
-	defer func() {
-		for _, r := range ctx.resets {
-			// panics handled by the previous defer
-			r()
-		}
-	}()
-
-	if f == nil {
-		// if f is nil, this was either a Convey(..., nil), or a SkipConvey
-		ctx.reporter.Report(reporting.NewSkipReport())
-	} else {
-		f(ctx)
-	}
-}
-
-// assertionReport is a helper for So and SkipSo which makes the report and
-// then possibly panics, depending on the current context's failureMode.
-func (ctx *context) assertionReport(r *reporting.AssertionResult) {
-	ctx.reporter.Report(r)
-	if r.Failure != "" && ctx.failureMode == FailureHalts {
-		panic(failureHalt)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey
deleted file mode 100644
index a2d9327dc9..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/convey.goconvey
+++ /dev/null
@@ -1,4 +0,0 @@
-#ignore
--timeout=1s
-#-covermode=count
-#-coverpkg=github.com/smartystreets/goconvey/convey,github.com/smartystreets/goconvey/convey/gotest,github.com/smartystreets/goconvey/convey/reporting
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go
deleted file mode 100644
index eb8d4cb2ce..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/discovery.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package convey
-
-type actionSpecifier uint8
-
-const (
-	noSpecifier actionSpecifier = iota
-	skipConvey
-	focusConvey
-)
-
-type suite struct {
-	Situation string
-	Test      t
-	Focus     bool
-	Func      func(C) // nil means skipped
-	FailMode  FailureMode
-}
-
-func newSuite(situation string, failureMode FailureMode, f func(C), test t, specifier actionSpecifier) *suite {
-	ret := &suite{
-		Situation: situation,
-		Test:      test,
-		Func:      f,
-		FailMode:  failureMode,
-	}
-	switch specifier {
-	case skipConvey:
-		ret.Func = nil
-	case focusConvey:
-		ret.Focus = true
-	}
-	return ret
-}
-
-func discover(items []interface{}) *suite {
-	name, items := parseName(items)
-	test, items := parseGoTest(items)
-	failure, items := parseFailureMode(items)
-	action, items := parseAction(items)
-	specifier, items := parseSpecifier(items)
-
-	if len(items) != 0 {
-		conveyPanic(parseError)
-	}
-
-	return newSuite(name, failure, action, test, specifier)
-}
-func item(items []interface{}) interface{} {
-	if len(items) == 0 {
-		conveyPanic(parseError)
-	}
-	return items[0]
-}
-func parseName(items []interface{}) (string, []interface{}) {
-	if name, parsed := item(items).(string); parsed {
-		return name, items[1:]
-	}
-	conveyPanic(parseError)
-	panic("never get here")
-}
-func parseGoTest(items []interface{}) (t, []interface{}) {
-	if test, parsed := item(items).(t); parsed {
-		return test, items[1:]
-	}
-	return nil, items
-}
-func parseFailureMode(items []interface{}) (FailureMode, []interface{}) {
-	if mode, parsed := item(items).(FailureMode); parsed {
-		return mode, items[1:]
-	}
-	return FailureInherits, items
-}
-func parseAction(items []interface{}) (func(C), []interface{}) {
-	switch x := item(items).(type) {
-	case nil:
-		return nil, items[1:]
-	case func(C):
-		return x, items[1:]
-	case func():
-		return func(C) { x() }, items[1:]
-	}
-	conveyPanic(parseError)
-	panic("never get here")
-}
-func parseSpecifier(items []interface{}) (actionSpecifier, []interface{}) {
-	if len(items) == 0 {
-		return noSpecifier, items
-	}
-	if spec, ok := items[0].(actionSpecifier); ok {
-		return spec, items[1:]
-	}
-	conveyPanic(parseError)
-	panic("never get here")
-}
-
-// This interface allows us to pass the *testing.T struct
-// throughout the internals of this package without ever
-// having to import the "testing" package.
-type t interface {
-	Fail()
-}
-
-const parseError = "You must provide a name (string), then a *testing.T (if in outermost scope), an optional FailureMode, and then an action (func())."
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go
deleted file mode 100644
index 2562ce4c28..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/doc.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Package convey contains all of the public-facing entry points to this project.
-// This means that it should never be required of the user to import any other
-// packages from this project as they serve internal purposes.
-package convey
-
-import "github.com/smartystreets/goconvey/convey/reporting"
-
-////////////////////////////////// suite //////////////////////////////////
-
-// C is the Convey context which you can optionally obtain in your action
-// by calling Convey like:
-//
-//   Convey(..., func(c C) {
-//     ...
-//   })
-//
-// See the documentation on Convey for more details.
-//
-// All methods in this context behave identically to the global functions of the
-// same name in this package.
-type C interface {
-	Convey(items ...interface{})
-	SkipConvey(items ...interface{})
-	FocusConvey(items ...interface{})
-
-	So(actual interface{}, assert assertion, expected ...interface{})
-	SkipSo(stuff ...interface{})
-
-	Reset(action func())
-
-	Println(items ...interface{}) (int, error)
-	Print(items ...interface{}) (int, error)
-	Printf(format string, items ...interface{}) (int, error)
-}
-
-// Convey is the method intended for use when declaring the scopes of
-// a specification. Each scope has a description and a func() which may contain
-// other calls to Convey(), Reset() or Should-style assertions. Convey calls can
-// be nested as far as you see fit.
-//
-// IMPORTANT NOTE: The top-level Convey() within a Test method
-// must conform to the following signature:
-//
-//     Convey(description string, t *testing.T, action func())
-//
-// All other calls should look like this (no need to pass in *testing.T):
-//
-//     Convey(description string, action func())
-//
-// Don't worry, goconvey will panic if you get it wrong so you can fix it.
-//
-// Additionally, you may explicitly obtain access to the Convey context by doing:
-//
-//     Convey(description string, action func(c C))
-//
-// You may need to do this if you want to pass the context through to a
-// goroutine, or to close over the context in a handler to a library which
-// calls your handler in a goroutine (httptest comes to mind).
-//
-// All Convey()-blocks also accept an optional parameter of FailureMode which sets
-// how goconvey should treat failures for So()-assertions in the block and
-// nested blocks. See the constants in this file for the available options.
-//
-// By default it will inherit from its parent block and the top-level blocks
-// default to the FailureHalts setting.
-//
-// This parameter is inserted before the block itself:
-//
-//     Convey(description string, t *testing.T, mode FailureMode, action func())
-//     Convey(description string, mode FailureMode, action func())
-//
-// See the examples package for, well, examples.
-func Convey(items ...interface{}) {
-	if ctx := getCurrentContext(); ctx == nil {
-		rootConvey(items...)
-	} else {
-		ctx.Convey(items...)
-	}
-}
-
-// SkipConvey is analagous to Convey except that the scope is not executed
-// (which means that child scopes defined within this scope are not run either).
-// The reporter will be notified that this step was skipped.
-func SkipConvey(items ...interface{}) {
-	Convey(append(items, skipConvey)...)
-}
-
-// FocusConvey is has the inverse effect of SkipConvey. If the top-level
-// Convey is changed to `FocusConvey`, only nested scopes that are defined
-// with FocusConvey will be run. The rest will be ignored completely. This
-// is handy when debugging a large suite that runs a misbehaving function
-// repeatedly as you can disable all but one of that function
-// without swaths of `SkipConvey` calls, just a targeted chain of calls
-// to FocusConvey.
-func FocusConvey(items ...interface{}) {
-	Convey(append(items, focusConvey)...)
-}
-
-// Reset registers a cleanup function to be run after each Convey()
-// in the same scope. See the examples package for a simple use case.
-func Reset(action func()) {
-	mustGetCurrentContext().Reset(action)
-}
-
-/////////////////////////////////// Assertions ///////////////////////////////////
-
-// assertion is an alias for a function with a signature that the convey.So()
-// method can handle. Any future or custom assertions should conform to this
-// method signature. The return value should be an empty string if the assertion
-// passes and a well-formed failure message if not.
-type assertion func(actual interface{}, expected ...interface{}) string
-
-const assertionSuccess = ""
-
-// So is the means by which assertions are made against the system under test.
-// The majority of exported names in the assertions package begin with the word
-// 'Should' and describe how the first argument (actual) should compare with any
-// of the final (expected) arguments. How many final arguments are accepted
-// depends on the particular assertion that is passed in as the assert argument.
-// See the examples package for use cases and the assertions package for
-// documentation on specific assertion methods. A failing assertion will
-// cause t.Fail() to be invoked--you should never call this method (or other
-// failure-inducing methods) in your test code. Leave that to GoConvey.
-func So(actual interface{}, assert assertion, expected ...interface{}) {
-	mustGetCurrentContext().So(actual, assert, expected...)
-}
-
-// SkipSo is analagous to So except that the assertion that would have been passed
-// to So is not executed and the reporter is notified that the assertion was skipped.
-func SkipSo(stuff ...interface{}) {
-	mustGetCurrentContext().SkipSo()
-}
-
-// FailureMode is a type which determines how the So() blocks should fail
-// if their assertion fails. See constants further down for acceptable values
-type FailureMode string
-
-const (
-
-	// FailureContinues is a failure mode which prevents failing
-	// So()-assertions from halting Convey-block execution, instead
-	// allowing the test to continue past failing So()-assertions.
-	FailureContinues FailureMode = "continue"
-
-	// FailureHalts is the default setting for a top-level Convey()-block
-	// and will cause all failing So()-assertions to halt further execution
-	// in that test-arm and continue on to the next arm.
-	FailureHalts FailureMode = "halt"
-
-	// FailureInherits is the default setting for failure-mode, it will
-	// default to the failure-mode of the parent block. You should never
-	// need to specify this mode in your tests..
-	FailureInherits FailureMode = "inherits"
-)
-
-func (f FailureMode) combine(other FailureMode) FailureMode {
-	if other == FailureInherits {
-		return f
-	}
-	return other
-}
-
-var defaultFailureMode FailureMode = FailureHalts
-
-// SetDefaultFailureMode allows you to specify the default failure mode
-// for all Convey blocks. It is meant to be used in an init function to
-// allow the default mode to be changdd across all tests for an entire packgae
-// but it can be used anywhere.
-func SetDefaultFailureMode(mode FailureMode) {
-	if mode == FailureContinues || mode == FailureHalts {
-		defaultFailureMode = mode
-	} else {
-		panic("You may only use the constants named 'FailureContinues' and 'FailureHalts' as default failure modes.")
-	}
-}
-
-//////////////////////////////////// Print functions ////////////////////////////////////
-
-// Print is analogous to fmt.Print (and it even calls fmt.Print). It ensures that
-// output is aligned with the corresponding scopes in the web UI.
-func Print(items ...interface{}) (written int, err error) {
-	return mustGetCurrentContext().Print(items...)
-}
-
-// Print is analogous to fmt.Println (and it even calls fmt.Println). It ensures that
-// output is aligned with the corresponding scopes in the web UI.
-func Println(items ...interface{}) (written int, err error) {
-	return mustGetCurrentContext().Println(items...)
-}
-
-// Print is analogous to fmt.Printf (and it even calls fmt.Printf). It ensures that
-// output is aligned with the corresponding scopes in the web UI.
-func Printf(format string, items ...interface{}) (written int, err error) {
-	return mustGetCurrentContext().Printf(format, items...)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-// SuppressConsoleStatistics prevents automatic printing of console statistics.
-// Calling PrintConsoleStatistics explicitly will force printing of statistics.
-func SuppressConsoleStatistics() {
-	reporting.SuppressConsoleStatistics()
-}
-
-// ConsoleStatistics may be called at any time to print assertion statistics.
-// Generally, the best place to do this would be in a TestMain function,
-// after all tests have been run. Something like this:
-//
-// func TestMain(m *testing.M) {
-//     convey.SuppressConsoleStatistics()
-//     result := m.Run()
-//     convey.PrintConsoleStatistics()
-//     os.Exit(result)
-// }
-//
-func PrintConsoleStatistics() {
-	reporting.PrintConsoleStatistics()
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go
deleted file mode 100644
index 3a5c848a44..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/gotest/utils.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Package gotest contains internal functionality. Although this package
-// contains one or more exported names it is not intended for public
-// consumption. See the examples package for how to use this project.
-package gotest
-
-import (
-	"runtime"
-	"strings"
-)
-
-func ResolveExternalCaller() (file string, line int, name string) {
-	var caller_id uintptr
-	callers := runtime.Callers(0, callStack)
-
-	for x := 0; x < callers; x++ {
-		caller_id, file, line, _ = runtime.Caller(x)
-		if strings.HasSuffix(file, "_test.go") || strings.HasSuffix(file, "_tests.go") {
-			name = runtime.FuncForPC(caller_id).Name()
-			return
-		}
-	}
-	file, line, name = "<unkown file>", -1, "<unknown name>"
-	return // panic?
-}
-
-const maxStackDepth = 100 // This had better be enough...
-
-var callStack []uintptr = make([]uintptr, maxStackDepth, maxStackDepth)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go
deleted file mode 100644
index 1d77ff3dcd..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/init.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package convey
-
-import (
-	"flag"
-	"os"
-
-	"github.com/jtolds/gls"
-	"github.com/smartystreets/assertions"
-	"github.com/smartystreets/goconvey/convey/reporting"
-)
-
-func init() {
-	assertions.GoConveyMode(true)
-
-	declareFlags()
-
-	ctxMgr = gls.NewContextManager()
-}
-
-func declareFlags() {
-	flag.BoolVar(&json, "convey-json", false, "When true, emits results in JSON blocks. Default: 'false'")
-	flag.BoolVar(&silent, "convey-silent", false, "When true, all output from GoConvey is suppressed.")
-	flag.BoolVar(&story, "convey-story", false, "When true, emits story output, otherwise emits dot output. When not provided, this flag mirros the value of the '-test.v' flag")
-
-	if noStoryFlagProvided() {
-		story = verboseEnabled
-	}
-
-	// FYI: flag.Parse() is called from the testing package.
-}
-
-func noStoryFlagProvided() bool {
-	return !story && !storyDisabled
-}
-
-func buildReporter() reporting.Reporter {
-	selectReporter := os.Getenv("GOCONVEY_REPORTER")
-
-	switch {
-	case testReporter != nil:
-		return testReporter
-	case json || selectReporter == "json":
-		return reporting.BuildJsonReporter()
-	case silent || selectReporter == "silent":
-		return reporting.BuildSilentReporter()
-	case selectReporter == "dot":
-		// Story is turned on when verbose is set, so we need to check for dot reporter first.
-		return reporting.BuildDotReporter()
-	case story || selectReporter == "story":
-		return reporting.BuildStoryReporter()
-	default:
-		return reporting.BuildDotReporter()
-	}
-}
-
-var (
-	ctxMgr *gls.ContextManager
-
-	// only set by internal tests
-	testReporter reporting.Reporter
-)
-
-var (
-	json   bool
-	silent bool
-	story  bool
-
-	verboseEnabled = flagFound("-test.v=true")
-	storyDisabled  = flagFound("-story=false")
-)
-
-// flagFound parses the command line args manually for flags defined in other
-// packages. Like the '-v' flag from the "testing" package, for instance.
-func flagFound(flagValue string) bool {
-	for _, arg := range os.Args {
-		if arg == flagValue {
-			return true
-		}
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go
deleted file mode 100644
index 777b2a5122..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/nilReporter.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package convey
-
-import (
-	"github.com/smartystreets/goconvey/convey/reporting"
-)
-
-type nilReporter struct{}
-
-func (self *nilReporter) BeginStory(story *reporting.StoryReport)  {}
-func (self *nilReporter) Enter(scope *reporting.ScopeReport)       {}
-func (self *nilReporter) Report(report *reporting.AssertionResult) {}
-func (self *nilReporter) Exit()                                    {}
-func (self *nilReporter) EndStory()                                {}
-func (self *nilReporter) Write(p []byte) (int, error)              { return len(p), nil }
-func newNilReporter() *nilReporter                                 { return &nilReporter{} }
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go
deleted file mode 100644
index 7bf67dbb2b..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/console.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package reporting
-
-import (
-	"fmt"
-	"io"
-)
-
-type console struct{}
-
-func (self *console) Write(p []byte) (n int, err error) {
-	return fmt.Print(string(p))
-}
-
-func NewConsole() io.Writer {
-	return new(console)
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go
deleted file mode 100644
index a37d001946..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/doc.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Package reporting contains internal functionality related
-// to console reporting and output. Although this package has
-// exported names is not intended for public consumption. See the
-// examples package for how to use this project.
-package reporting
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go
deleted file mode 100644
index 47d57c6b0d..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/dot.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package reporting
-
-import "fmt"
-
-type dot struct{ out *Printer }
-
-func (self *dot) BeginStory(story *StoryReport) {}
-
-func (self *dot) Enter(scope *ScopeReport) {}
-
-func (self *dot) Report(report *AssertionResult) {
-	if report.Error != nil {
-		fmt.Print(redColor)
-		self.out.Insert(dotError)
-	} else if report.Failure != "" {
-		fmt.Print(yellowColor)
-		self.out.Insert(dotFailure)
-	} else if report.Skipped {
-		fmt.Print(yellowColor)
-		self.out.Insert(dotSkip)
-	} else {
-		fmt.Print(greenColor)
-		self.out.Insert(dotSuccess)
-	}
-	fmt.Print(resetColor)
-}
-
-func (self *dot) Exit() {}
-
-func (self *dot) EndStory() {}
-
-func (self *dot) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewDotReporter(out *Printer) *dot {
-	self := new(dot)
-	self.out = out
-	return self
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go
deleted file mode 100644
index c396e16b17..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/gotest.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package reporting
-
-type gotestReporter struct{ test T }
-
-func (self *gotestReporter) BeginStory(story *StoryReport) {
-	self.test = story.Test
-}
-
-func (self *gotestReporter) Enter(scope *ScopeReport) {}
-
-func (self *gotestReporter) Report(r *AssertionResult) {
-	if !passed(r) {
-		self.test.Fail()
-	}
-}
-
-func (self *gotestReporter) Exit() {}
-
-func (self *gotestReporter) EndStory() {
-	self.test = nil
-}
-
-func (self *gotestReporter) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewGoTestReporter() *gotestReporter {
-	return new(gotestReporter)
-}
-
-func passed(r *AssertionResult) bool {
-	return r.Error == nil && r.Failure == ""
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go
deleted file mode 100644
index 44d080e90e..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/init.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package reporting
-
-import (
-	"os"
-	"runtime"
-	"strings"
-)
-
-func init() {
-	if !isColorableTerminal() {
-		monochrome()
-	}
-
-	if runtime.GOOS == "windows" {
-		success, failure, error_ = dotSuccess, dotFailure, dotError
-	}
-}
-
-func BuildJsonReporter() Reporter {
-	out := NewPrinter(NewConsole())
-	return NewReporters(
-		NewGoTestReporter(),
-		NewJsonReporter(out))
-}
-func BuildDotReporter() Reporter {
-	out := NewPrinter(NewConsole())
-	return NewReporters(
-		NewGoTestReporter(),
-		NewDotReporter(out),
-		NewProblemReporter(out),
-		consoleStatistics)
-}
-func BuildStoryReporter() Reporter {
-	out := NewPrinter(NewConsole())
-	return NewReporters(
-		NewGoTestReporter(),
-		NewStoryReporter(out),
-		NewProblemReporter(out),
-		consoleStatistics)
-}
-func BuildSilentReporter() Reporter {
-	out := NewPrinter(NewConsole())
-	return NewReporters(
-		NewGoTestReporter(),
-		NewSilentProblemReporter(out))
-}
-
-var (
-	newline         = "\n"
-	success         = "✔"
-	failure         = "✘"
-	error_          = "🔥"
-	skip            = "⚠"
-	dotSuccess      = "."
-	dotFailure      = "x"
-	dotError        = "E"
-	dotSkip         = "S"
-	errorTemplate   = "* %s \nLine %d: - %v \n%s\n"
-	failureTemplate = "* %s \nLine %d:\n%s\n"
-)
-
-var (
-	greenColor  = "\033[32m"
-	yellowColor = "\033[33m"
-	redColor    = "\033[31m"
-	resetColor  = "\033[0m"
-)
-
-var consoleStatistics = NewStatisticsReporter(NewPrinter(NewConsole()))
-
-func SuppressConsoleStatistics() { consoleStatistics.Suppress() }
-func PrintConsoleStatistics()    { consoleStatistics.PrintSummary() }
-
-// QuiteMode disables all console output symbols. This is only meant to be used
-// for tests that are internal to goconvey where the output is distracting or
-// otherwise not needed in the test output.
-func QuietMode() {
-	success, failure, error_, skip, dotSuccess, dotFailure, dotError, dotSkip = "", "", "", "", "", "", "", ""
-}
-
-func monochrome() {
-	greenColor, yellowColor, redColor, resetColor = "", "", "", ""
-}
-
-func isColorableTerminal() bool {
-	return strings.Contains(os.Getenv("TERM"), "color")
-}
-
-// This interface allows us to pass the *testing.T struct
-// throughout the internals of this tool without ever
-// having to import the "testing" package.
-type T interface {
-	Fail()
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go
deleted file mode 100644
index f8526979f8..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/json.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// TODO: under unit test
-
-package reporting
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
-type JsonReporter struct {
-	out        *Printer
-	currentKey []string
-	current    *ScopeResult
-	index      map[string]*ScopeResult
-	scopes     []*ScopeResult
-}
-
-func (self *JsonReporter) depth() int { return len(self.currentKey) }
-
-func (self *JsonReporter) BeginStory(story *StoryReport) {}
-
-func (self *JsonReporter) Enter(scope *ScopeReport) {
-	self.currentKey = append(self.currentKey, scope.Title)
-	ID := strings.Join(self.currentKey, "|")
-	if _, found := self.index[ID]; !found {
-		next := newScopeResult(scope.Title, self.depth(), scope.File, scope.Line)
-		self.scopes = append(self.scopes, next)
-		self.index[ID] = next
-	}
-	self.current = self.index[ID]
-}
-
-func (self *JsonReporter) Report(report *AssertionResult) {
-	self.current.Assertions = append(self.current.Assertions, report)
-}
-
-func (self *JsonReporter) Exit() {
-	self.currentKey = self.currentKey[:len(self.currentKey)-1]
-}
-
-func (self *JsonReporter) EndStory() {
-	self.report()
-	self.reset()
-}
-func (self *JsonReporter) report() {
-	scopes := []string{}
-	for _, scope := range self.scopes {
-		serialized, err := json.Marshal(scope)
-		if err != nil {
-			self.out.Println(jsonMarshalFailure)
-			panic(err)
-		}
-		var buffer bytes.Buffer
-		json.Indent(&buffer, serialized, "", "  ")
-		scopes = append(scopes, buffer.String())
-	}
-	self.out.Print(fmt.Sprintf("%s\n%s,\n%s\n", OpenJson, strings.Join(scopes, ","), CloseJson))
-}
-func (self *JsonReporter) reset() {
-	self.scopes = []*ScopeResult{}
-	self.index = map[string]*ScopeResult{}
-	self.currentKey = nil
-}
-
-func (self *JsonReporter) Write(content []byte) (written int, err error) {
-	self.current.Output += string(content)
-	return len(content), nil
-}
-
-func NewJsonReporter(out *Printer) *JsonReporter {
-	self := new(JsonReporter)
-	self.out = out
-	self.reset()
-	return self
-}
-
-const OpenJson = ">->->OPEN-JSON->->->"   // "⌦"
-const CloseJson = "<-<-<-CLOSE-JSON<-<-<" // "⌫"
-const jsonMarshalFailure = `
-
-GOCONVEY_JSON_MARSHALL_FAILURE: There was an error when attempting to convert test results to JSON.
-Please file a bug report and reference the code that caused this failure if possible.
-
-Here's the panic:
-
-`
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go
deleted file mode 100644
index 6d4a879c40..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/printer.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package reporting
-
-import (
-	"fmt"
-	"io"
-	"strings"
-)
-
-type Printer struct {
-	out    io.Writer
-	prefix string
-}
-
-func (self *Printer) Println(message string, values ...interface{}) {
-	formatted := self.format(message, values...) + newline
-	self.out.Write([]byte(formatted))
-}
-
-func (self *Printer) Print(message string, values ...interface{}) {
-	formatted := self.format(message, values...)
-	self.out.Write([]byte(formatted))
-}
-
-func (self *Printer) Insert(text string) {
-	self.out.Write([]byte(text))
-}
-
-func (self *Printer) format(message string, values ...interface{}) string {
-	var formatted string
-	if len(values) == 0 {
-		formatted = self.prefix + message
-	} else {
-		formatted = self.prefix + fmt.Sprintf(message, values...)
-	}
-	indented := strings.Replace(formatted, newline, newline+self.prefix, -1)
-	return strings.TrimRight(indented, space)
-}
-
-func (self *Printer) Indent() {
-	self.prefix += pad
-}
-
-func (self *Printer) Dedent() {
-	if len(self.prefix) >= padLength {
-		self.prefix = self.prefix[:len(self.prefix)-padLength]
-	}
-}
-
-func NewPrinter(out io.Writer) *Printer {
-	self := new(Printer)
-	self.out = out
-	return self
-}
-
-const space = " "
-const pad = space + space
-const padLength = len(pad)
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go
deleted file mode 100644
index 9ae493ac3b..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/problems.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package reporting
-
-import "fmt"
-
-type problem struct {
-	silent   bool
-	out      *Printer
-	errors   []*AssertionResult
-	failures []*AssertionResult
-}
-
-func (self *problem) BeginStory(story *StoryReport) {}
-
-func (self *problem) Enter(scope *ScopeReport) {}
-
-func (self *problem) Report(report *AssertionResult) {
-	if report.Error != nil {
-		self.errors = append(self.errors, report)
-	} else if report.Failure != "" {
-		self.failures = append(self.failures, report)
-	}
-}
-
-func (self *problem) Exit() {}
-
-func (self *problem) EndStory() {
-	self.show(self.showErrors, redColor)
-	self.show(self.showFailures, yellowColor)
-	self.prepareForNextStory()
-}
-func (self *problem) show(display func(), color string) {
-	if !self.silent {
-		fmt.Print(color)
-	}
-	display()
-	if !self.silent {
-		fmt.Print(resetColor)
-	}
-	self.out.Dedent()
-}
-func (self *problem) showErrors() {
-	for i, e := range self.errors {
-		if i == 0 {
-			self.out.Println("\nErrors:\n")
-			self.out.Indent()
-		}
-		self.out.Println(errorTemplate, e.File, e.Line, e.Error, e.StackTrace)
-	}
-}
-func (self *problem) showFailures() {
-	for i, f := range self.failures {
-		if i == 0 {
-			self.out.Println("\nFailures:\n")
-			self.out.Indent()
-		}
-		self.out.Println(failureTemplate, f.File, f.Line, f.Failure)
-	}
-}
-
-func (self *problem) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewProblemReporter(out *Printer) *problem {
-	self := new(problem)
-	self.out = out
-	self.prepareForNextStory()
-	return self
-}
-
-func NewSilentProblemReporter(out *Printer) *problem {
-	self := NewProblemReporter(out)
-	self.silent = true
-	return self
-}
-
-func (self *problem) prepareForNextStory() {
-	self.errors = []*AssertionResult{}
-	self.failures = []*AssertionResult{}
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go
deleted file mode 100644
index cce6c5e438..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporter.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package reporting
-
-import "io"
-
-type Reporter interface {
-	BeginStory(story *StoryReport)
-	Enter(scope *ScopeReport)
-	Report(r *AssertionResult)
-	Exit()
-	EndStory()
-	io.Writer
-}
-
-type reporters struct{ collection []Reporter }
-
-func (self *reporters) BeginStory(s *StoryReport) { self.foreach(func(r Reporter) { r.BeginStory(s) }) }
-func (self *reporters) Enter(s *ScopeReport)      { self.foreach(func(r Reporter) { r.Enter(s) }) }
-func (self *reporters) Report(a *AssertionResult) { self.foreach(func(r Reporter) { r.Report(a) }) }
-func (self *reporters) Exit()                     { self.foreach(func(r Reporter) { r.Exit() }) }
-func (self *reporters) EndStory()                 { self.foreach(func(r Reporter) { r.EndStory() }) }
-
-func (self *reporters) Write(contents []byte) (written int, err error) {
-	self.foreach(func(r Reporter) {
-		written, err = r.Write(contents)
-	})
-	return written, err
-}
-
-func (self *reporters) foreach(action func(Reporter)) {
-	for _, r := range self.collection {
-		action(r)
-	}
-}
-
-func NewReporters(collection ...Reporter) *reporters {
-	self := new(reporters)
-	self.collection = collection
-	return self
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey
deleted file mode 100644
index 79982854b5..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reporting.goconvey
+++ /dev/null
@@ -1,2 +0,0 @@
-#ignore
--timeout=1s
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go
deleted file mode 100644
index 712e6ade62..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/reports.go
+++ /dev/null
@@ -1,179 +0,0 @@
-package reporting
-
-import (
-	"encoding/json"
-	"fmt"
-	"runtime"
-	"strings"
-
-	"github.com/smartystreets/goconvey/convey/gotest"
-)
-
-////////////////// ScopeReport ////////////////////
-
-type ScopeReport struct {
-	Title string
-	File  string
-	Line  int
-}
-
-func NewScopeReport(title string) *ScopeReport {
-	file, line, _ := gotest.ResolveExternalCaller()
-	self := new(ScopeReport)
-	self.Title = title
-	self.File = file
-	self.Line = line
-	return self
-}
-
-////////////////// ScopeResult ////////////////////
-
-type ScopeResult struct {
-	Title      string
-	File       string
-	Line       int
-	Depth      int
-	Assertions []*AssertionResult
-	Output     string
-}
-
-func newScopeResult(title string, depth int, file string, line int) *ScopeResult {
-	self := new(ScopeResult)
-	self.Title = title
-	self.Depth = depth
-	self.File = file
-	self.Line = line
-	self.Assertions = []*AssertionResult{}
-	return self
-}
-
-/////////////////// StoryReport /////////////////////
-
-type StoryReport struct {
-	Test T
-	Name string
-	File string
-	Line int
-}
-
-func NewStoryReport(test T) *StoryReport {
-	file, line, name := gotest.ResolveExternalCaller()
-	name = removePackagePath(name)
-	self := new(StoryReport)
-	self.Test = test
-	self.Name = name
-	self.File = file
-	self.Line = line
-	return self
-}
-
-// name comes in looking like "github.com/smartystreets/goconvey/examples.TestName".
-// We only want the stuff after the last '.', which is the name of the test function.
-func removePackagePath(name string) string {
-	parts := strings.Split(name, ".")
-	return parts[len(parts)-1]
-}
-
-/////////////////// FailureView ////////////////////////
-
-// This struct is also declared in github.com/smartystreets/assertions.
-// The json struct tags should be equal in both declarations.
-type FailureView struct {
-	Message  string `json:"Message"`
-	Expected string `json:"Expected"`
-	Actual   string `json:"Actual"`
-}
-
-////////////////////AssertionResult //////////////////////
-
-type AssertionResult struct {
-	File       string
-	Line       int
-	Expected   string
-	Actual     string
-	Failure    string
-	Error      interface{}
-	StackTrace string
-	Skipped    bool
-}
-
-func NewFailureReport(failure string) *AssertionResult {
-	report := new(AssertionResult)
-	report.File, report.Line = caller()
-	report.StackTrace = stackTrace()
-	parseFailure(failure, report)
-	return report
-}
-func parseFailure(failure string, report *AssertionResult) {
-	view := new(FailureView)
-	err := json.Unmarshal([]byte(failure), view)
-	if err == nil {
-		report.Failure = view.Message
-		report.Expected = view.Expected
-		report.Actual = view.Actual
-	} else {
-		report.Failure = failure
-	}
-}
-func NewErrorReport(err interface{}) *AssertionResult {
-	report := new(AssertionResult)
-	report.File, report.Line = caller()
-	report.StackTrace = fullStackTrace()
-	report.Error = fmt.Sprintf("%v", err)
-	return report
-}
-func NewSuccessReport() *AssertionResult {
-	return new(AssertionResult)
-}
-func NewSkipReport() *AssertionResult {
-	report := new(AssertionResult)
-	report.File, report.Line = caller()
-	report.StackTrace = fullStackTrace()
-	report.Skipped = true
-	return report
-}
-
-func caller() (file string, line int) {
-	file, line, _ = gotest.ResolveExternalCaller()
-	return
-}
-
-func stackTrace() string {
-	buffer := make([]byte, 1024*64)
-	n := runtime.Stack(buffer, false)
-	return removeInternalEntries(string(buffer[:n]))
-}
-func fullStackTrace() string {
-	buffer := make([]byte, 1024*64)
-	n := runtime.Stack(buffer, true)
-	return removeInternalEntries(string(buffer[:n]))
-}
-func removeInternalEntries(stack string) string {
-	lines := strings.Split(stack, newline)
-	filtered := []string{}
-	for _, line := range lines {
-		if !isExternal(line) {
-			filtered = append(filtered, line)
-		}
-	}
-	return strings.Join(filtered, newline)
-}
-func isExternal(line string) bool {
-	for _, p := range internalPackages {
-		if strings.Contains(line, p) {
-			return true
-		}
-	}
-	return false
-}
-
-// NOTE: any new packages that host goconvey packages will need to be added here!
-// An alternative is to scan the goconvey directory and then exclude stuff like
-// the examples package but that's nasty too.
-var internalPackages = []string{
-	"goconvey/assertions",
-	"goconvey/convey",
-	"goconvey/execution",
-	"goconvey/gotest",
-	"goconvey/reporting",
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go
deleted file mode 100644
index c3ccd056a0..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/statistics.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package reporting
-
-import (
-	"fmt"
-	"sync"
-)
-
-func (self *statistics) BeginStory(story *StoryReport) {}
-
-func (self *statistics) Enter(scope *ScopeReport) {}
-
-func (self *statistics) Report(report *AssertionResult) {
-	self.Lock()
-	defer self.Unlock()
-
-	if !self.failing && report.Failure != "" {
-		self.failing = true
-	}
-	if !self.erroring && report.Error != nil {
-		self.erroring = true
-	}
-	if report.Skipped {
-		self.skipped += 1
-	} else {
-		self.total++
-	}
-}
-
-func (self *statistics) Exit() {}
-
-func (self *statistics) EndStory() {
-	self.Lock()
-	defer self.Unlock()
-
-	if !self.suppressed {
-		self.printSummaryLocked()
-	}
-}
-
-func (self *statistics) Suppress() {
-	self.Lock()
-	defer self.Unlock()
-	self.suppressed = true
-}
-
-func (self *statistics) PrintSummary() {
-	self.Lock()
-	defer self.Unlock()
-	self.printSummaryLocked()
-}
-
-func (self *statistics) printSummaryLocked() {
-	self.reportAssertionsLocked()
-	self.reportSkippedSectionsLocked()
-	self.completeReportLocked()
-}
-func (self *statistics) reportAssertionsLocked() {
-	self.decideColorLocked()
-	self.out.Print("\n%d total %s", self.total, plural("assertion", self.total))
-}
-func (self *statistics) decideColorLocked() {
-	if self.failing && !self.erroring {
-		fmt.Print(yellowColor)
-	} else if self.erroring {
-		fmt.Print(redColor)
-	} else {
-		fmt.Print(greenColor)
-	}
-}
-func (self *statistics) reportSkippedSectionsLocked() {
-	if self.skipped > 0 {
-		fmt.Print(yellowColor)
-		self.out.Print(" (one or more sections skipped)")
-	}
-}
-func (self *statistics) completeReportLocked() {
-	fmt.Print(resetColor)
-	self.out.Print("\n")
-	self.out.Print("\n")
-}
-
-func (self *statistics) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewStatisticsReporter(out *Printer) *statistics {
-	self := statistics{}
-	self.out = out
-	return &self
-}
-
-type statistics struct {
-	sync.Mutex
-
-	out        *Printer
-	total      int
-	failing    bool
-	erroring   bool
-	skipped    int
-	suppressed bool
-}
-
-func plural(word string, count int) string {
-	if count == 1 {
-		return word
-	}
-	return word + "s"
-}
diff --git a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go b/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go
deleted file mode 100644
index 9e73c971f8..0000000000
--- a/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey/reporting/story.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// TODO: in order for this reporter to be completely honest
-// we need to retrofit to be more like the json reporter such that:
-// 1. it maintains ScopeResult collections, which count assertions
-// 2. it reports only after EndStory(), so that all tick marks
-//    are placed near the appropriate title.
-// 3. Under unit test
-
-package reporting
-
-import (
-	"fmt"
-	"strings"
-)
-
-type story struct {
-	out        *Printer
-	titlesById map[string]string
-	currentKey []string
-}
-
-func (self *story) BeginStory(story *StoryReport) {}
-
-func (self *story) Enter(scope *ScopeReport) {
-	self.out.Indent()
-
-	self.currentKey = append(self.currentKey, scope.Title)
-	ID := strings.Join(self.currentKey, "|")
-
-	if _, found := self.titlesById[ID]; !found {
-		self.out.Println("")
-		self.out.Print(scope.Title)
-		self.out.Insert(" ")
-		self.titlesById[ID] = scope.Title
-	}
-}
-
-func (self *story) Report(report *AssertionResult) {
-	if report.Error != nil {
-		fmt.Print(redColor)
-		self.out.Insert(error_)
-	} else if report.Failure != "" {
-		fmt.Print(yellowColor)
-		self.out.Insert(failure)
-	} else if report.Skipped {
-		fmt.Print(yellowColor)
-		self.out.Insert(skip)
-	} else {
-		fmt.Print(greenColor)
-		self.out.Insert(success)
-	}
-	fmt.Print(resetColor)
-}
-
-func (self *story) Exit() {
-	self.out.Dedent()
-	self.currentKey = self.currentKey[:len(self.currentKey)-1]
-}
-
-func (self *story) EndStory() {
-	self.titlesById = make(map[string]string)
-	self.out.Println("\n")
-}
-
-func (self *story) Write(content []byte) (written int, err error) {
-	return len(content), nil // no-op
-}
-
-func NewStoryReporter(out *Printer) *story {
-	self := new(story)
-	self.out = out
-	self.titlesById = make(map[string]string)
-	return self
-}

From 077b78f8b839b45e907bb2c6cc4255a3056037b6 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 23 May 2016 21:19:11 -0700
Subject: [PATCH 0322/1304] stage1: implement no-new-privs linux isolator

Fixes #1469
---
 stage1/init/common/pod.go      | 15 ++++++
 tests/inspect/inspect.go       | 14 ++++++
 tests/rkt_no_new_privs_test.go | 92 ++++++++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 tests/rkt_no_new_privs_test.go

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index dbf63b4c9d..5895e24fdf 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -429,6 +429,8 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		return err
 	}
 
+	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
+
 	execStart := append([]string{binPath}, app.Exec[1:]...)
 	execStartString := quoteExec(execStart)
 	opts := []*unit.UnitOption{
@@ -447,6 +449,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
 		unit.NewUnitOption("Service", "SupplementaryGroups", strings.Join(supplementaryGroups, " ")),
 		unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")),
+		unit.NewUnitOption("Service", "NoNewPrivileges", strconv.FormatBool(noNewPrivileges)),
 		// This helps working around a race
 		// (https://github.com/systemd/systemd/issues/2913) that causes the
 		// systemd unit name not getting written to the journal if the unit is
@@ -1083,3 +1086,15 @@ func parseLinuxCapabilitiesSet(capSet types.LinuxCapabilitiesSet) []string {
 	}
 	return capsStr
 }
+
+func getAppNoNewPrivileges(isolators types.Isolators) bool {
+	for _, isolator := range isolators {
+		noNewPrivileges, ok := isolator.Value().(*types.LinuxNoNewPrivileges)
+
+		if ok && bool(*noNewPrivileges) {
+			return true
+		}
+	}
+
+	return false
+}
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 6d05ba5891..33b276a513 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -30,6 +30,8 @@ import (
 	"time"
 	"unsafe"
 
+	"golang.org/x/sys/unix"
+
 	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/tests/testutils"
 	"github.com/syndtr/gocapability/capability"
@@ -74,6 +76,7 @@ var (
 		PrintAppAnnotation string
 		SilentSigterm      bool
 		CheckMountNS       bool
+		PrintNoNewPrivs    bool
 	}{}
 )
 
@@ -114,6 +117,7 @@ func init() {
 	globalFlagset.StringVar(&globalFlags.PrintAppAnnotation, "print-app-annotation", "", "Take an annotation name of the app, and prints its value")
 	globalFlagset.BoolVar(&globalFlags.SilentSigterm, "silent-sigterm", false, "Exit with a success exit status if we receive SIGTERM")
 	globalFlagset.BoolVar(&globalFlags.CheckMountNS, "check-mountns", false, "Check if app's mount ns is different than stage1's. Requires CAP_SYS_PTRACE")
+	globalFlagset.BoolVar(&globalFlags.PrintNoNewPrivs, "print-no-new-privs", false, "print the prctl PR_GET_NO_NEW_PRIVS value")
 }
 
 func in(list []int, el int) bool {
@@ -133,6 +137,16 @@ func main() {
 		os.Exit(1)
 	}
 
+	if globalFlags.PrintNoNewPrivs {
+		r1, _, err := syscall.Syscall(
+			syscall.SYS_PRCTL,
+			uintptr(unix.PR_GET_NO_NEW_PRIVS),
+			uintptr(0), uintptr(0),
+		)
+
+		fmt.Printf("no_new_privs: %v err: %v\n", r1, err)
+	}
+
 	if globalFlags.SilentSigterm {
 		terminateCh := make(chan os.Signal, 1)
 		signal.Notify(terminateCh, syscall.SIGTERM)
diff --git a/tests/rkt_no_new_privs_test.go b/tests/rkt_no_new_privs_test.go
new file mode 100644
index 0000000000..ca16a15192
--- /dev/null
+++ b/tests/rkt_no_new_privs_test.go
@@ -0,0 +1,92 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestNoNewPrivileges(t *testing.T) {
+	for _, tt := range []struct {
+		rktParams string
+		patch     string
+		expected  string
+	}{
+		{
+			patch:    "--isolators=os/linux/no-new-privileges,true",
+			expected: "no_new_privs: 1 err: errno 0",
+		},
+		{
+			rktParams: "--user=1000 --group=100",
+			patch:     "--isolators=os/linux/no-new-privileges,true",
+			expected:  "no_new_privs: 1 err: errno 0",
+		},
+		{
+			patch:    "--isolators=os/linux/no-new-privileges,false",
+			expected: "no_new_privs: 0 err: errno 0",
+		},
+		{
+			rktParams: "--user=1000 --group=100",
+			patch:     "--isolators=os/linux/no-new-privileges,false",
+			expected:  "no_new_privs: 0 err: errno 0",
+		},
+		{
+			patch:    `--isolators=os/linux/no-new-privileges,false:os/linux/no-new-privileges,true`,
+			expected: "no_new_privs: 1 err: errno 0",
+		},
+		{
+			rktParams: "--user=1000 --group=100",
+			patch:     `--isolators=os/linux/no-new-privileges,false:os/linux/no-new-privileges,true`,
+			expected:  "no_new_privs: 1 err: errno 0",
+		},
+		{
+			patch:    "",
+			expected: "no_new_privs: 0 err: errno 0",
+		},
+	} {
+		func() {
+			ctx := testutils.NewRktRunCtx()
+			defer ctx.Cleanup()
+
+			ps := []string{}
+			if tt.patch != "" {
+				ps = append(ps, tt.patch)
+			}
+
+			image := patchTestACI("rkt-no-new-privs.aci", ps...)
+			defer os.Remove(image)
+
+			rktParams := fmt.Sprintf(
+				"%s --exec=/inspect -- -print-no-new-privs",
+				tt.rktParams,
+			)
+
+			rktCmd := fmt.Sprintf(
+				"%s --debug --insecure-options=image run %s %s",
+				ctx.Cmd(),
+				image,
+				rktParams,
+			)
+
+			runRktAndCheckOutput(t, rktCmd, tt.expected, false)
+		}()
+	}
+}

From b37bfb3ead682889508f4bc74b50f0512a66725c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 27 May 2016 09:40:41 +0200
Subject: [PATCH 0323/1304] Godeps: bump docker2aci to v0.11.0

For parallel goodness.
---
 Godeps/Godeps.json                            |   65 +-
 .../appc/docker2aci/lib/common/common.go      |    6 +
 .../appc/docker2aci/lib/docker2aci.go         |   40 +-
 .../lib/internal/backend/file/file.go         |   61 +-
 .../internal/backend/repository/repository.go |   14 +-
 .../backend/repository/repository1.go         |   91 +-
 .../backend/repository/repository2.go         |  172 ++-
 .../appc/docker2aci/lib/internal/internal.go  |    4 +-
 .../github.com/appc/docker2aci/lib/version.go |    2 +-
 .../src/github.com/coreos/pkg/LICENSE         |  202 +++
 .../src/github.com/coreos/pkg/NOTICE          |    5 +
 .../coreos/pkg/progressutil/iocopy.go         |  167 ++
 .../coreos/pkg/progressutil/progressbar.go    |  207 +++
 .../src/github.com/klauspost/compress/LICENSE |   27 +
 .../klauspost/compress/flate/copy.go          |   32 +
 .../klauspost/compress/flate/crc32_amd64.go   |   39 +
 .../klauspost/compress/flate/crc32_amd64.s    |  218 +++
 .../klauspost/compress/flate/crc32_noasm.go   |   34 +
 .../klauspost/compress/flate/deflate.go       | 1358 +++++++++++++++++
 .../klauspost/compress/flate/fixedhuff.go     |   78 +
 .../klauspost/compress/flate/gen.go           |  265 ++++
 .../compress/flate/huffman_bit_writer.go      |  717 +++++++++
 .../klauspost/compress/flate/huffman_code.go  |  363 +++++
 .../klauspost/compress/flate/inflate.go       |  846 ++++++++++
 .../klauspost/compress/flate/reverse_bits.go  |   48 +
 .../klauspost/compress/flate/snappy.go        |  768 ++++++++++
 .../klauspost/compress/flate/token.go         |  105 ++
 .../src/github.com/klauspost/cpuid/.gitignore |   24 +
 .../github.com/klauspost/cpuid/.travis.yml    |    8 +
 .../src/github.com/klauspost/cpuid/LICENSE    |   22 +
 .../src/github.com/klauspost/cpuid/README.md  |  145 ++
 .../src/github.com/klauspost/cpuid/cpuid.go   | 1022 +++++++++++++
 .../github.com/klauspost/cpuid/cpuid_386.s    |   42 +
 .../github.com/klauspost/cpuid/cpuid_amd64.s  |   42 +
 .../klauspost/cpuid/detect_intel.go           |   17 +
 .../github.com/klauspost/cpuid/detect_ref.go  |   23 +
 .../github.com/klauspost/cpuid/generate.go    |    3 +
 .../github.com/klauspost/cpuid/private-gen.go |  476 ++++++
 .../src/github.com/klauspost/crc32/.gitignore |   24 +
 .../github.com/klauspost/crc32/.travis.yml    |   12 +
 .../src/github.com/klauspost/crc32/LICENSE    |   28 +
 .../src/github.com/klauspost/crc32/README.md  |   84 +
 .../src/github.com/klauspost/crc32/crc32.go   |  186 +++
 .../github.com/klauspost/crc32/crc32_amd64.go |   62 +
 .../github.com/klauspost/crc32/crc32_amd64.s  |  237 +++
 .../klauspost/crc32/crc32_amd64p32.go         |   40 +
 .../klauspost/crc32/crc32_amd64p32.s          |   67 +
 .../klauspost/crc32/crc32_generic.go          |   29 +
 .../src/github.com/klauspost/pgzip/.gitignore |   24 +
 .../github.com/klauspost/pgzip/.travis.yml    |   18 +
 .../src/github.com/klauspost/pgzip/GO_LICENSE |   27 +
 .../src/github.com/klauspost/pgzip/LICENSE    |   22 +
 .../src/github.com/klauspost/pgzip/README.md  |  115 ++
 .../src/github.com/klauspost/pgzip/circle.yml |    7 +
 .../src/github.com/klauspost/pgzip/gunzip.go  |  564 +++++++
 .../src/github.com/klauspost/pgzip/gzip.go    |  485 ++++++
 rkt/image/dockerfetcher.go                    |    5 +-
 57 files changed, 9618 insertions(+), 176 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/NOTICE
 create mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go
 create mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/copy.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.s
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_noasm.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/deflate.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/fixedhuff.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/gen.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_bit_writer.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_code.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/inflate.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/reverse_bits.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/snappy.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/token.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/.gitignore
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/.travis.yml
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/README.md
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_386.s
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_amd64.s
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/detect_intel.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/detect_ref.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/generate.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/private-gen.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/README.md
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/.gitignore
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/.travis.yml
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/GO_LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/README.md
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/circle.yml
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/gunzip.go
 create mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/gzip.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 734022758a..d7ac03d327 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -108,53 +108,53 @@
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/common",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/backend/file",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/backend/repository",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/docker",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/tarball",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/types",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/util",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/pkg/log",
-			"Comment": "v0.9.3",
-			"Rev": "3b996e400e8937a7433b1759f846215e1d3b2fbd"
+			"Comment": "v0.11.0",
+			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
 		},
 		{
 			"ImportPath": "github.com/appc/goaci/proj2aci",
@@ -676,6 +676,31 @@
 			"ImportPath": "k8s.io/kubernetes/third_party/forked/reflect",
 			"Comment": "v1.3.0-alpha.4",
 			"Rev": "9990f843cd62caa90445cf76b07d63ba7b5c86fd"
+		},
+		{
+			"ImportPath": "github.com/klauspost/pgzip",
+			"Comment": "v1.0",
+			"Rev": "95e8170c5d4da28db9c64dfc9ec3138ea4466fd4"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg/progressutil",
+			"Comment": "v1",
+			"Rev": "160ae6282d8c48a33d8c150e4e4817fdef8a5cde"
+		},
+		{
+			"ImportPath": "github.com/klauspost/compress/flate",
+			"Comment": "v1.0",
+			"Rev": "006acde2c5d283d2f8b8aa03d8f0cd2891c680cf"
+		},
+		{
+			"ImportPath": "github.com/klauspost/crc32",
+			"Comment": "v1.0",
+			"Rev": "19b0b332c9e4516a6370a0456e6182c3b5036720"
+		},
+		{
+			"ImportPath": "github.com/klauspost/cpuid",
+			"Comment": "v1.0",
+			"Rev": "09cded8978dc9e80714c4d85b0322337b0a1e5e0"
 		}
 	]
 }
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go
index d28eddeb31..5fd1d46050 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go
@@ -44,6 +44,12 @@ type ErrSeveralImages struct {
 	Images []string
 }
 
+// InsecureConfig represents the different insecure options available
+type InsecureConfig struct {
+	SkipVerify bool
+	AllowHTTP  bool
+}
+
 func (e *ErrSeveralImages) Error() string {
 	return e.Msg
 }
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go
index 090ad3adc1..4cb0ecc9aa 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go
@@ -18,7 +18,6 @@ package docker2aci
 
 import (
 	"archive/tar"
-	"compress/gzip"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -38,6 +37,7 @@ import (
 	"github.com/appc/spec/pkg/acirenderer"
 	"github.com/appc/spec/schema"
 	appctypes "github.com/appc/spec/schema/types"
+	gzip "github.com/klauspost/pgzip"
 )
 
 // CommonConfig represents the shared configuration options for converting
@@ -53,9 +53,9 @@ type CommonConfig struct {
 // converting Docker images.
 type RemoteConfig struct {
 	CommonConfig
-	Username string // username to use if the image to convert needs authentication
-	Password string // password to use if the image to convert needs authentication
-	Insecure bool   // allow converting from insecure repos
+	Username string                // username to use if the image to convert needs authentication
+	Password string                // password to use if the image to convert needs authentication
+	Insecure common.InsecureConfig // Insecure options
 }
 
 // FileConfig represents the saved file specific configuration for converting
@@ -124,31 +124,25 @@ func convertReal(backend internal.Docker2ACIBackend, dockerURL string, squash bo
 
 	conversionStore := newConversionStore()
 
-	var images acirenderer.Images
-	var aciLayerPaths []string
-	var curPwl []string
-	for i := len(ancestry) - 1; i >= 0; i-- {
-		layerID := ancestry[i]
-
-		// only compress individual layers if we're not squashing
-		layerCompression := compression
-		if squash {
-			layerCompression = common.NoCompression
-		}
+	// only compress individual layers if we're not squashing
+	layerCompression := compression
+	if squash {
+		layerCompression = common.NoCompression
+	}
 
-		aciPath, manifest, err := backend.BuildACI(i, layerID, parsedDockerURL, layersOutputDir, tmpDir, curPwl, layerCompression)
-		if err != nil {
-			return nil, fmt.Errorf("error building layer: %v", err)
-		}
+	aciLayerPaths, aciManifests, err := backend.BuildACI(ancestry, parsedDockerURL, layersOutputDir, tmpDir, layerCompression)
+	if err != nil {
+		return nil, err
+	}
 
-		key, err := conversionStore.WriteACI(aciPath)
+	var images acirenderer.Images
+	for i, aciLayerPath := range aciLayerPaths {
+		key, err := conversionStore.WriteACI(aciLayerPath)
 		if err != nil {
 			return nil, fmt.Errorf("error inserting in the conversion store: %v", err)
 		}
 
-		images = append(images, acirenderer.Image{Im: manifest, Key: key, Level: uint16(i)})
-		aciLayerPaths = append(aciLayerPaths, aciPath)
-		curPwl = manifest.PathWhitelist
+		images = append(images, acirenderer.Image{Im: aciManifests[i], Key: key, Level: uint16(len(aciLayerPaths) - 1 - i)})
 	}
 
 	// acirenderer expects images in order from upper to base layer
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/file/file.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/file/file.go
index a0ba5e452e..a83402dfcd 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/file/file.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/file/file.go
@@ -68,39 +68,48 @@ func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *types.ParsedDo
 	return ancestry, parsedDockerURL, nil
 }
 
-func (lb *FileBackend) BuildACI(layerNumber int, layerID string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
-	tmpDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
-	if err != nil {
-		return "", nil, fmt.Errorf("error creating dir: %v", err)
-	}
-	defer os.RemoveAll(tmpDir)
+func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	var aciLayerPaths []string
+	var aciManifests []*schema.ImageManifest
+	var curPwl []string
+	for i := len(layerIDs) - 1; i >= 0; i-- {
+		tmpDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
+		if err != nil {
+			return nil, nil, fmt.Errorf("error creating dir: %v", err)
+		}
+		defer os.RemoveAll(tmpDir)
 
-	j, err := getJson(lb.file, layerID)
-	if err != nil {
-		return "", nil, fmt.Errorf("error getting image json: %v", err)
-	}
+		j, err := getJson(lb.file, layerIDs[i])
+		if err != nil {
+			return nil, nil, fmt.Errorf("error getting image json: %v", err)
+		}
 
-	layerData := types.DockerImageData{}
-	if err := json.Unmarshal(j, &layerData); err != nil {
-		return "", nil, fmt.Errorf("error unmarshaling layer data: %v", err)
-	}
+		layerData := types.DockerImageData{}
+		if err := json.Unmarshal(j, &layerData); err != nil {
+			return nil, nil, fmt.Errorf("error unmarshaling layer data: %v", err)
+		}
 
-	tmpLayerPath := path.Join(tmpDir, layerID)
-	tmpLayerPath += ".tar"
+		tmpLayerPath := path.Join(tmpDir, layerIDs[i])
+		tmpLayerPath += ".tar"
 
-	layerFile, err := extractEmbeddedLayer(lb.file, layerID, tmpLayerPath)
-	if err != nil {
-		return "", nil, fmt.Errorf("error getting layer from file: %v", err)
-	}
-	defer layerFile.Close()
+		layerFile, err := extractEmbeddedLayer(lb.file, layerIDs[i], tmpLayerPath)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error getting layer from file: %v", err)
+		}
+		defer layerFile.Close()
 
-	log.Debug("Generating layer ACI...")
-	aciPath, manifest, err := internal.GenerateACI(layerNumber, layerData, dockerURL, outputDir, layerFile, curPwl, compression)
-	if err != nil {
-		return "", nil, fmt.Errorf("error generating ACI: %v", err)
+		log.Debug("Generating layer ACI...")
+		aciPath, manifest, err := internal.GenerateACI(i, layerData, dockerURL, outputDir, layerFile, curPwl, compression)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
+		}
+
+		aciLayerPaths = append(aciLayerPaths, aciPath)
+		aciManifests = append(aciManifests, manifest)
+		curPwl = manifest.PathWhitelist
 	}
 
-	return aciPath, manifest, nil
+	return aciLayerPaths, aciManifests, nil
 }
 
 func getImageID(file *os.File, dockerURL *types.ParsedDockerURL) (string, *types.ParsedDockerURL, error) {
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
index 3c6715e8b3..57533857a1 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
@@ -42,14 +42,14 @@ type RepositoryBackend struct {
 	repoData          *RepoData
 	username          string
 	password          string
-	insecure          bool
+	insecure          common.InsecureConfig
 	hostsV2Support    map[string]bool
 	hostsV2AuthTokens map[string]map[string]string
 	schema            string
 	imageManifests    map[types.ParsedDockerURL]v2Manifest
 }
 
-func NewRepositoryBackend(username string, password string, insecure bool) *RepositoryBackend {
+func NewRepositoryBackend(username string, password string, insecure common.InsecureConfig) *RepositoryBackend {
 	return &RepositoryBackend{
 		username:          username,
 		password:          password,
@@ -93,11 +93,11 @@ func (rb *RepositoryBackend) GetImageInfo(url string) ([]string, *types.ParsedDo
 	}
 }
 
-func (rb *RepositoryBackend) BuildACI(layerNumber int, layerID string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
+func (rb *RepositoryBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	if rb.hostsV2Support[dockerURL.IndexURL] {
-		return rb.buildACIV2(layerNumber, layerID, dockerURL, outputDir, tmpBaseDir, curPwl, compression)
+		return rb.buildACIV2(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
 	} else {
-		return rb.buildACIV1(layerNumber, layerID, dockerURL, outputDir, tmpBaseDir, curPwl, compression)
+		return rb.buildACIV1(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
 	}
 }
 
@@ -137,7 +137,7 @@ func (rb *RepositoryBackend) supportsRegistry(indexURL string, version registryV
 
 		rb.setBasicAuth(req)
 
-		client := util.GetTLSClient(rb.insecure)
+		client := util.GetTLSClient(rb.insecure.SkipVerify)
 		res, err = client.Do(req)
 		return
 	}
@@ -149,7 +149,7 @@ func (rb *RepositoryBackend) supportsRegistry(indexURL string, version registryV
 		defer res.Body.Close()
 	}
 	if err != nil || !ok {
-		if rb.insecure {
+		if rb.insecure.AllowHTTP {
 			schema = "http"
 			res, err = fetch(schema)
 			if err == nil {
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
index 5b2f7a5cfa..bc54e47c7b 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
@@ -29,6 +29,7 @@ import (
 	"github.com/appc/docker2aci/lib/common"
 	"github.com/appc/docker2aci/lib/internal"
 	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/util"
 	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/schema"
 	"github.com/coreos/ioprogress"
@@ -62,40 +63,78 @@ func (rb *RepositoryBackend) getImageInfoV1(dockerURL *types.ParsedDockerURL) ([
 	return ancestry, dockerURL, nil
 }
 
-func (rb *RepositoryBackend) buildACIV1(layerNumber int, layerID string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
-	tmpDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
-	if err != nil {
-		return "", nil, fmt.Errorf("error creating dir: %v", err)
-	}
-	defer os.RemoveAll(tmpDir)
+func (rb *RepositoryBackend) buildACIV1(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	layerFiles := make([]*os.File, len(layerIDs))
+	layerDatas := make([]types.DockerImageData, len(layerIDs))
 
-	j, size, err := rb.getJsonV1(layerID, rb.repoData.Endpoints[0], rb.repoData)
+	tmpParentDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
 	if err != nil {
-		return "", nil, fmt.Errorf("error getting image json: %v", err)
+		return nil, nil, err
 	}
+	defer os.RemoveAll(tmpParentDir)
+
+	var doneChannels []chan error
+	for i, layerID := range layerIDs {
+		doneChan := make(chan error)
+		doneChannels = append(doneChannels, doneChan)
+		// https://github.com/golang/go/wiki/CommonMistakes
+		i := i // golang--
+		layerID := layerID
+		go func() {
+			tmpDir, err := ioutil.TempDir(tmpParentDir, "")
+			if err != nil {
+				doneChan <- fmt.Errorf("error creating dir: %v", err)
+				return
+			}
 
-	layerData := types.DockerImageData{}
-	if err := json.Unmarshal(j, &layerData); err != nil {
-		return "", nil, fmt.Errorf("error unmarshaling layer data: %v", err)
-	}
+			j, size, err := rb.getJsonV1(layerID, rb.repoData.Endpoints[0], rb.repoData)
+			if err != nil {
+				doneChan <- fmt.Errorf("error getting image json: %v", err)
+				return
+			}
 
-	layerFile, err := rb.getLayerV1(layerID, rb.repoData.Endpoints[0], rb.repoData, size, tmpDir)
-	if err != nil {
-		return "", nil, fmt.Errorf("error getting the remote layer: %v", err)
+			layerDatas[i] = types.DockerImageData{}
+			if err := json.Unmarshal(j, &layerDatas[i]); err != nil {
+				doneChan <- fmt.Errorf("error unmarshaling layer data: %v", err)
+				return
+			}
+
+			layerFiles[i], err = rb.getLayerV1(layerID, rb.repoData.Endpoints[0], rb.repoData, size, tmpDir)
+			if err != nil {
+				doneChan <- fmt.Errorf("error getting the remote layer: %v", err)
+				return
+			}
+			doneChan <- nil
+		}()
+	}
+	for _, doneChan := range doneChannels {
+		err := <-doneChan
+		if err != nil {
+			return nil, nil, err
+		}
 	}
-	defer layerFile.Close()
+	var aciLayerPaths []string
+	var aciManifests []*schema.ImageManifest
+	var curPwl []string
 
-	log.Debug("Generating layer ACI...")
-	aciPath, manifest, err := internal.GenerateACI(layerNumber, layerData, dockerURL, outputDir, layerFile, curPwl, compression)
-	if err != nil {
-		return "", nil, fmt.Errorf("error generating ACI: %v", err)
+	for i := len(layerIDs) - 1; i >= 0; i-- {
+		log.Debug("Generating layer ACI...")
+		aciPath, manifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
+		}
+		aciLayerPaths = append(aciLayerPaths, aciPath)
+		aciManifests = append(aciManifests, manifest)
+		curPwl = manifest.PathWhitelist
+
+		layerFiles[i].Close()
 	}
 
-	return aciPath, manifest, nil
+	return aciLayerPaths, aciManifests, nil
 }
 
 func (rb *RepositoryBackend) getRepoDataV1(indexURL string, remote string) (*RepoData, error) {
-	client := &http.Client{}
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
 	repositoryURL := rb.schema + path.Join(indexURL, "v1", "repositories", remote, "images")
 
 	req, err := http.NewRequest("GET", repositoryURL, nil)
@@ -145,7 +184,7 @@ func (rb *RepositoryBackend) getRepoDataV1(indexURL string, remote string) (*Rep
 }
 
 func (rb *RepositoryBackend) getImageIDFromTagV1(registry string, appName string, tag string, repoData *RepoData) (string, error) {
-	client := &http.Client{}
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
 	// we get all the tags instead of directly getting the imageID of the
 	// requested one (.../tags/TAG) because even though it's specified in the
 	// Docker API, some registries (e.g. Google Container Registry) don't
@@ -188,7 +227,7 @@ func (rb *RepositoryBackend) getImageIDFromTagV1(registry string, appName string
 }
 
 func (rb *RepositoryBackend) getAncestryV1(imgID, registry string, repoData *RepoData) ([]string, error) {
-	client := &http.Client{}
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
 	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "images", imgID, "ancestry"), nil)
 	if err != nil {
 		return nil, err
@@ -221,7 +260,7 @@ func (rb *RepositoryBackend) getAncestryV1(imgID, registry string, repoData *Rep
 }
 
 func (rb *RepositoryBackend) getJsonV1(imgID, registry string, repoData *RepoData) ([]byte, int64, error) {
-	client := &http.Client{}
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
 	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "images", imgID, "json"), nil)
 	if err != nil {
 		return nil, -1, err
@@ -256,7 +295,7 @@ func (rb *RepositoryBackend) getJsonV1(imgID, registry string, repoData *RepoDat
 }
 
 func (rb *RepositoryBackend) getLayerV1(imgID, registry string, repoData *RepoData, imgSize int64, tmpDir string) (*os.File, error) {
-	client := &http.Client{}
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
 	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "images", imgID, "layer"), nil)
 	if err != nil {
 		return nil, err
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
index b685cf8eaa..6a0c8907da 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -34,7 +34,7 @@ import (
 	"github.com/appc/docker2aci/lib/internal/util"
 	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/schema"
-	"github.com/coreos/ioprogress"
+	"github.com/coreos/pkg/progressutil"
 )
 
 const (
@@ -66,42 +66,98 @@ func (rb *RepositoryBackend) getImageInfoV2(dockerURL *types.ParsedDockerURL) ([
 	return layers, dockerURL, nil
 }
 
-func (rb *RepositoryBackend) buildACIV2(layerNumber int, layerID string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
-	manifest := rb.imageManifests[*dockerURL]
+func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	layerFiles := make([]*os.File, len(layerIDs))
+	layerDatas := make([]types.DockerImageData, len(layerIDs))
 
-	layerIndex, err := getLayerIndex(layerID, manifest)
+	tmpParentDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
 	if err != nil {
-		return "", nil, err
+		return nil, nil, err
 	}
+	defer os.RemoveAll(tmpParentDir)
 
-	if len(manifest.History) <= layerIndex {
-		return "", nil, fmt.Errorf("history not found for layer %s", layerID)
-	}
+	copier := &progressutil.CopyProgressPrinter{}
 
-	layerData := types.DockerImageData{}
-	if err := json.Unmarshal([]byte(manifest.History[layerIndex].V1Compatibility), &layerData); err != nil {
-		return "", nil, fmt.Errorf("error unmarshaling layer data: %v", err)
-	}
+	var errChannels []chan error
+	closers := make([]io.ReadCloser, len(layerIDs))
+	for i, layerID := range layerIDs {
+		errChan := make(chan error)
+		errChannels = append(errChannels, errChan)
+		// https://github.com/golang/go/wiki/CommonMistakes
+		i := i // golang--
+		layerID := layerID
+		go func() {
+			manifest := rb.imageManifests[*dockerURL]
 
-	tmpDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
-	if err != nil {
-		return "", nil, fmt.Errorf("error creating dir: %v", err)
-	}
-	defer os.RemoveAll(tmpDir)
+			layerIndex, err := getLayerIndex(layerID, manifest)
+			if err != nil {
+				errChan <- err
+				return
+			}
+
+			if len(manifest.History) <= layerIndex {
+				errChan <- fmt.Errorf("history not found for layer %s", layerID)
+				return
+			}
+
+			layerDatas[i] = types.DockerImageData{}
+			if err := json.Unmarshal([]byte(manifest.History[layerIndex].V1Compatibility), &layerDatas[i]); err != nil {
+				errChan <- fmt.Errorf("error unmarshaling layer data: %v", err)
+				return
+			}
+
+			tmpDir, err := ioutil.TempDir(tmpParentDir, "")
+			if err != nil {
+				errChan <- fmt.Errorf("error creating dir: %v", err)
+				return
+			}
 
-	layerFile, err := rb.getLayerV2(layerID, dockerURL, tmpDir)
+			layerFiles[i], closers[i], err = rb.getLayerV2(layerID, dockerURL, tmpDir, copier)
+			if err != nil {
+				errChan <- fmt.Errorf("error getting the remote layer: %v", err)
+				return
+			}
+			errChan <- nil
+		}()
+	}
+	err = copier.PrintAndWait(os.Stderr, 500*time.Millisecond, nil)
 	if err != nil {
-		return "", nil, fmt.Errorf("error getting the remote layer: %v", err)
+		return nil, nil, err
+	}
+	for _, closer := range closers {
+		if closer != nil {
+			closer.Close()
+		}
+	}
+	for _, errChan := range errChannels {
+		err := <-errChan
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+	for _, layerFile := range layerFiles {
+		err := layerFile.Sync()
+		if err != nil {
+			return nil, nil, err
+		}
 	}
-	defer layerFile.Close()
+	var aciLayerPaths []string
+	var aciManifests []*schema.ImageManifest
+	var curPwl []string
+	for i := len(layerIDs) - 1; i >= 0; i-- {
+		log.Debug("Generating layer ACI...")
+		aciPath, aciManifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
+		}
+		aciLayerPaths = append(aciLayerPaths, aciPath)
+		aciManifests = append(aciManifests, aciManifest)
+		curPwl = aciManifest.PathWhitelist
 
-	log.Debug("Generating layer ACI...")
-	aciPath, aciManifest, err := internal.GenerateACI(layerNumber, layerData, dockerURL, outputDir, layerFile, curPwl, compression)
-	if err != nil {
-		return "", nil, fmt.Errorf("error generating ACI: %v", err)
+		layerFiles[i].Close()
 	}
 
-	return aciPath, aciManifest, nil
+	return aciLayerPaths, aciManifests, nil
 }
 
 func (rb *RepositoryBackend) getManifestV2(dockerURL *types.ParsedDockerURL) (*v2Manifest, []string, error) {
@@ -224,84 +280,61 @@ func getLayerIndex(layerID string, manifest v2Manifest) (int, error) {
 	return -1, fmt.Errorf("layer not found in manifest: %s", layerID)
 }
 
-func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedDockerURL, tmpDir string) (*os.File, error) {
+func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedDockerURL, tmpDir string, copier *progressutil.CopyProgressPrinter) (*os.File, io.ReadCloser, error) {
 	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "blobs", layerID)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	rb.setBasicAuth(req)
 
 	res, err := rb.makeRequest(req, dockerURL.ImageName)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
-	defer res.Body.Close()
 
 	if res.StatusCode == http.StatusTemporaryRedirect || res.StatusCode == http.StatusFound {
 		location := res.Header.Get("Location")
 		if location != "" {
 			req, err = http.NewRequest("GET", location, nil)
 			if err != nil {
-				return nil, err
+				return nil, nil, err
 			}
 			res, err = rb.makeRequest(req, dockerURL.ImageName)
 			if err != nil {
-				return nil, err
+				return nil, nil, err
 			}
 			defer res.Body.Close()
 		}
 	}
 
 	if res.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
+		return nil, nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
 	}
 
 	var in io.Reader
 	in = res.Body
 
+	var size int64
+
 	if hdr := res.Header.Get("Content-Length"); hdr != "" {
-		imgSize, err := strconv.ParseInt(hdr, 10, 64)
+		size, err = strconv.ParseInt(hdr, 10, 64)
 		if err != nil {
-			return nil, err
-		}
-
-		prefix := "Downloading " + layerID[:18]
-		fmtBytesSize := 18
-		barSize := int64(80 - len(prefix) - fmtBytesSize)
-		bar := ioprogress.DrawTextFormatBarForW(barSize, os.Stderr)
-		fmtfunc := func(progress, total int64) string {
-			return fmt.Sprintf(
-				"%s: %s %s",
-				prefix,
-				bar(progress, total),
-				ioprogress.DrawTextFormatBytes(progress, total),
-			)
-		}
-		in = &ioprogress.Reader{
-			Reader:       res.Body,
-			Size:         imgSize,
-			DrawFunc:     ioprogress.DrawTerminalf(os.Stderr, fmtfunc),
-			DrawInterval: 500 * time.Millisecond,
+			return nil, nil, err
 		}
 	}
 
-	layerFile, err := ioutil.TempFile(tmpDir, "dockerlayer-")
-	if err != nil {
-		return nil, err
-	}
+	name := "Downloading " + layerID[:18]
 
-	_, err = io.Copy(layerFile, in)
+	layerFile, err := ioutil.TempFile(tmpDir, "dockerlayer-")
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
-	if err := layerFile.Sync(); err != nil {
-		return nil, err
-	}
+	copier.AddCopy(in, name, size, layerFile)
 
-	return layerFile, nil
+	return layerFile, res.Body, nil
 }
 
 func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string) (*http.Response, error) {
@@ -315,7 +348,7 @@ func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string) (*http.
 		}
 	}
 
-	client := util.GetTLSClient(rb.insecure)
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
 	res, err := client.Do(req)
 	if err != nil {
 		return nil, err
@@ -330,18 +363,17 @@ func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string) (*http.
 		return res, err
 	}
 
-	tokens := strings.Split(hdr, " ")
-	if len(tokens) != 2 || strings.ToLower(tokens[0]) != "bearer" {
+	tokens := strings.Split(hdr, ",")
+	if len(tokens) != 3 ||
+		!strings.HasPrefix(strings.ToLower(tokens[0]), "bearer realm") {
 		return res, err
 	}
 	res.Body.Close()
 
-	tokens = strings.Split(tokens[1], ",")
-
 	var realm, service, scope string
 	for _, token := range tokens {
-		if strings.HasPrefix(token, "realm") {
-			realm = strings.Trim(token[len("realm="):], "\"")
+		if strings.HasPrefix(strings.ToLower(token), "bearer realm") {
+			realm = strings.Trim(token[len("bearer realm="):], "\"")
 		}
 		if strings.HasPrefix(token, "service") {
 			service = strings.Trim(token[len("service="):], "\"")
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/internal.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/internal.go
index 3a30663df3..29cd8c87e4 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/internal.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/internal.go
@@ -20,7 +20,6 @@ package internal
 
 import (
 	"archive/tar"
-	"compress/gzip"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -40,6 +39,7 @@ import (
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema"
 	appctypes "github.com/appc/spec/schema/types"
+	gzip "github.com/klauspost/pgzip"
 )
 
 // Docker2ACIBackend is the interface that abstracts converting Docker layers
@@ -52,7 +52,7 @@ import (
 // path and its converted ImageManifest.
 type Docker2ACIBackend interface {
 	GetImageInfo(dockerUrl string) ([]string, *types.ParsedDockerURL, error)
-	BuildACI(layerNumber int, layerID string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, curPWl []string, compression common.Compression) (string, *schema.ImageManifest, error)
+	BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error)
 }
 
 // GenerateACI takes a Docker layer and generates an ACI from it.
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
index 6120c38b82..f8fe2eba80 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.9.3"
+var Version = "0.11.0"
 var AppcVersion = schema.AppContainerVersion
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/LICENSE b/Godeps/_workspace/src/github.com/coreos/pkg/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/NOTICE b/Godeps/_workspace/src/github.com/coreos/pkg/NOTICE
new file mode 100644
index 0000000000..b39ddfa5cb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/NOTICE
@@ -0,0 +1,5 @@
+CoreOS Project
+Copyright 2014 CoreOS, Inc
+
+This product includes software developed at CoreOS, Inc.
+(http://www.coreos.com/).
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go
new file mode 100644
index 0000000000..d897dc86b9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go
@@ -0,0 +1,167 @@
+// Copyright 2016 CoreOS Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package progressutil
+
+import (
+	"fmt"
+	"io"
+	"sync"
+	"time"
+)
+
+type copyReader struct {
+	reader  io.Reader
+	current int64
+	total   int64
+	done    bool
+	pb      *ProgressBar
+}
+
+func (cr *copyReader) Read(p []byte) (int, error) {
+	n, err := cr.reader.Read(p)
+	cr.current += int64(n)
+	err1 := cr.updateProgressBar()
+	if err == nil {
+		err = err1
+	}
+	if err != nil {
+		cr.done = true
+	}
+	return n, err
+}
+
+func (cr *copyReader) updateProgressBar() error {
+	cr.pb.SetPrintAfter(cr.formattedProgress())
+
+	progress := float64(cr.current) / float64(cr.total)
+	if progress > 1 {
+		progress = 1
+	}
+	return cr.pb.SetCurrentProgress(progress)
+}
+
+// CopyProgressPrinter will perform an arbitrary number of io.Copy calls, while
+// continually printing the progress of each copy.
+type CopyProgressPrinter struct {
+	readers []*copyReader
+	errors  []error
+	lock    sync.Mutex
+	pbp     *ProgressBarPrinter
+}
+
+// AddCopy adds a copy for this CopyProgressPrinter to perform. An io.Copy call
+// will be made to copy bytes from reader to dest, and name and size will be
+// used to label the progress bar and display how much progress has been made.
+// If size is 0, the total size of the reader is assumed to be unknown.
+func (cpp *CopyProgressPrinter) AddCopy(reader io.Reader, name string, size int64, dest io.Writer) {
+	cpp.lock.Lock()
+	if cpp.pbp == nil {
+		cpp.pbp = &ProgressBarPrinter{}
+		cpp.pbp.PadToBeEven = true
+	}
+
+	cr := &copyReader{
+		reader:  reader,
+		current: 0,
+		total:   size,
+		pb:      cpp.pbp.AddProgressBar(),
+	}
+	cr.pb.SetPrintBefore(name)
+	cr.pb.SetPrintAfter(cr.formattedProgress())
+
+	cpp.readers = append(cpp.readers, cr)
+	cpp.lock.Unlock()
+
+	go func() {
+		_, err := io.Copy(dest, cr)
+		if err != nil {
+			cpp.lock.Lock()
+			cpp.errors = append(cpp.errors, err)
+			cpp.lock.Unlock()
+		}
+	}()
+}
+
+// PrintAndWait will print the progress for each copy operation added with
+// AddCopy to printTo every printInterval. This will continue until every added
+// copy is finished, or until cancel is written to.
+func (cpp *CopyProgressPrinter) PrintAndWait(printTo io.Writer, printInterval time.Duration, cancel chan struct{}) error {
+	for {
+		// If cancel is not nil, see if anything has been written to it. If
+		// something has, return, otherwise keep drawing.
+		if cancel != nil {
+			select {
+			case <-cancel:
+				return nil
+			default:
+			}
+		}
+
+		cpp.lock.Lock()
+		readers := cpp.readers
+		errors := cpp.errors
+		cpp.lock.Unlock()
+
+		if len(errors) > 0 {
+			return errors[0]
+		}
+
+		if len(readers) > 0 {
+			_, err := cpp.pbp.Print(printTo)
+			if err != nil {
+				return err
+			}
+		} else {
+		}
+
+		allDone := true
+		for _, r := range readers {
+			allDone = allDone && r.done
+		}
+		if allDone && len(readers) > 0 {
+			return nil
+		}
+
+		time.Sleep(printInterval)
+	}
+}
+
+func (cr *copyReader) formattedProgress() string {
+	var totalStr string
+	if cr.total == 0 {
+		totalStr = "?"
+	} else {
+		totalStr = ByteUnitStr(cr.total)
+	}
+	return fmt.Sprintf("%s / %s", ByteUnitStr(cr.current), totalStr)
+}
+
+var byteUnits = []string{"B", "KB", "MB", "GB", "TB", "PB"}
+
+// ByteUnitStr pretty prints a number of bytes.
+func ByteUnitStr(n int64) string {
+	var unit string
+	size := float64(n)
+	for i := 1; i < len(byteUnits); i++ {
+		if size < 1000 {
+			unit = byteUnits[i-1]
+			break
+		}
+
+		size = size / 1000
+	}
+
+	return fmt.Sprintf("%.3g %s", size, unit)
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go
new file mode 100644
index 0000000000..76d2bff1ca
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go
@@ -0,0 +1,207 @@
+// Copyright 2016 CoreOS Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package progressutil
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"strings"
+	"sync"
+
+	"golang.org/x/crypto/ssh/terminal"
+)
+
+var (
+	// ErrorProgressOutOfBounds is returned if the progress is set to a value
+	// not between 0 and 1.
+	ErrorProgressOutOfBounds = fmt.Errorf("progress is out of bounds (0 to 1)")
+
+	// ErrorNoBarsAdded is returned when no progress bars have been added to a
+	// ProgressBarPrinter before PrintAndWait is called.
+	ErrorNoBarsAdded = fmt.Errorf("AddProgressBar hasn't been called yet")
+)
+
+// ProgressBar represents one progress bar in a ProgressBarPrinter. Should not
+// be created directly, use the AddProgressBar on a ProgressBarPrinter to
+// create these.
+type ProgressBar struct {
+	currentProgress float64
+	printBefore     string
+	printAfter      string
+	lock            sync.Mutex
+	done            bool
+}
+
+// SetCurrentProgress sets the progress of this ProgressBar. The progress must
+// be between 0 and 1 inclusive.
+func (pb *ProgressBar) SetCurrentProgress(progress float64) error {
+	if progress < 0 || progress > 1 {
+		return ErrorProgressOutOfBounds
+	}
+	pb.lock.Lock()
+	pb.currentProgress = progress
+	pb.lock.Unlock()
+	return nil
+}
+
+// SetPrintBefore sets the text printed on the line before the progress bar.
+func (pb *ProgressBar) SetPrintBefore(before string) {
+	pb.lock.Lock()
+	pb.printBefore = before
+	pb.lock.Unlock()
+}
+
+// SetPrintAfter sets the text printed on the line after the progress bar.
+func (pb *ProgressBar) SetPrintAfter(after string) {
+	pb.lock.Lock()
+	pb.printAfter = after
+	pb.lock.Unlock()
+}
+
+// ProgressBarPrinter will print out the progress of some number of
+// ProgressBars.
+type ProgressBarPrinter struct {
+	// DisplayWidth can be set to influence how large the progress bars are.
+	// The bars will be scaled to attempt to produce lines of this number of
+	// characters, but lines of different lengths may still be printed. When
+	// this value is 0 (aka unset), 80 character columns are assumed.
+	DisplayWidth int
+	// PadToBeEven, when set to true, will make Print pad the printBefore text
+	// with trailing spaces and the printAfter text with leading spaces to make
+	// the progress bars the same length.
+	PadToBeEven         bool
+	numLinesInLastPrint int
+	progressBars        []*ProgressBar
+	lock                sync.Mutex
+}
+
+// AddProgressBar will create a new ProgressBar, register it with this
+// ProgressBarPrinter, and return it. This must be called at least once before
+// PrintAndWait is called.
+func (pbp *ProgressBarPrinter) AddProgressBar() *ProgressBar {
+	pb := &ProgressBar{}
+	pbp.lock.Lock()
+	pbp.progressBars = append(pbp.progressBars, pb)
+	pbp.lock.Unlock()
+	return pb
+}
+
+// Print will print out progress information for each ProgressBar that has been
+// added to this ProgressBarPrinter. The progress will be written to printTo,
+// and if printTo is a terminal it will draw progress bars.  AddProgressBar
+// must be called at least once before Print is called. If printing to a
+// terminal, all draws after the first one will move the cursor up to draw over
+// the previously printed bars.
+func (pbp *ProgressBarPrinter) Print(printTo io.Writer) (bool, error) {
+	pbp.lock.Lock()
+	bars := pbp.progressBars
+	numColumns := pbp.DisplayWidth
+	pbp.lock.Unlock()
+
+	if len(bars) == 0 {
+		return false, ErrorNoBarsAdded
+	}
+
+	if numColumns == 0 {
+		numColumns = 80
+	}
+
+	if isTerminal(printTo) {
+		moveCursorUp(printTo, pbp.numLinesInLastPrint)
+	}
+
+	maxBefore := 0
+	maxAfter := 0
+	for _, bar := range bars {
+		bar.lock.Lock()
+		beforeSize := len(bar.printBefore)
+		afterSize := len(bar.printAfter)
+		bar.lock.Unlock()
+		if beforeSize > maxBefore {
+			maxBefore = beforeSize
+		}
+		if afterSize > maxAfter {
+			maxAfter = afterSize
+		}
+	}
+
+	allDone := false
+	for _, bar := range bars {
+		if isTerminal(printTo) {
+			bar.printToTerminal(printTo, numColumns, pbp.PadToBeEven, maxBefore, maxAfter)
+		} else {
+			bar.printToNonTerminal(printTo)
+		}
+		allDone = allDone || bar.currentProgress == 1
+	}
+
+	pbp.numLinesInLastPrint = len(bars)
+
+	return allDone, nil
+}
+
+// moveCursorUp moves the cursor up numLines in the terminal
+func moveCursorUp(printTo io.Writer, numLines int) {
+	if numLines > 0 {
+		fmt.Fprintf(printTo, "\033[%dA", numLines)
+	}
+}
+
+func (pb *ProgressBar) printToTerminal(printTo io.Writer, numColumns int, padding bool, maxBefore, maxAfter int) {
+	pb.lock.Lock()
+	before := pb.printBefore
+	after := pb.printAfter
+
+	if padding {
+		before = before + strings.Repeat(" ", maxBefore-len(before))
+		after = strings.Repeat(" ", maxAfter-len(after)) + after
+	}
+
+	progressBarSize := numColumns - (len(fmt.Sprintf("%s [] %s", before, after)))
+	progressBar := ""
+	if progressBarSize > 0 {
+		currentProgress := int(pb.currentProgress * float64(progressBarSize))
+		progressBar = fmt.Sprintf("[%s%s] ",
+			strings.Repeat("=", currentProgress),
+			strings.Repeat(" ", progressBarSize-currentProgress))
+	} else {
+		// If we can't fit the progress bar, better to not pad the before/after.
+		before = pb.printBefore
+		after = pb.printAfter
+	}
+
+	fmt.Fprintf(printTo, "%s %s%s\n", before, progressBar, after)
+	pb.lock.Unlock()
+}
+
+func (pb *ProgressBar) printToNonTerminal(printTo io.Writer) {
+	pb.lock.Lock()
+	if !pb.done {
+		fmt.Fprintf(printTo, "%s %s\n", pb.printBefore, pb.printAfter)
+		if pb.currentProgress == 1 {
+			pb.done = true
+		}
+	}
+	pb.lock.Unlock()
+}
+
+// isTerminal returns True when w is going to a tty, and false otherwise.
+func isTerminal(w io.Writer) bool {
+	if f, ok := w.(*os.File); ok {
+		return terminal.IsTerminal(int(f.Fd()))
+	}
+	return false
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/LICENSE b/Godeps/_workspace/src/github.com/klauspost/compress/LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/copy.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/copy.go
new file mode 100644
index 0000000000..a3200a8f49
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/copy.go
@@ -0,0 +1,32 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+// forwardCopy is like the built-in copy function except that it always goes
+// forward from the start, even if the dst and src overlap.
+// It is equivalent to:
+//   for i := 0; i < n; i++ {
+//     mem[dst+i] = mem[src+i]
+//   }
+func forwardCopy(mem []byte, dst, src, n int) {
+	if dst <= src {
+		copy(mem[dst:dst+n], mem[src:src+n])
+		return
+	}
+	for {
+		if dst >= src+n {
+			copy(mem[dst:dst+n], mem[src:src+n])
+			return
+		}
+		// There is some forward overlap.  The destination
+		// will be filled with a repeated pattern of mem[src:src+k].
+		// We copy one instance of the pattern here, then repeat.
+		// Each time around this loop k will double.
+		k := dst - src
+		copy(mem[dst:dst+k], mem[src:src+k])
+		n -= k
+		dst += k
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.go
new file mode 100644
index 0000000000..45d52f629c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.go
@@ -0,0 +1,39 @@
+//+build !noasm
+//+build !appengine
+
+// Copyright 2015, Klaus Post, see LICENSE for details.
+
+package flate
+
+import (
+	"github.com/klauspost/cpuid"
+)
+
+// crc32sse returns a hash for the first 4 bytes of the slice
+// len(a) must be >= 4.
+//go:noescape
+func crc32sse(a []byte) hash
+
+// crc32sseAll calculates hashes for each 4-byte set in a.
+// dst must be east len(a) - 4 in size.
+// The size is not checked by the assembly.
+//go:noescape
+func crc32sseAll(a []byte, dst []hash)
+
+// matchLenSSE4 returns the number of matching bytes in a and b
+// up to length 'max'. Both slices must be at least 'max'
+// bytes in size.
+// It uses the PCMPESTRI SSE 4.2 instruction.
+//go:noescape
+func matchLenSSE4(a, b []byte, max int) int
+
+// histogram accumulates a histogram of b in h.
+// h must be at least 256 entries in length,
+// and must be cleared before calling this function.
+//go:noescape
+func histogram(b []byte, h []int32)
+
+// Detect SSE 4.2 feature.
+func init() {
+	useSSE42 = cpuid.CPU.SSE42()
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.s b/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.s
new file mode 100644
index 0000000000..0212360d66
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.s
@@ -0,0 +1,218 @@
+//+build !noasm !appengine
+
+// Copyright 2015, Klaus Post, see LICENSE for details.
+
+// func crc32sse(a []byte) hash
+TEXT ·crc32sse(SB), 7, $0
+	MOVQ a+0(FP), R10
+	XORQ BX, BX
+
+	// CRC32   dword (R10), EBX
+	BYTE $0xF2; BYTE $0x41; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0x1a
+
+	MOVL BX, ret+24(FP)
+	RET
+
+// func crc32sseAll(a []byte, dst []hash)
+TEXT ·crc32sseAll(SB), 7, $0
+	MOVQ  a+0(FP), R8      // R8: src
+	MOVQ  a_len+8(FP), R10 // input length
+	MOVQ  dst+24(FP), R9   // R9: dst
+	SUBQ  $4, R10
+	JS    end
+	JZ    one_crc
+	MOVQ  R10, R13
+	SHRQ  $2, R10          // len/4
+	ANDQ  $3, R13          // len&3
+	XORQ  BX, BX
+	ADDQ  $1, R13
+	TESTQ R10, R10
+	JZ    rem_loop
+
+crc_loop:
+	MOVQ (R8), R11
+	XORQ BX, BX
+	XORQ DX, DX
+	XORQ DI, DI
+	MOVQ R11, R12
+	SHRQ $8, R11
+	MOVQ R12, AX
+	MOVQ R11, CX
+	SHRQ $16, R12
+	SHRQ $16, R11
+	MOVQ R12, SI
+
+	// CRC32   EAX, EBX
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xd8
+
+	// CRC32   ECX, EDX
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xd1
+
+	// CRC32   ESI, EDI
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xfe
+	MOVL BX, (R9)
+	MOVL DX, 4(R9)
+	MOVL DI, 8(R9)
+
+	XORQ BX, BX
+	MOVL R11, AX
+
+	// CRC32   EAX, EBX
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xd8
+	MOVL BX, 12(R9)
+
+	ADDQ $16, R9
+	ADDQ $4, R8
+	XORQ BX, BX
+	SUBQ $1, R10
+	JNZ  crc_loop
+
+rem_loop:
+	MOVL (R8), AX
+
+	// CRC32   EAX, EBX
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xd8
+
+	MOVL BX, (R9)
+	ADDQ $4, R9
+	ADDQ $1, R8
+	XORQ BX, BX
+	SUBQ $1, R13
+	JNZ  rem_loop
+
+end:
+	RET
+
+one_crc:
+	MOVQ $1, R13
+	XORQ BX, BX
+	JMP  rem_loop
+
+// func matchLenSSE4(a, b []byte, max int) int
+TEXT ·matchLenSSE4(SB), 7, $0
+	MOVQ  a+0(FP), SI        // RSI: &a
+	MOVQ  b+24(FP), DI       // RDI: &b
+	MOVQ  max+48(FP), R10    // R10: max
+	XORQ  R11, R11           // R11: match length
+	MOVQ  R10, R12           // R12: Remainder
+	SHRQ  $4, R10            // max / 16
+	MOVQ  $16, AX            // Set length for PCMPESTRI
+	MOVQ  $16, DX            // Set length for PCMPESTRI
+	ANDQ  $15, R12           // max & 15
+	TESTQ R10, R10
+	JZ    matchlen_verysmall
+
+loopback_matchlen:
+	MOVOU (SI), X0 // a[x]
+	MOVOU (DI), X1 // b[x]
+
+	// PCMPESTRI $0x18, X1, X0
+	// 0x18 = _SIDD_UBYTE_OPS (0x0) | _SIDD_CMP_EQUAL_EACH (0x8) | _SIDD_NEGATIVE_POLARITY (0x10)
+	BYTE $0x66; BYTE $0x0f; BYTE $0x3a
+	BYTE $0x61; BYTE $0xc1; BYTE $0x18
+
+	JC match_ended
+
+	ADDQ $16, SI
+	ADDQ $16, DI
+	ADDQ $16, R11
+
+	SUBQ $1, R10
+	JNZ  loopback_matchlen
+
+	// Check the remainder using REP CMPSB
+matchlen_verysmall:
+	TESTQ R12, R12
+	JZ    done_matchlen
+	MOVQ  R12, CX
+	ADDQ  R12, R11
+
+	// Compare CX bytes at [SI] [DI]
+	// Subtract one from CX for every match.
+	// Terminates when CX is zero (checked pre-compare)
+	CLD
+	REP; CMPSB
+
+	// Check if last was a match.
+	JZ done_matchlen
+
+	// Subtract remanding bytes.
+	SUBQ CX, R11
+	SUBQ $1, R11
+	MOVQ R11, ret+56(FP)
+	RET
+
+match_ended:
+	ADDQ CX, R11
+
+done_matchlen:
+	MOVQ R11, ret+56(FP)
+	RET
+
+// func histogram(b []byte, h []int32)
+TEXT ·histogram(SB), 7, $0
+	MOVQ b+0(FP), SI     // SI: &b
+	MOVQ b_len+8(FP), R9 // R9: len(b)
+	MOVQ h+24(FP), DI    // DI: Histogram
+	MOVQ R9, R8
+	SHRQ $3, R8
+	JZ   hist1
+	XORQ R11, R11
+
+loop_hist8:
+	MOVQ (SI), R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	INCL (DI)(R10*4)
+
+	ADDQ $8, SI
+	DECQ R8
+	JNZ  loop_hist8
+
+hist1:
+	ANDQ $7, R9
+	JZ   end_hist
+	XORQ R10, R10
+
+loop_hist1:
+	MOVB (SI), R10
+	INCL (DI)(R10*4)
+	INCQ SI
+	DECQ R9
+	JNZ  loop_hist1
+
+end_hist:
+	RET
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_noasm.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_noasm.go
new file mode 100644
index 0000000000..1c6d23eed6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_noasm.go
@@ -0,0 +1,34 @@
+//+build !amd64 noasm appengine
+
+// Copyright 2015, Klaus Post, see LICENSE for details.
+
+package flate
+
+func init() {
+	useSSE42 = false
+}
+
+// crc32sse should never be called.
+func crc32sse(a []byte) hash {
+	panic("no assembler")
+}
+
+// crc32sseAll should never be called.
+func crc32sseAll(a []byte, dst []hash) {
+	panic("no assembler")
+}
+
+// matchLenSSE4 should never be called.
+func matchLenSSE4(a, b []byte, max int) int {
+	panic("no assembler")
+	return 0
+}
+
+// histogram accumulates a histogram of b in h.
+// h must be at least 256 entries in length,
+// and must be cleared before calling this function.
+func histogram(b []byte, h []int32) {
+	for _, t := range b {
+		h[t]++
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/deflate.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/deflate.go
new file mode 100644
index 0000000000..b1efa677a5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/deflate.go
@@ -0,0 +1,1358 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Copyright (c) 2015 Klaus Post
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+import (
+	"fmt"
+	"io"
+	"math"
+)
+
+const (
+	NoCompression       = 0
+	BestSpeed           = 1
+	BestCompression     = 9
+	DefaultCompression  = -1
+	ConstantCompression = -2 // Does only Huffman encoding
+	logWindowSize       = 15
+	windowSize          = 1 << logWindowSize
+	windowMask          = windowSize - 1
+	logMaxOffsetSize    = 15  // Standard DEFLATE
+	minMatchLength      = 4   // The smallest match that the compressor looks for
+	maxMatchLength      = 258 // The longest match for the compressor
+	minOffsetSize       = 1   // The shortest offset that makes any sense
+
+	// The maximum number of tokens we put into a single flat block, just too
+	// stop things from getting too large.
+	maxFlateBlockTokens = 1 << 14
+	maxStoreBlockSize   = 65535
+	hashBits            = 17 // After 17 performance degrades
+	hashSize            = 1 << hashBits
+	hashMask            = (1 << hashBits) - 1
+	hashShift           = (hashBits + minMatchLength - 1) / minMatchLength
+	maxHashOffset       = 1 << 24
+
+	skipNever = math.MaxInt32
+)
+
+var useSSE42 bool
+
+type compressionLevel struct {
+	good, lazy, nice, chain, fastSkipHashing, level int
+}
+
+// Compression levels have been rebalanced from zlib deflate defaults
+// to give a bigger spread in speed and compression.
+// See https://blog.klauspost.com/rebalancing-deflate-compression-levels/
+var levels = []compressionLevel{
+	{}, // 0
+	// Level 1+2 uses snappy algorithm - values not used
+	{0, 0, 0, 0, 0, 1},
+	{0, 0, 0, 0, 0, 2},
+	// For levels 3-6 we don't bother trying with lazy matches.
+	// Lazy matching is at least 30% slower, with 1.5% increase.
+	{4, 0, 8, 4, 4, 3},
+	{4, 0, 12, 6, 5, 4},
+	{6, 0, 24, 16, 6, 5},
+	{8, 0, 32, 32, 7, 6},
+	// Levels 7-9 use increasingly more lazy matching
+	// and increasingly stringent conditions for "good enough".
+	{4, 8, 16, 16, skipNever, 7},
+	{6, 16, 32, 64, skipNever, 8},
+	{32, 258, 258, 4096, skipNever, 9},
+}
+
+type hashid uint32
+
+type compressor struct {
+	compressionLevel
+
+	w          *huffmanBitWriter
+	bulkHasher func([]byte, []hash)
+
+	// compression algorithm
+	fill func(*compressor, []byte) int // copy data to window
+	step func(*compressor)             // process window
+	sync bool                          // requesting flush
+
+	// Input hash chains
+	// hashHead[hashValue] contains the largest inputIndex with the specified hash value
+	// If hashHead[hashValue] is within the current window, then
+	// hashPrev[hashHead[hashValue] & windowMask] contains the previous index
+	// with the same hash value.
+	chainHead  int
+	hashHead   []hashid
+	hashPrev   []hashid
+	hashOffset int
+
+	// input window: unprocessed data is window[index:windowEnd]
+	index         int
+	window        []byte
+	windowEnd     int
+	blockStart    int  // window index where current tokens start
+	byteAvailable bool // if true, still need to process window[index-1].
+
+	// queued output tokens
+	tokens tokens
+
+	// deflate state
+	length         int
+	offset         int
+	hash           hash
+	maxInsertIndex int
+	err            error
+	ii             uint16 // position of last match, intended to overflow to reset.
+
+	snap      snappyEnc
+	hashMatch [maxMatchLength + minMatchLength]hash
+}
+
+type hash int32
+
+func (d *compressor) fillDeflate(b []byte) int {
+	if d.index >= 2*windowSize-(minMatchLength+maxMatchLength) {
+		// shift the window by windowSize
+		copy(d.window, d.window[windowSize:2*windowSize])
+		d.index -= windowSize
+		d.windowEnd -= windowSize
+		if d.blockStart >= windowSize {
+			d.blockStart -= windowSize
+		} else {
+			d.blockStart = math.MaxInt32
+		}
+		d.hashOffset += windowSize
+		if d.hashOffset > maxHashOffset {
+			delta := d.hashOffset - 1
+			d.hashOffset -= delta
+			d.chainHead -= delta
+			for i, v := range d.hashPrev {
+				if int(v) > delta {
+					d.hashPrev[i] = hashid(int(v) - delta)
+				} else {
+					d.hashPrev[i] = 0
+				}
+			}
+			for i, v := range d.hashHead {
+				if int(v) > delta {
+					d.hashHead[i] = hashid(int(v) - delta)
+				} else {
+					d.hashHead[i] = 0
+				}
+			}
+		}
+	}
+	n := copy(d.window[d.windowEnd:], b)
+	d.windowEnd += n
+	return n
+}
+
+func (d *compressor) writeBlock(tok tokens, index int, eof bool) error {
+	if index > 0 || eof {
+		var window []byte
+		if d.blockStart <= index {
+			window = d.window[d.blockStart:index]
+		}
+		d.blockStart = index
+		d.w.writeBlock(tok, eof, window)
+		return d.w.err
+	}
+	return nil
+}
+
+// writeBlockSkip writes the current block and uses the number of tokens
+// to determine if the block should be stored on no matches, or
+// only huffman encoded.
+func (d *compressor) writeBlockSkip(tok tokens, index int, eof bool) error {
+	if index > 0 || eof {
+		if d.blockStart <= index {
+			window := d.window[d.blockStart:index]
+			if tok.n == len(window) && !eof {
+				d.writeStoredBlock(window)
+				// If we removed less than 10 literals, huffman compress the block.
+			} else if tok.n > len(window)-10 {
+				d.w.writeBlockHuff(eof, window)
+			} else {
+				// Write a dynamic huffman block.
+				d.w.writeBlockDynamic(tok, eof, window)
+			}
+		} else {
+			d.w.writeBlock(tok, eof, nil)
+		}
+		d.blockStart = index
+		return d.w.err
+	}
+	return nil
+}
+
+// fillWindow will fill the current window with the supplied
+// dictionary and calculate all hashes.
+// This is much faster than doing a full encode.
+// Should only be used after a start/reset.
+func (d *compressor) fillWindow(b []byte) {
+	// Do not fill window if we are in store-only mode,
+	// use constant or Snappy compression.
+	switch d.compressionLevel.level {
+	case 0, 1, 2:
+		return
+	}
+	// If we are given too much, cut it.
+	if len(b) > windowSize {
+		b = b[len(b)-windowSize:]
+	}
+	// Add all to window.
+	n := copy(d.window[d.windowEnd:], b)
+
+	// Calculate 256 hashes at the time (more L1 cache hits)
+	loops := (n + 256 - minMatchLength) / 256
+	for j := 0; j < loops; j++ {
+		startindex := j * 256
+		end := startindex + 256 + minMatchLength - 1
+		if end > n {
+			end = n
+		}
+		tocheck := d.window[startindex:end]
+		dstSize := len(tocheck) - minMatchLength + 1
+
+		if dstSize <= 0 {
+			continue
+		}
+
+		dst := d.hashMatch[:dstSize]
+		d.bulkHasher(tocheck, dst)
+		var newH hash
+		for i, val := range dst {
+			di := i + startindex
+			newH = val & hashMask
+			// Get previous value with the same hash.
+			// Our chain should point to the previous value.
+			d.hashPrev[di&windowMask] = d.hashHead[newH]
+			// Set the head of the hash chain to us.
+			d.hashHead[newH] = hashid(di + d.hashOffset)
+		}
+		d.hash = newH
+	}
+	// Update window information.
+	d.windowEnd += n
+	d.index = n
+}
+
+// Try to find a match starting at index whose length is greater than prevSize.
+// We only look at chainCount possibilities before giving up.
+// pos = d.index, prevHead = d.chainHead-d.hashOffset, prevLength=minMatchLength-1, lookahead
+func (d *compressor) findMatch(pos int, prevHead int, prevLength int, lookahead int) (length, offset int, ok bool) {
+	minMatchLook := maxMatchLength
+	if lookahead < minMatchLook {
+		minMatchLook = lookahead
+	}
+
+	win := d.window[0 : pos+minMatchLook]
+
+	// We quit when we get a match that's at least nice long
+	nice := len(win) - pos
+	if d.nice < nice {
+		nice = d.nice
+	}
+
+	// If we've got a match that's good enough, only look in 1/4 the chain.
+	tries := d.chain
+	length = prevLength
+	if length >= d.good {
+		tries >>= 2
+	}
+
+	wEnd := win[pos+length]
+	wPos := win[pos:]
+	minIndex := pos - windowSize
+
+	for i := prevHead; tries > 0; tries-- {
+		if wEnd == win[i+length] {
+			n := matchLen(win[i:], wPos, minMatchLook)
+
+			if n > length && (n > minMatchLength || pos-i <= 4096) {
+				length = n
+				offset = pos - i
+				ok = true
+				if n >= nice {
+					// The match is good enough that we don't try to find a better one.
+					break
+				}
+				wEnd = win[pos+n]
+			}
+		}
+		if i == minIndex {
+			// hashPrev[i & windowMask] has already been overwritten, so stop now.
+			break
+		}
+		i = int(d.hashPrev[i&windowMask]) - d.hashOffset
+		if i < minIndex || i < 0 {
+			break
+		}
+	}
+	return
+}
+
+// Try to find a match starting at index whose length is greater than prevSize.
+// We only look at chainCount possibilities before giving up.
+// pos = d.index, prevHead = d.chainHead-d.hashOffset, prevLength=minMatchLength-1, lookahead
+func (d *compressor) findMatchSSE(pos int, prevHead int, prevLength int, lookahead int) (length, offset int, ok bool) {
+	minMatchLook := maxMatchLength
+	if lookahead < minMatchLook {
+		minMatchLook = lookahead
+	}
+
+	win := d.window[0 : pos+minMatchLook]
+
+	// We quit when we get a match that's at least nice long
+	nice := len(win) - pos
+	if d.nice < nice {
+		nice = d.nice
+	}
+
+	// If we've got a match that's good enough, only look in 1/4 the chain.
+	tries := d.chain
+	length = prevLength
+	if length >= d.good {
+		tries >>= 2
+	}
+
+	wEnd := win[pos+length]
+	wPos := win[pos:]
+	minIndex := pos - windowSize
+
+	for i := prevHead; tries > 0; tries-- {
+		if wEnd == win[i+length] {
+			n := matchLenSSE4(win[i:], wPos, minMatchLook)
+
+			if n > length && (n > minMatchLength || pos-i <= 4096) {
+				length = n
+				offset = pos - i
+				ok = true
+				if n >= nice {
+					// The match is good enough that we don't try to find a better one.
+					break
+				}
+				wEnd = win[pos+n]
+			}
+		}
+		if i == minIndex {
+			// hashPrev[i & windowMask] has already been overwritten, so stop now.
+			break
+		}
+		i = int(d.hashPrev[i&windowMask]) - d.hashOffset
+		if i < minIndex || i < 0 {
+			break
+		}
+	}
+	return
+}
+
+func (d *compressor) writeStoredBlock(buf []byte) error {
+	if d.w.writeStoredHeader(len(buf), false); d.w.err != nil {
+		return d.w.err
+	}
+	d.w.writeBytes(buf)
+	return d.w.err
+}
+
+// oldHash is the hash function used when no native crc32 calculation
+// or similar is present.
+func oldHash(b []byte) hash {
+	return hash(b[0])<<(hashShift*3) + hash(b[1])<<(hashShift*2) + hash(b[2])<<hashShift + hash(b[3])
+}
+
+// oldBulkHash will compute hashes using the same
+// algorithm as oldHash
+func oldBulkHash(b []byte, dst []hash) {
+	if len(b) < minMatchLength {
+		return
+	}
+	h := oldHash(b)
+	dst[0] = h
+	i := 1
+	end := len(b) - minMatchLength + 1
+	for ; i < end; i++ {
+		h = (h << hashShift) + hash(b[i+3])
+		dst[i] = h
+	}
+}
+
+// matchLen returns the number of matching bytes in a and b
+// up to length 'max'. Both slices must be at least 'max'
+// bytes in size.
+func matchLen(a, b []byte, max int) int {
+	a = a[:max]
+	for i, av := range a {
+		if b[i] != av {
+			return i
+		}
+	}
+	return max
+}
+
+func (d *compressor) initDeflate() {
+	d.hashHead = make([]hashid, hashSize)
+	d.hashPrev = make([]hashid, windowSize)
+	d.window = make([]byte, 2*windowSize)
+	d.hashOffset = 1
+	d.tokens.tokens = make([]token, maxFlateBlockTokens+1)
+	d.length = minMatchLength - 1
+	d.offset = 0
+	d.byteAvailable = false
+	d.index = 0
+	d.hash = 0
+	d.chainHead = -1
+	d.bulkHasher = oldBulkHash
+	if useSSE42 {
+		d.bulkHasher = crc32sseAll
+	}
+}
+
+// Assumes that d.fastSkipHashing != skipNever,
+// otherwise use deflateLazy
+func (d *compressor) deflate() {
+
+	// Sanity enables additional runtime tests.
+	// It's intended to be used during development
+	// to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
+		return
+	}
+
+	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
+	if d.index < d.maxInsertIndex {
+		d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+	}
+
+	for {
+		if sanity && d.index > d.windowEnd {
+			panic("index > windowEnd")
+		}
+		lookahead := d.windowEnd - d.index
+		if lookahead < minMatchLength+maxMatchLength {
+			if !d.sync {
+				return
+			}
+			if sanity && d.index > d.windowEnd {
+				panic("index > windowEnd")
+			}
+			if lookahead == 0 {
+				if d.tokens.n > 0 {
+					if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				return
+			}
+		}
+		if d.index < d.maxInsertIndex {
+			// Update the hash
+			d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+			ch := d.hashHead[d.hash]
+			d.chainHead = int(ch)
+			d.hashPrev[d.index&windowMask] = ch
+			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
+		}
+		d.length = minMatchLength - 1
+		d.offset = 0
+		minIndex := d.index - windowSize
+		if minIndex < 0 {
+			minIndex = 0
+		}
+
+		if d.chainHead-d.hashOffset >= minIndex && lookahead > minMatchLength-1 {
+			if newLength, newOffset, ok := d.findMatch(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
+				d.length = newLength
+				d.offset = newOffset
+			}
+		}
+		if d.length >= minMatchLength {
+			d.ii = 0
+			// There was a match at the previous step, and the current match is
+			// not better. Output the previous match.
+			// "d.length-3" should NOT be "d.length-minMatchLength", since the format always assume 3
+			d.tokens.tokens[d.tokens.n] = matchToken(uint32(d.length-3), uint32(d.offset-minOffsetSize))
+			d.tokens.n++
+			// Insert in the hash table all strings up to the end of the match.
+			// index and index-1 are already inserted. If there is not enough
+			// lookahead, the last two strings are not inserted into the hash
+			// table.
+			if d.length <= d.fastSkipHashing {
+				var newIndex int
+				newIndex = d.index + d.length
+				// Calculate missing hashes
+				end := newIndex
+				if end > d.maxInsertIndex {
+					end = d.maxInsertIndex
+				}
+				end += minMatchLength - 1
+				startindex := d.index + 1
+				if startindex > d.maxInsertIndex {
+					startindex = d.maxInsertIndex
+				}
+				tocheck := d.window[startindex:end]
+				dstSize := len(tocheck) - minMatchLength + 1
+				if dstSize > 0 {
+					dst := d.hashMatch[:dstSize]
+					oldBulkHash(tocheck, dst)
+					var newH hash
+					for i, val := range dst {
+						di := i + startindex
+						newH = val & hashMask
+						// Get previous value with the same hash.
+						// Our chain should point to the previous value.
+						d.hashPrev[di&windowMask] = d.hashHead[newH]
+						// Set the head of the hash chain to us.
+						d.hashHead[newH] = hashid(di + d.hashOffset)
+					}
+					d.hash = newH
+				}
+				d.index = newIndex
+			} else {
+				// For matches this long, we don't bother inserting each individual
+				// item into the table.
+				d.index += d.length
+				if d.index < d.maxInsertIndex {
+					d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+				}
+			}
+			if d.tokens.n == maxFlateBlockTokens {
+				// The block includes the current character
+				if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
+					return
+				}
+				d.tokens.n = 0
+			}
+		} else {
+			d.ii++
+			end := d.index + int(d.ii>>uint(d.fastSkipHashing)) + 1
+			if end > d.windowEnd {
+				end = d.windowEnd
+			}
+			for i := d.index; i < end; i++ {
+				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[i]))
+				d.tokens.n++
+				if d.tokens.n == maxFlateBlockTokens {
+					if d.err = d.writeBlockSkip(d.tokens, i+1, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+			}
+			d.index = end
+		}
+	}
+}
+
+// deflateLazy is the same as deflate, but with d.fastSkipHashing == skipNever,
+// meaning it always has lazy matching on.
+func (d *compressor) deflateLazy() {
+	// Sanity enables additional runtime tests.
+	// It's intended to be used during development
+	// to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
+		return
+	}
+
+	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
+	if d.index < d.maxInsertIndex {
+		d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+	}
+
+	for {
+		if sanity && d.index > d.windowEnd {
+			panic("index > windowEnd")
+		}
+		lookahead := d.windowEnd - d.index
+		if lookahead < minMatchLength+maxMatchLength {
+			if !d.sync {
+				return
+			}
+			if sanity && d.index > d.windowEnd {
+				panic("index > windowEnd")
+			}
+			if lookahead == 0 {
+				// Flush current output block if any.
+				if d.byteAvailable {
+					// There is still one pending token that needs to be flushed
+					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+					d.tokens.n++
+					d.byteAvailable = false
+				}
+				if d.tokens.n > 0 {
+					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				return
+			}
+		}
+		if d.index < d.maxInsertIndex {
+			// Update the hash
+			d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+			ch := d.hashHead[d.hash]
+			d.chainHead = int(ch)
+			d.hashPrev[d.index&windowMask] = ch
+			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
+		}
+		prevLength := d.length
+		prevOffset := d.offset
+		d.length = minMatchLength - 1
+		d.offset = 0
+		minIndex := d.index - windowSize
+		if minIndex < 0 {
+			minIndex = 0
+		}
+
+		if d.chainHead-d.hashOffset >= minIndex && lookahead > prevLength && prevLength < d.lazy {
+			if newLength, newOffset, ok := d.findMatch(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
+				d.length = newLength
+				d.offset = newOffset
+			}
+		}
+		if prevLength >= minMatchLength && d.length <= prevLength {
+			// There was a match at the previous step, and the current match is
+			// not better. Output the previous match.
+			d.tokens.tokens[d.tokens.n] = matchToken(uint32(prevLength-3), uint32(prevOffset-minOffsetSize))
+			d.tokens.n++
+
+			// Insert in the hash table all strings up to the end of the match.
+			// index and index-1 are already inserted. If there is not enough
+			// lookahead, the last two strings are not inserted into the hash
+			// table.
+			var newIndex int
+			newIndex = d.index + prevLength - 1
+			// Calculate missing hashes
+			end := newIndex
+			if end > d.maxInsertIndex {
+				end = d.maxInsertIndex
+			}
+			end += minMatchLength - 1
+			startindex := d.index + 1
+			if startindex > d.maxInsertIndex {
+				startindex = d.maxInsertIndex
+			}
+			tocheck := d.window[startindex:end]
+			dstSize := len(tocheck) - minMatchLength + 1
+			if dstSize > 0 {
+				dst := d.hashMatch[:dstSize]
+				oldBulkHash(tocheck, dst)
+				var newH hash
+				for i, val := range dst {
+					di := i + startindex
+					newH = val & hashMask
+					// Get previous value with the same hash.
+					// Our chain should point to the previous value.
+					d.hashPrev[di&windowMask] = d.hashHead[newH]
+					// Set the head of the hash chain to us.
+					d.hashHead[newH] = hashid(di + d.hashOffset)
+				}
+				d.hash = newH
+			}
+
+			d.index = newIndex
+			d.byteAvailable = false
+			d.length = minMatchLength - 1
+			if d.tokens.n == maxFlateBlockTokens {
+				// The block includes the current character
+				if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+					return
+				}
+				d.tokens.n = 0
+			}
+		} else {
+			// Reset, if we got a match this run.
+			if d.length >= minMatchLength {
+				d.ii = 0
+			}
+			// We have a byte waiting. Emit it.
+			if d.byteAvailable {
+				d.ii++
+				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+				d.tokens.n++
+				if d.tokens.n == maxFlateBlockTokens {
+					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				d.index++
+
+				// If we have a long run of no matches, skip additional bytes
+				// Resets when d.ii overflows after 64KB.
+				if d.ii > 31 {
+					n := int(d.ii >> 6)
+					for j := 0; j < n; j++ {
+						if d.index >= d.windowEnd-1 {
+							break
+						}
+
+						d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+						d.tokens.n++
+						if d.tokens.n == maxFlateBlockTokens {
+							if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+								return
+							}
+							d.tokens.n = 0
+						}
+						d.index++
+					}
+					// Flush last byte
+					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+					d.tokens.n++
+					d.byteAvailable = false
+					// d.length = minMatchLength - 1 // not needed, since d.ii is reset above, so it should never be > minMatchLength
+					if d.tokens.n == maxFlateBlockTokens {
+						if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+							return
+						}
+						d.tokens.n = 0
+					}
+				}
+			} else {
+				d.index++
+				d.byteAvailable = true
+			}
+		}
+	}
+}
+
+// Assumes that d.fastSkipHashing != skipNever,
+// otherwise use deflateLazySSE
+func (d *compressor) deflateSSE() {
+
+	// Sanity enables additional runtime tests.
+	// It's intended to be used during development
+	// to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
+		return
+	}
+
+	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
+	if d.index < d.maxInsertIndex {
+		d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+	}
+
+	for {
+		if sanity && d.index > d.windowEnd {
+			panic("index > windowEnd")
+		}
+		lookahead := d.windowEnd - d.index
+		if lookahead < minMatchLength+maxMatchLength {
+			if !d.sync {
+				return
+			}
+			if sanity && d.index > d.windowEnd {
+				panic("index > windowEnd")
+			}
+			if lookahead == 0 {
+				if d.tokens.n > 0 {
+					if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				return
+			}
+		}
+		if d.index < d.maxInsertIndex {
+			// Update the hash
+			d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
+			ch := d.hashHead[d.hash]
+			d.chainHead = int(ch)
+			d.hashPrev[d.index&windowMask] = ch
+			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
+		}
+		d.length = minMatchLength - 1
+		d.offset = 0
+		minIndex := d.index - windowSize
+		if minIndex < 0 {
+			minIndex = 0
+		}
+
+		if d.chainHead-d.hashOffset >= minIndex && lookahead > minMatchLength-1 {
+			if newLength, newOffset, ok := d.findMatchSSE(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
+				d.length = newLength
+				d.offset = newOffset
+			}
+		}
+		if d.length >= minMatchLength {
+			d.ii = 0
+			// There was a match at the previous step, and the current match is
+			// not better. Output the previous match.
+			// "d.length-3" should NOT be "d.length-minMatchLength", since the format always assume 3
+			d.tokens.tokens[d.tokens.n] = matchToken(uint32(d.length-3), uint32(d.offset-minOffsetSize))
+			d.tokens.n++
+			// Insert in the hash table all strings up to the end of the match.
+			// index and index-1 are already inserted. If there is not enough
+			// lookahead, the last two strings are not inserted into the hash
+			// table.
+			if d.length <= d.fastSkipHashing {
+				var newIndex int
+				newIndex = d.index + d.length
+				// Calculate missing hashes
+				end := newIndex
+				if end > d.maxInsertIndex {
+					end = d.maxInsertIndex
+				}
+				end += minMatchLength - 1
+				startindex := d.index + 1
+				if startindex > d.maxInsertIndex {
+					startindex = d.maxInsertIndex
+				}
+				tocheck := d.window[startindex:end]
+				dstSize := len(tocheck) - minMatchLength + 1
+				if dstSize > 0 {
+					dst := d.hashMatch[:dstSize]
+
+					crc32sseAll(tocheck, dst)
+					var newH hash
+					for i, val := range dst {
+						di := i + startindex
+						newH = val & hashMask
+						// Get previous value with the same hash.
+						// Our chain should point to the previous value.
+						d.hashPrev[di&windowMask] = d.hashHead[newH]
+						// Set the head of the hash chain to us.
+						d.hashHead[newH] = hashid(di + d.hashOffset)
+					}
+					d.hash = newH
+				}
+				d.index = newIndex
+			} else {
+				// For matches this long, we don't bother inserting each individual
+				// item into the table.
+				d.index += d.length
+				if d.index < d.maxInsertIndex {
+					d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
+				}
+			}
+			if d.tokens.n == maxFlateBlockTokens {
+				// The block includes the current character
+				if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
+					return
+				}
+				d.tokens.n = 0
+			}
+		} else {
+			d.ii++
+			end := d.index + int(d.ii>>uint(d.fastSkipHashing)) + 1
+			if end > d.windowEnd {
+				end = d.windowEnd
+			}
+			for i := d.index; i < end; i++ {
+				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[i]))
+				d.tokens.n++
+				if d.tokens.n == maxFlateBlockTokens {
+					if d.err = d.writeBlockSkip(d.tokens, i+1, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+			}
+			d.index = end
+		}
+	}
+}
+
+// deflateLazy is the same as deflate, but with d.fastSkipHashing == skipNever,
+// meaning it always has lazy matching on.
+func (d *compressor) deflateLazySSE() {
+	// Sanity enables additional runtime tests.
+	// It's intended to be used during development
+	// to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
+		return
+	}
+
+	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
+	if d.index < d.maxInsertIndex {
+		d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
+	}
+
+	for {
+		if sanity && d.index > d.windowEnd {
+			panic("index > windowEnd")
+		}
+		lookahead := d.windowEnd - d.index
+		if lookahead < minMatchLength+maxMatchLength {
+			if !d.sync {
+				return
+			}
+			if sanity && d.index > d.windowEnd {
+				panic("index > windowEnd")
+			}
+			if lookahead == 0 {
+				// Flush current output block if any.
+				if d.byteAvailable {
+					// There is still one pending token that needs to be flushed
+					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+					d.tokens.n++
+					d.byteAvailable = false
+				}
+				if d.tokens.n > 0 {
+					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				return
+			}
+		}
+		if d.index < d.maxInsertIndex {
+			// Update the hash
+			d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
+			ch := d.hashHead[d.hash]
+			d.chainHead = int(ch)
+			d.hashPrev[d.index&windowMask] = ch
+			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
+		}
+		prevLength := d.length
+		prevOffset := d.offset
+		d.length = minMatchLength - 1
+		d.offset = 0
+		minIndex := d.index - windowSize
+		if minIndex < 0 {
+			minIndex = 0
+		}
+
+		if d.chainHead-d.hashOffset >= minIndex && lookahead > prevLength && prevLength < d.lazy {
+			if newLength, newOffset, ok := d.findMatchSSE(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
+				d.length = newLength
+				d.offset = newOffset
+			}
+		}
+		if prevLength >= minMatchLength && d.length <= prevLength {
+			// There was a match at the previous step, and the current match is
+			// not better. Output the previous match.
+			d.tokens.tokens[d.tokens.n] = matchToken(uint32(prevLength-3), uint32(prevOffset-minOffsetSize))
+			d.tokens.n++
+
+			// Insert in the hash table all strings up to the end of the match.
+			// index and index-1 are already inserted. If there is not enough
+			// lookahead, the last two strings are not inserted into the hash
+			// table.
+			var newIndex int
+			newIndex = d.index + prevLength - 1
+			// Calculate missing hashes
+			end := newIndex
+			if end > d.maxInsertIndex {
+				end = d.maxInsertIndex
+			}
+			end += minMatchLength - 1
+			startindex := d.index + 1
+			if startindex > d.maxInsertIndex {
+				startindex = d.maxInsertIndex
+			}
+			tocheck := d.window[startindex:end]
+			dstSize := len(tocheck) - minMatchLength + 1
+			if dstSize > 0 {
+				dst := d.hashMatch[:dstSize]
+				crc32sseAll(tocheck, dst)
+				var newH hash
+				for i, val := range dst {
+					di := i + startindex
+					newH = val & hashMask
+					// Get previous value with the same hash.
+					// Our chain should point to the previous value.
+					d.hashPrev[di&windowMask] = d.hashHead[newH]
+					// Set the head of the hash chain to us.
+					d.hashHead[newH] = hashid(di + d.hashOffset)
+				}
+				d.hash = newH
+			}
+
+			d.index = newIndex
+			d.byteAvailable = false
+			d.length = minMatchLength - 1
+			if d.tokens.n == maxFlateBlockTokens {
+				// The block includes the current character
+				if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+					return
+				}
+				d.tokens.n = 0
+			}
+		} else {
+			// Reset, if we got a match this run.
+			if d.length >= minMatchLength {
+				d.ii = 0
+			}
+			// We have a byte waiting. Emit it.
+			if d.byteAvailable {
+				d.ii++
+				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+				d.tokens.n++
+				if d.tokens.n == maxFlateBlockTokens {
+					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				d.index++
+
+				// If we have a long run of no matches, skip additional bytes
+				// Resets when d.ii overflows after 64KB.
+				if d.ii > 31 {
+					n := int(d.ii >> 6)
+					for j := 0; j < n; j++ {
+						if d.index >= d.windowEnd-1 {
+							break
+						}
+
+						d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+						d.tokens.n++
+						if d.tokens.n == maxFlateBlockTokens {
+							if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+								return
+							}
+							d.tokens.n = 0
+						}
+						d.index++
+					}
+					// Flush last byte
+					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+					d.tokens.n++
+					d.byteAvailable = false
+					// d.length = minMatchLength - 1 // not needed, since d.ii is reset above, so it should never be > minMatchLength
+					if d.tokens.n == maxFlateBlockTokens {
+						if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+							return
+						}
+						d.tokens.n = 0
+					}
+				}
+			} else {
+				d.index++
+				d.byteAvailable = true
+			}
+		}
+	}
+}
+
+func (d *compressor) fillStore(b []byte) int {
+	n := copy(d.window[d.windowEnd:], b)
+	d.windowEnd += n
+	return n
+}
+
+func (d *compressor) store() {
+	if d.windowEnd > 0 {
+		d.err = d.writeStoredBlock(d.window[:d.windowEnd])
+	}
+	d.windowEnd = 0
+}
+
+// fillHuff will fill the buffer with data for huffman-only compression.
+// The number of bytes copied is returned.
+func (d *compressor) fillHuff(b []byte) int {
+	n := copy(d.window[d.windowEnd:], b)
+	d.windowEnd += n
+	return n
+}
+
+// storeHuff will compress and store the currently added data,
+// if enough has been accumulated or we at the end of the stream.
+// Any error that occurred will be in d.err
+func (d *compressor) storeHuff() {
+	// We only compress if we have maxStoreBlockSize or we are at end-of-stream
+	if d.windowEnd < maxStoreBlockSize && !d.sync {
+		return
+	}
+	if d.windowEnd == 0 {
+		return
+	}
+	d.w.writeBlockHuff(false, d.window[:d.windowEnd])
+	d.err = d.w.err
+	d.windowEnd = 0
+}
+
+// storeHuff will compress and store the currently added data,
+// if enough has been accumulated or we at the end of the stream.
+// Any error that occurred will be in d.err
+func (d *compressor) storeSnappy() {
+	// We only compress if we have maxStoreBlockSize.
+	if d.windowEnd < maxStoreBlockSize {
+		if !d.sync {
+			return
+		}
+		// Handle extremely small sizes.
+		if d.windowEnd < 128 {
+			if d.windowEnd == 0 {
+				return
+			}
+			if d.windowEnd <= 32 {
+				d.err = d.writeStoredBlock(d.window[:d.windowEnd])
+				d.tokens.n = 0
+				d.windowEnd = 0
+			} else {
+				d.w.writeBlockHuff(false, d.window[:d.windowEnd])
+				d.err = d.w.err
+			}
+			d.tokens.n = 0
+			d.windowEnd = 0
+			return
+		}
+	}
+
+	d.snap.Encode(&d.tokens, d.window[:d.windowEnd])
+	// If we made zero matches, store the block as is.
+	if d.tokens.n == d.windowEnd {
+		d.err = d.writeStoredBlock(d.window[:d.windowEnd])
+		// If we removed less than 1/16th, huffman compress the block.
+	} else if d.tokens.n > d.windowEnd-(d.windowEnd>>4) {
+		d.w.writeBlockHuff(false, d.window[:d.windowEnd])
+		d.err = d.w.err
+	} else {
+		d.w.writeBlockDynamic(d.tokens, false, d.window[:d.windowEnd])
+		d.err = d.w.err
+	}
+	d.tokens.n = 0
+	d.windowEnd = 0
+}
+
+// write will add input byte to the stream.
+// Unless an error occurs all bytes will be consumed.
+func (d *compressor) write(b []byte) (n int, err error) {
+	if d.err != nil {
+		return 0, d.err
+	}
+	n = len(b)
+	for len(b) > 0 {
+		d.step(d)
+		b = b[d.fill(d, b):]
+		if d.err != nil {
+			return 0, d.err
+		}
+	}
+	return n, d.err
+}
+
+func (d *compressor) syncFlush() error {
+	d.sync = true
+	if d.err != nil {
+		return d.err
+	}
+	d.step(d)
+	if d.err == nil {
+		d.w.writeStoredHeader(0, false)
+		d.w.flush()
+		d.err = d.w.err
+	}
+	d.sync = false
+	return d.err
+}
+
+func (d *compressor) init(w io.Writer, level int) (err error) {
+	d.w = newHuffmanBitWriter(w)
+
+	switch {
+	case level == NoCompression:
+		d.window = make([]byte, maxStoreBlockSize)
+		d.fill = (*compressor).fillStore
+		d.step = (*compressor).store
+	case level == ConstantCompression:
+		d.window = make([]byte, maxStoreBlockSize)
+		d.fill = (*compressor).fillHuff
+		d.step = (*compressor).storeHuff
+	case level >= 1 && level <= 3:
+		d.snap = newSnappy(level)
+		d.window = make([]byte, maxStoreBlockSize)
+		d.fill = (*compressor).fillHuff
+		d.step = (*compressor).storeSnappy
+		d.tokens.tokens = make([]token, maxStoreBlockSize+1)
+	case level == DefaultCompression:
+		level = 5
+		fallthrough
+	case 4 <= level && level <= 9:
+		d.compressionLevel = levels[level]
+		d.initDeflate()
+		d.fill = (*compressor).fillDeflate
+		if d.fastSkipHashing == skipNever {
+			if useSSE42 {
+				d.step = (*compressor).deflateLazySSE
+			} else {
+				d.step = (*compressor).deflateLazy
+			}
+		} else {
+			if useSSE42 {
+				d.step = (*compressor).deflateSSE
+			} else {
+				d.step = (*compressor).deflate
+
+			}
+		}
+	default:
+		return fmt.Errorf("flate: invalid compression level %d: want value in range [-2, 9]", level)
+	}
+	return nil
+}
+
+// Used for zeroing the hash slice
+var hzeroes [256]hashid
+
+// reset the state of the compressor.
+func (d *compressor) reset(w io.Writer) {
+	d.w.reset(w)
+	d.sync = false
+	d.err = nil
+	// We only need to reset a few things for Snappy.
+	if d.snap != nil {
+		d.snap.Reset()
+		d.windowEnd = 0
+		d.tokens.n = 0
+		return
+	}
+	switch d.compressionLevel.chain {
+	case 0:
+		// level was NoCompression or ConstantCompresssion.
+		d.windowEnd = 0
+	default:
+		d.chainHead = -1
+		for s := d.hashHead; len(s) > 0; {
+			n := copy(s, hzeroes[:])
+			s = s[n:]
+		}
+		for s := d.hashPrev; len(s) > 0; s = s[len(hzeroes):] {
+			copy(s, hzeroes[:])
+		}
+		d.hashOffset = 1
+
+		d.index, d.windowEnd = 0, 0
+		d.blockStart, d.byteAvailable = 0, false
+
+		d.tokens.n = 0
+		d.length = minMatchLength - 1
+		d.offset = 0
+		d.hash = 0
+		d.ii = 0
+		d.maxInsertIndex = 0
+	}
+}
+
+func (d *compressor) close() error {
+	if d.err != nil {
+		return d.err
+	}
+	d.sync = true
+	d.step(d)
+	if d.err != nil {
+		return d.err
+	}
+	if d.w.writeStoredHeader(0, true); d.w.err != nil {
+		return d.w.err
+	}
+	d.w.flush()
+	return d.w.err
+}
+
+// NewWriter returns a new Writer compressing data at the given level.
+// Following zlib, levels range from 1 (BestSpeed) to 9 (BestCompression);
+// higher levels typically run slower but compress more.
+// Level 0 (NoCompression) does not attempt any compression; it only adds the
+// necessary DEFLATE framing.
+// Level -1 (DefaultCompression) uses the default compression level.
+// Level -2 (ConstantCompression) will use Huffman compression only, giving
+// a very fast compression for all types of input, but sacrificing considerable
+// compression efficiency.
+//
+// If level is in the range [-2, 9] then the error returned will be nil.
+// Otherwise the error returned will be non-nil.
+func NewWriter(w io.Writer, level int) (*Writer, error) {
+	var dw Writer
+	if err := dw.d.init(w, level); err != nil {
+		return nil, err
+	}
+	return &dw, nil
+}
+
+// NewWriterDict is like NewWriter but initializes the new
+// Writer with a preset dictionary.  The returned Writer behaves
+// as if the dictionary had been written to it without producing
+// any compressed output.  The compressed data written to w
+// can only be decompressed by a Reader initialized with the
+// same dictionary.
+func NewWriterDict(w io.Writer, level int, dict []byte) (*Writer, error) {
+	dw := &dictWriter{w}
+	zw, err := NewWriter(dw, level)
+	if err != nil {
+		return nil, err
+	}
+	zw.d.fillWindow(dict)
+	zw.dict = append(zw.dict, dict...) // duplicate dictionary for Reset method.
+	return zw, err
+}
+
+type dictWriter struct {
+	w io.Writer
+}
+
+func (w *dictWriter) Write(b []byte) (n int, err error) {
+	return w.w.Write(b)
+}
+
+// A Writer takes data written to it and writes the compressed
+// form of that data to an underlying writer (see NewWriter).
+type Writer struct {
+	d    compressor
+	dict []byte
+}
+
+// Write writes data to w, which will eventually write the
+// compressed form of data to its underlying writer.
+func (w *Writer) Write(data []byte) (n int, err error) {
+	return w.d.write(data)
+}
+
+// Flush flushes any pending compressed data to the underlying writer.
+// It is useful mainly in compressed network protocols, to ensure that
+// a remote reader has enough data to reconstruct a packet.
+// Flush does not return until the data has been written.
+// If the underlying writer returns an error, Flush returns that error.
+//
+// In the terminology of the zlib library, Flush is equivalent to Z_SYNC_FLUSH.
+func (w *Writer) Flush() error {
+	// For more about flushing:
+	// http://www.bolet.org/~pornin/deflate-flush.html
+	return w.d.syncFlush()
+}
+
+// Close flushes and closes the writer.
+func (w *Writer) Close() error {
+	return w.d.close()
+}
+
+// Reset discards the writer's state and makes it equivalent to
+// the result of NewWriter or NewWriterDict called with dst
+// and w's level and dictionary.
+func (w *Writer) Reset(dst io.Writer) {
+	if dw, ok := w.d.w.w.(*dictWriter); ok {
+		// w was created with NewWriterDict
+		dw.w = dst
+		w.d.reset(dw)
+		w.d.fillWindow(w.dict)
+	} else {
+		// w was created with NewWriter
+		w.d.reset(dst)
+	}
+}
+
+// ResetDict discards the writer's state and makes it equivalent to
+// the result of NewWriter or NewWriterDict called with dst
+// and w's level, but sets a specific dictionary.
+func (w *Writer) ResetDict(dst io.Writer, dict []byte) {
+	w.dict = dict
+	w.d.reset(dst)
+	w.d.fillWindow(w.dict)
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/fixedhuff.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/fixedhuff.go
new file mode 100644
index 0000000000..7df8b9a293
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/fixedhuff.go
@@ -0,0 +1,78 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+// autogenerated by go run gen.go -output fixedhuff.go, DO NOT EDIT
+
+var fixedHuffmanDecoder = huffmanDecoder{
+	7,
+	[huffmanNumChunks]uint32{
+		0x1007, 0x0508, 0x0108, 0x1188, 0x1107, 0x0708, 0x0308, 0x0c09,
+		0x1087, 0x0608, 0x0208, 0x0a09, 0x0008, 0x0808, 0x0408, 0x0e09,
+		0x1047, 0x0588, 0x0188, 0x0909, 0x1147, 0x0788, 0x0388, 0x0d09,
+		0x10c7, 0x0688, 0x0288, 0x0b09, 0x0088, 0x0888, 0x0488, 0x0f09,
+		0x1027, 0x0548, 0x0148, 0x11c8, 0x1127, 0x0748, 0x0348, 0x0c89,
+		0x10a7, 0x0648, 0x0248, 0x0a89, 0x0048, 0x0848, 0x0448, 0x0e89,
+		0x1067, 0x05c8, 0x01c8, 0x0989, 0x1167, 0x07c8, 0x03c8, 0x0d89,
+		0x10e7, 0x06c8, 0x02c8, 0x0b89, 0x00c8, 0x08c8, 0x04c8, 0x0f89,
+		0x1017, 0x0528, 0x0128, 0x11a8, 0x1117, 0x0728, 0x0328, 0x0c49,
+		0x1097, 0x0628, 0x0228, 0x0a49, 0x0028, 0x0828, 0x0428, 0x0e49,
+		0x1057, 0x05a8, 0x01a8, 0x0949, 0x1157, 0x07a8, 0x03a8, 0x0d49,
+		0x10d7, 0x06a8, 0x02a8, 0x0b49, 0x00a8, 0x08a8, 0x04a8, 0x0f49,
+		0x1037, 0x0568, 0x0168, 0x11e8, 0x1137, 0x0768, 0x0368, 0x0cc9,
+		0x10b7, 0x0668, 0x0268, 0x0ac9, 0x0068, 0x0868, 0x0468, 0x0ec9,
+		0x1077, 0x05e8, 0x01e8, 0x09c9, 0x1177, 0x07e8, 0x03e8, 0x0dc9,
+		0x10f7, 0x06e8, 0x02e8, 0x0bc9, 0x00e8, 0x08e8, 0x04e8, 0x0fc9,
+		0x1007, 0x0518, 0x0118, 0x1198, 0x1107, 0x0718, 0x0318, 0x0c29,
+		0x1087, 0x0618, 0x0218, 0x0a29, 0x0018, 0x0818, 0x0418, 0x0e29,
+		0x1047, 0x0598, 0x0198, 0x0929, 0x1147, 0x0798, 0x0398, 0x0d29,
+		0x10c7, 0x0698, 0x0298, 0x0b29, 0x0098, 0x0898, 0x0498, 0x0f29,
+		0x1027, 0x0558, 0x0158, 0x11d8, 0x1127, 0x0758, 0x0358, 0x0ca9,
+		0x10a7, 0x0658, 0x0258, 0x0aa9, 0x0058, 0x0858, 0x0458, 0x0ea9,
+		0x1067, 0x05d8, 0x01d8, 0x09a9, 0x1167, 0x07d8, 0x03d8, 0x0da9,
+		0x10e7, 0x06d8, 0x02d8, 0x0ba9, 0x00d8, 0x08d8, 0x04d8, 0x0fa9,
+		0x1017, 0x0538, 0x0138, 0x11b8, 0x1117, 0x0738, 0x0338, 0x0c69,
+		0x1097, 0x0638, 0x0238, 0x0a69, 0x0038, 0x0838, 0x0438, 0x0e69,
+		0x1057, 0x05b8, 0x01b8, 0x0969, 0x1157, 0x07b8, 0x03b8, 0x0d69,
+		0x10d7, 0x06b8, 0x02b8, 0x0b69, 0x00b8, 0x08b8, 0x04b8, 0x0f69,
+		0x1037, 0x0578, 0x0178, 0x11f8, 0x1137, 0x0778, 0x0378, 0x0ce9,
+		0x10b7, 0x0678, 0x0278, 0x0ae9, 0x0078, 0x0878, 0x0478, 0x0ee9,
+		0x1077, 0x05f8, 0x01f8, 0x09e9, 0x1177, 0x07f8, 0x03f8, 0x0de9,
+		0x10f7, 0x06f8, 0x02f8, 0x0be9, 0x00f8, 0x08f8, 0x04f8, 0x0fe9,
+		0x1007, 0x0508, 0x0108, 0x1188, 0x1107, 0x0708, 0x0308, 0x0c19,
+		0x1087, 0x0608, 0x0208, 0x0a19, 0x0008, 0x0808, 0x0408, 0x0e19,
+		0x1047, 0x0588, 0x0188, 0x0919, 0x1147, 0x0788, 0x0388, 0x0d19,
+		0x10c7, 0x0688, 0x0288, 0x0b19, 0x0088, 0x0888, 0x0488, 0x0f19,
+		0x1027, 0x0548, 0x0148, 0x11c8, 0x1127, 0x0748, 0x0348, 0x0c99,
+		0x10a7, 0x0648, 0x0248, 0x0a99, 0x0048, 0x0848, 0x0448, 0x0e99,
+		0x1067, 0x05c8, 0x01c8, 0x0999, 0x1167, 0x07c8, 0x03c8, 0x0d99,
+		0x10e7, 0x06c8, 0x02c8, 0x0b99, 0x00c8, 0x08c8, 0x04c8, 0x0f99,
+		0x1017, 0x0528, 0x0128, 0x11a8, 0x1117, 0x0728, 0x0328, 0x0c59,
+		0x1097, 0x0628, 0x0228, 0x0a59, 0x0028, 0x0828, 0x0428, 0x0e59,
+		0x1057, 0x05a8, 0x01a8, 0x0959, 0x1157, 0x07a8, 0x03a8, 0x0d59,
+		0x10d7, 0x06a8, 0x02a8, 0x0b59, 0x00a8, 0x08a8, 0x04a8, 0x0f59,
+		0x1037, 0x0568, 0x0168, 0x11e8, 0x1137, 0x0768, 0x0368, 0x0cd9,
+		0x10b7, 0x0668, 0x0268, 0x0ad9, 0x0068, 0x0868, 0x0468, 0x0ed9,
+		0x1077, 0x05e8, 0x01e8, 0x09d9, 0x1177, 0x07e8, 0x03e8, 0x0dd9,
+		0x10f7, 0x06e8, 0x02e8, 0x0bd9, 0x00e8, 0x08e8, 0x04e8, 0x0fd9,
+		0x1007, 0x0518, 0x0118, 0x1198, 0x1107, 0x0718, 0x0318, 0x0c39,
+		0x1087, 0x0618, 0x0218, 0x0a39, 0x0018, 0x0818, 0x0418, 0x0e39,
+		0x1047, 0x0598, 0x0198, 0x0939, 0x1147, 0x0798, 0x0398, 0x0d39,
+		0x10c7, 0x0698, 0x0298, 0x0b39, 0x0098, 0x0898, 0x0498, 0x0f39,
+		0x1027, 0x0558, 0x0158, 0x11d8, 0x1127, 0x0758, 0x0358, 0x0cb9,
+		0x10a7, 0x0658, 0x0258, 0x0ab9, 0x0058, 0x0858, 0x0458, 0x0eb9,
+		0x1067, 0x05d8, 0x01d8, 0x09b9, 0x1167, 0x07d8, 0x03d8, 0x0db9,
+		0x10e7, 0x06d8, 0x02d8, 0x0bb9, 0x00d8, 0x08d8, 0x04d8, 0x0fb9,
+		0x1017, 0x0538, 0x0138, 0x11b8, 0x1117, 0x0738, 0x0338, 0x0c79,
+		0x1097, 0x0638, 0x0238, 0x0a79, 0x0038, 0x0838, 0x0438, 0x0e79,
+		0x1057, 0x05b8, 0x01b8, 0x0979, 0x1157, 0x07b8, 0x03b8, 0x0d79,
+		0x10d7, 0x06b8, 0x02b8, 0x0b79, 0x00b8, 0x08b8, 0x04b8, 0x0f79,
+		0x1037, 0x0578, 0x0178, 0x11f8, 0x1137, 0x0778, 0x0378, 0x0cf9,
+		0x10b7, 0x0678, 0x0278, 0x0af9, 0x0078, 0x0878, 0x0478, 0x0ef9,
+		0x1077, 0x05f8, 0x01f8, 0x09f9, 0x1177, 0x07f8, 0x03f8, 0x0df9,
+		0x10f7, 0x06f8, 0x02f8, 0x0bf9, 0x00f8, 0x08f8, 0x04f8, 0x0ff9,
+	},
+	nil, 0,
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/gen.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/gen.go
new file mode 100644
index 0000000000..154c89a488
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/gen.go
@@ -0,0 +1,265 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+// This program generates fixedhuff.go
+// Invoke as
+//
+//	go run gen.go -output fixedhuff.go
+
+package main
+
+import (
+	"bytes"
+	"flag"
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"log"
+)
+
+var filename = flag.String("output", "fixedhuff.go", "output file name")
+
+const maxCodeLen = 16
+
+// Note: the definition of the huffmanDecoder struct is copied from
+// inflate.go, as it is private to the implementation.
+
+// chunk & 15 is number of bits
+// chunk >> 4 is value, including table link
+
+const (
+	huffmanChunkBits  = 9
+	huffmanNumChunks  = 1 << huffmanChunkBits
+	huffmanCountMask  = 15
+	huffmanValueShift = 4
+)
+
+type huffmanDecoder struct {
+	min      int                      // the minimum code length
+	chunks   [huffmanNumChunks]uint32 // chunks as described above
+	links    [][]uint32               // overflow links
+	linkMask uint32                   // mask the width of the link table
+}
+
+// Initialize Huffman decoding tables from array of code lengths.
+// Following this function, h is guaranteed to be initialized into a complete
+// tree (i.e., neither over-subscribed nor under-subscribed). The exception is a
+// degenerate case where the tree has only a single symbol with length 1. Empty
+// trees are permitted.
+func (h *huffmanDecoder) init(bits []int) bool {
+	// Sanity enables additional runtime tests during Huffman
+	// table construction.  It's intended to be used during
+	// development to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if h.min != 0 {
+		*h = huffmanDecoder{}
+	}
+
+	// Count number of codes of each length,
+	// compute min and max length.
+	var count [maxCodeLen]int
+	var min, max int
+	for _, n := range bits {
+		if n == 0 {
+			continue
+		}
+		if min == 0 || n < min {
+			min = n
+		}
+		if n > max {
+			max = n
+		}
+		count[n]++
+	}
+
+	// Empty tree. The decompressor.huffSym function will fail later if the tree
+	// is used. Technically, an empty tree is only valid for the HDIST tree and
+	// not the HCLEN and HLIT tree. However, a stream with an empty HCLEN tree
+	// is guaranteed to fail since it will attempt to use the tree to decode the
+	// codes for the HLIT and HDIST trees. Similarly, an empty HLIT tree is
+	// guaranteed to fail later since the compressed data section must be
+	// composed of at least one symbol (the end-of-block marker).
+	if max == 0 {
+		return true
+	}
+
+	code := 0
+	var nextcode [maxCodeLen]int
+	for i := min; i <= max; i++ {
+		code <<= 1
+		nextcode[i] = code
+		code += count[i]
+	}
+
+	// Check that the coding is complete (i.e., that we've
+	// assigned all 2-to-the-max possible bit sequences).
+	// Exception: To be compatible with zlib, we also need to
+	// accept degenerate single-code codings.  See also
+	// TestDegenerateHuffmanCoding.
+	if code != 1<<uint(max) && !(code == 1 && max == 1) {
+		return false
+	}
+
+	h.min = min
+	if max > huffmanChunkBits {
+		numLinks := 1 << (uint(max) - huffmanChunkBits)
+		h.linkMask = uint32(numLinks - 1)
+
+		// create link tables
+		link := nextcode[huffmanChunkBits+1] >> 1
+		h.links = make([][]uint32, huffmanNumChunks-link)
+		for j := uint(link); j < huffmanNumChunks; j++ {
+			reverse := int(reverseByte[j>>8]) | int(reverseByte[j&0xff])<<8
+			reverse >>= uint(16 - huffmanChunkBits)
+			off := j - uint(link)
+			if sanity && h.chunks[reverse] != 0 {
+				panic("impossible: overwriting existing chunk")
+			}
+			h.chunks[reverse] = uint32(off<<huffmanValueShift | (huffmanChunkBits + 1))
+			h.links[off] = make([]uint32, numLinks)
+		}
+	}
+
+	for i, n := range bits {
+		if n == 0 {
+			continue
+		}
+		code := nextcode[n]
+		nextcode[n]++
+		chunk := uint32(i<<huffmanValueShift | n)
+		reverse := int(reverseByte[code>>8]) | int(reverseByte[code&0xff])<<8
+		reverse >>= uint(16 - n)
+		if n <= huffmanChunkBits {
+			for off := reverse; off < len(h.chunks); off += 1 << uint(n) {
+				// We should never need to overwrite
+				// an existing chunk.  Also, 0 is
+				// never a valid chunk, because the
+				// lower 4 "count" bits should be
+				// between 1 and 15.
+				if sanity && h.chunks[off] != 0 {
+					panic("impossible: overwriting existing chunk")
+				}
+				h.chunks[off] = chunk
+			}
+		} else {
+			j := reverse & (huffmanNumChunks - 1)
+			if sanity && h.chunks[j]&huffmanCountMask != huffmanChunkBits+1 {
+				// Longer codes should have been
+				// associated with a link table above.
+				panic("impossible: not an indirect chunk")
+			}
+			value := h.chunks[j] >> huffmanValueShift
+			linktab := h.links[value]
+			reverse >>= huffmanChunkBits
+			for off := reverse; off < len(linktab); off += 1 << uint(n-huffmanChunkBits) {
+				if sanity && linktab[off] != 0 {
+					panic("impossible: overwriting existing chunk")
+				}
+				linktab[off] = chunk
+			}
+		}
+	}
+
+	if sanity {
+		// Above we've sanity checked that we never overwrote
+		// an existing entry.  Here we additionally check that
+		// we filled the tables completely.
+		for i, chunk := range h.chunks {
+			if chunk == 0 {
+				// As an exception, in the degenerate
+				// single-code case, we allow odd
+				// chunks to be missing.
+				if code == 1 && i%2 == 1 {
+					continue
+				}
+				panic("impossible: missing chunk")
+			}
+		}
+		for _, linktab := range h.links {
+			for _, chunk := range linktab {
+				if chunk == 0 {
+					panic("impossible: missing chunk")
+				}
+			}
+		}
+	}
+
+	return true
+}
+
+func main() {
+	flag.Parse()
+
+	var h huffmanDecoder
+	var bits [288]int
+	initReverseByte()
+	for i := 0; i < 144; i++ {
+		bits[i] = 8
+	}
+	for i := 144; i < 256; i++ {
+		bits[i] = 9
+	}
+	for i := 256; i < 280; i++ {
+		bits[i] = 7
+	}
+	for i := 280; i < 288; i++ {
+		bits[i] = 8
+	}
+	h.init(bits[:])
+	if h.links != nil {
+		log.Fatal("Unexpected links table in fixed Huffman decoder")
+	}
+
+	var buf bytes.Buffer
+
+	fmt.Fprintf(&buf, `// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.`+"\n\n")
+
+	fmt.Fprintln(&buf, "package flate")
+	fmt.Fprintln(&buf)
+	fmt.Fprintln(&buf, "// autogenerated by go run gen.go -output fixedhuff.go, DO NOT EDIT")
+	fmt.Fprintln(&buf)
+	fmt.Fprintln(&buf, "var fixedHuffmanDecoder = huffmanDecoder{")
+	fmt.Fprintf(&buf, "\t%d,\n", h.min)
+	fmt.Fprintln(&buf, "\t[huffmanNumChunks]uint32{")
+	for i := 0; i < huffmanNumChunks; i++ {
+		if i&7 == 0 {
+			fmt.Fprintf(&buf, "\t\t")
+		} else {
+			fmt.Fprintf(&buf, " ")
+		}
+		fmt.Fprintf(&buf, "0x%04x,", h.chunks[i])
+		if i&7 == 7 {
+			fmt.Fprintln(&buf)
+		}
+	}
+	fmt.Fprintln(&buf, "\t},")
+	fmt.Fprintln(&buf, "\tnil, 0,")
+	fmt.Fprintln(&buf, "}")
+
+	data, err := format.Source(buf.Bytes())
+	if err != nil {
+		log.Fatal(err)
+	}
+	err = ioutil.WriteFile(*filename, data, 0644)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+var reverseByte [256]byte
+
+func initReverseByte() {
+	for x := 0; x < 256; x++ {
+		var result byte
+		for i := uint(0); i < 8; i++ {
+			result |= byte(((x >> i) & 1) << (7 - i))
+		}
+		reverseByte[x] = result
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_bit_writer.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_bit_writer.go
new file mode 100644
index 0000000000..5f7ffdd2e6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_bit_writer.go
@@ -0,0 +1,717 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+import (
+	"io"
+	"math"
+)
+
+const (
+	// The largest offset code.
+	offsetCodeCount = 30
+
+	// The special code used to mark the end of a block.
+	endBlockMarker = 256
+
+	// The first length code.
+	lengthCodesStart = 257
+
+	// The number of codegen codes.
+	codegenCodeCount = 19
+	badCode          = 255
+
+	// Output byte buffer size
+	// Must be multiple of 6 (48 bits) + 8
+	bufferSize = 240 + 8
+)
+
+// The number of extra bits needed by length code X - LENGTH_CODES_START.
+var lengthExtraBits = []int8{
+	/* 257 */ 0, 0, 0,
+	/* 260 */ 0, 0, 0, 0, 0, 1, 1, 1, 1, 2,
+	/* 270 */ 2, 2, 2, 3, 3, 3, 3, 4, 4, 4,
+	/* 280 */ 4, 5, 5, 5, 5, 0,
+}
+
+// The length indicated by length code X - LENGTH_CODES_START.
+var lengthBase = []uint32{
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 10,
+	12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+	64, 80, 96, 112, 128, 160, 192, 224, 255,
+}
+
+// offset code word extra bits.
+var offsetExtraBits = []int8{
+	0, 0, 0, 0, 1, 1, 2, 2, 3, 3,
+	4, 4, 5, 5, 6, 6, 7, 7, 8, 8,
+	9, 9, 10, 10, 11, 11, 12, 12, 13, 13,
+	/* extended window */
+	14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20,
+}
+
+var offsetBase = []uint32{
+	/* normal deflate */
+	0x000000, 0x000001, 0x000002, 0x000003, 0x000004,
+	0x000006, 0x000008, 0x00000c, 0x000010, 0x000018,
+	0x000020, 0x000030, 0x000040, 0x000060, 0x000080,
+	0x0000c0, 0x000100, 0x000180, 0x000200, 0x000300,
+	0x000400, 0x000600, 0x000800, 0x000c00, 0x001000,
+	0x001800, 0x002000, 0x003000, 0x004000, 0x006000,
+
+	/* extended window */
+	0x008000, 0x00c000, 0x010000, 0x018000, 0x020000,
+	0x030000, 0x040000, 0x060000, 0x080000, 0x0c0000,
+	0x100000, 0x180000, 0x200000, 0x300000,
+}
+
+// The odd order in which the codegen code sizes are written.
+var codegenOrder = []uint32{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}
+
+type huffmanBitWriter struct {
+	w io.Writer
+	// Data waiting to be written is bytes[0:nbytes]
+	// and then the low nbits of bits.
+	bits            uint64
+	nbits           uint
+	bytes           [bufferSize]byte
+	nbytes          int
+	literalFreq     []int32
+	offsetFreq      []int32
+	codegen         []uint8
+	codegenFreq     []int32
+	literalEncoding *huffmanEncoder
+	offsetEncoding  *huffmanEncoder
+	codegenEncoding *huffmanEncoder
+	err             error
+}
+
+func newHuffmanBitWriter(w io.Writer) *huffmanBitWriter {
+	return &huffmanBitWriter{
+		w:               w,
+		literalFreq:     make([]int32, maxNumLit),
+		offsetFreq:      make([]int32, offsetCodeCount),
+		codegen:         make([]uint8, maxNumLit+offsetCodeCount+1),
+		codegenFreq:     make([]int32, codegenCodeCount),
+		literalEncoding: newHuffmanEncoder(maxNumLit),
+		codegenEncoding: newHuffmanEncoder(codegenCodeCount),
+		offsetEncoding:  newHuffmanEncoder(offsetCodeCount),
+	}
+}
+
+func (w *huffmanBitWriter) reset(writer io.Writer) {
+	w.w = writer
+	w.bits, w.nbits, w.nbytes, w.err = 0, 0, 0, nil
+	w.bytes = [bufferSize]byte{}
+}
+
+func (w *huffmanBitWriter) flush() {
+	if w.err != nil {
+		w.nbits = 0
+		return
+	}
+	n := w.nbytes
+	for w.nbits != 0 {
+		w.bytes[n] = byte(w.bits)
+		w.bits >>= 8
+		if w.nbits > 8 { // Avoid underflow
+			w.nbits -= 8
+		} else {
+			w.nbits = 0
+		}
+		n++
+	}
+	w.bits = 0
+	_, w.err = w.w.Write(w.bytes[0:n])
+	w.nbytes = 0
+}
+
+func (w *huffmanBitWriter) writeBits(b int32, nb uint) {
+	w.bits |= uint64(b) << w.nbits
+	w.nbits += nb
+	if w.nbits >= 48 {
+		bits := w.bits
+		w.bits >>= 48
+		w.nbits -= 48
+		n := w.nbytes
+		w.bytes[n] = byte(bits)
+		w.bytes[n+1] = byte(bits >> 8)
+		w.bytes[n+2] = byte(bits >> 16)
+		w.bytes[n+3] = byte(bits >> 24)
+		w.bytes[n+4] = byte(bits >> 32)
+		w.bytes[n+5] = byte(bits >> 40)
+		n += 6
+		if n >= bufferSize-8 {
+			_, w.err = w.w.Write(w.bytes[:bufferSize-8])
+			n = 0
+		}
+		w.nbytes = n
+	}
+}
+
+func (w *huffmanBitWriter) writeBytes(bytes []byte) {
+	if w.err != nil {
+		return
+	}
+	n := w.nbytes
+	for w.nbits != 0 {
+		w.bytes[n] = byte(w.bits)
+		w.bits >>= 8
+		w.nbits -= 8
+		n++
+	}
+	if w.nbits != 0 {
+		w.err = InternalError("writeBytes with unfinished bits")
+		return
+	}
+	if n != 0 {
+		_, w.err = w.w.Write(w.bytes[0:n])
+		if w.err != nil {
+			return
+		}
+	}
+	w.nbytes = 0
+	_, w.err = w.w.Write(bytes)
+}
+
+// RFC 1951 3.2.7 specifies a special run-length encoding for specifying
+// the literal and offset lengths arrays (which are concatenated into a single
+// array).  This method generates that run-length encoding.
+//
+// The result is written into the codegen array, and the frequencies
+// of each code is written into the codegenFreq array.
+// Codes 0-15 are single byte codes. Codes 16-18 are followed by additional
+// information.  Code badCode is an end marker
+//
+//  numLiterals      The number of literals in literalEncoding
+//  numOffsets       The number of offsets in offsetEncoding
+func (w *huffmanBitWriter) generateCodegen(numLiterals int, numOffsets int, offenc *huffmanEncoder) {
+	for i := range w.codegenFreq {
+		w.codegenFreq[i] = 0
+	}
+	// Note that we are using codegen both as a temporary variable for holding
+	// a copy of the frequencies, and as the place where we put the result.
+	// This is fine because the output is always shorter than the input used
+	// so far.
+	codegen := w.codegen // cache
+	// Copy the concatenated code sizes to codegen.  Put a marker at the end.
+	cgnl := codegen[0:numLiterals]
+	for i := range cgnl {
+		cgnl[i] = uint8(w.literalEncoding.codes[i].bits())
+	}
+
+	cgnl = codegen[numLiterals : numLiterals+numOffsets]
+	for i := range cgnl {
+		cgnl[i] = uint8(offenc.codes[i].bits())
+	}
+	codegen[numLiterals+numOffsets] = badCode
+
+	size := codegen[0]
+	count := 1
+	outIndex := 0
+	for inIndex := 1; size != badCode; inIndex++ {
+		// INVARIANT: We have seen "count" copies of size that have not yet
+		// had output generated for them.
+		nextSize := codegen[inIndex]
+		if nextSize == size {
+			count++
+			continue
+		}
+		// We need to generate codegen indicating "count" of size.
+		if size != 0 {
+			codegen[outIndex] = size
+			outIndex++
+			w.codegenFreq[size]++
+			count--
+			for count >= 3 {
+				n := 6
+				if n > count {
+					n = count
+				}
+				codegen[outIndex] = 16
+				outIndex++
+				codegen[outIndex] = uint8(n - 3)
+				outIndex++
+				w.codegenFreq[16]++
+				count -= n
+			}
+		} else {
+			for count >= 11 {
+				n := 138
+				if n > count {
+					n = count
+				}
+				codegen[outIndex] = 18
+				outIndex++
+				codegen[outIndex] = uint8(n - 11)
+				outIndex++
+				w.codegenFreq[18]++
+				count -= n
+			}
+			if count >= 3 {
+				// count >= 3 && count <= 10
+				codegen[outIndex] = 17
+				outIndex++
+				codegen[outIndex] = uint8(count - 3)
+				outIndex++
+				w.codegenFreq[17]++
+				count = 0
+			}
+		}
+		count--
+		for ; count >= 0; count-- {
+			codegen[outIndex] = size
+			outIndex++
+			w.codegenFreq[size]++
+		}
+		// Set up invariant for next time through the loop.
+		size = nextSize
+		count = 1
+	}
+	// Marker indicating the end of the codegen.
+	codegen[outIndex] = badCode
+}
+
+func (w *huffmanBitWriter) writeCode(c hcode) {
+	if w.err != nil {
+		return
+	}
+	w.bits |= uint64(c.code()) << w.nbits
+	w.nbits += c.bits()
+	if w.nbits >= 48 {
+		bits := w.bits
+		w.bits >>= 48
+		w.nbits -= 48
+		n := w.nbytes
+		w.bytes[n] = byte(bits)
+		w.bytes[n+1] = byte(bits >> 8)
+		w.bytes[n+2] = byte(bits >> 16)
+		w.bytes[n+3] = byte(bits >> 24)
+		w.bytes[n+4] = byte(bits >> 32)
+		w.bytes[n+5] = byte(bits >> 40)
+		n += 6
+		if n >= bufferSize-8 {
+			_, w.err = w.w.Write(w.bytes[:bufferSize-8])
+			n = 0
+		}
+		w.nbytes = n
+	}
+
+}
+
+// Write the header of a dynamic Huffman block to the output stream.
+//
+//  numLiterals  The number of literals specified in codegen
+//  numOffsets   The number of offsets specified in codegen
+//  numCodegens  The number of codegens used in codegen
+func (w *huffmanBitWriter) writeDynamicHeader(numLiterals int, numOffsets int, numCodegens int, isEof bool) {
+	if w.err != nil {
+		return
+	}
+	var firstBits int32 = 4
+	if isEof {
+		firstBits = 5
+	}
+	w.writeBits(firstBits, 3)
+	w.writeBits(int32(numLiterals-257), 5)
+	w.writeBits(int32(numOffsets-1), 5)
+	w.writeBits(int32(numCodegens-4), 4)
+
+	for i := 0; i < numCodegens; i++ {
+		value := w.codegenEncoding.codes[codegenOrder[i]].bits()
+		w.writeBits(int32(value), 3)
+	}
+
+	i := 0
+	for {
+		var codeWord int = int(w.codegen[i])
+		i++
+		if codeWord == badCode {
+			break
+		}
+		// The low byte contains the actual code to generate.
+		w.writeCode(w.codegenEncoding.codes[uint32(codeWord)])
+
+		switch codeWord {
+		case 16:
+			w.writeBits(int32(w.codegen[i]), 2)
+			i++
+			break
+		case 17:
+			w.writeBits(int32(w.codegen[i]), 3)
+			i++
+			break
+		case 18:
+			w.writeBits(int32(w.codegen[i]), 7)
+			i++
+			break
+		}
+	}
+}
+
+func (w *huffmanBitWriter) writeStoredHeader(length int, isEof bool) {
+	if w.err != nil {
+		return
+	}
+	var flag int32
+	if isEof {
+		flag = 1
+	}
+	w.writeBits(flag, 3)
+	w.flush()
+	w.writeBits(int32(length), 16)
+	w.writeBits(int32(^uint16(length)), 16)
+}
+
+func (w *huffmanBitWriter) writeFixedHeader(isEof bool) {
+	if w.err != nil {
+		return
+	}
+	// Indicate that we are a fixed Huffman block
+	var value int32 = 2
+	if isEof {
+		value = 3
+	}
+	w.writeBits(value, 3)
+}
+
+func (w *huffmanBitWriter) writeBlock(tok tokens, eof bool, input []byte) {
+	if w.err != nil {
+		return
+	}
+	for i := range w.literalFreq {
+		w.literalFreq[i] = 0
+	}
+	for i := range w.offsetFreq {
+		w.offsetFreq[i] = 0
+	}
+
+	tok.tokens[tok.n] = endBlockMarker
+	tokens := tok.tokens[0 : tok.n+1]
+
+	for _, t := range tokens {
+		if t < matchType {
+			w.literalFreq[t.literal()]++
+		} else {
+			length := t.length()
+			offset := t.offset()
+			w.literalFreq[lengthCodesStart+lengthCode(length)]++
+			w.offsetFreq[offsetCode(offset)]++
+		}
+	}
+
+	// get the number of literals
+	numLiterals := len(w.literalFreq)
+	for w.literalFreq[numLiterals-1] == 0 {
+		numLiterals--
+	}
+	// get the number of offsets
+	numOffsets := len(w.offsetFreq)
+	for numOffsets > 0 && w.offsetFreq[numOffsets-1] == 0 {
+		numOffsets--
+	}
+	if numOffsets == 0 {
+		// We haven't found a single match. If we want to go with the dynamic encoding,
+		// we should count at least one offset to be sure that the offset huffman tree could be encoded.
+		w.offsetFreq[0] = 1
+		numOffsets = 1
+	}
+
+	w.literalEncoding.generate(w.literalFreq, 15)
+	w.offsetEncoding.generate(w.offsetFreq, 15)
+
+	storedBytes := 0
+	if input != nil {
+		storedBytes = len(input)
+	}
+	var extraBits int64
+	var storedSize int64 = math.MaxInt64
+	if storedBytes <= maxStoreBlockSize && input != nil {
+		storedSize = int64((storedBytes + 5) * 8)
+		// We only bother calculating the costs of the extra bits required by
+		// the length of offset fields (which will be the same for both fixed
+		// and dynamic encoding), if we need to compare those two encodings
+		// against stored encoding.
+		for lengthCode := lengthCodesStart + 8; lengthCode < numLiterals; lengthCode++ {
+			// First eight length codes have extra size = 0.
+			extraBits += int64(w.literalFreq[lengthCode]) * int64(lengthExtraBits[lengthCode-lengthCodesStart])
+		}
+		for offsetCode := 4; offsetCode < numOffsets; offsetCode++ {
+			// First four offset codes have extra size = 0.
+			extraBits += int64(w.offsetFreq[offsetCode]) * int64(offsetExtraBits[offsetCode])
+		}
+	}
+
+	// Figure out smallest code.
+	// Fixed Huffman baseline.
+	var size = int64(3) +
+		fixedLiteralEncoding.bitLength(w.literalFreq) +
+		fixedOffsetEncoding.bitLength(w.offsetFreq) +
+		extraBits
+	var literalEncoding = fixedLiteralEncoding
+	var offsetEncoding = fixedOffsetEncoding
+
+	// Dynamic Huffman?
+	var numCodegens int
+
+	// Generate codegen and codegenFrequencies, which indicates how to encode
+	// the literalEncoding and the offsetEncoding.
+	w.generateCodegen(numLiterals, numOffsets, w.offsetEncoding)
+	w.codegenEncoding.generate(w.codegenFreq, 7)
+	numCodegens = len(w.codegenFreq)
+	for numCodegens > 4 && w.codegenFreq[codegenOrder[numCodegens-1]] == 0 {
+		numCodegens--
+	}
+	dynamicHeader := int64(3+5+5+4+(3*numCodegens)) +
+		w.codegenEncoding.bitLength(w.codegenFreq) +
+		int64(extraBits) +
+		int64(w.codegenFreq[16]*2) +
+		int64(w.codegenFreq[17]*3) +
+		int64(w.codegenFreq[18]*7)
+	dynamicSize := dynamicHeader +
+		w.literalEncoding.bitLength(w.literalFreq) +
+		w.offsetEncoding.bitLength(w.offsetFreq)
+
+	if dynamicSize < size {
+		size = dynamicSize
+		literalEncoding = w.literalEncoding
+		offsetEncoding = w.offsetEncoding
+	}
+
+	// Stored bytes?
+	if storedSize < size {
+		w.writeStoredHeader(storedBytes, eof)
+		w.writeBytes(input[0:storedBytes])
+		return
+	}
+
+	// Huffman.
+	if literalEncoding == fixedLiteralEncoding {
+		w.writeFixedHeader(eof)
+	} else {
+		w.writeDynamicHeader(numLiterals, numOffsets, numCodegens, eof)
+	}
+
+	leCodes := literalEncoding.codes
+	oeCodes := offsetEncoding.codes
+	for _, t := range tokens {
+		if t < matchType {
+			w.writeCode(leCodes[t.literal()])
+		} else {
+			// Write the length
+			length := t.length()
+			lengthCode := lengthCode(length)
+			w.writeCode(leCodes[lengthCode+lengthCodesStart])
+			extraLengthBits := uint(lengthExtraBits[lengthCode])
+			if extraLengthBits > 0 {
+				extraLength := int32(length - lengthBase[lengthCode])
+				w.writeBits(extraLength, extraLengthBits)
+			}
+			// Write the offset
+			offset := t.offset()
+			offsetCode := offsetCode(offset)
+			w.writeCode(oeCodes[offsetCode])
+			extraOffsetBits := uint(offsetExtraBits[offsetCode])
+			if extraOffsetBits > 0 {
+				extraOffset := int32(offset - offsetBase[offsetCode])
+				w.writeBits(extraOffset, extraOffsetBits)
+			}
+		}
+	}
+}
+
+// writeBlockDynamic will write a block as dynamic Huffman table
+// compressed. This should be used, if the caller has a reasonable expectation
+// that this block contains compressible data.
+func (w *huffmanBitWriter) writeBlockDynamic(tok tokens, eof bool, input []byte) {
+	if w.err != nil {
+		return
+	}
+	for i := range w.literalFreq {
+		w.literalFreq[i] = 0
+	}
+	for i := range w.offsetFreq {
+		w.offsetFreq[i] = 0
+	}
+
+	tok.tokens[tok.n] = endBlockMarker
+	tokens := tok.tokens[0 : tok.n+1]
+
+	for _, t := range tokens {
+		if t < matchType {
+			w.literalFreq[t.literal()]++
+		} else {
+			length := t.length()
+			offset := t.offset()
+			w.literalFreq[lengthCodesStart+lengthCode(length)]++
+			w.offsetFreq[offsetCode(offset)]++
+		}
+	}
+
+	// get the number of literals
+	numLiterals := len(w.literalFreq)
+	for w.literalFreq[numLiterals-1] == 0 {
+		numLiterals--
+	}
+	// get the number of offsets
+	numOffsets := len(w.offsetFreq)
+	for numOffsets > 0 && w.offsetFreq[numOffsets-1] == 0 {
+		numOffsets--
+	}
+	if numOffsets == 0 {
+		// We haven't found a single match. If we want to go with the dynamic encoding,
+		// we should count at least one offset to be sure that the offset huffman tree could be encoded.
+		w.offsetFreq[0] = 1
+		numOffsets = 1
+	}
+
+	w.literalEncoding.generate(w.literalFreq, 15)
+	w.offsetEncoding.generate(w.offsetFreq, 15)
+
+	var numCodegens int
+
+	// Generate codegen and codegenFrequencies, which indicates how to encode
+	// the literalEncoding and the offsetEncoding.
+	w.generateCodegen(numLiterals, numOffsets, w.offsetEncoding)
+	w.codegenEncoding.generate(w.codegenFreq, 7)
+	numCodegens = len(w.codegenFreq)
+	for numCodegens > 4 && w.codegenFreq[codegenOrder[numCodegens-1]] == 0 {
+		numCodegens--
+	}
+	var literalEncoding = w.literalEncoding
+	var offsetEncoding = w.offsetEncoding
+
+	// Write Huffman table.
+	w.writeDynamicHeader(numLiterals, numOffsets, numCodegens, eof)
+	leCodes := literalEncoding.codes
+	oeCodes := offsetEncoding.codes
+
+	for _, t := range tokens {
+		if t < matchType {
+			w.writeCode(leCodes[t.literal()])
+		} else {
+			// Write the length
+			length := t.length()
+			lengthCode := lengthCode(length)
+			w.writeCode(leCodes[lengthCode+lengthCodesStart])
+			extraLengthBits := uint(lengthExtraBits[lengthCode])
+			if extraLengthBits > 0 {
+				extraLength := int32(length - lengthBase[lengthCode])
+				w.writeBits(extraLength, extraLengthBits)
+			}
+			// Write the offset
+			offset := t.offset()
+			offsetCode := offsetCode(offset)
+			w.writeCode(oeCodes[offsetCode])
+			extraOffsetBits := uint(offsetExtraBits[offsetCode])
+			if extraOffsetBits > 0 {
+				extraOffset := int32(offset - offsetBase[offsetCode])
+				w.writeBits(extraOffset, extraOffsetBits)
+			}
+		}
+	}
+}
+
+// static offset encoder used for huffman only encoding.
+var huffOffset *huffmanEncoder
+
+func init() {
+	var w = newHuffmanBitWriter(nil)
+	w.offsetFreq[0] = 1
+	huffOffset = newHuffmanEncoder(offsetCodeCount)
+	huffOffset.generate(w.offsetFreq, 15)
+}
+
+// writeBlockHuff will write a block of bytes as either
+// Huffman encoded literals or uncompressed bytes if the
+// results only gains very little from compression.
+func (w *huffmanBitWriter) writeBlockHuff(eof bool, input []byte) {
+	if w.err != nil {
+		return
+	}
+
+	// Clear histogram
+	for i := range w.literalFreq {
+		w.literalFreq[i] = 0
+	}
+
+	// Add everything as literals
+	histogram(input, w.literalFreq)
+
+	w.literalFreq[endBlockMarker] = 1
+
+	const numLiterals = endBlockMarker + 1
+	const numOffsets = 1
+
+	w.literalEncoding.generate(w.literalFreq, 15)
+
+	// Figure out smallest code.
+	// Always use dynamic Huffman or Store
+	var numCodegens int
+
+	// Generate codegen and codegenFrequencies, which indicates how to encode
+	// the literalEncoding and the offsetEncoding.
+	w.generateCodegen(numLiterals, numOffsets, huffOffset)
+	w.codegenEncoding.generate(w.codegenFreq, 7)
+	numCodegens = len(w.codegenFreq)
+	for numCodegens > 4 && w.codegenFreq[codegenOrder[numCodegens-1]] == 0 {
+		numCodegens--
+	}
+	headerSize := int64(3+5+5+4+(3*numCodegens)) +
+		w.codegenEncoding.bitLength(w.codegenFreq) +
+		int64(w.codegenFreq[16]*2) +
+		int64(w.codegenFreq[17]*3) +
+		int64(w.codegenFreq[18]*7)
+
+	// Includes EOB marker
+	size := headerSize + w.literalEncoding.bitLength(w.literalFreq)
+
+	// Calculate stored size
+	var storedSize int64 = math.MaxInt64
+	var storedBytes = len(input)
+	if storedBytes <= maxStoreBlockSize {
+		storedSize = int64(storedBytes+5) * 8
+	}
+
+	// Store bytes, if we don't get a reasonable improvement.
+	if storedSize < (size + size>>4) {
+		w.writeStoredHeader(storedBytes, eof)
+		w.writeBytes(input)
+		return
+	}
+
+	// Huffman.
+	w.writeDynamicHeader(numLiterals, numOffsets, numCodegens, eof)
+	encoding := w.literalEncoding.codes
+	for _, t := range input {
+		// Bitwriting inlined, ~30% speedup
+		c := encoding[t]
+		w.bits |= uint64(c.code()) << w.nbits
+		w.nbits += c.bits()
+		if w.nbits >= 48 {
+			bits := w.bits
+			w.bits >>= 48
+			w.nbits -= 48
+			n := w.nbytes
+			w.bytes[n] = byte(bits)
+			w.bytes[n+1] = byte(bits >> 8)
+			w.bytes[n+2] = byte(bits >> 16)
+			w.bytes[n+3] = byte(bits >> 24)
+			w.bytes[n+4] = byte(bits >> 32)
+			w.bytes[n+5] = byte(bits >> 40)
+			n += 6
+			if n >= bufferSize-8 {
+				_, w.err = w.w.Write(w.bytes[:bufferSize-8])
+				if w.err != nil {
+					return
+				}
+				w.nbytes = 0
+			} else {
+				w.nbytes = n
+			}
+		}
+	}
+	w.writeCode(encoding[endBlockMarker])
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_code.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_code.go
new file mode 100644
index 0000000000..9dba0faf33
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_code.go
@@ -0,0 +1,363 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+import (
+	"math"
+	"sort"
+)
+
+type hcode uint32
+
+type huffmanEncoder struct {
+	codes     []hcode
+	freqcache []literalNode
+	bitCount  [17]int32
+	lns       literalNodeSorter
+	lfs       literalFreqSorter
+}
+
+type literalNode struct {
+	literal uint16
+	freq    int32
+}
+
+// A levelInfo describes the state of the constructed tree for a given depth.
+type levelInfo struct {
+	// Our level.  for better printing
+	level int32
+
+	// The frequency of the last node at this level
+	lastFreq int32
+
+	// The frequency of the next character to add to this level
+	nextCharFreq int32
+
+	// The frequency of the next pair (from level below) to add to this level.
+	// Only valid if the "needed" value of the next lower level is 0.
+	nextPairFreq int32
+
+	// The number of chains remaining to generate for this level before moving
+	// up to the next level
+	needed int32
+}
+
+func (h hcode) codeBits() (code uint16, bits uint8) {
+	return uint16(h), uint8(h >> 16)
+}
+
+func (h *hcode) set(code uint16, bits uint8) {
+	*h = hcode(code) | hcode(uint32(bits)<<16)
+}
+
+func (h *hcode) setBits(bits uint8) {
+	*h = hcode(*h&0xffff) | hcode(uint32(bits)<<16)
+}
+
+func toCode(code uint16, bits uint8) hcode {
+	return hcode(code) | hcode(uint32(bits)<<16)
+}
+
+func (h hcode) code() (code uint16) {
+	return uint16(h)
+}
+
+func (h hcode) bits() (bits uint) {
+	return uint(h >> 16)
+}
+
+func maxNode() literalNode { return literalNode{math.MaxUint16, math.MaxInt32} }
+
+func newHuffmanEncoder(size int) *huffmanEncoder {
+	return &huffmanEncoder{codes: make([]hcode, size), freqcache: nil}
+}
+
+// Generates a HuffmanCode corresponding to the fixed literal table
+func generateFixedLiteralEncoding() *huffmanEncoder {
+	h := newHuffmanEncoder(maxNumLit)
+	codes := h.codes
+	var ch uint16
+	for ch = 0; ch < maxNumLit; ch++ {
+		var bits uint16
+		var size uint8
+		switch {
+		case ch < 144:
+			// size 8, 000110000  .. 10111111
+			bits = ch + 48
+			size = 8
+			break
+		case ch < 256:
+			// size 9, 110010000 .. 111111111
+			bits = ch + 400 - 144
+			size = 9
+			break
+		case ch < 280:
+			// size 7, 0000000 .. 0010111
+			bits = ch - 256
+			size = 7
+			break
+		default:
+			// size 8, 11000000 .. 11000111
+			bits = ch + 192 - 280
+			size = 8
+		}
+		codes[ch] = toCode(reverseBits(bits, size), size)
+	}
+	return h
+}
+
+func generateFixedOffsetEncoding() *huffmanEncoder {
+	h := newHuffmanEncoder(30)
+	codes := h.codes
+	for ch := uint16(0); ch < 30; ch++ {
+		codes[ch] = toCode(reverseBits(ch, 5), 5)
+	}
+	return h
+}
+
+var fixedLiteralEncoding *huffmanEncoder = generateFixedLiteralEncoding()
+var fixedOffsetEncoding *huffmanEncoder = generateFixedOffsetEncoding()
+
+func (h *huffmanEncoder) bitLength(freq []int32) int64 {
+	var total int64
+	for i, f := range freq {
+		if f != 0 {
+			total += int64(f) * int64(h.codes[i].bits())
+		}
+	}
+	return total
+}
+
+const maxBitsLimit = 16
+
+// Return the number of literals assigned to each bit size in the Huffman encoding
+//
+// This method is only called when list.length >= 3
+// The cases of 0, 1, and 2 literals are handled by special case code.
+//
+// list  An array of the literals with non-zero frequencies
+//             and their associated frequencies.  The array is in order of increasing
+//             frequency, and has as its last element a special element with frequency
+//             MaxInt32
+// maxBits     The maximum number of bits that should be used to encode any literal.
+//             Must be less than 16.
+// return      An integer array in which array[i] indicates the number of literals
+//             that should be encoded in i bits.
+func (h *huffmanEncoder) bitCounts(list []literalNode, maxBits int32) []int32 {
+	if maxBits >= maxBitsLimit {
+		panic("flate: maxBits too large")
+	}
+	n := int32(len(list))
+	list = list[0 : n+1]
+	list[n] = maxNode()
+
+	// The tree can't have greater depth than n - 1, no matter what.  This
+	// saves a little bit of work in some small cases
+	if maxBits > n-1 {
+		maxBits = n - 1
+	}
+
+	// Create information about each of the levels.
+	// A bogus "Level 0" whose sole purpose is so that
+	// level1.prev.needed==0.  This makes level1.nextPairFreq
+	// be a legitimate value that never gets chosen.
+	var levels [maxBitsLimit]levelInfo
+	// leafCounts[i] counts the number of literals at the left
+	// of ancestors of the rightmost node at level i.
+	// leafCounts[i][j] is the number of literals at the left
+	// of the level j ancestor.
+	var leafCounts [maxBitsLimit][maxBitsLimit]int32
+
+	for level := int32(1); level <= maxBits; level++ {
+		// For every level, the first two items are the first two characters.
+		// We initialize the levels as if we had already figured this out.
+		levels[level] = levelInfo{
+			level:        level,
+			lastFreq:     list[1].freq,
+			nextCharFreq: list[2].freq,
+			nextPairFreq: list[0].freq + list[1].freq,
+		}
+		leafCounts[level][level] = 2
+		if level == 1 {
+			levels[level].nextPairFreq = math.MaxInt32
+		}
+	}
+
+	// We need a total of 2*n - 2 items at top level and have already generated 2.
+	levels[maxBits].needed = 2*n - 4
+
+	level := maxBits
+	for {
+		l := &levels[level]
+		if l.nextPairFreq == math.MaxInt32 && l.nextCharFreq == math.MaxInt32 {
+			// We've run out of both leafs and pairs.
+			// End all calculations for this level.
+			// To make sure we never come back to this level or any lower level,
+			// set nextPairFreq impossibly large.
+			l.needed = 0
+			levels[level+1].nextPairFreq = math.MaxInt32
+			level++
+			continue
+		}
+
+		prevFreq := l.lastFreq
+		if l.nextCharFreq < l.nextPairFreq {
+			// The next item on this row is a leaf node.
+			n := leafCounts[level][level] + 1
+			l.lastFreq = l.nextCharFreq
+			// Lower leafCounts are the same of the previous node.
+			leafCounts[level][level] = n
+			l.nextCharFreq = list[n].freq
+		} else {
+			// The next item on this row is a pair from the previous row.
+			// nextPairFreq isn't valid until we generate two
+			// more values in the level below
+			l.lastFreq = l.nextPairFreq
+			// Take leaf counts from the lower level, except counts[level] remains the same.
+			copy(leafCounts[level][:level], leafCounts[level-1][:level])
+			levels[l.level-1].needed = 2
+		}
+
+		if l.needed--; l.needed == 0 {
+			// We've done everything we need to do for this level.
+			// Continue calculating one level up.  Fill in nextPairFreq
+			// of that level with the sum of the two nodes we've just calculated on
+			// this level.
+			if l.level == maxBits {
+				// All done!
+				break
+			}
+			levels[l.level+1].nextPairFreq = prevFreq + l.lastFreq
+			level++
+		} else {
+			// If we stole from below, move down temporarily to replenish it.
+			for levels[level-1].needed > 0 {
+				level--
+			}
+		}
+	}
+
+	// Somethings is wrong if at the end, the top level is null or hasn't used
+	// all of the leaves.
+	if leafCounts[maxBits][maxBits] != n {
+		panic("leafCounts[maxBits][maxBits] != n")
+	}
+
+	bitCount := h.bitCount[:maxBits+1]
+	//make([]int32, maxBits+1)
+	bits := 1
+	counts := &leafCounts[maxBits]
+	for level := maxBits; level > 0; level-- {
+		// chain.leafCount gives the number of literals requiring at least "bits"
+		// bits to encode.
+		bitCount[bits] = counts[level] - counts[level-1]
+		bits++
+	}
+	return bitCount
+}
+
+// Look at the leaves and assign them a bit count and an encoding as specified
+// in RFC 1951 3.2.2
+func (h *huffmanEncoder) assignEncodingAndSize(bitCount []int32, list []literalNode) {
+	code := uint16(0)
+	for n, bits := range bitCount {
+		code <<= 1
+		if n == 0 || bits == 0 {
+			continue
+		}
+		// The literals list[len(list)-bits] .. list[len(list)-bits]
+		// are encoded using "bits" bits, and get the values
+		// code, code + 1, ....  The code values are
+		// assigned in literal order (not frequency order).
+		chunk := list[len(list)-int(bits):]
+
+		h.lns.Sort(chunk)
+		for _, node := range chunk {
+			h.codes[node.literal] = toCode(reverseBits(code, uint8(n)), uint8(n))
+			code++
+		}
+		list = list[0 : len(list)-int(bits)]
+	}
+}
+
+// Update this Huffman Code object to be the minimum code for the specified frequency count.
+//
+// freq  An array of frequencies, in which frequency[i] gives the frequency of literal i.
+// maxBits  The maximum number of bits to use for any literal.
+func (h *huffmanEncoder) generate(freq []int32, maxBits int32) {
+	if h.freqcache == nil {
+		h.freqcache = make([]literalNode, 300)
+	}
+	list := h.freqcache[:len(freq)+1]
+	// Number of non-zero literals
+	count := 0
+	// Set list to be the set of all non-zero literals and their frequencies
+	for i, f := range freq {
+		if f != 0 {
+			list[count] = literalNode{uint16(i), f}
+			count++
+		} else {
+			list[count] = literalNode{}
+			//h.codeBits[i] = 0
+			h.codes[i].setBits(0)
+		}
+	}
+	list[len(freq)] = literalNode{}
+	// If freq[] is shorter than codeBits[], fill rest of codeBits[] with zeros
+	// FIXME: Doesn't do what it says on the tin (klauspost)
+	//h.codeBits = h.codeBits[0:len(freq)]
+
+	list = list[0:count]
+	if count <= 2 {
+		// Handle the small cases here, because they are awkward for the general case code.  With
+		// two or fewer literals, everything has bit length 1.
+		for i, node := range list {
+			// "list" is in order of increasing literal value.
+			h.codes[node.literal].set(uint16(i), 1)
+			//h.codeBits[node.literal] = 1
+			//h.code[node.literal] = uint16(i)
+		}
+		return
+	}
+	h.lfs.Sort(list)
+
+	// Get the number of literals for each bit count
+	bitCount := h.bitCounts(list, maxBits)
+	// And do the assignment
+	h.assignEncodingAndSize(bitCount, list)
+}
+
+type literalNodeSorter []literalNode
+
+func (s *literalNodeSorter) Sort(a []literalNode) {
+	*s = literalNodeSorter(a)
+	sort.Sort(s)
+}
+
+func (s literalNodeSorter) Len() int { return len(s) }
+
+func (s literalNodeSorter) Less(i, j int) bool {
+	return s[i].literal < s[j].literal
+}
+
+func (s literalNodeSorter) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+
+type literalFreqSorter []literalNode
+
+func (s *literalFreqSorter) Sort(a []literalNode) {
+	*s = literalFreqSorter(a)
+	sort.Sort(s)
+}
+
+func (s literalFreqSorter) Len() int { return len(s) }
+
+func (s literalFreqSorter) Less(i, j int) bool {
+	if s[i].freq == s[j].freq {
+		return s[i].literal < s[j].literal
+	}
+	return s[i].freq < s[j].freq
+}
+
+func (s literalFreqSorter) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/inflate.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/inflate.go
new file mode 100644
index 0000000000..91e27e7e28
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/inflate.go
@@ -0,0 +1,846 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:generate go run gen.go -output fixedhuff.go
+
+// Package flate implements the DEFLATE compressed data format, described in
+// RFC 1951.  The gzip and zlib packages implement access to DEFLATE-based file
+// formats.
+package flate
+
+import (
+	"bufio"
+	"io"
+	"strconv"
+)
+
+const (
+	maxCodeLen = 16    // max length of Huffman code
+	maxHist    = 32768 // max history required
+	// The next three numbers come from the RFC section 3.2.7, with the
+	// additional proviso in section 3.2.5 which implies that distance codes
+	// 30 and 31 should never occur in compressed data.
+	maxNumLit  = 286
+	maxNumDist = 30
+	numCodes   = 19 // number of codes in Huffman meta-code
+)
+
+// A CorruptInputError reports the presence of corrupt input at a given offset.
+type CorruptInputError int64
+
+func (e CorruptInputError) Error() string {
+	return "flate: corrupt input before offset " + strconv.FormatInt(int64(e), 10)
+}
+
+// An InternalError reports an error in the flate code itself.
+type InternalError string
+
+func (e InternalError) Error() string { return "flate: internal error: " + string(e) }
+
+// A ReadError reports an error encountered while reading input.
+type ReadError struct {
+	Offset int64 // byte offset where error occurred
+	Err    error // error returned by underlying Read
+}
+
+func (e *ReadError) Error() string {
+	return "flate: read error at offset " + strconv.FormatInt(e.Offset, 10) + ": " + e.Err.Error()
+}
+
+// A WriteError reports an error encountered while writing output.
+type WriteError struct {
+	Offset int64 // byte offset where error occurred
+	Err    error // error returned by underlying Write
+}
+
+func (e *WriteError) Error() string {
+	return "flate: write error at offset " + strconv.FormatInt(e.Offset, 10) + ": " + e.Err.Error()
+}
+
+// Resetter resets a ReadCloser returned by NewReader or NewReaderDict to
+// to switch to a new underlying Reader. This permits reusing a ReadCloser
+// instead of allocating a new one.
+type Resetter interface {
+	// Reset discards any buffered data and resets the Resetter as if it was
+	// newly initialized with the given reader.
+	Reset(r io.Reader, dict []byte) error
+}
+
+// Note that much of the implementation of huffmanDecoder is also copied
+// into gen.go (in package main) for the purpose of precomputing the
+// fixed huffman tables so they can be included statically.
+
+// The data structure for decoding Huffman tables is based on that of
+// zlib. There is a lookup table of a fixed bit width (huffmanChunkBits),
+// For codes smaller than the table width, there are multiple entries
+// (each combination of trailing bits has the same value). For codes
+// larger than the table width, the table contains a link to an overflow
+// table. The width of each entry in the link table is the maximum code
+// size minus the chunk width.
+
+// Note that you can do a lookup in the table even without all bits
+// filled. Since the extra bits are zero, and the DEFLATE Huffman codes
+// have the property that shorter codes come before longer ones, the
+// bit length estimate in the result is a lower bound on the actual
+// number of bits.
+
+// chunk & 15 is number of bits
+// chunk >> 4 is value, including table link
+
+const (
+	huffmanChunkBits  = 9
+	huffmanNumChunks  = 1 << huffmanChunkBits
+	huffmanCountMask  = 15
+	huffmanValueShift = 4
+)
+
+type huffmanDecoder struct {
+	min      int                      // the minimum code length
+	chunks   [huffmanNumChunks]uint32 // chunks as described above
+	links    [][]uint32               // overflow links
+	linkMask uint32                   // mask the width of the link table
+}
+
+// Initialize Huffman decoding tables from array of code lengths.
+// Following this function, h is guaranteed to be initialized into a complete
+// tree (i.e., neither over-subscribed nor under-subscribed). The exception is a
+// degenerate case where the tree has only a single symbol with length 1. Empty
+// trees are permitted.
+func (h *huffmanDecoder) init(bits []int) bool {
+	// Sanity enables additional runtime tests during Huffman
+	// table construction.  It's intended to be used during
+	// development to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if h.min != 0 {
+		*h = huffmanDecoder{}
+	}
+
+	// Count number of codes of each length,
+	// compute min and max length.
+	var count [maxCodeLen]int
+	var min, max int
+	for _, n := range bits {
+		if n == 0 {
+			continue
+		}
+		if min == 0 || n < min {
+			min = n
+		}
+		if n > max {
+			max = n
+		}
+		count[n]++
+	}
+
+	// Empty tree. The decompressor.huffSym function will fail later if the tree
+	// is used. Technically, an empty tree is only valid for the HDIST tree and
+	// not the HCLEN and HLIT tree. However, a stream with an empty HCLEN tree
+	// is guaranteed to fail since it will attempt to use the tree to decode the
+	// codes for the HLIT and HDIST trees. Similarly, an empty HLIT tree is
+	// guaranteed to fail later since the compressed data section must be
+	// composed of at least one symbol (the end-of-block marker).
+	if max == 0 {
+		return true
+	}
+
+	code := 0
+	var nextcode [maxCodeLen]int
+	for i := min; i <= max; i++ {
+		code <<= 1
+		nextcode[i] = code
+		code += count[i]
+	}
+
+	// Check that the coding is complete (i.e., that we've
+	// assigned all 2-to-the-max possible bit sequences).
+	// Exception: To be compatible with zlib, we also need to
+	// accept degenerate single-code codings.  See also
+	// TestDegenerateHuffmanCoding.
+	if code != 1<<uint(max) && !(code == 1 && max == 1) {
+		return false
+	}
+
+	h.min = min
+	if max > huffmanChunkBits {
+		numLinks := 1 << (uint(max) - huffmanChunkBits)
+		h.linkMask = uint32(numLinks - 1)
+
+		// create link tables
+		link := nextcode[huffmanChunkBits+1] >> 1
+		h.links = make([][]uint32, huffmanNumChunks-link)
+		for j := uint(link); j < huffmanNumChunks; j++ {
+			reverse := int(reverseByte[j>>8]) | int(reverseByte[j&0xff])<<8
+			reverse >>= uint(16 - huffmanChunkBits)
+			off := j - uint(link)
+			if sanity && h.chunks[reverse] != 0 {
+				panic("impossible: overwriting existing chunk")
+			}
+			h.chunks[reverse] = uint32(off<<huffmanValueShift | (huffmanChunkBits + 1))
+			h.links[off] = make([]uint32, numLinks)
+		}
+	}
+
+	for i, n := range bits {
+		if n == 0 {
+			continue
+		}
+		code := nextcode[n]
+		nextcode[n]++
+		chunk := uint32(i<<huffmanValueShift | n)
+		reverse := int(reverseByte[code>>8]) | int(reverseByte[code&0xff])<<8
+		reverse >>= uint(16 - n)
+		if n <= huffmanChunkBits {
+			for off := reverse; off < len(h.chunks); off += 1 << uint(n) {
+				// We should never need to overwrite
+				// an existing chunk.  Also, 0 is
+				// never a valid chunk, because the
+				// lower 4 "count" bits should be
+				// between 1 and 15.
+				if sanity && h.chunks[off] != 0 {
+					panic("impossible: overwriting existing chunk")
+				}
+				h.chunks[off] = chunk
+			}
+		} else {
+			j := reverse & (huffmanNumChunks - 1)
+			if sanity && h.chunks[j]&huffmanCountMask != huffmanChunkBits+1 {
+				// Longer codes should have been
+				// associated with a link table above.
+				panic("impossible: not an indirect chunk")
+			}
+			value := h.chunks[j] >> huffmanValueShift
+			linktab := h.links[value]
+			reverse >>= huffmanChunkBits
+			for off := reverse; off < len(linktab); off += 1 << uint(n-huffmanChunkBits) {
+				if sanity && linktab[off] != 0 {
+					panic("impossible: overwriting existing chunk")
+				}
+				linktab[off] = chunk
+			}
+		}
+	}
+
+	if sanity {
+		// Above we've sanity checked that we never overwrote
+		// an existing entry.  Here we additionally check that
+		// we filled the tables completely.
+		for i, chunk := range h.chunks {
+			if chunk == 0 {
+				// As an exception, in the degenerate
+				// single-code case, we allow odd
+				// chunks to be missing.
+				if code == 1 && i%2 == 1 {
+					continue
+				}
+				panic("impossible: missing chunk")
+			}
+		}
+		for _, linktab := range h.links {
+			for _, chunk := range linktab {
+				if chunk == 0 {
+					panic("impossible: missing chunk")
+				}
+			}
+		}
+	}
+
+	return true
+}
+
+// The actual read interface needed by NewReader.
+// If the passed in io.Reader does not also have ReadByte,
+// the NewReader will introduce its own buffering.
+type Reader interface {
+	io.Reader
+	io.ByteReader
+}
+
+// Decompress state.
+type decompressor struct {
+	// Input source.
+	r       Reader
+	roffset int64
+	woffset int64
+
+	// Input bits, in top of b.
+	b  uint32
+	nb uint
+
+	// Huffman decoders for literal/length, distance.
+	h1, h2 huffmanDecoder
+
+	// Length arrays used to define Huffman codes.
+	bits     *[maxNumLit + maxNumDist]int
+	codebits *[numCodes]int
+
+	// Output history, buffer.
+	hist  *[maxHist]byte
+	hp    int  // current output position in buffer
+	hw    int  // have written hist[0:hw] already
+	hfull bool // buffer has filled at least once
+
+	// Temporary buffer (avoids repeated allocation).
+	buf [4]byte
+
+	// Next step in the decompression,
+	// and decompression state.
+	step     func(*decompressor)
+	final    bool
+	err      error
+	toRead   []byte
+	hl, hd   *huffmanDecoder
+	copyLen  int
+	copyDist int
+}
+
+func (f *decompressor) nextBlock() {
+	if f.final {
+		if f.hw != f.hp {
+			f.flush((*decompressor).nextBlock)
+			return
+		}
+		f.err = io.EOF
+		return
+	}
+	for f.nb < 1+2 {
+		if f.err = f.moreBits(); f.err != nil {
+			return
+		}
+	}
+	f.final = f.b&1 == 1
+	f.b >>= 1
+	typ := f.b & 3
+	f.b >>= 2
+	f.nb -= 1 + 2
+	switch typ {
+	case 0:
+		f.dataBlock()
+	case 1:
+		// compressed, fixed Huffman tables
+		f.hl = &fixedHuffmanDecoder
+		f.hd = nil
+		f.huffmanBlock()
+	case 2:
+		// compressed, dynamic Huffman tables
+		if f.err = f.readHuffman(); f.err != nil {
+			break
+		}
+		f.hl = &f.h1
+		f.hd = &f.h2
+		f.huffmanBlock()
+	default:
+		// 3 is reserved.
+		f.err = CorruptInputError(f.roffset)
+	}
+}
+
+func (f *decompressor) Read(b []byte) (int, error) {
+	for {
+		if len(f.toRead) > 0 {
+			n := copy(b, f.toRead)
+			f.toRead = f.toRead[n:]
+			return n, nil
+		}
+		if f.err != nil {
+			return 0, f.err
+		}
+		f.step(f)
+	}
+}
+
+// Support the io.WriteTo interface for io.Copy and friends.
+func (f *decompressor) WriteTo(w io.Writer) (int64, error) {
+	total := int64(0)
+	for {
+		if f.err != nil {
+			if f.err == io.EOF {
+				return total, nil
+			}
+			return total, f.err
+		}
+		if len(f.toRead) > 0 {
+			var n int
+			n, f.err = w.Write(f.toRead)
+			if f.err != nil {
+				return total, f.err
+			}
+			if n != len(f.toRead) {
+				return total, io.ErrShortWrite
+			}
+			f.toRead = f.toRead[:0]
+			total += int64(n)
+		}
+		f.step(f)
+	}
+}
+
+func (f *decompressor) Close() error {
+	if f.err == io.EOF {
+		return nil
+	}
+	return f.err
+}
+
+// RFC 1951 section 3.2.7.
+// Compression with dynamic Huffman codes
+
+var codeOrder = [...]int{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}
+
+func (f *decompressor) readHuffman() error {
+	// HLIT[5], HDIST[5], HCLEN[4].
+	for f.nb < 5+5+4 {
+		if err := f.moreBits(); err != nil {
+			return err
+		}
+	}
+	nlit := int(f.b&0x1F) + 257
+	if nlit > maxNumLit {
+		return CorruptInputError(f.roffset)
+	}
+	f.b >>= 5
+	ndist := int(f.b&0x1F) + 1
+	if ndist > maxNumDist {
+		return CorruptInputError(f.roffset)
+	}
+	f.b >>= 5
+	nclen := int(f.b&0xF) + 4
+	// numCodes is 19, so nclen is always valid.
+	f.b >>= 4
+	f.nb -= 5 + 5 + 4
+
+	// (HCLEN+4)*3 bits: code lengths in the magic codeOrder order.
+	for i := 0; i < nclen; i++ {
+		for f.nb < 3 {
+			if err := f.moreBits(); err != nil {
+				return err
+			}
+		}
+		f.codebits[codeOrder[i]] = int(f.b & 0x7)
+		f.b >>= 3
+		f.nb -= 3
+	}
+	for i := nclen; i < len(codeOrder); i++ {
+		f.codebits[codeOrder[i]] = 0
+	}
+	if !f.h1.init(f.codebits[0:]) {
+		return CorruptInputError(f.roffset)
+	}
+
+	// HLIT + 257 code lengths, HDIST + 1 code lengths,
+	// using the code length Huffman code.
+	for i, n := 0, nlit+ndist; i < n; {
+		x, err := f.huffSym(&f.h1)
+		if err != nil {
+			return err
+		}
+		if x < 16 {
+			// Actual length.
+			f.bits[i] = x
+			i++
+			continue
+		}
+		// Repeat previous length or zero.
+		var rep int
+		var nb uint
+		var b int
+		switch x {
+		default:
+			return InternalError("unexpected length code")
+		case 16:
+			rep = 3
+			nb = 2
+			if i == 0 {
+				return CorruptInputError(f.roffset)
+			}
+			b = f.bits[i-1]
+		case 17:
+			rep = 3
+			nb = 3
+			b = 0
+		case 18:
+			rep = 11
+			nb = 7
+			b = 0
+		}
+		for f.nb < nb {
+			if err := f.moreBits(); err != nil {
+				return err
+			}
+		}
+		rep += int(f.b & uint32(1<<nb-1))
+		f.b >>= nb
+		f.nb -= nb
+		if i+rep > n {
+			return CorruptInputError(f.roffset)
+		}
+		for j := 0; j < rep; j++ {
+			f.bits[i] = b
+			i++
+		}
+	}
+
+	if !f.h1.init(f.bits[0:nlit]) || !f.h2.init(f.bits[nlit:nlit+ndist]) {
+		return CorruptInputError(f.roffset)
+	}
+
+	// In order to preserve the property that we never read any extra bytes
+	// after the end of the DEFLATE stream, huffSym conservatively reads min
+	// bits at a time until it decodes the symbol. However, since every block
+	// must end with an EOB marker, we can use that as the minimum number of
+	// bits to read and guarantee we never read past the end of the stream.
+	if f.bits[endBlockMarker] > 0 {
+		f.h1.min = f.bits[endBlockMarker] // Length of EOB marker
+	}
+
+	return nil
+}
+
+// Decode a single Huffman block from f.
+// hl and hd are the Huffman states for the lit/length values
+// and the distance values, respectively.  If hd == nil, using the
+// fixed distance encoding associated with fixed Huffman blocks.
+func (f *decompressor) huffmanBlock() {
+	for {
+		v, err := f.huffSym(f.hl)
+		if err != nil {
+			f.err = err
+			return
+		}
+		var n uint // number of bits extra
+		var length int
+		switch {
+		case v < 256:
+			f.hist[f.hp] = byte(v)
+			f.hp++
+			if f.hp == len(f.hist) {
+				// After the flush, continue this loop.
+				f.flush((*decompressor).huffmanBlock)
+				return
+			}
+			continue
+		case v == 256:
+			// Done with huffman block; read next block.
+			f.step = (*decompressor).nextBlock
+			return
+		// otherwise, reference to older data
+		case v < 265:
+			length = v - (257 - 3)
+			n = 0
+		case v < 269:
+			length = v*2 - (265*2 - 11)
+			n = 1
+		case v < 273:
+			length = v*4 - (269*4 - 19)
+			n = 2
+		case v < 277:
+			length = v*8 - (273*8 - 35)
+			n = 3
+		case v < 281:
+			length = v*16 - (277*16 - 67)
+			n = 4
+		case v < 285:
+			length = v*32 - (281*32 - 131)
+			n = 5
+		case v < maxNumLit:
+			length = 258
+			n = 0
+		default:
+			f.err = CorruptInputError(f.roffset)
+			return
+		}
+		if n > 0 {
+			for f.nb < n {
+				if err = f.moreBits(); err != nil {
+					f.err = err
+					return
+				}
+			}
+			length += int(f.b & uint32(1<<n-1))
+			f.b >>= n
+			f.nb -= n
+		}
+
+		var dist int
+		if f.hd == nil {
+			for f.nb < 5 {
+				if err = f.moreBits(); err != nil {
+					f.err = err
+					return
+				}
+			}
+			dist = int(reverseByte[(f.b&0x1F)<<3])
+			f.b >>= 5
+			f.nb -= 5
+		} else {
+			if dist, err = f.huffSym(f.hd); err != nil {
+				f.err = err
+				return
+			}
+		}
+
+		switch {
+		case dist < 4:
+			dist++
+		case dist < maxNumDist:
+			nb := uint(dist-2) >> 1
+			// have 1 bit in bottom of dist, need nb more.
+			extra := (dist & 1) << nb
+			for f.nb < nb {
+				if err = f.moreBits(); err != nil {
+					f.err = err
+					return
+				}
+			}
+			extra |= int(f.b & uint32(1<<nb-1))
+			f.b >>= nb
+			f.nb -= nb
+			dist = 1<<(nb+1) + 1 + extra
+		default:
+			f.err = CorruptInputError(f.roffset)
+			return
+		}
+
+		// Copy history[-dist:-dist+length] into output.
+		if dist > len(f.hist) {
+			f.err = InternalError("bad history distance")
+			return
+		}
+
+		// No check on length; encoding can be prescient.
+		if !f.hfull && dist > f.hp {
+			f.err = CorruptInputError(f.roffset)
+			return
+		}
+
+		f.copyLen, f.copyDist = length, dist
+		if f.copyHist() {
+			return
+		}
+	}
+}
+
+// copyHist copies f.copyLen bytes from f.hist (f.copyDist bytes ago) to itself.
+// It reports whether the f.hist buffer is full.
+func (f *decompressor) copyHist() bool {
+	p := f.hp - f.copyDist
+	if p < 0 {
+		p += len(f.hist)
+	}
+	for f.copyLen > 0 {
+		n := f.copyLen
+		if x := len(f.hist) - f.hp; n > x {
+			n = x
+		}
+		if x := len(f.hist) - p; n > x {
+			n = x
+		}
+		forwardCopy(f.hist[:], f.hp, p, n)
+		p += n
+		f.hp += n
+		f.copyLen -= n
+		if f.hp == len(f.hist) {
+			// After flush continue copying out of history.
+			f.flush((*decompressor).copyHuff)
+			return true
+		}
+		if p == len(f.hist) {
+			p = 0
+		}
+	}
+	return false
+}
+
+func (f *decompressor) copyHuff() {
+	if f.copyHist() {
+		return
+	}
+	f.huffmanBlock()
+}
+
+// Copy a single uncompressed data block from input to output.
+func (f *decompressor) dataBlock() {
+	// Uncompressed.
+	// Discard current half-byte.
+	f.nb = 0
+	f.b = 0
+
+	// Length then ones-complement of length.
+	nr, err := io.ReadFull(f.r, f.buf[0:4])
+	f.roffset += int64(nr)
+	if err != nil {
+		f.err = &ReadError{f.roffset, err}
+		return
+	}
+	n := int(f.buf[0]) | int(f.buf[1])<<8
+	nn := int(f.buf[2]) | int(f.buf[3])<<8
+	if uint16(nn) != uint16(^n) {
+		f.err = CorruptInputError(f.roffset)
+		return
+	}
+
+	if n == 0 {
+		// 0-length block means sync
+		f.flush((*decompressor).nextBlock)
+		return
+	}
+
+	f.copyLen = n
+	f.copyData()
+}
+
+// copyData copies f.copyLen bytes from the underlying reader into f.hist.
+// It pauses for reads when f.hist is full.
+func (f *decompressor) copyData() {
+	n := f.copyLen
+	for n > 0 {
+		m := len(f.hist) - f.hp
+		if m > n {
+			m = n
+		}
+		m, err := io.ReadFull(f.r, f.hist[f.hp:f.hp+m])
+		f.roffset += int64(m)
+		if err != nil {
+			f.err = &ReadError{f.roffset, err}
+			return
+		}
+		n -= m
+		f.hp += m
+		if f.hp == len(f.hist) {
+			f.copyLen = n
+			f.flush((*decompressor).copyData)
+			return
+		}
+	}
+	f.step = (*decompressor).nextBlock
+}
+
+func (f *decompressor) setDict(dict []byte) {
+	if len(dict) > len(f.hist) {
+		// Will only remember the tail.
+		dict = dict[len(dict)-len(f.hist):]
+	}
+
+	f.hp = copy(f.hist[:], dict)
+	if f.hp == len(f.hist) {
+		f.hp = 0
+		f.hfull = true
+	}
+	f.hw = f.hp
+}
+
+func (f *decompressor) moreBits() error {
+	c, err := f.r.ReadByte()
+	if err != nil {
+		if err == io.EOF {
+			err = io.ErrUnexpectedEOF
+		}
+		return err
+	}
+	f.roffset++
+	f.b |= uint32(c) << f.nb
+	f.nb += 8
+	return nil
+}
+
+// Read the next Huffman-encoded symbol from f according to h.
+func (f *decompressor) huffSym(h *huffmanDecoder) (int, error) {
+	// Since a huffmanDecoder can be empty or be composed of a degenerate tree
+	// with single element, huffSym must error on these two edge cases. In both
+	// cases, the chunks slice will be 0 for the invalid sequence, leading it
+	// satisfy the n == 0 check below.
+	n := uint(h.min)
+	for {
+		for f.nb < n {
+			if err := f.moreBits(); err != nil {
+				return 0, err
+			}
+		}
+		chunk := h.chunks[f.b&(huffmanNumChunks-1)]
+		n = uint(chunk & huffmanCountMask)
+		if n > huffmanChunkBits {
+			chunk = h.links[chunk>>huffmanValueShift][(f.b>>huffmanChunkBits)&h.linkMask]
+			n = uint(chunk & huffmanCountMask)
+		}
+		if n <= f.nb {
+			if n == 0 {
+				f.err = CorruptInputError(f.roffset)
+				return 0, f.err
+			}
+			f.b >>= n
+			f.nb -= n
+			return int(chunk >> huffmanValueShift), nil
+		}
+	}
+}
+
+// Flush any buffered output to the underlying writer.
+func (f *decompressor) flush(step func(*decompressor)) {
+	f.toRead = f.hist[f.hw:f.hp]
+	f.woffset += int64(f.hp - f.hw)
+	f.hw = f.hp
+	if f.hp == len(f.hist) {
+		f.hp = 0
+		f.hw = 0
+		f.hfull = true
+	}
+	f.step = step
+}
+
+func makeReader(r io.Reader) Reader {
+	if rr, ok := r.(Reader); ok {
+		return rr
+	}
+	return bufio.NewReader(r)
+}
+
+func (f *decompressor) Reset(r io.Reader, dict []byte) error {
+	*f = decompressor{
+		r:        makeReader(r),
+		bits:     f.bits,
+		codebits: f.codebits,
+		hist:     f.hist,
+		step:     (*decompressor).nextBlock,
+	}
+	if dict != nil {
+		f.setDict(dict)
+	}
+	return nil
+}
+
+// NewReader returns a new ReadCloser that can be used
+// to read the uncompressed version of r.
+// If r does not also implement io.ByteReader,
+// the decompressor may read more data than necessary from r.
+// It is the caller's responsibility to call Close on the ReadCloser
+// when finished reading.
+//
+// The ReadCloser returned by NewReader also implements Resetter.
+func NewReader(r io.Reader) io.ReadCloser {
+	var f decompressor
+	f.bits = new([maxNumLit + maxNumDist]int)
+	f.codebits = new([numCodes]int)
+	f.r = makeReader(r)
+	f.hist = new([maxHist]byte)
+	f.step = (*decompressor).nextBlock
+	return &f
+}
+
+// NewReaderDict is like NewReader but initializes the reader
+// with a preset dictionary.  The returned Reader behaves as if
+// the uncompressed data stream started with the given dictionary,
+// which has already been read.  NewReaderDict is typically used
+// to read data compressed by NewWriterDict.
+//
+// The ReadCloser returned by NewReader also implements Resetter.
+func NewReaderDict(r io.Reader, dict []byte) io.ReadCloser {
+	var f decompressor
+	f.r = makeReader(r)
+	f.hist = new([maxHist]byte)
+	f.bits = new([maxNumLit + maxNumDist]int)
+	f.codebits = new([numCodes]int)
+	f.step = (*decompressor).nextBlock
+	f.setDict(dict)
+	return &f
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/reverse_bits.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/reverse_bits.go
new file mode 100644
index 0000000000..c1a02720d1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/reverse_bits.go
@@ -0,0 +1,48 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+var reverseByte = [256]byte{
+	0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+	0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+	0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+	0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+	0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+	0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+	0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+	0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+	0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+	0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+	0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+	0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+	0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+	0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+	0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+	0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+	0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+	0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+	0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+	0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+	0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+	0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+	0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+	0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+	0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+	0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+	0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+	0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+	0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+	0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+	0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+	0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
+}
+
+func reverseUint16(v uint16) uint16 {
+	return uint16(reverseByte[v>>8]) | uint16(reverseByte[v&0xFF])<<8
+}
+
+func reverseBits(number uint16, bitLength byte) uint16 {
+	return reverseUint16(number << uint8(16-bitLength))
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/snappy.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/snappy.go
new file mode 100644
index 0000000000..a7cbf351d0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/snappy.go
@@ -0,0 +1,768 @@
+// Copyright 2011 The Snappy-Go Authors. All rights reserved.
+// Modified for deflate by Klaus Post (c) 2015.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+// We limit how far copy back-references can go, the same as the C++ code.
+const maxOffset = 1 << 15
+
+// emitLiteral writes a literal chunk and returns the number of bytes written.
+func emitLiteral(dst *tokens, lit []byte) {
+	ol := dst.n
+	for i, v := range lit {
+		dst.tokens[i+ol] = token(v)
+	}
+	dst.n += len(lit)
+}
+
+// emitCopy writes a copy chunk and returns the number of bytes written.
+func emitCopy(dst *tokens, offset, length int) {
+	dst.tokens[dst.n] = matchToken(uint32(length-3), uint32(offset-minOffsetSize))
+	dst.n++
+}
+
+type snappyEnc interface {
+	Encode(dst *tokens, src []byte)
+	Reset()
+}
+
+func newSnappy(level int) snappyEnc {
+	if useSSE42 {
+		e := &snappySSE4{}
+		switch level {
+		case 3:
+			e.enc = e.encodeL3
+			return e
+		}
+	}
+	e := &snappyGen{}
+	switch level {
+	case 1:
+		e.enc = e.encodeL1
+	case 2:
+		e.enc = e.encodeL2
+	case 3:
+		e.enc = e.encodeL3
+	default:
+		panic("invalid level specified")
+	}
+	return e
+}
+
+const tableBits = 14             // Bits used in the table
+const tableSize = 1 << tableBits // Size of the table
+
+// snappyGen maintains the table for matches,
+// and the previous byte block for level 2.
+// This is the generic implementation.
+type snappyGen struct {
+	table [tableSize]int64
+	block [maxStoreBlockSize]byte
+	prev  []byte
+	cur   int
+	enc   func(dst *tokens, src []byte)
+}
+
+func (e *snappyGen) Encode(dst *tokens, src []byte) {
+	e.enc(dst, src)
+}
+
+// EncodeL1 uses Snappy-like compression, but stores as Huffman
+// blocks.
+func (e *snappyGen) encodeL1(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.cur += 4
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		t   int // The last position with the same hash as s.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
+		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
+
+		offset := uint(s - t - 1)
+
+		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+		if t < 0 || offset >= (maxOffset-1) || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
+			// Skip 1 byte for 16 consecutive missed.
+			s += 1 + ((s - lit) >> 4)
+			continue
+		}
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Extend the match to be as long as possible.
+		s0 := s
+		s1 := s + maxMatchLength
+		if s1 > len(src) {
+			s1 = len(src)
+		}
+		s, t = s+4, t+4
+		for s < s1 && src[s] == src[t] {
+			s++
+			t++
+		}
+		// Emit the copied bytes.
+		// inlined: emitCopy(dst, s-t, s-s0)
+
+		dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
+		dst.n++
+		lit = s
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+}
+
+// EncodeL2 uses a similar algorithm to level 1, but is capable
+// of matching across blocks giving better compression at a small slowdown.
+func (e *snappyGen) encodeL2(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.prev = nil
+		e.cur += len(src)
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		t   int // The last position with the same hash as s.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
+		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
+
+		// If t is positive, the match starts in the current block
+		if t >= 0 {
+
+			offset := uint(s - t - 1)
+			// Check that the offset is valid and that we match at least 4 bytes
+			if offset >= (maxOffset-1) || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
+				// Skip 1 byte for 32 consecutive missed.
+				s += 1 + ((s - lit) >> 5)
+				continue
+			}
+			// Otherwise, we have a match. First, emit any pending literal bytes.
+			if lit != s {
+				emitLiteral(dst, src[lit:s])
+			}
+			// Extend the match to be as long as possible.
+			s0 := s
+			s1 := s + maxMatchLength
+			if s1 > len(src) {
+				s1 = len(src)
+			}
+			s, t = s+4, t+4
+			for s < s1 && src[s] == src[t] {
+				s++
+				t++
+			}
+			// Emit the copied bytes.
+			// inlined: emitCopy(dst, s-t, s-s0)
+			dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
+			dst.n++
+			lit = s
+			continue
+		}
+		// We found a match in the previous block.
+		tp := len(e.prev) + t
+		if tp < 0 || t > -5 || s-t >= maxOffset || b0 != e.prev[tp] || b1 != e.prev[tp+1] || b2 != e.prev[tp+2] || b3 != e.prev[tp+3] {
+			// Skip 1 byte for 32 consecutive missed.
+			s += 1 + ((s - lit) >> 5)
+			continue
+		}
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Extend the match to be as long as possible.
+		s0 := s
+		s1 := s + maxMatchLength
+		if s1 > len(src) {
+			s1 = len(src)
+		}
+		s, tp = s+4, tp+4
+		for s < s1 && src[s] == e.prev[tp] {
+			s++
+			tp++
+			if tp == len(e.prev) {
+				t = 0
+				// continue in current buffer
+				for s < s1 && src[s] == src[t] {
+					s++
+					t++
+				}
+				goto l
+			}
+		}
+	l:
+		// Emit the copied bytes.
+		if t < 0 {
+			t = tp - len(e.prev)
+		}
+		dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
+		dst.n++
+		lit = s
+
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+	// Store this block, if it was full length.
+	if len(src) == maxStoreBlockSize {
+		copy(e.block[:], src)
+		e.prev = e.block[:len(src)]
+	} else {
+		e.prev = nil
+	}
+}
+
+// EncodeL3 uses a similar algorithm to level 2, but is capable
+// will keep two matches per hash.
+// Both hashes are checked if the first isn't ok, and the longest is selected.
+func (e *snappyGen) encodeL3(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.prev = nil
+		e.cur += len(src)
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		h := uint32(src[s]) | uint32(src[s+1])<<8 | uint32(src[s+2])<<16 | uint32(src[s+3])<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		tmp := *p
+		p1 := int(tmp & 0xffffffff) // Closest match position
+		p2 := int(tmp >> 32)        // Furthest match position
+
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t1 := p1 - 1 - e.cur
+
+		var l2 int
+		var t2 int
+		l1 := e.matchlen(s, t1, src)
+		// If fist match was ok, don't do the second.
+		if l1 < 16 {
+			t2 = p2 - 1 - e.cur
+			l2 = e.matchlen(s, t2, src)
+
+			// If both are short, continue
+			if l1 < 4 && l2 < 4 {
+				// Update hash table
+				*p = int64(s+1+e.cur) | (int64(p1) << 32)
+				// Skip 1 byte for 32 consecutive missed.
+				s += 1 + ((s - lit) >> 5)
+				continue
+			}
+		}
+
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Update hash table
+		*p = int64(s+1+e.cur) | (int64(p1) << 32)
+
+		// Store the longest match l1 will be closest, so we prefer that if equal length
+		if l1 >= l2 {
+			dst.tokens[dst.n] = matchToken(uint32(l1-3), uint32(s-t1-minOffsetSize))
+			s += l1
+		} else {
+			dst.tokens[dst.n] = matchToken(uint32(l2-3), uint32(s-t2-minOffsetSize))
+			s += l2
+		}
+		dst.n++
+		lit = s
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+	// Store this block, if it was full length.
+	if len(src) == maxStoreBlockSize {
+		copy(e.block[:], src)
+		e.prev = e.block[:len(src)]
+	} else {
+		e.prev = nil
+	}
+}
+
+func (e *snappyGen) matchlen(s, t int, src []byte) int {
+	// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+	offset := uint(s - t - 1)
+
+	// If we are inside the current block
+	if t >= 0 {
+		if offset >= (maxOffset-1) ||
+			src[s] != src[t] || src[s+1] != src[t+1] ||
+			src[s+2] != src[t+2] || src[s+3] != src[t+3] {
+			return 0
+		}
+		// Extend the match to be as long as possible.
+		s0 := s
+		s1 := s + maxMatchLength
+		if s1 > len(src) {
+			s1 = len(src)
+		}
+		s, t = s+4, t+4
+		for s < s1 && src[s] == src[t] {
+			s++
+			t++
+		}
+		return s - s0
+	}
+
+	// We found a match in the previous block.
+	tp := len(e.prev) + t
+	if tp < 0 || offset >= (maxOffset-1) || t > -5 ||
+		src[s] != e.prev[tp] || src[s+1] != e.prev[tp+1] ||
+		src[s+2] != e.prev[tp+2] || src[s+3] != e.prev[tp+3] {
+		return 0
+	}
+
+	// Extend the match to be as long as possible.
+	s0 := s
+	s1 := s + maxMatchLength
+	if s1 > len(src) {
+		s1 = len(src)
+	}
+	s, tp = s+4, tp+4
+	for s < s1 && src[s] == e.prev[tp] {
+		s++
+		tp++
+		if tp == len(e.prev) {
+			t = 0
+			// continue in current buffer
+			for s < s1 && src[s] == src[t] {
+				s++
+				t++
+			}
+			return s - s0
+		}
+	}
+	return s - s0
+}
+
+// Reset the encoding table.
+func (e *snappyGen) Reset() {
+	e.prev = nil
+}
+
+// snappySSE4 extends snappyGen.
+// This implementation can use SSE 4.2 for length matching.
+type snappySSE4 struct {
+	snappyGen
+}
+
+/*
+// EncodeL1 uses Snappy-like compression, but stores as Huffman
+// blocks.
+func (e *snappySSE4) encodeL1(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.cur += 4
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		t   int // The last position with the same hash as s.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		h := uint32(src[s]) | uint32(src[s+1])<<8 | uint32(src[s+2])<<16 | uint32(src[s+3])<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
+
+		offset := uint(s - t - 1)
+
+		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+		if t < 0 || offset >= (maxOffset-1) {
+			// Skip 1 byte for 16 consecutive missed.
+			s += 1 + ((s - lit) >> 4)
+			continue
+		}
+
+		length := len(src) - s
+		if length > maxMatchLength {
+			length = maxMatchLength
+		}
+		// Extend the match to be as long as possible.
+		match := matchLenSSE4(src[t:], src[s:], length)
+
+		// Return if short.
+		if match < 4 {
+			s += 1 + (s-lit)>>4
+			continue
+		}
+
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+
+		dst.tokens[dst.n] = matchToken(uint32(match-3), uint32(offset))
+		dst.n++
+		s += match
+		lit = s
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+}
+
+// EncodeL2 uses a similar algorithm to level 1, but is capable
+// of matching across blocks giving better compression at a small slowdown.
+func (e *snappySSE4) encodeL2(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.prev = nil
+		e.cur += len(src)
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		t   int // The last position with the same hash as s.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
+		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
+
+		// If t is positive, the match starts in the current block
+		if t >= 0 {
+			offset := uint(s - t - 1)
+
+			// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+			if t < 0 || offset >= (maxOffset-1) {
+				// Skip 1 byte for 16 consecutive missed.
+				s += 1 + ((s - lit) >> 5)
+				continue
+			}
+
+			length := maxMatchLength
+			if length > len(src)-s {
+				length = len(src) - s
+			}
+			// Extend the match to be as long as possible.
+			match := matchLenSSE4(src[t:], src[s:], length)
+
+			// Return if short.
+			if match < 4 {
+				s += 1 + (s-lit)>>5
+				continue
+			}
+
+			// Otherwise, we have a match. First, emit any pending literal bytes.
+			if lit != s {
+				emitLiteral(dst, src[lit:s])
+			}
+
+			dst.tokens[dst.n] = matchToken(uint32(match-3), uint32(offset))
+			s += match
+			dst.n++
+			lit = s
+			continue
+		}
+
+		// We found a match in the previous block.
+		tp := len(e.prev) + t
+		if tp < 0 || t > -5 || s-t >= maxOffset || b0 != e.prev[tp] || b1 != e.prev[tp+1] || b2 != e.prev[tp+2] || b3 != e.prev[tp+3] {
+			// Skip 1 byte for 32 consecutive missed.
+			s += 1 + ((s - lit) >> 5)
+			continue
+		}
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Extend the match to be as long as possible.
+		s0 := s
+		s1 := s + maxMatchLength
+		if s1 > len(src) {
+			s1 = len(src)
+		}
+		s, tp = s+4, tp+4
+		for s < s1 && src[s] == e.prev[tp] {
+			s++
+			tp++
+			if tp == len(e.prev) {
+				t = 0
+				// continue in current buffer
+				for s < s1 && src[s] == src[t] {
+					s++
+					t++
+				}
+				goto l
+			}
+		}
+	l:
+		// Emit the copied bytes.
+		// inlined: emitCopy(dst, s-t, s-s0)
+		if t < 0 {
+			t = tp - len(e.prev)
+		}
+		dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
+		dst.n++
+		lit = s
+		continue
+
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+	// Store this block, if it was full length.
+	if len(src) == maxStoreBlockSize {
+		copy(e.block[:], src)
+		e.prev = e.block[:len(src)]
+	} else {
+		e.prev = nil
+	}
+}
+*/
+
+// EncodeL3 uses a similar algorithm to level 2,
+// but will keep two matches per hash.
+// Both hashes are checked if the first isn't ok, and the longest is selected.
+func (e *snappySSE4) encodeL3(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.prev = nil
+		e.cur += len(src)
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Load potential matches from hash table.
+		h := uint32(src[s]) | uint32(src[s+1])<<8 | uint32(src[s+2])<<16 | uint32(src[s+3])<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		tmp := *p
+		p1 := int(tmp & 0xffffffff) // Closest match position
+		p2 := int(tmp >> 32)        // Furthest match position
+
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t1 := int(p1) - 1 - e.cur
+
+		var l2 int
+		var t2 int
+		l1 := e.matchlen(s, t1, src)
+		// If fist match was ok, don't do the second.
+		if l1 < 16 {
+			t2 = int(p2) - 1 - e.cur
+			l2 = e.matchlen(s, t2, src)
+
+			// If both are short, continue
+			if l1 < 4 && l2 < 4 {
+				// Update hash table
+				*p = int64(s+1+e.cur) | (int64(p1) << 32)
+				// Skip 1 byte for 32 consecutive missed.
+				s += 1 + ((s - lit) >> 5)
+				continue
+			}
+		}
+
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Update hash table
+		*p = int64(s+1+e.cur) | (int64(p1) << 32)
+
+		// Store the longest match l1 will be closest, so we prefer that if equal length
+		if l1 >= l2 {
+			dst.tokens[dst.n] = matchToken(uint32(l1-3), uint32(s-t1-minOffsetSize))
+			s += l1
+		} else {
+			dst.tokens[dst.n] = matchToken(uint32(l2-3), uint32(s-t2-minOffsetSize))
+			s += l2
+		}
+		dst.n++
+		lit = s
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+	// Store this block, if it was full length.
+	if len(src) == maxStoreBlockSize {
+		copy(e.block[:], src)
+		e.prev = e.block[:len(src)]
+	} else {
+		e.prev = nil
+	}
+}
+
+func (e *snappySSE4) matchlen(s, t int, src []byte) int {
+	// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+	offset := uint(s - t - 1)
+
+	// If we are inside the current block
+	if t >= 0 {
+		if offset >= (maxOffset - 1) {
+			return 0
+		}
+		length := len(src) - s
+		if length > maxMatchLength {
+			length = maxMatchLength
+		}
+		// Extend the match to be as long as possible.
+		return matchLenSSE4(src[t:], src[s:], length)
+	}
+
+	// We found a match in the previous block.
+	tp := len(e.prev) + t
+	if tp < 0 || offset >= (maxOffset-1) || t > -5 ||
+		src[s] != e.prev[tp] || src[s+1] != e.prev[tp+1] ||
+		src[s+2] != e.prev[tp+2] || src[s+3] != e.prev[tp+3] {
+		return 0
+	}
+
+	// Extend the match to be as long as possible.
+	s0 := s
+	s1 := s + maxMatchLength
+	if s1 > len(src) {
+		s1 = len(src)
+	}
+	s, tp = s+4, tp+4
+	for s < s1 && src[s] == e.prev[tp] {
+		s++
+		tp++
+		if tp == len(e.prev) {
+			t = 0
+			// continue in current buffer
+			for s < s1 && src[s] == src[t] {
+				s++
+				t++
+			}
+			return s - s0
+		}
+	}
+	return s - s0
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/token.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/token.go
new file mode 100644
index 0000000000..94fa5eb93a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/compress/flate/token.go
@@ -0,0 +1,105 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+const (
+	// 2 bits:   type   0 = literal  1=EOF  2=Match   3=Unused
+	// 8 bits:   xlength = length - MIN_MATCH_LENGTH
+	// 22 bits   xoffset = offset - MIN_OFFSET_SIZE, or literal
+	lengthShift = 22
+	offsetMask  = 1<<lengthShift - 1
+	typeMask    = 3 << 30
+	literalType = 0 << 30
+	matchType   = 1 << 30
+)
+
+// The length code for length X (MIN_MATCH_LENGTH <= X <= MAX_MATCH_LENGTH)
+// is lengthCodes[length - MIN_MATCH_LENGTH]
+var lengthCodes = [...]uint32{
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 8,
+	9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
+	13, 13, 13, 13, 14, 14, 14, 14, 15, 15,
+	15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+	17, 17, 17, 17, 17, 17, 17, 17, 18, 18,
+	18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+	19, 19, 19, 19, 20, 20, 20, 20, 20, 20,
+	20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+	21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+	21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+	22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+	22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23, 24, 24,
+	24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+	24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+	24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+	25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+	26, 26, 26, 26, 27, 27, 27, 27, 27, 27,
+	27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+	27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+	27, 27, 27, 27, 27, 28,
+}
+
+var offsetCodes = [...]uint32{
+	0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7,
+	8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
+	10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+	11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+	12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+	12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+	13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+	13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+}
+
+type token uint32
+
+type tokens struct {
+	tokens []token
+	n      int
+}
+
+// Convert a literal into a literal token.
+func literalToken(literal uint32) token { return token(literalType + literal) }
+
+// Convert a < xlength, xoffset > pair into a match token.
+func matchToken(xlength uint32, xoffset uint32) token {
+	return token(matchType + xlength<<lengthShift + xoffset)
+}
+
+// Returns the type of a token
+func (t token) typ() uint32 { return uint32(t) & typeMask }
+
+// Returns the literal of a literal token
+func (t token) literal() uint32 { return uint32(t - literalType) }
+
+// Returns the extra offset of a match token
+func (t token) offset() uint32 { return uint32(t) & offsetMask }
+
+func (t token) length() uint32 { return uint32((t - matchType) >> lengthShift) }
+
+func lengthCode(len uint32) uint32 { return lengthCodes[len] }
+
+// Returns the offset code corresponding to a specific offset
+func offsetCode(off uint32) uint32 {
+	if off < uint32(len(offsetCodes)) {
+		return offsetCodes[off]
+	} else if off>>7 < uint32(len(offsetCodes)) {
+		return offsetCodes[off>>7] + 14
+	} else {
+		return offsetCodes[off>>14] + 28
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/.gitignore b/Godeps/_workspace/src/github.com/klauspost/cpuid/.gitignore
new file mode 100644
index 0000000000..daf913b1b3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/.gitignore
@@ -0,0 +1,24 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/.travis.yml b/Godeps/_workspace/src/github.com/klauspost/cpuid/.travis.yml
new file mode 100644
index 0000000000..bde823d8ab
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/.travis.yml
@@ -0,0 +1,8 @@
+language: go
+
+go:
+  - 1.3
+  - 1.4
+  - 1.5
+  - 1.6
+  - tip
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/LICENSE b/Godeps/_workspace/src/github.com/klauspost/cpuid/LICENSE
new file mode 100644
index 0000000000..5cec7ee949
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Klaus Post
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/README.md b/Godeps/_workspace/src/github.com/klauspost/cpuid/README.md
new file mode 100644
index 0000000000..b2b6bee879
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/README.md
@@ -0,0 +1,145 @@
+# cpuid
+Package cpuid provides information about the CPU running the current program.
+
+CPU features are detected on startup, and kept for fast access through the life of the application.
+Currently x86 / x64 (AMD64) is supported, and no external C (cgo) code is used, which should make the library very easy to use.
+
+You can access the CPU information by accessing the shared CPU variable of the cpuid library.
+
+Package home: https://github.com/klauspost/cpuid
+
+[![GoDoc][1]][2] [![Build Status][3]][4]
+
+[1]: https://godoc.org/github.com/klauspost/cpuid?status.svg
+[2]: https://godoc.org/github.com/klauspost/cpuid
+[3]: https://travis-ci.org/klauspost/cpuid.svg
+[4]: https://travis-ci.org/klauspost/cpuid
+
+# features
+## CPU Instructions
+*  **CMOV** (i686 CMOV)
+*  **NX** (NX (No-Execute) bit)
+*  **AMD3DNOW** (AMD 3DNOW)
+*  **AMD3DNOWEXT** (AMD 3DNowExt)
+*  **MMX** (standard MMX)
+*  **MMXEXT** (SSE integer functions or AMD MMX ext)
+*  **SSE** (SSE functions)
+*  **SSE2** (P4 SSE functions)
+*  **SSE3** (Prescott SSE3 functions)
+*  **SSSE3** (Conroe SSSE3 functions)
+*  **SSE4** (Penryn SSE4.1 functions)
+*  **SSE4A** (AMD Barcelona microarchitecture SSE4a instructions)
+*  **SSE42** (Nehalem SSE4.2 functions)
+*  **AVX** (AVX functions)
+*  **AVX2** (AVX2 functions)
+*  **FMA3** (Intel FMA 3)
+*  **FMA4** (Bulldozer FMA4 functions)
+*  **XOP** (Bulldozer XOP functions)
+*  **F16C** (Half-precision floating-point conversion)
+*  **BMI1** (Bit Manipulation Instruction Set 1)
+*  **BMI2** (Bit Manipulation Instruction Set 2)
+*  **TBM** (AMD Trailing Bit Manipulation)
+*  **LZCNT** (LZCNT instruction)
+*  **POPCNT** (POPCNT instruction)
+*  **AESNI** (Advanced Encryption Standard New Instructions)
+*  **CLMUL** (Carry-less Multiplication)
+*  **HTT** (Hyperthreading (enabled))
+*  **HLE** (Hardware Lock Elision)
+*  **RTM** (Restricted Transactional Memory)
+*  **RDRAND** (RDRAND instruction is available)
+*  **RDSEED** (RDSEED instruction is available)
+*  **ADX** (Intel ADX (Multi-Precision Add-Carry Instruction Extensions))
+*  **SHA** (Intel SHA Extensions)
+*  **AVX512F** (AVX-512 Foundation)
+*  **AVX512DQ** (AVX-512 Doubleword and Quadword Instructions)
+*  **AVX512IFMA** (AVX-512 Integer Fused Multiply-Add Instructions)
+*  **AVX512PF** (AVX-512 Prefetch Instructions)
+*  **AVX512ER** (AVX-512 Exponential and Reciprocal Instructions)
+*  **AVX512CD** (AVX-512 Conflict Detection Instructions)
+*  **AVX512BW** (AVX-512 Byte and Word Instructions)
+*  **AVX512VL** (AVX-512 Vector Length Extensions)
+*  **AVX512VBMI** (AVX-512 Vector Bit Manipulation Instructions)
+*  **MPX** (Intel MPX (Memory Protection Extensions))
+*  **ERMS** (Enhanced REP MOVSB/STOSB)
+*  **RDTSCP** (RDTSCP Instruction)
+*  **CX16** (CMPXCHG16B Instruction)
+*  **SGX** (Software Guard Extensions, with activation details)
+
+## Performance
+*  **RDTSCP()** Returns current cycle count. Can be used for benchmarking.
+*  **SSE2SLOW** (SSE2 is supported, but usually not faster)
+*  **SSE3SLOW** (SSE3 is supported, but usually not faster)
+*  **ATOM** (Atom processor, some SSSE3 instructions are slower)
+*  **Cache line** (Probable size of a cache line).
+*  **L1, L2, L3 Cache size** on newer Intel/AMD CPUs.
+
+## Cpu Vendor/VM
+* **Intel**
+* **AMD**
+* **VIA**
+* **Transmeta**
+* **NSC**
+* **KVM**  (Kernel-based Virtual Machine)
+* **MSVM** (Microsoft Hyper-V or Windows Virtual PC)
+* **VMware**
+* **XenHVM**
+
+# installing
+
+```go get github.com/klauspost/cpuid```
+
+# example
+
+```Go
+package main
+
+import (
+	"fmt"
+	"github.com/klauspost/cpuid"
+)
+
+func main() {
+	// Print basic CPU information:
+	fmt.Println("Name:", cpuid.CPU.BrandName)
+	fmt.Println("PhysicalCores:", cpuid.CPU.PhysicalCores)
+	fmt.Println("ThreadsPerCore:", cpuid.CPU.ThreadsPerCore)
+	fmt.Println("LogicalCores:", cpuid.CPU.LogicalCores)
+	fmt.Println("Family", cpuid.CPU.Family, "Model:", cpuid.CPU.Model)
+	fmt.Println("Features:", cpuid.CPU.Features)
+	fmt.Println("Cacheline bytes:", cpuid.CPU.CacheLine)
+	fmt.Println("L1 Data Cache:", cpuid.CPU.Cache.L1D, "bytes")
+	fmt.Println("L1 Instruction Cache:", cpuid.CPU.Cache.L1D, "bytes")
+	fmt.Println("L2 Cache:", cpuid.CPU.Cache.L2, "bytes")
+	fmt.Println("L3 Cache:", cpuid.CPU.Cache.L3, "bytes")
+
+	// Test if we have a specific feature:
+	if cpuid.CPU.SSE() {
+		fmt.Println("We have Streaming SIMD Extensions")
+	}
+}
+```
+
+Sample output:
+```
+>go run main.go
+Name: Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz
+PhysicalCores: 2
+ThreadsPerCore: 2
+LogicalCores: 4
+Family 6 Model: 42
+Features: CMOV,MMX,MMXEXT,SSE,SSE2,SSE3,SSSE3,SSE4.1,SSE4.2,AVX,AESNI,CLMUL
+Cacheline bytes: 64
+We have Streaming SIMD Extensions
+```
+
+# private package
+
+In the "private" folder you can find an autogenerated version of the library you can include in your own packages.
+
+For this purpose all exports are removed, and functions and constants are lowercased.
+
+This is not a recommended way of using the library, but provided for convenience, if it is difficult for you to use external packages.
+
+# license
+
+This code is published under an MIT license. See LICENSE file for more information.
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid.go
new file mode 100644
index 0000000000..9230ca5628
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid.go
@@ -0,0 +1,1022 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+// Package cpuid provides information about the CPU running the current program.
+//
+// CPU features are detected on startup, and kept for fast access through the life of the application.
+// Currently x86 / x64 (AMD64) is supported.
+//
+// You can access the CPU information by accessing the shared CPU variable of the cpuid library.
+//
+// Package home: https://github.com/klauspost/cpuid
+package cpuid
+
+import "strings"
+
+// Vendor is a representation of a CPU vendor.
+type Vendor int
+
+const (
+	Other Vendor = iota
+	Intel
+	AMD
+	VIA
+	Transmeta
+	NSC
+	KVM  // Kernel-based Virtual Machine
+	MSVM // Microsoft Hyper-V or Windows Virtual PC
+	VMware
+	XenHVM
+)
+
+const (
+	CMOV        = 1 << iota // i686 CMOV
+	NX                      // NX (No-Execute) bit
+	AMD3DNOW                // AMD 3DNOW
+	AMD3DNOWEXT             // AMD 3DNowExt
+	MMX                     // standard MMX
+	MMXEXT                  // SSE integer functions or AMD MMX ext
+	SSE                     // SSE functions
+	SSE2                    // P4 SSE functions
+	SSE3                    // Prescott SSE3 functions
+	SSSE3                   // Conroe SSSE3 functions
+	SSE4                    // Penryn SSE4.1 functions
+	SSE4A                   // AMD Barcelona microarchitecture SSE4a instructions
+	SSE42                   // Nehalem SSE4.2 functions
+	AVX                     // AVX functions
+	AVX2                    // AVX2 functions
+	FMA3                    // Intel FMA 3
+	FMA4                    // Bulldozer FMA4 functions
+	XOP                     // Bulldozer XOP functions
+	F16C                    // Half-precision floating-point conversion
+	BMI1                    // Bit Manipulation Instruction Set 1
+	BMI2                    // Bit Manipulation Instruction Set 2
+	TBM                     // AMD Trailing Bit Manipulation
+	LZCNT                   // LZCNT instruction
+	POPCNT                  // POPCNT instruction
+	AESNI                   // Advanced Encryption Standard New Instructions
+	CLMUL                   // Carry-less Multiplication
+	HTT                     // Hyperthreading (enabled)
+	HLE                     // Hardware Lock Elision
+	RTM                     // Restricted Transactional Memory
+	RDRAND                  // RDRAND instruction is available
+	RDSEED                  // RDSEED instruction is available
+	ADX                     // Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
+	SHA                     // Intel SHA Extensions
+	AVX512F                 // AVX-512 Foundation
+	AVX512DQ                // AVX-512 Doubleword and Quadword Instructions
+	AVX512IFMA              // AVX-512 Integer Fused Multiply-Add Instructions
+	AVX512PF                // AVX-512 Prefetch Instructions
+	AVX512ER                // AVX-512 Exponential and Reciprocal Instructions
+	AVX512CD                // AVX-512 Conflict Detection Instructions
+	AVX512BW                // AVX-512 Byte and Word Instructions
+	AVX512VL                // AVX-512 Vector Length Extensions
+	AVX512VBMI              // AVX-512 Vector Bit Manipulation Instructions
+	MPX                     // Intel MPX (Memory Protection Extensions)
+	ERMS                    // Enhanced REP MOVSB/STOSB
+	RDTSCP                  // RDTSCP Instruction
+	CX16                    // CMPXCHG16B Instruction
+	SGX                     // Software Guard Extensions
+
+	// Performance indicators
+	SSE2SLOW // SSE2 is supported, but usually not faster
+	SSE3SLOW // SSE3 is supported, but usually not faster
+	ATOM     // Atom processor, some SSSE3 instructions are slower
+)
+
+var flagNames = map[Flags]string{
+	CMOV:        "CMOV",        // i686 CMOV
+	NX:          "NX",          // NX (No-Execute) bit
+	AMD3DNOW:    "AMD3DNOW",    // AMD 3DNOW
+	AMD3DNOWEXT: "AMD3DNOWEXT", // AMD 3DNowExt
+	MMX:         "MMX",         // Standard MMX
+	MMXEXT:      "MMXEXT",      // SSE integer functions or AMD MMX ext
+	SSE:         "SSE",         // SSE functions
+	SSE2:        "SSE2",        // P4 SSE2 functions
+	SSE3:        "SSE3",        // Prescott SSE3 functions
+	SSSE3:       "SSSE3",       // Conroe SSSE3 functions
+	SSE4:        "SSE4.1",      // Penryn SSE4.1 functions
+	SSE4A:       "SSE4A",       // AMD Barcelona microarchitecture SSE4a instructions
+	SSE42:       "SSE4.2",      // Nehalem SSE4.2 functions
+	AVX:         "AVX",         // AVX functions
+	AVX2:        "AVX2",        // AVX functions
+	FMA3:        "FMA3",        // Intel FMA 3
+	FMA4:        "FMA4",        // Bulldozer FMA4 functions
+	XOP:         "XOP",         // Bulldozer XOP functions
+	F16C:        "F16C",        // Half-precision floating-point conversion
+	BMI1:        "BMI1",        // Bit Manipulation Instruction Set 1
+	BMI2:        "BMI2",        // Bit Manipulation Instruction Set 2
+	TBM:         "TBM",         // AMD Trailing Bit Manipulation
+	LZCNT:       "LZCNT",       // LZCNT instruction
+	POPCNT:      "POPCNT",      // POPCNT instruction
+	AESNI:       "AESNI",       // Advanced Encryption Standard New Instructions
+	CLMUL:       "CLMUL",       // Carry-less Multiplication
+	HTT:         "HTT",         // Hyperthreading (enabled)
+	HLE:         "HLE",         // Hardware Lock Elision
+	RTM:         "RTM",         // Restricted Transactional Memory
+	RDRAND:      "RDRAND",      // RDRAND instruction is available
+	RDSEED:      "RDSEED",      // RDSEED instruction is available
+	ADX:         "ADX",         // Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
+	SHA:         "SHA",         // Intel SHA Extensions
+	AVX512F:     "AVX512F",     // AVX-512 Foundation
+	AVX512DQ:    "AVX512DQ",    // AVX-512 Doubleword and Quadword Instructions
+	AVX512IFMA:  "AVX512IFMA",  // AVX-512 Integer Fused Multiply-Add Instructions
+	AVX512PF:    "AVX512PF",    // AVX-512 Prefetch Instructions
+	AVX512ER:    "AVX512ER",    // AVX-512 Exponential and Reciprocal Instructions
+	AVX512CD:    "AVX512CD",    // AVX-512 Conflict Detection Instructions
+	AVX512BW:    "AVX512BW",    // AVX-512 Byte and Word Instructions
+	AVX512VL:    "AVX512VL",    // AVX-512 Vector Length Extensions
+	AVX512VBMI:  "AVX512VBMI",  // AVX-512 Vector Bit Manipulation Instructions
+	MPX:         "MPX",         // Intel MPX (Memory Protection Extensions)
+	ERMS:        "ERMS",        // Enhanced REP MOVSB/STOSB
+	RDTSCP:      "RDTSCP",      // RDTSCP Instruction
+	CX16:        "CX16",        // CMPXCHG16B Instruction
+	SGX:         "SGX",         // Software Guard Extensions
+
+	// Performance indicators
+	SSE2SLOW: "SSE2SLOW", // SSE2 supported, but usually not faster
+	SSE3SLOW: "SSE3SLOW", // SSE3 supported, but usually not faster
+	ATOM:     "ATOM",     // Atom processor, some SSSE3 instructions are slower
+
+}
+
+// CPUInfo contains information about the detected system CPU.
+type CPUInfo struct {
+	BrandName      string // Brand name reported by the CPU
+	VendorID       Vendor // Comparable CPU vendor ID
+	Features       Flags  // Features of the CPU
+	PhysicalCores  int    // Number of physical processor cores in your CPU. Will be 0 if undetectable.
+	ThreadsPerCore int    // Number of threads per physical core. Will be 1 if undetectable.
+	LogicalCores   int    // Number of physical cores times threads that can run on each core through the use of hyperthreading. Will be 0 if undetectable.
+	Family         int    // CPU family number
+	Model          int    // CPU model number
+	CacheLine      int    // Cache line size in bytes. Will be 0 if undetectable.
+	Cache          struct {
+		L1I int // L1 Instruction Cache (per core or shared). Will be -1 if undetected
+		L1D int // L1 Data Cache (per core or shared). Will be -1 if undetected
+		L2  int // L2 Cache (per core or shared). Will be -1 if undetected
+		L3  int // L3 Instruction Cache (per core or shared). Will be -1 if undetected
+	}
+	SGX       SGXSupport
+	maxFunc   uint32
+	maxExFunc uint32
+}
+
+var cpuid func(op uint32) (eax, ebx, ecx, edx uint32)
+var cpuidex func(op, op2 uint32) (eax, ebx, ecx, edx uint32)
+var xgetbv func(index uint32) (eax, edx uint32)
+var rdtscpAsm func() (eax, ebx, ecx, edx uint32)
+
+// CPU contains information about the CPU as detected on startup,
+// or when Detect last was called.
+//
+// Use this as the primary entry point to you data,
+// this way queries are
+var CPU CPUInfo
+
+func init() {
+	initCPU()
+	Detect()
+}
+
+// Detect will re-detect current CPU info.
+// This will replace the content of the exported CPU variable.
+//
+// Unless you expect the CPU to change while you are running your program
+// you should not need to call this function.
+// If you call this, you must ensure that no other goroutine is accessing the
+// exported CPU variable.
+func Detect() {
+	CPU.maxFunc = maxFunctionID()
+	CPU.maxExFunc = maxExtendedFunction()
+	CPU.BrandName = brandName()
+	CPU.CacheLine = cacheLine()
+	CPU.Family, CPU.Model = familyModel()
+	CPU.Features = support()
+	CPU.SGX = sgx(CPU.Features&SGX != 0)
+	CPU.ThreadsPerCore = threadsPerCore()
+	CPU.LogicalCores = logicalCores()
+	CPU.PhysicalCores = physicalCores()
+	CPU.VendorID = vendorID()
+	CPU.cacheSize()
+}
+
+// Generated here: http://play.golang.org/p/BxFH2Gdc0G
+
+// Cmov indicates support of CMOV instructions
+func (c CPUInfo) Cmov() bool {
+	return c.Features&CMOV != 0
+}
+
+// Amd3dnow indicates support of AMD 3DNOW! instructions
+func (c CPUInfo) Amd3dnow() bool {
+	return c.Features&AMD3DNOW != 0
+}
+
+// Amd3dnowExt indicates support of AMD 3DNOW! Extended instructions
+func (c CPUInfo) Amd3dnowExt() bool {
+	return c.Features&AMD3DNOWEXT != 0
+}
+
+// MMX indicates support of MMX instructions
+func (c CPUInfo) MMX() bool {
+	return c.Features&MMX != 0
+}
+
+// MMXExt indicates support of MMXEXT instructions
+// (SSE integer functions or AMD MMX ext)
+func (c CPUInfo) MMXExt() bool {
+	return c.Features&MMXEXT != 0
+}
+
+// SSE indicates support of SSE instructions
+func (c CPUInfo) SSE() bool {
+	return c.Features&SSE != 0
+}
+
+// SSE2 indicates support of SSE 2 instructions
+func (c CPUInfo) SSE2() bool {
+	return c.Features&SSE2 != 0
+}
+
+// SSE3 indicates support of SSE 3 instructions
+func (c CPUInfo) SSE3() bool {
+	return c.Features&SSE3 != 0
+}
+
+// SSSE3 indicates support of SSSE 3 instructions
+func (c CPUInfo) SSSE3() bool {
+	return c.Features&SSSE3 != 0
+}
+
+// SSE4 indicates support of SSE 4 (also called SSE 4.1) instructions
+func (c CPUInfo) SSE4() bool {
+	return c.Features&SSE4 != 0
+}
+
+// SSE42 indicates support of SSE4.2 instructions
+func (c CPUInfo) SSE42() bool {
+	return c.Features&SSE42 != 0
+}
+
+// AVX indicates support of AVX instructions
+// and operating system support of AVX instructions
+func (c CPUInfo) AVX() bool {
+	return c.Features&AVX != 0
+}
+
+// AVX2 indicates support of AVX2 instructions
+func (c CPUInfo) AVX2() bool {
+	return c.Features&AVX2 != 0
+}
+
+// FMA3 indicates support of FMA3 instructions
+func (c CPUInfo) FMA3() bool {
+	return c.Features&FMA3 != 0
+}
+
+// FMA4 indicates support of FMA4 instructions
+func (c CPUInfo) FMA4() bool {
+	return c.Features&FMA4 != 0
+}
+
+// XOP indicates support of XOP instructions
+func (c CPUInfo) XOP() bool {
+	return c.Features&XOP != 0
+}
+
+// F16C indicates support of F16C instructions
+func (c CPUInfo) F16C() bool {
+	return c.Features&F16C != 0
+}
+
+// BMI1 indicates support of BMI1 instructions
+func (c CPUInfo) BMI1() bool {
+	return c.Features&BMI1 != 0
+}
+
+// BMI2 indicates support of BMI2 instructions
+func (c CPUInfo) BMI2() bool {
+	return c.Features&BMI2 != 0
+}
+
+// TBM indicates support of TBM instructions
+// (AMD Trailing Bit Manipulation)
+func (c CPUInfo) TBM() bool {
+	return c.Features&TBM != 0
+}
+
+// Lzcnt indicates support of LZCNT instruction
+func (c CPUInfo) Lzcnt() bool {
+	return c.Features&LZCNT != 0
+}
+
+// Popcnt indicates support of POPCNT instruction
+func (c CPUInfo) Popcnt() bool {
+	return c.Features&POPCNT != 0
+}
+
+// HTT indicates the processor has Hyperthreading enabled
+func (c CPUInfo) HTT() bool {
+	return c.Features&HTT != 0
+}
+
+// SSE2Slow indicates that SSE2 may be slow on this processor
+func (c CPUInfo) SSE2Slow() bool {
+	return c.Features&SSE2SLOW != 0
+}
+
+// SSE3Slow indicates that SSE3 may be slow on this processor
+func (c CPUInfo) SSE3Slow() bool {
+	return c.Features&SSE3SLOW != 0
+}
+
+// AesNi indicates support of AES-NI instructions
+// (Advanced Encryption Standard New Instructions)
+func (c CPUInfo) AesNi() bool {
+	return c.Features&AESNI != 0
+}
+
+// Clmul indicates support of CLMUL instructions
+// (Carry-less Multiplication)
+func (c CPUInfo) Clmul() bool {
+	return c.Features&CLMUL != 0
+}
+
+// NX indicates support of NX (No-Execute) bit
+func (c CPUInfo) NX() bool {
+	return c.Features&NX != 0
+}
+
+// SSE4A indicates support of AMD Barcelona microarchitecture SSE4a instructions
+func (c CPUInfo) SSE4A() bool {
+	return c.Features&SSE4A != 0
+}
+
+// HLE indicates support of Hardware Lock Elision
+func (c CPUInfo) HLE() bool {
+	return c.Features&HLE != 0
+}
+
+// RTM indicates support of Restricted Transactional Memory
+func (c CPUInfo) RTM() bool {
+	return c.Features&RTM != 0
+}
+
+// Rdrand indicates support of RDRAND instruction is available
+func (c CPUInfo) Rdrand() bool {
+	return c.Features&RDRAND != 0
+}
+
+// Rdseed indicates support of RDSEED instruction is available
+func (c CPUInfo) Rdseed() bool {
+	return c.Features&RDSEED != 0
+}
+
+// ADX indicates support of Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
+func (c CPUInfo) ADX() bool {
+	return c.Features&ADX != 0
+}
+
+// SHA indicates support of Intel SHA Extensions
+func (c CPUInfo) SHA() bool {
+	return c.Features&SHA != 0
+}
+
+// AVX512F indicates support of AVX-512 Foundation
+func (c CPUInfo) AVX512F() bool {
+	return c.Features&AVX512F != 0
+}
+
+// AVX512DQ indicates support of AVX-512 Doubleword and Quadword Instructions
+func (c CPUInfo) AVX512DQ() bool {
+	return c.Features&AVX512DQ != 0
+}
+
+// AVX512IFMA indicates support of AVX-512 Integer Fused Multiply-Add Instructions
+func (c CPUInfo) AVX512IFMA() bool {
+	return c.Features&AVX512IFMA != 0
+}
+
+// AVX512PF indicates support of AVX-512 Prefetch Instructions
+func (c CPUInfo) AVX512PF() bool {
+	return c.Features&AVX512PF != 0
+}
+
+// AVX512ER indicates support of AVX-512 Exponential and Reciprocal Instructions
+func (c CPUInfo) AVX512ER() bool {
+	return c.Features&AVX512ER != 0
+}
+
+// AVX512CD indicates support of AVX-512 Conflict Detection Instructions
+func (c CPUInfo) AVX512CD() bool {
+	return c.Features&AVX512CD != 0
+}
+
+// AVX512BW indicates support of AVX-512 Byte and Word Instructions
+func (c CPUInfo) AVX512BW() bool {
+	return c.Features&AVX512BW != 0
+}
+
+// AVX512VL indicates support of AVX-512 Vector Length Extensions
+func (c CPUInfo) AVX512VL() bool {
+	return c.Features&AVX512VL != 0
+}
+
+// AVX512VBMI indicates support of AVX-512 Vector Bit Manipulation Instructions
+func (c CPUInfo) AVX512VBMI() bool {
+	return c.Features&AVX512VBMI != 0
+}
+
+// MPX indicates support of Intel MPX (Memory Protection Extensions)
+func (c CPUInfo) MPX() bool {
+	return c.Features&MPX != 0
+}
+
+// ERMS indicates support of Enhanced REP MOVSB/STOSB
+func (c CPUInfo) ERMS() bool {
+	return c.Features&ERMS != 0
+}
+
+func (c CPUInfo) RDTSCP() bool {
+	return c.Features&RDTSCP != 0
+}
+
+func (c CPUInfo) CX16() bool {
+	return c.Features&CX16 != 0
+}
+
+// Atom indicates an Atom processor
+func (c CPUInfo) Atom() bool {
+	return c.Features&ATOM != 0
+}
+
+// Intel returns true if vendor is recognized as Intel
+func (c CPUInfo) Intel() bool {
+	return c.VendorID == Intel
+}
+
+// AMD returns true if vendor is recognized as AMD
+func (c CPUInfo) AMD() bool {
+	return c.VendorID == AMD
+}
+
+// Transmeta returns true if vendor is recognized as Transmeta
+func (c CPUInfo) Transmeta() bool {
+	return c.VendorID == Transmeta
+}
+
+// NSC returns true if vendor is recognized as National Semiconductor
+func (c CPUInfo) NSC() bool {
+	return c.VendorID == NSC
+}
+
+// VIA returns true if vendor is recognized as VIA
+func (c CPUInfo) VIA() bool {
+	return c.VendorID == VIA
+}
+
+// RTCounter returns the 64-bit time-stamp counter
+// Uses the RDTSCP instruction. The value 0 is returned
+// if the CPU does not support the instruction.
+func (c CPUInfo) RTCounter() uint64 {
+	if !c.RDTSCP() {
+		return 0
+	}
+	a, _, _, d := rdtscpAsm()
+	return uint64(a) | (uint64(d) << 32)
+}
+
+// Ia32TscAux returns the IA32_TSC_AUX part of the RDTSCP.
+// This variable is OS dependent, but on Linux contains information
+// about the current cpu/core the code is running on.
+// If the RDTSCP instruction isn't supported on the CPU, the value 0 is returned.
+func (c CPUInfo) Ia32TscAux() uint32 {
+	if !c.RDTSCP() {
+		return 0
+	}
+	_, _, ecx, _ := rdtscpAsm()
+	return ecx
+}
+
+// LogicalCPU will return the Logical CPU the code is currently executing on.
+// This is likely to change when the OS re-schedules the running thread
+// to another CPU.
+// If the current core cannot be detected, -1 will be returned.
+func (c CPUInfo) LogicalCPU() int {
+	if c.maxFunc < 1 {
+		return -1
+	}
+	_, ebx, _, _ := cpuid(1)
+	return int(ebx >> 24)
+}
+
+// VM Will return true if the cpu id indicates we are in
+// a virtual machine. This is only a hint, and will very likely
+// have many false negatives.
+func (c CPUInfo) VM() bool {
+	switch c.VendorID {
+	case MSVM, KVM, VMware, XenHVM:
+		return true
+	}
+	return false
+}
+
+// Flags contains detected cpu features and caracteristics
+type Flags uint64
+
+// String returns a string representation of the detected
+// CPU features.
+func (f Flags) String() string {
+	return strings.Join(f.Strings(), ",")
+}
+
+// Strings returns and array of the detected features.
+func (f Flags) Strings() []string {
+	s := support()
+	r := make([]string, 0, 20)
+	for i := uint(0); i < 64; i++ {
+		key := Flags(1 << i)
+		val := flagNames[key]
+		if s&key != 0 {
+			r = append(r, val)
+		}
+	}
+	return r
+}
+
+func maxExtendedFunction() uint32 {
+	eax, _, _, _ := cpuid(0x80000000)
+	return eax
+}
+
+func maxFunctionID() uint32 {
+	a, _, _, _ := cpuid(0)
+	return a
+}
+
+func brandName() string {
+	if maxExtendedFunction() >= 0x80000004 {
+		v := make([]uint32, 0, 48)
+		for i := uint32(0); i < 3; i++ {
+			a, b, c, d := cpuid(0x80000002 + i)
+			v = append(v, a, b, c, d)
+		}
+		return strings.Trim(string(valAsString(v...)), " ")
+	}
+	return "unknown"
+}
+
+func threadsPerCore() int {
+	mfi := maxFunctionID()
+	if mfi < 0x4 || vendorID() != Intel {
+		return 1
+	}
+
+	if mfi < 0xb {
+		_, b, _, d := cpuid(1)
+		if (d & (1 << 28)) != 0 {
+			// v will contain logical core count
+			v := (b >> 16) & 255
+			if v > 1 {
+				a4, _, _, _ := cpuid(4)
+				// physical cores
+				v2 := (a4 >> 26) + 1
+				if v2 > 0 {
+					return int(v) / int(v2)
+				}
+			}
+		}
+		return 1
+	}
+	_, b, _, _ := cpuidex(0xb, 0)
+	if b&0xffff == 0 {
+		return 1
+	}
+	return int(b & 0xffff)
+}
+
+func logicalCores() int {
+	mfi := maxFunctionID()
+	switch vendorID() {
+	case Intel:
+		// Use this on old Intel processors
+		if mfi < 0xb {
+			if mfi < 1 {
+				return 0
+			}
+			// CPUID.1:EBX[23:16] represents the maximum number of addressable IDs (initial APIC ID)
+			// that can be assigned to logical processors in a physical package.
+			// The value may not be the same as the number of logical processors that are present in the hardware of a physical package.
+			_, ebx, _, _ := cpuid(1)
+			logical := (ebx >> 16) & 0xff
+			return int(logical)
+		}
+		_, b, _, _ := cpuidex(0xb, 1)
+		return int(b & 0xffff)
+	case AMD:
+		_, b, _, _ := cpuid(1)
+		return int((b >> 16) & 0xff)
+	default:
+		return 0
+	}
+}
+
+func familyModel() (int, int) {
+	if maxFunctionID() < 0x1 {
+		return 0, 0
+	}
+	eax, _, _, _ := cpuid(1)
+	family := ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff)
+	model := ((eax >> 4) & 0xf) + ((eax >> 12) & 0xf0)
+	return int(family), int(model)
+}
+
+func physicalCores() int {
+	switch vendorID() {
+	case Intel:
+		return logicalCores() / threadsPerCore()
+	case AMD:
+		if maxExtendedFunction() >= 0x80000008 {
+			_, _, c, _ := cpuid(0x80000008)
+			return int(c&0xff) + 1
+		}
+	}
+	return 0
+}
+
+// Except from http://en.wikipedia.org/wiki/CPUID#EAX.3D0:_Get_vendor_ID
+var vendorMapping = map[string]Vendor{
+	"AMDisbetter!": AMD,
+	"AuthenticAMD": AMD,
+	"CentaurHauls": VIA,
+	"GenuineIntel": Intel,
+	"TransmetaCPU": Transmeta,
+	"GenuineTMx86": Transmeta,
+	"Geode by NSC": NSC,
+	"VIA VIA VIA ": VIA,
+	"KVMKVMKVMKVM": KVM,
+	"Microsoft Hv": MSVM,
+	"VMwareVMware": VMware,
+	"XenVMMXenVMM": XenHVM,
+}
+
+func vendorID() Vendor {
+	_, b, c, d := cpuid(0)
+	v := valAsString(b, d, c)
+	vend, ok := vendorMapping[string(v)]
+	if !ok {
+		return Other
+	}
+	return vend
+}
+
+func cacheLine() int {
+	if maxFunctionID() < 0x1 {
+		return 0
+	}
+
+	_, ebx, _, _ := cpuid(1)
+	cache := (ebx & 0xff00) >> 5 // cflush size
+	if cache == 0 && maxExtendedFunction() >= 0x80000006 {
+		_, _, ecx, _ := cpuid(0x80000006)
+		cache = ecx & 0xff // cacheline size
+	}
+	// TODO: Read from Cache and TLB Information
+	return int(cache)
+}
+
+func (c *CPUInfo) cacheSize() {
+	c.Cache.L1D = -1
+	c.Cache.L1I = -1
+	c.Cache.L2 = -1
+	c.Cache.L3 = -1
+	vendor := vendorID()
+	switch vendor {
+	case Intel:
+		if maxFunctionID() < 4 {
+			return
+		}
+		for i := uint32(0); ; i++ {
+			eax, ebx, ecx, _ := cpuidex(4, i)
+			cacheType := eax & 15
+			if cacheType == 0 {
+				break
+			}
+			cacheLevel := (eax >> 5) & 7
+			coherency := int(ebx&0xfff) + 1
+			partitions := int((ebx>>12)&0x3ff) + 1
+			associativity := int((ebx>>22)&0x3ff) + 1
+			sets := int(ecx) + 1
+			size := associativity * partitions * coherency * sets
+			switch cacheLevel {
+			case 1:
+				if cacheType == 1 {
+					// 1 = Data Cache
+					c.Cache.L1D = size
+				} else if cacheType == 2 {
+					// 2 = Instruction Cache
+					c.Cache.L1I = size
+				} else {
+					if c.Cache.L1D < 0 {
+						c.Cache.L1I = size
+					}
+					if c.Cache.L1I < 0 {
+						c.Cache.L1I = size
+					}
+				}
+			case 2:
+				c.Cache.L2 = size
+			case 3:
+				c.Cache.L3 = size
+			}
+		}
+	case AMD:
+		// Untested.
+		if maxExtendedFunction() < 0x80000005 {
+			return
+		}
+		_, _, ecx, edx := cpuid(0x80000005)
+		c.Cache.L1D = int(((ecx >> 24) & 0xFF) * 1024)
+		c.Cache.L1I = int(((edx >> 24) & 0xFF) * 1024)
+
+		if maxExtendedFunction() < 0x80000006 {
+			return
+		}
+		_, _, ecx, _ = cpuid(0x80000006)
+		c.Cache.L2 = int(((ecx >> 16) & 0xFFFF) * 1024)
+	}
+
+	return
+}
+
+type SGXSupport struct {
+	Available           bool
+	SGX1Supported       bool
+	SGX2Supported       bool
+	MaxEnclaveSizeNot64 int64
+	MaxEnclaveSize64    int64
+}
+
+func sgx(available bool) (rval SGXSupport) {
+	rval.Available = available
+
+	if !available {
+		return
+	}
+
+	a, _, _, d := cpuidex(0x12, 0)
+	rval.SGX1Supported = a&0x01 != 0
+	rval.SGX2Supported = a&0x02 != 0
+	rval.MaxEnclaveSizeNot64 = 1 << (d & 0xFF)     // pow 2
+	rval.MaxEnclaveSize64 = 1 << ((d >> 8) & 0xFF) // pow 2
+
+	return
+}
+
+func support() Flags {
+	mfi := maxFunctionID()
+	vend := vendorID()
+	if mfi < 0x1 {
+		return 0
+	}
+	rval := uint64(0)
+	_, _, c, d := cpuid(1)
+	if (d & (1 << 15)) != 0 {
+		rval |= CMOV
+	}
+	if (d & (1 << 23)) != 0 {
+		rval |= MMX
+	}
+	if (d & (1 << 25)) != 0 {
+		rval |= MMXEXT
+	}
+	if (d & (1 << 25)) != 0 {
+		rval |= SSE
+	}
+	if (d & (1 << 26)) != 0 {
+		rval |= SSE2
+	}
+	if (c & 1) != 0 {
+		rval |= SSE3
+	}
+	if (c & 0x00000200) != 0 {
+		rval |= SSSE3
+	}
+	if (c & 0x00080000) != 0 {
+		rval |= SSE4
+	}
+	if (c & 0x00100000) != 0 {
+		rval |= SSE42
+	}
+	if (c & (1 << 25)) != 0 {
+		rval |= AESNI
+	}
+	if (c & (1 << 1)) != 0 {
+		rval |= CLMUL
+	}
+	if c&(1<<23) != 0 {
+		rval |= POPCNT
+	}
+	if c&(1<<30) != 0 {
+		rval |= RDRAND
+	}
+	if c&(1<<29) != 0 {
+		rval |= F16C
+	}
+	if c&(1<<13) != 0 {
+		rval |= CX16
+	}
+	if vend == Intel && (d&(1<<28)) != 0 && mfi >= 4 {
+		if threadsPerCore() > 1 {
+			rval |= HTT
+		}
+	}
+
+	// Check XGETBV, OXSAVE and AVX bits
+	if c&(1<<26) != 0 && c&(1<<27) != 0 && c&(1<<28) != 0 {
+		// Check for OS support
+		eax, _ := xgetbv(0)
+		if (eax & 0x6) == 0x6 {
+			rval |= AVX
+			if (c & 0x00001000) != 0 {
+				rval |= FMA3
+			}
+		}
+	}
+
+	// Check AVX2, AVX2 requires OS support, but BMI1/2 don't.
+	if mfi >= 7 {
+		_, ebx, ecx, _ := cpuidex(7, 0)
+		if (rval&AVX) != 0 && (ebx&0x00000020) != 0 {
+			rval |= AVX2
+		}
+		if (ebx & 0x00000008) != 0 {
+			rval |= BMI1
+			if (ebx & 0x00000100) != 0 {
+				rval |= BMI2
+			}
+		}
+		if ebx&(1<<2) != 0 {
+			rval |= SGX
+		}
+		if ebx&(1<<4) != 0 {
+			rval |= HLE
+		}
+		if ebx&(1<<9) != 0 {
+			rval |= ERMS
+		}
+		if ebx&(1<<11) != 0 {
+			rval |= RTM
+		}
+		if ebx&(1<<14) != 0 {
+			rval |= MPX
+		}
+		if ebx&(1<<18) != 0 {
+			rval |= RDSEED
+		}
+		if ebx&(1<<19) != 0 {
+			rval |= ADX
+		}
+		if ebx&(1<<29) != 0 {
+			rval |= SHA
+		}
+
+		// Only detect AVX-512 features if XGETBV is supported
+		if c&((1<<26)|(1<<27)) == (1<<26)|(1<<27) {
+			// Check for OS support
+			eax, _ := xgetbv(0)
+
+			// Verify that XCR0[7:5] = ‘111b’ (OPMASK state, upper 256-bit of ZMM0-ZMM15 and
+			// ZMM16-ZMM31 state are enabled by OS)
+			/// and that XCR0[2:1] = ‘11b’ (XMM state and YMM state are enabled by OS).
+			if (eax>>5)&7 == 7 && (eax>>1)&3 == 3 {
+				if ebx&(1<<16) != 0 {
+					rval |= AVX512F
+				}
+				if ebx&(1<<17) != 0 {
+					rval |= AVX512DQ
+				}
+				if ebx&(1<<21) != 0 {
+					rval |= AVX512IFMA
+				}
+				if ebx&(1<<26) != 0 {
+					rval |= AVX512PF
+				}
+				if ebx&(1<<27) != 0 {
+					rval |= AVX512ER
+				}
+				if ebx&(1<<28) != 0 {
+					rval |= AVX512CD
+				}
+				if ebx&(1<<30) != 0 {
+					rval |= AVX512BW
+				}
+				if ebx&(1<<31) != 0 {
+					rval |= AVX512VL
+				}
+				// ecx
+				if ecx&(1<<1) != 0 {
+					rval |= AVX512VBMI
+				}
+			}
+		}
+	}
+
+	if maxExtendedFunction() >= 0x80000001 {
+		_, _, c, d := cpuid(0x80000001)
+		if (c & (1 << 5)) != 0 {
+			rval |= LZCNT
+			rval |= POPCNT
+		}
+		if (d & (1 << 31)) != 0 {
+			rval |= AMD3DNOW
+		}
+		if (d & (1 << 30)) != 0 {
+			rval |= AMD3DNOWEXT
+		}
+		if (d & (1 << 23)) != 0 {
+			rval |= MMX
+		}
+		if (d & (1 << 22)) != 0 {
+			rval |= MMXEXT
+		}
+		if (c & (1 << 6)) != 0 {
+			rval |= SSE4A
+		}
+		if d&(1<<20) != 0 {
+			rval |= NX
+		}
+		if d&(1<<27) != 0 {
+			rval |= RDTSCP
+		}
+
+		/* Allow for selectively disabling SSE2 functions on AMD processors
+		   with SSE2 support but not SSE4a. This includes Athlon64, some
+		   Opteron, and some Sempron processors. MMX, SSE, or 3DNow! are faster
+		   than SSE2 often enough to utilize this special-case flag.
+		   AV_CPU_FLAG_SSE2 and AV_CPU_FLAG_SSE2SLOW are both set in this case
+		   so that SSE2 is used unless explicitly disabled by checking
+		   AV_CPU_FLAG_SSE2SLOW. */
+		if vendorID() != Intel &&
+			rval&SSE2 != 0 && (c&0x00000040) == 0 {
+			rval |= SSE2SLOW
+		}
+
+		/* XOP and FMA4 use the AVX instruction coding scheme, so they can't be
+		 * used unless the OS has AVX support. */
+		if (rval & AVX) != 0 {
+			if (c & 0x00000800) != 0 {
+				rval |= XOP
+			}
+			if (c & 0x00010000) != 0 {
+				rval |= FMA4
+			}
+		}
+
+		if vendorID() == Intel {
+			family, model := familyModel()
+			if family == 6 && (model == 9 || model == 13 || model == 14) {
+				/* 6/9 (pentium-m "banias"), 6/13 (pentium-m "dothan"), and
+				 * 6/14 (core1 "yonah") theoretically support sse2, but it's
+				 * usually slower than mmx. */
+				if (rval & SSE2) != 0 {
+					rval |= SSE2SLOW
+				}
+				if (rval & SSE3) != 0 {
+					rval |= SSE3SLOW
+				}
+			}
+			/* The Atom processor has SSSE3 support, which is useful in many cases,
+			 * but sometimes the SSSE3 version is slower than the SSE2 equivalent
+			 * on the Atom, but is generally faster on other processors supporting
+			 * SSSE3. This flag allows for selectively disabling certain SSSE3
+			 * functions on the Atom. */
+			if family == 6 && model == 28 {
+				rval |= ATOM
+			}
+		}
+	}
+	return Flags(rval)
+}
+
+func valAsString(values ...uint32) []byte {
+	r := make([]byte, 4*len(values))
+	for i, v := range values {
+		dst := r[i*4:]
+		dst[0] = byte(v & 0xff)
+		dst[1] = byte((v >> 8) & 0xff)
+		dst[2] = byte((v >> 16) & 0xff)
+		dst[3] = byte((v >> 24) & 0xff)
+		switch {
+		case dst[0] == 0:
+			return r[:i*4]
+		case dst[1] == 0:
+			return r[:i*4+1]
+		case dst[2] == 0:
+			return r[:i*4+2]
+		case dst[3] == 0:
+			return r[:i*4+3]
+		}
+	}
+	return r
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_386.s b/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_386.s
new file mode 100644
index 0000000000..4d731711e4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_386.s
@@ -0,0 +1,42 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+// +build 386,!gccgo
+
+// func asmCpuid(op uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·asmCpuid(SB), 7, $0
+	XORL CX, CX
+	MOVL op+0(FP), AX
+	CPUID
+	MOVL AX, eax+4(FP)
+	MOVL BX, ebx+8(FP)
+	MOVL CX, ecx+12(FP)
+	MOVL DX, edx+16(FP)
+	RET
+
+// func asmCpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·asmCpuidex(SB), 7, $0
+	MOVL op+0(FP), AX
+	MOVL op2+4(FP), CX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
+
+// func xgetbv(index uint32) (eax, edx uint32)
+TEXT ·asmXgetbv(SB), 7, $0
+	MOVL index+0(FP), CX
+	BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
+	MOVL AX, eax+4(FP)
+	MOVL DX, edx+8(FP)
+	RET
+
+// func asmRdtscpAsm() (eax, ebx, ecx, edx uint32)
+TEXT ·asmRdtscpAsm(SB), 7, $0
+	BYTE $0x0F; BYTE $0x01; BYTE $0xF9 // RDTSCP
+	MOVL AX, eax+0(FP)
+	MOVL BX, ebx+4(FP)
+	MOVL CX, ecx+8(FP)
+	MOVL DX, edx+12(FP)
+	RET
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_amd64.s b/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_amd64.s
new file mode 100644
index 0000000000..3c1d60e422
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_amd64.s
@@ -0,0 +1,42 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+//+build amd64,!gccgo
+
+// func asmCpuid(op uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·asmCpuid(SB), 7, $0
+	XORQ CX, CX
+	MOVL op+0(FP), AX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
+
+// func asmCpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·asmCpuidex(SB), 7, $0
+	MOVL op+0(FP), AX
+	MOVL op2+4(FP), CX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
+
+// func asmXgetbv(index uint32) (eax, edx uint32)
+TEXT ·asmXgetbv(SB), 7, $0
+	MOVL index+0(FP), CX
+	BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
+	MOVL AX, eax+8(FP)
+	MOVL DX, edx+12(FP)
+	RET
+
+// func asmRdtscpAsm() (eax, ebx, ecx, edx uint32)
+TEXT ·asmRdtscpAsm(SB), 7, $0
+	BYTE $0x0F; BYTE $0x01; BYTE $0xF9 // RDTSCP
+	MOVL AX, eax+0(FP)
+	MOVL BX, ebx+4(FP)
+	MOVL CX, ecx+8(FP)
+	MOVL DX, edx+12(FP)
+	RET
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_intel.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_intel.go
new file mode 100644
index 0000000000..a5f04dd6d0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_intel.go
@@ -0,0 +1,17 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+// +build 386,!gccgo amd64,!gccgo
+
+package cpuid
+
+func asmCpuid(op uint32) (eax, ebx, ecx, edx uint32)
+func asmCpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
+func asmXgetbv(index uint32) (eax, edx uint32)
+func asmRdtscpAsm() (eax, ebx, ecx, edx uint32)
+
+func initCPU() {
+	cpuid = asmCpuid
+	cpuidex = asmCpuidex
+	xgetbv = asmXgetbv
+	rdtscpAsm = asmRdtscpAsm
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_ref.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_ref.go
new file mode 100644
index 0000000000..909c5d9a7a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_ref.go
@@ -0,0 +1,23 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+// +build !amd64,!386 gccgo
+
+package cpuid
+
+func initCPU() {
+	cpuid = func(op uint32) (eax, ebx, ecx, edx uint32) {
+		return 0, 0, 0, 0
+	}
+
+	cpuidex = func(op, op2 uint32) (eax, ebx, ecx, edx uint32) {
+		return 0, 0, 0, 0
+	}
+
+	xgetbv = func(index uint32) (eax, edx uint32) {
+		return 0, 0
+	}
+
+	rdtscpAsm = func() (eax, ebx, ecx, edx uint32) {
+		return 0, 0, 0, 0
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/generate.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/generate.go
new file mode 100644
index 0000000000..c060b8165e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/generate.go
@@ -0,0 +1,3 @@
+package cpuid
+
+//go:generate go run private-gen.go
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/private-gen.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/private-gen.go
new file mode 100644
index 0000000000..437333d292
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/cpuid/private-gen.go
@@ -0,0 +1,476 @@
+// +build ignore
+
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"go/ast"
+	"go/parser"
+	"go/printer"
+	"go/token"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+)
+
+var inFiles = []string{"cpuid.go", "cpuid_test.go"}
+var copyFiles = []string{"cpuid_amd64.s", "cpuid_386.s", "detect_ref.go", "detect_intel.go"}
+var fileSet = token.NewFileSet()
+var reWrites = []rewrite{
+	initRewrite("CPUInfo -> cpuInfo"),
+	initRewrite("Vendor -> vendor"),
+	initRewrite("Flags -> flags"),
+	initRewrite("Detect -> detect"),
+	initRewrite("CPU -> cpu"),
+}
+var excludeNames = map[string]bool{"string": true, "join": true, "trim": true,
+	// cpuid_test.go
+	"t": true, "println": true, "logf": true, "log": true, "fatalf": true, "fatal": true,
+}
+
+var excludePrefixes = []string{"test", "benchmark"}
+
+func main() {
+	Package := "private"
+	parserMode := parser.ParseComments
+	exported := make(map[string]rewrite)
+	for _, file := range inFiles {
+		in, err := os.Open(file)
+		if err != nil {
+			log.Fatalf("opening input", err)
+		}
+
+		src, err := ioutil.ReadAll(in)
+		if err != nil {
+			log.Fatalf("reading input", err)
+		}
+
+		astfile, err := parser.ParseFile(fileSet, file, src, parserMode)
+		if err != nil {
+			log.Fatalf("parsing input", err)
+		}
+
+		for _, rw := range reWrites {
+			astfile = rw(astfile)
+		}
+
+		// Inspect the AST and print all identifiers and literals.
+		var startDecl token.Pos
+		var endDecl token.Pos
+		ast.Inspect(astfile, func(n ast.Node) bool {
+			var s string
+			switch x := n.(type) {
+			case *ast.Ident:
+				if x.IsExported() {
+					t := strings.ToLower(x.Name)
+					for _, pre := range excludePrefixes {
+						if strings.HasPrefix(t, pre) {
+							return true
+						}
+					}
+					if excludeNames[t] != true {
+						//if x.Pos() > startDecl && x.Pos() < endDecl {
+						exported[x.Name] = initRewrite(x.Name + " -> " + t)
+					}
+				}
+
+			case *ast.GenDecl:
+				if x.Tok == token.CONST && x.Lparen > 0 {
+					startDecl = x.Lparen
+					endDecl = x.Rparen
+					// fmt.Printf("Decl:%s -> %s\n", fileSet.Position(startDecl), fileSet.Position(endDecl))
+				}
+			}
+			if s != "" {
+				fmt.Printf("%s:\t%s\n", fileSet.Position(n.Pos()), s)
+			}
+			return true
+		})
+
+		for _, rw := range exported {
+			astfile = rw(astfile)
+		}
+
+		var buf bytes.Buffer
+
+		printer.Fprint(&buf, fileSet, astfile)
+
+		// Remove package documentation and insert information
+		s := buf.String()
+		ind := strings.Index(buf.String(), "\npackage cpuid")
+		s = s[ind:]
+		s = "// Generated, DO NOT EDIT,\n" +
+			"// but copy it to your own project and rename the package.\n" +
+			"// See more at http://github.com/klauspost/cpuid\n" +
+			s
+
+		outputName := Package + string(os.PathSeparator) + file
+
+		err = ioutil.WriteFile(outputName, []byte(s), 0644)
+		if err != nil {
+			log.Fatalf("writing output: %s", err)
+		}
+		log.Println("Generated", outputName)
+	}
+
+	for _, file := range copyFiles {
+		dst := ""
+		if strings.HasPrefix(file, "cpuid") {
+			dst = Package + string(os.PathSeparator) + file
+		} else {
+			dst = Package + string(os.PathSeparator) + "cpuid_" + file
+		}
+		err := copyFile(file, dst)
+		if err != nil {
+			log.Fatalf("copying file: %s", err)
+		}
+		log.Println("Copied", dst)
+	}
+}
+
+// CopyFile copies a file from src to dst. If src and dst files exist, and are
+// the same, then return success. Copy the file contents from src to dst.
+func copyFile(src, dst string) (err error) {
+	sfi, err := os.Stat(src)
+	if err != nil {
+		return
+	}
+	if !sfi.Mode().IsRegular() {
+		// cannot copy non-regular files (e.g., directories,
+		// symlinks, devices, etc.)
+		return fmt.Errorf("CopyFile: non-regular source file %s (%q)", sfi.Name(), sfi.Mode().String())
+	}
+	dfi, err := os.Stat(dst)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return
+		}
+	} else {
+		if !(dfi.Mode().IsRegular()) {
+			return fmt.Errorf("CopyFile: non-regular destination file %s (%q)", dfi.Name(), dfi.Mode().String())
+		}
+		if os.SameFile(sfi, dfi) {
+			return
+		}
+	}
+	err = copyFileContents(src, dst)
+	return
+}
+
+// copyFileContents copies the contents of the file named src to the file named
+// by dst. The file will be created if it does not already exist. If the
+// destination file exists, all it's contents will be replaced by the contents
+// of the source file.
+func copyFileContents(src, dst string) (err error) {
+	in, err := os.Open(src)
+	if err != nil {
+		return
+	}
+	defer in.Close()
+	out, err := os.Create(dst)
+	if err != nil {
+		return
+	}
+	defer func() {
+		cerr := out.Close()
+		if err == nil {
+			err = cerr
+		}
+	}()
+	if _, err = io.Copy(out, in); err != nil {
+		return
+	}
+	err = out.Sync()
+	return
+}
+
+type rewrite func(*ast.File) *ast.File
+
+// Mostly copied from gofmt
+func initRewrite(rewriteRule string) rewrite {
+	f := strings.Split(rewriteRule, "->")
+	if len(f) != 2 {
+		fmt.Fprintf(os.Stderr, "rewrite rule must be of the form 'pattern -> replacement'\n")
+		os.Exit(2)
+	}
+	pattern := parseExpr(f[0], "pattern")
+	replace := parseExpr(f[1], "replacement")
+	return func(p *ast.File) *ast.File { return rewriteFile(pattern, replace, p) }
+}
+
+// parseExpr parses s as an expression.
+// It might make sense to expand this to allow statement patterns,
+// but there are problems with preserving formatting and also
+// with what a wildcard for a statement looks like.
+func parseExpr(s, what string) ast.Expr {
+	x, err := parser.ParseExpr(s)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "parsing %s %s at %s\n", what, s, err)
+		os.Exit(2)
+	}
+	return x
+}
+
+// Keep this function for debugging.
+/*
+func dump(msg string, val reflect.Value) {
+	fmt.Printf("%s:\n", msg)
+	ast.Print(fileSet, val.Interface())
+	fmt.Println()
+}
+*/
+
+// rewriteFile applies the rewrite rule 'pattern -> replace' to an entire file.
+func rewriteFile(pattern, replace ast.Expr, p *ast.File) *ast.File {
+	cmap := ast.NewCommentMap(fileSet, p, p.Comments)
+	m := make(map[string]reflect.Value)
+	pat := reflect.ValueOf(pattern)
+	repl := reflect.ValueOf(replace)
+
+	var rewriteVal func(val reflect.Value) reflect.Value
+	rewriteVal = func(val reflect.Value) reflect.Value {
+		// don't bother if val is invalid to start with
+		if !val.IsValid() {
+			return reflect.Value{}
+		}
+		for k := range m {
+			delete(m, k)
+		}
+		val = apply(rewriteVal, val)
+		if match(m, pat, val) {
+			val = subst(m, repl, reflect.ValueOf(val.Interface().(ast.Node).Pos()))
+		}
+		return val
+	}
+
+	r := apply(rewriteVal, reflect.ValueOf(p)).Interface().(*ast.File)
+	r.Comments = cmap.Filter(r).Comments() // recreate comments list
+	return r
+}
+
+// set is a wrapper for x.Set(y); it protects the caller from panics if x cannot be changed to y.
+func set(x, y reflect.Value) {
+	// don't bother if x cannot be set or y is invalid
+	if !x.CanSet() || !y.IsValid() {
+		return
+	}
+	defer func() {
+		if x := recover(); x != nil {
+			if s, ok := x.(string); ok &&
+				(strings.Contains(s, "type mismatch") || strings.Contains(s, "not assignable")) {
+				// x cannot be set to y - ignore this rewrite
+				return
+			}
+			panic(x)
+		}
+	}()
+	x.Set(y)
+}
+
+// Values/types for special cases.
+var (
+	objectPtrNil = reflect.ValueOf((*ast.Object)(nil))
+	scopePtrNil  = reflect.ValueOf((*ast.Scope)(nil))
+
+	identType     = reflect.TypeOf((*ast.Ident)(nil))
+	objectPtrType = reflect.TypeOf((*ast.Object)(nil))
+	positionType  = reflect.TypeOf(token.NoPos)
+	callExprType  = reflect.TypeOf((*ast.CallExpr)(nil))
+	scopePtrType  = reflect.TypeOf((*ast.Scope)(nil))
+)
+
+// apply replaces each AST field x in val with f(x), returning val.
+// To avoid extra conversions, f operates on the reflect.Value form.
+func apply(f func(reflect.Value) reflect.Value, val reflect.Value) reflect.Value {
+	if !val.IsValid() {
+		return reflect.Value{}
+	}
+
+	// *ast.Objects introduce cycles and are likely incorrect after
+	// rewrite; don't follow them but replace with nil instead
+	if val.Type() == objectPtrType {
+		return objectPtrNil
+	}
+
+	// similarly for scopes: they are likely incorrect after a rewrite;
+	// replace them with nil
+	if val.Type() == scopePtrType {
+		return scopePtrNil
+	}
+
+	switch v := reflect.Indirect(val); v.Kind() {
+	case reflect.Slice:
+		for i := 0; i < v.Len(); i++ {
+			e := v.Index(i)
+			set(e, f(e))
+		}
+	case reflect.Struct:
+		for i := 0; i < v.NumField(); i++ {
+			e := v.Field(i)
+			set(e, f(e))
+		}
+	case reflect.Interface:
+		e := v.Elem()
+		set(v, f(e))
+	}
+	return val
+}
+
+func isWildcard(s string) bool {
+	rune, size := utf8.DecodeRuneInString(s)
+	return size == len(s) && unicode.IsLower(rune)
+}
+
+// match returns true if pattern matches val,
+// recording wildcard submatches in m.
+// If m == nil, match checks whether pattern == val.
+func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
+	// Wildcard matches any expression.  If it appears multiple
+	// times in the pattern, it must match the same expression
+	// each time.
+	if m != nil && pattern.IsValid() && pattern.Type() == identType {
+		name := pattern.Interface().(*ast.Ident).Name
+		if isWildcard(name) && val.IsValid() {
+			// wildcards only match valid (non-nil) expressions.
+			if _, ok := val.Interface().(ast.Expr); ok && !val.IsNil() {
+				if old, ok := m[name]; ok {
+					return match(nil, old, val)
+				}
+				m[name] = val
+				return true
+			}
+		}
+	}
+
+	// Otherwise, pattern and val must match recursively.
+	if !pattern.IsValid() || !val.IsValid() {
+		return !pattern.IsValid() && !val.IsValid()
+	}
+	if pattern.Type() != val.Type() {
+		return false
+	}
+
+	// Special cases.
+	switch pattern.Type() {
+	case identType:
+		// For identifiers, only the names need to match
+		// (and none of the other *ast.Object information).
+		// This is a common case, handle it all here instead
+		// of recursing down any further via reflection.
+		p := pattern.Interface().(*ast.Ident)
+		v := val.Interface().(*ast.Ident)
+		return p == nil && v == nil || p != nil && v != nil && p.Name == v.Name
+	case objectPtrType, positionType:
+		// object pointers and token positions always match
+		return true
+	case callExprType:
+		// For calls, the Ellipsis fields (token.Position) must
+		// match since that is how f(x) and f(x...) are different.
+		// Check them here but fall through for the remaining fields.
+		p := pattern.Interface().(*ast.CallExpr)
+		v := val.Interface().(*ast.CallExpr)
+		if p.Ellipsis.IsValid() != v.Ellipsis.IsValid() {
+			return false
+		}
+	}
+
+	p := reflect.Indirect(pattern)
+	v := reflect.Indirect(val)
+	if !p.IsValid() || !v.IsValid() {
+		return !p.IsValid() && !v.IsValid()
+	}
+
+	switch p.Kind() {
+	case reflect.Slice:
+		if p.Len() != v.Len() {
+			return false
+		}
+		for i := 0; i < p.Len(); i++ {
+			if !match(m, p.Index(i), v.Index(i)) {
+				return false
+			}
+		}
+		return true
+
+	case reflect.Struct:
+		for i := 0; i < p.NumField(); i++ {
+			if !match(m, p.Field(i), v.Field(i)) {
+				return false
+			}
+		}
+		return true
+
+	case reflect.Interface:
+		return match(m, p.Elem(), v.Elem())
+	}
+
+	// Handle token integers, etc.
+	return p.Interface() == v.Interface()
+}
+
+// subst returns a copy of pattern with values from m substituted in place
+// of wildcards and pos used as the position of tokens from the pattern.
+// if m == nil, subst returns a copy of pattern and doesn't change the line
+// number information.
+func subst(m map[string]reflect.Value, pattern reflect.Value, pos reflect.Value) reflect.Value {
+	if !pattern.IsValid() {
+		return reflect.Value{}
+	}
+
+	// Wildcard gets replaced with map value.
+	if m != nil && pattern.Type() == identType {
+		name := pattern.Interface().(*ast.Ident).Name
+		if isWildcard(name) {
+			if old, ok := m[name]; ok {
+				return subst(nil, old, reflect.Value{})
+			}
+		}
+	}
+
+	if pos.IsValid() && pattern.Type() == positionType {
+		// use new position only if old position was valid in the first place
+		if old := pattern.Interface().(token.Pos); !old.IsValid() {
+			return pattern
+		}
+		return pos
+	}
+
+	// Otherwise copy.
+	switch p := pattern; p.Kind() {
+	case reflect.Slice:
+		v := reflect.MakeSlice(p.Type(), p.Len(), p.Len())
+		for i := 0; i < p.Len(); i++ {
+			v.Index(i).Set(subst(m, p.Index(i), pos))
+		}
+		return v
+
+	case reflect.Struct:
+		v := reflect.New(p.Type()).Elem()
+		for i := 0; i < p.NumField(); i++ {
+			v.Field(i).Set(subst(m, p.Field(i), pos))
+		}
+		return v
+
+	case reflect.Ptr:
+		v := reflect.New(p.Type()).Elem()
+		if elem := p.Elem(); elem.IsValid() {
+			v.Set(subst(m, elem, pos).Addr())
+		}
+		return v
+
+	case reflect.Interface:
+		v := reflect.New(p.Type()).Elem()
+		if elem := p.Elem(); elem.IsValid() {
+			v.Set(subst(m, elem, pos))
+		}
+		return v
+	}
+
+	return pattern
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore b/Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore
new file mode 100644
index 0000000000..daf913b1b3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore
@@ -0,0 +1,24 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml b/Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml
new file mode 100644
index 0000000000..977179953d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml
@@ -0,0 +1,12 @@
+language: go
+
+go:
+  - 1.3
+  - 1.4
+  - 1.5
+  - 1.6
+  - tip
+
+script: 
+ - go test -v .
+ - go test -v -race .
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE b/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE
new file mode 100644
index 0000000000..4fd5963e39
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+Copyright (c) 2015 Klaus Post
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/README.md b/Godeps/_workspace/src/github.com/klauspost/crc32/README.md
new file mode 100644
index 0000000000..440541c7ff
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/README.md
@@ -0,0 +1,84 @@
+# crc32
+CRC32 hash with x64 optimizations
+
+This package is a drop-in replacement for the standard library `hash/crc32` package, that features SSE 4.2 optimizations on x64 platforms, for a 10x speedup.
+
+[![Build Status](https://travis-ci.org/klauspost/crc32.svg?branch=master)](https://travis-ci.org/klauspost/crc32)
+
+# usage
+
+Install using `go get github.com/klauspost/crc32`. This library is based on Go 1.5 code and requires Go 1.3 or newer.
+
+Replace `import "hash/crc32"` with `import "github.com/klauspost/crc32"` and you are good to go.
+
+# changes
+
+* Dec 4, 2015: Uses the "slice-by-8" trick more extensively, which gives a 1.5 to 2.5x speedup if assembler is unavailable.
+
+
+# performance
+
+For IEEE tables (the most common), there is approximately a factor 10 speedup with "CLMUL" (Carryless multiplication) instruction:
+```
+benchmark            old ns/op     new ns/op     delta
+BenchmarkCrc32KB     99955         10258         -89.74%
+
+benchmark            old MB/s     new MB/s     speedup
+BenchmarkCrc32KB     327.83       3194.20      9.74x
+```
+
+For other tables and "CLMUL"  capable machines the performance is the same as the standard library.
+
+Here are some detailed benchmarks, comparing to go 1.5 standard library with and without assembler enabled.
+
+```
+Std:   Standard Go 1.5 library
+Crc:   Indicates IEEE type CRC.
+40B:   Size of each slice encoded.
+NoAsm: Assembler was disabled (ie. not an AMD64 or SSE 4.2+ capable machine).
+Castagnoli: Castagnoli CRC type.
+
+BenchmarkStdCrc40B-4            10000000               158 ns/op         252.88 MB/s
+BenchmarkCrc40BNoAsm-4          20000000               105 ns/op         377.38 MB/s (slice8)
+BenchmarkCrc40B-4               20000000               105 ns/op         378.77 MB/s (slice8)
+
+BenchmarkStdCrc1KB-4              500000              3604 ns/op         284.10 MB/s
+BenchmarkCrc1KBNoAsm-4           1000000              1463 ns/op         699.79 MB/s (slice8)
+BenchmarkCrc1KB-4                3000000               396 ns/op        2583.69 MB/s (asm)
+
+BenchmarkStdCrc8KB-4              200000             11417 ns/op         717.48 MB/s (slice8)
+BenchmarkCrc8KBNoAsm-4            200000             11317 ns/op         723.85 MB/s (slice8)
+BenchmarkCrc8KB-4                 500000              2919 ns/op        2805.73 MB/s (asm)
+
+BenchmarkStdCrc32KB-4              30000             45749 ns/op         716.24 MB/s (slice8)
+BenchmarkCrc32KBNoAsm-4            30000             45109 ns/op         726.42 MB/s (slice8)
+BenchmarkCrc32KB-4                100000             11497 ns/op        2850.09 MB/s (asm)
+
+BenchmarkStdNoAsmCastagnol40B-4 10000000               161 ns/op         246.94 MB/s
+BenchmarkStdCastagnoli40B-4     50000000              28.4 ns/op        1410.69 MB/s (asm)
+BenchmarkCastagnoli40BNoAsm-4   20000000               100 ns/op         398.01 MB/s (slice8)
+BenchmarkCastagnoli40B-4        50000000              28.2 ns/op        1419.54 MB/s (asm)
+
+BenchmarkStdNoAsmCastagnoli1KB-4  500000              3622 ns/op        282.67 MB/s
+BenchmarkStdCastagnoli1KB-4     10000000               144 ns/op        7099.78 MB/s (asm)
+BenchmarkCastagnoli1KBNoAsm-4    1000000              1475 ns/op         694.14 MB/s (slice8)
+BenchmarkCastagnoli1KB-4        10000000               146 ns/op        6993.35 MB/s (asm)
+
+BenchmarkStdNoAsmCastagnoli8KB-4  50000              28781 ns/op         284.63 MB/s
+BenchmarkStdCastagnoli8KB-4      1000000              1029 ns/op        7957.89 MB/s (asm)
+BenchmarkCastagnoli8KBNoAsm-4     200000             11410 ns/op         717.94 MB/s (slice8)
+BenchmarkCastagnoli8KB-4         1000000              1000 ns/op        8188.71 MB/s (asm)
+
+BenchmarkStdNoAsmCastagnoli32KB-4  10000            115426 ns/op         283.89 MB/s
+BenchmarkStdCastagnoli32KB-4      300000              4065 ns/op        8059.13 MB/s (asm)
+BenchmarkCastagnoli32KBNoAsm-4     30000             45171 ns/op         725.41 MB/s (slice8)
+BenchmarkCastagnoli32KB-4         500000              4077 ns/op        8035.89 MB/s (asm)
+```
+
+The IEEE assembler optimizations has been submitted and will be part of the Go 1.6 standard library.
+
+However, the improved use of slice-by-8 has not, but will probably be submitted for Go 1.7.
+
+# license
+
+Standard Go license. Changes are Copyright (c) 2015 Klaus Post under same conditions.
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go
new file mode 100644
index 0000000000..8d6ba5d3dc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go
@@ -0,0 +1,186 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package crc32 implements the 32-bit cyclic redundancy check, or CRC-32,
+// checksum. See http://en.wikipedia.org/wiki/Cyclic_redundancy_check for
+// information.
+//
+// Polynomials are represented in LSB-first form also known as reversed representation.
+//
+// See http://en.wikipedia.org/wiki/Mathematics_of_cyclic_redundancy_checks#Reversed_representations_and_reciprocal_polynomials
+// for information.
+package crc32
+
+import (
+	"hash"
+	"sync"
+)
+
+// The size of a CRC-32 checksum in bytes.
+const Size = 4
+
+// Predefined polynomials.
+const (
+	// IEEE is by far and away the most common CRC-32 polynomial.
+	// Used by ethernet (IEEE 802.3), v.42, fddi, gzip, zip, png, ...
+	IEEE = 0xedb88320
+
+	// Castagnoli's polynomial, used in iSCSI.
+	// Has better error detection characteristics than IEEE.
+	// http://dx.doi.org/10.1109/26.231911
+	Castagnoli = 0x82f63b78
+
+	// Koopman's polynomial.
+	// Also has better error detection characteristics than IEEE.
+	// http://dx.doi.org/10.1109/DSN.2002.1028931
+	Koopman = 0xeb31d82e
+)
+
+// Table is a 256-word table representing the polynomial for efficient processing.
+type Table [256]uint32
+
+// castagnoliTable points to a lazily initialized Table for the Castagnoli
+// polynomial. MakeTable will always return this value when asked to make a
+// Castagnoli table so we can compare against it to find when the caller is
+// using this polynomial.
+var castagnoliTable *Table
+var castagnoliTable8 *slicing8Table
+var castagnoliOnce sync.Once
+
+func castagnoliInit() {
+	castagnoliTable = makeTable(Castagnoli)
+	castagnoliTable8 = makeTable8(Castagnoli)
+}
+
+// IEEETable is the table for the IEEE polynomial.
+var IEEETable = makeTable(IEEE)
+
+// slicing8Table is array of 8 Tables
+type slicing8Table [8]Table
+
+// ieeeTable8 is the slicing8Table for IEEE
+var ieeeTable8 *slicing8Table
+var ieeeTable8Once sync.Once
+
+// MakeTable returns a Table constructed from the specified polynomial.
+// The contents of this Table must not be modified.
+func MakeTable(poly uint32) *Table {
+	switch poly {
+	case IEEE:
+		return IEEETable
+	case Castagnoli:
+		castagnoliOnce.Do(castagnoliInit)
+		return castagnoliTable
+	}
+	return makeTable(poly)
+}
+
+// makeTable returns the Table constructed from the specified polynomial.
+func makeTable(poly uint32) *Table {
+	t := new(Table)
+	for i := 0; i < 256; i++ {
+		crc := uint32(i)
+		for j := 0; j < 8; j++ {
+			if crc&1 == 1 {
+				crc = (crc >> 1) ^ poly
+			} else {
+				crc >>= 1
+			}
+		}
+		t[i] = crc
+	}
+	return t
+}
+
+// makeTable8 returns slicing8Table constructed from the specified polynomial.
+func makeTable8(poly uint32) *slicing8Table {
+	t := new(slicing8Table)
+	t[0] = *makeTable(poly)
+	for i := 0; i < 256; i++ {
+		crc := t[0][i]
+		for j := 1; j < 8; j++ {
+			crc = t[0][crc&0xFF] ^ (crc >> 8)
+			t[j][i] = crc
+		}
+	}
+	return t
+}
+
+// digest represents the partial evaluation of a checksum.
+type digest struct {
+	crc uint32
+	tab *Table
+}
+
+// New creates a new hash.Hash32 computing the CRC-32 checksum
+// using the polynomial represented by the Table.
+// Its Sum method will lay the value out in big-endian byte order.
+func New(tab *Table) hash.Hash32 { return &digest{0, tab} }
+
+// NewIEEE creates a new hash.Hash32 computing the CRC-32 checksum
+// using the IEEE polynomial.
+// Its Sum method will lay the value out in big-endian byte order.
+func NewIEEE() hash.Hash32 { return New(IEEETable) }
+
+func (d *digest) Size() int { return Size }
+
+func (d *digest) BlockSize() int { return 1 }
+
+func (d *digest) Reset() { d.crc = 0 }
+
+func update(crc uint32, tab *Table, p []byte) uint32 {
+	crc = ^crc
+	for _, v := range p {
+		crc = tab[byte(crc)^v] ^ (crc >> 8)
+	}
+	return ^crc
+}
+
+// updateSlicingBy8 updates CRC using Slicing-by-8
+func updateSlicingBy8(crc uint32, tab *slicing8Table, p []byte) uint32 {
+	crc = ^crc
+	for len(p) > 8 {
+		crc ^= uint32(p[0]) | uint32(p[1])<<8 | uint32(p[2])<<16 | uint32(p[3])<<24
+		crc = tab[0][p[7]] ^ tab[1][p[6]] ^ tab[2][p[5]] ^ tab[3][p[4]] ^
+			tab[4][crc>>24] ^ tab[5][(crc>>16)&0xFF] ^
+			tab[6][(crc>>8)&0xFF] ^ tab[7][crc&0xFF]
+		p = p[8:]
+	}
+	crc = ^crc
+	if len(p) == 0 {
+		return crc
+	}
+	return update(crc, &tab[0], p)
+}
+
+// Update returns the result of adding the bytes in p to the crc.
+func Update(crc uint32, tab *Table, p []byte) uint32 {
+	if tab == castagnoliTable {
+		return updateCastagnoli(crc, p)
+	}
+	if tab == IEEETable {
+		return updateIEEE(crc, p)
+	}
+	return update(crc, tab, p)
+}
+
+func (d *digest) Write(p []byte) (n int, err error) {
+	d.crc = Update(d.crc, d.tab, p)
+	return len(p), nil
+}
+
+func (d *digest) Sum32() uint32 { return d.crc }
+
+func (d *digest) Sum(in []byte) []byte {
+	s := d.Sum32()
+	return append(in, byte(s>>24), byte(s>>16), byte(s>>8), byte(s))
+}
+
+// Checksum returns the CRC-32 checksum of data
+// using the polynomial represented by the Table.
+func Checksum(data []byte, tab *Table) uint32 { return Update(0, tab, data) }
+
+// ChecksumIEEE returns the CRC-32 checksum of data
+// using the IEEE polynomial.
+func ChecksumIEEE(data []byte) uint32 { return updateIEEE(0, data) }
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go
new file mode 100644
index 0000000000..4827128ea0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go
@@ -0,0 +1,62 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !appengine,!gccgo
+
+package crc32
+
+// This file contains the code to call the SSE 4.2 version of the Castagnoli
+// and IEEE CRC.
+
+// haveSSE41/haveSSE42/haveCLMUL are defined in crc_amd64.s and use
+// CPUID to test for SSE 4.1, 4.2 and CLMUL support.
+func haveSSE41() bool
+func haveSSE42() bool
+func haveCLMUL() bool
+
+// castagnoliSSE42 is defined in crc_amd64.s and uses the SSE4.2 CRC32
+// instruction.
+//go:noescape
+func castagnoliSSE42(crc uint32, p []byte) uint32
+
+// ieeeCLMUL is defined in crc_amd64.s and uses the PCLMULQDQ
+// instruction as well as SSE 4.1.
+//go:noescape
+func ieeeCLMUL(crc uint32, p []byte) uint32
+
+var sse42 = haveSSE42()
+var useFastIEEE = haveCLMUL() && haveSSE41()
+
+func updateCastagnoli(crc uint32, p []byte) uint32 {
+	if sse42 {
+		return castagnoliSSE42(crc, p)
+	}
+	// only use slicing-by-8 when input is >= 16 Bytes
+	if len(p) >= 16 {
+		return updateSlicingBy8(crc, castagnoliTable8, p)
+	}
+	return update(crc, castagnoliTable, p)
+}
+
+func updateIEEE(crc uint32, p []byte) uint32 {
+	if useFastIEEE && len(p) >= 64 {
+		left := len(p) & 15
+		do := len(p) - left
+		crc = ^ieeeCLMUL(^crc, p[:do])
+		if left > 0 {
+			crc = update(crc, IEEETable, p[do:])
+		}
+		return crc
+	}
+
+	// only use slicing-by-8 when input is >= 16 Bytes
+	if len(p) >= 16 {
+		ieeeTable8Once.Do(func() {
+			ieeeTable8 = makeTable8(IEEE)
+		})
+		return updateSlicingBy8(crc, ieeeTable8, p)
+	}
+
+	return update(crc, IEEETable, p)
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s
new file mode 100644
index 0000000000..9bf05d89b8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s
@@ -0,0 +1,237 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gc
+
+#define NOSPLIT 4
+#define RODATA 8
+
+// func castagnoliSSE42(crc uint32, p []byte) uint32
+TEXT ·castagnoliSSE42(SB), NOSPLIT, $0
+	MOVL crc+0(FP), AX    // CRC value
+	MOVQ p+8(FP), SI      // data pointer
+	MOVQ p_len+16(FP), CX // len(p)
+
+	NOTL AX
+
+	// If there's less than 8 bytes to process, we do it byte-by-byte.
+	CMPQ CX, $8
+	JL   cleanup
+
+	// Process individual bytes until the input is 8-byte aligned.
+startup:
+	MOVQ SI, BX
+	ANDQ $7, BX
+	JZ   aligned
+
+	CRC32B (SI), AX
+	DECQ   CX
+	INCQ   SI
+	JMP    startup
+
+aligned:
+	// The input is now 8-byte aligned and we can process 8-byte chunks.
+	CMPQ CX, $8
+	JL   cleanup
+
+	CRC32Q (SI), AX
+	ADDQ   $8, SI
+	SUBQ   $8, CX
+	JMP    aligned
+
+cleanup:
+	// We may have some bytes left over that we process one at a time.
+	CMPQ CX, $0
+	JE   done
+
+	CRC32B (SI), AX
+	INCQ   SI
+	DECQ   CX
+	JMP    cleanup
+
+done:
+	NOTL AX
+	MOVL AX, ret+32(FP)
+	RET
+
+// func haveSSE42() bool
+TEXT ·haveSSE42(SB), NOSPLIT, $0
+	XORQ AX, AX
+	INCL AX
+	CPUID
+	SHRQ $20, CX
+	ANDQ $1, CX
+	MOVB CX, ret+0(FP)
+	RET
+
+// func haveCLMUL() bool
+TEXT ·haveCLMUL(SB), NOSPLIT, $0
+	XORQ AX, AX
+	INCL AX
+	CPUID
+	SHRQ $1, CX
+	ANDQ $1, CX
+	MOVB CX, ret+0(FP)
+	RET
+
+// func haveSSE41() bool
+TEXT ·haveSSE41(SB), NOSPLIT, $0
+	XORQ AX, AX
+	INCL AX
+	CPUID
+	SHRQ $19, CX
+	ANDQ $1, CX
+	MOVB CX, ret+0(FP)
+	RET
+
+// CRC32 polynomial data
+//
+// These constants are lifted from the
+// Linux kernel, since they avoid the costly
+// PSHUFB 16 byte reversal proposed in the
+// original Intel paper.
+DATA r2r1kp<>+0(SB)/8, $0x154442bd4
+DATA r2r1kp<>+8(SB)/8, $0x1c6e41596
+DATA r4r3kp<>+0(SB)/8, $0x1751997d0
+DATA r4r3kp<>+8(SB)/8, $0x0ccaa009e
+DATA rupolykp<>+0(SB)/8, $0x1db710641
+DATA rupolykp<>+8(SB)/8, $0x1f7011641
+DATA r5kp<>+0(SB)/8, $0x163cd6124
+
+GLOBL r2r1kp<>(SB), RODATA, $16
+GLOBL r4r3kp<>(SB), RODATA, $16
+GLOBL rupolykp<>(SB), RODATA, $16
+GLOBL r5kp<>(SB), RODATA, $8
+
+// Based on http://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
+// len(p) must be at least 64, and must be a multiple of 16.
+
+// func ieeeCLMUL(crc uint32, p []byte) uint32
+TEXT ·ieeeCLMUL(SB), NOSPLIT, $0
+	MOVL crc+0(FP), X0    // Initial CRC value
+	MOVQ p+8(FP), SI      // data pointer
+	MOVQ p_len+16(FP), CX // len(p)
+
+	MOVOU (SI), X1
+	MOVOU 16(SI), X2
+	MOVOU 32(SI), X3
+	MOVOU 48(SI), X4
+	PXOR  X0, X1
+	ADDQ  $64, SI    // buf+=64
+	SUBQ  $64, CX    // len-=64
+	CMPQ  CX, $64    // Less than 64 bytes left
+	JB    remain64
+
+	MOVOA r2r1kp<>+0(SB), X0
+
+loopback64:
+	MOVOA X1, X5
+	MOVOA X2, X6
+	MOVOA X3, X7
+	MOVOA X4, X8
+
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0, X0, X2
+	PCLMULQDQ $0, X0, X3
+	PCLMULQDQ $0, X0, X4
+
+	// Load next early
+	MOVOU (SI), X11
+	MOVOU 16(SI), X12
+	MOVOU 32(SI), X13
+	MOVOU 48(SI), X14
+
+	PCLMULQDQ $0x11, X0, X5
+	PCLMULQDQ $0x11, X0, X6
+	PCLMULQDQ $0x11, X0, X7
+	PCLMULQDQ $0x11, X0, X8
+
+	PXOR X5, X1
+	PXOR X6, X2
+	PXOR X7, X3
+	PXOR X8, X4
+
+	PXOR X11, X1
+	PXOR X12, X2
+	PXOR X13, X3
+	PXOR X14, X4
+
+	ADDQ $0x40, DI
+	ADDQ $64, SI    // buf+=64
+	SUBQ $64, CX    // len-=64
+	CMPQ CX, $64    // Less than 64 bytes left?
+	JGE  loopback64
+
+	// Fold result into a single register (X1)
+remain64:
+	MOVOA r4r3kp<>+0(SB), X0
+
+	MOVOA     X1, X5
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0x11, X0, X5
+	PXOR      X5, X1
+	PXOR      X2, X1
+
+	MOVOA     X1, X5
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0x11, X0, X5
+	PXOR      X5, X1
+	PXOR      X3, X1
+
+	MOVOA     X1, X5
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0x11, X0, X5
+	PXOR      X5, X1
+	PXOR      X4, X1
+
+	// More than 16 bytes left?
+	CMPQ CX, $16
+	JB   finish
+
+	// Encode 16 bytes
+remain16:
+	MOVOU     (SI), X10
+	MOVOA     X1, X5
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0x11, X0, X5
+	PXOR      X5, X1
+	PXOR      X10, X1
+	SUBQ      $16, CX
+	ADDQ      $16, SI
+	CMPQ      CX, $16
+	JGE       remain16
+
+finish:
+	// Fold final result into 32 bits and return it
+	PCMPEQB   X3, X3
+	PCLMULQDQ $1, X1, X0
+	PSRLDQ    $8, X1
+	PXOR      X0, X1
+
+	MOVOA X1, X2
+	MOVQ  r5kp<>+0(SB), X0
+
+	// Creates 32 bit mask. Note that we don't care about upper half.
+	PSRLQ $32, X3
+
+	PSRLDQ    $4, X2
+	PAND      X3, X1
+	PCLMULQDQ $0, X0, X1
+	PXOR      X2, X1
+
+	MOVOA rupolykp<>+0(SB), X0
+
+	MOVOA     X1, X2
+	PAND      X3, X1
+	PCLMULQDQ $0x10, X0, X1
+	PAND      X3, X1
+	PCLMULQDQ $0, X0, X1
+	PXOR      X2, X1
+
+	// PEXTRD   $1, X1, AX  (SSE 4.1)
+	BYTE $0x66; BYTE $0x0f; BYTE $0x3a
+	BYTE $0x16; BYTE $0xc8; BYTE $0x01
+	MOVL AX, ret+32(FP)
+
+	RET
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go
new file mode 100644
index 0000000000..926473e7c0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go
@@ -0,0 +1,40 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !appengine,!gccgo
+
+package crc32
+
+// This file contains the code to call the SSE 4.2 version of the Castagnoli
+// CRC.
+
+// haveSSE42 is defined in crc_amd64p32.s and uses CPUID to test for SSE 4.2
+// support.
+func haveSSE42() bool
+
+// castagnoliSSE42 is defined in crc_amd64.s and uses the SSE4.2 CRC32
+// instruction.
+//go:noescape
+func castagnoliSSE42(crc uint32, p []byte) uint32
+
+var sse42 = haveSSE42()
+
+func updateCastagnoli(crc uint32, p []byte) uint32 {
+	if sse42 {
+		return castagnoliSSE42(crc, p)
+	}
+	return update(crc, castagnoliTable, p)
+}
+
+func updateIEEE(crc uint32, p []byte) uint32 {
+	// only use slicing-by-8 when input is >= 4KB
+	if len(p) >= 4096 {
+		ieeeTable8Once.Do(func() {
+			ieeeTable8 = makeTable8(IEEE)
+		})
+		return updateSlicingBy8(crc, ieeeTable8, p)
+	}
+
+	return update(crc, IEEETable, p)
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s
new file mode 100644
index 0000000000..a578d685cc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s
@@ -0,0 +1,67 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gc
+
+#define NOSPLIT 4
+#define RODATA 8
+
+// func castagnoliSSE42(crc uint32, p []byte) uint32
+TEXT ·castagnoliSSE42(SB), NOSPLIT, $0
+	MOVL crc+0(FP), AX   // CRC value
+	MOVL p+4(FP), SI     // data pointer
+	MOVL p_len+8(FP), CX // len(p)
+
+	NOTL AX
+
+	// If there's less than 8 bytes to process, we do it byte-by-byte.
+	CMPQ CX, $8
+	JL   cleanup
+
+	// Process individual bytes until the input is 8-byte aligned.
+startup:
+	MOVQ SI, BX
+	ANDQ $7, BX
+	JZ   aligned
+
+	CRC32B (SI), AX
+	DECQ   CX
+	INCQ   SI
+	JMP    startup
+
+aligned:
+	// The input is now 8-byte aligned and we can process 8-byte chunks.
+	CMPQ CX, $8
+	JL   cleanup
+
+	CRC32Q (SI), AX
+	ADDQ   $8, SI
+	SUBQ   $8, CX
+	JMP    aligned
+
+cleanup:
+	// We may have some bytes left over that we process one at a time.
+	CMPQ CX, $0
+	JE   done
+
+	CRC32B (SI), AX
+	INCQ   SI
+	DECQ   CX
+	JMP    cleanup
+
+done:
+	NOTL AX
+	MOVL AX, ret+16(FP)
+	RET
+
+// func haveSSE42() bool
+TEXT ·haveSSE42(SB), NOSPLIT, $0
+	XORQ AX, AX
+	INCL AX
+	CPUID
+	SHRQ $20, CX
+	ANDQ $1, CX
+	MOVB CX, ret+0(FP)
+	RET
+
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go
new file mode 100644
index 0000000000..a53cf96a00
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go
@@ -0,0 +1,29 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !amd64,!amd64p32 appengine gccgo
+
+package crc32
+
+// This file contains the generic version of updateCastagnoli which does
+// slicing-by-8, or uses the fallback for very small sizes.
+
+func updateCastagnoli(crc uint32, p []byte) uint32 {
+	// only use slicing-by-8 when input is >= 16 Bytes
+	if len(p) >= 16 {
+		return updateSlicingBy8(crc, castagnoliTable8, p)
+	}
+	return update(crc, castagnoliTable, p)
+}
+
+func updateIEEE(crc uint32, p []byte) uint32 {
+	// only use slicing-by-8 when input is >= 16 Bytes
+	if len(p) >= 16 {
+		ieeeTable8Once.Do(func() {
+			ieeeTable8 = makeTable8(IEEE)
+		})
+		return updateSlicingBy8(crc, ieeeTable8, p)
+	}
+	return update(crc, IEEETable, p)
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/.gitignore b/Godeps/_workspace/src/github.com/klauspost/pgzip/.gitignore
new file mode 100644
index 0000000000..daf913b1b3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/pgzip/.gitignore
@@ -0,0 +1,24 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/.travis.yml b/Godeps/_workspace/src/github.com/klauspost/pgzip/.travis.yml
new file mode 100644
index 0000000000..6284168510
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/pgzip/.travis.yml
@@ -0,0 +1,18 @@
+language: go
+
+sudo: false
+
+os:
+  - linux
+  - osx
+
+go:
+  - 1.3
+  - 1.4
+  - 1.5
+  - 1.6
+  - tip
+
+script: 
+ - go test -v -cpu=1,2,4 .
+ - go test -v -cpu=2 -race -short .
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/GO_LICENSE b/Godeps/_workspace/src/github.com/klauspost/pgzip/GO_LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/pgzip/GO_LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/LICENSE b/Godeps/_workspace/src/github.com/klauspost/pgzip/LICENSE
new file mode 100644
index 0000000000..2bdc0d7517
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/pgzip/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Klaus Post
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/README.md b/Godeps/_workspace/src/github.com/klauspost/pgzip/README.md
new file mode 100644
index 0000000000..c312f53f73
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/pgzip/README.md
@@ -0,0 +1,115 @@
+pgzip
+=====
+
+Go parallel gzip compression/decompression. This is a fully gzip compatible drop in replacement for "compress/gzip".
+
+This will split compression into blocks that are compressed in parallel. This can be useful for compressing big amounts of data. The output is a standard gzip file.
+
+The gzip decompression is modified so it decompresses ahead of the current reader. This means that reads will be non-blocking if the decompressor can keep ahead of your code reading from it. CRC calculation also takes place in a separate goroutine.
+
+You should only use this if you are (de)compressing big amounts of data, say **more than 1MB** at the time, otherwise you will not see any benefit, and it will likely be faster to use the internal gzip library.
+
+It is important to note that this library creates and reads *standard gzip files*. You do not have to match the compressor/decompressor to get the described speedups, and the gzip files are fully compatible with other gzip readers/writers.
+
+A golang variant of this is [bgzf](https://godoc.org/github.com/biogo/hts/bgzf), which has the same feature, as well as seeking in the resulting file. The only drawback is a slightly bigger overhead compared to this and pure gzip. See a comparison below.
+
+[![GoDoc][1]][2] [![Build Status][3]][4]
+
+[1]: https://godoc.org/github.com/klauspost/pgzip?status.svg
+[2]: https://godoc.org/github.com/klauspost/pgzip
+[3]: https://travis-ci.org/klauspost/pgzip.svg
+[4]: https://travis-ci.org/klauspost/pgzip
+
+Installation
+====
+```go get github.com/klauspost/pgzip```
+
+Usage
+====
+[Godoc Doumentation](https://godoc.org/github.com/klauspost/pgzip)
+
+To use as a replacement for gzip, exchange 
+
+```import "compress/gzip"``` 
+with 
+```import gzip "github.com/klauspost/pgzip"```.
+
+# Changes
+
+* Dec 8, 2015: Decoder now supports the io.WriterTo interface, giving a speedup and less GC pressure.
+* Oct 9, 2015: Reduced allocations by ~35 by using sync.Pool. ~15% overall speedup.
+
+Changes in [github.com/klauspost/compress](https://github.com/klauspost/compress#changelog) are also carried over, so see that for more changes.
+
+## Compression
+The simplest way to use this is to simply do the same as you would when using [compress/gzip](http://golang.org/pkg/compress/gzip). 
+
+To change the block size, use the added (*pgzip.Writer).SetConcurrency(blockSize, blocks int) function. With this you can control the approximate size of your blocks, as well as how many you want to be processing in parallel. Default values for this is SetConcurrency(250000, 16), meaning blocks are split at 250000 bytes and up to 16 blocks can be processing at once before the writer blocks.
+
+
+Example:
+```
+var b bytes.Buffer
+w := gzip.NewWriter(&b)
+w.SetConcurrency(100000, 10)
+w.Write([]byte("hello, world\n"))
+w.Close()
+```
+
+To get any performance gains, you should at least be compressing more than 1 megabyte of data at the time.
+
+You should at least have a block size of 100k and at least a number of blocks that match the number of cores your would like to utilize, but about twice the number of blocks would be the best.
+
+Another side effect of this is, that it is likely to speed up your other code, since writes to the compressor only blocks if the compressor is already compressing the number of blocks you have specified. This also means you don't have worry about buffering input to the compressor.
+
+## Decompression
+
+Decompression works similar to compression. That means that you simply call pgzip the same way as you would call [compress/gzip](http://golang.org/pkg/compress/gzip). 
+
+The only difference is that if you want to specify your own readahead, you have to use `pgzip.NewReaderN(r io.Reader, blockSize, blocks int)` to get a reader with your custom blocksizes. The `blockSize` is the size of each block decoded, and `blocks` is the maximum number of blocks that is decoded ahead.
+
+See [Example on playground](http://play.golang.org/p/uHv1B5NbDh)
+
+Performance
+====
+## Compression
+
+See my blog post in [Benchmarks of Golang Gzip](https://blog.klauspost.com/go-gzipdeflate-benchmarks/).
+
+Compression cost is usually about 0.2% with default settings with a block size of 250k.
+
+Example with GOMAXPROC set to 8 (quad core with 8 hyperthreads)
+
+Content is [Matt Mahoneys 10GB corpus](http://mattmahoney.net/dc/10gb.html). Compression level 6.
+
+Compressor  | MB/sec   | speedup | size | size overhead (lower=better)
+------------|----------|---------|------|---------
+[gzip](http://golang.org/pkg/compress/gzip) (golang) | 7.21MB/s | 1.0x | 4786608902 | 0%
+[gzip](http://github.com/klauspost/compress/gzip) (klauspost) | 10.98MB/s | 1.52x | 4781331645 | -0.11%
+[pgzip](https://github.com/klauspost/pgzip) (klauspost) | 50.76MB/s|7.04x | 4784121440 | -0.052%
+[bgzf](https://godoc.org/github.com/biogo/hts/bgzf) (biogo) | 38.65MB/s | 5.36x | 4924899484 | 2.889%
+[pargzip](https://godoc.org/github.com/golang/build/pargzip) (builder) | 32.00MB/s | 4.44x | 4791226567 | 0.096%
+
+pgzip also contains a [linear time compression](https://github.com/klauspost/compress#linear-time-compression) mode, that will allow compression at ~150MB per core per second, independent of the content.
+
+See the [complete sheet](https://docs.google.com/spreadsheets/d/1nuNE2nPfuINCZJRMt6wFWhKpToF95I47XjSsc-1rbPQ/edit?usp=sharing) for different content types and compression settings.
+
+## Decompression
+
+The decompression speedup is there because it allows you to do other work while the decompression is taking place.
+
+In the example above, the numbers are as follows on a 4 CPU machine:
+
+Decompressor | Time | Speedup
+-------------|------|--------
+[gzip](http://golang.org/pkg/compress/gzip) (golang) | 1m28.85s | 0%
+[pgzip](https://github.com/klauspost/pgzip) (golang) | 43.48s | 104%
+
+But wait, since gzip decompression is inherently singlethreaded (aside from CRC calculation) how can it be more than 100% faster?  Because pgzip due to its design also acts as a buffer. When using ubuffered gzip, you are also waiting for io when you are decompressing. If the gzip decoder can keep up, it will always have data ready for your reader, and you will not be waiting for input to the gzip decompressor to complete.
+
+This is pretty much an optimal situation for pgzip, but it reflects most common usecases for CPU intensive gzip usage.
+
+I haven't included [bgzf](https://godoc.org/github.com/biogo/hts/bgzf) in this comparision, since it only can decompress files created by a compatible encoder, and therefore cannot be considered a generic gzip decompressor. But if you are able to compress your files with a bgzf compatible program, you can expect it to scale beyond 100%.
+
+#License
+This contains large portions of code from the go repository - see GO_LICENSE for more information. The changes are released under MIT License. See LICENSE for more information.
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/circle.yml b/Godeps/_workspace/src/github.com/klauspost/pgzip/circle.yml
new file mode 100644
index 0000000000..67b2b1628f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/pgzip/circle.yml
@@ -0,0 +1,7 @@
+test:
+  pre:
+    - go vet ./...
+
+  override:
+    - go test -v -cpu=1,2,4 .
+    - go test -v -cpu=2 -race -short .
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/gunzip.go b/Godeps/_workspace/src/github.com/klauspost/pgzip/gunzip.go
new file mode 100644
index 0000000000..45b846e020
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/pgzip/gunzip.go
@@ -0,0 +1,564 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package pgzip implements reading and writing of gzip format compressed files,
+// as specified in RFC 1952.
+//
+// This is a drop in replacement for "compress/gzip".
+// This will split compression into blocks that are compressed in parallel.
+// This can be useful for compressing big amounts of data.
+// The gzip decompression has not been modified, but remains in the package,
+// so you can use it as a complete replacement for "compress/gzip".
+//
+// See more at https://github.com/klauspost/pgzip
+package pgzip
+
+import (
+	"bufio"
+	"errors"
+	"hash"
+	"io"
+	"sync"
+	"time"
+
+	"github.com/klauspost/compress/flate"
+	"github.com/klauspost/crc32"
+)
+
+const (
+	gzipID1     = 0x1f
+	gzipID2     = 0x8b
+	gzipDeflate = 8
+	flagText    = 1 << 0
+	flagHdrCrc  = 1 << 1
+	flagExtra   = 1 << 2
+	flagName    = 1 << 3
+	flagComment = 1 << 4
+)
+
+func makeReader(r io.Reader) flate.Reader {
+	if rr, ok := r.(flate.Reader); ok {
+		return rr
+	}
+	return bufio.NewReader(r)
+}
+
+var (
+	// ErrChecksum is returned when reading GZIP data that has an invalid checksum.
+	ErrChecksum = errors.New("gzip: invalid checksum")
+	// ErrHeader is returned when reading GZIP data that has an invalid header.
+	ErrHeader = errors.New("gzip: invalid header")
+)
+
+// The gzip file stores a header giving metadata about the compressed file.
+// That header is exposed as the fields of the Writer and Reader structs.
+type Header struct {
+	Comment string    // comment
+	Extra   []byte    // "extra data"
+	ModTime time.Time // modification time
+	Name    string    // file name
+	OS      byte      // operating system type
+}
+
+// A Reader is an io.Reader that can be read to retrieve
+// uncompressed data from a gzip-format compressed file.
+//
+// In general, a gzip file can be a concatenation of gzip files,
+// each with its own header.  Reads from the Reader
+// return the concatenation of the uncompressed data of each.
+// Only the first header is recorded in the Reader fields.
+//
+// Gzip files store a length and checksum of the uncompressed data.
+// The Reader will return a ErrChecksum when Read
+// reaches the end of the uncompressed data if it does not
+// have the expected length or checksum.  Clients should treat data
+// returned by Read as tentative until they receive the io.EOF
+// marking the end of the data.
+type Reader struct {
+	Header
+	r            flate.Reader
+	decompressor io.ReadCloser
+	digest       hash.Hash32
+	size         uint32
+	flg          byte
+	buf          [512]byte
+	err          error
+	closeErr     chan error
+	multistream  bool
+
+	readAhead   chan read
+	roff        int // read offset
+	current     []byte
+	closeReader chan struct{}
+	lastBlock   bool
+	blockSize   int
+	blocks      int
+
+	activeRA bool       // Indication if readahead is active
+	mu       sync.Mutex // Lock for above
+
+	blockPool chan []byte
+}
+
+type read struct {
+	b   []byte
+	err error
+}
+
+// NewReader creates a new Reader reading the given reader.
+// The implementation buffers input and may read more data than necessary from r.
+// It is the caller's responsibility to call Close on the Reader when done.
+func NewReader(r io.Reader) (*Reader, error) {
+	z := new(Reader)
+	z.blocks = defaultBlocks
+	z.blockSize = defaultBlockSize
+	z.r = makeReader(r)
+	z.digest = crc32.NewIEEE()
+	z.multistream = true
+	z.blockPool = make(chan []byte, z.blocks)
+	for i := 0; i < z.blocks; i++ {
+		z.blockPool <- make([]byte, z.blockSize)
+	}
+	if err := z.readHeader(true); err != nil {
+		return nil, err
+	}
+	return z, nil
+}
+
+// NewReaderN creates a new Reader reading the given reader.
+// The implementation buffers input and may read more data than necessary from r.
+// It is the caller's responsibility to call Close on the Reader when done.
+//
+// With this you can control the approximate size of your blocks,
+// as well as how many blocks you want to have prefetched.
+//
+// Default values for this is blockSize = 250000, blocks = 16,
+// meaning up to 16 blocks of maximum 250000 bytes will be
+// prefetched.
+func NewReaderN(r io.Reader, blockSize, blocks int) (*Reader, error) {
+	z := new(Reader)
+	z.blocks = blocks
+	z.blockSize = blockSize
+	z.r = makeReader(r)
+	z.digest = crc32.NewIEEE()
+	z.multistream = true
+
+	// Account for too small values
+	if z.blocks <= 0 {
+		z.blocks = defaultBlocks
+	}
+	if z.blockSize <= 512 {
+		z.blockSize = defaultBlockSize
+	}
+	z.blockPool = make(chan []byte, z.blocks)
+	for i := 0; i < z.blocks; i++ {
+		z.blockPool <- make([]byte, z.blockSize)
+	}
+	if err := z.readHeader(true); err != nil {
+		return nil, err
+	}
+	return z, nil
+}
+
+// Reset discards the Reader z's state and makes it equivalent to the
+// result of its original state from NewReader, but reading from r instead.
+// This permits reusing a Reader rather than allocating a new one.
+func (z *Reader) Reset(r io.Reader) error {
+	z.killReadAhead()
+	z.r = makeReader(r)
+	z.digest = crc32.NewIEEE()
+	z.size = 0
+	z.err = nil
+	z.multistream = true
+
+	// Account for uninitialized values
+	if z.blocks <= 0 {
+		z.blocks = defaultBlocks
+	}
+	if z.blockSize <= 512 {
+		z.blockSize = defaultBlockSize
+	}
+
+	if z.blockPool == nil {
+		z.blockPool = make(chan []byte, z.blocks)
+		for i := 0; i < z.blocks; i++ {
+			z.blockPool <- make([]byte, z.blockSize)
+		}
+	}
+
+	return z.readHeader(true)
+}
+
+// Multistream controls whether the reader supports multistream files.
+//
+// If enabled (the default), the Reader expects the input to be a sequence
+// of individually gzipped data streams, each with its own header and
+// trailer, ending at EOF. The effect is that the concatenation of a sequence
+// of gzipped files is treated as equivalent to the gzip of the concatenation
+// of the sequence. This is standard behavior for gzip readers.
+//
+// Calling Multistream(false) disables this behavior; disabling the behavior
+// can be useful when reading file formats that distinguish individual gzip
+// data streams or mix gzip data streams with other data streams.
+// In this mode, when the Reader reaches the end of the data stream,
+// Read returns io.EOF. If the underlying reader implements io.ByteReader,
+// it will be left positioned just after the gzip stream.
+// To start the next stream, call z.Reset(r) followed by z.Multistream(false).
+// If there is no next stream, z.Reset(r) will return io.EOF.
+func (z *Reader) Multistream(ok bool) {
+	z.multistream = ok
+}
+
+// GZIP (RFC 1952) is little-endian, unlike ZLIB (RFC 1950).
+func get4(p []byte) uint32 {
+	return uint32(p[0]) | uint32(p[1])<<8 | uint32(p[2])<<16 | uint32(p[3])<<24
+}
+
+func (z *Reader) readString() (string, error) {
+	var err error
+	needconv := false
+	for i := 0; ; i++ {
+		if i >= len(z.buf) {
+			return "", ErrHeader
+		}
+		z.buf[i], err = z.r.ReadByte()
+		if err != nil {
+			return "", err
+		}
+		if z.buf[i] > 0x7f {
+			needconv = true
+		}
+		if z.buf[i] == 0 {
+			// GZIP (RFC 1952) specifies that strings are NUL-terminated ISO 8859-1 (Latin-1).
+			if needconv {
+				s := make([]rune, 0, i)
+				for _, v := range z.buf[0:i] {
+					s = append(s, rune(v))
+				}
+				return string(s), nil
+			}
+			return string(z.buf[0:i]), nil
+		}
+	}
+}
+
+func (z *Reader) read2() (uint32, error) {
+	_, err := io.ReadFull(z.r, z.buf[0:2])
+	if err != nil {
+		return 0, err
+	}
+	return uint32(z.buf[0]) | uint32(z.buf[1])<<8, nil
+}
+
+func (z *Reader) readHeader(save bool) error {
+	z.killReadAhead()
+
+	_, err := io.ReadFull(z.r, z.buf[0:10])
+	if err != nil {
+		return err
+	}
+	if z.buf[0] != gzipID1 || z.buf[1] != gzipID2 || z.buf[2] != gzipDeflate {
+		return ErrHeader
+	}
+	z.flg = z.buf[3]
+	if save {
+		z.ModTime = time.Unix(int64(get4(z.buf[4:8])), 0)
+		// z.buf[8] is xfl, ignored
+		z.OS = z.buf[9]
+	}
+	z.digest.Reset()
+	z.digest.Write(z.buf[0:10])
+
+	if z.flg&flagExtra != 0 {
+		n, err := z.read2()
+		if err != nil {
+			return err
+		}
+		data := make([]byte, n)
+		if _, err = io.ReadFull(z.r, data); err != nil {
+			return err
+		}
+		if save {
+			z.Extra = data
+		}
+	}
+
+	var s string
+	if z.flg&flagName != 0 {
+		if s, err = z.readString(); err != nil {
+			return err
+		}
+		if save {
+			z.Name = s
+		}
+	}
+
+	if z.flg&flagComment != 0 {
+		if s, err = z.readString(); err != nil {
+			return err
+		}
+		if save {
+			z.Comment = s
+		}
+	}
+
+	if z.flg&flagHdrCrc != 0 {
+		n, err := z.read2()
+		if err != nil {
+			return err
+		}
+		sum := z.digest.Sum32() & 0xFFFF
+		if n != sum {
+			return ErrHeader
+		}
+	}
+
+	z.digest.Reset()
+	z.decompressor = flate.NewReader(z.r)
+	z.doReadAhead()
+	return nil
+}
+
+func (z *Reader) killReadAhead() error {
+	z.mu.Lock()
+	defer z.mu.Unlock()
+	if z.activeRA {
+		if z.closeReader != nil {
+			close(z.closeReader)
+		}
+
+		// Wait for decompressor to be closed and return error, if any.
+		e, ok := <-z.closeErr
+		z.activeRA = false
+		if !ok {
+			// Channel is closed, so if there was any error it has already been returned.
+			return nil
+		}
+		return e
+	}
+	return nil
+}
+
+// Starts readahead.
+// Will return on error (including io.EOF)
+// or when z.closeReader is closed.
+func (z *Reader) doReadAhead() {
+	z.mu.Lock()
+	defer z.mu.Unlock()
+	z.activeRA = true
+
+	if z.blocks <= 0 {
+		z.blocks = defaultBlocks
+	}
+	if z.blockSize <= 512 {
+		z.blockSize = defaultBlockSize
+	}
+	ra := make(chan read, z.blocks)
+	z.readAhead = ra
+	closeReader := make(chan struct{}, 0)
+	z.closeReader = closeReader
+	z.lastBlock = false
+	closeErr := make(chan error, 1)
+	z.closeErr = closeErr
+	z.size = 0
+	z.roff = 0
+	z.current = nil
+	decomp := z.decompressor
+
+	go func() {
+		defer func() {
+			closeErr <- decomp.Close()
+			close(closeErr)
+			close(ra)
+		}()
+
+		// We hold a local reference to digest, since
+		// it way be changed by reset.
+		digest := z.digest
+		var wg sync.WaitGroup
+		for {
+			var buf []byte
+			select {
+			case buf = <-z.blockPool:
+			case <-closeReader:
+				return
+			}
+			buf = buf[0:z.blockSize]
+			// Try to fill the buffer
+			n, err := io.ReadFull(decomp, buf)
+			if err == io.ErrUnexpectedEOF {
+				err = nil
+			}
+			if n < len(buf) {
+				buf = buf[0:n]
+			}
+			wg.Wait()
+			wg.Add(1)
+			go func() {
+				digest.Write(buf)
+				wg.Done()
+			}()
+			z.size += uint32(n)
+
+			// If we return any error, out digest must be ready
+			if err != nil {
+				wg.Wait()
+			}
+			select {
+			case z.readAhead <- read{b: buf, err: err}:
+			case <-closeReader:
+				// Sent on close, we don't care about the next results
+				return
+			}
+			if err != nil {
+				return
+			}
+		}
+	}()
+}
+
+func (z *Reader) Read(p []byte) (n int, err error) {
+	if z.err != nil {
+		return 0, z.err
+	}
+	if len(p) == 0 {
+		return 0, nil
+	}
+
+	for {
+		if len(z.current) == 0 && !z.lastBlock {
+			read := <-z.readAhead
+
+			if read.err != nil {
+				// If not nil, the reader will have exited
+				z.closeReader = nil
+
+				if read.err != io.EOF {
+					z.err = read.err
+					return
+				}
+				if read.err == io.EOF {
+					z.lastBlock = true
+					err = nil
+				}
+			}
+			z.current = read.b
+			z.roff = 0
+		}
+		avail := z.current[z.roff:]
+		if len(p) >= len(avail) {
+			// If len(p) >= len(current), return all content of current
+			n = copy(p, avail)
+			z.blockPool <- z.current
+			z.current = nil
+			if z.lastBlock {
+				err = io.EOF
+				break
+			}
+		} else {
+			// We copy as much as there is space for
+			n = copy(p, avail)
+			z.roff += n
+		}
+		return
+	}
+
+	// Finished file; check checksum + size.
+	if _, err := io.ReadFull(z.r, z.buf[0:8]); err != nil {
+		z.err = err
+		return 0, err
+	}
+	crc32, isize := get4(z.buf[0:4]), get4(z.buf[4:8])
+	sum := z.digest.Sum32()
+	if sum != crc32 || isize != z.size {
+		z.err = ErrChecksum
+		return 0, z.err
+	}
+
+	// File is ok; should we attempt reading one more?
+	if !z.multistream {
+		return 0, io.EOF
+	}
+
+	// Is there another?
+	if err = z.readHeader(false); err != nil {
+		z.err = err
+		return
+	}
+
+	// Yes.  Reset and read from it.
+	return z.Read(p)
+}
+
+func (z *Reader) WriteTo(w io.Writer) (n int64, err error) {
+	total := int64(0)
+	for {
+		if z.err != nil {
+			return total, z.err
+		}
+		// We write both to output and digest.
+		for {
+			// Read from input
+			read := <-z.readAhead
+			if read.err != nil {
+				// If not nil, the reader will have exited
+				z.closeReader = nil
+
+				if read.err != io.EOF {
+					z.err = read.err
+					return total, z.err
+				}
+				if read.err == io.EOF {
+					z.lastBlock = true
+					err = nil
+				}
+			}
+			// Write what we got
+			n, err := w.Write(read.b)
+			if n != len(read.b) {
+				return total, io.ErrShortWrite
+			}
+			total += int64(n)
+			if err != nil {
+				return total, err
+			}
+			// Put block back
+			z.blockPool <- read.b
+			if z.lastBlock {
+				break
+			}
+		}
+
+		// Finished file; check checksum + size.
+		if _, err := io.ReadFull(z.r, z.buf[0:8]); err != nil {
+			z.err = err
+			return total, err
+		}
+		crc32, isize := get4(z.buf[0:4]), get4(z.buf[4:8])
+		sum := z.digest.Sum32()
+		if sum != crc32 || isize != z.size {
+			z.err = ErrChecksum
+			return total, z.err
+		}
+		// File is ok; should we attempt reading one more?
+		if !z.multistream {
+			return total, nil
+		}
+
+		// Is there another?
+		err = z.readHeader(false)
+		if err == io.EOF {
+			return total, nil
+		}
+		if err != nil {
+			z.err = err
+			return total, err
+		}
+	}
+}
+
+// Close closes the Reader. It does not close the underlying io.Reader.
+func (z *Reader) Close() error {
+	return z.killReadAhead()
+}
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/gzip.go b/Godeps/_workspace/src/github.com/klauspost/pgzip/gzip.go
new file mode 100644
index 0000000000..872afe7eb0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/klauspost/pgzip/gzip.go
@@ -0,0 +1,485 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package pgzip
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"hash"
+	"io"
+	"sync"
+
+	"github.com/klauspost/compress/flate"
+	"github.com/klauspost/crc32"
+)
+
+const (
+	defaultBlockSize = 250000
+	tailSize         = 16384
+	defaultBlocks    = 16
+)
+
+// These constants are copied from the flate package, so that code that imports
+// "compress/gzip" does not also have to import "compress/flate".
+const (
+	NoCompression       = flate.NoCompression
+	BestSpeed           = flate.BestSpeed
+	BestCompression     = flate.BestCompression
+	DefaultCompression  = flate.DefaultCompression
+	ConstantCompression = flate.ConstantCompression
+)
+
+// A Writer is an io.WriteCloser.
+// Writes to a Writer are compressed and written to w.
+type Writer struct {
+	Header
+	w             io.Writer
+	level         int
+	wroteHeader   bool
+	blockSize     int
+	blocks        int
+	currentBuffer []byte
+	prevTail      []byte
+	digest        hash.Hash32
+	size          int
+	closed        bool
+	buf           [10]byte
+	err           error
+	pushedErr     chan error
+	results       chan result
+	dictFlatePool *sync.Pool
+	dstPool       *sync.Pool
+}
+
+type result struct {
+	result        chan []byte
+	notifyWritten chan struct{}
+}
+
+// Use SetConcurrency to finetune the concurrency level if needed.
+//
+// With this you can control the approximate size of your blocks,
+// as well as how many you want to be processing in parallel.
+//
+// Default values for this is SetConcurrency(250000, 16),
+// meaning blocks are split at 250000 bytes and up to 16 blocks
+// can be processing at once before the writer blocks.
+func (z *Writer) SetConcurrency(blockSize, blocks int) error {
+	if blockSize <= tailSize {
+		return fmt.Errorf("gzip: block size cannot be less than or equal to %d", tailSize)
+	}
+	if blocks <= 0 {
+		return errors.New("gzip: blocks cannot be zero or less")
+	}
+	z.blockSize = blockSize
+	z.results = make(chan result, blocks)
+	z.blocks = blocks
+	return nil
+}
+
+// NewWriter returns a new Writer.
+// Writes to the returned writer are compressed and written to w.
+//
+// It is the caller's responsibility to call Close on the WriteCloser when done.
+// Writes may be buffered and not flushed until Close.
+//
+// Callers that wish to set the fields in Writer.Header must do so before
+// the first call to Write or Close. The Comment and Name header fields are
+// UTF-8 strings in Go, but the underlying format requires NUL-terminated ISO
+// 8859-1 (Latin-1). NUL or non-Latin-1 runes in those strings will lead to an
+// error on Write.
+func NewWriter(w io.Writer) *Writer {
+	z, _ := NewWriterLevel(w, DefaultCompression)
+	return z
+}
+
+// NewWriterLevel is like NewWriter but specifies the compression level instead
+// of assuming DefaultCompression.
+//
+// The compression level can be DefaultCompression, NoCompression, or any
+// integer value between BestSpeed and BestCompression inclusive. The error
+// returned will be nil if the level is valid.
+func NewWriterLevel(w io.Writer, level int) (*Writer, error) {
+	if level < ConstantCompression || level > BestCompression {
+		return nil, fmt.Errorf("gzip: invalid compression level: %d", level)
+	}
+	z := new(Writer)
+	z.SetConcurrency(defaultBlockSize, defaultBlocks)
+	z.init(w, level)
+	return z, nil
+}
+
+// This function must be used by goroutines to set an
+// error condition, since z.err access is restricted
+// to the callers goruotine.
+func (z *Writer) pushError(err error) {
+	z.pushedErr <- err
+	close(z.pushedErr)
+}
+
+func (z *Writer) init(w io.Writer, level int) {
+	digest := z.digest
+	if digest != nil {
+		digest.Reset()
+	} else {
+		digest = crc32.NewIEEE()
+	}
+
+	*z = Writer{
+		Header: Header{
+			OS: 255, // unknown
+		},
+		w:         w,
+		level:     level,
+		digest:    digest,
+		pushedErr: make(chan error, 1),
+		results:   make(chan result, z.blocks),
+		blockSize: z.blockSize,
+		blocks:    z.blocks,
+	}
+	z.dictFlatePool = &sync.Pool{
+		New: func() interface{} {
+			f, _ := flate.NewWriterDict(w, level, nil)
+			return f
+		},
+	}
+	z.dstPool = &sync.Pool{New: func() interface{} { return make([]byte, 0, z.blockSize) }}
+
+}
+
+// Reset discards the Writer z's state and makes it equivalent to the
+// result of its original state from NewWriter or NewWriterLevel, but
+// writing to w instead. This permits reusing a Writer rather than
+// allocating a new one.
+func (z *Writer) Reset(w io.Writer) {
+	if z.results != nil && !z.closed {
+		close(z.results)
+	}
+	z.SetConcurrency(defaultBlockSize, defaultBlocks)
+	z.init(w, z.level)
+}
+
+// GZIP (RFC 1952) is little-endian, unlike ZLIB (RFC 1950).
+func put2(p []byte, v uint16) {
+	p[0] = uint8(v >> 0)
+	p[1] = uint8(v >> 8)
+}
+
+func put4(p []byte, v uint32) {
+	p[0] = uint8(v >> 0)
+	p[1] = uint8(v >> 8)
+	p[2] = uint8(v >> 16)
+	p[3] = uint8(v >> 24)
+}
+
+// writeBytes writes a length-prefixed byte slice to z.w.
+func (z *Writer) writeBytes(b []byte) error {
+	if len(b) > 0xffff {
+		return errors.New("gzip.Write: Extra data is too large")
+	}
+	put2(z.buf[0:2], uint16(len(b)))
+	_, err := z.w.Write(z.buf[0:2])
+	if err != nil {
+		return err
+	}
+	_, err = z.w.Write(b)
+	return err
+}
+
+// writeString writes a UTF-8 string s in GZIP's format to z.w.
+// GZIP (RFC 1952) specifies that strings are NUL-terminated ISO 8859-1 (Latin-1).
+func (z *Writer) writeString(s string) (err error) {
+	// GZIP stores Latin-1 strings; error if non-Latin-1; convert if non-ASCII.
+	needconv := false
+	for _, v := range s {
+		if v == 0 || v > 0xff {
+			return errors.New("gzip.Write: non-Latin-1 header string")
+		}
+		if v > 0x7f {
+			needconv = true
+		}
+	}
+	if needconv {
+		b := make([]byte, 0, len(s))
+		for _, v := range s {
+			b = append(b, byte(v))
+		}
+		_, err = z.w.Write(b)
+	} else {
+		_, err = io.WriteString(z.w, s)
+	}
+	if err != nil {
+		return err
+	}
+	// GZIP strings are NUL-terminated.
+	z.buf[0] = 0
+	_, err = z.w.Write(z.buf[0:1])
+	return err
+}
+
+// compressCurrent will compress the data currently buffered
+// This should only be called from the main writer/flush/closer
+func (z *Writer) compressCurrent(flush bool) {
+	r := result{}
+	r.result = make(chan []byte, 1)
+	r.notifyWritten = make(chan struct{}, 0)
+	z.results <- r
+
+	// If block given is more than twice the block size, split it.
+	c := z.currentBuffer
+	if len(c) > z.blockSize*2 {
+		c = c[:z.blockSize]
+		go compressBlock(c, z.prevTail, *z, r)
+		z.prevTail = c[len(c)-tailSize:]
+		z.currentBuffer = z.currentBuffer[z.blockSize:]
+		z.compressCurrent(flush)
+		// Last one flushes if needed
+		return
+	}
+
+	go compressBlock(c, z.prevTail, *z, r)
+	if len(c) > tailSize {
+		z.prevTail = c[len(c)-tailSize:]
+	} else {
+		z.prevTail = nil
+	}
+	z.currentBuffer = make([]byte, 0, z.blockSize+(z.blockSize/4))
+
+	// Wait if flushing
+	if flush {
+		_ = <-r.notifyWritten
+	}
+}
+
+// Returns an error if it has been set.
+// Cannot be used by functions that are from internal goroutines.
+func (z *Writer) checkError() error {
+	if z.err != nil {
+		return z.err
+	}
+	select {
+	case err := <-z.pushedErr:
+		z.err = err
+	default:
+	}
+	return z.err
+}
+
+// Write writes a compressed form of p to the underlying io.Writer. The
+// compressed bytes are not necessarily flushed to output until
+// the Writer is closed or Flush() is called.
+//
+// The function will return quickly, if there are unused buffers.
+// The sent slice (p) is copied, and the caller is free to re-use the buffer
+// when the function returns.
+//
+// Errors that occur during compression will be reported later, and a nil error
+// does not signify that the compression succeeded (since it is most likely still running)
+// That means that the call that returns an error may not be the call that caused it.
+// Only Flush and Close functions are guaranteed to return any errors up to that point.
+func (z *Writer) Write(p []byte) (int, error) {
+	if z.checkError() != nil {
+		return 0, z.err
+	}
+	// Write the GZIP header lazily.
+	if !z.wroteHeader {
+		z.wroteHeader = true
+		z.buf[0] = gzipID1
+		z.buf[1] = gzipID2
+		z.buf[2] = gzipDeflate
+		z.buf[3] = 0
+		if z.Extra != nil {
+			z.buf[3] |= 0x04
+		}
+		if z.Name != "" {
+			z.buf[3] |= 0x08
+		}
+		if z.Comment != "" {
+			z.buf[3] |= 0x10
+		}
+		put4(z.buf[4:8], uint32(z.ModTime.Unix()))
+		if z.level == BestCompression {
+			z.buf[8] = 2
+		} else if z.level == BestSpeed {
+			z.buf[8] = 4
+		} else {
+			z.buf[8] = 0
+		}
+		z.buf[9] = z.OS
+		var n int
+		n, z.err = z.w.Write(z.buf[0:10])
+		if z.err != nil {
+			return n, z.err
+		}
+		if z.Extra != nil {
+			z.err = z.writeBytes(z.Extra)
+			if z.err != nil {
+				return n, z.err
+			}
+		}
+		if z.Name != "" {
+			z.err = z.writeString(z.Name)
+			if z.err != nil {
+				return n, z.err
+			}
+		}
+		if z.Comment != "" {
+			z.err = z.writeString(z.Comment)
+			if z.err != nil {
+				return n, z.err
+			}
+		}
+		// Start receiving data from compressors
+		go func() {
+			listen := z.results
+			for {
+				r, ok := <-listen
+				// If closed, we are finished.
+				if !ok {
+					return
+				}
+				buf := <-r.result
+				n, err := z.w.Write(buf)
+				if err != nil {
+					z.pushError(err)
+					close(r.notifyWritten)
+					return
+				}
+				if n != len(buf) {
+					z.pushError(fmt.Errorf("gzip: short write %d should be %d", n, len(buf)))
+					close(r.notifyWritten)
+					return
+				}
+				z.dstPool.Put(buf)
+				close(r.notifyWritten)
+			}
+		}()
+		z.currentBuffer = make([]byte, 0, z.blockSize+(z.blockSize/4))
+	}
+	// Handle very large writes in a loop
+	if len(p) > z.blockSize*z.blocks {
+		q := p
+		for len(q) > 0 {
+			length := len(q)
+			if length > z.blockSize {
+				length = z.blockSize
+			}
+			z.digest.Write(q[:length])
+			z.currentBuffer = append(z.currentBuffer, q[:length]...)
+			if len(z.currentBuffer) >= z.blockSize {
+				z.compressCurrent(false)
+				if z.err != nil {
+					return len(p) - len(q) - length, z.err
+				}
+			}
+			z.size += length
+			q = q[length:]
+		}
+		return len(p), z.err
+	} else {
+		z.size += len(p)
+		z.digest.Write(p)
+		z.currentBuffer = append(z.currentBuffer, p...)
+		if len(z.currentBuffer) >= z.blockSize {
+			z.compressCurrent(false)
+		}
+		return len(p), z.err
+	}
+}
+
+// Step 1: compresses buffer to buffer
+// Step 2: send writer to channel
+// Step 3: Close result channel to indicate we are done
+func compressBlock(p, prevTail []byte, z Writer, r result) {
+	defer close(r.result)
+	buf := z.dstPool.Get().([]byte)
+	dest := bytes.NewBuffer(buf[:0])
+
+	compressor := z.dictFlatePool.Get().(*flate.Writer)
+	compressor.ResetDict(dest, prevTail)
+	compressor.Write(p)
+
+	err := compressor.Flush()
+	if err != nil {
+		z.pushError(err)
+		return
+	}
+	if z.closed {
+		err = compressor.Close()
+		if err != nil {
+			z.pushError(err)
+			return
+		}
+	}
+	z.dictFlatePool.Put(compressor)
+	// Read back buffer
+	buf = dest.Bytes()
+	r.result <- buf
+}
+
+// Flush flushes any pending compressed data to the underlying writer.
+//
+// It is useful mainly in compressed network protocols, to ensure that
+// a remote reader has enough data to reconstruct a packet. Flush does
+// not return until the data has been written. If the underlying
+// writer returns an error, Flush returns that error.
+//
+// In the terminology of the zlib library, Flush is equivalent to Z_SYNC_FLUSH.
+func (z *Writer) Flush() error {
+	if z.checkError() != nil {
+		return z.err
+	}
+	if z.closed {
+		return nil
+	}
+	if !z.wroteHeader {
+		_, err := z.Write(nil)
+		if err != nil {
+			return err
+		}
+	}
+	// We send current block to compression
+	z.compressCurrent(true)
+	if z.checkError() != nil {
+		return z.err
+	}
+
+	return nil
+}
+
+// UncompressedSize will return the number of bytes written.
+// pgzip only, not a function in the official gzip package.
+func (z Writer) UncompressedSize() int {
+	return z.size
+}
+
+// Close closes the Writer, flushing any unwritten data to the underlying
+// io.Writer, but does not close the underlying io.Writer.
+func (z *Writer) Close() error {
+	if z.checkError() != nil {
+		return z.err
+	}
+	if z.closed {
+		return nil
+	}
+
+	z.closed = true
+	if !z.wroteHeader {
+		z.Write(nil)
+		if z.err != nil {
+			return z.err
+		}
+	}
+	z.compressCurrent(true)
+	if z.checkError() != nil {
+		return z.err
+	}
+	close(z.results)
+	put4(z.buf[0:4], z.digest.Sum32())
+	put4(z.buf[4:8], uint32(z.size))
+	_, z.err = z.w.Write(z.buf[0:8])
+	return z.err
+}
diff --git a/rkt/image/dockerfetcher.go b/rkt/image/dockerfetcher.go
index c41c2e3ef6..e7d71b50fa 100644
--- a/rkt/image/dockerfetcher.go
+++ b/rkt/image/dockerfetcher.go
@@ -106,7 +106,10 @@ func (f *dockerFetcher) fetch(u *url.URL) (*os.File, error) {
 	config := docker2aci.RemoteConfig{
 		Username: user,
 		Password: password,
-		Insecure: f.InsecureFlags.AllowHTTP(),
+		Insecure: d2acommon.InsecureConfig{
+			SkipVerify: f.InsecureFlags.SkipTLSCheck(),
+			AllowHTTP:  f.InsecureFlags.AllowHTTP(),
+		},
 		CommonConfig: docker2aci.CommonConfig{
 			Squash:      true,
 			OutputDir:   tmpDir,

From 4c7cd429e55a0377cb822f0168342bb51c3ec860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 13 Apr 2016 15:28:09 +0200
Subject: [PATCH 0324/1304] rkt/gc: mount stage1 on GC

It might happen that stage1 is unmounted between the time where the pod
was stopped and it is GCd. This causes the stage1 GC or the CNI
plugins not to be accessible.

To fix it, we mount stage1 from the treestore at GC time.
---
 rkt/gc.go    | 57 ++++++++++++++++++++++++++++++++++++++++++----------
 stage0/gc.go |  7 +++++--
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/rkt/gc.go b/rkt/gc.go
index b671a9db12..2911101c17 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -17,13 +17,17 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"syscall"
 	"time"
 
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/stage0"
 	"github.com/coreos/rkt/store"
+	"github.com/hashicorp/errwrap"
 	"github.com/spf13/cobra"
 )
 
@@ -191,6 +195,31 @@ func emptyGarbage() error {
 	return nil
 }
 
+func mountPodStage1(s *store.Store, p *pod) error {
+	if !p.usesOverlay() {
+		return nil
+	}
+
+	s1Id, err := p.getStage1TreeStoreID()
+	if err != nil {
+		return errwrap.Wrap(errors.New("error getting stage1 treeStoreID"), err)
+	}
+	s1rootfs := s.GetTreeStoreRootFS(s1Id)
+
+	stage1Dir := common.Stage1RootfsPath(p.path())
+	overlayDir := filepath.Join(p.path(), "overlay")
+	imgDir := filepath.Join(overlayDir, s1Id)
+	upperDir := filepath.Join(imgDir, "upper")
+	workDir := filepath.Join(imgDir, "work")
+
+	opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", s1rootfs, upperDir, workDir)
+	if err := syscall.Mount("overlay", stage1Dir, "overlay", 0, opts); err != nil {
+		return errwrap.Wrap(errors.New("error mounting stage1"), err)
+	}
+
+	return nil
+}
+
 // deletePod cleans up files and resource associated with the pod
 // pod must be under exclusive lock and be in either ExitedGarbage
 // or Garbage state
@@ -207,19 +236,25 @@ func deletePod(p *pod) {
 		}
 		defer s.Close()
 
-		// execute stage1's GC
-		stage1TreeStoreID, err := p.getStage1TreeStoreID()
-		if err != nil {
-			stderr.PrintE("error getting stage1 treeStoreID", err)
-			stderr.Print("skipping stage1 GC")
-		} else {
-			if globalFlags.Debug {
-				stage0.InitDebug()
-			}
-			stage1RootFS := s.GetTreeStoreRootFS(stage1TreeStoreID)
-			if err = stage0.GC(p.path(), p.uuid, stage1RootFS); err != nil {
+		if globalFlags.Debug {
+			stage0.InitDebug()
+		}
+
+		if err := mountPodStage1(s, p); err == nil {
+			if err = stage0.GC(p.path(), p.uuid); err != nil {
 				stderr.PrintE(fmt.Sprintf("problem performing stage1 GC on %q", p.uuid), err)
 			}
+			// an overlay fs can be mounted over itself, let's unmount it here
+			// if we mounted it before to avoid problems when running
+			// stage0.MountGC
+			if p.usesOverlay() {
+				stage1Mnt := common.Stage1RootfsPath(p.path())
+				if err := syscall.Unmount(stage1Mnt, 0); err != nil {
+					stderr.PrintE("error unmounting stage1", err)
+				}
+			}
+		} else {
+			stderr.PrintE("skipping stage1 GC", err)
 		}
 
 		// unmount all leftover mounts
diff --git a/stage0/gc.go b/stage0/gc.go
index 3bb3f8781e..3f548611a0 100644
--- a/stage0/gc.go
+++ b/stage0/gc.go
@@ -29,20 +29,23 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/coreos/rkt/common"
+
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 )
 
 // GC enters the pod by fork/exec()ing the stage1's /gc similar to /init.
 // /gc can expect to have its CWD set to the pod root.
-// stage1Path is the path of the stage1 rootfs
-func GC(pdir string, uuid *types.UUID, stage1Path string) error {
+func GC(pdir string, uuid *types.UUID) error {
 	err := unregisterPod(pdir, uuid)
 	if err != nil {
 		// Probably not worth abandoning the rest
 		log.PrintE("warning: could not unregister pod with metadata service", err)
 	}
 
+	stage1Path := common.Stage1RootfsPath(pdir)
+
 	ep, err := getStage1Entrypoint(pdir, gcEntrypoint)
 	if err != nil {
 		return errwrap.Wrap(errors.New("error determining 'gc' entrypoint"), err)

From 3d0eff1f631407e72174bbd13590953fe5c15275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 26 May 2016 16:10:19 +0200
Subject: [PATCH 0325/1304] functional tests: add GC-after-unmount test

---
 tests/rkt_gc_test.go | 74 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 13 deletions(-)

diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 00a1c83e78..3dd4b9b780 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -21,8 +21,10 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"syscall"
 	"testing"
 
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/tests/testutils"
 )
 
@@ -45,32 +47,78 @@ func TestGC(t *testing.T) {
 	gcCmd := fmt.Sprintf("%s gc --mark-only=true --expire-prepared=0 --grace-period=0", ctx.Cmd())
 	spawnAndWaitOrFail(t, gcCmd, 0)
 
+	pods := podsRemaining(t, ctx)
+	if len(pods) == 0 {
+		t.Fatalf("pods should still be present in rkt's data directory")
+	}
+
+	gcCmd = fmt.Sprintf("%s gc --mark-only=false --expire-prepared=0 --grace-period=0", ctx.Cmd())
+	spawnAndWaitOrFail(t, gcCmd, 0)
+
+	pods = podsRemaining(t, ctx)
+	if len(pods) != 0 {
+		t.Fatalf("no pods should exist rkt's data directory, but found: %v", pods)
+	}
+}
+
+func podsRemaining(t *testing.T, ctx *testutils.RktRunCtx) []os.FileInfo {
 	gcDirs := []string{
 		filepath.Join(ctx.DataDir(), "pods", "exited-garbage"),
 		filepath.Join(ctx.DataDir(), "pods", "prepared"),
 		filepath.Join(ctx.DataDir(), "pods", "garbage"),
+		filepath.Join(ctx.DataDir(), "pods", "run"),
 	}
 
+	var remainingPods []os.FileInfo
 	for _, dir := range gcDirs {
 		pods, err := ioutil.ReadDir(dir)
 		if err != nil {
 			t.Fatalf("cannot read gc directory %q: %v", dir, err)
 		}
-		if len(pods) == 0 {
-			t.Fatalf("pods should still exist in directory %q", dir)
-		}
+		remainingPods = append(remainingPods, pods...)
 	}
 
-	gcCmd = fmt.Sprintf("%s gc --mark-only=false --expire-prepared=0 --grace-period=0", ctx.Cmd())
-	spawnAndWaitOrFail(t, gcCmd, 0)
+	return remainingPods
+}
 
-	for _, dir := range gcDirs {
-		pods, err := ioutil.ReadDir(dir)
-		if err != nil {
-			t.Fatalf("cannot read gc directory %q: %v", dir, err)
-		}
-		if len(pods) != 0 {
-			t.Fatalf("no pods should exist in directory %q, but found: %v", dir, pods)
-		}
+func TestGCAfterUnmount(t *testing.T) {
+	if !common.SupportsOverlay() {
+		t.Skip("Overlay fs not supported.")
+	}
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	imagePath := patchImportAndFetchHash("inspect-gc-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
+	defer os.Remove(imagePath)
+	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
+	uuid := runRktAndGetUUID(t, cmd)
+
+	cmd = fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), uuid)
+	runRktAndCheckOutput(t, cmd, "", false)
+
+	stage1MntPath := filepath.Join(ctx.DataDir(), "pods", "run", uuid, "stage1", "rootfs")
+	stage2MntPath := filepath.Join(stage1MntPath, "opt", "stage2", "rkt-inspect", "rootfs")
+
+	if err := syscall.Unmount(stage2MntPath, 0); err != nil {
+		t.Fatalf("cannot umount stage2: %v", err)
+	}
+
+	if err := syscall.Unmount(stage1MntPath, 0); err != nil {
+		t.Fatalf("cannot umount stage1: %v", err)
+	}
+
+	pods := podsRemaining(t, ctx)
+	if len(pods) == 0 {
+		t.Fatalf("pods should still be present in rkt's data directory")
+	}
+
+	gcCmd := fmt.Sprintf("%s gc --mark-only=false --expire-prepared=0 --grace-period=0", ctx.Cmd())
+	// check we don't get any output (an error) after "executing net-plugin..."
+	runRktAndCheckRegexOutput(t, gcCmd, `executing net-plugin .*\n\z`)
+
+	pods = podsRemaining(t, ctx)
+	if len(pods) != 0 {
+		t.Fatalf("no pods should exist rkt's data directory, but found: %v", pods)
 	}
 }

From aef9bc41cdf40909957cd6042aa62fe4569beeb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 26 May 2016 16:52:50 +0200
Subject: [PATCH 0326/1304] functional tests: test GC with netns unmounted and
 rm'd

---
 tests/rkt_gc_test.go | 67 ++++++++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 3dd4b9b780..9c1a6e1920 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -89,36 +89,55 @@ func TestGCAfterUnmount(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	imagePath := patchImportAndFetchHash("inspect-gc-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
-	defer os.Remove(imagePath)
-	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
-	uuid := runRktAndGetUUID(t, cmd)
+	for _, rmNetns := range []bool{false, true} {
 
-	cmd = fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), uuid)
-	runRktAndCheckOutput(t, cmd, "", false)
+		imagePath := patchImportAndFetchHash("inspect-gc-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
+		defer os.Remove(imagePath)
+		cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
+		uuid := runRktAndGetUUID(t, cmd)
 
-	stage1MntPath := filepath.Join(ctx.DataDir(), "pods", "run", uuid, "stage1", "rootfs")
-	stage2MntPath := filepath.Join(stage1MntPath, "opt", "stage2", "rkt-inspect", "rootfs")
+		cmd = fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), uuid)
+		runRktAndCheckOutput(t, cmd, "", false)
 
-	if err := syscall.Unmount(stage2MntPath, 0); err != nil {
-		t.Fatalf("cannot umount stage2: %v", err)
-	}
+		podDir := filepath.Join(ctx.DataDir(), "pods", "run", uuid)
+		stage1MntPath := filepath.Join(podDir, "stage1", "rootfs")
+		stage2MntPath := filepath.Join(stage1MntPath, "opt", "stage2", "rkt-inspect", "rootfs")
+		netnsPath := filepath.Join(podDir, "netns")
+		podNetNSPathBytes, err := ioutil.ReadFile(netnsPath)
+		if err != nil {
+			t.Fatalf(`cannot read "netns" stage1: %v`, err)
+		}
+		podNetNSPath := string(podNetNSPathBytes)
 
-	if err := syscall.Unmount(stage1MntPath, 0); err != nil {
-		t.Fatalf("cannot umount stage1: %v", err)
-	}
+		if err := syscall.Unmount(stage2MntPath, 0); err != nil {
+			t.Fatalf("cannot umount stage2: %v", err)
+		}
 
-	pods := podsRemaining(t, ctx)
-	if len(pods) == 0 {
-		t.Fatalf("pods should still be present in rkt's data directory")
-	}
+		if err := syscall.Unmount(stage1MntPath, 0); err != nil {
+			t.Fatalf("cannot umount stage1: %v", err)
+		}
 
-	gcCmd := fmt.Sprintf("%s gc --mark-only=false --expire-prepared=0 --grace-period=0", ctx.Cmd())
-	// check we don't get any output (an error) after "executing net-plugin..."
-	runRktAndCheckRegexOutput(t, gcCmd, `executing net-plugin .*\n\z`)
+		if err := syscall.Unmount(podNetNSPath, 0); err != nil {
+			t.Fatalf("cannot umount pod netns: %v", err)
+		}
+
+		if rmNetns {
+			_ = os.RemoveAll(podNetNSPath)
+		}
+
+		pods := podsRemaining(t, ctx)
+		if len(pods) == 0 {
+			t.Fatalf("pods should still be present in rkt's data directory")
+		}
+
+		gcCmd := fmt.Sprintf("%s gc --mark-only=false --expire-prepared=0 --grace-period=0", ctx.Cmd())
+		// check we don't get any output (an error) after "executing net-plugin..."
+		runRktAndCheckRegexOutput(t, gcCmd, `executing net-plugin .*\n\z`)
+
+		pods = podsRemaining(t, ctx)
+		if len(pods) != 0 {
+			t.Fatalf("no pods should exist rkt's data directory, but found: %v", pods)
+		}
 
-	pods = podsRemaining(t, ctx)
-	if len(pods) != 0 {
-		t.Fatalf("no pods should exist rkt's data directory, but found: %v", pods)
 	}
 }

From 9672eab34be045bbf4cead38d5184cbe679e9e1a Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 27 May 2016 12:29:08 +0200
Subject: [PATCH 0327/1304] docs: re-order some steps in the release process

---
 Documentation/devel/release.md | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index d6950fcfd6..8e6fdeae59 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -10,21 +10,22 @@ Let's get started:
 
 - Start at the relevant milestone on GitHub (e.g. https://github.com/coreos/rkt/milestones/v1.2.0): ensure all referenced issues are closed (or moved elsewhere, if they're not done). Close the milestone.
 - Update the [roadmap](https://github.com/coreos/rkt/blob/master/ROADMAP.md) to remove the release you're performing, if necessary
+- Ensure that `stage1/aci/aci-manifest.in` is the same version of appc/spec vendored with rkt. Otherwise, update it.
 - Branch from the latest master, make sure your git status is clean
 - Ensure the build is clean!
   - `git clean -ffdx && ./autogen.sh && ./configure --enable-tpm=no --enable-functional-tests && make && make check` should work
   - Integration tests on CI should be green
 - Update the [release notes](https://github.com/coreos/rkt/blob/master/CHANGELOG.md).
   Try to capture most of the salient changes since the last release, but don't go into unnecessary detail (better to link/reference the documentation wherever possible).
+  `scripts/changelog.sh` will help generating an initial list of changes. Correct/fix entries if necessary, and group them by category.
 
 The rkt version is [hardcoded in the repository](https://github.com/coreos/rkt/blob/master/configure.ac#L2), so the first thing to do is bump it:
 
 - Run `scripts/bump-release v1.2.0`.
-  This should generate two commits: a bump to the actual release (e.g. v1.2.0), and then a bump to the release+git (e.g. v1.2.0+git).
+  This should generate two commits: a bump to the actual release (e.g. v1.2.0, including CHANGELOG updates), and then a bump to the release+git (e.g. v1.2.0+git).
   The actual release version should only exist in a single commit!
 - Sanity check what the script did with `git diff HEAD^^` or similar.
   As well as changing the actual version, it also attempts to fix a bunch of references in the documentation etc.
-- Fix the commit `HEAD^` so that the version in `stage1/aci/aci-manifest.in` is the version of appc/spec vendored with rkt.
 - If the script didn't work, yell at the author and/or fix it.
   It can almost certainly be improved.
 - File a PR and get a review from another [MAINTAINER](https://github.com/coreos/rkt/blob/master/MAINTAINERS).
@@ -97,30 +98,3 @@ Make sure to include a list of authors that contributed since the previous relea
 ```
 	git log v1.1.0..v1.2.0 --pretty=format:"%an" | sort | uniq | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $#\n#'
 ```
-
-Add `CHANGELOG.md` entries:
-
-- Add a new version headline and a meaningful release summary:
-
-```
-## v1.2.0
-
-This release includes a number of new features and bugfixes like a new config subcommand, man page, and bash completion generation during build time.
-```
-
-- Execute `scripts/changelog.sh`
-- Copy/Paste the generated entries into `CHANGELOG.md`
-- Group the generated entries according to the following headlines:
-
-```
-#### New features and UX changes
-...
-#### Improved documentation
-...
-#### Bug fixes
-...
-#### Other changes
-...
-```
-
-- Correct/fix the changelog entries if necessary.

From d6f2def58dfdd2dca5c9295955704ef689383dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 27 May 2016 12:13:13 +0200
Subject: [PATCH 0328/1304] functional tests: simplify gc/rm tests

---
 tests/rkt_gc_nspawn_test.go |  3 +--
 tests/rkt_gc_test.go        | 12 ++++++------
 tests/rkt_rm_nspawn_test.go |  4 +---
 tests/rkt_rm_test.go        |  3 +--
 tests/rkt_tests.go          | 10 ++++++++++
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/tests/rkt_gc_nspawn_test.go b/tests/rkt_gc_nspawn_test.go
index 5324ba0b4c..72e7ce4dad 100644
--- a/tests/rkt_gc_nspawn_test.go
+++ b/tests/rkt_gc_nspawn_test.go
@@ -47,8 +47,7 @@ func TestGCCgroup(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	imagePath := patchImportAndFetchHash("inspect-gc-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
-	defer os.Remove(imagePath)
+	imagePath := getInspectImagePath()
 	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
 	uuid := runRktAndGetUUID(t, cmd)
 	shortUUID := strings.Split(uuid, "-")[0]
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 9c1a6e1920..2e4f36e94a 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -32,15 +32,14 @@ func TestGC(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
+	imagePath := getInspectImagePath()
 	// Finished pods.
-	patchImportAndRun("inspect-gc-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
+	importImageAndRun(imagePath, t, ctx)
 
 	// Prepared pods.
-	patchImportAndPrepare("inspect-gc-test-prepare.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
+	importImageAndPrepare(imagePath, t, ctx)
 
 	// Abort prepare.
-	imagePath := patchTestACI("inspect-gc-test-abort.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}...)
-	defer os.Remove(imagePath)
 	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s %s", ctx.Cmd(), imagePath, imagePath)
 	spawnAndWaitOrFail(t, cmd, 1)
 
@@ -89,10 +88,11 @@ func TestGCAfterUnmount(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
+	imagePath := getInspectImagePath()
+
 	for _, rmNetns := range []bool{false, true} {
 
-		imagePath := patchImportAndFetchHash("inspect-gc-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
-		defer os.Remove(imagePath)
+		importImageAndFetchHash(t, ctx, "", imagePath)
 		cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
 		uuid := runRktAndGetUUID(t, cmd)
 
diff --git a/tests/rkt_rm_nspawn_test.go b/tests/rkt_rm_nspawn_test.go
index eb7e3205c1..6326241fe1 100644
--- a/tests/rkt_rm_nspawn_test.go
+++ b/tests/rkt_rm_nspawn_test.go
@@ -18,7 +18,6 @@ package main
 
 import (
 	"fmt"
-	"os"
 	"strings"
 	"testing"
 
@@ -29,8 +28,7 @@ func TestRmCgroup(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	imagePath := patchImportAndFetchHash("inspect-rm-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}, t, ctx)
-	defer os.Remove(imagePath)
+	imagePath := getInspectImagePath()
 	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
 	uuid := runRktAndGetUUID(t, cmd)
 	shortUUID := strings.Split(uuid, "-")[0]
diff --git a/tests/rkt_rm_test.go b/tests/rkt_rm_test.go
index 38ef516001..c8c4b3a682 100644
--- a/tests/rkt_rm_test.go
+++ b/tests/rkt_rm_test.go
@@ -32,8 +32,7 @@ func TestRm(t *testing.T) {
 
 	var uuids []string
 
-	img := patchTestACI("inspect-rm-test-run.aci", []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}...)
-	defer os.Remove(img)
+	img := getInspectImagePath()
 	prepareCmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), img)
 
 	// Finished pod.
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 93d1670594..afea7a96fc 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -225,6 +225,16 @@ func importImageAndFetchHash(t *testing.T, ctx *testutils.RktRunCtx, fetchArgs s
 	return importImageAndFetchHashAsGid(t, ctx, fetchArgs, img, 0)
 }
 
+func importImageAndRun(imagePath string, t *testing.T, ctx *testutils.RktRunCtx) {
+	cmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), imagePath)
+	spawnAndWaitOrFail(t, cmd, 0)
+}
+
+func importImageAndPrepare(imagePath string, t *testing.T, ctx *testutils.RktRunCtx) {
+	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
+	spawnAndWaitOrFail(t, cmd, 0)
+}
+
 func patchImportAndFetchHash(image string, patches []string, t *testing.T, ctx *testutils.RktRunCtx) string {
 	imagePath := patchTestACI(image, patches...)
 	defer os.Remove(imagePath)

From 96f418f58aa82bc15c305ba42904aa6a59d59daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 19 May 2016 10:56:32 +0200
Subject: [PATCH 0329/1304] *: add libsystemd-journal-dev dependency

---
 .travis.yml                        | 3 +++
 Documentation/dependencies.md      | 2 ++
 configure.ac                       | 6 ++++++
 scripts/acbuild-rkt-builder.sh     | 2 +-
 scripts/install-common.sh          | 2 +-
 scripts/install-deps-debian-sid.sh | 2 +-
 scripts/install-deps-fedora-22.sh  | 2 +-
 tests/cloudinit/centos.cloudinit   | 2 +-
 tests/cloudinit/fedora.cloudinit   | 2 +-
 tests/cloudinit/ubuntu.cloudinit   | 2 +-
 tests/install-deps.sh              | 2 +-
 11 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a61b4039b6..ad3e395521 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 # Configures rkt tests at Travis CI (https://travis-ci.org).
 
 language: go
+sudo: required
+dist: trusty
 
 go:
   - 1.5.3
@@ -11,6 +13,7 @@ install:
  - sudo apt-get install -y cpio realpath squashfs-tools
  - sudo apt-get install -y build-essential
  - sudo apt-get install -y libacl1-dev
+ - sudo apt-get install -y libsystemd-journal-dev
 
 script:
  - ./autogen.sh
diff --git a/Documentation/dependencies.md b/Documentation/dependencies.md
index f8339a7a79..00e7350b10 100644
--- a/Documentation/dependencies.md
+++ b/Documentation/dependencies.md
@@ -20,6 +20,8 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
 * TrouSerS (only when TPM is enabled)
   * development headers
   * the rkt binary links against the library
+* libsystemd-journal
+  * development headers
 * gpg (when running functional tests)
 
 ### Additional dependencies when building any stage1 image
diff --git a/configure.ac b/configure.ac
index dce34b5c9c..8fe006bde7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -563,6 +563,12 @@ AC_CHECK_LIB([c], [fork],
 # Check whether we can build TPM support code
 AC_CHECK_HEADER(trousers/tss.h, [HAVE_TPM=yes], [HAVE_TPM=no], [AC_INCLUDES_DEFAULT])
 
+# Check whether we have libsystemd-journal (needed by the API server)
+AC_CHECK_HEADER([systemd/sd-journal.h],
+                           [],
+                           [AC_MSG_ERROR([*** No development headers for libsystemd-journal found])],
+                           [AC_INCLUDES_DEFAULT])
+
 TPM_TAGS=''
 AS_CASE([${RKT_ENABLE_TPM}],
         [no],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index d3bb62a776..41eabfa9f7 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -23,7 +23,7 @@ BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
 ACI_GOPATH=/go
 
-DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev"
+DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libsystemd-dev"
 
 acbuildend () {
     export EXIT=$?;
diff --git a/scripts/install-common.sh b/scripts/install-common.sh
index c3bb61775b..a94468e305 100755
--- a/scripts/install-common.sh
+++ b/scripts/install-common.sh
@@ -4,7 +4,7 @@ set -e
 export DEBIAN_FRONTEND=noninteractive
 
 apt-get update
-apt-get install -y --no-install-recommends ca-certificates gcc libc6-dev make automake wget git coreutils cpio squashfs-tools realpath autoconf file libacl1-dev libtspi-dev bc
+apt-get install -y --no-install-recommends ca-certificates gcc libc6-dev make automake wget git coreutils cpio squashfs-tools realpath autoconf file libacl1-dev libtspi-dev bc libsystemd-dev
 
 ./scripts/install-go.sh
 . /etc/profile
diff --git a/scripts/install-deps-debian-sid.sh b/scripts/install-deps-debian-sid.sh
index b4edb2c102..a6755ecdfa 100755
--- a/scripts/install-deps-debian-sid.sh
+++ b/scripts/install-deps-debian-sid.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libtspi-dev"
+DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libtspi-dev libsystemd-dev"
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
diff --git a/scripts/install-deps-fedora-22.sh b/scripts/install-deps-fedora-22.sh
index d29bedfc16..adea45ba7f 100755
--- a/scripts/install-deps-fedora-22.sh
+++ b/scripts/install-deps-fedora-22.sh
@@ -2,6 +2,6 @@
 
 set -e
 
-FEDORA22_DEPS="make gcc glibc-devel glibc-static cpio squashfs-tools gpg autoconf automake golang file git wget tar xz patch bc hostname findutils openssl libacl-devel openssl-devel"
+FEDORA22_DEPS="make gcc glibc-devel glibc-static cpio squashfs-tools gpg autoconf automake golang file git wget tar xz patch bc hostname findutils openssl libacl-devel openssl-devel systemd-devel"
 
 dnf install -y ${FEDORA22_DEPS}
diff --git a/tests/cloudinit/centos.cloudinit b/tests/cloudinit/centos.cloudinit
index 5e65d4abe1..c0956a12ae 100644
--- a/tests/cloudinit/centos.cloudinit
+++ b/tests/cloudinit/centos.cloudinit
@@ -13,7 +13,7 @@ gpasswd -a centos rkt
 
 #yum update -y
 yum -y -v groupinstall "Development Tools"
-yum -y -v install wget squashfs-tools patch glibc-static gnupg libacl-devel
+yum -y -v install wget squashfs-tools patch glibc-static gnupg libacl-devel systemd-devel
 
 pushd /tmp
 wget https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz
diff --git a/tests/cloudinit/fedora.cloudinit b/tests/cloudinit/fedora.cloudinit
index aa900ef3d9..6bcbe179a9 100644
--- a/tests/cloudinit/fedora.cloudinit
+++ b/tests/cloudinit/fedora.cloudinit
@@ -25,7 +25,7 @@ gpasswd -a fedora rkt
 dnf -y -v update
 dnf -y -v groupinstall "Development Tools"
 dnf -y -v groupinstall "C Development Tools and Libraries"
-dnf -y -v install wget squashfs-tools patch glibc-static gnupg golang libacl-devel file
+dnf -y -v install wget squashfs-tools patch glibc-static gnupg golang libacl-devel file systemd-devel
 # systemd-container only available in newer versions of Fedora
 dnf -y -v install systemd-container || true
 
diff --git a/tests/cloudinit/ubuntu.cloudinit b/tests/cloudinit/ubuntu.cloudinit
index 22f848ec36..f5141cf24c 100644
--- a/tests/cloudinit/ubuntu.cloudinit
+++ b/tests/cloudinit/ubuntu.cloudinit
@@ -16,7 +16,7 @@ gpasswd -a ubuntu rkt
 apt-get update -y
 apt-get dist-upgrade -y --force-yes
 apt-get install -y build-essential autoconf
-apt-get install -y wget squashfs-tools patch gnupg golang libacl1-dev systemd-container
+apt-get install -y wget squashfs-tools patch gnupg golang libacl1-dev systemd-container libsystemd-dev
 
 su - ubuntu --command="cd /var/tmp ; git clone --branch @GIT_BRANCH@ @GIT_URL@ rkt"
 su - ubuntu --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/build-and-run-tests.sh -f @FLAVOR@"
diff --git a/tests/install-deps.sh b/tests/install-deps.sh
index 51baffa4f4..d9c40a6bae 100755
--- a/tests/install-deps.sh
+++ b/tests/install-deps.sh
@@ -25,7 +25,7 @@ if [ "${CI-}" == true ] ; then
 		# install -y <dep>" after it.
 
 		sudo apt-get update -qq || true
-		sudo apt-get install -y libacl1-dev bc
+		sudo apt-get install -y libacl1-dev bc libsystemd-journal-dev
 
 		# libmount: https://github.com/systemd/systemd/pull/986#issuecomment-138451264
 		sudo add-apt-repository --yes ppa:pitti/systemd-semaphore

From 68e1b0f929513f8a9545f5505af1d8caf75a96e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 19 May 2016 10:41:58 +0200
Subject: [PATCH 0330/1304] Godeps: update go-systemd

Adds new dep on coreos/pkg
---
 Godeps/Godeps.json                            |  26 +-
 .../github.com/coreos/go-systemd/dbus/dbus.go |  17 +-
 .../coreos/go-systemd/dbus/methods.go         |   5 +
 .../coreos/go-systemd/sdjournal/journal.go    | 795 ++++++++++++++++++
 .../coreos/go-systemd/sdjournal/read.go       | 221 +++++
 .../github.com/coreos/go-systemd/util/util.go |  85 +-
 .../github.com/coreos/pkg/dlopen/dlopen.go    |  82 ++
 .../coreos/pkg/dlopen/dlopen_example.go       |  56 ++
 8 files changed, 1209 insertions(+), 78 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go
 create mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
 create mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen.go
 create mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen_example.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index f2e4bdf2de..e6ff3c9016 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -276,23 +276,28 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/activation",
-			"Comment": "v5",
-			"Rev": "7b2428fec40033549c68f54e26e89e7ca9a9ce31"
+			"Comment": "v8",
+			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/dbus",
-			"Comment": "v5",
-			"Rev": "7b2428fec40033549c68f54e26e89e7ca9a9ce31"
+			"Comment": "v8",
+			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-systemd/sdjournal",
+			"Comment": "v8",
+			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/unit",
-			"Comment": "v5",
-			"Rev": "7b2428fec40033549c68f54e26e89e7ca9a9ce31"
+			"Comment": "v8",
+			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/util",
-			"Comment": "v5",
-			"Rev": "7b2428fec40033549c68f54e26e89e7ca9a9ce31"
+			"Comment": "v8",
+			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-tspi/tpmclient",
@@ -313,6 +318,11 @@
 			"ImportPath": "github.com/coreos/ioprogress",
 			"Rev": "e7fc03058804de5488baed8df5b89f3924b9ec9a"
 		},
+		{
+			"ImportPath": "github.com/coreos/pkg/dlopen",
+			"Comment": "v1",
+			"Rev": "160ae6282d8c48a33d8c150e4e4817fdef8a5cde"
+		},
 		{
 			"ImportPath": "github.com/cpuguy83/go-md2man/md2man",
 			"Comment": "v1.0.4",
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go
index 9404334796..1699b90332 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go
@@ -86,7 +86,7 @@ type Conn struct {
 // New establishes a connection to the system bus and authenticates.
 // Callers should call Close() when done with the connection.
 func New() (*Conn, error) {
-	return newConnection(func() (*dbus.Conn, error) {
+	return NewConnection(func() (*dbus.Conn, error) {
 		return dbusAuthHelloConnection(dbus.SystemBusPrivate)
 	})
 }
@@ -95,7 +95,7 @@ func New() (*Conn, error) {
 // authenticates. This can be used to connect to systemd user instances.
 // Callers should call Close() when done with the connection.
 func NewUserConnection() (*Conn, error) {
-	return newConnection(func() (*dbus.Conn, error) {
+	return NewConnection(func() (*dbus.Conn, error) {
 		return dbusAuthHelloConnection(dbus.SessionBusPrivate)
 	})
 }
@@ -104,7 +104,7 @@ func NewUserConnection() (*Conn, error) {
 // This can be used for communicating with systemd without a dbus daemon.
 // Callers should call Close() when done with the connection.
 func NewSystemdConnection() (*Conn, error) {
-	return newConnection(func() (*dbus.Conn, error) {
+	return NewConnection(func() (*dbus.Conn, error) {
 		// We skip Hello when talking directly to systemd.
 		return dbusAuthConnection(func() (*dbus.Conn, error) {
 			return dbus.Dial("unix:path=/run/systemd/private")
@@ -118,13 +118,18 @@ func (c *Conn) Close() {
 	c.sigconn.Close()
 }
 
-func newConnection(createBus func() (*dbus.Conn, error)) (*Conn, error) {
-	sysconn, err := createBus()
+// NewConnection establishes a connection to a bus using a caller-supplied function.
+// This allows connecting to remote buses through a user-supplied mechanism.
+// The supplied function may be called multiple times, and should return independent connections.
+// The returned connection must be fully initialised: the org.freedesktop.DBus.Hello call must have succeeded,
+// and any authentication should be handled by the function.
+func NewConnection(dialBus func() (*dbus.Conn, error)) (*Conn, error) {
+	sysconn, err := dialBus()
 	if err != nil {
 		return nil, err
 	}
 
-	sigconn, err := createBus()
+	sigconn, err := dialBus()
 	if err != nil {
 		sysconn.Close()
 		return nil, err
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
index f9552a3380..403c2f0f7b 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
@@ -199,6 +199,11 @@ func (c *Conn) GetUnitProperty(unit string, propertyName string) (*Property, err
 	return c.getProperty(unit, "org.freedesktop.systemd1.Unit", propertyName)
 }
 
+// GetServiceProperty returns property for given service name and property name
+func (c *Conn) GetServiceProperty(service string, propertyName string) (*Property, error) {
+	return c.getProperty(service, "org.freedesktop.systemd1.Service", propertyName)
+}
+
 // GetUnitTypeProperties returns the extra properties for a unit, specific to the unit type.
 // Valid values for unitType: Service, Socket, Target, Device, Mount, Automount, Snapshot, Timer, Swap, Path, Slice, Scope
 // return "dbus.Error: Unknown interface" if the unitType is not the correct type of the unit
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go
new file mode 100644
index 0000000000..d3c5675b1d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go
@@ -0,0 +1,795 @@
+// Copyright 2015 RedHat, Inc.
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package sdjournal provides a low-level Go interface to the
+// systemd journal wrapped around the sd-journal C API.
+//
+// All public read methods map closely to the sd-journal API functions. See the
+// sd-journal.h documentation[1] for information about each function.
+//
+// To write to the journal, see the pure-Go "journal" package
+//
+// [1] http://www.freedesktop.org/software/systemd/man/sd-journal.html
+package sdjournal
+
+// #include <systemd/sd-journal.h>
+// #include <stdlib.h>
+// #include <syslog.h>
+//
+// int
+// my_sd_journal_open(void *f, sd_journal **ret, int flags)
+// {
+//   int (*sd_journal_open)(sd_journal **, int);
+//
+//   sd_journal_open = f;
+//   return sd_journal_open(ret, flags);
+// }
+//
+// int
+// my_sd_journal_open_directory(void *f, sd_journal **ret, const char *path, int flags)
+// {
+//   int (*sd_journal_open_directory)(sd_journal **, const char *, int);
+//
+//   sd_journal_open_directory = f;
+//   return sd_journal_open_directory(ret, path, flags);
+// }
+//
+// void
+// my_sd_journal_close(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_close)(sd_journal *);
+//
+//   sd_journal_close = f;
+//   sd_journal_close(j);
+// }
+//
+// int
+// my_sd_journal_get_usage(void *f, sd_journal *j, uint64_t *bytes)
+// {
+//   int (*sd_journal_get_usage)(sd_journal *, uint64_t *);
+//
+//   sd_journal_get_usage = f;
+//   return sd_journal_get_usage(j, bytes);
+// }
+//
+// int
+// my_sd_journal_add_match(void *f, sd_journal *j, const void *data, size_t size)
+// {
+//   int (*sd_journal_add_match)(sd_journal *, const void *, size_t);
+//
+//   sd_journal_add_match = f;
+//   return sd_journal_add_match(j, data, size);
+// }
+//
+// int
+// my_sd_journal_add_disjunction(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_add_disjunction)(sd_journal *);
+//
+//   sd_journal_add_disjunction = f;
+//   return sd_journal_add_disjunction(j);
+// }
+//
+// int
+// my_sd_journal_add_conjunction(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_add_conjunction)(sd_journal *);
+//
+//   sd_journal_add_conjunction = f;
+//   return sd_journal_add_conjunction(j);
+// }
+//
+// void
+// my_sd_journal_flush_matches(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_flush_matches)(sd_journal *);
+//
+//   sd_journal_flush_matches = f;
+//   sd_journal_flush_matches(j);
+// }
+//
+// int
+// my_sd_journal_next(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_next)(sd_journal *);
+//
+//   sd_journal_next = f;
+//   return sd_journal_next(j);
+// }
+//
+// int
+// my_sd_journal_next_skip(void *f, sd_journal *j, uint64_t skip)
+// {
+//   int (*sd_journal_next_skip)(sd_journal *, uint64_t);
+//
+//   sd_journal_next_skip = f;
+//   return sd_journal_next_skip(j, skip);
+// }
+//
+// int
+// my_sd_journal_previous(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_previous)(sd_journal *);
+//
+//   sd_journal_previous = f;
+//   return sd_journal_previous(j);
+// }
+//
+// int
+// my_sd_journal_previous_skip(void *f, sd_journal *j, uint64_t skip)
+// {
+//   int (*sd_journal_previous_skip)(sd_journal *, uint64_t);
+//
+//   sd_journal_previous_skip = f;
+//   return sd_journal_previous_skip(j, skip);
+// }
+//
+// int
+// my_sd_journal_get_data(void *f, sd_journal *j, const char *field, const void **data, size_t *length)
+// {
+//   int (*sd_journal_get_data)(sd_journal *, const char *, const void **, size_t *);
+//
+//   sd_journal_get_data = f;
+//   return sd_journal_get_data(j, field, data, length);
+// }
+//
+// int
+// my_sd_journal_set_data_threshold(void *f, sd_journal *j, size_t sz)
+// {
+//   int (*sd_journal_set_data_threshold)(sd_journal *, size_t);
+//
+//   sd_journal_set_data_threshold = f;
+//   return sd_journal_set_data_threshold(j, sz);
+// }
+//
+// int
+// my_sd_journal_get_cursor(void *f, sd_journal *j, char **cursor)
+// {
+//   int (*sd_journal_get_cursor)(sd_journal *, char **);
+//
+//   sd_journal_get_cursor = f;
+//   return sd_journal_get_cursor(j, cursor);
+// }
+//
+// int
+// my_sd_journal_test_cursor(void *f, sd_journal *j, const char *cursor)
+// {
+//   int (*sd_journal_test_cursor)(sd_journal *, const char *);
+//
+//   sd_journal_test_cursor = f;
+//   return sd_journal_test_cursor(j, cursor);
+// }
+//
+// int
+// my_sd_journal_get_realtime_usec(void *f, sd_journal *j, uint64_t *usec)
+// {
+//   int (*sd_journal_get_realtime_usec)(sd_journal *, uint64_t *);
+//
+//   sd_journal_get_realtime_usec = f;
+//   return sd_journal_get_realtime_usec(j, usec);
+// }
+//
+// int
+// my_sd_journal_seek_head(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_seek_head)(sd_journal *);
+//
+//   sd_journal_seek_head = f;
+//   return sd_journal_seek_head(j);
+// }
+//
+// int
+// my_sd_journal_seek_tail(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_seek_tail)(sd_journal *);
+//
+//   sd_journal_seek_tail = f;
+//   return sd_journal_seek_tail(j);
+// }
+//
+//
+// int
+// my_sd_journal_seek_cursor(void *f, sd_journal *j, const char *cursor)
+// {
+//   int (*sd_journal_seek_cursor)(sd_journal *, const char *);
+//
+//   sd_journal_seek_cursor = f;
+//   return sd_journal_seek_cursor(j, cursor);
+// }
+//
+// int
+// my_sd_journal_seek_realtime_usec(void *f, sd_journal *j, uint64_t usec)
+// {
+//   int (*sd_journal_seek_realtime_usec)(sd_journal *, uint64_t);
+//
+//   sd_journal_seek_realtime_usec = f;
+//   return sd_journal_seek_realtime_usec(j, usec);
+// }
+//
+// int
+// my_sd_journal_wait(void *f, sd_journal *j, uint64_t timeout_usec)
+// {
+//   int (*sd_journal_wait)(sd_journal *, uint64_t);
+//
+//   sd_journal_wait = f;
+//   return sd_journal_wait(j, timeout_usec);
+// }
+//
+import "C"
+import (
+	"fmt"
+	"path/filepath"
+	"strings"
+	"sync"
+	"syscall"
+	"time"
+	"unsafe"
+
+	"github.com/coreos/pkg/dlopen"
+)
+
+var libsystemdFunctions = map[string]unsafe.Pointer{}
+
+// Journal entry field strings which correspond to:
+// http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
+const (
+	SD_JOURNAL_FIELD_SYSTEMD_UNIT      = "_SYSTEMD_UNIT"
+	SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER = "SYSLOG_IDENTIFIER"
+	SD_JOURNAL_FIELD_MESSAGE           = "MESSAGE"
+	SD_JOURNAL_FIELD_PID               = "_PID"
+	SD_JOURNAL_FIELD_UID               = "_UID"
+	SD_JOURNAL_FIELD_GID               = "_GID"
+	SD_JOURNAL_FIELD_HOSTNAME          = "_HOSTNAME"
+	SD_JOURNAL_FIELD_MACHINE_ID        = "_MACHINE_ID"
+	SD_JOURNAL_FIELD_TRANSPORT         = "_TRANSPORT"
+)
+
+// Journal event constants
+const (
+	SD_JOURNAL_NOP        = int(C.SD_JOURNAL_NOP)
+	SD_JOURNAL_APPEND     = int(C.SD_JOURNAL_APPEND)
+	SD_JOURNAL_INVALIDATE = int(C.SD_JOURNAL_INVALIDATE)
+)
+
+const (
+	// IndefiniteWait is a sentinel value that can be passed to
+	// sdjournal.Wait() to signal an indefinite wait for new journal
+	// events. It is implemented as the maximum value for a time.Duration:
+	// https://github.com/golang/go/blob/e4dcf5c8c22d98ac9eac7b9b226596229624cb1d/src/time/time.go#L434
+	IndefiniteWait time.Duration = 1<<63 - 1
+)
+
+var libsystemdNames = []string{
+	// systemd < 209
+	"libsystemd-journal.so.0",
+	"libsystemd-journal.so",
+
+	// systemd >= 209 merged libsystemd-journal into libsystemd proper
+	"libsystemd.so.0",
+	"libsystemd.so",
+}
+
+// Journal is a Go wrapper of an sd_journal structure.
+type Journal struct {
+	cjournal *C.sd_journal
+	mu       sync.Mutex
+	lib      *dlopen.LibHandle
+}
+
+// Match is a convenience wrapper to describe filters supplied to AddMatch.
+type Match struct {
+	Field string
+	Value string
+}
+
+// String returns a string representation of a Match suitable for use with AddMatch.
+func (m *Match) String() string {
+	return m.Field + "=" + m.Value
+}
+
+func (j *Journal) getFunction(name string) (unsafe.Pointer, error) {
+	j.mu.Lock()
+	defer j.mu.Unlock()
+	f, ok := libsystemdFunctions[name]
+	if !ok {
+		var err error
+		f, err = j.lib.GetSymbolPointer(name)
+		if err != nil {
+			return nil, err
+		}
+
+		libsystemdFunctions[name] = f
+	}
+
+	return f, nil
+}
+
+// NewJournal returns a new Journal instance pointing to the local journal
+func NewJournal() (j *Journal, err error) {
+	h, err := dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err == nil {
+			return
+		}
+		err2 := h.Close()
+		if err2 != nil {
+			err = fmt.Errorf(`%q and "error closing handle: %v"`, err, err2)
+		}
+	}()
+
+	j = &Journal{lib: h}
+
+	sd_journal_open, err := j.getFunction("sd_journal_open")
+	if err != nil {
+		return nil, err
+	}
+
+	r := C.my_sd_journal_open(sd_journal_open, &j.cjournal, C.SD_JOURNAL_LOCAL_ONLY)
+
+	if r < 0 {
+		return nil, fmt.Errorf("failed to open journal: %d", syscall.Errno(-r))
+	}
+
+	return j, nil
+}
+
+// NewJournalFromDir returns a new Journal instance pointing to a journal residing
+// in a given directory. The supplied path may be relative or absolute; if
+// relative, it will be converted to an absolute path before being opened.
+func NewJournalFromDir(path string) (j *Journal, err error) {
+	h, err := dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err == nil {
+			return
+		}
+		err2 := h.Close()
+		if err2 != nil {
+			err = fmt.Errorf(`%q and "error closing handle: %v"`, err, err2)
+		}
+	}()
+
+	path, err = filepath.Abs(path)
+	if err != nil {
+		return nil, err
+	}
+
+	j = &Journal{lib: h}
+
+	sd_journal_open_directory, err := j.getFunction("sd_journal_open_directory")
+	if err != nil {
+		return nil, err
+	}
+
+	p := C.CString(path)
+	defer C.free(unsafe.Pointer(p))
+
+	r := C.my_sd_journal_open_directory(sd_journal_open_directory, &j.cjournal, p, 0)
+	if r < 0 {
+		return nil, fmt.Errorf("failed to open journal in directory %q: %d", path, syscall.Errno(-r))
+	}
+
+	return j, nil
+}
+
+// Close closes a journal opened with NewJournal.
+func (j *Journal) Close() error {
+	sd_journal_close, err := j.getFunction("sd_journal_close")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	C.my_sd_journal_close(sd_journal_close, j.cjournal)
+	j.mu.Unlock()
+
+	return j.lib.Close()
+}
+
+// AddMatch adds a match by which to filter the entries of the journal.
+func (j *Journal) AddMatch(match string) error {
+	sd_journal_add_match, err := j.getFunction("sd_journal_add_match")
+	if err != nil {
+		return err
+	}
+
+	m := C.CString(match)
+	defer C.free(unsafe.Pointer(m))
+
+	j.mu.Lock()
+	r := C.my_sd_journal_add_match(sd_journal_add_match, j.cjournal, unsafe.Pointer(m), C.size_t(len(match)))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to add match: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// AddDisjunction inserts a logical OR in the match list.
+func (j *Journal) AddDisjunction() error {
+	sd_journal_add_disjunction, err := j.getFunction("sd_journal_add_disjunction")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_add_disjunction(sd_journal_add_disjunction, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to add a disjunction in the match list: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// AddConjunction inserts a logical AND in the match list.
+func (j *Journal) AddConjunction() error {
+	sd_journal_add_conjunction, err := j.getFunction("sd_journal_add_conjunction")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_add_conjunction(sd_journal_add_conjunction, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to add a conjunction in the match list: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// FlushMatches flushes all matches, disjunctions and conjunctions.
+func (j *Journal) FlushMatches() {
+	sd_journal_flush_matches, err := j.getFunction("sd_journal_flush_matches")
+	if err != nil {
+		return
+	}
+
+	j.mu.Lock()
+	C.my_sd_journal_flush_matches(sd_journal_flush_matches, j.cjournal)
+	j.mu.Unlock()
+}
+
+// Next advances the read pointer into the journal by one entry.
+func (j *Journal) Next() (int, error) {
+	sd_journal_next, err := j.getFunction("sd_journal_next")
+	if err != nil {
+		return -1, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_next(sd_journal_next, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return int(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+	}
+
+	return int(r), nil
+}
+
+// NextSkip advances the read pointer by multiple entries at once,
+// as specified by the skip parameter.
+func (j *Journal) NextSkip(skip uint64) (uint64, error) {
+	sd_journal_next_skip, err := j.getFunction("sd_journal_next_skip")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_next_skip(sd_journal_next_skip, j.cjournal, C.uint64_t(skip))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+	}
+
+	return uint64(r), nil
+}
+
+// Previous sets the read pointer into the journal back by one entry.
+func (j *Journal) Previous() (uint64, error) {
+	sd_journal_previous, err := j.getFunction("sd_journal_previous")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_previous(sd_journal_previous, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+	}
+
+	return uint64(r), nil
+}
+
+// PreviousSkip sets back the read pointer by multiple entries at once,
+// as specified by the skip parameter.
+func (j *Journal) PreviousSkip(skip uint64) (uint64, error) {
+	sd_journal_previous_skip, err := j.getFunction("sd_journal_previous_skip")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_previous_skip(sd_journal_previous_skip, j.cjournal, C.uint64_t(skip))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+	}
+
+	return uint64(r), nil
+}
+
+// GetData gets the data object associated with a specific field from the
+// current journal entry.
+func (j *Journal) GetData(field string) (string, error) {
+	sd_journal_get_data, err := j.getFunction("sd_journal_get_data")
+	if err != nil {
+		return "", err
+	}
+
+	f := C.CString(field)
+	defer C.free(unsafe.Pointer(f))
+
+	var d unsafe.Pointer
+	var l C.size_t
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_data(sd_journal_get_data, j.cjournal, f, &d, &l)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return "", fmt.Errorf("failed to read message: %d", syscall.Errno(-r))
+	}
+
+	msg := C.GoStringN((*C.char)(d), C.int(l))
+
+	return msg, nil
+}
+
+// GetDataValue gets the data object associated with a specific field from the
+// current journal entry, returning only the value of the object.
+func (j *Journal) GetDataValue(field string) (string, error) {
+	val, err := j.GetData(field)
+	if err != nil {
+		return "", err
+	}
+	return strings.SplitN(val, "=", 2)[1], nil
+}
+
+// SetDataThresold sets the data field size threshold for data returned by
+// GetData. To retrieve the complete data fields this threshold should be
+// turned off by setting it to 0, so that the library always returns the
+// complete data objects.
+func (j *Journal) SetDataThreshold(threshold uint64) error {
+	sd_journal_set_data_threshold, err := j.getFunction("sd_journal_set_data_threshold")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_set_data_threshold(sd_journal_set_data_threshold, j.cjournal, C.size_t(threshold))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to set data threshold: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// GetRealtimeUsec gets the realtime (wallclock) timestamp of the current
+// journal entry.
+func (j *Journal) GetRealtimeUsec() (uint64, error) {
+	var usec C.uint64_t
+
+	sd_journal_get_realtime_usec, err := j.getFunction("sd_journal_get_realtime_usec")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_realtime_usec(sd_journal_get_realtime_usec, j.cjournal, &usec)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return 0, fmt.Errorf("error getting timestamp for entry: %d", syscall.Errno(-r))
+	}
+
+	return uint64(usec), nil
+}
+
+// GetCursor gets the cursor of the current journal entry.
+func (j *Journal) GetCursor() (string, error) {
+	var d *C.char
+
+	sd_journal_get_cursor, err := j.getFunction("sd_journal_get_cursor")
+	if err != nil {
+		return "", err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &d)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return "", fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
+	}
+
+	cursor := C.GoString(d)
+
+	return cursor, nil
+}
+
+// TestCursor checks whether the current position in the journal matches the
+// specified cursor
+func (j *Journal) TestCursor(cursor string) error {
+	sd_journal_test_cursor, err := j.getFunction("sd_journal_test_cursor")
+	if err != nil {
+		return err
+	}
+
+	c := C.CString(cursor)
+	defer C.free(unsafe.Pointer(c))
+
+	j.mu.Lock()
+	r := C.my_sd_journal_test_cursor(sd_journal_test_cursor, j.cjournal, c)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to test to cursor %q: %d", cursor, syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// SeekHead seeks to the beginning of the journal, i.e. the oldest available
+// entry.
+func (j *Journal) SeekHead() error {
+	sd_journal_seek_head, err := j.getFunction("sd_journal_seek_head")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_seek_head(sd_journal_seek_head, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to seek to head of journal: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// SeekTail may be used to seek to the end of the journal, i.e. the most recent
+// available entry.
+func (j *Journal) SeekTail() error {
+	sd_journal_seek_tail, err := j.getFunction("sd_journal_seek_tail")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_seek_tail(sd_journal_seek_tail, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to seek to tail of journal: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// SeekRealtimeUsec seeks to the entry with the specified realtime (wallclock)
+// timestamp, i.e. CLOCK_REALTIME.
+func (j *Journal) SeekRealtimeUsec(usec uint64) error {
+	sd_journal_seek_realtime_usec, err := j.getFunction("sd_journal_seek_realtime_usec")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_seek_realtime_usec(sd_journal_seek_realtime_usec, j.cjournal, C.uint64_t(usec))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to seek to %d: %d", usec, syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// SeekCursor seeks to a concrete journal cursor.
+func (j *Journal) SeekCursor(cursor string) error {
+	sd_journal_seek_cursor, err := j.getFunction("sd_journal_seek_cursor")
+	if err != nil {
+		return err
+	}
+
+	c := C.CString(cursor)
+	defer C.free(unsafe.Pointer(c))
+
+	j.mu.Lock()
+	r := C.my_sd_journal_seek_cursor(sd_journal_seek_cursor, j.cjournal, c)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to seek to cursor %q: %d", cursor, syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// Wait will synchronously wait until the journal gets changed. The maximum time
+// this call sleeps may be controlled with the timeout parameter.  If
+// sdjournal.IndefiniteWait is passed as the timeout parameter, Wait will
+// wait indefinitely for a journal change.
+func (j *Journal) Wait(timeout time.Duration) int {
+	var to uint64
+
+	sd_journal_wait, err := j.getFunction("sd_journal_wait")
+	if err != nil {
+		return -1
+	}
+
+	if timeout == IndefiniteWait {
+		// sd_journal_wait(3) calls for a (uint64_t) -1 to be passed to signify
+		// indefinite wait, but using a -1 overflows our C.uint64_t, so we use an
+		// equivalent hex value.
+		to = 0xffffffffffffffff
+	} else {
+		to = uint64(time.Now().Add(timeout).Unix() / 1000)
+	}
+	j.mu.Lock()
+	r := C.my_sd_journal_wait(sd_journal_wait, j.cjournal, C.uint64_t(to))
+	j.mu.Unlock()
+
+	return int(r)
+}
+
+// GetUsage returns the journal disk space usage, in bytes.
+func (j *Journal) GetUsage() (uint64, error) {
+	var out C.uint64_t
+
+	sd_journal_get_usage, err := j.getFunction("sd_journal_get_usage")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_usage(sd_journal_get_usage, j.cjournal, &out)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return 0, fmt.Errorf("failed to get journal disk space usage: %d", syscall.Errno(-r))
+	}
+
+	return uint64(out), nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
new file mode 100644
index 0000000000..161577870b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
@@ -0,0 +1,221 @@
+// Copyright 2015 RedHat, Inc.
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package sdjournal
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"time"
+)
+
+var (
+	ErrExpired = errors.New("Timeout expired")
+)
+
+// JournalReaderConfig represents options to drive the behavior of a JournalReader.
+type JournalReaderConfig struct {
+	// The Since and NumFromTail options are mutually exclusive and determine
+	// where the reading begins within the journal.
+	Since       time.Duration // start relative to a Duration from now
+	NumFromTail uint64        // start relative to the tail
+	Cursor      string        // start relative to the cursor
+
+	// Show only journal entries whose fields match the supplied values. If
+	// the array is empty, entries will not be filtered.
+	Matches []Match
+
+	// If not empty, the journal instance will point to a journal residing
+	// in this directory. The supplied path may be relative or absolute.
+	Path string
+}
+
+// JournalReader is an io.ReadCloser which provides a simple interface for iterating through the
+// systemd journal.
+type JournalReader struct {
+	journal *Journal
+}
+
+// NewJournalReader creates a new JournalReader with configuration options that are similar to the
+// systemd journalctl tool's iteration and filtering features.
+func NewJournalReader(config JournalReaderConfig) (*JournalReader, error) {
+	r := &JournalReader{}
+
+	// Open the journal
+	var err error
+	if config.Path != "" {
+		r.journal, err = NewJournalFromDir(config.Path)
+	} else {
+		r.journal, err = NewJournal()
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	// Add any supplied matches
+	for _, m := range config.Matches {
+		r.journal.AddMatch(m.String())
+	}
+
+	// Set the start position based on options
+	if config.Since != 0 {
+		// Start based on a relative time
+		start := time.Now().Add(config.Since)
+		if err := r.journal.SeekRealtimeUsec(uint64(start.UnixNano() / 1000)); err != nil {
+			return nil, err
+		}
+	} else if config.NumFromTail != 0 {
+		// Start based on a number of lines before the tail
+		if err := r.journal.SeekTail(); err != nil {
+			return nil, err
+		}
+
+		// Move the read pointer into position near the tail. Go one further than
+		// the option so that the initial cursor advancement positions us at the
+		// correct starting point.
+		if _, err := r.journal.PreviousSkip(config.NumFromTail + 1); err != nil {
+			return nil, err
+		}
+	} else if config.Cursor != "" {
+		// Start based on a custom cursor
+		if err := r.journal.SeekCursor(config.Cursor); err != nil {
+			return nil, err
+		}
+	}
+
+	return r, nil
+}
+
+func (r *JournalReader) Read(b []byte) (int, error) {
+	var err error
+	var c int
+
+	// Advance the journal cursor
+	c, err = r.journal.Next()
+
+	// An unexpected error
+	if err != nil {
+		return 0, err
+	}
+
+	// EOF detection
+	if c == 0 {
+		return 0, io.EOF
+	}
+
+	// Build a message
+	var msg string
+	msg, err = r.buildMessage()
+
+	if err != nil {
+		return 0, err
+	}
+
+	// Copy and return the message
+	copy(b, []byte(msg))
+
+	return len(msg), nil
+}
+
+// Close closes the JournalReader's handle to the journal.
+func (r *JournalReader) Close() error {
+	return r.journal.Close()
+}
+
+// Rewind attempts to rewind the JournalReader to the first entry.
+func (r *JournalReader) Rewind() error {
+	return r.journal.SeekHead()
+}
+
+// Follow synchronously follows the JournalReader, writing each new journal entry to writer. The
+// follow will continue until a single time.Time is received on the until channel.
+func (r *JournalReader) Follow(until <-chan time.Time, writer io.Writer) (err error) {
+
+	// Process journal entries and events. Entries are flushed until the tail or
+	// timeout is reached, and then we wait for new events or the timeout.
+	var msg = make([]byte, 64*1<<(10))
+process:
+	for {
+		c, err := r.Read(msg)
+		if err != nil && err != io.EOF {
+			break process
+		}
+
+		select {
+		case <-until:
+			return ErrExpired
+		default:
+			if c > 0 {
+				writer.Write(msg[:c])
+				continue process
+			}
+		}
+
+		// We're at the tail, so wait for new events or time out.
+		// Holds journal events to process. Tightly bounded for now unless there's a
+		// reason to unblock the journal watch routine more quickly.
+		events := make(chan int, 1)
+		pollDone := make(chan bool, 1)
+		go func() {
+			for {
+				select {
+				case <-pollDone:
+					return
+				default:
+					events <- r.journal.Wait(time.Duration(1) * time.Second)
+				}
+			}
+		}()
+
+		select {
+		case <-until:
+			pollDone <- true
+			return ErrExpired
+		case e := <-events:
+			pollDone <- true
+			switch e {
+			case SD_JOURNAL_NOP, SD_JOURNAL_APPEND, SD_JOURNAL_INVALIDATE:
+				// TODO: need to account for any of these?
+			default:
+				log.Printf("Received unknown event: %d\n", e)
+			}
+			continue process
+		}
+	}
+
+	return
+}
+
+// buildMessage returns a string representing the current journal entry in a simple format which
+// includes the entry timestamp and MESSAGE field.
+func (r *JournalReader) buildMessage() (string, error) {
+	var msg string
+	var usec uint64
+	var err error
+
+	if msg, err = r.journal.GetData("MESSAGE"); err != nil {
+		return "", err
+	}
+
+	if usec, err = r.journal.GetRealtimeUsec(); err != nil {
+		return "", err
+	}
+
+	timestamp := time.Unix(0, int64(usec)*int64(time.Microsecond))
+
+	return fmt.Sprintf("%s %s\n", timestamp, msg), nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
index f9f0b2a35a..e4ed8b2639 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
@@ -18,9 +18,7 @@
 // than linking against them.
 package util
 
-// #cgo LDFLAGS: -ldl
 // #include <stdlib.h>
-// #include <dlfcn.h>
 // #include <sys/types.h>
 // #include <unistd.h>
 //
@@ -58,56 +56,24 @@ package util
 // }
 import "C"
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"strings"
 	"syscall"
 	"unsafe"
-)
-
-var ErrSoNotFound = errors.New("unable to open a handle to libsystemd")
-
-// libHandle represents an open handle to the systemd C library
-type libHandle struct {
-	handle  unsafe.Pointer
-	libname string
-}
 
-func (h *libHandle) Close() error {
-	if r := C.dlclose(h.handle); r != 0 {
-		return fmt.Errorf("error closing %v: %d", h.libname, r)
-	}
-	return nil
-}
+	"github.com/coreos/pkg/dlopen"
+)
 
-// getHandle tries to get a handle to a systemd library (.so), attempting to
-// access it by several different names and returning the first that is
-// successfully opened. Callers are responsible for closing the handler.
-// If no library can be successfully opened, an error is returned.
-func getHandle() (*libHandle, error) {
-	for _, name := range []string{
-		// systemd < 209
-		"libsystemd-login.so",
-		"libsystemd-login.so.0",
+var libsystemdNames = []string{
+	// systemd < 209
+	"libsystemd-login.so.0",
+	"libsystemd-login.so",
 
-		// systemd >= 209 merged libsystemd-login into libsystemd proper
-		"libsystemd.so",
-		"libsystemd.so.0",
-	} {
-		libname := C.CString(name)
-		defer C.free(unsafe.Pointer(libname))
-		handle := C.dlopen(libname, C.RTLD_LAZY)
-		if handle != nil {
-			h := &libHandle{
-				handle:  handle,
-				libname: name,
-			}
-			return h, nil
-		}
-	}
-	return nil, ErrSoNotFound
+	// systemd >= 209 merged libsystemd-login into libsystemd proper
+	"libsystemd.so.0",
+	"libsystemd.so",
 }
 
 // GetRunningSlice attempts to retrieve the name of the systemd slice in which
@@ -115,8 +81,8 @@ func getHandle() (*libHandle, error) {
 // This function is a wrapper around the libsystemd C library; if it cannot be
 // opened, an error is returned.
 func GetRunningSlice() (slice string, err error) {
-	var h *libHandle
-	h, err = getHandle()
+	var h *dlopen.LibHandle
+	h, err = dlopen.GetHandle(libsystemdNames)
 	if err != nil {
 		return
 	}
@@ -126,11 +92,8 @@ func GetRunningSlice() (slice string, err error) {
 		}
 	}()
 
-	sym := C.CString("sd_pid_get_slice")
-	defer C.free(unsafe.Pointer(sym))
-	sd_pid_get_slice := C.dlsym(h.handle, sym)
-	if sd_pid_get_slice == nil {
-		err = fmt.Errorf("error resolving sd_pid_get_slice function")
+	sd_pid_get_slice, err := h.GetSymbolPointer("sd_pid_get_slice")
+	if err != nil {
 		return
 	}
 
@@ -164,8 +127,8 @@ func GetRunningSlice() (slice string, err error) {
 // unable to successfully open a handle to the library for any reason (e.g. it
 // cannot be found), an errr will be returned
 func RunningFromSystemService() (ret bool, err error) {
-	var h *libHandle
-	h, err = getHandle()
+	var h *dlopen.LibHandle
+	h, err = dlopen.GetHandle(libsystemdNames)
 	if err != nil {
 		return
 	}
@@ -175,11 +138,8 @@ func RunningFromSystemService() (ret bool, err error) {
 		}
 	}()
 
-	sym := C.CString("sd_pid_get_owner_uid")
-	defer C.free(unsafe.Pointer(sym))
-	sd_pid_get_owner_uid := C.dlsym(h.handle, sym)
-	if sd_pid_get_owner_uid == nil {
-		err = fmt.Errorf("error resolving sd_pid_get_owner_uid function")
+	sd_pid_get_owner_uid, err := h.GetSymbolPointer("sd_pid_get_owner_uid")
+	if err != nil {
 		return
 	}
 
@@ -212,8 +172,8 @@ func RunningFromSystemService() (ret bool, err error) {
 // `sd_pid_get_unit` call, with the same caveat: for processes not part of a
 // systemd system unit, this function will return an error.
 func CurrentUnitName() (unit string, err error) {
-	var h *libHandle
-	h, err = getHandle()
+	var h *dlopen.LibHandle
+	h, err = dlopen.GetHandle(libsystemdNames)
 	if err != nil {
 		return
 	}
@@ -223,11 +183,8 @@ func CurrentUnitName() (unit string, err error) {
 		}
 	}()
 
-	sym := C.CString("sd_pid_get_unit")
-	defer C.free(unsafe.Pointer(sym))
-	sd_pid_get_unit := C.dlsym(h.handle, sym)
-	if sd_pid_get_unit == nil {
-		err = fmt.Errorf("error resolving sd_pid_get_unit function")
+	sd_pid_get_unit, err := h.GetSymbolPointer("sd_pid_get_unit")
+	if err != nil {
 		return
 	}
 
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen.go b/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen.go
new file mode 100644
index 0000000000..23774f612e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen.go
@@ -0,0 +1,82 @@
+// Copyright 2016 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package dlopen provides some convenience functions to dlopen a library and
+// get its symbols.
+package dlopen
+
+// #cgo LDFLAGS: -ldl
+// #include <stdlib.h>
+// #include <dlfcn.h>
+import "C"
+import (
+	"errors"
+	"fmt"
+	"unsafe"
+)
+
+var ErrSoNotFound = errors.New("unable to open a handle to the library")
+
+// LibHandle represents an open handle to a library (.so)
+type LibHandle struct {
+	Handle  unsafe.Pointer
+	Libname string
+}
+
+// GetHandle tries to get a handle to a library (.so), attempting to access it
+// by the names specified in libs and returning the first that is successfully
+// opened. Callers are responsible for closing the handler. If no library can
+// be successfully opened, an error is returned.
+func GetHandle(libs []string) (*LibHandle, error) {
+	for _, name := range libs {
+		libname := C.CString(name)
+		defer C.free(unsafe.Pointer(libname))
+		handle := C.dlopen(libname, C.RTLD_LAZY)
+		if handle != nil {
+			h := &LibHandle{
+				Handle:  handle,
+				Libname: name,
+			}
+			return h, nil
+		}
+	}
+	return nil, ErrSoNotFound
+}
+
+// GetSymbolPointer takes a symbol name and returns a pointer to the symbol.
+func (l *LibHandle) GetSymbolPointer(symbol string) (unsafe.Pointer, error) {
+	sym := C.CString(symbol)
+	defer C.free(unsafe.Pointer(sym))
+
+	C.dlerror()
+	p := C.dlsym(l.Handle, sym)
+	e := C.dlerror()
+	if e != nil {
+		return nil, fmt.Errorf("error resolving symbol %q: %v", symbol, errors.New(C.GoString(e)))
+	}
+
+	return p, nil
+}
+
+// Close closes a LibHandle.
+func (l *LibHandle) Close() error {
+	C.dlerror()
+	C.dlclose(l.Handle)
+	e := C.dlerror()
+	if e != nil {
+		return fmt.Errorf("error closing %v: %v", l.Libname, errors.New(C.GoString(e)))
+	}
+
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen_example.go b/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen_example.go
new file mode 100644
index 0000000000..48a660104f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen_example.go
@@ -0,0 +1,56 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// +build linux
+
+package dlopen
+
+// #include <string.h>
+// #include <stdlib.h>
+//
+// int
+// my_strlen(void *f, const char *s)
+// {
+//   size_t (*strlen)(const char *);
+//
+//   strlen = (size_t (*)(const char *))f;
+//   return strlen(s);
+// }
+import "C"
+
+import (
+	"fmt"
+	"unsafe"
+)
+
+func strlen(libs []string, s string) (int, error) {
+	h, err := GetHandle(libs)
+	if err != nil {
+		return -1, fmt.Errorf(`couldn't get a handle to the library: %v`, err)
+	}
+	defer h.Close()
+
+	f := "strlen"
+	cs := C.CString(s)
+	defer C.free(unsafe.Pointer(cs))
+
+	strlen, err := h.GetSymbolPointer(f)
+	if err != nil {
+		return -1, fmt.Errorf(`couldn't get symbol %q: %v`, f, err)
+	}
+
+	len := C.my_strlen(strlen, cs)
+
+	return int(len), nil
+}

From 44fbabaf3689e16197b89cee370062a371d967fc Mon Sep 17 00:00:00 2001
From: Derek Parker <derek.parker@coreos.com>
Date: Wed, 27 Jan 2016 10:54:01 -0800
Subject: [PATCH 0331/1304] api_service: Implement GetLogs RPC request

Fixes #1970
---
 rkt/api_service.go  | 74 ++++++++++++++++++++++++++++++++++++++++++++-
 stage1/init/init.go |  3 +-
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index bcd1a6733b..28ccf53de5 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -17,6 +17,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"net"
 	"os"
 	"os/signal"
@@ -24,13 +25,16 @@ import (
 	"path/filepath"
 	"strings"
 	"syscall"
+	"time"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
+	"github.com/coreos/go-systemd/sdjournal"
 	"github.com/coreos/rkt/api/v1alpha"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/pkg/set"
+	stage1common "github.com/coreos/rkt/stage1/init/common"
 	"github.com/coreos/rkt/store"
 	"github.com/coreos/rkt/version"
 	"github.com/spf13/cobra"
@@ -691,8 +695,76 @@ func (s *v1AlphaAPIServer) InspectImage(ctx context.Context, request *v1alpha.In
 	return &v1alpha.InspectImageResponse{Image: image}, nil
 }
 
+// LogsStreamWriter is a wrapper around a gRPC streaming server.
+// Implements io.Writer interface.
+type LogsStreamWriter struct {
+	server v1alpha.PublicAPI_GetLogsServer
+}
+
+func (sw LogsStreamWriter) Write(b []byte) (int, error) {
+	if err := sw.server.SendMsg(b); err != nil {
+		return 0, err
+	}
+	return len(b), nil
+}
+
 func (s *v1AlphaAPIServer) GetLogs(request *v1alpha.GetLogsRequest, server v1alpha.PublicAPI_GetLogsServer) error {
-	return fmt.Errorf("not implemented yet")
+	uuid, err := types.NewUUID(request.PodId)
+	if err != nil {
+		return err
+	}
+	pod, err := getPod(uuid)
+	if err != nil {
+		return err
+	}
+	stage1Path := "stage1/rootfs"
+	if pod.usesOverlay() {
+		stage1TreeStoreID, err := pod.getStage1TreeStoreID()
+		if err != nil {
+			return err
+		}
+		stage1Path = fmt.Sprintf("/overlay/%s/upper/", stage1TreeStoreID)
+	}
+	path := filepath.Join(getDataDir(), "/pods/run/", request.PodId, stage1Path, "/var/log/journal/")
+	jconf := sdjournal.JournalReaderConfig{
+		Path: path,
+	}
+	if request.AppName != "" {
+		acname, err := types.NewACName(request.AppName)
+		if err != nil {
+			return err
+		}
+		jconf.Matches = []sdjournal.Match{
+			{
+				Field: sdjournal.SD_JOURNAL_FIELD_SYSTEMD_UNIT,
+				Value: stage1common.ServiceUnitName(*acname),
+			},
+		}
+	}
+	if request.SinceTime != 0 {
+		t := time.Unix(request.SinceTime, 0)
+		jconf.Since = time.Since(t)
+	}
+	if request.Lines != 0 {
+		jconf.NumFromTail = uint64(request.Lines)
+	}
+
+	jr, err := sdjournal.NewJournalReader(jconf)
+	if err != nil {
+		return err
+	}
+	defer jr.Close()
+
+	if request.Follow {
+		return jr.Follow(nil, LogsStreamWriter{server: server})
+	}
+
+	data, err := ioutil.ReadAll(jr)
+	if err != nil {
+		return err
+	}
+	lines := strings.Split(string(data), "\n")
+	return server.Send(&v1alpha.GetLogsResponse{Lines: lines})
 }
 
 func (s *v1AlphaAPIServer) ListenEvents(request *v1alpha.ListenEventsRequest, server v1alpha.PublicAPI_ListenEventsServer) error {
diff --git a/stage1/init/init.go b/stage1/init/init.go
index b98f84bcd7..d5b495d373 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -36,6 +36,7 @@ import (
 	"github.com/appc/goaci/proj2aci"
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/util"
+	"github.com/coreos/pkg/dlopen"
 	"github.com/godbus/dbus"
 	"github.com/godbus/dbus/introspect"
 	"github.com/hashicorp/errwrap"
@@ -397,7 +398,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 
 		keepUnit, err := util.RunningFromSystemService()
 		if err != nil {
-			if err == util.ErrSoNotFound {
+			if err == dlopen.ErrSoNotFound {
 				log.Print("warning: libsystemd not found even though systemd is running. Cgroup limits set by the environment (e.g. a systemd service) won't be enforced.")
 			} else {
 				return nil, nil, errwrap.Wrap(errors.New("error determining if we're running from a system service"), err)

From 448dd546367aaa8ed05ef3aff13649b127b0333b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 1 Feb 2016 18:45:17 +0100
Subject: [PATCH 0332/1304] api: add getlogs to the client example

---
 api/v1alpha/client_example.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/api/v1alpha/client_example.go b/api/v1alpha/client_example.go
index ec807d9ee3..8ca4413ada 100644
--- a/api/v1alpha/client_example.go
+++ b/api/v1alpha/client_example.go
@@ -51,6 +51,24 @@ func main() {
 
 	for _, p := range podResp.Pods {
 		fmt.Printf("Pod %q is running\n", p.Id)
+
+		logsResp, err := c.GetLogs(context.Background(), &v1alpha.GetLogsRequest{
+			PodId: p.Id,
+		})
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(2)
+		}
+
+		logsRecvResp, err := logsResp.Recv()
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(2)
+		}
+
+		for _, l := range logsRecvResp.Lines {
+			fmt.Println(l)
+		}
 	}
 
 	// List images.

From 996489315f2c806cdf379d60452803e859c97030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 26 May 2016 15:00:33 +0200
Subject: [PATCH 0333/1304] api_service: SYSTEMD_UNIT -> SYSLOG_IDENTIFIER

To avoid the race mentioned in
https://github.com/coreos/rkt/issues/2630.
---
 rkt/api_service.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 28ccf53de5..22182908b4 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -736,7 +736,7 @@ func (s *v1AlphaAPIServer) GetLogs(request *v1alpha.GetLogsRequest, server v1alp
 		}
 		jconf.Matches = []sdjournal.Match{
 			{
-				Field: sdjournal.SD_JOURNAL_FIELD_SYSTEMD_UNIT,
+				Field: sdjournal.SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER,
 				Value: stage1common.ServiceUnitName(*acname),
 			},
 		}

From d0a749a6a79d0aa747558fe6349bb5ab0156679b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 27 May 2016 14:35:51 +0200
Subject: [PATCH 0334/1304] api: exit with status 1 on error

Sequential numbering of errors is evil.
---
 api/v1alpha/client_example.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/v1alpha/client_example.go b/api/v1alpha/client_example.go
index 8ca4413ada..0cf1949f7a 100644
--- a/api/v1alpha/client_example.go
+++ b/api/v1alpha/client_example.go
@@ -46,7 +46,7 @@ func main() {
 	})
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(2)
+		os.Exit(1)
 	}
 
 	for _, p := range podResp.Pods {
@@ -57,13 +57,13 @@ func main() {
 		})
 		if err != nil {
 			fmt.Println(err)
-			os.Exit(2)
+			os.Exit(1)
 		}
 
 		logsRecvResp, err := logsResp.Recv()
 		if err != nil {
 			fmt.Println(err)
-			os.Exit(2)
+			os.Exit(1)
 		}
 
 		for _, l := range logsRecvResp.Lines {
@@ -83,7 +83,7 @@ func main() {
 	})
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(3)
+		os.Exit(1)
 	}
 
 	for _, im := range imgResp.Images {

From a627ead79950a3ac568f126c8e0ccaf2fd1bdb03 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Tue, 24 May 2016 23:30:11 +0200
Subject: [PATCH 0335/1304] cni: 0.2.3 -> 0.3.0-rc3

---
 Godeps/Godeps.json                            |  97 +++++-
 .../containernetworking/cni/LICENSE           | 202 +++++++++++
 .../containernetworking/cni/pkg/ip/cidr.go    |  51 +++
 .../cni/pkg/ip/ipforward.go                   |  31 ++
 .../containernetworking/cni/pkg/ip/ipmasq.go  |  66 ++++
 .../containernetworking/cni/pkg/ip/link.go    | 153 +++++++++
 .../containernetworking/cni/pkg/ip/route.go   |  47 +++
 .../containernetworking/cni/pkg/ns/README.md  |  31 ++
 .../containernetworking/cni/pkg/ns/ns.go      | 315 ++++++++++++++++++
 .../containernetworking/cni/pkg/types/args.go |  91 +++++
 .../cni/pkg/types/types.go                    | 191 +++++++++++
 .../cni/pkg/utils/utils.go                    |  41 +++
 networking/kvm.go                             |   6 +-
 networking/net_plugin.go                      |   2 +-
 networking/netinfo/netinfo.go                 |   2 +-
 networking/networking.go                      |   4 +-
 stage1/init/kvm/network.go                    |   2 +-
 stage1/init/kvm/network_test.go               |   2 +-
 vendoredApps                                  |  17 +-
 19 files changed, 1333 insertions(+), 18 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/LICENSE
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/cidr.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipforward.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipmasq.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/link.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/route.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/README.md
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/ns.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/args.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/types.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/utils.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 2effffa85b..119c66dc82 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/rkt",
 	"GoVersion": "go1.5",
-	"GodepVersion": "v70",
+	"GodepVersion": "v71",
 	"Packages": [
 		"./...",
 		"github.com/appc/spec/actool",
@@ -260,6 +260,101 @@
 			"ImportPath": "github.com/camlistore/go4/lock",
 			"Rev": "9ba773eba85ab9e258ff516630f7f6474bc4535b"
 		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/invoke",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/ip",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/ipam",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/ns",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/skel",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/testutils",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/types",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/utils",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/utils/sysctl",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/dhcp",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local/backend",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/main/bridge",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/main/ipvlan",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/main/macvlan",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/main/ptp",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/meta/flannel",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/meta/tuning",
+			"Comment": "v0.3.0-rc3",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
 		{
 			"ImportPath": "github.com/coreos/gexpect",
 			"Comment": "v0.1.0",
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/LICENSE b/Godeps/_workspace/src/github.com/containernetworking/cni/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/cidr.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/cidr.go
new file mode 100644
index 0000000000..dae2c4d0e4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/cidr.go
@@ -0,0 +1,51 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"math/big"
+	"net"
+)
+
+// NextIP returns IP incremented by 1
+func NextIP(ip net.IP) net.IP {
+	i := ipToInt(ip)
+	return intToIP(i.Add(i, big.NewInt(1)))
+}
+
+// PrevIP returns IP decremented by 1
+func PrevIP(ip net.IP) net.IP {
+	i := ipToInt(ip)
+	return intToIP(i.Sub(i, big.NewInt(1)))
+}
+
+func ipToInt(ip net.IP) *big.Int {
+	if v := ip.To4(); v != nil {
+		return big.NewInt(0).SetBytes(v)
+	}
+	return big.NewInt(0).SetBytes(ip.To16())
+}
+
+func intToIP(i *big.Int) net.IP {
+	return net.IP(i.Bytes())
+}
+
+// Network masks off the host portion of the IP
+func Network(ipn *net.IPNet) *net.IPNet {
+	return &net.IPNet{
+		IP:   ipn.IP.Mask(ipn.Mask),
+		Mask: ipn.Mask,
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipforward.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipforward.go
new file mode 100644
index 0000000000..77ee74632a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipforward.go
@@ -0,0 +1,31 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"io/ioutil"
+)
+
+func EnableIP4Forward() error {
+	return echo1("/proc/sys/net/ipv4/ip_forward")
+}
+
+func EnableIP6Forward() error {
+	return echo1("/proc/sys/net/ipv6/conf/all/forwarding")
+}
+
+func echo1(f string) error {
+	return ioutil.WriteFile(f, []byte("1"), 0644)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipmasq.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipmasq.go
new file mode 100644
index 0000000000..8ee279717a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipmasq.go
@@ -0,0 +1,66 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/coreos/go-iptables/iptables"
+)
+
+// SetupIPMasq installs iptables rules to masquerade traffic
+// coming from ipn and going outside of it
+func SetupIPMasq(ipn *net.IPNet, chain string, comment string) error {
+	ipt, err := iptables.New()
+	if err != nil {
+		return fmt.Errorf("failed to locate iptables: %v", err)
+	}
+
+	if err = ipt.NewChain("nat", chain); err != nil {
+		if err.(*iptables.Error).ExitStatus() != 1 {
+			// TODO(eyakubovich): assumes exit status 1 implies chain exists
+			return err
+		}
+	}
+
+	if err = ipt.AppendUnique("nat", chain, "-d", ipn.String(), "-j", "ACCEPT", "-m", "comment", "--comment", comment); err != nil {
+		return err
+	}
+
+	if err = ipt.AppendUnique("nat", chain, "!", "-d", "224.0.0.0/4", "-j", "MASQUERADE", "-m", "comment", "--comment", comment); err != nil {
+		return err
+	}
+
+	return ipt.AppendUnique("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment)
+}
+
+// TeardownIPMasq undoes the effects of SetupIPMasq
+func TeardownIPMasq(ipn *net.IPNet, chain string, comment string) error {
+	ipt, err := iptables.New()
+	if err != nil {
+		return fmt.Errorf("failed to locate iptables: %v", err)
+	}
+
+	if err = ipt.Delete("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment); err != nil {
+		return err
+	}
+
+	if err = ipt.ClearChain("nat", chain); err != nil {
+		return err
+	}
+
+	return ipt.DeleteChain("nat", chain)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/link.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/link.go
new file mode 100644
index 0000000000..1b78567201
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/link.go
@@ -0,0 +1,153 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"crypto/rand"
+	"fmt"
+	"net"
+	"os"
+
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/vishvananda/netlink"
+)
+
+func makeVethPair(name, peer string, mtu int) (netlink.Link, error) {
+	veth := &netlink.Veth{
+		LinkAttrs: netlink.LinkAttrs{
+			Name:  name,
+			Flags: net.FlagUp,
+			MTU:   mtu,
+		},
+		PeerName: peer,
+	}
+	if err := netlink.LinkAdd(veth); err != nil {
+		return nil, err
+	}
+
+	return veth, nil
+}
+
+func makeVeth(name string, mtu int) (peerName string, veth netlink.Link, err error) {
+	for i := 0; i < 10; i++ {
+		peerName, err = RandomVethName()
+		if err != nil {
+			return
+		}
+
+		veth, err = makeVethPair(name, peerName, mtu)
+		switch {
+		case err == nil:
+			return
+
+		case os.IsExist(err):
+			continue
+
+		default:
+			err = fmt.Errorf("failed to make veth pair: %v", err)
+			return
+		}
+	}
+
+	// should really never be hit
+	err = fmt.Errorf("failed to find a unique veth name")
+	return
+}
+
+// RandomVethName returns string "veth" with random prefix (hashed from entropy)
+func RandomVethName() (string, error) {
+	entropy := make([]byte, 4)
+	_, err := rand.Reader.Read(entropy)
+	if err != nil {
+		return "", fmt.Errorf("failed to generate random veth name: %v", err)
+	}
+
+	// NetworkManager (recent versions) will ignore veth devices that start with "veth"
+	return fmt.Sprintf("veth%x", entropy), nil
+}
+
+// SetupVeth sets up a virtual ethernet link.
+// Should be in container netns, and will switch back to hostNS to set the host
+// veth end up.
+func SetupVeth(contVethName string, mtu int, hostNS ns.NetNS) (hostVeth, contVeth netlink.Link, err error) {
+	var hostVethName string
+	hostVethName, contVeth, err = makeVeth(contVethName, mtu)
+	if err != nil {
+		return
+	}
+
+	if err = netlink.LinkSetUp(contVeth); err != nil {
+		err = fmt.Errorf("failed to set %q up: %v", contVethName, err)
+		return
+	}
+
+	hostVeth, err = netlink.LinkByName(hostVethName)
+	if err != nil {
+		err = fmt.Errorf("failed to lookup %q: %v", hostVethName, err)
+		return
+	}
+
+	if err = netlink.LinkSetNsFd(hostVeth, int(hostNS.Fd())); err != nil {
+		err = fmt.Errorf("failed to move veth to host netns: %v", err)
+		return
+	}
+
+	err = hostNS.Do(func(_ ns.NetNS) error {
+		hostVeth, err := netlink.LinkByName(hostVethName)
+		if err != nil {
+			return fmt.Errorf("failed to lookup %q in %q: %v", hostVethName, hostNS.Path(), err)
+		}
+
+		if err = netlink.LinkSetUp(hostVeth); err != nil {
+			return fmt.Errorf("failed to set %q up: %v", hostVethName, err)
+		}
+		return nil
+	})
+	return
+}
+
+// DelLinkByName removes an interface link.
+func DelLinkByName(ifName string) error {
+	iface, err := netlink.LinkByName(ifName)
+	if err != nil {
+		return fmt.Errorf("failed to lookup %q: %v", ifName, err)
+	}
+
+	if err = netlink.LinkDel(iface); err != nil {
+		return fmt.Errorf("failed to delete %q: %v", ifName, err)
+	}
+
+	return nil
+}
+
+// DelLinkByNameAddr remove an interface returns its IP address
+// of the specified family
+func DelLinkByNameAddr(ifName string, family int) (*net.IPNet, error) {
+	iface, err := netlink.LinkByName(ifName)
+	if err != nil {
+		return nil, fmt.Errorf("failed to lookup %q: %v", ifName, err)
+	}
+
+	addrs, err := netlink.AddrList(iface, family)
+	if err != nil || len(addrs) == 0 {
+		return nil, fmt.Errorf("failed to get IP addresses for %q: %v", ifName, err)
+	}
+
+	if err = netlink.LinkDel(iface); err != nil {
+		return nil, fmt.Errorf("failed to delete %q: %v", ifName, err)
+	}
+
+	return addrs[0].IPNet, nil
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/route.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/route.go
new file mode 100644
index 0000000000..6c8658b2a2
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/route.go
@@ -0,0 +1,47 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"net"
+
+	"github.com/vishvananda/netlink"
+)
+
+// AddDefaultRoute sets the default route on the given gateway.
+func AddDefaultRoute(gw net.IP, dev netlink.Link) error {
+	_, defNet, _ := net.ParseCIDR("0.0.0.0/0")
+	return AddRoute(defNet, gw, dev)
+}
+
+// AddRoute adds a universally-scoped route to a device.
+func AddRoute(ipn *net.IPNet, gw net.IP, dev netlink.Link) error {
+	return netlink.RouteAdd(&netlink.Route{
+		LinkIndex: dev.Attrs().Index,
+		Scope:     netlink.SCOPE_UNIVERSE,
+		Dst:       ipn,
+		Gw:        gw,
+	})
+}
+
+// AddHostRoute adds a host-scoped route to a device.
+func AddHostRoute(ipn *net.IPNet, gw net.IP, dev netlink.Link) error {
+	return netlink.RouteAdd(&netlink.Route{
+		LinkIndex: dev.Attrs().Index,
+		Scope:     netlink.SCOPE_HOST,
+		Dst:       ipn,
+		Gw:        gw,
+	})
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/README.md b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/README.md
new file mode 100644
index 0000000000..e7b20c2f9b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/README.md
@@ -0,0 +1,31 @@
+### Namespaces, Threads, and Go
+On Linux each OS thread can have a different network namespace.  Go's thread scheduling model switches goroutines between OS threads based on OS thread load and whether the goroutine would block other goroutines.  This can result in a goroutine switching network namespaces without notice and lead to errors in your code.
+
+### Namespace Switching
+Switching namespaces with the `ns.Set()` method is not recommended without additional strategies to prevent unexpected namespace changes when your goroutines switch OS threads.
+
+Go provides the `runtime.LockOSThread()` function to ensure a specific goroutine executes on its current OS thread and prevents any other goroutine from running in that thread until the locked one exits.  Careful usage of `LockOSThread()` and goroutines can provide good control over which network namespace a given goroutine executes in.
+
+For example, you cannot rely on the `ns.Set()` namespace being the current namespace after the `Set()` call unless you do two things.  First, the goroutine calling `Set()` must have previously called `LockOSThread()`.  Second, you must ensure `runtime.UnlockOSThread()` is not called somewhere in-between.  You also cannot rely on the initial network namespace remaining the current network namespace if any other code in your program switches namespaces, unless you have already called `LockOSThread()` in that goroutine.  Note that `LockOSThread()` prevents the Go scheduler from optimally scheduling goroutines for best performance, so `LockOSThread()` should only be used in small, isolated goroutines that release the lock quickly.
+
+### Do() The Recommended Thing
+The `ns.Do()` method provides control over network namespaces for you by implementing these strategies. All code dependent on a particular network namespace should be wrapped in the `ns.Do()` method to ensure the correct namespace is selected for the duration of your code.  For example:
+
+```go
+targetNs, err := ns.NewNS()
+if err != nil {
+    return err
+}
+err = targetNs.Do(func(hostNs ns.NetNS) error {
+	dummy := &netlink.Dummy{
+		LinkAttrs: netlink.LinkAttrs{
+			Name: "dummy0",
+		},
+	}
+	return netlink.LinkAdd(dummy)
+})
+```
+
+### Further Reading
+ - https://github.com/golang/go/wiki/LockOSThread
+ - http://morsmachine.dk/go-scheduler
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/ns.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/ns.go
new file mode 100644
index 0000000000..e29f712ce1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/ns.go
@@ -0,0 +1,315 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ns
+
+import (
+	"crypto/rand"
+	"fmt"
+	"os"
+	"path"
+	"runtime"
+	"strings"
+	"sync"
+	"syscall"
+
+	"golang.org/x/sys/unix"
+)
+
+type NetNS interface {
+	// Executes the passed closure in this object's network namespace,
+	// attemtping to restore the original namespace before returning.
+	// However, since each OS thread can have a different network namespace,
+	// and Go's thread scheduling is highly variable, callers cannot
+	// guarantee any specific namespace is set unless operations that
+	// require that namespace are wrapped with Do().  Also, no code called
+	// from Do() should call runtime.UnlockOSThread(), or the risk
+	// of executing code in an incorrect namespace will be greater.  See
+	// https://github.com/golang/go/wiki/LockOSThread for further details.
+	Do(toRun func(NetNS) error) error
+
+	// Sets the current network namespace to this object's network namespace.
+	// Note that since Go's thread scheduling is highly variable, callers
+	// cannot guarantee the requested namespace will be the current namespace
+	// after this function is called; to ensure this wrap operations that
+	// require the namespace with Do() instead.
+	Set() error
+
+	// Returns the filesystem path representing this object's network namespace
+	Path() string
+
+	// Returns a file descriptor representing this object's network namespace
+	Fd() uintptr
+
+	// Cleans up this instance of the network namespace; if this instance
+	// is the last user the namespace will be destroyed
+	Close() error
+}
+
+type netNS struct {
+	file    *os.File
+	mounted bool
+	closed  bool
+}
+
+func getCurrentThreadNetNSPath() string {
+	// /proc/self/ns/net returns the namespace of the main thread, not
+	// of whatever thread this goroutine is running on.  Make sure we
+	// use the thread's net namespace since the thread is switching around
+	return fmt.Sprintf("/proc/%d/task/%d/ns/net", os.Getpid(), unix.Gettid())
+}
+
+// Returns an object representing the current OS thread's network namespace
+func GetCurrentNS() (NetNS, error) {
+	return GetNS(getCurrentThreadNetNSPath())
+}
+
+const (
+	// https://github.com/torvalds/linux/blob/master/include/uapi/linux/magic.h
+	NSFS_MAGIC   = 0x6e736673
+	PROCFS_MAGIC = 0x9fa0
+)
+
+type NSPathNotExistErr struct{ msg string }
+
+func (e NSPathNotExistErr) Error() string { return e.msg }
+
+type NSPathNotNSErr struct{ msg string }
+
+func (e NSPathNotNSErr) Error() string { return e.msg }
+
+func IsNSorErr(nspath string) error {
+	stat := syscall.Statfs_t{}
+	if err := syscall.Statfs(nspath, &stat); err != nil {
+		if os.IsNotExist(err) {
+			err = NSPathNotExistErr{msg: fmt.Sprintf("failed to Statfs %q: %v", nspath, err)}
+		} else {
+			err = fmt.Errorf("failed to Statfs %q: %v", nspath, err)
+		}
+		return err
+	}
+
+	switch stat.Type {
+	case PROCFS_MAGIC:
+		// Kernel < 3.19
+
+		validPathContent := "ns/"
+		validName := strings.Contains(nspath, validPathContent)
+		if !validName {
+			return NSPathNotNSErr{msg: fmt.Sprintf("path %q doesn't contain %q", nspath, validPathContent)}
+		}
+
+		return nil
+	case NSFS_MAGIC:
+		// Kernel >= 3.19
+
+		return nil
+	default:
+		return NSPathNotNSErr{msg: fmt.Sprintf("unknown FS magic on %q: %x", nspath, stat.Type)}
+	}
+}
+
+// Returns an object representing the namespace referred to by @path
+func GetNS(nspath string) (NetNS, error) {
+	err := IsNSorErr(nspath)
+	if err != nil {
+		return nil, err
+	}
+
+	fd, err := os.Open(nspath)
+	if err != nil {
+		return nil, err
+	}
+
+	return &netNS{file: fd}, nil
+}
+
+// Creates a new persistent network namespace and returns an object
+// representing that namespace, without switching to it
+func NewNS() (NetNS, error) {
+	const nsRunDir = "/var/run/netns"
+
+	b := make([]byte, 16)
+	_, err := rand.Reader.Read(b)
+	if err != nil {
+		return nil, fmt.Errorf("failed to generate random netns name: %v", err)
+	}
+
+	err = os.MkdirAll(nsRunDir, 0755)
+	if err != nil {
+		return nil, err
+	}
+
+	// create an empty file at the mount point
+	nsName := fmt.Sprintf("cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
+	nsPath := path.Join(nsRunDir, nsName)
+	mountPointFd, err := os.Create(nsPath)
+	if err != nil {
+		return nil, err
+	}
+	mountPointFd.Close()
+
+	// Ensure the mount point is cleaned up on errors; if the namespace
+	// was successfully mounted this will have no effect because the file
+	// is in-use
+	defer os.RemoveAll(nsPath)
+
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	// do namespace work in a dedicated goroutine, so that we can safely
+	// Lock/Unlock OSThread without upsetting the lock/unlock state of
+	// the caller of this function
+	var fd *os.File
+	go (func() {
+		defer wg.Done()
+		runtime.LockOSThread()
+
+		var origNS NetNS
+		origNS, err = GetNS(getCurrentThreadNetNSPath())
+		if err != nil {
+			return
+		}
+		defer origNS.Close()
+
+		// create a new netns on the current thread
+		err = unix.Unshare(unix.CLONE_NEWNET)
+		if err != nil {
+			return
+		}
+		defer origNS.Set()
+
+		// bind mount the new netns from the current thread onto the mount point
+		err = unix.Mount(getCurrentThreadNetNSPath(), nsPath, "none", unix.MS_BIND, "")
+		if err != nil {
+			return
+		}
+
+		fd, err = os.Open(nsPath)
+		if err != nil {
+			return
+		}
+	})()
+	wg.Wait()
+
+	if err != nil {
+		unix.Unmount(nsPath, unix.MNT_DETACH)
+		return nil, fmt.Errorf("failed to create namespace: %v", err)
+	}
+
+	return &netNS{file: fd, mounted: true}, nil
+}
+
+func (ns *netNS) Path() string {
+	return ns.file.Name()
+}
+
+func (ns *netNS) Fd() uintptr {
+	return ns.file.Fd()
+}
+
+func (ns *netNS) errorIfClosed() error {
+	if ns.closed {
+		return fmt.Errorf("%q has already been closed", ns.file.Name())
+	}
+	return nil
+}
+
+func (ns *netNS) Close() error {
+	if err := ns.errorIfClosed(); err != nil {
+		return err
+	}
+
+	if err := ns.file.Close(); err != nil {
+		return fmt.Errorf("Failed to close %q: %v", ns.file.Name(), err)
+	}
+	ns.closed = true
+
+	if ns.mounted {
+		if err := unix.Unmount(ns.file.Name(), unix.MNT_DETACH); err != nil {
+			return fmt.Errorf("Failed to unmount namespace %s: %v", ns.file.Name(), err)
+		}
+		if err := os.RemoveAll(ns.file.Name()); err != nil {
+			return fmt.Errorf("Failed to clean up namespace %s: %v", ns.file.Name(), err)
+		}
+		ns.mounted = false
+	}
+
+	return nil
+}
+
+func (ns *netNS) Do(toRun func(NetNS) error) error {
+	if err := ns.errorIfClosed(); err != nil {
+		return err
+	}
+
+	containedCall := func(hostNS NetNS) error {
+		threadNS, err := GetNS(getCurrentThreadNetNSPath())
+		if err != nil {
+			return fmt.Errorf("failed to open current netns: %v", err)
+		}
+		defer threadNS.Close()
+
+		// switch to target namespace
+		if err = ns.Set(); err != nil {
+			return fmt.Errorf("error switching to ns %v: %v", ns.file.Name(), err)
+		}
+		defer threadNS.Set() // switch back
+
+		return toRun(hostNS)
+	}
+
+	// save a handle to current network namespace
+	hostNS, err := GetNS(getCurrentThreadNetNSPath())
+	if err != nil {
+		return fmt.Errorf("Failed to open current namespace: %v", err)
+	}
+	defer hostNS.Close()
+
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	var innerError error
+	go func() {
+		defer wg.Done()
+		runtime.LockOSThread()
+		innerError = containedCall(hostNS)
+	}()
+	wg.Wait()
+
+	return innerError
+}
+
+func (ns *netNS) Set() error {
+	if err := ns.errorIfClosed(); err != nil {
+		return err
+	}
+
+	if _, _, err := unix.Syscall(unix.SYS_SETNS, ns.Fd(), uintptr(unix.CLONE_NEWNET), 0); err != 0 {
+		return fmt.Errorf("Error switching to ns %v: %v", ns.file.Name(), err)
+	}
+
+	return nil
+}
+
+// WithNetNSPath executes the passed closure under the given network
+// namespace, restoring the original namespace afterwards.
+func WithNetNSPath(nspath string, toRun func(NetNS) error) error {
+	ns, err := GetNS(nspath)
+	if err != nil {
+		return err
+	}
+	defer ns.Close()
+	return ns.Do(toRun)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/args.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/args.go
new file mode 100644
index 0000000000..3b667b0f20
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/args.go
@@ -0,0 +1,91 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// UnmarshallableBool typedef for builtin bool
+// because builtin type's methods can't be declared
+type UnmarshallableBool bool
+
+// UnmarshalText implements the encoding.TextUnmarshaler interface.
+// Returns boolean true if the string is "1" or "[Tt]rue"
+// Returns boolean false if the string is "0" or "[Ff]alse"
+func (b *UnmarshallableBool) UnmarshalText(data []byte) error {
+	s := strings.ToLower(string(data))
+	switch s {
+	case "1", "true":
+		*b = true
+	case "0", "false":
+		*b = false
+	default:
+		return fmt.Errorf("Boolean unmarshal error: invalid input %s", s)
+	}
+	return nil
+}
+
+// CommonArgs contains the IgnoreUnknown argument
+// and must be embedded by all Arg structs
+type CommonArgs struct {
+	IgnoreUnknown UnmarshallableBool `json:"ignoreunknown,omitempty"`
+}
+
+// GetKeyField is a helper function to receive Values
+// Values that represent a pointer to a struct
+func GetKeyField(keyString string, v reflect.Value) reflect.Value {
+	return v.Elem().FieldByName(keyString)
+}
+
+// LoadArgs parses args from a string in the form "K=V;K2=V2;..."
+func LoadArgs(args string, container interface{}) error {
+	if args == "" {
+		return nil
+	}
+
+	containerValue := reflect.ValueOf(container)
+
+	pairs := strings.Split(args, ";")
+	unknownArgs := []string{}
+	for _, pair := range pairs {
+		kv := strings.Split(pair, "=")
+		if len(kv) != 2 {
+			return fmt.Errorf("ARGS: invalid pair %q", pair)
+		}
+		keyString := kv[0]
+		valueString := kv[1]
+		keyField := GetKeyField(keyString, containerValue)
+		if !keyField.IsValid() {
+			unknownArgs = append(unknownArgs, pair)
+			continue
+		}
+
+		u := keyField.Addr().Interface().(encoding.TextUnmarshaler)
+		err := u.UnmarshalText([]byte(valueString))
+		if err != nil {
+			return fmt.Errorf("ARGS: error parsing value of pair %q: %v)", pair, err)
+		}
+	}
+
+	isIgnoreUnknown := GetKeyField("IgnoreUnknown", containerValue).Bool()
+	if len(unknownArgs) > 0 && !isIgnoreUnknown {
+		return fmt.Errorf("ARGS: unknown args %q", unknownArgs)
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/types.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/types.go
new file mode 100644
index 0000000000..6948dcb1fb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/types.go
@@ -0,0 +1,191 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+	"net"
+	"os"
+)
+
+// like net.IPNet but adds JSON marshalling and unmarshalling
+type IPNet net.IPNet
+
+// ParseCIDR takes a string like "10.2.3.1/24" and
+// return IPNet with "10.2.3.1" and /24 mask
+func ParseCIDR(s string) (*net.IPNet, error) {
+	ip, ipn, err := net.ParseCIDR(s)
+	if err != nil {
+		return nil, err
+	}
+
+	ipn.IP = ip
+	return ipn, nil
+}
+
+func (n IPNet) MarshalJSON() ([]byte, error) {
+	return json.Marshal((*net.IPNet)(&n).String())
+}
+
+func (n *IPNet) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+
+	tmp, err := ParseCIDR(s)
+	if err != nil {
+		return err
+	}
+
+	*n = IPNet(*tmp)
+	return nil
+}
+
+// NetConf describes a network.
+type NetConf struct {
+	Name string `json:"name,omitempty"`
+	Type string `json:"type,omitempty"`
+	IPAM struct {
+		Type string `json:"type,omitempty"`
+	} `json:"ipam,omitempty"`
+	DNS DNS `json:"dns"`
+}
+
+// Result is what gets returned from the plugin (via stdout) to the caller
+type Result struct {
+	IP4 *IPConfig `json:"ip4,omitempty"`
+	IP6 *IPConfig `json:"ip6,omitempty"`
+	DNS DNS       `json:"dns,omitempty"`
+}
+
+func (r *Result) Print() error {
+	return prettyPrint(r)
+}
+
+// String returns a formatted string in the form of "[IP4: $1,][ IP6: $2,] DNS: $3" where
+// $1 represents the receiver's IPv4, $2 represents the receiver's IPv6 and $3 the
+// receiver's DNS. If $1 or $2 are nil, they won't be present in the returned string.
+func (r *Result) String() string {
+	var str string
+	if r.IP4 != nil {
+		str = fmt.Sprintf("IP4:%+v, ", *r.IP4)
+	}
+	if r.IP6 != nil {
+		str += fmt.Sprintf("IP6:%+v, ", *r.IP6)
+	}
+	return fmt.Sprintf("%sDNS:%+v", str, r.DNS)
+}
+
+// IPConfig contains values necessary to configure an interface
+type IPConfig struct {
+	IP      net.IPNet
+	Gateway net.IP
+	Routes  []Route
+}
+
+// DNS contains values interesting for DNS resolvers
+type DNS struct {
+	Nameservers []string `json:"nameservers,omitempty"`
+	Domain      string   `json:"domain,omitempty"`
+	Search      []string `json:"search,omitempty"`
+	Options     []string `json:"options,omitempty"`
+}
+
+type Route struct {
+	Dst net.IPNet
+	GW  net.IP
+}
+
+type Error struct {
+	Code    uint   `json:"code"`
+	Msg     string `json:"msg"`
+	Details string `json:"details,omitempty"`
+}
+
+func (e *Error) Error() string {
+	return e.Msg
+}
+
+func (e *Error) Print() error {
+	return prettyPrint(e)
+}
+
+// net.IPNet is not JSON (un)marshallable so this duality is needed
+// for our custom IPNet type
+
+// JSON (un)marshallable types
+type ipConfig struct {
+	IP      IPNet   `json:"ip"`
+	Gateway net.IP  `json:"gateway,omitempty"`
+	Routes  []Route `json:"routes,omitempty"`
+}
+
+type route struct {
+	Dst IPNet  `json:"dst"`
+	GW  net.IP `json:"gw,omitempty"`
+}
+
+func (c *IPConfig) MarshalJSON() ([]byte, error) {
+	ipc := ipConfig{
+		IP:      IPNet(c.IP),
+		Gateway: c.Gateway,
+		Routes:  c.Routes,
+	}
+
+	return json.Marshal(ipc)
+}
+
+func (c *IPConfig) UnmarshalJSON(data []byte) error {
+	ipc := ipConfig{}
+	if err := json.Unmarshal(data, &ipc); err != nil {
+		return err
+	}
+
+	c.IP = net.IPNet(ipc.IP)
+	c.Gateway = ipc.Gateway
+	c.Routes = ipc.Routes
+	return nil
+}
+
+func (r *Route) UnmarshalJSON(data []byte) error {
+	rt := route{}
+	if err := json.Unmarshal(data, &rt); err != nil {
+		return err
+	}
+
+	r.Dst = net.IPNet(rt.Dst)
+	r.GW = rt.GW
+	return nil
+}
+
+func (r *Route) MarshalJSON() ([]byte, error) {
+	rt := route{
+		Dst: IPNet(r.Dst),
+		GW:  r.GW,
+	}
+
+	return json.Marshal(rt)
+}
+
+func prettyPrint(obj interface{}) error {
+	data, err := json.MarshalIndent(obj, "", "    ")
+	if err != nil {
+		return err
+	}
+	_, err = os.Stdout.Write(data)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/utils.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/utils.go
new file mode 100644
index 0000000000..33a2aa7960
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/utils.go
@@ -0,0 +1,41 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package utils
+
+import (
+	"crypto/sha512"
+	"fmt"
+)
+
+const (
+	maxChainLength = 28
+	chainPrefix    = "CNI-"
+	prefixLength   = len(chainPrefix)
+)
+
+// Generates a chain name to be used with iptables.
+// Ensures that the generated chain name is exactly
+// maxChainLength chars in length
+func FormatChainName(name string, id string) string {
+	chainBytes := sha512.Sum512([]byte(name + id))
+	chain := fmt.Sprintf("%s%x", chainPrefix, chainBytes)
+	return chain[:maxChainLength]
+}
+
+// FormatComment returns a comment used for easier
+// rule identification within iptables.
+func FormatComment(name string, id string) string {
+	return fmt.Sprintf("name: %q id: %q", name, id)
+}
diff --git a/networking/kvm.go b/networking/kvm.go
index 4019370c97..e57cc99d91 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -27,10 +27,10 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/appc/cni/pkg/ip"
-	cnitypes "github.com/appc/cni/pkg/types"
-	cniutils "github.com/appc/cni/pkg/utils"
 	"github.com/appc/spec/schema/types"
+	"github.com/containernetworking/cni/pkg/ip"
+	cnitypes "github.com/containernetworking/cni/pkg/types"
+	cniutils "github.com/containernetworking/cni/pkg/utils"
 	"github.com/hashicorp/errwrap"
 	"github.com/vishvananda/netlink"
 
diff --git a/networking/net_plugin.go b/networking/net_plugin.go
index eb86c90d97..652233984b 100644
--- a/networking/net_plugin.go
+++ b/networking/net_plugin.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	cnitypes "github.com/appc/cni/pkg/types"
+	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/hashicorp/errwrap"
 
 	"github.com/coreos/rkt/common"
diff --git a/networking/netinfo/netinfo.go b/networking/netinfo/netinfo.go
index 05c20baba1..fcfa5908c7 100644
--- a/networking/netinfo/netinfo.go
+++ b/networking/netinfo/netinfo.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/appc/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/types"
 )
 
 const filename = "net-info.json"
diff --git a/networking/networking.go b/networking/networking.go
index 61ec25c0c4..f07ee923c0 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/appc/cni/pkg/ns"
-	cnitypes "github.com/appc/cni/pkg/types"
 	"github.com/appc/spec/schema/types"
+	"github.com/containernetworking/cni/pkg/ns"
+	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/hashicorp/errwrap"
 	"github.com/vishvananda/netlink"
 
diff --git a/stage1/init/kvm/network.go b/stage1/init/kvm/network.go
index e4eccc2011..68ce32e47d 100644
--- a/stage1/init/kvm/network.go
+++ b/stage1/init/kvm/network.go
@@ -22,7 +22,7 @@ import (
 	"net"
 	"path/filepath"
 
-	"github.com/appc/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/types"
 	"github.com/coreos/go-systemd/unit"
 	"github.com/coreos/rkt/networking"
 	"github.com/hashicorp/errwrap"
diff --git a/stage1/init/kvm/network_test.go b/stage1/init/kvm/network_test.go
index 019dd87c8c..16699d7fcf 100644
--- a/stage1/init/kvm/network_test.go
+++ b/stage1/init/kvm/network_test.go
@@ -18,7 +18,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/appc/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/types"
 )
 
 type testNetDescriber struct {
diff --git a/vendoredApps b/vendoredApps
index e8b00a1c35..45842df29c 100644
--- a/vendoredApps
+++ b/vendoredApps
@@ -2,14 +2,15 @@
 github.com/appc/spec/actool
 
 # Vendor in CNI plugins, which will become a part of the stage1 image
-github.com/appc/cni/plugins/ipam/dhcp
-github.com/appc/cni/plugins/ipam/host-local
-github.com/appc/cni/plugins/main/bridge
-github.com/appc/cni/plugins/main/ipvlan
-github.com/appc/cni/plugins/main/macvlan
-github.com/appc/cni/plugins/main/ptp
-github.com/appc/cni/plugins/meta/flannel
-github.com/appc/cni/plugins/meta/tuning
+github.com/containernetworking/cni/plugins/ipam/dhcp
+github.com/containernetworking/cni/plugins/ipam/host-local
+github.com/containernetworking/cni/plugins/main/bridge
+github.com/containernetworking/cni/plugins/main/ipvlan
+github.com/containernetworking/cni/plugins/main/lo
+github.com/containernetworking/cni/plugins/main/macvlan
+github.com/containernetworking/cni/plugins/main/ptp
+github.com/containernetworking/cni/plugins/meta/flannel
+github.com/containernetworking/cni/plugins/meta/tuning
 
 # Vendor in ACE, which is used in functional tests
 github.com/appc/spec/ace

From f08211e095a3dfb8fc3bf1abba56a9cacbe4d867 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 27 May 2016 15:08:49 +0200
Subject: [PATCH 0336/1304] deps: fix CNI location in various places

---
 Godeps/Godeps.json                            | 171 ++++-----
 .../cni/pkg/invoke/args.go                    |  76 ++++
 .../cni/pkg/invoke/delegate.go                |  53 +++
 .../cni/pkg/invoke/exec.go                    |  75 ++++
 .../cni/pkg/invoke/find.go                    |  47 +++
 .../containernetworking/cni/pkg/ipam/ipam.go  |  68 ++++
 .../containernetworking/cni/pkg/skel/skel.go  | 161 +++++++++
 .../cni/pkg/testutils/cmd.go                  |  77 ++++
 .../cni/pkg/utils/sysctl/sysctl_linux.go      |  58 +++
 .../cni/plugins/ipam/dhcp/daemon.go           | 157 ++++++++
 .../cni/plugins/ipam/dhcp/lease.go            | 337 ++++++++++++++++++
 .../cni/plugins/ipam/dhcp/main.go             |  73 ++++
 .../cni/plugins/ipam/dhcp/options.go          | 139 ++++++++
 .../cni/plugins/ipam/host-local/README.md     |  86 +++++
 .../cni/plugins/ipam/host-local/allocator.go  | 165 +++++++++
 .../ipam/host-local/backend/disk/backend.go   |  88 +++++
 .../ipam/host-local/backend/disk/lock.go      |  50 +++
 .../plugins/ipam/host-local/backend/store.go  |  26 ++
 .../cni/plugins/ipam/host-local/config.go     |  70 ++++
 .../cni/plugins/ipam/host-local/main.go       |  74 ++++
 .../cni/plugins/main/bridge/bridge.go         | 319 +++++++++++++++++
 .../cni/plugins/main/ipvlan/ipvlan.go         | 175 +++++++++
 .../cni/plugins/main/macvlan/macvlan.go       | 193 ++++++++++
 .../cni/plugins/main/ptp/ptp.go               | 229 ++++++++++++
 .../cni/plugins/meta/flannel/flannel.go       | 253 +++++++++++++
 .../cni/plugins/meta/tuning/tuning.go         |  82 +++++
 stage1/net-plugins/net-plugins.mk             |   4 +-
 vendoredApps                                  |   1 -
 28 files changed, 3211 insertions(+), 96 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/args.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/delegate.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/exec.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/find.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ipam/ipam.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/skel/skel.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/testutils/cmd.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/README.md
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/config.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/main.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/bridge/bridge.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ptp/ptp.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go
 create mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 119c66dc82..83b52305ce 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -5,14 +5,14 @@
 	"Packages": [
 		"./...",
 		"github.com/appc/spec/actool",
-		"github.com/appc/cni/plugins/ipam/dhcp",
-		"github.com/appc/cni/plugins/ipam/host-local",
-		"github.com/appc/cni/plugins/main/bridge",
-		"github.com/appc/cni/plugins/main/ipvlan",
-		"github.com/appc/cni/plugins/main/macvlan",
-		"github.com/appc/cni/plugins/main/ptp",
-		"github.com/appc/cni/plugins/meta/flannel",
-		"github.com/appc/cni/plugins/meta/tuning",
+		"github.com/containernetworking/cni/plugins/ipam/dhcp",
+		"github.com/containernetworking/cni/plugins/ipam/host-local",
+		"github.com/containernetworking/cni/plugins/main/bridge",
+		"github.com/containernetworking/cni/plugins/main/ipvlan",
+		"github.com/containernetworking/cni/plugins/main/macvlan",
+		"github.com/containernetworking/cni/plugins/main/ptp",
+		"github.com/containernetworking/cni/plugins/meta/flannel",
+		"github.com/containernetworking/cni/plugins/meta/tuning",
 		"github.com/appc/spec/ace",
 		"github.com/golang/protobuf/protoc-gen-go"
 	],
@@ -21,91 +21,6 @@
 			"ImportPath": "github.com/StackExchange/wmi",
 			"Rev": "f3e2bae1e0cb5aef83e319133eabfee30013a4a5"
 		},
-		{
-			"ImportPath": "github.com/appc/cni/pkg/invoke",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/pkg/ip",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/pkg/ipam",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/pkg/ns",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/pkg/skel",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/pkg/types",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/pkg/utils",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/ipam/dhcp",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local/backend",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/ipam/host-local/backend/disk",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/main/bridge",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/main/ipvlan",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/main/macvlan",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/main/ptp",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/meta/flannel",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
-		{
-			"ImportPath": "github.com/appc/cni/plugins/meta/tuning",
-			"Comment": "v0.2.3",
-			"Rev": "b634ff6bcd406a6f8ca9405b018787ef53d82dc2"
-		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib",
 			"Comment": "v0.9.3",
@@ -275,6 +190,11 @@
 			"Comment": "v0.3.0-rc3",
 			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
 		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/ipam",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/ns",
 			"Comment": "v0.3.0-rc3",
@@ -290,6 +210,16 @@
 			"Comment": "v0.3.0-rc3",
 			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
 		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/skel",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/testutils",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types",
 			"Comment": "v0.3.0-rc3",
@@ -355,6 +285,61 @@
 			"Comment": "v0.3.0-rc3",
 			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
 		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/pkg/utils/sysctl",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/dhcp",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local/backend",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/main/bridge",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/main/ipvlan",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/main/macvlan",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/main/ptp",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/meta/flannel",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
+		{
+			"ImportPath": "github.com/containernetworking/cni/plugins/meta/tuning",
+			"Comment": "v0.3.0-rc2-5-g35f3a09",
+			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
+		},
 		{
 			"ImportPath": "github.com/coreos/gexpect",
 			"Comment": "v0.1.0",
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/args.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/args.go
new file mode 100644
index 0000000000..be28ba621f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/args.go
@@ -0,0 +1,76 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"os"
+	"strings"
+)
+
+type CNIArgs interface {
+	// For use with os/exec; i.e., return nil to inherit the
+	// environment from this process
+	AsEnv() []string
+}
+
+type inherited struct{}
+
+var inheritArgsFromEnv inherited
+
+func (_ *inherited) AsEnv() []string {
+	return nil
+}
+
+func ArgsFromEnv() CNIArgs {
+	return &inheritArgsFromEnv
+}
+
+type Args struct {
+	Command       string
+	ContainerID   string
+	NetNS         string
+	PluginArgs    [][2]string
+	PluginArgsStr string
+	IfName        string
+	Path          string
+}
+
+func (args *Args) AsEnv() []string {
+	env := os.Environ()
+	pluginArgsStr := args.PluginArgsStr
+	if pluginArgsStr == "" {
+		pluginArgsStr = stringify(args.PluginArgs)
+	}
+
+	env = append(env,
+		"CNI_COMMAND="+args.Command,
+		"CNI_CONTAINERID="+args.ContainerID,
+		"CNI_NETNS="+args.NetNS,
+		"CNI_ARGS="+pluginArgsStr,
+		"CNI_IFNAME="+args.IfName,
+		"CNI_PATH="+args.Path)
+	return env
+}
+
+// taken from rkt/networking/net_plugin.go
+func stringify(pluginArgs [][2]string) string {
+	entries := make([]string, len(pluginArgs))
+
+	for i, kv := range pluginArgs {
+		entries[i] = strings.Join(kv[:], "=")
+	}
+
+	return strings.Join(entries, ";")
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/delegate.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/delegate.go
new file mode 100644
index 0000000000..ddf1d17274
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/delegate.go
@@ -0,0 +1,53 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+func DelegateAdd(delegatePlugin string, netconf []byte) (*types.Result, error) {
+	if os.Getenv("CNI_COMMAND") != "ADD" {
+		return nil, fmt.Errorf("CNI_COMMAND is not ADD")
+	}
+
+	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
+
+	pluginPath, err := FindInPath(delegatePlugin, paths)
+	if err != nil {
+		return nil, err
+	}
+
+	return ExecPluginWithResult(pluginPath, netconf, ArgsFromEnv())
+}
+
+func DelegateDel(delegatePlugin string, netconf []byte) error {
+	if os.Getenv("CNI_COMMAND") != "DEL" {
+		return fmt.Errorf("CNI_COMMAND is not DEL")
+	}
+
+	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
+
+	pluginPath, err := FindInPath(delegatePlugin, paths)
+	if err != nil {
+		return err
+	}
+
+	return ExecPluginWithoutResult(pluginPath, netconf, ArgsFromEnv())
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/exec.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/exec.go
new file mode 100644
index 0000000000..a85eede66a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/exec.go
@@ -0,0 +1,75 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+func pluginErr(err error, output []byte) error {
+	if _, ok := err.(*exec.ExitError); ok {
+		emsg := types.Error{}
+		if perr := json.Unmarshal(output, &emsg); perr != nil {
+			return fmt.Errorf("netplugin failed but error parsing its diagnostic message %q: %v", string(output), perr)
+		}
+		details := ""
+		if emsg.Details != "" {
+			details = fmt.Sprintf("; %v", emsg.Details)
+		}
+		return fmt.Errorf("%v%v", emsg.Msg, details)
+	}
+
+	return err
+}
+
+func ExecPluginWithResult(pluginPath string, netconf []byte, args CNIArgs) (*types.Result, error) {
+	stdoutBytes, err := execPlugin(pluginPath, netconf, args)
+	if err != nil {
+		return nil, err
+	}
+
+	res := &types.Result{}
+	err = json.Unmarshal(stdoutBytes, res)
+	return res, err
+}
+
+func ExecPluginWithoutResult(pluginPath string, netconf []byte, args CNIArgs) error {
+	_, err := execPlugin(pluginPath, netconf, args)
+	return err
+}
+
+func execPlugin(pluginPath string, netconf []byte, args CNIArgs) ([]byte, error) {
+	stdout := &bytes.Buffer{}
+
+	c := exec.Cmd{
+		Env:    args.AsEnv(),
+		Path:   pluginPath,
+		Args:   []string{pluginPath},
+		Stdin:  bytes.NewBuffer(netconf),
+		Stdout: stdout,
+		Stderr: os.Stderr,
+	}
+	if err := c.Run(); err != nil {
+		return nil, pluginErr(err, stdout.Bytes())
+	}
+
+	return stdout.Bytes(), nil
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/find.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/find.go
new file mode 100644
index 0000000000..3b03790711
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/find.go
@@ -0,0 +1,47 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+// FindInPath returns the full path of the plugin by searching in the provided path
+func FindInPath(plugin string, paths []string) (string, error) {
+	if plugin == "" {
+		return "", fmt.Errorf("no plugin name provided")
+	}
+
+	if len(paths) == 0 {
+		return "", fmt.Errorf("no paths provided")
+	}
+
+	var fullpath string
+	for _, path := range paths {
+		full := filepath.Join(path, plugin)
+		if fi, err := os.Stat(full); err == nil && fi.Mode().IsRegular() {
+			fullpath = full
+			break
+		}
+	}
+
+	if fullpath == "" {
+		return "", fmt.Errorf("failed to find plugin %q in path %s", plugin, paths)
+	}
+
+	return fullpath, nil
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ipam/ipam.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ipam/ipam.go
new file mode 100644
index 0000000000..d9fbff74c7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ipam/ipam.go
@@ -0,0 +1,68 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ipam
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/containernetworking/cni/pkg/invoke"
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/types"
+
+	"github.com/vishvananda/netlink"
+)
+
+func ExecAdd(plugin string, netconf []byte) (*types.Result, error) {
+	return invoke.DelegateAdd(plugin, netconf)
+}
+
+func ExecDel(plugin string, netconf []byte) error {
+	return invoke.DelegateDel(plugin, netconf)
+}
+
+// ConfigureIface takes the result of IPAM plugin and
+// applies to the ifName interface
+func ConfigureIface(ifName string, res *types.Result) error {
+	link, err := netlink.LinkByName(ifName)
+	if err != nil {
+		return fmt.Errorf("failed to lookup %q: %v", ifName, err)
+	}
+
+	if err := netlink.LinkSetUp(link); err != nil {
+		return fmt.Errorf("failed to set %q UP: %v", ifName, err)
+	}
+
+	// TODO(eyakubovich): IPv6
+	addr := &netlink.Addr{IPNet: &res.IP4.IP, Label: ""}
+	if err = netlink.AddrAdd(link, addr); err != nil {
+		return fmt.Errorf("failed to add IP addr to %q: %v", ifName, err)
+	}
+
+	for _, r := range res.IP4.Routes {
+		gw := r.GW
+		if gw == nil {
+			gw = res.IP4.Gateway
+		}
+		if err = ip.AddRoute(&r.Dst, gw, link); err != nil {
+			// we skip over duplicate routes as we assume the first one wins
+			if !os.IsExist(err) {
+				return fmt.Errorf("failed to add route '%v via %v dev %v': %v", r.Dst, gw, ifName, err)
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/skel/skel.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/skel/skel.go
new file mode 100644
index 0000000000..9cf03917b4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/skel/skel.go
@@ -0,0 +1,161 @@
+// Copyright 2014 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package skel provides skeleton code for a CNI plugin.
+// In particular, it implements argument parsing and validation.
+package skel
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+// CmdArgs captures all the arguments passed in to the plugin
+// via both env vars and stdin
+type CmdArgs struct {
+	ContainerID string
+	Netns       string
+	IfName      string
+	Args        string
+	Path        string
+	StdinData   []byte
+}
+
+type reqForCmdEntry map[string]bool
+
+// PluginMain is the "main" for a plugin. It accepts
+// two callback functions for add and del commands.
+func PluginMain(cmdAdd, cmdDel func(_ *CmdArgs) error) {
+	var cmd, contID, netns, ifName, args, path string
+
+	vars := []struct {
+		name      string
+		val       *string
+		reqForCmd reqForCmdEntry
+	}{
+		{
+			"CNI_COMMAND",
+			&cmd,
+			reqForCmdEntry{
+				"ADD": true,
+				"DEL": true,
+			},
+		},
+		{
+			"CNI_CONTAINERID",
+			&contID,
+			reqForCmdEntry{
+				"ADD": false,
+				"DEL": false,
+			},
+		},
+		{
+			"CNI_NETNS",
+			&netns,
+			reqForCmdEntry{
+				"ADD": true,
+				"DEL": false,
+			},
+		},
+		{
+			"CNI_IFNAME",
+			&ifName,
+			reqForCmdEntry{
+				"ADD": true,
+				"DEL": true,
+			},
+		},
+		{
+			"CNI_ARGS",
+			&args,
+			reqForCmdEntry{
+				"ADD": false,
+				"DEL": false,
+			},
+		},
+		{
+			"CNI_PATH",
+			&path,
+			reqForCmdEntry{
+				"ADD": true,
+				"DEL": true,
+			},
+		},
+	}
+
+	argsMissing := false
+	for _, v := range vars {
+		*v.val = os.Getenv(v.name)
+		if v.reqForCmd[cmd] && *v.val == "" {
+			log.Printf("%v env variable missing", v.name)
+			argsMissing = true
+		}
+	}
+
+	if argsMissing {
+		dieMsg("required env variables missing")
+	}
+
+	stdinData, err := ioutil.ReadAll(os.Stdin)
+	if err != nil {
+		dieMsg("error reading from stdin: %v", err)
+	}
+
+	cmdArgs := &CmdArgs{
+		ContainerID: contID,
+		Netns:       netns,
+		IfName:      ifName,
+		Args:        args,
+		Path:        path,
+		StdinData:   stdinData,
+	}
+
+	switch cmd {
+	case "ADD":
+		err = cmdAdd(cmdArgs)
+
+	case "DEL":
+		err = cmdDel(cmdArgs)
+
+	default:
+		dieMsg("unknown CNI_COMMAND: %v", cmd)
+	}
+
+	if err != nil {
+		if e, ok := err.(*types.Error); ok {
+			// don't wrap Error in Error
+			dieErr(e)
+		}
+		dieMsg(err.Error())
+	}
+}
+
+func dieMsg(f string, args ...interface{}) {
+	e := &types.Error{
+		Code: 100,
+		Msg:  fmt.Sprintf(f, args...),
+	}
+	dieErr(e)
+}
+
+func dieErr(e *types.Error) {
+	if err := e.Print(); err != nil {
+		log.Print("Error writing error JSON to stdout: ", err)
+	}
+	os.Exit(1)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/testutils/cmd.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/testutils/cmd.go
new file mode 100644
index 0000000000..201b935f40
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/testutils/cmd.go
@@ -0,0 +1,77 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package testutils
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"os"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+func envCleanup() {
+	os.Unsetenv("CNI_COMMAND")
+	os.Unsetenv("CNI_PATH")
+	os.Unsetenv("CNI_NETNS")
+	os.Unsetenv("CNI_IFNAME")
+}
+
+func CmdAddWithResult(cniNetns, cniIfname string, f func() error) (*types.Result, error) {
+	os.Setenv("CNI_COMMAND", "ADD")
+	os.Setenv("CNI_PATH", os.Getenv("PATH"))
+	os.Setenv("CNI_NETNS", cniNetns)
+	os.Setenv("CNI_IFNAME", cniIfname)
+	defer envCleanup()
+
+	// Redirect stdout to capture plugin result
+	oldStdout := os.Stdout
+	r, w, err := os.Pipe()
+	if err != nil {
+		return nil, err
+	}
+
+	os.Stdout = w
+	err = f()
+	w.Close()
+	if err != nil {
+		return nil, err
+	}
+
+	// parse the result
+	out, err := ioutil.ReadAll(r)
+	os.Stdout = oldStdout
+	if err != nil {
+		return nil, err
+	}
+
+	result := types.Result{}
+	err = json.Unmarshal(out, &result)
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func CmdDelWithResult(cniNetns, cniIfname string, f func() error) error {
+	os.Setenv("CNI_COMMAND", "DEL")
+	os.Setenv("CNI_PATH", os.Getenv("PATH"))
+	os.Setenv("CNI_NETNS", cniNetns)
+	os.Setenv("CNI_IFNAME", cniIfname)
+	defer envCleanup()
+
+	return f()
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go
new file mode 100644
index 0000000000..c0fba38290
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go
@@ -0,0 +1,58 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// build +linux
+
+package sysctl
+
+import (
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"strings"
+)
+
+// Sysctl provides a method to set/get values from /proc/sys - in linux systems
+// new interface to set/get values of variables formerly handled by sysctl syscall
+// If optional `params` have only one string value - this function will
+// set this value into coresponding sysctl variable
+func Sysctl(name string, params ...string) (string, error) {
+	if len(params) > 1 {
+		return "", fmt.Errorf("unexcepted additional parameters")
+	} else if len(params) == 1 {
+		return setSysctl(name, params[0])
+	}
+	return getSysctl(name)
+}
+
+func getSysctl(name string) (string, error) {
+	fullName := filepath.Join("/proc/sys", strings.Replace(name, ".", "/", -1))
+	fullName = filepath.Clean(fullName)
+	data, err := ioutil.ReadFile(fullName)
+	if err != nil {
+		return "", err
+	}
+
+	return string(data[:len(data)-1]), nil
+}
+
+func setSysctl(name, value string) (string, error) {
+	fullName := filepath.Join("/proc/sys", strings.Replace(name, ".", "/", -1))
+	fullName = filepath.Clean(fullName)
+	if err := ioutil.WriteFile(fullName, []byte(value), 0644); err != nil {
+		return "", err
+	}
+
+	return getSysctl(name)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go
new file mode 100644
index 0000000000..2386f9a9f4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go
@@ -0,0 +1,157 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"log"
+	"net"
+	"net/http"
+	"net/rpc"
+	"os"
+	"path/filepath"
+	"runtime"
+	"sync"
+
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/coreos/go-systemd/activation"
+)
+
+const listenFdsStart = 3
+const resendCount = 3
+
+var errNoMoreTries = errors.New("no more tries")
+
+type DHCP struct {
+	mux    sync.Mutex
+	leases map[string]*DHCPLease
+}
+
+func newDHCP() *DHCP {
+	return &DHCP{
+		leases: make(map[string]*DHCPLease),
+	}
+}
+
+// Allocate acquires an IP from a DHCP server for a specified container.
+// The acquired lease will be maintained until Release() is called.
+func (d *DHCP) Allocate(args *skel.CmdArgs, result *types.Result) error {
+	conf := types.NetConf{}
+	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
+		return fmt.Errorf("error parsing netconf: %v", err)
+	}
+
+	clientID := args.ContainerID + "/" + conf.Name
+	l, err := AcquireLease(clientID, args.Netns, args.IfName)
+	if err != nil {
+		return err
+	}
+
+	ipn, err := l.IPNet()
+	if err != nil {
+		l.Stop()
+		return err
+	}
+
+	d.setLease(args.ContainerID, conf.Name, l)
+
+	result.IP4 = &types.IPConfig{
+		IP:      *ipn,
+		Gateway: l.Gateway(),
+		Routes:  l.Routes(),
+	}
+
+	return nil
+}
+
+// Release stops maintenance of the lease acquired in Allocate()
+// and sends a release msg to the DHCP server.
+func (d *DHCP) Release(args *skel.CmdArgs, reply *struct{}) error {
+	conf := types.NetConf{}
+	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
+		return fmt.Errorf("error parsing netconf: %v", err)
+	}
+
+	if l := d.getLease(args.ContainerID, conf.Name); l != nil {
+		l.Stop()
+		return nil
+	}
+
+	return fmt.Errorf("lease not found: %v/%v", args.ContainerID, conf.Name)
+}
+
+func (d *DHCP) getLease(contID, netName string) *DHCPLease {
+	d.mux.Lock()
+	defer d.mux.Unlock()
+
+	// TODO(eyakubovich): hash it to avoid collisions
+	l, ok := d.leases[contID+netName]
+	if !ok {
+		return nil
+	}
+	return l
+}
+
+func (d *DHCP) setLease(contID, netName string, l *DHCPLease) {
+	d.mux.Lock()
+	defer d.mux.Unlock()
+
+	// TODO(eyakubovich): hash it to avoid collisions
+	d.leases[contID+netName] = l
+}
+
+func getListener() (net.Listener, error) {
+	l, err := activation.Listeners(true)
+	if err != nil {
+		return nil, err
+	}
+
+	switch {
+	case len(l) == 0:
+		if err := os.MkdirAll(filepath.Dir(socketPath), 0700); err != nil {
+			return nil, err
+		}
+		return net.Listen("unix", socketPath)
+
+	case len(l) == 1:
+		if l[0] == nil {
+			return nil, fmt.Errorf("LISTEN_FDS=1 but no FD found")
+		}
+		return l[0], nil
+
+	default:
+		return nil, fmt.Errorf("Too many (%v) FDs passed through socket activation", len(l))
+	}
+}
+
+func runDaemon() {
+	// since other goroutines (on separate threads) will change namespaces,
+	// ensure the RPC server does not get scheduled onto those
+	runtime.LockOSThread()
+
+	l, err := getListener()
+	if err != nil {
+		log.Printf("Error getting listener: %v", err)
+		return
+	}
+
+	dhcp := newDHCP()
+	rpc.Register(dhcp)
+	rpc.HandleHTTP()
+	http.Serve(l, nil)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go
new file mode 100644
index 0000000000..eb2b403130
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go
@@ -0,0 +1,337 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"math/rand"
+	"net"
+	"sync"
+	"time"
+
+	"github.com/d2g/dhcp4"
+	"github.com/d2g/dhcp4client"
+	"github.com/vishvananda/netlink"
+
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+// RFC 2131 suggests using exponential backoff, starting with 4sec
+// and randomized to +/- 1sec
+const resendDelay0 = 4 * time.Second
+const resendDelayMax = 32 * time.Second
+
+const (
+	leaseStateBound = iota
+	leaseStateRenewing
+	leaseStateRebinding
+)
+
+// This implementation uses 1 OS thread per lease. This is because
+// all the network operations have to be done in network namespace
+// of the interface. This can be improved by switching to the proper
+// namespace for network ops and using fewer threads. However, this
+// needs to be done carefully as dhcp4client ops are blocking.
+
+type DHCPLease struct {
+	clientID      string
+	ack           *dhcp4.Packet
+	opts          dhcp4.Options
+	link          netlink.Link
+	renewalTime   time.Time
+	rebindingTime time.Time
+	expireTime    time.Time
+	stop          chan struct{}
+	wg            sync.WaitGroup
+}
+
+// AcquireLease gets an DHCP lease and then maintains it in the background
+// by periodically renewing it. The acquired lease can be released by
+// calling DHCPLease.Stop()
+func AcquireLease(clientID, netns, ifName string) (*DHCPLease, error) {
+	errCh := make(chan error, 1)
+	l := &DHCPLease{
+		clientID: clientID,
+		stop:     make(chan struct{}),
+	}
+
+	log.Printf("%v: acquiring lease", clientID)
+
+	l.wg.Add(1)
+	go func() {
+		errCh <- ns.WithNetNSPath(netns, func(_ ns.NetNS) error {
+			defer l.wg.Done()
+
+			link, err := netlink.LinkByName(ifName)
+			if err != nil {
+				return fmt.Errorf("error looking up %q: %v", ifName, err)
+			}
+
+			l.link = link
+
+			if err = l.acquire(); err != nil {
+				return err
+			}
+
+			log.Printf("%v: lease acquired, expiration is %v", l.clientID, l.expireTime)
+
+			errCh <- nil
+
+			l.maintain()
+			return nil
+		})
+	}()
+
+	if err := <-errCh; err != nil {
+		return nil, err
+	}
+
+	return l, nil
+}
+
+// Stop terminates the background task that maintains the lease
+// and issues a DHCP Release
+func (l *DHCPLease) Stop() {
+	close(l.stop)
+	l.wg.Wait()
+}
+
+func (l *DHCPLease) acquire() error {
+	c, err := newDHCPClient(l.link)
+	if err != nil {
+		return err
+	}
+	defer c.Close()
+
+	if (l.link.Attrs().Flags & net.FlagUp) != net.FlagUp {
+		log.Printf("Link %q down. Attempting to set up", l.link.Attrs().Name)
+		if err = netlink.LinkSetUp(l.link); err != nil {
+			return err
+		}
+	}
+
+	pkt, err := backoffRetry(func() (*dhcp4.Packet, error) {
+		ok, ack, err := c.Request()
+		switch {
+		case err != nil:
+			return nil, err
+		case !ok:
+			return nil, fmt.Errorf("DHCP server NACK'd own offer")
+		default:
+			return &ack, nil
+		}
+	})
+	if err != nil {
+		return err
+	}
+
+	return l.commit(pkt)
+}
+
+func (l *DHCPLease) commit(ack *dhcp4.Packet) error {
+	opts := ack.ParseOptions()
+
+	leaseTime, err := parseLeaseTime(opts)
+	if err != nil {
+		return err
+	}
+
+	rebindingTime, err := parseRebindingTime(opts)
+	if err != nil || rebindingTime > leaseTime {
+		// Per RFC 2131 Section 4.4.5, it should default to 85% of lease time
+		rebindingTime = leaseTime * 85 / 100
+	}
+
+	renewalTime, err := parseRenewalTime(opts)
+	if err != nil || renewalTime > rebindingTime {
+		// Per RFC 2131 Section 4.4.5, it should default to 50% of lease time
+		renewalTime = leaseTime / 2
+	}
+
+	now := time.Now()
+	l.expireTime = now.Add(leaseTime)
+	l.renewalTime = now.Add(renewalTime)
+	l.rebindingTime = now.Add(rebindingTime)
+	l.ack = ack
+	l.opts = opts
+
+	return nil
+}
+
+func (l *DHCPLease) maintain() {
+	state := leaseStateBound
+
+	for {
+		var sleepDur time.Duration
+
+		switch state {
+		case leaseStateBound:
+			sleepDur = l.renewalTime.Sub(time.Now())
+			if sleepDur <= 0 {
+				log.Printf("%v: renewing lease", l.clientID)
+				state = leaseStateRenewing
+				continue
+			}
+
+		case leaseStateRenewing:
+			if err := l.renew(); err != nil {
+				log.Printf("%v: %v", l.clientID, err)
+
+				if time.Now().After(l.rebindingTime) {
+					log.Printf("%v: renawal time expired, rebinding", l.clientID)
+					state = leaseStateRebinding
+				}
+			} else {
+				log.Printf("%v: lease renewed, expiration is %v", l.clientID, l.expireTime)
+				state = leaseStateBound
+			}
+
+		case leaseStateRebinding:
+			if err := l.acquire(); err != nil {
+				log.Printf("%v: %v", l.clientID, err)
+
+				if time.Now().After(l.expireTime) {
+					log.Printf("%v: lease expired, bringing interface DOWN", l.clientID)
+					l.downIface()
+					return
+				}
+			} else {
+				log.Printf("%v: lease rebound, expiration is %v", l.clientID, l.expireTime)
+				state = leaseStateBound
+			}
+		}
+
+		select {
+		case <-time.After(sleepDur):
+
+		case <-l.stop:
+			if err := l.release(); err != nil {
+				log.Printf("%v: failed to release DHCP lease: %v", l.clientID, err)
+			}
+			return
+		}
+	}
+}
+
+func (l *DHCPLease) downIface() {
+	if err := netlink.LinkSetDown(l.link); err != nil {
+		log.Printf("%v: failed to bring %v interface DOWN: %v", l.clientID, l.link.Attrs().Name, err)
+	}
+}
+
+func (l *DHCPLease) renew() error {
+	c, err := newDHCPClient(l.link)
+	if err != nil {
+		return err
+	}
+	defer c.Close()
+
+	pkt, err := backoffRetry(func() (*dhcp4.Packet, error) {
+		ok, ack, err := c.Renew(*l.ack)
+		switch {
+		case err != nil:
+			return nil, err
+		case !ok:
+			return nil, fmt.Errorf("DHCP server did not renew lease")
+		default:
+			return &ack, nil
+		}
+	})
+	if err != nil {
+		return err
+	}
+
+	l.commit(pkt)
+	return nil
+}
+
+func (l *DHCPLease) release() error {
+	log.Printf("%v: releasing lease", l.clientID)
+
+	c, err := newDHCPClient(l.link)
+	if err != nil {
+		return err
+	}
+	defer c.Close()
+
+	if err = c.Release(*l.ack); err != nil {
+		return fmt.Errorf("failed to send DHCPRELEASE")
+	}
+
+	return nil
+}
+
+func (l *DHCPLease) IPNet() (*net.IPNet, error) {
+	mask := parseSubnetMask(l.opts)
+	if mask == nil {
+		return nil, fmt.Errorf("DHCP option Subnet Mask not found in DHCPACK")
+	}
+
+	return &net.IPNet{
+		IP:   l.ack.YIAddr(),
+		Mask: mask,
+	}, nil
+}
+
+func (l *DHCPLease) Gateway() net.IP {
+	return parseRouter(l.opts)
+}
+
+func (l *DHCPLease) Routes() []types.Route {
+	routes := parseRoutes(l.opts)
+	return append(routes, parseCIDRRoutes(l.opts)...)
+}
+
+// jitter returns a random value within [-span, span) range
+func jitter(span time.Duration) time.Duration {
+	return time.Duration(float64(span) * (2.0*rand.Float64() - 1.0))
+}
+
+func backoffRetry(f func() (*dhcp4.Packet, error)) (*dhcp4.Packet, error) {
+	var baseDelay time.Duration = resendDelay0
+
+	for i := 0; i < resendCount; i++ {
+		pkt, err := f()
+		if err == nil {
+			return pkt, nil
+		}
+
+		log.Print(err)
+
+		time.Sleep(baseDelay + jitter(time.Second))
+
+		if baseDelay < resendDelayMax {
+			baseDelay *= 2
+		}
+	}
+
+	return nil, errNoMoreTries
+}
+
+func newDHCPClient(link netlink.Link) (*dhcp4client.Client, error) {
+	pktsock, err := dhcp4client.NewPacketSock(link.Attrs().Index)
+	if err != nil {
+		return nil, err
+	}
+
+	return dhcp4client.New(
+		dhcp4client.HardwareAddr(link.Attrs().HardwareAddr),
+		dhcp4client.Timeout(5*time.Second),
+		dhcp4client.Broadcast(false),
+		dhcp4client.Connection(pktsock),
+	)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go
new file mode 100644
index 0000000000..b537831506
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go
@@ -0,0 +1,73 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"net/rpc"
+	"os"
+	"path/filepath"
+
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+const socketPath = "/run/cni/dhcp.sock"
+
+func main() {
+	if len(os.Args) > 1 && os.Args[1] == "daemon" {
+		runDaemon()
+	} else {
+		skel.PluginMain(cmdAdd, cmdDel)
+	}
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	result := types.Result{}
+	if err := rpcCall("DHCP.Allocate", args, &result); err != nil {
+		return err
+	}
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	result := struct{}{}
+	if err := rpcCall("DHCP.Release", args, &result); err != nil {
+		return fmt.Errorf("error dialing DHCP daemon: %v", err)
+	}
+	return nil
+}
+
+func rpcCall(method string, args *skel.CmdArgs, result interface{}) error {
+	client, err := rpc.DialHTTP("unix", socketPath)
+	if err != nil {
+		return fmt.Errorf("error dialing DHCP daemon: %v", err)
+	}
+
+	// The daemon may be running under a different working dir
+	// so make sure the netns path is absolute.
+	netns, err := filepath.Abs(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to make %q an absolute path: %v", args.Netns, err)
+	}
+	args.Netns = netns
+
+	err = client.Call(method, args, result)
+	if err != nil {
+		return fmt.Errorf("error calling %v: %v", method, err)
+	}
+
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go
new file mode 100644
index 0000000000..b11ec21d55
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go
@@ -0,0 +1,139 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/binary"
+	"fmt"
+	"net"
+	"time"
+
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/d2g/dhcp4"
+)
+
+func parseRouter(opts dhcp4.Options) net.IP {
+	if opts, ok := opts[dhcp4.OptionRouter]; ok {
+		if len(opts) == 4 {
+			return net.IP(opts)
+		}
+	}
+	return nil
+}
+
+func classfulSubnet(sn net.IP) net.IPNet {
+	return net.IPNet{
+		IP:   sn,
+		Mask: sn.DefaultMask(),
+	}
+}
+
+func parseRoutes(opts dhcp4.Options) []types.Route {
+	// StaticRoutes format: pairs of:
+	// Dest = 4 bytes; Classful IP subnet
+	// Router = 4 bytes; IP address of router
+
+	routes := []types.Route{}
+	if opt, ok := opts[dhcp4.OptionStaticRoute]; ok {
+		for len(opt) >= 8 {
+			sn := opt[0:4]
+			r := opt[4:8]
+			rt := types.Route{
+				Dst: classfulSubnet(sn),
+				GW:  r,
+			}
+			routes = append(routes, rt)
+			opt = opt[8:]
+		}
+	}
+
+	return routes
+}
+
+func parseCIDRRoutes(opts dhcp4.Options) []types.Route {
+	// See RFC4332 for format (http://tools.ietf.org/html/rfc3442)
+
+	routes := []types.Route{}
+	if opt, ok := opts[dhcp4.OptionClasslessRouteFormat]; ok {
+		for len(opt) >= 5 {
+			width := int(opt[0])
+			if width > 32 {
+				// error: can't have more than /32
+				return nil
+			}
+			// network bits are compacted to avoid zeros
+			octets := 0
+			if width > 0 {
+				octets = (width-1)/8 + 1
+			}
+
+			if len(opt) < 1+octets+4 {
+				// error: too short
+				return nil
+			}
+
+			sn := make([]byte, 4)
+			copy(sn, opt[1:octets+1])
+
+			gw := net.IP(opt[octets+1 : octets+5])
+
+			rt := types.Route{
+				Dst: net.IPNet{
+					IP:   net.IP(sn),
+					Mask: net.CIDRMask(width, 32),
+				},
+				GW: gw,
+			}
+			routes = append(routes, rt)
+
+			opt = opt[octets+5 : len(opt)]
+		}
+	}
+	return routes
+}
+
+func parseSubnetMask(opts dhcp4.Options) net.IPMask {
+	mask, ok := opts[dhcp4.OptionSubnetMask]
+	if !ok {
+		return nil
+	}
+
+	return net.IPMask(mask)
+}
+
+func parseDuration(opts dhcp4.Options, code dhcp4.OptionCode, optName string) (time.Duration, error) {
+	val, ok := opts[code]
+	if !ok {
+		return 0, fmt.Errorf("option %v not found", optName)
+	}
+	if len(val) != 4 {
+		return 0, fmt.Errorf("option %v is not 4 bytes", optName)
+	}
+
+	secs := binary.BigEndian.Uint32(val)
+	return time.Duration(secs) * time.Second, nil
+}
+
+func parseLeaseTime(opts dhcp4.Options) (time.Duration, error) {
+	return parseDuration(opts, dhcp4.OptionIPAddressLeaseTime, "LeaseTime")
+}
+
+func parseRenewalTime(opts dhcp4.Options) (time.Duration, error) {
+	return parseDuration(opts, dhcp4.OptionRenewalTimeValue, "RenewalTime")
+}
+
+func parseRebindingTime(opts dhcp4.Options) (time.Duration, error) {
+	return parseDuration(opts, dhcp4.OptionRebindingTimeValue, "RebindingTime")
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/README.md b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/README.md
new file mode 100644
index 0000000000..39e9ede217
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/README.md
@@ -0,0 +1,86 @@
+# host-local IP address manager
+
+host-local IPAM allocates IPv4 and IPv6 addresses out of a specified address range.
+
+## Usage
+
+### Obtain an IP
+
+Given the following network configuration:
+
+```
+{
+    "name": "default",
+    "ipam": {
+        "type": "host-local",
+        "subnet": "203.0.113.0/24"
+    }
+}
+```
+
+#### Using the command line interface
+
+```
+$ export CNI_COMMAND=ADD
+$ export CNI_CONTAINERID=f81d4fae-7dec-11d0-a765-00a0c91e6bf6
+$ ./host-local < $conf
+```
+
+```
+{
+    "ip4": {
+        "ip": "203.0.113.1/24"
+    }
+}
+```
+
+## Backends
+
+By default ipmanager stores IP allocations on the local filesystem using the IP address as the file name and the ID as contents. For example:
+
+```
+$ ls /var/lib/cni/networks/default
+```
+```
+203.0.113.1	203.0.113.2
+```
+
+```
+$ cat /var/lib/cni/networks/default/203.0.113.1
+```
+```
+f81d4fae-7dec-11d0-a765-00a0c91e6bf6
+```
+
+## Configuration Files
+
+
+```
+{
+	"name": "ipv6",
+    "ipam": {
+		"type": "host-local",
+		"subnet": "3ffe:ffff:0:01ff::/64",
+		"range-start": "3ffe:ffff:0:01ff::0010",
+		"range-end": "3ffe:ffff:0:01ff::0020",
+		"routes": [
+			{ "dst": "3ffe:ffff:0:01ff::1/64" }
+		]
+	}
+}
+```
+
+```
+{
+    "name": "ipv4",
+	"ipam": {
+		"type": "host-local",
+		"subnet": "203.0.113.1/24",
+		"range-start": "203.0.113.10",
+		"range-end": "203.0.113.20",
+		"routes": [
+			{ "dst": "203.0.113.0/24" }
+		]
+	}
+}
+```
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go
new file mode 100644
index 0000000000..55a3ae6fa4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go
@@ -0,0 +1,165 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/plugins/ipam/host-local/backend"
+)
+
+type IPAllocator struct {
+	start net.IP
+	end   net.IP
+	conf  *IPAMConfig
+	store backend.Store
+}
+
+func NewIPAllocator(conf *IPAMConfig, store backend.Store) (*IPAllocator, error) {
+	var (
+		start net.IP
+		end   net.IP
+		err   error
+	)
+	start, end, err = networkRange((*net.IPNet)(&conf.Subnet))
+	if err != nil {
+		return nil, err
+	}
+
+	// skip the .0 address
+	start = ip.NextIP(start)
+
+	if conf.RangeStart != nil {
+		if err := validateRangeIP(conf.RangeStart, (*net.IPNet)(&conf.Subnet)); err != nil {
+			return nil, err
+		}
+		start = conf.RangeStart
+	}
+	if conf.RangeEnd != nil {
+		if err := validateRangeIP(conf.RangeEnd, (*net.IPNet)(&conf.Subnet)); err != nil {
+			return nil, err
+		}
+		// RangeEnd is inclusive
+		end = ip.NextIP(conf.RangeEnd)
+	}
+
+	return &IPAllocator{start, end, conf, store}, nil
+}
+
+func validateRangeIP(ip net.IP, ipnet *net.IPNet) error {
+	if !ipnet.Contains(ip) {
+		return fmt.Errorf("%s not in network: %s", ip, ipnet)
+	}
+	return nil
+}
+
+// Returns newly allocated IP along with its config
+func (a *IPAllocator) Get(id string) (*types.IPConfig, error) {
+	a.store.Lock()
+	defer a.store.Unlock()
+
+	gw := a.conf.Gateway
+	if gw == nil {
+		gw = ip.NextIP(a.conf.Subnet.IP)
+	}
+
+	var requestedIP net.IP
+	if a.conf.Args != nil {
+		requestedIP = a.conf.Args.IP
+	}
+
+	if requestedIP != nil {
+		if gw != nil && gw.Equal(a.conf.Args.IP) {
+			return nil, fmt.Errorf("requested IP must differ gateway IP")
+		}
+
+		subnet := net.IPNet{
+			IP:   a.conf.Subnet.IP,
+			Mask: a.conf.Subnet.Mask,
+		}
+		err := validateRangeIP(requestedIP, &subnet)
+		if err != nil {
+			return nil, err
+		}
+
+		reserved, err := a.store.Reserve(id, requestedIP)
+		if err != nil {
+			return nil, err
+		}
+
+		if reserved {
+			return &types.IPConfig{
+				IP:      net.IPNet{IP: requestedIP, Mask: a.conf.Subnet.Mask},
+				Gateway: gw,
+				Routes:  a.conf.Routes,
+			}, nil
+		}
+		return nil, fmt.Errorf("requested IP address %q is not available in network: %s", requestedIP, a.conf.Name)
+	}
+
+	for cur := a.start; !cur.Equal(a.end); cur = ip.NextIP(cur) {
+		// don't allocate gateway IP
+		if gw != nil && cur.Equal(gw) {
+			continue
+		}
+
+		reserved, err := a.store.Reserve(id, cur)
+		if err != nil {
+			return nil, err
+		}
+		if reserved {
+			return &types.IPConfig{
+				IP:      net.IPNet{IP: cur, Mask: a.conf.Subnet.Mask},
+				Gateway: gw,
+				Routes:  a.conf.Routes,
+			}, nil
+		}
+	}
+	return nil, fmt.Errorf("no IP addresses available in network: %s", a.conf.Name)
+}
+
+// Releases all IPs allocated for the container with given ID
+func (a *IPAllocator) Release(id string) error {
+	a.store.Lock()
+	defer a.store.Unlock()
+
+	return a.store.ReleaseByID(id)
+}
+
+func networkRange(ipnet *net.IPNet) (net.IP, net.IP, error) {
+	if ipnet.IP == nil {
+		return nil, nil, fmt.Errorf("missing field %q in IPAM configuration", "subnet")
+	}
+	ip := ipnet.IP.To4()
+	if ip == nil {
+		ip = ipnet.IP.To16()
+		if ip == nil {
+			return nil, nil, fmt.Errorf("IP not v4 nor v6")
+		}
+	}
+
+	if len(ip) != len(ipnet.Mask) {
+		return nil, nil, fmt.Errorf("IPNet IP and Mask version mismatch")
+	}
+
+	var end net.IP
+	for i := 0; i < len(ip); i++ {
+		end = append(end, ip[i]|^ipnet.Mask[i])
+	}
+	return ipnet.IP, end, nil
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go
new file mode 100644
index 0000000000..88dc5e92bc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go
@@ -0,0 +1,88 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package disk
+
+import (
+	"io/ioutil"
+	"net"
+	"os"
+	"path/filepath"
+)
+
+var defaultDataDir = "/var/lib/cni/networks"
+
+type Store struct {
+	FileLock
+	dataDir string
+}
+
+func New(network string) (*Store, error) {
+	dir := filepath.Join(defaultDataDir, network)
+	if err := os.MkdirAll(dir, 0644); err != nil {
+		return nil, err
+	}
+
+	lk, err := NewFileLock(dir)
+	if err != nil {
+		return nil, err
+	}
+	return &Store{*lk, dir}, nil
+}
+
+func (s *Store) Reserve(id string, ip net.IP) (bool, error) {
+	fname := filepath.Join(s.dataDir, ip.String())
+	f, err := os.OpenFile(fname, os.O_RDWR|os.O_EXCL|os.O_CREATE, 0644)
+	if os.IsExist(err) {
+		return false, nil
+	}
+	if err != nil {
+		return false, err
+	}
+	if _, err := f.WriteString(id); err != nil {
+		f.Close()
+		os.Remove(f.Name())
+		return false, err
+	}
+	if err := f.Close(); err != nil {
+		os.Remove(f.Name())
+		return false, err
+	}
+	return true, nil
+}
+
+func (s *Store) Release(ip net.IP) error {
+	return os.Remove(filepath.Join(s.dataDir, ip.String()))
+}
+
+// N.B. This function eats errors to be tolerant and
+// release as much as possible
+func (s *Store) ReleaseByID(id string) error {
+	err := filepath.Walk(s.dataDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil || info.IsDir() {
+			return nil
+		}
+		data, err := ioutil.ReadFile(path)
+		if err != nil {
+			return nil
+		}
+		if string(data) == id {
+			if err := os.Remove(path); err != nil {
+				return nil
+			}
+		}
+		return nil
+	})
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go
new file mode 100644
index 0000000000..7241482515
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go
@@ -0,0 +1,50 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package disk
+
+import (
+	"os"
+	"syscall"
+)
+
+// FileLock wraps os.File to be used as a lock using flock
+type FileLock struct {
+	f *os.File
+}
+
+// NewFileLock opens file/dir at path and returns unlocked FileLock object
+func NewFileLock(path string) (*FileLock, error) {
+	f, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+
+	return &FileLock{f}, nil
+}
+
+// Close closes underlying file
+func (l *FileLock) Close() error {
+	return l.f.Close()
+}
+
+// Lock acquires an exclusive lock
+func (l *FileLock) Lock() error {
+	return syscall.Flock(int(l.f.Fd()), syscall.LOCK_EX)
+}
+
+// Unlock releases the lock
+func (l *FileLock) Unlock() error {
+	return syscall.Flock(int(l.f.Fd()), syscall.LOCK_UN)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go
new file mode 100644
index 0000000000..45a89b109c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go
@@ -0,0 +1,26 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package backend
+
+import "net"
+
+type Store interface {
+	Lock() error
+	Unlock() error
+	Close() error
+	Reserve(id string, ip net.IP) (bool, error)
+	Release(ip net.IP) error
+	ReleaseByID(id string) error
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/config.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/config.go
new file mode 100644
index 0000000000..a0e493cd84
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/config.go
@@ -0,0 +1,70 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"net"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+// IPAMConfig represents the IP related network configuration.
+type IPAMConfig struct {
+	Name       string
+	Type       string        `json:"type"`
+	RangeStart net.IP        `json:"rangeStart"`
+	RangeEnd   net.IP        `json:"rangeEnd"`
+	Subnet     types.IPNet   `json:"subnet"`
+	Gateway    net.IP        `json:"gateway"`
+	Routes     []types.Route `json:"routes"`
+	Args       *IPAMArgs     `json:"-"`
+}
+
+type IPAMArgs struct {
+	types.CommonArgs
+	IP net.IP `json:"ip,omitempty"`
+}
+
+type Net struct {
+	Name string      `json:"name"`
+	IPAM *IPAMConfig `json:"ipam"`
+}
+
+// NewIPAMConfig creates a NetworkConfig from the given network name.
+func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, error) {
+	n := Net{}
+	if err := json.Unmarshal(bytes, &n); err != nil {
+		return nil, err
+	}
+
+	if args != "" {
+		n.IPAM.Args = &IPAMArgs{}
+		err := types.LoadArgs(args, n.IPAM.Args)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if n.IPAM == nil {
+		return nil, fmt.Errorf("%q missing 'ipam' key")
+	}
+
+	// Copy net name into IPAM so not to drag Net struct around
+	n.IPAM.Name = n.Name
+
+	return n.IPAM, nil
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/main.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/main.go
new file mode 100644
index 0000000000..d2f3c305a5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/main.go
@@ -0,0 +1,74 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk"
+
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
+	if err != nil {
+		return err
+	}
+
+	store, err := disk.New(ipamConf.Name)
+	if err != nil {
+		return err
+	}
+	defer store.Close()
+
+	allocator, err := NewIPAllocator(ipamConf, store)
+	if err != nil {
+		return err
+	}
+
+	ipConf, err := allocator.Get(args.ContainerID)
+	if err != nil {
+		return err
+	}
+
+	r := &types.Result{
+		IP4: ipConf,
+	}
+	return r.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
+	if err != nil {
+		return err
+	}
+
+	store, err := disk.New(ipamConf.Name)
+	if err != nil {
+		return err
+	}
+	defer store.Close()
+
+	allocator, err := NewIPAllocator(ipamConf, store)
+	if err != nil {
+		return err
+	}
+
+	return allocator.Release(args.ContainerID)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/bridge/bridge.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/bridge/bridge.go
new file mode 100644
index 0000000000..d4fc89c3aa
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/bridge/bridge.go
@@ -0,0 +1,319 @@
+// Copyright 2014 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net"
+	"runtime"
+	"syscall"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/ipam"
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/utils"
+	"github.com/vishvananda/netlink"
+)
+
+const defaultBrName = "cni0"
+
+type NetConf struct {
+	types.NetConf
+	BrName      string `json:"bridge"`
+	IsGW        bool   `json:"isGateway"`
+	IsDefaultGW bool   `json:"isDefaultGateway"`
+	IPMasq      bool   `json:"ipMasq"`
+	MTU         int    `json:"mtu"`
+	HairpinMode bool   `json:"hairpinMode"`
+}
+
+func init() {
+	// this ensures that main runs only on main thread (thread group leader).
+	// since namespace ops (unshare, setns) are done for a single thread, we
+	// must ensure that the goroutine does not jump from OS thread to thread
+	runtime.LockOSThread()
+}
+
+func loadNetConf(bytes []byte) (*NetConf, error) {
+	n := &NetConf{
+		BrName: defaultBrName,
+	}
+	if err := json.Unmarshal(bytes, n); err != nil {
+		return nil, fmt.Errorf("failed to load netconf: %v", err)
+	}
+	return n, nil
+}
+
+func ensureBridgeAddr(br *netlink.Bridge, ipn *net.IPNet) error {
+	addrs, err := netlink.AddrList(br, syscall.AF_INET)
+	if err != nil && err != syscall.ENOENT {
+		return fmt.Errorf("could not get list of IP addresses: %v", err)
+	}
+
+	// if there're no addresses on the bridge, it's ok -- we'll add one
+	if len(addrs) > 0 {
+		ipnStr := ipn.String()
+		for _, a := range addrs {
+			// string comp is actually easiest for doing IPNet comps
+			if a.IPNet.String() == ipnStr {
+				return nil
+			}
+		}
+		return fmt.Errorf("%q already has an IP address different from %v", br.Name, ipn.String())
+	}
+
+	addr := &netlink.Addr{IPNet: ipn, Label: ""}
+	if err := netlink.AddrAdd(br, addr); err != nil {
+		return fmt.Errorf("could not add IP address to %q: %v", br.Name, err)
+	}
+	return nil
+}
+
+func bridgeByName(name string) (*netlink.Bridge, error) {
+	l, err := netlink.LinkByName(name)
+	if err != nil {
+		return nil, fmt.Errorf("could not lookup %q: %v", name, err)
+	}
+	br, ok := l.(*netlink.Bridge)
+	if !ok {
+		return nil, fmt.Errorf("%q already exists but is not a bridge", name)
+	}
+	return br, nil
+}
+
+func ensureBridge(brName string, mtu int) (*netlink.Bridge, error) {
+	br := &netlink.Bridge{
+		LinkAttrs: netlink.LinkAttrs{
+			Name: brName,
+			MTU:  mtu,
+			// Let kernel use default txqueuelen; leaving it unset
+			// means 0, and a zero-length TX queue messes up FIFO
+			// traffic shapers which use TX queue length as the
+			// default packet limit
+			TxQLen: -1,
+		},
+	}
+
+	if err := netlink.LinkAdd(br); err != nil {
+		if err != syscall.EEXIST {
+			return nil, fmt.Errorf("could not add %q: %v", brName, err)
+		}
+
+		// it's ok if the device already exists as long as config is similar
+		br, err = bridgeByName(brName)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if err := netlink.LinkSetUp(br); err != nil {
+		return nil, err
+	}
+
+	return br, nil
+}
+
+func setupVeth(netns ns.NetNS, br *netlink.Bridge, ifName string, mtu int, hairpinMode bool) error {
+	var hostVethName string
+
+	err := netns.Do(func(hostNS ns.NetNS) error {
+		// create the veth pair in the container and move host end into host netns
+		hostVeth, _, err := ip.SetupVeth(ifName, mtu, hostNS)
+		if err != nil {
+			return err
+		}
+
+		hostVethName = hostVeth.Attrs().Name
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	// need to lookup hostVeth again as its index has changed during ns move
+	hostVeth, err := netlink.LinkByName(hostVethName)
+	if err != nil {
+		return fmt.Errorf("failed to lookup %q: %v", hostVethName, err)
+	}
+
+	// connect host veth end to the bridge
+	if err = netlink.LinkSetMaster(hostVeth, br); err != nil {
+		return fmt.Errorf("failed to connect %q to bridge %v: %v", hostVethName, br.Attrs().Name, err)
+	}
+
+	// set hairpin mode
+	if err = netlink.LinkSetHairpin(hostVeth, hairpinMode); err != nil {
+		return fmt.Errorf("failed to setup hairpin mode for %v: %v", hostVethName, err)
+	}
+
+	return nil
+}
+
+func calcGatewayIP(ipn *net.IPNet) net.IP {
+	nid := ipn.IP.Mask(ipn.Mask)
+	return ip.NextIP(nid)
+}
+
+func setupBridge(n *NetConf) (*netlink.Bridge, error) {
+	// create bridge if necessary
+	br, err := ensureBridge(n.BrName, n.MTU)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create bridge %q: %v", n.BrName, err)
+	}
+
+	return br, nil
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	n, err := loadNetConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	if n.IsDefaultGW {
+		n.IsGW = true
+	}
+
+	br, err := setupBridge(n)
+	if err != nil {
+		return err
+	}
+
+	netns, err := ns.GetNS(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)
+	}
+	defer netns.Close()
+
+	if err = setupVeth(netns, br, args.IfName, n.MTU, n.HairpinMode); err != nil {
+		return err
+	}
+
+	// run the IPAM plugin and get back the config to apply
+	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	// TODO: make this optional when IPv6 is supported
+	if result.IP4 == nil {
+		return errors.New("IPAM plugin returned missing IPv4 config")
+	}
+
+	if result.IP4.Gateway == nil && n.IsGW {
+		result.IP4.Gateway = calcGatewayIP(&result.IP4.IP)
+	}
+
+	if err := netns.Do(func(_ ns.NetNS) error {
+		// set the default gateway if requested
+		if n.IsDefaultGW {
+			_, defaultNet, err := net.ParseCIDR("0.0.0.0/0")
+			if err != nil {
+				return err
+			}
+
+			for _, route := range result.IP4.Routes {
+				if defaultNet.String() == route.Dst.String() {
+					if route.GW != nil && !route.GW.Equal(result.IP4.Gateway) {
+						return fmt.Errorf(
+							"isDefaultGateway ineffective because IPAM sets default route via %q",
+							route.GW,
+						)
+					}
+				}
+			}
+
+			result.IP4.Routes = append(
+				result.IP4.Routes,
+				types.Route{Dst: *defaultNet, GW: result.IP4.Gateway},
+			)
+
+			// TODO: IPV6
+		}
+
+		return ipam.ConfigureIface(args.IfName, result)
+	}); err != nil {
+		return err
+	}
+
+	if n.IsGW {
+		gwn := &net.IPNet{
+			IP:   result.IP4.Gateway,
+			Mask: result.IP4.IP.Mask,
+		}
+
+		if err = ensureBridgeAddr(br, gwn); err != nil {
+			return err
+		}
+
+		if err := ip.EnableIP4Forward(); err != nil {
+			return fmt.Errorf("failed to enable forwarding: %v", err)
+		}
+	}
+
+	if n.IPMasq {
+		chain := utils.FormatChainName(n.Name, args.ContainerID)
+		comment := utils.FormatComment(n.Name, args.ContainerID)
+		if err = ip.SetupIPMasq(ip.Network(&result.IP4.IP), chain, comment); err != nil {
+			return err
+		}
+	}
+
+	result.DNS = n.DNS
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	n, err := loadNetConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	if err := ipam.ExecDel(n.IPAM.Type, args.StdinData); err != nil {
+		return err
+	}
+
+	if args.Netns == "" {
+		return nil
+	}
+
+	var ipn *net.IPNet
+	err = ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		var err error
+		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
+		return err
+	})
+	if err != nil {
+		return err
+	}
+
+	if n.IPMasq {
+		chain := utils.FormatChainName(n.Name, args.ContainerID)
+		comment := utils.FormatComment(n.Name, args.ContainerID)
+		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go
new file mode 100644
index 0000000000..d7cfc39f4e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go
@@ -0,0 +1,175 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"runtime"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/ipam"
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/vishvananda/netlink"
+)
+
+type NetConf struct {
+	types.NetConf
+	Master string `json:"master"`
+	Mode   string `json:"mode"`
+	MTU    int    `json:"mtu"`
+}
+
+func init() {
+	// this ensures that main runs only on main thread (thread group leader).
+	// since namespace ops (unshare, setns) are done for a single thread, we
+	// must ensure that the goroutine does not jump from OS thread to thread
+	runtime.LockOSThread()
+}
+
+func loadConf(bytes []byte) (*NetConf, error) {
+	n := &NetConf{}
+	if err := json.Unmarshal(bytes, n); err != nil {
+		return nil, fmt.Errorf("failed to load netconf: %v", err)
+	}
+	if n.Master == "" {
+		return nil, fmt.Errorf(`"master" field is required. It specifies the host interface name to virtualize`)
+	}
+	return n, nil
+}
+
+func modeFromString(s string) (netlink.IPVlanMode, error) {
+	switch s {
+	case "", "l2":
+		return netlink.IPVLAN_MODE_L2, nil
+	case "l3":
+		return netlink.IPVLAN_MODE_L3, nil
+	default:
+		return 0, fmt.Errorf("unknown ipvlan mode: %q", s)
+	}
+}
+
+func createIpvlan(conf *NetConf, ifName string, netns ns.NetNS) error {
+	mode, err := modeFromString(conf.Mode)
+	if err != nil {
+		return err
+	}
+
+	m, err := netlink.LinkByName(conf.Master)
+	if err != nil {
+		return fmt.Errorf("failed to lookup master %q: %v", conf.Master, err)
+	}
+
+	// due to kernel bug we have to create with tmpname or it might
+	// collide with the name on the host and error out
+	tmpName, err := ip.RandomVethName()
+	if err != nil {
+		return err
+	}
+
+	mv := &netlink.IPVlan{
+		LinkAttrs: netlink.LinkAttrs{
+			MTU:         conf.MTU,
+			Name:        tmpName,
+			ParentIndex: m.Attrs().Index,
+			Namespace:   netlink.NsFd(int(netns.Fd())),
+		},
+		Mode: mode,
+	}
+
+	if err := netlink.LinkAdd(mv); err != nil {
+		return fmt.Errorf("failed to create ipvlan: %v", err)
+	}
+
+	return netns.Do(func(_ ns.NetNS) error {
+		err := renameLink(tmpName, ifName)
+		if err != nil {
+			return fmt.Errorf("failed to rename ipvlan to %q: %v", ifName, err)
+		}
+		return nil
+	})
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	n, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	netns, err := ns.GetNS(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)
+	}
+	defer netns.Close()
+
+	if err = createIpvlan(n, args.IfName, netns); err != nil {
+		return err
+	}
+
+	// run the IPAM plugin and get back the config to apply
+	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+	if result.IP4 == nil {
+		return errors.New("IPAM plugin returned missing IPv4 config")
+	}
+
+	err = netns.Do(func(_ ns.NetNS) error {
+		return ipam.ConfigureIface(args.IfName, result)
+	})
+	if err != nil {
+		return err
+	}
+
+	result.DNS = n.DNS
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	n, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	if args.Netns == "" {
+		return nil
+	}
+
+	return ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		return ip.DelLinkByName(args.IfName)
+	})
+}
+
+func renameLink(curName, newName string) error {
+	link, err := netlink.LinkByName(curName)
+	if err != nil {
+		return err
+	}
+
+	return netlink.LinkSetName(link, newName)
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go
new file mode 100644
index 0000000000..7739d7b8eb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go
@@ -0,0 +1,193 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"runtime"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/ipam"
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/utils/sysctl"
+	"github.com/vishvananda/netlink"
+)
+
+const (
+	IPv4InterfaceArpProxySysctlTemplate = "net.ipv4.conf.%s.proxy_arp"
+)
+
+type NetConf struct {
+	types.NetConf
+	Master string `json:"master"`
+	Mode   string `json:"mode"`
+	MTU    int    `json:"mtu"`
+}
+
+func init() {
+	// this ensures that main runs only on main thread (thread group leader).
+	// since namespace ops (unshare, setns) are done for a single thread, we
+	// must ensure that the goroutine does not jump from OS thread to thread
+	runtime.LockOSThread()
+}
+
+func loadConf(bytes []byte) (*NetConf, error) {
+	n := &NetConf{}
+	if err := json.Unmarshal(bytes, n); err != nil {
+		return nil, fmt.Errorf("failed to load netconf: %v", err)
+	}
+	if n.Master == "" {
+		return nil, fmt.Errorf(`"master" field is required. It specifies the host interface name to virtualize`)
+	}
+	return n, nil
+}
+
+func modeFromString(s string) (netlink.MacvlanMode, error) {
+	switch s {
+	case "", "bridge":
+		return netlink.MACVLAN_MODE_BRIDGE, nil
+	case "private":
+		return netlink.MACVLAN_MODE_PRIVATE, nil
+	case "vepa":
+		return netlink.MACVLAN_MODE_VEPA, nil
+	case "passthru":
+		return netlink.MACVLAN_MODE_PASSTHRU, nil
+	default:
+		return 0, fmt.Errorf("unknown macvlan mode: %q", s)
+	}
+}
+
+func createMacvlan(conf *NetConf, ifName string, netns ns.NetNS) error {
+	mode, err := modeFromString(conf.Mode)
+	if err != nil {
+		return err
+	}
+
+	m, err := netlink.LinkByName(conf.Master)
+	if err != nil {
+		return fmt.Errorf("failed to lookup master %q: %v", conf.Master, err)
+	}
+
+	// due to kernel bug we have to create with tmpName or it might
+	// collide with the name on the host and error out
+	tmpName, err := ip.RandomVethName()
+	if err != nil {
+		return err
+	}
+
+	mv := &netlink.Macvlan{
+		LinkAttrs: netlink.LinkAttrs{
+			MTU:         conf.MTU,
+			Name:        tmpName,
+			ParentIndex: m.Attrs().Index,
+			Namespace:   netlink.NsFd(int(netns.Fd())),
+		},
+		Mode: mode,
+	}
+
+	if err := netlink.LinkAdd(mv); err != nil {
+		return fmt.Errorf("failed to create macvlan: %v", err)
+	}
+
+	return netns.Do(func(_ ns.NetNS) error {
+		// TODO: duplicate following lines for ipv6 support, when it will be added in other places
+		ipv4SysctlValueName := fmt.Sprintf(IPv4InterfaceArpProxySysctlTemplate, tmpName)
+		if _, err := sysctl.Sysctl(ipv4SysctlValueName, "1"); err != nil {
+			// remove the newly added link and ignore errors, because we already are in a failed state
+			_ = netlink.LinkDel(mv)
+			return fmt.Errorf("failed to set proxy_arp on newly added interface %q: %v", tmpName, err)
+		}
+
+		err := renameLink(tmpName, ifName)
+		if err != nil {
+			_ = netlink.LinkDel(mv)
+			return fmt.Errorf("failed to rename macvlan to %q: %v", ifName, err)
+		}
+		return nil
+	})
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	n, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	netns, err := ns.GetNS(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to open netns %q: %v", netns, err)
+	}
+	defer netns.Close()
+
+	if err = createMacvlan(n, args.IfName, netns); err != nil {
+		return err
+	}
+
+	// run the IPAM plugin and get back the config to apply
+	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+	if result.IP4 == nil {
+		return errors.New("IPAM plugin returned missing IPv4 config")
+	}
+
+	err = netns.Do(func(_ ns.NetNS) error {
+		return ipam.ConfigureIface(args.IfName, result)
+	})
+	if err != nil {
+		return err
+	}
+
+	result.DNS = n.DNS
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	n, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	if args.Netns == "" {
+		return nil
+	}
+
+	return ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		return ip.DelLinkByName(args.IfName)
+	})
+}
+
+func renameLink(curName, newName string) error {
+	link, err := netlink.LinkByName(curName)
+	if err != nil {
+		return err
+	}
+
+	return netlink.LinkSetName(link, newName)
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ptp/ptp.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ptp/ptp.go
new file mode 100644
index 0000000000..aa695e39e2
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ptp/ptp.go
@@ -0,0 +1,229 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net"
+	"os"
+	"runtime"
+
+	"github.com/vishvananda/netlink"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/ipam"
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/utils"
+)
+
+func init() {
+	// this ensures that main runs only on main thread (thread group leader).
+	// since namespace ops (unshare, setns) are done for a single thread, we
+	// must ensure that the goroutine does not jump from OS thread to thread
+	runtime.LockOSThread()
+}
+
+type NetConf struct {
+	types.NetConf
+	IPMasq bool `json:"ipMasq"`
+	MTU    int  `json:"mtu"`
+}
+
+func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string, error) {
+	// The IPAM result will be something like IP=192.168.3.5/24, GW=192.168.3.1.
+	// What we want is really a point-to-point link but veth does not support IFF_POINTOPONT.
+	// Next best thing would be to let it ARP but set interface to 192.168.3.5/32 and
+	// add a route like "192.168.3.0/24 via 192.168.3.1 dev $ifName".
+	// Unfortunately that won't work as the GW will be outside the interface's subnet.
+
+	// Our solution is to configure the interface with 192.168.3.5/24, then delete the
+	// "192.168.3.0/24 dev $ifName" route that was automatically added. Then we add
+	// "192.168.3.1/32 dev $ifName" and "192.168.3.0/24 via 192.168.3.1 dev $ifName".
+	// In other words we force all traffic to ARP via the gateway except for GW itself.
+
+	var hostVethName string
+	err := ns.WithNetNSPath(netns, func(hostNS ns.NetNS) error {
+		hostVeth, _, err := ip.SetupVeth(ifName, mtu, hostNS)
+		if err != nil {
+			return err
+		}
+
+		if err = ipam.ConfigureIface(ifName, pr); err != nil {
+			return err
+		}
+
+		contVeth, err := netlink.LinkByName(ifName)
+		if err != nil {
+			return fmt.Errorf("failed to look up %q: %v", ifName, err)
+		}
+
+		// Delete the route that was automatically added
+		route := netlink.Route{
+			LinkIndex: contVeth.Attrs().Index,
+			Dst: &net.IPNet{
+				IP:   pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
+				Mask: pr.IP4.IP.Mask,
+			},
+			Scope: netlink.SCOPE_NOWHERE,
+		}
+
+		if err := netlink.RouteDel(&route); err != nil {
+			return fmt.Errorf("failed to delete route %v: %v", route, err)
+		}
+
+		for _, r := range []netlink.Route{
+			netlink.Route{
+				LinkIndex: contVeth.Attrs().Index,
+				Dst: &net.IPNet{
+					IP:   pr.IP4.Gateway,
+					Mask: net.CIDRMask(32, 32),
+				},
+				Scope: netlink.SCOPE_LINK,
+				Src:   pr.IP4.IP.IP,
+			},
+			netlink.Route{
+				LinkIndex: contVeth.Attrs().Index,
+				Dst: &net.IPNet{
+					IP:   pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
+					Mask: pr.IP4.IP.Mask,
+				},
+				Scope: netlink.SCOPE_UNIVERSE,
+				Gw:    pr.IP4.Gateway,
+				Src:   pr.IP4.IP.IP,
+			},
+		} {
+			if err := netlink.RouteAdd(&r); err != nil {
+				return fmt.Errorf("failed to add route %v: %v", r, err)
+			}
+		}
+
+		hostVethName = hostVeth.Attrs().Name
+
+		return nil
+	})
+	return hostVethName, err
+}
+
+func setupHostVeth(vethName string, ipConf *types.IPConfig) error {
+	// hostVeth moved namespaces and may have a new ifindex
+	veth, err := netlink.LinkByName(vethName)
+	if err != nil {
+		return fmt.Errorf("failed to lookup %q: %v", vethName, err)
+	}
+
+	// TODO(eyakubovich): IPv6
+	ipn := &net.IPNet{
+		IP:   ipConf.Gateway,
+		Mask: net.CIDRMask(32, 32),
+	}
+	addr := &netlink.Addr{IPNet: ipn, Label: ""}
+	if err = netlink.AddrAdd(veth, addr); err != nil {
+		return fmt.Errorf("failed to add IP addr (%#v) to veth: %v", ipn, err)
+	}
+
+	ipn = &net.IPNet{
+		IP:   ipConf.IP.IP,
+		Mask: net.CIDRMask(32, 32),
+	}
+	// dst happens to be the same as IP/net of host veth
+	if err = ip.AddHostRoute(ipn, nil, veth); err != nil && !os.IsExist(err) {
+		return fmt.Errorf("failed to add route on host: %v", err)
+	}
+
+	return nil
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	conf := NetConf{}
+	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
+		return fmt.Errorf("failed to load netconf: %v", err)
+	}
+
+	if err := ip.EnableIP4Forward(); err != nil {
+		return fmt.Errorf("failed to enable forwarding: %v", err)
+	}
+
+	// run the IPAM plugin and get back the config to apply
+	result, err := ipam.ExecAdd(conf.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+	if result.IP4 == nil {
+		return errors.New("IPAM plugin returned missing IPv4 config")
+	}
+
+	hostVethName, err := setupContainerVeth(args.Netns, args.IfName, conf.MTU, result)
+	if err != nil {
+		return err
+	}
+
+	if err = setupHostVeth(hostVethName, result.IP4); err != nil {
+		return err
+	}
+
+	if conf.IPMasq {
+		chain := utils.FormatChainName(conf.Name, args.ContainerID)
+		comment := utils.FormatComment(conf.Name, args.ContainerID)
+		if err = ip.SetupIPMasq(&result.IP4.IP, chain, comment); err != nil {
+			return err
+		}
+	}
+
+	result.DNS = conf.DNS
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	conf := NetConf{}
+	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
+		return fmt.Errorf("failed to load netconf: %v", err)
+	}
+
+	if err := ipam.ExecDel(conf.IPAM.Type, args.StdinData); err != nil {
+		return err
+	}
+
+	if args.Netns == "" {
+		return nil
+	}
+
+	var ipn *net.IPNet
+	err := ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		var err error
+		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
+		return err
+	})
+	if err != nil {
+		return err
+	}
+
+	if conf.IPMasq {
+		chain := utils.FormatChainName(conf.Name, args.ContainerID)
+		comment := utils.FormatComment(conf.Name, args.ContainerID)
+		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go
new file mode 100644
index 0000000000..096fe6d677
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go
@@ -0,0 +1,253 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This is a "meta-plugin". It reads in its own netconf, combines it with
+// the data from flannel generated subnet file and then invokes a plugin
+// like bridge or ipvlan to do the real work.
+
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/containernetworking/cni/pkg/invoke"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+const (
+	defaultSubnetFile = "/run/flannel/subnet.env"
+	stateDir          = "/var/lib/cni/flannel"
+)
+
+type NetConf struct {
+	types.NetConf
+	SubnetFile string                 `json:"subnetFile"`
+	Delegate   map[string]interface{} `json:"delegate"`
+}
+
+type subnetEnv struct {
+	nw     *net.IPNet
+	sn     *net.IPNet
+	mtu    *uint
+	ipmasq *bool
+}
+
+func (se *subnetEnv) missing() string {
+	m := []string{}
+
+	if se.nw == nil {
+		m = append(m, "FLANNEL_NETWORK")
+	}
+	if se.sn == nil {
+		m = append(m, "FLANNEL_SUBNET")
+	}
+	if se.mtu == nil {
+		m = append(m, "FLANNEL_MTU")
+	}
+	if se.ipmasq == nil {
+		m = append(m, "FLANNEL_IPMASQ")
+	}
+	return strings.Join(m, ", ")
+}
+
+func loadFlannelNetConf(bytes []byte) (*NetConf, error) {
+	n := &NetConf{
+		SubnetFile: defaultSubnetFile,
+	}
+	if err := json.Unmarshal(bytes, n); err != nil {
+		return nil, fmt.Errorf("failed to load netconf: %v", err)
+	}
+	return n, nil
+}
+
+func loadFlannelSubnetEnv(fn string) (*subnetEnv, error) {
+	f, err := os.Open(fn)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+
+	se := &subnetEnv{}
+
+	s := bufio.NewScanner(f)
+	for s.Scan() {
+		parts := strings.SplitN(s.Text(), "=", 2)
+		switch parts[0] {
+		case "FLANNEL_NETWORK":
+			_, se.nw, err = net.ParseCIDR(parts[1])
+			if err != nil {
+				return nil, err
+			}
+
+		case "FLANNEL_SUBNET":
+			_, se.sn, err = net.ParseCIDR(parts[1])
+			if err != nil {
+				return nil, err
+			}
+
+		case "FLANNEL_MTU":
+			mtu, err := strconv.ParseUint(parts[1], 10, 32)
+			if err != nil {
+				return nil, err
+			}
+			se.mtu = new(uint)
+			*se.mtu = uint(mtu)
+
+		case "FLANNEL_IPMASQ":
+			ipmasq := parts[1] == "true"
+			se.ipmasq = &ipmasq
+		}
+	}
+	if err := s.Err(); err != nil {
+		return nil, err
+	}
+
+	if m := se.missing(); m != "" {
+		return nil, fmt.Errorf("%v is missing %v", fn, m)
+	}
+
+	return se, nil
+}
+
+func saveScratchNetConf(containerID string, netconf []byte) error {
+	if err := os.MkdirAll(stateDir, 0700); err != nil {
+		return err
+	}
+	path := filepath.Join(stateDir, containerID)
+	return ioutil.WriteFile(path, netconf, 0600)
+}
+
+func consumeScratchNetConf(containerID string) ([]byte, error) {
+	path := filepath.Join(stateDir, containerID)
+	defer os.Remove(path)
+
+	return ioutil.ReadFile(path)
+}
+
+func delegateAdd(cid string, netconf map[string]interface{}) error {
+	netconfBytes, err := json.Marshal(netconf)
+	if err != nil {
+		return fmt.Errorf("error serializing delegate netconf: %v", err)
+	}
+
+	// save the rendered netconf for cmdDel
+	if err = saveScratchNetConf(cid, netconfBytes); err != nil {
+		return err
+	}
+
+	result, err := invoke.DelegateAdd(netconf["type"].(string), netconfBytes)
+	if err != nil {
+		return err
+	}
+
+	return result.Print()
+}
+
+func hasKey(m map[string]interface{}, k string) bool {
+	_, ok := m[k]
+	return ok
+}
+
+func isString(i interface{}) bool {
+	_, ok := i.(string)
+	return ok
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	n, err := loadFlannelNetConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	fenv, err := loadFlannelSubnetEnv(n.SubnetFile)
+	if err != nil {
+		return err
+	}
+
+	if n.Delegate == nil {
+		n.Delegate = make(map[string]interface{})
+	} else {
+		if hasKey(n.Delegate, "type") && !isString(n.Delegate["type"]) {
+			return fmt.Errorf("'delegate' dictionary, if present, must have (string) 'type' field")
+		}
+		if hasKey(n.Delegate, "name") {
+			return fmt.Errorf("'delegate' dictionary must not have 'name' field, it'll be set by flannel")
+		}
+		if hasKey(n.Delegate, "ipam") {
+			return fmt.Errorf("'delegate' dictionary must not have 'ipam' field, it'll be set by flannel")
+		}
+	}
+
+	n.Delegate["name"] = n.Name
+
+	if !hasKey(n.Delegate, "type") {
+		n.Delegate["type"] = "bridge"
+	}
+
+	if !hasKey(n.Delegate, "ipMasq") {
+		// if flannel is not doing ipmasq, we should
+		ipmasq := !*fenv.ipmasq
+		n.Delegate["ipMasq"] = ipmasq
+	}
+
+	if !hasKey(n.Delegate, "mtu") {
+		mtu := fenv.mtu
+		n.Delegate["mtu"] = mtu
+	}
+
+	if n.Delegate["type"].(string) == "bridge" {
+		if !hasKey(n.Delegate, "isGateway") {
+			n.Delegate["isGateway"] = true
+		}
+	}
+
+	n.Delegate["ipam"] = map[string]interface{}{
+		"type":   "host-local",
+		"subnet": fenv.sn.String(),
+		"routes": []types.Route{
+			types.Route{
+				Dst: *fenv.nw,
+			},
+		},
+	}
+
+	return delegateAdd(args.ContainerID, n.Delegate)
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	netconfBytes, err := consumeScratchNetConf(args.ContainerID)
+	if err != nil {
+		return err
+	}
+
+	n := &types.NetConf{}
+	if err = json.Unmarshal(netconfBytes, n); err != nil {
+		return fmt.Errorf("failed to parse netconf: %v", err)
+	}
+
+	return invoke.DelegateDel(n.Type, netconfBytes)
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go
new file mode 100644
index 0000000000..75ba852c00
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go
@@ -0,0 +1,82 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This is a "meta-plugin". It reads in its own netconf, it does not create
+// any network interface but just changes the network sysctl.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"strings"
+
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+// TuningConf represents the network tuning configuration.
+type TuningConf struct {
+	types.NetConf
+	SysCtl map[string]string `json:"sysctl"`
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	tuningConf := TuningConf{}
+	if err := json.Unmarshal(args.StdinData, &tuningConf); err != nil {
+		return fmt.Errorf("failed to load netconf: %v", err)
+	}
+
+	// The directory /proc/sys/net is per network namespace. Enter in the
+	// network namespace before writing on it.
+
+	err := ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		for key, value := range tuningConf.SysCtl {
+			fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1))
+			fileName = filepath.Clean(fileName)
+
+			// Refuse to modify sysctl parameters that don't belong
+			// to the network subsystem.
+			if !strings.HasPrefix(fileName, "/proc/sys/net/") {
+				return fmt.Errorf("invalid net sysctl key: %q", key)
+			}
+			content := []byte(value)
+			err := ioutil.WriteFile(fileName, content, 0644)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	result := types.Result{}
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	// TODO: the settings are not reverted to the previous values. Reverting the
+	// settings is not useful when the whole container goes away but it could be
+	// useful in scenarios where plugins are added and removed at runtime.
+	return nil
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/stage1/net-plugins/net-plugins.mk b/stage1/net-plugins/net-plugins.mk
index 0040831709..78ef0848c0 100644
--- a/stage1/net-plugins/net-plugins.mk
+++ b/stage1/net-plugins/net-plugins.mk
@@ -7,7 +7,7 @@
 
 # 1.
 
-# plugin names - taken from github.com/appc/cni/plugins
+# plugin names - taken from github.com/containernetworking/cni/plugins
 NPM_PLUGIN_NAMES := \
 	main/ptp \
 	main/bridge \
@@ -38,7 +38,7 @@ $$(call setup-stamp-file,NPM_STAMP,$$(NPM_BASE))
 # variables for makelib/build_go_bin.mk
 BGB_STAMP := $$(NPM_STAMP)
 BGB_BINARY := $$(NPM_PLUGIN)
-BGB_PKG_IN_REPO := Godeps/_workspace/src/github.com/appc/cni/plugins/$1
+BGB_PKG_IN_REPO := Godeps/_workspace/src/github.com/containernetworking/cni/plugins/$1
 include makelib/build_go_bin.mk
 
 $$(NPM_PLUGIN): | $$(TOOLSDIR)
diff --git a/vendoredApps b/vendoredApps
index 45842df29c..c65ebb2343 100644
--- a/vendoredApps
+++ b/vendoredApps
@@ -6,7 +6,6 @@ github.com/containernetworking/cni/plugins/ipam/dhcp
 github.com/containernetworking/cni/plugins/ipam/host-local
 github.com/containernetworking/cni/plugins/main/bridge
 github.com/containernetworking/cni/plugins/main/ipvlan
-github.com/containernetworking/cni/plugins/main/lo
 github.com/containernetworking/cni/plugins/main/macvlan
 github.com/containernetworking/cni/plugins/main/ptp
 github.com/containernetworking/cni/plugins/meta/flannel

From e1e8bc55df1f66b5874392c69922543defdd750c Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 27 May 2016 15:29:35 +0200
Subject: [PATCH 0337/1304] deps: delete appc/cni files

---
 .../src/github.com/appc/cni/LICENSE           | 202 -----------
 .../github.com/appc/cni/pkg/invoke/args.go    |  76 ----
 .../appc/cni/pkg/invoke/delegate.go           |  39 --
 .../github.com/appc/cni/pkg/invoke/exec.go    |  75 ----
 .../github.com/appc/cni/pkg/invoke/find.go    |  47 ---
 .../src/github.com/appc/cni/pkg/ip/cidr.go    |  51 ---
 .../github.com/appc/cni/pkg/ip/ipforward.go   |  31 --
 .../src/github.com/appc/cni/pkg/ip/ipmasq.go  |  66 ----
 .../src/github.com/appc/cni/pkg/ip/link.go    | 153 --------
 .../src/github.com/appc/cni/pkg/ip/route.go   |  47 ---
 .../src/github.com/appc/cni/pkg/ipam/ipam.go  |  68 ----
 .../src/github.com/appc/cni/pkg/ns/ns.go      |  93 -----
 .../src/github.com/appc/cni/pkg/skel/skel.go  | 117 ------
 .../src/github.com/appc/cni/pkg/types/args.go |  91 -----
 .../github.com/appc/cni/pkg/types/types.go    | 191 ----------
 .../github.com/appc/cni/pkg/utils/utils.go    |  27 --
 .../appc/cni/plugins/ipam/dhcp/daemon.go      | 157 --------
 .../appc/cni/plugins/ipam/dhcp/lease.go       | 338 ------------------
 .../appc/cni/plugins/ipam/dhcp/main.go        |  73 ----
 .../appc/cni/plugins/ipam/dhcp/options.go     | 139 -------
 .../cni/plugins/ipam/host-local/README.md     |  86 -----
 .../cni/plugins/ipam/host-local/allocator.go  | 165 ---------
 .../ipam/host-local/backend/disk/backend.go   |  88 -----
 .../ipam/host-local/backend/disk/lock.go      |  50 ---
 .../plugins/ipam/host-local/backend/store.go  |  26 --
 .../cni/plugins/ipam/host-local/config.go     |  70 ----
 .../appc/cni/plugins/ipam/host-local/main.go  |  74 ----
 .../appc/cni/plugins/main/bridge/bridge.go    | 268 --------------
 .../appc/cni/plugins/main/ipvlan/ipvlan.go    | 172 ---------
 .../appc/cni/plugins/main/macvlan/macvlan.go  | 176 ---------
 .../appc/cni/plugins/main/ptp/ptp.go          | 225 ------------
 .../appc/cni/plugins/meta/flannel/flannel.go  | 253 -------------
 .../appc/cni/plugins/meta/tuning/tuning.go    |  83 -----
 33 files changed, 3817 deletions(-)
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/args.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/delegate.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/ip/cidr.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipforward.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipmasq.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/ip/link.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/ip/route.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/ipam/ipam.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/ns/ns.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/skel/skel.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/types/types.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/pkg/utils/utils.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/daemon.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/lease.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/options.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/allocator.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/disk/backend.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/disk/lock.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/store.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/config.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/main/ipvlan/ipvlan.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/main/macvlan/macvlan.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/meta/flannel/flannel.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/cni/plugins/meta/tuning/tuning.go

diff --git a/Godeps/_workspace/src/github.com/appc/cni/LICENSE b/Godeps/_workspace/src/github.com/appc/cni/LICENSE
deleted file mode 100644
index 8f71f43fee..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/args.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/args.go
deleted file mode 100644
index be28ba621f..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/args.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"os"
-	"strings"
-)
-
-type CNIArgs interface {
-	// For use with os/exec; i.e., return nil to inherit the
-	// environment from this process
-	AsEnv() []string
-}
-
-type inherited struct{}
-
-var inheritArgsFromEnv inherited
-
-func (_ *inherited) AsEnv() []string {
-	return nil
-}
-
-func ArgsFromEnv() CNIArgs {
-	return &inheritArgsFromEnv
-}
-
-type Args struct {
-	Command       string
-	ContainerID   string
-	NetNS         string
-	PluginArgs    [][2]string
-	PluginArgsStr string
-	IfName        string
-	Path          string
-}
-
-func (args *Args) AsEnv() []string {
-	env := os.Environ()
-	pluginArgsStr := args.PluginArgsStr
-	if pluginArgsStr == "" {
-		pluginArgsStr = stringify(args.PluginArgs)
-	}
-
-	env = append(env,
-		"CNI_COMMAND="+args.Command,
-		"CNI_CONTAINERID="+args.ContainerID,
-		"CNI_NETNS="+args.NetNS,
-		"CNI_ARGS="+pluginArgsStr,
-		"CNI_IFNAME="+args.IfName,
-		"CNI_PATH="+args.Path)
-	return env
-}
-
-// taken from rkt/networking/net_plugin.go
-func stringify(pluginArgs [][2]string) string {
-	entries := make([]string, len(pluginArgs))
-
-	for i, kv := range pluginArgs {
-		entries[i] = strings.Join(kv[:], "=")
-	}
-
-	return strings.Join(entries, ";")
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/delegate.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/delegate.go
deleted file mode 100644
index 9864e6f53e..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/delegate.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package invoke
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/appc/cni/pkg/types"
-)
-
-func DelegateAdd(delegatePlugin string, netconf []byte) (*types.Result, error) {
-	if os.Getenv("CNI_COMMAND") != "ADD" {
-		return nil, fmt.Errorf("CNI_COMMAND is not ADD")
-	}
-
-	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
-
-	pluginPath, err := FindInPath(delegatePlugin, paths)
-	if err != nil {
-		return nil, err
-	}
-
-	return ExecPluginWithResult(pluginPath, netconf, ArgsFromEnv())
-}
-
-func DelegateDel(delegatePlugin string, netconf []byte) error {
-	if os.Getenv("CNI_COMMAND") != "DEL" {
-		return fmt.Errorf("CNI_COMMAND is not DEL")
-	}
-
-	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
-
-	pluginPath, err := FindInPath(delegatePlugin, paths)
-	if err != nil {
-		return err
-	}
-
-	return ExecPluginWithoutResult(pluginPath, netconf, ArgsFromEnv())
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go
deleted file mode 100644
index 337bfcb870..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/exec.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"os"
-	"os/exec"
-
-	"github.com/appc/cni/pkg/types"
-)
-
-func pluginErr(err error, output []byte) error {
-	if _, ok := err.(*exec.ExitError); ok {
-		emsg := types.Error{}
-		if perr := json.Unmarshal(output, &emsg); perr != nil {
-			return fmt.Errorf("netplugin failed but error parsing its diagnostic message %q: %v", string(output), perr)
-		}
-		details := ""
-		if emsg.Details != "" {
-			details = fmt.Sprintf("; %v", emsg.Details)
-		}
-		return fmt.Errorf("%v%v", emsg.Msg, details)
-	}
-
-	return err
-}
-
-func ExecPluginWithResult(pluginPath string, netconf []byte, args CNIArgs) (*types.Result, error) {
-	stdoutBytes, err := execPlugin(pluginPath, netconf, args)
-	if err != nil {
-		return nil, err
-	}
-
-	res := &types.Result{}
-	err = json.Unmarshal(stdoutBytes, res)
-	return res, err
-}
-
-func ExecPluginWithoutResult(pluginPath string, netconf []byte, args CNIArgs) error {
-	_, err := execPlugin(pluginPath, netconf, args)
-	return err
-}
-
-func execPlugin(pluginPath string, netconf []byte, args CNIArgs) ([]byte, error) {
-	stdout := &bytes.Buffer{}
-
-	c := exec.Cmd{
-		Env:    args.AsEnv(),
-		Path:   pluginPath,
-		Args:   []string{pluginPath},
-		Stdin:  bytes.NewBuffer(netconf),
-		Stdout: stdout,
-		Stderr: os.Stderr,
-	}
-	if err := c.Run(); err != nil {
-		return nil, pluginErr(err, stdout.Bytes())
-	}
-
-	return stdout.Bytes(), nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go
deleted file mode 100644
index 3b03790711..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/invoke/find.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-)
-
-// FindInPath returns the full path of the plugin by searching in the provided path
-func FindInPath(plugin string, paths []string) (string, error) {
-	if plugin == "" {
-		return "", fmt.Errorf("no plugin name provided")
-	}
-
-	if len(paths) == 0 {
-		return "", fmt.Errorf("no paths provided")
-	}
-
-	var fullpath string
-	for _, path := range paths {
-		full := filepath.Join(path, plugin)
-		if fi, err := os.Stat(full); err == nil && fi.Mode().IsRegular() {
-			fullpath = full
-			break
-		}
-	}
-
-	if fullpath == "" {
-		return "", fmt.Errorf("failed to find plugin %q in path %s", plugin, paths)
-	}
-
-	return fullpath, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/cidr.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/cidr.go
deleted file mode 100644
index dae2c4d0e4..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/cidr.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"math/big"
-	"net"
-)
-
-// NextIP returns IP incremented by 1
-func NextIP(ip net.IP) net.IP {
-	i := ipToInt(ip)
-	return intToIP(i.Add(i, big.NewInt(1)))
-}
-
-// PrevIP returns IP decremented by 1
-func PrevIP(ip net.IP) net.IP {
-	i := ipToInt(ip)
-	return intToIP(i.Sub(i, big.NewInt(1)))
-}
-
-func ipToInt(ip net.IP) *big.Int {
-	if v := ip.To4(); v != nil {
-		return big.NewInt(0).SetBytes(v)
-	}
-	return big.NewInt(0).SetBytes(ip.To16())
-}
-
-func intToIP(i *big.Int) net.IP {
-	return net.IP(i.Bytes())
-}
-
-// Network masks off the host portion of the IP
-func Network(ipn *net.IPNet) *net.IPNet {
-	return &net.IPNet{
-		IP:   ipn.IP.Mask(ipn.Mask),
-		Mask: ipn.Mask,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipforward.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipforward.go
deleted file mode 100644
index 77ee74632a..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipforward.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"io/ioutil"
-)
-
-func EnableIP4Forward() error {
-	return echo1("/proc/sys/net/ipv4/ip_forward")
-}
-
-func EnableIP6Forward() error {
-	return echo1("/proc/sys/net/ipv6/conf/all/forwarding")
-}
-
-func echo1(f string) error {
-	return ioutil.WriteFile(f, []byte("1"), 0644)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipmasq.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipmasq.go
deleted file mode 100644
index 8ee279717a..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/ipmasq.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/coreos/go-iptables/iptables"
-)
-
-// SetupIPMasq installs iptables rules to masquerade traffic
-// coming from ipn and going outside of it
-func SetupIPMasq(ipn *net.IPNet, chain string, comment string) error {
-	ipt, err := iptables.New()
-	if err != nil {
-		return fmt.Errorf("failed to locate iptables: %v", err)
-	}
-
-	if err = ipt.NewChain("nat", chain); err != nil {
-		if err.(*iptables.Error).ExitStatus() != 1 {
-			// TODO(eyakubovich): assumes exit status 1 implies chain exists
-			return err
-		}
-	}
-
-	if err = ipt.AppendUnique("nat", chain, "-d", ipn.String(), "-j", "ACCEPT", "-m", "comment", "--comment", comment); err != nil {
-		return err
-	}
-
-	if err = ipt.AppendUnique("nat", chain, "!", "-d", "224.0.0.0/4", "-j", "MASQUERADE", "-m", "comment", "--comment", comment); err != nil {
-		return err
-	}
-
-	return ipt.AppendUnique("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment)
-}
-
-// TeardownIPMasq undoes the effects of SetupIPMasq
-func TeardownIPMasq(ipn *net.IPNet, chain string, comment string) error {
-	ipt, err := iptables.New()
-	if err != nil {
-		return fmt.Errorf("failed to locate iptables: %v", err)
-	}
-
-	if err = ipt.Delete("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment); err != nil {
-		return err
-	}
-
-	if err = ipt.ClearChain("nat", chain); err != nil {
-		return err
-	}
-
-	return ipt.DeleteChain("nat", chain)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/link.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/link.go
deleted file mode 100644
index 1ba529da58..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/link.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"crypto/rand"
-	"fmt"
-	"net"
-	"os"
-
-	"github.com/appc/cni/pkg/ns"
-	"github.com/vishvananda/netlink"
-)
-
-func makeVethPair(name, peer string, mtu int) (netlink.Link, error) {
-	veth := &netlink.Veth{
-		LinkAttrs: netlink.LinkAttrs{
-			Name:  name,
-			Flags: net.FlagUp,
-			MTU:   mtu,
-		},
-		PeerName: peer,
-	}
-	if err := netlink.LinkAdd(veth); err != nil {
-		return nil, err
-	}
-
-	return veth, nil
-}
-
-func makeVeth(name string, mtu int) (peerName string, veth netlink.Link, err error) {
-	for i := 0; i < 10; i++ {
-		peerName, err = RandomVethName()
-		if err != nil {
-			return
-		}
-
-		veth, err = makeVethPair(name, peerName, mtu)
-		switch {
-		case err == nil:
-			return
-
-		case os.IsExist(err):
-			continue
-
-		default:
-			err = fmt.Errorf("failed to make veth pair: %v", err)
-			return
-		}
-	}
-
-	// should really never be hit
-	err = fmt.Errorf("failed to find a unique veth name")
-	return
-}
-
-// RandomVethName returns string "veth" with random prefix (hashed from entropy)
-func RandomVethName() (string, error) {
-	entropy := make([]byte, 4)
-	_, err := rand.Reader.Read(entropy)
-	if err != nil {
-		return "", fmt.Errorf("failed to generate random veth name: %v", err)
-	}
-
-	// NetworkManager (recent versions) will ignore veth devices that start with "veth"
-	return fmt.Sprintf("veth%x", entropy), nil
-}
-
-// SetupVeth sets up a virtual ethernet link.
-// Should be in container netns, and will switch back to hostNS to set the host
-// veth end up.
-func SetupVeth(contVethName string, mtu int, hostNS *os.File) (hostVeth, contVeth netlink.Link, err error) {
-	var hostVethName string
-	hostVethName, contVeth, err = makeVeth(contVethName, mtu)
-	if err != nil {
-		return
-	}
-
-	if err = netlink.LinkSetUp(contVeth); err != nil {
-		err = fmt.Errorf("failed to set %q up: %v", contVethName, err)
-		return
-	}
-
-	hostVeth, err = netlink.LinkByName(hostVethName)
-	if err != nil {
-		err = fmt.Errorf("failed to lookup %q: %v", hostVethName, err)
-		return
-	}
-
-	if err = netlink.LinkSetNsFd(hostVeth, int(hostNS.Fd())); err != nil {
-		err = fmt.Errorf("failed to move veth to host netns: %v", err)
-		return
-	}
-
-	err = ns.WithNetNS(hostNS, false, func(_ *os.File) error {
-		hostVeth, err := netlink.LinkByName(hostVethName)
-		if err != nil {
-			return fmt.Errorf("failed to lookup %q in %q: %v", hostVethName, hostNS.Name(), err)
-		}
-
-		if err = netlink.LinkSetUp(hostVeth); err != nil {
-			return fmt.Errorf("failed to set %q up: %v", hostVethName, err)
-		}
-		return nil
-	})
-	return
-}
-
-// DelLinkByName removes an interface link.
-func DelLinkByName(ifName string) error {
-	iface, err := netlink.LinkByName(ifName)
-	if err != nil {
-		return fmt.Errorf("failed to lookup %q: %v", ifName, err)
-	}
-
-	if err = netlink.LinkDel(iface); err != nil {
-		return fmt.Errorf("failed to delete %q: %v", ifName, err)
-	}
-
-	return nil
-}
-
-// DelLinkByNameAddr remove an interface returns its IP address
-// of the specified family
-func DelLinkByNameAddr(ifName string, family int) (*net.IPNet, error) {
-	iface, err := netlink.LinkByName(ifName)
-	if err != nil {
-		return nil, fmt.Errorf("failed to lookup %q: %v", ifName, err)
-	}
-
-	addrs, err := netlink.AddrList(iface, family)
-	if err != nil || len(addrs) == 0 {
-		return nil, fmt.Errorf("failed to get IP addresses for %q: %v", ifName, err)
-	}
-
-	if err = netlink.LinkDel(iface); err != nil {
-		return nil, fmt.Errorf("failed to delete %q: %v", ifName, err)
-	}
-
-	return addrs[0].IPNet, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/route.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/route.go
deleted file mode 100644
index 6c8658b2a2..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ip/route.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"net"
-
-	"github.com/vishvananda/netlink"
-)
-
-// AddDefaultRoute sets the default route on the given gateway.
-func AddDefaultRoute(gw net.IP, dev netlink.Link) error {
-	_, defNet, _ := net.ParseCIDR("0.0.0.0/0")
-	return AddRoute(defNet, gw, dev)
-}
-
-// AddRoute adds a universally-scoped route to a device.
-func AddRoute(ipn *net.IPNet, gw net.IP, dev netlink.Link) error {
-	return netlink.RouteAdd(&netlink.Route{
-		LinkIndex: dev.Attrs().Index,
-		Scope:     netlink.SCOPE_UNIVERSE,
-		Dst:       ipn,
-		Gw:        gw,
-	})
-}
-
-// AddHostRoute adds a host-scoped route to a device.
-func AddHostRoute(ipn *net.IPNet, gw net.IP, dev netlink.Link) error {
-	return netlink.RouteAdd(&netlink.Route{
-		LinkIndex: dev.Attrs().Index,
-		Scope:     netlink.SCOPE_HOST,
-		Dst:       ipn,
-		Gw:        gw,
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ipam/ipam.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ipam/ipam.go
deleted file mode 100644
index f0adfb7f60..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ipam/ipam.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ipam
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/appc/cni/pkg/invoke"
-	"github.com/appc/cni/pkg/ip"
-	"github.com/appc/cni/pkg/types"
-
-	"github.com/vishvananda/netlink"
-)
-
-func ExecAdd(plugin string, netconf []byte) (*types.Result, error) {
-	return invoke.DelegateAdd(plugin, netconf)
-}
-
-func ExecDel(plugin string, netconf []byte) error {
-	return invoke.DelegateDel(plugin, netconf)
-}
-
-// ConfigureIface takes the result of IPAM plugin and
-// applies to the ifName interface
-func ConfigureIface(ifName string, res *types.Result) error {
-	link, err := netlink.LinkByName(ifName)
-	if err != nil {
-		return fmt.Errorf("failed to lookup %q: %v", ifName, err)
-	}
-
-	if err := netlink.LinkSetUp(link); err != nil {
-		return fmt.Errorf("failed to set %q UP: %v", ifName, err)
-	}
-
-	// TODO(eyakubovich): IPv6
-	addr := &netlink.Addr{IPNet: &res.IP4.IP, Label: ""}
-	if err = netlink.AddrAdd(link, addr); err != nil {
-		return fmt.Errorf("failed to add IP addr to %q: %v", ifName, err)
-	}
-
-	for _, r := range res.IP4.Routes {
-		gw := r.GW
-		if gw == nil {
-			gw = res.IP4.Gateway
-		}
-		if err = ip.AddRoute(&r.Dst, gw, link); err != nil {
-			// we skip over duplicate routes as we assume the first one wins
-			if !os.IsExist(err) {
-				return fmt.Errorf("failed to add route '%v via %v dev %v': %v", r.Dst, gw, ifName, err)
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/ns/ns.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/ns/ns.go
deleted file mode 100644
index 4f0814f1d6..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/ns/ns.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ns
-
-import (
-	"fmt"
-	"os"
-	"runtime"
-	"syscall"
-)
-
-var setNsMap = map[string]uintptr{
-	"386":   346,
-	"amd64": 308,
-	"arm":   374,
-}
-
-// SetNS sets the network namespace on a target file.
-func SetNS(f *os.File, flags uintptr) error {
-	if runtime.GOOS != "linux" {
-		return fmt.Errorf("unsupported OS: %s", runtime.GOOS)
-	}
-
-	trap, ok := setNsMap[runtime.GOARCH]
-	if !ok {
-		return fmt.Errorf("unsupported arch: %s", runtime.GOARCH)
-	}
-
-	_, _, err := syscall.RawSyscall(trap, f.Fd(), flags, 0)
-	if err != 0 {
-		return err
-	}
-
-	return nil
-}
-
-// WithNetNSPath executes the passed closure under the given network
-// namespace, restoring the original namespace afterwards.
-// Changing namespaces must be done on a goroutine that has been
-// locked to an OS thread. If lockThread arg is true, this function
-// locks the goroutine prior to change namespace and unlocks before
-// returning
-func WithNetNSPath(nspath string, lockThread bool, f func(*os.File) error) error {
-	ns, err := os.Open(nspath)
-	if err != nil {
-		return fmt.Errorf("Failed to open %v: %v", nspath, err)
-	}
-	defer ns.Close()
-	return WithNetNS(ns, lockThread, f)
-}
-
-// WithNetNS executes the passed closure under the given network
-// namespace, restoring the original namespace afterwards.
-// Changing namespaces must be done on a goroutine that has been
-// locked to an OS thread. If lockThread arg is true, this function
-// locks the goroutine prior to change namespace and unlocks before
-// returning.  If the closure returns an error, WithNetNS attempts to
-// restore the original namespace before returning.
-func WithNetNS(ns *os.File, lockThread bool, f func(*os.File) error) error {
-	if lockThread {
-		runtime.LockOSThread()
-		defer runtime.UnlockOSThread()
-	}
-	// save a handle to current (host) network namespace
-	thisNS, err := os.Open("/proc/self/ns/net")
-	if err != nil {
-		return fmt.Errorf("Failed to open /proc/self/ns/net: %v", err)
-	}
-	defer thisNS.Close()
-
-	if err = SetNS(ns, syscall.CLONE_NEWNET); err != nil {
-		return fmt.Errorf("Error switching to ns %v: %v", ns.Name(), err)
-	}
-	defer SetNS(thisNS, syscall.CLONE_NEWNET) // switch back
-
-	if err = f(thisNS); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/skel/skel.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/skel/skel.go
deleted file mode 100644
index 5c3532dbae..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/skel/skel.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2014 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package skel provides skeleton code for a CNI plugin.
-// In particular, it implements argument parsing and validation.
-package skel
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-
-	"github.com/appc/cni/pkg/types"
-)
-
-// CmdArgs captures all the arguments passed in to the plugin
-// via both env vars and stdin
-type CmdArgs struct {
-	ContainerID string
-	Netns       string
-	IfName      string
-	Args        string
-	Path        string
-	StdinData   []byte
-}
-
-// PluginMain is the "main" for a plugin. It accepts
-// two callback functions for add and del commands.
-func PluginMain(cmdAdd, cmdDel func(_ *CmdArgs) error) {
-	var cmd, contID, netns, ifName, args, path string
-
-	vars := []struct {
-		name string
-		val  *string
-		req  bool
-	}{
-		{"CNI_COMMAND", &cmd, true},
-		{"CNI_CONTAINERID", &contID, false},
-		{"CNI_NETNS", &netns, true},
-		{"CNI_IFNAME", &ifName, true},
-		{"CNI_ARGS", &args, false},
-		{"CNI_PATH", &path, true},
-	}
-
-	argsMissing := false
-	for _, v := range vars {
-		*v.val = os.Getenv(v.name)
-		if v.req && *v.val == "" {
-			log.Printf("%v env variable missing", v.name)
-			argsMissing = true
-		}
-	}
-
-	if argsMissing {
-		dieMsg("required env variables missing")
-	}
-
-	stdinData, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		dieMsg("error reading from stdin: %v", err)
-	}
-
-	cmdArgs := &CmdArgs{
-		ContainerID: contID,
-		Netns:       netns,
-		IfName:      ifName,
-		Args:        args,
-		Path:        path,
-		StdinData:   stdinData,
-	}
-
-	switch cmd {
-	case "ADD":
-		err = cmdAdd(cmdArgs)
-
-	case "DEL":
-		err = cmdDel(cmdArgs)
-
-	default:
-		dieMsg("unknown CNI_COMMAND: %v", cmd)
-	}
-
-	if err != nil {
-		if e, ok := err.(*types.Error); ok {
-			// don't wrap Error in Error
-			dieErr(e)
-		}
-		dieMsg(err.Error())
-	}
-}
-
-func dieMsg(f string, args ...interface{}) {
-	e := &types.Error{
-		Code: 100,
-		Msg:  fmt.Sprintf(f, args...),
-	}
-	dieErr(e)
-}
-
-func dieErr(e *types.Error) {
-	if err := e.Print(); err != nil {
-		log.Print("Error writing error JSON to stdout: ", err)
-	}
-	os.Exit(1)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go
deleted file mode 100644
index 3b667b0f20..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/types/args.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// UnmarshallableBool typedef for builtin bool
-// because builtin type's methods can't be declared
-type UnmarshallableBool bool
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface.
-// Returns boolean true if the string is "1" or "[Tt]rue"
-// Returns boolean false if the string is "0" or "[Ff]alse"
-func (b *UnmarshallableBool) UnmarshalText(data []byte) error {
-	s := strings.ToLower(string(data))
-	switch s {
-	case "1", "true":
-		*b = true
-	case "0", "false":
-		*b = false
-	default:
-		return fmt.Errorf("Boolean unmarshal error: invalid input %s", s)
-	}
-	return nil
-}
-
-// CommonArgs contains the IgnoreUnknown argument
-// and must be embedded by all Arg structs
-type CommonArgs struct {
-	IgnoreUnknown UnmarshallableBool `json:"ignoreunknown,omitempty"`
-}
-
-// GetKeyField is a helper function to receive Values
-// Values that represent a pointer to a struct
-func GetKeyField(keyString string, v reflect.Value) reflect.Value {
-	return v.Elem().FieldByName(keyString)
-}
-
-// LoadArgs parses args from a string in the form "K=V;K2=V2;..."
-func LoadArgs(args string, container interface{}) error {
-	if args == "" {
-		return nil
-	}
-
-	containerValue := reflect.ValueOf(container)
-
-	pairs := strings.Split(args, ";")
-	unknownArgs := []string{}
-	for _, pair := range pairs {
-		kv := strings.Split(pair, "=")
-		if len(kv) != 2 {
-			return fmt.Errorf("ARGS: invalid pair %q", pair)
-		}
-		keyString := kv[0]
-		valueString := kv[1]
-		keyField := GetKeyField(keyString, containerValue)
-		if !keyField.IsValid() {
-			unknownArgs = append(unknownArgs, pair)
-			continue
-		}
-
-		u := keyField.Addr().Interface().(encoding.TextUnmarshaler)
-		err := u.UnmarshalText([]byte(valueString))
-		if err != nil {
-			return fmt.Errorf("ARGS: error parsing value of pair %q: %v)", pair, err)
-		}
-	}
-
-	isIgnoreUnknown := GetKeyField("IgnoreUnknown", containerValue).Bool()
-	if len(unknownArgs) > 0 && !isIgnoreUnknown {
-		return fmt.Errorf("ARGS: unknown args %q", unknownArgs)
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/types/types.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/types/types.go
deleted file mode 100644
index 6948dcb1fb..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/types/types.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"os"
-)
-
-// like net.IPNet but adds JSON marshalling and unmarshalling
-type IPNet net.IPNet
-
-// ParseCIDR takes a string like "10.2.3.1/24" and
-// return IPNet with "10.2.3.1" and /24 mask
-func ParseCIDR(s string) (*net.IPNet, error) {
-	ip, ipn, err := net.ParseCIDR(s)
-	if err != nil {
-		return nil, err
-	}
-
-	ipn.IP = ip
-	return ipn, nil
-}
-
-func (n IPNet) MarshalJSON() ([]byte, error) {
-	return json.Marshal((*net.IPNet)(&n).String())
-}
-
-func (n *IPNet) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-
-	tmp, err := ParseCIDR(s)
-	if err != nil {
-		return err
-	}
-
-	*n = IPNet(*tmp)
-	return nil
-}
-
-// NetConf describes a network.
-type NetConf struct {
-	Name string `json:"name,omitempty"`
-	Type string `json:"type,omitempty"`
-	IPAM struct {
-		Type string `json:"type,omitempty"`
-	} `json:"ipam,omitempty"`
-	DNS DNS `json:"dns"`
-}
-
-// Result is what gets returned from the plugin (via stdout) to the caller
-type Result struct {
-	IP4 *IPConfig `json:"ip4,omitempty"`
-	IP6 *IPConfig `json:"ip6,omitempty"`
-	DNS DNS       `json:"dns,omitempty"`
-}
-
-func (r *Result) Print() error {
-	return prettyPrint(r)
-}
-
-// String returns a formatted string in the form of "[IP4: $1,][ IP6: $2,] DNS: $3" where
-// $1 represents the receiver's IPv4, $2 represents the receiver's IPv6 and $3 the
-// receiver's DNS. If $1 or $2 are nil, they won't be present in the returned string.
-func (r *Result) String() string {
-	var str string
-	if r.IP4 != nil {
-		str = fmt.Sprintf("IP4:%+v, ", *r.IP4)
-	}
-	if r.IP6 != nil {
-		str += fmt.Sprintf("IP6:%+v, ", *r.IP6)
-	}
-	return fmt.Sprintf("%sDNS:%+v", str, r.DNS)
-}
-
-// IPConfig contains values necessary to configure an interface
-type IPConfig struct {
-	IP      net.IPNet
-	Gateway net.IP
-	Routes  []Route
-}
-
-// DNS contains values interesting for DNS resolvers
-type DNS struct {
-	Nameservers []string `json:"nameservers,omitempty"`
-	Domain      string   `json:"domain,omitempty"`
-	Search      []string `json:"search,omitempty"`
-	Options     []string `json:"options,omitempty"`
-}
-
-type Route struct {
-	Dst net.IPNet
-	GW  net.IP
-}
-
-type Error struct {
-	Code    uint   `json:"code"`
-	Msg     string `json:"msg"`
-	Details string `json:"details,omitempty"`
-}
-
-func (e *Error) Error() string {
-	return e.Msg
-}
-
-func (e *Error) Print() error {
-	return prettyPrint(e)
-}
-
-// net.IPNet is not JSON (un)marshallable so this duality is needed
-// for our custom IPNet type
-
-// JSON (un)marshallable types
-type ipConfig struct {
-	IP      IPNet   `json:"ip"`
-	Gateway net.IP  `json:"gateway,omitempty"`
-	Routes  []Route `json:"routes,omitempty"`
-}
-
-type route struct {
-	Dst IPNet  `json:"dst"`
-	GW  net.IP `json:"gw,omitempty"`
-}
-
-func (c *IPConfig) MarshalJSON() ([]byte, error) {
-	ipc := ipConfig{
-		IP:      IPNet(c.IP),
-		Gateway: c.Gateway,
-		Routes:  c.Routes,
-	}
-
-	return json.Marshal(ipc)
-}
-
-func (c *IPConfig) UnmarshalJSON(data []byte) error {
-	ipc := ipConfig{}
-	if err := json.Unmarshal(data, &ipc); err != nil {
-		return err
-	}
-
-	c.IP = net.IPNet(ipc.IP)
-	c.Gateway = ipc.Gateway
-	c.Routes = ipc.Routes
-	return nil
-}
-
-func (r *Route) UnmarshalJSON(data []byte) error {
-	rt := route{}
-	if err := json.Unmarshal(data, &rt); err != nil {
-		return err
-	}
-
-	r.Dst = net.IPNet(rt.Dst)
-	r.GW = rt.GW
-	return nil
-}
-
-func (r *Route) MarshalJSON() ([]byte, error) {
-	rt := route{
-		Dst: IPNet(r.Dst),
-		GW:  r.GW,
-	}
-
-	return json.Marshal(rt)
-}
-
-func prettyPrint(obj interface{}) error {
-	data, err := json.MarshalIndent(obj, "", "    ")
-	if err != nil {
-		return err
-	}
-	_, err = os.Stdout.Write(data)
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/pkg/utils/utils.go b/Godeps/_workspace/src/github.com/appc/cni/pkg/utils/utils.go
deleted file mode 100644
index 7ec139fd8f..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/pkg/utils/utils.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package utils
-
-import (
-	"crypto/sha512"
-	"fmt"
-)
-
-const (
-	maxChainLength = 28
-	chainPrefix    = "CNI-"
-	prefixLength   = len(chainPrefix)
-)
-
-// Generates a chain name to be used with iptables.
-// Ensures that the generated chain name is exactly
-// maxChainLength chars in length
-func FormatChainName(name string, id string) string {
-	chainBytes := sha512.Sum512([]byte(name + id))
-	chain := fmt.Sprintf("%s%x", chainPrefix, chainBytes)
-	return chain[:maxChainLength]
-}
-
-// FormatComment returns a comment used for easier
-// rule identification within iptables.
-func FormatComment(name string, id string) string {
-	return fmt.Sprintf("name: %q id: %q", name, id)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/daemon.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/daemon.go
deleted file mode 100644
index dabedf7241..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/daemon.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"log"
-	"net"
-	"net/http"
-	"net/rpc"
-	"os"
-	"path/filepath"
-	"runtime"
-	"sync"
-
-	"github.com/appc/cni/pkg/skel"
-	"github.com/appc/cni/pkg/types"
-	"github.com/coreos/go-systemd/activation"
-)
-
-const listenFdsStart = 3
-const resendCount = 3
-
-var errNoMoreTries = errors.New("no more tries")
-
-type DHCP struct {
-	mux    sync.Mutex
-	leases map[string]*DHCPLease
-}
-
-func newDHCP() *DHCP {
-	return &DHCP{
-		leases: make(map[string]*DHCPLease),
-	}
-}
-
-// Allocate acquires an IP from a DHCP server for a specified container.
-// The acquired lease will be maintained until Release() is called.
-func (d *DHCP) Allocate(args *skel.CmdArgs, result *types.Result) error {
-	conf := types.NetConf{}
-	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
-		return fmt.Errorf("error parsing netconf: %v", err)
-	}
-
-	clientID := args.ContainerID + "/" + conf.Name
-	l, err := AcquireLease(clientID, args.Netns, args.IfName)
-	if err != nil {
-		return err
-	}
-
-	ipn, err := l.IPNet()
-	if err != nil {
-		l.Stop()
-		return err
-	}
-
-	d.setLease(args.ContainerID, conf.Name, l)
-
-	result.IP4 = &types.IPConfig{
-		IP:      *ipn,
-		Gateway: l.Gateway(),
-		Routes:  l.Routes(),
-	}
-
-	return nil
-}
-
-// Release stops maintenance of the lease acquired in Allocate()
-// and sends a release msg to the DHCP server.
-func (d *DHCP) Release(args *skel.CmdArgs, reply *struct{}) error {
-	conf := types.NetConf{}
-	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
-		return fmt.Errorf("error parsing netconf: %v", err)
-	}
-
-	if l := d.getLease(args.ContainerID, conf.Name); l != nil {
-		l.Stop()
-		return nil
-	}
-
-	return fmt.Errorf("lease not found: %v/%v", args.ContainerID, conf.Name)
-}
-
-func (d *DHCP) getLease(contID, netName string) *DHCPLease {
-	d.mux.Lock()
-	defer d.mux.Unlock()
-
-	// TODO(eyakubovich): hash it to avoid collisions
-	l, ok := d.leases[contID+netName]
-	if !ok {
-		return nil
-	}
-	return l
-}
-
-func (d *DHCP) setLease(contID, netName string, l *DHCPLease) {
-	d.mux.Lock()
-	defer d.mux.Unlock()
-
-	// TODO(eyakubovich): hash it to avoid collisions
-	d.leases[contID+netName] = l
-}
-
-func getListener() (net.Listener, error) {
-	l, err := activation.Listeners(true)
-	if err != nil {
-		return nil, err
-	}
-
-	switch {
-	case len(l) == 0:
-		if err := os.MkdirAll(filepath.Dir(socketPath), 0700); err != nil {
-			return nil, err
-		}
-		return net.Listen("unix", socketPath)
-
-	case len(l) == 1:
-		if l[0] == nil {
-			return nil, fmt.Errorf("LISTEN_FDS=1 but no FD found")
-		}
-		return l[0], nil
-
-	default:
-		return nil, fmt.Errorf("Too many (%v) FDs passed through socket activation", len(l))
-	}
-}
-
-func runDaemon() {
-	// since other goroutines (on separate threads) will change namespaces,
-	// ensure the RPC server does not get scheduled onto those
-	runtime.LockOSThread()
-
-	l, err := getListener()
-	if err != nil {
-		log.Printf("Error getting listener: %v", err)
-		return
-	}
-
-	dhcp := newDHCP()
-	rpc.Register(dhcp)
-	rpc.HandleHTTP()
-	http.Serve(l, nil)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/lease.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/lease.go
deleted file mode 100644
index 90c223c7c3..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/lease.go
+++ /dev/null
@@ -1,338 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"log"
-	"math/rand"
-	"net"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/d2g/dhcp4"
-	"github.com/d2g/dhcp4client"
-	"github.com/vishvananda/netlink"
-
-	"github.com/appc/cni/pkg/ns"
-	"github.com/appc/cni/pkg/types"
-)
-
-// RFC 2131 suggests using exponential backoff, starting with 4sec
-// and randomized to +/- 1sec
-const resendDelay0 = 4 * time.Second
-const resendDelayMax = 32 * time.Second
-
-const (
-	leaseStateBound = iota
-	leaseStateRenewing
-	leaseStateRebinding
-)
-
-// This implementation uses 1 OS thread per lease. This is because
-// all the network operations have to be done in network namespace
-// of the interface. This can be improved by switching to the proper
-// namespace for network ops and using fewer threads. However, this
-// needs to be done carefully as dhcp4client ops are blocking.
-
-type DHCPLease struct {
-	clientID      string
-	ack           *dhcp4.Packet
-	opts          dhcp4.Options
-	link          netlink.Link
-	renewalTime   time.Time
-	rebindingTime time.Time
-	expireTime    time.Time
-	stop          chan struct{}
-	wg            sync.WaitGroup
-}
-
-// AcquireLease gets an DHCP lease and then maintains it in the background
-// by periodically renewing it. The acquired lease can be released by
-// calling DHCPLease.Stop()
-func AcquireLease(clientID, netns, ifName string) (*DHCPLease, error) {
-	errCh := make(chan error, 1)
-	l := &DHCPLease{
-		clientID: clientID,
-		stop:     make(chan struct{}),
-	}
-
-	log.Printf("%v: acquiring lease", clientID)
-
-	l.wg.Add(1)
-	go func() {
-		errCh <- ns.WithNetNSPath(netns, true, func(_ *os.File) error {
-			defer l.wg.Done()
-
-			link, err := netlink.LinkByName(ifName)
-			if err != nil {
-				return fmt.Errorf("error looking up %q: %v", ifName, err)
-			}
-
-			l.link = link
-
-			if err = l.acquire(); err != nil {
-				return err
-			}
-
-			log.Printf("%v: lease acquired, expiration is %v", l.clientID, l.expireTime)
-
-			errCh <- nil
-
-			l.maintain()
-			return nil
-		})
-	}()
-
-	if err := <-errCh; err != nil {
-		return nil, err
-	}
-
-	return l, nil
-}
-
-// Stop terminates the background task that maintains the lease
-// and issues a DHCP Release
-func (l *DHCPLease) Stop() {
-	close(l.stop)
-	l.wg.Wait()
-}
-
-func (l *DHCPLease) acquire() error {
-	c, err := newDHCPClient(l.link)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-
-	if (l.link.Attrs().Flags & net.FlagUp) != net.FlagUp {
-		log.Printf("Link %q down. Attempting to set up", l.link.Attrs().Name)
-		if err = netlink.LinkSetUp(l.link); err != nil {
-			return err
-		}
-	}
-
-	pkt, err := backoffRetry(func() (*dhcp4.Packet, error) {
-		ok, ack, err := c.Request()
-		switch {
-		case err != nil:
-			return nil, err
-		case !ok:
-			return nil, fmt.Errorf("DHCP server NACK'd own offer")
-		default:
-			return &ack, nil
-		}
-	})
-	if err != nil {
-		return err
-	}
-
-	return l.commit(pkt)
-}
-
-func (l *DHCPLease) commit(ack *dhcp4.Packet) error {
-	opts := ack.ParseOptions()
-
-	leaseTime, err := parseLeaseTime(opts)
-	if err != nil {
-		return err
-	}
-
-	rebindingTime, err := parseRebindingTime(opts)
-	if err != nil || rebindingTime > leaseTime {
-		// Per RFC 2131 Section 4.4.5, it should default to 85% of lease time
-		rebindingTime = leaseTime * 85 / 100
-	}
-
-	renewalTime, err := parseRenewalTime(opts)
-	if err != nil || renewalTime > rebindingTime {
-		// Per RFC 2131 Section 4.4.5, it should default to 50% of lease time
-		renewalTime = leaseTime / 2
-	}
-
-	now := time.Now()
-	l.expireTime = now.Add(leaseTime)
-	l.renewalTime = now.Add(renewalTime)
-	l.rebindingTime = now.Add(rebindingTime)
-	l.ack = ack
-	l.opts = opts
-
-	return nil
-}
-
-func (l *DHCPLease) maintain() {
-	state := leaseStateBound
-
-	for {
-		var sleepDur time.Duration
-
-		switch state {
-		case leaseStateBound:
-			sleepDur = l.renewalTime.Sub(time.Now())
-			if sleepDur <= 0 {
-				log.Printf("%v: renewing lease", l.clientID)
-				state = leaseStateRenewing
-				continue
-			}
-
-		case leaseStateRenewing:
-			if err := l.renew(); err != nil {
-				log.Printf("%v: %v", l.clientID, err)
-
-				if time.Now().After(l.rebindingTime) {
-					log.Printf("%v: renawal time expired, rebinding", l.clientID)
-					state = leaseStateRebinding
-				}
-			} else {
-				log.Printf("%v: lease renewed, expiration is %v", l.clientID, l.expireTime)
-				state = leaseStateBound
-			}
-
-		case leaseStateRebinding:
-			if err := l.acquire(); err != nil {
-				log.Printf("%v: %v", l.clientID, err)
-
-				if time.Now().After(l.expireTime) {
-					log.Printf("%v: lease expired, bringing interface DOWN", l.clientID)
-					l.downIface()
-					return
-				}
-			} else {
-				log.Printf("%v: lease rebound, expiration is %v", l.clientID, l.expireTime)
-				state = leaseStateBound
-			}
-		}
-
-		select {
-		case <-time.After(sleepDur):
-
-		case <-l.stop:
-			if err := l.release(); err != nil {
-				log.Printf("%v: failed to release DHCP lease: %v", l.clientID, err)
-			}
-			return
-		}
-	}
-}
-
-func (l *DHCPLease) downIface() {
-	if err := netlink.LinkSetDown(l.link); err != nil {
-		log.Printf("%v: failed to bring %v interface DOWN: %v", l.clientID, l.link.Attrs().Name, err)
-	}
-}
-
-func (l *DHCPLease) renew() error {
-	c, err := newDHCPClient(l.link)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-
-	pkt, err := backoffRetry(func() (*dhcp4.Packet, error) {
-		ok, ack, err := c.Renew(*l.ack)
-		switch {
-		case err != nil:
-			return nil, err
-		case !ok:
-			return nil, fmt.Errorf("DHCP server did not renew lease")
-		default:
-			return &ack, nil
-		}
-	})
-	if err != nil {
-		return err
-	}
-
-	l.commit(pkt)
-	return nil
-}
-
-func (l *DHCPLease) release() error {
-	log.Printf("%v: releasing lease", l.clientID)
-
-	c, err := newDHCPClient(l.link)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-
-	if err = c.Release(*l.ack); err != nil {
-		return fmt.Errorf("failed to send DHCPRELEASE")
-	}
-
-	return nil
-}
-
-func (l *DHCPLease) IPNet() (*net.IPNet, error) {
-	mask := parseSubnetMask(l.opts)
-	if mask == nil {
-		return nil, fmt.Errorf("DHCP option Subnet Mask not found in DHCPACK")
-	}
-
-	return &net.IPNet{
-		IP:   l.ack.YIAddr(),
-		Mask: mask,
-	}, nil
-}
-
-func (l *DHCPLease) Gateway() net.IP {
-	return parseRouter(l.opts)
-}
-
-func (l *DHCPLease) Routes() []types.Route {
-	routes := parseRoutes(l.opts)
-	return append(routes, parseCIDRRoutes(l.opts)...)
-}
-
-// jitter returns a random value within [-span, span) range
-func jitter(span time.Duration) time.Duration {
-	return time.Duration(float64(span) * (2.0*rand.Float64() - 1.0))
-}
-
-func backoffRetry(f func() (*dhcp4.Packet, error)) (*dhcp4.Packet, error) {
-	var baseDelay time.Duration = resendDelay0
-
-	for i := 0; i < resendCount; i++ {
-		pkt, err := f()
-		if err == nil {
-			return pkt, nil
-		}
-
-		log.Print(err)
-
-		time.Sleep(baseDelay + jitter(time.Second))
-
-		if baseDelay < resendDelayMax {
-			baseDelay *= 2
-		}
-	}
-
-	return nil, errNoMoreTries
-}
-
-func newDHCPClient(link netlink.Link) (*dhcp4client.Client, error) {
-	pktsock, err := dhcp4client.NewPacketSock(link.Attrs().Index)
-	if err != nil {
-		return nil, err
-	}
-
-	return dhcp4client.New(
-		dhcp4client.HardwareAddr(link.Attrs().HardwareAddr),
-		dhcp4client.Timeout(5*time.Second),
-		dhcp4client.Broadcast(false),
-		dhcp4client.Connection(pktsock),
-	)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/main.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/main.go
deleted file mode 100644
index da44d5762e..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/main.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"net/rpc"
-	"os"
-	"path/filepath"
-
-	"github.com/appc/cni/pkg/skel"
-	"github.com/appc/cni/pkg/types"
-)
-
-const socketPath = "/run/cni/dhcp.sock"
-
-func main() {
-	if len(os.Args) > 1 && os.Args[1] == "daemon" {
-		runDaemon()
-	} else {
-		skel.PluginMain(cmdAdd, cmdDel)
-	}
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	result := types.Result{}
-	if err := rpcCall("DHCP.Allocate", args, &result); err != nil {
-		return err
-	}
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	result := struct{}{}
-	if err := rpcCall("DHCP.Release", args, &result); err != nil {
-		return fmt.Errorf("error dialing DHCP daemon: %v", err)
-	}
-	return nil
-}
-
-func rpcCall(method string, args *skel.CmdArgs, result interface{}) error {
-	client, err := rpc.DialHTTP("unix", socketPath)
-	if err != nil {
-		return fmt.Errorf("error dialing DHCP daemon: %v", err)
-	}
-
-	// The daemon may be running under a different working dir
-	// so make sure the netns path is absolute.
-	netns, err := filepath.Abs(args.Netns)
-	if err != nil {
-		return fmt.Errorf("failed to make %q an absolute path: %v", args.Netns, err)
-	}
-	args.Netns = netns
-
-	err = client.Call(method, args, result)
-	if err != nil {
-		return fmt.Errorf("error calling %v: %v", method, err)
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/options.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/options.go
deleted file mode 100644
index f2712c28e6..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/options.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/binary"
-	"fmt"
-	"net"
-	"time"
-
-	"github.com/appc/cni/pkg/types"
-	"github.com/d2g/dhcp4"
-)
-
-func parseRouter(opts dhcp4.Options) net.IP {
-	if opts, ok := opts[dhcp4.OptionRouter]; ok {
-		if len(opts) == 4 {
-			return net.IP(opts)
-		}
-	}
-	return nil
-}
-
-func classfulSubnet(sn net.IP) net.IPNet {
-	return net.IPNet{
-		IP:   sn,
-		Mask: sn.DefaultMask(),
-	}
-}
-
-func parseRoutes(opts dhcp4.Options) []types.Route {
-	// StaticRoutes format: pairs of:
-	// Dest = 4 bytes; Classful IP subnet
-	// Router = 4 bytes; IP address of router
-
-	routes := []types.Route{}
-	if opt, ok := opts[dhcp4.OptionStaticRoute]; ok {
-		for len(opt) >= 8 {
-			sn := opt[0:4]
-			r := opt[4:8]
-			rt := types.Route{
-				Dst: classfulSubnet(sn),
-				GW:  r,
-			}
-			routes = append(routes, rt)
-			opt = opt[8:]
-		}
-	}
-
-	return routes
-}
-
-func parseCIDRRoutes(opts dhcp4.Options) []types.Route {
-	// See RFC4332 for format (http://tools.ietf.org/html/rfc3442)
-
-	routes := []types.Route{}
-	if opt, ok := opts[dhcp4.OptionClasslessRouteFormat]; ok {
-		for len(opt) >= 5 {
-			width := int(opt[0])
-			if width > 32 {
-				// error: can't have more than /32
-				return nil
-			}
-			// network bits are compacted to avoid zeros
-			octets := 0
-			if width > 0 {
-				octets = (width-1)/8 + 1
-			}
-
-			if len(opt) < 1+octets+4 {
-				// error: too short
-				return nil
-			}
-
-			sn := make([]byte, 4)
-			copy(sn, opt[1:octets+1])
-
-			gw := net.IP(opt[octets+1 : octets+5])
-
-			rt := types.Route{
-				Dst: net.IPNet{
-					IP:   net.IP(sn),
-					Mask: net.CIDRMask(width, 32),
-				},
-				GW: gw,
-			}
-			routes = append(routes, rt)
-
-			opt = opt[octets+5 : len(opt)]
-		}
-	}
-	return routes
-}
-
-func parseSubnetMask(opts dhcp4.Options) net.IPMask {
-	mask, ok := opts[dhcp4.OptionSubnetMask]
-	if !ok {
-		return nil
-	}
-
-	return net.IPMask(mask)
-}
-
-func parseDuration(opts dhcp4.Options, code dhcp4.OptionCode, optName string) (time.Duration, error) {
-	val, ok := opts[code]
-	if !ok {
-		return 0, fmt.Errorf("option %v not found", optName)
-	}
-	if len(val) != 4 {
-		return 0, fmt.Errorf("option %v is not 4 bytes", optName)
-	}
-
-	secs := binary.BigEndian.Uint32(val)
-	return time.Duration(secs) * time.Second, nil
-}
-
-func parseLeaseTime(opts dhcp4.Options) (time.Duration, error) {
-	return parseDuration(opts, dhcp4.OptionIPAddressLeaseTime, "LeaseTime")
-}
-
-func parseRenewalTime(opts dhcp4.Options) (time.Duration, error) {
-	return parseDuration(opts, dhcp4.OptionRenewalTimeValue, "RenewalTime")
-}
-
-func parseRebindingTime(opts dhcp4.Options) (time.Duration, error) {
-	return parseDuration(opts, dhcp4.OptionRebindingTimeValue, "RebindingTime")
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/README.md b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/README.md
deleted file mode 100644
index 39e9ede217..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/README.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# host-local IP address manager
-
-host-local IPAM allocates IPv4 and IPv6 addresses out of a specified address range.
-
-## Usage
-
-### Obtain an IP
-
-Given the following network configuration:
-
-```
-{
-    "name": "default",
-    "ipam": {
-        "type": "host-local",
-        "subnet": "203.0.113.0/24"
-    }
-}
-```
-
-#### Using the command line interface
-
-```
-$ export CNI_COMMAND=ADD
-$ export CNI_CONTAINERID=f81d4fae-7dec-11d0-a765-00a0c91e6bf6
-$ ./host-local < $conf
-```
-
-```
-{
-    "ip4": {
-        "ip": "203.0.113.1/24"
-    }
-}
-```
-
-## Backends
-
-By default ipmanager stores IP allocations on the local filesystem using the IP address as the file name and the ID as contents. For example:
-
-```
-$ ls /var/lib/cni/networks/default
-```
-```
-203.0.113.1	203.0.113.2
-```
-
-```
-$ cat /var/lib/cni/networks/default/203.0.113.1
-```
-```
-f81d4fae-7dec-11d0-a765-00a0c91e6bf6
-```
-
-## Configuration Files
-
-
-```
-{
-	"name": "ipv6",
-    "ipam": {
-		"type": "host-local",
-		"subnet": "3ffe:ffff:0:01ff::/64",
-		"range-start": "3ffe:ffff:0:01ff::0010",
-		"range-end": "3ffe:ffff:0:01ff::0020",
-		"routes": [
-			{ "dst": "3ffe:ffff:0:01ff::1/64" }
-		]
-	}
-}
-```
-
-```
-{
-    "name": "ipv4",
-	"ipam": {
-		"type": "host-local",
-		"subnet": "203.0.113.1/24",
-		"range-start": "203.0.113.10",
-		"range-end": "203.0.113.20",
-		"routes": [
-			{ "dst": "203.0.113.0/24" }
-		]
-	}
-}
-```
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/allocator.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/allocator.go
deleted file mode 100644
index 2b867ce525..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/allocator.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/appc/cni/pkg/ip"
-	"github.com/appc/cni/pkg/types"
-	"github.com/appc/cni/plugins/ipam/host-local/backend"
-)
-
-type IPAllocator struct {
-	start net.IP
-	end   net.IP
-	conf  *IPAMConfig
-	store backend.Store
-}
-
-func NewIPAllocator(conf *IPAMConfig, store backend.Store) (*IPAllocator, error) {
-	var (
-		start net.IP
-		end   net.IP
-		err   error
-	)
-	start, end, err = networkRange((*net.IPNet)(&conf.Subnet))
-	if err != nil {
-		return nil, err
-	}
-
-	// skip the .0 address
-	start = ip.NextIP(start)
-
-	if conf.RangeStart != nil {
-		if err := validateRangeIP(conf.RangeStart, (*net.IPNet)(&conf.Subnet)); err != nil {
-			return nil, err
-		}
-		start = conf.RangeStart
-	}
-	if conf.RangeEnd != nil {
-		if err := validateRangeIP(conf.RangeEnd, (*net.IPNet)(&conf.Subnet)); err != nil {
-			return nil, err
-		}
-		// RangeEnd is inclusive
-		end = ip.NextIP(conf.RangeEnd)
-	}
-
-	return &IPAllocator{start, end, conf, store}, nil
-}
-
-func validateRangeIP(ip net.IP, ipnet *net.IPNet) error {
-	if !ipnet.Contains(ip) {
-		return fmt.Errorf("%s not in network: %s", ip, ipnet)
-	}
-	return nil
-}
-
-// Returns newly allocated IP along with its config
-func (a *IPAllocator) Get(id string) (*types.IPConfig, error) {
-	a.store.Lock()
-	defer a.store.Unlock()
-
-	gw := a.conf.Gateway
-	if gw == nil {
-		gw = ip.NextIP(a.conf.Subnet.IP)
-	}
-
-	var requestedIP net.IP
-	if a.conf.Args != nil {
-		requestedIP = a.conf.Args.IP
-	}
-
-	if requestedIP != nil {
-		if gw != nil && gw.Equal(a.conf.Args.IP) {
-			return nil, fmt.Errorf("requested IP must differ gateway IP")
-		}
-
-		subnet := net.IPNet{
-			IP:   a.conf.Subnet.IP,
-			Mask: a.conf.Subnet.Mask,
-		}
-		err := validateRangeIP(requestedIP, &subnet)
-		if err != nil {
-			return nil, err
-		}
-
-		reserved, err := a.store.Reserve(id, requestedIP)
-		if err != nil {
-			return nil, err
-		}
-
-		if reserved {
-			return &types.IPConfig{
-				IP:      net.IPNet{IP: requestedIP, Mask: a.conf.Subnet.Mask},
-				Gateway: gw,
-				Routes:  a.conf.Routes,
-			}, nil
-		}
-		return nil, fmt.Errorf("requested IP address %q is not available in network: %s", requestedIP, a.conf.Name)
-	}
-
-	for cur := a.start; !cur.Equal(a.end); cur = ip.NextIP(cur) {
-		// don't allocate gateway IP
-		if gw != nil && cur.Equal(gw) {
-			continue
-		}
-
-		reserved, err := a.store.Reserve(id, cur)
-		if err != nil {
-			return nil, err
-		}
-		if reserved {
-			return &types.IPConfig{
-				IP:      net.IPNet{IP: cur, Mask: a.conf.Subnet.Mask},
-				Gateway: gw,
-				Routes:  a.conf.Routes,
-			}, nil
-		}
-	}
-	return nil, fmt.Errorf("no IP addresses available in network: %s", a.conf.Name)
-}
-
-// Releases all IPs allocated for the container with given ID
-func (a *IPAllocator) Release(id string) error {
-	a.store.Lock()
-	defer a.store.Unlock()
-
-	return a.store.ReleaseByID(id)
-}
-
-func networkRange(ipnet *net.IPNet) (net.IP, net.IP, error) {
-	if ipnet.IP == nil {
-		return nil, nil, fmt.Errorf("missing field %q in IPAM configuration", "subnet")
-	}
-	ip := ipnet.IP.To4()
-	if ip == nil {
-		ip = ipnet.IP.To16()
-		if ip == nil {
-			return nil, nil, fmt.Errorf("IP not v4 nor v6")
-		}
-	}
-
-	if len(ip) != len(ipnet.Mask) {
-		return nil, nil, fmt.Errorf("IPNet IP and Mask version mismatch")
-	}
-
-	var end net.IP
-	for i := 0; i < len(ip); i++ {
-		end = append(end, ip[i]|^ipnet.Mask[i])
-	}
-	return ipnet.IP, end, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/disk/backend.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/disk/backend.go
deleted file mode 100644
index 88dc5e92bc..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/disk/backend.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"io/ioutil"
-	"net"
-	"os"
-	"path/filepath"
-)
-
-var defaultDataDir = "/var/lib/cni/networks"
-
-type Store struct {
-	FileLock
-	dataDir string
-}
-
-func New(network string) (*Store, error) {
-	dir := filepath.Join(defaultDataDir, network)
-	if err := os.MkdirAll(dir, 0644); err != nil {
-		return nil, err
-	}
-
-	lk, err := NewFileLock(dir)
-	if err != nil {
-		return nil, err
-	}
-	return &Store{*lk, dir}, nil
-}
-
-func (s *Store) Reserve(id string, ip net.IP) (bool, error) {
-	fname := filepath.Join(s.dataDir, ip.String())
-	f, err := os.OpenFile(fname, os.O_RDWR|os.O_EXCL|os.O_CREATE, 0644)
-	if os.IsExist(err) {
-		return false, nil
-	}
-	if err != nil {
-		return false, err
-	}
-	if _, err := f.WriteString(id); err != nil {
-		f.Close()
-		os.Remove(f.Name())
-		return false, err
-	}
-	if err := f.Close(); err != nil {
-		os.Remove(f.Name())
-		return false, err
-	}
-	return true, nil
-}
-
-func (s *Store) Release(ip net.IP) error {
-	return os.Remove(filepath.Join(s.dataDir, ip.String()))
-}
-
-// N.B. This function eats errors to be tolerant and
-// release as much as possible
-func (s *Store) ReleaseByID(id string) error {
-	err := filepath.Walk(s.dataDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil || info.IsDir() {
-			return nil
-		}
-		data, err := ioutil.ReadFile(path)
-		if err != nil {
-			return nil
-		}
-		if string(data) == id {
-			if err := os.Remove(path); err != nil {
-				return nil
-			}
-		}
-		return nil
-	})
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/disk/lock.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/disk/lock.go
deleted file mode 100644
index 7241482515..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/disk/lock.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"os"
-	"syscall"
-)
-
-// FileLock wraps os.File to be used as a lock using flock
-type FileLock struct {
-	f *os.File
-}
-
-// NewFileLock opens file/dir at path and returns unlocked FileLock object
-func NewFileLock(path string) (*FileLock, error) {
-	f, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return &FileLock{f}, nil
-}
-
-// Close closes underlying file
-func (l *FileLock) Close() error {
-	return l.f.Close()
-}
-
-// Lock acquires an exclusive lock
-func (l *FileLock) Lock() error {
-	return syscall.Flock(int(l.f.Fd()), syscall.LOCK_EX)
-}
-
-// Unlock releases the lock
-func (l *FileLock) Unlock() error {
-	return syscall.Flock(int(l.f.Fd()), syscall.LOCK_UN)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/store.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/store.go
deleted file mode 100644
index 45a89b109c..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/backend/store.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backend
-
-import "net"
-
-type Store interface {
-	Lock() error
-	Unlock() error
-	Close() error
-	Reserve(id string, ip net.IP) (bool, error)
-	Release(ip net.IP) error
-	ReleaseByID(id string) error
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/config.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/config.go
deleted file mode 100644
index 08ca07e384..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/config.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-
-	"github.com/appc/cni/pkg/types"
-)
-
-// IPAMConfig represents the IP related network configuration.
-type IPAMConfig struct {
-	Name       string
-	Type       string        `json:"type"`
-	RangeStart net.IP        `json:"rangeStart"`
-	RangeEnd   net.IP        `json:"rangeEnd"`
-	Subnet     types.IPNet   `json:"subnet"`
-	Gateway    net.IP        `json:"gateway"`
-	Routes     []types.Route `json:"routes"`
-	Args       *IPAMArgs     `json:"-"`
-}
-
-type IPAMArgs struct {
-	types.CommonArgs
-	IP net.IP `json:"ip,omitempty"`
-}
-
-type Net struct {
-	Name string      `json:"name"`
-	IPAM *IPAMConfig `json:"ipam"`
-}
-
-// NewIPAMConfig creates a NetworkConfig from the given network name.
-func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, error) {
-	n := Net{}
-	if err := json.Unmarshal(bytes, &n); err != nil {
-		return nil, err
-	}
-
-	if args != "" {
-		n.IPAM.Args = &IPAMArgs{}
-		err := types.LoadArgs(args, n.IPAM.Args)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if n.IPAM == nil {
-		return nil, fmt.Errorf("%q missing 'ipam' key")
-	}
-
-	// Copy net name into IPAM so not to drag Net struct around
-	n.IPAM.Name = n.Name
-
-	return n.IPAM, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/main.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/main.go
deleted file mode 100644
index 9f67e8a507..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/main.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"github.com/appc/cni/plugins/ipam/host-local/backend/disk"
-
-	"github.com/appc/cni/pkg/skel"
-	"github.com/appc/cni/pkg/types"
-)
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
-	if err != nil {
-		return err
-	}
-
-	store, err := disk.New(ipamConf.Name)
-	if err != nil {
-		return err
-	}
-	defer store.Close()
-
-	allocator, err := NewIPAllocator(ipamConf, store)
-	if err != nil {
-		return err
-	}
-
-	ipConf, err := allocator.Get(args.ContainerID)
-	if err != nil {
-		return err
-	}
-
-	r := &types.Result{
-		IP4: ipConf,
-	}
-	return r.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
-	if err != nil {
-		return err
-	}
-
-	store, err := disk.New(ipamConf.Name)
-	if err != nil {
-		return err
-	}
-	defer store.Close()
-
-	allocator, err := NewIPAllocator(ipamConf, store)
-	if err != nil {
-		return err
-	}
-
-	return allocator.Release(args.ContainerID)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go
deleted file mode 100644
index e87eb726fc..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge.go
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright 2014 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"runtime"
-	"syscall"
-
-	"github.com/appc/cni/pkg/ip"
-	"github.com/appc/cni/pkg/ipam"
-	"github.com/appc/cni/pkg/ns"
-	"github.com/appc/cni/pkg/skel"
-	"github.com/appc/cni/pkg/types"
-	"github.com/appc/cni/pkg/utils"
-	"github.com/vishvananda/netlink"
-)
-
-const defaultBrName = "cni0"
-
-type NetConf struct {
-	types.NetConf
-	BrName string `json:"bridge"`
-	IsGW   bool   `json:"isGateway"`
-	IPMasq bool   `json:"ipMasq"`
-	MTU    int    `json:"mtu"`
-}
-
-func init() {
-	// this ensures that main runs only on main thread (thread group leader).
-	// since namespace ops (unshare, setns) are done for a single thread, we
-	// must ensure that the goroutine does not jump from OS thread to thread
-	runtime.LockOSThread()
-}
-
-func loadNetConf(bytes []byte) (*NetConf, error) {
-	n := &NetConf{
-		BrName: defaultBrName,
-	}
-	if err := json.Unmarshal(bytes, n); err != nil {
-		return nil, fmt.Errorf("failed to load netconf: %v", err)
-	}
-	return n, nil
-}
-
-func ensureBridgeAddr(br *netlink.Bridge, ipn *net.IPNet) error {
-	addrs, err := netlink.AddrList(br, syscall.AF_INET)
-	if err != nil && err != syscall.ENOENT {
-		return fmt.Errorf("could not get list of IP addresses: %v", err)
-	}
-
-	// if there're no addresses on the bridge, it's ok -- we'll add one
-	if len(addrs) > 0 {
-		ipnStr := ipn.String()
-		for _, a := range addrs {
-			// string comp is actually easiest for doing IPNet comps
-			if a.IPNet.String() == ipnStr {
-				return nil
-			}
-		}
-		return fmt.Errorf("%q already has an IP address different from %v", br.Name, ipn.String())
-	}
-
-	addr := &netlink.Addr{IPNet: ipn, Label: ""}
-	if err := netlink.AddrAdd(br, addr); err != nil {
-		return fmt.Errorf("could not add IP address to %q: %v", br.Name, err)
-	}
-	return nil
-}
-
-func bridgeByName(name string) (*netlink.Bridge, error) {
-	l, err := netlink.LinkByName(name)
-	if err != nil {
-		return nil, fmt.Errorf("could not lookup %q: %v", name, err)
-	}
-	br, ok := l.(*netlink.Bridge)
-	if !ok {
-		return nil, fmt.Errorf("%q already exists but is not a bridge", name)
-	}
-	return br, nil
-}
-
-func ensureBridge(brName string, mtu int) (*netlink.Bridge, error) {
-	br := &netlink.Bridge{
-		LinkAttrs: netlink.LinkAttrs{
-			Name: brName,
-			MTU:  mtu,
-		},
-	}
-
-	if err := netlink.LinkAdd(br); err != nil {
-		if err != syscall.EEXIST {
-			return nil, fmt.Errorf("could not add %q: %v", brName, err)
-		}
-
-		// it's ok if the device already exists as long as config is similar
-		br, err = bridgeByName(brName)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if err := netlink.LinkSetUp(br); err != nil {
-		return nil, err
-	}
-
-	return br, nil
-}
-
-func setupVeth(netns string, br *netlink.Bridge, ifName string, mtu int) error {
-	var hostVethName string
-
-	err := ns.WithNetNSPath(netns, false, func(hostNS *os.File) error {
-		// create the veth pair in the container and move host end into host netns
-		hostVeth, _, err := ip.SetupVeth(ifName, mtu, hostNS)
-		if err != nil {
-			return err
-		}
-
-		hostVethName = hostVeth.Attrs().Name
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	// need to lookup hostVeth again as its index has changed during ns move
-	hostVeth, err := netlink.LinkByName(hostVethName)
-	if err != nil {
-		return fmt.Errorf("failed to lookup %q: %v", hostVethName, err)
-	}
-
-	// connect host veth end to the bridge
-	if err = netlink.LinkSetMaster(hostVeth, br); err != nil {
-		return fmt.Errorf("failed to connect %q to bridge %v: %v", hostVethName, br.Attrs().Name, err)
-	}
-
-	return nil
-}
-
-func calcGatewayIP(ipn *net.IPNet) net.IP {
-	nid := ipn.IP.Mask(ipn.Mask)
-	return ip.NextIP(nid)
-}
-
-func setupBridge(n *NetConf) (*netlink.Bridge, error) {
-	// create bridge if necessary
-	br, err := ensureBridge(n.BrName, n.MTU)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create bridge %q: %v", n.BrName, err)
-	}
-
-	return br, nil
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	n, err := loadNetConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	br, err := setupBridge(n)
-	if err != nil {
-		return err
-	}
-
-	if err = setupVeth(args.Netns, br, args.IfName, n.MTU); err != nil {
-		return err
-	}
-
-	// run the IPAM plugin and get back the config to apply
-	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	if result.IP4 == nil {
-		return errors.New("IPAM plugin returned missing IPv4 config")
-	}
-
-	if result.IP4.Gateway == nil && n.IsGW {
-		result.IP4.Gateway = calcGatewayIP(&result.IP4.IP)
-	}
-
-	err = ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
-		return ipam.ConfigureIface(args.IfName, result)
-	})
-	if err != nil {
-		return err
-	}
-
-	if n.IsGW {
-		gwn := &net.IPNet{
-			IP:   result.IP4.Gateway,
-			Mask: result.IP4.IP.Mask,
-		}
-
-		if err = ensureBridgeAddr(br, gwn); err != nil {
-			return err
-		}
-
-		if err := ip.EnableIP4Forward(); err != nil {
-			return fmt.Errorf("failed to enable forwarding: %v", err)
-		}
-	}
-
-	if n.IPMasq {
-		chain := utils.FormatChainName(n.Name, args.ContainerID)
-		comment := utils.FormatComment(n.Name, args.ContainerID)
-		if err = ip.SetupIPMasq(ip.Network(&result.IP4.IP), chain, comment); err != nil {
-			return err
-		}
-	}
-
-	result.DNS = n.DNS
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	n, err := loadNetConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	if err := ipam.ExecDel(n.IPAM.Type, args.StdinData); err != nil {
-		return err
-	}
-
-	var ipn *net.IPNet
-	err = ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
-		var err error
-		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
-		return err
-	})
-	if err != nil {
-		return err
-	}
-
-	if n.IPMasq {
-		chain := utils.FormatChainName(n.Name, args.ContainerID)
-		comment := utils.FormatComment(n.Name, args.ContainerID)
-		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ipvlan/ipvlan.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ipvlan/ipvlan.go
deleted file mode 100644
index 85919772d8..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ipvlan/ipvlan.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"runtime"
-
-	"github.com/appc/cni/pkg/ip"
-	"github.com/appc/cni/pkg/ipam"
-	"github.com/appc/cni/pkg/ns"
-	"github.com/appc/cni/pkg/skel"
-	"github.com/appc/cni/pkg/types"
-	"github.com/vishvananda/netlink"
-)
-
-type NetConf struct {
-	types.NetConf
-	Master string `json:"master"`
-	Mode   string `json:"mode"`
-	MTU    int    `json:"mtu"`
-}
-
-func init() {
-	// this ensures that main runs only on main thread (thread group leader).
-	// since namespace ops (unshare, setns) are done for a single thread, we
-	// must ensure that the goroutine does not jump from OS thread to thread
-	runtime.LockOSThread()
-}
-
-func loadConf(bytes []byte) (*NetConf, error) {
-	n := &NetConf{}
-	if err := json.Unmarshal(bytes, n); err != nil {
-		return nil, fmt.Errorf("failed to load netconf: %v", err)
-	}
-	if n.Master == "" {
-		return nil, fmt.Errorf(`"master" field is required. It specifies the host interface name to virtualize`)
-	}
-	return n, nil
-}
-
-func modeFromString(s string) (netlink.IPVlanMode, error) {
-	switch s {
-	case "", "l2":
-		return netlink.IPVLAN_MODE_L2, nil
-	case "l3":
-		return netlink.IPVLAN_MODE_L3, nil
-	default:
-		return 0, fmt.Errorf("unknown ipvlan mode: %q", s)
-	}
-}
-
-func createIpvlan(conf *NetConf, ifName string, netns *os.File) error {
-	mode, err := modeFromString(conf.Mode)
-	if err != nil {
-		return err
-	}
-
-	m, err := netlink.LinkByName(conf.Master)
-	if err != nil {
-		return fmt.Errorf("failed to lookup master %q: %v", conf.Master, err)
-	}
-
-	// due to kernel bug we have to create with tmpname or it might
-	// collide with the name on the host and error out
-	tmpName, err := ip.RandomVethName()
-	if err != nil {
-		return err
-	}
-
-	mv := &netlink.IPVlan{
-		LinkAttrs: netlink.LinkAttrs{
-			MTU:         conf.MTU,
-			Name:        tmpName,
-			ParentIndex: m.Attrs().Index,
-			Namespace:   netlink.NsFd(int(netns.Fd())),
-		},
-		Mode: mode,
-	}
-
-	if err := netlink.LinkAdd(mv); err != nil {
-		return fmt.Errorf("failed to create ipvlan: %v", err)
-	}
-
-	return ns.WithNetNS(netns, false, func(_ *os.File) error {
-		err := renameLink(tmpName, ifName)
-		if err != nil {
-			return fmt.Errorf("failed to rename ipvlan to %q: %v", ifName, err)
-		}
-		return nil
-	})
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	n, err := loadConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	netns, err := os.Open(args.Netns)
-	if err != nil {
-		return fmt.Errorf("failed to open netns %q: %v", netns, err)
-	}
-	defer netns.Close()
-
-	if err = createIpvlan(n, args.IfName, netns); err != nil {
-		return err
-	}
-
-	// run the IPAM plugin and get back the config to apply
-	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-	if result.IP4 == nil {
-		return errors.New("IPAM plugin returned missing IPv4 config")
-	}
-
-	err = ns.WithNetNS(netns, false, func(_ *os.File) error {
-		return ipam.ConfigureIface(args.IfName, result)
-	})
-	if err != nil {
-		return err
-	}
-
-	result.DNS = n.DNS
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	n, err := loadConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	return ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
-		return ip.DelLinkByName(args.IfName)
-	})
-}
-
-func renameLink(curName, newName string) error {
-	link, err := netlink.LinkByName(curName)
-	if err != nil {
-		return err
-	}
-
-	return netlink.LinkSetName(link, newName)
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/macvlan/macvlan.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/macvlan/macvlan.go
deleted file mode 100644
index f6891a3491..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/macvlan/macvlan.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"runtime"
-
-	"github.com/appc/cni/pkg/ip"
-	"github.com/appc/cni/pkg/ipam"
-	"github.com/appc/cni/pkg/ns"
-	"github.com/appc/cni/pkg/skel"
-	"github.com/appc/cni/pkg/types"
-	"github.com/vishvananda/netlink"
-)
-
-type NetConf struct {
-	types.NetConf
-	Master string `json:"master"`
-	Mode   string `json:"mode"`
-	MTU    int    `json:"mtu"`
-}
-
-func init() {
-	// this ensures that main runs only on main thread (thread group leader).
-	// since namespace ops (unshare, setns) are done for a single thread, we
-	// must ensure that the goroutine does not jump from OS thread to thread
-	runtime.LockOSThread()
-}
-
-func loadConf(bytes []byte) (*NetConf, error) {
-	n := &NetConf{}
-	if err := json.Unmarshal(bytes, n); err != nil {
-		return nil, fmt.Errorf("failed to load netconf: %v", err)
-	}
-	if n.Master == "" {
-		return nil, fmt.Errorf(`"master" field is required. It specifies the host interface name to virtualize`)
-	}
-	return n, nil
-}
-
-func modeFromString(s string) (netlink.MacvlanMode, error) {
-	switch s {
-	case "", "bridge":
-		return netlink.MACVLAN_MODE_BRIDGE, nil
-	case "private":
-		return netlink.MACVLAN_MODE_PRIVATE, nil
-	case "vepa":
-		return netlink.MACVLAN_MODE_VEPA, nil
-	case "passthru":
-		return netlink.MACVLAN_MODE_PASSTHRU, nil
-	default:
-		return 0, fmt.Errorf("unknown macvlan mode: %q", s)
-	}
-}
-
-func createMacvlan(conf *NetConf, ifName string, netns *os.File) error {
-	mode, err := modeFromString(conf.Mode)
-	if err != nil {
-		return err
-	}
-
-	m, err := netlink.LinkByName(conf.Master)
-	if err != nil {
-		return fmt.Errorf("failed to lookup master %q: %v", conf.Master, err)
-	}
-
-	// due to kernel bug we have to create with tmpname or it might
-	// collide with the name on the host and error out
-	tmpName, err := ip.RandomVethName()
-	if err != nil {
-		return err
-	}
-
-	mv := &netlink.Macvlan{
-		LinkAttrs: netlink.LinkAttrs{
-			MTU:         conf.MTU,
-			Name:        tmpName,
-			ParentIndex: m.Attrs().Index,
-			Namespace:   netlink.NsFd(int(netns.Fd())),
-		},
-		Mode: mode,
-	}
-
-	if err := netlink.LinkAdd(mv); err != nil {
-		return fmt.Errorf("failed to create macvlan: %v", err)
-	}
-
-	return ns.WithNetNS(netns, false, func(_ *os.File) error {
-		err := renameLink(tmpName, ifName)
-		if err != nil {
-			return fmt.Errorf("failed to rename macvlan to %q: %v", ifName, err)
-		}
-		return nil
-	})
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	n, err := loadConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	netns, err := os.Open(args.Netns)
-	if err != nil {
-		return fmt.Errorf("failed to open netns %q: %v", netns, err)
-	}
-	defer netns.Close()
-
-	if err = createMacvlan(n, args.IfName, netns); err != nil {
-		return err
-	}
-
-	// run the IPAM plugin and get back the config to apply
-	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-	if result.IP4 == nil {
-		return errors.New("IPAM plugin returned missing IPv4 config")
-	}
-
-	err = ns.WithNetNS(netns, false, func(_ *os.File) error {
-		return ipam.ConfigureIface(args.IfName, result)
-	})
-	if err != nil {
-		return err
-	}
-
-	result.DNS = n.DNS
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	n, err := loadConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	return ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
-		return ip.DelLinkByName(args.IfName)
-	})
-}
-
-func renameLink(curName, newName string) error {
-	link, err := netlink.LinkByName(curName)
-	if err != nil {
-		return err
-	}
-
-	return netlink.LinkSetName(link, newName)
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go
deleted file mode 100644
index 05b3b2a324..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp.go
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"runtime"
-
-	"github.com/vishvananda/netlink"
-
-	"github.com/appc/cni/pkg/ip"
-	"github.com/appc/cni/pkg/ipam"
-	"github.com/appc/cni/pkg/ns"
-	"github.com/appc/cni/pkg/skel"
-	"github.com/appc/cni/pkg/types"
-	"github.com/appc/cni/pkg/utils"
-)
-
-func init() {
-	// this ensures that main runs only on main thread (thread group leader).
-	// since namespace ops (unshare, setns) are done for a single thread, we
-	// must ensure that the goroutine does not jump from OS thread to thread
-	runtime.LockOSThread()
-}
-
-type NetConf struct {
-	types.NetConf
-	IPMasq bool `json:"ipMasq"`
-	MTU    int  `json:"mtu"`
-}
-
-func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string, error) {
-	// The IPAM result will be something like IP=192.168.3.5/24, GW=192.168.3.1.
-	// What we want is really a point-to-point link but veth does not support IFF_POINTOPONT.
-	// Next best thing would be to let it ARP but set interface to 192.168.3.5/32 and
-	// add a route like "192.168.3.0/24 via 192.168.3.1 dev $ifName".
-	// Unfortunately that won't work as the GW will be outside the interface's subnet.
-
-	// Our solution is to configure the interface with 192.168.3.5/24, then delete the
-	// "192.168.3.0/24 dev $ifName" route that was automatically added. Then we add
-	// "192.168.3.1/32 dev $ifName" and "192.168.3.0/24 via 192.168.3.1 dev $ifName".
-	// In other words we force all traffic to ARP via the gateway except for GW itself.
-
-	var hostVethName string
-	err := ns.WithNetNSPath(netns, false, func(hostNS *os.File) error {
-		hostVeth, _, err := ip.SetupVeth(ifName, mtu, hostNS)
-		if err != nil {
-			return err
-		}
-
-		if err = ipam.ConfigureIface(ifName, pr); err != nil {
-			return err
-		}
-
-		contVeth, err := netlink.LinkByName(ifName)
-		if err != nil {
-			return fmt.Errorf("failed to look up %q: %v", ifName, err)
-		}
-
-		// Delete the route that was automatically added
-		route := netlink.Route{
-			LinkIndex: contVeth.Attrs().Index,
-			Dst: &net.IPNet{
-				IP:   pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
-				Mask: pr.IP4.IP.Mask,
-			},
-			Scope: netlink.SCOPE_NOWHERE,
-		}
-
-		if err := netlink.RouteDel(&route); err != nil {
-			return fmt.Errorf("failed to delete route %v: %v", route, err)
-		}
-
-		for _, r := range []netlink.Route{
-			netlink.Route{
-				LinkIndex: contVeth.Attrs().Index,
-				Dst: &net.IPNet{
-					IP:   pr.IP4.Gateway,
-					Mask: net.CIDRMask(32, 32),
-				},
-				Scope: netlink.SCOPE_LINK,
-				Src:   pr.IP4.IP.IP,
-			},
-			netlink.Route{
-				LinkIndex: contVeth.Attrs().Index,
-				Dst: &net.IPNet{
-					IP:   pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
-					Mask: pr.IP4.IP.Mask,
-				},
-				Scope: netlink.SCOPE_UNIVERSE,
-				Gw:    pr.IP4.Gateway,
-				Src:   pr.IP4.IP.IP,
-			},
-		} {
-			if err := netlink.RouteAdd(&r); err != nil {
-				return fmt.Errorf("failed to add route %v: %v", r, err)
-			}
-		}
-
-		hostVethName = hostVeth.Attrs().Name
-
-		return nil
-	})
-	return hostVethName, err
-}
-
-func setupHostVeth(vethName string, ipConf *types.IPConfig) error {
-	// hostVeth moved namespaces and may have a new ifindex
-	veth, err := netlink.LinkByName(vethName)
-	if err != nil {
-		return fmt.Errorf("failed to lookup %q: %v", vethName, err)
-	}
-
-	// TODO(eyakubovich): IPv6
-	ipn := &net.IPNet{
-		IP:   ipConf.Gateway,
-		Mask: net.CIDRMask(32, 32),
-	}
-	addr := &netlink.Addr{IPNet: ipn, Label: ""}
-	if err = netlink.AddrAdd(veth, addr); err != nil {
-		return fmt.Errorf("failed to add IP addr (%#v) to veth: %v", ipn, err)
-	}
-
-	ipn = &net.IPNet{
-		IP:   ipConf.IP.IP,
-		Mask: net.CIDRMask(32, 32),
-	}
-	// dst happens to be the same as IP/net of host veth
-	if err = ip.AddHostRoute(ipn, nil, veth); err != nil && !os.IsExist(err) {
-		return fmt.Errorf("failed to add route on host: %v", err)
-	}
-
-	return nil
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	conf := NetConf{}
-	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
-		return fmt.Errorf("failed to load netconf: %v", err)
-	}
-
-	if err := ip.EnableIP4Forward(); err != nil {
-		return fmt.Errorf("failed to enable forwarding: %v", err)
-	}
-
-	// run the IPAM plugin and get back the config to apply
-	result, err := ipam.ExecAdd(conf.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-	if result.IP4 == nil {
-		return errors.New("IPAM plugin returned missing IPv4 config")
-	}
-
-	hostVethName, err := setupContainerVeth(args.Netns, args.IfName, conf.MTU, result)
-	if err != nil {
-		return err
-	}
-
-	if err = setupHostVeth(hostVethName, result.IP4); err != nil {
-		return err
-	}
-
-	if conf.IPMasq {
-		chain := utils.FormatChainName(conf.Name, args.ContainerID)
-		comment := utils.FormatComment(conf.Name, args.ContainerID)
-		if err = ip.SetupIPMasq(&result.IP4.IP, chain, comment); err != nil {
-			return err
-		}
-	}
-
-	result.DNS = conf.DNS
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	conf := NetConf{}
-	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
-		return fmt.Errorf("failed to load netconf: %v", err)
-	}
-
-	if err := ipam.ExecDel(conf.IPAM.Type, args.StdinData); err != nil {
-		return err
-	}
-
-	var ipn *net.IPNet
-	err := ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
-		var err error
-		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
-		return err
-	})
-	if err != nil {
-		return err
-	}
-
-	if conf.IPMasq {
-		chain := utils.FormatChainName(conf.Name, args.ContainerID)
-		comment := utils.FormatComment(conf.Name, args.ContainerID)
-		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/flannel/flannel.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/flannel/flannel.go
deleted file mode 100644
index 6653baca2a..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/flannel/flannel.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This is a "meta-plugin". It reads in its own netconf, combines it with
-// the data from flannel generated subnet file and then invokes a plugin
-// like bridge or ipvlan to do the real work.
-
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/appc/cni/pkg/invoke"
-	"github.com/appc/cni/pkg/skel"
-	"github.com/appc/cni/pkg/types"
-)
-
-const (
-	defaultSubnetFile = "/run/flannel/subnet.env"
-	stateDir          = "/var/lib/cni/flannel"
-)
-
-type NetConf struct {
-	types.NetConf
-	SubnetFile string                 `json:"subnetFile"`
-	Delegate   map[string]interface{} `json:"delegate"`
-}
-
-type subnetEnv struct {
-	nw     *net.IPNet
-	sn     *net.IPNet
-	mtu    *uint
-	ipmasq *bool
-}
-
-func (se *subnetEnv) missing() string {
-	m := []string{}
-
-	if se.nw == nil {
-		m = append(m, "FLANNEL_NETWORK")
-	}
-	if se.sn == nil {
-		m = append(m, "FLANNEL_SUBNET")
-	}
-	if se.mtu == nil {
-		m = append(m, "FLANNEL_MTU")
-	}
-	if se.ipmasq == nil {
-		m = append(m, "FLANNEL_IPMASQ")
-	}
-	return strings.Join(m, ", ")
-}
-
-func loadFlannelNetConf(bytes []byte) (*NetConf, error) {
-	n := &NetConf{
-		SubnetFile: defaultSubnetFile,
-	}
-	if err := json.Unmarshal(bytes, n); err != nil {
-		return nil, fmt.Errorf("failed to load netconf: %v", err)
-	}
-	return n, nil
-}
-
-func loadFlannelSubnetEnv(fn string) (*subnetEnv, error) {
-	f, err := os.Open(fn)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	se := &subnetEnv{}
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		parts := strings.SplitN(s.Text(), "=", 2)
-		switch parts[0] {
-		case "FLANNEL_NETWORK":
-			_, se.nw, err = net.ParseCIDR(parts[1])
-			if err != nil {
-				return nil, err
-			}
-
-		case "FLANNEL_SUBNET":
-			_, se.sn, err = net.ParseCIDR(parts[1])
-			if err != nil {
-				return nil, err
-			}
-
-		case "FLANNEL_MTU":
-			mtu, err := strconv.ParseUint(parts[1], 10, 32)
-			if err != nil {
-				return nil, err
-			}
-			se.mtu = new(uint)
-			*se.mtu = uint(mtu)
-
-		case "FLANNEL_IPMASQ":
-			ipmasq := parts[1] == "true"
-			se.ipmasq = &ipmasq
-		}
-	}
-	if err := s.Err(); err != nil {
-		return nil, err
-	}
-
-	if m := se.missing(); m != "" {
-		return nil, fmt.Errorf("%v is missing %v", fn, m)
-	}
-
-	return se, nil
-}
-
-func saveScratchNetConf(containerID string, netconf []byte) error {
-	if err := os.MkdirAll(stateDir, 0700); err != nil {
-		return err
-	}
-	path := filepath.Join(stateDir, containerID)
-	return ioutil.WriteFile(path, netconf, 0600)
-}
-
-func consumeScratchNetConf(containerID string) ([]byte, error) {
-	path := filepath.Join(stateDir, containerID)
-	defer os.Remove(path)
-
-	return ioutil.ReadFile(path)
-}
-
-func delegateAdd(cid string, netconf map[string]interface{}) error {
-	netconfBytes, err := json.Marshal(netconf)
-	if err != nil {
-		return fmt.Errorf("error serializing delegate netconf: %v", err)
-	}
-
-	// save the rendered netconf for cmdDel
-	if err = saveScratchNetConf(cid, netconfBytes); err != nil {
-		return err
-	}
-
-	result, err := invoke.DelegateAdd(netconf["type"].(string), netconfBytes)
-	if err != nil {
-		return err
-	}
-
-	return result.Print()
-}
-
-func hasKey(m map[string]interface{}, k string) bool {
-	_, ok := m[k]
-	return ok
-}
-
-func isString(i interface{}) bool {
-	_, ok := i.(string)
-	return ok
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	n, err := loadFlannelNetConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	fenv, err := loadFlannelSubnetEnv(n.SubnetFile)
-	if err != nil {
-		return err
-	}
-
-	if n.Delegate == nil {
-		n.Delegate = make(map[string]interface{})
-	} else {
-		if hasKey(n.Delegate, "type") && !isString(n.Delegate["type"]) {
-			return fmt.Errorf("'delegate' dictionary, if present, must have (string) 'type' field")
-		}
-		if hasKey(n.Delegate, "name") {
-			return fmt.Errorf("'delegate' dictionary must not have 'name' field, it'll be set by flannel")
-		}
-		if hasKey(n.Delegate, "ipam") {
-			return fmt.Errorf("'delegate' dictionary must not have 'ipam' field, it'll be set by flannel")
-		}
-	}
-
-	n.Delegate["name"] = n.Name
-
-	if !hasKey(n.Delegate, "type") {
-		n.Delegate["type"] = "bridge"
-	}
-
-	if !hasKey(n.Delegate, "ipMasq") {
-		// if flannel is not doing ipmasq, we should
-		ipmasq := !*fenv.ipmasq
-		n.Delegate["ipMasq"] = ipmasq
-	}
-
-	if !hasKey(n.Delegate, "mtu") {
-		mtu := fenv.mtu
-		n.Delegate["mtu"] = mtu
-	}
-
-	if n.Delegate["type"].(string) == "bridge" {
-		if !hasKey(n.Delegate, "isGateway") {
-			n.Delegate["isGateway"] = true
-		}
-	}
-
-	n.Delegate["ipam"] = map[string]interface{}{
-		"type":   "host-local",
-		"subnet": fenv.sn.String(),
-		"routes": []types.Route{
-			types.Route{
-				Dst: *fenv.nw,
-			},
-		},
-	}
-
-	return delegateAdd(args.ContainerID, n.Delegate)
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	netconfBytes, err := consumeScratchNetConf(args.ContainerID)
-	if err != nil {
-		return err
-	}
-
-	n := &types.NetConf{}
-	if err = json.Unmarshal(netconfBytes, n); err != nil {
-		return fmt.Errorf("failed to parse netconf: %v", err)
-	}
-
-	return invoke.DelegateDel(n.Type, netconfBytes)
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/tuning/tuning.go b/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/tuning/tuning.go
deleted file mode 100644
index 91118dfb1a..0000000000
--- a/Godeps/_workspace/src/github.com/appc/cni/plugins/meta/tuning/tuning.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2016 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This is a "meta-plugin". It reads in its own netconf, it does not create
-// any network interface but just changes the network sysctl.
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/appc/cni/pkg/ns"
-	"github.com/appc/cni/pkg/skel"
-	"github.com/appc/cni/pkg/types"
-)
-
-// TuningConf represents the network tuning configuration.
-type TuningConf struct {
-	types.NetConf
-	SysCtl map[string]string `json:"sysctl"`
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	tuningConf := TuningConf{}
-	if err := json.Unmarshal(args.StdinData, &tuningConf); err != nil {
-		return fmt.Errorf("failed to load netconf: %v", err)
-	}
-
-	// The directory /proc/sys/net is per network namespace. Enter in the
-	// network namespace before writing on it.
-
-	err := ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
-		for key, value := range tuningConf.SysCtl {
-			fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1))
-			fileName = filepath.Clean(fileName)
-
-			// Refuse to modify sysctl parameters that don't belong
-			// to the network subsystem.
-			if !strings.HasPrefix(fileName, "/proc/sys/net/") {
-				return fmt.Errorf("invalid net sysctl key: %q", key)
-			}
-			content := []byte(value)
-			err := ioutil.WriteFile(fileName, content, 0644)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	result := types.Result{}
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	// TODO: the settings are not reverted to the previous values. Reverting the
-	// settings is not useful when the whole container goes away but it could be
-	// useful in scenarios where plugins are added and removed at runtime.
-	return nil
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}

From 1b1bef814e99b62cbcc296dc62e3dd243058e5e8 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 25 May 2016 17:27:06 +0200
Subject: [PATCH 0338/1304] networking: use CNI's ns package

---
 networking/networking.go | 200 ++++++++++++---------------------------
 networking/podenv.go     |  53 +++++++++--
 tests/inspect/inspect.go |   4 +
 3 files changed, 114 insertions(+), 143 deletions(-)

diff --git a/networking/networking.go b/networking/networking.go
index f07ee923c0..280cdbfab2 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -33,6 +33,8 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/networking/netinfo"
 	"github.com/coreos/rkt/pkg/log"
+
+	"golang.org/x/sys/unix"
 )
 
 const (
@@ -44,8 +46,7 @@ const (
 type Networking struct {
 	podEnv
 
-	hostNS *os.File
-	nets   []activeNet
+	nets []activeNet
 }
 
 // NetConf local struct extends cnitypes.NetConf with information about masquerading
@@ -68,6 +69,12 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 		return kvmSetup(podRoot, podID, fps, netList, localConfig)
 	}
 
+	// Create namespace for Pod and write path to a file
+	podNS, err := ns.NewNS()
+	if err != nil {
+		return nil, err
+	}
+
 	// TODO(jonboulle): currently podRoot is _always_ ".", and behaviour in other
 	// circumstances is untested. This should be cleaned up.
 	n := Networking{
@@ -76,56 +83,39 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 			podID:        podID,
 			netsLoadList: netList,
 			localConfig:  localConfig,
+			podNS:        podNS,
 		},
 	}
 
-	hostNS, podNS, err := basicNetNS()
+	n.nets, err = n.loadNets()
 	if err != nil {
-		return nil, err
+		return nil, errwrap.Wrap(errors.New("error loading network definitions"), err)
 	}
-	// we're in podNS!
-	n.hostNS = hostNS
-
-	nspath := n.podNSPath()
 
-	if err = bindMountFile(selfNetNS, nspath); err != nil {
+	if err := n.setupNets(n.nets); err != nil {
 		return nil, err
 	}
 
-	defer func() {
+	if len(fps) > 0 {
+		if err = n.enableDefaultLocalnetRouting(); err != nil {
+			return nil, err
+		}
+		podIP, err := n.GetForwardableNetPodIP()
 		if err != nil {
-			if err := syscall.Unmount(nspath, 0); err != nil {
-				stderr.PrintE(fmt.Sprintf("error unmounting %q", nspath), err)
-			}
+			return nil, err
+		}
+		if err := n.forwardPorts(fps, podIP); err != nil {
+			n.unforwardPorts()
+			return nil, err
 		}
-	}()
+	}
 
-	n.nets, err = n.loadNets()
-	if err != nil {
-		return nil, errwrap.Wrap(errors.New("error loading network definitions"), err)
+	// Switch to the podNS
+	if err := podNS.Set(); err != nil {
+		return nil, err
 	}
 
-	err = withNetNS(podNS, hostNS, func() error {
-		if err := n.setupNets(n.nets); err != nil {
-			return err
-		}
-		if len(fps) > 0 {
-			if err = n.enableDefaultLocalnetRouting(); err != nil {
-				return err
-			}
-			podIP, err := n.GetForwardableNetPodIP()
-			if err != nil {
-				return err
-			}
-			if err := n.forwardPorts(fps, podIP); err != nil {
-				n.unforwardPorts()
-				return err
-			}
-			return nil
-		}
-		return nil
-	})
-	if err != nil {
+	if err = loUp(); err != nil {
 		return nil, err
 	}
 
@@ -194,11 +184,6 @@ func Load(podRoot string, podID *types.UUID) (*Networking, error) {
 		return nil, err
 	}
 
-	hostNS, err := os.Open(selfNetNS)
-	if err != nil {
-		return nil, err
-	}
-
 	var nets []activeNet
 	for _, ni := range nis {
 		n, err := loadNet(ni.ConfPath)
@@ -215,12 +200,19 @@ func Load(podRoot string, podID *types.UUID) (*Networking, error) {
 		nets = append(nets, *n)
 	}
 
+	p := podEnv{
+		podRoot: podRoot,
+		podID:   *podID,
+	}
+
+	podNS, err := p.podNSLoad()
+	if err != nil {
+		return nil, err
+	}
+	p.podNS = podNS
+
 	return &Networking{
-		podEnv: podEnv{
-			podRoot: podRoot,
-			podID:   *podID,
-		},
-		hostNS: hostNS,
+		podEnv: p,
 		nets:   nets,
 	}, nil
 }
@@ -276,104 +268,49 @@ func (n *Networking) Teardown(flavor string, debug bool) {
 		return
 	}
 
-	if err := n.enterHostNS(); err != nil {
-		stderr.PrintE("error switching to host netns", err)
-		return
-	}
-
 	if err := n.unforwardPorts(); err != nil {
 		stderr.PrintE("error removing forwarded ports", err)
 	}
 
-	n.teardownNets(n.nets)
-
-	if err := syscall.Unmount(n.podNSPath(), 0); err != nil {
-		// if already unmounted, umount(2) returns EINVAL
-		if !os.IsNotExist(err) && err != syscall.EINVAL {
-			stderr.PrintE(fmt.Sprintf("error unmounting %q", n.podNSPath()), err)
-		}
-	}
-}
-
-// sets up new netns with just lo
-func basicNetNS() (hostNS, podNS *os.File, err error) {
-	hostNS, podNS, err = newNetNS()
+	podNS, err := n.podNSLoad()
 	if err != nil {
-		err = errwrap.Wrap(errors.New("failed to create new netns"), err)
-		return
+		stderr.PrintE("error loading podNS: %v", err)
 	}
-	// we're in podNS!!
+	if podNS != nil {
+		defer func() {
+			n.podNS.Close()
 
-	if err = loUp(); err != nil {
-		hostNS.Close()
-		podNS.Close()
-		return nil, nil, err
-	}
+			if err := syscall.Unmount(n.podNS.Path(), unix.MNT_DETACH); err != nil {
+				// if already unmounted, umount(2) returns EINVAL
+				if !os.IsNotExist(err) && err != syscall.EINVAL {
+					stderr.PrintE(fmt.Sprintf("error unmounting %q", n.podNS.Path()), err)
+				}
+			}
 
-	return
-}
+			if err := os.RemoveAll(n.podNS.Path()); err != nil {
+				stderr.PrintE(fmt.Sprintf("failed to remove namespace %s", n.podNS.Path()), err)
+			}
+		}()
+	}
 
-// enterHostNS moves into the host's network namespace.
-func (n *Networking) enterHostNS() error {
-	return ns.SetNS(n.hostNS, syscall.CLONE_NEWNET)
+	n.podNS = podNS
+	n.teardownNets(n.nets)
 }
 
 // Save writes out the info about active nets
 // for "rkt list" and friends to display
 func (e *Networking) Save() error {
-	var nis []netinfo.NetInfo
-	for _, n := range e.nets {
-		nis = append(nis, *n.runtime)
-	}
-
-	return netinfo.Save(e.podRoot, nis)
-}
-
-func newNetNS() (hostNS, childNS *os.File, err error) {
-	defer func() {
-		if err != nil {
-			if hostNS != nil {
-				hostNS.Close()
-			}
-			if childNS != nil {
-				childNS.Close()
-			}
-		}
-	}()
 
-	hostNS, err = os.Open(selfNetNS)
-	if err != nil {
-		return
-	}
-
-	if err = syscall.Unshare(syscall.CLONE_NEWNET); err != nil {
-		return
-	}
-
-	childNS, err = os.Open(selfNetNS)
-	if err != nil {
-		ns.SetNS(hostNS, syscall.CLONE_NEWNET)
-		return
-	}
-
-	return
-}
-
-// execute f() in tgtNS
-func withNetNS(curNS, tgtNS *os.File, f func() error) error {
-	if err := ns.SetNS(tgtNS, syscall.CLONE_NEWNET); err != nil {
+	if err := e.podNSPathSave(); err != nil {
 		return err
 	}
 
-	if err := f(); err != nil {
-		// Attempt to revert the net ns in a known state
-		if err := ns.SetNS(curNS, syscall.CLONE_NEWNET); err != nil {
-			stderr.PrintE("cannot revert the net namespace", err)
-		}
-		return err
+	var nis []netinfo.NetInfo
+	for _, n := range e.nets {
+		nis = append(nis, *n.runtime)
 	}
 
-	return ns.SetNS(curNS, syscall.CLONE_NEWNET)
+	return netinfo.Save(e.podRoot, nis)
 }
 
 func loUp() error {
@@ -388,14 +325,3 @@ func loUp() error {
 
 	return nil
 }
-
-func bindMountFile(src, dst string) error {
-	// mount point has to be an existing file
-	f, err := os.Create(dst)
-	if err != nil {
-		return err
-	}
-	f.Close()
-
-	return syscall.Mount(src, dst, "none", syscall.MS_BIND, "")
-}
diff --git a/networking/podenv.go b/networking/podenv.go
index 5fe95f4ed7..2f1a802f2f 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -28,6 +28,8 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 
+	"github.com/containernetworking/cni/pkg/ns"
+
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/networking/netinfo"
 )
@@ -49,6 +51,7 @@ type podEnv struct {
 	podID        types.UUID
 	netsLoadList common.NetList
 	localConfig  string
+	podNS        ns.NetNS
 }
 
 type activeNet struct {
@@ -91,10 +94,46 @@ func (e *podEnv) loadNets() ([]activeNet, error) {
 	return nets, nil
 }
 
-func (e *podEnv) podNSPath() string {
+func (e *podEnv) podNSFilePath() string {
 	return filepath.Join(e.podRoot, "netns")
 }
 
+func (e *podEnv) podNSPathLoad() (string, error) {
+	podNSPath, err := ioutil.ReadFile(e.podNSFilePath())
+	if err != nil {
+		return "", err
+	}
+
+	return string(podNSPath), nil
+}
+
+func (e *podEnv) podNSLoad() (ns.NetNS, error) {
+	podNSPath, err := e.podNSPathLoad()
+	if err != nil {
+		return nil, err
+	}
+
+	podNS, err := ns.GetNS(podNSPath)
+	if err != nil {
+		return nil, err
+	}
+	return podNS, nil
+}
+
+func (e *podEnv) podNSPathSave() error {
+	podNSFile, err := os.OpenFile(e.podNSFilePath(), os.O_WRONLY|os.O_CREATE, 0)
+	if err != nil {
+		return err
+	}
+	defer podNSFile.Close()
+
+	if _, err = io.WriteString(podNSFile, e.podNS.Path()); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (e *podEnv) netDir() string {
 	return filepath.Join(e.podRoot, "net")
 }
@@ -112,8 +151,6 @@ func (e *podEnv) setupNets(nets []activeNet) error {
 		}
 	}()
 
-	nspath := e.podNSPath()
-
 	n := activeNet{}
 	for i, n = range nets {
 		stderr.Printf("loading network %v with type %v", n.conf.Name, n.conf.Type)
@@ -123,7 +160,7 @@ func (e *podEnv) setupNets(nets []activeNet) error {
 			return errwrap.Wrap(fmt.Errorf("error copying %q to %q", n.runtime.ConfPath, e.netDir()), err)
 		}
 
-		n.runtime.IP, n.runtime.HostIP, err = e.netPluginAdd(&n, nspath)
+		n.runtime.IP, n.runtime.HostIP, err = e.netPluginAdd(&n, e.podNS.Path())
 		if err != nil {
 			return errwrap.Wrap(fmt.Errorf("error adding network %q", n.conf.Name), err)
 		}
@@ -132,12 +169,16 @@ func (e *podEnv) setupNets(nets []activeNet) error {
 }
 
 func (e *podEnv) teardownNets(nets []activeNet) {
-	nspath := e.podNSPath()
 
 	for i := len(nets) - 1; i >= 0; i-- {
 		stderr.Printf("teardown - executing net-plugin %v", nets[i].conf.Type)
 
-		err := e.netPluginDel(&nets[i], nspath)
+		podNSpath := ""
+		if e.podNS != nil {
+			podNSpath = e.podNS.Path()
+		}
+
+		err := e.netPluginDel(&nets[i], podNSpath)
 		if err != nil {
 			stderr.PrintE(fmt.Sprintf("error deleting %q", nets[i].conf.Name), err)
 		}
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 6d05ba5891..b84d3c4914 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -390,6 +390,10 @@ func main() {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
 			os.Exit(1)
 		}
+		if len(ips) == 0 {
+			fmt.Fprintf(os.Stderr, "No IPv4 found for interface %+v:\n", iface)
+			os.Exit(1)
+		}
 		fmt.Printf("%v IPv4: %s\n", iface, ips[0])
 	}
 

From 8e60a31d01af2aa9671a65a128b16e47d63b5e5b Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 26 May 2016 00:14:00 +0200
Subject: [PATCH 0339/1304] networking: only save NS to file when set

* Fixes KVM flavor, which doesn't use the NS file
---
 networking/networking.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/networking/networking.go b/networking/networking.go
index 280cdbfab2..faae829003 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -301,8 +301,10 @@ func (n *Networking) Teardown(flavor string, debug bool) {
 // for "rkt list" and friends to display
 func (e *Networking) Save() error {
 
-	if err := e.podNSPathSave(); err != nil {
-		return err
+	if e.podNS != nil {
+		if err := e.podNSPathSave(); err != nil {
+			return err
+		}
 	}
 
 	var nis []netinfo.NetInfo

From 667637fd74fd0f99cf88c43e2efe16e915b3d8ac Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 26 May 2016 16:17:57 +0200
Subject: [PATCH 0340/1304] tests/net: migrate remaining ones to testutil.Test

This will implicitly disable these tests for the KVM flavor on which
they are currently failing.
---
 tests/rkt_net_nspawn_test.go |  12 +++
 tests/rkt_net_test.go        | 172 ++++++++++++++++++-----------------
 2 files changed, 101 insertions(+), 83 deletions(-)

diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index 905c5a588d..376f2ca5e5 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -63,3 +63,15 @@ func TestNetCustomPtp(t *testing.T) {
 func TestNetDefaultConnectivity(t *testing.T) {
 	NewNetDefaultConnectivityTest().Execute(t)
 }
+
+func TestNetDefaultNetNS(t *testing.T) {
+	NewTestNetDefaultNetNS().Execute(t)
+}
+
+func TestNetLongName(t *testing.T) {
+	NewTestNetLongName().Execute(t)
+}
+
+func TestNetDefaultRestrictedConnectivity(t *testing.T) {
+	NewTestNetDefaultRestrictedConnectivity().Execute(t)
+}
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index 58eb30b4a7..8bd7c0be55 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -175,37 +175,39 @@ func NewNetNoneTest() testutils.Test {
  * ---
  * Container must be in a separate network namespace
  */
-func TestNetDefaultNetNS(t *testing.T) {
-	testImageArgs := []string{"--exec=/inspect --print-netns"}
-	testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
-	defer os.Remove(testImage)
+func NewTestNetDefaultNetNS() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		testImageArgs := []string{"--exec=/inspect --print-netns"}
+		testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+		defer os.Remove(testImage)
 
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
 
-	f := func(argument string) {
-		cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s --mds-register=false %s", ctx.Cmd(), argument, testImage)
-		child := spawnOrFail(t, cmd)
-		defer waitOrFail(t, child, 0)
+		f := func(argument string) {
+			cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s --mds-register=false %s", ctx.Cmd(), argument, testImage)
+			child := spawnOrFail(t, cmd)
+			defer waitOrFail(t, child, 0)
 
-		expectedRegex := `NetNS: (net:\[\d+\])`
-		result, out, err := expectRegexWithOutput(child, expectedRegex)
-		if err != nil {
-			t.Fatalf("Error: %v\nOutput: %v", err, out)
-		}
+			expectedRegex := `NetNS: (net:\[\d+\])`
+			result, out, err := expectRegexWithOutput(child, expectedRegex)
+			if err != nil {
+				t.Fatalf("Error: %v\nOutput: %v", err, out)
+			}
 
-		ns, err := os.Readlink("/proc/self/ns/net")
-		if err != nil {
-			t.Fatalf("Cannot evaluate NetNS symlink: %v", err)
-		}
+			ns, err := os.Readlink("/proc/self/ns/net")
+			if err != nil {
+				t.Fatalf("Cannot evaluate NetNS symlink: %v", err)
+			}
 
-		if nsChanged := ns != result[1]; !nsChanged {
-			t.Fatalf("container did not leave host netns")
-		}
+			if nsChanged := ns != result[1]; !nsChanged {
+				t.Fatalf("container did not leave host netns")
+			}
 
-	}
-	f("--net=default")
-	f("")
+		}
+		f("--net=default")
+		f("")
+	})
 }
 
 /*
@@ -293,59 +295,61 @@ func NewNetDefaultConnectivityTest() testutils.Test {
  * eth0's IPv4
  * TODO: verify that the container isn't NATed
  */
-func TestNetDefaultRestrictedConnectivity(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+func NewTestNetDefaultRestrictedConnectivity() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
 
-	f := func(argument string) {
-		httpPort, err := testutils.GetNextFreePort4()
-		if err != nil {
-			t.Fatalf("%v", err)
-		}
-		httpServeAddr := fmt.Sprintf("0.0.0.0:%v", httpPort)
-		iface := "eth0"
+		f := func(argument string) {
+			httpPort, err := testutils.GetNextFreePort4()
+			if err != nil {
+				t.Fatalf("%v", err)
+			}
+			httpServeAddr := fmt.Sprintf("0.0.0.0:%v", httpPort)
+			iface := "eth0"
 
-		testImageArgs := []string{fmt.Sprintf("--exec=/inspect --print-ipv4=%v --serve-http=%v", iface, httpServeAddr)}
-		testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
-		defer os.Remove(testImage)
+			testImageArgs := []string{fmt.Sprintf("--exec=/inspect --print-ipv4=%v --serve-http=%v", iface, httpServeAddr)}
+			testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+			defer os.Remove(testImage)
 
-		cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s --mds-register=false %s", ctx.Cmd(), argument, testImage)
-		child := spawnOrFail(t, cmd)
+			cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s --mds-register=false %s", ctx.Cmd(), argument, testImage)
+			child := spawnOrFail(t, cmd)
 
-		expectedRegex := `IPv4: (\d+\.\d+\.\d+\.\d+)`
-		result, out, err := expectRegexWithOutput(child, expectedRegex)
-		if err != nil {
-			t.Fatalf("Error: %v\nOutput: %v", err, out)
-		}
-		httpGetAddr := fmt.Sprintf("http://%v:%v", result[1], httpPort)
+			expectedRegex := `IPv4: (\d+\.\d+\.\d+\.\d+)`
+			result, out, err := expectRegexWithOutput(child, expectedRegex)
+			if err != nil {
+				t.Fatalf("Error: %v\nOutput: %v", err, out)
+			}
+			httpGetAddr := fmt.Sprintf("http://%v:%v", result[1], httpPort)
 
-		ga := testutils.NewGoroutineAssistant(t)
-		ga.Add(2)
+			ga := testutils.NewGoroutineAssistant(t)
+			ga.Add(2)
 
-		// Child opens the server
-		go func() {
-			defer ga.Done()
-			ga.WaitOrFail(child)
-		}()
+			// Child opens the server
+			go func() {
+				defer ga.Done()
+				ga.WaitOrFail(child)
+			}()
 
-		// Host connects to the child
-		go func() {
-			defer ga.Done()
-			expectedRegex := `serving on`
-			_, out, err := expectRegexWithOutput(child, expectedRegex)
-			if err != nil {
-				ga.Fatalf("Error: %v\nOutput: %v", err, out)
-			}
-			body, err := testutils.HTTPGet(httpGetAddr)
-			if err != nil {
-				ga.Fatalf("%v\n", err)
-			}
-			t.Logf("HTTP-Get received: %s", body)
-		}()
+			// Host connects to the child
+			go func() {
+				defer ga.Done()
+				expectedRegex := `serving on`
+				_, out, err := expectRegexWithOutput(child, expectedRegex)
+				if err != nil {
+					ga.Fatalf("Error: %v\nOutput: %v", err, out)
+				}
+				body, err := testutils.HTTPGet(httpGetAddr)
+				if err != nil {
+					ga.Fatalf("%v\n", err)
+				}
+				t.Logf("HTTP-Get received: %s", body)
+			}()
 
-		ga.Wait()
-	}
-	f("--net=default-restricted")
+			ga.Wait()
+		}
+		f("--net=default-restricted")
+	})
 }
 
 type PortFwdCase struct {
@@ -817,18 +821,20 @@ func NewNetOverrideTest() testutils.Test {
 	})
 }
 
-func TestNetLongName(t *testing.T) {
-	nt := networkTemplateT{
-		Name:   "thisnameiswaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaytoolong",
-		Type:   "ptp",
-		IpMasq: true,
-		Ipam: ipamTemplateT{
-			Type:   "host-local",
-			Subnet: "11.11.6.0/24",
-			Routes: []map[string]string{
-				{"dst": "0.0.0.0/0"},
+func NewTestNetLongName() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		nt := networkTemplateT{
+			Name:   "thisnameiswaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaytoolong",
+			Type:   "ptp",
+			IpMasq: true,
+			Ipam: ipamTemplateT{
+				Type:   "host-local",
+				Subnet: "11.11.6.0/24",
+				Routes: []map[string]string{
+					{"dst": "0.0.0.0/0"},
+				},
 			},
-		},
-	}
-	testNetCustomNatConnectivity(t, nt)
+		}
+		testNetCustomNatConnectivity(t, nt)
+	})
 }

From 8fe3c158b0a1d38fe65de88e120827b249727233 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 27 May 2016 14:21:13 +0200
Subject: [PATCH 0341/1304] networking: use error types to check NS loading

---
 networking/podenv.go | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/networking/podenv.go b/networking/podenv.go
index 2f1a802f2f..c5b5f33226 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -107,17 +107,32 @@ func (e *podEnv) podNSPathLoad() (string, error) {
 	return string(podNSPath), nil
 }
 
-func (e *podEnv) podNSLoad() (ns.NetNS, error) {
-	podNSPath, err := e.podNSPathLoad()
-	if err != nil {
-		return nil, err
+func podNSerrorOK(podNSPath string, err error) bool {
+	switch err.(type) {
+	case ns.NSPathNotExistErr:
+		return true
+	case ns.NSPathNotNSErr:
+		return true
+
+	default:
+		if os.IsNotExist(err) {
+			return true
+		}
+		return false
 	}
+}
 
-	podNS, err := ns.GetNS(podNSPath)
-	if err != nil {
+func (e *podEnv) podNSLoad() (ns.NetNS, error) {
+	podNSPath, err := e.podNSPathLoad()
+	if err != nil && !podNSerrorOK(podNSPath, err) {
 		return nil, err
+	} else {
+		podNS, err := ns.GetNS(podNSPath)
+		if err != nil && !podNSerrorOK(podNSPath, err) {
+			return nil, err
+		}
+		return podNS, nil
 	}
-	return podNS, nil
 }
 
 func (e *podEnv) podNSPathSave() error {

From f09d6a97eaa2968521c421a42aeb08a93124a9ad Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 27 May 2016 16:50:27 +0200
Subject: [PATCH 0342/1304] tests/kvm: re-enable previously failing cases

---
 tests/rkt_net_kvm_test.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/rkt_net_kvm_test.go b/tests/rkt_net_kvm_test.go
index 79acb909b8..70fac2773a 100644
--- a/tests/rkt_net_kvm_test.go
+++ b/tests/rkt_net_kvm_test.go
@@ -28,3 +28,15 @@ func TestNetCustomPtp(t *testing.T) {
 	// PTP means connection Point-To-Point. That is, connections to other pods/containers should be forbidden
 	NewNetCustomPtpTest(false)
 }
+
+func TestNetDefaultNetNS(t *testing.T) {
+	NewTestNetDefaultNetNS().Execute(t)
+}
+
+func TestNetLongName(t *testing.T) {
+	NewTestNetLongName().Execute(t)
+}
+
+func TestNetDefaultRestrictedConnectivity(t *testing.T) {
+	NewTestNetDefaultRestrictedConnectivity().Execute(t)
+}

From 597bb9fc761b88a208cfac88ad874c4f26a30257 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 27 May 2016 18:06:11 +0200
Subject: [PATCH 0343/1304] Godeps: fix gopsutil/load reference

Per OOB, thanks to the calamity that is GitHub,
this inconsistency slipped in as a mix of
https://github.com/coreos/rkt/pull/2587/files#diff-681659ab9abb4b4883e78e8aaa980dbaR510
and https://github.com/coreos/rkt/pull/2705/files
---
 Godeps/Godeps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 0b561989b4..33473adae4 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -593,8 +593,8 @@
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/load",
-			"Comment": "v2.0.0-10-g9ef3410",
-			"Rev": "9ef341037b1bcadeeee79e77da4f6baf63de4feb"
+			"Comment": "v2.0.0",
+			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/mem",

From be74c323adfa99fd63fd1e29906627b1f7b7a641 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Mon, 30 May 2016 14:44:55 +0200
Subject: [PATCH 0344/1304] Godeps: update appc/docker2aci (0.11.1) and
 coreos/pkg (v2)

---
 Godeps/Godeps.json                            |  50 ++++-----
 .../backend/repository/repository2.go         |  16 ++-
 .../github.com/appc/docker2aci/lib/version.go |   2 +-
 .../coreos/pkg/progressutil/iocopy.go         | 104 ++++++++++-------
 .../coreos/pkg/progressutil/progressbar.go    | 105 +++++++++++++-----
 5 files changed, 179 insertions(+), 98 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 33473adae4..f4fe087376 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/rkt",
 	"GoVersion": "go1.5",
-	"GodepVersion": "v71",
+	"GodepVersion": "v72",
 	"Packages": [
 		"./...",
 		"github.com/appc/spec/actool",
@@ -23,53 +23,53 @@
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/common",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/backend/file",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/backend/repository",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/docker",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/tarball",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/types",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/lib/internal/util",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/docker2aci/pkg/log",
-			"Comment": "v0.11.0",
-			"Rev": "abe598e6384a9978e419a3f43d3e389218407624"
+			"Comment": "v0.11.1",
+			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
 		},
 		{
 			"ImportPath": "github.com/appc/goaci/proj2aci",
@@ -400,8 +400,8 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/pkg/dlopen",
-			"Comment": "v1",
-			"Rev": "160ae6282d8c48a33d8c150e4e4817fdef8a5cde"
+			"Comment": "v2",
+			"Rev": "7f080b6c11ac2d2347c3cd7521e810207ea1a041"
 		},
 		{
 			"ImportPath": "github.com/cpuguy83/go-md2man/md2man",
@@ -774,8 +774,8 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/pkg/progressutil",
-			"Comment": "v1",
-			"Rev": "160ae6282d8c48a33d8c150e4e4817fdef8a5cde"
+			"Comment": "v2",
+			"Rev": "7f080b6c11ac2d2347c3cd7521e810207ea1a041"
 		},
 		{
 			"ImportPath": "github.com/klauspost/compress/flate",
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
index 6a0c8907da..356d6f9bee 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -26,6 +26,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/appc/docker2aci/lib/common"
@@ -76,17 +77,21 @@ func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.Pars
 	}
 	defer os.RemoveAll(tmpParentDir)
 
-	copier := &progressutil.CopyProgressPrinter{}
+	copier := progressutil.NewCopyProgressPrinter()
 
 	var errChannels []chan error
 	closers := make([]io.ReadCloser, len(layerIDs))
+	var wg sync.WaitGroup
 	for i, layerID := range layerIDs {
-		errChan := make(chan error)
+		wg.Add(1)
+		errChan := make(chan error, 1)
 		errChannels = append(errChannels, errChan)
 		// https://github.com/golang/go/wiki/CommonMistakes
 		i := i // golang--
 		layerID := layerID
 		go func() {
+			defer wg.Done()
+
 			manifest := rb.imageManifests[*dockerURL]
 
 			layerIndex, err := getLayerIndex(layerID, manifest)
@@ -120,6 +125,8 @@ func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.Pars
 			errChan <- nil
 		}()
 	}
+	// Need to wait for all of the readers to be added to the copier (which happens during rb.getLayerV2)
+	wg.Wait()
 	err = copier.PrintAndWait(os.Stderr, 500*time.Millisecond, nil)
 	if err != nil {
 		return nil, nil, err
@@ -332,7 +339,10 @@ func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedD
 		return nil, nil, err
 	}
 
-	copier.AddCopy(in, name, size, layerFile)
+	err = copier.AddCopy(in, name, size, layerFile)
+	if err != nil {
+		return nil, nil, err
+	}
 
 	return layerFile, res.Body, nil
 }
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
index f8fe2eba80..487c4bc50e 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.11.0"
+var Version = "0.11.1"
 var AppcVersion = schema.AppContainerVersion
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go
index d897dc86b9..04cd0dfa30 100644
--- a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go
@@ -15,17 +15,21 @@
 package progressutil
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"sync"
 	"time"
 )
 
+var (
+	ErrAlreadyStarted = errors.New("cannot add copies after PrintAndWait has been called")
+)
+
 type copyReader struct {
 	reader  io.Reader
 	current int64
 	total   int64
-	done    bool
 	pb      *ProgressBar
 }
 
@@ -36,9 +40,6 @@ func (cr *copyReader) Read(p []byte) (int, error) {
 	if err == nil {
 		err = err1
 	}
-	if err != nil {
-		cr.done = true
-	}
 	return n, err
 }
 
@@ -52,12 +53,21 @@ func (cr *copyReader) updateProgressBar() error {
 	return cr.pb.SetCurrentProgress(progress)
 }
 
+// NewCopyProgressPrinter returns a new CopyProgressPrinter
+func NewCopyProgressPrinter() *CopyProgressPrinter {
+	return &CopyProgressPrinter{results: make(chan error), cancel: make(chan struct{})}
+}
+
 // CopyProgressPrinter will perform an arbitrary number of io.Copy calls, while
 // continually printing the progress of each copy.
 type CopyProgressPrinter struct {
-	readers []*copyReader
-	errors  []error
+	results chan error
+	cancel  chan struct{}
+
+	// `lock` mutex protects all fields below it in CopyProgressPrinter struct
 	lock    sync.Mutex
+	readers []*copyReader
+	started bool
 	pbp     *ProgressBarPrinter
 }
 
@@ -65,8 +75,15 @@ type CopyProgressPrinter struct {
 // will be made to copy bytes from reader to dest, and name and size will be
 // used to label the progress bar and display how much progress has been made.
 // If size is 0, the total size of the reader is assumed to be unknown.
-func (cpp *CopyProgressPrinter) AddCopy(reader io.Reader, name string, size int64, dest io.Writer) {
+// AddCopy can only be called before PrintAndWait; otherwise, ErrAlreadyStarted
+// will be returned.
+func (cpp *CopyProgressPrinter) AddCopy(reader io.Reader, name string, size int64, dest io.Writer) error {
 	cpp.lock.Lock()
+	defer cpp.lock.Unlock()
+
+	if cpp.started {
+		return ErrAlreadyStarted
+	}
 	if cpp.pbp == nil {
 		cpp.pbp = &ProgressBarPrinter{}
 		cpp.pbp.PadToBeEven = true
@@ -82,60 +99,65 @@ func (cpp *CopyProgressPrinter) AddCopy(reader io.Reader, name string, size int6
 	cr.pb.SetPrintAfter(cr.formattedProgress())
 
 	cpp.readers = append(cpp.readers, cr)
-	cpp.lock.Unlock()
 
 	go func() {
 		_, err := io.Copy(dest, cr)
-		if err != nil {
-			cpp.lock.Lock()
-			cpp.errors = append(cpp.errors, err)
-			cpp.lock.Unlock()
+		select {
+		case <-cpp.cancel:
+			return
+		case cpp.results <- err:
+			return
 		}
 	}()
+	return nil
 }
 
 // PrintAndWait will print the progress for each copy operation added with
 // AddCopy to printTo every printInterval. This will continue until every added
 // copy is finished, or until cancel is written to.
+// PrintAndWait may only be called once; any subsequent calls will immediately
+// return ErrAlreadyStarted.  After PrintAndWait has been called, no more
+// copies may be added to the CopyProgressPrinter.
 func (cpp *CopyProgressPrinter) PrintAndWait(printTo io.Writer, printInterval time.Duration, cancel chan struct{}) error {
-	for {
-		// If cancel is not nil, see if anything has been written to it. If
-		// something has, return, otherwise keep drawing.
-		if cancel != nil {
-			select {
-			case <-cancel:
-				return nil
-			default:
-			}
-		}
-
-		cpp.lock.Lock()
-		readers := cpp.readers
-		errors := cpp.errors
+	cpp.lock.Lock()
+	if cpp.started {
 		cpp.lock.Unlock()
+		return ErrAlreadyStarted
+	}
+	cpp.started = true
+	cpp.lock.Unlock()
 
-		if len(errors) > 0 {
-			return errors[0]
-		}
+	n := len(cpp.readers)
+	if n == 0 {
+		// Nothing to do.
+		return nil
+	}
 
-		if len(readers) > 0 {
+	defer close(cpp.cancel)
+	t := time.NewTicker(printInterval)
+	allDone := false
+	for i := 0; i < n; {
+		select {
+		case <-cancel:
+			return nil
+		case <-t.C:
 			_, err := cpp.pbp.Print(printTo)
 			if err != nil {
 				return err
 			}
-		} else {
-		}
-
-		allDone := true
-		for _, r := range readers {
-			allDone = allDone && r.done
-		}
-		if allDone && len(readers) > 0 {
-			return nil
+		case err := <-cpp.results:
+			i++
+			// Once completion is signaled, further on this just drains
+			// (unlikely) errors from the channel.
+			if err == nil && !allDone {
+				allDone, err = cpp.pbp.Print(printTo)
+			}
+			if err != nil {
+				return err
+			}
 		}
-
-		time.Sleep(printInterval)
 	}
+	return nil
 }
 
 func (cr *copyReader) formattedProgress() string {
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go
index 76d2bff1ca..224c124acd 100644
--- a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go
@@ -38,13 +38,33 @@ var (
 // be created directly, use the AddProgressBar on a ProgressBarPrinter to
 // create these.
 type ProgressBar struct {
+	lock sync.Mutex
+
 	currentProgress float64
 	printBefore     string
 	printAfter      string
-	lock            sync.Mutex
 	done            bool
 }
 
+func (pb *ProgressBar) clone() *ProgressBar {
+	pb.lock.Lock()
+	pbClone := &ProgressBar{
+		currentProgress: pb.currentProgress,
+		printBefore:     pb.printBefore,
+		printAfter:      pb.printAfter,
+		done:            pb.done,
+	}
+	pb.lock.Unlock()
+	return pbClone
+}
+
+func (pb *ProgressBar) GetCurrentProgress() float64 {
+	pb.lock.Lock()
+	val := pb.currentProgress
+	pb.lock.Unlock()
+	return val
+}
+
 // SetCurrentProgress sets the progress of this ProgressBar. The progress must
 // be between 0 and 1 inclusive.
 func (pb *ProgressBar) SetCurrentProgress(progress float64) error {
@@ -57,6 +77,29 @@ func (pb *ProgressBar) SetCurrentProgress(progress float64) error {
 	return nil
 }
 
+// GetDone returns whether or not this progress bar is done
+func (pb *ProgressBar) GetDone() bool {
+	pb.lock.Lock()
+	val := pb.done
+	pb.lock.Unlock()
+	return val
+}
+
+// SetDone sets whether or not this progress bar is done
+func (pb *ProgressBar) SetDone(val bool) {
+	pb.lock.Lock()
+	pb.done = val
+	pb.lock.Unlock()
+}
+
+// GetPrintBefore gets the text printed on the line before the progress bar.
+func (pb *ProgressBar) GetPrintBefore() string {
+	pb.lock.Lock()
+	val := pb.printBefore
+	pb.lock.Unlock()
+	return val
+}
+
 // SetPrintBefore sets the text printed on the line before the progress bar.
 func (pb *ProgressBar) SetPrintBefore(before string) {
 	pb.lock.Lock()
@@ -64,6 +107,14 @@ func (pb *ProgressBar) SetPrintBefore(before string) {
 	pb.lock.Unlock()
 }
 
+// GetPrintAfter gets the text printed on the line after the progress bar.
+func (pb *ProgressBar) GetPrintAfter() string {
+	pb.lock.Lock()
+	val := pb.printAfter
+	pb.lock.Unlock()
+	return val
+}
+
 // SetPrintAfter sets the text printed on the line after the progress bar.
 func (pb *ProgressBar) SetPrintAfter(after string) {
 	pb.lock.Lock()
@@ -74,6 +125,8 @@ func (pb *ProgressBar) SetPrintAfter(after string) {
 // ProgressBarPrinter will print out the progress of some number of
 // ProgressBars.
 type ProgressBarPrinter struct {
+	lock sync.Mutex
+
 	// DisplayWidth can be set to influence how large the progress bars are.
 	// The bars will be scaled to attempt to produce lines of this number of
 	// characters, but lines of different lengths may still be printed. When
@@ -85,7 +138,8 @@ type ProgressBarPrinter struct {
 	PadToBeEven         bool
 	numLinesInLastPrint int
 	progressBars        []*ProgressBar
-	lock                sync.Mutex
+	maxBefore           int
+	maxAfter            int
 }
 
 // AddProgressBar will create a new ProgressBar, register it with this
@@ -107,7 +161,10 @@ func (pbp *ProgressBarPrinter) AddProgressBar() *ProgressBar {
 // the previously printed bars.
 func (pbp *ProgressBarPrinter) Print(printTo io.Writer) (bool, error) {
 	pbp.lock.Lock()
-	bars := pbp.progressBars
+	var bars []*ProgressBar
+	for _, bar := range pbp.progressBars {
+		bars = append(bars, bar.clone())
+	}
 	numColumns := pbp.DisplayWidth
 	pbp.lock.Unlock()
 
@@ -123,29 +180,25 @@ func (pbp *ProgressBarPrinter) Print(printTo io.Writer) (bool, error) {
 		moveCursorUp(printTo, pbp.numLinesInLastPrint)
 	}
 
-	maxBefore := 0
-	maxAfter := 0
 	for _, bar := range bars {
-		bar.lock.Lock()
-		beforeSize := len(bar.printBefore)
-		afterSize := len(bar.printAfter)
-		bar.lock.Unlock()
-		if beforeSize > maxBefore {
-			maxBefore = beforeSize
+		beforeSize := len(bar.GetPrintBefore())
+		afterSize := len(bar.GetPrintAfter())
+		if beforeSize > pbp.maxBefore {
+			pbp.maxBefore = beforeSize
 		}
-		if afterSize > maxAfter {
-			maxAfter = afterSize
+		if afterSize > pbp.maxAfter {
+			pbp.maxAfter = afterSize
 		}
 	}
 
-	allDone := false
+	allDone := true
 	for _, bar := range bars {
 		if isTerminal(printTo) {
-			bar.printToTerminal(printTo, numColumns, pbp.PadToBeEven, maxBefore, maxAfter)
+			bar.printToTerminal(printTo, numColumns, pbp.PadToBeEven, pbp.maxBefore, pbp.maxAfter)
 		} else {
 			bar.printToNonTerminal(printTo)
 		}
-		allDone = allDone || bar.currentProgress == 1
+		allDone = allDone && bar.GetCurrentProgress() == 1
 	}
 
 	pbp.numLinesInLastPrint = len(bars)
@@ -161,9 +214,8 @@ func moveCursorUp(printTo io.Writer, numLines int) {
 }
 
 func (pb *ProgressBar) printToTerminal(printTo io.Writer, numColumns int, padding bool, maxBefore, maxAfter int) {
-	pb.lock.Lock()
-	before := pb.printBefore
-	after := pb.printAfter
+	before := pb.GetPrintBefore()
+	after := pb.GetPrintAfter()
 
 	if padding {
 		before = before + strings.Repeat(" ", maxBefore-len(before))
@@ -173,29 +225,26 @@ func (pb *ProgressBar) printToTerminal(printTo io.Writer, numColumns int, paddin
 	progressBarSize := numColumns - (len(fmt.Sprintf("%s [] %s", before, after)))
 	progressBar := ""
 	if progressBarSize > 0 {
-		currentProgress := int(pb.currentProgress * float64(progressBarSize))
+		currentProgress := int(pb.GetCurrentProgress() * float64(progressBarSize))
 		progressBar = fmt.Sprintf("[%s%s] ",
 			strings.Repeat("=", currentProgress),
 			strings.Repeat(" ", progressBarSize-currentProgress))
 	} else {
 		// If we can't fit the progress bar, better to not pad the before/after.
-		before = pb.printBefore
-		after = pb.printAfter
+		before = pb.GetPrintBefore()
+		after = pb.GetPrintAfter()
 	}
 
 	fmt.Fprintf(printTo, "%s %s%s\n", before, progressBar, after)
-	pb.lock.Unlock()
 }
 
 func (pb *ProgressBar) printToNonTerminal(printTo io.Writer) {
-	pb.lock.Lock()
-	if !pb.done {
+	if !pb.GetDone() {
 		fmt.Fprintf(printTo, "%s %s\n", pb.printBefore, pb.printAfter)
-		if pb.currentProgress == 1 {
-			pb.done = true
+		if pb.GetCurrentProgress() == 1 {
+			pb.SetDone(true)
 		}
 	}
-	pb.lock.Unlock()
 }
 
 // isTerminal returns True when w is going to a tty, and false otherwise.

From 9549a059c85915f1136a4ce1e7fdd7b8cf25fd08 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 27 May 2016 17:48:18 +0200
Subject: [PATCH 0345/1304] version: bump to v1.7.0

---
 CHANGELOG.md                            | 38 +++++++++++++++++++++++++
 Documentation/getting-started-ubuntu.md |  6 ++--
 Documentation/running-fly-stage1.md     |  4 +--
 Documentation/running-lkvm-stage1.md    |  4 +--
 Documentation/subcommands/prepare.md    |  2 +-
 Documentation/subcommands/version.md    |  2 +-
 Documentation/trying-out-rkt.md         |  6 ++--
 ROADMAP.md                              |  9 +++---
 configure.ac                            |  2 +-
 scripts/acbuild-rkt-builder.sh          |  2 +-
 scripts/build-rir.sh                    |  2 +-
 stage1/aci/aci-manifest.in              |  2 +-
 tests/empty-image/manifest              |  2 +-
 tests/image/manifest                    |  2 +-
 tests/rkt_exec_test.go                  |  2 +-
 tests/rkt_image_cat_manifest_test.go    |  2 +-
 tests/rkt_image_export_test.go          |  2 +-
 tests/rkt_image_render_test.go          |  2 +-
 tests/rkt_os_arch_test.go               |  2 +-
 19 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2abcde86f0..44ea24ac44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,41 @@
+## v1.7.0
+
+This release introduces some new security features, including a "no-new-privileges" isolator and initial (partial) restrictions on /proc and /sys access.
+Cgroups handling has also been improved with regards to setup and cleaning. Many bugfixes and new documentation are included too.
+
+#### New features and UX changes
+
+- stage1: implement no-new-privs linux isolator ([#2677](https://github.com/coreos/rkt/pull/2677)).
+- stage0: disable OverlayFS by default when working on ZFS ([#2600](https://github.com/coreos/rkt/pull/2600)).
+- stage1: (partially) restrict access to procfs and sysfs paths ([#2683](https://github.com/coreos/rkt/pull/2683)).
+- stage1: clean up pod cgroups on GC ([#2655](https://github.com/coreos/rkt/pull/2655)).
+- stage1/prepare-app: don't mount /sys/fs/cgroup in stage2 ([#2681](https://github.com/coreos/rkt/pull/2681)).
+- stage0: complain and abort on conflicting CLI flags ([#2666](https://github.com/coreos/rkt/pull/2666)).
+- stage1: update CoreOS image signing key ([#2659](https://github.com/coreos/rkt/pull/2659)).
+- api_service: Implement GetLogs RPC request ([#2662](https://github.com/coreos/rkt/pull/2662)).
+- networking: update to CNI v0.3.0 ([#3696](https://github.com/coreos/rkt/pull/2696)).
+
+#### Bug fixes
+
+- api: fix image size reporting ([#2501](https://github.com/coreos/rkt/pull/2501)).
+- build: fix build failures on manpages/bash-completion target due to missing GOPATH ([#2646](https://github.com/coreos/rkt/pull/2646)).
+- dist: fix "other" permissions so rkt list can work without root/rkt-admin ([#2698](https://github.com/coreos/rkt/pull/2698)).
+- kvm: fix logging network plugin type ([#2635](https://github.com/coreos/rkt/pull/2635)).
+- kvm: transform flannel network to allow teardown ([#2647](https://github.com/coreos/rkt/pull/2647)).
+- rkt: fix panic on rm a non-existing pod with uuid-file ([#2679](https://github.com/coreos/rkt/pull/2679)).
+- stage1/init: work around `cgroup/SCM_CREDENTIALS` race ([#2645](https://github.com/coreos/rkt/pull/2645)).
+- gc: mount stage1 on GC ([#2704](https://github.com/coreos/rkt/pull/2704)).
+- stage1: fix network files leak on GC ([#2319](https://github.com/coreos/rkt/issues/2319)).
+
+#### Other changes
+
+- deps: remove unused dependencies ([#2703](https://github.com/coreos/rkt/pull/2703)).
+- deps: appc/spec, k8s, protobuf updates ([#2697](https://github.com/coreos/rkt/pull/2697)).
+- deps: use tagged release of github.com/shirou/gopsutil ([#2705](https://github.com/coreos/rkt/pull/2705)).
+- deps: bump docker2aci to v0.11.1 ([#2719](https://github.com/coreos/rkt/pull/2719)).
+- Documentation updates ([#2620](https://github.com/coreos/rkt/pull/2620), [#2700](https://github.com/coreos/rkt/pull/2700), [#2637](https://github.com/coreos/rkt/pull/2637), [#2591](https://github.com/coreos/rkt/pull/2591), [#2651](https://github.com/coreos/rkt/pull/2651), [#2699](https://github.com/coreos/rkt/pull/2699), [#2631](https://github.com/coreos/rkt/pull/2631)).
+- Test improvements ([#2587](https://github.com/coreos/rkt/pull/2587), [#2656](https://github.com/coreos/rkt/pull/2656), [#2676](https://github.com/coreos/rkt/pull/2676), [#2554](https://github.com/coreos/rkt/pull/2554), [#2690](https://github.com/coreos/rkt/pull/2690), [#2674](https://github.com/coreos/rkt/pull/2674), [#2665](https://github.com/coreos/rkt/pull/2665), [#2649](https://github.com/coreos/rkt/pull/2649), [#2643](https://github.com/coreos/rkt/pull/2643), [#2637](https://github.com/coreos/rkt/pull/2637), [#2633](https://github.com/coreos/rkt/pull/2633)).
+
 ## v1.6.0
 
 This release focuses on security enhancements. It provides additional isolators, creating a new mount namespace per app. Also a new version of CoreOS 1032.0.0 with systemd v229 is being used in stage1.
diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
index 73bbaec11b..413d3b1c97 100644
--- a/Documentation/getting-started-ubuntu.md
+++ b/Documentation/getting-started-ubuntu.md
@@ -15,9 +15,9 @@ vagrant up --provider virtualbox
 vagrant ssh
 sudo -s
 
-wget https://github.com/coreos/rkt/releases/download/v1.6.0/rkt-v1.6.0.tar.gz
-tar xzvf rkt-v1.6.0.tar.gz
-cd rkt-v1.6.0
+wget https://github.com/coreos/rkt/releases/download/v1.7.0/rkt-v1.7.0.tar.gz
+tar xzvf rkt-v1.7.0.tar.gz
+cd rkt-v1.7.0
 ./rkt help
 ```
 
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 1d145e8031..8b4b0378f0 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.6.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.7.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.6.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.7.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index d75391b533..01c5a5b7ac 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.6.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.7.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.6.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.7.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 5e55a81f8c..2791f20968 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.6.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.7.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 56b5c9c937..d23ae66475 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.6.0
+rkt Version: 1.7.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 96736c4aa1..dec49926d4 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool, and is currently supported on amd64 Linux. A
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.6.0/rkt-v1.6.0.tar.gz
-tar xzvf rkt-v1.6.0.tar.gz
-cd rkt-v1.6.0
+wget https://github.com/coreos/rkt/releases/download/v1.7.0/rkt-v1.7.0.tar.gz
+tar xzvf rkt-v1.7.0.tar.gz
+cd rkt-v1.7.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
index d04c5ab900..a5e9422d2b 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,13 +9,10 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-### rkt 1.7 (May)
-
-- enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
-- app-level seccomp support [#1614](https://github.com/coreos/rkt/issues/1614)
 
 ### rkt 1.8 (June)
 
+- app-level seccomp support [#1614](https://github.com/coreos/rkt/issues/1614)
 - stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
 - IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
 - full integration with Kubernetes (aka "rktnetes")
@@ -25,3 +22,7 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 - packaged for more distributions
   - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)
 - user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)
+
+### rkt 1.9 (June)
+
+- enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
diff --git a/configure.ac b/configure.ac
index 8fe006bde7..5f547b31b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.6.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.7.0], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 41eabfa9f7..d39f925e59 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.6.0+git"}
+IMG_VERSION=${VERSION:-"v1.7.0"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 6f771b6bda..117190119f 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.6.0+git}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.7.0}"
 
 mkdir -p $BUILDDIR
 
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index bca4bce96d..b9e7b1a3dc 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.7.4",
+    "acVersion": "0.8.4",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 7ef4622e87..9e3ee0a986 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.6.0"
+            "value": "1.7.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index d4abdfe4dc..228c2ce830 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.6.0"
+            "value": "1.7.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index b9e3be307d..b3c8c0224b 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.6.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.7.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 9831833c66..5ec32f02c9 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.6.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.7.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 80a203961b..eb4adcdf85 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.6.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.7.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 191b7d6388..d86a9cb711 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.6.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.7.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 172a80d74e..357ee15c20 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.6.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.7.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 74424a0cd730a7548560b600cc1baa719efffe45 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 27 May 2016 17:48:19 +0200
Subject: [PATCH 0346/1304] version: bump to v1.7.0+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5f547b31b1..a65bdd62f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.7.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.7.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index d39f925e59..9b66b9c421 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.7.0"}
+IMG_VERSION=${VERSION:-"v1.7.0+git"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 117190119f..fa5d54e35d 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.7.0}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.7.0+git}"
 
 mkdir -p $BUILDDIR
 

From fa90728abf1e8cb8c4c50304d1a08956075ac9f2 Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@gmail.com>
Date: Fri, 27 May 2016 13:01:11 +0200
Subject: [PATCH 0347/1304] kvm: add proxy arp support to macvtap

---
 networking/kvm.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/networking/kvm.go b/networking/kvm.go
index e57cc99d91..1dd0c5bedb 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -31,6 +31,7 @@ import (
 	"github.com/containernetworking/cni/pkg/ip"
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	cniutils "github.com/containernetworking/cni/pkg/utils"
+	cnisysctl "github.com/containernetworking/cni/pkg/utils/sysctl"
 	"github.com/hashicorp/errwrap"
 	"github.com/vishvananda/netlink"
 
@@ -78,6 +79,10 @@ type MacVTapNetConf struct {
 	Mode   string `json:"mode"`
 }
 
+const (
+	IPv4InterfaceArpProxySysctlTemplate = "net.ipv4.conf.%s.proxy_arp"
+)
+
 // setupTapDevice creates persistent macvtap device
 // and returns a newly created netlink.Link structure
 // using part of pod hash and interface number in interface name
@@ -120,6 +125,15 @@ func setupMacVTapDevice(podID types.UUID, config MacVTapNetConf, interfaceNumber
 	if err := netlink.LinkAdd(link); err != nil {
 		return nil, errwrap.Wrap(errors.New("cannot create macvtap interface"), err)
 	}
+
+	// TODO: duplicate following lines for ipv6 support, when it will be added in other places
+	ipv4SysctlValueName := fmt.Sprintf(IPv4InterfaceArpProxySysctlTemplate, interfaceName)
+	if _, err := cnisysctl.Sysctl(ipv4SysctlValueName, "1"); err != nil {
+		// remove the newly added link and ignore errors, because we already are in a failed state
+		_ = netlink.LinkDel(link)
+		return nil, errwrap.Wrap(fmt.Errorf("failed to set proxy_arp on newly added interface %q", interfaceName), err)
+	}
+
 	if err := netlink.LinkSetUp(link); err != nil {
 		// remove the newly added link and ignore errors, because we already are in a failed state
 		_ = netlink.LinkDel(link)

From ad0c46dc744adb6544f02efe0c2658e1233cc32f Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 31 May 2016 11:24:29 +0200
Subject: [PATCH 0348/1304] MAINTAINERS: add Piotr Skamruk (@jellonek)

Piotr has provided invaluable contributions to the project, mostly
around the KVM stage1 but also more generally. This proposes adding him
as a maintainer of all KVM-related areas.

This format is taken straight from
https://github.com/coreos/etcd/blob/master/MAINTAINERS but open to
better suggestions. I don't think it's necessary yet to go to a fully
structured approach (i.e. human parseable is fine for now).
---
 MAINTAINERS | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 1df9151f47..f05557c361 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,12 +1,15 @@
-Alban Crequy <alban.crequy@coreos.com> (@alban)
-Brandon Philips <brandon.philips@coreos.com> (@philips)
-Derek Gonyeo <derek.gonyeo@coreos.com> (@dgonyeo)
-Iago López Galeiras <iago.lopez@coreos.com> (@iaguis)
-Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle)
-Krzesimir Nowak <krzesimir.nowak@coreos.com> (@krnowak)
-Luca Bruno <luca.bruno@coreos.com> (@lucab)
-Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak)
-Stefan Junker <stefan.junker@coreos.com> (@steveeJ)
-Tamer Tas <tamer.tas@coreos.com> (@tmrts)
-Vito Caputo <vito.caputo@coreos.com> (@vcaputo)
-Yifan Gu <yifan.gu@coreos.com> (@yifan-gu)
+Alban Crequy <alban.crequy@coreos.com> (@alban) pkg: *
+Brandon Philips <brandon.philips@coreos.com> (@philips) pkg: *
+Derek Gonyeo <derek.gonyeo@coreos.com> (@dgonyeo) pkg: *
+Euan Kemp <euan.kemp@coreos.com> (@euank) pkg: *
+Iago López Galeiras <iago.lopez@coreos.com> (@iaguis) pkg: *
+Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle) pkg: *
+Krzesimir Nowak <krzesimir.nowak@coreos.com> (@krnowak) pkg: *
+Luca Bruno <luca.bruno@coreos.com> (@lucab) pkg: *
+Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak) pkg: *
+Stefan Junker <stefan.junker@coreos.com> (@steveeJ) pkg: *
+Tamer Tas <tamer.tas@coreos.com> (@tmrts) pkg: *
+Vito Caputo <vito.caputo@coreos.com> (@vcaputo) pkg: *
+Yifan Gu <yifan.gu@coreos.com> (@yifan-gu) pkg: *
+
+Piotr Skamruk <piotr.skamruk@gmail.com> (@jellonek) pkg: *kvm*

From e1b3a1b04ee4c49b40d8b650dc72406d16fc67cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 31 May 2016 13:24:28 +0200
Subject: [PATCH 0349/1304] functional tests: print details on check-cgroup
 error

---
 tests/inspect/inspect.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 6b66e80d9d..5899fb0218 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -380,7 +380,7 @@ func main() {
 
 		for _, p := range testPaths {
 			if err := syscall.Mkdir(filepath.Join(p, "test"), 0600); err == nil || err != syscall.EROFS {
-				fmt.Println("check-cgroups: FAIL")
+				fmt.Fprintf(os.Stderr, "check-cgroups: FAIL (%v)", err)
 				os.Exit(1)
 			}
 		}

From 6fa67781a0eaf732350c2023dd0c396becc827ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 31 May 2016 13:54:21 +0200
Subject: [PATCH 0350/1304] functional tests: fix check-cgroup on inspect

We're not mounting `/sys/fs/cgroup` on stage2 anymore so this check
doesn't make sense. Let's just check on
`/proc/1/root/sys/fs/cgroup/...`.
---
 tests/inspect/inspect.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 5899fb0218..b8140233e2 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -371,10 +371,10 @@ func main() {
 		testPaths := []string{rootCgroupPath}
 
 		// test a couple of controllers if they're available
-		if cgroup.IsIsolatorSupported("memory") {
+		if _, err := os.Stat(filepath.Join(rootCgroupPath, "memory")); err == nil {
 			testPaths = append(testPaths, filepath.Join(rootCgroupPath, "memory"))
 		}
-		if cgroup.IsIsolatorSupported("cpu") {
+		if _, err := os.Stat(filepath.Join(rootCgroupPath, "cpu")); err == nil {
 			testPaths = append(testPaths, filepath.Join(rootCgroupPath, "cpu"))
 		}
 

From 9f8471640c31bbf7b6384555b8c6d881abed75fe Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 31 May 2016 11:26:28 +0200
Subject: [PATCH 0351/1304] MAINTAINERS: remove @vcaputo for now

Vito is not currently actively working on the project so remove him for
now. He'll be gladly welcomed back as a maintainer at any time if he
wishes to resume involvement.
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index f05557c361..c99999bc20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9,7 +9,6 @@ Luca Bruno <luca.bruno@coreos.com> (@lucab) pkg: *
 Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak) pkg: *
 Stefan Junker <stefan.junker@coreos.com> (@steveeJ) pkg: *
 Tamer Tas <tamer.tas@coreos.com> (@tmrts) pkg: *
-Vito Caputo <vito.caputo@coreos.com> (@vcaputo) pkg: *
 Yifan Gu <yifan.gu@coreos.com> (@yifan-gu) pkg: *
 
 Piotr Skamruk <piotr.skamruk@gmail.com> (@jellonek) pkg: *kvm*

From d2c085c4827195f54c30599dd1c3b680adcd0d41 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 31 May 2016 13:34:24 +0200
Subject: [PATCH 0352/1304] MAINTAINERS: update Krzesimir's email address

---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index c99999bc20..18df4b9f75 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,7 +4,7 @@ Derek Gonyeo <derek.gonyeo@coreos.com> (@dgonyeo) pkg: *
 Euan Kemp <euan.kemp@coreos.com> (@euank) pkg: *
 Iago López Galeiras <iago.lopez@coreos.com> (@iaguis) pkg: *
 Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle) pkg: *
-Krzesimir Nowak <krzesimir.nowak@coreos.com> (@krnowak) pkg: *
+Krzesimir Nowak <krzesimir@kinvolk.io> (@krnowak) pkg: *
 Luca Bruno <luca.bruno@coreos.com> (@lucab) pkg: *
 Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak) pkg: *
 Stefan Junker <stefan.junker@coreos.com> (@steveeJ) pkg: *

From c8ed37e883df0fe40a146e43d40925c361950f79 Mon Sep 17 00:00:00 2001
From: Josh Wood <j@coreos.com>
Date: Tue, 31 May 2016 14:27:59 -0700
Subject: [PATCH 0353/1304] Documentation: Fix issues from downstream: fmt and
 link

- Fix formatting of code blocks and lists in capabilities doc
- Fix broken link to networking/overview.
---
 Documentation/capabilities-guide.md | 36 ++++++++++++++++-------------
 Documentation/subcommands/run.md    |  2 +-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Documentation/capabilities-guide.md b/Documentation/capabilities-guide.md
index 5ca541aec0..4dec8194cd 100644
--- a/Documentation/capabilities-guide.md
+++ b/Documentation/capabilities-guide.md
@@ -24,8 +24,9 @@ Once running, each process has a bounding set of capabilities which it can
 enable and use; such process cannot get further capabilities outside of this set.
 
 In the context of containers, capabilities are useful for:
- * restricting the effective privileges of applications running as root
- * allowing applications to perform specific privileged operations, without
+
+* Restricting the effective privileges of applications running as root
+* Allowing applications to perform specific privileged operations, without
    having to run them as root
 
 For the complete list of existing Linux capabilities and a detailed description
@@ -36,7 +37,7 @@ of this security mechanism, see [capabilities(7)](http://man7.org/linux/man-page
 By default, rkt enforces [a default set of
 capabilities](https://github.com/appc/spec/blob/master/spec/ace.md#oslinuxcapabilities-remove-set)
 onto applications.
-This default set is tailored to stop applications from performing a large 
+This default set is tailored to stop applications from performing a large
 variety of privileged actions, while not impacting their normal behavior.
 Operations which are typically not needed in containers and which may
 impact host state, eg. invoking `reboot(2)`, are denied in this way.
@@ -50,12 +51,13 @@ of the customizable isolators available in rkt.
 
 When running Linux containers, rkt provides two mutually exclusive isolators
 to define the bounding set under which an application will be run:
- * `os/linux/capabilities-retain-set`
- * `os/linux/capabilities-remove-set`
+
+* `os/linux/capabilities-retain-set`
+* `os/linux/capabilities-remove-set`
 
 Those isolators cover different use-cases and employ different techniques to
 achieve the same goal of limiting available capabilities. As such, they cannot
-be used together at the same time, and recommended usage varies on a 
+be used together at the same time, and recommended usage varies on a
 case-by-case basis.
 
 As the granularity of capabilities varies for specific permission cases, a word
@@ -69,12 +71,12 @@ Many other ways to maliciously transition across capabilities have already been
 
 ### Retain-set
 
-`os/linux/capabilities-retain-set` allows for an additive approach to 
+`os/linux/capabilities-retain-set` allows for an additive approach to
 capabilities: applications will be stripped of all capabilities, except the ones
 listed in this isolator.
 
 This whitelisting approach is useful for completely locking down environments
-and whenever application requirements (in terms of capabilities) are 
+and whenever application requirements (in terms of capabilities) are
 well-defined in advance. It allows one to ensure that exactly and only the
 specified capabilities could ever be used.
 
@@ -84,7 +86,7 @@ its "retain-set".
 
 ### Remove-set
 
-`os/linux/capabilities-remove-set` tackles capabilities in a subtractive way: 
+`os/linux/capabilities-remove-set` tackles capabilities in a subtractive way:
 starting from the default set of capabilities, single entries can be further
 forbidden in order to prevent specific actions.
 
@@ -92,7 +94,7 @@ This blacklisting approach is useful to somehow limit applications which have
 broad requirements in terms of privileged operations, in order to deny some
 potentially malicious operations.
 
-For example, an application that will need to perform multiple privileged 
+For example, an application that will need to perform multiple privileged
 operations but is known to never open a raw socket, will have
 `CAP_NET_RAW` specified in its "remove-set".
 
@@ -105,12 +107,12 @@ CoreOS which ships with `ping` and `nc` commands (from busybox). Those
 commands respectively requires `CAP_NET_RAW` and `CAP_NET_BIND_SERVICE`
 capabilities in order to perform privileged operations.
 To block their usage, capabilities bounding set
-can be manipulated via `os/linux/capabilities-remove-set` or 
+can be manipulated via `os/linux/capabilities-remove-set` or
 `os/linux/capabilities-retain-set`; both approaches are shown here.
 
 ### Removing specific capabilities
 
-This example shows how to block `ping` only, by removing `CAP_NET_RAW` from 
+This example shows how to block `ping` only, by removing `CAP_NET_RAW` from
 capabilities bounding set.
 
 First, a local image is built with an explicit "remove-set" isolator.
@@ -129,8 +131,9 @@ $ acbuild end
 
 Once properly built, this image can be run in order to check that `ping` usage has
 been effectively disabled:
+
 ```
-$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci 
+$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci
 image: using image from file stage1-coreos.aci
 image: using image from file caps-remove-set-example.aci
 image: using image from local store for image name quay.io/coreos/alpine-sh
@@ -146,8 +149,9 @@ ping: permission denied (are you root?)
 This means that `CAP_NET_RAW` had been effectively disabled inside the container.
 At the same time, `CAP_NET_BIND_SERVICE` is still available in the default bounding
 set, so the `nc` command will be able to bind to port 80:
+
 ```
-$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci 
+$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci
 image: using image from file stage1-coreos.aci
 image: using image from file caps-remove-set-example.aci
 image: using image from local store for image name quay.io/coreos/alpine-sh
@@ -184,7 +188,7 @@ Once run, it can be easily verified that `ping` from inside the container is now
 functional:
 
 ```
-$ sudo rkt run --interactive --insecure-options=image caps-retain-set-example.aci 
+$ sudo rkt run --interactive --insecure-options=image caps-retain-set-example.aci
 image: using image from file stage1-coreos.aci
 image: using image from file caps-retain-set-example.aci
 image: using image from local store for image name quay.io/coreos/alpine-sh
@@ -206,7 +210,7 @@ For example, using `nc` to bind to port 80 will now result in a failure due to
 the missing `CAP_NET_BIND_SERVICE` capability:
 
 ```
-$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci 
+$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci
 image: using image from file stage1-coreos.aci
 image: using image from file caps-remove-set-example.aci
 image: using image from local store for image name quay.io/coreos/alpine-sh
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 1ffb5b0629..ee3c2f7cc5 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -309,7 +309,7 @@ Strictly seen, this is only true when `rkt run` is invoked on the host directly,
 
 ### Other Networking Examples
 
-More details about rkt's networking options and examples can be found in the [networking documentation](https://github.com/coreos/rkt/blob/master/Documentation/networking.md)
+More details about rkt's networking options and examples can be found in the [networking documentation](../networking/overview.md)
 
 ## Run rkt as a Daemon
 

From 915720def3e2d59ed44bdd32b18bad71886b5880 Mon Sep 17 00:00:00 2001
From: Josh Wood <j@coreos.com>
Date: Tue, 31 May 2016 15:22:16 -0700
Subject: [PATCH 0354/1304] Doc/devel/stage1-implementors-guide: Fix heading
 fmt

Switch to all atx-style markdown for headings and sort the hierarchy.
Ref https://github.com/coreos/rkt/issues/2707
---
 .../devel/stage1-implementors-guide.md        | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index eda3915d68..daaf58f4e1 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -1,8 +1,6 @@
-Stage1 ACI implementor's guide
-=============================
+# Stage1 ACI implementor's guide
 
-Background
-----------
+## Background
 
 rkt's execution of pods is divided roughly into three separate stages:
 
@@ -25,8 +23,7 @@ Stage1 is the vehicle for getting there from stage0.
 For any given pod instance, stage1 may be replaced by a completely different implementation.
 This allows users to employ different containment strategies on the same host running the same interchangeable ACIs.
 
-Entrypoints
------------
+## Entrypoints
 
 ### `rkt run` => `coreos.com/rkt/stage1/run`
 
@@ -47,7 +44,7 @@ Systemd-nspawn then boots the stage1 systemd with the just-written unit files fo
 The `/init` program's primary job is translating a pod manifest to systemd-nspawn systemd.services.
 
 An alternative stage1 could forego systemd-nspawn and systemd altogether, or retain these and introduce something like novm or qemu-kvm for greater isolation by first starting a VM.
-All that is required is an executable at the place indicated by the `coreos.com/rkt/stage1/run` entrypoint that knows how to apply the pod manifest and prepared ACI file-systems to good effect.
+All that is required is an executable at the place indicated by the `coreos.com/rkt/stage1/run` entrypoint that knows how to apply the pod manifest and prepared ACI file-systems.
 
 The resolved entrypoint must inform rkt of its PID for the benefit of `rkt enter`.
 Stage1 implementors have two options for doing so; only one must be implemented:
@@ -65,7 +62,7 @@ Stage1 implementors have two options for doing so; only one must be implemented:
 * `--local-config=$PATH` to override the local configuration directory
 * `--private-users=$SHIFT` to define a UID/GID shift when using user namespaces. SHIFT is a two-value colon-separated parameter, the first value is the first host UID to assign to the container and the second one is the number of host UIDs to assign.
 
-##### Arguments added in interface version 2
+#### Arguments added in interface version 2
 
 * `--hostname=$HOSTNAME` configures the host name of the pod. If empty, it will be "rkt-$PODUUID".
 
@@ -101,16 +98,14 @@ For example, it removes the network namespace of a pod.
 * `--debug` to activate debugging
 * UUID of the pod
 
-Versioning
-----------
+## Versioning
 
 The stage1 command line interface is versioned using an annotation with the name `coreos.com/rkt/stage1/interface-version`.
 If the annotation is not present, rkt assumes the version is 1.
 
 The current version of the stage1 interface is 2.
 
-Examples
---------
+## Examples
 
 ### Stage1 ACI manifest
 

From 5063cde45cf6bb930e5c0dd7fa7426301cd0ca92 Mon Sep 17 00:00:00 2001
From: John Pettigrew <john.pettigrew404@gmail.com>
Date: Tue, 31 May 2016 20:05:33 -0500
Subject: [PATCH 0355/1304] Don't remove the cleanSrc if it equals '.'

This fixes the issue where when cleanSrc equals '.', copied files are missing the first character from their names.

Fixes appc/acbuild#211
---
 pkg/fileutil/fileutil.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go
index 9b22e5e12f..ec4b234d13 100644
--- a/pkg/fileutil/fileutil.go
+++ b/pkg/fileutil/fileutil.go
@@ -62,13 +62,15 @@ func CopySymlink(src, dest string) error {
 
 func CopyTree(src, dest string, uidRange *user.UidRange) error {
 	cleanSrc := filepath.Clean(src)
-
 	dirs := make(map[string][]syscall.Timespec)
 	copyWalker := func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 		rootLess := path[len(cleanSrc):]
+		if cleanSrc == "." {
+			rootLess = path
+		}
 		target := filepath.Join(dest, rootLess)
 		mode := info.Mode()
 		switch {

From 967b6a6c7cb42b82c6c9e5719aa08bfbf2223da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 1 Jun 2016 10:59:18 +0200
Subject: [PATCH 0356/1304] pkg/selinux: fix TestSELinux

TestSELinux was not setting the MCS dir which caused the paths of every
MCS to be in the root of the file system (the path is calculated as
fmt.Sprintf("%s/%s", mcsdir, mcs) and mcsdir was the empty string by
default). This was making the test to fail when it runs as non-root.

The test failure was non-obvious because of the way the algorithm to get
a unique MCS is implemented. We first try to create the MCS file with a
random category pair and, if it doesn't work, we continue with a
different random category pair. Since we can't write to the MCS
directory, we'll continue doing this until the test times out and we
don't print any errors when we can't create the MCS file.

Also, clean up test code a bit.
---
 pkg/selinux/selinux_test.go | 109 ++++++++++++++++++++----------------
 1 file changed, 60 insertions(+), 49 deletions(-)

diff --git a/pkg/selinux/selinux_test.go b/pkg/selinux/selinux_test.go
index f63d19bc61..38c9b6cdc1 100644
--- a/pkg/selinux/selinux_test.go
+++ b/pkg/selinux/selinux_test.go
@@ -1,3 +1,4 @@
+// Copyright 2016 The rkt Authors
 // Copyright 2014,2015 Red Hat, Inc
 // Copyright 2014,2015 Docker, Inc
 //
@@ -18,66 +19,76 @@
 package selinux_test
 
 import (
+	"fmt"
+	"io/ioutil"
 	"os"
 	"testing"
 
 	"github.com/coreos/rkt/pkg/selinux"
 )
 
-func testSetfilecon(t *testing.T) {
-	if selinux.SelinuxEnabled() {
-		tmp := "selinux_test"
-		out, _ := os.OpenFile(tmp, os.O_WRONLY, 0)
-		out.Close()
-		err := selinux.Setfilecon(tmp, "system_u:object_r:bin_t:s0")
-		if err != nil {
-			t.Log("Setfilecon failed")
-			t.Fatal(err)
-		}
-		os.Remove(tmp)
+func TestSetfilecon(t *testing.T) {
+	if !selinux.SelinuxEnabled() {
+		t.Skip("SELinux not enabled")
+	}
+
+	f, err := ioutil.TempFile("", "rkt-selinux-test")
+	if err != nil {
+		panic(fmt.Sprintf("unable to create tempfile: %v", err))
+	}
+	f.Close()
+	defer os.Remove(f.Name())
+	err = selinux.Setfilecon(f.Name(), "system_u:object_r:bin_t:s0")
+	if err != nil {
+		t.Log("Setfilecon failed")
+		t.Fatal(err)
 	}
 }
 
 func TestSELinux(t *testing.T) {
-	var (
-		err            error
-		plabel, flabel string
-	)
+	if !selinux.SelinuxEnabled() {
+		t.Skip("SELinux not enabled")
+	}
 
-	if selinux.SelinuxEnabled() {
-		t.Log("Enabled")
-		plabel, flabel = selinux.GetLxcContexts()
-		if plabel == "" {
-			t.Log("No lxc contexts, skipping tests")
-			return
-		}
-		t.Log(plabel)
-		t.Log(flabel)
-		selinux.FreeLxcContexts(plabel)
-		plabel, flabel = selinux.GetLxcContexts()
-		t.Log(plabel)
-		t.Log(flabel)
-		selinux.FreeLxcContexts(plabel)
-		t.Log("getenforce ", selinux.SelinuxGetEnforce())
-		t.Log("getenforcemode ", selinux.SelinuxGetEnforceMode())
-		pid := os.Getpid()
-		t.Logf("PID:%d MCS:%s\n", pid, selinux.IntToMcs(pid, 1023))
-		err = selinux.Setfscreatecon("unconfined_u:unconfined_r:unconfined_t:s0")
-		if err == nil {
-			t.Log(selinux.Getfscreatecon())
-		} else {
-			t.Log("setfscreatecon failed", err)
-			t.Fatal(err)
-		}
-		err = selinux.Setfscreatecon("")
-		if err == nil {
-			t.Log(selinux.Getfscreatecon())
-		} else {
-			t.Log("setfscreatecon failed", err)
-			t.Fatal(err)
-		}
-		t.Log(selinux.Getpidcon(1))
+	dir, err := ioutil.TempDir("", "rkt-selinux-test")
+	if err != nil {
+		panic(fmt.Sprintf("unable to create temp dir: %v", err))
+	}
+	defer os.RemoveAll(dir)
+	if err := selinux.SetMCSDir(dir); err != nil {
+		t.Errorf("error setting MCS directory: %v", err)
+	}
+
+	var plabel, flabel string
+
+	plabel, flabel = selinux.GetLxcContexts()
+	if plabel == "" {
+		t.Skip("No LXC contexts, skipping tests")
+	}
+	t.Log(plabel)
+	t.Log(flabel)
+	selinux.FreeLxcContexts(plabel)
+	plabel, flabel = selinux.GetLxcContexts()
+	t.Log(plabel)
+	t.Log(flabel)
+	selinux.FreeLxcContexts(plabel)
+	t.Log("getenforce ", selinux.SelinuxGetEnforce())
+	t.Log("getenforcemode ", selinux.SelinuxGetEnforceMode())
+	pid := os.Getpid()
+	t.Logf("PID:%d MCS:%s\n", pid, selinux.IntToMcs(pid, 1023))
+	err = selinux.Setfscreatecon("unconfined_u:unconfined_r:unconfined_t:s0")
+	if err == nil {
+		t.Log(selinux.Getfscreatecon())
+	} else {
+		t.Log("setfscreatecon failed", err)
+		t.Fatal(err)
+	}
+	err = selinux.Setfscreatecon("")
+	if err == nil {
+		t.Log(selinux.Getfscreatecon())
 	} else {
-		t.Log("Disabled")
+		t.Log("setfscreatecon failed", err)
+		t.Fatal(err)
 	}
+	t.Log(selinux.Getpidcon(1))
 }

From b4bc6c6a9efbbdb4e2f6b8f01c205ce6d0172224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 1 Jun 2016 11:00:39 +0200
Subject: [PATCH 0357/1304] pkg/selinux: cleanup

---
 pkg/label/label_selinux.go  |  5 +++-
 pkg/selinux/selinux.go      | 52 ++++++++++++++++++-------------------
 pkg/selinux/selinux_test.go | 10 +++++--
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/pkg/label/label_selinux.go b/pkg/label/label_selinux.go
index 4992125545..a806f40352 100644
--- a/pkg/label/label_selinux.go
+++ b/pkg/label/label_selinux.go
@@ -34,7 +34,10 @@ func InitLabels(options []string) (string, string, error) {
 	if !selinux.SelinuxEnabled() {
 		return "", "", nil
 	}
-	processLabel, mountLabel := selinux.GetLxcContexts()
+	processLabel, mountLabel, err := selinux.GetLxcContexts()
+	if err != nil {
+		return "", "", err
+	}
 	if processLabel != "" {
 		pcon := selinux.NewContext(processLabel)
 		mcon := selinux.NewContext(mountLabel)
diff --git a/pkg/selinux/selinux.go b/pkg/selinux/selinux.go
index 0e05621918..a1b182a965 100644
--- a/pkg/selinux/selinux.go
+++ b/pkg/selinux/selinux.go
@@ -1,3 +1,4 @@
+// Copyright 2016 The rkt Authors
 // Copyright 2014,2015 Red Hat, Inc
 // Copyright 2014,2015 Docker, Inc
 //
@@ -21,7 +22,6 @@ import (
 	"bufio"
 	"crypto/rand"
 	"encoding/binary"
-	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -32,7 +32,6 @@ import (
 	"syscall"
 
 	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/hashicorp/errwrap"
 )
 
 const (
@@ -55,6 +54,8 @@ var (
 	selinuxEnabled        = false // Stores whether selinux is currently enabled
 	selinuxEnabledChecked = false // Stores whether selinux enablement has been checked or established yet
 	mcsdir                = ""    // Directory to use for MCS storage
+
+	errMCSAlreadyExists = fmt.Errorf("MCS label already exists")
 )
 
 type SELinuxContext map[string]string
@@ -281,10 +282,9 @@ func mcsAdd(mcs string) error {
 	file, err := os.OpenFile(filename, os.O_CREATE|os.O_EXCL|os.O_RDONLY, 0644)
 	if err != nil {
 		if os.IsExist(err) {
-			return fmt.Errorf("MCS label already exists")
-		} else {
-			return errwrap.Wrap(errors.New("unable to test MCS"), err)
+			return errMCSAlreadyExists
 		}
+		return fmt.Errorf("unable to create MCS: %v", err)
 	}
 	file.Close()
 	return nil
@@ -324,34 +324,33 @@ func IntToMcs(id int, catRange uint32) string {
 	return fmt.Sprintf("s0:c%d,c%d", TIER, ORD)
 }
 
-func uniqMcs(catRange uint32) string {
+func makeUniqueMcs(catRange uint32) (string, error) {
 	var (
 		n      uint32
 		c1, c2 uint32
 		mcs    string
+		tries  = 1000000
+		err    error
 	)
 
-	for {
+	for i := 0; i < tries; i++ {
 		binary.Read(rand.Reader, binary.LittleEndian, &n)
 		c1 = n % catRange
 		binary.Read(rand.Reader, binary.LittleEndian, &n)
 		c2 = n % catRange
 		if c1 == c2 {
 			continue
-		} else {
-			if c1 > c2 {
-				t := c1
-				c1 = c2
-				c2 = t
-			}
+		}
+		if c1 > c2 {
+			c1, c2 = c2, c1
 		}
 		mcs = fmt.Sprintf("s0:c%d,c%d", c1, c2)
-		if err := mcsAdd(mcs); err != nil {
-			continue
+		err = mcsAdd(mcs)
+		if err == nil {
+			return mcs, nil
 		}
-		break
 	}
-	return mcs
+	return "", fmt.Errorf("couldn't generate unique MCS after %d tries! (last err=%v)", tries, err)
 }
 
 func FreeLxcContexts(scon string) {
@@ -361,19 +360,19 @@ func FreeLxcContexts(scon string) {
 	}
 }
 
-func GetLxcContexts() (processLabel string, fileLabel string) {
+func GetLxcContexts() (processLabel string, fileLabel string, err error) {
 	var (
 		val, key string
 		bufin    *bufio.Reader
 	)
 
 	if !SelinuxEnabled() {
-		return "", ""
+		return "", "", nil
 	}
 	lxcPath := fmt.Sprintf("%s/contexts/lxc_contexts", getSELinuxPolicyRoot())
 	in, err := os.Open(lxcPath)
 	if err != nil {
-		return "", ""
+		return "", "", nil
 	}
 	defer in.Close()
 
@@ -409,19 +408,21 @@ func GetLxcContexts() (processLabel string, fileLabel string) {
 	}
 
 	if processLabel == "" || fileLabel == "" {
-		return "", ""
+		return "", "", nil
 	}
 
 exit:
-	//	mcs := IntToMcs(os.Getpid(), 1024)
-	mcs := uniqMcs(1024)
+	mcs, err := makeUniqueMcs(1024)
+	if err != nil {
+		return "", "", err
+	}
 	scon := NewContext(processLabel)
 	scon["level"] = mcs
 	processLabel = scon.Get()
 	scon = NewContext(fileLabel)
 	scon["level"] = mcs
 	fileLabel = scon.Get()
-	return processLabel, fileLabel
+	return processLabel, fileLabel, nil
 }
 
 func SecurityCheckContext(val string) error {
@@ -507,6 +508,5 @@ func DisableSecOpt() []string {
 // Set the directory used for storage of used MCS contexts
 func SetMCSDir(arg string) error {
 	mcsdir = arg
-	err := os.MkdirAll(mcsdir, 0755)
-	return err
+	return os.MkdirAll(mcsdir, 0755)
 }
diff --git a/pkg/selinux/selinux_test.go b/pkg/selinux/selinux_test.go
index 38c9b6cdc1..f0e6781b10 100644
--- a/pkg/selinux/selinux_test.go
+++ b/pkg/selinux/selinux_test.go
@@ -61,14 +61,20 @@ func TestSELinux(t *testing.T) {
 
 	var plabel, flabel string
 
-	plabel, flabel = selinux.GetLxcContexts()
+	plabel, flabel, err = selinux.GetLxcContexts()
+	if err != nil {
+		t.Fatal(err)
+	}
 	if plabel == "" {
 		t.Skip("No LXC contexts, skipping tests")
 	}
 	t.Log(plabel)
 	t.Log(flabel)
 	selinux.FreeLxcContexts(plabel)
-	plabel, flabel = selinux.GetLxcContexts()
+	plabel, flabel, err = selinux.GetLxcContexts()
+	if err != nil {
+		t.Fatal(err)
+	}
 	t.Log(plabel)
 	t.Log(flabel)
 	selinux.FreeLxcContexts(plabel)

From 926b4f566bf26e919ea9694dbd493fb99443cc45 Mon Sep 17 00:00:00 2001
From: Josh Wood <j@coreos.com>
Date: Tue, 31 May 2016 15:22:16 -0700
Subject: [PATCH 0358/1304] Doc/devel/stage1-implementors-guide: Fix heading
 fmt

Switch to all atx-style markdown for headings and sort the hierarchy.
Ref https://github.com/coreos/rkt/issues/2707
---
 .../devel/stage1-implementors-guide.md        | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index eda3915d68..81444b70ed 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -1,8 +1,6 @@
-Stage1 ACI implementor's guide
-=============================
+# Stage1 ACI implementor's guide
 
-Background
-----------
+## Background
 
 rkt's execution of pods is divided roughly into three separate stages:
 
@@ -25,10 +23,11 @@ Stage1 is the vehicle for getting there from stage0.
 For any given pod instance, stage1 may be replaced by a completely different implementation.
 This allows users to employ different containment strategies on the same host running the same interchangeable ACIs.
 
-Entrypoints
------------
+## Entrypoints
 
-### `rkt run` => `coreos.com/rkt/stage1/run`
+### rkt run
+
+`coreos.com/rkt/stage1/run`
 
 1. rkt prepares the pod's stage1 and stage2 images and pod manifest under `/var/lib/rkt/pods/prepare/$uuid`, acquiring an exclusive advisory lock on the directory.
    Upon a successful preparation, the directory will be renamed to `/var/lib/rkt/pods/run/$uuid`.
@@ -59,17 +58,19 @@ Stage1 implementors have two options for doing so; only one must be implemented:
 
 * `--debug` to activate debugging
 * `--net[=$NET1,$NET2,...]` to configure the creation of a contained network.
-  See the [rkt networking documentation](../networking.md) for details.
+  See the [rkt networking documentation](../networking.html) for details.
 * `--mds-token=$TOKEN` passes the auth token to the apps via `AC_METADATA_URL` env var
 * `--interactive` to run a pod interactively, that is, pass standard input to the application (only for pods with one application)
 * `--local-config=$PATH` to override the local configuration directory
 * `--private-users=$SHIFT` to define a UID/GID shift when using user namespaces. SHIFT is a two-value colon-separated parameter, the first value is the first host UID to assign to the container and the second one is the number of host UIDs to assign.
 
-##### Arguments added in interface version 2
+#### Arguments added in interface version 2
 
 * `--hostname=$HOSTNAME` configures the host name of the pod. If empty, it will be "rkt-$PODUUID".
 
-### `rkt enter` => `coreos.com/rkt/stage1/enter`
+### rkt enter
+
+`coreos.com/rkt/stage1/enter`
 
 1. rkt verifies the pod and image to enter are valid and running
 2. chdirs to `/var/lib/rkt/pods/run/$uuid`
@@ -91,7 +92,9 @@ An alternative stage1 would need to do whatever is appropriate for entering the
 4. cmd to execute.
 5. optionally, any cmd arguments.
 
-### `rkt gc` => `coreos.com/rkt/stage1/gc`
+### rkt gc
+
+`coreos.com/rkt/stage1/gc`
 
 The gc entrypoint deals with garbage collecting resources allocated by stage1.
 For example, it removes the network namespace of a pod.
@@ -101,16 +104,14 @@ For example, it removes the network namespace of a pod.
 * `--debug` to activate debugging
 * UUID of the pod
 
-Versioning
-----------
+## Versioning
 
 The stage1 command line interface is versioned using an annotation with the name `coreos.com/rkt/stage1/interface-version`.
 If the annotation is not present, rkt assumes the version is 1.
 
 The current version of the stage1 interface is 2.
 
-Examples
---------
+## Examples
 
 ### Stage1 ACI manifest
 
@@ -159,20 +160,26 @@ Examples
 The following paths are reserved for the stage1 image, and they will be created during stage0.
 When creating a stage1 image, developers SHOULD NOT create or use these paths in the image's filesystem.
 
-### opt/stage2
+### stage2
+
+`opt/stage2`
 
 This directory path is used for extracting the ACI of every app in the pod.
 Each app's rootfs will appear under this directory,
 e.g. `/var/lib/rkt/pods/run/$uuid/stage1/rootfs/opt/stage2/$appname/rootfs`.
 
-### rkt/status
+### status
+
+`rkt/status`
 
 This directory path is used for storing the apps' exit statuses.
 For example, if an app named `foo` exits with status = `42`, stage1 should write `42`
 in `/var/lib/rkt/pods/run/$uuid/stage1/rootfs/rkt/status/foo`.
 Later the exit status can be retrieved and shown by `rkt status $uuid`.
 
-### rkt/env
+### env
+
+`rkt/env`
 
 This directory path is used for passing environment variables to each app.
 For example, environment variables for an app named `foo` will be stored in `rkt/env/foo`.

From 226eae1bc9df7926a6fd89bd1cb2312ad31945c8 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@coreos.com>
Date: Wed, 1 Jun 2016 16:37:32 -0700
Subject: [PATCH 0359/1304] api_service: Only fill in image info if we have it

Fixes #2738
---
 rkt/api_service.go | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 22182908b4..ff328a5877 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -442,16 +442,7 @@ func fillAppInfo(store *store.Store, p *pod, v1pod *v1alpha.Pod) {
 			stderr.PrintE(fmt.Sprintf("failed to resolve the image ID %q", app.Image.Id), err)
 		}
 
-		im, err := p.getAppImageManifest(*types.MustACName(app.Name))
-		if err != nil {
-			stderr.PrintE(fmt.Sprintf("failed to get image manifests for app %q", app.Name), err)
-		}
-
-		version, ok := im.Labels.Get("version")
-		if !ok {
-			version = "latest"
-		}
-
+		// The following information is always known
 		app.Image = &v1alpha.Image{
 			BaseFormat: &v1alpha.ImageFormat{
 				// Only support appc image now. If it's a docker image, then it
@@ -459,11 +450,22 @@ func fillAppInfo(store *store.Store, p *pod, v1pod *v1alpha.Pod) {
 				Type:    v1alpha.ImageType_IMAGE_TYPE_APPC,
 				Version: schema.AppContainerVersion.String(),
 			},
-			Id:      fullImageID,
-			Name:    im.Name.String(),
-			Version: version,
+			Id: fullImageID,
 			// Other information are not available because they require the image
-			// info from store.
+			// info from store. Some of it is filled in below if possible.
+		}
+
+		im, err := p.getAppImageManifest(*types.MustACName(app.Name))
+		if err != nil {
+			stderr.PrintE(fmt.Sprintf("failed to get image manifests for app %q", app.Name), err)
+		} else {
+			app.Image.Name = im.Name.String()
+
+			version, ok := im.Labels.Get("version")
+			if !ok {
+				version = "latest"
+			}
+			app.Image.Version = version
 		}
 
 		if readStatus {

From 96fcd97d4d6b7723a1d65b028a1fc6aa089fd461 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@coreos.com>
Date: Wed, 1 Jun 2016 16:39:04 -0700
Subject: [PATCH 0360/1304] tests/api_service: Add list partial pod test

This test verifies that a partial pod (one with an apps manifest file
unreadable) does not cause the api service to panic
---
 tests/rkt_api_service_test.go | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 1cd172f8ef..60182a5594 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -437,6 +437,38 @@ func NewAPIServiceListInspectPodsTest() testutils.Test {
 		for _, p := range resp.Pods {
 			checkPodDetails(t, ctx, p)
 		}
+
+		// ListPods with corrupt pod directory
+		// Note that we don't checkPodDetails here, the failure this is testing is
+		// the api server panicing, which results in a list call hanging for ages
+		// and then failing.
+		// TODO: do further validation on the partial pods returned
+		for _, p := range resp.Pods {
+			numRemoved := 0
+			podDir := getPodDir(t, ctx, p.Id)
+			filepath.Walk(filepath.Join(podDir, "appsinfo"), filepath.WalkFunc(func(path string, info os.FileInfo, err error) error {
+				if err != nil {
+					return err
+				}
+				if info.Name() == "manifest" {
+					os.Remove(path)
+					numRemoved++
+				}
+				return nil
+			}))
+			if numRemoved == 0 {
+				t.Fatalf("Expected to remove at least one app manifest for pod %v", p)
+			}
+		}
+
+		// ListPods(detail=true).
+		resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{Detail: true})
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+		if len(resp.Pods) != len(podManifests) {
+			t.Fatalf("Expected %v pods, got %v pods", len(podManifests), len(resp.Pods))
+		}
 	})
 }
 

From 4abed9fe72e9806ef05054e547d162c883d0d16d Mon Sep 17 00:00:00 2001
From: Josh Wood <j@coreos.com>
Date: Thu, 2 Jun 2016 18:32:46 -0700
Subject: [PATCH 0361/1304] Documentation/subcmd/rm: Correct --uuid-file-save
 typo

---
 Documentation/subcommands/rm.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/rm.md b/Documentation/subcommands/rm.md
index 30b888201f..005825870a 100644
--- a/Documentation/subcommands/rm.md
+++ b/Documentation/subcommands/rm.md
@@ -11,7 +11,7 @@ Instead of passing UUID on command line, rm command can read the UUID from a tex
 This can be paired with `--uuid-file-save` to remove pods by name:
 
 ```
-rkt run --uuid-files-save=/run/rkt-uuids/mypod ...
+rkt run --uuid-file-save=/run/rkt-uuids/mypod ...
 rkt rm --uuid-file=/run/rkt-uuids/mypod
 ```
 

From fc4753436500238a6a4d4d925536b1e63917c4e9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 2 Jun 2016 12:49:04 +0200
Subject: [PATCH 0362/1304] docs: document rkt release cycle

This tries to document current release model, tentatively
introducing a buffer day to stabilize the release and better
plan next ones.
---
 Documentation/devel/release.md | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index 8e6fdeae59..4c2347a6ca 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -1,9 +1,24 @@
 # rkt release guide
 
-How to perform a release of rkt.
-This guide is probably unnecessarily verbose, so improvements welcomed.
-Only parts of the procedure are automated; this is somewhat intentional (manual steps for sanity checking) but it can probably be further scripted, please help.
+## Release cycle
+
+This section describes the typical release cycle of rkt:
+
+1. A GitHub [milestone](https://github.com/coreos/rkt/milestones) sets the target date for a future rkt release. Releases occur approximately every two to three weeks.
+2. Issues grouped into the next release milestone are worked on in order of priority.
+3. Changes are submitted for review in the form of a GitHub Pull Request (PR). Each PR undergoes review and must pass continuous integration (CI) tests before being accepted and merged into the main line of rkt source code.
+4. The day before each release is a short code freeze during which no new code or dependencies may be merged. Instead, this period focuses on polishing the release, with tasks concerning:
+  * Documentation
+  * Usability tests
+  * Issues triaging
+  * Roadmap planning and scheduling the next release milestone
+  * Organizational and backlog review
+  * Build, distribution, and install testing by release manager
 
+## Release process
+
+This section shows how to perform a release of rkt.
+Only parts of the procedure are automated; this is somewhat intentional (manual steps for sanity checking) but it can probably be further scripted, please help.
 The following example assumes we're going from version 1.1.0 (`v1.1.0`) to 1.2.0 (`v1.2.0`).
 
 Let's get started:

From e9e31ae2ca66566f21726e9fe05987460247ad64 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 3 Jun 2016 13:22:08 +0200
Subject: [PATCH 0363/1304] stage1: split out procfs restrictions logic

`appToSystemd()` is already quite large and will keep growing when adding new
procfs restrictions. This commit refactors filtering logic in its own function.
Ref #2616
---
 stage1/init/common/pod.go | 78 +++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 5895e24fdf..814dcb047b 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -457,42 +457,8 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
 	}
 
-	// Restrict access to some security-sensitive paths under /proc and /sys.
-	// Those entries can be hidden or just made read-only to app.
-	roPaths := []string{
-		"/proc/sys/kernel/core_pattern",
-		"/proc/sys/kernel/modprobe",
-		"/proc/sys/vm/panic_on_oom",
-		"/proc/sysrq-trigger",
-		"/sys/block/",
-		"/sys/bus/",
-		"/sys/class/",
-		"/sys/dev/",
-		"/sys/devices/",
-		"/sys/kernel/",
-	}
-	hiddenPaths := []string{
-		// TODO(lucab): file-paths restrictions need support in systemd first
-		//"/proc/config.gz",
-		//"/proc/kallsyms",
-		//"/proc/sched_debug",
-		//"/proc/kcore",
-		//"/proc/kmem",
-		//"/proc/mem",
-		"/sys/firmware/",
-		"/sys/fs/",
-		"/sys/hypervisor/",
-		"/sys/module/",
-		"/sys/power/",
-	}
-	// Paths prefixed with "-" are ignored if they do not exist:
-	// [https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ReadWriteDirectories=]
-	for _, p := range hiddenPaths {
-		opts = append(opts, unit.NewUnitOption("Service", "InaccessibleDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
-	}
-	for _, p := range roPaths {
-		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
-	}
+	// Restrict access to sensitive paths (eg. procfs)
+	opts = protectSystemFiles(opts, appName)
 
 	if ra.ReadOnlyRootFS {
 		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", common.RelAppRootfsPath(appName)))
@@ -1098,3 +1064,43 @@ func getAppNoNewPrivileges(isolators types.Isolators) bool {
 
 	return false
 }
+
+// restrictProcFS restricts access to some security-sensitive paths under
+// /proc and /sys. Entries are either hidden or just made read-only to app.
+func protectSystemFiles(opts []*unit.UnitOption, appName types.ACName) []*unit.UnitOption {
+	roPaths := []string{
+		"/proc/sys/kernel/core_pattern",
+		"/proc/sys/kernel/modprobe",
+		"/proc/sys/vm/panic_on_oom",
+		"/proc/sysrq-trigger",
+		"/sys/block/",
+		"/sys/bus/",
+		"/sys/class/",
+		"/sys/dev/",
+		"/sys/devices/",
+		"/sys/kernel/",
+	}
+	hiddenPaths := []string{
+		// TODO(lucab): file-paths restrictions need support in systemd first
+		//"/proc/config.gz",
+		//"/proc/kallsyms",
+		//"/proc/sched_debug",
+		//"/proc/kcore",
+		//"/proc/kmem",
+		//"/proc/mem",
+		"/sys/firmware/",
+		"/sys/fs/",
+		"/sys/hypervisor/",
+		"/sys/module/",
+		"/sys/power/",
+	}
+	// Paths prefixed with "-" are ignored if they do not exist:
+	// https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ReadWriteDirectories=
+	for _, p := range hiddenPaths {
+		opts = append(opts, unit.NewUnitOption("Service", "InaccessibleDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
+	}
+	for _, p := range roPaths {
+		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
+	}
+	return opts
+}

From 414fddf1d9136092861954cfca7d59af3315c1b5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 3 Jun 2016 13:35:54 +0200
Subject: [PATCH 0364/1304] stage1: make /proc/bus/ read-only

This removes write access to /proc/bus/, stopping malicious apps from
directly accessing devices through procfs.

This blocks direct manipulation of PCI devices as shown in Appendix IV of
https://www.nccgroup.trust/globalassets/our-research/us/whitepapers/2016/june/abusing-privileged-and-unprivileged-linux-containerspdf
---
 stage1/init/common/pod.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 814dcb047b..13aba46a98 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -1069,6 +1069,7 @@ func getAppNoNewPrivileges(isolators types.Isolators) bool {
 // /proc and /sys. Entries are either hidden or just made read-only to app.
 func protectSystemFiles(opts []*unit.UnitOption, appName types.ACName) []*unit.UnitOption {
 	roPaths := []string{
+		"/proc/bus/",
 		"/proc/sys/kernel/core_pattern",
 		"/proc/sys/kernel/modprobe",
 		"/proc/sys/vm/panic_on_oom",

From 3bbee24710a778b43e7ecf3875d92498664f10fe Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 3 Jun 2016 17:46:53 +0200
Subject: [PATCH 0365/1304] api: GetLogs: use the correct type in
 LogsStreamWriter

Symptoms:

> panic: interface conversion: []uint8 is not proto.Message: missing
> method ProtoMessage

This patch fixes the panic, but there are other crashes that are not
related to LogsStreamWriter. I'll file a separate PR.

Helps with https://github.com/coreos/rkt/issues/2740
---
 rkt/api_service.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 22182908b4..84f5332fe4 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -702,7 +702,8 @@ type LogsStreamWriter struct {
 }
 
 func (sw LogsStreamWriter) Write(b []byte) (int, error) {
-	if err := sw.server.SendMsg(b); err != nil {
+	lines := strings.Split(string(b), "\n")
+	if err := sw.server.Send(&v1alpha.GetLogsResponse{Lines: lines}); err != nil {
 		return 0, err
 	}
 	return len(b), nil

From 459f00de3230968b353b8b59d9c9570fa5cef169 Mon Sep 17 00:00:00 2001
From: Abhishek Chanda <abhishek.becs@gmail.com>
Date: Fri, 3 Jun 2016 22:37:38 -0700
Subject: [PATCH 0366/1304] CLI: add a flag to pretty print json in config
 command

Pretty printing makes it easier to read for humans. Since it is still
json, it's still easy to automate. A script still has the option to
enable or disable pretty printing.
---
 rkt/config.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rkt/config.go b/rkt/config.go
index afaf6a1c2f..6992b1b3ad 100644
--- a/rkt/config.go
+++ b/rkt/config.go
@@ -28,10 +28,12 @@ var (
 The generated configuration entries resemble the original rkt configuration format.`,
 		Run: runWrapper(runConfig),
 	}
+	flagConfigPrettyPrint bool
 )
 
 func init() {
 	cmdRkt.AddCommand(cmdConfig)
+	cmdConfig.Flags().BoolVar(&flagConfigPrettyPrint, "pretty-print", false, "apply indent to format the output")
 }
 
 func runConfig(cmd *cobra.Command, args []string) int {
@@ -41,7 +43,12 @@ func runConfig(cmd *cobra.Command, args []string) int {
 		return 1
 	}
 
-	b, err := json.Marshal(config)
+	var b []byte
+	if flagConfigPrettyPrint {
+		b, err = json.MarshalIndent(config, "", "\t")
+	} else {
+		b, err = json.Marshal(config)
+	}
 	if err != nil {
 		stderr.PanicE("error marshaling configuration", err)
 	}

From 741d9dfb8fbb7bc5a11fcf96989d1c5605bd976a Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Sun, 5 Jun 2016 18:28:10 +0200
Subject: [PATCH 0367/1304] api: client_example: GetLogs with follow

Previously, client_example was only able to call GetLogs without the
'Follow' option. This patch updates client_example.go to show how to
test calls to GetLogs both with and without the 'Follow' option.
---
 api/v1alpha/client_example.go | 77 +++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 18 deletions(-)

diff --git a/api/v1alpha/client_example.go b/api/v1alpha/client_example.go
index 0cf1949f7a..861823aa1d 100644
--- a/api/v1alpha/client_example.go
+++ b/api/v1alpha/client_example.go
@@ -17,7 +17,9 @@
 package main
 
 import (
+	"flag"
 	"fmt"
+	"io"
 	"os"
 
 	"github.com/coreos/rkt/api/v1alpha"
@@ -25,7 +27,58 @@ import (
 	"google.golang.org/grpc"
 )
 
+func getLogsWithoutFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
+	logsResp, err := c.GetLogs(context.Background(), &v1alpha.GetLogsRequest{
+		PodId:  p.Id,
+		Follow: false,
+	})
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	logsRecvResp, err := logsResp.Recv()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	for _, l := range logsRecvResp.Lines {
+		fmt.Println(l)
+	}
+}
+
+func getLogsWithFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
+	logsResp, err := c.GetLogs(context.Background(), &v1alpha.GetLogsRequest{
+		PodId:  p.Id,
+		Follow: true,
+	})
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	for {
+		logsRecvResp, err := logsResp.Recv()
+		if err == io.EOF {
+			return
+		}
+
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+
+		for _, l := range logsRecvResp.Lines {
+			fmt.Println(l)
+		}
+	}
+}
+
 func main() {
+	followFlag := flag.Bool("follow", false, "enable 'follow' option on GetLogs")
+	flag.Parse()
+
 	conn, err := grpc.Dial("localhost:15441", grpc.WithInsecure())
 	if err != nil {
 		fmt.Println(err)
@@ -50,24 +103,12 @@ func main() {
 	}
 
 	for _, p := range podResp.Pods {
-		fmt.Printf("Pod %q is running\n", p.Id)
-
-		logsResp, err := c.GetLogs(context.Background(), &v1alpha.GetLogsRequest{
-			PodId: p.Id,
-		})
-		if err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		logsRecvResp, err := logsResp.Recv()
-		if err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		for _, l := range logsRecvResp.Lines {
-			fmt.Println(l)
+		if *followFlag {
+			fmt.Printf("Pod %q is running. Following logs:\n", p.Id)
+			getLogsWithFollow(c, p)
+		} else {
+			fmt.Printf("Pod %q is running.\n", p.Id)
+			getLogsWithoutFollow(c, p)
 		}
 	}
 

From fcd4ee0beb2b1787094d08a4d18fb9952919780d Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Sun, 5 Jun 2016 20:14:49 +0200
Subject: [PATCH 0368/1304] api: GetLogs: remove empty lines

---
 rkt/api_service.go | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 8fe44c0db1..6cb0eaa82a 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -704,7 +704,14 @@ type LogsStreamWriter struct {
 }
 
 func (sw LogsStreamWriter) Write(b []byte) (int, error) {
-	lines := strings.Split(string(b), "\n")
+	// Remove empty lines
+	lines := make([]string, 0)
+	for _, v := range strings.Split(string(b), "\n") {
+		if len(v) > 0 {
+			lines = append(lines, v)
+		}
+	}
+
 	if err := sw.server.Send(&v1alpha.GetLogsResponse{Lines: lines}); err != nil {
 		return 0, err
 	}
@@ -766,7 +773,13 @@ func (s *v1AlphaAPIServer) GetLogs(request *v1alpha.GetLogsRequest, server v1alp
 	if err != nil {
 		return err
 	}
-	lines := strings.Split(string(data), "\n")
+	// Remove empty lines
+	lines := make([]string, 0)
+	for _, v := range strings.Split(string(data), "\n") {
+		if len(v) > 0 {
+			lines = append(lines, v)
+		}
+	}
 	return server.Send(&v1alpha.GetLogsResponse{Lines: lines})
 }
 

From b8d5cdcfc9e713f9725e12d4441142cad1463e1c Mon Sep 17 00:00:00 2001
From: Mark Petrovic <mpetrovic@paypal.com>
Date: Mon, 6 Jun 2016 12:19:18 -0700
Subject: [PATCH 0369/1304] stage0:  remove superfluous %v Printf verb from
 logged message when tree cache is bad

Fixes #2749
---
 stage0/run.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage0/run.go b/stage0/run.go
index 8c3acf9a46..110b5ea66e 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -576,7 +576,7 @@ func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cd
 		if !cfg.SkipTreeStoreCheck {
 			hash, err := cfg.Store.CheckTreeStore(treeStoreID)
 			if err != nil {
-				log.PrintE("warning: tree cache is in a bad state: %v. Rebuilding...", err)
+				log.PrintE("warning: tree cache is in a bad state.  Rebuilding...", err)
 				var err error
 				treeStoreID, hash, err = cfg.Store.RenderTreeStore(img.String(), true)
 				if err != nil {

From 1e0ec65dcaf5e26afbc302a00b8d0669abcb315f Mon Sep 17 00:00:00 2001
From: Abhishek Chanda <abhishek.becs@gmail.com>
Date: Mon, 6 Jun 2016 22:13:38 -0700
Subject: [PATCH 0370/1304] CLI: default to pretty printing for all json

Also change some docs accordingly
---
 Documentation/subcommands/cat-manifest.md | 2 +-
 Documentation/subcommands/image.md        | 2 +-
 rkt/cat_manifest.go                       | 2 +-
 rkt/config.go                             | 2 +-
 rkt/image_cat_manifest.go                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index d350b26add..d3f91e2afb 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -14,7 +14,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--pretty-print` |  `false` | `true` or `false` | Apply indent to format the output |
+| `--pretty-print` |  `true` | `true` or `false` | Apply indent to format the output |
 
 ## Global options
 
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 150f7ed364..b89019020f 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -16,7 +16,7 @@ For debugging or inspection you may want to extract an ACI manifest to stdout.
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--pretty-print` |  `false` | `true` or `false` | Apply indent to format the output |
+| `--pretty-print` |  `true` | `true` or `false` | Apply indent to format the output |
 
 ## rkt image export
 
diff --git a/rkt/cat_manifest.go b/rkt/cat_manifest.go
index d872dd98cd..4a96c11cf8 100644
--- a/rkt/cat_manifest.go
+++ b/rkt/cat_manifest.go
@@ -32,7 +32,7 @@ var (
 
 func init() {
 	cmdRkt.AddCommand(cmdCatManifest)
-	cmdCatManifest.Flags().BoolVar(&flagPMPrettyPrint, "pretty-print", false, "apply indent to format the output")
+	cmdCatManifest.Flags().BoolVar(&flagPMPrettyPrint, "pretty-print", true, "apply indent to format the output")
 }
 
 func runCatManifest(cmd *cobra.Command, args []string) (exit int) {
diff --git a/rkt/config.go b/rkt/config.go
index 6992b1b3ad..8b61b1bc6a 100644
--- a/rkt/config.go
+++ b/rkt/config.go
@@ -33,7 +33,7 @@ The generated configuration entries resemble the original rkt configuration form
 
 func init() {
 	cmdRkt.AddCommand(cmdConfig)
-	cmdConfig.Flags().BoolVar(&flagConfigPrettyPrint, "pretty-print", false, "apply indent to format the output")
+	cmdConfig.Flags().BoolVar(&flagConfigPrettyPrint, "pretty-print", true, "apply indent to format the output")
 }
 
 func runConfig(cmd *cobra.Command, args []string) int {
diff --git a/rkt/image_cat_manifest.go b/rkt/image_cat_manifest.go
index e696a73297..490a59432b 100644
--- a/rkt/image_cat_manifest.go
+++ b/rkt/image_cat_manifest.go
@@ -34,7 +34,7 @@ var (
 
 func init() {
 	cmdImage.AddCommand(cmdImageCatManifest)
-	cmdImageCatManifest.Flags().BoolVar(&flagPrettyPrint, "pretty-print", false, "apply indent to format the output")
+	cmdImageCatManifest.Flags().BoolVar(&flagPrettyPrint, "pretty-print", true, "apply indent to format the output")
 }
 
 func runImageCatManifest(cmd *cobra.Command, args []string) (exit int) {

From 3ad94f52d1715570afa0b2ffb7ec88e7992aa4fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20K=C3=BChl?= <chris@kinvolk.io>
Date: Tue, 7 Jun 2016 16:42:19 +0200
Subject: [PATCH 0371/1304] kvm: use diagnostic messages for diagnostics

This switches the kvm package to using a diagnostic logger whose
messages are only sent to stderr when debugging is switched on.
Otherwise messages are discarded.
---
 stage1/init/init.go        |  1 +
 stage1/init/kvm/log.go     | 12 ++++++++++--
 stage1/init/kvm/network.go |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index d5b495d373..52a1850843 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -566,6 +566,7 @@ func stage1() int {
 	}
 
 	if flavor == "kvm" {
+		kvm.InitDebug(debug)
 		if err := KvmNetworkingToSystemd(p, n); err != nil {
 			log.PrintE("failed to configure systemd for kvm", err)
 			return 1
diff --git a/stage1/init/kvm/log.go b/stage1/init/kvm/log.go
index 55d0a2554b..8caf970f9b 100644
--- a/stage1/init/kvm/log.go
+++ b/stage1/init/kvm/log.go
@@ -15,13 +15,21 @@
 package kvm
 
 import (
+	"io/ioutil"
 	"os"
 
 	rktlog "github.com/coreos/rkt/pkg/log"
 )
 
-var rlog *rktlog.Logger
+var diag *rktlog.Logger
 
 func init() {
-	rlog = rktlog.New(os.Stderr, "kvm", false)
+	diag = rktlog.New(os.Stderr, "kvm", false)
+}
+
+func InitDebug(debug bool) {
+	diag.SetDebug(debug)
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
+	}
 }
diff --git a/stage1/init/kvm/network.go b/stage1/init/kvm/network.go
index 68ce32e47d..6724983fe3 100644
--- a/stage1/init/kvm/network.go
+++ b/stage1/init/kvm/network.go
@@ -158,7 +158,7 @@ func GenerateNetworkInterfaceUnits(unitsPath string, netDescriptions []netDescri
 			return errwrap.Wrap(fmt.Errorf("failed to create network unit file %q", unitName), err)
 		}
 
-		rlog.Printf("network unit created: %q in %q (iface=%q, addr=%q)", unitName, unitsPath, ifName, address)
+		diag.Printf("network unit created: %q in %q (iface=%q, addr=%q)", unitName, unitsPath, ifName, address)
 	}
 	return nil
 }

From fc0d9b6d2a0eb0f702e9b075819209b485962beb Mon Sep 17 00:00:00 2001
From: Vincent De Smet <vincent.drl@gmail.com>
Date: Tue, 7 Jun 2016 23:54:48 +0800
Subject: [PATCH 0372/1304] Clarify the URL for the discovery example

---
 Documentation/signing-and-verification-guide.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/signing-and-verification-guide.md b/Documentation/signing-and-verification-guide.md
index c58b570080..48431c9a0e 100644
--- a/Documentation/signing-and-verification-guide.md
+++ b/Documentation/signing-and-verification-guide.md
@@ -143,7 +143,7 @@ pubkeys.gpg
 
 ## Distributing Images via Meta Discovery
 
-Host an HTML page with the following meta tags:
+Host `example.com/hello` with the following HTML contents and meta tags:
 
 ```html
 <!DOCTYPE html>
@@ -152,8 +152,8 @@ Host an HTML page with the following meta tags:
     <meta charset="utf-8">
     <meta name="ac-discovery" content="example.com/hello https://example.com/images/{name}-{version}-{os}-{arch}.{ext}">
     <meta name="ac-discovery-pubkeys" content="example.com/hello https://example.com/pubkeys.gpg">
-  <head>
-<html>
+  </head>
+</html>
 ```
 
 Serve the following files at the locations described in the meta tags:

From 524bdd90bd050efddcb91b5be1e9be610ef9cae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 7 Jun 2016 16:23:50 +0200
Subject: [PATCH 0373/1304] Godeps: bump go-systemd

Fixes a panic on the api-service when calling GetLogs().
---
 Godeps/Godeps.json                            |  22 +-
 .../coreos/go-systemd/dbus/methods.go         |  53 ++++-
 .../coreos/go-systemd/sdjournal/journal.go    | 196 +++++++++++++++++-
 .../coreos/go-systemd/sdjournal/read.go       |   5 +-
 4 files changed, 245 insertions(+), 31 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index f4fe087376..e7b5125206 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/rkt",
 	"GoVersion": "go1.5",
-	"GodepVersion": "v72",
+	"GodepVersion": "v74",
 	"Packages": [
 		"./...",
 		"github.com/appc/spec/actool",
@@ -356,28 +356,28 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/activation",
-			"Comment": "v8",
-			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
+			"Comment": "v9",
+			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/dbus",
-			"Comment": "v8",
-			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
+			"Comment": "v9",
+			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/sdjournal",
-			"Comment": "v8",
-			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
+			"Comment": "v9",
+			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/unit",
-			"Comment": "v8",
-			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
+			"Comment": "v9",
+			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/util",
-			"Comment": "v8",
-			"Rev": "b9b5f5970662ce700ab6ee41f56186e5b131490c"
+			"Comment": "v9",
+			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-tspi/tpmclient",
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
index 403c2f0f7b..8f32fe8a7d 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
@@ -239,12 +239,11 @@ type UnitStatus struct {
 	JobPath     dbus.ObjectPath // The job object path
 }
 
-// ListUnits returns an array with all currently loaded units. Note that
-// units may be known by multiple names at the same time, and hence there might
-// be more unit names loaded than actual units behind them.
-func (c *Conn) ListUnits() ([]UnitStatus, error) {
+type storeFunc func(retvalues ...interface{}) error
+
+func (c *Conn) listUnitsInternal(f storeFunc) ([]UnitStatus, error) {
 	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnits", 0).Store(&result)
+	err := f(&result)
 	if err != nil {
 		return nil, err
 	}
@@ -268,15 +267,43 @@ func (c *Conn) ListUnits() ([]UnitStatus, error) {
 	return status, nil
 }
 
+// ListUnits returns an array with all currently loaded units. Note that
+// units may be known by multiple names at the same time, and hence there might
+// be more unit names loaded than actual units behind them.
+func (c *Conn) ListUnits() ([]UnitStatus, error) {
+	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnits", 0).Store)
+}
+
+// ListUnitsFiltered returns an array with units filtered by state.
+// It takes a list of units' statuses to filter.
+func (c *Conn) ListUnitsFiltered(states []string) ([]UnitStatus, error) {
+	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsFiltered", 0, states).Store)
+}
+
+// ListUnitsByPatterns returns an array with units.
+// It takes a list of units' statuses and names to filter.
+// Note that units may be known by multiple names at the same time,
+// and hence there might be more unit names loaded than actual units behind them.
+func (c *Conn) ListUnitsByPatterns(states []string, patterns []string) ([]UnitStatus, error) {
+	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByPatterns", 0, states, patterns).Store)
+}
+
+// ListUnitsByNames returns an array with units. It takes a list of units'
+// names and returns an UnitStatus array. Comparing to ListUnitsByPatterns
+// method, this method returns statuses even for inactive or non-existing
+// units. Input array should contain exact unit names, but not patterns.
+func (c *Conn) ListUnitsByNames(units []string) ([]UnitStatus, error) {
+	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByNames", 0, units).Store)
+}
+
 type UnitFile struct {
 	Path string
 	Type string
 }
 
-// ListUnitFiles returns an array of all available units on disk.
-func (c *Conn) ListUnitFiles() ([]UnitFile, error) {
+func (c *Conn) listUnitFilesInternal(f storeFunc) ([]UnitFile, error) {
 	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFiles", 0).Store(&result)
+	err := f(&result)
 	if err != nil {
 		return nil, err
 	}
@@ -300,6 +327,16 @@ func (c *Conn) ListUnitFiles() ([]UnitFile, error) {
 	return files, nil
 }
 
+// ListUnitFiles returns an array of all available units on disk.
+func (c *Conn) ListUnitFiles() ([]UnitFile, error) {
+	return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFiles", 0).Store)
+}
+
+// ListUnitFilesByPatterns returns an array of all available units on disk matched the patterns.
+func (c *Conn) ListUnitFilesByPatterns(states []string, patterns []string) ([]UnitFile, error) {
+	return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFilesByPatterns", 0, states, patterns).Store)
+}
+
 type LinkUnitFileChange EnableUnitFileChange
 
 // LinkUnitFiles() links unit files (that are located outside of the
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go
index d3c5675b1d..4fd29c66f1 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go
@@ -25,6 +25,7 @@
 package sdjournal
 
 // #include <systemd/sd-journal.h>
+// #include <systemd/sd-id128.h>
 // #include <stdlib.h>
 // #include <syslog.h>
 //
@@ -182,6 +183,15 @@ package sdjournal
 // }
 //
 // int
+// my_sd_journal_get_monotonic_usec(void *f, sd_journal *j, uint64_t *usec, sd_id128_t *boot_id)
+// {
+//   int (*sd_journal_get_monotonic_usec)(sd_journal *, uint64_t *, sd_id128_t *);
+//
+//   sd_journal_get_monotonic_usec = f;
+//   return sd_journal_get_monotonic_usec(j, usec, boot_id);
+// }
+//
+// int
 // my_sd_journal_seek_head(void *f, sd_journal *j)
 // {
 //   int (*sd_journal_seek_head)(sd_journal *);
@@ -227,6 +237,24 @@ package sdjournal
 //   return sd_journal_wait(j, timeout_usec);
 // }
 //
+// void
+// my_sd_journal_restart_data(void *f, sd_journal *j)
+// {
+//   void (*sd_journal_restart_data)(sd_journal *);
+//
+//   sd_journal_restart_data = f;
+//   sd_journal_restart_data(j);
+// }
+//
+// int
+// my_sd_journal_enumerate_data(void *f, sd_journal *j, const void **data, size_t *length)
+// {
+//   int (*sd_journal_enumerate_data)(sd_journal *, const void **, size_t *);
+//
+//   sd_journal_enumerate_data = f;
+//   return sd_journal_enumerate_data(j, data, length);
+// }
+//
 import "C"
 import (
 	"fmt"
@@ -245,15 +273,45 @@ var libsystemdFunctions = map[string]unsafe.Pointer{}
 // Journal entry field strings which correspond to:
 // http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
 const (
-	SD_JOURNAL_FIELD_SYSTEMD_UNIT      = "_SYSTEMD_UNIT"
-	SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER = "SYSLOG_IDENTIFIER"
+	// User Journal Fields
 	SD_JOURNAL_FIELD_MESSAGE           = "MESSAGE"
-	SD_JOURNAL_FIELD_PID               = "_PID"
-	SD_JOURNAL_FIELD_UID               = "_UID"
-	SD_JOURNAL_FIELD_GID               = "_GID"
-	SD_JOURNAL_FIELD_HOSTNAME          = "_HOSTNAME"
-	SD_JOURNAL_FIELD_MACHINE_ID        = "_MACHINE_ID"
-	SD_JOURNAL_FIELD_TRANSPORT         = "_TRANSPORT"
+	SD_JOURNAL_FIELD_MESSAGE_ID        = "MESSAGE_ID"
+	SD_JOURNAL_FIELD_PRIORITY          = "PRIORITY"
+	SD_JOURNAL_FIELD_CODE_FILE         = "CODE_FILE"
+	SD_JOURNAL_FIELD_CODE_LINE         = "CODE_LINE"
+	SD_JOURNAL_FIELD_CODE_FUNC         = "CODE_FUNC"
+	SD_JOURNAL_FIELD_ERRNO             = "ERRNO"
+	SD_JOURNAL_FIELD_SYSLOG_FACILITY   = "SYSLOG_FACILITY"
+	SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER = "SYSLOG_IDENTIFIER"
+	SD_JOURNAL_FIELD_SYSLOG_PID        = "SYSLOG_PID"
+
+	// Trusted Journal Fields
+	SD_JOURNAL_FIELD_PID                       = "_PID"
+	SD_JOURNAL_FIELD_UID                       = "_UID"
+	SD_JOURNAL_FIELD_GID                       = "_GID"
+	SD_JOURNAL_FIELD_COMM                      = "_COMM"
+	SD_JOURNAL_FIELD_EXE                       = "_EXE"
+	SD_JOURNAL_FIELD_CMDLINE                   = "_CMDLINE"
+	SD_JOURNAL_FIELD_CAP_EFFECTIVE             = "_CAP_EFFECTIVE"
+	SD_JOURNAL_FIELD_AUDIT_SESSION             = "_AUDIT_SESSION"
+	SD_JOURNAL_FIELD_AUDIT_LOGINUID            = "_AUDIT_LOGINUID"
+	SD_JOURNAL_FIELD_SYSTEMD_CGROUP            = "_SYSTEMD_CGROUP"
+	SD_JOURNAL_FIELD_SYSTEMD_SESSION           = "_SYSTEMD_SESSION"
+	SD_JOURNAL_FIELD_SYSTEMD_UNIT              = "_SYSTEMD_UNIT"
+	SD_JOURNAL_FIELD_SYSTEMD_USER_UNIT         = "_SYSTEMD_USER_UNIT"
+	SD_JOURNAL_FIELD_SYSTEMD_OWNER_UID         = "_SYSTEMD_OWNER_UID"
+	SD_JOURNAL_FIELD_SYSTEMD_SLICE             = "_SYSTEMD_SLICE"
+	SD_JOURNAL_FIELD_SELINUX_CONTEXT           = "_SELINUX_CONTEXT"
+	SD_JOURNAL_FIELD_SOURCE_REALTIME_TIMESTAMP = "_SOURCE_REALTIME_TIMESTAMP"
+	SD_JOURNAL_FIELD_BOOT_ID                   = "_BOOT_ID"
+	SD_JOURNAL_FIELD_MACHINE_ID                = "_MACHINE_ID"
+	SD_JOURNAL_FIELD_HOSTNAME                  = "_HOSTNAME"
+	SD_JOURNAL_FIELD_TRANSPORT                 = "_TRANSPORT"
+
+	// Address Fields
+	SD_JOURNAL_FIELD_CURSOR              = "__CURSOR"
+	SD_JOURNAL_FIELD_REALTIME_TIMESTAMP  = "__REALTIME_TIMESTAMP"
+	SD_JOURNAL_FIELD_MONOTONIC_TIMESTAMP = "__MONOTONIC_TIMESTAMP"
 )
 
 // Journal event constants
@@ -288,6 +346,14 @@ type Journal struct {
 	lib      *dlopen.LibHandle
 }
 
+// JournalEntry represents all fields of a journal entry plus address fields.
+type JournalEntry struct {
+	Fields             map[string]string
+	Cursor             string
+	RealtimeTimestamp  uint64
+	MonotonicTimestamp uint64
+}
+
 // Match is a convenience wrapper to describe filters supplied to AddMatch.
 type Match struct {
 	Field string
@@ -400,7 +466,9 @@ func (j *Journal) Close() error {
 	C.my_sd_journal_close(sd_journal_close, j.cjournal)
 	j.mu.Unlock()
 
-	return j.lib.Close()
+	// we don't close the handle to reuse the symbol cache between Journal
+	// instances. It will go away when the process exits.
+	return nil
 }
 
 // AddMatch adds a match by which to filter the entries of the journal.
@@ -583,6 +651,93 @@ func (j *Journal) GetDataValue(field string) (string, error) {
 	return strings.SplitN(val, "=", 2)[1], nil
 }
 
+// GetEntry returns a full representation of a journal entry with
+// all key-value pairs of data as well as address fields (cursor, realtime
+// timestamp and monotonic timestamp)
+func (j *Journal) GetEntry() (*JournalEntry, error) {
+	sd_journal_get_realtime_usec, err := j.getFunction("sd_journal_get_realtime_usec")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_get_monotonic_usec, err := j.getFunction("sd_journal_get_monotonic_usec")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_get_cursor, err := j.getFunction("sd_journal_get_cursor")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_restart_data, err := j.getFunction("sd_journal_restart_data")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_enumerate_data, err := j.getFunction("sd_journal_enumerate_data")
+	if err != nil {
+		return nil, err
+	}
+
+	j.mu.Lock()
+	defer j.mu.Unlock()
+
+	var r C.int
+	entry := &JournalEntry{Fields: make(map[string]string)}
+
+	var realtimeUsec C.uint64_t
+	r = C.my_sd_journal_get_realtime_usec(sd_journal_get_realtime_usec, j.cjournal, &realtimeUsec)
+	if r < 0 {
+		return nil, fmt.Errorf("failed to get realtime timestamp: %d", syscall.Errno(-r))
+	}
+
+	entry.RealtimeTimestamp = uint64(realtimeUsec)
+
+	var monotonicUsec C.uint64_t
+	var boot_id C.sd_id128_t
+
+	r = C.my_sd_journal_get_monotonic_usec(sd_journal_get_monotonic_usec, j.cjournal, &monotonicUsec, &boot_id)
+	if r < 0 {
+		return nil, fmt.Errorf("failed to get monotonic timestamp: %d", syscall.Errno(-r))
+	}
+
+	entry.MonotonicTimestamp = uint64(monotonicUsec)
+
+	var c *C.char
+	r = C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &c)
+	if r < 0 {
+		return nil, fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
+	}
+
+	entry.Cursor = C.GoString(c)
+
+	// Implements the JOURNAL_FOREACH_DATA_RETVAL macro from journal-internal.h
+	var d unsafe.Pointer
+	var l C.size_t
+	C.my_sd_journal_restart_data(sd_journal_restart_data, j.cjournal)
+	for {
+		r = C.my_sd_journal_enumerate_data(sd_journal_enumerate_data, j.cjournal, &d, &l)
+		if r == 0 {
+			break
+		}
+
+		if r < 0 {
+			return nil, fmt.Errorf("failed to read message field: %d", syscall.Errno(-r))
+		}
+
+		msg := C.GoStringN((*C.char)(d), C.int(l))
+		kv := strings.SplitN(msg, "=", 2)
+		if len(kv) < 2 {
+			return nil, fmt.Errorf("failed to parse field")
+		}
+
+		entry.Fields[kv[0]] = kv[1]
+	}
+
+	return entry, nil
+}
+
 // SetDataThresold sets the data field size threshold for data returned by
 // GetData. To retrieve the complete data fields this threshold should be
 // turned off by setting it to 0, so that the library always returns the
@@ -619,7 +774,28 @@ func (j *Journal) GetRealtimeUsec() (uint64, error) {
 	j.mu.Unlock()
 
 	if r < 0 {
-		return 0, fmt.Errorf("error getting timestamp for entry: %d", syscall.Errno(-r))
+		return 0, fmt.Errorf("failed to get realtime timestamp: %d", syscall.Errno(-r))
+	}
+
+	return uint64(usec), nil
+}
+
+// GetMonotonicUsec gets the monotonic timestamp of the current journal entry.
+func (j *Journal) GetMonotonicUsec() (uint64, error) {
+	var usec C.uint64_t
+	var boot_id C.sd_id128_t
+
+	sd_journal_get_monotonic_usec, err := j.getFunction("sd_journal_get_monotonic_usec")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_monotonic_usec(sd_journal_get_monotonic_usec, j.cjournal, &usec, &boot_id)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return 0, fmt.Errorf("failed to get monotonic timestamp: %d", syscall.Errno(-r))
 	}
 
 	return uint64(usec), nil
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
index 161577870b..73a0d51e96 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
@@ -29,8 +29,9 @@ var (
 
 // JournalReaderConfig represents options to drive the behavior of a JournalReader.
 type JournalReaderConfig struct {
-	// The Since and NumFromTail options are mutually exclusive and determine
-	// where the reading begins within the journal.
+	// The Since, NumFromTail and Cursor options are mutually exclusive and
+	// determine where the reading begins within the journal. The order in which
+	// options are written is exactly the order of precedence.
 	Since       time.Duration // start relative to a Duration from now
 	NumFromTail uint64        // start relative to the tail
 	Cursor      string        // start relative to the cursor

From 345af3e81c8152dcf54fb37417d71f78d7782d88 Mon Sep 17 00:00:00 2001
From: Mark Petrovic <mpetrovic@paypal.com>
Date: Tue, 7 Jun 2016 09:59:19 -0700
Subject: [PATCH 0374/1304] networking: remove superfluous %v printf verb in
 stderr.PrintE("error loading podNS: %v", err) in networking.go

Fixes #2749
---
 networking/networking.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/networking/networking.go b/networking/networking.go
index faae829003..1d6cd4b10a 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -274,7 +274,7 @@ func (n *Networking) Teardown(flavor string, debug bool) {
 
 	podNS, err := n.podNSLoad()
 	if err != nil {
-		stderr.PrintE("error loading podNS: %v", err)
+		stderr.PrintE("error loading podNS", err)
 	}
 	if podNS != nil {
 		defer func() {

From da00c01acd536656d98b37a171e01b5b18f78e33 Mon Sep 17 00:00:00 2001
From: Angus Lees <gus@inodes.org>
Date: Wed, 8 Jun 2016 12:08:31 +1000
Subject: [PATCH 0375/1304] common: Use untyped FsMagic constants

The size of Statfs_t.Type varies by platform.  Use untyped constants to
avoid a compile error on non-64bit platforms.
---
 common/common.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/common.go b/common/common.go
index 4320edfd0a..e1ab87f871 100644
--- a/common/common.go
+++ b/common/common.go
@@ -58,8 +58,8 @@ const (
 )
 
 const (
-	FsMagicAUFS = int64(0x61756673) // https://goo.gl/CBwx43
-	FsMagicZFS  = int64(0x2FC12FC1) // https://goo.gl/xTvzO5
+	FsMagicAUFS = 0x61756673 // https://goo.gl/CBwx43
+	FsMagicZFS  = 0x2FC12FC1 // https://goo.gl/xTvzO5
 )
 
 // Stage1ImagePath returns the path where the stage1 app image (unpacked ACI) is rooted,

From b75eee20b285769a43d73300832e083ff78c3836 Mon Sep 17 00:00:00 2001
From: Angus Lees <gus@inodes.org>
Date: Wed, 8 Jun 2016 12:11:59 +1000
Subject: [PATCH 0376/1304] rkt.mk: Compile generators for *build* platform

manpages_gen and bash_completion_gen are compiled and run at build time,
so need to be built for the build platform, not the target platform.

This change overrides GOARCH/CC appropriately for these two targets.
Note building these tools requires that the systemd and acl C headers
are also available for the build architecture.
---
 rkt/rkt.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rkt/rkt.mk b/rkt/rkt.mk
index e04e893dbd..48a26773f4 100644
--- a/rkt/rkt.mk
+++ b/rkt/rkt.mk
@@ -29,10 +29,12 @@ $(BGB_BINARY): $(MK_PATH) | $(BINDIR)
 
 include makelib/build_go_bin.mk
 
+manpages: GO_ENV += GOARCH=$(GOARCH_FOR_BUILD) CC=$(CC_FOR_BUILD)
 manpages: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/manpages/
 	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | $(GO_ENV) xargs "$(GO)" run rkt/manpages_gen.go
 
+bash-completion: GO_ENV += GOARCH=$(GOARCH_FOR_BUILD) CC=$(CC_FOR_BUILD)
 bash-completion: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/bash_completion/
 	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | $(GO_ENV) xargs "$(GO)" run rkt/bash_completion_gen.go

From c3bc7cc7956be56fcc0f647622effabf0f1b98da Mon Sep 17 00:00:00 2001
From: Matthias Jahn <matthias.jahn@peerigon.com>
Date: Thu, 19 May 2016 10:52:36 +0200
Subject: [PATCH 0377/1304] trust: change error message if prefix/root flag
 missing

Error message is not helpful at the moment for the user

Fixes #480
---
 Documentation/subcommands/trust.md | 2 +-
 rkt/trust.go                       | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation/subcommands/trust.md b/Documentation/subcommands/trust.md
index 68611f0095..3841af8afb 100644
--- a/Documentation/subcommands/trust.md
+++ b/Documentation/subcommands/trust.md
@@ -16,7 +16,7 @@ A few examples:
 # rkt trust --prefix=coreos.com/etcd
 ```
 
-To trust a key for an entire root domain, you must use the `--root` flag, with a path to a local key file (no discovery).
+To trust a key for an entire root domain, you must use the `--root` flag, with a path to a key file (no discovery).
 
 ```
 # rkt trust --root ~/aci-pubkeys.gpg
diff --git a/rkt/trust.go b/rkt/trust.go
index 14d6c2bbd0..0679bf2e9e 100644
--- a/rkt/trust.go
+++ b/rkt/trust.go
@@ -59,7 +59,12 @@ func init() {
 func runTrust(cmd *cobra.Command, args []string) (exit int) {
 	if flagPrefix == "" && !flagRoot {
 		if len(args) != 0 {
-			stderr.Print("--root required for non-prefixed (root) keys")
+			stderr.Print(`aborting due to implicit unbounded trust (root domain)
+Please provide a specific domain prefix to trust:
+    rkt trust --prefix "example.com/foo" [PUBKEY]
+    rkt trust --prefix "example.com/foo/*" [PUBKEY]
+Otherwise, trust at the root domain (not recommended) must be explicitly requested:
+    rkt trust --root PUBKEY`)
 		} else {
 			cmd.Usage()
 		}

From 6af0d3097ae2cb14f860b1096a92ea77f920d63c Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Wed, 8 Jun 2016 13:34:59 -0700
Subject: [PATCH 0378/1304] api_service: Fix the GetLogs() when appname is
 given.

When appname is given, we should set SYSLOG_IDENTIFIER=appname instead
of the service name.
---
 api/v1alpha/client_example.go | 10 ++++++----
 rkt/api_service.go            |  7 +------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/api/v1alpha/client_example.go b/api/v1alpha/client_example.go
index 861823aa1d..631098298b 100644
--- a/api/v1alpha/client_example.go
+++ b/api/v1alpha/client_example.go
@@ -29,8 +29,9 @@ import (
 
 func getLogsWithoutFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
 	logsResp, err := c.GetLogs(context.Background(), &v1alpha.GetLogsRequest{
-		PodId:  p.Id,
-		Follow: false,
+		PodId:   p.Id,
+		Follow:  false,
+		AppName: p.Apps[0].Name,
 	})
 	if err != nil {
 		fmt.Println(err)
@@ -50,8 +51,9 @@ func getLogsWithoutFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
 
 func getLogsWithFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
 	logsResp, err := c.GetLogs(context.Background(), &v1alpha.GetLogsRequest{
-		PodId:  p.Id,
-		Follow: true,
+		PodId:   p.Id,
+		Follow:  true,
+		AppName: p.Apps[0].Name,
 	})
 	if err != nil {
 		fmt.Println(err)
diff --git a/rkt/api_service.go b/rkt/api_service.go
index 6cb0eaa82a..b957d09afe 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -34,7 +34,6 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/pkg/set"
-	stage1common "github.com/coreos/rkt/stage1/init/common"
 	"github.com/coreos/rkt/store"
 	"github.com/coreos/rkt/version"
 	"github.com/spf13/cobra"
@@ -740,14 +739,10 @@ func (s *v1AlphaAPIServer) GetLogs(request *v1alpha.GetLogsRequest, server v1alp
 		Path: path,
 	}
 	if request.AppName != "" {
-		acname, err := types.NewACName(request.AppName)
-		if err != nil {
-			return err
-		}
 		jconf.Matches = []sdjournal.Match{
 			{
 				Field: sdjournal.SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER,
-				Value: stage1common.ServiceUnitName(*acname),
+				Value: request.AppName,
 			},
 		}
 	}

From 2a343ee1eb85b2e95cf87bc4c3aaa24267a19a34 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Wed, 8 Jun 2016 14:02:21 -0700
Subject: [PATCH 0379/1304] api_service: Fix the 'Since' in Getlogs().

The go-systemd will expect a positive 'Since' duration for logs
in the future, and a negative 'Since' duration for logs in the past.
---
 api/v1alpha/client_example.go | 9 ++++++---
 rkt/api_service.go            | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/api/v1alpha/client_example.go b/api/v1alpha/client_example.go
index 631098298b..e4ebfb31a2 100644
--- a/api/v1alpha/client_example.go
+++ b/api/v1alpha/client_example.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"time"
 
 	"github.com/coreos/rkt/api/v1alpha"
 	"golang.org/x/net/context"
@@ -29,9 +30,11 @@ import (
 
 func getLogsWithoutFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
 	logsResp, err := c.GetLogs(context.Background(), &v1alpha.GetLogsRequest{
-		PodId:   p.Id,
-		Follow:  false,
-		AppName: p.Apps[0].Name,
+		PodId:     p.Id,
+		Follow:    false,
+		AppName:   p.Apps[0].Name,
+		SinceTime: time.Now().Add(-time.Second * 5).Unix(),
+		Lines:     10,
 	})
 	if err != nil {
 		fmt.Println(err)
diff --git a/rkt/api_service.go b/rkt/api_service.go
index b957d09afe..d98afc152d 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -748,7 +748,7 @@ func (s *v1AlphaAPIServer) GetLogs(request *v1alpha.GetLogsRequest, server v1alp
 	}
 	if request.SinceTime != 0 {
 		t := time.Unix(request.SinceTime, 0)
-		jconf.Since = time.Since(t)
+		jconf.Since = -time.Since(t)
 	}
 	if request.Lines != 0 {
 		jconf.NumFromTail = uint64(request.Lines)

From 1559cc2802df06ef11b906720b463d38e9534152 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 9 Jun 2016 11:45:24 +0200
Subject: [PATCH 0380/1304] api/client_example: fix panic if pod has no apps

---
 api/v1alpha/client_example.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/api/v1alpha/client_example.go b/api/v1alpha/client_example.go
index e4ebfb31a2..6be7c32ac0 100644
--- a/api/v1alpha/client_example.go
+++ b/api/v1alpha/client_example.go
@@ -29,6 +29,11 @@ import (
 )
 
 func getLogsWithoutFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
+	if len(p.Apps) == 0 {
+		fmt.Printf("Pod %q has no apps\n", p.Id)
+		return
+	}
+
 	logsResp, err := c.GetLogs(context.Background(), &v1alpha.GetLogsRequest{
 		PodId:     p.Id,
 		Follow:    false,
@@ -53,6 +58,11 @@ func getLogsWithoutFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
 }
 
 func getLogsWithFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
+	if len(p.Apps) == 0 {
+		fmt.Printf("Pod %q has no apps\n", p.Id)
+		return
+	}
+
 	logsResp, err := c.GetLogs(context.Background(), &v1alpha.GetLogsRequest{
 		PodId:   p.Id,
 		Follow:  true,

From 5393f2e99b1ae3d3b6b232bf428dd15a88714663 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 9 Jun 2016 11:45:38 +0200
Subject: [PATCH 0381/1304] version: bump to v1.8.0

---
 CHANGELOG.md                            | 26 +++++++++++++++++++++++++
 Documentation/getting-started-ubuntu.md |  6 +++---
 Documentation/running-fly-stage1.md     |  4 ++--
 Documentation/running-lkvm-stage1.md    |  4 ++--
 Documentation/subcommands/prepare.md    |  2 +-
 Documentation/subcommands/version.md    |  2 +-
 Documentation/trying-out-rkt.md         |  6 +++---
 ROADMAP.md                              | 22 +++++++++++++--------
 configure.ac                            |  2 +-
 scripts/acbuild-rkt-builder.sh          |  2 +-
 scripts/build-rir.sh                    |  2 +-
 tests/empty-image/manifest              |  2 +-
 tests/image/manifest                    |  2 +-
 tests/rkt_exec_test.go                  |  2 +-
 tests/rkt_image_cat_manifest_test.go    |  2 +-
 tests/rkt_image_export_test.go          |  2 +-
 tests/rkt_image_render_test.go          |  2 +-
 tests/rkt_os_arch_test.go               |  2 +-
 18 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44ea24ac44..7e7ebf54dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## v1.8.0
+
+This release focuses on stabilizing the API service, fixing multiple issues in the logging subsystem.
+
+#### New features and UX changes
+
+- api: GetLogs: improve client example with 'Follow' ([#2747](https://github.com/coreos/rkt/pull/2747)).
+- kvm: add proxy arp support to macvtap ([#2715](https://github.com/coreos/rkt/pull/2715)).
+- stage0/config: add a CLI flag to pretty print json ([#2745](https://github.com/coreos/rkt/pull/2745)).
+- stage1: make /proc/bus/ read-only ([#2743](https://github.com/coreos/rkt/pull/2743)).
+
+#### Bug fixes
+
+- api: GetLogs: use the correct type in LogsStreamWriter ([#2744](https://github.com/coreos/rkt/pull/2744)).
+- api: fix service panic on incomplete pods ([#2739](https://github.com/coreos/rkt/pull/2739)).
+- api: Fix the GetLogs() when appname is given ([#2763](https://github.com/coreos/rkt/pull/2763)).
+- pkg/selinux: various fixes ([#2723](https://github.com/coreos/rkt/pull/2723)).
+- pkg/fileutil: don't remove the cleanSrc if it equals '.' ([#2731](https://github.com/coreos/rkt/pull/2731)).
+- stage0: remove superfluous error verbs ([#2750](https://github.com/coreos/rkt/pull/2750)).
+
+#### Other changes
+
+- Godeps: bump go-systemd ([#2754](https://github.com/coreos/rkt/pull/2754)). Fixes a panic on the api-service when calling GetLogs().
+- Documentation updates ([#2756](https://github.com/coreos/rkt/pull/2756), [#2741](https://github.com/coreos/rkt/pull/2741), [#2737](https://github.com/coreos/rkt/pull/2737), [#2742](https://github.com/coreos/rkt/pull/2742), [#2730](https://github.com/coreos/rkt/pull/2730), [#2729](https://github.com/coreos/rkt/pull/2729))
+- Test improvements ([#2726](https://github.com/coreos/rkt/pull/2726)).
+
 ## v1.7.0
 
 This release introduces some new security features, including a "no-new-privileges" isolator and initial (partial) restrictions on /proc and /sys access.
diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
index 413d3b1c97..83eb6208e9 100644
--- a/Documentation/getting-started-ubuntu.md
+++ b/Documentation/getting-started-ubuntu.md
@@ -15,9 +15,9 @@ vagrant up --provider virtualbox
 vagrant ssh
 sudo -s
 
-wget https://github.com/coreos/rkt/releases/download/v1.7.0/rkt-v1.7.0.tar.gz
-tar xzvf rkt-v1.7.0.tar.gz
-cd rkt-v1.7.0
+wget https://github.com/coreos/rkt/releases/download/v1.8.0/rkt-v1.8.0.tar.gz
+tar xzvf rkt-v1.8.0.tar.gz
+cd rkt-v1.8.0
 ./rkt help
 ```
 
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 8b4b0378f0..b391e90754 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.7.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.8.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.7.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.8.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index 01c5a5b7ac..666b5a6c76 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.7.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.8.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.7.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.8.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 2791f20968..0cbb1e1fcc 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.7.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.8.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index d23ae66475..b9ff8fe7a1 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.7.0
+rkt Version: 1.8.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index dec49926d4..b8f2b7b2a0 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool, and is currently supported on amd64 Linux. A
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.7.0/rkt-v1.7.0.tar.gz
-tar xzvf rkt-v1.7.0.tar.gz
-cd rkt-v1.7.0
+wget https://github.com/coreos/rkt/releases/download/v1.8.0/rkt-v1.8.0.tar.gz
+tar xzvf rkt-v1.8.0.tar.gz
+cd rkt-v1.8.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
index a5e9422d2b..73618c88ed 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -10,19 +10,25 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
 
-### rkt 1.8 (June)
+### rkt 1.9.0 (June)
 
+- full integration with Kubernetes (aka "rktnetes")
 - app-level seccomp support [#1614](https://github.com/coreos/rkt/issues/1614)
-- stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
+- enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
 - IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
-- full integration with Kubernetes (aka "rktnetes")
+
+### rkt 1.10.0 (July)
+
+- stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
+- further improvements for SELinux environments, especially Fedora in enforcing mode
 - full integration with `machinectl login` and `systemd-run` [#1463](https://github.com/coreos/rkt/issues/1463)
-- `rkt fly` as top-level command [#1889](https://github.com/coreos/rkt/issues/1889)
-- rkt runs on Fedora with SELinux in enforcing mode
+
+### rkt 1.11.0 (July)
+
 - packaged for more distributions
   - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)
-- user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)
 
-### rkt 1.9 (June)
+### rkt 1.12.0 (August)
 
-- enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
+- `rkt fly` as top-level command [#1889](https://github.com/coreos/rkt/issues/1889)
+- user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)
diff --git a/configure.ac b/configure.ac
index a65bdd62f1..00833d1223 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.7.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.8.0], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 9b66b9c421..aa409ce939 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.7.0+git"}
+IMG_VERSION=${VERSION:-"v1.8.0"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index fa5d54e35d..b586925846 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.7.0+git}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.8.0}"
 
 mkdir -p $BUILDDIR
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 9e3ee0a986..b477c36f3f 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.7.0"
+            "value": "1.8.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 228c2ce830..590a406418 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.7.0"
+            "value": "1.8.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index b3c8c0224b..1565d7a79f 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.7.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.8.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 5ec32f02c9..1393f8b6cc 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.7.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.8.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index eb4adcdf85..5c1f006d08 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.7.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.8.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index d86a9cb711..a2bbacb107 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.7.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.8.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 357ee15c20..c7236d717f 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.7.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.8.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 6633dc73d67c76a8201f5b0548312207ba1e931b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 9 Jun 2016 11:45:38 +0200
Subject: [PATCH 0382/1304] version: bump to v1.8.0+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 00833d1223..1cb0980034 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.8.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.8.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index aa409ce939..4bfe9763d6 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.8.0"}
+IMG_VERSION=${VERSION:-"v1.8.0+git"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index b586925846..c18a070acf 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.8.0}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.8.0+git}"
 
 mkdir -p $BUILDDIR
 

From ff7820c44f4ea4a3fa80e01324546c63af1feb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=C5=BBy=C5=82owski?=
 <michal.zylowski@intel.com>
Date: Fri, 13 May 2016 18:24:34 +0200
Subject: [PATCH 0383/1304] docs: New file in documentation - instruction for
 new developers in rkt My write up about first steps in preparing development
 environment

---
 Documentation/devel/quickstart-dev.md | 124 ++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 Documentation/devel/quickstart-dev.md

diff --git a/Documentation/devel/quickstart-dev.md b/Documentation/devel/quickstart-dev.md
new file mode 100644
index 0000000000..63d4528d97
--- /dev/null
+++ b/Documentation/devel/quickstart-dev.md
@@ -0,0 +1,124 @@
+# Preparing development environment and first rkt build
+
+This is an example configuration and quick start guide for the installation of rkt from source on Ubuntu 16.04 GNOME. For a detailed developer's reference, see [the rkt hacking guide][rkt-hacking].
+
+## Get rkt repo and install dependencies
+
+In this example ~/Repos is a personal workspace where all repos are stored
+
+```sh
+$ mkdir ~/Repos && cd ~/Repos
+$ mkdir -p ~/.local/gopath/src/github.com/coreos
+$ sudo apt-get install git
+$ git -C ~/.local/gopath/src/github.com/coreos clone https://github.com/coreos/rkt.git
+$ ln -s ~/.local/gopath/src/github.com/coreos/rkt rkt
+```
+
+On a fresh system installation, few additional software packages are needed to correctly build rkt:
+
+```sh
+$ sudo ~/Repos/rkt/scripts/install-deps-debian-sid.sh
+```
+
+See also [the dependencies page][rkt-dependencies].
+
+## Installing Go Programming Language for a single-user
+
+```
+$ cd ~/Downloads
+$ wget https://storage.googleapis.com/golang/go1.6.1.linux-amd64.tar.gz
+$ tar -xvf go1.6.1.linux-amd64.tar.gz
+$ mv go ~/.local
+```
+
+Add GO variables to .bashrc file:
+
+```sh
+export PATH=~/.local/bin:~/.local/go/bin:$PATH
+export GOPATH=~/.local/gopath
+export GOROOT=~/.local/go
+```
+
+## Install ccache (optional step)
+
+Ccache can save a lot of time. If you build a kernel once, most of the compiled code can just be taken from the cache.
+Ccache can be configured in a few easy steps:
+
+```sh
+$ sudo apt-get install ccache
+$ ccache --max-size=10G
+$ sudo ln -s /usr/bin/ccache /usr/local/bin/gcc
+```
+
+The maximum cache size is 10GB now (the default value is too small to cache kernel compilation).
+
+## Building rkt
+
+Run the autogen and configure commands with the relevant arguments, for example (kvm as flavor):
+
+```sh
+$ cd ~/Repos/rkt
+$ ./autogen.sh && ./configure --enable-functional-tests --with-stage1-flavors=kvm
+```
+
+Now build rkt with:
+
+```sh
+$ make V=2 -j
+```
+
+REMEMBER: If you want to test somebody else's changes:
+
+```sh
+$ git checkout <branch>
+$ make clean
+$ ./autogen.sh && ./configure <proper arguments>
+```
+
+## A few useful commands
+
+### Just build and run tests:
+
+```sh
+$ ./tests/build-and-run-tests.sh -f kvm
+```
+
+### Run only functional tests after build:
+
+```sh
+$ make functional-check
+```
+
+### Check only one test:
+
+```sh
+$ make functional-check GO_TEST_FUNC_ARGS='-run TEST_NAME_HERE'
+```
+
+See more in [the tests readme][rkt-tests-readme] page.
+
+### Simple usage of rkt container (run, exit, remove):
+
+```sh
+$ sudo ./build-rkt-*/bin/rkt run --insecure-options=image --interactive docker://busybox
+$ exit
+$ sudo ./build-rkt-*/bin/rkt gc --grace-period=0
+```
+
+### Remove all network interfaces created by rkt:
+
+```sh
+for link in $(ip link | grep rkt | cut -d':' -f2 | cut -d'@' -f1);
+    sudo ip link del "${link}"
+done
+```
+
+### Simplify changes in go files, before commit:
+
+```sh
+gofmt -s -w file.go
+```
+
+[rkt-hacking]: ../hacking.md
+[rkt-dependencies]: ../dependencies.md
+[rkt-tests-readme]: ../../tests/README.md

From 9c4f29fc21c9b59112b02677f33f0425698788d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 9 Jun 2016 15:50:16 +0200
Subject: [PATCH 0384/1304] store: update goroutine leak check

The code this check was based on changed lately and we've been getting
some occurrences of a goroutine leak when running unit tests.

Update the code to match golang upstream [1][1], which waits a bit for
goroutines to finish, in the hope of getting rid of those issues.

[1]: https://github.com/golang/go/blob/release-branch.go1.6/src/net/http/main_test.go#L21
---
 store/main_test.go | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/store/main_test.go b/store/main_test.go
index b12ced44cb..abb54300ba 100644
--- a/store/main_test.go
+++ b/store/main_test.go
@@ -12,6 +12,7 @@ import (
 	"sort"
 	"strings"
 	"testing"
+	"time"
 )
 
 func interestingGoroutines() (gs []string) {
@@ -52,17 +53,21 @@ func goroutineLeaked() bool {
 		// not counting goroutines for leakage in -short mode
 		return false
 	}
-	gs := interestingGoroutines()
 
-	n := 0
-	stackCount := make(map[string]int)
-	for _, g := range gs {
-		stackCount[g]++
-		n++
-	}
-
-	if n == 0 {
-		return false
+	var stackCount map[string]int
+	for i := 0; i < 5; i++ {
+		n := 0
+		stackCount = make(map[string]int)
+		gs := interestingGoroutines()
+		for _, g := range gs {
+			stackCount[g]++
+			n++
+		}
+		if n == 0 {
+			return false
+		}
+		// Wait for goroutines to schedule and die off:
+		time.Sleep(100 * time.Millisecond)
 	}
 	fmt.Fprintf(os.Stderr, "Too many goroutines running after integration test(s).\n")
 	for stack, count := range stackCount {

From dae07cfe9e33c47329d12c1ea5e13da28ea3bb9c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 8 Jun 2016 15:37:56 +0200
Subject: [PATCH 0385/1304] stage1/prepare-app: always adjust /etc/hostname

This commit lets prepare-app bind mount /proc/sys/kernel/hostname
over /etc/hostname, so that applications have a consistent hostname
view.
---
 stage1/prepare-app/prepare-app.c |  1 +
 tests/rkt_etc_hosts_test.go      | 43 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index db42773a4b..a5a89bd60a 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -230,6 +230,7 @@ int main(int argc, char *argv[])
 	};
 	static const mount_point files_mount_table[] = {
 		{ "/etc/rkt-resolv.conf", "/etc/resolv.conf", "bind", NULL, MS_BIND },
+		{ "/proc/sys/kernel/hostname", "/etc/hostname", "bind", NULL, MS_BIND },
 	};
 	const char *root;
 	int rootfd;
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index 24196cfeee..f19e91e65b 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -17,6 +17,7 @@
 package main
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -87,3 +88,45 @@ func TestPrepareAppEnsureEtcHosts(t *testing.T) {
 		}
 	}
 }
+
+// stage1/prepare-app will bind mount /proc/sys/kernel/hostname on /etc/hostname,
+// see https://github.com/coreos/rkt/issues/2657
+var etcHostnameTests = []struct {
+	aciBuildArgs   []string
+	runArgs        []string
+	expectedOutput string
+	expectErr      bool
+}{
+	{
+		[]string{"--exec=/inspect -file-name /etc/hostname -stat-file"},
+		nil,
+		`/etc/hostname: mode: -rw-r--r--`,
+		false,
+	},
+	{
+		[]string{"--exec=/inspect -file-name /etc/hostname -read-file"},
+		[]string{"--hostname custom_hostname_setting"},
+		`<<<custom_hostname_setting`,
+		false,
+	},
+	{
+		[]string{"--exec=/inspect -file-name /etc/hostname -read-file"},
+		nil,
+		`<<<rkt-`,
+		false,
+	},
+}
+
+func TestPrepareAppCheckEtcHostname(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for i, ti := range etcHostnameTests {
+
+		aciFileName := patchTestACI(fmt.Sprintf("rkt-inspect-hostname-%d.aci", i), ti.aciBuildArgs...)
+		defer os.Remove(aciFileName)
+
+		rktCmd := fmt.Sprintf("%s --insecure-options=image run %s %s", ctx.Cmd(), aciFileName, strings.Join(ti.runArgs, " "))
+		runRktAndCheckOutput(t, rktCmd, ti.expectedOutput, ti.expectErr)
+	}
+}

From c41120f5772491a5cc44a6582c7c2e0dc1a32cf7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 9 Jun 2016 17:37:37 +0200
Subject: [PATCH 0386/1304] docs: update release guide with signing details

This commit updates the release guide with detailed steps for
signing tags and release artifacts in a consistent way.

Fixes #2734
---
 Documentation/devel/release.md | 46 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index 4c2347a6ca..0d424082d3 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -55,10 +55,9 @@ After merging and going back to master branch, we check out the release version
   - `rkt --insecure-options=image fetch ./rkt-builder.aci`
   - `export BUILDDIR=$PWD/release-build && mkdir -p $BUILDDIR && sudo BUILDDIR=$BUILDDIR ./scripts/build-rir.sh`
   - Sanity check `release-build/bin/rkt version`
-  - Sanity check `ldd release-build/bin/rkt`: it can contain linux-vdso.so, libpthread.so, libc.so, ld-linux-x86-64.so but nothing else.
-  - Sanity check `ldd release-build/tools/init`: in addition to the previous list, it can contain libdl.so, but nothing else.
-- Add a signed tag: `git tag -s v1.2.0`.
-  (We previously used tags for release notes, but now we store them in CHANGELOG.md, so a short tag with the release name is fine).
+  - Sanity check `ldd release-build/bin/rkt`: it can contain linux-vdso.so, libpthread.so, libc.so, libdl.so and ld-linux-x86-64.so but nothing else.
+  - Sanity check `ldd release-build/tools/init`: same as above.
+- Grab the release key (see details below) and add a signed tag: `GIT_COMMITTER_NAME="CoreOS Application Signing Key" GIT_COMMITTER_EMAIL="security@coreos.com" git tag -u $RKTSUBKEYID'!' -s v1.2.0 -m "rkt v1.2.0"`
 - Push the tag to GitHub: `git push --tags`
 
 Now we switch to the GitHub web UI to conduct the release:
@@ -71,36 +70,37 @@ Now we switch to the GitHub web UI to conduct the release:
   This is a simple tarball:
 
 ```
-	export NAME="rkt-v1.2.0"
-	mkdir $NAME
-	cp release-build/bin/rkt release-build/bin/stage1-{coreos,kvm,fly}.aci $NAME/
-	cp -r dist/* $NAME/
-	sudo chown -R root:root $NAME/
-	tar czvf $NAME.tar.gz --numeric-owner $NAME/
+export RKTVER="1.2.0"
+export NAME="rkt-v$RKTVER"
+mkdir $NAME
+cp release-build/bin/rkt release-build/bin/stage1-{coreos,kvm,fly}.aci $NAME/
+cp -r dist/* $NAME/
+sudo chown -R root:root $NAME/
+tar czvf $NAME.tar.gz --numeric-owner $NAME/
 ```
 
-- Attach the release signature; your personal GPG is okay for now:
+- Attach each stage1 file individually so they can be fetched by the ACI discovery mechanism. The files must be named as follows:
 
 ```
-	gpg --detach-sign $NAME.tar.gz
+cp release-build/bin/stage1-coreos.aci stage1-coreos-$RKTVER-linux-amd64.aci
+cp release-build/bin/stage1-kvm.aci stage1-kvm-$RKTVER-linux-amd64.aci
+cp release-build/bin/stage1-fly.aci stage1-fly-$RKTVER-linux-amd64.aci
 ```
 
-- Attach each stage1 file individually so they can be fetched by the ACI discovery mechanism. The files must be named as follows:
+- Sign all release artifacts.
 
-```
-	cp release-build/bin/stage1-coreos.aci stage1-coreos-1.2.0-linux-amd64.aci
-	cp release-build/bin/stage1-kvm.aci stage1-kvm-1.2.0-linux-amd64.aci
-	cp release-build/bin/stage1-fly.aci stage1-fly-1.2.0-linux-amd64.aci
-```
+rkt project key must be used to sign the generated binaries and images.`$RKTSUBKEYID` is the key ID of rkt project Yubikey. Connect the key and run `gpg2 --card-status` to get the ID.
+The public key for GPG signing can be found at [CoreOS Application Signing Key](https://coreos.com/security/app-signing-key) and is assumed as trusted.
 
-- Attach the signature of each stage1 file:
+The following commands are used for public release signing:
 
 ```
-	gpg --armor --detach-sign stage1-coreos-1.2.0-linux-amd64.aci
-	gpg --armor --detach-sign stage1-kvm-1.2.0-linux-amd64.aci
-	gpg --armor --detach-sign stage1-fly-1.2.0-linux-amd64.aci
+for i in $NAME.tar.gz stage1-*.aci; do gpg2 -u $RKTSUBKEYID'!' --armor --output ${i}.asc --detach-sign ${i}; done
+for i in $NAME.tar.gz stage1-*.aci; do gpg2 --verify ${i}.asc ${i}; done
 ```
 
+- Once signed and uploaded, double-check that all artifacts and signatures are on github. There should be 8 files in attachments (1x tar.gz, 3x ACI, 4x armored signatures).
+
 - Publish the release!
 
 - Clean your git tree: `sudo git clean -ffdx`.
@@ -111,5 +111,5 @@ Use your discretion and see [previous release emails](https://groups.google.com/
 Make sure to include a list of authors that contributed since the previous release - something like the following might be handy:
 
 ```
-	git log v1.1.0..v1.2.0 --pretty=format:"%an" | sort | uniq | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $#\n#'
+git log v1.1.0..v1.2.0 --pretty=format:"%an" | sort | uniq | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $#\n#'
 ```

From 701c0f07b9e03cc7cced48364aa370ad3ba35bed Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 15 Apr 2016 17:12:08 +0200
Subject: [PATCH 0387/1304] stage1: always write /etc/machine-id

Prepare rkt for systemd-v230 in stage1.

rkt was previously only writing /etc/machine-id in the stage1 rootfs if
systemd was running on the host. However, new versions of systemd always
require /etc/machine-id, see:
https://github.com/systemd/systemd/commit/e01ff70a77e781734e1e73a2238af2e9bf7967a8
This patch will be in systemd-v230.

This is currently not a problem because stage1 does not use systemd-v230
(and systemd-v230 is not released yet), but we want rkt to be ready.

Fixes https://github.com/coreos/rkt/issues/2416
---
 stage1/init/init.go | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 52a1850843..7955e432da 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -383,17 +383,18 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 		return nil, nil, fmt.Errorf("unrecognized stage1 flavor: %q", flavor)
 	}
 
-	// link journal only if the host is running systemd
-	if util.IsRunningSystemd() {
-		// we write /etc/machine-id here because systemd-nspawn needs it to link
-		// the container's journal to the host
-		mPath := filepath.Join(common.Stage1RootfsPath(p.Root), "etc", "machine-id")
-		mID := strings.Replace(p.UUID.String(), "-", "", -1)
+	// systemd-nspawn needs /etc/machine-id to link the container's journal
+	// to the host. Since systemd-v230, /etc/machine-id is mandatory, see
+	// https://github.com/systemd/systemd/commit/e01ff70a77e781734e1e73a2238af2e9bf7967a8
+	mPath := filepath.Join(common.Stage1RootfsPath(p.Root), "etc", "machine-id")
+	mID := strings.Replace(p.UUID.String(), "-", "", -1)
 
-		if err := ioutil.WriteFile(mPath, []byte(mID), 0644); err != nil {
-			log.FatalE("error writing /etc/machine-id", err)
-		}
+	if err := ioutil.WriteFile(mPath, []byte(mID), 0644); err != nil {
+		log.FatalE("error writing /etc/machine-id", err)
+	}
 
+	// link journal only if the host is running systemd
+	if util.IsRunningSystemd() {
 		args = append(args, "--link-journal=try-guest")
 
 		keepUnit, err := util.RunningFromSystemService()
@@ -408,6 +409,8 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 		if keepUnit {
 			args = append(args, "--keep-unit")
 		}
+	} else {
+		args = append(args, "--link-journal=no")
 	}
 
 	if !debug {

From 0bf7491d85be60f678a76a6b0d414d7830424ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Jun 2016 17:06:03 +0200
Subject: [PATCH 0388/1304] functional tests: increase timeout to 60min

Some of our Jenkins machines reach the previous 45min limit, let's
increase it a bit more.
---
 tests/functional.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/functional.mk b/tests/functional.mk
index e90d8d6c42..2e8d383d89 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -71,15 +71,17 @@ CLEAN_DIRS += \
 CLEAN_SYMLINKS += \
 	$(FTST_IMAGE_ROOTFSDIR)/inspect-link \
 	$(FTST_IMAGE_ROOTFSDIR)/bin/inspect-link-bin
+FTST_FUNCTIONAL_TESTS_TIMEOUT := 60m
 
 $(call forward-vars,$(FTST_FUNCTIONAL_TESTS_STAMP), \
 	FTST_RKT_PATH ACTOOL FTST_IMAGE FTST_EMPTY_IMAGE FTST_TEST_TMP ABS_GO \
 	FTST_INSPECT_BINARY GO_ENV GO_TEST_FUNC_ARGS REPO_PATH \
-	FTST_ACE_MAIN_IMAGE FTST_ACE_SIDEKICK_IMAGE RKT_STAGE1_DEFAULT_FLAVOR FTST_SS1_IMAGE)
+	FTST_ACE_MAIN_IMAGE FTST_ACE_SIDEKICK_IMAGE RKT_STAGE1_DEFAULT_FLAVOR FTST_SS1_IMAGE \
+	FTST_FUNCTIONAL_TESTS_TIMEOUT)
 $(FTST_FUNCTIONAL_TESTS_STAMP): $(FTST_IMAGE) $(FTST_EMPTY_IMAGE) $(ACTOOL_STAMP) $(RKT_STAMP) $(FTST_ACE_MAIN_IMAGE) $(FTST_ACE_SIDEKICK_IMAGE) $(FTST_SS1_STAMP) | $(FTST_TEST_TMP) $(FTST_RKT_PATH) $(FTST_STAGE1_ALL_FLAVOR_SYMLINKS)
 	$(VQ) \
 	$(call vb,vt,GO TEST,$(REPO_PATH)/tests) \
-	sudo RKT_STAGE1_DEFAULT_FLAVOR="$(RKT_STAGE1_DEFAULT_FLAVOR)" RKT="$(FTST_RKT_PATH)" ACTOOL="$(ACTOOL)" RKT_INSPECT_IMAGE="$(FTST_IMAGE)" RKT_EMPTY_IMAGE="$(FTST_EMPTY_IMAGE)" RKT_ACE_MAIN_IMAGE=$(FTST_ACE_MAIN_IMAGE) RKT_ACE_SIDEKICK_IMAGE=$(FTST_ACE_SIDEKICK_IMAGE) FUNCTIONAL_TMP="$(FTST_TEST_TMP)" INSPECT_BINARY="$(FTST_INSPECT_BINARY)" STUB_STAGE1="$(FTST_SS1_IMAGE)" $(GO_ENV) "$(ABS_GO)" test -tags $(RKT_STAGE1_DEFAULT_FLAVOR) -timeout 45m -v $(GO_TEST_FUNC_ARGS) $(REPO_PATH)/tests
+	sudo RKT_STAGE1_DEFAULT_FLAVOR="$(RKT_STAGE1_DEFAULT_FLAVOR)" RKT="$(FTST_RKT_PATH)" ACTOOL="$(ACTOOL)" RKT_INSPECT_IMAGE="$(FTST_IMAGE)" RKT_EMPTY_IMAGE="$(FTST_EMPTY_IMAGE)" RKT_ACE_MAIN_IMAGE=$(FTST_ACE_MAIN_IMAGE) RKT_ACE_SIDEKICK_IMAGE=$(FTST_ACE_SIDEKICK_IMAGE) FUNCTIONAL_TMP="$(FTST_TEST_TMP)" INSPECT_BINARY="$(FTST_INSPECT_BINARY)" STUB_STAGE1="$(FTST_SS1_IMAGE)" $(GO_ENV) "$(ABS_GO)" test -tags $(RKT_STAGE1_DEFAULT_FLAVOR) -timeout $(FTST_FUNCTIONAL_TESTS_TIMEOUT) -v $(GO_TEST_FUNC_ARGS) $(REPO_PATH)/tests
 
 $(call forward-vars,$(FTST_IMAGE), \
 	FTST_IMAGE_ROOTFSDIR ACTOOL FTST_IMAGE_DIR)

From 264503d374ff699b5e5ffbebf307f21eab2234c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Jun 2016 17:07:17 +0200
Subject: [PATCH 0389/1304] functional tests: increase API service test timeout

Some of our Jenkins machine seem to take longer to start the pods,
increase a bit the timeout.
---
 tests/rkt_api_service_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 60182a5594..50de85f065 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -578,7 +578,7 @@ func NewAPIServiceCgroupTest() testutils.Test {
 			}
 		}()
 
-		testutils.WaitOrTimeout(t, time.Second*30, done)
+		testutils.WaitOrTimeout(t, time.Second*60, done)
 
 		var cgroups []string
 		var subcgroups []string

From 451cc00d5eb038460a73a61fc4d0c21099bf05ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Jun 2016 17:11:21 +0200
Subject: [PATCH 0390/1304] functional tests: don't error if a cgroup knob
 doesn't exist

We've seen some errors in the functional tests where some knob didn't
exist. We're not sure why but we're really only interested in not having
any cgroups remaining after running GC so let's ignore that error.
---
 tests/rkt_gc_nspawn_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/rkt_gc_nspawn_test.go b/tests/rkt_gc_nspawn_test.go
index 72e7ce4dad..3c1b67ef81 100644
--- a/tests/rkt_gc_nspawn_test.go
+++ b/tests/rkt_gc_nspawn_test.go
@@ -29,6 +29,11 @@ import (
 func getPodCgroups(shortUUID string) ([]string, error) {
 	var podCgroups []string
 	walkCgroups := func(path string, info os.FileInfo, err error) error {
+		// Maybe the file doesn't exist anymore. We've seen this during tests,
+		// not sure about the reason though.
+		if os.IsNotExist(err) {
+			return nil
+		}
 		if err != nil {
 			return err
 		}

From eed65378a39a427552b2c638ec17d7c07e4b0e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Jun 2016 17:16:13 +0200
Subject: [PATCH 0391/1304] functional tests: skip test if a remote fetching
 fails

It was provoking so many false positives.

This means we won't always be doing a full TestFetch but in some
distributions the test will run until the end so we can verify we didn't
break anything.

Later we can consider retrying if a remote fetch fails. Or even better,
always fetch from the local test ACI server and implement/run our own
Docker server and fetch from that. Or wait for OCI support and implement
a local OCI server :).
---
 tests/rkt_fetch_test.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index d0c1a453a9..945ef98754 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -161,7 +161,11 @@ func testFetchDefault(t *testing.T, arg string, image string, imageArgs string,
 	if err := expectWithOutput(child, remoteFetchMsg); err != nil {
 		t.Fatalf("%q should be found: %v", remoteFetchMsg, err)
 	}
-	child.Wait()
+	err := child.Wait()
+	status := getExitStatus(err)
+	if status != 0 {
+		t.Skip("remote fetching failed, probably a network failure. Skipping...")
+	}
 
 	// 2. Run cmd with the image available in the store, should get $storeMsg.
 	runRktAndCheckRegexOutput(t, cmd, storeMsg)
@@ -203,7 +207,11 @@ func testFetchNoStore(t *testing.T, args string, image string, imageArgs string,
 	if err := expectWithOutput(child, remoteFetchMsg); err != nil {
 		t.Fatalf("%q should be found: %v", remoteFetchMsg, err)
 	}
-	child.Wait()
+	err := child.Wait()
+	status := getExitStatus(err)
+	if status != 0 {
+		t.Skip("remote fetching failed, probably a network failure. Skipping...")
+	}
 }
 
 type synchronizedBool struct {

From fd4cc976a17b6098cffb0841f80b82e84e3e7d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 9 Jun 2016 11:35:32 +0200
Subject: [PATCH 0392/1304] functional tests: exec real binaries on TestFetch

If we exec /dev/null, rkt's exit status will be 203 and it will be a
failure. Instead, exec /etcdctl which will immediately exit with a
success status.
---
 tests/rkt_fetch_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 945ef98754..d7029633ff 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -101,8 +101,8 @@ func TestFetch(t *testing.T) {
 		{"--insecure-options=image fetch", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
 		{"--insecure-options=image fetch", "docker://busybox", "", "docker://busybox"},
 		{"--insecure-options=image fetch", "docker://busybox:latest", "", "docker://busybox:latest"},
-		{"--insecure-options=image run --mds-register=false", "coreos.com/etcd:v2.1.2", "--exec /dev/null", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image run --mds-register=false", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "--exec /dev/null", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
+		{"--insecure-options=image run --mds-register=false", "coreos.com/etcd:v2.1.2", "--exec /etcdctl", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
+		{"--insecure-options=image run --mds-register=false", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "--exec /etcdctl", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
 		{"--insecure-options=image run --mds-register=false", "docker://busybox", "", "docker://busybox"},
 		{"--insecure-options=image run --mds-register=false", "docker://busybox:latest", "", "docker://busybox:latest"},
 		{"--insecure-options=image prepare", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},

From 98545e1c7b22480679aa7e75cb61d2a3f9188b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 9 Jun 2016 11:36:57 +0200
Subject: [PATCH 0393/1304] functional tests: add more info if we skip
 TestFetch

Namely, rkt's output.
---
 tests/rkt_fetch_test.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index d7029633ff..3c3d56ae27 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -164,6 +164,7 @@ func testFetchDefault(t *testing.T, arg string, image string, imageArgs string,
 	err := child.Wait()
 	status := getExitStatus(err)
 	if status != 0 {
+		t.Errorf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
 		t.Skip("remote fetching failed, probably a network failure. Skipping...")
 	}
 
@@ -210,6 +211,7 @@ func testFetchNoStore(t *testing.T, args string, image string, imageArgs string,
 	err := child.Wait()
 	status := getExitStatus(err)
 	if status != 0 {
+		t.Errorf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
 		t.Skip("remote fetching failed, probably a network failure. Skipping...")
 	}
 }

From dc7369e3bd5f76341dbfd0d7c2fb860085e16cb3 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Fri, 10 Jun 2016 11:19:58 -0700
Subject: [PATCH 0394/1304] Godeps: Update sys/unix to get arm64 support

Update to golang/sys@b44883b.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 Godeps/Godeps.json                            |    2 +-
 .../src/golang.org/x/sys/unix/.gitignore      |    1 +
 .../golang.org/x/sys/unix/asm_darwin_arm.s    |   30 +
 .../golang.org/x/sys/unix/asm_darwin_arm64.s  |   30 +
 .../golang.org/x/sys/unix/asm_linux_arm64.s   |   24 +
 ...sm_dragonfly_386.s => asm_linux_mips64x.s} |   17 +-
 .../golang.org/x/sys/unix/asm_linux_ppc64x.s  |   28 +
 .../golang.org/x/sys/unix/asm_linux_s390x.s   |   28 +
 .../golang.org/x/sys/unix/asm_solaris_amd64.s |   17 +-
 .../golang.org/x/sys/unix/bluetooth_linux.go  |   35 +
 .../src/golang.org/x/sys/unix/gccgo.go        |   17 +-
 .../src/golang.org/x/sys/unix/gccgo_c.c       |    4 +-
 .../src/golang.org/x/sys/unix/mkall.sh        |   62 +-
 .../src/golang.org/x/sys/unix/mkerrors.sh     |   48 +-
 .../src/golang.org/x/sys/unix/mkpost.go       |   62 +
 .../src/golang.org/x/sys/unix/mksyscall.pl    |    7 +
 .../x/sys/unix/mksyscall_solaris.pl           |   46 +-
 .../golang.org/x/sys/unix/mksysctl_openbsd.pl |    7 +
 .../golang.org/x/sys/unix/mksysnum_darwin.pl  |    7 +
 .../x/sys/unix/mksysnum_dragonfly.pl          |    7 +
 .../golang.org/x/sys/unix/mksysnum_freebsd.pl |    7 +
 .../golang.org/x/sys/unix/mksysnum_linux.pl   |   24 +-
 .../golang.org/x/sys/unix/mksysnum_netbsd.pl  |    7 +
 .../golang.org/x/sys/unix/mksysnum_openbsd.pl |    7 +
 .../src/golang.org/x/sys/unix/so_solaris.go   |  261 ---
 .../golang.org/x/sys/unix/sockcmsg_unix.go    |    8 +-
 .../src/golang.org/x/sys/unix/str.go          |    6 +-
 .../src/golang.org/x/sys/unix/syscall.go      |    2 +
 .../src/golang.org/x/sys/unix/syscall_bsd.go  |   92 +-
 .../x/sys/unix/syscall_darwin_386.go          |    8 +-
 .../x/sys/unix/syscall_darwin_amd64.go        |   10 +-
 ...dragonfly_386.go => syscall_darwin_arm.go} |   24 +-
 .../x/sys/unix/syscall_darwin_arm64.go        |   77 +
 .../x/sys/unix/syscall_dragonfly_amd64.go     |    4 +-
 .../x/sys/unix/syscall_freebsd_386.go         |    4 +-
 .../x/sys/unix/syscall_freebsd_amd64.go       |    4 +-
 .../x/sys/unix/syscall_freebsd_arm.go         |    4 +-
 .../golang.org/x/sys/unix/syscall_linux.go    |  152 +-
 .../x/sys/unix/syscall_linux_386.go           |   37 +-
 .../x/sys/unix/syscall_linux_amd64.go         |   41 +-
 .../x/sys/unix/syscall_linux_arm.go           |   54 +-
 .../x/sys/unix/syscall_linux_arm64.go         |  180 ++
 .../x/sys/unix/syscall_linux_mips64x.go       |  206 ++
 .../x/sys/unix/syscall_linux_ppc64x.go        |  126 +
 .../x/sys/unix/syscall_linux_s390x.go         |  320 +++
 .../x/sys/unix/syscall_netbsd_386.go          |    4 +-
 .../x/sys/unix/syscall_netbsd_amd64.go        |    4 +-
 .../x/sys/unix/syscall_netbsd_arm.go          |    4 +-
 .../x/sys/unix/syscall_openbsd_386.go         |    4 +-
 .../x/sys/unix/syscall_openbsd_amd64.go       |    4 +-
 .../golang.org/x/sys/unix/syscall_solaris.go  |  247 +-
 .../x/sys/unix/syscall_solaris_amd64.go       |    6 +-
 .../src/golang.org/x/sys/unix/types_darwin.go |    7 +
 .../src/golang.org/x/sys/unix/types_linux.go  |   48 +-
 .../golang.org/x/sys/unix/types_solaris.go    |   38 +
 .../x/sys/unix/zerrors_darwin_386.go          |  197 +-
 .../x/sys/unix/zerrors_darwin_amd64.go        |   15 +-
 .../x/sys/unix/zerrors_darwin_arm.go          | 1293 +++++++++++
 ...agonfly_386.go => zerrors_darwin_arm64.go} | 1040 +++++----
 .../x/sys/unix/zerrors_dragonfly_amd64.go     |    2 +
 .../x/sys/unix/zerrors_freebsd_386.go         |   16 +
 .../x/sys/unix/zerrors_freebsd_amd64.go       |   16 +
 .../x/sys/unix/zerrors_freebsd_arm.go         |    2 +
 .../x/sys/unix/zerrors_linux_386.go           |   60 +
 .../x/sys/unix/zerrors_linux_amd64.go         |   60 +
 .../x/sys/unix/zerrors_linux_arm.go           |  168 ++
 .../x/sys/unix/zerrors_linux_arm64.go         | 1897 +++++++++++++++
 .../x/sys/unix/zerrors_linux_mips64.go        | 1917 ++++++++++++++++
 .../x/sys/unix/zerrors_linux_mips64le.go      | 1917 ++++++++++++++++
 .../x/sys/unix/zerrors_linux_ppc64.go         | 1970 ++++++++++++++++
 .../x/sys/unix/zerrors_linux_ppc64le.go       | 1969 ++++++++++++++++
 .../x/sys/unix/zerrors_linux_s390x.go         | 2027 +++++++++++++++++
 .../x/sys/unix/zerrors_netbsd_386.go          |    2 +
 .../x/sys/unix/zerrors_netbsd_amd64.go        |    2 +
 .../x/sys/unix/zerrors_netbsd_arm.go          |    2 +
 .../x/sys/unix/zerrors_openbsd_386.go         |    2 +
 .../x/sys/unix/zerrors_openbsd_amd64.go       |    2 +
 .../x/sys/unix/zerrors_solaris_amd64.go       |   28 +-
 .../x/sys/unix/zsyscall_darwin_386.go         |    3 +
 .../x/sys/unix/zsyscall_darwin_amd64.go       |   19 +
 ...ragonfly_386.go => zsyscall_darwin_arm.go} |  181 +-
 .../x/sys/unix/zsyscall_darwin_arm64.go       | 1427 ++++++++++++
 .../x/sys/unix/zsyscall_dragonfly_amd64.go    |    3 +
 .../x/sys/unix/zsyscall_freebsd_386.go        |    3 +
 .../x/sys/unix/zsyscall_freebsd_amd64.go      |    3 +
 .../x/sys/unix/zsyscall_freebsd_arm.go        |    3 +
 .../x/sys/unix/zsyscall_linux_386.go          |  444 ++--
 .../x/sys/unix/zsyscall_linux_amd64.go        |  444 ++--
 .../x/sys/unix/zsyscall_linux_arm.go          |  417 +---
 .../x/sys/unix/zsyscall_linux_arm64.go        | 1723 ++++++++++++++
 .../x/sys/unix/zsyscall_linux_mips64.go       | 1781 +++++++++++++++
 .../x/sys/unix/zsyscall_linux_mips64le.go     | 1781 +++++++++++++++
 .../x/sys/unix/zsyscall_linux_ppc64.go        | 1843 +++++++++++++++
 .../x/sys/unix/zsyscall_linux_ppc64le.go      | 1843 +++++++++++++++
 .../x/sys/unix/zsyscall_linux_s390x.go        | 1623 +++++++++++++
 .../x/sys/unix/zsyscall_netbsd_386.go         |    3 +
 .../x/sys/unix/zsyscall_netbsd_amd64.go       |    3 +
 .../x/sys/unix/zsyscall_netbsd_arm.go         |    3 +
 .../x/sys/unix/zsyscall_openbsd_386.go        |    3 +
 .../x/sys/unix/zsyscall_openbsd_amd64.go      |    3 +
 .../x/sys/unix/zsyscall_solaris_amd64.go      | 1003 ++++++--
 .../x/sys/unix/zsysnum_darwin_386.go          |   80 +-
 .../x/sys/unix/zsysnum_darwin_amd64.go        |   80 +-
 .../x/sys/unix/zsysnum_darwin_arm.go          |  358 +++
 .../x/sys/unix/zsysnum_darwin_arm64.go        |  398 ++++
 .../x/sys/unix/zsysnum_dragonfly_386.go       |  302 ---
 .../x/sys/unix/zsysnum_dragonfly_amd64.go     |    2 +
 .../x/sys/unix/zsysnum_freebsd_386.go         |    2 +
 .../x/sys/unix/zsysnum_freebsd_amd64.go       |    2 +
 .../x/sys/unix/zsysnum_freebsd_arm.go         |    2 +
 .../x/sys/unix/zsysnum_linux_386.go           |    2 +
 .../x/sys/unix/zsysnum_linux_amd64.go         |    2 +
 .../x/sys/unix/zsysnum_linux_arm.go           |    2 +
 .../x/sys/unix/zsysnum_linux_arm64.go         |  272 +++
 .../x/sys/unix/zsysnum_linux_mips64.go        |  327 +++
 .../x/sys/unix/zsysnum_linux_mips64le.go      |  327 +++
 .../x/sys/unix/zsysnum_linux_ppc64.go         |  360 +++
 .../x/sys/unix/zsysnum_linux_ppc64le.go       |  353 +++
 .../x/sys/unix/zsysnum_linux_s390x.go         |  328 +++
 .../x/sys/unix/zsysnum_netbsd_386.go          |    2 +
 .../x/sys/unix/zsysnum_netbsd_amd64.go        |    2 +
 .../x/sys/unix/zsysnum_netbsd_arm.go          |    2 +
 .../x/sys/unix/zsysnum_openbsd_386.go         |    2 +
 .../x/sys/unix/zsysnum_openbsd_amd64.go       |    2 +
 .../x/sys/unix/zsysnum_solaris_amd64.go       |    2 +
 .../x/sys/unix/ztypes_darwin_386.go           |    3 +-
 .../x/sys/unix/ztypes_darwin_amd64.go         |   12 +-
 ..._dragonfly_386.go => ztypes_darwin_arm.go} |  218 +-
 .../x/sys/unix/ztypes_darwin_arm64.go         |  457 ++++
 .../x/sys/unix/ztypes_dragonfly_amd64.go      |    2 +
 .../x/sys/unix/ztypes_freebsd_386.go          |   10 +
 .../x/sys/unix/ztypes_freebsd_amd64.go        |   10 +
 .../x/sys/unix/ztypes_freebsd_arm.go          |    2 +
 .../golang.org/x/sys/unix/ztypes_linux_386.go |   37 +-
 .../x/sys/unix/ztypes_linux_amd64.go          |   37 +-
 .../golang.org/x/sys/unix/ztypes_linux_arm.go |  130 +-
 .../x/sys/unix/ztypes_linux_arm64.go          |  604 +++++
 .../x/sys/unix/ztypes_linux_mips64.go         |  607 +++++
 .../x/sys/unix/ztypes_linux_mips64le.go       |  607 +++++
 .../x/sys/unix/ztypes_linux_ppc64.go          |  614 +++++
 .../x/sys/unix/ztypes_linux_ppc64le.go        |  614 +++++
 .../x/sys/unix/ztypes_linux_s390x.go          |  629 +++++
 .../x/sys/unix/ztypes_netbsd_386.go           |    2 +
 .../x/sys/unix/ztypes_netbsd_amd64.go         |    2 +
 .../x/sys/unix/ztypes_netbsd_arm.go           |    2 +
 .../x/sys/unix/ztypes_openbsd_386.go          |    2 +
 .../x/sys/unix/ztypes_openbsd_amd64.go        |    2 +
 .../x/sys/unix/ztypes_solaris_amd64.go        |   57 +
 148 files changed, 36824 insertions(+), 2720 deletions(-)
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s
 rename Godeps/_workspace/src/golang.org/x/sys/unix/{asm_dragonfly_386.s => asm_linux_mips64x.s} (56%)
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_s390x.s
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/bluetooth_linux.go
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/mkpost.go
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl
 mode change 100644 => 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/so_solaris.go
 rename Godeps/_workspace/src/golang.org/x/sys/unix/{syscall_dragonfly_386.go => syscall_darwin_arm.go} (67%)
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_mips64x.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_s390x.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go
 rename Godeps/_workspace/src/golang.org/x/sys/unix/{zerrors_dragonfly_386.go => zerrors_darwin_arm64.go} (66%)
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64le.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_s390x.go
 rename Godeps/_workspace/src/golang.org/x/sys/unix/{zsyscall_dragonfly_386.go => zsyscall_darwin_arm.go} (92%)
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_s390x.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_386.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_s390x.go
 rename Godeps/_workspace/src/golang.org/x/sys/unix/{ztypes_dragonfly_386.go => ztypes_darwin_arm.go} (68%)
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64le.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
 create mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_s390x.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index e7b5125206..141351f8d0 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -709,7 +709,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/sys/unix",
-			"Rev": "e11762ca30adc5b39fdbfd8c4250dabeb8e456d3"
+			"Rev": "b44883b474ffefa37335017174e397412b633a4f"
 		},
 		{
 			"ImportPath": "golang.org/x/tools/go/vcs",
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore b/Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore
new file mode 100644
index 0000000000..e482715909
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore
@@ -0,0 +1 @@
+_obj/
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s
new file mode 100644
index 0000000000..333242d506
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s
@@ -0,0 +1,30 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+// +build arm,darwin
+
+#include "textflag.h"
+
+//
+// System call support for ARM, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s
new file mode 100644
index 0000000000..97e0174371
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s
@@ -0,0 +1,30 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+// +build arm64,darwin
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	B	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s
new file mode 100644
index 0000000000..4be9bfedea
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s
@@ -0,0 +1,24 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build arm64
+// +build !gccgo
+
+#include "textflag.h"
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	B	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	B	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	B	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	B	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_386.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_mips64x.s
similarity index 56%
rename from Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_386.s
rename to Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_mips64x.s
index 7e55e0d317..724e580c4e 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_386.s
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_mips64x.s
@@ -1,29 +1,28 @@
-// Copyright 2009 The Go Authors. All rights reserved.
+// Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build linux
+// +build mips64 mips64le
 // +build !gccgo
 
 #include "textflag.h"
 
 //
-// System call support for 386, FreeBSD
+// System calls for mips64, Linux
 //
 
 // Just jump to package syscall's implementation for all these functions.
 // The runtime may know about them.
 
-TEXT	·Syscall(SB),NOSPLIT,$0-32
+TEXT	·Syscall(SB),NOSPLIT,$0-56
 	JMP	syscall·Syscall(SB)
 
-TEXT	·Syscall6(SB),NOSPLIT,$0-44
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
 	JMP	syscall·Syscall6(SB)
 
-TEXT	·Syscall9(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-32
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
 	JMP	syscall·RawSyscall(SB)
 
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-44
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
 	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s
new file mode 100644
index 0000000000..8d231feb4b
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s
@@ -0,0 +1,28 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build ppc64 ppc64le
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for ppc64, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	BR	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	BR	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	BR	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	BR	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_s390x.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_s390x.s
new file mode 100644
index 0000000000..11889859fb
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_s390x.s
@@ -0,0 +1,28 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x
+// +build linux
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for s390x, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-56
+	BR	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	BR	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	BR	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	BR	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s
index a33708f0c0..43ed17a05f 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s
@@ -4,21 +4,14 @@
 
 // +build !gccgo
 
+#include "textflag.h"
+
 //
-// System calls for amd64, Solaris are implemented in runtime/syscall_solaris.goc
+// System calls for amd64, Solaris are implemented in runtime/syscall_solaris.go
 //
 
-TEXT ·sysvicall6(SB), 7, $0-64
+TEXT ·sysvicall6(SB),NOSPLIT,$0-64
 	JMP	syscall·sysvicall6(SB)
 
-TEXT ·rawSysvicall6(SB), 7, $0-64
+TEXT ·rawSysvicall6(SB),NOSPLIT,$0-64
 	JMP	syscall·rawSysvicall6(SB)
-
-TEXT ·dlopen(SB), 7, $0-16
-	JMP	syscall·dlopen(SB)
-
-TEXT ·dlclose(SB), 7, $0-8
-	JMP	syscall·dlclose(SB)
-
-TEXT ·dlsym(SB), 7, $0-16
-	JMP	syscall·dlsym(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/bluetooth_linux.go b/Godeps/_workspace/src/golang.org/x/sys/unix/bluetooth_linux.go
new file mode 100644
index 0000000000..6e32296970
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/bluetooth_linux.go
@@ -0,0 +1,35 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Bluetooth sockets and messages
+
+package unix
+
+// Bluetooth Protocols
+const (
+	BTPROTO_L2CAP  = 0
+	BTPROTO_HCI    = 1
+	BTPROTO_SCO    = 2
+	BTPROTO_RFCOMM = 3
+	BTPROTO_BNEP   = 4
+	BTPROTO_CMTP   = 5
+	BTPROTO_HIDP   = 6
+	BTPROTO_AVDTP  = 7
+)
+
+const (
+	HCI_CHANNEL_RAW     = 0
+	HCI_CHANNEL_USER    = 1
+	HCI_CHANNEL_MONITOR = 2
+	HCI_CHANNEL_CONTROL = 3
+)
+
+// Socketoption Level
+const (
+	SOL_BLUETOOTH = 0x112
+	SOL_HCI       = 0x0
+	SOL_L2CAP     = 0x6
+	SOL_RFCOMM    = 0x12
+	SOL_SCO       = 0x11
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go b/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go
index 5fc9bc9045..94c8232124 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go
@@ -12,28 +12,35 @@ import "syscall"
 // much of the functionality can be written directly in Go.
 
 //extern gccgoRealSyscall
-func realSyscall(trap, a1, a2, a3, a4, a5, a6 uintptr) (r, errno uintptr)
+func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr)
 
 func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
 	syscall.Entersyscall()
-	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0)
+	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
 	syscall.Exitsyscall()
 	return r, 0, syscall.Errno(errno)
 }
 
 func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
 	syscall.Entersyscall()
-	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6)
+	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
+	syscall.Exitsyscall()
+	return r, 0, syscall.Errno(errno)
+}
+
+func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	syscall.Entersyscall()
+	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9)
 	syscall.Exitsyscall()
 	return r, 0, syscall.Errno(errno)
 }
 
 func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0)
+	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
 	return r, 0, syscall.Errno(errno)
 }
 
 func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6)
+	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
 	return r, 0, syscall.Errno(errno)
 }
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c b/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c
index 991980eaf7..07f6be0392 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c
@@ -21,12 +21,12 @@ struct ret {
 };
 
 struct ret
-gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6)
+gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
 {
 	struct ret r;
 
 	errno = 0;
-	r.r = syscall(trap, a1, a2, a3, a4, a5, a6);
+	r.r = syscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9);
 	r.err = errno;
 	return r;
 }
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh b/Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh
old mode 100644
new mode 100755
index 4632f89499..3e224c57e2
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh
@@ -107,6 +107,7 @@ case "$#" in
 	exit 2
 esac
 
+GOOSARCH_in=syscall_$GOOSARCH.go
 case "$GOOSARCH" in
 _* | *_ | _)
 	echo 'undefined $GOOS_$GOARCH:' "$GOOSARCH" 1>&2
@@ -115,12 +116,22 @@ _* | *_ | _)
 darwin_386)
 	mkerrors="$mkerrors -m32"
 	mksyscall="./mksyscall.pl -l32"
-	mksysnum="./mksysnum_darwin.pl /usr/include/sys/syscall.h"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 darwin_amd64)
 	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/sys/syscall.h"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+darwin_arm)
+	mkerrors="$mkerrors"
+	mksysnum="./mksysnum_darwin.pl /usr/include/sys/syscall.h"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+darwin_arm64)
+	mkerrors="$mkerrors -m64"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk iphoneos)/usr/include/sys/syscall.h"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 dragonfly_386)
@@ -150,7 +161,7 @@ freebsd_arm)
 	mkerrors="$mkerrors"
 	mksyscall="./mksyscall.pl -l32 -arm"
 	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	# Let the type of C char be singed for making the bare syscall
+	# Let the type of C char be signed for making the bare syscall
 	# API consistent across over platforms.
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
 	;;
@@ -173,9 +184,45 @@ linux_amd64)
 linux_arm)
 	mkerrors="$mkerrors"
 	mksyscall="./mksyscall.pl -l32 -arm"
-	mksysnum="curl -s 'http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/arch/arm/include/uapi/asm/unistd.h' | ./mksysnum_linux.pl"
+	mksysnum="curl -s 'http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/arch/arm/include/uapi/asm/unistd.h' | ./mksysnum_linux.pl -"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
+linux_arm64)
+	unistd_h=$(ls -1 /usr/include/asm/unistd.h /usr/include/asm-generic/unistd.h 2>/dev/null | head -1)
+	if [ "$unistd_h" = "" ]; then
+		echo >&2 cannot find unistd_64.h
+		exit 1
+	fi
+	mksysnum="./mksysnum_linux.pl $unistd_h"
+	# Let the type of C char be signed for making the bare syscall
+	# API consistent across over platforms.
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
+	;;
+linux_ppc64)
+	GOOSARCH_in=syscall_linux_ppc64x.go
+	unistd_h=/usr/include/asm/unistd.h
+	mkerrors="$mkerrors -m64"
+	mksysnum="./mksysnum_linux.pl $unistd_h"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+linux_ppc64le)
+	GOOSARCH_in=syscall_linux_ppc64x.go
+	unistd_h=/usr/include/powerpc64le-linux-gnu/asm/unistd.h
+	mkerrors="$mkerrors -m64"
+	mksysnum="./mksysnum_linux.pl $unistd_h"
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
+	;;
+linux_s390x)
+	GOOSARCH_in=syscall_linux_s390x.go
+	unistd_h=/usr/include/asm/unistd.h
+	mkerrors="$mkerrors -m64"
+	mksysnum="./mksysnum_linux.pl $unistd_h"
+	# Let the type of C char be signed to make the bare sys
+	# API more consistent between platforms.
+	# This is a deliberate departure from the way the syscall
+	# package generates its version of the types file.
+	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
+	;;
 netbsd_386)
 	mkerrors="$mkerrors -m32"
 	mksyscall="./mksyscall.pl -l32 -netbsd"
@@ -226,10 +273,13 @@ esac
 			syscall_goos="syscall_bsd.go $syscall_goos"
 			;;
 		esac
-		if [ -n "$mksyscall" ]; then echo "$mksyscall $syscall_goos syscall_$GOOSARCH.go |gofmt >zsyscall_$GOOSARCH.go"; fi
+		if [ -n "$mksyscall" ]; then echo "$mksyscall $syscall_goos $GOOSARCH_in |gofmt >zsyscall_$GOOSARCH.go"; fi
 		;;
 	esac
 	if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi
 	if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi
-	if [ -n "$mktypes" ]; then echo "$mktypes types_$GOOS.go |gofmt >ztypes_$GOOSARCH.go"; fi
+	if [ -n "$mktypes" ]; then
+		echo "echo // +build $GOARCH,$GOOS > ztypes_$GOOSARCH.go";
+		echo "$mktypes types_$GOOS.go | go run mkpost.go >>ztypes_$GOOSARCH.go";
+	fi
 ) | $run
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh b/Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh
old mode 100644
new mode 100755
index 29813778c0..c40d788c4a
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh
@@ -11,7 +11,17 @@ unset LANG
 export LC_ALL=C
 export LC_CTYPE=C
 
-CC=${CC:-gcc}
+if test -z "$GOARCH" -o -z "$GOOS"; then
+	echo 1>&2 "GOARCH or GOOS not defined in environment"
+	exit 1
+fi
+
+CC=${CC:-cc}
+
+if [[ "$GOOS" -eq "solaris" ]]; then
+	# Assumes GNU versions of utilities in PATH.
+	export PATH=/usr/gnu/bin:$PATH
+fi
 
 uname=$(uname)
 
@@ -33,7 +43,6 @@ includes_Darwin='
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
 #include <termios.h>
 '
 
@@ -88,7 +97,9 @@ includes_FreeBSD='
 includes_Linux='
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
+#ifndef __LP64__
 #define _FILE_OFFSET_BITS 64
+#endif
 #define _GNU_SOURCE
 
 #include <bits/sockaddr.h>
@@ -117,11 +128,19 @@ includes_Linux='
 #include <linux/wait.h>
 #include <linux/icmpv6.h>
 #include <net/route.h>
-#include <termios.h>
+#include <asm/termbits.h>
 
 #ifndef MSG_FASTOPEN
 #define MSG_FASTOPEN    0x20000000
 #endif
+
+#ifndef PTRACE_GETREGS
+#define PTRACE_GETREGS	0xc
+#endif
+
+#ifndef PTRACE_SETREGS
+#define PTRACE_SETREGS	0xd
+#endif
 '
 
 includes_NetBSD='
@@ -186,6 +205,7 @@ includes_OpenBSD='
 '
 
 includes_SunOS='
+#include <limits.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
@@ -245,6 +265,7 @@ ccflags="$@"
 		$2 ~ /^(SIGEV_|SIGSTKSZ|SIGRT(MIN|MAX))/ {next}
 		$2 ~ /^(SCM_SRCRT)$/ {next}
 		$2 ~ /^(MAP_FAILED)$/ {next}
+		$2 ~ /^ELF_.*$/ {next}# <asm/elf.h> contains ELF_ARCH, etc.
 
 		$2 ~ /^EXTATTR_NAMESPACE_NAMES/ ||
 		$2 ~ /^EXTATTR_NAMESPACE_[A-Z]+_STRING/ {next}
@@ -255,21 +276,31 @@ ccflags="$@"
 		$2 !~ /^EXPR_/ &&
 		$2 ~ /^E[A-Z0-9_]+$/ ||
 		$2 ~ /^B[0-9_]+$/ ||
+		$2 == "BOTHER" ||
+		$2 ~ /^CI?BAUD(EX)?$/ ||
+		$2 == "IBSHIFT" ||
 		$2 ~ /^V[A-Z0-9]+$/ ||
 		$2 ~ /^CS[A-Z0-9]/ ||
-		$2 ~ /^I(SIG|CANON|CRNL|EXTEN|MAXBEL|STRIP|UTF8)$/ ||
+		$2 ~ /^I(SIG|CANON|CRNL|UCLC|EXTEN|MAXBEL|STRIP|UTF8)$/ ||
 		$2 ~ /^IGN/ ||
 		$2 ~ /^IX(ON|ANY|OFF)$/ ||
 		$2 ~ /^IN(LCR|PCK)$/ ||
 		$2 ~ /(^FLU?SH)|(FLU?SH$)/ ||
-		$2 ~ /^C(LOCAL|READ)$/ ||
+		$2 ~ /^C(LOCAL|READ|MSPAR|RTSCTS)$/ ||
 		$2 == "BRKINT" ||
 		$2 == "HUPCL" ||
 		$2 == "PENDIN" ||
 		$2 == "TOSTOP" ||
+		$2 == "XCASE" ||
+		$2 == "ALTWERASE" ||
+		$2 == "NOKERNINFO" ||
 		$2 ~ /^PAR/ ||
 		$2 ~ /^SIG[^_]/ ||
-		$2 ~ /^O[CNPFP][A-Z]+[^_][A-Z]+$/ ||
+		$2 ~ /^O[CNPFPL][A-Z]+[^_][A-Z]+$/ ||
+		$2 ~ /^(NL|CR|TAB|BS|VT|FF)DLY$/ ||
+		$2 ~ /^(NL|CR|TAB|BS|VT|FF)[0-9]$/ ||
+		$2 ~ /^O?XTABS$/ ||
+		$2 ~ /^TC[IO](ON|OFF)$/ ||
 		$2 ~ /^IN_/ ||
 		$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
 		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|ICMP6|TCP|EVFILT|NOTE|EV|SHUT|PROT|MAP|PACKET|MSG|SCM|MCL|DT|MADV|PR)_/ ||
@@ -288,6 +319,9 @@ ccflags="$@"
 		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P)_/ ||
 		$2 ~ /^SIOC/ ||
 		$2 ~ /^TIOC/ ||
+		$2 ~ /^TCGET/ ||
+		$2 ~ /^TCSET/ ||
+		$2 ~ /^TC(FLSH|SBRKP?|XONC)$/ ||
 		$2 !~ "RTF_BITS" &&
 		$2 ~ /^(IFF|IFT|NET_RT|RTM|RTF|RTV|RTA|RTAX)_/ ||
 		$2 ~ /^BIOC/ ||
@@ -336,6 +370,8 @@ echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
 echo '// mkerrors.sh' "$@"
 echo '// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT'
 echo
+echo "// +build ${GOARCH},${GOOS}"
+echo
 go tool cgo -godefs -- "$@" _const.go >_error.out
 cat _error.out | grep -vf _error.grep | grep -vf _signal.grep
 echo
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mkpost.go b/Godeps/_workspace/src/golang.org/x/sys/unix/mkpost.go
new file mode 100644
index 0000000000..ed50d902af
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mkpost.go
@@ -0,0 +1,62 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+// mkpost processes the output of cgo -godefs to
+// modify the generated types. It is used to clean up
+// the sys API in an architecture specific manner.
+//
+// mkpost is run after cgo -godefs by mkall.sh.
+package main
+
+import (
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"log"
+	"os"
+	"regexp"
+)
+
+func main() {
+	b, err := ioutil.ReadAll(os.Stdin)
+	if err != nil {
+		log.Fatal(err)
+	}
+	s := string(b)
+
+	goarch := os.Getenv("GOARCH")
+	goos := os.Getenv("GOOS")
+	if goarch == "s390x" && goos == "linux" {
+		// Export the types of PtraceRegs fields.
+		re := regexp.MustCompile("ptrace(Psw|Fpregs|Per)")
+		s = re.ReplaceAllString(s, "Ptrace$1")
+
+		// Replace padding fields inserted by cgo with blank identifiers.
+		re = regexp.MustCompile("Pad_cgo[A-Za-z0-9_]*")
+		s = re.ReplaceAllString(s, "_")
+
+		// Replace other unwanted fields with blank identifiers.
+		re = regexp.MustCompile("X_[A-Za-z0-9_]*")
+		s = re.ReplaceAllString(s, "_")
+
+		// Replace the control_regs union with a blank identifier for now.
+		re = regexp.MustCompile("(Control_regs)\\s+\\[0\\]uint64")
+		s = re.ReplaceAllString(s, "_ [0]uint64")
+	}
+
+	// gofmt
+	b, err = format.Source([]byte(s))
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Append this command to the header to show where the new file
+	// came from.
+	re := regexp.MustCompile("(cgo -godefs [a-zA-Z0-9_]+\\.go.*)")
+	b = re.ReplaceAll(b, []byte("$1 | go run mkpost.go"))
+
+	fmt.Printf("%s", b)
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl
old mode 100644
new mode 100755
index ec0103ca30..b1e7766dae
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl
@@ -63,6 +63,11 @@
 	exit 1;
 }
 
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
 sub parseparamlist($) {
 	my ($list) = @_;
 	$list =~ s/^\s*//;
@@ -302,6 +307,8 @@ ($)
 // $cmdline
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
 package unix
 
 import (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl
old mode 100644
new mode 100755
index e8ec976fea..06bade7687
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl
@@ -38,6 +38,11 @@
 	exit 1;
 }
 
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
 sub parseparamlist($) {
 	my ($list) = @_;
 	$list =~ s/^\s*//;
@@ -60,9 +65,9 @@ ($)
 
 my $package = "";
 my $text = "";
-my $vars = "";
-my $mods = "";
-my $modnames = "";
+my $dynimports = "";
+my $linknames = "";
+my @vars = ();
 while(<>) {
 	chomp;
 	s/\s+/ /g;
@@ -90,11 +95,6 @@ ($)
 	if($modname eq "") {
 		$modname = "libc";
 	}
-	my $modvname = "mod$modname";
-	if($modnames !~ /$modname/) {
-		$modnames .= ".$modname";
-		$mods .= "\t$modvname = newLazySO(\"$modname.so\")\n";
-	}
 
 	# System call name.
 	if($sysname eq "") {
@@ -107,9 +107,14 @@ ($)
 	my $strconvfunc = "BytePtrFromString";
 	my $strconvtype = "*byte";
 
-	# Library proc address variable.
 	$sysname =~ y/A-Z/a-z/; # All libc functions are lowercase.
-	$vars .= "\t$sysvarname = $modvname.NewProc(\"$sysname\")\n";
+
+	# Runtime import of function to allow cross-platform builds.
+	$dynimports .= "//go:cgo_import_dynamic libc_${sysname} ${sysname} \"$modname.so\"\n";
+	# Link symbol to proc address variable.
+	$linknames .= "//go:linkname ${sysvarname} libc_${sysname}\n";
+	# Library proc address variable.
+	push @vars, $sysvarname;
 
 	# Go function header.
 	$out = join(', ', @out);
@@ -193,7 +198,7 @@ ($)
 
 	# Actual call.
 	my $args = join(', ', @args);
-	my $call = "$asm($sysvarname.Addr(), $nargs, $args)";
+	my $call = "$asm(uintptr(unsafe.Pointer(&$sysvarname)), $nargs, $args)";
 
 	# Assign return values.
 	my $body = "";
@@ -260,21 +265,30 @@ ($)
 // $cmdline
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
 package $package
 
-import "unsafe"
+import (
+	"syscall"
+	"unsafe"
+)
 EOF
 
 print "import \"golang.org/x/sys/unix\"\n" if $package ne "unix";
 
-print <<EOF;
+my $vardecls = "\t" . join(",\n\t", @vars);
+$vardecls .= " syscallFunc";
+
+chomp($_=<<EOF);
 
+$dynimports
+$linknames
 var (
-$mods
-$vars
+$vardecls
 )
 
 $text
-
 EOF
+print $_;
 exit 0;
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl
old mode 100644
new mode 100755
index 6f540ba8a7..be67afa417
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl
@@ -14,6 +14,11 @@
 
 use strict;
 
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
 my $debug = 0;
 my %ctls = ();
 
@@ -237,6 +242,8 @@ ()
 // mksysctl_openbsd.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
 package unix;
 
 type mibentry struct {
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl
old mode 100644
new mode 100755
index 7601fbaa33..d3e5147fcb
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl
@@ -7,12 +7,19 @@
 
 use strict;
 
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
 my $command = "mksysnum_darwin.pl " . join(' ', @ARGV);
 
 print <<EOF;
 // $command
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl
old mode 100644
new mode 100755
index 25df4d38cf..266a248c75
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl
@@ -8,12 +8,19 @@
 
 use strict;
 
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
 my $command = "mksysnum_dragonfly.pl " . join(' ', @ARGV);
 
 print <<EOF;
 // $command
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl
old mode 100644
new mode 100755
index ea165a6f31..b767e124cc
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl
@@ -8,12 +8,19 @@
 
 use strict;
 
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
 my $command = "mksysnum_freebsd.pl " . join(' ', @ARGV);
 
 print <<EOF;
 // $command
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl
old mode 100644
new mode 100755
index 5204378f65..4d4017deb2
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl
@@ -5,12 +5,19 @@
 
 use strict;
 
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
 my $command = "mksysnum_linux.pl ". join(' ', @ARGV);
 
 print <<EOF;
 // $command
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
 package unix
 
 const(
@@ -18,13 +25,26 @@ package unix
 
 sub fmt {
 	my ($name, $num) = @_;
+	if($num > 999){
+		# ignore deprecated syscalls that are no longer implemented
+		# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h?id=refs/heads/master#n716
+		return;
+	}
 	$name =~ y/a-z/A-Z/;
 	print "	SYS_$name = $num;\n";
 }
 
 my $prev;
-while(<>){
-	if(/^#define __NR_(\w+)\s+([0-9]+)/){
+open(GCC, "gcc -E -dD $ARGV[0] |") || die "can't run gcc";
+while(<GCC>){
+	if(/^#define __NR_syscalls\s+/) {
+		# ignore redefinitions of __NR_syscalls
+	}
+	elsif(/^#define __NR_(\w+)\s+([0-9]+)/){
+		$prev = $2;
+		fmt($1, $2);
+	}
+	elsif(/^#define __NR3264_(\w+)\s+([0-9]+)/){
 		$prev = $2;
 		fmt($1, $2);
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl
old mode 100644
new mode 100755
index fc16fccb03..e74616a65a
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl
@@ -8,12 +8,19 @@
 
 use strict;
 
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
 my $command = "mksysnum_netbsd.pl " . join(' ', @ARGV);
 
 print <<EOF;
 // $command
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl
old mode 100644
new mode 100755
index 5dffa047ae..ae5aad5866
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl
@@ -8,12 +8,19 @@
 
 use strict;
 
+if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
+	print STDERR "GOARCH or GOOS not defined in environment\n";
+	exit 1;
+}
+
 my $command = "mksysnum_openbsd.pl " . join(' ', @ARGV);
 
 print <<EOF;
 // $command
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build $ENV{'GOARCH'},$ENV{'GOOS'}
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/so_solaris.go b/Godeps/_workspace/src/golang.org/x/sys/unix/so_solaris.go
deleted file mode 100644
index 9bd0b266a7..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/so_solaris.go
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unix
-
-import (
-	"sync"
-	"sync/atomic"
-	"syscall"
-	"unsafe"
-)
-
-// soError describes reasons for shared library load failures.
-type soError struct {
-	Err     error
-	ObjName string
-	Msg     string
-}
-
-func (e *soError) Error() string { return e.Msg }
-
-// Implemented in runtime/syscall_solaris.goc.
-func rawSysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func dlclose(handle uintptr) (err syscall.Errno)
-func dlopen(name *uint8, mode uintptr) (handle uintptr, err syscall.Errno)
-func dlsym(handle uintptr, name *uint8) (proc uintptr, err syscall.Errno)
-
-// A so implements access to a single shared library object.
-type so struct {
-	Name   string
-	Handle uintptr
-}
-
-// loadSO loads shared library file into memory.
-func loadSO(name string) (*so, error) {
-	namep, err := BytePtrFromString(name)
-	if err != nil {
-		return nil, err
-	}
-	h, e := dlopen(namep, 1) // RTLD_LAZY
-	if e != 0 {
-		return nil, &soError{
-			Err:     e,
-			ObjName: name,
-			Msg:     "Failed to load " + name + ": " + e.Error(),
-		}
-	}
-	d := &so{
-		Name:   name,
-		Handle: uintptr(h),
-	}
-	return d, nil
-}
-
-// mustLoadSO is like loadSO but panics if load operation fails.
-func mustLoadSO(name string) *so {
-	d, e := loadSO(name)
-	if e != nil {
-		panic(e)
-	}
-	return d
-}
-
-// FindProc searches shared library d for procedure named name and returns
-// *proc if found. It returns an error if the search fails.
-func (d *so) FindProc(name string) (*proc, error) {
-	namep, err := BytePtrFromString(name)
-	if err != nil {
-		return nil, err
-	}
-	a, _ := dlsym(uintptr(d.Handle), namep)
-	if a == 0 {
-		return nil, &soError{
-			Err:     ENOSYS,
-			ObjName: name,
-			Msg:     "Failed to find " + name + " procedure in " + d.Name,
-		}
-	}
-	p := &proc{
-		SO:   d,
-		Name: name,
-		addr: a,
-	}
-	return p, nil
-}
-
-// MustFindProc is like FindProc but panics if search fails.
-func (d *so) MustFindProc(name string) *proc {
-	p, e := d.FindProc(name)
-	if e != nil {
-		panic(e)
-	}
-	return p
-}
-
-// Release unloads shared library d from memory.
-func (d *so) Release() (err error) {
-	return dlclose(d.Handle)
-}
-
-// A proc implements access to a procedure inside a shared library.
-type proc struct {
-	SO   *so
-	Name string
-	addr uintptr
-}
-
-// Addr returns the address of the procedure represented by p.
-// The return value can be passed to Syscall to run the procedure.
-func (p *proc) Addr() uintptr {
-	return p.addr
-}
-
-// Call executes procedure p with arguments a. It will panic, if more then
-// 6 arguments are supplied.
-//
-// The returned error is always non-nil, constructed from the result of
-// GetLastError.  Callers must inspect the primary return value to decide
-// whether an error occurred (according to the semantics of the specific
-// function being called) before consulting the error. The error will be
-// guaranteed to contain syscall.Errno.
-func (p *proc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
-	switch len(a) {
-	case 0:
-		return sysvicall6(p.Addr(), uintptr(len(a)), 0, 0, 0, 0, 0, 0)
-	case 1:
-		return sysvicall6(p.Addr(), uintptr(len(a)), a[0], 0, 0, 0, 0, 0)
-	case 2:
-		return sysvicall6(p.Addr(), uintptr(len(a)), a[0], a[1], 0, 0, 0, 0)
-	case 3:
-		return sysvicall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], 0, 0, 0)
-	case 4:
-		return sysvicall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], 0, 0)
-	case 5:
-		return sysvicall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], 0)
-	case 6:
-		return sysvicall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5])
-	default:
-		panic("Call " + p.Name + " with too many arguments " + itoa(len(a)) + ".")
-	}
-	return
-}
-
-// A lazySO implements access to a single shared library.  It will delay
-// the load of the shared library until the first call to its Handle method
-// or to one of its lazyProc's Addr method.
-type lazySO struct {
-	mu   sync.Mutex
-	so   *so // non nil once SO is loaded
-	Name string
-}
-
-// Load loads single shared file d.Name into memory. It returns an error if
-// fails.  Load will not try to load SO, if it is already loaded into memory.
-func (d *lazySO) Load() error {
-	// Non-racy version of:
-	// if d.so == nil {
-	if atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&d.so))) == nil {
-		d.mu.Lock()
-		defer d.mu.Unlock()
-		if d.so == nil {
-			so, e := loadSO(d.Name)
-			if e != nil {
-				return e
-			}
-			// Non-racy version of:
-			// d.so = so
-			atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&d.so)), unsafe.Pointer(so))
-		}
-	}
-	return nil
-}
-
-// mustLoad is like Load but panics if search fails.
-func (d *lazySO) mustLoad() {
-	e := d.Load()
-	if e != nil {
-		panic(e)
-	}
-}
-
-// Handle returns d's module handle.
-func (d *lazySO) Handle() uintptr {
-	d.mustLoad()
-	return uintptr(d.so.Handle)
-}
-
-// NewProc returns a lazyProc for accessing the named procedure in the SO d.
-func (d *lazySO) NewProc(name string) *lazyProc {
-	return &lazyProc{l: d, Name: name}
-}
-
-// newLazySO creates new lazySO associated with SO file.
-func newLazySO(name string) *lazySO {
-	return &lazySO{Name: name}
-}
-
-// A lazyProc implements access to a procedure inside a lazySO.
-// It delays the lookup until the Addr method is called.
-type lazyProc struct {
-	mu   sync.Mutex
-	Name string
-	l    *lazySO
-	proc *proc
-}
-
-// Find searches the shared library for procedure named p.Name. It returns an
-// error if search fails. Find will not search procedure, if it is already
-// found and loaded into memory.
-func (p *lazyProc) Find() error {
-	// Non-racy version of:
-	// if p.proc == nil {
-	if atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&p.proc))) == nil {
-		p.mu.Lock()
-		defer p.mu.Unlock()
-		if p.proc == nil {
-			e := p.l.Load()
-			if e != nil {
-				return e
-			}
-			proc, e := p.l.so.FindProc(p.Name)
-			if e != nil {
-				return e
-			}
-			// Non-racy version of:
-			// p.proc = proc
-			atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&p.proc)), unsafe.Pointer(proc))
-		}
-	}
-	return nil
-}
-
-// mustFind is like Find but panics if search fails.
-func (p *lazyProc) mustFind() {
-	e := p.Find()
-	if e != nil {
-		panic(e)
-	}
-}
-
-// Addr returns the address of the procedure represented by p.
-// The return value can be passed to Syscall to run the procedure.
-func (p *lazyProc) Addr() uintptr {
-	p.mustFind()
-	return p.proc.Addr()
-}
-
-// Call executes procedure p with arguments a. It will panic, if more then
-// 6 arguments are supplied.
-//
-// The returned error is always non-nil, constructed from the result of
-// GetLastError.  Callers must inspect the primary return value to decide
-// whether an error occurred (according to the semantics of the specific
-// function being called) before consulting the error. The error will be
-// guaranteed to contain syscall.Errno.
-func (p *lazyProc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
-	p.mustFind()
-	return p.proc.Call(a...)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go b/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go
index 6668bec711..f1493a3e6f 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go
@@ -62,7 +62,7 @@ func ParseSocketControlMessage(b []byte) ([]SocketControlMessage, error) {
 
 func socketControlMessageHeaderAndData(b []byte) (*Cmsghdr, []byte, error) {
 	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	if h.Len < SizeofCmsghdr || int(h.Len) > len(b) {
+	if h.Len < SizeofCmsghdr || uint64(h.Len) > uint64(len(b)) {
 		return nil, nil, EINVAL
 	}
 	return h, b[cmsgAlignOf(SizeofCmsghdr):h.Len], nil
@@ -77,10 +77,10 @@ func UnixRights(fds ...int) []byte {
 	h.Level = SOL_SOCKET
 	h.Type = SCM_RIGHTS
 	h.SetLen(CmsgLen(datalen))
-	data := uintptr(cmsgData(h))
+	data := cmsgData(h)
 	for _, fd := range fds {
-		*(*int32)(unsafe.Pointer(data)) = int32(fd)
-		data += 4
+		*(*int32)(data) = int32(fd)
+		data = unsafe.Pointer(uintptr(data) + 4)
 	}
 	return b
 }
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/str.go b/Godeps/_workspace/src/golang.org/x/sys/unix/str.go
index f873edecc7..35ed664353 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/str.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/str.go
@@ -8,8 +8,12 @@ package unix
 
 func itoa(val int) string { // do it here rather than with fmt to avoid dependency
 	if val < 0 {
-		return "-" + itoa(-val)
+		return "-" + uitoa(uint(-val))
 	}
+	return uitoa(uint(val))
+}
+
+func uitoa(val uint) string {
 	var buf [32]byte // big enough for int64
 	i := len(buf) - 1
 	for val >= 10 {
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go
index a48d47cff8..571e6993c3 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go
@@ -68,6 +68,8 @@ func (tv *Timeval) Nano() int64 {
 	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
 }
 
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+
 // use is a no-op, but the compiler cannot see that it is.
 // Calling use(p) ensures that p is kept live until that point.
 //go:noescape
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go
index 7b08113bf3..e9671764cc 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go
@@ -450,16 +450,34 @@ func Kevent(kq int, changes, events []Kevent_t, timeout *Timespec) (n int, err e
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
 
-func Sysctl(name string) (value string, err error) {
+// sysctlmib translates name to mib number and appends any additional args.
+func sysctlmib(name string, args ...int) ([]_C_int, error) {
 	// Translate name to mib number.
 	mib, err := nametomib(name)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, a := range args {
+		mib = append(mib, _C_int(a))
+	}
+
+	return mib, nil
+}
+
+func Sysctl(name string) (string, error) {
+	return SysctlArgs(name)
+}
+
+func SysctlArgs(name string, args ...int) (string, error) {
+	mib, err := sysctlmib(name, args...)
 	if err != nil {
 		return "", err
 	}
 
 	// Find size.
 	n := uintptr(0)
-	if err = sysctl(mib, nil, &n, nil, 0); err != nil {
+	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
 		return "", err
 	}
 	if n == 0 {
@@ -468,7 +486,7 @@ func Sysctl(name string) (value string, err error) {
 
 	// Read into buffer of that size.
 	buf := make([]byte, n)
-	if err = sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
 		return "", err
 	}
 
@@ -479,17 +497,19 @@ func Sysctl(name string) (value string, err error) {
 	return string(buf[0:n]), nil
 }
 
-func SysctlUint32(name string) (value uint32, err error) {
-	// Translate name to mib number.
-	mib, err := nametomib(name)
+func SysctlUint32(name string) (uint32, error) {
+	return SysctlUint32Args(name)
+}
+
+func SysctlUint32Args(name string, args ...int) (uint32, error) {
+	mib, err := sysctlmib(name, args...)
 	if err != nil {
 		return 0, err
 	}
 
-	// Read into buffer of that size.
 	n := uintptr(4)
 	buf := make([]byte, 4)
-	if err = sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
 		return 0, err
 	}
 	if n != 4 {
@@ -498,9 +518,55 @@ func SysctlUint32(name string) (value uint32, err error) {
 	return *(*uint32)(unsafe.Pointer(&buf[0])), nil
 }
 
+func SysctlUint64(name string, args ...int) (uint64, error) {
+	mib, err := sysctlmib(name, args...)
+	if err != nil {
+		return 0, err
+	}
+
+	n := uintptr(8)
+	buf := make([]byte, 8)
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+		return 0, err
+	}
+	if n != 8 {
+		return 0, EIO
+	}
+	return *(*uint64)(unsafe.Pointer(&buf[0])), nil
+}
+
+func SysctlRaw(name string, args ...int) ([]byte, error) {
+	mib, err := sysctlmib(name, args...)
+	if err != nil {
+		return nil, err
+	}
+
+	// Find size.
+	n := uintptr(0)
+	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
+		return nil, err
+	}
+	if n == 0 {
+		return nil, nil
+	}
+
+	// Read into buffer of that size.
+	buf := make([]byte, n)
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+		return nil, err
+	}
+
+	// The actual call may return less than the original reported required
+	// size so ensure we deal with that.
+	return buf[:n], nil
+}
+
 //sys	utimes(path string, timeval *[2]Timeval) (err error)
 
-func Utimes(path string, tv []Timeval) (err error) {
+func Utimes(path string, tv []Timeval) error {
+	if tv == nil {
+		return utimes(path, nil)
+	}
 	if len(tv) != 2 {
 		return EINVAL
 	}
@@ -508,6 +574,9 @@ func Utimes(path string, tv []Timeval) (err error) {
 }
 
 func UtimesNano(path string, ts []Timespec) error {
+	if ts == nil {
+		return utimes(path, nil)
+	}
 	// TODO: The BSDs can do utimensat with SYS_UTIMENSAT but it
 	// isn't supported by darwin so this uses utimes instead
 	if len(ts) != 2 {
@@ -524,7 +593,10 @@ func UtimesNano(path string, ts []Timespec) error {
 
 //sys	futimes(fd int, timeval *[2]Timeval) (err error)
 
-func Futimes(fd int, tv []Timeval) (err error) {
+func Futimes(fd int, tv []Timeval) error {
+	if tv == nil {
+		return futimes(fd, nil)
+	}
 	if len(tv) != 2 {
 		return EINVAL
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go
index 40bef13ce0..c172a3da5a 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build 386,darwin
+
 package unix
 
 import (
@@ -19,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
@@ -71,3 +71,7 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/386 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go
index 57bd190319..fc1e5a4a82 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build amd64,darwin
+
 package unix
 
 import (
@@ -9,6 +11,8 @@ import (
 	"unsafe"
 )
 
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+
 func Getpagesize() int { return 4096 }
 
 func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
@@ -19,8 +23,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
@@ -71,3 +73,7 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/amd64 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm.go
similarity index 67%
rename from Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_386.go
rename to Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm.go
index b3b02d4dbc..d286cf408d 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm.go
@@ -1,4 +1,4 @@
-// Copyright 2009 The Go Authors. All rights reserved.
+// Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -19,8 +19,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
@@ -28,6 +26,17 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 	return
 }
 
+//sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused.  The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = int32(sec)
+	tv.Usec = int32(usec)
+	return err
+}
+
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
 	k.Ident = uint32(fd)
 	k.Filter = int16(mode)
@@ -47,10 +56,11 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 }
 
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
+	var length = uint64(count)
+
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(*offset>>32), uintptr(unsafe.Pointer(&length)), 0, 0, 0, 0)
 
-	written = int(writtenOut)
+	written = int(length)
 
 	if e1 != 0 {
 		err = e1
@@ -58,4 +68,4 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 	return
 }
 
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go
new file mode 100644
index 0000000000..c33905cdcd
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go
@@ -0,0 +1,77 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm64,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 16384 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+//sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused.  The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = sec
+	tv.Usec = usec
+	return err
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var length = uint64(count)
+
+	_, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(unsafe.Pointer(&length)), 0, 0)
+
+	written = int(length)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/arm64 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
index 568ada119b..da7cb7982c 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build amd64,dragonfly
+
 package unix
 
 import (
@@ -19,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = nsec % 1e9 / 1e3
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go
index b3b02d4dbc..6a0cd804d8 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build 386,freebsd
+
 package unix
 
 import (
@@ -19,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go
index 568ada119b..e142540efa 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build amd64,freebsd
+
 package unix
 
 import (
@@ -19,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = nsec % 1e9 / 1e3
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go
index 4cf79fb43a..5504cb1255 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build arm,freebsd
+
 package unix
 
 import (
@@ -19,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return tv.Sec*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go
index e35959fe9a..9ca104c957 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go
@@ -20,10 +20,38 @@ import (
  * Wrapped
  */
 
-//sys	open(path string, mode int, perm uint32) (fd int, err error)
+func Access(path string, mode uint32) (err error) {
+	return Faccessat(AT_FDCWD, path, mode, 0)
+}
+
+func Chmod(path string, mode uint32) (err error) {
+	return Fchmodat(AT_FDCWD, path, mode, 0)
+}
+
+func Chown(path string, uid int, gid int) (err error) {
+	return Fchownat(AT_FDCWD, path, uid, gid, 0)
+}
+
+func Creat(path string, mode uint32) (fd int, err error) {
+	return Open(path, O_CREAT|O_WRONLY|O_TRUNC, mode)
+}
+
+//sys	Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error)
+
+func Link(oldpath string, newpath string) (err error) {
+	return Linkat(AT_FDCWD, oldpath, AT_FDCWD, newpath, 0)
+}
+
+func Mkdir(path string, mode uint32) (err error) {
+	return Mkdirat(AT_FDCWD, path, mode)
+}
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	return Mknodat(AT_FDCWD, path, mode, dev)
+}
 
 func Open(path string, mode int, perm uint32) (fd int, err error) {
-	return open(path, mode|O_LARGEFILE, perm)
+	return openat(AT_FDCWD, path, mode|O_LARGEFILE, perm)
 }
 
 //sys	openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
@@ -32,48 +60,73 @@ func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
 	return openat(dirfd, path, flags|O_LARGEFILE, mode)
 }
 
-//sysnb	pipe(p *[2]_C_int) (err error)
+//sys	readlinkat(dirfd int, path string, buf []byte) (n int, err error)
 
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
+func Readlink(path string, buf []byte) (n int, err error) {
+	return readlinkat(AT_FDCWD, path, buf)
+}
+
+func Rename(oldpath string, newpath string) (err error) {
+	return Renameat(AT_FDCWD, oldpath, AT_FDCWD, newpath)
 }
 
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+func Rmdir(path string) error {
+	return unlinkat(AT_FDCWD, path, AT_REMOVEDIR)
+}
 
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
+//sys	symlinkat(oldpath string, newdirfd int, newpath string) (err error)
+
+func Symlink(oldpath string, newpath string) (err error) {
+	return symlinkat(oldpath, AT_FDCWD, newpath)
+}
+
+func Unlink(path string) error {
+	return unlinkat(AT_FDCWD, path, 0)
+}
+
+//sys	unlinkat(dirfd int, path string, flags int) (err error)
+
+func Unlinkat(dirfd int, path string, flags int) error {
+	return unlinkat(dirfd, path, flags)
 }
 
 //sys	utimes(path string, times *[2]Timeval) (err error)
 
-func Utimes(path string, tv []Timeval) (err error) {
+func Utimes(path string, tv []Timeval) error {
+	if tv == nil {
+		err := utimensat(AT_FDCWD, path, nil, 0)
+		if err != ENOSYS {
+			return err
+		}
+		return utimes(path, nil)
+	}
 	if len(tv) != 2 {
 		return EINVAL
 	}
+	var ts [2]Timespec
+	ts[0] = NsecToTimespec(TimevalToNsec(tv[0]))
+	ts[1] = NsecToTimespec(TimevalToNsec(tv[1]))
+	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+	if err != ENOSYS {
+		return err
+	}
 	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
 }
 
 //sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
 
-func UtimesNano(path string, ts []Timespec) (err error) {
+func UtimesNano(path string, ts []Timespec) error {
+	if ts == nil {
+		err := utimensat(AT_FDCWD, path, nil, 0)
+		if err != ENOSYS {
+			return err
+		}
+		return utimes(path, nil)
+	}
 	if len(ts) != 2 {
 		return EINVAL
 	}
-	err = utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
 	if err != ENOSYS {
 		return err
 	}
@@ -87,7 +140,10 @@ func UtimesNano(path string, ts []Timespec) (err error) {
 	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
 }
 
-func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) (err error) {
+func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
+	if ts == nil {
+		return utimensat(dirfd, path, nil, flags)
+	}
 	if len(ts) != 2 {
 		return EINVAL
 	}
@@ -96,14 +152,17 @@ func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) (err error)
 
 //sys	futimesat(dirfd int, path *byte, times *[2]Timeval) (err error)
 
-func Futimesat(dirfd int, path string, tv []Timeval) (err error) {
-	if len(tv) != 2 {
-		return EINVAL
-	}
+func Futimesat(dirfd int, path string, tv []Timeval) error {
 	pathp, err := BytePtrFromString(path)
 	if err != nil {
 		return err
 	}
+	if tv == nil {
+		return futimesat(dirfd, pathp, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
 	return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
 }
 
@@ -335,6 +394,19 @@ func (sa *SockaddrNetlink) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrNetlink, nil
 }
 
+type SockaddrHCI struct {
+	Dev     uint16
+	Channel uint16
+	raw     RawSockaddrHCI
+}
+
+func (sa *SockaddrHCI) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_BLUETOOTH
+	sa.raw.Dev = sa.Dev
+	sa.raw.Channel = sa.Channel
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrHCI, nil
+}
+
 func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
 	switch rsa.Addr.Family {
 	case AF_NETLINK:
@@ -789,22 +861,17 @@ func Mount(source string, target string, fstype string, flags uintptr, data stri
 /*
  * Direct access
  */
-//sys	Access(path string, mode uint32) (err error)
 //sys	Acct(path string) (err error)
 //sys	Adjtimex(buf *Timex) (state int, err error)
 //sys	Chdir(path string) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
 //sys	Chroot(path string) (err error)
 //sys	ClockGettime(clockid int32, time *Timespec) (err error)
 //sys	Close(fd int) (err error)
-//sys	Creat(path string, mode uint32) (fd int, err error)
 //sys	Dup(oldfd int) (fd int, err error)
-//sys	Dup2(oldfd int, newfd int) (err error)
 //sys	Dup3(oldfd int, newfd int, flags int) (err error)
 //sysnb	EpollCreate(size int) (fd int, err error)
 //sysnb	EpollCreate1(flag int) (fd int, err error)
 //sysnb	EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Exit(code int) = SYS_EXIT_GROUP
 //sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fallocate(fd int, mode uint32, off int64, len int64) (err error)
@@ -831,32 +898,26 @@ func Getpgrp() (pid int) {
 //sysnb	Gettid() (tid int)
 //sys	Getxattr(path string, attr string, dest []byte) (sz int, err error)
 //sys	InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error)
-//sysnb	InotifyInit() (fd int, err error)
 //sysnb	InotifyInit1(flags int) (fd int, err error)
 //sysnb	InotifyRmWatch(fd int, watchdesc uint32) (success int, err error)
 //sysnb	Kill(pid int, sig syscall.Signal) (err error)
 //sys	Klogctl(typ int, buf []byte) (n int, err error) = SYS_SYSLOG
-//sys	Link(oldpath string, newpath string) (err error)
 //sys	Listxattr(path string, dest []byte) (sz int, err error)
-//sys	Mkdir(path string, mode uint32) (err error)
 //sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
 //sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Pause() (err error)
 //sys	PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT
 //sysnb prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) = SYS_PRLIMIT64
+//sys   Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error)
 //sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
 //sys	Removexattr(path string, attr string) (err error)
-//sys	Rename(oldpath string, newpath string) (err error)
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
-//sys	Rmdir(path string) (err error)
 //sys	Setdomainname(p []byte) (err error)
 //sys	Sethostname(p []byte) (err error)
 //sysnb	Setpgid(pid int, pgid int) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tv *Timeval) (err error)
+//sys	Setns(fd int, nstype int) (err error)
 
 // issue 1435.
 // On linux Setuid and Setgid only affects the current thread, not the process.
@@ -873,7 +934,6 @@ func Setgid(uid int) (err error) {
 
 //sys	Setpriority(which int, who int, prio int) (err error)
 //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
-//sys	Symlink(oldpath string, newpath string) (err error)
 //sys	Sync()
 //sysnb	Sysinfo(info *Sysinfo_t) (err error)
 //sys	Tee(rfd int, wfd int, len int, flags int) (n int64, err error)
@@ -881,12 +941,9 @@ func Setgid(uid int) (err error) {
 //sysnb	Times(tms *Tms) (ticks uintptr, err error)
 //sysnb	Umask(mask int) (oldmask int)
 //sysnb	Uname(buf *Utsname) (err error)
-//sys	Unlink(path string) (err error)
-//sys	Unlinkat(dirfd int, path string, flags int) (err error)
 //sys	Unmount(target string, flags int) (err error) = SYS_UMOUNT2
 //sys	Unshare(flags int) (err error)
 //sys	Ustat(dev int, ubuf *Ustat_t) (err error)
-//sys	Utime(path string, buf *Utimbuf) (err error)
 //sys	write(fd int, p []byte) (n int, err error)
 //sys	exitThread(code int) (err error) = SYS_EXIT
 //sys	readlen(fd int, p *byte, np int) (n int, err error) = SYS_READ
@@ -988,7 +1045,6 @@ func Munmap(b []byte) (err error) {
 // Personality
 // Poll
 // Ppoll
-// Prctl
 // Pselect6
 // Ptrace
 // Putpmsg
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go
index 3e1eab0da6..bea01cb506 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go
@@ -5,6 +5,8 @@
 // TODO(rsc): Rewrite all nn(SP) references into name+(nn-8)(FP)
 // so that go vet can check that they are correct.
 
+// +build 386,linux
+
 package unix
 
 import (
@@ -22,8 +24,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Sec = int32(nsec / 1e9)
@@ -31,9 +31,35 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 	return
 }
 
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 // 64-bit file system and 32-bit uid calls
 // (386 default is 32-bit file system and 16-bit uid).
-//sys	Chown(path string, uid int, gid int) (err error) = SYS_CHOWN32
+//sys	Dup2(oldfd int, newfd int) (err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64_64
 //sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
@@ -42,6 +68,7 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 //sysnb	Geteuid() (euid int) = SYS_GETEUID32
 //sysnb	Getgid() (gid int) = SYS_GETGID32
 //sysnb	Getuid() (uid int) = SYS_GETUID32
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Ioperm(from int, num int, on int) (err error)
 //sys	Iopl(level int) (err error)
 //sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
@@ -64,6 +91,8 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 //sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
 
 //sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Pause() (err error)
 
 func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
 	page := uintptr(offset / 4096)
@@ -152,6 +181,8 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 //sysnb	Gettimeofday(tv *Timeval) (err error)
 //sysnb	Time(t *Time_t) (tt Time_t, err error)
 
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
 // On x86 Linux, all the socket calls go through an extra indirection,
 // I think because the 5-register system call interface can't handle
 // the 6-argument calls like sendto and recvfrom.  Instead the
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go
index 7a89584ba8..721f24b68d 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go
@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build amd64,linux
+
 package unix
 
 import "syscall"
 
-//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
@@ -17,11 +20,13 @@ import "syscall"
 //sysnb	Getgid() (gid int)
 //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
 //sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Ioperm(from int, num int, on int) (err error)
 //sys	Iopl(level int) (err error)
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Listen(s int, n int) (err error)
 //sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
 //sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
 //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
@@ -58,8 +63,6 @@ import "syscall"
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
 
-func Getpagesize() int { return 4096 }
-
 //go:noescape
 func gettimeofday(tv *Timeval) (err syscall.Errno)
 
@@ -71,6 +74,8 @@ func Gettimeofday(tv *Timeval) (err error) {
 	return nil
 }
 
+func Getpagesize() int { return 4096 }
+
 func Time(t *Time_t) (tt Time_t, err error) {
 	var tv Timeval
 	errno := gettimeofday(&tv)
@@ -83,6 +88,8 @@ func Time(t *Time_t) (tt Time_t, err error) {
 	return Time_t(tv.Sec), nil
 }
 
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
 func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
@@ -91,8 +98,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Sec = nsec / 1e9
@@ -100,6 +105,32 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 	return
 }
 
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 func (r *PtraceRegs) PC() uint64 { return r.Rip }
 
 func (r *PtraceRegs) SetPC(pc uint64) { r.Rip = pc }
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go
index 073a7a3c6a..122df649af 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build arm,linux
+
 package unix
 
 import (
@@ -26,6 +28,30 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 	return
 }
 
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
 // Underlying system call writes to newoffset via pointer.
 // Implemented in assembly to avoid allocation.
 func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
@@ -57,13 +83,14 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 
 // 64-bit file system and 32-bit uid calls
 // (16-bit uid calls are not always supported in newer kernels)
-//sys	Chown(path string, uid int, gid int) (err error) = SYS_CHOWN32
+//sys	Dup2(oldfd int, newfd int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
 //sysnb	Getegid() (egid int) = SYS_GETEGID32
 //sysnb	Geteuid() (euid int) = SYS_GETEUID32
 //sysnb	Getgid() (gid int) = SYS_GETGID32
 //sysnb	Getuid() (uid int) = SYS_GETUID32
+//sysnb	InotifyInit() (fd int, err error)
 //sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
 //sys	Listen(s int, n int) (err error)
 //sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
@@ -81,7 +108,28 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 
 // Vsyscalls on amd64.
 //sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Time(t *Time_t) (tt Time_t, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Pause() (err error)
+
+func Time(t *Time_t) (Time_t, error) {
+	var tv Timeval
+	err := Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+func Utime(path string, buf *Utimbuf) error {
+	tv := []Timeval{
+		{Sec: buf.Actime},
+		{Sec: buf.Modtime},
+	}
+	return Utimes(path, tv)
+}
 
 //sys   Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
 //sys   Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
@@ -131,7 +179,7 @@ type rlimit32 struct {
 	Max uint32
 }
 
-//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_GETRLIMIT
+//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_UGETRLIMIT
 
 const rlimInf32 = ^uint32(0)
 const rlimInf64 = ^uint64(0)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go
new file mode 100644
index 0000000000..d105186803
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go
@@ -0,0 +1,180 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm64,linux
+
+package unix
+
+const _SYS_dup = SYS_DUP3
+
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Listen(s int, n int) (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+
+func Stat(path string, stat *Stat_t) (err error) {
+	return Fstatat(AT_FDCWD, path, stat, 0)
+}
+
+func Lchown(path string, uid int, gid int) (err error) {
+	return Fchownat(AT_FDCWD, path, uid, gid, AT_SYMLINK_NOFOLLOW)
+}
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	return Fstatat(AT_FDCWD, path, stat, AT_SYMLINK_NOFOLLOW)
+}
+
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+func Getpagesize() int { return 65536 }
+
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
+}
+
+func Time(t *Time_t) (Time_t, error) {
+	var tv Timeval
+	err := Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+func Utime(path string, buf *Utimbuf) error {
+	tv := []Timeval{
+		{Sec: buf.Actime},
+		{Sec: buf.Modtime},
+	}
+	return Utimes(path, tv)
+}
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Pc }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Pc = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+func InotifyInit() (fd int, err error) {
+	return InotifyInit1(0)
+}
+
+func Dup2(oldfd int, newfd int) (err error) {
+	return Dup3(oldfd, newfd, 0)
+}
+
+func Pause() (err error) {
+	_, _, e1 := Syscall6(SYS_PPOLL, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// TODO(dfc): constants that should be in zsysnum_linux_arm64.go, remove
+// these when the deprecated syscalls that the syscall package relies on
+// are removed.
+const (
+	SYS_GETPGRP      = 1060
+	SYS_UTIMES       = 1037
+	SYS_FUTIMESAT    = 1066
+	SYS_PAUSE        = 1061
+	SYS_USTAT        = 1070
+	SYS_UTIME        = 1063
+	SYS_LCHOWN       = 1032
+	SYS_TIME         = 1062
+	SYS_EPOLL_CREATE = 1042
+	SYS_EPOLL_WAIT   = 1069
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_mips64x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_mips64x.go
new file mode 100644
index 0000000000..bb15ba3e68
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_mips64x.go
@@ -0,0 +1,206 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build mips64 mips64le
+
+package unix
+
+// Linux introduced getdents64 syscall for N64 ABI only in 3.10
+// (May 21 2013, rev dec33abaafc89bcbd78f85fad0513170415a26d5),
+// to support older kernels, we have to use getdents for mips64.
+// Also note that struct dirent is different for these two.
+// Lookup linux_dirent{,64} in kernel source code for details.
+const _SYS_getdents = SYS_GETDENTS
+
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+func Getpagesize() int { return 65536 }
+
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	var tv Timeval
+	err = Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
+}
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Ioperm(from int, num int, on int) (err error) {
+	return ENOSYS
+}
+
+func Iopl(level int) (err error) {
+	return ENOSYS
+}
+
+type stat_t struct {
+	Dev        uint32
+	Pad0       [3]int32
+	Ino        uint64
+	Mode       uint32
+	Nlink      uint32
+	Uid        uint32
+	Gid        uint32
+	Rdev       uint32
+	Pad1       [3]uint32
+	Size       int64
+	Atime      uint32
+	Atime_nsec uint32
+	Mtime      uint32
+	Mtime_nsec uint32
+	Ctime      uint32
+	Ctime_nsec uint32
+	Blksize    uint32
+	Pad2       uint32
+	Blocks     int64
+}
+
+//sys	fstat(fd int, st *stat_t) (err error)
+//sys	lstat(path string, st *stat_t) (err error)
+//sys	stat(path string, st *stat_t) (err error)
+
+func Fstat(fd int, s *Stat_t) (err error) {
+	st := &stat_t{}
+	err = fstat(fd, st)
+	fillStat_t(s, st)
+	return
+}
+
+func Lstat(path string, s *Stat_t) (err error) {
+	st := &stat_t{}
+	err = lstat(path, st)
+	fillStat_t(s, st)
+	return
+}
+
+func Stat(path string, s *Stat_t) (err error) {
+	st := &stat_t{}
+	err = stat(path, st)
+	fillStat_t(s, st)
+	return
+}
+
+func fillStat_t(s *Stat_t, st *stat_t) {
+	s.Dev = st.Dev
+	s.Ino = st.Ino
+	s.Mode = st.Mode
+	s.Nlink = st.Nlink
+	s.Uid = st.Uid
+	s.Gid = st.Gid
+	s.Rdev = st.Rdev
+	s.Size = st.Size
+	s.Atim = Timespec{int64(st.Atime), int64(st.Atime_nsec)}
+	s.Mtim = Timespec{int64(st.Mtime), int64(st.Mtime_nsec)}
+	s.Ctim = Timespec{int64(st.Ctime), int64(st.Ctime_nsec)}
+	s.Blksize = st.Blksize
+	s.Blocks = st.Blocks
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Regs[64] }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Regs[64] = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go
new file mode 100644
index 0000000000..acd2e1c789
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go
@@ -0,0 +1,126 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build ppc64 ppc64le
+
+package unix
+
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error) = SYS_UGETRLIMIT
+//sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Ioperm(from int, num int, on int) (err error)
+//sys	Iopl(level int) (err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error) = SYS_SYNC_FILE_RANGE2
+//sys	Truncate(path string, length int64) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+func Getpagesize() int { return 65536 }
+
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Time(t *Time_t) (tt Time_t, err error)
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Nip }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Nip = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+//sysnb pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_s390x.go
new file mode 100644
index 0000000000..3f98904e3c
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_s390x.go
@@ -0,0 +1,320 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x,linux
+
+package unix
+
+import (
+	"unsafe"
+)
+
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+
+func Getpagesize() int { return 4096 }
+
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	var tv Timeval
+	err = Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0) // pipe2 is the same as pipe when flags are set to 0.
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Ioperm(from int, num int, on int) (err error) {
+	return ENOSYS
+}
+
+func Iopl(level int) (err error) {
+	return ENOSYS
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Psw.Addr }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Psw.Addr = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+// Linux on s390x uses the old mmap interface, which requires arguments to be passed in a struct.
+// mmap2 also requires arguments to be passed in a struct; it is currently not exposed in <asm/unistd.h>.
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	mmap_args := [6]uintptr{addr, length, uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset)}
+	r0, _, e1 := Syscall(SYS_MMAP, uintptr(unsafe.Pointer(&mmap_args[0])), 0, 0)
+	use(unsafe.Pointer(&mmap_args[0]))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// On s390x Linux, all the socket calls go through an extra indirection.
+// The arguments to the underlying system call (SYS_SOCKETCALL) are the
+// number below and a pointer to an array of uintptr.
+const (
+	// see linux/net.h
+	netSocket      = 1
+	netBind        = 2
+	netConnect     = 3
+	netListen      = 4
+	netAccept      = 5
+	netGetSockName = 6
+	netGetPeerName = 7
+	netSocketPair  = 8
+	netSend        = 9
+	netRecv        = 10
+	netSendTo      = 11
+	netRecvFrom    = 12
+	netShutdown    = 13
+	netSetSockOpt  = 14
+	netGetSockOpt  = 15
+	netSendMsg     = 16
+	netRecvMsg     = 17
+	netAccept4     = 18
+	netRecvMMsg    = 19
+	netSendMMsg    = 20
+)
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (int, error) {
+	args := [4]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags)}
+	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept4, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
+func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetSockName, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetPeerName, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func socketpair(domain int, typ int, flags int, fd *[2]int32) error {
+	args := [4]uintptr{uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd))}
+	_, _, err := RawSyscall(SYS_SOCKETCALL, netSocketPair, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netBind, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netConnect, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func socket(domain int, typ int, proto int) (int, error) {
+	args := [3]uintptr{uintptr(domain), uintptr(typ), uintptr(proto)}
+	fd, _, err := RawSyscall(SYS_SOCKETCALL, netSocket, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) error {
+	args := [5]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen))}
+	_, _, err := Syscall(SYS_SOCKETCALL, netGetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) error {
+	args := [4]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netSetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (int, error) {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen))}
+	n, _, err := Syscall(SYS_SOCKETCALL, netRecvFrom, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(n), nil
+}
+
+func sendto(s int, p []byte, flags int, to unsafe.Pointer, addrlen _Socklen) error {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(to), uintptr(addrlen)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netSendTo, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func recvmsg(s int, msg *Msghdr, flags int) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
+	n, _, err := Syscall(SYS_SOCKETCALL, netRecvMsg, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(n), nil
+}
+
+func sendmsg(s int, msg *Msghdr, flags int) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
+	n, _, err := Syscall(SYS_SOCKETCALL, netSendMsg, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(n), nil
+}
+
+func Listen(s int, n int) error {
+	args := [2]uintptr{uintptr(s), uintptr(n)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netListen, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func Shutdown(s, how int) error {
+	args := [2]uintptr{uintptr(s), uintptr(how)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netShutdown, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go
index bf73fff2e9..afaca09838 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build 386,netbsd
+
 package unix
 
 func Getpagesize() int { return 4096 }
@@ -14,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go
index 474a092cbd..a6ff04ce5b 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build amd64,netbsd
+
 package unix
 
 func Getpagesize() int { return 4096 }
@@ -14,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go
index 3c6755b3ed..68a6969b28 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build arm,netbsd
+
 package unix
 
 func Getpagesize() int { return 4096 }
@@ -14,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go
index 23b665c069..a66ddc59ce 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build 386,openbsd
+
 package unix
 
 func Getpagesize() int { return 4096 }
@@ -14,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go
index e5513534da..0776c1faf9 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build amd64,openbsd
+
 package unix
 
 func Getpagesize() int { return 4096 }
@@ -14,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = nsec % 1e9 / 1e3
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go
index 7e9626ad0d..eb489b159f 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go
@@ -13,10 +13,17 @@
 package unix
 
 import (
+	"sync/atomic"
 	"syscall"
 	"unsafe"
 )
 
+// Implemented in runtime/syscall_solaris.go.
+type syscallFunc uintptr
+
+func rawSysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
 type SockaddrDatalink struct {
 	Family uint16
 	Index  uint16
@@ -132,6 +139,8 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), sl, nil
 }
 
+//sys	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getsockname
+
 func Getsockname(fd int) (sa Sockaddr, err error) {
 	var rsa RawSockaddrAny
 	var len _Socklen = SizeofSockaddrAny
@@ -141,12 +150,23 @@ func Getsockname(fd int) (sa Sockaddr, err error) {
 	return anyToSockaddr(&rsa)
 }
 
-// The const provides a compile-time constant so clients
-// can adjust to whether there is a working Getwd and avoid
-// even linking this function into the binary.  See ../os/getwd.go.
-const ImplementsGetwd = false
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error)
 
-func Getwd() (string, error) { return "", ENOTSUP }
+func Getwd() (wd string, err error) {
+	var buf [PathMax]byte
+	// Getcwd will return an error if it failed for any reason.
+	_, err = Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
 
 /*
  * Wrapped
@@ -157,21 +177,20 @@ func Getwd() (string, error) { return "", ENOTSUP }
 
 func Getgroups() (gids []int, err error) {
 	n, err := getgroups(0, nil)
-	if err != nil {
-		return nil, err
-	}
-	if n == 0 {
-		return nil, nil
-	}
-
-	// Sanity check group count.  Max is 16 on BSD.
-	if n < 0 || n > 1000 {
+	// Check for error and sanity check group count.  Newer versions of
+	// Solaris allow up to 1024 (NGROUPS_MAX).
+	if n < 0 || n > 1024 {
+		if err != nil {
+			return nil, err
+		}
 		return nil, EINVAL
+	} else if n == 0 {
+		return nil, nil
 	}
 
 	a := make([]_Gid_t, n)
 	n, err = getgroups(n, &a[0])
-	if err != nil {
+	if n == -1 {
 		return nil, err
 	}
 	gids = make([]int, n)
@@ -270,29 +289,80 @@ func Gethostname() (name string, err error) {
 	return name, err
 }
 
-func UtimesNano(path string, ts []Timespec) (err error) {
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+func Utimes(path string, tv []Timeval) (err error) {
+	if tv == nil {
+		return utimes(path, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+//sys	utimensat(fd int, path string, times *[2]Timespec, flag int) (err error)
+
+func UtimesNano(path string, ts []Timespec) error {
+	if ts == nil {
+		return utimensat(AT_FDCWD, path, nil, 0)
+	}
 	if len(ts) != 2 {
 		return EINVAL
 	}
-	var tv [2]Timeval
-	for i := 0; i < 2; i++ {
-		tv[i].Sec = ts[i].Sec
-		tv[i].Usec = ts[i].Nsec / 1000
+	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+}
+
+func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
+	if ts == nil {
+		return utimensat(dirfd, path, nil, flags)
 	}
-	return Utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
 }
 
 //sys	fcntl(fd int, cmd int, arg int) (val int, err error)
 
 // FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
 func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
-	_, _, e1 := sysvicall6(procfcntl.Addr(), 3, uintptr(fd), uintptr(cmd), uintptr(unsafe.Pointer(lk)), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(unsafe.Pointer(lk)), 0, 0, 0)
 	if e1 != 0 {
 		return e1
 	}
 	return nil
 }
 
+//sys	futimesat(fildes int, path *byte, times *[2]Timeval) (err error)
+
+func Futimesat(dirfd int, path string, tv []Timeval) error {
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	if tv == nil {
+		return futimesat(dirfd, pathp, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+// Solaris doesn't have an futimes function because it allows NULL to be
+// specified as the path for futimesat.  However, Go doesn't like
+// NULL-style string interfaces, so this simple wrapper is provided.
+func Futimes(fd int, tv []Timeval) error {
+	if tv == nil {
+		return futimesat(fd, nil, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimesat(fd, nil, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
 func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
 	switch rsa.Addr.Family {
 	case AF_UNIX:
@@ -341,7 +411,7 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 	var rsa RawSockaddrAny
 	var len _Socklen = SizeofSockaddrAny
 	nfd, err = accept(fd, &rsa, &len)
-	if err != nil {
+	if nfd == -1 {
 		return
 	}
 	sa, err = anyToSockaddr(&rsa)
@@ -352,6 +422,8 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 	return
 }
 
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.recvmsg
+
 func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
 	var msg Msghdr
 	var rsa RawSockaddrAny
@@ -373,7 +445,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
 	}
 	msg.Iov = &iov
 	msg.Iovlen = 1
-	if n, err = recvmsg(fd, &msg, flags); err != nil {
+	if n, err = recvmsg(fd, &msg, flags); n == -1 {
 		return
 	}
 	oobn = int(msg.Accrightslen)
@@ -428,6 +500,67 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)
 	return n, nil
 }
 
+//sys	acct(path *byte) (err error)
+
+func Acct(path string) (err error) {
+	if len(path) == 0 {
+		// Assume caller wants to disable accounting.
+		return acct(nil)
+	}
+
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	return acct(pathp)
+}
+
+/*
+ * Expose the ioctl function
+ */
+
+//sys	ioctl(fd int, req int, arg uintptr) (err error)
+
+func IoctlSetInt(fd int, req int, value int) (err error) {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req int, value *Winsize) (err error) {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req int, value *Termios) (err error) {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermio(fd int, req int, value *Termio) (err error) {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlGetInt(fd int, req int) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req int) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req int) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermio(fd int, req int) (*Termio, error) {
+	var value Termio
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
 /*
  * Exposed directly
  */
@@ -438,21 +571,29 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)
 //sys	Chown(path string, uid int, gid int) (err error)
 //sys	Chroot(path string) (err error)
 //sys	Close(fd int) (err error)
+//sys	Creat(path string, mode uint32) (fd int, err error)
 //sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(oldfd int, newfd int) (err error)
 //sys	Exit(code int)
 //sys	Fchdir(fd int) (err error)
 //sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
+//sys	Fdatasync(fd int) (err error)
 //sys	Fpathconf(fd int, name int) (val int, err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
 //sys	Getdents(fd int, buf []byte, basep *uintptr) (n int, err error)
 //sysnb	Getgid() (gid int)
 //sysnb	Getpid() (pid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgid int, err error)
 //sys	Geteuid() (euid int)
 //sys	Getegid() (egid int)
 //sys	Getppid() (ppid int)
 //sys	Getpriority(which int, who int) (n int, err error)
 //sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
 //sysnb	Gettimeofday(tv *Timeval) (err error)
 //sysnb	Getuid() (uid int)
 //sys	Kill(pid int, signum syscall.Signal) (err error)
@@ -460,21 +601,35 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)
 //sys	Link(path string, link string) (err error)
 //sys	Listen(s int, backlog int) (err error) = libsocket.listen
 //sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Madvise(b []byte, advice int) (err error)
 //sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mkfifoat(dirfd int, path string, mode uint32) (err error)
 //sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pause() (err error)
 //sys	Pread(fd int, p []byte, offset int64) (n int, err error)
 //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Readlink(path string, buf []byte) (n int, err error)
 //sys	Rename(from string, to string) (err error)
+//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Rmdir(path string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = lseek
 //sysnb	Setegid(egid int) (err error)
 //sysnb	Seteuid(euid int) (err error)
 //sysnb	Setgid(gid int) (err error)
+//sys	Sethostname(p []byte) (err error)
 //sysnb	Setpgid(pid int, pgid int) (err error)
 //sys	Setpriority(which int, who int, prio int) (err error)
 //sysnb	Setregid(rgid int, egid int) (err error)
@@ -486,12 +641,17 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)
 //sys	Stat(path string, stat *Stat_t) (err error)
 //sys	Symlink(path string, link string) (err error)
 //sys	Sync() (err error)
+//sysnb	Times(tms *Tms) (ticks uintptr, err error)
 //sys	Truncate(path string, length int64) (err error)
 //sys	Fsync(fd int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
+//sys	Umask(mask int) (oldmask int)
+//sysnb	Uname(buf *Utsname) (err error)
+//sys	Unmount(target string, flags int) (err error) = libc.umount
 //sys	Unlink(path string) (err error)
-//sys	Utimes(path string, times *[2]Timeval) (err error)
+//sys	Unlinkat(dirfd int, path string, flags int) (err error)
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	Utime(path string, buf *Utimbuf) (err error)
 //sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.bind
 //sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.connect
 //sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
@@ -502,13 +662,11 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)
 //sys	write(fd int, p []byte) (n int, err error)
 //sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) = libsocket.getsockopt
 //sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getpeername
-//sys	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getsockname
 //sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) = libsocket.setsockopt
 //sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) = libsocket.recvfrom
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.recvmsg
 
 func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := sysvicall6(procread.Addr(), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -517,10 +675,39 @@ func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
 }
 
 func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := sysvicall6(procwrite.Addr(), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
 	}
 	return
 }
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
+//sys	sysconf(name int) (n int64, err error)
+
+// pageSize caches the value of Getpagesize, since it can't change
+// once the system is booted.
+var pageSize int64 // accessed atomically
+
+func Getpagesize() int {
+	n := atomic.LoadInt64(&pageSize)
+	if n == 0 {
+		n, _ = sysconf(_SC_PAGESIZE)
+		atomic.StoreInt64(&pageSize, n)
+	}
+	return int(n)
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go
index 4795f524a4..5aff62c3bb 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package unix
+// +build amd64,solaris
 
-func Getpagesize() int { return 4096 }
+package unix
 
 func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
@@ -14,8 +14,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = nsec % 1e9 / 1e3
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go
index 2bb15cb8b7..1153261822 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go
@@ -241,3 +241,10 @@ type BpfHdr C.struct_bpf_hdr
 // Terminal handling
 
 type Termios C.struct_termios
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go
index 49d9e1fedb..d004b4a484 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go
@@ -50,11 +50,20 @@ package unix
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/icmpv6.h>
-#include <termios.h>
+#include <asm/termbits.h>
 #include <time.h>
 #include <unistd.h>
 #include <ustat.h>
 #include <utime.h>
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+
+#ifdef TCSETS2
+// On systems that have "struct termios2" use this as type Termios.
+typedef struct termios2 termios_t;
+#else
+typedef struct termios termios_t;
+#endif
 
 enum {
 	sizeofPtr = sizeof(void*),
@@ -77,7 +86,7 @@ struct sockaddr_any {
 // copied from /usr/include/linux/un.h
 struct my_sockaddr_un {
 	sa_family_t sun_family;
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) || defined(__powerpc64__)
 	// on ARM char is by default unsigned
 	signed char sun_path[108];
 #else
@@ -87,17 +96,37 @@ struct my_sockaddr_un {
 
 #ifdef __ARM_EABI__
 typedef struct user_regs PtraceRegs;
+#elif defined(__aarch64__)
+typedef struct user_pt_regs PtraceRegs;
+#elif defined(__powerpc64__)
+typedef struct pt_regs PtraceRegs;
+#elif defined(__mips__)
+typedef struct user PtraceRegs;
+#elif defined(__s390x__)
+typedef struct _user_regs_struct PtraceRegs;
 #else
 typedef struct user_regs_struct PtraceRegs;
 #endif
 
+#if defined(__s390x__)
+typedef struct _user_psw_struct ptracePsw;
+typedef struct _user_fpregs_struct ptraceFpregs;
+typedef struct _user_per_struct ptracePer;
+#else
+typedef struct {} ptracePsw;
+typedef struct {} ptraceFpregs;
+typedef struct {} ptracePer;
+#endif
+
 // The real epoll_event is a union, and godefs doesn't handle it well.
 struct my_epoll_event {
 	uint32_t events;
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) || defined(__aarch64__)
 	// padding is not specified in linux/eventpoll.h but added to conform to the
 	// alignment requirements of EABI
 	int32_t padFd;
+#elif defined(__powerpc64__) || defined(__s390x__)
+	int32_t _padFd;
 #endif
 	int32_t fd;
 	int32_t pad;
@@ -183,6 +212,8 @@ type RawSockaddrLinklayer C.struct_sockaddr_ll
 
 type RawSockaddrNetlink C.struct_sockaddr_nl
 
+type RawSockaddrHCI C.struct_sockaddr_hci
+
 type RawSockaddr C.struct_sockaddr
 
 type RawSockaddrAny C.struct_sockaddr_any
@@ -222,6 +253,7 @@ const (
 	SizeofSockaddrUnix      = C.sizeof_struct_sockaddr_un
 	SizeofSockaddrLinklayer = C.sizeof_struct_sockaddr_ll
 	SizeofSockaddrNetlink   = C.sizeof_struct_sockaddr_nl
+	SizeofSockaddrHCI       = C.sizeof_struct_sockaddr_hci
 	SizeofLinger            = C.sizeof_struct_linger
 	SizeofIPMreq            = C.sizeof_struct_ip_mreq
 	SizeofIPMreqn           = C.sizeof_struct_ip_mreqn
@@ -372,6 +404,13 @@ const SizeofInotifyEvent = C.sizeof_struct_inotify_event
 // Register structures
 type PtraceRegs C.PtraceRegs
 
+// Structures contained in PtraceRegs on s390x (exported by mkpost.go)
+type ptracePsw C.ptracePsw
+
+type ptraceFpregs C.ptraceFpregs
+
+type ptracePer C.ptracePer
+
 // Misc
 
 type FdSet C.fd_set
@@ -387,9 +426,10 @@ type EpollEvent C.struct_my_epoll_event
 const (
 	AT_FDCWD            = C.AT_FDCWD
 	AT_REMOVEDIR        = C.AT_REMOVEDIR
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
 	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
 )
 
 // Terminal handling
 
-type Termios C.struct_termios
+type Termios C.termios_t
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go
index 753c7996b1..6ad50eaba6 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go
@@ -15,10 +15,17 @@ package unix
 
 /*
 #define KERNEL
+// These defines ensure that builds done on newer versions of Solaris are
+// backwards-compatible with older versions of Solaris and
+// OpenSolaris-based derivatives.
+#define __USE_SUNOS_SOCKETS__          // msghdr
+#define __USE_LEGACY_PROTOTYPES__      // iovec
 #include <dirent.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <signal.h>
 #include <termios.h>
+#include <termio.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/mman.h>
@@ -30,7 +37,9 @@ package unix
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/times.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <net/bpf.h>
@@ -40,6 +49,8 @@ package unix
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 #include <netinet/tcp.h>
+#include <ustat.h>
+#include <utime.h>
 
 enum {
 	sizeofPtr = sizeof(void*),
@@ -69,6 +80,7 @@ const (
 	sizeofInt      = C.sizeof_int
 	sizeofLong     = C.sizeof_long
 	sizeofLongLong = C.sizeof_longlong
+	PathMax        = C.PATH_MAX
 )
 
 // Basic types
@@ -88,6 +100,10 @@ type Timeval C.struct_timeval
 
 type Timeval32 C.struct_timeval32
 
+type Tms C.struct_tms
+
+type Utimbuf C.struct_utimbuf
+
 // Processes
 
 type Rusage C.struct_rusage
@@ -175,6 +191,20 @@ const (
 
 type FdSet C.fd_set
 
+// Misc
+
+type Utsname C.struct_utsname
+
+type Ustat_t C.struct_ustat
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
+	AT_REMOVEDIR        = C.AT_REMOVEDIR
+	AT_EACCESS          = C.AT_EACCESS
+)
+
 // Routing and interface messages
 
 const (
@@ -217,6 +247,14 @@ type BpfTimeval C.struct_bpf_timeval
 
 type BpfHdr C.struct_bpf_hdr
 
+// sysconf information
+
+const _SC_PAGESIZE = C._SC_PAGESIZE
+
 // Terminal handling
 
 type Termios C.struct_termios
+
+type Termio C.struct_termio
+
+type Winsize C.struct_winsize
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go
index 15204b9c7d..8e63888351 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m32
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,darwin
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m32 _const.go
 
@@ -30,7 +32,7 @@ const (
 	AF_LAT                            = 0xe
 	AF_LINK                           = 0x12
 	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x26
+	AF_MAX                            = 0x28
 	AF_NATM                           = 0x1f
 	AF_NDRV                           = 0x1b
 	AF_NETBIOS                        = 0x21
@@ -45,6 +47,7 @@ const (
 	AF_SYSTEM                         = 0x20
 	AF_UNIX                           = 0x1
 	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
 	B0                                = 0x0
 	B110                              = 0x6e
 	B115200                           = 0x1c200
@@ -83,6 +86,7 @@ const (
 	BIOCSBLEN                         = 0xc0044266
 	BIOCSDLT                          = 0x80044278
 	BIOCSETF                          = 0x80084267
+	BIOCSETFNR                        = 0x8008427e
 	BIOCSETIF                         = 0x8020426c
 	BIOCSHDRCMPLT                     = 0x80044275
 	BIOCSRSIG                         = 0x80044273
@@ -149,33 +153,168 @@ const (
 	CSUSP                             = 0x1a
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
 	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
 	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
 	DLT_ATM_CLIP                      = 0x13
 	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
 	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
 	DLT_CHAOS                         = 0x5
 	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
 	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
 	DLT_EN10MB                        = 0x1
 	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
 	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
 	DLT_IEEE802                       = 0x6
 	DLT_IEEE802_11                    = 0x69
 	DLT_IEEE802_11_RADIO              = 0x7f
 	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
 	DLT_LINUX_SLL                     = 0x71
 	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
 	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
 	DLT_PFLOG                         = 0x75
 	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
 	DLT_PPP                           = 0x9
 	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
 	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
 	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
 	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
 	DLT_SLIP                          = 0x8
 	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
 	DT_BLK                            = 0x6
 	DT_CHR                            = 0x2
 	DT_DIR                            = 0x4
@@ -198,8 +337,8 @@ const (
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xc
-	EVFILT_THREADMARKER               = 0xc
+	EVFILT_SYSCOUNT                   = 0xe
+	EVFILT_THREADMARKER               = 0xe
 	EVFILT_TIMER                      = -0x7
 	EVFILT_USER                       = -0xa
 	EVFILT_VM                         = -0xc
@@ -233,9 +372,11 @@ const (
 	F_CHKCLEAN                        = 0x29
 	F_DUPFD                           = 0x0
 	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
 	F_FLUSH_DATA                      = 0x28
 	F_FREEZE_FS                       = 0x35
 	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
 	F_GETFD                           = 0x1
 	F_GETFL                           = 0x3
 	F_GETLK                           = 0x7
@@ -245,10 +386,10 @@ const (
 	F_GETPATH                         = 0x32
 	F_GETPATH_MTMINFO                 = 0x47
 	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
 	F_GLOBAL_NOCACHE                  = 0x37
 	F_LOG2PHYS                        = 0x31
 	F_LOG2PHYS_EXT                    = 0x41
-	F_MARKDEPENDENCY                  = 0x3c
 	F_NOCACHE                         = 0x30
 	F_NODIRECT                        = 0x3e
 	F_OK                              = 0x0
@@ -258,20 +399,21 @@ const (
 	F_RDADVISE                        = 0x2c
 	F_RDAHEAD                         = 0x2d
 	F_RDLCK                           = 0x1
-	F_READBOOTSTRAP                   = 0x2e
 	F_SETBACKINGSTORE                 = 0x46
 	F_SETFD                           = 0x2
 	F_SETFL                           = 0x4
 	F_SETLK                           = 0x8
 	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
 	F_SETNOSIGPIPE                    = 0x49
 	F_SETOWN                          = 0x6
 	F_SETPROTECTIONCLASS              = 0x40
 	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
 	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
 	F_UNLCK                           = 0x2
 	F_VOLPOSMODE                      = 0x4
-	F_WRITEBOOTSTRAP                  = 0x2f
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
 	ICANON                            = 0x100
@@ -341,6 +483,7 @@ const (
 	IFT_PDP                           = 0xff
 	IFT_PFLOG                         = 0xf5
 	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
 	IFT_PPP                           = 0x17
 	IFT_PROPMUX                       = 0x36
 	IFT_PROPVIRTUAL                   = 0x35
@@ -509,7 +652,7 @@ const (
 	IPV6_FAITH                        = 0x1d
 	IPV6_FLOWINFO_MASK                = 0xffffff0f
 	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
+	IPV6_FRAGTTL                      = 0x3c
 	IPV6_FW_ADD                       = 0x1e
 	IPV6_FW_DEL                       = 0x1f
 	IPV6_FW_FLUSH                     = 0x20
@@ -679,11 +822,19 @@ const (
 	NOFLSH                            = 0x80000000
 	NOTE_ABSOLUTE                     = 0x8
 	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
 	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
 	NOTE_DELETE                       = 0x1
 	NOTE_EXEC                         = 0x20000000
 	NOTE_EXIT                         = 0x80000000
 	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
 	NOTE_EXTEND                       = 0x4
 	NOTE_FFAND                        = 0x40000000
 	NOTE_FFCOPY                       = 0xc0000000
@@ -692,6 +843,7 @@ const (
 	NOTE_FFNOP                        = 0x0
 	NOTE_FFOR                         = 0x80000000
 	NOTE_FORK                         = 0x40000000
+	NOTE_LEEWAY                       = 0x10
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
 	NOTE_NONE                         = 0x80
@@ -700,7 +852,6 @@ const (
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_REAP                         = 0x10000000
 	NOTE_RENAME                       = 0x20
-	NOTE_RESOURCEEND                  = 0x2000000
 	NOTE_REVOKE                       = 0x40
 	NOTE_SECONDS                      = 0x1
 	NOTE_SIGNAL                       = 0x8000000
@@ -728,6 +879,7 @@ const (
 	O_CLOEXEC                         = 0x1000000
 	O_CREAT                           = 0x200
 	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
 	O_DSYNC                           = 0x400000
 	O_EVTONLY                         = 0x8000
 	O_EXCL                            = 0x800
@@ -777,6 +929,7 @@ const (
 	RLIMIT_AS                         = 0x5
 	RLIMIT_CORE                       = 0x4
 	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
 	RLIMIT_DATA                       = 0x2
 	RLIMIT_FSIZE                      = 0x1
 	RLIMIT_NOFILE                     = 0x8
@@ -814,12 +967,15 @@ const (
 	RTF_LOCAL                         = 0x200000
 	RTF_MODIFIED                      = 0x20
 	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
 	RTF_PINNED                        = 0x100000
 	RTF_PRCLONING                     = 0x10000
 	RTF_PROTO1                        = 0x8000
 	RTF_PROTO2                        = 0x4000
 	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
 	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
 	RTF_STATIC                        = 0x800
 	RTF_UP                            = 0x1
 	RTF_WASCLONED                     = 0x20000
@@ -864,7 +1020,6 @@ const (
 	SHUT_WR                           = 0x1
 	SIOCADDMULTI                      = 0x80206931
 	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691d
 	SIOCARPIPLL                       = 0xc0206928
 	SIOCATMARK                        = 0x40047307
 	SIOCAUTOADDR                      = 0xc0206926
@@ -872,10 +1027,7 @@ const (
 	SIOCDELMULTI                      = 0x80206932
 	SIOCDIFADDR                       = 0x80206919
 	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCDLIFADDR                      = 0x8118691f
 	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETSGCNT                      = 0xc014721c
-	SIOCGETVIFCNT                     = 0xc014721b
 	SIOCGETVLAN                       = 0xc020697f
 	SIOCGHIWAT                        = 0x40047301
 	SIOCGIFADDR                       = 0xc0206921
@@ -901,13 +1053,12 @@ const (
 	SIOCGIFSTATUS                     = 0xc331693d
 	SIOCGIFVLAN                       = 0xc020697f
 	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLIFADDR                      = 0xc118691e
-	SIOCGLIFPHYADDR                   = 0xc1186943
 	SIOCGLOWAT                        = 0x40047303
 	SIOCGPGRP                         = 0x40047309
 	SIOCIFCREATE                      = 0xc0206978
 	SIOCIFCREATE2                     = 0xc020697a
 	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc00c6981
 	SIOCRSLVMULTI                     = 0xc008693b
 	SIOCSDRVSPEC                      = 0x801c697b
 	SIOCSETVLAN                       = 0x8020697e
@@ -931,7 +1082,6 @@ const (
 	SIOCSIFPHYADDR                    = 0x8040693e
 	SIOCSIFPHYS                       = 0x80206936
 	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLIFPHYADDR                   = 0x81186942
 	SIOCSLOWAT                        = 0x80047302
 	SIOCSPGRP                         = 0x80047308
 	SOCK_DGRAM                        = 0x2
@@ -958,6 +1108,7 @@ const (
 	SO_NOTIFYCONFLICT                 = 0x1026
 	SO_NP_EXTENSIONS                  = 0x1083
 	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
 	SO_NWRITE                         = 0x1024
 	SO_OOBINLINE                      = 0x100
 	SO_PEERLABEL                      = 0x1011
@@ -965,10 +1116,6 @@ const (
 	SO_RCVBUF                         = 0x1002
 	SO_RCVLOWAT                       = 0x1004
 	SO_RCVTIMEO                       = 0x1006
-	SO_RESTRICTIONS                   = 0x1081
-	SO_RESTRICT_DENYIN                = 0x1
-	SO_RESTRICT_DENYOUT               = 0x2
-	SO_RESTRICT_DENYSET               = 0x80000000
 	SO_REUSEADDR                      = 0x4
 	SO_REUSEPORT                      = 0x200
 	SO_REUSESHAREUID                  = 0x1025
@@ -1014,21 +1161,25 @@ const (
 	TCIOFLUSH                         = 0x3
 	TCOFLUSH                          = 0x2
 	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_ENABLE_ECN                    = 0x104
 	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
 	TCP_MAXHLEN                       = 0x3c
 	TCP_MAXOLEN                       = 0x28
 	TCP_MAXSEG                        = 0x2
 	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x3
+	TCP_MAX_SACK                      = 0x4
 	TCP_MAX_WINSHIFT                  = 0xe
 	TCP_MINMSS                        = 0xd8
-	TCP_MINMSSOVERLOAD                = 0x3e8
 	TCP_MSS                           = 0x200
 	TCP_NODELAY                       = 0x1
 	TCP_NOOPT                         = 0x8
 	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
 	TCP_RXT_CONNDROPTIME              = 0x80
 	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
 	TCSAFLUSH                         = 0x2
 	TIOCCBRK                          = 0x2000747a
 	TIOCCDTR                          = 0x20007478
@@ -1172,7 +1323,7 @@ const (
 	EIO             = syscall.Errno(0x5)
 	EISCONN         = syscall.Errno(0x38)
 	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x69)
+	ELAST           = syscall.Errno(0x6a)
 	ELOOP           = syscall.Errno(0x3e)
 	EMFILE          = syscall.Errno(0x18)
 	EMLINK          = syscall.Errno(0x1f)
@@ -1223,6 +1374,7 @@ const (
 	EPROTONOSUPPORT = syscall.Errno(0x2b)
 	EPROTOTYPE      = syscall.Errno(0x29)
 	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
 	ERANGE          = syscall.Errno(0x22)
 	EREMOTE         = syscall.Errno(0x47)
 	EROFS           = syscall.Errno(0x1e)
@@ -1385,6 +1537,7 @@ var errors = [...]string{
 	103: "policy not found",
 	104: "state not recoverable",
 	105: "previous owner died",
+	106: "interface output queue is full",
 }
 
 // Signal table
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go
index 095b6f3a5c..9594f93817 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m64
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,darwin
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m64 _const.go
 
@@ -374,6 +376,7 @@ const (
 	F_FLUSH_DATA                      = 0x28
 	F_FREEZE_FS                       = 0x35
 	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
 	F_GETFD                           = 0x1
 	F_GETFL                           = 0x3
 	F_GETLK                           = 0x7
@@ -1017,7 +1020,6 @@ const (
 	SHUT_WR                           = 0x1
 	SIOCADDMULTI                      = 0x80206931
 	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691d
 	SIOCARPIPLL                       = 0xc0206928
 	SIOCATMARK                        = 0x40047307
 	SIOCAUTOADDR                      = 0xc0206926
@@ -1025,10 +1027,7 @@ const (
 	SIOCDELMULTI                      = 0x80206932
 	SIOCDIFADDR                       = 0x80206919
 	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCDLIFADDR                      = 0x8118691f
 	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETSGCNT                      = 0xc014721c
-	SIOCGETVIFCNT                     = 0xc014721b
 	SIOCGETVLAN                       = 0xc020697f
 	SIOCGHIWAT                        = 0x40047301
 	SIOCGIFADDR                       = 0xc0206921
@@ -1054,8 +1053,6 @@ const (
 	SIOCGIFSTATUS                     = 0xc331693d
 	SIOCGIFVLAN                       = 0xc020697f
 	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLIFADDR                      = 0xc118691e
-	SIOCGLIFPHYADDR                   = 0xc1186943
 	SIOCGLOWAT                        = 0x40047303
 	SIOCGPGRP                         = 0x40047309
 	SIOCIFCREATE                      = 0xc0206978
@@ -1085,7 +1082,6 @@ const (
 	SIOCSIFPHYADDR                    = 0x8040693e
 	SIOCSIFPHYS                       = 0x80206936
 	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLIFPHYADDR                   = 0x81186942
 	SIOCSLOWAT                        = 0x80047302
 	SIOCSPGRP                         = 0x80047308
 	SOCK_DGRAM                        = 0x2
@@ -1112,6 +1108,7 @@ const (
 	SO_NOTIFYCONFLICT                 = 0x1026
 	SO_NP_EXTENSIONS                  = 0x1083
 	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
 	SO_NWRITE                         = 0x1024
 	SO_OOBINLINE                      = 0x100
 	SO_PEERLABEL                      = 0x1011
@@ -1164,6 +1161,7 @@ const (
 	TCIOFLUSH                         = 0x3
 	TCOFLUSH                          = 0x2
 	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_ENABLE_ECN                    = 0x104
 	TCP_KEEPALIVE                     = 0x10
 	TCP_KEEPCNT                       = 0x102
 	TCP_KEEPINTVL                     = 0x101
@@ -1171,13 +1169,14 @@ const (
 	TCP_MAXOLEN                       = 0x28
 	TCP_MAXSEG                        = 0x2
 	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x3
+	TCP_MAX_SACK                      = 0x4
 	TCP_MAX_WINSHIFT                  = 0xe
 	TCP_MINMSS                        = 0xd8
 	TCP_MSS                           = 0x200
 	TCP_NODELAY                       = 0x1
 	TCP_NOOPT                         = 0x8
 	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
 	TCP_RXT_CONNDROPTIME              = 0x80
 	TCP_RXT_FINDROP                   = 0x100
 	TCP_SENDMOREACKS                  = 0x103
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go
new file mode 100644
index 0000000000..a410e88edd
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go
@@ -0,0 +1,1293 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+// +build arm,darwin
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AX25                          = 0x3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_C_HDLC                        = 0x68
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_FDDI                          = 0xa
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_NULL                          = 0x0
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PRONET                        = 0x4
+	DLT_RAW                           = 0xc
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xe
+	EVFILT_THREADMARKER               = 0xe
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_ANON                          = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_SHARED                        = 0x1
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x40487413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
+	EBADF           = syscall.Errno(0x9)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x59)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x6a)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5f)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x61)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x66)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x64)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm64.go
similarity index 66%
rename from Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_386.go
rename to Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm64.go
index 85988c0eaf..3189c6b345 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm64.go
@@ -1,8 +1,10 @@
-// mkerrors.sh -m32
+// mkerrors.sh -m64
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build arm64,darwin
+
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
+// cgo -godefs -- -m64 _const.go
 
 package unix
 
@@ -10,8 +12,6 @@ import "syscall"
 
 const (
 	AF_APPLETALK                      = 0x10
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x21
 	AF_CCITT                          = 0xa
 	AF_CHAOS                          = 0x5
 	AF_CNT                            = 0x15
@@ -19,31 +19,35 @@ const (
 	AF_DATAKIT                        = 0x9
 	AF_DECnet                         = 0xc
 	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
+	AF_E164                           = 0x1c
 	AF_ECMA                           = 0x8
 	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x23
+	AF_IEEE80211                      = 0x25
 	AF_IMPLINK                        = 0x3
 	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
+	AF_INET6                          = 0x1e
 	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
+	AF_ISDN                           = 0x1c
 	AF_ISO                            = 0x7
 	AF_LAT                            = 0xe
 	AF_LINK                           = 0x12
 	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x24
-	AF_MPLS                           = 0x22
-	AF_NATM                           = 0x1d
-	AF_NETGRAPH                       = 0x20
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
 	AF_NS                             = 0x6
 	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
 	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
 	AF_ROUTE                          = 0x11
 	AF_SIP                            = 0x18
 	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
 	AF_UNIX                           = 0x1
 	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
 	B0                                = 0x0
 	B110                              = 0x6e
 	B115200                           = 0x1c200
@@ -70,24 +74,23 @@ const (
 	BIOCFLUSH                         = 0x20004268
 	BIOCGBLEN                         = 0x40044266
 	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084279
+	BIOCGDLTLIST                      = 0xc00c4279
 	BIOCGETIF                         = 0x4020426b
 	BIOCGHDRCMPLT                     = 0x40044274
 	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4008426e
+	BIOCGRTIMEOUT                     = 0x4010426e
 	BIOCGSEESENT                      = 0x40044276
 	BIOCGSTATS                        = 0x4008426f
 	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
 	BIOCPROMISC                       = 0x20004269
 	BIOCSBLEN                         = 0xc0044266
 	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80084267
+	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x8010427e
 	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8008427b
 	BIOCSHDRCMPLT                     = 0x80044275
 	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8008426d
+	BIOCSRTIMEOUT                     = 0x8010426d
 	BIOCSSEESENT                      = 0x80044277
 	BIOCVERSION                       = 0x40044271
 	BPF_A                             = 0x10
@@ -97,7 +100,6 @@ const (
 	BPF_ALU                           = 0x4
 	BPF_AND                           = 0x50
 	BPF_B                             = 0x10
-	BPF_DEFAULTBUFSIZE                = 0x1000
 	BPF_DIV                           = 0x30
 	BPF_H                             = 0x8
 	BPF_IMM                           = 0x0
@@ -116,7 +118,6 @@ const (
 	BPF_MAJOR_VERSION                 = 0x1
 	BPF_MAXBUFSIZE                    = 0x80000
 	BPF_MAXINSNS                      = 0x200
-	BPF_MAX_CLONES                    = 0x80
 	BPF_MEM                           = 0x60
 	BPF_MEMWORDS                      = 0x10
 	BPF_MINBUFSIZE                    = 0x20
@@ -155,6 +156,7 @@ const (
 	DLT_A429                          = 0xb8
 	DLT_A653_ICM                      = 0xb9
 	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
 	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
 	DLT_ARCNET                        = 0x7
 	DLT_ARCNET_LINUX                  = 0x81
@@ -167,12 +169,16 @@ const (
 	DLT_BLUETOOTH_HCI_H4              = 0xbb
 	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
 	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
 	DLT_CHAOS                         = 0x5
 	DLT_CHDLC                         = 0x68
 	DLT_CISCO_IOS                     = 0x76
 	DLT_C_HDLC                        = 0x68
 	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
 	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
 	DLT_ECONET                        = 0x73
 	DLT_EN10MB                        = 0x1
 	DLT_EN3MB                         = 0x2
@@ -180,6 +186,8 @@ const (
 	DLT_ERF                           = 0xc5
 	DLT_ERF_ETH                       = 0xaf
 	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
 	DLT_FDDI                          = 0xa
 	DLT_FLEXRAY                       = 0xd2
 	DLT_FRELAY                        = 0x6b
@@ -189,6 +197,8 @@ const (
 	DLT_GPF_F                         = 0xab
 	DLT_GPF_T                         = 0xaa
 	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
 	DLT_HHDLC                         = 0x79
 	DLT_IBM_SN                        = 0x92
 	DLT_IBM_SP                        = 0x91
@@ -198,18 +208,25 @@ const (
 	DLT_IEEE802_11_RADIO_AVS          = 0xa3
 	DLT_IEEE802_15_4                  = 0xc3
 	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
 	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
 	DLT_IEEE802_16_MAC_CPS            = 0xbc
 	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
 	DLT_IPFILTER                      = 0x74
 	DLT_IPMB                          = 0xc7
 	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
 	DLT_IP_OVER_FC                    = 0x7a
 	DLT_JUNIPER_ATM1                  = 0x89
 	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
 	DLT_JUNIPER_CHDLC                 = 0xb5
 	DLT_JUNIPER_ES                    = 0x84
 	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
 	DLT_JUNIPER_FRELAY                = 0xb4
 	DLT_JUNIPER_GGSN                  = 0x85
 	DLT_JUNIPER_ISM                   = 0xc2
@@ -222,21 +239,35 @@ const (
 	DLT_JUNIPER_PPPOE                 = 0xa7
 	DLT_JUNIPER_PPPOE_ATM             = 0xa8
 	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
 	DLT_JUNIPER_ST                    = 0xc8
 	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
 	DLT_LAPB_WITH_DIR                 = 0xcf
 	DLT_LAPD                          = 0xcb
 	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
 	DLT_LINUX_IRDA                    = 0x90
 	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
 	DLT_LINUX_SLL                     = 0x71
 	DLT_LOOP                          = 0x6c
 	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
 	DLT_MFR                           = 0xb6
 	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
 	DLT_MTP2                          = 0x8c
 	DLT_MTP2_WITH_PHDR                = 0x8b
 	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
 	DLT_NULL                          = 0x0
 	DLT_PCI_EXP                       = 0x7d
 	DLT_PFLOG                         = 0x75
@@ -248,26 +279,44 @@ const (
 	DLT_PPP_PPPD                      = 0xa6
 	DLT_PPP_SERIAL                    = 0x32
 	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
 	DLT_PRISM_HEADER                  = 0x77
 	DLT_PRONET                        = 0x4
 	DLT_RAIF1                         = 0xc6
 	DLT_RAW                           = 0xc
-	DLT_REDBACK_SMARTEDGE             = 0x20
 	DLT_RIO                           = 0x7c
 	DLT_SCCP                          = 0x8e
 	DLT_SITA                          = 0xc4
 	DLT_SLIP                          = 0x8
 	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
 	DLT_SUNATM                        = 0x7b
 	DLT_SYMANTEC_FIREWALL             = 0x63
 	DLT_TZSP                          = 0x80
 	DLT_USB                           = 0xba
 	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
 	DLT_X2E_SERIAL                    = 0xd5
 	DLT_X2E_XORAYA                    = 0xd6
 	DT_BLK                            = 0x6
 	DT_CHR                            = 0x2
-	DT_DBF                            = 0xf
 	DT_DIR                            = 0x4
 	DT_FIFO                           = 0x1
 	DT_LNK                            = 0xa
@@ -283,289 +332,178 @@ const (
 	ECHONL                            = 0x10
 	ECHOPRT                           = 0x20
 	EVFILT_AIO                        = -0x3
-	EVFILT_EXCEPT                     = -0x8
-	EVFILT_MARKER                     = 0xf
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x8
+	EVFILT_SYSCOUNT                   = 0xe
+	EVFILT_THREADMARKER               = 0xe
 	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
 	EVFILT_VNODE                      = -0x4
 	EVFILT_WRITE                      = -0x2
 	EV_ADD                            = 0x1
 	EV_CLEAR                          = 0x20
 	EV_DELETE                         = 0x2
 	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
 	EV_ENABLE                         = 0x4
 	EV_EOF                            = 0x8000
 	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
 	EV_FLAG1                          = 0x2000
-	EV_NODATA                         = 0x1000
 	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
 	EV_SYSFLAGS                       = 0xf000
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
-	EXTEXIT_LWP                       = 0x10000
-	EXTEXIT_PROC                      = 0x0
-	EXTEXIT_SETINT                    = 0x1
-	EXTEXIT_SIMPLE                    = 0x0
 	EXTPROC                           = 0x800
 	FD_CLOEXEC                        = 0x1
 	FD_SETSIZE                        = 0x400
 	FLUSHO                            = 0x800000
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_CHKCLEAN                        = 0x29
 	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
 	F_GETFD                           = 0x1
 	F_GETFL                           = 0x3
 	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
 	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
 	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
 	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
 	F_SETFD                           = 0x2
 	F_SETFL                           = 0x4
 	F_SETLK                           = 0x8
 	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
 	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
 	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
 	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
 	IFF_ALLMULTI                      = 0x200
 	IFF_ALTPHYS                       = 0x4000
 	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x118e72
 	IFF_DEBUG                         = 0x4
 	IFF_LINK0                         = 0x1000
 	IFF_LINK1                         = 0x2000
 	IFF_LINK2                         = 0x4000
 	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
 	IFF_MULTICAST                     = 0x8000
 	IFF_NOARP                         = 0x80
-	IFF_NPOLLING                      = 0x100000
+	IFF_NOTRAILERS                    = 0x20
 	IFF_OACTIVE                       = 0x400
-	IFF_OACTIVE_COMPAT                = 0x400
 	IFF_POINTOPOINT                   = 0x10
-	IFF_POLLING                       = 0x10000
-	IFF_POLLING_COMPAT                = 0x10000
-	IFF_PPROMISC                      = 0x20000
 	IFF_PROMISC                       = 0x100
 	IFF_RUNNING                       = 0x40
 	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
 	IFF_UP                            = 0x1
 	IFNAMSIZ                          = 0x10
 	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
 	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
 	IFT_ARCNET                        = 0x23
 	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
 	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
 	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
 	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
+	IFT_CELLULAR                      = 0xff
 	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
 	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
 	IFT_ENC                           = 0xf4
 	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
 	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
+	IFT_FAITH                         = 0x38
 	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
 	IFT_FRELAY                        = 0x20
 	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
+	IFT_GIF                           = 0x37
 	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
 	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
 	IFT_HSSI                          = 0x2e
 	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
 	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
+	IFT_IEEE8023ADLAG                 = 0x88
 	IFT_ISDNBASIC                     = 0x14
 	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
 	IFT_ISO88022LLC                   = 0x29
 	IFT_ISO88023                      = 0x7
 	IFT_ISO88024                      = 0x8
 	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
 	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
 	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
 	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
 	IFT_LOCALTALK                     = 0x2a
 	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
 	IFT_MIOX25                        = 0x26
 	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
 	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
 	IFT_OTHER                         = 0x1
 	IFT_P10                           = 0xc
 	IFT_P80                           = 0xd
 	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
 	IFT_PFLOG                         = 0xf5
 	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
+	IFT_PKTAP                         = 0xfe
 	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
 	IFT_PROPMUX                       = 0x36
 	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
 	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
 	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
 	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
 	IFT_SIP                           = 0x1f
 	IFT_SLIP                          = 0x1c
 	IFT_SMDSDXI                       = 0x2b
 	IFT_SMDSICIP                      = 0x34
 	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
 	IFT_SONETPATH                     = 0x32
 	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
 	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xf3
+	IFT_STF                           = 0x39
 	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
 	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
 	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
 	IFT_X25                           = 0x5
 	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
 	IFT_X25PLE                        = 0x28
 	IFT_XETHER                        = 0x1a
 	IGNBRK                            = 0x1
@@ -588,6 +526,7 @@ const (
 	IN_CLASSD_HOST                    = 0xfffffff
 	IN_CLASSD_NET                     = 0xf0000000
 	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
 	IN_LOOPBACKNET                    = 0x7f
 	IPPROTO_3PC                       = 0x22
 	IPPROTO_ADFS                      = 0x44
@@ -599,7 +538,6 @@ const (
 	IPPROTO_BHA                       = 0x31
 	IPPROTO_BLT                       = 0x1e
 	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
 	IPPROTO_CFTP                      = 0x3e
 	IPPROTO_CHAOS                     = 0x10
 	IPPROTO_CMTP                      = 0x26
@@ -652,7 +590,6 @@ const (
 	IPPROTO_MEAS                      = 0x13
 	IPPROTO_MHRP                      = 0x30
 	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
 	IPPROTO_MTP                       = 0x5c
 	IPPROTO_MUX                       = 0x12
 	IPPROTO_ND                        = 0x4d
@@ -661,7 +598,6 @@ const (
 	IPPROTO_NSP                       = 0x1f
 	IPPROTO_NVPII                     = 0xb
 	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
 	IPPROTO_PGM                       = 0x71
 	IPPROTO_PIGP                      = 0x9
 	IPPROTO_PIM                       = 0x67
@@ -680,21 +616,18 @@ const (
 	IPPROTO_SCTP                      = 0x84
 	IPPROTO_SDRP                      = 0x2a
 	IPPROTO_SEP                       = 0x21
-	IPPROTO_SKIP                      = 0x39
 	IPPROTO_SRPC                      = 0x5a
 	IPPROTO_ST                        = 0x7
 	IPPROTO_SVMTP                     = 0x52
 	IPPROTO_SWIPE                     = 0x35
 	IPPROTO_TCF                       = 0x57
 	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
 	IPPROTO_TP                        = 0x1d
 	IPPROTO_TPXX                      = 0x27
 	IPPROTO_TRUNK1                    = 0x17
 	IPPROTO_TRUNK2                    = 0x18
 	IPPROTO_TTP                       = 0x54
 	IPPROTO_UDP                       = 0x11
-	IPPROTO_UNKNOWN                   = 0x102
 	IPPROTO_VINES                     = 0x53
 	IPPROTO_VISA                      = 0x46
 	IPPROTO_VMTP                      = 0x51
@@ -703,93 +636,103 @@ const (
 	IPPROTO_WSN                       = 0x4a
 	IPPROTO_XNET                      = 0xf
 	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
 	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
 	IPV6_CHECKSUM                     = 0x1a
 	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
 	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
 	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
 	IPV6_FAITH                        = 0x1d
 	IPV6_FLOWINFO_MASK                = 0xffffff0f
 	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
+	IPV6_FRAGTTL                      = 0x3c
 	IPV6_FW_ADD                       = 0x1e
 	IPV6_FW_DEL                       = 0x1f
 	IPV6_FW_FLUSH                     = 0x20
 	IPV6_FW_GET                       = 0x22
 	IPV6_FW_ZERO                      = 0x21
 	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
 	IPV6_IPSEC_POLICY                 = 0x1c
 	IPV6_JOIN_GROUP                   = 0xc
 	IPV6_LEAVE_GROUP                  = 0xd
 	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
 	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
 	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
 	IPV6_MULTICAST_HOPS               = 0xa
 	IPV6_MULTICAST_IF                 = 0x9
 	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PKTOPTIONS                   = 0x34
 	IPV6_PORTRANGE                    = 0xe
 	IPV6_PORTRANGE_DEFAULT            = 0x0
 	IPV6_PORTRANGE_HIGH               = 0x1
 	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RECVTCLASS                   = 0x23
 	IPV6_RTHDR_LOOSE                  = 0x0
 	IPV6_RTHDR_STRICT                 = 0x1
 	IPV6_RTHDR_TYPE_0                 = 0x0
 	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
+	IPV6_TCLASS                       = 0x24
 	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
 	IPV6_V6ONLY                       = 0x1b
 	IPV6_VERSION                      = 0x60
 	IPV6_VERSION_MASK                 = 0xf0
 	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
 	IP_DEFAULT_MULTICAST_LOOP         = 0x1
 	IP_DEFAULT_MULTICAST_TTL          = 0x1
 	IP_DF                             = 0x4000
 	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
 	IP_DUMMYNET_CONFIGURE             = 0x3c
 	IP_DUMMYNET_DEL                   = 0x3d
 	IP_DUMMYNET_FLUSH                 = 0x3e
 	IP_DUMMYNET_GET                   = 0x40
 	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_ZERO                        = 0x35
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
 	IP_HDRINCL                        = 0x2
 	IP_IPSEC_POLICY                   = 0x15
 	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0x14
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
 	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
 	IP_MSS                            = 0x240
 	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
 	IP_MULTICAST_LOOP                 = 0xb
 	IP_MULTICAST_TTL                  = 0xa
 	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
 	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
 	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
 	IP_PORTRANGE                      = 0x13
 	IP_PORTRANGE_DEFAULT              = 0x0
 	IP_PORTRANGE_HIGH                 = 0x1
@@ -797,18 +740,23 @@ const (
 	IP_RECVDSTADDR                    = 0x7
 	IP_RECVIF                         = 0x14
 	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
 	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x41
+	IP_RECVTTL                        = 0x18
 	IP_RETOPTS                        = 0x8
 	IP_RF                             = 0x8000
 	IP_RSVP_OFF                       = 0x10
 	IP_RSVP_ON                        = 0xf
 	IP_RSVP_VIF_OFF                   = 0x12
 	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
 	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
 	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
 	ISIG                              = 0x80
 	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
@@ -816,37 +764,29 @@ const (
 	LOCK_NB                           = 0x4
 	LOCK_SH                           = 0x1
 	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CONTROL_END                  = 0xb
-	MADV_CONTROL_START                = 0xa
-	MADV_CORE                         = 0x9
+	MADV_CAN_REUSE                    = 0x9
 	MADV_DONTNEED                     = 0x4
 	MADV_FREE                         = 0x5
-	MADV_INVAL                        = 0xa
-	MADV_NOCORE                       = 0x8
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
 	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
 	MADV_RANDOM                       = 0x1
 	MADV_SEQUENTIAL                   = 0x2
-	MADV_SETMAP                       = 0xb
 	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
 	MAP_ANON                          = 0x1000
 	MAP_COPY                          = 0x2
 	MAP_FILE                          = 0x0
 	MAP_FIXED                         = 0x10
 	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_NOCORE                        = 0x20000
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
 	MAP_NOEXTEND                      = 0x100
 	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
 	MAP_PRIVATE                       = 0x2
 	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
 	MAP_SHARED                        = 0x1
-	MAP_SIZEALIGN                     = 0x40000
-	MAP_STACK                         = 0x400
-	MAP_TRYFIXED                      = 0x10000
-	MAP_VPAGETABLE                    = 0x2000
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
 	MSG_CTRUNC                        = 0x20
@@ -854,75 +794,106 @@ const (
 	MSG_DONTWAIT                      = 0x80
 	MSG_EOF                           = 0x100
 	MSG_EOR                           = 0x8
-	MSG_FBLOCKING                     = 0x10000
-	MSG_FMASK                         = 0xffff0000
-	MSG_FNONBLOCKING                  = 0x20000
-	MSG_NOSIGNAL                      = 0x400
-	MSG_NOTIFICATION                  = 0x200
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
 	MSG_OOB                           = 0x1
 	MSG_PEEK                          = 0x2
-	MSG_SYNC                          = 0x800
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
 	MSG_TRUNC                         = 0x10
 	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
 	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
 	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
 	NAME_MAX                          = 0xff
 	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
 	NET_RT_FLAGS                      = 0x2
 	NET_RT_IFLIST                     = 0x3
-	NET_RT_MAXID                      = 0x4
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
 	NOFLSH                            = 0x80000000
+	NOTE_ABSOLUTE                     = 0x8
 	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
 	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
 	NOTE_DELETE                       = 0x1
 	NOTE_EXEC                         = 0x20000000
 	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
 	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
 	NOTE_FORK                         = 0x40000000
+	NOTE_LEEWAY                       = 0x10
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x2
-	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_PCTRLMASK                    = -0x100000
 	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
 	NOTE_RENAME                       = 0x20
 	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
 	NOTE_TRACK                        = 0x1
 	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
 	NOTE_WRITE                        = 0x2
 	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
 	ONLCR                             = 0x2
 	ONLRET                            = 0x40
 	ONOCR                             = 0x20
 	ONOEOT                            = 0x8
 	OPOST                             = 0x1
 	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
 	O_APPEND                          = 0x8
 	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x20000
+	O_CLOEXEC                         = 0x1000000
 	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x8000000
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
 	O_EXCL                            = 0x800
 	O_EXLOCK                          = 0x20
-	O_FAPPEND                         = 0x100000
-	O_FASYNCWRITE                     = 0x800000
-	O_FBLOCKING                       = 0x40000
-	O_FBUFFERED                       = 0x2000000
-	O_FMASK                           = 0x7fc0000
-	O_FNONBLOCKING                    = 0x80000
-	O_FOFFSET                         = 0x200000
 	O_FSYNC                           = 0x80
-	O_FSYNCWRITE                      = 0x400000
-	O_FUNBUFFERED                     = 0x1000000
-	O_MAPONREAD                       = 0x4000000
 	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
+	O_NOCTTY                          = 0x20000
 	O_NOFOLLOW                        = 0x100
 	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
 	O_RDONLY                          = 0x0
 	O_RDWR                            = 0x2
 	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
 	O_SYNC                            = 0x80
 	O_TRUNC                           = 0x400
 	O_WRONLY                          = 0x1
@@ -937,9 +908,28 @@ const (
 	PROT_NONE                         = 0x0
 	PROT_READ                         = 0x1
 	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
 	RLIMIT_CORE                       = 0x4
 	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
 	RLIMIT_DATA                       = 0x2
 	RLIMIT_FSIZE                      = 0x1
 	RLIMIT_NOFILE                     = 0x8
@@ -952,10 +942,7 @@ const (
 	RTAX_GENMASK                      = 0x3
 	RTAX_IFA                          = 0x5
 	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0xb
-	RTAX_MPLS1                        = 0x8
-	RTAX_MPLS2                        = 0x9
-	RTAX_MPLS3                        = 0xa
+	RTAX_MAX                          = 0x8
 	RTAX_NETMASK                      = 0x2
 	RTA_AUTHOR                        = 0x40
 	RTA_BRD                           = 0x80
@@ -964,28 +951,31 @@ const (
 	RTA_GENMASK                       = 0x8
 	RTA_IFA                           = 0x20
 	RTA_IFP                           = 0x10
-	RTA_MPLS1                         = 0x100
-	RTA_MPLS2                         = 0x200
-	RTA_MPLS3                         = 0x400
 	RTA_NETMASK                       = 0x4
 	RTF_BLACKHOLE                     = 0x1000
 	RTF_BROADCAST                     = 0x400000
 	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
 	RTF_DONE                          = 0x40
 	RTF_DYNAMIC                       = 0x10
 	RTF_GATEWAY                       = 0x2
 	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
 	RTF_LLINFO                        = 0x400
 	RTF_LOCAL                         = 0x200000
 	RTF_MODIFIED                      = 0x20
-	RTF_MPLSOPS                       = 0x1000000
 	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
 	RTF_PINNED                        = 0x100000
 	RTF_PRCLONING                     = 0x10000
 	RTF_PROTO1                        = 0x8000
 	RTF_PROTO2                        = 0x4000
 	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
 	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
 	RTF_STATIC                        = 0x800
 	RTF_UP                            = 0x1
 	RTF_WASCLONED                     = 0x20000
@@ -996,25 +986,23 @@ const (
 	RTM_DELETE                        = 0x2
 	RTM_DELMADDR                      = 0x10
 	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
+	RTM_GET2                          = 0x14
 	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
 	RTM_LOCK                          = 0x8
 	RTM_LOSING                        = 0x5
 	RTM_MISS                          = 0x7
 	RTM_NEWADDR                       = 0xc
 	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
 	RTM_OLDADD                        = 0x9
 	RTM_OLDDEL                        = 0xa
 	RTM_REDIRECT                      = 0x6
 	RTM_RESOLVE                       = 0xb
 	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x6
+	RTM_VERSION                       = 0x5
 	RTV_EXPIRE                        = 0x4
 	RTV_HOPCOUNT                      = 0x2
-	RTV_IWCAPSEGS                     = 0x400
-	RTV_IWMAXSEGS                     = 0x200
-	RTV_MSL                           = 0x100
 	RTV_MTU                           = 0x1
 	RTV_RPIPE                         = 0x8
 	RTV_RTT                           = 0x40
@@ -1026,72 +1014,74 @@ const (
 	SCM_CREDS                         = 0x3
 	SCM_RIGHTS                        = 0x1
 	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
 	SHUT_RD                           = 0x0
 	SHUT_RDWR                         = 0x2
 	SHUT_WR                           = 0x1
 	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8030720a
 	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691b
+	SIOCARPIPLL                       = 0xc0206928
 	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
 	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8030720b
 	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETSGCNT                      = 0xc0147210
-	SIOCGETVIFCNT                     = 0xc014720f
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
 	SIOCGHIWAT                        = 0x40047301
 	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
 	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDATA                       = 0xc0206926
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
 	SIOCGIFDSTADDR                    = 0xc0206922
 	SIOCGIFFLAGS                      = 0xc0206911
 	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc024698a
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMEDIA                      = 0xc0286938
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
 	SIOCGIFMETRIC                     = 0xc0206917
 	SIOCGIFMTU                        = 0xc0206933
 	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPDSTADDR                   = 0xc0206940
 	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPOLLCPU                    = 0xc020697e
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGIFTSOLEN                     = 0xc0206980
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
 	SIOCGLOWAT                        = 0x40047303
 	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
 	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCSDRVSPEC                      = 0x801c697b
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
 	SIOCSHIWAT                        = 0x80047300
 	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
 	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
+	SIOCSIFCAP                        = 0x8020695a
 	SIOCSIFDSTADDR                    = 0x8020690e
 	SIOCSIFFLAGS                      = 0x80206910
 	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
 	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
 	SIOCSIFMEDIA                      = 0xc0206937
 	SIOCSIFMETRIC                     = 0x80206918
 	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
 	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPHYADDR                    = 0x8040693e
 	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFPOLLCPU                    = 0x8020697d
-	SIOCSIFTSOLEN                     = 0x8020697f
-	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSIFVLAN                       = 0x8020697e
 	SIOCSLOWAT                        = 0x80047302
 	SIOCSPGRP                         = 0x80047308
 	SOCK_DGRAM                        = 0x2
@@ -1103,65 +1093,110 @@ const (
 	SOL_SOCKET                        = 0xffff
 	SOMAXCONN                         = 0x80
 	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
 	SO_BROADCAST                      = 0x20
 	SO_DEBUG                          = 0x1
 	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
 	SO_ERROR                          = 0x1007
 	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
 	SO_LINGER                         = 0x80
-	SO_NOSIGPIPE                      = 0x800
+	SO_LINGER_SEC                     = 0x1080
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
 	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
 	SO_RCVBUF                         = 0x1002
 	SO_RCVLOWAT                       = 0x1004
 	SO_RCVTIMEO                       = 0x1006
 	SO_REUSEADDR                      = 0x4
 	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
 	SO_SNDBUF                         = 0x1001
 	SO_SNDLOWAT                       = 0x1003
-	SO_SNDSPACE                       = 0x100a
 	SO_SNDTIMEO                       = 0x1005
 	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
 	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
 	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
 	TCIFLUSH                          = 0x1
 	TCIOFLUSH                         = 0x3
 	TCOFLUSH                          = 0x2
-	TCP_FASTKEEP                      = 0x80
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x20
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
 	TCP_MAXHLEN                       = 0x3c
 	TCP_MAXOLEN                       = 0x28
 	TCP_MAXSEG                        = 0x2
 	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
 	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0x100
-	TCP_MIN_WINSHIFT                  = 0x5
+	TCP_MINMSS                        = 0xd8
 	TCP_MSS                           = 0x200
 	TCP_NODELAY                       = 0x1
 	TCP_NOOPT                         = 0x8
 	TCP_NOPUSH                        = 0x4
-	TCP_SIGNATURE_ENABLE              = 0x10
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
 	TCSAFLUSH                         = 0x2
 	TIOCCBRK                          = 0x2000747a
 	TIOCCDTR                          = 0x20007478
 	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40087458
+	TIOCDCDTIMESTAMP                  = 0x40107458
 	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
 	TIOCEXCL                          = 0x2000740d
 	TIOCEXT                           = 0x80047460
 	TIOCFLUSH                         = 0x80047410
 	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
+	TIOCGETA                          = 0x40487413
 	TIOCGETD                          = 0x4004741a
 	TIOCGPGRP                         = 0x40047477
-	TIOCGSID                          = 0x40047463
-	TIOCGSIZE                         = 0x40087468
 	TIOCGWINSZ                        = 0x40087468
-	TIOCISPTMASTER                    = 0x20007455
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
 	TIOCMBIC                          = 0x8004746b
 	TIOCMBIS                          = 0x8004746c
 	TIOCMGDTRWAIT                     = 0x4004745a
@@ -1193,34 +1228,35 @@ const (
 	TIOCPKT_NOSTOP                    = 0x10
 	TIOCPKT_START                     = 0x8
 	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
 	TIOCREMOTE                        = 0x80047469
 	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
 	TIOCSCTTY                         = 0x20007461
 	TIOCSDRAINWAIT                    = 0x80047457
 	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
 	TIOCSETD                          = 0x8004741b
 	TIOCSIG                           = 0x2000745f
 	TIOCSPGRP                         = 0x80047476
-	TIOCSSIZE                         = 0x80087467
 	TIOCSTART                         = 0x2000746e
 	TIOCSTAT                          = 0x20007465
 	TIOCSTI                           = 0x80017472
 	TIOCSTOP                          = 0x2000746f
 	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40087459
+	TIOCTIMESTAMP                     = 0x40107459
 	TIOCUCNTL                         = 0x80047466
 	TOSTOP                            = 0x400000
-	VCHECKPT                          = 0x13
 	VDISCARD                          = 0xf
 	VDSUSP                            = 0xb
 	VEOF                              = 0x0
 	VEOL                              = 0x1
 	VEOL2                             = 0x2
 	VERASE                            = 0x3
-	VERASE2                           = 0x7
 	VINTR                             = 0x8
 	VKILL                             = 0x5
 	VLNEXT                            = 0xe
@@ -1231,13 +1267,18 @@ const (
 	VSTATUS                           = 0x12
 	VSTOP                             = 0xd
 	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
 	VTIME                             = 0x11
 	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
+	WCONTINUED                        = 0x10
 	WCOREFLAG                         = 0x80
-	WLINUXCLONE                       = 0x80000000
+	WEXITED                           = 0x4
 	WNOHANG                           = 0x1
-	WSTOPPED                          = 0x7f
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
 	WUNTRACED                         = 0x2
 )
 
@@ -1250,21 +1291,23 @@ const (
 	EAFNOSUPPORT    = syscall.Errno(0x2f)
 	EAGAIN          = syscall.Errno(0x23)
 	EALREADY        = syscall.Errno(0x25)
-	EASYNC          = syscall.Errno(0x63)
 	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
 	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
 	EBADRPC         = syscall.Errno(0x48)
 	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
+	ECANCELED       = syscall.Errno(0x59)
 	ECHILD          = syscall.Errno(0xa)
 	ECONNABORTED    = syscall.Errno(0x35)
 	ECONNREFUSED    = syscall.Errno(0x3d)
 	ECONNRESET      = syscall.Errno(0x36)
 	EDEADLK         = syscall.Errno(0xb)
 	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
 	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
 	EDQUOT          = syscall.Errno(0x45)
 	EEXIST          = syscall.Errno(0x11)
 	EFAULT          = syscall.Errno(0xe)
@@ -1272,49 +1315,54 @@ const (
 	EFTYPE          = syscall.Errno(0x4f)
 	EHOSTDOWN       = syscall.Errno(0x40)
 	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
 	EINPROGRESS     = syscall.Errno(0x24)
 	EINTR           = syscall.Errno(0x4)
 	EINVAL          = syscall.Errno(0x16)
 	EIO             = syscall.Errno(0x5)
 	EISCONN         = syscall.Errno(0x38)
 	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x63)
+	ELAST           = syscall.Errno(0x6a)
 	ELOOP           = syscall.Errno(0x3e)
 	EMFILE          = syscall.Errno(0x18)
 	EMLINK          = syscall.Errno(0x1f)
 	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x5f)
 	ENAMETOOLONG    = syscall.Errno(0x3f)
 	ENEEDAUTH       = syscall.Errno(0x51)
 	ENETDOWN        = syscall.Errno(0x32)
 	ENETRESET       = syscall.Errno(0x34)
 	ENETUNREACH     = syscall.Errno(0x33)
 	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
+	ENOATTR         = syscall.Errno(0x5d)
 	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
 	ENODEV          = syscall.Errno(0x13)
 	ENOENT          = syscall.Errno(0x2)
 	ENOEXEC         = syscall.Errno(0x8)
 	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEDIUM       = syscall.Errno(0x5d)
+	ENOLINK         = syscall.Errno(0x61)
 	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
 	ENOPROTOOPT     = syscall.Errno(0x2a)
 	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
 	ENOSYS          = syscall.Errno(0x4e)
 	ENOTBLK         = syscall.Errno(0xf)
 	ENOTCONN        = syscall.Errno(0x39)
 	ENOTDIR         = syscall.Errno(0x14)
 	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
 	ENOTSOCK        = syscall.Errno(0x26)
 	ENOTSUP         = syscall.Errno(0x2d)
 	ENOTTY          = syscall.Errno(0x19)
 	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOPNOTSUPP      = syscall.Errno(0x66)
 	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
 	EPERM           = syscall.Errno(0x1)
 	EPFNOSUPPORT    = syscall.Errno(0x2e)
 	EPIPE           = syscall.Errno(0x20)
@@ -1322,26 +1370,25 @@ const (
 	EPROCUNAVAIL    = syscall.Errno(0x4c)
 	EPROGMISMATCH   = syscall.Errno(0x4b)
 	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
+	EPROTO          = syscall.Errno(0x64)
 	EPROTONOSUPPORT = syscall.Errno(0x2b)
 	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
 	ERANGE          = syscall.Errno(0x22)
 	EREMOTE         = syscall.Errno(0x47)
 	EROFS           = syscall.Errno(0x1e)
 	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
 	ESHUTDOWN       = syscall.Errno(0x3a)
 	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
 	ESPIPE          = syscall.Errno(0x1d)
 	ESRCH           = syscall.Errno(0x3)
 	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
 	ETIMEDOUT       = syscall.Errno(0x3c)
 	ETOOMANYREFS    = syscall.Errno(0x3b)
 	ETXTBSY         = syscall.Errno(0x1a)
-	EUNUSED94       = syscall.Errno(0x5e)
-	EUNUSED95       = syscall.Errno(0x5f)
-	EUNUSED96       = syscall.Errno(0x60)
-	EUNUSED97       = syscall.Errno(0x61)
-	EUNUSED98       = syscall.Errno(0x62)
 	EUSERS          = syscall.Errno(0x44)
 	EWOULDBLOCK     = syscall.Errno(0x23)
 	EXDEV           = syscall.Errno(0x12)
@@ -1349,144 +1396,148 @@ const (
 
 // Signals
 const (
-	SIGABRT     = syscall.Signal(0x6)
-	SIGALRM     = syscall.Signal(0xe)
-	SIGBUS      = syscall.Signal(0xa)
-	SIGCHLD     = syscall.Signal(0x14)
-	SIGCKPT     = syscall.Signal(0x21)
-	SIGCKPTEXIT = syscall.Signal(0x22)
-	SIGCONT     = syscall.Signal(0x13)
-	SIGEMT      = syscall.Signal(0x7)
-	SIGFPE      = syscall.Signal(0x8)
-	SIGHUP      = syscall.Signal(0x1)
-	SIGILL      = syscall.Signal(0x4)
-	SIGINFO     = syscall.Signal(0x1d)
-	SIGINT      = syscall.Signal(0x2)
-	SIGIO       = syscall.Signal(0x17)
-	SIGIOT      = syscall.Signal(0x6)
-	SIGKILL     = syscall.Signal(0x9)
-	SIGPIPE     = syscall.Signal(0xd)
-	SIGPROF     = syscall.Signal(0x1b)
-	SIGQUIT     = syscall.Signal(0x3)
-	SIGSEGV     = syscall.Signal(0xb)
-	SIGSTOP     = syscall.Signal(0x11)
-	SIGSYS      = syscall.Signal(0xc)
-	SIGTERM     = syscall.Signal(0xf)
-	SIGTHR      = syscall.Signal(0x20)
-	SIGTRAP     = syscall.Signal(0x5)
-	SIGTSTP     = syscall.Signal(0x12)
-	SIGTTIN     = syscall.Signal(0x15)
-	SIGTTOU     = syscall.Signal(0x16)
-	SIGURG      = syscall.Signal(0x10)
-	SIGUSR1     = syscall.Signal(0x1e)
-	SIGUSR2     = syscall.Signal(0x1f)
-	SIGVTALRM   = syscall.Signal(0x1a)
-	SIGWINCH    = syscall.Signal(0x1c)
-	SIGXCPU     = syscall.Signal(0x18)
-	SIGXFSZ     = syscall.Signal(0x19)
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
 )
 
 // Error table
 var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "no medium found",
-	94: "unknown error: 94",
-	95: "unknown error: 95",
-	96: "unknown error: 96",
-	97: "unknown error: 97",
-	98: "unknown error: 98",
-	99: "unknown error: 99",
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "device not configured",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource deadlock avoided",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "resource busy",
+	17:  "file exists",
+	18:  "cross-device link",
+	19:  "operation not supported by device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "result too large",
+	35:  "resource temporarily unavailable",
+	36:  "operation now in progress",
+	37:  "operation already in progress",
+	38:  "socket operation on non-socket",
+	39:  "destination address required",
+	40:  "message too long",
+	41:  "protocol wrong type for socket",
+	42:  "protocol not available",
+	43:  "protocol not supported",
+	44:  "socket type not supported",
+	45:  "operation not supported",
+	46:  "protocol family not supported",
+	47:  "address family not supported by protocol family",
+	48:  "address already in use",
+	49:  "can't assign requested address",
+	50:  "network is down",
+	51:  "network is unreachable",
+	52:  "network dropped connection on reset",
+	53:  "software caused connection abort",
+	54:  "connection reset by peer",
+	55:  "no buffer space available",
+	56:  "socket is already connected",
+	57:  "socket is not connected",
+	58:  "can't send after socket shutdown",
+	59:  "too many references: can't splice",
+	60:  "operation timed out",
+	61:  "connection refused",
+	62:  "too many levels of symbolic links",
+	63:  "file name too long",
+	64:  "host is down",
+	65:  "no route to host",
+	66:  "directory not empty",
+	67:  "too many processes",
+	68:  "too many users",
+	69:  "disc quota exceeded",
+	70:  "stale NFS file handle",
+	71:  "too many levels of remote in path",
+	72:  "RPC struct is bad",
+	73:  "RPC version wrong",
+	74:  "RPC prog. not avail",
+	75:  "program version wrong",
+	76:  "bad procedure for program",
+	77:  "no locks available",
+	78:  "function not implemented",
+	79:  "inappropriate file type or format",
+	80:  "authentication error",
+	81:  "need authenticator",
+	82:  "device power is off",
+	83:  "device error",
+	84:  "value too large to be stored in data type",
+	85:  "bad executable (or shared library)",
+	86:  "bad CPU type in executable",
+	87:  "shared library version mismatch",
+	88:  "malformed Mach-o file",
+	89:  "operation canceled",
+	90:  "identifier removed",
+	91:  "no message of desired type",
+	92:  "illegal byte sequence",
+	93:  "attribute not found",
+	94:  "bad message",
+	95:  "EMULTIHOP (Reserved)",
+	96:  "no message available on STREAM",
+	97:  "ENOLINK (Reserved)",
+	98:  "no STREAM resources",
+	99:  "not a STREAM",
+	100: "protocol error",
+	101: "STREAM ioctl timeout",
+	102: "operation not supported on socket",
+	103: "policy not found",
+	104: "state not recoverable",
+	105: "previous owner died",
+	106: "interface output queue is full",
 }
 
 // Signal table
@@ -1522,7 +1573,4 @@ var signals = [...]string{
 	29: "information request",
 	30: "user defined signal 1",
 	31: "user defined signal 2",
-	32: "thread Scheduler",
-	33: "checkPoint",
-	34: "checkPointExit",
 }
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
index 914fa96a78..0feceee151 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m64
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,dragonfly
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m64 _const.go
 
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go
index 199c63fe61..7b95751c3d 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m32
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,freebsd
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m32 _const.go
 
@@ -223,6 +225,20 @@ const (
 	BRKINT                            = 0x2
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x4
+	CLOCK_MONOTONIC_FAST              = 0xc
+	CLOCK_MONOTONIC_PRECISE           = 0xb
+	CLOCK_PROCESS_CPUTIME_ID          = 0xf
+	CLOCK_PROF                        = 0x2
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_REALTIME_FAST               = 0xa
+	CLOCK_REALTIME_PRECISE            = 0x9
+	CLOCK_SECOND                      = 0xd
+	CLOCK_THREAD_CPUTIME_ID           = 0xe
+	CLOCK_UPTIME                      = 0x5
+	CLOCK_UPTIME_FAST                 = 0x8
+	CLOCK_UPTIME_PRECISE              = 0x7
+	CLOCK_VIRTUAL                     = 0x1
 	CREAD                             = 0x800
 	CS5                               = 0x0
 	CS6                               = 0x100
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
index f3ca90af1b..e48e7799a1 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m64
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,freebsd
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m64 _const.go
 
@@ -223,6 +225,20 @@ const (
 	BRKINT                            = 0x2
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x4
+	CLOCK_MONOTONIC_FAST              = 0xc
+	CLOCK_MONOTONIC_PRECISE           = 0xb
+	CLOCK_PROCESS_CPUTIME_ID          = 0xf
+	CLOCK_PROF                        = 0x2
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_REALTIME_FAST               = 0xa
+	CLOCK_REALTIME_PRECISE            = 0x9
+	CLOCK_SECOND                      = 0xd
+	CLOCK_THREAD_CPUTIME_ID           = 0xe
+	CLOCK_UPTIME                      = 0x5
+	CLOCK_UPTIME_FAST                 = 0x8
+	CLOCK_UPTIME_PRECISE              = 0x7
+	CLOCK_VIRTUAL                     = 0x1
 	CREAD                             = 0x800
 	CS5                               = 0x0
 	CS6                               = 0x100
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go
index 2d9d5e228d..2afbe2d5ed 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go
@@ -1,6 +1,8 @@
 // mkerrors.sh
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build arm,freebsd
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- _const.go
 
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go
index fcee4fcef4..8f920124b8 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m32
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,linux
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m32 _const.go
 
@@ -143,6 +145,7 @@ const (
 	B75                              = 0x2
 	B921600                          = 0x1007
 	B9600                            = 0xd
+	BOTHER                           = 0x1000
 	BPF_A                            = 0x10
 	BPF_ABS                          = 0x20
 	BPF_ADD                          = 0x0
@@ -184,7 +187,13 @@ const (
 	BPF_W                            = 0x0
 	BPF_X                            = 0x8
 	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
 	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
 	CLOCAL                           = 0x800
 	CLOCK_BOOTTIME                   = 0x7
 	CLOCK_BOOTTIME_ALARM             = 0x9
@@ -207,6 +216,7 @@ const (
 	CLONE_FILES                      = 0x400
 	CLONE_FS                         = 0x200
 	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
 	CLONE_NEWIPC                     = 0x8000000
 	CLONE_NEWNET                     = 0x40000000
 	CLONE_NEWNS                      = 0x20000
@@ -223,7 +233,14 @@ const (
 	CLONE_UNTRACED                   = 0x800000
 	CLONE_VFORK                      = 0x4000
 	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
 	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
 	CS5                              = 0x0
 	CS6                              = 0x10
 	CS7                              = 0x20
@@ -351,6 +368,9 @@ const (
 	EXTPROC                          = 0x10000
 	FD_CLOEXEC                       = 0x1
 	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
 	FLUSHO                           = 0x1000
 	F_DUPFD                          = 0x0
 	F_DUPFD_CLOEXEC                  = 0x406
@@ -386,6 +406,7 @@ const (
 	F_UNLCK                          = 0x2
 	F_WRLCK                          = 0x1
 	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
 	ICANON                           = 0x2
 	ICMPV6_FILTER                    = 0x1
 	ICRNL                            = 0x100
@@ -617,6 +638,7 @@ const (
 	IP_XFRM_POLICY                   = 0x11
 	ISIG                             = 0x1
 	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
 	IUTF8                            = 0x4000
 	IXANY                            = 0x800
 	IXOFF                            = 0x1000
@@ -748,10 +770,13 @@ const (
 	NETLINK_UNUSED                   = 0x1
 	NETLINK_USERSOCK                 = 0x2
 	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
 	NLA_ALIGNTO                      = 0x4
 	NLA_F_NESTED                     = 0x8000
 	NLA_F_NET_BYTEORDER              = 0x4000
 	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
 	NLMSG_ALIGNTO                    = 0x4
 	NLMSG_DONE                       = 0x3
 	NLMSG_ERROR                      = 0x2
@@ -776,6 +801,7 @@ const (
 	OCRNL                            = 0x8
 	OFDEL                            = 0x80
 	OFILL                            = 0x40
+	OLCUC                            = 0x2
 	ONLCR                            = 0x4
 	ONLRET                           = 0x20
 	ONOCR                            = 0x10
@@ -801,6 +827,7 @@ const (
 	O_RDWR                           = 0x2
 	O_RSYNC                          = 0x101000
 	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
 	O_TRUNC                          = 0x200
 	O_WRONLY                         = 0x1
 	PACKET_ADD_MEMBERSHIP            = 0x1
@@ -1273,10 +1300,23 @@ const (
 	S_IXGRP                          = 0x8
 	S_IXOTH                          = 0x1
 	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
 	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
 	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
 	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
 	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
 	TCP_CONGESTION                   = 0xd
 	TCP_CORK                         = 0x3
 	TCP_DEFER_ACCEPT                 = 0x9
@@ -1296,14 +1336,32 @@ const (
 	TCP_SYNCNT                       = 0x7
 	TCP_WINDOW_CLAMP                 = 0xa
 	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
 	TIOCCBRK                         = 0x5428
 	TIOCCONS                         = 0x541d
 	TIOCEXCL                         = 0x540c
 	TIOCGDEV                         = 0x80045432
 	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
 	TIOCGICOUNT                      = 0x545d
 	TIOCGLCKTRMIOS                   = 0x5456
 	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
 	TIOCGPTN                         = 0x80045430
 	TIOCGRS485                       = 0x542e
 	TIOCGSERIAL                      = 0x541e
@@ -1409,6 +1467,8 @@ const (
 	WORDSIZE                         = 0x20
 	WSTOPPED                         = 0x2
 	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
 )
 
 // Errors
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go
index 52d05b1282..49b6c35467 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m64
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,linux
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m64 _const.go
 
@@ -143,6 +145,7 @@ const (
 	B75                              = 0x2
 	B921600                          = 0x1007
 	B9600                            = 0xd
+	BOTHER                           = 0x1000
 	BPF_A                            = 0x10
 	BPF_ABS                          = 0x20
 	BPF_ADD                          = 0x0
@@ -184,7 +187,13 @@ const (
 	BPF_W                            = 0x0
 	BPF_X                            = 0x8
 	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
 	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
 	CLOCAL                           = 0x800
 	CLOCK_BOOTTIME                   = 0x7
 	CLOCK_BOOTTIME_ALARM             = 0x9
@@ -207,6 +216,7 @@ const (
 	CLONE_FILES                      = 0x400
 	CLONE_FS                         = 0x200
 	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
 	CLONE_NEWIPC                     = 0x8000000
 	CLONE_NEWNET                     = 0x40000000
 	CLONE_NEWNS                      = 0x20000
@@ -223,7 +233,14 @@ const (
 	CLONE_UNTRACED                   = 0x800000
 	CLONE_VFORK                      = 0x4000
 	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
 	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
 	CS5                              = 0x0
 	CS6                              = 0x10
 	CS7                              = 0x20
@@ -351,6 +368,9 @@ const (
 	EXTPROC                          = 0x10000
 	FD_CLOEXEC                       = 0x1
 	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
 	FLUSHO                           = 0x1000
 	F_DUPFD                          = 0x0
 	F_DUPFD_CLOEXEC                  = 0x406
@@ -386,6 +406,7 @@ const (
 	F_UNLCK                          = 0x2
 	F_WRLCK                          = 0x1
 	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
 	ICANON                           = 0x2
 	ICMPV6_FILTER                    = 0x1
 	ICRNL                            = 0x100
@@ -617,6 +638,7 @@ const (
 	IP_XFRM_POLICY                   = 0x11
 	ISIG                             = 0x1
 	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
 	IUTF8                            = 0x4000
 	IXANY                            = 0x800
 	IXOFF                            = 0x1000
@@ -748,10 +770,13 @@ const (
 	NETLINK_UNUSED                   = 0x1
 	NETLINK_USERSOCK                 = 0x2
 	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
 	NLA_ALIGNTO                      = 0x4
 	NLA_F_NESTED                     = 0x8000
 	NLA_F_NET_BYTEORDER              = 0x4000
 	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
 	NLMSG_ALIGNTO                    = 0x4
 	NLMSG_DONE                       = 0x3
 	NLMSG_ERROR                      = 0x2
@@ -776,6 +801,7 @@ const (
 	OCRNL                            = 0x8
 	OFDEL                            = 0x80
 	OFILL                            = 0x40
+	OLCUC                            = 0x2
 	ONLCR                            = 0x4
 	ONLRET                           = 0x20
 	ONOCR                            = 0x10
@@ -801,6 +827,7 @@ const (
 	O_RDWR                           = 0x2
 	O_RSYNC                          = 0x101000
 	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
 	O_TRUNC                          = 0x200
 	O_WRONLY                         = 0x1
 	PACKET_ADD_MEMBERSHIP            = 0x1
@@ -1274,10 +1301,23 @@ const (
 	S_IXGRP                          = 0x8
 	S_IXOTH                          = 0x1
 	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
 	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
 	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
 	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
 	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
 	TCP_CONGESTION                   = 0xd
 	TCP_CORK                         = 0x3
 	TCP_DEFER_ACCEPT                 = 0x9
@@ -1297,14 +1337,32 @@ const (
 	TCP_SYNCNT                       = 0x7
 	TCP_WINDOW_CLAMP                 = 0xa
 	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
 	TIOCCBRK                         = 0x5428
 	TIOCCONS                         = 0x541d
 	TIOCEXCL                         = 0x540c
 	TIOCGDEV                         = 0x80045432
 	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
 	TIOCGICOUNT                      = 0x545d
 	TIOCGLCKTRMIOS                   = 0x5456
 	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
 	TIOCGPTN                         = 0x80045430
 	TIOCGRS485                       = 0x542e
 	TIOCGSERIAL                      = 0x541e
@@ -1410,6 +1468,8 @@ const (
 	WORDSIZE                         = 0x40
 	WSTOPPED                         = 0x2
 	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
 )
 
 // Errors
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go
index 7f57070a0d..f036758f92 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -1,6 +1,8 @@
 // mkerrors.sh
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build arm,linux
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- _const.go
 
@@ -108,6 +110,38 @@ const (
 	ARPHRD_TUNNEL6                   = 0x301
 	ARPHRD_VOID                      = 0xffff
 	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BOTHER                           = 0x1000
 	BPF_A                            = 0x10
 	BPF_ABS                          = 0x20
 	BPF_ADD                          = 0x0
@@ -148,6 +182,15 @@ const (
 	BPF_TXA                          = 0x80
 	BPF_W                            = 0x0
 	BPF_X                            = 0x8
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
+	CLOCAL                           = 0x800
 	CLOCK_BOOTTIME                   = 0x7
 	CLOCK_BOOTTIME_ALARM             = 0x9
 	CLOCK_DEFAULT                    = 0x0
@@ -169,6 +212,7 @@ const (
 	CLONE_FILES                      = 0x400
 	CLONE_FS                         = 0x200
 	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
 	CLONE_NEWIPC                     = 0x8000000
 	CLONE_NEWNET                     = 0x40000000
 	CLONE_NEWNS                      = 0x20000
@@ -185,6 +229,25 @@ const (
 	CLONE_UNTRACED                   = 0x800000
 	CLONE_VFORK                      = 0x4000
 	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
+	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
 	DT_BLK                           = 0x6
 	DT_CHR                           = 0x2
 	DT_DIR                           = 0x4
@@ -196,6 +259,13 @@ const (
 	DT_WHT                           = 0xe
 	ELF_NGREG                        = 0x12
 	ELF_PRARGSZ                      = 0x50
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
 	EPOLLERR                         = 0x8
 	EPOLLET                          = -0x80000000
 	EPOLLHUP                         = 0x10
@@ -278,8 +348,15 @@ const (
 	ETH_P_WAN_PPP                    = 0x7
 	ETH_P_WCCP                       = 0x883e
 	ETH_P_X25                        = 0x805
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
 	FD_CLOEXEC                       = 0x1
 	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
+	FLUSHO                           = 0x1000
 	F_DUPFD                          = 0x0
 	F_DUPFD_CLOEXEC                  = 0x406
 	F_EXLCK                          = 0x4
@@ -313,7 +390,12 @@ const (
 	F_ULOCK                          = 0x0
 	F_UNLCK                          = 0x2
 	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x2
 	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x8000
 	IFA_F_DADFAILED                  = 0x8
 	IFA_F_DEPRECATED                 = 0x20
 	IFA_F_HOMEADDRESS                = 0x10
@@ -347,6 +429,12 @@ const (
 	IFF_UP                           = 0x1
 	IFF_VNET_HDR                     = 0x4000
 	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
 	IN_ACCESS                        = 0x1
 	IN_ALL_EVENTS                    = 0xfff
 	IN_ATTRIB                        = 0x4
@@ -510,6 +598,13 @@ const (
 	IP_TTL                           = 0x2
 	IP_UNBLOCK_SOURCE                = 0x25
 	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
 	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
 	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
 	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
@@ -633,10 +728,13 @@ const (
 	NETLINK_UNUSED                   = 0x1
 	NETLINK_USERSOCK                 = 0x2
 	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
 	NLA_ALIGNTO                      = 0x4
 	NLA_F_NESTED                     = 0x8000
 	NLA_F_NET_BYTEORDER              = 0x4000
 	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
 	NLMSG_ALIGNTO                    = 0x4
 	NLMSG_DONE                       = 0x3
 	NLMSG_ERROR                      = 0x2
@@ -656,6 +754,15 @@ const (
 	NLM_F_REPLACE                    = 0x100
 	NLM_F_REQUEST                    = 0x1
 	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x2
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
 	O_ACCMODE                        = 0x3
 	O_APPEND                         = 0x400
 	O_ASYNC                          = 0x2000
@@ -672,6 +779,7 @@ const (
 	O_NOCTTY                         = 0x100
 	O_NOFOLLOW                       = 0x8000
 	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
 	O_RDONLY                         = 0x0
 	O_RDWR                           = 0x2
 	O_RSYNC                          = 0x1000
@@ -693,6 +801,10 @@ const (
 	PACKET_RECV_OUTPUT               = 0x3
 	PACKET_RX_RING                   = 0x5
 	PACKET_STATISTICS                = 0x6
+	PARENB                           = 0x100
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
 	PRIO_PGRP                        = 0x1
 	PRIO_PROCESS                     = 0x0
 	PRIO_USER                        = 0x2
@@ -1112,9 +1224,23 @@ const (
 	S_IXGRP                          = 0x8
 	S_IXOTH                          = 0x1
 	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
+	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
 	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
 	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
 	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
 	TCP_CONGESTION                   = 0xd
 	TCP_CORK                         = 0x3
 	TCP_DEFER_ACCEPT                 = 0x9
@@ -1133,14 +1259,33 @@ const (
 	TCP_QUICKACK                     = 0xc
 	TCP_SYNCNT                       = 0x7
 	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
 	TIOCCBRK                         = 0x5428
 	TIOCCONS                         = 0x541d
 	TIOCEXCL                         = 0x540c
 	TIOCGDEV                         = 0x80045432
 	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
 	TIOCGICOUNT                      = 0x545d
 	TIOCGLCKTRMIOS                   = 0x5456
 	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
 	TIOCGPTN                         = 0x80045430
 	TIOCGRS485                       = 0x542e
 	TIOCGSERIAL                      = 0x541e
@@ -1198,6 +1343,7 @@ const (
 	TIOCSTI                          = 0x5412
 	TIOCSWINSZ                       = 0x5414
 	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x100
 	TUNATTACHFILTER                  = 0x400854d5
 	TUNDETACHFILTER                  = 0x400854d6
 	TUNGETFEATURES                   = 0x800454cf
@@ -1215,6 +1361,26 @@ const (
 	TUNSETSNDBUF                     = 0x400454d4
 	TUNSETTXFILTER                   = 0x400454d1
 	TUNSETVNETHDRSZ                  = 0x400454d8
+	VDISCARD                         = 0xd
+	VEOF                             = 0x4
+	VEOL                             = 0xb
+	VEOL2                            = 0x10
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x6
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
 	WALL                             = 0x40000000
 	WCLONE                           = 0x80000000
 	WCONTINUED                       = 0x8
@@ -1225,6 +1391,8 @@ const (
 	WORDSIZE                         = 0x20
 	WSTOPPED                         = 0x2
 	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
 )
 
 // Errors
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go
new file mode 100644
index 0000000000..16dcbc9cb2
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -0,0 +1,1897 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm64,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BOTHER                           = 0x1000
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
+	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ELF_NGREG                        = 0x22
+	ELF_PRARGSZ                      = 0x50
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
+	FLUSHO                           = 0x1000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0x5
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x8000
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_NODAD                      = 0x2
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x7
+	IFF_802_1Q_VLAN                  = 0x1
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BONDING                      = 0x20
+	IFF_BRIDGE_PORT                  = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DISABLE_NETPOLL              = 0x1000
+	IFF_DONT_BRIDGE                  = 0x800
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_EBRIDGE                      = 0x2
+	IFF_ECHO                         = 0x40000
+	IFF_ISATAP                       = 0x80
+	IFF_LIVE_ADDR_CHANGE             = 0x100000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MACVLAN                      = 0x200000
+	IFF_MACVLAN_PORT                 = 0x2000
+	IFF_MASTER                       = 0x400
+	IFF_MASTER_8023AD                = 0x8
+	IFF_MASTER_ALB                   = 0x10
+	IFF_MASTER_ARPMON                = 0x100
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_OVS_DATAPATH                 = 0x8000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_SLAVE_INACTIVE               = 0x4
+	IFF_SLAVE_NEEDARP                = 0x40
+	IFF_SUPP_NOFCS                   = 0x80000
+	IFF_TAP                          = 0x2
+	IFF_TEAM_PORT                    = 0x40000
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_TX_SKB_SHARING               = 0x10000
+	IFF_UNICAST_FLT                  = 0x20000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFF_WAN_HDLC                     = 0x200
+	IFF_XMIT_DST_RELEASE             = 0x400
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x2000
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x4000
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x2
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x10000
+	O_DIRECTORY                      = 0x4000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x8000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x1000ff
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0xf
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x11
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x57
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x12
+	RTM_NR_MSGTYPES                  = 0x48
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_GET_FILTER                    = 0x1a
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x10
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x11
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x12
+	SO_RCVTIMEO                      = 0x14
+	SO_REUSEADDR                     = 0x2
+	SO_REUSEPORT                     = 0xf
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x13
+	SO_SNDTIMEO                      = 0x15
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
+	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x80045432
+	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
+	TIOCGPTN                         = 0x80045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x5413
+	TIOCINQ                          = 0x541b
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x5411
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x5423
+	TIOCSIG                          = 0x40045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSPGRP                        = 0x5410
+	TIOCSPTLCK                       = 0x40045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTI                          = 0x5412
+	TIOCSWINSZ                       = 0x5414
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x100
+	TUNATTACHFILTER                  = 0x401054d5
+	TUNDETACHFILTER                  = 0x401054d6
+	TUNGETFEATURES                   = 0x800454cf
+	TUNGETFILTER                     = 0x801054db
+	TUNGETIFF                        = 0x800454d2
+	TUNGETSNDBUF                     = 0x800454d3
+	TUNGETVNETHDRSZ                  = 0x800454d7
+	TUNSETDEBUG                      = 0x400454c9
+	TUNSETGROUP                      = 0x400454ce
+	TUNSETIFF                        = 0x400454ca
+	TUNSETIFINDEX                    = 0x400454da
+	TUNSETLINK                       = 0x400454cd
+	TUNSETNOCSUM                     = 0x400454c8
+	TUNSETOFFLOAD                    = 0x400454d0
+	TUNSETOWNER                      = 0x400454cc
+	TUNSETPERSIST                    = 0x400454cb
+	TUNSETQUEUE                      = 0x400454d9
+	TUNSETSNDBUF                     = 0x400454d4
+	TUNSETTXFILTER                   = 0x400454d1
+	TUNSETVNETHDRSZ                  = 0x400454d8
+	VDISCARD                         = 0xd
+	VEOF                             = 0x4
+	VEOL                             = 0xb
+	VEOL2                            = 0x10
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x6
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "memory page has hardware error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64.go
new file mode 100644
index 0000000000..36535b242d
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -0,0 +1,1917 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build mips64,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IB                            = 0x1b
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_MPLS                          = 0x1c
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_6LOWPAN                   = 0x339
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LL_OFF                       = -0x200000
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_NET_OFF                      = -0x100000
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	CFLUSH                           = 0xf
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_TAI                        = 0xb
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CREAD                            = 0x80
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_80221                      = 0x8917
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_LOOPBACK                   = 0x9000
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_TSN                        = 0x22f0
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	ETH_P_XDSA                       = 0xf8
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FLUSHO                           = 0x2000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0xe
+	F_GETLK64                        = 0xe
+	F_GETOWN                         = 0x17
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OFD_GETLK                      = 0x24
+	F_OFD_SETLK                      = 0x25
+	F_OFD_SETLKW                     = 0x26
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x18
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x100
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_MANAGETEMPADDR             = 0x100
+	IFA_F_MCAUTOJOIN                 = 0x400
+	IFA_F_NODAD                      = 0x2
+	IFA_F_NOPREFIXROUTE              = 0x200
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_STABLE_PRIVACY             = 0x800
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x8
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_ECHO                         = 0x40000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x80
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DONTFRAG                    = 0x3e
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PATHMTU                     = 0x3d
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_INTERFACE          = 0x4
+	IPV6_PMTUDISC_OMIT               = 0x5
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPATHMTU                 = 0x3c
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_CHECKSUM                      = 0x17
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_NODEFRAG                      = 0x16
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_INTERFACE            = 0x4
+	IP_PMTUDISC_OMIT                 = 0x5
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x800
+	MAP_ANONYMOUS                    = 0x800
+	MAP_DENYWRITE                    = 0x2000
+	MAP_EXECUTABLE                   = 0x4000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x1000
+	MAP_HUGETLB                      = 0x80000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x8000
+	MAP_NONBLOCK                     = 0x20000
+	MAP_NORESERVE                    = 0x400
+	MAP_POPULATE                     = 0x10000
+	MAP_PRIVATE                      = 0x2
+	MAP_RENAME                       = 0x800
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x40000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_LAZYTIME                      = 0x2000000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x2800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CAP_ACK                  = 0xa
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_LISTEN_ALL_NSID          = 0x8
+	NETLINK_LIST_MEMBERSHIPS         = 0x9
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x8
+	O_ASYNC                          = 0x1000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x100
+	O_DIRECT                         = 0x8000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x10
+	O_EXCL                           = 0x400
+	O_FSYNC                          = 0x4010
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x80
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x800
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x80
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x4010
+	O_SYNC                           = 0x4010
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CBPF               = 0x6
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_DATA               = 0x16
+	PACKET_FANOUT_EBPF               = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_QM                 = 0x5
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_KERNEL                    = 0x7
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_QDISC_BYPASS              = 0x14
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_ROLLOVER_STATS            = 0x15
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_USER                      = 0x6
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_CAP_AMBIENT                   = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
+	PR_CAP_AMBIENT_IS_SET            = 0x1
+	PR_CAP_AMBIENT_LOWER             = 0x3
+	PR_CAP_AMBIENT_RAISE             = 0x2
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_FP_MODE_FR                    = 0x1
+	PR_FP_MODE_FRE                   = 0x2
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_FP_MODE                   = 0x2e
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_THP_DISABLE               = 0x2a
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_FP_MODE                   = 0x2d
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_MAP                    = 0xe
+	PR_SET_MM_MAP_SIZE               = 0xf
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_THP_DISABLE               = 0x29
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GET_THREAD_AREA           = 0x19
+	PTRACE_GET_THREAD_AREA_3264      = 0xc4
+	PTRACE_GET_WATCH_REGS            = 0xd0
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKDATA_3264             = 0xc1
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKTEXT_3264             = 0xc0
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKEDATA_3264             = 0xc3
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKETEXT_3264             = 0xc2
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SET_THREAD_AREA           = 0x1a
+	PTRACE_SET_WATCH_REGS            = 0xd1
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	RLIMIT_AS                        = 0x6
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x5
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CC_ALGO                     = 0x10
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_MASK                = 0xf
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0x10
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x16
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELNSID                      = 0x59
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETNSID                      = 0x5a
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x5b
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWNSID                      = 0x58
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x13
+	RTM_NR_MSGTYPES                  = 0x4c
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_COMPARE_MASK                = 0x11
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_LINKDOWN                  = 0x10
+	RTNH_F_OFFLOAD                   = 0x8
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BABEL                     = 0x2a
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x40047307
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x40047309
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x80047308
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x1
+	SOCK_NONBLOCK                    = 0x80
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x2
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0xffff
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1009
+	SO_ATTACH_BPF                    = 0x32
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BPF_EXTENSIONS                = 0x30
+	SO_BROADCAST                     = 0x20
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_BPF                    = 0x1b
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x1029
+	SO_DONTROUTE                     = 0x10
+	SO_ERROR                         = 0x1007
+	SO_GET_FILTER                    = 0x1a
+	SO_INCOMING_CPU                  = 0x31
+	SO_KEEPALIVE                     = 0x8
+	SO_LINGER                        = 0x80
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0x100
+	SO_PASSCRED                      = 0x11
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x12
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1e
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x1028
+	SO_RCVBUF                        = 0x1002
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x1004
+	SO_RCVTIMEO                      = 0x1006
+	SO_REUSEADDR                     = 0x4
+	SO_REUSEPORT                     = 0x200
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x1001
+	SO_SNDBUFFORCE                   = 0x1f
+	SO_SNDLOWAT                      = 0x1003
+	SO_SNDTIMEO                      = 0x1005
+	SO_STYLE                         = 0x1008
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x1008
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TCFLSH                           = 0x5407
+	TCIFLUSH                         = 0x0
+	TCIOFLUSH                        = 0x2
+	TCOFLUSH                         = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x5410
+	TCSBRK                           = 0x5405
+	TCXONC                           = 0x5406
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x80047478
+	TIOCEXCL                         = 0x740d
+	TIOCGDEV                         = 0x40045432
+	TIOCGETD                         = 0x7400
+	TIOCGETP                         = 0x7408
+	TIOCGEXCL                        = 0x40045440
+	TIOCGICOUNT                      = 0x5492
+	TIOCGLCKTRMIOS                   = 0x548b
+	TIOCGLTC                         = 0x7474
+	TIOCGPGRP                        = 0x40047477
+	TIOCGPKT                         = 0x40045438
+	TIOCGPTLCK                       = 0x40045439
+	TIOCGPTN                         = 0x40045430
+	TIOCGRS485                       = 0x4020542e
+	TIOCGSERIAL                      = 0x5484
+	TIOCGSID                         = 0x7416
+	TIOCGSOFTCAR                     = 0x5481
+	TIOCGWINSZ                       = 0x40087468
+	TIOCINQ                          = 0x467f
+	TIOCLINUX                        = 0x5483
+	TIOCMBIC                         = 0x741c
+	TIOCMBIS                         = 0x741b
+	TIOCMGET                         = 0x741d
+	TIOCMIWAIT                       = 0x5491
+	TIOCMSET                         = 0x741a
+	TIOCM_CAR                        = 0x100
+	TIOCM_CD                         = 0x100
+	TIOCM_CTS                        = 0x40
+	TIOCM_DSR                        = 0x400
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x200
+	TIOCM_RNG                        = 0x200
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x20
+	TIOCM_ST                         = 0x10
+	TIOCNOTTY                        = 0x5471
+	TIOCNXCL                         = 0x740e
+	TIOCOUTQ                         = 0x7472
+	TIOCPKT                          = 0x5470
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x5480
+	TIOCSERCONFIG                    = 0x5488
+	TIOCSERGETLSR                    = 0x548e
+	TIOCSERGETMULTI                  = 0x548f
+	TIOCSERGSTRUCT                   = 0x548d
+	TIOCSERGWILD                     = 0x5489
+	TIOCSERSETMULTI                  = 0x5490
+	TIOCSERSWILD                     = 0x548a
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x7401
+	TIOCSETN                         = 0x740a
+	TIOCSETP                         = 0x7409
+	TIOCSIG                          = 0x80045436
+	TIOCSLCKTRMIOS                   = 0x548c
+	TIOCSLTC                         = 0x7475
+	TIOCSPGRP                        = 0x80047476
+	TIOCSPTLCK                       = 0x80045431
+	TIOCSRS485                       = 0xc020542f
+	TIOCSSERIAL                      = 0x5485
+	TIOCSSOFTCAR                     = 0x5482
+	TIOCSTI                          = 0x5472
+	TIOCSWINSZ                       = 0x80087467
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x8000
+	TUNATTACHFILTER                  = 0x801054d5
+	TUNDETACHFILTER                  = 0x801054d6
+	TUNGETFEATURES                   = 0x400454cf
+	TUNGETFILTER                     = 0x401054db
+	TUNGETIFF                        = 0x400454d2
+	TUNGETSNDBUF                     = 0x400454d3
+	TUNGETVNETBE                     = 0x400454df
+	TUNGETVNETHDRSZ                  = 0x400454d7
+	TUNGETVNETLE                     = 0x400454dd
+	TUNSETDEBUG                      = 0x800454c9
+	TUNSETGROUP                      = 0x800454ce
+	TUNSETIFF                        = 0x800454ca
+	TUNSETIFINDEX                    = 0x800454da
+	TUNSETLINK                       = 0x800454cd
+	TUNSETNOCSUM                     = 0x800454c8
+	TUNSETOFFLOAD                    = 0x800454d0
+	TUNSETOWNER                      = 0x800454cc
+	TUNSETPERSIST                    = 0x800454cb
+	TUNSETQUEUE                      = 0x800454d9
+	TUNSETSNDBUF                     = 0x800454d4
+	TUNSETTXFILTER                   = 0x800454d1
+	TUNSETVNETBE                     = 0x800454de
+	TUNSETVNETHDRSZ                  = 0x800454d8
+	TUNSETVNETLE                     = 0x800454dc
+	VDISCARD                         = 0xd
+	VEOF                             = 0x10
+	VEOL                             = 0x11
+	VEOL2                            = 0x6
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x4
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VSWTCH                           = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x9e)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x46d)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EHWPOISON       = syscall.Errno(0xa8)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINIT           = syscall.Errno(0x8d)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x8b)
+	EKEYEXPIRED     = syscall.Errno(0xa2)
+	EKEYREJECTED    = syscall.Errno(0xa4)
+	EKEYREVOKED     = syscall.Errno(0xa3)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOOP           = syscall.Errno(0x5a)
+	EMEDIUMTYPE     = syscall.Errno(0xa0)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENAVAIL         = syscall.Errno(0x8a)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0xa1)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x9f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTNAM         = syscall.Errno(0x89)
+	ENOTRECOVERABLE = syscall.Errno(0xa6)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x7a)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0xa5)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMDEV         = syscall.Errno(0x8e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x8c)
+	ERESTART        = syscall.Errno(0x5b)
+	ERFKILL         = syscall.Errno(0xa7)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x87)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x12)
+	SIGCLD    = syscall.Signal(0x12)
+	SIGCONT   = syscall.Signal(0x19)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x16)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x16)
+	SIGPROF   = syscall.Signal(0x1d)
+	SIGPWR    = syscall.Signal(0x13)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x17)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x18)
+	SIGTTIN   = syscall.Signal(0x1a)
+	SIGTTOU   = syscall.Signal(0x1b)
+	SIGURG    = syscall.Signal(0x15)
+	SIGUSR1   = syscall.Signal(0x10)
+	SIGUSR2   = syscall.Signal(0x11)
+	SIGVTALRM = syscall.Signal(0x1c)
+	SIGWINCH  = syscall.Signal(0x14)
+	SIGXCPU   = syscall.Signal(0x1e)
+	SIGXFSZ   = syscall.Signal(0x1f)
+)
+
+// Error table
+var errors = [...]string{
+	1:    "operation not permitted",
+	2:    "no such file or directory",
+	3:    "no such process",
+	4:    "interrupted system call",
+	5:    "input/output error",
+	6:    "no such device or address",
+	7:    "argument list too long",
+	8:    "exec format error",
+	9:    "bad file descriptor",
+	10:   "no child processes",
+	11:   "resource temporarily unavailable",
+	12:   "cannot allocate memory",
+	13:   "permission denied",
+	14:   "bad address",
+	15:   "block device required",
+	16:   "device or resource busy",
+	17:   "file exists",
+	18:   "invalid cross-device link",
+	19:   "no such device",
+	20:   "not a directory",
+	21:   "is a directory",
+	22:   "invalid argument",
+	23:   "too many open files in system",
+	24:   "too many open files",
+	25:   "inappropriate ioctl for device",
+	26:   "text file busy",
+	27:   "file too large",
+	28:   "no space left on device",
+	29:   "illegal seek",
+	30:   "read-only file system",
+	31:   "too many links",
+	32:   "broken pipe",
+	33:   "numerical argument out of domain",
+	34:   "numerical result out of range",
+	35:   "no message of desired type",
+	36:   "identifier removed",
+	37:   "channel number out of range",
+	38:   "level 2 not synchronized",
+	39:   "level 3 halted",
+	40:   "level 3 reset",
+	41:   "link number out of range",
+	42:   "protocol driver not attached",
+	43:   "no CSI structure available",
+	44:   "level 2 halted",
+	45:   "resource deadlock avoided",
+	46:   "no locks available",
+	50:   "invalid exchange",
+	51:   "invalid request descriptor",
+	52:   "exchange full",
+	53:   "no anode",
+	54:   "invalid request code",
+	55:   "invalid slot",
+	56:   "file locking deadlock error",
+	59:   "bad font file format",
+	60:   "device not a stream",
+	61:   "no data available",
+	62:   "timer expired",
+	63:   "out of streams resources",
+	64:   "machine is not on the network",
+	65:   "package not installed",
+	66:   "object is remote",
+	67:   "link has been severed",
+	68:   "advertise error",
+	69:   "srmount error",
+	70:   "communication error on send",
+	71:   "protocol error",
+	73:   "RFS specific error",
+	74:   "multihop attempted",
+	77:   "bad message",
+	78:   "file name too long",
+	79:   "value too large for defined data type",
+	80:   "name not unique on network",
+	81:   "file descriptor in bad state",
+	82:   "remote address changed",
+	83:   "can not access a needed shared library",
+	84:   "accessing a corrupted shared library",
+	85:   ".lib section in a.out corrupted",
+	86:   "attempting to link in too many shared libraries",
+	87:   "cannot exec a shared library directly",
+	88:   "invalid or incomplete multibyte or wide character",
+	89:   "function not implemented",
+	90:   "too many levels of symbolic links",
+	91:   "interrupted system call should be restarted",
+	92:   "streams pipe error",
+	93:   "directory not empty",
+	94:   "too many users",
+	95:   "socket operation on non-socket",
+	96:   "destination address required",
+	97:   "message too long",
+	98:   "protocol wrong type for socket",
+	99:   "protocol not available",
+	120:  "protocol not supported",
+	121:  "socket type not supported",
+	122:  "operation not supported",
+	123:  "protocol family not supported",
+	124:  "address family not supported by protocol",
+	125:  "address already in use",
+	126:  "cannot assign requested address",
+	127:  "network is down",
+	128:  "network is unreachable",
+	129:  "network dropped connection on reset",
+	130:  "software caused connection abort",
+	131:  "connection reset by peer",
+	132:  "no buffer space available",
+	133:  "transport endpoint is already connected",
+	134:  "transport endpoint is not connected",
+	135:  "structure needs cleaning",
+	137:  "not a XENIX named type file",
+	138:  "no XENIX semaphores available",
+	139:  "is a named type file",
+	140:  "remote I/O error",
+	141:  "unknown error 141",
+	142:  "unknown error 142",
+	143:  "cannot send after transport endpoint shutdown",
+	144:  "too many references: cannot splice",
+	145:  "connection timed out",
+	146:  "connection refused",
+	147:  "host is down",
+	148:  "no route to host",
+	149:  "operation already in progress",
+	150:  "operation now in progress",
+	151:  "stale file handle",
+	158:  "operation canceled",
+	159:  "no medium found",
+	160:  "wrong medium type",
+	161:  "required key not available",
+	162:  "key has expired",
+	163:  "key has been revoked",
+	164:  "key was rejected by service",
+	165:  "owner died",
+	166:  "state not recoverable",
+	167:  "operation not possible due to RF-kill",
+	168:  "memory page has hardware error",
+	1133: "disk quota exceeded",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "user defined signal 1",
+	17: "user defined signal 2",
+	18: "child exited",
+	19: "power failure",
+	20: "window changed",
+	21: "urgent I/O condition",
+	22: "I/O possible",
+	23: "stopped (signal)",
+	24: "stopped",
+	25: "continued",
+	26: "stopped (tty input)",
+	27: "stopped (tty output)",
+	28: "virtual timer expired",
+	29: "profiling timer expired",
+	30: "CPU time limit exceeded",
+	31: "file size limit exceeded",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64le.go
new file mode 100644
index 0000000000..112f05de56
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -0,0 +1,1917 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build mips64le,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IB                            = 0x1b
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_MPLS                          = 0x1c
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_6LOWPAN                   = 0x339
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LL_OFF                       = -0x200000
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_NET_OFF                      = -0x100000
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	CFLUSH                           = 0xf
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_TAI                        = 0xb
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CREAD                            = 0x80
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_80221                      = 0x8917
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_LOOPBACK                   = 0x9000
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_TSN                        = 0x22f0
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	ETH_P_XDSA                       = 0xf8
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FLUSHO                           = 0x2000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0xe
+	F_GETLK64                        = 0xe
+	F_GETOWN                         = 0x17
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OFD_GETLK                      = 0x24
+	F_OFD_SETLK                      = 0x25
+	F_OFD_SETLKW                     = 0x26
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x18
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x100
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_MANAGETEMPADDR             = 0x100
+	IFA_F_MCAUTOJOIN                 = 0x400
+	IFA_F_NODAD                      = 0x2
+	IFA_F_NOPREFIXROUTE              = 0x200
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_STABLE_PRIVACY             = 0x800
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x8
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_ECHO                         = 0x40000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x80
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DONTFRAG                    = 0x3e
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PATHMTU                     = 0x3d
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_INTERFACE          = 0x4
+	IPV6_PMTUDISC_OMIT               = 0x5
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPATHMTU                 = 0x3c
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_CHECKSUM                      = 0x17
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_NODEFRAG                      = 0x16
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_INTERFACE            = 0x4
+	IP_PMTUDISC_OMIT                 = 0x5
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x800
+	MAP_ANONYMOUS                    = 0x800
+	MAP_DENYWRITE                    = 0x2000
+	MAP_EXECUTABLE                   = 0x4000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x1000
+	MAP_HUGETLB                      = 0x80000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x8000
+	MAP_NONBLOCK                     = 0x20000
+	MAP_NORESERVE                    = 0x400
+	MAP_POPULATE                     = 0x10000
+	MAP_PRIVATE                      = 0x2
+	MAP_RENAME                       = 0x800
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x40000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_LAZYTIME                      = 0x2000000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x2800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CAP_ACK                  = 0xa
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_LISTEN_ALL_NSID          = 0x8
+	NETLINK_LIST_MEMBERSHIPS         = 0x9
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x8
+	O_ASYNC                          = 0x1000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x100
+	O_DIRECT                         = 0x8000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x10
+	O_EXCL                           = 0x400
+	O_FSYNC                          = 0x4010
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x80
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x800
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x80
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x4010
+	O_SYNC                           = 0x4010
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CBPF               = 0x6
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_DATA               = 0x16
+	PACKET_FANOUT_EBPF               = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_QM                 = 0x5
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_KERNEL                    = 0x7
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_QDISC_BYPASS              = 0x14
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_ROLLOVER_STATS            = 0x15
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_USER                      = 0x6
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_CAP_AMBIENT                   = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
+	PR_CAP_AMBIENT_IS_SET            = 0x1
+	PR_CAP_AMBIENT_LOWER             = 0x3
+	PR_CAP_AMBIENT_RAISE             = 0x2
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_FP_MODE_FR                    = 0x1
+	PR_FP_MODE_FRE                   = 0x2
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_FP_MODE                   = 0x2e
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_THP_DISABLE               = 0x2a
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_FP_MODE                   = 0x2d
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_MAP                    = 0xe
+	PR_SET_MM_MAP_SIZE               = 0xf
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_THP_DISABLE               = 0x29
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GET_THREAD_AREA           = 0x19
+	PTRACE_GET_THREAD_AREA_3264      = 0xc4
+	PTRACE_GET_WATCH_REGS            = 0xd0
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKDATA_3264             = 0xc1
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKTEXT_3264             = 0xc0
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKEDATA_3264             = 0xc3
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKETEXT_3264             = 0xc2
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SET_THREAD_AREA           = 0x1a
+	PTRACE_SET_WATCH_REGS            = 0xd1
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	RLIMIT_AS                        = 0x6
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x5
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CC_ALGO                     = 0x10
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_MASK                = 0xf
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0x10
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x16
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELNSID                      = 0x59
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETNSID                      = 0x5a
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x5b
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWNSID                      = 0x58
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x13
+	RTM_NR_MSGTYPES                  = 0x4c
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_COMPARE_MASK                = 0x11
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_LINKDOWN                  = 0x10
+	RTNH_F_OFFLOAD                   = 0x8
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BABEL                     = 0x2a
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x40047307
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x40047309
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x80047308
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x1
+	SOCK_NONBLOCK                    = 0x80
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x2
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0xffff
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1009
+	SO_ATTACH_BPF                    = 0x32
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BPF_EXTENSIONS                = 0x30
+	SO_BROADCAST                     = 0x20
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_BPF                    = 0x1b
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x1029
+	SO_DONTROUTE                     = 0x10
+	SO_ERROR                         = 0x1007
+	SO_GET_FILTER                    = 0x1a
+	SO_INCOMING_CPU                  = 0x31
+	SO_KEEPALIVE                     = 0x8
+	SO_LINGER                        = 0x80
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0x100
+	SO_PASSCRED                      = 0x11
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x12
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1e
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x1028
+	SO_RCVBUF                        = 0x1002
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x1004
+	SO_RCVTIMEO                      = 0x1006
+	SO_REUSEADDR                     = 0x4
+	SO_REUSEPORT                     = 0x200
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x1001
+	SO_SNDBUFFORCE                   = 0x1f
+	SO_SNDLOWAT                      = 0x1003
+	SO_SNDTIMEO                      = 0x1005
+	SO_STYLE                         = 0x1008
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x1008
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TCFLSH                           = 0x5407
+	TCIFLUSH                         = 0x0
+	TCIOFLUSH                        = 0x2
+	TCOFLUSH                         = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x5410
+	TCSBRK                           = 0x5405
+	TCXONC                           = 0x5406
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x80047478
+	TIOCEXCL                         = 0x740d
+	TIOCGDEV                         = 0x40045432
+	TIOCGETD                         = 0x7400
+	TIOCGETP                         = 0x7408
+	TIOCGEXCL                        = 0x40045440
+	TIOCGICOUNT                      = 0x5492
+	TIOCGLCKTRMIOS                   = 0x548b
+	TIOCGLTC                         = 0x7474
+	TIOCGPGRP                        = 0x40047477
+	TIOCGPKT                         = 0x40045438
+	TIOCGPTLCK                       = 0x40045439
+	TIOCGPTN                         = 0x40045430
+	TIOCGRS485                       = 0x4020542e
+	TIOCGSERIAL                      = 0x5484
+	TIOCGSID                         = 0x7416
+	TIOCGSOFTCAR                     = 0x5481
+	TIOCGWINSZ                       = 0x40087468
+	TIOCINQ                          = 0x467f
+	TIOCLINUX                        = 0x5483
+	TIOCMBIC                         = 0x741c
+	TIOCMBIS                         = 0x741b
+	TIOCMGET                         = 0x741d
+	TIOCMIWAIT                       = 0x5491
+	TIOCMSET                         = 0x741a
+	TIOCM_CAR                        = 0x100
+	TIOCM_CD                         = 0x100
+	TIOCM_CTS                        = 0x40
+	TIOCM_DSR                        = 0x400
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x200
+	TIOCM_RNG                        = 0x200
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x20
+	TIOCM_ST                         = 0x10
+	TIOCNOTTY                        = 0x5471
+	TIOCNXCL                         = 0x740e
+	TIOCOUTQ                         = 0x7472
+	TIOCPKT                          = 0x5470
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x5480
+	TIOCSERCONFIG                    = 0x5488
+	TIOCSERGETLSR                    = 0x548e
+	TIOCSERGETMULTI                  = 0x548f
+	TIOCSERGSTRUCT                   = 0x548d
+	TIOCSERGWILD                     = 0x5489
+	TIOCSERSETMULTI                  = 0x5490
+	TIOCSERSWILD                     = 0x548a
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x7401
+	TIOCSETN                         = 0x740a
+	TIOCSETP                         = 0x7409
+	TIOCSIG                          = 0x80045436
+	TIOCSLCKTRMIOS                   = 0x548c
+	TIOCSLTC                         = 0x7475
+	TIOCSPGRP                        = 0x80047476
+	TIOCSPTLCK                       = 0x80045431
+	TIOCSRS485                       = 0xc020542f
+	TIOCSSERIAL                      = 0x5485
+	TIOCSSOFTCAR                     = 0x5482
+	TIOCSTI                          = 0x5472
+	TIOCSWINSZ                       = 0x80087467
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x8000
+	TUNATTACHFILTER                  = 0x801054d5
+	TUNDETACHFILTER                  = 0x801054d6
+	TUNGETFEATURES                   = 0x400454cf
+	TUNGETFILTER                     = 0x401054db
+	TUNGETIFF                        = 0x400454d2
+	TUNGETSNDBUF                     = 0x400454d3
+	TUNGETVNETBE                     = 0x400454df
+	TUNGETVNETHDRSZ                  = 0x400454d7
+	TUNGETVNETLE                     = 0x400454dd
+	TUNSETDEBUG                      = 0x800454c9
+	TUNSETGROUP                      = 0x800454ce
+	TUNSETIFF                        = 0x800454ca
+	TUNSETIFINDEX                    = 0x800454da
+	TUNSETLINK                       = 0x800454cd
+	TUNSETNOCSUM                     = 0x800454c8
+	TUNSETOFFLOAD                    = 0x800454d0
+	TUNSETOWNER                      = 0x800454cc
+	TUNSETPERSIST                    = 0x800454cb
+	TUNSETQUEUE                      = 0x800454d9
+	TUNSETSNDBUF                     = 0x800454d4
+	TUNSETTXFILTER                   = 0x800454d1
+	TUNSETVNETBE                     = 0x800454de
+	TUNSETVNETHDRSZ                  = 0x800454d8
+	TUNSETVNETLE                     = 0x800454dc
+	VDISCARD                         = 0xd
+	VEOF                             = 0x10
+	VEOL                             = 0x11
+	VEOL2                            = 0x6
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x4
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VSWTCH                           = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x9e)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x46d)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EHWPOISON       = syscall.Errno(0xa8)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINIT           = syscall.Errno(0x8d)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x8b)
+	EKEYEXPIRED     = syscall.Errno(0xa2)
+	EKEYREJECTED    = syscall.Errno(0xa4)
+	EKEYREVOKED     = syscall.Errno(0xa3)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOOP           = syscall.Errno(0x5a)
+	EMEDIUMTYPE     = syscall.Errno(0xa0)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENAVAIL         = syscall.Errno(0x8a)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0xa1)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x9f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTNAM         = syscall.Errno(0x89)
+	ENOTRECOVERABLE = syscall.Errno(0xa6)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x7a)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0xa5)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMDEV         = syscall.Errno(0x8e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x8c)
+	ERESTART        = syscall.Errno(0x5b)
+	ERFKILL         = syscall.Errno(0xa7)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x87)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x12)
+	SIGCLD    = syscall.Signal(0x12)
+	SIGCONT   = syscall.Signal(0x19)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x16)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x16)
+	SIGPROF   = syscall.Signal(0x1d)
+	SIGPWR    = syscall.Signal(0x13)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x17)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x18)
+	SIGTTIN   = syscall.Signal(0x1a)
+	SIGTTOU   = syscall.Signal(0x1b)
+	SIGURG    = syscall.Signal(0x15)
+	SIGUSR1   = syscall.Signal(0x10)
+	SIGUSR2   = syscall.Signal(0x11)
+	SIGVTALRM = syscall.Signal(0x1c)
+	SIGWINCH  = syscall.Signal(0x14)
+	SIGXCPU   = syscall.Signal(0x1e)
+	SIGXFSZ   = syscall.Signal(0x1f)
+)
+
+// Error table
+var errors = [...]string{
+	1:    "operation not permitted",
+	2:    "no such file or directory",
+	3:    "no such process",
+	4:    "interrupted system call",
+	5:    "input/output error",
+	6:    "no such device or address",
+	7:    "argument list too long",
+	8:    "exec format error",
+	9:    "bad file descriptor",
+	10:   "no child processes",
+	11:   "resource temporarily unavailable",
+	12:   "cannot allocate memory",
+	13:   "permission denied",
+	14:   "bad address",
+	15:   "block device required",
+	16:   "device or resource busy",
+	17:   "file exists",
+	18:   "invalid cross-device link",
+	19:   "no such device",
+	20:   "not a directory",
+	21:   "is a directory",
+	22:   "invalid argument",
+	23:   "too many open files in system",
+	24:   "too many open files",
+	25:   "inappropriate ioctl for device",
+	26:   "text file busy",
+	27:   "file too large",
+	28:   "no space left on device",
+	29:   "illegal seek",
+	30:   "read-only file system",
+	31:   "too many links",
+	32:   "broken pipe",
+	33:   "numerical argument out of domain",
+	34:   "numerical result out of range",
+	35:   "no message of desired type",
+	36:   "identifier removed",
+	37:   "channel number out of range",
+	38:   "level 2 not synchronized",
+	39:   "level 3 halted",
+	40:   "level 3 reset",
+	41:   "link number out of range",
+	42:   "protocol driver not attached",
+	43:   "no CSI structure available",
+	44:   "level 2 halted",
+	45:   "resource deadlock avoided",
+	46:   "no locks available",
+	50:   "invalid exchange",
+	51:   "invalid request descriptor",
+	52:   "exchange full",
+	53:   "no anode",
+	54:   "invalid request code",
+	55:   "invalid slot",
+	56:   "file locking deadlock error",
+	59:   "bad font file format",
+	60:   "device not a stream",
+	61:   "no data available",
+	62:   "timer expired",
+	63:   "out of streams resources",
+	64:   "machine is not on the network",
+	65:   "package not installed",
+	66:   "object is remote",
+	67:   "link has been severed",
+	68:   "advertise error",
+	69:   "srmount error",
+	70:   "communication error on send",
+	71:   "protocol error",
+	73:   "RFS specific error",
+	74:   "multihop attempted",
+	77:   "bad message",
+	78:   "file name too long",
+	79:   "value too large for defined data type",
+	80:   "name not unique on network",
+	81:   "file descriptor in bad state",
+	82:   "remote address changed",
+	83:   "can not access a needed shared library",
+	84:   "accessing a corrupted shared library",
+	85:   ".lib section in a.out corrupted",
+	86:   "attempting to link in too many shared libraries",
+	87:   "cannot exec a shared library directly",
+	88:   "invalid or incomplete multibyte or wide character",
+	89:   "function not implemented",
+	90:   "too many levels of symbolic links",
+	91:   "interrupted system call should be restarted",
+	92:   "streams pipe error",
+	93:   "directory not empty",
+	94:   "too many users",
+	95:   "socket operation on non-socket",
+	96:   "destination address required",
+	97:   "message too long",
+	98:   "protocol wrong type for socket",
+	99:   "protocol not available",
+	120:  "protocol not supported",
+	121:  "socket type not supported",
+	122:  "operation not supported",
+	123:  "protocol family not supported",
+	124:  "address family not supported by protocol",
+	125:  "address already in use",
+	126:  "cannot assign requested address",
+	127:  "network is down",
+	128:  "network is unreachable",
+	129:  "network dropped connection on reset",
+	130:  "software caused connection abort",
+	131:  "connection reset by peer",
+	132:  "no buffer space available",
+	133:  "transport endpoint is already connected",
+	134:  "transport endpoint is not connected",
+	135:  "structure needs cleaning",
+	137:  "not a XENIX named type file",
+	138:  "no XENIX semaphores available",
+	139:  "is a named type file",
+	140:  "remote I/O error",
+	141:  "unknown error 141",
+	142:  "unknown error 142",
+	143:  "cannot send after transport endpoint shutdown",
+	144:  "too many references: cannot splice",
+	145:  "connection timed out",
+	146:  "connection refused",
+	147:  "host is down",
+	148:  "no route to host",
+	149:  "operation already in progress",
+	150:  "operation now in progress",
+	151:  "stale file handle",
+	158:  "operation canceled",
+	159:  "no medium found",
+	160:  "wrong medium type",
+	161:  "required key not available",
+	162:  "key has expired",
+	163:  "key has been revoked",
+	164:  "key was rejected by service",
+	165:  "owner died",
+	166:  "state not recoverable",
+	167:  "operation not possible due to RF-kill",
+	168:  "memory page has hardware error",
+	1133: "disk quota exceeded",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "user defined signal 1",
+	17: "user defined signal 2",
+	18: "child exited",
+	19: "power failure",
+	20: "window changed",
+	21: "urgent I/O condition",
+	22: "I/O possible",
+	23: "stopped (signal)",
+	24: "stopped",
+	25: "continued",
+	26: "stopped (tty input)",
+	27: "stopped (tty output)",
+	28: "virtual timer expired",
+	29: "profiling timer expired",
+	30: "CPU time limit exceeded",
+	31: "file size limit exceeded",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go
new file mode 100644
index 0000000000..8b42ca2fe9
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -0,0 +1,1970 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build ppc64,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_6LOWPAN                   = 0x339
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x17
+	B110                             = 0x3
+	B115200                          = 0x11
+	B1152000                         = 0x18
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x19
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x1a
+	B230400                          = 0x12
+	B2400                            = 0xb
+	B2500000                         = 0x1b
+	B300                             = 0x7
+	B3000000                         = 0x1c
+	B3500000                         = 0x1d
+	B38400                           = 0xf
+	B4000000                         = 0x1e
+	B460800                          = 0x13
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x14
+	B57600                           = 0x10
+	B576000                          = 0x15
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x16
+	B9600                            = 0xd
+	BOTHER                           = 0x1f
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x8000
+	BSDLY                            = 0x8000
+	CBAUD                            = 0xff
+	CBAUDEX                          = 0x0
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0xff0000
+	CLOCAL                           = 0x8000
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x1000
+	CR2                              = 0x2000
+	CR3                              = 0x3000
+	CRDLY                            = 0x3000
+	CREAD                            = 0x800
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x100
+	CS7                              = 0x200
+	CS8                              = 0x300
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x300
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x400
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x40
+	ECHOE                            = 0x2
+	ECHOK                            = 0x4
+	ECHOKE                           = 0x1
+	ECHONL                           = 0x10
+	ECHOPRT                          = 0x20
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_80221                      = 0x8917
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_LOOPBACK                   = 0x9000
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	ETH_P_XDSA                       = 0xf8
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x4000
+	FFDLY                            = 0x4000
+	FLUSHO                           = 0x800000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0xc
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OFD_GETLK                      = 0x24
+	F_OFD_SETLK                      = 0x25
+	F_OFD_SETLKW                     = 0x26
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0xd
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0xe
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x4000
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x100
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x400
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_MANAGETEMPADDR             = 0x100
+	IFA_F_NODAD                      = 0x2
+	IFA_F_NOPREFIXROUTE              = 0x200
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x8
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_ECHO                         = 0x40000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_INTERFACE          = 0x4
+	IPV6_PMTUDISC_OMIT               = 0x5
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_NODEFRAG                      = 0x16
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_INTERFACE            = 0x4
+	IP_PMTUDISC_OMIT                 = 0x5
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x80
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x1000
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x400
+	IXON                             = 0x200
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x80
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x40
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x2000
+	MCL_FUTURE                       = 0x4000
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NL2                              = 0x200
+	NL3                              = 0x300
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x300
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80000000
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x4
+	ONLCR                            = 0x2
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x20000
+	O_DIRECTORY                      = 0x4000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x8000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_QM                 = 0x5
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_KERNEL                    = 0x7
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_QDISC_BYPASS              = 0x14
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_USER                      = 0x6
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x1000
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x2000
+	PENDIN                           = 0x20000000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_SAO                         = 0x10
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_THP_DISABLE               = 0x2a
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_MAP                    = 0xe
+	PR_SET_MM_MAP_SIZE               = 0xf
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_THP_DISABLE               = 0x29
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETEVRREGS                = 0x14
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGS64                 = 0x16
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GETVRREGS                 = 0x12
+	PTRACE_GETVSRREGS                = 0x1b
+	PTRACE_GET_DEBUGREG              = 0x19
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x1000ff
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETEVRREGS                = 0x15
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGS64                 = 0x17
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SETVRREGS                 = 0x13
+	PTRACE_SETVSRREGS                = 0x1c
+	PTRACE_SET_DEBUGREG              = 0x1a
+	PTRACE_SINGLEBLOCK               = 0x100
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	PT_CCR                           = 0x26
+	PT_CTR                           = 0x23
+	PT_DAR                           = 0x29
+	PT_DSCR                          = 0x2c
+	PT_DSISR                         = 0x2a
+	PT_FPR0                          = 0x30
+	PT_FPSCR                         = 0x50
+	PT_LNK                           = 0x24
+	PT_MSR                           = 0x21
+	PT_NIP                           = 0x20
+	PT_ORIG_R3                       = 0x22
+	PT_R0                            = 0x0
+	PT_R1                            = 0x1
+	PT_R10                           = 0xa
+	PT_R11                           = 0xb
+	PT_R12                           = 0xc
+	PT_R13                           = 0xd
+	PT_R14                           = 0xe
+	PT_R15                           = 0xf
+	PT_R16                           = 0x10
+	PT_R17                           = 0x11
+	PT_R18                           = 0x12
+	PT_R19                           = 0x13
+	PT_R2                            = 0x2
+	PT_R20                           = 0x14
+	PT_R21                           = 0x15
+	PT_R22                           = 0x16
+	PT_R23                           = 0x17
+	PT_R24                           = 0x18
+	PT_R25                           = 0x19
+	PT_R26                           = 0x1a
+	PT_R27                           = 0x1b
+	PT_R28                           = 0x1c
+	PT_R29                           = 0x1d
+	PT_R3                            = 0x3
+	PT_R30                           = 0x1e
+	PT_R31                           = 0x1f
+	PT_R4                            = 0x4
+	PT_R5                            = 0x5
+	PT_R6                            = 0x6
+	PT_R7                            = 0x7
+	PT_R8                            = 0x8
+	PT_R9                            = 0x9
+	PT_REGS_COUNT                    = 0x2c
+	PT_RESULT                        = 0x2b
+	PT_SOFTE                         = 0x27
+	PT_TRAP                          = 0x28
+	PT_VR0                           = 0x52
+	PT_VRSAVE                        = 0x94
+	PT_VSCR                          = 0x93
+	PT_VSR0                          = 0x96
+	PT_VSR31                         = 0xd4
+	PT_XER                           = 0x25
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0xf
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x11
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x57
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x12
+	RTM_NR_MSGTYPES                  = 0x48
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BPF_EXTENSIONS                = 0x30
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_GET_FILTER                    = 0x1a
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x14
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x15
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x10
+	SO_RCVTIMEO                      = 0x12
+	SO_REUSEADDR                     = 0x2
+	SO_REUSEPORT                     = 0xf
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x11
+	SO_SNDTIMEO                      = 0x13
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x400
+	TAB2                             = 0x800
+	TAB3                             = 0xc00
+	TABDLY                           = 0xc00
+	TCFLSH                           = 0x2000741f
+	TCGETA                           = 0x40147417
+	TCGETS                           = 0x402c7413
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x2000741d
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x80147418
+	TCSETAF                          = 0x8014741c
+	TCSETAW                          = 0x80147419
+	TCSETS                           = 0x802c7414
+	TCSETSF                          = 0x802c7416
+	TCSETSW                          = 0x802c7415
+	TCXONC                           = 0x2000741e
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x40045432
+	TIOCGETC                         = 0x40067412
+	TIOCGETD                         = 0x5424
+	TIOCGETP                         = 0x40067408
+	TIOCGEXCL                        = 0x40045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGLTC                         = 0x40067474
+	TIOCGPGRP                        = 0x40047477
+	TIOCGPKT                         = 0x40045438
+	TIOCGPTLCK                       = 0x40045439
+	TIOCGPTN                         = 0x40045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x40087468
+	TIOCINQ                          = 0x4004667f
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_LOOP                       = 0x8000
+	TIOCM_OUT1                       = 0x2000
+	TIOCM_OUT2                       = 0x4000
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x40047473
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETC                         = 0x80067411
+	TIOCSETD                         = 0x5423
+	TIOCSETN                         = 0x8006740a
+	TIOCSETP                         = 0x80067409
+	TIOCSIG                          = 0x80045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSLTC                         = 0x80067475
+	TIOCSPGRP                        = 0x80047476
+	TIOCSPTLCK                       = 0x80045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTART                        = 0x2000746e
+	TIOCSTI                          = 0x5412
+	TIOCSTOP                         = 0x2000746f
+	TIOCSWINSZ                       = 0x80087467
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x400000
+	TUNATTACHFILTER                  = 0x801054d5
+	TUNDETACHFILTER                  = 0x801054d6
+	TUNGETFEATURES                   = 0x400454cf
+	TUNGETFILTER                     = 0x401054db
+	TUNGETIFF                        = 0x400454d2
+	TUNGETSNDBUF                     = 0x400454d3
+	TUNGETVNETHDRSZ                  = 0x400454d7
+	TUNSETDEBUG                      = 0x800454c9
+	TUNSETGROUP                      = 0x800454ce
+	TUNSETIFF                        = 0x800454ca
+	TUNSETIFINDEX                    = 0x800454da
+	TUNSETLINK                       = 0x800454cd
+	TUNSETNOCSUM                     = 0x800454c8
+	TUNSETOFFLOAD                    = 0x800454d0
+	TUNSETOWNER                      = 0x800454cc
+	TUNSETPERSIST                    = 0x800454cb
+	TUNSETQUEUE                      = 0x800454d9
+	TUNSETSNDBUF                     = 0x800454d4
+	TUNSETTXFILTER                   = 0x800454d1
+	TUNSETVNETHDRSZ                  = 0x800454d8
+	VDISCARD                         = 0x10
+	VEOF                             = 0x4
+	VEOL                             = 0x6
+	VEOL2                            = 0x8
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x5
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xb
+	VSTART                           = 0xd
+	VSTOP                            = 0xe
+	VSUSP                            = 0xc
+	VSWTC                            = 0x9
+	VT0                              = 0x0
+	VT1                              = 0x10000
+	VTDLY                            = 0x10000
+	VTIME                            = 0x7
+	VWERASE                          = 0xa
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4000
+	XTABS                            = 0xc00
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x3a)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	58:  "file locking deadlock error",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "memory page has hardware error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
new file mode 100644
index 0000000000..e8d12b5d6d
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -0,0 +1,1969 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build ppc64le,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x17
+	B110                             = 0x3
+	B115200                          = 0x11
+	B1152000                         = 0x18
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x19
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x1a
+	B230400                          = 0x12
+	B2400                            = 0xb
+	B2500000                         = 0x1b
+	B300                             = 0x7
+	B3000000                         = 0x1c
+	B3500000                         = 0x1d
+	B38400                           = 0xf
+	B4000000                         = 0x1e
+	B460800                          = 0x13
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x14
+	B57600                           = 0x10
+	B576000                          = 0x15
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x16
+	B9600                            = 0xd
+	BOTHER                           = 0x1f
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x8000
+	BSDLY                            = 0x8000
+	CBAUD                            = 0xff
+	CBAUDEX                          = 0x0
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0xff0000
+	CLOCAL                           = 0x8000
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x1000
+	CR2                              = 0x2000
+	CR3                              = 0x3000
+	CRDLY                            = 0x3000
+	CREAD                            = 0x800
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x100
+	CS7                              = 0x200
+	CS8                              = 0x300
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x300
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x400
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x40
+	ECHOE                            = 0x2
+	ECHOK                            = 0x4
+	ECHOKE                           = 0x1
+	ECHONL                           = 0x10
+	ECHOPRT                          = 0x20
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x4000
+	FFDLY                            = 0x4000
+	FLUSHO                           = 0x800000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0xc
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0xd
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0xe
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x4000
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x100
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x400
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_NODAD                      = 0x2
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x7
+	IFF_802_1Q_VLAN                  = 0x1
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BONDING                      = 0x20
+	IFF_BRIDGE_PORT                  = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DISABLE_NETPOLL              = 0x1000
+	IFF_DONT_BRIDGE                  = 0x800
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_EBRIDGE                      = 0x2
+	IFF_ECHO                         = 0x40000
+	IFF_ISATAP                       = 0x80
+	IFF_LIVE_ADDR_CHANGE             = 0x100000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MACVLAN                      = 0x200000
+	IFF_MACVLAN_PORT                 = 0x2000
+	IFF_MASTER                       = 0x400
+	IFF_MASTER_8023AD                = 0x8
+	IFF_MASTER_ALB                   = 0x10
+	IFF_MASTER_ARPMON                = 0x100
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_OVS_DATAPATH                 = 0x8000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_SLAVE_INACTIVE               = 0x4
+	IFF_SLAVE_NEEDARP                = 0x40
+	IFF_SUPP_NOFCS                   = 0x80000
+	IFF_TAP                          = 0x2
+	IFF_TEAM_PORT                    = 0x40000
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_TX_SKB_SHARING               = 0x10000
+	IFF_UNICAST_FLT                  = 0x20000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFF_WAN_HDLC                     = 0x200
+	IFF_XMIT_DST_RELEASE             = 0x400
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x80
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x1000
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x400
+	IXON                             = 0x200
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x80
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x40
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x2000
+	MCL_FUTURE                       = 0x4000
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NL2                              = 0x200
+	NL3                              = 0x300
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x300
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80000000
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x4
+	ONLCR                            = 0x2
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x20000
+	O_DIRECTORY                      = 0x4000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x8000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x1000
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x2000
+	PENDIN                           = 0x20000000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_SAO                         = 0x10
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETEVRREGS                = 0x14
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGS64                 = 0x16
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GETVRREGS                 = 0x12
+	PTRACE_GETVSRREGS                = 0x1b
+	PTRACE_GET_DEBUGREG              = 0x19
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x1000ff
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETEVRREGS                = 0x15
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGS64                 = 0x17
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SETVRREGS                 = 0x13
+	PTRACE_SETVSRREGS                = 0x1c
+	PTRACE_SET_DEBUGREG              = 0x1a
+	PTRACE_SINGLEBLOCK               = 0x100
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	PT_CCR                           = 0x26
+	PT_CTR                           = 0x23
+	PT_DAR                           = 0x29
+	PT_DSCR                          = 0x2c
+	PT_DSISR                         = 0x2a
+	PT_FPR0                          = 0x30
+	PT_FPSCR                         = 0x50
+	PT_LNK                           = 0x24
+	PT_MSR                           = 0x21
+	PT_NIP                           = 0x20
+	PT_ORIG_R3                       = 0x22
+	PT_R0                            = 0x0
+	PT_R1                            = 0x1
+	PT_R10                           = 0xa
+	PT_R11                           = 0xb
+	PT_R12                           = 0xc
+	PT_R13                           = 0xd
+	PT_R14                           = 0xe
+	PT_R15                           = 0xf
+	PT_R16                           = 0x10
+	PT_R17                           = 0x11
+	PT_R18                           = 0x12
+	PT_R19                           = 0x13
+	PT_R2                            = 0x2
+	PT_R20                           = 0x14
+	PT_R21                           = 0x15
+	PT_R22                           = 0x16
+	PT_R23                           = 0x17
+	PT_R24                           = 0x18
+	PT_R25                           = 0x19
+	PT_R26                           = 0x1a
+	PT_R27                           = 0x1b
+	PT_R28                           = 0x1c
+	PT_R29                           = 0x1d
+	PT_R3                            = 0x3
+	PT_R30                           = 0x1e
+	PT_R31                           = 0x1f
+	PT_R4                            = 0x4
+	PT_R5                            = 0x5
+	PT_R6                            = 0x6
+	PT_R7                            = 0x7
+	PT_R8                            = 0x8
+	PT_R9                            = 0x9
+	PT_REGS_COUNT                    = 0x2c
+	PT_RESULT                        = 0x2b
+	PT_SOFTE                         = 0x27
+	PT_TRAP                          = 0x28
+	PT_VR0                           = 0x52
+	PT_VRSAVE                        = 0x94
+	PT_VSCR                          = 0x93
+	PT_VSR0                          = 0x96
+	PT_VSR31                         = 0xd4
+	PT_XER                           = 0x25
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0xf
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x11
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x57
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x12
+	RTM_NR_MSGTYPES                  = 0x48
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_GET_FILTER                    = 0x1a
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x14
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x15
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x10
+	SO_RCVTIMEO                      = 0x12
+	SO_REUSEADDR                     = 0x2
+	SO_REUSEPORT                     = 0xf
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x11
+	SO_SNDTIMEO                      = 0x13
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x400
+	TAB2                             = 0x800
+	TAB3                             = 0xc00
+	TABDLY                           = 0xc00
+	TCFLSH                           = 0x2000741f
+	TCGETA                           = 0x40147417
+	TCGETS                           = 0x402c7413
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x2000741d
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x80147418
+	TCSETAF                          = 0x8014741c
+	TCSETAW                          = 0x80147419
+	TCSETS                           = 0x802c7414
+	TCSETSF                          = 0x802c7416
+	TCSETSW                          = 0x802c7415
+	TCXONC                           = 0x2000741e
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x40045432
+	TIOCGETC                         = 0x40067412
+	TIOCGETD                         = 0x5424
+	TIOCGETP                         = 0x40067408
+	TIOCGEXCL                        = 0x40045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGLTC                         = 0x40067474
+	TIOCGPGRP                        = 0x40047477
+	TIOCGPKT                         = 0x40045438
+	TIOCGPTLCK                       = 0x40045439
+	TIOCGPTN                         = 0x40045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x40087468
+	TIOCINQ                          = 0x4004667f
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_LOOP                       = 0x8000
+	TIOCM_OUT1                       = 0x2000
+	TIOCM_OUT2                       = 0x4000
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x40047473
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETC                         = 0x80067411
+	TIOCSETD                         = 0x5423
+	TIOCSETN                         = 0x8006740a
+	TIOCSETP                         = 0x80067409
+	TIOCSIG                          = 0x80045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSLTC                         = 0x80067475
+	TIOCSPGRP                        = 0x80047476
+	TIOCSPTLCK                       = 0x80045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTART                        = 0x2000746e
+	TIOCSTI                          = 0x5412
+	TIOCSTOP                         = 0x2000746f
+	TIOCSWINSZ                       = 0x80087467
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x400000
+	TUNATTACHFILTER                  = 0x801054d5
+	TUNDETACHFILTER                  = 0x801054d6
+	TUNGETFEATURES                   = 0x400454cf
+	TUNGETFILTER                     = 0x401054db
+	TUNGETIFF                        = 0x400454d2
+	TUNGETSNDBUF                     = 0x400454d3
+	TUNGETVNETHDRSZ                  = 0x400454d7
+	TUNSETDEBUG                      = 0x800454c9
+	TUNSETGROUP                      = 0x800454ce
+	TUNSETIFF                        = 0x800454ca
+	TUNSETIFINDEX                    = 0x800454da
+	TUNSETLINK                       = 0x800454cd
+	TUNSETNOCSUM                     = 0x800454c8
+	TUNSETOFFLOAD                    = 0x800454d0
+	TUNSETOWNER                      = 0x800454cc
+	TUNSETPERSIST                    = 0x800454cb
+	TUNSETQUEUE                      = 0x800454d9
+	TUNSETSNDBUF                     = 0x800454d4
+	TUNSETTXFILTER                   = 0x800454d1
+	TUNSETVNETHDRSZ                  = 0x800454d8
+	VDISCARD                         = 0x10
+	VEOF                             = 0x4
+	VEOL                             = 0x6
+	VEOL2                            = 0x8
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x5
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xb
+	VSTART                           = 0xd
+	VSTOP                            = 0xe
+	VSUSP                            = 0xc
+	VSWTC                            = 0x9
+	VT0                              = 0x0
+	VT1                              = 0x10000
+	VTDLY                            = 0x10000
+	VTIME                            = 0x7
+	VWERASE                          = 0xa
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4000
+	XTABS                            = 0xc00
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x3a)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	58:  "file locking deadlock error",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "memory page has hardware error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_s390x.go
new file mode 100644
index 0000000000..329f25e7cf
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -0,0 +1,2027 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build s390x,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IB                            = 0x1b
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_MPLS                          = 0x1c
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_6LOWPAN                   = 0x339
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BOTHER                           = 0x1000
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LL_OFF                       = -0x200000
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_NET_OFF                      = -0x100000
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_TAI                        = 0xb
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
+	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_80221                      = 0x8917
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_LOOPBACK                   = 0x9000
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_TSN                        = 0x22f0
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	ETH_P_XDSA                       = 0xf8
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
+	FLUSHO                           = 0x1000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0x5
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OFD_GETLK                      = 0x24
+	F_OFD_SETLK                      = 0x25
+	F_OFD_SETLKW                     = 0x26
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x8000
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_MANAGETEMPADDR             = 0x100
+	IFA_F_MCAUTOJOIN                 = 0x400
+	IFA_F_NODAD                      = 0x2
+	IFA_F_NOPREFIXROUTE              = 0x200
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_STABLE_PRIVACY             = 0x800
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x8
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_ECHO                         = 0x40000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MPLS                     = 0x89
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DONTFRAG                    = 0x3e
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PATHMTU                     = 0x3d
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_INTERFACE          = 0x4
+	IPV6_PMTUDISC_OMIT               = 0x5
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPATHMTU                 = 0x3c
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BIND_ADDRESS_NO_PORT          = 0x18
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_CHECKSUM                      = 0x17
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_NODEFRAG                      = 0x16
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_INTERFACE            = 0x4
+	IP_PMTUDISC_OMIT                 = 0x5
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x2000
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x4000
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MCL_ONFAULT                      = 0x4
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_LAZYTIME                      = 0x2000000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x2800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CAP_ACK                  = 0xa
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_LISTEN_ALL_NSID          = 0x8
+	NETLINK_LIST_MEMBERSHIPS         = 0x9
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_FILTERED              = 0x20
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x2
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x4000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CBPF               = 0x6
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_DATA               = 0x16
+	PACKET_FANOUT_EBPF               = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_QM                 = 0x5
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_KERNEL                    = 0x7
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_QDISC_BYPASS              = 0x14
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_ROLLOVER_STATS            = 0x15
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_USER                      = 0x6
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_CAP_AMBIENT                   = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
+	PR_CAP_AMBIENT_IS_SET            = 0x1
+	PR_CAP_AMBIENT_LOWER             = 0x3
+	PR_CAP_AMBIENT_RAISE             = 0x2
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_FP_MODE_FR                    = 0x1
+	PR_FP_MODE_FRE                   = 0x2
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_FP_MODE                   = 0x2e
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_THP_DISABLE               = 0x2a
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_FP_MODE                   = 0x2d
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_MAP                    = 0xe
+	PR_SET_MM_MAP_SIZE               = 0xf
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_THP_DISABLE               = 0x29
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_DISABLE_TE                = 0x5010
+	PTRACE_ENABLE_TE                 = 0x5009
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GET_LAST_BREAK            = 0x5006
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKDATA_AREA             = 0x5003
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKTEXT_AREA             = 0x5002
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_PEEKUSR_AREA              = 0x5000
+	PTRACE_PEEK_SYSTEM_CALL          = 0x5007
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKEDATA_AREA             = 0x5005
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKETEXT_AREA             = 0x5004
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_POKEUSR_AREA              = 0x5001
+	PTRACE_POKE_SYSTEM_CALL          = 0x5008
+	PTRACE_PROT                      = 0x15
+	PTRACE_SECCOMP_GET_FILTER        = 0x420c
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SINGLEBLOCK               = 0xc
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TE_ABORT_RAND             = 0x5011
+	PTRACE_TRACEME                   = 0x0
+	PT_ACR0                          = 0x90
+	PT_ACR1                          = 0x94
+	PT_ACR10                         = 0xb8
+	PT_ACR11                         = 0xbc
+	PT_ACR12                         = 0xc0
+	PT_ACR13                         = 0xc4
+	PT_ACR14                         = 0xc8
+	PT_ACR15                         = 0xcc
+	PT_ACR2                          = 0x98
+	PT_ACR3                          = 0x9c
+	PT_ACR4                          = 0xa0
+	PT_ACR5                          = 0xa4
+	PT_ACR6                          = 0xa8
+	PT_ACR7                          = 0xac
+	PT_ACR8                          = 0xb0
+	PT_ACR9                          = 0xb4
+	PT_CR_10                         = 0x168
+	PT_CR_11                         = 0x170
+	PT_CR_9                          = 0x160
+	PT_ENDREGS                       = 0x1af
+	PT_FPC                           = 0xd8
+	PT_FPR0                          = 0xe0
+	PT_FPR1                          = 0xe8
+	PT_FPR10                         = 0x130
+	PT_FPR11                         = 0x138
+	PT_FPR12                         = 0x140
+	PT_FPR13                         = 0x148
+	PT_FPR14                         = 0x150
+	PT_FPR15                         = 0x158
+	PT_FPR2                          = 0xf0
+	PT_FPR3                          = 0xf8
+	PT_FPR4                          = 0x100
+	PT_FPR5                          = 0x108
+	PT_FPR6                          = 0x110
+	PT_FPR7                          = 0x118
+	PT_FPR8                          = 0x120
+	PT_FPR9                          = 0x128
+	PT_GPR0                          = 0x10
+	PT_GPR1                          = 0x18
+	PT_GPR10                         = 0x60
+	PT_GPR11                         = 0x68
+	PT_GPR12                         = 0x70
+	PT_GPR13                         = 0x78
+	PT_GPR14                         = 0x80
+	PT_GPR15                         = 0x88
+	PT_GPR2                          = 0x20
+	PT_GPR3                          = 0x28
+	PT_GPR4                          = 0x30
+	PT_GPR5                          = 0x38
+	PT_GPR6                          = 0x40
+	PT_GPR7                          = 0x48
+	PT_GPR8                          = 0x50
+	PT_GPR9                          = 0x58
+	PT_IEEE_IP                       = 0x1a8
+	PT_LASTOFF                       = 0x1a8
+	PT_ORIGGPR2                      = 0xd0
+	PT_PSWADDR                       = 0x8
+	PT_PSWMASK                       = 0x0
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CC_ALGO                     = 0x10
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_MASK                = 0xf
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0x10
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x16
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELNSID                      = 0x59
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_LOOKUP_TABLE               = 0x1000
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETNSID                      = 0x5a
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x5b
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWNSID                      = 0x58
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x13
+	RTM_NR_MSGTYPES                  = 0x4c
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_COMPARE_MASK                = 0x11
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_LINKDOWN                  = 0x10
+	RTNH_F_OFFLOAD                   = 0x8
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BABEL                     = 0x2a
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_BPF                    = 0x32
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BPF_EXTENSIONS                = 0x30
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_BPF                    = 0x1b
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_GET_FILTER                    = 0x1a
+	SO_INCOMING_CPU                  = 0x31
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x10
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x11
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x12
+	SO_RCVTIMEO                      = 0x14
+	SO_REUSEADDR                     = 0x2
+	SO_REUSEPORT                     = 0xf
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x13
+	SO_SNDTIMEO                      = 0x15
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
+	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CC_INFO                      = 0x1a
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_NOTSENT_LOWAT                = 0x19
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SAVED_SYN                    = 0x1c
+	TCP_SAVE_SYN                     = 0x1b
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x80045432
+	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
+	TIOCGPTN                         = 0x80045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x5413
+	TIOCINQ                          = 0x541b
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x5411
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x5423
+	TIOCSIG                          = 0x40045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSPGRP                        = 0x5410
+	TIOCSPTLCK                       = 0x40045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTI                          = 0x5412
+	TIOCSWINSZ                       = 0x5414
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x100
+	TUNATTACHFILTER                  = 0x401054d5
+	TUNDETACHFILTER                  = 0x401054d6
+	TUNGETFEATURES                   = 0x800454cf
+	TUNGETFILTER                     = 0x801054db
+	TUNGETIFF                        = 0x800454d2
+	TUNGETSNDBUF                     = 0x800454d3
+	TUNGETVNETBE                     = 0x800454df
+	TUNGETVNETHDRSZ                  = 0x800454d7
+	TUNGETVNETLE                     = 0x800454dd
+	TUNSETDEBUG                      = 0x400454c9
+	TUNSETGROUP                      = 0x400454ce
+	TUNSETIFF                        = 0x400454ca
+	TUNSETIFINDEX                    = 0x400454da
+	TUNSETLINK                       = 0x400454cd
+	TUNSETNOCSUM                     = 0x400454c8
+	TUNSETOFFLOAD                    = 0x400454d0
+	TUNSETOWNER                      = 0x400454cc
+	TUNSETPERSIST                    = 0x400454cb
+	TUNSETQUEUE                      = 0x400454d9
+	TUNSETSNDBUF                     = 0x400454d4
+	TUNSETTXFILTER                   = 0x400454d1
+	TUNSETVNETBE                     = 0x400454de
+	TUNSETVNETHDRSZ                  = 0x400454d8
+	TUNSETVNETLE                     = 0x400454dc
+	VDISCARD                         = 0xd
+	VEOF                             = 0x4
+	VEOL                             = 0xb
+	VEOL2                            = 0x10
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x6
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "memory page has hardware error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go
index 147bcd3df0..b4338d5f26 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m32
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,netbsd
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m32 _const.go
 
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
index cae48d1e7e..4994437b63 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m64
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,netbsd
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m64 _const.go
 
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go
index 95a0a25163..ac85ca6452 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -marm
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build arm,netbsd
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -marm _const.go
 
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go
index 8558737b84..3322e998d3 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m32
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,openbsd
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m32 _const.go
 
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
index c1d382a421..1758ecca93 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m64
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,openbsd
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m64 _const.go
 
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go
index f60e1f8313..a08922b981 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go
@@ -1,6 +1,8 @@
 // mkerrors.sh -m64
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,solaris
+
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -m64 _const.go
 
@@ -159,6 +161,14 @@ const (
 	BRKINT                        = 0x2
 	CFLUSH                        = 0xf
 	CLOCAL                        = 0x800
+	CLOCK_HIGHRES                 = 0x4
+	CLOCK_LEVEL                   = 0xa
+	CLOCK_MONOTONIC               = 0x4
+	CLOCK_PROCESS_CPUTIME_ID      = 0x5
+	CLOCK_PROF                    = 0x2
+	CLOCK_REALTIME                = 0x3
+	CLOCK_THREAD_CPUTIME_ID       = 0x2
+	CLOCK_VIRTUAL                 = 0x1
 	CREAD                         = 0x80
 	CS5                           = 0x0
 	CS6                           = 0x10
@@ -166,6 +176,7 @@ const (
 	CS8                           = 0x30
 	CSIZE                         = 0x30
 	CSTART                        = 0x11
+	CSTATUS                       = 0x14
 	CSTOP                         = 0x13
 	CSTOPB                        = 0x40
 	CSUSP                         = 0x1a
@@ -755,9 +766,7 @@ const (
 	SIOCDARP                      = -0x7fdb96e0
 	SIOCDELMULTI                  = -0x7fdf96ce
 	SIOCDELRT                     = -0x7fcf8df5
-	SIOCDIPSECONFIG               = -0x7ffb9669
 	SIOCDXARP                     = -0x7fff9658
-	SIOCFIPSECONFIG               = -0x7ffb966b
 	SIOCGARP                      = -0x3fdb96e1
 	SIOCGDSTINFO                  = -0x3fff965c
 	SIOCGENADDR                   = -0x3fdf96ab
@@ -819,7 +828,6 @@ const (
 	SIOCLIFGETND                  = -0x3f879672
 	SIOCLIFREMOVEIF               = -0x7f879692
 	SIOCLIFSETND                  = -0x7f879671
-	SIOCLIPSECONFIG               = -0x7ffb9668
 	SIOCLOWER                     = -0x7fdf96d7
 	SIOCSARP                      = -0x7fdb96e2
 	SIOCSCTPGOPT                  = -0x3fef9653
@@ -842,7 +850,6 @@ const (
 	SIOCSIFNETMASK                = -0x7fdf96e6
 	SIOCSIP6ADDRPOLICY            = -0x7fff965d
 	SIOCSIPMSFILTER               = -0x7ffb964b
-	SIOCSIPSECONFIG               = -0x7ffb966a
 	SIOCSLGETREQ                  = -0x3fdf96b9
 	SIOCSLIFADDR                  = -0x7f879690
 	SIOCSLIFBRDADDR               = -0x7f879684
@@ -949,6 +956,8 @@ const (
 	SO_VRRP                       = 0x1017
 	SO_WROFF                      = 0x2
 	TCFLSH                        = 0x5407
+	TCGETA                        = 0x5401
+	TCGETS                        = 0x540d
 	TCIFLUSH                      = 0x0
 	TCIOFLUSH                     = 0x2
 	TCOFLUSH                      = 0x1
@@ -975,6 +984,14 @@ const (
 	TCP_RTO_MAX                   = 0x1b
 	TCP_RTO_MIN                   = 0x1a
 	TCSAFLUSH                     = 0x5410
+	TCSBRK                        = 0x5405
+	TCSETA                        = 0x5402
+	TCSETAF                       = 0x5404
+	TCSETAW                       = 0x5403
+	TCSETS                        = 0x540e
+	TCSETSF                       = 0x5410
+	TCSETSW                       = 0x540f
+	TCXONC                        = 0x5406
 	TIOC                          = 0x5400
 	TIOCCBRK                      = 0x747a
 	TIOCCDTR                      = 0x7478
@@ -1050,6 +1067,7 @@ const (
 	VQUIT                         = 0x1
 	VREPRINT                      = 0xc
 	VSTART                        = 0x8
+	VSTATUS                       = 0x10
 	VSTOP                         = 0x9
 	VSUSP                         = 0xa
 	VSWTCH                        = 0x7
@@ -1213,6 +1231,7 @@ const (
 	SIGFREEZE  = syscall.Signal(0x22)
 	SIGHUP     = syscall.Signal(0x1)
 	SIGILL     = syscall.Signal(0x4)
+	SIGINFO    = syscall.Signal(0x29)
 	SIGINT     = syscall.Signal(0x2)
 	SIGIO      = syscall.Signal(0x16)
 	SIGIOT     = syscall.Signal(0x6)
@@ -1413,4 +1432,5 @@ var signals = [...]string{
 	38: "resource Control Exceeded",
 	39: "reserved for JVM 1",
 	40: "reserved for JVM 2",
+	41: "information Request",
 }
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go
index a6bcbed346..031034a345 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -l32 syscall_bsd.go syscall_darwin.go syscall_darwin_386.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,darwin
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
index 14b367b9e4..ee96f78bad 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -1,6 +1,8 @@
 // mksyscall.pl syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,darwin
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1413,6 +1416,22 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
 	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
 	sec = int64(r0)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm.go
similarity index 92%
rename from Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_386.go
rename to Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm.go
index 8c20019c6a..e52cd0d54c 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm.go
@@ -1,6 +1,8 @@
-// mksyscall.pl -l32 -dragonfly syscall_bsd.go syscall_dragonfly.go syscall_dragonfly_386.go
+// mksyscall.pl syscall_bsd.go syscall_darwin.go syscall_darwin_arm.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build arm,darwin
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -265,10 +268,8 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -277,15 +278,10 @@ func pipe() (r int, w int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func extpread(fd int, p []byte, flags int, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EXTPREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -294,15 +290,8 @@ func extpread(fd int, p []byte, flags int, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EXTPWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -448,6 +437,28 @@ func Dup2(from int, to int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
 	Syscall(SYS_EXIT, uintptr(code), 0, 0)
 	return
@@ -517,7 +528,7 @@ func Fpathconf(fd int, name int) (val int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -527,7 +538,7 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -547,7 +558,7 @@ func Fsync(fd int) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -563,7 +574,7 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -682,16 +693,6 @@ func Getsid(pid int) (sid int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Getuid() (uid int) {
 	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
@@ -701,23 +702,13 @@ func Getuid() (uid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
 	tainted = bool(r0 != 0)
 	return
 }
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Kqueue() (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
 	fd = int(r0)
@@ -783,7 +774,7 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -909,16 +900,6 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Open(path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -953,6 +934,40 @@ func Pathconf(path string, name int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -1048,8 +1063,8 @@ func Rmdir(path string) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1069,7 +1084,7 @@ func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1134,8 +1149,8 @@ func Setpriority(which int, who int, prio int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1144,18 +1159,8 @@ func Setregid(rgid int, egid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1164,8 +1169,8 @@ func Setresgid(rgid int, egid int, sgid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1221,7 +1226,7 @@ func Stat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1237,7 +1242,7 @@ func Statfs(path string, stat *Statfs_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1285,7 +1290,7 @@ func Truncate(path string, length int64) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1369,7 +1374,7 @@ func write(fd int, p []byte) (n int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
 	ret = uintptr(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1408,3 +1413,15 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int32, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int32(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
new file mode 100644
index 0000000000..9863ef99e3
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -0,0 +1,1427 @@
+// mksyscall.pl syscall_bsd.go syscall_darwin.go syscall_darwin_arm64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm64,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int64(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
index 2ae6f6a620..78de48dcf3 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -dragonfly syscall_bsd.go syscall_dragonfly.go syscall_dragonfly_amd64.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,dragonfly
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go
index eef8eca6f0..fade994dcf 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -l32 syscall_bsd.go syscall_freebsd.go syscall_freebsd_386.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,freebsd
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
index 507166bcfc..c28281e83e 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
@@ -1,6 +1,8 @@
 // mksyscall.pl syscall_bsd.go syscall_freebsd.go syscall_freebsd_amd64.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,freebsd
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
index 0b7a34eb1b..a18ba5c88b 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -l32 -arm syscall_bsd.go syscall_freebsd.go syscall_freebsd_arm.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build arm,freebsd
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go
index 5a881ce6b2..749f3e46e6 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -l32 syscall_linux.go syscall_linux_386.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,linux
+
 package unix
 
 import (
@@ -12,15 +14,20 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func open(path string, mode int, perm uint32) (fd int, err error) {
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
+	_p0, err = BytePtrFromString(oldpath)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
 	use(unsafe.Pointer(_p0))
-	fd = int(r0)
+	use(unsafe.Pointer(_p1))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -46,8 +53,21 @@ func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -56,8 +76,36 @@ func pipe(p *[2]_C_int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -190,22 +238,6 @@ func mount(source string, target string, fstype string, flags uintptr, data *byt
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Acct(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -249,22 +281,6 @@ func Chdir(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Chroot(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -301,23 +317,6 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Creat(path string, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_CREAT, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -329,16 +328,6 @@ func Dup(oldfd int) (fd int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Dup3(oldfd int, newfd int, flags int) (err error) {
 	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
 	if e1 != 0 {
@@ -381,23 +370,6 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Exit(code int) {
 	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
@@ -643,17 +615,6 @@ func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func InotifyInit1(flags int) (fd int, err error) {
 	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -703,28 +664,6 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Link(oldpath string, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -748,22 +687,6 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -780,22 +703,6 @@ func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -822,16 +729,6 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -864,15 +761,8 @@ func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -881,20 +771,14 @@ func read(fd int, p []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
 	} else {
-		_p1 = unsafe.Pointer(&_zero)
+		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -926,28 +810,6 @@ func Removexattr(path string, attr string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Rename(oldpath string, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -970,22 +832,6 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -1049,6 +895,16 @@ func Settimeofday(tv *Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setpriority(which int, who int, prio int) (err error) {
 	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
 	if e1 != 0 {
@@ -1087,28 +943,6 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Symlink(oldpath string, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Sync() {
 	Syscall(SYS_SYNC, 0, 0, 0)
 	return
@@ -1176,38 +1010,6 @@ func Uname(buf *Utsname) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Unmount(target string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(target)
@@ -1244,22 +1046,6 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func write(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -1403,14 +1189,28 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
-	_, _, e1 := Syscall(SYS_CHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1491,6 +1291,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Ioperm(from int, num int, on int) (err error) {
 	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
 	if e1 != 0 {
@@ -1744,6 +1555,33 @@ func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func getrlimit(resource int, rlim *rlimit32) (err error) {
 	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
 	if e1 != 0 {
@@ -1782,3 +1620,19 @@ func Time(t *Time_t) (tt Time_t, err error) {
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go
index d0092b59bb..1096aa5443 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -1,6 +1,8 @@
 // mksyscall.pl syscall_linux.go syscall_linux_amd64.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,linux
+
 package unix
 
 import (
@@ -12,15 +14,20 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func open(path string, mode int, perm uint32) (fd int, err error) {
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
+	_p0, err = BytePtrFromString(oldpath)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
 	use(unsafe.Pointer(_p0))
-	fd = int(r0)
+	use(unsafe.Pointer(_p1))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -46,8 +53,21 @@ func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -56,8 +76,36 @@ func pipe(p *[2]_C_int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -190,22 +238,6 @@ func mount(source string, target string, fstype string, flags uintptr, data *byt
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Acct(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -249,22 +281,6 @@ func Chdir(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Chroot(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -301,23 +317,6 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Creat(path string, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_CREAT, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -329,16 +328,6 @@ func Dup(oldfd int) (fd int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Dup3(oldfd int, newfd int, flags int) (err error) {
 	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
 	if e1 != 0 {
@@ -381,23 +370,6 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Exit(code int) {
 	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
@@ -643,17 +615,6 @@ func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func InotifyInit1(flags int) (fd int, err error) {
 	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -703,28 +664,6 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Link(oldpath string, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -748,22 +687,6 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -780,22 +703,6 @@ func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -822,16 +729,6 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -864,15 +761,8 @@ func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -881,20 +771,14 @@ func read(fd int, p []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
 	} else {
-		_p1 = unsafe.Pointer(&_zero)
+		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -926,28 +810,6 @@ func Removexattr(path string, attr string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Rename(oldpath string, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -970,22 +832,6 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -1049,6 +895,16 @@ func Settimeofday(tv *Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setpriority(which int, who int, prio int) (err error) {
 	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
 	if e1 != 0 {
@@ -1087,28 +943,6 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Symlink(oldpath string, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Sync() {
 	Syscall(SYS_SYNC, 0, 0, 0)
 	return
@@ -1176,38 +1010,6 @@ func Uname(buf *Utsname) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Unmount(target string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(target)
@@ -1244,22 +1046,6 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func write(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -1403,14 +1189,25 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
 	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1511,6 +1308,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Ioperm(from int, num int, on int) (err error) {
 	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
 	if e1 != 0 {
@@ -1573,6 +1381,16 @@ func Lstat(path string, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -1976,3 +1794,39 @@ func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int6
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go
index 4e42e81e89..9066e1cb77 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -l32 -arm syscall_linux.go syscall_linux_arm.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build arm,linux
+
 package unix
 
 import (
@@ -12,15 +14,20 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func open(path string, mode int, perm uint32) (fd int, err error) {
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
 	use(unsafe.Pointer(_p0))
-	fd = int(r0)
+	use(unsafe.Pointer(_p1))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -46,8 +53,21 @@ func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -56,8 +76,36 @@ func pipe(p *[2]_C_int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -190,22 +238,6 @@ func mount(source string, target string, fstype string, flags uintptr, data *byt
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Acct(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -249,22 +281,6 @@ func Chdir(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Chroot(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -301,23 +317,6 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Creat(path string, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_CREAT, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -329,16 +328,6 @@ func Dup(oldfd int) (fd int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Dup3(oldfd int, newfd int, flags int) (err error) {
 	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
 	if e1 != 0 {
@@ -381,23 +370,6 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Exit(code int) {
 	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
@@ -643,17 +615,6 @@ func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func InotifyInit1(flags int) (fd int, err error) {
 	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
 	fd = int(r0)
@@ -703,28 +664,6 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Link(oldpath string, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -748,22 +687,6 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -780,22 +703,6 @@ func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -822,16 +729,6 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -864,15 +761,8 @@ func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -881,20 +771,14 @@ func read(fd int, p []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
 	} else {
-		_p1 = unsafe.Pointer(&_zero)
+		_p0 = unsafe.Pointer(&_zero)
 	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -926,28 +810,6 @@ func Removexattr(path string, attr string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Rename(oldpath string, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -970,22 +832,6 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -1049,6 +895,16 @@ func Settimeofday(tv *Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setpriority(which int, who int, prio int) (err error) {
 	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
 	if e1 != 0 {
@@ -1087,28 +943,6 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Symlink(oldpath string, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Sync() {
 	Syscall(SYS_SYNC, 0, 0, 0)
 	return
@@ -1176,38 +1010,6 @@ func Uname(buf *Utsname) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Unmount(target string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(target)
@@ -1244,22 +1046,6 @@ func Ustat(dev int, ubuf *Ustat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func write(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -1403,6 +1189,16 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
 	fd = int(r0)
@@ -1582,14 +1378,8 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1650,6 +1440,17 @@ func Getuid() (uid int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Lchown(path string, uid int, gid int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1821,9 +1622,25 @@ func Gettimeofday(tv *Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Time(t *Time_t) (tt Time_t, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
-	tt = Time_t(r0)
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1904,7 +1721,7 @@ func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func getrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go
new file mode 100644
index 0000000000..5b91612265
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -0,0 +1,1723 @@
+// mksyscall.pl syscall_linux.go syscall_linux_arm64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm64,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64.go
new file mode 100644
index 0000000000..738c830914
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -0,0 +1,1781 @@
+// mksyscall.pl syscall_linux.go syscall_linux_mips64x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build mips64,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstat(fd int, st *stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func lstat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func stat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
new file mode 100644
index 0000000000..2a03578322
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -0,0 +1,1781 @@
+// mksyscall.pl syscall_linux.go syscall_linux_mips64x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build mips64le,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstat(fd int, st *stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func lstat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func stat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
new file mode 100644
index 0000000000..4bd18dcee6
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -0,0 +1,1843 @@
+// mksyscall.pl syscall_linux.go syscall_linux_ppc64x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build ppc64,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
new file mode 100644
index 0000000000..fbb43516cc
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -0,0 +1,1843 @@
+// mksyscall.pl syscall_linux.go syscall_linux_ppc64x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build ppc64le,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_s390x.go
new file mode 100644
index 0000000000..f8aa91f149
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_s390x.go
@@ -0,0 +1,1623 @@
+// mksyscall.pl syscall_linux.go syscall_linux_s390x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build s390x,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go
index 2dde52ae6b..b16e1d0ee3 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -l32 -netbsd syscall_bsd.go syscall_netbsd.go syscall_netbsd_386.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,netbsd
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
index b16c66ced3..b63667da9c 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -netbsd syscall_bsd.go syscall_netbsd.go syscall_netbsd_amd64.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,netbsd
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
index cae18cabd3..b0d19038d2 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -l32 -arm syscall_bsd.go syscall_netbsd.go syscall_netbsd_arm.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build arm,netbsd
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go
index e9ec117441..f91a5b8564 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -l32 -openbsd syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build 386,openbsd
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
index 3c8535f4d2..2e8d59d724 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
@@ -1,6 +1,8 @@
 // mksyscall.pl -openbsd syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,openbsd
+
 package unix
 
 import (
@@ -220,6 +222,7 @@ func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr)
 		_p0 = unsafe.Pointer(&_zero)
 	}
 	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
index 9ee51e3e3a..4326427817 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
@@ -1,98 +1,385 @@
 // mksyscall_solaris.pl syscall_solaris.go syscall_solaris_amd64.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
+// +build amd64,solaris
+
 package unix
 
-import "unsafe"
+import (
+	"syscall"
+	"unsafe"
+)
+
+//go:cgo_import_dynamic libc_getsockname getsockname "libsocket.so"
+//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
+//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
+//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
+//go:cgo_import_dynamic libc_utimes utimes "libc.so"
+//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+//go:cgo_import_dynamic libc_futimesat futimesat "libc.so"
+//go:cgo_import_dynamic libc_accept accept "libsocket.so"
+//go:cgo_import_dynamic libc_recvmsg recvmsg "libsocket.so"
+//go:cgo_import_dynamic libc_sendmsg sendmsg "libsocket.so"
+//go:cgo_import_dynamic libc_acct acct "libc.so"
+//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
+//go:cgo_import_dynamic libc_access access "libc.so"
+//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
+//go:cgo_import_dynamic libc_chdir chdir "libc.so"
+//go:cgo_import_dynamic libc_chmod chmod "libc.so"
+//go:cgo_import_dynamic libc_chown chown "libc.so"
+//go:cgo_import_dynamic libc_chroot chroot "libc.so"
+//go:cgo_import_dynamic libc_close close "libc.so"
+//go:cgo_import_dynamic libc_creat creat "libc.so"
+//go:cgo_import_dynamic libc_dup dup "libc.so"
+//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
+//go:cgo_import_dynamic libc_exit exit "libc.so"
+//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
+//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
+//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
+//go:cgo_import_dynamic libc_fchown fchown "libc.so"
+//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
+//go:cgo_import_dynamic libc_fdatasync fdatasync "libc.so"
+//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
+//go:cgo_import_dynamic libc_fstat fstat "libc.so"
+//go:cgo_import_dynamic libc_getdents getdents "libc.so"
+//go:cgo_import_dynamic libc_getgid getgid "libc.so"
+//go:cgo_import_dynamic libc_getpid getpid "libc.so"
+//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
+//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
+//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
+//go:cgo_import_dynamic libc_getegid getegid "libc.so"
+//go:cgo_import_dynamic libc_getppid getppid "libc.so"
+//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
+//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
+//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
+//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
+//go:cgo_import_dynamic libc_getuid getuid "libc.so"
+//go:cgo_import_dynamic libc_kill kill "libc.so"
+//go:cgo_import_dynamic libc_lchown lchown "libc.so"
+//go:cgo_import_dynamic libc_link link "libc.so"
+//go:cgo_import_dynamic libc_listen listen "libsocket.so"
+//go:cgo_import_dynamic libc_lstat lstat "libc.so"
+//go:cgo_import_dynamic libc_madvise madvise "libc.so"
+//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
+//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
+//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
+//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
+//go:cgo_import_dynamic libc_mknod mknod "libc.so"
+//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
+//go:cgo_import_dynamic libc_mlock mlock "libc.so"
+//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
+//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
+//go:cgo_import_dynamic libc_munlock munlock "libc.so"
+//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
+//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
+//go:cgo_import_dynamic libc_open open "libc.so"
+//go:cgo_import_dynamic libc_openat openat "libc.so"
+//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
+//go:cgo_import_dynamic libc_pause pause "libc.so"
+//go:cgo_import_dynamic libc_pread pread "libc.so"
+//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
+//go:cgo_import_dynamic libc_read read "libc.so"
+//go:cgo_import_dynamic libc_readlink readlink "libc.so"
+//go:cgo_import_dynamic libc_rename rename "libc.so"
+//go:cgo_import_dynamic libc_renameat renameat "libc.so"
+//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
+//go:cgo_import_dynamic libc_lseek lseek "libc.so"
+//go:cgo_import_dynamic libc_setegid setegid "libc.so"
+//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
+//go:cgo_import_dynamic libc_setgid setgid "libc.so"
+//go:cgo_import_dynamic libc_sethostname sethostname "libc.so"
+//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
+//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
+//go:cgo_import_dynamic libc_setregid setregid "libc.so"
+//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
+//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
+//go:cgo_import_dynamic libc_setsid setsid "libc.so"
+//go:cgo_import_dynamic libc_setuid setuid "libc.so"
+//go:cgo_import_dynamic libc_shutdown shutdown "libsocket.so"
+//go:cgo_import_dynamic libc_stat stat "libc.so"
+//go:cgo_import_dynamic libc_symlink symlink "libc.so"
+//go:cgo_import_dynamic libc_sync sync "libc.so"
+//go:cgo_import_dynamic libc_times times "libc.so"
+//go:cgo_import_dynamic libc_truncate truncate "libc.so"
+//go:cgo_import_dynamic libc_fsync fsync "libc.so"
+//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
+//go:cgo_import_dynamic libc_umask umask "libc.so"
+//go:cgo_import_dynamic libc_uname uname "libc.so"
+//go:cgo_import_dynamic libc_umount umount "libc.so"
+//go:cgo_import_dynamic libc_unlink unlink "libc.so"
+//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
+//go:cgo_import_dynamic libc_ustat ustat "libc.so"
+//go:cgo_import_dynamic libc_utime utime "libc.so"
+//go:cgo_import_dynamic libc_bind bind "libsocket.so"
+//go:cgo_import_dynamic libc_connect connect "libsocket.so"
+//go:cgo_import_dynamic libc_mmap mmap "libc.so"
+//go:cgo_import_dynamic libc_munmap munmap "libc.so"
+//go:cgo_import_dynamic libc_sendto sendto "libsocket.so"
+//go:cgo_import_dynamic libc_socket socket "libsocket.so"
+//go:cgo_import_dynamic libc_socketpair socketpair "libsocket.so"
+//go:cgo_import_dynamic libc_write write "libc.so"
+//go:cgo_import_dynamic libc_getsockopt getsockopt "libsocket.so"
+//go:cgo_import_dynamic libc_getpeername getpeername "libsocket.so"
+//go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
+//go:cgo_import_dynamic libc_recvfrom recvfrom "libsocket.so"
+//go:cgo_import_dynamic libc_sysconf sysconf "libc.so"
+
+//go:linkname procgetsockname libc_getsockname
+//go:linkname procGetcwd libc_getcwd
+//go:linkname procgetgroups libc_getgroups
+//go:linkname procsetgroups libc_setgroups
+//go:linkname procutimes libc_utimes
+//go:linkname procutimensat libc_utimensat
+//go:linkname procfcntl libc_fcntl
+//go:linkname procfutimesat libc_futimesat
+//go:linkname procaccept libc_accept
+//go:linkname procrecvmsg libc_recvmsg
+//go:linkname procsendmsg libc_sendmsg
+//go:linkname procacct libc_acct
+//go:linkname procioctl libc_ioctl
+//go:linkname procAccess libc_access
+//go:linkname procAdjtime libc_adjtime
+//go:linkname procChdir libc_chdir
+//go:linkname procChmod libc_chmod
+//go:linkname procChown libc_chown
+//go:linkname procChroot libc_chroot
+//go:linkname procClose libc_close
+//go:linkname procCreat libc_creat
+//go:linkname procDup libc_dup
+//go:linkname procDup2 libc_dup2
+//go:linkname procExit libc_exit
+//go:linkname procFchdir libc_fchdir
+//go:linkname procFchmod libc_fchmod
+//go:linkname procFchmodat libc_fchmodat
+//go:linkname procFchown libc_fchown
+//go:linkname procFchownat libc_fchownat
+//go:linkname procFdatasync libc_fdatasync
+//go:linkname procFpathconf libc_fpathconf
+//go:linkname procFstat libc_fstat
+//go:linkname procGetdents libc_getdents
+//go:linkname procGetgid libc_getgid
+//go:linkname procGetpid libc_getpid
+//go:linkname procGetpgid libc_getpgid
+//go:linkname procGetpgrp libc_getpgrp
+//go:linkname procGeteuid libc_geteuid
+//go:linkname procGetegid libc_getegid
+//go:linkname procGetppid libc_getppid
+//go:linkname procGetpriority libc_getpriority
+//go:linkname procGetrlimit libc_getrlimit
+//go:linkname procGetrusage libc_getrusage
+//go:linkname procGettimeofday libc_gettimeofday
+//go:linkname procGetuid libc_getuid
+//go:linkname procKill libc_kill
+//go:linkname procLchown libc_lchown
+//go:linkname procLink libc_link
+//go:linkname proclisten libc_listen
+//go:linkname procLstat libc_lstat
+//go:linkname procMadvise libc_madvise
+//go:linkname procMkdir libc_mkdir
+//go:linkname procMkdirat libc_mkdirat
+//go:linkname procMkfifo libc_mkfifo
+//go:linkname procMkfifoat libc_mkfifoat
+//go:linkname procMknod libc_mknod
+//go:linkname procMknodat libc_mknodat
+//go:linkname procMlock libc_mlock
+//go:linkname procMlockall libc_mlockall
+//go:linkname procMprotect libc_mprotect
+//go:linkname procMunlock libc_munlock
+//go:linkname procMunlockall libc_munlockall
+//go:linkname procNanosleep libc_nanosleep
+//go:linkname procOpen libc_open
+//go:linkname procOpenat libc_openat
+//go:linkname procPathconf libc_pathconf
+//go:linkname procPause libc_pause
+//go:linkname procPread libc_pread
+//go:linkname procPwrite libc_pwrite
+//go:linkname procread libc_read
+//go:linkname procReadlink libc_readlink
+//go:linkname procRename libc_rename
+//go:linkname procRenameat libc_renameat
+//go:linkname procRmdir libc_rmdir
+//go:linkname proclseek libc_lseek
+//go:linkname procSetegid libc_setegid
+//go:linkname procSeteuid libc_seteuid
+//go:linkname procSetgid libc_setgid
+//go:linkname procSethostname libc_sethostname
+//go:linkname procSetpgid libc_setpgid
+//go:linkname procSetpriority libc_setpriority
+//go:linkname procSetregid libc_setregid
+//go:linkname procSetreuid libc_setreuid
+//go:linkname procSetrlimit libc_setrlimit
+//go:linkname procSetsid libc_setsid
+//go:linkname procSetuid libc_setuid
+//go:linkname procshutdown libc_shutdown
+//go:linkname procStat libc_stat
+//go:linkname procSymlink libc_symlink
+//go:linkname procSync libc_sync
+//go:linkname procTimes libc_times
+//go:linkname procTruncate libc_truncate
+//go:linkname procFsync libc_fsync
+//go:linkname procFtruncate libc_ftruncate
+//go:linkname procUmask libc_umask
+//go:linkname procUname libc_uname
+//go:linkname procumount libc_umount
+//go:linkname procUnlink libc_unlink
+//go:linkname procUnlinkat libc_unlinkat
+//go:linkname procUstat libc_ustat
+//go:linkname procUtime libc_utime
+//go:linkname procbind libc_bind
+//go:linkname procconnect libc_connect
+//go:linkname procmmap libc_mmap
+//go:linkname procmunmap libc_munmap
+//go:linkname procsendto libc_sendto
+//go:linkname procsocket libc_socket
+//go:linkname procsocketpair libc_socketpair
+//go:linkname procwrite libc_write
+//go:linkname procgetsockopt libc_getsockopt
+//go:linkname procgetpeername libc_getpeername
+//go:linkname procsetsockopt libc_setsockopt
+//go:linkname procrecvfrom libc_recvfrom
+//go:linkname procsysconf libc_sysconf
 
 var (
-	modlibc      = syscall.newLazySO("libc.so")
-	modlibsocket = syscall.newLazySO("libsocket.so")
-
-	procgetgroups    = modlibc.NewProc("getgroups")
-	procsetgroups    = modlibc.NewProc("setgroups")
-	procfcntl        = modlibc.NewProc("fcntl")
-	procaccept       = modlibsocket.NewProc("accept")
-	procsendmsg      = modlibsocket.NewProc("sendmsg")
-	procAccess       = modlibc.NewProc("access")
-	procAdjtime      = modlibc.NewProc("adjtime")
-	procChdir        = modlibc.NewProc("chdir")
-	procChmod        = modlibc.NewProc("chmod")
-	procChown        = modlibc.NewProc("chown")
-	procChroot       = modlibc.NewProc("chroot")
-	procClose        = modlibc.NewProc("close")
-	procDup          = modlibc.NewProc("dup")
-	procExit         = modlibc.NewProc("exit")
-	procFchdir       = modlibc.NewProc("fchdir")
-	procFchmod       = modlibc.NewProc("fchmod")
-	procFchown       = modlibc.NewProc("fchown")
-	procFpathconf    = modlibc.NewProc("fpathconf")
-	procFstat        = modlibc.NewProc("fstat")
-	procGetdents     = modlibc.NewProc("getdents")
-	procGetgid       = modlibc.NewProc("getgid")
-	procGetpid       = modlibc.NewProc("getpid")
-	procGeteuid      = modlibc.NewProc("geteuid")
-	procGetegid      = modlibc.NewProc("getegid")
-	procGetppid      = modlibc.NewProc("getppid")
-	procGetpriority  = modlibc.NewProc("getpriority")
-	procGetrlimit    = modlibc.NewProc("getrlimit")
-	procGettimeofday = modlibc.NewProc("gettimeofday")
-	procGetuid       = modlibc.NewProc("getuid")
-	procKill         = modlibc.NewProc("kill")
-	procLchown       = modlibc.NewProc("lchown")
-	procLink         = modlibc.NewProc("link")
-	proclisten       = modlibsocket.NewProc("listen")
-	procLstat        = modlibc.NewProc("lstat")
-	procMkdir        = modlibc.NewProc("mkdir")
-	procMknod        = modlibc.NewProc("mknod")
-	procNanosleep    = modlibc.NewProc("nanosleep")
-	procOpen         = modlibc.NewProc("open")
-	procPathconf     = modlibc.NewProc("pathconf")
-	procPread        = modlibc.NewProc("pread")
-	procPwrite       = modlibc.NewProc("pwrite")
-	procread         = modlibc.NewProc("read")
-	procReadlink     = modlibc.NewProc("readlink")
-	procRename       = modlibc.NewProc("rename")
-	procRmdir        = modlibc.NewProc("rmdir")
-	proclseek        = modlibc.NewProc("lseek")
-	procSetegid      = modlibc.NewProc("setegid")
-	procSeteuid      = modlibc.NewProc("seteuid")
-	procSetgid       = modlibc.NewProc("setgid")
-	procSetpgid      = modlibc.NewProc("setpgid")
-	procSetpriority  = modlibc.NewProc("setpriority")
-	procSetregid     = modlibc.NewProc("setregid")
-	procSetreuid     = modlibc.NewProc("setreuid")
-	procSetrlimit    = modlibc.NewProc("setrlimit")
-	procSetsid       = modlibc.NewProc("setsid")
-	procSetuid       = modlibc.NewProc("setuid")
-	procshutdown     = modlibsocket.NewProc("shutdown")
-	procStat         = modlibc.NewProc("stat")
-	procSymlink      = modlibc.NewProc("symlink")
-	procSync         = modlibc.NewProc("sync")
-	procTruncate     = modlibc.NewProc("truncate")
-	procFsync        = modlibc.NewProc("fsync")
-	procFtruncate    = modlibc.NewProc("ftruncate")
-	procUmask        = modlibc.NewProc("umask")
-	procUnlink       = modlibc.NewProc("unlink")
-	procUtimes       = modlibc.NewProc("utimes")
-	procbind         = modlibsocket.NewProc("bind")
-	procconnect      = modlibsocket.NewProc("connect")
-	procmmap         = modlibc.NewProc("mmap")
-	procmunmap       = modlibc.NewProc("munmap")
-	procsendto       = modlibsocket.NewProc("sendto")
-	procsocket       = modlibsocket.NewProc("socket")
-	procsocketpair   = modlibsocket.NewProc("socketpair")
-	procwrite        = modlibc.NewProc("write")
-	procgetsockopt   = modlibsocket.NewProc("getsockopt")
-	procgetpeername  = modlibsocket.NewProc("getpeername")
-	procgetsockname  = modlibsocket.NewProc("getsockname")
-	procsetsockopt   = modlibsocket.NewProc("setsockopt")
-	procrecvfrom     = modlibsocket.NewProc("recvfrom")
-	procrecvmsg      = modlibsocket.NewProc("recvmsg")
+	procgetsockname,
+	procGetcwd,
+	procgetgroups,
+	procsetgroups,
+	procutimes,
+	procutimensat,
+	procfcntl,
+	procfutimesat,
+	procaccept,
+	procrecvmsg,
+	procsendmsg,
+	procacct,
+	procioctl,
+	procAccess,
+	procAdjtime,
+	procChdir,
+	procChmod,
+	procChown,
+	procChroot,
+	procClose,
+	procCreat,
+	procDup,
+	procDup2,
+	procExit,
+	procFchdir,
+	procFchmod,
+	procFchmodat,
+	procFchown,
+	procFchownat,
+	procFdatasync,
+	procFpathconf,
+	procFstat,
+	procGetdents,
+	procGetgid,
+	procGetpid,
+	procGetpgid,
+	procGetpgrp,
+	procGeteuid,
+	procGetegid,
+	procGetppid,
+	procGetpriority,
+	procGetrlimit,
+	procGetrusage,
+	procGettimeofday,
+	procGetuid,
+	procKill,
+	procLchown,
+	procLink,
+	proclisten,
+	procLstat,
+	procMadvise,
+	procMkdir,
+	procMkdirat,
+	procMkfifo,
+	procMkfifoat,
+	procMknod,
+	procMknodat,
+	procMlock,
+	procMlockall,
+	procMprotect,
+	procMunlock,
+	procMunlockall,
+	procNanosleep,
+	procOpen,
+	procOpenat,
+	procPathconf,
+	procPause,
+	procPread,
+	procPwrite,
+	procread,
+	procReadlink,
+	procRename,
+	procRenameat,
+	procRmdir,
+	proclseek,
+	procSetegid,
+	procSeteuid,
+	procSetgid,
+	procSethostname,
+	procSetpgid,
+	procSetpriority,
+	procSetregid,
+	procSetreuid,
+	procSetrlimit,
+	procSetsid,
+	procSetuid,
+	procshutdown,
+	procStat,
+	procSymlink,
+	procSync,
+	procTimes,
+	procTruncate,
+	procFsync,
+	procFtruncate,
+	procUmask,
+	procUname,
+	procumount,
+	procUnlink,
+	procUnlinkat,
+	procUstat,
+	procUtime,
+	procbind,
+	procconnect,
+	procmmap,
+	procmunmap,
+	procsendto,
+	procsocket,
+	procsocketpair,
+	procwrite,
+	procgetsockopt,
+	procgetpeername,
+	procsetsockopt,
+	procrecvfrom,
+	procsysconf syscallFunc
 )
 
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockname)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetcwd)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0, 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := rawSysvicall6(procgetgroups.Addr(), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -101,7 +388,35 @@ func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
 }
 
 func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := rawSysvicall6(procsetgroups.Addr(), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimes)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func utimensat(fd int, path string, times *[2]Timespec, flag int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimensat)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flag), 0, 0)
+	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
 	}
@@ -109,7 +424,7 @@ func setgroups(ngid int, gid *_Gid_t) (err error) {
 }
 
 func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := sysvicall6(procfcntl.Addr(), 3, uintptr(fd), uintptr(cmd), uintptr(arg), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(arg), 0, 0, 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -117,8 +432,16 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 	return
 }
 
+func futimesat(fildes int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfutimesat)), 3, uintptr(fildes), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := sysvicall6(procaccept.Addr(), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procaccept)), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -126,8 +449,17 @@ func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
 	return
 }
 
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := sysvicall6(procsendmsg.Addr(), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -135,13 +467,29 @@ func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 	return
 }
 
+func acct(path *byte) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procacct)), 1, uintptr(unsafe.Pointer(path)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func ioctl(fd int, req int, arg uintptr) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procAccess.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAccess)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -150,7 +498,7 @@ func Access(path string, mode uint32) (err error) {
 }
 
 func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := sysvicall6(procAdjtime.Addr(), 2, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAdjtime)), 2, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -163,7 +511,7 @@ func Chdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procChdir.Addr(), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -177,7 +525,7 @@ func Chmod(path string, mode uint32) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procChmod.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChmod)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -191,7 +539,7 @@ func Chown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procChown.Addr(), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -205,7 +553,7 @@ func Chroot(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procChroot.Addr(), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChroot)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -214,7 +562,22 @@ func Chroot(path string) (err error) {
 }
 
 func Close(fd int) (err error) {
-	_, _, e1 := sysvicall6(procClose.Addr(), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procClose)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Creat(path string, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procCreat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -222,7 +585,7 @@ func Close(fd int) (err error) {
 }
 
 func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := sysvicall6(procDup.Addr(), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup)), 1, uintptr(fd), 0, 0, 0, 0, 0)
 	nfd = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -230,13 +593,21 @@ func Dup(fd int) (nfd int, err error) {
 	return
 }
 
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup2)), 2, uintptr(oldfd), uintptr(newfd), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Exit(code int) {
-	sysvicall6(procExit.Addr(), 1, uintptr(code), 0, 0, 0, 0, 0)
+	sysvicall6(uintptr(unsafe.Pointer(&procExit)), 1, uintptr(code), 0, 0, 0, 0, 0)
 	return
 }
 
 func Fchdir(fd int) (err error) {
-	_, _, e1 := sysvicall6(procFchdir.Addr(), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchdir)), 1, uintptr(fd), 0, 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -244,7 +615,21 @@ func Fchdir(fd int) (err error) {
 }
 
 func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := sysvicall6(procFchmod.Addr(), 2, uintptr(fd), uintptr(mode), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmod)), 2, uintptr(fd), uintptr(mode), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
 	}
@@ -252,7 +637,29 @@ func Fchmod(fd int, mode uint32) (err error) {
 }
 
 func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := sysvicall6(procFchown.Addr(), 3, uintptr(fd), uintptr(uid), uintptr(gid), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchown)), 3, uintptr(fd), uintptr(uid), uintptr(gid), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchownat)), 5, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFdatasync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -260,7 +667,7 @@ func Fchown(fd int, uid int, gid int) (err error) {
 }
 
 func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := sysvicall6(procFpathconf.Addr(), 2, uintptr(fd), uintptr(name), 0, 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFpathconf)), 2, uintptr(fd), uintptr(name), 0, 0, 0, 0)
 	val = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -269,7 +676,7 @@ func Fpathconf(fd int, name int) (val int, err error) {
 }
 
 func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := sysvicall6(procFstat.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstat)), 2, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -281,7 +688,7 @@ func Getdents(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	r0, _, e1 := sysvicall6(procGetdents.Addr(), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetdents)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -290,37 +697,55 @@ func Getdents(fd int, buf []byte, basep *uintptr) (n int, err error) {
 }
 
 func Getgid() (gid int) {
-	r0, _, _ := rawSysvicall6(procGetgid.Addr(), 0, 0, 0, 0, 0, 0, 0)
+	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetgid)), 0, 0, 0, 0, 0, 0, 0)
 	gid = int(r0)
 	return
 }
 
 func Getpid() (pid int) {
-	r0, _, _ := rawSysvicall6(procGetpid.Addr(), 0, 0, 0, 0, 0, 0, 0)
+	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpid)), 0, 0, 0, 0, 0, 0, 0)
 	pid = int(r0)
 	return
 }
 
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgid)), 1, uintptr(pid), 0, 0, 0, 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getpgrp() (pgid int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgrp)), 0, 0, 0, 0, 0, 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Geteuid() (euid int) {
-	r0, _, _ := sysvicall6(procGeteuid.Addr(), 0, 0, 0, 0, 0, 0, 0)
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGeteuid)), 0, 0, 0, 0, 0, 0, 0)
 	euid = int(r0)
 	return
 }
 
 func Getegid() (egid int) {
-	r0, _, _ := sysvicall6(procGetegid.Addr(), 0, 0, 0, 0, 0, 0, 0)
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetegid)), 0, 0, 0, 0, 0, 0, 0)
 	egid = int(r0)
 	return
 }
 
 func Getppid() (ppid int) {
-	r0, _, _ := sysvicall6(procGetppid.Addr(), 0, 0, 0, 0, 0, 0, 0)
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetppid)), 0, 0, 0, 0, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
 
 func Getpriority(which int, who int) (n int, err error) {
-	r0, _, e1 := sysvicall6(procGetpriority.Addr(), 2, uintptr(which), uintptr(who), 0, 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetpriority)), 2, uintptr(which), uintptr(who), 0, 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -329,7 +754,15 @@ func Getpriority(which int, who int) (n int, err error) {
 }
 
 func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := rawSysvicall6(procGetrlimit.Addr(), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrusage)), 2, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -337,7 +770,7 @@ func Getrlimit(which int, lim *Rlimit) (err error) {
 }
 
 func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := rawSysvicall6(procGettimeofday.Addr(), 1, uintptr(unsafe.Pointer(tv)), 0, 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGettimeofday)), 1, uintptr(unsafe.Pointer(tv)), 0, 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -345,13 +778,13 @@ func Gettimeofday(tv *Timeval) (err error) {
 }
 
 func Getuid() (uid int) {
-	r0, _, _ := rawSysvicall6(procGetuid.Addr(), 0, 0, 0, 0, 0, 0, 0)
+	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetuid)), 0, 0, 0, 0, 0, 0, 0)
 	uid = int(r0)
 	return
 }
 
 func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := sysvicall6(procKill.Addr(), 2, uintptr(pid), uintptr(signum), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procKill)), 2, uintptr(pid), uintptr(signum), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -364,7 +797,7 @@ func Lchown(path string, uid int, gid int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procLchown.Addr(), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLchown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -383,7 +816,7 @@ func Link(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procLink.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	use(unsafe.Pointer(_p1))
 	if e1 != 0 {
@@ -393,7 +826,7 @@ func Link(path string, link string) (err error) {
 }
 
 func Listen(s int, backlog int) (err error) {
-	_, _, e1 := sysvicall6(proclisten.Addr(), 2, uintptr(s), uintptr(backlog), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclisten)), 2, uintptr(s), uintptr(backlog), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -406,7 +839,7 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procLstat.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLstat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -414,13 +847,67 @@ func Lstat(path string, stat *Stat_t) (err error) {
 	return
 }
 
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMadvise)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(advice), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Mkdir(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procMkdir.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdir)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdirat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifo)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifoat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -434,7 +921,7 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procMknod.Addr(), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknod)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -442,8 +929,74 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 	return
 }
 
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mlock(b []byte) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlockall)), 1, uintptr(flags), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMprotect)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(prot), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Munlock(b []byte) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Munlockall() (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlockall)), 0, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := sysvicall6(procNanosleep.Addr(), 2, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procNanosleep)), 2, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -456,7 +1009,22 @@ func Open(path string, mode int, perm uint32) (fd int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := sysvicall6(procOpen.Addr(), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpen)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpenat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
 	use(unsafe.Pointer(_p0))
 	fd = int(r0)
 	if e1 != 0 {
@@ -471,7 +1039,7 @@ func Pathconf(path string, name int) (val int, err error) {
 	if err != nil {
 		return
 	}
-	r0, _, e1 := sysvicall6(procPathconf.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0, 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPathconf)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	val = int(r0)
 	if e1 != 0 {
@@ -480,12 +1048,20 @@ func Pathconf(path string, name int) (val int, err error) {
 	return
 }
 
+func Pause() (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPause)), 0, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Pread(fd int, p []byte, offset int64) (n int, err error) {
 	var _p0 *byte
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := sysvicall6(procPread.Addr(), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPread)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -498,7 +1074,7 @@ func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := sysvicall6(procPwrite.Addr(), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPwrite)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -511,7 +1087,7 @@ func read(fd int, p []byte) (n int, err error) {
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := sysvicall6(procread.Addr(), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -529,7 +1105,7 @@ func Readlink(path string, buf []byte) (n int, err error) {
 	if len(buf) > 0 {
 		_p1 = &buf[0]
 	}
-	r0, _, e1 := sysvicall6(procReadlink.Addr(), 3, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(len(buf)), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procReadlink)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(len(buf)), 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	n = int(r0)
 	if e1 != 0 {
@@ -549,7 +1125,27 @@ func Rename(from string, to string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procRename.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRename)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRenameat)), 4, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
 	use(unsafe.Pointer(_p0))
 	use(unsafe.Pointer(_p1))
 	if e1 != 0 {
@@ -564,7 +1160,7 @@ func Rmdir(path string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procRmdir.Addr(), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRmdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -573,7 +1169,7 @@ func Rmdir(path string) (err error) {
 }
 
 func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := sysvicall6(proclseek.Addr(), 3, uintptr(fd), uintptr(offset), uintptr(whence), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclseek)), 3, uintptr(fd), uintptr(offset), uintptr(whence), 0, 0, 0)
 	newoffset = int64(r0)
 	if e1 != 0 {
 		err = e1
@@ -582,7 +1178,7 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 }
 
 func Setegid(egid int) (err error) {
-	_, _, e1 := rawSysvicall6(procSetegid.Addr(), 1, uintptr(egid), 0, 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetegid)), 1, uintptr(egid), 0, 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -590,7 +1186,7 @@ func Setegid(egid int) (err error) {
 }
 
 func Seteuid(euid int) (err error) {
-	_, _, e1 := rawSysvicall6(procSeteuid.Addr(), 1, uintptr(euid), 0, 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSeteuid)), 1, uintptr(euid), 0, 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -598,7 +1194,19 @@ func Seteuid(euid int) (err error) {
 }
 
 func Setgid(gid int) (err error) {
-	_, _, e1 := rawSysvicall6(procSetgid.Addr(), 1, uintptr(gid), 0, 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetgid)), 1, uintptr(gid), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Sethostname(p []byte) (err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSethostname)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -606,7 +1214,7 @@ func Setgid(gid int) (err error) {
 }
 
 func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := rawSysvicall6(procSetpgid.Addr(), 2, uintptr(pid), uintptr(pgid), 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetpgid)), 2, uintptr(pid), uintptr(pgid), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -614,7 +1222,7 @@ func Setpgid(pid int, pgid int) (err error) {
 }
 
 func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := sysvicall6(procSetpriority.Addr(), 3, uintptr(which), uintptr(who), uintptr(prio), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSetpriority)), 3, uintptr(which), uintptr(who), uintptr(prio), 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -622,7 +1230,7 @@ func Setpriority(which int, who int, prio int) (err error) {
 }
 
 func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := rawSysvicall6(procSetregid.Addr(), 2, uintptr(rgid), uintptr(egid), 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetregid)), 2, uintptr(rgid), uintptr(egid), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -630,7 +1238,7 @@ func Setregid(rgid int, egid int) (err error) {
 }
 
 func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := rawSysvicall6(procSetreuid.Addr(), 2, uintptr(ruid), uintptr(euid), 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetreuid)), 2, uintptr(ruid), uintptr(euid), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -638,7 +1246,7 @@ func Setreuid(ruid int, euid int) (err error) {
 }
 
 func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := rawSysvicall6(procSetrlimit.Addr(), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -646,7 +1254,7 @@ func Setrlimit(which int, lim *Rlimit) (err error) {
 }
 
 func Setsid() (pid int, err error) {
-	r0, _, e1 := rawSysvicall6(procSetsid.Addr(), 0, 0, 0, 0, 0, 0, 0)
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetsid)), 0, 0, 0, 0, 0, 0, 0)
 	pid = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -655,7 +1263,7 @@ func Setsid() (pid int, err error) {
 }
 
 func Setuid(uid int) (err error) {
-	_, _, e1 := rawSysvicall6(procSetuid.Addr(), 1, uintptr(uid), 0, 0, 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetuid)), 1, uintptr(uid), 0, 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -663,7 +1271,7 @@ func Setuid(uid int) (err error) {
 }
 
 func Shutdown(s int, how int) (err error) {
-	_, _, e1 := sysvicall6(procshutdown.Addr(), 2, uintptr(s), uintptr(how), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procshutdown)), 2, uintptr(s), uintptr(how), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -676,7 +1284,7 @@ func Stat(path string, stat *Stat_t) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procStat.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procStat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -695,7 +1303,7 @@ func Symlink(path string, link string) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procSymlink.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSymlink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	use(unsafe.Pointer(_p1))
 	if e1 != 0 {
@@ -705,7 +1313,16 @@ func Symlink(path string, link string) (err error) {
 }
 
 func Sync() (err error) {
-	_, _, e1 := sysvicall6(procSync.Addr(), 0, 0, 0, 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSync)), 0, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procTimes)), 1, uintptr(unsafe.Pointer(tms)), 0, 0, 0, 0, 0)
+	ticks = uintptr(r0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -718,7 +1335,7 @@ func Truncate(path string, length int64) (err error) {
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procTruncate.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procTruncate)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -727,7 +1344,7 @@ func Truncate(path string, length int64) (err error) {
 }
 
 func Fsync(fd int) (err error) {
-	_, _, e1 := sysvicall6(procFsync.Addr(), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFsync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -735,26 +1352,62 @@ func Fsync(fd int) (err error) {
 }
 
 func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := sysvicall6(procFtruncate.Addr(), 2, uintptr(fd), uintptr(length), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFtruncate)), 2, uintptr(fd), uintptr(length), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
 	return
 }
 
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := sysvicall6(procUmask.Addr(), 1, uintptr(newmask), 0, 0, 0, 0, 0)
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procUmask)), 1, uintptr(mask), 0, 0, 0, 0, 0)
 	oldmask = int(r0)
 	return
 }
 
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procUname)), 1, uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procumount)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Unlink(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procUnlink.Addr(), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlink)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlinkat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -762,13 +1415,21 @@ func Unlink(path string) (err error) {
 	return
 }
 
-func Utimes(path string, times *[2]Timeval) (err error) {
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUstat)), 2, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Utime(path string, buf *Utimbuf) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := sysvicall6(procUtimes.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUtime)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0)
 	use(unsafe.Pointer(_p0))
 	if e1 != 0 {
 		err = e1
@@ -777,7 +1438,7 @@ func Utimes(path string, times *[2]Timeval) (err error) {
 }
 
 func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := sysvicall6(procbind.Addr(), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procbind)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -785,7 +1446,7 @@ func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
 }
 
 func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := sysvicall6(procconnect.Addr(), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procconnect)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -793,7 +1454,7 @@ func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
 }
 
 func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := sysvicall6(procmmap.Addr(), 6, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmmap)), 6, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
 	ret = uintptr(r0)
 	if e1 != 0 {
 		err = e1
@@ -802,7 +1463,7 @@ func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (
 }
 
 func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := sysvicall6(procmunmap.Addr(), 2, uintptr(addr), uintptr(length), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmunmap)), 2, uintptr(addr), uintptr(length), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -814,7 +1475,7 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	_, _, e1 := sysvicall6(procsendto.Addr(), 6, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendto)), 6, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
 	if e1 != 0 {
 		err = e1
 	}
@@ -822,7 +1483,7 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 }
 
 func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := sysvicall6(procsocket.Addr(), 3, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsocket)), 3, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -831,7 +1492,7 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 }
 
 func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := rawSysvicall6(procsocketpair.Addr(), 4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsocketpair)), 4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -843,7 +1504,7 @@ func write(fd int, p []byte) (n int, err error) {
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := sysvicall6(procwrite.Addr(), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -852,7 +1513,7 @@ func write(fd int, p []byte) (n int, err error) {
 }
 
 func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := sysvicall6(procgetsockopt.Addr(), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -860,15 +1521,7 @@ func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen
 }
 
 func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := rawSysvicall6(procgetpeername.Addr(), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := sysvicall6(procgetsockname.Addr(), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetpeername)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -876,7 +1529,7 @@ func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
 }
 
 func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := sysvicall6(procsetsockopt.Addr(), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -888,7 +1541,7 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	if len(p) > 0 {
 		_p0 = &p[0]
 	}
-	r0, _, e1 := sysvicall6(procrecvfrom.Addr(), 6, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvfrom)), 6, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -896,9 +1549,9 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	return
 }
 
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := sysvicall6(procrecvmsg.Addr(), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
-	n = int(r0)
+func sysconf(name int) (n int64, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsysconf)), 1, uintptr(name), 0, 0, 0, 0, 0)
+	n = int64(r0)
 	if e1 != 0 {
 		err = e1
 	}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go
index 645426a8d5..2786773ba3 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go
@@ -1,6 +1,8 @@
-// mksysnum_darwin.pl /usr/include/sys/unix.h
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build 386,darwin
+
 package unix
 
 const (
@@ -40,7 +42,6 @@ const (
 	SYS_DUP                            = 41
 	SYS_PIPE                           = 42
 	SYS_GETEGID                        = 43
-	SYS_PROFIL                         = 44
 	SYS_SIGACTION                      = 46
 	SYS_GETGID                         = 47
 	SYS_SIGPROCMASK                    = 48
@@ -118,8 +119,9 @@ const (
 	SYS_QUOTACTL                       = 165
 	SYS_MOUNT                          = 167
 	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
 	SYS_WAITID                         = 173
-	SYS_ADD_PROFIL                     = 176
+	SYS_KDEBUG_TRACE64                 = 179
 	SYS_KDEBUG_TRACE                   = 180
 	SYS_SETGID                         = 181
 	SYS_SETEGID                        = 182
@@ -139,21 +141,11 @@ const (
 	SYS_LSEEK                          = 199
 	SYS_TRUNCATE                       = 200
 	SYS_FTRUNCATE                      = 201
-	SYS___SYSCTL                       = 202
+	SYS_SYSCTL                         = 202
 	SYS_MLOCK                          = 203
 	SYS_MUNLOCK                        = 204
 	SYS_UNDELETE                       = 205
-	SYS_ATSOCKET                       = 206
-	SYS_ATGETMSG                       = 207
-	SYS_ATPUTMSG                       = 208
-	SYS_ATPSNDREQ                      = 209
-	SYS_ATPSNDRSP                      = 210
-	SYS_ATPGETREQ                      = 211
-	SYS_ATPGETRSP                      = 212
-	SYS_MKCOMPLEX                      = 216
-	SYS_STATV                          = 217
-	SYS_LSTATV                         = 218
-	SYS_FSTATV                         = 219
+	SYS_OPEN_DPROTECTED_NP             = 216
 	SYS_GETATTRLIST                    = 220
 	SYS_SETATTRLIST                    = 221
 	SYS_GETDIRENTRIESATTR              = 222
@@ -204,9 +196,7 @@ const (
 	SYS_SEM_WAIT                       = 271
 	SYS_SEM_TRYWAIT                    = 272
 	SYS_SEM_POST                       = 273
-	SYS_SEM_GETVALUE                   = 274
-	SYS_SEM_INIT                       = 275
-	SYS_SEM_DESTROY                    = 276
+	SYS_SYSCTLBYNAME                   = 274
 	SYS_OPEN_EXTENDED                  = 277
 	SYS_UMASK_EXTENDED                 = 278
 	SYS_STAT_EXTENDED                  = 279
@@ -280,8 +270,6 @@ const (
 	SYS_AUDITON                        = 351
 	SYS_GETAUID                        = 353
 	SYS_SETAUID                        = 354
-	SYS_GETAUDIT                       = 355
-	SYS_SETAUDIT                       = 356
 	SYS_GETAUDIT_ADDR                  = 357
 	SYS_SETAUDIT_ADDR                  = 358
 	SYS_AUDITCTL                       = 359
@@ -298,6 +286,7 @@ const (
 	SYS___OLD_SEMWAIT_SIGNAL           = 370
 	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
 	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
 	SYS___MAC_EXECVE                   = 380
 	SYS___MAC_SYSCALL                  = 381
 	SYS___MAC_GET_FILE                 = 382
@@ -356,5 +345,54 @@ const (
 	SYS_PID_HIBERNATE                  = 435
 	SYS_PID_SHUTDOWN_SOCKETS           = 436
 	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_MAXSYSCALL                     = 439
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAME_EXT                     = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_MAXSYSCALL                     = 490
 )
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
index 645426a8d5..09de240c8f 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
@@ -1,6 +1,8 @@
-// mksysnum_darwin.pl /usr/include/sys/unix.h
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build amd64,darwin
+
 package unix
 
 const (
@@ -40,7 +42,6 @@ const (
 	SYS_DUP                            = 41
 	SYS_PIPE                           = 42
 	SYS_GETEGID                        = 43
-	SYS_PROFIL                         = 44
 	SYS_SIGACTION                      = 46
 	SYS_GETGID                         = 47
 	SYS_SIGPROCMASK                    = 48
@@ -118,8 +119,9 @@ const (
 	SYS_QUOTACTL                       = 165
 	SYS_MOUNT                          = 167
 	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
 	SYS_WAITID                         = 173
-	SYS_ADD_PROFIL                     = 176
+	SYS_KDEBUG_TRACE64                 = 179
 	SYS_KDEBUG_TRACE                   = 180
 	SYS_SETGID                         = 181
 	SYS_SETEGID                        = 182
@@ -139,21 +141,11 @@ const (
 	SYS_LSEEK                          = 199
 	SYS_TRUNCATE                       = 200
 	SYS_FTRUNCATE                      = 201
-	SYS___SYSCTL                       = 202
+	SYS_SYSCTL                         = 202
 	SYS_MLOCK                          = 203
 	SYS_MUNLOCK                        = 204
 	SYS_UNDELETE                       = 205
-	SYS_ATSOCKET                       = 206
-	SYS_ATGETMSG                       = 207
-	SYS_ATPUTMSG                       = 208
-	SYS_ATPSNDREQ                      = 209
-	SYS_ATPSNDRSP                      = 210
-	SYS_ATPGETREQ                      = 211
-	SYS_ATPGETRSP                      = 212
-	SYS_MKCOMPLEX                      = 216
-	SYS_STATV                          = 217
-	SYS_LSTATV                         = 218
-	SYS_FSTATV                         = 219
+	SYS_OPEN_DPROTECTED_NP             = 216
 	SYS_GETATTRLIST                    = 220
 	SYS_SETATTRLIST                    = 221
 	SYS_GETDIRENTRIESATTR              = 222
@@ -204,9 +196,7 @@ const (
 	SYS_SEM_WAIT                       = 271
 	SYS_SEM_TRYWAIT                    = 272
 	SYS_SEM_POST                       = 273
-	SYS_SEM_GETVALUE                   = 274
-	SYS_SEM_INIT                       = 275
-	SYS_SEM_DESTROY                    = 276
+	SYS_SYSCTLBYNAME                   = 274
 	SYS_OPEN_EXTENDED                  = 277
 	SYS_UMASK_EXTENDED                 = 278
 	SYS_STAT_EXTENDED                  = 279
@@ -280,8 +270,6 @@ const (
 	SYS_AUDITON                        = 351
 	SYS_GETAUID                        = 353
 	SYS_SETAUID                        = 354
-	SYS_GETAUDIT                       = 355
-	SYS_SETAUDIT                       = 356
 	SYS_GETAUDIT_ADDR                  = 357
 	SYS_SETAUDIT_ADDR                  = 358
 	SYS_AUDITCTL                       = 359
@@ -298,6 +286,7 @@ const (
 	SYS___OLD_SEMWAIT_SIGNAL           = 370
 	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
 	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
 	SYS___MAC_EXECVE                   = 380
 	SYS___MAC_SYSCALL                  = 381
 	SYS___MAC_GET_FILE                 = 382
@@ -356,5 +345,54 @@ const (
 	SYS_PID_HIBERNATE                  = 435
 	SYS_PID_SHUTDOWN_SOCKETS           = 436
 	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_MAXSYSCALL                     = 439
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAME_EXT                     = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_MAXSYSCALL                     = 490
 )
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go
new file mode 100644
index 0000000000..b8c9aea852
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go
@@ -0,0 +1,358 @@
+// mksysnum_darwin.pl /usr/include/sys/syscall.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_CHUD                           = 185
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS___SYSCTL                       = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_ATSOCKET                       = 206
+	SYS_ATGETMSG                       = 207
+	SYS_ATPUTMSG                       = 208
+	SYS_ATPSNDREQ                      = 209
+	SYS_ATPSNDRSP                      = 210
+	SYS_ATPGETREQ                      = 211
+	SYS_ATPGETRSP                      = 212
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SEM_GETVALUE                   = 274
+	SYS_SEM_INIT                       = 275
+	SYS_SEM_DESTROY                    = 276
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_STACK_SNAPSHOT                 = 365
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS___MAC_GET_LCID                 = 391
+	SYS___MAC_GET_LCTX                 = 392
+	SYS___MAC_SET_LCTX                 = 393
+	SYS_SETLCID                        = 394
+	SYS_GETLCID                        = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MAXSYSCALL                     = 440
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
new file mode 100644
index 0000000000..26677ebbf5
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
@@ -0,0 +1,398 @@
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/usr/include/sys/syscall.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm64,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TRACE64                 = 179
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_CHUD                           = 185
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS_SYSCTL                         = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SYSCTLBYNAME                   = 274
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_STACK_SNAPSHOT                 = 365
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS___MAC_GET_LCID                 = 391
+	SYS___MAC_GET_LCTX                 = 392
+	SYS___MAC_SET_LCTX                 = 393
+	SYS_SETLCID                        = 394
+	SYS_GETLCID                        = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAME_EXT                     = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_MAXSYSCALL                     = 490
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_386.go
deleted file mode 100644
index 09c3515804..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_386.go
+++ /dev/null
@@ -1,302 +0,0 @@
-// mksysnum_dragonfly.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT          = 1   // { void exit(int rval); }
-	SYS_FORK          = 2   // { int fork(void); }
-	SYS_READ          = 3   // { ssize_t read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE         = 4   // { ssize_t write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN          = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE         = 6   // { int close(int fd); }
-	SYS_WAIT4         = 7   // { int wait4(int pid, int *status, int options, \
-	SYS_LINK          = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK        = 10  // { int unlink(char *path); }
-	SYS_CHDIR         = 12  // { int chdir(char *path); }
-	SYS_FCHDIR        = 13  // { int fchdir(int fd); }
-	SYS_MKNOD         = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD         = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN         = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK        = 17  // { int obreak(char *nsize); } break obreak_args int
-	SYS_GETFSSTAT     = 18  // { int getfsstat(struct statfs *buf, long bufsize, \
-	SYS_GETPID        = 20  // { pid_t getpid(void); }
-	SYS_MOUNT         = 21  // { int mount(char *type, char *path, int flags, \
-	SYS_UNMOUNT       = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID        = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID        = 24  // { uid_t getuid(void); }
-	SYS_GETEUID       = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE        = 26  // { int ptrace(int req, pid_t pid, caddr_t addr, \
-	SYS_RECVMSG       = 27  // { int recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG       = 28  // { int sendmsg(int s, caddr_t msg, int flags); }
-	SYS_RECVFROM      = 29  // { int recvfrom(int s, caddr_t buf, size_t len, \
-	SYS_ACCEPT        = 30  // { int accept(int s, caddr_t name, int *anamelen); }
-	SYS_GETPEERNAME   = 31  // { int getpeername(int fdes, caddr_t asa, int *alen); }
-	SYS_GETSOCKNAME   = 32  // { int getsockname(int fdes, caddr_t asa, int *alen); }
-	SYS_ACCESS        = 33  // { int access(char *path, int flags); }
-	SYS_CHFLAGS       = 34  // { int chflags(char *path, int flags); }
-	SYS_FCHFLAGS      = 35  // { int fchflags(int fd, int flags); }
-	SYS_SYNC          = 36  // { int sync(void); }
-	SYS_KILL          = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID       = 39  // { pid_t getppid(void); }
-	SYS_DUP           = 41  // { int dup(u_int fd); }
-	SYS_PIPE          = 42  // { int pipe(void); }
-	SYS_GETEGID       = 43  // { gid_t getegid(void); }
-	SYS_PROFIL        = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE        = 45  // { int ktrace(const char *fname, int ops, int facs, \
-	SYS_GETGID        = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN      = 49  // { int getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN      = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT          = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK   = 53  // { int sigaltstack(stack_t *ss, stack_t *oss); }
-	SYS_IOCTL         = 54  // { int ioctl(int fd, u_long com, caddr_t data); }
-	SYS_REBOOT        = 55  // { int reboot(int opt); }
-	SYS_REVOKE        = 56  // { int revoke(char *path); }
-	SYS_SYMLINK       = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK      = 58  // { int readlink(char *path, char *buf, int count); }
-	SYS_EXECVE        = 59  // { int execve(char *fname, char **argv, char **envv); }
-	SYS_UMASK         = 60  // { int umask(int newmask); } umask umask_args int
-	SYS_CHROOT        = 61  // { int chroot(char *path); }
-	SYS_MSYNC         = 65  // { int msync(void *addr, size_t len, int flags); }
-	SYS_VFORK         = 66  // { pid_t vfork(void); }
-	SYS_SBRK          = 69  // { int sbrk(int incr); }
-	SYS_SSTK          = 70  // { int sstk(int incr); }
-	SYS_MUNMAP        = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT      = 74  // { int mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE       = 75  // { int madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE       = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS     = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS     = 80  // { int setgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_GETPGRP       = 81  // { int getpgrp(void); }
-	SYS_SETPGID       = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER     = 83  // { int setitimer(u_int which, struct itimerval *itv, \
-	SYS_SWAPON        = 85  // { int swapon(char *name); }
-	SYS_GETITIMER     = 86  // { int getitimer(u_int which, struct itimerval *itv); }
-	SYS_GETDTABLESIZE = 89  // { int getdtablesize(void); }
-	SYS_DUP2          = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL         = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT        = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC         = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY   = 96  // { int setpriority(int which, int who, int prio); }
-	SYS_SOCKET        = 97  // { int socket(int domain, int type, int protocol); }
-	SYS_CONNECT       = 98  // { int connect(int s, caddr_t name, int namelen); }
-	SYS_GETPRIORITY   = 100 // { int getpriority(int which, int who); }
-	SYS_BIND          = 104 // { int bind(int s, caddr_t name, int namelen); }
-	SYS_SETSOCKOPT    = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN        = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY  = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE     = 117 // { int getrusage(int who, struct rusage *rusage); }
-	SYS_GETSOCKOPT    = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV         = 120 // { int readv(int fd, struct iovec *iovp, u_int iovcnt); }
-	SYS_WRITEV        = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY  = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN        = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD        = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID      = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID      = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME        = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK         = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO        = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO        = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN      = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR    = 135 // { int socketpair(int domain, int type, int protocol, \
-	SYS_MKDIR         = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR         = 137 // { int rmdir(char *path); }
-	SYS_UTIMES        = 138 // { int utimes(char *path, struct timeval *tptr); }
-	SYS_ADJTIME       = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID        = 147 // { int setsid(void); }
-	SYS_QUOTACTL      = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_STATFS        = 157 // { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS       = 158 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_GETFH         = 161 // { int getfh(char *fname, struct fhandle *fhp); }
-	SYS_GETDOMAINNAME = 162 // { int getdomainname(char *domainname, int len); }
-	SYS_SETDOMAINNAME = 163 // { int setdomainname(char *domainname, int len); }
-	SYS_UNAME         = 164 // { int uname(struct utsname *name); }
-	SYS_SYSARCH       = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO        = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_EXTPREAD      = 173 // { ssize_t extpread(int fd, void *buf, \
-	SYS_EXTPWRITE     = 174 // { ssize_t extpwrite(int fd, const void *buf, \
-	SYS_NTP_ADJTIME   = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID        = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID       = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID       = 183 // { int seteuid(uid_t euid); }
-	SYS_PATHCONF      = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF     = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT     = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT     = 195 // { int setrlimit(u_int which, \
-	SYS_MMAP          = 197 // { caddr_t mmap(caddr_t addr, size_t len, int prot, \
-	// SYS_NOSYS = 198;  // { int nosys(void); } __syscall __syscall_args int
-	SYS_LSEEK                  = 199 // { off_t lseek(int fd, int pad, off_t offset, \
-	SYS_TRUNCATE               = 200 // { int truncate(char *path, int pad, off_t length); }
-	SYS_FTRUNCATE              = 201 // { int ftruncate(int fd, int pad, off_t length); }
-	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, void *old, \
-	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE               = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS___SEMCTL               = 220 // { int __semctl(int semid, int semnum, int cmd, \
-	SYS_SEMGET                 = 221 // { int semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                  = 222 // { int semop(int semid, struct sembuf *sops, \
-	SYS_MSGCTL                 = 224 // { int msgctl(int msqid, int cmd, \
-	SYS_MSGGET                 = 225 // { int msgget(key_t key, int msgflg); }
-	SYS_MSGSND                 = 226 // { int msgsnd(int msqid, void *msgp, size_t msgsz, \
-	SYS_MSGRCV                 = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, \
-	SYS_SHMAT                  = 228 // { caddr_t shmat(int shmid, const void *shmaddr, \
-	SYS_SHMCTL                 = 229 // { int shmctl(int shmid, int cmd, \
-	SYS_SHMDT                  = 230 // { int shmdt(const void *shmaddr); }
-	SYS_SHMGET                 = 231 // { int shmget(key_t key, size_t size, int shmflg); }
-	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME          = 233 // { int clock_settime(clockid_t clock_id, \
-	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, int inherit); }
-	SYS_RFORK                  = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, u_int nfds, \
-	SYS_ISSETUGID              = 253 // { int issetugid(void); }
-	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                = 276 // { int lutimes(char *path, struct timeval *tptr); }
-	SYS_EXTPREADV              = 289 // { ssize_t extpreadv(int fd, struct iovec *iovp, \
-	SYS_EXTPWRITEV             = 290 // { ssize_t extpwritev(int fd, struct iovec *iovp,\
-	SYS_FHSTATFS               = 297 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
-	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
-	SYS_MODNEXT                = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                = 301 // { int modstat(int modid, struct module_stat* stat); }
-	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct kld_file_stat* stat); }
-	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
-	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
-	SYS_AIO_RETURN             = 314 // { int aio_return(struct aiocb *aiocbp); }
-	SYS_AIO_SUSPEND            = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
-	SYS_AIO_CANCEL             = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
-	SYS_AIO_ERROR              = 317 // { int aio_error(struct aiocb *aiocbp); }
-	SYS_AIO_READ               = 318 // { int aio_read(struct aiocb *aiocbp); }
-	SYS_AIO_WRITE              = 319 // { int aio_write(struct aiocb *aiocbp); }
-	SYS_LIO_LISTIO             = 320 // { int lio_listio(int mode, struct aiocb * const *acb_list, int nent, struct sigevent *sig); }
-	SYS_YIELD                  = 321 // { int yield(void); }
-	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
-	SYS___GETCWD               = 326 // { int __getcwd(u_char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
-	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
-	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
-	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, struct timespec *interval); }
-	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, void *data); }
-	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, const sigset_t *set, \
-	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGACTION              = 342 // { int sigaction(int sig, const struct sigaction *act, \
-	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGRETURN              = 344 // { int sigreturn(ucontext_t *sigcntxp); }
-	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set,\
-	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set,\
-	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, acl_type_t type, \
-	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, acl_type_t type, \
-	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, acl_type_t type); }
-	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, \
-	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE       = 356 // { int extattr_set_file(const char *path, \
-	SYS_EXTATTR_GET_FILE       = 357 // { int extattr_get_file(const char *path, \
-	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
-	SYS_AIO_WAITCOMPLETE       = 359 // { int aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
-	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
-	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
-	SYS_KQUEUE                 = 362 // { int kqueue(void); }
-	SYS_KEVENT                 = 363 // { int kevent(int fd, \
-	SYS_SCTP_PEELOFF           = 364 // { int sctp_peeloff(int sd, caddr_t name ); }
-	SYS_LCHFLAGS               = 391 // { int lchflags(char *path, int flags); }
-	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, int count); }
-	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, \
-	SYS_VARSYM_SET             = 450 // { int varsym_set(int level, const char *name, const char *data); }
-	SYS_VARSYM_GET             = 451 // { int varsym_get(int mask, const char *wild, char *buf, int bufsize); }
-	SYS_VARSYM_LIST            = 452 // { int varsym_list(int level, char *buf, int maxsize, int *marker); }
-	SYS_EXEC_SYS_REGISTER      = 465 // { int exec_sys_register(void *entry); }
-	SYS_EXEC_SYS_UNREGISTER    = 466 // { int exec_sys_unregister(int id); }
-	SYS_SYS_CHECKPOINT         = 467 // { int sys_checkpoint(int type, int fd, pid_t pid, int retval); }
-	SYS_MOUNTCTL               = 468 // { int mountctl(const char *path, int op, int fd, const void *ctl, int ctllen, void *buf, int buflen); }
-	SYS_UMTX_SLEEP             = 469 // { int umtx_sleep(volatile const int *ptr, int value, int timeout); }
-	SYS_UMTX_WAKEUP            = 470 // { int umtx_wakeup(volatile const int *ptr, int count); }
-	SYS_JAIL_ATTACH            = 471 // { int jail_attach(int jid); }
-	SYS_SET_TLS_AREA           = 472 // { int set_tls_area(int which, struct tls_info *info, size_t infosize); }
-	SYS_GET_TLS_AREA           = 473 // { int get_tls_area(int which, struct tls_info *info, size_t infosize); }
-	SYS_CLOSEFROM              = 474 // { int closefrom(int fd); }
-	SYS_STAT                   = 475 // { int stat(const char *path, struct stat *ub); }
-	SYS_FSTAT                  = 476 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                  = 477 // { int lstat(const char *path, struct stat *ub); }
-	SYS_FHSTAT                 = 478 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
-	SYS_GETDIRENTRIES          = 479 // { int getdirentries(int fd, char *buf, u_int count, \
-	SYS_GETDENTS               = 480 // { int getdents(int fd, char *buf, size_t count); }
-	SYS_USCHED_SET             = 481 // { int usched_set(pid_t pid, int cmd, void *data, \
-	SYS_EXTACCEPT              = 482 // { int extaccept(int s, int flags, caddr_t name, int *anamelen); }
-	SYS_EXTCONNECT             = 483 // { int extconnect(int s, int flags, caddr_t name, int namelen); }
-	SYS_MCONTROL               = 485 // { int mcontrol(void *addr, size_t len, int behav, off_t value); }
-	SYS_VMSPACE_CREATE         = 486 // { int vmspace_create(void *id, int type, void *data); }
-	SYS_VMSPACE_DESTROY        = 487 // { int vmspace_destroy(void *id); }
-	SYS_VMSPACE_CTL            = 488 // { int vmspace_ctl(void *id, int cmd, 		\
-	SYS_VMSPACE_MMAP           = 489 // { int vmspace_mmap(void *id, void *addr, size_t len, \
-	SYS_VMSPACE_MUNMAP         = 490 // { int vmspace_munmap(void *id, void *addr,	\
-	SYS_VMSPACE_MCONTROL       = 491 // { int vmspace_mcontrol(void *id, void *addr, 	\
-	SYS_VMSPACE_PREAD          = 492 // { ssize_t vmspace_pread(void *id, void *buf, \
-	SYS_VMSPACE_PWRITE         = 493 // { ssize_t vmspace_pwrite(void *id, const void *buf, \
-	SYS_EXTEXIT                = 494 // { void extexit(int how, int status, void *addr); }
-	SYS_LWP_CREATE             = 495 // { int lwp_create(struct lwp_params *params); }
-	SYS_LWP_GETTID             = 496 // { lwpid_t lwp_gettid(void); }
-	SYS_LWP_KILL               = 497 // { int lwp_kill(pid_t pid, lwpid_t tid, int signum); }
-	SYS_LWP_RTPRIO             = 498 // { int lwp_rtprio(int function, pid_t pid, lwpid_t tid, struct rtprio *rtp); }
-	SYS_PSELECT                = 499 // { int pselect(int nd, fd_set *in, fd_set *ou, \
-	SYS_STATVFS                = 500 // { int statvfs(const char *path, struct statvfs *buf); }
-	SYS_FSTATVFS               = 501 // { int fstatvfs(int fd, struct statvfs *buf); }
-	SYS_FHSTATVFS              = 502 // { int fhstatvfs(const struct fhandle *u_fhp, struct statvfs *buf); }
-	SYS_GETVFSSTAT             = 503 // { int getvfsstat(struct statfs *buf,          \
-	SYS_OPENAT                 = 504 // { int openat(int fd, char *path, int flags, int mode); }
-	SYS_FSTATAT                = 505 // { int fstatat(int fd, char *path, 	\
-	SYS_FCHMODAT               = 506 // { int fchmodat(int fd, char *path, int mode, \
-	SYS_FCHOWNAT               = 507 // { int fchownat(int fd, char *path, int uid, int gid, \
-	SYS_UNLINKAT               = 508 // { int unlinkat(int fd, char *path, int flags); }
-	SYS_FACCESSAT              = 509 // { int faccessat(int fd, char *path, int amode, \
-	SYS_MQ_OPEN                = 510 // { mqd_t mq_open(const char * name, int oflag, \
-	SYS_MQ_CLOSE               = 511 // { int mq_close(mqd_t mqdes); }
-	SYS_MQ_UNLINK              = 512 // { int mq_unlink(const char *name); }
-	SYS_MQ_GETATTR             = 513 // { int mq_getattr(mqd_t mqdes, \
-	SYS_MQ_SETATTR             = 514 // { int mq_setattr(mqd_t mqdes, \
-	SYS_MQ_NOTIFY              = 515 // { int mq_notify(mqd_t mqdes, \
-	SYS_MQ_SEND                = 516 // { int mq_send(mqd_t mqdes, const char *msg_ptr, \
-	SYS_MQ_RECEIVE             = 517 // { ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, \
-	SYS_MQ_TIMEDSEND           = 518 // { int mq_timedsend(mqd_t mqdes, \
-	SYS_MQ_TIMEDRECEIVE        = 519 // { ssize_t mq_timedreceive(mqd_t mqdes, \
-	SYS_IOPRIO_SET             = 520 // { int ioprio_set(int which, int who, int prio); }
-	SYS_IOPRIO_GET             = 521 // { int ioprio_get(int which, int who); }
-	SYS_CHROOT_KERNEL          = 522 // { int chroot_kernel(char *path); }
-	SYS_RENAMEAT               = 523 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_MKDIRAT                = 524 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT               = 525 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                = 526 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_READLINKAT             = 527 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_SYMLINKAT              = 528 // { int symlinkat(char *path1, int fd, char *path2); }
-	SYS_SWAPOFF                = 529 // { int swapoff(char *name); }
-	SYS_VQUOTACTL              = 530 // { int vquotactl(const char *path, \
-	SYS_LINKAT                 = 531 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_EACCESS                = 532 // { int eaccess(char *path, int flags); }
-	SYS_LPATHCONF              = 533 // { int lpathconf(char *path, int name); }
-	SYS_VMM_GUEST_CTL          = 534 // { int vmm_guest_ctl(int op, struct vmm_guest_options *options); }
-	SYS_VMM_GUEST_SYNC_ADDR    = 535 // { int vmm_guest_sync_addr(long *dstaddr, long *srcaddr); }
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
index 09c3515804..d6038fa9b0 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
@@ -1,6 +1,8 @@
 // mksysnum_dragonfly.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build amd64,dragonfly
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go
index 782eb91721..262a84536a 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go
@@ -1,6 +1,8 @@
 // mksysnum_freebsd.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build 386,freebsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
index 782eb91721..57a60ea126 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
@@ -1,6 +1,8 @@
 // mksysnum_freebsd.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build amd64,freebsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
index 782eb91721..206b9f612d 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
@@ -1,6 +1,8 @@
 // mksysnum_freebsd.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build arm,freebsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go
index b6f993f7bc..ba952c6754 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go
@@ -1,6 +1,8 @@
 // mksysnum_linux.pl /usr/include/asm/unistd_32.h
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build 386,linux
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go
index c2da210c5e..ddac31f58a 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go
@@ -1,6 +1,8 @@
 // mksysnum_linux.pl /usr/include/asm/unistd_64.h
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build amd64,linux
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go
index e2b7d19d79..45ced17fc4 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go
@@ -1,6 +1,8 @@
 // mksysnum_linux.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build arm,linux
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go
new file mode 100644
index 0000000000..2e9514f280
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go
@@ -0,0 +1,272 @@
+// mksysnum_linux.pl /usr/include/asm-generic/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm64,linux
+
+package unix
+
+const (
+	SYS_IO_SETUP               = 0
+	SYS_IO_DESTROY             = 1
+	SYS_IO_SUBMIT              = 2
+	SYS_IO_CANCEL              = 3
+	SYS_IO_GETEVENTS           = 4
+	SYS_SETXATTR               = 5
+	SYS_LSETXATTR              = 6
+	SYS_FSETXATTR              = 7
+	SYS_GETXATTR               = 8
+	SYS_LGETXATTR              = 9
+	SYS_FGETXATTR              = 10
+	SYS_LISTXATTR              = 11
+	SYS_LLISTXATTR             = 12
+	SYS_FLISTXATTR             = 13
+	SYS_REMOVEXATTR            = 14
+	SYS_LREMOVEXATTR           = 15
+	SYS_FREMOVEXATTR           = 16
+	SYS_GETCWD                 = 17
+	SYS_LOOKUP_DCOOKIE         = 18
+	SYS_EVENTFD2               = 19
+	SYS_EPOLL_CREATE1          = 20
+	SYS_EPOLL_CTL              = 21
+	SYS_EPOLL_PWAIT            = 22
+	SYS_DUP                    = 23
+	SYS_DUP3                   = 24
+	SYS_FCNTL                  = 25
+	SYS_INOTIFY_INIT1          = 26
+	SYS_INOTIFY_ADD_WATCH      = 27
+	SYS_INOTIFY_RM_WATCH       = 28
+	SYS_IOCTL                  = 29
+	SYS_IOPRIO_SET             = 30
+	SYS_IOPRIO_GET             = 31
+	SYS_FLOCK                  = 32
+	SYS_MKNODAT                = 33
+	SYS_MKDIRAT                = 34
+	SYS_UNLINKAT               = 35
+	SYS_SYMLINKAT              = 36
+	SYS_LINKAT                 = 37
+	SYS_RENAMEAT               = 38
+	SYS_UMOUNT2                = 39
+	SYS_MOUNT                  = 40
+	SYS_PIVOT_ROOT             = 41
+	SYS_NFSSERVCTL             = 42
+	SYS_STATFS                 = 43
+	SYS_FSTATFS                = 44
+	SYS_TRUNCATE               = 45
+	SYS_FTRUNCATE              = 46
+	SYS_FALLOCATE              = 47
+	SYS_FACCESSAT              = 48
+	SYS_CHDIR                  = 49
+	SYS_FCHDIR                 = 50
+	SYS_CHROOT                 = 51
+	SYS_FCHMOD                 = 52
+	SYS_FCHMODAT               = 53
+	SYS_FCHOWNAT               = 54
+	SYS_FCHOWN                 = 55
+	SYS_OPENAT                 = 56
+	SYS_CLOSE                  = 57
+	SYS_VHANGUP                = 58
+	SYS_PIPE2                  = 59
+	SYS_QUOTACTL               = 60
+	SYS_GETDENTS64             = 61
+	SYS_LSEEK                  = 62
+	SYS_READ                   = 63
+	SYS_WRITE                  = 64
+	SYS_READV                  = 65
+	SYS_WRITEV                 = 66
+	SYS_PREAD64                = 67
+	SYS_PWRITE64               = 68
+	SYS_PREADV                 = 69
+	SYS_PWRITEV                = 70
+	SYS_SENDFILE               = 71
+	SYS_PSELECT6               = 72
+	SYS_PPOLL                  = 73
+	SYS_SIGNALFD4              = 74
+	SYS_VMSPLICE               = 75
+	SYS_SPLICE                 = 76
+	SYS_TEE                    = 77
+	SYS_READLINKAT             = 78
+	SYS_FSTATAT                = 79
+	SYS_FSTAT                  = 80
+	SYS_SYNC                   = 81
+	SYS_FSYNC                  = 82
+	SYS_FDATASYNC              = 83
+	SYS_SYNC_FILE_RANGE        = 84
+	SYS_TIMERFD_CREATE         = 85
+	SYS_TIMERFD_SETTIME        = 86
+	SYS_TIMERFD_GETTIME        = 87
+	SYS_UTIMENSAT              = 88
+	SYS_ACCT                   = 89
+	SYS_CAPGET                 = 90
+	SYS_CAPSET                 = 91
+	SYS_PERSONALITY            = 92
+	SYS_EXIT                   = 93
+	SYS_EXIT_GROUP             = 94
+	SYS_WAITID                 = 95
+	SYS_SET_TID_ADDRESS        = 96
+	SYS_UNSHARE                = 97
+	SYS_FUTEX                  = 98
+	SYS_SET_ROBUST_LIST        = 99
+	SYS_GET_ROBUST_LIST        = 100
+	SYS_NANOSLEEP              = 101
+	SYS_GETITIMER              = 102
+	SYS_SETITIMER              = 103
+	SYS_KEXEC_LOAD             = 104
+	SYS_INIT_MODULE            = 105
+	SYS_DELETE_MODULE          = 106
+	SYS_TIMER_CREATE           = 107
+	SYS_TIMER_GETTIME          = 108
+	SYS_TIMER_GETOVERRUN       = 109
+	SYS_TIMER_SETTIME          = 110
+	SYS_TIMER_DELETE           = 111
+	SYS_CLOCK_SETTIME          = 112
+	SYS_CLOCK_GETTIME          = 113
+	SYS_CLOCK_GETRES           = 114
+	SYS_CLOCK_NANOSLEEP        = 115
+	SYS_SYSLOG                 = 116
+	SYS_PTRACE                 = 117
+	SYS_SCHED_SETPARAM         = 118
+	SYS_SCHED_SETSCHEDULER     = 119
+	SYS_SCHED_GETSCHEDULER     = 120
+	SYS_SCHED_GETPARAM         = 121
+	SYS_SCHED_SETAFFINITY      = 122
+	SYS_SCHED_GETAFFINITY      = 123
+	SYS_SCHED_YIELD            = 124
+	SYS_SCHED_GET_PRIORITY_MAX = 125
+	SYS_SCHED_GET_PRIORITY_MIN = 126
+	SYS_SCHED_RR_GET_INTERVAL  = 127
+	SYS_RESTART_SYSCALL        = 128
+	SYS_KILL                   = 129
+	SYS_TKILL                  = 130
+	SYS_TGKILL                 = 131
+	SYS_SIGALTSTACK            = 132
+	SYS_RT_SIGSUSPEND          = 133
+	SYS_RT_SIGACTION           = 134
+	SYS_RT_SIGPROCMASK         = 135
+	SYS_RT_SIGPENDING          = 136
+	SYS_RT_SIGTIMEDWAIT        = 137
+	SYS_RT_SIGQUEUEINFO        = 138
+	SYS_RT_SIGRETURN           = 139
+	SYS_SETPRIORITY            = 140
+	SYS_GETPRIORITY            = 141
+	SYS_REBOOT                 = 142
+	SYS_SETREGID               = 143
+	SYS_SETGID                 = 144
+	SYS_SETREUID               = 145
+	SYS_SETUID                 = 146
+	SYS_SETRESUID              = 147
+	SYS_GETRESUID              = 148
+	SYS_SETRESGID              = 149
+	SYS_GETRESGID              = 150
+	SYS_SETFSUID               = 151
+	SYS_SETFSGID               = 152
+	SYS_TIMES                  = 153
+	SYS_SETPGID                = 154
+	SYS_GETPGID                = 155
+	SYS_GETSID                 = 156
+	SYS_SETSID                 = 157
+	SYS_GETGROUPS              = 158
+	SYS_SETGROUPS              = 159
+	SYS_UNAME                  = 160
+	SYS_SETHOSTNAME            = 161
+	SYS_SETDOMAINNAME          = 162
+	SYS_GETRLIMIT              = 163
+	SYS_SETRLIMIT              = 164
+	SYS_GETRUSAGE              = 165
+	SYS_UMASK                  = 166
+	SYS_PRCTL                  = 167
+	SYS_GETCPU                 = 168
+	SYS_GETTIMEOFDAY           = 169
+	SYS_SETTIMEOFDAY           = 170
+	SYS_ADJTIMEX               = 171
+	SYS_GETPID                 = 172
+	SYS_GETPPID                = 173
+	SYS_GETUID                 = 174
+	SYS_GETEUID                = 175
+	SYS_GETGID                 = 176
+	SYS_GETEGID                = 177
+	SYS_GETTID                 = 178
+	SYS_SYSINFO                = 179
+	SYS_MQ_OPEN                = 180
+	SYS_MQ_UNLINK              = 181
+	SYS_MQ_TIMEDSEND           = 182
+	SYS_MQ_TIMEDRECEIVE        = 183
+	SYS_MQ_NOTIFY              = 184
+	SYS_MQ_GETSETATTR          = 185
+	SYS_MSGGET                 = 186
+	SYS_MSGCTL                 = 187
+	SYS_MSGRCV                 = 188
+	SYS_MSGSND                 = 189
+	SYS_SEMGET                 = 190
+	SYS_SEMCTL                 = 191
+	SYS_SEMTIMEDOP             = 192
+	SYS_SEMOP                  = 193
+	SYS_SHMGET                 = 194
+	SYS_SHMCTL                 = 195
+	SYS_SHMAT                  = 196
+	SYS_SHMDT                  = 197
+	SYS_SOCKET                 = 198
+	SYS_SOCKETPAIR             = 199
+	SYS_BIND                   = 200
+	SYS_LISTEN                 = 201
+	SYS_ACCEPT                 = 202
+	SYS_CONNECT                = 203
+	SYS_GETSOCKNAME            = 204
+	SYS_GETPEERNAME            = 205
+	SYS_SENDTO                 = 206
+	SYS_RECVFROM               = 207
+	SYS_SETSOCKOPT             = 208
+	SYS_GETSOCKOPT             = 209
+	SYS_SHUTDOWN               = 210
+	SYS_SENDMSG                = 211
+	SYS_RECVMSG                = 212
+	SYS_READAHEAD              = 213
+	SYS_BRK                    = 214
+	SYS_MUNMAP                 = 215
+	SYS_MREMAP                 = 216
+	SYS_ADD_KEY                = 217
+	SYS_REQUEST_KEY            = 218
+	SYS_KEYCTL                 = 219
+	SYS_CLONE                  = 220
+	SYS_EXECVE                 = 221
+	SYS_MMAP                   = 222
+	SYS_FADVISE64              = 223
+	SYS_SWAPON                 = 224
+	SYS_SWAPOFF                = 225
+	SYS_MPROTECT               = 226
+	SYS_MSYNC                  = 227
+	SYS_MLOCK                  = 228
+	SYS_MUNLOCK                = 229
+	SYS_MLOCKALL               = 230
+	SYS_MUNLOCKALL             = 231
+	SYS_MINCORE                = 232
+	SYS_MADVISE                = 233
+	SYS_REMAP_FILE_PAGES       = 234
+	SYS_MBIND                  = 235
+	SYS_GET_MEMPOLICY          = 236
+	SYS_SET_MEMPOLICY          = 237
+	SYS_MIGRATE_PAGES          = 238
+	SYS_MOVE_PAGES             = 239
+	SYS_RT_TGSIGQUEUEINFO      = 240
+	SYS_PERF_EVENT_OPEN        = 241
+	SYS_ACCEPT4                = 242
+	SYS_RECVMMSG               = 243
+	SYS_ARCH_SPECIFIC_SYSCALL  = 244
+	SYS_WAIT4                  = 260
+	SYS_PRLIMIT64              = 261
+	SYS_FANOTIFY_INIT          = 262
+	SYS_FANOTIFY_MARK          = 263
+	SYS_NAME_TO_HANDLE_AT      = 264
+	SYS_OPEN_BY_HANDLE_AT      = 265
+	SYS_CLOCK_ADJTIME          = 266
+	SYS_SYNCFS                 = 267
+	SYS_SETNS                  = 268
+	SYS_SENDMMSG               = 269
+	SYS_PROCESS_VM_READV       = 270
+	SYS_PROCESS_VM_WRITEV      = 271
+	SYS_KCMP                   = 272
+	SYS_FINIT_MODULE           = 273
+	SYS_SCHED_SETATTR          = 274
+	SYS_SCHED_GETATTR          = 275
+	SYS_RENAMEAT2              = 276
+	SYS_SECCOMP                = 277
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64.go
new file mode 100644
index 0000000000..5ffe1c7191
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64.go
@@ -0,0 +1,327 @@
+// mksysnum_linux.pl /usr/include/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build mips64,linux
+
+package unix
+
+const (
+	SYS_READ                   = 5000
+	SYS_WRITE                  = 5001
+	SYS_OPEN                   = 5002
+	SYS_CLOSE                  = 5003
+	SYS_STAT                   = 5004
+	SYS_FSTAT                  = 5005
+	SYS_LSTAT                  = 5006
+	SYS_POLL                   = 5007
+	SYS_LSEEK                  = 5008
+	SYS_MMAP                   = 5009
+	SYS_MPROTECT               = 5010
+	SYS_MUNMAP                 = 5011
+	SYS_BRK                    = 5012
+	SYS_RT_SIGACTION           = 5013
+	SYS_RT_SIGPROCMASK         = 5014
+	SYS_IOCTL                  = 5015
+	SYS_PREAD64                = 5016
+	SYS_PWRITE64               = 5017
+	SYS_READV                  = 5018
+	SYS_WRITEV                 = 5019
+	SYS_ACCESS                 = 5020
+	SYS_PIPE                   = 5021
+	SYS__NEWSELECT             = 5022
+	SYS_SCHED_YIELD            = 5023
+	SYS_MREMAP                 = 5024
+	SYS_MSYNC                  = 5025
+	SYS_MINCORE                = 5026
+	SYS_MADVISE                = 5027
+	SYS_SHMGET                 = 5028
+	SYS_SHMAT                  = 5029
+	SYS_SHMCTL                 = 5030
+	SYS_DUP                    = 5031
+	SYS_DUP2                   = 5032
+	SYS_PAUSE                  = 5033
+	SYS_NANOSLEEP              = 5034
+	SYS_GETITIMER              = 5035
+	SYS_SETITIMER              = 5036
+	SYS_ALARM                  = 5037
+	SYS_GETPID                 = 5038
+	SYS_SENDFILE               = 5039
+	SYS_SOCKET                 = 5040
+	SYS_CONNECT                = 5041
+	SYS_ACCEPT                 = 5042
+	SYS_SENDTO                 = 5043
+	SYS_RECVFROM               = 5044
+	SYS_SENDMSG                = 5045
+	SYS_RECVMSG                = 5046
+	SYS_SHUTDOWN               = 5047
+	SYS_BIND                   = 5048
+	SYS_LISTEN                 = 5049
+	SYS_GETSOCKNAME            = 5050
+	SYS_GETPEERNAME            = 5051
+	SYS_SOCKETPAIR             = 5052
+	SYS_SETSOCKOPT             = 5053
+	SYS_GETSOCKOPT             = 5054
+	SYS_CLONE                  = 5055
+	SYS_FORK                   = 5056
+	SYS_EXECVE                 = 5057
+	SYS_EXIT                   = 5058
+	SYS_WAIT4                  = 5059
+	SYS_KILL                   = 5060
+	SYS_UNAME                  = 5061
+	SYS_SEMGET                 = 5062
+	SYS_SEMOP                  = 5063
+	SYS_SEMCTL                 = 5064
+	SYS_SHMDT                  = 5065
+	SYS_MSGGET                 = 5066
+	SYS_MSGSND                 = 5067
+	SYS_MSGRCV                 = 5068
+	SYS_MSGCTL                 = 5069
+	SYS_FCNTL                  = 5070
+	SYS_FLOCK                  = 5071
+	SYS_FSYNC                  = 5072
+	SYS_FDATASYNC              = 5073
+	SYS_TRUNCATE               = 5074
+	SYS_FTRUNCATE              = 5075
+	SYS_GETDENTS               = 5076
+	SYS_GETCWD                 = 5077
+	SYS_CHDIR                  = 5078
+	SYS_FCHDIR                 = 5079
+	SYS_RENAME                 = 5080
+	SYS_MKDIR                  = 5081
+	SYS_RMDIR                  = 5082
+	SYS_CREAT                  = 5083
+	SYS_LINK                   = 5084
+	SYS_UNLINK                 = 5085
+	SYS_SYMLINK                = 5086
+	SYS_READLINK               = 5087
+	SYS_CHMOD                  = 5088
+	SYS_FCHMOD                 = 5089
+	SYS_CHOWN                  = 5090
+	SYS_FCHOWN                 = 5091
+	SYS_LCHOWN                 = 5092
+	SYS_UMASK                  = 5093
+	SYS_GETTIMEOFDAY           = 5094
+	SYS_GETRLIMIT              = 5095
+	SYS_GETRUSAGE              = 5096
+	SYS_SYSINFO                = 5097
+	SYS_TIMES                  = 5098
+	SYS_PTRACE                 = 5099
+	SYS_GETUID                 = 5100
+	SYS_SYSLOG                 = 5101
+	SYS_GETGID                 = 5102
+	SYS_SETUID                 = 5103
+	SYS_SETGID                 = 5104
+	SYS_GETEUID                = 5105
+	SYS_GETEGID                = 5106
+	SYS_SETPGID                = 5107
+	SYS_GETPPID                = 5108
+	SYS_GETPGRP                = 5109
+	SYS_SETSID                 = 5110
+	SYS_SETREUID               = 5111
+	SYS_SETREGID               = 5112
+	SYS_GETGROUPS              = 5113
+	SYS_SETGROUPS              = 5114
+	SYS_SETRESUID              = 5115
+	SYS_GETRESUID              = 5116
+	SYS_SETRESGID              = 5117
+	SYS_GETRESGID              = 5118
+	SYS_GETPGID                = 5119
+	SYS_SETFSUID               = 5120
+	SYS_SETFSGID               = 5121
+	SYS_GETSID                 = 5122
+	SYS_CAPGET                 = 5123
+	SYS_CAPSET                 = 5124
+	SYS_RT_SIGPENDING          = 5125
+	SYS_RT_SIGTIMEDWAIT        = 5126
+	SYS_RT_SIGQUEUEINFO        = 5127
+	SYS_RT_SIGSUSPEND          = 5128
+	SYS_SIGALTSTACK            = 5129
+	SYS_UTIME                  = 5130
+	SYS_MKNOD                  = 5131
+	SYS_PERSONALITY            = 5132
+	SYS_USTAT                  = 5133
+	SYS_STATFS                 = 5134
+	SYS_FSTATFS                = 5135
+	SYS_SYSFS                  = 5136
+	SYS_GETPRIORITY            = 5137
+	SYS_SETPRIORITY            = 5138
+	SYS_SCHED_SETPARAM         = 5139
+	SYS_SCHED_GETPARAM         = 5140
+	SYS_SCHED_SETSCHEDULER     = 5141
+	SYS_SCHED_GETSCHEDULER     = 5142
+	SYS_SCHED_GET_PRIORITY_MAX = 5143
+	SYS_SCHED_GET_PRIORITY_MIN = 5144
+	SYS_SCHED_RR_GET_INTERVAL  = 5145
+	SYS_MLOCK                  = 5146
+	SYS_MUNLOCK                = 5147
+	SYS_MLOCKALL               = 5148
+	SYS_MUNLOCKALL             = 5149
+	SYS_VHANGUP                = 5150
+	SYS_PIVOT_ROOT             = 5151
+	SYS__SYSCTL                = 5152
+	SYS_PRCTL                  = 5153
+	SYS_ADJTIMEX               = 5154
+	SYS_SETRLIMIT              = 5155
+	SYS_CHROOT                 = 5156
+	SYS_SYNC                   = 5157
+	SYS_ACCT                   = 5158
+	SYS_SETTIMEOFDAY           = 5159
+	SYS_MOUNT                  = 5160
+	SYS_UMOUNT2                = 5161
+	SYS_SWAPON                 = 5162
+	SYS_SWAPOFF                = 5163
+	SYS_REBOOT                 = 5164
+	SYS_SETHOSTNAME            = 5165
+	SYS_SETDOMAINNAME          = 5166
+	SYS_CREATE_MODULE          = 5167
+	SYS_INIT_MODULE            = 5168
+	SYS_DELETE_MODULE          = 5169
+	SYS_GET_KERNEL_SYMS        = 5170
+	SYS_QUERY_MODULE           = 5171
+	SYS_QUOTACTL               = 5172
+	SYS_NFSSERVCTL             = 5173
+	SYS_GETPMSG                = 5174
+	SYS_PUTPMSG                = 5175
+	SYS_AFS_SYSCALL            = 5176
+	SYS_RESERVED177            = 5177
+	SYS_GETTID                 = 5178
+	SYS_READAHEAD              = 5179
+	SYS_SETXATTR               = 5180
+	SYS_LSETXATTR              = 5181
+	SYS_FSETXATTR              = 5182
+	SYS_GETXATTR               = 5183
+	SYS_LGETXATTR              = 5184
+	SYS_FGETXATTR              = 5185
+	SYS_LISTXATTR              = 5186
+	SYS_LLISTXATTR             = 5187
+	SYS_FLISTXATTR             = 5188
+	SYS_REMOVEXATTR            = 5189
+	SYS_LREMOVEXATTR           = 5190
+	SYS_FREMOVEXATTR           = 5191
+	SYS_TKILL                  = 5192
+	SYS_RESERVED193            = 5193
+	SYS_FUTEX                  = 5194
+	SYS_SCHED_SETAFFINITY      = 5195
+	SYS_SCHED_GETAFFINITY      = 5196
+	SYS_CACHEFLUSH             = 5197
+	SYS_CACHECTL               = 5198
+	SYS_SYSMIPS                = 5199
+	SYS_IO_SETUP               = 5200
+	SYS_IO_DESTROY             = 5201
+	SYS_IO_GETEVENTS           = 5202
+	SYS_IO_SUBMIT              = 5203
+	SYS_IO_CANCEL              = 5204
+	SYS_EXIT_GROUP             = 5205
+	SYS_LOOKUP_DCOOKIE         = 5206
+	SYS_EPOLL_CREATE           = 5207
+	SYS_EPOLL_CTL              = 5208
+	SYS_EPOLL_WAIT             = 5209
+	SYS_REMAP_FILE_PAGES       = 5210
+	SYS_RT_SIGRETURN           = 5211
+	SYS_SET_TID_ADDRESS        = 5212
+	SYS_RESTART_SYSCALL        = 5213
+	SYS_SEMTIMEDOP             = 5214
+	SYS_FADVISE64              = 5215
+	SYS_TIMER_CREATE           = 5216
+	SYS_TIMER_SETTIME          = 5217
+	SYS_TIMER_GETTIME          = 5218
+	SYS_TIMER_GETOVERRUN       = 5219
+	SYS_TIMER_DELETE           = 5220
+	SYS_CLOCK_SETTIME          = 5221
+	SYS_CLOCK_GETTIME          = 5222
+	SYS_CLOCK_GETRES           = 5223
+	SYS_CLOCK_NANOSLEEP        = 5224
+	SYS_TGKILL                 = 5225
+	SYS_UTIMES                 = 5226
+	SYS_MBIND                  = 5227
+	SYS_GET_MEMPOLICY          = 5228
+	SYS_SET_MEMPOLICY          = 5229
+	SYS_MQ_OPEN                = 5230
+	SYS_MQ_UNLINK              = 5231
+	SYS_MQ_TIMEDSEND           = 5232
+	SYS_MQ_TIMEDRECEIVE        = 5233
+	SYS_MQ_NOTIFY              = 5234
+	SYS_MQ_GETSETATTR          = 5235
+	SYS_VSERVER                = 5236
+	SYS_WAITID                 = 5237
+	SYS_ADD_KEY                = 5239
+	SYS_REQUEST_KEY            = 5240
+	SYS_KEYCTL                 = 5241
+	SYS_SET_THREAD_AREA        = 5242
+	SYS_INOTIFY_INIT           = 5243
+	SYS_INOTIFY_ADD_WATCH      = 5244
+	SYS_INOTIFY_RM_WATCH       = 5245
+	SYS_MIGRATE_PAGES          = 5246
+	SYS_OPENAT                 = 5247
+	SYS_MKDIRAT                = 5248
+	SYS_MKNODAT                = 5249
+	SYS_FCHOWNAT               = 5250
+	SYS_FUTIMESAT              = 5251
+	SYS_NEWFSTATAT             = 5252
+	SYS_UNLINKAT               = 5253
+	SYS_RENAMEAT               = 5254
+	SYS_LINKAT                 = 5255
+	SYS_SYMLINKAT              = 5256
+	SYS_READLINKAT             = 5257
+	SYS_FCHMODAT               = 5258
+	SYS_FACCESSAT              = 5259
+	SYS_PSELECT6               = 5260
+	SYS_PPOLL                  = 5261
+	SYS_UNSHARE                = 5262
+	SYS_SPLICE                 = 5263
+	SYS_SYNC_FILE_RANGE        = 5264
+	SYS_TEE                    = 5265
+	SYS_VMSPLICE               = 5266
+	SYS_MOVE_PAGES             = 5267
+	SYS_SET_ROBUST_LIST        = 5268
+	SYS_GET_ROBUST_LIST        = 5269
+	SYS_KEXEC_LOAD             = 5270
+	SYS_GETCPU                 = 5271
+	SYS_EPOLL_PWAIT            = 5272
+	SYS_IOPRIO_SET             = 5273
+	SYS_IOPRIO_GET             = 5274
+	SYS_UTIMENSAT              = 5275
+	SYS_SIGNALFD               = 5276
+	SYS_TIMERFD                = 5277
+	SYS_EVENTFD                = 5278
+	SYS_FALLOCATE              = 5279
+	SYS_TIMERFD_CREATE         = 5280
+	SYS_TIMERFD_GETTIME        = 5281
+	SYS_TIMERFD_SETTIME        = 5282
+	SYS_SIGNALFD4              = 5283
+	SYS_EVENTFD2               = 5284
+	SYS_EPOLL_CREATE1          = 5285
+	SYS_DUP3                   = 5286
+	SYS_PIPE2                  = 5287
+	SYS_INOTIFY_INIT1          = 5288
+	SYS_PREADV                 = 5289
+	SYS_PWRITEV                = 5290
+	SYS_RT_TGSIGQUEUEINFO      = 5291
+	SYS_PERF_EVENT_OPEN        = 5292
+	SYS_ACCEPT4                = 5293
+	SYS_RECVMMSG               = 5294
+	SYS_FANOTIFY_INIT          = 5295
+	SYS_FANOTIFY_MARK          = 5296
+	SYS_PRLIMIT64              = 5297
+	SYS_NAME_TO_HANDLE_AT      = 5298
+	SYS_OPEN_BY_HANDLE_AT      = 5299
+	SYS_CLOCK_ADJTIME          = 5300
+	SYS_SYNCFS                 = 5301
+	SYS_SENDMMSG               = 5302
+	SYS_SETNS                  = 5303
+	SYS_PROCESS_VM_READV       = 5304
+	SYS_PROCESS_VM_WRITEV      = 5305
+	SYS_KCMP                   = 5306
+	SYS_FINIT_MODULE           = 5307
+	SYS_GETDENTS64             = 5308
+	SYS_SCHED_SETATTR          = 5309
+	SYS_SCHED_GETATTR          = 5310
+	SYS_RENAMEAT2              = 5311
+	SYS_SECCOMP                = 5312
+	SYS_GETRANDOM              = 5313
+	SYS_MEMFD_CREATE           = 5314
+	SYS_BPF                    = 5315
+	SYS_EXECVEAT               = 5316
+	SYS_USERFAULTFD            = 5317
+	SYS_MEMBARRIER             = 5318
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
new file mode 100644
index 0000000000..d192b940ce
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
@@ -0,0 +1,327 @@
+// mksysnum_linux.pl /usr/include/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build mips64le,linux
+
+package unix
+
+const (
+	SYS_READ                   = 5000
+	SYS_WRITE                  = 5001
+	SYS_OPEN                   = 5002
+	SYS_CLOSE                  = 5003
+	SYS_STAT                   = 5004
+	SYS_FSTAT                  = 5005
+	SYS_LSTAT                  = 5006
+	SYS_POLL                   = 5007
+	SYS_LSEEK                  = 5008
+	SYS_MMAP                   = 5009
+	SYS_MPROTECT               = 5010
+	SYS_MUNMAP                 = 5011
+	SYS_BRK                    = 5012
+	SYS_RT_SIGACTION           = 5013
+	SYS_RT_SIGPROCMASK         = 5014
+	SYS_IOCTL                  = 5015
+	SYS_PREAD64                = 5016
+	SYS_PWRITE64               = 5017
+	SYS_READV                  = 5018
+	SYS_WRITEV                 = 5019
+	SYS_ACCESS                 = 5020
+	SYS_PIPE                   = 5021
+	SYS__NEWSELECT             = 5022
+	SYS_SCHED_YIELD            = 5023
+	SYS_MREMAP                 = 5024
+	SYS_MSYNC                  = 5025
+	SYS_MINCORE                = 5026
+	SYS_MADVISE                = 5027
+	SYS_SHMGET                 = 5028
+	SYS_SHMAT                  = 5029
+	SYS_SHMCTL                 = 5030
+	SYS_DUP                    = 5031
+	SYS_DUP2                   = 5032
+	SYS_PAUSE                  = 5033
+	SYS_NANOSLEEP              = 5034
+	SYS_GETITIMER              = 5035
+	SYS_SETITIMER              = 5036
+	SYS_ALARM                  = 5037
+	SYS_GETPID                 = 5038
+	SYS_SENDFILE               = 5039
+	SYS_SOCKET                 = 5040
+	SYS_CONNECT                = 5041
+	SYS_ACCEPT                 = 5042
+	SYS_SENDTO                 = 5043
+	SYS_RECVFROM               = 5044
+	SYS_SENDMSG                = 5045
+	SYS_RECVMSG                = 5046
+	SYS_SHUTDOWN               = 5047
+	SYS_BIND                   = 5048
+	SYS_LISTEN                 = 5049
+	SYS_GETSOCKNAME            = 5050
+	SYS_GETPEERNAME            = 5051
+	SYS_SOCKETPAIR             = 5052
+	SYS_SETSOCKOPT             = 5053
+	SYS_GETSOCKOPT             = 5054
+	SYS_CLONE                  = 5055
+	SYS_FORK                   = 5056
+	SYS_EXECVE                 = 5057
+	SYS_EXIT                   = 5058
+	SYS_WAIT4                  = 5059
+	SYS_KILL                   = 5060
+	SYS_UNAME                  = 5061
+	SYS_SEMGET                 = 5062
+	SYS_SEMOP                  = 5063
+	SYS_SEMCTL                 = 5064
+	SYS_SHMDT                  = 5065
+	SYS_MSGGET                 = 5066
+	SYS_MSGSND                 = 5067
+	SYS_MSGRCV                 = 5068
+	SYS_MSGCTL                 = 5069
+	SYS_FCNTL                  = 5070
+	SYS_FLOCK                  = 5071
+	SYS_FSYNC                  = 5072
+	SYS_FDATASYNC              = 5073
+	SYS_TRUNCATE               = 5074
+	SYS_FTRUNCATE              = 5075
+	SYS_GETDENTS               = 5076
+	SYS_GETCWD                 = 5077
+	SYS_CHDIR                  = 5078
+	SYS_FCHDIR                 = 5079
+	SYS_RENAME                 = 5080
+	SYS_MKDIR                  = 5081
+	SYS_RMDIR                  = 5082
+	SYS_CREAT                  = 5083
+	SYS_LINK                   = 5084
+	SYS_UNLINK                 = 5085
+	SYS_SYMLINK                = 5086
+	SYS_READLINK               = 5087
+	SYS_CHMOD                  = 5088
+	SYS_FCHMOD                 = 5089
+	SYS_CHOWN                  = 5090
+	SYS_FCHOWN                 = 5091
+	SYS_LCHOWN                 = 5092
+	SYS_UMASK                  = 5093
+	SYS_GETTIMEOFDAY           = 5094
+	SYS_GETRLIMIT              = 5095
+	SYS_GETRUSAGE              = 5096
+	SYS_SYSINFO                = 5097
+	SYS_TIMES                  = 5098
+	SYS_PTRACE                 = 5099
+	SYS_GETUID                 = 5100
+	SYS_SYSLOG                 = 5101
+	SYS_GETGID                 = 5102
+	SYS_SETUID                 = 5103
+	SYS_SETGID                 = 5104
+	SYS_GETEUID                = 5105
+	SYS_GETEGID                = 5106
+	SYS_SETPGID                = 5107
+	SYS_GETPPID                = 5108
+	SYS_GETPGRP                = 5109
+	SYS_SETSID                 = 5110
+	SYS_SETREUID               = 5111
+	SYS_SETREGID               = 5112
+	SYS_GETGROUPS              = 5113
+	SYS_SETGROUPS              = 5114
+	SYS_SETRESUID              = 5115
+	SYS_GETRESUID              = 5116
+	SYS_SETRESGID              = 5117
+	SYS_GETRESGID              = 5118
+	SYS_GETPGID                = 5119
+	SYS_SETFSUID               = 5120
+	SYS_SETFSGID               = 5121
+	SYS_GETSID                 = 5122
+	SYS_CAPGET                 = 5123
+	SYS_CAPSET                 = 5124
+	SYS_RT_SIGPENDING          = 5125
+	SYS_RT_SIGTIMEDWAIT        = 5126
+	SYS_RT_SIGQUEUEINFO        = 5127
+	SYS_RT_SIGSUSPEND          = 5128
+	SYS_SIGALTSTACK            = 5129
+	SYS_UTIME                  = 5130
+	SYS_MKNOD                  = 5131
+	SYS_PERSONALITY            = 5132
+	SYS_USTAT                  = 5133
+	SYS_STATFS                 = 5134
+	SYS_FSTATFS                = 5135
+	SYS_SYSFS                  = 5136
+	SYS_GETPRIORITY            = 5137
+	SYS_SETPRIORITY            = 5138
+	SYS_SCHED_SETPARAM         = 5139
+	SYS_SCHED_GETPARAM         = 5140
+	SYS_SCHED_SETSCHEDULER     = 5141
+	SYS_SCHED_GETSCHEDULER     = 5142
+	SYS_SCHED_GET_PRIORITY_MAX = 5143
+	SYS_SCHED_GET_PRIORITY_MIN = 5144
+	SYS_SCHED_RR_GET_INTERVAL  = 5145
+	SYS_MLOCK                  = 5146
+	SYS_MUNLOCK                = 5147
+	SYS_MLOCKALL               = 5148
+	SYS_MUNLOCKALL             = 5149
+	SYS_VHANGUP                = 5150
+	SYS_PIVOT_ROOT             = 5151
+	SYS__SYSCTL                = 5152
+	SYS_PRCTL                  = 5153
+	SYS_ADJTIMEX               = 5154
+	SYS_SETRLIMIT              = 5155
+	SYS_CHROOT                 = 5156
+	SYS_SYNC                   = 5157
+	SYS_ACCT                   = 5158
+	SYS_SETTIMEOFDAY           = 5159
+	SYS_MOUNT                  = 5160
+	SYS_UMOUNT2                = 5161
+	SYS_SWAPON                 = 5162
+	SYS_SWAPOFF                = 5163
+	SYS_REBOOT                 = 5164
+	SYS_SETHOSTNAME            = 5165
+	SYS_SETDOMAINNAME          = 5166
+	SYS_CREATE_MODULE          = 5167
+	SYS_INIT_MODULE            = 5168
+	SYS_DELETE_MODULE          = 5169
+	SYS_GET_KERNEL_SYMS        = 5170
+	SYS_QUERY_MODULE           = 5171
+	SYS_QUOTACTL               = 5172
+	SYS_NFSSERVCTL             = 5173
+	SYS_GETPMSG                = 5174
+	SYS_PUTPMSG                = 5175
+	SYS_AFS_SYSCALL            = 5176
+	SYS_RESERVED177            = 5177
+	SYS_GETTID                 = 5178
+	SYS_READAHEAD              = 5179
+	SYS_SETXATTR               = 5180
+	SYS_LSETXATTR              = 5181
+	SYS_FSETXATTR              = 5182
+	SYS_GETXATTR               = 5183
+	SYS_LGETXATTR              = 5184
+	SYS_FGETXATTR              = 5185
+	SYS_LISTXATTR              = 5186
+	SYS_LLISTXATTR             = 5187
+	SYS_FLISTXATTR             = 5188
+	SYS_REMOVEXATTR            = 5189
+	SYS_LREMOVEXATTR           = 5190
+	SYS_FREMOVEXATTR           = 5191
+	SYS_TKILL                  = 5192
+	SYS_RESERVED193            = 5193
+	SYS_FUTEX                  = 5194
+	SYS_SCHED_SETAFFINITY      = 5195
+	SYS_SCHED_GETAFFINITY      = 5196
+	SYS_CACHEFLUSH             = 5197
+	SYS_CACHECTL               = 5198
+	SYS_SYSMIPS                = 5199
+	SYS_IO_SETUP               = 5200
+	SYS_IO_DESTROY             = 5201
+	SYS_IO_GETEVENTS           = 5202
+	SYS_IO_SUBMIT              = 5203
+	SYS_IO_CANCEL              = 5204
+	SYS_EXIT_GROUP             = 5205
+	SYS_LOOKUP_DCOOKIE         = 5206
+	SYS_EPOLL_CREATE           = 5207
+	SYS_EPOLL_CTL              = 5208
+	SYS_EPOLL_WAIT             = 5209
+	SYS_REMAP_FILE_PAGES       = 5210
+	SYS_RT_SIGRETURN           = 5211
+	SYS_SET_TID_ADDRESS        = 5212
+	SYS_RESTART_SYSCALL        = 5213
+	SYS_SEMTIMEDOP             = 5214
+	SYS_FADVISE64              = 5215
+	SYS_TIMER_CREATE           = 5216
+	SYS_TIMER_SETTIME          = 5217
+	SYS_TIMER_GETTIME          = 5218
+	SYS_TIMER_GETOVERRUN       = 5219
+	SYS_TIMER_DELETE           = 5220
+	SYS_CLOCK_SETTIME          = 5221
+	SYS_CLOCK_GETTIME          = 5222
+	SYS_CLOCK_GETRES           = 5223
+	SYS_CLOCK_NANOSLEEP        = 5224
+	SYS_TGKILL                 = 5225
+	SYS_UTIMES                 = 5226
+	SYS_MBIND                  = 5227
+	SYS_GET_MEMPOLICY          = 5228
+	SYS_SET_MEMPOLICY          = 5229
+	SYS_MQ_OPEN                = 5230
+	SYS_MQ_UNLINK              = 5231
+	SYS_MQ_TIMEDSEND           = 5232
+	SYS_MQ_TIMEDRECEIVE        = 5233
+	SYS_MQ_NOTIFY              = 5234
+	SYS_MQ_GETSETATTR          = 5235
+	SYS_VSERVER                = 5236
+	SYS_WAITID                 = 5237
+	SYS_ADD_KEY                = 5239
+	SYS_REQUEST_KEY            = 5240
+	SYS_KEYCTL                 = 5241
+	SYS_SET_THREAD_AREA        = 5242
+	SYS_INOTIFY_INIT           = 5243
+	SYS_INOTIFY_ADD_WATCH      = 5244
+	SYS_INOTIFY_RM_WATCH       = 5245
+	SYS_MIGRATE_PAGES          = 5246
+	SYS_OPENAT                 = 5247
+	SYS_MKDIRAT                = 5248
+	SYS_MKNODAT                = 5249
+	SYS_FCHOWNAT               = 5250
+	SYS_FUTIMESAT              = 5251
+	SYS_NEWFSTATAT             = 5252
+	SYS_UNLINKAT               = 5253
+	SYS_RENAMEAT               = 5254
+	SYS_LINKAT                 = 5255
+	SYS_SYMLINKAT              = 5256
+	SYS_READLINKAT             = 5257
+	SYS_FCHMODAT               = 5258
+	SYS_FACCESSAT              = 5259
+	SYS_PSELECT6               = 5260
+	SYS_PPOLL                  = 5261
+	SYS_UNSHARE                = 5262
+	SYS_SPLICE                 = 5263
+	SYS_SYNC_FILE_RANGE        = 5264
+	SYS_TEE                    = 5265
+	SYS_VMSPLICE               = 5266
+	SYS_MOVE_PAGES             = 5267
+	SYS_SET_ROBUST_LIST        = 5268
+	SYS_GET_ROBUST_LIST        = 5269
+	SYS_KEXEC_LOAD             = 5270
+	SYS_GETCPU                 = 5271
+	SYS_EPOLL_PWAIT            = 5272
+	SYS_IOPRIO_SET             = 5273
+	SYS_IOPRIO_GET             = 5274
+	SYS_UTIMENSAT              = 5275
+	SYS_SIGNALFD               = 5276
+	SYS_TIMERFD                = 5277
+	SYS_EVENTFD                = 5278
+	SYS_FALLOCATE              = 5279
+	SYS_TIMERFD_CREATE         = 5280
+	SYS_TIMERFD_GETTIME        = 5281
+	SYS_TIMERFD_SETTIME        = 5282
+	SYS_SIGNALFD4              = 5283
+	SYS_EVENTFD2               = 5284
+	SYS_EPOLL_CREATE1          = 5285
+	SYS_DUP3                   = 5286
+	SYS_PIPE2                  = 5287
+	SYS_INOTIFY_INIT1          = 5288
+	SYS_PREADV                 = 5289
+	SYS_PWRITEV                = 5290
+	SYS_RT_TGSIGQUEUEINFO      = 5291
+	SYS_PERF_EVENT_OPEN        = 5292
+	SYS_ACCEPT4                = 5293
+	SYS_RECVMMSG               = 5294
+	SYS_FANOTIFY_INIT          = 5295
+	SYS_FANOTIFY_MARK          = 5296
+	SYS_PRLIMIT64              = 5297
+	SYS_NAME_TO_HANDLE_AT      = 5298
+	SYS_OPEN_BY_HANDLE_AT      = 5299
+	SYS_CLOCK_ADJTIME          = 5300
+	SYS_SYNCFS                 = 5301
+	SYS_SENDMMSG               = 5302
+	SYS_SETNS                  = 5303
+	SYS_PROCESS_VM_READV       = 5304
+	SYS_PROCESS_VM_WRITEV      = 5305
+	SYS_KCMP                   = 5306
+	SYS_FINIT_MODULE           = 5307
+	SYS_GETDENTS64             = 5308
+	SYS_SCHED_SETATTR          = 5309
+	SYS_SCHED_GETATTR          = 5310
+	SYS_RENAMEAT2              = 5311
+	SYS_SECCOMP                = 5312
+	SYS_GETRANDOM              = 5313
+	SYS_MEMFD_CREATE           = 5314
+	SYS_BPF                    = 5315
+	SYS_EXECVEAT               = 5316
+	SYS_USERFAULTFD            = 5317
+	SYS_MEMBARRIER             = 5318
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
new file mode 100644
index 0000000000..e1b08f00d3
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
@@ -0,0 +1,360 @@
+// mksysnum_linux.pl /usr/include/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build ppc64,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAITPID                = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BREAK                  = 17
+	SYS_OLDSTAT                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_OLDFSTAT               = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_STTY                   = 31
+	SYS_GTTY                   = 32
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_FTIME                  = 35
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_PROF                   = 44
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_LOCK                   = 53
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_MPX                    = 56
+	SYS_SETPGID                = 57
+	SYS_ULIMIT                 = 58
+	SYS_OLDOLDUNAME            = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SGETMASK               = 68
+	SYS_SSETMASK               = 69
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_OLDLSTAT               = 84
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_PROFIL                 = 98
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_IOPERM                 = 101
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_OLDUNAME               = 109
+	SYS_IOPL                   = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_VM86                   = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_MODIFY_LDT             = 123
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_QUERY_MODULE           = 166
+	SYS_POLL                   = 167
+	SYS_NFSSERVCTL             = 168
+	SYS_SETRESGID              = 169
+	SYS_GETRESGID              = 170
+	SYS_PRCTL                  = 171
+	SYS_RT_SIGRETURN           = 172
+	SYS_RT_SIGACTION           = 173
+	SYS_RT_SIGPROCMASK         = 174
+	SYS_RT_SIGPENDING          = 175
+	SYS_RT_SIGTIMEDWAIT        = 176
+	SYS_RT_SIGQUEUEINFO        = 177
+	SYS_RT_SIGSUSPEND          = 178
+	SYS_PREAD64                = 179
+	SYS_PWRITE64               = 180
+	SYS_CHOWN                  = 181
+	SYS_GETCWD                 = 182
+	SYS_CAPGET                 = 183
+	SYS_CAPSET                 = 184
+	SYS_SIGALTSTACK            = 185
+	SYS_SENDFILE               = 186
+	SYS_GETPMSG                = 187
+	SYS_PUTPMSG                = 188
+	SYS_VFORK                  = 189
+	SYS_UGETRLIMIT             = 190
+	SYS_READAHEAD              = 191
+	SYS_PCICONFIG_READ         = 198
+	SYS_PCICONFIG_WRITE        = 199
+	SYS_PCICONFIG_IOBASE       = 200
+	SYS_MULTIPLEXER            = 201
+	SYS_GETDENTS64             = 202
+	SYS_PIVOT_ROOT             = 203
+	SYS_MADVISE                = 205
+	SYS_MINCORE                = 206
+	SYS_GETTID                 = 207
+	SYS_TKILL                  = 208
+	SYS_SETXATTR               = 209
+	SYS_LSETXATTR              = 210
+	SYS_FSETXATTR              = 211
+	SYS_GETXATTR               = 212
+	SYS_LGETXATTR              = 213
+	SYS_FGETXATTR              = 214
+	SYS_LISTXATTR              = 215
+	SYS_LLISTXATTR             = 216
+	SYS_FLISTXATTR             = 217
+	SYS_REMOVEXATTR            = 218
+	SYS_LREMOVEXATTR           = 219
+	SYS_FREMOVEXATTR           = 220
+	SYS_FUTEX                  = 221
+	SYS_SCHED_SETAFFINITY      = 222
+	SYS_SCHED_GETAFFINITY      = 223
+	SYS_TUXCALL                = 225
+	SYS_IO_SETUP               = 227
+	SYS_IO_DESTROY             = 228
+	SYS_IO_GETEVENTS           = 229
+	SYS_IO_SUBMIT              = 230
+	SYS_IO_CANCEL              = 231
+	SYS_SET_TID_ADDRESS        = 232
+	SYS_FADVISE64              = 233
+	SYS_EXIT_GROUP             = 234
+	SYS_LOOKUP_DCOOKIE         = 235
+	SYS_EPOLL_CREATE           = 236
+	SYS_EPOLL_CTL              = 237
+	SYS_EPOLL_WAIT             = 238
+	SYS_REMAP_FILE_PAGES       = 239
+	SYS_TIMER_CREATE           = 240
+	SYS_TIMER_SETTIME          = 241
+	SYS_TIMER_GETTIME          = 242
+	SYS_TIMER_GETOVERRUN       = 243
+	SYS_TIMER_DELETE           = 244
+	SYS_CLOCK_SETTIME          = 245
+	SYS_CLOCK_GETTIME          = 246
+	SYS_CLOCK_GETRES           = 247
+	SYS_CLOCK_NANOSLEEP        = 248
+	SYS_SWAPCONTEXT            = 249
+	SYS_TGKILL                 = 250
+	SYS_UTIMES                 = 251
+	SYS_STATFS64               = 252
+	SYS_FSTATFS64              = 253
+	SYS_RTAS                   = 255
+	SYS_SYS_DEBUG_SETCONTEXT   = 256
+	SYS_MIGRATE_PAGES          = 258
+	SYS_MBIND                  = 259
+	SYS_GET_MEMPOLICY          = 260
+	SYS_SET_MEMPOLICY          = 261
+	SYS_MQ_OPEN                = 262
+	SYS_MQ_UNLINK              = 263
+	SYS_MQ_TIMEDSEND           = 264
+	SYS_MQ_TIMEDRECEIVE        = 265
+	SYS_MQ_NOTIFY              = 266
+	SYS_MQ_GETSETATTR          = 267
+	SYS_KEXEC_LOAD             = 268
+	SYS_ADD_KEY                = 269
+	SYS_REQUEST_KEY            = 270
+	SYS_KEYCTL                 = 271
+	SYS_WAITID                 = 272
+	SYS_IOPRIO_SET             = 273
+	SYS_IOPRIO_GET             = 274
+	SYS_INOTIFY_INIT           = 275
+	SYS_INOTIFY_ADD_WATCH      = 276
+	SYS_INOTIFY_RM_WATCH       = 277
+	SYS_SPU_RUN                = 278
+	SYS_SPU_CREATE             = 279
+	SYS_PSELECT6               = 280
+	SYS_PPOLL                  = 281
+	SYS_UNSHARE                = 282
+	SYS_SPLICE                 = 283
+	SYS_TEE                    = 284
+	SYS_VMSPLICE               = 285
+	SYS_OPENAT                 = 286
+	SYS_MKDIRAT                = 287
+	SYS_MKNODAT                = 288
+	SYS_FCHOWNAT               = 289
+	SYS_FUTIMESAT              = 290
+	SYS_NEWFSTATAT             = 291
+	SYS_UNLINKAT               = 292
+	SYS_RENAMEAT               = 293
+	SYS_LINKAT                 = 294
+	SYS_SYMLINKAT              = 295
+	SYS_READLINKAT             = 296
+	SYS_FCHMODAT               = 297
+	SYS_FACCESSAT              = 298
+	SYS_GET_ROBUST_LIST        = 299
+	SYS_SET_ROBUST_LIST        = 300
+	SYS_MOVE_PAGES             = 301
+	SYS_GETCPU                 = 302
+	SYS_EPOLL_PWAIT            = 303
+	SYS_UTIMENSAT              = 304
+	SYS_SIGNALFD               = 305
+	SYS_TIMERFD_CREATE         = 306
+	SYS_EVENTFD                = 307
+	SYS_SYNC_FILE_RANGE2       = 308
+	SYS_FALLOCATE              = 309
+	SYS_SUBPAGE_PROT           = 310
+	SYS_TIMERFD_SETTIME        = 311
+	SYS_TIMERFD_GETTIME        = 312
+	SYS_SIGNALFD4              = 313
+	SYS_EVENTFD2               = 314
+	SYS_EPOLL_CREATE1          = 315
+	SYS_DUP3                   = 316
+	SYS_PIPE2                  = 317
+	SYS_INOTIFY_INIT1          = 318
+	SYS_PERF_EVENT_OPEN        = 319
+	SYS_PREADV                 = 320
+	SYS_PWRITEV                = 321
+	SYS_RT_TGSIGQUEUEINFO      = 322
+	SYS_FANOTIFY_INIT          = 323
+	SYS_FANOTIFY_MARK          = 324
+	SYS_PRLIMIT64              = 325
+	SYS_SOCKET                 = 326
+	SYS_BIND                   = 327
+	SYS_CONNECT                = 328
+	SYS_LISTEN                 = 329
+	SYS_ACCEPT                 = 330
+	SYS_GETSOCKNAME            = 331
+	SYS_GETPEERNAME            = 332
+	SYS_SOCKETPAIR             = 333
+	SYS_SEND                   = 334
+	SYS_SENDTO                 = 335
+	SYS_RECV                   = 336
+	SYS_RECVFROM               = 337
+	SYS_SHUTDOWN               = 338
+	SYS_SETSOCKOPT             = 339
+	SYS_GETSOCKOPT             = 340
+	SYS_SENDMSG                = 341
+	SYS_RECVMSG                = 342
+	SYS_RECVMMSG               = 343
+	SYS_ACCEPT4                = 344
+	SYS_NAME_TO_HANDLE_AT      = 345
+	SYS_OPEN_BY_HANDLE_AT      = 346
+	SYS_CLOCK_ADJTIME          = 347
+	SYS_SYNCFS                 = 348
+	SYS_SENDMMSG               = 349
+	SYS_SETNS                  = 350
+	SYS_PROCESS_VM_READV       = 351
+	SYS_PROCESS_VM_WRITEV      = 352
+	SYS_FINIT_MODULE           = 353
+	SYS_KCMP                   = 354
+	SYS_SCHED_SETATTR          = 355
+	SYS_SCHED_GETATTR          = 356
+	SYS_RENAMEAT2              = 357
+	SYS_SECCOMP                = 358
+	SYS_GETRANDOM              = 359
+	SYS_MEMFD_CREATE           = 360
+	SYS_BPF                    = 361
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
new file mode 100644
index 0000000000..45e63f51a4
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
@@ -0,0 +1,353 @@
+// mksysnum_linux.pl /usr/include/powerpc64le-linux-gnu/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build ppc64le,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAITPID                = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BREAK                  = 17
+	SYS_OLDSTAT                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_OLDFSTAT               = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_STTY                   = 31
+	SYS_GTTY                   = 32
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_FTIME                  = 35
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_PROF                   = 44
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_LOCK                   = 53
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_MPX                    = 56
+	SYS_SETPGID                = 57
+	SYS_ULIMIT                 = 58
+	SYS_OLDOLDUNAME            = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SGETMASK               = 68
+	SYS_SSETMASK               = 69
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_OLDLSTAT               = 84
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_PROFIL                 = 98
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_IOPERM                 = 101
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_OLDUNAME               = 109
+	SYS_IOPL                   = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_VM86                   = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_MODIFY_LDT             = 123
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_QUERY_MODULE           = 166
+	SYS_POLL                   = 167
+	SYS_NFSSERVCTL             = 168
+	SYS_SETRESGID              = 169
+	SYS_GETRESGID              = 170
+	SYS_PRCTL                  = 171
+	SYS_RT_SIGRETURN           = 172
+	SYS_RT_SIGACTION           = 173
+	SYS_RT_SIGPROCMASK         = 174
+	SYS_RT_SIGPENDING          = 175
+	SYS_RT_SIGTIMEDWAIT        = 176
+	SYS_RT_SIGQUEUEINFO        = 177
+	SYS_RT_SIGSUSPEND          = 178
+	SYS_PREAD64                = 179
+	SYS_PWRITE64               = 180
+	SYS_CHOWN                  = 181
+	SYS_GETCWD                 = 182
+	SYS_CAPGET                 = 183
+	SYS_CAPSET                 = 184
+	SYS_SIGALTSTACK            = 185
+	SYS_SENDFILE               = 186
+	SYS_GETPMSG                = 187
+	SYS_PUTPMSG                = 188
+	SYS_VFORK                  = 189
+	SYS_UGETRLIMIT             = 190
+	SYS_READAHEAD              = 191
+	SYS_PCICONFIG_READ         = 198
+	SYS_PCICONFIG_WRITE        = 199
+	SYS_PCICONFIG_IOBASE       = 200
+	SYS_MULTIPLEXER            = 201
+	SYS_GETDENTS64             = 202
+	SYS_PIVOT_ROOT             = 203
+	SYS_MADVISE                = 205
+	SYS_MINCORE                = 206
+	SYS_GETTID                 = 207
+	SYS_TKILL                  = 208
+	SYS_SETXATTR               = 209
+	SYS_LSETXATTR              = 210
+	SYS_FSETXATTR              = 211
+	SYS_GETXATTR               = 212
+	SYS_LGETXATTR              = 213
+	SYS_FGETXATTR              = 214
+	SYS_LISTXATTR              = 215
+	SYS_LLISTXATTR             = 216
+	SYS_FLISTXATTR             = 217
+	SYS_REMOVEXATTR            = 218
+	SYS_LREMOVEXATTR           = 219
+	SYS_FREMOVEXATTR           = 220
+	SYS_FUTEX                  = 221
+	SYS_SCHED_SETAFFINITY      = 222
+	SYS_SCHED_GETAFFINITY      = 223
+	SYS_TUXCALL                = 225
+	SYS_IO_SETUP               = 227
+	SYS_IO_DESTROY             = 228
+	SYS_IO_GETEVENTS           = 229
+	SYS_IO_SUBMIT              = 230
+	SYS_IO_CANCEL              = 231
+	SYS_SET_TID_ADDRESS        = 232
+	SYS_FADVISE64              = 233
+	SYS_EXIT_GROUP             = 234
+	SYS_LOOKUP_DCOOKIE         = 235
+	SYS_EPOLL_CREATE           = 236
+	SYS_EPOLL_CTL              = 237
+	SYS_EPOLL_WAIT             = 238
+	SYS_REMAP_FILE_PAGES       = 239
+	SYS_TIMER_CREATE           = 240
+	SYS_TIMER_SETTIME          = 241
+	SYS_TIMER_GETTIME          = 242
+	SYS_TIMER_GETOVERRUN       = 243
+	SYS_TIMER_DELETE           = 244
+	SYS_CLOCK_SETTIME          = 245
+	SYS_CLOCK_GETTIME          = 246
+	SYS_CLOCK_GETRES           = 247
+	SYS_CLOCK_NANOSLEEP        = 248
+	SYS_SWAPCONTEXT            = 249
+	SYS_TGKILL                 = 250
+	SYS_UTIMES                 = 251
+	SYS_STATFS64               = 252
+	SYS_FSTATFS64              = 253
+	SYS_RTAS                   = 255
+	SYS_SYS_DEBUG_SETCONTEXT   = 256
+	SYS_MIGRATE_PAGES          = 258
+	SYS_MBIND                  = 259
+	SYS_GET_MEMPOLICY          = 260
+	SYS_SET_MEMPOLICY          = 261
+	SYS_MQ_OPEN                = 262
+	SYS_MQ_UNLINK              = 263
+	SYS_MQ_TIMEDSEND           = 264
+	SYS_MQ_TIMEDRECEIVE        = 265
+	SYS_MQ_NOTIFY              = 266
+	SYS_MQ_GETSETATTR          = 267
+	SYS_KEXEC_LOAD             = 268
+	SYS_ADD_KEY                = 269
+	SYS_REQUEST_KEY            = 270
+	SYS_KEYCTL                 = 271
+	SYS_WAITID                 = 272
+	SYS_IOPRIO_SET             = 273
+	SYS_IOPRIO_GET             = 274
+	SYS_INOTIFY_INIT           = 275
+	SYS_INOTIFY_ADD_WATCH      = 276
+	SYS_INOTIFY_RM_WATCH       = 277
+	SYS_SPU_RUN                = 278
+	SYS_SPU_CREATE             = 279
+	SYS_PSELECT6               = 280
+	SYS_PPOLL                  = 281
+	SYS_UNSHARE                = 282
+	SYS_SPLICE                 = 283
+	SYS_TEE                    = 284
+	SYS_VMSPLICE               = 285
+	SYS_OPENAT                 = 286
+	SYS_MKDIRAT                = 287
+	SYS_MKNODAT                = 288
+	SYS_FCHOWNAT               = 289
+	SYS_FUTIMESAT              = 290
+	SYS_NEWFSTATAT             = 291
+	SYS_UNLINKAT               = 292
+	SYS_RENAMEAT               = 293
+	SYS_LINKAT                 = 294
+	SYS_SYMLINKAT              = 295
+	SYS_READLINKAT             = 296
+	SYS_FCHMODAT               = 297
+	SYS_FACCESSAT              = 298
+	SYS_GET_ROBUST_LIST        = 299
+	SYS_SET_ROBUST_LIST        = 300
+	SYS_MOVE_PAGES             = 301
+	SYS_GETCPU                 = 302
+	SYS_EPOLL_PWAIT            = 303
+	SYS_UTIMENSAT              = 304
+	SYS_SIGNALFD               = 305
+	SYS_TIMERFD_CREATE         = 306
+	SYS_EVENTFD                = 307
+	SYS_SYNC_FILE_RANGE2       = 308
+	SYS_FALLOCATE              = 309
+	SYS_SUBPAGE_PROT           = 310
+	SYS_TIMERFD_SETTIME        = 311
+	SYS_TIMERFD_GETTIME        = 312
+	SYS_SIGNALFD4              = 313
+	SYS_EVENTFD2               = 314
+	SYS_EPOLL_CREATE1          = 315
+	SYS_DUP3                   = 316
+	SYS_PIPE2                  = 317
+	SYS_INOTIFY_INIT1          = 318
+	SYS_PERF_EVENT_OPEN        = 319
+	SYS_PREADV                 = 320
+	SYS_PWRITEV                = 321
+	SYS_RT_TGSIGQUEUEINFO      = 322
+	SYS_FANOTIFY_INIT          = 323
+	SYS_FANOTIFY_MARK          = 324
+	SYS_PRLIMIT64              = 325
+	SYS_SOCKET                 = 326
+	SYS_BIND                   = 327
+	SYS_CONNECT                = 328
+	SYS_LISTEN                 = 329
+	SYS_ACCEPT                 = 330
+	SYS_GETSOCKNAME            = 331
+	SYS_GETPEERNAME            = 332
+	SYS_SOCKETPAIR             = 333
+	SYS_SEND                   = 334
+	SYS_SENDTO                 = 335
+	SYS_RECV                   = 336
+	SYS_RECVFROM               = 337
+	SYS_SHUTDOWN               = 338
+	SYS_SETSOCKOPT             = 339
+	SYS_GETSOCKOPT             = 340
+	SYS_SENDMSG                = 341
+	SYS_RECVMSG                = 342
+	SYS_RECVMMSG               = 343
+	SYS_ACCEPT4                = 344
+	SYS_NAME_TO_HANDLE_AT      = 345
+	SYS_OPEN_BY_HANDLE_AT      = 346
+	SYS_CLOCK_ADJTIME          = 347
+	SYS_SYNCFS                 = 348
+	SYS_SENDMMSG               = 349
+	SYS_SETNS                  = 350
+	SYS_PROCESS_VM_READV       = 351
+	SYS_PROCESS_VM_WRITEV      = 352
+	SYS_FINIT_MODULE           = 353
+	SYS_KCMP                   = 354
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_s390x.go
new file mode 100644
index 0000000000..42d4f5cda8
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_s390x.go
@@ -0,0 +1,328 @@
+// mksysnum_linux.pl /usr/include/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build s390x,linux
+
+package unix
+
+const (
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_RESTART_SYSCALL        = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_BRK                    = 45
+	SYS_SIGNAL                 = 48
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_SETPGID                = 57
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_SYMLINK                = 83
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_LOOKUP_DCOOKIE         = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_GETDENTS               = 141
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_QUERY_MODULE           = 167
+	SYS_POLL                   = 168
+	SYS_NFSSERVCTL             = 169
+	SYS_PRCTL                  = 172
+	SYS_RT_SIGRETURN           = 173
+	SYS_RT_SIGACTION           = 174
+	SYS_RT_SIGPROCMASK         = 175
+	SYS_RT_SIGPENDING          = 176
+	SYS_RT_SIGTIMEDWAIT        = 177
+	SYS_RT_SIGQUEUEINFO        = 178
+	SYS_RT_SIGSUSPEND          = 179
+	SYS_PREAD64                = 180
+	SYS_PWRITE64               = 181
+	SYS_GETCWD                 = 183
+	SYS_CAPGET                 = 184
+	SYS_CAPSET                 = 185
+	SYS_SIGALTSTACK            = 186
+	SYS_SENDFILE               = 187
+	SYS_GETPMSG                = 188
+	SYS_PUTPMSG                = 189
+	SYS_VFORK                  = 190
+	SYS_PIVOT_ROOT             = 217
+	SYS_MINCORE                = 218
+	SYS_MADVISE                = 219
+	SYS_GETDENTS64             = 220
+	SYS_READAHEAD              = 222
+	SYS_SETXATTR               = 224
+	SYS_LSETXATTR              = 225
+	SYS_FSETXATTR              = 226
+	SYS_GETXATTR               = 227
+	SYS_LGETXATTR              = 228
+	SYS_FGETXATTR              = 229
+	SYS_LISTXATTR              = 230
+	SYS_LLISTXATTR             = 231
+	SYS_FLISTXATTR             = 232
+	SYS_REMOVEXATTR            = 233
+	SYS_LREMOVEXATTR           = 234
+	SYS_FREMOVEXATTR           = 235
+	SYS_GETTID                 = 236
+	SYS_TKILL                  = 237
+	SYS_FUTEX                  = 238
+	SYS_SCHED_SETAFFINITY      = 239
+	SYS_SCHED_GETAFFINITY      = 240
+	SYS_TGKILL                 = 241
+	SYS_IO_SETUP               = 243
+	SYS_IO_DESTROY             = 244
+	SYS_IO_GETEVENTS           = 245
+	SYS_IO_SUBMIT              = 246
+	SYS_IO_CANCEL              = 247
+	SYS_EXIT_GROUP             = 248
+	SYS_EPOLL_CREATE           = 249
+	SYS_EPOLL_CTL              = 250
+	SYS_EPOLL_WAIT             = 251
+	SYS_SET_TID_ADDRESS        = 252
+	SYS_FADVISE64              = 253
+	SYS_TIMER_CREATE           = 254
+	SYS_TIMER_SETTIME          = 255
+	SYS_TIMER_GETTIME          = 256
+	SYS_TIMER_GETOVERRUN       = 257
+	SYS_TIMER_DELETE           = 258
+	SYS_CLOCK_SETTIME          = 259
+	SYS_CLOCK_GETTIME          = 260
+	SYS_CLOCK_GETRES           = 261
+	SYS_CLOCK_NANOSLEEP        = 262
+	SYS_STATFS64               = 265
+	SYS_FSTATFS64              = 266
+	SYS_REMAP_FILE_PAGES       = 267
+	SYS_MBIND                  = 268
+	SYS_GET_MEMPOLICY          = 269
+	SYS_SET_MEMPOLICY          = 270
+	SYS_MQ_OPEN                = 271
+	SYS_MQ_UNLINK              = 272
+	SYS_MQ_TIMEDSEND           = 273
+	SYS_MQ_TIMEDRECEIVE        = 274
+	SYS_MQ_NOTIFY              = 275
+	SYS_MQ_GETSETATTR          = 276
+	SYS_KEXEC_LOAD             = 277
+	SYS_ADD_KEY                = 278
+	SYS_REQUEST_KEY            = 279
+	SYS_KEYCTL                 = 280
+	SYS_WAITID                 = 281
+	SYS_IOPRIO_SET             = 282
+	SYS_IOPRIO_GET             = 283
+	SYS_INOTIFY_INIT           = 284
+	SYS_INOTIFY_ADD_WATCH      = 285
+	SYS_INOTIFY_RM_WATCH       = 286
+	SYS_MIGRATE_PAGES          = 287
+	SYS_OPENAT                 = 288
+	SYS_MKDIRAT                = 289
+	SYS_MKNODAT                = 290
+	SYS_FCHOWNAT               = 291
+	SYS_FUTIMESAT              = 292
+	SYS_UNLINKAT               = 294
+	SYS_RENAMEAT               = 295
+	SYS_LINKAT                 = 296
+	SYS_SYMLINKAT              = 297
+	SYS_READLINKAT             = 298
+	SYS_FCHMODAT               = 299
+	SYS_FACCESSAT              = 300
+	SYS_PSELECT6               = 301
+	SYS_PPOLL                  = 302
+	SYS_UNSHARE                = 303
+	SYS_SET_ROBUST_LIST        = 304
+	SYS_GET_ROBUST_LIST        = 305
+	SYS_SPLICE                 = 306
+	SYS_SYNC_FILE_RANGE        = 307
+	SYS_TEE                    = 308
+	SYS_VMSPLICE               = 309
+	SYS_MOVE_PAGES             = 310
+	SYS_GETCPU                 = 311
+	SYS_EPOLL_PWAIT            = 312
+	SYS_UTIMES                 = 313
+	SYS_FALLOCATE              = 314
+	SYS_UTIMENSAT              = 315
+	SYS_SIGNALFD               = 316
+	SYS_TIMERFD                = 317
+	SYS_EVENTFD                = 318
+	SYS_TIMERFD_CREATE         = 319
+	SYS_TIMERFD_SETTIME        = 320
+	SYS_TIMERFD_GETTIME        = 321
+	SYS_SIGNALFD4              = 322
+	SYS_EVENTFD2               = 323
+	SYS_INOTIFY_INIT1          = 324
+	SYS_PIPE2                  = 325
+	SYS_DUP3                   = 326
+	SYS_EPOLL_CREATE1          = 327
+	SYS_PREADV                 = 328
+	SYS_PWRITEV                = 329
+	SYS_RT_TGSIGQUEUEINFO      = 330
+	SYS_PERF_EVENT_OPEN        = 331
+	SYS_FANOTIFY_INIT          = 332
+	SYS_FANOTIFY_MARK          = 333
+	SYS_PRLIMIT64              = 334
+	SYS_NAME_TO_HANDLE_AT      = 335
+	SYS_OPEN_BY_HANDLE_AT      = 336
+	SYS_CLOCK_ADJTIME          = 337
+	SYS_SYNCFS                 = 338
+	SYS_SETNS                  = 339
+	SYS_PROCESS_VM_READV       = 340
+	SYS_PROCESS_VM_WRITEV      = 341
+	SYS_S390_RUNTIME_INSTR     = 342
+	SYS_KCMP                   = 343
+	SYS_FINIT_MODULE           = 344
+	SYS_SCHED_SETATTR          = 345
+	SYS_SCHED_GETATTR          = 346
+	SYS_RENAMEAT2              = 347
+	SYS_SECCOMP                = 348
+	SYS_GETRANDOM              = 349
+	SYS_MEMFD_CREATE           = 350
+	SYS_BPF                    = 351
+	SYS_S390_PCI_MMIO_WRITE    = 352
+	SYS_S390_PCI_MMIO_READ     = 353
+	SYS_EXECVEAT               = 354
+	SYS_USERFAULTFD            = 355
+	SYS_MEMBARRIER             = 356
+	SYS_RECVMMSG               = 357
+	SYS_SENDMMSG               = 358
+	SYS_SOCKET                 = 359
+	SYS_SOCKETPAIR             = 360
+	SYS_BIND                   = 361
+	SYS_CONNECT                = 362
+	SYS_LISTEN                 = 363
+	SYS_ACCEPT4                = 364
+	SYS_GETSOCKOPT             = 365
+	SYS_SETSOCKOPT             = 366
+	SYS_GETSOCKNAME            = 367
+	SYS_GETPEERNAME            = 368
+	SYS_SENDTO                 = 369
+	SYS_SENDMSG                = 370
+	SYS_RECVFROM               = 371
+	SYS_RECVMSG                = 372
+	SYS_SHUTDOWN               = 373
+	SYS_MLOCK2                 = 374
+	SYS_SELECT                 = 142
+	SYS_GETRLIMIT              = 191
+	SYS_LCHOWN                 = 198
+	SYS_GETUID                 = 199
+	SYS_GETGID                 = 200
+	SYS_GETEUID                = 201
+	SYS_GETEGID                = 202
+	SYS_SETREUID               = 203
+	SYS_SETREGID               = 204
+	SYS_GETGROUPS              = 205
+	SYS_SETGROUPS              = 206
+	SYS_FCHOWN                 = 207
+	SYS_SETRESUID              = 208
+	SYS_GETRESUID              = 209
+	SYS_SETRESGID              = 210
+	SYS_GETRESGID              = 211
+	SYS_CHOWN                  = 212
+	SYS_SETUID                 = 213
+	SYS_SETGID                 = 214
+	SYS_SETFSUID               = 215
+	SYS_SETFSGID               = 216
+	SYS_NEWFSTATAT             = 293
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go
index bf00385b85..f60d8f9882 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go
@@ -1,6 +1,8 @@
 // mksysnum_netbsd.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build 386,netbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
index bf00385b85..48a91d4646 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
@@ -1,6 +1,8 @@
 // mksysnum_netbsd.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build amd64,netbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
index bf00385b85..612ba662cb 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
@@ -1,6 +1,8 @@
 // mksysnum_netbsd.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build arm,netbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go
index a3cae50590..3e8ce2a1dd 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go
@@ -1,6 +1,8 @@
 // mksysnum_openbsd.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build 386,openbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
index a3cae50590..bd28146ddd 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
@@ -1,6 +1,8 @@
 // mksysnum_openbsd.pl
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
+// +build amd64,openbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
index da00f9ee13..c708659859 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build amd64,solaris
+
 package unix
 
 // TODO(aram): remove these before Go 1.3.
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go
index 75dc532c5d..2de1d44e28 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go
@@ -1,3 +1,4 @@
+// +build 386,darwin
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_darwin.go
 
@@ -28,7 +29,7 @@ type Timeval struct {
 	Usec int32
 }
 
-type Timeval32 [0]byte
+type Timeval32 struct{}
 
 type Rusage struct {
 	Utime    Timeval
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go
index 93d6d28626..044657878c 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go
@@ -1,3 +1,4 @@
+// +build amd64,darwin
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_darwin.go
 
@@ -130,9 +131,9 @@ type Fbootstraptransfer_t struct {
 }
 
 type Log2phys_t struct {
-	Flags       uint32
-	Contigbytes int64
-	Devoffset   int64
+	Flags     uint32
+	Pad_cgo_0 [8]byte
+	Pad_cgo_1 [8]byte
 }
 
 type Fsid struct {
@@ -454,3 +455,8 @@ type Termios struct {
 	Ispeed    uint64
 	Ospeed    uint64
 }
+
+const (
+	AT_FDCWD            = -0x2
+	AT_SYMLINK_NOFOLLOW = 0x20
+)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm.go
similarity index 68%
rename from Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_386.go
rename to Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm.go
index e1b97ffd12..66df363ce5 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm.go
@@ -1,5 +1,8 @@
+// NOTE: cgo can't generate struct Stat_t and struct Statfs_t yet
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_dragonfly.go
+// cgo -godefs types_darwin.go
+
+// +build arm,darwin
 
 package unix
 
@@ -28,6 +31,8 @@ type Timeval struct {
 	Usec int32
 }
 
+type Timeval32 [0]byte
+
 type Rusage struct {
 	Utime    Timeval
 	Stime    Timeval
@@ -48,74 +53,50 @@ type Rusage struct {
 }
 
 type Rlimit struct {
-	Cur int64
-	Max int64
+	Cur uint64
+	Max uint64
 }
 
 type _Gid_t uint32
 
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
 type Stat_t struct {
-	Ino      uint64
-	Nlink    uint32
-	Dev      uint32
-	Mode     uint16
-	Padding1 uint16
-	Uid      uint32
-	Gid      uint32
-	Rdev     uint32
-	Atim     Timespec
-	Mtim     Timespec
-	Ctim     Timespec
-	Size     int64
-	Blocks   int64
-	Blksize  uint32
-	Flags    uint32
-	Gen      uint32
-	Lspare   int32
-	Qspare1  int64
-	Qspare2  int64
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
 }
 
 type Statfs_t struct {
-	Spare2      int32
-	Bsize       int32
+	Bsize       uint32
 	Iosize      int32
-	Blocks      int32
-	Bfree       int32
-	Bavail      int32
-	Files       int32
-	Ffree       int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
 	Fsid        Fsid
 	Owner       uint32
-	Type        int32
-	Flags       int32
-	Syncwrites  int32
-	Asyncwrites int32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
 	Fstypename  [16]int8
-	Mntonname   [80]int8
-	Syncreads   int32
-	Asyncreads  int32
-	Spares1     int16
-	Mntfromname [80]int8
-	Spares2     int16
-	Spare       [2]int32
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
 }
 
 type Flock_t struct {
@@ -126,19 +107,45 @@ type Flock_t struct {
 	Whence int16
 }
 
-type Dirent struct {
-	Fileno  uint64
-	Namlen  uint16
-	Type    uint8
-	Unused1 uint8
-	Unused2 uint32
-	Name    [256]int8
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset int64
+	Count  int32
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint32
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags       uint32
+	Contigbytes int64
+	Devoffset   int64
 }
 
 type Fsid struct {
 	Val [2]int32
 }
 
+type Dirent struct {
+	Ino       uint64
+	Seekoff   uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [1024]int8
+	Pad_cgo_0 [3]byte
+}
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
@@ -171,8 +178,6 @@ type RawSockaddrDatalink struct {
 	Alen   uint8
 	Slen   uint8
 	Data   [12]int8
-	Rcf    uint16
-	Route  [16]uint16
 }
 
 type RawSockaddr struct {
@@ -224,6 +229,12 @@ type Cmsghdr struct {
 	Type  int32
 }
 
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
 type Inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex uint32
@@ -243,12 +254,13 @@ const (
 	SizeofSockaddrInet6    = 0x1c
 	SizeofSockaddrAny      = 0x6c
 	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
+	SizeofSockaddrDatalink = 0x14
 	SizeofLinger           = 0x8
 	SizeofIPMreq           = 0x8
 	SizeofIPv6Mreq         = 0x14
 	SizeofMsghdr           = 0x1c
 	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
 	SizeofInet6Pktinfo     = 0x14
 	SizeofIPv6MTUInfo      = 0x20
 	SizeofICMPv6Filter     = 0x20
@@ -270,17 +282,17 @@ type Kevent_t struct {
 }
 
 type FdSet struct {
-	Bits [32]uint32
+	Bits [32]int32
 }
 
 const (
-	SizeofIfMsghdr         = 0x68
-	SizeofIfData           = 0x58
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x5c
-	SizeofRtMetrics        = 0x38
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
 )
 
 type IfMsghdr struct {
@@ -296,16 +308,16 @@ type IfMsghdr struct {
 
 type IfData struct {
 	Type       uint8
+	Typelen    uint8
 	Physical   uint8
 	Addrlen    uint8
 	Hdrlen     uint8
 	Recvquota  uint8
 	Xmitquota  uint8
-	Pad_cgo_0  [2]byte
+	Unused1    uint8
 	Mtu        uint32
 	Metric     uint32
-	Link_state uint32
-	Baudrate   uint64
+	Baudrate   uint32
 	Ipackets   uint32
 	Ierrors    uint32
 	Opackets   uint32
@@ -317,9 +329,13 @@ type IfData struct {
 	Omcasts    uint32
 	Iqdrops    uint32
 	Noproto    uint32
-	Hwassist   uint32
-	Unused     uint32
+	Recvtiming uint32
+	Xmittiming uint32
 	Lastchange Timeval
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
 }
 
 type IfaMsghdr struct {
@@ -343,13 +359,15 @@ type IfmaMsghdr struct {
 	Pad_cgo_0 [2]byte
 }
 
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
+type IfmaMsghdr2 struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Refcount  int32
 }
 
 type RtMsghdr struct {
@@ -369,21 +387,17 @@ type RtMsghdr struct {
 }
 
 type RtMetrics struct {
-	Locks     uint32
-	Mtu       uint32
-	Pksent    uint32
-	Expire    uint32
-	Sendpipe  uint32
-	Ssthresh  uint32
-	Rtt       uint32
-	Rttvar    uint32
-	Recvpipe  uint32
-	Hopcount  uint32
-	Mssopt    uint16
-	Pad       uint16
-	Msl       uint32
-	Iwmaxsegs uint32
-	Iwcapsegs uint32
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
 }
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go
new file mode 100644
index 0000000000..85d56eabd3
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go
@@ -0,0 +1,457 @@
+// +build arm64,darwin
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Timeval32 struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Pad_cgo_0     [4]byte
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
+}
+
+type Statfs_t struct {
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        Fsid
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset    int64
+	Count     int32
+	Pad_cgo_0 [4]byte
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint64
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags     uint32
+	Pad_cgo_0 [8]byte
+	Pad_cgo_1 [8]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Dirent struct {
+	Ino       uint64
+	Seekoff   uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [1024]int8
+	Pad_cgo_0 [3]byte
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad_cgo_1  [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+const (
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Typelen    uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Unused1    uint8
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Recvtiming uint32
+	Xmittiming uint32
+	Lastchange Timeval32
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfmaMsghdr2 struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Refcount  int32
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval32
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type Termios struct {
+	Iflag     uint64
+	Oflag     uint64
+	Cflag     uint64
+	Lflag     uint64
+	Cc        [20]uint8
+	Pad_cgo_0 [4]byte
+	Ispeed    uint64
+	Ospeed    uint64
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
index b94a4ff02a..8a6f4e1ce3 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
@@ -1,6 +1,8 @@
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_dragonfly.go
 
+// +build amd64,dragonfly
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go
index d9d5ce46ff..8cf30947b4 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go
@@ -1,3 +1,4 @@
+// +build 386,freebsd
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_freebsd.go
 
@@ -138,6 +139,15 @@ type Fsid struct {
 	Val [2]int32
 }
 
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
index 80c6b81254..e5feb207be 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
@@ -1,3 +1,4 @@
+// +build amd64,freebsd
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_freebsd.go
 
@@ -138,6 +139,15 @@ type Fsid struct {
 	Val [2]int32
 }
 
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go
index bd971b5647..5472b54284 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go
@@ -1,6 +1,8 @@
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- -fsigned-char types_freebsd.go
 
+// +build arm,freebsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go
index 3b1dcc65e3..fb1257ae02 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -1,3 +1,4 @@
+// +build 386,linux
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_linux.go
 
@@ -150,6 +151,15 @@ type Flock_t struct {
 	Pid    int32
 }
 
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
 type RawSockaddrInet4 struct {
 	Family uint16
 	Port   uint16
@@ -187,6 +197,12 @@ type RawSockaddrNetlink struct {
 	Groups uint32
 }
 
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
 type RawSockaddr struct {
 	Family uint16
 	Data   [14]int8
@@ -309,6 +325,7 @@ const (
 	SizeofSockaddrUnix      = 0x6e
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
 	SizeofLinger            = 0x8
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
@@ -573,18 +590,18 @@ type EpollEvent struct {
 
 const (
 	AT_FDCWD            = -0x64
-	AT_SYMLINK_NOFOLLOW = 0x100
 	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
 )
 
 type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Line      uint8
-	Cc        [32]uint8
-	Pad_cgo_0 [3]byte
-	Ispeed    uint32
-	Ospeed    uint32
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
 }
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go
index 8e6bd61e0c..34edb3685f 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -1,3 +1,4 @@
+// +build amd64,linux
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_linux.go
 
@@ -152,6 +153,15 @@ type Flock_t struct {
 	Pad_cgo_1 [4]byte
 }
 
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
 type RawSockaddrInet4 struct {
 	Family uint16
 	Port   uint16
@@ -189,6 +199,12 @@ type RawSockaddrNetlink struct {
 	Groups uint32
 }
 
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
 type RawSockaddr struct {
 	Family uint16
 	Data   [14]int8
@@ -313,6 +329,7 @@ const (
 	SizeofSockaddrUnix      = 0x6e
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
 	SizeofLinger            = 0x8
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
@@ -591,18 +608,18 @@ type EpollEvent struct {
 
 const (
 	AT_FDCWD            = -0x64
-	AT_SYMLINK_NOFOLLOW = 0x100
 	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
 )
 
 type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Line      uint8
-	Cc        [32]uint8
-	Pad_cgo_0 [3]byte
-	Ispeed    uint32
-	Ospeed    uint32
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
 }
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go
index 7a8e03943b..0fef350b14 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -1,3 +1,4 @@
+// +build arm,linux
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_linux.go
 
@@ -191,6 +192,12 @@ type RawSockaddrNetlink struct {
 	Groups uint32
 }
 
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
 type RawSockaddr struct {
 	Family uint16
 	Data   [14]uint8
@@ -313,6 +320,7 @@ const (
 	SizeofSockaddrUnix      = 0x6e
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
 	SizeofLinger            = 0x8
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
@@ -562,120 +570,18 @@ type EpollEvent struct {
 
 const (
 	AT_FDCWD            = -0x64
-	AT_SYMLINK_NOFOLLOW = 0x100
 	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
 )
 
 type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Line      uint8
-	Cc        [32]uint8
-	Pad_cgo_0 [3]byte
-	Ispeed    uint32
-	Ospeed    uint32
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
 }
-
-const (
-	VINTR    = 0x0
-	VQUIT    = 0x1
-	VERASE   = 0x2
-	VKILL    = 0x3
-	VEOF     = 0x4
-	VTIME    = 0x5
-	VMIN     = 0x6
-	VSWTC    = 0x7
-	VSTART   = 0x8
-	VSTOP    = 0x9
-	VSUSP    = 0xa
-	VEOL     = 0xb
-	VREPRINT = 0xc
-	VDISCARD = 0xd
-	VWERASE  = 0xe
-	VLNEXT   = 0xf
-	VEOL2    = 0x10
-	IGNBRK   = 0x1
-	BRKINT   = 0x2
-	IGNPAR   = 0x4
-	PARMRK   = 0x8
-	INPCK    = 0x10
-	ISTRIP   = 0x20
-	INLCR    = 0x40
-	IGNCR    = 0x80
-	ICRNL    = 0x100
-	IUCLC    = 0x200
-	IXON     = 0x400
-	IXANY    = 0x800
-	IXOFF    = 0x1000
-	IMAXBEL  = 0x2000
-	IUTF8    = 0x4000
-	OPOST    = 0x1
-	OLCUC    = 0x2
-	ONLCR    = 0x4
-	OCRNL    = 0x8
-	ONOCR    = 0x10
-	ONLRET   = 0x20
-	OFILL    = 0x40
-	OFDEL    = 0x80
-	B0       = 0x0
-	B50      = 0x1
-	B75      = 0x2
-	B110     = 0x3
-	B134     = 0x4
-	B150     = 0x5
-	B200     = 0x6
-	B300     = 0x7
-	B600     = 0x8
-	B1200    = 0x9
-	B1800    = 0xa
-	B2400    = 0xb
-	B4800    = 0xc
-	B9600    = 0xd
-	B19200   = 0xe
-	B38400   = 0xf
-	CSIZE    = 0x30
-	CS5      = 0x0
-	CS6      = 0x10
-	CS7      = 0x20
-	CS8      = 0x30
-	CSTOPB   = 0x40
-	CREAD    = 0x80
-	PARENB   = 0x100
-	PARODD   = 0x200
-	HUPCL    = 0x400
-	CLOCAL   = 0x800
-	B57600   = 0x1001
-	B115200  = 0x1002
-	B230400  = 0x1003
-	B460800  = 0x1004
-	B500000  = 0x1005
-	B576000  = 0x1006
-	B921600  = 0x1007
-	B1000000 = 0x1008
-	B1152000 = 0x1009
-	B1500000 = 0x100a
-	B2000000 = 0x100b
-	B2500000 = 0x100c
-	B3000000 = 0x100d
-	B3500000 = 0x100e
-	B4000000 = 0x100f
-	ISIG     = 0x1
-	ICANON   = 0x2
-	XCASE    = 0x4
-	ECHO     = 0x8
-	ECHOE    = 0x10
-	ECHOK    = 0x20
-	ECHONL   = 0x40
-	NOFLSH   = 0x80
-	TOSTOP   = 0x100
-	ECHOCTL  = 0x200
-	ECHOPRT  = 0x400
-	ECHOKE   = 0x800
-	FLUSHO   = 0x1000
-	PENDIN   = 0x4000
-	IEXTEN   = 0x8000
-	TCGETS   = 0x5401
-	TCSETS   = 0x5402
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go
new file mode 100644
index 0000000000..28b7cd43ce
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -0,0 +1,604 @@
+// +build arm64,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -fsigned-char types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev               uint64
+	Ino               uint64
+	Mode              uint32
+	Nlink             uint32
+	Uid               uint32
+	Gid               uint32
+	Rdev              uint64
+	X__pad1           uint64
+	Size              int64
+	Blksize           int32
+	X__pad2           int32
+	Blocks            int64
+	Atim              Timespec
+	Mtim              Timespec
+	Ctim              Timespec
+	X__glibc_reserved [2]int32
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]int8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len          uint64
+	Level        int32
+	Type         int32
+	X__cmsg_data [0]uint8
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x22
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+	Name   [0]int8
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs   [31]uint64
+	Sp     uint64
+	Pc     uint64
+	Pstate uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]int8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	PadFd  int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64.go
new file mode 100644
index 0000000000..8fe5af2628
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -0,0 +1,607 @@
+// +build mips64,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint32
+	Pad1    [3]int32
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Pad2    [3]uint32
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize uint32
+	Pad4    uint32
+	Blocks  int64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Frsize  int64
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int64
+	Flags   int64
+	Spare   [5]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]int8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x27
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs        [102]uint64
+	U_tsize     uint64
+	U_dsize     uint64
+	U_ssize     uint64
+	Start_code  uint64
+	Start_data  uint64
+	Start_stack uint64
+	Signal      int64
+	U_ar0       uint64
+	Magic       uint64
+	U_comm      [32]int8
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]int8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag     uint32
+	Oflag     uint32
+	Cflag     uint32
+	Lflag     uint32
+	Line      uint8
+	Cc        [32]uint8
+	Pad_cgo_0 [3]byte
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64le.go
new file mode 100644
index 0000000000..df16e83c5b
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -0,0 +1,607 @@
+// +build mips64le,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint32
+	Pad1    [3]int32
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Pad2    [3]uint32
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize uint32
+	Pad4    uint32
+	Blocks  int64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Frsize  int64
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int64
+	Flags   int64
+	Spare   [5]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]int8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x27
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs        [102]uint64
+	U_tsize     uint64
+	U_dsize     uint64
+	U_ssize     uint64
+	Start_code  uint64
+	Start_data  uint64
+	Start_stack uint64
+	Signal      int64
+	U_ar0       uint64
+	Magic       uint64
+	U_comm      [32]int8
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]int8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag     uint32
+	Oflag     uint32
+	Cflag     uint32
+	Lflag     uint32
+	Line      uint8
+	Cc        [32]uint8
+	Pad_cgo_0 [3]byte
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go
new file mode 100644
index 0000000000..d1105402ec
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -0,0 +1,614 @@
+// +build ppc64,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev                uint64
+	Ino                uint64
+	Nlink              uint64
+	Mode               uint32
+	Uid                uint32
+	Gid                uint32
+	X__pad2            int32
+	Rdev               uint64
+	Size               int64
+	Blksize            int64
+	Blocks             int64
+	Atim               Timespec
+	Mtim               Timespec
+	Ctim               Timespec
+	X__glibc_reserved4 uint64
+	X__glibc_reserved5 uint64
+	X__glibc_reserved6 uint64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]uint8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]uint8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]uint8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len          uint64
+	Level        int32
+	Type         int32
+	X__cmsg_data [0]uint8
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x23
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+	Name   [0]uint8
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Gpr       [32]uint64
+	Nip       uint64
+	Msr       uint64
+	Orig_gpr3 uint64
+	Ctr       uint64
+	Link      uint64
+	Xer       uint64
+	Ccr       uint64
+	Softe     uint64
+	Trap      uint64
+	Dar       uint64
+	Dsisr     uint64
+	Result    uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]uint8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]uint8
+	Nodename   [65]uint8
+	Release    [65]uint8
+	Version    [65]uint8
+	Machine    [65]uint8
+	Domainname [65]uint8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]uint8
+	Fpack     [6]uint8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events  uint32
+	X_padFd int32
+	Fd      int32
+	Pad     int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [19]uint8
+	Line   uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
new file mode 100644
index 0000000000..8e25c9fffc
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -0,0 +1,614 @@
+// +build ppc64le,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev                uint64
+	Ino                uint64
+	Nlink              uint64
+	Mode               uint32
+	Uid                uint32
+	Gid                uint32
+	X__pad2            int32
+	Rdev               uint64
+	Size               int64
+	Blksize            int64
+	Blocks             int64
+	Atim               Timespec
+	Mtim               Timespec
+	Ctim               Timespec
+	X__glibc_reserved4 uint64
+	X__glibc_reserved5 uint64
+	X__glibc_reserved6 uint64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]uint8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]uint8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]uint8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len          uint64
+	Level        int32
+	Type         int32
+	X__cmsg_data [0]uint8
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x22
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+	Name   [0]uint8
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Gpr       [32]uint64
+	Nip       uint64
+	Msr       uint64
+	Orig_gpr3 uint64
+	Ctr       uint64
+	Link      uint64
+	Xer       uint64
+	Ccr       uint64
+	Softe     uint64
+	Trap      uint64
+	Dar       uint64
+	Dsisr     uint64
+	Result    uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]uint8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]uint8
+	Nodename   [65]uint8
+	Release    [65]uint8
+	Version    [65]uint8
+	Machine    [65]uint8
+	Domainname [65]uint8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]uint8
+	Fpack     [6]uint8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events  uint32
+	X_padFd int32
+	Fd      int32
+	Pad     int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [19]uint8
+	Line   uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_s390x.go
new file mode 100644
index 0000000000..268e373624
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -0,0 +1,629 @@
+// +build s390x,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -fsigned-char types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	_         [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	_         [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	_         [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	Uid     uint32
+	Gid     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize int64
+	Blocks  int64
+	_       [3]int64
+}
+
+type Statfs_t struct {
+	Type    uint32
+	Bsize   uint32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen uint32
+	Frsize  uint32
+	Flags   uint32
+	Spare   [4]uint32
+	_       [4]byte
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
+}
+
+type Fsid struct {
+	_ [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x6
+	FADV_NOREUSE    = 0x7
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	_          [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x27
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Psw                      PtracePsw
+	Gprs                     [16]uint64
+	Acrs                     [16]uint32
+	Orig_gpr2                uint64
+	Fp_regs                  PtraceFpregs
+	Per_info                 PtracePer
+	Ieee_instruction_pointer uint64
+}
+
+type PtracePsw struct {
+	Mask uint64
+	Addr uint64
+}
+
+type PtraceFpregs struct {
+	Fpc  uint32
+	_    [4]byte
+	Fprs [16]float64
+}
+
+type PtracePer struct {
+	_             [0]uint64
+	_             [24]byte
+	_             [8]byte
+	Starting_addr uint64
+	Ending_addr   uint64
+	Perc_atmid    uint16
+	_             [6]byte
+	Address       uint64
+	Access_id     uint8
+	_             [7]byte
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	_         [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_         [0]int8
+	_         [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	_      int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go
index 345bf23b35..caf755fb86 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go
@@ -1,6 +1,8 @@
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_netbsd.go
 
+// +build 386,netbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
index 5559f022ab..91b4a5305a 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
@@ -1,6 +1,8 @@
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_netbsd.go
 
+// +build amd64,netbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go
index 5618909c77..c0758f9d3f 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go
@@ -1,6 +1,8 @@
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_netbsd.go
 
+// +build arm,netbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go
index be07f6e547..860a469796 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go
@@ -1,6 +1,8 @@
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_openbsd.go
 
+// +build 386,openbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
index d553c2f084..23c52727f7 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
@@ -1,6 +1,8 @@
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_openbsd.go
 
+// +build amd64,openbsd
+
 package unix
 
 const (
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go
index 9d8d0e5f41..b3b928a51e 100644
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go
@@ -1,3 +1,4 @@
+// +build amd64,solaris
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_solaris.go
 
@@ -9,6 +10,7 @@ const (
 	sizeofInt      = 0x4
 	sizeofLong     = 0x8
 	sizeofLongLong = 0x8
+	PathMax        = 0x400
 )
 
 type (
@@ -33,6 +35,18 @@ type Timeval32 struct {
 	Usec int32
 }
 
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
 type Rusage struct {
 	Utime    Timeval
 	Stime    Timeval
@@ -228,6 +242,30 @@ type FdSet struct {
 	Bits [1024]int64
 }
 
+type Utsname struct {
+	Sysname  [257]int8
+	Nodename [257]int8
+	Release  [257]int8
+	Version  [257]int8
+	Machine  [257]int8
+}
+
+type Ustat_t struct {
+	Tfree     int64
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_0 [4]byte
+}
+
+const (
+	AT_FDCWD            = 0xffd19553
+	AT_SYMLINK_NOFOLLOW = 0x1000
+	AT_SYMLINK_FOLLOW   = 0x2000
+	AT_REMOVEDIR        = 0x1
+	AT_EACCESS          = 0x4
+)
+
 const (
 	SizeofIfMsghdr  = 0x54
 	SizeofIfData    = 0x44
@@ -355,6 +393,8 @@ type BpfHdr struct {
 	Pad_cgo_0 [2]byte
 }
 
+const _SC_PAGESIZE = 0xb
+
 type Termios struct {
 	Iflag     uint32
 	Oflag     uint32
@@ -363,3 +403,20 @@ type Termios struct {
 	Cc        [19]uint8
 	Pad_cgo_0 [1]byte
 }
+
+type Termio struct {
+	Iflag     uint16
+	Oflag     uint16
+	Cflag     uint16
+	Lflag     uint16
+	Line      int8
+	Cc        [8]uint8
+	Pad_cgo_0 [1]byte
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}

From bf93209ef1bf89a0bc49faad86c3b41351b351d0 Mon Sep 17 00:00:00 2001
From: Ed Rooth <sym3tri@users.noreply.github.com>
Date: Fri, 10 Jun 2016 15:16:30 -0700
Subject: [PATCH 0395/1304] Documentation: fix broken CoreOS install doc link

---
 Documentation/distributions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 9b4ecd788e..e9afb6ba7a 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -5,7 +5,7 @@
 rkt is an integral part of CoreOS, installed with the operating system.
 The [CoreOS releases page](https://coreos.com/releases/) lists the version of rkt available in each CoreOS release channel.
 
-If the version of rkt included in CoreOS is too old, it's fairly trivial to fetch the desired version [via a systemd unit](Documentation/install-rkt-in-coreos.md)
+If the version of rkt included in CoreOS is too old, it's fairly trivial to fetch the desired version [via a systemd unit](install-rkt-in-coreos.md)
 
 ## Fedora
 

From 596d97201efc31386c9d0dc6d1f36db7359403ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 13 Jun 2016 12:30:07 +0200
Subject: [PATCH 0396/1304] functional tests: sleep on every app when testing
 exit code

Sometimes, the first app (hello0) didn't have time to print its message
before the pod exits. Sleep on every app so all of them have time to
print it.
---
 tests/rkt_exit_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/rkt_exit_test.go b/tests/rkt_exit_test.go
index 1370005bbd..3a77adae24 100644
--- a/tests/rkt_exit_test.go
+++ b/tests/rkt_exit_test.go
@@ -46,15 +46,15 @@ func TestExitCodeSimple(t *testing.T) {
 // exit codes.
 func TestExitCodeWithSeveralApps(t *testing.T) {
 	image0File := patchTestACI("rkt-inspect-exit-0.aci", "--name=hello0",
-		"--exec=/inspect --print-msg=HelloWorld --exit-code=0")
+		"--exec=/inspect --print-msg=HelloWorld --exit-code=0 --sleep=1")
 	defer os.Remove(image0File)
 
 	image1File := patchTestACI("rkt-inspect-exit-1.aci", "--name=hello1",
-		"--exec=/inspect --print-msg=HelloWorld --exit-code=5")
+		"--exec=/inspect --print-msg=HelloWorld --exit-code=5 --sleep=1")
 	defer os.Remove(image1File)
 
 	image2File := patchTestACI("rkt-inspect-exit-2.aci", "--name=hello2",
-		"--exec=/inspect --print-msg=HelloWorld --exit-code=6 --sleep=1")
+		"--exec=/inspect --print-msg=HelloWorld --exit-code=6 --sleep=2")
 	defer os.Remove(image2File)
 
 	ctx := testutils.NewRktRunCtx()

From f23ca9d8673762e3ddc9d5ec4605abd4893bab88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 13 Jun 2016 13:10:06 +0200
Subject: [PATCH 0397/1304] api_service: wait until a pod regs with machined

If we return before we're registered with machined, we could return a
wrong cgroup because the pod is not yet moved to its final cgroup.

Wait until we're registered with machined for 500ms before returning
pod's information.
---
 rkt/api_service.go | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index d98afc152d..61d09c20ad 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -16,6 +16,7 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -36,6 +37,7 @@ import (
 	"github.com/coreos/rkt/pkg/set"
 	"github.com/coreos/rkt/store"
 	"github.com/coreos/rkt/version"
+	"github.com/godbus/dbus"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -368,6 +370,11 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest) {
 	}
 
 	if pod.State == v1alpha.PodState_POD_STATE_RUNNING {
+		if err := waitForMachinedRegistration(pod.Id); err != nil {
+			// If there's an error, it means we're not registered to machined
+			// in a reasonable time. Just output the cgroup we're in.
+			stderr.PrintE("checking for machined registration failed", err)
+		}
 		// Get cgroup for the "name=systemd" controller.
 		pid, err := p.getContainerPID1()
 		if err != nil {
@@ -390,6 +397,25 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest) {
 	return pod, manifest
 }
 
+func waitForMachinedRegistration(uuid string) error {
+	conn, err := dbus.SystemBus()
+	if err != nil {
+		return err
+	}
+	machined := conn.Object("org.freedesktop.machine1", "/org/freedesktop/machine1")
+	machineName := "rkt-" + uuid
+
+	var o dbus.ObjectPath
+	for i := 0; i < 10; i++ {
+		if err := machined.Call("org.freedesktop.machine1.Manager.GetMachine", 0, machineName).Store(&o); err == nil {
+			return nil
+		}
+		time.Sleep(time.Millisecond * 50)
+	}
+
+	return errors.New("pod not found")
+}
+
 func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPodsRequest) (*v1alpha.ListPodsResponse, error) {
 	var pods []*v1alpha.Pod
 	if err := walkPods(includeMostDirs, func(p *pod) {

From bfc7a5208956480e6a8194b24c5c7f611215cfeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 10 Jun 2016 18:30:42 +0200
Subject: [PATCH 0398/1304] functional tests: start api service with "nobody"
 UID

We now check if we're registered with machined over dbus before
returning from the ListPods API call. It turns out dbus authentication
doesn't succeed unless our UID is mapped to a user name, and UID 65534
might not be mapped to any user name.

Instead, look for the "nobody" user in `/etc/passwd` and use that. If
it's not found, fall back to running the API service as root in the
functional tests.
---
 tests/rkt_api_service_test.go | 20 ++++++++++++++++----
 tests/rkt_tests.go            | 23 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 50de85f065..28ebdce503 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -21,8 +21,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"os/user"
 	"path/filepath"
 	"reflect"
+	"strconv"
 	"strings"
 	"syscall"
 	"testing"
@@ -38,24 +40,34 @@ import (
 )
 
 func startAPIService(t *testing.T, ctx *testutils.RktRunCtx) *gexpect.ExpectSubprocess {
-	noGid := false
+	noUidGid := false
 	gid, err := common.LookupGid(common.RktGroup)
 	if err != nil {
 		t.Logf("no %q group, will run api service with root, ONLY DO THIS FOR TESTING!", common.RktGroup)
-		noGid = true
+		noUidGid = true
 	} else {
 		if err := ctx.SetupDataDir(); err != nil {
 			t.Fatalf("failed to setup data directory: %v", err)
 		}
 	}
 
+	u, err := user.Lookup("nobody")
+	if err != nil {
+		t.Logf(`no "nobody" user, will run api service with root, ONLY DO THIS FOR TESTING!`)
+		noUidGid = true
+	}
+	uid, err := strconv.Atoi(u.Uid)
+	if err != nil {
+		t.Fatalf(`failed to parse "nobody" UID: %v`, err)
+	}
+
 	t.Logf("Running rkt api service")
 	apisvcCmd := fmt.Sprintf("%s api-service", ctx.Cmd())
 
-	if noGid {
+	if noUidGid {
 		return startRktAndCheckOutput(t, apisvcCmd, "API service running")
 	}
-	return startRktAsGidAndCheckOutput(t, apisvcCmd, "API service running", gid)
+	return startRktAsUidGidAndCheckOutput(t, apisvcCmd, "API service running", false, uid, gid)
 }
 
 func stopAPIService(t *testing.T, svc *gexpect.ExpectSubprocess) {
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index afea7a96fc..0fea827cd3 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -369,6 +369,29 @@ func startRktAsGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, gid
 	return child
 }
 
+func startRktAsUidGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, expectError bool, uid, gid int) *gexpect.ExpectSubprocess {
+	child, err := gexpect.Command(rktCmd)
+	if err != nil {
+		t.Fatalf("cannot exec rkt: %v", err)
+	}
+	if gid != 0 {
+		child.Cmd.SysProcAttr = &syscall.SysProcAttr{}
+		child.Cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}
+	}
+
+	err = child.Start()
+	if err != nil {
+		t.Fatalf("cannot start rkt: %v", err)
+	}
+
+	if expectedLine != "" {
+		if err := expectWithOutput(child, expectedLine); err != nil {
+			t.Fatalf("didn't receive expected output %q: %v", expectedLine, err)
+		}
+	}
+	return child
+}
+
 func runRktAndCheckRegexOutput(t *testing.T, rktCmd, match string) {
 	child := spawnOrFail(t, rktCmd)
 	defer child.Wait()

From dd91f8f46ecd25b2bcaf050a5a4c31be76a1eb4c Mon Sep 17 00:00:00 2001
From: Josh Wood <j@coreos.com>
Date: Mon, 13 Jun 2016 16:25:34 -0700
Subject: [PATCH 0399/1304] Doc/subcmd: Fix options table in prepare and run

Fix broken links to k8s/design/resources.
Restore docker port name convention doc from
https://github.com/coreos/rkt/commit/443073354c7d2bb40a3f69d520f4f45f69f2f31d
---
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/run.md     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 0cbb1e1fcc..23ac4bf0e2 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -40,7 +40,7 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
 | `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
-| `--port` | none | A port number (ex. `--port=NAME:HOSTPORT`) | Ports to expose on the host (requires [contained network](../networking.md#contained-mode)). |
+| `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network](../networking/overview.md#contained-mode). Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080` |
 | `--private-users` |  `false` | `true` or `false` | Run within user namespaces |
 | `--quiet` |  `false` | `true` or `false` | Suppress superfluous output on stdout, print only the UUID on success |
 | `--set-env` |  `` | An environment variable. Syntax `NAME=VALUE` | An environment variable to set for apps |
@@ -57,4 +57,4 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in the general commands documentation](../commands.md#global-options).
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index ee3c2f7cc5..16ad23eab9 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -44,7 +44,7 @@ This executable can be overridden by rkt using the `--exec` flag:
 ## Overriding Isolators
 
 Application images can include per-app isolators and some of them can be overridden by rkt.
-The units come from [the Kubernetes resource model](http://kubernetes.io/v1.1/docs/design/resources.html).
+The units come from [the Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md).
 In the following example, the CPU isolator is defined to 750 milli-cores and the memory isolator limits the memory usage to 128MB.
 
 ```
@@ -342,7 +342,7 @@ For more details see the [hacking documentation](../hacking.md).
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--cpu` | none | CPU units (ex. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model](http://kubernetes.io/v1.1/docs/design/resources.html) format. |
+| `--cpu` | none | CPU units (ex. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
 | `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times |
 | `--dns-opt` | none | DNS option  | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |
@@ -351,13 +351,13 @@ For more details see the [hacking documentation](../hacking.md).
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
 | `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
 | `--mds-register` | `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net` as `default`, `default-restricted`, or `host`). |
-| `--memory` | none | Memory units (ex. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model](http://kubernetes.io/v1.1/docs/design/resources.html) format. |
+| `--memory` | none | Memory units (ex. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
 | `--mount` | none | Mount syntax (ex. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
 | `--net` | `default` | A comma-separated list of networks. (ex. `--net[=n[:args], ...]`) | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
 | `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
-| `--port` | none | A port number (ex. `--port=NAME:HOSTPORT`) | Ports to expose on the host (requires [contained network](../networking.md#contained-mode)). |
+| `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network](../networking/overview.md#contained-mode). Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080` |
 | `--private-users` |  `false` | `true` or `false` | Run within user namespaces. |
 | `--set-env` | none | An environment variable (ex. `--set-env=NAME=VALUE`) | An environment variable to set for apps. |
 | `--signature` | none | A file path | Local signature file to use in validating the preceding image |
@@ -372,4 +372,4 @@ For more details see the [hacking documentation](../hacking.md).
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in the general commands documentation](../commands.md#global-options).

From 686d60c46be056b3dc51cd58745017e690ed933d Mon Sep 17 00:00:00 2001
From: Abhishek Chanda <abhishek.becs@gmail.com>
Date: Tue, 7 Jun 2016 13:03:20 -0700
Subject: [PATCH 0400/1304] functional tests: do not pretty print json in tests

---
 Documentation/subcommands/cat-manifest.md | 2 +-
 Documentation/subcommands/image.md        | 2 +-
 tests/rkt_cat_manifest_test.go            | 2 +-
 tests/rkt_config_test.go                  | 2 +-
 tests/rkt_image_cat_manifest_test.go      | 2 +-
 tests/rkt_tests.go                        | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index d3f91e2afb..844d35acdb 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -3,7 +3,7 @@
 For debugging or inspection you may want to extract the PodManifest to stdout.
 
 ```
-# rkt cat-manifest --pretty-print UUID
+# rkt cat-manifest UUID
 {
   "acVersion":"0.7.0",
   "acKind":"PodManifest"
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index b89019020f..43907e1abc 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -5,7 +5,7 @@
 For debugging or inspection you may want to extract an ACI manifest to stdout.
 
 ```
-# rkt image cat-manifest --pretty-print coreos.com/etcd
+# rkt image cat-manifest coreos.com/etcd
 {
   "acVersion": "0.7.0",
   "acKind": "ImageManifest",
diff --git a/tests/rkt_cat_manifest_test.go b/tests/rkt_cat_manifest_test.go
index 0eb65c1de3..8f74c90a79 100644
--- a/tests/rkt_cat_manifest_test.go
+++ b/tests/rkt_cat_manifest_test.go
@@ -63,7 +63,7 @@ func TestCatManifest(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		runCmd := fmt.Sprintf("%s cat-manifest %s", ctx.Cmd(), tt.uuid)
+		runCmd := fmt.Sprintf("%s cat-manifest --pretty-print=false %s", ctx.Cmd(), tt.uuid)
 		t.Logf("Running test #%d", i)
 		runRktAndCheckRegexOutput(t, runCmd, tt.match)
 	}
diff --git a/tests/rkt_config_test.go b/tests/rkt_config_test.go
index 00a85e91fa..ad8b028b60 100644
--- a/tests/rkt_config_test.go
+++ b/tests/rkt_config_test.go
@@ -452,7 +452,7 @@ func TestConfig(t *testing.T) {
 
 			tt.configFunc(ctx)
 
-			rktCmd := ctx.Cmd() + " --debug --insecure-options=image config"
+			rktCmd := ctx.Cmd() + " --debug --insecure-options=image --pretty-print=false config"
 			out, status := runRkt(t, rktCmd, nobodyUid, 0)
 
 			if status != 0 {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 5ec32f02c9..3c05f0ed75 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -85,7 +85,7 @@ func TestImageCatManifest(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		runCmd := fmt.Sprintf("%s image cat-manifest %s", ctx.Cmd(), tt.image)
+		runCmd := fmt.Sprintf("%s image cat-manifest --pretty-print=false %s", ctx.Cmd(), tt.image)
 		t.Logf("Running test #%d", i)
 		runRktAndCheckOutput(t, runCmd, tt.expect, !tt.shouldFind)
 	}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index afea7a96fc..1c054f9680 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -627,7 +627,8 @@ func getImageInfo(t *testing.T, ctx *testutils.RktRunCtx, imageID string) *image
 	imgInfo := parseImageInfoOutput(t, string(output))
 
 	// Get manifest
-	output, err = exec.Command("/bin/bash", "-c", fmt.Sprintf("%s image cat-manifest %s", ctx.Cmd(), imageID)).CombinedOutput()
+	output, err = exec.Command("/bin/bash", "-c",
+		fmt.Sprintf("%s image cat-manifest --pretty-print=false %s", ctx.Cmd(), imageID)).CombinedOutput()
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}

From 0a129683a9f84ad6f4bbf616b40a031edcf4fbd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Tue, 14 Jun 2016 12:00:49 +0200
Subject: [PATCH 0401/1304] KVM: Update LKVM patch to mount with mmap mode.

It is minimal cache that is only used for read-write mmap.
Nothing else is cached, like cache=none, but it allows to read logs from rkt+kvm.
---
 stage1/usr_from_kvm/lkvm/patches/do_synchronous_writes.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/usr_from_kvm/lkvm/patches/do_synchronous_writes.patch b/stage1/usr_from_kvm/lkvm/patches/do_synchronous_writes.patch
index 700caf7b6a..ebd8a0fa64 100644
--- a/stage1/usr_from_kvm/lkvm/patches/do_synchronous_writes.patch
+++ b/stage1/usr_from_kvm/lkvm/patches/do_synchronous_writes.patch
@@ -7,7 +7,7 @@ index edcaf3e..f2f2d73 100644
  
  	if (kvm->cfg.using_rootfs) {
 -		strcat(real_cmdline, " rw rootflags=trans=virtio,version=9p2000.L,cache=loose rootfstype=9p");
-+		strcat(real_cmdline, " rw rootflags=trans=virtio,version=9p2000.L,cache=none rootfstype=9p");
++		strcat(real_cmdline, " rw rootflags=trans=virtio,version=9p2000.L,cache=mmap rootfstype=9p");
  		if (kvm->cfg.custom_rootfs) {
  			kvm_run_set_sandbox(kvm);
  

From 83c5903fe00def7d6bccb8b11b7b84282f641792 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 14 Jun 2016 16:22:55 +0200
Subject: [PATCH 0402/1304] stage1_fly: write pid instead of ppid

Currently the stage1 fly flavor writes a ppid file. This implies it will
have a child pid eventually. For the fly flavor this assumption does not
hold. fly may or may not spawn children hence a ppid doesn't make sense.

This fixes it and writes a pid file instead.

Fixes partially #2792
---
 stage1_fly/run/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 396ef39ebd..d569f0991a 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -334,7 +334,7 @@ func stage1() int {
 		}
 	}
 
-	if err = stage1common.WritePid(os.Getpid(), "ppid"); err != nil {
+	if err = stage1common.WritePid(os.Getpid(), "pid"); err != nil {
 		log.Error(err)
 		return 1
 	}

From 23b73ad27efc38c075d83798b4ea946f2e633276 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 9 Jun 2016 17:21:24 +0200
Subject: [PATCH 0403/1304] run: add --cap-retain and --cap-remove

This adds the isolators os/linux/capabilities-retain-set or
os/linux/capabilities-remove-set respectively.

Examples of usage:
sudo rkt run docker://ubuntu --cap-retain=CAP_KILL,CAP_NET_ADMIN --exec sh  -- -c 'capsh --print'
sudo rkt run docker://ubuntu --cap-remove=CAP_MKNOD,CAP_SYS_CHROOT --exec sh  -- -c 'capsh --print'

It is not allowed to specify both --cap-retain and --cap-remove on the
same image.

Both flags will override any existing capability isolator from the ACI.
The override also happens on a capability isolator of a different type.
For example, if the image had os/linux/capabilities-retain-set, using
--cap-remove will remove it even if --cap-remove refers to
os/linux/capabilities-remove-set.
---
 common/apps/apps.go | 20 +++++++-------
 rkt/cli_apps.go     | 64 +++++++++++++++++++++++++++++++++++++++++++++
 rkt/run.go          |  5 +++-
 stage0/run.go       | 24 +++++++++++++++++
 4 files changed, 103 insertions(+), 10 deletions(-)

diff --git a/common/apps/apps.go b/common/apps/apps.go
index 865c3aaf52..76c7bc88f8 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -38,15 +38,17 @@ const (
 )
 
 type App struct {
-	Image       string                // the image reference as supplied by the user on the cli
-	ImType      AppImageType          // the type of the image reference (to be guessed, url, path or hash)
-	Args        []string              // any arguments the user supplied for this app
-	Asc         string                // signature file override for image verification (if fetching occurs)
-	Exec        string                // exec override for image
-	Mounts      []schema.Mount        // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
-	MemoryLimit *types.ResourceMemory // memory isolator override
-	CPULimit    *types.ResourceCPU    // cpu isolator override
-	User, Group string                // user, group overrides
+	Image       string                            // the image reference as supplied by the user on the cli
+	ImType      AppImageType                      // the type of the image reference (to be guessed, url, path or hash)
+	Args        []string                          // any arguments the user supplied for this app
+	Asc         string                            // signature file override for image verification (if fetching occurs)
+	Exec        string                            // exec override for image
+	Mounts      []schema.Mount                    // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
+	MemoryLimit *types.ResourceMemory             // memory isolator override
+	CPULimit    *types.ResourceCPU                // cpu isolator override
+	User, Group string                            // user, group overrides
+	CapsRetain  *types.LinuxCapabilitiesRetainSet // os/linux/capabilities-retain-set overrides
+	CapsRemove  *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
 
 	// TODO(jonboulle): These images are partially-populated hashes, this should be clarified.
 	ImageID types.Hash // resolved image identifier
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 70f2132ae7..5e01daff0f 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -353,3 +353,67 @@ func (ag *appGroup) String() string {
 func (ag *appGroup) Type() string {
 	return "appGroup"
 }
+
+// appCapsRetain is for --caps-retain flags in the form of: --caps-retain=CAP_KILL,CAP_NET_ADMIN
+type appCapsRetain apps.Apps
+
+func (au *appCapsRetain) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--caps-retain must follow an image")
+	}
+	capsRetain, err := types.NewLinuxCapabilitiesRetainSet(strings.Split(s, ",")...)
+	if err != nil {
+		return err
+	}
+	app.CapsRetain = capsRetain
+	return nil
+}
+
+func (au *appCapsRetain) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	var vs []string
+	for _, v := range app.CapsRetain.Set() {
+		vs = append(vs, string(v))
+	}
+	return strings.Join(vs, ",")
+}
+
+func (au *appCapsRetain) Type() string {
+	return "appCapsRetain"
+}
+
+// appCapsRemove is for --caps-remove flags in the form of: --caps-remove=CAP_MKNOD,CAP_SYS_CHROOT
+type appCapsRemove apps.Apps
+
+func (au *appCapsRemove) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--caps-retain must follow an image")
+	}
+	capsRemove, err := types.NewLinuxCapabilitiesRevokeSet(strings.Split(s, ",")...)
+	if err != nil {
+		return err
+	}
+	app.CapsRemove = capsRemove
+	return nil
+}
+
+func (au *appCapsRemove) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	var vs []string
+	for _, v := range app.CapsRemove.Set() {
+		vs = append(vs, string(v))
+	}
+	return strings.Join(vs, ",")
+}
+
+func (au *appCapsRemove) Type() string {
+	return "appCapsRemove"
+}
diff --git a/rkt/run.go b/rkt/run.go
index f0756d8bf4..0634b63005 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -101,6 +101,8 @@ func init() {
 	cmdRun.Flags().Var((*appCPULimit)(&rktApps), "cpu", "cpu limit for the preceding image (example: '--cpu=500m')")
 	cmdRun.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
 	cmdRun.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
+	cmdRun.Flags().Var((*appCapsRetain)(&rktApps), "cap-retain", "capability to retain (example: '--cap-retain=CAP_SYS_ADMIN')")
+	cmdRun.Flags().Var((*appCapsRemove)(&rktApps), "cap-remove", "capability to remove (example: '--cap-remove=CAP_MKNOD')")
 
 	flagPorts = portList{}
 	flagDNS = flagStringList{}
@@ -150,7 +152,8 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 
 	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagInheritEnv || !flagExplicitEnv.IsEmpty() || rktApps.Count() > 0 || flagStoreOnly || flagNoStore ||
 		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" || (*appExec)(&rktApps).String() != "" ||
-		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "") {
+		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "" ||
+		(*appCapsRetain)(&rktApps).String() != "" || (*appCapsRemove)(&rktApps).String() != "") {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
 		return 1
 	}
diff --git a/stage0/run.go b/stage0/run.go
index 110b5ea66e..f7b5aa1daa 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -248,6 +248,30 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 			ra.App.Isolators = append(ra.App.Isolators, isolator)
 		}
 
+		if app.CapsRetain != nil && app.CapsRemove != nil {
+			return fmt.Errorf("error: cannot use both --cap-retain and --cap-remove on the same image")
+		}
+
+		// Delete existing caps isolators if the user wants to override
+		// them with either --cap-retain or --cap-remove
+		if app.CapsRetain != nil || app.CapsRemove != nil {
+			for i := len(ra.App.Isolators) - 1; i >= 0; i-- {
+				isolator := ra.App.Isolators[i]
+				if _, ok := isolator.Value().(types.LinuxCapabilitiesSet); ok {
+					ra.App.Isolators = append(ra.App.Isolators[:i],
+						ra.App.Isolators[i+1:]...)
+				}
+			}
+		}
+
+		if capsRetain := app.CapsRetain; capsRetain != nil {
+			isolator := capsRetain.AsIsolator()
+			ra.App.Isolators = append(ra.App.Isolators, isolator)
+		} else if capsRemove := app.CapsRemove; capsRemove != nil {
+			isolator := capsRemove.AsIsolator()
+			ra.App.Isolators = append(ra.App.Isolators, isolator)
+		}
+
 		if user := app.User; user != "" {
 			ra.App.User = user
 		}

From 52731d6a576577488a0e51ed4f64ae5dee8b41b1 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 10 Jun 2016 14:03:32 +0200
Subject: [PATCH 0404/1304] tests: new tests for --cap-retain and --cap-remove

The existing test TestCapsSeveralApp was split in two tests:
- TestCapsSeveralAppWithPatches: add the caps isolators in the ACI
- TestCapsSeveralAppWithFlags: add the caps isolators on the command
  line

TestCapsOverride is a new test that combine caps isolators defined in
the ACI and on the command line.
---
 tests/rkt_caps_test.go | 600 ++++++++++++++++++++++++++---------------
 1 file changed, 376 insertions(+), 224 deletions(-)

diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index b54057e0b5..1b73ee5eac 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -26,146 +26,382 @@ import (
 	"github.com/syndtr/gocapability/capability"
 )
 
-func TestCapsSeveralApp(t *testing.T) {
+var appCapsTests = []struct {
+	// constants
+	testName     string // name of the image
+	capRetainSet string // only use value if != "x"
+	capRemoveSet string // only use value if != "x"
+	expected     string // caps bounding set as printed by gocapability
+
+	// set during the test
+	imageFile string
+}{
+	// Testing without isolators
+	{
+		testName:     "image-none",
+		capRetainSet: "x",
+		capRemoveSet: "x",
+		expected: strings.Join([]string{
+			"chown",
+			"dac_override",
+			"fowner",
+			"fsetid",
+			"kill",
+			"setgid",
+			"setuid",
+			"setpcap",
+			"net_bind_service",
+			"net_raw",
+			"sys_chroot",
+			"mknod",
+			"audit_write",
+			"setfcap",
+		}, ", "),
+	},
+	// Testing retain set
+	{
+		testName:     "image-only-one-cap",
+		capRetainSet: "CAP_NET_ADMIN",
+		capRemoveSet: "x",
+		expected:     "net_admin",
+	},
+	{
+		testName:     "image-only-one-cap-from-default",
+		capRetainSet: "CAP_CHOWN",
+		capRemoveSet: "x",
+		expected:     "chown",
+	},
+	{
+		testName: "image-some-caps",
+		capRetainSet: strings.Join([]string{
+			"CAP_CHOWN",
+			"CAP_FOWNER",
+			"CAP_SYS_ADMIN",
+			"CAP_NET_ADMIN",
+		}, ","),
+		capRemoveSet: "x",
+		expected: strings.Join([]string{
+			"chown",
+			"fowner",
+			"net_admin",
+			"sys_admin",
+		}, ", "),
+	},
+	{
+		testName: "image-caps-from-nspawn-default",
+		capRetainSet: strings.Join([]string{
+			"CAP_CHOWN",
+			"CAP_DAC_OVERRIDE",
+			"CAP_DAC_READ_SEARCH",
+			"CAP_FOWNER",
+			"CAP_FSETID",
+			"CAP_IPC_OWNER",
+			"CAP_KILL",
+			"CAP_LEASE",
+			"CAP_LINUX_IMMUTABLE",
+			"CAP_NET_BIND_SERVICE",
+			"CAP_NET_BROADCAST",
+			"CAP_NET_RAW",
+			"CAP_SETGID",
+			"CAP_SETFCAP",
+			"CAP_SETPCAP",
+			"CAP_SETUID",
+			"CAP_SYS_ADMIN",
+			"CAP_SYS_CHROOT",
+			"CAP_SYS_NICE",
+			"CAP_SYS_PTRACE",
+			"CAP_SYS_TTY_CONFIG",
+			"CAP_SYS_RESOURCE",
+			"CAP_SYS_BOOT",
+			"CAP_AUDIT_WRITE",
+			"CAP_AUDIT_CONTROL",
+		}, ","),
+		capRemoveSet: "x",
+		expected: strings.Join([]string{
+			"chown",
+			"dac_override",
+			"dac_read_search",
+			"fowner",
+			"fsetid",
+			"kill",
+			"setgid",
+			"setuid",
+			"setpcap",
+			"linux_immutable",
+			"net_bind_service",
+			"net_broadcast",
+			"net_raw",
+			"ipc_owner",
+			"sys_chroot",
+			"sys_ptrace",
+			"sys_admin",
+			"sys_boot",
+			"sys_nice",
+			"sys_resource",
+			"sys_tty_config",
+			"lease",
+			"audit_write",
+			"audit_control",
+			"setfcap",
+		}, ", "),
+	},
+	// Testing remove set
+	{
+		testName:     "image-remove-one-from-default",
+		capRetainSet: "x",
+		capRemoveSet: "CAP_CHOWN",
+		expected: strings.Join([]string{
+			"dac_override, fowner, fsetid, kill, setgid, setuid, setpcap, net_bind_service, net_raw, sys_chroot, mknod, audit_write, setfcap",
+		}, ", "),
+	},
+	{
+		testName:     "image-remove-one-already-removed",
+		capRetainSet: "x",
+		capRemoveSet: "CAP_SYS_ADMIN",
+		expected: strings.Join([]string{
+			"chown",
+			"dac_override",
+			"fowner",
+			"fsetid",
+			"kill",
+			"setgid",
+			"setuid",
+			"setpcap",
+			"net_bind_service",
+			"net_raw",
+			"sys_chroot",
+			"mknod",
+			"audit_write",
+			"setfcap",
+		}, ", "),
+	},
+	{
+		testName:     "image-remove-two",
+		capRetainSet: "x",
+		capRemoveSet: "CAP_CHOWN,CAP_SYS_ADMIN",
+		expected: strings.Join([]string{
+			"dac_override",
+			"fowner",
+			"fsetid",
+			"kill",
+			"setgid",
+			"setuid",
+			"setpcap",
+			"net_bind_service",
+			"net_raw",
+			"sys_chroot",
+			"mknod",
+			"audit_write",
+			"setfcap",
+		}, ", "),
+	},
+	{
+		testName:     "image-remove-all",
+		capRetainSet: "x",
+		capRemoveSet: strings.Join([]string{
+			"CAP_AUDIT_WRITE",
+			"CAP_CHOWN",
+			"CAP_DAC_OVERRIDE",
+			"CAP_FSETID",
+			"CAP_FOWNER",
+			"CAP_KILL",
+			"CAP_MKNOD",
+			"CAP_NET_RAW",
+			"CAP_NET_BIND_SERVICE",
+			"CAP_SETUID",
+			"CAP_SETGID",
+			"CAP_SETPCAP",
+			"CAP_SETFCAP",
+			"CAP_SYS_CHROOT",
+		}, ","),
+		expected: "",
+	},
+	{
+		testName:     "image-remove-all-but-one",
+		capRetainSet: "x",
+		capRemoveSet: strings.Join([]string{
+			"CAP_AUDIT_WRITE",
+			"CAP_CHOWN",
+			"CAP_DAC_OVERRIDE",
+			"CAP_FSETID",
+			"CAP_FOWNER",
+			"CAP_KILL",
+			"CAP_MKNOD",
+			"CAP_NET_RAW",
+			"CAP_NET_BIND_SERVICE",
+			"CAP_SETUID",
+			"CAP_SETGID",
+			"CAP_SETPCAP",
+			"CAP_SETFCAP",
+		}, ","),
+		expected: "sys_chroot",
+	},
+	{
+		testName:     "image-remove-all-plus-one",
+		capRetainSet: "x",
+		capRemoveSet: strings.Join([]string{
+			"CAP_AUDIT_WRITE",
+			"CAP_CHOWN",
+			"CAP_DAC_OVERRIDE",
+			"CAP_FSETID",
+			"CAP_FOWNER",
+			"CAP_KILL",
+			"CAP_MKNOD",
+			"CAP_NET_RAW",
+			"CAP_NET_BIND_SERVICE",
+			"CAP_SETUID",
+			"CAP_SETGID",
+			"CAP_SETPCAP",
+			"CAP_SETFCAP",
+			"CAP_SYS_CHROOT",
+			"CAP_SYS_ADMIN",
+		}, ","),
+		expected: "",
+	},
+	// Testing with an empty retain set or an empty remove set
+	// TODO(alban): "actool patch-manifest" cannot generate those images for now
+	//{
+	//	testName:     "image-retain-set-empty",
+	//	capRetainSet: "",
+	//	capRemoveSet: "x",
+	//	expected:     "",
+	//},
+	//{
+	//	testName:     "image-remove-none",
+	//	capRetainSet: "x",
+	//	capRemoveSet: "",
+	//	expected:     "TODO(alban)",
+	//},
+}
+
+func capsSeveralAppsRunAndCheckOutput(t *testing.T, ctx *testutils.RktRunCtx, cmd string) {
+	// Ideally, the test would run the pod only one time, but all
+	// apps' output is mixed together without ordering guarantees, so
+	// it makes it impossible to call all the expectWithOutput() in
+	// the correct order.
+	for _, tt := range appCapsTests {
+		t.Logf("Checking caps for %q", tt.testName)
+		child := spawnOrFail(t, cmd)
+
+		expected := fmt.Sprintf("Capability set: bounding: %s (%s)",
+			tt.expected, tt.testName)
+		if err := expectWithOutput(child, expected); err != nil {
+			t.Fatalf("Expected %q but not found: %v", expected, err)
+		}
+
+		waitOrFail(t, child, 0)
+
+		ctx.RunGC()
+	}
+}
+
+func TestCapsSeveralAppWithPatches(t *testing.T) {
+	// All the following images are launched together in the same pod
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for i, tt := range appCapsTests {
+		patches := []string{
+			fmt.Sprintf("--name=%s", tt.testName),
+			fmt.Sprintf("--exec=/inspect --print-caps-pid=0 --suffix-msg=%s", tt.testName),
+		}
+		if tt.capRetainSet != "x" {
+			patches = append(patches, "--capability="+tt.capRetainSet)
+		}
+		if tt.capRemoveSet != "x" {
+			patches = append(patches, "--revoke-capability="+tt.capRemoveSet)
+		}
+		imageFile := patchTestACI(tt.testName+".aci", patches...)
+		defer os.Remove(imageFile)
+		appCapsTests[i].imageFile = imageFile
+		t.Logf("Built image %q", imageFile)
+	}
+
+	// Generate the rkt arguments to launch all the apps in the same pod
+	rktArgs := ""
+	for _, tt := range appCapsTests {
+		rktArgs += " " + tt.imageFile
+	}
+	cmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), rktArgs)
+
+	capsSeveralAppsRunAndCheckOutput(t, ctx, cmd)
+}
+
+func TestCapsSeveralAppWithFlags(t *testing.T) {
 	// All the following images are launched together in the same pod
-	var appCapsTests = []struct {
-		// constants
-		testName     string // name of the image
-		capRemainSet string // if != "x", value passed to actool patch-manifest --capability=
-		capRemoveSet string // if != "x", value passed to actool patch-manifest --revoke-capability=
-		expected     string // caps bounding set as printed by gocapability
-
-		// set during the test
-		imageFile string
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for i, tt := range appCapsTests {
+		imageFile := patchTestACI(tt.testName+".aci", fmt.Sprintf("--name=%s", tt.testName),
+			fmt.Sprintf("--exec=/inspect --print-caps-pid=0 --suffix-msg=%s", tt.testName))
+		defer os.Remove(imageFile)
+		appCapsTests[i].imageFile = imageFile
+		t.Logf("Built image %q", imageFile)
+	}
+
+	// Generate the rkt arguments to launch all the apps in the same pod
+	rktArgs := ""
+	for _, tt := range appCapsTests {
+		rktArgs += " " + tt.imageFile
+		if tt.capRetainSet != "x" {
+			rktArgs += " --cap-retain=" + tt.capRetainSet
+		}
+		if tt.capRemoveSet != "x" {
+			rktArgs += " --cap-remove=" + tt.capRemoveSet
+		}
+	}
+	cmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), rktArgs)
+
+	capsSeveralAppsRunAndCheckOutput(t, ctx, cmd)
+}
+
+// Tests that flags on the command line override the isolator in the ACI
+func TestCapsOverride(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	var appCapsOverride = []struct {
+		testName        string // name of the image
+		capRetainSetImg string // only use value if != "x"
+		capRemoveSetImg string // only use value if != "x"
+		capRetainSetFlg string // only use value if != "x"
+		capRemoveSetFlg string // only use value if != "x"
+		expected        string // caps bounding set as printed by gocapability
 	}{
-		// Testing without isolators
-		{
-			testName:     "image-none",
-			capRemainSet: "x",
-			capRemoveSet: "x",
-			expected: strings.Join([]string{
-				"chown",
-				"dac_override",
-				"fowner",
-				"fsetid",
-				"kill",
-				"setgid",
-				"setuid",
-				"setpcap",
-				"net_bind_service",
-				"net_raw",
-				"sys_chroot",
-				"mknod",
-				"audit_write",
-				"setfcap",
-			}, ", "),
-		},
-		// Testing remain set
-		{
-			testName:     "image-only-one-cap",
-			capRemainSet: "CAP_NET_ADMIN",
-			capRemoveSet: "x",
-			expected:     "net_admin",
-		},
-		{
-			testName:     "image-only-one-cap-from-default",
-			capRemainSet: "CAP_CHOWN",
-			capRemoveSet: "x",
-			expected:     "chown",
-		},
 		{
-			testName: "image-some-caps",
-			capRemainSet: strings.Join([]string{
-				"CAP_CHOWN",
-				"CAP_FOWNER",
-				"CAP_SYS_ADMIN",
-				"CAP_NET_ADMIN",
-			}, ","),
-			capRemoveSet: "x",
+			testName:        "retain-override-retain",
+			capRetainSetImg: "CAP_MKNOD",
+			capRemoveSetImg: "x",
+			capRetainSetFlg: "CAP_SYS_ADMIN",
+			capRemoveSetFlg: "x",
 			expected: strings.Join([]string{
-				"chown",
-				"fowner",
-				"net_admin",
 				"sys_admin",
 			}, ", "),
 		},
 		{
-			testName: "image-caps-from-nspawn-default",
-			capRemainSet: strings.Join([]string{
-				"CAP_CHOWN",
-				"CAP_DAC_OVERRIDE",
-				"CAP_DAC_READ_SEARCH",
-				"CAP_FOWNER",
-				"CAP_FSETID",
-				"CAP_IPC_OWNER",
-				"CAP_KILL",
-				"CAP_LEASE",
-				"CAP_LINUX_IMMUTABLE",
-				"CAP_NET_BIND_SERVICE",
-				"CAP_NET_BROADCAST",
-				"CAP_NET_RAW",
-				"CAP_SETGID",
-				"CAP_SETFCAP",
-				"CAP_SETPCAP",
-				"CAP_SETUID",
-				"CAP_SYS_ADMIN",
-				"CAP_SYS_CHROOT",
-				"CAP_SYS_NICE",
-				"CAP_SYS_PTRACE",
-				"CAP_SYS_TTY_CONFIG",
-				"CAP_SYS_RESOURCE",
-				"CAP_SYS_BOOT",
-				"CAP_AUDIT_WRITE",
-				"CAP_AUDIT_CONTROL",
-			}, ","),
-			capRemoveSet: "x",
+			testName:        "retain-override-remove",
+			capRetainSetImg: "x",
+			capRemoveSetImg: "CAP_CHOWN",
+			capRetainSetFlg: "CAP_SYS_ADMIN",
+			capRemoveSetFlg: "x",
 			expected: strings.Join([]string{
-				"chown",
-				"dac_override",
-				"dac_read_search",
-				"fowner",
-				"fsetid",
-				"kill",
-				"setgid",
-				"setuid",
-				"setpcap",
-				"linux_immutable",
-				"net_bind_service",
-				"net_broadcast",
-				"net_raw",
-				"ipc_owner",
-				"sys_chroot",
-				"sys_ptrace",
 				"sys_admin",
-				"sys_boot",
-				"sys_nice",
-				"sys_resource",
-				"sys_tty_config",
-				"lease",
-				"audit_write",
-				"audit_control",
-				"setfcap",
 			}, ", "),
 		},
-		// Testing revoke set
 		{
-			testName:     "image-revoke-one-from-default",
-			capRemainSet: "x",
-			capRemoveSet: "CAP_CHOWN",
-			expected: strings.Join([]string{
-				"dac_override, fowner, fsetid, kill, setgid, setuid, setpcap, net_bind_service, net_raw, sys_chroot, mknod, audit_write, setfcap",
-			}, ", "),
-		},
-		{
-			testName:     "image-revoke-one-already-revoked",
-			capRemainSet: "x",
-			capRemoveSet: "CAP_SYS_ADMIN",
+			testName:        "remove-override-remove",
+			capRetainSetImg: "x",
+			capRemoveSetImg: "CAP_CHOWN",
+			capRetainSetFlg: "x",
+			capRemoveSetFlg: "CAP_KILL",
 			expected: strings.Join([]string{
 				"chown",
 				"dac_override",
 				"fowner",
 				"fsetid",
-				"kill",
 				"setgid",
 				"setuid",
 				"setpcap",
@@ -178,14 +414,16 @@ func TestCapsSeveralApp(t *testing.T) {
 			}, ", "),
 		},
 		{
-			testName:     "image-revoke-two",
-			capRemainSet: "x",
-			capRemoveSet: "CAP_CHOWN,CAP_SYS_ADMIN",
+			testName:        "remove-override-retain",
+			capRetainSetImg: "CAP_MKNOD",
+			capRemoveSetImg: "x",
+			capRetainSetFlg: "x",
+			capRemoveSetFlg: "CAP_KILL",
 			expected: strings.Join([]string{
+				"chown",
 				"dac_override",
 				"fowner",
 				"fsetid",
-				"kill",
 				"setgid",
 				"setuid",
 				"setpcap",
@@ -197,117 +435,31 @@ func TestCapsSeveralApp(t *testing.T) {
 				"setfcap",
 			}, ", "),
 		},
-		{
-			testName:     "image-revoke-all",
-			capRemainSet: "x",
-			capRemoveSet: strings.Join([]string{
-				"CAP_AUDIT_WRITE",
-				"CAP_CHOWN",
-				"CAP_DAC_OVERRIDE",
-				"CAP_FSETID",
-				"CAP_FOWNER",
-				"CAP_KILL",
-				"CAP_MKNOD",
-				"CAP_NET_RAW",
-				"CAP_NET_BIND_SERVICE",
-				"CAP_SETUID",
-				"CAP_SETGID",
-				"CAP_SETPCAP",
-				"CAP_SETFCAP",
-				"CAP_SYS_CHROOT",
-			}, ","),
-			expected: "",
-		},
-		{
-			testName:     "image-revoke-all-but-one",
-			capRemainSet: "x",
-			capRemoveSet: strings.Join([]string{
-				"CAP_AUDIT_WRITE",
-				"CAP_CHOWN",
-				"CAP_DAC_OVERRIDE",
-				"CAP_FSETID",
-				"CAP_FOWNER",
-				"CAP_KILL",
-				"CAP_MKNOD",
-				"CAP_NET_RAW",
-				"CAP_NET_BIND_SERVICE",
-				"CAP_SETUID",
-				"CAP_SETGID",
-				"CAP_SETPCAP",
-				"CAP_SETFCAP",
-			}, ","),
-			expected: "sys_chroot",
-		},
-		{
-			testName:     "image-revoke-all-plus-one",
-			capRemainSet: "x",
-			capRemoveSet: strings.Join([]string{
-				"CAP_AUDIT_WRITE",
-				"CAP_CHOWN",
-				"CAP_DAC_OVERRIDE",
-				"CAP_FSETID",
-				"CAP_FOWNER",
-				"CAP_KILL",
-				"CAP_MKNOD",
-				"CAP_NET_RAW",
-				"CAP_NET_BIND_SERVICE",
-				"CAP_SETUID",
-				"CAP_SETGID",
-				"CAP_SETPCAP",
-				"CAP_SETFCAP",
-				"CAP_SYS_CHROOT",
-				"CAP_SYS_ADMIN",
-			}, ","),
-			expected: "",
-		},
-		// Testing with an empty remain set or an empty remove set
-		// TODO(alban): "actool patch-manifest" cannot generate those images for now
-		//{
-		//	testName:     "image-remain-set-empty",
-		//	capRemainSet: "",
-		//	capRemoveSet: "x",
-		//	expected:     "",
-		//},
-		//{
-		//	testName:     "image-revoke-none",
-		//	capRemainSet: "x",
-		//	capRemoveSet: "",
-		//	expected:     "TODO(alban)",
-		//},
 	}
 
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	for i, tt := range appCapsTests {
+	for _, tt := range appCapsOverride {
 		patches := []string{
 			fmt.Sprintf("--name=%s", tt.testName),
 			fmt.Sprintf("--exec=/inspect --print-caps-pid=0 --suffix-msg=%s", tt.testName),
 		}
-		if tt.capRemainSet != "x" {
-			patches = append(patches, "--capability="+tt.capRemainSet)
+		if tt.capRetainSetImg != "x" {
+			patches = append(patches, "--capability="+tt.capRetainSetImg)
 		}
-		if tt.capRemoveSet != "x" {
-			patches = append(patches, "--revoke-capability="+tt.capRemoveSet)
+		if tt.capRemoveSetImg != "x" {
+			patches = append(patches, "--revoke-capability="+tt.capRemoveSetImg)
 		}
 		imageFile := patchTestACI(tt.testName+".aci", patches...)
 		defer os.Remove(imageFile)
-		appCapsTests[i].imageFile = imageFile
 		t.Logf("Built image %q", imageFile)
-	}
 
-	// Generate the rkt arguments to launch all the apps in the same pod
-	rktArgs := ""
-	for _, tt := range appCapsTests {
-		rktArgs += " " + tt.imageFile
-	}
-	cmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), rktArgs)
+		cmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), imageFile)
+		if tt.capRetainSetFlg != "x" {
+			cmd += " --cap-retain=" + tt.capRetainSetFlg
+		}
+		if tt.capRemoveSetFlg != "x" {
+			cmd += " --cap-remove=" + tt.capRemoveSetFlg
+		}
 
-	// Ideally, the test would run the pod only one time, but all
-	// apps' output is mixed together without ordering guarantees, so
-	// it makes it impossible to call all the expectWithOutput() in
-	// the correct order.
-	for _, tt := range appCapsTests {
 		t.Logf("Checking caps for %q", tt.testName)
 		child := spawnOrFail(t, cmd)
 

From 9c6c37ec007e9c2b818002c504a200f587b122e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=C5=BBy=C5=82owski?=
 <michal.zylowski@intel.com>
Date: Mon, 13 Jun 2016 11:42:45 +0200
Subject: [PATCH 0405/1304] tests: enable all cases in capabilities test for
 rkt-kvm

---
 tests/rkt_caps_kvm_test.go    | 6 +-----
 tests/rkt_caps_nspawn_test.go | 2 +-
 tests/rkt_caps_test.go        | 5 ++---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/rkt_caps_kvm_test.go b/tests/rkt_caps_kvm_test.go
index b30a108319..b72e5479bb 100644
--- a/tests/rkt_caps_kvm_test.go
+++ b/tests/rkt_caps_kvm_test.go
@@ -19,9 +19,5 @@ package main
 import "testing"
 
 func TestCaps(t *testing.T) {
-	// KVM is running VMs as stage1 pods, so root has access to all VM options.
-	// The case with access to PID 1 is skipped...
-	// KVM flavor runs systemd stage1 with full capabilities in stage1 (pid=1)
-	// so expect every capability enabled
-	NewCapsTest(true, []int{2}).Execute(t)
+	NewCapsTest(true).Execute(t)
 }
diff --git a/tests/rkt_caps_nspawn_test.go b/tests/rkt_caps_nspawn_test.go
index 5c3f2e048b..d23f8f4b09 100644
--- a/tests/rkt_caps_nspawn_test.go
+++ b/tests/rkt_caps_nspawn_test.go
@@ -19,5 +19,5 @@ package main
 import "testing"
 
 func TestCaps(t *testing.T) {
-	NewCapsTest(false, []int{1, 2}).Execute(t)
+	NewCapsTest(false).Execute(t)
 }
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index b54057e0b5..e9dda79b79 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -373,8 +373,7 @@ var capsTests = []struct {
 	},
 }
 
-// CommonTestCaps creates a new capabilities test fixture for the given stages.
-func NewCapsTest(hasStage1FullCaps bool, stages []int) testutils.Test {
+func NewCapsTest(hasStage1FullCaps bool) testutils.Test {
 	return testutils.TestFunc(func(t *testing.T) {
 		ctx := testutils.NewRktRunCtx()
 		defer ctx.Cleanup()
@@ -392,7 +391,7 @@ func NewCapsTest(hasStage1FullCaps bool, stages []int) testutils.Test {
 			defer os.Remove(stage2FileName)
 			stageFileNames := []string{stage1FileName, stage2FileName}
 
-			for _, stage := range stages {
+			for _, stage := range []int{1, 2} {
 				t.Logf("Running test #%v: %v [stage%v]", i, tt.testName, stage)
 
 				cmd := fmt.Sprintf("%s --debug --insecure-options=image run --mds-register=false --set-env=CAPABILITY=%d %s", ctx.Cmd(), int(tt.capa), stageFileNames[stage-1])

From 8969389becbe2325c1338282f2f999f329963e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 15 Jun 2016 16:05:08 +0200
Subject: [PATCH 0406/1304] functional tests: sleep before killing rkt on
 TestResumedFetch

Our test server sends half of the file and then tells TestResumedFetch
via a channel that it should kill rkt and start another rkt process
to check if it resumes the download.

However, it may happen that rkt doesn't have time to write everything to
disk before it gets killed, in some cases it doesn't even have time to
write anything and the test fails.

To fix it, we sleep a bit before telling TestResumedFetch that it should
kill rkt.
---
 tests/rkt_fetch_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 3c3d56ae27..eefdedcf55 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -28,6 +28,7 @@ import (
 	"strings"
 	"sync"
 	"testing"
+	"time"
 
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/tests/testutils"
@@ -395,6 +396,9 @@ func testInterruptingServerHandler(t *testing.T, imagePath string, kill, waitfor
 			panic(err)
 		}
 
+		// sleep a bit before signaling that rkt should be killed since it
+		// might not have had time to write everything to disk
+		time.Sleep(time.Second)
 		kill <- struct{}{}
 		<-waitforkill
 	}

From b2bb6322d15774ab603470b305c5de7e85e5a8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 15 Jun 2016 16:19:25 +0200
Subject: [PATCH 0407/1304] functional tests: fix skipping tests on remote
 fetch failure

If we call `t.Errorf` before skipping, our test will fail...
---
 tests/rkt_fetch_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index eefdedcf55..86c080b256 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -165,7 +165,7 @@ func testFetchDefault(t *testing.T, arg string, image string, imageArgs string,
 	err := child.Wait()
 	status := getExitStatus(err)
 	if status != 0 {
-		t.Errorf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
+		t.Logf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
 		t.Skip("remote fetching failed, probably a network failure. Skipping...")
 	}
 
@@ -212,7 +212,7 @@ func testFetchNoStore(t *testing.T, args string, image string, imageArgs string,
 	err := child.Wait()
 	status := getExitStatus(err)
 	if status != 0 {
-		t.Errorf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
+		t.Logf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
 		t.Skip("remote fetching failed, probably a network failure. Skipping...")
 	}
 }

From c3265e928ef798415b64adc0aa5f69a9a8e5f143 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 14 Jun 2016 16:25:28 +0200
Subject: [PATCH 0408/1304] rkt/api_service: return err for non-journaling pods

Previously GetLogs assumed a journal directory is always present. This
assumption doesn't hold for the fly flavor.

This fixes it by returning an error in this case.

Fixes partially #2792
---
 api/v1alpha/client_example.go | 10 ++++++++--
 rkt/api_service.go            |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/api/v1alpha/client_example.go b/api/v1alpha/client_example.go
index 6be7c32ac0..81d3d15c7d 100644
--- a/api/v1alpha/client_example.go
+++ b/api/v1alpha/client_example.go
@@ -41,15 +41,21 @@ func getLogsWithoutFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
 		SinceTime: time.Now().Add(-time.Second * 5).Unix(),
 		Lines:     10,
 	})
+
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 
 	logsRecvResp, err := logsResp.Recv()
+
+	if err == io.EOF {
+		return
+	}
+
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(1)
+		return
 	}
 
 	for _, l := range logsRecvResp.Lines {
@@ -81,7 +87,7 @@ func getLogsWithFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
 
 		if err != nil {
 			fmt.Println(err)
-			os.Exit(1)
+			return
 		}
 
 		for _, l := range logsRecvResp.Lines {
diff --git a/rkt/api_service.go b/rkt/api_service.go
index d98afc152d..2f37305858 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -735,6 +735,11 @@ func (s *v1AlphaAPIServer) GetLogs(request *v1alpha.GetLogsRequest, server v1alp
 		stage1Path = fmt.Sprintf("/overlay/%s/upper/", stage1TreeStoreID)
 	}
 	path := filepath.Join(getDataDir(), "/pods/run/", request.PodId, stage1Path, "/var/log/journal/")
+
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return fmt.Errorf("%s: logging unsupported", uuid.String())
+	}
+
 	jconf := sdjournal.JournalReaderConfig{
 		Path: path,
 	}

From 6f9be548c580643ffeb0d36d97d026359a259556 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 1 Jun 2016 12:11:56 +0200
Subject: [PATCH 0409/1304] docs: add Jenkins CI Badge

https://jenkins-rkt-public.prod.coreos.systems/
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 12611baa68..83f8cfc1d4 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![godoc](https://godoc.org/github.com/coreos/rkt?status.svg)](http://godoc.org/github.com/coreos/rkt)
 [![Build Status (Travis)](https://travis-ci.org/coreos/rkt.svg?branch=master)](https://travis-ci.org/coreos/rkt)
 [![Build Status (SemaphoreCI)](https://semaphoreci.com/api/v1/projects/28468e19-4fd0-483e-9c29-6c8368661333/395211/badge.svg)](https://semaphoreci.com/coreos/rkt)
+[![Build Status (Jenkins)](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-matrix/badge/icon)](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-matrix/)
 
 ![rkt Logo](logos/rkt-horizontal-color.png)
 

From 579da705a27ccbba15f23e2876779ba668a0dd2e Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@coreos.com>
Date: Tue, 24 May 2016 14:12:50 -0700
Subject: [PATCH 0410/1304] dist: Add rkt-api systemd unit

This commit adds a sample service file for a rkt api-service listening
on localhost.
---
 dist/init/systemd/rkt-api.service | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 dist/init/systemd/rkt-api.service

diff --git a/dist/init/systemd/rkt-api.service b/dist/init/systemd/rkt-api.service
new file mode 100644
index 0000000000..c4d8031b94
--- /dev/null
+++ b/dist/init/systemd/rkt-api.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=rkt api service
+Documentation=http://github.com/coreos/rkt
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/rkt api-service --listen="127.0.0.1:15441"
+
+[Install]
+WantedBy=multi-user.target

From e9afff0d70401f4e8acf69070cc7196b3ed15cce Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@coreos.com>
Date: Mon, 13 Jun 2016 19:16:03 -0700
Subject: [PATCH 0411/1304] docs: Add a few words about rkt api-service unit

---
 Documentation/packaging.md               | 3 ++-
 Documentation/subcommands/api-service.md | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Documentation/packaging.md b/Documentation/packaging.md
index 8393bee81d..016a5cdde6 100644
--- a/Documentation/packaging.md
+++ b/Documentation/packaging.md
@@ -48,12 +48,13 @@ When the ownership and permissions of `/var/lib/rkt` are set up correctly, membe
 
 ### systemd units
 
-A few [example systemd unit files for rkt helper services][rkt-units] are included in the rkt sources. These units demonstrate a systemd-managed, socket-activated rkt [metadata-service][rkt-metadata-svc], along with a convenient periodic [garbage collection][rkt-gc] service invoked at 12-hour intervals to purge dead pods.
+A few [example systemd unit files for rkt helper services][rkt-units] are included in the rkt sources. These units demonstrate systemd-managed units to run the rkt [metadata-service][rkt-metadata-svc] with socket-activation, the rkt [api-service][api-service], and a periodic [garbage collection][rkt-gc] service invoked at 12-hour intervals to purge dead pods.
 
 
 [build-config]: build-configure.md
 [rkt-gc]: subcommands/gc.md
 [rkt-metadata-svc]: subcommands/metadata-service.md
+[api-service]: subcommands/api-service.md
 [rkt-units]: https://github.com/coreos/rkt/tree/master/dist/init/systemd
 [build-deps]: dependencies.md#build-time-dependencies
 [run-deps]: dependencies.md#run-time-dependencies
diff --git a/Documentation/subcommands/api-service.md b/Documentation/subcommands/api-service.md
index e2795e4d51..160d27712c 100644
--- a/Documentation/subcommands/api-service.md
+++ b/Documentation/subcommands/api-service.md
@@ -13,6 +13,8 @@ The API service listens for gRPC requests on the address and port specified by t
 The default is to listen on the loopback interface on port number `15441`, equivalent to invoking `rkt api-service --listen=localhost:15441`.
 Specify the address `0.0.0.0` to listen on all interfaces.
 
+Typically, the API service will be run via a unit file similar to the one included in the [dist directory](../dist/init/systemd/rkt-api.service).
+
 ## Using the API service
 
 The interfaces are defined in the [protobuf here](../../api/v1alpha/api.proto).

From c10a4564981918701b8f9aa5b334c21f263ffa1c Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 17 Jun 2016 21:01:15 +0200
Subject: [PATCH 0412/1304] tests: skip integration tests for dist/ changes

---
 tests/build-and-run-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index 2b944ee44b..ddc02a315f 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -255,6 +255,7 @@ function main {
 
     DOC_CHANGE_PATTERN="\
             -e ^Documentation/ \
+            -e ^dist/ \
             -e ^logos/ \
             -e ^(MAINTAINERS|LICENSE|DCO)$ \
             -e \.md$\

From 9b442efb30d8e54dbe043f066e39c8b2f573970c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 20 Jun 2016 16:32:57 +0200
Subject: [PATCH 0413/1304] pkg/multicall: strip path from command before
 matching

This commit strips base path from command name before trying multicall
matching. It allows for file binaries to be properly run with entrypoint
hijacking via multicall.
---
 pkg/multicall/multicall.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/multicall/multicall.go b/pkg/multicall/multicall.go
index 1541c5ddc1..d16455f07c 100644
--- a/pkg/multicall/multicall.go
+++ b/pkg/multicall/multicall.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path"
 	"syscall"
 )
 
@@ -62,7 +63,7 @@ func Add(name string, fn commandFn) Entrypoint {
 // exit with an exit status of 1, otherwise it will exit with a 0 exit
 // status.
 func MaybeExec() {
-	name := os.Args[0]
+	name := path.Base(os.Args[0])
 	if fn, ok := commands[name]; ok {
 		if err := fn(); err != nil {
 			fmt.Fprintln(os.Stderr, err)

From 166b5603f24902711ceed01a146e06f9fbbaa671 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Sat, 20 Jun 2015 11:12:50 +0200
Subject: [PATCH 0414/1304] rkt/uuid: fix match when uuid is an empty string

After the patch, if the uuid is an empty string then matchUUID(uuid string)
returns `UUID cannot be empty` error message instead of all the pods.
This is done to avoid `rkt rm` or `rkt enter` to delete or enter pods
without intending to.

Fixes https://github.com/coreos/rkt/issues/2806
---
 rkt/uuid.go          |  4 ++++
 tests/rkt_rm_test.go | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/rkt/uuid.go b/rkt/uuid.go
index 3969beeb60..0ca536b6cd 100644
--- a/rkt/uuid.go
+++ b/rkt/uuid.go
@@ -30,6 +30,10 @@ import (
 // matchUUID attempts to match the uuid specified as uuid against all pods present.
 // An array of matches is returned, which may be empty when nothing matches.
 func matchUUID(uuid string) ([]string, error) {
+	if uuid == "" {
+		return nil, types.ErrNoEmptyUUID
+	}
+
 	ls, err := listPods(includePrepareDir | includePreparedDir | includeRunDir | includeExitedGarbageDir)
 	if err != nil {
 		return nil, err
diff --git a/tests/rkt_rm_test.go b/tests/rkt_rm_test.go
index c8c4b3a682..6ad66857f9 100644
--- a/tests/rkt_rm_test.go
+++ b/tests/rkt_rm_test.go
@@ -99,3 +99,14 @@ func TestRmInvalid(t *testing.T) {
 	cmd = fmt.Sprintf("%s rm --uuid-file=%s", ctx.Cmd(), uuidFile)
 	runRktAndCheckOutput(t, cmd, expected, true)
 }
+
+func TestRmEmptyUUID(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	emptyUUID := "\"\""
+	expected := fmt.Sprintf("UUID cannot be empty")
+
+	cmd := fmt.Sprintf("%s rm %s", ctx.Cmd(), emptyUUID)
+	runRktAndCheckOutput(t, cmd, expected, true)
+}

From f0bed3d8bd8ee55cd0b23f3e82aa7d3a80d7f843 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 16 Jun 2016 15:47:06 +0200
Subject: [PATCH 0415/1304] Documentation/vagrant: use rkt binary for getting
 started

Currently to get started with rkt we recommend using "vagrant up". This
tries to build rkt inside a virtual machine.

This cleans up the install-vagrant.sh script to use a released version
of rkt instead.

It also removes scripts not being used any more.

Fixes #2789
---
 Documentation/distributions.md          | 30 ++++++++
 Documentation/getting-started-ubuntu.md | 97 -------------------------
 Documentation/trying-out-rkt.md         | 57 ++++++++++++++-
 Vagrantfile                             | 10 +--
 scripts/install-acbuild.sh              | 14 ----
 scripts/install-common.sh               | 12 ---
 scripts/install-go.sh                   | 37 ----------
 scripts/install-rkt.sh                  | 65 ++++++++++++++++-
 scripts/install-vagrant.sh              | 21 ------
 9 files changed, 152 insertions(+), 191 deletions(-)
 delete mode 100644 Documentation/getting-started-ubuntu.md
 delete mode 100755 scripts/install-acbuild.sh
 delete mode 100755 scripts/install-common.sh
 delete mode 100755 scripts/install-go.sh
 delete mode 100755 scripts/install-vagrant.sh

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index e9afb6ba7a..b40c41c75e 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -7,6 +7,36 @@ The [CoreOS releases page](https://coreos.com/releases/) lists the version of rk
 
 If the version of rkt included in CoreOS is too old, it's fairly trivial to fetch the desired version [via a systemd unit](install-rkt-in-coreos.md)
 
+## Debian
+
+rkt currently is packaged in Debian sid (unstable) available at https://packages.debian.org/sid/utils/rkt:
+
+```
+sudo apt-get install rkt
+```
+
+Note that due to an outstanding bug (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823322) one has to use the "coreos" stage1 image:
+
+```
+sudo rkt run --insecure-options=image --stage1-name=coreos.com/rkt/stage1-coreos:1.5.1 docker://nginx
+```
+
+If you prefer to install the newest version of rkt follow the instructions in the Ubuntu section below.
+
+## Ubuntu
+
+rkt is not packaged currently in Ubuntu. If you want the newest version of rkt the easiest method to install it is using the `install-rkt.sh` script:
+
+```
+sudo ./scripts/install-rkt.sh
+```
+
+The above script will install the "gnupg2", and "checkinstall" packages, download rkt, verify it, and finally invoke "checkinstall" to create a deb pakage and install rkt. To uninstall rkt, execute:
+
+```
+sudo apt-get remove rkt
+```
+
 ## Fedora
 
 rkt is packaged in the development version of Fedora, [Rawhide](https://fedoraproject.org/wiki/Releases/Rawhide):
diff --git a/Documentation/getting-started-ubuntu.md b/Documentation/getting-started-ubuntu.md
deleted file mode 100644
index 83eb6208e9..0000000000
--- a/Documentation/getting-started-ubuntu.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Getting Started with rkt on Ubuntu Wily
-
-The following guide will show you how to build and run the sample [etcd ACI](https://github.com/coreos/etcd/releases/download/v2.0.9/etcd-v2.0.9-linux-amd64.aci) on the standard vagrantcloud.com [box for Ubuntu Wily](https://vagrantcloud.com/ubuntu/boxes/wily64).
-
-## Download and start an Ubuntu Wily box
-
-```
-vagrant init ubuntu/wily64
-vagrant up --provider virtualbox
-```
-
-## SSH into the VM and install rkt
-
-```
-vagrant ssh
-sudo -s
-
-wget https://github.com/coreos/rkt/releases/download/v1.8.0/rkt-v1.8.0.tar.gz
-tar xzvf rkt-v1.8.0.tar.gz
-cd rkt-v1.8.0
-./rkt help
-```
-
-## Trust the CoreOS signing key
-
-This shows how to trust the CoreOS signing key using the [`rkt trust` command](https://github.com/coreos/rkt/blob/master/Documentation/commands.md#rkt-trust).
-
-```
-./rkt trust --prefix=coreos.com/etcd
-Prefix: "coreos.com/etcd"
-Key: "https://coreos.com/dist/pubkeys/aci-pubkeys.gpg"
-GPG key fingerprint is: 8B86 DE38 890D DB72 9186  7B02 5210 BD88 8818 2190
-	CoreOS ACI Builder <release@coreos.com>
-	Are you sure you want to trust this key (yes/no)?
-	yes
-	Trusting "https://coreos.com/dist/pubkeys/aci-pubkeys.gpg" for prefix "coreos.com/etcd".
-	Added key for prefix "coreos.com/etcd" at "/etc/rkt/trustedkeys/prefix.d/coreos.com/etcd/8b86de38890ddb7291867b025210bd8888182190"
-```
-
-For more details on how signature verification works in rkt, see the [Signing and Verification Guide](https://github.com/coreos/rkt/blob/master/Documentation/signing-and-verification-guide.md).
-
-## Fetch the ACI
-
-The simplest way to retrieve the etcd ACI is to use image discovery:
-
-```
-./rkt fetch coreos.com/etcd:v2.0.9
-rkt: searching for app image coreos.com/etcd:v2.0.9
-rkt: fetching image from https://github.com/coreos/etcd/releases/download/v2.0.9/etcd-v2.0.9-linux-amd64.aci
-Downloading signature from https://github.com/coreos/etcd/releases/download/v2.0.9/etcd-v2.0.9-linux-amd64.aci.asc
-Downloading ACI: [================================             ] 2.71 MB/3.79 MB
-rkt: signature verified:
-  CoreOS ACI Builder <release@coreos.com>
-  sha512-91e98d7f1679a097c878203c9659f2a2
-```
-
-For more on this and other ways to retrieve ACIs, check out the `rkt fetch` section of the [commands guide](https://github.com/coreos/rkt/blob/master/Documentation/commands.md#rkt-fetch).
-
-## Run the ACI
-
-Finally, let's run the application we just retrieved:
-
-```
-./rkt run coreos.com/etcd:v2.0.9
-rkt: searching for app image coreos.com/etcd:v2.0.9
-rkt: found image in local store, skipping fetching from https://github.com/coreos/etcd/releases/download/v2.0.9/etcd-v2.0.9-linux-amd64.aci
-[  489.734930] etcd[4]: 2015/08/03 08:57:23 etcd: no data-dir provided, using default data-dir ./default.etcd
-[  489.739297] etcd[4]: 2015/08/03 08:57:23 etcd: listening for peers on http://localhost:2380
-[  489.740653] etcd[4]: 2015/08/03 08:57:23 etcd: listening for peers on http://localhost:7001
-[  489.741405] etcd[4]: 2015/08/03 08:57:23 etcd: listening for client requests on http://localhost:2379
-[  489.742178] etcd[4]: 2015/08/03 08:57:23 etcd: listening for client requests on http://localhost:4001
-[  489.743394] etcd[4]: 2015/08/03 08:57:23 etcdserver: datadir is valid for the 2.0.1 format
-[  489.743977] etcd[4]: 2015/08/03 08:57:23 etcdserver: name = default
-[  489.744707] etcd[4]: 2015/08/03 08:57:23 etcdserver: data dir = default.etcd
-[  489.745374] etcd[4]: 2015/08/03 08:57:23 etcdserver: member dir = default.etcd/member
-[  489.746029] etcd[4]: 2015/08/03 08:57:23 etcdserver: heartbeat = 100ms
-[  489.746688] etcd[4]: 2015/08/03 08:57:23 etcdserver: election = 1000ms
-[  489.747238] etcd[4]: 2015/08/03 08:57:23 etcdserver: snapshot count = 10000
-[  489.747586] etcd[4]: 2015/08/03 08:57:23 etcdserver: advertise client URLs = http://localhost:2379,http://localhost:4001
-[  489.747838] etcd[4]: 2015/08/03 08:57:23 etcdserver: initial advertise peer URLs = http://localhost:2380,http://localhost:7001
-[  489.748232] etcd[4]: 2015/08/03 08:57:23 etcdserver: initial cluster = default=http://localhost:2380,default=http://localhost:7001
-[  489.750110] etcd[4]: 2015/08/03 08:57:23 etcdserver: start member ce2a822cea30bfca in cluster 7e27652122e8b2ae
-[  489.750588] etcd[4]: 2015/08/03 08:57:23 raft: ce2a822cea30bfca became follower at term 0
-[  489.750839] etcd[4]: 2015/08/03 08:57:23 raft: newRaft ce2a822cea30bfca [peers: [], term: 0, commit: 0, applied: 0, lastindex: 0, lastterm: 0]
-[  489.751106] etcd[4]: 2015/08/03 08:57:23 raft: ce2a822cea30bfca became follower at term 1
-[  489.751990] etcd[4]: 2015/08/03 08:57:23 etcdserver: added local member ce2a822cea30bfca [http://localhost:2380 http://localhost:7001] to cluster 7e27652122e8b2ae
-[  491.050049] etcd[4]: 2015/08/03 08:57:25 raft: ce2a822cea30bfca is starting a new election at term 1
-[  491.051266] etcd[4]: 2015/08/03 08:57:25 raft: ce2a822cea30bfca became candidate at term 2
-[  491.052159] etcd[4]: 2015/08/03 08:57:25 raft: ce2a822cea30bfca received vote from ce2a822cea30bfca at term 2
-[  491.053349] etcd[4]: 2015/08/03 08:57:25 raft: ce2a822cea30bfca became leader at term 2
-[  491.053727] etcd[4]: 2015/08/03 08:57:25 raft.node: ce2a822cea30bfca elected leader ce2a822cea30bfca at term 2
-[  491.054883] etcd[4]: 2015/08/03 08:57:25 etcdserver: published {Name:default ClientURLs:[http://localhost:2379 http://localhost:4001]} to cluster 7e27652122e8b2ae
-```
-
-Congratulations!
-You've run your first application with rkt.
-For more on how to use rkt, check out the [commands guide](https://github.com/coreos/rkt/blob/master/Documentation/commands.md).
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index b8f2b7b2a0..620678485c 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -5,7 +5,7 @@ For a more in-depth guide of a full end-to-end workflow of building an applicati
 
 ## Using rkt on Linux
 
-rkt consists of a single CLI tool, and is currently supported on amd64 Linux. A modern kernel is required but there should be no other system dependencies. We recommend booting up a fresh virtual machine to test out rkt.
+rkt consists of a single CLI tool and can run on different platforms. The primary target platform currently is amd64 Linux. A modern kernel is required but there should be no other system dependencies.
 
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
@@ -16,6 +16,10 @@ cd rkt-v1.8.0
 ./rkt help
 ```
 
+Like most applications, the easiest way to run rkt is to install it with your system's package manager, like apt on Debian or dnf on Fedora. If your distribution doesn't include a rkt package, or your operating system isn't Linux at all, running rkt in a Vagrant virtual machine can be nearly as simple. The instructions below start a virtual machine with rkt installed and ready to run.
+
+Refer to the [distributions guide](distributions.md) whether a package is available for your Linux distribution.
+
 **SELinux Note**: rkt can use SELinux but the policy needs to be tailored to your distribution. We suggest that new users [disable SELinux](https://www.centos.org/docs/5/html/5.1/Deployment_Guide/sec-sel-enable-disable.html) to get started. If you can help package rkt for your distro [please help](https://github.com/coreos/rkt/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fdistribution++label%3Adependency%2Fexternal)!
 
 ### Optional: Set up Privilege Separation
@@ -65,7 +69,7 @@ If you want to run Vagrant on a Linux host machine, you may want to use libvirt
 ```
 vagrant plugin install vagrant-libvirt
 vagrant plugin install vagrant-mutate
-vagrant mutate ubuntu/vivid64 libvirt
+vagrant mutate ubuntu/xenial64 libvirt
 vagrant up --provider=libvirt
 ```
 
@@ -76,6 +80,55 @@ vagrant ssh
 rkt --help
 ```
 
+Additional help can be consulted in the rkt man pages:
+
+```
+man rkt
+```
+
+The Vagrant setup also includes bash-completion to assist with rkt subcommands and options.
+
+To reach pods from your host determine the IP address of the Vagrant machine:
+
+```
+vagrant ssh -c 'ip address'
+...
+3: enp0s8: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP group default qlen 1000
+    link/ether 08:00:27:04:e4:5d brd ff:ff:ff:ff:ff:ff
+    inet 172.28.128.3/24 brd 172.28.128.255 scope global enp0s8
+       valid_lft forever preferred_lft forever
+...
+
+```
+
+In the given example the Vagrant machine has the IP address `172.28.128.3`. The following command starts a nginx container using host networking and will be reachable from the host:
+
+```
+sudo rkt run --net=host --insecure-options=image docker://nginx
+```
+
+The nginx container is now accessible on the host under http://172.28.128.3. In order to use containers with the default contained network, a route to the 172.16.28.0/24 network has to be configured on the host:
+
+On Linux execute:
+```
+sudo ip route add 172.16.28.0/24 via 172.28.128.3
+```
+
+On OSX execute:
+```
+sudo route -n add 172.16.28.0/24 172.28.128.3
+```
+
+Now nginx can be started using the default network:
+```
+$ sudo rkt run --insecure-options=image docker://nginx
+$ rkt list
+UUID		APP	IMAGE NAME					STATE	CREATED		STARTED		NETWORKS
+0c3ab969	nginx	registry-1.docker.io/library/nginx:latest	running	2 minutes ago	2 minutes ago	default:ip4=172.16.28.2
+```
+
+The nginx container is now accessible on the host under http://172.16.28.2.
+
 Success! The rest of the guide can now be followed normally.
 
 ## rkt basics
diff --git a/Vagrantfile b/Vagrantfile
index 4edf002652..09511431ff 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,12 +1,10 @@
 Vagrant.configure('2') do |config|
-    # grab Ubuntu 15.10 official image
-    config.vm.box = "ubuntu/wily64" # Ubuntu 15.10
+    config.vm.box = "ubuntu/xenial64" # Ubuntu 16.04
 
     # fix issues with slow dns http://serverfault.com/a/595010
     config.vm.provider :virtualbox do |vb, override|
         vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
         vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
-        # add more ram, the default isn't enough for the build
         vb.customize ["modifyvm", :id, "--memory", "1024"]
     end
 
@@ -14,6 +12,8 @@ Vagrant.configure('2') do |config|
         libvirt.memory = 1024
     end
 
-    config.vm.synced_folder ".", "/vagrant", type: "rsync"
-    config.vm.provision :shell, :privileged => true, :path => "scripts/install-vagrant.sh"
+    config.vm.network "private_network", type: "dhcp"
+    config.vm.provision :shell, :privileged => true, :path => "scripts/install-rkt.sh"
+    config.vm.provision :shell, :inline => "usermod -a -G rkt-admin ubuntu"
+    config.vm.provision :shell, :inline => "usermod -a -G rkt ubuntu"
 end
diff --git a/scripts/install-acbuild.sh b/scripts/install-acbuild.sh
deleted file mode 100755
index 03dab5d616..0000000000
--- a/scripts/install-acbuild.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-
-if ! [ -e "$PWD/acbuild" ]; then
-    git clone https://github.com/appc/acbuild
-fi
-
-pushd acbuild
-
-git pull
-./build
-cp -v bin/* /usr/local/bin
-
-popd
diff --git a/scripts/install-common.sh b/scripts/install-common.sh
deleted file mode 100755
index a94468e305..0000000000
--- a/scripts/install-common.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get update
-apt-get install -y --no-install-recommends ca-certificates gcc libc6-dev make automake wget git coreutils cpio squashfs-tools realpath autoconf file libacl1-dev libtspi-dev bc libsystemd-dev
-
-./scripts/install-go.sh
-. /etc/profile
-
-./scripts/install-appc-spec.sh
diff --git a/scripts/install-go.sh b/scripts/install-go.sh
deleted file mode 100755
index 5f21b1841b..0000000000
--- a/scripts/install-go.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export DEBIAN_FRONTEND=noninteractive
-VERSION=1.5.3
-OS=linux
-ARCH=amd64
-
-prefix=/usr/local
-
-which wget || apt-get install -y wget
-# not essential but go get depends on it
-which git || apt-get install -y git
-
-# grab go
-if ! [ -e "$prefix/go" ]; then
-    if ! [ -e "go$VERSION.$OS-$ARCH.tar.gz" ]; then
-        wget -q https://storage.googleapis.com/golang/go$VERSION.$OS-$ARCH.tar.gz
-    fi
-    tar -C $prefix -xzf go$VERSION.$OS-$ARCH.tar.gz
-fi
-
-# setup user environment variables
-if ! [ -e "/etc/profile.d/01go.sh" ]; then
-    echo "export GOROOT=$prefix/go" | tee /etc/profile.d/01go.sh
-
-    cat << 'EOF' | tee -a /etc/profile.d/go.sh
-
-export GOPATH=$HOME/.gopath
-
-[ -e $GOPATH ] || mkdir -p $GOPATH
-
-export PATH=$GOPATH/bin:$GOROOT/bin:$PATH
-EOF
-
-fi
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 7a3f623926..6ad891b082 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -1,6 +1,65 @@
 #!/bin/bash
-
 set -e
+set -x
+
+cd $(mktemp -d)
+
+version="1.8.0"
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update
+apt-get install -y --no-install-recommends \
+        ca-certificates \
+        gnupg2 \
+        bash-completion \
+        checkinstall
+
+curl -sSL https://coreos.com/dist/pubkeys/app-signing-pubkey.gpg | gpg2 --import -
+key=$(gpg2 --with-colons --keyid-format LONG -k security@coreos.com | egrep ^pub | cut -d ':' -f5)
+
+wget --progress=bar:force https://github.com/coreos/rkt/releases/download/v"${version}"/rkt-v"${version}".tar.gz
+wget --progress=bar:force https://github.com/coreos/rkt/releases/download/v"${version}"/rkt-v"${version}".tar.gz.asc
+gpg2 --trusted-key "${key}" --verify-files *.asc
+
+tar xvzf rkt-v"${version}".tar.gz
+
+cat <<EOF >install-pak
+#!/bin/bash
+
+for flavor in fly coreos kvm; do
+    install -Dm644 rkt-v${version}/stage1-\${flavor}.aci /usr/lib/rkt/stage1-images/stage1-\${flavor}.aci
+done
+
+install -Dm755 rkt-v${version}/rkt /usr/bin/rkt
+
+for f in rkt-v${version}/manpages/*; do
+    install -Dm644 "\${f}" "/usr/share/man/man1/\$(basename \$f)"
+done
+
+install -Dm644 rkt-v${version}/bash_completion/rkt.bash /usr/share/bash-completion/completions/rkt
+install -Dm644 rkt-v${version}/init/systemd/tmpfiles.d/rkt.conf /usr/lib/tmpfiles.d/rkt.conf
+
+for unit in rkt-gc.{timer,service} rkt-metadata.{socket,service}; do
+    install -Dm644 rkt-v${version}/init/systemd/\$unit /usr/lib/systemd/system/\$unit
+done
+EOF
+chmod +x install-pak
+
+cat <<EOF >preinstall-pak
+#!/bin/sh
+
+groupadd --force --system rkt-admin
+groupadd --force --system rkt
+EOF
+chmod +x preinstall-pak
+
+cp rkt-v"${version}"/scripts/setup-data-dir.sh postinstall-pak
+chmod +x postinstall-pak
+
+cat <<EOF >>postinstall-pak
+systemctl daemon-reload
+systemd-tmpfiles --create /usr/lib/tmpfiles.d/rkt.conf
+EOF
 
-BUILDDIR=${BUILDDIR:-$PWD/build-rkt*}
-sudo cp -v $BUILDDIR/bin/* /usr/local/bin
+checkinstall -y --pkgname=rkt --pkgversion="${version}" ./install-pak
diff --git a/scripts/install-vagrant.sh b/scripts/install-vagrant.sh
deleted file mode 100755
index 326be704cf..0000000000
--- a/scripts/install-vagrant.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -e
-
-cd /vagrant
-
-echo "Installing common dependencies"
-./scripts/install-common.sh
-. /etc/profile
-
-echo "Installing acbuild"
-./scripts/install-acbuild.sh
-
-echo "Building rkt"
-./scripts/build-rkt.sh > rkt-build.log 2>&1
-
-echo "Installing rkt"
-./scripts/install-rkt.sh
-
-groupadd rkt
-./dist/scripts/setup-data-dir.sh
-usermod -a -G rkt vagrant

From ef86fb2f23297633399e93c337a38df44fc88b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 16 Jun 2016 11:12:54 +0200
Subject: [PATCH 0416/1304] store: print more information on rm as non-root

---
 store/store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/store/store.go b/store/store.go
index ee226632a1..77faf17d97 100644
--- a/store/store.go
+++ b/store/store.go
@@ -548,7 +548,7 @@ func (s *Store) RemoveACI(key string) error {
 		dirUid := int(fi.Sys().(*syscall.Stat_t).Uid)
 
 		if uid != dirUid && uid != 0 {
-			return fmt.Errorf("permission denied, are you root or the owner of the image?")
+			return fmt.Errorf("permission denied on %s, directory owner id (%d) does not match current real id (%d). Are you root or the owner of the image?", path, dirUid, uid)
 		}
 	}
 

From 9e7cd4620b0984ef597d5a571197c54b6f395e92 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 21 Jun 2016 13:56:52 +0200
Subject: [PATCH 0417/1304] docs: fix relative link in api-service

---
 Documentation/subcommands/api-service.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/api-service.md b/Documentation/subcommands/api-service.md
index 160d27712c..ace2116a09 100644
--- a/Documentation/subcommands/api-service.md
+++ b/Documentation/subcommands/api-service.md
@@ -13,7 +13,7 @@ The API service listens for gRPC requests on the address and port specified by t
 The default is to listen on the loopback interface on port number `15441`, equivalent to invoking `rkt api-service --listen=localhost:15441`.
 Specify the address `0.0.0.0` to listen on all interfaces.
 
-Typically, the API service will be run via a unit file similar to the one included in the [dist directory](../dist/init/systemd/rkt-api.service).
+Typically, the API service will be run via a unit file similar to the one included in the [dist directory](../../dist/init/systemd/rkt-api.service).
 
 ## Using the API service
 

From 30e5a121e9599976fbb40e0eeb8c7bad203f710b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 21 Jun 2016 12:06:18 +0200
Subject: [PATCH 0418/1304] stage1: update coreos image to 1068.0.0

This introduces support for arm64 and aligns to the current base of
beta channel.
---
 stage1/usr_from_coreos/coreos-common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index f864f56d6e..75abfb15cd 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -11,7 +11,7 @@ $(call setup-tmp-dir,CCN_TMPDIR)
 # systemd version in coreos image
 CCN_SYSTEMD_VERSION := v229
 # coreos image version
-CCN_IMG_RELEASE := 1032.0.0
+CCN_IMG_RELEASE := 1068.0.0
 # coreos image URL
 CCN_IMG_URL := https://alpha.release.core-os.net/amd64-usr/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image

From 344038ae27460e083f6dc404b0287c26be0a7654 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Sat, 20 Jun 2015 10:12:50 +0200
Subject: [PATCH 0419/1304] rkt/run: added --set-env-file switch and priorities
 for environments

--set-env-file gets an environment variables file path in the format "VAR=VALUE\n...".
This switch may be used multiple times on the command line to provide multiple
environment files. When it used multiple times, it merges each environment file
in a single environment and it returns an error if the same variable is set multiple
times (either in different files or in the same file).

This patch implements priorities among the various way to specify
environment variables, from highest to least priority:
1. Command line (--set-env)
2. From files (--set-env-file)
3. Image Manifest
4. Inherit (--inherit-env)
A variable in a group with an higher priority will override the value
of a variable with the same name in groups with lower priority without
producing any error. Variables with unique names will be always preserved.

Fixes https://github.com/coreos/rkt/issues/647
---
 Documentation/subcommands/prepare.md |  1 +
 Documentation/subcommands/run.md     |  5 +-
 rkt/prepare.go                       |  5 +-
 rkt/run.go                           | 73 +++++++++++++++++++++++++++-
 stage0/run.go                        | 30 ++++++------
 tests/env_file_test.conf             |  1 +
 tests/rkt_env_test.go                | 12 +++++
 7 files changed, 109 insertions(+), 18 deletions(-)
 create mode 100644 tests/env_file_test.conf

diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 23ac4bf0e2..419391314b 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -44,6 +44,7 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--private-users` |  `false` | `true` or `false` | Run within user namespaces |
 | `--quiet` |  `false` | `true` or `false` | Suppress superfluous output on stdout, print only the UUID on success |
 | `--set-env` |  `` | An environment variable. Syntax `NAME=VALUE` | An environment variable to set for apps |
+| `--set-env-file` |  `` | Path of an environment variables file | Environment variables to set for apps |
 | `--signature` |  `` | A file path | Local signature file to use in validating the preceding image |
 | `--stage1-url` |  `` | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported | Image to use as stage1 |
 | `--stage1-path` |  `` | A path to a stage1 image. Absolute and relative paths are supported | Image to use as stage1 |
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 16ad23eab9..dc4aa49b2a 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -80,11 +80,13 @@ To inherit all environment variables from the parent use the `--inherit-env` fla
 
 To explicitly set individual environment variables use the `--set-env` flag.
 
+To explicitly set environment variables from a file use the `--set-env-file` flag. Variables are expected to be in the format `VAR_NAME=VALUE` separated by the new line character `\n`. Lines starting with `#` or `;` and empty ones will be ignored.
 The precedence is as follows with the last item replacing previous environment entries:
 
 - Parent environment
 - App image environment
-- Explicitly set environment
+- Explicitly set environment variables from file (`--set-env-file`)
+- Explicitly set environment variables on command line (`--set-env`)
 
 ```
 # export EXAMPLE_ENV=hello
@@ -360,6 +362,7 @@ For more details see the [hacking documentation](../hacking.md).
 | `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network](../networking/overview.md#contained-mode). Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080` |
 | `--private-users` |  `false` | `true` or `false` | Run within user namespaces. |
 | `--set-env` | none | An environment variable (ex. `--set-env=NAME=VALUE`) | An environment variable to set for apps. |
+| `--set-env-file` |  `` | Path of an environment variables file (ex. `--set-env-file=/path/to/env/file`) | Environment variables to set for apps |
 | `--signature` | none | A file path | Local signature file to use in validating the preceding image |
 | `--stage1-from-dir` | none | Image name (ex. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A stage1 image file name to search for inside the default stage1 images directory. |
 | `--stage1-hash` | none | Image hash (ex. `--stage1-hash=sha512-dedce9f5ea50`) | A hash of a stage1 image. The image must exist in the store. |
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 8bcb22f809..a71e673203 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -60,6 +60,7 @@ func init() {
 	cmdPrepare.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
 	cmdPrepare.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
 	cmdPrepare.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for apps in the form name=value")
+	cmdPrepare.Flags().Var(&flagEnvFromFile, "set-env-file", "the path to an environment variables file")
 	cmdPrepare.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
 	cmdPrepare.Flags().BoolVar(&flagNoStore, "no-store", false, "fetch images ignoring the local store")
 	cmdPrepare.Flags().StringVar(&flagPodManifest, "pod-manifest", "", "the path to the pod manifest. If it's non-empty, then only '--quiet' and '--no-overlay' will have effect")
@@ -107,7 +108,8 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagInheritEnv || !flagExplicitEnv.IsEmpty() || flagStoreOnly || flagNoStore ||
+	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagStoreOnly || flagNoStore ||
+		flagInheritEnv || !flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty() ||
 		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" || (*appExec)(&rktApps).String() != "" ||
 		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "") {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
@@ -181,6 +183,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		pcfg.Ports = []types.ExposedPort(flagPorts)
 		pcfg.InheritEnv = flagInheritEnv
 		pcfg.ExplicitEnv = flagExplicitEnv.Strings()
+		pcfg.EnvFromFile = flagEnvFromFile.Strings()
 		pcfg.Apps = &rktApps
 	}
 
diff --git a/rkt/run.go b/rkt/run.go
index 0634b63005..56271a8be3 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -17,7 +17,9 @@
 package main
 
 import (
+	"bufio"
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 
@@ -57,6 +59,7 @@ image arguments with a lone "---" to resume argument parsing.`,
 	flagPrivateUsers bool
 	flagInheritEnv   bool
 	flagExplicitEnv  envMap
+	flagEnvFromFile  envFileMap
 	flagInteractive  bool
 	flagDNS          flagStringList
 	flagDNSSearch    flagStringList
@@ -81,6 +84,7 @@ func init() {
 	cmdRun.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
 	cmdRun.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
 	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for apps in the form name=value")
+	cmdRun.Flags().Var(&flagEnvFromFile, "set-env-file", "path to an environment variables file")
 	cmdRun.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively. If true, only one image may be supplied.")
 	cmdRun.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf")
 	cmdRun.Flags().Var(&flagDNSSearch, "dns-search", "DNS search domains to write in /etc/resolv.conf")
@@ -150,7 +154,8 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagInheritEnv || !flagExplicitEnv.IsEmpty() || rktApps.Count() > 0 || flagStoreOnly || flagNoStore ||
+	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || rktApps.Count() > 0 || flagStoreOnly || flagNoStore ||
+		flagInheritEnv || !flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty() ||
 		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" || (*appExec)(&rktApps).String() != "" ||
 		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "" ||
 		(*appCapsRetain)(&rktApps).String() != "" || (*appCapsRemove)(&rktApps).String() != "") {
@@ -249,6 +254,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		pcfg.Ports = []types.ExposedPort(flagPorts)
 		pcfg.InheritEnv = flagInheritEnv
 		pcfg.ExplicitEnv = flagExplicitEnv.Strings()
+		pcfg.EnvFromFile = flagEnvFromFile.Strings()
 		pcfg.Apps = &rktApps
 	}
 
@@ -409,3 +415,68 @@ func (e *envMap) Strings() []string {
 func (e *envMap) Type() string {
 	return "envMap"
 }
+
+// envFileMap
+type envFileMap struct {
+	mapping map[string]string
+}
+
+func skipLine(s []string) bool {
+	// Empty line
+	if len(s) == 0 {
+		return true
+	}
+	// Line start with '#' and ';'
+	if string(s[0][0]) == "#" || string(s[0][0]) == ";" {
+		return true
+	}
+	return false
+}
+
+func (e *envFileMap) Set(s string) error {
+	if e.mapping == nil {
+		e.mapping = make(map[string]string)
+	}
+	file, err := os.Open(s)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		// TODO parse '\' to skip new line character
+		pair := strings.SplitN(scanner.Text(), "=", 2)
+		if skipLine(pair) {
+			continue
+		}
+		if len(pair) != 2 {
+			return fmt.Errorf("environment variable must be specified as name=value (file %q)", file)
+		}
+		if _, exists := e.mapping[pair[0]]; exists {
+			return fmt.Errorf("environment variable %q already set (file %q)", pair[0], file)
+		}
+		e.mapping[pair[0]] = pair[1]
+	}
+	return nil
+}
+
+func (e *envFileMap) IsEmpty() bool {
+	return len(e.mapping) == 0
+}
+
+func (e *envFileMap) String() string {
+	return strings.Join(e.Strings(), "\n")
+}
+
+func (e *envFileMap) Strings() []string {
+	var env []string
+	for n, v := range e.mapping {
+		env = append(env, n+"="+v)
+	}
+	return env
+}
+
+func (e *envFileMap) Type() string {
+	return "envFileMap"
+}
diff --git a/stage0/run.go b/stage0/run.go
index f7b5aa1daa..2c0124c7a5 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -72,6 +72,7 @@ type PrepareConfig struct {
 	Apps               *apps.Apps          // apps to prepare
 	InheritEnv         bool                // inherit parent environment into apps
 	ExplicitEnv        []string            // always set these environment variables for all the apps
+	EnvFromFile        []string            // environment variables loaded from files, set for all the apps
 	Ports              []types.ExposedPort // list of ports that rkt will expose on the host
 	UseOverlay         bool                // prepare pod with overlay fs
 	SkipTreeStoreCheck bool                // skip checking the treestore before rendering
@@ -125,20 +126,14 @@ func debug(format string, i ...interface{}) {
 	}
 }
 
-// MergeEnvs amends appEnv setting variables in setEnv before setting anything new from os.Environ if inheritEnv = true
-// setEnv is expected to be in the os.Environ() key=value format
-func MergeEnvs(appEnv *types.Environment, inheritEnv bool, setEnv []string) {
-	for _, ev := range setEnv {
+// mergeEnvs merges environment variables from env into the current appEnv
+// if override is set to true, then variables with the same name will be set to the value in env
+// env is expected to be in the os.Environ() key=value format
+func mergeEnvs(appEnv *types.Environment, env []string, override bool) {
+	for _, ev := range env {
 		pair := strings.SplitN(ev, "=", 2)
-		appEnv.Set(pair[0], pair[1])
-	}
-
-	if inheritEnv {
-		for _, ev := range os.Environ() {
-			pair := strings.SplitN(ev, "=", 2)
-			if _, exists := appEnv.Get(pair[0]); !exists {
-				appEnv.Set(pair[0], pair[1])
-			}
+		if _, exists := appEnv.Get(pair[0]); override || !exists {
+			appEnv.Set(pair[0], pair[1])
 		}
 	}
 }
@@ -280,9 +275,14 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 			ra.App.Group = group
 		}
 
-		if cfg.InheritEnv || len(cfg.ExplicitEnv) > 0 {
-			MergeEnvs(&ra.App.Environment, cfg.InheritEnv, cfg.ExplicitEnv)
+		// loading the environment from the lowest priority to highest
+		if cfg.InheritEnv {
+			// Inherit environment does not override app image environment
+			mergeEnvs(&ra.App.Environment, os.Environ(), false)
 		}
+
+		mergeEnvs(&ra.App.Environment, cfg.EnvFromFile, true)
+		mergeEnvs(&ra.App.Environment, cfg.ExplicitEnv, true)
 		pm.Apps = append(pm.Apps, ra)
 		return nil
 	}); err != nil {
diff --git a/tests/env_file_test.conf b/tests/env_file_test.conf
new file mode 100644
index 0000000000..caae5bfdea
--- /dev/null
+++ b/tests/env_file_test.conf
@@ -0,0 +1 @@
+VAR_OTHER=file
diff --git a/tests/rkt_env_test.go b/tests/rkt_env_test.go
index 8456d02204..a1f3ba1316 100644
--- a/tests/rkt_env_test.go
+++ b/tests/rkt_env_test.go
@@ -78,6 +78,18 @@ var envTests = []struct {
 		`/bin/sh -c "export VAR_OTHER=host ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --interactive --inherit-env=true --set-env=VAR_OTHER=setenv ^SLEEP^"`,
 		`/bin/sh -c "export VAR_OTHER=host ; ^RKT_BIN^ --debug enter $(^RKT_BIN^ list --full|grep running|awk '{print $1}') /inspect --print-env=VAR_OTHER"`,
 	},
+	{
+		`/bin/sh -c "^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --set-env=VAR_OTHER=setenv --set-env-file=env_file_test.conf ^PRINT_VAR_OTHER^"`,
+		"VAR_OTHER=setenv",
+		`/bin/sh -c "^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --interactive --set-env=VAR_OTHER=setenv --set-env-file=env_file_test.conf ^SLEEP^"`,
+		`/bin/sh -c "export VAR_OTHER=host ; ^RKT_BIN^ --debug enter $(^RKT_BIN^ list --full|grep running|awk '{print $1}') /inspect --print-env=VAR_OTHER"`,
+	},
+	{
+		`/bin/sh -c "^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --set-env-file=env_file_test.conf ^PRINT_VAR_OTHER^"`,
+		"VAR_OTHER=file",
+		`/bin/sh -c "^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --interactive --set-env-file=env_file_test.conf ^SLEEP^"`,
+		`/bin/sh -c "^RKT_BIN^ --debug enter $(^RKT_BIN^ list --full|grep running|awk '{print $1}') /inspect --print-env=VAR_OTHER"`,
+	},
 }
 
 func TestEnv(t *testing.T) {

From 8cf28c4efd84f390095bd64dc1e272300ad24bcd Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 21 Jun 2016 17:22:20 +0200
Subject: [PATCH 0420/1304] Doc/subcmd: add missing flags

https://github.com/coreos/rkt/pull/2771 previously added --cap-retain
and --cap-remove in the "rkt run" command but they were not added in the
documentation. This patch adds them.

Also, the flags --user and --group were only partially documented. This
patch also completes that.
---
 Documentation/subcommands/prepare.md | 4 ++--
 Documentation/subcommands/run.md     | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 23ac4bf0e2..4e787350d9 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -35,6 +35,7 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
+| `--group` | root | gid, groupname or file path | Group override for the preceding image (example: '--group=group') |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
 | `--mount` | none | Mount syntax (ex. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
@@ -51,9 +52,8 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--stage1-hash` |  `` | A hash of a stage1 image. The image must exist in the store | Image to use as stage1 |
 | `--stage1-from-dir` |  `` | A stage1 image file inside the default stage1 images directory | Image to use as stage1 |
 | `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md) |
+| `--user` | none | uid, username or file path | user override for the preceding image (example: '--user=user') |
 | `--volume` |  `` | Volume syntax (`NAME,kind=KIND,source=PATH,readOnly=BOOL`). See [Mount Volumes into a Pod](run.md#mount-volumes-into-a-pod) | Volumes to make available in the pod |
-| `--user` | none | username or UID | user override for the preceding image (example: '--user=user') |
-| `--group` | none | group or GID | group override for the preceding image (example: '--group=group') |
 
 ## Global options
 
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 16ad23eab9..1ed0aa7b13 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -342,11 +342,14 @@ For more details see the [hacking documentation](../hacking.md).
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
+| `--cap-remove` | none | capability to remove (example: '--cap-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
+| `--cap-retain` | none | capability to retain (example: '--cap-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
 | `--cpu` | none | CPU units (ex. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
 | `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times |
 | `--dns-opt` | none | DNS option  | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
+| `--group` | root | gid, groupname or file path | Group override for the preceding image (example: '--group=group') |
 | `--hostname` | "rkt-$PODUUID" | A host name | Set pod's host name. |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
 | `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
@@ -367,6 +370,7 @@ For more details see the [hacking documentation](../hacking.md).
 | `--stage1-path` | none | Absolute or relative path | A path to a stage1 image. |
 | `--stage1-url` | none | URL with protocol | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported. |
 | `--store-only` | `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md). |
+| `--user` | none | uid, username or file path | user override for the preceding image (example: '--user=user') |
 | `--uuid-file-save` | none | A file path | Write out the pod UUID to a file. |
 | `--volume` |  none | Volume syntax (ex. `--volume NAME,kind=KIND,source=PATH,readOnly=BOOL`) | Volumes to make available in the pod. See [Mount Volumes into a Pod](#mount-volumes-into-a-pod). |
 

From e040d3315c09008894f3db837c7890e20adbdbaa Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek.gonyeo@coreos.com>
Date: Mon, 20 Jun 2016 14:53:53 -0700
Subject: [PATCH 0421/1304] rkt/image: when using heuristics to determine app
 type, stat first

At some point rkt will fall back to using heuristics to determine if the
provided image name is referring to an ACI on disk or if it's an image
name to perform discovery on / look in the store for. This commit
modifies the function that determines this to begin by stat'ing the
provided image name. If a file to that exact path exists on disk, that's
probably what the user wished to run.
---
 rkt/image/common.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/rkt/image/common.go b/rkt/image/common.go
index d0458f5a34..789f3cf663 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -160,7 +160,14 @@ func guessImageType(image string) apps.AppImageType {
 	// Well, at this point is basically heuristics time. The image
 	// parameter can be either a relative path or an image name.
 
-	// First, let's check if there is a colon in the image
+	// First, let's try to stat whatever file the URL would specify. If it
+	// exists, that's probably what the user wanted.
+	f, err := os.Stat(image)
+	if err == nil && f.Mode().IsRegular() {
+		return apps.AppImagePath
+	}
+
+	// Second, let's check if there is a colon in the image
 	// parameter. Colon often serves as a paths separator (like in
 	// the PATH environment variable), so if it exists, then it is
 	// highly unlikely that the image parameter is a path. Colon
@@ -170,14 +177,14 @@ func guessImageType(image string) apps.AppImageType {
 		return apps.AppImageName
 	}
 
-	// Second, let's check if there is a dot followed by a slash
+	// Third, let's check if there is a dot followed by a slash
 	// (./) - if so, it is likely that the image parameter is path
 	// like ./aci-in-this-dir or ../aci-in-parent-dir
 	if strings.Contains(image, "./") {
 		return apps.AppImagePath
 	}
 
-	// Third, let's check if the image parameter has an .aci
+	// Fourth, let's check if the image parameter has an .aci
 	// extension. If so, likely a path like "stage1-coreos.aci".
 	if filepath.Ext(image) == schema.ACIExtension {
 		return apps.AppImagePath

From 05da38501628b99396d28cdb7225c06746a1ac73 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek.gonyeo@coreos.com>
Date: Tue, 21 Jun 2016 13:50:27 -0700
Subject: [PATCH 0422/1304] pkg/tar: overwrite tests was failing due to not
 using overwrite flag

TestExtractTarOverwrite was failing due to attempting to test the tar
package's ability to overwrite files during extraction, but called
ExtractTar with the overwrite argument set to false. This went unnoticed
since the test is skipped when not run as root, which is the case in our
CI.
---
 pkg/tar/tar_test.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/tar/tar_test.go b/pkg/tar/tar_test.go
index 0363ad86c6..db700b0027 100644
--- a/pkg/tar/tar_test.go
+++ b/pkg/tar/tar_test.go
@@ -427,7 +427,7 @@ func TestExtractTarOverwrite(t *testing.T) {
 	if !sys.HasChrootCapability() {
 		t.Skipf("chroot capability not available. Disabling test.")
 	}
-	testExtractTarOverwrite(t, extractTarHelper)
+	testExtractTarOverwrite(t, extractTarOverwriteHelper)
 }
 func TestExtractTarOverwriteInsecure(t *testing.T) {
 	testExtractTarOverwrite(t, extractTarInsecureHelper)
@@ -787,6 +787,10 @@ func testExtractTarHardLink(t *testing.T, extractTar func(io.Reader, string) err
 	}
 }
 
+func extractTarOverwriteHelper(rdr io.Reader, target string) error {
+	return ExtractTar(rdr, target, true, user.NewBlankUidRange(), nil)
+}
+
 func extractTarHelper(rdr io.Reader, target string) error {
 	return extractTarHelperPWL(rdr, target, nil)
 }

From e53e047ee8a0b48b668c39357f81a823fc278e67 Mon Sep 17 00:00:00 2001
From: Rob Szumski <rob@robszumski.com>
Date: Wed, 22 Jun 2016 18:32:10 -0700
Subject: [PATCH 0423/1304] docs: fix list formatting

---
 Documentation/running-fly-stage1.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index b391e90754..bcdb9bb35d 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -77,6 +77,7 @@ If the image is not in the store, `--stage1-name` will perform discovery and fet
 By design, the *fly* stage1 does not provide the same isolaton and security features as the default stage1.
 
 Specifically, the following constraints are not available when using the *fly* stage1:
+
 - network namespace isolation
 - CPU isolators
 - Memory isolators

From eb0eb1f7079097e1b6e1a8c50441c3750dce9fc8 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Thu, 23 Jun 2016 01:15:41 +0600
Subject: [PATCH 0424/1304] common/cgroup: add mountFsRO() helper function

There are some places in the common/cgroup/cgroup.go which contain the same
code which collects flags to mount a filesystem in read-only mode and calls
mount system call with the given flags and a filesystem source/target.

This patch adds mountFsRO() helper function to prevent code duplication.

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
---
 common/cgroup/cgroup.go | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index d30fc03c30..6211d4d528 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -349,17 +349,7 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 	}
 
 	// Bind-mount cgroup tmpfs filesystem read-only
-	flags = syscall.MS_BIND |
-		syscall.MS_REMOUNT |
-		syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV |
-		syscall.MS_RDONLY
-	if err := syscall.Mount(cgroupTmpfs, cgroupTmpfs, "", flags, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", cgroupTmpfs), err)
-	}
-
-	return nil
+	return mountFsRO(cgroupTmpfs)
 }
 
 // RemountCgroupsRO remounts the cgroup hierarchy under root read-only, leaving
@@ -370,8 +360,6 @@ func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup st
 	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
 	sysPath := filepath.Join(root, "/sys")
 
-	var flags uintptr
-
 	// Mount RW knobs we need to make the enabled isolators work
 	for _, c := range controllers {
 		cPath := filepath.Join(cgroupTmpfs, c)
@@ -403,26 +391,24 @@ func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup st
 		}
 
 		// Re-mount controller read-only to prevent the container modifying host controllers
-		flags = syscall.MS_BIND |
-			syscall.MS_REMOUNT |
-			syscall.MS_NOSUID |
-			syscall.MS_NOEXEC |
-			syscall.MS_NODEV |
-			syscall.MS_RDONLY
-		if err := syscall.Mount(cPath, cPath, "", flags, ""); err != nil {
-			return errwrap.Wrap(fmt.Errorf("error remounting RO %q", cPath), err)
+		if err := mountFsRO(cPath); err != nil {
+			return err
 		}
 	}
 
 	// Bind-mount sys filesystem read-only
-	flags = syscall.MS_BIND |
+	return mountFsRO(sysPath)
+}
+
+func mountFsRO(mountPoint string) error {
+	var flags uintptr = syscall.MS_BIND |
 		syscall.MS_REMOUNT |
 		syscall.MS_NOSUID |
 		syscall.MS_NOEXEC |
 		syscall.MS_NODEV |
 		syscall.MS_RDONLY
-	if err := syscall.Mount(sysPath, sysPath, "", flags, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", sysPath), err)
+	if err := syscall.Mount(mountPoint, mountPoint, "", flags, ""); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", mountPoint), err)
 	}
 
 	return nil

From 3a7d06ab45eb5a11794b2cf0a8bfed260221c998 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Thu, 23 Jun 2016 12:56:58 +0000
Subject: [PATCH 0425/1304] docs: update docs or the v1.9.0 release

---
 CHANGELOG.md | 27 +++++++++++++++++++++++++++
 ROADMAP.md   | 10 ++--------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e7ebf54dc..a4e669eeab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## v1.9.0
+
+This release focuses on bug fixes and developer tooling and UX improvements.
+
+#### New features and UX changes
+
+- rkt/run: added --set-env-file switch and priorities for environments ([#2816](https://github.com/coreos/rkt/pull/2816)). --set-env-file gets an environment variables file path in the format "VAR=VALUE\n...".
+- run: add --cap-retain and --cap-remove ([#2771](https://github.com/coreos/rkt/pull/2771)).
+- store: print more information on rm as non-root ([#2805](https://github.com/coreos/rkt/pull/2805)).
+- Documentation/vagrant: use rkt binary for getting started ([#2808](https://github.com/coreos/rkt/pull/2808)). 
+- docs: New file in documentation - instruction for new developers in rkt ([#2639](https://github.com/coreos/rkt/pull/2639)).
+- stage0/trust: change error message if prefix/root flag missing ([#2661](https://github.com/coreos/rkt/pull/2661)).
+
+#### Bug fixes
+
+- rkt/uuid: fix match when uuid is an empty string ([#2807](https://github.com/coreos/rkt/pull/2807)).
+- rkt/api_service: fix fly pods ([#2799](https://github.com/coreos/rkt/pull/2799)).
+- api/client_example: fix panic if pod has no apps ([#2766](https://github.com/coreos/rkt/pull/2766)). Fixes the concern expressed in https://github.com/coreos/rkt/pull/2763#discussion_r66409260
+- api_service: wait until a pod regs with machined ([#2788](https://github.com/coreos/rkt/pull/2788)).
+
+#### Other changes
+
+- stage1: update coreos image to 1068.0.0 ([#2821](https://github.com/coreos/rkt/pull/2821)). 
+- KVM: Update LKVM patch to mount with mmap mode ([#2795](https://github.com/coreos/rkt/pull/2795)).
+- stage1: always write /etc/machine-id ([#2440](https://github.com/coreos/rkt/pull/2440)). Prepare rkt for systemd-v230 in stage1.
+- stage1/prepare-app: always adjust /etc/hostname ([#2761](https://github.com/coreos/rkt/pull/2761)). 
+
 ## v1.8.0
 
 This release focuses on stabilizing the API service, fixing multiple issues in the logging subsystem.
diff --git a/ROADMAP.md b/ROADMAP.md
index 73618c88ed..fe304ecde9 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,14 +9,6 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-
-### rkt 1.9.0 (June)
-
-- full integration with Kubernetes (aka "rktnetes")
-- app-level seccomp support [#1614](https://github.com/coreos/rkt/issues/1614)
-- enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
-- IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
-
 ### rkt 1.10.0 (July)
 
 - stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
@@ -25,6 +17,8 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 
 ### rkt 1.11.0 (July)
 
+- IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
+- enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
 - packaged for more distributions
   - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)
 

From d6874f787c60b3b4593e58030a2a20b55cc763e2 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Thu, 23 Jun 2016 12:50:52 +0000
Subject: [PATCH 0426/1304] version: bump to v1.9.0

---
 Documentation/running-fly-stage1.md  | 4 ++--
 Documentation/running-lkvm-stage1.md | 4 ++--
 Documentation/subcommands/prepare.md | 2 +-
 Documentation/subcommands/version.md | 2 +-
 Documentation/trying-out-rkt.md      | 6 +++---
 configure.ac                         | 2 +-
 scripts/acbuild-rkt-builder.sh       | 2 +-
 scripts/build-rir.sh                 | 2 +-
 scripts/install-rkt.sh               | 2 +-
 tests/empty-image/manifest           | 2 +-
 tests/image/manifest                 | 2 +-
 tests/rkt_exec_test.go               | 2 +-
 tests/rkt_image_cat_manifest_test.go | 2 +-
 tests/rkt_image_export_test.go       | 2 +-
 tests/rkt_image_render_test.go       | 2 +-
 tests/rkt_os_arch_test.go            | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index bcdb9bb35d..ee0e433e61 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.8.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.9.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.8.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.9.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index 666b5a6c76..e4b6eadfe1 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.8.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.9.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.8.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.9.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 967fd8d9af..9ca79ab45e 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.8.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.9.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index b9ff8fe7a1..5a113ebf9a 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.8.0
+rkt Version: 1.9.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 620678485c..054dfadadb 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool and can run on different platforms. The primar
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.8.0/rkt-v1.8.0.tar.gz
-tar xzvf rkt-v1.8.0.tar.gz
-cd rkt-v1.8.0
+wget https://github.com/coreos/rkt/releases/download/v1.9.0/rkt-v1.9.0.tar.gz
+tar xzvf rkt-v1.9.0.tar.gz
+cd rkt-v1.9.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 1cb0980034..5cb40a9924 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.8.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.9.0], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 4bfe9763d6..9de21556ce 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.8.0+git"}
+IMG_VERSION=${VERSION:-"v1.9.0"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index c18a070acf..fb73cdbe30 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.8.0+git}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.9.0}"
 
 mkdir -p $BUILDDIR
 
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 6ad891b082..301832e303 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.8.0"
+version="1.9.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index b477c36f3f..17d71a3a9b 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.8.0"
+            "value": "1.9.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 590a406418..ee696ecb3d 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.8.0"
+            "value": "1.9.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 1565d7a79f..0fbc88ec92 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.8.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.9.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index c72ba438fe..732e85c968 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.8.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 5c1f006d08..1edd04f42c 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.8.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index a2bbacb107..0f18001379 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.8.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index c7236d717f..437c8850af 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.8.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From fbb131f6f94fafea59e73ff1f89a3f441c40259c Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Thu, 23 Jun 2016 12:50:52 +0000
Subject: [PATCH 0427/1304] version: bump to v1.9.0+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5cb40a9924..03a215da51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.9.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.9.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 9de21556ce..5dc1e0e5b8 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.9.0"}
+IMG_VERSION=${VERSION:-"v1.9.0+git"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index fb73cdbe30..5888a61836 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.9.0}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.9.0+git}"
 
 mkdir -p $BUILDDIR
 

From e4c459ebc22912f09691ea4da9dea34f599473b8 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Thu, 23 Jun 2016 23:49:27 +0600
Subject: [PATCH 0428/1304] common: remove unused GetImageIDs()

This patch removes apps.GetImageIds() method as it has no callers anymore.
This helper was added to pass list of image ids to the state0, but now we
pass list of apps in a pod instead.

Last user of the GetImageIDs() was removed in the 227fe3c commit
( Move pod registration from stage1 to stage0. by @eyakubovich ) and it is
not used anywhere anymore.

So we can remove it.
---
 common/apps/apps.go | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/common/apps/apps.go b/common/apps/apps.go
index 76c7bc88f8..b00efdb450 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -145,13 +145,3 @@ func (al *Apps) GetArgs() [][]string {
 	}
 	return aal
 }
-
-// GetImageIDs returns a list of the imageIDs in al, one per app.
-// The order reflects the app order in al.
-func (al *Apps) GetImageIDs() []types.Hash {
-	var hl []types.Hash
-	for _, a := range al.apps {
-		hl = append(hl, a.ImageID)
-	}
-	return hl
-}

From b678f216f68f1fd9fb6e3d697f60054d2ee4bd7c Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 23 Jun 2016 14:53:18 -0700
Subject: [PATCH 0429/1304] stage1/fly: use 0755 to create mountpaths

This will allow any user to list the content directories. It does not
have any effect on the permissions on the mounted files itself.
---
 stage1_fly/run/main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index d569f0991a..77cf287ad6 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -299,13 +299,13 @@ func stage1() int {
 		switch {
 		case targetPathInfo == nil:
 			absTargetPathParent, _ := filepath.Split(absTargetPath)
-			if err := os.MkdirAll(absTargetPathParent, 0700); err != nil {
+			if err := os.MkdirAll(absTargetPathParent, 0755); err != nil {
 				log.PrintE(fmt.Sprintf("can't create directory %q", absTargetPath), err)
 				return 1
 			}
 			switch {
 			case hostPathInfo == nil || hostPathInfo.IsDir():
-				if err := os.Mkdir(absTargetPath, 0700); err != nil {
+				if err := os.Mkdir(absTargetPath, 0755); err != nil {
 					log.PrintE(fmt.Sprintf("can't create directory %q", absTargetPath), err)
 					return 1
 				}

From 523abfa98cabbdfcbb745040da3c2ddb9911647c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 23 Jun 2016 23:59:43 +0200
Subject: [PATCH 0430/1304] Godeps: update go-systemd

go-systemd v10 fixes a panic-inducing bug due to returning incorrect
Read() length values.
---
 Godeps/Godeps.json                            | 20 +++---
 .../coreos/go-systemd/sdjournal/read.go       | 72 +++++++++++++------
 2 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 141351f8d0..f0fc34c1db 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -356,28 +356,28 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/activation",
-			"Comment": "v9",
-			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
+			"Comment": "v10",
+			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/dbus",
-			"Comment": "v9",
-			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
+			"Comment": "v10",
+			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/sdjournal",
-			"Comment": "v9",
-			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
+			"Comment": "v10",
+			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/unit",
-			"Comment": "v9",
-			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
+			"Comment": "v10",
+			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-systemd/util",
-			"Comment": "v9",
-			"Rev": "6dc8b843c670f2027cc26b164935635840a40526"
+			"Comment": "v10",
+			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-tspi/tpmclient",
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
index 73a0d51e96..71ee806a96 100644
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"strings"
 	"time"
 )
 
@@ -46,9 +47,10 @@ type JournalReaderConfig struct {
 }
 
 // JournalReader is an io.ReadCloser which provides a simple interface for iterating through the
-// systemd journal.
+// systemd journal. A JournalReader is not safe for concurrent use by multiple goroutines.
 type JournalReader struct {
-	journal *Journal
+	journal   *Journal
+	msgReader *strings.Reader
 }
 
 // NewJournalReader creates a new JournalReader with configuration options that are similar to the
@@ -101,35 +103,60 @@ func NewJournalReader(config JournalReaderConfig) (*JournalReader, error) {
 	return r, nil
 }
 
+// Read reads entries from the journal. Read follows the Reader interface so
+// it must be able to read a specific amount of bytes. Journald on the other
+// hand only allows us to read full entries of arbitrary size (without byte
+// granularity). JournalReader is therefore internally buffering entries that
+// don't fit in the read buffer. Callers should keep calling until 0 and/or an
+// error is returned.
 func (r *JournalReader) Read(b []byte) (int, error) {
 	var err error
-	var c int
 
-	// Advance the journal cursor
-	c, err = r.journal.Next()
+	if r.msgReader == nil {
+		var c int
 
-	// An unexpected error
-	if err != nil {
-		return 0, err
-	}
+		// Advance the journal cursor. It has to be called at least one time
+		// before reading
+		c, err = r.journal.Next()
 
-	// EOF detection
-	if c == 0 {
-		return 0, io.EOF
-	}
+		// An unexpected error
+		if err != nil {
+			return 0, err
+		}
 
-	// Build a message
-	var msg string
-	msg, err = r.buildMessage()
+		// EOF detection
+		if c == 0 {
+			return 0, io.EOF
+		}
 
-	if err != nil {
-		return 0, err
+		// Build a message
+		var msg string
+		msg, err = r.buildMessage()
+
+		if err != nil {
+			return 0, err
+		}
+		r.msgReader = strings.NewReader(msg)
 	}
 
 	// Copy and return the message
-	copy(b, []byte(msg))
+	var sz int
+	sz, err = r.msgReader.Read(b)
+	if err == io.EOF {
+		// The current entry has been fully read. Don't propagate this
+		// EOF, so the next entry can be read at the next Read()
+		// iteration.
+		r.msgReader = nil
+		return sz, nil
+	}
+	if err != nil {
+		return sz, err
+	}
+	if r.msgReader.Len() == 0 {
+		r.msgReader = nil
+	}
 
-	return len(msg), nil
+	return sz, nil
 }
 
 // Close closes the JournalReader's handle to the journal.
@@ -139,6 +166,7 @@ func (r *JournalReader) Close() error {
 
 // Rewind attempts to rewind the JournalReader to the first entry.
 func (r *JournalReader) Rewind() error {
+	r.msgReader = nil
 	return r.journal.SeekHead()
 }
 
@@ -161,7 +189,9 @@ process:
 			return ErrExpired
 		default:
 			if c > 0 {
-				writer.Write(msg[:c])
+				if _, err = writer.Write(msg[:c]); err != nil {
+					break process
+				}
 				continue process
 			}
 		}

From 0f22bdf4a154d9e0123fc12366a0db5ef3fb08ea Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Fri, 24 Jun 2016 07:12:44 +0000
Subject: [PATCH 0431/1304] docs: update docs for the v1.9.1 release

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4e669eeab..13a60a4a19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## v1.9.1
+
+This is a minor bug fix release.
+
+#### Bug fixes
+
+- Godeps: update go-systemd ([#2837](https://github.com/coreos/rkt/pull/2837)). go-systemd v10 fixes a panic-inducing bug due to returning incorrect
+Read() length values.
+- stage1/fly: use 0755 to create mountpaths ([#2836](https://github.com/coreos/rkt/pull/2836)). This will allow any user to list the content directories. It does not
+have any effect on the permissions on the mounted files itself.
+
 ## v1.9.0
 
 This release focuses on bug fixes and developer tooling and UX improvements.

From 886c62d84158b1164a91bef9b4ca68de4c4e0322 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Fri, 24 Jun 2016 07:13:06 +0000
Subject: [PATCH 0432/1304] version: bump to v1.9.1

---
 Documentation/running-fly-stage1.md  | 4 ++--
 Documentation/running-lkvm-stage1.md | 4 ++--
 Documentation/subcommands/prepare.md | 2 +-
 Documentation/subcommands/version.md | 2 +-
 Documentation/trying-out-rkt.md      | 6 +++---
 configure.ac                         | 2 +-
 scripts/acbuild-rkt-builder.sh       | 2 +-
 scripts/build-rir.sh                 | 2 +-
 scripts/install-rkt.sh               | 2 +-
 tests/empty-image/manifest           | 2 +-
 tests/image/manifest                 | 2 +-
 tests/rkt_exec_test.go               | 2 +-
 tests/rkt_image_cat_manifest_test.go | 2 +-
 tests/rkt_image_export_test.go       | 2 +-
 tests/rkt_image_render_test.go       | 2 +-
 tests/rkt_os_arch_test.go            | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index ee0e433e61..bfd9be5d52 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.9.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.9.1+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.9.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.9.1 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index e4b6eadfe1..fb3c3c541b 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.9.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.9.1+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.9.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.9.1 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 9ca79ab45e..223f10d215 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.9.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.9.1
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 5a113ebf9a..c920b975bd 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.9.0
+rkt Version: 1.9.1
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 054dfadadb..d9f85ec241 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -10,9 +10,9 @@ rkt consists of a single CLI tool and can run on different platforms. The primar
 To download the rkt binary, simply grab the latest release directly from GitHub:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.9.0/rkt-v1.9.0.tar.gz
-tar xzvf rkt-v1.9.0.tar.gz
-cd rkt-v1.9.0
+wget https://github.com/coreos/rkt/releases/download/v1.9.1/rkt-v1.9.1.tar.gz
+tar xzvf rkt-v1.9.1.tar.gz
+cd rkt-v1.9.1
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 03a215da51..49e51ffa16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.9.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.9.1], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 5dc1e0e5b8..11827941b0 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.9.0+git"}
+IMG_VERSION=${VERSION:-"v1.9.1"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 5888a61836..bbe2abad6a 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.9.0+git}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.9.1}"
 
 mkdir -p $BUILDDIR
 
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 301832e303..c2ff2aca68 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.9.0"
+version="1.9.1"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 17d71a3a9b..b0d661f23d 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.9.0"
+            "value": "1.9.1"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index ee696ecb3d..049cfd66fe 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.9.0"
+            "value": "1.9.1"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 0fbc88ec92..17f8215cd8 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.9.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.9.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 732e85c968..fd7bcd5ff5 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 1edd04f42c..1ffbebcf07 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 0f18001379..460925aed5 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 437c8850af..ff130222c0 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.1"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 022d8772b8c9f3cca844845a7cf4b678cedaa845 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Fri, 24 Jun 2016 07:13:06 +0000
Subject: [PATCH 0433/1304] version: bump to v1.9.1+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 49e51ffa16..2a3dde581c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.9.1], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.9.1+git], [https://github.com/coreos/rkt/issues])
 
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 11827941b0..01258ed61c 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.9.1"}
+IMG_VERSION=${VERSION:-"v1.9.1+git"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index bbe2abad6a..ad660ef659 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.9.1}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.9.1+git}"
 
 mkdir -p $BUILDDIR
 

From 2810a4c164fc61e3146e3b2fc608cc87f3c599a3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 24 Jun 2016 14:24:54 +0200
Subject: [PATCH 0434/1304] tests: fix abuses of appc types.Isolator

appc 0.8.5 perform stricter validation on types.Isolator instances,
and some rkt tests would fail due to library misuses.
This commit switches to proper unmarshaling to construct those
instances.
---
 tests/rkt_run_pod_manifest_test.go | 60 +++++++++++++-----------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 7ff003ca63..321a2d60ab 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -17,7 +17,6 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -59,19 +58,12 @@ func verifyHostFile(t *testing.T, tmpdir, filename string, i int, expectedResult
 	}
 }
 
-func rawValue(value string) *json.RawMessage {
-	msg := json.RawMessage(value)
-	return &msg
-}
-
-func rawRequestLimit(request, limit string) *json.RawMessage {
-	if request == "" {
-		return rawValue(fmt.Sprintf(`{"limit":%q}`, limit))
-	}
-	if limit == "" {
-		return rawValue(fmt.Sprintf(`{"request":%q}`, request))
+func mustNewIsolator(body string) (i types.Isolator) {
+	err := i.UnmarshalJSON([]byte(body))
+	if err != nil {
+		panic(err)
 	}
-	return rawValue(fmt.Sprintf(`{"request":%q,"limit":%q}`, request, limit))
+	return
 }
 
 type imagePatch struct {
@@ -735,14 +727,14 @@ func TestPodManifest(t *testing.T) {
 							User:  "0",
 							Group: "0",
 							Isolators: []types.Isolator{
-								{
-									Name:     "resource/cpu",
-									ValueRaw: rawRequestLimit("100", "100"),
-								},
-								{
-									Name:     "os/linux/capabilities-retain-set",
-									ValueRaw: rawValue(`{"set":["CAP_SYS_PTRACE"]}`),
-								},
+								mustNewIsolator(`{
+									"name":     "resource/cpu",
+									"value":    { "request": "100", "limit": "100"}
+								}`),
+								mustNewIsolator(`{
+									"name":     "os/linux/capabilities-retain-set",
+									"value":    { "set": ["CAP_SYS_PTRACE"] }
+								}`),
 							},
 						},
 					},
@@ -766,15 +758,15 @@ func TestPodManifest(t *testing.T) {
 							User:  "0",
 							Group: "0",
 							Isolators: []types.Isolator{
-								{
-									Name: "resource/memory",
-									// 4MB.
-									ValueRaw: rawRequestLimit("4194304", "4194304"),
-								},
-								{
-									Name:     "os/linux/capabilities-retain-set",
-									ValueRaw: rawValue(`{"set":["CAP_SYS_PTRACE"]}`),
-								},
+								// 4MB.
+								mustNewIsolator(`{
+									"name":     "resource/memory",
+									"value":    { "request": "4194304", "limit": "4194304"}
+								}`),
+								mustNewIsolator(`{
+									"name":     "os/linux/capabilities-retain-set",
+									"value":    { "set": ["CAP_SYS_PTRACE"] }
+								}`),
 							},
 						},
 					},
@@ -872,10 +864,10 @@ func TestPodManifest(t *testing.T) {
 								{"CAPABILITY", strconv.Itoa(int(capability.CAP_NET_ADMIN))},
 							},
 							Isolators: []types.Isolator{
-								{
-									Name:     "os/linux/capabilities-retain-set",
-									ValueRaw: rawValue(fmt.Sprintf(`{"set":["CAP_NET_ADMIN"]}`)),
-								},
+								mustNewIsolator(`{
+									"name":     "os/linux/capabilities-retain-set",
+									"value":    { "set": ["CAP_NET_ADMIN"] }
+								}`),
 							},
 						},
 					},

From b0a9822e545a4cd756e45ff01cbafb8d7aec3b4e Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:48 -0700
Subject: [PATCH 0435/1304] build: Remove unused variable

The makefile variable MAKETOOLSDIR is unused, so remove it.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 makelib/variables.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/makelib/variables.mk b/makelib/variables.mk
index 73f16298ae..1d53452728 100644
--- a/makelib/variables.mk
+++ b/makelib/variables.mk
@@ -4,7 +4,6 @@ REPO_PATH := $(ORG_PATH)/rkt
 
 override BUILDDIR := $(abspath $(BUILDDIR))
 
-MAKETOOLSDIR := $(MK_TOPLEVEL_SRCDIR)/tools
 STAMPSDIR := $(BUILDDIR)/stamps
 TOOLSDIR := $(BUILDDIR)/tools
 BINDIR := $(BUILDDIR)/bin

From f854dc04e93aebe85d154955ff4a2648c934c3f5 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:48 -0700
Subject: [PATCH 0436/1304] build: Verbose go builds

To aid in debugging go build problems, add go verbosity flags when the
make variable V is set.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 makelib/build_go_bin.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/makelib/build_go_bin.mk b/makelib/build_go_bin.mk
index a1d276d92d..4ae8b2a528 100644
--- a/makelib/build_go_bin.mk
+++ b/makelib/build_go_bin.mk
@@ -41,12 +41,16 @@ _BGB_PKG_NAME_ := $(REPO_PATH)/$(BGB_PKG_IN_REPO)
 $(call setup-dep-file,_BGB_GO_DEPMK,$(_BGB_PKG_NAME_))
 $(call setup-dep-file,_BGB_KV_DEPMK,$(_BGB_PKG_NAME_)/kv)
 
+VERBOSE_1 := -v
+VERBOSE_2 := -v
+VERBOSE_3 := -v -x
+
 $(call forward-vars,$(BGB_BINARY), \
 	BGB_ADDITIONAL_GO_ENV GO_ENV GO BGB_GO_FLAGS _BGB_PKG_NAME_)
 $(BGB_BINARY): $(_BGB_PATH_) $(_BGB_RKT_SYMLINK_STAMP_)
 	$(VQ) \
 	$(call vb,vt,GO,$(call vsg,$(_BGB_PKG_NAME_))) \
-	$(BGB_ADDITIONAL_GO_ENV) $(GO_ENV) "$(GO)" build -o "$@" $(BGB_GO_FLAGS) "$(_BGB_PKG_NAME_)"
+	$(BGB_ADDITIONAL_GO_ENV) $(GO_ENV) "$(GO)" build $(VERBOSE_$(V)) -o "$@" $(BGB_GO_FLAGS) "$(_BGB_PKG_NAME_)"
 
 $(call generate-go-deps,$(_BGB_GO_DEPMK_STAMP_),$(BGB_BINARY),$(_BGB_GO_DEPMK),$(BGB_PKG_IN_REPO))
 $(call generate-kv-deps,$(_BGB_KV_DEPMK_STAMP_),$(BGB_BINARY),$(_BGB_KV_DEPMK),BGB_GO_FLAGS)

From 83bd7b851454f8302bbc6d341bec22e9cbd887eb Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0437/1304] build: Output makefile compiler variables

To allow for cross compile builds, output CC and CXX to the
makefile.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 Makefile.in  | 2 ++
 configure.ac | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index d668af0f64..d39fc6fe90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,6 +7,8 @@ all:
 INSTALL = @INSTALL@
 
 # binaries we need to build things
+CC := @CC@
+CXX := @CXX@
 GO := @GOBINARY@
 GOFMT := @GOFMTBINARY@
 GIT := @GIT@
diff --git a/configure.ac b/configure.ac
index 2a3dde581c..df82f6df81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,9 @@
 AC_PREREQ([2.63])
 AC_INIT([rkt], [1.9.1+git], [https://github.com/coreos/rkt/issues])
 
+AC_PROG_CC
+AC_PROG_CXX
+
 AC_DEFUN([RKT_CHECK_PROG],
          [AS_VAR_IF([$1], [],
                     [AC_CHECK_PROG($@)],[:])])

From 25ee2968cf47666d2cfdd84429534820710c68fb Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0438/1304] build: Output makefile arch variables

To allow the build system to target multiple architectures, add the
new arch related makefile variables GOARCH, RKT_ACI_ARCH, and
RKT_STAGE1_COREOS_BOARD.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 Makefile.in  |  5 +++++
 configure.ac | 18 ++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d39fc6fe90..01c6cd5efc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,6 +23,7 @@ RKT_TAGS := -tags "selinux @TPM_TAGS@"
 # stage1 build mode
 
 RKT_VERSION := @RKT_VERSION@
+RKT_ACI_ARCH := @RKT_ACI_ARCH@
 RKT_STAGE1_VERSION_OVERRIDE := @RKT_STAGE1_FLAVORS_VERSION_OVERRIDE@
 
 RKT_STAGE1_DEFAULT_NAME := @RKT_STAGE1_DEFAULT_NAME@
@@ -41,11 +42,15 @@ RKT_STAGE1_SYSTEMD_VER := @RKT_STAGE1_SYSTEMD_VER@
 
 RKT_LOCAL_COREOS_PXE_IMAGE_PATH := @RKT_LOCAL_COREOS_PXE_IMAGE_PATH@
 RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER := @RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER@
+
+RKT_STAGE1_COREOS_BOARD := @RKT_STAGE1_COREOS_BOARD@
+
 # defines for enter
 RKT_DEFINES_FOR_ENTER := @RKT_DEFINES_FOR_ENTER@
 
 RKT_RUN_FUNCTIONAL_TESTS := @RKT_RUN_FUNCTIONAL_TESTS@
 
+GOARCH := @GOARCH@
 GOARCH_FOR_BUILD := @GOARCH_FOR_BUILD@
 
 RKT_STAGE1_DEFAULT_NAME_LDFLAGS := @RKT_STAGE1_DEFAULT_NAME_LDFLAGS@
diff --git a/configure.ac b/configure.ac
index df82f6df81..e8863160a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,11 @@ AS_IF([test `expr match 'AC_PACKAGE_VERSION' '.*+git$'` -gt 0],
 AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 
+AS_CASE([${host_cpu}],
+        [aarch64], [RKT_ACI_ARCH=aarch64; GOARCH=arm64;],
+        [x86_64],  [RKT_ACI_ARCH=amd64; GOARCH=amd64;],
+        [AC_MSG_ERROR([*** unsupported host architecture specified: ${host_cpu}])])
+
 #### FLAGS
 
 ## STAGE1 - detailed setup
@@ -119,6 +124,8 @@ AC_ARG_WITH([coreos-local-pxe-image-systemd-version],
             [RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER="${withval}"],
             [RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER=])
 
+RKT_STAGE1_COREOS_BOARD=${GOARCH}-usr;
+
 ## Functional tests
 
 AC_ARG_ENABLE([functional-tests],
@@ -653,6 +660,7 @@ RKT_FEATURES_LDFLAGS="-X 'main.rktFeatures=${RKT_FEATURES}'"
 #### SUBSTITUTIONS
 
 AC_SUBST(RKT_VERSION)
+AC_SUBST(RKT_ACI_ARCH)
 AC_SUBST(RKT_STAGE1_FLAVORS_VERSION_OVERRIDE)
 
 AC_SUBST(RKT_STAGE1_DEFAULT_NAME)
@@ -672,8 +680,11 @@ AC_SUBST(RKT_STAGE1_SYSTEMD_VER)
 AC_SUBST(RKT_LOCAL_COREOS_PXE_IMAGE_PATH)
 AC_SUBST(RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER)
 
+AC_SUBST(RKT_STAGE1_COREOS_BOARD)
+
 AC_SUBST(RKT_RUN_FUNCTIONAL_TESTS)
 
+AC_SUBST(GOARCH)
 AC_SUBST(GOARCH_FOR_BUILD)
 
 AC_SUBST(RKT_STAGE1_DEFAULT_NAME_LDFLAGS)
@@ -724,7 +735,8 @@ RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos,kvm],
         coreos/kvm flavor specific build parameters
 
         local CoreOS PXE image path:            '${RKT_LOCAL_COREOS_PXE_IMAGE_PATH}'
-        local CoreOS PXE image systemd version: '${RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER}'])])
+        local CoreOS PXE image systemd version: '${RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER}'
+        stage1 CoreOS board:                    '${RKT_STAGE1_COREOS_BOARD}'])])
 
 RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [src],
                   [AC_MSG_RESULT([
@@ -738,4 +750,6 @@ AC_MSG_RESULT([
 
         functional tests enabled:               '${RKT_RUN_FUNCTIONAL_TESTS}'
         features:                               '${RKT_FEATURES}'
-        go version:                             '${GO_VERSION}'])
+        ACI arch:                               '${RKT_ACI_ARCH}'
+        go version:                             '${GO_VERSION}'
+        go arch:                                '${GOARCH}'])

From 2656c561f50911f23189dc58b54b65404dd6d207 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0439/1304] build: Make BGB_ADDITIONAL_GO_ENV override GO_ENV

To allow GO_ENV to be the default environment, and for
BGB_ADDITIONAL_GO_ENV to override that default when needed,
switch the order of the two on the go invocation.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 makelib/build_go_bin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makelib/build_go_bin.mk b/makelib/build_go_bin.mk
index 4ae8b2a528..8ceec59fcf 100644
--- a/makelib/build_go_bin.mk
+++ b/makelib/build_go_bin.mk
@@ -50,7 +50,7 @@ $(call forward-vars,$(BGB_BINARY), \
 $(BGB_BINARY): $(_BGB_PATH_) $(_BGB_RKT_SYMLINK_STAMP_)
 	$(VQ) \
 	$(call vb,vt,GO,$(call vsg,$(_BGB_PKG_NAME_))) \
-	$(BGB_ADDITIONAL_GO_ENV) $(GO_ENV) "$(GO)" build $(VERBOSE_$(V)) -o "$@" $(BGB_GO_FLAGS) "$(_BGB_PKG_NAME_)"
+	$(GO_ENV) $(BGB_ADDITIONAL_GO_ENV) "$(GO)" build $(VERBOSE_$(V)) -o "$@" $(BGB_GO_FLAGS) "$(_BGB_PKG_NAME_)"
 
 $(call generate-go-deps,$(_BGB_GO_DEPMK_STAMP_),$(BGB_BINARY),$(_BGB_GO_DEPMK),$(BGB_PKG_IN_REPO))
 $(call generate-kv-deps,$(_BGB_KV_DEPMK_STAMP_),$(BGB_BINARY),$(_BGB_KV_DEPMK),BGB_GO_FLAGS)

From eff2aeb935585acadeaad5eb6e4865eee3660eda Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0440/1304] build: Setup GO_ENV for cross compile

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 makelib/variables.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/makelib/variables.mk b/makelib/variables.mk
index 1d53452728..27b4c79064 100644
--- a/makelib/variables.mk
+++ b/makelib/variables.mk
@@ -24,7 +24,13 @@ QUICKRMTOOL := $(TOOLSDIR)/quickrm
 GO_TEST_PACKAGES ?= ./...
 GO_TEST_FUNC_ARGS ?=
 
-GO_ENV := $(strip GOPATH="$(GOPATH)" $(if $(strip $(GOROOT)),GOROOT=$(strip $(GOROOT))))
+GO_ENV := $(strip \
+	GOARCH="$(GOARCH)" \
+	CGO_ENABLED=1 \
+	CC="$(CC)" \
+	CXX="$(CXX)" \
+	GOPATH="$(GOPATH)" \
+	$(if $(strip $(GOROOT)),GOROOT="$(strip $(GOROOT))"))
 
 CREATE_DIRS += \
 	$(BUILDDIR) \

From 3aac0aecd6b31289f33a101a27b63c4bb00b4c13 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0441/1304] actool: Move to TOOLSDIR

The generated actool is a host tool, so move it to the TOOLSDIR.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 makelib/variables.mk | 2 +-
 tools/actool.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/makelib/variables.mk b/makelib/variables.mk
index 27b4c79064..43a1777e0d 100644
--- a/makelib/variables.mk
+++ b/makelib/variables.mk
@@ -14,7 +14,7 @@ FILELISTDIR := $(BUILDDIR)/filelists
 MAINTEMPDIR := $(BUILDDIR)/tmp
 CLEANDIR := $(BUILDDIR)/clean
 
-ACTOOL := $(BINDIR)/actool
+ACTOOL := $(TOOLSDIR)/actool
 DEPSGENTOOL := $(TOOLSDIR)/depsgen
 FILELISTGENTOOL := $(TOOLSDIR)/filelistgen
 CLEANGENTOOL := $(TOOLSDIR)/cleangen
diff --git a/tools/actool.mk b/tools/actool.mk
index 1e07c95f14..4d341b4d50 100644
--- a/tools/actool.mk
+++ b/tools/actool.mk
@@ -10,7 +10,7 @@ CLEAN_FILES += $(ACTOOL)
 
 $(call generate-stamp-rule,$(ACTOOL_STAMP))
 
-$(ACTOOL): $(MK_PATH) | $(BINDIR)
+$(ACTOOL): $(MK_PATH) | $(TOOLSDIR)
 
 include makelib/build_go_bin.mk
 

From 3cff20f1d6ce6ad9c52829e943bf46d0df225674 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0442/1304] build: Add target directories

Create new makfile variables TARGET_BINDIR and TARGET_TOOLSDIR to hold
files for use within the target image.  Files intended to be used on
the host at build time will continue to be located in TOOLSDIR.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 makelib/variables.mk                      | 8 ++++++--
 rkt/rkt.mk                                | 4 ++--
 stage1/makelib/aci_simple_go_bin.mk       | 4 ++--
 stage1/makelib/aci_simple_static_c_bin.mk | 4 ++--
 stage1/net-plugins/net-plugins.mk         | 4 ++--
 stage1/stage1.mk                          | 4 ++--
 stage1_fly/stage1_fly.mk                  | 4 ++--
 tests/functional.mk                       | 2 +-
 8 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/makelib/variables.mk b/makelib/variables.mk
index 43a1777e0d..eabc804a02 100644
--- a/makelib/variables.mk
+++ b/makelib/variables.mk
@@ -6,7 +6,9 @@ override BUILDDIR := $(abspath $(BUILDDIR))
 
 STAMPSDIR := $(BUILDDIR)/stamps
 TOOLSDIR := $(BUILDDIR)/tools
-BINDIR := $(BUILDDIR)/bin
+TARGETDIR := $(BUILDDIR)/target
+TARGET_BINDIR := $(BUILDDIR)/target/bin
+TARGET_TOOLSDIR := $(BUILDDIR)/target/tools
 GOPATH_TO_CREATE := $(BUILDDIR)/gopath
 GOPATH := $(GOPATH_TO_CREATE)/src/github.com/coreos/rkt/Godeps/_workspace:$(GOPATH_TO_CREATE)
 DEPSDIR := $(BUILDDIR)/deps
@@ -36,7 +38,9 @@ CREATE_DIRS += \
 	$(BUILDDIR) \
 	$(STAMPSDIR) \
 	$(TOOLSDIR) \
-	$(BINDIR) \
+	$(TARGETDIR) \
+	$(TARGET_BINDIR) \
+	$(TARGET_TOOLSDIR) \
 	$(GOPATH_TO_CREATE) \
 	$(DEPSDIR) \
 	$(FILELISTDIR) \
diff --git a/rkt/rkt.mk b/rkt/rkt.mk
index 48a26773f4..96c6e88eaa 100644
--- a/rkt/rkt.mk
+++ b/rkt/rkt.mk
@@ -2,7 +2,7 @@ LOCAL_NAME := $(patsubst %.mk,%,$(MK_FILENAME))
 
 $(call setup-stamp-file,RKT_STAMP)
 
-RKT_BINARY := $(BINDIR)/$(LOCAL_NAME)
+RKT_BINARY := $(TARGET_BINDIR)/$(LOCAL_NAME)
 
 # variables for makelib/build_go_bin.mk
 BGB_STAMP := $(RKT_STAMP)
@@ -25,7 +25,7 @@ TOPLEVEL_STAMPS += $(RKT_STAMP)
 
 $(call generate-stamp-rule,$(RKT_STAMP))
 
-$(BGB_BINARY): $(MK_PATH) | $(BINDIR)
+$(BGB_BINARY): $(MK_PATH) | $(TARGET_BINDIR)
 
 include makelib/build_go_bin.mk
 
diff --git a/stage1/makelib/aci_simple_go_bin.mk b/stage1/makelib/aci_simple_go_bin.mk
index 88999931eb..7c44e01ea8 100644
--- a/stage1/makelib/aci_simple_go_bin.mk
+++ b/stage1/makelib/aci_simple_go_bin.mk
@@ -20,7 +20,7 @@ _ASGB_PATH_ := $(lastword $(MAKEFILE_LIST))
 # Name of a binary, deduced upon filename of a parent Makefile.
 _ASGB_NAME_ := $(patsubst %.mk,%,$(MK_FILENAME))
 # Path to built binary. Not the one in the ACI rootfs.
-_ASGB_BINARY_ := $(TOOLSDIR)/$(_ASGB_NAME_)
+_ASGB_BINARY_ := $(TARGET_TOOLSDIR)/$(_ASGB_NAME_)
 
 ifeq ($(ASGB_FLAVORS),)
 
@@ -42,7 +42,7 @@ include makelib/build_go_bin.mk
 
 CLEAN_FILES += $(_ASGB_BINARY_)
 
-$(_ASGB_BINARY_): $(_ASGB_PATH_) $(MK_PATH) | $(TOOLSDIR)
+$(_ASGB_BINARY_): $(_ASGB_PATH_) $(MK_PATH) | $(TARGET_TOOLSDIR)
 
 # 2.
 
diff --git a/stage1/makelib/aci_simple_static_c_bin.mk b/stage1/makelib/aci_simple_static_c_bin.mk
index e98d5ad392..bf15731734 100644
--- a/stage1/makelib/aci_simple_static_c_bin.mk
+++ b/stage1/makelib/aci_simple_static_c_bin.mk
@@ -24,7 +24,7 @@ _ASSCB_PATH_ := $(lastword $(MAKEFILE_LIST))
 # Name of a binary, deduced upon filename of a parent Makefile.
 _ASSCB_NAME_ := $(patsubst %.mk,%,$(MK_FILENAME))
 # Path to built binary. Not the one in the ACI rootfs.
-_ASSCB_BINARY_ := $(TOOLSDIR)/$(_ASSCB_NAME_)
+_ASSCB_BINARY_ := $(TARGET_TOOLSDIR)/$(_ASSCB_NAME_)
 
 ifeq ($(ASSCB_FLAVORS),)
 
@@ -44,7 +44,7 @@ CLEAN_FILES += $(_ASSCB_BINARY_)
 
 include makelib/build_static_c_bin.mk
 
-$(_ASSCB_BINARY_): $(_ASSCB_PATH_) $(MK_PATH) | $(TOOLSDIR)
+$(_ASSCB_BINARY_): $(_ASSCB_PATH_) $(MK_PATH) | $(TARGET_TOOLSDIR)
 
 # 2.
 
diff --git a/stage1/net-plugins/net-plugins.mk b/stage1/net-plugins/net-plugins.mk
index 78ef0848c0..edff85c2d4 100644
--- a/stage1/net-plugins/net-plugins.mk
+++ b/stage1/net-plugins/net-plugins.mk
@@ -30,7 +30,7 @@ define NPM_GENERATE_BUILD_PLUGIN_RULE
 # base name of a plugin
 NPM_BASE := $$(notdir $1)
 # path to the built plugin
-NPM_PLUGIN := $$(TOOLSDIR)/$$(NPM_BASE)
+NPM_PLUGIN := $$(TARGET_TOOLSDIR)/$$(NPM_BASE)
 
 # stamp used to build a plugin
 $$(call setup-stamp-file,NPM_STAMP,$$(NPM_BASE))
@@ -41,7 +41,7 @@ BGB_BINARY := $$(NPM_PLUGIN)
 BGB_PKG_IN_REPO := Godeps/_workspace/src/github.com/containernetworking/cni/plugins/$1
 include makelib/build_go_bin.mk
 
-$$(NPM_PLUGIN): | $$(TOOLSDIR)
+$$(NPM_PLUGIN): $(TARGET_TOOLSDIR)
 
 $$(call generate-stamp-rule,$$(NPM_STAMP))
 
diff --git a/stage1/stage1.mk b/stage1/stage1.mk
index f232013b6d..7bc82ad52a 100644
--- a/stage1/stage1.mk
+++ b/stage1/stage1.mk
@@ -66,7 +66,7 @@ $(foreach f,$(STAGE1_FLAVORS), \
 	$(eval STAGE1_SECONDARY_STAMPS_$f :=) \
 	$(eval STAGE1_ACIDIR_$f := $(BUILDDIR)/aci-for-$f-flavor) \
 	$(eval STAGE1_ACIROOTFSDIR_$f := $(STAGE1_ACIDIR_$f)/rootfs) \
-	$(eval STAGE1_ACI_IMAGE_$f := $(BINDIR)/stage1-$f.aci) \
+	$(eval STAGE1_ACI_IMAGE_$f := $(TARGET_BINDIR)/stage1-$f.aci) \
 	$(eval STAGE1_INSTALL_FILES_$f :=) \
 	$(eval STAGE1_INSTALL_SYMLINKS_$f :=) \
 	$(eval STAGE1_INSTALL_DIRS_$f :=) \
@@ -136,7 +136,7 @@ endif
 # above.
 $$(call forward-vars,$$(STAGE1_ACI_IMAGE_$1), \
 	ACTOOL STAGE1_ACIDIR_$1)
-$$(STAGE1_ACI_IMAGE_$1): $$(ACTOOL_STAMP) | $$(BINDIR)
+$$(STAGE1_ACI_IMAGE_$1): $$(ACTOOL_STAMP) | $$(TARGET_BINDIR)
 	$(VQ) \
 	$(call vb,vt,ACTOOL,$$(call vsp,$$@)) \
 	"$$(ACTOOL)" build --overwrite --owner-root "$$(STAGE1_ACIDIR_$1)" "$$@"
diff --git a/stage1_fly/stage1_fly.mk b/stage1_fly/stage1_fly.mk
index 8513176f06..d9fe3149ea 100644
--- a/stage1_fly/stage1_fly.mk
+++ b/stage1_fly/stage1_fly.mk
@@ -1,9 +1,9 @@
 FLY_ACIDIR := $(BUILDDIR)/aci-for-fly-flavor
 FLY_ACIROOTFSDIR := $(FLY_ACIDIR)/rootfs
-FLY_TOOLSDIR := $(TOOLSDIR)/fly
+FLY_TOOLSDIR := $(TARGET_TOOLSDIR)/fly
 FLY_STAMPS :=
 FLY_SUBDIRS := run gc enter aci
-FLY_STAGE1 := $(BINDIR)/stage1-fly.aci
+FLY_STAGE1 := $(TARGET_BINDIR)/stage1-fly.aci
 
 $(call setup-stamp-file,FLY_STAMP,aci-build)
 
diff --git a/tests/functional.mk b/tests/functional.mk
index 2e8d383d89..7fb9ba7c4a 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -49,7 +49,7 @@ CREATE_DIRS += \
 INSTALL_DIRS += \
 	$(FTST_IMAGE_ROOTFSDIR):0755
 INSTALL_SYMLINKS += \
-	$(foreach f,$(FTST_STAGE1_FLAVOR_FILENAMES),$(BINDIR)/$f:$(FTST_TMPDIR)/$f)
+	$(foreach f,$(FTST_STAGE1_FLAVOR_FILENAMES),$(TARGET_BINDIR)/$f:$(FTST_TMPDIR)/$f)
 CLEAN_FILES += \
 	$(FTST_IMAGE) \
 	$(FTST_ECHO_SERVER_BINARY) \

From de62f73737e219d23e54314eb07910a7751adbc2 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0443/1304] stage1: Move manifest files to board directory

To allow building rkt from multiple CoreOS board images move
the manifest files to board specific directories.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 .../{manifest.d => manifest-amd64-usr.d}/bash.manifest          | 0
 .../{manifest.d => manifest-amd64-usr.d}/journald.manifest      | 0
 .../{manifest.d => manifest-amd64-usr.d}/systemd.manifest       | 0
 stage1/usr_from_coreos/usr_from_coreos.mk                       | 2 +-
 stage1/usr_from_kvm/manifest-amd64-usr.d/bash.manifest          | 1 +
 .../{manifest.d => manifest-amd64-usr.d}/ip.manifest            | 0
 stage1/usr_from_kvm/manifest-amd64-usr.d/journald.manifest      | 1 +
 .../{manifest.d => manifest-amd64-usr.d}/sshd.manifest          | 0
 stage1/usr_from_kvm/manifest-amd64-usr.d/systemd.manifest       | 1 +
 stage1/usr_from_kvm/manifest.d/bash.manifest                    | 1 -
 stage1/usr_from_kvm/manifest.d/journald.manifest                | 1 -
 stage1/usr_from_kvm/manifest.d/systemd.manifest                 | 1 -
 stage1/usr_from_kvm/usr_from_kvm.mk                             | 2 +-
 13 files changed, 5 insertions(+), 5 deletions(-)
 rename stage1/usr_from_coreos/{manifest.d => manifest-amd64-usr.d}/bash.manifest (100%)
 rename stage1/usr_from_coreos/{manifest.d => manifest-amd64-usr.d}/journald.manifest (100%)
 rename stage1/usr_from_coreos/{manifest.d => manifest-amd64-usr.d}/systemd.manifest (100%)
 create mode 120000 stage1/usr_from_kvm/manifest-amd64-usr.d/bash.manifest
 rename stage1/usr_from_kvm/{manifest.d => manifest-amd64-usr.d}/ip.manifest (100%)
 create mode 120000 stage1/usr_from_kvm/manifest-amd64-usr.d/journald.manifest
 rename stage1/usr_from_kvm/{manifest.d => manifest-amd64-usr.d}/sshd.manifest (100%)
 create mode 120000 stage1/usr_from_kvm/manifest-amd64-usr.d/systemd.manifest
 delete mode 120000 stage1/usr_from_kvm/manifest.d/bash.manifest
 delete mode 120000 stage1/usr_from_kvm/manifest.d/journald.manifest
 delete mode 120000 stage1/usr_from_kvm/manifest.d/systemd.manifest

diff --git a/stage1/usr_from_coreos/manifest.d/bash.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/bash.manifest
similarity index 100%
rename from stage1/usr_from_coreos/manifest.d/bash.manifest
rename to stage1/usr_from_coreos/manifest-amd64-usr.d/bash.manifest
diff --git a/stage1/usr_from_coreos/manifest.d/journald.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/journald.manifest
similarity index 100%
rename from stage1/usr_from_coreos/manifest.d/journald.manifest
rename to stage1/usr_from_coreos/manifest-amd64-usr.d/journald.manifest
diff --git a/stage1/usr_from_coreos/manifest.d/systemd.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
similarity index 100%
rename from stage1/usr_from_coreos/manifest.d/systemd.manifest
rename to stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
diff --git a/stage1/usr_from_coreos/usr_from_coreos.mk b/stage1/usr_from_coreos/usr_from_coreos.mk
index 0028982452..70ac3c8da9 100644
--- a/stage1/usr_from_coreos/usr_from_coreos.mk
+++ b/stage1/usr_from_coreos/usr_from_coreos.mk
@@ -10,7 +10,7 @@ S1_RF_USR_STAMPS += $(UFC_CBU_STAMP)
 
 # Input variables for building the ACI rootfs from CoreOS image
 # (build-usr.mk).
-CBU_MANIFESTS_DIR := $(MK_SRCDIR)/manifest.d
+CBU_MANIFESTS_DIR := $(MK_SRCDIR)/manifest-$(RKT_STAGE1_COREOS_BOARD).d
 CBU_TMPDIR := $(UFC_CBUDIR)
 CBU_DIFF := for-usr-from-coreos-mk
 CBU_STAMP := $(UFC_CBU_STAMP)
diff --git a/stage1/usr_from_kvm/manifest-amd64-usr.d/bash.manifest b/stage1/usr_from_kvm/manifest-amd64-usr.d/bash.manifest
new file mode 120000
index 0000000000..5eac6843c8
--- /dev/null
+++ b/stage1/usr_from_kvm/manifest-amd64-usr.d/bash.manifest
@@ -0,0 +1 @@
+../../usr_from_coreos/manifest-amd64-usr.d/bash.manifest
\ No newline at end of file
diff --git a/stage1/usr_from_kvm/manifest.d/ip.manifest b/stage1/usr_from_kvm/manifest-amd64-usr.d/ip.manifest
similarity index 100%
rename from stage1/usr_from_kvm/manifest.d/ip.manifest
rename to stage1/usr_from_kvm/manifest-amd64-usr.d/ip.manifest
diff --git a/stage1/usr_from_kvm/manifest-amd64-usr.d/journald.manifest b/stage1/usr_from_kvm/manifest-amd64-usr.d/journald.manifest
new file mode 120000
index 0000000000..cdc5df962e
--- /dev/null
+++ b/stage1/usr_from_kvm/manifest-amd64-usr.d/journald.manifest
@@ -0,0 +1 @@
+../../usr_from_coreos/manifest-amd64-usr.d/journald.manifest
\ No newline at end of file
diff --git a/stage1/usr_from_kvm/manifest.d/sshd.manifest b/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
similarity index 100%
rename from stage1/usr_from_kvm/manifest.d/sshd.manifest
rename to stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
diff --git a/stage1/usr_from_kvm/manifest-amd64-usr.d/systemd.manifest b/stage1/usr_from_kvm/manifest-amd64-usr.d/systemd.manifest
new file mode 120000
index 0000000000..d9346f64a8
--- /dev/null
+++ b/stage1/usr_from_kvm/manifest-amd64-usr.d/systemd.manifest
@@ -0,0 +1 @@
+../../usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
\ No newline at end of file
diff --git a/stage1/usr_from_kvm/manifest.d/bash.manifest b/stage1/usr_from_kvm/manifest.d/bash.manifest
deleted file mode 120000
index 1e70f758f7..0000000000
--- a/stage1/usr_from_kvm/manifest.d/bash.manifest
+++ /dev/null
@@ -1 +0,0 @@
-../../usr_from_coreos/manifest.d/bash.manifest
\ No newline at end of file
diff --git a/stage1/usr_from_kvm/manifest.d/journald.manifest b/stage1/usr_from_kvm/manifest.d/journald.manifest
deleted file mode 120000
index 9190f6c01b..0000000000
--- a/stage1/usr_from_kvm/manifest.d/journald.manifest
+++ /dev/null
@@ -1 +0,0 @@
-../../usr_from_coreos/manifest.d/journald.manifest
\ No newline at end of file
diff --git a/stage1/usr_from_kvm/manifest.d/systemd.manifest b/stage1/usr_from_kvm/manifest.d/systemd.manifest
deleted file mode 120000
index 8b479ff5c3..0000000000
--- a/stage1/usr_from_kvm/manifest.d/systemd.manifest
+++ /dev/null
@@ -1 +0,0 @@
-../../usr_from_coreos/manifest.d/systemd.manifest
\ No newline at end of file
diff --git a/stage1/usr_from_kvm/usr_from_kvm.mk b/stage1/usr_from_kvm/usr_from_kvm.mk
index eceadc9e21..d74bb0bbb9 100644
--- a/stage1/usr_from_kvm/usr_from_kvm.mk
+++ b/stage1/usr_from_kvm/usr_from_kvm.mk
@@ -15,7 +15,7 @@ $(call inc-many,$(UFK_INCLUDES))
 
 # Some input variables for building the ACI rootfs from CoreOS image
 # (build-usr.mk).
-CBU_MANIFESTS_DIR := $(MK_SRCDIR)/manifest.d
+CBU_MANIFESTS_DIR := $(MK_SRCDIR)/manifest-$(RKT_STAGE1_COREOS_BOARD).d
 CBU_TMPDIR := $(UFK_CBUDIR)
 CBU_DIFF := for-usr-from-kvm-mk
 CBU_STAMP := $(UFK_CBU_STAMP)

From fcd6f8bacd83244fc4a28738cd8040325218be88 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0444/1304] stage1: Get board specific image

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1/usr_from_coreos/coreos-common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index 75abfb15cd..00491cea01 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -13,7 +13,7 @@ CCN_SYSTEMD_VERSION := v229
 # coreos image version
 CCN_IMG_RELEASE := 1068.0.0
 # coreos image URL
-CCN_IMG_URL := https://alpha.release.core-os.net/amd64-usr/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
+CCN_IMG_URL := https://alpha.release.core-os.net/$(RKT_STAGE1_COREOS_BOARD)/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image
 CCN_DOWNLOADED_PXE := $(CCN_TMPDIR)/pxe.img
 CLEAN_FILES += \

From 2ce24da0e558d645cfe162f166b82b6456bd6504 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0445/1304] stage1: Set ACI manifest arch value

Set the arch value of the ACI manifest based on the RKT_ACI_ARCH
variable.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1/aci/aci-install.mk  | 8 +++++---
 stage1/aci/aci-manifest.in | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/stage1/aci/aci-install.mk b/stage1/aci/aci-install.mk
index 54363b16e3..6e072c50f7 100644
--- a/stage1/aci/aci-install.mk
+++ b/stage1/aci/aci-install.mk
@@ -63,6 +63,7 @@ endif
 AMI_SED_NAME := $(call sed-replacement-escape,$(AMI_NAME))
 AMI_SED_VERSION := $(call sed-replacement-escape,$(AMI_STAGE1_VERSION))
 AMI_SED_ENTER := $(call sed-replacement-escape,$(STAGE1_ENTER_CMD_$(AMI_FLAVOR)))
+AMI_SED_ARCH := $(call sed-replacement-escape,$(RKT_ACI_ARCH))
 
 # main stamp ensures everything is done
 $(call setup-stamp-file,AMI_STAMP,$(AMI_FLAVOR)-main)
@@ -86,7 +87,7 @@ $(call generate-stamp-rule,$(AMI_STAMP),$(AMI_INSTALLED_FILES) $(AMI_MANIFEST_KV
 
 # this rule generates a manifest
 $(call forward-vars,$(AMI_GEN_MANIFEST), \
-	AMI_FLAVOR AMI_SED_NAME AMI_SED_VERSION AMI_SED_ENTER)
+	AMI_FLAVOR AMI_SED_NAME AMI_SED_VERSION AMI_SED_ENTER AMI_SED_ARCH)
 $(AMI_GEN_MANIFEST): $(AMI_SRC_MANIFEST) | $(AMI_TMPDIR)
 	$(VQ) \
 	set -e; \
@@ -95,11 +96,12 @@ $(AMI_GEN_MANIFEST): $(AMI_SRC_MANIFEST) | $(AMI_TMPDIR)
 		-e 's/@RKT_STAGE1_NAME@/$(AMI_SED_NAME)/g' \
 		-e 's/@RKT_STAGE1_VERSION@/$(AMI_SED_VERSION)/g' \
 		-e 's/@RKT_STAGE1_ENTER@/$(AMI_SED_ENTER)/g' \
+		-e 's/@RKT_STAGE1_ARCH@/$(AMI_SED_ARCH)/g' \
 	"$<" >"$@.tmp"; \
 	$(call bash-cond-rename,$@.tmp,$@)
 
-# invalidate generated manifest if name, version or enter cmd changes
-$(call generate-kv-deps,$(AMI_MANIFEST_KV_DEPMK_STAMP),$(AMI_GEN_MANIFEST),$(AMI_MANIFEST_KV_DEPMK),AMI_SED_NAME AMI_SED_VERSION AMI_SED_ENTER)
+# invalidate generated manifest if name, version, arch or enter cmd changes
+$(call generate-kv-deps,$(AMI_MANIFEST_KV_DEPMK_STAMP),$(AMI_GEN_MANIFEST),$(AMI_MANIFEST_KV_DEPMK),AMI_SED_NAME AMI_SED_VERSION AMI_SED_ARCH AMI_SED_ENTER)
 
 # this removes the ACI rootfs dir
 $(call generate-rm-dir-rule,$(AMI_RMDIR_STAMP),$(AMI_ACIROOTFSDIR))
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index b9e7b1a3dc..257fcb8900 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -9,7 +9,7 @@
         },
         {
             "name": "arch",
-            "value": "amd64"
+            "value": "@RKT_STAGE1_ARCH@"
         },
         {
             "name": "os",

From 42b35c2d75a0f812e126bbfb0c1884831b6c5aeb Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0446/1304] stage1_fly: Set ACI manifest arch value

Set the arch value of the ACI manifest based on the RKT_ACI_ARCH
variable.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1_fly/aci/aci-manifest.in | 2 +-
 stage1_fly/aci/aci.mk          | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index 54295d342e..598c409eb5 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -9,7 +9,7 @@
         },
         {
             "name": "arch",
-            "value": "amd64"
+            "value": "@RKT_STAGE1_ARCH@"
         },
         {
             "name": "os",
diff --git a/stage1_fly/aci/aci.mk b/stage1_fly/aci/aci.mk
index eacf2d525d..f9c0d93e7e 100644
--- a/stage1_fly/aci/aci.mk
+++ b/stage1_fly/aci/aci.mk
@@ -12,6 +12,7 @@ FLY_ACI_MANIFEST := $(FLY_ACIDIR)/manifest
 # they can be safely used in the replacement part of sed's s///
 # command.
 FLY_ACI_VERSION := $(call sed-replacement-escape,$(RKT_VERSION))
+FLY_ACI_ARCH := $(call sed-replacement-escape,$(RKT_ACI_ARCH))
 # stamp and dep file for invalidating the generated manifest if name,
 # version or enter command changes for this flavor
 $(call setup-stamp-file,FLY_ACI_MANIFEST_KV_DEPMK_STAMP,$manifest-kv-dep)
@@ -25,18 +26,19 @@ FLY_ACI_DIRS := \
 # main stamp rule - makes sure manifest and deps files are generated
 $(call generate-stamp-rule,$(FLY_ACI_STAMP),$(FLY_ACI_MANIFEST) $(FLY_ACI_MANIFEST_KV_DEPMK_STAMP))
 
-# invalidate generated manifest if version changes
-$(call generate-kv-deps,$(FLY_ACI_MANIFEST_KV_DEPMK_STAMP),$(FLY_ACI_GEN_MANIFEST),$(FLY_ACI_MANIFEST_KV_DEPMK),FLY_ACI_VERSION)
+# invalidate generated manifest if version or arch changes
+$(call generate-kv-deps,$(FLY_ACI_MANIFEST_KV_DEPMK_STAMP),$(FLY_ACI_GEN_MANIFEST),$(FLY_ACI_MANIFEST_KV_DEPMK),FLY_ACI_VERSION FLY_ACI_ARCH)
 
 # this rule generates a manifest
 $(call forward-vars,$(FLY_ACI_GEN_MANIFEST), \
-	FLY_ACI_VERSION)
+	FLY_ACI_VERSION FLY_ACI_ARCH)
 $(FLY_ACI_GEN_MANIFEST): $(FLY_ACI_SRC_MANIFEST) | $(FLY_ACI_TMPDIR) $(FLY_ACI_DIRS) $(FLY_ACIROOTFSDIR)/flavor
 	$(VQ) \
 	set -e; \
 	$(call vb,vt,MANIFEST,fly) \
 	sed \
 		-e 's/@RKT_STAGE1_VERSION@/$(FLY_ACI_VERSION)/g' \
+		-e 's/@RKT_STAGE1_ARCH@/$(FLY_ACI_ARCH)/g' \
 	"$<" >"$@.tmp"; \
 	$(call bash-cond-rename,$@.tmp,$@)
 

From 390af328ac4be322eddc1ccc01f8ccec8bc2ab7b Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0447/1304] stage1/init: Add arm64 interpBin

The interpreter binary is arch specific, so split the interpBin definition
off into the arch specific file init_linux_amd64.go, and add a new one,
init_linux_arm64.go.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1/init/init.go             |  2 --
 stage1/init/init_linux_amd64.go | 22 ++++++++++++++++++++++
 stage1/init/init_linux_arm64.go | 22 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 stage1/init/init_linux_amd64.go
 create mode 100644 stage1/init/init_linux_arm64.go

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 7955e432da..cad2674615 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -56,8 +56,6 @@ import (
 const (
 	// Path to systemd-nspawn binary within the stage1 rootfs
 	nspawnBin = "/usr/bin/systemd-nspawn"
-	// Path to the interpreter within the stage1 rootfs
-	interpBin = "/usr/lib/ld-linux-x86-64.so.2"
 	// Path to the localtime file/symlink in host
 	localtimePath = "/etc/localtime"
 )
diff --git a/stage1/init/init_linux_amd64.go b/stage1/init/init_linux_amd64.go
new file mode 100644
index 0000000000..fb673c2999
--- /dev/null
+++ b/stage1/init/init_linux_amd64.go
@@ -0,0 +1,22 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build amd64,linux
+
+package main
+
+const (
+	// Path to the interpreter within the stage1 rootfs
+	interpBin = "/usr/lib/ld-linux-x86-64.so.2"
+)
diff --git a/stage1/init/init_linux_arm64.go b/stage1/init/init_linux_arm64.go
new file mode 100644
index 0000000000..c7962260f8
--- /dev/null
+++ b/stage1/init/init_linux_arm64.go
@@ -0,0 +1,22 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build arm64,linux
+
+package main
+
+const (
+	// Path to the interpreter within the stage1 rootfs
+	interpBin = "/usr/lib/ld-linux-aarch64.so.1"
+)

From 1b0d2f43120b1aeeb5569f4291cac07f3b6eca4a Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0448/1304] stage1: Add arm64-usr manifest files

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 .../manifest-arm64-usr.d/bash.manifest        | 12 +++
 .../manifest-arm64-usr.d/journald.manifest    |  5 +
 .../manifest-arm64-usr.d/systemd.manifest     | 95 +++++++++++++++++++
 .../manifest-arm64-usr.d/bash.manifest        |  1 +
 .../manifest-arm64-usr.d/ip.manifest          |  8 ++
 .../manifest-arm64-usr.d/journald.manifest    |  1 +
 .../manifest-arm64-usr.d/sshd.manifest        | 22 +++++
 .../manifest-arm64-usr.d/systemd.manifest     |  1 +
 8 files changed, 145 insertions(+)
 create mode 100644 stage1/usr_from_coreos/manifest-arm64-usr.d/bash.manifest
 create mode 100644 stage1/usr_from_coreos/manifest-arm64-usr.d/journald.manifest
 create mode 100644 stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
 create mode 120000 stage1/usr_from_kvm/manifest-arm64-usr.d/bash.manifest
 create mode 100644 stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest
 create mode 120000 stage1/usr_from_kvm/manifest-arm64-usr.d/journald.manifest
 create mode 100644 stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest
 create mode 120000 stage1/usr_from_kvm/manifest-arm64-usr.d/systemd.manifest

diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/bash.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/bash.manifest
new file mode 100644
index 0000000000..cfba8f1f1a
--- /dev/null
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/bash.manifest
@@ -0,0 +1,12 @@
+bin/bash
+lib64/libreadline.so.6.3
+lib64/libreadline.so.6
+lib64/libncurses.so.5.9
+lib64/libncurses.so.5
+lib64/libdl.so.2
+lib64/libdl-2.21.so
+lib64/libc.so.6
+lib64/libc-2.21.so
+lib64/ld-linux-aarch64.so.1
+lib64/ld-2.21.so
+lib/ld-linux-aarch64.so.1
diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/journald.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/journald.manifest
new file mode 100644
index 0000000000..04637a41c4
--- /dev/null
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/journald.manifest
@@ -0,0 +1,5 @@
+lib/systemd/system/syslog.socket
+lib/systemd/system/systemd-journald-audit.socket
+lib/systemd/system/systemd-journald-dev-log.socket
+lib/systemd/system/systemd-journald.service
+lib/systemd/system/systemd-journald.socket
diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
new file mode 100644
index 0000000000..e1dc37bf3a
--- /dev/null
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
@@ -0,0 +1,95 @@
+bin/bash
+bin/coredumpctl
+bin/journalctl
+bin/mount
+bin/systemctl
+bin/systemd-analyze
+bin/systemd-ask-password
+bin/systemd-cat
+bin/systemd-cgls
+bin/systemd-cgtop
+bin/systemd-delta
+bin/systemd-detect-virt
+bin/systemd-inhibit
+bin/systemd-machine-id-setup
+bin/systemd-notify
+bin/systemd-nspawn
+bin/systemd-path
+bin/systemd-run
+bin/systemd-stdio-bridge
+bin/systemd-sysusers
+bin/systemd-tmpfiles
+bin/systemd-tty-ask-password-agent
+lib64/ld-2.21.so
+lib64/ld-linux-aarch64.so.1
+lib64/libattr.so.1
+lib64/libattr.so.1.1.0
+lib64/libblkid.so.1
+lib64/libblkid.so.1.1.0
+lib64/libc-2.21.so
+lib64/libcap.so.2
+lib64/libcap.so.2.24
+lib64/libc.so.6
+lib64/libdl-2.21.so
+lib64/libdl.so
+lib64/libdl.so.2
+lib64/libgcrypt.so.11
+lib64/libgcrypt.so.11.8.3
+lib64/libgpg-error.so.0
+lib64/libgpg-error.so.0.10.0
+lib64/libip4tc.so.0
+lib64/libip4tc.so.0.1.0
+lib64/libkmod.so.2
+lib64/libkmod.so.2.2.11
+lib64/liblzma.so.5.0.8
+lib64/liblzma.so.5
+lib64/libmount.so.1
+lib64/libmount.so.1.1.0
+lib64/libncurses.so.5
+lib64/libncurses.so.5.9
+lib64/libpam.so.0
+lib64/libpam.so.0.84.1
+lib64/libpthread-2.21.so
+lib64/libpthread.so.0
+lib64/libreadline.so.6
+lib64/libreadline.so.6.3
+lib64/librt-2.21.so
+lib64/librt.so.1
+lib64/libuuid.so.1
+lib64/libuuid.so.1.3.0
+lib64/libz.so.1
+lib64/libz.so.1.2.8
+lib/ld-linux-aarch64.so.1
+lib/systemd/systemd
+lib/systemd/systemd-ac-power
+lib/systemd/systemd-activate
+lib/systemd/systemd-backlight
+lib/systemd/systemd-binfmt
+lib/systemd/systemd-bootchart
+lib/systemd/systemd-bus-proxyd
+lib/systemd/systemd-cgroups-agent
+lib/systemd/systemd-coredump
+lib/systemd/systemd-fsck
+lib/systemd/systemd-hostnamed
+lib/systemd/systemd-initctl
+lib/systemd/systemd-journald
+lib/systemd/systemd-localed
+lib/systemd/systemd-logind
+lib/systemd/systemd-machined
+lib/systemd/systemd-modules-load
+lib/systemd/systemd-networkd
+lib/systemd/systemd-networkd-wait-online
+lib/systemd/systemd-random-seed
+lib/systemd/systemd-remount-fs
+lib/systemd/systemd-reply-password
+lib/systemd/systemd-rfkill
+lib/systemd/systemd-shutdown
+lib/systemd/systemd-sleep
+lib/systemd/systemd-sysctl
+lib/systemd/systemd-timedated
+lib/systemd/systemd-udevd
+lib/systemd/systemd-update-done
+lib/systemd/systemd-update-utmp
+lib/systemd/systemd-vconsole-setup
+lib/systemd/system-sleep
+lib/systemd/user-generators
diff --git a/stage1/usr_from_kvm/manifest-arm64-usr.d/bash.manifest b/stage1/usr_from_kvm/manifest-arm64-usr.d/bash.manifest
new file mode 120000
index 0000000000..c3b0ee0f4e
--- /dev/null
+++ b/stage1/usr_from_kvm/manifest-arm64-usr.d/bash.manifest
@@ -0,0 +1 @@
+../../usr_from_coreos/manifest-arm64-usr.d/bash.manifest
\ No newline at end of file
diff --git a/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest b/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest
new file mode 100644
index 0000000000..c983b94b65
--- /dev/null
+++ b/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest
@@ -0,0 +1,8 @@
+bin/ip
+lib64/libdl.so.2
+lib64/libdl-2.21.so
+lib64/libc.so.6
+lib64/libc-2.21.so
+lib64/ld-linux-aarch64.so.1
+lib64/ld-2.21.so
+lib/ld-linux-aarch64.so.1
diff --git a/stage1/usr_from_kvm/manifest-arm64-usr.d/journald.manifest b/stage1/usr_from_kvm/manifest-arm64-usr.d/journald.manifest
new file mode 120000
index 0000000000..8306b4af1d
--- /dev/null
+++ b/stage1/usr_from_kvm/manifest-arm64-usr.d/journald.manifest
@@ -0,0 +1 @@
+../../usr_from_coreos/manifest-arm64-usr.d/journald.manifest
\ No newline at end of file
diff --git a/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest b/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest
new file mode 100644
index 0000000000..5591237179
--- /dev/null
+++ b/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest
@@ -0,0 +1,22 @@
+bin/chmod
+bin/chown
+bin/ssh-keygen
+lib64/ld-linux-aarch64.so.1
+lib64/libc-2.21.so
+lib64/libcrypt-2.21.so
+lib64/libcrypto.so.1.0.0
+lib64/libcrypt.so.1
+lib64/libc.so.6
+lib64/libdl-2.21.so
+lib64/libdl.so.2
+lib64/libpam.so
+lib64/libpam.so.0.84.1
+lib64/libresolv-2.21.so
+lib64/libresolv.so.2
+lib64/libutil-2.21.so
+lib64/libutil.so.1
+lib64/libz.so.1
+lib64/libz.so.1.2.8
+libcrypt-2.21.so
+lib/ld-linux-aarch64.so.1
+sbin/sshd
diff --git a/stage1/usr_from_kvm/manifest-arm64-usr.d/systemd.manifest b/stage1/usr_from_kvm/manifest-arm64-usr.d/systemd.manifest
new file mode 120000
index 0000000000..4e10576577
--- /dev/null
+++ b/stage1/usr_from_kvm/manifest-arm64-usr.d/systemd.manifest
@@ -0,0 +1 @@
+../../usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
\ No newline at end of file

From 687f8120474e07c879d30627aef936b497b88763 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0449/1304] travis: Use apt packages addon

Use the travis apt packages addon to simplify installing packages.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 .travis.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad3e395521..6ce4bc67f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,18 @@ go:
   - 1.5.3
   - 1.6
 
+addons:
+  apt:
+    packages:
+    - cpio
+    - realpath
+    - squashfs-tools
+    - build-essential
+    - libacl1-dev
+    - libsystemd-journal-dev
+
 install:
- - sudo apt-get update -qq
- - sudo apt-get install -y cpio realpath squashfs-tools
- - sudo apt-get install -y build-essential
- - sudo apt-get install -y libacl1-dev
- - sudo apt-get install -y libsystemd-journal-dev
+  -
 
 script:
  - ./autogen.sh

From 1642da3ef06b35c6fd2a54fb07c01d5b9ce65e17 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0450/1304] travis: Add gimme.local

Add a local gimme script that knows how to provide a go compiler with
arm64 cgo support.

This change can be reverted once travis PR #45 is merged.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 gimme.local | 481 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 481 insertions(+)
 create mode 100755 gimme.local

diff --git a/gimme.local b/gimme.local
new file mode 100755
index 0000000000..9a2afe69d7
--- /dev/null
+++ b/gimme.local
@@ -0,0 +1,481 @@
+#!/bin/bash
+# vim:noexpandtab:ts=2:sw=2:
+#
+#+  Usage: $(basename $0) [flags] [go-version] [version-prefix]
+#+  -
+#+  Version: ${GIMME_VERSION}
+#+  -
+#+  Install go!  There are multiple types of installations available, with 'auto' being the default.
+#+  If either 'auto' or 'binary' is specified as GIMME_TYPE, gimme will first check for an existing
+#+  go installation.  This behavior may be disabled by providing '-f/--force/force' as first positional
+#+  argument.
+#+  -
+#+  Option flags:
+#+          -h --help help - show this help text and exit
+#+    -V --version version - show the version only and exit
+#+        -f --force force - remove the existing go installation if present prior to install
+#+          -l --list list - list installed go versions and exit
+#+  -
+#+  Influential env vars:
+#+  -
+#+        GIMME_GO_VERSION - version to install (*REQUIRED*, may be given as first positional arg)
+#+    GIMME_VERSION_PREFIX - prefix for installed versions (default '${GIMME_VERSION_PREFIX}',
+#+                           may be given as second positional arg)
+#+              GIMME_ARCH - arch to install (default '${GIMME_ARCH}')
+#+        GIMME_BINARY_OSX - darwin-specific binary suffix (default '${GIMME_BINARY_OSX}')
+#+        GIMME_ENV_PREFIX - prefix for env files (default '${GIMME_ENV_PREFIX}')
+#+     GIMME_GO_GIT_REMOTE - git remote for git-based install (default '${GIMME_GO_GIT_REMOTE}')
+#+                GIMME_OS - os to install (default '${GIMME_OS}')
+#+               GIMME_TMP - temp directory (default '${GIMME_TMP}')
+#+              GIMME_TYPE - install type to perform ('auto', 'binary', 'source', or 'git')
+#+                           (default '${GIMME_TYPE}')
+#+             GIMME_DEBUG - enable tracing if non-empty
+#+      GIMME_NO_ENV_ALIAS - disable creation of env 'alias' file when os and arch match host
+#+        GIMME_SILENT_ENV - omit the 'go version' line from env file
+#+       GIMME_CGO_ENABLED - enable build of cgo support
+#+     GIMME_CC_FOR_TARGET - cross compiler for cgo support
+#+  -
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2015 Dan Buch, Tianon Gravi
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+set -e
+shopt -s nullglob
+set -o pipefail
+
+[[ ${GIMME_DEBUG} ]] && set -x
+
+GIMME_VERSION=v0.2.3
+
+# _do_curl "url" "file"
+_do_curl() {
+	mkdir -p "$(dirname "${2}")"
+
+	if command -v curl > /dev/null ; then
+		curl -sSLf "${1}" -o "${2}" 2>/dev/null
+		return
+	fi
+
+	if command -v wget > /dev/null ; then
+		wget -q "${1}" -O "${2}" 2>/dev/null
+		return
+	fi
+
+	echo >&2 'error: no curl or wget found'
+	exit 1
+}
+
+# _do_curls "file" "url" ["url"...]
+_do_curls() {
+	f="${1}"
+	shift
+	[[ ! -s "${f}" ]] || return 0
+	for url in "${@}" ; do
+		if _do_curl "${url}" "${f}" ; then
+			return
+		fi
+	done
+	rm -f "${f}"
+	return 1
+}
+
+# _binary "version" "file.tar.gz" "arch"
+_binary() {
+	local version=${1}
+	local file=${2}
+	local arch=${3}
+	urls=(
+		"https://storage.googleapis.com/golang/go${version}.${GIMME_OS}-${arch}.tar.gz"
+		"https://go.googlecode.com/files/go${version}.${GIMME_OS}-${arch}.tar.gz"
+		"https://go.googlecode.com/files/go.${version}.${GIMME_OS}-${arch}.tar.gz"
+	)
+	if [ "${GIMME_OS}" = 'darwin' -a "${GIMME_BINARY_OSX}" ] ; then
+		urls=(
+			"https://storage.googleapis.com/golang/go${version}.${GIMME_OS}-${arch}-${GIMME_BINARY_OSX}.tar.gz"
+			"${urls[@]}"
+		)
+	fi
+	if [ "${arch}" = 'arm' ] ; then
+		# attempt "armv6l" vs just "arm" first (since that's what's officially published)
+		urls=(
+			"https://storage.googleapis.com/golang/go${version}.${GIMME_OS}-${arch}v6l.tar.gz" # go1.6beta2 & go1.6rc1
+			"https://storage.googleapis.com/golang/go${version}.${GIMME_OS}-${arch}6.tar.gz" # go1.6beta1
+			"${urls[@]}"
+		)
+	fi
+	_do_curls "${file}" "${urls[@]}"
+}
+
+# _source "version" "file.src.tar.gz"
+_source() {
+	urls=(
+		"https://storage.googleapis.com/golang/go${1}.src.tar.gz"
+		"https://go.googlecode.com/files/go${1}.src.tar.gz"
+		"https://go.googlecode.com/files/go.${1}.src.tar.gz"
+	)
+	_do_curls "${2}" "${urls[@]}"
+}
+
+# _fetch "dir"
+_fetch() {
+	mkdir -p "$(dirname "${1}")"
+
+	if [[ -d "${1}/.git" ]] ; then
+		(
+			cd "${1}"
+			git remote set-url origin "${GIMME_GO_GIT_REMOTE}"
+			git fetch -q --all && git fetch -q --tags
+		)
+		return
+	fi
+
+	git clone -q "${GIMME_GO_GIT_REMOTE}" "${1}"
+}
+
+# _checkout "version" "dir"
+_checkout() {
+	_fetch "${2}"
+	( cd "${2}" && {
+		git reset -q --hard "origin/${1}" \
+		|| git reset -q --hard "origin/go${1}" \
+		|| { [ "${1}" = 'tip' ] && git reset -q --hard origin/master ; } \
+		|| git reset -q --hard "refs/tags/${1}" \
+		|| git reset -q --hard "refs/tags/go${1}"
+	} 2>/dev/null )
+}
+
+# _extract "file.tar.gz" "dir"
+_extract() {
+	mkdir -p "${2}"
+	tar -xf "${1}" -C "${2}" --strip-components 1
+}
+
+# _setup_bootstrap
+_setup_bootstrap() {
+	local versions=("1.6" "1.5" "1.4")
+
+	# try existing
+	for v in "${versions[@]}" ; do
+		for candidate in "${GIMME_ENV_PREFIX}/go${v}"*".env" ; do
+			if [ -s "$candidate" ]; then
+				export GOROOT_BOOTSTRAP="$(source "${candidate}" 2>/dev/null && go env GOROOT)"
+				return 0
+			fi
+		done
+	done
+
+	# try binary
+	for v in "${versions[@]}" ; do
+		if [ -n  "$(_try_binary ${v} "${GIMME_HOSTARCH}")" ]; then
+			export GOROOT_BOOTSTRAP="${GIMME_VERSION_PREFIX}/go${v}.${GIMME_OS}.${GIMME_HOSTARCH}"
+			return 0
+		fi
+	done
+
+	echo >&2 "Unable to setup go bootstrap from existing or binary";
+	return 1;
+}
+
+# _compile "dir"
+_compile() {
+	(
+		if grep -q GOROOT_BOOTSTRAP "${1}/src/make.bash" &> /dev/null; then
+			_setup_bootstrap || return 1
+		fi
+		cd "${1}"
+		if [[ -d .git ]] ; then
+			git clean -dfx -q
+		fi
+		cd src
+		export GOOS="${GIMME_OS}" GOARCH="${GIMME_ARCH}"
+		export CGO_ENABLED="${GIMME_CGO_ENABLED}"
+		export CC_FOR_TARGET="${GIMME_CC_FOR_TARGET}"
+
+		if [ "${GIMME_DEBUG}" = "2" ]; then
+			./make.bash 1>&2 || return 1
+		else
+			local make_log="${1}/make.${GOOS}.${GOARCH}.log"
+			./make.bash &> $make_log || return 1
+		fi
+	)
+}
+
+_can_compile() {
+	cat > "${GIMME_TMP}/test.go" <<'EOF'
+package main
+import "os"
+func main() {
+	os.Exit(0)
+}
+EOF
+	"${1}/bin/go" run "${GIMME_TMP}/test.go"
+}
+
+# _env "dir"
+_env() {
+	[ -d "${1}/bin" -a -x "${1}/bin/go" ] || return 1
+
+	# if we try to run a Darwin binary on Linux, we need to fail so 'auto' can fallback to cross-compiling from source
+	# automatically
+	GOROOT="${1}" "${1}/bin/go" version &> /dev/null || return 1
+
+	# https://twitter.com/davecheney/status/431581286918934528
+	# we have to GOROOT sometimes because we use official release binaries in unofficial locations :(
+
+	echo
+	if [[ "$(GOROOT="${1}" "${1}/bin/go" env GOHOSTOS)" = "${GIMME_OS}" ]] ; then
+		echo 'unset GOOS'
+	else
+		echo 'export GOOS="'"${GIMME_OS}"'"'
+	fi
+	if [[ "$(GOROOT="${1}" "${1}/bin/go" env GOHOSTARCH)" = "${GIMME_ARCH}" ]] ; then
+		echo 'unset GOARCH'
+	else
+		echo 'export GOARCH="'"${GIMME_ARCH}"'"'
+	fi
+	if ! _can_compile "${1}" >/dev/null 2>&1 ; then
+		# if the compile test fails without GOROOT, then we probably need GOROOT
+		echo 'export GOROOT="'"${1}"'"'
+	else
+		echo 'unset GOROOT'
+	fi
+	echo 'export PATH="'"${1}/bin"':${PATH}"'
+	if [[ -z "${GIMME_SILENT_ENV}" ]] ; then
+		echo 'go version >&2'
+	fi
+	echo
+}
+
+# _env_alias "dir" "env-file"
+_env_alias() {
+	if [[ "${GIMME_NO_ENV_ALIAS}" ]] ; then
+		echo "${2}"
+		return
+	fi
+
+	if [[ "$(GOROOT="${1}" "${1}/bin/go" env GOHOSTOS)" = "${GIMME_OS}"  && \
+		"$(GOROOT="${1}" "${1}/bin/go" env GOHOSTARCH)" = "${GIMME_ARCH}" ]] ; then
+		local dest="${GIMME_ENV_PREFIX}/go${GIMME_GO_VERSION}.env"
+		cp "${2}" "${dest}"
+		ln -sf "${dest}" "${GIMME_ENV_PREFIX}/latest.env"
+		echo "${dest}"
+	else
+		echo "${2}"
+	fi
+}
+
+_try_existing() {
+	local existing_ver="${GIMME_VERSION_PREFIX}/go${GIMME_GO_VERSION}.${GIMME_OS}.${GIMME_ARCH}"
+	local existing_env="${GIMME_ENV_PREFIX}/go${GIMME_GO_VERSION}.${GIMME_OS}.${GIMME_ARCH}.env"
+
+	if [[ -x "${existing_ver}/bin/go" &&  -s "${existing_env}" ]] ; then
+		cat "${existing_env}"
+		return
+	fi
+
+	return 1
+}
+
+# _try_binary "version" "arch"
+_try_binary() {
+	local version=${1}
+	local arch=${2}
+	local bin_tgz="${GIMME_TMP}/go${version}.${GIMME_OS}.${arch}.tar.gz"
+	local bin_dir="${GIMME_VERSION_PREFIX}/go${version}.${GIMME_OS}.${arch}"
+	local bin_env="${GIMME_ENV_PREFIX}/go${version}.${GIMME_OS}.${arch}.env"
+
+	_binary "${version}" "${bin_tgz}" "${arch}" || return 1
+	_extract "${bin_tgz}" "${bin_dir}" || return 1
+	_env "${bin_dir}" | tee "${bin_env}" || return 1
+	echo "export GIMME_ENV=\"$(_env_alias "${bin_dir}" "${bin_env}")\""
+}
+
+_try_source() {
+	local src_tgz="${GIMME_TMP}/go${GIMME_GO_VERSION}.src.tar.gz"
+	local src_dir="${GIMME_VERSION_PREFIX}/go${GIMME_GO_VERSION}.src"
+	local src_env="${GIMME_ENV_PREFIX}/go${GIMME_GO_VERSION}.${GIMME_OS}.${GIMME_ARCH}.env"
+
+	_source "${GIMME_GO_VERSION}" "${src_tgz}" || return 1
+	_extract "${src_tgz}" "${src_dir}" || return 1
+	_compile "${src_dir}" || return 1
+	_env "${src_dir}" | tee "${src_env}" || return 1
+	echo "export GIMME_ENV=\"$(_env_alias "${src_dir}" "${src_env}")\""
+}
+
+_try_git() {
+	local git_dir="${GIMME_VERSION_PREFIX}/go"
+	local git_env="${GIMME_ENV_PREFIX}/go.git.${GIMME_OS}.${GIMME_ARCH}.env"
+
+	_checkout "${GIMME_GO_VERSION}" "${git_dir}" || return 1
+	_compile "${git_dir}" || return 1
+	_env "${git_dir}" | tee "${git_env}" || return 1
+	echo "export GIMME_ENV=\"$(_env_alias "${git_dir}" "${git_env}")\""
+}
+
+_wipe_version() {
+	local env_file="${GIMME_ENV_PREFIX}/go${1}.${GIMME_OS}.${GIMME_ARCH}.env"
+
+	if [[ -s "${env_file}" ]] ; then
+		rm -rf "$(awk -F\" '/GOROOT/ { print $2 }' "${env_file}")"
+		rm -f "${env_file}"
+	fi
+}
+
+_list_versions() {
+	if [ ! -d "${GIMME_VERSION_PREFIX}" ] ; then
+		return 0
+	fi
+
+	local current_version="$(go env GOROOT 2>/dev/null)"
+	current_version="${current_version##*/go}"
+	current_version="${current_version%%.${GIMME_OS}.*}"
+
+	for d in "${GIMME_VERSION_PREFIX}/go"*".${GIMME_OS}."* ; do
+		local cleaned="${d##*/go}"
+		cleaned="${cleaned%%.${GIMME_OS}.*}"
+		echo -en "${cleaned}"
+		if [[ $cleaned = $current_version ]] ; then
+			echo -en >&2 ' <= current'
+		fi
+		echo
+	done
+}
+
+_realpath() {
+	[ -d "$1" ] && echo "$(cd "$1" && pwd)" || echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+}
+
+_assert_version_given() {
+	if [[ -z "${GIMME_GO_VERSION}" ]] ; then
+		echo >&2 'error: no GIMME_GO_VERSION supplied'
+		echo >&2 "  ex: GIMME_GO_VERSION=1.4.1 ${0} ${@}"
+		echo >&2 "  ex: ${0} 1.4.1 ${@}"
+		exit 1
+	fi
+}
+
+: ${GIMME_OS:=$(uname -s | tr '[:upper:]' '[:lower:]')}
+: ${GIMME_HOSTOS:=$(uname -s | tr '[:upper:]' '[:lower:]')}
+: ${GIMME_ARCH:=$(uname -m)}
+: ${GIMME_HOSTARCH:=$(uname -m)}
+: ${GIMME_ENV_PREFIX:=${HOME}/.gimme/envs}
+: ${GIMME_VERSION_PREFIX:=${HOME}/.gimme/versions}
+: ${GIMME_TMP:=${TMPDIR:-/tmp}/gimme}
+: ${GIMME_GO_GIT_REMOTE:=https://github.com/golang/go.git}
+: ${GIMME_TYPE:=auto} # 'auto', 'binary', 'source', or 'git'
+: ${GIMME_BINARY_OSX:=osx10.8}
+
+while [[ $# -gt 0 ]]; do
+	case "${1}" in
+		-h|--help|help|wat)
+			_old_ifs="$IFS"
+			IFS=';'
+			awk '/^#\+  / {
+				sub(/^#\+  /, "", $0) ;
+				sub(/-$/, "", $0) ;
+				print $0
+			}' "$0" | while read line ; do
+				eval "echo \"$line\""
+			done
+			IFS="$_old_ifs"
+			exit 0
+		;;
+		-V|--version|version)
+			echo "${GIMME_VERSION}"
+			exit 0
+		;;
+		-l|--list|list)
+			_list_versions
+			exit 0
+		;;
+		-f|--force|force)
+			force=1
+		;;
+		*)
+			break
+		;;
+	esac
+	shift
+done
+
+if [[ -n "${1}" ]] ; then
+	GIMME_GO_VERSION="${1}"
+fi
+if [[ -n "${2}" ]] ; then
+	GIMME_VERSION_PREFIX="${2}"
+fi
+
+case "${GIMME_ARCH}" in
+	x86_64) GIMME_ARCH=amd64 ;;
+	x86) GIMME_ARCH=386 ;;
+	arm64)
+		if [[ "${GIMME_GO_VERSION}" < "1.5" ]]; then
+			echo >&2 "error: ${GIMME_ARCH} is not supported by this go version"
+			echo >&2 "try go1.5 or newer"
+			exit 1
+		fi
+		if [[ "${GIMME_HOSTOS}" = "linux" && "${GIMME_HOSTARCH}" != "${GIMME_ARCH}" ]]; then
+			: ${GIMME_CC_FOR_TARGET:="aarch64-linux-gnu-gcc"}
+		fi
+	;;
+	arm*) GIMME_ARCH=arm ;;
+esac
+
+case "${GIMME_HOSTARCH}" in
+	x86_64) GIMME_HOSTARCH=amd64 ;;
+	x86) GIMME_HOSTARCH=386 ;;
+	arm64) ;;
+	arm*) GIMME_HOSTARCH=arm ;;
+esac
+
+_assert_version_given "$@"
+
+[ ${force} ] && _wipe_version "${GIMME_GO_VERSION}"
+
+unset GOARCH
+unset GOBIN
+unset GOOS
+unset GOPATH
+unset GOROOT
+unset CGO_ENABLED
+unset CC_FOR_TARGET
+
+mkdir -p "${GIMME_VERSION_PREFIX}" "${GIMME_ENV_PREFIX}"
+
+GIMME_VERSION_PREFIX="$(_realpath "${GIMME_VERSION_PREFIX}")"
+GIMME_ENV_PREFIX="$(_realpath "${GIMME_ENV_PREFIX}")"
+
+if ! case "${GIMME_TYPE}" in
+	binary) _try_existing || _try_binary "${GIMME_GO_VERSION}" "${GIMME_ARCH}" ;;
+	source) _try_source || _try_git ;;
+	git)    _try_git ;;
+	auto)   _try_existing || _try_binary  "${GIMME_GO_VERSION}" "${GIMME_ARCH}" || _try_source || _try_git ;;
+	*)
+		echo >&2 "I don't know how to '${GIMME_TYPE}'."
+		echo >&2 "  Try 'auto', 'binary', 'source', or 'git'."
+		exit 1
+		;;
+esac ; then
+	echo >&2 "I don't have any idea what to do with '${GIMME_GO_VERSION}'."
+	echo >&2 "  (using type '${GIMME_TYPE}')"
+	exit 1
+fi

From 1b332d19334c9d662121399903dd9d6de5bbbfe0 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0451/1304] travis: Add arm64 to build matrix

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 .travis.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ce4bc67f0..ced0d50191 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,10 @@ go:
   - 1.5.3
   - 1.6
 
+env:
+  - TARGET=amd64
+  - TARGET=arm64
+
 addons:
   apt:
     packages:
@@ -17,13 +21,22 @@ addons:
     - build-essential
     - libacl1-dev
     - libsystemd-journal-dev
+    - gcc-aarch64-linux-gnu
+    - libc6-dev-arm64-cross
 
 install:
   -
 
 script:
- - ./autogen.sh
  # Build host and fly to ensure we build stage1 init. We don't build everything
  # to avoid downloading large images.
- - ./configure --with-stage1-flavors=host,fly --enable-tpm=auto
- - make unit-check
+ -      if [ "${TARGET}" == "amd64" ]; then
+                ./autogen.sh;
+                ./configure --with-stage1-flavors=host,fly --enable-tpm=auto;
+                make unit-check;
+        elif [ "${TARGET}" == "arm64" ]; then
+                eval "$(GIMME_ARCH=${TARGET} GIMME_CGO_ENABLED=1 ./gimme.local ${TRAVIS_GO_VERSION})";
+                ./autogen.sh;
+                ./configure --host=aarch64-linux-gnu --with-stage1-flavors=host,fly --enable-tpm=auto;
+                make V=2;
+        fi

From d87acbb47bc83ba37d9a6aaf020be0b6cfa60530 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:49 -0700
Subject: [PATCH 0452/1304] release.md: Update for new target directories

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 Documentation/devel/release.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index 0d424082d3..f1b20631f8 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -54,9 +54,9 @@ After merging and going back to master branch, we check out the release version
   - `git clean -ffdx && sudo ./scripts/acbuild-rkt-builder.sh`
   - `rkt --insecure-options=image fetch ./rkt-builder.aci`
   - `export BUILDDIR=$PWD/release-build && mkdir -p $BUILDDIR && sudo BUILDDIR=$BUILDDIR ./scripts/build-rir.sh`
-  - Sanity check `release-build/bin/rkt version`
-  - Sanity check `ldd release-build/bin/rkt`: it can contain linux-vdso.so, libpthread.so, libc.so, libdl.so and ld-linux-x86-64.so but nothing else.
-  - Sanity check `ldd release-build/tools/init`: same as above.
+  - Sanity check `release-build/target/bin/rkt version`
+  - Sanity check `ldd release-build/target/bin/rkt`: it can contain linux-vdso.so, libpthread.so, libc.so, libdl.so and ld-linux-x86-64.so but nothing else.
+  - Sanity check `ldd release-build/target/tools/init`: same as above.
 - Grab the release key (see details below) and add a signed tag: `GIT_COMMITTER_NAME="CoreOS Application Signing Key" GIT_COMMITTER_EMAIL="security@coreos.com" git tag -u $RKTSUBKEYID'!' -s v1.2.0 -m "rkt v1.2.0"`
 - Push the tag to GitHub: `git push --tags`
 
@@ -73,7 +73,7 @@ Now we switch to the GitHub web UI to conduct the release:
 export RKTVER="1.2.0"
 export NAME="rkt-v$RKTVER"
 mkdir $NAME
-cp release-build/bin/rkt release-build/bin/stage1-{coreos,kvm,fly}.aci $NAME/
+cp release-build/target/bin/rkt release-build/target/bin/stage1-{coreos,kvm,fly}.aci $NAME/
 cp -r dist/* $NAME/
 sudo chown -R root:root $NAME/
 tar czvf $NAME.tar.gz --numeric-owner $NAME/
@@ -82,9 +82,9 @@ tar czvf $NAME.tar.gz --numeric-owner $NAME/
 - Attach each stage1 file individually so they can be fetched by the ACI discovery mechanism. The files must be named as follows:
 
 ```
-cp release-build/bin/stage1-coreos.aci stage1-coreos-$RKTVER-linux-amd64.aci
-cp release-build/bin/stage1-kvm.aci stage1-kvm-$RKTVER-linux-amd64.aci
-cp release-build/bin/stage1-fly.aci stage1-fly-$RKTVER-linux-amd64.aci
+cp release-build/target/bin/stage1-coreos.aci stage1-coreos-$RKTVER-linux-amd64.aci
+cp release-build/target/bin/stage1-kvm.aci stage1-kvm-$RKTVER-linux-amd64.aci
+cp release-build/target/bin/stage1-fly.aci stage1-fly-$RKTVER-linux-amd64.aci
 ```
 
 - Sign all release artifacts.

From 1e31c7cbecb300b891988a5af711c587d2e1faf0 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 27 Jun 2016 11:21:50 -0700
Subject: [PATCH 0453/1304] CHANGELOG: Updates for arm64 support

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13a60a4a19..0cdb282588 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.10.0
+
+#### Other changes
+
+- build directory layout change ([#2758](https://github.com/coreos/rkt/pull/2758)): The rkt binary and stage1 image files have been moved from the 'bin' sub-directory to the 'target/bin' sub-directory.
+
 ## v1.9.1
 
 This is a minor bug fix release.

From bc18c26d2669860eab8d571b856b2ffec1f59b19 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thipp@suse.de>
Date: Tue, 28 Jun 2016 11:43:11 +0200
Subject: [PATCH 0454/1304] Documentation: add openSUSE to distributions

Closes #1308

Signed-off-by: Thomas Hipp <thipp@suse.de>
---
 Documentation/distributions.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index b40c41c75e..9faf390798 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -96,6 +96,23 @@ nix-env -iA rkt
 
 The source for the rkt.nix expression can be found on [GitHub](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/virtualization/rkt/default.nix)
 
+
+## openSUSE
+
+rkt is available in the [Virtualization:containers](https://build.opensuse.org/package/show/Virtualization:containers/rkt) project on openSUSE Build Service.
+Before installing, the appropriate repository needs to be added (usually Tumbleweed or Leap):
+
+```
+sudo zypper ar -f obs://Virtualization:containers/openSUSE_Tumbleweed/ virtualization_containers
+sudo zypper ar -f obs://Virtualization:containers/openSUSE_Leap_42.1/ virtualization_containers
+```
+
+Install rkt using zypper:
+
+```
+sudo zypper in rkt
+```
+
 ## Void
 
 rkt is available in the [official binary packages](http://www.voidlinux.eu/packages/) for the Void Linux distribution.

From 609559dda858cc00b69f133e9090ee3341e28e96 Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Tue, 28 Jun 2016 16:42:35 -0700
Subject: [PATCH 0455/1304] pkg/tar: ignore global extended headers

---
 pkg/tar/tar.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/tar/tar.go b/pkg/tar/tar.go
index 0d8f27ad87..322fd95b20 100644
--- a/pkg/tar/tar.go
+++ b/pkg/tar/tar.go
@@ -194,6 +194,8 @@ func extractFile(tr *tar.Reader, target string, hdr *tar.Header, overwrite bool,
 		if err := syscall.Mkfifo(p, uint32(fi.Mode())); err != nil {
 			return err
 		}
+	case typ == tar.TypeXGlobalHeader:
+		return nil
 	// TODO(jonboulle): implement other modes
 	default:
 		return fmt.Errorf("unsupported type: %v", typ)

From 12ecf682e2fe4238aa4590c140527017cfa2cfc6 Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Tue, 28 Jun 2016 16:49:20 -0700
Subject: [PATCH 0456/1304] pkg/tar: remove errwrap

Since this package can be used outside of rkt, there is no need to
obscure the return values by using errwrap. All of the internal
consumers of these functions already wrap the output anyway, so this is
actually redundant. For example, extractTarCommand() may return:

  error extracting tarball
    error extracting tarball
      no such file or directory

This change removes the outermost wrap:

  error extracting tarball
    no such file or directory
---
 pkg/tar/tar.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkg/tar/tar.go b/pkg/tar/tar.go
index 0d8f27ad87..cb95c8c8a2 100644
--- a/pkg/tar/tar.go
+++ b/pkg/tar/tar.go
@@ -28,7 +28,6 @@ import (
 	"github.com/appc/spec/pkg/device"
 	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/pkg/user"
-	"github.com/hashicorp/errwrap"
 )
 
 const DEFAULT_DIR_MODE os.FileMode = 0755
@@ -94,13 +93,13 @@ Tar:
 			}
 			err = extractFile(tr, target, hdr, overwrite, editor)
 			if err != nil {
-				return errwrap.Wrap(errors.New("error extracting tarball"), err)
+				return err
 			}
 			if hdr.Typeflag == tar.TypeDir {
 				dirhdrs = append(dirhdrs, hdr)
 			}
 		default:
-			return errwrap.Wrap(errors.New("error extracting tarball"), err)
+			return err
 		}
 	}
 
@@ -242,11 +241,11 @@ func extractFileFromTar(tr *tar.Reader, file string) ([]byte, error) {
 			}
 			buf, err := ioutil.ReadAll(tr)
 			if err != nil {
-				return nil, errwrap.Wrap(errors.New("error extracting tarball"), err)
+				return nil, err
 			}
 			return buf, nil
 		default:
-			return nil, errwrap.Wrap(errors.New("error extracting tarball"), err)
+			return nil, err
 		}
 	}
 }

From c6b9bc5c83326312805c230e241c0664254c3f92 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Thu, 23 Jun 2016 18:10:26 +0200
Subject: [PATCH 0457/1304] stage1/enterexec: environment file with '\n' as
 separator (systemd style)

This patch modifies enterexec to get environment files with variables
separated by the new line character (like the systemd ones).
This patch works also with environment files in the old format (separator '\0').

Fixes https://github.com/coreos/rkt/issues/2507
---
 stage1/enterexec/enterexec.c | 38 ++++++++++++++++--------------------
 stage1/init/common/path.go   | 25 ++++++------------------
 stage1/init/common/pod.go    | 12 +++---------
 3 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/stage1/enterexec/enterexec.c b/stage1/enterexec/enterexec.c
index 36079235a2..0d8c16361b 100644
--- a/stage1/enterexec/enterexec.c
+++ b/stage1/enterexec/enterexec.c
@@ -177,34 +177,30 @@ void initialize_keep_env(const char *keep_env_file, const char **keep_env)
 /* Try to set current env from keep_env and env file. */
 static void set_env(const char *env_file)
 {
-	struct stat st;
-	char *map, *k, *v;
-	typeof(st.st_size) i;
-
-	map_file(env_file, PROT_READ|PROT_WRITE, MAP_PRIVATE, &st, (void **)&map);
-
-	if(!st.st_size)
-		return;
-
-	map[st.st_size - 1] = '\0'; /* ensure the mapping is null-terminated */
-
-	for(i = 0; i < st.st_size;) {
-		k = &map[i];
-		i += strlen(k) + 1;
-		exit_if((v = strchr(k, '=')) == NULL,
-			"Malformed environment entry: \"%s\"", k);
-		/* a private writable map is used permitting s/=/\0/ */
+	FILE 		*f;
+	char 		*line = NULL;
+	size_t 		len = 0;
+	ssize_t 	read;
+	char 		*v;
+
+	pexit_if((f = fopen(env_file, "r")) == NULL,
+             "Unable to fopen \"%s\"", env_file);
+	while ((read = getline(&line, &len, f)) != -1) {
+		pexit_if((v = strchr(line, '=')) == NULL,
+				"Malformed environment entry: \"%s\"", line);
 		*v = '\0';
 		v++;
-		pexit_if(setenv(k, v, 1) == -1,
-			"Unable to set env variable: \"%s\"=\"%s\"", k, v);
+		pexit_if(setenv(line, v, 1) == -1,
+				 "Unable to set env variable: \"%s\"=\"%s\"", line, v);
 	}
-}
+	free(line);
+	pexit_if(fclose(f) == EOF,
+			 "Unable to fclose \"%s\"", env_file);}
 
 /* Read environment from env and keep_env files make it our own, keeping the env variables in
  * if they're present in the current environment.
  * The environment files must exist, may be empty, and are expected to be of the format:
- * key=value\0key=value\0...
+ * key=value\nkey=value\n...
  */
 static void load_env(const char *env_file, const char *keep_env_file, int entering)
 {
diff --git a/stage1/init/common/path.go b/stage1/init/common/path.go
index 51422e04c0..e2a9b733e3 100644
--- a/stage1/init/common/path.go
+++ b/stage1/init/common/path.go
@@ -43,28 +43,15 @@ func ServiceUnitPath(root string, appName types.ACName) string {
 	return filepath.Join(common.Stage1RootfsPath(root), UnitsDir, ServiceUnitName(appName))
 }
 
-// RelEnvFilePathEnterexec returns the path to the environment file for the given
-// app name relative to the pod's root to be parsed by enterexec.
-func RelEnvFilePathEnterexec(appName types.ACName) string {
+// RelEnvFilePath returns the path to the environment file for the given
+// app name relative to the pod's root.
+func RelEnvFilePath(appName types.ACName) string {
 	return filepath.Join(envDir, appName.String())
 }
 
-// EnvFilePathEnterexec returns the path to the environment file for the given
-// app name to be parsed by enterexec.
-func EnvFilePathEnterexec(root string, appName types.ACName) string {
-	return filepath.Join(common.Stage1RootfsPath(root), RelEnvFilePathEnterexec(appName))
-}
-
-// RelEnvFilePathSystemd returns the path to the environment file for the given
-// app name relative to the pod's root to be parsed by systemd.
-func RelEnvFilePathSystemd(appName types.ACName) string {
-	return filepath.Join(envDir, appName.String()) + "-systemd"
-}
-
-// EnvFilePathSystemd returns the path to the environment file for the given
-// app name to be parsed by systemd.
-func EnvFilePathSystemd(root string, appName types.ACName) string {
-	return EnvFilePathEnterexec(root, appName) + "-systemd"
+// EnvFilePath returns the path to the environment file for the given app name.
+func EnvFilePath(root string, appName types.ACName) string {
+	return filepath.Join(common.Stage1RootfsPath(root), RelEnvFilePath(appName))
 }
 
 // ServiceWantPath returns the systemd default.target want symlink path for the
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 13aba46a98..c847ae5620 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -388,23 +388,17 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		env.Set("AC_METADATA_URL", p.MetadataServiceURL)
 	}
 
-	// TODO(iaguis): make enterexec use the same format as systemd
-	envFilePathSystemd := EnvFilePathSystemd(p.Root, appName)
-	envFilePathEnterexec := EnvFilePathEnterexec(p.Root, appName)
+	envFilePath := EnvFilePath(p.Root, appName)
 
 	uidRange := user.NewBlankUidRange()
 	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
 		return err
 	}
 
-	if err := writeEnvFile(p, env, appName, uidRange, '\n', envFilePathSystemd); err != nil {
+	if err := writeEnvFile(p, env, appName, uidRange, '\n', envFilePath); err != nil {
 		return errwrap.Wrap(errors.New("unable to write environment file for systemd"), err)
 	}
 
-	if err := writeEnvFile(p, env, appName, uidRange, '\000', envFilePathEnterexec); err != nil {
-		return errwrap.Wrap(errors.New("unable to write environment file for enterexec"), err)
-	}
-
 	u, g, err := parseUserGroup(p, ra, uidRange)
 	if err != nil {
 		return err
@@ -444,7 +438,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		// as it might seem) makes sure the mount is slave+shared.
 		unit.NewUnitOption("Service", "MountFlags", "shared"),
 		unit.NewUnitOption("Service", "WorkingDirectory", workDir),
-		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePathSystemd(appName)),
+		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePath(appName)),
 		unit.NewUnitOption("Service", "User", strconv.Itoa(u)),
 		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
 		unit.NewUnitOption("Service", "SupplementaryGroups", strings.Join(supplementaryGroups, " ")),

From 8b5deb1f0cb61f15aff8e5dc2c77451c20134e30 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 29 Jun 2016 10:38:26 +0200
Subject: [PATCH 0458/1304] glide: vendor dependencies

---
 glide.lock                                    |  293 +
 vendor/github.com/StackExchange/wmi/LICENSE   |   20 +
 vendor/github.com/StackExchange/wmi/wmi.go    |  416 +
 vendor/github.com/appc/docker2aci/LICENSE     |  202 +
 .../appc/docker2aci/lib/common/common.go      |   62 +
 .../appc/docker2aci/lib/conversion_store.go   |  126 +
 .../appc/docker2aci/lib/docker2aci.go         |  417 +
 .../lib/internal/backend/file/file.go         |  332 +
 .../internal/backend/repository/repository.go |  164 +
 .../backend/repository/repository1.go         |  391 +
 .../backend/repository/repository2.go         |  466 ++
 .../lib/internal/docker/docker_functions.go   |  161 +
 .../appc/docker2aci/lib/internal/internal.go  |  591 ++
 .../lib/internal/tarball/tarfile.go           |   42 +
 .../docker2aci/lib/internal/tarball/walk.go   |   43 +
 .../lib/internal/types/docker_types.go        |   92 +
 .../docker2aci/lib/internal/types/types.go    |   27 +
 .../appc/docker2aci/lib/internal/util/util.go |   83 +
 .../github.com/appc/docker2aci/lib/version.go |   20 +
 vendor/github.com/appc/docker2aci/main.go     |  222 +
 .../github.com/appc/docker2aci/pkg/log/log.go |   46 +
 vendor/github.com/appc/goaci/LICENSE          |  202 +
 .../github.com/appc/goaci/buildercommand.go   |   50 +
 vendor/github.com/appc/goaci/command.go       |   12 +
 vendor/github.com/appc/goaci/commands.go      |   15 +
 vendor/github.com/appc/goaci/main.go          |   59 +
 vendor/github.com/appc/goaci/mappers.go       |  150 +
 .../github.com/appc/goaci/proj2aci/asset.go   |  283 +
 .../github.com/appc/goaci/proj2aci/binary.go  |   44 +
 .../github.com/appc/goaci/proj2aci/builder.go |  365 +
 .../github.com/appc/goaci/proj2aci/cmake.go   |  234 +
 vendor/github.com/appc/goaci/proj2aci/go.go   |  195 +
 vendor/github.com/appc/goaci/proj2aci/run.go  |   65 +
 vendor/github.com/appc/goaci/proj2aci/util.go |   68 +
 vendor/github.com/appc/goaci/proj2aci/vcs.go  |  118 +
 vendor/github.com/appc/spec/LICENSE           |  202 +
 vendor/github.com/appc/spec/ace/doc.go        |   19 +
 .../appc/spec/ace/image_manifest_main.json.in |   80 +
 .../spec/ace/image_manifest_sidekick.json.in  |   24 +
 vendor/github.com/appc/spec/ace/os_default.go |   26 +
 vendor/github.com/appc/spec/ace/os_freebsd.go |   32 +
 vendor/github.com/appc/spec/ace/os_linux.go   |   45 +
 vendor/github.com/appc/spec/ace/os_shared.go  |   35 +
 vendor/github.com/appc/spec/ace/validator.go  |  578 ++
 vendor/github.com/appc/spec/aci/build.go      |  110 +
 vendor/github.com/appc/spec/aci/doc.go        |   16 +
 vendor/github.com/appc/spec/aci/file.go       |  246 +
 vendor/github.com/appc/spec/aci/layout.go     |  187 +
 vendor/github.com/appc/spec/aci/writer.go     |   98 +
 vendor/github.com/appc/spec/actool/actool.go  |  118 +
 vendor/github.com/appc/spec/actool/build.go   |  145 +
 .../github.com/appc/spec/actool/discover.go   |  106 +
 vendor/github.com/appc/spec/actool/doc.go     |   17 +
 vendor/github.com/appc/spec/actool/help.go    |  140 +
 .../github.com/appc/spec/actool/manifest.go   |  525 ++
 .../github.com/appc/spec/actool/validate.go   |  177 +
 vendor/github.com/appc/spec/actool/version.go |   33 +
 .../appc/spec/discovery/discovery.go          |  257 +
 vendor/github.com/appc/spec/discovery/doc.go  |   17 +
 vendor/github.com/appc/spec/discovery/http.go |  122 +
 .../github.com/appc/spec/discovery/parse.go   |  130 +
 .../appc/spec/pkg/acirenderer/acirenderer.go  |  253 +
 .../appc/spec/pkg/acirenderer/resolve.go      |   88 +
 .../appc/spec/pkg/device/device_linux.go      |   33 +
 .../appc/spec/pkg/device/device_posix.go      |   57 +
 .../github.com/appc/spec/pkg/tarheader/doc.go |   17 +
 .../appc/spec/pkg/tarheader/pop_darwin.go     |   39 +
 .../appc/spec/pkg/tarheader/pop_linux.go      |   39 +
 .../appc/spec/pkg/tarheader/pop_posix.go      |   50 +
 .../appc/spec/pkg/tarheader/tarheader.go      |   28 +
 .../appc/spec/schema/common/common.go         |   40 +
 vendor/github.com/appc/spec/schema/doc.go     |   25 +
 vendor/github.com/appc/spec/schema/image.go   |  103 +
 vendor/github.com/appc/spec/schema/kind.go    |   42 +
 .../appc/spec/schema/lastditch/doc.go         |   28 +
 .../appc/spec/schema/lastditch/image.go       |   45 +
 .../appc/spec/schema/lastditch/labels.go      |   38 +
 .../appc/spec/schema/lastditch/pod.go         |   57 +
 vendor/github.com/appc/spec/schema/pod.go     |  168 +
 .../appc/spec/schema/types/acidentifier.go    |  145 +
 .../appc/spec/schema/types/ackind.go          |   67 +
 .../appc/spec/schema/types/acname.go          |  145 +
 .../appc/spec/schema/types/annotations.go     |  106 +
 .../github.com/appc/spec/schema/types/app.go  |   90 +
 .../github.com/appc/spec/schema/types/date.go |   60 +
 .../appc/spec/schema/types/dependencies.go    |   58 +
 .../github.com/appc/spec/schema/types/doc.go  |   18 +
 .../appc/spec/schema/types/environment.go     |  110 +
 .../appc/spec/schema/types/errors.go          |   49 +
 .../appc/spec/schema/types/event_handler.go   |   61 +
 .../github.com/appc/spec/schema/types/exec.go |   46 +
 .../github.com/appc/spec/schema/types/hash.go |  118 +
 .../appc/spec/schema/types/isolator.go        |  129 +
 .../schema/types/isolator_linux_specific.go   |  163 +
 .../spec/schema/types/isolator_resources.go   |  236 +
 .../appc/spec/schema/types/labels.go          |  134 +
 .../appc/spec/schema/types/mountpoint.go      |   91 +
 .../github.com/appc/spec/schema/types/port.go |  139 +
 .../appc/spec/schema/types/semver.go          |   91 +
 .../github.com/appc/spec/schema/types/url.go  |   71 +
 .../github.com/appc/spec/schema/types/uuid.go |   92 +
 .../appc/spec/schema/types/volume.go          |  236 +
 vendor/github.com/appc/spec/schema/version.go |   39 +
 vendor/github.com/aws/aws-sdk-go/LICENSE.txt  |  202 +
 vendor/github.com/aws/aws-sdk-go/NOTICE.txt   |    3 +
 .../aws/aws-sdk-go/aws/awserr/error.go        |  124 +
 .../aws/aws-sdk-go/aws/awserr/types.go        |  197 +
 .../aws/aws-sdk-go/aws/awsutil/copy.go        |  100 +
 .../aws/aws-sdk-go/aws/awsutil/equal.go       |   27 +
 .../aws/aws-sdk-go/aws/awsutil/path_value.go  |  222 +
 .../aws/aws-sdk-go/aws/awsutil/prettify.go    |  103 +
 .../aws-sdk-go/aws/awsutil/string_value.go    |   89 +
 .../aws/client/metadata/client_info.go        |   12 +
 .../github.com/aws/aws-sdk-go/aws/config.go   |  311 +
 .../aws/aws-sdk-go/aws/convert_types.go       |  357 +
 .../aws/credentials/chain_provider.go         |  100 +
 .../aws-sdk-go/aws/credentials/credentials.go |  223 +
 .../aws/credentials/env_provider.go           |   77 +
 .../shared_credentials_provider.go            |  151 +
 .../aws/credentials/static_provider.go        |   48 +
 .../github.com/aws/aws-sdk-go/aws/errors.go   |   17 +
 .../github.com/aws/aws-sdk-go/aws/logger.go   |  112 +
 .../aws/aws-sdk-go/aws/request/handlers.go    |  187 +
 .../aws/aws-sdk-go/aws/request/request.go     |  302 +
 .../aws/request/request_pagination.go         |  104 +
 .../aws/aws-sdk-go/aws/request/retryer.go     |   82 +
 vendor/github.com/aws/aws-sdk-go/aws/types.go |   88 +
 .../github.com/aws/aws-sdk-go/aws/version.go  |    8 +
 .../aws-sdk-go/private/protocol/rest/build.go |  257 +
 .../private/protocol/rest/payload.go          |   45 +
 .../private/protocol/rest/unmarshal.go        |  193 +
 .../private/signer/v4/header_rules.go         |   82 +
 .../aws/aws-sdk-go/private/signer/v4/v4.go    |  438 ++
 vendor/github.com/aws/aws-sdk-go/sdk.go       |    7 +
 vendor/github.com/camlistore/go4/LICENSE      |  202 +
 vendor/github.com/camlistore/go4/lock/lock.go |  186 +
 .../camlistore/go4/lock/lock_appengine.go     |   32 +
 .../camlistore/go4/lock/lock_darwin_amd64.go  |   67 +
 .../camlistore/go4/lock/lock_freebsd.go       |   66 +
 .../camlistore/go4/lock/lock_linux_amd64.go   |   67 +
 .../camlistore/go4/lock/lock_linux_arm.go     |   68 +
 .../camlistore/go4/lock/lock_plan9.go         |   41 +
 .../camlistore/go4/lock/lock_sigzero.go       |   26 +
 .../containernetworking/cni/LICENSE           |  202 +
 .../cni/pkg/invoke/args.go                    |   76 +
 .../cni/pkg/invoke/delegate.go                |   53 +
 .../cni/pkg/invoke/exec.go                    |   75 +
 .../cni/pkg/invoke/find.go                    |   47 +
 .../containernetworking/cni/pkg/ip/cidr.go    |   51 +
 .../cni/pkg/ip/ipforward.go                   |   31 +
 .../containernetworking/cni/pkg/ip/ipmasq.go  |   66 +
 .../containernetworking/cni/pkg/ip/link.go    |  153 +
 .../containernetworking/cni/pkg/ip/route.go   |   47 +
 .../containernetworking/cni/pkg/ipam/ipam.go  |   68 +
 .../containernetworking/cni/pkg/ns/ns.go      |  315 +
 .../containernetworking/cni/pkg/skel/skel.go  |  161 +
 .../cni/pkg/testutils/cmd.go                  |   77 +
 .../containernetworking/cni/pkg/types/args.go |   91 +
 .../cni/pkg/types/types.go                    |  191 +
 .../cni/pkg/utils/sysctl/sysctl_linux.go      |   58 +
 .../cni/pkg/utils/utils.go                    |   41 +
 .../cni/plugins/ipam/dhcp/daemon.go           |  157 +
 .../cni/plugins/ipam/dhcp/lease.go            |  337 +
 .../cni/plugins/ipam/dhcp/main.go             |   73 +
 .../cni/plugins/ipam/dhcp/options.go          |  139 +
 .../cni/plugins/ipam/host-local/allocator.go  |  165 +
 .../ipam/host-local/backend/disk/backend.go   |   88 +
 .../ipam/host-local/backend/disk/lock.go      |   50 +
 .../plugins/ipam/host-local/backend/store.go  |   26 +
 .../cni/plugins/ipam/host-local/config.go     |   70 +
 .../cni/plugins/ipam/host-local/main.go       |   74 +
 .../cni/plugins/main/bridge/bridge.go         |  319 +
 .../cni/plugins/main/ipvlan/ipvlan.go         |  175 +
 .../cni/plugins/main/macvlan/macvlan.go       |  193 +
 .../cni/plugins/main/ptp/ptp.go               |  229 +
 .../cni/plugins/meta/flannel/flannel.go       |  253 +
 .../cni/plugins/meta/tuning/tuning.go         |   82 +
 vendor/github.com/coreos/gexpect/LICENCE      |    7 +
 vendor/github.com/coreos/gexpect/gexpect.go   |  449 ++
 vendor/github.com/coreos/go-iptables/LICENSE  |  191 +
 .../coreos/go-iptables/iptables/iptables.go   |  295 +
 .../coreos/go-iptables/iptables/lock.go       |   84 +
 vendor/github.com/coreos/go-semver/LICENSE    |  202 +
 vendor/github.com/coreos/go-semver/example.go |   20 +
 .../coreos/go-semver/semver/semver.go         |  257 +
 .../coreos/go-semver/semver/sort.go           |   38 +
 vendor/github.com/coreos/go-systemd/LICENSE   |  191 +
 .../coreos/go-systemd/activation/files.go     |   52 +
 .../coreos/go-systemd/activation/listeners.go |   62 +
 .../go-systemd/activation/packetconns.go      |   37 +
 .../github.com/coreos/go-systemd/dbus/dbus.go |  203 +
 .../coreos/go-systemd/dbus/methods.go         |  484 ++
 .../coreos/go-systemd/dbus/properties.go      |  218 +
 .../github.com/coreos/go-systemd/dbus/set.go  |   47 +
 .../coreos/go-systemd/dbus/subscription.go    |  250 +
 .../go-systemd/dbus/subscription_set.go       |   57 +
 .../coreos/go-systemd/sdjournal/journal.go    |  971 +++
 .../coreos/go-systemd/sdjournal/read.go       |  252 +
 .../coreos/go-systemd/unit/deserialize.go     |  276 +
 .../coreos/go-systemd/unit/escape.go          |  116 +
 .../coreos/go-systemd/unit/option.go          |   54 +
 .../coreos/go-systemd/unit/serialize.go       |   75 +
 .../github.com/coreos/go-systemd/util/util.go |  227 +
 vendor/github.com/coreos/go-tspi/LICENSE      |  202 +
 .../coreos/go-tspi/tpmclient/tpmclient.go     |  310 +
 .../coreos/go-tspi/tspiconst/tspiconst.go     |  538 ++
 .../go-tspi/verification/verification.go      |  654 ++
 vendor/github.com/coreos/ioprogress/LICENSE   |   21 +
 vendor/github.com/coreos/ioprogress/draw.go   |  132 +
 vendor/github.com/coreos/ioprogress/reader.go |  107 +
 vendor/github.com/coreos/pkg/LICENSE          |  202 +
 vendor/github.com/coreos/pkg/NOTICE           |    5 +
 vendor/github.com/coreos/pkg/dlopen/dlopen.go |   82 +
 .../coreos/pkg/dlopen/dlopen_example.go       |   56 +
 .../coreos/pkg/progressutil/iocopy.go         |  189 +
 .../coreos/pkg/progressutil/progressbar.go    |  256 +
 .../github.com/cpuguy83/go-md2man/LICENSE.md  |   21 +
 .../github.com/cpuguy83/go-md2man/md2man.go   |   44 +
 .../cpuguy83/go-md2man/md2man/md2man.go       |   19 +
 .../cpuguy83/go-md2man/md2man/roff.go         |  269 +
 vendor/github.com/cznic/b/LICENSE             |   27 +
 vendor/github.com/cznic/b/btree.go            |  929 +++
 vendor/github.com/cznic/b/doc.go              |   53 +
 vendor/github.com/cznic/bufs/LICENSE          |   27 +
 vendor/github.com/cznic/bufs/bufs.go          |  391 +
 vendor/github.com/cznic/exp/lldb/2pc.go       |  324 +
 vendor/github.com/cznic/exp/lldb/2pc_docs.go  |   44 +
 vendor/github.com/cznic/exp/lldb/LICENSE      |   27 +
 vendor/github.com/cznic/exp/lldb/btree.go     | 2297 ++++++
 vendor/github.com/cznic/exp/lldb/errors.go    |  170 +
 vendor/github.com/cznic/exp/lldb/falloc.go    | 1981 +++++
 vendor/github.com/cznic/exp/lldb/filer.go     |  192 +
 vendor/github.com/cznic/exp/lldb/gb.go        |  812 ++
 vendor/github.com/cznic/exp/lldb/lldb.go      |  155 +
 vendor/github.com/cznic/exp/lldb/memfiler.go  |  344 +
 vendor/github.com/cznic/exp/lldb/osfiler.go   |  130 +
 .../cznic/exp/lldb/simplefilefiler.go         |  123 +
 vendor/github.com/cznic/exp/lldb/xact.go      |  629 ++
 vendor/github.com/cznic/fileutil/LICENSE      |   27 +
 vendor/github.com/cznic/fileutil/fileutil.go  |  223 +
 .../github.com/cznic/fileutil/fileutil_arm.go |   25 +
 .../cznic/fileutil/fileutil_darwin.go         |   25 +
 .../cznic/fileutil/fileutil_freebsd.go        |   25 +
 .../cznic/fileutil/fileutil_linux.go          |   96 +
 .../cznic/fileutil/fileutil_openbsd.go        |   25 +
 .../cznic/fileutil/fileutil_plan9.go          |   25 +
 .../cznic/fileutil/fileutil_solaris.go        |   27 +
 .../cznic/fileutil/fileutil_windows.go        |  183 +
 vendor/github.com/cznic/fileutil/test_deps.go |   13 +
 vendor/github.com/cznic/mathutil/LICENSE      |   27 +
 vendor/github.com/cznic/mathutil/bits.go      |  207 +
 vendor/github.com/cznic/mathutil/envelope.go  |   46 +
 vendor/github.com/cznic/mathutil/mathutil.go  |  829 ++
 vendor/github.com/cznic/mathutil/permute.go   |   39 +
 vendor/github.com/cznic/mathutil/primes.go    |  342 +
 vendor/github.com/cznic/mathutil/rat.go       |   27 +
 vendor/github.com/cznic/mathutil/rnd.go       |  383 +
 vendor/github.com/cznic/mathutil/tables.go    | 6995 +++++++++++++++++
 vendor/github.com/cznic/mathutil/test_deps.go |   11 +
 vendor/github.com/cznic/ql/LICENSE            |   27 +
 vendor/github.com/cznic/ql/blob.go            |  155 +
 vendor/github.com/cznic/ql/btree.go           |  725 ++
 vendor/github.com/cznic/ql/builtin.go         |  991 +++
 vendor/github.com/cznic/ql/coerce.go          |  290 +
 vendor/github.com/cznic/ql/doc.go             | 2606 ++++++
 vendor/github.com/cznic/ql/driver.go          |  523 ++
 vendor/github.com/cznic/ql/driver/driver.go   |   61 +
 vendor/github.com/cznic/ql/errors.go          |   18 +
 vendor/github.com/cznic/ql/etc.go             | 2805 +++++++
 vendor/github.com/cznic/ql/expr.go            | 4023 ++++++++++
 vendor/github.com/cznic/ql/file.go            | 1279 +++
 vendor/github.com/cznic/ql/httpfs.go          |  302 +
 vendor/github.com/cznic/ql/introspection.go   |  625 ++
 vendor/github.com/cznic/ql/mem.go             | 1277 +++
 vendor/github.com/cznic/ql/parser.go          | 2637 +++++++
 vendor/github.com/cznic/ql/plan.go            | 2800 +++++++
 vendor/github.com/cznic/ql/ql.go              | 1729 ++++
 vendor/github.com/cznic/ql/scanner.go         | 4129 ++++++++++
 vendor/github.com/cznic/ql/stmt.go            | 1268 +++
 vendor/github.com/cznic/ql/storage.go         |  991 +++
 vendor/github.com/cznic/sortutil/LICENSE      |   27 +
 vendor/github.com/cznic/sortutil/sortutil.go  |  227 +
 vendor/github.com/cznic/strutil/LICENSE       |   27 +
 vendor/github.com/cznic/strutil/strutil.go    |  428 +
 vendor/github.com/cznic/zappy/LICENSE         |   27 +
 vendor/github.com/cznic/zappy/decode.go       |   38 +
 vendor/github.com/cznic/zappy/decode_cgo.go   |  121 +
 vendor/github.com/cznic/zappy/decode_nocgo.go |   89 +
 vendor/github.com/cznic/zappy/encode.go       |   37 +
 vendor/github.com/cznic/zappy/encode_cgo.go   |  140 +
 vendor/github.com/cznic/zappy/encode_nocgo.go |   92 +
 vendor/github.com/cznic/zappy/zappy.go        |  241 +
 vendor/github.com/d2g/dhcp4/LICENSE           |   27 +
 vendor/github.com/d2g/dhcp4/constants.go      |  121 +
 vendor/github.com/d2g/dhcp4/helpers.go        |   58 +
 vendor/github.com/d2g/dhcp4/option.go         |   40 +
 vendor/github.com/d2g/dhcp4/packet.go         |  149 +
 vendor/github.com/d2g/dhcp4client/LICENSE     |  354 +
 vendor/github.com/d2g/dhcp4client/client.go   |  366 +
 vendor/github.com/d2g/dhcp4client/inetsock.go |   75 +
 vendor/github.com/d2g/dhcp4client/init.go     |   10 +
 .../d2g/dhcp4client/pktsock_linux.go          |  147 +
 vendor/github.com/docker/distribution/LICENSE |  202 +
 .../github.com/docker/distribution/blobs.go   |  233 +
 .../docker/distribution/digest/digest.go      |  139 +
 .../docker/distribution/digest/digester.go    |  155 +
 .../docker/distribution/digest/doc.go         |   42 +
 .../docker/distribution/digest/set.go         |  245 +
 .../docker/distribution/digest/verifiers.go   |   44 +
 vendor/github.com/docker/distribution/doc.go  |    7 +
 .../github.com/docker/distribution/errors.go  |  111 +
 .../docker/distribution/manifests.go          |  117 +
 .../distribution/reference/reference.go       |  334 +
 .../docker/distribution/reference/regexp.go   |  124 +
 .../docker/distribution/registry.go           |   72 +
 vendor/github.com/docker/distribution/tags.go |   27 +
 vendor/github.com/dustin/go-humanize/LICENSE  |   21 +
 vendor/github.com/dustin/go-humanize/big.go   |   31 +
 .../github.com/dustin/go-humanize/bigbytes.go |  164 +
 vendor/github.com/dustin/go-humanize/bytes.go |  134 +
 vendor/github.com/dustin/go-humanize/comma.go |  101 +
 vendor/github.com/dustin/go-humanize/ftoa.go  |   23 +
 .../github.com/dustin/go-humanize/humanize.go |    8 +
 .../github.com/dustin/go-humanize/number.go   |  192 +
 .../github.com/dustin/go-humanize/ordinals.go |   25 +
 vendor/github.com/dustin/go-humanize/si.go    |  110 +
 vendor/github.com/dustin/go-humanize/times.go |   91 +
 vendor/github.com/go-ini/ini/LICENSE          |  191 +
 vendor/github.com/go-ini/ini/ini.go           |  465 ++
 vendor/github.com/go-ini/ini/key.go           |  616 ++
 vendor/github.com/go-ini/ini/parser.go        |  312 +
 vendor/github.com/go-ini/ini/section.go       |  177 +
 vendor/github.com/go-ini/ini/struct.go        |  351 +
 vendor/github.com/go-ole/go-ole/com.go        |  329 +
 vendor/github.com/go-ole/go-ole/com_func.go   |  174 +
 vendor/github.com/go-ole/go-ole/connect.go    |  192 +
 vendor/github.com/go-ole/go-ole/constants.go  |  153 +
 vendor/github.com/go-ole/go-ole/error.go      |   51 +
 vendor/github.com/go-ole/go-ole/error_func.go |    8 +
 .../github.com/go-ole/go-ole/error_windows.go |   24 +
 vendor/github.com/go-ole/go-ole/guid.go       |  118 +
 .../go-ole/go-ole/iconnectionpoint.go         |   20 +
 .../go-ole/go-ole/iconnectionpoint_func.go    |   21 +
 .../go-ole/go-ole/iconnectionpoint_windows.go |   43 +
 .../go-ole/iconnectionpointcontainer.go       |   17 +
 .../go-ole/iconnectionpointcontainer_func.go  |   11 +
 .../iconnectionpointcontainer_windows.go      |   25 +
 vendor/github.com/go-ole/go-ole/idispatch.go  |   94 +
 .../go-ole/go-ole/idispatch_func.go           |   19 +
 .../go-ole/go-ole/idispatch_windows.go        |  193 +
 .../github.com/go-ole/go-ole/ienumvariant.go  |   19 +
 .../go-ole/go-ole/ienumvariant_func.go        |   19 +
 .../go-ole/go-ole/ienumvariant_windows.go     |   63 +
 .../github.com/go-ole/go-ole/iinspectable.go  |   18 +
 .../go-ole/go-ole/iinspectable_func.go        |   15 +
 .../go-ole/go-ole/iinspectable_windows.go     |   72 +
 .../go-ole/go-ole/iprovideclassinfo.go        |   21 +
 .../go-ole/go-ole/iprovideclassinfo_func.go   |    7 +
 .../go-ole/iprovideclassinfo_windows.go       |   21 +
 vendor/github.com/go-ole/go-ole/itypeinfo.go  |   34 +
 .../go-ole/go-ole/itypeinfo_func.go           |    7 +
 .../go-ole/go-ole/itypeinfo_windows.go        |   21 +
 vendor/github.com/go-ole/go-ole/iunknown.go   |   57 +
 .../github.com/go-ole/go-ole/iunknown_func.go |   19 +
 .../go-ole/go-ole/iunknown_windows.go         |   58 +
 vendor/github.com/go-ole/go-ole/ole.go        |  147 +
 .../go-ole/go-ole/oleutil/connection.go       |  100 +
 .../go-ole/go-ole/oleutil/connection_func.go  |   10 +
 .../go-ole/oleutil/connection_windows.go      |   57 +
 .../go-ole/go-ole/oleutil/go-get.go           |    6 +
 .../go-ole/go-ole/oleutil/oleutil.go          |   89 +
 vendor/github.com/go-ole/go-ole/safearray.go  |   27 +
 .../go-ole/go-ole/safearray_func.go           |  211 +
 .../go-ole/go-ole/safearray_windows.go        |  337 +
 .../go-ole/go-ole/safearrayconversion.go      |  140 +
 .../go-ole/go-ole/safearrayslices.go          |   33 +
 vendor/github.com/go-ole/go-ole/utility.go    |  101 +
 vendor/github.com/go-ole/go-ole/variables.go  |   16 +
 vendor/github.com/go-ole/go-ole/variant.go    |  105 +
 .../github.com/go-ole/go-ole/variant_386.go   |   11 +
 .../github.com/go-ole/go-ole/variant_amd64.go |   12 +
 vendor/github.com/go-ole/go-ole/vt_string.go  |   58 +
 vendor/github.com/go-ole/go-ole/winrt.go      |   99 +
 vendor/github.com/go-ole/go-ole/winrt_doc.go  |   36 +
 vendor/github.com/godbus/dbus/LICENSE         |   25 +
 vendor/github.com/godbus/dbus/auth.go         |  253 +
 .../github.com/godbus/dbus/auth_external.go   |   26 +
 vendor/github.com/godbus/dbus/auth_sha1.go    |  102 +
 vendor/github.com/godbus/dbus/call.go         |   36 +
 vendor/github.com/godbus/dbus/conn.go         |  625 ++
 vendor/github.com/godbus/dbus/conn_darwin.go  |   21 +
 vendor/github.com/godbus/dbus/conn_other.go   |   27 +
 vendor/github.com/godbus/dbus/dbus.go         |  258 +
 vendor/github.com/godbus/dbus/decoder.go      |  228 +
 vendor/github.com/godbus/dbus/doc.go          |   63 +
 vendor/github.com/godbus/dbus/encoder.go      |  208 +
 vendor/github.com/godbus/dbus/export.go       |  411 +
 vendor/github.com/godbus/dbus/homedir.go      |   28 +
 .../github.com/godbus/dbus/homedir_dynamic.go |   15 +
 .../github.com/godbus/dbus/homedir_static.go  |   45 +
 .../github.com/godbus/dbus/introspect/call.go |   27 +
 .../godbus/dbus/introspect/introspect.go      |   86 +
 .../godbus/dbus/introspect/introspectable.go  |   76 +
 vendor/github.com/godbus/dbus/message.go      |  346 +
 vendor/github.com/godbus/dbus/object.go       |  136 +
 vendor/github.com/godbus/dbus/sig.go          |  257 +
 .../godbus/dbus/transport_darwin.go           |    6 +
 .../godbus/dbus/transport_generic.go          |   35 +
 .../github.com/godbus/dbus/transport_unix.go  |  196 +
 .../dbus/transport_unixcred_dragonfly.go      |   95 +
 .../godbus/dbus/transport_unixcred_linux.go   |   25 +
 vendor/github.com/godbus/dbus/variant.go      |  139 +
 .../github.com/godbus/dbus/variant_lexer.go   |  284 +
 .../github.com/godbus/dbus/variant_parser.go  |  817 ++
 vendor/github.com/gogo/protobuf/LICENSE       |   36 +
 .../github.com/gogo/protobuf/proto/clone.go   |  228 +
 .../github.com/gogo/protobuf/proto/decode.go  |  872 ++
 .../gogo/protobuf/proto/decode_gogo.go        |  175 +
 .../github.com/gogo/protobuf/proto/encode.go  | 1325 ++++
 .../gogo/protobuf/proto/encode_gogo.go        |  354 +
 .../github.com/gogo/protobuf/proto/equal.go   |  276 +
 .../gogo/protobuf/proto/extensions.go         |  518 ++
 .../gogo/protobuf/proto/extensions_gogo.go    |  221 +
 vendor/github.com/gogo/protobuf/proto/lib.go  |  894 +++
 .../gogo/protobuf/proto/lib_gogo.go           |   40 +
 .../gogo/protobuf/proto/message_set.go        |  280 +
 .../gogo/protobuf/proto/pointer_reflect.go    |  479 ++
 .../gogo/protobuf/proto/pointer_unsafe.go     |  266 +
 .../protobuf/proto/pointer_unsafe_gogo.go     |  108 +
 .../gogo/protobuf/proto/properties.go         |  923 +++
 .../gogo/protobuf/proto/properties_gogo.go    |   64 +
 .../gogo/protobuf/proto/skip_gogo.go          |  117 +
 vendor/github.com/gogo/protobuf/proto/text.go |  793 ++
 .../gogo/protobuf/proto/text_gogo.go          |   55 +
 .../gogo/protobuf/proto/text_parser.go        |  849 ++
 vendor/github.com/golang/protobuf/LICENSE     |   31 +
 .../github.com/golang/protobuf/proto/clone.go |  223 +
 .../golang/protobuf/proto/decode.go           |  867 ++
 .../golang/protobuf/proto/encode.go           | 1325 ++++
 .../github.com/golang/protobuf/proto/equal.go |  276 +
 .../golang/protobuf/proto/extensions.go       |  399 +
 .../github.com/golang/protobuf/proto/lib.go   |  893 +++
 .../golang/protobuf/proto/message_set.go      |  280 +
 .../golang/protobuf/proto/pointer_reflect.go  |  479 ++
 .../golang/protobuf/proto/pointer_unsafe.go   |  266 +
 .../golang/protobuf/proto/properties.go       |  842 ++
 .../github.com/golang/protobuf/proto/text.go  |  751 ++
 .../golang/protobuf/proto/text_parser.go      |  798 ++
 .../protoc-gen-go/descriptor/descriptor.pb.go | 1812 +++++
 .../golang/protobuf/protoc-gen-go/doc.go      |   51 +
 .../protoc-gen-go/generator/generator.go      | 2715 +++++++
 .../protoc-gen-go/internal/grpc/grpc.go       |  442 ++
 .../protobuf/protoc-gen-go/link_grpc.go       |   34 +
 .../golang/protobuf/protoc-gen-go/main.go     |   98 +
 .../protoc-gen-go/plugin/plugin.pb.go         |  222 +
 vendor/github.com/google/btree/LICENSE        |  202 +
 vendor/github.com/google/btree/btree.go       |  571 ++
 vendor/github.com/google/btree/btree_mem.go   |   76 +
 vendor/github.com/gorilla/context/LICENSE     |   27 +
 vendor/github.com/gorilla/context/context.go  |  143 +
 vendor/github.com/gorilla/context/doc.go      |   82 +
 vendor/github.com/gorilla/mux/LICENSE         |   27 +
 vendor/github.com/gorilla/mux/doc.go          |  199 +
 vendor/github.com/gorilla/mux/mux.go          |  353 +
 vendor/github.com/gorilla/mux/regexp.go       |  276 +
 vendor/github.com/gorilla/mux/route.go        |  524 ++
 vendor/github.com/hashicorp/errwrap/LICENSE   |  354 +
 .../github.com/hashicorp/errwrap/errwrap.go   |  169 +
 .../hydrogen18/stoppableListener/LICENSE      |   10 +
 .../hydrogen18/stoppableListener/listener.go  |   62 +
 .../inconshreveable/mousetrap/LICENSE         |   13 +
 .../inconshreveable/mousetrap/trap_others.go  |   15 +
 .../inconshreveable/mousetrap/trap_windows.go |   98 +
 .../mousetrap/trap_windows_1.4.go             |   46 +
 .../github.com/jmespath/go-jmespath/LICENSE   |   13 +
 vendor/github.com/jmespath/go-jmespath/api.go |   49 +
 .../go-jmespath/astnodetype_string.go         |   16 +
 .../jmespath/go-jmespath/functions.go         |  842 ++
 .../jmespath/go-jmespath/interpreter.go       |  418 +
 .../github.com/jmespath/go-jmespath/lexer.go  |  420 +
 .../github.com/jmespath/go-jmespath/parser.go |  603 ++
 .../jmespath/go-jmespath/toktype_string.go    |   16 +
 .../github.com/jmespath/go-jmespath/util.go   |  185 +
 .../github.com/kballard/go-shellquote/LICENSE |   19 +
 .../github.com/kballard/go-shellquote/doc.go  |    3 +
 .../kballard/go-shellquote/quote.go           |  102 +
 .../kballard/go-shellquote/unquote.go         |  144 +
 vendor/github.com/klauspost/compress/LICENSE  |   27 +
 .../klauspost/compress/flate/copy.go          |   32 +
 .../klauspost/compress/flate/crc32_amd64.go   |   39 +
 .../klauspost/compress/flate/crc32_amd64.s    |  218 +
 .../klauspost/compress/flate/crc32_noasm.go   |   34 +
 .../klauspost/compress/flate/deflate.go       | 1358 ++++
 .../klauspost/compress/flate/fixedhuff.go     |   78 +
 .../klauspost/compress/flate/gen.go           |  265 +
 .../compress/flate/huffman_bit_writer.go      |  717 ++
 .../klauspost/compress/flate/huffman_code.go  |  363 +
 .../klauspost/compress/flate/inflate.go       |  846 ++
 .../klauspost/compress/flate/reverse_bits.go  |   48 +
 .../klauspost/compress/flate/snappy.go        |  768 ++
 .../klauspost/compress/flate/token.go         |  105 +
 vendor/github.com/klauspost/cpuid/LICENSE     |   22 +
 vendor/github.com/klauspost/cpuid/cpuid.go    | 1022 +++
 vendor/github.com/klauspost/cpuid/cpuid_386.s |   42 +
 .../github.com/klauspost/cpuid/cpuid_amd64.s  |   42 +
 .../klauspost/cpuid/detect_intel.go           |   17 +
 .../github.com/klauspost/cpuid/detect_ref.go  |   23 +
 vendor/github.com/klauspost/cpuid/generate.go |    3 +
 .../github.com/klauspost/cpuid/private-gen.go |  476 ++
 vendor/github.com/klauspost/crc32/LICENSE     |   28 +
 vendor/github.com/klauspost/crc32/crc32.go    |  186 +
 .../github.com/klauspost/crc32/crc32_amd64.go |   62 +
 .../github.com/klauspost/crc32/crc32_amd64.s  |  237 +
 .../klauspost/crc32/crc32_amd64p32.go         |   40 +
 .../klauspost/crc32/crc32_amd64p32.s          |   67 +
 .../klauspost/crc32/crc32_generic.go          |   29 +
 vendor/github.com/klauspost/pgzip/LICENSE     |   22 +
 vendor/github.com/klauspost/pgzip/gunzip.go   |  564 ++
 vendor/github.com/klauspost/pgzip/gzip.go     |  485 ++
 vendor/github.com/kr/pty/License              |   23 +
 vendor/github.com/kr/pty/doc.go               |   16 +
 vendor/github.com/kr/pty/ioctl.go             |   11 +
 vendor/github.com/kr/pty/ioctl_bsd.go         |   39 +
 vendor/github.com/kr/pty/pty_darwin.go        |   60 +
 vendor/github.com/kr/pty/pty_freebsd.go       |   73 +
 vendor/github.com/kr/pty/pty_linux.go         |   46 +
 vendor/github.com/kr/pty/pty_unsupported.go   |   11 +
 vendor/github.com/kr/pty/run.go               |   32 +
 vendor/github.com/kr/pty/types.go             |   10 +
 vendor/github.com/kr/pty/types_freebsd.go     |   15 +
 vendor/github.com/kr/pty/util.go              |   35 +
 vendor/github.com/kr/pty/ztypes_386.go        |    9 +
 vendor/github.com/kr/pty/ztypes_amd64.go      |    9 +
 vendor/github.com/kr/pty/ztypes_arm.go        |    9 +
 vendor/github.com/kr/pty/ztypes_arm64.go      |   11 +
 .../github.com/kr/pty/ztypes_freebsd_386.go   |   13 +
 .../github.com/kr/pty/ztypes_freebsd_amd64.go |   14 +
 .../github.com/kr/pty/ztypes_freebsd_arm.go   |   13 +
 vendor/github.com/kr/pty/ztypes_ppc64.go      |   11 +
 vendor/github.com/kr/pty/ztypes_ppc64le.go    |   11 +
 vendor/github.com/kr/pty/ztypes_s390x.go      |   11 +
 vendor/github.com/pborman/uuid/LICENSE        |   27 +
 vendor/github.com/pborman/uuid/dce.go         |   84 +
 vendor/github.com/pborman/uuid/doc.go         |    8 +
 vendor/github.com/pborman/uuid/hash.go        |   53 +
 vendor/github.com/pborman/uuid/json.go        |   30 +
 vendor/github.com/pborman/uuid/node.go        |  101 +
 vendor/github.com/pborman/uuid/sql.go         |   40 +
 vendor/github.com/pborman/uuid/time.go        |  132 +
 vendor/github.com/pborman/uuid/util.go        |   43 +
 vendor/github.com/pborman/uuid/uuid.go        |  163 +
 vendor/github.com/pborman/uuid/version1.go    |   41 +
 vendor/github.com/pborman/uuid/version4.go    |   25 +
 vendor/github.com/peterbourgon/diskv/LICENSE  |   19 +
 .../peterbourgon/diskv/compression.go         |   64 +
 vendor/github.com/peterbourgon/diskv/diskv.go |  578 ++
 vendor/github.com/peterbourgon/diskv/index.go |  115 +
 .../russross/blackfriday/LICENSE.txt          |   29 +
 .../github.com/russross/blackfriday/block.go  | 1398 ++++
 .../github.com/russross/blackfriday/html.go   |  949 +++
 .../github.com/russross/blackfriday/inline.go | 1133 +++
 .../github.com/russross/blackfriday/latex.go  |  332 +
 .../russross/blackfriday/markdown.go          |  926 +++
 .../russross/blackfriday/smartypants.go       |  400 +
 vendor/github.com/shirou/gopsutil/LICENSE     |   27 +
 vendor/github.com/shirou/gopsutil/cpu/cpu.go  |   76 +
 .../shirou/gopsutil/cpu/cpu_darwin.go         |  106 +
 .../shirou/gopsutil/cpu/cpu_darwin_cgo.go     |  107 +
 .../shirou/gopsutil/cpu/cpu_darwin_nocgo.go   |   14 +
 .../shirou/gopsutil/cpu/cpu_freebsd.go        |  147 +
 .../shirou/gopsutil/cpu/cpu_linux.go          |  244 +
 .../shirou/gopsutil/cpu/cpu_unix.go           |   59 +
 .../shirou/gopsutil/cpu/cpu_windows.go        |  105 +
 vendor/github.com/shirou/gopsutil/doc.go      |    1 +
 .../github.com/shirou/gopsutil/host/host.go   |   38 +
 .../shirou/gopsutil/host/host_darwin.go       |  152 +
 .../shirou/gopsutil/host/host_darwin_amd64.go |   19 +
 .../shirou/gopsutil/host/host_freebsd.go      |  196 +
 .../gopsutil/host/host_freebsd_amd64.go       |   41 +
 .../shirou/gopsutil/host/host_linux.go        |  431 +
 .../shirou/gopsutil/host/host_linux_386.go    |   44 +
 .../shirou/gopsutil/host/host_linux_amd64.go  |   42 +
 .../shirou/gopsutil/host/host_linux_arm.go    |   42 +
 .../shirou/gopsutil/host/host_windows.go      |  135 +
 .../shirou/gopsutil/host/types_darwin.go      |   17 +
 .../shirou/gopsutil/host/types_freebsd.go     |   43 +
 .../shirou/gopsutil/host/types_linux.go       |   45 +
 .../shirou/gopsutil/internal/common/binary.go |  634 ++
 .../shirou/gopsutil/internal/common/common.go |  279 +
 .../gopsutil/internal/common/common_darwin.go |   70 +
 .../internal/common/common_freebsd.go         |   70 +
 .../gopsutil/internal/common/common_linux.go  |    3 +
 .../gopsutil/internal/common/common_unix.go   |   66 +
 .../internal/common/common_windows.go         |  110 +
 .../github.com/shirou/gopsutil/load/load.go   |   35 +
 .../shirou/gopsutil/load/load_darwin.go       |   67 +
 .../shirou/gopsutil/load/load_freebsd.go      |   65 +
 .../shirou/gopsutil/load/load_linux.go        |   78 +
 .../shirou/gopsutil/load/load_windows.go      |   19 +
 vendor/github.com/shirou/gopsutil/mem/mem.go  |   64 +
 .../shirou/gopsutil/mem/mem_darwin.go         |   69 +
 .../shirou/gopsutil/mem/mem_darwin_cgo.go     |   53 +
 .../shirou/gopsutil/mem/mem_darwin_nocgo.go   |   88 +
 .../shirou/gopsutil/mem/mem_freebsd.go        |  134 +
 .../shirou/gopsutil/mem/mem_linux.go          |  100 +
 .../shirou/gopsutil/mem/mem_windows.go        |   50 +
 vendor/github.com/shirou/gopsutil/net/net.go  |  243 +
 .../shirou/gopsutil/net/net_darwin.go         |  114 +
 .../shirou/gopsutil/net/net_freebsd.go        |  108 +
 .../shirou/gopsutil/net/net_linux.go          |  620 ++
 .../shirou/gopsutil/net/net_unix.go           |   68 +
 .../shirou/gopsutil/net/net_windows.go        |  116 +
 .../shirou/gopsutil/process/process.go        |  166 +
 .../shirou/gopsutil/process/process_darwin.go |  451 ++
 .../gopsutil/process/process_darwin_amd64.go  |  234 +
 .../gopsutil/process/process_freebsd.go       |  336 +
 .../gopsutil/process/process_freebsd_386.go   |  141 +
 .../gopsutil/process/process_freebsd_amd64.go |  192 +
 .../shirou/gopsutil/process/process_linux.go  |  733 ++
 .../gopsutil/process/process_linux_386.go     |    9 +
 .../gopsutil/process/process_linux_amd64.go   |    9 +
 .../gopsutil/process/process_linux_arm.go     |    9 +
 .../shirou/gopsutil/process/process_posix.go  |  106 +
 .../gopsutil/process/process_windows.go       |  357 +
 .../shirou/gopsutil/process/types_darwin.go   |  160 +
 .../shirou/gopsutil/process/types_freebsd.go  |   95 +
 vendor/github.com/shirou/w32/LICENSE          |   23 +
 vendor/github.com/shirou/w32/advapi32.go      |  299 +
 vendor/github.com/shirou/w32/comctl32.go      |  109 +
 vendor/github.com/shirou/w32/comdlg32.go      |   38 +
 vendor/github.com/shirou/w32/constants.go     | 2661 +++++++
 vendor/github.com/shirou/w32/dwmapi.go        |  254 +
 vendor/github.com/shirou/w32/gdi32.go         |  509 ++
 vendor/github.com/shirou/w32/gdiplus.go       |  175 +
 vendor/github.com/shirou/w32/idispatch.go     |   43 +
 vendor/github.com/shirou/w32/istream.go       |   31 +
 vendor/github.com/shirou/w32/iunknown.go      |   27 +
 vendor/github.com/shirou/w32/kernel32.go      |  314 +
 vendor/github.com/shirou/w32/ole32.go         |   63 +
 vendor/github.com/shirou/w32/oleaut32.go      |   48 +
 vendor/github.com/shirou/w32/opengl32.go      |   72 +
 vendor/github.com/shirou/w32/psapi.go         |   25 +
 vendor/github.com/shirou/w32/shell32.go       |  153 +
 vendor/github.com/shirou/w32/typedef.go       |  901 +++
 vendor/github.com/shirou/w32/user32.go        |  948 +++
 vendor/github.com/shirou/w32/utils.go         |  201 +
 vendor/github.com/shirou/w32/vars.go          |   13 +
 .../shurcooL/sanitized_anchor_name/LICENSE    |   19 +
 .../shurcooL/sanitized_anchor_name/main.go    |   29 +
 vendor/github.com/spf13/cobra/LICENSE.txt     |  174 +
 .../spf13/cobra/bash_completions.go           |  602 ++
 vendor/github.com/spf13/cobra/cobra.go        |  171 +
 vendor/github.com/spf13/cobra/command.go      | 1193 +++
 .../github.com/spf13/cobra/command_notwin.go  |    5 +
 vendor/github.com/spf13/cobra/command_win.go  |   26 +
 vendor/github.com/spf13/cobra/doc/man_docs.go |  218 +
 vendor/github.com/spf13/cobra/doc/md_docs.go  |  175 +
 vendor/github.com/spf13/cobra/doc/util.go     |   38 +
 vendor/github.com/spf13/pflag/LICENSE         |   28 +
 vendor/github.com/spf13/pflag/bool.go         |   97 +
 vendor/github.com/spf13/pflag/count.go        |   97 +
 vendor/github.com/spf13/pflag/duration.go     |   86 +
 vendor/github.com/spf13/pflag/flag.go         |  836 ++
 vendor/github.com/spf13/pflag/float32.go      |   91 +
 vendor/github.com/spf13/pflag/float64.go      |   87 +
 vendor/github.com/spf13/pflag/golangflag.go   |   97 +
 vendor/github.com/spf13/pflag/int.go          |   87 +
 vendor/github.com/spf13/pflag/int32.go        |   91 +
 vendor/github.com/spf13/pflag/int64.go        |   87 +
 vendor/github.com/spf13/pflag/int8.go         |   91 +
 vendor/github.com/spf13/pflag/int_slice.go    |  128 +
 vendor/github.com/spf13/pflag/ip.go           |   96 +
 vendor/github.com/spf13/pflag/ipmask.go       |  122 +
 vendor/github.com/spf13/pflag/ipnet.go        |  100 +
 vendor/github.com/spf13/pflag/string.go       |   82 +
 vendor/github.com/spf13/pflag/string_slice.go |  111 +
 vendor/github.com/spf13/pflag/uint.go         |   91 +
 vendor/github.com/spf13/pflag/uint16.go       |   89 +
 vendor/github.com/spf13/pflag/uint32.go       |   89 +
 vendor/github.com/spf13/pflag/uint64.go       |   91 +
 vendor/github.com/spf13/pflag/uint8.go        |   91 +
 vendor/github.com/syndtr/gocapability/LICENSE |   24 +
 .../gocapability/capability/capability.go     |   72 +
 .../capability/capability_linux.go            |  608 ++
 .../capability/capability_noop.go             |   19 +
 .../syndtr/gocapability/capability/enum.go    |  345 +
 .../gocapability/capability/syscall_linux.go  |  143 +
 vendor/github.com/vishvananda/netlink/LICENSE |  192 +
 vendor/github.com/vishvananda/netlink/addr.go |   43 +
 .../vishvananda/netlink/addr_linux.go         |  128 +
 .../github.com/vishvananda/netlink/class.go   |  110 +
 .../vishvananda/netlink/class_linux.go        |  144 +
 .../github.com/vishvananda/netlink/filter.go  |   55 +
 .../vishvananda/netlink/filter_linux.go       |  191 +
 vendor/github.com/vishvananda/netlink/link.go |  223 +
 .../vishvananda/netlink/link_linux.go         |  790 ++
 .../github.com/vishvananda/netlink/neigh.go   |   22 +
 .../vishvananda/netlink/neigh_linux.go        |  189 +
 .../github.com/vishvananda/netlink/netlink.go |   39 +
 .../netlink/netlink_unspecified.go            |  143 +
 .../vishvananda/netlink/nl/addr_linux.go      |   47 +
 .../vishvananda/netlink/nl/link_linux.go      |  104 +
 .../vishvananda/netlink/nl/nl_linux.go        |  418 +
 .../vishvananda/netlink/nl/route_linux.go     |   42 +
 .../vishvananda/netlink/nl/tc_linux.go        |  425 +
 .../vishvananda/netlink/nl/xfrm_linux.go      |  258 +
 .../netlink/nl/xfrm_policy_linux.go           |  119 +
 .../netlink/nl/xfrm_state_linux.go            |  221 +
 .../vishvananda/netlink/protinfo.go           |   53 +
 .../vishvananda/netlink/protinfo_linux.go     |   60 +
 .../github.com/vishvananda/netlink/qdisc.go   |  167 +
 .../vishvananda/netlink/qdisc_linux.go        |  316 +
 .../github.com/vishvananda/netlink/route.go   |   41 +
 .../vishvananda/netlink/route_linux.go        |  249 +
 vendor/github.com/vishvananda/netlink/xfrm.go |   64 +
 .../vishvananda/netlink/xfrm_policy.go        |   59 +
 .../vishvananda/netlink/xfrm_policy_linux.go  |  127 +
 .../vishvananda/netlink/xfrm_state.go         |   53 +
 .../vishvananda/netlink/xfrm_state_linux.go   |  181 +
 vendor/go4.org/LICENSE                        |  202 +
 vendor/go4.org/errorutil/highlight.go         |   58 +
 vendor/golang.org/x/crypto/LICENSE            |   27 +
 vendor/golang.org/x/crypto/PATENTS            |   22 +
 vendor/golang.org/x/crypto/cast5/cast5.go     |  526 ++
 .../x/crypto/openpgp/armor/armor.go           |  219 +
 .../x/crypto/openpgp/armor/encode.go          |  160 +
 .../x/crypto/openpgp/canonical_text.go        |   59 +
 .../x/crypto/openpgp/elgamal/elgamal.go       |  122 +
 .../x/crypto/openpgp/errors/errors.go         |   72 +
 vendor/golang.org/x/crypto/openpgp/keys.go    |  624 ++
 .../x/crypto/openpgp/packet/compressed.go     |  123 +
 .../x/crypto/openpgp/packet/config.go         |   88 +
 .../x/crypto/openpgp/packet/encrypted_key.go  |  168 +
 .../x/crypto/openpgp/packet/literal.go        |   89 +
 .../x/crypto/openpgp/packet/ocfb.go           |  143 +
 .../openpgp/packet/one_pass_signature.go      |   73 +
 .../x/crypto/openpgp/packet/opaque.go         |  161 +
 .../x/crypto/openpgp/packet/packet.go         |  538 ++
 .../x/crypto/openpgp/packet/private_key.go    |  310 +
 .../x/crypto/openpgp/packet/public_key.go     |  687 ++
 .../x/crypto/openpgp/packet/public_key_v3.go  |  275 +
 .../x/crypto/openpgp/packet/reader.go         |   62 +
 .../x/crypto/openpgp/packet/signature.go      |  663 ++
 .../x/crypto/openpgp/packet/signature_v3.go   |  146 +
 .../openpgp/packet/symmetric_key_encrypted.go |  164 +
 .../openpgp/packet/symmetrically_encrypted.go |  290 +
 .../x/crypto/openpgp/packet/userattribute.go  |   91 +
 .../x/crypto/openpgp/packet/userid.go         |  160 +
 vendor/golang.org/x/crypto/openpgp/read.go    |  423 +
 vendor/golang.org/x/crypto/openpgp/s2k/s2k.go |  273 +
 vendor/golang.org/x/crypto/openpgp/write.go   |  374 +
 .../x/crypto/ssh/terminal/terminal.go         |  892 +++
 .../golang.org/x/crypto/ssh/terminal/util.go  |  128 +
 .../x/crypto/ssh/terminal/util_bsd.go         |   12 +
 .../x/crypto/ssh/terminal/util_linux.go       |   11 +
 .../x/crypto/ssh/terminal/util_windows.go     |  174 +
 vendor/golang.org/x/net/LICENSE               |   27 +
 vendor/golang.org/x/net/PATENTS               |   22 +
 vendor/golang.org/x/net/context/context.go    |  447 ++
 vendor/golang.org/x/net/html/atom/atom.go     |   78 +
 vendor/golang.org/x/net/html/atom/gen.go      |  648 ++
 vendor/golang.org/x/net/html/atom/table.go    |  713 ++
 vendor/golang.org/x/net/html/const.go         |  102 +
 vendor/golang.org/x/net/html/doc.go           |  106 +
 vendor/golang.org/x/net/html/doctype.go       |  156 +
 vendor/golang.org/x/net/html/entity.go        | 2253 ++++++
 vendor/golang.org/x/net/html/escape.go        |  258 +
 vendor/golang.org/x/net/html/foreign.go       |  226 +
 vendor/golang.org/x/net/html/node.go          |  193 +
 vendor/golang.org/x/net/html/parse.go         | 2094 +++++
 vendor/golang.org/x/net/html/render.go        |  271 +
 vendor/golang.org/x/net/html/token.go         | 1219 +++
 .../x/net/http2/client_conn_pool.go           |  225 +
 .../x/net/http2/configure_transport.go        |   89 +
 vendor/golang.org/x/net/http2/errors.go       |   90 +
 vendor/golang.org/x/net/http2/fixed_buffer.go |   60 +
 vendor/golang.org/x/net/http2/flow.go         |   50 +
 vendor/golang.org/x/net/http2/frame.go        | 1269 +++
 vendor/golang.org/x/net/http2/go15.go         |   11 +
 vendor/golang.org/x/net/http2/gotrack.go      |  170 +
 vendor/golang.org/x/net/http2/headermap.go    |   78 +
 vendor/golang.org/x/net/http2/hpack/encode.go |  251 +
 vendor/golang.org/x/net/http2/hpack/hpack.go  |  533 ++
 .../golang.org/x/net/http2/hpack/huffman.go   |  190 +
 vendor/golang.org/x/net/http2/hpack/tables.go |  352 +
 vendor/golang.org/x/net/http2/http2.go        |  424 +
 vendor/golang.org/x/net/http2/not_go15.go     |   11 +
 vendor/golang.org/x/net/http2/not_go16.go     |   13 +
 vendor/golang.org/x/net/http2/pipe.go         |  147 +
 vendor/golang.org/x/net/http2/server.go       | 2260 ++++++
 vendor/golang.org/x/net/http2/transport.go    | 1713 ++++
 vendor/golang.org/x/net/http2/write.go        |  263 +
 vendor/golang.org/x/net/http2/writesched.go   |  283 +
 .../x/net/internal/timeseries/timeseries.go   |  525 ++
 vendor/golang.org/x/net/trace/events.go       |  524 ++
 vendor/golang.org/x/net/trace/histogram.go    |  356 +
 vendor/golang.org/x/net/trace/trace.go        | 1059 +++
 vendor/golang.org/x/sys/LICENSE               |   27 +
 vendor/golang.org/x/sys/PATENTS               |   22 +
 vendor/golang.org/x/sys/unix/asm.s            |   10 +
 vendor/golang.org/x/sys/unix/asm_darwin_386.s |   29 +
 .../golang.org/x/sys/unix/asm_darwin_amd64.s  |   29 +
 vendor/golang.org/x/sys/unix/asm_darwin_arm.s |   30 +
 .../golang.org/x/sys/unix/asm_darwin_arm64.s  |   30 +
 .../x/sys/unix/asm_dragonfly_amd64.s          |   29 +
 .../golang.org/x/sys/unix/asm_freebsd_386.s   |   29 +
 .../golang.org/x/sys/unix/asm_freebsd_amd64.s |   29 +
 .../golang.org/x/sys/unix/asm_freebsd_arm.s   |   29 +
 vendor/golang.org/x/sys/unix/asm_linux_386.s  |   35 +
 .../golang.org/x/sys/unix/asm_linux_amd64.s   |   29 +
 vendor/golang.org/x/sys/unix/asm_linux_arm.s  |   29 +
 .../golang.org/x/sys/unix/asm_linux_arm64.s   |   24 +
 .../golang.org/x/sys/unix/asm_linux_mips64x.s |   28 +
 .../golang.org/x/sys/unix/asm_linux_ppc64x.s  |   28 +
 .../golang.org/x/sys/unix/asm_linux_s390x.s   |   28 +
 vendor/golang.org/x/sys/unix/asm_netbsd_386.s |   29 +
 .../golang.org/x/sys/unix/asm_netbsd_amd64.s  |   29 +
 vendor/golang.org/x/sys/unix/asm_netbsd_arm.s |   29 +
 .../golang.org/x/sys/unix/asm_openbsd_386.s   |   29 +
 .../golang.org/x/sys/unix/asm_openbsd_amd64.s |   29 +
 .../golang.org/x/sys/unix/asm_solaris_amd64.s |   17 +
 .../golang.org/x/sys/unix/bluetooth_linux.go  |   35 +
 vendor/golang.org/x/sys/unix/constants.go     |   13 +
 vendor/golang.org/x/sys/unix/env_unix.go      |   27 +
 vendor/golang.org/x/sys/unix/env_unset.go     |   14 +
 vendor/golang.org/x/sys/unix/flock.go         |   24 +
 .../x/sys/unix/flock_linux_32bit.go           |   13 +
 vendor/golang.org/x/sys/unix/gccgo.go         |   46 +
 vendor/golang.org/x/sys/unix/gccgo_c.c        |   41 +
 .../x/sys/unix/gccgo_linux_amd64.go           |   20 +
 vendor/golang.org/x/sys/unix/mkpost.go        |   62 +
 vendor/golang.org/x/sys/unix/race.go          |   30 +
 vendor/golang.org/x/sys/unix/race0.go         |   25 +
 .../golang.org/x/sys/unix/sockcmsg_linux.go   |   36 +
 vendor/golang.org/x/sys/unix/sockcmsg_unix.go |  103 +
 vendor/golang.org/x/sys/unix/str.go           |   26 +
 vendor/golang.org/x/sys/unix/syscall.go       |   76 +
 vendor/golang.org/x/sys/unix/syscall_bsd.go   |  628 ++
 .../golang.org/x/sys/unix/syscall_darwin.go   |  509 ++
 .../x/sys/unix/syscall_darwin_386.go          |   77 +
 .../x/sys/unix/syscall_darwin_amd64.go        |   79 +
 .../x/sys/unix/syscall_darwin_arm.go          |   71 +
 .../x/sys/unix/syscall_darwin_arm64.go        |   77 +
 .../x/sys/unix/syscall_dragonfly.go           |  411 +
 .../x/sys/unix/syscall_dragonfly_amd64.go     |   61 +
 .../golang.org/x/sys/unix/syscall_freebsd.go  |  682 ++
 .../x/sys/unix/syscall_freebsd_386.go         |   61 +
 .../x/sys/unix/syscall_freebsd_amd64.go       |   61 +
 .../x/sys/unix/syscall_freebsd_arm.go         |   61 +
 vendor/golang.org/x/sys/unix/syscall_linux.go | 1108 +++
 .../x/sys/unix/syscall_linux_386.go           |  390 +
 .../x/sys/unix/syscall_linux_amd64.go         |  148 +
 .../x/sys/unix/syscall_linux_arm.go           |  254 +
 .../x/sys/unix/syscall_linux_arm64.go         |  180 +
 .../x/sys/unix/syscall_linux_mips64x.go       |  206 +
 .../x/sys/unix/syscall_linux_ppc64x.go        |  126 +
 .../x/sys/unix/syscall_linux_s390x.go         |  320 +
 .../golang.org/x/sys/unix/syscall_netbsd.go   |  492 ++
 .../x/sys/unix/syscall_netbsd_386.go          |   42 +
 .../x/sys/unix/syscall_netbsd_amd64.go        |   42 +
 .../x/sys/unix/syscall_netbsd_arm.go          |   42 +
 .../golang.org/x/sys/unix/syscall_no_getwd.go |   11 +
 .../golang.org/x/sys/unix/syscall_openbsd.go  |  303 +
 .../x/sys/unix/syscall_openbsd_386.go         |   42 +
 .../x/sys/unix/syscall_openbsd_amd64.go       |   42 +
 .../golang.org/x/sys/unix/syscall_solaris.go  |  713 ++
 .../x/sys/unix/syscall_solaris_amd64.go       |   35 +
 vendor/golang.org/x/sys/unix/syscall_unix.go  |  297 +
 vendor/golang.org/x/sys/unix/types_darwin.go  |  250 +
 .../golang.org/x/sys/unix/types_dragonfly.go  |  242 +
 vendor/golang.org/x/sys/unix/types_freebsd.go |  353 +
 vendor/golang.org/x/sys/unix/types_linux.go   |  435 +
 vendor/golang.org/x/sys/unix/types_netbsd.go  |  232 +
 vendor/golang.org/x/sys/unix/types_openbsd.go |  244 +
 vendor/golang.org/x/sys/unix/types_solaris.go |  260 +
 .../x/sys/unix/zerrors_darwin_386.go          | 1576 ++++
 .../x/sys/unix/zerrors_darwin_amd64.go        | 1576 ++++
 .../x/sys/unix/zerrors_darwin_arm.go          | 1293 +++
 .../x/sys/unix/zerrors_darwin_arm64.go        | 1576 ++++
 .../x/sys/unix/zerrors_dragonfly_amd64.go     | 1530 ++++
 .../x/sys/unix/zerrors_freebsd_386.go         | 1743 ++++
 .../x/sys/unix/zerrors_freebsd_amd64.go       | 1748 ++++
 .../x/sys/unix/zerrors_freebsd_arm.go         | 1729 ++++
 .../x/sys/unix/zerrors_linux_386.go           | 1819 +++++
 .../x/sys/unix/zerrors_linux_amd64.go         | 1820 +++++
 .../x/sys/unix/zerrors_linux_arm.go           | 1743 ++++
 .../x/sys/unix/zerrors_linux_arm64.go         | 1897 +++++
 .../x/sys/unix/zerrors_linux_mips64.go        | 1917 +++++
 .../x/sys/unix/zerrors_linux_mips64le.go      | 1917 +++++
 .../x/sys/unix/zerrors_linux_ppc64.go         | 1970 +++++
 .../x/sys/unix/zerrors_linux_ppc64le.go       | 1969 +++++
 .../x/sys/unix/zerrors_linux_s390x.go         | 2027 +++++
 .../x/sys/unix/zerrors_netbsd_386.go          | 1712 ++++
 .../x/sys/unix/zerrors_netbsd_amd64.go        | 1702 ++++
 .../x/sys/unix/zerrors_netbsd_arm.go          | 1688 ++++
 .../x/sys/unix/zerrors_openbsd_386.go         | 1584 ++++
 .../x/sys/unix/zerrors_openbsd_amd64.go       | 1583 ++++
 .../x/sys/unix/zerrors_solaris_amd64.go       | 1436 ++++
 .../x/sys/unix/zsyscall_darwin_386.go         | 1427 ++++
 .../x/sys/unix/zsyscall_darwin_amd64.go       | 1443 ++++
 .../x/sys/unix/zsyscall_darwin_arm.go         | 1427 ++++
 .../x/sys/unix/zsyscall_darwin_arm64.go       | 1427 ++++
 .../x/sys/unix/zsyscall_dragonfly_amd64.go    | 1413 ++++
 .../x/sys/unix/zsyscall_freebsd_386.go        | 1665 ++++
 .../x/sys/unix/zsyscall_freebsd_amd64.go      | 1665 ++++
 .../x/sys/unix/zsyscall_freebsd_arm.go        | 1665 ++++
 .../x/sys/unix/zsyscall_linux_386.go          | 1638 ++++
 .../x/sys/unix/zsyscall_linux_amd64.go        | 1832 +++++
 .../x/sys/unix/zsyscall_linux_arm.go          | 1739 ++++
 .../x/sys/unix/zsyscall_linux_arm64.go        | 1723 ++++
 .../x/sys/unix/zsyscall_linux_mips64.go       | 1781 +++++
 .../x/sys/unix/zsyscall_linux_mips64le.go     | 1781 +++++
 .../x/sys/unix/zsyscall_linux_ppc64.go        | 1843 +++++
 .../x/sys/unix/zsyscall_linux_ppc64le.go      | 1843 +++++
 .../x/sys/unix/zsyscall_linux_s390x.go        | 1623 ++++
 .../x/sys/unix/zsyscall_netbsd_386.go         | 1327 ++++
 .../x/sys/unix/zsyscall_netbsd_amd64.go       | 1327 ++++
 .../x/sys/unix/zsyscall_netbsd_arm.go         | 1327 ++++
 .../x/sys/unix/zsyscall_openbsd_386.go        | 1387 ++++
 .../x/sys/unix/zsyscall_openbsd_amd64.go      | 1387 ++++
 .../x/sys/unix/zsyscall_solaris_amd64.go      | 1559 ++++
 .../golang.org/x/sys/unix/zsysctl_openbsd.go  |  270 +
 .../x/sys/unix/zsysnum_darwin_386.go          |  398 +
 .../x/sys/unix/zsysnum_darwin_amd64.go        |  398 +
 .../x/sys/unix/zsysnum_darwin_arm.go          |  358 +
 .../x/sys/unix/zsysnum_darwin_arm64.go        |  398 +
 .../x/sys/unix/zsysnum_dragonfly_amd64.go     |  304 +
 .../x/sys/unix/zsysnum_freebsd_386.go         |  351 +
 .../x/sys/unix/zsysnum_freebsd_amd64.go       |  351 +
 .../x/sys/unix/zsysnum_freebsd_arm.go         |  351 +
 .../x/sys/unix/zsysnum_linux_386.go           |  355 +
 .../x/sys/unix/zsysnum_linux_amd64.go         |  321 +
 .../x/sys/unix/zsysnum_linux_arm.go           |  356 +
 .../x/sys/unix/zsysnum_linux_arm64.go         |  272 +
 .../x/sys/unix/zsysnum_linux_mips64.go        |  327 +
 .../x/sys/unix/zsysnum_linux_mips64le.go      |  327 +
 .../x/sys/unix/zsysnum_linux_ppc64.go         |  360 +
 .../x/sys/unix/zsysnum_linux_ppc64le.go       |  353 +
 .../x/sys/unix/zsysnum_linux_s390x.go         |  328 +
 .../x/sys/unix/zsysnum_netbsd_386.go          |  273 +
 .../x/sys/unix/zsysnum_netbsd_amd64.go        |  273 +
 .../x/sys/unix/zsysnum_netbsd_arm.go          |  273 +
 .../x/sys/unix/zsysnum_openbsd_386.go         |  207 +
 .../x/sys/unix/zsysnum_openbsd_amd64.go       |  207 +
 .../x/sys/unix/zsysnum_solaris_amd64.go       |   13 +
 .../x/sys/unix/ztypes_darwin_386.go           |  447 ++
 .../x/sys/unix/ztypes_darwin_amd64.go         |  462 ++
 .../x/sys/unix/ztypes_darwin_arm.go           |  449 ++
 .../x/sys/unix/ztypes_darwin_arm64.go         |  457 ++
 .../x/sys/unix/ztypes_dragonfly_amd64.go      |  443 ++
 .../x/sys/unix/ztypes_freebsd_386.go          |  502 ++
 .../x/sys/unix/ztypes_freebsd_amd64.go        |  505 ++
 .../x/sys/unix/ztypes_freebsd_arm.go          |  497 ++
 .../golang.org/x/sys/unix/ztypes_linux_386.go |  607 ++
 .../x/sys/unix/ztypes_linux_amd64.go          |  625 ++
 .../golang.org/x/sys/unix/ztypes_linux_arm.go |  587 ++
 .../x/sys/unix/ztypes_linux_arm64.go          |  604 ++
 .../x/sys/unix/ztypes_linux_mips64.go         |  607 ++
 .../x/sys/unix/ztypes_linux_mips64le.go       |  607 ++
 .../x/sys/unix/ztypes_linux_ppc64.go          |  614 ++
 .../x/sys/unix/ztypes_linux_ppc64le.go        |  614 ++
 .../x/sys/unix/ztypes_linux_s390x.go          |  629 ++
 .../x/sys/unix/ztypes_netbsd_386.go           |  396 +
 .../x/sys/unix/ztypes_netbsd_amd64.go         |  403 +
 .../x/sys/unix/ztypes_netbsd_arm.go           |  401 +
 .../x/sys/unix/ztypes_openbsd_386.go          |  441 ++
 .../x/sys/unix/ztypes_openbsd_amd64.go        |  448 ++
 .../x/sys/unix/ztypes_solaris_amd64.go        |  422 +
 vendor/golang.org/x/tools/LICENSE             |   27 +
 vendor/golang.org/x/tools/PATENTS             |   22 +
 vendor/golang.org/x/tools/go/vcs/discovery.go |   76 +
 vendor/golang.org/x/tools/go/vcs/env.go       |   39 +
 vendor/golang.org/x/tools/go/vcs/http.go      |   80 +
 vendor/golang.org/x/tools/go/vcs/vcs.go       |  754 ++
 vendor/google.golang.org/grpc/LICENSE         |   28 +
 vendor/google.golang.org/grpc/PATENTS         |   22 +
 vendor/google.golang.org/grpc/call.go         |  190 +
 vendor/google.golang.org/grpc/clientconn.go   |  590 ++
 .../grpc/codes/code_string.go                 |   16 +
 vendor/google.golang.org/grpc/codes/codes.go  |  159 +
 .../grpc/credentials/credentials.go           |  226 +
 vendor/google.golang.org/grpc/doc.go          |    6 +
 .../google.golang.org/grpc/grpclog/logger.go  |   93 +
 .../grpc/internal/internal.go                 |   49 +
 .../grpc/metadata/metadata.go                 |  134 +
 .../google.golang.org/grpc/naming/naming.go   |   73 +
 vendor/google.golang.org/grpc/peer/peer.go    |   65 +
 vendor/google.golang.org/grpc/picker.go       |  243 +
 vendor/google.golang.org/grpc/rpc_util.go     |  444 ++
 vendor/google.golang.org/grpc/server.go       |  785 ++
 vendor/google.golang.org/grpc/stream.go       |  411 +
 vendor/google.golang.org/grpc/trace.go        |  120 +
 .../grpc/transport/control.go                 |  260 +
 .../grpc/transport/handler_server.go          |  377 +
 .../grpc/transport/http2_client.go            |  875 +++
 .../grpc/transport/http2_server.go            |  707 ++
 .../grpc/transport/http_util.go               |  455 ++
 .../grpc/transport/transport.go               |  510 ++
 vendor/gopkg.in/inf.v0/LICENSE                |   28 +
 vendor/gopkg.in/inf.v0/dec.go                 |  615 ++
 vendor/gopkg.in/inf.v0/rounder.go             |  145 +
 vendor/k8s.io/kubernetes/LICENSE              |  202 +
 .../pkg/api/resource/deep_copy_generated.go   |   55 +
 .../pkg/api/resource/generated.pb.go          |  371 +
 .../kubernetes/pkg/api/resource/quantity.go   |  538 ++
 .../pkg/api/resource/quantity_proto.go        |   78 +
 .../kubernetes/pkg/api/resource/scale_int.go  |   95 +
 .../kubernetes/pkg/api/resource/suffix.go     |  136 +
 .../kubernetes/pkg/conversion/cloner.go       |  237 +
 .../kubernetes/pkg/conversion/converter.go    |  951 +++
 .../pkg/conversion/deep_copy_generated.go     |  185 +
 .../kubernetes/pkg/conversion/deep_equal.go   |   36 +
 .../k8s.io/kubernetes/pkg/conversion/doc.go   |   24 +
 .../kubernetes/pkg/conversion/helper.go       |   39 +
 .../third_party/forked/reflect/LICENSE        |   27 +
 .../third_party/forked/reflect/deep_equal.go  |  388 +
 1016 files changed, 311070 insertions(+)
 create mode 100644 glide.lock
 create mode 100644 vendor/github.com/StackExchange/wmi/LICENSE
 create mode 100644 vendor/github.com/StackExchange/wmi/wmi.go
 create mode 100644 vendor/github.com/appc/docker2aci/LICENSE
 create mode 100644 vendor/github.com/appc/docker2aci/lib/common/common.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/conversion_store.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/docker2aci.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/internal.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/tarball/tarfile.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/tarball/walk.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/types/docker_types.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/types/types.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/util/util.go
 create mode 100644 vendor/github.com/appc/docker2aci/lib/version.go
 create mode 100644 vendor/github.com/appc/docker2aci/main.go
 create mode 100644 vendor/github.com/appc/docker2aci/pkg/log/log.go
 create mode 100644 vendor/github.com/appc/goaci/LICENSE
 create mode 100644 vendor/github.com/appc/goaci/buildercommand.go
 create mode 100644 vendor/github.com/appc/goaci/command.go
 create mode 100644 vendor/github.com/appc/goaci/commands.go
 create mode 100644 vendor/github.com/appc/goaci/main.go
 create mode 100644 vendor/github.com/appc/goaci/mappers.go
 create mode 100644 vendor/github.com/appc/goaci/proj2aci/asset.go
 create mode 100644 vendor/github.com/appc/goaci/proj2aci/binary.go
 create mode 100644 vendor/github.com/appc/goaci/proj2aci/builder.go
 create mode 100644 vendor/github.com/appc/goaci/proj2aci/cmake.go
 create mode 100644 vendor/github.com/appc/goaci/proj2aci/go.go
 create mode 100644 vendor/github.com/appc/goaci/proj2aci/run.go
 create mode 100644 vendor/github.com/appc/goaci/proj2aci/util.go
 create mode 100644 vendor/github.com/appc/goaci/proj2aci/vcs.go
 create mode 100644 vendor/github.com/appc/spec/LICENSE
 create mode 100644 vendor/github.com/appc/spec/ace/doc.go
 create mode 100644 vendor/github.com/appc/spec/ace/image_manifest_main.json.in
 create mode 100644 vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
 create mode 100644 vendor/github.com/appc/spec/ace/os_default.go
 create mode 100644 vendor/github.com/appc/spec/ace/os_freebsd.go
 create mode 100644 vendor/github.com/appc/spec/ace/os_linux.go
 create mode 100644 vendor/github.com/appc/spec/ace/os_shared.go
 create mode 100644 vendor/github.com/appc/spec/ace/validator.go
 create mode 100644 vendor/github.com/appc/spec/aci/build.go
 create mode 100644 vendor/github.com/appc/spec/aci/doc.go
 create mode 100644 vendor/github.com/appc/spec/aci/file.go
 create mode 100644 vendor/github.com/appc/spec/aci/layout.go
 create mode 100644 vendor/github.com/appc/spec/aci/writer.go
 create mode 100644 vendor/github.com/appc/spec/actool/actool.go
 create mode 100644 vendor/github.com/appc/spec/actool/build.go
 create mode 100644 vendor/github.com/appc/spec/actool/discover.go
 create mode 100644 vendor/github.com/appc/spec/actool/doc.go
 create mode 100644 vendor/github.com/appc/spec/actool/help.go
 create mode 100644 vendor/github.com/appc/spec/actool/manifest.go
 create mode 100644 vendor/github.com/appc/spec/actool/validate.go
 create mode 100644 vendor/github.com/appc/spec/actool/version.go
 create mode 100644 vendor/github.com/appc/spec/discovery/discovery.go
 create mode 100644 vendor/github.com/appc/spec/discovery/doc.go
 create mode 100644 vendor/github.com/appc/spec/discovery/http.go
 create mode 100644 vendor/github.com/appc/spec/discovery/parse.go
 create mode 100644 vendor/github.com/appc/spec/pkg/acirenderer/acirenderer.go
 create mode 100644 vendor/github.com/appc/spec/pkg/acirenderer/resolve.go
 create mode 100644 vendor/github.com/appc/spec/pkg/device/device_linux.go
 create mode 100644 vendor/github.com/appc/spec/pkg/device/device_posix.go
 create mode 100644 vendor/github.com/appc/spec/pkg/tarheader/doc.go
 create mode 100644 vendor/github.com/appc/spec/pkg/tarheader/pop_darwin.go
 create mode 100644 vendor/github.com/appc/spec/pkg/tarheader/pop_linux.go
 create mode 100644 vendor/github.com/appc/spec/pkg/tarheader/pop_posix.go
 create mode 100644 vendor/github.com/appc/spec/pkg/tarheader/tarheader.go
 create mode 100644 vendor/github.com/appc/spec/schema/common/common.go
 create mode 100644 vendor/github.com/appc/spec/schema/doc.go
 create mode 100644 vendor/github.com/appc/spec/schema/image.go
 create mode 100644 vendor/github.com/appc/spec/schema/kind.go
 create mode 100644 vendor/github.com/appc/spec/schema/lastditch/doc.go
 create mode 100644 vendor/github.com/appc/spec/schema/lastditch/image.go
 create mode 100644 vendor/github.com/appc/spec/schema/lastditch/labels.go
 create mode 100644 vendor/github.com/appc/spec/schema/lastditch/pod.go
 create mode 100644 vendor/github.com/appc/spec/schema/pod.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/acidentifier.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/ackind.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/acname.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/annotations.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/app.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/date.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/dependencies.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/doc.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/environment.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/errors.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/event_handler.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/exec.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/hash.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/isolator.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/isolator_resources.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/labels.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/mountpoint.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/port.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/semver.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/url.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/uuid.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/volume.go
 create mode 100644 vendor/github.com/appc/spec/schema/version.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/LICENSE.txt
 create mode 100644 vendor/github.com/aws/aws-sdk-go/NOTICE.txt
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/config.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/errors.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/logger.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/request/request.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/types.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/version.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
 create mode 100644 vendor/github.com/aws/aws-sdk-go/sdk.go
 create mode 100644 vendor/github.com/camlistore/go4/LICENSE
 create mode 100644 vendor/github.com/camlistore/go4/lock/lock.go
 create mode 100644 vendor/github.com/camlistore/go4/lock/lock_appengine.go
 create mode 100644 vendor/github.com/camlistore/go4/lock/lock_darwin_amd64.go
 create mode 100644 vendor/github.com/camlistore/go4/lock/lock_freebsd.go
 create mode 100644 vendor/github.com/camlistore/go4/lock/lock_linux_amd64.go
 create mode 100644 vendor/github.com/camlistore/go4/lock/lock_linux_arm.go
 create mode 100644 vendor/github.com/camlistore/go4/lock/lock_plan9.go
 create mode 100644 vendor/github.com/camlistore/go4/lock/lock_sigzero.go
 create mode 100644 vendor/github.com/containernetworking/cni/LICENSE
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/invoke/args.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/invoke/delegate.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/invoke/exec.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/invoke/find.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/ip/cidr.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/ip/ipforward.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/ip/ipmasq.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/ip/link.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/ip/route.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/ipam/ipam.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/ns/ns.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/skel/skel.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/testutils/cmd.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/types/args.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/types/types.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go
 create mode 100644 vendor/github.com/containernetworking/cni/pkg/utils/utils.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/host-local/config.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/ipam/host-local/main.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/main/bridge/bridge.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/main/ptp/ptp.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go
 create mode 100644 vendor/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go
 create mode 100644 vendor/github.com/coreos/gexpect/LICENCE
 create mode 100644 vendor/github.com/coreos/gexpect/gexpect.go
 create mode 100644 vendor/github.com/coreos/go-iptables/LICENSE
 create mode 100644 vendor/github.com/coreos/go-iptables/iptables/iptables.go
 create mode 100644 vendor/github.com/coreos/go-iptables/iptables/lock.go
 create mode 100644 vendor/github.com/coreos/go-semver/LICENSE
 create mode 100644 vendor/github.com/coreos/go-semver/example.go
 create mode 100644 vendor/github.com/coreos/go-semver/semver/semver.go
 create mode 100644 vendor/github.com/coreos/go-semver/semver/sort.go
 create mode 100644 vendor/github.com/coreos/go-systemd/LICENSE
 create mode 100644 vendor/github.com/coreos/go-systemd/activation/files.go
 create mode 100644 vendor/github.com/coreos/go-systemd/activation/listeners.go
 create mode 100644 vendor/github.com/coreos/go-systemd/activation/packetconns.go
 create mode 100644 vendor/github.com/coreos/go-systemd/dbus/dbus.go
 create mode 100644 vendor/github.com/coreos/go-systemd/dbus/methods.go
 create mode 100644 vendor/github.com/coreos/go-systemd/dbus/properties.go
 create mode 100644 vendor/github.com/coreos/go-systemd/dbus/set.go
 create mode 100644 vendor/github.com/coreos/go-systemd/dbus/subscription.go
 create mode 100644 vendor/github.com/coreos/go-systemd/dbus/subscription_set.go
 create mode 100644 vendor/github.com/coreos/go-systemd/sdjournal/journal.go
 create mode 100644 vendor/github.com/coreos/go-systemd/sdjournal/read.go
 create mode 100644 vendor/github.com/coreos/go-systemd/unit/deserialize.go
 create mode 100644 vendor/github.com/coreos/go-systemd/unit/escape.go
 create mode 100644 vendor/github.com/coreos/go-systemd/unit/option.go
 create mode 100644 vendor/github.com/coreos/go-systemd/unit/serialize.go
 create mode 100644 vendor/github.com/coreos/go-systemd/util/util.go
 create mode 100644 vendor/github.com/coreos/go-tspi/LICENSE
 create mode 100644 vendor/github.com/coreos/go-tspi/tpmclient/tpmclient.go
 create mode 100644 vendor/github.com/coreos/go-tspi/tspiconst/tspiconst.go
 create mode 100644 vendor/github.com/coreos/go-tspi/verification/verification.go
 create mode 100644 vendor/github.com/coreos/ioprogress/LICENSE
 create mode 100644 vendor/github.com/coreos/ioprogress/draw.go
 create mode 100644 vendor/github.com/coreos/ioprogress/reader.go
 create mode 100644 vendor/github.com/coreos/pkg/LICENSE
 create mode 100644 vendor/github.com/coreos/pkg/NOTICE
 create mode 100644 vendor/github.com/coreos/pkg/dlopen/dlopen.go
 create mode 100644 vendor/github.com/coreos/pkg/dlopen/dlopen_example.go
 create mode 100644 vendor/github.com/coreos/pkg/progressutil/iocopy.go
 create mode 100644 vendor/github.com/coreos/pkg/progressutil/progressbar.go
 create mode 100644 vendor/github.com/cpuguy83/go-md2man/LICENSE.md
 create mode 100644 vendor/github.com/cpuguy83/go-md2man/md2man.go
 create mode 100644 vendor/github.com/cpuguy83/go-md2man/md2man/md2man.go
 create mode 100644 vendor/github.com/cpuguy83/go-md2man/md2man/roff.go
 create mode 100644 vendor/github.com/cznic/b/LICENSE
 create mode 100644 vendor/github.com/cznic/b/btree.go
 create mode 100644 vendor/github.com/cznic/b/doc.go
 create mode 100644 vendor/github.com/cznic/bufs/LICENSE
 create mode 100644 vendor/github.com/cznic/bufs/bufs.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/2pc.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/2pc_docs.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/LICENSE
 create mode 100644 vendor/github.com/cznic/exp/lldb/btree.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/errors.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/falloc.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/filer.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/gb.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/lldb.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/memfiler.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/osfiler.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/simplefilefiler.go
 create mode 100644 vendor/github.com/cznic/exp/lldb/xact.go
 create mode 100644 vendor/github.com/cznic/fileutil/LICENSE
 create mode 100644 vendor/github.com/cznic/fileutil/fileutil.go
 create mode 100644 vendor/github.com/cznic/fileutil/fileutil_arm.go
 create mode 100644 vendor/github.com/cznic/fileutil/fileutil_darwin.go
 create mode 100644 vendor/github.com/cznic/fileutil/fileutil_freebsd.go
 create mode 100644 vendor/github.com/cznic/fileutil/fileutil_linux.go
 create mode 100644 vendor/github.com/cznic/fileutil/fileutil_openbsd.go
 create mode 100644 vendor/github.com/cznic/fileutil/fileutil_plan9.go
 create mode 100644 vendor/github.com/cznic/fileutil/fileutil_solaris.go
 create mode 100644 vendor/github.com/cznic/fileutil/fileutil_windows.go
 create mode 100644 vendor/github.com/cznic/fileutil/test_deps.go
 create mode 100644 vendor/github.com/cznic/mathutil/LICENSE
 create mode 100644 vendor/github.com/cznic/mathutil/bits.go
 create mode 100644 vendor/github.com/cznic/mathutil/envelope.go
 create mode 100644 vendor/github.com/cznic/mathutil/mathutil.go
 create mode 100644 vendor/github.com/cznic/mathutil/permute.go
 create mode 100644 vendor/github.com/cznic/mathutil/primes.go
 create mode 100644 vendor/github.com/cznic/mathutil/rat.go
 create mode 100644 vendor/github.com/cznic/mathutil/rnd.go
 create mode 100644 vendor/github.com/cznic/mathutil/tables.go
 create mode 100644 vendor/github.com/cznic/mathutil/test_deps.go
 create mode 100644 vendor/github.com/cznic/ql/LICENSE
 create mode 100644 vendor/github.com/cznic/ql/blob.go
 create mode 100644 vendor/github.com/cznic/ql/btree.go
 create mode 100644 vendor/github.com/cznic/ql/builtin.go
 create mode 100644 vendor/github.com/cznic/ql/coerce.go
 create mode 100644 vendor/github.com/cznic/ql/doc.go
 create mode 100644 vendor/github.com/cznic/ql/driver.go
 create mode 100644 vendor/github.com/cznic/ql/driver/driver.go
 create mode 100644 vendor/github.com/cznic/ql/errors.go
 create mode 100644 vendor/github.com/cznic/ql/etc.go
 create mode 100644 vendor/github.com/cznic/ql/expr.go
 create mode 100644 vendor/github.com/cznic/ql/file.go
 create mode 100644 vendor/github.com/cznic/ql/httpfs.go
 create mode 100644 vendor/github.com/cznic/ql/introspection.go
 create mode 100644 vendor/github.com/cznic/ql/mem.go
 create mode 100644 vendor/github.com/cznic/ql/parser.go
 create mode 100644 vendor/github.com/cznic/ql/plan.go
 create mode 100644 vendor/github.com/cznic/ql/ql.go
 create mode 100644 vendor/github.com/cznic/ql/scanner.go
 create mode 100644 vendor/github.com/cznic/ql/stmt.go
 create mode 100644 vendor/github.com/cznic/ql/storage.go
 create mode 100644 vendor/github.com/cznic/sortutil/LICENSE
 create mode 100644 vendor/github.com/cznic/sortutil/sortutil.go
 create mode 100644 vendor/github.com/cznic/strutil/LICENSE
 create mode 100644 vendor/github.com/cznic/strutil/strutil.go
 create mode 100644 vendor/github.com/cznic/zappy/LICENSE
 create mode 100644 vendor/github.com/cznic/zappy/decode.go
 create mode 100644 vendor/github.com/cznic/zappy/decode_cgo.go
 create mode 100644 vendor/github.com/cznic/zappy/decode_nocgo.go
 create mode 100644 vendor/github.com/cznic/zappy/encode.go
 create mode 100644 vendor/github.com/cznic/zappy/encode_cgo.go
 create mode 100644 vendor/github.com/cznic/zappy/encode_nocgo.go
 create mode 100644 vendor/github.com/cznic/zappy/zappy.go
 create mode 100644 vendor/github.com/d2g/dhcp4/LICENSE
 create mode 100644 vendor/github.com/d2g/dhcp4/constants.go
 create mode 100644 vendor/github.com/d2g/dhcp4/helpers.go
 create mode 100644 vendor/github.com/d2g/dhcp4/option.go
 create mode 100644 vendor/github.com/d2g/dhcp4/packet.go
 create mode 100644 vendor/github.com/d2g/dhcp4client/LICENSE
 create mode 100644 vendor/github.com/d2g/dhcp4client/client.go
 create mode 100644 vendor/github.com/d2g/dhcp4client/inetsock.go
 create mode 100644 vendor/github.com/d2g/dhcp4client/init.go
 create mode 100644 vendor/github.com/d2g/dhcp4client/pktsock_linux.go
 create mode 100644 vendor/github.com/docker/distribution/LICENSE
 create mode 100644 vendor/github.com/docker/distribution/blobs.go
 create mode 100644 vendor/github.com/docker/distribution/digest/digest.go
 create mode 100644 vendor/github.com/docker/distribution/digest/digester.go
 create mode 100644 vendor/github.com/docker/distribution/digest/doc.go
 create mode 100644 vendor/github.com/docker/distribution/digest/set.go
 create mode 100644 vendor/github.com/docker/distribution/digest/verifiers.go
 create mode 100644 vendor/github.com/docker/distribution/doc.go
 create mode 100644 vendor/github.com/docker/distribution/errors.go
 create mode 100644 vendor/github.com/docker/distribution/manifests.go
 create mode 100644 vendor/github.com/docker/distribution/reference/reference.go
 create mode 100644 vendor/github.com/docker/distribution/reference/regexp.go
 create mode 100644 vendor/github.com/docker/distribution/registry.go
 create mode 100644 vendor/github.com/docker/distribution/tags.go
 create mode 100644 vendor/github.com/dustin/go-humanize/LICENSE
 create mode 100644 vendor/github.com/dustin/go-humanize/big.go
 create mode 100644 vendor/github.com/dustin/go-humanize/bigbytes.go
 create mode 100644 vendor/github.com/dustin/go-humanize/bytes.go
 create mode 100644 vendor/github.com/dustin/go-humanize/comma.go
 create mode 100644 vendor/github.com/dustin/go-humanize/ftoa.go
 create mode 100644 vendor/github.com/dustin/go-humanize/humanize.go
 create mode 100644 vendor/github.com/dustin/go-humanize/number.go
 create mode 100644 vendor/github.com/dustin/go-humanize/ordinals.go
 create mode 100644 vendor/github.com/dustin/go-humanize/si.go
 create mode 100644 vendor/github.com/dustin/go-humanize/times.go
 create mode 100644 vendor/github.com/go-ini/ini/LICENSE
 create mode 100644 vendor/github.com/go-ini/ini/ini.go
 create mode 100644 vendor/github.com/go-ini/ini/key.go
 create mode 100644 vendor/github.com/go-ini/ini/parser.go
 create mode 100644 vendor/github.com/go-ini/ini/section.go
 create mode 100644 vendor/github.com/go-ini/ini/struct.go
 create mode 100644 vendor/github.com/go-ole/go-ole/com.go
 create mode 100644 vendor/github.com/go-ole/go-ole/com_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/connect.go
 create mode 100644 vendor/github.com/go-ole/go-ole/constants.go
 create mode 100644 vendor/github.com/go-ole/go-ole/error.go
 create mode 100644 vendor/github.com/go-ole/go-ole/error_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/error_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/guid.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iconnectionpoint.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iconnectionpoint_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iconnectionpoint_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iconnectionpointcontainer.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/idispatch.go
 create mode 100644 vendor/github.com/go-ole/go-ole/idispatch_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/idispatch_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/ienumvariant.go
 create mode 100644 vendor/github.com/go-ole/go-ole/ienumvariant_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/ienumvariant_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iinspectable.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iinspectable_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iinspectable_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iprovideclassinfo.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iprovideclassinfo_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iprovideclassinfo_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/itypeinfo.go
 create mode 100644 vendor/github.com/go-ole/go-ole/itypeinfo_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/itypeinfo_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iunknown.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iunknown_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/iunknown_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/ole.go
 create mode 100644 vendor/github.com/go-ole/go-ole/oleutil/connection.go
 create mode 100644 vendor/github.com/go-ole/go-ole/oleutil/connection_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/oleutil/connection_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/oleutil/go-get.go
 create mode 100644 vendor/github.com/go-ole/go-ole/oleutil/oleutil.go
 create mode 100644 vendor/github.com/go-ole/go-ole/safearray.go
 create mode 100644 vendor/github.com/go-ole/go-ole/safearray_func.go
 create mode 100644 vendor/github.com/go-ole/go-ole/safearray_windows.go
 create mode 100644 vendor/github.com/go-ole/go-ole/safearrayconversion.go
 create mode 100644 vendor/github.com/go-ole/go-ole/safearrayslices.go
 create mode 100644 vendor/github.com/go-ole/go-ole/utility.go
 create mode 100644 vendor/github.com/go-ole/go-ole/variables.go
 create mode 100644 vendor/github.com/go-ole/go-ole/variant.go
 create mode 100644 vendor/github.com/go-ole/go-ole/variant_386.go
 create mode 100644 vendor/github.com/go-ole/go-ole/variant_amd64.go
 create mode 100644 vendor/github.com/go-ole/go-ole/vt_string.go
 create mode 100644 vendor/github.com/go-ole/go-ole/winrt.go
 create mode 100644 vendor/github.com/go-ole/go-ole/winrt_doc.go
 create mode 100644 vendor/github.com/godbus/dbus/LICENSE
 create mode 100644 vendor/github.com/godbus/dbus/auth.go
 create mode 100644 vendor/github.com/godbus/dbus/auth_external.go
 create mode 100644 vendor/github.com/godbus/dbus/auth_sha1.go
 create mode 100644 vendor/github.com/godbus/dbus/call.go
 create mode 100644 vendor/github.com/godbus/dbus/conn.go
 create mode 100644 vendor/github.com/godbus/dbus/conn_darwin.go
 create mode 100644 vendor/github.com/godbus/dbus/conn_other.go
 create mode 100644 vendor/github.com/godbus/dbus/dbus.go
 create mode 100644 vendor/github.com/godbus/dbus/decoder.go
 create mode 100644 vendor/github.com/godbus/dbus/doc.go
 create mode 100644 vendor/github.com/godbus/dbus/encoder.go
 create mode 100644 vendor/github.com/godbus/dbus/export.go
 create mode 100644 vendor/github.com/godbus/dbus/homedir.go
 create mode 100644 vendor/github.com/godbus/dbus/homedir_dynamic.go
 create mode 100644 vendor/github.com/godbus/dbus/homedir_static.go
 create mode 100644 vendor/github.com/godbus/dbus/introspect/call.go
 create mode 100644 vendor/github.com/godbus/dbus/introspect/introspect.go
 create mode 100644 vendor/github.com/godbus/dbus/introspect/introspectable.go
 create mode 100644 vendor/github.com/godbus/dbus/message.go
 create mode 100644 vendor/github.com/godbus/dbus/object.go
 create mode 100644 vendor/github.com/godbus/dbus/sig.go
 create mode 100644 vendor/github.com/godbus/dbus/transport_darwin.go
 create mode 100644 vendor/github.com/godbus/dbus/transport_generic.go
 create mode 100644 vendor/github.com/godbus/dbus/transport_unix.go
 create mode 100644 vendor/github.com/godbus/dbus/transport_unixcred_dragonfly.go
 create mode 100644 vendor/github.com/godbus/dbus/transport_unixcred_linux.go
 create mode 100644 vendor/github.com/godbus/dbus/variant.go
 create mode 100644 vendor/github.com/godbus/dbus/variant_lexer.go
 create mode 100644 vendor/github.com/godbus/dbus/variant_parser.go
 create mode 100644 vendor/github.com/gogo/protobuf/LICENSE
 create mode 100644 vendor/github.com/gogo/protobuf/proto/clone.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/decode.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/decode_gogo.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/encode.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/encode_gogo.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/equal.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/extensions.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/lib.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/lib_gogo.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/message_set.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/pointer_reflect.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/properties.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/properties_gogo.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/skip_gogo.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/text.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/text_gogo.go
 create mode 100644 vendor/github.com/gogo/protobuf/proto/text_parser.go
 create mode 100644 vendor/github.com/golang/protobuf/LICENSE
 create mode 100644 vendor/github.com/golang/protobuf/proto/clone.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/decode.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/encode.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/equal.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/extensions.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/lib.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/message_set.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/pointer_reflect.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/properties.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/text.go
 create mode 100644 vendor/github.com/golang/protobuf/proto/text_parser.go
 create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
 create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/doc.go
 create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
 create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
 create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
 create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/main.go
 create mode 100644 vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
 create mode 100644 vendor/github.com/google/btree/LICENSE
 create mode 100644 vendor/github.com/google/btree/btree.go
 create mode 100644 vendor/github.com/google/btree/btree_mem.go
 create mode 100644 vendor/github.com/gorilla/context/LICENSE
 create mode 100644 vendor/github.com/gorilla/context/context.go
 create mode 100644 vendor/github.com/gorilla/context/doc.go
 create mode 100644 vendor/github.com/gorilla/mux/LICENSE
 create mode 100644 vendor/github.com/gorilla/mux/doc.go
 create mode 100644 vendor/github.com/gorilla/mux/mux.go
 create mode 100644 vendor/github.com/gorilla/mux/regexp.go
 create mode 100644 vendor/github.com/gorilla/mux/route.go
 create mode 100644 vendor/github.com/hashicorp/errwrap/LICENSE
 create mode 100644 vendor/github.com/hashicorp/errwrap/errwrap.go
 create mode 100644 vendor/github.com/hydrogen18/stoppableListener/LICENSE
 create mode 100644 vendor/github.com/hydrogen18/stoppableListener/listener.go
 create mode 100644 vendor/github.com/inconshreveable/mousetrap/LICENSE
 create mode 100644 vendor/github.com/inconshreveable/mousetrap/trap_others.go
 create mode 100644 vendor/github.com/inconshreveable/mousetrap/trap_windows.go
 create mode 100644 vendor/github.com/inconshreveable/mousetrap/trap_windows_1.4.go
 create mode 100644 vendor/github.com/jmespath/go-jmespath/LICENSE
 create mode 100644 vendor/github.com/jmespath/go-jmespath/api.go
 create mode 100644 vendor/github.com/jmespath/go-jmespath/astnodetype_string.go
 create mode 100644 vendor/github.com/jmespath/go-jmespath/functions.go
 create mode 100644 vendor/github.com/jmespath/go-jmespath/interpreter.go
 create mode 100644 vendor/github.com/jmespath/go-jmespath/lexer.go
 create mode 100644 vendor/github.com/jmespath/go-jmespath/parser.go
 create mode 100644 vendor/github.com/jmespath/go-jmespath/toktype_string.go
 create mode 100644 vendor/github.com/jmespath/go-jmespath/util.go
 create mode 100644 vendor/github.com/kballard/go-shellquote/LICENSE
 create mode 100644 vendor/github.com/kballard/go-shellquote/doc.go
 create mode 100644 vendor/github.com/kballard/go-shellquote/quote.go
 create mode 100644 vendor/github.com/kballard/go-shellquote/unquote.go
 create mode 100644 vendor/github.com/klauspost/compress/LICENSE
 create mode 100644 vendor/github.com/klauspost/compress/flate/copy.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/crc32_amd64.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/crc32_amd64.s
 create mode 100644 vendor/github.com/klauspost/compress/flate/crc32_noasm.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/deflate.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/fixedhuff.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/gen.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/huffman_bit_writer.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/huffman_code.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/inflate.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/reverse_bits.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/snappy.go
 create mode 100644 vendor/github.com/klauspost/compress/flate/token.go
 create mode 100644 vendor/github.com/klauspost/cpuid/LICENSE
 create mode 100644 vendor/github.com/klauspost/cpuid/cpuid.go
 create mode 100644 vendor/github.com/klauspost/cpuid/cpuid_386.s
 create mode 100644 vendor/github.com/klauspost/cpuid/cpuid_amd64.s
 create mode 100644 vendor/github.com/klauspost/cpuid/detect_intel.go
 create mode 100644 vendor/github.com/klauspost/cpuid/detect_ref.go
 create mode 100644 vendor/github.com/klauspost/cpuid/generate.go
 create mode 100644 vendor/github.com/klauspost/cpuid/private-gen.go
 create mode 100644 vendor/github.com/klauspost/crc32/LICENSE
 create mode 100644 vendor/github.com/klauspost/crc32/crc32.go
 create mode 100644 vendor/github.com/klauspost/crc32/crc32_amd64.go
 create mode 100644 vendor/github.com/klauspost/crc32/crc32_amd64.s
 create mode 100644 vendor/github.com/klauspost/crc32/crc32_amd64p32.go
 create mode 100644 vendor/github.com/klauspost/crc32/crc32_amd64p32.s
 create mode 100644 vendor/github.com/klauspost/crc32/crc32_generic.go
 create mode 100644 vendor/github.com/klauspost/pgzip/LICENSE
 create mode 100644 vendor/github.com/klauspost/pgzip/gunzip.go
 create mode 100644 vendor/github.com/klauspost/pgzip/gzip.go
 create mode 100644 vendor/github.com/kr/pty/License
 create mode 100644 vendor/github.com/kr/pty/doc.go
 create mode 100644 vendor/github.com/kr/pty/ioctl.go
 create mode 100644 vendor/github.com/kr/pty/ioctl_bsd.go
 create mode 100644 vendor/github.com/kr/pty/pty_darwin.go
 create mode 100644 vendor/github.com/kr/pty/pty_freebsd.go
 create mode 100644 vendor/github.com/kr/pty/pty_linux.go
 create mode 100644 vendor/github.com/kr/pty/pty_unsupported.go
 create mode 100644 vendor/github.com/kr/pty/run.go
 create mode 100644 vendor/github.com/kr/pty/types.go
 create mode 100644 vendor/github.com/kr/pty/types_freebsd.go
 create mode 100644 vendor/github.com/kr/pty/util.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_386.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_amd64.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_arm.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_arm64.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_freebsd_386.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_freebsd_amd64.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_freebsd_arm.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_ppc64.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_ppc64le.go
 create mode 100644 vendor/github.com/kr/pty/ztypes_s390x.go
 create mode 100644 vendor/github.com/pborman/uuid/LICENSE
 create mode 100755 vendor/github.com/pborman/uuid/dce.go
 create mode 100755 vendor/github.com/pborman/uuid/doc.go
 create mode 100644 vendor/github.com/pborman/uuid/hash.go
 create mode 100644 vendor/github.com/pborman/uuid/json.go
 create mode 100755 vendor/github.com/pborman/uuid/node.go
 create mode 100644 vendor/github.com/pborman/uuid/sql.go
 create mode 100755 vendor/github.com/pborman/uuid/time.go
 create mode 100644 vendor/github.com/pborman/uuid/util.go
 create mode 100755 vendor/github.com/pborman/uuid/uuid.go
 create mode 100644 vendor/github.com/pborman/uuid/version1.go
 create mode 100644 vendor/github.com/pborman/uuid/version4.go
 create mode 100644 vendor/github.com/peterbourgon/diskv/LICENSE
 create mode 100644 vendor/github.com/peterbourgon/diskv/compression.go
 create mode 100644 vendor/github.com/peterbourgon/diskv/diskv.go
 create mode 100644 vendor/github.com/peterbourgon/diskv/index.go
 create mode 100644 vendor/github.com/russross/blackfriday/LICENSE.txt
 create mode 100644 vendor/github.com/russross/blackfriday/block.go
 create mode 100644 vendor/github.com/russross/blackfriday/html.go
 create mode 100644 vendor/github.com/russross/blackfriday/inline.go
 create mode 100644 vendor/github.com/russross/blackfriday/latex.go
 create mode 100644 vendor/github.com/russross/blackfriday/markdown.go
 create mode 100644 vendor/github.com/russross/blackfriday/smartypants.go
 create mode 100644 vendor/github.com/shirou/gopsutil/LICENSE
 create mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu.go
 create mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
 create mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
 create mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
 create mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
 create mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
 create mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go
 create mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go
 create mode 100644 vendor/github.com/shirou/gopsutil/doc.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_darwin.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_darwin_amd64.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_freebsd.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_386.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_amd64.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_arm.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_windows.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/types_darwin.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/types_freebsd.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/types_linux.go
 create mode 100644 vendor/github.com/shirou/gopsutil/internal/common/binary.go
 create mode 100644 vendor/github.com/shirou/gopsutil/internal/common/common.go
 create mode 100644 vendor/github.com/shirou/gopsutil/internal/common/common_darwin.go
 create mode 100644 vendor/github.com/shirou/gopsutil/internal/common/common_freebsd.go
 create mode 100644 vendor/github.com/shirou/gopsutil/internal/common/common_linux.go
 create mode 100644 vendor/github.com/shirou/gopsutil/internal/common/common_unix.go
 create mode 100644 vendor/github.com/shirou/gopsutil/internal/common/common_windows.go
 create mode 100644 vendor/github.com/shirou/gopsutil/load/load.go
 create mode 100644 vendor/github.com/shirou/gopsutil/load/load_darwin.go
 create mode 100644 vendor/github.com/shirou/gopsutil/load/load_freebsd.go
 create mode 100644 vendor/github.com/shirou/gopsutil/load/load_linux.go
 create mode 100644 vendor/github.com/shirou/gopsutil/load/load_windows.go
 create mode 100644 vendor/github.com/shirou/gopsutil/mem/mem.go
 create mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_darwin.go
 create mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go
 create mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
 create mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go
 create mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_linux.go
 create mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_windows.go
 create mode 100644 vendor/github.com/shirou/gopsutil/net/net.go
 create mode 100644 vendor/github.com/shirou/gopsutil/net/net_darwin.go
 create mode 100644 vendor/github.com/shirou/gopsutil/net/net_freebsd.go
 create mode 100644 vendor/github.com/shirou/gopsutil/net/net_linux.go
 create mode 100644 vendor/github.com/shirou/gopsutil/net/net_unix.go
 create mode 100644 vendor/github.com/shirou/gopsutil/net/net_windows.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_darwin.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_darwin_amd64.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_freebsd.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_freebsd_386.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux_386.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux_amd64.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux_arm.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_posix.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_windows.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/types_darwin.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/types_freebsd.go
 create mode 100644 vendor/github.com/shirou/w32/LICENSE
 create mode 100644 vendor/github.com/shirou/w32/advapi32.go
 create mode 100644 vendor/github.com/shirou/w32/comctl32.go
 create mode 100644 vendor/github.com/shirou/w32/comdlg32.go
 create mode 100644 vendor/github.com/shirou/w32/constants.go
 create mode 100644 vendor/github.com/shirou/w32/dwmapi.go
 create mode 100644 vendor/github.com/shirou/w32/gdi32.go
 create mode 100644 vendor/github.com/shirou/w32/gdiplus.go
 create mode 100644 vendor/github.com/shirou/w32/idispatch.go
 create mode 100644 vendor/github.com/shirou/w32/istream.go
 create mode 100644 vendor/github.com/shirou/w32/iunknown.go
 create mode 100644 vendor/github.com/shirou/w32/kernel32.go
 create mode 100644 vendor/github.com/shirou/w32/ole32.go
 create mode 100644 vendor/github.com/shirou/w32/oleaut32.go
 create mode 100644 vendor/github.com/shirou/w32/opengl32.go
 create mode 100644 vendor/github.com/shirou/w32/psapi.go
 create mode 100644 vendor/github.com/shirou/w32/shell32.go
 create mode 100644 vendor/github.com/shirou/w32/typedef.go
 create mode 100644 vendor/github.com/shirou/w32/user32.go
 create mode 100644 vendor/github.com/shirou/w32/utils.go
 create mode 100644 vendor/github.com/shirou/w32/vars.go
 create mode 100644 vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE
 create mode 100644 vendor/github.com/shurcooL/sanitized_anchor_name/main.go
 create mode 100644 vendor/github.com/spf13/cobra/LICENSE.txt
 create mode 100644 vendor/github.com/spf13/cobra/bash_completions.go
 create mode 100644 vendor/github.com/spf13/cobra/cobra.go
 create mode 100644 vendor/github.com/spf13/cobra/command.go
 create mode 100644 vendor/github.com/spf13/cobra/command_notwin.go
 create mode 100644 vendor/github.com/spf13/cobra/command_win.go
 create mode 100644 vendor/github.com/spf13/cobra/doc/man_docs.go
 create mode 100644 vendor/github.com/spf13/cobra/doc/md_docs.go
 create mode 100644 vendor/github.com/spf13/cobra/doc/util.go
 create mode 100644 vendor/github.com/spf13/pflag/LICENSE
 create mode 100644 vendor/github.com/spf13/pflag/bool.go
 create mode 100644 vendor/github.com/spf13/pflag/count.go
 create mode 100644 vendor/github.com/spf13/pflag/duration.go
 create mode 100644 vendor/github.com/spf13/pflag/flag.go
 create mode 100644 vendor/github.com/spf13/pflag/float32.go
 create mode 100644 vendor/github.com/spf13/pflag/float64.go
 create mode 100644 vendor/github.com/spf13/pflag/golangflag.go
 create mode 100644 vendor/github.com/spf13/pflag/int.go
 create mode 100644 vendor/github.com/spf13/pflag/int32.go
 create mode 100644 vendor/github.com/spf13/pflag/int64.go
 create mode 100644 vendor/github.com/spf13/pflag/int8.go
 create mode 100644 vendor/github.com/spf13/pflag/int_slice.go
 create mode 100644 vendor/github.com/spf13/pflag/ip.go
 create mode 100644 vendor/github.com/spf13/pflag/ipmask.go
 create mode 100644 vendor/github.com/spf13/pflag/ipnet.go
 create mode 100644 vendor/github.com/spf13/pflag/string.go
 create mode 100644 vendor/github.com/spf13/pflag/string_slice.go
 create mode 100644 vendor/github.com/spf13/pflag/uint.go
 create mode 100644 vendor/github.com/spf13/pflag/uint16.go
 create mode 100644 vendor/github.com/spf13/pflag/uint32.go
 create mode 100644 vendor/github.com/spf13/pflag/uint64.go
 create mode 100644 vendor/github.com/spf13/pflag/uint8.go
 create mode 100644 vendor/github.com/syndtr/gocapability/LICENSE
 create mode 100644 vendor/github.com/syndtr/gocapability/capability/capability.go
 create mode 100644 vendor/github.com/syndtr/gocapability/capability/capability_linux.go
 create mode 100644 vendor/github.com/syndtr/gocapability/capability/capability_noop.go
 create mode 100644 vendor/github.com/syndtr/gocapability/capability/enum.go
 create mode 100644 vendor/github.com/syndtr/gocapability/capability/syscall_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/LICENSE
 create mode 100644 vendor/github.com/vishvananda/netlink/addr.go
 create mode 100644 vendor/github.com/vishvananda/netlink/addr_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/class.go
 create mode 100644 vendor/github.com/vishvananda/netlink/class_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/filter.go
 create mode 100644 vendor/github.com/vishvananda/netlink/filter_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/link.go
 create mode 100644 vendor/github.com/vishvananda/netlink/link_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/neigh.go
 create mode 100644 vendor/github.com/vishvananda/netlink/neigh_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/netlink.go
 create mode 100644 vendor/github.com/vishvananda/netlink/netlink_unspecified.go
 create mode 100644 vendor/github.com/vishvananda/netlink/nl/addr_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/nl/link_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/nl/nl_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/nl/route_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/nl/tc_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/protinfo.go
 create mode 100644 vendor/github.com/vishvananda/netlink/protinfo_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/qdisc.go
 create mode 100644 vendor/github.com/vishvananda/netlink/qdisc_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/route.go
 create mode 100644 vendor/github.com/vishvananda/netlink/route_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/xfrm.go
 create mode 100644 vendor/github.com/vishvananda/netlink/xfrm_policy.go
 create mode 100644 vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go
 create mode 100644 vendor/github.com/vishvananda/netlink/xfrm_state.go
 create mode 100644 vendor/github.com/vishvananda/netlink/xfrm_state_linux.go
 create mode 100644 vendor/go4.org/LICENSE
 create mode 100644 vendor/go4.org/errorutil/highlight.go
 create mode 100644 vendor/golang.org/x/crypto/LICENSE
 create mode 100644 vendor/golang.org/x/crypto/PATENTS
 create mode 100644 vendor/golang.org/x/crypto/cast5/cast5.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/armor/armor.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/armor/encode.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/canonical_text.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/errors/errors.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/keys.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/compressed.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/config.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/encrypted_key.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/literal.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/ocfb.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/opaque.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/packet.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/private_key.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/public_key.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/public_key_v3.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/reader.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/signature.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/signature_v3.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/userattribute.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/packet/userid.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/read.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/s2k/s2k.go
 create mode 100644 vendor/golang.org/x/crypto/openpgp/write.go
 create mode 100644 vendor/golang.org/x/crypto/ssh/terminal/terminal.go
 create mode 100644 vendor/golang.org/x/crypto/ssh/terminal/util.go
 create mode 100644 vendor/golang.org/x/crypto/ssh/terminal/util_bsd.go
 create mode 100644 vendor/golang.org/x/crypto/ssh/terminal/util_linux.go
 create mode 100644 vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
 create mode 100644 vendor/golang.org/x/net/LICENSE
 create mode 100644 vendor/golang.org/x/net/PATENTS
 create mode 100644 vendor/golang.org/x/net/context/context.go
 create mode 100644 vendor/golang.org/x/net/html/atom/atom.go
 create mode 100644 vendor/golang.org/x/net/html/atom/gen.go
 create mode 100644 vendor/golang.org/x/net/html/atom/table.go
 create mode 100644 vendor/golang.org/x/net/html/const.go
 create mode 100644 vendor/golang.org/x/net/html/doc.go
 create mode 100644 vendor/golang.org/x/net/html/doctype.go
 create mode 100644 vendor/golang.org/x/net/html/entity.go
 create mode 100644 vendor/golang.org/x/net/html/escape.go
 create mode 100644 vendor/golang.org/x/net/html/foreign.go
 create mode 100644 vendor/golang.org/x/net/html/node.go
 create mode 100644 vendor/golang.org/x/net/html/parse.go
 create mode 100644 vendor/golang.org/x/net/html/render.go
 create mode 100644 vendor/golang.org/x/net/html/token.go
 create mode 100644 vendor/golang.org/x/net/http2/client_conn_pool.go
 create mode 100644 vendor/golang.org/x/net/http2/configure_transport.go
 create mode 100644 vendor/golang.org/x/net/http2/errors.go
 create mode 100644 vendor/golang.org/x/net/http2/fixed_buffer.go
 create mode 100644 vendor/golang.org/x/net/http2/flow.go
 create mode 100644 vendor/golang.org/x/net/http2/frame.go
 create mode 100644 vendor/golang.org/x/net/http2/go15.go
 create mode 100644 vendor/golang.org/x/net/http2/gotrack.go
 create mode 100644 vendor/golang.org/x/net/http2/headermap.go
 create mode 100644 vendor/golang.org/x/net/http2/hpack/encode.go
 create mode 100644 vendor/golang.org/x/net/http2/hpack/hpack.go
 create mode 100644 vendor/golang.org/x/net/http2/hpack/huffman.go
 create mode 100644 vendor/golang.org/x/net/http2/hpack/tables.go
 create mode 100644 vendor/golang.org/x/net/http2/http2.go
 create mode 100644 vendor/golang.org/x/net/http2/not_go15.go
 create mode 100644 vendor/golang.org/x/net/http2/not_go16.go
 create mode 100644 vendor/golang.org/x/net/http2/pipe.go
 create mode 100644 vendor/golang.org/x/net/http2/server.go
 create mode 100644 vendor/golang.org/x/net/http2/transport.go
 create mode 100644 vendor/golang.org/x/net/http2/write.go
 create mode 100644 vendor/golang.org/x/net/http2/writesched.go
 create mode 100644 vendor/golang.org/x/net/internal/timeseries/timeseries.go
 create mode 100644 vendor/golang.org/x/net/trace/events.go
 create mode 100644 vendor/golang.org/x/net/trace/histogram.go
 create mode 100644 vendor/golang.org/x/net/trace/trace.go
 create mode 100644 vendor/golang.org/x/sys/LICENSE
 create mode 100644 vendor/golang.org/x/sys/PATENTS
 create mode 100644 vendor/golang.org/x/sys/unix/asm.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_darwin_386.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_darwin_amd64.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_darwin_arm.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_darwin_arm64.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_freebsd_386.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_freebsd_arm.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_linux_386.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_linux_amd64.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_linux_arm.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_linux_arm64.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_linux_s390x.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_netbsd_386.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_netbsd_arm.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_openbsd_386.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s
 create mode 100644 vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
 create mode 100644 vendor/golang.org/x/sys/unix/bluetooth_linux.go
 create mode 100644 vendor/golang.org/x/sys/unix/constants.go
 create mode 100644 vendor/golang.org/x/sys/unix/env_unix.go
 create mode 100644 vendor/golang.org/x/sys/unix/env_unset.go
 create mode 100644 vendor/golang.org/x/sys/unix/flock.go
 create mode 100644 vendor/golang.org/x/sys/unix/flock_linux_32bit.go
 create mode 100644 vendor/golang.org/x/sys/unix/gccgo.go
 create mode 100644 vendor/golang.org/x/sys/unix/gccgo_c.c
 create mode 100644 vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/mkpost.go
 create mode 100644 vendor/golang.org/x/sys/unix/race.go
 create mode 100644 vendor/golang.org/x/sys/unix/race0.go
 create mode 100644 vendor/golang.org/x/sys/unix/sockcmsg_linux.go
 create mode 100644 vendor/golang.org/x/sys/unix/sockcmsg_unix.go
 create mode 100644 vendor/golang.org/x/sys/unix/str.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_bsd.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_dragonfly.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_freebsd.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_netbsd.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_no_getwd.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_openbsd.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_solaris.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/syscall_unix.go
 create mode 100644 vendor/golang.org/x/sys/unix/types_darwin.go
 create mode 100644 vendor/golang.org/x/sys/unix/types_dragonfly.go
 create mode 100644 vendor/golang.org/x/sys/unix/types_freebsd.go
 create mode 100644 vendor/golang.org/x/sys/unix/types_linux.go
 create mode 100644 vendor/golang.org/x/sys/unix/types_netbsd.go
 create mode 100644 vendor/golang.org/x/sys/unix/types_openbsd.go
 create mode 100644 vendor/golang.org/x/sys/unix/types_solaris.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysctl_openbsd.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
 create mode 100644 vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
 create mode 100644 vendor/golang.org/x/tools/LICENSE
 create mode 100644 vendor/golang.org/x/tools/PATENTS
 create mode 100644 vendor/golang.org/x/tools/go/vcs/discovery.go
 create mode 100644 vendor/golang.org/x/tools/go/vcs/env.go
 create mode 100644 vendor/golang.org/x/tools/go/vcs/http.go
 create mode 100644 vendor/golang.org/x/tools/go/vcs/vcs.go
 create mode 100644 vendor/google.golang.org/grpc/LICENSE
 create mode 100644 vendor/google.golang.org/grpc/PATENTS
 create mode 100644 vendor/google.golang.org/grpc/call.go
 create mode 100644 vendor/google.golang.org/grpc/clientconn.go
 create mode 100644 vendor/google.golang.org/grpc/codes/code_string.go
 create mode 100644 vendor/google.golang.org/grpc/codes/codes.go
 create mode 100644 vendor/google.golang.org/grpc/credentials/credentials.go
 create mode 100644 vendor/google.golang.org/grpc/doc.go
 create mode 100644 vendor/google.golang.org/grpc/grpclog/logger.go
 create mode 100644 vendor/google.golang.org/grpc/internal/internal.go
 create mode 100644 vendor/google.golang.org/grpc/metadata/metadata.go
 create mode 100644 vendor/google.golang.org/grpc/naming/naming.go
 create mode 100644 vendor/google.golang.org/grpc/peer/peer.go
 create mode 100644 vendor/google.golang.org/grpc/picker.go
 create mode 100644 vendor/google.golang.org/grpc/rpc_util.go
 create mode 100644 vendor/google.golang.org/grpc/server.go
 create mode 100644 vendor/google.golang.org/grpc/stream.go
 create mode 100644 vendor/google.golang.org/grpc/trace.go
 create mode 100644 vendor/google.golang.org/grpc/transport/control.go
 create mode 100644 vendor/google.golang.org/grpc/transport/handler_server.go
 create mode 100644 vendor/google.golang.org/grpc/transport/http2_client.go
 create mode 100644 vendor/google.golang.org/grpc/transport/http2_server.go
 create mode 100644 vendor/google.golang.org/grpc/transport/http_util.go
 create mode 100644 vendor/google.golang.org/grpc/transport/transport.go
 create mode 100644 vendor/gopkg.in/inf.v0/LICENSE
 create mode 100644 vendor/gopkg.in/inf.v0/dec.go
 create mode 100644 vendor/gopkg.in/inf.v0/rounder.go
 create mode 100644 vendor/k8s.io/kubernetes/LICENSE
 create mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/cloner.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/converter.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/deep_equal.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/doc.go
 create mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/helper.go
 create mode 100644 vendor/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
 create mode 100644 vendor/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go

diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000000..87fe3ed55f
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,293 @@
+hash: 74fbc0c8510a051f4fa1a79b834e401dbea213c8e5e5749ec1c3a81d2256f091
+updated: 2016-06-29T10:38:03.891204025+02:00
+imports:
+- name: github.com/appc/docker2aci
+  version: 355af275fa8d48b4ecdd361a5feaf173abff81e7
+  subpackages:
+  - lib
+  - lib/common
+  - lib/internal
+  - lib/internal/backend/file
+  - lib/internal/backend/repository
+  - lib/internal/docker
+  - lib/internal/tarball
+  - lib/internal/types
+  - lib/internal/util
+  - pkg/log
+- name: github.com/appc/goaci
+  version: ba7b591f930783c0ab75f5bbfd6ff65c7bd011bf
+  subpackages:
+  - proj2aci
+- name: github.com/appc/spec
+  version: f82c741e743001237821b5e0bb9a8ebd324d3117
+  subpackages:
+  - ace
+  - aci
+  - actool
+  - discovery
+  - pkg/acirenderer
+  - pkg/device
+  - pkg/tarheader
+  - schema
+  - schema/common
+  - schema/lastditch
+  - schema/types
+- name: github.com/aws/aws-sdk-go
+  version: 13a12060f716145019378a10e2806c174356b857
+  subpackages:
+  - aws
+  - aws/awserr
+  - aws/awsutil
+  - aws/client/metadata
+  - aws/credentials
+  - aws/request
+  - private/protocol/rest
+  - private/signer/v4
+- name: github.com/camlistore/go4
+  version: 9ba773eba85ab9e258ff516630f7f6474bc4535b
+  subpackages:
+  - lock
+- name: github.com/containernetworking/cni
+  version: 5c3c17164270150467498a32c71436c7cd5501be
+  subpackages:
+  - pkg/invoke
+  - pkg/ip
+  - pkg/ipam
+  - pkg/ipam
+  - pkg/ns
+  - pkg/skel
+  - pkg/testutils
+  - pkg/skel
+  - pkg/testutils
+  - pkg/types
+  - pkg/utils
+  - pkg/utils/sysctl
+  - plugins/ipam/dhcp
+  - plugins/ipam/host-local
+  - plugins/ipam/host-local/backend
+  - plugins/ipam/host-local/backend/disk
+  - plugins/main/bridge
+  - plugins/main/ipvlan
+  - plugins/main/macvlan
+  - plugins/main/ptp
+  - plugins/meta/flannel
+  - plugins/meta/tuning
+  - pkg/utils/sysctl
+  - plugins/ipam/dhcp
+  - plugins/ipam/host-local
+  - plugins/ipam/host-local/backend
+  - plugins/ipam/host-local/backend/disk
+  - plugins/main/bridge
+  - plugins/main/ipvlan
+  - plugins/main/macvlan
+  - plugins/main/ptp
+  - plugins/meta/flannel
+  - plugins/meta/tuning
+- name: github.com/coreos/gexpect
+  version: ca42424d18c76d0d51a4cccd830d11878e9e5c17
+- name: github.com/coreos/go-iptables
+  version: fbb73372b87f6e89951c2b6b31470c2c9d5cfae3
+  subpackages:
+  - iptables
+- name: github.com/coreos/go-semver
+  version: 294930c1e79c64e7dbe360054274fdad492c8cf5
+  subpackages:
+  - semver
+- name: github.com/coreos/go-systemd
+  version: b32b8467dbea18858bfebf65c1a6a761090f2c31
+  subpackages:
+  - activation
+  - dbus
+  - sdjournal
+  - unit
+  - util
+- name: github.com/coreos/go-tspi
+  version: 03955c59fff97f9e38e7e32c68ac4db21a2aea2b
+  subpackages:
+  - tpmclient
+  - tspiconst
+  - verification
+- name: github.com/coreos/ioprogress
+  version: e7fc03058804de5488baed8df5b89f3924b9ec9a
+- name: github.com/coreos/pkg
+  version: 7f080b6c11ac2d2347c3cd7521e810207ea1a041
+  subpackages:
+  - dlopen
+  - progressutil
+- name: github.com/cpuguy83/go-md2man
+  version: 71acacd42f85e5e82f70a55327789582a5200a90
+  subpackages:
+  - md2man
+- name: github.com/cznic/b
+  version: e2e747ce049fb910cff6b1fd7ad8faf3900939d5
+- name: github.com/cznic/bufs
+  version: 3dcccbd7064a1689f9c093a988ea11ac00e21f51
+- name: github.com/cznic/exp
+  version: 36265f1914ea00990ff0b73f72350edf9b1850df
+  subpackages:
+  - lldb
+- name: github.com/cznic/fileutil
+  version: 21ae57c9dce724a15e88bd9cd46d5668f3e880a5
+- name: github.com/cznic/mathutil
+  version: 250d0b9d3304c5ea0c4cfc7d9efc7ee528b81f3b
+- name: github.com/cznic/ql
+  version: 77545ff365ff426dfab06c46d70fa77600cd55af
+  subpackages:
+  - driver
+- name: github.com/cznic/sortutil
+  version: d4401851b4c370f979b842fa1e45e0b3b718b391
+- name: github.com/cznic/strutil
+  version: 97bc31f80ac4c9fa9c5dc5fea74c383858988ea2
+- name: github.com/cznic/zappy
+  version: 47331054e4f96186e3ff772877c0443909368a45
+- name: github.com/d2g/dhcp4
+  version: f0e4d29ff0231dce36e250b2ed9ff08412584bca
+- name: github.com/d2g/dhcp4client
+  version: bed07e1bc5b85f69c6f0fd73393aa35ec68ed892
+- name: github.com/docker/distribution
+  version: 099622876197e3b24d627a72053d1bcc8968076a
+  subpackages:
+  - digest
+  - reference
+- name: github.com/dustin/go-humanize
+  version: c20a8bde38c8f5ba06f6600edf473705c96829d1
+- name: github.com/go-ini/ini
+  version: 12f418cc7edc5a618a51407b7ac1f1f512139df3
+- name: github.com/go-ole/go-ole
+  version: 572eabb84c424e76a0d39d31510dd7dfd62f70b2
+  subpackages:
+  - oleutil
+- name: github.com/godbus/dbus
+  version: a1b8ba5163b7f041b22761461eabd02b70d1f824
+  subpackages:
+  - introspect
+- name: github.com/gogo/protobuf
+  version: 4168943e65a2802828518e95310aeeed6d84c4e5
+  subpackages:
+  - proto
+- name: github.com/golang/protobuf
+  version: 2402d76f3d41f928c7902a765dfc872356dd3aad
+  subpackages:
+  - proto
+  - protoc-gen-go
+  - protoc-gen-go/descriptor
+  - protoc-gen-go/generator
+  - protoc-gen-go/internal/grpc
+  - protoc-gen-go/plugin
+- name: github.com/google/btree
+  version: f06e229e679911bb31a04e07ac891115822e37c3
+- name: github.com/gorilla/context
+  version: 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
+- name: github.com/gorilla/mux
+  version: e444e69cbd2e2e3e0749a2f3c717cec491552bbf
+- name: github.com/hashicorp/errwrap
+  version: 7554cd9344cec97297fa6649b055a8c98c2a1e55
+- name: github.com/hydrogen18/stoppableListener
+  version: 2eebd04b47ff393f4bc50b7fcacf8f048994c6fd
+- name: github.com/inconshreveable/mousetrap
+  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
+- name: github.com/jmespath/go-jmespath
+  version: 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
+- name: github.com/kballard/go-shellquote
+  version: e5c918b80c17694cbc49aab32a759f9a40067f5d
+- name: github.com/klauspost/compress
+  version: 006acde2c5d283d2f8b8aa03d8f0cd2891c680cf
+  subpackages:
+  - flate
+- name: github.com/klauspost/cpuid
+  version: 09cded8978dc9e80714c4d85b0322337b0a1e5e0
+- name: github.com/klauspost/crc32
+  version: 19b0b332c9e4516a6370a0456e6182c3b5036720
+- name: github.com/klauspost/pgzip
+  version: 95e8170c5d4da28db9c64dfc9ec3138ea4466fd4
+- name: github.com/kr/pty
+  version: f7ee69f31298ecbe5d2b349c711e2547a617d398
+- name: github.com/pborman/uuid
+  version: cccd189d45f7ac3368a0d127efb7f4d08ae0b655
+- name: github.com/peterbourgon/diskv
+  version: 937c5a91d7fb1477fa6d2bb71410b2ae7a0f2143
+- name: github.com/russross/blackfriday
+  version: 300106c228d52c8941d4b3de6054a6062a86dda3
+- name: github.com/shirou/gopsutil
+  version: e8f7a95747d711f34ddfe9dd9b825a84bd059dec
+  subpackages:
+  - cpu
+  - host
+  - internal/common
+  - load
+  - mem
+  - net
+  - process
+- name: github.com/shirou/w32
+  version: 3c9377fc6748f222729a8270fe2775d149a249ad
+- name: github.com/shurcooL/sanitized_anchor_name
+  version: 10ef21a441db47d8b13ebcc5fd2310f636973c77
+- name: github.com/spf13/cobra
+  version: 4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f
+  subpackages:
+  - doc
+- name: github.com/spf13/pflag
+  version: 08b1a584251b5b62f458943640fc8ebd4d50aaa5
+- name: github.com/StackExchange/wmi
+  version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
+- name: github.com/syndtr/gocapability
+  version: 8e4cdcb3c22b40d5e330ade0b68cb2e2a3cf6f98
+  subpackages:
+  - capability
+- name: github.com/vishvananda/netlink
+  version: ecf47fd5739b3d2c3daf7c89c4b9715a2605c21b
+  subpackages:
+  - nl
+- name: go4.org
+  version: 03efcb870d84809319ea509714dd6d19a1498483
+  subpackages:
+  - errorutil
+- name: golang.org/x/crypto
+  version: a7ead6ddf06233883deca151dffaef2effbf498f
+  subpackages:
+  - cast5
+  - openpgp
+  - openpgp/armor
+  - openpgp/elgamal
+  - openpgp/errors
+  - openpgp/packet
+  - openpgp/s2k
+  - ssh/terminal
+- name: golang.org/x/net
+  version: d513e58596cd55e6f47cd1dcbff6b46035baeccb
+  subpackages:
+  - context
+  - html
+  - html/atom
+  - http2
+  - http2/hpack
+  - internal/timeseries
+  - trace
+- name: golang.org/x/sys
+  version: b44883b474ffefa37335017174e397412b633a4f
+  subpackages:
+  - unix
+- name: golang.org/x/tools
+  version: 27e692e6ec36d8f48be794f32553e1400c70dbf2
+  subpackages:
+  - go/vcs
+- name: google.golang.org/grpc
+  version: 0f80f5b995e8332b1bdaac1bc37af0482c60147c
+  subpackages:
+  - codes
+  - credentials
+  - grpclog
+  - metadata
+  - naming
+  - peer
+  - transport
+  - internal
+- name: gopkg.in/inf.v0
+  version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
+- name: k8s.io/kubernetes
+  version: 9990f843cd62caa90445cf76b07d63ba7b5c86fd
+  subpackages:
+  - pkg/api/resource
+  - pkg/conversion
+  - third_party/forked/reflect
+devImports: []
diff --git a/vendor/github.com/StackExchange/wmi/LICENSE b/vendor/github.com/StackExchange/wmi/LICENSE
new file mode 100644
index 0000000000..ae80b67209
--- /dev/null
+++ b/vendor/github.com/StackExchange/wmi/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Stack Exchange
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/StackExchange/wmi/wmi.go b/vendor/github.com/StackExchange/wmi/wmi.go
new file mode 100644
index 0000000000..b931ca57af
--- /dev/null
+++ b/vendor/github.com/StackExchange/wmi/wmi.go
@@ -0,0 +1,416 @@
+// +build windows
+
+/*
+Package wmi provides a WQL interface for WMI on Windows.
+
+Example code to print names of running processes:
+
+	type Win32_Process struct {
+		Name string
+	}
+
+	func main() {
+		var dst []Win32_Process
+		q := wmi.CreateQuery(&dst, "")
+		err := wmi.Query(q, &dst)
+		if err != nil {
+			log.Fatal(err)
+		}
+		for i, v := range dst {
+			println(i, v.Name)
+		}
+	}
+
+*/
+package wmi
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"log"
+	"os"
+	"reflect"
+	"runtime"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/go-ole/go-ole"
+	"github.com/go-ole/go-ole/oleutil"
+)
+
+var l = log.New(os.Stdout, "", log.LstdFlags)
+
+var (
+	ErrInvalidEntityType = errors.New("wmi: invalid entity type")
+	lock                 sync.Mutex
+)
+
+// QueryNamespace invokes Query with the given namespace on the local machine.
+func QueryNamespace(query string, dst interface{}, namespace string) error {
+	return Query(query, dst, nil, namespace)
+}
+
+// Query runs the WQL query and appends the values to dst.
+//
+// dst must have type *[]S or *[]*S, for some struct type S. Fields selected in
+// the query must have the same name in dst. Supported types are all signed and
+// unsigned integers, time.Time, string, bool, or a pointer to one of those.
+// Array types are not supported.
+//
+// By default, the local machine and default namespace are used. These can be
+// changed using connectServerArgs. See
+// http://msdn.microsoft.com/en-us/library/aa393720.aspx for details.
+//
+// Query is a wrapper around DefaultClient.Query.
+func Query(query string, dst interface{}, connectServerArgs ...interface{}) error {
+	return DefaultClient.Query(query, dst, connectServerArgs...)
+}
+
+// A Client is an WMI query client.
+//
+// Its zero value (DefaultClient) is a usable client.
+type Client struct {
+	// NonePtrZero specifies if nil values for fields which aren't pointers
+	// should be returned as the field types zero value.
+	//
+	// Setting this to true allows stucts without pointer fields to be used
+	// without the risk failure should a nil value returned from WMI.
+	NonePtrZero bool
+
+	// PtrNil specifies if nil values for pointer fields should be returned
+	// as nil.
+	//
+	// Setting this to true will set pointer fields to nil where WMI
+	// returned nil, otherwise the types zero value will be returned.
+	PtrNil bool
+
+	// AllowMissingFields specifies that struct fields not present in the
+	// query result should not result in an error.
+	//
+	// Setting this to true allows custom queries to be used with full
+	// struct definitions instead of having to define multiple structs.
+	AllowMissingFields bool
+}
+
+// DefaultClient is the default Client and is used by Query, QueryNamespace
+var DefaultClient = &Client{}
+
+// Query runs the WQL query and appends the values to dst.
+//
+// dst must have type *[]S or *[]*S, for some struct type S. Fields selected in
+// the query must have the same name in dst. Supported types are all signed and
+// unsigned integers, time.Time, string, bool, or a pointer to one of those.
+// Array types are not supported.
+//
+// By default, the local machine and default namespace are used. These can be
+// changed using connectServerArgs. See
+// http://msdn.microsoft.com/en-us/library/aa393720.aspx for details.
+func (c *Client) Query(query string, dst interface{}, connectServerArgs ...interface{}) error {
+	dv := reflect.ValueOf(dst)
+	if dv.Kind() != reflect.Ptr || dv.IsNil() {
+		return ErrInvalidEntityType
+	}
+	dv = dv.Elem()
+	mat, elemType := checkMultiArg(dv)
+	if mat == multiArgTypeInvalid {
+		return ErrInvalidEntityType
+	}
+
+	lock.Lock()
+	defer lock.Unlock()
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	err := ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
+	if err != nil {
+		oleerr := err.(*ole.OleError)
+		// S_FALSE           = 0x00000001 // CoInitializeEx was already called on this thread
+		if oleerr.Code() != ole.S_OK && oleerr.Code() != 0x00000001 {
+			return err
+		}
+	} else {
+		// Only invoke CoUninitialize if the thread was not initizlied before.
+		// This will allow other go packages based on go-ole play along
+		// with this library.
+		defer ole.CoUninitialize()
+	}
+
+	unknown, err := oleutil.CreateObject("WbemScripting.SWbemLocator")
+	if err != nil {
+		return err
+	}
+	defer unknown.Release()
+
+	wmi, err := unknown.QueryInterface(ole.IID_IDispatch)
+	if err != nil {
+		return err
+	}
+	defer wmi.Release()
+
+	// service is a SWbemServices
+	serviceRaw, err := oleutil.CallMethod(wmi, "ConnectServer", connectServerArgs...)
+	if err != nil {
+		return err
+	}
+	service := serviceRaw.ToIDispatch()
+	defer serviceRaw.Clear()
+
+	// result is a SWBemObjectSet
+	resultRaw, err := oleutil.CallMethod(service, "ExecQuery", query)
+	if err != nil {
+		return err
+	}
+	result := resultRaw.ToIDispatch()
+	defer resultRaw.Clear()
+
+	count, err := oleInt64(result, "Count")
+	if err != nil {
+		return err
+	}
+
+	// Initialize a slice with Count capacity
+	dv.Set(reflect.MakeSlice(dv.Type(), 0, int(count)))
+
+	var errFieldMismatch error
+	for i := int64(0); i < count; i++ {
+		err := func() error {
+			// item is a SWbemObject, but really a Win32_Process
+			itemRaw, err := oleutil.CallMethod(result, "ItemIndex", i)
+			if err != nil {
+				return err
+			}
+			item := itemRaw.ToIDispatch()
+			defer itemRaw.Clear()
+
+			ev := reflect.New(elemType)
+			if err = c.loadEntity(ev.Interface(), item); err != nil {
+				if _, ok := err.(*ErrFieldMismatch); ok {
+					// We continue loading entities even in the face of field mismatch errors.
+					// If we encounter any other error, that other error is returned. Otherwise,
+					// an ErrFieldMismatch is returned.
+					errFieldMismatch = err
+				} else {
+					return err
+				}
+			}
+			if mat != multiArgTypeStructPtr {
+				ev = ev.Elem()
+			}
+			dv.Set(reflect.Append(dv, ev))
+			return nil
+		}()
+		if err != nil {
+			return err
+		}
+	}
+	return errFieldMismatch
+}
+
+// ErrFieldMismatch is returned when a field is to be loaded into a different
+// type than the one it was stored from, or when a field is missing or
+// unexported in the destination struct.
+// StructType is the type of the struct pointed to by the destination argument.
+type ErrFieldMismatch struct {
+	StructType reflect.Type
+	FieldName  string
+	Reason     string
+}
+
+func (e *ErrFieldMismatch) Error() string {
+	return fmt.Sprintf("wmi: cannot load field %q into a %q: %s",
+		e.FieldName, e.StructType, e.Reason)
+}
+
+var timeType = reflect.TypeOf(time.Time{})
+
+// loadEntity loads a SWbemObject into a struct pointer.
+func (c *Client) loadEntity(dst interface{}, src *ole.IDispatch) (errFieldMismatch error) {
+	v := reflect.ValueOf(dst).Elem()
+	for i := 0; i < v.NumField(); i++ {
+		f := v.Field(i)
+		of := f
+		isPtr := f.Kind() == reflect.Ptr
+		if isPtr {
+			ptr := reflect.New(f.Type().Elem())
+			f.Set(ptr)
+			f = f.Elem()
+		}
+		n := v.Type().Field(i).Name
+		if !f.CanSet() {
+			return &ErrFieldMismatch{
+				StructType: of.Type(),
+				FieldName:  n,
+				Reason:     "CanSet() is false",
+			}
+		}
+		prop, err := oleutil.GetProperty(src, n)
+		if err != nil {
+			if !c.AllowMissingFields {
+				errFieldMismatch = &ErrFieldMismatch{
+					StructType: of.Type(),
+					FieldName:  n,
+					Reason:     "no such struct field",
+				}
+			}
+			continue
+		}
+		defer prop.Clear()
+
+		switch val := prop.Value().(type) {
+		case int8, int16, int32, int64, int:
+			v := reflect.ValueOf(val).Int()
+			switch f.Kind() {
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				f.SetInt(v)
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+				f.SetUint(uint64(v))
+			default:
+				return &ErrFieldMismatch{
+					StructType: of.Type(),
+					FieldName:  n,
+					Reason:     "not an integer class",
+				}
+			}
+		case uint8, uint16, uint32, uint64:
+			v := reflect.ValueOf(val).Uint()
+			switch f.Kind() {
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				f.SetInt(int64(v))
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+				f.SetUint(v)
+			default:
+				return &ErrFieldMismatch{
+					StructType: of.Type(),
+					FieldName:  n,
+					Reason:     "not an integer class",
+				}
+			}
+		case string:
+			switch f.Kind() {
+			case reflect.String:
+				f.SetString(val)
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				iv, err := strconv.ParseInt(val, 10, 64)
+				if err != nil {
+					return err
+				}
+				f.SetInt(iv)
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+				uv, err := strconv.ParseUint(val, 10, 64)
+				if err != nil {
+					return err
+				}
+				f.SetUint(uv)
+			case reflect.Struct:
+				switch f.Type() {
+				case timeType:
+					if len(val) == 25 {
+						mins, err := strconv.Atoi(val[22:])
+						if err != nil {
+							return err
+						}
+						val = val[:22] + fmt.Sprintf("%02d%02d", mins/60, mins%60)
+					}
+					t, err := time.Parse("20060102150405.000000-0700", val)
+					if err != nil {
+						return err
+					}
+					f.Set(reflect.ValueOf(t))
+				}
+			}
+		case bool:
+			switch f.Kind() {
+			case reflect.Bool:
+				f.SetBool(val)
+			default:
+				return &ErrFieldMismatch{
+					StructType: of.Type(),
+					FieldName:  n,
+					Reason:     "not a bool",
+				}
+			}
+		default:
+			typeof := reflect.TypeOf(val)
+			if typeof == nil && (isPtr || c.NonePtrZero) {
+				if (isPtr && c.PtrNil) || (!isPtr && c.NonePtrZero) {
+					of.Set(reflect.Zero(of.Type()))
+				}
+				break
+			}
+			return &ErrFieldMismatch{
+				StructType: of.Type(),
+				FieldName:  n,
+				Reason:     fmt.Sprintf("unsupported type (%T)", val),
+			}
+		}
+	}
+	return errFieldMismatch
+}
+
+type multiArgType int
+
+const (
+	multiArgTypeInvalid multiArgType = iota
+	multiArgTypeStruct
+	multiArgTypeStructPtr
+)
+
+// checkMultiArg checks that v has type []S, []*S for some struct type S.
+//
+// It returns what category the slice's elements are, and the reflect.Type
+// that represents S.
+func checkMultiArg(v reflect.Value) (m multiArgType, elemType reflect.Type) {
+	if v.Kind() != reflect.Slice {
+		return multiArgTypeInvalid, nil
+	}
+	elemType = v.Type().Elem()
+	switch elemType.Kind() {
+	case reflect.Struct:
+		return multiArgTypeStruct, elemType
+	case reflect.Ptr:
+		elemType = elemType.Elem()
+		if elemType.Kind() == reflect.Struct {
+			return multiArgTypeStructPtr, elemType
+		}
+	}
+	return multiArgTypeInvalid, nil
+}
+
+func oleInt64(item *ole.IDispatch, prop string) (int64, error) {
+	v, err := oleutil.GetProperty(item, prop)
+	if err != nil {
+		return 0, err
+	}
+	defer v.Clear()
+
+	i := int64(v.Val)
+	return i, nil
+}
+
+// CreateQuery returns a WQL query string that queries all columns of src. where
+// is an optional string that is appended to the query, to be used with WHERE
+// clauses. In such a case, the "WHERE" string should appear at the beginning.
+func CreateQuery(src interface{}, where string) string {
+	var b bytes.Buffer
+	b.WriteString("SELECT ")
+	s := reflect.Indirect(reflect.ValueOf(src))
+	t := s.Type()
+	if s.Kind() == reflect.Slice {
+		t = t.Elem()
+	}
+	if t.Kind() != reflect.Struct {
+		return ""
+	}
+	var fields []string
+	for i := 0; i < t.NumField(); i++ {
+		fields = append(fields, t.Field(i).Name)
+	}
+	b.WriteString(strings.Join(fields, ", "))
+	b.WriteString(" FROM ")
+	b.WriteString(t.Name())
+	b.WriteString(" " + where)
+	return b.String()
+}
diff --git a/vendor/github.com/appc/docker2aci/LICENSE b/vendor/github.com/appc/docker2aci/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/appc/docker2aci/lib/common/common.go b/vendor/github.com/appc/docker2aci/lib/common/common.go
new file mode 100644
index 0000000000..5fd1d46050
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/common/common.go
@@ -0,0 +1,62 @@
+// Copyright 2016 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package common provides misc types and variables.
+package common
+
+import (
+	"github.com/appc/docker2aci/lib/internal/docker"
+	"github.com/appc/docker2aci/lib/internal/types"
+)
+
+type Compression int
+
+const (
+	NoCompression = iota
+	GzipCompression
+)
+
+type ParsedDockerURL types.ParsedDockerURL
+
+const (
+	AppcDockerRegistryURL   = "appc.io/docker/registryurl"
+	AppcDockerRepository    = "appc.io/docker/repository"
+	AppcDockerTag           = "appc.io/docker/tag"
+	AppcDockerImageID       = "appc.io/docker/imageid"
+	AppcDockerParentImageID = "appc.io/docker/parentimageid"
+	AppcDockerEntrypoint    = "appc.io/docker/entrypoint"
+	AppcDockerCmd           = "appc.io/docker/cmd"
+)
+
+type ErrSeveralImages struct {
+	Msg    string
+	Images []string
+}
+
+// InsecureConfig represents the different insecure options available
+type InsecureConfig struct {
+	SkipVerify bool
+	AllowHTTP  bool
+}
+
+func (e *ErrSeveralImages) Error() string {
+	return e.Msg
+}
+
+// ParseDockerURL takes a Docker URL and returns a ParsedDockerURL with its
+// index URL, image name, and tag.
+func ParseDockerURL(arg string) (*ParsedDockerURL, error) {
+	p, err := docker.ParseDockerURL(arg)
+	return (*ParsedDockerURL)(p), err
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/conversion_store.go b/vendor/github.com/appc/docker2aci/lib/conversion_store.go
new file mode 100644
index 0000000000..4944f1386a
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/conversion_store.go
@@ -0,0 +1,126 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package docker2aci
+
+import (
+	"crypto/sha512"
+	"fmt"
+	"hash"
+	"io"
+	"io/ioutil"
+	"os"
+
+	"github.com/appc/spec/aci"
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+const (
+	hashPrefix = "sha512-"
+)
+
+type aciInfo struct {
+	path          string
+	key           string
+	ImageManifest *schema.ImageManifest
+}
+
+// conversionStore is an simple implementation of the acirenderer.ACIRegistry
+// interface. It stores the Docker layers converted to ACI so we can take
+// advantage of acirenderer to generate a squashed ACI Image.
+type conversionStore struct {
+	acis map[string]*aciInfo
+}
+
+func newConversionStore() *conversionStore {
+	return &conversionStore{acis: make(map[string]*aciInfo)}
+}
+
+func (ms *conversionStore) WriteACI(path string) (string, error) {
+	f, err := os.Open(path)
+	if err != nil {
+		return "", err
+	}
+	defer f.Close()
+
+	cr, err := aci.NewCompressedReader(f)
+	if err != nil {
+		return "", err
+	}
+	defer cr.Close()
+
+	h := sha512.New()
+	r := io.TeeReader(cr, h)
+
+	// read the file so we can get the hash
+	if _, err := io.Copy(ioutil.Discard, r); err != nil {
+		return "", fmt.Errorf("error reading ACI: %v", err)
+	}
+
+	im, err := aci.ManifestFromImage(f)
+	if err != nil {
+		return "", err
+	}
+
+	key := ms.HashToKey(h)
+	ms.acis[key] = &aciInfo{path: path, key: key, ImageManifest: im}
+	return key, nil
+}
+
+func (ms *conversionStore) GetImageManifest(key string) (*schema.ImageManifest, error) {
+	aci, ok := ms.acis[key]
+	if !ok {
+		return nil, fmt.Errorf("aci with key: %s not found", key)
+	}
+	return aci.ImageManifest, nil
+}
+
+func (ms *conversionStore) GetACI(name types.ACIdentifier, labels types.Labels) (string, error) {
+	for _, aci := range ms.acis {
+		// we implement this function to comply with the interface so don't
+		// bother implementing a proper label check
+		if aci.ImageManifest.Name.String() == name.String() {
+			return aci.key, nil
+		}
+	}
+	return "", fmt.Errorf("aci not found")
+}
+
+func (ms *conversionStore) ReadStream(key string) (io.ReadCloser, error) {
+	img, ok := ms.acis[key]
+	if !ok {
+		return nil, fmt.Errorf("stream for key: %s not found", key)
+	}
+	f, err := os.Open(img.path)
+	if err != nil {
+		return nil, fmt.Errorf("error opening aci: %s", img.path)
+	}
+
+	tr, err := aci.NewCompressedReader(f)
+	if err != nil {
+		return nil, err
+	}
+
+	return tr, nil
+}
+
+func (ms *conversionStore) ResolveKey(key string) (string, error) {
+	return key, nil
+}
+
+func (ms *conversionStore) HashToKey(h hash.Hash) string {
+	s := h.Sum(nil)
+	return fmt.Sprintf("%s%x", hashPrefix, s)
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/docker2aci.go b/vendor/github.com/appc/docker2aci/lib/docker2aci.go
new file mode 100644
index 0000000000..4cb0ecc9aa
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/docker2aci.go
@@ -0,0 +1,417 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package docker2aci implements a simple library for converting docker images to
+// App Container Images (ACIs).
+package docker2aci
+
+import (
+	"archive/tar"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/appc/docker2aci/lib/common"
+	"github.com/appc/docker2aci/lib/internal"
+	"github.com/appc/docker2aci/lib/internal/backend/file"
+	"github.com/appc/docker2aci/lib/internal/backend/repository"
+	"github.com/appc/docker2aci/lib/internal/docker"
+	"github.com/appc/docker2aci/lib/internal/tarball"
+	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/util"
+	"github.com/appc/docker2aci/pkg/log"
+	"github.com/appc/spec/pkg/acirenderer"
+	"github.com/appc/spec/schema"
+	appctypes "github.com/appc/spec/schema/types"
+	gzip "github.com/klauspost/pgzip"
+)
+
+// CommonConfig represents the shared configuration options for converting
+// Docker images.
+type CommonConfig struct {
+	Squash      bool               // squash the layers in one file
+	OutputDir   string             // where to put the resulting ACI
+	TmpDir      string             // directory to use for temporary files
+	Compression common.Compression // which compression to use for the resulting file(s)
+}
+
+// RemoteConfig represents the remote repository specific configuration for
+// converting Docker images.
+type RemoteConfig struct {
+	CommonConfig
+	Username string                // username to use if the image to convert needs authentication
+	Password string                // password to use if the image to convert needs authentication
+	Insecure common.InsecureConfig // Insecure options
+}
+
+// FileConfig represents the saved file specific configuration for converting
+// Docker images.
+type FileConfig struct {
+	CommonConfig
+	DockerURL string // select an image if there are several images/tags in the file, Syntax: "{docker registry URL}/{image name}:{tag}"
+}
+
+// ConvertRemoteRepo generates ACI images from docker registry URLs.  It takes
+// as input a dockerURL of the form:
+//
+//     {registry URL}/{repository}:{reference[tag|digest]}
+//
+// It then gets all the layers of the requested image and converts each of
+// them to ACI.
+// It returns the list of generated ACI paths.
+func ConvertRemoteRepo(dockerURL string, config RemoteConfig) ([]string, error) {
+	repositoryBackend := repository.NewRepositoryBackend(config.Username, config.Password, config.Insecure)
+	return convertReal(repositoryBackend, dockerURL, config.Squash, config.OutputDir, config.TmpDir, config.Compression)
+}
+
+// ConvertSavedFile generates ACI images from a file generated with "docker
+// save".  If there are several images/tags in the file, a particular image can
+// be chosen via FileConfig.DockerURL.
+//
+// It returns the list of generated ACI paths.
+func ConvertSavedFile(dockerSavedFile string, config FileConfig) ([]string, error) {
+	f, err := os.Open(dockerSavedFile)
+	if err != nil {
+		return nil, fmt.Errorf("error opening file: %v", err)
+	}
+	defer f.Close()
+
+	fileBackend := file.NewFileBackend(f)
+	return convertReal(fileBackend, config.DockerURL, config.Squash, config.OutputDir, config.TmpDir, config.Compression)
+}
+
+// GetIndexName returns the docker index server from a docker URL.
+func GetIndexName(dockerURL string) string {
+	index, _ := docker.SplitReposName(dockerURL)
+	return index
+}
+
+// GetDockercfgAuth reads a ~/.dockercfg file and returns the username and password
+// of the given docker index server.
+func GetDockercfgAuth(indexServer string) (string, string, error) {
+	return docker.GetAuthInfo(indexServer)
+}
+
+func convertReal(backend internal.Docker2ACIBackend, dockerURL string, squash bool, outputDir string, tmpDir string, compression common.Compression) ([]string, error) {
+	log.Debug("Getting image info...")
+	ancestry, parsedDockerURL, err := backend.GetImageInfo(dockerURL)
+	if err != nil {
+		return nil, err
+	}
+
+	layersOutputDir := outputDir
+	if squash {
+		layersOutputDir, err = ioutil.TempDir(tmpDir, "docker2aci-")
+		if err != nil {
+			return nil, fmt.Errorf("error creating dir: %v", err)
+		}
+		defer os.RemoveAll(layersOutputDir)
+	}
+
+	conversionStore := newConversionStore()
+
+	// only compress individual layers if we're not squashing
+	layerCompression := compression
+	if squash {
+		layerCompression = common.NoCompression
+	}
+
+	aciLayerPaths, aciManifests, err := backend.BuildACI(ancestry, parsedDockerURL, layersOutputDir, tmpDir, layerCompression)
+	if err != nil {
+		return nil, err
+	}
+
+	var images acirenderer.Images
+	for i, aciLayerPath := range aciLayerPaths {
+		key, err := conversionStore.WriteACI(aciLayerPath)
+		if err != nil {
+			return nil, fmt.Errorf("error inserting in the conversion store: %v", err)
+		}
+
+		images = append(images, acirenderer.Image{Im: aciManifests[i], Key: key, Level: uint16(len(aciLayerPaths) - 1 - i)})
+	}
+
+	// acirenderer expects images in order from upper to base layer
+	images = util.ReverseImages(images)
+	if squash {
+		squashedImagePath, err := squashLayers(images, conversionStore, *parsedDockerURL, outputDir, compression)
+		if err != nil {
+			return nil, fmt.Errorf("error squashing image: %v", err)
+		}
+		aciLayerPaths = []string{squashedImagePath}
+	}
+
+	return aciLayerPaths, nil
+}
+
+// squashLayers receives a list of ACI layer file names ordered from base image
+// to application image and squashes them into one ACI
+func squashLayers(images []acirenderer.Image, aciRegistry acirenderer.ACIRegistry, parsedDockerURL types.ParsedDockerURL, outputDir string, compression common.Compression) (path string, err error) {
+	log.Debug("Squashing layers...")
+	log.Debug("Rendering ACI...")
+	renderedACI, err := acirenderer.GetRenderedACIFromList(images, aciRegistry)
+	if err != nil {
+		return "", fmt.Errorf("error rendering squashed image: %v", err)
+	}
+	manifests, err := getManifests(renderedACI, aciRegistry)
+	if err != nil {
+		return "", fmt.Errorf("error getting manifests: %v", err)
+	}
+
+	squashedFilename := getSquashedFilename(parsedDockerURL)
+	squashedImagePath := filepath.Join(outputDir, squashedFilename)
+
+	squashedTempFile, err := ioutil.TempFile(outputDir, "docker2aci-squashedFile-")
+	if err != nil {
+		return "", err
+	}
+	defer func() {
+		if err == nil {
+			err = squashedTempFile.Close()
+		} else {
+			// remove temp file on error
+			// we ignore its error to not mask the real error
+			os.Remove(squashedTempFile.Name())
+		}
+	}()
+
+	log.Debug("Writing squashed ACI...")
+	if err := writeSquashedImage(squashedTempFile, renderedACI, aciRegistry, manifests, compression); err != nil {
+		return "", fmt.Errorf("error writing squashed image: %v", err)
+	}
+
+	log.Debug("Validating squashed ACI...")
+	if err := internal.ValidateACI(squashedTempFile.Name()); err != nil {
+		return "", fmt.Errorf("error validating image: %v", err)
+	}
+
+	if err := os.Rename(squashedTempFile.Name(), squashedImagePath); err != nil {
+		return "", err
+	}
+
+	log.Debug("ACI squashed!")
+	return squashedImagePath, nil
+}
+
+func getSquashedFilename(parsedDockerURL types.ParsedDockerURL) string {
+	squashedFilename := strings.Replace(parsedDockerURL.ImageName, "/", "-", -1)
+	if parsedDockerURL.Tag != "" {
+		squashedFilename += "-" + parsedDockerURL.Tag
+	}
+	squashedFilename += ".aci"
+
+	return squashedFilename
+}
+
+func getManifests(renderedACI acirenderer.RenderedACI, aciRegistry acirenderer.ACIRegistry) ([]schema.ImageManifest, error) {
+	var manifests []schema.ImageManifest
+
+	for _, aci := range renderedACI {
+		im, err := aciRegistry.GetImageManifest(aci.Key)
+		if err != nil {
+			return nil, err
+		}
+		manifests = append(manifests, *im)
+	}
+
+	return manifests, nil
+}
+
+func writeSquashedImage(outputFile *os.File, renderedACI acirenderer.RenderedACI, aciProvider acirenderer.ACIProvider, manifests []schema.ImageManifest, compression common.Compression) error {
+	var tarWriterTarget io.WriteCloser = outputFile
+
+	switch compression {
+	case common.NoCompression:
+	case common.GzipCompression:
+		tarWriterTarget = gzip.NewWriter(outputFile)
+		defer tarWriterTarget.Close()
+	default:
+		return fmt.Errorf("unexpected compression enum value: %d", compression)
+	}
+
+	outputWriter := tar.NewWriter(tarWriterTarget)
+	defer outputWriter.Close()
+
+	finalManifest := mergeManifests(manifests)
+
+	if err := internal.WriteManifest(outputWriter, finalManifest); err != nil {
+		return err
+	}
+
+	if err := internal.WriteRootfsDir(outputWriter); err != nil {
+		return err
+	}
+
+	type hardLinkEntry struct {
+		firstLinkCleanName string
+		firstLinkHeader    tar.Header
+		keepOriginal       bool
+		walked             bool
+	}
+	// map aciFileKey -> cleanTarget -> hardLinkEntry
+	hardLinks := make(map[string]map[string]hardLinkEntry)
+
+	// first pass: read all the entries and build the hardLinks map in memory
+	// but don't write on disk
+	for _, aciFile := range renderedACI {
+		rs, err := aciProvider.ReadStream(aciFile.Key)
+		if err != nil {
+			return err
+		}
+		defer rs.Close()
+
+		hardLinks[aciFile.Key] = map[string]hardLinkEntry{}
+
+		squashWalker := func(t *tarball.TarFile) error {
+			cleanName := filepath.Clean(t.Name())
+			// the rootfs and the squashed manifest are added separately
+			if cleanName == "manifest" || cleanName == "rootfs" {
+				return nil
+			}
+			_, keep := aciFile.FileMap[cleanName]
+			if keep && t.Header.Typeflag == tar.TypeLink {
+				cleanTarget := filepath.Clean(t.Linkname())
+				if _, ok := hardLinks[aciFile.Key][cleanTarget]; !ok {
+					_, keepOriginal := aciFile.FileMap[cleanTarget]
+					hardLinks[aciFile.Key][cleanTarget] = hardLinkEntry{cleanName, *t.Header, keepOriginal, false}
+				}
+			}
+			return nil
+		}
+
+		tr := tar.NewReader(rs)
+		if err := tarball.Walk(*tr, squashWalker); err != nil {
+			return err
+		}
+	}
+
+	// second pass: write on disk
+	for _, aciFile := range renderedACI {
+		rs, err := aciProvider.ReadStream(aciFile.Key)
+		if err != nil {
+			return err
+		}
+		defer rs.Close()
+
+		squashWalker := func(t *tarball.TarFile) error {
+			cleanName := filepath.Clean(t.Name())
+			// the rootfs and the squashed manifest are added separately
+			if cleanName == "manifest" || cleanName == "rootfs" {
+				return nil
+			}
+			_, keep := aciFile.FileMap[cleanName]
+
+			if link, ok := hardLinks[aciFile.Key][cleanName]; ok {
+				if keep != link.keepOriginal {
+					return fmt.Errorf("logic error: should we keep file %q?", cleanName)
+				}
+				if keep {
+					if err := outputWriter.WriteHeader(t.Header); err != nil {
+						return fmt.Errorf("error writing header: %v", err)
+					}
+					if _, err := io.Copy(outputWriter, t.TarStream); err != nil {
+						return fmt.Errorf("error copying file into the tar out: %v", err)
+					}
+				} else {
+					// The current file does not remain but there is a hard link pointing to
+					// it. Write the current file but with the filename of the first hard link
+					// pointing to it. That first hard link will not be written later, see
+					// variable "alreadyWritten".
+					link.firstLinkHeader.Size = t.Header.Size
+					link.firstLinkHeader.Typeflag = t.Header.Typeflag
+					link.firstLinkHeader.Linkname = ""
+
+					if err := outputWriter.WriteHeader(&link.firstLinkHeader); err != nil {
+						return fmt.Errorf("error writing header: %v", err)
+					}
+					if _, err := io.Copy(outputWriter, t.TarStream); err != nil {
+						return fmt.Errorf("error copying file into the tar out: %v", err)
+					}
+				}
+			} else if keep {
+				alreadyWritten := false
+				if t.Header.Typeflag == tar.TypeLink {
+					cleanTarget := filepath.Clean(t.Linkname())
+					if link, ok := hardLinks[aciFile.Key][cleanTarget]; ok {
+						if !link.keepOriginal {
+							if link.walked {
+								t.Header.Linkname = link.firstLinkCleanName
+							} else {
+								alreadyWritten = true
+							}
+						}
+						link.walked = true
+						hardLinks[aciFile.Key][cleanTarget] = link
+					}
+				}
+
+				if !alreadyWritten {
+					if err := outputWriter.WriteHeader(t.Header); err != nil {
+						return fmt.Errorf("error writing header: %v", err)
+					}
+					if _, err := io.Copy(outputWriter, t.TarStream); err != nil {
+						return fmt.Errorf("error copying file into the tar out: %v", err)
+					}
+				}
+			}
+			return nil
+		}
+
+		tr := tar.NewReader(rs)
+		if err := tarball.Walk(*tr, squashWalker); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func mergeManifests(manifests []schema.ImageManifest) schema.ImageManifest {
+	// FIXME(iaguis) we take app layer's manifest as the final manifest for now
+	manifest := manifests[0]
+
+	manifest.Dependencies = nil
+
+	layerIndex := -1
+	for i, l := range manifest.Labels {
+		if l.Name.String() == "layer" {
+			layerIndex = i
+		}
+	}
+
+	if layerIndex != -1 {
+		manifest.Labels = append(manifest.Labels[:layerIndex], manifest.Labels[layerIndex+1:]...)
+	}
+
+	nameWithoutLayerID := appctypes.MustACIdentifier(stripLayerID(manifest.Name.String()))
+
+	manifest.Name = *nameWithoutLayerID
+
+	// once the image is squashed, we don't need a pathWhitelist
+	manifest.PathWhitelist = nil
+
+	return manifest
+}
+
+// striplayerID strips the layer ID from an app name:
+//
+// myregistry.com/organization/app-name-85738f8f9a7f1b04b5329c590ebcb9e425925c6d0984089c43a022de4f19c281
+// myregistry.com/organization/app-name
+func stripLayerID(layerName string) string {
+	n := strings.LastIndex(layerName, "-")
+	return layerName[:n]
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
new file mode 100644
index 0000000000..a83402dfcd
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
@@ -0,0 +1,332 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package file is an implementation of Docker2ACIBackend for files saved via
+// "docker save".
+//
+// Note: this package is an implementation detail and shouldn't be used outside
+// of docker2aci.
+package file
+
+import (
+	"archive/tar"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/appc/docker2aci/lib/common"
+	"github.com/appc/docker2aci/lib/internal"
+	"github.com/appc/docker2aci/lib/internal/docker"
+	"github.com/appc/docker2aci/lib/internal/tarball"
+	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/pkg/log"
+	"github.com/appc/spec/schema"
+)
+
+type FileBackend struct {
+	file *os.File
+}
+
+func NewFileBackend(file *os.File) *FileBackend {
+	return &FileBackend{
+		file: file,
+	}
+}
+
+func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *types.ParsedDockerURL, error) {
+	parsedDockerURL, err := docker.ParseDockerURL(dockerURL)
+	if err != nil {
+		// a missing Docker URL could mean that the file only contains one
+		// image, so we ignore the error here, we'll handle it in getImageID
+	}
+
+	appImageID, parsedDockerURL, err := getImageID(lb.file, parsedDockerURL)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	ancestry, err := getAncestry(lb.file, appImageID)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error getting ancestry: %v", err)
+	}
+
+	return ancestry, parsedDockerURL, nil
+}
+
+func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	var aciLayerPaths []string
+	var aciManifests []*schema.ImageManifest
+	var curPwl []string
+	for i := len(layerIDs) - 1; i >= 0; i-- {
+		tmpDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
+		if err != nil {
+			return nil, nil, fmt.Errorf("error creating dir: %v", err)
+		}
+		defer os.RemoveAll(tmpDir)
+
+		j, err := getJson(lb.file, layerIDs[i])
+		if err != nil {
+			return nil, nil, fmt.Errorf("error getting image json: %v", err)
+		}
+
+		layerData := types.DockerImageData{}
+		if err := json.Unmarshal(j, &layerData); err != nil {
+			return nil, nil, fmt.Errorf("error unmarshaling layer data: %v", err)
+		}
+
+		tmpLayerPath := path.Join(tmpDir, layerIDs[i])
+		tmpLayerPath += ".tar"
+
+		layerFile, err := extractEmbeddedLayer(lb.file, layerIDs[i], tmpLayerPath)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error getting layer from file: %v", err)
+		}
+		defer layerFile.Close()
+
+		log.Debug("Generating layer ACI...")
+		aciPath, manifest, err := internal.GenerateACI(i, layerData, dockerURL, outputDir, layerFile, curPwl, compression)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
+		}
+
+		aciLayerPaths = append(aciLayerPaths, aciPath)
+		aciManifests = append(aciManifests, manifest)
+		curPwl = manifest.PathWhitelist
+	}
+
+	return aciLayerPaths, aciManifests, nil
+}
+
+func getImageID(file *os.File, dockerURL *types.ParsedDockerURL) (string, *types.ParsedDockerURL, error) {
+	type tags map[string]string
+	type apps map[string]tags
+
+	_, err := file.Seek(0, 0)
+	if err != nil {
+		return "", nil, fmt.Errorf("error seeking file: %v", err)
+	}
+
+	var imageID string
+	var appName string
+	reposWalker := func(t *tarball.TarFile) error {
+		if filepath.Clean(t.Name()) == "repositories" {
+			repob, err := ioutil.ReadAll(t.TarStream)
+			if err != nil {
+				return fmt.Errorf("error reading repositories file: %v", err)
+			}
+
+			var repositories apps
+			if err := json.Unmarshal(repob, &repositories); err != nil {
+				return fmt.Errorf("error unmarshaling repositories file")
+			}
+
+			if dockerURL == nil {
+				n := len(repositories)
+				switch {
+				case n == 1:
+					for key, _ := range repositories {
+						appName = key
+					}
+				case n > 1:
+					var appNames []string
+					for key, _ := range repositories {
+						appNames = append(appNames, key)
+					}
+					return &common.ErrSeveralImages{
+						Msg:    "several images found",
+						Images: appNames,
+					}
+				default:
+					return fmt.Errorf("no images found")
+				}
+			} else {
+				appName = dockerURL.ImageName
+			}
+
+			tag := "latest"
+			if dockerURL != nil {
+				tag = dockerURL.Tag
+			}
+
+			app, ok := repositories[appName]
+			if !ok {
+				return fmt.Errorf("app %q not found", appName)
+			}
+
+			_, ok = app[tag]
+			if !ok {
+				if len(app) == 1 {
+					for key, _ := range app {
+						tag = key
+					}
+				} else {
+					return fmt.Errorf("tag %q not found", tag)
+				}
+			}
+
+			if dockerURL == nil {
+				dockerURL = &types.ParsedDockerURL{
+					IndexURL:  "",
+					Tag:       tag,
+					ImageName: appName,
+				}
+			}
+
+			imageID = string(app[tag])
+		}
+
+		return nil
+	}
+
+	tr := tar.NewReader(file)
+	if err := tarball.Walk(*tr, reposWalker); err != nil {
+		return "", nil, err
+	}
+
+	if imageID == "" {
+		return "", nil, fmt.Errorf("repositories file not found")
+	}
+
+	return imageID, dockerURL, nil
+}
+
+func getJson(file *os.File, layerID string) ([]byte, error) {
+	jsonPath := path.Join(layerID, "json")
+	return getTarFileBytes(file, jsonPath)
+}
+
+func getTarFileBytes(file *os.File, path string) ([]byte, error) {
+	_, err := file.Seek(0, 0)
+	if err != nil {
+		fmt.Errorf("error seeking file: %v", err)
+	}
+
+	var fileBytes []byte
+	fileWalker := func(t *tarball.TarFile) error {
+		if filepath.Clean(t.Name()) == path {
+			fileBytes, err = ioutil.ReadAll(t.TarStream)
+			if err != nil {
+				return err
+			}
+		}
+
+		return nil
+	}
+
+	tr := tar.NewReader(file)
+	if err := tarball.Walk(*tr, fileWalker); err != nil {
+		return nil, err
+	}
+
+	if fileBytes == nil {
+		return nil, fmt.Errorf("file %q not found", path)
+	}
+
+	return fileBytes, nil
+}
+
+func extractEmbeddedLayer(file *os.File, layerID string, outputPath string) (*os.File, error) {
+	log.Info("Extracting ", layerID[:12], "\n")
+
+	_, err := file.Seek(0, 0)
+	if err != nil {
+		fmt.Errorf("error seeking file: %v", err)
+	}
+
+	layerTarPath := path.Join(layerID, "layer.tar")
+
+	var layerFile *os.File
+	fileWalker := func(t *tarball.TarFile) error {
+		if filepath.Clean(t.Name()) == layerTarPath {
+			layerFile, err = os.Create(outputPath)
+			if err != nil {
+				return fmt.Errorf("error creating layer: %v", err)
+			}
+
+			_, err = io.Copy(layerFile, t.TarStream)
+			if err != nil {
+				return fmt.Errorf("error getting layer: %v", err)
+			}
+		}
+
+		return nil
+	}
+
+	tr := tar.NewReader(file)
+	if err := tarball.Walk(*tr, fileWalker); err != nil {
+		return nil, err
+	}
+
+	if layerFile == nil {
+		return nil, fmt.Errorf("file %q not found", layerTarPath)
+	}
+
+	return layerFile, nil
+}
+
+func getAncestry(file *os.File, imgID string) ([]string, error) {
+	var ancestry []string
+
+	curImgID := imgID
+
+	var err error
+	for curImgID != "" {
+		ancestry = append(ancestry, curImgID)
+		curImgID, err = getParent(file, curImgID)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return ancestry, nil
+}
+
+func getParent(file *os.File, imgID string) (string, error) {
+	var parent string
+
+	_, err := file.Seek(0, 0)
+	if err != nil {
+		return "", fmt.Errorf("error seeking file: %v", err)
+	}
+
+	jsonPath := filepath.Join(imgID, "json")
+	parentWalker := func(t *tarball.TarFile) error {
+		if filepath.Clean(t.Name()) == jsonPath {
+			jsonb, err := ioutil.ReadAll(t.TarStream)
+			if err != nil {
+				return fmt.Errorf("error reading layer json: %v", err)
+			}
+
+			var dockerData types.DockerImageData
+			if err := json.Unmarshal(jsonb, &dockerData); err != nil {
+				return fmt.Errorf("error unmarshaling layer data: %v", err)
+			}
+
+			parent = dockerData.Parent
+		}
+
+		return nil
+	}
+
+	tr := tar.NewReader(file)
+	if err := tarball.Walk(*tr, parentWalker); err != nil {
+		return "", err
+	}
+
+	return parent, nil
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
new file mode 100644
index 0000000000..57533857a1
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
@@ -0,0 +1,164 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package repository is an implementation of Docker2ACIBackend for Docker
+// remote registries.
+//
+// Note: this package is an implementation detail and shouldn't be used outside
+// of docker2aci.
+package repository
+
+import (
+	"fmt"
+	"net/http"
+	"path"
+
+	"github.com/appc/docker2aci/lib/common"
+	"github.com/appc/docker2aci/lib/internal/docker"
+	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/util"
+	"github.com/appc/spec/schema"
+)
+
+type registryVersion int
+
+const (
+	registryV1 registryVersion = iota
+	registryV2
+)
+
+type RepositoryBackend struct {
+	repoData          *RepoData
+	username          string
+	password          string
+	insecure          common.InsecureConfig
+	hostsV2Support    map[string]bool
+	hostsV2AuthTokens map[string]map[string]string
+	schema            string
+	imageManifests    map[types.ParsedDockerURL]v2Manifest
+}
+
+func NewRepositoryBackend(username string, password string, insecure common.InsecureConfig) *RepositoryBackend {
+	return &RepositoryBackend{
+		username:          username,
+		password:          password,
+		insecure:          insecure,
+		hostsV2Support:    make(map[string]bool),
+		hostsV2AuthTokens: make(map[string]map[string]string),
+		imageManifests:    make(map[types.ParsedDockerURL]v2Manifest),
+	}
+}
+
+func (rb *RepositoryBackend) GetImageInfo(url string) ([]string, *types.ParsedDockerURL, error) {
+	dockerURL, err := docker.ParseDockerURL(url)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	var supportsV2, ok bool
+	var URLSchema string
+	if supportsV2, ok = rb.hostsV2Support[dockerURL.IndexURL]; !ok {
+		var err error
+		URLSchema, supportsV2, err = rb.supportsRegistry(dockerURL.IndexURL, registryV2)
+		if err != nil {
+			return nil, nil, err
+		}
+		rb.schema = URLSchema + "://"
+		rb.hostsV2Support[dockerURL.IndexURL] = supportsV2
+	}
+
+	if supportsV2 {
+		return rb.getImageInfoV2(dockerURL)
+	} else {
+		URLSchema, supportsV1, err := rb.supportsRegistry(dockerURL.IndexURL, registryV1)
+		if err != nil {
+			return nil, nil, err
+		}
+		if !supportsV1 {
+			return nil, nil, fmt.Errorf("registry doesn't support API v2 nor v1")
+		}
+		rb.schema = URLSchema + "://"
+		return rb.getImageInfoV1(dockerURL)
+	}
+}
+
+func (rb *RepositoryBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	if rb.hostsV2Support[dockerURL.IndexURL] {
+		return rb.buildACIV2(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+	} else {
+		return rb.buildACIV1(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+	}
+}
+
+func checkRegistryStatus(statusCode int, hdr http.Header, version registryVersion) (bool, error) {
+	switch statusCode {
+	case http.StatusOK, http.StatusUnauthorized:
+		ok := true
+		if version == registryV2 {
+			// v2 API requires this check
+			ok = hdr.Get("Docker-Distribution-API-Version") == "registry/2.0"
+		}
+		return ok, nil
+	case http.StatusNotFound:
+		return false, nil
+	}
+
+	return false, fmt.Errorf("unexpected http code: %d", statusCode)
+}
+
+func (rb *RepositoryBackend) supportsRegistry(indexURL string, version registryVersion) (schema string, ok bool, err error) {
+	var URLPath string
+	switch version {
+	case registryV1:
+		// the v1 API defines this URL to check if the registry's status
+		URLPath = "v1/_ping"
+	case registryV2:
+		URLPath = "v2"
+	}
+	URLStr := path.Join(indexURL, URLPath)
+
+	fetch := func(schema string) (res *http.Response, err error) {
+		url := schema + "://" + URLStr
+		req, err := http.NewRequest("GET", url, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		rb.setBasicAuth(req)
+
+		client := util.GetTLSClient(rb.insecure.SkipVerify)
+		res, err = client.Do(req)
+		return
+	}
+
+	schema = "https"
+	res, err := fetch(schema)
+	if err == nil {
+		ok, err = checkRegistryStatus(res.StatusCode, res.Header, version)
+		defer res.Body.Close()
+	}
+	if err != nil || !ok {
+		if rb.insecure.AllowHTTP {
+			schema = "http"
+			res, err = fetch(schema)
+			if err == nil {
+				ok, err = checkRegistryStatus(res.StatusCode, res.Header, version)
+				defer res.Body.Close()
+			}
+		}
+		return schema, ok, err
+	}
+
+	return schema, ok, err
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
new file mode 100644
index 0000000000..bc54e47c7b
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
@@ -0,0 +1,391 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package repository
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/appc/docker2aci/lib/common"
+	"github.com/appc/docker2aci/lib/internal"
+	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/util"
+	"github.com/appc/docker2aci/pkg/log"
+	"github.com/appc/spec/schema"
+	"github.com/coreos/ioprogress"
+)
+
+type RepoData struct {
+	Tokens    []string
+	Endpoints []string
+	Cookie    []string
+}
+
+func (rb *RepositoryBackend) getImageInfoV1(dockerURL *types.ParsedDockerURL) ([]string, *types.ParsedDockerURL, error) {
+	repoData, err := rb.getRepoDataV1(dockerURL.IndexURL, dockerURL.ImageName)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error getting repository data: %v", err)
+	}
+
+	// TODO(iaguis) check more endpoints
+	appImageID, err := rb.getImageIDFromTagV1(repoData.Endpoints[0], dockerURL.ImageName, dockerURL.Tag, repoData)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error getting ImageID from tag %s: %v", dockerURL.Tag, err)
+	}
+
+	ancestry, err := rb.getAncestryV1(appImageID, repoData.Endpoints[0], repoData)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	rb.repoData = repoData
+
+	return ancestry, dockerURL, nil
+}
+
+func (rb *RepositoryBackend) buildACIV1(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	layerFiles := make([]*os.File, len(layerIDs))
+	layerDatas := make([]types.DockerImageData, len(layerIDs))
+
+	tmpParentDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
+	if err != nil {
+		return nil, nil, err
+	}
+	defer os.RemoveAll(tmpParentDir)
+
+	var doneChannels []chan error
+	for i, layerID := range layerIDs {
+		doneChan := make(chan error)
+		doneChannels = append(doneChannels, doneChan)
+		// https://github.com/golang/go/wiki/CommonMistakes
+		i := i // golang--
+		layerID := layerID
+		go func() {
+			tmpDir, err := ioutil.TempDir(tmpParentDir, "")
+			if err != nil {
+				doneChan <- fmt.Errorf("error creating dir: %v", err)
+				return
+			}
+
+			j, size, err := rb.getJsonV1(layerID, rb.repoData.Endpoints[0], rb.repoData)
+			if err != nil {
+				doneChan <- fmt.Errorf("error getting image json: %v", err)
+				return
+			}
+
+			layerDatas[i] = types.DockerImageData{}
+			if err := json.Unmarshal(j, &layerDatas[i]); err != nil {
+				doneChan <- fmt.Errorf("error unmarshaling layer data: %v", err)
+				return
+			}
+
+			layerFiles[i], err = rb.getLayerV1(layerID, rb.repoData.Endpoints[0], rb.repoData, size, tmpDir)
+			if err != nil {
+				doneChan <- fmt.Errorf("error getting the remote layer: %v", err)
+				return
+			}
+			doneChan <- nil
+		}()
+	}
+	for _, doneChan := range doneChannels {
+		err := <-doneChan
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+	var aciLayerPaths []string
+	var aciManifests []*schema.ImageManifest
+	var curPwl []string
+
+	for i := len(layerIDs) - 1; i >= 0; i-- {
+		log.Debug("Generating layer ACI...")
+		aciPath, manifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
+		}
+		aciLayerPaths = append(aciLayerPaths, aciPath)
+		aciManifests = append(aciManifests, manifest)
+		curPwl = manifest.PathWhitelist
+
+		layerFiles[i].Close()
+	}
+
+	return aciLayerPaths, aciManifests, nil
+}
+
+func (rb *RepositoryBackend) getRepoDataV1(indexURL string, remote string) (*RepoData, error) {
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
+	repositoryURL := rb.schema + path.Join(indexURL, "v1", "repositories", remote, "images")
+
+	req, err := http.NewRequest("GET", repositoryURL, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if rb.username != "" && rb.password != "" {
+		req.SetBasicAuth(rb.username, rb.password)
+	}
+
+	req.Header.Set("X-Docker-Token", "true")
+
+	res, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != 200 {
+		return nil, fmt.Errorf("HTTP code: %d, URL: %s", res.StatusCode, req.URL)
+	}
+
+	var tokens []string
+	if res.Header.Get("X-Docker-Token") != "" {
+		tokens = res.Header["X-Docker-Token"]
+	}
+
+	var cookies []string
+	if res.Header.Get("Set-Cookie") != "" {
+		cookies = res.Header["Set-Cookie"]
+	}
+
+	var endpoints []string
+	if res.Header.Get("X-Docker-Endpoints") != "" {
+		endpoints = makeEndpointsListV1(res.Header["X-Docker-Endpoints"])
+	} else {
+		// Assume same endpoint
+		endpoints = append(endpoints, indexURL)
+	}
+
+	return &RepoData{
+		Endpoints: endpoints,
+		Tokens:    tokens,
+		Cookie:    cookies,
+	}, nil
+}
+
+func (rb *RepositoryBackend) getImageIDFromTagV1(registry string, appName string, tag string, repoData *RepoData) (string, error) {
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
+	// we get all the tags instead of directly getting the imageID of the
+	// requested one (.../tags/TAG) because even though it's specified in the
+	// Docker API, some registries (e.g. Google Container Registry) don't
+	// implement it.
+	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "repositories", appName, "tags"), nil)
+	if err != nil {
+		return "", fmt.Errorf("failed to get Image ID: %s, URL: %s", err, req.URL)
+	}
+
+	setAuthTokenV1(req, repoData.Tokens)
+	setCookieV1(req, repoData.Cookie)
+	res, err := client.Do(req)
+	if err != nil {
+		return "", fmt.Errorf("failed to get Image ID: %s, URL: %s", err, req.URL)
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != 200 {
+		return "", fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
+	}
+
+	j, err := ioutil.ReadAll(res.Body)
+
+	if err != nil {
+		return "", err
+	}
+
+	var tags map[string]string
+
+	if err := json.Unmarshal(j, &tags); err != nil {
+		return "", fmt.Errorf("error unmarshaling: %v", err)
+	}
+
+	imageID, ok := tags[tag]
+	if !ok {
+		return "", fmt.Errorf("tag %s not found", tag)
+	}
+
+	return imageID, nil
+}
+
+func (rb *RepositoryBackend) getAncestryV1(imgID, registry string, repoData *RepoData) ([]string, error) {
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
+	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "images", imgID, "ancestry"), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	setAuthTokenV1(req, repoData.Tokens)
+	setCookieV1(req, repoData.Cookie)
+	res, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != 200 {
+		return nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
+	}
+
+	var ancestry []string
+
+	j, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to read downloaded json: %s (%s)", err, j)
+	}
+
+	if err := json.Unmarshal(j, &ancestry); err != nil {
+		return nil, fmt.Errorf("error unmarshaling: %v", err)
+	}
+
+	return ancestry, nil
+}
+
+func (rb *RepositoryBackend) getJsonV1(imgID, registry string, repoData *RepoData) ([]byte, int64, error) {
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
+	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "images", imgID, "json"), nil)
+	if err != nil {
+		return nil, -1, err
+	}
+	setAuthTokenV1(req, repoData.Tokens)
+	setCookieV1(req, repoData.Cookie)
+	res, err := client.Do(req)
+	if err != nil {
+		return nil, -1, err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != 200 {
+		return nil, -1, fmt.Errorf("HTTP code: %d, URL: %s", res.StatusCode, req.URL)
+	}
+
+	imageSize := int64(-1)
+
+	if hdr := res.Header.Get("X-Docker-Size"); hdr != "" {
+		imageSize, err = strconv.ParseInt(hdr, 10, 64)
+		if err != nil {
+			return nil, -1, err
+		}
+	}
+
+	b, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, -1, fmt.Errorf("failed to read downloaded json: %v (%s)", err, b)
+	}
+
+	return b, imageSize, nil
+}
+
+func (rb *RepositoryBackend) getLayerV1(imgID, registry string, repoData *RepoData, imgSize int64, tmpDir string) (*os.File, error) {
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
+	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "images", imgID, "layer"), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	setAuthTokenV1(req, repoData.Tokens)
+	setCookieV1(req, repoData.Cookie)
+
+	res, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != 200 {
+		res.Body.Close()
+		return nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
+	}
+
+	// if we didn't receive the size via X-Docker-Size when we retrieved the
+	// layer's json, try Content-Length
+	if imgSize == -1 {
+		if hdr := res.Header.Get("Content-Length"); hdr != "" {
+			imgSize, err = strconv.ParseInt(hdr, 10, 64)
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	prefix := "Downloading " + imgID[:12]
+	fmtBytesSize := 18
+	barSize := int64(80 - len(prefix) - fmtBytesSize)
+	bar := ioprogress.DrawTextFormatBarForW(barSize, os.Stderr)
+	fmtfunc := func(progress, total int64) string {
+		return fmt.Sprintf(
+			"%s: %s %s",
+			prefix,
+			bar(progress, total),
+			ioprogress.DrawTextFormatBytes(progress, total),
+		)
+	}
+
+	progressReader := &ioprogress.Reader{
+		Reader:       res.Body,
+		Size:         imgSize,
+		DrawFunc:     ioprogress.DrawTerminalf(os.Stderr, fmtfunc),
+		DrawInterval: 500 * time.Millisecond,
+	}
+
+	layerFile, err := ioutil.TempFile(tmpDir, "dockerlayer-")
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = io.Copy(layerFile, progressReader)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := layerFile.Sync(); err != nil {
+		return nil, err
+	}
+
+	return layerFile, nil
+}
+
+func setAuthTokenV1(req *http.Request, token []string) {
+	if req.Header.Get("Authorization") == "" {
+		req.Header.Set("Authorization", "Token "+strings.Join(token, ","))
+	}
+}
+
+func setCookieV1(req *http.Request, cookie []string) {
+	if req.Header.Get("Cookie") == "" {
+		req.Header.Set("Cookie", strings.Join(cookie, ""))
+	}
+}
+
+func makeEndpointsListV1(headers []string) []string {
+	var endpoints []string
+
+	for _, ep := range headers {
+		endpointsList := strings.Split(ep, ",")
+		for _, endpointEl := range endpointsList {
+			endpoints = append(
+				endpoints,
+				path.Join(strings.TrimSpace(endpointEl), "v1"))
+		}
+	}
+
+	return endpoints
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
new file mode 100644
index 0000000000..356d6f9bee
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -0,0 +1,466 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package repository
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path"
+	"regexp"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/appc/docker2aci/lib/common"
+	"github.com/appc/docker2aci/lib/internal"
+	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/util"
+	"github.com/appc/docker2aci/pkg/log"
+	"github.com/appc/spec/schema"
+	"github.com/coreos/pkg/progressutil"
+)
+
+const (
+	defaultIndexURL = "registry-1.docker.io"
+)
+
+var validHex = regexp.MustCompile(`^([a-f0-9]{64})$`)
+
+type v2Manifest struct {
+	Name     string `json:"name"`
+	Tag      string `json:"tag"`
+	FSLayers []struct {
+		BlobSum string `json:"blobSum"`
+	} `json:"fsLayers"`
+	History []struct {
+		V1Compatibility string `json:"v1Compatibility"`
+	} `json:"history"`
+	Signature []byte `json:"signature"`
+}
+
+func (rb *RepositoryBackend) getImageInfoV2(dockerURL *types.ParsedDockerURL) ([]string, *types.ParsedDockerURL, error) {
+	manifest, layers, err := rb.getManifestV2(dockerURL)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	rb.imageManifests[*dockerURL] = *manifest
+
+	return layers, dockerURL, nil
+}
+
+func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	layerFiles := make([]*os.File, len(layerIDs))
+	layerDatas := make([]types.DockerImageData, len(layerIDs))
+
+	tmpParentDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
+	if err != nil {
+		return nil, nil, err
+	}
+	defer os.RemoveAll(tmpParentDir)
+
+	copier := progressutil.NewCopyProgressPrinter()
+
+	var errChannels []chan error
+	closers := make([]io.ReadCloser, len(layerIDs))
+	var wg sync.WaitGroup
+	for i, layerID := range layerIDs {
+		wg.Add(1)
+		errChan := make(chan error, 1)
+		errChannels = append(errChannels, errChan)
+		// https://github.com/golang/go/wiki/CommonMistakes
+		i := i // golang--
+		layerID := layerID
+		go func() {
+			defer wg.Done()
+
+			manifest := rb.imageManifests[*dockerURL]
+
+			layerIndex, err := getLayerIndex(layerID, manifest)
+			if err != nil {
+				errChan <- err
+				return
+			}
+
+			if len(manifest.History) <= layerIndex {
+				errChan <- fmt.Errorf("history not found for layer %s", layerID)
+				return
+			}
+
+			layerDatas[i] = types.DockerImageData{}
+			if err := json.Unmarshal([]byte(manifest.History[layerIndex].V1Compatibility), &layerDatas[i]); err != nil {
+				errChan <- fmt.Errorf("error unmarshaling layer data: %v", err)
+				return
+			}
+
+			tmpDir, err := ioutil.TempDir(tmpParentDir, "")
+			if err != nil {
+				errChan <- fmt.Errorf("error creating dir: %v", err)
+				return
+			}
+
+			layerFiles[i], closers[i], err = rb.getLayerV2(layerID, dockerURL, tmpDir, copier)
+			if err != nil {
+				errChan <- fmt.Errorf("error getting the remote layer: %v", err)
+				return
+			}
+			errChan <- nil
+		}()
+	}
+	// Need to wait for all of the readers to be added to the copier (which happens during rb.getLayerV2)
+	wg.Wait()
+	err = copier.PrintAndWait(os.Stderr, 500*time.Millisecond, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+	for _, closer := range closers {
+		if closer != nil {
+			closer.Close()
+		}
+	}
+	for _, errChan := range errChannels {
+		err := <-errChan
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+	for _, layerFile := range layerFiles {
+		err := layerFile.Sync()
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+	var aciLayerPaths []string
+	var aciManifests []*schema.ImageManifest
+	var curPwl []string
+	for i := len(layerIDs) - 1; i >= 0; i-- {
+		log.Debug("Generating layer ACI...")
+		aciPath, aciManifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
+		}
+		aciLayerPaths = append(aciLayerPaths, aciPath)
+		aciManifests = append(aciManifests, aciManifest)
+		curPwl = aciManifest.PathWhitelist
+
+		layerFiles[i].Close()
+	}
+
+	return aciLayerPaths, aciManifests, nil
+}
+
+func (rb *RepositoryBackend) getManifestV2(dockerURL *types.ParsedDockerURL) (*v2Manifest, []string, error) {
+	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "manifests", dockerURL.Tag)
+
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	rb.setBasicAuth(req)
+
+	res, err := rb.makeRequest(req, dockerURL.ImageName)
+	if err != nil {
+		return nil, nil, err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		return nil, nil, fmt.Errorf("unexpected http code: %d, URL: %s", res.StatusCode, req.URL)
+	}
+
+	manblob, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	manifest := &v2Manifest{}
+
+	err = json.Unmarshal(manblob, manifest)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if manifest.Name != dockerURL.ImageName {
+		return nil, nil, fmt.Errorf("name doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.ImageName, manifest.Name)
+	}
+
+	if manifest.Tag != dockerURL.Tag {
+		return nil, nil, fmt.Errorf("tag doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.Tag, manifest.Tag)
+	}
+
+	if err := fixManifestLayers(manifest); err != nil {
+		return nil, nil, err
+	}
+
+	//TODO: verify signature here
+
+	layers := make([]string, len(manifest.FSLayers))
+
+	for i, layer := range manifest.FSLayers {
+		layers[i] = layer.BlobSum
+	}
+
+	return manifest, layers, nil
+}
+
+func fixManifestLayers(manifest *v2Manifest) error {
+	type imageV1 struct {
+		ID     string
+		Parent string
+	}
+	imgs := make([]*imageV1, len(manifest.FSLayers))
+	for i := range manifest.FSLayers {
+		img := &imageV1{}
+
+		if err := json.Unmarshal([]byte(manifest.History[i].V1Compatibility), img); err != nil {
+			return err
+		}
+
+		imgs[i] = img
+		if err := validateV1ID(img.ID); err != nil {
+			return err
+		}
+	}
+
+	if imgs[len(imgs)-1].Parent != "" {
+		return errors.New("Invalid parent ID in the base layer of the image.")
+	}
+
+	// check general duplicates to error instead of a deadlock
+	idmap := make(map[string]struct{})
+
+	var lastID string
+	for _, img := range imgs {
+		// skip IDs that appear after each other, we handle those later
+		if _, exists := idmap[img.ID]; img.ID != lastID && exists {
+			return fmt.Errorf("ID %+v appears multiple times in manifest", img.ID)
+		}
+		lastID = img.ID
+		idmap[lastID] = struct{}{}
+	}
+
+	// backwards loop so that we keep the remaining indexes after removing items
+	for i := len(imgs) - 2; i >= 0; i-- {
+		if imgs[i].ID == imgs[i+1].ID { // repeated ID. remove and continue
+			manifest.FSLayers = append(manifest.FSLayers[:i], manifest.FSLayers[i+1:]...)
+			manifest.History = append(manifest.History[:i], manifest.History[i+1:]...)
+		} else if imgs[i].Parent != imgs[i+1].ID {
+			return fmt.Errorf("Invalid parent ID. Expected %v, got %v.", imgs[i+1].ID, imgs[i].Parent)
+		}
+	}
+
+	return nil
+}
+
+func validateV1ID(id string) error {
+	if ok := validHex.MatchString(id); !ok {
+		return fmt.Errorf("image ID %q is invalid", id)
+	}
+	return nil
+}
+
+func getLayerIndex(layerID string, manifest v2Manifest) (int, error) {
+	for i, layer := range manifest.FSLayers {
+		if layer.BlobSum == layerID {
+			return i, nil
+		}
+	}
+	return -1, fmt.Errorf("layer not found in manifest: %s", layerID)
+}
+
+func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedDockerURL, tmpDir string, copier *progressutil.CopyProgressPrinter) (*os.File, io.ReadCloser, error) {
+	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "blobs", layerID)
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	rb.setBasicAuth(req)
+
+	res, err := rb.makeRequest(req, dockerURL.ImageName)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if res.StatusCode == http.StatusTemporaryRedirect || res.StatusCode == http.StatusFound {
+		location := res.Header.Get("Location")
+		if location != "" {
+			req, err = http.NewRequest("GET", location, nil)
+			if err != nil {
+				return nil, nil, err
+			}
+			res, err = rb.makeRequest(req, dockerURL.ImageName)
+			if err != nil {
+				return nil, nil, err
+			}
+			defer res.Body.Close()
+		}
+	}
+
+	if res.StatusCode != http.StatusOK {
+		return nil, nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
+	}
+
+	var in io.Reader
+	in = res.Body
+
+	var size int64
+
+	if hdr := res.Header.Get("Content-Length"); hdr != "" {
+		size, err = strconv.ParseInt(hdr, 10, 64)
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
+	name := "Downloading " + layerID[:18]
+
+	layerFile, err := ioutil.TempFile(tmpDir, "dockerlayer-")
+	if err != nil {
+		return nil, nil, err
+	}
+
+	err = copier.AddCopy(in, name, size, layerFile)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return layerFile, res.Body, nil
+}
+
+func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string) (*http.Response, error) {
+	setBearerHeader := false
+	hostAuthTokens, ok := rb.hostsV2AuthTokens[req.URL.Host]
+	if ok {
+		authToken, ok := hostAuthTokens[repo]
+		if ok {
+			req.Header.Set("Authorization", "Bearer "+authToken)
+			setBearerHeader = true
+		}
+	}
+
+	client := util.GetTLSClient(rb.insecure.SkipVerify)
+	res, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	if res.StatusCode == http.StatusUnauthorized && setBearerHeader {
+		return res, err
+	}
+
+	hdr := res.Header.Get("www-authenticate")
+	if res.StatusCode != http.StatusUnauthorized || hdr == "" {
+		return res, err
+	}
+
+	tokens := strings.Split(hdr, ",")
+	if len(tokens) != 3 ||
+		!strings.HasPrefix(strings.ToLower(tokens[0]), "bearer realm") {
+		return res, err
+	}
+	res.Body.Close()
+
+	var realm, service, scope string
+	for _, token := range tokens {
+		if strings.HasPrefix(strings.ToLower(token), "bearer realm") {
+			realm = strings.Trim(token[len("bearer realm="):], "\"")
+		}
+		if strings.HasPrefix(token, "service") {
+			service = strings.Trim(token[len("service="):], "\"")
+		}
+		if strings.HasPrefix(token, "scope") {
+			scope = strings.Trim(token[len("scope="):], "\"")
+		}
+	}
+
+	if realm == "" {
+		return nil, fmt.Errorf("missing realm in bearer auth challenge")
+	}
+	if service == "" {
+		return nil, fmt.Errorf("missing service in bearer auth challenge")
+	}
+	// The scope can be empty if we're not getting a token for a specific repo
+	if scope == "" && repo != "" {
+		// If the scope is empty and it shouldn't be, we can infer it based on the repo
+		scope = fmt.Sprintf("repository:%s:pull", repo)
+	}
+
+	authReq, err := http.NewRequest("GET", realm, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	getParams := authReq.URL.Query()
+	getParams.Add("service", service)
+	if scope != "" {
+		getParams.Add("scope", scope)
+	}
+	authReq.URL.RawQuery = getParams.Encode()
+
+	rb.setBasicAuth(authReq)
+
+	res, err = client.Do(authReq)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	switch res.StatusCode {
+	case http.StatusUnauthorized:
+		return nil, fmt.Errorf("unable to retrieve auth token: 401 unauthorized")
+	case http.StatusOK:
+		break
+	default:
+		return nil, fmt.Errorf("unexpected http code: %d, URL: %s", res.StatusCode, authReq.URL)
+	}
+
+	tokenBlob, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	tokenStruct := struct {
+		Token string `json:"token"`
+	}{}
+
+	err = json.Unmarshal(tokenBlob, &tokenStruct)
+	if err != nil {
+		return nil, err
+	}
+
+	hostAuthTokens, ok = rb.hostsV2AuthTokens[req.URL.Host]
+	if !ok {
+		hostAuthTokens = make(map[string]string)
+		rb.hostsV2AuthTokens[req.URL.Host] = hostAuthTokens
+	}
+
+	hostAuthTokens[repo] = tokenStruct.Token
+
+	return rb.makeRequest(req, repo)
+}
+
+func (rb *RepositoryBackend) setBasicAuth(req *http.Request) {
+	if rb.username != "" && rb.password != "" {
+		req.SetBasicAuth(rb.username, rb.password)
+	}
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go b/vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
new file mode 100644
index 0000000000..70bca8e476
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
@@ -0,0 +1,161 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package docker
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path"
+	"runtime"
+	"strings"
+
+	"github.com/appc/docker2aci/lib/internal/types"
+
+	"github.com/docker/distribution/reference"
+)
+
+const (
+	dockercfgFileName    = "config.json"
+	dockercfgFileNameOld = ".dockercfg"
+	defaultIndexURL      = "registry-1.docker.io"
+	defaultIndexURLAuth  = "https://index.docker.io/v1/"
+	defaultTag           = "latest"
+	defaultRepoPrefix    = "library/"
+)
+
+// SplitReposName breaks a repo name into an index name and remote name.
+func SplitReposName(name string) (indexName, remoteName string) {
+	i := strings.IndexRune(name, '/')
+	if i == -1 || (!strings.ContainsAny(name[:i], ".:") && name[:i] != "localhost") {
+		indexName, remoteName = defaultIndexURL, name
+	} else {
+		indexName, remoteName = name[:i], name[i+1:]
+	}
+	if indexName == defaultIndexURL && !strings.ContainsRune(remoteName, '/') {
+		remoteName = defaultRepoPrefix + remoteName
+	}
+	return
+}
+
+// Get a repos name and returns the right reposName + tag
+// The tag can be confusing because of a port in a repository name.
+//     Ex: localhost.localdomain:5000/samalba/hipache:latest
+func parseRepositoryTag(repos string) (string, string) {
+	n := strings.LastIndex(repos, ":")
+	if n < 0 {
+		return repos, ""
+	}
+	if tag := repos[n+1:]; !strings.Contains(tag, "/") {
+		return repos[:n], tag
+	}
+	return repos, ""
+}
+
+func decodeDockerAuth(s string) (string, string, error) {
+	decoded, err := base64.StdEncoding.DecodeString(s)
+	if err != nil {
+		return "", "", err
+	}
+	parts := strings.SplitN(string(decoded), ":", 2)
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("invalid auth configuration file")
+	}
+	user := parts[0]
+	password := strings.Trim(parts[1], "\x00")
+	return user, password, nil
+}
+
+func getHomeDir() string {
+	if runtime.GOOS == "windows" {
+		return os.Getenv("USERPROFILE")
+	}
+	return os.Getenv("HOME")
+}
+
+// GetDockercfgAuth reads a ~/.dockercfg file and returns the username and password
+// of the given docker index server.
+func GetAuthInfo(indexServer string) (string, string, error) {
+	// official docker registry
+	if indexServer == defaultIndexURL {
+		indexServer = defaultIndexURLAuth
+	}
+	dockerCfgPath := path.Join(getHomeDir(), ".docker", dockercfgFileName)
+	if _, err := os.Stat(dockerCfgPath); err == nil {
+		j, err := ioutil.ReadFile(dockerCfgPath)
+		if err != nil {
+			return "", "", err
+		}
+		var dockerAuth types.DockerConfigFile
+		if err := json.Unmarshal(j, &dockerAuth); err != nil {
+			return "", "", err
+		}
+		// try the normal case
+		if c, ok := dockerAuth.AuthConfigs[indexServer]; ok {
+			return decodeDockerAuth(c.Auth)
+		}
+	} else if os.IsNotExist(err) {
+		oldDockerCfgPath := path.Join(getHomeDir(), dockercfgFileNameOld)
+		if _, err := os.Stat(oldDockerCfgPath); err != nil {
+			return "", "", nil //missing file is not an error
+		}
+		j, err := ioutil.ReadFile(oldDockerCfgPath)
+		if err != nil {
+			return "", "", err
+		}
+		var dockerAuthOld map[string]types.DockerAuthConfigOld
+		if err := json.Unmarshal(j, &dockerAuthOld); err != nil {
+			return "", "", err
+		}
+		if c, ok := dockerAuthOld[indexServer]; ok {
+			return decodeDockerAuth(c.Auth)
+		}
+	} else {
+		// if file is there but we can't stat it for any reason other
+		// than it doesn't exist then stop
+		return "", "", fmt.Errorf("%s - %v", dockerCfgPath, err)
+	}
+	return "", "", nil
+}
+
+// ParseDockerURL takes a Docker URL and returns a ParsedDockerURL with its
+// index URL, image name, and tag.
+func ParseDockerURL(arg string) (*types.ParsedDockerURL, error) {
+	r, err := reference.ParseNamed(arg)
+	if err != nil {
+		return nil, err
+	}
+
+	tag := defaultTag
+	var digest string
+	switch x := r.(type) {
+	case reference.Canonical:
+		digest = x.Digest().String()
+	case reference.NamedTagged:
+		tag = x.Tag()
+	}
+
+	indexURL, remoteName := SplitReposName(r.Name())
+
+	p := &types.ParsedDockerURL{
+		IndexURL:  indexURL,
+		ImageName: remoteName,
+		Tag:       tag,
+		Digest:    digest,
+	}
+	return p, nil
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/internal.go b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
new file mode 100644
index 0000000000..29cd8c87e4
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
@@ -0,0 +1,591 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package internal provides functions shared by different parts of docker2aci.
+//
+// Note: this package is an implementation detail and shouldn't be used outside
+// of docker2aci.
+package internal
+
+import (
+	"archive/tar"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/appc/docker2aci/lib/common"
+	"github.com/appc/docker2aci/lib/internal/tarball"
+	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/util"
+	"github.com/appc/docker2aci/pkg/log"
+	"github.com/appc/spec/aci"
+	"github.com/appc/spec/schema"
+	appctypes "github.com/appc/spec/schema/types"
+	gzip "github.com/klauspost/pgzip"
+)
+
+// Docker2ACIBackend is the interface that abstracts converting Docker layers
+// to ACI from where they're stored (remote or file).
+//
+// GetImageInfo takes a Docker URL and returns a list of layers and the parsed
+// Docker URL.
+//
+// BuildACI takes a Docker layer, converts it to ACI and returns its output
+// path and its converted ImageManifest.
+type Docker2ACIBackend interface {
+	GetImageInfo(dockerUrl string) ([]string, *types.ParsedDockerURL, error)
+	BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error)
+}
+
+// GenerateACI takes a Docker layer and generates an ACI from it.
+func GenerateACI(layerNumber int, layerData types.DockerImageData, dockerURL *types.ParsedDockerURL, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
+	manifest, err := GenerateManifest(layerData, dockerURL)
+	if err != nil {
+		return "", nil, fmt.Errorf("error generating the manifest: %v", err)
+	}
+
+	imageName := strings.Replace(dockerURL.ImageName, "/", "-", -1)
+	aciPath := imageName + "-" + layerData.ID
+	if dockerURL.Tag != "" {
+		aciPath += "-" + dockerURL.Tag
+	}
+	if layerData.OS != "" {
+		aciPath += "-" + layerData.OS
+		if layerData.Architecture != "" {
+			aciPath += "-" + layerData.Architecture
+		}
+	}
+	aciPath += "-" + strconv.Itoa(layerNumber)
+	aciPath += ".aci"
+
+	aciPath = path.Join(outputDir, aciPath)
+	manifest, err = writeACI(layerFile, *manifest, curPwl, aciPath, compression)
+	if err != nil {
+		return "", nil, fmt.Errorf("error writing ACI: %v", err)
+	}
+
+	if err := ValidateACI(aciPath); err != nil {
+		return "", nil, fmt.Errorf("invalid ACI generated: %v", err)
+	}
+
+	return aciPath, manifest, nil
+}
+
+// ValidateACI checks whether the ACI in aciPath is valid.
+func ValidateACI(aciPath string) error {
+	aciFile, err := os.Open(aciPath)
+	if err != nil {
+		return err
+	}
+	defer aciFile.Close()
+
+	tr, err := aci.NewCompressedTarReader(aciFile)
+	if err != nil {
+		return err
+	}
+	defer tr.Close()
+
+	if err := aci.ValidateArchive(tr.Reader); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// GenerateManifest converts the docker manifest format to an appc
+// ImageManifest.
+func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDockerURL) (*schema.ImageManifest, error) {
+	dockerConfig := layerData.Config
+	genManifest := &schema.ImageManifest{}
+
+	appURL := ""
+	appURL = dockerURL.IndexURL + "/"
+	appURL += dockerURL.ImageName + "-" + layerData.ID
+	appURL, err := appctypes.SanitizeACIdentifier(appURL)
+	if err != nil {
+		return nil, err
+	}
+	name := appctypes.MustACIdentifier(appURL)
+	genManifest.Name = *name
+
+	acVersion, err := appctypes.NewSemVer(schema.AppContainerVersion.String())
+	if err != nil {
+		panic("invalid appc spec version")
+	}
+	genManifest.ACVersion = *acVersion
+
+	genManifest.ACKind = appctypes.ACKind(schema.ImageManifestKind)
+
+	var (
+		labels       appctypes.Labels
+		parentLabels appctypes.Labels
+		annotations  appctypes.Annotations
+	)
+
+	layer := appctypes.MustACIdentifier("layer")
+	labels = append(labels, appctypes.Label{Name: *layer, Value: layerData.ID})
+
+	tag := dockerURL.Tag
+	version := appctypes.MustACIdentifier("version")
+	labels = append(labels, appctypes.Label{Name: *version, Value: tag})
+
+	if layerData.OS != "" {
+		os := appctypes.MustACIdentifier("os")
+		labels = append(labels, appctypes.Label{Name: *os, Value: layerData.OS})
+		parentLabels = append(parentLabels, appctypes.Label{Name: *os, Value: layerData.OS})
+
+		if layerData.Architecture != "" {
+			arch := appctypes.MustACIdentifier("arch")
+			labels = append(labels, appctypes.Label{Name: *arch, Value: layerData.Architecture})
+			parentLabels = append(parentLabels, appctypes.Label{Name: *arch, Value: layerData.Architecture})
+		}
+	}
+
+	if layerData.Author != "" {
+		authorsKey := appctypes.MustACIdentifier("authors")
+		annotations = append(annotations, appctypes.Annotation{Name: *authorsKey, Value: layerData.Author})
+	}
+	epoch := time.Unix(0, 0)
+	if !layerData.Created.Equal(epoch) {
+		createdKey := appctypes.MustACIdentifier("created")
+		annotations = append(annotations, appctypes.Annotation{Name: *createdKey, Value: layerData.Created.Format(time.RFC3339)})
+	}
+	if layerData.Comment != "" {
+		commentKey := appctypes.MustACIdentifier("docker-comment")
+		annotations = append(annotations, appctypes.Annotation{Name: *commentKey, Value: layerData.Comment})
+	}
+
+	if dockerURL.IndexURL != "" {
+		annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerRegistryURL), Value: dockerURL.IndexURL})
+	}
+	annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerRepository), Value: dockerURL.ImageName})
+	annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerImageID), Value: layerData.ID})
+	annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerParentImageID), Value: layerData.Parent})
+
+	if dockerConfig != nil {
+		if len(dockerConfig.Entrypoint) > 0 {
+			entry, err := json.Marshal(dockerConfig.Entrypoint)
+			if err != nil {
+				return nil, err
+			}
+			annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerEntrypoint), Value: string(entry)})
+		}
+		if len(dockerConfig.Cmd) > 0 {
+			cmd, err := json.Marshal(dockerConfig.Cmd)
+			if err != nil {
+				return nil, err
+			}
+			annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerCmd), Value: string(cmd)})
+		}
+
+		exec := getExecCommand(dockerConfig.Entrypoint, dockerConfig.Cmd)
+		if exec != nil {
+			user, group := parseDockerUser(dockerConfig.User)
+			var env appctypes.Environment
+			for _, v := range dockerConfig.Env {
+				parts := strings.SplitN(v, "=", 2)
+				env.Set(parts[0], parts[1])
+			}
+			app := &appctypes.App{
+				Exec:             exec,
+				User:             user,
+				Group:            group,
+				Environment:      env,
+				WorkingDirectory: dockerConfig.WorkingDir,
+			}
+
+			app.MountPoints, err = convertVolumesToMPs(dockerConfig.Volumes)
+			if err != nil {
+				return nil, err
+			}
+
+			app.Ports, err = convertPorts(dockerConfig.ExposedPorts, dockerConfig.PortSpecs)
+			if err != nil {
+				return nil, err
+			}
+
+			genManifest.App = app
+		}
+	}
+
+	if layerData.Parent != "" {
+		indexPrefix := ""
+		// omit docker hub index URL in app name
+		indexPrefix = dockerURL.IndexURL + "/"
+		parentImageNameString := indexPrefix + dockerURL.ImageName + "-" + layerData.Parent
+		parentImageNameString, err := appctypes.SanitizeACIdentifier(parentImageNameString)
+		if err != nil {
+			return nil, err
+		}
+		parentImageName := appctypes.MustACIdentifier(parentImageNameString)
+
+		genManifest.Dependencies = append(genManifest.Dependencies, appctypes.Dependency{ImageName: *parentImageName, Labels: parentLabels})
+
+		annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerTag), Value: dockerURL.Tag})
+	}
+
+	genManifest.Labels = labels
+	genManifest.Annotations = annotations
+
+	return genManifest, nil
+}
+
+type appcPortSorter []appctypes.Port
+
+func (s appcPortSorter) Len() int {
+	return len(s)
+}
+
+func (s appcPortSorter) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
+func (s appcPortSorter) Less(i, j int) bool {
+	return s[i].Name.String() < s[j].Name.String()
+}
+
+func convertPorts(dockerExposedPorts map[string]struct{}, dockerPortSpecs []string) ([]appctypes.Port, error) {
+	ports := []appctypes.Port{}
+
+	for ep := range dockerExposedPorts {
+		appcPort, err := parseDockerPort(ep)
+		if err != nil {
+			return nil, err
+		}
+		ports = append(ports, *appcPort)
+	}
+
+	if dockerExposedPorts == nil && dockerPortSpecs != nil {
+		log.Debug("warning: docker image uses deprecated PortSpecs field")
+		for _, ep := range dockerPortSpecs {
+			appcPort, err := parseDockerPort(ep)
+			if err != nil {
+				return nil, err
+			}
+			ports = append(ports, *appcPort)
+		}
+	}
+
+	sort.Sort(appcPortSorter(ports))
+
+	return ports, nil
+}
+
+func parseDockerPort(dockerPort string) (*appctypes.Port, error) {
+	var portString string
+	proto := "tcp"
+	sp := strings.Split(dockerPort, "/")
+	if len(sp) < 2 {
+		portString = dockerPort
+	} else {
+		proto = sp[1]
+		portString = sp[0]
+	}
+
+	port, err := strconv.ParseUint(portString, 10, 0)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing port %q: %v", portString, err)
+	}
+
+	sn, err := appctypes.SanitizeACName(dockerPort)
+	if err != nil {
+		return nil, err
+	}
+
+	appcPort := &appctypes.Port{
+		Name:     *appctypes.MustACName(sn),
+		Protocol: proto,
+		Port:     uint(port),
+	}
+
+	return appcPort, nil
+}
+
+type appcVolSorter []appctypes.MountPoint
+
+func (s appcVolSorter) Len() int {
+	return len(s)
+}
+
+func (s appcVolSorter) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
+func (s appcVolSorter) Less(i, j int) bool {
+	return s[i].Name.String() < s[j].Name.String()
+}
+
+func convertVolumesToMPs(dockerVolumes map[string]struct{}) ([]appctypes.MountPoint, error) {
+	mps := []appctypes.MountPoint{}
+	dup := make(map[string]int)
+
+	for p := range dockerVolumes {
+		n := filepath.Join("volume", p)
+		sn, err := appctypes.SanitizeACName(n)
+		if err != nil {
+			return nil, err
+		}
+
+		// check for duplicate names
+		if i, ok := dup[sn]; ok {
+			dup[sn] = i + 1
+			sn = fmt.Sprintf("%s-%d", sn, i)
+		} else {
+			dup[sn] = 1
+		}
+
+		mp := appctypes.MountPoint{
+			Name: *appctypes.MustACName(sn),
+			Path: p,
+		}
+
+		mps = append(mps, mp)
+	}
+
+	sort.Sort(appcVolSorter(mps))
+
+	return mps, nil
+}
+
+func writeACI(layer io.ReadSeeker, manifest schema.ImageManifest, curPwl []string, output string, compression common.Compression) (*schema.ImageManifest, error) {
+	aciFile, err := os.Create(output)
+	if err != nil {
+		return nil, fmt.Errorf("error creating ACI file: %v", err)
+	}
+	defer aciFile.Close()
+
+	var w io.WriteCloser = aciFile
+	if compression == common.GzipCompression {
+		w = gzip.NewWriter(aciFile)
+		defer w.Close()
+	}
+	trw := tar.NewWriter(w)
+	defer trw.Close()
+
+	if err := WriteRootfsDir(trw); err != nil {
+		return nil, fmt.Errorf("error writing rootfs entry: %v", err)
+	}
+
+	fileMap := make(map[string]struct{})
+	var whiteouts []string
+	convWalker := func(t *tarball.TarFile) error {
+		name := t.Name()
+		if name == "./" {
+			return nil
+		}
+		t.Header.Name = path.Join("rootfs", name)
+		absolutePath := strings.TrimPrefix(t.Header.Name, "rootfs")
+
+		if filepath.Clean(absolutePath) == "/dev" && t.Header.Typeflag != tar.TypeDir {
+			return fmt.Errorf(`invalid layer: "/dev" is not a directory`)
+		}
+
+		fileMap[absolutePath] = struct{}{}
+		if strings.Contains(t.Header.Name, "/.wh.") {
+			whiteouts = append(whiteouts, strings.Replace(absolutePath, ".wh.", "", 1))
+			return nil
+		}
+		if t.Header.Typeflag == tar.TypeLink {
+			t.Header.Linkname = path.Join("rootfs", t.Linkname())
+		}
+
+		if err := trw.WriteHeader(t.Header); err != nil {
+			return err
+		}
+		if _, err := io.Copy(trw, t.TarStream); err != nil {
+			return err
+		}
+
+		if !util.In(curPwl, absolutePath) {
+			curPwl = append(curPwl, absolutePath)
+		}
+
+		return nil
+	}
+	tr, err := aci.NewCompressedTarReader(layer)
+	if err == nil {
+		defer tr.Close()
+		// write files in rootfs/
+		if err := tarball.Walk(*tr.Reader, convWalker); err != nil {
+			return nil, err
+		}
+	} else {
+		// ignore errors: empty layers in tars generated by docker save are not
+		// valid tar files so we ignore errors trying to open them. Converted
+		// ACIs will have the manifest and an empty rootfs directory in any
+		// case.
+	}
+	newPwl := subtractWhiteouts(curPwl, whiteouts)
+
+	newPwl, err = writeStdioSymlinks(trw, fileMap, newPwl)
+	if err != nil {
+		return nil, err
+	}
+	// Let's copy the newly generated PathWhitelist to avoid unintended
+	// side-effects
+	manifest.PathWhitelist = make([]string, len(newPwl))
+	copy(manifest.PathWhitelist, newPwl)
+
+	if err := WriteManifest(trw, manifest); err != nil {
+		return nil, fmt.Errorf("error writing manifest: %v", err)
+	}
+
+	return &manifest, nil
+}
+
+func getExecCommand(entrypoint []string, cmd []string) appctypes.Exec {
+	return append(entrypoint, cmd...)
+}
+
+func parseDockerUser(dockerUser string) (string, string) {
+	// if the docker user is empty assume root user and group
+	if dockerUser == "" {
+		return "0", "0"
+	}
+
+	dockerUserParts := strings.Split(dockerUser, ":")
+
+	// when only the user is given, the docker spec says that the default and
+	// supplementary groups of the user in /etc/passwd should be applied.
+	// Assume root group for now in this case.
+	if len(dockerUserParts) < 2 {
+		return dockerUserParts[0], "0"
+	}
+
+	return dockerUserParts[0], dockerUserParts[1]
+}
+
+func subtractWhiteouts(pathWhitelist []string, whiteouts []string) []string {
+	matchPaths := []string{}
+	for _, path := range pathWhitelist {
+		// If one of the parent dirs of the current path matches the
+		// whiteout then also this path should be removed
+		curPath := path
+		for curPath != "/" {
+			for _, whiteout := range whiteouts {
+				if curPath == whiteout {
+					matchPaths = append(matchPaths, path)
+				}
+			}
+			curPath = filepath.Dir(curPath)
+		}
+	}
+	for _, matchPath := range matchPaths {
+		idx := util.IndexOf(pathWhitelist, matchPath)
+		if idx != -1 {
+			pathWhitelist = append(pathWhitelist[:idx], pathWhitelist[idx+1:]...)
+		}
+	}
+
+	sort.Sort(sort.StringSlice(pathWhitelist))
+
+	return pathWhitelist
+}
+
+// WriteManifest writes a schema.ImageManifest entry on a tar.Writer.
+func WriteManifest(outputWriter *tar.Writer, manifest schema.ImageManifest) error {
+	b, err := json.Marshal(manifest)
+	if err != nil {
+		return err
+	}
+
+	hdr := getGenericTarHeader()
+	hdr.Name = "manifest"
+	hdr.Mode = 0644
+	hdr.Size = int64(len(b))
+	hdr.Typeflag = tar.TypeReg
+
+	if err := outputWriter.WriteHeader(hdr); err != nil {
+		return err
+	}
+	if _, err := outputWriter.Write(b); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// WriteRootfsDir writes a "rootfs" dir entry on a tar.Writer.
+func WriteRootfsDir(tarWriter *tar.Writer) error {
+	hdr := getGenericTarHeader()
+	hdr.Name = "rootfs"
+	hdr.Mode = 0755
+	hdr.Size = int64(0)
+	hdr.Typeflag = tar.TypeDir
+
+	return tarWriter.WriteHeader(hdr)
+}
+
+type symlink struct {
+	linkname string
+	target   string
+}
+
+// writeStdioSymlinks adds the /dev/stdin, /dev/stdout, /dev/stderr, and
+// /dev/fd symlinks expected by Docker to the converted ACIs so apps can find
+// them as expected
+func writeStdioSymlinks(tarWriter *tar.Writer, fileMap map[string]struct{}, pwl []string) ([]string, error) {
+	stdioSymlinks := []symlink{
+		{"/dev/stdin", "/proc/self/fd/0"},
+		// Docker makes /dev/{stdout,stderr} point to /proc/self/fd/{1,2} but
+		// we point to /dev/console instead in order to support the case when
+		// stdout/stderr is a Unix socket (e.g. for the journal).
+		{"/dev/stdout", "/dev/console"},
+		{"/dev/stderr", "/dev/console"},
+		{"/dev/fd", "/proc/self/fd"},
+	}
+
+	for _, s := range stdioSymlinks {
+		name := s.linkname
+		target := s.target
+		if _, exists := fileMap[name]; exists {
+			continue
+		}
+		hdr := &tar.Header{
+			Name:     filepath.Join("rootfs", name),
+			Mode:     0777,
+			Typeflag: tar.TypeSymlink,
+			Linkname: target,
+		}
+		if err := tarWriter.WriteHeader(hdr); err != nil {
+			return nil, err
+		}
+		if !util.In(pwl, name) {
+			pwl = append(pwl, name)
+		}
+	}
+
+	return pwl, nil
+}
+
+func getGenericTarHeader() *tar.Header {
+	// FIXME(iaguis) Use docker image time instead of the Unix Epoch?
+	hdr := &tar.Header{
+		Uid:        0,
+		Gid:        0,
+		ModTime:    time.Unix(0, 0),
+		Uname:      "0",
+		Gname:      "0",
+		ChangeTime: time.Unix(0, 0),
+	}
+
+	return hdr
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/tarball/tarfile.go b/vendor/github.com/appc/docker2aci/lib/internal/tarball/tarfile.go
new file mode 100644
index 0000000000..c72d18d9d9
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/tarball/tarfile.go
@@ -0,0 +1,42 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package tarball provides functions to manipulate tar files.
+//
+// Note: this package is an implementation detail and shouldn't be used outside
+// of docker2aci.
+package tarball
+
+import (
+	"archive/tar"
+	"io"
+)
+
+// TarFile is a representation of a file in a tarball. It consists of two parts,
+// the Header and the Stream. The Header is a regular tar header, the Stream
+// is a byte stream that can be used to read the file's contents.
+type TarFile struct {
+	Header    *tar.Header
+	TarStream io.Reader
+}
+
+// Name returns the name of the file as reported by the header.
+func (t *TarFile) Name() string {
+	return t.Header.Name
+}
+
+// Linkname returns the Linkname of the file as reported by the header.
+func (t *TarFile) Linkname() string {
+	return t.Header.Linkname
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/tarball/walk.go b/vendor/github.com/appc/docker2aci/lib/internal/tarball/walk.go
new file mode 100644
index 0000000000..c12d2e34fb
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/tarball/walk.go
@@ -0,0 +1,43 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tarball
+
+import (
+	"archive/tar"
+	"fmt"
+	"io"
+)
+
+// WalkFunc is a func for handling each file (header and byte stream) in a tarball
+type WalkFunc func(t *TarFile) error
+
+// Walk walks through the files in the tarball represented by tarstream and
+// passes each of them to the WalkFunc provided as an argument
+func Walk(tarReader tar.Reader, walkFunc func(t *TarFile) error) error {
+	for {
+		hdr, err := tarReader.Next()
+		if err == io.EOF {
+			// end of tar archive
+			break
+		}
+		if err != nil {
+			return fmt.Errorf("Error reading tar entry: %v", err)
+		}
+		if err := walkFunc(&TarFile{Header: hdr, TarStream: &tarReader}); err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/types/docker_types.go b/vendor/github.com/appc/docker2aci/lib/internal/types/docker_types.go
new file mode 100644
index 0000000000..7af1e17e7a
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/types/docker_types.go
@@ -0,0 +1,92 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import "time"
+
+// DockerImageData stores the JSON structure of a Docker image.
+// Taken and adapted from upstream Docker.
+type DockerImageData struct {
+	ID              string             `json:"id"`
+	Parent          string             `json:"parent,omitempty"`
+	Comment         string             `json:"comment,omitempty"`
+	Created         time.Time          `json:"created"`
+	Container       string             `json:"container,omitempty"`
+	ContainerConfig DockerImageConfig  `json:"container_config,omitempty"`
+	DockerVersion   string             `json:"docker_version,omitempty"`
+	Author          string             `json:"author,omitempty"`
+	Config          *DockerImageConfig `json:"config,omitempty"`
+	Architecture    string             `json:"architecture,omitempty"`
+	OS              string             `json:"os,omitempty"`
+	Checksum        string             `json:"checksum"`
+}
+
+// Note: the Config structure should hold only portable information about the container.
+// Here, "portable" means "independent from the host we are running on".
+// Non-portable information *should* appear in HostConfig.
+// Taken and adapted from upstream Docker.
+type DockerImageConfig struct {
+	Hostname        string
+	Domainname      string
+	User            string
+	Memory          int64  // Memory limit (in bytes)
+	MemorySwap      int64  // Total memory usage (memory + swap); set `-1' to disable swap
+	CpuShares       int64  // CPU shares (relative weight vs. other containers)
+	Cpuset          string // Cpuset 0-2, 0,1
+	AttachStdin     bool
+	AttachStdout    bool
+	AttachStderr    bool
+	PortSpecs       []string // Deprecated - Can be in the format of 8080/tcp
+	ExposedPorts    map[string]struct{}
+	Tty             bool // Attach standard streams to a tty, including stdin if it is not closed.
+	OpenStdin       bool // Open stdin
+	StdinOnce       bool // If true, close stdin after the 1 attached client disconnects.
+	Env             []string
+	Cmd             []string
+	Image           string // Name of the image as it was passed by the operator (eg. could be symbolic)
+	Volumes         map[string]struct{}
+	WorkingDir      string
+	Entrypoint      []string
+	NetworkDisabled bool
+	MacAddress      string
+	OnBuild         []string
+}
+
+// DockerAuthConfigOld represents the deprecated ~/.dockercfg auth
+// configuration.
+// Taken from upstream Docker.
+type DockerAuthConfigOld struct {
+	Username      string `json:"username,omitempty"`
+	Password      string `json:"password,omitempty"`
+	Auth          string `json:"auth"`
+	Email         string `json:"email"`
+	ServerAddress string `json:"serveraddress,omitempty"`
+}
+
+// DockerAuthConfig represents a config.json auth entry.
+// Taken from upstream Docker.
+type DockerAuthConfig struct {
+	Username      string `json:"username,omitempty"`
+	Password      string `json:"password,omitempty"`
+	Auth          string `json:"auth,omitempty"`
+	ServerAddress string `json:"serveraddress,omitempty"`
+	RegistryToken string `json:"registrytoken,omitempty"`
+}
+
+// DockerConfigFile represents a config.json auth file.
+// Taken from upstream docker.
+type DockerConfigFile struct {
+	AuthConfigs map[string]DockerAuthConfig `json:"auths"`
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/types/types.go b/vendor/github.com/appc/docker2aci/lib/internal/types/types.go
new file mode 100644
index 0000000000..cc4fc12ac8
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/types/types.go
@@ -0,0 +1,27 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package types defines Docker image, URL and configuration types.
+//
+// Note: this package is an implementation detail and shouldn't be used outside
+// of docker2aci.
+package types
+
+// ParsedDockerURL represents a parsed Docker URL.
+type ParsedDockerURL struct {
+	IndexURL  string
+	ImageName string
+	Tag       string
+	Digest    string
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/util/util.go b/vendor/github.com/appc/docker2aci/lib/internal/util/util.go
new file mode 100644
index 0000000000..ebaafca62c
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/util/util.go
@@ -0,0 +1,83 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package util defines convenience functions for handling slices and debugging.
+//
+// Note: this package is an implementation detail and shouldn't be used outside
+// of docker2aci.
+package util
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net/http"
+
+	"github.com/appc/spec/pkg/acirenderer"
+)
+
+// Quote takes a slice of strings and returns another slice with them quoted.
+func Quote(l []string) []string {
+	var quoted []string
+
+	for _, s := range l {
+		quoted = append(quoted, fmt.Sprintf("%q", s))
+	}
+
+	return quoted
+}
+
+// ReverseImages takes an acirenderer.Images and reverses it.
+func ReverseImages(s acirenderer.Images) acirenderer.Images {
+	var o acirenderer.Images
+	for i := len(s) - 1; i >= 0; i-- {
+		o = append(o, s[i])
+	}
+
+	return o
+}
+
+// In checks whether el is in list.
+func In(list []string, el string) bool {
+	return IndexOf(list, el) != -1
+}
+
+// IndexOf returns the index of el in list, or -1 if it's not found.
+func IndexOf(list []string, el string) int {
+	for i, x := range list {
+		if el == x {
+			return i
+		}
+	}
+	return -1
+}
+
+// GetTLSClient gets an HTTP client that behaves like the default HTTP
+// client, but optionally skips the TLS certificate verification.
+func GetTLSClient(skipTLSCheck bool) *http.Client {
+	if !skipTLSCheck {
+		return http.DefaultClient
+	}
+	client := *http.DefaultClient
+	// Default transport is hidden behind the RoundTripper
+	// interface, so we can't easily make a copy of it. If this
+	// ever panics, we will have to adapt.
+	realTransport := http.DefaultTransport.(*http.Transport)
+	tr := *realTransport
+	if tr.TLSClientConfig == nil {
+		tr.TLSClientConfig = &tls.Config{}
+	}
+	tr.TLSClientConfig.InsecureSkipVerify = true
+	client.Transport = &tr
+	return &client
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
new file mode 100644
index 0000000000..487c4bc50e
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -0,0 +1,20 @@
+// Copyright 2016 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package docker2aci
+
+import "github.com/appc/spec/schema"
+
+var Version = "0.11.1"
+var AppcVersion = schema.AppContainerVersion
diff --git a/vendor/github.com/appc/docker2aci/main.go b/vendor/github.com/appc/docker2aci/main.go
new file mode 100644
index 0000000000..e52ca29769
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/main.go
@@ -0,0 +1,222 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"net/url"
+	"os"
+	"strings"
+
+	"github.com/appc/docker2aci/lib"
+	"github.com/appc/docker2aci/lib/common"
+	"github.com/appc/docker2aci/pkg/log"
+
+	"github.com/appc/spec/aci"
+	"github.com/appc/spec/schema"
+)
+
+var (
+	flagNoSquash           bool
+	flagImage              string
+	flagDebug              bool
+	flagInsecureSkipVerify bool
+	flagInsecureAllowHTTP  bool
+	flagCompression        string
+	flagVersion            bool
+)
+
+func init() {
+	flag.BoolVar(&flagNoSquash, "nosquash", false, "Don't squash layers and output every layer as ACI")
+	flag.StringVar(&flagImage, "image", "", "When converting a local file, it selects a particular image to convert. Format: IMAGE_NAME[:TAG]")
+	flag.BoolVar(&flagDebug, "debug", false, "Enables debug messages")
+	flag.BoolVar(&flagInsecureSkipVerify, "insecure-skip-verify", false, "Don't verify certificates when fetching images")
+	flag.BoolVar(&flagInsecureAllowHTTP, "insecure-allow-http", false, "Uses unencrypted connections when fetching images")
+	flag.StringVar(&flagCompression, "compression", "gzip", "Type of compression to use; allowed values: gzip, none")
+	flag.BoolVar(&flagVersion, "version", false, "Print version")
+}
+
+func printVersion() {
+	fmt.Println("docker2aci version", docker2aci.Version)
+	fmt.Println("appc version", docker2aci.AppcVersion)
+}
+
+func runDocker2ACI(arg string) error {
+	if flagDebug {
+		log.InitDebug()
+	}
+	squash := !flagNoSquash
+
+	var aciLayerPaths []string
+	// try to convert a local file
+	u, err := url.Parse(arg)
+	if err != nil {
+		return fmt.Errorf("error parsing argument: %v", err)
+	}
+
+	var compression common.Compression
+
+	switch flagCompression {
+	case "none":
+		compression = common.NoCompression
+	case "gzip":
+		compression = common.GzipCompression
+	default:
+		return fmt.Errorf("unknown compression method: %s", flagCompression)
+	}
+
+	cfg := docker2aci.CommonConfig{
+		Squash:      squash,
+		OutputDir:   ".",
+		TmpDir:      os.TempDir(),
+		Compression: compression,
+	}
+	if u.Scheme == "docker" {
+		if flagImage != "" {
+			return fmt.Errorf("flag --image works only with files.")
+		}
+		dockerURL := strings.TrimPrefix(arg, "docker://")
+
+		indexServer := docker2aci.GetIndexName(dockerURL)
+
+		var username, password string
+		username, password, err = docker2aci.GetDockercfgAuth(indexServer)
+		if err != nil {
+			return fmt.Errorf("error reading .dockercfg file: %v", err)
+		}
+		remoteConfig := docker2aci.RemoteConfig{
+			CommonConfig: cfg,
+			Username:     username,
+			Password:     password,
+			Insecure: common.InsecureConfig{
+				SkipVerify: flagInsecureSkipVerify,
+				AllowHTTP:  flagInsecureAllowHTTP,
+			},
+		}
+
+		aciLayerPaths, err = docker2aci.ConvertRemoteRepo(dockerURL, remoteConfig)
+	} else {
+		fileConfig := docker2aci.FileConfig{
+			CommonConfig: cfg,
+			DockerURL:    flagImage,
+		}
+		aciLayerPaths, err = docker2aci.ConvertSavedFile(arg, fileConfig)
+		if serr, ok := err.(*common.ErrSeveralImages); ok {
+			err = fmt.Errorf("%s, use option --image with one of:\n\n%s", serr, strings.Join(serr.Images, "\n"))
+		}
+	}
+	if err != nil {
+		return fmt.Errorf("conversion error: %v", err)
+	}
+
+	// we get last layer's manifest, this will include all the elements in the
+	// previous layers. If we're squashing, the last element of aciLayerPaths
+	// will be the squashed image.
+	manifest, err := getManifest(aciLayerPaths[len(aciLayerPaths)-1])
+	if err != nil {
+		return err
+	}
+
+	if err := printConvertedVolumes(*manifest); err != nil {
+		return err
+	}
+	if err := printConvertedPorts(*manifest); err != nil {
+		return err
+	}
+
+	fmt.Printf("\nGenerated ACI(s):\n")
+	for _, aciFile := range aciLayerPaths {
+		fmt.Println(aciFile)
+	}
+
+	return nil
+}
+
+func printConvertedVolumes(manifest schema.ImageManifest) error {
+	if manifest.App != nil && manifest.App.MountPoints != nil {
+		mps := manifest.App.MountPoints
+		if len(mps) > 0 {
+			fmt.Printf("\nConverted volumes:\n")
+			for _, mp := range mps {
+				fmt.Printf("\tname: %q, path: %q, readOnly: %v\n", mp.Name, mp.Path, mp.ReadOnly)
+			}
+		}
+	}
+
+	return nil
+}
+
+func printConvertedPorts(manifest schema.ImageManifest) error {
+	if manifest.App != nil && manifest.App.Ports != nil {
+		ports := manifest.App.Ports
+		if len(ports) > 0 {
+			fmt.Printf("\nConverted ports:\n")
+			for _, port := range ports {
+				fmt.Printf("\tname: %q, protocol: %q, port: %v, count: %v, socketActivated: %v\n",
+					port.Name, port.Protocol, port.Port, port.Count, port.SocketActivated)
+			}
+		}
+	}
+
+	return nil
+}
+
+func getManifest(aciPath string) (*schema.ImageManifest, error) {
+	f, err := os.Open(aciPath)
+	if err != nil {
+		return nil, fmt.Errorf("error opening converted image: %v", err)
+	}
+	defer f.Close()
+
+	manifest, err := aci.ManifestFromImage(f)
+	if err != nil {
+		return nil, fmt.Errorf("error reading manifest from converted image: %v", err)
+	}
+
+	return manifest, nil
+}
+
+func usage() {
+	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "docker2aci [--debug] [--nosquash] [--compression=(gzip|none)] IMAGE\n")
+	fmt.Fprintf(os.Stderr, "  Where IMAGE is\n")
+	fmt.Fprintf(os.Stderr, "    [--image=IMAGE_NAME[:TAG]] FILEPATH\n")
+	fmt.Fprintf(os.Stderr, "  or\n")
+	fmt.Fprintf(os.Stderr, "    docker://[REGISTRYURL/]IMAGE_NAME[:TAG]\n")
+	fmt.Fprintf(os.Stderr, "Flags:\n")
+	flag.PrintDefaults()
+}
+
+func main() {
+	flag.Usage = usage
+	flag.Parse()
+	args := flag.Args()
+
+	if flagVersion {
+		printVersion()
+		return
+	}
+
+	if len(args) < 1 {
+		usage()
+		os.Exit(2)
+	}
+
+	if err := runDocker2ACI(args[0]); err != nil {
+		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+		os.Exit(1)
+	}
+}
diff --git a/vendor/github.com/appc/docker2aci/pkg/log/log.go b/vendor/github.com/appc/docker2aci/pkg/log/log.go
new file mode 100644
index 0000000000..2a02c47414
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/pkg/log/log.go
@@ -0,0 +1,46 @@
+// Copyright 2016 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package log
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"strings"
+)
+
+var debugEnabled bool
+
+func printTo(w io.Writer, i ...interface{}) {
+	s := fmt.Sprint(i...)
+	fmt.Fprintln(w, strings.TrimSuffix(s, "\n"))
+}
+
+// Info prints a message to stderr.
+func Info(i ...interface{}) {
+	printTo(os.Stderr, i...)
+}
+
+// Debug prints a message to stderr if debug is enabled.
+func Debug(i ...interface{}) {
+	if debugEnabled {
+		printTo(os.Stderr, i...)
+	}
+}
+
+// InitDebug enables debug output.
+func InitDebug() {
+	debugEnabled = true
+}
diff --git a/vendor/github.com/appc/goaci/LICENSE b/vendor/github.com/appc/goaci/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/vendor/github.com/appc/goaci/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/appc/goaci/buildercommand.go b/vendor/github.com/appc/goaci/buildercommand.go
new file mode 100644
index 0000000000..586672775d
--- /dev/null
+++ b/vendor/github.com/appc/goaci/buildercommand.go
@@ -0,0 +1,50 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+
+	"github.com/appc/goaci/proj2aci"
+)
+
+// parameterMapper is an interface which should handle command line
+// parameter handling specific to a proj2aci.BuilderCustomizations
+// implementation.
+type parameterMapper interface {
+	Name() string
+	SetupParameters(parameters *flag.FlagSet)
+	GetBuilderCustomizations() proj2aci.BuilderCustomizations
+}
+
+// builderCommand is an implementation of command interface which
+// mainly maps command line parameters to proj2aci.Builder's
+// configuration and runs the builder.
+type builderCommand struct {
+	mapper parameterMapper
+}
+
+func newBuilderCommand(mapper parameterMapper) command {
+	return &builderCommand{
+		mapper: mapper,
+	}
+}
+
+func (cmd *builderCommand) Name() string {
+	custom := cmd.mapper.GetBuilderCustomizations()
+	return custom.Name()
+}
+
+func (cmd *builderCommand) Run(name string, args []string) error {
+	parameters := flag.NewFlagSet(name, flag.ExitOnError)
+	cmd.mapper.SetupParameters(parameters)
+	if err := parameters.Parse(args); err != nil {
+		return err
+	}
+	if len(parameters.Args()) != 1 {
+		return fmt.Errorf("Expected exactly one project to build, got %d", len(args))
+	}
+	custom := cmd.mapper.GetBuilderCustomizations()
+	custom.GetCommonConfiguration().Project = parameters.Args()[0]
+	builder := proj2aci.NewBuilder(custom)
+	return builder.Run()
+}
diff --git a/vendor/github.com/appc/goaci/command.go b/vendor/github.com/appc/goaci/command.go
new file mode 100644
index 0000000000..6e4e539cb1
--- /dev/null
+++ b/vendor/github.com/appc/goaci/command.go
@@ -0,0 +1,12 @@
+package main
+
+// command provides an interface for named actions for command line
+// purposes.
+type command interface {
+	// Name should return a name of a command usable at command
+	// line.
+	Name() string
+	// Run should parse given args and perform some action. name
+	// parameter is given for usage purposes.
+	Run(name string, args []string) error
+}
diff --git a/vendor/github.com/appc/goaci/commands.go b/vendor/github.com/appc/goaci/commands.go
new file mode 100644
index 0000000000..831c4b08fc
--- /dev/null
+++ b/vendor/github.com/appc/goaci/commands.go
@@ -0,0 +1,15 @@
+package main
+
+var (
+	commandsMap map[string]command = make(map[string]command)
+)
+
+func init() {
+	commands := []command{
+		newBuilderCommand(newGoParameterMapper()),
+		newBuilderCommand(newCmakeParameterMapper()),
+	}
+	for _, c := range commands {
+		commandsMap[c.Name()] = c
+	}
+}
diff --git a/vendor/github.com/appc/goaci/main.go b/vendor/github.com/appc/goaci/main.go
new file mode 100644
index 0000000000..24e04c5e33
--- /dev/null
+++ b/vendor/github.com/appc/goaci/main.go
@@ -0,0 +1,59 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"sort"
+
+	"github.com/appc/goaci/proj2aci"
+)
+
+type CmdLineError struct {
+	what string
+}
+
+func (err *CmdLineError) Error() string {
+	return fmt.Sprintf("Command line error: %s", err.what)
+}
+
+func newCmdLineError(format string, args ...interface{}) error {
+	return &CmdLineError{
+		what: fmt.Sprintf(format, args...),
+	}
+}
+
+func main() {
+	if err := mainWithError(); err != nil {
+		proj2aci.Warn(err)
+		if _, ok := err.(*CmdLineError); ok {
+			printUsage()
+		}
+		os.Exit(1)
+	}
+}
+
+func mainWithError() error {
+	proj2aci.InitDebug()
+	if len(os.Args) < 2 {
+		return newCmdLineError("No command specified")
+	}
+	if c, ok := commandsMap[os.Args[1]]; ok {
+		name := fmt.Sprintf("%s %s", os.Args[0], os.Args[1])
+		return c.Run(name, os.Args[2:])
+	} else {
+		return newCmdLineError("No such command: %q", os.Args[1])
+	}
+}
+
+func printUsage() {
+	fmt.Println("Available commands:")
+	commands := make([]string, 0, len(commandsMap))
+	for c := range commandsMap {
+		commands = append(commands, c)
+	}
+	sort.Strings(commands)
+	for _, c := range commands {
+		fmt.Printf("  %s\n", c)
+	}
+	fmt.Printf("Type %s <command> --help to get possible options for chosen command\n", os.Args[0])
+}
diff --git a/vendor/github.com/appc/goaci/mappers.go b/vendor/github.com/appc/goaci/mappers.go
new file mode 100644
index 0000000000..0b1f5c69ff
--- /dev/null
+++ b/vendor/github.com/appc/goaci/mappers.go
@@ -0,0 +1,150 @@
+package main
+
+import (
+	"flag"
+	"os/exec"
+	"sort"
+	"strings"
+
+	"github.com/appc/goaci/proj2aci"
+)
+
+// stringSliceWrapper is an implementation of flag.Value
+// interface. It is basically a proxy that append strings to already
+// existing strings slice.
+type stringSliceWrapper struct {
+	vector *[]string
+}
+
+func (wrapper *stringSliceWrapper) String() string {
+	if len(*wrapper.vector) > 0 {
+		return `["` + strings.Join(*wrapper.vector, `" "`) + `"]`
+	}
+	return "[]"
+}
+
+func (wrapper *stringSliceWrapper) Set(str string) error {
+	*wrapper.vector = append(*wrapper.vector, str)
+	return nil
+}
+
+// commonParameterMapper maps command line parameters to
+// proj2aci.CommonConfiguration.
+type commonParameterMapper struct {
+	custom       proj2aci.BuilderCustomizations
+	config       *proj2aci.CommonConfiguration
+	execWrapper  stringSliceWrapper
+	assetWrapper stringSliceWrapper
+}
+
+func (mapper *commonParameterMapper) setupCommonParameters(parameters *flag.FlagSet) {
+	// --exec
+	mapper.execWrapper.vector = &mapper.config.Exec
+	parameters.Var(&mapper.execWrapper, "exec", "Parameters passed to app, can be used multiple times")
+
+	// --use-binary
+	parameters.StringVar(&mapper.config.UseBinary, "use-binary", "", "Which executable to put in ACI image")
+
+	// --asset
+	mapper.assetWrapper.vector = &mapper.config.Assets
+	parameters.Var(&mapper.assetWrapper, "asset", "Additional assets, can be used multiple times; format: "+proj2aci.GetAssetString("<path in ACI rootfs>", "<local path>")+"; available placeholders for use: "+mapper.getPlaceholders())
+
+	// --keep-tmp-dir
+	parameters.BoolVar(&mapper.config.KeepTmpDir, "keep-tmp-dir", false, "Do not delete temporary directory used for creating ACI")
+
+	// --tmp-dir
+	parameters.StringVar(&mapper.config.TmpDir, "tmp-dir", "", "Use this directory for build a project and an ACI image")
+
+	// --reuse-tmp-dir
+	parameters.StringVar(&mapper.config.ReuseTmpDir, "reuse-tmp-dir", "", "Use this already existing directory with built project to build an ACI image; ACI specific contents in this directory are removed before reuse")
+}
+
+func (mapper *commonParameterMapper) getPlaceholders() string {
+	mapping := mapper.custom.GetPlaceholderMapping()
+	placeholders := make([]string, 0, len(mapping))
+	for p := range mapping {
+		placeholders = append(placeholders, p)
+	}
+	sort.Strings(placeholders)
+	return strings.Join(placeholders, ", ")
+}
+
+func (mapper *commonParameterMapper) Name() string {
+	return mapper.custom.Name()
+}
+
+func (mapper *commonParameterMapper) GetBuilderCustomizations() proj2aci.BuilderCustomizations {
+	return mapper.custom
+}
+
+// goParameterMapper maps command line parameters to
+// proj2aci.GoConfiguration.
+type goParameterMapper struct {
+	commonParameterMapper
+
+	goCustom *proj2aci.GoCustomizations
+}
+
+func newGoParameterMapper() parameterMapper {
+	custom := &proj2aci.GoCustomizations{}
+	return &goParameterMapper{
+		commonParameterMapper: commonParameterMapper{
+			custom: custom,
+			config: custom.GetCommonConfiguration(),
+		},
+		goCustom: custom,
+	}
+}
+
+func (mapper *goParameterMapper) SetupParameters(parameters *flag.FlagSet) {
+	// common params
+	mapper.setupCommonParameters(parameters)
+
+	// --go-binary
+	goDefaultBinaryDesc := "Go binary to use"
+	gocmd, err := exec.LookPath("go")
+	if err != nil {
+		goDefaultBinaryDesc += " (default: none found in $PATH, so it must be provided)"
+	} else {
+		goDefaultBinaryDesc += " (default: whatever go in $PATH)"
+	}
+	parameters.StringVar(&mapper.goCustom.Configuration.GoBinary, "go-binary", gocmd, goDefaultBinaryDesc)
+
+	// --go-path
+	parameters.StringVar(&mapper.goCustom.Configuration.GoPath, "go-path", "", "Custom GOPATH (default: a temporary directory)")
+}
+
+// cmakeParameterMapper maps command line parameters to
+// proj2aci.CmakeConfiguration.
+type cmakeParameterMapper struct {
+	commonParameterMapper
+
+	cmakeCustom       *proj2aci.CmakeCustomizations
+	cmakeParamWrapper stringSliceWrapper
+}
+
+func newCmakeParameterMapper() parameterMapper {
+	custom := &proj2aci.CmakeCustomizations{}
+	return &cmakeParameterMapper{
+		commonParameterMapper: commonParameterMapper{
+			custom: custom,
+			config: custom.GetCommonConfiguration(),
+		},
+		cmakeCustom: custom,
+	}
+}
+
+func (mapper *cmakeParameterMapper) SetupParameters(parameters *flag.FlagSet) {
+	// common params
+	mapper.setupCommonParameters(parameters)
+
+	// --binary-dir
+	parameters.StringVar(&mapper.cmakeCustom.Configuration.BinDir, "binary-dir", "", "Look for binaries in this directory (relative to install path, eg passing /usr/local/mysql/bin would look for a binary in <tmpdir>/install/usr/local/mysql/bin")
+
+	// --reuse-src-dir
+	parameters.StringVar(&mapper.cmakeCustom.Configuration.ReuseSrcDir, "reuse-src-dir", "", "Instead of downloading a project, use this path with already downloaded sources")
+
+	// --cmake-param
+	mapper.cmakeParamWrapper.vector = &mapper.cmakeCustom.Configuration.CmakeParams
+	parameters.Var(&mapper.cmakeParamWrapper, "cmake-param", "Parameters passed to cmake, can be used multiple times")
+}
diff --git a/vendor/github.com/appc/goaci/proj2aci/asset.go b/vendor/github.com/appc/goaci/proj2aci/asset.go
new file mode 100644
index 0000000000..d90ee5fc8e
--- /dev/null
+++ b/vendor/github.com/appc/goaci/proj2aci/asset.go
@@ -0,0 +1,283 @@
+package proj2aci
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+// GetAssetString returns a properly formatted asset string.
+func GetAssetString(aciAsset, localAsset string) string {
+	return getAssetString(aciAsset, localAsset)
+}
+
+// PrepareAssets copies given assets to ACI rootfs directory. It also
+// tries to copy required shared libraries if an asset is a
+// dynamically linked executable or library. placeholderMapping maps
+// placeholders (like "<INSTALLDIR>") to actual paths (usually
+// something inside temporary directory).
+func PrepareAssets(assets []string, rootfs string, placeholderMapping map[string]string) error {
+	newAssets := assets
+	processedAssets := make(map[string]struct{})
+	for len(newAssets) > 0 {
+		assetsToProcess := newAssets
+		newAssets = nil
+		for _, asset := range assetsToProcess {
+			splitAsset := filepath.SplitList(asset)
+			if len(splitAsset) != 2 {
+				return fmt.Errorf("Malformed asset option: '%v' - expected two absolute paths separated with %v", asset, listSeparator())
+			}
+			evalSrc, srcErr := evalPath(splitAsset[0])
+			if srcErr != nil {
+				return fmt.Errorf("Could not evaluate symlinks in source asset %q: %v", evalSrc, srcErr)
+			}
+			evalDest, destErr := evalPath(splitAsset[1])
+			asset = getAssetString(evalSrc, evalDest)
+			Debug("Processing asset:", asset)
+			if _, ok := processedAssets[asset]; ok {
+				Debug("  skipped")
+				continue
+			}
+			additionalAssets, err := processAsset(asset, rootfs, placeholderMapping)
+			if destErr != nil {
+				evalDest, destErr = evalPath(evalDest)
+				if destErr != nil {
+					return fmt.Errorf("Could not evaluate symlinks in destination asset %q, even after it was copied to: %v", evalDest, destErr)
+				}
+				asset = getAssetString(evalSrc, evalDest)
+			}
+			if err != nil {
+				return err
+			}
+			processedAssets[asset] = struct{}{}
+			newAssets = append(newAssets, additionalAssets...)
+		}
+	}
+	return nil
+}
+
+func evalPath(path string) (string, error) {
+	symlinkDir := filepath.Dir(path)
+	symlinkBase := filepath.Base(path)
+	realSymlinkDir, err := filepath.EvalSymlinks(symlinkDir)
+	if err != nil {
+		return path, err
+	}
+	return filepath.Join(realSymlinkDir, symlinkBase), nil
+}
+
+// processAsset validates an asset, replaces placeholders with real
+// paths and does the copying. It may return additional assets to be
+// processed when asset is an executable or a library.
+func processAsset(asset, rootfs string, placeholderMapping map[string]string) ([]string, error) {
+	splitAsset := filepath.SplitList(asset)
+	if len(splitAsset) != 2 {
+		return nil, fmt.Errorf("Malformed asset option: '%v' - expected two absolute paths separated with %v", asset, listSeparator())
+	}
+	ACIAsset := replacePlaceholders(splitAsset[0], placeholderMapping)
+	localAsset := replacePlaceholders(splitAsset[1], placeholderMapping)
+	if err := validateAsset(ACIAsset, localAsset); err != nil {
+		return nil, err
+	}
+	ACIAssetSubPath := filepath.Join(rootfs, filepath.Dir(ACIAsset))
+	err := os.MkdirAll(ACIAssetSubPath, 0755)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to create directory tree for asset '%v': %v", asset, err)
+	}
+	err = copyTree(localAsset, filepath.Join(rootfs, ACIAsset))
+	if err != nil {
+		return nil, fmt.Errorf("Failed to copy assets for %q: %v", asset, err)
+	}
+	additionalAssets, err := getSoLibs(localAsset)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to get dependent assets for %q: %v", localAsset, err)
+	}
+	// HACK! if we are copying libc then try to copy libnss_* libs
+	// (glibc name service switch libs used in networking)
+	if matched, err := filepath.Match("libc.*", filepath.Base(localAsset)); err == nil && matched {
+		toGlob := filepath.Join(filepath.Dir(localAsset), "libnss_*")
+		if matches, err := filepath.Glob(toGlob); err == nil && len(matches) > 0 {
+			matchesAsAssets := make([]string, 0, len(matches))
+			for _, f := range matches {
+				matchesAsAssets = append(matchesAsAssets, getAssetString(f, f))
+			}
+			additionalAssets = append(additionalAssets, matchesAsAssets...)
+		}
+	}
+	return additionalAssets, nil
+}
+
+func replacePlaceholders(path string, placeholderMapping map[string]string) string {
+	Debug("Processing path: ", path)
+	newPath := path
+	for placeholder, replacement := range placeholderMapping {
+		newPath = strings.Replace(newPath, placeholder, replacement, -1)
+	}
+	Debug("Processed path: ", newPath)
+	return newPath
+}
+
+func validateAsset(ACIAsset, localAsset string) error {
+	if !filepath.IsAbs(ACIAsset) {
+		return fmt.Errorf("Wrong ACI asset: '%v' - ACI asset has to be absolute path", ACIAsset)
+	}
+	if !filepath.IsAbs(localAsset) {
+		return fmt.Errorf("Wrong local asset: '%v' - local asset has to be absolute path", localAsset)
+	}
+	fi, err := os.Lstat(localAsset)
+	if err != nil {
+		return fmt.Errorf("Error stating %v: %v", localAsset, err)
+	}
+	mode := fi.Mode()
+	if mode.IsDir() || mode.IsRegular() || isSymlink(mode) {
+		return nil
+	}
+	return fmt.Errorf("Can't handle local asset %v - not a file, not a dir, not a symlink", fi.Name())
+}
+
+func copyTree(src, dest string) error {
+	return filepath.Walk(src, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		rootLess := path[len(src):]
+		target := filepath.Join(dest, rootLess)
+		mode := info.Mode()
+		switch {
+		case mode.IsDir():
+			err := os.Mkdir(target, mode.Perm())
+			if err != nil {
+				return err
+			}
+		case mode.IsRegular():
+			if err := copyRegularFile(path, target); err != nil {
+				return err
+			}
+		case isSymlink(mode):
+			if err := copySymlink(path, target); err != nil {
+				return err
+			}
+		default:
+			return fmt.Errorf("Unsupported node %q in assets, only regular files, directories and symlinks are supported.", path, mode.String())
+		}
+		return nil
+	})
+}
+
+func copyRegularFile(src, dest string) error {
+	srcFile, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer srcFile.Close()
+	destFile, err := os.Create(dest)
+	if err != nil {
+		return err
+	}
+	defer destFile.Close()
+	if _, err := io.Copy(destFile, srcFile); err != nil {
+		return err
+	}
+	fi, err := srcFile.Stat()
+	if err != nil {
+		return err
+	}
+	if err := destFile.Chmod(fi.Mode().Perm()); err != nil {
+		return err
+	}
+	return nil
+}
+
+func copySymlink(src, dest string) error {
+	symTarget, err := os.Readlink(src)
+	if err != nil {
+		return err
+	}
+	if err := os.Symlink(symTarget, dest); err != nil {
+		return err
+	}
+	return nil
+}
+
+// getSoLibs tries to run ldd on given path and to process its output
+// to get a list of shared libraries to copy. This list is returned as
+// an array of assets.
+//
+// man ldd says that running ldd on untrusted executables is dangerous
+// (it might run an executable to get the libraries), so possibly this
+// should be replaced with objdump. Problem with objdump is that it
+// just gives library names, while ldd gives absolute paths to those
+// libraries - to use objdump we need to know the $libdir.
+func getSoLibs(path string) ([]string, error) {
+	assets := []string{}
+	buf := new(bytes.Buffer)
+	args := []string{
+		"ldd",
+		path,
+	}
+	if err := RunCmdFull("", args, nil, "", buf, nil); err != nil {
+		if _, ok := err.(CmdFailedError); !ok {
+			return nil, err
+		}
+	} else {
+		re := regexp.MustCompile(`(?m)^\t(?:\S+\s+=>\s+)?(\/\S+)\s+\([0-9a-fA-Fx]+\)$`)
+		for _, matches := range re.FindAllStringSubmatch(string(buf.Bytes()), -1) {
+			lib := matches[1]
+			if lib == "" {
+				continue
+			}
+			symlinkedAssets, err := getSymlinkedAssets(lib)
+			if err != nil {
+				return nil, err
+			}
+			assets = append(assets, symlinkedAssets...)
+		}
+	}
+	return assets, nil
+}
+
+// getSymlinkedAssets returns an array of many assets if given path is
+// a symlink - useful for getting shared libraries, which are often
+// surrounded with a bunch of symlinks.
+func getSymlinkedAssets(path string) ([]string, error) {
+	assets := []string{}
+	maxLevels := 100
+	levels := maxLevels
+	for {
+		if levels < 1 {
+			return nil, fmt.Errorf("Too many levels of symlinks (>$d)", maxLevels)
+		}
+		fi, err := os.Lstat(path)
+		if err != nil {
+			return nil, err
+		}
+		asset := getAssetString(path, path)
+		assets = append(assets, asset)
+		if !isSymlink(fi.Mode()) {
+			break
+		}
+		symTarget, err := os.Readlink(path)
+		if err != nil {
+			return nil, err
+		}
+		if filepath.IsAbs(symTarget) {
+			path = symTarget
+		} else {
+			path = filepath.Join(filepath.Dir(path), symTarget)
+		}
+		levels--
+	}
+	return assets, nil
+}
+
+func getAssetString(aciAsset, localAsset string) string {
+	return fmt.Sprintf("%s%s%s", aciAsset, listSeparator(), localAsset)
+}
+
+func isSymlink(mode os.FileMode) bool {
+	return mode&os.ModeSymlink == os.ModeSymlink
+}
diff --git a/vendor/github.com/appc/goaci/proj2aci/binary.go b/vendor/github.com/appc/goaci/proj2aci/binary.go
new file mode 100644
index 0000000000..ee54f6c641
--- /dev/null
+++ b/vendor/github.com/appc/goaci/proj2aci/binary.go
@@ -0,0 +1,44 @@
+package proj2aci
+
+import (
+	"fmt"
+	"io/ioutil"
+	"strings"
+)
+
+// GetBinaryName checks if useBinary is in binDir and returns it. If
+// useBinary is empty it returns a binary name if there is only one
+// such in binDir. Otherwise it returns an error.
+func GetBinaryName(binDir, useBinary string) (string, error) {
+	fi, err := ioutil.ReadDir(binDir)
+	if err != nil {
+		return "", err
+	}
+
+	switch {
+	case len(fi) < 1:
+		return "", fmt.Errorf("No binaries found in %q", binDir)
+	case len(fi) == 1:
+		name := fi[0].Name()
+		if useBinary != "" && name != useBinary {
+			return "", fmt.Errorf("No such binary found in %q: %q. There is only %q", binDir, useBinary, name)
+		}
+		Debug("found binary: ", name)
+		return name, nil
+	case len(fi) > 1:
+		names := []string{}
+		for _, v := range fi {
+			names = append(names, v.Name())
+		}
+		if useBinary == "" {
+			return "", fmt.Errorf("Found multiple binaries in %q, but no specific binary is preferred. Please specify which binary to pick up. Following binaries are available: %q", binDir, strings.Join(names, `", "`))
+		}
+		for _, v := range names {
+			if v == useBinary {
+				return v, nil
+			}
+		}
+		return "", fmt.Errorf("No such binary found in %q: %q. There are following binaries available: %q", binDir, useBinary, strings.Join(names, `", "`))
+	}
+	panic("Reaching this point shouldn't be possible.")
+}
diff --git a/vendor/github.com/appc/goaci/proj2aci/builder.go b/vendor/github.com/appc/goaci/proj2aci/builder.go
new file mode 100644
index 0000000000..e512c572af
--- /dev/null
+++ b/vendor/github.com/appc/goaci/proj2aci/builder.go
@@ -0,0 +1,365 @@
+package proj2aci
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"runtime"
+
+	"github.com/appc/spec/aci"
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+// CommonConfiguration keeps configuration items common for all the
+// builders. Users of a Builder are supposed to create a
+// BuilderCustomizations instance, get a CommonConfiguration instance
+// via GetCommonConfiguration function and modify it before running
+// Builder.Run().
+type CommonConfiguration struct {
+	Exec        []string
+	UseBinary   string
+	Assets      []string
+	KeepTmpDir  bool
+	TmpDir      string
+	ReuseTmpDir string
+	Project     string
+}
+
+// CommonPaths keeps some paths common for all builders. Implementers
+// of new BuilderCustomizations can read those after they are set up.
+type CommonPaths struct {
+	TmpDir string
+	AciDir string
+	RootFS string
+}
+
+// BuilderCustomizations is an interface for customizing a build
+// process. The order of function roughly describe the build process.
+type BuilderCustomizations interface {
+	Name() string
+	GetCommonConfiguration() *CommonConfiguration
+	ValidateConfiguration() error
+	GetCommonPaths() *CommonPaths
+	SetupPaths() error
+	GetDirectoriesToMake() []string
+	PrepareProject() error
+	GetPlaceholderMapping() map[string]string
+	GetAssets(aciBinDir string) ([]string, error)
+	GetImageName() (*types.ACIdentifier, error)
+	GetBinaryName() (string, error)
+	GetRepoPath() (string, error)
+	GetImageFileName() (string, error)
+}
+
+type Builder struct {
+	manifest  *schema.ImageManifest
+	aciBinDir string
+	custom    BuilderCustomizations
+}
+
+func NewBuilder(custom BuilderCustomizations) *Builder {
+	return &Builder{
+		manifest:  nil,
+		aciBinDir: "/",
+		custom:    custom,
+	}
+}
+
+func (cmd *Builder) Name() string {
+	return cmd.custom.Name()
+}
+
+func (cmd *Builder) Run() error {
+	Info("Validating builder configuration")
+	if err := cmd.validateConfiguration(); err != nil {
+		return err
+	}
+
+	Info("Setting up paths")
+	if err := cmd.setupPaths(); err != nil {
+		return err
+	}
+
+	config := cmd.custom.GetCommonConfiguration()
+	paths := cmd.custom.GetCommonPaths()
+	if config.KeepTmpDir {
+		Info(fmt.Sprintf("Preserving temporary directory %q", paths.TmpDir))
+	} else {
+		defer os.RemoveAll(paths.TmpDir)
+	}
+
+	if config.ReuseTmpDir != "" {
+		Info("Reusing temporary directory")
+		Info("Deleting old ACI contents")
+		if err := os.RemoveAll(paths.AciDir); err != nil {
+			return err
+		}
+
+		Info("Creating directories")
+		if err := cmd.makeDirectories(); err != nil {
+			return err
+		}
+	} else {
+		Info("Creating directories")
+		if err := cmd.makeDirectories(); err != nil {
+			return err
+		}
+
+		Info("Preparing a project")
+		if err := cmd.prepareProject(); err != nil {
+			return err
+		}
+	}
+
+	Info("Copying assets to ACI directory")
+	if err := cmd.copyAssets(); err != nil {
+		return err
+	}
+
+	Info("Preparing manifest")
+	if err := cmd.prepareManifest(); err != nil {
+		return err
+	}
+
+	Info("Writing ACI")
+	if name, err := cmd.writeACI(); err != nil {
+		return err
+	} else {
+		Info(fmt.Sprintf("Done, wrote %q", name))
+	}
+	return nil
+}
+
+func (cmd *Builder) validateConfiguration() error {
+	config := cmd.custom.GetCommonConfiguration()
+	if config == nil {
+		panic("common configuration is nil")
+	}
+	if config.Project == "" {
+		fmt.Errorf("Got no project to build")
+	}
+
+	if config.TmpDir != "" && config.ReuseTmpDir != "" && config.TmpDir != config.ReuseTmpDir {
+		return fmt.Errorf("Specified both tmp dir to reuse and a tmp dir and they are different. ")
+	}
+	if !DirExists(config.ReuseTmpDir) {
+		return fmt.Errorf("Invalid tmp dir to reuse")
+	}
+
+	return cmd.custom.ValidateConfiguration()
+}
+
+func (cmd *Builder) setupPaths() error {
+	config := cmd.custom.GetCommonConfiguration()
+	paths := cmd.custom.GetCommonPaths()
+	tmpDir := ""
+	if config.TmpDir != "" {
+		tmpDir = config.TmpDir
+	} else if config.ReuseTmpDir != "" {
+		tmpDir = config.ReuseTmpDir
+	} else {
+		tmpName := fmt.Sprintf("proj2aci-%s-", cmd.custom.Name())
+		aTmpDir, err := ioutil.TempDir("", tmpName)
+		if err != nil {
+			return fmt.Errorf("Failed to set up temporary directory: %v", err)
+		}
+		tmpDir = aTmpDir
+	}
+	paths.TmpDir = tmpDir
+	paths.AciDir = filepath.Join(paths.TmpDir, "aci")
+	paths.RootFS = filepath.Join(paths.AciDir, "rootfs")
+	return cmd.custom.SetupPaths()
+}
+
+func (cmd *Builder) makeDirectories() error {
+	paths := cmd.custom.GetCommonPaths()
+	config := cmd.custom.GetCommonConfiguration()
+
+	toMake := []string{}
+	if config.ReuseTmpDir == "" && config.TmpDir != "" {
+		tmpDirs, err := tmpDirList(paths.TmpDir)
+		if err != nil {
+			return err
+		}
+		toMake = append(toMake, tmpDirs...)
+	}
+	toMake = append(toMake, paths.AciDir, paths.RootFS)
+	if config.ReuseTmpDir == "" {
+		toMake = append(toMake, cmd.custom.GetDirectoriesToMake()...)
+	}
+
+	for _, dir := range toMake {
+		Debug("mkdir ", dir)
+		if err := os.Mkdir(dir, 0755); err != nil {
+			return fmt.Errorf("Failed to make directory %q: %v", dir, err)
+		}
+	}
+	return nil
+}
+
+func tmpDirList(path string) ([]string, error) {
+	list := []string{}
+	test := path
+	for {
+		if _, err := os.Stat(test); err != nil {
+			if !os.IsNotExist(err) {
+				return nil, err
+			}
+			// prepend
+			list = append([]string{test}, list...)
+			test = filepath.Dir(test)
+		} else {
+			break
+		}
+	}
+	return list, nil
+}
+
+func (cmd *Builder) prepareProject() error {
+	return cmd.custom.PrepareProject()
+}
+
+func (cmd *Builder) copyAssets() error {
+	paths := cmd.custom.GetCommonPaths()
+	config := cmd.custom.GetCommonConfiguration()
+	mapping := cmd.custom.GetPlaceholderMapping()
+	customAssets, err := cmd.custom.GetAssets(cmd.aciBinDir)
+	if err != nil {
+		return err
+	}
+	assets := append(config.Assets, customAssets...)
+	if err := PrepareAssets(assets, paths.RootFS, mapping); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *Builder) prepareManifest() error {
+	name, err := cmd.custom.GetImageName()
+	if err != nil {
+		return err
+	}
+	labels, err := cmd.getLabels()
+	if err != nil {
+		return err
+	}
+	app, err := cmd.getApp()
+	if err != nil {
+		return err
+	}
+
+	cmd.manifest = schema.BlankImageManifest()
+	cmd.manifest.Name = *name
+	cmd.manifest.App = app
+	cmd.manifest.Labels = labels
+	return nil
+}
+
+func (cmd *Builder) getApp() (*types.App, error) {
+	binaryName, err := cmd.custom.GetBinaryName()
+	if err != nil {
+		return nil, err
+	}
+	exec := []string{filepath.Join(cmd.aciBinDir, binaryName)}
+	config := cmd.custom.GetCommonConfiguration()
+
+	return &types.App{
+		Exec:  append(exec, config.Exec...),
+		User:  "0",
+		Group: "0",
+	}, nil
+}
+
+func (cmd *Builder) getLabels() (types.Labels, error) {
+	arch, err := newLabel("arch", runtime.GOARCH)
+	if err != nil {
+		return nil, err
+	}
+	os, err := newLabel("os", runtime.GOOS)
+	if err != nil {
+		return nil, err
+	}
+
+	labels := types.Labels{
+		*arch,
+		*os,
+	}
+
+	vcsLabel, err := cmd.getVCSLabel()
+	if err != nil {
+		return nil, err
+	} else if vcsLabel != nil {
+		labels = append(labels, *vcsLabel)
+	}
+
+	return labels, nil
+}
+
+func newLabel(name, value string) (*types.Label, error) {
+	acName, err := types.NewACIdentifier(name)
+	if err != nil {
+		return nil, err
+	}
+	return &types.Label{
+		Name:  *acName,
+		Value: value,
+	}, nil
+}
+
+func (cmd *Builder) getVCSLabel() (*types.Label, error) {
+	repoPath, err := cmd.custom.GetRepoPath()
+	if err != nil {
+		return nil, err
+	}
+	if repoPath == "" {
+		return nil, nil
+	}
+	name, value, err := GetVCSInfo(repoPath)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to get VCS info: %v", err)
+	}
+	acname, err := types.NewACIdentifier(name)
+	if err != nil {
+		return nil, fmt.Errorf("Invalid VCS label: %v", err)
+	}
+	return &types.Label{
+		Name:  *acname,
+		Value: value,
+	}, nil
+}
+
+func (cmd *Builder) writeACI() (string, error) {
+	mode := os.O_CREATE | os.O_WRONLY | os.O_TRUNC
+	filename, err := cmd.custom.GetImageFileName()
+	if err != nil {
+		return "", err
+	}
+	of, err := os.OpenFile(filename, mode, 0644)
+	if err != nil {
+		return "", fmt.Errorf("Error opening output file: %v", err)
+	}
+	defer of.Close()
+
+	gw := gzip.NewWriter(of)
+	defer gw.Close()
+
+	tr := tar.NewWriter(gw)
+	defer tr.Close()
+
+	// FIXME: the files in the tar archive are added with the
+	// wrong uid/gid. The uid/gid of the aci builder leaks in the
+	// tar archive. See: https://github.com/appc/goaci/issues/16
+	iw := aci.NewImageWriter(*cmd.manifest, tr)
+	paths := cmd.custom.GetCommonPaths()
+	if err := filepath.Walk(paths.AciDir, aci.BuildWalker(paths.AciDir, iw, nil)); err != nil {
+		return "", err
+	}
+	if err := iw.Close(); err != nil {
+		return "", err
+	}
+	return of.Name(), nil
+}
diff --git a/vendor/github.com/appc/goaci/proj2aci/cmake.go b/vendor/github.com/appc/goaci/proj2aci/cmake.go
new file mode 100644
index 0000000000..e8dea907d0
--- /dev/null
+++ b/vendor/github.com/appc/goaci/proj2aci/cmake.go
@@ -0,0 +1,234 @@
+package proj2aci
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+
+	"golang.org/x/tools/go/vcs"
+)
+
+type CmakeConfiguration struct {
+	CommonConfiguration
+	BinDir      string
+	ReuseSrcDir string
+	CmakeParams []string
+}
+
+type CmakePaths struct {
+	CommonPaths
+	src     string
+	build   string
+	install string
+	binDir  string
+}
+
+type CmakeCustomizations struct {
+	Configuration CmakeConfiguration
+
+	paths       CmakePaths
+	fullBinPath string
+}
+
+func (custom *CmakeCustomizations) Name() string {
+	return "cmake"
+}
+
+func (custom *CmakeCustomizations) GetCommonConfiguration() *CommonConfiguration {
+	return &custom.Configuration.CommonConfiguration
+}
+
+func (custom *CmakeCustomizations) ValidateConfiguration() error {
+	if !DirExists(custom.Configuration.ReuseSrcDir) {
+		return fmt.Errorf("Invalid src dir to reuse")
+	}
+	return nil
+}
+
+func (custom *CmakeCustomizations) GetCommonPaths() *CommonPaths {
+	return &custom.paths.CommonPaths
+}
+
+func (custom *CmakeCustomizations) SetupPaths() error {
+	setupReusableDir(&custom.paths.src, custom.Configuration.ReuseSrcDir, filepath.Join(custom.paths.TmpDir, "src"))
+	custom.paths.build = filepath.Join(custom.paths.TmpDir, "build")
+	custom.paths.install = filepath.Join(custom.paths.TmpDir, "install")
+	return nil
+}
+
+func setupReusableDir(path *string, reusePath, stockPath string) {
+	if path == nil {
+		panic("path in setupReusableDir cannot be nil")
+	}
+	if reusePath != "" {
+		*path = reusePath
+	} else {
+		*path = stockPath
+	}
+}
+
+func (custom *CmakeCustomizations) GetDirectoriesToMake() []string {
+	dirs := []string{
+		custom.paths.build,
+		custom.paths.install,
+	}
+	// not creating custom.paths.src, because go.vcs requires the
+	// src directory to be nonexistent
+	return dirs
+}
+
+func (custom *CmakeCustomizations) PrepareProject() error {
+	if custom.Configuration.ReuseSrcDir == "" {
+		if err := custom.createRepo(); err != nil {
+			return err
+		}
+	}
+
+	Info("Running cmake")
+	if err := custom.runCmake(); err != nil {
+		return err
+	}
+
+	Info("Running make")
+	if err := custom.runMake(); err != nil {
+		return err
+	}
+
+	Info("Running make install")
+	if err := custom.runMakeInstall(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (custom *CmakeCustomizations) createRepo() error {
+	Info(fmt.Sprintf("Downloading %s", custom.Configuration.Project))
+	repo, err := vcs.RepoRootForImportPath(custom.Configuration.Project, false)
+	if err != nil {
+		return err
+	}
+	return repo.VCS.Create(custom.paths.src, repo.Repo)
+}
+
+func (custom *CmakeCustomizations) runCmake() error {
+	args := []string{"cmake"}
+	args = append(args, custom.Configuration.CmakeParams...)
+	args = append(args, custom.paths.src)
+	return RunCmd(args, nil, custom.paths.build)
+}
+
+func (custom *CmakeCustomizations) runMake() error {
+	args := []string{
+		"make",
+		fmt.Sprintf("-j%d", runtime.NumCPU()),
+	}
+	return RunCmd(args, nil, custom.paths.build)
+}
+
+func (custom *CmakeCustomizations) runMakeInstall() error {
+	args := []string{
+		"make",
+		"install",
+	}
+	env := append(os.Environ(), "DESTDIR="+custom.paths.install)
+	return RunCmd(args, env, custom.paths.build)
+}
+
+func (custom *CmakeCustomizations) GetPlaceholderMapping() map[string]string {
+	return map[string]string{
+		"<SRCPATH>":     custom.paths.src,
+		"<BUILDPATH>":   custom.paths.build,
+		"<INSTALLPATH>": custom.paths.install,
+	}
+}
+
+func (custom *CmakeCustomizations) GetAssets(aciBinDir string) ([]string, error) {
+	binaryName, err := custom.GetBinaryName()
+	if err != nil {
+		return nil, err
+	}
+	rootBinary := filepath.Join(aciBinDir, binaryName)
+	return []string{GetAssetString(rootBinary, custom.fullBinPath)}, nil
+}
+
+func (custom *CmakeCustomizations) getBinDir() (string, error) {
+	if custom.Configuration.BinDir != "" {
+		return filepath.Join(custom.paths.install, custom.Configuration.BinDir), nil
+	}
+	dirs := []string{
+		"/usr/local/sbin",
+		"/usr/local/bin",
+		"/usr/sbin",
+		"/usr/bin",
+		"/sbin",
+		"/bin",
+	}
+	for _, dir := range dirs {
+		path := filepath.Join(custom.paths.install, dir)
+		_, err := os.Stat(path)
+		if err != nil {
+			if os.IsNotExist(err) {
+				continue
+			}
+			return "", err
+		}
+		return path, nil
+	}
+	return "", fmt.Errorf("Could not find any bin directory")
+}
+
+func (custom *CmakeCustomizations) GetImageName() (*types.ACIdentifier, error) {
+	imageName := custom.Configuration.Project
+	if filepath.Base(imageName) == "..." {
+		imageName = filepath.Dir(imageName)
+		if custom.Configuration.UseBinary != "" {
+			imageName += "-" + custom.Configuration.UseBinary
+		}
+	}
+	return types.NewACIdentifier(strings.ToLower(imageName))
+}
+
+func (custom *CmakeCustomizations) GetBinaryName() (string, error) {
+	if err := custom.findFullBinPath(); err != nil {
+		return "", err
+	}
+
+	return filepath.Base(custom.fullBinPath), nil
+}
+
+func (custom *CmakeCustomizations) findFullBinPath() error {
+	if custom.fullBinPath != "" {
+		return nil
+	}
+	binDir, err := custom.getBinDir()
+	if err != nil {
+		return err
+	}
+	binary, err := GetBinaryName(binDir, custom.Configuration.UseBinary)
+	if err != nil {
+		return err
+	}
+	custom.fullBinPath = filepath.Join(binDir, binary)
+	return nil
+}
+
+func (custom *CmakeCustomizations) GetRepoPath() (string, error) {
+	return custom.paths.src, nil
+}
+
+func (custom *CmakeCustomizations) GetImageFileName() (string, error) {
+	base := filepath.Base(custom.Configuration.Project)
+	if base == "..." {
+		base = filepath.Base(filepath.Dir(custom.Configuration.Project))
+		if custom.Configuration.UseBinary != "" {
+			base += "-" + custom.Configuration.UseBinary
+		}
+	}
+	return base + schema.ACIExtension, nil
+}
diff --git a/vendor/github.com/appc/goaci/proj2aci/go.go b/vendor/github.com/appc/goaci/proj2aci/go.go
new file mode 100644
index 0000000000..2ebed255a4
--- /dev/null
+++ b/vendor/github.com/appc/goaci/proj2aci/go.go
@@ -0,0 +1,195 @@
+package proj2aci
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+type GoConfiguration struct {
+	CommonConfiguration
+	GoBinary string
+	GoPath   string
+}
+
+type GoPaths struct {
+	CommonPaths
+	project string
+	realGo  string
+	fakeGo  string
+	goRoot  string
+	goBin   string
+}
+
+type GoCustomizations struct {
+	Configuration GoConfiguration
+
+	paths GoPaths
+	app   string
+}
+
+func (custom *GoCustomizations) Name() string {
+	return "go"
+}
+
+func (custom *GoCustomizations) GetCommonConfiguration() *CommonConfiguration {
+	return &custom.Configuration.CommonConfiguration
+}
+
+func (custom *GoCustomizations) GetCommonPaths() *CommonPaths {
+	return &custom.paths.CommonPaths
+}
+
+func (custom *GoCustomizations) ValidateConfiguration() error {
+	if custom.Configuration.GoBinary == "" {
+		return fmt.Errorf("Go binary not found")
+	}
+	return nil
+}
+
+func (custom *GoCustomizations) SetupPaths() error {
+	custom.paths.realGo, custom.paths.fakeGo = custom.getGoPath()
+
+	if os.Getenv("GOPATH") != "" {
+		Warn("GOPATH env var is ignored, use --go-path=\"$GOPATH\" option instead")
+	}
+	custom.paths.goRoot = os.Getenv("GOROOT")
+	if custom.paths.goRoot != "" {
+		Warn("Overriding GOROOT env var to ", custom.paths.goRoot)
+	}
+
+	projectName := getProjectName(custom.Configuration.Project)
+	// Project name is path-like string with slashes, but slash is
+	// not a file separator on every OS.
+	custom.paths.project = filepath.Join(custom.paths.realGo, "src", filepath.Join(strings.Split(projectName, "/")...))
+	custom.paths.goBin = filepath.Join(custom.paths.fakeGo, "bin")
+	return nil
+}
+
+// getGoPath returns go path and fake go path. The former is either in
+// /tmp (which is a default) or some other path as specified by
+// --go-path parameter. The latter is always in /tmp.
+func (custom *GoCustomizations) getGoPath() (string, string) {
+	fakeGoPath := filepath.Join(custom.paths.TmpDir, "gopath")
+	if custom.Configuration.GoPath == "" {
+		return fakeGoPath, fakeGoPath
+	}
+	return custom.Configuration.GoPath, fakeGoPath
+}
+
+func getProjectName(project string) string {
+	if filepath.Base(project) != "..." {
+		return project
+	}
+	return filepath.Dir(project)
+}
+
+func (custom *GoCustomizations) GetDirectoriesToMake() []string {
+	return []string{
+		custom.paths.fakeGo,
+		custom.paths.goBin,
+	}
+}
+
+func (custom *GoCustomizations) PrepareProject() error {
+	Info("Running go get")
+	// Construct args for a go get that does a static build
+	args := []string{
+		"go",
+		"get",
+		"-a",
+		custom.Configuration.Project,
+	}
+
+	env := []string{
+		"GOPATH=" + custom.paths.realGo,
+		"GOBIN=" + custom.paths.goBin,
+		"PATH=" + os.Getenv("PATH"),
+	}
+	if custom.paths.goRoot != "" {
+		env = append(env, "GOROOT="+custom.paths.goRoot)
+	}
+
+	cmd := exec.Cmd{
+		Env:    env,
+		Path:   custom.Configuration.GoBinary,
+		Args:   args,
+		Stderr: os.Stderr,
+		Stdout: os.Stdout,
+	}
+	Debug("env: ", cmd.Env)
+	Debug("running command: ", strings.Join(cmd.Args, " "))
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (custom *GoCustomizations) GetPlaceholderMapping() map[string]string {
+	return map[string]string{
+		"<PROJPATH>": custom.paths.project,
+		"<GOPATH>":   custom.paths.realGo,
+	}
+}
+
+func (custom *GoCustomizations) GetAssets(aciBinDir string) ([]string, error) {
+	name, err := custom.GetBinaryName()
+	if err != nil {
+		return nil, err
+	}
+	aciAsset := filepath.Join(aciBinDir, name)
+	localAsset := filepath.Join(custom.paths.goBin, name)
+
+	return []string{GetAssetString(aciAsset, localAsset)}, nil
+}
+
+func (custom *GoCustomizations) GetImageName() (*types.ACIdentifier, error) {
+	imageName := custom.Configuration.Project
+	if filepath.Base(imageName) == "..." {
+		imageName = filepath.Dir(imageName)
+		if custom.Configuration.UseBinary != "" {
+			imageName += "-" + custom.Configuration.UseBinary
+		}
+	}
+	return types.NewACIdentifier(strings.ToLower(imageName))
+}
+
+func (custom *GoCustomizations) GetBinaryName() (string, error) {
+	if err := custom.findBinaryName(); err != nil {
+		return "", err
+	}
+
+	return custom.app, nil
+}
+
+func (custom *GoCustomizations) findBinaryName() error {
+	if custom.app != "" {
+		return nil
+	}
+	binaryName, err := GetBinaryName(custom.paths.goBin, custom.Configuration.UseBinary)
+	if err != nil {
+		return err
+	}
+	custom.app = binaryName
+	return nil
+}
+
+func (custom *GoCustomizations) GetRepoPath() (string, error) {
+	return custom.paths.project, nil
+}
+
+func (custom *GoCustomizations) GetImageFileName() (string, error) {
+	base := filepath.Base(custom.Configuration.Project)
+	if base == "..." {
+		base = filepath.Base(filepath.Dir(custom.Configuration.Project))
+		if custom.Configuration.UseBinary != "" {
+			base += "-" + custom.Configuration.UseBinary
+		}
+	}
+	return base + schema.ACIExtension, nil
+}
diff --git a/vendor/github.com/appc/goaci/proj2aci/run.go b/vendor/github.com/appc/goaci/proj2aci/run.go
new file mode 100644
index 0000000000..532990f30d
--- /dev/null
+++ b/vendor/github.com/appc/goaci/proj2aci/run.go
@@ -0,0 +1,65 @@
+package proj2aci
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+type CmdFailedError struct {
+	Err error
+}
+
+func (e CmdFailedError) Error() string {
+	return fmt.Sprintf("CmdFailedError: %s", e.Err.Error())
+}
+
+type CmdNotFoundError struct {
+	Err error
+}
+
+func (e CmdNotFoundError) Error() string {
+	return fmt.Sprintf("CmdNotFoundError: %s", e.Err.Error())
+}
+
+// RunCmdFull runs given execProg. execProg should be an absolute path
+// to a program or it can be an empty string. In the latter case first
+// string in args is taken and searched for in $PATH.
+//
+// If execution fails then CmdFailedError is returned. This can be
+// useful if we don't care if execution fails or not. CmdNotFoundError
+// is returned if executable is not found.
+func RunCmdFull(execProg string, args, env []string, cwd string, stdout, stderr io.Writer) error {
+	if len(args) < 1 {
+		return fmt.Errorf("No args to execute passed")
+	}
+	prog := execProg
+	if prog == "" {
+		pathProg, err := exec.LookPath(args[0])
+		if err != nil {
+			return CmdNotFoundError{err}
+		}
+		prog = pathProg
+	} else if _, err := os.Stat(prog); err != nil {
+		return CmdNotFoundError{err}
+	}
+	cmd := exec.Cmd{
+		Path:   prog,
+		Args:   args,
+		Env:    env,
+		Dir:    cwd,
+		Stdout: stdout,
+		Stderr: stderr,
+	}
+	Debug(`running command: "`, strings.Join(args, `" "`), `"`)
+	if err := cmd.Run(); err != nil {
+		return CmdFailedError{err}
+	}
+	return nil
+}
+
+func RunCmd(args, env []string, cwd string) error {
+	return RunCmdFull("", args, env, cwd, os.Stdout, os.Stderr)
+}
diff --git a/vendor/github.com/appc/goaci/proj2aci/util.go b/vendor/github.com/appc/goaci/proj2aci/util.go
new file mode 100644
index 0000000000..177c28c805
--- /dev/null
+++ b/vendor/github.com/appc/goaci/proj2aci/util.go
@@ -0,0 +1,68 @@
+package proj2aci
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"unicode/utf8"
+)
+
+var debugEnabled bool
+var pathListSep string
+
+// DirExists checks if directory exists if given path is not empty.
+//
+// This function is rather specific as it is mostly used for checking
+// overrides validity (like overriding temporary directory, where
+// empty string means "do not override").
+func DirExists(path string) bool {
+	if path != "" {
+		fi, err := os.Stat(path)
+		if err != nil || !fi.IsDir() {
+			return false
+		}
+	}
+	return true
+}
+
+func printTo(w io.Writer, i ...interface{}) {
+	s := fmt.Sprint(i...)
+	fmt.Fprintln(w, strings.TrimSuffix(s, "\n"))
+}
+
+func Warn(i ...interface{}) {
+	printTo(os.Stderr, i...)
+}
+
+func Info(i ...interface{}) {
+	printTo(os.Stdout, i...)
+}
+
+func Debug(i ...interface{}) {
+	if debugEnabled {
+		printTo(os.Stdout, i...)
+	}
+}
+
+func InitDebug() {
+	if os.Getenv("GOACI_DEBUG") != "" {
+		debugEnabled = true
+	}
+}
+
+// listSeparator returns filepath.ListSeparator rune as a string.
+func listSeparator() string {
+	if pathListSep == "" {
+		len := utf8.RuneLen(filepath.ListSeparator)
+		if len < 0 {
+			panic("filepath.ListSeparator is not valid utf8?!")
+		}
+		buf := make([]byte, len)
+		len = utf8.EncodeRune(buf, filepath.ListSeparator)
+		pathListSep = string(buf[:len])
+	}
+
+	return pathListSep
+}
diff --git a/vendor/github.com/appc/goaci/proj2aci/vcs.go b/vendor/github.com/appc/goaci/proj2aci/vcs.go
new file mode 100644
index 0000000000..8a6d88b860
--- /dev/null
+++ b/vendor/github.com/appc/goaci/proj2aci/vcs.go
@@ -0,0 +1,118 @@
+package proj2aci
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+)
+
+func repoDirExists(projPath, repoDir string) bool {
+	path := filepath.Join(projPath, repoDir)
+	info, err := os.Stat(path)
+	if err != nil {
+		return false
+	}
+	return info.IsDir()
+}
+
+// getId gets first line of commands output which should hold some VCS
+// specific id of current code checkout.
+func getId(dir, cmd string, params []string) (string, error) {
+	args := []string{cmd}
+	args = append(args, params...)
+	buffer := new(bytes.Buffer)
+	cmdPath, err := exec.LookPath(cmd)
+	if err != nil {
+		return "", nil
+	}
+	process := &exec.Cmd{
+		Path: cmdPath,
+		Args: args,
+		Env: []string{
+			"PATH=" + os.Getenv("PATH"),
+		},
+		Dir:    dir,
+		Stdout: buffer,
+	}
+	if err := process.Run(); err != nil {
+		return "", err
+	}
+	output := string(buffer.Bytes())
+	if newline := strings.Index(output, "\n"); newline < 0 {
+		return output, nil
+	} else {
+		return output[:newline], nil
+	}
+}
+
+func getLabelAndId(label, path, cmd string, params []string) (string, string, error) {
+	if info, err := getId(path, cmd, params); err != nil {
+		return "", "", err
+	} else {
+		return label, info, nil
+	}
+}
+
+type VCSInfo interface {
+	IsValid(path string) bool
+	GetLabelAndId(path string) (string, string, error)
+}
+
+type GitInfo struct{}
+
+func (info GitInfo) IsValid(path string) bool {
+	return repoDirExists(path, ".git")
+}
+
+func (info GitInfo) GetLabelAndId(path string) (string, string, error) {
+	return getLabelAndId("git", path, "git", []string{"rev-parse", "HEAD"})
+}
+
+type HgInfo struct{}
+
+func (info HgInfo) IsValid(path string) bool {
+	return repoDirExists(path, ".hg")
+}
+
+func (info HgInfo) GetLabelAndId(path string) (string, string, error) {
+	return getLabelAndId("hg", path, "hg", []string{"id", "-i"})
+}
+
+type SvnInfo struct{}
+
+func (info SvnInfo) IsValid(path string) bool {
+	return repoDirExists(path, ".svn")
+}
+
+func (info SvnInfo) GetLabelAndId(path string) (string, string, error) {
+	return getLabelAndId("svn", path, "svnversion", []string{})
+}
+
+type BzrInfo struct{}
+
+func (info BzrInfo) IsValid(path string) bool {
+	return repoDirExists(path, ".bzr")
+}
+
+func (info BzrInfo) GetLabelAndId(path string) (string, string, error) {
+	return getLabelAndId("bzr", path, "bzr", []string{"revno"})
+}
+
+func GetVCSInfo(projPath string) (string, string, error) {
+	vcses := []VCSInfo{
+		GitInfo{},
+		HgInfo{},
+		SvnInfo{},
+		BzrInfo{},
+	}
+
+	for _, vcs := range vcses {
+		if vcs.IsValid(projPath) {
+			return vcs.GetLabelAndId(projPath)
+		}
+	}
+	return "", "", fmt.Errorf("Unknown code repository in %q", projPath)
+}
diff --git a/vendor/github.com/appc/spec/LICENSE b/vendor/github.com/appc/spec/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/vendor/github.com/appc/spec/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/appc/spec/ace/doc.go b/vendor/github.com/appc/spec/ace/doc.go
new file mode 100644
index 0000000000..476f2c9557
--- /dev/null
+++ b/vendor/github.com/appc/spec/ace/doc.go
@@ -0,0 +1,19 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package ace contains a tool intended to be run within an _Application
+// Container Executor_ to validate that the ACE has set up the container
+// environment correctly. This tool can be built into an ACI image ready for
+// running on an executor by using the `build_aci` script.
+package main
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
new file mode 100644
index 0000000000..33157eeead
--- /dev/null
+++ b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -0,0 +1,80 @@
+{
+    "acVersion": "0.8.4",
+    "acKind": "ImageManifest",
+    "name": "coreos.com/ace-validator-main",
+    "labels": [
+        { "name": "version", "value": "0.8.4" },
+        { "name": "os", "value": "@GOOS@" },
+        { "name": "arch", "value": "@GOARCH@" }
+    ],
+    "app": {
+        "exec": [
+            "/ace-validator", "main"
+        ],
+        "eventHandlers": [
+            {
+                "name": "pre-start",
+                "exec": [
+                    "/ace-validator", "prestart"
+                ]
+            },
+            {
+                "name": "post-stop",
+                "exec": [
+                    "/ace-validator", "poststop"
+                ]
+            }
+        ],
+        "user": "0",
+        "group": "0",
+        "workingDirectory": "/opt/acvalidator",
+        "environment": [
+            {
+                "name": "IN_ACE_VALIDATOR",
+                "value": "correct"
+            }
+        ],
+        "mountPoints": [
+            {
+                "name": "database",
+                "path": "/db",
+                "readOnly": false
+            }
+        ],
+        "ports": [
+            {
+                "name": "www",
+                "protocol": "tcp",
+                "port": 80
+            }
+        ],
+        "isolators": [
+            {
+                "name": "resource/memory",
+                "value": {"limit": "1G"}
+            }
+        ]
+    },
+    "annotations": [
+        {
+            "name": "created",
+            "value": "2014-10-27T19:32:27.67021798Z"
+        },
+        {
+            "name": "authors",
+            "value": "Carly Container <carly@example.com>, Nat Network <nat@example.com>"
+        },
+        {
+            "name": "homepage",
+            "value": "https://github.com/appc/spec"
+        },
+        {
+            "name": "documentation",
+            "value": "https://github.com/appc/spec/blob/master/README.md"
+        },
+        {
+            "name": "lorem",
+            "value": "ipsum"
+        }
+    ]
+}
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
new file mode 100644
index 0000000000..a69bbcf66b
--- /dev/null
+++ b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -0,0 +1,24 @@
+{
+    "acVersion": "0.8.4",
+    "acKind": "ImageManifest",
+    "name": "coreos.com/ace-validator-sidekick",
+    "labels": [
+        { "name": "version", "value": "0.8.4" },
+        { "name": "os", "value": "@GOOS@" },
+        { "name": "arch", "value": "@GOARCH@" }
+    ],
+    "app": {
+        "exec": [
+            "/ace-validator", "sidekick"
+        ],
+        "user": "0",
+        "group": "0",
+        "mountPoints": [
+            {
+                "name": "database",
+                "path": "/db",
+                "readOnly": false
+            }
+        ]
+    }
+}
diff --git a/vendor/github.com/appc/spec/ace/os_default.go b/vendor/github.com/appc/spec/ace/os_default.go
new file mode 100644
index 0000000000..4810d4368f
--- /dev/null
+++ b/vendor/github.com/appc/spec/ace/os_default.go
@@ -0,0 +1,26 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !linux
+// +build !freebsd
+
+package main
+
+import (
+	"syscall"
+)
+
+func isSameFilesystem(a, b *syscall.Statfs_t) bool {
+	return a.Fsid == b.Fsid
+}
diff --git a/vendor/github.com/appc/spec/ace/os_freebsd.go b/vendor/github.com/appc/spec/ace/os_freebsd.go
new file mode 100644
index 0000000000..ec7ad0419f
--- /dev/null
+++ b/vendor/github.com/appc/spec/ace/os_freebsd.go
@@ -0,0 +1,32 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build freebsd
+
+package main
+
+import (
+	"syscall"
+)
+
+func isSameFilesystem(a, b *syscall.Statfs_t) bool {
+	if a.Fsid != (syscall.Fsid{}) || b.Fsid != (syscall.Fsid{}) {
+		// If Fsid is not empty, we can just compare the IDs
+		return a.Fsid == b.Fsid
+	}
+	// Fsids are zero, this happens in jails, but we can compare the rest
+	return a.Fstypename == b.Fstypename &&
+		a.Mntfromname == b.Mntfromname &&
+		a.Mntonname == b.Mntonname
+}
diff --git a/vendor/github.com/appc/spec/ace/os_linux.go b/vendor/github.com/appc/spec/ace/os_linux.go
new file mode 100644
index 0000000000..aedfc3ad59
--- /dev/null
+++ b/vendor/github.com/appc/spec/ace/os_linux.go
@@ -0,0 +1,45 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build linux
+
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+func checkMountImpl(d string, readonly bool) error {
+	mountinfoPath := fmt.Sprintf("/proc/self/mountinfo")
+	mi, err := os.Open(mountinfoPath)
+	if err != nil {
+		return err
+	}
+	defer mi.Close()
+
+	isMounted, ro, err := parseMountinfo(mi, d)
+	if err != nil {
+		return err
+	}
+	if !isMounted {
+		return fmt.Errorf("%q is not a mount point", d)
+	}
+
+	if ro == readonly {
+		return nil
+	} else {
+		return fmt.Errorf("%q mounted ro=%t, want %t", d, ro, readonly)
+	}
+}
diff --git a/vendor/github.com/appc/spec/ace/os_shared.go b/vendor/github.com/appc/spec/ace/os_shared.go
new file mode 100644
index 0000000000..93964c3b12
--- /dev/null
+++ b/vendor/github.com/appc/spec/ace/os_shared.go
@@ -0,0 +1,35 @@
+// +build !linux
+
+package main
+
+import (
+	"fmt"
+	"path/filepath"
+	"syscall"
+)
+
+func checkMountStatfs(d string, readonly bool) error {
+	// or....
+	// os.Stat(path).Sys().(*syscall.Stat_t).Dev
+	sfs1 := &syscall.Statfs_t{}
+	if err := syscall.Statfs(d, sfs1); err != nil {
+		return fmt.Errorf("error calling statfs on %q: %v", d, err)
+	}
+	sfs2 := &syscall.Statfs_t{}
+	if err := syscall.Statfs(filepath.Dir(d), sfs2); err != nil {
+		return fmt.Errorf("error calling statfs on %q: %v", d, err)
+	}
+	if isSameFilesystem(sfs1, sfs2) {
+		return fmt.Errorf("%q is not a mount point", d)
+	}
+	ro := sfs1.Flags&syscall.O_RDONLY == 1
+	if ro != readonly {
+		return fmt.Errorf("%q mounted ro=%t, want %t", d, ro, readonly)
+	}
+
+	return nil
+}
+
+func checkMountImpl(d string, readonly bool) error {
+	return checkMountStatfs(d, readonly)
+}
diff --git a/vendor/github.com/appc/spec/ace/validator.go b/vendor/github.com/appc/spec/ace/validator.go
new file mode 100644
index 0000000000..fdd27ac222
--- /dev/null
+++ b/vendor/github.com/appc/spec/ace/validator.go
@@ -0,0 +1,578 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+/*
+
+This validator tool is intended to be run within an App Container Executor
+(ACE), and verifies that the ACE has been set up correctly.
+
+This verifies the _apps perspective_ of the execution environment.
+
+Changes to the validator need to be reflected in app_manifest.json, and vice-versa
+
+The App Container Execution spec defines the following expectations within the execution environment:
+ - Working Directory defaults to the root of the application image, overridden with "workingDirectory"
+ - PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ - USER, LOGNAME username of the user executing this app
+ - HOME home directory of the user
+ - SHELL login shell of the user
+ - AC_APP_NAME the entrypoint that this process was defined from
+
+In addition, we validate:
+ - The expected mount points are mounted
+ - metadata service reachable at http://169.254.169.255
+
+TODO(jonboulle):
+ - should we validate Isolators? (e.g. MemoryLimit + malloc, or capabilities)
+ - should we validate ports? (e.g. that they are available to bind to within the network namespace of the pod)
+
+*/
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"os"
+	"reflect"
+	"strings"
+	"time"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+const (
+	standardPath     = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+	appNameEnv       = "AC_APP_NAME"
+	metadataPathBase = "/acMetadata/v1"
+
+	// marker files to validate
+	prestartFile = "/prestart"
+	mainFile     = "/main"
+	poststopFile = "/poststop"
+
+	mainVolFile     = "/db/main"
+	sidekickVolFile = "/db/sidekick"
+
+	timeout = 5 * time.Second
+)
+
+var (
+	// Expected values must be kept in sync with app_manifest.json
+	workingDirectory = "/opt/acvalidator"
+	// "Environment"
+	env = map[string]string{
+		"IN_ACE_VALIDATOR": "correct",
+		"HOME":             "/root",
+		"USER":             "root",
+		"LOGNAME":          "root",
+		"SHELL":            "/bin/sh",
+	}
+	// "MountPoints"
+	mps = map[string]types.MountPoint{
+		"database": types.MountPoint{
+			Path:     "/db",
+			ReadOnly: false,
+		},
+	}
+	// "Name"
+	an = "ace-validator-main"
+)
+
+type results []error
+
+// main outputs diagnostic information to stderr and exits 1 if validation fails
+func main() {
+	if len(os.Args) != 2 {
+		stderr("usage: %s [main|sidekick|preStart|postStop]", os.Args[0])
+		os.Exit(64)
+	}
+	mode := os.Args[1]
+	var res results
+	switch strings.ToLower(mode) {
+	case "main":
+		res = validateMain()
+	case "sidekick":
+		res = validateSidekick()
+	case "prestart":
+		res = validatePrestart()
+	case "poststop":
+		res = validatePoststop()
+	default:
+		stderr("unrecognized mode: %s", mode)
+		os.Exit(64)
+	}
+	if len(res) == 0 {
+		fmt.Printf("%s OK\n", mode)
+		os.Exit(0)
+	}
+	fmt.Printf("%s FAIL\n", mode)
+	for _, err := range res {
+		fmt.Fprintln(os.Stderr, "==>", err)
+	}
+	os.Exit(1)
+}
+
+func validateMain() (errs results) {
+	errs = append(errs, assertExists(prestartFile)...)
+	errs = append(errs, assertNotExistsAndCreate(mainFile)...)
+	errs = append(errs, assertNotExists(poststopFile)...)
+	errs = append(errs, ValidatePath(standardPath)...)
+	errs = append(errs, ValidateWorkingDirectory(workingDirectory)...)
+	errs = append(errs, ValidateEnvironment(env)...)
+	errs = append(errs, ValidateMountpoints(mps)...)
+	errs = append(errs, ValidateAppNameEnv(an)...)
+	errs = append(errs, ValidateMetadataSvc()...)
+	errs = append(errs, waitForFile(sidekickVolFile, timeout)...)
+	errs = append(errs, assertNotExistsAndCreate(mainVolFile)...)
+	return
+}
+
+func validateSidekick() (errs results) {
+	errs = append(errs, assertNotExistsAndCreate(sidekickVolFile)...)
+	errs = append(errs, waitForFile(mainVolFile, timeout)...)
+	return
+}
+
+func validatePrestart() (errs results) {
+	errs = append(errs, assertNotExistsAndCreate(prestartFile)...)
+	errs = append(errs, assertNotExists(mainFile)...)
+	errs = append(errs, assertNotExists(poststopFile)...)
+	return
+}
+
+func validatePoststop() (errs results) {
+	errs = append(errs, assertExists(prestartFile)...)
+	errs = append(errs, assertExists(mainFile)...)
+	errs = append(errs, assertNotExistsAndCreate(poststopFile)...)
+	return
+}
+
+// ValidatePath ensures that the PATH has been set up correctly within the
+// environment in which this process is being run
+func ValidatePath(wp string) results {
+	r := results{}
+	gp := os.Getenv("PATH")
+	if wp != gp {
+		r = append(r, fmt.Errorf("PATH not set appropriately (need %q, got %q)", wp, gp))
+	}
+	return r
+}
+
+// ValidateWorkingDirectory ensures that the process working directory is set
+// to the desired path.
+func ValidateWorkingDirectory(wwd string) (r results) {
+	gwd, err := os.Getwd()
+	if err != nil {
+		r = append(r, fmt.Errorf("error getting working directory: %v", err))
+		return
+	}
+	if gwd != wwd {
+		r = append(r, fmt.Errorf("working directory not set appropriately (need %q, got %v)", wwd, gwd))
+	}
+	return
+}
+
+// ValidateEnvironment ensures that the given environment contains the
+// necessary/expected environment variables.
+func ValidateEnvironment(wenv map[string]string) (r results) {
+	for wkey, wval := range wenv {
+		gval := os.Getenv(wkey)
+		if gval != wval {
+			err := fmt.Errorf("environment variable %q not set appropriately (need %q, got %q)", wkey, wval, gval)
+			r = append(r, err)
+		}
+	}
+	return
+}
+
+// ValidateAppNameEnv ensures that the environment variable specifying the
+// entrypoint of this process is set correctly.
+func ValidateAppNameEnv(want string) (r results) {
+	if got := os.Getenv(appNameEnv); got != want {
+		r = append(r, fmt.Errorf("%s not set appropriately (need %q, got %q)", appNameEnv, want, got))
+	}
+	return
+}
+
+// ValidateMountpoints ensures that the given mount points are present in the
+// environment in which this process is running
+func ValidateMountpoints(wmp map[string]types.MountPoint) results {
+	r := results{}
+	// TODO(jonboulle): verify actual source
+	for _, mp := range wmp {
+		if err := checkMount(mp.Path, mp.ReadOnly); err != nil {
+			r = append(r, err)
+		}
+	}
+	return r
+}
+
+func metadataRequest(req *http.Request, expectedContentType string) ([]byte, error) {
+	cli := http.Client{
+		Timeout: 100 * time.Millisecond,
+	}
+
+	req.Header["Metadata-Flavor"] = []string{"AppContainer"}
+
+	resp, err := cli.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("Get %s failed with %v", req.URL, resp.StatusCode)
+	}
+
+	if respContentType := resp.Header.Get("Content-Type"); respContentType != expectedContentType {
+		return nil, fmt.Errorf("`%v` did not respond with expected Content-Type header.  Expected %s, received %s",
+			req.URL, expectedContentType, respContentType)
+	}
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("Get %s failed on body read: %v", req.URL, err)
+	}
+
+	return body, nil
+}
+
+func metadataGet(metadataURL, path string, expectedContentType string) ([]byte, error) {
+	uri := metadataURL + metadataPathBase + path
+	req, err := http.NewRequest("GET", uri, nil)
+	if err != nil {
+		panic(err)
+	}
+
+	return metadataRequest(req, expectedContentType)
+}
+
+func metadataPost(metadataURL, path string, body []byte, expectedContentType string) ([]byte, error) {
+	uri := metadataURL + metadataPathBase + path
+	req, err := http.NewRequest("POST", uri, bytes.NewBuffer(body))
+	if err != nil {
+		panic(err)
+	}
+	req.Header.Set("Content-Type", "text/plain")
+
+	return metadataRequest(req, expectedContentType)
+}
+
+func metadataPostForm(metadataURL, path string, data url.Values, expectedContentType string) ([]byte, error) {
+	uri := metadataURL + metadataPathBase + path
+	req, err := http.NewRequest("POST", uri, strings.NewReader(data.Encode()))
+	if err != nil {
+		panic(err)
+	}
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+
+	return metadataRequest(req, expectedContentType)
+}
+
+func validatePodAnnotations(metadataURL string, pm *schema.PodManifest) results {
+	r := results{}
+
+	var actualAnnots types.Annotations
+
+	annotJson, err := metadataGet(metadataURL, "/pod/annotations", "application/json")
+	if err != nil {
+		return append(r, err)
+	}
+
+	err = json.Unmarshal(annotJson, &actualAnnots)
+	if err != nil {
+		return append(r, err)
+	}
+
+	if !reflect.DeepEqual(actualAnnots, pm.Annotations) {
+		r = append(r, fmt.Errorf("pod annotations mismatch: %v vs %v", actualAnnots, pm.Annotations))
+	}
+
+	return r
+}
+
+func validatePodMetadata(metadataURL string, pm *schema.PodManifest) results {
+	r := results{}
+
+	uuid, err := metadataGet(metadataURL, "/pod/uuid", "text/plain; charset=us-ascii")
+	if err != nil {
+		return append(r, err)
+	}
+
+	_, err = types.NewUUID(string(uuid))
+	if err != nil {
+		return append(r, fmt.Errorf("malformed UUID returned (%v): %v", string(uuid), err))
+	}
+
+	return append(r, validatePodAnnotations(metadataURL, pm)...)
+}
+
+func validateAppAnnotations(metadataURL string, pm *schema.PodManifest, app *schema.RuntimeApp, img *schema.ImageManifest) results {
+	r := results{}
+
+	// build a map of expected annotations by merging app.Annotations
+	// with PodManifest overrides
+	expectedAnnots := app.Annotations
+	a := pm.Apps.Get(app.Name)
+	if a == nil {
+		panic("could not find app in manifest!")
+	}
+	for _, annot := range a.Annotations {
+		expectedAnnots.Set(annot.Name, annot.Value)
+	}
+	if len(expectedAnnots) == 0 {
+		expectedAnnots = nil
+	}
+
+	var actualAnnots types.Annotations
+
+	annotJson, err := metadataGet(metadataURL, "/apps/"+string(app.Name)+"/annotations", "application/json")
+	if err != nil {
+		return append(r, err)
+	}
+
+	err = json.Unmarshal(annotJson, &actualAnnots)
+	if err != nil {
+		return append(r, err)
+	}
+	if len(actualAnnots) == 0 {
+		actualAnnots = nil
+	}
+
+	if !reflect.DeepEqual(actualAnnots, expectedAnnots) {
+		err := fmt.Errorf("%v annotations mismatch: %v vs %v", app.Name, actualAnnots, expectedAnnots)
+		r = append(r, err)
+	}
+
+	return r
+}
+
+func validateAppMetadata(metadataURL string, pm *schema.PodManifest, app *schema.RuntimeApp) results {
+	r := results{}
+
+	am, err := metadataGet(metadataURL, "/apps/"+app.Name.String()+"/image/manifest", "application/json")
+	if err != nil {
+		return append(r, err)
+	}
+
+	img := &schema.ImageManifest{}
+	if err = json.Unmarshal(am, img); err != nil {
+		return append(r, fmt.Errorf("failed to JSON-decode %q manifest: %v", app.Name.String(), err))
+	}
+
+	id, err := metadataGet(metadataURL, "/apps/"+app.Name.String()+"/image/id", "text/plain; charset=us-ascii")
+	if err != nil {
+		r = append(r, err)
+	}
+
+	if string(id) != app.Image.ID.String() {
+		err = fmt.Errorf("%q's image id mismatch: %v vs %v", app.Name.String(), id, app.Image.ID)
+		r = append(r, err)
+	}
+
+	return append(r, validateAppAnnotations(metadataURL, pm, app, img)...)
+}
+
+func validateSigning(metadataURL string, pm *schema.PodManifest) results {
+	r := results{}
+
+	// Get our UUID
+	uuid, err := metadataGet(metadataURL, "/pod/uuid", "text/plain; charset=us-ascii")
+	if err != nil {
+		return append(r, err)
+	}
+
+	plaintext := "Old MacDonald Had A Farm"
+
+	// Sign
+	sig, err := metadataPostForm(metadataURL, "/pod/hmac/sign", url.Values{
+		"content": []string{plaintext},
+	}, "text/plain; charset=us-ascii")
+	if err != nil {
+		return append(r, err)
+	}
+
+	// Verify
+	_, err = metadataPostForm(metadataURL, "/pod/hmac/verify", url.Values{
+		"content":   []string{plaintext},
+		"uuid":      []string{string(uuid)},
+		"signature": []string{string(sig)},
+	}, "text/plain; charset=us-ascii")
+
+	if err != nil {
+		return append(r, err)
+	}
+
+	return r
+}
+
+func ValidateMetadataSvc() results {
+	r := results{}
+
+	metadataURL := os.Getenv("AC_METADATA_URL")
+	if metadataURL == "" {
+		return append(r, fmt.Errorf("AC_METADATA_URL is not set"))
+	}
+
+	pod, err := metadataGet(metadataURL, "/pod/manifest", "application/json")
+	if err != nil {
+		return append(r, err)
+	}
+
+	pm := &schema.PodManifest{}
+	if err = json.Unmarshal(pod, pm); err != nil {
+		return append(r, fmt.Errorf("failed to JSON-decode pod manifest: %v", err))
+	}
+
+	r = append(r, validatePodMetadata(metadataURL, pm)...)
+
+	for _, app := range pm.Apps {
+		app := app
+		r = append(r, validateAppMetadata(metadataURL, pm, &app)...)
+	}
+
+	return append(r, validateSigning(metadataURL, pm)...)
+}
+
+// checkMount checks that the given string is a mount point, and that it is
+// mounted appropriately read-only or not according to the given bool
+func checkMount(d string, readonly bool) error {
+	return checkMountImpl(d, readonly)
+}
+
+// parseMountinfo parses a Reader representing a /proc/PID/mountinfo file and
+// returns whether dir is mounted and if so, whether it is read-only or not
+func parseMountinfo(mountinfo io.Reader, dir string) (isMounted bool, readOnly bool, err error) {
+	sc := bufio.NewScanner(mountinfo)
+	for sc.Scan() {
+		var (
+			mountID      int
+			parentID     int
+			majorMinor   string
+			root         string
+			mountPoint   string
+			mountOptions string
+		)
+
+		_, err := fmt.Sscanf(sc.Text(), "%d %d %s %s %s %s",
+			&mountID, &parentID, &majorMinor, &root, &mountPoint, &mountOptions)
+		if err != nil {
+			return false, false, err
+		}
+
+		if mountPoint == dir {
+			isMounted = true
+			optionsParts := strings.Split(mountOptions, ",")
+			for _, o := range optionsParts {
+				switch o {
+				case "ro":
+					readOnly = true
+				case "rw":
+					readOnly = false
+				}
+			}
+		}
+	}
+
+	return
+}
+
+// assertNotExistsAndCreate asserts that a file at the given path does not
+// exist, and then proceeds to create (touch) the file. It returns any errors
+// encountered at either of these steps.
+func assertNotExistsAndCreate(p string) []error {
+	var errs []error
+	errs = append(errs, assertNotExists(p)...)
+	if err := touchFile(p); err != nil {
+		errs = append(errs, fmt.Errorf("error touching file %q: %v", p, err))
+	}
+	return errs
+}
+
+// assertNotExists asserts that a file at the given path does not exist. A
+// non-empty list of errors is returned if the file exists or any error is
+// encountered while checking.
+func assertNotExists(p string) []error {
+	var errs []error
+	e, err := fileExists(p)
+	if err != nil {
+		errs = append(errs, fmt.Errorf("error checking %q exists: %v", p, err))
+	}
+	if e {
+		errs = append(errs, fmt.Errorf("file %q exists unexpectedly", p))
+	}
+	return errs
+}
+
+// assertExists asserts that a file exists at the given path. A non-empty
+// list of errors is returned if the file does not exist or any error is
+// encountered while checking.
+func assertExists(p string) []error {
+	var errs []error
+	e, err := fileExists(p)
+	if err != nil {
+		errs = append(errs, fmt.Errorf("error checking %q exists: %v", p, err))
+	}
+	if !e {
+		errs = append(errs, fmt.Errorf("file %q does not exist as expected", p))
+	}
+	return errs
+}
+
+// touchFile creates an empty file, returning any error encountered
+func touchFile(p string) error {
+	_, err := os.Create(p)
+	return err
+}
+
+// fileExists checks whether a file exists at the given path
+func fileExists(p string) (bool, error) {
+	_, err := os.Stat(p)
+	if err == nil {
+		return true, nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return false, err
+}
+
+// waitForFile waits for the file at the given path to appear
+func waitForFile(p string, to time.Duration) []error {
+	done := time.After(to)
+	for {
+		select {
+		case <-done:
+			return []error{
+				fmt.Errorf("timed out waiting for %s", p),
+			}
+		case <-time.After(1):
+			if ok, _ := fileExists(p); ok {
+				return nil
+			}
+		}
+	}
+}
+
+func stderr(format string, a ...interface{}) {
+	out := fmt.Sprintf(format, a...)
+	fmt.Fprintln(os.Stderr, strings.TrimSuffix(out, "\n"))
+}
diff --git a/vendor/github.com/appc/spec/aci/build.go b/vendor/github.com/appc/spec/aci/build.go
new file mode 100644
index 0000000000..0d259a27f5
--- /dev/null
+++ b/vendor/github.com/appc/spec/aci/build.go
@@ -0,0 +1,110 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package aci
+
+import (
+	"archive/tar"
+	"io"
+	"os"
+	"path/filepath"
+
+	"github.com/appc/spec/pkg/tarheader"
+)
+
+// TarHeaderWalkFunc is the type of the function which allows setting tar
+// headers or filtering out tar entries when building an ACI. It will be
+// applied to every entry in the tar file.
+//
+// If true is returned, the entry will be included in the final ACI; if false,
+// the entry will not be included.
+type TarHeaderWalkFunc func(hdr *tar.Header) bool
+
+// BuildWalker creates a filepath.WalkFunc that walks over the given root
+// (which should represent an ACI layout on disk) and adds the files in the
+// rootfs/ subdirectory to the given ArchiveWriter
+func BuildWalker(root string, aw ArchiveWriter, cb TarHeaderWalkFunc) filepath.WalkFunc {
+	// cache of inode -> filepath, used to leverage hard links in the archive
+	inos := map[uint64]string{}
+	return func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		relpath, err := filepath.Rel(root, path)
+		if err != nil {
+			return err
+		}
+		if relpath == "." {
+			return nil
+		}
+		if relpath == ManifestFile {
+			// ignore; this will be written by the archive writer
+			// TODO(jonboulle): does this make sense? maybe just remove from archivewriter?
+			return nil
+		}
+
+		link := ""
+		var r io.Reader
+		switch info.Mode() & os.ModeType {
+		case os.ModeSocket:
+			return nil
+		case os.ModeNamedPipe:
+		case os.ModeCharDevice:
+		case os.ModeDevice:
+		case os.ModeDir:
+		case os.ModeSymlink:
+			target, err := os.Readlink(path)
+			if err != nil {
+				return err
+			}
+			link = target
+		default:
+			file, err := os.Open(path)
+			if err != nil {
+				return err
+			}
+			defer file.Close()
+			r = file
+		}
+
+		hdr, err := tar.FileInfoHeader(info, link)
+		if err != nil {
+			panic(err)
+		}
+		// Because os.FileInfo's Name method returns only the base
+		// name of the file it describes, it may be necessary to
+		// modify the Name field of the returned header to provide the
+		// full path name of the file.
+		hdr.Name = relpath
+		tarheader.Populate(hdr, info, inos)
+		// If the file is a hard link to a file we've already seen, we
+		// don't need the contents
+		if hdr.Typeflag == tar.TypeLink {
+			hdr.Size = 0
+			r = nil
+		}
+
+		if cb != nil {
+			if !cb(hdr) {
+				return nil
+			}
+		}
+
+		if err := aw.AddFile(hdr, r); err != nil {
+			return err
+		}
+
+		return nil
+	}
+}
diff --git a/vendor/github.com/appc/spec/aci/doc.go b/vendor/github.com/appc/spec/aci/doc.go
new file mode 100644
index 0000000000..624d431aff
--- /dev/null
+++ b/vendor/github.com/appc/spec/aci/doc.go
@@ -0,0 +1,16 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package aci contains various functions for working with App Container Images.
+package aci
diff --git a/vendor/github.com/appc/spec/aci/file.go b/vendor/github.com/appc/spec/aci/file.go
new file mode 100644
index 0000000000..fe4e1b5bd9
--- /dev/null
+++ b/vendor/github.com/appc/spec/aci/file.go
@@ -0,0 +1,246 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package aci
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/bzip2"
+	"compress/gzip"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/appc/spec/schema"
+)
+
+type FileType string
+
+const (
+	TypeGzip    = FileType("gz")
+	TypeBzip2   = FileType("bz2")
+	TypeXz      = FileType("xz")
+	TypeTar     = FileType("tar")
+	TypeText    = FileType("text")
+	TypeUnknown = FileType("unknown")
+
+	readLen = 512 // max bytes to sniff
+
+	hexHdrGzip  = "1f8b"
+	hexHdrBzip2 = "425a68"
+	hexHdrXz    = "fd377a585a00"
+	hexSigTar   = "7573746172"
+
+	tarOffset = 257
+
+	textMime = "text/plain; charset=utf-8"
+)
+
+var (
+	hdrGzip  []byte
+	hdrBzip2 []byte
+	hdrXz    []byte
+	sigTar   []byte
+	tarEnd   int
+)
+
+func mustDecodeHex(s string) []byte {
+	b, err := hex.DecodeString(s)
+	if err != nil {
+		panic(err)
+	}
+	return b
+}
+
+func init() {
+	hdrGzip = mustDecodeHex(hexHdrGzip)
+	hdrBzip2 = mustDecodeHex(hexHdrBzip2)
+	hdrXz = mustDecodeHex(hexHdrXz)
+	sigTar = mustDecodeHex(hexSigTar)
+	tarEnd = tarOffset + len(sigTar)
+}
+
+// DetectFileType attempts to detect the type of file that the given reader
+// represents by comparing it against known file signatures (magic numbers)
+func DetectFileType(r io.Reader) (FileType, error) {
+	var b bytes.Buffer
+	n, err := io.CopyN(&b, r, readLen)
+	if err != nil && err != io.EOF {
+		return TypeUnknown, err
+	}
+	bs := b.Bytes()
+	switch {
+	case bytes.HasPrefix(bs, hdrGzip):
+		return TypeGzip, nil
+	case bytes.HasPrefix(bs, hdrBzip2):
+		return TypeBzip2, nil
+	case bytes.HasPrefix(bs, hdrXz):
+		return TypeXz, nil
+	case n > int64(tarEnd) && bytes.Equal(bs[tarOffset:tarEnd], sigTar):
+		return TypeTar, nil
+	case http.DetectContentType(bs) == textMime:
+		return TypeText, nil
+	default:
+		return TypeUnknown, nil
+	}
+}
+
+// XzReader is an io.ReadCloser which decompresses xz compressed data.
+type XzReader struct {
+	io.ReadCloser
+	cmd     *exec.Cmd
+	closech chan error
+}
+
+// NewXzReader shells out to a command line xz executable (if
+// available) to decompress the given io.Reader using the xz
+// compression format and returns an *XzReader.
+// It is the caller's responsibility to call Close on the XzReader when done.
+func NewXzReader(r io.Reader) (*XzReader, error) {
+	rpipe, wpipe := io.Pipe()
+	ex, err := exec.LookPath("xz")
+	if err != nil {
+		log.Fatalf("couldn't find xz executable: %v", err)
+	}
+	cmd := exec.Command(ex, "--decompress", "--stdout")
+
+	closech := make(chan error)
+
+	cmd.Stdin = r
+	cmd.Stdout = wpipe
+
+	go func() {
+		err := cmd.Run()
+		wpipe.CloseWithError(err)
+		closech <- err
+	}()
+
+	return &XzReader{rpipe, cmd, closech}, nil
+}
+
+func (r *XzReader) Close() error {
+	r.ReadCloser.Close()
+	r.cmd.Process.Kill()
+	return <-r.closech
+}
+
+// ManifestFromImage extracts a new schema.ImageManifest from the given ACI image.
+func ManifestFromImage(rs io.ReadSeeker) (*schema.ImageManifest, error) {
+	var im schema.ImageManifest
+
+	tr, err := NewCompressedTarReader(rs)
+	if err != nil {
+		return nil, err
+	}
+	defer tr.Close()
+
+	for {
+		hdr, err := tr.Next()
+		switch err {
+		case io.EOF:
+			return nil, errors.New("missing manifest")
+		case nil:
+			if filepath.Clean(hdr.Name) == ManifestFile {
+				data, err := ioutil.ReadAll(tr)
+				if err != nil {
+					return nil, err
+				}
+				if err := im.UnmarshalJSON(data); err != nil {
+					return nil, err
+				}
+				return &im, nil
+			}
+		default:
+			return nil, fmt.Errorf("error extracting tarball: %v", err)
+		}
+	}
+}
+
+// TarReadCloser embeds a *tar.Reader and the related io.Closer
+// It is the caller's responsibility to call Close on TarReadCloser when
+// done.
+type TarReadCloser struct {
+	*tar.Reader
+	io.Closer
+}
+
+func (r *TarReadCloser) Close() error {
+	return r.Closer.Close()
+}
+
+// NewCompressedTarReader creates a new TarReadCloser reading from the
+// given ACI image.
+// It is the caller's responsibility to call Close on the TarReadCloser
+// when done.
+func NewCompressedTarReader(rs io.ReadSeeker) (*TarReadCloser, error) {
+	cr, err := NewCompressedReader(rs)
+	if err != nil {
+		return nil, err
+	}
+	return &TarReadCloser{tar.NewReader(cr), cr}, nil
+}
+
+// NewCompressedReader creates a new io.ReaderCloser from the given ACI image.
+// It is the caller's responsibility to call Close on the Reader when done.
+func NewCompressedReader(rs io.ReadSeeker) (io.ReadCloser, error) {
+
+	var (
+		dr  io.ReadCloser
+		err error
+	)
+
+	_, err = rs.Seek(0, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	ftype, err := DetectFileType(rs)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = rs.Seek(0, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	switch ftype {
+	case TypeGzip:
+		dr, err = gzip.NewReader(rs)
+		if err != nil {
+			return nil, err
+		}
+	case TypeBzip2:
+		dr = ioutil.NopCloser(bzip2.NewReader(rs))
+	case TypeXz:
+		dr, err = NewXzReader(rs)
+		if err != nil {
+			return nil, err
+		}
+	case TypeTar:
+		dr = ioutil.NopCloser(rs)
+	case TypeUnknown:
+		return nil, errors.New("error: unknown image filetype")
+	default:
+		return nil, errors.New("no type returned from DetectFileType?")
+	}
+	return dr, nil
+}
diff --git a/vendor/github.com/appc/spec/aci/layout.go b/vendor/github.com/appc/spec/aci/layout.go
new file mode 100644
index 0000000000..c2cce5635a
--- /dev/null
+++ b/vendor/github.com/appc/spec/aci/layout.go
@@ -0,0 +1,187 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package aci
+
+/*
+
+Image Layout
+
+The on-disk layout of an app container is straightforward.
+It includes a rootfs with all of the files that will exist in the root of the app and a manifest describing the image.
+The layout MUST contain an image manifest.
+
+/manifest
+/rootfs/
+/rootfs/usr/bin/mysql
+
+*/
+
+import (
+	"archive/tar"
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+const (
+	// Path to manifest file inside the layout
+	ManifestFile = "manifest"
+	// Path to rootfs directory inside the layout
+	RootfsDir = "rootfs"
+)
+
+type ErrOldVersion struct {
+	version types.SemVer
+}
+
+func (e ErrOldVersion) Error() string {
+	return fmt.Sprintf("ACVersion too old. Found major version %v, expected %v", e.version.Major, schema.AppContainerVersion.Major)
+}
+
+var (
+	ErrNoRootFS   = errors.New("no rootfs found in layout")
+	ErrNoManifest = errors.New("no image manifest found in layout")
+)
+
+// ValidateLayout takes a directory and validates that the layout of the directory
+// matches that expected by the Application Container Image format.
+// If any errors are encountered during the validation, it will abort and
+// return the first one.
+func ValidateLayout(dir string) error {
+	fi, err := os.Stat(dir)
+	if err != nil {
+		return fmt.Errorf("error accessing layout: %v", err)
+	}
+	if !fi.IsDir() {
+		return fmt.Errorf("given path %q is not a directory", dir)
+	}
+	var flist []string
+	var imOK, rfsOK bool
+	var im io.Reader
+	walkLayout := func(fpath string, fi os.FileInfo, err error) error {
+		rpath, err := filepath.Rel(dir, fpath)
+		if err != nil {
+			return err
+		}
+		switch rpath {
+		case ".":
+		case ManifestFile:
+			im, err = os.Open(fpath)
+			if err != nil {
+				return err
+			}
+			imOK = true
+		case RootfsDir:
+			if !fi.IsDir() {
+				return errors.New("rootfs is not a directory")
+			}
+			rfsOK = true
+		default:
+			flist = append(flist, rpath)
+		}
+		return nil
+	}
+	if err := filepath.Walk(dir, walkLayout); err != nil {
+		return err
+	}
+	return validate(imOK, im, rfsOK, flist)
+}
+
+// ValidateArchive takes a *tar.Reader and validates that the layout of the
+// filesystem the reader encapsulates matches that expected by the
+// Application Container Image format.  If any errors are encountered during
+// the validation, it will abort and return the first one.
+func ValidateArchive(tr *tar.Reader) error {
+	var fseen map[string]bool = make(map[string]bool)
+	var imOK, rfsOK bool
+	var im bytes.Buffer
+Tar:
+	for {
+		hdr, err := tr.Next()
+		switch {
+		case err == nil:
+		case err == io.EOF:
+			break Tar
+		default:
+			return err
+		}
+		name := filepath.Clean(hdr.Name)
+		switch name {
+		case ".":
+		case ManifestFile:
+			_, err := io.Copy(&im, tr)
+			if err != nil {
+				return err
+			}
+			imOK = true
+		case RootfsDir:
+			if !hdr.FileInfo().IsDir() {
+				return fmt.Errorf("rootfs is not a directory")
+			}
+			rfsOK = true
+		default:
+			if _, seen := fseen[name]; seen {
+				return fmt.Errorf("duplicate file entry in archive: %s", name)
+			}
+			fseen[name] = true
+		}
+	}
+	var flist []string
+	for key := range fseen {
+		flist = append(flist, key)
+	}
+	return validate(imOK, &im, rfsOK, flist)
+}
+
+func validate(imOK bool, im io.Reader, rfsOK bool, files []string) error {
+	defer func() {
+		if rc, ok := im.(io.Closer); ok {
+			rc.Close()
+		}
+	}()
+	if !imOK {
+		return ErrNoManifest
+	}
+	if !rfsOK {
+		return ErrNoRootFS
+	}
+	b, err := ioutil.ReadAll(im)
+	if err != nil {
+		return fmt.Errorf("error reading image manifest: %v", err)
+	}
+	var a schema.ImageManifest
+	if err := a.UnmarshalJSON(b); err != nil {
+		return fmt.Errorf("image manifest validation failed: %v", err)
+	}
+	if a.ACVersion.LessThanMajor(schema.AppContainerVersion) {
+		return ErrOldVersion{
+			version: a.ACVersion,
+		}
+	}
+	for _, f := range files {
+		if !strings.HasPrefix(f, "rootfs") {
+			return fmt.Errorf("unrecognized file path in layout: %q", f)
+		}
+	}
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/aci/writer.go b/vendor/github.com/appc/spec/aci/writer.go
new file mode 100644
index 0000000000..070b09ba53
--- /dev/null
+++ b/vendor/github.com/appc/spec/aci/writer.go
@@ -0,0 +1,98 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package aci
+
+import (
+	"archive/tar"
+	"bytes"
+	"encoding/json"
+	"io"
+	"time"
+
+	"github.com/appc/spec/schema"
+)
+
+// ArchiveWriter writes App Container Images. Users wanting to create an ACI or
+// should create an ArchiveWriter and add files to it; the ACI will be written
+// to the underlying tar.Writer
+type ArchiveWriter interface {
+	AddFile(hdr *tar.Header, r io.Reader) error
+	Close() error
+}
+
+type imageArchiveWriter struct {
+	*tar.Writer
+	am *schema.ImageManifest
+}
+
+// NewImageWriter creates a new ArchiveWriter which will generate an App
+// Container Image based on the given manifest and write it to the given
+// tar.Writer
+func NewImageWriter(am schema.ImageManifest, w *tar.Writer) ArchiveWriter {
+	aw := &imageArchiveWriter{
+		w,
+		&am,
+	}
+	return aw
+}
+
+func (aw *imageArchiveWriter) AddFile(hdr *tar.Header, r io.Reader) error {
+	err := aw.Writer.WriteHeader(hdr)
+	if err != nil {
+		return err
+	}
+
+	if r != nil {
+		_, err := io.Copy(aw.Writer, r)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (aw *imageArchiveWriter) addFileNow(path string, contents []byte) error {
+	buf := bytes.NewBuffer(contents)
+	now := time.Now()
+	hdr := tar.Header{
+		Name:       path,
+		Mode:       0644,
+		Uid:        0,
+		Gid:        0,
+		Size:       int64(buf.Len()),
+		ModTime:    now,
+		Typeflag:   tar.TypeReg,
+		Uname:      "root",
+		Gname:      "root",
+		ChangeTime: now,
+	}
+	return aw.AddFile(&hdr, buf)
+}
+
+func (aw *imageArchiveWriter) addManifest(name string, m json.Marshaler) error {
+	out, err := m.MarshalJSON()
+	if err != nil {
+		return err
+	}
+	return aw.addFileNow(name, out)
+}
+
+func (aw *imageArchiveWriter) Close() error {
+	if err := aw.addManifest(ManifestFile, aw.am); err != nil {
+		return err
+	}
+	return aw.Writer.Close()
+}
diff --git a/vendor/github.com/appc/spec/actool/actool.go b/vendor/github.com/appc/spec/actool/actool.go
new file mode 100644
index 0000000000..21c5f5fa90
--- /dev/null
+++ b/vendor/github.com/appc/spec/actool/actool.go
@@ -0,0 +1,118 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+	"text/tabwriter"
+)
+
+const (
+	cliName        = "actool"
+	cliDescription = "actool, the application container tool"
+)
+
+var (
+	globalFlagset = flag.NewFlagSet(cliName, flag.ExitOnError)
+	out           *tabwriter.Writer
+	commands      []*Command
+	globalFlags   = struct {
+		Dir   string
+		Debug bool
+		Help  bool
+	}{}
+	transportFlags = struct {
+		Insecure bool
+	}{}
+)
+
+func init() {
+	globalFlagset.BoolVar(&globalFlags.Help, "help", false, "Print usage information and exit")
+	globalFlagset.BoolVar(&globalFlags.Debug, "debug", false, "Print verbose (debug) output")
+}
+
+type Command struct {
+	Name        string       // Name of the Command and the string to use to invoke it
+	Summary     string       // One-sentence summary of what the Command does
+	Usage       string       // Usage options/arguments
+	Description string       // Detailed description of command
+	Flags       flag.FlagSet // Set of flags associated with this command
+
+	Run func(args []string) int // Run a command with the given arguments, return exit status
+}
+
+func init() {
+	out = new(tabwriter.Writer)
+	out.Init(os.Stdout, 0, 8, 1, '\t', 0)
+	commands = []*Command{
+		cmdBuild,
+		cmdCatManifest,
+		cmdDiscover,
+		cmdHelp,
+		cmdPatchManifest,
+		cmdValidate,
+		cmdVersion,
+	}
+}
+
+func main() {
+	// parse global arguments
+	globalFlagset.Parse(os.Args[1:])
+	args := globalFlagset.Args()
+	if len(args) < 1 || globalFlags.Help {
+		args = []string{"help"}
+	}
+
+	var cmd *Command
+
+	// determine which Command should be run
+	for _, c := range commands {
+		if c.Name == args[0] {
+			cmd = c
+			if err := c.Flags.Parse(args[1:]); err != nil {
+				stderr("%v", err)
+				os.Exit(2)
+			}
+			break
+		}
+	}
+
+	if cmd == nil {
+		stderr("%v: unknown subcommand: %q", cliName, args[0])
+		stderr("Run '%v help' for usage.", cliName)
+		os.Exit(2)
+	}
+	os.Exit(cmd.Run(cmd.Flags.Args()))
+}
+
+func getAllFlags() (flags []*flag.Flag) {
+	return getFlags(globalFlagset)
+}
+
+func getFlags(flagset *flag.FlagSet) (flags []*flag.Flag) {
+	flags = make([]*flag.Flag, 0)
+	flagset.VisitAll(func(f *flag.Flag) {
+		flags = append(flags, f)
+	})
+	return
+}
+
+func stderr(format string, a ...interface{}) {
+	out := fmt.Sprintf(format, a...)
+	fmt.Fprintln(os.Stderr, strings.TrimSuffix(out, "\n"))
+}
diff --git a/vendor/github.com/appc/spec/actool/build.go b/vendor/github.com/appc/spec/actool/build.go
new file mode 100644
index 0000000000..1c958eba45
--- /dev/null
+++ b/vendor/github.com/appc/spec/actool/build.go
@@ -0,0 +1,145 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
+	"github.com/appc/spec/aci"
+	"github.com/appc/spec/schema"
+)
+
+var (
+	buildNocompress bool
+	buildOverwrite  bool
+	buildOwnerRoot  bool
+	cmdBuild        = &Command{
+		Name: "build",
+		Description: `Build an ACI from a given directory. The directory should
+contain an Image Layout. The Image Layout will be validated
+before the ACI is created. The produced ACI will be
+gzip-compressed by default.`,
+		Summary: "Build an ACI from an Image Layout (experimental)",
+		Usage:   `[--overwrite] [--no-compression] [--owner-root] DIRECTORY OUTPUT_FILE`,
+		Run:     runBuild,
+	}
+)
+
+func init() {
+	cmdBuild.Flags.BoolVar(&buildOverwrite, "overwrite", false, "Overwrite target file if it already exists")
+	cmdBuild.Flags.BoolVar(&buildOwnerRoot, "owner-root", false, "Force ownership to root:root on all files")
+	cmdBuild.Flags.BoolVar(&buildNocompress, "no-compression", false, "Do not gzip-compress the produced ACI")
+}
+
+func runBuild(args []string) (exit int) {
+	if len(args) != 2 {
+		stderr("build: Must provide directory and output file")
+		return 1
+	}
+
+	root := args[0]
+	tgt := args[1]
+	ext := filepath.Ext(tgt)
+	if ext != schema.ACIExtension {
+		stderr("build: Extension must be %s (given %s)", schema.ACIExtension, ext)
+		return 1
+	}
+
+	// TODO(jonboulle): stream the validation so we don't have to walk the rootfs twice
+	if err := aci.ValidateLayout(root); err != nil {
+		if e, ok := err.(aci.ErrOldVersion); ok {
+			stderr("build: Warning: %v. Please update your manifest.", e)
+		} else {
+			stderr("build: Layout failed validation: %v", err)
+			return 1
+		}
+	}
+
+	mode := os.O_CREATE | os.O_WRONLY
+	if buildOverwrite {
+		mode |= os.O_TRUNC
+	} else {
+		mode |= os.O_EXCL
+	}
+	fh, err := os.OpenFile(tgt, mode, 0644)
+	if err != nil {
+		if os.IsExist(err) {
+			stderr("build: Target file exists (try --overwrite)")
+		} else {
+			stderr("build: Unable to open target %s: %v", tgt, err)
+		}
+		return 1
+	}
+
+	var gw *gzip.Writer
+	var r io.WriteCloser = fh
+	if !buildNocompress {
+		gw = gzip.NewWriter(fh)
+		r = gw
+	}
+	tr := tar.NewWriter(r)
+
+	defer func() {
+		tr.Close()
+		if !buildNocompress {
+			gw.Close()
+		}
+		fh.Close()
+		if exit != 0 && !buildOverwrite {
+			os.Remove(tgt)
+		}
+	}()
+
+	mpath := filepath.Join(root, aci.ManifestFile)
+	b, err := ioutil.ReadFile(mpath)
+	if err != nil {
+		stderr("build: Unable to read Image Manifest: %v", err)
+		return 1
+	}
+	var im schema.ImageManifest
+	if err := im.UnmarshalJSON(b); err != nil {
+		stderr("build: Unable to load Image Manifest: %v", err)
+		return 1
+	}
+	iw := aci.NewImageWriter(im, tr)
+
+	var walkerCb aci.TarHeaderWalkFunc
+	if buildOwnerRoot {
+		walkerCb = func(hdr *tar.Header) bool {
+			hdr.Uid, hdr.Gid = 0, 0
+			hdr.Uname, hdr.Gname = "root", "root"
+			return true
+		}
+	}
+
+	err = filepath.Walk(root, aci.BuildWalker(root, iw, walkerCb))
+	if err != nil {
+		stderr("build: Error walking rootfs: %v", err)
+		return 1
+	}
+
+	err = iw.Close()
+	if err != nil {
+		stderr("build: Unable to close image %s: %v", tgt, err)
+		return 1
+	}
+
+	return
+}
diff --git a/vendor/github.com/appc/spec/actool/discover.go b/vendor/github.com/appc/spec/actool/discover.go
new file mode 100644
index 0000000000..f91f526d7b
--- /dev/null
+++ b/vendor/github.com/appc/spec/actool/discover.go
@@ -0,0 +1,106 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"runtime"
+	"strings"
+
+	"github.com/appc/spec/discovery"
+)
+
+var (
+	outputJson  bool
+	cmdDiscover = &Command{
+		Name:        "discover",
+		Description: "Discover the download URLs for an app",
+		Summary:     "Discover the download URLs for one or more app container images",
+		Usage:       "[--json] APP...",
+		Run:         runDiscover,
+	}
+)
+
+func init() {
+	cmdDiscover.Flags.BoolVar(&transportFlags.Insecure, "insecure", false,
+		"Don't check TLS certificates and allow insecure non-TLS downloads over http")
+	cmdDiscover.Flags.BoolVar(&outputJson, "json", false,
+		"Output result as JSON")
+}
+
+func runDiscover(args []string) (exit int) {
+	if len(args) < 1 {
+		stderr("discover: at least one name required")
+	}
+
+	for _, name := range args {
+		app, err := discovery.NewAppFromString(name)
+		if app.Labels["os"] == "" {
+			app.Labels["os"] = runtime.GOOS
+		}
+		if app.Labels["arch"] == "" {
+			app.Labels["arch"] = runtime.GOARCH
+		}
+		if err != nil {
+			stderr("%s: %s", name, err)
+			return 1
+		}
+		insecure := discovery.InsecureNone
+		if transportFlags.Insecure {
+			insecure = discovery.InsecureTLS | discovery.InsecureHTTP
+		}
+		eps, attempts, err := discovery.DiscoverACIEndpoints(*app, nil, insecure)
+		if err != nil {
+			stderr("error fetching endpoints for %s: %s", name, err)
+			return 1
+		}
+		for _, a := range attempts {
+			fmt.Printf("discover endpoints walk: prefix: %s error: %v\n", a.Prefix, a.Error)
+		}
+		publicKeys, attempts, err := discovery.DiscoverPublicKeys(*app, nil, insecure)
+		if err != nil {
+			stderr("error fetching public keys for %s: %s", name, err)
+			return 1
+		}
+		for _, a := range attempts {
+			fmt.Printf("discover public keys walk: prefix: %s error: %v\n", a.Prefix, a.Error)
+		}
+
+		type discoveryData struct {
+			ACIEndpoints []discovery.ACIEndpoint
+			PublicKeys   []string
+		}
+
+		if outputJson {
+			dd := discoveryData{ACIEndpoints: eps, PublicKeys: publicKeys}
+			jsonBytes, err := json.MarshalIndent(dd, "", "    ")
+			if err != nil {
+				stderr("error generating JSON: %s", err)
+				return 1
+			}
+			fmt.Println(string(jsonBytes))
+		} else {
+			for _, aciEndpoint := range eps {
+				fmt.Printf("ACI: %s, ASC: %s\n", aciEndpoint.ACI, aciEndpoint.ASC)
+			}
+			if len(publicKeys) > 0 {
+				fmt.Println("PublicKeys: " + strings.Join(publicKeys, ","))
+			}
+		}
+	}
+
+	return
+}
diff --git a/vendor/github.com/appc/spec/actool/doc.go b/vendor/github.com/appc/spec/actool/doc.go
new file mode 100644
index 0000000000..e0e446d203
--- /dev/null
+++ b/vendor/github.com/appc/spec/actool/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package main contains a tool for building and validating images and
+// manifests that meet the App Container specifications.
+package main
diff --git a/vendor/github.com/appc/spec/actool/help.go b/vendor/github.com/appc/spec/actool/help.go
new file mode 100644
index 0000000000..25fa5622cc
--- /dev/null
+++ b/vendor/github.com/appc/spec/actool/help.go
@@ -0,0 +1,140 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"strings"
+	"text/template"
+
+	"github.com/appc/spec/schema"
+)
+
+var (
+	cmdHelp = &Command{
+		Name:        "help",
+		Summary:     "Show a list of commands or help for one command",
+		Usage:       "[COMMAND]",
+		Description: "Show a list of commands or detailed help for one command",
+		Run:         runHelp,
+	}
+
+	globalUsageTemplate  *template.Template
+	commandUsageTemplate *template.Template
+	templFuncs           = template.FuncMap{
+		"descToLines": func(s string) []string {
+			// trim leading/trailing whitespace and split into slice of lines
+			return strings.Split(strings.Trim(s, "\n\t "), "\n")
+		},
+		"printOption": func(name, defvalue, usage string) string {
+			prefix := "--"
+			if len(name) == 1 {
+				prefix = "-"
+			}
+			return fmt.Sprintf("\t%s%s=%s\t%s", prefix, name, defvalue, usage)
+		},
+	}
+)
+
+func init() {
+	globalUsageTemplate = template.Must(template.New("global_usage").Funcs(templFuncs).Parse(`
+NAME:
+{{printf "\t%s - %s" .Executable .Description}}
+
+USAGE:
+{{printf "\t%s" .Executable}} [global options] <command> [command options] [arguments...]
+
+VERSION:
+{{printf "\t%s" .Version}}
+
+COMMANDS:{{range .Commands}}
+{{printf "\t%s\t%s" .Name .Summary}}{{end}}
+
+GLOBAL OPTIONS:{{range .Flags}}
+{{printOption .Name .DefValue .Usage}}{{end}}
+
+Run "{{.Executable}} help <command>" for more details on a specific command.
+`[1:]))
+	commandUsageTemplate = template.Must(template.New("command_usage").Funcs(templFuncs).Parse(`
+NAME:
+{{printf "\t%s - %s" .Cmd.Name .Cmd.Summary}}
+
+USAGE:
+{{printf "\t%s %s %s" .Executable .Cmd.Name .Cmd.Usage}}
+
+DESCRIPTION:
+{{range $line := descToLines .Cmd.Description}}{{printf "\t%s" $line}}
+{{end}}
+{{if .CmdFlags}}OPTIONS:{{range .CmdFlags}}
+{{printOption .Name .DefValue .Usage}}{{end}}
+
+{{end}}For help on global options run "{{.Executable}} help"
+`[1:]))
+}
+
+func runHelp(args []string) (exit int) {
+	if len(args) < 1 {
+		printGlobalUsage()
+		return
+	}
+
+	var cmd *Command
+
+	for _, c := range commands {
+		if c.Name == args[0] {
+			cmd = c
+			break
+		}
+	}
+
+	if cmd == nil {
+		stderr("Unrecognized command: %s", args[0])
+		return 1
+	}
+
+	printCommandUsage(cmd)
+	return
+}
+
+func printGlobalUsage() {
+	globalUsageTemplate.Execute(out, struct {
+		Executable  string
+		Commands    []*Command
+		Flags       []*flag.Flag
+		Description string
+		Version     string
+	}{
+		cliName,
+		commands,
+		getAllFlags(),
+		cliDescription,
+		schema.AppContainerVersion.String(),
+	})
+	out.Flush()
+}
+
+func printCommandUsage(cmd *Command) {
+	commandUsageTemplate.Execute(out, struct {
+		Executable string
+		Cmd        *Command
+		CmdFlags   []*flag.Flag
+	}{
+		cliName,
+		cmd,
+		getFlags(&cmd.Flags),
+	})
+	out.Flush()
+}
diff --git a/vendor/github.com/appc/spec/actool/manifest.go b/vendor/github.com/appc/spec/actool/manifest.go
new file mode 100644
index 0000000000..46662167dc
--- /dev/null
+++ b/vendor/github.com/appc/spec/actool/manifest.go
@@ -0,0 +1,525 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/url"
+	"os"
+	"path"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/appc/spec/aci"
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+var (
+	inputFile  string
+	outputFile string
+
+	patchNocompress        bool
+	patchOverwrite         bool
+	patchReplace           bool
+	patchManifestFile      string
+	patchName              string
+	patchExec              string
+	patchUser              string
+	patchGroup             string
+	patchSupplementaryGIDs string
+	patchCaps              string
+	patchRevokeCaps        string
+	patchMounts            string
+	patchPorts             string
+	patchIsolators         string
+
+	catPrettyPrint bool
+
+	cmdPatchManifest = &Command{
+		Name:        "patch-manifest",
+		Description: `Copy an ACI and patch its manifest.`,
+		Summary:     "Copy an ACI and patch its manifest (experimental)",
+		Usage: `
+		  [--manifest=MANIFEST_FILE]
+		  [--name=example.com/app]
+		  [--exec="/app --debug"]
+		  [--user=uid] [--group=gid]
+		  [--capability=CAP_SYS_ADMIN,CAP_NET_ADMIN]
+		  [--revoke-capability=CAP_SYS_CHROOT,CAP_MKNOD]
+		  [--mounts=work,path=/opt,readOnly=true[:work2,...]]
+		  [--ports=query,protocol=tcp,port=8080[:query2,...]]
+		  [--supplementary-groups=gid1,gid2,...]
+		  [--isolators=resource/cpu,request=50m,limit=100m[:resource/memory,...]]
+		  [--replace]
+		  INPUT_ACI_FILE
+		  [OUTPUT_ACI_FILE]`,
+		Run: runPatchManifest,
+	}
+	cmdCatManifest = &Command{
+		Name:        "cat-manifest",
+		Description: `Print the manifest from an ACI.`,
+		Summary:     "Print the manifest from an ACI",
+		Usage:       ` [--pretty-print] ACI_FILE`,
+		Run:         runCatManifest,
+	}
+)
+
+func init() {
+	cmdPatchManifest.Flags.BoolVar(&patchOverwrite, "overwrite", false, "Overwrite target file if it already exists")
+	cmdPatchManifest.Flags.BoolVar(&patchNocompress, "no-compression", false, "Do not gzip-compress the produced ACI")
+	cmdPatchManifest.Flags.BoolVar(&patchReplace, "replace", false, "Replace the input file")
+
+	cmdPatchManifest.Flags.StringVar(&patchManifestFile, "manifest", "", "Replace image manifest with this file. Incompatible with other replace options.")
+	cmdPatchManifest.Flags.StringVar(&patchName, "name", "", "Replace name")
+	cmdPatchManifest.Flags.StringVar(&patchExec, "exec", "", "Replace the command line to launch the executable")
+	cmdPatchManifest.Flags.StringVar(&patchUser, "user", "", "Replace user")
+	cmdPatchManifest.Flags.StringVar(&patchGroup, "group", "", "Replace group")
+	cmdPatchManifest.Flags.StringVar(&patchSupplementaryGIDs, "supplementary-groups", "", "Replace supplementary groups, expects a comma-separated list.")
+	cmdPatchManifest.Flags.StringVar(&patchCaps, "capability", "", "Set the capability remain set")
+	cmdPatchManifest.Flags.StringVar(&patchRevokeCaps, "revoke-capability", "", "Set the capability remove set")
+	cmdPatchManifest.Flags.StringVar(&patchMounts, "mounts", "", "Replace mount points")
+	cmdPatchManifest.Flags.StringVar(&patchPorts, "ports", "", "Replace ports")
+	cmdPatchManifest.Flags.StringVar(&patchIsolators, "isolators", "", "Replace isolators")
+
+	cmdCatManifest.Flags.BoolVar(&catPrettyPrint, "pretty-print", false, "Print with better style")
+}
+
+func getIsolatorStr(name, value string) string {
+	return fmt.Sprintf(`
+                {
+                    "name": "%s",
+                    "value": { %s }
+                }`, name, value)
+}
+
+func isolatorStrFromString(is string) (types.ACIdentifier, string, error) {
+	is = "name=" + is
+	v, err := url.ParseQuery(strings.Replace(is, ",", "&", -1))
+	if err != nil {
+		return "", "", err
+	}
+
+	var name string
+	var values []string
+	var acn *types.ACIdentifier
+
+	for key, val := range v {
+		if len(val) > 1 {
+			return "", "", fmt.Errorf("label %s with multiple values %q", key, val)
+		}
+
+		switch key {
+		case "name":
+			acn, err = types.NewACIdentifier(val[0])
+			if err != nil {
+				return "", "", err
+			}
+			name = val[0]
+		default:
+			// (TODO)yifan: Not support the default boolean yet.
+			values = append(values, fmt.Sprintf(`"%s": "%s"`, key, val[0]))
+		}
+	}
+	return *acn, getIsolatorStr(name, strings.Join(values, ", ")), nil
+}
+
+func patchManifest(im *schema.ImageManifest) error {
+
+	if patchName != "" {
+		name, err := types.NewACIdentifier(patchName)
+		if err != nil {
+			return err
+		}
+		im.Name = *name
+	}
+
+	var app *types.App = im.App
+	if patchExec != "" {
+		if app == nil {
+			// if the original manifest was missing an app and
+			// patchExec is set let's assume the user is trying to
+			// inject one...
+			im.App = &types.App{}
+			app = im.App
+		}
+		app.Exec = strings.Split(patchExec, " ")
+	}
+
+	if patchUser != "" ||
+		patchGroup != "" ||
+		patchSupplementaryGIDs != "" ||
+		patchCaps != "" ||
+		patchRevokeCaps != "" ||
+		patchMounts != "" ||
+		patchPorts != "" ||
+		patchIsolators != "" {
+		// ...but if we still don't have an app and the user is trying
+		// to patch one of its other parameters, it's an error
+		if app == nil {
+			return fmt.Errorf("no app in the supplied manifest and no exec command provided")
+		}
+	}
+
+	if patchUser != "" {
+		app.User = patchUser
+	}
+
+	if patchGroup != "" {
+		app.Group = patchGroup
+	}
+
+	if patchSupplementaryGIDs != "" {
+		app.SupplementaryGIDs = []int{}
+		gids := strings.Split(patchSupplementaryGIDs, ",")
+		for _, g := range gids {
+			gid, err := strconv.Atoi(g)
+			if err != nil {
+				return fmt.Errorf("invalid supplementary group %q: %v", g, err)
+			}
+			app.SupplementaryGIDs = append(app.SupplementaryGIDs, gid)
+		}
+	}
+
+	if patchCaps != "" {
+		isolator := app.Isolators.GetByName(types.LinuxCapabilitiesRetainSetName)
+		if isolator != nil {
+			return fmt.Errorf("isolator already exists (os/linux/capabilities-retain-set)")
+		}
+
+		// Instantiate a Isolator with the content specified by the --capability
+		// parameter.
+		caps, err := types.NewLinuxCapabilitiesRetainSet(strings.Split(patchCaps, ",")...)
+		if err != nil {
+			return fmt.Errorf("cannot parse capability %q: %v", patchCaps, err)
+		}
+		app.Isolators = append(app.Isolators, caps.AsIsolator())
+	}
+	if patchRevokeCaps != "" {
+		isolator := app.Isolators.GetByName(types.LinuxCapabilitiesRevokeSetName)
+		if isolator != nil {
+			return fmt.Errorf("isolator already exists (os/linux/capabilities-remove-set)")
+		}
+
+		// Instantiate a Isolator with the content specified by the --revoke-capability
+		// parameter.
+		caps, err := types.NewLinuxCapabilitiesRevokeSet(strings.Split(patchRevokeCaps, ",")...)
+		if err != nil {
+			return fmt.Errorf("cannot parse capability %q: %v", patchRevokeCaps, err)
+		}
+		app.Isolators = append(app.Isolators, caps.AsIsolator())
+	}
+
+	if patchMounts != "" {
+		mounts := strings.Split(patchMounts, ":")
+		for _, m := range mounts {
+			mountPoint, err := types.MountPointFromString(m)
+			if err != nil {
+				return fmt.Errorf("cannot parse mount point %q: %v", m, err)
+			}
+			app.MountPoints = append(app.MountPoints, *mountPoint)
+		}
+	}
+
+	if patchPorts != "" {
+		ports := strings.Split(patchPorts, ":")
+		for _, p := range ports {
+			port, err := types.PortFromString(p)
+			if err != nil {
+				return fmt.Errorf("cannot parse port %q: %v", p, err)
+			}
+			app.Ports = append(app.Ports, *port)
+		}
+	}
+
+	if patchIsolators != "" {
+		isolators := strings.Split(patchIsolators, ":")
+		for _, is := range isolators {
+			name, isolatorStr, err := isolatorStrFromString(is)
+			if err != nil {
+				return fmt.Errorf("cannot parse isolator %q: %v", is, err)
+			}
+
+			_, ok := types.ResourceIsolatorNames[name]
+
+			if name == types.LinuxNoNewPrivilegesName {
+				ok = true
+				kv := strings.Split(is, ",")
+				if len(kv) != 2 {
+					return fmt.Errorf("isolator %s: invalid format", name)
+				}
+
+				isolatorStr = fmt.Sprintf(`{ "name": "%s", "value": %s }`, name, kv[1])
+			}
+
+			if !ok {
+				return fmt.Errorf("isolator %s is not supported for patching", name)
+			}
+
+			isolator := &types.Isolator{}
+			if err := isolator.UnmarshalJSON([]byte(isolatorStr)); err != nil {
+				return fmt.Errorf("cannot unmarshal isolator %v: %v", isolatorStr, err)
+			}
+			app.Isolators = append(app.Isolators, *isolator)
+		}
+	}
+	return nil
+}
+
+// extractManifest iterates over the tar reader and locate the manifest. Once
+// located, the manifest can be printed, replaced or patched.
+func extractManifest(tr *tar.Reader, tw *tar.Writer, printManifest bool, newManifest []byte) error {
+Tar:
+	for {
+		hdr, err := tr.Next()
+		switch err {
+		case io.EOF:
+			break Tar
+		case nil:
+			if filepath.Clean(hdr.Name) == aci.ManifestFile {
+				var new_bytes []byte
+
+				bytes, err := ioutil.ReadAll(tr)
+				if err != nil {
+					return err
+				}
+
+				if printManifest && !catPrettyPrint {
+					fmt.Println(string(bytes))
+				}
+
+				im := &schema.ImageManifest{}
+				err = im.UnmarshalJSON(bytes)
+				if err != nil {
+					return err
+				}
+
+				if printManifest && catPrettyPrint {
+					output, err := json.MarshalIndent(im, "", "    ")
+					if err != nil {
+						return err
+					}
+					fmt.Println(string(output))
+				}
+
+				if tw == nil {
+					return nil
+				}
+
+				if len(newManifest) == 0 {
+					err = patchManifest(im)
+					if err != nil {
+						return err
+					}
+
+					new_bytes, err = im.MarshalJSON()
+					if err != nil {
+						return err
+					}
+				} else {
+					new_bytes = newManifest
+				}
+
+				hdr.Size = int64(len(new_bytes))
+				err = tw.WriteHeader(hdr)
+				if err != nil {
+					return err
+				}
+
+				_, err = tw.Write(new_bytes)
+				if err != nil {
+					return err
+				}
+			} else if tw != nil {
+				err := tw.WriteHeader(hdr)
+				if err != nil {
+					return err
+				}
+				_, err = io.Copy(tw, tr)
+				if err != nil {
+					return err
+				}
+			}
+		default:
+			return fmt.Errorf("error reading tarball: %v", err)
+		}
+	}
+
+	return nil
+}
+
+func runPatchManifest(args []string) (exit int) {
+	var fh *os.File
+	var err error
+
+	if patchReplace && patchOverwrite {
+		stderr("patch-manifest: Cannot use both --replace and --overwrite")
+		return 1
+	}
+	if !patchReplace && len(args) != 2 {
+		stderr("patch-manifest: Must provide input and output files (or use --replace)")
+		return 1
+	}
+	if patchReplace && len(args) != 1 {
+		stderr("patch-manifest: Must provide one file")
+		return 1
+	}
+	if patchManifestFile != "" && (patchName != "" || patchExec != "" || patchUser != "" || patchGroup != "" || patchCaps != "" || patchMounts != "") {
+		stderr("patch-manifest: --manifest is incompatible with other manifest editing options")
+		return 1
+	}
+
+	inputFile = args[0]
+
+	// Prepare output writer
+
+	if patchReplace {
+		fh, err = ioutil.TempFile(path.Dir(inputFile), ".actool-tmp."+path.Base(inputFile)+"-")
+		if err != nil {
+			stderr("patch-manifest: Cannot create temporary file: %v", err)
+			return 1
+		}
+	} else {
+		outputFile = args[1]
+
+		ext := filepath.Ext(outputFile)
+		if ext != schema.ACIExtension {
+			stderr("patch-manifest: Extension must be %s (given %s)", schema.ACIExtension, ext)
+			return 1
+		}
+
+		mode := os.O_CREATE | os.O_WRONLY
+		if patchOverwrite {
+			mode |= os.O_TRUNC
+		} else {
+			mode |= os.O_EXCL
+		}
+
+		fh, err = os.OpenFile(outputFile, mode, 0644)
+		if err != nil {
+			if os.IsExist(err) {
+				stderr("patch-manifest: Output file exists (try --overwrite)")
+			} else {
+				stderr("patch-manifest: Unable to open output %s: %v", outputFile, err)
+			}
+			return 1
+		}
+	}
+
+	var gw *gzip.Writer
+	var w io.WriteCloser = fh
+	if !patchNocompress {
+		gw = gzip.NewWriter(fh)
+		w = gw
+	}
+	tw := tar.NewWriter(w)
+
+	defer func() {
+		tw.Close()
+		if !patchNocompress {
+			gw.Close()
+		}
+		fh.Close()
+		if exit != 0 && !patchOverwrite {
+			os.Remove(fh.Name())
+		}
+	}()
+
+	// Prepare input reader
+
+	input, err := os.Open(inputFile)
+	if err != nil {
+		stderr("patch-manifest: Cannot open %s: %v", inputFile, err)
+		return 1
+	}
+	defer input.Close()
+
+	tr, err := aci.NewCompressedTarReader(input)
+	if err != nil {
+		stderr("patch-manifest: Cannot extract %s: %v", inputFile, err)
+		return 1
+	}
+	defer tr.Close()
+
+	var newManifest []byte
+
+	if patchManifestFile != "" {
+		mr, err := os.Open(patchManifestFile)
+		if err != nil {
+			stderr("patch-manifest: Cannot open %s: %v", patchManifestFile, err)
+			return 1
+		}
+		defer input.Close()
+
+		newManifest, err = ioutil.ReadAll(mr)
+		if err != nil {
+			stderr("patch-manifest: Cannot read %s: %v", patchManifestFile, err)
+			return 1
+		}
+	}
+
+	err = extractManifest(tr.Reader, tw, false, newManifest)
+	if err != nil {
+		stderr("patch-manifest: Unable to read %s: %v", inputFile, err)
+		return 1
+	}
+
+	if patchReplace {
+		err = os.Rename(fh.Name(), inputFile)
+		if err != nil {
+			stderr("patch-manifest: Cannot rename %q to %q: %v", fh.Name, inputFile, err)
+			return 1
+		}
+	}
+
+	return
+}
+
+func runCatManifest(args []string) (exit int) {
+	if len(args) != 1 {
+		stderr("cat-manifest: Must provide one file")
+		return 1
+	}
+
+	inputFile = args[0]
+
+	input, err := os.Open(inputFile)
+	if err != nil {
+		stderr("cat-manifest: Cannot open %s: %v", inputFile, err)
+		return 1
+	}
+	defer input.Close()
+
+	tr, err := aci.NewCompressedTarReader(input)
+	if err != nil {
+		stderr("cat-manifest: Cannot extract %s: %v", inputFile, err)
+		return 1
+	}
+	defer tr.Close()
+
+	err = extractManifest(tr.Reader, nil, true, nil)
+	if err != nil {
+		stderr("cat-manifest: Unable to read %s: %v", inputFile, err)
+		return 1
+	}
+
+	return
+}
diff --git a/vendor/github.com/appc/spec/actool/validate.go b/vendor/github.com/appc/spec/actool/validate.go
new file mode 100644
index 0000000000..12a7f19ff9
--- /dev/null
+++ b/vendor/github.com/appc/spec/actool/validate.go
@@ -0,0 +1,177 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"strings"
+
+	"github.com/appc/spec/aci"
+	"github.com/appc/spec/schema"
+)
+
+const (
+	typeAppImage    = "appimage"
+	typeImageLayout = "layout"
+	typeManifest    = "manifest"
+)
+
+var (
+	valType     string
+	cmdValidate = &Command{
+		Name:        "validate",
+		Description: "Validate one or more AppContainer files",
+		Summary:     "Validate that one or more images or manifests meet the AppContainer specification",
+		Usage:       "[--type=TYPE] FILE...",
+		Run:         runValidate,
+	}
+	validateTypes = []string{
+		typeAppImage,
+		typeImageLayout,
+		typeManifest,
+	}
+)
+
+func init() {
+	cmdValidate.Flags.StringVar(&valType, "type", "",
+		fmt.Sprintf(`Type of file to validate. If unset, actool will try to detect the type. One of "%s"`, strings.Join(validateTypes, ",")))
+}
+
+func runValidate(args []string) (exit int) {
+	if len(args) < 1 {
+		stderr("must pass one or more files")
+		return 1
+	}
+
+	for _, path := range args {
+		vt := valType
+		fi, err := os.Stat(path)
+		if err != nil {
+			stderr("unable to access %s: %v", path, err)
+			return 1
+		}
+		var fh *os.File
+		if fi.IsDir() {
+			switch vt {
+			case typeImageLayout:
+			case "":
+				vt = typeImageLayout
+			case typeManifest, typeAppImage:
+				stderr("%s is a directory (wrong --type?)", path)
+				return 1
+			default:
+				// should never happen
+				panic(fmt.Sprintf("unexpected type: %v", vt))
+			}
+		} else {
+			fh, err = os.Open(path)
+			if err != nil {
+				stderr("%s: unable to open: %v", path, err)
+				return 1
+			}
+		}
+
+		if vt == "" {
+			vt, err = detectValType(fh)
+			if err != nil {
+				stderr("%s: error detecting file type: %v", path, err)
+				return 1
+			}
+		}
+		switch vt {
+		case typeImageLayout:
+			err = aci.ValidateLayout(path)
+			if err != nil {
+				stderr("%s: invalid image layout: %v", path, err)
+				exit = 1
+			} else if globalFlags.Debug {
+				stderr("%s: valid image layout", path)
+			}
+		case typeAppImage:
+			tr, err := aci.NewCompressedTarReader(fh)
+			if err != nil {
+				stderr("%s: error decompressing file: %v", path, err)
+				return 1
+			}
+			err = aci.ValidateArchive(tr.Reader)
+			tr.Close()
+			fh.Close()
+			if err != nil {
+				if e, ok := err.(aci.ErrOldVersion); ok {
+					stderr("%s: warning: %v", path, e)
+				} else {
+					stderr("%s: error validating: %v", path, err)
+					exit = 1
+				}
+			} else if globalFlags.Debug {
+				stderr("%s: valid app container image", path)
+			}
+		case typeManifest:
+			b, err := ioutil.ReadAll(fh)
+			fh.Close()
+			if err != nil {
+				stderr("%s: unable to read file %s", path, err)
+				return 1
+			}
+			k := schema.Kind{}
+			if err := k.UnmarshalJSON(b); err != nil {
+				stderr("%s: error unmarshaling manifest: %v", path, err)
+				return 1
+			}
+			switch k.ACKind {
+			case "ImageManifest":
+				m := schema.ImageManifest{}
+				err = m.UnmarshalJSON(b)
+			case "PodManifest":
+				m := schema.PodManifest{}
+				err = m.UnmarshalJSON(b)
+			default:
+				// Should not get here; schema.Kind unmarshal should fail
+				panic("bad ACKind")
+			}
+			if err != nil {
+				stderr("%s: invalid %s: %v", path, k.ACKind, err)
+				exit = 1
+			} else if globalFlags.Debug {
+				stderr("%s: valid %s", path, k.ACKind)
+			}
+		default:
+			stderr("%s: unable to detect filetype (try --type)", path)
+			return 1
+		}
+	}
+
+	return
+}
+
+func detectValType(file *os.File) (string, error) {
+	typ, err := aci.DetectFileType(file)
+	if err != nil {
+		return "", err
+	}
+	if _, err := file.Seek(0, 0); err != nil {
+		return "", err
+	}
+	switch typ {
+	case aci.TypeXz, aci.TypeGzip, aci.TypeBzip2, aci.TypeTar:
+		return typeAppImage, nil
+	case aci.TypeText:
+		return typeManifest, nil
+	default:
+		return "", nil
+	}
+}
diff --git a/vendor/github.com/appc/spec/actool/version.go b/vendor/github.com/appc/spec/actool/version.go
new file mode 100644
index 0000000000..0191ad7b38
--- /dev/null
+++ b/vendor/github.com/appc/spec/actool/version.go
@@ -0,0 +1,33 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/appc/spec/schema"
+)
+
+var cmdVersion = &Command{
+	Name:        "version",
+	Description: "Print the version and exit",
+	Summary:     "Print the version and exit",
+	Run:         runVersion,
+}
+
+func runVersion(args []string) (exit int) {
+	fmt.Printf("actool version %s\n", schema.AppContainerVersion.String())
+	return
+}
diff --git a/vendor/github.com/appc/spec/discovery/discovery.go b/vendor/github.com/appc/spec/discovery/discovery.go
new file mode 100644
index 0000000000..b2dc659541
--- /dev/null
+++ b/vendor/github.com/appc/spec/discovery/discovery.go
@@ -0,0 +1,257 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package discovery
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"regexp"
+	"strings"
+
+	"golang.org/x/net/html"
+	"golang.org/x/net/html/atom"
+)
+
+type acMeta struct {
+	name   string
+	prefix string
+	uri    string
+}
+
+type ACIEndpoint struct {
+	ACI string
+	ASC string
+}
+
+// A struct containing both discovered endpoints and keys. Used to avoid
+// function duplication (one for endpoints and one for keys, so to avoid two
+// doDiscover, two DiscoverWalkFunc)
+type discoveryData struct {
+	ACIEndpoints []ACIEndpoint
+	PublicKeys   []string
+}
+
+type ACIEndpoints []ACIEndpoint
+
+type PublicKeys []string
+
+const (
+	defaultVersion = "latest"
+)
+
+var (
+	templateExpression = regexp.MustCompile(`{.*?}`)
+	errEnough          = errors.New("enough discovery information found")
+)
+
+func appendMeta(meta []acMeta, attrs []html.Attribute) []acMeta {
+	m := acMeta{}
+
+	for _, a := range attrs {
+		if a.Namespace != "" {
+			continue
+		}
+
+		switch a.Key {
+		case "name":
+			m.name = a.Val
+
+		case "content":
+			parts := strings.SplitN(strings.TrimSpace(a.Val), " ", 2)
+			if len(parts) < 2 {
+				break
+			}
+			m.prefix = parts[0]
+			m.uri = strings.TrimSpace(parts[1])
+		}
+	}
+
+	// TODO(eyakubovich): should prefix be optional?
+	if !strings.HasPrefix(m.name, "ac-") || m.prefix == "" || m.uri == "" {
+		return meta
+	}
+
+	return append(meta, m)
+}
+
+func extractACMeta(r io.Reader) []acMeta {
+	var meta []acMeta
+
+	z := html.NewTokenizer(r)
+
+	for {
+		switch z.Next() {
+		case html.ErrorToken:
+			return meta
+
+		case html.StartTagToken, html.SelfClosingTagToken:
+			tok := z.Token()
+			if tok.DataAtom == atom.Meta {
+				meta = appendMeta(meta, tok.Attr)
+			}
+		}
+	}
+}
+
+func renderTemplate(tpl string, kvs ...string) (string, bool) {
+	for i := 0; i < len(kvs); i += 2 {
+		k := kvs[i]
+		v := kvs[i+1]
+		tpl = strings.Replace(tpl, k, v, -1)
+	}
+	return tpl, !templateExpression.MatchString(tpl)
+}
+
+func createTemplateVars(app App) []string {
+	tplVars := []string{"{name}", app.Name.String()}
+	// If a label is called "name", it will be ignored as it appears after
+	// in the slice
+	for n, v := range app.Labels {
+		tplVars = append(tplVars, fmt.Sprintf("{%s}", n), v)
+	}
+	return tplVars
+}
+
+func doDiscover(pre string, hostHeaders map[string]http.Header, app App, insecure InsecureOption) (*discoveryData, error) {
+	app = *app.Copy()
+	if app.Labels["version"] == "" {
+		app.Labels["version"] = defaultVersion
+	}
+
+	_, body, err := httpsOrHTTP(pre, hostHeaders, insecure)
+	if err != nil {
+		return nil, err
+	}
+	defer body.Close()
+
+	meta := extractACMeta(body)
+
+	tplVars := createTemplateVars(app)
+
+	dd := &discoveryData{}
+
+	for _, m := range meta {
+		if !strings.HasPrefix(app.Name.String(), m.prefix) {
+			continue
+		}
+
+		switch m.name {
+		case "ac-discovery":
+			// Ignore not handled variables as {ext} isn't already rendered.
+			uri, _ := renderTemplate(m.uri, tplVars...)
+			asc, ok := renderTemplate(uri, "{ext}", "aci.asc")
+			if !ok {
+				continue
+			}
+			aci, ok := renderTemplate(uri, "{ext}", "aci")
+			if !ok {
+				continue
+			}
+			dd.ACIEndpoints = append(dd.ACIEndpoints, ACIEndpoint{ACI: aci, ASC: asc})
+
+		case "ac-discovery-pubkeys":
+			dd.PublicKeys = append(dd.PublicKeys, m.uri)
+		}
+	}
+
+	return dd, nil
+}
+
+// DiscoverWalk will make HTTPS requests to find discovery meta tags and
+// optionally will use HTTP if insecure is set. hostHeaders specifies the
+// header to apply depending on the host (e.g. authentication). Based on the
+// response of the discoverFn it will continue to recurse up the tree.
+func DiscoverWalk(app App, hostHeaders map[string]http.Header, insecure InsecureOption, discoverFn DiscoverWalkFunc) (dd *discoveryData, err error) {
+	parts := strings.Split(string(app.Name), "/")
+	for i := range parts {
+		end := len(parts) - i
+		pre := strings.Join(parts[:end], "/")
+
+		dd, err = doDiscover(pre, hostHeaders, app, insecure)
+		if derr := discoverFn(pre, dd, err); derr != nil {
+			return dd, derr
+		}
+	}
+
+	return nil, fmt.Errorf("discovery failed")
+}
+
+// DiscoverWalkFunc can stop a DiscoverWalk by returning non-nil error.
+type DiscoverWalkFunc func(prefix string, dd *discoveryData, err error) error
+
+// FailedAttempt represents a failed discovery attempt. This is for debugging
+// and user feedback.
+type FailedAttempt struct {
+	Prefix string
+	Error  error
+}
+
+func walker(attempts *[]FailedAttempt, testFn DiscoverWalkFunc) DiscoverWalkFunc {
+	return func(pre string, dd *discoveryData, err error) error {
+		if err != nil {
+			*attempts = append(*attempts, FailedAttempt{pre, err})
+			return nil
+		}
+		if err := testFn(pre, dd, err); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+// DiscoverACIEndpoints will make HTTPS requests to find the ac-discovery meta
+// tags and optionally will use HTTP if insecure is set. hostHeaders
+// specifies the header to apply depending on the host (e.g. authentication).
+// It will not give up until it has exhausted the path or found an image
+// discovery.
+func DiscoverACIEndpoints(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (ACIEndpoints, []FailedAttempt, error) {
+	testFn := func(pre string, dd *discoveryData, err error) error {
+		if len(dd.ACIEndpoints) != 0 {
+			return errEnough
+		}
+		return nil
+	}
+
+	attempts := []FailedAttempt{}
+	dd, err := DiscoverWalk(app, hostHeaders, insecure, walker(&attempts, testFn))
+	if err != nil && err != errEnough {
+		return nil, attempts, err
+	}
+
+	return dd.ACIEndpoints, attempts, nil
+}
+
+// DiscoverPublicKey will make HTTPS requests to find the ac-public-keys meta
+// tags and optionally will use HTTP if insecure is set. hostHeaders
+// specifies the header to apply depending on the host (e.g. authentication).
+// It will not give up until it has exhausted the path or found an public key.
+func DiscoverPublicKeys(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (PublicKeys, []FailedAttempt, error) {
+	testFn := func(pre string, dd *discoveryData, err error) error {
+		if len(dd.PublicKeys) != 0 {
+			return errEnough
+		}
+		return nil
+	}
+
+	attempts := []FailedAttempt{}
+	dd, err := DiscoverWalk(app, hostHeaders, insecure, walker(&attempts, testFn))
+	if err != nil && err != errEnough {
+		return nil, attempts, err
+	}
+
+	return dd.PublicKeys, attempts, nil
+}
diff --git a/vendor/github.com/appc/spec/discovery/doc.go b/vendor/github.com/appc/spec/discovery/doc.go
new file mode 100644
index 0000000000..55bfc3a02a
--- /dev/null
+++ b/vendor/github.com/appc/spec/discovery/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package discovery contains an experimental implementation of the Image
+// Discovery section of the appc specification.
+package discovery
diff --git a/vendor/github.com/appc/spec/discovery/http.go b/vendor/github.com/appc/spec/discovery/http.go
new file mode 100644
index 0000000000..430bcc61cf
--- /dev/null
+++ b/vendor/github.com/appc/spec/discovery/http.go
@@ -0,0 +1,122 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package discovery
+
+import (
+	"crypto/tls"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"time"
+)
+
+type InsecureOption int
+
+const (
+	defaultDialTimeout = 5 * time.Second
+)
+
+const (
+	InsecureNone InsecureOption = 0
+
+	InsecureTLS InsecureOption = 1 << iota
+	InsecureHTTP
+)
+
+var (
+	// Client is the default http.Client used for discovery requests.
+	Client            *http.Client
+	ClientInsecureTLS *http.Client
+
+	// httpDo is the internal object used by discovery to retrieve URLs; it is
+	// defined here so it can be overridden for testing
+	httpDo            httpDoer
+	httpDoInsecureTLS httpDoer
+)
+
+// httpDoer is an interface used to wrap http.Client for real requests and
+// allow easy mocking in local tests.
+type httpDoer interface {
+	Do(req *http.Request) (resp *http.Response, err error)
+}
+
+func init() {
+	t := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		Dial: func(n, a string) (net.Conn, error) {
+			return net.DialTimeout(n, a, defaultDialTimeout)
+		},
+	}
+	Client = &http.Client{
+		Transport: t,
+	}
+	httpDo = Client
+
+	// copy for InsecureTLS
+	tInsecureTLS := *t
+	tInsecureTLS.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+	ClientInsecureTLS = &http.Client{
+		Transport: &tInsecureTLS,
+	}
+	httpDoInsecureTLS = ClientInsecureTLS
+}
+
+func httpsOrHTTP(name string, hostHeaders map[string]http.Header, insecure InsecureOption) (urlStr string, body io.ReadCloser, err error) {
+	fetch := func(scheme string) (urlStr string, res *http.Response, err error) {
+		u, err := url.Parse(scheme + "://" + name)
+		if err != nil {
+			return "", nil, err
+		}
+		u.RawQuery = "ac-discovery=1"
+		urlStr = u.String()
+		req, err := http.NewRequest("GET", urlStr, nil)
+		if err != nil {
+			return "", nil, err
+		}
+		if hostHeader, ok := hostHeaders[u.Host]; ok {
+			req.Header = hostHeader
+		}
+		if insecure&InsecureTLS != 0 {
+			res, err = httpDoInsecureTLS.Do(req)
+			return
+		}
+		res, err = httpDo.Do(req)
+		return
+	}
+	closeBody := func(res *http.Response) {
+		if res != nil {
+			res.Body.Close()
+		}
+	}
+	urlStr, res, err := fetch("https")
+	if err != nil || res.StatusCode != http.StatusOK {
+		if insecure&InsecureHTTP != 0 {
+			closeBody(res)
+			urlStr, res, err = fetch("http")
+		}
+	}
+
+	if res != nil && res.StatusCode != http.StatusOK {
+		err = fmt.Errorf("expected a 200 OK got %d", res.StatusCode)
+	}
+
+	if err != nil {
+		closeBody(res)
+		return "", nil, err
+	}
+	return urlStr, res.Body, nil
+}
diff --git a/vendor/github.com/appc/spec/discovery/parse.go b/vendor/github.com/appc/spec/discovery/parse.go
new file mode 100644
index 0000000000..7b9d574a69
--- /dev/null
+++ b/vendor/github.com/appc/spec/discovery/parse.go
@@ -0,0 +1,130 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package discovery
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+
+	"github.com/appc/spec/schema/common"
+	"github.com/appc/spec/schema/types"
+)
+
+type App struct {
+	Name   types.ACIdentifier
+	Labels map[types.ACIdentifier]string
+}
+
+func NewApp(name string, labels map[types.ACIdentifier]string) (*App, error) {
+	if labels == nil {
+		labels = make(map[types.ACIdentifier]string, 0)
+	}
+	acn, err := types.NewACIdentifier(name)
+	if err != nil {
+		return nil, err
+	}
+	return &App{
+		Name:   *acn,
+		Labels: labels,
+	}, nil
+}
+
+// NewAppFromString takes a command line app parameter and returns a map of labels.
+//
+// Example app parameters:
+// 	example.com/reduce-worker:1.0.0
+// 	example.com/reduce-worker,channel=alpha,label=value
+// 	example.com/reduce-worker:1.0.0,label=value
+//
+// As can be seen in above examples - colon, comma and equal sign have
+// special meaning. If any of them has to be a part of a label's value
+// then consider writing your own string to App parser.
+func NewAppFromString(app string) (*App, error) {
+	var (
+		name   string
+		labels map[types.ACIdentifier]string
+	)
+
+	preparedApp, err := prepareAppString(app)
+	if err != nil {
+		return nil, err
+	}
+	v, err := url.ParseQuery(preparedApp)
+	if err != nil {
+		return nil, err
+	}
+	labels = make(map[types.ACIdentifier]string, 0)
+	for key, val := range v {
+		if len(val) > 1 {
+			return nil, fmt.Errorf("label %s with multiple values %q", key, val)
+		}
+		if key == "name" {
+			name = val[0]
+			continue
+		}
+		labelName, err := types.NewACIdentifier(key)
+		if err != nil {
+			return nil, err
+		}
+		labels[*labelName] = val[0]
+	}
+	a, err := NewApp(name, labels)
+	if err != nil {
+		return nil, err
+	}
+	return a, nil
+}
+
+func prepareAppString(app string) (string, error) {
+	if err := checkColon(app); err != nil {
+		return "", err
+	}
+
+	app = "name=" + strings.Replace(app, ":", ",version=", 1)
+	return common.MakeQueryString(app)
+}
+
+func checkColon(app string) error {
+	firstComma := strings.IndexRune(app, ',')
+	firstColon := strings.IndexRune(app, ':')
+	if firstColon > firstComma && firstComma > -1 {
+		return fmt.Errorf("malformed app string - colon may appear only right after the app name")
+	}
+	if strings.Count(app, ":") > 1 {
+		return fmt.Errorf("malformed app string - colon may appear at most once")
+	}
+	return nil
+}
+
+func (a *App) Copy() *App {
+	ac := &App{
+		Name:   a.Name,
+		Labels: make(map[types.ACIdentifier]string, 0),
+	}
+	for k, v := range a.Labels {
+		ac.Labels[k] = v
+	}
+	return ac
+}
+
+// String returns the URL-like image name
+func (a *App) String() string {
+	img := a.Name.String()
+	for n, v := range a.Labels {
+		img += fmt.Sprintf(",%s=%s", n, v)
+	}
+	return img
+}
diff --git a/vendor/github.com/appc/spec/pkg/acirenderer/acirenderer.go b/vendor/github.com/appc/spec/pkg/acirenderer/acirenderer.go
new file mode 100644
index 0000000000..25a097f056
--- /dev/null
+++ b/vendor/github.com/appc/spec/pkg/acirenderer/acirenderer.go
@@ -0,0 +1,253 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package acirenderer
+
+import (
+	"archive/tar"
+	"crypto/sha512"
+	"fmt"
+	"hash"
+	"io"
+	"io/ioutil"
+	"path/filepath"
+	"strings"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+// An ACIRegistry provides all functions of an ACIProvider plus functions to
+// search for an aci and get its contents
+type ACIRegistry interface {
+	ACIProvider
+	GetImageManifest(key string) (*schema.ImageManifest, error)
+	GetACI(name types.ACIdentifier, labels types.Labels) (string, error)
+}
+
+// An ACIProvider provides functions to get an ACI contents, to convert an
+// ACI hash to the key under which the ACI is known to the provider and to resolve an
+// image ID to the key under which it's known to the provider.
+type ACIProvider interface {
+	// Read the ACI contents stream given the key. Use ResolveKey to
+	// convert an image ID to the relative provider's key.
+	ReadStream(key string) (io.ReadCloser, error)
+	// Converts an image ID to the, if existent, key under which the
+	// ACI is known to the provider
+	ResolveKey(key string) (string, error)
+	// Converts a Hash to the provider's key
+	HashToKey(h hash.Hash) string
+}
+
+// An Image contains the ImageManifest, the ACIProvider's key and its Level in
+// the dependency tree.
+type Image struct {
+	Im    *schema.ImageManifest
+	Key   string
+	Level uint16
+}
+
+// Images encapsulates an ordered slice of Image structs. It represents a flat
+// dependency tree.
+// The upper Image should be the first in the slice with a level of 0.
+// For example if A is the upper image and has two deps (in order B and C). And C has one dep (D),
+// the slice (reporting the app name and excluding im and Hash) should be:
+// [{A, Level: 0}, {C, Level:1}, {D, Level: 2}, {B, Level: 1}]
+type Images []Image
+
+// ACIFiles represents which files to extract for every ACI
+type ACIFiles struct {
+	Key     string
+	FileMap map[string]struct{}
+}
+
+// RenderedACI is an (ordered) slice of ACIFiles
+type RenderedACI []*ACIFiles
+
+// GetRenderedACIWithImageID, given an imageID, starts with the matching image
+// available in the store, creates the dependencies list and returns the
+// RenderedACI list.
+func GetRenderedACIWithImageID(imageID types.Hash, ap ACIRegistry) (RenderedACI, error) {
+	imgs, err := CreateDepListFromImageID(imageID, ap)
+	if err != nil {
+		return nil, err
+	}
+	return GetRenderedACIFromList(imgs, ap)
+}
+
+// GetRenderedACI, given an image app name and optional labels, starts with the
+// best matching image available in the store, creates the dependencies list
+// and returns the RenderedACI list.
+func GetRenderedACI(name types.ACIdentifier, labels types.Labels, ap ACIRegistry) (RenderedACI, error) {
+	imgs, err := CreateDepListFromNameLabels(name, labels, ap)
+	if err != nil {
+		return nil, err
+	}
+	return GetRenderedACIFromList(imgs, ap)
+}
+
+// GetRenderedACIFromList returns the RenderedACI list. All file outside rootfs
+// are excluded (at the moment only "manifest").
+func GetRenderedACIFromList(imgs Images, ap ACIProvider) (RenderedACI, error) {
+	if len(imgs) == 0 {
+		return nil, fmt.Errorf("image list empty")
+	}
+
+	allFiles := make(map[string]byte)
+	renderedACI := RenderedACI{}
+
+	first := true
+	for i, img := range imgs {
+		pwlm := getUpperPWLM(imgs, i)
+		ra, err := getACIFiles(img, ap, allFiles, pwlm)
+		if err != nil {
+			return nil, err
+		}
+		// Use the manifest from the upper ACI
+		if first {
+			ra.FileMap["manifest"] = struct{}{}
+			first = false
+		}
+		renderedACI = append(renderedACI, ra)
+	}
+
+	return renderedACI, nil
+}
+
+// getUpperPWLM returns the pwl at the lower level for the branch where
+// img[pos] lives.
+func getUpperPWLM(imgs Images, pos int) map[string]struct{} {
+	var pwlm map[string]struct{}
+	curlevel := imgs[pos].Level
+	// Start from our position and go back ignoring the other leafs.
+	for i := pos; i >= 0; i-- {
+		img := imgs[i]
+		if img.Level < curlevel && len(img.Im.PathWhitelist) > 0 {
+			pwlm = pwlToMap(img.Im.PathWhitelist)
+		}
+		curlevel = img.Level
+	}
+	return pwlm
+}
+
+// getACIFiles returns the ACIFiles struct for the given image. All files
+// outside rootfs are excluded (at the moment only "manifest").
+func getACIFiles(img Image, ap ACIProvider, allFiles map[string]byte, pwlm map[string]struct{}) (*ACIFiles, error) {
+	rs, err := ap.ReadStream(img.Key)
+	if err != nil {
+		return nil, err
+	}
+	defer rs.Close()
+
+	hash := sha512.New()
+	r := io.TeeReader(rs, hash)
+
+	thispwlm := pwlToMap(img.Im.PathWhitelist)
+	ra := &ACIFiles{FileMap: make(map[string]struct{})}
+	if err = Walk(tar.NewReader(r), func(hdr *tar.Header) error {
+		name := hdr.Name
+		cleanName := filepath.Clean(name)
+
+		// Add the rootfs directory.
+		if cleanName == "rootfs" && hdr.Typeflag == tar.TypeDir {
+			ra.FileMap[cleanName] = struct{}{}
+			allFiles[cleanName] = hdr.Typeflag
+			return nil
+		}
+
+		// Ignore files outside /rootfs/ (at the moment only "manifest").
+		if !strings.HasPrefix(cleanName, "rootfs/") {
+			return nil
+		}
+
+		// Is the file in our PathWhiteList?
+		// If the file is a directory continue also if not in PathWhiteList
+		if hdr.Typeflag != tar.TypeDir {
+			if len(img.Im.PathWhitelist) > 0 {
+				if _, ok := thispwlm[cleanName]; !ok {
+					return nil
+				}
+			}
+		}
+		// Is the file in the lower level PathWhiteList of this img branch?
+		if pwlm != nil {
+			if _, ok := pwlm[cleanName]; !ok {
+				return nil
+			}
+		}
+		// Is the file already provided by a previous image?
+		if _, ok := allFiles[cleanName]; ok {
+			return nil
+		}
+		// Check that the parent dirs are also of type dir in the upper
+		// images
+		parentDir := filepath.Dir(cleanName)
+		for parentDir != "." && parentDir != "/" {
+			if ft, ok := allFiles[parentDir]; ok && ft != tar.TypeDir {
+				return nil
+			}
+			parentDir = filepath.Dir(parentDir)
+		}
+		ra.FileMap[cleanName] = struct{}{}
+		allFiles[cleanName] = hdr.Typeflag
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	// Tar does not necessarily read the complete file, so ensure we read the entirety into the hash
+	if _, err := io.Copy(ioutil.Discard, r); err != nil {
+		return nil, fmt.Errorf("error reading ACI: %v", err)
+	}
+
+	if g := ap.HashToKey(hash); g != img.Key {
+		return nil, fmt.Errorf("image hash does not match expected (%s != %s)", g, img.Key)
+	}
+
+	ra.Key = img.Key
+	return ra, nil
+}
+
+// pwlToMap converts a pathWhiteList slice to a map for faster search
+// It will also prepend "rootfs/" to the provided paths and they will be
+// relative to "/" so they can be easily compared with the tar.Header.Name
+// If pwl length is 0, a nil map is returned
+func pwlToMap(pwl []string) map[string]struct{} {
+	if len(pwl) == 0 {
+		return nil
+	}
+	m := make(map[string]struct{}, len(pwl))
+	for _, name := range pwl {
+		relpath := filepath.Join("rootfs", name)
+		m[relpath] = struct{}{}
+	}
+	return m
+}
+
+func Walk(tarReader *tar.Reader, walkFunc func(hdr *tar.Header) error) error {
+	for {
+		hdr, err := tarReader.Next()
+		if err == io.EOF {
+			// end of tar archive
+			break
+		}
+		if err != nil {
+			return fmt.Errorf("Error reading tar entry: %v", err)
+		}
+		if err := walkFunc(hdr); err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/pkg/acirenderer/resolve.go b/vendor/github.com/appc/spec/pkg/acirenderer/resolve.go
new file mode 100644
index 0000000000..248bcbf2af
--- /dev/null
+++ b/vendor/github.com/appc/spec/pkg/acirenderer/resolve.go
@@ -0,0 +1,88 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package acirenderer
+
+import (
+	"container/list"
+
+	"github.com/appc/spec/schema/types"
+)
+
+// CreateDepListFromImageID returns the flat dependency tree of the image with
+// the provided imageID
+func CreateDepListFromImageID(imageID types.Hash, ap ACIRegistry) (Images, error) {
+	key, err := ap.ResolveKey(imageID.String())
+	if err != nil {
+		return nil, err
+	}
+	return createDepList(key, ap)
+}
+
+// CreateDepListFromNameLabels returns the flat dependency tree of the image
+// with the provided app name and optional labels.
+func CreateDepListFromNameLabels(name types.ACIdentifier, labels types.Labels, ap ACIRegistry) (Images, error) {
+	key, err := ap.GetACI(name, labels)
+	if err != nil {
+		return nil, err
+	}
+	return createDepList(key, ap)
+}
+
+// createDepList returns the flat dependency tree as a list of Image type
+func createDepList(key string, ap ACIRegistry) (Images, error) {
+	imgsl := list.New()
+	im, err := ap.GetImageManifest(key)
+	if err != nil {
+		return nil, err
+	}
+
+	img := Image{Im: im, Key: key, Level: 0}
+	imgsl.PushFront(img)
+
+	// Create a flat dependency tree. Use a LinkedList to be able to
+	// insert elements in the list while working on it.
+	for el := imgsl.Front(); el != nil; el = el.Next() {
+		img := el.Value.(Image)
+		dependencies := img.Im.Dependencies
+		for _, d := range dependencies {
+			var depimg Image
+			var depKey string
+			if d.ImageID != nil && !d.ImageID.Empty() {
+				depKey, err = ap.ResolveKey(d.ImageID.String())
+				if err != nil {
+					return nil, err
+				}
+			} else {
+				var err error
+				depKey, err = ap.GetACI(d.ImageName, d.Labels)
+				if err != nil {
+					return nil, err
+				}
+			}
+			im, err := ap.GetImageManifest(depKey)
+			if err != nil {
+				return nil, err
+			}
+			depimg = Image{Im: im, Key: depKey, Level: img.Level + 1}
+			imgsl.InsertAfter(depimg, el)
+		}
+	}
+
+	imgs := Images{}
+	for el := imgsl.Front(); el != nil; el = el.Next() {
+		imgs = append(imgs, el.Value.(Image))
+	}
+	return imgs, nil
+}
diff --git a/vendor/github.com/appc/spec/pkg/device/device_linux.go b/vendor/github.com/appc/spec/pkg/device/device_linux.go
new file mode 100644
index 0000000000..4f895cd76e
--- /dev/null
+++ b/vendor/github.com/appc/spec/pkg/device/device_linux.go
@@ -0,0 +1,33 @@
+// Copyright 2016 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build linux
+
+package device
+
+// with glibc/sysdeps/unix/sysv/linux/sys/sysmacros.h as reference
+
+func Major(rdev uint64) uint {
+	return uint((rdev>>8)&0xfff) | (uint(rdev>>32) & ^uint(0xfff))
+}
+
+func Minor(rdev uint64) uint {
+	return uint(rdev&0xff) | uint(uint32(rdev>>12) & ^uint32(0xff))
+}
+
+func Makedev(maj uint, min uint) uint64 {
+	return uint64(min&0xff) | (uint64(maj&0xfff) << 8) |
+		((uint64(min) & ^uint64(0xff)) << 12) |
+		((uint64(maj) & ^uint64(0xfff)) << 32)
+}
diff --git a/vendor/github.com/appc/spec/pkg/device/device_posix.go b/vendor/github.com/appc/spec/pkg/device/device_posix.go
new file mode 100644
index 0000000000..c2e1b31697
--- /dev/null
+++ b/vendor/github.com/appc/spec/pkg/device/device_posix.go
@@ -0,0 +1,57 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build freebsd netbsd openbsd darwin
+
+package device
+
+/*
+#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
+#include <sys/types.h>
+
+unsigned int
+my_major(dev_t dev)
+{
+  return major(dev);
+}
+
+unsigned int
+my_minor(dev_t dev)
+{
+  return minor(dev);
+}
+
+dev_t
+my_makedev(unsigned int maj, unsigned int min)
+{
+       return makedev(maj, min);
+}
+*/
+import "C"
+
+func Major(rdev uint64) uint {
+	major := C.my_major(C.dev_t(rdev))
+	return uint(major)
+}
+
+func Minor(rdev uint64) uint {
+	minor := C.my_minor(C.dev_t(rdev))
+	return uint(minor)
+}
+
+func Makedev(maj uint, min uint) uint64 {
+	dev := C.my_makedev(C.uint(maj), C.uint(min))
+	return uint64(dev)
+}
diff --git a/vendor/github.com/appc/spec/pkg/tarheader/doc.go b/vendor/github.com/appc/spec/pkg/tarheader/doc.go
new file mode 100644
index 0000000000..047a0c0fa4
--- /dev/null
+++ b/vendor/github.com/appc/spec/pkg/tarheader/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package tarheader contains a simple abstraction to accurately create
+// tar.Headers on different operating systems.
+package tarheader
diff --git a/vendor/github.com/appc/spec/pkg/tarheader/pop_darwin.go b/vendor/github.com/appc/spec/pkg/tarheader/pop_darwin.go
new file mode 100644
index 0000000000..8f68ee77c5
--- /dev/null
+++ b/vendor/github.com/appc/spec/pkg/tarheader/pop_darwin.go
@@ -0,0 +1,39 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build darwin
+
+package tarheader
+
+import (
+	"archive/tar"
+	"os"
+	"syscall"
+	"time"
+)
+
+func init() {
+	populateHeaderStat = append(populateHeaderStat, populateHeaderCtime)
+}
+
+func populateHeaderCtime(h *tar.Header, fi os.FileInfo, _ map[uint64]string) {
+	st, ok := fi.Sys().(*syscall.Stat_t)
+	if !ok {
+		return
+	}
+
+	sec, nsec := st.Ctimespec.Unix()
+	ctime := time.Unix(sec, nsec)
+	h.ChangeTime = ctime
+}
diff --git a/vendor/github.com/appc/spec/pkg/tarheader/pop_linux.go b/vendor/github.com/appc/spec/pkg/tarheader/pop_linux.go
new file mode 100644
index 0000000000..2055024084
--- /dev/null
+++ b/vendor/github.com/appc/spec/pkg/tarheader/pop_linux.go
@@ -0,0 +1,39 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build linux
+
+package tarheader
+
+import (
+	"archive/tar"
+	"os"
+	"syscall"
+	"time"
+)
+
+func init() {
+	populateHeaderStat = append(populateHeaderStat, populateHeaderCtime)
+}
+
+func populateHeaderCtime(h *tar.Header, fi os.FileInfo, _ map[uint64]string) {
+	st, ok := fi.Sys().(*syscall.Stat_t)
+	if !ok {
+		return
+	}
+
+	sec, nsec := st.Ctim.Unix()
+	ctime := time.Unix(sec, nsec)
+	h.ChangeTime = ctime
+}
diff --git a/vendor/github.com/appc/spec/pkg/tarheader/pop_posix.go b/vendor/github.com/appc/spec/pkg/tarheader/pop_posix.go
new file mode 100644
index 0000000000..0cc083fee6
--- /dev/null
+++ b/vendor/github.com/appc/spec/pkg/tarheader/pop_posix.go
@@ -0,0 +1,50 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build linux freebsd netbsd openbsd
+
+package tarheader
+
+import (
+	"archive/tar"
+	"os"
+	"syscall"
+
+	"github.com/appc/spec/pkg/device"
+)
+
+func init() {
+	populateHeaderStat = append(populateHeaderStat, populateHeaderUnix)
+}
+
+func populateHeaderUnix(h *tar.Header, fi os.FileInfo, seen map[uint64]string) {
+	st, ok := fi.Sys().(*syscall.Stat_t)
+	if !ok {
+		return
+	}
+	h.Uid = int(st.Uid)
+	h.Gid = int(st.Gid)
+	if st.Mode&syscall.S_IFMT == syscall.S_IFBLK || st.Mode&syscall.S_IFMT == syscall.S_IFCHR {
+		h.Devminor = int64(device.Minor(uint64(st.Rdev)))
+		h.Devmajor = int64(device.Major(uint64(st.Rdev)))
+	}
+	// If we have already seen this inode, generate a hardlink
+	p, ok := seen[uint64(st.Ino)]
+	if ok {
+		h.Linkname = p
+		h.Typeflag = tar.TypeLink
+	} else {
+		seen[uint64(st.Ino)] = h.Name
+	}
+}
diff --git a/vendor/github.com/appc/spec/pkg/tarheader/tarheader.go b/vendor/github.com/appc/spec/pkg/tarheader/tarheader.go
new file mode 100644
index 0000000000..dc16c33d33
--- /dev/null
+++ b/vendor/github.com/appc/spec/pkg/tarheader/tarheader.go
@@ -0,0 +1,28 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tarheader
+
+import (
+	"archive/tar"
+	"os"
+)
+
+var populateHeaderStat []func(h *tar.Header, fi os.FileInfo, seen map[uint64]string)
+
+func Populate(h *tar.Header, fi os.FileInfo, seen map[uint64]string) {
+	for _, pop := range populateHeaderStat {
+		pop(h, fi, seen)
+	}
+}
diff --git a/vendor/github.com/appc/spec/schema/common/common.go b/vendor/github.com/appc/spec/schema/common/common.go
new file mode 100644
index 0000000000..ffc0f6f9b4
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/common/common.go
@@ -0,0 +1,40 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+)
+
+// MakeQueryString takes a comma-separated LABEL=VALUE string and returns an
+// "&"-separated string with URL escaped values.
+//
+// Examples:
+// 	version=1.0.0,label=v1+v2 -> version=1.0.0&label=v1%2Bv2
+// 	name=db,source=/tmp$1 -> name=db&source=%2Ftmp%241
+func MakeQueryString(app string) (string, error) {
+	parts := strings.Split(app, ",")
+	escapedParts := make([]string, len(parts))
+	for i, s := range parts {
+		p := strings.SplitN(s, "=", 2)
+		if len(p) != 2 {
+			return "", fmt.Errorf("malformed string %q - has a label without a value: %s", app, p[0])
+		}
+		escapedParts[i] = fmt.Sprintf("%s=%s", p[0], url.QueryEscape(p[1]))
+	}
+	return strings.Join(escapedParts, "&"), nil
+}
diff --git a/vendor/github.com/appc/spec/schema/doc.go b/vendor/github.com/appc/spec/schema/doc.go
new file mode 100644
index 0000000000..ba381543f8
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/doc.go
@@ -0,0 +1,25 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package schema provides definitions for the JSON schema of the different
+// manifests in the App Container Specification. The manifests are canonically
+// represented in their respective structs:
+//   - `ImageManifest`
+//   - `PodManifest`
+//
+// Validation is performed through serialization: if a blob of JSON data will
+// unmarshal to one of the *Manifests, it is considered a valid implementation
+// of the standard. Similarly, if a constructed *Manifest struct marshals
+// successfully to JSON, it must be valid.
+package schema
diff --git a/vendor/github.com/appc/spec/schema/image.go b/vendor/github.com/appc/spec/schema/image.go
new file mode 100644
index 0000000000..fac4c794c3
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/image.go
@@ -0,0 +1,103 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package schema
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/appc/spec/schema/types"
+
+	"go4.org/errorutil"
+)
+
+const (
+	ACIExtension      = ".aci"
+	ImageManifestKind = types.ACKind("ImageManifest")
+)
+
+type ImageManifest struct {
+	ACKind        types.ACKind       `json:"acKind"`
+	ACVersion     types.SemVer       `json:"acVersion"`
+	Name          types.ACIdentifier `json:"name"`
+	Labels        types.Labels       `json:"labels,omitempty"`
+	App           *types.App         `json:"app,omitempty"`
+	Annotations   types.Annotations  `json:"annotations,omitempty"`
+	Dependencies  types.Dependencies `json:"dependencies,omitempty"`
+	PathWhitelist []string           `json:"pathWhitelist,omitempty"`
+}
+
+// imageManifest is a model to facilitate extra validation during the
+// unmarshalling of the ImageManifest
+type imageManifest ImageManifest
+
+func BlankImageManifest() *ImageManifest {
+	return &ImageManifest{ACKind: ImageManifestKind, ACVersion: AppContainerVersion}
+}
+
+func (im *ImageManifest) UnmarshalJSON(data []byte) error {
+	a := imageManifest(*im)
+	err := json.Unmarshal(data, &a)
+	if err != nil {
+		if serr, ok := err.(*json.SyntaxError); ok {
+			line, col, highlight := errorutil.HighlightBytePosition(bytes.NewReader(data), serr.Offset)
+			return fmt.Errorf("\nError at line %d, column %d\n%s%v", line, col, highlight, err)
+		}
+		return err
+	}
+	nim := ImageManifest(a)
+	if err := nim.assertValid(); err != nil {
+		return err
+	}
+	*im = nim
+	return nil
+}
+
+func (im ImageManifest) MarshalJSON() ([]byte, error) {
+	if err := im.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(imageManifest(im))
+}
+
+var imKindError = types.InvalidACKindError(ImageManifestKind)
+
+// assertValid performs extra assertions on an ImageManifest to ensure that
+// fields are set appropriately, etc. It is used exclusively when marshalling
+// and unmarshalling an ImageManifest. Most field-specific validation is
+// performed through the individual types being marshalled; assertValid()
+// should only deal with higher-level validation.
+func (im *ImageManifest) assertValid() error {
+	if im.ACKind != ImageManifestKind {
+		return imKindError
+	}
+	if im.ACVersion.Empty() {
+		return errors.New(`acVersion must be set`)
+	}
+	if im.Name.Empty() {
+		return errors.New(`name must be set`)
+	}
+	return nil
+}
+
+func (im *ImageManifest) GetLabel(name string) (val string, ok bool) {
+	return im.Labels.Get(name)
+}
+
+func (im *ImageManifest) GetAnnotation(name string) (val string, ok bool) {
+	return im.Annotations.Get(name)
+}
diff --git a/vendor/github.com/appc/spec/schema/kind.go b/vendor/github.com/appc/spec/schema/kind.go
new file mode 100644
index 0000000000..5dc4f957ec
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/kind.go
@@ -0,0 +1,42 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package schema
+
+import (
+	"encoding/json"
+
+	"github.com/appc/spec/schema/types"
+)
+
+type Kind struct {
+	ACVersion types.SemVer `json:"acVersion"`
+	ACKind    types.ACKind `json:"acKind"`
+}
+
+type kind Kind
+
+func (k *Kind) UnmarshalJSON(data []byte) error {
+	nk := kind{}
+	err := json.Unmarshal(data, &nk)
+	if err != nil {
+		return err
+	}
+	*k = Kind(nk)
+	return nil
+}
+
+func (k Kind) MarshalJSON() ([]byte, error) {
+	return json.Marshal(kind(k))
+}
diff --git a/vendor/github.com/appc/spec/schema/lastditch/doc.go b/vendor/github.com/appc/spec/schema/lastditch/doc.go
new file mode 100644
index 0000000000..9cc5734607
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/lastditch/doc.go
@@ -0,0 +1,28 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package lastditch provides fallback redefinitions of parts of
+// schemas provided by schema package.
+//
+// Almost no validation of schemas is done (besides checking if data
+// really is `JSON`-encoded and kind is either `ImageManifest` or
+// `PodManifest`. This is to get as much data as possible from an
+// invalid manifest. The main aim of the package is to be used for the
+// better error reporting. The another aim might be to force some
+// operation (like removing a pod), which would otherwise fail because
+// of an invalid manifest.
+//
+// To avoid validation during deserialization, types provided by this
+// package use plain strings.
+package lastditch
diff --git a/vendor/github.com/appc/spec/schema/lastditch/image.go b/vendor/github.com/appc/spec/schema/lastditch/image.go
new file mode 100644
index 0000000000..dc5055a056
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/lastditch/image.go
@@ -0,0 +1,45 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package lastditch
+
+import (
+	"encoding/json"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+type ImageManifest struct {
+	ACVersion string `json:"acVersion"`
+	ACKind    string `json:"acKind"`
+	Name      string `json:"name"`
+	Labels    Labels `json:"labels,omitempty"`
+}
+
+// a type just to avoid a recursion during unmarshalling
+type imageManifest ImageManifest
+
+func (im *ImageManifest) UnmarshalJSON(data []byte) error {
+	i := imageManifest(*im)
+	err := json.Unmarshal(data, &i)
+	if err != nil {
+		return err
+	}
+	if i.ACKind != string(schema.ImageManifestKind) {
+		return types.InvalidACKindError(schema.ImageManifestKind)
+	}
+	*im = ImageManifest(i)
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/lastditch/labels.go b/vendor/github.com/appc/spec/schema/lastditch/labels.go
new file mode 100644
index 0000000000..5cf93a087c
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/lastditch/labels.go
@@ -0,0 +1,38 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package lastditch
+
+import (
+	"encoding/json"
+)
+
+type Labels []Label
+
+// a type just to avoid a recursion during unmarshalling
+type labels Labels
+
+type Label struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+func (l *Labels) UnmarshalJSON(data []byte) error {
+	var jl labels
+	if err := json.Unmarshal(data, &jl); err != nil {
+		return err
+	}
+	*l = Labels(jl)
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/lastditch/pod.go b/vendor/github.com/appc/spec/schema/lastditch/pod.go
new file mode 100644
index 0000000000..2e9d8456bb
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/lastditch/pod.go
@@ -0,0 +1,57 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package lastditch
+
+import (
+	"encoding/json"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+type PodManifest struct {
+	ACVersion string  `json:"acVersion"`
+	ACKind    string  `json:"acKind"`
+	Apps      AppList `json:"apps"`
+}
+
+type AppList []RuntimeApp
+
+type RuntimeApp struct {
+	Name  string       `json:"name"`
+	Image RuntimeImage `json:"image"`
+}
+
+type RuntimeImage struct {
+	Name   string `json:"name"`
+	ID     string `json:"id"`
+	Labels Labels `json:"labels,omitempty"`
+}
+
+// a type just to avoid a recursion during unmarshalling
+type podManifest PodManifest
+
+func (pm *PodManifest) UnmarshalJSON(data []byte) error {
+	p := podManifest(*pm)
+	err := json.Unmarshal(data, &p)
+	if err != nil {
+		return err
+	}
+	if p.ACKind != string(schema.PodManifestKind) {
+		return types.InvalidACKindError(schema.PodManifestKind)
+	}
+	*pm = PodManifest(p)
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/pod.go b/vendor/github.com/appc/spec/schema/pod.go
new file mode 100644
index 0000000000..d4792ff3b4
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/pod.go
@@ -0,0 +1,168 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package schema
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/appc/spec/schema/types"
+
+	"go4.org/errorutil"
+)
+
+const PodManifestKind = types.ACKind("PodManifest")
+
+type PodManifest struct {
+	ACVersion   types.SemVer        `json:"acVersion"`
+	ACKind      types.ACKind        `json:"acKind"`
+	Apps        AppList             `json:"apps"`
+	Volumes     []types.Volume      `json:"volumes"`
+	Isolators   []types.Isolator    `json:"isolators"`
+	Annotations types.Annotations   `json:"annotations"`
+	Ports       []types.ExposedPort `json:"ports"`
+}
+
+// podManifest is a model to facilitate extra validation during the
+// unmarshalling of the PodManifest
+type podManifest PodManifest
+
+func BlankPodManifest() *PodManifest {
+	return &PodManifest{ACKind: PodManifestKind, ACVersion: AppContainerVersion}
+}
+
+func (pm *PodManifest) UnmarshalJSON(data []byte) error {
+	p := podManifest(*pm)
+	err := json.Unmarshal(data, &p)
+	if err != nil {
+		if serr, ok := err.(*json.SyntaxError); ok {
+			line, col, highlight := errorutil.HighlightBytePosition(bytes.NewReader(data), serr.Offset)
+			return fmt.Errorf("\nError at line %d, column %d\n%s%v", line, col, highlight, err)
+		}
+		return err
+	}
+	npm := PodManifest(p)
+	if err := npm.assertValid(); err != nil {
+		return err
+	}
+	*pm = npm
+	return nil
+}
+
+func (pm PodManifest) MarshalJSON() ([]byte, error) {
+	if err := pm.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(podManifest(pm))
+}
+
+var pmKindError = types.InvalidACKindError(PodManifestKind)
+
+// assertValid performs extra assertions on an PodManifest to
+// ensure that fields are set appropriately, etc. It is used exclusively when
+// marshalling and unmarshalling an PodManifest. Most
+// field-specific validation is performed through the individual types being
+// marshalled; assertValid() should only deal with higher-level validation.
+func (pm *PodManifest) assertValid() error {
+	if pm.ACKind != PodManifestKind {
+		return pmKindError
+	}
+	return nil
+}
+
+type AppList []RuntimeApp
+
+type appList AppList
+
+func (al *AppList) UnmarshalJSON(data []byte) error {
+	a := appList{}
+	err := json.Unmarshal(data, &a)
+	if err != nil {
+		return err
+	}
+	nal := AppList(a)
+	if err := nal.assertValid(); err != nil {
+		return err
+	}
+	*al = nal
+	return nil
+}
+
+func (al AppList) MarshalJSON() ([]byte, error) {
+	if err := al.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(appList(al))
+}
+
+func (al AppList) assertValid() error {
+	seen := map[types.ACName]bool{}
+	for _, a := range al {
+		if _, ok := seen[a.Name]; ok {
+			return fmt.Errorf(`duplicate apps of name %q`, a.Name)
+		}
+		seen[a.Name] = true
+	}
+	return nil
+}
+
+// Get retrieves an app by the specified name from the AppList; if there is
+// no such app, nil is returned. The returned *RuntimeApp MUST be considered
+// read-only.
+func (al AppList) Get(name types.ACName) *RuntimeApp {
+	for _, a := range al {
+		if name.Equals(a.Name) {
+			aa := a
+			return &aa
+		}
+	}
+	return nil
+}
+
+// Mount describes the mapping between a volume and the path it is mounted
+// inside of an app's filesystem.
+type Mount struct {
+	Volume types.ACName `json:"volume"`
+	Path   string       `json:"path"`
+}
+
+func (r Mount) assertValid() error {
+	if r.Volume.Empty() {
+		return errors.New("volume must be set")
+	}
+	if r.Path == "" {
+		return errors.New("path must be set")
+	}
+	return nil
+}
+
+// RuntimeApp describes an application referenced in a PodManifest
+type RuntimeApp struct {
+	Name           types.ACName      `json:"name"`
+	Image          RuntimeImage      `json:"image"`
+	App            *types.App        `json:"app,omitempty"`
+	ReadOnlyRootFS bool              `json:"readOnlyRootFS,omitempty"`
+	Mounts         []Mount           `json:"mounts,omitempty"`
+	Annotations    types.Annotations `json:"annotations,omitempty"`
+}
+
+// RuntimeImage describes an image referenced in a RuntimeApp
+type RuntimeImage struct {
+	Name   *types.ACIdentifier `json:"name,omitempty"`
+	ID     types.Hash          `json:"id"`
+	Labels types.Labels        `json:"labels,omitempty"`
+}
diff --git a/vendor/github.com/appc/spec/schema/types/acidentifier.go b/vendor/github.com/appc/spec/schema/types/acidentifier.go
new file mode 100644
index 0000000000..904eda5cbc
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/acidentifier.go
@@ -0,0 +1,145 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"errors"
+	"regexp"
+	"strings"
+)
+
+var (
+	// ValidACIdentifier is a regular expression that defines a valid ACIdentifier
+	ValidACIdentifier = regexp.MustCompile("^[a-z0-9]+([-._~/][a-z0-9]+)*$")
+
+	invalidACIdentifierChars = regexp.MustCompile("[^a-z0-9-._~/]")
+	invalidACIdentifierEdges = regexp.MustCompile("(^[-._~/]+)|([-._~/]+$)")
+
+	ErrEmptyACIdentifier         = ACIdentifierError("ACIdentifier cannot be empty")
+	ErrInvalidEdgeInACIdentifier = ACIdentifierError("ACIdentifier must start and end with only lower case " +
+		"alphanumeric characters")
+	ErrInvalidCharInACIdentifier = ACIdentifierError("ACIdentifier must contain only lower case " +
+		`alphanumeric characters plus "-._~/"`)
+)
+
+// ACIdentifier (an App-Container Identifier) is a format used by keys in image names
+// and image labels of the App Container Standard. An ACIdentifier is restricted to numeric
+// and lowercase URI unreserved characters defined in URI RFC[1]; all alphabetical characters
+// must be lowercase only. Furthermore, the first and last character ("edges") must be
+// alphanumeric, and an ACIdentifier cannot be empty. Programmatically, an ACIdentifier must
+// conform to the regular expression ValidACIdentifier.
+//
+// [1] http://tools.ietf.org/html/rfc3986#section-2.3
+type ACIdentifier string
+
+func (n ACIdentifier) String() string {
+	return string(n)
+}
+
+// Set sets the ACIdentifier to the given value, if it is valid; if not,
+// an error is returned.
+func (n *ACIdentifier) Set(s string) error {
+	nn, err := NewACIdentifier(s)
+	if err == nil {
+		*n = *nn
+	}
+	return err
+}
+
+// Equals checks whether a given ACIdentifier is equal to this one.
+func (n ACIdentifier) Equals(o ACIdentifier) bool {
+	return strings.ToLower(string(n)) == strings.ToLower(string(o))
+}
+
+// Empty returns a boolean indicating whether this ACIdentifier is empty.
+func (n ACIdentifier) Empty() bool {
+	return n.String() == ""
+}
+
+// NewACIdentifier generates a new ACIdentifier from a string. If the given string is
+// not a valid ACIdentifier, nil and an error are returned.
+func NewACIdentifier(s string) (*ACIdentifier, error) {
+	n := ACIdentifier(s)
+	if err := n.assertValid(); err != nil {
+		return nil, err
+	}
+	return &n, nil
+}
+
+// MustACIdentifier generates a new ACIdentifier from a string, If the given string is
+// not a valid ACIdentifier, it panics.
+func MustACIdentifier(s string) *ACIdentifier {
+	n, err := NewACIdentifier(s)
+	if err != nil {
+		panic(err)
+	}
+	return n
+}
+
+func (n ACIdentifier) assertValid() error {
+	s := string(n)
+	if len(s) == 0 {
+		return ErrEmptyACIdentifier
+	}
+	if invalidACIdentifierChars.MatchString(s) {
+		return ErrInvalidCharInACIdentifier
+	}
+	if invalidACIdentifierEdges.MatchString(s) {
+		return ErrInvalidEdgeInACIdentifier
+	}
+	return nil
+}
+
+// UnmarshalJSON implements the json.Unmarshaler interface
+func (n *ACIdentifier) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	nn, err := NewACIdentifier(s)
+	if err != nil {
+		return err
+	}
+	*n = *nn
+	return nil
+}
+
+// MarshalJSON implements the json.Marshaler interface
+func (n ACIdentifier) MarshalJSON() ([]byte, error) {
+	if err := n.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(n.String())
+}
+
+// SanitizeACIdentifier replaces every invalid ACIdentifier character in s with an underscore
+// making it a legal ACIdentifier string. If the character is an upper case letter it
+// replaces it with its lower case. It also removes illegal edge characters
+// (hyphens, period, underscore, tilde and slash).
+//
+// This is a helper function and its algorithm is not part of the spec. It
+// should not be called without the user explicitly asking for a suggestion.
+func SanitizeACIdentifier(s string) (string, error) {
+	s = strings.ToLower(s)
+	s = invalidACIdentifierChars.ReplaceAllString(s, "_")
+	s = invalidACIdentifierEdges.ReplaceAllString(s, "")
+
+	if s == "" {
+		return "", errors.New("must contain at least one valid character")
+	}
+
+	return s, nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/ackind.go b/vendor/github.com/appc/spec/schema/types/ackind.go
new file mode 100644
index 0000000000..1793ca8de8
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/ackind.go
@@ -0,0 +1,67 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+var (
+	ErrNoACKind = ACKindError("ACKind must be set")
+)
+
+// ACKind wraps a string to define a field which must be set with one of
+// several ACKind values. If it is unset, or has an invalid value, the field
+// will refuse to marshal/unmarshal.
+type ACKind string
+
+func (a ACKind) String() string {
+	return string(a)
+}
+
+func (a ACKind) assertValid() error {
+	s := a.String()
+	switch s {
+	case "ImageManifest", "PodManifest":
+		return nil
+	case "":
+		return ErrNoACKind
+	default:
+		msg := fmt.Sprintf("bad ACKind: %s", s)
+		return ACKindError(msg)
+	}
+}
+
+func (a ACKind) MarshalJSON() ([]byte, error) {
+	if err := a.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(a.String())
+}
+
+func (a *ACKind) UnmarshalJSON(data []byte) error {
+	var s string
+	err := json.Unmarshal(data, &s)
+	if err != nil {
+		return err
+	}
+	na := ACKind(s)
+	if err := na.assertValid(); err != nil {
+		return err
+	}
+	*a = na
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/acname.go b/vendor/github.com/appc/spec/schema/types/acname.go
new file mode 100644
index 0000000000..5ececffb7f
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/acname.go
@@ -0,0 +1,145 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"errors"
+	"regexp"
+	"strings"
+)
+
+var (
+	// ValidACName is a regular expression that defines a valid ACName
+	ValidACName = regexp.MustCompile("^[a-z0-9]+([-][a-z0-9]+)*$")
+
+	invalidACNameChars = regexp.MustCompile("[^a-z0-9-]")
+	invalidACNameEdges = regexp.MustCompile("(^[-]+)|([-]+$)")
+
+	ErrEmptyACName         = ACNameError("ACName cannot be empty")
+	ErrInvalidEdgeInACName = ACNameError("ACName must start and end with only lower case " +
+		"alphanumeric characters")
+	ErrInvalidCharInACName = ACNameError("ACName must contain only lower case " +
+		`alphanumeric characters plus "-"`)
+)
+
+// ACName (an App-Container Name) is a format used by keys in different formats
+// of the App Container Standard. An ACName is restricted to numeric and lowercase
+// characters accepted by the DNS RFC[1] plus "-"; all alphabetical characters must
+// be lowercase only. Furthermore, the first and last character ("edges") must be
+// alphanumeric, and an ACName cannot be empty. Programmatically, an ACName must
+// conform to the regular expression ValidACName.
+//
+// [1] http://tools.ietf.org/html/rfc1123#page-13
+type ACName string
+
+func (n ACName) String() string {
+	return string(n)
+}
+
+// Set sets the ACName to the given value, if it is valid; if not,
+// an error is returned.
+func (n *ACName) Set(s string) error {
+	nn, err := NewACName(s)
+	if err == nil {
+		*n = *nn
+	}
+	return err
+}
+
+// Equals checks whether a given ACName is equal to this one.
+func (n ACName) Equals(o ACName) bool {
+	return strings.ToLower(string(n)) == strings.ToLower(string(o))
+}
+
+// Empty returns a boolean indicating whether this ACName is empty.
+func (n ACName) Empty() bool {
+	return n.String() == ""
+}
+
+// NewACName generates a new ACName from a string. If the given string is
+// not a valid ACName, nil and an error are returned.
+func NewACName(s string) (*ACName, error) {
+	n := ACName(s)
+	if err := n.assertValid(); err != nil {
+		return nil, err
+	}
+	return &n, nil
+}
+
+// MustACName generates a new ACName from a string, If the given string is
+// not a valid ACName, it panics.
+func MustACName(s string) *ACName {
+	n, err := NewACName(s)
+	if err != nil {
+		panic(err)
+	}
+	return n
+}
+
+func (n ACName) assertValid() error {
+	s := string(n)
+	if len(s) == 0 {
+		return ErrEmptyACName
+	}
+	if invalidACNameChars.MatchString(s) {
+		return ErrInvalidCharInACName
+	}
+	if invalidACNameEdges.MatchString(s) {
+		return ErrInvalidEdgeInACName
+	}
+	return nil
+}
+
+// UnmarshalJSON implements the json.Unmarshaler interface
+func (n *ACName) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	nn, err := NewACName(s)
+	if err != nil {
+		return err
+	}
+	*n = *nn
+	return nil
+}
+
+// MarshalJSON implements the json.Marshaler interface
+func (n ACName) MarshalJSON() ([]byte, error) {
+	if err := n.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(n.String())
+}
+
+// SanitizeACName replaces every invalid ACName character in s with a dash
+// making it a legal ACName string. If the character is an upper case letter it
+// replaces it with its lower case. It also removes illegal edge characters
+// (hyphens).
+//
+// This is a helper function and its algorithm is not part of the spec. It
+// should not be called without the user explicitly asking for a suggestion.
+func SanitizeACName(s string) (string, error) {
+	s = strings.ToLower(s)
+	s = invalidACNameChars.ReplaceAllString(s, "-")
+	s = invalidACNameEdges.ReplaceAllString(s, "")
+
+	if s == "" {
+		return "", errors.New("must contain at least one valid character")
+	}
+
+	return s, nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/annotations.go b/vendor/github.com/appc/spec/schema/types/annotations.go
new file mode 100644
index 0000000000..ce7743bf53
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/annotations.go
@@ -0,0 +1,106 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+type Annotations []Annotation
+
+type annotations Annotations
+
+type Annotation struct {
+	Name  ACIdentifier `json:"name"`
+	Value string       `json:"value"`
+}
+
+func (a Annotations) assertValid() error {
+	seen := map[ACIdentifier]string{}
+	for _, anno := range a {
+		_, ok := seen[anno.Name]
+		if ok {
+			return fmt.Errorf(`duplicate annotations of name %q`, anno.Name)
+		}
+		seen[anno.Name] = anno.Value
+	}
+	if c, ok := seen["created"]; ok {
+		if _, err := NewDate(c); err != nil {
+			return err
+		}
+	}
+	if h, ok := seen["homepage"]; ok {
+		if _, err := NewURL(h); err != nil {
+			return err
+		}
+	}
+	if d, ok := seen["documentation"]; ok {
+		if _, err := NewURL(d); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (a Annotations) MarshalJSON() ([]byte, error) {
+	if err := a.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(annotations(a))
+}
+
+func (a *Annotations) UnmarshalJSON(data []byte) error {
+	var ja annotations
+	if err := json.Unmarshal(data, &ja); err != nil {
+		return err
+	}
+	na := Annotations(ja)
+	if err := na.assertValid(); err != nil {
+		return err
+	}
+	*a = na
+	return nil
+}
+
+// Retrieve the value of an annotation by the given name from Annotations, if
+// it exists.
+func (a Annotations) Get(name string) (val string, ok bool) {
+	for _, anno := range a {
+		if anno.Name.String() == name {
+			return anno.Value, true
+		}
+	}
+	return "", false
+}
+
+// Set sets the value of an annotation by the given name, overwriting if one already exists.
+func (a *Annotations) Set(name ACIdentifier, value string) {
+	for i, anno := range *a {
+		if anno.Name.Equals(name) {
+			(*a)[i] = Annotation{
+				Name:  name,
+				Value: value,
+			}
+			return
+		}
+	}
+	anno := Annotation{
+		Name:  name,
+		Value: value,
+	}
+	*a = append(*a, anno)
+}
diff --git a/vendor/github.com/appc/spec/schema/types/app.go b/vendor/github.com/appc/spec/schema/types/app.go
new file mode 100644
index 0000000000..df13bf1c3a
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/app.go
@@ -0,0 +1,90 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"path"
+)
+
+type App struct {
+	Exec              Exec           `json:"exec"`
+	EventHandlers     []EventHandler `json:"eventHandlers,omitempty"`
+	User              string         `json:"user"`
+	Group             string         `json:"group"`
+	SupplementaryGIDs []int          `json:"supplementaryGIDs,omitempty"`
+	WorkingDirectory  string         `json:"workingDirectory,omitempty"`
+	Environment       Environment    `json:"environment,omitempty"`
+	MountPoints       []MountPoint   `json:"mountPoints,omitempty"`
+	Ports             []Port         `json:"ports,omitempty"`
+	Isolators         Isolators      `json:"isolators,omitempty"`
+}
+
+// app is a model to facilitate extra validation during the
+// unmarshalling of the App
+type app App
+
+func (a *App) UnmarshalJSON(data []byte) error {
+	ja := app(*a)
+	err := json.Unmarshal(data, &ja)
+	if err != nil {
+		return err
+	}
+	na := App(ja)
+	if err := na.assertValid(); err != nil {
+		return err
+	}
+	if na.Environment == nil {
+		na.Environment = make(Environment, 0)
+	}
+	*a = na
+	return nil
+}
+
+func (a App) MarshalJSON() ([]byte, error) {
+	if err := a.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(app(a))
+}
+
+func (a *App) assertValid() error {
+	if err := a.Exec.assertValid(); err != nil {
+		return err
+	}
+	if a.User == "" {
+		return errors.New(`user is required`)
+	}
+	if a.Group == "" {
+		return errors.New(`group is required`)
+	}
+	if !path.IsAbs(a.WorkingDirectory) && a.WorkingDirectory != "" {
+		return errors.New("workingDirectory must be an absolute path")
+	}
+	eh := make(map[string]bool)
+	for _, e := range a.EventHandlers {
+		name := e.Name
+		if eh[name] {
+			return fmt.Errorf("Only one eventHandler of name %q allowed", name)
+		}
+		eh[name] = true
+	}
+	if err := a.Environment.assertValid(); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/date.go b/vendor/github.com/appc/spec/schema/types/date.go
new file mode 100644
index 0000000000..4458bf45d9
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/date.go
@@ -0,0 +1,60 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+	"time"
+)
+
+// Date wraps time.Time to marshal/unmarshal to/from JSON strings in strict
+// accordance with RFC3339
+// TODO(jonboulle): golang's implementation seems slightly buggy here;
+// according to http://tools.ietf.org/html/rfc3339#section-5.6 , applications
+// may choose to separate the date and time with a space instead of a T
+// character (for example, `date --rfc-3339` on GNU coreutils) - but this is
+// considered an error by go's parser. File a bug?
+type Date time.Time
+
+func NewDate(s string) (*Date, error) {
+	t, err := time.Parse(time.RFC3339, s)
+	if err != nil {
+		return nil, fmt.Errorf("bad Date: %v", err)
+	}
+	d := Date(t)
+	return &d, nil
+}
+
+func (d Date) String() string {
+	return time.Time(d).Format(time.RFC3339)
+}
+
+func (d *Date) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	nd, err := NewDate(s)
+	if err != nil {
+		return err
+	}
+	*d = *nd
+	return nil
+}
+
+func (d Date) MarshalJSON() ([]byte, error) {
+	return json.Marshal(d.String())
+}
diff --git a/vendor/github.com/appc/spec/schema/types/dependencies.go b/vendor/github.com/appc/spec/schema/types/dependencies.go
new file mode 100644
index 0000000000..fb399e4041
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/dependencies.go
@@ -0,0 +1,58 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"errors"
+)
+
+type Dependencies []Dependency
+
+type Dependency struct {
+	ImageName ACIdentifier `json:"imageName"`
+	ImageID   *Hash        `json:"imageID,omitempty"`
+	Labels    Labels       `json:"labels,omitempty"`
+	Size      uint         `json:"size,omitempty"`
+}
+
+type dependency Dependency
+
+func (d Dependency) assertValid() error {
+	if len(d.ImageName) < 1 {
+		return errors.New(`imageName cannot be empty`)
+	}
+	return nil
+}
+
+func (d Dependency) MarshalJSON() ([]byte, error) {
+	if err := d.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(dependency(d))
+}
+
+func (d *Dependency) UnmarshalJSON(data []byte) error {
+	var jd dependency
+	if err := json.Unmarshal(data, &jd); err != nil {
+		return err
+	}
+	nd := Dependency(jd)
+	if err := nd.assertValid(); err != nil {
+		return err
+	}
+	*d = nd
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/doc.go b/vendor/github.com/appc/spec/schema/types/doc.go
new file mode 100644
index 0000000000..9c540851b0
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/doc.go
@@ -0,0 +1,18 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package types contains structs representing the various types in the app
+// container specification. It is used by the [schema manifest types](../)
+// to enforce validation.
+package types
diff --git a/vendor/github.com/appc/spec/schema/types/environment.go b/vendor/github.com/appc/spec/schema/types/environment.go
new file mode 100644
index 0000000000..f152a6b88d
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/environment.go
@@ -0,0 +1,110 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+	"regexp"
+)
+
+var (
+	envPattern = regexp.MustCompile("^[A-Za-z_][A-Za-z_0-9]*$")
+)
+
+type Environment []EnvironmentVariable
+
+type environment Environment
+
+type EnvironmentVariable struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+func (ev EnvironmentVariable) assertValid() error {
+	if len(ev.Name) == 0 {
+		return fmt.Errorf(`environment variable name must not be empty`)
+	}
+	if !envPattern.MatchString(ev.Name) {
+		return fmt.Errorf(`environment variable does not have valid identifier %q`, ev.Name)
+	}
+	return nil
+}
+
+func (e Environment) assertValid() error {
+	seen := map[string]bool{}
+	for _, env := range e {
+		if err := env.assertValid(); err != nil {
+			return err
+		}
+		_, ok := seen[env.Name]
+		if ok {
+			return fmt.Errorf(`duplicate environment variable of name %q`, env.Name)
+		}
+		seen[env.Name] = true
+	}
+
+	return nil
+}
+
+func (e Environment) MarshalJSON() ([]byte, error) {
+	if err := e.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(environment(e))
+}
+
+func (e *Environment) UnmarshalJSON(data []byte) error {
+	var je environment
+	if err := json.Unmarshal(data, &je); err != nil {
+		return err
+	}
+	ne := Environment(je)
+	if err := ne.assertValid(); err != nil {
+		return err
+	}
+	*e = ne
+	return nil
+}
+
+// Retrieve the value of an environment variable by the given name from
+// Environment, if it exists.
+func (e Environment) Get(name string) (value string, ok bool) {
+	for _, env := range e {
+		if env.Name == name {
+			return env.Value, true
+		}
+	}
+	return "", false
+}
+
+// Set sets the value of an environment variable by the given name,
+// overwriting if one already exists.
+func (e *Environment) Set(name string, value string) {
+	for i, env := range *e {
+		if env.Name == name {
+			(*e)[i] = EnvironmentVariable{
+				Name:  name,
+				Value: value,
+			}
+			return
+		}
+	}
+	env := EnvironmentVariable{
+		Name:  name,
+		Value: value,
+	}
+	*e = append(*e, env)
+}
diff --git a/vendor/github.com/appc/spec/schema/types/errors.go b/vendor/github.com/appc/spec/schema/types/errors.go
new file mode 100644
index 0000000000..bb46515944
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/errors.go
@@ -0,0 +1,49 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import "fmt"
+
+// An ACKindError is returned when the wrong ACKind is set in a manifest
+type ACKindError string
+
+func (e ACKindError) Error() string {
+	return string(e)
+}
+
+func InvalidACKindError(kind ACKind) ACKindError {
+	return ACKindError(fmt.Sprintf("missing or bad ACKind (must be %#v)", kind))
+}
+
+// An ACVersionError is returned when a bad ACVersion is set in a manifest
+type ACVersionError string
+
+func (e ACVersionError) Error() string {
+	return string(e)
+}
+
+// An ACIdentifierError is returned when a bad value is used for an ACIdentifier
+type ACIdentifierError string
+
+func (e ACIdentifierError) Error() string {
+	return string(e)
+}
+
+// An ACNameError is returned when a bad value is used for an ACName
+type ACNameError string
+
+func (e ACNameError) Error() string {
+	return string(e)
+}
diff --git a/vendor/github.com/appc/spec/schema/types/event_handler.go b/vendor/github.com/appc/spec/schema/types/event_handler.go
new file mode 100644
index 0000000000..f40c642be4
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/event_handler.go
@@ -0,0 +1,61 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+)
+
+type EventHandler struct {
+	Name string `json:"name"`
+	Exec Exec   `json:"exec"`
+}
+
+type eventHandler EventHandler
+
+func (e EventHandler) assertValid() error {
+	s := e.Name
+	switch s {
+	case "pre-start", "post-stop":
+		return nil
+	case "":
+		return errors.New(`eventHandler "name" cannot be empty`)
+	default:
+		return fmt.Errorf(`bad eventHandler "name": %q`, s)
+	}
+}
+
+func (e EventHandler) MarshalJSON() ([]byte, error) {
+	if err := e.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(eventHandler(e))
+}
+
+func (e *EventHandler) UnmarshalJSON(data []byte) error {
+	var je eventHandler
+	err := json.Unmarshal(data, &je)
+	if err != nil {
+		return err
+	}
+	ne := EventHandler(je)
+	if err := ne.assertValid(); err != nil {
+		return err
+	}
+	*e = ne
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/exec.go b/vendor/github.com/appc/spec/schema/types/exec.go
new file mode 100644
index 0000000000..fa8b156cfb
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/exec.go
@@ -0,0 +1,46 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import "encoding/json"
+
+type Exec []string
+
+type exec Exec
+
+func (e Exec) assertValid() error {
+	return nil
+}
+
+func (e Exec) MarshalJSON() ([]byte, error) {
+	if err := e.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(exec(e))
+}
+
+func (e *Exec) UnmarshalJSON(data []byte) error {
+	var je exec
+	err := json.Unmarshal(data, &je)
+	if err != nil {
+		return err
+	}
+	ne := Exec(je)
+	if err := ne.assertValid(); err != nil {
+		return err
+	}
+	*e = ne
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/hash.go b/vendor/github.com/appc/spec/schema/types/hash.go
new file mode 100644
index 0000000000..1c060a47a0
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/hash.go
@@ -0,0 +1,118 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"crypto/sha512"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+const (
+	maxHashSize = (sha512.Size / 2) + len("sha512-")
+)
+
+// Hash encodes a hash specified in a string of the form:
+//    "<type>-<value>"
+// for example
+//    "sha512-06c733b1838136838e6d2d3e8fa5aea4c7905e92[...]"
+// Valid types are currently:
+//  * sha512
+type Hash struct {
+	typ string
+	Val string
+}
+
+func NewHash(s string) (*Hash, error) {
+	elems := strings.Split(s, "-")
+	if len(elems) != 2 {
+		return nil, errors.New("badly formatted hash string")
+	}
+	nh := Hash{
+		typ: elems[0],
+		Val: elems[1],
+	}
+	if err := nh.assertValid(); err != nil {
+		return nil, err
+	}
+	return &nh, nil
+}
+
+func (h Hash) String() string {
+	return fmt.Sprintf("%s-%s", h.typ, h.Val)
+}
+
+func (h *Hash) Set(s string) error {
+	nh, err := NewHash(s)
+	if err == nil {
+		*h = *nh
+	}
+	return err
+}
+
+func (h Hash) Empty() bool {
+	return reflect.DeepEqual(h, Hash{})
+}
+
+func (h Hash) assertValid() error {
+	switch h.typ {
+	case "sha512":
+	case "":
+		return fmt.Errorf("unexpected empty hash type")
+	default:
+		return fmt.Errorf("unrecognized hash type: %v", h.typ)
+	}
+	if h.Val == "" {
+		return fmt.Errorf("unexpected empty hash value")
+	}
+	return nil
+}
+
+func (h *Hash) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	nh, err := NewHash(s)
+	if err != nil {
+		return err
+	}
+	*h = *nh
+	return nil
+}
+
+func (h Hash) MarshalJSON() ([]byte, error) {
+	if err := h.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(h.String())
+}
+
+func NewHashSHA512(b []byte) *Hash {
+	h := sha512.New()
+	h.Write(b)
+	nh, _ := NewHash(fmt.Sprintf("sha512-%x", h.Sum(nil)))
+	return nh
+}
+
+func ShortHash(hash string) string {
+	if len(hash) > maxHashSize {
+		return hash[:maxHashSize]
+	}
+	return hash
+}
diff --git a/vendor/github.com/appc/spec/schema/types/isolator.go b/vendor/github.com/appc/spec/schema/types/isolator.go
new file mode 100644
index 0000000000..ecdab0088b
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/isolator.go
@@ -0,0 +1,129 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+)
+
+var (
+	isolatorMap map[ACIdentifier]IsolatorValueConstructor
+)
+
+func init() {
+	isolatorMap = make(map[ACIdentifier]IsolatorValueConstructor)
+}
+
+type IsolatorValueConstructor func() IsolatorValue
+
+func AddIsolatorValueConstructor(n ACIdentifier, i IsolatorValueConstructor) {
+	isolatorMap[n] = i
+}
+
+func AddIsolatorName(n ACIdentifier, ns map[ACIdentifier]struct{}) {
+	ns[n] = struct{}{}
+}
+
+// Isolators encapsulates a list of individual Isolators for the ImageManifest
+// and PodManifest schemas.
+type Isolators []Isolator
+
+// GetByName returns the last isolator in the list by the given name.
+func (is *Isolators) GetByName(name ACIdentifier) *Isolator {
+	var i Isolator
+	for j := len(*is) - 1; j >= 0; j-- {
+		i = []Isolator(*is)[j]
+		if i.Name == name {
+			return &i
+		}
+	}
+	return nil
+}
+
+// Unrecognized returns a set of isolators that are not recognized.
+// An isolator is not recognized if it has not had an associated
+// constructor registered with AddIsolatorValueConstructor.
+func (is *Isolators) Unrecognized() Isolators {
+	u := Isolators{}
+	for _, i := range *is {
+		if i.value == nil {
+			u = append(u, i)
+		}
+	}
+	return u
+}
+
+// IsolatorValue encapsulates the actual value of an Isolator which may be
+// serialized as any arbitrary JSON blob. Specific Isolator types should
+// implement this interface to facilitate unmarshalling and validation.
+type IsolatorValue interface {
+	UnmarshalJSON(b []byte) error
+	AssertValid() error
+}
+
+// Isolator is a model for unmarshalling isolator types from their JSON-encoded
+// representation.
+type Isolator struct {
+	// Name is the name of the Isolator type as defined in the specification.
+	Name ACIdentifier `json:"name"`
+	// ValueRaw captures the raw JSON value of an Isolator that was
+	// unmarshalled. This field is used for unmarshalling only. It MUST NOT
+	// be referenced by external users of the Isolator struct. It is
+	// exported only to satisfy Go's unfortunate requirement that fields
+	// must be capitalized to be unmarshalled successfully.
+	ValueRaw *json.RawMessage `json:"value"`
+	// value captures the "true" value of the isolator.
+	value IsolatorValue
+}
+
+// isolator is a shadow type used for unmarshalling.
+type isolator Isolator
+
+// Value returns the raw Value of this Isolator. Users should perform a type
+// switch/assertion on this value to extract the underlying isolator type.
+func (i *Isolator) Value() IsolatorValue {
+	return i.value
+}
+
+// UnmarshalJSON populates this Isolator from a JSON-encoded representation. To
+// unmarshal the Value of the Isolator, it will use the appropriate constructor
+// as registered by AddIsolatorValueConstructor.
+func (i *Isolator) UnmarshalJSON(b []byte) error {
+	var ii isolator
+	err := json.Unmarshal(b, &ii)
+	if err != nil {
+		return err
+	}
+
+	var dst IsolatorValue
+	con, ok := isolatorMap[ii.Name]
+	if ok {
+		dst = con()
+		err = dst.UnmarshalJSON(*ii.ValueRaw)
+		if err != nil {
+			return err
+		}
+		err = dst.AssertValid()
+		if err != nil {
+			return err
+		}
+	}
+
+	i.value = dst
+	i.ValueRaw = ii.ValueRaw
+	i.Name = ii.Name
+
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
new file mode 100644
index 0000000000..678e0bf1f4
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
@@ -0,0 +1,163 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"errors"
+)
+
+const (
+	LinuxCapabilitiesRetainSetName = "os/linux/capabilities-retain-set"
+	LinuxCapabilitiesRevokeSetName = "os/linux/capabilities-remove-set"
+	LinuxNoNewPrivilegesName       = "os/linux/no-new-privileges"
+)
+
+var LinuxIsolatorNames = make(map[ACIdentifier]struct{})
+
+func init() {
+	for name, con := range map[ACIdentifier]IsolatorValueConstructor{
+		LinuxCapabilitiesRevokeSetName: func() IsolatorValue { return &LinuxCapabilitiesRevokeSet{} },
+		LinuxCapabilitiesRetainSetName: func() IsolatorValue { return &LinuxCapabilitiesRetainSet{} },
+		LinuxNoNewPrivilegesName:       func() IsolatorValue { v := LinuxNoNewPrivileges(false); return &v },
+	} {
+		AddIsolatorName(name, LinuxIsolatorNames)
+		AddIsolatorValueConstructor(name, con)
+	}
+}
+
+type LinuxNoNewPrivileges bool
+
+func (l LinuxNoNewPrivileges) AssertValid() error {
+	return nil
+}
+
+func (l *LinuxNoNewPrivileges) UnmarshalJSON(b []byte) error {
+	var v bool
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	*l = LinuxNoNewPrivileges(v)
+
+	return nil
+}
+
+type LinuxCapabilitiesSet interface {
+	Set() []LinuxCapability
+	AssertValid() error
+}
+
+type LinuxCapability string
+
+type linuxCapabilitiesSetValue struct {
+	Set []LinuxCapability `json:"set"`
+}
+
+type linuxCapabilitiesSetBase struct {
+	val linuxCapabilitiesSetValue
+}
+
+func (l linuxCapabilitiesSetBase) AssertValid() error {
+	if len(l.val.Set) == 0 {
+		return errors.New("set must be non-empty")
+	}
+	return nil
+}
+
+func (l *linuxCapabilitiesSetBase) UnmarshalJSON(b []byte) error {
+	var v linuxCapabilitiesSetValue
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	l.val = v
+
+	return err
+}
+
+func (l linuxCapabilitiesSetBase) Set() []LinuxCapability {
+	return l.val.Set
+}
+
+type LinuxCapabilitiesRetainSet struct {
+	linuxCapabilitiesSetBase
+}
+
+func NewLinuxCapabilitiesRetainSet(caps ...string) (*LinuxCapabilitiesRetainSet, error) {
+	l := LinuxCapabilitiesRetainSet{
+		linuxCapabilitiesSetBase{
+			linuxCapabilitiesSetValue{
+				make([]LinuxCapability, len(caps)),
+			},
+		},
+	}
+	for i, c := range caps {
+		l.linuxCapabilitiesSetBase.val.Set[i] = LinuxCapability(c)
+	}
+	if err := l.AssertValid(); err != nil {
+		return nil, err
+	}
+	return &l, nil
+}
+
+func (l LinuxCapabilitiesRetainSet) AsIsolator() Isolator {
+	b, err := json.Marshal(l.linuxCapabilitiesSetBase.val)
+	if err != nil {
+		panic(err)
+	}
+	rm := json.RawMessage(b)
+	return Isolator{
+		Name:     LinuxCapabilitiesRetainSetName,
+		ValueRaw: &rm,
+		value:    &l,
+	}
+}
+
+type LinuxCapabilitiesRevokeSet struct {
+	linuxCapabilitiesSetBase
+}
+
+func NewLinuxCapabilitiesRevokeSet(caps ...string) (*LinuxCapabilitiesRevokeSet, error) {
+	l := LinuxCapabilitiesRevokeSet{
+		linuxCapabilitiesSetBase{
+			linuxCapabilitiesSetValue{
+				make([]LinuxCapability, len(caps)),
+			},
+		},
+	}
+	for i, c := range caps {
+		l.linuxCapabilitiesSetBase.val.Set[i] = LinuxCapability(c)
+	}
+	if err := l.AssertValid(); err != nil {
+		return nil, err
+	}
+	return &l, nil
+}
+
+func (l LinuxCapabilitiesRevokeSet) AsIsolator() Isolator {
+	b, err := json.Marshal(l.linuxCapabilitiesSetBase.val)
+	if err != nil {
+		panic(err)
+	}
+	rm := json.RawMessage(b)
+	return Isolator{
+		Name:     LinuxCapabilitiesRevokeSetName,
+		ValueRaw: &rm,
+		value:    &l,
+	}
+}
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_resources.go b/vendor/github.com/appc/spec/schema/types/isolator_resources.go
new file mode 100644
index 0000000000..2ac5130d1c
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/isolator_resources.go
@@ -0,0 +1,236 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"k8s.io/kubernetes/pkg/api/resource"
+)
+
+var (
+	ErrDefaultTrue     = errors.New("default must be false")
+	ErrDefaultRequired = errors.New("default must be true")
+	ErrRequestNonEmpty = errors.New("request not supported by this resource, must be empty")
+
+	ResourceIsolatorNames = make(map[ACIdentifier]struct{})
+)
+
+const (
+	ResourceBlockBandwidthName   = "resource/block-bandwidth"
+	ResourceBlockIOPSName        = "resource/block-iops"
+	ResourceCPUName              = "resource/cpu"
+	ResourceMemoryName           = "resource/memory"
+	ResourceNetworkBandwidthName = "resource/network-bandwidth"
+)
+
+func init() {
+	for name, con := range map[ACIdentifier]IsolatorValueConstructor{
+		ResourceBlockBandwidthName:   func() IsolatorValue { return &ResourceBlockBandwidth{} },
+		ResourceBlockIOPSName:        func() IsolatorValue { return &ResourceBlockIOPS{} },
+		ResourceCPUName:              func() IsolatorValue { return &ResourceCPU{} },
+		ResourceMemoryName:           func() IsolatorValue { return &ResourceMemory{} },
+		ResourceNetworkBandwidthName: func() IsolatorValue { return &ResourceNetworkBandwidth{} },
+	} {
+		AddIsolatorName(name, ResourceIsolatorNames)
+		AddIsolatorValueConstructor(name, con)
+	}
+}
+
+type Resource interface {
+	Limit() *resource.Quantity
+	Request() *resource.Quantity
+	Default() bool
+}
+
+type ResourceBase struct {
+	val resourceValue
+}
+
+type resourceValue struct {
+	Default bool               `json:"default"`
+	Request *resource.Quantity `json:"request"`
+	Limit   *resource.Quantity `json:"limit"`
+}
+
+func (r ResourceBase) Limit() *resource.Quantity {
+	return r.val.Limit
+}
+func (r ResourceBase) Request() *resource.Quantity {
+	return r.val.Request
+}
+func (r ResourceBase) Default() bool {
+	return r.val.Default
+}
+
+func (r *ResourceBase) UnmarshalJSON(b []byte) error {
+	return json.Unmarshal(b, &r.val)
+}
+
+func (r ResourceBase) AssertValid() error {
+	return nil
+}
+
+type ResourceBlockBandwidth struct {
+	ResourceBase
+}
+
+func (r ResourceBlockBandwidth) AssertValid() error {
+	if r.Default() != true {
+		return ErrDefaultRequired
+	}
+	if r.Request() != nil {
+		return ErrRequestNonEmpty
+	}
+	return nil
+}
+
+type ResourceBlockIOPS struct {
+	ResourceBase
+}
+
+func (r ResourceBlockIOPS) AssertValid() error {
+	if r.Default() != true {
+		return ErrDefaultRequired
+	}
+	if r.Request() != nil {
+		return ErrRequestNonEmpty
+	}
+	return nil
+}
+
+type ResourceCPU struct {
+	ResourceBase
+}
+
+func (r ResourceCPU) String() string {
+	return fmt.Sprintf("ResourceCPU(request=%s, limit=%s)", r.Request(), r.Limit())
+}
+
+func (r ResourceCPU) AssertValid() error {
+	if r.Default() != false {
+		return ErrDefaultTrue
+	}
+	return nil
+}
+
+func (r ResourceCPU) AsIsolator() Isolator {
+	isol := isolatorMap[ResourceCPUName]()
+
+	b, err := json.Marshal(r.val)
+	if err != nil {
+		panic(err)
+	}
+	valRaw := json.RawMessage(b)
+	return Isolator{
+		Name:     ResourceCPUName,
+		ValueRaw: &valRaw,
+		value:    isol,
+	}
+}
+
+func NewResourceCPUIsolator(request, limit string) (*ResourceCPU, error) {
+	req, err := resource.ParseQuantity(request)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing request: %v", err)
+	}
+	lim, err := resource.ParseQuantity(limit)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing limit: %v", err)
+	}
+	res := &ResourceCPU{
+		ResourceBase{
+			resourceValue{
+				Request: req,
+				Limit:   lim,
+			},
+		},
+	}
+	if err := res.AssertValid(); err != nil {
+		// should never happen
+		return nil, err
+	}
+	return res, nil
+}
+
+type ResourceMemory struct {
+	ResourceBase
+}
+
+func (r ResourceMemory) String() string {
+	return fmt.Sprintf("ResourceMemory(request=%s, limit=%s)", r.Request(), r.Limit())
+}
+
+func (r ResourceMemory) AssertValid() error {
+	if r.Default() != false {
+		return ErrDefaultTrue
+	}
+	return nil
+}
+
+func (r ResourceMemory) AsIsolator() Isolator {
+	isol := isolatorMap[ResourceMemoryName]()
+
+	b, err := json.Marshal(r.val)
+	if err != nil {
+		panic(err)
+	}
+	valRaw := json.RawMessage(b)
+	return Isolator{
+		Name:     ResourceMemoryName,
+		ValueRaw: &valRaw,
+		value:    isol,
+	}
+}
+
+func NewResourceMemoryIsolator(request, limit string) (*ResourceMemory, error) {
+	req, err := resource.ParseQuantity(request)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing request: %v", err)
+	}
+	lim, err := resource.ParseQuantity(limit)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing limit: %v", err)
+	}
+	res := &ResourceMemory{
+		ResourceBase{
+			resourceValue{
+				Request: req,
+				Limit:   lim,
+			},
+		},
+	}
+	if err := res.AssertValid(); err != nil {
+		// should never happen
+		return nil, err
+	}
+	return res, nil
+}
+
+type ResourceNetworkBandwidth struct {
+	ResourceBase
+}
+
+func (r ResourceNetworkBandwidth) AssertValid() error {
+	if r.Default() != true {
+		return ErrDefaultRequired
+	}
+	if r.Request() != nil {
+		return ErrRequestNonEmpty
+	}
+	return nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/labels.go b/vendor/github.com/appc/spec/schema/types/labels.go
new file mode 100644
index 0000000000..ebd2bb1a98
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/labels.go
@@ -0,0 +1,134 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+	"sort"
+)
+
+var ValidOSArch = map[string][]string{
+	"linux":   {"amd64", "i386", "aarch64", "aarch64_be", "armv6l", "armv7l", "armv7b"},
+	"freebsd": {"amd64", "i386", "arm"},
+	"darwin":  {"x86_64", "i386"},
+}
+
+type Labels []Label
+
+type labels Labels
+
+type Label struct {
+	Name  ACIdentifier `json:"name"`
+	Value string       `json:"value"`
+}
+
+// IsValidOsArch checks if a OS-architecture combination is valid given a map
+// of valid OS-architectures
+func IsValidOSArch(labels map[ACIdentifier]string, validOSArch map[string][]string) error {
+	if os, ok := labels["os"]; ok {
+		if validArchs, ok := validOSArch[os]; !ok {
+			// Not a whitelisted OS. TODO: how to warn rather than fail?
+			validOses := make([]string, 0, len(validOSArch))
+			for validOs := range validOSArch {
+				validOses = append(validOses, validOs)
+			}
+			sort.Strings(validOses)
+			return fmt.Errorf(`bad os %#v (must be one of: %v)`, os, validOses)
+		} else {
+			// Whitelisted OS. We check arch here, as arch makes sense only
+			// when os is defined.
+			if arch, ok := labels["arch"]; ok {
+				found := false
+				for _, validArch := range validArchs {
+					if arch == validArch {
+						found = true
+						break
+					}
+				}
+				if !found {
+					return fmt.Errorf(`bad arch %#v for %v (must be one of: %v)`, arch, os, validArchs)
+				}
+			}
+		}
+	}
+	return nil
+}
+
+func (l Labels) assertValid() error {
+	seen := map[ACIdentifier]string{}
+	for _, lbl := range l {
+		if lbl.Name == "name" {
+			return fmt.Errorf(`invalid label name: "name"`)
+		}
+		_, ok := seen[lbl.Name]
+		if ok {
+			return fmt.Errorf(`duplicate labels of name %q`, lbl.Name)
+		}
+		seen[lbl.Name] = lbl.Value
+	}
+	return IsValidOSArch(seen, ValidOSArch)
+}
+
+func (l Labels) MarshalJSON() ([]byte, error) {
+	if err := l.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(labels(l))
+}
+
+func (l *Labels) UnmarshalJSON(data []byte) error {
+	var jl labels
+	if err := json.Unmarshal(data, &jl); err != nil {
+		return err
+	}
+	nl := Labels(jl)
+	if err := nl.assertValid(); err != nil {
+		return err
+	}
+	*l = nl
+	return nil
+}
+
+// Get retrieves the value of the label by the given name from Labels, if it exists
+func (l Labels) Get(name string) (val string, ok bool) {
+	for _, lbl := range l {
+		if lbl.Name.String() == name {
+			return lbl.Value, true
+		}
+	}
+	return "", false
+}
+
+// ToMap creates a map[ACIdentifier]string.
+func (l Labels) ToMap() map[ACIdentifier]string {
+	labelsMap := make(map[ACIdentifier]string)
+	for _, lbl := range l {
+		labelsMap[lbl.Name] = lbl.Value
+	}
+	return labelsMap
+}
+
+// LabelsFromMap creates Labels from a map[ACIdentifier]string
+func LabelsFromMap(labelsMap map[ACIdentifier]string) (Labels, error) {
+	labels := Labels{}
+	for n, v := range labelsMap {
+		labels = append(labels, Label{Name: n, Value: v})
+	}
+	if err := labels.assertValid(); err != nil {
+		return nil, err
+	}
+	return labels, nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/mountpoint.go b/vendor/github.com/appc/spec/schema/types/mountpoint.go
new file mode 100644
index 0000000000..80eab94563
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/mountpoint.go
@@ -0,0 +1,91 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"errors"
+	"fmt"
+	"net/url"
+	"strconv"
+
+	"github.com/appc/spec/schema/common"
+)
+
+type MountPoint struct {
+	Name     ACName `json:"name"`
+	Path     string `json:"path"`
+	ReadOnly bool   `json:"readOnly,omitempty"`
+}
+
+func (mount MountPoint) assertValid() error {
+	if mount.Name.Empty() {
+		return errors.New("name must be set")
+	}
+	if len(mount.Path) == 0 {
+		return errors.New("path must be set")
+	}
+	return nil
+}
+
+// MountPointFromString takes a command line mountpoint parameter and returns a mountpoint
+//
+// It is useful for actool patch-manifest --mounts
+//
+// Example mountpoint parameters:
+// 	database,path=/tmp,readOnly=true
+func MountPointFromString(mp string) (*MountPoint, error) {
+	var mount MountPoint
+
+	mp = "name=" + mp
+	mpQuery, err := common.MakeQueryString(mp)
+	if err != nil {
+		return nil, err
+	}
+
+	v, err := url.ParseQuery(mpQuery)
+	if err != nil {
+		return nil, err
+	}
+	for key, val := range v {
+		if len(val) > 1 {
+			return nil, fmt.Errorf("label %s with multiple values %q", key, val)
+		}
+
+		switch key {
+		case "name":
+			acn, err := NewACName(val[0])
+			if err != nil {
+				return nil, err
+			}
+			mount.Name = *acn
+		case "path":
+			mount.Path = val[0]
+		case "readOnly":
+			ro, err := strconv.ParseBool(val[0])
+			if err != nil {
+				return nil, err
+			}
+			mount.ReadOnly = ro
+		default:
+			return nil, fmt.Errorf("unknown mountpoint parameter %q", key)
+		}
+	}
+	err = mount.assertValid()
+	if err != nil {
+		return nil, err
+	}
+
+	return &mount, nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/port.go b/vendor/github.com/appc/spec/schema/types/port.go
new file mode 100644
index 0000000000..78d6de4ce1
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/port.go
@@ -0,0 +1,139 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/url"
+	"strconv"
+
+	"github.com/appc/spec/schema/common"
+)
+
+type Port struct {
+	Name            ACName `json:"name"`
+	Protocol        string `json:"protocol"`
+	Port            uint   `json:"port"`
+	Count           uint   `json:"count"`
+	SocketActivated bool   `json:"socketActivated"`
+}
+
+type ExposedPort struct {
+	Name     ACName `json:"name"`
+	HostPort uint   `json:"hostPort"`
+}
+
+type port Port
+
+func (p *Port) UnmarshalJSON(data []byte) error {
+	var pp port
+	if err := json.Unmarshal(data, &pp); err != nil {
+		return err
+	}
+	np := Port(pp)
+	if err := np.assertValid(); err != nil {
+		return err
+	}
+	if np.Count == 0 {
+		np.Count = 1
+	}
+	*p = np
+	return nil
+}
+
+func (p Port) MarshalJSON() ([]byte, error) {
+	if err := p.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(port(p))
+}
+
+func (p Port) assertValid() error {
+	// Although there are no guarantees, most (if not all)
+	// transport protocols use 16 bit ports
+	if p.Port > 65535 || p.Port < 1 {
+		return errors.New("port must be in 1-65535 range")
+	}
+	if p.Port+p.Count > 65536 {
+		return errors.New("end of port range must be in 1-65535 range")
+	}
+	return nil
+}
+
+// PortFromString takes a command line port parameter and returns a port
+//
+// It is useful for actool patch-manifest --ports
+//
+// Example port parameters:
+//      health-check,protocol=udp,port=8000
+// 	query,protocol=tcp,port=8080,count=1,socketActivated=true
+func PortFromString(pt string) (*Port, error) {
+	var port Port
+
+	pt = "name=" + pt
+	ptQuery, err := common.MakeQueryString(pt)
+	if err != nil {
+		return nil, err
+	}
+
+	v, err := url.ParseQuery(ptQuery)
+	if err != nil {
+		return nil, err
+	}
+	for key, val := range v {
+		if len(val) > 1 {
+			return nil, fmt.Errorf("label %s with multiple values %q", key, val)
+		}
+
+		switch key {
+		case "name":
+			acn, err := NewACName(val[0])
+			if err != nil {
+				return nil, err
+			}
+			port.Name = *acn
+		case "protocol":
+			port.Protocol = val[0]
+		case "port":
+			p, err := strconv.ParseUint(val[0], 10, 16)
+			if err != nil {
+				return nil, err
+			}
+			port.Port = uint(p)
+		case "count":
+			cnt, err := strconv.ParseUint(val[0], 10, 16)
+			if err != nil {
+				return nil, err
+			}
+			port.Count = uint(cnt)
+		case "socketActivated":
+			sa, err := strconv.ParseBool(val[0])
+			if err != nil {
+				return nil, err
+			}
+			port.SocketActivated = sa
+		default:
+			return nil, fmt.Errorf("unknown port parameter %q", key)
+		}
+	}
+	err = port.assertValid()
+	if err != nil {
+		return nil, err
+	}
+
+	return &port, nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/semver.go b/vendor/github.com/appc/spec/schema/types/semver.go
new file mode 100644
index 0000000000..0008181a5e
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/semver.go
@@ -0,0 +1,91 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+
+	"github.com/coreos/go-semver/semver"
+)
+
+var (
+	ErrNoZeroSemVer = ACVersionError("SemVer cannot be zero")
+	ErrBadSemVer    = ACVersionError("SemVer is bad")
+)
+
+// SemVer implements the Unmarshaler interface to define a field that must be
+// a semantic version string
+// TODO(jonboulle): extend upstream instead of wrapping?
+type SemVer semver.Version
+
+// NewSemVer generates a new SemVer from a string. If the given string does
+// not represent a valid SemVer, nil and an error are returned.
+func NewSemVer(s string) (*SemVer, error) {
+	nsv, err := semver.NewVersion(s)
+	if err != nil {
+		return nil, ErrBadSemVer
+	}
+	v := SemVer(*nsv)
+	if v.Empty() {
+		return nil, ErrNoZeroSemVer
+	}
+	return &v, nil
+}
+
+func (sv SemVer) LessThanMajor(versionB SemVer) bool {
+	majorA := semver.Version(sv).Major
+	majorB := semver.Version(versionB).Major
+	if majorA < majorB {
+		return true
+	}
+	return false
+}
+
+func (sv SemVer) LessThanExact(versionB SemVer) bool {
+	vA := semver.Version(sv)
+	vB := semver.Version(versionB)
+	return vA.LessThan(vB)
+}
+
+func (sv SemVer) String() string {
+	s := semver.Version(sv)
+	return s.String()
+}
+
+func (sv SemVer) Empty() bool {
+	return semver.Version(sv) == semver.Version{}
+}
+
+// UnmarshalJSON implements the json.Unmarshaler interface
+func (sv *SemVer) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	v, err := NewSemVer(s)
+	if err != nil {
+		return err
+	}
+	*sv = *v
+	return nil
+}
+
+// MarshalJSON implements the json.Marshaler interface
+func (sv SemVer) MarshalJSON() ([]byte, error) {
+	if sv.Empty() {
+		return nil, ErrNoZeroSemVer
+	}
+	return json.Marshal(sv.String())
+}
diff --git a/vendor/github.com/appc/spec/schema/types/url.go b/vendor/github.com/appc/spec/schema/types/url.go
new file mode 100644
index 0000000000..d4f8f337da
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/url.go
@@ -0,0 +1,71 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/url"
+)
+
+// URL wraps url.URL to marshal/unmarshal to/from JSON strings and enforce
+// that the scheme is HTTP/HTTPS only
+type URL url.URL
+
+func NewURL(s string) (*URL, error) {
+	uu, err := url.Parse(s)
+	if err != nil {
+		return nil, fmt.Errorf("bad URL: %v", err)
+	}
+	nu := URL(*uu)
+	if err := nu.assertValidScheme(); err != nil {
+		return nil, err
+	}
+	return &nu, nil
+}
+
+func (u URL) String() string {
+	uu := url.URL(u)
+	return uu.String()
+}
+
+func (u URL) assertValidScheme() error {
+	switch u.Scheme {
+	case "http", "https":
+		return nil
+	default:
+		return fmt.Errorf("bad URL scheme, must be http/https")
+	}
+}
+
+func (u *URL) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	nu, err := NewURL(s)
+	if err != nil {
+		return err
+	}
+	*u = *nu
+	return nil
+}
+
+func (u URL) MarshalJSON() ([]byte, error) {
+	if err := u.assertValidScheme(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(u.String())
+}
diff --git a/vendor/github.com/appc/spec/schema/types/uuid.go b/vendor/github.com/appc/spec/schema/types/uuid.go
new file mode 100644
index 0000000000..4925b7606d
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/uuid.go
@@ -0,0 +1,92 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+var (
+	ErrNoEmptyUUID = errors.New("UUID cannot be empty")
+)
+
+// UUID encodes an RFC4122-compliant UUID, marshaled to/from a string
+// TODO(jonboulle): vendor a package for this?
+// TODO(jonboulle): consider more flexibility in input string formats.
+// Right now, we only accept:
+//   "6733C088-A507-4694-AABF-EDBE4FC5266F"
+//   "6733C088A5074694AABFEDBE4FC5266F"
+type UUID [16]byte
+
+func (u UUID) String() string {
+	return fmt.Sprintf("%x-%x-%x-%x-%x", u[0:4], u[4:6], u[6:8], u[8:10], u[10:16])
+}
+
+func (u *UUID) Set(s string) error {
+	nu, err := NewUUID(s)
+	if err == nil {
+		*u = *nu
+	}
+	return err
+}
+
+// NewUUID generates a new UUID from the given string. If the string does not
+// represent a valid UUID, nil and an error are returned.
+func NewUUID(s string) (*UUID, error) {
+	s = strings.Replace(s, "-", "", -1)
+	if len(s) != 32 {
+		return nil, errors.New("bad UUID length != 32")
+	}
+	dec, err := hex.DecodeString(s)
+	if err != nil {
+		return nil, err
+	}
+	var u UUID
+	for i, b := range dec {
+		u[i] = b
+	}
+	return &u, nil
+}
+
+func (u UUID) Empty() bool {
+	return reflect.DeepEqual(u, UUID{})
+}
+
+func (u *UUID) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	uu, err := NewUUID(s)
+	if uu.Empty() {
+		return ErrNoEmptyUUID
+	}
+	if err == nil {
+		*u = *uu
+	}
+	return err
+}
+
+func (u UUID) MarshalJSON() ([]byte, error) {
+	if u.Empty() {
+		return nil, ErrNoEmptyUUID
+	}
+	return json.Marshal(u.String())
+}
diff --git a/vendor/github.com/appc/spec/schema/types/volume.go b/vendor/github.com/appc/spec/schema/types/volume.go
new file mode 100644
index 0000000000..c5ae59180f
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/volume.go
@@ -0,0 +1,236 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/url"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/appc/spec/schema/common"
+)
+
+const (
+	emptyVolumeDefaultMode = "0755"
+	emptyVolumeDefaultUID  = 0
+	emptyVolumeDefaultGID  = 0
+)
+
+// Volume encapsulates a volume which should be mounted into the filesystem
+// of all apps in a PodManifest
+type Volume struct {
+	Name ACName `json:"name"`
+	Kind string `json:"kind"`
+
+	// currently used only by "host"
+	// TODO(jonboulle): factor out?
+	Source   string `json:"source,omitempty"`
+	ReadOnly *bool  `json:"readOnly,omitempty"`
+
+	// currently used only by "empty"
+	Mode *string `json:"mode,omitempty"`
+	UID  *int    `json:"uid,omitempty"`
+	GID  *int    `json:"gid,omitempty"`
+}
+
+type volume Volume
+
+func (v Volume) assertValid() error {
+	if v.Name.Empty() {
+		return errors.New("name must be set")
+	}
+
+	switch v.Kind {
+	case "empty":
+		if v.Source != "" {
+			return errors.New("source for empty volume must be empty")
+		}
+		if v.Mode == nil {
+			return errors.New("mode for empty volume must be set")
+		}
+		if v.UID == nil {
+			return errors.New("uid for empty volume must be set")
+		}
+		if v.GID == nil {
+			return errors.New("gid for empty volume must be set")
+		}
+		return nil
+	case "host":
+		if v.Source == "" {
+			return errors.New("source for host volume cannot be empty")
+		}
+		if v.Mode != nil {
+			return errors.New("mode for host volume cannot be set")
+		}
+		if v.UID != nil {
+			return errors.New("uid for host volume cannot be set")
+		}
+		if v.GID != nil {
+			return errors.New("gid for host volume cannot be set")
+		}
+		if !filepath.IsAbs(v.Source) {
+			return errors.New("source for host volume must be absolute path")
+		}
+		return nil
+	default:
+		return errors.New(`unrecognized volume kind: should be one of "empty", "host"`)
+	}
+}
+
+func (v *Volume) UnmarshalJSON(data []byte) error {
+	var vv volume
+	if err := json.Unmarshal(data, &vv); err != nil {
+		return err
+	}
+	nv := Volume(vv)
+	maybeSetDefaults(&nv)
+	if err := nv.assertValid(); err != nil {
+		return err
+	}
+	*v = nv
+	return nil
+}
+
+func (v Volume) MarshalJSON() ([]byte, error) {
+	if err := v.assertValid(); err != nil {
+		return nil, err
+	}
+	return json.Marshal(volume(v))
+}
+
+func (v Volume) String() string {
+	s := []string{
+		v.Name.String(),
+		",kind=",
+		v.Kind,
+	}
+	if v.Source != "" {
+		s = append(s, ",source=")
+		s = append(s, v.Source)
+	}
+	if v.ReadOnly != nil {
+		s = append(s, ",readOnly=")
+		s = append(s, strconv.FormatBool(*v.ReadOnly))
+	}
+	switch v.Kind {
+	case "empty":
+		if *v.Mode != emptyVolumeDefaultMode {
+			s = append(s, ",mode=")
+			s = append(s, *v.Mode)
+		}
+		if *v.UID != emptyVolumeDefaultUID {
+			s = append(s, ",uid=")
+			s = append(s, strconv.Itoa(*v.UID))
+		}
+		if *v.GID != emptyVolumeDefaultGID {
+			s = append(s, ",gid=")
+			s = append(s, strconv.Itoa(*v.GID))
+		}
+	}
+	return strings.Join(s, "")
+}
+
+// VolumeFromString takes a command line volume parameter and returns a volume
+//
+// Example volume parameters:
+// 	database,kind=host,source=/tmp,readOnly=true
+func VolumeFromString(vp string) (*Volume, error) {
+	var vol Volume
+
+	vp = "name=" + vp
+	vpQuery, err := common.MakeQueryString(vp)
+	if err != nil {
+		return nil, err
+	}
+
+	v, err := url.ParseQuery(vpQuery)
+	if err != nil {
+		return nil, err
+	}
+	for key, val := range v {
+		val := val
+		if len(val) > 1 {
+			return nil, fmt.Errorf("label %s with multiple values %q", key, val)
+		}
+
+		switch key {
+		case "name":
+			acn, err := NewACName(val[0])
+			if err != nil {
+				return nil, err
+			}
+			vol.Name = *acn
+		case "kind":
+			vol.Kind = val[0]
+		case "source":
+			vol.Source = val[0]
+		case "readOnly":
+			ro, err := strconv.ParseBool(val[0])
+			if err != nil {
+				return nil, err
+			}
+			vol.ReadOnly = &ro
+		case "mode":
+			vol.Mode = &val[0]
+		case "uid":
+			u, err := strconv.Atoi(val[0])
+			if err != nil {
+				return nil, err
+			}
+			vol.UID = &u
+		case "gid":
+			g, err := strconv.Atoi(val[0])
+			if err != nil {
+				return nil, err
+			}
+			vol.GID = &g
+		default:
+			return nil, fmt.Errorf("unknown volume parameter %q", key)
+		}
+	}
+
+	maybeSetDefaults(&vol)
+
+	err = vol.assertValid()
+	if err != nil {
+		return nil, err
+	}
+
+	return &vol, nil
+}
+
+// maybeSetDefaults sets the correct default values for certain fields on a
+// Volume if they are not already been set. These fields are not
+// pre-populated on all Volumes as the Volume type is polymorphic.
+func maybeSetDefaults(vol *Volume) {
+	if vol.Kind == "empty" {
+		if vol.Mode == nil {
+			m := emptyVolumeDefaultMode
+			vol.Mode = &m
+		}
+		if vol.UID == nil {
+			u := emptyVolumeDefaultUID
+			vol.UID = &u
+		}
+		if vol.GID == nil {
+			g := emptyVolumeDefaultGID
+			vol.GID = &g
+		}
+	}
+}
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go
new file mode 100644
index 0000000000..029ebfac35
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/version.go
@@ -0,0 +1,39 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package schema
+
+import (
+	"github.com/appc/spec/schema/types"
+)
+
+const (
+	// version represents the canonical version of the appc spec and tooling.
+	// For now, the schema and tooling is coupled with the spec itself, so
+	// this must be kept in sync with the VERSION file in the root of the repo.
+	version string = "0.8.4"
+)
+
+var (
+	// AppContainerVersion is the SemVer representation of version
+	AppContainerVersion types.SemVer
+)
+
+func init() {
+	v, err := types.NewSemVer(version)
+	if err != nil {
+		panic(err)
+	}
+	AppContainerVersion = *v
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/LICENSE.txt b/vendor/github.com/aws/aws-sdk-go/LICENSE.txt
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/aws/aws-sdk-go/NOTICE.txt b/vendor/github.com/aws/aws-sdk-go/NOTICE.txt
new file mode 100644
index 0000000000..5f14d1162e
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/NOTICE.txt
@@ -0,0 +1,3 @@
+AWS SDK for Go
+Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
+Copyright 2014-2015 Stripe, Inc.
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
new file mode 100644
index 0000000000..cbc6bb1c0b
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
@@ -0,0 +1,124 @@
+// Package awserr represents API error interface accessors for the SDK.
+package awserr
+
+// An Error wraps lower level errors with code, message and an original error.
+// The underlying concrete error type may also satisfy other interfaces which
+// can be to used to obtain more specific information about the error.
+//
+// Calling Error() or String() will always include the full information about
+// an error based on its underlying type.
+//
+// Example:
+//
+//     output, err := s3manage.Upload(svc, input, opts)
+//     if err != nil {
+//         if awsErr, ok := err.(awserr.Error); ok {
+//             // Get error details
+//             log.Println("Error:", awsErr.Code(), awsErr.Message())
+//
+//             // Prints out full error message, including original error if there was one.
+//             log.Println("Error:", awsErr.Error())
+//
+//             // Get original error
+//             if origErr := awsErr.OrigErr(); origErr != nil {
+//                 // operate on original error.
+//             }
+//         } else {
+//             fmt.Println(err.Error())
+//         }
+//     }
+//
+type Error interface {
+	// Satisfy the generic error interface.
+	error
+
+	// Returns the short phrase depicting the classification of the error.
+	Code() string
+
+	// Returns the error details message.
+	Message() string
+
+	// Returns the original error if one was set.  Nil is returned if not set.
+	OrigErr() error
+}
+
+// BatchError is a batch of errors which also wraps lower level errors with code, message,
+// and original errors. Calling Error() will only return the error that is at the end
+// of the list.
+type BatchError interface {
+	// Satisfy the generic error interface.
+	error
+
+	// Returns the short phrase depicting the classification of the error.
+	Code() string
+
+	// Returns the error details message.
+	Message() string
+
+	// Returns the original error if one was set.  Nil is returned if not set.
+	OrigErrs() []error
+}
+
+// New returns an Error object described by the code, message, and origErr.
+//
+// If origErr satisfies the Error interface it will not be wrapped within a new
+// Error object and will instead be returned.
+func New(code, message string, origErr error) Error {
+	return newBaseError(code, message, origErr)
+}
+
+// NewBatchError returns an baseError with an expectation of an array of errors
+func NewBatchError(code, message string, errs []error) BatchError {
+	return newBaseErrors(code, message, errs)
+}
+
+// A RequestFailure is an interface to extract request failure information from
+// an Error such as the request ID of the failed request returned by a service.
+// RequestFailures may not always have a requestID value if the request failed
+// prior to reaching the service such as a connection error.
+//
+// Example:
+//
+//     output, err := s3manage.Upload(svc, input, opts)
+//     if err != nil {
+//         if reqerr, ok := err.(RequestFailure); ok {
+//             log.Println("Request failed", reqerr.Code(), reqerr.Message(), reqerr.RequestID())
+//         } else {
+//             log.Println("Error:", err.Error())
+//         }
+//     }
+//
+// Combined with awserr.Error:
+//
+//    output, err := s3manage.Upload(svc, input, opts)
+//    if err != nil {
+//        if awsErr, ok := err.(awserr.Error); ok {
+//            // Generic AWS Error with Code, Message, and original error (if any)
+//            fmt.Println(awsErr.Code(), awsErr.Message(), awsErr.OrigErr())
+//
+//            if reqErr, ok := err.(awserr.RequestFailure); ok {
+//                // A service error occurred
+//                fmt.Println(reqErr.StatusCode(), reqErr.RequestID())
+//            }
+//        } else {
+//            fmt.Println(err.Error())
+//        }
+//    }
+//
+type RequestFailure interface {
+	Error
+
+	// The status code of the HTTP response.
+	StatusCode() int
+
+	// The request ID returned by the service for a request failure. This will
+	// be empty if no request ID is available such as the request failed due
+	// to a connection error.
+	RequestID() string
+}
+
+// NewRequestFailure returns a new request error wrapper for the given Error
+// provided.
+func NewRequestFailure(err Error, statusCode int, reqID string) RequestFailure {
+	return newRequestError(err, statusCode, reqID)
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
new file mode 100644
index 0000000000..605f73c5d6
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
@@ -0,0 +1,197 @@
+package awserr
+
+import "fmt"
+
+// SprintError returns a string of the formatted error code.
+//
+// Both extra and origErr are optional.  If they are included their lines
+// will be added, but if they are not included their lines will be ignored.
+func SprintError(code, message, extra string, origErr error) string {
+	msg := fmt.Sprintf("%s: %s", code, message)
+	if extra != "" {
+		msg = fmt.Sprintf("%s\n\t%s", msg, extra)
+	}
+	if origErr != nil {
+		msg = fmt.Sprintf("%s\ncaused by: %s", msg, origErr.Error())
+	}
+	return msg
+}
+
+// A baseError wraps the code and message which defines an error. It also
+// can be used to wrap an original error object.
+//
+// Should be used as the root for errors satisfying the awserr.Error. Also
+// for any error which does not fit into a specific error wrapper type.
+type baseError struct {
+	// Classification of error
+	code string
+
+	// Detailed information about error
+	message string
+
+	// Optional original error this error is based off of. Allows building
+	// chained errors.
+	errs []error
+}
+
+// newBaseError returns an error object for the code, message, and err.
+//
+// code is a short no whitespace phrase depicting the classification of
+// the error that is being created.
+//
+// message is the free flow string containing detailed information about the error.
+//
+// origErr is the error object which will be nested under the new error to be returned.
+func newBaseError(code, message string, origErr error) *baseError {
+	b := &baseError{
+		code:    code,
+		message: message,
+	}
+
+	if origErr != nil {
+		b.errs = append(b.errs, origErr)
+	}
+
+	return b
+}
+
+// newBaseErrors returns an error object for the code, message, and errors.
+//
+// code is a short no whitespace phrase depicting the classification of
+// the error that is being created.
+//
+// message is the free flow string containing detailed information about the error.
+//
+// origErrs is the error objects which will be nested under the new errors to be returned.
+func newBaseErrors(code, message string, origErrs []error) *baseError {
+	b := &baseError{
+		code:    code,
+		message: message,
+		errs:    origErrs,
+	}
+
+	return b
+}
+
+// Error returns the string representation of the error.
+//
+// See ErrorWithExtra for formatting.
+//
+// Satisfies the error interface.
+func (b baseError) Error() string {
+	size := len(b.errs)
+	if size > 0 {
+		return SprintError(b.code, b.message, "", errorList(b.errs))
+	}
+
+	return SprintError(b.code, b.message, "", nil)
+}
+
+// String returns the string representation of the error.
+// Alias for Error to satisfy the stringer interface.
+func (b baseError) String() string {
+	return b.Error()
+}
+
+// Code returns the short phrase depicting the classification of the error.
+func (b baseError) Code() string {
+	return b.code
+}
+
+// Message returns the error details message.
+func (b baseError) Message() string {
+	return b.message
+}
+
+// OrigErr returns the original error if one was set. Nil is returned if no error
+// was set. This only returns the first element in the list. If the full list is
+// needed, use BatchError
+func (b baseError) OrigErr() error {
+	if size := len(b.errs); size > 0 {
+		return b.errs[0]
+	}
+
+	return nil
+}
+
+// OrigErrs returns the original errors if one was set. An empty slice is returned if
+// no error was set:w
+func (b baseError) OrigErrs() []error {
+	return b.errs
+}
+
+// So that the Error interface type can be included as an anonymous field
+// in the requestError struct and not conflict with the error.Error() method.
+type awsError Error
+
+// A requestError wraps a request or service error.
+//
+// Composed of baseError for code, message, and original error.
+type requestError struct {
+	awsError
+	statusCode int
+	requestID  string
+}
+
+// newRequestError returns a wrapped error with additional information for request
+// status code, and service requestID.
+//
+// Should be used to wrap all request which involve service requests. Even if
+// the request failed without a service response, but had an HTTP status code
+// that may be meaningful.
+//
+// Also wraps original errors via the baseError.
+func newRequestError(err Error, statusCode int, requestID string) *requestError {
+	return &requestError{
+		awsError:   err,
+		statusCode: statusCode,
+		requestID:  requestID,
+	}
+}
+
+// Error returns the string representation of the error.
+// Satisfies the error interface.
+func (r requestError) Error() string {
+	extra := fmt.Sprintf("status code: %d, request id: %s",
+		r.statusCode, r.requestID)
+	return SprintError(r.Code(), r.Message(), extra, r.OrigErr())
+}
+
+// String returns the string representation of the error.
+// Alias for Error to satisfy the stringer interface.
+func (r requestError) String() string {
+	return r.Error()
+}
+
+// StatusCode returns the wrapped status code for the error
+func (r requestError) StatusCode() int {
+	return r.statusCode
+}
+
+// RequestID returns the wrapped requestID
+func (r requestError) RequestID() string {
+	return r.requestID
+}
+
+// An error list that satisfies the golang interface
+type errorList []error
+
+// Error returns the string representation of the error.
+//
+// Satisfies the error interface.
+func (e errorList) Error() string {
+	msg := ""
+	// How do we want to handle the array size being zero
+	if size := len(e); size > 0 {
+		for i := 0; i < size; i++ {
+			msg += fmt.Sprintf("%s", e[i].Error())
+			// We check the next index to see if it is within the slice.
+			// If it is, then we append a newline. We do this, because unit tests
+			// could be broken with the additional '\n'
+			if i+1 < size {
+				msg += "\n"
+			}
+		}
+	}
+	return msg
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
new file mode 100644
index 0000000000..8429470b9d
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
@@ -0,0 +1,100 @@
+package awsutil
+
+import (
+	"io"
+	"reflect"
+)
+
+// Copy deeply copies a src structure to dst. Useful for copying request and
+// response structures.
+//
+// Can copy between structs of different type, but will only copy fields which
+// are assignable, and exist in both structs. Fields which are not assignable,
+// or do not exist in both structs are ignored.
+func Copy(dst, src interface{}) {
+	dstval := reflect.ValueOf(dst)
+	if !dstval.IsValid() {
+		panic("Copy dst cannot be nil")
+	}
+
+	rcopy(dstval, reflect.ValueOf(src), true)
+}
+
+// CopyOf returns a copy of src while also allocating the memory for dst.
+// src must be a pointer type or this operation will fail.
+func CopyOf(src interface{}) (dst interface{}) {
+	dsti := reflect.New(reflect.TypeOf(src).Elem())
+	dst = dsti.Interface()
+	rcopy(dsti, reflect.ValueOf(src), true)
+	return
+}
+
+// rcopy performs a recursive copy of values from the source to destination.
+//
+// root is used to skip certain aspects of the copy which are not valid
+// for the root node of a object.
+func rcopy(dst, src reflect.Value, root bool) {
+	if !src.IsValid() {
+		return
+	}
+
+	switch src.Kind() {
+	case reflect.Ptr:
+		if _, ok := src.Interface().(io.Reader); ok {
+			if dst.Kind() == reflect.Ptr && dst.Elem().CanSet() {
+				dst.Elem().Set(src)
+			} else if dst.CanSet() {
+				dst.Set(src)
+			}
+		} else {
+			e := src.Type().Elem()
+			if dst.CanSet() && !src.IsNil() {
+				dst.Set(reflect.New(e))
+			}
+			if src.Elem().IsValid() {
+				// Keep the current root state since the depth hasn't changed
+				rcopy(dst.Elem(), src.Elem(), root)
+			}
+		}
+	case reflect.Struct:
+		t := dst.Type()
+		for i := 0; i < t.NumField(); i++ {
+			name := t.Field(i).Name
+			srcVal := src.FieldByName(name)
+			dstVal := dst.FieldByName(name)
+			if srcVal.IsValid() && dstVal.CanSet() {
+				rcopy(dstVal, srcVal, false)
+			}
+		}
+	case reflect.Slice:
+		if src.IsNil() {
+			break
+		}
+
+		s := reflect.MakeSlice(src.Type(), src.Len(), src.Cap())
+		dst.Set(s)
+		for i := 0; i < src.Len(); i++ {
+			rcopy(dst.Index(i), src.Index(i), false)
+		}
+	case reflect.Map:
+		if src.IsNil() {
+			break
+		}
+
+		s := reflect.MakeMap(src.Type())
+		dst.Set(s)
+		for _, k := range src.MapKeys() {
+			v := src.MapIndex(k)
+			v2 := reflect.New(v.Type()).Elem()
+			rcopy(v2, v, false)
+			dst.SetMapIndex(k, v2)
+		}
+	default:
+		// Assign the value if possible. If its not assignable, the value would
+		// need to be converted and the impact of that may be unexpected, or is
+		// not compatible with the dst type.
+		if src.Type().AssignableTo(dst.Type()) {
+			dst.Set(src)
+		}
+	}
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
new file mode 100644
index 0000000000..59fa4a558a
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
@@ -0,0 +1,27 @@
+package awsutil
+
+import (
+	"reflect"
+)
+
+// DeepEqual returns if the two values are deeply equal like reflect.DeepEqual.
+// In addition to this, this method will also dereference the input values if
+// possible so the DeepEqual performed will not fail if one parameter is a
+// pointer and the other is not.
+//
+// DeepEqual will not perform indirection of nested values of the input parameters.
+func DeepEqual(a, b interface{}) bool {
+	ra := reflect.Indirect(reflect.ValueOf(a))
+	rb := reflect.Indirect(reflect.ValueOf(b))
+
+	if raValid, rbValid := ra.IsValid(), rb.IsValid(); !raValid && !rbValid {
+		// If the elements are both nil, and of the same type the are equal
+		// If they are of different types they are not equal
+		return reflect.TypeOf(a) == reflect.TypeOf(b)
+	} else if raValid != rbValid {
+		// Both values must be valid to be equal
+		return false
+	}
+
+	return reflect.DeepEqual(ra.Interface(), rb.Interface())
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
new file mode 100644
index 0000000000..4d2a01e8c4
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
@@ -0,0 +1,222 @@
+package awsutil
+
+import (
+	"reflect"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/jmespath/go-jmespath"
+)
+
+var indexRe = regexp.MustCompile(`(.+)\[(-?\d+)?\]$`)
+
+// rValuesAtPath returns a slice of values found in value v. The values
+// in v are explored recursively so all nested values are collected.
+func rValuesAtPath(v interface{}, path string, createPath, caseSensitive, nilTerm bool) []reflect.Value {
+	pathparts := strings.Split(path, "||")
+	if len(pathparts) > 1 {
+		for _, pathpart := range pathparts {
+			vals := rValuesAtPath(v, pathpart, createPath, caseSensitive, nilTerm)
+			if len(vals) > 0 {
+				return vals
+			}
+		}
+		return nil
+	}
+
+	values := []reflect.Value{reflect.Indirect(reflect.ValueOf(v))}
+	components := strings.Split(path, ".")
+	for len(values) > 0 && len(components) > 0 {
+		var index *int64
+		var indexStar bool
+		c := strings.TrimSpace(components[0])
+		if c == "" { // no actual component, illegal syntax
+			return nil
+		} else if caseSensitive && c != "*" && strings.ToLower(c[0:1]) == c[0:1] {
+			// TODO normalize case for user
+			return nil // don't support unexported fields
+		}
+
+		// parse this component
+		if m := indexRe.FindStringSubmatch(c); m != nil {
+			c = m[1]
+			if m[2] == "" {
+				index = nil
+				indexStar = true
+			} else {
+				i, _ := strconv.ParseInt(m[2], 10, 32)
+				index = &i
+				indexStar = false
+			}
+		}
+
+		nextvals := []reflect.Value{}
+		for _, value := range values {
+			// pull component name out of struct member
+			if value.Kind() != reflect.Struct {
+				continue
+			}
+
+			if c == "*" { // pull all members
+				for i := 0; i < value.NumField(); i++ {
+					if f := reflect.Indirect(value.Field(i)); f.IsValid() {
+						nextvals = append(nextvals, f)
+					}
+				}
+				continue
+			}
+
+			value = value.FieldByNameFunc(func(name string) bool {
+				if c == name {
+					return true
+				} else if !caseSensitive && strings.ToLower(name) == strings.ToLower(c) {
+					return true
+				}
+				return false
+			})
+
+			if nilTerm && value.Kind() == reflect.Ptr && len(components[1:]) == 0 {
+				if !value.IsNil() {
+					value.Set(reflect.Zero(value.Type()))
+				}
+				return []reflect.Value{value}
+			}
+
+			if createPath && value.Kind() == reflect.Ptr && value.IsNil() {
+				// TODO if the value is the terminus it should not be created
+				// if the value to be set to its position is nil.
+				value.Set(reflect.New(value.Type().Elem()))
+				value = value.Elem()
+			} else {
+				value = reflect.Indirect(value)
+			}
+
+			if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
+				if !createPath && value.IsNil() {
+					value = reflect.ValueOf(nil)
+				}
+			}
+
+			if value.IsValid() {
+				nextvals = append(nextvals, value)
+			}
+		}
+		values = nextvals
+
+		if indexStar || index != nil {
+			nextvals = []reflect.Value{}
+			for _, value := range values {
+				value := reflect.Indirect(value)
+				if value.Kind() != reflect.Slice {
+					continue
+				}
+
+				if indexStar { // grab all indices
+					for i := 0; i < value.Len(); i++ {
+						idx := reflect.Indirect(value.Index(i))
+						if idx.IsValid() {
+							nextvals = append(nextvals, idx)
+						}
+					}
+					continue
+				}
+
+				// pull out index
+				i := int(*index)
+				if i >= value.Len() { // check out of bounds
+					if createPath {
+						// TODO resize slice
+					} else {
+						continue
+					}
+				} else if i < 0 { // support negative indexing
+					i = value.Len() + i
+				}
+				value = reflect.Indirect(value.Index(i))
+
+				if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
+					if !createPath && value.IsNil() {
+						value = reflect.ValueOf(nil)
+					}
+				}
+
+				if value.IsValid() {
+					nextvals = append(nextvals, value)
+				}
+			}
+			values = nextvals
+		}
+
+		components = components[1:]
+	}
+	return values
+}
+
+// ValuesAtPath returns a list of values at the case insensitive lexical
+// path inside of a structure.
+func ValuesAtPath(i interface{}, path string) ([]interface{}, error) {
+	result, err := jmespath.Search(path, i)
+	if err != nil {
+		return nil, err
+	}
+
+	v := reflect.ValueOf(result)
+	if !v.IsValid() || (v.Kind() == reflect.Ptr && v.IsNil()) {
+		return nil, nil
+	}
+	if s, ok := result.([]interface{}); ok {
+		return s, err
+	}
+	if v.Kind() == reflect.Map && v.Len() == 0 {
+		return nil, nil
+	}
+	if v.Kind() == reflect.Slice {
+		out := make([]interface{}, v.Len())
+		for i := 0; i < v.Len(); i++ {
+			out[i] = v.Index(i).Interface()
+		}
+		return out, nil
+	}
+
+	return []interface{}{result}, nil
+}
+
+// SetValueAtPath sets a value at the case insensitive lexical path inside
+// of a structure.
+func SetValueAtPath(i interface{}, path string, v interface{}) {
+	if rvals := rValuesAtPath(i, path, true, false, v == nil); rvals != nil {
+		for _, rval := range rvals {
+			if rval.Kind() == reflect.Ptr && rval.IsNil() {
+				continue
+			}
+			setValue(rval, v)
+		}
+	}
+}
+
+func setValue(dstVal reflect.Value, src interface{}) {
+	if dstVal.Kind() == reflect.Ptr {
+		dstVal = reflect.Indirect(dstVal)
+	}
+	srcVal := reflect.ValueOf(src)
+
+	if !srcVal.IsValid() { // src is literal nil
+		if dstVal.CanAddr() {
+			// Convert to pointer so that pointer's value can be nil'ed
+			//                     dstVal = dstVal.Addr()
+		}
+		dstVal.Set(reflect.Zero(dstVal.Type()))
+
+	} else if srcVal.Kind() == reflect.Ptr {
+		if srcVal.IsNil() {
+			srcVal = reflect.Zero(dstVal.Type())
+		} else {
+			srcVal = reflect.ValueOf(src).Elem()
+		}
+		dstVal.Set(srcVal)
+	} else {
+		dstVal.Set(srcVal)
+	}
+
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
new file mode 100644
index 0000000000..0de3eaa0f6
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
@@ -0,0 +1,103 @@
+package awsutil
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"reflect"
+	"strings"
+)
+
+// Prettify returns the string representation of a value.
+func Prettify(i interface{}) string {
+	var buf bytes.Buffer
+	prettify(reflect.ValueOf(i), 0, &buf)
+	return buf.String()
+}
+
+// prettify will recursively walk value v to build a textual
+// representation of the value.
+func prettify(v reflect.Value, indent int, buf *bytes.Buffer) {
+	for v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+
+	switch v.Kind() {
+	case reflect.Struct:
+		strtype := v.Type().String()
+		if strtype == "time.Time" {
+			fmt.Fprintf(buf, "%s", v.Interface())
+			break
+		} else if strings.HasPrefix(strtype, "io.") {
+			buf.WriteString("<buffer>")
+			break
+		}
+
+		buf.WriteString("{\n")
+
+		names := []string{}
+		for i := 0; i < v.Type().NumField(); i++ {
+			name := v.Type().Field(i).Name
+			f := v.Field(i)
+			if name[0:1] == strings.ToLower(name[0:1]) {
+				continue // ignore unexported fields
+			}
+			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice || f.Kind() == reflect.Map) && f.IsNil() {
+				continue // ignore unset fields
+			}
+			names = append(names, name)
+		}
+
+		for i, n := range names {
+			val := v.FieldByName(n)
+			buf.WriteString(strings.Repeat(" ", indent+2))
+			buf.WriteString(n + ": ")
+			prettify(val, indent+2, buf)
+
+			if i < len(names)-1 {
+				buf.WriteString(",\n")
+			}
+		}
+
+		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
+	case reflect.Slice:
+		nl, id, id2 := "", "", ""
+		if v.Len() > 3 {
+			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
+		}
+		buf.WriteString("[" + nl)
+		for i := 0; i < v.Len(); i++ {
+			buf.WriteString(id2)
+			prettify(v.Index(i), indent+2, buf)
+
+			if i < v.Len()-1 {
+				buf.WriteString("," + nl)
+			}
+		}
+
+		buf.WriteString(nl + id + "]")
+	case reflect.Map:
+		buf.WriteString("{\n")
+
+		for i, k := range v.MapKeys() {
+			buf.WriteString(strings.Repeat(" ", indent+2))
+			buf.WriteString(k.String() + ": ")
+			prettify(v.MapIndex(k), indent+2, buf)
+
+			if i < v.Len()-1 {
+				buf.WriteString(",\n")
+			}
+		}
+
+		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
+	default:
+		format := "%v"
+		switch v.Interface().(type) {
+		case string:
+			format = "%q"
+		case io.ReadSeeker, io.Reader:
+			format = "buffer(%p)"
+		}
+		fmt.Fprintf(buf, format, v.Interface())
+	}
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
new file mode 100644
index 0000000000..b6432f1a11
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
@@ -0,0 +1,89 @@
+package awsutil
+
+import (
+	"bytes"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// StringValue returns the string representation of a value.
+func StringValue(i interface{}) string {
+	var buf bytes.Buffer
+	stringValue(reflect.ValueOf(i), 0, &buf)
+	return buf.String()
+}
+
+func stringValue(v reflect.Value, indent int, buf *bytes.Buffer) {
+	for v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+
+	switch v.Kind() {
+	case reflect.Struct:
+		buf.WriteString("{\n")
+
+		names := []string{}
+		for i := 0; i < v.Type().NumField(); i++ {
+			name := v.Type().Field(i).Name
+			f := v.Field(i)
+			if name[0:1] == strings.ToLower(name[0:1]) {
+				continue // ignore unexported fields
+			}
+			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice) && f.IsNil() {
+				continue // ignore unset fields
+			}
+			names = append(names, name)
+		}
+
+		for i, n := range names {
+			val := v.FieldByName(n)
+			buf.WriteString(strings.Repeat(" ", indent+2))
+			buf.WriteString(n + ": ")
+			stringValue(val, indent+2, buf)
+
+			if i < len(names)-1 {
+				buf.WriteString(",\n")
+			}
+		}
+
+		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
+	case reflect.Slice:
+		nl, id, id2 := "", "", ""
+		if v.Len() > 3 {
+			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
+		}
+		buf.WriteString("[" + nl)
+		for i := 0; i < v.Len(); i++ {
+			buf.WriteString(id2)
+			stringValue(v.Index(i), indent+2, buf)
+
+			if i < v.Len()-1 {
+				buf.WriteString("," + nl)
+			}
+		}
+
+		buf.WriteString(nl + id + "]")
+	case reflect.Map:
+		buf.WriteString("{\n")
+
+		for i, k := range v.MapKeys() {
+			buf.WriteString(strings.Repeat(" ", indent+2))
+			buf.WriteString(k.String() + ": ")
+			stringValue(v.MapIndex(k), indent+2, buf)
+
+			if i < v.Len()-1 {
+				buf.WriteString(",\n")
+			}
+		}
+
+		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
+	default:
+		format := "%v"
+		switch v.Interface().(type) {
+		case string:
+			format = "%q"
+		}
+		fmt.Fprintf(buf, format, v.Interface())
+	}
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
new file mode 100644
index 0000000000..4778056ddf
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
@@ -0,0 +1,12 @@
+package metadata
+
+// ClientInfo wraps immutable data from the client.Client structure.
+type ClientInfo struct {
+	ServiceName   string
+	APIVersion    string
+	Endpoint      string
+	SigningName   string
+	SigningRegion string
+	JSONVersion   string
+	TargetPrefix  string
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/config.go b/vendor/github.com/aws/aws-sdk-go/aws/config.go
new file mode 100644
index 0000000000..9e83e9260a
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/config.go
@@ -0,0 +1,311 @@
+package aws
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws/credentials"
+)
+
+// UseServiceDefaultRetries instructs the config to use the service's own default
+// number of retries. This will be the default action if Config.MaxRetries
+// is nil also.
+const UseServiceDefaultRetries = -1
+
+// RequestRetryer is an alias for a type that implements the request.Retryer interface.
+type RequestRetryer interface{}
+
+// A Config provides service configuration for service clients. By default,
+// all clients will use the {defaults.DefaultConfig} structure.
+type Config struct {
+	// Enables verbose error printing of all credential chain errors.
+	// Should be used when wanting to see all errors while attempting to retreive
+	// credentials.
+	CredentialsChainVerboseErrors *bool
+
+	// The credentials object to use when signing requests. Defaults to
+	// a chain of credential providers to search for credentials in environment
+	// variables, shared credential file, and EC2 Instance Roles.
+	Credentials *credentials.Credentials
+
+	// An optional endpoint URL (hostname only or fully qualified URI)
+	// that overrides the default generated endpoint for a client. Set this
+	// to `""` to use the default generated endpoint.
+	//
+	// @note You must still provide a `Region` value when specifying an
+	//   endpoint for a client.
+	Endpoint *string
+
+	// The region to send requests to. This parameter is required and must
+	// be configured globally or on a per-client basis unless otherwise
+	// noted. A full list of regions is found in the "Regions and Endpoints"
+	// document.
+	//
+	// @see http://docs.aws.amazon.com/general/latest/gr/rande.html
+	//   AWS Regions and Endpoints
+	Region *string
+
+	// Set this to `true` to disable SSL when sending requests. Defaults
+	// to `false`.
+	DisableSSL *bool
+
+	// The HTTP client to use when sending requests. Defaults to
+	// `http.DefaultClient`.
+	HTTPClient *http.Client
+
+	// An integer value representing the logging level. The default log level
+	// is zero (LogOff), which represents no logging. To enable logging set
+	// to a LogLevel Value.
+	LogLevel *LogLevelType
+
+	// The logger writer interface to write logging messages to. Defaults to
+	// standard out.
+	Logger Logger
+
+	// The maximum number of times that a request will be retried for failures.
+	// Defaults to -1, which defers the max retry setting to the service specific
+	// configuration.
+	MaxRetries *int
+
+	// Retryer guides how HTTP requests should be retried in case of recoverable failures.
+	//
+	// When nil or the value does not implement the request.Retryer interface,
+	// the request.DefaultRetryer will be used.
+	//
+	// When both Retryer and MaxRetries are non-nil, the former is used and
+	// the latter ignored.
+	//
+	// To set the Retryer field in a type-safe manner and with chaining, use
+	// the request.WithRetryer helper function:
+	//
+	//   cfg := request.WithRetryer(aws.NewConfig(), myRetryer)
+	//
+	Retryer RequestRetryer
+
+	// Disables semantic parameter validation, which validates input for missing
+	// required fields and/or other semantic request input errors.
+	DisableParamValidation *bool
+
+	// Disables the computation of request and response checksums, e.g.,
+	// CRC32 checksums in Amazon DynamoDB.
+	DisableComputeChecksums *bool
+
+	// Set this to `true` to force the request to use path-style addressing,
+	// i.e., `http://s3.amazonaws.com/BUCKET/KEY`. By default, the S3 client will
+	// use virtual hosted bucket addressing when possible
+	// (`http://BUCKET.s3.amazonaws.com/KEY`).
+	//
+	// @note This configuration option is specific to the Amazon S3 service.
+	// @see http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
+	//   Amazon S3: Virtual Hosting of Buckets
+	S3ForcePathStyle *bool
+
+	// Set this to `true` to disable the EC2Metadata client from overriding the
+	// default http.Client's Timeout. This is helpful if you do not want the EC2Metadata
+	// client to create a new http.Client. This options is only meaningful if you're not
+	// already using a custom HTTP client with the SDK. Enabled by default.
+	//
+	// Must be set and provided to the session.New() in order to disable the EC2Metadata
+	// overriding the timeout for default credentials chain.
+	//
+	// Example:
+	//    sess := session.New(aws.NewConfig().WithEC2MetadataDiableTimeoutOverride(true))
+	//    svc := s3.New(sess)
+	//
+	EC2MetadataDisableTimeoutOverride *bool
+
+	SleepDelay func(time.Duration)
+}
+
+// NewConfig returns a new Config pointer that can be chained with builder methods to
+// set multiple configuration values inline without using pointers.
+//
+//     svc := s3.New(aws.NewConfig().WithRegion("us-west-2").WithMaxRetries(10))
+//
+func NewConfig() *Config {
+	return &Config{}
+}
+
+// WithCredentialsChainVerboseErrors sets a config verbose errors boolean and returning
+// a Config pointer.
+func (c *Config) WithCredentialsChainVerboseErrors(verboseErrs bool) *Config {
+	c.CredentialsChainVerboseErrors = &verboseErrs
+	return c
+}
+
+// WithCredentials sets a config Credentials value returning a Config pointer
+// for chaining.
+func (c *Config) WithCredentials(creds *credentials.Credentials) *Config {
+	c.Credentials = creds
+	return c
+}
+
+// WithEndpoint sets a config Endpoint value returning a Config pointer for
+// chaining.
+func (c *Config) WithEndpoint(endpoint string) *Config {
+	c.Endpoint = &endpoint
+	return c
+}
+
+// WithRegion sets a config Region value returning a Config pointer for
+// chaining.
+func (c *Config) WithRegion(region string) *Config {
+	c.Region = &region
+	return c
+}
+
+// WithDisableSSL sets a config DisableSSL value returning a Config pointer
+// for chaining.
+func (c *Config) WithDisableSSL(disable bool) *Config {
+	c.DisableSSL = &disable
+	return c
+}
+
+// WithHTTPClient sets a config HTTPClient value returning a Config pointer
+// for chaining.
+func (c *Config) WithHTTPClient(client *http.Client) *Config {
+	c.HTTPClient = client
+	return c
+}
+
+// WithMaxRetries sets a config MaxRetries value returning a Config pointer
+// for chaining.
+func (c *Config) WithMaxRetries(max int) *Config {
+	c.MaxRetries = &max
+	return c
+}
+
+// WithDisableParamValidation sets a config DisableParamValidation value
+// returning a Config pointer for chaining.
+func (c *Config) WithDisableParamValidation(disable bool) *Config {
+	c.DisableParamValidation = &disable
+	return c
+}
+
+// WithDisableComputeChecksums sets a config DisableComputeChecksums value
+// returning a Config pointer for chaining.
+func (c *Config) WithDisableComputeChecksums(disable bool) *Config {
+	c.DisableComputeChecksums = &disable
+	return c
+}
+
+// WithLogLevel sets a config LogLevel value returning a Config pointer for
+// chaining.
+func (c *Config) WithLogLevel(level LogLevelType) *Config {
+	c.LogLevel = &level
+	return c
+}
+
+// WithLogger sets a config Logger value returning a Config pointer for
+// chaining.
+func (c *Config) WithLogger(logger Logger) *Config {
+	c.Logger = logger
+	return c
+}
+
+// WithS3ForcePathStyle sets a config S3ForcePathStyle value returning a Config
+// pointer for chaining.
+func (c *Config) WithS3ForcePathStyle(force bool) *Config {
+	c.S3ForcePathStyle = &force
+	return c
+}
+
+// WithEC2MetadataDisableTimeoutOverride sets a config EC2MetadataDisableTimeoutOverride value
+// returning a Config pointer for chaining.
+func (c *Config) WithEC2MetadataDisableTimeoutOverride(enable bool) *Config {
+	c.EC2MetadataDisableTimeoutOverride = &enable
+	return c
+}
+
+// WithSleepDelay overrides the function used to sleep while waiting for the
+// next retry. Defaults to time.Sleep.
+func (c *Config) WithSleepDelay(fn func(time.Duration)) *Config {
+	c.SleepDelay = fn
+	return c
+}
+
+// MergeIn merges the passed in configs into the existing config object.
+func (c *Config) MergeIn(cfgs ...*Config) {
+	for _, other := range cfgs {
+		mergeInConfig(c, other)
+	}
+}
+
+func mergeInConfig(dst *Config, other *Config) {
+	if other == nil {
+		return
+	}
+
+	if other.CredentialsChainVerboseErrors != nil {
+		dst.CredentialsChainVerboseErrors = other.CredentialsChainVerboseErrors
+	}
+
+	if other.Credentials != nil {
+		dst.Credentials = other.Credentials
+	}
+
+	if other.Endpoint != nil {
+		dst.Endpoint = other.Endpoint
+	}
+
+	if other.Region != nil {
+		dst.Region = other.Region
+	}
+
+	if other.DisableSSL != nil {
+		dst.DisableSSL = other.DisableSSL
+	}
+
+	if other.HTTPClient != nil {
+		dst.HTTPClient = other.HTTPClient
+	}
+
+	if other.LogLevel != nil {
+		dst.LogLevel = other.LogLevel
+	}
+
+	if other.Logger != nil {
+		dst.Logger = other.Logger
+	}
+
+	if other.MaxRetries != nil {
+		dst.MaxRetries = other.MaxRetries
+	}
+
+	if other.Retryer != nil {
+		dst.Retryer = other.Retryer
+	}
+
+	if other.DisableParamValidation != nil {
+		dst.DisableParamValidation = other.DisableParamValidation
+	}
+
+	if other.DisableComputeChecksums != nil {
+		dst.DisableComputeChecksums = other.DisableComputeChecksums
+	}
+
+	if other.S3ForcePathStyle != nil {
+		dst.S3ForcePathStyle = other.S3ForcePathStyle
+	}
+
+	if other.EC2MetadataDisableTimeoutOverride != nil {
+		dst.EC2MetadataDisableTimeoutOverride = other.EC2MetadataDisableTimeoutOverride
+	}
+
+	if other.SleepDelay != nil {
+		dst.SleepDelay = other.SleepDelay
+	}
+}
+
+// Copy will return a shallow copy of the Config object. If any additional
+// configurations are provided they will be merged into the new config returned.
+func (c *Config) Copy(cfgs ...*Config) *Config {
+	dst := &Config{}
+	dst.MergeIn(c)
+
+	for _, cfg := range cfgs {
+		dst.MergeIn(cfg)
+	}
+
+	return dst
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go b/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
new file mode 100644
index 0000000000..d6a7b08dff
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
@@ -0,0 +1,357 @@
+package aws
+
+import "time"
+
+// String returns a pointer to of the string value passed in.
+func String(v string) *string {
+	return &v
+}
+
+// StringValue returns the value of the string pointer passed in or
+// "" if the pointer is nil.
+func StringValue(v *string) string {
+	if v != nil {
+		return *v
+	}
+	return ""
+}
+
+// StringSlice converts a slice of string values into a slice of
+// string pointers
+func StringSlice(src []string) []*string {
+	dst := make([]*string, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// StringValueSlice converts a slice of string pointers into a slice of
+// string values
+func StringValueSlice(src []*string) []string {
+	dst := make([]string, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// StringMap converts a string map of string values into a string
+// map of string pointers
+func StringMap(src map[string]string) map[string]*string {
+	dst := make(map[string]*string)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// StringValueMap converts a string map of string pointers into a string
+// map of string values
+func StringValueMap(src map[string]*string) map[string]string {
+	dst := make(map[string]string)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Bool returns a pointer to of the bool value passed in.
+func Bool(v bool) *bool {
+	return &v
+}
+
+// BoolValue returns the value of the bool pointer passed in or
+// false if the pointer is nil.
+func BoolValue(v *bool) bool {
+	if v != nil {
+		return *v
+	}
+	return false
+}
+
+// BoolSlice converts a slice of bool values into a slice of
+// bool pointers
+func BoolSlice(src []bool) []*bool {
+	dst := make([]*bool, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// BoolValueSlice converts a slice of bool pointers into a slice of
+// bool values
+func BoolValueSlice(src []*bool) []bool {
+	dst := make([]bool, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// BoolMap converts a string map of bool values into a string
+// map of bool pointers
+func BoolMap(src map[string]bool) map[string]*bool {
+	dst := make(map[string]*bool)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// BoolValueMap converts a string map of bool pointers into a string
+// map of bool values
+func BoolValueMap(src map[string]*bool) map[string]bool {
+	dst := make(map[string]bool)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Int returns a pointer to of the int value passed in.
+func Int(v int) *int {
+	return &v
+}
+
+// IntValue returns the value of the int pointer passed in or
+// 0 if the pointer is nil.
+func IntValue(v *int) int {
+	if v != nil {
+		return *v
+	}
+	return 0
+}
+
+// IntSlice converts a slice of int values into a slice of
+// int pointers
+func IntSlice(src []int) []*int {
+	dst := make([]*int, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// IntValueSlice converts a slice of int pointers into a slice of
+// int values
+func IntValueSlice(src []*int) []int {
+	dst := make([]int, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// IntMap converts a string map of int values into a string
+// map of int pointers
+func IntMap(src map[string]int) map[string]*int {
+	dst := make(map[string]*int)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// IntValueMap converts a string map of int pointers into a string
+// map of int values
+func IntValueMap(src map[string]*int) map[string]int {
+	dst := make(map[string]int)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Int64 returns a pointer to of the int64 value passed in.
+func Int64(v int64) *int64 {
+	return &v
+}
+
+// Int64Value returns the value of the int64 pointer passed in or
+// 0 if the pointer is nil.
+func Int64Value(v *int64) int64 {
+	if v != nil {
+		return *v
+	}
+	return 0
+}
+
+// Int64Slice converts a slice of int64 values into a slice of
+// int64 pointers
+func Int64Slice(src []int64) []*int64 {
+	dst := make([]*int64, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// Int64ValueSlice converts a slice of int64 pointers into a slice of
+// int64 values
+func Int64ValueSlice(src []*int64) []int64 {
+	dst := make([]int64, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// Int64Map converts a string map of int64 values into a string
+// map of int64 pointers
+func Int64Map(src map[string]int64) map[string]*int64 {
+	dst := make(map[string]*int64)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// Int64ValueMap converts a string map of int64 pointers into a string
+// map of int64 values
+func Int64ValueMap(src map[string]*int64) map[string]int64 {
+	dst := make(map[string]int64)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Float64 returns a pointer to of the float64 value passed in.
+func Float64(v float64) *float64 {
+	return &v
+}
+
+// Float64Value returns the value of the float64 pointer passed in or
+// 0 if the pointer is nil.
+func Float64Value(v *float64) float64 {
+	if v != nil {
+		return *v
+	}
+	return 0
+}
+
+// Float64Slice converts a slice of float64 values into a slice of
+// float64 pointers
+func Float64Slice(src []float64) []*float64 {
+	dst := make([]*float64, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// Float64ValueSlice converts a slice of float64 pointers into a slice of
+// float64 values
+func Float64ValueSlice(src []*float64) []float64 {
+	dst := make([]float64, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// Float64Map converts a string map of float64 values into a string
+// map of float64 pointers
+func Float64Map(src map[string]float64) map[string]*float64 {
+	dst := make(map[string]*float64)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// Float64ValueMap converts a string map of float64 pointers into a string
+// map of float64 values
+func Float64ValueMap(src map[string]*float64) map[string]float64 {
+	dst := make(map[string]float64)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
+
+// Time returns a pointer to of the time.Time value passed in.
+func Time(v time.Time) *time.Time {
+	return &v
+}
+
+// TimeValue returns the value of the time.Time pointer passed in or
+// time.Time{} if the pointer is nil.
+func TimeValue(v *time.Time) time.Time {
+	if v != nil {
+		return *v
+	}
+	return time.Time{}
+}
+
+// TimeSlice converts a slice of time.Time values into a slice of
+// time.Time pointers
+func TimeSlice(src []time.Time) []*time.Time {
+	dst := make([]*time.Time, len(src))
+	for i := 0; i < len(src); i++ {
+		dst[i] = &(src[i])
+	}
+	return dst
+}
+
+// TimeValueSlice converts a slice of time.Time pointers into a slice of
+// time.Time values
+func TimeValueSlice(src []*time.Time) []time.Time {
+	dst := make([]time.Time, len(src))
+	for i := 0; i < len(src); i++ {
+		if src[i] != nil {
+			dst[i] = *(src[i])
+		}
+	}
+	return dst
+}
+
+// TimeMap converts a string map of time.Time values into a string
+// map of time.Time pointers
+func TimeMap(src map[string]time.Time) map[string]*time.Time {
+	dst := make(map[string]*time.Time)
+	for k, val := range src {
+		v := val
+		dst[k] = &v
+	}
+	return dst
+}
+
+// TimeValueMap converts a string map of time.Time pointers into a string
+// map of time.Time values
+func TimeValueMap(src map[string]*time.Time) map[string]time.Time {
+	dst := make(map[string]time.Time)
+	for k, val := range src {
+		if val != nil {
+			dst[k] = *val
+		}
+	}
+	return dst
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
new file mode 100644
index 0000000000..857311f64c
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
@@ -0,0 +1,100 @@
+package credentials
+
+import (
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+var (
+	// ErrNoValidProvidersFoundInChain Is returned when there are no valid
+	// providers in the ChainProvider.
+	//
+	// This has been deprecated. For verbose error messaging set
+	// aws.Config.CredentialsChainVerboseErrors to true
+	//
+	// @readonly
+	ErrNoValidProvidersFoundInChain = awserr.New("NoCredentialProviders",
+		`no valid providers in chain. Deprecated. 
+	For verbose messaging see aws.Config.CredentialsChainVerboseErrors`,
+		nil)
+)
+
+// A ChainProvider will search for a provider which returns credentials
+// and cache that provider until Retrieve is called again.
+//
+// The ChainProvider provides a way of chaining multiple providers together
+// which will pick the first available using priority order of the Providers
+// in the list.
+//
+// If none of the Providers retrieve valid credentials Value, ChainProvider's
+// Retrieve() will return the error ErrNoValidProvidersFoundInChain.
+//
+// If a Provider is found which returns valid credentials Value ChainProvider
+// will cache that Provider for all calls to IsExpired(), until Retrieve is
+// called again.
+//
+// Example of ChainProvider to be used with an EnvProvider and EC2RoleProvider.
+// In this example EnvProvider will first check if any credentials are available
+// vai the environment variables. If there are none ChainProvider will check
+// the next Provider in the list, EC2RoleProvider in this case. If EC2RoleProvider
+// does not return any credentials ChainProvider will return the error
+// ErrNoValidProvidersFoundInChain
+//
+//     creds := NewChainCredentials(
+//         []Provider{
+//             &EnvProvider{},
+//             &EC2RoleProvider{
+//                 Client: ec2metadata.New(sess),
+//             },
+//         })
+//
+//     // Usage of ChainCredentials with aws.Config
+//     svc := ec2.New(&aws.Config{Credentials: creds})
+//
+type ChainProvider struct {
+	Providers     []Provider
+	curr          Provider
+	VerboseErrors bool
+}
+
+// NewChainCredentials returns a pointer to a new Credentials object
+// wrapping a chain of providers.
+func NewChainCredentials(providers []Provider) *Credentials {
+	return NewCredentials(&ChainProvider{
+		Providers: append([]Provider{}, providers...),
+	})
+}
+
+// Retrieve returns the credentials value or error if no provider returned
+// without error.
+//
+// If a provider is found it will be cached and any calls to IsExpired()
+// will return the expired state of the cached provider.
+func (c *ChainProvider) Retrieve() (Value, error) {
+	var errs []error
+	for _, p := range c.Providers {
+		creds, err := p.Retrieve()
+		if err == nil {
+			c.curr = p
+			return creds, nil
+		}
+		errs = append(errs, err)
+	}
+	c.curr = nil
+
+	var err error
+	err = ErrNoValidProvidersFoundInChain
+	if c.VerboseErrors {
+		err = awserr.NewBatchError("NoCredentialProviders", "no valid providers in chain", errs)
+	}
+	return Value{}, err
+}
+
+// IsExpired will returned the expired state of the currently cached provider
+// if there is one.  If there is no current provider, true will be returned.
+func (c *ChainProvider) IsExpired() bool {
+	if c.curr != nil {
+		return c.curr.IsExpired()
+	}
+
+	return true
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
new file mode 100644
index 0000000000..7b8ebf5f9d
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
@@ -0,0 +1,223 @@
+// Package credentials provides credential retrieval and management
+//
+// The Credentials is the primary method of getting access to and managing
+// credentials Values. Using dependency injection retrieval of the credential
+// values is handled by a object which satisfies the Provider interface.
+//
+// By default the Credentials.Get() will cache the successful result of a
+// Provider's Retrieve() until Provider.IsExpired() returns true. At which
+// point Credentials will call Provider's Retrieve() to get new credential Value.
+//
+// The Provider is responsible for determining when credentials Value have expired.
+// It is also important to note that Credentials will always call Retrieve the
+// first time Credentials.Get() is called.
+//
+// Example of using the environment variable credentials.
+//
+//     creds := NewEnvCredentials()
+//
+//     // Retrieve the credentials value
+//     credValue, err := creds.Get()
+//     if err != nil {
+//         // handle error
+//     }
+//
+// Example of forcing credentials to expire and be refreshed on the next Get().
+// This may be helpful to proactively expire credentials and refresh them sooner
+// than they would naturally expire on their own.
+//
+//     creds := NewCredentials(&EC2RoleProvider{})
+//     creds.Expire()
+//     credsValue, err := creds.Get()
+//     // New credentials will be retrieved instead of from cache.
+//
+//
+// Custom Provider
+//
+// Each Provider built into this package also provides a helper method to generate
+// a Credentials pointer setup with the provider. To use a custom Provider just
+// create a type which satisfies the Provider interface and pass it to the
+// NewCredentials method.
+//
+//     type MyProvider struct{}
+//     func (m *MyProvider) Retrieve() (Value, error) {...}
+//     func (m *MyProvider) IsExpired() bool {...}
+//
+//     creds := NewCredentials(&MyProvider{})
+//     credValue, err := creds.Get()
+//
+package credentials
+
+import (
+	"sync"
+	"time"
+)
+
+// AnonymousCredentials is an empty Credential object that can be used as
+// dummy placeholder credentials for requests that do not need signed.
+//
+// This Credentials can be used to configure a service to not sign requests
+// when making service API calls. For example, when accessing public
+// s3 buckets.
+//
+//     svc := s3.New(&aws.Config{Credentials: AnonymousCredentials})
+//     // Access public S3 buckets.
+//
+// @readonly
+var AnonymousCredentials = NewStaticCredentials("", "", "")
+
+// A Value is the AWS credentials value for individual credential fields.
+type Value struct {
+	// AWS Access key ID
+	AccessKeyID string
+
+	// AWS Secret Access Key
+	SecretAccessKey string
+
+	// AWS Session Token
+	SessionToken string
+
+	// Provider used to get credentials
+	ProviderName string
+}
+
+// A Provider is the interface for any component which will provide credentials
+// Value. A provider is required to manage its own Expired state, and what to
+// be expired means.
+//
+// The Provider should not need to implement its own mutexes, because
+// that will be managed by Credentials.
+type Provider interface {
+	// Refresh returns nil if it successfully retrieved the value.
+	// Error is returned if the value were not obtainable, or empty.
+	Retrieve() (Value, error)
+
+	// IsExpired returns if the credentials are no longer valid, and need
+	// to be retrieved.
+	IsExpired() bool
+}
+
+// A Expiry provides shared expiration logic to be used by credentials
+// providers to implement expiry functionality.
+//
+// The best method to use this struct is as an anonymous field within the
+// provider's struct.
+//
+// Example:
+//     type EC2RoleProvider struct {
+//         Expiry
+//         ...
+//     }
+type Expiry struct {
+	// The date/time when to expire on
+	expiration time.Time
+
+	// If set will be used by IsExpired to determine the current time.
+	// Defaults to time.Now if CurrentTime is not set.  Available for testing
+	// to be able to mock out the current time.
+	CurrentTime func() time.Time
+}
+
+// SetExpiration sets the expiration IsExpired will check when called.
+//
+// If window is greater than 0 the expiration time will be reduced by the
+// window value.
+//
+// Using a window is helpful to trigger credentials to expire sooner than
+// the expiration time given to ensure no requests are made with expired
+// tokens.
+func (e *Expiry) SetExpiration(expiration time.Time, window time.Duration) {
+	e.expiration = expiration
+	if window > 0 {
+		e.expiration = e.expiration.Add(-window)
+	}
+}
+
+// IsExpired returns if the credentials are expired.
+func (e *Expiry) IsExpired() bool {
+	if e.CurrentTime == nil {
+		e.CurrentTime = time.Now
+	}
+	return e.expiration.Before(e.CurrentTime())
+}
+
+// A Credentials provides synchronous safe retrieval of AWS credentials Value.
+// Credentials will cache the credentials value until they expire. Once the value
+// expires the next Get will attempt to retrieve valid credentials.
+//
+// Credentials is safe to use across multiple goroutines and will manage the
+// synchronous state so the Providers do not need to implement their own
+// synchronization.
+//
+// The first Credentials.Get() will always call Provider.Retrieve() to get the
+// first instance of the credentials Value. All calls to Get() after that
+// will return the cached credentials Value until IsExpired() returns true.
+type Credentials struct {
+	creds        Value
+	forceRefresh bool
+	m            sync.Mutex
+
+	provider Provider
+}
+
+// NewCredentials returns a pointer to a new Credentials with the provider set.
+func NewCredentials(provider Provider) *Credentials {
+	return &Credentials{
+		provider:     provider,
+		forceRefresh: true,
+	}
+}
+
+// Get returns the credentials value, or error if the credentials Value failed
+// to be retrieved.
+//
+// Will return the cached credentials Value if it has not expired. If the
+// credentials Value has expired the Provider's Retrieve() will be called
+// to refresh the credentials.
+//
+// If Credentials.Expire() was called the credentials Value will be force
+// expired, and the next call to Get() will cause them to be refreshed.
+func (c *Credentials) Get() (Value, error) {
+	c.m.Lock()
+	defer c.m.Unlock()
+
+	if c.isExpired() {
+		creds, err := c.provider.Retrieve()
+		if err != nil {
+			return Value{}, err
+		}
+		c.creds = creds
+		c.forceRefresh = false
+	}
+
+	return c.creds, nil
+}
+
+// Expire expires the credentials and forces them to be retrieved on the
+// next call to Get().
+//
+// This will override the Provider's expired state, and force Credentials
+// to call the Provider's Retrieve().
+func (c *Credentials) Expire() {
+	c.m.Lock()
+	defer c.m.Unlock()
+
+	c.forceRefresh = true
+}
+
+// IsExpired returns if the credentials are no longer valid, and need
+// to be retrieved.
+//
+// If the Credentials were forced to be expired with Expire() this will
+// reflect that override.
+func (c *Credentials) IsExpired() bool {
+	c.m.Lock()
+	defer c.m.Unlock()
+
+	return c.isExpired()
+}
+
+// isExpired helper method wrapping the definition of expired credentials.
+func (c *Credentials) isExpired() bool {
+	return c.forceRefresh || c.provider.IsExpired()
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
new file mode 100644
index 0000000000..96655bc46a
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
@@ -0,0 +1,77 @@
+package credentials
+
+import (
+	"os"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+// EnvProviderName provides a name of Env provider
+const EnvProviderName = "EnvProvider"
+
+var (
+	// ErrAccessKeyIDNotFound is returned when the AWS Access Key ID can't be
+	// found in the process's environment.
+	//
+	// @readonly
+	ErrAccessKeyIDNotFound = awserr.New("EnvAccessKeyNotFound", "AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment", nil)
+
+	// ErrSecretAccessKeyNotFound is returned when the AWS Secret Access Key
+	// can't be found in the process's environment.
+	//
+	// @readonly
+	ErrSecretAccessKeyNotFound = awserr.New("EnvSecretNotFound", "AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment", nil)
+)
+
+// A EnvProvider retrieves credentials from the environment variables of the
+// running process. Environment credentials never expire.
+//
+// Environment variables used:
+//
+// * Access Key ID:     AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY
+// * Secret Access Key: AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY
+type EnvProvider struct {
+	retrieved bool
+}
+
+// NewEnvCredentials returns a pointer to a new Credentials object
+// wrapping the environment variable provider.
+func NewEnvCredentials() *Credentials {
+	return NewCredentials(&EnvProvider{})
+}
+
+// Retrieve retrieves the keys from the environment.
+func (e *EnvProvider) Retrieve() (Value, error) {
+	e.retrieved = false
+
+	id := os.Getenv("AWS_ACCESS_KEY_ID")
+	if id == "" {
+		id = os.Getenv("AWS_ACCESS_KEY")
+	}
+
+	secret := os.Getenv("AWS_SECRET_ACCESS_KEY")
+	if secret == "" {
+		secret = os.Getenv("AWS_SECRET_KEY")
+	}
+
+	if id == "" {
+		return Value{ProviderName: EnvProviderName}, ErrAccessKeyIDNotFound
+	}
+
+	if secret == "" {
+		return Value{ProviderName: EnvProviderName}, ErrSecretAccessKeyNotFound
+	}
+
+	e.retrieved = true
+	return Value{
+		AccessKeyID:     id,
+		SecretAccessKey: secret,
+		SessionToken:    os.Getenv("AWS_SESSION_TOKEN"),
+		ProviderName:    EnvProviderName,
+	}, nil
+}
+
+// IsExpired returns if the credentials have been retrieved.
+func (e *EnvProvider) IsExpired() bool {
+	return !e.retrieved
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
new file mode 100644
index 0000000000..7fb7cbf0db
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
@@ -0,0 +1,151 @@
+package credentials
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/go-ini/ini"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+// SharedCredsProviderName provides a name of SharedCreds provider
+const SharedCredsProviderName = "SharedCredentialsProvider"
+
+var (
+	// ErrSharedCredentialsHomeNotFound is emitted when the user directory cannot be found.
+	//
+	// @readonly
+	ErrSharedCredentialsHomeNotFound = awserr.New("UserHomeNotFound", "user home directory not found.", nil)
+)
+
+// A SharedCredentialsProvider retrieves credentials from the current user's home
+// directory, and keeps track if those credentials are expired.
+//
+// Profile ini file example: $HOME/.aws/credentials
+type SharedCredentialsProvider struct {
+	// Path to the shared credentials file.
+	//
+	// If empty will look for "AWS_SHARED_CREDENTIALS_FILE" env variable. If the
+	// env value is empty will default to current user's home directory.
+	// Linux/OSX: "$HOME/.aws/credentials"
+	// Windows:   "%USERPROFILE%\.aws\credentials"
+	Filename string
+
+	// AWS Profile to extract credentials from the shared credentials file. If empty
+	// will default to environment variable "AWS_PROFILE" or "default" if
+	// environment variable is also not set.
+	Profile string
+
+	// retrieved states if the credentials have been successfully retrieved.
+	retrieved bool
+}
+
+// NewSharedCredentials returns a pointer to a new Credentials object
+// wrapping the Profile file provider.
+func NewSharedCredentials(filename, profile string) *Credentials {
+	return NewCredentials(&SharedCredentialsProvider{
+		Filename: filename,
+		Profile:  profile,
+	})
+}
+
+// Retrieve reads and extracts the shared credentials from the current
+// users home directory.
+func (p *SharedCredentialsProvider) Retrieve() (Value, error) {
+	p.retrieved = false
+
+	filename, err := p.filename()
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, err
+	}
+
+	creds, err := loadProfile(filename, p.profile())
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, err
+	}
+
+	p.retrieved = true
+	return creds, nil
+}
+
+// IsExpired returns if the shared credentials have expired.
+func (p *SharedCredentialsProvider) IsExpired() bool {
+	return !p.retrieved
+}
+
+// loadProfiles loads from the file pointed to by shared credentials filename for profile.
+// The credentials retrieved from the profile will be returned or error. Error will be
+// returned if it fails to read from the file, or the data is invalid.
+func loadProfile(filename, profile string) (Value, error) {
+	config, err := ini.Load(filename)
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to load shared credentials file", err)
+	}
+	iniProfile, err := config.GetSection(profile)
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to get profile", err)
+	}
+
+	id, err := iniProfile.GetKey("aws_access_key_id")
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsAccessKey",
+			fmt.Sprintf("shared credentials %s in %s did not contain aws_access_key_id", profile, filename),
+			err)
+	}
+
+	secret, err := iniProfile.GetKey("aws_secret_access_key")
+	if err != nil {
+		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsSecret",
+			fmt.Sprintf("shared credentials %s in %s did not contain aws_secret_access_key", profile, filename),
+			nil)
+	}
+
+	// Default to empty string if not found
+	token := iniProfile.Key("aws_session_token")
+
+	return Value{
+		AccessKeyID:     id.String(),
+		SecretAccessKey: secret.String(),
+		SessionToken:    token.String(),
+		ProviderName:    SharedCredsProviderName,
+	}, nil
+}
+
+// filename returns the filename to use to read AWS shared credentials.
+//
+// Will return an error if the user's home directory path cannot be found.
+func (p *SharedCredentialsProvider) filename() (string, error) {
+	if p.Filename == "" {
+		if p.Filename = os.Getenv("AWS_SHARED_CREDENTIALS_FILE"); p.Filename != "" {
+			return p.Filename, nil
+		}
+
+		homeDir := os.Getenv("HOME") // *nix
+		if homeDir == "" {           // Windows
+			homeDir = os.Getenv("USERPROFILE")
+		}
+		if homeDir == "" {
+			return "", ErrSharedCredentialsHomeNotFound
+		}
+
+		p.Filename = filepath.Join(homeDir, ".aws", "credentials")
+	}
+
+	return p.Filename, nil
+}
+
+// profile returns the AWS shared credentials profile.  If empty will read
+// environment variable "AWS_PROFILE". If that is not set profile will
+// return "default".
+func (p *SharedCredentialsProvider) profile() string {
+	if p.Profile == "" {
+		p.Profile = os.Getenv("AWS_PROFILE")
+	}
+	if p.Profile == "" {
+		p.Profile = "default"
+	}
+
+	return p.Profile
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
new file mode 100644
index 0000000000..71189e733d
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
@@ -0,0 +1,48 @@
+package credentials
+
+import (
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+// StaticProviderName provides a name of Static provider
+const StaticProviderName = "StaticProvider"
+
+var (
+	// ErrStaticCredentialsEmpty is emitted when static credentials are empty.
+	//
+	// @readonly
+	ErrStaticCredentialsEmpty = awserr.New("EmptyStaticCreds", "static credentials are empty", nil)
+)
+
+// A StaticProvider is a set of credentials which are set pragmatically,
+// and will never expire.
+type StaticProvider struct {
+	Value
+}
+
+// NewStaticCredentials returns a pointer to a new Credentials object
+// wrapping a static credentials value provider.
+func NewStaticCredentials(id, secret, token string) *Credentials {
+	return NewCredentials(&StaticProvider{Value: Value{
+		AccessKeyID:     id,
+		SecretAccessKey: secret,
+		SessionToken:    token,
+	}})
+}
+
+// Retrieve returns the credentials or error if the credentials are invalid.
+func (s *StaticProvider) Retrieve() (Value, error) {
+	if s.AccessKeyID == "" || s.SecretAccessKey == "" {
+		return Value{ProviderName: StaticProviderName}, ErrStaticCredentialsEmpty
+	}
+
+	s.Value.ProviderName = StaticProviderName
+	return s.Value, nil
+}
+
+// IsExpired returns if the credentials are expired.
+//
+// For StaticProvider, the credentials never expired.
+func (s *StaticProvider) IsExpired() bool {
+	return false
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/errors.go b/vendor/github.com/aws/aws-sdk-go/aws/errors.go
new file mode 100644
index 0000000000..5766361686
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/errors.go
@@ -0,0 +1,17 @@
+package aws
+
+import "github.com/aws/aws-sdk-go/aws/awserr"
+
+var (
+	// ErrMissingRegion is an error that is returned if region configuration is
+	// not found.
+	//
+	// @readonly
+	ErrMissingRegion = awserr.New("MissingRegion", "could not find region configuration", nil)
+
+	// ErrMissingEndpoint is an error that is returned if an endpoint cannot be
+	// resolved for a service.
+	//
+	// @readonly
+	ErrMissingEndpoint = awserr.New("MissingEndpoint", "'Endpoint' configuration is required for this service", nil)
+)
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/logger.go
new file mode 100644
index 0000000000..db87188e20
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/logger.go
@@ -0,0 +1,112 @@
+package aws
+
+import (
+	"log"
+	"os"
+)
+
+// A LogLevelType defines the level logging should be performed at. Used to instruct
+// the SDK which statements should be logged.
+type LogLevelType uint
+
+// LogLevel returns the pointer to a LogLevel. Should be used to workaround
+// not being able to take the address of a non-composite literal.
+func LogLevel(l LogLevelType) *LogLevelType {
+	return &l
+}
+
+// Value returns the LogLevel value or the default value LogOff if the LogLevel
+// is nil. Safe to use on nil value LogLevelTypes.
+func (l *LogLevelType) Value() LogLevelType {
+	if l != nil {
+		return *l
+	}
+	return LogOff
+}
+
+// Matches returns true if the v LogLevel is enabled by this LogLevel. Should be
+// used with logging sub levels. Is safe to use on nil value LogLevelTypes. If
+// LogLevel is nill, will default to LogOff comparison.
+func (l *LogLevelType) Matches(v LogLevelType) bool {
+	c := l.Value()
+	return c&v == v
+}
+
+// AtLeast returns true if this LogLevel is at least high enough to satisfies v.
+// Is safe to use on nil value LogLevelTypes. If LogLevel is nill, will default
+// to LogOff comparison.
+func (l *LogLevelType) AtLeast(v LogLevelType) bool {
+	c := l.Value()
+	return c >= v
+}
+
+const (
+	// LogOff states that no logging should be performed by the SDK. This is the
+	// default state of the SDK, and should be use to disable all logging.
+	LogOff LogLevelType = iota * 0x1000
+
+	// LogDebug state that debug output should be logged by the SDK. This should
+	// be used to inspect request made and responses received.
+	LogDebug
+)
+
+// Debug Logging Sub Levels
+const (
+	// LogDebugWithSigning states that the SDK should log request signing and
+	// presigning events. This should be used to log the signing details of
+	// requests for debugging. Will also enable LogDebug.
+	LogDebugWithSigning LogLevelType = LogDebug | (1 << iota)
+
+	// LogDebugWithHTTPBody states the SDK should log HTTP request and response
+	// HTTP bodys in addition to the headers and path. This should be used to
+	// see the body content of requests and responses made while using the SDK
+	// Will also enable LogDebug.
+	LogDebugWithHTTPBody
+
+	// LogDebugWithRequestRetries states the SDK should log when service requests will
+	// be retried. This should be used to log when you want to log when service
+	// requests are being retried. Will also enable LogDebug.
+	LogDebugWithRequestRetries
+
+	// LogDebugWithRequestErrors states the SDK should log when service requests fail
+	// to build, send, validate, or unmarshal.
+	LogDebugWithRequestErrors
+)
+
+// A Logger is a minimalistic interface for the SDK to log messages to. Should
+// be used to provide custom logging writers for the SDK to use.
+type Logger interface {
+	Log(...interface{})
+}
+
+// A LoggerFunc is a convenience type to convert a function taking a variadic
+// list of arguments and wrap it so the Logger interface can be used.
+//
+// Example:
+//     s3.New(sess, &aws.Config{Logger: aws.LoggerFunc(func(args ...interface{}) {
+//         fmt.Fprintln(os.Stdout, args...)
+//     })})
+type LoggerFunc func(...interface{})
+
+// Log calls the wrapped function with the arguments provided
+func (f LoggerFunc) Log(args ...interface{}) {
+	f(args...)
+}
+
+// NewDefaultLogger returns a Logger which will write log messages to stdout, and
+// use same formatting runes as the stdlib log.Logger
+func NewDefaultLogger() Logger {
+	return &defaultLogger{
+		logger: log.New(os.Stdout, "", log.LstdFlags),
+	}
+}
+
+// A defaultLogger provides a minimalistic logger satisfying the Logger interface.
+type defaultLogger struct {
+	logger *log.Logger
+}
+
+// Log logs the parameters to the stdlib logger. See log.Println.
+func (l defaultLogger) Log(args ...interface{}) {
+	l.logger.Println(args...)
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
new file mode 100644
index 0000000000..5279c19c09
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
@@ -0,0 +1,187 @@
+package request
+
+import (
+	"fmt"
+	"strings"
+)
+
+// A Handlers provides a collection of request handlers for various
+// stages of handling requests.
+type Handlers struct {
+	Validate         HandlerList
+	Build            HandlerList
+	Sign             HandlerList
+	Send             HandlerList
+	ValidateResponse HandlerList
+	Unmarshal        HandlerList
+	UnmarshalMeta    HandlerList
+	UnmarshalError   HandlerList
+	Retry            HandlerList
+	AfterRetry       HandlerList
+}
+
+// Copy returns of this handler's lists.
+func (h *Handlers) Copy() Handlers {
+	return Handlers{
+		Validate:         h.Validate.copy(),
+		Build:            h.Build.copy(),
+		Sign:             h.Sign.copy(),
+		Send:             h.Send.copy(),
+		ValidateResponse: h.ValidateResponse.copy(),
+		Unmarshal:        h.Unmarshal.copy(),
+		UnmarshalError:   h.UnmarshalError.copy(),
+		UnmarshalMeta:    h.UnmarshalMeta.copy(),
+		Retry:            h.Retry.copy(),
+		AfterRetry:       h.AfterRetry.copy(),
+	}
+}
+
+// Clear removes callback functions for all handlers
+func (h *Handlers) Clear() {
+	h.Validate.Clear()
+	h.Build.Clear()
+	h.Send.Clear()
+	h.Sign.Clear()
+	h.Unmarshal.Clear()
+	h.UnmarshalMeta.Clear()
+	h.UnmarshalError.Clear()
+	h.ValidateResponse.Clear()
+	h.Retry.Clear()
+	h.AfterRetry.Clear()
+}
+
+// A HandlerListRunItem represents an entry in the HandlerList which
+// is being run.
+type HandlerListRunItem struct {
+	Index   int
+	Handler NamedHandler
+	Request *Request
+}
+
+// A HandlerList manages zero or more handlers in a list.
+type HandlerList struct {
+	list []NamedHandler
+
+	// Called after each request handler in the list is called. If set
+	// and the func returns true the HandlerList will continue to iterate
+	// over the request handlers. If false is returned the HandlerList
+	// will stop iterating.
+	//
+	// Should be used if extra logic to be performed between each handler
+	// in the list. This can be used to terminate a list's iteration
+	// based on a condition such as error like, HandlerListStopOnError.
+	// Or for logging like HandlerListLogItem.
+	AfterEachFn func(item HandlerListRunItem) bool
+}
+
+// A NamedHandler is a struct that contains a name and function callback.
+type NamedHandler struct {
+	Name string
+	Fn   func(*Request)
+}
+
+// copy creates a copy of the handler list.
+func (l *HandlerList) copy() HandlerList {
+	n := HandlerList{
+		AfterEachFn: l.AfterEachFn,
+	}
+	n.list = append([]NamedHandler{}, l.list...)
+	return n
+}
+
+// Clear clears the handler list.
+func (l *HandlerList) Clear() {
+	l.list = []NamedHandler{}
+}
+
+// Len returns the number of handlers in the list.
+func (l *HandlerList) Len() int {
+	return len(l.list)
+}
+
+// PushBack pushes handler f to the back of the handler list.
+func (l *HandlerList) PushBack(f func(*Request)) {
+	l.list = append(l.list, NamedHandler{"__anonymous", f})
+}
+
+// PushFront pushes handler f to the front of the handler list.
+func (l *HandlerList) PushFront(f func(*Request)) {
+	l.list = append([]NamedHandler{{"__anonymous", f}}, l.list...)
+}
+
+// PushBackNamed pushes named handler f to the back of the handler list.
+func (l *HandlerList) PushBackNamed(n NamedHandler) {
+	l.list = append(l.list, n)
+}
+
+// PushFrontNamed pushes named handler f to the front of the handler list.
+func (l *HandlerList) PushFrontNamed(n NamedHandler) {
+	l.list = append([]NamedHandler{n}, l.list...)
+}
+
+// Remove removes a NamedHandler n
+func (l *HandlerList) Remove(n NamedHandler) {
+	newlist := []NamedHandler{}
+	for _, m := range l.list {
+		if m.Name != n.Name {
+			newlist = append(newlist, m)
+		}
+	}
+	l.list = newlist
+}
+
+// Run executes all handlers in the list with a given request object.
+func (l *HandlerList) Run(r *Request) {
+	for i, h := range l.list {
+		h.Fn(r)
+		item := HandlerListRunItem{
+			Index: i, Handler: h, Request: r,
+		}
+		if l.AfterEachFn != nil && !l.AfterEachFn(item) {
+			return
+		}
+	}
+}
+
+// HandlerListLogItem logs the request handler and the state of the
+// request's Error value. Always returns true to continue iterating
+// request handlers in a HandlerList.
+func HandlerListLogItem(item HandlerListRunItem) bool {
+	if item.Request.Config.Logger == nil {
+		return true
+	}
+	item.Request.Config.Logger.Log("DEBUG: RequestHandler",
+		item.Index, item.Handler.Name, item.Request.Error)
+
+	return true
+}
+
+// HandlerListStopOnError returns false to stop the HandlerList iterating
+// over request handlers if Request.Error is not nil. True otherwise
+// to continue iterating.
+func HandlerListStopOnError(item HandlerListRunItem) bool {
+	return item.Request.Error == nil
+}
+
+// MakeAddToUserAgentHandler will add the name/version pair to the User-Agent request
+// header. If the extra parameters are provided they will be added as metadata to the
+// name/version pair resulting in the following format.
+// "name/version (extra0; extra1; ...)"
+// The user agent part will be concatenated with this current request's user agent string.
+func MakeAddToUserAgentHandler(name, version string, extra ...string) func(*Request) {
+	ua := fmt.Sprintf("%s/%s", name, version)
+	if len(extra) > 0 {
+		ua += fmt.Sprintf(" (%s)", strings.Join(extra, "; "))
+	}
+	return func(r *Request) {
+		AddToUserAgent(r, ua)
+	}
+}
+
+// MakeAddToUserAgentFreeFormHandler adds the input to the User-Agent request header.
+// The input string will be concatenated with the current request's user agent string.
+func MakeAddToUserAgentFreeFormHandler(s string) func(*Request) {
+	return func(r *Request) {
+		AddToUserAgent(r, s)
+	}
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
new file mode 100644
index 0000000000..85eead3d51
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
@@ -0,0 +1,302 @@
+package request
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"reflect"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/client/metadata"
+)
+
+// A Request is the service request to be made.
+type Request struct {
+	Config     aws.Config
+	ClientInfo metadata.ClientInfo
+	Handlers   Handlers
+
+	Retryer
+	Time             time.Time
+	ExpireTime       time.Duration
+	Operation        *Operation
+	HTTPRequest      *http.Request
+	HTTPResponse     *http.Response
+	Body             io.ReadSeeker
+	BodyStart        int64 // offset from beginning of Body that the request body starts
+	Params           interface{}
+	Error            error
+	Data             interface{}
+	RequestID        string
+	RetryCount       int
+	Retryable        *bool
+	RetryDelay       time.Duration
+	NotHoist         bool
+	SignedHeaderVals http.Header
+
+	built bool
+}
+
+// An Operation is the service API operation to be made.
+type Operation struct {
+	Name       string
+	HTTPMethod string
+	HTTPPath   string
+	*Paginator
+}
+
+// Paginator keeps track of pagination configuration for an API operation.
+type Paginator struct {
+	InputTokens     []string
+	OutputTokens    []string
+	LimitToken      string
+	TruncationToken string
+}
+
+// New returns a new Request pointer for the service API
+// operation and parameters.
+//
+// Params is any value of input parameters to be the request payload.
+// Data is pointer value to an object which the request's response
+// payload will be deserialized to.
+func New(cfg aws.Config, clientInfo metadata.ClientInfo, handlers Handlers,
+	retryer Retryer, operation *Operation, params interface{}, data interface{}) *Request {
+
+	method := operation.HTTPMethod
+	if method == "" {
+		method = "POST"
+	}
+	p := operation.HTTPPath
+	if p == "" {
+		p = "/"
+	}
+
+	httpReq, _ := http.NewRequest(method, "", nil)
+	httpReq.URL, _ = url.Parse(clientInfo.Endpoint + p)
+
+	r := &Request{
+		Config:     cfg,
+		ClientInfo: clientInfo,
+		Handlers:   handlers.Copy(),
+
+		Retryer:     retryer,
+		Time:        time.Now(),
+		ExpireTime:  0,
+		Operation:   operation,
+		HTTPRequest: httpReq,
+		Body:        nil,
+		Params:      params,
+		Error:       nil,
+		Data:        data,
+	}
+	r.SetBufferBody([]byte{})
+
+	return r
+}
+
+// WillRetry returns if the request's can be retried.
+func (r *Request) WillRetry() bool {
+	return r.Error != nil && aws.BoolValue(r.Retryable) && r.RetryCount < r.MaxRetries()
+}
+
+// ParamsFilled returns if the request's parameters have been populated
+// and the parameters are valid. False is returned if no parameters are
+// provided or invalid.
+func (r *Request) ParamsFilled() bool {
+	return r.Params != nil && reflect.ValueOf(r.Params).Elem().IsValid()
+}
+
+// DataFilled returns true if the request's data for response deserialization
+// target has been set and is a valid. False is returned if data is not
+// set, or is invalid.
+func (r *Request) DataFilled() bool {
+	return r.Data != nil && reflect.ValueOf(r.Data).Elem().IsValid()
+}
+
+// SetBufferBody will set the request's body bytes that will be sent to
+// the service API.
+func (r *Request) SetBufferBody(buf []byte) {
+	r.SetReaderBody(bytes.NewReader(buf))
+}
+
+// SetStringBody sets the body of the request to be backed by a string.
+func (r *Request) SetStringBody(s string) {
+	r.SetReaderBody(strings.NewReader(s))
+}
+
+// SetReaderBody will set the request's body reader.
+func (r *Request) SetReaderBody(reader io.ReadSeeker) {
+	r.HTTPRequest.Body = ioutil.NopCloser(reader)
+	r.Body = reader
+}
+
+// Presign returns the request's signed URL. Error will be returned
+// if the signing fails.
+func (r *Request) Presign(expireTime time.Duration) (string, error) {
+	r.ExpireTime = expireTime
+	r.NotHoist = false
+	r.Sign()
+	if r.Error != nil {
+		return "", r.Error
+	}
+	return r.HTTPRequest.URL.String(), nil
+}
+
+// PresignRequest behaves just like presign, but hoists all headers and signs them.
+// Also returns the signed hash back to the user
+func (r *Request) PresignRequest(expireTime time.Duration) (string, http.Header, error) {
+	r.ExpireTime = expireTime
+	r.NotHoist = true
+	r.Sign()
+	if r.Error != nil {
+		return "", nil, r.Error
+	}
+	return r.HTTPRequest.URL.String(), r.SignedHeaderVals, nil
+}
+
+func debugLogReqError(r *Request, stage string, retrying bool, err error) {
+	if !r.Config.LogLevel.Matches(aws.LogDebugWithRequestErrors) {
+		return
+	}
+
+	retryStr := "not retrying"
+	if retrying {
+		retryStr = "will retry"
+	}
+
+	r.Config.Logger.Log(fmt.Sprintf("DEBUG: %s %s/%s failed, %s, error %v",
+		stage, r.ClientInfo.ServiceName, r.Operation.Name, retryStr, err))
+}
+
+// Build will build the request's object so it can be signed and sent
+// to the service. Build will also validate all the request's parameters.
+// Anny additional build Handlers set on this request will be run
+// in the order they were set.
+//
+// The request will only be built once. Multiple calls to build will have
+// no effect.
+//
+// If any Validate or Build errors occur the build will stop and the error
+// which occurred will be returned.
+func (r *Request) Build() error {
+	if !r.built {
+		r.Error = nil
+		r.Handlers.Validate.Run(r)
+		if r.Error != nil {
+			debugLogReqError(r, "Validate Request", false, r.Error)
+			return r.Error
+		}
+		r.Handlers.Build.Run(r)
+		if r.Error != nil {
+			debugLogReqError(r, "Build Request", false, r.Error)
+			return r.Error
+		}
+		r.built = true
+	}
+
+	return r.Error
+}
+
+// Sign will sign the request retuning error if errors are encountered.
+//
+// Send will build the request prior to signing. All Sign Handlers will
+// be executed in the order they were set.
+func (r *Request) Sign() error {
+	r.Build()
+	if r.Error != nil {
+		debugLogReqError(r, "Build Request", false, r.Error)
+		return r.Error
+	}
+
+	r.Handlers.Sign.Run(r)
+	return r.Error
+}
+
+// Send will send the request returning error if errors are encountered.
+//
+// Send will sign the request prior to sending. All Send Handlers will
+// be executed in the order they were set.
+func (r *Request) Send() error {
+	for {
+		r.Sign()
+		if r.Error != nil {
+			return r.Error
+		}
+
+		if aws.BoolValue(r.Retryable) {
+			if r.Config.LogLevel.Matches(aws.LogDebugWithRequestRetries) {
+				r.Config.Logger.Log(fmt.Sprintf("DEBUG: Retrying Request %s/%s, attempt %d",
+					r.ClientInfo.ServiceName, r.Operation.Name, r.RetryCount))
+			}
+
+			// Closing response body. Since we are setting a new request to send off, this
+			// response will get squashed and leaked.
+			r.HTTPResponse.Body.Close()
+
+			// Re-seek the body back to the original point in for a retry so that
+			// send will send the body's contents again in the upcoming request.
+			r.Body.Seek(r.BodyStart, 0)
+			r.HTTPRequest.Body = ioutil.NopCloser(r.Body)
+		}
+		r.Retryable = nil
+
+		r.Handlers.Send.Run(r)
+		if r.Error != nil {
+			err := r.Error
+			r.Handlers.Retry.Run(r)
+			r.Handlers.AfterRetry.Run(r)
+			if r.Error != nil {
+				debugLogReqError(r, "Send Request", false, r.Error)
+				return r.Error
+			}
+			debugLogReqError(r, "Send Request", true, err)
+			continue
+		}
+
+		r.Handlers.UnmarshalMeta.Run(r)
+		r.Handlers.ValidateResponse.Run(r)
+		if r.Error != nil {
+			err := r.Error
+			r.Handlers.UnmarshalError.Run(r)
+			r.Handlers.Retry.Run(r)
+			r.Handlers.AfterRetry.Run(r)
+			if r.Error != nil {
+				debugLogReqError(r, "Validate Response", false, r.Error)
+				return r.Error
+			}
+			debugLogReqError(r, "Validate Response", true, err)
+			continue
+		}
+
+		r.Handlers.Unmarshal.Run(r)
+		if r.Error != nil {
+			err := r.Error
+			r.Handlers.Retry.Run(r)
+			r.Handlers.AfterRetry.Run(r)
+			if r.Error != nil {
+				debugLogReqError(r, "Unmarshal Response", false, r.Error)
+				return r.Error
+			}
+			debugLogReqError(r, "Unmarshal Response", true, err)
+			continue
+		}
+
+		break
+	}
+
+	return nil
+}
+
+// AddToUserAgent adds the string to the end of the request's current user agent.
+func AddToUserAgent(r *Request, s string) {
+	curUA := r.HTTPRequest.Header.Get("User-Agent")
+	if len(curUA) > 0 {
+		s = curUA + " " + s
+	}
+	r.HTTPRequest.Header.Set("User-Agent", s)
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
new file mode 100644
index 0000000000..2939ec473f
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
@@ -0,0 +1,104 @@
+package request
+
+import (
+	"reflect"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
+)
+
+//type Paginater interface {
+//	HasNextPage() bool
+//	NextPage() *Request
+//	EachPage(fn func(data interface{}, isLastPage bool) (shouldContinue bool)) error
+//}
+
+// HasNextPage returns true if this request has more pages of data available.
+func (r *Request) HasNextPage() bool {
+	return len(r.nextPageTokens()) > 0
+}
+
+// nextPageTokens returns the tokens to use when asking for the next page of
+// data.
+func (r *Request) nextPageTokens() []interface{} {
+	if r.Operation.Paginator == nil {
+		return nil
+	}
+
+	if r.Operation.TruncationToken != "" {
+		tr, _ := awsutil.ValuesAtPath(r.Data, r.Operation.TruncationToken)
+		if len(tr) == 0 {
+			return nil
+		}
+
+		switch v := tr[0].(type) {
+		case *bool:
+			if !aws.BoolValue(v) {
+				return nil
+			}
+		case bool:
+			if v == false {
+				return nil
+			}
+		}
+	}
+
+	tokens := []interface{}{}
+	tokenAdded := false
+	for _, outToken := range r.Operation.OutputTokens {
+		v, _ := awsutil.ValuesAtPath(r.Data, outToken)
+		if len(v) > 0 {
+			tokens = append(tokens, v[0])
+			tokenAdded = true
+		} else {
+			tokens = append(tokens, nil)
+		}
+	}
+	if !tokenAdded {
+		return nil
+	}
+
+	return tokens
+}
+
+// NextPage returns a new Request that can be executed to return the next
+// page of result data. Call .Send() on this request to execute it.
+func (r *Request) NextPage() *Request {
+	tokens := r.nextPageTokens()
+	if len(tokens) == 0 {
+		return nil
+	}
+
+	data := reflect.New(reflect.TypeOf(r.Data).Elem()).Interface()
+	nr := New(r.Config, r.ClientInfo, r.Handlers, r.Retryer, r.Operation, awsutil.CopyOf(r.Params), data)
+	for i, intok := range nr.Operation.InputTokens {
+		awsutil.SetValueAtPath(nr.Params, intok, tokens[i])
+	}
+	return nr
+}
+
+// EachPage iterates over each page of a paginated request object. The fn
+// parameter should be a function with the following sample signature:
+//
+//   func(page *T, lastPage bool) bool {
+//       return true // return false to stop iterating
+//   }
+//
+// Where "T" is the structure type matching the output structure of the given
+// operation. For example, a request object generated by
+// DynamoDB.ListTablesRequest() would expect to see dynamodb.ListTablesOutput
+// as the structure "T". The lastPage value represents whether the page is
+// the last page of data or not. The return value of this function should
+// return true to keep iterating or false to stop.
+func (r *Request) EachPage(fn func(data interface{}, isLastPage bool) (shouldContinue bool)) error {
+	for page := r; page != nil; page = page.NextPage() {
+		if err := page.Send(); err != nil {
+			return err
+		}
+		if getNextPage := fn(page.Data, !page.HasNextPage()); !getNextPage {
+			return page.Error
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
new file mode 100644
index 0000000000..ab6fff5ac8
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
@@ -0,0 +1,82 @@
+package request
+
+import (
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+// Retryer is an interface to control retry logic for a given service.
+// The default implementation used by most services is the service.DefaultRetryer
+// structure, which contains basic retry logic using exponential backoff.
+type Retryer interface {
+	RetryRules(*Request) time.Duration
+	ShouldRetry(*Request) bool
+	MaxRetries() int
+}
+
+// WithRetryer sets a config Retryer value to the given Config returning it
+// for chaining.
+func WithRetryer(cfg *aws.Config, retryer Retryer) *aws.Config {
+	cfg.Retryer = retryer
+	return cfg
+}
+
+// retryableCodes is a collection of service response codes which are retry-able
+// without any further action.
+var retryableCodes = map[string]struct{}{
+	"RequestError":                           {},
+	"RequestTimeout":                         {},
+	"ProvisionedThroughputExceededException": {},
+	"Throttling":                             {},
+	"ThrottlingException":                    {},
+	"RequestLimitExceeded":                   {},
+	"RequestThrottled":                       {},
+	"LimitExceededException":                 {}, // Deleting 10+ DynamoDb tables at once
+	"TooManyRequestsException":               {}, // Lambda functions
+}
+
+// credsExpiredCodes is a collection of error codes which signify the credentials
+// need to be refreshed. Expired tokens require refreshing of credentials, and
+// resigning before the request can be retried.
+var credsExpiredCodes = map[string]struct{}{
+	"ExpiredToken":          {},
+	"ExpiredTokenException": {},
+	"RequestExpired":        {}, // EC2 Only
+}
+
+func isCodeRetryable(code string) bool {
+	if _, ok := retryableCodes[code]; ok {
+		return true
+	}
+
+	return isCodeExpiredCreds(code)
+}
+
+func isCodeExpiredCreds(code string) bool {
+	_, ok := credsExpiredCodes[code]
+	return ok
+}
+
+// IsErrorRetryable returns whether the error is retryable, based on its Code.
+// Returns false if the request has no Error set.
+func (r *Request) IsErrorRetryable() bool {
+	if r.Error != nil {
+		if err, ok := r.Error.(awserr.Error); ok {
+			return isCodeRetryable(err.Code())
+		}
+	}
+	return false
+}
+
+// IsErrorExpired returns whether the error code is a credential expiry error.
+// Returns false if the request has no Error set.
+func (r *Request) IsErrorExpired() bool {
+	if r.Error != nil {
+		if err, ok := r.Error.(awserr.Error); ok {
+			return isCodeExpiredCreds(err.Code())
+		}
+	}
+	return false
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/types.go b/vendor/github.com/aws/aws-sdk-go/aws/types.go
new file mode 100644
index 0000000000..0f067c57f4
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/types.go
@@ -0,0 +1,88 @@
+package aws
+
+import (
+	"io"
+	"sync"
+)
+
+// ReadSeekCloser wraps a io.Reader returning a ReaderSeekerCloser
+func ReadSeekCloser(r io.Reader) ReaderSeekerCloser {
+	return ReaderSeekerCloser{r}
+}
+
+// ReaderSeekerCloser represents a reader that can also delegate io.Seeker and
+// io.Closer interfaces to the underlying object if they are available.
+type ReaderSeekerCloser struct {
+	r io.Reader
+}
+
+// Read reads from the reader up to size of p. The number of bytes read, and
+// error if it occurred will be returned.
+//
+// If the reader is not an io.Reader zero bytes read, and nil error will be returned.
+//
+// Performs the same functionality as io.Reader Read
+func (r ReaderSeekerCloser) Read(p []byte) (int, error) {
+	switch t := r.r.(type) {
+	case io.Reader:
+		return t.Read(p)
+	}
+	return 0, nil
+}
+
+// Seek sets the offset for the next Read to offset, interpreted according to
+// whence: 0 means relative to the origin of the file, 1 means relative to the
+// current offset, and 2 means relative to the end. Seek returns the new offset
+// and an error, if any.
+//
+// If the ReaderSeekerCloser is not an io.Seeker nothing will be done.
+func (r ReaderSeekerCloser) Seek(offset int64, whence int) (int64, error) {
+	switch t := r.r.(type) {
+	case io.Seeker:
+		return t.Seek(offset, whence)
+	}
+	return int64(0), nil
+}
+
+// Close closes the ReaderSeekerCloser.
+//
+// If the ReaderSeekerCloser is not an io.Closer nothing will be done.
+func (r ReaderSeekerCloser) Close() error {
+	switch t := r.r.(type) {
+	case io.Closer:
+		return t.Close()
+	}
+	return nil
+}
+
+// A WriteAtBuffer provides a in memory buffer supporting the io.WriterAt interface
+// Can be used with the s3manager.Downloader to download content to a buffer
+// in memory. Safe to use concurrently.
+type WriteAtBuffer struct {
+	buf []byte
+	m   sync.Mutex
+}
+
+// WriteAt writes a slice of bytes to a buffer starting at the position provided
+// The number of bytes written will be returned, or error. Can overwrite previous
+// written slices if the write ats overlap.
+func (b *WriteAtBuffer) WriteAt(p []byte, pos int64) (n int, err error) {
+	b.m.Lock()
+	defer b.m.Unlock()
+
+	expLen := pos + int64(len(p))
+	if int64(len(b.buf)) < expLen {
+		newBuf := make([]byte, expLen)
+		copy(newBuf, b.buf)
+		b.buf = newBuf
+	}
+	copy(b.buf[pos:], p)
+	return len(p), nil
+}
+
+// Bytes returns a slice of bytes written to the buffer.
+func (b *WriteAtBuffer) Bytes() []byte {
+	b.m.Lock()
+	defer b.m.Unlock()
+	return b.buf[:len(b.buf):len(b.buf)]
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go
new file mode 100644
index 0000000000..669da2d695
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go
@@ -0,0 +1,8 @@
+// Package aws provides core functionality for making requests to AWS services.
+package aws
+
+// SDKName is the name of this AWS SDK
+const SDKName = "aws-sdk-go"
+
+// SDKVersion is the version of this SDK
+const SDKVersion = "1.1.7"
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
new file mode 100644
index 0000000000..5469edb60b
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
@@ -0,0 +1,257 @@
+// Package rest provides RESTful serialization of AWS requests and responses.
+package rest
+
+import (
+	"bytes"
+	"encoding/base64"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"path"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
+)
+
+// RFC822 returns an RFC822 formatted timestamp for AWS protocols
+const RFC822 = "Mon, 2 Jan 2006 15:04:05 GMT"
+
+// Whether the byte value can be sent without escaping in AWS URLs
+var noEscape [256]bool
+
+var errValueNotSet = fmt.Errorf("value not set")
+
+func init() {
+	for i := 0; i < len(noEscape); i++ {
+		// AWS expects every character except these to be escaped
+		noEscape[i] = (i >= 'A' && i <= 'Z') ||
+			(i >= 'a' && i <= 'z') ||
+			(i >= '0' && i <= '9') ||
+			i == '-' ||
+			i == '.' ||
+			i == '_' ||
+			i == '~'
+	}
+}
+
+// BuildHandler is a named request handler for building rest protocol requests
+var BuildHandler = request.NamedHandler{Name: "awssdk.rest.Build", Fn: Build}
+
+// Build builds the REST component of a service request.
+func Build(r *request.Request) {
+	if r.ParamsFilled() {
+		v := reflect.ValueOf(r.Params).Elem()
+		buildLocationElements(r, v)
+		buildBody(r, v)
+	}
+}
+
+func buildLocationElements(r *request.Request, v reflect.Value) {
+	query := r.HTTPRequest.URL.Query()
+
+	for i := 0; i < v.NumField(); i++ {
+		m := v.Field(i)
+		if n := v.Type().Field(i).Name; n[0:1] == strings.ToLower(n[0:1]) {
+			continue
+		}
+
+		if m.IsValid() {
+			field := v.Type().Field(i)
+			name := field.Tag.Get("locationName")
+			if name == "" {
+				name = field.Name
+			}
+			if m.Kind() == reflect.Ptr {
+				m = m.Elem()
+			}
+			if !m.IsValid() {
+				continue
+			}
+
+			var err error
+			switch field.Tag.Get("location") {
+			case "headers": // header maps
+				err = buildHeaderMap(&r.HTTPRequest.Header, m, field.Tag.Get("locationName"))
+			case "header":
+				err = buildHeader(&r.HTTPRequest.Header, m, name)
+			case "uri":
+				err = buildURI(r.HTTPRequest.URL, m, name)
+			case "querystring":
+				err = buildQueryString(query, m, name)
+			}
+			r.Error = err
+		}
+		if r.Error != nil {
+			return
+		}
+	}
+
+	r.HTTPRequest.URL.RawQuery = query.Encode()
+	updatePath(r.HTTPRequest.URL, r.HTTPRequest.URL.Path)
+}
+
+func buildBody(r *request.Request, v reflect.Value) {
+	if field, ok := v.Type().FieldByName("_"); ok {
+		if payloadName := field.Tag.Get("payload"); payloadName != "" {
+			pfield, _ := v.Type().FieldByName(payloadName)
+			if ptag := pfield.Tag.Get("type"); ptag != "" && ptag != "structure" {
+				payload := reflect.Indirect(v.FieldByName(payloadName))
+				if payload.IsValid() && payload.Interface() != nil {
+					switch reader := payload.Interface().(type) {
+					case io.ReadSeeker:
+						r.SetReaderBody(reader)
+					case []byte:
+						r.SetBufferBody(reader)
+					case string:
+						r.SetStringBody(reader)
+					default:
+						r.Error = awserr.New("SerializationError",
+							"failed to encode REST request",
+							fmt.Errorf("unknown payload type %s", payload.Type()))
+					}
+				}
+			}
+		}
+	}
+}
+
+func buildHeader(header *http.Header, v reflect.Value, name string) error {
+	str, err := convertType(v)
+	if err == errValueNotSet {
+		return nil
+	} else if err != nil {
+		return awserr.New("SerializationError", "failed to encode REST request", err)
+	}
+
+	header.Add(name, str)
+
+	return nil
+}
+
+func buildHeaderMap(header *http.Header, v reflect.Value, prefix string) error {
+	for _, key := range v.MapKeys() {
+		str, err := convertType(v.MapIndex(key))
+		if err == errValueNotSet {
+			continue
+		} else if err != nil {
+			return awserr.New("SerializationError", "failed to encode REST request", err)
+
+		}
+
+		header.Add(prefix+key.String(), str)
+	}
+	return nil
+}
+
+func buildURI(u *url.URL, v reflect.Value, name string) error {
+	value, err := convertType(v)
+	if err == errValueNotSet {
+		return nil
+	} else if err != nil {
+		return awserr.New("SerializationError", "failed to encode REST request", err)
+	}
+
+	uri := u.Path
+	uri = strings.Replace(uri, "{"+name+"}", EscapePath(value, true), -1)
+	uri = strings.Replace(uri, "{"+name+"+}", EscapePath(value, false), -1)
+	u.Path = uri
+
+	return nil
+}
+
+func buildQueryString(query url.Values, v reflect.Value, name string) error {
+	switch value := v.Interface().(type) {
+	case []*string:
+		for _, item := range value {
+			query.Add(name, *item)
+		}
+	case map[string]*string:
+		for key, item := range value {
+			query.Add(key, *item)
+		}
+	case map[string][]*string:
+		for key, items := range value {
+			for _, item := range items {
+				query.Add(key, *item)
+			}
+		}
+	default:
+		str, err := convertType(v)
+		if err == errValueNotSet {
+			return nil
+		} else if err != nil {
+			return awserr.New("SerializationError", "failed to encode REST request", err)
+		}
+		query.Set(name, str)
+	}
+
+	return nil
+}
+
+func updatePath(url *url.URL, urlPath string) {
+	scheme, query := url.Scheme, url.RawQuery
+
+	hasSlash := strings.HasSuffix(urlPath, "/")
+
+	// clean up path
+	urlPath = path.Clean(urlPath)
+	if hasSlash && !strings.HasSuffix(urlPath, "/") {
+		urlPath += "/"
+	}
+
+	// get formatted URL minus scheme so we can build this into Opaque
+	url.Scheme, url.Path, url.RawQuery = "", "", ""
+	s := url.String()
+	url.Scheme = scheme
+	url.RawQuery = query
+
+	// build opaque URI
+	url.Opaque = s + urlPath
+}
+
+// EscapePath escapes part of a URL path in Amazon style
+func EscapePath(path string, encodeSep bool) string {
+	var buf bytes.Buffer
+	for i := 0; i < len(path); i++ {
+		c := path[i]
+		if noEscape[c] || (c == '/' && !encodeSep) {
+			buf.WriteByte(c)
+		} else {
+			buf.WriteByte('%')
+			buf.WriteString(strings.ToUpper(strconv.FormatUint(uint64(c), 16)))
+		}
+	}
+	return buf.String()
+}
+
+func convertType(v reflect.Value) (string, error) {
+	v = reflect.Indirect(v)
+	if !v.IsValid() {
+		return "", errValueNotSet
+	}
+
+	var str string
+	switch value := v.Interface().(type) {
+	case string:
+		str = value
+	case []byte:
+		str = base64.StdEncoding.EncodeToString(value)
+	case bool:
+		str = strconv.FormatBool(value)
+	case int64:
+		str = strconv.FormatInt(value, 10)
+	case float64:
+		str = strconv.FormatFloat(value, 'f', -1, 64)
+	case time.Time:
+		str = value.UTC().Format(RFC822)
+	default:
+		err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
+		return "", err
+	}
+	return str, nil
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
new file mode 100644
index 0000000000..4366de2e1e
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
@@ -0,0 +1,45 @@
+package rest
+
+import "reflect"
+
+// PayloadMember returns the payload field member of i if there is one, or nil.
+func PayloadMember(i interface{}) interface{} {
+	if i == nil {
+		return nil
+	}
+
+	v := reflect.ValueOf(i).Elem()
+	if !v.IsValid() {
+		return nil
+	}
+	if field, ok := v.Type().FieldByName("_"); ok {
+		if payloadName := field.Tag.Get("payload"); payloadName != "" {
+			field, _ := v.Type().FieldByName(payloadName)
+			if field.Tag.Get("type") != "structure" {
+				return nil
+			}
+
+			payload := v.FieldByName(payloadName)
+			if payload.IsValid() || (payload.Kind() == reflect.Ptr && !payload.IsNil()) {
+				return payload.Interface()
+			}
+		}
+	}
+	return nil
+}
+
+// PayloadType returns the type of a payload field member of i if there is one, or "".
+func PayloadType(i interface{}) string {
+	v := reflect.Indirect(reflect.ValueOf(i))
+	if !v.IsValid() {
+		return ""
+	}
+	if field, ok := v.Type().FieldByName("_"); ok {
+		if payloadName := field.Tag.Get("payload"); payloadName != "" {
+			if member, ok := v.Type().FieldByName(payloadName); ok {
+				return member.Tag.Get("type")
+			}
+		}
+	}
+	return ""
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
new file mode 100644
index 0000000000..ba46f5bc9f
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
@@ -0,0 +1,193 @@
+package rest
+
+import (
+	"encoding/base64"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
+)
+
+// UnmarshalHandler is a named request handler for unmarshaling rest protocol requests
+var UnmarshalHandler = request.NamedHandler{Name: "awssdk.rest.Unmarshal", Fn: Unmarshal}
+
+// UnmarshalMetaHandler is a named request handler for unmarshaling rest protocol request metadata
+var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.rest.UnmarshalMeta", Fn: UnmarshalMeta}
+
+// Unmarshal unmarshals the REST component of a response in a REST service.
+func Unmarshal(r *request.Request) {
+	if r.DataFilled() {
+		v := reflect.Indirect(reflect.ValueOf(r.Data))
+		unmarshalBody(r, v)
+	}
+}
+
+// UnmarshalMeta unmarshals the REST metadata of a response in a REST service
+func UnmarshalMeta(r *request.Request) {
+	r.RequestID = r.HTTPResponse.Header.Get("X-Amzn-Requestid")
+	if r.RequestID == "" {
+		// Alternative version of request id in the header
+		r.RequestID = r.HTTPResponse.Header.Get("X-Amz-Request-Id")
+	}
+	if r.DataFilled() {
+		v := reflect.Indirect(reflect.ValueOf(r.Data))
+		unmarshalLocationElements(r, v)
+	}
+}
+
+func unmarshalBody(r *request.Request, v reflect.Value) {
+	if field, ok := v.Type().FieldByName("_"); ok {
+		if payloadName := field.Tag.Get("payload"); payloadName != "" {
+			pfield, _ := v.Type().FieldByName(payloadName)
+			if ptag := pfield.Tag.Get("type"); ptag != "" && ptag != "structure" {
+				payload := v.FieldByName(payloadName)
+				if payload.IsValid() {
+					switch payload.Interface().(type) {
+					case []byte:
+						b, err := ioutil.ReadAll(r.HTTPResponse.Body)
+						if err != nil {
+							r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+						} else {
+							payload.Set(reflect.ValueOf(b))
+						}
+					case *string:
+						b, err := ioutil.ReadAll(r.HTTPResponse.Body)
+						if err != nil {
+							r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+						} else {
+							str := string(b)
+							payload.Set(reflect.ValueOf(&str))
+						}
+					default:
+						switch payload.Type().String() {
+						case "io.ReadSeeker":
+							payload.Set(reflect.ValueOf(aws.ReadSeekCloser(r.HTTPResponse.Body)))
+						case "aws.ReadSeekCloser", "io.ReadCloser":
+							payload.Set(reflect.ValueOf(r.HTTPResponse.Body))
+						default:
+							r.Error = awserr.New("SerializationError",
+								"failed to decode REST response",
+								fmt.Errorf("unknown payload type %s", payload.Type()))
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+func unmarshalLocationElements(r *request.Request, v reflect.Value) {
+	for i := 0; i < v.NumField(); i++ {
+		m, field := v.Field(i), v.Type().Field(i)
+		if n := field.Name; n[0:1] == strings.ToLower(n[0:1]) {
+			continue
+		}
+
+		if m.IsValid() {
+			name := field.Tag.Get("locationName")
+			if name == "" {
+				name = field.Name
+			}
+
+			switch field.Tag.Get("location") {
+			case "statusCode":
+				unmarshalStatusCode(m, r.HTTPResponse.StatusCode)
+			case "header":
+				err := unmarshalHeader(m, r.HTTPResponse.Header.Get(name))
+				if err != nil {
+					r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+					break
+				}
+			case "headers":
+				prefix := field.Tag.Get("locationName")
+				err := unmarshalHeaderMap(m, r.HTTPResponse.Header, prefix)
+				if err != nil {
+					r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+					break
+				}
+			}
+		}
+		if r.Error != nil {
+			return
+		}
+	}
+}
+
+func unmarshalStatusCode(v reflect.Value, statusCode int) {
+	if !v.IsValid() {
+		return
+	}
+
+	switch v.Interface().(type) {
+	case *int64:
+		s := int64(statusCode)
+		v.Set(reflect.ValueOf(&s))
+	}
+}
+
+func unmarshalHeaderMap(r reflect.Value, headers http.Header, prefix string) error {
+	switch r.Interface().(type) {
+	case map[string]*string: // we only support string map value types
+		out := map[string]*string{}
+		for k, v := range headers {
+			k = http.CanonicalHeaderKey(k)
+			if strings.HasPrefix(strings.ToLower(k), strings.ToLower(prefix)) {
+				out[k[len(prefix):]] = &v[0]
+			}
+		}
+		r.Set(reflect.ValueOf(out))
+	}
+	return nil
+}
+
+func unmarshalHeader(v reflect.Value, header string) error {
+	if !v.IsValid() || (header == "" && v.Elem().Kind() != reflect.String) {
+		return nil
+	}
+
+	switch v.Interface().(type) {
+	case *string:
+		v.Set(reflect.ValueOf(&header))
+	case []byte:
+		b, err := base64.StdEncoding.DecodeString(header)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&b))
+	case *bool:
+		b, err := strconv.ParseBool(header)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&b))
+	case *int64:
+		i, err := strconv.ParseInt(header, 10, 64)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&i))
+	case *float64:
+		f, err := strconv.ParseFloat(header, 64)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&f))
+	case *time.Time:
+		t, err := time.Parse(RFC822, header)
+		if err != nil {
+			return err
+		}
+		v.Set(reflect.ValueOf(&t))
+	default:
+		err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
+		return err
+	}
+	return nil
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go b/vendor/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go
new file mode 100644
index 0000000000..244c86da05
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go
@@ -0,0 +1,82 @@
+package v4
+
+import (
+	"net/http"
+	"strings"
+)
+
+// validator houses a set of rule needed for validation of a
+// string value
+type rules []rule
+
+// rule interface allows for more flexible rules and just simply
+// checks whether or not a value adheres to that rule
+type rule interface {
+	IsValid(value string) bool
+}
+
+// IsValid will iterate through all rules and see if any rules
+// apply to the value and supports nested rules
+func (r rules) IsValid(value string) bool {
+	for _, rule := range r {
+		if rule.IsValid(value) {
+			return true
+		}
+	}
+	return false
+}
+
+// mapRule generic rule for maps
+type mapRule map[string]struct{}
+
+// IsValid for the map rule satisfies whether it exists in the map
+func (m mapRule) IsValid(value string) bool {
+	_, ok := m[value]
+	return ok
+}
+
+// whitelist is a generic rule for whitelisting
+type whitelist struct {
+	rule
+}
+
+// IsValid for whitelist checks if the value is within the whitelist
+func (w whitelist) IsValid(value string) bool {
+	return w.rule.IsValid(value)
+}
+
+// blacklist is a generic rule for blacklisting
+type blacklist struct {
+	rule
+}
+
+// IsValid for whitelist checks if the value is within the whitelist
+func (b blacklist) IsValid(value string) bool {
+	return !b.rule.IsValid(value)
+}
+
+type patterns []string
+
+// IsValid for patterns checks each pattern and returns if a match has
+// been found
+func (p patterns) IsValid(value string) bool {
+	for _, pattern := range p {
+		if strings.HasPrefix(http.CanonicalHeaderKey(value), pattern) {
+			return true
+		}
+	}
+	return false
+}
+
+// inclusiveRules rules allow for rules to depend on one another
+type inclusiveRules []rule
+
+// IsValid will return true if all rules are true
+func (r inclusiveRules) IsValid(value string) bool {
+	for _, rule := range r {
+		if !rule.IsValid(value) {
+			return false
+		}
+	}
+	return true
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/signer/v4/v4.go b/vendor/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
new file mode 100644
index 0000000000..14b0c66161
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
@@ -0,0 +1,438 @@
+// Package v4 implements signing for AWS V4 signer
+package v4
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/private/protocol/rest"
+)
+
+const (
+	authHeaderPrefix = "AWS4-HMAC-SHA256"
+	timeFormat       = "20060102T150405Z"
+	shortTimeFormat  = "20060102"
+)
+
+var ignoredHeaders = rules{
+	blacklist{
+		mapRule{
+			"Content-Length": struct{}{},
+			"User-Agent":     struct{}{},
+		},
+	},
+}
+
+// requiredSignedHeaders is a whitelist for build canonical headers.
+var requiredSignedHeaders = rules{
+	whitelist{
+		mapRule{
+			"Cache-Control":                                               struct{}{},
+			"Content-Disposition":                                         struct{}{},
+			"Content-Encoding":                                            struct{}{},
+			"Content-Language":                                            struct{}{},
+			"Content-Md5":                                                 struct{}{},
+			"Content-Type":                                                struct{}{},
+			"Expires":                                                     struct{}{},
+			"If-Match":                                                    struct{}{},
+			"If-Modified-Since":                                           struct{}{},
+			"If-None-Match":                                               struct{}{},
+			"If-Unmodified-Since":                                         struct{}{},
+			"Range":                                                       struct{}{},
+			"X-Amz-Acl":                                                   struct{}{},
+			"X-Amz-Copy-Source":                                           struct{}{},
+			"X-Amz-Copy-Source-If-Match":                                  struct{}{},
+			"X-Amz-Copy-Source-If-Modified-Since":                         struct{}{},
+			"X-Amz-Copy-Source-If-None-Match":                             struct{}{},
+			"X-Amz-Copy-Source-If-Unmodified-Since":                       struct{}{},
+			"X-Amz-Copy-Source-Range":                                     struct{}{},
+			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Algorithm": struct{}{},
+			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key":       struct{}{},
+			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key-Md5":   struct{}{},
+			"X-Amz-Grant-Full-control":                                    struct{}{},
+			"X-Amz-Grant-Read":                                            struct{}{},
+			"X-Amz-Grant-Read-Acp":                                        struct{}{},
+			"X-Amz-Grant-Write":                                           struct{}{},
+			"X-Amz-Grant-Write-Acp":                                       struct{}{},
+			"X-Amz-Metadata-Directive":                                    struct{}{},
+			"X-Amz-Mfa":                                                   struct{}{},
+			"X-Amz-Request-Payer":                                         struct{}{},
+			"X-Amz-Server-Side-Encryption":                                struct{}{},
+			"X-Amz-Server-Side-Encryption-Aws-Kms-Key-Id":                 struct{}{},
+			"X-Amz-Server-Side-Encryption-Customer-Algorithm":             struct{}{},
+			"X-Amz-Server-Side-Encryption-Customer-Key":                   struct{}{},
+			"X-Amz-Server-Side-Encryption-Customer-Key-Md5":               struct{}{},
+			"X-Amz-Storage-Class":                                         struct{}{},
+			"X-Amz-Website-Redirect-Location":                             struct{}{},
+		},
+	},
+	patterns{"X-Amz-Meta-"},
+}
+
+// allowedHoisting is a whitelist for build query headers. The boolean value
+// represents whether or not it is a pattern.
+var allowedQueryHoisting = inclusiveRules{
+	blacklist{requiredSignedHeaders},
+	patterns{"X-Amz-"},
+}
+
+type signer struct {
+	Request     *http.Request
+	Time        time.Time
+	ExpireTime  time.Duration
+	ServiceName string
+	Region      string
+	CredValues  credentials.Value
+	Credentials *credentials.Credentials
+	Query       url.Values
+	Body        io.ReadSeeker
+	Debug       aws.LogLevelType
+	Logger      aws.Logger
+
+	isPresign          bool
+	formattedTime      string
+	formattedShortTime string
+
+	signedHeaders    string
+	canonicalHeaders string
+	canonicalString  string
+	credentialString string
+	stringToSign     string
+	signature        string
+	authorization    string
+	notHoist         bool
+	signedHeaderVals http.Header
+}
+
+// Sign requests with signature version 4.
+//
+// Will sign the requests with the service config's Credentials object
+// Signing is skipped if the credentials is the credentials.AnonymousCredentials
+// object.
+func Sign(req *request.Request) {
+	// If the request does not need to be signed ignore the signing of the
+	// request if the AnonymousCredentials object is used.
+	if req.Config.Credentials == credentials.AnonymousCredentials {
+		return
+	}
+
+	region := req.ClientInfo.SigningRegion
+	if region == "" {
+		region = aws.StringValue(req.Config.Region)
+	}
+
+	name := req.ClientInfo.SigningName
+	if name == "" {
+		name = req.ClientInfo.ServiceName
+	}
+
+	s := signer{
+		Request:     req.HTTPRequest,
+		Time:        req.Time,
+		ExpireTime:  req.ExpireTime,
+		Query:       req.HTTPRequest.URL.Query(),
+		Body:        req.Body,
+		ServiceName: name,
+		Region:      region,
+		Credentials: req.Config.Credentials,
+		Debug:       req.Config.LogLevel.Value(),
+		Logger:      req.Config.Logger,
+		notHoist:    req.NotHoist,
+	}
+
+	req.Error = s.sign()
+	req.SignedHeaderVals = s.signedHeaderVals
+}
+
+func (v4 *signer) sign() error {
+	if v4.ExpireTime != 0 {
+		v4.isPresign = true
+	}
+
+	if v4.isRequestSigned() {
+		if !v4.Credentials.IsExpired() {
+			// If the request is already signed, and the credentials have not
+			// expired yet ignore the signing request.
+			return nil
+		}
+
+		// The credentials have expired for this request. The current signing
+		// is invalid, and needs to be request because the request will fail.
+		if v4.isPresign {
+			v4.removePresign()
+			// Update the request's query string to ensure the values stays in
+			// sync in the case retrieving the new credentials fails.
+			v4.Request.URL.RawQuery = v4.Query.Encode()
+		}
+	}
+
+	var err error
+	v4.CredValues, err = v4.Credentials.Get()
+	if err != nil {
+		return err
+	}
+
+	if v4.isPresign {
+		v4.Query.Set("X-Amz-Algorithm", authHeaderPrefix)
+		if v4.CredValues.SessionToken != "" {
+			v4.Query.Set("X-Amz-Security-Token", v4.CredValues.SessionToken)
+		} else {
+			v4.Query.Del("X-Amz-Security-Token")
+		}
+	} else if v4.CredValues.SessionToken != "" {
+		v4.Request.Header.Set("X-Amz-Security-Token", v4.CredValues.SessionToken)
+	}
+
+	v4.build()
+
+	if v4.Debug.Matches(aws.LogDebugWithSigning) {
+		v4.logSigningInfo()
+	}
+
+	return nil
+}
+
+const logSignInfoMsg = `DEBUG: Request Signiture:
+---[ CANONICAL STRING  ]-----------------------------
+%s
+---[ STRING TO SIGN ]--------------------------------
+%s%s
+-----------------------------------------------------`
+const logSignedURLMsg = `
+---[ SIGNED URL ]------------------------------------
+%s`
+
+func (v4 *signer) logSigningInfo() {
+	signedURLMsg := ""
+	if v4.isPresign {
+		signedURLMsg = fmt.Sprintf(logSignedURLMsg, v4.Request.URL.String())
+	}
+	msg := fmt.Sprintf(logSignInfoMsg, v4.canonicalString, v4.stringToSign, signedURLMsg)
+	v4.Logger.Log(msg)
+}
+
+func (v4 *signer) build() {
+
+	v4.buildTime()             // no depends
+	v4.buildCredentialString() // no depends
+
+	unsignedHeaders := v4.Request.Header
+	if v4.isPresign {
+		if !v4.notHoist {
+			urlValues := url.Values{}
+			urlValues, unsignedHeaders = buildQuery(allowedQueryHoisting, unsignedHeaders) // no depends
+			for k := range urlValues {
+				v4.Query[k] = urlValues[k]
+			}
+		}
+	}
+
+	v4.buildCanonicalHeaders(ignoredHeaders, unsignedHeaders)
+	v4.buildCanonicalString() // depends on canon headers / signed headers
+	v4.buildStringToSign()    // depends on canon string
+	v4.buildSignature()       // depends on string to sign
+
+	if v4.isPresign {
+		v4.Request.URL.RawQuery += "&X-Amz-Signature=" + v4.signature
+	} else {
+		parts := []string{
+			authHeaderPrefix + " Credential=" + v4.CredValues.AccessKeyID + "/" + v4.credentialString,
+			"SignedHeaders=" + v4.signedHeaders,
+			"Signature=" + v4.signature,
+		}
+		v4.Request.Header.Set("Authorization", strings.Join(parts, ", "))
+	}
+}
+
+func (v4 *signer) buildTime() {
+	v4.formattedTime = v4.Time.UTC().Format(timeFormat)
+	v4.formattedShortTime = v4.Time.UTC().Format(shortTimeFormat)
+
+	if v4.isPresign {
+		duration := int64(v4.ExpireTime / time.Second)
+		v4.Query.Set("X-Amz-Date", v4.formattedTime)
+		v4.Query.Set("X-Amz-Expires", strconv.FormatInt(duration, 10))
+	} else {
+		v4.Request.Header.Set("X-Amz-Date", v4.formattedTime)
+	}
+}
+
+func (v4 *signer) buildCredentialString() {
+	v4.credentialString = strings.Join([]string{
+		v4.formattedShortTime,
+		v4.Region,
+		v4.ServiceName,
+		"aws4_request",
+	}, "/")
+
+	if v4.isPresign {
+		v4.Query.Set("X-Amz-Credential", v4.CredValues.AccessKeyID+"/"+v4.credentialString)
+	}
+}
+
+func buildQuery(r rule, header http.Header) (url.Values, http.Header) {
+	query := url.Values{}
+	unsignedHeaders := http.Header{}
+	for k, h := range header {
+		if r.IsValid(k) {
+			query[k] = h
+		} else {
+			unsignedHeaders[k] = h
+		}
+	}
+
+	return query, unsignedHeaders
+}
+func (v4 *signer) buildCanonicalHeaders(r rule, header http.Header) {
+	var headers []string
+	headers = append(headers, "host")
+	for k, v := range header {
+		canonicalKey := http.CanonicalHeaderKey(k)
+		if !r.IsValid(canonicalKey) {
+			continue // ignored header
+		}
+
+		lowerCaseKey := strings.ToLower(k)
+		headers = append(headers, lowerCaseKey)
+
+		if v4.signedHeaderVals == nil {
+			v4.signedHeaderVals = make(http.Header)
+		}
+		v4.signedHeaderVals[lowerCaseKey] = v
+	}
+	sort.Strings(headers)
+
+	v4.signedHeaders = strings.Join(headers, ";")
+
+	if v4.isPresign {
+		v4.Query.Set("X-Amz-SignedHeaders", v4.signedHeaders)
+	}
+
+	headerValues := make([]string, len(headers))
+	for i, k := range headers {
+		if k == "host" {
+			headerValues[i] = "host:" + v4.Request.URL.Host
+		} else {
+			headerValues[i] = k + ":" +
+				strings.Join(v4.Request.Header[http.CanonicalHeaderKey(k)], ",")
+		}
+	}
+
+	v4.canonicalHeaders = strings.Join(headerValues, "\n")
+}
+
+func (v4 *signer) buildCanonicalString() {
+	v4.Request.URL.RawQuery = strings.Replace(v4.Query.Encode(), "+", "%20", -1)
+	uri := v4.Request.URL.Opaque
+	if uri != "" {
+		uri = "/" + strings.Join(strings.Split(uri, "/")[3:], "/")
+	} else {
+		uri = v4.Request.URL.Path
+	}
+	if uri == "" {
+		uri = "/"
+	}
+
+	if v4.ServiceName != "s3" {
+		uri = rest.EscapePath(uri, false)
+	}
+
+	v4.canonicalString = strings.Join([]string{
+		v4.Request.Method,
+		uri,
+		v4.Request.URL.RawQuery,
+		v4.canonicalHeaders + "\n",
+		v4.signedHeaders,
+		v4.bodyDigest(),
+	}, "\n")
+}
+
+func (v4 *signer) buildStringToSign() {
+	v4.stringToSign = strings.Join([]string{
+		authHeaderPrefix,
+		v4.formattedTime,
+		v4.credentialString,
+		hex.EncodeToString(makeSha256([]byte(v4.canonicalString))),
+	}, "\n")
+}
+
+func (v4 *signer) buildSignature() {
+	secret := v4.CredValues.SecretAccessKey
+	date := makeHmac([]byte("AWS4"+secret), []byte(v4.formattedShortTime))
+	region := makeHmac(date, []byte(v4.Region))
+	service := makeHmac(region, []byte(v4.ServiceName))
+	credentials := makeHmac(service, []byte("aws4_request"))
+	signature := makeHmac(credentials, []byte(v4.stringToSign))
+	v4.signature = hex.EncodeToString(signature)
+}
+
+func (v4 *signer) bodyDigest() string {
+	hash := v4.Request.Header.Get("X-Amz-Content-Sha256")
+	if hash == "" {
+		if v4.isPresign && v4.ServiceName == "s3" {
+			hash = "UNSIGNED-PAYLOAD"
+		} else if v4.Body == nil {
+			hash = hex.EncodeToString(makeSha256([]byte{}))
+		} else {
+			hash = hex.EncodeToString(makeSha256Reader(v4.Body))
+		}
+		v4.Request.Header.Add("X-Amz-Content-Sha256", hash)
+	}
+	return hash
+}
+
+// isRequestSigned returns if the request is currently signed or presigned
+func (v4 *signer) isRequestSigned() bool {
+	if v4.isPresign && v4.Query.Get("X-Amz-Signature") != "" {
+		return true
+	}
+	if v4.Request.Header.Get("Authorization") != "" {
+		return true
+	}
+
+	return false
+}
+
+// unsign removes signing flags for both signed and presigned requests.
+func (v4 *signer) removePresign() {
+	v4.Query.Del("X-Amz-Algorithm")
+	v4.Query.Del("X-Amz-Signature")
+	v4.Query.Del("X-Amz-Security-Token")
+	v4.Query.Del("X-Amz-Date")
+	v4.Query.Del("X-Amz-Expires")
+	v4.Query.Del("X-Amz-Credential")
+	v4.Query.Del("X-Amz-SignedHeaders")
+}
+
+func makeHmac(key []byte, data []byte) []byte {
+	hash := hmac.New(sha256.New, key)
+	hash.Write(data)
+	return hash.Sum(nil)
+}
+
+func makeSha256(data []byte) []byte {
+	hash := sha256.New()
+	hash.Write(data)
+	return hash.Sum(nil)
+}
+
+func makeSha256Reader(reader io.ReadSeeker) []byte {
+	hash := sha256.New()
+	start, _ := reader.Seek(0, 1)
+	defer reader.Seek(start, 0)
+
+	io.Copy(hash, reader)
+	return hash.Sum(nil)
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/sdk.go b/vendor/github.com/aws/aws-sdk-go/sdk.go
new file mode 100644
index 0000000000..afa465a225
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/sdk.go
@@ -0,0 +1,7 @@
+// Package sdk is the official AWS SDK for the Go programming language.
+//
+// See our Developer Guide for information for on getting started and using
+// the SDK.
+//
+// https://github.com/aws/aws-sdk-go/wiki
+package sdk
diff --git a/vendor/github.com/camlistore/go4/LICENSE b/vendor/github.com/camlistore/go4/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/github.com/camlistore/go4/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/camlistore/go4/lock/lock.go b/vendor/github.com/camlistore/go4/lock/lock.go
new file mode 100644
index 0000000000..a9fb802de6
--- /dev/null
+++ b/vendor/github.com/camlistore/go4/lock/lock.go
@@ -0,0 +1,186 @@
+/*
+Copyright 2013 The Go Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package lock is a file locking library.
+package lock
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"sync"
+)
+
+// Lock locks the given file, creating the file if necessary. If the
+// file already exists, it must have zero size or an error is returned.
+// The lock is an exclusive lock (a write lock), but locked files
+// should neither be read from nor written to. Such files should have
+// zero size and only exist to co-ordinate ownership across processes.
+//
+// A nil Closer is returned if an error occurred. Otherwise, close that
+// Closer to release the lock.
+//
+// On Linux, FreeBSD and OSX, a lock has the same semantics as fcntl(2)'s
+// advisory locks.  In particular, closing any other file descriptor for the
+// same file will release the lock prematurely.
+//
+// Attempting to lock a file that is already locked by the current process
+// has undefined behavior.
+//
+// On other operating systems, lock will fallback to using the presence and
+// content of a file named name + '.lock' to implement locking behavior.
+func Lock(name string) (io.Closer, error) {
+	abs, err := filepath.Abs(name)
+	if err != nil {
+		return nil, err
+	}
+	lockmu.Lock()
+	defer lockmu.Unlock()
+	if locked[abs] {
+		return nil, fmt.Errorf("file %q already locked", abs)
+	}
+
+	c, err := lockFn(abs)
+	if err != nil {
+		return nil, fmt.Errorf("cannot acquire lock: %v", err)
+	}
+	locked[abs] = true
+	return c, nil
+}
+
+var lockFn = lockPortable
+
+// lockPortable is a portable version not using fcntl. Doesn't handle crashes as gracefully,
+// since it can leave stale lock files.
+func lockPortable(name string) (io.Closer, error) {
+	fi, err := os.Stat(name)
+	if err == nil && fi.Size() > 0 {
+		st := portableLockStatus(name)
+		switch st {
+		case statusLocked:
+			return nil, fmt.Errorf("file %q already locked", name)
+		case statusStale:
+			os.Remove(name)
+		case statusInvalid:
+			return nil, fmt.Errorf("can't Lock file %q: has invalid contents", name)
+		}
+	}
+	f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_EXCL, 0666)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create lock file %s %v", name, err)
+	}
+	if err := json.NewEncoder(f).Encode(&pidLockMeta{OwnerPID: os.Getpid()}); err != nil {
+		return nil, fmt.Errorf("cannot write owner pid: %v", err)
+	}
+	return &unlocker{
+		f:        f,
+		abs:      name,
+		portable: true,
+	}, nil
+}
+
+type lockStatus int
+
+const (
+	statusInvalid lockStatus = iota
+	statusLocked
+	statusUnlocked
+	statusStale
+)
+
+type pidLockMeta struct {
+	OwnerPID int
+}
+
+func portableLockStatus(path string) lockStatus {
+	f, err := os.Open(path)
+	if err != nil {
+		return statusUnlocked
+	}
+	defer f.Close()
+	var meta pidLockMeta
+	if json.NewDecoder(f).Decode(&meta) != nil {
+		return statusInvalid
+	}
+	if meta.OwnerPID == 0 {
+		return statusInvalid
+	}
+	p, err := os.FindProcess(meta.OwnerPID)
+	if err != nil {
+		// e.g. on Windows
+		return statusStale
+	}
+	// On unix, os.FindProcess always is true, so we have to send
+	// it a signal to see if it's alive.
+	if signalZero != nil {
+		if p.Signal(signalZero) != nil {
+			return statusStale
+		}
+	}
+	return statusLocked
+}
+
+var signalZero os.Signal // nil or set by lock_sigzero.go
+
+var (
+	lockmu sync.Mutex
+	locked = map[string]bool{} // abs path -> true
+)
+
+type unlocker struct {
+	portable bool
+	f        *os.File
+	abs      string
+	// once guards the close method call.
+	once sync.Once
+	// err holds the error returned by Close.
+	err error
+}
+
+func (u *unlocker) Close() error {
+	u.once.Do(u.close)
+	return u.err
+}
+
+func (u *unlocker) close() {
+	lockmu.Lock()
+	defer lockmu.Unlock()
+	delete(locked, u.abs)
+
+	if u.portable {
+		// In the portable lock implementation, it's
+		// important to close before removing because
+		// Windows won't allow us to remove an open
+		// file.
+		if err := u.f.Close(); err != nil {
+			u.err = err
+		}
+		if err := os.Remove(u.abs); err != nil {
+			// Note that if both Close and Remove fail,
+			// we care more about the latter than the former
+			// so we'll return that error.
+			u.err = err
+		}
+		return
+	}
+	// In other implementatioons, it's nice for us to clean up.
+	// If we do do this, though, it needs to be before the
+	// u.f.Close below.
+	os.Remove(u.abs)
+	u.err = u.f.Close()
+}
diff --git a/vendor/github.com/camlistore/go4/lock/lock_appengine.go b/vendor/github.com/camlistore/go4/lock/lock_appengine.go
new file mode 100644
index 0000000000..ab4cad6ab6
--- /dev/null
+++ b/vendor/github.com/camlistore/go4/lock/lock_appengine.go
@@ -0,0 +1,32 @@
+// +build appengine
+
+/*
+Copyright 2013 The Go Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package lock
+
+import (
+	"errors"
+	"io"
+)
+
+func init() {
+	lockFn = lockAppEngine
+}
+
+func lockAppEngine(name string) (io.Closer, error) {
+	return nil, errors.New("Lock not available on App Engine")
+}
diff --git a/vendor/github.com/camlistore/go4/lock/lock_darwin_amd64.go b/vendor/github.com/camlistore/go4/lock/lock_darwin_amd64.go
new file mode 100644
index 0000000000..35f5787bae
--- /dev/null
+++ b/vendor/github.com/camlistore/go4/lock/lock_darwin_amd64.go
@@ -0,0 +1,67 @@
+// +build darwin,amd64
+// +build !appengine
+
+/*
+Copyright 2013 The Go Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package lock
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+func init() {
+	lockFn = lockFcntl
+}
+
+func lockFcntl(name string) (io.Closer, error) {
+	fi, err := os.Stat(name)
+	if err == nil && fi.Size() > 0 {
+		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
+	}
+
+	f, err := os.Create(name)
+	if err != nil {
+		return nil, fmt.Errorf("Lock Create of %s failed: %v", name, err)
+	}
+
+	// This type matches C's "struct flock" defined in /usr/include/sys/fcntl.h.
+	// TODO: move this into the standard syscall package.
+	k := struct {
+		Start  uint64 // sizeof(off_t): 8
+		Len    uint64 // sizeof(off_t): 8
+		Pid    uint32 // sizeof(pid_t): 4
+		Type   uint16 // sizeof(short): 2
+		Whence uint16 // sizeof(short): 2
+	}{
+		Type:   syscall.F_WRLCK,
+		Whence: uint16(os.SEEK_SET),
+		Start:  0,
+		Len:    0, // 0 means to lock the entire file.
+		Pid:    uint32(os.Getpid()),
+	}
+
+	_, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k)))
+	if errno != 0 {
+		f.Close()
+		return nil, errno
+	}
+	return &unlocker{f: f, abs: name}, nil
+}
diff --git a/vendor/github.com/camlistore/go4/lock/lock_freebsd.go b/vendor/github.com/camlistore/go4/lock/lock_freebsd.go
new file mode 100644
index 0000000000..ee2767a0a6
--- /dev/null
+++ b/vendor/github.com/camlistore/go4/lock/lock_freebsd.go
@@ -0,0 +1,66 @@
+/*
+Copyright 2013 The Go Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package lock
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+func init() {
+	lockFn = lockFcntl
+}
+
+func lockFcntl(name string) (io.Closer, error) {
+	fi, err := os.Stat(name)
+	if err == nil && fi.Size() > 0 {
+		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
+	}
+
+	f, err := os.Create(name)
+	if err != nil {
+		return nil, err
+	}
+
+	// This type matches C's "struct flock" defined in /usr/include/fcntl.h.
+	// TODO: move this into the standard syscall package.
+	k := struct {
+		Start  int64 /* off_t starting offset */
+		Len    int64 /* off_t len = 0 means until end of file */
+		Pid    int32 /* pid_t lock owner */
+		Type   int16 /* short lock type: read/write, etc. */
+		Whence int16 /* short type of l_start */
+		Sysid  int32 /* int   remote system id or zero for local */
+	}{
+		Start:  0,
+		Len:    0, // 0 means to lock the entire file.
+		Pid:    int32(os.Getpid()),
+		Type:   syscall.F_WRLCK,
+		Whence: int16(os.SEEK_SET),
+		Sysid:  0,
+	}
+
+	_, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k)))
+	if errno != 0 {
+		f.Close()
+		return nil, errno
+	}
+	return &unlocker{f: f, abs: name}, nil
+}
diff --git a/vendor/github.com/camlistore/go4/lock/lock_linux_amd64.go b/vendor/github.com/camlistore/go4/lock/lock_linux_amd64.go
new file mode 100644
index 0000000000..08b3aae921
--- /dev/null
+++ b/vendor/github.com/camlistore/go4/lock/lock_linux_amd64.go
@@ -0,0 +1,67 @@
+// +build linux,amd64
+// +build !appengine
+
+/*
+Copyright 2013 The Go Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package lock
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+func init() {
+	lockFn = lockFcntl
+}
+
+func lockFcntl(name string) (io.Closer, error) {
+	fi, err := os.Stat(name)
+	if err == nil && fi.Size() > 0 {
+		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
+	}
+
+	f, err := os.Create(name)
+	if err != nil {
+		return nil, err
+	}
+
+	// This type matches C's "struct flock" defined in /usr/include/bits/fcntl.h.
+	// TODO: move this into the standard syscall package.
+	k := struct {
+		Type   uint32
+		Whence uint32
+		Start  uint64
+		Len    uint64
+		Pid    uint32
+	}{
+		Type:   syscall.F_WRLCK,
+		Whence: uint32(os.SEEK_SET),
+		Start:  0,
+		Len:    0, // 0 means to lock the entire file.
+		Pid:    uint32(os.Getpid()),
+	}
+
+	_, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k)))
+	if errno != 0 {
+		f.Close()
+		return nil, errno
+	}
+	return &unlocker{f: f, abs: name}, nil
+}
diff --git a/vendor/github.com/camlistore/go4/lock/lock_linux_arm.go b/vendor/github.com/camlistore/go4/lock/lock_linux_arm.go
new file mode 100644
index 0000000000..ebf87bd3e7
--- /dev/null
+++ b/vendor/github.com/camlistore/go4/lock/lock_linux_arm.go
@@ -0,0 +1,68 @@
+// +build linux,arm
+// +build !appengine
+
+/*
+Copyright 2013 The Go Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package lock
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+func init() {
+	lockFn = lockFcntl
+}
+
+func lockFcntl(name string) (io.Closer, error) {
+	fi, err := os.Stat(name)
+	if err == nil && fi.Size() > 0 {
+		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
+	}
+
+	f, err := os.Create(name)
+	if err != nil {
+		return nil, err
+	}
+
+	// This type matches C's "struct flock" defined in /usr/include/bits/fcntl.h.
+	// TODO: move this into the standard syscall package.
+	k := struct {
+		Type   uint16
+		Whence uint16
+		Start  uint32
+		Len    uint32
+		Pid    uint32
+	}{
+		Type:   syscall.F_WRLCK,
+		Whence: uint16(os.SEEK_SET),
+		Start:  0,
+		Len:    0, // 0 means to lock the entire file.
+		Pid:    uint32(os.Getpid()),
+	}
+
+	const F_SETLK = 6 // actual value. syscall package is wrong: golang.org/issue/7059
+	_, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(F_SETLK), uintptr(unsafe.Pointer(&k)))
+	if errno != 0 {
+		f.Close()
+		return nil, errno
+	}
+	return &unlocker{f: f, abs: name}, nil
+}
diff --git a/vendor/github.com/camlistore/go4/lock/lock_plan9.go b/vendor/github.com/camlistore/go4/lock/lock_plan9.go
new file mode 100644
index 0000000000..d841c27d70
--- /dev/null
+++ b/vendor/github.com/camlistore/go4/lock/lock_plan9.go
@@ -0,0 +1,41 @@
+/*
+Copyright 2013 The Go Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package lock
+
+import (
+	"fmt"
+	"io"
+	"os"
+)
+
+func init() {
+	lockFn = lockPlan9
+}
+
+func lockPlan9(name string) (io.Closer, error) {
+	fi, err := os.Stat(name)
+	if err == nil && fi.Size() > 0 {
+		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
+	}
+
+	f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE, os.ModeExclusive|0644)
+	if err != nil {
+		return nil, fmt.Errorf("Lock Create of %s failed: %v", name, err)
+	}
+
+	return &unlocker{f: f, abs: name}, nil
+}
diff --git a/vendor/github.com/camlistore/go4/lock/lock_sigzero.go b/vendor/github.com/camlistore/go4/lock/lock_sigzero.go
new file mode 100644
index 0000000000..fd3ba2db19
--- /dev/null
+++ b/vendor/github.com/camlistore/go4/lock/lock_sigzero.go
@@ -0,0 +1,26 @@
+// +build !appengine
+// +build linux darwin freebsd openbsd netbsd dragonfly
+
+/*
+Copyright 2013 The Go Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package lock
+
+import "syscall"
+
+func init() {
+	signalZero = syscall.Signal(0)
+}
diff --git a/vendor/github.com/containernetworking/cni/LICENSE b/vendor/github.com/containernetworking/cni/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/args.go b/vendor/github.com/containernetworking/cni/pkg/invoke/args.go
new file mode 100644
index 0000000000..be28ba621f
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/invoke/args.go
@@ -0,0 +1,76 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"os"
+	"strings"
+)
+
+type CNIArgs interface {
+	// For use with os/exec; i.e., return nil to inherit the
+	// environment from this process
+	AsEnv() []string
+}
+
+type inherited struct{}
+
+var inheritArgsFromEnv inherited
+
+func (_ *inherited) AsEnv() []string {
+	return nil
+}
+
+func ArgsFromEnv() CNIArgs {
+	return &inheritArgsFromEnv
+}
+
+type Args struct {
+	Command       string
+	ContainerID   string
+	NetNS         string
+	PluginArgs    [][2]string
+	PluginArgsStr string
+	IfName        string
+	Path          string
+}
+
+func (args *Args) AsEnv() []string {
+	env := os.Environ()
+	pluginArgsStr := args.PluginArgsStr
+	if pluginArgsStr == "" {
+		pluginArgsStr = stringify(args.PluginArgs)
+	}
+
+	env = append(env,
+		"CNI_COMMAND="+args.Command,
+		"CNI_CONTAINERID="+args.ContainerID,
+		"CNI_NETNS="+args.NetNS,
+		"CNI_ARGS="+pluginArgsStr,
+		"CNI_IFNAME="+args.IfName,
+		"CNI_PATH="+args.Path)
+	return env
+}
+
+// taken from rkt/networking/net_plugin.go
+func stringify(pluginArgs [][2]string) string {
+	entries := make([]string, len(pluginArgs))
+
+	for i, kv := range pluginArgs {
+		entries[i] = strings.Join(kv[:], "=")
+	}
+
+	return strings.Join(entries, ";")
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/delegate.go b/vendor/github.com/containernetworking/cni/pkg/invoke/delegate.go
new file mode 100644
index 0000000000..ddf1d17274
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/invoke/delegate.go
@@ -0,0 +1,53 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+func DelegateAdd(delegatePlugin string, netconf []byte) (*types.Result, error) {
+	if os.Getenv("CNI_COMMAND") != "ADD" {
+		return nil, fmt.Errorf("CNI_COMMAND is not ADD")
+	}
+
+	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
+
+	pluginPath, err := FindInPath(delegatePlugin, paths)
+	if err != nil {
+		return nil, err
+	}
+
+	return ExecPluginWithResult(pluginPath, netconf, ArgsFromEnv())
+}
+
+func DelegateDel(delegatePlugin string, netconf []byte) error {
+	if os.Getenv("CNI_COMMAND") != "DEL" {
+		return fmt.Errorf("CNI_COMMAND is not DEL")
+	}
+
+	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
+
+	pluginPath, err := FindInPath(delegatePlugin, paths)
+	if err != nil {
+		return err
+	}
+
+	return ExecPluginWithoutResult(pluginPath, netconf, ArgsFromEnv())
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/exec.go b/vendor/github.com/containernetworking/cni/pkg/invoke/exec.go
new file mode 100644
index 0000000000..a85eede66a
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/invoke/exec.go
@@ -0,0 +1,75 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+func pluginErr(err error, output []byte) error {
+	if _, ok := err.(*exec.ExitError); ok {
+		emsg := types.Error{}
+		if perr := json.Unmarshal(output, &emsg); perr != nil {
+			return fmt.Errorf("netplugin failed but error parsing its diagnostic message %q: %v", string(output), perr)
+		}
+		details := ""
+		if emsg.Details != "" {
+			details = fmt.Sprintf("; %v", emsg.Details)
+		}
+		return fmt.Errorf("%v%v", emsg.Msg, details)
+	}
+
+	return err
+}
+
+func ExecPluginWithResult(pluginPath string, netconf []byte, args CNIArgs) (*types.Result, error) {
+	stdoutBytes, err := execPlugin(pluginPath, netconf, args)
+	if err != nil {
+		return nil, err
+	}
+
+	res := &types.Result{}
+	err = json.Unmarshal(stdoutBytes, res)
+	return res, err
+}
+
+func ExecPluginWithoutResult(pluginPath string, netconf []byte, args CNIArgs) error {
+	_, err := execPlugin(pluginPath, netconf, args)
+	return err
+}
+
+func execPlugin(pluginPath string, netconf []byte, args CNIArgs) ([]byte, error) {
+	stdout := &bytes.Buffer{}
+
+	c := exec.Cmd{
+		Env:    args.AsEnv(),
+		Path:   pluginPath,
+		Args:   []string{pluginPath},
+		Stdin:  bytes.NewBuffer(netconf),
+		Stdout: stdout,
+		Stderr: os.Stderr,
+	}
+	if err := c.Run(); err != nil {
+		return nil, pluginErr(err, stdout.Bytes())
+	}
+
+	return stdout.Bytes(), nil
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/find.go b/vendor/github.com/containernetworking/cni/pkg/invoke/find.go
new file mode 100644
index 0000000000..3b03790711
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/invoke/find.go
@@ -0,0 +1,47 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+// FindInPath returns the full path of the plugin by searching in the provided path
+func FindInPath(plugin string, paths []string) (string, error) {
+	if plugin == "" {
+		return "", fmt.Errorf("no plugin name provided")
+	}
+
+	if len(paths) == 0 {
+		return "", fmt.Errorf("no paths provided")
+	}
+
+	var fullpath string
+	for _, path := range paths {
+		full := filepath.Join(path, plugin)
+		if fi, err := os.Stat(full); err == nil && fi.Mode().IsRegular() {
+			fullpath = full
+			break
+		}
+	}
+
+	if fullpath == "" {
+		return "", fmt.Errorf("failed to find plugin %q in path %s", plugin, paths)
+	}
+
+	return fullpath, nil
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/ip/cidr.go b/vendor/github.com/containernetworking/cni/pkg/ip/cidr.go
new file mode 100644
index 0000000000..dae2c4d0e4
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/ip/cidr.go
@@ -0,0 +1,51 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"math/big"
+	"net"
+)
+
+// NextIP returns IP incremented by 1
+func NextIP(ip net.IP) net.IP {
+	i := ipToInt(ip)
+	return intToIP(i.Add(i, big.NewInt(1)))
+}
+
+// PrevIP returns IP decremented by 1
+func PrevIP(ip net.IP) net.IP {
+	i := ipToInt(ip)
+	return intToIP(i.Sub(i, big.NewInt(1)))
+}
+
+func ipToInt(ip net.IP) *big.Int {
+	if v := ip.To4(); v != nil {
+		return big.NewInt(0).SetBytes(v)
+	}
+	return big.NewInt(0).SetBytes(ip.To16())
+}
+
+func intToIP(i *big.Int) net.IP {
+	return net.IP(i.Bytes())
+}
+
+// Network masks off the host portion of the IP
+func Network(ipn *net.IPNet) *net.IPNet {
+	return &net.IPNet{
+		IP:   ipn.IP.Mask(ipn.Mask),
+		Mask: ipn.Mask,
+	}
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/ip/ipforward.go b/vendor/github.com/containernetworking/cni/pkg/ip/ipforward.go
new file mode 100644
index 0000000000..77ee74632a
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/ip/ipforward.go
@@ -0,0 +1,31 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"io/ioutil"
+)
+
+func EnableIP4Forward() error {
+	return echo1("/proc/sys/net/ipv4/ip_forward")
+}
+
+func EnableIP6Forward() error {
+	return echo1("/proc/sys/net/ipv6/conf/all/forwarding")
+}
+
+func echo1(f string) error {
+	return ioutil.WriteFile(f, []byte("1"), 0644)
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/ip/ipmasq.go b/vendor/github.com/containernetworking/cni/pkg/ip/ipmasq.go
new file mode 100644
index 0000000000..8ee279717a
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/ip/ipmasq.go
@@ -0,0 +1,66 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/coreos/go-iptables/iptables"
+)
+
+// SetupIPMasq installs iptables rules to masquerade traffic
+// coming from ipn and going outside of it
+func SetupIPMasq(ipn *net.IPNet, chain string, comment string) error {
+	ipt, err := iptables.New()
+	if err != nil {
+		return fmt.Errorf("failed to locate iptables: %v", err)
+	}
+
+	if err = ipt.NewChain("nat", chain); err != nil {
+		if err.(*iptables.Error).ExitStatus() != 1 {
+			// TODO(eyakubovich): assumes exit status 1 implies chain exists
+			return err
+		}
+	}
+
+	if err = ipt.AppendUnique("nat", chain, "-d", ipn.String(), "-j", "ACCEPT", "-m", "comment", "--comment", comment); err != nil {
+		return err
+	}
+
+	if err = ipt.AppendUnique("nat", chain, "!", "-d", "224.0.0.0/4", "-j", "MASQUERADE", "-m", "comment", "--comment", comment); err != nil {
+		return err
+	}
+
+	return ipt.AppendUnique("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment)
+}
+
+// TeardownIPMasq undoes the effects of SetupIPMasq
+func TeardownIPMasq(ipn *net.IPNet, chain string, comment string) error {
+	ipt, err := iptables.New()
+	if err != nil {
+		return fmt.Errorf("failed to locate iptables: %v", err)
+	}
+
+	if err = ipt.Delete("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment); err != nil {
+		return err
+	}
+
+	if err = ipt.ClearChain("nat", chain); err != nil {
+		return err
+	}
+
+	return ipt.DeleteChain("nat", chain)
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/ip/link.go b/vendor/github.com/containernetworking/cni/pkg/ip/link.go
new file mode 100644
index 0000000000..1b78567201
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/ip/link.go
@@ -0,0 +1,153 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"crypto/rand"
+	"fmt"
+	"net"
+	"os"
+
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/vishvananda/netlink"
+)
+
+func makeVethPair(name, peer string, mtu int) (netlink.Link, error) {
+	veth := &netlink.Veth{
+		LinkAttrs: netlink.LinkAttrs{
+			Name:  name,
+			Flags: net.FlagUp,
+			MTU:   mtu,
+		},
+		PeerName: peer,
+	}
+	if err := netlink.LinkAdd(veth); err != nil {
+		return nil, err
+	}
+
+	return veth, nil
+}
+
+func makeVeth(name string, mtu int) (peerName string, veth netlink.Link, err error) {
+	for i := 0; i < 10; i++ {
+		peerName, err = RandomVethName()
+		if err != nil {
+			return
+		}
+
+		veth, err = makeVethPair(name, peerName, mtu)
+		switch {
+		case err == nil:
+			return
+
+		case os.IsExist(err):
+			continue
+
+		default:
+			err = fmt.Errorf("failed to make veth pair: %v", err)
+			return
+		}
+	}
+
+	// should really never be hit
+	err = fmt.Errorf("failed to find a unique veth name")
+	return
+}
+
+// RandomVethName returns string "veth" with random prefix (hashed from entropy)
+func RandomVethName() (string, error) {
+	entropy := make([]byte, 4)
+	_, err := rand.Reader.Read(entropy)
+	if err != nil {
+		return "", fmt.Errorf("failed to generate random veth name: %v", err)
+	}
+
+	// NetworkManager (recent versions) will ignore veth devices that start with "veth"
+	return fmt.Sprintf("veth%x", entropy), nil
+}
+
+// SetupVeth sets up a virtual ethernet link.
+// Should be in container netns, and will switch back to hostNS to set the host
+// veth end up.
+func SetupVeth(contVethName string, mtu int, hostNS ns.NetNS) (hostVeth, contVeth netlink.Link, err error) {
+	var hostVethName string
+	hostVethName, contVeth, err = makeVeth(contVethName, mtu)
+	if err != nil {
+		return
+	}
+
+	if err = netlink.LinkSetUp(contVeth); err != nil {
+		err = fmt.Errorf("failed to set %q up: %v", contVethName, err)
+		return
+	}
+
+	hostVeth, err = netlink.LinkByName(hostVethName)
+	if err != nil {
+		err = fmt.Errorf("failed to lookup %q: %v", hostVethName, err)
+		return
+	}
+
+	if err = netlink.LinkSetNsFd(hostVeth, int(hostNS.Fd())); err != nil {
+		err = fmt.Errorf("failed to move veth to host netns: %v", err)
+		return
+	}
+
+	err = hostNS.Do(func(_ ns.NetNS) error {
+		hostVeth, err := netlink.LinkByName(hostVethName)
+		if err != nil {
+			return fmt.Errorf("failed to lookup %q in %q: %v", hostVethName, hostNS.Path(), err)
+		}
+
+		if err = netlink.LinkSetUp(hostVeth); err != nil {
+			return fmt.Errorf("failed to set %q up: %v", hostVethName, err)
+		}
+		return nil
+	})
+	return
+}
+
+// DelLinkByName removes an interface link.
+func DelLinkByName(ifName string) error {
+	iface, err := netlink.LinkByName(ifName)
+	if err != nil {
+		return fmt.Errorf("failed to lookup %q: %v", ifName, err)
+	}
+
+	if err = netlink.LinkDel(iface); err != nil {
+		return fmt.Errorf("failed to delete %q: %v", ifName, err)
+	}
+
+	return nil
+}
+
+// DelLinkByNameAddr remove an interface returns its IP address
+// of the specified family
+func DelLinkByNameAddr(ifName string, family int) (*net.IPNet, error) {
+	iface, err := netlink.LinkByName(ifName)
+	if err != nil {
+		return nil, fmt.Errorf("failed to lookup %q: %v", ifName, err)
+	}
+
+	addrs, err := netlink.AddrList(iface, family)
+	if err != nil || len(addrs) == 0 {
+		return nil, fmt.Errorf("failed to get IP addresses for %q: %v", ifName, err)
+	}
+
+	if err = netlink.LinkDel(iface); err != nil {
+		return nil, fmt.Errorf("failed to delete %q: %v", ifName, err)
+	}
+
+	return addrs[0].IPNet, nil
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/ip/route.go b/vendor/github.com/containernetworking/cni/pkg/ip/route.go
new file mode 100644
index 0000000000..6c8658b2a2
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/ip/route.go
@@ -0,0 +1,47 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ip
+
+import (
+	"net"
+
+	"github.com/vishvananda/netlink"
+)
+
+// AddDefaultRoute sets the default route on the given gateway.
+func AddDefaultRoute(gw net.IP, dev netlink.Link) error {
+	_, defNet, _ := net.ParseCIDR("0.0.0.0/0")
+	return AddRoute(defNet, gw, dev)
+}
+
+// AddRoute adds a universally-scoped route to a device.
+func AddRoute(ipn *net.IPNet, gw net.IP, dev netlink.Link) error {
+	return netlink.RouteAdd(&netlink.Route{
+		LinkIndex: dev.Attrs().Index,
+		Scope:     netlink.SCOPE_UNIVERSE,
+		Dst:       ipn,
+		Gw:        gw,
+	})
+}
+
+// AddHostRoute adds a host-scoped route to a device.
+func AddHostRoute(ipn *net.IPNet, gw net.IP, dev netlink.Link) error {
+	return netlink.RouteAdd(&netlink.Route{
+		LinkIndex: dev.Attrs().Index,
+		Scope:     netlink.SCOPE_HOST,
+		Dst:       ipn,
+		Gw:        gw,
+	})
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/ipam/ipam.go b/vendor/github.com/containernetworking/cni/pkg/ipam/ipam.go
new file mode 100644
index 0000000000..d9fbff74c7
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/ipam/ipam.go
@@ -0,0 +1,68 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ipam
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/containernetworking/cni/pkg/invoke"
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/types"
+
+	"github.com/vishvananda/netlink"
+)
+
+func ExecAdd(plugin string, netconf []byte) (*types.Result, error) {
+	return invoke.DelegateAdd(plugin, netconf)
+}
+
+func ExecDel(plugin string, netconf []byte) error {
+	return invoke.DelegateDel(plugin, netconf)
+}
+
+// ConfigureIface takes the result of IPAM plugin and
+// applies to the ifName interface
+func ConfigureIface(ifName string, res *types.Result) error {
+	link, err := netlink.LinkByName(ifName)
+	if err != nil {
+		return fmt.Errorf("failed to lookup %q: %v", ifName, err)
+	}
+
+	if err := netlink.LinkSetUp(link); err != nil {
+		return fmt.Errorf("failed to set %q UP: %v", ifName, err)
+	}
+
+	// TODO(eyakubovich): IPv6
+	addr := &netlink.Addr{IPNet: &res.IP4.IP, Label: ""}
+	if err = netlink.AddrAdd(link, addr); err != nil {
+		return fmt.Errorf("failed to add IP addr to %q: %v", ifName, err)
+	}
+
+	for _, r := range res.IP4.Routes {
+		gw := r.GW
+		if gw == nil {
+			gw = res.IP4.Gateway
+		}
+		if err = ip.AddRoute(&r.Dst, gw, link); err != nil {
+			// we skip over duplicate routes as we assume the first one wins
+			if !os.IsExist(err) {
+				return fmt.Errorf("failed to add route '%v via %v dev %v': %v", r.Dst, gw, ifName, err)
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/ns/ns.go b/vendor/github.com/containernetworking/cni/pkg/ns/ns.go
new file mode 100644
index 0000000000..e29f712ce1
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/ns/ns.go
@@ -0,0 +1,315 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ns
+
+import (
+	"crypto/rand"
+	"fmt"
+	"os"
+	"path"
+	"runtime"
+	"strings"
+	"sync"
+	"syscall"
+
+	"golang.org/x/sys/unix"
+)
+
+type NetNS interface {
+	// Executes the passed closure in this object's network namespace,
+	// attemtping to restore the original namespace before returning.
+	// However, since each OS thread can have a different network namespace,
+	// and Go's thread scheduling is highly variable, callers cannot
+	// guarantee any specific namespace is set unless operations that
+	// require that namespace are wrapped with Do().  Also, no code called
+	// from Do() should call runtime.UnlockOSThread(), or the risk
+	// of executing code in an incorrect namespace will be greater.  See
+	// https://github.com/golang/go/wiki/LockOSThread for further details.
+	Do(toRun func(NetNS) error) error
+
+	// Sets the current network namespace to this object's network namespace.
+	// Note that since Go's thread scheduling is highly variable, callers
+	// cannot guarantee the requested namespace will be the current namespace
+	// after this function is called; to ensure this wrap operations that
+	// require the namespace with Do() instead.
+	Set() error
+
+	// Returns the filesystem path representing this object's network namespace
+	Path() string
+
+	// Returns a file descriptor representing this object's network namespace
+	Fd() uintptr
+
+	// Cleans up this instance of the network namespace; if this instance
+	// is the last user the namespace will be destroyed
+	Close() error
+}
+
+type netNS struct {
+	file    *os.File
+	mounted bool
+	closed  bool
+}
+
+func getCurrentThreadNetNSPath() string {
+	// /proc/self/ns/net returns the namespace of the main thread, not
+	// of whatever thread this goroutine is running on.  Make sure we
+	// use the thread's net namespace since the thread is switching around
+	return fmt.Sprintf("/proc/%d/task/%d/ns/net", os.Getpid(), unix.Gettid())
+}
+
+// Returns an object representing the current OS thread's network namespace
+func GetCurrentNS() (NetNS, error) {
+	return GetNS(getCurrentThreadNetNSPath())
+}
+
+const (
+	// https://github.com/torvalds/linux/blob/master/include/uapi/linux/magic.h
+	NSFS_MAGIC   = 0x6e736673
+	PROCFS_MAGIC = 0x9fa0
+)
+
+type NSPathNotExistErr struct{ msg string }
+
+func (e NSPathNotExistErr) Error() string { return e.msg }
+
+type NSPathNotNSErr struct{ msg string }
+
+func (e NSPathNotNSErr) Error() string { return e.msg }
+
+func IsNSorErr(nspath string) error {
+	stat := syscall.Statfs_t{}
+	if err := syscall.Statfs(nspath, &stat); err != nil {
+		if os.IsNotExist(err) {
+			err = NSPathNotExistErr{msg: fmt.Sprintf("failed to Statfs %q: %v", nspath, err)}
+		} else {
+			err = fmt.Errorf("failed to Statfs %q: %v", nspath, err)
+		}
+		return err
+	}
+
+	switch stat.Type {
+	case PROCFS_MAGIC:
+		// Kernel < 3.19
+
+		validPathContent := "ns/"
+		validName := strings.Contains(nspath, validPathContent)
+		if !validName {
+			return NSPathNotNSErr{msg: fmt.Sprintf("path %q doesn't contain %q", nspath, validPathContent)}
+		}
+
+		return nil
+	case NSFS_MAGIC:
+		// Kernel >= 3.19
+
+		return nil
+	default:
+		return NSPathNotNSErr{msg: fmt.Sprintf("unknown FS magic on %q: %x", nspath, stat.Type)}
+	}
+}
+
+// Returns an object representing the namespace referred to by @path
+func GetNS(nspath string) (NetNS, error) {
+	err := IsNSorErr(nspath)
+	if err != nil {
+		return nil, err
+	}
+
+	fd, err := os.Open(nspath)
+	if err != nil {
+		return nil, err
+	}
+
+	return &netNS{file: fd}, nil
+}
+
+// Creates a new persistent network namespace and returns an object
+// representing that namespace, without switching to it
+func NewNS() (NetNS, error) {
+	const nsRunDir = "/var/run/netns"
+
+	b := make([]byte, 16)
+	_, err := rand.Reader.Read(b)
+	if err != nil {
+		return nil, fmt.Errorf("failed to generate random netns name: %v", err)
+	}
+
+	err = os.MkdirAll(nsRunDir, 0755)
+	if err != nil {
+		return nil, err
+	}
+
+	// create an empty file at the mount point
+	nsName := fmt.Sprintf("cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
+	nsPath := path.Join(nsRunDir, nsName)
+	mountPointFd, err := os.Create(nsPath)
+	if err != nil {
+		return nil, err
+	}
+	mountPointFd.Close()
+
+	// Ensure the mount point is cleaned up on errors; if the namespace
+	// was successfully mounted this will have no effect because the file
+	// is in-use
+	defer os.RemoveAll(nsPath)
+
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	// do namespace work in a dedicated goroutine, so that we can safely
+	// Lock/Unlock OSThread without upsetting the lock/unlock state of
+	// the caller of this function
+	var fd *os.File
+	go (func() {
+		defer wg.Done()
+		runtime.LockOSThread()
+
+		var origNS NetNS
+		origNS, err = GetNS(getCurrentThreadNetNSPath())
+		if err != nil {
+			return
+		}
+		defer origNS.Close()
+
+		// create a new netns on the current thread
+		err = unix.Unshare(unix.CLONE_NEWNET)
+		if err != nil {
+			return
+		}
+		defer origNS.Set()
+
+		// bind mount the new netns from the current thread onto the mount point
+		err = unix.Mount(getCurrentThreadNetNSPath(), nsPath, "none", unix.MS_BIND, "")
+		if err != nil {
+			return
+		}
+
+		fd, err = os.Open(nsPath)
+		if err != nil {
+			return
+		}
+	})()
+	wg.Wait()
+
+	if err != nil {
+		unix.Unmount(nsPath, unix.MNT_DETACH)
+		return nil, fmt.Errorf("failed to create namespace: %v", err)
+	}
+
+	return &netNS{file: fd, mounted: true}, nil
+}
+
+func (ns *netNS) Path() string {
+	return ns.file.Name()
+}
+
+func (ns *netNS) Fd() uintptr {
+	return ns.file.Fd()
+}
+
+func (ns *netNS) errorIfClosed() error {
+	if ns.closed {
+		return fmt.Errorf("%q has already been closed", ns.file.Name())
+	}
+	return nil
+}
+
+func (ns *netNS) Close() error {
+	if err := ns.errorIfClosed(); err != nil {
+		return err
+	}
+
+	if err := ns.file.Close(); err != nil {
+		return fmt.Errorf("Failed to close %q: %v", ns.file.Name(), err)
+	}
+	ns.closed = true
+
+	if ns.mounted {
+		if err := unix.Unmount(ns.file.Name(), unix.MNT_DETACH); err != nil {
+			return fmt.Errorf("Failed to unmount namespace %s: %v", ns.file.Name(), err)
+		}
+		if err := os.RemoveAll(ns.file.Name()); err != nil {
+			return fmt.Errorf("Failed to clean up namespace %s: %v", ns.file.Name(), err)
+		}
+		ns.mounted = false
+	}
+
+	return nil
+}
+
+func (ns *netNS) Do(toRun func(NetNS) error) error {
+	if err := ns.errorIfClosed(); err != nil {
+		return err
+	}
+
+	containedCall := func(hostNS NetNS) error {
+		threadNS, err := GetNS(getCurrentThreadNetNSPath())
+		if err != nil {
+			return fmt.Errorf("failed to open current netns: %v", err)
+		}
+		defer threadNS.Close()
+
+		// switch to target namespace
+		if err = ns.Set(); err != nil {
+			return fmt.Errorf("error switching to ns %v: %v", ns.file.Name(), err)
+		}
+		defer threadNS.Set() // switch back
+
+		return toRun(hostNS)
+	}
+
+	// save a handle to current network namespace
+	hostNS, err := GetNS(getCurrentThreadNetNSPath())
+	if err != nil {
+		return fmt.Errorf("Failed to open current namespace: %v", err)
+	}
+	defer hostNS.Close()
+
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	var innerError error
+	go func() {
+		defer wg.Done()
+		runtime.LockOSThread()
+		innerError = containedCall(hostNS)
+	}()
+	wg.Wait()
+
+	return innerError
+}
+
+func (ns *netNS) Set() error {
+	if err := ns.errorIfClosed(); err != nil {
+		return err
+	}
+
+	if _, _, err := unix.Syscall(unix.SYS_SETNS, ns.Fd(), uintptr(unix.CLONE_NEWNET), 0); err != 0 {
+		return fmt.Errorf("Error switching to ns %v: %v", ns.file.Name(), err)
+	}
+
+	return nil
+}
+
+// WithNetNSPath executes the passed closure under the given network
+// namespace, restoring the original namespace afterwards.
+func WithNetNSPath(nspath string, toRun func(NetNS) error) error {
+	ns, err := GetNS(nspath)
+	if err != nil {
+		return err
+	}
+	defer ns.Close()
+	return ns.Do(toRun)
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/skel/skel.go b/vendor/github.com/containernetworking/cni/pkg/skel/skel.go
new file mode 100644
index 0000000000..9cf03917b4
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/skel/skel.go
@@ -0,0 +1,161 @@
+// Copyright 2014 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package skel provides skeleton code for a CNI plugin.
+// In particular, it implements argument parsing and validation.
+package skel
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+// CmdArgs captures all the arguments passed in to the plugin
+// via both env vars and stdin
+type CmdArgs struct {
+	ContainerID string
+	Netns       string
+	IfName      string
+	Args        string
+	Path        string
+	StdinData   []byte
+}
+
+type reqForCmdEntry map[string]bool
+
+// PluginMain is the "main" for a plugin. It accepts
+// two callback functions for add and del commands.
+func PluginMain(cmdAdd, cmdDel func(_ *CmdArgs) error) {
+	var cmd, contID, netns, ifName, args, path string
+
+	vars := []struct {
+		name      string
+		val       *string
+		reqForCmd reqForCmdEntry
+	}{
+		{
+			"CNI_COMMAND",
+			&cmd,
+			reqForCmdEntry{
+				"ADD": true,
+				"DEL": true,
+			},
+		},
+		{
+			"CNI_CONTAINERID",
+			&contID,
+			reqForCmdEntry{
+				"ADD": false,
+				"DEL": false,
+			},
+		},
+		{
+			"CNI_NETNS",
+			&netns,
+			reqForCmdEntry{
+				"ADD": true,
+				"DEL": false,
+			},
+		},
+		{
+			"CNI_IFNAME",
+			&ifName,
+			reqForCmdEntry{
+				"ADD": true,
+				"DEL": true,
+			},
+		},
+		{
+			"CNI_ARGS",
+			&args,
+			reqForCmdEntry{
+				"ADD": false,
+				"DEL": false,
+			},
+		},
+		{
+			"CNI_PATH",
+			&path,
+			reqForCmdEntry{
+				"ADD": true,
+				"DEL": true,
+			},
+		},
+	}
+
+	argsMissing := false
+	for _, v := range vars {
+		*v.val = os.Getenv(v.name)
+		if v.reqForCmd[cmd] && *v.val == "" {
+			log.Printf("%v env variable missing", v.name)
+			argsMissing = true
+		}
+	}
+
+	if argsMissing {
+		dieMsg("required env variables missing")
+	}
+
+	stdinData, err := ioutil.ReadAll(os.Stdin)
+	if err != nil {
+		dieMsg("error reading from stdin: %v", err)
+	}
+
+	cmdArgs := &CmdArgs{
+		ContainerID: contID,
+		Netns:       netns,
+		IfName:      ifName,
+		Args:        args,
+		Path:        path,
+		StdinData:   stdinData,
+	}
+
+	switch cmd {
+	case "ADD":
+		err = cmdAdd(cmdArgs)
+
+	case "DEL":
+		err = cmdDel(cmdArgs)
+
+	default:
+		dieMsg("unknown CNI_COMMAND: %v", cmd)
+	}
+
+	if err != nil {
+		if e, ok := err.(*types.Error); ok {
+			// don't wrap Error in Error
+			dieErr(e)
+		}
+		dieMsg(err.Error())
+	}
+}
+
+func dieMsg(f string, args ...interface{}) {
+	e := &types.Error{
+		Code: 100,
+		Msg:  fmt.Sprintf(f, args...),
+	}
+	dieErr(e)
+}
+
+func dieErr(e *types.Error) {
+	if err := e.Print(); err != nil {
+		log.Print("Error writing error JSON to stdout: ", err)
+	}
+	os.Exit(1)
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/testutils/cmd.go b/vendor/github.com/containernetworking/cni/pkg/testutils/cmd.go
new file mode 100644
index 0000000000..201b935f40
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/testutils/cmd.go
@@ -0,0 +1,77 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package testutils
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"os"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+func envCleanup() {
+	os.Unsetenv("CNI_COMMAND")
+	os.Unsetenv("CNI_PATH")
+	os.Unsetenv("CNI_NETNS")
+	os.Unsetenv("CNI_IFNAME")
+}
+
+func CmdAddWithResult(cniNetns, cniIfname string, f func() error) (*types.Result, error) {
+	os.Setenv("CNI_COMMAND", "ADD")
+	os.Setenv("CNI_PATH", os.Getenv("PATH"))
+	os.Setenv("CNI_NETNS", cniNetns)
+	os.Setenv("CNI_IFNAME", cniIfname)
+	defer envCleanup()
+
+	// Redirect stdout to capture plugin result
+	oldStdout := os.Stdout
+	r, w, err := os.Pipe()
+	if err != nil {
+		return nil, err
+	}
+
+	os.Stdout = w
+	err = f()
+	w.Close()
+	if err != nil {
+		return nil, err
+	}
+
+	// parse the result
+	out, err := ioutil.ReadAll(r)
+	os.Stdout = oldStdout
+	if err != nil {
+		return nil, err
+	}
+
+	result := types.Result{}
+	err = json.Unmarshal(out, &result)
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func CmdDelWithResult(cniNetns, cniIfname string, f func() error) error {
+	os.Setenv("CNI_COMMAND", "DEL")
+	os.Setenv("CNI_PATH", os.Getenv("PATH"))
+	os.Setenv("CNI_NETNS", cniNetns)
+	os.Setenv("CNI_IFNAME", cniIfname)
+	defer envCleanup()
+
+	return f()
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/types/args.go b/vendor/github.com/containernetworking/cni/pkg/types/args.go
new file mode 100644
index 0000000000..3b667b0f20
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/types/args.go
@@ -0,0 +1,91 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// UnmarshallableBool typedef for builtin bool
+// because builtin type's methods can't be declared
+type UnmarshallableBool bool
+
+// UnmarshalText implements the encoding.TextUnmarshaler interface.
+// Returns boolean true if the string is "1" or "[Tt]rue"
+// Returns boolean false if the string is "0" or "[Ff]alse"
+func (b *UnmarshallableBool) UnmarshalText(data []byte) error {
+	s := strings.ToLower(string(data))
+	switch s {
+	case "1", "true":
+		*b = true
+	case "0", "false":
+		*b = false
+	default:
+		return fmt.Errorf("Boolean unmarshal error: invalid input %s", s)
+	}
+	return nil
+}
+
+// CommonArgs contains the IgnoreUnknown argument
+// and must be embedded by all Arg structs
+type CommonArgs struct {
+	IgnoreUnknown UnmarshallableBool `json:"ignoreunknown,omitempty"`
+}
+
+// GetKeyField is a helper function to receive Values
+// Values that represent a pointer to a struct
+func GetKeyField(keyString string, v reflect.Value) reflect.Value {
+	return v.Elem().FieldByName(keyString)
+}
+
+// LoadArgs parses args from a string in the form "K=V;K2=V2;..."
+func LoadArgs(args string, container interface{}) error {
+	if args == "" {
+		return nil
+	}
+
+	containerValue := reflect.ValueOf(container)
+
+	pairs := strings.Split(args, ";")
+	unknownArgs := []string{}
+	for _, pair := range pairs {
+		kv := strings.Split(pair, "=")
+		if len(kv) != 2 {
+			return fmt.Errorf("ARGS: invalid pair %q", pair)
+		}
+		keyString := kv[0]
+		valueString := kv[1]
+		keyField := GetKeyField(keyString, containerValue)
+		if !keyField.IsValid() {
+			unknownArgs = append(unknownArgs, pair)
+			continue
+		}
+
+		u := keyField.Addr().Interface().(encoding.TextUnmarshaler)
+		err := u.UnmarshalText([]byte(valueString))
+		if err != nil {
+			return fmt.Errorf("ARGS: error parsing value of pair %q: %v)", pair, err)
+		}
+	}
+
+	isIgnoreUnknown := GetKeyField("IgnoreUnknown", containerValue).Bool()
+	if len(unknownArgs) > 0 && !isIgnoreUnknown {
+		return fmt.Errorf("ARGS: unknown args %q", unknownArgs)
+	}
+	return nil
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/types/types.go b/vendor/github.com/containernetworking/cni/pkg/types/types.go
new file mode 100644
index 0000000000..6948dcb1fb
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/types/types.go
@@ -0,0 +1,191 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+	"net"
+	"os"
+)
+
+// like net.IPNet but adds JSON marshalling and unmarshalling
+type IPNet net.IPNet
+
+// ParseCIDR takes a string like "10.2.3.1/24" and
+// return IPNet with "10.2.3.1" and /24 mask
+func ParseCIDR(s string) (*net.IPNet, error) {
+	ip, ipn, err := net.ParseCIDR(s)
+	if err != nil {
+		return nil, err
+	}
+
+	ipn.IP = ip
+	return ipn, nil
+}
+
+func (n IPNet) MarshalJSON() ([]byte, error) {
+	return json.Marshal((*net.IPNet)(&n).String())
+}
+
+func (n *IPNet) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+
+	tmp, err := ParseCIDR(s)
+	if err != nil {
+		return err
+	}
+
+	*n = IPNet(*tmp)
+	return nil
+}
+
+// NetConf describes a network.
+type NetConf struct {
+	Name string `json:"name,omitempty"`
+	Type string `json:"type,omitempty"`
+	IPAM struct {
+		Type string `json:"type,omitempty"`
+	} `json:"ipam,omitempty"`
+	DNS DNS `json:"dns"`
+}
+
+// Result is what gets returned from the plugin (via stdout) to the caller
+type Result struct {
+	IP4 *IPConfig `json:"ip4,omitempty"`
+	IP6 *IPConfig `json:"ip6,omitempty"`
+	DNS DNS       `json:"dns,omitempty"`
+}
+
+func (r *Result) Print() error {
+	return prettyPrint(r)
+}
+
+// String returns a formatted string in the form of "[IP4: $1,][ IP6: $2,] DNS: $3" where
+// $1 represents the receiver's IPv4, $2 represents the receiver's IPv6 and $3 the
+// receiver's DNS. If $1 or $2 are nil, they won't be present in the returned string.
+func (r *Result) String() string {
+	var str string
+	if r.IP4 != nil {
+		str = fmt.Sprintf("IP4:%+v, ", *r.IP4)
+	}
+	if r.IP6 != nil {
+		str += fmt.Sprintf("IP6:%+v, ", *r.IP6)
+	}
+	return fmt.Sprintf("%sDNS:%+v", str, r.DNS)
+}
+
+// IPConfig contains values necessary to configure an interface
+type IPConfig struct {
+	IP      net.IPNet
+	Gateway net.IP
+	Routes  []Route
+}
+
+// DNS contains values interesting for DNS resolvers
+type DNS struct {
+	Nameservers []string `json:"nameservers,omitempty"`
+	Domain      string   `json:"domain,omitempty"`
+	Search      []string `json:"search,omitempty"`
+	Options     []string `json:"options,omitempty"`
+}
+
+type Route struct {
+	Dst net.IPNet
+	GW  net.IP
+}
+
+type Error struct {
+	Code    uint   `json:"code"`
+	Msg     string `json:"msg"`
+	Details string `json:"details,omitempty"`
+}
+
+func (e *Error) Error() string {
+	return e.Msg
+}
+
+func (e *Error) Print() error {
+	return prettyPrint(e)
+}
+
+// net.IPNet is not JSON (un)marshallable so this duality is needed
+// for our custom IPNet type
+
+// JSON (un)marshallable types
+type ipConfig struct {
+	IP      IPNet   `json:"ip"`
+	Gateway net.IP  `json:"gateway,omitempty"`
+	Routes  []Route `json:"routes,omitempty"`
+}
+
+type route struct {
+	Dst IPNet  `json:"dst"`
+	GW  net.IP `json:"gw,omitempty"`
+}
+
+func (c *IPConfig) MarshalJSON() ([]byte, error) {
+	ipc := ipConfig{
+		IP:      IPNet(c.IP),
+		Gateway: c.Gateway,
+		Routes:  c.Routes,
+	}
+
+	return json.Marshal(ipc)
+}
+
+func (c *IPConfig) UnmarshalJSON(data []byte) error {
+	ipc := ipConfig{}
+	if err := json.Unmarshal(data, &ipc); err != nil {
+		return err
+	}
+
+	c.IP = net.IPNet(ipc.IP)
+	c.Gateway = ipc.Gateway
+	c.Routes = ipc.Routes
+	return nil
+}
+
+func (r *Route) UnmarshalJSON(data []byte) error {
+	rt := route{}
+	if err := json.Unmarshal(data, &rt); err != nil {
+		return err
+	}
+
+	r.Dst = net.IPNet(rt.Dst)
+	r.GW = rt.GW
+	return nil
+}
+
+func (r *Route) MarshalJSON() ([]byte, error) {
+	rt := route{
+		Dst: IPNet(r.Dst),
+		GW:  r.GW,
+	}
+
+	return json.Marshal(rt)
+}
+
+func prettyPrint(obj interface{}) error {
+	data, err := json.MarshalIndent(obj, "", "    ")
+	if err != nil {
+		return err
+	}
+	_, err = os.Stdout.Write(data)
+	return err
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go b/vendor/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go
new file mode 100644
index 0000000000..c0fba38290
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go
@@ -0,0 +1,58 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// build +linux
+
+package sysctl
+
+import (
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"strings"
+)
+
+// Sysctl provides a method to set/get values from /proc/sys - in linux systems
+// new interface to set/get values of variables formerly handled by sysctl syscall
+// If optional `params` have only one string value - this function will
+// set this value into coresponding sysctl variable
+func Sysctl(name string, params ...string) (string, error) {
+	if len(params) > 1 {
+		return "", fmt.Errorf("unexcepted additional parameters")
+	} else if len(params) == 1 {
+		return setSysctl(name, params[0])
+	}
+	return getSysctl(name)
+}
+
+func getSysctl(name string) (string, error) {
+	fullName := filepath.Join("/proc/sys", strings.Replace(name, ".", "/", -1))
+	fullName = filepath.Clean(fullName)
+	data, err := ioutil.ReadFile(fullName)
+	if err != nil {
+		return "", err
+	}
+
+	return string(data[:len(data)-1]), nil
+}
+
+func setSysctl(name, value string) (string, error) {
+	fullName := filepath.Join("/proc/sys", strings.Replace(name, ".", "/", -1))
+	fullName = filepath.Clean(fullName)
+	if err := ioutil.WriteFile(fullName, []byte(value), 0644); err != nil {
+		return "", err
+	}
+
+	return getSysctl(name)
+}
diff --git a/vendor/github.com/containernetworking/cni/pkg/utils/utils.go b/vendor/github.com/containernetworking/cni/pkg/utils/utils.go
new file mode 100644
index 0000000000..33a2aa7960
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/pkg/utils/utils.go
@@ -0,0 +1,41 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package utils
+
+import (
+	"crypto/sha512"
+	"fmt"
+)
+
+const (
+	maxChainLength = 28
+	chainPrefix    = "CNI-"
+	prefixLength   = len(chainPrefix)
+)
+
+// Generates a chain name to be used with iptables.
+// Ensures that the generated chain name is exactly
+// maxChainLength chars in length
+func FormatChainName(name string, id string) string {
+	chainBytes := sha512.Sum512([]byte(name + id))
+	chain := fmt.Sprintf("%s%x", chainPrefix, chainBytes)
+	return chain[:maxChainLength]
+}
+
+// FormatComment returns a comment used for easier
+// rule identification within iptables.
+func FormatComment(name string, id string) string {
+	return fmt.Sprintf("name: %q id: %q", name, id)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go b/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go
new file mode 100644
index 0000000000..2386f9a9f4
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go
@@ -0,0 +1,157 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"log"
+	"net"
+	"net/http"
+	"net/rpc"
+	"os"
+	"path/filepath"
+	"runtime"
+	"sync"
+
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/coreos/go-systemd/activation"
+)
+
+const listenFdsStart = 3
+const resendCount = 3
+
+var errNoMoreTries = errors.New("no more tries")
+
+type DHCP struct {
+	mux    sync.Mutex
+	leases map[string]*DHCPLease
+}
+
+func newDHCP() *DHCP {
+	return &DHCP{
+		leases: make(map[string]*DHCPLease),
+	}
+}
+
+// Allocate acquires an IP from a DHCP server for a specified container.
+// The acquired lease will be maintained until Release() is called.
+func (d *DHCP) Allocate(args *skel.CmdArgs, result *types.Result) error {
+	conf := types.NetConf{}
+	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
+		return fmt.Errorf("error parsing netconf: %v", err)
+	}
+
+	clientID := args.ContainerID + "/" + conf.Name
+	l, err := AcquireLease(clientID, args.Netns, args.IfName)
+	if err != nil {
+		return err
+	}
+
+	ipn, err := l.IPNet()
+	if err != nil {
+		l.Stop()
+		return err
+	}
+
+	d.setLease(args.ContainerID, conf.Name, l)
+
+	result.IP4 = &types.IPConfig{
+		IP:      *ipn,
+		Gateway: l.Gateway(),
+		Routes:  l.Routes(),
+	}
+
+	return nil
+}
+
+// Release stops maintenance of the lease acquired in Allocate()
+// and sends a release msg to the DHCP server.
+func (d *DHCP) Release(args *skel.CmdArgs, reply *struct{}) error {
+	conf := types.NetConf{}
+	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
+		return fmt.Errorf("error parsing netconf: %v", err)
+	}
+
+	if l := d.getLease(args.ContainerID, conf.Name); l != nil {
+		l.Stop()
+		return nil
+	}
+
+	return fmt.Errorf("lease not found: %v/%v", args.ContainerID, conf.Name)
+}
+
+func (d *DHCP) getLease(contID, netName string) *DHCPLease {
+	d.mux.Lock()
+	defer d.mux.Unlock()
+
+	// TODO(eyakubovich): hash it to avoid collisions
+	l, ok := d.leases[contID+netName]
+	if !ok {
+		return nil
+	}
+	return l
+}
+
+func (d *DHCP) setLease(contID, netName string, l *DHCPLease) {
+	d.mux.Lock()
+	defer d.mux.Unlock()
+
+	// TODO(eyakubovich): hash it to avoid collisions
+	d.leases[contID+netName] = l
+}
+
+func getListener() (net.Listener, error) {
+	l, err := activation.Listeners(true)
+	if err != nil {
+		return nil, err
+	}
+
+	switch {
+	case len(l) == 0:
+		if err := os.MkdirAll(filepath.Dir(socketPath), 0700); err != nil {
+			return nil, err
+		}
+		return net.Listen("unix", socketPath)
+
+	case len(l) == 1:
+		if l[0] == nil {
+			return nil, fmt.Errorf("LISTEN_FDS=1 but no FD found")
+		}
+		return l[0], nil
+
+	default:
+		return nil, fmt.Errorf("Too many (%v) FDs passed through socket activation", len(l))
+	}
+}
+
+func runDaemon() {
+	// since other goroutines (on separate threads) will change namespaces,
+	// ensure the RPC server does not get scheduled onto those
+	runtime.LockOSThread()
+
+	l, err := getListener()
+	if err != nil {
+		log.Printf("Error getting listener: %v", err)
+		return
+	}
+
+	dhcp := newDHCP()
+	rpc.Register(dhcp)
+	rpc.HandleHTTP()
+	http.Serve(l, nil)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go b/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go
new file mode 100644
index 0000000000..eb2b403130
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go
@@ -0,0 +1,337 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"math/rand"
+	"net"
+	"sync"
+	"time"
+
+	"github.com/d2g/dhcp4"
+	"github.com/d2g/dhcp4client"
+	"github.com/vishvananda/netlink"
+
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+// RFC 2131 suggests using exponential backoff, starting with 4sec
+// and randomized to +/- 1sec
+const resendDelay0 = 4 * time.Second
+const resendDelayMax = 32 * time.Second
+
+const (
+	leaseStateBound = iota
+	leaseStateRenewing
+	leaseStateRebinding
+)
+
+// This implementation uses 1 OS thread per lease. This is because
+// all the network operations have to be done in network namespace
+// of the interface. This can be improved by switching to the proper
+// namespace for network ops and using fewer threads. However, this
+// needs to be done carefully as dhcp4client ops are blocking.
+
+type DHCPLease struct {
+	clientID      string
+	ack           *dhcp4.Packet
+	opts          dhcp4.Options
+	link          netlink.Link
+	renewalTime   time.Time
+	rebindingTime time.Time
+	expireTime    time.Time
+	stop          chan struct{}
+	wg            sync.WaitGroup
+}
+
+// AcquireLease gets an DHCP lease and then maintains it in the background
+// by periodically renewing it. The acquired lease can be released by
+// calling DHCPLease.Stop()
+func AcquireLease(clientID, netns, ifName string) (*DHCPLease, error) {
+	errCh := make(chan error, 1)
+	l := &DHCPLease{
+		clientID: clientID,
+		stop:     make(chan struct{}),
+	}
+
+	log.Printf("%v: acquiring lease", clientID)
+
+	l.wg.Add(1)
+	go func() {
+		errCh <- ns.WithNetNSPath(netns, func(_ ns.NetNS) error {
+			defer l.wg.Done()
+
+			link, err := netlink.LinkByName(ifName)
+			if err != nil {
+				return fmt.Errorf("error looking up %q: %v", ifName, err)
+			}
+
+			l.link = link
+
+			if err = l.acquire(); err != nil {
+				return err
+			}
+
+			log.Printf("%v: lease acquired, expiration is %v", l.clientID, l.expireTime)
+
+			errCh <- nil
+
+			l.maintain()
+			return nil
+		})
+	}()
+
+	if err := <-errCh; err != nil {
+		return nil, err
+	}
+
+	return l, nil
+}
+
+// Stop terminates the background task that maintains the lease
+// and issues a DHCP Release
+func (l *DHCPLease) Stop() {
+	close(l.stop)
+	l.wg.Wait()
+}
+
+func (l *DHCPLease) acquire() error {
+	c, err := newDHCPClient(l.link)
+	if err != nil {
+		return err
+	}
+	defer c.Close()
+
+	if (l.link.Attrs().Flags & net.FlagUp) != net.FlagUp {
+		log.Printf("Link %q down. Attempting to set up", l.link.Attrs().Name)
+		if err = netlink.LinkSetUp(l.link); err != nil {
+			return err
+		}
+	}
+
+	pkt, err := backoffRetry(func() (*dhcp4.Packet, error) {
+		ok, ack, err := c.Request()
+		switch {
+		case err != nil:
+			return nil, err
+		case !ok:
+			return nil, fmt.Errorf("DHCP server NACK'd own offer")
+		default:
+			return &ack, nil
+		}
+	})
+	if err != nil {
+		return err
+	}
+
+	return l.commit(pkt)
+}
+
+func (l *DHCPLease) commit(ack *dhcp4.Packet) error {
+	opts := ack.ParseOptions()
+
+	leaseTime, err := parseLeaseTime(opts)
+	if err != nil {
+		return err
+	}
+
+	rebindingTime, err := parseRebindingTime(opts)
+	if err != nil || rebindingTime > leaseTime {
+		// Per RFC 2131 Section 4.4.5, it should default to 85% of lease time
+		rebindingTime = leaseTime * 85 / 100
+	}
+
+	renewalTime, err := parseRenewalTime(opts)
+	if err != nil || renewalTime > rebindingTime {
+		// Per RFC 2131 Section 4.4.5, it should default to 50% of lease time
+		renewalTime = leaseTime / 2
+	}
+
+	now := time.Now()
+	l.expireTime = now.Add(leaseTime)
+	l.renewalTime = now.Add(renewalTime)
+	l.rebindingTime = now.Add(rebindingTime)
+	l.ack = ack
+	l.opts = opts
+
+	return nil
+}
+
+func (l *DHCPLease) maintain() {
+	state := leaseStateBound
+
+	for {
+		var sleepDur time.Duration
+
+		switch state {
+		case leaseStateBound:
+			sleepDur = l.renewalTime.Sub(time.Now())
+			if sleepDur <= 0 {
+				log.Printf("%v: renewing lease", l.clientID)
+				state = leaseStateRenewing
+				continue
+			}
+
+		case leaseStateRenewing:
+			if err := l.renew(); err != nil {
+				log.Printf("%v: %v", l.clientID, err)
+
+				if time.Now().After(l.rebindingTime) {
+					log.Printf("%v: renawal time expired, rebinding", l.clientID)
+					state = leaseStateRebinding
+				}
+			} else {
+				log.Printf("%v: lease renewed, expiration is %v", l.clientID, l.expireTime)
+				state = leaseStateBound
+			}
+
+		case leaseStateRebinding:
+			if err := l.acquire(); err != nil {
+				log.Printf("%v: %v", l.clientID, err)
+
+				if time.Now().After(l.expireTime) {
+					log.Printf("%v: lease expired, bringing interface DOWN", l.clientID)
+					l.downIface()
+					return
+				}
+			} else {
+				log.Printf("%v: lease rebound, expiration is %v", l.clientID, l.expireTime)
+				state = leaseStateBound
+			}
+		}
+
+		select {
+		case <-time.After(sleepDur):
+
+		case <-l.stop:
+			if err := l.release(); err != nil {
+				log.Printf("%v: failed to release DHCP lease: %v", l.clientID, err)
+			}
+			return
+		}
+	}
+}
+
+func (l *DHCPLease) downIface() {
+	if err := netlink.LinkSetDown(l.link); err != nil {
+		log.Printf("%v: failed to bring %v interface DOWN: %v", l.clientID, l.link.Attrs().Name, err)
+	}
+}
+
+func (l *DHCPLease) renew() error {
+	c, err := newDHCPClient(l.link)
+	if err != nil {
+		return err
+	}
+	defer c.Close()
+
+	pkt, err := backoffRetry(func() (*dhcp4.Packet, error) {
+		ok, ack, err := c.Renew(*l.ack)
+		switch {
+		case err != nil:
+			return nil, err
+		case !ok:
+			return nil, fmt.Errorf("DHCP server did not renew lease")
+		default:
+			return &ack, nil
+		}
+	})
+	if err != nil {
+		return err
+	}
+
+	l.commit(pkt)
+	return nil
+}
+
+func (l *DHCPLease) release() error {
+	log.Printf("%v: releasing lease", l.clientID)
+
+	c, err := newDHCPClient(l.link)
+	if err != nil {
+		return err
+	}
+	defer c.Close()
+
+	if err = c.Release(*l.ack); err != nil {
+		return fmt.Errorf("failed to send DHCPRELEASE")
+	}
+
+	return nil
+}
+
+func (l *DHCPLease) IPNet() (*net.IPNet, error) {
+	mask := parseSubnetMask(l.opts)
+	if mask == nil {
+		return nil, fmt.Errorf("DHCP option Subnet Mask not found in DHCPACK")
+	}
+
+	return &net.IPNet{
+		IP:   l.ack.YIAddr(),
+		Mask: mask,
+	}, nil
+}
+
+func (l *DHCPLease) Gateway() net.IP {
+	return parseRouter(l.opts)
+}
+
+func (l *DHCPLease) Routes() []types.Route {
+	routes := parseRoutes(l.opts)
+	return append(routes, parseCIDRRoutes(l.opts)...)
+}
+
+// jitter returns a random value within [-span, span) range
+func jitter(span time.Duration) time.Duration {
+	return time.Duration(float64(span) * (2.0*rand.Float64() - 1.0))
+}
+
+func backoffRetry(f func() (*dhcp4.Packet, error)) (*dhcp4.Packet, error) {
+	var baseDelay time.Duration = resendDelay0
+
+	for i := 0; i < resendCount; i++ {
+		pkt, err := f()
+		if err == nil {
+			return pkt, nil
+		}
+
+		log.Print(err)
+
+		time.Sleep(baseDelay + jitter(time.Second))
+
+		if baseDelay < resendDelayMax {
+			baseDelay *= 2
+		}
+	}
+
+	return nil, errNoMoreTries
+}
+
+func newDHCPClient(link netlink.Link) (*dhcp4client.Client, error) {
+	pktsock, err := dhcp4client.NewPacketSock(link.Attrs().Index)
+	if err != nil {
+		return nil, err
+	}
+
+	return dhcp4client.New(
+		dhcp4client.HardwareAddr(link.Attrs().HardwareAddr),
+		dhcp4client.Timeout(5*time.Second),
+		dhcp4client.Broadcast(false),
+		dhcp4client.Connection(pktsock),
+	)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go b/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go
new file mode 100644
index 0000000000..b537831506
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go
@@ -0,0 +1,73 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"net/rpc"
+	"os"
+	"path/filepath"
+
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+const socketPath = "/run/cni/dhcp.sock"
+
+func main() {
+	if len(os.Args) > 1 && os.Args[1] == "daemon" {
+		runDaemon()
+	} else {
+		skel.PluginMain(cmdAdd, cmdDel)
+	}
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	result := types.Result{}
+	if err := rpcCall("DHCP.Allocate", args, &result); err != nil {
+		return err
+	}
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	result := struct{}{}
+	if err := rpcCall("DHCP.Release", args, &result); err != nil {
+		return fmt.Errorf("error dialing DHCP daemon: %v", err)
+	}
+	return nil
+}
+
+func rpcCall(method string, args *skel.CmdArgs, result interface{}) error {
+	client, err := rpc.DialHTTP("unix", socketPath)
+	if err != nil {
+		return fmt.Errorf("error dialing DHCP daemon: %v", err)
+	}
+
+	// The daemon may be running under a different working dir
+	// so make sure the netns path is absolute.
+	netns, err := filepath.Abs(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to make %q an absolute path: %v", args.Netns, err)
+	}
+	args.Netns = netns
+
+	err = client.Call(method, args, result)
+	if err != nil {
+		return fmt.Errorf("error calling %v: %v", method, err)
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go b/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go
new file mode 100644
index 0000000000..b11ec21d55
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go
@@ -0,0 +1,139 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/binary"
+	"fmt"
+	"net"
+	"time"
+
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/d2g/dhcp4"
+)
+
+func parseRouter(opts dhcp4.Options) net.IP {
+	if opts, ok := opts[dhcp4.OptionRouter]; ok {
+		if len(opts) == 4 {
+			return net.IP(opts)
+		}
+	}
+	return nil
+}
+
+func classfulSubnet(sn net.IP) net.IPNet {
+	return net.IPNet{
+		IP:   sn,
+		Mask: sn.DefaultMask(),
+	}
+}
+
+func parseRoutes(opts dhcp4.Options) []types.Route {
+	// StaticRoutes format: pairs of:
+	// Dest = 4 bytes; Classful IP subnet
+	// Router = 4 bytes; IP address of router
+
+	routes := []types.Route{}
+	if opt, ok := opts[dhcp4.OptionStaticRoute]; ok {
+		for len(opt) >= 8 {
+			sn := opt[0:4]
+			r := opt[4:8]
+			rt := types.Route{
+				Dst: classfulSubnet(sn),
+				GW:  r,
+			}
+			routes = append(routes, rt)
+			opt = opt[8:]
+		}
+	}
+
+	return routes
+}
+
+func parseCIDRRoutes(opts dhcp4.Options) []types.Route {
+	// See RFC4332 for format (http://tools.ietf.org/html/rfc3442)
+
+	routes := []types.Route{}
+	if opt, ok := opts[dhcp4.OptionClasslessRouteFormat]; ok {
+		for len(opt) >= 5 {
+			width := int(opt[0])
+			if width > 32 {
+				// error: can't have more than /32
+				return nil
+			}
+			// network bits are compacted to avoid zeros
+			octets := 0
+			if width > 0 {
+				octets = (width-1)/8 + 1
+			}
+
+			if len(opt) < 1+octets+4 {
+				// error: too short
+				return nil
+			}
+
+			sn := make([]byte, 4)
+			copy(sn, opt[1:octets+1])
+
+			gw := net.IP(opt[octets+1 : octets+5])
+
+			rt := types.Route{
+				Dst: net.IPNet{
+					IP:   net.IP(sn),
+					Mask: net.CIDRMask(width, 32),
+				},
+				GW: gw,
+			}
+			routes = append(routes, rt)
+
+			opt = opt[octets+5 : len(opt)]
+		}
+	}
+	return routes
+}
+
+func parseSubnetMask(opts dhcp4.Options) net.IPMask {
+	mask, ok := opts[dhcp4.OptionSubnetMask]
+	if !ok {
+		return nil
+	}
+
+	return net.IPMask(mask)
+}
+
+func parseDuration(opts dhcp4.Options, code dhcp4.OptionCode, optName string) (time.Duration, error) {
+	val, ok := opts[code]
+	if !ok {
+		return 0, fmt.Errorf("option %v not found", optName)
+	}
+	if len(val) != 4 {
+		return 0, fmt.Errorf("option %v is not 4 bytes", optName)
+	}
+
+	secs := binary.BigEndian.Uint32(val)
+	return time.Duration(secs) * time.Second, nil
+}
+
+func parseLeaseTime(opts dhcp4.Options) (time.Duration, error) {
+	return parseDuration(opts, dhcp4.OptionIPAddressLeaseTime, "LeaseTime")
+}
+
+func parseRenewalTime(opts dhcp4.Options) (time.Duration, error) {
+	return parseDuration(opts, dhcp4.OptionRenewalTimeValue, "RenewalTime")
+}
+
+func parseRebindingTime(opts dhcp4.Options) (time.Duration, error) {
+	return parseDuration(opts, dhcp4.OptionRebindingTimeValue, "RebindingTime")
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go
new file mode 100644
index 0000000000..55a3ae6fa4
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go
@@ -0,0 +1,165 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/plugins/ipam/host-local/backend"
+)
+
+type IPAllocator struct {
+	start net.IP
+	end   net.IP
+	conf  *IPAMConfig
+	store backend.Store
+}
+
+func NewIPAllocator(conf *IPAMConfig, store backend.Store) (*IPAllocator, error) {
+	var (
+		start net.IP
+		end   net.IP
+		err   error
+	)
+	start, end, err = networkRange((*net.IPNet)(&conf.Subnet))
+	if err != nil {
+		return nil, err
+	}
+
+	// skip the .0 address
+	start = ip.NextIP(start)
+
+	if conf.RangeStart != nil {
+		if err := validateRangeIP(conf.RangeStart, (*net.IPNet)(&conf.Subnet)); err != nil {
+			return nil, err
+		}
+		start = conf.RangeStart
+	}
+	if conf.RangeEnd != nil {
+		if err := validateRangeIP(conf.RangeEnd, (*net.IPNet)(&conf.Subnet)); err != nil {
+			return nil, err
+		}
+		// RangeEnd is inclusive
+		end = ip.NextIP(conf.RangeEnd)
+	}
+
+	return &IPAllocator{start, end, conf, store}, nil
+}
+
+func validateRangeIP(ip net.IP, ipnet *net.IPNet) error {
+	if !ipnet.Contains(ip) {
+		return fmt.Errorf("%s not in network: %s", ip, ipnet)
+	}
+	return nil
+}
+
+// Returns newly allocated IP along with its config
+func (a *IPAllocator) Get(id string) (*types.IPConfig, error) {
+	a.store.Lock()
+	defer a.store.Unlock()
+
+	gw := a.conf.Gateway
+	if gw == nil {
+		gw = ip.NextIP(a.conf.Subnet.IP)
+	}
+
+	var requestedIP net.IP
+	if a.conf.Args != nil {
+		requestedIP = a.conf.Args.IP
+	}
+
+	if requestedIP != nil {
+		if gw != nil && gw.Equal(a.conf.Args.IP) {
+			return nil, fmt.Errorf("requested IP must differ gateway IP")
+		}
+
+		subnet := net.IPNet{
+			IP:   a.conf.Subnet.IP,
+			Mask: a.conf.Subnet.Mask,
+		}
+		err := validateRangeIP(requestedIP, &subnet)
+		if err != nil {
+			return nil, err
+		}
+
+		reserved, err := a.store.Reserve(id, requestedIP)
+		if err != nil {
+			return nil, err
+		}
+
+		if reserved {
+			return &types.IPConfig{
+				IP:      net.IPNet{IP: requestedIP, Mask: a.conf.Subnet.Mask},
+				Gateway: gw,
+				Routes:  a.conf.Routes,
+			}, nil
+		}
+		return nil, fmt.Errorf("requested IP address %q is not available in network: %s", requestedIP, a.conf.Name)
+	}
+
+	for cur := a.start; !cur.Equal(a.end); cur = ip.NextIP(cur) {
+		// don't allocate gateway IP
+		if gw != nil && cur.Equal(gw) {
+			continue
+		}
+
+		reserved, err := a.store.Reserve(id, cur)
+		if err != nil {
+			return nil, err
+		}
+		if reserved {
+			return &types.IPConfig{
+				IP:      net.IPNet{IP: cur, Mask: a.conf.Subnet.Mask},
+				Gateway: gw,
+				Routes:  a.conf.Routes,
+			}, nil
+		}
+	}
+	return nil, fmt.Errorf("no IP addresses available in network: %s", a.conf.Name)
+}
+
+// Releases all IPs allocated for the container with given ID
+func (a *IPAllocator) Release(id string) error {
+	a.store.Lock()
+	defer a.store.Unlock()
+
+	return a.store.ReleaseByID(id)
+}
+
+func networkRange(ipnet *net.IPNet) (net.IP, net.IP, error) {
+	if ipnet.IP == nil {
+		return nil, nil, fmt.Errorf("missing field %q in IPAM configuration", "subnet")
+	}
+	ip := ipnet.IP.To4()
+	if ip == nil {
+		ip = ipnet.IP.To16()
+		if ip == nil {
+			return nil, nil, fmt.Errorf("IP not v4 nor v6")
+		}
+	}
+
+	if len(ip) != len(ipnet.Mask) {
+		return nil, nil, fmt.Errorf("IPNet IP and Mask version mismatch")
+	}
+
+	var end net.IP
+	for i := 0; i < len(ip); i++ {
+		end = append(end, ip[i]|^ipnet.Mask[i])
+	}
+	return ipnet.IP, end, nil
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go
new file mode 100644
index 0000000000..88dc5e92bc
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go
@@ -0,0 +1,88 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package disk
+
+import (
+	"io/ioutil"
+	"net"
+	"os"
+	"path/filepath"
+)
+
+var defaultDataDir = "/var/lib/cni/networks"
+
+type Store struct {
+	FileLock
+	dataDir string
+}
+
+func New(network string) (*Store, error) {
+	dir := filepath.Join(defaultDataDir, network)
+	if err := os.MkdirAll(dir, 0644); err != nil {
+		return nil, err
+	}
+
+	lk, err := NewFileLock(dir)
+	if err != nil {
+		return nil, err
+	}
+	return &Store{*lk, dir}, nil
+}
+
+func (s *Store) Reserve(id string, ip net.IP) (bool, error) {
+	fname := filepath.Join(s.dataDir, ip.String())
+	f, err := os.OpenFile(fname, os.O_RDWR|os.O_EXCL|os.O_CREATE, 0644)
+	if os.IsExist(err) {
+		return false, nil
+	}
+	if err != nil {
+		return false, err
+	}
+	if _, err := f.WriteString(id); err != nil {
+		f.Close()
+		os.Remove(f.Name())
+		return false, err
+	}
+	if err := f.Close(); err != nil {
+		os.Remove(f.Name())
+		return false, err
+	}
+	return true, nil
+}
+
+func (s *Store) Release(ip net.IP) error {
+	return os.Remove(filepath.Join(s.dataDir, ip.String()))
+}
+
+// N.B. This function eats errors to be tolerant and
+// release as much as possible
+func (s *Store) ReleaseByID(id string) error {
+	err := filepath.Walk(s.dataDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil || info.IsDir() {
+			return nil
+		}
+		data, err := ioutil.ReadFile(path)
+		if err != nil {
+			return nil
+		}
+		if string(data) == id {
+			if err := os.Remove(path); err != nil {
+				return nil
+			}
+		}
+		return nil
+	})
+	return err
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go
new file mode 100644
index 0000000000..7241482515
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go
@@ -0,0 +1,50 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package disk
+
+import (
+	"os"
+	"syscall"
+)
+
+// FileLock wraps os.File to be used as a lock using flock
+type FileLock struct {
+	f *os.File
+}
+
+// NewFileLock opens file/dir at path and returns unlocked FileLock object
+func NewFileLock(path string) (*FileLock, error) {
+	f, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+
+	return &FileLock{f}, nil
+}
+
+// Close closes underlying file
+func (l *FileLock) Close() error {
+	return l.f.Close()
+}
+
+// Lock acquires an exclusive lock
+func (l *FileLock) Lock() error {
+	return syscall.Flock(int(l.f.Fd()), syscall.LOCK_EX)
+}
+
+// Unlock releases the lock
+func (l *FileLock) Unlock() error {
+	return syscall.Flock(int(l.f.Fd()), syscall.LOCK_UN)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go
new file mode 100644
index 0000000000..45a89b109c
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go
@@ -0,0 +1,26 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package backend
+
+import "net"
+
+type Store interface {
+	Lock() error
+	Unlock() error
+	Close() error
+	Reserve(id string, ip net.IP) (bool, error)
+	Release(ip net.IP) error
+	ReleaseByID(id string) error
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/config.go b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/config.go
new file mode 100644
index 0000000000..a0e493cd84
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/config.go
@@ -0,0 +1,70 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"net"
+
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+// IPAMConfig represents the IP related network configuration.
+type IPAMConfig struct {
+	Name       string
+	Type       string        `json:"type"`
+	RangeStart net.IP        `json:"rangeStart"`
+	RangeEnd   net.IP        `json:"rangeEnd"`
+	Subnet     types.IPNet   `json:"subnet"`
+	Gateway    net.IP        `json:"gateway"`
+	Routes     []types.Route `json:"routes"`
+	Args       *IPAMArgs     `json:"-"`
+}
+
+type IPAMArgs struct {
+	types.CommonArgs
+	IP net.IP `json:"ip,omitempty"`
+}
+
+type Net struct {
+	Name string      `json:"name"`
+	IPAM *IPAMConfig `json:"ipam"`
+}
+
+// NewIPAMConfig creates a NetworkConfig from the given network name.
+func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, error) {
+	n := Net{}
+	if err := json.Unmarshal(bytes, &n); err != nil {
+		return nil, err
+	}
+
+	if args != "" {
+		n.IPAM.Args = &IPAMArgs{}
+		err := types.LoadArgs(args, n.IPAM.Args)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if n.IPAM == nil {
+		return nil, fmt.Errorf("%q missing 'ipam' key")
+	}
+
+	// Copy net name into IPAM so not to drag Net struct around
+	n.IPAM.Name = n.Name
+
+	return n.IPAM, nil
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/main.go b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/main.go
new file mode 100644
index 0000000000..d2f3c305a5
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/ipam/host-local/main.go
@@ -0,0 +1,74 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk"
+
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
+	if err != nil {
+		return err
+	}
+
+	store, err := disk.New(ipamConf.Name)
+	if err != nil {
+		return err
+	}
+	defer store.Close()
+
+	allocator, err := NewIPAllocator(ipamConf, store)
+	if err != nil {
+		return err
+	}
+
+	ipConf, err := allocator.Get(args.ContainerID)
+	if err != nil {
+		return err
+	}
+
+	r := &types.Result{
+		IP4: ipConf,
+	}
+	return r.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
+	if err != nil {
+		return err
+	}
+
+	store, err := disk.New(ipamConf.Name)
+	if err != nil {
+		return err
+	}
+	defer store.Close()
+
+	allocator, err := NewIPAllocator(ipamConf, store)
+	if err != nil {
+		return err
+	}
+
+	return allocator.Release(args.ContainerID)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/main/bridge/bridge.go b/vendor/github.com/containernetworking/cni/plugins/main/bridge/bridge.go
new file mode 100644
index 0000000000..d4fc89c3aa
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/main/bridge/bridge.go
@@ -0,0 +1,319 @@
+// Copyright 2014 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net"
+	"runtime"
+	"syscall"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/ipam"
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/utils"
+	"github.com/vishvananda/netlink"
+)
+
+const defaultBrName = "cni0"
+
+type NetConf struct {
+	types.NetConf
+	BrName      string `json:"bridge"`
+	IsGW        bool   `json:"isGateway"`
+	IsDefaultGW bool   `json:"isDefaultGateway"`
+	IPMasq      bool   `json:"ipMasq"`
+	MTU         int    `json:"mtu"`
+	HairpinMode bool   `json:"hairpinMode"`
+}
+
+func init() {
+	// this ensures that main runs only on main thread (thread group leader).
+	// since namespace ops (unshare, setns) are done for a single thread, we
+	// must ensure that the goroutine does not jump from OS thread to thread
+	runtime.LockOSThread()
+}
+
+func loadNetConf(bytes []byte) (*NetConf, error) {
+	n := &NetConf{
+		BrName: defaultBrName,
+	}
+	if err := json.Unmarshal(bytes, n); err != nil {
+		return nil, fmt.Errorf("failed to load netconf: %v", err)
+	}
+	return n, nil
+}
+
+func ensureBridgeAddr(br *netlink.Bridge, ipn *net.IPNet) error {
+	addrs, err := netlink.AddrList(br, syscall.AF_INET)
+	if err != nil && err != syscall.ENOENT {
+		return fmt.Errorf("could not get list of IP addresses: %v", err)
+	}
+
+	// if there're no addresses on the bridge, it's ok -- we'll add one
+	if len(addrs) > 0 {
+		ipnStr := ipn.String()
+		for _, a := range addrs {
+			// string comp is actually easiest for doing IPNet comps
+			if a.IPNet.String() == ipnStr {
+				return nil
+			}
+		}
+		return fmt.Errorf("%q already has an IP address different from %v", br.Name, ipn.String())
+	}
+
+	addr := &netlink.Addr{IPNet: ipn, Label: ""}
+	if err := netlink.AddrAdd(br, addr); err != nil {
+		return fmt.Errorf("could not add IP address to %q: %v", br.Name, err)
+	}
+	return nil
+}
+
+func bridgeByName(name string) (*netlink.Bridge, error) {
+	l, err := netlink.LinkByName(name)
+	if err != nil {
+		return nil, fmt.Errorf("could not lookup %q: %v", name, err)
+	}
+	br, ok := l.(*netlink.Bridge)
+	if !ok {
+		return nil, fmt.Errorf("%q already exists but is not a bridge", name)
+	}
+	return br, nil
+}
+
+func ensureBridge(brName string, mtu int) (*netlink.Bridge, error) {
+	br := &netlink.Bridge{
+		LinkAttrs: netlink.LinkAttrs{
+			Name: brName,
+			MTU:  mtu,
+			// Let kernel use default txqueuelen; leaving it unset
+			// means 0, and a zero-length TX queue messes up FIFO
+			// traffic shapers which use TX queue length as the
+			// default packet limit
+			TxQLen: -1,
+		},
+	}
+
+	if err := netlink.LinkAdd(br); err != nil {
+		if err != syscall.EEXIST {
+			return nil, fmt.Errorf("could not add %q: %v", brName, err)
+		}
+
+		// it's ok if the device already exists as long as config is similar
+		br, err = bridgeByName(brName)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if err := netlink.LinkSetUp(br); err != nil {
+		return nil, err
+	}
+
+	return br, nil
+}
+
+func setupVeth(netns ns.NetNS, br *netlink.Bridge, ifName string, mtu int, hairpinMode bool) error {
+	var hostVethName string
+
+	err := netns.Do(func(hostNS ns.NetNS) error {
+		// create the veth pair in the container and move host end into host netns
+		hostVeth, _, err := ip.SetupVeth(ifName, mtu, hostNS)
+		if err != nil {
+			return err
+		}
+
+		hostVethName = hostVeth.Attrs().Name
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	// need to lookup hostVeth again as its index has changed during ns move
+	hostVeth, err := netlink.LinkByName(hostVethName)
+	if err != nil {
+		return fmt.Errorf("failed to lookup %q: %v", hostVethName, err)
+	}
+
+	// connect host veth end to the bridge
+	if err = netlink.LinkSetMaster(hostVeth, br); err != nil {
+		return fmt.Errorf("failed to connect %q to bridge %v: %v", hostVethName, br.Attrs().Name, err)
+	}
+
+	// set hairpin mode
+	if err = netlink.LinkSetHairpin(hostVeth, hairpinMode); err != nil {
+		return fmt.Errorf("failed to setup hairpin mode for %v: %v", hostVethName, err)
+	}
+
+	return nil
+}
+
+func calcGatewayIP(ipn *net.IPNet) net.IP {
+	nid := ipn.IP.Mask(ipn.Mask)
+	return ip.NextIP(nid)
+}
+
+func setupBridge(n *NetConf) (*netlink.Bridge, error) {
+	// create bridge if necessary
+	br, err := ensureBridge(n.BrName, n.MTU)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create bridge %q: %v", n.BrName, err)
+	}
+
+	return br, nil
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	n, err := loadNetConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	if n.IsDefaultGW {
+		n.IsGW = true
+	}
+
+	br, err := setupBridge(n)
+	if err != nil {
+		return err
+	}
+
+	netns, err := ns.GetNS(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)
+	}
+	defer netns.Close()
+
+	if err = setupVeth(netns, br, args.IfName, n.MTU, n.HairpinMode); err != nil {
+		return err
+	}
+
+	// run the IPAM plugin and get back the config to apply
+	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	// TODO: make this optional when IPv6 is supported
+	if result.IP4 == nil {
+		return errors.New("IPAM plugin returned missing IPv4 config")
+	}
+
+	if result.IP4.Gateway == nil && n.IsGW {
+		result.IP4.Gateway = calcGatewayIP(&result.IP4.IP)
+	}
+
+	if err := netns.Do(func(_ ns.NetNS) error {
+		// set the default gateway if requested
+		if n.IsDefaultGW {
+			_, defaultNet, err := net.ParseCIDR("0.0.0.0/0")
+			if err != nil {
+				return err
+			}
+
+			for _, route := range result.IP4.Routes {
+				if defaultNet.String() == route.Dst.String() {
+					if route.GW != nil && !route.GW.Equal(result.IP4.Gateway) {
+						return fmt.Errorf(
+							"isDefaultGateway ineffective because IPAM sets default route via %q",
+							route.GW,
+						)
+					}
+				}
+			}
+
+			result.IP4.Routes = append(
+				result.IP4.Routes,
+				types.Route{Dst: *defaultNet, GW: result.IP4.Gateway},
+			)
+
+			// TODO: IPV6
+		}
+
+		return ipam.ConfigureIface(args.IfName, result)
+	}); err != nil {
+		return err
+	}
+
+	if n.IsGW {
+		gwn := &net.IPNet{
+			IP:   result.IP4.Gateway,
+			Mask: result.IP4.IP.Mask,
+		}
+
+		if err = ensureBridgeAddr(br, gwn); err != nil {
+			return err
+		}
+
+		if err := ip.EnableIP4Forward(); err != nil {
+			return fmt.Errorf("failed to enable forwarding: %v", err)
+		}
+	}
+
+	if n.IPMasq {
+		chain := utils.FormatChainName(n.Name, args.ContainerID)
+		comment := utils.FormatComment(n.Name, args.ContainerID)
+		if err = ip.SetupIPMasq(ip.Network(&result.IP4.IP), chain, comment); err != nil {
+			return err
+		}
+	}
+
+	result.DNS = n.DNS
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	n, err := loadNetConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	if err := ipam.ExecDel(n.IPAM.Type, args.StdinData); err != nil {
+		return err
+	}
+
+	if args.Netns == "" {
+		return nil
+	}
+
+	var ipn *net.IPNet
+	err = ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		var err error
+		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
+		return err
+	})
+	if err != nil {
+		return err
+	}
+
+	if n.IPMasq {
+		chain := utils.FormatChainName(n.Name, args.ContainerID)
+		comment := utils.FormatComment(n.Name, args.ContainerID)
+		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go b/vendor/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go
new file mode 100644
index 0000000000..d7cfc39f4e
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go
@@ -0,0 +1,175 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"runtime"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/ipam"
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/vishvananda/netlink"
+)
+
+type NetConf struct {
+	types.NetConf
+	Master string `json:"master"`
+	Mode   string `json:"mode"`
+	MTU    int    `json:"mtu"`
+}
+
+func init() {
+	// this ensures that main runs only on main thread (thread group leader).
+	// since namespace ops (unshare, setns) are done for a single thread, we
+	// must ensure that the goroutine does not jump from OS thread to thread
+	runtime.LockOSThread()
+}
+
+func loadConf(bytes []byte) (*NetConf, error) {
+	n := &NetConf{}
+	if err := json.Unmarshal(bytes, n); err != nil {
+		return nil, fmt.Errorf("failed to load netconf: %v", err)
+	}
+	if n.Master == "" {
+		return nil, fmt.Errorf(`"master" field is required. It specifies the host interface name to virtualize`)
+	}
+	return n, nil
+}
+
+func modeFromString(s string) (netlink.IPVlanMode, error) {
+	switch s {
+	case "", "l2":
+		return netlink.IPVLAN_MODE_L2, nil
+	case "l3":
+		return netlink.IPVLAN_MODE_L3, nil
+	default:
+		return 0, fmt.Errorf("unknown ipvlan mode: %q", s)
+	}
+}
+
+func createIpvlan(conf *NetConf, ifName string, netns ns.NetNS) error {
+	mode, err := modeFromString(conf.Mode)
+	if err != nil {
+		return err
+	}
+
+	m, err := netlink.LinkByName(conf.Master)
+	if err != nil {
+		return fmt.Errorf("failed to lookup master %q: %v", conf.Master, err)
+	}
+
+	// due to kernel bug we have to create with tmpname or it might
+	// collide with the name on the host and error out
+	tmpName, err := ip.RandomVethName()
+	if err != nil {
+		return err
+	}
+
+	mv := &netlink.IPVlan{
+		LinkAttrs: netlink.LinkAttrs{
+			MTU:         conf.MTU,
+			Name:        tmpName,
+			ParentIndex: m.Attrs().Index,
+			Namespace:   netlink.NsFd(int(netns.Fd())),
+		},
+		Mode: mode,
+	}
+
+	if err := netlink.LinkAdd(mv); err != nil {
+		return fmt.Errorf("failed to create ipvlan: %v", err)
+	}
+
+	return netns.Do(func(_ ns.NetNS) error {
+		err := renameLink(tmpName, ifName)
+		if err != nil {
+			return fmt.Errorf("failed to rename ipvlan to %q: %v", ifName, err)
+		}
+		return nil
+	})
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	n, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	netns, err := ns.GetNS(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)
+	}
+	defer netns.Close()
+
+	if err = createIpvlan(n, args.IfName, netns); err != nil {
+		return err
+	}
+
+	// run the IPAM plugin and get back the config to apply
+	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+	if result.IP4 == nil {
+		return errors.New("IPAM plugin returned missing IPv4 config")
+	}
+
+	err = netns.Do(func(_ ns.NetNS) error {
+		return ipam.ConfigureIface(args.IfName, result)
+	})
+	if err != nil {
+		return err
+	}
+
+	result.DNS = n.DNS
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	n, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	if args.Netns == "" {
+		return nil
+	}
+
+	return ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		return ip.DelLinkByName(args.IfName)
+	})
+}
+
+func renameLink(curName, newName string) error {
+	link, err := netlink.LinkByName(curName)
+	if err != nil {
+		return err
+	}
+
+	return netlink.LinkSetName(link, newName)
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go b/vendor/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go
new file mode 100644
index 0000000000..7739d7b8eb
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go
@@ -0,0 +1,193 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"runtime"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/ipam"
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/utils/sysctl"
+	"github.com/vishvananda/netlink"
+)
+
+const (
+	IPv4InterfaceArpProxySysctlTemplate = "net.ipv4.conf.%s.proxy_arp"
+)
+
+type NetConf struct {
+	types.NetConf
+	Master string `json:"master"`
+	Mode   string `json:"mode"`
+	MTU    int    `json:"mtu"`
+}
+
+func init() {
+	// this ensures that main runs only on main thread (thread group leader).
+	// since namespace ops (unshare, setns) are done for a single thread, we
+	// must ensure that the goroutine does not jump from OS thread to thread
+	runtime.LockOSThread()
+}
+
+func loadConf(bytes []byte) (*NetConf, error) {
+	n := &NetConf{}
+	if err := json.Unmarshal(bytes, n); err != nil {
+		return nil, fmt.Errorf("failed to load netconf: %v", err)
+	}
+	if n.Master == "" {
+		return nil, fmt.Errorf(`"master" field is required. It specifies the host interface name to virtualize`)
+	}
+	return n, nil
+}
+
+func modeFromString(s string) (netlink.MacvlanMode, error) {
+	switch s {
+	case "", "bridge":
+		return netlink.MACVLAN_MODE_BRIDGE, nil
+	case "private":
+		return netlink.MACVLAN_MODE_PRIVATE, nil
+	case "vepa":
+		return netlink.MACVLAN_MODE_VEPA, nil
+	case "passthru":
+		return netlink.MACVLAN_MODE_PASSTHRU, nil
+	default:
+		return 0, fmt.Errorf("unknown macvlan mode: %q", s)
+	}
+}
+
+func createMacvlan(conf *NetConf, ifName string, netns ns.NetNS) error {
+	mode, err := modeFromString(conf.Mode)
+	if err != nil {
+		return err
+	}
+
+	m, err := netlink.LinkByName(conf.Master)
+	if err != nil {
+		return fmt.Errorf("failed to lookup master %q: %v", conf.Master, err)
+	}
+
+	// due to kernel bug we have to create with tmpName or it might
+	// collide with the name on the host and error out
+	tmpName, err := ip.RandomVethName()
+	if err != nil {
+		return err
+	}
+
+	mv := &netlink.Macvlan{
+		LinkAttrs: netlink.LinkAttrs{
+			MTU:         conf.MTU,
+			Name:        tmpName,
+			ParentIndex: m.Attrs().Index,
+			Namespace:   netlink.NsFd(int(netns.Fd())),
+		},
+		Mode: mode,
+	}
+
+	if err := netlink.LinkAdd(mv); err != nil {
+		return fmt.Errorf("failed to create macvlan: %v", err)
+	}
+
+	return netns.Do(func(_ ns.NetNS) error {
+		// TODO: duplicate following lines for ipv6 support, when it will be added in other places
+		ipv4SysctlValueName := fmt.Sprintf(IPv4InterfaceArpProxySysctlTemplate, tmpName)
+		if _, err := sysctl.Sysctl(ipv4SysctlValueName, "1"); err != nil {
+			// remove the newly added link and ignore errors, because we already are in a failed state
+			_ = netlink.LinkDel(mv)
+			return fmt.Errorf("failed to set proxy_arp on newly added interface %q: %v", tmpName, err)
+		}
+
+		err := renameLink(tmpName, ifName)
+		if err != nil {
+			_ = netlink.LinkDel(mv)
+			return fmt.Errorf("failed to rename macvlan to %q: %v", ifName, err)
+		}
+		return nil
+	})
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	n, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	netns, err := ns.GetNS(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to open netns %q: %v", netns, err)
+	}
+	defer netns.Close()
+
+	if err = createMacvlan(n, args.IfName, netns); err != nil {
+		return err
+	}
+
+	// run the IPAM plugin and get back the config to apply
+	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+	if result.IP4 == nil {
+		return errors.New("IPAM plugin returned missing IPv4 config")
+	}
+
+	err = netns.Do(func(_ ns.NetNS) error {
+		return ipam.ConfigureIface(args.IfName, result)
+	})
+	if err != nil {
+		return err
+	}
+
+	result.DNS = n.DNS
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	n, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	if args.Netns == "" {
+		return nil
+	}
+
+	return ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		return ip.DelLinkByName(args.IfName)
+	})
+}
+
+func renameLink(curName, newName string) error {
+	link, err := netlink.LinkByName(curName)
+	if err != nil {
+		return err
+	}
+
+	return netlink.LinkSetName(link, newName)
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/main/ptp/ptp.go b/vendor/github.com/containernetworking/cni/plugins/main/ptp/ptp.go
new file mode 100644
index 0000000000..aa695e39e2
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/main/ptp/ptp.go
@@ -0,0 +1,229 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net"
+	"os"
+	"runtime"
+
+	"github.com/vishvananda/netlink"
+
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/ipam"
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/utils"
+)
+
+func init() {
+	// this ensures that main runs only on main thread (thread group leader).
+	// since namespace ops (unshare, setns) are done for a single thread, we
+	// must ensure that the goroutine does not jump from OS thread to thread
+	runtime.LockOSThread()
+}
+
+type NetConf struct {
+	types.NetConf
+	IPMasq bool `json:"ipMasq"`
+	MTU    int  `json:"mtu"`
+}
+
+func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string, error) {
+	// The IPAM result will be something like IP=192.168.3.5/24, GW=192.168.3.1.
+	// What we want is really a point-to-point link but veth does not support IFF_POINTOPONT.
+	// Next best thing would be to let it ARP but set interface to 192.168.3.5/32 and
+	// add a route like "192.168.3.0/24 via 192.168.3.1 dev $ifName".
+	// Unfortunately that won't work as the GW will be outside the interface's subnet.
+
+	// Our solution is to configure the interface with 192.168.3.5/24, then delete the
+	// "192.168.3.0/24 dev $ifName" route that was automatically added. Then we add
+	// "192.168.3.1/32 dev $ifName" and "192.168.3.0/24 via 192.168.3.1 dev $ifName".
+	// In other words we force all traffic to ARP via the gateway except for GW itself.
+
+	var hostVethName string
+	err := ns.WithNetNSPath(netns, func(hostNS ns.NetNS) error {
+		hostVeth, _, err := ip.SetupVeth(ifName, mtu, hostNS)
+		if err != nil {
+			return err
+		}
+
+		if err = ipam.ConfigureIface(ifName, pr); err != nil {
+			return err
+		}
+
+		contVeth, err := netlink.LinkByName(ifName)
+		if err != nil {
+			return fmt.Errorf("failed to look up %q: %v", ifName, err)
+		}
+
+		// Delete the route that was automatically added
+		route := netlink.Route{
+			LinkIndex: contVeth.Attrs().Index,
+			Dst: &net.IPNet{
+				IP:   pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
+				Mask: pr.IP4.IP.Mask,
+			},
+			Scope: netlink.SCOPE_NOWHERE,
+		}
+
+		if err := netlink.RouteDel(&route); err != nil {
+			return fmt.Errorf("failed to delete route %v: %v", route, err)
+		}
+
+		for _, r := range []netlink.Route{
+			netlink.Route{
+				LinkIndex: contVeth.Attrs().Index,
+				Dst: &net.IPNet{
+					IP:   pr.IP4.Gateway,
+					Mask: net.CIDRMask(32, 32),
+				},
+				Scope: netlink.SCOPE_LINK,
+				Src:   pr.IP4.IP.IP,
+			},
+			netlink.Route{
+				LinkIndex: contVeth.Attrs().Index,
+				Dst: &net.IPNet{
+					IP:   pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
+					Mask: pr.IP4.IP.Mask,
+				},
+				Scope: netlink.SCOPE_UNIVERSE,
+				Gw:    pr.IP4.Gateway,
+				Src:   pr.IP4.IP.IP,
+			},
+		} {
+			if err := netlink.RouteAdd(&r); err != nil {
+				return fmt.Errorf("failed to add route %v: %v", r, err)
+			}
+		}
+
+		hostVethName = hostVeth.Attrs().Name
+
+		return nil
+	})
+	return hostVethName, err
+}
+
+func setupHostVeth(vethName string, ipConf *types.IPConfig) error {
+	// hostVeth moved namespaces and may have a new ifindex
+	veth, err := netlink.LinkByName(vethName)
+	if err != nil {
+		return fmt.Errorf("failed to lookup %q: %v", vethName, err)
+	}
+
+	// TODO(eyakubovich): IPv6
+	ipn := &net.IPNet{
+		IP:   ipConf.Gateway,
+		Mask: net.CIDRMask(32, 32),
+	}
+	addr := &netlink.Addr{IPNet: ipn, Label: ""}
+	if err = netlink.AddrAdd(veth, addr); err != nil {
+		return fmt.Errorf("failed to add IP addr (%#v) to veth: %v", ipn, err)
+	}
+
+	ipn = &net.IPNet{
+		IP:   ipConf.IP.IP,
+		Mask: net.CIDRMask(32, 32),
+	}
+	// dst happens to be the same as IP/net of host veth
+	if err = ip.AddHostRoute(ipn, nil, veth); err != nil && !os.IsExist(err) {
+		return fmt.Errorf("failed to add route on host: %v", err)
+	}
+
+	return nil
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	conf := NetConf{}
+	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
+		return fmt.Errorf("failed to load netconf: %v", err)
+	}
+
+	if err := ip.EnableIP4Forward(); err != nil {
+		return fmt.Errorf("failed to enable forwarding: %v", err)
+	}
+
+	// run the IPAM plugin and get back the config to apply
+	result, err := ipam.ExecAdd(conf.IPAM.Type, args.StdinData)
+	if err != nil {
+		return err
+	}
+	if result.IP4 == nil {
+		return errors.New("IPAM plugin returned missing IPv4 config")
+	}
+
+	hostVethName, err := setupContainerVeth(args.Netns, args.IfName, conf.MTU, result)
+	if err != nil {
+		return err
+	}
+
+	if err = setupHostVeth(hostVethName, result.IP4); err != nil {
+		return err
+	}
+
+	if conf.IPMasq {
+		chain := utils.FormatChainName(conf.Name, args.ContainerID)
+		comment := utils.FormatComment(conf.Name, args.ContainerID)
+		if err = ip.SetupIPMasq(&result.IP4.IP, chain, comment); err != nil {
+			return err
+		}
+	}
+
+	result.DNS = conf.DNS
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	conf := NetConf{}
+	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
+		return fmt.Errorf("failed to load netconf: %v", err)
+	}
+
+	if err := ipam.ExecDel(conf.IPAM.Type, args.StdinData); err != nil {
+		return err
+	}
+
+	if args.Netns == "" {
+		return nil
+	}
+
+	var ipn *net.IPNet
+	err := ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		var err error
+		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
+		return err
+	})
+	if err != nil {
+		return err
+	}
+
+	if conf.IPMasq {
+		chain := utils.FormatChainName(conf.Name, args.ContainerID)
+		comment := utils.FormatComment(conf.Name, args.ContainerID)
+		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go b/vendor/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go
new file mode 100644
index 0000000000..096fe6d677
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go
@@ -0,0 +1,253 @@
+// Copyright 2015 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This is a "meta-plugin". It reads in its own netconf, combines it with
+// the data from flannel generated subnet file and then invokes a plugin
+// like bridge or ipvlan to do the real work.
+
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/containernetworking/cni/pkg/invoke"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+const (
+	defaultSubnetFile = "/run/flannel/subnet.env"
+	stateDir          = "/var/lib/cni/flannel"
+)
+
+type NetConf struct {
+	types.NetConf
+	SubnetFile string                 `json:"subnetFile"`
+	Delegate   map[string]interface{} `json:"delegate"`
+}
+
+type subnetEnv struct {
+	nw     *net.IPNet
+	sn     *net.IPNet
+	mtu    *uint
+	ipmasq *bool
+}
+
+func (se *subnetEnv) missing() string {
+	m := []string{}
+
+	if se.nw == nil {
+		m = append(m, "FLANNEL_NETWORK")
+	}
+	if se.sn == nil {
+		m = append(m, "FLANNEL_SUBNET")
+	}
+	if se.mtu == nil {
+		m = append(m, "FLANNEL_MTU")
+	}
+	if se.ipmasq == nil {
+		m = append(m, "FLANNEL_IPMASQ")
+	}
+	return strings.Join(m, ", ")
+}
+
+func loadFlannelNetConf(bytes []byte) (*NetConf, error) {
+	n := &NetConf{
+		SubnetFile: defaultSubnetFile,
+	}
+	if err := json.Unmarshal(bytes, n); err != nil {
+		return nil, fmt.Errorf("failed to load netconf: %v", err)
+	}
+	return n, nil
+}
+
+func loadFlannelSubnetEnv(fn string) (*subnetEnv, error) {
+	f, err := os.Open(fn)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+
+	se := &subnetEnv{}
+
+	s := bufio.NewScanner(f)
+	for s.Scan() {
+		parts := strings.SplitN(s.Text(), "=", 2)
+		switch parts[0] {
+		case "FLANNEL_NETWORK":
+			_, se.nw, err = net.ParseCIDR(parts[1])
+			if err != nil {
+				return nil, err
+			}
+
+		case "FLANNEL_SUBNET":
+			_, se.sn, err = net.ParseCIDR(parts[1])
+			if err != nil {
+				return nil, err
+			}
+
+		case "FLANNEL_MTU":
+			mtu, err := strconv.ParseUint(parts[1], 10, 32)
+			if err != nil {
+				return nil, err
+			}
+			se.mtu = new(uint)
+			*se.mtu = uint(mtu)
+
+		case "FLANNEL_IPMASQ":
+			ipmasq := parts[1] == "true"
+			se.ipmasq = &ipmasq
+		}
+	}
+	if err := s.Err(); err != nil {
+		return nil, err
+	}
+
+	if m := se.missing(); m != "" {
+		return nil, fmt.Errorf("%v is missing %v", fn, m)
+	}
+
+	return se, nil
+}
+
+func saveScratchNetConf(containerID string, netconf []byte) error {
+	if err := os.MkdirAll(stateDir, 0700); err != nil {
+		return err
+	}
+	path := filepath.Join(stateDir, containerID)
+	return ioutil.WriteFile(path, netconf, 0600)
+}
+
+func consumeScratchNetConf(containerID string) ([]byte, error) {
+	path := filepath.Join(stateDir, containerID)
+	defer os.Remove(path)
+
+	return ioutil.ReadFile(path)
+}
+
+func delegateAdd(cid string, netconf map[string]interface{}) error {
+	netconfBytes, err := json.Marshal(netconf)
+	if err != nil {
+		return fmt.Errorf("error serializing delegate netconf: %v", err)
+	}
+
+	// save the rendered netconf for cmdDel
+	if err = saveScratchNetConf(cid, netconfBytes); err != nil {
+		return err
+	}
+
+	result, err := invoke.DelegateAdd(netconf["type"].(string), netconfBytes)
+	if err != nil {
+		return err
+	}
+
+	return result.Print()
+}
+
+func hasKey(m map[string]interface{}, k string) bool {
+	_, ok := m[k]
+	return ok
+}
+
+func isString(i interface{}) bool {
+	_, ok := i.(string)
+	return ok
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	n, err := loadFlannelNetConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	fenv, err := loadFlannelSubnetEnv(n.SubnetFile)
+	if err != nil {
+		return err
+	}
+
+	if n.Delegate == nil {
+		n.Delegate = make(map[string]interface{})
+	} else {
+		if hasKey(n.Delegate, "type") && !isString(n.Delegate["type"]) {
+			return fmt.Errorf("'delegate' dictionary, if present, must have (string) 'type' field")
+		}
+		if hasKey(n.Delegate, "name") {
+			return fmt.Errorf("'delegate' dictionary must not have 'name' field, it'll be set by flannel")
+		}
+		if hasKey(n.Delegate, "ipam") {
+			return fmt.Errorf("'delegate' dictionary must not have 'ipam' field, it'll be set by flannel")
+		}
+	}
+
+	n.Delegate["name"] = n.Name
+
+	if !hasKey(n.Delegate, "type") {
+		n.Delegate["type"] = "bridge"
+	}
+
+	if !hasKey(n.Delegate, "ipMasq") {
+		// if flannel is not doing ipmasq, we should
+		ipmasq := !*fenv.ipmasq
+		n.Delegate["ipMasq"] = ipmasq
+	}
+
+	if !hasKey(n.Delegate, "mtu") {
+		mtu := fenv.mtu
+		n.Delegate["mtu"] = mtu
+	}
+
+	if n.Delegate["type"].(string) == "bridge" {
+		if !hasKey(n.Delegate, "isGateway") {
+			n.Delegate["isGateway"] = true
+		}
+	}
+
+	n.Delegate["ipam"] = map[string]interface{}{
+		"type":   "host-local",
+		"subnet": fenv.sn.String(),
+		"routes": []types.Route{
+			types.Route{
+				Dst: *fenv.nw,
+			},
+		},
+	}
+
+	return delegateAdd(args.ContainerID, n.Delegate)
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	netconfBytes, err := consumeScratchNetConf(args.ContainerID)
+	if err != nil {
+		return err
+	}
+
+	n := &types.NetConf{}
+	if err = json.Unmarshal(netconfBytes, n); err != nil {
+		return fmt.Errorf("failed to parse netconf: %v", err)
+	}
+
+	return invoke.DelegateDel(n.Type, netconfBytes)
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/vendor/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go b/vendor/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go
new file mode 100644
index 0000000000..75ba852c00
--- /dev/null
+++ b/vendor/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go
@@ -0,0 +1,82 @@
+// Copyright 2016 CNI authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This is a "meta-plugin". It reads in its own netconf, it does not create
+// any network interface but just changes the network sysctl.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"strings"
+
+	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+)
+
+// TuningConf represents the network tuning configuration.
+type TuningConf struct {
+	types.NetConf
+	SysCtl map[string]string `json:"sysctl"`
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+	tuningConf := TuningConf{}
+	if err := json.Unmarshal(args.StdinData, &tuningConf); err != nil {
+		return fmt.Errorf("failed to load netconf: %v", err)
+	}
+
+	// The directory /proc/sys/net is per network namespace. Enter in the
+	// network namespace before writing on it.
+
+	err := ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
+		for key, value := range tuningConf.SysCtl {
+			fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1))
+			fileName = filepath.Clean(fileName)
+
+			// Refuse to modify sysctl parameters that don't belong
+			// to the network subsystem.
+			if !strings.HasPrefix(fileName, "/proc/sys/net/") {
+				return fmt.Errorf("invalid net sysctl key: %q", key)
+			}
+			content := []byte(value)
+			err := ioutil.WriteFile(fileName, content, 0644)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	result := types.Result{}
+	return result.Print()
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	// TODO: the settings are not reverted to the previous values. Reverting the
+	// settings is not useful when the whole container goes away but it could be
+	// useful in scenarios where plugins are added and removed at runtime.
+	return nil
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel)
+}
diff --git a/vendor/github.com/coreos/gexpect/LICENCE b/vendor/github.com/coreos/gexpect/LICENCE
new file mode 100644
index 0000000000..50adb0f19c
--- /dev/null
+++ b/vendor/github.com/coreos/gexpect/LICENCE
@@ -0,0 +1,7 @@
+Copyright (C) 2014 Thomas Rooney
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/vendor/github.com/coreos/gexpect/gexpect.go b/vendor/github.com/coreos/gexpect/gexpect.go
new file mode 100644
index 0000000000..4ea620ef6e
--- /dev/null
+++ b/vendor/github.com/coreos/gexpect/gexpect.go
@@ -0,0 +1,449 @@
+// +build !windows
+
+package gexpect
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"regexp"
+	"time"
+	"unicode/utf8"
+
+	shell "github.com/kballard/go-shellquote"
+	"github.com/kr/pty"
+)
+
+var (
+	ErrEmptySearch = errors.New("empty search string")
+)
+
+type ExpectSubprocess struct {
+	Cmd          *exec.Cmd
+	buf          *buffer
+	outputBuffer []byte
+}
+
+type buffer struct {
+	f       *os.File
+	b       bytes.Buffer
+	collect bool
+
+	collection bytes.Buffer
+}
+
+func (buf *buffer) StartCollecting() {
+	buf.collect = true
+}
+
+func (buf *buffer) StopCollecting() (result string) {
+	result = string(buf.collection.Bytes())
+	buf.collect = false
+	buf.collection.Reset()
+	return result
+}
+
+func (buf *buffer) Read(chunk []byte) (int, error) {
+	nread := 0
+	if buf.b.Len() > 0 {
+		n, err := buf.b.Read(chunk)
+		if err != nil {
+			return n, err
+		}
+		if n == len(chunk) {
+			return n, nil
+		}
+		nread = n
+	}
+	fn, err := buf.f.Read(chunk[nread:])
+	return fn + nread, err
+}
+
+func (buf *buffer) ReadRune() (r rune, size int, err error) {
+	l := buf.b.Len()
+
+	chunk := make([]byte, utf8.UTFMax)
+	if l > 0 {
+		n, err := buf.b.Read(chunk)
+		if err != nil {
+			return 0, 0, err
+		}
+		if utf8.FullRune(chunk[:n]) {
+			r, rL := utf8.DecodeRune(chunk)
+			if n > rL {
+				buf.PutBack(chunk[rL:n])
+			}
+			if buf.collect {
+				buf.collection.WriteRune(r)
+			}
+			return r, rL, nil
+		}
+	}
+	// else add bytes from the file, then try that
+	for l < utf8.UTFMax {
+		fn, err := buf.f.Read(chunk[l : l+1])
+		if err != nil {
+			return 0, 0, err
+		}
+		l = l + fn
+
+		if utf8.FullRune(chunk[:l]) {
+			r, rL := utf8.DecodeRune(chunk)
+			if buf.collect {
+				buf.collection.WriteRune(r)
+			}
+			return r, rL, nil
+		}
+	}
+	return 0, 0, errors.New("File is not a valid UTF=8 encoding")
+}
+
+func (buf *buffer) PutBack(chunk []byte) {
+	if len(chunk) == 0 {
+		return
+	}
+	if buf.b.Len() == 0 {
+		buf.b.Write(chunk)
+		return
+	}
+	d := make([]byte, 0, len(chunk)+buf.b.Len())
+	d = append(d, chunk...)
+	d = append(d, buf.b.Bytes()...)
+	buf.b.Reset()
+	buf.b.Write(d)
+}
+
+func SpawnAtDirectory(command string, directory string) (*ExpectSubprocess, error) {
+	expect, err := _spawn(command)
+	if err != nil {
+		return nil, err
+	}
+	expect.Cmd.Dir = directory
+	return _start(expect)
+}
+
+func Command(command string) (*ExpectSubprocess, error) {
+	expect, err := _spawn(command)
+	if err != nil {
+		return nil, err
+	}
+	return expect, nil
+}
+
+func (expect *ExpectSubprocess) Start() error {
+	_, err := _start(expect)
+	return err
+}
+
+func Spawn(command string) (*ExpectSubprocess, error) {
+	expect, err := _spawn(command)
+	if err != nil {
+		return nil, err
+	}
+	return _start(expect)
+}
+
+func (expect *ExpectSubprocess) Close() error {
+	if err := expect.Cmd.Process.Kill(); err != nil {
+		return err
+	}
+	if err := expect.buf.f.Close(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (expect *ExpectSubprocess) AsyncInteractChannels() (send chan string, receive chan string) {
+	receive = make(chan string)
+	send = make(chan string)
+
+	go func() {
+		for {
+			str, err := expect.ReadLine()
+			if err != nil {
+				close(receive)
+				return
+			}
+			receive <- str
+		}
+	}()
+
+	go func() {
+		for {
+			select {
+			case sendCommand, exists := <-send:
+				{
+					if !exists {
+						return
+					}
+					err := expect.Send(sendCommand)
+					if err != nil {
+						receive <- "gexpect Error: " + err.Error()
+						return
+					}
+				}
+			}
+		}
+	}()
+
+	return
+}
+
+func (expect *ExpectSubprocess) ExpectRegex(regex string) (bool, error) {
+	return regexp.MatchReader(regex, expect.buf)
+}
+
+func (expect *ExpectSubprocess) expectRegexFind(regex string, output bool) ([]string, string, error) {
+	re, err := regexp.Compile(regex)
+	if err != nil {
+		return nil, "", err
+	}
+	expect.buf.StartCollecting()
+	pairs := re.FindReaderSubmatchIndex(expect.buf)
+	stringIndexedInto := expect.buf.StopCollecting()
+	l := len(pairs)
+	numPairs := l / 2
+	result := make([]string, numPairs)
+	for i := 0; i < numPairs; i += 1 {
+		result[i] = stringIndexedInto[pairs[i*2]:pairs[i*2+1]]
+	}
+	// convert indexes to strings
+
+	if len(result) == 0 {
+		err = fmt.Errorf("ExpectRegex didn't find regex '%v'.", regex)
+	} else {
+		// The number in pairs[1] is an index of a first
+		// character outside the whole match
+		putBackIdx := pairs[1]
+		if len(stringIndexedInto) > putBackIdx {
+			stringToPutBack := stringIndexedInto[putBackIdx:]
+			stringIndexedInto = stringIndexedInto[:putBackIdx]
+			expect.buf.PutBack([]byte(stringToPutBack))
+		}
+	}
+	return result, stringIndexedInto, err
+}
+
+func (expect *ExpectSubprocess) expectTimeoutRegexFind(regex string, timeout time.Duration) (result []string, out string, err error) {
+	t := make(chan bool)
+	go func() {
+		result, out, err = expect.ExpectRegexFindWithOutput(regex)
+		t <- false
+	}()
+	go func() {
+		time.Sleep(timeout)
+		err = fmt.Errorf("ExpectRegex timed out after %v finding '%v'.\nOutput:\n%s", timeout, regex, expect.Collect())
+		t <- true
+	}()
+	<-t
+	return result, out, err
+}
+
+func (expect *ExpectSubprocess) ExpectRegexFind(regex string) ([]string, error) {
+	result, _, err := expect.expectRegexFind(regex, false)
+	return result, err
+}
+
+func (expect *ExpectSubprocess) ExpectTimeoutRegexFind(regex string, timeout time.Duration) ([]string, error) {
+	result, _, err := expect.expectTimeoutRegexFind(regex, timeout)
+	return result, err
+}
+
+func (expect *ExpectSubprocess) ExpectRegexFindWithOutput(regex string) ([]string, string, error) {
+	return expect.expectRegexFind(regex, true)
+}
+
+func (expect *ExpectSubprocess) ExpectTimeoutRegexFindWithOutput(regex string, timeout time.Duration) ([]string, string, error) {
+	return expect.expectTimeoutRegexFind(regex, timeout)
+}
+
+func buildKMPTable(searchString string) []int {
+	pos := 2
+	cnd := 0
+	length := len(searchString)
+
+	var table []int
+	if length < 2 {
+		length = 2
+	}
+
+	table = make([]int, length)
+	table[0] = -1
+	table[1] = 0
+
+	for pos < len(searchString) {
+		if searchString[pos-1] == searchString[cnd] {
+			cnd += 1
+			table[pos] = cnd
+			pos += 1
+		} else if cnd > 0 {
+			cnd = table[cnd]
+		} else {
+			table[pos] = 0
+			pos += 1
+		}
+	}
+	return table
+}
+
+func (expect *ExpectSubprocess) ExpectTimeout(searchString string, timeout time.Duration) (e error) {
+	result := make(chan error)
+	go func() {
+		result <- expect.Expect(searchString)
+	}()
+	select {
+	case e = <-result:
+	case <-time.After(timeout):
+		e = fmt.Errorf("Expect timed out after %v waiting for '%v'.\nOutput:\n%s", timeout, searchString, expect.Collect())
+	}
+	return e
+}
+
+func (expect *ExpectSubprocess) Expect(searchString string) (e error) {
+	target := len(searchString)
+	if target < 1 {
+		return ErrEmptySearch
+	}
+	chunk := make([]byte, target*2)
+	if expect.outputBuffer != nil {
+		expect.outputBuffer = expect.outputBuffer[0:]
+	}
+	m := 0
+	i := 0
+	// Build KMP Table
+	table := buildKMPTable(searchString)
+
+	for {
+		n, err := expect.buf.Read(chunk)
+		if err != nil {
+			return err
+		}
+		if expect.outputBuffer != nil {
+			expect.outputBuffer = append(expect.outputBuffer, chunk[:n]...)
+		}
+		offset := m + i
+		for m+i-offset < n {
+			if searchString[i] == chunk[m+i-offset] {
+				i += 1
+				if i == target {
+					unreadIndex := m + i - offset
+					if len(chunk) > unreadIndex {
+						expect.buf.PutBack(chunk[unreadIndex:n])
+					}
+					return nil
+				}
+			} else {
+				m += i - table[i]
+				if table[i] > -1 {
+					i = table[i]
+				} else {
+					i = 0
+				}
+			}
+		}
+	}
+}
+
+func (expect *ExpectSubprocess) Send(command string) error {
+	_, err := io.WriteString(expect.buf.f, command)
+	return err
+}
+
+func (expect *ExpectSubprocess) Capture() {
+	if expect.outputBuffer == nil {
+		expect.outputBuffer = make([]byte, 0)
+	}
+}
+
+func (expect *ExpectSubprocess) Collect() []byte {
+	collectOutput := make([]byte, len(expect.outputBuffer))
+	copy(collectOutput, expect.outputBuffer)
+	expect.outputBuffer = nil
+	return collectOutput
+}
+
+func (expect *ExpectSubprocess) SendLine(command string) error {
+	_, err := io.WriteString(expect.buf.f, command+"\r\n")
+	return err
+}
+
+func (expect *ExpectSubprocess) Interact() {
+	defer expect.Cmd.Wait()
+	io.Copy(os.Stdout, &expect.buf.b)
+	go io.Copy(os.Stdout, expect.buf.f)
+	go io.Copy(expect.buf.f, os.Stdin)
+}
+
+func (expect *ExpectSubprocess) ReadUntil(delim byte) ([]byte, error) {
+	join := make([]byte, 0, 512)
+	chunk := make([]byte, 255)
+
+	for {
+		n, err := expect.buf.Read(chunk)
+
+		for i := 0; i < n; i++ {
+			if chunk[i] == delim {
+				if len(chunk) > i+1 {
+					expect.buf.PutBack(chunk[i+1:n])
+				}
+				return join, nil
+			} else {
+				join = append(join, chunk[i])
+			}
+		}
+
+		if err != nil {
+			return join, err
+		}
+	}
+}
+
+func (expect *ExpectSubprocess) Wait() error {
+	return expect.Cmd.Wait()
+}
+
+func (expect *ExpectSubprocess) ReadLine() (string, error) {
+	str, err := expect.ReadUntil('\n')
+	return string(str), err
+}
+
+func _start(expect *ExpectSubprocess) (*ExpectSubprocess, error) {
+	f, err := pty.Start(expect.Cmd)
+	if err != nil {
+		return nil, err
+	}
+	expect.buf.f = f
+
+	return expect, nil
+}
+
+func _spawn(command string) (*ExpectSubprocess, error) {
+	wrapper := new(ExpectSubprocess)
+
+	wrapper.outputBuffer = nil
+
+	splitArgs, err := shell.Split(command)
+	if err != nil {
+		return nil, err
+	}
+	numArguments := len(splitArgs) - 1
+	if numArguments < 0 {
+		return nil, errors.New("gexpect: No command given to spawn")
+	}
+	path, err := exec.LookPath(splitArgs[0])
+	if err != nil {
+		return nil, err
+	}
+
+	if numArguments >= 1 {
+		wrapper.Cmd = exec.Command(path, splitArgs[1:]...)
+	} else {
+		wrapper.Cmd = exec.Command(path)
+	}
+	wrapper.buf = new(buffer)
+
+	return wrapper, nil
+}
diff --git a/vendor/github.com/coreos/go-iptables/LICENSE b/vendor/github.com/coreos/go-iptables/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/vendor/github.com/coreos/go-iptables/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/coreos/go-iptables/iptables/iptables.go b/vendor/github.com/coreos/go-iptables/iptables/iptables.go
new file mode 100644
index 0000000000..4b2f2f2f4b
--- /dev/null
+++ b/vendor/github.com/coreos/go-iptables/iptables/iptables.go
@@ -0,0 +1,295 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package iptables
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os/exec"
+	"regexp"
+	"strconv"
+	"strings"
+	"syscall"
+)
+
+// Adds the output of stderr to exec.ExitError
+type Error struct {
+	exec.ExitError
+	msg string
+}
+
+func (e *Error) ExitStatus() int {
+	return e.Sys().(syscall.WaitStatus).ExitStatus()
+}
+
+func (e *Error) Error() string {
+	return fmt.Sprintf("exit status %v: %v", e.ExitStatus(), e.msg)
+}
+
+type IPTables struct {
+	path     string
+	hasCheck bool
+	hasWait  bool
+}
+
+func New() (*IPTables, error) {
+	path, err := exec.LookPath("iptables")
+	if err != nil {
+		return nil, err
+	}
+	checkPresent, waitPresent, err := getIptablesCommandSupport()
+	if err != nil {
+		return nil, fmt.Errorf("error checking iptables version: %v", err)
+	}
+	ipt := IPTables{
+		path:     path,
+		hasCheck: checkPresent,
+		hasWait:  waitPresent,
+	}
+	return &ipt, nil
+}
+
+// Exists checks if given rulespec in specified table/chain exists
+func (ipt *IPTables) Exists(table, chain string, rulespec ...string) (bool, error) {
+	if !ipt.hasCheck {
+		return ipt.existsForOldIptables(table, chain, rulespec)
+
+	}
+	cmd := append([]string{"-t", table, "-C", chain}, rulespec...)
+	err := ipt.run(cmd...)
+	eerr, eok := err.(*Error)
+	switch {
+	case err == nil:
+		return true, nil
+	case eok && eerr.ExitStatus() == 1:
+		return false, nil
+	default:
+		return false, err
+	}
+}
+
+// Insert inserts rulespec to specified table/chain (in specified pos)
+func (ipt *IPTables) Insert(table, chain string, pos int, rulespec ...string) error {
+	cmd := append([]string{"-t", table, "-I", chain, strconv.Itoa(pos)}, rulespec...)
+	return ipt.run(cmd...)
+}
+
+// Append appends rulespec to specified table/chain
+func (ipt *IPTables) Append(table, chain string, rulespec ...string) error {
+	cmd := append([]string{"-t", table, "-A", chain}, rulespec...)
+	return ipt.run(cmd...)
+}
+
+// AppendUnique acts like Append except that it won't add a duplicate
+func (ipt *IPTables) AppendUnique(table, chain string, rulespec ...string) error {
+	exists, err := ipt.Exists(table, chain, rulespec...)
+	if err != nil {
+		return err
+	}
+
+	if !exists {
+		return ipt.Append(table, chain, rulespec...)
+	}
+
+	return nil
+}
+
+// Delete removes rulespec in specified table/chain
+func (ipt *IPTables) Delete(table, chain string, rulespec ...string) error {
+	cmd := append([]string{"-t", table, "-D", chain}, rulespec...)
+	return ipt.run(cmd...)
+}
+
+// List rules in specified table/chain
+func (ipt *IPTables) List(table, chain string) ([]string, error) {
+	args := []string{"-t", table, "-S", chain}
+	var stdout bytes.Buffer
+	if err := ipt.runWithOutput(args, &stdout); err != nil {
+		return nil, err
+	}
+
+	rules := strings.Split(stdout.String(), "\n")
+	if len(rules) > 0 && rules[len(rules)-1] == "" {
+		rules = rules[:len(rules)-1]
+	}
+
+	return rules, nil
+}
+
+func (ipt *IPTables) NewChain(table, chain string) error {
+	return ipt.run("-t", table, "-N", chain)
+}
+
+// ClearChain flushed (deletes all rules) in the specified table/chain.
+// If the chain does not exist, a new one will be created
+func (ipt *IPTables) ClearChain(table, chain string) error {
+	err := ipt.NewChain(table, chain)
+
+	eerr, eok := err.(*Error)
+	switch {
+	case err == nil:
+		return nil
+	case eok && eerr.ExitStatus() == 1:
+		// chain already exists. Flush (clear) it.
+		return ipt.run("-t", table, "-F", chain)
+	default:
+		return err
+	}
+}
+
+// RenameChain renames the old chain to the new one.
+func (ipt *IPTables) RenameChain(table, oldChain, newChain string) error {
+	return ipt.run("-t", table, "-E", oldChain, newChain)
+}
+
+// DeleteChain deletes the chain in the specified table.
+// The chain must be empty
+func (ipt *IPTables) DeleteChain(table, chain string) error {
+	return ipt.run("-t", table, "-X", chain)
+}
+
+// run runs an iptables command with the given arguments, ignoring
+// any stdout output
+func (ipt *IPTables) run(args ...string) error {
+	return ipt.runWithOutput(args, nil)
+}
+
+// runWithOutput runs an iptables command with the given arguments,
+// writing any stdout output to the given writer
+func (ipt *IPTables) runWithOutput(args []string, stdout io.Writer) error {
+	args = append([]string{ipt.path}, args...)
+	if ipt.hasWait {
+		args = append(args, "--wait")
+	} else {
+		fmu, err := newXtablesFileLock()
+		if err != nil {
+			return err
+		}
+		ul, err := fmu.tryLock()
+		if err != nil {
+			return err
+		}
+		defer ul.Unlock()
+	}
+
+	var stderr bytes.Buffer
+	cmd := exec.Cmd{
+		Path:   ipt.path,
+		Args:   args,
+		Stdout: stdout,
+		Stderr: &stderr,
+	}
+
+	if err := cmd.Run(); err != nil {
+		return &Error{*(err.(*exec.ExitError)), stderr.String()}
+	}
+
+	return nil
+}
+
+// Checks if iptables has the "-C" and "--wait" flag
+func getIptablesCommandSupport() (bool, bool, error) {
+	vstring, err := getIptablesVersionString()
+	if err != nil {
+		return false, false, err
+	}
+
+	v1, v2, v3, err := extractIptablesVersion(vstring)
+	if err != nil {
+		return false, false, err
+	}
+
+	return iptablesHasCheckCommand(v1, v2, v3), iptablesHasWaitCommand(v1, v2, v3), nil
+}
+
+// getIptablesVersion returns the first three components of the iptables version.
+// e.g. "iptables v1.3.66" would return (1, 3, 66, nil)
+func extractIptablesVersion(str string) (int, int, int, error) {
+	versionMatcher := regexp.MustCompile("v([0-9]+)\\.([0-9]+)\\.([0-9]+)")
+	result := versionMatcher.FindStringSubmatch(str)
+	if result == nil {
+		return 0, 0, 0, fmt.Errorf("no iptables version found in string: %s", str)
+	}
+
+	v1, err := strconv.Atoi(result[1])
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	v2, err := strconv.Atoi(result[2])
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	v3, err := strconv.Atoi(result[3])
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	return v1, v2, v3, nil
+}
+
+// Runs "iptables --version" to get the version string
+func getIptablesVersionString() (string, error) {
+	cmd := exec.Command("iptables", "--version")
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err := cmd.Run()
+	if err != nil {
+		return "", err
+	}
+	return out.String(), nil
+}
+
+// Checks if an iptables version is after 1.4.11, when --check was added
+func iptablesHasCheckCommand(v1 int, v2 int, v3 int) bool {
+	if v1 > 1 {
+		return true
+	}
+	if v1 == 1 && v2 > 4 {
+		return true
+	}
+	if v1 == 1 && v2 == 4 && v3 >= 11 {
+		return true
+	}
+	return false
+}
+
+// Checks if an iptables version is after 1.4.20, when --wait was added
+func iptablesHasWaitCommand(v1 int, v2 int, v3 int) bool {
+	if v1 > 1 {
+		return true
+	}
+	if v1 == 1 && v2 > 4 {
+		return true
+	}
+	if v1 == 1 && v2 == 4 && v3 >= 20 {
+		return true
+	}
+	return false
+}
+
+// Checks if a rule specification exists for a table
+func (ipt *IPTables) existsForOldIptables(table, chain string, rulespec []string) (bool, error) {
+	rs := strings.Join(append([]string{"-A", chain}, rulespec...), " ")
+	args := []string{"-t", table, "-S"}
+	var stdout bytes.Buffer
+	err := ipt.runWithOutput(args, &stdout)
+	if err != nil {
+		return false, err
+	}
+	return strings.Contains(stdout.String(), rs), nil
+}
diff --git a/vendor/github.com/coreos/go-iptables/iptables/lock.go b/vendor/github.com/coreos/go-iptables/iptables/lock.go
new file mode 100644
index 0000000000..a88e92b4e4
--- /dev/null
+++ b/vendor/github.com/coreos/go-iptables/iptables/lock.go
@@ -0,0 +1,84 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package iptables
+
+import (
+	"os"
+	"sync"
+	"syscall"
+)
+
+const (
+	// In earlier versions of iptables, the xtables lock was implemented
+	// via a Unix socket, but now flock is used via this lockfile:
+	// http://git.netfilter.org/iptables/commit/?id=aa562a660d1555b13cffbac1e744033e91f82707
+	// Note the LSB-conforming "/run" directory does not exist on old
+	// distributions, so assume "/var" is symlinked
+	xtablesLockFilePath = "/var/run/xtables.lock"
+
+	defaultFilePerm = 0600
+)
+
+type Unlocker interface {
+	Unlock() error
+}
+
+type nopUnlocker struct{}
+
+func (_ nopUnlocker) Unlock() error { return nil }
+
+type fileLock struct {
+	// mu is used to protect against concurrent invocations from within this process
+	mu sync.Mutex
+	fd int
+}
+
+// tryLock takes an exclusive lock on the xtables lock file without blocking.
+// This is best-effort only: if the exclusive lock would block (i.e. because
+// another process already holds it), no error is returned. Otherwise, any
+// error encountered during the locking operation is returned.
+// The returned Unlocker should be used to release the lock when the caller is
+// done invoking iptables commands.
+func (l *fileLock) tryLock() (Unlocker, error) {
+	l.mu.Lock()
+	err := syscall.Flock(l.fd, syscall.LOCK_EX|syscall.LOCK_NB)
+	switch err {
+	case syscall.EWOULDBLOCK:
+		l.mu.Unlock()
+		return nopUnlocker{}, nil
+	case nil:
+		return l, nil
+	default:
+		l.mu.Unlock()
+		return nil, err
+	}
+}
+
+// Unlock closes the underlying file, which implicitly unlocks it as well. It
+// also unlocks the associated mutex.
+func (l *fileLock) Unlock() error {
+	defer l.mu.Unlock()
+	return syscall.Close(l.fd)
+}
+
+// newXtablesFileLock opens a new lock on the xtables lockfile without
+// acquiring the lock
+func newXtablesFileLock() (*fileLock, error) {
+	fd, err := syscall.Open(xtablesLockFilePath, os.O_CREATE, defaultFilePerm)
+	if err != nil {
+		return nil, err
+	}
+	return &fileLock{fd: fd}, nil
+}
diff --git a/vendor/github.com/coreos/go-semver/LICENSE b/vendor/github.com/coreos/go-semver/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/coreos/go-semver/example.go b/vendor/github.com/coreos/go-semver/example.go
new file mode 100644
index 0000000000..fd2ee5af27
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/example.go
@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+	"github.com/coreos/go-semver/semver"
+	"os"
+)
+
+func main() {
+	vA, err := semver.NewVersion(os.Args[1])
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	vB, err := semver.NewVersion(os.Args[2])
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	fmt.Printf("%s < %s == %t\n", vA, vB, vA.LessThan(*vB))
+}
diff --git a/vendor/github.com/coreos/go-semver/semver/semver.go b/vendor/github.com/coreos/go-semver/semver/semver.go
new file mode 100644
index 0000000000..000a020586
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/semver/semver.go
@@ -0,0 +1,257 @@
+// Copyright 2013-2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Semantic Versions http://semver.org
+package semver
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+type Version struct {
+	Major      int64
+	Minor      int64
+	Patch      int64
+	PreRelease PreRelease
+	Metadata   string
+}
+
+type PreRelease string
+
+func splitOff(input *string, delim string) (val string) {
+	parts := strings.SplitN(*input, delim, 2)
+
+	if len(parts) == 2 {
+		*input = parts[0]
+		val = parts[1]
+	}
+
+	return val
+}
+
+func NewVersion(version string) (*Version, error) {
+	v := Version{}
+
+	v.Metadata = splitOff(&version, "+")
+	v.PreRelease = PreRelease(splitOff(&version, "-"))
+
+	dotParts := strings.SplitN(version, ".", 3)
+
+	if len(dotParts) != 3 {
+		return nil, errors.New(fmt.Sprintf("%s is not in dotted-tri format", version))
+	}
+
+	parsed := make([]int64, 3, 3)
+
+	for i, v := range dotParts[:3] {
+		val, err := strconv.ParseInt(v, 10, 64)
+		parsed[i] = val
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	v.Major = parsed[0]
+	v.Minor = parsed[1]
+	v.Patch = parsed[2]
+
+	return &v, nil
+}
+
+func Must(v *Version, err error) *Version {
+	if err != nil {
+		panic(err)
+	}
+	return v
+}
+
+func (v Version) String() string {
+	var buffer bytes.Buffer
+
+	fmt.Fprintf(&buffer, "%d.%d.%d", v.Major, v.Minor, v.Patch)
+
+	if v.PreRelease != "" {
+		fmt.Fprintf(&buffer, "-%s", v.PreRelease)
+	}
+
+	if v.Metadata != "" {
+		fmt.Fprintf(&buffer, "+%s", v.Metadata)
+	}
+
+	return buffer.String()
+}
+
+func (v *Version) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var data string
+	if err := unmarshal(&data); err != nil {
+		return err
+	}
+	vv, err := NewVersion(data)
+	if err != nil {
+		return err
+	}
+	*v = *vv
+	return nil
+}
+
+func (v Version) MarshalJSON() ([]byte, error) {
+	return []byte(`"` + v.String() + `"`), nil
+}
+
+func (v *Version) UnmarshalJSON(data []byte) error {
+	l := len(data)
+	if l == 0 || string(data) == `""` {
+		return nil
+	}
+	if l < 2 || data[0] != '"' || data[l-1] != '"' {
+		return errors.New("invalid semver string")
+	}
+	vv, err := NewVersion(string(data[1 : l-1]))
+	if err != nil {
+		return err
+	}
+	*v = *vv
+	return nil
+}
+
+func (v Version) LessThan(versionB Version) bool {
+	versionA := v
+	cmp := recursiveCompare(versionA.Slice(), versionB.Slice())
+
+	if cmp == 0 {
+		cmp = preReleaseCompare(versionA, versionB)
+	}
+
+	if cmp == -1 {
+		return true
+	}
+
+	return false
+}
+
+/* Slice converts the comparable parts of the semver into a slice of strings */
+func (v Version) Slice() []int64 {
+	return []int64{v.Major, v.Minor, v.Patch}
+}
+
+func (p PreRelease) Slice() []string {
+	preRelease := string(p)
+	return strings.Split(preRelease, ".")
+}
+
+func preReleaseCompare(versionA Version, versionB Version) int {
+	a := versionA.PreRelease
+	b := versionB.PreRelease
+
+	/* Handle the case where if two versions are otherwise equal it is the
+	 * one without a PreRelease that is greater */
+	if len(a) == 0 && (len(b) > 0) {
+		return 1
+	} else if len(b) == 0 && (len(a) > 0) {
+		return -1
+	}
+
+	// If there is a prelease, check and compare each part.
+	return recursivePreReleaseCompare(a.Slice(), b.Slice())
+}
+
+func recursiveCompare(versionA []int64, versionB []int64) int {
+	if len(versionA) == 0 {
+		return 0
+	}
+
+	a := versionA[0]
+	b := versionB[0]
+
+	if a > b {
+		return 1
+	} else if a < b {
+		return -1
+	}
+
+	return recursiveCompare(versionA[1:], versionB[1:])
+}
+
+func recursivePreReleaseCompare(versionA []string, versionB []string) int {
+	// Handle slice length disparity.
+	if len(versionA) == 0 {
+		// Nothing to compare too, so we return 0
+		return 0
+	} else if len(versionB) == 0 {
+		// We're longer than versionB so return 1.
+		return 1
+	}
+
+	a := versionA[0]
+	b := versionB[0]
+
+	aInt := false
+	bInt := false
+
+	aI, err := strconv.Atoi(versionA[0])
+	if err == nil {
+		aInt = true
+	}
+
+	bI, err := strconv.Atoi(versionB[0])
+	if err == nil {
+		bInt = true
+	}
+
+	// Handle Integer Comparison
+	if aInt && bInt {
+		if aI > bI {
+			return 1
+		} else if aI < bI {
+			return -1
+		}
+	}
+
+	// Handle String Comparison
+	if a > b {
+		return 1
+	} else if a < b {
+		return -1
+	}
+
+	return recursivePreReleaseCompare(versionA[1:], versionB[1:])
+}
+
+// BumpMajor increments the Major field by 1 and resets all other fields to their default values
+func (v *Version) BumpMajor() {
+	v.Major += 1
+	v.Minor = 0
+	v.Patch = 0
+	v.PreRelease = PreRelease("")
+	v.Metadata = ""
+}
+
+// BumpMinor increments the Minor field by 1 and resets all other fields to their default values
+func (v *Version) BumpMinor() {
+	v.Minor += 1
+	v.Patch = 0
+	v.PreRelease = PreRelease("")
+	v.Metadata = ""
+}
+
+// BumpPatch increments the Patch field by 1 and resets all other fields to their default values
+func (v *Version) BumpPatch() {
+	v.Patch += 1
+	v.PreRelease = PreRelease("")
+	v.Metadata = ""
+}
diff --git a/vendor/github.com/coreos/go-semver/semver/sort.go b/vendor/github.com/coreos/go-semver/semver/sort.go
new file mode 100644
index 0000000000..e256b41a5d
--- /dev/null
+++ b/vendor/github.com/coreos/go-semver/semver/sort.go
@@ -0,0 +1,38 @@
+// Copyright 2013-2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package semver
+
+import (
+	"sort"
+)
+
+type Versions []*Version
+
+func (s Versions) Len() int {
+	return len(s)
+}
+
+func (s Versions) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
+func (s Versions) Less(i, j int) bool {
+	return s[i].LessThan(*s[j])
+}
+
+// Sort sorts the given slice of Version
+func Sort(versions []*Version) {
+	sort.Sort(Versions(versions))
+}
diff --git a/vendor/github.com/coreos/go-systemd/LICENSE b/vendor/github.com/coreos/go-systemd/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/coreos/go-systemd/activation/files.go b/vendor/github.com/coreos/go-systemd/activation/files.go
new file mode 100644
index 0000000000..c8e85fcd58
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/activation/files.go
@@ -0,0 +1,52 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package activation implements primitives for systemd socket activation.
+package activation
+
+import (
+	"os"
+	"strconv"
+	"syscall"
+)
+
+// based on: https://gist.github.com/alberts/4640792
+const (
+	listenFdsStart = 3
+)
+
+func Files(unsetEnv bool) []*os.File {
+	if unsetEnv {
+		defer os.Unsetenv("LISTEN_PID")
+		defer os.Unsetenv("LISTEN_FDS")
+	}
+
+	pid, err := strconv.Atoi(os.Getenv("LISTEN_PID"))
+	if err != nil || pid != os.Getpid() {
+		return nil
+	}
+
+	nfds, err := strconv.Atoi(os.Getenv("LISTEN_FDS"))
+	if err != nil || nfds == 0 {
+		return nil
+	}
+
+	files := make([]*os.File, 0, nfds)
+	for fd := listenFdsStart; fd < listenFdsStart+nfds; fd++ {
+		syscall.CloseOnExec(fd)
+		files = append(files, os.NewFile(uintptr(fd), "LISTEN_FD_"+strconv.Itoa(fd)))
+	}
+
+	return files
+}
diff --git a/vendor/github.com/coreos/go-systemd/activation/listeners.go b/vendor/github.com/coreos/go-systemd/activation/listeners.go
new file mode 100644
index 0000000000..df27c29e9e
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/activation/listeners.go
@@ -0,0 +1,62 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package activation
+
+import (
+	"crypto/tls"
+	"net"
+)
+
+// Listeners returns a slice containing a net.Listener for each matching socket type
+// passed to this process.
+//
+// The order of the file descriptors is preserved in the returned slice.
+// Nil values are used to fill any gaps. For example if systemd were to return file descriptors
+// corresponding with "udp, tcp, tcp", then the slice would contain {nil, net.Listener, net.Listener}
+func Listeners(unsetEnv bool) ([]net.Listener, error) {
+	files := Files(unsetEnv)
+	listeners := make([]net.Listener, len(files))
+
+	for i, f := range files {
+		if pc, err := net.FileListener(f); err == nil {
+			listeners[i] = pc
+		}
+	}
+	return listeners, nil
+}
+
+// TLSListeners returns a slice containing a net.listener for each matching TCP socket type
+// passed to this process.
+// It uses default Listeners func and forces TCP sockets handlers to use TLS based on tlsConfig.
+func TLSListeners(unsetEnv bool, tlsConfig *tls.Config) ([]net.Listener, error) {
+	listeners, err := Listeners(unsetEnv)
+
+	if listeners == nil || err != nil {
+		return nil, err
+	}
+
+	if tlsConfig != nil && err == nil {
+		tlsConfig.NextProtos = []string{"http/1.1"}
+
+		for i, l := range listeners {
+			// Activate TLS only for TCP sockets
+			if l.Addr().Network() == "tcp" {
+				listeners[i] = tls.NewListener(l, tlsConfig)
+			}
+		}
+	}
+
+	return listeners, err
+}
diff --git a/vendor/github.com/coreos/go-systemd/activation/packetconns.go b/vendor/github.com/coreos/go-systemd/activation/packetconns.go
new file mode 100644
index 0000000000..48b2ca029d
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/activation/packetconns.go
@@ -0,0 +1,37 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package activation
+
+import (
+	"net"
+)
+
+// PacketConns returns a slice containing a net.PacketConn for each matching socket type
+// passed to this process.
+//
+// The order of the file descriptors is preserved in the returned slice.
+// Nil values are used to fill any gaps. For example if systemd were to return file descriptors
+// corresponding with "udp, tcp, udp", then the slice would contain {net.PacketConn, nil, net.PacketConn}
+func PacketConns(unsetEnv bool) ([]net.PacketConn, error) {
+	files := Files(unsetEnv)
+	conns := make([]net.PacketConn, len(files))
+
+	for i, f := range files {
+		if pc, err := net.FilePacketConn(f); err == nil {
+			conns[i] = pc
+		}
+	}
+	return conns, nil
+}
diff --git a/vendor/github.com/coreos/go-systemd/dbus/dbus.go b/vendor/github.com/coreos/go-systemd/dbus/dbus.go
new file mode 100644
index 0000000000..1699b90332
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/dbus/dbus.go
@@ -0,0 +1,203 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Integration with the systemd D-Bus API.  See http://www.freedesktop.org/wiki/Software/systemd/dbus/
+package dbus
+
+import (
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+
+	"github.com/godbus/dbus"
+)
+
+const (
+	alpha        = `abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ`
+	num          = `0123456789`
+	alphanum     = alpha + num
+	signalBuffer = 100
+)
+
+// needsEscape checks whether a byte in a potential dbus ObjectPath needs to be escaped
+func needsEscape(i int, b byte) bool {
+	// Escape everything that is not a-z-A-Z-0-9
+	// Also escape 0-9 if it's the first character
+	return strings.IndexByte(alphanum, b) == -1 ||
+		(i == 0 && strings.IndexByte(num, b) != -1)
+}
+
+// PathBusEscape sanitizes a constituent string of a dbus ObjectPath using the
+// rules that systemd uses for serializing special characters.
+func PathBusEscape(path string) string {
+	// Special case the empty string
+	if len(path) == 0 {
+		return "_"
+	}
+	n := []byte{}
+	for i := 0; i < len(path); i++ {
+		c := path[i]
+		if needsEscape(i, c) {
+			e := fmt.Sprintf("_%x", c)
+			n = append(n, []byte(e)...)
+		} else {
+			n = append(n, c)
+		}
+	}
+	return string(n)
+}
+
+// Conn is a connection to systemd's dbus endpoint.
+type Conn struct {
+	// sysconn/sysobj are only used to call dbus methods
+	sysconn *dbus.Conn
+	sysobj  dbus.BusObject
+
+	// sigconn/sigobj are only used to receive dbus signals
+	sigconn *dbus.Conn
+	sigobj  dbus.BusObject
+
+	jobListener struct {
+		jobs map[dbus.ObjectPath]chan<- string
+		sync.Mutex
+	}
+	subscriber struct {
+		updateCh chan<- *SubStateUpdate
+		errCh    chan<- error
+		sync.Mutex
+		ignore      map[dbus.ObjectPath]int64
+		cleanIgnore int64
+	}
+}
+
+// New establishes a connection to the system bus and authenticates.
+// Callers should call Close() when done with the connection.
+func New() (*Conn, error) {
+	return NewConnection(func() (*dbus.Conn, error) {
+		return dbusAuthHelloConnection(dbus.SystemBusPrivate)
+	})
+}
+
+// NewUserConnection establishes a connection to the session bus and
+// authenticates. This can be used to connect to systemd user instances.
+// Callers should call Close() when done with the connection.
+func NewUserConnection() (*Conn, error) {
+	return NewConnection(func() (*dbus.Conn, error) {
+		return dbusAuthHelloConnection(dbus.SessionBusPrivate)
+	})
+}
+
+// NewSystemdConnection establishes a private, direct connection to systemd.
+// This can be used for communicating with systemd without a dbus daemon.
+// Callers should call Close() when done with the connection.
+func NewSystemdConnection() (*Conn, error) {
+	return NewConnection(func() (*dbus.Conn, error) {
+		// We skip Hello when talking directly to systemd.
+		return dbusAuthConnection(func() (*dbus.Conn, error) {
+			return dbus.Dial("unix:path=/run/systemd/private")
+		})
+	})
+}
+
+// Close closes an established connection
+func (c *Conn) Close() {
+	c.sysconn.Close()
+	c.sigconn.Close()
+}
+
+// NewConnection establishes a connection to a bus using a caller-supplied function.
+// This allows connecting to remote buses through a user-supplied mechanism.
+// The supplied function may be called multiple times, and should return independent connections.
+// The returned connection must be fully initialised: the org.freedesktop.DBus.Hello call must have succeeded,
+// and any authentication should be handled by the function.
+func NewConnection(dialBus func() (*dbus.Conn, error)) (*Conn, error) {
+	sysconn, err := dialBus()
+	if err != nil {
+		return nil, err
+	}
+
+	sigconn, err := dialBus()
+	if err != nil {
+		sysconn.Close()
+		return nil, err
+	}
+
+	c := &Conn{
+		sysconn: sysconn,
+		sysobj:  systemdObject(sysconn),
+		sigconn: sigconn,
+		sigobj:  systemdObject(sigconn),
+	}
+
+	c.subscriber.ignore = make(map[dbus.ObjectPath]int64)
+	c.jobListener.jobs = make(map[dbus.ObjectPath]chan<- string)
+
+	// Setup the listeners on jobs so that we can get completions
+	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
+		"type='signal', interface='org.freedesktop.systemd1.Manager', member='JobRemoved'")
+
+	c.dispatch()
+	return c, nil
+}
+
+// GetManagerProperty returns the value of a property on the org.freedesktop.systemd1.Manager
+// interface. The value is returned in its string representation, as defined at
+// https://developer.gnome.org/glib/unstable/gvariant-text.html
+func (c *Conn) GetManagerProperty(prop string) (string, error) {
+	variant, err := c.sysobj.GetProperty("org.freedesktop.systemd1.Manager." + prop)
+	if err != nil {
+		return "", err
+	}
+	return variant.String(), nil
+}
+
+func dbusAuthConnection(createBus func() (*dbus.Conn, error)) (*dbus.Conn, error) {
+	conn, err := createBus()
+	if err != nil {
+		return nil, err
+	}
+
+	// Only use EXTERNAL method, and hardcode the uid (not username)
+	// to avoid a username lookup (which requires a dynamically linked
+	// libc)
+	methods := []dbus.Auth{dbus.AuthExternal(strconv.Itoa(os.Getuid()))}
+
+	err = conn.Auth(methods)
+	if err != nil {
+		conn.Close()
+		return nil, err
+	}
+
+	return conn, nil
+}
+
+func dbusAuthHelloConnection(createBus func() (*dbus.Conn, error)) (*dbus.Conn, error) {
+	conn, err := dbusAuthConnection(createBus)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = conn.Hello(); err != nil {
+		conn.Close()
+		return nil, err
+	}
+
+	return conn, nil
+}
+
+func systemdObject(conn *dbus.Conn) dbus.BusObject {
+	return conn.Object("org.freedesktop.systemd1", dbus.ObjectPath("/org/freedesktop/systemd1"))
+}
diff --git a/vendor/github.com/coreos/go-systemd/dbus/methods.go b/vendor/github.com/coreos/go-systemd/dbus/methods.go
new file mode 100644
index 0000000000..8f32fe8a7d
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/dbus/methods.go
@@ -0,0 +1,484 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package dbus
+
+import (
+	"errors"
+	"path"
+	"strconv"
+
+	"github.com/godbus/dbus"
+)
+
+func (c *Conn) jobComplete(signal *dbus.Signal) {
+	var id uint32
+	var job dbus.ObjectPath
+	var unit string
+	var result string
+	dbus.Store(signal.Body, &id, &job, &unit, &result)
+	c.jobListener.Lock()
+	out, ok := c.jobListener.jobs[job]
+	if ok {
+		out <- result
+		delete(c.jobListener.jobs, job)
+	}
+	c.jobListener.Unlock()
+}
+
+func (c *Conn) startJob(ch chan<- string, job string, args ...interface{}) (int, error) {
+	if ch != nil {
+		c.jobListener.Lock()
+		defer c.jobListener.Unlock()
+	}
+
+	var p dbus.ObjectPath
+	err := c.sysobj.Call(job, 0, args...).Store(&p)
+	if err != nil {
+		return 0, err
+	}
+
+	if ch != nil {
+		c.jobListener.jobs[p] = ch
+	}
+
+	// ignore error since 0 is fine if conversion fails
+	jobID, _ := strconv.Atoi(path.Base(string(p)))
+
+	return jobID, nil
+}
+
+// StartUnit enqueues a start job and depending jobs, if any (unless otherwise
+// specified by the mode string).
+//
+// Takes the unit to activate, plus a mode string. The mode needs to be one of
+// replace, fail, isolate, ignore-dependencies, ignore-requirements. If
+// "replace" the call will start the unit and its dependencies, possibly
+// replacing already queued jobs that conflict with this. If "fail" the call
+// will start the unit and its dependencies, but will fail if this would change
+// an already queued job. If "isolate" the call will start the unit in question
+// and terminate all units that aren't dependencies of it. If
+// "ignore-dependencies" it will start a unit but ignore all its dependencies.
+// If "ignore-requirements" it will start a unit but only ignore the
+// requirement dependencies. It is not recommended to make use of the latter
+// two options.
+//
+// If the provided channel is non-nil, a result string will be sent to it upon
+// job completion: one of done, canceled, timeout, failed, dependency, skipped.
+// done indicates successful execution of a job. canceled indicates that a job
+// has been canceled  before it finished execution. timeout indicates that the
+// job timeout was reached. failed indicates that the job failed. dependency
+// indicates that a job this job has been depending on failed and the job hence
+// has been removed too. skipped indicates that a job was skipped because it
+// didn't apply to the units current state.
+//
+// If no error occurs, the ID of the underlying systemd job will be returned. There
+// does exist the possibility for no error to be returned, but for the returned job
+// ID to be 0. In this case, the actual underlying ID is not 0 and this datapoint
+// should not be considered authoritative.
+//
+// If an error does occur, it will be returned to the user alongside a job ID of 0.
+func (c *Conn) StartUnit(name string, mode string, ch chan<- string) (int, error) {
+	return c.startJob(ch, "org.freedesktop.systemd1.Manager.StartUnit", name, mode)
+}
+
+// StopUnit is similar to StartUnit but stops the specified unit rather
+// than starting it.
+func (c *Conn) StopUnit(name string, mode string, ch chan<- string) (int, error) {
+	return c.startJob(ch, "org.freedesktop.systemd1.Manager.StopUnit", name, mode)
+}
+
+// ReloadUnit reloads a unit.  Reloading is done only if the unit is already running and fails otherwise.
+func (c *Conn) ReloadUnit(name string, mode string, ch chan<- string) (int, error) {
+	return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadUnit", name, mode)
+}
+
+// RestartUnit restarts a service.  If a service is restarted that isn't
+// running it will be started.
+func (c *Conn) RestartUnit(name string, mode string, ch chan<- string) (int, error) {
+	return c.startJob(ch, "org.freedesktop.systemd1.Manager.RestartUnit", name, mode)
+}
+
+// TryRestartUnit is like RestartUnit, except that a service that isn't running
+// is not affected by the restart.
+func (c *Conn) TryRestartUnit(name string, mode string, ch chan<- string) (int, error) {
+	return c.startJob(ch, "org.freedesktop.systemd1.Manager.TryRestartUnit", name, mode)
+}
+
+// ReloadOrRestart attempts a reload if the unit supports it and use a restart
+// otherwise.
+func (c *Conn) ReloadOrRestartUnit(name string, mode string, ch chan<- string) (int, error) {
+	return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadOrRestartUnit", name, mode)
+}
+
+// ReloadOrTryRestart attempts a reload if the unit supports it and use a "Try"
+// flavored restart otherwise.
+func (c *Conn) ReloadOrTryRestartUnit(name string, mode string, ch chan<- string) (int, error) {
+	return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadOrTryRestartUnit", name, mode)
+}
+
+// StartTransientUnit() may be used to create and start a transient unit, which
+// will be released as soon as it is not running or referenced anymore or the
+// system is rebooted. name is the unit name including suffix, and must be
+// unique. mode is the same as in StartUnit(), properties contains properties
+// of the unit.
+func (c *Conn) StartTransientUnit(name string, mode string, properties []Property, ch chan<- string) (int, error) {
+	return c.startJob(ch, "org.freedesktop.systemd1.Manager.StartTransientUnit", name, mode, properties, make([]PropertyCollection, 0))
+}
+
+// KillUnit takes the unit name and a UNIX signal number to send.  All of the unit's
+// processes are killed.
+func (c *Conn) KillUnit(name string, signal int32) {
+	c.sysobj.Call("org.freedesktop.systemd1.Manager.KillUnit", 0, name, "all", signal).Store()
+}
+
+// ResetFailedUnit resets the "failed" state of a specific unit.
+func (c *Conn) ResetFailedUnit(name string) error {
+	return c.sysobj.Call("org.freedesktop.systemd1.Manager.ResetFailedUnit", 0, name).Store()
+}
+
+// getProperties takes the unit name and returns all of its dbus object properties, for the given dbus interface
+func (c *Conn) getProperties(unit string, dbusInterface string) (map[string]interface{}, error) {
+	var err error
+	var props map[string]dbus.Variant
+
+	path := unitPath(unit)
+	if !path.IsValid() {
+		return nil, errors.New("invalid unit name: " + unit)
+	}
+
+	obj := c.sysconn.Object("org.freedesktop.systemd1", path)
+	err = obj.Call("org.freedesktop.DBus.Properties.GetAll", 0, dbusInterface).Store(&props)
+	if err != nil {
+		return nil, err
+	}
+
+	out := make(map[string]interface{}, len(props))
+	for k, v := range props {
+		out[k] = v.Value()
+	}
+
+	return out, nil
+}
+
+// GetUnitProperties takes the unit name and returns all of its dbus object properties.
+func (c *Conn) GetUnitProperties(unit string) (map[string]interface{}, error) {
+	return c.getProperties(unit, "org.freedesktop.systemd1.Unit")
+}
+
+func (c *Conn) getProperty(unit string, dbusInterface string, propertyName string) (*Property, error) {
+	var err error
+	var prop dbus.Variant
+
+	path := unitPath(unit)
+	if !path.IsValid() {
+		return nil, errors.New("invalid unit name: " + unit)
+	}
+
+	obj := c.sysconn.Object("org.freedesktop.systemd1", path)
+	err = obj.Call("org.freedesktop.DBus.Properties.Get", 0, dbusInterface, propertyName).Store(&prop)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Property{Name: propertyName, Value: prop}, nil
+}
+
+func (c *Conn) GetUnitProperty(unit string, propertyName string) (*Property, error) {
+	return c.getProperty(unit, "org.freedesktop.systemd1.Unit", propertyName)
+}
+
+// GetServiceProperty returns property for given service name and property name
+func (c *Conn) GetServiceProperty(service string, propertyName string) (*Property, error) {
+	return c.getProperty(service, "org.freedesktop.systemd1.Service", propertyName)
+}
+
+// GetUnitTypeProperties returns the extra properties for a unit, specific to the unit type.
+// Valid values for unitType: Service, Socket, Target, Device, Mount, Automount, Snapshot, Timer, Swap, Path, Slice, Scope
+// return "dbus.Error: Unknown interface" if the unitType is not the correct type of the unit
+func (c *Conn) GetUnitTypeProperties(unit string, unitType string) (map[string]interface{}, error) {
+	return c.getProperties(unit, "org.freedesktop.systemd1."+unitType)
+}
+
+// SetUnitProperties() may be used to modify certain unit properties at runtime.
+// Not all properties may be changed at runtime, but many resource management
+// settings (primarily those in systemd.cgroup(5)) may. The changes are applied
+// instantly, and stored on disk for future boots, unless runtime is true, in which
+// case the settings only apply until the next reboot. name is the name of the unit
+// to modify. properties are the settings to set, encoded as an array of property
+// name and value pairs.
+func (c *Conn) SetUnitProperties(name string, runtime bool, properties ...Property) error {
+	return c.sysobj.Call("org.freedesktop.systemd1.Manager.SetUnitProperties", 0, name, runtime, properties).Store()
+}
+
+func (c *Conn) GetUnitTypeProperty(unit string, unitType string, propertyName string) (*Property, error) {
+	return c.getProperty(unit, "org.freedesktop.systemd1."+unitType, propertyName)
+}
+
+type UnitStatus struct {
+	Name        string          // The primary unit name as string
+	Description string          // The human readable description string
+	LoadState   string          // The load state (i.e. whether the unit file has been loaded successfully)
+	ActiveState string          // The active state (i.e. whether the unit is currently started or not)
+	SubState    string          // The sub state (a more fine-grained version of the active state that is specific to the unit type, which the active state is not)
+	Followed    string          // A unit that is being followed in its state by this unit, if there is any, otherwise the empty string.
+	Path        dbus.ObjectPath // The unit object path
+	JobId       uint32          // If there is a job queued for the job unit the numeric job id, 0 otherwise
+	JobType     string          // The job type as string
+	JobPath     dbus.ObjectPath // The job object path
+}
+
+type storeFunc func(retvalues ...interface{}) error
+
+func (c *Conn) listUnitsInternal(f storeFunc) ([]UnitStatus, error) {
+	result := make([][]interface{}, 0)
+	err := f(&result)
+	if err != nil {
+		return nil, err
+	}
+
+	resultInterface := make([]interface{}, len(result))
+	for i := range result {
+		resultInterface[i] = result[i]
+	}
+
+	status := make([]UnitStatus, len(result))
+	statusInterface := make([]interface{}, len(status))
+	for i := range status {
+		statusInterface[i] = &status[i]
+	}
+
+	err = dbus.Store(resultInterface, statusInterface...)
+	if err != nil {
+		return nil, err
+	}
+
+	return status, nil
+}
+
+// ListUnits returns an array with all currently loaded units. Note that
+// units may be known by multiple names at the same time, and hence there might
+// be more unit names loaded than actual units behind them.
+func (c *Conn) ListUnits() ([]UnitStatus, error) {
+	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnits", 0).Store)
+}
+
+// ListUnitsFiltered returns an array with units filtered by state.
+// It takes a list of units' statuses to filter.
+func (c *Conn) ListUnitsFiltered(states []string) ([]UnitStatus, error) {
+	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsFiltered", 0, states).Store)
+}
+
+// ListUnitsByPatterns returns an array with units.
+// It takes a list of units' statuses and names to filter.
+// Note that units may be known by multiple names at the same time,
+// and hence there might be more unit names loaded than actual units behind them.
+func (c *Conn) ListUnitsByPatterns(states []string, patterns []string) ([]UnitStatus, error) {
+	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByPatterns", 0, states, patterns).Store)
+}
+
+// ListUnitsByNames returns an array with units. It takes a list of units'
+// names and returns an UnitStatus array. Comparing to ListUnitsByPatterns
+// method, this method returns statuses even for inactive or non-existing
+// units. Input array should contain exact unit names, but not patterns.
+func (c *Conn) ListUnitsByNames(units []string) ([]UnitStatus, error) {
+	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByNames", 0, units).Store)
+}
+
+type UnitFile struct {
+	Path string
+	Type string
+}
+
+func (c *Conn) listUnitFilesInternal(f storeFunc) ([]UnitFile, error) {
+	result := make([][]interface{}, 0)
+	err := f(&result)
+	if err != nil {
+		return nil, err
+	}
+
+	resultInterface := make([]interface{}, len(result))
+	for i := range result {
+		resultInterface[i] = result[i]
+	}
+
+	files := make([]UnitFile, len(result))
+	fileInterface := make([]interface{}, len(files))
+	for i := range files {
+		fileInterface[i] = &files[i]
+	}
+
+	err = dbus.Store(resultInterface, fileInterface...)
+	if err != nil {
+		return nil, err
+	}
+
+	return files, nil
+}
+
+// ListUnitFiles returns an array of all available units on disk.
+func (c *Conn) ListUnitFiles() ([]UnitFile, error) {
+	return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFiles", 0).Store)
+}
+
+// ListUnitFilesByPatterns returns an array of all available units on disk matched the patterns.
+func (c *Conn) ListUnitFilesByPatterns(states []string, patterns []string) ([]UnitFile, error) {
+	return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFilesByPatterns", 0, states, patterns).Store)
+}
+
+type LinkUnitFileChange EnableUnitFileChange
+
+// LinkUnitFiles() links unit files (that are located outside of the
+// usual unit search paths) into the unit search path.
+//
+// It takes a list of absolute paths to unit files to link and two
+// booleans. The first boolean controls whether the unit shall be
+// enabled for runtime only (true, /run), or persistently (false,
+// /etc).
+// The second controls whether symlinks pointing to other units shall
+// be replaced if necessary.
+//
+// This call returns a list of the changes made. The list consists of
+// structures with three strings: the type of the change (one of symlink
+// or unlink), the file name of the symlink and the destination of the
+// symlink.
+func (c *Conn) LinkUnitFiles(files []string, runtime bool, force bool) ([]LinkUnitFileChange, error) {
+	result := make([][]interface{}, 0)
+	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.LinkUnitFiles", 0, files, runtime, force).Store(&result)
+	if err != nil {
+		return nil, err
+	}
+
+	resultInterface := make([]interface{}, len(result))
+	for i := range result {
+		resultInterface[i] = result[i]
+	}
+
+	changes := make([]LinkUnitFileChange, len(result))
+	changesInterface := make([]interface{}, len(changes))
+	for i := range changes {
+		changesInterface[i] = &changes[i]
+	}
+
+	err = dbus.Store(resultInterface, changesInterface...)
+	if err != nil {
+		return nil, err
+	}
+
+	return changes, nil
+}
+
+// EnableUnitFiles() may be used to enable one or more units in the system (by
+// creating symlinks to them in /etc or /run).
+//
+// It takes a list of unit files to enable (either just file names or full
+// absolute paths if the unit files are residing outside the usual unit
+// search paths), and two booleans: the first controls whether the unit shall
+// be enabled for runtime only (true, /run), or persistently (false, /etc).
+// The second one controls whether symlinks pointing to other units shall
+// be replaced if necessary.
+//
+// This call returns one boolean and an array with the changes made. The
+// boolean signals whether the unit files contained any enablement
+// information (i.e. an [Install]) section. The changes list consists of
+// structures with three strings: the type of the change (one of symlink
+// or unlink), the file name of the symlink and the destination of the
+// symlink.
+func (c *Conn) EnableUnitFiles(files []string, runtime bool, force bool) (bool, []EnableUnitFileChange, error) {
+	var carries_install_info bool
+
+	result := make([][]interface{}, 0)
+	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.EnableUnitFiles", 0, files, runtime, force).Store(&carries_install_info, &result)
+	if err != nil {
+		return false, nil, err
+	}
+
+	resultInterface := make([]interface{}, len(result))
+	for i := range result {
+		resultInterface[i] = result[i]
+	}
+
+	changes := make([]EnableUnitFileChange, len(result))
+	changesInterface := make([]interface{}, len(changes))
+	for i := range changes {
+		changesInterface[i] = &changes[i]
+	}
+
+	err = dbus.Store(resultInterface, changesInterface...)
+	if err != nil {
+		return false, nil, err
+	}
+
+	return carries_install_info, changes, nil
+}
+
+type EnableUnitFileChange struct {
+	Type        string // Type of the change (one of symlink or unlink)
+	Filename    string // File name of the symlink
+	Destination string // Destination of the symlink
+}
+
+// DisableUnitFiles() may be used to disable one or more units in the system (by
+// removing symlinks to them from /etc or /run).
+//
+// It takes a list of unit files to disable (either just file names or full
+// absolute paths if the unit files are residing outside the usual unit
+// search paths), and one boolean: whether the unit was enabled for runtime
+// only (true, /run), or persistently (false, /etc).
+//
+// This call returns an array with the changes made. The changes list
+// consists of structures with three strings: the type of the change (one of
+// symlink or unlink), the file name of the symlink and the destination of the
+// symlink.
+func (c *Conn) DisableUnitFiles(files []string, runtime bool) ([]DisableUnitFileChange, error) {
+	result := make([][]interface{}, 0)
+	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.DisableUnitFiles", 0, files, runtime).Store(&result)
+	if err != nil {
+		return nil, err
+	}
+
+	resultInterface := make([]interface{}, len(result))
+	for i := range result {
+		resultInterface[i] = result[i]
+	}
+
+	changes := make([]DisableUnitFileChange, len(result))
+	changesInterface := make([]interface{}, len(changes))
+	for i := range changes {
+		changesInterface[i] = &changes[i]
+	}
+
+	err = dbus.Store(resultInterface, changesInterface...)
+	if err != nil {
+		return nil, err
+	}
+
+	return changes, nil
+}
+
+type DisableUnitFileChange struct {
+	Type        string // Type of the change (one of symlink or unlink)
+	Filename    string // File name of the symlink
+	Destination string // Destination of the symlink
+}
+
+// Reload instructs systemd to scan for and reload unit files. This is
+// equivalent to a 'systemctl daemon-reload'.
+func (c *Conn) Reload() error {
+	return c.sysobj.Call("org.freedesktop.systemd1.Manager.Reload", 0).Store()
+}
+
+func unitPath(name string) dbus.ObjectPath {
+	return dbus.ObjectPath("/org/freedesktop/systemd1/unit/" + PathBusEscape(name))
+}
diff --git a/vendor/github.com/coreos/go-systemd/dbus/properties.go b/vendor/github.com/coreos/go-systemd/dbus/properties.go
new file mode 100644
index 0000000000..7520011564
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/dbus/properties.go
@@ -0,0 +1,218 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package dbus
+
+import (
+	"github.com/godbus/dbus"
+)
+
+// From the systemd docs:
+//
+// The properties array of StartTransientUnit() may take many of the settings
+// that may also be configured in unit files. Not all parameters are currently
+// accepted though, but we plan to cover more properties with future release.
+// Currently you may set the Description, Slice and all dependency types of
+// units, as well as RemainAfterExit, ExecStart for service units,
+// TimeoutStopUSec and PIDs for scope units, and CPUAccounting, CPUShares,
+// BlockIOAccounting, BlockIOWeight, BlockIOReadBandwidth,
+// BlockIOWriteBandwidth, BlockIODeviceWeight, MemoryAccounting, MemoryLimit,
+// DevicePolicy, DeviceAllow for services/scopes/slices. These fields map
+// directly to their counterparts in unit files and as normal D-Bus object
+// properties. The exception here is the PIDs field of scope units which is
+// used for construction of the scope only and specifies the initial PIDs to
+// add to the scope object.
+
+type Property struct {
+	Name  string
+	Value dbus.Variant
+}
+
+type PropertyCollection struct {
+	Name       string
+	Properties []Property
+}
+
+type execStart struct {
+	Path             string   // the binary path to execute
+	Args             []string // an array with all arguments to pass to the executed command, starting with argument 0
+	UncleanIsFailure bool     // a boolean whether it should be considered a failure if the process exits uncleanly
+}
+
+// PropExecStart sets the ExecStart service property.  The first argument is a
+// slice with the binary path to execute followed by the arguments to pass to
+// the executed command. See
+// http://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart=
+func PropExecStart(command []string, uncleanIsFailure bool) Property {
+	execStarts := []execStart{
+		execStart{
+			Path:             command[0],
+			Args:             command,
+			UncleanIsFailure: uncleanIsFailure,
+		},
+	}
+
+	return Property{
+		Name:  "ExecStart",
+		Value: dbus.MakeVariant(execStarts),
+	}
+}
+
+// PropRemainAfterExit sets the RemainAfterExit service property. See
+// http://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit=
+func PropRemainAfterExit(b bool) Property {
+	return Property{
+		Name:  "RemainAfterExit",
+		Value: dbus.MakeVariant(b),
+	}
+}
+
+// PropDescription sets the Description unit property. See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit#Description=
+func PropDescription(desc string) Property {
+	return Property{
+		Name:  "Description",
+		Value: dbus.MakeVariant(desc),
+	}
+}
+
+func propDependency(name string, units []string) Property {
+	return Property{
+		Name:  name,
+		Value: dbus.MakeVariant(units),
+	}
+}
+
+// PropRequires sets the Requires unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Requires=
+func PropRequires(units ...string) Property {
+	return propDependency("Requires", units)
+}
+
+// PropRequiresOverridable sets the RequiresOverridable unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiresOverridable=
+func PropRequiresOverridable(units ...string) Property {
+	return propDependency("RequiresOverridable", units)
+}
+
+// PropRequisite sets the Requisite unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Requisite=
+func PropRequisite(units ...string) Property {
+	return propDependency("Requisite", units)
+}
+
+// PropRequisiteOverridable sets the RequisiteOverridable unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequisiteOverridable=
+func PropRequisiteOverridable(units ...string) Property {
+	return propDependency("RequisiteOverridable", units)
+}
+
+// PropWants sets the Wants unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Wants=
+func PropWants(units ...string) Property {
+	return propDependency("Wants", units)
+}
+
+// PropBindsTo sets the BindsTo unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#BindsTo=
+func PropBindsTo(units ...string) Property {
+	return propDependency("BindsTo", units)
+}
+
+// PropRequiredBy sets the RequiredBy unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiredBy=
+func PropRequiredBy(units ...string) Property {
+	return propDependency("RequiredBy", units)
+}
+
+// PropRequiredByOverridable sets the RequiredByOverridable unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiredByOverridable=
+func PropRequiredByOverridable(units ...string) Property {
+	return propDependency("RequiredByOverridable", units)
+}
+
+// PropWantedBy sets the WantedBy unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#WantedBy=
+func PropWantedBy(units ...string) Property {
+	return propDependency("WantedBy", units)
+}
+
+// PropBoundBy sets the BoundBy unit property.  See
+// http://www.freedesktop.org/software/systemd/main/systemd.unit.html#BoundBy=
+func PropBoundBy(units ...string) Property {
+	return propDependency("BoundBy", units)
+}
+
+// PropConflicts sets the Conflicts unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Conflicts=
+func PropConflicts(units ...string) Property {
+	return propDependency("Conflicts", units)
+}
+
+// PropConflictedBy sets the ConflictedBy unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#ConflictedBy=
+func PropConflictedBy(units ...string) Property {
+	return propDependency("ConflictedBy", units)
+}
+
+// PropBefore sets the Before unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Before=
+func PropBefore(units ...string) Property {
+	return propDependency("Before", units)
+}
+
+// PropAfter sets the After unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#After=
+func PropAfter(units ...string) Property {
+	return propDependency("After", units)
+}
+
+// PropOnFailure sets the OnFailure unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#OnFailure=
+func PropOnFailure(units ...string) Property {
+	return propDependency("OnFailure", units)
+}
+
+// PropTriggers sets the Triggers unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Triggers=
+func PropTriggers(units ...string) Property {
+	return propDependency("Triggers", units)
+}
+
+// PropTriggeredBy sets the TriggeredBy unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#TriggeredBy=
+func PropTriggeredBy(units ...string) Property {
+	return propDependency("TriggeredBy", units)
+}
+
+// PropPropagatesReloadTo sets the PropagatesReloadTo unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#PropagatesReloadTo=
+func PropPropagatesReloadTo(units ...string) Property {
+	return propDependency("PropagatesReloadTo", units)
+}
+
+// PropRequiresMountsFor sets the RequiresMountsFor unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiresMountsFor=
+func PropRequiresMountsFor(units ...string) Property {
+	return propDependency("RequiresMountsFor", units)
+}
+
+// PropSlice sets the Slice unit property.  See
+// http://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#Slice=
+func PropSlice(slice string) Property {
+	return Property{
+		Name:  "Slice",
+		Value: dbus.MakeVariant(slice),
+	}
+}
diff --git a/vendor/github.com/coreos/go-systemd/dbus/set.go b/vendor/github.com/coreos/go-systemd/dbus/set.go
new file mode 100644
index 0000000000..f92e6fbed1
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/dbus/set.go
@@ -0,0 +1,47 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package dbus
+
+type set struct {
+	data map[string]bool
+}
+
+func (s *set) Add(value string) {
+	s.data[value] = true
+}
+
+func (s *set) Remove(value string) {
+	delete(s.data, value)
+}
+
+func (s *set) Contains(value string) (exists bool) {
+	_, exists = s.data[value]
+	return
+}
+
+func (s *set) Length() int {
+	return len(s.data)
+}
+
+func (s *set) Values() (values []string) {
+	for val, _ := range s.data {
+		values = append(values, val)
+	}
+	return
+}
+
+func newSet() *set {
+	return &set{make(map[string]bool)}
+}
diff --git a/vendor/github.com/coreos/go-systemd/dbus/subscription.go b/vendor/github.com/coreos/go-systemd/dbus/subscription.go
new file mode 100644
index 0000000000..996451445c
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/dbus/subscription.go
@@ -0,0 +1,250 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package dbus
+
+import (
+	"errors"
+	"time"
+
+	"github.com/godbus/dbus"
+)
+
+const (
+	cleanIgnoreInterval = int64(10 * time.Second)
+	ignoreInterval      = int64(30 * time.Millisecond)
+)
+
+// Subscribe sets up this connection to subscribe to all systemd dbus events.
+// This is required before calling SubscribeUnits. When the connection closes
+// systemd will automatically stop sending signals so there is no need to
+// explicitly call Unsubscribe().
+func (c *Conn) Subscribe() error {
+	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
+		"type='signal',interface='org.freedesktop.systemd1.Manager',member='UnitNew'")
+	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
+		"type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'")
+
+	err := c.sigobj.Call("org.freedesktop.systemd1.Manager.Subscribe", 0).Store()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Unsubscribe this connection from systemd dbus events.
+func (c *Conn) Unsubscribe() error {
+	err := c.sigobj.Call("org.freedesktop.systemd1.Manager.Unsubscribe", 0).Store()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (c *Conn) dispatch() {
+	ch := make(chan *dbus.Signal, signalBuffer)
+
+	c.sigconn.Signal(ch)
+
+	go func() {
+		for {
+			signal, ok := <-ch
+			if !ok {
+				return
+			}
+
+			if signal.Name == "org.freedesktop.systemd1.Manager.JobRemoved" {
+				c.jobComplete(signal)
+			}
+
+			if c.subscriber.updateCh == nil {
+				continue
+			}
+
+			var unitPath dbus.ObjectPath
+			switch signal.Name {
+			case "org.freedesktop.systemd1.Manager.JobRemoved":
+				unitName := signal.Body[2].(string)
+				c.sysobj.Call("org.freedesktop.systemd1.Manager.GetUnit", 0, unitName).Store(&unitPath)
+			case "org.freedesktop.systemd1.Manager.UnitNew":
+				unitPath = signal.Body[1].(dbus.ObjectPath)
+			case "org.freedesktop.DBus.Properties.PropertiesChanged":
+				if signal.Body[0].(string) == "org.freedesktop.systemd1.Unit" {
+					unitPath = signal.Path
+				}
+			}
+
+			if unitPath == dbus.ObjectPath("") {
+				continue
+			}
+
+			c.sendSubStateUpdate(unitPath)
+		}
+	}()
+}
+
+// Returns two unbuffered channels which will receive all changed units every
+// interval.  Deleted units are sent as nil.
+func (c *Conn) SubscribeUnits(interval time.Duration) (<-chan map[string]*UnitStatus, <-chan error) {
+	return c.SubscribeUnitsCustom(interval, 0, func(u1, u2 *UnitStatus) bool { return *u1 != *u2 }, nil)
+}
+
+// SubscribeUnitsCustom is like SubscribeUnits but lets you specify the buffer
+// size of the channels, the comparison function for detecting changes and a filter
+// function for cutting down on the noise that your channel receives.
+func (c *Conn) SubscribeUnitsCustom(interval time.Duration, buffer int, isChanged func(*UnitStatus, *UnitStatus) bool, filterUnit func(string) bool) (<-chan map[string]*UnitStatus, <-chan error) {
+	old := make(map[string]*UnitStatus)
+	statusChan := make(chan map[string]*UnitStatus, buffer)
+	errChan := make(chan error, buffer)
+
+	go func() {
+		for {
+			timerChan := time.After(interval)
+
+			units, err := c.ListUnits()
+			if err == nil {
+				cur := make(map[string]*UnitStatus)
+				for i := range units {
+					if filterUnit != nil && filterUnit(units[i].Name) {
+						continue
+					}
+					cur[units[i].Name] = &units[i]
+				}
+
+				// add all new or changed units
+				changed := make(map[string]*UnitStatus)
+				for n, u := range cur {
+					if oldU, ok := old[n]; !ok || isChanged(oldU, u) {
+						changed[n] = u
+					}
+					delete(old, n)
+				}
+
+				// add all deleted units
+				for oldN := range old {
+					changed[oldN] = nil
+				}
+
+				old = cur
+
+				if len(changed) != 0 {
+					statusChan <- changed
+				}
+			} else {
+				errChan <- err
+			}
+
+			<-timerChan
+		}
+	}()
+
+	return statusChan, errChan
+}
+
+type SubStateUpdate struct {
+	UnitName string
+	SubState string
+}
+
+// SetSubStateSubscriber writes to updateCh when any unit's substate changes.
+// Although this writes to updateCh on every state change, the reported state
+// may be more recent than the change that generated it (due to an unavoidable
+// race in the systemd dbus interface).  That is, this method provides a good
+// way to keep a current view of all units' states, but is not guaranteed to
+// show every state transition they go through.  Furthermore, state changes
+// will only be written to the channel with non-blocking writes.  If updateCh
+// is full, it attempts to write an error to errCh; if errCh is full, the error
+// passes silently.
+func (c *Conn) SetSubStateSubscriber(updateCh chan<- *SubStateUpdate, errCh chan<- error) {
+	c.subscriber.Lock()
+	defer c.subscriber.Unlock()
+	c.subscriber.updateCh = updateCh
+	c.subscriber.errCh = errCh
+}
+
+func (c *Conn) sendSubStateUpdate(path dbus.ObjectPath) {
+	c.subscriber.Lock()
+	defer c.subscriber.Unlock()
+
+	if c.shouldIgnore(path) {
+		return
+	}
+
+	info, err := c.GetUnitProperties(string(path))
+	if err != nil {
+		select {
+		case c.subscriber.errCh <- err:
+		default:
+		}
+	}
+
+	name := info["Id"].(string)
+	substate := info["SubState"].(string)
+
+	update := &SubStateUpdate{name, substate}
+	select {
+	case c.subscriber.updateCh <- update:
+	default:
+		select {
+		case c.subscriber.errCh <- errors.New("update channel full!"):
+		default:
+		}
+	}
+
+	c.updateIgnore(path, info)
+}
+
+// The ignore functions work around a wart in the systemd dbus interface.
+// Requesting the properties of an unloaded unit will cause systemd to send a
+// pair of UnitNew/UnitRemoved signals.  Because we need to get a unit's
+// properties on UnitNew (as that's the only indication of a new unit coming up
+// for the first time), we would enter an infinite loop if we did not attempt
+// to detect and ignore these spurious signals.  The signal themselves are
+// indistinguishable from relevant ones, so we (somewhat hackishly) ignore an
+// unloaded unit's signals for a short time after requesting its properties.
+// This means that we will miss e.g. a transient unit being restarted
+// *immediately* upon failure and also a transient unit being started
+// immediately after requesting its status (with systemctl status, for example,
+// because this causes a UnitNew signal to be sent which then causes us to fetch
+// the properties).
+
+func (c *Conn) shouldIgnore(path dbus.ObjectPath) bool {
+	t, ok := c.subscriber.ignore[path]
+	return ok && t >= time.Now().UnixNano()
+}
+
+func (c *Conn) updateIgnore(path dbus.ObjectPath, info map[string]interface{}) {
+	c.cleanIgnore()
+
+	// unit is unloaded - it will trigger bad systemd dbus behavior
+	if info["LoadState"].(string) == "not-found" {
+		c.subscriber.ignore[path] = time.Now().UnixNano() + ignoreInterval
+	}
+}
+
+// without this, ignore would grow unboundedly over time
+func (c *Conn) cleanIgnore() {
+	now := time.Now().UnixNano()
+	if c.subscriber.cleanIgnore < now {
+		c.subscriber.cleanIgnore = now + cleanIgnoreInterval
+
+		for p, t := range c.subscriber.ignore {
+			if t < now {
+				delete(c.subscriber.ignore, p)
+			}
+		}
+	}
+}
diff --git a/vendor/github.com/coreos/go-systemd/dbus/subscription_set.go b/vendor/github.com/coreos/go-systemd/dbus/subscription_set.go
new file mode 100644
index 0000000000..5b408d5847
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/dbus/subscription_set.go
@@ -0,0 +1,57 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package dbus
+
+import (
+	"time"
+)
+
+// SubscriptionSet returns a subscription set which is like conn.Subscribe but
+// can filter to only return events for a set of units.
+type SubscriptionSet struct {
+	*set
+	conn *Conn
+}
+
+func (s *SubscriptionSet) filter(unit string) bool {
+	return !s.Contains(unit)
+}
+
+// Subscribe starts listening for dbus events for all of the units in the set.
+// Returns channels identical to conn.SubscribeUnits.
+func (s *SubscriptionSet) Subscribe() (<-chan map[string]*UnitStatus, <-chan error) {
+	// TODO: Make fully evented by using systemd 209 with properties changed values
+	return s.conn.SubscribeUnitsCustom(time.Second, 0,
+		mismatchUnitStatus,
+		func(unit string) bool { return s.filter(unit) },
+	)
+}
+
+// NewSubscriptionSet returns a new subscription set.
+func (conn *Conn) NewSubscriptionSet() *SubscriptionSet {
+	return &SubscriptionSet{newSet(), conn}
+}
+
+// mismatchUnitStatus returns true if the provided UnitStatus objects
+// are not equivalent. false is returned if the objects are equivalent.
+// Only the Name, Description and state-related fields are used in
+// the comparison.
+func mismatchUnitStatus(u1, u2 *UnitStatus) bool {
+	return u1.Name != u2.Name ||
+		u1.Description != u2.Description ||
+		u1.LoadState != u2.LoadState ||
+		u1.ActiveState != u2.ActiveState ||
+		u1.SubState != u2.SubState
+}
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/journal.go b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
new file mode 100644
index 0000000000..4fd29c66f1
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
@@ -0,0 +1,971 @@
+// Copyright 2015 RedHat, Inc.
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package sdjournal provides a low-level Go interface to the
+// systemd journal wrapped around the sd-journal C API.
+//
+// All public read methods map closely to the sd-journal API functions. See the
+// sd-journal.h documentation[1] for information about each function.
+//
+// To write to the journal, see the pure-Go "journal" package
+//
+// [1] http://www.freedesktop.org/software/systemd/man/sd-journal.html
+package sdjournal
+
+// #include <systemd/sd-journal.h>
+// #include <systemd/sd-id128.h>
+// #include <stdlib.h>
+// #include <syslog.h>
+//
+// int
+// my_sd_journal_open(void *f, sd_journal **ret, int flags)
+// {
+//   int (*sd_journal_open)(sd_journal **, int);
+//
+//   sd_journal_open = f;
+//   return sd_journal_open(ret, flags);
+// }
+//
+// int
+// my_sd_journal_open_directory(void *f, sd_journal **ret, const char *path, int flags)
+// {
+//   int (*sd_journal_open_directory)(sd_journal **, const char *, int);
+//
+//   sd_journal_open_directory = f;
+//   return sd_journal_open_directory(ret, path, flags);
+// }
+//
+// void
+// my_sd_journal_close(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_close)(sd_journal *);
+//
+//   sd_journal_close = f;
+//   sd_journal_close(j);
+// }
+//
+// int
+// my_sd_journal_get_usage(void *f, sd_journal *j, uint64_t *bytes)
+// {
+//   int (*sd_journal_get_usage)(sd_journal *, uint64_t *);
+//
+//   sd_journal_get_usage = f;
+//   return sd_journal_get_usage(j, bytes);
+// }
+//
+// int
+// my_sd_journal_add_match(void *f, sd_journal *j, const void *data, size_t size)
+// {
+//   int (*sd_journal_add_match)(sd_journal *, const void *, size_t);
+//
+//   sd_journal_add_match = f;
+//   return sd_journal_add_match(j, data, size);
+// }
+//
+// int
+// my_sd_journal_add_disjunction(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_add_disjunction)(sd_journal *);
+//
+//   sd_journal_add_disjunction = f;
+//   return sd_journal_add_disjunction(j);
+// }
+//
+// int
+// my_sd_journal_add_conjunction(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_add_conjunction)(sd_journal *);
+//
+//   sd_journal_add_conjunction = f;
+//   return sd_journal_add_conjunction(j);
+// }
+//
+// void
+// my_sd_journal_flush_matches(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_flush_matches)(sd_journal *);
+//
+//   sd_journal_flush_matches = f;
+//   sd_journal_flush_matches(j);
+// }
+//
+// int
+// my_sd_journal_next(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_next)(sd_journal *);
+//
+//   sd_journal_next = f;
+//   return sd_journal_next(j);
+// }
+//
+// int
+// my_sd_journal_next_skip(void *f, sd_journal *j, uint64_t skip)
+// {
+//   int (*sd_journal_next_skip)(sd_journal *, uint64_t);
+//
+//   sd_journal_next_skip = f;
+//   return sd_journal_next_skip(j, skip);
+// }
+//
+// int
+// my_sd_journal_previous(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_previous)(sd_journal *);
+//
+//   sd_journal_previous = f;
+//   return sd_journal_previous(j);
+// }
+//
+// int
+// my_sd_journal_previous_skip(void *f, sd_journal *j, uint64_t skip)
+// {
+//   int (*sd_journal_previous_skip)(sd_journal *, uint64_t);
+//
+//   sd_journal_previous_skip = f;
+//   return sd_journal_previous_skip(j, skip);
+// }
+//
+// int
+// my_sd_journal_get_data(void *f, sd_journal *j, const char *field, const void **data, size_t *length)
+// {
+//   int (*sd_journal_get_data)(sd_journal *, const char *, const void **, size_t *);
+//
+//   sd_journal_get_data = f;
+//   return sd_journal_get_data(j, field, data, length);
+// }
+//
+// int
+// my_sd_journal_set_data_threshold(void *f, sd_journal *j, size_t sz)
+// {
+//   int (*sd_journal_set_data_threshold)(sd_journal *, size_t);
+//
+//   sd_journal_set_data_threshold = f;
+//   return sd_journal_set_data_threshold(j, sz);
+// }
+//
+// int
+// my_sd_journal_get_cursor(void *f, sd_journal *j, char **cursor)
+// {
+//   int (*sd_journal_get_cursor)(sd_journal *, char **);
+//
+//   sd_journal_get_cursor = f;
+//   return sd_journal_get_cursor(j, cursor);
+// }
+//
+// int
+// my_sd_journal_test_cursor(void *f, sd_journal *j, const char *cursor)
+// {
+//   int (*sd_journal_test_cursor)(sd_journal *, const char *);
+//
+//   sd_journal_test_cursor = f;
+//   return sd_journal_test_cursor(j, cursor);
+// }
+//
+// int
+// my_sd_journal_get_realtime_usec(void *f, sd_journal *j, uint64_t *usec)
+// {
+//   int (*sd_journal_get_realtime_usec)(sd_journal *, uint64_t *);
+//
+//   sd_journal_get_realtime_usec = f;
+//   return sd_journal_get_realtime_usec(j, usec);
+// }
+//
+// int
+// my_sd_journal_get_monotonic_usec(void *f, sd_journal *j, uint64_t *usec, sd_id128_t *boot_id)
+// {
+//   int (*sd_journal_get_monotonic_usec)(sd_journal *, uint64_t *, sd_id128_t *);
+//
+//   sd_journal_get_monotonic_usec = f;
+//   return sd_journal_get_monotonic_usec(j, usec, boot_id);
+// }
+//
+// int
+// my_sd_journal_seek_head(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_seek_head)(sd_journal *);
+//
+//   sd_journal_seek_head = f;
+//   return sd_journal_seek_head(j);
+// }
+//
+// int
+// my_sd_journal_seek_tail(void *f, sd_journal *j)
+// {
+//   int (*sd_journal_seek_tail)(sd_journal *);
+//
+//   sd_journal_seek_tail = f;
+//   return sd_journal_seek_tail(j);
+// }
+//
+//
+// int
+// my_sd_journal_seek_cursor(void *f, sd_journal *j, const char *cursor)
+// {
+//   int (*sd_journal_seek_cursor)(sd_journal *, const char *);
+//
+//   sd_journal_seek_cursor = f;
+//   return sd_journal_seek_cursor(j, cursor);
+// }
+//
+// int
+// my_sd_journal_seek_realtime_usec(void *f, sd_journal *j, uint64_t usec)
+// {
+//   int (*sd_journal_seek_realtime_usec)(sd_journal *, uint64_t);
+//
+//   sd_journal_seek_realtime_usec = f;
+//   return sd_journal_seek_realtime_usec(j, usec);
+// }
+//
+// int
+// my_sd_journal_wait(void *f, sd_journal *j, uint64_t timeout_usec)
+// {
+//   int (*sd_journal_wait)(sd_journal *, uint64_t);
+//
+//   sd_journal_wait = f;
+//   return sd_journal_wait(j, timeout_usec);
+// }
+//
+// void
+// my_sd_journal_restart_data(void *f, sd_journal *j)
+// {
+//   void (*sd_journal_restart_data)(sd_journal *);
+//
+//   sd_journal_restart_data = f;
+//   sd_journal_restart_data(j);
+// }
+//
+// int
+// my_sd_journal_enumerate_data(void *f, sd_journal *j, const void **data, size_t *length)
+// {
+//   int (*sd_journal_enumerate_data)(sd_journal *, const void **, size_t *);
+//
+//   sd_journal_enumerate_data = f;
+//   return sd_journal_enumerate_data(j, data, length);
+// }
+//
+import "C"
+import (
+	"fmt"
+	"path/filepath"
+	"strings"
+	"sync"
+	"syscall"
+	"time"
+	"unsafe"
+
+	"github.com/coreos/pkg/dlopen"
+)
+
+var libsystemdFunctions = map[string]unsafe.Pointer{}
+
+// Journal entry field strings which correspond to:
+// http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
+const (
+	// User Journal Fields
+	SD_JOURNAL_FIELD_MESSAGE           = "MESSAGE"
+	SD_JOURNAL_FIELD_MESSAGE_ID        = "MESSAGE_ID"
+	SD_JOURNAL_FIELD_PRIORITY          = "PRIORITY"
+	SD_JOURNAL_FIELD_CODE_FILE         = "CODE_FILE"
+	SD_JOURNAL_FIELD_CODE_LINE         = "CODE_LINE"
+	SD_JOURNAL_FIELD_CODE_FUNC         = "CODE_FUNC"
+	SD_JOURNAL_FIELD_ERRNO             = "ERRNO"
+	SD_JOURNAL_FIELD_SYSLOG_FACILITY   = "SYSLOG_FACILITY"
+	SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER = "SYSLOG_IDENTIFIER"
+	SD_JOURNAL_FIELD_SYSLOG_PID        = "SYSLOG_PID"
+
+	// Trusted Journal Fields
+	SD_JOURNAL_FIELD_PID                       = "_PID"
+	SD_JOURNAL_FIELD_UID                       = "_UID"
+	SD_JOURNAL_FIELD_GID                       = "_GID"
+	SD_JOURNAL_FIELD_COMM                      = "_COMM"
+	SD_JOURNAL_FIELD_EXE                       = "_EXE"
+	SD_JOURNAL_FIELD_CMDLINE                   = "_CMDLINE"
+	SD_JOURNAL_FIELD_CAP_EFFECTIVE             = "_CAP_EFFECTIVE"
+	SD_JOURNAL_FIELD_AUDIT_SESSION             = "_AUDIT_SESSION"
+	SD_JOURNAL_FIELD_AUDIT_LOGINUID            = "_AUDIT_LOGINUID"
+	SD_JOURNAL_FIELD_SYSTEMD_CGROUP            = "_SYSTEMD_CGROUP"
+	SD_JOURNAL_FIELD_SYSTEMD_SESSION           = "_SYSTEMD_SESSION"
+	SD_JOURNAL_FIELD_SYSTEMD_UNIT              = "_SYSTEMD_UNIT"
+	SD_JOURNAL_FIELD_SYSTEMD_USER_UNIT         = "_SYSTEMD_USER_UNIT"
+	SD_JOURNAL_FIELD_SYSTEMD_OWNER_UID         = "_SYSTEMD_OWNER_UID"
+	SD_JOURNAL_FIELD_SYSTEMD_SLICE             = "_SYSTEMD_SLICE"
+	SD_JOURNAL_FIELD_SELINUX_CONTEXT           = "_SELINUX_CONTEXT"
+	SD_JOURNAL_FIELD_SOURCE_REALTIME_TIMESTAMP = "_SOURCE_REALTIME_TIMESTAMP"
+	SD_JOURNAL_FIELD_BOOT_ID                   = "_BOOT_ID"
+	SD_JOURNAL_FIELD_MACHINE_ID                = "_MACHINE_ID"
+	SD_JOURNAL_FIELD_HOSTNAME                  = "_HOSTNAME"
+	SD_JOURNAL_FIELD_TRANSPORT                 = "_TRANSPORT"
+
+	// Address Fields
+	SD_JOURNAL_FIELD_CURSOR              = "__CURSOR"
+	SD_JOURNAL_FIELD_REALTIME_TIMESTAMP  = "__REALTIME_TIMESTAMP"
+	SD_JOURNAL_FIELD_MONOTONIC_TIMESTAMP = "__MONOTONIC_TIMESTAMP"
+)
+
+// Journal event constants
+const (
+	SD_JOURNAL_NOP        = int(C.SD_JOURNAL_NOP)
+	SD_JOURNAL_APPEND     = int(C.SD_JOURNAL_APPEND)
+	SD_JOURNAL_INVALIDATE = int(C.SD_JOURNAL_INVALIDATE)
+)
+
+const (
+	// IndefiniteWait is a sentinel value that can be passed to
+	// sdjournal.Wait() to signal an indefinite wait for new journal
+	// events. It is implemented as the maximum value for a time.Duration:
+	// https://github.com/golang/go/blob/e4dcf5c8c22d98ac9eac7b9b226596229624cb1d/src/time/time.go#L434
+	IndefiniteWait time.Duration = 1<<63 - 1
+)
+
+var libsystemdNames = []string{
+	// systemd < 209
+	"libsystemd-journal.so.0",
+	"libsystemd-journal.so",
+
+	// systemd >= 209 merged libsystemd-journal into libsystemd proper
+	"libsystemd.so.0",
+	"libsystemd.so",
+}
+
+// Journal is a Go wrapper of an sd_journal structure.
+type Journal struct {
+	cjournal *C.sd_journal
+	mu       sync.Mutex
+	lib      *dlopen.LibHandle
+}
+
+// JournalEntry represents all fields of a journal entry plus address fields.
+type JournalEntry struct {
+	Fields             map[string]string
+	Cursor             string
+	RealtimeTimestamp  uint64
+	MonotonicTimestamp uint64
+}
+
+// Match is a convenience wrapper to describe filters supplied to AddMatch.
+type Match struct {
+	Field string
+	Value string
+}
+
+// String returns a string representation of a Match suitable for use with AddMatch.
+func (m *Match) String() string {
+	return m.Field + "=" + m.Value
+}
+
+func (j *Journal) getFunction(name string) (unsafe.Pointer, error) {
+	j.mu.Lock()
+	defer j.mu.Unlock()
+	f, ok := libsystemdFunctions[name]
+	if !ok {
+		var err error
+		f, err = j.lib.GetSymbolPointer(name)
+		if err != nil {
+			return nil, err
+		}
+
+		libsystemdFunctions[name] = f
+	}
+
+	return f, nil
+}
+
+// NewJournal returns a new Journal instance pointing to the local journal
+func NewJournal() (j *Journal, err error) {
+	h, err := dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err == nil {
+			return
+		}
+		err2 := h.Close()
+		if err2 != nil {
+			err = fmt.Errorf(`%q and "error closing handle: %v"`, err, err2)
+		}
+	}()
+
+	j = &Journal{lib: h}
+
+	sd_journal_open, err := j.getFunction("sd_journal_open")
+	if err != nil {
+		return nil, err
+	}
+
+	r := C.my_sd_journal_open(sd_journal_open, &j.cjournal, C.SD_JOURNAL_LOCAL_ONLY)
+
+	if r < 0 {
+		return nil, fmt.Errorf("failed to open journal: %d", syscall.Errno(-r))
+	}
+
+	return j, nil
+}
+
+// NewJournalFromDir returns a new Journal instance pointing to a journal residing
+// in a given directory. The supplied path may be relative or absolute; if
+// relative, it will be converted to an absolute path before being opened.
+func NewJournalFromDir(path string) (j *Journal, err error) {
+	h, err := dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err == nil {
+			return
+		}
+		err2 := h.Close()
+		if err2 != nil {
+			err = fmt.Errorf(`%q and "error closing handle: %v"`, err, err2)
+		}
+	}()
+
+	path, err = filepath.Abs(path)
+	if err != nil {
+		return nil, err
+	}
+
+	j = &Journal{lib: h}
+
+	sd_journal_open_directory, err := j.getFunction("sd_journal_open_directory")
+	if err != nil {
+		return nil, err
+	}
+
+	p := C.CString(path)
+	defer C.free(unsafe.Pointer(p))
+
+	r := C.my_sd_journal_open_directory(sd_journal_open_directory, &j.cjournal, p, 0)
+	if r < 0 {
+		return nil, fmt.Errorf("failed to open journal in directory %q: %d", path, syscall.Errno(-r))
+	}
+
+	return j, nil
+}
+
+// Close closes a journal opened with NewJournal.
+func (j *Journal) Close() error {
+	sd_journal_close, err := j.getFunction("sd_journal_close")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	C.my_sd_journal_close(sd_journal_close, j.cjournal)
+	j.mu.Unlock()
+
+	// we don't close the handle to reuse the symbol cache between Journal
+	// instances. It will go away when the process exits.
+	return nil
+}
+
+// AddMatch adds a match by which to filter the entries of the journal.
+func (j *Journal) AddMatch(match string) error {
+	sd_journal_add_match, err := j.getFunction("sd_journal_add_match")
+	if err != nil {
+		return err
+	}
+
+	m := C.CString(match)
+	defer C.free(unsafe.Pointer(m))
+
+	j.mu.Lock()
+	r := C.my_sd_journal_add_match(sd_journal_add_match, j.cjournal, unsafe.Pointer(m), C.size_t(len(match)))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to add match: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// AddDisjunction inserts a logical OR in the match list.
+func (j *Journal) AddDisjunction() error {
+	sd_journal_add_disjunction, err := j.getFunction("sd_journal_add_disjunction")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_add_disjunction(sd_journal_add_disjunction, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to add a disjunction in the match list: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// AddConjunction inserts a logical AND in the match list.
+func (j *Journal) AddConjunction() error {
+	sd_journal_add_conjunction, err := j.getFunction("sd_journal_add_conjunction")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_add_conjunction(sd_journal_add_conjunction, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to add a conjunction in the match list: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// FlushMatches flushes all matches, disjunctions and conjunctions.
+func (j *Journal) FlushMatches() {
+	sd_journal_flush_matches, err := j.getFunction("sd_journal_flush_matches")
+	if err != nil {
+		return
+	}
+
+	j.mu.Lock()
+	C.my_sd_journal_flush_matches(sd_journal_flush_matches, j.cjournal)
+	j.mu.Unlock()
+}
+
+// Next advances the read pointer into the journal by one entry.
+func (j *Journal) Next() (int, error) {
+	sd_journal_next, err := j.getFunction("sd_journal_next")
+	if err != nil {
+		return -1, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_next(sd_journal_next, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return int(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+	}
+
+	return int(r), nil
+}
+
+// NextSkip advances the read pointer by multiple entries at once,
+// as specified by the skip parameter.
+func (j *Journal) NextSkip(skip uint64) (uint64, error) {
+	sd_journal_next_skip, err := j.getFunction("sd_journal_next_skip")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_next_skip(sd_journal_next_skip, j.cjournal, C.uint64_t(skip))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+	}
+
+	return uint64(r), nil
+}
+
+// Previous sets the read pointer into the journal back by one entry.
+func (j *Journal) Previous() (uint64, error) {
+	sd_journal_previous, err := j.getFunction("sd_journal_previous")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_previous(sd_journal_previous, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+	}
+
+	return uint64(r), nil
+}
+
+// PreviousSkip sets back the read pointer by multiple entries at once,
+// as specified by the skip parameter.
+func (j *Journal) PreviousSkip(skip uint64) (uint64, error) {
+	sd_journal_previous_skip, err := j.getFunction("sd_journal_previous_skip")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_previous_skip(sd_journal_previous_skip, j.cjournal, C.uint64_t(skip))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+	}
+
+	return uint64(r), nil
+}
+
+// GetData gets the data object associated with a specific field from the
+// current journal entry.
+func (j *Journal) GetData(field string) (string, error) {
+	sd_journal_get_data, err := j.getFunction("sd_journal_get_data")
+	if err != nil {
+		return "", err
+	}
+
+	f := C.CString(field)
+	defer C.free(unsafe.Pointer(f))
+
+	var d unsafe.Pointer
+	var l C.size_t
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_data(sd_journal_get_data, j.cjournal, f, &d, &l)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return "", fmt.Errorf("failed to read message: %d", syscall.Errno(-r))
+	}
+
+	msg := C.GoStringN((*C.char)(d), C.int(l))
+
+	return msg, nil
+}
+
+// GetDataValue gets the data object associated with a specific field from the
+// current journal entry, returning only the value of the object.
+func (j *Journal) GetDataValue(field string) (string, error) {
+	val, err := j.GetData(field)
+	if err != nil {
+		return "", err
+	}
+	return strings.SplitN(val, "=", 2)[1], nil
+}
+
+// GetEntry returns a full representation of a journal entry with
+// all key-value pairs of data as well as address fields (cursor, realtime
+// timestamp and monotonic timestamp)
+func (j *Journal) GetEntry() (*JournalEntry, error) {
+	sd_journal_get_realtime_usec, err := j.getFunction("sd_journal_get_realtime_usec")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_get_monotonic_usec, err := j.getFunction("sd_journal_get_monotonic_usec")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_get_cursor, err := j.getFunction("sd_journal_get_cursor")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_restart_data, err := j.getFunction("sd_journal_restart_data")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_enumerate_data, err := j.getFunction("sd_journal_enumerate_data")
+	if err != nil {
+		return nil, err
+	}
+
+	j.mu.Lock()
+	defer j.mu.Unlock()
+
+	var r C.int
+	entry := &JournalEntry{Fields: make(map[string]string)}
+
+	var realtimeUsec C.uint64_t
+	r = C.my_sd_journal_get_realtime_usec(sd_journal_get_realtime_usec, j.cjournal, &realtimeUsec)
+	if r < 0 {
+		return nil, fmt.Errorf("failed to get realtime timestamp: %d", syscall.Errno(-r))
+	}
+
+	entry.RealtimeTimestamp = uint64(realtimeUsec)
+
+	var monotonicUsec C.uint64_t
+	var boot_id C.sd_id128_t
+
+	r = C.my_sd_journal_get_monotonic_usec(sd_journal_get_monotonic_usec, j.cjournal, &monotonicUsec, &boot_id)
+	if r < 0 {
+		return nil, fmt.Errorf("failed to get monotonic timestamp: %d", syscall.Errno(-r))
+	}
+
+	entry.MonotonicTimestamp = uint64(monotonicUsec)
+
+	var c *C.char
+	r = C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &c)
+	if r < 0 {
+		return nil, fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
+	}
+
+	entry.Cursor = C.GoString(c)
+
+	// Implements the JOURNAL_FOREACH_DATA_RETVAL macro from journal-internal.h
+	var d unsafe.Pointer
+	var l C.size_t
+	C.my_sd_journal_restart_data(sd_journal_restart_data, j.cjournal)
+	for {
+		r = C.my_sd_journal_enumerate_data(sd_journal_enumerate_data, j.cjournal, &d, &l)
+		if r == 0 {
+			break
+		}
+
+		if r < 0 {
+			return nil, fmt.Errorf("failed to read message field: %d", syscall.Errno(-r))
+		}
+
+		msg := C.GoStringN((*C.char)(d), C.int(l))
+		kv := strings.SplitN(msg, "=", 2)
+		if len(kv) < 2 {
+			return nil, fmt.Errorf("failed to parse field")
+		}
+
+		entry.Fields[kv[0]] = kv[1]
+	}
+
+	return entry, nil
+}
+
+// SetDataThresold sets the data field size threshold for data returned by
+// GetData. To retrieve the complete data fields this threshold should be
+// turned off by setting it to 0, so that the library always returns the
+// complete data objects.
+func (j *Journal) SetDataThreshold(threshold uint64) error {
+	sd_journal_set_data_threshold, err := j.getFunction("sd_journal_set_data_threshold")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_set_data_threshold(sd_journal_set_data_threshold, j.cjournal, C.size_t(threshold))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to set data threshold: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// GetRealtimeUsec gets the realtime (wallclock) timestamp of the current
+// journal entry.
+func (j *Journal) GetRealtimeUsec() (uint64, error) {
+	var usec C.uint64_t
+
+	sd_journal_get_realtime_usec, err := j.getFunction("sd_journal_get_realtime_usec")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_realtime_usec(sd_journal_get_realtime_usec, j.cjournal, &usec)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return 0, fmt.Errorf("failed to get realtime timestamp: %d", syscall.Errno(-r))
+	}
+
+	return uint64(usec), nil
+}
+
+// GetMonotonicUsec gets the monotonic timestamp of the current journal entry.
+func (j *Journal) GetMonotonicUsec() (uint64, error) {
+	var usec C.uint64_t
+	var boot_id C.sd_id128_t
+
+	sd_journal_get_monotonic_usec, err := j.getFunction("sd_journal_get_monotonic_usec")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_monotonic_usec(sd_journal_get_monotonic_usec, j.cjournal, &usec, &boot_id)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return 0, fmt.Errorf("failed to get monotonic timestamp: %d", syscall.Errno(-r))
+	}
+
+	return uint64(usec), nil
+}
+
+// GetCursor gets the cursor of the current journal entry.
+func (j *Journal) GetCursor() (string, error) {
+	var d *C.char
+
+	sd_journal_get_cursor, err := j.getFunction("sd_journal_get_cursor")
+	if err != nil {
+		return "", err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &d)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return "", fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
+	}
+
+	cursor := C.GoString(d)
+
+	return cursor, nil
+}
+
+// TestCursor checks whether the current position in the journal matches the
+// specified cursor
+func (j *Journal) TestCursor(cursor string) error {
+	sd_journal_test_cursor, err := j.getFunction("sd_journal_test_cursor")
+	if err != nil {
+		return err
+	}
+
+	c := C.CString(cursor)
+	defer C.free(unsafe.Pointer(c))
+
+	j.mu.Lock()
+	r := C.my_sd_journal_test_cursor(sd_journal_test_cursor, j.cjournal, c)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to test to cursor %q: %d", cursor, syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// SeekHead seeks to the beginning of the journal, i.e. the oldest available
+// entry.
+func (j *Journal) SeekHead() error {
+	sd_journal_seek_head, err := j.getFunction("sd_journal_seek_head")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_seek_head(sd_journal_seek_head, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to seek to head of journal: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// SeekTail may be used to seek to the end of the journal, i.e. the most recent
+// available entry.
+func (j *Journal) SeekTail() error {
+	sd_journal_seek_tail, err := j.getFunction("sd_journal_seek_tail")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_seek_tail(sd_journal_seek_tail, j.cjournal)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to seek to tail of journal: %d", syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// SeekRealtimeUsec seeks to the entry with the specified realtime (wallclock)
+// timestamp, i.e. CLOCK_REALTIME.
+func (j *Journal) SeekRealtimeUsec(usec uint64) error {
+	sd_journal_seek_realtime_usec, err := j.getFunction("sd_journal_seek_realtime_usec")
+	if err != nil {
+		return err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_seek_realtime_usec(sd_journal_seek_realtime_usec, j.cjournal, C.uint64_t(usec))
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to seek to %d: %d", usec, syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// SeekCursor seeks to a concrete journal cursor.
+func (j *Journal) SeekCursor(cursor string) error {
+	sd_journal_seek_cursor, err := j.getFunction("sd_journal_seek_cursor")
+	if err != nil {
+		return err
+	}
+
+	c := C.CString(cursor)
+	defer C.free(unsafe.Pointer(c))
+
+	j.mu.Lock()
+	r := C.my_sd_journal_seek_cursor(sd_journal_seek_cursor, j.cjournal, c)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return fmt.Errorf("failed to seek to cursor %q: %d", cursor, syscall.Errno(-r))
+	}
+
+	return nil
+}
+
+// Wait will synchronously wait until the journal gets changed. The maximum time
+// this call sleeps may be controlled with the timeout parameter.  If
+// sdjournal.IndefiniteWait is passed as the timeout parameter, Wait will
+// wait indefinitely for a journal change.
+func (j *Journal) Wait(timeout time.Duration) int {
+	var to uint64
+
+	sd_journal_wait, err := j.getFunction("sd_journal_wait")
+	if err != nil {
+		return -1
+	}
+
+	if timeout == IndefiniteWait {
+		// sd_journal_wait(3) calls for a (uint64_t) -1 to be passed to signify
+		// indefinite wait, but using a -1 overflows our C.uint64_t, so we use an
+		// equivalent hex value.
+		to = 0xffffffffffffffff
+	} else {
+		to = uint64(time.Now().Add(timeout).Unix() / 1000)
+	}
+	j.mu.Lock()
+	r := C.my_sd_journal_wait(sd_journal_wait, j.cjournal, C.uint64_t(to))
+	j.mu.Unlock()
+
+	return int(r)
+}
+
+// GetUsage returns the journal disk space usage, in bytes.
+func (j *Journal) GetUsage() (uint64, error) {
+	var out C.uint64_t
+
+	sd_journal_get_usage, err := j.getFunction("sd_journal_get_usage")
+	if err != nil {
+		return 0, err
+	}
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_usage(sd_journal_get_usage, j.cjournal, &out)
+	j.mu.Unlock()
+
+	if r < 0 {
+		return 0, fmt.Errorf("failed to get journal disk space usage: %d", syscall.Errno(-r))
+	}
+
+	return uint64(out), nil
+}
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/read.go b/vendor/github.com/coreos/go-systemd/sdjournal/read.go
new file mode 100644
index 0000000000..71ee806a96
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/read.go
@@ -0,0 +1,252 @@
+// Copyright 2015 RedHat, Inc.
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package sdjournal
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"strings"
+	"time"
+)
+
+var (
+	ErrExpired = errors.New("Timeout expired")
+)
+
+// JournalReaderConfig represents options to drive the behavior of a JournalReader.
+type JournalReaderConfig struct {
+	// The Since, NumFromTail and Cursor options are mutually exclusive and
+	// determine where the reading begins within the journal. The order in which
+	// options are written is exactly the order of precedence.
+	Since       time.Duration // start relative to a Duration from now
+	NumFromTail uint64        // start relative to the tail
+	Cursor      string        // start relative to the cursor
+
+	// Show only journal entries whose fields match the supplied values. If
+	// the array is empty, entries will not be filtered.
+	Matches []Match
+
+	// If not empty, the journal instance will point to a journal residing
+	// in this directory. The supplied path may be relative or absolute.
+	Path string
+}
+
+// JournalReader is an io.ReadCloser which provides a simple interface for iterating through the
+// systemd journal. A JournalReader is not safe for concurrent use by multiple goroutines.
+type JournalReader struct {
+	journal   *Journal
+	msgReader *strings.Reader
+}
+
+// NewJournalReader creates a new JournalReader with configuration options that are similar to the
+// systemd journalctl tool's iteration and filtering features.
+func NewJournalReader(config JournalReaderConfig) (*JournalReader, error) {
+	r := &JournalReader{}
+
+	// Open the journal
+	var err error
+	if config.Path != "" {
+		r.journal, err = NewJournalFromDir(config.Path)
+	} else {
+		r.journal, err = NewJournal()
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	// Add any supplied matches
+	for _, m := range config.Matches {
+		r.journal.AddMatch(m.String())
+	}
+
+	// Set the start position based on options
+	if config.Since != 0 {
+		// Start based on a relative time
+		start := time.Now().Add(config.Since)
+		if err := r.journal.SeekRealtimeUsec(uint64(start.UnixNano() / 1000)); err != nil {
+			return nil, err
+		}
+	} else if config.NumFromTail != 0 {
+		// Start based on a number of lines before the tail
+		if err := r.journal.SeekTail(); err != nil {
+			return nil, err
+		}
+
+		// Move the read pointer into position near the tail. Go one further than
+		// the option so that the initial cursor advancement positions us at the
+		// correct starting point.
+		if _, err := r.journal.PreviousSkip(config.NumFromTail + 1); err != nil {
+			return nil, err
+		}
+	} else if config.Cursor != "" {
+		// Start based on a custom cursor
+		if err := r.journal.SeekCursor(config.Cursor); err != nil {
+			return nil, err
+		}
+	}
+
+	return r, nil
+}
+
+// Read reads entries from the journal. Read follows the Reader interface so
+// it must be able to read a specific amount of bytes. Journald on the other
+// hand only allows us to read full entries of arbitrary size (without byte
+// granularity). JournalReader is therefore internally buffering entries that
+// don't fit in the read buffer. Callers should keep calling until 0 and/or an
+// error is returned.
+func (r *JournalReader) Read(b []byte) (int, error) {
+	var err error
+
+	if r.msgReader == nil {
+		var c int
+
+		// Advance the journal cursor. It has to be called at least one time
+		// before reading
+		c, err = r.journal.Next()
+
+		// An unexpected error
+		if err != nil {
+			return 0, err
+		}
+
+		// EOF detection
+		if c == 0 {
+			return 0, io.EOF
+		}
+
+		// Build a message
+		var msg string
+		msg, err = r.buildMessage()
+
+		if err != nil {
+			return 0, err
+		}
+		r.msgReader = strings.NewReader(msg)
+	}
+
+	// Copy and return the message
+	var sz int
+	sz, err = r.msgReader.Read(b)
+	if err == io.EOF {
+		// The current entry has been fully read. Don't propagate this
+		// EOF, so the next entry can be read at the next Read()
+		// iteration.
+		r.msgReader = nil
+		return sz, nil
+	}
+	if err != nil {
+		return sz, err
+	}
+	if r.msgReader.Len() == 0 {
+		r.msgReader = nil
+	}
+
+	return sz, nil
+}
+
+// Close closes the JournalReader's handle to the journal.
+func (r *JournalReader) Close() error {
+	return r.journal.Close()
+}
+
+// Rewind attempts to rewind the JournalReader to the first entry.
+func (r *JournalReader) Rewind() error {
+	r.msgReader = nil
+	return r.journal.SeekHead()
+}
+
+// Follow synchronously follows the JournalReader, writing each new journal entry to writer. The
+// follow will continue until a single time.Time is received on the until channel.
+func (r *JournalReader) Follow(until <-chan time.Time, writer io.Writer) (err error) {
+
+	// Process journal entries and events. Entries are flushed until the tail or
+	// timeout is reached, and then we wait for new events or the timeout.
+	var msg = make([]byte, 64*1<<(10))
+process:
+	for {
+		c, err := r.Read(msg)
+		if err != nil && err != io.EOF {
+			break process
+		}
+
+		select {
+		case <-until:
+			return ErrExpired
+		default:
+			if c > 0 {
+				if _, err = writer.Write(msg[:c]); err != nil {
+					break process
+				}
+				continue process
+			}
+		}
+
+		// We're at the tail, so wait for new events or time out.
+		// Holds journal events to process. Tightly bounded for now unless there's a
+		// reason to unblock the journal watch routine more quickly.
+		events := make(chan int, 1)
+		pollDone := make(chan bool, 1)
+		go func() {
+			for {
+				select {
+				case <-pollDone:
+					return
+				default:
+					events <- r.journal.Wait(time.Duration(1) * time.Second)
+				}
+			}
+		}()
+
+		select {
+		case <-until:
+			pollDone <- true
+			return ErrExpired
+		case e := <-events:
+			pollDone <- true
+			switch e {
+			case SD_JOURNAL_NOP, SD_JOURNAL_APPEND, SD_JOURNAL_INVALIDATE:
+				// TODO: need to account for any of these?
+			default:
+				log.Printf("Received unknown event: %d\n", e)
+			}
+			continue process
+		}
+	}
+
+	return
+}
+
+// buildMessage returns a string representing the current journal entry in a simple format which
+// includes the entry timestamp and MESSAGE field.
+func (r *JournalReader) buildMessage() (string, error) {
+	var msg string
+	var usec uint64
+	var err error
+
+	if msg, err = r.journal.GetData("MESSAGE"); err != nil {
+		return "", err
+	}
+
+	if usec, err = r.journal.GetRealtimeUsec(); err != nil {
+		return "", err
+	}
+
+	timestamp := time.Unix(0, int64(usec)*int64(time.Microsecond))
+
+	return fmt.Sprintf("%s %s\n", timestamp, msg), nil
+}
diff --git a/vendor/github.com/coreos/go-systemd/unit/deserialize.go b/vendor/github.com/coreos/go-systemd/unit/deserialize.go
new file mode 100644
index 0000000000..8a88162f98
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/unit/deserialize.go
@@ -0,0 +1,276 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package unit
+
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"strings"
+	"unicode"
+)
+
+const (
+	// SYSTEMD_LINE_MAX mimics the maximum line length that systemd can use.
+	// On typical systemd platforms (i.e. modern Linux), this will most
+	// commonly be 2048, so let's use that as a sanity check.
+	// Technically, we should probably pull this at runtime:
+	//    SYSTEMD_LINE_MAX = int(C.sysconf(C.__SC_LINE_MAX))
+	// but this would introduce an (unfortunate) dependency on cgo
+	SYSTEMD_LINE_MAX = 2048
+
+	// characters that systemd considers indicate a newline
+	SYSTEMD_NEWLINE = "\r\n"
+)
+
+var (
+	ErrLineTooLong = fmt.Errorf("line too long (max %d bytes)", SYSTEMD_LINE_MAX)
+)
+
+// Deserialize parses a systemd unit file into a list of UnitOption objects.
+func Deserialize(f io.Reader) (opts []*UnitOption, err error) {
+	lexer, optchan, errchan := newLexer(f)
+	go lexer.lex()
+
+	for opt := range optchan {
+		opts = append(opts, &(*opt))
+	}
+
+	err = <-errchan
+	return opts, err
+}
+
+func newLexer(f io.Reader) (*lexer, <-chan *UnitOption, <-chan error) {
+	optchan := make(chan *UnitOption)
+	errchan := make(chan error, 1)
+	buf := bufio.NewReader(f)
+
+	return &lexer{buf, optchan, errchan, ""}, optchan, errchan
+}
+
+type lexer struct {
+	buf     *bufio.Reader
+	optchan chan *UnitOption
+	errchan chan error
+	section string
+}
+
+func (l *lexer) lex() {
+	var err error
+	defer func() {
+		close(l.optchan)
+		close(l.errchan)
+	}()
+	next := l.lexNextSection
+	for next != nil {
+		if l.buf.Buffered() >= SYSTEMD_LINE_MAX {
+			// systemd truncates lines longer than LINE_MAX
+			// https://bugs.freedesktop.org/show_bug.cgi?id=85308
+			// Rather than allowing this to pass silently, let's
+			// explicitly gate people from encountering this
+			line, err := l.buf.Peek(SYSTEMD_LINE_MAX)
+			if err != nil {
+				l.errchan <- err
+				return
+			}
+			if bytes.IndexAny(line, SYSTEMD_NEWLINE) == -1 {
+				l.errchan <- ErrLineTooLong
+				return
+			}
+		}
+
+		next, err = next()
+		if err != nil {
+			l.errchan <- err
+			return
+		}
+	}
+}
+
+type lexStep func() (lexStep, error)
+
+func (l *lexer) lexSectionName() (lexStep, error) {
+	sec, err := l.buf.ReadBytes(']')
+	if err != nil {
+		return nil, errors.New("unable to find end of section")
+	}
+
+	return l.lexSectionSuffixFunc(string(sec[:len(sec)-1])), nil
+}
+
+func (l *lexer) lexSectionSuffixFunc(section string) lexStep {
+	return func() (lexStep, error) {
+		garbage, _, err := l.toEOL()
+		if err != nil {
+			return nil, err
+		}
+
+		garbage = bytes.TrimSpace(garbage)
+		if len(garbage) > 0 {
+			return nil, fmt.Errorf("found garbage after section name %s: %v", l.section, garbage)
+		}
+
+		return l.lexNextSectionOrOptionFunc(section), nil
+	}
+}
+
+func (l *lexer) ignoreLineFunc(next lexStep) lexStep {
+	return func() (lexStep, error) {
+		for {
+			line, _, err := l.toEOL()
+			if err != nil {
+				return nil, err
+			}
+
+			line = bytes.TrimSuffix(line, []byte{' '})
+
+			// lack of continuation means this line has been exhausted
+			if !bytes.HasSuffix(line, []byte{'\\'}) {
+				break
+			}
+		}
+
+		// reached end of buffer, safe to exit
+		return next, nil
+	}
+}
+
+func (l *lexer) lexNextSection() (lexStep, error) {
+	r, _, err := l.buf.ReadRune()
+	if err != nil {
+		if err == io.EOF {
+			err = nil
+		}
+		return nil, err
+	}
+
+	if r == '[' {
+		return l.lexSectionName, nil
+	} else if isComment(r) {
+		return l.ignoreLineFunc(l.lexNextSection), nil
+	}
+
+	return l.lexNextSection, nil
+}
+
+func (l *lexer) lexNextSectionOrOptionFunc(section string) lexStep {
+	return func() (lexStep, error) {
+		r, _, err := l.buf.ReadRune()
+		if err != nil {
+			if err == io.EOF {
+				err = nil
+			}
+			return nil, err
+		}
+
+		if unicode.IsSpace(r) {
+			return l.lexNextSectionOrOptionFunc(section), nil
+		} else if r == '[' {
+			return l.lexSectionName, nil
+		} else if isComment(r) {
+			return l.ignoreLineFunc(l.lexNextSectionOrOptionFunc(section)), nil
+		}
+
+		l.buf.UnreadRune()
+		return l.lexOptionNameFunc(section), nil
+	}
+}
+
+func (l *lexer) lexOptionNameFunc(section string) lexStep {
+	return func() (lexStep, error) {
+		var partial bytes.Buffer
+		for {
+			r, _, err := l.buf.ReadRune()
+			if err != nil {
+				return nil, err
+			}
+
+			if r == '\n' || r == '\r' {
+				return nil, errors.New("unexpected newline encountered while parsing option name")
+			}
+
+			if r == '=' {
+				break
+			}
+
+			partial.WriteRune(r)
+		}
+
+		name := strings.TrimSpace(partial.String())
+		return l.lexOptionValueFunc(section, name, bytes.Buffer{}), nil
+	}
+}
+
+func (l *lexer) lexOptionValueFunc(section, name string, partial bytes.Buffer) lexStep {
+	return func() (lexStep, error) {
+		for {
+			line, eof, err := l.toEOL()
+			if err != nil {
+				return nil, err
+			}
+
+			if len(bytes.TrimSpace(line)) == 0 {
+				break
+			}
+
+			partial.Write(line)
+
+			// lack of continuation means this value has been exhausted
+			idx := bytes.LastIndex(line, []byte{'\\'})
+			if idx == -1 || idx != (len(line)-1) {
+				break
+			}
+
+			if !eof {
+				partial.WriteRune('\n')
+			}
+
+			return l.lexOptionValueFunc(section, name, partial), nil
+		}
+
+		val := partial.String()
+		if strings.HasSuffix(val, "\n") {
+			// A newline was added to the end, so the file didn't end with a backslash.
+			// => Keep the newline
+			val = strings.TrimSpace(val) + "\n"
+		} else {
+			val = strings.TrimSpace(val)
+		}
+		l.optchan <- &UnitOption{Section: section, Name: name, Value: val}
+
+		return l.lexNextSectionOrOptionFunc(section), nil
+	}
+}
+
+// toEOL reads until the end-of-line or end-of-file.
+// Returns (data, EOFfound, error)
+func (l *lexer) toEOL() ([]byte, bool, error) {
+	line, err := l.buf.ReadBytes('\n')
+	// ignore EOF here since it's roughly equivalent to EOL
+	if err != nil && err != io.EOF {
+		return nil, false, err
+	}
+
+	line = bytes.TrimSuffix(line, []byte{'\r'})
+	line = bytes.TrimSuffix(line, []byte{'\n'})
+
+	return line, err == io.EOF, nil
+}
+
+func isComment(r rune) bool {
+	return r == '#' || r == ';'
+}
diff --git a/vendor/github.com/coreos/go-systemd/unit/escape.go b/vendor/github.com/coreos/go-systemd/unit/escape.go
new file mode 100644
index 0000000000..63b11726db
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/unit/escape.go
@@ -0,0 +1,116 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements systemd-escape [--unescape] [--path]
+
+package unit
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+const (
+	allowed = `:_.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789`
+)
+
+// If isPath is true:
+//   We remove redundant '/'s, the leading '/', and trailing '/'.
+//   If the result is empty, a '/' is inserted.
+//
+// We always:
+//  Replace the following characters with `\x%x`:
+//   Leading `.`
+//   `-`, `\`, and anything not in this set: `:-_.\[0-9a-zA-Z]`
+//  Replace '/' with '-'.
+func escape(unescaped string, isPath bool) string {
+	e := []byte{}
+	inSlashes := false
+	start := true
+	for i := 0; i < len(unescaped); i++ {
+		c := unescaped[i]
+		if isPath {
+			if c == '/' {
+				inSlashes = true
+				continue
+			} else if inSlashes {
+				inSlashes = false
+				if !start {
+					e = append(e, '-')
+				}
+			}
+		}
+
+		if c == '/' {
+			e = append(e, '-')
+		} else if start && c == '.' || strings.IndexByte(allowed, c) == -1 {
+			e = append(e, []byte(fmt.Sprintf(`\x%x`, c))...)
+		} else {
+			e = append(e, c)
+		}
+		start = false
+	}
+	if isPath && len(e) == 0 {
+		e = append(e, '-')
+	}
+	return string(e)
+}
+
+// If isPath is true:
+//   We always return a string beginning with '/'.
+//
+// We always:
+//  Replace '-' with '/'.
+//  Replace `\x%x` with the value represented in hex.
+func unescape(escaped string, isPath bool) string {
+	u := []byte{}
+	for i := 0; i < len(escaped); i++ {
+		c := escaped[i]
+		if c == '-' {
+			c = '/'
+		} else if c == '\\' && len(escaped)-i >= 4 && escaped[i+1] == 'x' {
+			n, err := strconv.ParseInt(escaped[i+2:i+4], 16, 8)
+			if err == nil {
+				c = byte(n)
+				i += 3
+			}
+		}
+		u = append(u, c)
+	}
+	if isPath && (len(u) == 0 || u[0] != '/') {
+		u = append([]byte("/"), u...)
+	}
+	return string(u)
+}
+
+// UnitNameEscape escapes a string as `systemd-escape` would
+func UnitNameEscape(unescaped string) string {
+	return escape(unescaped, false)
+}
+
+// UnitNameUnescape unescapes a string as `systemd-escape --unescape` would
+func UnitNameUnescape(escaped string) string {
+	return unescape(escaped, false)
+}
+
+// UnitNamePathEscape escapes a string as `systemd-escape --path` would
+func UnitNamePathEscape(unescaped string) string {
+	return escape(unescaped, true)
+}
+
+// UnitNamePathUnescape unescapes a string as `systemd-escape --path --unescape` would
+func UnitNamePathUnescape(escaped string) string {
+	return unescape(escaped, true)
+}
diff --git a/vendor/github.com/coreos/go-systemd/unit/option.go b/vendor/github.com/coreos/go-systemd/unit/option.go
new file mode 100644
index 0000000000..e5d21e19d9
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/unit/option.go
@@ -0,0 +1,54 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package unit
+
+import (
+	"fmt"
+)
+
+type UnitOption struct {
+	Section string
+	Name    string
+	Value   string
+}
+
+func NewUnitOption(section, name, value string) *UnitOption {
+	return &UnitOption{Section: section, Name: name, Value: value}
+}
+
+func (uo *UnitOption) String() string {
+	return fmt.Sprintf("{Section: %q, Name: %q, Value: %q}", uo.Section, uo.Name, uo.Value)
+}
+
+func (uo *UnitOption) Match(other *UnitOption) bool {
+	return uo.Section == other.Section &&
+		uo.Name == other.Name &&
+		uo.Value == other.Value
+}
+
+func AllMatch(u1 []*UnitOption, u2 []*UnitOption) bool {
+	length := len(u1)
+	if length != len(u2) {
+		return false
+	}
+
+	for i := 0; i < length; i++ {
+		if !u1[i].Match(u2[i]) {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/vendor/github.com/coreos/go-systemd/unit/serialize.go b/vendor/github.com/coreos/go-systemd/unit/serialize.go
new file mode 100644
index 0000000000..e07799cad6
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/unit/serialize.go
@@ -0,0 +1,75 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package unit
+
+import (
+	"bytes"
+	"io"
+)
+
+// Serialize encodes all of the given UnitOption objects into a
+// unit file. When serialized the options are sorted in their
+// supplied order but grouped by section.
+func Serialize(opts []*UnitOption) io.Reader {
+	var buf bytes.Buffer
+
+	if len(opts) == 0 {
+		return &buf
+	}
+
+	// Index of sections -> ordered options
+	idx := map[string][]*UnitOption{}
+	// Separately preserve order in which sections were seen
+	sections := []string{}
+	for _, opt := range opts {
+		sec := opt.Section
+		if _, ok := idx[sec]; !ok {
+			sections = append(sections, sec)
+		}
+		idx[sec] = append(idx[sec], opt)
+	}
+
+	for i, sect := range sections {
+		writeSectionHeader(&buf, sect)
+		writeNewline(&buf)
+
+		opts := idx[sect]
+		for _, opt := range opts {
+			writeOption(&buf, opt)
+			writeNewline(&buf)
+		}
+		if i < len(sections)-1 {
+			writeNewline(&buf)
+		}
+	}
+
+	return &buf
+}
+
+func writeNewline(buf *bytes.Buffer) {
+	buf.WriteRune('\n')
+}
+
+func writeSectionHeader(buf *bytes.Buffer, section string) {
+	buf.WriteRune('[')
+	buf.WriteString(section)
+	buf.WriteRune(']')
+}
+
+func writeOption(buf *bytes.Buffer, opt *UnitOption) {
+	buf.WriteString(opt.Name)
+	buf.WriteRune('=')
+	buf.WriteString(opt.Value)
+}
diff --git a/vendor/github.com/coreos/go-systemd/util/util.go b/vendor/github.com/coreos/go-systemd/util/util.go
new file mode 100644
index 0000000000..e4ed8b2639
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/util/util.go
@@ -0,0 +1,227 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package util contains utility functions related to systemd that applications
+// can use to check things like whether systemd is running.  Note that some of
+// these functions attempt to manually load systemd libraries at runtime rather
+// than linking against them.
+package util
+
+// #include <stdlib.h>
+// #include <sys/types.h>
+// #include <unistd.h>
+//
+// int
+// my_sd_pid_get_owner_uid(void *f, pid_t pid, uid_t *uid)
+// {
+//   int (*sd_pid_get_owner_uid)(pid_t, uid_t *);
+//
+//   sd_pid_get_owner_uid = (int (*)(pid_t, uid_t *))f;
+//   return sd_pid_get_owner_uid(pid, uid);
+// }
+//
+// int
+// my_sd_pid_get_unit(void *f, pid_t pid, char **unit)
+// {
+//   int (*sd_pid_get_unit)(pid_t, char **);
+//
+//   sd_pid_get_unit = (int (*)(pid_t, char **))f;
+//   return sd_pid_get_unit(pid, unit);
+// }
+//
+// int
+// my_sd_pid_get_slice(void *f, pid_t pid, char **slice)
+// {
+//   int (*sd_pid_get_slice)(pid_t, char **);
+//
+//   sd_pid_get_slice = (int (*)(pid_t, char **))f;
+//   return sd_pid_get_slice(pid, slice);
+// }
+//
+// int
+// am_session_leader()
+// {
+//   return (getsid(0) == getpid());
+// }
+import "C"
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"strings"
+	"syscall"
+	"unsafe"
+
+	"github.com/coreos/pkg/dlopen"
+)
+
+var libsystemdNames = []string{
+	// systemd < 209
+	"libsystemd-login.so.0",
+	"libsystemd-login.so",
+
+	// systemd >= 209 merged libsystemd-login into libsystemd proper
+	"libsystemd.so.0",
+	"libsystemd.so",
+}
+
+// GetRunningSlice attempts to retrieve the name of the systemd slice in which
+// the current process is running.
+// This function is a wrapper around the libsystemd C library; if it cannot be
+// opened, an error is returned.
+func GetRunningSlice() (slice string, err error) {
+	var h *dlopen.LibHandle
+	h, err = dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err1 := h.Close(); err1 != nil {
+			err = err1
+		}
+	}()
+
+	sd_pid_get_slice, err := h.GetSymbolPointer("sd_pid_get_slice")
+	if err != nil {
+		return
+	}
+
+	var s string
+	sl := C.CString(s)
+	defer C.free(unsafe.Pointer(sl))
+
+	ret := C.my_sd_pid_get_slice(sd_pid_get_slice, 0, &sl)
+	if ret < 0 {
+		err = fmt.Errorf("error calling sd_pid_get_slice: %v", syscall.Errno(-ret))
+		return
+	}
+
+	return C.GoString(sl), nil
+}
+
+// RunningFromSystemService tries to detect whether the current process has
+// been invoked from a system service. The condition for this is whether the
+// process is _not_ a user process. User processes are those running in session
+// scopes or under per-user `systemd --user` instances.
+//
+// To avoid false positives on systems without `pam_systemd` (which is
+// responsible for creating user sessions), this function also uses a heuristic
+// to detect whether it's being invoked from a session leader process. This is
+// the case if the current process is executed directly from a service file
+// (e.g. with `ExecStart=/this/cmd`). Note that this heuristic will fail if the
+// command is instead launched in a subshell or similar so that it is not
+// session leader (e.g. `ExecStart=/bin/bash -c "/this/cmd"`)
+//
+// This function is a wrapper around the libsystemd C library; if this is
+// unable to successfully open a handle to the library for any reason (e.g. it
+// cannot be found), an errr will be returned
+func RunningFromSystemService() (ret bool, err error) {
+	var h *dlopen.LibHandle
+	h, err = dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err1 := h.Close(); err1 != nil {
+			err = err1
+		}
+	}()
+
+	sd_pid_get_owner_uid, err := h.GetSymbolPointer("sd_pid_get_owner_uid")
+	if err != nil {
+		return
+	}
+
+	var uid C.uid_t
+	errno := C.my_sd_pid_get_owner_uid(sd_pid_get_owner_uid, 0, &uid)
+	serrno := syscall.Errno(-errno)
+	// when we're running from a unit file, sd_pid_get_owner_uid returns
+	// ENOENT (systemd <220) or ENXIO (systemd >=220)
+	switch {
+	case errno >= 0:
+		ret = false
+	case serrno == syscall.ENOENT, serrno == syscall.ENXIO:
+		// Since the implementation of sessions in systemd relies on
+		// the `pam_systemd` module, using the sd_pid_get_owner_uid
+		// heuristic alone can result in false positives if that module
+		// (or PAM itself) is not present or properly configured on the
+		// system. As such, we also check if we're the session leader,
+		// which should be the case if we're invoked from a unit file,
+		// but not if e.g. we're invoked from the command line from a
+		// user's login session
+		ret = C.am_session_leader() == 1
+	default:
+		err = fmt.Errorf("error calling sd_pid_get_owner_uid: %v", syscall.Errno(-errno))
+	}
+	return
+}
+
+// CurrentUnitName attempts to retrieve the name of the systemd system unit
+// from which the calling process has been invoked. It wraps the systemd
+// `sd_pid_get_unit` call, with the same caveat: for processes not part of a
+// systemd system unit, this function will return an error.
+func CurrentUnitName() (unit string, err error) {
+	var h *dlopen.LibHandle
+	h, err = dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err1 := h.Close(); err1 != nil {
+			err = err1
+		}
+	}()
+
+	sd_pid_get_unit, err := h.GetSymbolPointer("sd_pid_get_unit")
+	if err != nil {
+		return
+	}
+
+	var s string
+	u := C.CString(s)
+	defer C.free(unsafe.Pointer(u))
+
+	ret := C.my_sd_pid_get_unit(sd_pid_get_unit, 0, &u)
+	if ret < 0 {
+		err = fmt.Errorf("error calling sd_pid_get_unit: %v", syscall.Errno(-ret))
+		return
+	}
+
+	unit = C.GoString(u)
+	return
+}
+
+// IsRunningSystemd checks whether the host was booted with systemd as its init
+// system. This functions similarly to systemd's `sd_booted(3)`: internally, it
+// checks whether /run/systemd/system/ exists and is a directory.
+// http://www.freedesktop.org/software/systemd/man/sd_booted.html
+func IsRunningSystemd() bool {
+	fi, err := os.Lstat("/run/systemd/system")
+	if err != nil {
+		return false
+	}
+	return fi.IsDir()
+}
+
+// GetMachineID returns a host's 128-bit machine ID as a string. This functions
+// similarly to systemd's `sd_id128_get_machine`: internally, it simply reads
+// the contents of /etc/machine-id
+// http://www.freedesktop.org/software/systemd/man/sd_id128_get_machine.html
+func GetMachineID() (string, error) {
+	machineID, err := ioutil.ReadFile("/etc/machine-id")
+	if err != nil {
+		return "", fmt.Errorf("failed to read /etc/machine-id: %v", err)
+	}
+	return strings.TrimSpace(string(machineID)), nil
+}
diff --git a/vendor/github.com/coreos/go-tspi/LICENSE b/vendor/github.com/coreos/go-tspi/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/vendor/github.com/coreos/go-tspi/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/coreos/go-tspi/tpmclient/tpmclient.go b/vendor/github.com/coreos/go-tspi/tpmclient/tpmclient.go
new file mode 100644
index 0000000000..fb5279b2a1
--- /dev/null
+++ b/vendor/github.com/coreos/go-tspi/tpmclient/tpmclient.go
@@ -0,0 +1,310 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tpmclient
+
+import (
+	"bytes"
+	"crypto/rand"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"time"
+
+	"github.com/coreos/go-tspi/tspiconst"
+	"github.com/coreos/go-tspi/verification"
+)
+
+// TPMClient represents a connection to a system running a daemon providing
+// access to TPM functionality
+type TPMClient struct {
+	host    string
+	timeout time.Duration
+}
+
+const (
+	GetEKCertURL    = "/v1/getEkcert"
+	ExtendURL       = "/v1/extend"
+	QuoteURL        = "/v1/quote"
+	GenerateAikURL  = "/v1/generateAik"
+	GenerateKeyURL  = "/v1/generateKey"
+	AikChallengeURL = "/v1/aikChallenge"
+)
+
+func (client *TPMClient) get(endpoint string) (*http.Response, error) {
+	url := fmt.Sprintf("http://%s%s", client.host, endpoint)
+	httpClient := &http.Client{
+		Timeout: client.timeout,
+	}
+	resp, err := httpClient.Get(url)
+	return resp, err
+}
+
+func (client *TPMClient) post(endpoint string, data io.Reader) (*http.Response, error) {
+	url := fmt.Sprintf("http://%s%s", client.host, endpoint)
+	httpClient := &http.Client{
+		Timeout: client.timeout,
+	}
+	resp, err := httpClient.Post(url, "application/json", data)
+	return resp, err
+}
+
+type EkcertResponse struct {
+	EKCert []byte
+}
+
+// GetEKCert obtains the Endorsement Key certificate from the client TPM. This
+// is an X509 certificate containing the public half of the Endorsement Key
+// and a signature chain chaining back to a vendor-issued signing certificate.
+func (client *TPMClient) GetEKCert() (ekcert []byte, err error) {
+	var ekcertData EkcertResponse
+
+	ekresp, err := client.get(GetEKCertURL)
+	if err != nil {
+		return nil, fmt.Errorf("Can't obtain ekcert: %s", err)
+	}
+	defer ekresp.Body.Close()
+	body, err := ioutil.ReadAll(ekresp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("Can't read ekcert response: %s", err)
+	}
+
+	err = json.Unmarshal(body, &ekcertData)
+	if err != nil {
+		return nil, fmt.Errorf("Can't parse ekcert response: %s", err)
+	}
+
+	return ekcertData.EKCert, nil
+}
+
+type AikResponse struct {
+	AIKBlob []byte
+	AIKPub  []byte
+}
+
+// GenerateAIK requests that the TPM generate a new Attestation Identity Key.
+// It returns an unencrypted copy of the public half of the AIK, along with
+// a TSPI key blob encrypted by the TPM.
+func (client *TPMClient) GenerateAIK() (aikpub []byte, aikblob []byte, err error) {
+	var aikData AikResponse
+
+	aikresp, err := client.post(GenerateAikURL, nil)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't generate AIK: %s", err)
+	}
+	defer aikresp.Body.Close()
+	body, err := ioutil.ReadAll(aikresp.Body)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't read AIK response: %s", err)
+	}
+
+	err = json.Unmarshal(body, &aikData)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't parse AIK response: %s (%s)", err, body)
+	}
+
+	aikpub = aikData.AIKPub
+	aikblob = aikData.AIKBlob
+
+	return aikpub, aikblob, nil
+}
+
+type KeyData struct {
+	KeyFlags int
+}
+
+type KeyResponse struct {
+	KeyBlob []byte
+	KeyPub  []byte
+}
+
+// GenerateKey requests that the TPM generate a new keypair
+func (client *TPMClient) GenerateKey(flags int) (keypub []byte, keyblob []byte, err error) {
+	var keyData KeyData
+	var keyResponse KeyResponse
+
+	keyData.KeyFlags = flags
+	request, err := json.Marshal(keyData)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't construct request JSON: %s", err)
+	}
+
+	keyresp, err := client.post(GenerateKeyURL, bytes.NewBuffer(request))
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't generate key: %s", err)
+	}
+	defer keyresp.Body.Close()
+	body, err := ioutil.ReadAll(keyresp.Body)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't read key response: %s", err)
+	}
+
+	err = json.Unmarshal(body, &keyResponse)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't parse key response: %s (%s)", err, body)
+	}
+
+	keypub = keyResponse.KeyPub
+	keyblob = keyResponse.KeyBlob
+
+	return keypub, keyblob, nil
+}
+
+type ChallengeData struct {
+	AIK     []byte
+	Asymenc []byte
+	Symenc  []byte
+}
+
+type ChallengeResponse struct {
+	Response []byte
+}
+
+// ValidateAIK challenges the TPM to validate an AIK by using the provided
+// key blob to decrypt a secret encrypted with the public half of the
+// AIK. This will only be possible if the TPM is able to decrypt the
+// encrypted key blob.  The AIK is used to decrypt asymenc, which then
+// provides the AES key used to encrypt symenc. Decrypting symenc provides
+// the original secret, which is then returned.
+func (client *TPMClient) ValidateAIK(aikblob []byte, asymenc []byte, symenc []byte) (secret []byte, err error) {
+	var challenge ChallengeData
+	var response ChallengeResponse
+
+	challenge.AIK = aikblob
+	challenge.Asymenc = asymenc
+	challenge.Symenc = symenc
+
+	request, err := json.Marshal(challenge)
+	if err != nil {
+		return nil, fmt.Errorf("Can't construct challenge JSON: %s", err)
+	}
+	chalresp, err := client.post(AikChallengeURL, bytes.NewBuffer(request))
+	if err != nil {
+		return nil, fmt.Errorf("Can't perform AIK challenge: %s", err)
+	}
+	defer chalresp.Body.Close()
+	body, err := ioutil.ReadAll(chalresp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("Can't read AIK challenge response: %s", err)
+	}
+
+	err = json.Unmarshal(body, &response)
+	if err != nil {
+		return nil, fmt.Errorf("Can't parse AIK challenge response: %s", err)
+	}
+	return response.Response, nil
+}
+
+type ExtendInput struct {
+	Pcr       int
+	Eventtype int
+	Data      []byte
+	Event     string
+}
+
+// Extend extends a TPM PCR with the provided data. If event is nil, data must
+// be pre-hashed with SHA1 and will be used to extend the PCR directly. If
+// event is not nil, data and event will be hashed to generate the extension
+// value. Event will then be stored in the TPM event log.
+func (client *TPMClient) Extend(pcr int, eventtype int, data []byte, event string) error {
+	var extendData ExtendInput
+
+	extendData.Pcr = pcr
+	extendData.Eventtype = eventtype
+	extendData.Data = data
+	extendData.Event = event
+
+	request, err := json.Marshal(extendData)
+	if err != nil {
+		return fmt.Errorf("Can't construct extension JSON: %s", err)
+	}
+	chalresp, err := client.post(ExtendURL, bytes.NewBuffer(request))
+	if err != nil {
+		return fmt.Errorf("Can't perform PCR extension: %s", err)
+	}
+	defer chalresp.Body.Close()
+
+	return nil
+}
+
+type QuoteData struct {
+	AIK   []byte
+	PCRs  []int
+	Nonce []byte
+}
+
+type QuoteResponse struct {
+	Data       []byte
+	Validation []byte
+	PCRValues  [][]byte
+	Events     []tspiconst.Log
+}
+
+// GetQuote obtains a PCR quote from the TPM. It takes the aikpub Tspi Key, the
+// encrypted AIK blob and a list of PCRs as arguments. The response will
+// contain an array of PCR values, an array of log entries and any error.
+func (client *TPMClient) GetQuote(aikpub []byte, aikblob []byte, pcrs []int) (pcrvals [][]byte, log []tspiconst.Log, err error) {
+	var quoteRequest QuoteData
+	var response QuoteResponse
+
+	nonce := make([]byte, 20)
+	_, err = rand.Read(nonce)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Unable to generate nonce: %s", err)
+	}
+
+	quoteRequest.AIK = aikblob
+	quoteRequest.PCRs = pcrs
+	quoteRequest.Nonce = nonce
+
+	request, err := json.Marshal(quoteRequest)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't construct quote request JSON: %s", err)
+	}
+	chalresp, err := client.post(QuoteURL, bytes.NewBuffer(request))
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't perform obtain quote: %s", err)
+	}
+	defer chalresp.Body.Close()
+	body, err := ioutil.ReadAll(chalresp.Body)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't read quote response: %s", err)
+	}
+
+	err = json.Unmarshal(body, &response)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't parse quote response: %s", err)
+	}
+
+	aikmod := aikpub[28:]
+
+	err = verification.QuoteVerify(response.Data, response.Validation, aikmod, response.PCRValues, nonce)
+
+	if err != nil {
+		return nil, nil, fmt.Errorf("Can't verify quote: %s", err)
+	}
+
+	return response.PCRValues, response.Events, nil
+}
+
+// New returns a TPMClient structure configured to connect to the provided
+// host with the provided timeout.
+func New(host string, timeout time.Duration) *TPMClient {
+	return &TPMClient{
+		host:    host,
+		timeout: timeout,
+	}
+}
diff --git a/vendor/github.com/coreos/go-tspi/tspiconst/tspiconst.go b/vendor/github.com/coreos/go-tspi/tspiconst/tspiconst.go
new file mode 100644
index 0000000000..f2446db76b
--- /dev/null
+++ b/vendor/github.com/coreos/go-tspi/tspiconst/tspiconst.go
@@ -0,0 +1,538 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tspiconst
+
+const (
+	TSS_OBJECT_TYPE_POLICY                                = 0x01
+	TSS_OBJECT_TYPE_RSAKEY                                = 0x02
+	TSS_OBJECT_TYPE_ENCDATA                               = 0x03
+	TSS_OBJECT_TYPE_PCRS                                  = 0x04
+	TSS_OBJECT_TYPE_HASH                                  = 0x05
+	TSS_OBJECT_TYPE_DELFAMILY                             = 0x06
+	TSS_OBJECT_TYPE_NV                                    = 0x07
+	TSS_OBJECT_TYPE_MIGDATA                               = 0x08
+	TSS_OBJECT_TYPE_DAA_CERTIFICATE                       = 0x09
+	TSS_OBJECT_TYPE_DAA_ISSUER_KEY                        = 0x0a
+	TSS_OBJECT_TYPE_DAA_ARA_KEY                           = 0x0b
+	TSS_KEY_NO_AUTHORIZATION                              = 0x00000000
+	TSS_KEY_AUTHORIZATION                                 = 0x00000001
+	TSS_KEY_AUTHORIZATION_PRIV_USE_ONLY                   = 0x00000002
+	TSS_KEY_NON_VOLATILE                                  = 0x00000000
+	TSS_KEY_VOLATILE                                      = 0x00000004
+	TSS_KEY_NOT_MIGRATABLE                                = 0x00000000
+	TSS_KEY_MIGRATABLE                                    = 0x00000008
+	TSS_KEY_TYPE_DEFAULT                                  = 0x00000000
+	TSS_KEY_TYPE_SIGNING                                  = 0x00000010
+	TSS_KEY_TYPE_STORAGE                                  = 0x00000020
+	TSS_KEY_TYPE_IDENTITY                                 = 0x00000030
+	TSS_KEY_TYPE_AUTHCHANGE                               = 0x00000040
+	TSS_KEY_TYPE_BIND                                     = 0x00000050
+	TSS_KEY_TYPE_LEGACY                                   = 0x00000060
+	TSS_KEY_TYPE_MIGRATE                                  = 0x00000070
+	TSS_KEY_TYPE_BITMASK                                  = 0x000000F0
+	TSS_KEY_SIZE_DEFAULT                                  = 0x00000000
+	TSS_KEY_SIZE_512                                      = 0x00000100
+	TSS_KEY_SIZE_1024                                     = 0x00000200
+	TSS_KEY_SIZE_2048                                     = 0x00000300
+	TSS_KEY_SIZE_4096                                     = 0x00000400
+	TSS_KEY_SIZE_8192                                     = 0x00000500
+	TSS_KEY_SIZE_16384                                    = 0x00000600
+	TSS_KEY_SIZE_BITMASK                                  = 0x00000F00
+	TSS_KEY_NOT_CERTIFIED_MIGRATABLE                      = 0x00000000
+	TSS_KEY_CERTIFIED_MIGRATABLE                          = 0x00001000
+	TSS_KEY_STRUCT_DEFAULT                                = 0x00000000
+	TSS_KEY_STRUCT_KEY                                    = 0x00004000
+	TSS_KEY_STRUCT_KEY12                                  = 0x00008000
+	TSS_KEY_STRUCT_BITMASK                                = 0x0001C000
+	TSS_KEY_EMPTY_KEY                                     = 0x00000000
+	TSS_KEY_TSP_SRK                                       = 0x04000000
+	TSS_KEY_TEMPLATE_BITMASK                              = 0xFC000000
+	TSS_ENCDATA_SEAL                                      = 0x00000001
+	TSS_ENCDATA_BIND                                      = 0x00000002
+	TSS_ENCDATA_LEGACY                                    = 0x00000003
+	TSS_HASH_DEFAULT                                      = 0x00000000
+	TSS_HASH_SHA1                                         = 0x00000001
+	TSS_HASH_OTHER                                        = 0xFFFFFFFF
+	TSS_POLICY_USAGE                                      = 0x00000001
+	TSS_POLICY_MIGRATION                                  = 0x00000002
+	TSS_POLICY_OPERATOR                                   = 0x00000003
+	TSS_PCRS_STRUCT_DEFAULT                               = 0x00000000
+	TSS_PCRS_STRUCT_INFO                                  = 0x00000001
+	TSS_PCRS_STRUCT_INFO_LONG                             = 0x00000002
+	TSS_PCRS_STRUCT_INFO_SHORT                            = 0x00000003
+	TSS_TSPATTRIB_CONTEXT_SILENT_MODE                     = 0x00000001
+	TSS_TSPATTRIB_CONTEXT_MACHINE_NAME                    = 0x00000002
+	TSS_TSPATTRIB_CONTEXT_VERSION_MODE                    = 0x00000003
+	TSS_TSPATTRIB_CONTEXT_TRANSPORT                       = 0x00000004
+	TSS_TSPATTRIB_CONTEXT_CONNECTION_VERSION              = 0x00000005
+	TSS_TSPATTRIB_SECRET_HASH_MODE                        = 0x00000006
+	TSS_TSPATTRIB_CONTEXTTRANS_CONTROL                    = 0x00000008
+	TSS_TSPATTRIB_CONTEXTTRANS_MODE                       = 0x00000010
+	TSS_TSPATTRIB_CONTEXT_NOT_SILENT                      = 0x00000000
+	TSS_TSPATTRIB_CONTEXT_SILENT                          = 0x00000001
+	TSS_TSPATTRIB_CONTEXT_VERSION_AUTO                    = 0x00000001
+	TSS_TSPATTRIB_CONTEXT_VERSION_V1_1                    = 0x00000002
+	TSS_TSPATTRIB_CONTEXT_VERSION_V1_2                    = 0x00000003
+	TSS_TSPATTRIB_DISABLE_TRANSPORT                       = 0x00000016
+	TSS_TSPATTRIB_ENABLE_TRANSPORT                        = 0x00000032
+	TSS_TSPATTRIB_TRANSPORT_NO_DEFAULT_ENCRYPTION         = 0x00000000
+	TSS_TSPATTRIB_TRANSPORT_DEFAULT_ENCRYPTION            = 0x00000001
+	TSS_TSPATTRIB_TRANSPORT_AUTHENTIC_CHANNEL             = 0x00000002
+	TSS_TSPATTRIB_TRANSPORT_EXCLUSIVE                     = 0x00000004
+	TSS_TSPATTRIB_TRANSPORT_STATIC_AUTH                   = 0x00000008
+	TSS_CONNECTION_VERSION_1_1                            = 0x00000001
+	TSS_CONNECTION_VERSION_1_2                            = 0x00000002
+	TSS_TSPATTRIB_SECRET_HASH_MODE_POPUP                  = 0x00000001
+	TSS_TSPATTRIB_HASH_MODE_NOT_NULL                      = 0x00000000
+	TSS_TSPATTRIB_HASH_MODE_NULL                          = 0x00000001
+	TSS_TSPATTRIB_TPM_CALLBACK_COLLATEIDENTITY            = 0x00000001
+	TSS_TSPATTRIB_TPM_CALLBACK_ACTIVATEIDENTITY           = 0x00000002
+	TSS_TSPATTRIB_TPM_ORDINAL_AUDIT_STATUS                = 0x00000003
+	TSS_TSPATTRIB_TPM_CREDENTIAL                          = 0x00001000
+	TPM_CAP_PROP_TPM_CLEAR_ORDINAL_AUDIT                  = 0x00000000
+	TPM_CAP_PROP_TPM_SET_ORDINAL_AUDIT                    = 0x00000001
+	TSS_TPMATTRIB_EKCERT                                  = 0x00000001
+	TSS_TPMATTRIB_TPM_CC                                  = 0x00000002
+	TSS_TPMATTRIB_PLATFORMCERT                            = 0x00000003
+	TSS_TPMATTRIB_PLATFORM_CC                             = 0x00000004
+	TSS_TSPATTRIB_POLICY_CALLBACK_HMAC                    = 0x00000080
+	TSS_TSPATTRIB_POLICY_CALLBACK_XOR_ENC                 = 0x00000100
+	TSS_TSPATTRIB_POLICY_CALLBACK_TAKEOWNERSHIP           = 0x00000180
+	TSS_TSPATTRIB_POLICY_CALLBACK_CHANGEAUTHASYM          = 0x00000200
+	TSS_TSPATTRIB_POLICY_SECRET_LIFETIME                  = 0x00000280
+	TSS_TSPATTRIB_POLICY_POPUPSTRING                      = 0x00000300
+	TSS_TSPATTRIB_POLICY_CALLBACK_SEALX_MASK              = 0x00000380
+	TSS_TSPATTRIB_POLICY_DELEGATION_INFO                  = 0x00000001
+	TSS_TSPATTRIB_POLICY_DELEGATION_PCR                   = 0x00000002
+	TSS_SECRET_LIFETIME_ALWAYS                            = 0x00000001
+	TSS_SECRET_LIFETIME_COUNTER                           = 0x00000002
+	TSS_SECRET_LIFETIME_TIMER                             = 0x00000003
+	TSS_TSPATTRIB_POLSECRET_LIFETIME_ALWAYS               = TSS_SECRET_LIFETIME_ALWAYS
+	TSS_TSPATTRIB_POLSECRET_LIFETIME_COUNTER              = TSS_SECRET_LIFETIME_COUNTER
+	TSS_TSPATTRIB_POLSECRET_LIFETIME_TIMER                = TSS_SECRET_LIFETIME_TIMER
+	TSS_TSPATTRIB_POLICYSECRET_LIFETIME_ALWAYS            = TSS_SECRET_LIFETIME_ALWAYS
+	TSS_TSPATTRIB_POLICYSECRET_LIFETIME_COUNTER           = TSS_SECRET_LIFETIME_COUNTER
+	TSS_TSPATTRIB_POLICYSECRET_LIFETIME_TIMER             = TSS_SECRET_LIFETIME_TIMER
+	TSS_TSPATTRIB_POLDEL_TYPE                             = 0x00000001
+	TSS_TSPATTRIB_POLDEL_INDEX                            = 0x00000002
+	TSS_TSPATTRIB_POLDEL_PER1                             = 0x00000003
+	TSS_TSPATTRIB_POLDEL_PER2                             = 0x00000004
+	TSS_TSPATTRIB_POLDEL_LABEL                            = 0x00000005
+	TSS_TSPATTRIB_POLDEL_FAMILYID                         = 0x00000006
+	TSS_TSPATTRIB_POLDEL_VERCOUNT                         = 0x00000007
+	TSS_TSPATTRIB_POLDEL_OWNERBLOB                        = 0x00000008
+	TSS_TSPATTRIB_POLDEL_KEYBLOB                          = 0x00000009
+	TSS_TSPATTRIB_POLDELPCR_LOCALITY                      = 0x00000001
+	TSS_TSPATTRIB_POLDELPCR_DIGESTATRELEASE               = 0x00000002
+	TSS_TSPATTRIB_POLDELPCR_SELECTION                     = 0x00000003
+	TSS_DELEGATIONTYPE_NONE                               = 0x00000001
+	TSS_DELEGATIONTYPE_OWNER                              = 0x00000002
+	TSS_DELEGATIONTYPE_KEY                                = 0x00000003
+	TSS_SECRET_MODE_NONE                                  = 0x00000800
+	TSS_SECRET_MODE_SHA1                                  = 0x00001000
+	TSS_SECRET_MODE_PLAIN                                 = 0x00001800
+	TSS_SECRET_MODE_POPUP                                 = 0x00002000
+	TSS_SECRET_MODE_CALLBACK                              = 0x00002800
+	TSS_TSPATTRIB_ENCDATA_BLOB                            = 0x00000008
+	TSS_TSPATTRIB_ENCDATA_PCR                             = 0x00000010
+	TSS_TSPATTRIB_ENCDATA_PCR_LONG                        = 0x00000018
+	TSS_TSPATTRIB_ENCDATA_SEAL                            = 0x00000020
+	TSS_TSPATTRIB_ENCDATABLOB_BLOB                        = 0x00000001
+	TSS_TSPATTRIB_ENCDATAPCR_DIGEST_ATCREATION            = 0x00000002
+	TSS_TSPATTRIB_ENCDATAPCR_DIGEST_ATRELEASE             = 0x00000003
+	TSS_TSPATTRIB_ENCDATAPCR_SELECTION                    = 0x00000004
+	TSS_TSPATTRIB_ENCDATAPCR_DIGEST_RELEASE               = TSS_TSPATTRIB_ENCDATAPCR_DIGEST_ATRELEASE
+	TSS_TSPATTRIB_ENCDATAPCRLONG_LOCALITY_ATCREATION      = 0x00000005
+	TSS_TSPATTRIB_ENCDATAPCRLONG_LOCALITY_ATRELEASE       = 0x00000006
+	TSS_TSPATTRIB_ENCDATAPCRLONG_CREATION_SELECTION       = 0x00000007
+	TSS_TSPATTRIB_ENCDATAPCRLONG_RELEASE_SELECTION        = 0x00000008
+	TSS_TSPATTRIB_ENCDATAPCRLONG_DIGEST_ATCREATION        = 0x00000009
+	TSS_TSPATTRIB_ENCDATAPCRLONG_DIGEST_ATRELEASE         = 0x0000000A
+	TSS_TSPATTRIB_ENCDATASEAL_PROTECT_MODE                = 0x00000001
+	TSS_TSPATTRIB_ENCDATASEAL_NOPROTECT                   = 0x00000000
+	TSS_TSPATTRIB_ENCDATASEAL_PROTECT                     = 0x00000001
+	TSS_TSPATTRIB_ENCDATASEAL_NO_PROTECT                  = TSS_TSPATTRIB_ENCDATASEAL_NOPROTECT
+	TSS_TSPATTRIB_NV_INDEX                                = 0x00000001
+	TSS_TSPATTRIB_NV_PERMISSIONS                          = 0x00000002
+	TSS_TSPATTRIB_NV_STATE                                = 0x00000003
+	TSS_TSPATTRIB_NV_DATASIZE                             = 0x00000004
+	TSS_TSPATTRIB_NV_PCR                                  = 0x00000005
+	TSS_TSPATTRIB_NVSTATE_READSTCLEAR                     = 0x00100000
+	TSS_TSPATTRIB_NVSTATE_WRITESTCLEAR                    = 0x00200000
+	TSS_TSPATTRIB_NVSTATE_WRITEDEFINE                     = 0x00300000
+	TSS_TSPATTRIB_NVPCR_READPCRSELECTION                  = 0x01000000
+	TSS_TSPATTRIB_NVPCR_READDIGESTATRELEASE               = 0x02000000
+	TSS_TSPATTRIB_NVPCR_READLOCALITYATRELEASE             = 0x03000000
+	TSS_TSPATTRIB_NVPCR_WRITEPCRSELECTION                 = 0x04000000
+	TSS_TSPATTRIB_NVPCR_WRITEDIGESTATRELEASE              = 0x05000000
+	TSS_TSPATTRIB_NVPCR_WRITELOCALITYATRELEASE            = 0x06000000
+	TSS_NV_TPM                                            = 0x80000000
+	TSS_NV_PLATFORM                                       = 0x40000000
+	TSS_NV_USER                                           = 0x20000000
+	TSS_NV_DEFINED                                        = 0x10000000
+	TSS_NV_MASK_TPM                                       = 0x80000000
+	TSS_NV_MASK_PLATFORM                                  = 0x40000000
+	TSS_NV_MASK_USER                                      = 0x20000000
+	TSS_NV_MASK_DEFINED                                   = 0x10000000
+	TSS_NV_MASK_RESERVED                                  = 0x0f000000
+	TSS_NV_MASK_PURVIEW                                   = 0x00ff0000
+	TSS_NV_MASK_INDEX                                     = 0x0000ffff
+	TSS_NV_INDEX_SESSIONS                                 = 0x00011101
+	TSS_MIGATTRIB_MIGRATIONBLOB                           = 0x00000010
+	TSS_MIGATTRIB_MIGRATIONTICKET                         = 0x00000020
+	TSS_MIGATTRIB_AUTHORITY_DATA                          = 0x00000030
+	TSS_MIGATTRIB_MIG_AUTH_DATA                           = 0x00000040
+	TSS_MIGATTRIB_TICKET_DATA                             = 0x00000050
+	TSS_MIGATTRIB_PAYLOAD_TYPE                            = 0x00000060
+	TSS_MIGATTRIB_MIGRATION_XOR_BLOB                      = 0x00000101
+	TSS_MIGATTRIB_MIGRATION_REWRAPPED_BLOB                = 0x00000102
+	TSS_MIGATTRIB_MIG_MSALIST_PUBKEY_BLOB                 = 0x00000103
+	TSS_MIGATTRIB_MIG_AUTHORITY_PUBKEY_BLOB               = 0x00000104
+	TSS_MIGATTRIB_MIG_DESTINATION_PUBKEY_BLOB             = 0x00000105
+	TSS_MIGATTRIB_MIG_SOURCE_PUBKEY_BLOB                  = 0x00000106
+	TSS_MIGATTRIB_MIG_REWRAPPED_BLOB                      = TSS_MIGATTRIB_MIGRATION_REWRAPPED_BLOB
+	TSS_MIGATTRIB_MIG_XOR_BLOB                            = TSS_MIGATTRIB_MIGRATION_XOR_BLOB
+	TSS_MIGATTRIB_AUTHORITY_DIGEST                        = 0x00000301
+	TSS_MIGATTRIB_AUTHORITY_APPROVAL_HMAC                 = 0x00000302
+	TSS_MIGATTRIB_AUTHORITY_MSALIST                       = 0x00000303
+	TSS_MIGATTRIB_MIG_AUTH_AUTHORITY_DIGEST               = 0x00000401
+	TSS_MIGATTRIB_MIG_AUTH_DESTINATION_DIGEST             = 0x00000402
+	TSS_MIGATTRIB_MIG_AUTH_SOURCE_DIGEST                  = 0x00000403
+	TSS_MIGATTRIB_TICKET_SIG_DIGEST                       = 0x00000501
+	TSS_MIGATTRIB_TICKET_SIG_VALUE                        = 0x00000502
+	TSS_MIGATTRIB_TICKET_SIG_TICKET                       = 0x00000503
+	TSS_MIGATTRIB_TICKET_RESTRICT_TICKET                  = 0x00000504
+	TSS_MIGATTRIB_PT_MIGRATE_RESTRICTED                   = 0x00000601
+	TSS_MIGATTRIB_PT_MIGRATE_EXTERNAL                     = 0x00000602
+	TSS_TSPATTRIB_HASH_IDENTIFIER                         = 0x00001000
+	TSS_TSPATTRIB_ALG_IDENTIFIER                          = 0x00002000
+	TSS_TSPATTRIB_PCRS_INFO                               = 0x00000001
+	TSS_TSPATTRIB_PCRSINFO_PCRSTRUCT                      = 0x00000001
+	TSS_TSPATTRIB_DELFAMILY_STATE                         = 0x00000001
+	TSS_TSPATTRIB_DELFAMILY_INFO                          = 0x00000002
+	TSS_TSPATTRIB_DELFAMILYSTATE_LOCKED                   = 0x00000001
+	TSS_TSPATTRIB_DELFAMILYSTATE_ENABLED                  = 0x00000002
+	TSS_TSPATTRIB_DELFAMILYINFO_LABEL                     = 0x00000003
+	TSS_TSPATTRIB_DELFAMILYINFO_VERCOUNT                  = 0x00000004
+	TSS_TSPATTRIB_DELFAMILYINFO_FAMILYID                  = 0x00000005
+	TSS_DELEGATE_INCREMENTVERIFICATIONCOUNT               = 1
+	TSS_DELEGATE_CACHEOWNERDELEGATION_OVERWRITEEXISTING   = 1
+	TSS_TSPATTRIB_DAACRED_COMMIT                          = 0x00000001
+	TSS_TSPATTRIB_DAACRED_ATTRIB_GAMMAS                   = 0x00000002
+	TSS_TSPATTRIB_DAACRED_CREDENTIAL_BLOB                 = 0x00000003
+	TSS_TSPATTRIB_DAACRED_CALLBACK_SIGN                   = 0x00000004
+	TSS_TSPATTRIB_DAACRED_CALLBACK_VERIFYSIGNATURE        = 0x00000005
+	TSS_TSPATTRIB_DAACOMMIT_NUMBER                        = 0x00000001
+	TSS_TSPATTRIB_DAACOMMIT_SELECTION                     = 0x00000002
+	TSS_TSPATTRIB_DAACOMMIT_COMMITMENTS                   = 0x00000003
+	TSS_TSPATTRIB_DAAATTRIBGAMMAS_BLOB                    = 0xffffffff
+	TSS_TSPATTRIB_DAAISSUERKEY_BLOB                       = 0x00000001
+	TSS_TSPATTRIB_DAAISSUERKEY_PUBKEY                     = 0x00000002
+	TSS_TSPATTRIB_DAAISSUERKEYBLOB_PUBLIC_KEY             = 0x00000001
+	TSS_TSPATTRIB_DAAISSUERKEYBLOB_SECRET_KEY             = 0x00000002
+	TSS_TSPATTRIB_DAAISSUERKEYBLOB_KEYBLOB                = 0x00000003
+	TSS_TSPATTRIB_DAAISSUERKEYBLOB_PROOF                  = 0x00000004
+	TSS_TSPATTRIB_DAAISSUERKEYPUBKEY_NUM_ATTRIBS          = 0x00000001
+	TSS_TSPATTRIB_DAAISSUERKEYPUBKEY_NUM_PLATFORM_ATTRIBS = 0x00000002
+	TSS_TSPATTRIB_DAAISSUERKEYPUBKEY_NUM_ISSUER_ATTRIBS   = 0x00000003
+	TSS_TSPATTRIB_DAAARAKEY_BLOB                          = 0x00000001
+	TSS_TSPATTRIB_DAAARAKEYBLOB_PUBLIC_KEY                = 0x00000001
+	TSS_TSPATTRIB_DAAARAKEYBLOB_SECRET_KEY                = 0x00000002
+	TSS_TSPATTRIB_DAAARAKEYBLOB_KEYBLOB                   = 0x00000003
+	TSS_FLAG_DAA_PSEUDONYM_PLAIN                          = 0x00000000
+	TSS_FLAG_DAA_PSEUDONYM_ENCRYPTED                      = 0x00000001
+	TSS_TSPATTRIB_KEY_BLOB                                = 0x00000040
+	TSS_TSPATTRIB_KEY_INFO                                = 0x00000080
+	TSS_TSPATTRIB_KEY_UUID                                = 0x000000C0
+	TSS_TSPATTRIB_KEY_PCR                                 = 0x00000100
+	TSS_TSPATTRIB_RSAKEY_INFO                             = 0x00000140
+	TSS_TSPATTRIB_KEY_REGISTER                            = 0x00000180
+	TSS_TSPATTRIB_KEY_PCR_LONG                            = 0x000001c0
+	TSS_TSPATTRIB_KEY_CONTROLBIT                          = 0x00000200
+	TSS_TSPATTRIB_KEY_CMKINFO                             = 0x00000400
+	TSS_TSPATTRIB_KEYBLOB_BLOB                            = 0x00000008
+	TSS_TSPATTRIB_KEYBLOB_PUBLIC_KEY                      = 0x00000010
+	TSS_TSPATTRIB_KEYBLOB_PRIVATE_KEY                     = 0x00000028
+	TSS_TSPATTRIB_KEYINFO_SIZE                            = 0x00000080
+	TSS_TSPATTRIB_KEYINFO_USAGE                           = 0x00000100
+	TSS_TSPATTRIB_KEYINFO_KEYFLAGS                        = 0x00000180
+	TSS_TSPATTRIB_KEYINFO_AUTHUSAGE                       = 0x00000200
+	TSS_TSPATTRIB_KEYINFO_ALGORITHM                       = 0x00000280
+	TSS_TSPATTRIB_KEYINFO_SIGSCHEME                       = 0x00000300
+	TSS_TSPATTRIB_KEYINFO_ENCSCHEME                       = 0x00000380
+	TSS_TSPATTRIB_KEYINFO_MIGRATABLE                      = 0x00000400
+	TSS_TSPATTRIB_KEYINFO_REDIRECTED                      = 0x00000480
+	TSS_TSPATTRIB_KEYINFO_VOLATILE                        = 0x00000500
+	TSS_TSPATTRIB_KEYINFO_AUTHDATAUSAGE                   = 0x00000580
+	TSS_TSPATTRIB_KEYINFO_VERSION                         = 0x00000600
+	TSS_TSPATTRIB_KEYINFO_CMK                             = 0x00000680
+	TSS_TSPATTRIB_KEYINFO_KEYSTRUCT                       = 0x00000700
+	TSS_TSPATTRIB_KEYCONTROL_OWNEREVICT                   = 0x00000780
+	TSS_TSPATTRIB_KEYINFO_RSA_EXPONENT                    = 0x00001000
+	TSS_TSPATTRIB_KEYINFO_RSA_MODULUS                     = 0x00002000
+	TSS_TSPATTRIB_KEYINFO_RSA_KEYSIZE                     = 0x00003000
+	TSS_TSPATTRIB_KEYINFO_RSA_PRIMES                      = 0x00004000
+	TSS_TSPATTRIB_KEYPCR_DIGEST_ATCREATION                = 0x00008000
+	TSS_TSPATTRIB_KEYPCR_DIGEST_ATRELEASE                 = 0x00010000
+	TSS_TSPATTRIB_KEYPCR_SELECTION                        = 0x00018000
+	TSS_TSPATTRIB_KEYREGISTER_USER                        = 0x02000000
+	TSS_TSPATTRIB_KEYREGISTER_SYSTEM                      = 0x04000000
+	TSS_TSPATTRIB_KEYREGISTER_NO                          = 0x06000000
+	TSS_TSPATTRIB_KEYPCRLONG_LOCALITY_ATCREATION          = 0x00040000
+	TSS_TSPATTRIB_KEYPCRLONG_LOCALITY_ATRELEASE           = 0x00080000
+	TSS_TSPATTRIB_KEYPCRLONG_CREATION_SELECTION           = 0x000C0000
+	TSS_TSPATTRIB_KEYPCRLONG_RELEASE_SELECTION            = 0x00100000
+	TSS_TSPATTRIB_KEYPCRLONG_DIGEST_ATCREATION            = 0x00140000
+	TSS_TSPATTRIB_KEYPCRLONG_DIGEST_ATRELEASE             = 0x00180000
+	TSS_TSPATTRIB_KEYINFO_CMK_MA_APPROVAL                 = 0x00000010
+	TSS_TSPATTRIB_KEYINFO_CMK_MA_DIGEST                   = 0x00000020
+	TSS_KEY_SIZEVAL_512BIT                                = 0x0200
+	TSS_KEY_SIZEVAL_1024BIT                               = 0x0400
+	TSS_KEY_SIZEVAL_2048BIT                               = 0x0800
+	TSS_KEY_SIZEVAL_4096BIT                               = 0x1000
+	TSS_KEY_SIZEVAL_8192BIT                               = 0x2000
+	TSS_KEY_SIZEVAL_16384BIT                              = 0x4000
+	TSS_KEYUSAGE_BIND                                     = 0x00
+	TSS_KEYUSAGE_IDENTITY                                 = 0x01
+	TSS_KEYUSAGE_LEGACY                                   = 0x02
+	TSS_KEYUSAGE_SIGN                                     = 0x03
+	TSS_KEYUSAGE_STORAGE                                  = 0x04
+	TSS_KEYUSAGE_AUTHCHANGE                               = 0x05
+	TSS_KEYUSAGE_MIGRATE                                  = 0x06
+	TSS_KEYFLAG_REDIRECTION                               = 0x00000001
+	TSS_KEYFLAG_MIGRATABLE                                = 0x00000002
+	TSS_KEYFLAG_VOLATILEKEY                               = 0x00000004
+	TSS_KEYFLAG_CERTIFIED_MIGRATABLE                      = 0x00000008
+	TSS_ALG_RSA                                           = 0x20
+	TSS_ALG_DES                                           = 0x21
+	TSS_ALG_3DES                                          = 0x22
+	TSS_ALG_SHA                                           = 0x23
+	TSS_ALG_HMAC                                          = 0x24
+	TSS_ALG_AES128                                        = 0x25
+	TSS_ALG_AES192                                        = 0x26
+	TSS_ALG_AES256                                        = 0x27
+	TSS_ALG_XOR                                           = 0x28
+	TSS_ALG_MGF1                                          = 0x29
+	TSS_ALG_AES                                           = TSS_ALG_AES128
+	TSS_ALG_DEFAULT                                       = 0xfe
+	TSS_ALG_DEFAULT_SIZE                                  = 0xff
+	TSS_SS_NONE                                           = 0x10
+	TSS_SS_RSASSAPKCS1V15_SHA1                            = 0x11
+	TSS_SS_RSASSAPKCS1V15_DER                             = 0x12
+	TSS_SS_RSASSAPKCS1V15_INFO                            = 0x13
+	TSS_ES_NONE                                           = 0x10
+	TSS_ES_RSAESPKCSV15                                   = 0x11
+	TSS_ES_RSAESOAEP_SHA1_MGF1                            = 0x12
+	TSS_ES_SYM_CNT                                        = 0x13
+	TSS_ES_SYM_OFB                                        = 0x14
+	TSS_ES_SYM_CBC_PKCS5PAD                               = 0x15
+	TSS_PS_TYPE_USER                                      = 1
+	TSS_PS_TYPE_SYSTEM                                    = 2
+	TSS_MS_MIGRATE                                        = 0x20
+	TSS_MS_REWRAP                                         = 0x21
+	TSS_MS_MAINT                                          = 0x22
+	TSS_MS_RESTRICT_MIGRATE                               = 0x23
+	TSS_MS_RESTRICT_APPROVE_DOUBLE                        = 0x24
+	TSS_MS_RESTRICT_MIGRATE_EXTERNAL                      = 0x25
+	TSS_KEYAUTH_AUTH_NEVER                                = 0x10
+	TSS_KEYAUTH_AUTH_ALWAYS                               = 0x11
+	TSS_KEYAUTH_AUTH_PRIV_USE_ONLY                        = 0x12
+	TSS_TPMSTATUS_DISABLEOWNERCLEAR                       = 0x00000001
+	TSS_TPMSTATUS_DISABLEFORCECLEAR                       = 0x00000002
+	TSS_TPMSTATUS_DISABLED                                = 0x00000003
+	TSS_TPMSTATUS_DEACTIVATED                             = 0x00000004
+	TSS_TPMSTATUS_OWNERSETDISABLE                         = 0x00000005
+	TSS_TPMSTATUS_SETOWNERINSTALL                         = 0x00000006
+	TSS_TPMSTATUS_DISABLEPUBEKREAD                        = 0x00000007
+	TSS_TPMSTATUS_ALLOWMAINTENANCE                        = 0x00000008
+	TSS_TPMSTATUS_PHYSPRES_LIFETIMELOCK                   = 0x00000009
+	TSS_TPMSTATUS_PHYSPRES_HWENABLE                       = 0x0000000A
+	TSS_TPMSTATUS_PHYSPRES_CMDENABLE                      = 0x0000000B
+	TSS_TPMSTATUS_PHYSPRES_LOCK                           = 0x0000000C
+	TSS_TPMSTATUS_PHYSPRESENCE                            = 0x0000000D
+	TSS_TPMSTATUS_PHYSICALDISABLE                         = 0x0000000E
+	TSS_TPMSTATUS_CEKP_USED                               = 0x0000000F
+	TSS_TPMSTATUS_PHYSICALSETDEACTIVATED                  = 0x00000010
+	TSS_TPMSTATUS_SETTEMPDEACTIVATED                      = 0x00000011
+	TSS_TPMSTATUS_POSTINITIALISE                          = 0x00000012
+	TSS_TPMSTATUS_TPMPOST                                 = 0x00000013
+	TSS_TPMSTATUS_TPMPOSTLOCK                             = 0x00000014
+	TSS_TPMSTATUS_DISABLEPUBSRKREAD                       = 0x00000016
+	TSS_TPMSTATUS_MAINTENANCEUSED                         = 0x00000017
+	TSS_TPMSTATUS_OPERATORINSTALLED                       = 0x00000018
+	TSS_TPMSTATUS_OPERATOR_INSTALLED                      = TSS_TPMSTATUS_OPERATORINSTALLED
+	TSS_TPMSTATUS_FIPS                                    = 0x00000019
+	TSS_TPMSTATUS_ENABLEREVOKEEK                          = 0x0000001A
+	TSS_TPMSTATUS_ENABLE_REVOKEEK                         = TSS_TPMSTATUS_ENABLEREVOKEEK
+	TSS_TPMSTATUS_NV_LOCK                                 = 0x0000001B
+	TSS_TPMSTATUS_TPM_ESTABLISHED                         = 0x0000001C
+	TSS_TPMSTATUS_RESETLOCK                               = 0x0000001D
+	TSS_TPMSTATUS_DISABLE_FULL_DA_LOGIC_INFO              = 0x0000001D
+	TSS_TPMCAP_ORD                                        = 0x10
+	TSS_TPMCAP_ALG                                        = 0x11
+	TSS_TPMCAP_FLAG                                       = 0x12
+	TSS_TPMCAP_PROPERTY                                   = 0x13
+	TSS_TPMCAP_VERSION                                    = 0x14
+	TSS_TPMCAP_VERSION_VAL                                = 0x15
+	TSS_TPMCAP_NV_LIST                                    = 0x16
+	TSS_TPMCAP_NV_INDEX                                   = 0x17
+	TSS_TPMCAP_MFR                                        = 0x18
+	TSS_TPMCAP_SYM_MODE                                   = 0x19
+	TSS_TPMCAP_HANDLE                                     = 0x1a
+	TSS_TPMCAP_TRANS_ES                                   = 0x1b
+	TSS_TPMCAP_AUTH_ENCRYPT                               = 0x1c
+	TSS_TPMCAP_SET_PERM_FLAGS                             = 0x1d
+	TSS_TPMCAP_SET_VENDOR                                 = 0x1e
+	TSS_TPMCAP_DA_LOGIC                                   = 0x1f
+	TSS_TPMCAP_PROP_PCR                                   = 0x10
+	TSS_TPMCAP_PROP_DIR                                   = 0x11
+	TSS_TPMCAP_PROP_MANUFACTURER                          = 0x12
+	TSS_TPMCAP_PROP_SLOTS                                 = 0x13
+	TSS_TPMCAP_PROP_KEYS                                  = TSS_TPMCAP_PROP_SLOTS
+	TSS_TPMCAP_PROP_FAMILYROWS                            = 0x14
+	TSS_TPMCAP_PROP_DELEGATEROWS                          = 0x15
+	TSS_TPMCAP_PROP_OWNER                                 = 0x16
+	TSS_TPMCAP_PROP_MAXKEYS                               = 0x18
+	TSS_TPMCAP_PROP_AUTHSESSIONS                          = 0x19
+	TSS_TPMCAP_PROP_MAXAUTHSESSIONS                       = 0x1a
+	TSS_TPMCAP_PROP_TRANSESSIONS                          = 0x1b
+	TSS_TPMCAP_PROP_MAXTRANSESSIONS                       = 0x1c
+	TSS_TPMCAP_PROP_SESSIONS                              = 0x1d
+	TSS_TPMCAP_PROP_MAXSESSIONS                           = 0x1e
+	TSS_TPMCAP_PROP_CONTEXTS                              = 0x1f
+	TSS_TPMCAP_PROP_MAXCONTEXTS                           = 0x20
+	TSS_TPMCAP_PROP_DAASESSIONS                           = 0x21
+	TSS_TPMCAP_PROP_MAXDAASESSIONS                        = 0x22
+	TSS_TPMCAP_PROP_DAA_INTERRUPT                         = 0x23
+	TSS_TPMCAP_PROP_COUNTERS                              = 0x24
+	TSS_TPMCAP_PROP_MAXCOUNTERS                           = 0x25
+	TSS_TPMCAP_PROP_ACTIVECOUNTER                         = 0x26
+	TSS_TPMCAP_PROP_MIN_COUNTER                           = 0x27
+	TSS_TPMCAP_PROP_TISTIMEOUTS                           = 0x28
+	TSS_TPMCAP_PROP_STARTUPEFFECTS                        = 0x29
+	TSS_TPMCAP_PROP_MAXCONTEXTCOUNTDIST                   = 0x2a
+	TSS_TPMCAP_PROP_CMKRESTRICTION                        = 0x2b
+	TSS_TPMCAP_PROP_DURATION                              = 0x2c
+	TSS_TPMCAP_PROP_MAXNVAVAILABLE                        = 0x2d
+	TSS_TPMCAP_PROP_INPUTBUFFERSIZE                       = 0x2e
+	TSS_TPMCAP_PROP_REVISION                              = 0x2f
+	TSS_TPMCAP_PROP_LOCALITIES_AVAIL                      = 0x32
+	TSS_RT_KEY                                            = 0x00000010
+	TSS_RT_AUTH                                           = 0x00000020
+	TSS_RT_TRANS                                          = 0x00000030
+	TSS_RT_COUNTER                                        = 0x00000040
+	TSS_TCSCAP_ALG                                        = 0x00000001
+	TSS_TCSCAP_VERSION                                    = 0x00000002
+	TSS_TCSCAP_CACHING                                    = 0x00000003
+	TSS_TCSCAP_PERSSTORAGE                                = 0x00000004
+	TSS_TCSCAP_MANUFACTURER                               = 0x00000005
+	TSS_TCSCAP_PLATFORM_CLASS                             = 0x00000006
+	TSS_TCSCAP_TRANSPORT                                  = 0x00000007
+	TSS_TCSCAP_PLATFORM_INFO                              = 0x00000008
+	TSS_TCSCAP_PROP_KEYCACHE                              = 0x00000100
+	TSS_TCSCAP_PROP_AUTHCACHE                             = 0x00000101
+	TSS_TCSCAP_PROP_MANUFACTURER_STR                      = 0x00000102
+	TSS_TCSCAP_PROP_MANUFACTURER_ID                       = 0x00000103
+	TSS_TCSCAP_PLATFORM_VERSION                           = 0x00001100
+	TSS_TCSCAP_PLATFORM_TYPE                              = 0x00001101
+	TSS_TCSCAP_TRANS_EXCLUSIVE                            = 0x00002100
+	TSS_TCSCAP_PROP_HOST_PLATFORM                         = 0x00003001
+	TSS_TCSCAP_PROP_ALL_PLATFORMS                         = 0x00003002
+	TSS_TSPCAP_ALG                                        = 0x00000010
+	TSS_TSPCAP_VERSION                                    = 0x00000011
+	TSS_TSPCAP_PERSSTORAGE                                = 0x00000012
+	TSS_TSPCAP_MANUFACTURER                               = 0x00000013
+	TSS_TSPCAP_RETURNVALUE_INFO                           = 0x00000015
+	TSS_TSPCAP_PLATFORM_INFO                              = 0x00000016
+	TSS_TSPCAP_PROP_MANUFACTURER_STR                      = 0x00000102
+	TSS_TSPCAP_PROP_MANUFACTURER_ID                       = 0x00000103
+	TSS_TSPCAP_PLATFORM_TYPE                              = 0x00000201
+	TSS_TSPCAP_PLATFORM_VERSION                           = 0x00000202
+	TSS_TSPCAP_PROP_RETURNVALUE_INFO                      = 0x00000201
+	TSS_EV_CODE_CERT                                      = 0x00000001
+	TSS_EV_CODE_NOCERT                                    = 0x00000002
+	TSS_EV_XML_CONFIG                                     = 0x00000003
+	TSS_EV_NO_ACTION                                      = 0x00000004
+	TSS_EV_SEPARATOR                                      = 0x00000005
+	TSS_EV_ACTION                                         = 0x00000006
+	TSS_EV_PLATFORM_SPECIFIC                              = 0x00000007
+	TSS_TSPCAP_RANDOMLIMIT                                = 0x00001000
+	TSS_PCRS_DIRECTION_CREATION                           = 1
+	TSS_PCRS_DIRECTION_RELEASE                            = 2
+	TSS_BLOB_STRUCT_VERSION                               = 0x01
+	TSS_BLOB_TYPE_KEY                                     = 0x01
+	TSS_BLOB_TYPE_PUBKEY                                  = 0x02
+	TSS_BLOB_TYPE_MIGKEY                                  = 0x03
+	TSS_BLOB_TYPE_SEALEDDATA                              = 0x04
+	TSS_BLOB_TYPE_BOUNDDATA                               = 0x05
+	TSS_BLOB_TYPE_MIGTICKET                               = 0x06
+	TSS_BLOB_TYPE_PRIVATEKEY                              = 0x07
+	TSS_BLOB_TYPE_PRIVATEKEY_MOD1                         = 0x08
+	TSS_BLOB_TYPE_RANDOM_XOR                              = 0x09
+	TSS_BLOB_TYPE_CERTIFY_INFO                            = 0x0A
+	TSS_BLOB_TYPE_KEY_1_2                                 = 0x0B
+	TSS_BLOB_TYPE_CERTIFY_INFO_2                          = 0x0C
+	TSS_BLOB_TYPE_CMK_MIG_KEY                             = 0x0D
+	TSS_BLOB_TYPE_CMK_BYTE_STREAM                         = 0x0E
+	TSS_CMK_DELEGATE_SIGNING                              = 1 << 31
+	TSS_CMK_DELEGATE_STORAGE                              = 1 << 30
+	TSS_CMK_DELEGATE_BIND                                 = 1 << 29
+	TSS_CMK_DELEGATE_LEGACY                               = 1 << 28
+	TSS_CMK_DELEGATE_MIGRATE                              = 1 << 27
+	TSS_DAA_LENGTH_N                                      = 256
+	TSS_DAA_LENGTH_F                                      = 13
+	TSS_DAA_LENGTH_E                                      = 46
+	TSS_DAA_LENGTH_E_PRIME                                = 15
+	TSS_DAA_LENGTH_V                                      = 317
+	TSS_DAA_LENGTH_SAFETY                                 = 10
+	TSS_DAA_LENGTH_HASH                                   = 20
+	TSS_DAA_LENGTH_S                                      = 128
+	TSS_DAA_LENGTH_GAMMA                                  = 204
+	TSS_DAA_LENGTH_RHO                                    = 26
+	TSS_DAA_LENGTH_MFG1_GAMMA                             = 214
+	TSS_DAA_LENGTH_MGF1_AR                                = 25
+	TPM_ALG_RSA                                           = 0x00000001
+	TPM_ALG_DES                                           = 0x00000002
+	TPM_ALG_3DES                                          = 0x00000003
+	TPM_ALG_SHA                                           = 0x00000004
+	TPM_ALG_HMAC                                          = 0x00000005
+	TPM_ALG_AES                                           = 0x00000006
+	TPM_ALG_AES128                                        = TPM_ALG_AES
+	TPM_ALG_MGF1                                          = 0x00000007
+	TPM_ALG_AES192                                        = 0x00000008
+	TPM_ALG_AES256                                        = 0x00000009
+	TPM_ALG_XOR                                           = 0x0000000A
+	TPM_SS_NONE                                           = 0x0001
+	TPM_SS_RSASSAPKCS1v15_SHA1                            = 0x0002
+	TPM_SS_RSASSAPKCS1v15_DER                             = 0x0003
+	TPM_SS_RSASSAPKCS1v15_INFO                            = 0x0004
+	TPM_ES_NONE                                           = 0x0001
+	TPM_ES_RSAESPKCSv15                                   = 0x0002
+	TPM_ES_RSAESOAEP_SHA1_MGF1                            = 0x0003
+	TPM_ES_SYM_CNT                                        = 0x0004
+	TPM_ES_SYM_CTR                                        = TPM_ES_SYM_CNT
+	TPM_ES_SYM_OFB                                        = 0x0005
+	TPM_ES_SYM_CBC_PKCS5PAD                               = 0x00FF
+)
+
+// Log represents an entry from the TSS event log. Pcr is the register that
+// was extended by the event. Eventtype is the type of the event. PcrValue
+// is the value that was hashed into the TPM. Event is the raw event data.
+type Log struct {
+	Pcr       int32
+	Eventtype int32
+	PcrValue  [20]byte
+	Event     []byte
+}
diff --git a/vendor/github.com/coreos/go-tspi/verification/verification.go b/vendor/github.com/coreos/go-tspi/verification/verification.go
new file mode 100644
index 0000000000..15e06e2103
--- /dev/null
+++ b/vendor/github.com/coreos/go-tspi/verification/verification.go
@@ -0,0 +1,654 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package verification
+
+import (
+	"bytes"
+	"crypto"
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/sha1"
+	"crypto/x509"
+	"encoding/binary"
+	"encoding/pem"
+	"errors"
+	"fmt"
+	"math/big"
+
+	"github.com/coreos/go-tspi/tspiconst"
+)
+
+func pad(plaintext []byte, bsize int) ([]byte, error) {
+	if bsize >= 256 {
+		return nil, errors.New("bsize must be < 256")
+	}
+	pad := bsize - (len(plaintext) % bsize)
+	if pad == 0 {
+		pad = bsize
+	}
+	for i := 0; i < pad; i++ {
+		plaintext = append(plaintext, byte(pad))
+	}
+	return plaintext, nil
+}
+
+// GenerateChallenge takes a copy of the EK certificate, the public half of
+// the AIK to be challenged and a secret. It then symmetrically encrypts the
+// secret with a randomly generated AES key and Asymmetrically encrypts the
+// AES key with the public half of the EK. These can then be provided to the
+// TPM in order to ensure that the AIK is under the control of the TPM. It
+// returns the asymmetrically and symmetrically encrypted data, along with
+// any error.
+func GenerateChallenge(ekcert []byte, aikpub []byte, secret []byte) (asymenc []byte, symenc []byte, err error) {
+	aeskey := make([]byte, 16)
+	iv := make([]byte, 16)
+
+	_, err = rand.Read(aeskey)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	_, err = rand.Read(iv)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	/*
+	 * The EK certificate has an OID for rsaesOaep which will break
+	 * parsing. Replace it with rsaEncryption instead.
+	 */
+	ekcert = bytes.Replace(ekcert, []byte{0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x07}, []byte{0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01}, 1)
+	cert, err := x509.ParseCertificate(ekcert)
+	pubkey := cert.PublicKey.(*rsa.PublicKey)
+
+	asymplain := []byte{0x00, 0x00, 0x00, 0x06, 0x00, 0xff, 0x00, 0x10}
+	asymplain = append(asymplain, aeskey...)
+	hash := sha1.Sum(aikpub)
+	asymplain = append(asymplain, hash[:]...)
+
+	label := []byte{'T', 'C', 'P', 'A'}
+	asymenc, err = rsa.EncryptOAEP(sha1.New(), rand.Reader, pubkey, asymplain, label)
+	block, err := aes.NewCipher(aeskey)
+	if err != nil {
+		return nil, nil, err
+	}
+	cbc := cipher.NewCBCEncrypter(block, iv)
+	secret, err = pad(secret, len(iv))
+	if err != nil {
+		return nil, nil, err
+	}
+	symenc = make([]byte, len(secret))
+	cbc.CryptBlocks(symenc, secret)
+
+	symheader := new(bytes.Buffer)
+	err = binary.Write(symheader, binary.BigEndian, (uint32)(len(symenc)+len(iv)))
+	if err != nil {
+		return nil, nil, err
+	}
+	err = binary.Write(symheader, binary.BigEndian, (uint32)(tspiconst.TPM_ALG_AES))
+	if err != nil {
+		return nil, nil, err
+	}
+	err = binary.Write(symheader, binary.BigEndian, (uint16)(tspiconst.TPM_ES_SYM_CBC_PKCS5PAD))
+	if err != nil {
+		return nil, nil, err
+	}
+	err = binary.Write(symheader, binary.BigEndian, (uint16)(tspiconst.TPM_SS_NONE))
+	if err != nil {
+		return nil, nil, err
+	}
+	err = binary.Write(symheader, binary.BigEndian, (uint32)(12))
+	if err != nil {
+		return nil, nil, err
+	}
+	err = binary.Write(symheader, binary.BigEndian, (uint32)(128))
+	if err != nil {
+		return nil, nil, err
+	}
+	err = binary.Write(symheader, binary.BigEndian, (uint32)(len(iv)))
+	if err != nil {
+		return nil, nil, err
+	}
+	err = binary.Write(symheader, binary.BigEndian, (uint32)(0))
+	if err != nil {
+		return nil, nil, err
+	}
+	header := make([]byte, 28)
+	err = binary.Read(symheader, binary.BigEndian, &header)
+	header = append(header, iv...)
+	header = append(header, symenc...)
+	symenc = header
+
+	return asymenc, symenc, nil
+}
+
+// VerifyEKCert verifies that the provided EK certificate is signed by a
+// trusted manufacturer.
+func VerifyEKCert(ekcert []byte) error {
+	trustedCerts := map[string]string{
+		"STM1": `-----BEGIN CERTIFICATE-----
+MIIDzDCCArSgAwIBAgIEAAAAATANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJD
+SDEeMBwGA1UEChMVU1RNaWNyb2VsZWN0cm9uaWNzIE5WMRswGQYDVQQDExJTVE0g
+VFBNIEVLIFJvb3QgQ0EwHhcNMDkwNzI4MDAwMDAwWhcNMjkxMjMxMDAwMDAwWjBV
+MQswCQYDVQQGEwJDSDEeMBwGA1UEChMVU1RNaWNyb2VsZWN0cm9uaWNzIE5WMSYw
+JAYDVQQDEx1TVE0gVFBNIEVLIEludGVybWVkaWF0ZSBDQSAwMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJQYnWO8iw955vWqakWNr3YyazQnNzqV97+l
+Qa+wUKMVY+lsyhAyOyXO31j4+clvsj6+JhNEwQtcnpkSc+TX60eZvLhgZPUgRVuK
+B9w4GUVyg/db593QUmP8K41Is8E+l32CQdcVh9go0toqf/oS/za1TDFHEHLlB4dC
+joKkfr3/hkGA9XJaoUopO2ELt4Otop12aw1BknoiTh1+YbzrZtAlIwK2TX99GW3S
+IjaCi+fLoXyK2Fmx8vKnr9JfNL888xK9BQfhZzKmbKm/eLD1e1CFRs1B3z2gd3ax
+pW5j1OIkSBMOIUeip5+7xvYo2gor5mxatB+rzSvrWup9AwIcymMCAwEAAaOBrjCB
+qzAdBgNVHQ4EFgQU88kVdKbnc/8TvwxrrXp7Zc8ceCAwHwYDVR0jBBgwFoAUb+bF
+bAe3bIsKgZKDXMtBHva00ScwRQYDVR0gAQH/BDswOTA3BgRVHSAAMC8wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cuc3QuY29tL1RQTS9yZXBvc2l0b3J5LzAOBgNVHQ8B
+Af8EBAMCAAQwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0BAQsFAAOCAQEA
+uZqViou3aZDGvaAn29gghOkj04SkEWViZR3dU3DGrA+5ZX+zr6kZduus3Hf0bVHT
+I318PZGTml1wm6faDRomE8bI5xADWhPiCQ1Gf7cFPiqaPkq7mgdC6SGlQtRAfoP8
+ISUJlih0UtsqBWGql4lpk5G6YmvAezguWmMR0/O5Cx5w8YKfXkwAhegGmMGIoJFO
+oSzJrS7jK2GnGCuRG65OQVC5HiQY2fFF0JePLWG/D56djNxMbPNGTHF3+yBWg0DU
+0xJKYKGFdjFcw0Wi0m2j49Pv3JD1f78c2Z3I/65pkklZGu4awnKQcHeGIbdYF0hQ
+LtDSBV4DR9q5GVxSR9JPgQ==
+-----END CERTIFICATE-----`,
+		"STM2": `-----BEGIN CERTIFICATE-----
+MIIDzDCCArSgAwIBAgIEAAAAAzANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJD
+SDEeMBwGA1UEChMVU1RNaWNyb2VsZWN0cm9uaWNzIE5WMRswGQYDVQQDExJTVE0g
+VFBNIEVLIFJvb3QgQ0EwHhcNMTEwMTIxMDAwMDAwWhcNMjkxMjMxMDAwMDAwWjBV
+MQswCQYDVQQGEwJDSDEeMBwGA1UEChMVU1RNaWNyb2VsZWN0cm9uaWNzIE5WMSYw
+JAYDVQQDEx1TVE0gVFBNIEVLIEludGVybWVkaWF0ZSBDQSAwMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJO3ihn/uHgV3HrlPZpv8+1+xg9ccLf3pVXJ
+oT5n8PHHixN6ZRBmf/Ng85/ODZzxnotC64WD8GHMLyQ0Cna3MJF+MGJZ5R5JkuJR
+B4CtgTPwcTVZIsCuup0aDWnPzYqHwvfaiD2FD0aaxCnTKIjWU9OztTD2I61xW2LK
+EY4Vde+W3C7WZgS5TpqkbhJzy2NJj6oSMDKklfI3X8jVf7bngMcCR3X3NcIo349I
+Dt1r1GfwB+oWrhogZVnMFJKAoSYP8aQrLDVl7SQOAgTXz2IDD6bo1jga/8Kb72dD
+h8D2qrkqWh7Hwdas3jqqbb9uiq6O2dJJY86FjffjXPo3jGlFjTsCAwEAAaOBrjCB
+qzAdBgNVHQ4EFgQUVx+Aa0fM55v6NZR87Yi40QBa4J4wHwYDVR0jBBgwFoAUb+bF
+bAe3bIsKgZKDXMtBHvaO0ScwRQYDVR0gAQH/BDswOTA3BgRVHSAAMC8wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cuc3QuY29tL1RQTS9yZXBvc2l0b3J5LzAOBgNVHQ8B
+Af8EBAMCAAQwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQsFAAOCAQEA
+4gllWq44PFWcv0JgMPOtyXDQx30YB5vBpjS0in7f/Y/r+1Dd8q3EZwNOwYApe+Lp
+/ldNqCXw4XzmO8ZCVWOdQdVOqHZuSOhe++Jn0S7M4z2/1PQ6EbRczGfw3dlX63Ec
+cEnrn6YMcgPC63Q+ID53vbTS3gpeX/SGpngtVwnzpuJ5rBajqSQUo5jBTBtuGQpO
+Ko6Eu7U6Ouz7BVgOSn0mLbfSRb77PjOLZ3+97gSiMmV0iofS7ufemYqA8sF7ZFv/
+lM2eOe/eeS56Jw+IPsnEU0Tf8Tn9hnEig1KP8VByRTWAJgiEOgX2nTs5iJbyZeIZ
+RUjDHQQ5onqhgjpfRsC95g==
+-----END CERTIFICATE-----`,
+		"NTC1": `-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIGAK3jXfbVMA0GCSqGSIb3DQEBBQUAMFIxUDAcBgNVBAMT
+FU5UQyBUUE0gRUsgUm9vdCBDQSAwMTAlBgNVBAoTHk51dm90b24gVGVjaG5vbG9n
+eSBDb3Jwb3JhdGlvbjAJBgNVBAYTAlRXMB4XDTEyMDcxMTE2MjkzMFoXDTMyMDcx
+MTE2MjkzMFowUjFQMBwGA1UEAxMVTlRDIFRQTSBFSyBSb290IENBIDAxMCUGA1UE
+ChMeTnV2b3RvbiBUZWNobm9sb2d5IENvcnBvcmF0aW9uMAkGA1UEBhMCVFcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoNqxhtD4yUtXhqKQGGZemoKJy
+uj1RnWvmNgzItLeejNU8B6fOnpMQyoS4K72tMhhFRK2jV9RYzyJMSjEwyX0ASTO1
+2yMti2UJQS60d36eGwk8WLgrFnnITlemshi01h9t1MOmay3TO1LLH/3/VDKJ+jbd
+cbfIO2bBquN8r3/ojYUaNSPj6pK1mmsMoJXF4dGRSEwb/4ozBIw5dugm1MEq4Zj3
+GZ0YPg5wyLRugQbt7DkUOX4FGuK5p/C0u5zX8u33EGTrDrRz3ye3zO+aAY1xXF/m
+qwEqgxX5M8f0/DXTTO/CfeIksuPeOzujFtXfi5Cy64eeIZ0nAUG3jbtnGjoFAgMB
+AAGjJjAkMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAGAQH/AgEAMA0GCSqG
+SIb3DQEBBQUAA4IBAQBBQznOPJAsD4Yvyt/hXtVJSgBX/+rRfoaqbdt3UMbUPJYi
+pUoTUgaTx02DVRwommO+hLx7CS++1F2zorWC8qQyvNbg7iffQbbjWitt8NPE6kCr
+q0Y5g7M/LkQDd5N3cFfC15uFJOtlj+A2DGzir8dlXU/0qNq9dBFbi+y+Y3rAT+wK
+fktmN82UT861wTUzDvnXO+v7H5DYXjUU8kejPW6q+GgsccIbVTOdHNNWbMrcD9yf
+oS91nMZ/+/n7IfFWXNN82qERsrvOFCDsbIzUOR30N0IP++oqGfwAbKFfCOCFUz6j
+jpXUdJlh22tp12UMsreibmi5bsWYBgybwSbRgvzE
+-----END CERTIFICATE-----`,
+		"NTC2": `-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIGAPadBmPZMA0GCSqGSIb3DQEBBQUAMFIxUDAcBgNVBAMT
+FU5UQyBUUE0gRUsgUm9vdCBDQSAwMjAlBgNVBAoTHk51dm90b24gVGVjaG5vbG9n
+eSBDb3Jwb3JhdGlvbjAJBgNVBAYTAlRXMB4XDTEyMDcxMTE2MzMyNFoXDTMyMDcx
+MTE2MzMyNFowUjFQMBwGA1UEAxMVTlRDIFRQTSBFSyBSb290IENBIDAyMCUGA1UE
+ChMeTnV2b3RvbiBUZWNobm9sb2d5IENvcnBvcmF0aW9uMAkGA1UEBhMCVFcwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSagWxaANT1YA2YUSN7sq7yzOT
+1ymbIM+WijhE5AGcLwLFoJ9fmaQrYL6fAW2EW/Q3yu97Q9Ysr8yYZ2XCCfxfseEr
+Vs80an8Nk6LkTDz8+0Hm0Cct0klvNUAZEIvWpmgHZMvGijXyOcp4z494d8B28Ynb
+I7x0JMXZZQQKQi+WfuHtntF+2osYScweocipPrGeONLKU9sngWZ2vnnvw1SBneTa
+irxq0Q0SD6Bx9jtxvdf87euk8JzfPhX8jp8GEeAjmLwGR+tnOQrDmczGNmp7YYNN
+R+Q7NZVoYWHw5jaoZnNxbouWUXZZxFqDsB/ndCKWtsIzRYPuWcqrFcmUN4SVAgMB
+AAGjJjAkMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAGAQH/AgEAMA0GCSqG
+SIb3DQEBBQUAA4IBAQAIkdDSErzPLPYrVthw4lKjW4tRYelUicMPEHKjQeVUAAS5
+y9XTzB4DWISDAFsgtQjqHJj0xCG+vpY0Rmn2FCO/0YpP+YBQkdbJOsiyXCdFy9e4
+gGjQ24gw1B+rr84+pkI51y952NYBdoQDeb7diPe+24U94f//DYt/JQ8cJua4alr3
+2Pohhh5TxCXXfU2EHt67KyqBSxCSy9m4OkCOGLHL2X5nQIdXVj178mw6DSAwyhwR
+n3uJo5MvUEoQTFZJKGSXfab619mIgzEr+YHsIQToqf44VfDMDdM+MFiXQ3a5fLii
+hEKQ9DhBPtpHAbhFA4jhCiG9HA8FdEplJ+M4uxNz
+-----END CERTIFICATE-----`,
+		"IFX1": `-----BEGIN CERTIFICATE-----
+MIIEnzCCA4egAwIBAgIEMV64bDANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
+RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
+aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
+QTAeFw0wNTEwMjAxMzQ3NDNaFw0yNTEwMjAxMzQ3NDNaMHcxCzAJBgNVBAYTAkRF
+MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
+cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
+aWF0ZSBDQSAwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALftPhYN
+t4rE+JnU/XOPICbOBLvfo6iA7nuq7zf4DzsAWBdsZEdFJQfaK331ihG3IpQnlQ2i
+YtDim289265f0J4OkPFpKeFU27CsfozVaNUm6UR/uzwA8ncxFc3iZLRMRNLru/Al
+VG053ULVDQMVx2iwwbBSAYO9pGiGbk1iMmuZaSErMdb9v0KRUyZM7yABiyDlM3cz
+UQX5vLWV0uWqxdGoHwNva5u3ynP9UxPTZWHZOHE6+14rMzpobs6Ww2RR8BgF96rh
+4rRAZEl8BXhwiQq4STvUXkfvdpWH4lzsGcDDtrB6Nt3KvVNvsKz+b07Dk+Xzt+EH
+NTf3Byk2HlvX+scCAwEAAaOCATswggE3MB0GA1UdDgQWBBQ4k8292HPEIzMV4bE7
+qWoNI8wQxzAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
+HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
+d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
+MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
+BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
+RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
+DQYJKoZIhvcNAQEFBQADggEBABJ1+Ap3rNlxZ0FW0aIgdzktbNHlvXWNxFdYIBbM
+OKjmbOos0Y4O60eKPu259XmMItCUmtbzF3oKYXq6ybARUT2Lm+JsseMF5VgikSlU
+BJALqpKVjwAds81OtmnIQe2LSu4xcTSavpsL4f52cUAu/maMhtSgN9mq5roYptq9
+DnSSDZrX4uYiMPl//rBaNDBflhJ727j8xo9CCohF3yQUoQm7coUgbRMzyO64yMIO
+3fhb+Vuc7sNwrMOz3VJN14C3JMoGgXy0c57IP/kD5zGRvljKEvrRC2I147+fPeLS
+DueRMS6lblvRKiZgmGAg7YaKOkOaEmVDMQ+fTo2Po7hI5wc=
+-----END CERTIFICATE-----`,
+		"IFX2": `-----BEGIN CERTIFICATE-----
+MIIEnzCCA4egAwIBAgIEaItIgTANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
+RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
+aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
+QTAeFw0wNjEyMjExMDM0MDBaFw0yNjEyMjExMDM0MDBaMHcxCzAJBgNVBAYTAkRF
+MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
+cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
+aWF0ZSBDQSAwMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK6KnP5R
+8ppq9TtPu3mAs3AFxdWhzK5ks+BixGR6mpzyXG64Bjl4xzBXeBIVtlBZXYvIAJ5s
+eCTEEsnZc9eKNJeFLdmXQ/siRrTeonyxoS4aL1mVEQebLUz2gN9J6j1ewly+OvGk
+jEYouGCzA+fARzLeRIrhuhBI0kUChbH7VM8FngJsbT4xKB3EJ6Wttma25VSimkAr
+SPS6dzUDRS1OFCWtAtHJW6YjBnA4wgR8WfpXsnjeNpwEEB+JciWu1VAueLNI+Kis
+RiferCfsgWRvHkR6RQf04h+FlhnYHJnf1ktqcEi1oYAjLsbYOAwqyoU1Pev9cS28
+EA6FTJcxjuHhH9ECAwEAAaOCATswggE3MB0GA1UdDgQWBBRDMlr1UAQGVIkwzamm
+fceAZ7l4ATAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
+HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
+d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
+MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
+BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
+RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
+DQYJKoZIhvcNAQEFBQADggEBAIZAaYGzf9AYv6DqoUNx6wdpayhCeX75/IHuFQ/d
+gLzat9Vd6qNKdAByskpOjpE0KRauEzD/BhTtkEJDazPSmVP1QxAPjqGaD+JjqhS/
+Q6aY+1PSDi2zRIDA66V2yFJDcUBTtShbdTg144YSkVSY5UCKhQrsdg8yAbs7saAB
+LHzVebTXffjmkTk5GZk26d/AZQRjfssta1N/TWhWTfuZtwYvjZmgDPeCfr6AOPLr
+pVJz+ntzUKGpQ+5mwDJXMZ0qeiFIgXUlU0D+lfuajc/x9rgix9cM+o7amgDlRi1T
+55Uu2vzUQ9jLUaISFaTTMag+quBDhx8BDVu+igLp5hvBtxQ=
+-----END CERTIFICATE-----`,
+		"IFX3": `-----BEGIN CERTIFICATE-----
+MIIEnzCCA4egAwIBAgIEH7fYljANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
+RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
+aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
+QTAeFw0wNzA0MTMxNjQ0MjRaFw0yNzA0MTMxNjQ0MjRaMHcxCzAJBgNVBAYTAkRF
+MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
+cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
+aWF0ZSBDQSAwMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJWdPAuH
+z/p1tIwB1QXlPD/PjedZ4uBZdwPH5tI3Uve0TzbR/mO5clx/loWn7nZ5cHkH1nhB
+R67JEFY0a9GithPfITh0XRxPcisLBE/SoqZ90KHFaS+N6SwOpdCP0GlUg1OesKCF
+79Z6fXrkTZsVpPqdawdZK+oUsDO9z9U6xqV7bwsS75Y+QiHsm6UTgAkSNQnuFMP3
+NqQyDi/BaWaYRGQ6K8pM7Y7e1h21z/+5X7LncZXU8hgpYpu2zQPg96IkYboVUKL4
+00snaPcOvfagsBUGlBltNfz7geaSuWTCdwEiwlkCYZqCtbkAj5FiStajrzP72BfT
+2fshIv+5eF7Qp5ECAwEAAaOCATswggE3MB0GA1UdDgQWBBTGyypNtylL6RFyT1BB
+MQtMQvibsjAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
+HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
+d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
+MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
+BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
+RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
+DQYJKoZIhvcNAQEFBQADggEBAGN1bkh4J90DGcOPP2BlwE6ejJ0iDKf1zF+7CLu5
+WS5K4dvuzsWUoQ5eplUt1LrIlorLr46mLokZD0RTG8t49Rcw4AvxMgWk7oYk69q2
+0MGwXwgZ5OQypHaPwslmddLcX+RyEvjrdGpQx3E/87ZrQP8OKnmqI3pBlB8QwCGL
+SV9AERaGDpzIHoObLlUjgHuD6aFekPfeIu1xbN25oZCWmqFVIhkKxWE1Xu+qqHIA
+dnCFhoIWH3ie9OsJh/iDRaANYYGyplIibDx1FJA8fqiBiBBKUlPoJvbqmZs4meMd
+OoeOuCvQ7op28UtaoV6H6BSYmN5dOgW7r1lX2Re0nd84NGE=
+-----END CERTIFICATE-----`,
+		"IFX4": `-----BEGIN CERTIFICATE-----
+MIIEnzCCA4egAwIBAgIEDhD4wDANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
+RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
+aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
+QTAeFw0wNzEyMDMxMzA3NTVaFw0yNzEyMDMxMzA3NTVaMHcxCzAJBgNVBAYTAkRF
+MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
+cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
+aWF0ZSBDQSAwNDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN3UBmDk
+jJzzJ+WCgrq4tILtE9KJPMGHwvCsbJOlo7eHiEb8JQzGK1prkPQ3dowFRXPnqONP
+WUa36/J3R32xgvuZHqAdliZCt8IUb9qYhDenuXo1SSqJ8LWp30QIJ0vnkaQ2TCkO
+bveZZR3hK2OZKRTkFaV/iy2RH+Qs4JAe3diD8mlIu2gXAXnKJSkrzW6gbMzrlTOi
+RCuGcatpy7Hfmodbz/0Trbuwtc3dyJZ3Ko1z9bz2Oirjh93RrmYjbtL0HhkAjMOR
+83GLrzwUddSqmxtXXX8j5i+/gmE3AO71swOIESdGugxaKUzJ1jTqWKMZcx0E6BFI
+lDIfKk0fJlSxHfECAwEAAaOCATswggE3MB0GA1UdDgQWBBSIs8E/YQXRBCKfWsDr
+SZVkrNRzvTAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
+HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
+d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
+MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
+BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
+RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
+DQYJKoZIhvcNAQEFBQADggEBAFtqClQNBLOzcGZUpsBqlz3frzM45iiBpxosG1Re
+IgoAgtIBEtl609TG51tmpm294KqpfKZVO+xNzovm8k/heGb0jmYf+q1ggrk2qT4v
+Qy2jgE0jbP/P8WWq8NHC13uMcBUGPaka7yofEDDwz7TcduQyJVfG2pd1vflnzP0+
+iiJpfCk3CAQQnb+B7zsOp7jHNwpvHP+FhNwZaikaa0OdR/ML9da1sOOW3oJSTEjW
+SMLuhaZHtcVgitvtOVvCI/aq47rNJku3xQ7c/s8FHnFzQQ+Q4TExbP20SrqQIlL/
+9sFAb7/nKYNauusakiF3pfvMrJOJigNfJyIcWaGfyyQtVVI=
+-----END CERTIFICATE-----`,
+		"IFX5": `-----BEGIN CERTIFICATE-----
+MIIEnzCCA4egAwIBAgIEVuRoqzANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
+RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
+aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
+QTAeFw0wOTEyMTExMDM4NDJaFw0yOTEyMTExMDM4NDJaMHcxCzAJBgNVBAYTAkRF
+MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
+cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
+aWF0ZSBDQSAwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL79zMCO
+bjkg7gCWEuyGO49CisF/QrGoz9adW1FBuSW8U9IOlvWXNsvoasC1mhrsfkRRojuU
+mWifxxxcVfOI9v1SbRfJ+i6lG21IcVe6ywLJdDliT+3vzvrb/2hU/XjCCMDWb/Pw
+aZslV5iL4QEiKxvRIiWMYHW0MkkL7mzRBDVN/Vz3ZiL5Lpq7awiKuX9OXpS2a1wf
+qSGAlm2TxjU884q9Ky85JJugn0Q/C3dc8aaFPKLHlRs6rIvN1l0LwB1b5EWPzTPJ
+d9EhRPFJOAbJS66nSgX06Fl7eWB71ow6w/25otLQCbpy6OrF8wBVMtPMHqFb1c32
+PaaNzpCBnIU7vaMCAwEAAaOCATswggE3MB0GA1UdDgQWBBS7z3zBhCExZtq1vlOo
+cBTd00jYzDAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
+HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
+d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
+MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
+BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
+RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
+DQYJKoZIhvcNAQEFBQADggEBAHomNJtmFNtRJI2+s6ZwdzCTHXXIcR/T+N/lfPbE
+hIUG4Kg+3uQMP7zBi22m3I3Kk9SXsjLqV5mnsQUGMGlF7jw5W5Q+d6NSJz4taw9D
+2DsiUxE/i5vrjWiUaWxv2Eckd4MUexe5Qz8YSh4FPqLB8FZnAlgx2kfdzRIUjkMq
+EgFK8ZRSUjXdczvsud68YPVMIZTxK0L8POGJ6RYiDrjTelprfZ4pKKZ79XwxwAIo
+pG6emUEf+doRT0KoHoCHr9vvWCWKhojqlQ6jflPZcEsNBMbq5KHVN77vOU58OKx1
+56v3EaqrZenVFt8+n6h2NzhOmg2quQXIr0V9jEg8GAMehDs=
+-----END CERTIFICATE-----`,
+		"IFX8": `-----BEGIN CERTIFICATE-----
+MIIEnzCCA4egAwIBAgIEfGoY6jANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
+RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
+aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
+QTAeFw0xMjA3MTcwOTI0NTJaFw0zMDEwMTgyMzU5NTlaMHcxCzAJBgNVBAYTAkRF
+MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
+cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
+aWF0ZSBDQSAwODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOJaIJu6
+r/betrMgWJ/JZ5j8ytoAA9RWq0cw7+W0e5L2kDLJMM288wYT+iEbfwx6sWSLAl7q
+okXYDtTB9MFNhQ5ZWFLslFXbYigtXJxwANcSdPISTF1Czn6LLi1fu1EHddwCXFC8
+xaX0iGgQ9pZklvAy2ijK9BPHquWisisEiWZNRT9dCVylzOR3+p2YOC3ZrRmg7Bj+
+DkC7dltTTO6dPR+LNOFe01pJlpZdF4YHcu4EC10gRu0quZz1LtDZWFKezK7rg5Rj
+LSAJbKOsGXjl6hQXMtADEX9Vlz1vItD21OYCNRsu6VdipiL0bl0aAio4BV3GMyjk
+0gHnQwCk9k/YPU8CAwEAAaOCATswggE3MB0GA1UdDgQWBBRMS01kiQjkW/5aENNj
+h6aIrsHPeDAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
+HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
+d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
+MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
+BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
+RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
+DQYJKoZIhvcNAQEFBQADggEBALMiDyQ9WKH/eTI84Mk8KYk+TXXEwf+fhgeCvxOQ
+G0FTSmOpJaNIzxWXr/gDbY3dO0ODjWRKYvhimZUuV+ckMA+wZX2C6o8g5njpWIOH
+pSAa+W35ijArh0Zt3MASJ46avd+fnQGTdzT0hK46gx6n2KixLvaZsR3JtuwUFYlQ
+wzmz/UsbBNEoPiR8p5E0Zf5GEGiTqkmBVYyS6XA34axpMMRHy0wI7AGs0gVihwUM
+rr0iWOu+GAcrm11lcYzqJvuEkfenAF62ufA2Ktv+Ut2xiRC0jUIp73CeplAJsqBr
+camV3pJn3qYPI5c1njMRYnoRFWQbrOR5ADWDQLFQPYRrJmg=
+-----END CERTIFICATE-----`,
+		"IFX15": `-----BEGIN CERTIFICATE-----
+MIIEnzCCA4egAwIBAgIER3V5aDANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
+RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
+aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
+QTAeFw0xMjExMTQxNDQzMzRaFw0zMDEwMTgyMzU5NTlaMHcxCzAJBgNVBAYTAkRF
+MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
+cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
+aWF0ZSBDQSAxNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKS6pgcg
+OQWSozVbMkdf9jZkpGdT4U735zs0skfpjoKK2CgpLMO/+oGKbObm/DQPRQO/oxvq
+jJNBKz55QBgKd+MoQ6t+2J8mcQ91Nfwqnm1C4r+c4zezJ1Utk/KIYNqpFDAzefBA
+/lK8IxQ6kmzxcIFE4skaFsSgkearSZGG6sA9A51yxwvs8yUrQF51ICEUM7wDb4cM
+53utaFdm6p6m9UZGSmmrdTiemOkuuwtl8IUQXfuk9lFyQsACBTM95Hrts0IzI6hX
+QeTwSL4JqyEnKP9vbtT4eXzWNycqSYBf0+Uo/HHZo9WuVDUaA4I9zcmD0qCvSOT0
+NAj4ifJ7SPGInU0CAwEAAaOCATswggE3MB0GA1UdDgQWBBR4pAnEV95pJvbfQsYR
+TrflaptW5zAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
+HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
+d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
+MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
+BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
+RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
+DQYJKoZIhvcNAQEFBQADggEBAAnZDdJZs5QgAXnl0Jo5sCqktZcwcK+V1+uhsqrT
+Z7OJ9Ze1YJ9XB14KxRfmck7Erl5HVc6PtUcLnR0tuJKKKqm7dTe4sQEFYd5usjrW
+KSG6y7BOH7AdonocILY9OIxuNwxMAqhK8LIjkkRCeOWSvCqLnaLtrP52C0fBkTTM
+SWX7YnsutXEpwhro3Qsnm9hL9s3s/WoIuNKUcLFH/qWKztpxXnF0zip73gcZbwEy
+1GPQQpYnxFJ2R2ab2RHlO+3Uf3FDxn+eRLXNl95ZZ6GE4OIIpKEg2urIiig0HmGA
+ijO6JfJxT30H9QNsx78sjYs7pOfMw6DfiqJ8Fx82GcCUOyM=
+-----END CERTIFICATE-----`,
+	}
+
+	trustedKeys := map[string]string{
+		"ATM1": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5a+4yXtubUnGJPz7ZVjW
+spGhe5Tr9BhrWQ9QOfDoVlkmi+tg2Gqc9qA9R39WhiiEmKuQ3+4XIvO+XFFrVCv+
+8YuEnBIIu46FEX1LBG7LnUJbkgAV0pzHMWOghLhDIGcGg/6kO9fH+7KcwfwNah+Z
+Lkfbfis3cm09RlOG8RSq8LyK8Zc07QH2M7L/8PFnRRQ5MnAgW7vuk8h/M62TTy+y
+DVuWl/jnh3vrKgVMoOyL/iM3EdFHIV+r/lJOI/HRAlkieCRGiJ1kJI4tQpUXiL+t
+K2iB1yAxnqcSQzWWxlNuu6sAUV2tI+qMVM2o6eT1f/MM7+b4nmyuBrdOIO5dvTek
+7wIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM10": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1HEeCn82r8Vrg64howvt
+s/2Yj5yuXhEv7FwUaISo7rYFnAbstyMVGNsL24reRW7aiyj65iHEojx1Car3Jlu8
+hYfTqiagFmEK/qe8erEatwg5jFQ0GdK3a9Tw7nhYZjjpe98sRjL/DQlI5NiKClPF
+4ZNqI418MGmzmPN/QNxRnKJAr5LTE8FZCMShm5V9ege72oLj4VfPuz29fQLBZWJA
+2+NUy6gCpcUShejGfm9DTGBk0m3wruqyXuzKzJ4U0Xo5nTqp7ZV/JLbSWnTJxs72
+hZ4D1nbi0paPQgcK5FYbIwQ1WuEpN5QMfilsAZFbokQnQa+jX2Rzleoa0mURVEnG
+TQIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM11": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrS1Ei1VvLxVYWNv/s35
+aYmHa5MOnvQybgW/i1XuINZuPQqYNw02wrWRA5eft2ts+FkJDvbz6edtqH30Cjx+
+pmE9OvotY7O7rboruz2W2PpcQ0/inLUixNiq/A8giKRWJaTNsiF6VLNEWEe5sf3r
+e6+C/ZQUfwupM56bU0JrIMxEgp8SCFguQsNwcq2txtr1ujgX4PN6DOet6BcrTpsY
+vxKhQPbL/Tfl/kMqYVzqqyrBGgkg8+2FRxO6bVSJCwryrA37ZwkgJl3k/qibTFzw
+JVfJnGaT57L/TUVJRwADtVN+oJFcQamR7N6VIuohx7fp7U8t8nrKhZpIwK405hLE
+1wIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM12": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1R4fVBbUI7tsaRuS0VvH
+TiouZ7L/HAokHIsozeLKamistnoCNKMyz40pwGenK8l0XnvJveoAlT+3tbKmmeo7
+iR1QP28shN8ggnObHZpBN2cPiySh0A8uYIEXY3sJMrNZ/h2MMbjYD2nUyreVpuj+
+mytSbvmB1eqcj9p4JBY1aqwXBrm0DqxZXJsVNBkjJ7c9kFy3ze8yccTFKx/wXe7v
+PHgoWKA7RLtM2i/ppJdQgT/IubOrhZTyWPpvLQDpNf0p/SDmByw3/RzinPFlxUmA
+eBzvTDwM7jEsZIUQGDZIBhifK45VLLrQiDTTOL8eVw9D8H0zn8AJu7cF9w9oYQj6
+fQIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM13": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwSvUzUQRjD3KyZMJu5CZ
+sHVLqAN0mBT86nivjCV+RhHsR0uSU110NKjb2IHXM3fYaJlgvZRTAQJ3c8jPc0bV
+tC0+521QKKt86OLi0+nrNT2QzLtrJgx6eRoYiu9se2F0u/zB+PHQ0R8qVOI1xw0W
+FVK2w2+mRT3WN4Udp0Rn6LKPRXCq59JPfuD7hNBVmwp9uzj2TLp8ljMRSbChRjek
+u9H4G+b2qa4wf2g9R5/Eqq5cMwYsD4357cuhlfqWQxD61J93ro2Hf5+30JrZF2yo
+/TX5ocdQqnvLeape1KZGTDrikNXD9eIhR53yT4aBAK/RB8scsbwjn5tnoIBO0GAE
+wwIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM2": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6e/oMMyv7NPlNKo9A7ls
+wJDkE14LZGSsKiRyzyJe2qHCoBwsZEq3QV2w4ducngcOysRaczDd8Cku9Z332dbi
+9Tq6RZapk/eL7mcBF/XBNu7Wft3PDRTzs8gpM3xFHo59+OAjeax3TE8yR6Phiipp
+42uI9f184vQsgwzEWNz6kMUP5mwe3Hm9y8RlTzrpJAtVtW9w7LmoSeOHHgzsEGG9
+q5F2PkY6X0Ft9eDQaIOlTofkSHzvG2VLv8MJINMjnXrPnvF8dqG38lzAIvDfJKKx
+E5MjY2aoFc1dfISQDv4sYx02b6jwfDl8pFCrwCzH7cWmIE0hD2BV2LpurURTi+kk
+MQIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM3": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmFAUATJ/8xIeuFW0aKNZ
+cwCtDLDOQoGIez+sg64EmJ+rEKNHfPQj7ee3UxiARWoLvmrMwMZFHXVuHb6Q6QUB
+H2OmUZfhcBXm94ZbXrFQyDxosR3lU+JZu5JK0X76kZAQtiBI2/UkJMt0xRUm1P7p
+InKnqk9HYw2HpwrCYZII78R2N8bfGJAXOpz1oOpI7jVHewtJY/gun1jgXuOwNW+1
+ouDaUrB/8t9m0lvsoeqduq0Nhvl4AL6kxVFp4sSX3gFuSORcbFP4hu7UMJy6g59d
+bsgpulbltd2+HDqxEa4VPOe3IlC4iUso091vq+V49ThYOZ0TXFjk1dNdcTFuK2O8
+kQIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM4": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxtl1salu/2SXeqCGMtac
+0GMCqx6Qeh4KtrviPfGVdObksuyGRPPuaW25/oYNGLlf2x/kDlknB2eZFMiW8otK
+XV+xO50uFcxoTHXZ1wnMD8x6CgM0z0j3DQ5d0eu5sRRDd7GHYEpuvMj0x8pgkZk+
+C+Ux2hWlj8xEiEDH8q5wyP5AX92GkpoUAL0e4vUV7/cCEBcsLOs8Oq6rKzmig82k
+sDiL/Tn/8TtsSmUAwT/FzM/gi79x0D1hHtXyLOFPDIrOy3d3cz5QMOSSLDHGjmoa
+DBF0+rcBRJCCU2iBtfIMBevJO1IBUmj/EgerHWWaf5pNNJAL62eAeeaWKm5OaX6b
+VQIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM5": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqg1FjhOQ/GsqgUL+WSBc
+fYr3hkxxl1EBaCIqiolc1R5TmZabaHoCUIJmhwXfFGhFvhZrI0AcEqIYANLgY0ri
+vn4h6vV+rrwtxM1X7X8hmT+AdvxL2p9lOCp7XNpQ2Rw+o/2JhuBSUv+opW7K6wPu
+mwUpy4gL+dAozZyBjan5Co9sP5Yh3kdG3+ezRsfxf3CnS76NhjHglK9AWUdM1c6m
+FGqTP+fU9ySTpoabrnDUzIcedu5OsMZa5L1LeLKHrqrbM3b995aU9RPrIQoO3x+B
+Sau9Ab0d614zpD0TeWwjBT7Y5rIg14bIx7DiA+4kGRE5fHZtpdSWpgJmlkcObSSd
+vQIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM6": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw9s9ykpgzH1Birz8JVmH
+c/jXNSaFsDQYM9hcS3513P7arS+r/musmUqfdybY/GQ8+YqAA6IZq+xlGZ7WUEmx
+vo/Hlnm/FQj3epZGD3ruApm+8dLV4Hvs4RjZCS8cfpkRZygh+nRdrZ3aAwZRjQbh
+vl8mAJOQ2Rp9ANaZMzYjre7adkuqIFDa83nKgn4XkMIft+MthOvcMYmZtSL64gvA
+NZ7PiryB2cMhS+0yAMGK/Oqm0ELIRk8wqAR/l3txRVxoQEqA9fBk2bvGNiWva92c
+hxCLpEX9+CcZWvUeH6Up5a2EDxw8BgxE0L6sqjINWn2uN0x7jlKysg+XEyo7qUpM
+RQIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM7": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlYRfDD3bMJB7w6Fl+Kez
+oIaEkzz+2VCeF8v3ohsNnSKCgcx8uk7Seyp50bEtLB6vOzwgcM5WjFItKyYLZaHt
+P43q3iHsvISjAGNcYGcQ3NrM4ia6pc2geVraupldPTdQFOQjwd+0P/Q2/RMbWY6g
++sbjIDtItEc1vhf6bI3TinT+bGxxXdR9B6qWgLNc/H31wsBNN2nPv1K4wE8MWfAV
+7hcK2NoIc1zGEY+IiWPtXSu48zmvS2lxKWWYuiHBwCt5ns/U7M8XSjkaj7SbhD02
+yKwiMavu7SMAceSWWMBuhjgm9/zfMAPKO9weQixVCeuXspByefsekPuk5ohbWOS/
+bwIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM8": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylXag4JmzoqaTK8eCcSj
+DSOGRcrX8IK/fBawgEWKAgPy/yu+8FGXXK10XDeI1fmlAefDr7349Cn+v9/y+Mff
+XIduKCqR5ZP9M1+fBk7k5l4x2SeC9NfIMG+c0yJ6m1kEmsSN04nlKk8foo54L7DY
++Kkjfh6EPxyzxsMDqqTrMifBThF2kqo5KUBDdBjIkOUH1dbLWGjEgUpKocCu2M41
+U7jmjToatkA+d3V+PyQRF4/lJkTYiv6Jy1Zl1qpEkLvR0qKrzoHkOij7zBpQ/46B
+2BW1pARjU7AIp3NtfS5THL59mpXxpuyj6y2h0wxNVRkPZpnVA0ZWHgz9J4TcIgAN
+PwIDAQAB
+-----END PUBLIC KEY-----`,
+		"ATM9": `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxa0XBIlBj9t5bYB81Cea
+mlV3I3rTathgyUn2VL7/wng2vK5x7BB3a1wjXt5k/uwR/M5tfIDOSjug/SdDfTWk
+ZRe82Ij/oYJOytcrFzEzouIZVA7t/uKdXzRwz7dZ6LPnNVkp8GiWUDCDpTNNmnvi
+eZcjqofajDcc0EC720NT+NqmkAJd0qYMs+i4TA2om2C2Lxpkq+YdJp2pJOCCQquC
+wmLXB8OxrddjX4QW5mHzigx4fanC/GJcXuRQPXqLruHZlWmUqU7Sl6yZEluItHbB
+ri4BxD3Q7eXH0sM3rZGUCLr3lMPXjGsfpogZT4zLr075QIxtwe5OUpnslU61c34X
+BwIDAQAB
+-----END PUBLIC KEY-----`,
+	}
+
+	cert, err := x509.ParseCertificate(ekcert)
+	if err != nil {
+		return fmt.Errorf("Unable to parse EKCert: %s", err)
+	}
+
+	for vendor, certificate := range trustedCerts {
+		block, _ := pem.Decode([]byte(certificate))
+		testcert, err := x509.ParseCertificate(block.Bytes)
+		if err != nil {
+			return fmt.Errorf("Unable to parse %s: %s", vendor, err)
+		}
+		err = testcert.CheckSignature(cert.SignatureAlgorithm, cert.RawTBSCertificate, cert.Signature)
+		if err == nil {
+			return nil
+		}
+	}
+
+	for vendor, key := range trustedKeys {
+		block, _ := pem.Decode([]byte(key))
+		pubkey, err := x509.ParsePKIXPublicKey(block.Bytes)
+		if err != nil {
+			return fmt.Errorf("Unable to parse %s: %s", vendor, err)
+		}
+		hashdata := sha1.Sum(cert.RawTBSCertificate[:])
+		err = rsa.VerifyPKCS1v15(pubkey.(*rsa.PublicKey), crypto.SHA1, hashdata[:], cert.Signature)
+		if err == nil {
+			return nil
+		}
+	}
+
+	return fmt.Errorf("No matching certificate found")
+}
+
+// QuoteVerify verifies that a quote was genuinely provided by the TPM. It
+// takes the quote data, quote validation blob, public half of the AIK,
+// current PCR values and the nonce used in the original quote request. It
+// then verifies that the validation block is a valid signature for the
+// quote data, that the secrets are the same (in order to avoid replay
+// attacks), and that the PCR values are the same. It returns an error if
+// any stage of the validation fails.
+func QuoteVerify(data []byte, validation []byte, aikpub []byte, pcrvalues [][]byte, secret []byte) error {
+	n := big.NewInt(0)
+	n.SetBytes(aikpub)
+	e := 65537
+
+	pKey := rsa.PublicKey{N: n, E: int(e)}
+
+	dataHash := sha1.Sum(data[:])
+
+	err := rsa.VerifyPKCS1v15(&pKey, crypto.SHA1, dataHash[:], validation)
+	if err != nil {
+		return err
+	}
+
+	pcrHash := data[8:28]
+	nonceHash := data[28:48]
+
+	secretHash := sha1.Sum(secret[:])
+
+	if bytes.Equal(secretHash[:], nonceHash) == false {
+		return fmt.Errorf("Secret doesn't match")
+	}
+
+	pcrComposite := []byte{0x00, 0x02, 0xff, 0xff, 0x00, 0x00, 0x01, 0x40}
+	for i := 0; i < 16; i++ {
+		pcrComposite = append(pcrComposite, pcrvalues[i]...)
+	}
+	pcrCompositeHash := sha1.Sum(pcrComposite[:])
+
+	if bytes.Equal(pcrCompositeHash[:], pcrHash) == false {
+		return fmt.Errorf("PCR values don't match")
+	}
+
+	return nil
+}
+
+// KeyVerify verifies that a key certification request was genuinely
+// provided by the TPM. It takes the certification data, certification
+// validation blob, the public half of the AIK, the public half of the key
+// to be certified and the nonce used in the original quote request. It then
+// verifies that the validation block is a valid signature for the
+// certification data, that the certification data matches the certified key
+// and that the secrets are the same (in order to avoid replay attacks). It
+// returns an error if any stage of the validation fails.
+func KeyVerify(data []byte, validation []byte, aikpub []byte, keypub []byte, secret []byte) error {
+	n := big.NewInt(0)
+	n.SetBytes(aikpub)
+	e := 65537
+
+	pKey := rsa.PublicKey{N: n, E: int(e)}
+
+	dataHash := sha1.Sum(data[:])
+
+	err := rsa.VerifyPKCS1v15(&pKey, crypto.SHA1, dataHash[:], validation)
+	if err != nil {
+		return err
+	}
+
+	keyHash := data[43:63]
+	nonceHash := data[63:83]
+
+	secretHash := sha1.Sum(secret[:])
+
+	if bytes.Equal(secretHash[:], nonceHash) == false {
+		return fmt.Errorf("Secret doesn't match")
+	}
+
+	certHash := sha1.Sum(keypub[:])
+
+	if bytes.Equal(certHash[:], keyHash) == false {
+		return fmt.Errorf("Key doesn't match")
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/coreos/ioprogress/LICENSE b/vendor/github.com/coreos/ioprogress/LICENSE
new file mode 100644
index 0000000000..2298515904
--- /dev/null
+++ b/vendor/github.com/coreos/ioprogress/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Mitchell Hashimoto
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/github.com/coreos/ioprogress/draw.go b/vendor/github.com/coreos/ioprogress/draw.go
new file mode 100644
index 0000000000..b659be5b67
--- /dev/null
+++ b/vendor/github.com/coreos/ioprogress/draw.go
@@ -0,0 +1,132 @@
+package ioprogress
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"strings"
+
+	"golang.org/x/crypto/ssh/terminal"
+)
+
+// DrawFunc is the callback type for drawing progress.
+type DrawFunc func(int64, int64) error
+
+// DrawTextFormatFunc is a callback used by DrawFuncs that draw text in
+// order to format the text into some more human friendly format.
+type DrawTextFormatFunc func(int64, int64) string
+
+var defaultDrawFunc DrawFunc
+
+func init() {
+	defaultDrawFunc = DrawTerminal(os.Stdout)
+}
+
+// isTerminal returns True when w is going to a tty, and false otherwise.
+func isTerminal(w io.Writer) bool {
+	if f, ok := w.(*os.File); ok {
+		return terminal.IsTerminal(int(f.Fd()))
+	}
+	return false
+}
+
+// DrawTerminal returns a DrawFunc that draws a progress bar to an io.Writer
+// that is assumed to be a terminal (and therefore respects carriage returns).
+func DrawTerminal(w io.Writer) DrawFunc {
+	return DrawTerminalf(w, func(progress, total int64) string {
+		return fmt.Sprintf("%d/%d", progress, total)
+	})
+}
+
+// DrawTerminalf returns a DrawFunc that draws a progress bar to an io.Writer
+// that is formatted with the given formatting function.
+func DrawTerminalf(w io.Writer, f DrawTextFormatFunc) DrawFunc {
+	var maxLength int
+
+	return func(progress, total int64) error {
+		if progress == -1 && total == -1 {
+			_, err := fmt.Fprintf(w, "\n")
+			return err
+		}
+
+		// Make sure we pad it to the max length we've ever drawn so that
+		// we don't have trailing characters.
+		line := f(progress, total)
+		if len(line) < maxLength {
+			line = fmt.Sprintf(
+				"%s%s",
+				line,
+				strings.Repeat(" ", maxLength-len(line)))
+		}
+		maxLength = len(line)
+
+		terminate := "\r"
+		if !isTerminal(w) {
+			terminate = "\n"
+		}
+		_, err := fmt.Fprint(w, line+terminate)
+		return err
+	}
+}
+
+var byteUnits = []string{"B", "KB", "MB", "GB", "TB", "PB"}
+
+// DrawTextFormatBytes is a DrawTextFormatFunc that formats the progress
+// and total into human-friendly byte formats.
+func DrawTextFormatBytes(progress, total int64) string {
+	return fmt.Sprintf("%s/%s", ByteUnitStr(progress), ByteUnitStr(total))
+}
+
+// DrawTextFormatBar returns a DrawTextFormatFunc that draws a progress
+// bar with the given width (in characters). This can be used in conjunction
+// with another DrawTextFormatFunc to create a progress bar with bytes, for
+// example:
+//
+//     bar := DrawTextFormatBar(20)
+//     func(progress, total int64) string {
+//         return fmt.Sprintf(
+//           "%s %s",
+//           bar(progress, total),
+//           DrawTextFormatBytes(progress, total))
+//     }
+//
+func DrawTextFormatBar(width int64) DrawTextFormatFunc {
+	return DrawTextFormatBarForW(width, nil)
+}
+
+// DrawTextFormatBarForW returns a DrawTextFormatFunc as described in the docs
+// for DrawTextFormatBar, however if the io.Writer passed in is not a tty then
+// the returned function will always return "".
+func DrawTextFormatBarForW(width int64, w io.Writer) DrawTextFormatFunc {
+	if w != nil && !isTerminal(w) {
+		return func(progress, total int64) string {
+			return ""
+		}
+	}
+
+	width -= 2
+
+	return func(progress, total int64) string {
+		current := int64((float64(progress) / float64(total)) * float64(width))
+		return fmt.Sprintf(
+			"[%s%s]",
+			strings.Repeat("=", int(current)),
+			strings.Repeat(" ", int(width-current)))
+	}
+}
+
+// ByteUnitStr pretty prints a number of bytes.
+func ByteUnitStr(n int64) string {
+	var unit string
+	size := float64(n)
+	for i := 1; i < len(byteUnits); i++ {
+		if size < 1000 {
+			unit = byteUnits[i-1]
+			break
+		}
+
+		size = size / 1000
+	}
+
+	return fmt.Sprintf("%.3g %s", size, unit)
+}
diff --git a/vendor/github.com/coreos/ioprogress/reader.go b/vendor/github.com/coreos/ioprogress/reader.go
new file mode 100644
index 0000000000..7d52731e2d
--- /dev/null
+++ b/vendor/github.com/coreos/ioprogress/reader.go
@@ -0,0 +1,107 @@
+package ioprogress
+
+import (
+	"io"
+	"time"
+)
+
+// Reader is an implementation of io.Reader that draws the progress of
+// reading some data.
+type Reader struct {
+	// Reader is the underlying reader to read from
+	Reader io.Reader
+
+	// Size is the total size of the data coming out of the reader.
+	Size int64
+
+	// DrawFunc is the callback to invoke to draw the progress bar. By
+	// default, this will be DrawTerminal(os.Stdout).
+	//
+	// DrawInterval is the minimum time to wait between reads to update the
+	// progress bar.
+	DrawFunc     DrawFunc
+	DrawInterval time.Duration
+
+	progress int64
+	lastDraw time.Time
+}
+
+// Read reads from the underlying reader and invokes the DrawFunc if
+// appropriate. The DrawFunc is executed when there is data that is
+// read (progress is made) and at least DrawInterval time has passed.
+func (r *Reader) Read(p []byte) (int, error) {
+	// If we haven't drawn before, initialize the progress bar
+	if r.lastDraw.IsZero() {
+		r.initProgress()
+	}
+
+	// Read from the underlying source
+	n, err := r.Reader.Read(p)
+
+	// Always increment the progress even if there was an error
+	r.progress += int64(n)
+
+	// If we don't have any errors, then draw the progress. If we are
+	// at the end of the data, then finish the progress.
+	if err == nil {
+		// Only draw if we read data or we've never read data before (to
+		// initialize the progress bar).
+		if n > 0 {
+			r.drawProgress()
+		}
+	}
+	if err == io.EOF {
+		r.finishProgress()
+	}
+
+	return n, err
+}
+
+func (r *Reader) drawProgress() {
+	// If we've drawn before, then make sure that the draw interval
+	// has passed before we draw again.
+	interval := r.DrawInterval
+	if interval == 0 {
+		interval = time.Second
+	}
+	if !r.lastDraw.IsZero() {
+		nextDraw := r.lastDraw.Add(interval)
+		if time.Now().Before(nextDraw) {
+			return
+		}
+	}
+
+	// Draw
+	f := r.drawFunc()
+	f(r.progress, r.Size)
+
+	// Record this draw so that we don't draw again really quickly
+	r.lastDraw = time.Now()
+}
+
+func (r *Reader) finishProgress() {
+	f := r.drawFunc()
+	f(r.progress, r.Size)
+
+	// Print a newline
+	f(-1, -1)
+
+	// Reset lastDraw so we don't finish again
+	var zeroDraw time.Time
+	r.lastDraw = zeroDraw
+}
+
+func (r *Reader) initProgress() {
+	var zeroDraw time.Time
+	r.lastDraw = zeroDraw
+	r.drawProgress()
+	r.lastDraw = zeroDraw
+}
+
+func (r *Reader) drawFunc() DrawFunc {
+	if r.DrawFunc == nil {
+		return defaultDrawFunc
+	}
+
+	return r.DrawFunc
+}
diff --git a/vendor/github.com/coreos/pkg/LICENSE b/vendor/github.com/coreos/pkg/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/vendor/github.com/coreos/pkg/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/coreos/pkg/NOTICE b/vendor/github.com/coreos/pkg/NOTICE
new file mode 100644
index 0000000000..b39ddfa5cb
--- /dev/null
+++ b/vendor/github.com/coreos/pkg/NOTICE
@@ -0,0 +1,5 @@
+CoreOS Project
+Copyright 2014 CoreOS, Inc
+
+This product includes software developed at CoreOS, Inc.
+(http://www.coreos.com/).
diff --git a/vendor/github.com/coreos/pkg/dlopen/dlopen.go b/vendor/github.com/coreos/pkg/dlopen/dlopen.go
new file mode 100644
index 0000000000..23774f612e
--- /dev/null
+++ b/vendor/github.com/coreos/pkg/dlopen/dlopen.go
@@ -0,0 +1,82 @@
+// Copyright 2016 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package dlopen provides some convenience functions to dlopen a library and
+// get its symbols.
+package dlopen
+
+// #cgo LDFLAGS: -ldl
+// #include <stdlib.h>
+// #include <dlfcn.h>
+import "C"
+import (
+	"errors"
+	"fmt"
+	"unsafe"
+)
+
+var ErrSoNotFound = errors.New("unable to open a handle to the library")
+
+// LibHandle represents an open handle to a library (.so)
+type LibHandle struct {
+	Handle  unsafe.Pointer
+	Libname string
+}
+
+// GetHandle tries to get a handle to a library (.so), attempting to access it
+// by the names specified in libs and returning the first that is successfully
+// opened. Callers are responsible for closing the handler. If no library can
+// be successfully opened, an error is returned.
+func GetHandle(libs []string) (*LibHandle, error) {
+	for _, name := range libs {
+		libname := C.CString(name)
+		defer C.free(unsafe.Pointer(libname))
+		handle := C.dlopen(libname, C.RTLD_LAZY)
+		if handle != nil {
+			h := &LibHandle{
+				Handle:  handle,
+				Libname: name,
+			}
+			return h, nil
+		}
+	}
+	return nil, ErrSoNotFound
+}
+
+// GetSymbolPointer takes a symbol name and returns a pointer to the symbol.
+func (l *LibHandle) GetSymbolPointer(symbol string) (unsafe.Pointer, error) {
+	sym := C.CString(symbol)
+	defer C.free(unsafe.Pointer(sym))
+
+	C.dlerror()
+	p := C.dlsym(l.Handle, sym)
+	e := C.dlerror()
+	if e != nil {
+		return nil, fmt.Errorf("error resolving symbol %q: %v", symbol, errors.New(C.GoString(e)))
+	}
+
+	return p, nil
+}
+
+// Close closes a LibHandle.
+func (l *LibHandle) Close() error {
+	C.dlerror()
+	C.dlclose(l.Handle)
+	e := C.dlerror()
+	if e != nil {
+		return fmt.Errorf("error closing %v: %v", l.Libname, errors.New(C.GoString(e)))
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/coreos/pkg/dlopen/dlopen_example.go b/vendor/github.com/coreos/pkg/dlopen/dlopen_example.go
new file mode 100644
index 0000000000..48a660104f
--- /dev/null
+++ b/vendor/github.com/coreos/pkg/dlopen/dlopen_example.go
@@ -0,0 +1,56 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// +build linux
+
+package dlopen
+
+// #include <string.h>
+// #include <stdlib.h>
+//
+// int
+// my_strlen(void *f, const char *s)
+// {
+//   size_t (*strlen)(const char *);
+//
+//   strlen = (size_t (*)(const char *))f;
+//   return strlen(s);
+// }
+import "C"
+
+import (
+	"fmt"
+	"unsafe"
+)
+
+func strlen(libs []string, s string) (int, error) {
+	h, err := GetHandle(libs)
+	if err != nil {
+		return -1, fmt.Errorf(`couldn't get a handle to the library: %v`, err)
+	}
+	defer h.Close()
+
+	f := "strlen"
+	cs := C.CString(s)
+	defer C.free(unsafe.Pointer(cs))
+
+	strlen, err := h.GetSymbolPointer(f)
+	if err != nil {
+		return -1, fmt.Errorf(`couldn't get symbol %q: %v`, f, err)
+	}
+
+	len := C.my_strlen(strlen, cs)
+
+	return int(len), nil
+}
diff --git a/vendor/github.com/coreos/pkg/progressutil/iocopy.go b/vendor/github.com/coreos/pkg/progressutil/iocopy.go
new file mode 100644
index 0000000000..04cd0dfa30
--- /dev/null
+++ b/vendor/github.com/coreos/pkg/progressutil/iocopy.go
@@ -0,0 +1,189 @@
+// Copyright 2016 CoreOS Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package progressutil
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"sync"
+	"time"
+)
+
+var (
+	ErrAlreadyStarted = errors.New("cannot add copies after PrintAndWait has been called")
+)
+
+type copyReader struct {
+	reader  io.Reader
+	current int64
+	total   int64
+	pb      *ProgressBar
+}
+
+func (cr *copyReader) Read(p []byte) (int, error) {
+	n, err := cr.reader.Read(p)
+	cr.current += int64(n)
+	err1 := cr.updateProgressBar()
+	if err == nil {
+		err = err1
+	}
+	return n, err
+}
+
+func (cr *copyReader) updateProgressBar() error {
+	cr.pb.SetPrintAfter(cr.formattedProgress())
+
+	progress := float64(cr.current) / float64(cr.total)
+	if progress > 1 {
+		progress = 1
+	}
+	return cr.pb.SetCurrentProgress(progress)
+}
+
+// NewCopyProgressPrinter returns a new CopyProgressPrinter
+func NewCopyProgressPrinter() *CopyProgressPrinter {
+	return &CopyProgressPrinter{results: make(chan error), cancel: make(chan struct{})}
+}
+
+// CopyProgressPrinter will perform an arbitrary number of io.Copy calls, while
+// continually printing the progress of each copy.
+type CopyProgressPrinter struct {
+	results chan error
+	cancel  chan struct{}
+
+	// `lock` mutex protects all fields below it in CopyProgressPrinter struct
+	lock    sync.Mutex
+	readers []*copyReader
+	started bool
+	pbp     *ProgressBarPrinter
+}
+
+// AddCopy adds a copy for this CopyProgressPrinter to perform. An io.Copy call
+// will be made to copy bytes from reader to dest, and name and size will be
+// used to label the progress bar and display how much progress has been made.
+// If size is 0, the total size of the reader is assumed to be unknown.
+// AddCopy can only be called before PrintAndWait; otherwise, ErrAlreadyStarted
+// will be returned.
+func (cpp *CopyProgressPrinter) AddCopy(reader io.Reader, name string, size int64, dest io.Writer) error {
+	cpp.lock.Lock()
+	defer cpp.lock.Unlock()
+
+	if cpp.started {
+		return ErrAlreadyStarted
+	}
+	if cpp.pbp == nil {
+		cpp.pbp = &ProgressBarPrinter{}
+		cpp.pbp.PadToBeEven = true
+	}
+
+	cr := &copyReader{
+		reader:  reader,
+		current: 0,
+		total:   size,
+		pb:      cpp.pbp.AddProgressBar(),
+	}
+	cr.pb.SetPrintBefore(name)
+	cr.pb.SetPrintAfter(cr.formattedProgress())
+
+	cpp.readers = append(cpp.readers, cr)
+
+	go func() {
+		_, err := io.Copy(dest, cr)
+		select {
+		case <-cpp.cancel:
+			return
+		case cpp.results <- err:
+			return
+		}
+	}()
+	return nil
+}
+
+// PrintAndWait will print the progress for each copy operation added with
+// AddCopy to printTo every printInterval. This will continue until every added
+// copy is finished, or until cancel is written to.
+// PrintAndWait may only be called once; any subsequent calls will immediately
+// return ErrAlreadyStarted.  After PrintAndWait has been called, no more
+// copies may be added to the CopyProgressPrinter.
+func (cpp *CopyProgressPrinter) PrintAndWait(printTo io.Writer, printInterval time.Duration, cancel chan struct{}) error {
+	cpp.lock.Lock()
+	if cpp.started {
+		cpp.lock.Unlock()
+		return ErrAlreadyStarted
+	}
+	cpp.started = true
+	cpp.lock.Unlock()
+
+	n := len(cpp.readers)
+	if n == 0 {
+		// Nothing to do.
+		return nil
+	}
+
+	defer close(cpp.cancel)
+	t := time.NewTicker(printInterval)
+	allDone := false
+	for i := 0; i < n; {
+		select {
+		case <-cancel:
+			return nil
+		case <-t.C:
+			_, err := cpp.pbp.Print(printTo)
+			if err != nil {
+				return err
+			}
+		case err := <-cpp.results:
+			i++
+			// Once completion is signaled, further on this just drains
+			// (unlikely) errors from the channel.
+			if err == nil && !allDone {
+				allDone, err = cpp.pbp.Print(printTo)
+			}
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (cr *copyReader) formattedProgress() string {
+	var totalStr string
+	if cr.total == 0 {
+		totalStr = "?"
+	} else {
+		totalStr = ByteUnitStr(cr.total)
+	}
+	return fmt.Sprintf("%s / %s", ByteUnitStr(cr.current), totalStr)
+}
+
+var byteUnits = []string{"B", "KB", "MB", "GB", "TB", "PB"}
+
+// ByteUnitStr pretty prints a number of bytes.
+func ByteUnitStr(n int64) string {
+	var unit string
+	size := float64(n)
+	for i := 1; i < len(byteUnits); i++ {
+		if size < 1000 {
+			unit = byteUnits[i-1]
+			break
+		}
+
+		size = size / 1000
+	}
+
+	return fmt.Sprintf("%.3g %s", size, unit)
+}
diff --git a/vendor/github.com/coreos/pkg/progressutil/progressbar.go b/vendor/github.com/coreos/pkg/progressutil/progressbar.go
new file mode 100644
index 0000000000..224c124acd
--- /dev/null
+++ b/vendor/github.com/coreos/pkg/progressutil/progressbar.go
@@ -0,0 +1,256 @@
+// Copyright 2016 CoreOS Inc
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package progressutil
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"strings"
+	"sync"
+
+	"golang.org/x/crypto/ssh/terminal"
+)
+
+var (
+	// ErrorProgressOutOfBounds is returned if the progress is set to a value
+	// not between 0 and 1.
+	ErrorProgressOutOfBounds = fmt.Errorf("progress is out of bounds (0 to 1)")
+
+	// ErrorNoBarsAdded is returned when no progress bars have been added to a
+	// ProgressBarPrinter before PrintAndWait is called.
+	ErrorNoBarsAdded = fmt.Errorf("AddProgressBar hasn't been called yet")
+)
+
+// ProgressBar represents one progress bar in a ProgressBarPrinter. Should not
+// be created directly, use the AddProgressBar on a ProgressBarPrinter to
+// create these.
+type ProgressBar struct {
+	lock sync.Mutex
+
+	currentProgress float64
+	printBefore     string
+	printAfter      string
+	done            bool
+}
+
+func (pb *ProgressBar) clone() *ProgressBar {
+	pb.lock.Lock()
+	pbClone := &ProgressBar{
+		currentProgress: pb.currentProgress,
+		printBefore:     pb.printBefore,
+		printAfter:      pb.printAfter,
+		done:            pb.done,
+	}
+	pb.lock.Unlock()
+	return pbClone
+}
+
+func (pb *ProgressBar) GetCurrentProgress() float64 {
+	pb.lock.Lock()
+	val := pb.currentProgress
+	pb.lock.Unlock()
+	return val
+}
+
+// SetCurrentProgress sets the progress of this ProgressBar. The progress must
+// be between 0 and 1 inclusive.
+func (pb *ProgressBar) SetCurrentProgress(progress float64) error {
+	if progress < 0 || progress > 1 {
+		return ErrorProgressOutOfBounds
+	}
+	pb.lock.Lock()
+	pb.currentProgress = progress
+	pb.lock.Unlock()
+	return nil
+}
+
+// GetDone returns whether or not this progress bar is done
+func (pb *ProgressBar) GetDone() bool {
+	pb.lock.Lock()
+	val := pb.done
+	pb.lock.Unlock()
+	return val
+}
+
+// SetDone sets whether or not this progress bar is done
+func (pb *ProgressBar) SetDone(val bool) {
+	pb.lock.Lock()
+	pb.done = val
+	pb.lock.Unlock()
+}
+
+// GetPrintBefore gets the text printed on the line before the progress bar.
+func (pb *ProgressBar) GetPrintBefore() string {
+	pb.lock.Lock()
+	val := pb.printBefore
+	pb.lock.Unlock()
+	return val
+}
+
+// SetPrintBefore sets the text printed on the line before the progress bar.
+func (pb *ProgressBar) SetPrintBefore(before string) {
+	pb.lock.Lock()
+	pb.printBefore = before
+	pb.lock.Unlock()
+}
+
+// GetPrintAfter gets the text printed on the line after the progress bar.
+func (pb *ProgressBar) GetPrintAfter() string {
+	pb.lock.Lock()
+	val := pb.printAfter
+	pb.lock.Unlock()
+	return val
+}
+
+// SetPrintAfter sets the text printed on the line after the progress bar.
+func (pb *ProgressBar) SetPrintAfter(after string) {
+	pb.lock.Lock()
+	pb.printAfter = after
+	pb.lock.Unlock()
+}
+
+// ProgressBarPrinter will print out the progress of some number of
+// ProgressBars.
+type ProgressBarPrinter struct {
+	lock sync.Mutex
+
+	// DisplayWidth can be set to influence how large the progress bars are.
+	// The bars will be scaled to attempt to produce lines of this number of
+	// characters, but lines of different lengths may still be printed. When
+	// this value is 0 (aka unset), 80 character columns are assumed.
+	DisplayWidth int
+	// PadToBeEven, when set to true, will make Print pad the printBefore text
+	// with trailing spaces and the printAfter text with leading spaces to make
+	// the progress bars the same length.
+	PadToBeEven         bool
+	numLinesInLastPrint int
+	progressBars        []*ProgressBar
+	maxBefore           int
+	maxAfter            int
+}
+
+// AddProgressBar will create a new ProgressBar, register it with this
+// ProgressBarPrinter, and return it. This must be called at least once before
+// PrintAndWait is called.
+func (pbp *ProgressBarPrinter) AddProgressBar() *ProgressBar {
+	pb := &ProgressBar{}
+	pbp.lock.Lock()
+	pbp.progressBars = append(pbp.progressBars, pb)
+	pbp.lock.Unlock()
+	return pb
+}
+
+// Print will print out progress information for each ProgressBar that has been
+// added to this ProgressBarPrinter. The progress will be written to printTo,
+// and if printTo is a terminal it will draw progress bars.  AddProgressBar
+// must be called at least once before Print is called. If printing to a
+// terminal, all draws after the first one will move the cursor up to draw over
+// the previously printed bars.
+func (pbp *ProgressBarPrinter) Print(printTo io.Writer) (bool, error) {
+	pbp.lock.Lock()
+	var bars []*ProgressBar
+	for _, bar := range pbp.progressBars {
+		bars = append(bars, bar.clone())
+	}
+	numColumns := pbp.DisplayWidth
+	pbp.lock.Unlock()
+
+	if len(bars) == 0 {
+		return false, ErrorNoBarsAdded
+	}
+
+	if numColumns == 0 {
+		numColumns = 80
+	}
+
+	if isTerminal(printTo) {
+		moveCursorUp(printTo, pbp.numLinesInLastPrint)
+	}
+
+	for _, bar := range bars {
+		beforeSize := len(bar.GetPrintBefore())
+		afterSize := len(bar.GetPrintAfter())
+		if beforeSize > pbp.maxBefore {
+			pbp.maxBefore = beforeSize
+		}
+		if afterSize > pbp.maxAfter {
+			pbp.maxAfter = afterSize
+		}
+	}
+
+	allDone := true
+	for _, bar := range bars {
+		if isTerminal(printTo) {
+			bar.printToTerminal(printTo, numColumns, pbp.PadToBeEven, pbp.maxBefore, pbp.maxAfter)
+		} else {
+			bar.printToNonTerminal(printTo)
+		}
+		allDone = allDone && bar.GetCurrentProgress() == 1
+	}
+
+	pbp.numLinesInLastPrint = len(bars)
+
+	return allDone, nil
+}
+
+// moveCursorUp moves the cursor up numLines in the terminal
+func moveCursorUp(printTo io.Writer, numLines int) {
+	if numLines > 0 {
+		fmt.Fprintf(printTo, "\033[%dA", numLines)
+	}
+}
+
+func (pb *ProgressBar) printToTerminal(printTo io.Writer, numColumns int, padding bool, maxBefore, maxAfter int) {
+	before := pb.GetPrintBefore()
+	after := pb.GetPrintAfter()
+
+	if padding {
+		before = before + strings.Repeat(" ", maxBefore-len(before))
+		after = strings.Repeat(" ", maxAfter-len(after)) + after
+	}
+
+	progressBarSize := numColumns - (len(fmt.Sprintf("%s [] %s", before, after)))
+	progressBar := ""
+	if progressBarSize > 0 {
+		currentProgress := int(pb.GetCurrentProgress() * float64(progressBarSize))
+		progressBar = fmt.Sprintf("[%s%s] ",
+			strings.Repeat("=", currentProgress),
+			strings.Repeat(" ", progressBarSize-currentProgress))
+	} else {
+		// If we can't fit the progress bar, better to not pad the before/after.
+		before = pb.GetPrintBefore()
+		after = pb.GetPrintAfter()
+	}
+
+	fmt.Fprintf(printTo, "%s %s%s\n", before, progressBar, after)
+}
+
+func (pb *ProgressBar) printToNonTerminal(printTo io.Writer) {
+	if !pb.GetDone() {
+		fmt.Fprintf(printTo, "%s %s\n", pb.printBefore, pb.printAfter)
+		if pb.GetCurrentProgress() == 1 {
+			pb.SetDone(true)
+		}
+	}
+}
+
+// isTerminal returns True when w is going to a tty, and false otherwise.
+func isTerminal(w io.Writer) bool {
+	if f, ok := w.(*os.File); ok {
+		return terminal.IsTerminal(int(f.Fd()))
+	}
+	return false
+}
diff --git a/vendor/github.com/cpuguy83/go-md2man/LICENSE.md b/vendor/github.com/cpuguy83/go-md2man/LICENSE.md
new file mode 100644
index 0000000000..1cade6cef6
--- /dev/null
+++ b/vendor/github.com/cpuguy83/go-md2man/LICENSE.md
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Brian Goff
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/github.com/cpuguy83/go-md2man/md2man.go b/vendor/github.com/cpuguy83/go-md2man/md2man.go
new file mode 100644
index 0000000000..1dc70f47a7
--- /dev/null
+++ b/vendor/github.com/cpuguy83/go-md2man/md2man.go
@@ -0,0 +1,44 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+
+	"github.com/cpuguy83/go-md2man/md2man"
+)
+
+var inFilePath = flag.String("in", "", "Path to file to be processed")
+var outFilePath = flag.String("out", "", "Path to output processed file")
+
+func main() {
+	flag.Parse()
+
+	inFile, err := os.Open(*inFilePath)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	defer inFile.Close()
+
+	doc, err := ioutil.ReadAll(inFile)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	out := md2man.Render(doc)
+
+	outFile, err := os.Create(*outFilePath)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	defer outFile.Close()
+	_, err = outFile.Write(out)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
diff --git a/vendor/github.com/cpuguy83/go-md2man/md2man/md2man.go b/vendor/github.com/cpuguy83/go-md2man/md2man/md2man.go
new file mode 100644
index 0000000000..8f44fa1550
--- /dev/null
+++ b/vendor/github.com/cpuguy83/go-md2man/md2man/md2man.go
@@ -0,0 +1,19 @@
+package md2man
+
+import (
+	"github.com/russross/blackfriday"
+)
+
+func Render(doc []byte) []byte {
+	renderer := RoffRenderer(0)
+	extensions := 0
+	extensions |= blackfriday.EXTENSION_NO_INTRA_EMPHASIS
+	extensions |= blackfriday.EXTENSION_TABLES
+	extensions |= blackfriday.EXTENSION_FENCED_CODE
+	extensions |= blackfriday.EXTENSION_AUTOLINK
+	extensions |= blackfriday.EXTENSION_SPACE_HEADERS
+	extensions |= blackfriday.EXTENSION_FOOTNOTES
+	extensions |= blackfriday.EXTENSION_TITLEBLOCK
+
+	return blackfriday.Markdown(doc, renderer, extensions)
+}
diff --git a/vendor/github.com/cpuguy83/go-md2man/md2man/roff.go b/vendor/github.com/cpuguy83/go-md2man/md2man/roff.go
new file mode 100644
index 0000000000..4478786b7b
--- /dev/null
+++ b/vendor/github.com/cpuguy83/go-md2man/md2man/roff.go
@@ -0,0 +1,269 @@
+package md2man
+
+import (
+	"bytes"
+	"fmt"
+	"html"
+	"strings"
+
+	"github.com/russross/blackfriday"
+)
+
+type roffRenderer struct{}
+
+func RoffRenderer(flags int) blackfriday.Renderer {
+	return &roffRenderer{}
+}
+
+func (r *roffRenderer) GetFlags() int {
+	return 0
+}
+
+func (r *roffRenderer) TitleBlock(out *bytes.Buffer, text []byte) {
+	out.WriteString(".TH ")
+
+	splitText := bytes.Split(text, []byte("\n"))
+	for i, line := range splitText {
+		line = bytes.TrimPrefix(line, []byte("% "))
+		if i == 0 {
+			line = bytes.Replace(line, []byte("("), []byte("\" \""), 1)
+			line = bytes.Replace(line, []byte(")"), []byte("\" \""), 1)
+		}
+		line = append([]byte("\""), line...)
+		line = append(line, []byte("\" ")...)
+		out.Write(line)
+	}
+
+	out.WriteString(" \"\"\n")
+}
+
+func (r *roffRenderer) BlockCode(out *bytes.Buffer, text []byte, lang string) {
+	out.WriteString("\n.PP\n.RS\n\n.nf\n")
+	escapeSpecialChars(out, text)
+	out.WriteString("\n.fi\n.RE\n")
+}
+
+func (r *roffRenderer) BlockQuote(out *bytes.Buffer, text []byte) {
+	out.WriteString("\n.PP\n.RS\n")
+	out.Write(text)
+	out.WriteString("\n.RE\n")
+}
+
+func (r *roffRenderer) BlockHtml(out *bytes.Buffer, text []byte) {
+	out.Write(text)
+}
+
+func (r *roffRenderer) Header(out *bytes.Buffer, text func() bool, level int, id string) {
+	marker := out.Len()
+
+	switch {
+	case marker == 0:
+		// This is the doc header
+		out.WriteString(".TH ")
+	case level == 1:
+		out.WriteString("\n\n.SH ")
+	case level == 2:
+		out.WriteString("\n.SH ")
+	default:
+		out.WriteString("\n.SS ")
+	}
+
+	if !text() {
+		out.Truncate(marker)
+		return
+	}
+}
+
+func (r *roffRenderer) HRule(out *bytes.Buffer) {
+	out.WriteString("\n.ti 0\n\\l'\\n(.lu'\n")
+}
+
+func (r *roffRenderer) List(out *bytes.Buffer, text func() bool, flags int) {
+	marker := out.Len()
+	out.WriteString(".IP ")
+	if flags&blackfriday.LIST_TYPE_ORDERED != 0 {
+		out.WriteString("\\(bu 2")
+	} else {
+		out.WriteString("\\n+[step" + string(flags) + "]")
+	}
+	out.WriteString("\n")
+	if !text() {
+		out.Truncate(marker)
+		return
+	}
+
+}
+
+func (r *roffRenderer) ListItem(out *bytes.Buffer, text []byte, flags int) {
+	out.WriteString("\n\\item ")
+	out.Write(text)
+}
+
+func (r *roffRenderer) Paragraph(out *bytes.Buffer, text func() bool) {
+	marker := out.Len()
+	out.WriteString("\n.PP\n")
+	if !text() {
+		out.Truncate(marker)
+		return
+	}
+	if marker != 0 {
+		out.WriteString("\n")
+	}
+}
+
+// TODO: This might now work
+func (r *roffRenderer) Table(out *bytes.Buffer, header []byte, body []byte, columnData []int) {
+	out.WriteString(".TS\nallbox;\n")
+
+	out.Write(header)
+	out.Write(body)
+	out.WriteString("\n.TE\n")
+}
+
+func (r *roffRenderer) TableRow(out *bytes.Buffer, text []byte) {
+	if out.Len() > 0 {
+		out.WriteString("\n")
+	}
+	out.Write(text)
+	out.WriteString("\n")
+}
+
+func (r *roffRenderer) TableHeaderCell(out *bytes.Buffer, text []byte, align int) {
+	if out.Len() > 0 {
+		out.WriteString(" ")
+	}
+	out.Write(text)
+	out.WriteString(" ")
+}
+
+// TODO: This is probably broken
+func (r *roffRenderer) TableCell(out *bytes.Buffer, text []byte, align int) {
+	if out.Len() > 0 {
+		out.WriteString("\t")
+	}
+	out.Write(text)
+	out.WriteString("\t")
+}
+
+func (r *roffRenderer) Footnotes(out *bytes.Buffer, text func() bool) {
+
+}
+
+func (r *roffRenderer) FootnoteItem(out *bytes.Buffer, name, text []byte, flags int) {
+
+}
+
+func (r *roffRenderer) AutoLink(out *bytes.Buffer, link []byte, kind int) {
+	out.WriteString("\n\\[la]")
+	out.Write(link)
+	out.WriteString("\\[ra]")
+}
+
+func (r *roffRenderer) CodeSpan(out *bytes.Buffer, text []byte) {
+	out.WriteString("\\fB\\fC")
+	escapeSpecialChars(out, text)
+	out.WriteString("\\fR")
+}
+
+func (r *roffRenderer) DoubleEmphasis(out *bytes.Buffer, text []byte) {
+	out.WriteString("\\fB")
+	out.Write(text)
+	out.WriteString("\\fP")
+}
+
+func (r *roffRenderer) Emphasis(out *bytes.Buffer, text []byte) {
+	out.WriteString("\\fI")
+	out.Write(text)
+	out.WriteString("\\fP")
+}
+
+func (r *roffRenderer) Image(out *bytes.Buffer, link []byte, title []byte, alt []byte) {
+}
+
+func (r *roffRenderer) LineBreak(out *bytes.Buffer) {
+	out.WriteString("\n.br\n")
+}
+
+func (r *roffRenderer) Link(out *bytes.Buffer, link []byte, title []byte, content []byte) {
+	r.AutoLink(out, link, 0)
+}
+
+func (r *roffRenderer) RawHtmlTag(out *bytes.Buffer, tag []byte) {
+	out.Write(tag)
+}
+
+func (r *roffRenderer) TripleEmphasis(out *bytes.Buffer, text []byte) {
+	out.WriteString("\\s+2")
+	out.Write(text)
+	out.WriteString("\\s-2")
+}
+
+func (r *roffRenderer) StrikeThrough(out *bytes.Buffer, text []byte) {
+}
+
+func (r *roffRenderer) FootnoteRef(out *bytes.Buffer, ref []byte, id int) {
+
+}
+
+func (r *roffRenderer) Entity(out *bytes.Buffer, entity []byte) {
+	out.WriteString(html.UnescapeString(string(entity)))
+}
+
+func processFooterText(text []byte) []byte {
+	text = bytes.TrimPrefix(text, []byte("% "))
+	newText := []byte{}
+	textArr := strings.Split(string(text), ") ")
+
+	for i, w := range textArr {
+		if i == 0 {
+			w = strings.Replace(w, "(", "\" \"", 1)
+			w = fmt.Sprintf("\"%s\"", w)
+		} else {
+			w = fmt.Sprintf(" \"%s\"", w)
+		}
+		newText = append(newText, []byte(w)...)
+	}
+	newText = append(newText, []byte(" \"\"")...)
+
+	return newText
+}
+
+func (r *roffRenderer) NormalText(out *bytes.Buffer, text []byte) {
+	escapeSpecialChars(out, text)
+}
+
+func (r *roffRenderer) DocumentHeader(out *bytes.Buffer) {
+}
+
+func (r *roffRenderer) DocumentFooter(out *bytes.Buffer) {
+}
+
+func needsBackslash(c byte) bool {
+	for _, r := range []byte("-_&\\~") {
+		if c == r {
+			return true
+		}
+	}
+	return false
+}
+
+func escapeSpecialChars(out *bytes.Buffer, text []byte) {
+	for i := 0; i < len(text); i++ {
+		// directly copy normal characters
+		org := i
+
+		for i < len(text) && !needsBackslash(text[i]) {
+			i++
+		}
+		if i > org {
+			out.Write(text[org:i])
+		}
+
+		// escape a character
+		if i >= len(text) {
+			break
+		}
+		out.WriteByte('\\')
+		out.WriteByte(text[i])
+	}
+}
diff --git a/vendor/github.com/cznic/b/LICENSE b/vendor/github.com/cznic/b/LICENSE
new file mode 100644
index 0000000000..54c6e90872
--- /dev/null
+++ b/vendor/github.com/cznic/b/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The b Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/cznic/b/btree.go b/vendor/github.com/cznic/b/btree.go
new file mode 100644
index 0000000000..18cbeb8b05
--- /dev/null
+++ b/vendor/github.com/cznic/b/btree.go
@@ -0,0 +1,929 @@
+// Copyright 2014 The b Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package b
+
+import (
+	"fmt"
+	"io"
+	"sync"
+)
+
+const (
+	kx = 32 //TODO benchmark tune this number if using custom key/value type(s).
+	kd = 32 //TODO benchmark tune this number if using custom key/value type(s).
+)
+
+func init() {
+	if kd < 1 {
+		panic(fmt.Errorf("kd %d: out of range", kd))
+	}
+
+	if kx < 2 {
+		panic(fmt.Errorf("kx %d: out of range", kx))
+	}
+}
+
+var (
+	btDPool = sync.Pool{New: func() interface{} { return &d{} }}
+	btEPool = btEpool{sync.Pool{New: func() interface{} { return &Enumerator{} }}}
+	btTPool = btTpool{sync.Pool{New: func() interface{} { return &Tree{} }}}
+	btXPool = sync.Pool{New: func() interface{} { return &x{} }}
+)
+
+type btTpool struct{ sync.Pool }
+
+func (p *btTpool) get(cmp Cmp) *Tree {
+	x := p.Get().(*Tree)
+	x.cmp = cmp
+	return x
+}
+
+type btEpool struct{ sync.Pool }
+
+func (p *btEpool) get(err error, hit bool, i int, k interface{} /*K*/, q *d, t *Tree, ver int64) *Enumerator {
+	x := p.Get().(*Enumerator)
+	x.err, x.hit, x.i, x.k, x.q, x.t, x.ver = err, hit, i, k, q, t, ver
+	return x
+}
+
+type (
+	// Cmp compares a and b. Return value is:
+	//
+	//	< 0 if a <  b
+	//	  0 if a == b
+	//	> 0 if a >  b
+	//
+	Cmp func(a, b interface{} /*K*/) int
+
+	d struct { // data page
+		c int
+		d [2*kd + 1]de
+		n *d
+		p *d
+	}
+
+	de struct { // d element
+		k interface{} /*K*/
+		v interface{} /*V*/
+	}
+
+	// Enumerator captures the state of enumerating a tree. It is returned
+	// from the Seek* methods. The enumerator is aware of any mutations
+	// made to the tree in the process of enumerating it and automatically
+	// resumes the enumeration at the proper key, if possible.
+	//
+	// However, once an Enumerator returns io.EOF to signal "no more
+	// items", it does no more attempt to "resync" on tree mutation(s).  In
+	// other words, io.EOF from an Enumaretor is "sticky" (idempotent).
+	Enumerator struct {
+		err error
+		hit bool
+		i   int
+		k   interface{} /*K*/
+		q   *d
+		t   *Tree
+		ver int64
+	}
+
+	// Tree is a B+tree.
+	Tree struct {
+		c     int
+		cmp   Cmp
+		first *d
+		last  *d
+		r     interface{}
+		ver   int64
+	}
+
+	xe struct { // x element
+		ch interface{}
+		k  interface{} /*K*/
+	}
+
+	x struct { // index page
+		c int
+		x [2*kx + 2]xe
+	}
+)
+
+var ( // R/O zero values
+	zd  d
+	zde de
+	ze  Enumerator
+	zk  interface{} /*K*/
+	zt  Tree
+	zx  x
+	zxe xe
+)
+
+func clr(q interface{}) {
+	switch x := q.(type) {
+	case *x:
+		for i := 0; i <= x.c; i++ { // Ch0 Sep0 ... Chn-1 Sepn-1 Chn
+			clr(x.x[i].ch)
+		}
+		*x = zx
+		btXPool.Put(x)
+	case *d:
+		*x = zd
+		btDPool.Put(x)
+	}
+}
+
+// -------------------------------------------------------------------------- x
+
+func newX(ch0 interface{}) *x {
+	r := btXPool.Get().(*x)
+	r.x[0].ch = ch0
+	return r
+}
+
+func (q *x) extract(i int) {
+	q.c--
+	if i < q.c {
+		copy(q.x[i:], q.x[i+1:q.c+1])
+		q.x[q.c].ch = q.x[q.c+1].ch
+		q.x[q.c].k = zk  // GC
+		q.x[q.c+1] = zxe // GC
+	}
+}
+
+func (q *x) insert(i int, k interface{} /*K*/, ch interface{}) *x {
+	c := q.c
+	if i < c {
+		q.x[c+1].ch = q.x[c].ch
+		copy(q.x[i+2:], q.x[i+1:c])
+		q.x[i+1].k = q.x[i].k
+	}
+	c++
+	q.c = c
+	q.x[i].k = k
+	q.x[i+1].ch = ch
+	return q
+}
+
+func (q *x) siblings(i int) (l, r *d) {
+	if i >= 0 {
+		if i > 0 {
+			l = q.x[i-1].ch.(*d)
+		}
+		if i < q.c {
+			r = q.x[i+1].ch.(*d)
+		}
+	}
+	return
+}
+
+// -------------------------------------------------------------------------- d
+
+func (l *d) mvL(r *d, c int) {
+	copy(l.d[l.c:], r.d[:c])
+	copy(r.d[:], r.d[c:r.c])
+	l.c += c
+	r.c -= c
+}
+
+func (l *d) mvR(r *d, c int) {
+	copy(r.d[c:], r.d[:r.c])
+	copy(r.d[:c], l.d[l.c-c:])
+	r.c += c
+	l.c -= c
+}
+
+// ----------------------------------------------------------------------- Tree
+
+// TreeNew returns a newly created, empty Tree. The compare function is used
+// for key collation.
+func TreeNew(cmp Cmp) *Tree {
+	return btTPool.get(cmp)
+}
+
+// Clear removes all K/V pairs from the tree.
+func (t *Tree) Clear() {
+	if t.r == nil {
+		return
+	}
+
+	clr(t.r)
+	t.c, t.first, t.last, t.r = 0, nil, nil, nil
+	t.ver++
+}
+
+// Close performs Clear and recycles t to a pool for possible later reuse. No
+// references to t should exist or such references must not be used afterwards.
+func (t *Tree) Close() {
+	t.Clear()
+	*t = zt
+	btTPool.Put(t)
+}
+
+func (t *Tree) cat(p *x, q, r *d, pi int) {
+	t.ver++
+	q.mvL(r, r.c)
+	if r.n != nil {
+		r.n.p = q
+	} else {
+		t.last = q
+	}
+	q.n = r.n
+	*r = zd
+	btDPool.Put(r)
+	if p.c > 1 {
+		p.extract(pi)
+		p.x[pi].ch = q
+		return
+	}
+
+	switch x := t.r.(type) {
+	case *x:
+		*x = zx
+		btXPool.Put(x)
+	case *d:
+		*x = zd
+		btDPool.Put(x)
+	}
+	t.r = q
+}
+
+func (t *Tree) catX(p, q, r *x, pi int) {
+	t.ver++
+	q.x[q.c].k = p.x[pi].k
+	copy(q.x[q.c+1:], r.x[:r.c])
+	q.c += r.c + 1
+	q.x[q.c].ch = r.x[r.c].ch
+	*r = zx
+	btXPool.Put(r)
+	if p.c > 1 {
+		p.c--
+		pc := p.c
+		if pi < pc {
+			p.x[pi].k = p.x[pi+1].k
+			copy(p.x[pi+1:], p.x[pi+2:pc+1])
+			p.x[pc].ch = p.x[pc+1].ch
+			p.x[pc].k = zk     // GC
+			p.x[pc+1].ch = nil // GC
+		}
+		return
+	}
+
+	switch x := t.r.(type) {
+	case *x:
+		*x = zx
+		btXPool.Put(x)
+	case *d:
+		*x = zd
+		btDPool.Put(x)
+	}
+	t.r = q
+}
+
+// Delete removes the k's KV pair, if it exists, in which case Delete returns
+// true.
+func (t *Tree) Delete(k interface{} /*K*/) (ok bool) {
+	pi := -1
+	var p *x
+	q := t.r
+	if q == nil {
+		return false
+	}
+
+	for {
+		var i int
+		i, ok = t.find(q, k)
+		if ok {
+			switch x := q.(type) {
+			case *x:
+				if x.c < kx && q != t.r {
+					x, i = t.underflowX(p, x, pi, i)
+				}
+				pi = i + 1
+				p = x
+				q = x.x[pi].ch
+				ok = false
+				continue
+			case *d:
+				t.extract(x, i)
+				if x.c >= kd {
+					return true
+				}
+
+				if q != t.r {
+					t.underflow(p, x, pi)
+				} else if t.c == 0 {
+					t.Clear()
+				}
+				return true
+			}
+		}
+
+		switch x := q.(type) {
+		case *x:
+			if x.c < kx && q != t.r {
+				x, i = t.underflowX(p, x, pi, i)
+			}
+			pi = i
+			p = x
+			q = x.x[i].ch
+		case *d:
+			return false
+		}
+	}
+}
+
+func (t *Tree) extract(q *d, i int) { // (r interface{} /*V*/) {
+	t.ver++
+	//r = q.d[i].v // prepared for Extract
+	q.c--
+	if i < q.c {
+		copy(q.d[i:], q.d[i+1:q.c+1])
+	}
+	q.d[q.c] = zde // GC
+	t.c--
+	return
+}
+
+func (t *Tree) find(q interface{}, k interface{} /*K*/) (i int, ok bool) {
+	var mk interface{} /*K*/
+	l := 0
+	switch x := q.(type) {
+	case *x:
+		h := x.c - 1
+		for l <= h {
+			m := (l + h) >> 1
+			mk = x.x[m].k
+			switch cmp := t.cmp(k, mk); {
+			case cmp > 0:
+				l = m + 1
+			case cmp == 0:
+				return m, true
+			default:
+				h = m - 1
+			}
+		}
+	case *d:
+		h := x.c - 1
+		for l <= h {
+			m := (l + h) >> 1
+			mk = x.d[m].k
+			switch cmp := t.cmp(k, mk); {
+			case cmp > 0:
+				l = m + 1
+			case cmp == 0:
+				return m, true
+			default:
+				h = m - 1
+			}
+		}
+	}
+	return l, false
+}
+
+// First returns the first item of the tree in the key collating order, or
+// (zero-value, zero-value) if the tree is empty.
+func (t *Tree) First() (k interface{} /*K*/, v interface{} /*V*/) {
+	if q := t.first; q != nil {
+		q := &q.d[0]
+		k, v = q.k, q.v
+	}
+	return
+}
+
+// Get returns the value associated with k and true if it exists. Otherwise Get
+// returns (zero-value, false).
+func (t *Tree) Get(k interface{} /*K*/) (v interface{} /*V*/, ok bool) {
+	q := t.r
+	if q == nil {
+		return
+	}
+
+	for {
+		var i int
+		if i, ok = t.find(q, k); ok {
+			switch x := q.(type) {
+			case *x:
+				q = x.x[i+1].ch
+				continue
+			case *d:
+				return x.d[i].v, true
+			}
+		}
+		switch x := q.(type) {
+		case *x:
+			q = x.x[i].ch
+		default:
+			return
+		}
+	}
+}
+
+func (t *Tree) insert(q *d, i int, k interface{} /*K*/, v interface{} /*V*/) *d {
+	t.ver++
+	c := q.c
+	if i < c {
+		copy(q.d[i+1:], q.d[i:c])
+	}
+	c++
+	q.c = c
+	q.d[i].k, q.d[i].v = k, v
+	t.c++
+	return q
+}
+
+// Last returns the last item of the tree in the key collating order, or
+// (zero-value, zero-value) if the tree is empty.
+func (t *Tree) Last() (k interface{} /*K*/, v interface{} /*V*/) {
+	if q := t.last; q != nil {
+		q := &q.d[q.c-1]
+		k, v = q.k, q.v
+	}
+	return
+}
+
+// Len returns the number of items in the tree.
+func (t *Tree) Len() int {
+	return t.c
+}
+
+func (t *Tree) overflow(p *x, q *d, pi, i int, k interface{} /*K*/, v interface{} /*V*/) {
+	t.ver++
+	l, r := p.siblings(pi)
+
+	if l != nil && l.c < 2*kd {
+		l.mvL(q, 1)
+		t.insert(q, i-1, k, v)
+		p.x[pi-1].k = q.d[0].k
+		return
+	}
+
+	if r != nil && r.c < 2*kd {
+		if i < 2*kd {
+			q.mvR(r, 1)
+			t.insert(q, i, k, v)
+			p.x[pi].k = r.d[0].k
+			return
+		}
+
+		t.insert(r, 0, k, v)
+		p.x[pi].k = k
+		return
+	}
+
+	t.split(p, q, pi, i, k, v)
+}
+
+// Seek returns an Enumerator positioned on a an item such that k >= item's
+// key. ok reports if k == item.key The Enumerator's position is possibly
+// after the last item in the tree.
+func (t *Tree) Seek(k interface{} /*K*/) (e *Enumerator, ok bool) {
+	q := t.r
+	if q == nil {
+		e = btEPool.get(nil, false, 0, k, nil, t, t.ver)
+		return
+	}
+
+	for {
+		var i int
+		if i, ok = t.find(q, k); ok {
+			switch x := q.(type) {
+			case *x:
+				q = x.x[i+1].ch
+				continue
+			case *d:
+				return btEPool.get(nil, ok, i, k, x, t, t.ver), true
+			}
+		}
+
+		switch x := q.(type) {
+		case *x:
+			q = x.x[i].ch
+		case *d:
+			return btEPool.get(nil, ok, i, k, x, t, t.ver), false
+		}
+	}
+}
+
+// SeekFirst returns an enumerator positioned on the first KV pair in the tree,
+// if any. For an empty tree, err == io.EOF is returned and e will be nil.
+func (t *Tree) SeekFirst() (e *Enumerator, err error) {
+	q := t.first
+	if q == nil {
+		return nil, io.EOF
+	}
+
+	return btEPool.get(nil, true, 0, q.d[0].k, q, t, t.ver), nil
+}
+
+// SeekLast returns an enumerator positioned on the last KV pair in the tree,
+// if any. For an empty tree, err == io.EOF is returned and e will be nil.
+func (t *Tree) SeekLast() (e *Enumerator, err error) {
+	q := t.last
+	if q == nil {
+		return nil, io.EOF
+	}
+
+	return btEPool.get(nil, true, q.c-1, q.d[q.c-1].k, q, t, t.ver), nil
+}
+
+// Set sets the value associated with k.
+func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
+	//dbg("--- PRE Set(%v, %v)\n%s", k, v, t.dump())
+	//defer func() {
+	//	dbg("--- POST\n%s\n====\n", t.dump())
+	//}()
+
+	pi := -1
+	var p *x
+	q := t.r
+	if q == nil {
+		z := t.insert(btDPool.Get().(*d), 0, k, v)
+		t.r, t.first, t.last = z, z, z
+		return
+	}
+
+	for {
+		i, ok := t.find(q, k)
+		if ok {
+			switch x := q.(type) {
+			case *x:
+				if x.c > 2*kx {
+					x, i = t.splitX(p, x, pi, i)
+				}
+				pi = i + 1
+				p = x
+				q = x.x[i+1].ch
+				continue
+			case *d:
+				x.d[i].v = v
+			}
+			return
+		}
+
+		switch x := q.(type) {
+		case *x:
+			if x.c > 2*kx {
+				x, i = t.splitX(p, x, pi, i)
+			}
+			pi = i
+			p = x
+			q = x.x[i].ch
+		case *d:
+			switch {
+			case x.c < 2*kd:
+				t.insert(x, i, k, v)
+			default:
+				t.overflow(p, x, pi, i, k, v)
+			}
+			return
+		}
+	}
+}
+
+// Put combines Get and Set in a more efficient way where the tree is walked
+// only once. The upd(ater) receives (old-value, true) if a KV pair for k
+// exists or (zero-value, false) otherwise. It can then return a (new-value,
+// true) to create or overwrite the existing value in the KV pair, or
+// (whatever, false) if it decides not to create or not to update the value of
+// the KV pair.
+//
+// 	tree.Set(k, v) call conceptually equals calling
+//
+// 	tree.Put(k, func(interface{} /*K*/, bool){ return v, true })
+//
+// modulo the differing return values.
+func (t *Tree) Put(k interface{} /*K*/, upd func(oldV interface{} /*V*/, exists bool) (newV interface{} /*V*/, write bool)) (oldV interface{} /*V*/, written bool) {
+	pi := -1
+	var p *x
+	q := t.r
+	var newV interface{} /*V*/
+	if q == nil {
+		// new KV pair in empty tree
+		newV, written = upd(newV, false)
+		if !written {
+			return
+		}
+
+		z := t.insert(btDPool.Get().(*d), 0, k, newV)
+		t.r, t.first, t.last = z, z, z
+		return
+	}
+
+	for {
+		i, ok := t.find(q, k)
+		if ok {
+			switch x := q.(type) {
+			case *x:
+				if x.c > 2*kx {
+					x, i = t.splitX(p, x, pi, i)
+				}
+				pi = i + 1
+				p = x
+				q = x.x[i+1].ch
+				continue
+			case *d:
+				oldV = x.d[i].v
+				newV, written = upd(oldV, true)
+				if !written {
+					return
+				}
+
+				x.d[i].v = newV
+			}
+			return
+		}
+
+		switch x := q.(type) {
+		case *x:
+			if x.c > 2*kx {
+				x, i = t.splitX(p, x, pi, i)
+			}
+			pi = i
+			p = x
+			q = x.x[i].ch
+		case *d: // new KV pair
+			newV, written = upd(newV, false)
+			if !written {
+				return
+			}
+
+			switch {
+			case x.c < 2*kd:
+				t.insert(x, i, k, newV)
+			default:
+				t.overflow(p, x, pi, i, k, newV)
+			}
+			return
+		}
+	}
+}
+
+func (t *Tree) split(p *x, q *d, pi, i int, k interface{} /*K*/, v interface{} /*V*/) {
+	t.ver++
+	r := btDPool.Get().(*d)
+	if q.n != nil {
+		r.n = q.n
+		r.n.p = r
+	} else {
+		t.last = r
+	}
+	q.n = r
+	r.p = q
+
+	copy(r.d[:], q.d[kd:2*kd])
+	for i := range q.d[kd:] {
+		q.d[kd+i] = zde
+	}
+	q.c = kd
+	r.c = kd
+	var done bool
+	if i > kd {
+		done = true
+		t.insert(r, i-kd, k, v)
+	}
+	if pi >= 0 {
+		p.insert(pi, r.d[0].k, r)
+	} else {
+		t.r = newX(q).insert(0, r.d[0].k, r)
+	}
+	if done {
+		return
+	}
+
+	t.insert(q, i, k, v)
+}
+
+func (t *Tree) splitX(p *x, q *x, pi int, i int) (*x, int) {
+	t.ver++
+	r := btXPool.Get().(*x)
+	copy(r.x[:], q.x[kx+1:])
+	q.c = kx
+	r.c = kx
+	if pi >= 0 {
+		p.insert(pi, q.x[kx].k, r)
+		q.x[kx].k = zk
+		for i := range q.x[kx+1:] {
+			q.x[kx+i+1] = zxe
+		}
+
+		switch {
+		case i < kx:
+			return q, i
+		case i == kx:
+			return p, pi
+		default: // i > kx
+			return r, i - kx - 1
+		}
+	}
+
+	nr := newX(q).insert(0, q.x[kx].k, r)
+	t.r = nr
+	q.x[kx].k = zk
+	for i := range q.x[kx+1:] {
+		q.x[kx+i+1] = zxe
+	}
+
+	switch {
+	case i < kx:
+		return q, i
+	case i == kx:
+		return nr, 0
+	default: // i > kx
+		return r, i - kx - 1
+	}
+}
+
+func (t *Tree) underflow(p *x, q *d, pi int) {
+	t.ver++
+	l, r := p.siblings(pi)
+
+	if l != nil && l.c+q.c >= 2*kd {
+		l.mvR(q, 1)
+		p.x[pi-1].k = q.d[0].k
+		return
+	}
+
+	if r != nil && q.c+r.c >= 2*kd {
+		q.mvL(r, 1)
+		p.x[pi].k = r.d[0].k
+		r.d[r.c] = zde // GC
+		return
+	}
+
+	if l != nil {
+		t.cat(p, l, q, pi-1)
+		return
+	}
+
+	t.cat(p, q, r, pi)
+}
+
+func (t *Tree) underflowX(p *x, q *x, pi int, i int) (*x, int) {
+	t.ver++
+	var l, r *x
+
+	if pi >= 0 {
+		if pi > 0 {
+			l = p.x[pi-1].ch.(*x)
+		}
+		if pi < p.c {
+			r = p.x[pi+1].ch.(*x)
+		}
+	}
+
+	if l != nil && l.c > kx {
+		q.x[q.c+1].ch = q.x[q.c].ch
+		copy(q.x[1:], q.x[:q.c])
+		q.x[0].ch = l.x[l.c].ch
+		q.x[0].k = p.x[pi-1].k
+		q.c++
+		i++
+		l.c--
+		p.x[pi-1].k = l.x[l.c].k
+		return q, i
+	}
+
+	if r != nil && r.c > kx {
+		q.x[q.c].k = p.x[pi].k
+		q.c++
+		q.x[q.c].ch = r.x[0].ch
+		p.x[pi].k = r.x[0].k
+		copy(r.x[:], r.x[1:r.c])
+		r.c--
+		rc := r.c
+		r.x[rc].ch = r.x[rc+1].ch
+		r.x[rc].k = zk
+		r.x[rc+1].ch = nil
+		return q, i
+	}
+
+	if l != nil {
+		i += l.c + 1
+		t.catX(p, l, q, pi-1)
+		q = l
+		return q, i
+	}
+
+	t.catX(p, q, r, pi)
+	return q, i
+}
+
+// ----------------------------------------------------------------- Enumerator
+
+// Close recycles e to a pool for possible later reuse. No references to e
+// should exist or such references must not be used afterwards.
+func (e *Enumerator) Close() {
+	*e = ze
+	btEPool.Put(e)
+}
+
+// Next returns the currently enumerated item, if it exists and moves to the
+// next item in the key collation order. If there is no item to return, err ==
+// io.EOF is returned.
+func (e *Enumerator) Next() (k interface{} /*K*/, v interface{} /*V*/, err error) {
+	if err = e.err; err != nil {
+		return
+	}
+
+	if e.ver != e.t.ver {
+		f, hit := e.t.Seek(e.k)
+		if !e.hit && hit {
+			if err = f.next(); err != nil {
+				return
+			}
+		}
+
+		*e = *f
+		f.Close()
+	}
+	if e.q == nil {
+		e.err, err = io.EOF, io.EOF
+		return
+	}
+
+	if e.i >= e.q.c {
+		if err = e.next(); err != nil {
+			return
+		}
+	}
+
+	i := e.q.d[e.i]
+	k, v = i.k, i.v
+	e.k, e.hit = k, false
+	e.next()
+	return
+}
+
+func (e *Enumerator) next() error {
+	if e.q == nil {
+		e.err = io.EOF
+		return io.EOF
+	}
+
+	switch {
+	case e.i < e.q.c-1:
+		e.i++
+	default:
+		if e.q, e.i = e.q.n, 0; e.q == nil {
+			e.err = io.EOF
+		}
+	}
+	return e.err
+}
+
+// Prev returns the currently enumerated item, if it exists and moves to the
+// previous item in the key collation order. If there is no item to return, err
+// == io.EOF is returned.
+func (e *Enumerator) Prev() (k interface{} /*K*/, v interface{} /*V*/, err error) {
+	if err = e.err; err != nil {
+		return
+	}
+
+	if e.ver != e.t.ver {
+		f, hit := e.t.Seek(e.k)
+		if !e.hit && hit {
+			if err = f.prev(); err != nil {
+				return
+			}
+		}
+
+		*e = *f
+		f.Close()
+	}
+	if e.q == nil {
+		e.err, err = io.EOF, io.EOF
+		return
+	}
+
+	if e.i >= e.q.c {
+		if err = e.next(); err != nil {
+			return
+		}
+	}
+
+	i := e.q.d[e.i]
+	k, v = i.k, i.v
+	e.k, e.hit = k, false
+	e.prev()
+	return
+}
+
+func (e *Enumerator) prev() error {
+	if e.q == nil {
+		e.err = io.EOF
+		return io.EOF
+	}
+
+	switch {
+	case e.i > 0:
+		e.i--
+	default:
+		if e.q = e.q.p; e.q == nil {
+			e.err = io.EOF
+			break
+		}
+
+		e.i = e.q.c - 1
+	}
+	return e.err
+}
diff --git a/vendor/github.com/cznic/b/doc.go b/vendor/github.com/cznic/b/doc.go
new file mode 100644
index 0000000000..ddcf73704f
--- /dev/null
+++ b/vendor/github.com/cznic/b/doc.go
@@ -0,0 +1,53 @@
+// Copyright 2014 The b Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package b implements the B+tree flavor of a BTree.
+//
+// Changelog
+//
+// 2014-06-26: Lower GC presure by recycling things.
+//
+// 2014-04-18: Added new method Put.
+//
+// Generic types
+//
+// Keys and their associated values are interface{} typed, similar to all of
+// the containers in the standard library.
+//
+// Semiautomatic production of a type specific variant of this package is
+// supported via
+//
+//	$ make generic
+//
+// This command will write to stdout a version of the btree.go file where every
+// key type occurrence is replaced by the word 'KEY' and every value type
+// occurrence is replaced by the word 'VALUE'. Then you have to replace these
+// tokens with your desired type(s), using any technique you're comfortable
+// with.
+//
+// This is how, for example, 'example/int.go' was created:
+//
+//	$ mkdir example
+//	$ make generic | sed -e 's/KEY/int/g' -e 's/VALUE/int/g' > example/int.go
+//
+// No other changes to int.go are necessary, it compiles just fine.
+//
+// Running the benchmarks for 1000 keys on a machine with Intel i5-4670 CPU @
+// 3.4GHz, Go release 1.4.2.
+//
+//	$ go test -bench 1e3 example/all_test.go example/int.go
+//	PASS
+//	BenchmarkSetSeq1e3	   10000	    151620 ns/op
+//	BenchmarkGetSeq1e3	   10000	    115354 ns/op
+//	BenchmarkSetRnd1e3	    5000	    255865 ns/op
+//	BenchmarkGetRnd1e3	   10000	    140466 ns/op
+//	BenchmarkDelSeq1e3	   10000	    143860 ns/op
+//	BenchmarkDelRnd1e3	   10000	    188228 ns/op
+//	BenchmarkSeekSeq1e3	   10000	    156448 ns/op
+//	BenchmarkSeekRnd1e3	   10000	    190587 ns/op
+//	BenchmarkNext1e3	  200000	      9407 ns/op
+//	BenchmarkPrev1e3	  200000	      9306 ns/op
+//	ok  	command-line-arguments	26.369s
+//	$
+package b
diff --git a/vendor/github.com/cznic/bufs/LICENSE b/vendor/github.com/cznic/bufs/LICENSE
new file mode 100644
index 0000000000..7d80fe28eb
--- /dev/null
+++ b/vendor/github.com/cznic/bufs/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The bufs Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/cznic/bufs/bufs.go b/vendor/github.com/cznic/bufs/bufs.go
new file mode 100644
index 0000000000..f4e0eee2a6
--- /dev/null
+++ b/vendor/github.com/cznic/bufs/bufs.go
@@ -0,0 +1,391 @@
+// Copyright 2014 The bufs Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package bufs implements a simple buffer cache.
+//
+// The intended use scheme is like:
+//
+//	type Foo struct {
+//		buffers bufs.Buffers
+//		...
+//	}
+//
+//	// Bar can call Qux, but not the other way around (in this example).
+//	const maxFooDepth = 2
+//
+//	func NewFoo() *Foo {
+//		return &Foo{buffers: bufs.New(maxFooDepth), ...}
+//	}
+//
+//	func (f *Foo) Bar(n int) {
+//		buf := f.buffers.Alloc(n) // needed locally for computation and/or I/O
+//		defer f.buffers.Free()
+//		...
+//		f.Qux(whatever)
+//	}
+//
+//	func (f *Foo) Qux(n int) {
+//		buf := f.buffers.Alloc(n) // needed locally for computation and/or I/O
+//		defer f.buffers.Free()
+//		...
+//	}
+//
+// The whole idea behind 'bufs' is that when calling e.g. Foo.Bar N times, then
+// normally, without using 'bufs', there will be 2*N (in this example) []byte
+// buffers allocated.  While using 'bufs', only 2 buffers (in this example)
+// will ever be created. For large N it can be a substantial difference.
+//
+// It's not a good idea to use Buffers to cache too big buffers. The cost of
+// having a cached buffer is that the buffer is naturally not eligible for
+// garbage collection.  Of course, that holds only while the Foo instance is
+// reachable, in the above example.
+//
+// The buffer count limit is intentionally "hard" (read panicking), although
+// configurable in New().  The rationale is to prevent recursive calls, using
+// Alloc, to cause excessive, "static" memory consumption. Tune the limit
+// carefully or do not use Buffers from within [mutually] recursive functions
+// where the nesting depth is not realistically bounded to some rather small
+// number.
+//
+// Buffers cannot guarantee improvements to you program performance. There may
+// be a gain in case where they fit well. Firm grasp on what your code is
+// actually doing, when and in what order is essential to proper use of
+// Buffers. It's _highly_ recommended to first do profiling and memory
+// profiling before even thinking about using 'bufs'. The real world example,
+// and cause for this package, was a first correct, yet no optimizations done
+// version of a program; producing few MB of useful data while allocating 20+GB
+// of memory.  Of course the garbage collector properly kicked in, yet the
+// memory abuse caused ~80+% of run time to be spent memory management.  The
+// program _was_ expected to be slow in its still development phase, but the
+// bottleneck was guessed to be in I/O.  Actually the hard disk was waiting for
+// the billions bytes being allocated and zeroed. Garbage collect on low
+// memory, rinse and repeat.
+//
+// In the provided tests, TestFoo and TestFooBufs do the same simulated work,
+// except the later uses Buffers while the former does not. Suggested test runs
+// which show the differences:
+//
+//	$ go test -bench . -benchmem
+//
+//	or
+//
+//	$ go test -c
+//	$ ./bufs.test -test.v -test.run Foo -test.memprofile mem.out -test.memprofilerate 1
+//	$ go tool pprof bufs.test mem.out --alloc_space --nodefraction 0.0001 --edgefraction 0 -web
+//	$ # Note: Foo vs FooBufs allocated memory is in hundreds of MBs vs 8 kB.
+//
+//	or
+//
+//	$ make demo # same as all of the above
+//
+//
+// NOTE: Alloc/Free calls must be properly nested in the same way as in for
+// example BeginTransaction/EndTransaction pairs. If your code can panic then
+// the pairing should be enforced by deferred calls.
+//
+// NOTE: Buffers objects do not allocate any space until requested by Alloc,
+// the mechanism works on demand only.
+//
+// FAQ: Why the 'bufs' package name?
+//
+// Package name 'bufs' was intentionally chosen instead of the perhaps more
+// conventional 'buf'. There are already too many 'buf' named things in the
+// code out there and that'll be a source of a lot of trouble. It's a bit
+// similar situation as in the case of package "strings" (not "string").
+package bufs
+
+import (
+	"errors"
+	"sort"
+	"sync"
+)
+
+// Buffers type represents a buffer ([]byte) cache.
+//
+// NOTE: Do not modify Buffers directly, use only its methods. Do not create
+// additional values (copies) of Buffers, that'll break its functionality. Use
+// a pointer instead to refer to a single instance from different
+// places/scopes.
+type Buffers [][]byte
+
+// New returns a newly created instance of Buffers with a maximum capacity of n
+// buffers.
+//
+// NOTE: 'bufs.New(n)' is the same as 'make(bufs.Buffers, n)'.
+func New(n int) Buffers {
+	return make(Buffers, n)
+}
+
+// Alloc will return a buffer such that len(r) == n. It will firstly try to
+// find an existing and unused buffer of big enough size. Only when there is no
+// such, then one of the buffer slots is reallocated to a bigger size.
+//
+// It's okay to use append with buffers returned by Alloc. But it can cause
+// allocation in that case and will again be producing load for the garbage
+// collector. The best use of Alloc is for I/O buffers where the needed size of
+// the buffer is figured out at some point of the code path in a 'final size'
+// sense. Another real world example are compression/decompression buffers.
+//
+// NOTE: The buffer returned by Alloc _is not_ zeroed. That's okay for e.g.
+// passing a buffer to io.Reader. If you need a zeroed buffer use Calloc.
+//
+// NOTE: Buffers returned from Alloc _must not_ be exposed/returned to your
+// clients.  Those buffers are intended to be used strictly internally, within
+// the methods of some "object".
+//
+// NOTE: Alloc will panic if there are no buffers (buffer slots) left.
+func (p *Buffers) Alloc(n int) (r []byte) {
+	b := *p
+	if len(b) == 0 {
+		panic(errors.New("Buffers.Alloc: out of buffers"))
+	}
+
+	biggest, best, biggestI, bestI := -1, -1, -1, -1
+	for i, v := range b {
+		//ln := len(v)
+		// The above was correct, buts it's just confusing. It worked
+		// because not the buffers, but slices of them are returned in
+		// the 'if best >= n' code path.
+		ln := cap(v)
+
+		if ln >= biggest {
+			biggest, biggestI = ln, i
+		}
+
+		if ln >= n && (bestI < 0 || best > ln) {
+			best, bestI = ln, i
+			if ln == n {
+				break
+			}
+		}
+	}
+
+	last := len(b) - 1
+	if best >= n {
+		r = b[bestI]
+		b[last], b[bestI] = b[bestI], b[last]
+		*p = b[:last]
+		return r[:n]
+	}
+
+	r = make([]byte, n, overCommit(n))
+	b[biggestI] = r
+	b[last], b[biggestI] = b[biggestI], b[last]
+	*p = b[:last]
+	return
+}
+
+// Calloc will acquire a buffer using Alloc and then clears it to zeros. The
+// zeroing goes up to n, not cap(r).
+func (p *Buffers) Calloc(n int) (r []byte) {
+	r = p.Alloc(n)
+	for i := range r {
+		r[i] = 0
+	}
+	return
+}
+
+// Free makes the lastly allocated by Alloc buffer free (available) again for
+// Alloc.
+//
+// NOTE: Improper Free invocations, like in the sequence {New, Alloc, Free,
+// Free}, will panic.
+func (p *Buffers) Free() {
+	b := *p
+	b = b[:len(b)+1]
+	*p = b
+}
+
+// Stats reports memory consumed by Buffers, without accounting for some
+// (smallish) additional overhead.
+func (p *Buffers) Stats() (bytes int) {
+	b := *p
+	b = b[:cap(b)]
+	for _, v := range b {
+		bytes += cap(v)
+	}
+	return
+}
+
+// Cache caches buffers ([]byte). A zero value of Cache is ready for use.
+//
+// NOTE: Do not modify a Cache directly, use only its methods. Do not create
+// additional values (copies) of a Cache, that'll break its functionality. Use
+// a pointer instead to refer to a single instance from different
+// places/scopes.
+type Cache [][]byte
+
+// Get returns a buffer ([]byte) of length n. If no such buffer is cached then
+// a biggest cached buffer is resized to have length n and returned. If there
+// are no cached items at all, Get returns a newly allocated buffer.
+//
+// In other words the cache policy is:
+//
+// - If the cache is empty, the buffer must be newly created and returned.
+// Cache remains empty.
+//
+// - If a buffer of sufficient size is found in the cache, remove it from the
+// cache and return it.
+//
+// - Otherwise the cache is non empty, but no cached buffer is big enough.
+// Enlarge the biggest cached buffer, remove it from the cache and return it.
+// This provide cached buffers size adjustment based on demand.
+//
+// In short, if the cache is not empty, Get guarantees to make it always one
+// item less.  This rules prevent uncontrolled cache grow in some scenarios.
+// The older policy was not preventing that. Another advantage is better cached
+// buffers sizes "auto tuning", although not in every possible use case.
+//
+// NOTE: The buffer returned by Get _is not guaranteed_ to be zeroed. That's
+// okay for e.g.  passing a buffer to io.Reader. If you need a zeroed buffer
+// use Cget.
+func (c *Cache) Get(n int) []byte {
+	r, _ := c.get(n)
+	return r
+}
+
+func (c *Cache) get(n int) (r []byte, isZeroed bool) {
+	s := *c
+	lens := len(s)
+	if lens == 0 {
+		r, isZeroed = make([]byte, n, overCommit(n)), true
+		return
+	}
+
+	i := sort.Search(lens, func(x int) bool { return len(s[x]) >= n })
+	if i == lens {
+		i--
+		s[i] = make([]byte, n, overCommit(n))
+	}
+	r = s[i][:n]
+	copy(s[i:], s[i+1:])
+	s[lens-1] = nil
+	s = s[:lens-1]
+	*c = s
+	return r, false
+}
+
+// Cget will acquire a buffer using Get and then clears it to zeros. The
+// zeroing goes up to n, not cap(r).
+func (c *Cache) Cget(n int) (r []byte) {
+	r, ok := c.get(n)
+	if ok {
+		return
+	}
+
+	for i := range r {
+		r[i] = 0
+	}
+	return
+}
+
+// Put caches b for possible later reuse (via Get). No other references to b's
+// backing array may exist. Otherwise a big mess is sooner or later inevitable.
+func (c *Cache) Put(b []byte) {
+	b = b[:cap(b)]
+	lenb := len(b)
+	if lenb == 0 {
+		return
+	}
+
+	s := *c
+	lens := len(s)
+	i := sort.Search(lens, func(x int) bool { return len(s[x]) >= lenb })
+	s = append(s, nil)
+	copy(s[i+1:], s[i:])
+	s[i] = b
+	*c = s
+	return
+}
+
+// Stats reports memory consumed by a Cache, without accounting for some
+// (smallish) additional overhead. 'n' is the number of cached buffers, bytes
+// is their combined capacity.
+func (c Cache) Stats() (n, bytes int) {
+	n = len(c)
+	for _, v := range c {
+		bytes += cap(v)
+	}
+	return
+}
+
+// CCache is a Cache which is safe for concurrent use by multiple goroutines.
+type CCache struct {
+	c  Cache
+	mu sync.Mutex
+}
+
+// Get returns a buffer ([]byte) of length n. If no such buffer is cached then
+// a biggest cached buffer is resized to have length n and returned. If there
+// are no cached items at all, Get returns a newly allocated buffer.
+//
+// In other words the cache policy is:
+//
+// - If the cache is empty, the buffer must be newly created and returned.
+// Cache remains empty.
+//
+// - If a buffer of sufficient size is found in the cache, remove it from the
+// cache and return it.
+//
+// - Otherwise the cache is non empty, but no cached buffer is big enough.
+// Enlarge the biggest cached buffer, remove it from the cache and return it.
+// This provide cached buffers size adjustment based on demand.
+//
+// In short, if the cache is not empty, Get guarantees to make it always one
+// item less.  This rules prevent uncontrolled cache grow in some scenarios.
+// The older policy was not preventing that. Another advantage is better cached
+// buffers sizes "auto tuning", although not in every possible use case.
+//
+// NOTE: The buffer returned by Get _is not guaranteed_ to be zeroed. That's
+// okay for e.g.  passing a buffer to io.Reader. If you need a zeroed buffer
+// use Cget.
+func (c *CCache) Get(n int) []byte {
+	c.mu.Lock()
+	r, _ := c.c.get(n)
+	c.mu.Unlock()
+	return r
+}
+
+// Cget will acquire a buffer using Get and then clears it to zeros. The
+// zeroing goes up to n, not cap(r).
+func (c *CCache) Cget(n int) (r []byte) {
+	c.mu.Lock()
+	r = c.c.Cget(n)
+	c.mu.Unlock()
+	return
+}
+
+// Put caches b for possible later reuse (via Get). No other references to b's
+// backing array may exist. Otherwise a big mess is sooner or later inevitable.
+func (c *CCache) Put(b []byte) {
+	c.mu.Lock()
+	c.c.Put(b)
+	c.mu.Unlock()
+}
+
+// Stats reports memory consumed by a Cache, without accounting for some
+// (smallish) additional overhead. 'n' is the number of cached buffers, bytes
+// is their combined capacity.
+func (c *CCache) Stats() (n, bytes int) {
+	c.mu.Lock()
+	n, bytes = c.c.Stats()
+	c.mu.Unlock()
+	return
+}
+
+// GCache is a ready to use global instance of a CCache.
+var GCache CCache
+
+func overCommit(n int) int {
+	switch {
+	case n < 8:
+		return 8
+	case n < 1e5:
+		return 2 * n
+	case n < 1e6:
+		return 3 * n / 2
+	default:
+		return n
+	}
+}
diff --git a/vendor/github.com/cznic/exp/lldb/2pc.go b/vendor/github.com/cznic/exp/lldb/2pc.go
new file mode 100644
index 0000000000..887604def2
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/2pc.go
@@ -0,0 +1,324 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Two Phase Commit & Structural ACID
+
+package lldb
+
+import (
+	"bufio"
+	"encoding/binary"
+	"fmt"
+	"io"
+	"os"
+
+	"github.com/cznic/fileutil"
+	"github.com/cznic/mathutil"
+)
+
+var _ Filer = &ACIDFiler0{} // Ensure ACIDFiler0 is a Filer
+
+type acidWrite struct {
+	b   []byte
+	off int64
+}
+
+type acidWriter0 ACIDFiler0
+
+func (a *acidWriter0) WriteAt(b []byte, off int64) (n int, err error) {
+	f := (*ACIDFiler0)(a)
+	if f.bwal == nil { // new epoch
+		f.data = f.data[:0]
+		f.bwal = bufio.NewWriter(f.wal)
+		if err = a.writePacket([]interface{}{wpt00Header, walTypeACIDFiler0, ""}); err != nil {
+			return
+		}
+	}
+
+	if err = a.writePacket([]interface{}{wpt00WriteData, b, off}); err != nil {
+		return
+	}
+
+	f.data = append(f.data, acidWrite{b, off})
+	return len(b), nil
+}
+
+func (a *acidWriter0) writePacket(items []interface{}) (err error) {
+	f := (*ACIDFiler0)(a)
+	b, err := EncodeScalars(items...)
+	if err != nil {
+		return
+	}
+
+	var b4 [4]byte
+	binary.BigEndian.PutUint32(b4[:], uint32(len(b)))
+	if _, err = f.bwal.Write(b4[:]); err != nil {
+		return
+	}
+
+	if _, err = f.bwal.Write(b); err != nil {
+		return
+	}
+
+	if m := (4 + len(b)) % 16; m != 0 {
+		var pad [15]byte
+		_, err = f.bwal.Write(pad[:16-m])
+	}
+	return
+}
+
+// WAL Packet Tags
+const (
+	wpt00Header = iota
+	wpt00WriteData
+	wpt00Checkpoint
+)
+
+const (
+	walTypeACIDFiler0 = iota
+)
+
+// ACIDFiler0 is a very simple, synchronous implementation of 2PC. It uses a
+// single write ahead log file to provide the structural atomicity
+// (BeginUpdate/EndUpdate/Rollback) and durability (DB can be recovered from
+// WAL if a crash occurred).
+//
+// ACIDFiler0 is a Filer.
+//
+// NOTE: Durable synchronous 2PC involves three fsyncs in this implementation
+// (WAL, DB, zero truncated WAL).  Where possible, it's recommended to collect
+// transactions for, say one second before performing the two phase commit as
+// the typical performance for rotational hard disks is about few tens of
+// fsyncs per second atmost. For an example of such collective transaction
+// approach please see the colecting FSM STT in Dbm's documentation[1].
+//
+//  [1]: http://godoc.org/github.com/cznic/exp/dbm
+type ACIDFiler0 struct {
+	*RollbackFiler
+	wal               *os.File
+	bwal              *bufio.Writer
+	data              []acidWrite
+	testHook          bool  // keeps WAL untruncated (once)
+	peakWal           int64 // tracks WAL maximum used size
+	peakBitFilerPages int   // track maximum transaction memory
+}
+
+// NewACIDFiler0 returns a  newly created ACIDFiler0 with WAL in wal.
+//
+// If the WAL is zero sized then a previous clean shutdown of db is taken for
+// granted and no recovery procedure is taken.
+//
+// If the WAL is of non zero size then it is checked for having a
+// commited/fully finished transaction not yet been reflected in db. If such
+// transaction exists it's committed to db. If the recovery process finishes
+// successfully, the WAL is truncated to zero size and fsync'ed prior to return
+// from NewACIDFiler0.
+func NewACIDFiler(db Filer, wal *os.File) (r *ACIDFiler0, err error) {
+	fi, err := wal.Stat()
+	if err != nil {
+		return
+	}
+
+	r = &ACIDFiler0{wal: wal}
+
+	if fi.Size() != 0 {
+		if err = r.recoverDb(db); err != nil {
+			return
+		}
+	}
+
+	acidWriter := (*acidWriter0)(r)
+
+	if r.RollbackFiler, err = NewRollbackFiler(
+		db,
+		func(sz int64) (err error) {
+			// Checkpoint
+			if err = acidWriter.writePacket([]interface{}{wpt00Checkpoint, sz}); err != nil {
+				return
+			}
+
+			if err = r.bwal.Flush(); err != nil {
+				return
+			}
+
+			r.bwal = nil
+
+			if err = r.wal.Sync(); err != nil {
+				return
+			}
+
+			wfi, err := r.wal.Stat()
+			switch err != nil {
+			case true:
+				// unexpected, but ignored
+			case false:
+				r.peakWal = mathutil.MaxInt64(wfi.Size(), r.peakWal)
+			}
+
+			// Phase 1 commit complete
+
+			for _, v := range r.data {
+				if _, err := db.WriteAt(v.b, v.off); err != nil {
+					return err
+				}
+			}
+
+			if err = db.Truncate(sz); err != nil {
+				return
+			}
+
+			if err = db.Sync(); err != nil {
+				return
+			}
+
+			// Phase 2 commit complete
+
+			if !r.testHook {
+				if err = r.wal.Truncate(0); err != nil {
+					return
+				}
+
+				if _, err = r.wal.Seek(0, 0); err != nil {
+					return
+				}
+			}
+
+			r.testHook = false
+			return r.wal.Sync()
+
+		},
+		acidWriter,
+	); err != nil {
+		return
+	}
+
+	return r, nil
+}
+
+// PeakWALSize reports the maximum size WAL has ever used.
+func (a ACIDFiler0) PeakWALSize() int64 {
+	return a.peakWal
+}
+
+func (a *ACIDFiler0) readPacket(f *bufio.Reader) (items []interface{}, err error) {
+	var b4 [4]byte
+	n, err := io.ReadAtLeast(f, b4[:], 4)
+	if n != 4 {
+		return
+	}
+
+	ln := int(binary.BigEndian.Uint32(b4[:]))
+	m := (4 + ln) % 16
+	padd := (16 - m) % 16
+	b := make([]byte, ln+padd)
+	if n, err = io.ReadAtLeast(f, b, len(b)); n != len(b) {
+		return
+	}
+
+	return DecodeScalars(b[:ln])
+}
+
+func (a *ACIDFiler0) recoverDb(db Filer) (err error) {
+	fi, err := a.wal.Stat()
+	if err != nil {
+		return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: err}
+	}
+
+	if sz := fi.Size(); sz%16 != 0 {
+		return &ErrILSEQ{Type: ErrFileSize, Name: a.wal.Name(), Arg: sz}
+	}
+
+	f := bufio.NewReader(a.wal)
+	items, err := a.readPacket(f)
+	if err != nil {
+		return
+	}
+
+	if len(items) != 3 || items[0] != int64(wpt00Header) || items[1] != int64(walTypeACIDFiler0) {
+		return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("invalid packet items %#v", items)}
+	}
+
+	tr := NewBTree(nil)
+
+	for {
+		items, err = a.readPacket(f)
+		if err != nil {
+			return
+		}
+
+		if len(items) < 2 {
+			return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("too few packet items %#v", items)}
+		}
+
+		switch items[0] {
+		case int64(wpt00WriteData):
+			if len(items) != 3 {
+				return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("invalid data packet items %#v", items)}
+			}
+
+			b, off := items[1].([]byte), items[2].(int64)
+			var key [8]byte
+			binary.BigEndian.PutUint64(key[:], uint64(off))
+			if err = tr.Set(key[:], b); err != nil {
+				return
+			}
+		case int64(wpt00Checkpoint):
+			var b1 [1]byte
+			if n, err := f.Read(b1[:]); n != 0 || err == nil {
+				return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("checkpoint n %d, err %v", n, err)}
+			}
+
+			if len(items) != 2 {
+				return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("checkpoint packet invalid items %#v", items)}
+			}
+
+			sz := items[1].(int64)
+			enum, err := tr.seekFirst()
+			if err != nil {
+				return err
+			}
+
+			for {
+				k, v, err := enum.current()
+				if err != nil {
+					if fileutil.IsEOF(err) {
+						break
+					}
+
+					return err
+				}
+
+				if _, err = db.WriteAt(v, int64(binary.BigEndian.Uint64(k))); err != nil {
+					return err
+				}
+
+				if err = enum.next(); err != nil {
+					if fileutil.IsEOF(err) {
+						break
+					}
+
+					return err
+				}
+			}
+
+			if err = db.Truncate(sz); err != nil {
+				return err
+			}
+
+			if err = db.Sync(); err != nil {
+				return err
+			}
+
+			// Recovery complete
+
+			if err = a.wal.Truncate(0); err != nil {
+				return err
+			}
+
+			return a.wal.Sync()
+		default:
+			return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("packet tag %v", items[0])}
+		}
+	}
+}
diff --git a/vendor/github.com/cznic/exp/lldb/2pc_docs.go b/vendor/github.com/cznic/exp/lldb/2pc_docs.go
new file mode 100644
index 0000000000..02c993b8ba
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/2pc_docs.go
@@ -0,0 +1,44 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+
+Anatomy of a WAL file
+
+WAL file
+	A sequence of packets
+
+WAL packet, parts in slice notation
+	[0:4],   4 bytes:        N uint32        // network byte order
+	[4:4+N], N bytes:        payload []byte  // gb encoded scalars
+
+Packets, including the 4 byte 'size' prefix, MUST BE padded to size == 0 (mod
+16). The values of the padding bytes MUST BE zero.
+
+Encoded scalars first item is a packet type number (packet tag). The meaning of
+any other item(s) of the payload depends on the packet tag.
+
+Packet definitions
+
+	{wpt00Header int, typ int, s string}
+		typ:	Must be zero (ACIDFiler0 file).
+		s:	Any comment string, empty string is okay.
+
+		This packet must be present only once - as the first packet of
+		a WAL file.
+
+	{wpt00WriteData int, b []byte, off int64}
+		Write data (WriteAt(b, off)).
+
+	{wpt00Checkpoint int, sz int64}
+		Checkpoint (Truncate(sz)).
+
+		This packet must be present only once - as the last packet of
+		a WAL file.
+
+*/
+
+package lldb
+
+//TODO optimize bitfiler/wal/2pc data above final size
diff --git a/vendor/github.com/cznic/exp/lldb/LICENSE b/vendor/github.com/cznic/exp/lldb/LICENSE
new file mode 100644
index 0000000000..27e4447a49
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The lldb Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/cznic/exp/lldb/btree.go b/vendor/github.com/cznic/exp/lldb/btree.go
new file mode 100644
index 0000000000..57b0f39c62
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/btree.go
@@ -0,0 +1,2297 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package lldb
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"sort"
+	"strings"
+
+	"github.com/cznic/bufs"
+	"github.com/cznic/fileutil"
+	"github.com/cznic/sortutil"
+)
+
+const (
+	kData             = 256         // [1, 512]
+	kIndex            = 256         // [2, 2048]
+	kKV               = 19          // Size of the key/value field in btreeDataPage
+	kSz               = kKV - 1 - 7 // Content prefix size
+	kH                = kKV - 7     // Content field offset for handle
+	tagBTreeDataPage  = 1
+	tagBTreeIndexPage = 0
+)
+
+// BTree is a B+tree[1][2], i.e. a variant which speeds up
+// enumeration/iteration of the BTree. According to its origin it can be
+// volatile (backed only by memory) or non-volatile (backed by a non-volatile
+// Allocator).
+//
+// The specific implementation of BTrees in this package are B+trees with
+// delayed split/concatenation (discussed in e.g. [3]).
+//
+// Note: No BTree methods returns io.EOF for physical Filer reads/writes.  The
+// io.EOF is returned only by bTreeEnumerator methods to indicate "no more K-V
+// pair".
+//
+//  [1]: http://en.wikipedia.org/wiki/B+tree
+//  [2]: http://zgking.com:8080/home/donghui/publications/books/dshandbook_BTree.pdf
+//  [3]: http://people.cs.aau.dk/~simas/aalg06/UbiquitBtree.pdf
+type BTree struct {
+	store   btreeStore
+	root    btree
+	collate func(a, b []byte) int
+	serial  uint64
+}
+
+// NewBTree returns a new, memory-only BTree.
+func NewBTree(collate func(a, b []byte) int) *BTree {
+	store := newMemBTreeStore()
+	root, err := newBTree(store)
+	if err != nil { // should not happen
+		panic(err.Error())
+	}
+
+	return &BTree{store, root, collate, 0}
+}
+
+// IsMem reports if t is a memory only BTree.
+func (t *BTree) IsMem() (r bool) {
+	_, r = t.store.(*memBTreeStore)
+	return
+}
+
+// Clear empties the tree.
+func (t *BTree) Clear() (err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	t.serial++
+	return t.root.clear(t.store)
+}
+
+// Delete deletes key and its associated value from the tree.
+func (t *BTree) Delete(key []byte) (err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	t.serial++
+	_, err = t.root.extract(t.store, nil, t.collate, key)
+	return
+}
+
+// DeleteAny deletes one key and its associated value from the tree. If the
+// tree is empty on return then empty is true.
+func (t *BTree) DeleteAny() (empty bool, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	t.serial++
+	return t.root.deleteAny(t.store)
+}
+
+func elem(v interface{}) string {
+	switch x := v.(type) {
+	default:
+		panic("internal error")
+	case nil:
+		return "nil"
+	case bool:
+		if x {
+			return "true"
+		}
+
+		return "false"
+	case int64:
+		return fmt.Sprint(x)
+	case uint64:
+		return fmt.Sprint(x)
+	case float64:
+		s := fmt.Sprintf("%g", x)
+		if !strings.Contains(s, ".") {
+			s += "."
+		}
+		return s
+	case complex128:
+		s := fmt.Sprint(x)
+		return s[1 : len(s)-1]
+	case []byte:
+		return fmt.Sprintf("[]byte{% 02x}", x)
+	case string:
+		return fmt.Sprintf("%q", x)
+	}
+}
+
+// Dump outputs a human readable dump of t to w. It is usable iff t keys and
+// values are encoded scalars (see EncodeScalars). Intended use is only for
+// examples or debugging. Some type information is lost in the rendering, for
+// example a float value '17.' and an integer value '17' may both output as
+// '17'.
+func (t *BTree) Dump(w io.Writer) (err error) {
+	enum, err := t.seekFirst()
+	if err != nil {
+		return
+	}
+
+	for {
+		bkey, bval, err := enum.current()
+		if err != nil {
+			return err
+		}
+
+		key, err := DecodeScalars(bkey)
+		if err != nil {
+			return err
+		}
+
+		val, err := DecodeScalars(bval)
+		if err != nil {
+			return err
+		}
+
+		kk := []string{}
+		if key == nil {
+			kk = []string{"null"}
+		}
+		for _, v := range key {
+			kk = append(kk, elem(v))
+		}
+		vv := []string{}
+		if val == nil {
+			vv = []string{"null"}
+		}
+		for _, v := range val {
+			vv = append(vv, elem(v))
+		}
+		skey := strings.Join(kk, ", ")
+		sval := strings.Join(vv, ", ")
+		if len(vv) > 1 {
+			sval = fmt.Sprintf("[]interface{%s}", sval)
+		}
+		if _, err = fmt.Fprintf(w, "%s → %s\n", skey, sval); err != nil {
+			return err
+		}
+
+		err = enum.next()
+		if err != nil {
+			if fileutil.IsEOF(err) {
+				err = nil
+				break
+			}
+
+			return err
+		}
+	}
+	return
+}
+
+// Extract is a combination of Get and Delete. If the key exists in the tree,
+// it is returned (like Get) and also deleted from a tree in a more efficient
+// way which doesn't walk it twice.  The returned slice may be a sub-slice of
+// buf if buf was large enough to hold the entire content.  Otherwise, a newly
+// allocated slice will be returned.  It is valid to pass a nil buf.
+func (t *BTree) Extract(buf, key []byte) (value []byte, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	t.serial++
+	return t.root.extract(t.store, buf, t.collate, key)
+}
+
+// First returns the first KV pair of the tree, if it exists. Otherwise key == nil
+// and value == nil.
+func (t *BTree) First() (key, value []byte, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	var p btreeDataPage
+	if _, p, err = t.root.first(t.store); err != nil || p == nil {
+		return
+	}
+
+	if key, err = p.key(t.store, 0); err != nil {
+		return
+	}
+
+	value, err = p.value(t.store, 0)
+	return
+}
+
+// Get returns the value associated with key, or nil if no such value exists.
+// The returned slice may be a sub-slice of buf if buf was large enough to hold
+// the entire content.  Otherwise, a newly allocated slice will be returned.
+// It is valid to pass a nil buf.
+//
+// Get is safe for concurrent access by multiple goroutines iff no other
+// goroutine mutates the tree.
+func (t *BTree) Get(buf, key []byte) (value []byte, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	buffer := bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(buffer)
+	if buffer, err = t.root.get(t.store, buffer, t.collate, key); buffer == nil || err != nil {
+		return
+	}
+
+	value = need(len(buffer), buf)
+	copy(value, buffer)
+	return
+}
+
+// Handle reports t's handle.
+func (t *BTree) Handle() int64 {
+	return int64(t.root)
+}
+
+// Last returns the last KV pair of the tree, if it exists. Otherwise key == nil
+// and value == nil.
+func (t *BTree) Last() (key, value []byte, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	var p btreeDataPage
+	if _, p, err = t.root.last(t.store); err != nil || p == nil {
+		return
+	}
+
+	index := p.len() - 1
+	if key, err = p.key(t.store, index); err != nil {
+		return
+	}
+
+	value, err = p.value(t.store, index)
+	return
+}
+
+// Put combines Get and Set in a more efficient way where the tree is walked
+// only once.  The upd(ater) receives the current (key, old-value), if that
+// exists or (key, nil) otherwise.  It can then return a (new-value, true, nil)
+// to create or overwrite the existing value in the KV pair, or (whatever,
+// false, nil) if it decides not to create or not to update the value of the KV
+// pair.
+//
+// 	tree.Set(k, v)
+//
+// conceptually equals
+//
+// 	tree.Put(k, func(k, v []byte){ return v, true }([]byte, bool))
+//
+// modulo the differing return values.
+//
+// The returned slice may be a sub-slice of buf if buf was large enough to hold
+// the entire content.  Otherwise, a newly allocated slice will be returned.
+// It is valid to pass a nil buf.
+func (t *BTree) Put(buf, key []byte, upd func(key, old []byte) (new []byte, write bool, err error)) (old []byte, written bool, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	t.serial++
+	return t.root.put2(buf, t.store, t.collate, key, upd)
+}
+
+// Seek returns an Enumerator with "position" or an error of any. Normally the
+// position is on a KV pair such that key >= KV.key. Then hit is key == KV.key.
+// The position is possibly "after" the last KV pair, but that is not an error.
+//
+// Seek is safe for concurrent access by multiple goroutines iff no other
+// goroutine mutates the tree.
+func (t *BTree) Seek(key []byte) (enum *BTreeEnumerator, hit bool, err error) {
+	enum0, hit, err := t.seek(key)
+	if err != nil {
+		return
+	}
+
+	enum = &BTreeEnumerator{
+		enum:     enum0,
+		firstHit: hit,
+		key:      append([]byte(nil), key...),
+	}
+	return
+}
+
+func (t *BTree) seek(key []byte) (enum *bTreeEnumerator, hit bool, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	r := &bTreeEnumerator{t: t, collate: t.collate, serial: t.serial}
+	if r.p, r.index, hit, err = t.root.seek(t.store, r.collate, key); err != nil {
+		return
+	}
+
+	enum = r
+	return
+}
+
+// IndexSeek returns an Enumerator with "position" or an error of any. Normally
+// the position is on a KV pair such that key >= KV.key. Then hit is key ==
+// KV.key.  The position is possibly "after" the last KV pair, but that is not
+// an error.  The collate function originally passed to CreateBTree is used for
+// enumerating the tree but a custom collate function c is used for IndexSeek.
+//
+// IndexSeek is safe for concurrent access by multiple goroutines iff no other
+// goroutine mutates the tree.
+func (t *BTree) IndexSeek(key []byte, c func(a, b []byte) int) (enum *BTreeEnumerator, hit bool, err error) { //TODO +test
+	enum0, hit, err := t.indexSeek(key, c)
+	if err != nil {
+		return
+	}
+
+	enum = &BTreeEnumerator{
+		enum:     enum0,
+		firstHit: hit,
+		key:      append([]byte(nil), key...),
+	}
+	return
+}
+
+func (t *BTree) indexSeek(key []byte, c func(a, b []byte) int) (enum *bTreeEnumerator, hit bool, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	r := &bTreeEnumerator{t: t, collate: t.collate, serial: t.serial}
+	if r.p, r.index, hit, err = t.root.seek(t.store, c, key); err != nil {
+		return
+	}
+
+	enum = r
+	return
+}
+
+// seekFirst returns an enumerator positioned on the first KV pair in the tree,
+// if any.  For an empty tree, err == io.EOF is returend.
+//
+// SeekFirst is safe for concurrent access by multiple goroutines iff no other
+// goroutine mutates the tree.
+func (t *BTree) SeekFirst() (enum *BTreeEnumerator, err error) {
+	enum0, err := t.seekFirst()
+	if err != nil {
+		return
+	}
+
+	var key []byte
+	if key, _, err = enum0.current(); err != nil {
+		return
+	}
+
+	enum = &BTreeEnumerator{
+		enum:     enum0,
+		firstHit: true,
+		key:      append([]byte(nil), key...),
+	}
+	return
+}
+
+func (t *BTree) seekFirst() (enum *bTreeEnumerator, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	var p btreeDataPage
+	if _, p, err = t.root.first(t.store); err == nil && p == nil {
+		err = io.EOF
+	}
+	if err != nil {
+		return
+	}
+
+	return &bTreeEnumerator{t: t, collate: t.collate, p: p, index: 0, serial: t.serial}, nil
+}
+
+// seekLast returns an enumerator positioned on the last KV pair in the tree,
+// if any.  For an empty tree, err == io.EOF is returend.
+//
+// SeekLast is safe for concurrent access by multiple goroutines iff no other
+// goroutine mutates the tree.
+func (t *BTree) SeekLast() (enum *BTreeEnumerator, err error) {
+	enum0, err := t.seekLast()
+	if err != nil {
+		return
+	}
+
+	var key []byte
+	if key, _, err = enum0.current(); err != nil {
+		return
+	}
+
+	enum = &BTreeEnumerator{
+		enum:     enum0,
+		firstHit: true,
+		key:      append([]byte(nil), key...),
+	}
+	return
+}
+
+func (t *BTree) seekLast() (enum *bTreeEnumerator, err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	var p btreeDataPage
+	if _, p, err = t.root.last(t.store); err == nil && p == nil {
+		err = io.EOF
+	}
+	if err != nil {
+		return
+	}
+
+	return &bTreeEnumerator{t: t, collate: t.collate, p: p, index: p.len() - 1, serial: t.serial}, nil
+}
+
+// Set sets the value associated with key. Any previous value, if existed, is
+// overwritten by the new one.
+func (t *BTree) Set(key, value []byte) (err error) {
+	if t == nil {
+		err = errors.New("BTree method invoked on nil receiver")
+		return
+	}
+
+	t.serial++
+	dst := bufs.GCache.Get(maxBuf)
+	_, err = t.root.put(dst, t.store, t.collate, key, value, true)
+	bufs.GCache.Put(dst)
+	return
+}
+
+// bTreeEnumerator is a closure of a BTree and a position. It is returned from
+// BTree.seek.
+//
+// NOTE: bTreeEnumerator cannot be used after its BTree was mutated after the
+// bTreeEnumerator was acquired from any of the seek, seekFirst, seekLast
+// methods.
+type bTreeEnumerator struct {
+	t       *BTree
+	collate func(a, b []byte) int
+	p       btreeDataPage
+	index   int
+	serial  uint64
+}
+
+// Current returns the KV pair the enumerator is currently positioned on. If
+// the position is before the first KV pair in the tree or after the last KV
+// pair in the tree then err == io.EOF is returned.
+//
+// If the enumerator has been invalidated by updating the tree, ErrINVAL is
+// returned.
+func (e *bTreeEnumerator) current() (key, value []byte, err error) {
+	if e == nil {
+		err = errors.New("bTreeEnumerator method invoked on nil receiver")
+		return
+	}
+
+	if e.serial != e.t.serial {
+		err = &ErrINVAL{Src: "bTreeEnumerator invalidated by updating the tree"}
+		return
+	}
+
+	if e.p == nil || e.index == e.p.len() {
+		return nil, nil, io.EOF
+	}
+
+	if key, err = e.p.key(e.t.store, e.index); err != nil {
+		return
+	}
+
+	value, err = e.p.value(e.t.store, e.index)
+	return
+}
+
+// Next attempts to position the enumerator onto the next KV pair wrt the
+// current position. If there is no "next" KV pair, io.EOF is returned.
+//
+// If the enumerator has been invalidated by updating the tree, ErrINVAL is
+// returned.
+func (e *bTreeEnumerator) next() (err error) {
+	if e == nil {
+		err = errors.New("bTreeEnumerator method invoked on nil receiver")
+		return
+	}
+
+	if e.serial != e.t.serial {
+		err = &ErrINVAL{Src: "bTreeEnumerator invalidated by updating the tree"}
+		return
+	}
+
+	if e.p == nil {
+		return io.EOF
+	}
+
+	switch {
+	case e.index < e.p.len()-1:
+		e.index++
+	default:
+		ph := e.p.next()
+		if ph == 0 {
+			err = io.EOF
+			break
+		}
+
+		if e.p, err = e.t.store.Get(e.p, ph); err != nil {
+			e.p = nil
+			return
+		}
+		e.index = 0
+	}
+	return
+}
+
+// Prev attempts to position the enumerator onto the previous KV pair wrt the
+// current position. If there is no "previous" KV pair, io.EOF is returned.
+//
+// If the enumerator has been invalidated by updating the tree, ErrINVAL is
+// returned.
+func (e *bTreeEnumerator) prev() (err error) {
+	if e == nil {
+		err = errors.New("bTreeEnumerator method invoked on nil receiver")
+		return
+	}
+
+	if e.serial != e.t.serial {
+		err = &ErrINVAL{Src: "bTreeEnumerator invalidated by updating the tree"}
+		return
+	}
+
+	if e.p == nil {
+		return io.EOF
+	}
+
+	switch {
+	case e.index > 0:
+		e.index--
+	default:
+		ph := e.p.prev()
+		if ph == 0 {
+			err = io.EOF
+			break
+		}
+
+		if e.p, err = e.t.store.Get(e.p, ph); err != nil {
+			e.p = nil
+			return
+		}
+		e.index = e.p.len() - 1
+	}
+	return
+}
+
+// BTreeEnumerator captures the state of enumerating a tree. It is returned
+// from the Seek* methods.  The enumerator is aware of any mutations made to
+// the tree in the process of enumerating it and automatically resumes the
+// enumeration.
+type BTreeEnumerator struct {
+	enum     *bTreeEnumerator
+	err      error
+	key      []byte
+	firstHit bool
+}
+
+// Next returns the currently enumerated KV pair, if it exists and moves to the
+// next KV in the key collation order. If there is no KV pair to return, err ==
+// io.EOF is returned.
+//
+// Next is safe for concurrent access by multiple goroutines iff no other
+// goroutine mutates the tree.
+func (e *BTreeEnumerator) Next() (key, value []byte, err error) {
+	if err = e.err; err != nil {
+		return
+	}
+
+	canRetry := true
+retry:
+	if key, value, err = e.enum.current(); err != nil {
+		if _, ok := err.(*ErrINVAL); !ok || !canRetry {
+			e.err = err
+			return
+		}
+
+		canRetry = false
+		var hit bool
+		if e.enum, hit, err = e.enum.t.seek(e.key); err != nil {
+			e.err = err
+			return
+		}
+
+		if !e.firstHit && hit {
+			err = e.enum.next()
+			if err != nil {
+				e.err = err
+				return
+			}
+		}
+
+		goto retry
+	}
+
+	e.firstHit = false
+	e.key = append([]byte(nil), key...)
+	e.err = e.enum.next()
+	return
+}
+
+// Prev returns the currently enumerated KV pair, if it exists and moves to the
+// previous KV in the key collation order. If there is no KV pair to return,
+// err == io.EOF is returned.
+//
+// Prev is safe for concurrent access by multiple goroutines iff no other
+// goroutine mutates the tree.
+func (e *BTreeEnumerator) Prev() (key, value []byte, err error) {
+	if err = e.err; err != nil {
+		return
+	}
+
+	canRetry := true
+retry:
+	if key, value, err = e.enum.current(); err != nil {
+		if _, ok := err.(*ErrINVAL); !ok || !canRetry {
+			e.err = err
+			return
+		}
+
+		canRetry = false
+		var hit bool
+		if e.enum, hit, err = e.enum.t.seek(e.key); err != nil {
+			e.err = err
+			return
+		}
+
+		if !e.firstHit && hit {
+			err = e.enum.prev()
+			if err != nil {
+				e.err = err
+				return
+			}
+		}
+
+		goto retry
+	}
+
+	e.firstHit = false
+	e.key = append([]byte(nil), key...)
+	e.err = e.enum.prev()
+	return
+}
+
+// CreateBTree creates a new BTree in store. It returns the tree, its (freshly
+// assigned) handle (for OpenBTree or RemoveBTree) or an error, if any.
+func CreateBTree(store *Allocator, collate func(a, b []byte) int) (bt *BTree, handle int64, err error) {
+	r := &BTree{store: store, collate: collate}
+	if r.root, err = newBTree(store); err != nil {
+		return
+	}
+
+	return r, int64(r.root), nil
+}
+
+// OpenBTree opens a store's BTree using handle. It returns the tree or an
+// error, if any. The same tree may be opened more than once, but operations on
+// the separate instances should not ever overlap or void the other instances.
+// However, the intended API usage is to open the same tree handle only once
+// (handled by some upper layer "dispatcher").
+func OpenBTree(store *Allocator, collate func(a, b []byte) int, handle int64) (bt *BTree, err error) {
+	r := &BTree{store: store, root: btree(handle), collate: collate}
+	b := bufs.GCache.Get(7)
+	defer bufs.GCache.Put(b)
+	if b, err = store.Get(b, handle); err != nil {
+		return
+	}
+
+	if len(b) != 7 {
+		return nil, &ErrILSEQ{Off: h2off(handle), More: "btree.go:671"}
+	}
+
+	return r, nil
+}
+
+// RemoveBTree removes tree, represented by handle from store. Empty trees are
+// cheap, each uses only few bytes of the store. If there's a chance that a
+// tree will eventually get reused (non empty again), it's recommended to
+// not/never remove it.  One advantage of such approach is a stable handle of
+// such tree.
+func RemoveBTree(store *Allocator, handle int64) (err error) {
+	tree, err := OpenBTree(store, nil, handle)
+	if err != nil {
+		return
+	}
+
+	if err = tree.Clear(); err != nil {
+		return
+	}
+
+	return store.Free(handle)
+}
+
+type btreeStore interface {
+	Alloc(b []byte) (handle int64, err error)
+	Free(handle int64) (err error)
+	Get(dst []byte, handle int64) (b []byte, err error)
+	Realloc(handle int64, b []byte) (err error)
+}
+
+// Read only zero bytes
+var zeros [2 * kKV]byte
+
+func init() {
+	if kData < 1 || kData > 512 {
+		panic(fmt.Errorf("kData %d: out of limits", kData))
+	}
+
+	if kIndex < 2 || kIndex > 2048 {
+		panic(fmt.Errorf("kIndex %d: out of limits", kIndex))
+	}
+
+	if kKV < 8 || kKV > 23 {
+		panic(fmt.Errorf("kKV %d: out of limits", kKV))
+	}
+
+	if n := len(zeros); n < 15 {
+		panic(fmt.Errorf("not enough zeros: %d", n))
+	}
+}
+
+type memBTreeStore struct {
+	h int64
+	m map[int64][]byte
+}
+
+func newMemBTreeStore() *memBTreeStore {
+	return &memBTreeStore{h: 0, m: map[int64][]byte{}}
+}
+
+func (s *memBTreeStore) String() string {
+	var a sortutil.Int64Slice
+	for k := range s.m {
+		a = append(a, k)
+	}
+	sort.Sort(a)
+	var sa []string
+	for _, k := range a {
+		sa = append(sa, fmt.Sprintf("%#x:|% x|", k, s.m[k]))
+	}
+	return strings.Join(sa, "\n")
+}
+
+func (s *memBTreeStore) Alloc(b []byte) (handle int64, err error) {
+	s.h++
+	handle = s.h
+	s.m[handle] = bpack(b)
+	return
+}
+
+func (s *memBTreeStore) Free(handle int64) (err error) {
+	if _, ok := s.m[handle]; !ok {
+		return &ErrILSEQ{Type: ErrOther, Off: h2off(handle), More: "btree.go:754"}
+	}
+
+	delete(s.m, handle)
+	return
+}
+
+func (s *memBTreeStore) Get(dst []byte, handle int64) (b []byte, err error) {
+	r, ok := s.m[handle]
+	if !ok {
+		return nil, &ErrILSEQ{Type: ErrOther, Off: h2off(handle), More: "btree.go:764"}
+	}
+
+	b = need(len(r), dst)
+	copy(b, r)
+	return
+}
+
+func (s *memBTreeStore) Realloc(handle int64, b []byte) (err error) {
+	if _, ok := s.m[handle]; !ok {
+		return &ErrILSEQ{Type: ErrOther, Off: h2off(handle), More: "btree.go:774"}
+	}
+
+	s.m[handle] = bpack(b)
+	return
+}
+
+/*
+
+0...0 (1 bytes):
+Flag
+
+	  0
+	+---+
+	| 0 |
+	+---+
+
+0 indicates an index page
+
+1...count*14-1
+"array" of items, 14 bytes each. Count of items in kIndex-1..2*kIndex+2
+
+	Count = (len(raw) - 8) / 14
+
+	  0..6     7..13
+	+-------+----------+
+	| Child | DataPage |
+	+-------+----------+
+
+	Child    == handle of a child index page
+	DataPage == handle of a data page
+
+Offsets into the raw []byte:
+Child[X]    == 1+14*X
+DataPage[X] == 8+14*X
+
+*/
+type btreeIndexPage []byte
+
+func newBTreeIndexPage(leftmostChild int64) (p btreeIndexPage) {
+	p = bufs.GCache.Get(1 + (kIndex+1)*2*7)[:8]
+	p[0] = tagBTreeIndexPage
+	h2b(p[1:], leftmostChild)
+	return
+}
+
+func (p btreeIndexPage) len() int {
+	return (len(p) - 8) / 14
+}
+
+func (p btreeIndexPage) child(index int) int64 {
+	return b2h(p[1+14*index:])
+}
+
+func (p btreeIndexPage) setChild(index int, dp int64) {
+	h2b(p[1+14*index:], dp)
+}
+
+func (p btreeIndexPage) dataPage(index int) int64 {
+	return b2h(p[8+14*index:])
+}
+
+func (p btreeIndexPage) setDataPage(index int, dp int64) {
+	h2b(p[8+14*index:], dp)
+}
+
+func (q btreeIndexPage) insert(index int) btreeIndexPage {
+	switch len0 := q.len(); {
+	case index < len0:
+		has := len(q)
+		need := has + 14
+		switch {
+		case cap(q) >= need:
+			q = q[:need]
+		default:
+			q = append(q, zeros[:14]...)
+		}
+		copy(q[8+14*(index+1):8+14*(index+1)+2*(len0-index)*7], q[8+14*index:])
+	case index == len0:
+		has := len(q)
+		need := has + 14
+		switch {
+		case cap(q) >= need:
+			q = q[:need]
+		default:
+			q = append(q, zeros[:14]...)
+		}
+	}
+	return q
+}
+
+func (p btreeIndexPage) insert3(index int, dataPage, child int64) btreeIndexPage {
+	p = p.insert(index)
+	p.setDataPage(index, dataPage)
+	p.setChild(index+1, child)
+	return p
+}
+
+func (p btreeIndexPage) cmp(a btreeStore, c func(a, b []byte) int, keyA []byte, keyBIndex int) (int, error) {
+	b := bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(b)
+	dp, err := a.Get(b, p.dataPage(keyBIndex))
+	if err != nil {
+		return 0, err
+	}
+
+	return btreeDataPage(dp).cmp(a, c, keyA, 0)
+}
+
+func (q btreeIndexPage) setLen(n int) btreeIndexPage {
+	q = q[:cap(q)]
+	need := 8 + 14*n
+	if need < len(q) {
+		return q[:need]
+	}
+	return append(q, make([]byte, need-len(q))...)
+}
+
+func (p btreeIndexPage) split(a btreeStore, root btree, ph *int64, parent int64, parentIndex int, index *int) (btreeIndexPage, error) {
+	right := newBTreeIndexPage(0)
+	canRecycle := true
+	defer func() {
+		if canRecycle {
+			bufs.GCache.Put(right)
+		}
+	}()
+	right = right.setLen(kIndex)
+	copy(right[1:1+(2*kIndex+1)*7], p[1+14*(kIndex+1):])
+	p = p.setLen(kIndex)
+	if err := a.Realloc(*ph, p); err != nil {
+		return nil, err
+	}
+
+	rh, err := a.Alloc(right)
+	if err != nil {
+		return nil, err
+	}
+
+	if parentIndex >= 0 {
+		var pp btreeIndexPage = bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(pp)
+		if pp, err = a.Get(pp, parent); err != nil {
+			return nil, err
+		}
+		pp = pp.insert3(parentIndex, p.dataPage(kIndex), rh)
+		if err = a.Realloc(parent, pp); err != nil {
+			return nil, err
+		}
+
+	} else {
+		nr := newBTreeIndexPage(*ph)
+		defer bufs.GCache.Put(nr)
+		nr = nr.insert3(0, p.dataPage(kIndex), rh)
+		nrh, err := a.Alloc(nr)
+		if err != nil {
+			return nil, err
+		}
+
+		if err = a.Realloc(int64(root), h2b(make([]byte, 7), nrh)); err != nil {
+			return nil, err
+		}
+	}
+	if *index > kIndex {
+		p = right
+		canRecycle = false
+		*ph = rh
+		*index -= kIndex + 1
+	}
+	return p, nil
+}
+
+// p is dirty on return
+func (p btreeIndexPage) extract(index int) btreeIndexPage {
+	n := p.len() - 1
+	if index < n {
+		sz := (n-index)*14 + 7
+		copy(p[1+14*index:1+14*index+sz], p[1+14*(index+1):])
+	}
+	return p.setLen(n)
+}
+
+// must persist all changes made
+func (p btreeIndexPage) underflow(a btreeStore, root, iroot, parent int64, ph *int64, parentIndex int, index *int) (btreeIndexPage, error) {
+	lh, rh, err := checkSiblings(a, parent, parentIndex)
+	if err != nil {
+		return nil, err
+	}
+
+	var left btreeIndexPage = bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(left)
+
+	if lh != 0 {
+		if left, err = a.Get(left, lh); err != nil {
+			return nil, err
+		}
+
+		if lc := btreeIndexPage(left).len(); lc > kIndex {
+			var pp = bufs.GCache.Get(maxBuf)
+			defer bufs.GCache.Put(pp)
+			if pp, err = a.Get(pp, parent); err != nil {
+				return nil, err
+			}
+
+			pc := p.len()
+			p = p.setLen(pc + 1)
+			di, si, sz := 1+1*14, 1+0*14, (2*pc+1)*7
+			copy(p[di:di+sz], p[si:])
+			p.setChild(0, btreeIndexPage(left).child(lc))
+			p.setDataPage(0, btreeIndexPage(pp).dataPage(parentIndex-1))
+			*index++
+			btreeIndexPage(pp).setDataPage(parentIndex-1, btreeIndexPage(left).dataPage(lc-1))
+			left = left.setLen(lc - 1)
+			if err = a.Realloc(parent, pp); err != nil {
+				return nil, err
+			}
+
+			if err = a.Realloc(*ph, p); err != nil {
+				return nil, err
+			}
+
+			return p, a.Realloc(lh, left)
+		}
+	}
+
+	if rh != 0 {
+		right := bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(right)
+		if right, err = a.Get(right, rh); err != nil {
+			return nil, err
+		}
+
+		if rc := btreeIndexPage(right).len(); rc > kIndex {
+			pp := bufs.GCache.Get(maxBuf)
+			defer bufs.GCache.Put(pp)
+			if pp, err = a.Get(pp, parent); err != nil {
+				return nil, err
+			}
+
+			pc := p.len()
+			p = p.setLen(pc + 1)
+			p.setDataPage(pc, btreeIndexPage(pp).dataPage(parentIndex))
+			pc++
+			p.setChild(pc, btreeIndexPage(right).child(0))
+			btreeIndexPage(pp).setDataPage(parentIndex, btreeIndexPage(right).dataPage(0))
+			di, si, sz := 1+0*14, 1+1*14, (2*rc+1)*7
+			copy(right[di:di+sz], right[si:])
+			right = btreeIndexPage(right).setLen(rc - 1)
+			if err = a.Realloc(parent, pp); err != nil {
+				return nil, err
+			}
+
+			if err = a.Realloc(*ph, p); err != nil {
+				return nil, err
+			}
+
+			return p, a.Realloc(rh, right)
+		}
+	}
+
+	if lh != 0 {
+		*index += left.len() + 1
+		if left, err = left.concat(a, root, iroot, parent, lh, *ph, parentIndex-1); err != nil {
+			return p, err
+		}
+
+		p, *ph = left, lh
+		return p, nil
+	}
+
+	return p.concat(a, root, iroot, parent, *ph, rh, parentIndex)
+}
+
+// must persist all changes made
+func (p btreeIndexPage) concat(a btreeStore, root, iroot, parent, ph, rh int64, parentIndex int) (btreeIndexPage, error) {
+	pp := bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(pp)
+	pp, err := a.Get(pp, parent)
+	if err != nil {
+		return nil, err
+	}
+
+	right := bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(right)
+	if right, err = a.Get(right, rh); err != nil {
+		return nil, err
+	}
+
+	pc := p.len()
+	rc := btreeIndexPage(right).len()
+	p = p.setLen(pc + rc + 1)
+	p.setDataPage(pc, btreeIndexPage(pp).dataPage(parentIndex))
+	di, si, sz := 1+14*(pc+1), 1+0*14, (2*rc+1)*7
+	copy(p[di:di+sz], right[si:])
+	if err := a.Realloc(ph, p); err != nil {
+		return nil, err
+	}
+
+	if err := a.Free(rh); err != nil {
+		return nil, err
+	}
+
+	if pc := btreeIndexPage(pp).len(); pc > 1 {
+		if parentIndex < pc-1 {
+			di, si, sz := 8+parentIndex*14, 8+(parentIndex+1)*14, 2*(pc-1-parentIndex)*7
+			copy(pp[di:si+sz], pp[si:])
+		}
+		pp = btreeIndexPage(pp).setLen(pc - 1)
+		return p, a.Realloc(parent, pp)
+	}
+
+	if err := a.Free(iroot); err != nil {
+		return nil, err
+	}
+
+	b7 := bufs.GCache.Get(7)
+	defer bufs.GCache.Put(b7)
+	return p, a.Realloc(root, h2b(b7[:7], ph))
+}
+
+/*
+
+0...0 (1 bytes):
+Flag
+
+	  0
+	+---+
+	| 1 |
+	+---+
+
+1 indicates a data page
+
+1...14 (14 bytes)
+
+	  1..7  8..14
+	+------+------+
+	| Prev | Next |
+	+------+------+
+
+	Prev, Next == Handles of the data pages doubly linked list
+
+	Count = (len(raw) - 15) / (2*kKV)
+
+15...count*2*kKV-1
+"array" of items, 2*kKV bytes each. Count of items in kData-1..2*kData
+
+Item
+	  0..kKV-1   kKV..2*kKV-1
+	+----------+--------------+
+	|   Key    |    Value     |
+	+----------+--------------+
+
+Key/Value encoding
+
+Length 0...kKV-1
+
+	  0    1...N    N+1...kKV-1
+	+---+---------+-------------+
+	| N |  Data   |  Padding    |
+	+---+---------+-------------+
+
+	N       == content length
+	Data    == Key or Value content
+	Padding == MUST be zero bytes
+
+Length >= kKV
+
+	   0     1...kkV-8   kKV-7...kkV-1
+	+------+-----------+--------------+
+	| 0xFF |   Data    |      H       |
+	+------+-----------+--------------+
+
+	Data == Key or Value content, first kKV-7 bytes
+	H    == Handle to THE REST of the content, w/o the first bytes in Data.
+
+Offsets into the raw []byte:
+Key[X]   == 15+2*kKV*X
+Value[X] == 15+kKV+2*kKV*X
+*/
+type btreeDataPage []byte
+
+func newBTreeDataPage() (p btreeDataPage) {
+	p = bufs.GCache.Cget(1 + 2*7 + (kData+1)*2*kKV)[:1+2*7]
+	p[0] = tagBTreeDataPage
+	return
+}
+
+func newBTreeDataPageAlloc(a btreeStore) (p btreeDataPage, h int64, err error) {
+	p = newBTreeDataPage()
+	h, err = a.Alloc(p)
+	return
+}
+
+func (p btreeDataPage) len() int {
+	return (len(p) - 15) / (2 * kKV)
+}
+
+func (q btreeDataPage) setLen(n int) btreeDataPage {
+	q = q[:cap(q)]
+	need := 15 + 2*kKV*n
+	if need < len(q) {
+		return q[:need]
+	}
+	return append(q, make([]byte, need-len(q))...)
+}
+
+func (p btreeDataPage) prev() int64 {
+	return b2h(p[1:])
+}
+
+func (p btreeDataPage) next() int64 {
+	return b2h(p[8:])
+}
+
+func (p btreeDataPage) setPrev(h int64) {
+	h2b(p[1:], h)
+}
+
+func (p btreeDataPage) setNext(h int64) {
+	h2b(p[8:], h)
+}
+
+func (q btreeDataPage) insert(index int) btreeDataPage {
+	switch len0 := q.len(); {
+	case index < len0:
+		has := len(q)
+		need := has + 2*kKV
+		switch {
+		case cap(q) >= need:
+			q = q[:need]
+		default:
+			q = append(q, zeros[:2*kKV]...)
+		}
+		q.copy(q, index+1, index, len0-index)
+		return q
+	case index == len0:
+		has := len(q)
+		need := has + 2*kKV
+		switch {
+		case cap(q) >= need:
+			return q[:need]
+		default:
+			return append(q, zeros[:2*kKV]...)
+		}
+	}
+	panic("internal error")
+}
+
+func (p btreeDataPage) contentField(off int) (b []byte, h int64) {
+	p = p[off:]
+	switch n := int(p[0]); {
+	case n >= kKV: // content has a handle
+		b = append([]byte(nil), p[1:1+kSz]...)
+		h = b2h(p[kH:])
+	default: // content is embedded
+		b, h = append([]byte(nil), p[1:1+n]...), 0
+	}
+	return
+}
+
+func (p btreeDataPage) content(a btreeStore, off int) (b []byte, err error) {
+	b, h := p.contentField(off)
+	if h == 0 {
+		return
+	}
+
+	// content has a handle
+	b2, err := a.Get(nil, h) //TODO buffers: Later, not a public API
+	if err != nil {
+		return nil, err
+	}
+
+	return append(b, b2...), nil
+}
+
+func (p btreeDataPage) setContent(a btreeStore, off int, b []byte) (err error) {
+	p = p[off:]
+	switch {
+	case p[0] >= kKV: // existing content has a handle
+		switch n := len(b); {
+		case n < kKV:
+			p[0] = byte(n)
+			if err = a.Free(b2h(p[kH:])); err != nil {
+				return
+			}
+			copy(p[1:], b)
+		default:
+			// reuse handle
+			copy(p[1:1+kSz], b)
+			return a.Realloc(b2h(p[kH:]), b[kSz:])
+		}
+	default: // existing content is embedded
+		switch n := len(b); {
+		case n < kKV:
+			p[0] = byte(n)
+			copy(p[1:], b)
+		default:
+			p[0] = 0xff
+			copy(p[1:1+kSz], b)
+			h, err := a.Alloc(b[kSz:])
+			if err != nil {
+				return err
+			}
+
+			h2b(p[kH:], h)
+		}
+	}
+	return
+}
+
+func (p btreeDataPage) keyField(index int) (b []byte, h int64) {
+	return p.contentField(15 + 2*kKV*index)
+}
+
+func (p btreeDataPage) key(a btreeStore, index int) (b []byte, err error) {
+	return p.content(a, 15+2*kKV*index)
+}
+
+func (p btreeDataPage) valueField(index int) (b []byte, h int64) {
+	return p.contentField(15 + kKV + 2*kKV*index)
+}
+
+func (p btreeDataPage) value(a btreeStore, index int) (b []byte, err error) {
+	return p.content(a, 15+kKV+2*kKV*index)
+}
+
+func (p btreeDataPage) valueCopy(a btreeStore, index int) (b []byte, err error) {
+	if b, err = p.content(a, 15+kKV+2*kKV*index); err != nil {
+		return
+	}
+
+	return append([]byte(nil), b...), nil
+}
+
+func (p btreeDataPage) setKey(a btreeStore, index int, key []byte) (err error) {
+	return p.setContent(a, 15+2*kKV*index, key)
+}
+
+func (p btreeDataPage) setValue(a btreeStore, index int, value []byte) (err error) {
+	return p.setContent(a, 15+kKV+2*kKV*index, value)
+}
+
+func (p btreeDataPage) cmp(a btreeStore, c func(a, b []byte) int, keyA []byte, keyBIndex int) (y int, err error) {
+	var keyB []byte
+	if keyB, err = p.content(a, 15+2*kKV*keyBIndex); err != nil {
+		return
+	}
+
+	return c(keyA, keyB), nil
+}
+
+func (p btreeDataPage) copy(src btreeDataPage, di, si, n int) {
+	do, so := 15+2*kKV*di, 15+2*kKV*si
+	copy(p[do:do+2*kKV*n], src[so:])
+}
+
+// {p,left} dirty on exit
+func (p btreeDataPage) moveLeft(left btreeDataPage, n int) (btreeDataPage, btreeDataPage) {
+	nl, np := left.len(), p.len()
+	left = left.setLen(nl + n)
+	left.copy(p, nl, 0, n)
+	p.copy(p, 0, n, np-n)
+	return p.setLen(np - n), left
+}
+
+func (p btreeDataPage) moveRight(right btreeDataPage, n int) (btreeDataPage, btreeDataPage) {
+	nr, np := right.len(), p.len()
+	right = right.setLen(nr + n)
+	right.copy(right, n, 0, nr)
+	right.copy(p, 0, np-n, n)
+	return p.setLen(np - n), right
+}
+
+func (p btreeDataPage) insertItem(a btreeStore, index int, key, value []byte) (btreeDataPage, error) {
+	p = p.insert(index)
+	di, sz := 15+2*kKV*index, 2*kKV
+	copy(p[di:di+sz], zeros[:sz])
+	if err := p.setKey(a, index, key); err != nil {
+		return nil, err
+	}
+	return p, p.setValue(a, index, value)
+}
+
+func (p btreeDataPage) split(a btreeStore, root, ph, parent int64, parentIndex, index int, key, value []byte) (btreeDataPage, error) {
+	right, rh, err := newBTreeDataPageAlloc(a)
+	// fails defer bufs.GCache.Put(right)
+	if err != nil {
+		return nil, err
+	}
+
+	if next := p.next(); next != 0 {
+		right.setNext(p.next())
+		nxh := right.next()
+		nx := bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(nx)
+		if nx, err = a.Get(nx, nxh); err != nil {
+			return nil, err
+		}
+
+		btreeDataPage(nx).setPrev(rh)
+		if err = a.Realloc(nxh, nx); err != nil {
+			return nil, err
+		}
+	}
+
+	p.setNext(rh)
+	right.setPrev(ph)
+	right = right.setLen(kData)
+	right.copy(p, 0, kData, kData)
+	p = p.setLen(kData)
+
+	if parentIndex >= 0 {
+		var pp btreeIndexPage = bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(pp)
+		if pp, err = a.Get(pp, parent); err != nil {
+			return nil, err
+		}
+
+		pp = pp.insert3(parentIndex, rh, rh)
+		if err = a.Realloc(parent, pp); err != nil {
+			return nil, err
+		}
+
+	} else {
+		nr := newBTreeIndexPage(ph)
+		defer bufs.GCache.Put(nr)
+		nr = nr.insert3(0, rh, rh)
+		nrh, err := a.Alloc(nr)
+		if err != nil {
+			return nil, err
+		}
+
+		if err = a.Realloc(root, h2b(make([]byte, 7), nrh)); err != nil {
+			return nil, err
+		}
+
+	}
+	if index > kData {
+		if right, err = right.insertItem(a, index-kData, key, value); err != nil {
+			return nil, err
+		}
+	} else {
+		if p, err = p.insertItem(a, index, key, value); err != nil {
+			return nil, err
+		}
+	}
+	if err = a.Realloc(ph, p); err != nil {
+		return nil, err
+	}
+
+	return p, a.Realloc(rh, right)
+}
+
+func (p btreeDataPage) overflow(a btreeStore, root, ph, parent int64, parentIndex, index int, key, value []byte) (btreeDataPage, error) {
+	leftH, rightH, err := checkSiblings(a, parent, parentIndex)
+	if err != nil {
+		return nil, err
+	}
+
+	if leftH != 0 {
+		left := btreeDataPage(bufs.GCache.Get(maxBuf))
+		defer bufs.GCache.Put(left)
+		if left, err = a.Get(left, leftH); err != nil {
+			return nil, err
+		}
+
+		if left.len() < 2*kData {
+
+			p, left = p.moveLeft(left, 1)
+			if err = a.Realloc(leftH, left); err != nil {
+				return nil, err
+			}
+
+			if p, err = p.insertItem(a, index-1, key, value); err != nil {
+				return nil, err
+			}
+
+			return p, a.Realloc(ph, p)
+		}
+	}
+
+	if rightH != 0 {
+		right := btreeDataPage(bufs.GCache.Get(maxBuf))
+		defer bufs.GCache.Put(right)
+		if right, err = a.Get(right, rightH); err != nil {
+			return nil, err
+		}
+
+		if right.len() < 2*kData {
+			if index < 2*kData {
+				p, right = p.moveRight(right, 1)
+				if err = a.Realloc(rightH, right); err != nil {
+					return nil, err
+				}
+
+				if p, err = p.insertItem(a, index, key, value); err != nil {
+					return nil, err
+				}
+
+				return p, a.Realloc(ph, p)
+			} else {
+				if right, err = right.insertItem(a, 0, key, value); err != nil {
+					return nil, err
+				}
+
+				return p, a.Realloc(rightH, right)
+			}
+		}
+	}
+	return p.split(a, root, ph, parent, parentIndex, index, key, value)
+}
+
+func (p btreeDataPage) swap(a btreeStore, di int, value []byte, canOverwrite bool) (oldValue []byte, err error) {
+	if oldValue, err = p.value(a, di); err != nil {
+		return
+	}
+
+	if !canOverwrite {
+		return
+	}
+
+	oldValue = append([]byte(nil), oldValue...)
+	err = p.setValue(a, di, value)
+	return
+}
+
+type btreePage []byte
+
+func (p btreePage) isIndex() bool {
+	return p[0] == tagBTreeIndexPage
+}
+
+func (p btreePage) len() int {
+	if p.isIndex() {
+		return btreeIndexPage(p).len()
+	}
+
+	return btreeDataPage(p).len()
+}
+
+func (p btreePage) find(a btreeStore, c func(a, b []byte) int, key []byte) (index int, ok bool, err error) {
+	l := 0
+	h := p.len() - 1
+	isIndex := p.isIndex()
+	if c == nil {
+		c = bytes.Compare
+	}
+	for l <= h {
+		index = (l + h) >> 1
+		var cmp int
+		if isIndex {
+			if cmp, err = btreeIndexPage(p).cmp(a, c, key, index); err != nil {
+				return
+			}
+		} else {
+			if cmp, err = btreeDataPage(p).cmp(a, c, key, index); err != nil {
+				return
+			}
+		}
+		switch ok = cmp == 0; {
+		case cmp > 0:
+			l = index + 1
+		case ok:
+			return
+		default:
+			h = index - 1
+		}
+	}
+	return l, false, nil
+}
+
+// p is dirty after extract!
+func (p btreeDataPage) extract(a btreeStore, index int) (btreeDataPage, []byte, error) {
+	value, err := p.valueCopy(a, index)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if _, h := p.keyField(index); h != 0 {
+		if err = a.Free(h); err != nil {
+			return nil, nil, err
+		}
+	}
+
+	if _, h := p.valueField(index); h != 0 {
+		if err = a.Free(h); err != nil {
+			return nil, nil, err
+		}
+	}
+
+	n := p.len() - 1
+	if index < n {
+		p.copy(p, index, index+1, n-index)
+	}
+	return p.setLen(n), value, nil
+}
+
+func checkSiblings(a btreeStore, parent int64, parentIndex int) (left, right int64, err error) {
+	if parentIndex >= 0 {
+		var p btreeIndexPage = bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(p)
+		if p, err = a.Get(p, parent); err != nil {
+			return
+		}
+
+		if parentIndex > 0 {
+			left = p.child(parentIndex - 1)
+		}
+		if parentIndex < p.len() {
+			right = p.child(parentIndex + 1)
+		}
+	}
+	return
+}
+
+// underflow must persist all changes made.
+func (p btreeDataPage) underflow(a btreeStore, root, iroot, parent, ph int64, parentIndex int) (err error) {
+	lh, rh, err := checkSiblings(a, parent, parentIndex)
+	if err != nil {
+		return err
+	}
+
+	if lh != 0 {
+		left := bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(left)
+		if left, err = a.Get(left, lh); err != nil {
+			return err
+		}
+
+		if btreeDataPage(left).len()+p.len() >= 2*kData {
+			left, p = btreeDataPage(left).moveRight(p, 1)
+			if err = a.Realloc(lh, left); err != nil {
+				return err
+			}
+
+			return a.Realloc(ph, p)
+		}
+	}
+
+	if rh != 0 {
+		right := bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(right)
+		if right, err = a.Get(right, rh); err != nil {
+			return err
+		}
+
+		if p.len()+btreeDataPage(right).len() > 2*kData {
+			right, p = btreeDataPage(right).moveLeft(p, 1)
+			if err = a.Realloc(rh, right); err != nil {
+				return err
+			}
+
+			return a.Realloc(ph, p)
+		}
+	}
+
+	if lh != 0 {
+		left := bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(left)
+		if left, err = a.Get(left, lh); err != nil {
+			return err
+		}
+
+		if err = a.Realloc(ph, p); err != nil {
+			return err
+		}
+
+		return btreeDataPage(left).concat(a, root, iroot, parent, lh, ph, parentIndex-1)
+	}
+
+	return p.concat(a, root, iroot, parent, ph, rh, parentIndex)
+}
+
+// concat must persist all changes made.
+func (p btreeDataPage) concat(a btreeStore, root, iroot, parent, ph, rh int64, parentIndex int) (err error) {
+	right := bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(right)
+	if right, err = a.Get(right, rh); err != nil {
+		return err
+	}
+
+	right, p = btreeDataPage(right).moveLeft(p, btreeDataPage(right).len())
+	nxh := btreeDataPage(right).next()
+	if nxh != 0 {
+		nx := bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(nx)
+		if nx, err = a.Get(nx, nxh); err != nil {
+			return err
+		}
+
+		btreeDataPage(nx).setPrev(ph)
+		if err = a.Realloc(nxh, nx); err != nil {
+			return err
+		}
+	}
+	p.setNext(nxh)
+	if err = a.Free(rh); err != nil {
+		return err
+	}
+
+	pp := bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(pp)
+	if pp, err = a.Get(pp, parent); err != nil {
+		return err
+	}
+
+	if btreeIndexPage(pp).len() > 1 {
+		pp = btreeIndexPage(pp).extract(parentIndex)
+		btreeIndexPage(pp).setChild(parentIndex, ph)
+		if err = a.Realloc(parent, pp); err != nil {
+			return err
+		}
+
+		return a.Realloc(ph, p)
+	}
+
+	if err = a.Free(iroot); err != nil {
+		return err
+	}
+
+	if err = a.Realloc(ph, p); err != nil {
+		return err
+	}
+
+	var b7 [7]byte
+	return a.Realloc(root, h2b(b7[:], ph))
+}
+
+// external "root" is stable and contains the real root.
+type btree int64
+
+func newBTree(a btreeStore) (btree, error) {
+	r, err := a.Alloc(zeros[:7])
+	return btree(r), err
+}
+
+func (root btree) String(a btreeStore) string {
+	r := bufs.GCache.Get(16)
+	defer bufs.GCache.Put(r)
+	r, err := a.Get(r, int64(root))
+	if err != nil {
+		panic(err)
+	}
+
+	iroot := b2h(r)
+	m := map[int64]bool{int64(root): true}
+
+	s := []string{fmt.Sprintf("tree %#x -> %#x\n====", root, iroot)}
+	if iroot == 0 {
+		return s[0]
+	}
+
+	var f func(int64, string)
+	f = func(h int64, ind string) {
+		if m[h] {
+			return
+		}
+
+		m[h] = true
+		var b btreePage = bufs.GCache.Get(maxBuf)
+		defer bufs.GCache.Put(b)
+		var err error
+		if b, err = a.Get(b, h); err != nil {
+			panic(err)
+		}
+
+		s = append(s, fmt.Sprintf("%s@%#x", ind, h))
+		switch b.isIndex() {
+		case true:
+			da := []int64{}
+			b := btreeIndexPage(b)
+			for i := 0; i < b.len(); i++ {
+				c, d := b.child(i), b.dataPage(i)
+				s = append(s, fmt.Sprintf("%schild[%d] %#x dataPage[%d] %#x", ind, i, c, i, d))
+				da = append(da, c)
+				da = append(da, d)
+			}
+			i := b.len()
+			c := b.child(i)
+			s = append(s, fmt.Sprintf("%schild[%d] %#x", ind, i, c))
+			for _, c := range da {
+				f(c, ind+"  ")
+			}
+			f(c, ind+"  ")
+		case false:
+			b := btreeDataPage(b)
+			s = append(s, fmt.Sprintf("%sprev %#x next %#x", ind, b.prev(), b.next()))
+			for i := 0; i < b.len(); i++ {
+				k, err := b.key(a, i)
+				if err != nil {
+					panic(err)
+				}
+
+				v, err := b.value(a, i)
+				if err != nil {
+					panic(err)
+				}
+
+				s = append(s, fmt.Sprintf("%sK[%d]|% x| V[%d]|% x|", ind, i, k, i, v))
+			}
+		}
+	}
+
+	f(int64(iroot), "")
+	return strings.Join(s, "\n")
+}
+
+func (root btree) put(dst []byte, a btreeStore, c func(a, b []byte) int, key, value []byte, canOverwrite bool) (prev []byte, err error) {
+	prev, _, err = root.put2(dst, a, c, key, func(key, old []byte) (new []byte, write bool, err error) {
+		new, write = value, true
+		return
+	})
+	return
+}
+
+func (root btree) put2(dst []byte, a btreeStore, c func(a, b []byte) int, key []byte, upd func(key, old []byte) (new []byte, write bool, err error)) (old []byte, written bool, err error) {
+	var r, value []byte
+	if r, err = a.Get(dst, int64(root)); err != nil {
+		return
+	}
+
+	iroot := b2h(r)
+	var h int64
+	if iroot == 0 {
+		p := newBTreeDataPage()
+		defer bufs.GCache.Put(p)
+		if value, written, err = upd(key, nil); err != nil || !written {
+			return
+		}
+
+		if p, err = p.insertItem(a, 0, key, value); err != nil {
+			return
+		}
+
+		h, err = a.Alloc(p)
+		if err != nil {
+			return nil, true, err
+		}
+
+		err = a.Realloc(int64(root), h2b(r, h)[:7])
+		return
+	}
+
+	parentIndex := -1
+	var parent int64
+	ph := iroot
+
+	p := bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(p)
+
+	for {
+		if p, err = a.Get(p[:cap(p)], ph); err != nil {
+			return
+		}
+
+		var index int
+		var ok bool
+
+		if index, ok, err = btreePage(p).find(a, c, key); err != nil {
+			return
+		}
+
+		switch {
+		case ok: // Key found
+			if btreePage(p).isIndex() {
+				ph = btreeIndexPage(p).dataPage(index)
+				if p, err = a.Get(p, ph); err != nil {
+					return
+				}
+
+				if old, err = btreeDataPage(p).valueCopy(a, 0); err != nil {
+					return
+				}
+
+				if value, written, err = upd(key, old); err != nil || !written {
+					return
+				}
+
+				if _, err = btreeDataPage(p).swap(a, 0, value, true); err != nil {
+					return
+				}
+
+				err = a.Realloc(ph, p)
+				return
+			}
+
+			if old, err = btreeDataPage(p).valueCopy(a, index); err != nil {
+				return
+			}
+
+			if value, written, err = upd(key, old); err != nil || !written {
+				return
+			}
+
+			if _, err = btreeDataPage(p).swap(a, index, value, true); err != nil {
+				return
+			}
+
+			err = a.Realloc(ph, p)
+			return
+		case btreePage(p).isIndex():
+			if btreePage(p).len() > 2*kIndex {
+				if p, err = btreeIndexPage(p).split(a, root, &ph, parent, parentIndex, &index); err != nil {
+					return
+				}
+			}
+			parentIndex = index
+			parent = ph
+			ph = btreeIndexPage(p).child(index)
+		default:
+			if value, written, err = upd(key, nil); err != nil || !written {
+				return
+			}
+
+			if btreePage(p).len() < 2*kData { // page is not full
+				if p, err = btreeDataPage(p).insertItem(a, index, key, value); err != nil {
+					return
+				}
+
+				err = a.Realloc(ph, p)
+				return
+			}
+
+			// page is full
+			p, err = btreeDataPage(p).overflow(a, int64(root), ph, parent, parentIndex, index, key, value)
+			return
+		}
+	}
+}
+
+//TODO actually use 'dst' to return 'value'
+func (root btree) get(a btreeStore, dst []byte, c func(a, b []byte) int, key []byte) (b []byte, err error) {
+	var r []byte
+	if r, err = a.Get(dst, int64(root)); err != nil {
+		return
+	}
+
+	iroot := b2h(r)
+	if iroot == 0 {
+		return
+	}
+
+	ph := iroot
+
+	for {
+		var p btreePage
+		if p, err = a.Get(p, ph); err != nil {
+			return
+		}
+
+		var index int
+		var ok bool
+		if index, ok, err = p.find(a, c, key); err != nil {
+			return
+		}
+
+		switch {
+		case ok:
+			if p.isIndex() {
+				dh := btreeIndexPage(p).dataPage(index)
+				dp, err := a.Get(dst, dh)
+				if err != nil {
+					return nil, err
+				}
+
+				return btreeDataPage(dp).value(a, 0)
+			}
+
+			return btreeDataPage(p).value(a, index)
+		case p.isIndex():
+			ph = btreeIndexPage(p).child(index)
+		default:
+			return
+		}
+	}
+}
+
+//TODO actually use 'dst' to return 'value'
+func (root btree) extract(a btreeStore, dst []byte, c func(a, b []byte) int, key []byte) (value []byte, err error) {
+	var r []byte
+	if r, err = a.Get(dst, int64(root)); err != nil {
+		return
+	}
+
+	iroot := b2h(r)
+	if iroot == 0 {
+		return
+	}
+
+	ph := iroot
+	parentIndex := -1
+	var parent int64
+
+	p := bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(p)
+
+	for {
+		if p, err = a.Get(p[:cap(p)], ph); err != nil {
+			return
+		}
+
+		var index int
+		var ok bool
+		if index, ok, err = btreePage(p).find(a, c, key); err != nil {
+			return
+		}
+
+		if ok {
+			if btreePage(p).isIndex() {
+				dph := btreeIndexPage(p).dataPage(index)
+				dp, err := a.Get(dst, dph)
+				if err != nil {
+					return nil, err
+				}
+
+				if btreeDataPage(dp).len() > kData {
+					if dp, value, err = btreeDataPage(dp).extract(a, 0); err != nil {
+						return nil, err
+					}
+
+					return value, a.Realloc(dph, dp)
+				}
+
+				if btreeIndexPage(p).len() < kIndex && ph != iroot {
+					var err error
+					if p, err = btreeIndexPage(p).underflow(a, int64(root), iroot, parent, &ph, parentIndex, &index); err != nil {
+						return nil, err
+					}
+				}
+				parentIndex = index + 1
+				parent = ph
+				ph = btreeIndexPage(p).child(parentIndex)
+				continue
+			}
+
+			p, value, err = btreeDataPage(p).extract(a, index)
+			if btreePage(p).len() >= kData {
+				err = a.Realloc(ph, p)
+				return
+			}
+
+			if ph != iroot {
+				err = btreeDataPage(p).underflow(a, int64(root), iroot, parent, ph, parentIndex)
+				return
+			}
+
+			if btreePage(p).len() == 0 {
+				if err = a.Free(ph); err != nil {
+					return
+				}
+
+				err = a.Realloc(int64(root), zeros[:7])
+				return
+			}
+			err = a.Realloc(ph, p)
+			return
+		}
+
+		if !btreePage(p).isIndex() {
+			return
+		}
+
+		if btreePage(p).len() < kIndex && ph != iroot {
+			if p, err = btreeIndexPage(p).underflow(a, int64(root), iroot, parent, &ph, parentIndex, &index); err != nil {
+				return nil, err
+			}
+		}
+		parentIndex = index
+		parent = ph
+		ph = btreeIndexPage(p).child(index)
+	}
+}
+
+func (root btree) deleteAny(a btreeStore) (bool, error) {
+	r := bufs.GCache.Get(7)
+	defer bufs.GCache.Put(r)
+	var err error
+	if r, err = a.Get(r, int64(root)); err != nil {
+		return false, err
+	}
+
+	iroot := b2h(r)
+	if iroot == 0 {
+		return true, nil
+	}
+
+	ph := iroot
+	parentIndex := -1
+	var parent int64
+	p := bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(p)
+
+	for {
+		if p, err = a.Get(p, ph); err != nil {
+			return false, err
+		}
+
+		index := btreePage(p).len() / 2
+		if btreePage(p).isIndex() {
+			dph := btreeIndexPage(p).dataPage(index)
+			dp := bufs.GCache.Get(maxBuf)
+			defer bufs.GCache.Put(dp)
+			if dp, err = a.Get(dp, dph); err != nil {
+				return false, err
+			}
+
+			if btreeDataPage(dp).len() > kData {
+				if dp, _, err = btreeDataPage(dp).extract(a, 0); err != nil {
+					return false, err
+				}
+
+				return false, a.Realloc(dph, dp)
+			}
+
+			if btreeIndexPage(p).len() < kIndex && ph != iroot {
+				if p, err = btreeIndexPage(p).underflow(a, int64(root), iroot, parent, &ph, parentIndex, &index); err != nil {
+					return false, err
+				}
+			}
+			parentIndex = index + 1
+			parent = ph
+			ph = btreeIndexPage(p).child(parentIndex)
+			continue
+		}
+
+		p, _, err = btreeDataPage(p).extract(a, index)
+		if btreePage(p).len() >= kData {
+			err = a.Realloc(ph, p)
+			return false, err
+		}
+
+		if ph != iroot {
+			err = btreeDataPage(p).underflow(a, int64(root), iroot, parent, ph, parentIndex)
+			return false, err
+		}
+
+		if btreePage(p).len() == 0 {
+			if err = a.Free(ph); err != nil {
+				return true, err
+			}
+
+			return true, a.Realloc(int64(root), zeros[:7])
+		}
+
+		return false, a.Realloc(ph, p)
+	}
+}
+
+func (root btree) first(a btreeStore) (ph int64, p btreeDataPage, err error) {
+	r := bufs.GCache.Get(7)
+	defer bufs.GCache.Put(r)
+	if r, err = a.Get(r, int64(root)); err != nil {
+		return
+	}
+
+	for ph = b2h(r); ph != 0; ph = btreeIndexPage(p).child(0) {
+		if p, err = a.Get(p, ph); err != nil {
+			return
+		}
+
+		if !btreePage(p).isIndex() {
+			break
+		}
+	}
+
+	return
+}
+
+func (root btree) last(a btreeStore) (ph int64, p btreeDataPage, err error) {
+	r := bufs.GCache.Get(7)
+	defer bufs.GCache.Put(r)
+	if r, err = a.Get(r, int64(root)); err != nil {
+		return
+	}
+
+	for ph = b2h(r); ph != 0; ph = btreeIndexPage(p).child(btreeIndexPage(p).len()) {
+		if p, err = a.Get(p, ph); err != nil {
+			return
+		}
+
+		if !btreePage(p).isIndex() {
+			break
+		}
+	}
+
+	return
+}
+
+// key >= p[index].key
+func (root btree) seek(a btreeStore, c func(a, b []byte) int, key []byte) (p btreeDataPage, index int, equal bool, err error) {
+	r := bufs.GCache.Get(7)
+	defer bufs.GCache.Put(r)
+	if r, err = a.Get(r, int64(root)); err != nil {
+		return
+	}
+
+	for ph := b2h(r); ph != 0; ph = btreeIndexPage(p).child(index) {
+		if p, err = a.Get(p, ph); err != nil {
+			break
+		}
+
+		if index, equal, err = btreePage(p).find(a, c, key); err != nil {
+			break
+		}
+
+		if equal {
+			if !btreePage(p).isIndex() {
+				break
+			}
+
+			p, err = a.Get(p, btreeIndexPage(p).dataPage(index))
+			index = 0
+			break
+		}
+
+		if !btreePage(p).isIndex() {
+			break
+		}
+	}
+	return
+}
+
+func (root btree) clear(a btreeStore) (err error) {
+	r := bufs.GCache.Get(7)
+	defer bufs.GCache.Put(r)
+	if r, err = a.Get(r, int64(root)); err != nil {
+		return
+	}
+
+	iroot := b2h(r)
+	if iroot == 0 {
+		return
+	}
+
+	if err = root.clear2(a, iroot); err != nil {
+		return
+	}
+
+	var b [7]byte
+	return a.Realloc(int64(root), b[:])
+}
+
+func (root btree) clear2(a btreeStore, ph int64) (err error) {
+	var p = bufs.GCache.Get(maxBuf)
+	defer bufs.GCache.Put(p)
+	if p, err = a.Get(p, ph); err != nil {
+		return
+	}
+
+	switch btreePage(p).isIndex() {
+	case true:
+		ip := btreeIndexPage(p)
+		for i := 0; i <= ip.len(); i++ {
+			root.clear2(a, ip.child(i))
+
+		}
+	case false:
+		dp := btreeDataPage(p)
+		for i := 0; i < dp.len(); i++ {
+			if err = dp.setKey(a, i, nil); err != nil {
+				return
+			}
+
+			if err = dp.setValue(a, i, nil); err != nil {
+				return
+			}
+		}
+	}
+	return a.Free(ph)
+}
diff --git a/vendor/github.com/cznic/exp/lldb/errors.go b/vendor/github.com/cznic/exp/lldb/errors.go
new file mode 100644
index 0000000000..7dffe7f10c
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/errors.go
@@ -0,0 +1,170 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Some errors returned by this package.
+//
+// Note that this package can return more errors than declared here, for
+// example io.EOF from Filer.ReadAt().
+
+package lldb
+
+import (
+	"fmt"
+)
+
+// ErrDecodeScalars is possibly returned from DecodeScalars
+type ErrDecodeScalars struct {
+	B []byte // Data being decoded
+	I int    // offending offset
+}
+
+// Error implements the built in error type.
+func (e *ErrDecodeScalars) Error() string {
+	return fmt.Sprintf("DecodeScalars: corrupted data @ %d/%d", e.I, len(e.B))
+}
+
+// ErrINVAL reports invalid values passed as parameters, for example negative
+// offsets where only non-negative ones are allowed or read from the DB.
+type ErrINVAL struct {
+	Src string
+	Val interface{}
+}
+
+// Error implements the built in error type.
+func (e *ErrINVAL) Error() string {
+	return fmt.Sprintf("%s: %+v", e.Src, e.Val)
+}
+
+// ErrPERM is for example reported when a Filer is closed while BeginUpdate(s)
+// are not balanced with EndUpdate(s)/Rollback(s) or when EndUpdate or Rollback
+// is invoked which is not paired with a BeginUpdate.
+type ErrPERM struct {
+	Src string
+}
+
+// Error implements the built in error type.
+func (e *ErrPERM) Error() string {
+	return fmt.Sprintf("%s: Operation not permitted", string(e.Src))
+}
+
+// ErrTag represents an ErrILSEQ kind.
+type ErrType int
+
+// ErrILSEQ types
+const (
+	ErrOther ErrType = iota
+
+	ErrAdjacentFree          // Adjacent free blocks (.Off and .Arg)
+	ErrDecompress            // Used compressed block: corrupted compression
+	ErrExpFreeTag            // Expected a free block tag, got .Arg
+	ErrExpUsedTag            // Expected a used block tag, got .Arg
+	ErrFLT                   // Free block is invalid or referenced multiple times
+	ErrFLTLoad               // FLT truncated to .Off, need size >= .Arg
+	ErrFLTSize               // Free block size (.Arg) doesn't belong to its list min size: .Arg2
+	ErrFileSize              // File .Name size (.Arg) != 0 (mod 16)
+	ErrFreeChaining          // Free block, .prev.next doesn't point back to this block
+	ErrFreeTailBlock         // Last block is free
+	ErrHead                  // Head of a free block list has non zero Prev (.Arg)
+	ErrInvalidRelocTarget    // Reloc doesn't target (.Arg) a short or long used block
+	ErrInvalidWAL            // Corrupted write ahead log. .Name: file name, .More: more
+	ErrLongFreeBlkTooLong    // Long free block spans beyond EOF, size .Arg
+	ErrLongFreeBlkTooShort   // Long free block must have at least 2 atoms, got only .Arg
+	ErrLongFreeNextBeyondEOF // Long free block .Next (.Arg) spans beyond EOF
+	ErrLongFreePrevBeyondEOF // Long free block .Prev (.Arg) spans beyond EOF
+	ErrLongFreeTailTag       // Expected a long free block tail tag, got .Arg
+	ErrLostFreeBlock         // Free block is not in any FLT list
+	ErrNullReloc             // Used reloc block with nil target
+	ErrRelocBeyondEOF        // Used reloc points (.Arg) beyond EOF
+	ErrShortFreeTailTag      // Expected a short free block tail tag, got .Arg
+	ErrSmall                 // Request for a free block (.Arg) returned a too small one (.Arg2) at .Off
+	ErrTailTag               // Block at .Off has invalid tail CC (compression code) tag, got .Arg
+	ErrUnexpReloc            // Unexpected reloc block referred to from reloc block .Arg
+	ErrVerifyPadding         // Used block has nonzero padding
+	ErrVerifyTailSize        // Long free block size .Arg but tail size .Arg2
+	ErrVerifyUsedSpan        // Used block size (.Arg) spans beyond EOF
+)
+
+// ErrILSEQ reports a corrupted file format. Details in fields according to Type.
+type ErrILSEQ struct {
+	Type ErrType
+	Off  int64
+	Arg  int64
+	Arg2 int64
+	Arg3 int64
+	Name string
+	More interface{}
+}
+
+// Error implements the built in error type.
+func (e *ErrILSEQ) Error() string {
+	switch e.Type {
+	case ErrAdjacentFree:
+		return fmt.Sprintf("Adjacent free blocks at offset %#x and %#x", e.Off, e.Arg)
+	case ErrDecompress:
+		return fmt.Sprintf("Compressed block at offset %#x: Corrupted compressed content", e.Off)
+	case ErrExpFreeTag:
+		return fmt.Sprintf("Block at offset %#x: Expected a free block tag, got %#2x", e.Off, e.Arg)
+	case ErrExpUsedTag:
+		return fmt.Sprintf("Block at ofset %#x: Expected a used block tag, got %#2x", e.Off, e.Arg)
+	case ErrFLT:
+		return fmt.Sprintf("Free block at offset %#x is invalid or referenced multiple times", e.Off)
+	case ErrFLTLoad:
+		return fmt.Sprintf("FLT truncated to size %d, expected at least %d", e.Off, e.Arg)
+	case ErrFLTSize:
+		return fmt.Sprintf("Free block at offset %#x has size (%#x) should be at least (%#x)", e.Off, e.Arg, e.Arg2)
+	case ErrFileSize:
+		return fmt.Sprintf("File %q size (%#x) != 0 (mod 16)", e.Name, e.Arg)
+	case ErrFreeChaining:
+		return fmt.Sprintf("Free block at offset %#x: .prev.next doesn point back here.", e.Off)
+	case ErrFreeTailBlock:
+		return fmt.Sprintf("Free block at offset %#x: Cannot be last file block", e.Off)
+	case ErrHead:
+		return fmt.Sprintf("Block at offset %#x: Head of free block list has non zero .prev %#x", e.Off, e.Arg)
+	case ErrInvalidRelocTarget:
+		return fmt.Sprintf("Used reloc block at offset %#x: Target (%#x) is not a short or long used block", e.Off, e.Arg)
+	case ErrInvalidWAL:
+		return fmt.Sprintf("Corrupted write ahead log file: %q %v", e.Name, e.More)
+	case ErrLongFreeBlkTooLong:
+		return fmt.Sprintf("Long free block at offset %#x: Size (%#x) beyond EOF", e.Off, e.Arg)
+	case ErrLongFreeBlkTooShort:
+		return fmt.Sprintf("Long free block at offset %#x: Size (%#x) too small", e.Off, e.Arg)
+	case ErrLongFreeNextBeyondEOF:
+		return fmt.Sprintf("Long free block at offset %#x: Next (%#x) points beyond EOF", e.Off, e.Arg)
+	case ErrLongFreePrevBeyondEOF:
+		return fmt.Sprintf("Long free block at offset %#x: Prev (%#x) points beyond EOF", e.Off, e.Arg)
+	case ErrLongFreeTailTag:
+		return fmt.Sprintf("Block at offset %#x: Expected long free tail tag, got %#2x", e.Off, e.Arg)
+	case ErrLostFreeBlock:
+		return fmt.Sprintf("Free block at offset %#x: not in any FLT list", e.Off)
+	case ErrNullReloc:
+		return fmt.Sprintf("Used reloc block at offset %#x: Nil target", e.Off)
+	case ErrRelocBeyondEOF:
+		return fmt.Sprintf("Used reloc block at offset %#x: Link (%#x) points beyond EOF", e.Off, e.Arg)
+	case ErrShortFreeTailTag:
+		return fmt.Sprintf("Block at offset %#x: Expected short free tail tag, got %#2x", e.Off, e.Arg)
+	case ErrSmall:
+		return fmt.Sprintf("Request for of free block of size %d returned a too small (%d) one at offset %#x", e.Arg, e.Arg2, e.Off)
+	case ErrTailTag:
+		return fmt.Sprintf("Block at offset %#x: Invalid tail CC tag, got %#2x", e.Off, e.Arg)
+	case ErrUnexpReloc:
+		return fmt.Sprintf("Block at offset %#x: Unexpected reloc block. Referred to from reloc block at offset %#x", e.Off, e.Arg)
+	case ErrVerifyPadding:
+		return fmt.Sprintf("Used block at offset %#x: Nonzero padding", e.Off)
+	case ErrVerifyTailSize:
+		return fmt.Sprintf("Long free block at offset %#x: Size %#x, but tail size %#x", e.Off, e.Arg, e.Arg2)
+	case ErrVerifyUsedSpan:
+		return fmt.Sprintf("Used block at offset %#x: Size %#x spans beyond EOF", e.Off, e.Arg)
+	}
+
+	more := ""
+	if e.More != nil {
+		more = fmt.Sprintf(", %v", e.More)
+	}
+	off := ""
+	if e.Off != 0 {
+		off = fmt.Sprintf(", off: %#x", e.Off)
+	}
+
+	return fmt.Sprintf("Error%s%s", off, more)
+}
diff --git a/vendor/github.com/cznic/exp/lldb/falloc.go b/vendor/github.com/cznic/exp/lldb/falloc.go
new file mode 100644
index 0000000000..2969036e24
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/falloc.go
@@ -0,0 +1,1981 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// The storage space management.
+
+package lldb
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"sort"
+	"strings"
+	"sync"
+
+	"github.com/cznic/bufs"
+	"github.com/cznic/mathutil"
+	"github.com/cznic/zappy"
+)
+
+const (
+	maxBuf = maxRq + 20 // bufs,Buffers.Alloc
+)
+
+// Options are passed to the NewAllocator to amend some configuration.  The
+// compatibility promise is the same as of struct types in the Go standard
+// library - introducing changes can be made only by adding new exported
+// fields, which is backward compatible as long as client code uses field names
+// to assign values of imported struct types literals.
+//
+// NOTE: No options are currently defined.
+type Options struct{}
+
+// AllocStats record statistics about a Filer. It can be optionally filled by
+// Allocator.Verify, if successful.
+type AllocStats struct {
+	Handles     int64           // total valid handles in use
+	Compression int64           // number of compressed blocks
+	TotalAtoms  int64           // total number of atoms == AllocAtoms + FreeAtoms
+	AllocBytes  int64           // bytes allocated (after decompression, if/where used)
+	AllocAtoms  int64           // atoms allocated/used, including relocation atoms
+	Relocations int64           // number of relocated used blocks
+	FreeAtoms   int64           // atoms unused
+	AllocMap    map[int64]int64 // allocated block size in atoms -> count of such blocks
+	FreeMap     map[int64]int64 // free block size in atoms -> count of such blocks
+}
+
+/*
+
+Allocator implements "raw" storage space management (allocation and
+deallocation) for a low level of a DB engine.  The storage is an abstraction
+provided by a Filer.
+
+The terms MUST or MUST NOT, if/where used in the documentation of Allocator,
+written in all caps as seen here, are a requirement for any possible
+alternative implementations aiming for compatibility with this one.
+
+Filer file
+
+A Filer file, or simply 'file', is a linear, contiguous sequence of blocks.
+Blocks may be either free (currently unused) or allocated (currently used).
+Some blocks may eventually become virtual in a sense as they may not be
+realized in the storage (sparse files).
+
+Free Lists Table
+
+File starts with a FLT. This table records heads of 14 doubly linked free
+lists. The zero based index (I) vs minimal size of free blocks in that list,
+except the last one which registers free blocks of size 4112+ atoms:
+
+	MinSize == 2^I
+
+	For example 0 -> 1, 1 -> 2, ... 12 -> 4096.
+
+Each entry in the FLT is 8 bytes in netwtork order, MSB MUST be zero, ie. the
+slot value is effectively only 7 bytes. The value is the handle of the head of
+the respective doubly linked free list. The FLT size is 14*8 == 112(0x70)
+bytes. If the free blocks list for any particular size is empty, the respective
+FLT slot is zero. Sizes of free blocks in one list MUST NOT overlap with sizes
+of free lists in other list. For example, even though a free block of size 2
+technically is of minimal size >= 1, it MUST NOT be put to the list for slot 0
+(minimal size 1), but in slot 1( minimal size 2).
+
+	slot 0:		sizes [1, 2)
+	slot 1:		sizes [2, 4)
+	slot 2:		sizes [4, 8)
+	...
+	slot 11:	sizes [2048, 4096)
+	slot 12:	sizes [4096, 4112)
+	slot 13:	sizes [4112, inf)
+
+The last FLT slot collects all free blocks bigger than its minimal size. That
+still respects the 'no overlap' invariant.
+
+File blocks
+
+A block is a linear, contiguous sequence of atoms. The first and last atoms of
+a block provide information about, for example, whether the block is free or
+used, what is the size of the block, etc.  Details are discussed elsewhere. The
+first block of a file starts immediately after FLT, ie. at file offset
+112(0x70).
+
+Block atoms
+
+An atom is a fixed size piece of a block (and thus of a file too); it is 16
+bytes long. A consequence is that for a valid file:
+
+ filesize == 0 (mod 16)
+
+The first atom of the first block is considered to be atom #1.
+
+Block handles
+
+A handle is an integer referring to a block. The reference is the number of the
+atom the block starts with. Put in other way:
+
+ handle == offset/16 - 6
+ offset == 16 * (handle + 6)
+
+`offset` is the offset of the first byte of the block, measured in bytes
+- as in fseek(3). Handle has type `int64`, but only the lower 7 bytes may be
+nonzero while referring to a block, both in code as well as when persisted in
+the the file's internal bookkeeping structures - see 'Block types' bellow. So a
+handle is effectively only `uint56`.  This also means that the maximum usable
+size of a file is 2^56 atoms.  That is 2^60 bytes == 1 exabyte (10^18 bytes).
+
+Nil handles
+
+A handle with numeric value of '0' refers to no block.
+
+Zero padding
+
+A padding is used to round-up a block size to be a whole number of atoms. Any
+padding, if present, MUST be all zero bytes. Note that the size of padding is
+in [0, 15].
+
+Content wiping
+
+When a block is deallocated, its data content is not wiped as the added
+overhead may be substantial while not necessarily needed. Client code should
+however overwrite the content of any block having sensitive data with eg. zeros
+(good compression) - before deallocating the block.
+
+Block tags
+
+Every block is tagged in its first byte (a head tag) and last byte (tail tag).
+Block types are:
+
+ 1. Short content used block (head tags 0x00-0xFB)
+ 2. Long content used block (head tag 0xFC)
+ 3. Relocated used block (head tag 0xFD)
+ 4. Short, single atom, free block (head tag 0xFE)
+ 5. Long free block (head tag 0xFF)
+
+Note: Relocated used block, 3. above (head tag 0xFD) MUST NOT refer to blocks
+other then 1. or 2. above (head tags 0x00-0xFC).
+
+Content blocks
+
+Used blocks (head tags 0x00-0xFC) tail tag distinguish used/unused block and if
+content is compressed or not.
+
+Content compression
+
+The tail flag of an used block is one of
+
+	CC == 0 // Content is not compressed.
+	CC == 1 // Content is in zappy compression format.
+
+If compression of written content is enabled, there are two cases: If
+compressed size < original size then the compressed content should be written
+if it will save at least one atom of the block. If compressed size >= original
+size then the compressed content should not be used.
+
+It's recommended to use compression. For example the BTrees implementation
+assumes compression is used. Using compression may cause a slowdown in some
+cases while it may as well cause a speedup.
+
+Short content block
+
+Short content block carries content of length between N == 0(0x00) and N ==
+251(0xFB) bytes.
+
+	|<-first atom start  ...  last atom end->|
+	+---++--   ...   --+--   ...   --++------+
+	| 0 ||    1...     |  0x*...0x*E || 0x*F |
+	+---++--   ...   --+--   ...   --++------+
+	| N ||   content   |   padding   ||  CC  |
+	+---++--   ...   --+--   ...   --++------+
+
+	A == (N+1)/16 + 1        // The number of atoms in the block [1, 16]
+	padding == 15 - (N+1)%16 // Length of the zero padding
+
+Long content block
+
+Long content block carries content of length between N == 252(0xFC) and N ==
+65787(0x100FB) bytes.
+
+	|<-first atom start    ...     last atom end->|
+	+------++------+-- ... --+--  ...   --++------+
+	|  0   || 1..2 |   3...  | 0x*...0x*E || 0x*F |
+	+------++------+-- ... --+--  ...   --++------+
+	| 0xFC ||  M   | content |  padding   ||  CC  |
+	+------++------+-- ... --+--  ...   --++------+
+
+	A == (N+3)/16 + 1        // The number of atoms in the block [16, 4112]
+	M == N % 0x10000         // Stored as 2 bytes in network byte order
+	padding == 15 - (N+3)%16 // Length of the zero padding
+
+Relocated used block
+
+Relocated block allows to permanently assign a handle to some content and
+resize the content anytime afterwards without having to update all the possible
+existing references; the handle can be constant while the content size may be
+dynamic. When relocating a block, any space left by the original block content,
+above this single atom block, MUST be reclaimed.
+
+Relocations MUST point only to a used short or long block == blocks with tags
+0x00...0xFC.
+
+	+------++------+---------++----+
+	|  0   || 1..7 | 8...14  || 15 |
+	+------++------+---------++----+
+	| 0xFD ||  H   | padding || 0  |
+	+------++------+---------++----+
+
+H is the handle of the relocated block in network byte order.
+
+Free blocks
+
+Free blocks are the result of space deallocation. Free blocks are organized in
+one or more doubly linked lists, abstracted by the FLT interface. Free blocks
+MUST be "registered" by putting them in such list. Allocator MUST reuse a big
+enough free block, if such exists, before growing the file size. When a free
+block is created by deallocation or reallocation it MUST be joined with any
+adjacently existing free blocks before "registering". If the resulting free
+block is now a last block of a file, the free block MUST be discarded and the
+file size MUST be truncated accordingly instead. Put differently, there MUST
+NOT ever be a free block at the file end.
+
+A single free atom
+
+Is an unused block of size 1 atom.
+
+	+------++------+--------++------+
+	|  0   || 1..7 | 8...14 ||  15  |
+	+------++------+--------++------+
+	| 0xFE ||  P   |   N    || 0xFE |
+	+------++------+--------++------+
+
+P and N, stored in network byte order, are the previous and next free block
+handles in the doubly linked list to which this free block belongs.
+
+A long unused block
+
+Is an unused block of size > 1 atom.
+
+	+------++------+-------+---------+- ... -+----------++------+
+	|  0   || 1..7 | 8..14 | 15...21 |       | Z-7..Z-1 ||  Z   |
+	+------++------+-------+---------+- ... -+----------++------+
+	| 0xFF ||  S   |   P   |    N    | Leak  |    S     || 0xFF |
+	+------++------+-------+---------+- ... -+----------++------+
+
+	Z == 16 * S - 1
+
+S is the size of this unused block in atoms. P and N are the previous and next
+free block handles in the doubly linked list to which this free block belongs.
+Leak contains any data the block had before deallocating this block.  See also
+the subtitle 'Content wiping' above. S, P and N are stored in network byte
+order. Large free blocks may trigger a consideration of file hole punching of
+the Leak field - for some value of 'large'.
+
+Note: Allocator methods vs CRUD[1]:
+
+	Alloc	[C]reate
+	Get	[R]ead
+	Realloc	[U]pdate
+	Free	[D]elete
+
+Note: No Allocator method returns io.EOF.
+
+  [1]: http://en.wikipedia.org/wiki/Create,_read,_update_and_delete
+
+*/
+type Allocator struct {
+	f        Filer
+	flt      flt
+	Compress bool // enables content compression
+	cache    cache
+	m        map[int64]*node
+	lru      lst
+	expHit   int64
+	expMiss  int64
+	cacheSz  int
+	hit      uint16
+	miss     uint16
+	mu       sync.Mutex
+}
+
+// NewAllocator returns a new Allocator. To open an existing file, pass its
+// Filer. To create a "new" file, pass a Filer which file is of zero size.
+func NewAllocator(f Filer, opts *Options) (a *Allocator, err error) {
+	if opts == nil { // Enforce *Options is always passed
+		return nil, errors.New("NewAllocator: nil opts passed")
+	}
+
+	a = &Allocator{
+		f:       f,
+		cacheSz: 10,
+	}
+
+	a.cinit()
+	switch x := f.(type) {
+	case *RollbackFiler:
+		x.afterRollback = func() error {
+			a.cinit()
+			return a.flt.load(a.f, 0)
+		}
+	case *ACIDFiler0:
+		x.RollbackFiler.afterRollback = func() error {
+			a.cinit()
+			return a.flt.load(a.f, 0)
+		}
+	}
+
+	sz, err := f.Size()
+	if err != nil {
+		return
+	}
+
+	a.flt.init()
+	if sz == 0 {
+		var b [fltSz]byte
+		if err = a.f.BeginUpdate(); err != nil {
+			return
+		}
+
+		if _, err = f.WriteAt(b[:], 0); err != nil {
+			a.f.Rollback()
+			return
+		}
+
+		return a, a.f.EndUpdate()
+	}
+
+	return a, a.flt.load(f, 0)
+}
+
+// CacheStats reports cache statistics.
+//
+//TODO return a struct perhaps.
+func (a *Allocator) CacheStats() (buffersUsed, buffersTotal int, bytesUsed, bytesTotal, hits, misses int64) {
+	buffersUsed = len(a.m)
+	buffersTotal = buffersUsed + len(a.cache)
+	bytesUsed = a.lru.size()
+	bytesTotal = bytesUsed + a.cache.size()
+	hits = a.expHit
+	misses = a.expMiss
+	return
+}
+
+func (a *Allocator) cinit() {
+	for h, n := range a.m {
+		a.cache.put(a.lru.remove(n))
+		delete(a.m, h)
+	}
+	if a.m == nil {
+		a.m = map[int64]*node{}
+	}
+}
+
+func (a *Allocator) cadd(b []byte, h int64) {
+	if len(a.m) < a.cacheSz {
+		n := a.cache.get(len(b))
+		n.h = h
+		copy(n.b, b)
+		a.m[h] = a.lru.pushFront(n)
+		return
+	}
+
+	// cache full
+	delete(a.m, a.cache.put(a.lru.removeBack()).h)
+	n := a.cache.get(len(b))
+	n.h = h
+	copy(n.b, b)
+	a.m[h] = a.lru.pushFront(n)
+	return
+}
+
+func (a *Allocator) cfree(h int64) {
+	n, ok := a.m[h]
+	if !ok { // must have been evicted
+		return
+	}
+
+	a.cache.put(a.lru.remove(n))
+	delete(a.m, h)
+}
+
+// Alloc allocates storage space for b and returns the handle of the new block
+// with content set to b or an error, if any. The returned handle is valid only
+// while the block is used - until the block is deallocated. No two valid
+// handles share the same value within the same Filer, but any value of a
+// handle not referring to any used block may become valid any time as a result
+// of Alloc.
+//
+// Invoking Alloc on an empty Allocator is guaranteed to return handle with
+// value 1. The intended use of content of handle 1 is a root "directory" of
+// other data held by an Allocator.
+//
+// Passing handles not obtained initially from Alloc or not anymore valid to
+// any other Allocator methods can result in an irreparably corrupted database.
+func (a *Allocator) Alloc(b []byte) (handle int64, err error) {
+	buf := bufs.GCache.Get(zappy.MaxEncodedLen(len(b)))
+	defer bufs.GCache.Put(buf)
+	buf, _, cc, err := a.makeUsedBlock(buf, b)
+	if err != nil {
+		return
+	}
+
+	if handle, err = a.alloc(buf, cc); err == nil {
+		a.cadd(b, handle)
+	}
+	return
+}
+
+func (a *Allocator) alloc(b []byte, cc byte) (h int64, err error) {
+	rqAtoms := n2atoms(len(b))
+	if h = a.flt.find(rqAtoms); h == 0 { // must grow
+		var sz int64
+		if sz, err = a.f.Size(); err != nil {
+			return
+		}
+
+		h = off2h(sz)
+		err = a.writeUsedBlock(h, cc, b)
+		return
+	}
+
+	// Handle is the first item of a free blocks list.
+	tag, s, prev, next, err := a.nfo(h)
+	if err != nil {
+		return
+	}
+
+	if tag != tagFreeShort && tag != tagFreeLong {
+		err = &ErrILSEQ{Type: ErrExpFreeTag, Off: h2off(h), Arg: int64(tag)}
+		return
+	}
+
+	if prev != 0 {
+		err = &ErrILSEQ{Type: ErrHead, Off: h2off(h), Arg: prev}
+		return
+	}
+
+	if s < int64(rqAtoms) {
+		err = &ErrILSEQ{Type: ErrSmall, Arg: int64(rqAtoms), Arg2: s, Off: h2off(h)}
+		return
+	}
+
+	if err = a.unlink(h, s, prev, next); err != nil {
+		return
+	}
+
+	if s > int64(rqAtoms) {
+		freeH := h + int64(rqAtoms)
+		freeAtoms := s - int64(rqAtoms)
+		if err = a.link(freeH, freeAtoms); err != nil {
+			return
+		}
+	}
+	return h, a.writeUsedBlock(h, cc, b)
+}
+
+// Free deallocates the block referred to by handle or returns an error, if
+// any.
+//
+// After Free succeeds, handle is invalid and must not be used.
+//
+// Handle must have been obtained initially from Alloc and must be still valid,
+// otherwise a database may get irreparably corrupted.
+func (a *Allocator) Free(handle int64) (err error) {
+	if handle <= 0 || handle > maxHandle {
+		return &ErrINVAL{"Allocator.Free: handle out of limits", handle}
+	}
+
+	a.cfree(handle)
+	return a.free(handle, 0, true)
+}
+
+func (a *Allocator) free(h, from int64, acceptRelocs bool) (err error) {
+	tag, atoms, _, n, err := a.nfo(h)
+	if err != nil {
+		return
+	}
+
+	switch tag {
+	default:
+		// nop
+	case tagUsedLong:
+		// nop
+	case tagUsedRelocated:
+		if !acceptRelocs {
+			return &ErrILSEQ{Type: ErrUnexpReloc, Off: h2off(h), Arg: h2off(from)}
+		}
+
+		if err = a.free(n, h, false); err != nil {
+			return
+		}
+	case tagFreeShort, tagFreeLong:
+		return &ErrINVAL{"Allocator.Free: attempt to free a free block at off", h2off(h)}
+	}
+
+	return a.free2(h, atoms)
+}
+
+func (a *Allocator) free2(h, atoms int64) (err error) {
+	sz, err := a.f.Size()
+	if err != nil {
+		return
+	}
+
+	ltag, latoms, lp, ln, err := a.leftNfo(h)
+	if err != nil {
+		return
+	}
+
+	if ltag != tagFreeShort && ltag != tagFreeLong {
+		latoms = 0
+	}
+
+	var rtag byte
+	var ratoms, rp, rn int64
+
+	isTail := h2off(h)+atoms*16 == sz
+	if !isTail {
+		if rtag, ratoms, rp, rn, err = a.nfo(h + atoms); err != nil {
+			return
+		}
+	}
+
+	if rtag != tagFreeShort && rtag != tagFreeLong {
+		ratoms = 0
+	}
+
+	switch {
+	case latoms == 0 && ratoms == 0:
+		// -> isolated <-
+		if isTail { // cut tail
+			return a.f.Truncate(h2off(h))
+		}
+
+		return a.link(h, atoms)
+	case latoms == 0 && ratoms != 0:
+		// right join ->
+		if err = a.unlink(h+atoms, ratoms, rp, rn); err != nil {
+			return
+		}
+
+		return a.link(h, atoms+ratoms)
+	case latoms != 0 && ratoms == 0:
+		// <- left join
+		if err = a.unlink(h-latoms, latoms, lp, ln); err != nil {
+			return
+		}
+
+		if isTail {
+			return a.f.Truncate(h2off(h - latoms))
+		}
+
+		return a.link(h-latoms, latoms+atoms)
+	}
+
+	// case latoms != 0 && ratoms != 0:
+	// <- middle join ->
+	lh, rh := h-latoms, h+atoms
+	if err = a.unlink(lh, latoms, lp, ln); err != nil {
+		return
+	}
+
+	// Prev unlink may have invalidated rp or rn
+	if _, _, rp, rn, err = a.nfo(rh); err != nil {
+		return
+	}
+
+	if err = a.unlink(rh, ratoms, rp, rn); err != nil {
+		return
+	}
+
+	return a.link(h-latoms, latoms+atoms+ratoms)
+}
+
+// Add a free block h to the appropriate free list
+func (a *Allocator) link(h, atoms int64) (err error) {
+	if err = a.makeFree(h, atoms, 0, a.flt.head(atoms)); err != nil {
+		return
+	}
+
+	return a.flt.setHead(h, atoms, a.f)
+}
+
+// Remove free block h from the free list
+func (a *Allocator) unlink(h, atoms, p, n int64) (err error) {
+	switch {
+	case p == 0 && n == 0:
+		// single item list, must be head
+		return a.flt.setHead(0, atoms, a.f)
+	case p == 0 && n != 0:
+		// head of list (has next item[s])
+		if err = a.prev(n, 0); err != nil {
+			return
+		}
+
+		// new head
+		return a.flt.setHead(n, atoms, a.f)
+	case p != 0 && n == 0:
+		// last item in list
+		return a.next(p, 0)
+	}
+	// case p != 0 && n != 0:
+	// intermediate item in a list
+	if err = a.next(p, n); err != nil {
+		return
+	}
+
+	return a.prev(n, p)
+}
+
+//TODO remove ?
+// Return len(slice) == n, reuse src if possible.
+func need(n int, src []byte) []byte {
+	if cap(src) < n {
+		bufs.GCache.Put(src)
+		return bufs.GCache.Get(n)
+	}
+
+	return src[:n]
+}
+
+// Get returns the data content of a block referred to by handle or an error if
+// any.  The returned slice may be a sub-slice of buf if buf was large enough
+// to hold the entire content.  Otherwise, a newly allocated slice will be
+// returned.  It is valid to pass a nil buf.
+//
+// If the content was stored using compression then it is transparently
+// returned decompressed.
+//
+// Handle must have been obtained initially from Alloc and must be still valid,
+// otherwise invalid data may be returned without detecting the error.
+//
+// Get is safe for concurrent access by multiple goroutines iff no other
+// goroutine mutates the DB.
+func (a *Allocator) Get(buf []byte, handle int64) (b []byte, err error) {
+	buf = buf[:cap(buf)]
+	a.mu.Lock() // X1+
+	if n, ok := a.m[handle]; ok {
+		a.lru.moveToFront(n)
+		b = need(len(n.b), buf)
+		copy(b, n.b)
+		a.expHit++
+		a.hit++
+		a.mu.Unlock() // X1-
+		return
+	}
+
+	a.expMiss++
+	a.miss++
+	if a.miss > 10 && len(a.m) < 500 {
+		if 100*a.hit/a.miss < 95 {
+			a.cacheSz++
+		}
+		a.hit, a.miss = 0, 0
+	}
+	a.mu.Unlock() // X1-
+
+	defer func(h int64) {
+		if err == nil {
+			a.mu.Lock() // X2+
+			a.cadd(b, h)
+			a.mu.Unlock() // X2-
+		}
+	}(handle)
+
+	first := bufs.GCache.Get(16)
+	defer bufs.GCache.Put(first)
+	relocated := false
+	relocSrc := handle
+reloc:
+	if handle <= 0 || handle > maxHandle {
+		return nil, &ErrINVAL{"Allocator.Get: handle out of limits", handle}
+	}
+
+	off := h2off(handle)
+	if err = a.read(first, off); err != nil {
+		return
+	}
+
+	switch tag := first[0]; tag {
+	default:
+		dlen := int(tag)
+		atoms := n2atoms(dlen)
+		switch atoms {
+		case 1:
+			switch tag := first[15]; tag {
+			default:
+				return nil, &ErrILSEQ{Type: ErrTailTag, Off: off, Arg: int64(tag)}
+			case tagNotCompressed:
+				b = need(dlen, buf)
+				copy(b, first[1:])
+				return
+			case tagCompressed:
+				return zappy.Decode(buf, first[1:dlen+1])
+			}
+		default:
+			cc := bufs.GCache.Get(1)
+			defer bufs.GCache.Put(cc)
+			dlen := int(tag)
+			atoms := n2atoms(dlen)
+			tailOff := off + 16*int64(atoms) - 1
+			if err = a.read(cc, tailOff); err != nil {
+				return
+			}
+
+			switch tag := cc[0]; tag {
+			default:
+				return nil, &ErrILSEQ{Type: ErrTailTag, Off: off, Arg: int64(tag)}
+			case tagNotCompressed:
+				b = need(dlen, buf)
+				off += 1
+				if err = a.read(b, off); err != nil {
+					b = buf[:0]
+				}
+				return
+			case tagCompressed:
+				zbuf := bufs.GCache.Get(dlen)
+				defer bufs.GCache.Put(zbuf)
+				off += 1
+				if err = a.read(zbuf, off); err != nil {
+					return buf[:0], err
+				}
+
+				return zappy.Decode(buf, zbuf)
+			}
+		}
+	case 0:
+		return buf[:0], nil
+	case tagUsedLong:
+		cc := bufs.GCache.Get(1)
+		defer bufs.GCache.Put(cc)
+		dlen := m2n(int(first[1])<<8 | int(first[2]))
+		atoms := n2atoms(dlen)
+		tailOff := off + 16*int64(atoms) - 1
+		if err = a.read(cc, tailOff); err != nil {
+			return
+		}
+
+		switch tag := cc[0]; tag {
+		default:
+			return nil, &ErrILSEQ{Type: ErrTailTag, Off: off, Arg: int64(tag)}
+		case tagNotCompressed:
+			b = need(dlen, buf)
+			off += 3
+			if err = a.read(b, off); err != nil {
+				b = buf[:0]
+			}
+			return
+		case tagCompressed:
+			zbuf := bufs.GCache.Get(dlen)
+			defer bufs.GCache.Put(zbuf)
+			off += 3
+			if err = a.read(zbuf, off); err != nil {
+				return buf[:0], err
+			}
+
+			return zappy.Decode(buf, zbuf)
+		}
+	case tagFreeShort, tagFreeLong:
+		return nil, &ErrILSEQ{Type: ErrExpUsedTag, Off: off, Arg: int64(tag)}
+	case tagUsedRelocated:
+		if relocated {
+			return nil, &ErrILSEQ{Type: ErrUnexpReloc, Off: off, Arg: relocSrc}
+		}
+
+		handle = b2h(first[1:])
+		relocated = true
+		goto reloc
+	}
+}
+
+var reallocTestHook bool
+
+// Realloc sets the content of a block referred to by handle or returns an
+// error, if any.
+//
+// Handle must have been obtained initially from Alloc and must be still valid,
+// otherwise a database may get irreparably corrupted.
+func (a *Allocator) Realloc(handle int64, b []byte) (err error) {
+	if handle <= 0 || handle > maxHandle {
+		return &ErrINVAL{"Realloc: handle out of limits", handle}
+	}
+
+	a.cfree(handle)
+	if err = a.realloc(handle, b); err != nil {
+		return
+	}
+
+	if reallocTestHook {
+		if err = cacheAudit(a.m, &a.lru); err != nil {
+			return
+		}
+	}
+
+	a.cadd(b, handle)
+	return
+}
+
+func (a *Allocator) realloc(handle int64, b []byte) (err error) {
+	var dlen, needAtoms0 int
+
+	b8 := bufs.GCache.Get(8)
+	defer bufs.GCache.Put(b8)
+	dst := bufs.GCache.Get(zappy.MaxEncodedLen(len(b)))
+	defer bufs.GCache.Put(dst)
+	b, needAtoms0, cc, err := a.makeUsedBlock(dst, b)
+	if err != nil {
+		return
+	}
+
+	needAtoms := int64(needAtoms0)
+	off := h2off(handle)
+	if err = a.read(b8[:], off); err != nil {
+		return
+	}
+
+	switch tag := b8[0]; tag {
+	default:
+		dlen = int(b8[0])
+	case tagUsedLong:
+		dlen = m2n(int(b8[1])<<8 | int(b8[2]))
+	case tagUsedRelocated:
+		if err = a.free(b2h(b8[1:]), handle, false); err != nil {
+			return err
+		}
+
+		dlen = 0
+	case tagFreeShort, tagFreeLong:
+		return &ErrINVAL{"Allocator.Realloc: invalid handle", handle}
+	}
+
+	atoms := int64(n2atoms(dlen))
+retry:
+	switch {
+	case needAtoms < atoms:
+		// in place shrink
+		if err = a.writeUsedBlock(handle, cc, b); err != nil {
+			return
+		}
+
+		fh, fa := handle+needAtoms, atoms-needAtoms
+		sz, err := a.f.Size()
+		if err != nil {
+			return err
+		}
+
+		if h2off(fh)+16*fa == sz {
+			return a.f.Truncate(h2off(fh))
+		}
+
+		return a.free2(fh, fa)
+	case needAtoms == atoms:
+		// in place replace
+		return a.writeUsedBlock(handle, cc, b)
+	}
+
+	// case needAtoms > atoms:
+	// in place extend or relocate
+	var sz int64
+	if sz, err = a.f.Size(); err != nil {
+		return
+	}
+
+	off = h2off(handle)
+	switch {
+	case off+atoms*16 == sz:
+		// relocating tail block - shortcut
+		return a.writeUsedBlock(handle, cc, b)
+	default:
+		if off+atoms*16 < sz {
+			// handle is not a tail block, check right neighbour
+			rh := handle + atoms
+			rtag, ratoms, p, n, e := a.nfo(rh)
+			if e != nil {
+				return e
+			}
+
+			if rtag == tagFreeShort || rtag == tagFreeLong {
+				// Right neighbour is a free block
+				if needAtoms <= atoms+ratoms {
+					// can expand in place
+					if err = a.unlink(rh, ratoms, p, n); err != nil {
+						return
+					}
+
+					atoms += ratoms
+					goto retry
+
+				}
+			}
+		}
+	}
+
+	if atoms > 1 {
+		if err = a.realloc(handle, nil); err != nil {
+			return
+		}
+	}
+
+	var newH int64
+	if newH, err = a.alloc(b, cc); err != nil {
+		return err
+	}
+
+	rb := bufs.GCache.Cget(16)
+	defer bufs.GCache.Put(rb)
+	rb[0] = tagUsedRelocated
+	h2b(rb[1:], newH)
+	if err = a.writeAt(rb[:], h2off(handle)); err != nil {
+		return
+	}
+
+	return a.writeUsedBlock(newH, cc, b)
+}
+
+func (a *Allocator) writeAt(b []byte, off int64) (err error) {
+	var n int
+	if n, err = a.f.WriteAt(b, off); err != nil {
+		return
+	}
+
+	if n != len(b) {
+		err = io.ErrShortWrite
+	}
+	return
+}
+
+func (a *Allocator) write(off int64, b ...[]byte) (err error) {
+	rq := 0
+	for _, part := range b {
+		rq += len(part)
+	}
+	buf := bufs.GCache.Get(rq)
+	defer bufs.GCache.Put(buf)
+	buf = buf[:0]
+	for _, part := range b {
+		buf = append(buf, part...)
+	}
+	return a.writeAt(buf, off)
+}
+
+func (a *Allocator) read(b []byte, off int64) (err error) {
+	var rn int
+	if rn, err = a.f.ReadAt(b, off); rn != len(b) {
+		return &ErrILSEQ{Type: ErrOther, Off: off, More: err}
+	}
+
+	return nil
+}
+
+// nfo returns h's tag. If it's a free block then return also (s)ize (in
+// atoms), (p)rev and (n)ext. If it's a used block then only (s)ize is returned
+// (again in atoms). If it's a used relocate block then (n)ext is set to the
+// relocation target handle.
+func (a *Allocator) nfo(h int64) (tag byte, s, p, n int64, err error) {
+	off := h2off(h)
+	rq := int64(22)
+	sz, err := a.f.Size()
+	if err != nil {
+		return
+	}
+
+	if off+rq >= sz {
+		if rq = sz - off; rq < 15 {
+			err = io.ErrUnexpectedEOF
+			return
+		}
+	}
+
+	buf := bufs.GCache.Get(22)
+	defer bufs.GCache.Put(buf)
+	if err = a.read(buf[:rq], off); err != nil {
+		return
+	}
+
+	switch tag = buf[0]; tag {
+	default:
+		s = int64(n2atoms(int(tag)))
+	case tagUsedLong:
+		s = int64(n2atoms(m2n(int(buf[1])<<8 | int(buf[2]))))
+	case tagFreeLong:
+		if rq < 22 {
+			err = io.ErrUnexpectedEOF
+			return
+		}
+
+		s, p, n = b2h(buf[1:]), b2h(buf[8:]), b2h(buf[15:])
+	case tagUsedRelocated:
+		s, n = 1, b2h(buf[1:])
+	case tagFreeShort:
+		s, p, n = 1, b2h(buf[1:]), b2h(buf[8:])
+	}
+	return
+}
+
+// leftNfo returns nfo for h's left neighbor if h > 1 and the left neighbor is
+// a free block. Otherwise all zero values are returned instead.
+func (a *Allocator) leftNfo(h int64) (tag byte, s, p, n int64, err error) {
+	if !(h > 1) {
+		return
+	}
+
+	buf := bufs.GCache.Get(8)
+	defer bufs.GCache.Put(buf)
+	off := h2off(h)
+	if err = a.read(buf[:], off-8); err != nil {
+		return
+	}
+
+	switch tag := buf[7]; tag {
+	case tagFreeShort:
+		return a.nfo(h - 1)
+	case tagFreeLong:
+		return a.nfo(h - b2h(buf[:]))
+	}
+	return
+}
+
+// Set h.prev = p
+func (a *Allocator) prev(h, p int64) (err error) {
+	b := bufs.GCache.Get(7)
+	defer bufs.GCache.Put(b)
+	off := h2off(h)
+	if err = a.read(b[:1], off); err != nil {
+		return
+	}
+
+	switch tag := b[0]; tag {
+	default:
+		return &ErrILSEQ{Type: ErrExpFreeTag, Off: off, Arg: int64(tag)}
+	case tagFreeShort:
+		off += 1
+	case tagFreeLong:
+		off += 8
+	}
+	return a.writeAt(h2b(b[:7], p), off)
+}
+
+// Set h.next = n
+func (a *Allocator) next(h, n int64) (err error) {
+	b := bufs.GCache.Get(7)
+	defer bufs.GCache.Put(b)
+	off := h2off(h)
+	if err = a.read(b[:1], off); err != nil {
+		return
+	}
+
+	switch tag := b[0]; tag {
+	default:
+		return &ErrILSEQ{Type: ErrExpFreeTag, Off: off, Arg: int64(tag)}
+	case tagFreeShort:
+		off += 8
+	case tagFreeLong:
+		off += 15
+	}
+	return a.writeAt(h2b(b[:7], n), off)
+}
+
+// Make the filer image @h a free block.
+func (a *Allocator) makeFree(h, atoms, prev, next int64) (err error) {
+	buf := bufs.GCache.Get(22)
+	defer bufs.GCache.Put(buf)
+	switch {
+	case atoms == 1:
+		buf[0], buf[15] = tagFreeShort, tagFreeShort
+		h2b(buf[1:], prev)
+		h2b(buf[8:], next)
+		if err = a.write(h2off(h), buf[:16]); err != nil {
+			return
+		}
+	default:
+
+		buf[0] = tagFreeLong
+		h2b(buf[1:], atoms)
+		h2b(buf[8:], prev)
+		h2b(buf[15:], next)
+		if err = a.write(h2off(h), buf[:22]); err != nil {
+			return
+		}
+
+		h2b(buf[:], atoms)
+		buf[7] = tagFreeLong
+		if err = a.write(h2off(h+atoms)-8, buf[:8]); err != nil {
+			return
+		}
+	}
+	if prev != 0 {
+		if err = a.next(prev, h); err != nil {
+			return
+		}
+	}
+
+	if next != 0 {
+		err = a.prev(next, h)
+	}
+	return
+}
+
+func (a *Allocator) makeUsedBlock(dst []byte, b []byte) (w []byte, rqAtoms int, cc byte, err error) {
+	cc = tagNotCompressed
+	w = b
+
+	var n int
+	if n = len(b); n > maxRq {
+		return nil, 0, 0, &ErrINVAL{"Allocator.makeUsedBlock: content size out of limits", n}
+	}
+
+	rqAtoms = n2atoms(n)
+	if a.Compress && n > 14 { // attempt compression
+		if dst, err = zappy.Encode(dst, b); err != nil {
+			return
+		}
+
+		n2 := len(dst)
+		if rqAtoms2 := n2atoms(n2); rqAtoms2 < rqAtoms { // compression saved at least a single atom
+			w, n, rqAtoms, cc = dst, n2, rqAtoms2, tagCompressed
+		}
+	}
+	return
+}
+
+func (a *Allocator) writeUsedBlock(h int64, cc byte, b []byte) (err error) {
+	n := len(b)
+	rq := n2atoms(n) << 4
+	buf := bufs.GCache.Get(rq)
+	defer bufs.GCache.Put(buf)
+	switch n <= maxShort {
+	case true:
+		buf[0] = byte(n)
+		copy(buf[1:], b)
+	case false:
+		m := n2m(n)
+		buf[0], buf[1], buf[2] = tagUsedLong, byte(m>>8), byte(m)
+		copy(buf[3:], b)
+	}
+	if p := n2padding(n); p != 0 {
+		copy(buf[rq-1-p:], zeros[:])
+	}
+	buf[rq-1] = cc
+	return a.writeAt(buf, h2off(h))
+}
+
+func (a *Allocator) verifyUnused(h, totalAtoms int64, tag byte, log func(error) bool, fast bool) (atoms, prev, next int64, err error) {
+	switch tag {
+	default:
+		panic("internal error")
+	case tagFreeShort:
+		var b [16]byte
+		off := h2off(h)
+		if err = a.read(b[:], off); err != nil {
+			return
+		}
+
+		if b[15] != tagFreeShort {
+			err = &ErrILSEQ{Type: ErrShortFreeTailTag, Off: off, Arg: int64(b[15])}
+			log(err)
+			return
+		}
+
+		atoms, prev, next = 1, b2h(b[1:]), b2h(b[8:])
+	case tagFreeLong:
+		var b [22]byte
+		off := h2off(h)
+		if err = a.read(b[:], off); err != nil {
+			return
+		}
+
+		atoms, prev, next = b2h(b[1:]), b2h(b[8:]), b2h(b[15:])
+		if fast {
+			return
+		}
+
+		if atoms < 2 {
+			err = &ErrILSEQ{Type: ErrLongFreeBlkTooShort, Off: off, Arg: int64(atoms)}
+			break
+		}
+
+		if h+atoms-1 > totalAtoms {
+			err = &ErrILSEQ{Type: ErrLongFreeBlkTooLong, Off: off, Arg: atoms}
+			break
+		}
+
+		if prev > totalAtoms {
+			err = &ErrILSEQ{Type: ErrLongFreePrevBeyondEOF, Off: off, Arg: next}
+			break
+		}
+
+		if next > totalAtoms {
+			err = &ErrILSEQ{Type: ErrLongFreeNextBeyondEOF, Off: off, Arg: next}
+			break
+		}
+
+		toff := h2off(h+atoms) - 8
+		if err = a.read(b[:8], toff); err != nil {
+			return
+		}
+
+		if b[7] != tag {
+			err = &ErrILSEQ{Type: ErrLongFreeTailTag, Off: off, Arg: int64(b[7])}
+			break
+		}
+
+		if s2 := b2h(b[:]); s2 != atoms {
+			err = &ErrILSEQ{Type: ErrVerifyTailSize, Off: off, Arg: atoms, Arg2: s2}
+			break
+		}
+
+	}
+	if err != nil {
+		log(err)
+	}
+	return
+}
+
+func (a *Allocator) verifyUsed(h, totalAtoms int64, tag byte, buf, ubuf []byte, log func(error) bool, fast bool) (compressed bool, dlen int, atoms, link int64, err error) {
+	var (
+		padding  int
+		doff     int64
+		padZeros [15]byte
+		tailBuf  [16]byte
+	)
+
+	switch tag {
+	default: // Short used
+		dlen = int(tag)
+		atoms = int64((dlen+1)/16) + 1
+		padding = 15 - (dlen+1)%16
+		doff = h2off(h) + 1
+	case tagUsedLong:
+		off := h2off(h) + 1
+		var b2 [2]byte
+		if err = a.read(b2[:], off); err != nil {
+			return
+		}
+
+		dlen = m2n(int(b2[0])<<8 | int(b2[1]))
+		atoms = int64((dlen+3)/16) + 1
+		padding = 15 - (dlen+3)%16
+		doff = h2off(h) + 3
+	case tagUsedRelocated:
+		dlen = 7
+		atoms = 1
+		padding = 7
+		doff = h2off(h) + 1
+	case tagFreeShort, tagFreeLong:
+		panic("internal error")
+	}
+
+	if fast {
+		if tag == tagUsedRelocated {
+			dlen = 0
+			if err = a.read(buf[:7], doff); err != nil {
+				return
+			}
+
+			link = b2h(buf)
+		}
+
+		return false, dlen, atoms, link, nil
+	}
+
+	if ok := h+atoms-1 <= totalAtoms; !ok { // invalid last block
+		err = &ErrILSEQ{Type: ErrVerifyUsedSpan, Off: h2off(h), Arg: atoms}
+		log(err)
+		return
+	}
+
+	tailsz := 1 + padding
+	off := h2off(h) + 16*atoms - int64(tailsz)
+	if err = a.read(tailBuf[:tailsz], off); err != nil {
+		return false, 0, 0, 0, err
+	}
+
+	if ok := bytes.Equal(padZeros[:padding], tailBuf[:padding]); !ok {
+		err = &ErrILSEQ{Type: ErrVerifyPadding, Off: h2off(h)}
+		log(err)
+		return
+	}
+
+	var cc byte
+	switch cc = tailBuf[padding]; cc {
+	default:
+		err = &ErrILSEQ{Type: ErrTailTag, Off: h2off(h)}
+		log(err)
+		return
+	case tagCompressed:
+		compressed = true
+		if tag == tagUsedRelocated {
+			err = &ErrILSEQ{Type: ErrTailTag, Off: h2off(h)}
+			log(err)
+			return
+		}
+
+		fallthrough
+	case tagNotCompressed:
+		if err = a.read(buf[:dlen], doff); err != nil {
+			return false, 0, 0, 0, err
+		}
+	}
+
+	if cc == tagCompressed {
+		if ubuf, err = zappy.Decode(ubuf, buf[:dlen]); err != nil || len(ubuf) > maxRq {
+			err = &ErrILSEQ{Type: ErrDecompress, Off: h2off(h)}
+			log(err)
+			return
+		}
+
+		dlen = len(ubuf)
+	}
+
+	if tag == tagUsedRelocated {
+		link = b2h(buf)
+		if link == 0 {
+			err = &ErrILSEQ{Type: ErrNullReloc, Off: h2off(h)}
+			log(err)
+			return
+		}
+
+		if link > totalAtoms { // invalid last block
+			err = &ErrILSEQ{Type: ErrRelocBeyondEOF, Off: h2off(h), Arg: link}
+			log(err)
+			return
+		}
+	}
+
+	return
+}
+
+var nolog = func(error) bool { return false }
+
+// Verify attempts to find any structural errors in a Filer wrt the
+// organization of it as defined by Allocator. 'bitmap' is a scratch pad for
+// necessary bookkeeping and will grow to at most to Allocator's
+// Filer.Size()/128 (0,78%).  Any problems found are reported to 'log' except
+// non verify related errors like disk read fails etc.  If 'log' returns false
+// or the error doesn't allow to (reliably) continue, the verification process
+// is stopped and an error is returned from the Verify function. Passing a nil
+// log works like providing a log function always returning false. Any
+// non-structural errors, like for instance Filer read errors, are NOT reported
+// to 'log', but returned as the Verify's return value, because Verify cannot
+// proceed in such cases.  Verify returns nil only if it fully completed
+// verifying Allocator's Filer without detecting any error.
+//
+// It is recommended to limit the number reported problems by returning false
+// from 'log' after reaching some limit. Huge and corrupted DB can produce an
+// overwhelming error report dataset.
+//
+// The verifying process will scan the whole DB at least 3 times (a trade
+// between processing space and time consumed). It doesn't read the content of
+// free blocks above the head/tail info bytes. If the 3rd phase detects lost
+// free space, then a 4th scan (a faster one) is performed to precisely report
+// all of them.
+//
+// If the DB/Filer to be verified is reasonably small, respective if its
+// size/128 can comfortably fit within process's free memory, then it is
+// recommended to consider using a MemFiler for the bit map.
+//
+// Statistics are returned via 'stats' if non nil. The statistics are valid
+// only if Verify succeeded, ie. it didn't reported anything to log and it
+// returned a nil error.
+func (a *Allocator) Verify(bitmap Filer, log func(error) bool, stats *AllocStats) (err error) {
+	if log == nil {
+		log = nolog
+	}
+
+	n, err := bitmap.Size()
+	if err != nil {
+		return
+	}
+
+	if n != 0 {
+		return &ErrINVAL{"Allocator.Verify: bit map initial size non zero (%d)", n}
+	}
+
+	var bits int64
+	bitMask := [8]byte{1, 2, 4, 8, 16, 32, 64, 128}
+	byteBuf := []byte{0}
+
+	//DONE
+	// +performance, this implementation is hopefully correct but _very_
+	// naive, probably good as a prototype only. Use maybe a MemFiler
+	// "cache" etc.
+	// ----
+	// Turns out the OS caching is as effective as it can probably get.
+	bit := func(on bool, h int64) (wasOn bool, err error) {
+		m := bitMask[h&7]
+		off := h >> 3
+		var v byte
+		sz, err := bitmap.Size()
+		if err != nil {
+			return
+		}
+
+		if off < sz {
+			if n, err := bitmap.ReadAt(byteBuf, off); n != 1 {
+				return false, &ErrILSEQ{Type: ErrOther, Off: off, More: fmt.Errorf("Allocator.Verify - reading bitmap: %s", err)}
+			}
+
+			v = byteBuf[0]
+		}
+		switch wasOn = v&m != 0; on {
+		case true:
+			if !wasOn {
+				v |= m
+				bits++
+			}
+		case false:
+			if wasOn {
+				v ^= m
+				bits--
+			}
+		}
+		byteBuf[0] = v
+		if n, err := bitmap.WriteAt(byteBuf, off); n != 1 || err != nil {
+			return false, &ErrILSEQ{Type: ErrOther, Off: off, More: fmt.Errorf("Allocator.Verify - writing bitmap: %s", err)}
+		}
+
+		return
+	}
+
+	// Phase 1 - sequentially scan a.f to reliably determine block
+	// boundaries. Set a bit for every block start.
+	var (
+		buf, ubuf       [maxRq]byte
+		prevH, h, atoms int64
+		wasOn           bool
+		tag             byte
+		st              = AllocStats{
+			AllocMap: map[int64]int64{},
+			FreeMap:  map[int64]int64{},
+		}
+		dlen int
+	)
+
+	fsz, err := a.f.Size()
+	if err != nil {
+		return
+	}
+
+	ok := fsz%16 == 0
+	totalAtoms := (fsz - fltSz) / atomLen
+	if !ok {
+		err = &ErrILSEQ{Type: ErrFileSize, Name: a.f.Name(), Arg: fsz}
+		log(err)
+		return
+	}
+
+	st.TotalAtoms = totalAtoms
+	prevTag := -1
+	lastH := int64(-1)
+
+	for h = 1; h <= totalAtoms; h += atoms {
+		prevH = h // For checking last block == used
+
+		off := h2off(h)
+		if err = a.read(buf[:1], off); err != nil {
+			return
+		}
+
+		switch tag = buf[0]; tag {
+		default: // Short used
+			fallthrough
+		case tagUsedLong, tagUsedRelocated:
+			var compressed bool
+			if compressed, dlen, atoms, _, err = a.verifyUsed(h, totalAtoms, tag, buf[:], ubuf[:], log, false); err != nil {
+				return
+			}
+
+			if compressed {
+				st.Compression++
+			}
+			st.AllocAtoms += atoms
+			switch {
+			case tag == tagUsedRelocated:
+				st.AllocMap[1]++
+				st.Relocations++
+			default:
+				st.AllocMap[atoms]++
+				st.AllocBytes += int64(dlen)
+				st.Handles++
+			}
+		case tagFreeShort, tagFreeLong:
+			if prevTag == tagFreeShort || prevTag == tagFreeLong {
+				err = &ErrILSEQ{Type: ErrAdjacentFree, Off: h2off(lastH), Arg: off}
+				log(err)
+				return
+			}
+
+			if atoms, _, _, err = a.verifyUnused(h, totalAtoms, tag, log, false); err != nil {
+				return
+			}
+
+			st.FreeMap[atoms]++
+			st.FreeAtoms += atoms
+		}
+
+		if wasOn, err = bit(true, h); err != nil {
+			return
+		}
+
+		if wasOn {
+			panic("internal error")
+		}
+
+		prevTag = int(tag)
+		lastH = h
+	}
+
+	if totalAtoms != 0 && (tag == tagFreeShort || tag == tagFreeLong) {
+		err = &ErrILSEQ{Type: ErrFreeTailBlock, Off: h2off(prevH)}
+		log(err)
+		return
+	}
+
+	// Phase 2 - check used blocks, turn off the map bit for every used
+	// block.
+	for h = 1; h <= totalAtoms; h += atoms {
+		off := h2off(h)
+		if err = a.read(buf[:1], off); err != nil {
+			return
+		}
+
+		var link int64
+		switch tag = buf[0]; tag {
+		default: // Short used
+			fallthrough
+		case tagUsedLong, tagUsedRelocated:
+			if _, _, atoms, link, err = a.verifyUsed(h, totalAtoms, tag, buf[:], ubuf[:], log, true); err != nil {
+				return
+			}
+		case tagFreeShort, tagFreeLong:
+			if atoms, _, _, err = a.verifyUnused(h, totalAtoms, tag, log, true); err != nil {
+				return
+			}
+		}
+
+		turnoff := true
+		switch tag {
+		case tagUsedRelocated:
+			if err = a.read(buf[:1], h2off(link)); err != nil {
+				return
+			}
+
+			switch linkedTag := buf[0]; linkedTag {
+			case tagFreeShort, tagFreeLong, tagUsedRelocated:
+				err = &ErrILSEQ{Type: ErrInvalidRelocTarget, Off: off, Arg: link}
+				log(err)
+				return
+			}
+
+		case tagFreeShort, tagFreeLong:
+			turnoff = false
+		}
+
+		if !turnoff {
+			continue
+		}
+
+		if wasOn, err = bit(false, h); err != nil {
+			return
+		}
+
+		if !wasOn {
+			panic("internal error")
+		}
+
+	}
+
+	// Phase 3 - using the flt check heads link to proper free blocks.  For
+	// every free block, walk the list, verify the {next, prev} links and
+	// turn the respective map bit off. After processing all free lists,
+	// the map bits count should be zero. Otherwise there are "lost" free
+	// blocks.
+
+	var prev, next, fprev, fnext int64
+	rep := a.flt
+
+	for _, list := range rep {
+		prev, next = 0, list.head
+		for ; next != 0; prev, next = next, fnext {
+			if wasOn, err = bit(false, next); err != nil {
+				return
+			}
+
+			if !wasOn {
+				err = &ErrILSEQ{Type: ErrFLT, Off: h2off(next), Arg: h}
+				log(err)
+				return
+			}
+
+			off := h2off(next)
+			if err = a.read(buf[:1], off); err != nil {
+				return
+			}
+
+			switch tag = buf[0]; tag {
+			default:
+				panic("internal error")
+			case tagFreeShort, tagFreeLong:
+				if atoms, fprev, fnext, err = a.verifyUnused(next, totalAtoms, tag, log, true); err != nil {
+					return
+				}
+
+				if min := list.minSize; atoms < min {
+					err = &ErrILSEQ{Type: ErrFLTSize, Off: h2off(next), Arg: atoms, Arg2: min}
+					log(err)
+					return
+				}
+
+				if fprev != prev {
+					err = &ErrILSEQ{Type: ErrFreeChaining, Off: h2off(next)}
+					log(err)
+					return
+				}
+			}
+		}
+
+	}
+
+	if bits == 0 { // Verify succeeded
+		if stats != nil {
+			*stats = st
+		}
+		return
+	}
+
+	// Phase 4 - if after phase 3 there are lost free blocks, report all of
+	// them to 'log'
+	for i := range ubuf { // setup zeros for compares
+		ubuf[i] = 0
+	}
+
+	var off, lh int64
+	rem, err := bitmap.Size()
+	if err != nil {
+		return err
+	}
+
+	for rem != 0 {
+		rq := int(mathutil.MinInt64(64*1024, rem))
+		var n int
+		if n, err = bitmap.ReadAt(buf[:rq], off); n != rq {
+			return &ErrILSEQ{Type: ErrOther, Off: off, More: fmt.Errorf("bitmap ReadAt(size %d, off %#x): %s", rq, off, err)}
+		}
+
+		if !bytes.Equal(buf[:rq], ubuf[:rq]) {
+			for d, v := range buf[:rq] {
+				if v != 0 {
+					for i, m := range bitMask {
+						if v&m != 0 {
+							lh = 8*(off+int64(d)) + int64(i)
+							err = &ErrILSEQ{Type: ErrLostFreeBlock, Off: h2off(lh)}
+							log(err)
+							return
+						}
+					}
+				}
+			}
+		}
+
+		off += int64(rq)
+		rem -= int64(rq)
+	}
+
+	return
+}
+
+type fltSlot struct {
+	head    int64
+	minSize int64
+}
+
+func (f fltSlot) String() string {
+	return fmt.Sprintf("head %#x, minSize %#x\n", f.head, f.minSize)
+}
+
+type flt [14]fltSlot
+
+func (f *flt) init() {
+	sz := 1
+	for i := range *f {
+		f[i].minSize, f[i].head = int64(sz), 0
+		sz <<= 1
+	}
+	f[13].minSize = 4112
+}
+
+func (f *flt) load(fi Filer, off int64) (err error) {
+	b := bufs.GCache.Get(fltSz)
+	defer bufs.GCache.Put(b)
+	if _, err = fi.ReadAt(b[:], off); err != nil {
+		return
+	}
+
+	for i := range *f {
+		off := 8*i + 1
+		f[i].head = b2h(b[off:])
+	}
+	return
+}
+
+func (f *flt) find(rq int) (h int64) {
+	switch {
+	case rq < 1:
+		panic(rq)
+	case rq >= maxFLTRq:
+		h, f[13].head = f[13].head, 0
+		return
+	default:
+		g := f[mathutil.Log2Uint16(uint16(rq)):]
+		for i := range g {
+			p := &g[i]
+			if rq <= int(p.minSize) {
+				if h = p.head; h != 0 {
+					p.head = 0
+					return
+				}
+			}
+		}
+		return
+	}
+}
+
+func (f *flt) head(atoms int64) (h int64) {
+	switch {
+	case atoms < 1:
+		panic(atoms)
+	case atoms >= maxFLTRq:
+		return f[13].head
+	default:
+		lg := mathutil.Log2Uint16(uint16(atoms))
+		g := f[lg:]
+		for i := range g {
+			if atoms < g[i+1].minSize {
+				return g[i].head
+			}
+		}
+		panic("internal error")
+	}
+}
+
+func (f *flt) setHead(h, atoms int64, fi Filer) (err error) {
+	switch {
+	case atoms < 1:
+		panic(atoms)
+	case atoms >= maxFLTRq:
+		b := bufs.GCache.Get(7)
+		defer bufs.GCache.Put(b)
+		if _, err = fi.WriteAt(h2b(b[:], h), 8*13+1); err != nil {
+			return
+		}
+
+		f[13].head = h
+		return
+	default:
+		lg := mathutil.Log2Uint16(uint16(atoms))
+		g := f[lg:]
+		for i := range f {
+			if atoms < g[i+1].minSize {
+				b := bufs.GCache.Get(7)
+				defer bufs.GCache.Put(b)
+				if _, err = fi.WriteAt(h2b(b[:], h), 8*int64(i+lg)+1); err != nil {
+					return
+				}
+
+				g[i].head = h
+				return
+			}
+		}
+		panic("internal error")
+	}
+}
+
+func (f *flt) String() string {
+	a := []string{}
+	for i, v := range *f {
+		a = append(a, fmt.Sprintf("[%2d] %s", i, v))
+	}
+	return strings.Join(a, "")
+}
+
+type node struct {
+	b          []byte
+	h          int64
+	prev, next *node
+}
+
+type cache []*node
+
+func (c *cache) get(n int) *node {
+	r, _ := c.get2(n)
+	return r
+}
+
+func (c *cache) get2(n int) (r *node, isZeroed bool) {
+	s := *c
+	lens := len(s)
+	if lens == 0 {
+		return &node{b: make([]byte, n, mathutil.Min(2*n, maxBuf))}, true
+	}
+
+	i := sort.Search(lens, func(x int) bool { return len(s[x].b) >= n })
+	if i == lens {
+		i--
+		s[i].b, isZeroed = make([]byte, n, mathutil.Min(2*n, maxBuf)), true
+	}
+
+	r = s[i]
+	r.b = r.b[:n]
+	copy(s[i:], s[i+1:])
+	s = s[:lens-1]
+	*c = s
+	return
+}
+
+func (c *cache) cget(n int) (r *node) {
+	r, ok := c.get2(n)
+	if ok {
+		return
+	}
+
+	for i := range r.b {
+		r.b[i] = 0
+	}
+	return
+}
+
+func (c *cache) size() (sz int64) {
+	for _, n := range *c {
+		sz += int64(cap(n.b))
+	}
+	return
+}
+
+func (c *cache) put(n *node) *node {
+	s := *c
+	n.b = n.b[:cap(n.b)]
+	lenb := len(n.b)
+	lens := len(s)
+	i := sort.Search(lens, func(x int) bool { return len(s[x].b) >= lenb })
+	s = append(s, nil)
+	copy(s[i+1:], s[i:])
+	s[i] = n
+	*c = s
+	return n
+}
+
+type lst struct {
+	front, back *node
+}
+
+func (l *lst) pushFront(n *node) *node {
+	if l.front == nil {
+		l.front, l.back, n.prev, n.next = n, n, nil, nil
+		return n
+	}
+
+	n.prev, n.next, l.front.prev, l.front = nil, l.front, n, n
+	return n
+}
+
+func (l *lst) remove(n *node) *node {
+	if n.prev == nil {
+		l.front = n.next
+	} else {
+		n.prev.next = n.next
+	}
+	if n.next == nil {
+		l.back = n.prev
+	} else {
+		n.next.prev = n.prev
+	}
+	n.prev, n.next = nil, nil
+	return n
+}
+
+func (l *lst) removeBack() *node {
+	return l.remove(l.back)
+}
+
+func (l *lst) moveToFront(n *node) *node {
+	return l.pushFront(l.remove(n))
+}
+
+func (l *lst) size() (sz int64) {
+	for n := l.front; n != nil; n = n.next {
+		sz += int64(cap(n.b))
+	}
+	return
+}
+
+func cacheAudit(m map[int64]*node, l *lst) (err error) {
+	cnt := 0
+	for h, n := range m {
+		if g, e := n.h, h; g != e {
+			return fmt.Errorf("cacheAudit: invalid node handle %d != %d", g, e)
+		}
+
+		if cnt, err = l.audit(n, true); err != nil {
+			return
+		}
+	}
+
+	if g, e := cnt, len(m); g != e {
+		return fmt.Errorf("cacheAudit: invalid cache size %d != %d", g, e)
+	}
+
+	return
+}
+
+func (l *lst) audit(n *node, onList bool) (cnt int, err error) {
+	if !onList && (n.prev != nil || n.next != nil) {
+		return -1, fmt.Errorf("lst.audit: free node with non nil linkage")
+	}
+
+	if l.front == nil && l.back != nil || l.back == nil && l.front != nil {
+		return -1, fmt.Errorf("lst.audit: one of .front/.back is nil while the other is non nil")
+	}
+
+	if l.front == l.back && l.front != nil {
+		x := l.front
+		if x.prev != nil || x.next != nil {
+			return -1, fmt.Errorf("lst.audit: single node has non nil linkage")
+		}
+
+		if onList && x != n {
+			return -1, fmt.Errorf("lst.audit: single node is alien")
+		}
+	}
+
+	seen := false
+	var prev *node
+	x := l.front
+	for x != nil {
+		cnt++
+		if x.prev != prev {
+			return -1, fmt.Errorf("lst.audit: broken .prev linkage")
+		}
+
+		if x == n {
+			seen = true
+		}
+
+		prev = x
+		x = x.next
+	}
+
+	if prev != l.back {
+		return -1, fmt.Errorf("lst.audit: broken .back linkage")
+	}
+
+	if onList && !seen {
+		return -1, fmt.Errorf("lst.audit: node missing in list")
+	}
+
+	if !onList && seen {
+		return -1, fmt.Errorf("lst.audit: node should not be on the list")
+	}
+
+	return
+}
diff --git a/vendor/github.com/cznic/exp/lldb/filer.go b/vendor/github.com/cznic/exp/lldb/filer.go
new file mode 100644
index 0000000000..38b389387a
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/filer.go
@@ -0,0 +1,192 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// An abstraction of file like (persistent) storage with optional (abstracted)
+// support for structural integrity.
+
+package lldb
+
+import (
+	"fmt"
+
+	"github.com/cznic/mathutil"
+)
+
+func doubleTrouble(first, second error) error {
+	return fmt.Errorf("%q. Additionally, while attempting to recover (rollback): %q", first, second)
+}
+
+// A Filer is a []byte-like model of a file or similar entity. It may
+// optionally implement support for structural transaction safety. In contrast
+// to a file stream, a Filer is not sequentially accessible. ReadAt and WriteAt
+// are always "addressed" by an offset and are assumed to perform atomically.
+// A Filer is not safe for concurrent access, it's designed for consumption by
+// the other objects in package, which should use a Filer from one goroutine
+// only or via a mutex. BeginUpdate, EndUpdate and Rollback must be either all
+// implemented by a Filer for structural integrity - or they should be all
+// no-ops; where/if that requirement is relaxed.
+//
+// If a Filer wraps another Filer implementation, it usually invokes the same
+// methods on the "inner" one, after some possible argument translations etc.
+// If a Filer implements the structural transactions handling methods
+// (BeginUpdate, EndUpdate and Rollback) as no-ops _and_ wraps another Filer:
+// it then still MUST invoke those methods on the inner Filer. This is
+// important for the case where a RollbackFiler exists somewhere down the
+// chain.  It's also important for an Allocator - to know when it must
+// invalidate its FLT cache.
+type Filer interface {
+	// BeginUpdate increments the "nesting" counter (initially zero). Every
+	// call to BeginUpdate must be eventually "balanced" by exactly one of
+	// EndUpdate or Rollback. Calls to BeginUpdate may nest.
+	BeginUpdate() error
+
+	// Analogous to os.File.Close().
+	Close() error
+
+	// EndUpdate decrements the "nesting" counter. If it's zero after that
+	// then assume the "storage" has reached structural integrity (after a
+	// batch of partial updates). If a Filer implements some support for
+	// that (write ahead log, journal, etc.) then the appropriate actions
+	// are to be taken for nesting == 0. Invocation of an unbalanced
+	// EndUpdate is an error.
+	EndUpdate() error
+
+	// Analogous to os.File.Name().
+	Name() string
+
+	// PunchHole deallocates space inside a "file" in the byte range
+	// starting at off and continuing for size bytes. The actual hole
+	// created by PunchHole may be smaller than requested. The Filer size
+	// (as reported by `Size()` does not change when hole punching, even
+	// when punching the end of a file off.  In contrast to the Linux
+	// implementation of FALLOC_FL_PUNCH_HOLE in `fallocate`(2); a Filer is
+	// free not only to ignore `PunchHole()` (implement it as a nop), but
+	// additionally no guarantees about the content of the hole, when
+	// eventually read back, are required, i.e.  any data, not only zeros,
+	// can be read from the "hole", including just anything what was left
+	// there - with all of the possible security problems.
+	PunchHole(off, size int64) error
+
+	// As os.File.ReadAt. Note: `off` is an absolute "file pointer"
+	// address and cannot be negative even when a Filer is a InnerFiler.
+	ReadAt(b []byte, off int64) (n int, err error)
+
+	// Rollback cancels and undoes the innermost pending update level.
+	// Rollback decrements the "nesting" counter.  If a Filer implements
+	// some support for keeping structural integrity (write ahead log,
+	// journal, etc.) then the appropriate actions are to be taken.
+	// Invocation of an unbalanced Rollback is an error.
+	Rollback() error
+
+	// Analogous to os.File.FileInfo().Size().
+	Size() (int64, error)
+
+	// Analogous to os.Sync().
+	Sync() (err error)
+
+	// Analogous to os.File.Truncate().
+	Truncate(size int64) error
+
+	// Analogous to os.File.WriteAt(). Note: `off` is an absolute "file
+	// pointer" address and cannot be negative even when a Filer is a
+	// InnerFiler.
+	WriteAt(b []byte, off int64) (n int, err error)
+}
+
+var _ Filer = &InnerFiler{} // Ensure InnerFiler is a Filer.
+
+// A InnerFiler is a Filer with added addressing/size translation.
+type InnerFiler struct {
+	outer Filer
+	off   int64
+}
+
+// NewInnerFiler returns a new InnerFiler wrapped by `outer` in a way which
+// adds `off` to every access.
+//
+// For example, considering:
+//
+// 	inner := NewInnerFiler(outer, 10)
+//
+// then
+//
+// 	inner.WriteAt([]byte{42}, 4)
+//
+// translates to
+//
+// 	outer.WriteAt([]byte{42}, 14)
+//
+// But an attempt to emulate
+//
+// 	outer.WriteAt([]byte{17}, 9)
+//
+// by
+//
+// 	inner.WriteAt([]byte{17}, -1)
+//
+// will fail as the `off` parameter can never be < 0. Also note that
+//
+// 	inner.Size() == outer.Size() - off,
+//
+// i.e. `inner` pretends no `outer` exists. Finally, after e.g.
+//
+// 	inner.Truncate(7)
+// 	outer.Size() == 17
+//
+// will be true.
+func NewInnerFiler(outer Filer, off int64) *InnerFiler { return &InnerFiler{outer, off} }
+
+// BeginUpdate implements Filer.
+func (f *InnerFiler) BeginUpdate() error { return f.outer.BeginUpdate() }
+
+// Close implements Filer.
+func (f *InnerFiler) Close() (err error) { return f.outer.Close() }
+
+// EndUpdate implements Filer.
+func (f *InnerFiler) EndUpdate() error { return f.outer.EndUpdate() }
+
+// Name implements Filer.
+func (f *InnerFiler) Name() string { return f.outer.Name() }
+
+// PunchHole implements Filer. `off`, `size` must be >= 0.
+func (f *InnerFiler) PunchHole(off, size int64) error { return f.outer.PunchHole(f.off+off, size) }
+
+// ReadAt implements Filer. `off` must be >= 0.
+func (f *InnerFiler) ReadAt(b []byte, off int64) (n int, err error) {
+	if off < 0 {
+		return 0, &ErrINVAL{f.outer.Name() + ":ReadAt invalid off", off}
+	}
+
+	return f.outer.ReadAt(b, f.off+off)
+}
+
+// Rollback implements Filer.
+func (f *InnerFiler) Rollback() error { return f.outer.Rollback() }
+
+// Size implements Filer.
+func (f *InnerFiler) Size() (int64, error) {
+	sz, err := f.outer.Size()
+	if err != nil {
+		return 0, err
+	}
+
+	return mathutil.MaxInt64(sz-f.off, 0), nil
+}
+
+// Sync() implements Filer.
+func (f *InnerFiler) Sync() (err error) {
+	return f.outer.Sync()
+}
+
+// Truncate implements Filer.
+func (f *InnerFiler) Truncate(size int64) error { return f.outer.Truncate(size + f.off) }
+
+// WriteAt implements Filer. `off` must be >= 0.
+func (f *InnerFiler) WriteAt(b []byte, off int64) (n int, err error) {
+	if off < 0 {
+		return 0, &ErrINVAL{f.outer.Name() + ":WriteAt invalid off", off}
+	}
+
+	return f.outer.WriteAt(b, f.off+off)
+}
diff --git a/vendor/github.com/cznic/exp/lldb/gb.go b/vendor/github.com/cznic/exp/lldb/gb.go
new file mode 100644
index 0000000000..e9090a5473
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/gb.go
@@ -0,0 +1,812 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Utilities to encode/decode and collate Go predeclared scalar types (and the
+// typeless nil and []byte).  The encoding format is a variation of the one
+// used by the "encoding/gob" package.
+
+package lldb
+
+import (
+	"bytes"
+	"fmt"
+	"math"
+
+	"github.com/cznic/mathutil"
+)
+
+const (
+	gbNull     = iota // 0x00
+	gbFalse           // 0x01
+	gbTrue            // 0x02
+	gbFloat0          // 0x03
+	gbFloat1          // 0x04
+	gbFloat2          // 0x05
+	gbFloat3          // 0x06
+	gbFloat4          // 0x07
+	gbFloat5          // 0x08
+	gbFloat6          // 0x09
+	gbFloat7          // 0x0a
+	gbFloat8          // 0x0b
+	gbComplex0        // 0x0c
+	gbComplex1        // 0x0d
+	gbComplex2        // 0x0e
+	gbComplex3        // 0x0f
+	gbComplex4        // 0x10
+	gbComplex5        // 0x11
+	gbComplex6        // 0x12
+	gbComplex7        // 0x13
+	gbComplex8        // 0x14
+	gbBytes00         // 0x15
+	gbBytes01         // 0x16
+	gbBytes02         // 0x17
+	gbBytes03         // 0x18
+	gbBytes04         // 0x19
+	gbBytes05         // 0x1a
+	gbBytes06         // 0x1b
+	gbBytes07         // 0x1c
+	gbBytes08         // 0x1d
+	gbBytes09         // 0x1e
+	gbBytes10         // 0x1f
+	gbBytes11         // 0x20
+	gbBytes12         // 0x21
+	gbBytes13         // 0x22
+	gbBytes14         // 0x23
+	gbBytes15         // 0x24
+	gbBytes16         // 0x25
+	gbBytes17         // Ox26
+	gbBytes1          // 0x27
+	gbBytes2          // 0x28: Offset by one to allow 64kB sized []byte.
+	gbString00        // 0x29
+	gbString01        // 0x2a
+	gbString02        // 0x2b
+	gbString03        // 0x2c
+	gbString04        // 0x2d
+	gbString05        // 0x2e
+	gbString06        // 0x2f
+	gbString07        // 0x30
+	gbString08        // 0x31
+	gbString09        // 0x32
+	gbString10        // 0x33
+	gbString11        // 0x34
+	gbString12        // 0x35
+	gbString13        // 0x36
+	gbString14        // 0x37
+	gbString15        // 0x38
+	gbString16        // 0x39
+	gbString17        // 0x3a
+	gbString1         // 0x3b
+	gbString2         // 0x3c
+	gbUintP1          // 0x3d
+	gbUintP2          // 0x3e
+	gbUintP3          // 0x3f
+	gbUintP4          // 0x40
+	gbUintP5          // 0x41
+	gbUintP6          // 0x42
+	gbUintP7          // 0x43
+	gbUintP8          // 0x44
+	gbIntM8           // 0x45
+	gbIntM7           // 0x46
+	gbIntM6           // 0x47
+	gbIntM5           // 0x48
+	gbIntM4           // 0x49
+	gbIntM3           // 0x4a
+	gbIntM2           // 0x4b
+	gbIntM1           // 0x4c
+	gbIntP1           // 0x4d
+	gbIntP2           // 0x4e
+	gbIntP3           // 0x4f
+	gbIntP4           // 0x50
+	gbIntP5           // 0x51
+	gbIntP6           // 0x52
+	gbIntP7           // 0x53
+	gbIntP8           // 0x54
+	gbInt0            // 0x55
+
+	gbIntMax = 255 - gbInt0 // 0xff == 170
+)
+
+// EncodeScalars encodes a vector of predeclared scalar type values to a
+// []byte, making it suitable to store it as a "record" in a DB or to use it as
+// a key of a BTree.
+func EncodeScalars(scalars ...interface{}) (b []byte, err error) {
+	for _, scalar := range scalars {
+		switch x := scalar.(type) {
+		default:
+			return nil, &ErrINVAL{"EncodeScalars: unsupported type", fmt.Sprintf("%T in `%#v`", x, scalars)}
+
+		case nil:
+			b = append(b, gbNull)
+
+		case bool:
+			switch x {
+			case false:
+				b = append(b, gbFalse)
+			case true:
+				b = append(b, gbTrue)
+			}
+
+		case float32:
+			encFloat(float64(x), &b)
+		case float64:
+			encFloat(x, &b)
+
+		case complex64:
+			encComplex(complex128(x), &b)
+		case complex128:
+			encComplex(x, &b)
+
+		case string:
+			n := len(x)
+			if n <= 17 {
+				b = append(b, byte(gbString00+n))
+				b = append(b, []byte(x)...)
+				break
+			}
+
+			if n > 65535 {
+				return nil, fmt.Errorf("EncodeScalars: cannot encode string of length %d (limit 65536)", n)
+			}
+
+			pref := byte(gbString1)
+			if n > 255 {
+				pref++
+			}
+			b = append(b, pref)
+			encUint0(uint64(n), &b)
+			b = append(b, []byte(x)...)
+
+		case int8:
+			encInt(int64(x), &b)
+		case int16:
+			encInt(int64(x), &b)
+		case int32:
+			encInt(int64(x), &b)
+		case int64:
+			encInt(x, &b)
+		case int:
+			encInt(int64(x), &b)
+
+		case uint8:
+			encUint(uint64(x), &b)
+		case uint16:
+			encUint(uint64(x), &b)
+		case uint32:
+			encUint(uint64(x), &b)
+		case uint64:
+			encUint(x, &b)
+		case uint:
+			encUint(uint64(x), &b)
+		case []byte:
+			n := len(x)
+			if n <= 17 {
+				b = append(b, byte(gbBytes00+n))
+				b = append(b, []byte(x)...)
+				break
+			}
+
+			if n > 655356 {
+				return nil, fmt.Errorf("EncodeScalars: cannot encode []byte of length %d (limit 65536)", n)
+			}
+
+			pref := byte(gbBytes1)
+			if n > 255 {
+				pref++
+			}
+			b = append(b, pref)
+			if n <= 255 {
+				b = append(b, byte(n))
+			} else {
+				n--
+				b = append(b, byte(n>>8), byte(n))
+			}
+			b = append(b, x...)
+		}
+	}
+	return
+}
+
+func encComplex(f complex128, b *[]byte) {
+	encFloatPrefix(gbComplex0, real(f), b)
+	encFloatPrefix(gbComplex0, imag(f), b)
+}
+
+func encFloatPrefix(prefix byte, f float64, b *[]byte) {
+	u := math.Float64bits(f)
+	var n uint64
+	for i := 0; i < 8; i++ {
+		n <<= 8
+		n |= u & 0xFF
+		u >>= 8
+	}
+	bits := mathutil.BitLenUint64(n)
+	if bits == 0 {
+		*b = append(*b, prefix)
+		return
+	}
+
+	// 0 1 2 3 4 5 6 7 8 9
+	// . 1 1 1 1 1 1 1 1 2
+	encUintPrefix(prefix+1+byte((bits-1)>>3), n, b)
+}
+
+func encFloat(f float64, b *[]byte) {
+	encFloatPrefix(gbFloat0, f, b)
+}
+
+func encUint0(n uint64, b *[]byte) {
+	switch {
+	case n <= 0xff:
+		*b = append(*b, byte(n))
+	case n <= 0xffff:
+		*b = append(*b, byte(n>>8), byte(n))
+	case n <= 0xffffff:
+		*b = append(*b, byte(n>>16), byte(n>>8), byte(n))
+	case n <= 0xffffffff:
+		*b = append(*b, byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n <= 0xffffffffff:
+		*b = append(*b, byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n <= 0xffffffffffff:
+		*b = append(*b, byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n <= 0xffffffffffffff:
+		*b = append(*b, byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n <= math.MaxUint64:
+		*b = append(*b, byte(n>>56), byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	}
+}
+
+func encUintPrefix(prefix byte, n uint64, b *[]byte) {
+	*b = append(*b, prefix)
+	encUint0(n, b)
+}
+
+func encUint(n uint64, b *[]byte) {
+	bits := mathutil.Max(1, mathutil.BitLenUint64(n))
+	encUintPrefix(gbUintP1+byte((bits-1)>>3), n, b)
+}
+
+func encInt(n int64, b *[]byte) {
+	switch {
+	case n < -0x100000000000000:
+		*b = append(*b, byte(gbIntM8), byte(n>>56), byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n < -0x1000000000000:
+		*b = append(*b, byte(gbIntM7), byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n < -0x10000000000:
+		*b = append(*b, byte(gbIntM6), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n < -0x100000000:
+		*b = append(*b, byte(gbIntM5), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n < -0x1000000:
+		*b = append(*b, byte(gbIntM4), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n < -0x10000:
+		*b = append(*b, byte(gbIntM3), byte(n>>16), byte(n>>8), byte(n))
+	case n < -0x100:
+		*b = append(*b, byte(gbIntM2), byte(n>>8), byte(n))
+	case n < 0:
+		*b = append(*b, byte(gbIntM1), byte(n))
+	case n <= gbIntMax:
+		*b = append(*b, byte(gbInt0+n))
+	case n <= 0xff:
+		*b = append(*b, gbIntP1, byte(n))
+	case n <= 0xffff:
+		*b = append(*b, gbIntP2, byte(n>>8), byte(n))
+	case n <= 0xffffff:
+		*b = append(*b, gbIntP3, byte(n>>16), byte(n>>8), byte(n))
+	case n <= 0xffffffff:
+		*b = append(*b, gbIntP4, byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n <= 0xffffffffff:
+		*b = append(*b, gbIntP5, byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n <= 0xffffffffffff:
+		*b = append(*b, gbIntP6, byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n <= 0xffffffffffffff:
+		*b = append(*b, gbIntP7, byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	case n <= 0x7fffffffffffffff:
+		*b = append(*b, gbIntP8, byte(n>>56), byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
+	}
+}
+
+func decodeFloat(b []byte) float64 {
+	var u uint64
+	for i, v := range b {
+		u |= uint64(v) << uint((i+8-len(b))*8)
+	}
+	return math.Float64frombits(u)
+}
+
+// DecodeScalars decodes a []byte produced by EncodeScalars.
+func DecodeScalars(b []byte) (scalars []interface{}, err error) {
+	b0 := b
+	for len(b) != 0 {
+		switch tag := b[0]; tag {
+		//default:
+		//return nil, fmt.Errorf("tag %d(%#x) not supported", b[0], b[0])
+		case gbNull:
+			scalars = append(scalars, nil)
+			b = b[1:]
+		case gbFalse:
+			scalars = append(scalars, false)
+			b = b[1:]
+		case gbTrue:
+			scalars = append(scalars, true)
+			b = b[1:]
+		case gbFloat0:
+			scalars = append(scalars, 0.0)
+			b = b[1:]
+		case gbFloat1, gbFloat2, gbFloat3, gbFloat4, gbFloat5, gbFloat6, gbFloat7, gbFloat8:
+			n := 1 + int(tag) - gbFloat0
+			if len(b) < n-1 {
+				goto corrupted
+			}
+
+			scalars = append(scalars, decodeFloat(b[1:n]))
+			b = b[n:]
+		case gbComplex0, gbComplex1, gbComplex2, gbComplex3, gbComplex4, gbComplex5, gbComplex6, gbComplex7, gbComplex8:
+			n := 1 + int(tag) - gbComplex0
+			if len(b) < n-1 {
+				goto corrupted
+			}
+
+			re := decodeFloat(b[1:n])
+			b = b[n:]
+
+			if len(b) == 0 {
+				goto corrupted
+			}
+
+			tag = b[0]
+			if tag < gbComplex0 || tag > gbComplex8 {
+				goto corrupted
+			}
+
+			n = 1 + int(tag) - gbComplex0
+			if len(b) < n-1 {
+				goto corrupted
+			}
+
+			scalars = append(scalars, complex(re, decodeFloat(b[1:n])))
+			b = b[n:]
+		case gbBytes00, gbBytes01, gbBytes02, gbBytes03, gbBytes04,
+			gbBytes05, gbBytes06, gbBytes07, gbBytes08, gbBytes09,
+			gbBytes10, gbBytes11, gbBytes12, gbBytes13, gbBytes14,
+			gbBytes15, gbBytes16, gbBytes17:
+			n := int(tag - gbBytes00)
+			if len(b) < n+1 {
+				goto corrupted
+			}
+
+			scalars = append(scalars, append([]byte(nil), b[1:n+1]...))
+			b = b[n+1:]
+		case gbBytes1:
+			if len(b) < 2 {
+				goto corrupted
+			}
+
+			n := int(b[1])
+			b = b[2:]
+			if len(b) < n {
+				goto corrupted
+			}
+
+			scalars = append(scalars, append([]byte(nil), b[:n]...))
+			b = b[n:]
+		case gbBytes2:
+			if len(b) < 3 {
+				goto corrupted
+			}
+
+			n := int(b[1])<<8 | int(b[2]) + 1
+			b = b[3:]
+			if len(b) < n {
+				goto corrupted
+			}
+
+			scalars = append(scalars, append([]byte(nil), b[:n]...))
+			b = b[n:]
+		case gbString00, gbString01, gbString02, gbString03, gbString04,
+			gbString05, gbString06, gbString07, gbString08, gbString09,
+			gbString10, gbString11, gbString12, gbString13, gbString14,
+			gbString15, gbString16, gbString17:
+			n := int(tag - gbString00)
+			if len(b) < n+1 {
+				goto corrupted
+			}
+
+			scalars = append(scalars, string(b[1:n+1]))
+			b = b[n+1:]
+		case gbString1:
+			if len(b) < 2 {
+				goto corrupted
+			}
+
+			n := int(b[1])
+			b = b[2:]
+			if len(b) < n {
+				goto corrupted
+			}
+
+			scalars = append(scalars, string(b[:n]))
+			b = b[n:]
+		case gbString2:
+			if len(b) < 3 {
+				goto corrupted
+			}
+
+			n := int(b[1])<<8 | int(b[2])
+			b = b[3:]
+			if len(b) < n {
+				goto corrupted
+			}
+
+			scalars = append(scalars, string(b[:n]))
+			b = b[n:]
+		case gbUintP1, gbUintP2, gbUintP3, gbUintP4, gbUintP5, gbUintP6, gbUintP7, gbUintP8:
+			b = b[1:]
+			n := 1 + int(tag) - gbUintP1
+			if len(b) < n {
+				goto corrupted
+			}
+
+			var u uint64
+			for _, v := range b[:n] {
+				u = u<<8 | uint64(v)
+			}
+			scalars = append(scalars, u)
+			b = b[n:]
+		case gbIntM8, gbIntM7, gbIntM6, gbIntM5, gbIntM4, gbIntM3, gbIntM2, gbIntM1:
+			b = b[1:]
+			n := 8 - (int(tag) - gbIntM8)
+			if len(b) < n {
+				goto corrupted
+			}
+			u := uint64(math.MaxUint64)
+			for _, v := range b[:n] {
+				u = u<<8 | uint64(v)
+			}
+			scalars = append(scalars, int64(u))
+			b = b[n:]
+		case gbIntP1, gbIntP2, gbIntP3, gbIntP4, gbIntP5, gbIntP6, gbIntP7, gbIntP8:
+			b = b[1:]
+			n := 1 + int(tag) - gbIntP1
+			if len(b) < n {
+				goto corrupted
+			}
+
+			i := int64(0)
+			for _, v := range b[:n] {
+				i = i<<8 | int64(v)
+			}
+			scalars = append(scalars, i)
+			b = b[n:]
+		default:
+			scalars = append(scalars, int64(b[0])-gbInt0)
+			b = b[1:]
+		}
+	}
+	return append([]interface{}(nil), scalars...), nil
+
+corrupted:
+	return nil, &ErrDecodeScalars{append([]byte(nil), b0...), len(b0) - len(b)}
+}
+
+func collateComplex(x, y complex128) int {
+	switch rx, ry := real(x), real(y); {
+	case rx < ry:
+		return -1
+	case rx == ry:
+		switch ix, iy := imag(x), imag(y); {
+		case ix < iy:
+			return -1
+		case ix == iy:
+			return 0
+		case ix > iy:
+			return 1
+		}
+	}
+	//case rx > ry:
+	return 1
+}
+
+func collateFloat(x, y float64) int {
+	switch {
+	case x < y:
+		return -1
+	case x == y:
+		return 0
+	}
+	//case x > y:
+	return 1
+}
+
+func collateInt(x, y int64) int {
+	switch {
+	case x < y:
+		return -1
+	case x == y:
+		return 0
+	}
+	//case x > y:
+	return 1
+}
+
+func collateUint(x, y uint64) int {
+	switch {
+	case x < y:
+		return -1
+	case x == y:
+		return 0
+	}
+	//case x > y:
+	return 1
+}
+
+func collateIntUint(x int64, y uint64) int {
+	if y > math.MaxInt64 {
+		return -1
+	}
+
+	return collateInt(x, int64(y))
+}
+
+func collateUintInt(x uint64, y int64) int {
+	return -collateIntUint(y, x)
+}
+
+func collateType(i interface{}) (r interface{}, err error) {
+	switch x := i.(type) {
+	default:
+		return nil, fmt.Errorf("invalid collate type %T", x)
+	case nil:
+		return i, nil
+	case bool:
+		return i, nil
+	case int8:
+		return int64(x), nil
+	case int16:
+		return int64(x), nil
+	case int32:
+		return int64(x), nil
+	case int64:
+		return i, nil
+	case int:
+		return int64(x), nil
+	case uint8:
+		return uint64(x), nil
+	case uint16:
+		return uint64(x), nil
+	case uint32:
+		return uint64(x), nil
+	case uint64:
+		return i, nil
+	case uint:
+		return uint64(x), nil
+	case float32:
+		return float64(x), nil
+	case float64:
+		return i, nil
+	case complex64:
+		return complex128(x), nil
+	case complex128:
+		return i, nil
+	case []byte:
+		return i, nil
+	case string:
+		return i, nil
+	}
+}
+
+// Collate collates two arrays of Go predeclared scalar types (and the typeless
+// nil or []byte). If any other type appears in x or y, Collate will return a
+// non nil error.  String items are collated using strCollate or lexically
+// byte-wise (as when using Go comparison operators) when strCollate is nil.
+// []byte items are collated using bytes.Compare.
+//
+// Collate returns:
+//
+// 	-1 if x <  y
+// 	 0 if x == y
+// 	+1 if x >  y
+//
+// The same value as defined above must be returned from strCollate.
+//
+// The "outer" ordering is: nil, bool, number, []byte, string. IOW, nil is
+// "smaller" than anything else except other nil, numbers collate before
+// []byte, []byte collate before strings, etc.
+//
+// Integers and real numbers collate as expected in math. However, complex
+// numbers are not ordered in Go. Here the ordering is defined: Complex numbers
+// are in comparison considered first only by their real part. Iff the result
+// is equality then the imaginary part is used to determine the ordering. In
+// this "second order" comparing, integers and real numbers are considered as
+// complex numbers with a zero imaginary part.
+func Collate(x, y []interface{}, strCollate func(string, string) int) (r int, err error) {
+	nx, ny := len(x), len(y)
+
+	switch {
+	case nx == 0 && ny != 0:
+		return -1, nil
+	case nx == 0 && ny == 0:
+		return 0, nil
+	case nx != 0 && ny == 0:
+		return 1, nil
+	}
+
+	r = 1
+	if nx > ny {
+		x, y, r = y, x, -r
+	}
+
+	var c int
+	for i, xi0 := range x {
+		yi0 := y[i]
+		xi, err := collateType(xi0)
+		if err != nil {
+			return 0, err
+		}
+
+		yi, err := collateType(yi0)
+		if err != nil {
+			return 0, err
+		}
+
+		switch x := xi.(type) {
+		default:
+			panic(fmt.Errorf("internal error: %T", x))
+
+		case nil:
+			switch yi.(type) {
+			case nil:
+				// nop
+			default:
+				return -r, nil
+			}
+
+		case bool:
+			switch y := yi.(type) {
+			case nil:
+				return r, nil
+			case bool:
+				switch {
+				case !x && y:
+					return -r, nil
+				case x == y:
+					// nop
+				case x && !y:
+					return r, nil
+				}
+			default:
+				return -r, nil
+			}
+
+		case int64:
+			switch y := yi.(type) {
+			case nil, bool:
+				return r, nil
+			case int64:
+				c = collateInt(x, y)
+			case uint64:
+				c = collateIntUint(x, y)
+			case float64:
+				c = collateFloat(float64(x), y)
+			case complex128:
+				c = collateComplex(complex(float64(x), 0), y)
+			case []byte:
+				return -r, nil
+			case string:
+				return -r, nil
+			}
+
+			if c != 0 {
+				return c * r, nil
+			}
+
+		case uint64:
+			switch y := yi.(type) {
+			case nil, bool:
+				return r, nil
+			case int64:
+				c = collateUintInt(x, y)
+			case uint64:
+				c = collateUint(x, y)
+			case float64:
+				c = collateFloat(float64(x), y)
+			case complex128:
+				c = collateComplex(complex(float64(x), 0), y)
+			case []byte:
+				return -r, nil
+			case string:
+				return -r, nil
+			}
+
+			if c != 0 {
+				return c * r, nil
+			}
+
+		case float64:
+			switch y := yi.(type) {
+			case nil, bool:
+				return r, nil
+			case int64:
+				c = collateFloat(x, float64(y))
+			case uint64:
+				c = collateFloat(x, float64(y))
+			case float64:
+				c = collateFloat(x, y)
+			case complex128:
+				c = collateComplex(complex(x, 0), y)
+			case []byte:
+				return -r, nil
+			case string:
+				return -r, nil
+			}
+
+			if c != 0 {
+				return c * r, nil
+			}
+
+		case complex128:
+			switch y := yi.(type) {
+			case nil, bool:
+				return r, nil
+			case int64:
+				c = collateComplex(x, complex(float64(y), 0))
+			case uint64:
+				c = collateComplex(x, complex(float64(y), 0))
+			case float64:
+				c = collateComplex(x, complex(y, 0))
+			case complex128:
+				c = collateComplex(x, y)
+			case []byte:
+				return -r, nil
+			case string:
+				return -r, nil
+			}
+
+			if c != 0 {
+				return c * r, nil
+			}
+
+		case []byte:
+			switch y := yi.(type) {
+			case nil, bool, int64, uint64, float64, complex128:
+				return r, nil
+			case []byte:
+				c = bytes.Compare(x, y)
+			case string:
+				return -r, nil
+			}
+
+			if c != 0 {
+				return c * r, nil
+			}
+
+		case string:
+			switch y := yi.(type) {
+			case nil, bool, int64, uint64, float64, complex128:
+				return r, nil
+			case []byte:
+				return r, nil
+			case string:
+				switch {
+				case strCollate != nil:
+					c = strCollate(x, y)
+				case x < y:
+					return -r, nil
+				case x == y:
+					c = 0
+				case x > y:
+					return r, nil
+				}
+			}
+
+			if c != 0 {
+				return c * r, nil
+			}
+		}
+	}
+
+	if nx == ny {
+		return 0, nil
+	}
+
+	return -r, nil
+}
diff --git a/vendor/github.com/cznic/exp/lldb/lldb.go b/vendor/github.com/cznic/exp/lldb/lldb.go
new file mode 100644
index 0000000000..8f77ec8add
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/lldb.go
@@ -0,0 +1,155 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package lldb (WIP) implements a low level database engine. The database
+// model used could be considered a specific implementation of some small(est)
+// intersection of models listed in [1]. As a settled term is lacking, it'll be
+// called here a 'Virtual memory model' (VMM).
+//
+// Experimental release notes
+//
+// This is an experimental release. Don't open a DB from two applications or
+// two instances of an application - it will get corrupted (no file locking is
+// implemented and this task is delegated to lldb's clients).
+//
+// WARNING: THE LLDB API IS SUBJECT TO CHANGE.
+//
+// Filers
+//
+// A Filer is an abstraction of storage. A Filer may be a part of some process'
+// virtual address space, an OS file, a networked, remote file etc. Persistence
+// of the storage is optional, opaque to VMM and it is specific to a concrete
+// Filer implementation.
+//
+// Space management
+//
+// Mechanism to allocate, reallocate (resize), deallocate (and later reclaim
+// the unused) contiguous parts of a Filer, called blocks.  Blocks are
+// identified and referred to by a handle, an int64.
+//
+// BTrees
+//
+// In addition to the VMM like services, lldb provides volatile and
+// non-volatile BTrees. Keys and values of a BTree are limited in size to 64kB
+// each (a bit more actually). Support for larger keys/values, if desired, can
+// be built atop a BTree to certain limits.
+//
+// Handles vs pointers
+//
+// A handle is the abstracted storage counterpart of a memory address.  There
+// is one fundamental difference, though. Resizing a block never results in a
+// change to the handle which refers to the resized block, so a handle is more
+// akin to an unique numeric id/key. Yet it shares one property of pointers -
+// handles can be associated again with blocks after the original handle block
+// was deallocated. In other words, a handle uniqueness domain is the state of
+// the database and is not something comparable to e.g. an ever growing
+// numbering sequence.
+//
+// Also, as with memory pointers, dangling handles can be created and blocks
+// overwritten when such handles are used. Using a zero handle to refer to a
+// block will not panic; however, the resulting error is effectively the same
+// exceptional situation as dereferencing a nil pointer.
+//
+// Blocks
+//
+// Allocated/used blocks, are limited in size to only a little bit more than
+// 64kB.  Bigger semantic entities/structures must be built in lldb's client
+// code.  The content of a block has no semantics attached, it's only a fully
+// opaque `[]byte`.
+//
+// Scalars
+//
+// Use of "scalars" applies to EncodeScalars, DecodeScalars and Collate. Those
+// first two "to bytes" and "from bytes" functions are suggested for handling
+// multi-valued Allocator content items and/or keys/values of BTrees (using
+// Collate for keys). Types called "scalar" are:
+//
+//	nil (the typeless one)
+//	bool
+//	all integral types: [u]int8, [u]int16, [u]int32, [u]int, [u]int64
+//	all floating point types: float32, float64
+//	all complex types: complex64, complex128
+//	[]byte (64kB max)
+//	string (64kb max)
+//
+// Specific implementations
+//
+// Included are concrete implementations of some of the VMM interfaces included
+// to ease serving simple client code or for testing and possibly as an
+// example.  More details in the documentation of such implementations.
+//
+//  [1]: http://en.wikipedia.org/wiki/Database_model
+package lldb
+
+const (
+	fltSz            = 0x70 // size of the FLT
+	maxShort         = 251
+	maxRq            = 65787
+	maxFLTRq         = 4112
+	maxHandle        = 1<<56 - 1
+	atomLen          = 16
+	tagUsedLong      = 0xfc
+	tagUsedRelocated = 0xfd
+	tagFreeShort     = 0xfe
+	tagFreeLong      = 0xff
+	tagNotCompressed = 0
+	tagCompressed    = 1
+)
+
+// Content size n -> blocksize in atoms.
+func n2atoms(n int) int {
+	if n > maxShort {
+		n += 2
+	}
+	return (n+1)/16 + 1
+}
+
+// Content size n -> number of padding zeros.
+func n2padding(n int) int {
+	if n > maxShort {
+		n += 2
+	}
+	return 15 - (n+1)&15
+}
+
+// Handle <-> offset
+func h2off(h int64) int64   { return (h + 6) * 16 }
+func off2h(off int64) int64 { return off/16 - 6 }
+
+// Get a 7B int64 from b
+func b2h(b []byte) (h int64) {
+	for _, v := range b[:7] {
+		h = h<<8 | int64(v)
+	}
+	return
+}
+
+// Put a 7B int64 into b
+func h2b(b []byte, h int64) []byte {
+	for i := range b[:7] {
+		b[i], h = byte(h>>48), h<<8
+	}
+	return b
+}
+
+// Content length N (must be in [252, 65787]) to long used block M field.
+func n2m(n int) (m int) {
+	return n % 0x10000
+}
+
+// Long used block M (must be in [0, 65535]) field to content length N.
+func m2n(m int) (n int) {
+	if m <= maxShort {
+		m += 0x10000
+	}
+	return m
+}
+
+func bpack(a []byte) []byte {
+	if cap(a) > len(a) {
+		return append([]byte(nil), a...)
+	}
+
+	return a
+}
diff --git a/vendor/github.com/cznic/exp/lldb/memfiler.go b/vendor/github.com/cznic/exp/lldb/memfiler.go
new file mode 100644
index 0000000000..417e92f3aa
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/memfiler.go
@@ -0,0 +1,344 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// A memory-only implementation of Filer.
+
+/*
+
+pgBits: 8
+BenchmarkMemFilerWrSeq	  100000	     19430 ns/op	1646.93 MB/s
+BenchmarkMemFilerRdSeq	  100000	     17390 ns/op	1840.13 MB/s
+BenchmarkMemFilerWrRand	 1000000	      1903 ns/op	 133.94 MB/s
+BenchmarkMemFilerRdRand	 1000000	      1153 ns/op	 221.16 MB/s
+
+pgBits: 9
+BenchmarkMemFilerWrSeq	  100000	     16195 ns/op	1975.80 MB/s
+BenchmarkMemFilerRdSeq	  200000	     13011 ns/op	2459.39 MB/s
+BenchmarkMemFilerWrRand	 1000000	      2248 ns/op	 227.28 MB/s
+BenchmarkMemFilerRdRand	 1000000	      1177 ns/op	 433.94 MB/s
+
+pgBits: 10
+BenchmarkMemFilerWrSeq	  100000	     16169 ns/op	1979.04 MB/s
+BenchmarkMemFilerRdSeq	  200000	     12673 ns/op	2524.91 MB/s
+BenchmarkMemFilerWrRand	 1000000	      5550 ns/op	 184.30 MB/s
+BenchmarkMemFilerRdRand	 1000000	      1699 ns/op	 601.79 MB/s
+
+pgBits: 11
+BenchmarkMemFilerWrSeq	  100000	     13449 ns/op	2379.31 MB/s
+BenchmarkMemFilerRdSeq	  200000	     12058 ns/op	2653.80 MB/s
+BenchmarkMemFilerWrRand	  500000	      4335 ns/op	 471.47 MB/s
+BenchmarkMemFilerRdRand	 1000000	      2843 ns/op	 719.47 MB/s
+
+pgBits: 12
+BenchmarkMemFilerWrSeq	  200000	     11976 ns/op	2672.00 MB/s
+BenchmarkMemFilerRdSeq	  200000	     12255 ns/op	2611.06 MB/s
+BenchmarkMemFilerWrRand	  200000	      8058 ns/op	 507.14 MB/s
+BenchmarkMemFilerRdRand	  500000	      4365 ns/op	 936.15 MB/s
+
+pgBits: 13
+BenchmarkMemFilerWrSeq	  200000	     10852 ns/op	2948.69 MB/s
+BenchmarkMemFilerRdSeq	  200000	     11561 ns/op	2767.77 MB/s
+BenchmarkMemFilerWrRand	  200000	      9748 ns/op	 840.15 MB/s
+BenchmarkMemFilerRdRand	  500000	      7236 ns/op	1131.59 MB/s
+
+pgBits: 14
+BenchmarkMemFilerWrSeq	  200000	     10328 ns/op	3098.12 MB/s
+BenchmarkMemFilerRdSeq	  200000	     11292 ns/op	2833.66 MB/s
+BenchmarkMemFilerWrRand	  100000	     16768 ns/op	 978.75 MB/s
+BenchmarkMemFilerRdRand	  200000	     13033 ns/op	1258.43 MB/s
+
+pgBits: 15
+BenchmarkMemFilerWrSeq	  200000	     10309 ns/op	3103.93 MB/s
+BenchmarkMemFilerRdSeq	  200000	     11126 ns/op	2876.12 MB/s
+BenchmarkMemFilerWrRand	   50000	     31985 ns/op	1021.74 MB/s
+BenchmarkMemFilerRdRand	  100000	     25217 ns/op	1297.65 MB/s
+
+pgBits: 16
+BenchmarkMemFilerWrSeq	  200000	     10324 ns/op	3099.45 MB/s
+BenchmarkMemFilerRdSeq	  200000	     11201 ns/op	2856.80 MB/s
+BenchmarkMemFilerWrRand	   20000	     55226 ns/op	1184.76 MB/s
+BenchmarkMemFilerRdRand	   50000	     48316 ns/op	1355.16 MB/s
+
+pgBits: 17
+BenchmarkMemFilerWrSeq	  200000	     10377 ns/op	3083.53 MB/s
+BenchmarkMemFilerRdSeq	  200000	     11018 ns/op	2904.18 MB/s
+BenchmarkMemFilerWrRand	   10000	    143425 ns/op	 913.12 MB/s
+BenchmarkMemFilerRdRand	   20000	     95267 ns/op	1376.99 MB/s
+
+pgBits: 18
+BenchmarkMemFilerWrSeq	  200000	     10312 ns/op	3102.96 MB/s
+BenchmarkMemFilerRdSeq	  200000	     11069 ns/op	2890.84 MB/s
+BenchmarkMemFilerWrRand	    5000	    280910 ns/op	 934.14 MB/s
+BenchmarkMemFilerRdRand	   10000	    188500 ns/op	1388.17 MB/s
+
+*/
+
+package lldb
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+
+	"github.com/cznic/fileutil"
+	"github.com/cznic/mathutil"
+)
+
+const (
+	pgBits = 16
+	pgSize = 1 << pgBits
+	pgMask = pgSize - 1
+)
+
+var _ Filer = &MemFiler{} // Ensure MemFiler is a Filer.
+
+type memFilerMap map[int64]*[pgSize]byte
+
+// MemFiler is a memory backed Filer. It implements BeginUpdate, EndUpdate and
+// Rollback as no-ops. MemFiler is not automatically persistent, but it has
+// ReadFrom and WriteTo methods.
+type MemFiler struct {
+	m    memFilerMap
+	nest int
+	size int64
+}
+
+// NewMemFiler returns a new MemFiler.
+func NewMemFiler() *MemFiler {
+	return &MemFiler{m: memFilerMap{}}
+}
+
+// BeginUpdate implements Filer.
+func (f *MemFiler) BeginUpdate() error {
+	f.nest++
+	return nil
+}
+
+// Close implements Filer.
+func (f *MemFiler) Close() (err error) {
+	if f.nest != 0 {
+		return &ErrPERM{(f.Name() + ":Close")}
+	}
+
+	return
+}
+
+// EndUpdate implements Filer.
+func (f *MemFiler) EndUpdate() (err error) {
+	if f.nest == 0 {
+		return &ErrPERM{(f.Name() + ": EndUpdate")}
+	}
+
+	f.nest--
+	return
+}
+
+// Name implements Filer.
+func (f *MemFiler) Name() string {
+	return fmt.Sprintf("%p.memfiler", f)
+}
+
+// PunchHole implements Filer.
+func (f *MemFiler) PunchHole(off, size int64) (err error) {
+	if off < 0 {
+		return &ErrINVAL{f.Name() + ": PunchHole off", off}
+	}
+
+	if size < 0 || off+size > f.size {
+		return &ErrINVAL{f.Name() + ": PunchHole size", size}
+	}
+
+	first := off >> pgBits
+	if off&pgMask != 0 {
+		first++
+	}
+	off += size - 1
+	last := off >> pgBits
+	if off&pgMask != 0 {
+		last--
+	}
+	if limit := f.size >> pgBits; last > limit {
+		last = limit
+	}
+	for pg := first; pg <= last; pg++ {
+		delete(f.m, pg)
+	}
+	return
+}
+
+var zeroPage [pgSize]byte
+
+// ReadAt implements Filer.
+func (f *MemFiler) ReadAt(b []byte, off int64) (n int, err error) {
+	avail := f.size - off
+	pgI := off >> pgBits
+	pgO := int(off & pgMask)
+	rem := len(b)
+	if int64(rem) >= avail {
+		rem = int(avail)
+		err = io.EOF
+	}
+	for rem != 0 && avail > 0 {
+		pg := f.m[pgI]
+		if pg == nil {
+			pg = &zeroPage
+		}
+		nc := copy(b[:mathutil.Min(rem, pgSize)], pg[pgO:])
+		pgI++
+		pgO = 0
+		rem -= nc
+		n += nc
+		b = b[nc:]
+	}
+	return
+}
+
+// ReadFrom is a helper to populate MemFiler's content from r.  'n' reports the
+// number of bytes read from 'r'.
+func (f *MemFiler) ReadFrom(r io.Reader) (n int64, err error) {
+	if err = f.Truncate(0); err != nil {
+		return
+	}
+
+	var (
+		b   [pgSize]byte
+		rn  int
+		off int64
+	)
+
+	var rerr error
+	for rerr == nil {
+		if rn, rerr = r.Read(b[:]); rn != 0 {
+			f.WriteAt(b[:rn], off)
+			off += int64(rn)
+			n += int64(rn)
+		}
+	}
+	if !fileutil.IsEOF(rerr) {
+		err = rerr
+	}
+	return
+}
+
+// Rollback implements Filer.
+func (f *MemFiler) Rollback() (err error) { return }
+
+// Size implements Filer.
+func (f *MemFiler) Size() (int64, error) {
+	return f.size, nil
+}
+
+// Sync implements Filer.
+func (f *MemFiler) Sync() error {
+	return nil
+}
+
+// Truncate implements Filer.
+func (f *MemFiler) Truncate(size int64) (err error) {
+	switch {
+	case size < 0:
+		return &ErrINVAL{"Truncate size", size}
+	case size == 0:
+		f.m = memFilerMap{}
+		f.size = 0
+		return
+	}
+
+	first := size >> pgBits
+	if size&pgMask != 0 {
+		first++
+	}
+	last := f.size >> pgBits
+	if f.size&pgMask != 0 {
+		last++
+	}
+	for ; first < last; first++ {
+		delete(f.m, first)
+	}
+
+	f.size = size
+	return
+}
+
+// WriteAt implements Filer.
+func (f *MemFiler) WriteAt(b []byte, off int64) (n int, err error) {
+	pgI := off >> pgBits
+	pgO := int(off & pgMask)
+	n = len(b)
+	rem := n
+	var nc int
+	for rem != 0 {
+		if pgO == 0 && rem >= pgSize && bytes.Equal(b[:pgSize], zeroPage[:]) {
+			delete(f.m, pgI)
+			nc = pgSize
+		} else {
+			pg := f.m[pgI]
+			if pg == nil {
+				pg = new([pgSize]byte)
+				f.m[pgI] = pg
+			}
+			nc = copy((*pg)[pgO:], b)
+		}
+		pgI++
+		pgO = 0
+		rem -= nc
+		b = b[nc:]
+	}
+	f.size = mathutil.MaxInt64(f.size, off+int64(n))
+	return
+}
+
+// WriteTo is a helper to copy/persist MemFiler's content to w.  If w is also
+// an io.WriterAt then WriteTo may attempt to _not_ write any big, for some
+// value of big, runs of zeros, i.e. it will attempt to punch holes, where
+// possible, in `w` if that happens to be a freshly created or to zero length
+// truncated OS file.  'n' reports the number of bytes written to 'w'.
+func (f *MemFiler) WriteTo(w io.Writer) (n int64, err error) {
+	var (
+		b      [pgSize]byte
+		wn, rn int
+		off    int64
+		rerr   error
+	)
+
+	if wa, ok := w.(io.WriterAt); ok {
+		lastPgI := f.size >> pgBits
+		for pgI := int64(0); pgI <= lastPgI; pgI++ {
+			sz := pgSize
+			if pgI == lastPgI {
+				sz = int(f.size & pgMask)
+			}
+			pg := f.m[pgI]
+			if pg != nil {
+				wn, err = wa.WriteAt(pg[:sz], off)
+				if err != nil {
+					return
+				}
+
+				n += int64(wn)
+				off += int64(sz)
+				if wn != sz {
+					return n, io.ErrShortWrite
+				}
+			}
+		}
+		return
+	}
+
+	var werr error
+	for rerr == nil {
+		if rn, rerr = f.ReadAt(b[:], off); rn != 0 {
+			off += int64(rn)
+			if wn, werr = w.Write(b[:rn]); werr != nil {
+				return n, werr
+			}
+
+			n += int64(wn)
+		}
+	}
+	if !fileutil.IsEOF(rerr) {
+		err = rerr
+	}
+	return
+}
diff --git a/vendor/github.com/cznic/exp/lldb/osfiler.go b/vendor/github.com/cznic/exp/lldb/osfiler.go
new file mode 100644
index 0000000000..d6e189a18f
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/osfiler.go
@@ -0,0 +1,130 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package lldb
+
+import (
+	"io"
+	"os"
+
+	"github.com/cznic/mathutil"
+)
+
+var _ Filer = (*OSFiler)(nil)
+
+// OSFile is an os.File like minimal set of methods allowing to construct a
+// Filer.
+type OSFile interface {
+	Name() string
+	Stat() (fi os.FileInfo, err error)
+	Sync() (err error)
+	Truncate(size int64) (err error)
+	io.Closer
+	io.Reader
+	io.ReaderAt
+	io.Seeker
+	io.Writer
+	io.WriterAt
+}
+
+// OSFiler is like a SimpleFileFiler but based on an OSFile.
+type OSFiler struct {
+	f    OSFile
+	nest int
+	size int64 // not set if < 0
+}
+
+// NewOSFiler returns a Filer from an OSFile. This Filer is like the
+// SimpleFileFiler, it does not implement the transaction related methods.
+func NewOSFiler(f OSFile) (r *OSFiler) {
+	return &OSFiler{
+		f:    f,
+		size: -1,
+	}
+}
+
+// BeginUpdate implements Filer.
+func (f *OSFiler) BeginUpdate() (err error) {
+	f.nest++
+	return nil
+}
+
+// Close implements Filer.
+func (f *OSFiler) Close() (err error) {
+	if f.nest != 0 {
+		return &ErrPERM{(f.Name() + ":Close")}
+	}
+
+	return f.f.Close()
+}
+
+// EndUpdate implements Filer.
+func (f *OSFiler) EndUpdate() (err error) {
+	if f.nest == 0 {
+		return &ErrPERM{(f.Name() + ":EndUpdate")}
+	}
+
+	f.nest--
+	return
+}
+
+// Name implements Filer.
+func (f *OSFiler) Name() string {
+	return f.f.Name()
+}
+
+// PunchHole implements Filer.
+func (f *OSFiler) PunchHole(off, size int64) (err error) {
+	return
+}
+
+// ReadAt implements Filer.
+func (f *OSFiler) ReadAt(b []byte, off int64) (n int, err error) {
+	return f.f.ReadAt(b, off)
+}
+
+// Rollback implements Filer.
+func (f *OSFiler) Rollback() (err error) { return }
+
+// Size implements Filer.
+func (f *OSFiler) Size() (n int64, err error) {
+	if f.size < 0 { // boot
+		fi, err := f.f.Stat()
+		if err != nil {
+			return 0, err
+		}
+
+		f.size = fi.Size()
+	}
+	return f.size, nil
+}
+
+// Sync implements Filer.
+func (f *OSFiler) Sync() (err error) {
+	return f.f.Sync()
+}
+
+// Truncate implements Filer.
+func (f *OSFiler) Truncate(size int64) (err error) {
+	if size < 0 {
+		return &ErrINVAL{"Truncate size", size}
+	}
+
+	f.size = size
+	return f.f.Truncate(size)
+}
+
+// WriteAt implements Filer.
+func (f *OSFiler) WriteAt(b []byte, off int64) (n int, err error) {
+	if f.size < 0 { // boot
+		fi, err := os.Stat(f.f.Name())
+		if err != nil {
+			return 0, err
+		}
+
+		f.size = fi.Size()
+	}
+	f.size = mathutil.MaxInt64(f.size, int64(len(b))+off)
+	return f.f.WriteAt(b, off)
+}
diff --git a/vendor/github.com/cznic/exp/lldb/simplefilefiler.go b/vendor/github.com/cznic/exp/lldb/simplefilefiler.go
new file mode 100644
index 0000000000..de32e64916
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/simplefilefiler.go
@@ -0,0 +1,123 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// A basic os.File backed Filer.
+
+package lldb
+
+import (
+	"os"
+
+	"github.com/cznic/fileutil"
+	"github.com/cznic/mathutil"
+)
+
+var _ Filer = &SimpleFileFiler{} // Ensure SimpleFileFiler is a Filer.
+
+// SimpleFileFiler is an os.File backed Filer intended for use where structural
+// consistency can be reached by other means (SimpleFileFiler is for example
+// wrapped in eg. an RollbackFiler or ACIDFiler0) or where persistence is not
+// required (temporary/working data sets).
+//
+// SimpleFileFiler is the most simple os.File backed Filer implementation as it
+// does not really implement BeginUpdate and EndUpdate/Rollback in any way
+// which would protect the structural integrity of data. If misused e.g. as a
+// real database storage w/o other measures, it can easily cause data loss
+// when, for example, a power outage occurs or the updating process terminates
+// abruptly.
+type SimpleFileFiler struct {
+	file *os.File
+	nest int
+	size int64 // not set if < 0
+}
+
+// NewSimpleFileFiler returns a new SimpleFileFiler.
+func NewSimpleFileFiler(f *os.File) *SimpleFileFiler {
+	return &SimpleFileFiler{file: f, size: -1}
+}
+
+// BeginUpdate implements Filer.
+func (f *SimpleFileFiler) BeginUpdate() error {
+	f.nest++
+	return nil
+}
+
+// Close implements Filer.
+func (f *SimpleFileFiler) Close() (err error) {
+	if f.nest != 0 {
+		return &ErrPERM{(f.Name() + ":Close")}
+	}
+
+	return f.file.Close()
+}
+
+// EndUpdate implements Filer.
+func (f *SimpleFileFiler) EndUpdate() (err error) {
+	if f.nest == 0 {
+		return &ErrPERM{(f.Name() + ":EndUpdate")}
+	}
+
+	f.nest--
+	return
+}
+
+// Name implements Filer.
+func (f *SimpleFileFiler) Name() string {
+	return f.file.Name()
+}
+
+// PunchHole implements Filer.
+func (f *SimpleFileFiler) PunchHole(off, size int64) (err error) {
+	return fileutil.PunchHole(f.file, off, size)
+}
+
+// ReadAt implements Filer.
+func (f *SimpleFileFiler) ReadAt(b []byte, off int64) (n int, err error) {
+	return f.file.ReadAt(b, off)
+}
+
+// Rollback implements Filer.
+func (f *SimpleFileFiler) Rollback() (err error) { return }
+
+// Size implements Filer.
+func (f *SimpleFileFiler) Size() (int64, error) {
+	if f.size < 0 { // boot
+		fi, err := os.Stat(f.file.Name())
+		if err != nil {
+			return 0, err
+		}
+
+		f.size = fi.Size()
+	}
+	return f.size, nil
+}
+
+// Sync implements Filer.
+func (f *SimpleFileFiler) Sync() error {
+	return f.file.Sync()
+}
+
+// Truncate implements Filer.
+func (f *SimpleFileFiler) Truncate(size int64) (err error) {
+	if size < 0 {
+		return &ErrINVAL{"Truncate size", size}
+	}
+
+	f.size = size
+	return f.file.Truncate(size)
+}
+
+// WriteAt implements Filer.
+func (f *SimpleFileFiler) WriteAt(b []byte, off int64) (n int, err error) {
+	if f.size < 0 { // boot
+		fi, err := os.Stat(f.file.Name())
+		if err != nil {
+			return 0, err
+		}
+
+		f.size = fi.Size()
+	}
+	f.size = mathutil.MaxInt64(f.size, int64(len(b))+off)
+	return f.file.WriteAt(b, off)
+}
diff --git a/vendor/github.com/cznic/exp/lldb/xact.go b/vendor/github.com/cznic/exp/lldb/xact.go
new file mode 100644
index 0000000000..f9ad1cbfb7
--- /dev/null
+++ b/vendor/github.com/cznic/exp/lldb/xact.go
@@ -0,0 +1,629 @@
+// Copyright 2014 The lldb Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Structural transactions.
+
+package lldb
+
+//DONE+ TransactionalMemoryFiler
+//	----
+//	Use NewRollbackFiler(myMemFiler, ...)
+
+/*
+
+bfBits: 3
+BenchmarkRollbackFiler	20000000	       102 ns/op	   9.73 MB/s
+
+bfBits: 4
+BenchmarkRollbackFiler	50000000	        55.7 ns/op	  17.95 MB/s
+
+bfBits: 5
+BenchmarkRollbackFiler	100000000	        32.2 ns/op	  31.06 MB/s
+
+bfBits: 6
+BenchmarkRollbackFiler	100000000	        20.6 ns/op	  48.46 MB/s
+
+bfBits: 7
+BenchmarkRollbackFiler	100000000	        15.1 ns/op	  66.12 MB/s
+
+bfBits: 8
+BenchmarkRollbackFiler	100000000	        10.5 ns/op	  95.66 MB/s
+
+bfBits: 9
+BenchmarkRollbackFiler	200000000	         8.02 ns/op	 124.74 MB/s
+
+bfBits: 10
+BenchmarkRollbackFiler	200000000	         9.25 ns/op	 108.09 MB/s
+
+bfBits: 11
+BenchmarkRollbackFiler	100000000	        11.7 ns/op	  85.47 MB/s
+
+bfBits: 12
+BenchmarkRollbackFiler	100000000	        17.2 ns/op	  57.99 MB/s
+
+bfBits: 13
+BenchmarkRollbackFiler	100000000	        32.7 ns/op	  30.58 MB/s
+
+bfBits: 14
+BenchmarkRollbackFiler	50000000	        39.6 ns/op	  25.27 MB/s
+
+*/
+
+import (
+	"fmt"
+	"io"
+	"sync"
+
+	"github.com/cznic/fileutil"
+	"github.com/cznic/mathutil"
+)
+
+var (
+	_ Filer = &bitFiler{}      // Ensure bitFiler is a Filer.
+	_ Filer = &RollbackFiler{} // ditto
+)
+
+const (
+	bfBits = 9
+	bfSize = 1 << bfBits
+	bfMask = bfSize - 1
+)
+
+var (
+	bitmask       = [8]byte{1, 2, 4, 8, 16, 32, 64, 128}
+	bitZeroPage   bitPage
+	allDirtyFlags [bfSize >> 3]byte
+)
+
+func init() {
+	for i := range allDirtyFlags {
+		allDirtyFlags[i] = 0xff
+	}
+}
+
+type (
+	bitPage struct {
+		prev, next *bitPage
+		data       [bfSize]byte
+		flags      [bfSize >> 3]byte
+		dirty      bool
+	}
+
+	bitFilerMap map[int64]*bitPage
+
+	bitFiler struct {
+		parent Filer
+		m      bitFilerMap
+		size   int64
+	}
+)
+
+func newBitFiler(parent Filer) (f *bitFiler, err error) {
+	sz, err := parent.Size()
+	if err != nil {
+		return
+	}
+
+	return &bitFiler{parent: parent, m: bitFilerMap{}, size: sz}, nil
+}
+
+func (f *bitFiler) BeginUpdate() error { panic("internal error") }
+func (f *bitFiler) EndUpdate() error   { panic("internal error") }
+func (f *bitFiler) Rollback() error    { panic("internal error") }
+func (f *bitFiler) Sync() error        { panic("internal error") }
+
+func (f *bitFiler) Close() (err error)   { return }
+func (f *bitFiler) Name() string         { return fmt.Sprintf("%p.bitfiler", f) }
+func (f *bitFiler) Size() (int64, error) { return f.size, nil }
+
+func (f *bitFiler) PunchHole(off, size int64) (err error) {
+	first := off >> bfBits
+	if off&bfMask != 0 {
+		first++
+	}
+	off += size - 1
+	last := off >> bfBits
+	if off&bfMask != 0 {
+		last--
+	}
+	if limit := f.size >> bfBits; last > limit {
+		last = limit
+	}
+	for pgI := first; pgI <= last; pgI++ {
+		pg := &bitPage{}
+		pg.flags = allDirtyFlags
+		f.m[pgI] = pg
+	}
+	return
+}
+
+func (f *bitFiler) ReadAt(b []byte, off int64) (n int, err error) {
+	avail := f.size - off
+	pgI := off >> bfBits
+	pgO := int(off & bfMask)
+	rem := len(b)
+	if int64(rem) >= avail {
+		rem = int(avail)
+		err = io.EOF
+	}
+	for rem != 0 && avail > 0 {
+		pg := f.m[pgI]
+		if pg == nil {
+			pg = &bitPage{}
+			if f.parent != nil {
+				_, err = f.parent.ReadAt(pg.data[:], off&^bfMask)
+				if err != nil && !fileutil.IsEOF(err) {
+					return
+				}
+
+				err = nil
+			}
+			f.m[pgI] = pg
+		}
+		nc := copy(b[:mathutil.Min(rem, bfSize)], pg.data[pgO:])
+		pgI++
+		pgO = 0
+		rem -= nc
+		n += nc
+		b = b[nc:]
+		off += int64(nc)
+	}
+	return
+}
+
+func (f *bitFiler) Truncate(size int64) (err error) {
+	switch {
+	case size < 0:
+		return &ErrINVAL{"Truncate size", size}
+	case size == 0:
+		f.m = bitFilerMap{}
+		f.size = 0
+		return
+	}
+
+	first := size >> bfBits
+	if size&bfMask != 0 {
+		first++
+	}
+	last := f.size >> bfBits
+	if f.size&bfMask != 0 {
+		last++
+	}
+	for ; first < last; first++ {
+		delete(f.m, first)
+	}
+
+	f.size = size
+	return
+}
+
+func (f *bitFiler) WriteAt(b []byte, off int64) (n int, err error) {
+	off0 := off
+	pgI := off >> bfBits
+	pgO := int(off & bfMask)
+	n = len(b)
+	rem := n
+	var nc int
+	for rem != 0 {
+		pg := f.m[pgI]
+		if pg == nil {
+			pg = &bitPage{}
+			if f.parent != nil {
+				_, err = f.parent.ReadAt(pg.data[:], off&^bfMask)
+				if err != nil && !fileutil.IsEOF(err) {
+					return
+				}
+
+				err = nil
+			}
+			f.m[pgI] = pg
+		}
+		nc = copy(pg.data[pgO:], b)
+		pgI++
+		pg.dirty = true
+		for i := pgO; i < pgO+nc; i++ {
+			pg.flags[i>>3] |= bitmask[i&7]
+		}
+		pgO = 0
+		rem -= nc
+		b = b[nc:]
+		off += int64(nc)
+	}
+	f.size = mathutil.MaxInt64(f.size, off0+int64(n))
+	return
+}
+
+func (f *bitFiler) link() {
+	for pgI, pg := range f.m {
+		nx, ok := f.m[pgI+1]
+		if !ok || !nx.dirty {
+			continue
+		}
+
+		nx.prev, pg.next = pg, nx
+	}
+}
+
+func (f *bitFiler) dumpDirty(w io.WriterAt) (nwr int, err error) {
+	f.link()
+	for pgI, pg := range f.m {
+		if !pg.dirty {
+			continue
+		}
+
+		for pg.prev != nil && pg.prev.dirty {
+			pg = pg.prev
+			pgI--
+		}
+
+		for pg != nil && pg.dirty {
+			last := false
+			var off int64
+			first := -1
+			for i := 0; i < bfSize; i++ {
+				flag := pg.flags[i>>3]&bitmask[i&7] != 0
+				switch {
+				case flag && !last: // Leading edge detected
+					off = pgI<<bfBits + int64(i)
+					first = i
+				case !flag && last: // Trailing edge detected
+					n, err := w.WriteAt(pg.data[first:i], off)
+					if n != i-first {
+						return 0, err
+					}
+					first = -1
+					nwr++
+				}
+
+				last = flag
+			}
+			if first >= 0 {
+				i := bfSize
+				n, err := w.WriteAt(pg.data[first:i], off)
+				if n != i-first {
+					return 0, err
+				}
+
+				nwr++
+			}
+
+			pg.dirty = false
+			pg = pg.next
+			pgI++
+		}
+	}
+	return
+}
+
+// RollbackFiler is a Filer implementing structural transaction handling.
+// Structural transactions should be small and short lived because all non
+// committed data are held in memory until committed or discarded by a
+// Rollback.
+//
+// While using RollbackFiler, every intended update of the wrapped Filler, by
+// WriteAt, Truncate or PunchHole, _must_ be made within a transaction.
+// Attempts to do it outside of a transaction will return ErrPERM. OTOH,
+// invoking ReadAt outside of a transaction is not a problem.
+//
+// No nested transactions: All updates within a transaction are held in memory.
+// On a matching EndUpdate the updates held in memory are actually written to
+// the wrapped Filer.
+//
+// Nested transactions: Correct data will be seen from RollbackFiler when any
+// level of a nested transaction is rollbacked. The actual writing to the
+// wrapped Filer happens only when the outer most transaction nesting level is
+// closed.
+//
+// Invoking Rollback is an alternative to EndUpdate. It discards all changes
+// made at the current transaction level and returns the "state" (possibly not
+// yet persisted) of the Filer to what it was before the corresponding
+// BeginUpdate.
+//
+// During an open transaction, all reads (using ReadAt) are "dirty" reads,
+// seeing the uncommitted changes made to the Filer's data.
+//
+// Lldb databases should be based upon a RollbackFiler.
+//
+// With a wrapped MemFiler one gets transactional memory. With, for example a
+// wrapped disk based SimpleFileFiler it protects against at least some HW
+// errors - if Rollback is properly invoked on such failures and/or if there's
+// some WAL or 2PC or whatever other safe mechanism based recovery procedure
+// used by the client.
+//
+// The "real" writes to the wrapped Filer (or WAL instead) go through the
+// writerAt supplied to NewRollbackFiler.
+//
+// List of functions/methods which are recommended to be wrapped in a
+// BeginUpdate/EndUpdate structural transaction:
+//
+// 	Allocator.Alloc
+// 	Allocator.Free
+// 	Allocator.Realloc
+//
+//	CreateBTree
+// 	RemoveBTree
+// 	BTree.Clear
+// 	BTree.Delete
+// 	BTree.DeleteAny
+// 	BTree.Clear
+// 	BTree.Extract
+// 	BTree.Get (it can mutate the DB)
+// 	BTree.Put
+// 	BTree.Set
+//
+// NOTE: RollbackFiler is a generic solution intended to wrap Filers provided
+// by this package which do not implement any of the transactional methods.
+// RollbackFiler thus _does not_ invoke any of the transactional methods of its
+// wrapped Filer.
+//
+// RollbackFiler is safe for concurrent use by multiple goroutines.
+type RollbackFiler struct {
+	mu           sync.RWMutex
+	inCallback   bool
+	inCallbackMu sync.RWMutex
+	bitFiler     *bitFiler
+	checkpoint   func(int64) error
+	closed       bool
+	f            Filer
+	parent       Filer
+	tlevel       int // transaction nesting level, 0 == not in transaction
+	writerAt     io.WriterAt
+
+	// afterRollback, if not nil, is called after performing Rollback
+	// without errros.
+	afterRollback func() error
+}
+
+// NewRollbackFiler returns a RollbackFiler wrapping f.
+//
+// The checkpoint parameter
+//
+// The checkpoint function is called after closing (by EndUpdate) the upper
+// most level open transaction if all calls of writerAt were successful and the
+// DB (or eg. a WAL) is thus now in a consistent state (virtually, in the ideal
+// world with no write caches, no HW failures, no process crashes, ...).
+//
+// NOTE: In, for example, a 2PC it is necessary to reflect also the sz
+// parameter as the new file size (as in the parameter to Truncate). All
+// changes were successfully written already by writerAt before invoking
+// checkpoint.
+//
+// The writerAt parameter
+//
+// The writerAt interface is used to commit the updates of the wrapped Filer.
+// If any invocation of writerAt fails then a non nil error will be returned
+// from EndUpdate and checkpoint will _not_ ne called.  Neither is necessary to
+// call Rollback. The rule of thumb: The [structural] transaction [level] is
+// closed by invoking exactly once one of EndUpdate _or_ Rollback.
+//
+// It is presumed that writerAt uses WAL or 2PC or whatever other safe
+// mechanism to physically commit the updates.
+//
+// Updates performed by invocations of writerAt are byte-precise, but not
+// necessarily maximum possible length precise. IOW, for example an update
+// crossing page boundaries may be performed by more than one writerAt
+// invocation.  No offset sorting is performed.  This may change if it proves
+// to be a problem. Such change would be considered backward compatible.
+//
+// NOTE: Using RollbackFiler, but failing to ever invoke a matching "closing"
+// EndUpdate after an "opening" BeginUpdate means neither writerAt or
+// checkpoint will ever get called - with all the possible data loss
+// consequences.
+func NewRollbackFiler(f Filer, checkpoint func(sz int64) error, writerAt io.WriterAt) (r *RollbackFiler, err error) {
+	if f == nil || checkpoint == nil || writerAt == nil {
+		return nil, &ErrINVAL{Src: "lldb.NewRollbackFiler, nil argument"}
+	}
+
+	return &RollbackFiler{
+		checkpoint: checkpoint,
+		f:          f,
+		writerAt:   writerAt,
+	}, nil
+}
+
+// Implements Filer.
+func (r *RollbackFiler) BeginUpdate() (err error) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	parent := r.f
+	if r.tlevel != 0 {
+		parent = r.bitFiler
+	}
+	r.bitFiler, err = newBitFiler(parent)
+	if err != nil {
+		return
+	}
+
+	r.tlevel++
+	return
+}
+
+// Implements Filer.
+//
+// Close will return an error if not invoked at nesting level 0.  However, to
+// allow emergency closing from eg. a signal handler; if Close is invoked
+// within an open transaction(s), it rollbacks any non committed open
+// transactions and performs the Close operation.
+//
+// IOW: Regardless of the transaction nesting level the Close is always
+// performed but any uncommitted transaction data are lost.
+func (r *RollbackFiler) Close() (err error) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	if r.closed {
+		return &ErrPERM{r.f.Name() + ": Already closed"}
+	}
+
+	r.closed = true
+	if err = r.f.Close(); err != nil {
+		return
+	}
+
+	if r.tlevel != 0 {
+		err = &ErrPERM{r.f.Name() + ": Close inside an open transaction"}
+	}
+
+	return
+}
+
+// Implements Filer.
+func (r *RollbackFiler) EndUpdate() (err error) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	if r.tlevel == 0 {
+		return &ErrPERM{r.f.Name() + " : EndUpdate outside of a transaction"}
+	}
+
+	sz, err := r.size() // Cannot call .Size() -> deadlock
+	if err != nil {
+		return
+	}
+
+	r.tlevel--
+	bf := r.bitFiler
+	parent := bf.parent
+	w := r.writerAt
+	if r.tlevel != 0 {
+		w = parent
+	}
+	nwr, err := bf.dumpDirty(w)
+	if err != nil {
+		return
+	}
+
+	switch {
+	case r.tlevel == 0:
+		r.bitFiler = nil
+		if nwr == 0 {
+			return
+		}
+
+		return r.checkpoint(sz)
+	default:
+		r.bitFiler = parent.(*bitFiler)
+		sz, _ := bf.Size() // bitFiler.Size() never returns err != nil
+		return parent.Truncate(sz)
+	}
+}
+
+// Implements Filer.
+func (r *RollbackFiler) Name() string {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+
+	return r.f.Name()
+}
+
+// Implements Filer.
+func (r *RollbackFiler) PunchHole(off, size int64) error {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	if r.tlevel == 0 {
+		return &ErrPERM{r.f.Name() + ": PunchHole outside of a transaction"}
+	}
+
+	if off < 0 {
+		return &ErrINVAL{r.f.Name() + ": PunchHole off", off}
+	}
+
+	if size < 0 || off+size > r.bitFiler.size {
+		return &ErrINVAL{r.f.Name() + ": PunchHole size", size}
+	}
+
+	return r.bitFiler.PunchHole(off, size)
+}
+
+// Implements Filer.
+func (r *RollbackFiler) ReadAt(b []byte, off int64) (n int, err error) {
+	r.inCallbackMu.RLock()
+	defer r.inCallbackMu.RUnlock()
+	if !r.inCallback {
+		r.mu.RLock()
+		defer r.mu.RUnlock()
+	}
+	if r.tlevel == 0 {
+		return r.f.ReadAt(b, off)
+	}
+
+	return r.bitFiler.ReadAt(b, off)
+}
+
+// Implements Filer.
+func (r *RollbackFiler) Rollback() (err error) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	if r.tlevel == 0 {
+		return &ErrPERM{r.f.Name() + ": Rollback outside of a transaction"}
+	}
+
+	if r.tlevel > 1 {
+		r.bitFiler = r.bitFiler.parent.(*bitFiler)
+	}
+	r.tlevel--
+	if f := r.afterRollback; f != nil {
+		r.inCallbackMu.Lock()
+		r.inCallback = true
+		r.inCallbackMu.Unlock()
+		defer func() {
+			r.inCallbackMu.Lock()
+			r.inCallback = false
+			r.inCallbackMu.Unlock()
+		}()
+		return f()
+	}
+	return
+}
+
+func (r *RollbackFiler) size() (sz int64, err error) {
+	if r.tlevel == 0 {
+		return r.f.Size()
+	}
+
+	return r.bitFiler.Size()
+}
+
+// Implements Filer.
+func (r *RollbackFiler) Size() (sz int64, err error) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	return r.size()
+}
+
+// Implements Filer.
+func (r *RollbackFiler) Sync() error {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	return r.f.Sync()
+}
+
+// Implements Filer.
+func (r *RollbackFiler) Truncate(size int64) error {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	if r.tlevel == 0 {
+		return &ErrPERM{r.f.Name() + ": Truncate outside of a transaction"}
+	}
+
+	return r.bitFiler.Truncate(size)
+}
+
+// Implements Filer.
+func (r *RollbackFiler) WriteAt(b []byte, off int64) (n int, err error) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	if r.tlevel == 0 {
+		return 0, &ErrPERM{r.f.Name() + ": WriteAt outside of a transaction"}
+	}
+
+	return r.bitFiler.WriteAt(b, off)
+}
diff --git a/vendor/github.com/cznic/fileutil/LICENSE b/vendor/github.com/cznic/fileutil/LICENSE
new file mode 100644
index 0000000000..50bbdd2410
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The fileutil Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/cznic/fileutil/fileutil.go b/vendor/github.com/cznic/fileutil/fileutil.go
new file mode 100644
index 0000000000..2f0f7ab155
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/fileutil.go
@@ -0,0 +1,223 @@
+// Copyright (c) 2014 The fileutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package fileutil collects some file utility functions.
+package fileutil
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strconv"
+	"sync"
+	"time"
+)
+
+// GoMFile is a concurrent access safe version of MFile.
+type GoMFile struct {
+	mfile *MFile
+	mutex sync.Mutex
+}
+
+// NewGoMFile return a newly created GoMFile.
+func NewGoMFile(fname string, flag int, perm os.FileMode, delta_ns int64) (m *GoMFile, err error) {
+	m = &GoMFile{}
+	if m.mfile, err = NewMFile(fname, flag, perm, delta_ns); err != nil {
+		m = nil
+	}
+	return
+}
+
+func (m *GoMFile) File() (file *os.File, err error) {
+	m.mutex.Lock()
+	defer m.mutex.Unlock()
+	return m.mfile.File()
+}
+
+func (m *GoMFile) SetChanged() {
+	m.mutex.Lock()
+	defer m.mutex.Unlock()
+	m.mfile.SetChanged()
+}
+
+func (m *GoMFile) SetHandler(h MFileHandler) {
+	m.mutex.Lock()
+	defer m.mutex.Unlock()
+	m.mfile.SetHandler(h)
+}
+
+// MFileHandler resolves modifications of File.
+// Possible File context is expected to be a part of the handler's closure.
+type MFileHandler func(*os.File) error
+
+// MFile represents an os.File with a guard/handler on change/modification.
+// Example use case is an app with a configuration file which can be modified at any time
+// and have to be reloaded in such event prior to performing something configurable by that
+// file. The checks are made only on access to the MFile file by
+// File() and a time threshold/hysteresis value can be chosen on creating a new MFile.
+type MFile struct {
+	file    *os.File
+	handler MFileHandler
+	t0      int64
+	delta   int64
+	ctime   int64
+}
+
+// NewMFile returns a newly created MFile or Error if any.
+// The fname, flag and perm parameters have the same meaning as in os.Open.
+// For meaning of the delta_ns parameter please see the (m *MFile) File() docs.
+func NewMFile(fname string, flag int, perm os.FileMode, delta_ns int64) (m *MFile, err error) {
+	m = &MFile{}
+	m.t0 = time.Now().UnixNano()
+	if m.file, err = os.OpenFile(fname, flag, perm); err != nil {
+		return
+	}
+
+	var fi os.FileInfo
+	if fi, err = m.file.Stat(); err != nil {
+		return
+	}
+
+	m.ctime = fi.ModTime().UnixNano()
+	m.delta = delta_ns
+	runtime.SetFinalizer(m, func(m *MFile) {
+		m.file.Close()
+	})
+	return
+}
+
+// SetChanged forces next File() to unconditionally handle modification of the wrapped os.File.
+func (m *MFile) SetChanged() {
+	m.ctime = -1
+}
+
+// SetHandler sets a function to be invoked when modification of MFile is to be processed.
+func (m *MFile) SetHandler(h MFileHandler) {
+	m.handler = h
+}
+
+// File returns an os.File from MFile. If time elapsed between the last invocation of this function
+// and now is at least delta_ns ns (a parameter of NewMFile) then the file is checked for
+// change/modification. For delta_ns == 0 the modification is checked w/o getting os.Time().
+// If a change is detected a handler is invoked on the MFile file.
+// Any of these steps can produce an Error. If that happens the function returns nil, Error.
+func (m *MFile) File() (file *os.File, err error) {
+	var now int64
+
+	mustCheck := m.delta == 0
+	if !mustCheck {
+		now = time.Now().UnixNano()
+		mustCheck = now-m.t0 > m.delta
+	}
+
+	if mustCheck { // check interval reached
+		var fi os.FileInfo
+		if fi, err = m.file.Stat(); err != nil {
+			return
+		}
+
+		if fi.ModTime().UnixNano() != m.ctime { // modification detected
+			if m.handler == nil {
+				return nil, fmt.Errorf("no handler set for modified file %q", m.file.Name())
+			}
+			if err = m.handler(m.file); err != nil {
+				return
+			}
+
+			m.ctime = fi.ModTime().UnixNano()
+		}
+		m.t0 = now
+	}
+
+	return m.file, nil
+}
+
+// Read reads buf from r. It will either fill the full buf or fail.
+// It wraps the functionality of an io.Reader which may return less bytes than requested,
+// but may block if not all data are ready for the io.Reader.
+func Read(r io.Reader, buf []byte) (err error) {
+	have := 0
+	remain := len(buf)
+	got := 0
+	for remain > 0 {
+		if got, err = r.Read(buf[have:]); err != nil {
+			return
+		}
+
+		remain -= got
+		have += got
+	}
+	return
+}
+
+// "os" and/or "syscall" extensions
+
+// FadviseAdvice is used by Fadvise.
+type FadviseAdvice int
+
+// FAdviseAdvice values.
+const (
+	// $ grep FADV /usr/include/bits/fcntl.h
+	POSIX_FADV_NORMAL     FadviseAdvice = iota // No further special treatment.
+	POSIX_FADV_RANDOM                          // Expect random page references.
+	POSIX_FADV_SEQUENTIAL                      // Expect sequential page references.
+	POSIX_FADV_WILLNEED                        // Will need these pages.
+	POSIX_FADV_DONTNEED                        // Don't need these pages.
+	POSIX_FADV_NOREUSE                         // Data will be accessed once.
+)
+
+// TempFile creates a new temporary file in the directory dir with a name
+// ending with suffix, basename starting with prefix, opens the file for
+// reading and writing, and returns the resulting *os.File.  If dir is the
+// empty string, TempFile uses the default directory for temporary files (see
+// os.TempDir).  Multiple programs calling TempFile simultaneously will not
+// choose the same file.  The caller can use f.Name() to find the pathname of
+// the file.  It is the caller's responsibility to remove the file when no
+// longer needed.
+//
+// NOTE: This function differs from ioutil.TempFile.
+func TempFile(dir, prefix, suffix string) (f *os.File, err error) {
+	if dir == "" {
+		dir = os.TempDir()
+	}
+
+	nconflict := 0
+	for i := 0; i < 10000; i++ {
+		name := filepath.Join(dir, prefix+nextInfix()+suffix)
+		f, err = os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
+		if os.IsExist(err) {
+			if nconflict++; nconflict > 10 {
+				rand = reseed()
+			}
+			continue
+		}
+		break
+	}
+	return
+}
+
+// Random number state.
+// We generate random temporary file names so that there's a good
+// chance the file doesn't exist yet - keeps the number of tries in
+// TempFile to a minimum.
+var rand uint32
+var randmu sync.Mutex
+
+func reseed() uint32 {
+	return uint32(time.Now().UnixNano() + int64(os.Getpid()))
+}
+
+func nextInfix() string {
+	randmu.Lock()
+	r := rand
+	if r == 0 {
+		r = reseed()
+	}
+	r = r*1664525 + 1013904223 // constants from Numerical Recipes
+	rand = r
+	randmu.Unlock()
+	return strconv.Itoa(int(1e9 + r%1e9))[1:]
+}
diff --git a/vendor/github.com/cznic/fileutil/fileutil_arm.go b/vendor/github.com/cznic/fileutil/fileutil_arm.go
new file mode 100644
index 0000000000..9410d1bb26
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/fileutil_arm.go
@@ -0,0 +1,25 @@
+// Copyright (c) 2014 The fileutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package fileutil
+
+import (
+	"io"
+	"os"
+)
+
+// PunchHole deallocates space inside a file in the byte range starting at
+// offset and continuing for len bytes. Not supported on ARM.
+func PunchHole(f *os.File, off, len int64) error {
+	return nil
+}
+
+// Fadvise predeclares an access pattern for file data.  See also 'man 2
+// posix_fadvise'. Not supported on ARM.
+func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
+	return nil
+}
+
+// IsEOF reports whether err is an EOF condition.
+func IsEOF(err error) bool { return err == io.EOF }
diff --git a/vendor/github.com/cznic/fileutil/fileutil_darwin.go b/vendor/github.com/cznic/fileutil/fileutil_darwin.go
new file mode 100644
index 0000000000..a19723fc78
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/fileutil_darwin.go
@@ -0,0 +1,25 @@
+// Copyright (c) 2014 The fileutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package fileutil
+
+import (
+	"io"
+	"os"
+)
+
+// PunchHole deallocates space inside a file in the byte range starting at
+// offset and continuing for len bytes. Not supported on OSX.
+func PunchHole(f *os.File, off, len int64) error {
+	return nil
+}
+
+// Fadvise predeclares an access pattern for file data.  See also 'man 2
+// posix_fadvise'. Not supported on OSX.
+func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
+	return nil
+}
+
+// IsEOF reports whether err is an EOF condition.
+func IsEOF(err error) bool { return err == io.EOF }
diff --git a/vendor/github.com/cznic/fileutil/fileutil_freebsd.go b/vendor/github.com/cznic/fileutil/fileutil_freebsd.go
new file mode 100644
index 0000000000..0865093e2b
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/fileutil_freebsd.go
@@ -0,0 +1,25 @@
+// Copyright (c) 2014 The fileutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package fileutil
+
+import (
+	"io"
+	"os"
+)
+
+// PunchHole deallocates space inside a file in the byte range starting at
+// offset and continuing for len bytes. Unimplemented on FreeBSD.
+func PunchHole(f *os.File, off, len int64) error {
+	return nil
+}
+
+// Fadvise predeclares an access pattern for file data.  See also 'man 2
+// posix_fadvise'. Unimplemented on FreeBSD.
+func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
+	return nil
+}
+
+// IsEOF reports whether err is an EOF condition.
+func IsEOF(err error) bool { return err == io.EOF }
diff --git a/vendor/github.com/cznic/fileutil/fileutil_linux.go b/vendor/github.com/cznic/fileutil/fileutil_linux.go
new file mode 100644
index 0000000000..8babfc5533
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/fileutil_linux.go
@@ -0,0 +1,96 @@
+// Copyright (c) 2014 The fileutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !arm
+
+package fileutil
+
+import (
+	"bytes"
+	"io"
+	"io/ioutil"
+	"os"
+	"strconv"
+	"syscall"
+)
+
+func n(s []byte) byte {
+	for i, c := range s {
+		if c < '0' || c > '9' {
+			s = s[:i]
+			break
+		}
+	}
+	v, _ := strconv.Atoi(string(s))
+	return byte(v)
+}
+
+func init() {
+	b, err := ioutil.ReadFile("/proc/sys/kernel/osrelease")
+	if err != nil {
+		panic(err)
+	}
+
+	tokens := bytes.Split(b, []byte("."))
+	if len(tokens) > 3 {
+		tokens = tokens[:3]
+	}
+	switch len(tokens) {
+	case 3:
+		// Supported since kernel 2.6.38
+		if bytes.Compare([]byte{n(tokens[0]), n(tokens[1]), n(tokens[2])}, []byte{2, 6, 38}) < 0 {
+			puncher = func(*os.File, int64, int64) error { return nil }
+		}
+	case 2:
+		if bytes.Compare([]byte{n(tokens[0]), n(tokens[1])}, []byte{2, 7}) < 0 {
+			puncher = func(*os.File, int64, int64) error { return nil }
+		}
+	default:
+		puncher = func(*os.File, int64, int64) error { return nil }
+	}
+}
+
+var puncher = func(f *os.File, off, len int64) error {
+	const (
+		/*
+			/usr/include/linux$ grep FL_ falloc.h
+		*/
+		_FALLOC_FL_KEEP_SIZE  = 0x01 // default is extend size
+		_FALLOC_FL_PUNCH_HOLE = 0x02 // de-allocates range
+	)
+
+	_, _, errno := syscall.Syscall6(
+		syscall.SYS_FALLOCATE,
+		uintptr(f.Fd()),
+		uintptr(_FALLOC_FL_KEEP_SIZE|_FALLOC_FL_PUNCH_HOLE),
+		uintptr(off),
+		uintptr(len),
+		0, 0)
+	if errno != 0 {
+		return os.NewSyscallError("SYS_FALLOCATE", errno)
+	}
+	return nil
+}
+
+// PunchHole deallocates space inside a file in the byte range starting at
+// offset and continuing for len bytes. No-op for kernels < 2.6.38 (or < 2.7).
+func PunchHole(f *os.File, off, len int64) error {
+	return puncher(f, off, len)
+}
+
+// Fadvise predeclares an access pattern for file data.  See also 'man 2
+// posix_fadvise'.
+func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
+	_, _, errno := syscall.Syscall6(
+		syscall.SYS_FADVISE64,
+		uintptr(f.Fd()),
+		uintptr(off),
+		uintptr(len),
+		uintptr(advice),
+		0, 0)
+	return os.NewSyscallError("SYS_FADVISE64", errno)
+}
+
+// IsEOF reports whether err is an EOF condition.
+func IsEOF(err error) bool { return err == io.EOF }
diff --git a/vendor/github.com/cznic/fileutil/fileutil_openbsd.go b/vendor/github.com/cznic/fileutil/fileutil_openbsd.go
new file mode 100644
index 0000000000..428171bdfe
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/fileutil_openbsd.go
@@ -0,0 +1,25 @@
+// Copyright (c) 2014 The fileutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package fileutil
+
+import (
+	"io"
+	"os"
+)
+
+// PunchHole deallocates space inside a file in the byte range starting at
+// offset and continuing for len bytes. Similar to FreeBSD, this is
+// unimplemented.
+func PunchHole(f *os.File, off, len int64) error {
+	return nil
+}
+
+// Unimplemented on OpenBSD.
+func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
+	return nil
+}
+
+// IsEOF reports whether err is an EOF condition.
+func IsEOF(err error) bool { return err == io.EOF }
diff --git a/vendor/github.com/cznic/fileutil/fileutil_plan9.go b/vendor/github.com/cznic/fileutil/fileutil_plan9.go
new file mode 100644
index 0000000000..a2db64e2d3
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/fileutil_plan9.go
@@ -0,0 +1,25 @@
+// Copyright (c) 2014 The fileutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package fileutil
+
+import (
+	"io"
+	"os"
+)
+
+// PunchHole deallocates space inside a file in the byte range starting at
+// offset and continuing for len bytes. Unimplemented on Plan 9.
+func PunchHole(f *os.File, off, len int64) error {
+	return nil
+}
+
+// Fadvise predeclares an access pattern for file data.  See also 'man 2
+// posix_fadvise'. Unimplemented on Plan 9.
+func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
+	return nil
+}
+
+// IsEOF reports whether err is an EOF condition.
+func IsEOF(err error) bool { return err == io.EOF }
diff --git a/vendor/github.com/cznic/fileutil/fileutil_solaris.go b/vendor/github.com/cznic/fileutil/fileutil_solaris.go
new file mode 100644
index 0000000000..61dfcde38f
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/fileutil_solaris.go
@@ -0,0 +1,27 @@
+// Copyright (c) 2013 jnml. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.3
+
+package fileutil
+
+import (
+	"io"
+	"os"
+)
+
+// PunchHole deallocates space inside a file in the byte range starting at
+// offset and continuing for len bytes. Not supported on Solaris.
+func PunchHole(f *os.File, off, len int64) error {
+	return nil
+}
+
+// Fadvise predeclares an access pattern for file data.  See also 'man 2
+// posix_fadvise'. Not supported on Solaris.
+func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
+	return nil
+}
+
+// IsEOF reports whether err is an EOF condition.
+func IsEOF(err error) bool { return err == io.EOF }
diff --git a/vendor/github.com/cznic/fileutil/fileutil_windows.go b/vendor/github.com/cznic/fileutil/fileutil_windows.go
new file mode 100644
index 0000000000..3a81f2fc87
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/fileutil_windows.go
@@ -0,0 +1,183 @@
+// Copyright (c) 2014 The fileutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package fileutil
+
+import (
+	"io"
+	"os"
+	"sync"
+	"syscall"
+	"unsafe"
+)
+
+// PunchHole deallocates space inside a file in the byte range starting at
+// offset and continuing for len bytes. Not supported on Windows.
+func PunchHole(f *os.File, off, len int64) error {
+	return puncher(f, off, len)
+}
+
+// Fadvise predeclares an access pattern for file data.  See also 'man 2
+// posix_fadvise'. Not supported on Windows.
+func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
+	return nil
+}
+
+// IsEOF reports whether err is an EOF condition.
+func IsEOF(err error) bool {
+	if err == io.EOF {
+		return true
+	}
+
+	// http://social.technet.microsoft.com/Forums/windowsserver/en-US/1a16311b-c625-46cf-830b-6a26af488435/how-to-solve-error-38-0x26-errorhandleeof-using-fsctlgetretrievalpointers
+	x, ok := err.(*os.PathError)
+	return ok && x.Op == "read" && x.Err.(syscall.Errno) == 0x26
+}
+
+var (
+	modkernel32 = syscall.NewLazyDLL("kernel32.dll")
+
+	procDeviceIOControl = modkernel32.NewProc("DeviceIoControl")
+
+	sparseFilesMu sync.Mutex
+	sparseFiles   map[uintptr]struct{}
+)
+
+func init() {
+	// sparseFiles is an fd set for already "sparsed" files - according to
+	// msdn.microsoft.com/en-us/library/windows/desktop/aa364225(v=vs.85).aspx
+	// the file handles are unique per process.
+	sparseFiles = make(map[uintptr]struct{})
+}
+
+// puncHoleWindows punches a hole into the given file starting at offset,
+// measuring "size" bytes
+// (http://msdn.microsoft.com/en-us/library/windows/desktop/aa364597%28v=vs.85%29.aspx)
+func puncher(file *os.File, offset, size int64) error {
+	if err := ensureFileSparse(file); err != nil {
+		return err
+	}
+
+	// http://msdn.microsoft.com/en-us/library/windows/desktop/aa364411%28v=vs.85%29.aspx
+	// typedef struct _FILE_ZERO_DATA_INFORMATION {
+	//  LARGE_INTEGER FileOffset;
+	//  LARGE_INTEGER BeyondFinalZero;
+	//} FILE_ZERO_DATA_INFORMATION, *PFILE_ZERO_DATA_INFORMATION;
+	type fileZeroDataInformation struct {
+		FileOffset, BeyondFinalZero int64
+	}
+
+	lpInBuffer := fileZeroDataInformation{
+		FileOffset:      offset,
+		BeyondFinalZero: offset + size}
+	return deviceIOControl(false, file.Fd(), uintptr(unsafe.Pointer(&lpInBuffer)), 16)
+}
+
+// // http://msdn.microsoft.com/en-us/library/windows/desktop/cc948908%28v=vs.85%29.aspx
+// type fileSetSparseBuffer struct {
+//	 SetSparse bool
+// }
+
+func ensureFileSparse(file *os.File) (err error) {
+	fd := file.Fd()
+	sparseFilesMu.Lock()
+	if _, ok := sparseFiles[fd]; ok {
+		sparseFilesMu.Unlock()
+		return nil
+	}
+
+	if err = deviceIOControl(true, fd, 0, 0); err == nil {
+		sparseFiles[fd] = struct{}{}
+	}
+	sparseFilesMu.Unlock()
+	return err
+}
+
+func deviceIOControl(setSparse bool, fd, inBuf, inBufLen uintptr) (err error) {
+	const (
+		//http://source.winehq.org/source/include/winnt.h#L4605
+		file_read_data  = 1
+		file_write_data = 2
+
+		// METHOD_BUFFERED	0
+		method_buffered = 0
+		// FILE_ANY_ACCESS   0
+		file_any_access = 0
+		// FILE_DEVICE_FILE_SYSTEM   0x00000009
+		file_device_file_system = 0x00000009
+		// FILE_SPECIAL_ACCESS   (FILE_ANY_ACCESS)
+		file_special_access = file_any_access
+		file_read_access    = file_read_data
+		file_write_access   = file_write_data
+
+		// http://source.winehq.org/source/include/winioctl.h
+		// #define CTL_CODE 	(  	DeviceType,
+		//		Function,
+		//		Method,
+		//		Access  		 )
+		//    ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)
+
+		// FSCTL_SET_COMPRESSION   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA)
+		fsctl_set_compression = (file_device_file_system << 16) | ((file_read_access | file_write_access) << 14) | (16 << 2) | method_buffered
+		// FSCTL_SET_SPARSE   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
+		fsctl_set_sparse = (file_device_file_system << 16) | (file_special_access << 14) | (49 << 2) | method_buffered
+		// FSCTL_SET_ZERO_DATA   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA)
+		fsctl_set_zero_data = (file_device_file_system << 16) | (file_write_data << 14) | (50 << 2) | method_buffered
+	)
+	retPtr := uintptr(unsafe.Pointer(&(make([]byte, 8)[0])))
+	var r1 uintptr
+	var e1 syscall.Errno
+	if setSparse {
+		// BOOL
+		// WINAPI
+		// DeviceIoControl( (HANDLE) hDevice,                      // handle to a file
+		//                  FSCTL_SET_SPARSE,                      // dwIoControlCode
+		//                  (PFILE_SET_SPARSE_BUFFER) lpInBuffer,  // input buffer
+		//                  (DWORD) nInBufferSize,                 // size of input buffer
+		//                  NULL,                                  // lpOutBuffer
+		//                  0,                                     // nOutBufferSize
+		//                  (LPDWORD) lpBytesReturned,             // number of bytes returned
+		//                  (LPOVERLAPPED) lpOverlapped );         // OVERLAPPED structure
+		r1, _, e1 = syscall.Syscall9(procDeviceIOControl.Addr(), 8,
+			fd,
+			uintptr(fsctl_set_sparse),
+			// If the lpInBuffer parameter is NULL, the operation will behave the same as if the SetSparse member of the FILE_SET_SPARSE_BUFFER structure were TRUE. In other words, the operation sets the file to a sparse file.
+			0, // uintptr(unsafe.Pointer(&lpInBuffer)),
+			0, // 1,
+			0,
+			0,
+			retPtr,
+			0,
+			0)
+	} else {
+		// BOOL
+		// WINAPI
+		// DeviceIoControl( (HANDLE) hDevice,              // handle to a file
+		//                  FSCTL_SET_ZERO_DATA,           // dwIoControlCode
+		//                  (LPVOID) lpInBuffer,           // input buffer
+		//                  (DWORD) nInBufferSize,         // size of input buffer
+		//                  NULL,                          // lpOutBuffer
+		//                  0,                             // nOutBufferSize
+		//                  (LPDWORD) lpBytesReturned,     // number of bytes returned
+		//                  (LPOVERLAPPED) lpOverlapped ); // OVERLAPPED structure
+		r1, _, e1 = syscall.Syscall9(procDeviceIOControl.Addr(), 8,
+			fd,
+			uintptr(fsctl_set_zero_data),
+			inBuf,
+			inBufLen,
+			0,
+			0,
+			retPtr,
+			0,
+			0)
+	}
+	if r1 == 0 {
+		if e1 != 0 {
+			err = error(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return err
+}
diff --git a/vendor/github.com/cznic/fileutil/test_deps.go b/vendor/github.com/cznic/fileutil/test_deps.go
new file mode 100644
index 0000000000..eec608ab3a
--- /dev/null
+++ b/vendor/github.com/cznic/fileutil/test_deps.go
@@ -0,0 +1,13 @@
+// Copyright (c) 2014 The fileutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// blame: jnml, labs.nic.cz
+
+package fileutil
+
+// Pull test dependencies too.
+// Enables easy 'go test X' after 'go get X'
+import (
+// nothing yet
+)
diff --git a/vendor/github.com/cznic/mathutil/LICENSE b/vendor/github.com/cznic/mathutil/LICENSE
new file mode 100644
index 0000000000..128a1b64a4
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The mathutil Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/cznic/mathutil/bits.go b/vendor/github.com/cznic/mathutil/bits.go
new file mode 100644
index 0000000000..6eaa4e3054
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/bits.go
@@ -0,0 +1,207 @@
+// Copyright (c) 2014 The mathutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mathutil
+
+import (
+	"math/big"
+)
+
+// BitLenByte returns the bit width of the non zero part of n.
+func BitLenByte(n byte) int {
+	return log2[n] + 1
+}
+
+// BitLenUint16 returns the bit width of the non zero part of n.
+func BitLenUint16(n uint16) int {
+	if b := n >> 8; b != 0 {
+		return log2[b] + 8 + 1
+	}
+
+	return log2[n] + 1
+}
+
+// BitLenUint32 returns the bit width of the non zero part of n.
+func BitLenUint32(n uint32) int {
+	if b := n >> 24; b != 0 {
+		return log2[b] + 24 + 1
+	}
+
+	if b := n >> 16; b != 0 {
+		return log2[b] + 16 + 1
+	}
+
+	if b := n >> 8; b != 0 {
+		return log2[b] + 8 + 1
+	}
+
+	return log2[n] + 1
+}
+
+// BitLen returns the bit width of the non zero part of n.
+func BitLen(n int) int { // Should handle correctly [future] 64 bit Go ints
+	if IntBits == 64 {
+		return BitLenUint64(uint64(n))
+	}
+
+	if b := byte(n >> 24); b != 0 {
+		return log2[b] + 24 + 1
+	}
+
+	if b := byte(n >> 16); b != 0 {
+		return log2[b] + 16 + 1
+	}
+
+	if b := byte(n >> 8); b != 0 {
+		return log2[b] + 8 + 1
+	}
+
+	return log2[byte(n)] + 1
+}
+
+// BitLenUint returns the bit width of the non zero part of n.
+func BitLenUint(n uint) int { // Should handle correctly [future] 64 bit Go uints
+	if IntBits == 64 {
+		return BitLenUint64(uint64(n))
+	}
+
+	if b := n >> 24; b != 0 {
+		return log2[b] + 24 + 1
+	}
+
+	if b := n >> 16; b != 0 {
+		return log2[b] + 16 + 1
+	}
+
+	if b := n >> 8; b != 0 {
+		return log2[b] + 8 + 1
+	}
+
+	return log2[n] + 1
+}
+
+// BitLenUint64 returns the bit width of the non zero part of n.
+func BitLenUint64(n uint64) int {
+	if b := n >> 56; b != 0 {
+		return log2[b] + 56 + 1
+	}
+
+	if b := n >> 48; b != 0 {
+		return log2[b] + 48 + 1
+	}
+
+	if b := n >> 40; b != 0 {
+		return log2[b] + 40 + 1
+	}
+
+	if b := n >> 32; b != 0 {
+		return log2[b] + 32 + 1
+	}
+
+	if b := n >> 24; b != 0 {
+		return log2[b] + 24 + 1
+	}
+
+	if b := n >> 16; b != 0 {
+		return log2[b] + 16 + 1
+	}
+
+	if b := n >> 8; b != 0 {
+		return log2[b] + 8 + 1
+	}
+
+	return log2[n] + 1
+}
+
+// BitLenUintptr returns the bit width of the non zero part of n.
+func BitLenUintptr(n uintptr) int {
+	if b := n >> 56; b != 0 {
+		return log2[b] + 56 + 1
+	}
+
+	if b := n >> 48; b != 0 {
+		return log2[b] + 48 + 1
+	}
+
+	if b := n >> 40; b != 0 {
+		return log2[b] + 40 + 1
+	}
+
+	if b := n >> 32; b != 0 {
+		return log2[b] + 32 + 1
+	}
+
+	if b := n >> 24; b != 0 {
+		return log2[b] + 24 + 1
+	}
+
+	if b := n >> 16; b != 0 {
+		return log2[b] + 16 + 1
+	}
+
+	if b := n >> 8; b != 0 {
+		return log2[b] + 8 + 1
+	}
+
+	return log2[n] + 1
+}
+
+// PopCountByte returns population count of n (number of bits set in n).
+func PopCountByte(n byte) int {
+	return int(popcnt[byte(n)])
+}
+
+// PopCountUint16 returns population count of n (number of bits set in n).
+func PopCountUint16(n uint16) int {
+	return int(popcnt[byte(n>>8)]) + int(popcnt[byte(n)])
+}
+
+// PopCountUint32 returns population count of n (number of bits set in n).
+func PopCountUint32(n uint32) int {
+	return int(popcnt[byte(n>>24)]) + int(popcnt[byte(n>>16)]) +
+		int(popcnt[byte(n>>8)]) + int(popcnt[byte(n)])
+}
+
+// PopCount returns population count of n (number of bits set in n).
+func PopCount(n int) int { // Should handle correctly [future] 64 bit Go ints
+	if IntBits == 64 {
+		return PopCountUint64(uint64(n))
+	}
+
+	return PopCountUint32(uint32(n))
+}
+
+// PopCountUint returns population count of n (number of bits set in n).
+func PopCountUint(n uint) int { // Should handle correctly [future] 64 bit Go uints
+	if IntBits == 64 {
+		return PopCountUint64(uint64(n))
+	}
+
+	return PopCountUint32(uint32(n))
+}
+
+// PopCountUintptr returns population count of n (number of bits set in n).
+func PopCountUintptr(n uintptr) int {
+	if UintPtrBits == 64 {
+		return PopCountUint64(uint64(n))
+	}
+
+	return PopCountUint32(uint32(n))
+}
+
+// PopCountUint64 returns population count of n (number of bits set in n).
+func PopCountUint64(n uint64) int {
+	return int(popcnt[byte(n>>56)]) + int(popcnt[byte(n>>48)]) +
+		int(popcnt[byte(n>>40)]) + int(popcnt[byte(n>>32)]) +
+		int(popcnt[byte(n>>24)]) + int(popcnt[byte(n>>16)]) +
+		int(popcnt[byte(n>>8)]) + int(popcnt[byte(n)])
+}
+
+// PopCountBigInt returns population count of |n| (number of bits set in |n|).
+func PopCountBigInt(n *big.Int) (r int) {
+	for _, v := range n.Bits() {
+		r += PopCountUintptr(uintptr(v))
+	}
+	return
+}
diff --git a/vendor/github.com/cznic/mathutil/envelope.go b/vendor/github.com/cznic/mathutil/envelope.go
new file mode 100644
index 0000000000..ff8e6012a6
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/envelope.go
@@ -0,0 +1,46 @@
+// Copyright (c) 2014 The mathutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mathutil
+
+import (
+	"math"
+)
+
+// Approximation type determines approximation methods used by e.g. Envelope.
+type Approximation int
+
+// Specific approximation method tags
+const (
+	_          Approximation = iota
+	Linear                   // As named
+	Sinusoidal               // Smooth for all derivations
+)
+
+// Envelope is an utility for defining simple curves using a small (usually)
+// set of data points.  Envelope returns a value defined by x, points and
+// approximation.  The value of x must be in [0,1) otherwise the result is
+// undefined or the function may panic. Points are interpreted as dividing the
+// [0,1) interval in len(points)-1 sections, so len(points) must be > 1 or the
+// function may panic. According to the left and right points closing/adjacent
+// to the section the resulting value is interpolated using the chosen
+// approximation method.  Unsupported values of approximation are silently
+// interpreted as 'Linear'.
+func Envelope(x float64, points []float64, approximation Approximation) float64 {
+	step := 1 / float64(len(points)-1)
+	fslot := math.Floor(x / step)
+	mod := x - fslot*step
+	slot := int(fslot)
+	l, r := points[slot], points[slot+1]
+	rmod := mod / step
+	switch approximation {
+	case Sinusoidal:
+		k := (math.Sin(math.Pi*(rmod-0.5)) + 1) / 2
+		return l + (r-l)*k
+	case Linear:
+		fallthrough
+	default:
+		return l + (r-l)*rmod
+	}
+}
diff --git a/vendor/github.com/cznic/mathutil/mathutil.go b/vendor/github.com/cznic/mathutil/mathutil.go
new file mode 100644
index 0000000000..e8f3f5622c
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/mathutil.go
@@ -0,0 +1,829 @@
+// Copyright (c) 2014 The mathutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package mathutil provides utilities supplementing the standard 'math' and
+// 'math/rand' packages.
+//
+// Compatibility issues
+//
+// 2013-12-13: The following functions have been REMOVED
+//
+// 	func Uint64ToBigInt(n uint64) *big.Int
+// 	func Uint64FromBigInt(n *big.Int) (uint64, bool)
+//
+// 2013-05-13: The following functions are now DEPRECATED
+//
+// 	func Uint64ToBigInt(n uint64) *big.Int
+// 	func Uint64FromBigInt(n *big.Int) (uint64, bool)
+//
+// These functions will be REMOVED with Go release 1.1+1.
+//
+// 2013-01-21: The following functions have been REMOVED
+//
+// 	func MaxInt() int
+// 	func MinInt() int
+// 	func MaxUint() uint
+// 	func UintPtrBits() int
+//
+// They are now replaced by untyped constants
+//
+// 	MaxInt
+// 	MinInt
+// 	MaxUint
+// 	UintPtrBits
+//
+// Additionally one more untyped constant was added
+//
+// 	IntBits
+//
+// This change breaks any existing code depending on the above removed
+// functions.  They should have not been published in the first place, that was
+// unfortunate. Instead, defining such architecture and/or implementation
+// specific integer limits and bit widths as untyped constants improves
+// performance and allows for static dead code elimination if it depends on
+// these values. Thanks to minux for pointing it out in the mail list
+// (https://groups.google.com/d/msg/golang-nuts/tlPpLW6aJw8/NT3mpToH-a4J).
+//
+// 2012-12-12: The following functions will be DEPRECATED with Go release
+// 1.0.3+1 and REMOVED with Go release 1.0.3+2, b/c of
+// http://code.google.com/p/go/source/detail?r=954a79ee3ea8
+//
+// 	func Uint64ToBigInt(n uint64) *big.Int
+// 	func Uint64FromBigInt(n *big.Int) (uint64, bool)
+package mathutil
+
+import (
+	"math"
+	"math/big"
+)
+
+// Architecture and/or implementation specific integer limits and bit widths.
+const (
+	MaxInt      = 1<<(IntBits-1) - 1
+	MinInt      = -MaxInt - 1
+	MaxUint     = 1<<IntBits - 1
+	IntBits     = 1 << (^uint(0)>>32&1 + ^uint(0)>>16&1 + ^uint(0)>>8&1 + 3)
+	UintPtrBits = 1 << (^uintptr(0)>>32&1 + ^uintptr(0)>>16&1 + ^uintptr(0)>>8&1 + 3)
+)
+
+var (
+	_1 = big.NewInt(1)
+	_2 = big.NewInt(2)
+)
+
+// GCDByte returns the greatest common divisor of a and b. Based on:
+// http://en.wikipedia.org/wiki/Euclidean_algorithm#Implementations
+func GCDByte(a, b byte) byte {
+	for b != 0 {
+		a, b = b, a%b
+	}
+	return a
+}
+
+// GCDUint16 returns the greatest common divisor of a and b.
+func GCDUint16(a, b uint16) uint16 {
+	for b != 0 {
+		a, b = b, a%b
+	}
+	return a
+}
+
+// GCD returns the greatest common divisor of a and b.
+func GCDUint32(a, b uint32) uint32 {
+	for b != 0 {
+		a, b = b, a%b
+	}
+	return a
+}
+
+// GCD64 returns the greatest common divisor of a and b.
+func GCDUint64(a, b uint64) uint64 {
+	for b != 0 {
+		a, b = b, a%b
+	}
+	return a
+}
+
+// ISqrt returns floor(sqrt(n)). Typical run time is few hundreds of ns.
+func ISqrt(n uint32) (x uint32) {
+	if n == 0 {
+		return
+	}
+
+	if n >= math.MaxUint16*math.MaxUint16 {
+		return math.MaxUint16
+	}
+
+	var px, nx uint32
+	for x = n; ; px, x = x, nx {
+		nx = (x + n/x) / 2
+		if nx == x || nx == px {
+			break
+		}
+	}
+	return
+}
+
+// SqrtUint64 returns floor(sqrt(n)). Typical run time is about 0.5 µs.
+func SqrtUint64(n uint64) (x uint64) {
+	if n == 0 {
+		return
+	}
+
+	if n >= math.MaxUint32*math.MaxUint32 {
+		return math.MaxUint32
+	}
+
+	var px, nx uint64
+	for x = n; ; px, x = x, nx {
+		nx = (x + n/x) / 2
+		if nx == x || nx == px {
+			break
+		}
+	}
+	return
+}
+
+// SqrtBig returns floor(sqrt(n)). It panics on n < 0.
+func SqrtBig(n *big.Int) (x *big.Int) {
+	switch n.Sign() {
+	case -1:
+		panic(-1)
+	case 0:
+		return big.NewInt(0)
+	}
+
+	var px, nx big.Int
+	x = big.NewInt(0)
+	x.SetBit(x, n.BitLen()/2+1, 1)
+	for {
+		nx.Rsh(nx.Add(x, nx.Div(n, x)), 1)
+		if nx.Cmp(x) == 0 || nx.Cmp(&px) == 0 {
+			break
+		}
+		px.Set(x)
+		x.Set(&nx)
+	}
+	return
+}
+
+// Log2Byte returns log base 2 of n. It's the same as index of the highest
+// bit set in n.  For n == 0 -1 is returned.
+func Log2Byte(n byte) int {
+	return log2[n]
+}
+
+// Log2Uint16 returns log base 2 of n. It's the same as index of the highest
+// bit set in n.  For n == 0 -1 is returned.
+func Log2Uint16(n uint16) int {
+	if b := n >> 8; b != 0 {
+		return log2[b] + 8
+	}
+
+	return log2[n]
+}
+
+// Log2Uint32 returns log base 2 of n. It's the same as index of the highest
+// bit set in n.  For n == 0 -1 is returned.
+func Log2Uint32(n uint32) int {
+	if b := n >> 24; b != 0 {
+		return log2[b] + 24
+	}
+
+	if b := n >> 16; b != 0 {
+		return log2[b] + 16
+	}
+
+	if b := n >> 8; b != 0 {
+		return log2[b] + 8
+	}
+
+	return log2[n]
+}
+
+// Log2Uint64 returns log base 2 of n. It's the same as index of the highest
+// bit set in n.  For n == 0 -1 is returned.
+func Log2Uint64(n uint64) int {
+	if b := n >> 56; b != 0 {
+		return log2[b] + 56
+	}
+
+	if b := n >> 48; b != 0 {
+		return log2[b] + 48
+	}
+
+	if b := n >> 40; b != 0 {
+		return log2[b] + 40
+	}
+
+	if b := n >> 32; b != 0 {
+		return log2[b] + 32
+	}
+
+	if b := n >> 24; b != 0 {
+		return log2[b] + 24
+	}
+
+	if b := n >> 16; b != 0 {
+		return log2[b] + 16
+	}
+
+	if b := n >> 8; b != 0 {
+		return log2[b] + 8
+	}
+
+	return log2[n]
+}
+
+// ModPowByte computes (b^e)%m. It panics for m == 0 || b == e == 0.
+//
+// See also: http://en.wikipedia.org/wiki/Modular_exponentiation#Right-to-left_binary_method
+func ModPowByte(b, e, m byte) byte {
+	if b == 0 && e == 0 {
+		panic(0)
+	}
+
+	if m == 1 {
+		return 0
+	}
+
+	r := uint16(1)
+	for b, m := uint16(b), uint16(m); e > 0; b, e = b*b%m, e>>1 {
+		if e&1 == 1 {
+			r = r * b % m
+		}
+	}
+	return byte(r)
+}
+
+// ModPowByte computes (b^e)%m. It panics for m == 0 || b == e == 0.
+func ModPowUint16(b, e, m uint16) uint16 {
+	if b == 0 && e == 0 {
+		panic(0)
+	}
+
+	if m == 1 {
+		return 0
+	}
+
+	r := uint32(1)
+	for b, m := uint32(b), uint32(m); e > 0; b, e = b*b%m, e>>1 {
+		if e&1 == 1 {
+			r = r * b % m
+		}
+	}
+	return uint16(r)
+}
+
+// ModPowUint32 computes (b^e)%m. It panics for m == 0 || b == e == 0.
+func ModPowUint32(b, e, m uint32) uint32 {
+	if b == 0 && e == 0 {
+		panic(0)
+	}
+
+	if m == 1 {
+		return 0
+	}
+
+	r := uint64(1)
+	for b, m := uint64(b), uint64(m); e > 0; b, e = b*b%m, e>>1 {
+		if e&1 == 1 {
+			r = r * b % m
+		}
+	}
+	return uint32(r)
+}
+
+// ModPowUint64 computes (b^e)%m. It panics for m == 0 || b == e == 0.
+func ModPowUint64(b, e, m uint64) (r uint64) {
+	if b == 0 && e == 0 {
+		panic(0)
+	}
+
+	if m == 1 {
+		return 0
+	}
+
+	return modPowBigInt(big.NewInt(0).SetUint64(b), big.NewInt(0).SetUint64(e), big.NewInt(0).SetUint64(m)).Uint64()
+}
+
+func modPowBigInt(b, e, m *big.Int) (r *big.Int) {
+	r = big.NewInt(1)
+	for i, n := 0, e.BitLen(); i < n; i++ {
+		if e.Bit(i) != 0 {
+			r.Mod(r.Mul(r, b), m)
+		}
+		b.Mod(b.Mul(b, b), m)
+	}
+	return
+}
+
+// ModPowBigInt computes (b^e)%m. Returns nil for e < 0. It panics for m == 0 || b == e == 0.
+func ModPowBigInt(b, e, m *big.Int) (r *big.Int) {
+	if b.Sign() == 0 && e.Sign() == 0 {
+		panic(0)
+	}
+
+	if m.Cmp(_1) == 0 {
+		return big.NewInt(0)
+	}
+
+	if e.Sign() < 0 {
+		return
+	}
+
+	return modPowBigInt(big.NewInt(0).Set(b), big.NewInt(0).Set(e), m)
+}
+
+var uint64ToBigIntDelta big.Int
+
+func init() {
+	uint64ToBigIntDelta.SetBit(&uint64ToBigIntDelta, 63, 1)
+}
+
+var uintptrBits int
+
+func init() {
+	x := uint64(math.MaxUint64)
+	uintptrBits = BitLenUintptr(uintptr(x))
+}
+
+// UintptrBits returns the bit width of an uintptr at the executing machine.
+func UintptrBits() int {
+	return uintptrBits
+}
+
+// AddUint128_64 returns the uint128 sum of uint64 a and b.
+func AddUint128_64(a, b uint64) (hi uint64, lo uint64) {
+	lo = a + b
+	if lo < a {
+		hi = 1
+	}
+	return
+}
+
+// MulUint128_64 returns the uint128 bit product of uint64 a and b.
+func MulUint128_64(a, b uint64) (hi, lo uint64) {
+	/*
+		2^(2 W) ahi bhi + 2^W alo bhi + 2^W ahi blo + alo blo
+
+		FEDCBA98 76543210 FEDCBA98 76543210
+		                  ---- alo*blo ----
+		         ---- alo*bhi ----
+		         ---- ahi*blo ----
+		---- ahi*bhi ----
+	*/
+	const w = 32
+	const m = 1<<w - 1
+	ahi, bhi, alo, blo := a>>w, b>>w, a&m, b&m
+	lo = alo * blo
+	mid1 := alo * bhi
+	mid2 := ahi * blo
+	c1, lo := AddUint128_64(lo, mid1<<w)
+	c2, lo := AddUint128_64(lo, mid2<<w)
+	_, hi = AddUint128_64(ahi*bhi, mid1>>w+mid2>>w+uint64(c1+c2))
+	return
+}
+
+// PowerizeBigInt returns (e, p) such that e is the smallest number for which p
+// == b^e is greater or equal n. For n < 0 or b < 2 (0, nil) is returned.
+//
+// NOTE: Run time for large values of n (above about 2^1e6 ~= 1e300000) can be
+// significant and/or unacceptabe.  For any smaller values of n the function
+// typically performs in sub second time.  For "small" values of n (cca bellow
+// 2^1e3 ~= 1e300) the same can be easily below 10 µs.
+//
+// A special (and trivial) case of b == 2 is handled separately and performs
+// much faster.
+func PowerizeBigInt(b, n *big.Int) (e uint32, p *big.Int) {
+	switch {
+	case b.Cmp(_2) < 0 || n.Sign() < 0:
+		return
+	case n.Sign() == 0 || n.Cmp(_1) == 0:
+		return 0, big.NewInt(1)
+	case b.Cmp(_2) == 0:
+		p = big.NewInt(0)
+		e = uint32(n.BitLen() - 1)
+		p.SetBit(p, int(e), 1)
+		if p.Cmp(n) < 0 {
+			p.Mul(p, _2)
+			e++
+		}
+		return
+	}
+
+	bw := b.BitLen()
+	nw := n.BitLen()
+	p = big.NewInt(1)
+	var bb, r big.Int
+	for {
+		switch p.Cmp(n) {
+		case -1:
+			x := uint32((nw - p.BitLen()) / bw)
+			if x == 0 {
+				x = 1
+			}
+			e += x
+			switch x {
+			case 1:
+				p.Mul(p, b)
+			default:
+				r.Set(_1)
+				bb.Set(b)
+				e := x
+				for {
+					if e&1 != 0 {
+						r.Mul(&r, &bb)
+					}
+					if e >>= 1; e == 0 {
+						break
+					}
+
+					bb.Mul(&bb, &bb)
+				}
+				p.Mul(p, &r)
+			}
+		case 0, 1:
+			return
+		}
+	}
+}
+
+// PowerizeUint32BigInt returns (e, p) such that e is the smallest number for
+// which p == b^e is greater or equal n. For n < 0 or b < 2 (0, nil) is
+// returned.
+//
+// More info: see PowerizeBigInt.
+func PowerizeUint32BigInt(b uint32, n *big.Int) (e uint32, p *big.Int) {
+	switch {
+	case b < 2 || n.Sign() < 0:
+		return
+	case n.Sign() == 0 || n.Cmp(_1) == 0:
+		return 0, big.NewInt(1)
+	case b == 2:
+		p = big.NewInt(0)
+		e = uint32(n.BitLen() - 1)
+		p.SetBit(p, int(e), 1)
+		if p.Cmp(n) < 0 {
+			p.Mul(p, _2)
+			e++
+		}
+		return
+	}
+
+	var bb big.Int
+	bb.SetInt64(int64(b))
+	return PowerizeBigInt(&bb, n)
+}
+
+/*
+ProbablyPrimeUint32 returns true if n is prime or n is a pseudoprime to base a.
+It implements the Miller-Rabin primality test for one specific value of 'a' and
+k == 1.
+
+Wrt pseudocode shown at
+http://en.wikipedia.org/wiki/Miller-Rabin_primality_test#Algorithm_and_running_time
+
+ Input: n > 3, an odd integer to be tested for primality;
+ Input: k, a parameter that determines the accuracy of the test
+ Output: composite if n is composite, otherwise probably prime
+ write n − 1 as 2^s·d with d odd by factoring powers of 2 from n − 1
+ LOOP: repeat k times:
+    pick a random integer a in the range [2, n − 2]
+    x ← a^d mod n
+    if x = 1 or x = n − 1 then do next LOOP
+    for r = 1 .. s − 1
+       x ← x^2 mod n
+       if x = 1 then return composite
+       if x = n − 1 then do next LOOP
+    return composite
+ return probably prime
+
+... this function behaves like passing 1 for 'k' and additionaly a
+fixed/non-random 'a'.  Otherwise it's the same algorithm.
+
+See also: http://mathworld.wolfram.com/Rabin-MillerStrongPseudoprimeTest.html
+*/
+func ProbablyPrimeUint32(n, a uint32) bool {
+	d, s := n-1, 0
+	for ; d&1 == 0; d, s = d>>1, s+1 {
+	}
+	x := uint64(ModPowUint32(a, d, n))
+	if x == 1 || uint32(x) == n-1 {
+		return true
+	}
+
+	for ; s > 1; s-- {
+		if x = x * x % uint64(n); x == 1 {
+			return false
+		}
+
+		if uint32(x) == n-1 {
+			return true
+		}
+	}
+	return false
+}
+
+// ProbablyPrimeUint64_32 returns true if n is prime or n is a pseudoprime to
+// base a. It implements the Miller-Rabin primality test for one specific value
+// of 'a' and k == 1.  See also ProbablyPrimeUint32.
+func ProbablyPrimeUint64_32(n uint64, a uint32) bool {
+	d, s := n-1, 0
+	for ; d&1 == 0; d, s = d>>1, s+1 {
+	}
+	x := ModPowUint64(uint64(a), d, n)
+	if x == 1 || x == n-1 {
+		return true
+	}
+
+	bx, bn := big.NewInt(0).SetUint64(x), big.NewInt(0).SetUint64(n)
+	for ; s > 1; s-- {
+		if x = bx.Mod(bx.Mul(bx, bx), bn).Uint64(); x == 1 {
+			return false
+		}
+
+		if x == n-1 {
+			return true
+		}
+	}
+	return false
+}
+
+// ProbablyPrimeBigInt_32 returns true if n is prime or n is a pseudoprime to
+// base a. It implements the Miller-Rabin primality test for one specific value
+// of 'a' and k == 1.  See also ProbablyPrimeUint32.
+func ProbablyPrimeBigInt_32(n *big.Int, a uint32) bool {
+	var d big.Int
+	d.Set(n)
+	d.Sub(&d, _1) // d <- n-1
+	s := 0
+	for ; d.Bit(s) == 0; s++ {
+	}
+	nMinus1 := big.NewInt(0).Set(&d)
+	d.Rsh(&d, uint(s))
+
+	x := ModPowBigInt(big.NewInt(int64(a)), &d, n)
+	if x.Cmp(_1) == 0 || x.Cmp(nMinus1) == 0 {
+		return true
+	}
+
+	for ; s > 1; s-- {
+		if x = x.Mod(x.Mul(x, x), n); x.Cmp(_1) == 0 {
+			return false
+		}
+
+		if x.Cmp(nMinus1) == 0 {
+			return true
+		}
+	}
+	return false
+}
+
+// ProbablyPrimeBigInt returns true if n is prime or n is a pseudoprime to base
+// a. It implements the Miller-Rabin primality test for one specific value of
+// 'a' and k == 1.  See also ProbablyPrimeUint32.
+func ProbablyPrimeBigInt(n, a *big.Int) bool {
+	var d big.Int
+	d.Set(n)
+	d.Sub(&d, _1) // d <- n-1
+	s := 0
+	for ; d.Bit(s) == 0; s++ {
+	}
+	nMinus1 := big.NewInt(0).Set(&d)
+	d.Rsh(&d, uint(s))
+
+	x := ModPowBigInt(a, &d, n)
+	if x.Cmp(_1) == 0 || x.Cmp(nMinus1) == 0 {
+		return true
+	}
+
+	for ; s > 1; s-- {
+		if x = x.Mod(x.Mul(x, x), n); x.Cmp(_1) == 0 {
+			return false
+		}
+
+		if x.Cmp(nMinus1) == 0 {
+			return true
+		}
+	}
+	return false
+}
+
+// Max returns the larger of a and b.
+func Max(a, b int) int {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// Min returns the smaller of a and b.
+func Min(a, b int) int {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// UMax returns the larger of a and b.
+func UMax(a, b uint) uint {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// UMin returns the smaller of a and b.
+func UMin(a, b uint) uint {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// MaxByte returns the larger of a and b.
+func MaxByte(a, b byte) byte {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// MinByte returns the smaller of a and b.
+func MinByte(a, b byte) byte {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// MaxInt8 returns the larger of a and b.
+func MaxInt8(a, b int8) int8 {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// MinInt8 returns the smaller of a and b.
+func MinInt8(a, b int8) int8 {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// MaxUint16 returns the larger of a and b.
+func MaxUint16(a, b uint16) uint16 {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// MinUint16 returns the smaller of a and b.
+func MinUint16(a, b uint16) uint16 {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// MaxInt16 returns the larger of a and b.
+func MaxInt16(a, b int16) int16 {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// MinInt16 returns the smaller of a and b.
+func MinInt16(a, b int16) int16 {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// MaxUint32 returns the larger of a and b.
+func MaxUint32(a, b uint32) uint32 {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// MinUint32 returns the smaller of a and b.
+func MinUint32(a, b uint32) uint32 {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// MaxInt32 returns the larger of a and b.
+func MaxInt32(a, b int32) int32 {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// MinInt32 returns the smaller of a and b.
+func MinInt32(a, b int32) int32 {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// MaxUint64 returns the larger of a and b.
+func MaxUint64(a, b uint64) uint64 {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// MinUint64 returns the smaller of a and b.
+func MinUint64(a, b uint64) uint64 {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// MaxInt64 returns the larger of a and b.
+func MaxInt64(a, b int64) int64 {
+	if a > b {
+		return a
+	}
+
+	return b
+}
+
+// MinInt64 returns the smaller of a and b.
+func MinInt64(a, b int64) int64 {
+	if a < b {
+		return a
+	}
+
+	return b
+}
+
+// ToBase produces n in base b. For example
+//
+// 	ToBase(2047, 22) -> [1, 5, 4]
+//
+//	1 * 22^0           1
+//	5 * 22^1         110
+//	4 * 22^2        1936
+//	                ----
+//	                2047
+//
+// ToBase panics for bases < 2.
+func ToBase(n *big.Int, b int) []int {
+	var nn big.Int
+	nn.Set(n)
+	if b < 2 {
+		panic("invalid base")
+	}
+
+	k := 1
+	switch nn.Sign() {
+	case -1:
+		nn.Neg(&nn)
+		k = -1
+	case 0:
+		return []int{0}
+	}
+
+	bb := big.NewInt(int64(b))
+	var r []int
+	rem := big.NewInt(0)
+	for nn.Sign() != 0 {
+		nn.QuoRem(&nn, bb, rem)
+		r = append(r, k*int(rem.Int64()))
+	}
+	return r
+}
diff --git a/vendor/github.com/cznic/mathutil/permute.go b/vendor/github.com/cznic/mathutil/permute.go
new file mode 100644
index 0000000000..bf828b694f
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/permute.go
@@ -0,0 +1,39 @@
+// Copyright (c) 2014 The mathutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mathutil
+
+import (
+	"sort"
+)
+
+// Generate the first permutation of data.
+func PermutationFirst(data sort.Interface) {
+	sort.Sort(data)
+}
+
+// Generate the next permutation of data if possible and return true.
+// Return false if there is no more permutation left.
+// Based on the algorithm described here:
+// http://en.wikipedia.org/wiki/Permutation#Generation_in_lexicographic_order
+func PermutationNext(data sort.Interface) bool {
+	var k, l int
+	for k = data.Len() - 2; ; k-- { // 1.
+		if k < 0 {
+			return false
+		}
+
+		if data.Less(k, k+1) {
+			break
+		}
+	}
+	for l = data.Len() - 1; !data.Less(k, l); l-- { // 2.
+	}
+	data.Swap(k, l)                             // 3.
+	for i, j := k+1, data.Len()-1; i < j; i++ { // 4.
+		data.Swap(i, j)
+		j--
+	}
+	return true
+}
diff --git a/vendor/github.com/cznic/mathutil/primes.go b/vendor/github.com/cznic/mathutil/primes.go
new file mode 100644
index 0000000000..2c82eb033e
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/primes.go
@@ -0,0 +1,342 @@
+// Copyright (c) 2014 The mathutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mathutil
+
+import (
+	"math"
+)
+
+// IsPrimeUint16 returns true if n is prime. Typical run time is few ns.
+func IsPrimeUint16(n uint16) bool {
+	return n > 0 && primes16[n-1] == 1
+}
+
+// NextPrimeUint16 returns first prime > n and true if successful or an
+// undefined value and false if there is no next prime in the uint16 limits.
+// Typical run time is few ns.
+func NextPrimeUint16(n uint16) (p uint16, ok bool) {
+	return n + uint16(primes16[n]), n < 65521
+}
+
+// IsPrime returns true if n is prime. Typical run time is about 100 ns.
+//
+//TODO rename to IsPrimeUint32
+func IsPrime(n uint32) bool {
+	switch {
+	case n&1 == 0:
+		return n == 2
+	case n%3 == 0:
+		return n == 3
+	case n%5 == 0:
+		return n == 5
+	case n%7 == 0:
+		return n == 7
+	case n%11 == 0:
+		return n == 11
+	case n%13 == 0:
+		return n == 13
+	case n%17 == 0:
+		return n == 17
+	case n%19 == 0:
+		return n == 19
+	case n%23 == 0:
+		return n == 23
+	case n%29 == 0:
+		return n == 29
+	case n%31 == 0:
+		return n == 31
+	case n%37 == 0:
+		return n == 37
+	case n%41 == 0:
+		return n == 41
+	case n%43 == 0:
+		return n == 43
+	case n%47 == 0:
+		return n == 47
+	case n%53 == 0:
+		return n == 53 // Benchmarked optimum
+	case n < 65536:
+		// use table data
+		return IsPrimeUint16(uint16(n))
+	default:
+		mod := ModPowUint32(2, (n+1)/2, n)
+		if mod != 2 && mod != n-2 {
+			return false
+		}
+		blk := &lohi[n>>24]
+		lo, hi := blk.lo, blk.hi
+		for lo <= hi {
+			index := (lo + hi) >> 1
+			liar := liars[index]
+			switch {
+			case n > liar:
+				lo = index + 1
+			case n < liar:
+				hi = index - 1
+			default:
+				return false
+			}
+		}
+		return true
+	}
+}
+
+// IsPrimeUint64 returns true if n is prime. Typical run time is few tens of µs.
+//
+// SPRP bases: http://miller-rabin.appspot.com
+func IsPrimeUint64(n uint64) bool {
+	switch {
+	case n%2 == 0:
+		return n == 2
+	case n%3 == 0:
+		return n == 3
+	case n%5 == 0:
+		return n == 5
+	case n%7 == 0:
+		return n == 7
+	case n%11 == 0:
+		return n == 11
+	case n%13 == 0:
+		return n == 13
+	case n%17 == 0:
+		return n == 17
+	case n%19 == 0:
+		return n == 19
+	case n%23 == 0:
+		return n == 23
+	case n%29 == 0:
+		return n == 29
+	case n%31 == 0:
+		return n == 31
+	case n%37 == 0:
+		return n == 37
+	case n%41 == 0:
+		return n == 41
+	case n%43 == 0:
+		return n == 43
+	case n%47 == 0:
+		return n == 47
+	case n%53 == 0:
+		return n == 53
+	case n%59 == 0:
+		return n == 59
+	case n%61 == 0:
+		return n == 61
+	case n%67 == 0:
+		return n == 67
+	case n%71 == 0:
+		return n == 71
+	case n%73 == 0:
+		return n == 73
+	case n%79 == 0:
+		return n == 79
+	case n%83 == 0:
+		return n == 83
+	case n%89 == 0:
+		return n == 89 // Benchmarked optimum
+	case n <= math.MaxUint16:
+		return IsPrimeUint16(uint16(n))
+	case n <= math.MaxUint32:
+		return ProbablyPrimeUint32(uint32(n), 11000544) &&
+			ProbablyPrimeUint32(uint32(n), 31481107)
+	case n < 105936894253:
+		return ProbablyPrimeUint64_32(n, 2) &&
+			ProbablyPrimeUint64_32(n, 1005905886) &&
+			ProbablyPrimeUint64_32(n, 1340600841)
+	case n < 31858317218647:
+		return ProbablyPrimeUint64_32(n, 2) &&
+			ProbablyPrimeUint64_32(n, 642735) &&
+			ProbablyPrimeUint64_32(n, 553174392) &&
+			ProbablyPrimeUint64_32(n, 3046413974)
+	case n < 3071837692357849:
+		return ProbablyPrimeUint64_32(n, 2) &&
+			ProbablyPrimeUint64_32(n, 75088) &&
+			ProbablyPrimeUint64_32(n, 642735) &&
+			ProbablyPrimeUint64_32(n, 203659041) &&
+			ProbablyPrimeUint64_32(n, 3613982119)
+	default:
+		return ProbablyPrimeUint64_32(n, 2) &&
+			ProbablyPrimeUint64_32(n, 325) &&
+			ProbablyPrimeUint64_32(n, 9375) &&
+			ProbablyPrimeUint64_32(n, 28178) &&
+			ProbablyPrimeUint64_32(n, 450775) &&
+			ProbablyPrimeUint64_32(n, 9780504) &&
+			ProbablyPrimeUint64_32(n, 1795265022)
+	}
+}
+
+// NextPrime returns first prime > n and true if successful or an undefined value and false if there
+// is no next prime in the uint32 limits. Typical run time is about 2 µs.
+//
+//TODO rename to NextPrimeUint32
+func NextPrime(n uint32) (p uint32, ok bool) {
+	switch {
+	case n < 65521:
+		p16, _ := NextPrimeUint16(uint16(n))
+		return uint32(p16), true
+	case n >= math.MaxUint32-4:
+		return
+	}
+
+	n++
+	var d0, d uint32
+	switch mod := n % 6; mod {
+	case 0:
+		d0, d = 1, 4
+	case 1:
+		d = 4
+	case 2, 3, 4:
+		d0, d = 5-mod, 2
+	case 5:
+		d = 2
+	}
+
+	p = n + d0
+	if p < n { // overflow
+		return
+	}
+
+	for {
+		if IsPrime(p) {
+			return p, true
+		}
+
+		p0 := p
+		p += d
+		if p < p0 { // overflow
+			break
+		}
+
+		d ^= 6
+	}
+	return
+}
+
+// NextPrimeUint64 returns first prime > n and true if successful or an undefined value and false if there
+// is no next prime in the uint64 limits. Typical run time is in hundreds of µs.
+func NextPrimeUint64(n uint64) (p uint64, ok bool) {
+	switch {
+	case n < 65521:
+		p16, _ := NextPrimeUint16(uint16(n))
+		return uint64(p16), true
+	case n >= 18446744073709551557: // last uint64 prime
+		return
+	}
+
+	n++
+	var d0, d uint64
+	switch mod := n % 6; mod {
+	case 0:
+		d0, d = 1, 4
+	case 1:
+		d = 4
+	case 2, 3, 4:
+		d0, d = 5-mod, 2
+	case 5:
+		d = 2
+	}
+
+	p = n + d0
+	if p < n { // overflow
+		return
+	}
+
+	for {
+		if ok = IsPrimeUint64(p); ok {
+			break
+		}
+
+		p0 := p
+		p += d
+		if p < p0 { // overflow
+			break
+		}
+
+		d ^= 6
+	}
+	return
+}
+
+// FactorTerm is one term of an integer factorization.
+type FactorTerm struct {
+	Prime uint32 // The divisor
+	Power uint32 // Term == Prime^Power
+}
+
+// FactorTerms represent a factorization of an integer
+type FactorTerms []FactorTerm
+
+// FactorInt returns prime factorization of n > 1 or nil otherwise.
+// Resulting factors are ordered by Prime. Typical run time is few µs.
+func FactorInt(n uint32) (f FactorTerms) {
+	switch {
+	case n < 2:
+		return
+	case IsPrime(n):
+		return []FactorTerm{{n, 1}}
+	}
+
+	f, w := make([]FactorTerm, 9), 0
+	prime16 := uint16(0)
+	for {
+		var ok bool
+		if prime16, ok = NextPrimeUint16(prime16); !ok {
+			break
+		}
+
+		prime := uint32(prime16)
+		if prime*prime > n {
+			break
+		}
+
+		power := uint32(0)
+		for n%prime == 0 {
+			n /= prime
+			power++
+		}
+		if power != 0 {
+			f[w] = FactorTerm{prime, power}
+			w++
+		}
+		if n == 1 {
+			break
+		}
+	}
+	if n != 1 {
+		f[w] = FactorTerm{n, 1}
+		w++
+	}
+	return f[:w]
+}
+
+// PrimorialProductsUint32 returns a slice of numbers in [lo, hi] which are a
+// product of max 'max' primorials. The slice is not sorted.
+//
+// See also: http://en.wikipedia.org/wiki/Primorial
+func PrimorialProductsUint32(lo, hi, max uint32) (r []uint32) {
+	lo64, hi64 := int64(lo), int64(hi)
+	if max > 31 { // N/A
+		max = 31
+	}
+
+	var f func(int64, int64, uint32)
+	f = func(n, p int64, emax uint32) {
+		e := uint32(1)
+		for n <= hi64 && e <= emax {
+			n *= p
+			if n >= lo64 && n <= hi64 {
+				r = append(r, uint32(n))
+			}
+			if n < hi64 {
+				p, _ := NextPrime(uint32(p))
+				f(n, int64(p), e)
+			}
+			e++
+		}
+	}
+
+	f(1, 2, max)
+	return
+}
diff --git a/vendor/github.com/cznic/mathutil/rat.go b/vendor/github.com/cznic/mathutil/rat.go
new file mode 100644
index 0000000000..91b1c6fb1e
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/rat.go
@@ -0,0 +1,27 @@
+// Copyright (c) 2014 The mathutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mathutil
+
+// QCmpUint32 compares a/b and c/d and returns:
+//
+//   -1 if a/b <  c/d
+//    0 if a/b == c/d
+//   +1 if a/b >  c/d
+//
+func QCmpUint32(a, b, c, d uint32) int {
+	switch x, y := uint64(a)*uint64(d), uint64(b)*uint64(c); {
+	case x < y:
+		return -1
+	case x == y:
+		return 0
+	default: // x > y
+		return 1
+	}
+}
+
+// QScaleUint32 returns a such that a/b >= c/d.
+func QScaleUint32(b, c, d uint32) (a uint64) {
+	return 1 + (uint64(b)*uint64(c))/uint64(d)
+}
diff --git a/vendor/github.com/cznic/mathutil/rnd.go b/vendor/github.com/cznic/mathutil/rnd.go
new file mode 100644
index 0000000000..9132dc0d55
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/rnd.go
@@ -0,0 +1,383 @@
+// Copyright (c) 2014 The mathutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mathutil
+
+import (
+	"fmt"
+	"math"
+	"math/big"
+)
+
+// FC32 is a full cycle PRNG covering the 32 bit signed integer range.
+// In contrast to full cycle generators shown at e.g. http://en.wikipedia.org/wiki/Full_cycle,
+// this code doesn't produce values at constant delta (mod cycle length).
+// The 32 bit limit is per this implementation, the algorithm used has no intrinsic limit on the cycle size.
+// Properties include:
+//	- Adjustable limits on creation (hi, lo).
+//	- Positionable/randomly accessible (Pos, Seek).
+//	- Repeatable (deterministic).
+//	- Can run forward or backward (Next, Prev).
+//	- For a billion numbers cycle the Next/Prev PRN can be produced in cca 100-150ns.
+//	  That's like 5-10 times slower compared to PRNs generated using the (non FC) rand package.
+type FC32 struct {
+	cycle   int64     // On average: 3 * delta / 2, (HQ: 2 * delta)
+	delta   int64     // hi - lo
+	factors [][]int64 // This trades some space for hopefully a bit of speed (multiple adding vs multiplying).
+	lo      int
+	mods    []int   // pos % set
+	pos     int64   // Within cycle.
+	primes  []int64 // Ordered. ∏ primes == cycle.
+	set     []int64 // Reordered primes (magnitude order bases) according to seed.
+}
+
+// NewFC32 returns a newly created FC32 adjusted for the closed interval [lo, hi] or an Error if any.
+// If hq == true then trade some generation time for improved (pseudo)randomness.
+func NewFC32(lo, hi int, hq bool) (r *FC32, err error) {
+	if lo > hi {
+		return nil, fmt.Errorf("invalid range %d > %d", lo, hi)
+	}
+
+	if uint64(hi)-uint64(lo) > math.MaxUint32 {
+		return nil, fmt.Errorf("range out of int32 limits %d, %d", lo, hi)
+	}
+
+	delta := int64(hi) - int64(lo)
+	// Find the primorial covering whole delta
+	n, set, p := int64(1), []int64{}, uint32(2)
+	if hq {
+		p++
+	}
+	for {
+		set = append(set, int64(p))
+		n *= int64(p)
+		if n > delta {
+			break
+		}
+		p, _ = NextPrime(p)
+	}
+
+	// Adjust the set so n ∊ [delta, 2 * delta] (HQ: [delta, 3 * delta])
+	// while keeping the cardinality of the set (correlates with the statistic "randomness quality")
+	// at max, i.e. discard atmost one member.
+	i := -1 // no candidate prime
+	if n > 2*(delta+1) {
+		for j, p := range set {
+			q := n / p
+			if q < delta+1 {
+				break
+			}
+
+			i = j // mark the highest candidate prime set index
+		}
+	}
+	if i >= 0 { // shrink the inner cycle
+		n = n / set[i]
+		set = delete(set, i)
+	}
+	r = &FC32{
+		cycle:   n,
+		delta:   delta,
+		factors: make([][]int64, len(set)),
+		lo:      lo,
+		mods:    make([]int, len(set)),
+		primes:  set,
+	}
+	r.Seed(1) // the default seed should be always non zero
+	return
+}
+
+// Cycle reports the length of the inner FCPRNG cycle.
+// Cycle is atmost the double (HQ: triple) of the generator period (hi - lo + 1).
+func (r *FC32) Cycle() int64 {
+	return r.cycle
+}
+
+// Next returns the first PRN after Pos.
+func (r *FC32) Next() int {
+	return r.step(1)
+}
+
+// Pos reports the current position within the inner cycle.
+func (r *FC32) Pos() int64 {
+	return r.pos
+}
+
+// Prev return the first PRN before Pos.
+func (r *FC32) Prev() int {
+	return r.step(-1)
+}
+
+// Seed uses the provided seed value to initialize the generator to a deterministic state.
+// A zero seed produces a "canonical" generator with worse randomness than for most non zero seeds.
+// Still, the FC property holds for any seed value.
+func (r *FC32) Seed(seed int64) {
+	u := uint64(seed)
+	r.set = mix(r.primes, &u)
+	n := int64(1)
+	for i, p := range r.set {
+		k := make([]int64, p)
+		v := int64(0)
+		for j := range k {
+			k[j] = v
+			v += n
+		}
+		n *= p
+		r.factors[i] = mix(k, &u)
+	}
+}
+
+// Seek sets Pos to |pos| % Cycle.
+func (r *FC32) Seek(pos int64) { //vet:ignore
+	if pos < 0 {
+		pos = -pos
+	}
+	pos %= r.cycle
+	r.pos = pos
+	for i, p := range r.set {
+		r.mods[i] = int(pos % p)
+	}
+}
+
+func (r *FC32) step(dir int) int {
+	for { // avg loops per step: 3/2 (HQ: 2)
+		y := int64(0)
+		pos := r.pos
+		pos += int64(dir)
+		switch {
+		case pos < 0:
+			pos = r.cycle - 1
+		case pos >= r.cycle:
+			pos = 0
+		}
+		r.pos = pos
+		for i, mod := range r.mods {
+			mod += dir
+			p := int(r.set[i])
+			switch {
+			case mod < 0:
+				mod = p - 1
+			case mod >= p:
+				mod = 0
+			}
+			r.mods[i] = mod
+			y += r.factors[i][mod]
+		}
+		if y <= r.delta {
+			return int(y) + r.lo
+		}
+	}
+}
+
+func delete(set []int64, i int) (y []int64) {
+	for j, v := range set {
+		if j != i {
+			y = append(y, v)
+		}
+	}
+	return
+}
+
+func mix(set []int64, seed *uint64) (y []int64) {
+	for len(set) != 0 {
+		*seed = rol(*seed)
+		i := int(*seed % uint64(len(set)))
+		y = append(y, set[i])
+		set = delete(set, i)
+	}
+	return
+}
+
+func rol(u uint64) (y uint64) {
+	y = u << 1
+	if int64(u) < 0 {
+		y |= 1
+	}
+	return
+}
+
+// FCBig is a full cycle PRNG covering ranges outside of the int32 limits.
+// For more info see the FC32 docs.
+// Next/Prev PRN on a 1e15 cycle can be produced in about 2 µsec.
+type FCBig struct {
+	cycle   *big.Int     // On average: 3 * delta / 2, (HQ: 2 * delta)
+	delta   *big.Int     // hi - lo
+	factors [][]*big.Int // This trades some space for hopefully a bit of speed (multiple adding vs multiplying).
+	lo      *big.Int
+	mods    []int    // pos % set
+	pos     *big.Int // Within cycle.
+	primes  []int64  // Ordered. ∏ primes == cycle.
+	set     []int64  // Reordered primes (magnitude order bases) according to seed.
+}
+
+// NewFCBig returns a newly created FCBig adjusted for the closed interval [lo, hi] or an Error if any.
+// If hq == true then trade some generation time for improved (pseudo)randomness.
+func NewFCBig(lo, hi *big.Int, hq bool) (r *FCBig, err error) {
+	if lo.Cmp(hi) > 0 {
+		return nil, fmt.Errorf("invalid range %d > %d", lo, hi)
+	}
+
+	delta := big.NewInt(0)
+	delta.Add(delta, hi).Sub(delta, lo)
+
+	// Find the primorial covering whole delta
+	n, set, pp, p := big.NewInt(1), []int64{}, big.NewInt(0), uint32(2)
+	if hq {
+		p++
+	}
+	for {
+		set = append(set, int64(p))
+		pp.SetInt64(int64(p))
+		n.Mul(n, pp)
+		if n.Cmp(delta) > 0 {
+			break
+		}
+		p, _ = NextPrime(p)
+	}
+
+	// Adjust the set so n ∊ [delta, 2 * delta] (HQ: [delta, 3 * delta])
+	// while keeping the cardinality of the set (correlates with the statistic "randomness quality")
+	// at max, i.e. discard atmost one member.
+	dd1 := big.NewInt(1)
+	dd1.Add(dd1, delta)
+	dd2 := big.NewInt(0)
+	dd2.Lsh(dd1, 1)
+	i := -1 // no candidate prime
+	if n.Cmp(dd2) > 0 {
+		q := big.NewInt(0)
+		for j, p := range set {
+			pp.SetInt64(p)
+			q.Set(n)
+			q.Div(q, pp)
+			if q.Cmp(dd1) < 0 {
+				break
+			}
+
+			i = j // mark the highest candidate prime set index
+		}
+	}
+	if i >= 0 { // shrink the inner cycle
+		pp.SetInt64(set[i])
+		n.Div(n, pp)
+		set = delete(set, i)
+	}
+	r = &FCBig{
+		cycle:   n,
+		delta:   delta,
+		factors: make([][]*big.Int, len(set)),
+		lo:      lo,
+		mods:    make([]int, len(set)),
+		pos:     big.NewInt(0),
+		primes:  set,
+	}
+	r.Seed(1) // the default seed should be always non zero
+	return
+}
+
+// Cycle reports the length of the inner FCPRNG cycle.
+// Cycle is atmost the double (HQ: triple) of the generator period (hi - lo + 1).
+func (r *FCBig) Cycle() *big.Int {
+	return r.cycle
+}
+
+// Next returns the first PRN after Pos.
+func (r *FCBig) Next() *big.Int {
+	return r.step(1)
+}
+
+// Pos reports the current position within the inner cycle.
+func (r *FCBig) Pos() *big.Int {
+	return r.pos
+}
+
+// Prev return the first PRN before Pos.
+func (r *FCBig) Prev() *big.Int {
+	return r.step(-1)
+}
+
+// Seed uses the provided seed value to initialize the generator to a deterministic state.
+// A zero seed produces a "canonical" generator with worse randomness than for most non zero seeds.
+// Still, the FC property holds for any seed value.
+func (r *FCBig) Seed(seed int64) {
+	u := uint64(seed)
+	r.set = mix(r.primes, &u)
+	n := big.NewInt(1)
+	v := big.NewInt(0)
+	pp := big.NewInt(0)
+	for i, p := range r.set {
+		k := make([]*big.Int, p)
+		v.SetInt64(0)
+		for j := range k {
+			k[j] = big.NewInt(0)
+			k[j].Set(v)
+			v.Add(v, n)
+		}
+		pp.SetInt64(p)
+		n.Mul(n, pp)
+		r.factors[i] = mixBig(k, &u)
+	}
+}
+
+// Seek sets Pos to |pos| % Cycle.
+func (r *FCBig) Seek(pos *big.Int) {
+	r.pos.Set(pos)
+	r.pos.Abs(r.pos)
+	r.pos.Mod(r.pos, r.cycle)
+	mod := big.NewInt(0)
+	pp := big.NewInt(0)
+	for i, p := range r.set {
+		pp.SetInt64(p)
+		r.mods[i] = int(mod.Mod(r.pos, pp).Int64())
+	}
+}
+
+func (r *FCBig) step(dir int) (y *big.Int) {
+	y = big.NewInt(0)
+	d := big.NewInt(int64(dir))
+	for { // avg loops per step: 3/2 (HQ: 2)
+		r.pos.Add(r.pos, d)
+		switch {
+		case r.pos.Sign() < 0:
+			r.pos.Add(r.pos, r.cycle)
+		case r.pos.Cmp(r.cycle) >= 0:
+			r.pos.SetInt64(0)
+		}
+		for i, mod := range r.mods {
+			mod += dir
+			p := int(r.set[i])
+			switch {
+			case mod < 0:
+				mod = p - 1
+			case mod >= p:
+				mod = 0
+			}
+			r.mods[i] = mod
+			y.Add(y, r.factors[i][mod])
+		}
+		if y.Cmp(r.delta) <= 0 {
+			y.Add(y, r.lo)
+			return
+		}
+		y.SetInt64(0)
+	}
+}
+
+func deleteBig(set []*big.Int, i int) (y []*big.Int) {
+	for j, v := range set {
+		if j != i {
+			y = append(y, v)
+		}
+	}
+	return
+}
+
+func mixBig(set []*big.Int, seed *uint64) (y []*big.Int) {
+	for len(set) != 0 {
+		*seed = rol(*seed)
+		i := int(*seed % uint64(len(set)))
+		y = append(y, set[i])
+		set = deleteBig(set, i)
+	}
+	return
+}
diff --git a/vendor/github.com/cznic/mathutil/tables.go b/vendor/github.com/cznic/mathutil/tables.go
new file mode 100644
index 0000000000..f32952c007
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/tables.go
@@ -0,0 +1,6995 @@
+// Copyright (c) 2014 The mathutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// "Static" data
+
+package mathutil
+
+var (
+	// Set bits count in a byte
+	popcnt = [256]byte{
+		0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, // 0
+		1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, // 1
+		1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, // 2
+		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 3
+		1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, // 4
+		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 5
+		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 6
+		3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, // 7
+		1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, // 8
+		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 9
+		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 10
+		3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, // 11
+		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 12
+		3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, // 13
+		3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, // 14
+		4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8, // 15
+	}
+
+	// Highest set bit index in a byte
+	log2 = [256]int{
+		-1, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, // 0
+
+		4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, // 1
+
+		5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, // 2
+		5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, // 3
+
+		6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, // 4
+		6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, // 5
+		6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, // 6
+		6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, // 7
+
+		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 8
+		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 9
+		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 10
+		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 11
+		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 12
+		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 13
+		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 14
+		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 15
+	}
+
+	// "Predivisors": 2-53
+	liars = [3660]uint32{
+		31621, 42799, 49141, 49981, 65077, 65281, 80581, 83333, 88357, 90751,
+		104653, 130561, 164737, 188057, 194221, 196093, 215749, 219781, 220729, 253241,
+		256999, 271951, 280601, 282133, 357761, 390937, 458989, 486737, 489997, 514447,
+		580337, 587861, 611701, 647089, 653333, 657901, 665281, 665333, 688213, 710533,
+		721801, 722261, 738541, 741751, 742813, 745889, 769757, 818201, 838861, 873181,
+		877099, 916327, 976873, 983401, 1016801, 1018921, 1053761, 1064053, 1073021, 1082401,
+		1109461, 1132657, 1145257, 1168513, 1194649, 1207361, 1251949, 1252697, 1302451, 1325843,
+		1357441, 1373653, 1397419, 1441091, 1493857, 1507963, 1509709, 1530787, 1584133, 1678541,
+		1690501, 1730977, 1735841, 1811573, 1876393, 1969417, 1987021, 2004403, 2081713, 2163001,
+		2181961, 2205967, 2261953, 2264369, 2269093, 2284453, 2304167, 2387797, 2487941, 2510569,
+		2670361, 2746477, 2748023, 2757241, 2811271, 2909197, 2944261, 2976487, 3048841, 3090091,
+		3116107, 3125281, 3225601, 3363121, 3375041, 3400013, 3413533, 3429037, 3539101, 3542533,
+		3567481, 3568661, 3605429, 3656449, 3763801, 3828001, 3898129, 3911197, 3985921, 4072729,
+		4181921, 4188889, 4209661, 4360621, 4469471, 4480477, 4513841, 4835209, 4863127, 4869313,
+		4877641, 4922413, 5016191, 5044033, 5095177, 5173169, 5173601, 5176153, 5256091, 5271841,
+		5284333, 5351537, 5489641, 5590621, 5672041, 5919187, 6027193, 6118141, 6140161, 6159301,
+		6189121, 6226193, 6233977, 6236257, 6278533, 6334351, 6368689, 6386993, 6631549, 6658669,
+		6779137, 6787327, 6836233, 6952037, 6955541, 6998881, 7017193, 7232321, 7306261, 7306561,
+		7429117, 7462001, 7674967, 7725901, 7759937, 7820201, 7883731, 8036033, 8095447, 8239477,
+		8384513, 8534233, 8725753, 8727391, 8902741, 9006401, 9056501, 9073513, 9131401, 9345541,
+		9371251, 9439201, 9480461, 9533701, 9564169, 9567673, 9588151, 9591661, 9729301, 9774181,
+		9863461, 10024561, 10084177, 10323769, 10331141, 10386241, 10425511, 10610063, 10700761, 10712857,
+		10763653, 10974881, 11081459, 11115037, 11335501, 11541307, 11585293, 11592397, 11777599, 12032021,
+		12096613, 12263131, 12322133, 12327121, 12599233, 12854437, 13057787, 13338371, 13446253, 13500313,
+		13635289, 13694761, 13747361, 13773061, 14026897, 14154337, 14179537, 14324473, 14469841, 14671801,
+		14676481, 14709241, 14794081, 14796289, 14865121, 15101893, 15139199, 15162941, 15188557, 15220951,
+		15247621, 15479777, 15525241, 15603391, 15621409, 15700301, 15802681, 15976747, 15978007, 16070429,
+		16132321, 16149169, 16153633, 16324001, 16349477, 16360381, 16705021, 16773121, 16822081, 16843009,
+		16853077, 16879501, 16973393, 17098369, 17116837, 17134043, 17208601, 17236801, 17327773, 17375249,
+		17405537, 17585969, 17870561, 18067501, 18073817, 18366937, 18443701, 18454921, 18535177, 18653353,
+		18740971, 19328653, 19384289, 19404139, 19471033, 19607561, 20261251, 20417311, 20647621, 20968501,
+		21042001, 21303343, 21306157, 21359521, 21397381, 21400481, 21623659, 21654533, 22075579, 22087477,
+		22369621, 22591301, 22669501, 22711873, 22849481, 22953673, 23247901, 23382529, 23464033, 23577497,
+		23634181, 23734901, 23828017, 23872213, 23963869, 24214051, 24356377, 25080101, 25150501, 25276421,
+		25326001, 25457833, 25629913, 25696133, 25768261, 25909453, 26280073, 26377921, 26821601, 26840269,
+		26877421, 26886817, 27108397, 27118601, 27219697, 27271151, 27279409, 27331921, 27380831, 27392041,
+		27409541, 27491237, 27509653, 27664033, 27798461, 27808463, 28325881, 28527049, 28572961, 29111881,
+		29214541, 29581501, 30022129, 30090817, 30185569, 30219757, 30295141, 30338593, 30388753, 30418957,
+		30576151, 30662497, 30740417, 30881551, 30894307, 31040833, 31166803, 31436123, 31735621, 31759121,
+		32091781, 32095057, 32168117, 32285041, 32497921, 32676481, 33146717, 33298337, 33600533, 33627301,
+		33704101, 33872593, 34003061, 34043101, 34124641, 34540801, 34856167, 34944001, 35576599, 35703361,
+		35820937, 35851037, 36291193, 36307981, 36861901, 36919681, 36974341, 37109467, 37376509, 37439201,
+		37964809, 37988497, 38010307, 38046817, 38118763, 38210323, 39465091, 39512773, 39655153, 39684157,
+		40165093, 40238797, 40315441, 40361197, 40629601, 40782589, 40827473, 40987201, 41121433, 41568101,
+		41604109, 41642681, 41662297, 41840809, 42009217, 42485119, 42623017, 42984589, 43224397, 43363601,
+		43661257, 44070841, 44314129, 44465221, 44482901, 45100177, 45175201, 45219329, 45414433, 45819541,
+		45879941, 46094401, 46325029, 46386589, 46469809, 46517857, 46679761, 46860001, 47220367, 47903701,
+		47918581, 48064021, 48191653, 48269761, 48316969, 48400753, 48448661, 48551161, 48563089, 49075417,
+		49303801, 49411801, 49459801, 50155733, 50201089, 50443201, 50523661, 51030601, 51129781, 51302353,
+		51500521, 52072021, 52119289, 52204237, 53283169, 53399449, 53656021, 53675623, 53695721, 53711113,
+		54029741, 54449431, 55109401, 55176097, 55318957, 55729957, 56052361, 56420033, 56479897, 56810137,
+		57762433, 58003213, 58422409, 58449847, 58509977, 58679941, 58755877, 59631211, 59840537, 59913157,
+		59953741, 60155201, 60352921, 60547831, 60566431, 60581401, 60696661, 60738257, 60957361, 61201009,
+		61219789, 61377109, 61832377, 62756641, 63001801, 63002501, 63065281, 63167743, 63318169, 63328469,
+		63346999, 63388033, 64148717, 64605041, 64735897, 65144501, 65254393, 65301013, 65350801, 65359477,
+		66096253, 67194401, 67642513, 67928221, 68102641, 68154001, 68165761, 68512867, 68621701, 68839597,
+		69030901, 69128641, 69176647, 69228967, 69231061, 69485281, 69612061, 69885649, 70149631, 70463489,
+		70593931, 70728121, 71079661, 71734417, 72498253, 72543547, 73562833, 73645001, 74411131, 74927161,
+		75140137, 75565873, 76725091, 76745101, 77533123, 77648941, 77812153, 77817979, 78939089, 79398901,
+		79411201, 79417801, 79464533, 79786523, 80142761, 80146909, 80375707, 80556337, 80687881, 80891009,
+		81433591, 81954133, 82273201, 82506439, 82870517, 82929001, 83083001, 83103329, 83204801, 84164033,
+		84350561, 84421081, 84487457, 84998503, 85328717, 85519337, 85823401, 86027329, 86438857, 86530621,
+		86999837, 87499651, 87694261, 88256449, 88368853, 88661861, 89308771, 89784581, 90270613, 90278161,
+		90341197, 90665789, 90698401, 91433281, 91659283, 92438581, 92625121, 93431521, 93541537, 93571633,
+		93643201, 93677761, 93926197, 94316401, 94502701, 95451361, 95452781, 96135601, 96618397, 96791881,
+		96888641, 96895441, 96904081, 96925921, 97255801, 97496449, 97796953, 97863529, 97924217, 99036001,
+		99115297, 99486889, 99789673, 99898801, 100463443, 100618933, 100943201, 101152133, 101218921, 101270251,
+		101276579, 101649241, 102004421, 102678031, 102690677, 102690901, 103301633, 104078857, 104524421, 104988673,
+		105305443, 105919633, 106485121, 106622353, 106743073, 107360641, 107543333, 108596953, 109231229, 109437751,
+		109541461, 109879837, 110135821, 110139499, 110312773, 110413333, 110717861, 111370141, 111654401, 112032001,
+		112402981, 112828801, 113589601, 113605201, 113730481, 113892589, 114305441, 114329881, 114701341, 114842677,
+		114910489, 115039081, 115174681, 115497901, 115804501, 115873801, 116090081, 116321617, 116617289, 116682721,
+		116696161, 116998669, 117987841, 118466401, 118901521, 119092801, 119204809, 119261113, 119327041, 119558011,
+		119743537, 119940853, 120296677, 120517021, 120838609, 121062001, 121374241, 121472359, 121609489, 122166307,
+		122396737, 122941981, 123481777, 123671671, 123877081, 123987793, 124145473, 124630273, 124818601, 125284141,
+		125686241, 125848577, 126132553, 127050067, 128079409, 128124151, 128396921, 128468957, 128665319, 128987429,
+		129205781, 129256273, 129357061, 129461617, 129524669, 130556329, 130693393, 130944133, 131023201, 131567929,
+		131938561, 132332201, 132338881, 132440521, 132575071, 133216381, 133302781, 133467517, 133800661, 134696801,
+		134767153, 134868029, 135263269, 135296053, 135308881, 135945853, 135969401, 136043641, 136661201, 136722433,
+		137415821, 137763037, 138030721, 138403981, 138828821, 139295701, 139487041, 140197051, 142525333, 142922413,
+		143106133, 143168581, 145348529, 146156617, 146272901, 146659801, 146843929, 146884393, 147028001, 147287141,
+		148109473, 148171769, 148910653, 149389633, 150379693, 150960239, 150988753, 151533377, 151589881, 152716537,
+		152922001, 152991841, 153369061, 153589801, 153754873, 153928133, 154287451, 154513633, 154944533, 155203361,
+		156114061, 156532799, 157069189, 157368661, 157405249, 157725829, 158068153, 158192317, 158397247, 158496911,
+		158544401, 158895281, 160348189, 160378861, 160491329, 160587841, 160672201, 160730389, 161184013, 161216021,
+		161289649, 161304001, 161423377, 162026869, 162067441, 162690481, 162771337, 162776041, 163442551, 163954561,
+		164111281, 165061909, 165224321, 165938653, 166082309, 166339057, 166406561, 166827943, 167579497, 167582377,
+		167692141, 167881121, 168566501, 169655641, 170640961, 170782921, 170856533, 171454321, 172116181, 172436713,
+		172947529, 173401621, 174479729, 176030977, 176597821, 176609441, 176977921, 177167233, 177254533, 177693521,
+		177927641, 177951973, 178837201, 178956971, 179083601, 179285137, 179820257, 180115489, 180497633, 180703451,
+		181285001, 181285537, 181542601, 181647497, 182383111, 183677341, 184411567, 185653333, 186183469, 186393481,
+		186983521, 187050529, 187667969, 187761241, 188516329, 188985961, 189714193, 189738361, 189941761, 190212181,
+		190382161, 190913297, 191233813, 191648161, 191981609, 192346153, 192857761, 193330237, 193638337, 193949641,
+		194556451, 196035001, 196049701, 196231393, 198982759, 199674721, 200143351, 200753281, 201261061, 202130197,
+		202156813, 202538857, 203505697, 204280501, 204582457, 204766381, 205057561, 206304961, 206453509, 206504033,
+		206529737, 207008569, 207030541, 207132481, 207477001, 207618781, 208051201, 208969223, 209246701, 209404369,
+		209990881, 210592873, 210842113, 213035761, 214038533, 214110541, 214852609, 214858717, 215436241, 216821881,
+		217123069, 217875571, 218603617, 218642029, 218947121, 219621781, 220531501, 220883521, 221368153, 221415781,
+		221884001, 222010721, 222630193, 223449463, 223625851, 223782263, 224074369, 224136013, 224769241, 224957893,
+		225853633, 226359547, 226450297, 227132641, 227444101, 227475481, 228652201, 228842209, 228988033, 229589413,
+		230357761, 231383461, 231405701, 231927781, 232114433, 232460821, 232771501, 233110081, 234869009, 235426913,
+		235928071, 237791143, 238001653, 238833421, 240068041, 240371713, 240694513, 240785047, 241505377, 242067841,
+		242650717, 242860069, 243583201, 243955141, 244883981, 245006623, 245950561, 246099317, 246282511, 246434761,
+		246658441, 247318957, 247321301, 247416101, 249582481, 250436033, 250958401, 250988173, 251528401, 251663837,
+		251855893, 252853921, 253610281, 253893397, 255416897, 256831433, 257590661, 258020473, 258043229, 258234401,
+		258944401, 259763093, 259765747, 260156101, 260518801, 260736341, 260963389, 261186001, 261703417, 262979501,
+		263428181, 264269449, 264384469, 265020001, 265584133, 265735969, 265836161, 266790481, 266925601, 270525737,
+		271272569, 271763467, 271826629, 271950829, 273361789, 273480637, 274701913, 274810241, 274919401, 275283401,
+		275619961, 276018913, 276131137, 276542401, 276638321, 277787141, 278943061, 279377281, 280885153, 282253141,
+		282471853, 282769771, 283900961, 284166877, 284301751, 284736091, 284834299, 285820501, 286316801, 287160301,
+		287449091, 287715121, 288099001, 288117721, 288735277, 290643601, 290706781, 290953921, 291088513, 291461633,
+		292153681, 292290181, 292433321, 292902481, 293346637, 293847721, 293938261, 295419097, 295743017, 297624961,
+		297798961, 298212601, 299367877, 299736181, 301413001, 302635351, 304080001, 307629401, 307694323, 307972801,
+		308483209, 309666361, 310474249, 310978027, 311177213, 311411629, 311655829, 311671361, 312408113, 312614021,
+		314184487, 315034513, 315351521, 317137969, 317365933, 317641171, 317796119, 319053281, 319374577, 319440769,
+		319726177, 320326003, 321324589, 321850849, 322469701, 322941881, 324477697, 325028089, 325352101, 325546873,
+		326266051, 326405713, 326469137, 326628721, 326694301, 326695141, 327073601, 327093409, 327398009, 328302901,
+		329153653, 329769721, 330198331, 330759617, 331658081, 331934989, 337135501, 337420679, 337665901, 337783981,
+		338125537, 338458807, 338914369, 339195097, 339492169, 339794641, 341958121, 341994131, 343017529, 343052833,
+		344201441, 344255551, 344776301, 346080391, 348989101, 349752913, 350031973, 350244577, 351058753, 351177769,
+		352802803, 352932337, 353815801, 353932801, 354062809, 356604421, 356836819, 357348601, 357872971, 358416577,
+		359394751, 359727073, 360145633, 360375181, 360787771, 361307521, 361312337, 362569201, 363170837, 363430637,
+		364550761, 365077373, 365231401, 366487201, 366532321, 366652201, 367559501, 367632301, 368016949, 368476501,
+		369667561, 371011801, 371611153, 372167101, 373012777, 373533617, 373669453, 373906513, 374346361, 374988661,
+		376957153, 377192353, 377334497, 377458849, 377806687, 377869031, 378792649, 379732501, 380137633, 382304161,
+		384100001, 385175113, 385319089, 387072661, 388695301, 390609941, 390612221, 391014937, 392679737, 393611653,
+		394723177, 396864469, 399156661, 399302581, 399647221, 400385701, 400557109, 401100881, 403095967, 403293313,
+		405739681, 405782623, 407737201, 407889161, 409302001, 409458241, 410613809, 410680357, 411618241, 411851389,
+		412836689, 413138881, 413429801, 413778817, 414216461, 414368641, 415200361, 415204501, 415476343, 416964241,
+		417767201, 417779909, 418044563, 418226581, 418616161, 418617281, 418667401, 419184481, 420607441, 421942951,
+		422429041, 422928101, 423384001, 423465001, 424175761, 424411501, 424431541, 425967301, 426174101, 426219649,
+		426770437, 426783811, 427294141, 428180191, 428758201, 429135841, 429509837, 430046857, 430381921, 430646401,
+		430733701, 432227449, 434042801, 435016187, 435358657, 435993301, 436465501, 437247841, 437462101, 437597101,
+		437866087, 439309261, 441354497, 441650591, 441758461, 442050577, 442181291, 442543553, 444660421, 445429693,
+		446414621, 446619617, 449501761, 450807481, 450866021, 450872573, 452990401, 453366029, 453967739, 454745773,
+		455198563, 457274161, 457320533, 459785089, 460251733, 460585861, 461151121, 461272267, 461329601, 462587329,
+		462639409, 462701513, 464012033, 464955857, 465505633, 466290949, 466758181, 467100937, 468410113, 468950021,
+		470120257, 470268137, 470644021, 471535373, 471664513, 472814413, 473581057, 474892741, 474970501, 474983881,
+		475723849, 478614067, 479962009, 480668347, 481153501, 481239361, 482488393, 482824669, 482921297, 483006889,
+		483029821, 483945601, 484200289, 486063001, 486902929, 487896601, 488104681, 488169289, 488585521, 488656981,
+		489994201, 490950461, 491738801, 493108481, 494288677, 495909871, 496109729, 496560349, 497148599, 497285713,
+		498662561, 498706651, 498905189, 500747293, 501172241, 501472333, 502686713, 504870241, 505473263, 505532773,
+		505798213, 506349421, 507142567, 507323521, 508606771, 509302873, 509551201, 510925609, 511098521, 511215521,
+		511611673, 512330281, 514738981, 516045197, 516259657, 516764063, 517662001, 518216201, 518548801, 521501473,
+		522390109, 522758233, 523756711, 526067821, 526359289, 526686889, 528013333, 528043753, 528220117, 530630701,
+		531095029, 531681281, 532126801, 532758241, 532800133, 533429881, 534782293, 535252867, 535428577, 535517581,
+		536003333, 536114197, 536342419, 536870911, 540207097, 540621181, 540654409, 540680141, 542497201, 542536457,
+		544861633, 545550433, 545622401, 546102481, 546117301, 546322201, 548080513, 548989561, 549308761, 550132741,
+		550230409, 550635373, 550853137, 551313001, 552573793, 553027201, 554487121, 554599051, 554964001, 555321007,
+		555465601, 556001377, 556069849, 556095433, 556114609, 557165209, 558235109, 558900821, 558977761, 561448487,
+		562367821, 563298061, 563947141, 564298489, 564689381, 565664761, 565707061, 567358513, 567596401, 568902001,
+		568967221, 569332177, 569495809, 570941881, 572123521, 572228929, 572430769, 572567353, 572936869, 573817861,
+		573862021, 574998841, 575326033, 576724219, 577210181, 577352641, 577613261, 579606301, 579956653, 581618143,
+		582389641, 582799951, 585261637, 586706821, 587343541, 588049001, 591242653, 591822001, 592467451, 592468777,
+		593682169, 593728489, 595405201, 595590841, 597537361, 597717121, 599135767, 599945293, 600893921, 601606487,
+		602379181, 604584221, 605454917, 605961049, 606872449, 607148653, 607750681, 608421637, 608917753, 609361567,
+		609813781, 611097401, 611374453, 611770513, 611812321, 611817421, 612006253, 613849601, 614742241, 615361183,
+		615760133, 615895897, 616280897, 617087701, 619239457, 619365121, 619480601, 620169409, 620544961, 620755537,
+		621769669, 622137601, 623735953, 624303241, 624732421, 625060801, 625482001, 626717471, 627886657, 628868467,
+		629134081, 630496621, 630622753, 630811513, 631767943, 631974613, 633289807, 635155291, 635291077, 635319361,
+		636287653, 636337073, 636936697, 638502913, 638837761, 639305921, 639807781, 640650931, 640977373, 643036321,
+		643316461, 643552909, 644004817, 644453633, 644457551, 644731357, 644900257, 645556481, 648056449, 648328801,
+		651011329, 651064681, 651151801, 651514753, 652469641, 653235841, 653260633, 655264369, 657732349, 659526601,
+		659846021, 660095641, 660754117, 661122881, 661207177, 662134201, 663760681, 665462081, 668498321, 670976641,
+		670987021, 671716921, 672103001, 672108193, 673778827, 675260477, 676359391, 678481693, 680983817, 681019921,
+		681124207, 681303241, 682528687, 683316001, 683362681, 684350833, 686059921, 687741401, 689537441, 690035713,
+		690562601, 691131349, 692535637, 693456521, 694116893, 696042901, 696321949, 696998251, 697821857, 698192041,
+		698819711, 702683101, 705303457, 705351583, 706728377, 707691601, 709409993, 710382401, 710617861, 710721001,
+		714490481, 717096641, 717653129, 717831211, 720767521, 722955773, 724160251, 724969087, 725508241, 731276521,
+		732805681, 734166217, 736668013, 739444021, 739576801, 740988151, 741182401, 741214237, 742017181, 742550401,
+		744500641, 745493761, 745745461, 746331041, 747406801, 748638001, 749172821, 749640161, 750632137, 751226401,
+		751705597, 752186593, 753233717, 753574537, 753594001, 754020361, 754874257, 756205633, 756271909, 756980137,
+		758581651, 758687581, 758901701, 759252367, 759266621, 759638881, 762699649, 763907741, 764033999, 764240611,
+		765378241, 766303693, 766823797, 770201221, 770909107, 770937931, 771043201, 771337891, 772495777, 773131927,
+		773807401, 775368901, 775896181, 776443769, 777218989, 781471001, 782823281, 784450393, 784777393, 784783477,
+		784966297, 787085857, 787209277, 788046901, 788931361, 789082001, 790453049, 791118043, 792144161, 792145729,
+		794201333, 794399041, 794937601, 795064909, 796072003, 796200901, 796560703, 797418997, 797834017, 799162561,
+		799630753, 799898833, 799916101, 801093011, 801227269, 801866647, 804978721, 805505957, 805771501, 807115753,
+		807218413, 808214161, 809790881, 810023881, 810455101, 811110301, 811478533, 811607777, 811730923, 815430533,
+		815796413, 816024161, 816215401, 816549121, 817832329, 818401321, 819466201, 819743233, 822018961, 822531841,
+		824389441, 826004467, 829512001, 830664451, 831933901, 832048447, 832127489, 832169857, 833610751, 837766217,
+		839268139, 839280691, 839908217, 840749761, 841217653, 841660961, 842785841, 842824981, 842960981, 843161887,
+		844545271, 845376533, 846961321, 848090377, 848755969, 849548671, 852432769, 854094781, 854868257, 855734401,
+		857100421, 857902861, 858687103, 859096477, 860334301, 862082677, 862678081, 863196181, 863609113, 863984881,
+		865242841, 867022747, 867110501, 867638201, 868088341, 868111597, 868691401, 870985223, 871157233, 871195561,
+		871908481, 876850801, 877542481, 878492941, 878940833, 879995689, 880870513, 880922657, 883276549, 884304037,
+		884952001, 886180429, 887795221, 888868441, 892740853, 893692819, 894264337, 896901461, 897087361, 897283213,
+		899019353, 900736411, 901848301, 902566501, 903108821, 903390643, 905040953, 907378669, 907670501, 907711561,
+		908005249, 910202509, 910867481, 911484421, 914348737, 914906539, 920375821, 920696653, 921858631, 922845241,
+		923437213, 926756881, 927106561, 927877001, 929159941, 930530701, 932148253, 933729421, 935794081, 936421141,
+		937675393, 938376181, 939947009, 940123801, 941056273, 941734657, 943271569, 944832533, 946034057, 946787377,
+		947878081, 949317217, 949697233, 952893881, 954924013, 957600541, 957631249, 958131157, 958735681, 960269377,
+		960946321, 962442001, 962489557, 962523169, 964412837, 965501857, 967266451, 967287751, 967790401, 968283247,
+		968413217, 968751241, 969528337, 970586713, 971975071, 974113601, 974471243, 974774401, 975576281, 976396961,
+		977483449, 979363153, 980056507, 980725201, 981484561, 983456377, 984133441, 984252001, 985052881, 985075681,
+		987842101, 994133479, 995586373, 995650921, 997836841, 998489017, 998590601, 998596741, 998724481, 999828727,
+		1002261781, 1003062061, 1005402133, 1005833971, 1006800829, 1008777001, 1008839999, 1009025263, 1009140161, 1011319501,
+		1011333061, 1011570457, 1011909271, 1012438391, 1013833153, 1015339441, 1015626151, 1017748057, 1020515761, 1021281301,
+		1022336611, 1024041853, 1024123501, 1024605121, 1025035129, 1026738161, 1027744453, 1028494429, 1034252929, 1034958601,
+		1040234231, 1049584313, 1050102901, 1050535501, 1054999441, 1055009117, 1056121453, 1057426651, 1063212481, 1065508321,
+		1065602281, 1066972301, 1069388497, 1070639389, 1070941987, 1071512749, 1071643249, 1072898711, 1073159281, 1073288581,
+		1073484823, 1075100041, 1077133397, 1078467589, 1081798061, 1082472553, 1084241341, 1084444481, 1090858081, 1093150081,
+		1093352833, 1093526353, 1094042321, 1097416321, 1098743563, 1100624857, 1101623381, 1101673501, 1102573501, 1102750013,
+		1104194521, 1105038871, 1106529761, 1106580817, 1106595493, 1107138961, 1108135381, 1109304913, 1110582947, 1111205873,
+		1111939201, 1112671603, 1114277221, 1116379301, 1117202557, 1117785881, 1117828001, 1117890019, 1119412321, 1120076281,
+		1120981021, 1121176981, 1123406047, 1123625501, 1123727617, 1124396521, 1125038377, 1127040769, 1130933429, 1134367777,
+		1138289041, 1138607233, 1139137057, 1140573601, 1142466151, 1147434289, 1148578201, 1150229761, 1151670001, 1153164097,
+		1153440289, 1154343961, 1154691409, 1154987209, 1155939709, 1156761911, 1156993373, 1157839381, 1159421509, 1160844821,
+		1163098249, 1163227759, 1164218641, 1165717129, 1166475601, 1166598217, 1168221121, 1168256953, 1168492417, 1173229201,
+		1173545533, 1174300093, 1180970407, 1181566219, 1183338241, 1184554801, 1186325981, 1187235193, 1191153937, 1191216133,
+		1192314817, 1192412033, 1192903531, 1193229577, 1193557093, 1195524181, 1196852273, 1198650961, 1198880261, 1200456577,
+		1200778753, 1202142061, 1204205449, 1205606533, 1205772499, 1209998077, 1210393801, 1210562701, 1210653541, 1213619761,
+		1217181061, 1217823517, 1217924159, 1219816261, 1219858921, 1220114377, 1221127013, 1222861271, 1223531677, 1223941657,
+		1225128829, 1226230297, 1226855293, 1227220801, 1229491063, 1229751667, 1230446653, 1231362793, 1232445677, 1234125721,
+		1234646533, 1235188597, 1235864033, 1236313501, 1236442421, 1238825569, 1242171349, 1242858317, 1249166881, 1249785941,
+		1250656621, 1252236421, 1254277909, 1255665613, 1257102001, 1258903981, 1260332137, 1263293281, 1264145401, 1265477791,
+		1266003461, 1266273793, 1266425101, 1267345081, 1269295201, 1269835201, 1270193401, 1270489621, 1270667353, 1272558739,
+		1272866167, 1282447477, 1282568741, 1285636801, 1286298133, 1286298263, 1296613501, 1297443913, 1299072721, 1299784141,
+		1299963601, 1301509249, 1301926081, 1302745481, 1306836001, 1307004641, 1307520469, 1307823661, 1308758533, 1308998741,
+		1309723213, 1309983901, 1310329567, 1311255661, 1311616153, 1312332001, 1312573123, 1313396221, 1315858381, 1316169541,
+		1318126321, 1318717531, 1319978701, 1319992181, 1320793813, 1321058213, 1323668917, 1325172421, 1325329297, 1328256247,
+		1329174601, 1329431689, 1331973329, 1341010577, 1341926401, 1343575381, 1344597577, 1344975721, 1345514101, 1345523401,
+		1347387361, 1348964401, 1350685001, 1351126261, 1352453257, 1353051517, 1356241321, 1356328121, 1357459183, 1362463807,
+		1362515701, 1362742561, 1365662917, 1366587661, 1366608377, 1368769681, 1371908137, 1372681861, 1375322101, 1376799577,
+		1378646179, 1379464633, 1382453333, 1383283129, 1385656829, 1386705433, 1388972353, 1389353941, 1389975149, 1391890033,
+		1393851553, 1394640941, 1394746081, 1394942473, 1397357851, 1398883201, 1400859847, 1401840833, 1404008369, 1404253369,
+		1406826241, 1406851249, 1409372779, 1413803197, 1414154827, 1414529533, 1415969101, 1417986901, 1421475031, 1424503849,
+		1425860101, 1426319563, 1426534201, 1427771089, 1428966001, 1432354901, 1435091377, 1438648993, 1440231941, 1440922891,
+		1441139641, 1441678411, 1442945689, 1443388481, 1443742273, 1446298309, 1446434677, 1446818651, 1448921633, 1451635201,
+		1454282449, 1454445413, 1456527461, 1457378449, 1461307717, 1463065501, 1463178817, 1463992661, 1464568381, 1465908193,
+		1465945417, 1468540477, 1468824787, 1469059481, 1469960377, 1470080501, 1470650851, 1471628401, 1472221921, 1473580001,
+		1477289941, 1481626513, 1482274513, 1482876673, 1483873861, 1483918801, 1485061471, 1486564301, 1493114149, 1495190699,
+		1497221281, 1497965713, 1499971457, 1499989177, 1500142001, 1501165097, 1502171117, 1502403121, 1503240559, 1503705601,
+		1504139521, 1504832033, 1507746241, 1509156013, 1510870241, 1511558533, 1515175087, 1515785041, 1517039371, 1518014689,
+		1518290707, 1520190341, 1521221473, 1522302121, 1526732803, 1529648231, 1529819971, 1530495289, 1532419099, 1532569681,
+		1532755369, 1533343261, 1534063081, 1535020133, 1536112001, 1536251047, 1536883357, 1537433899, 1537641691, 1538012449,
+		1539583921, 1539804001, 1540454761, 1540550413, 1541047813, 1541849761, 1541955409, 1544145121, 1545019813, 1545177581,
+		1546106773, 1546340401, 1546508057, 1547140841, 1547543161, 1547712601, 1550924873, 1554270481, 1557118081, 1560312001,
+		1560620041, 1561800833, 1565893201, 1566594551, 1567830241, 1568916311, 1574362441, 1574601601, 1577983489, 1578009401,
+		1580449201, 1581576641, 1581714481, 1582783777, 1583230241, 1583658649, 1586436193, 1587650401, 1590394313, 1593706201,
+		1595647351, 1595887921, 1598197201, 1602517949, 1603765021, 1603810561, 1603994701, 1609916491, 1609935913, 1612121473,
+		1614508267, 1617795181, 1617921667, 1619447741, 1620646177, 1627103521, 1627898401, 1628692201, 1630062253, 1630307617,
+		1631314609, 1632286673, 1632513601, 1633044241, 1636185601, 1637434657, 1637436457, 1637930893, 1638294661, 1639351981,
+		1639846391, 1641971701, 1642814653, 1644637051, 1645413001, 1647225529, 1648076041, 1649430889, 1650265549, 1650682153,
+		1654940509, 1655660761, 1656229921, 1656280033, 1656917377, 1659009601, 1661202113, 1668037621, 1668926629, 1669893661,
+		1671603667, 1671714241, 1672125131, 1674091141, 1674658133, 1675978193, 1678274581, 1679130641, 1680901381, 1683174533,
+		1685433413, 1686001861, 1687248001, 1691745821, 1692605041, 1694128129, 1695158921, 1696893101, 1698707377, 1699279441,
+		1700250049, 1709909293, 1710753001, 1712392321, 1714322377, 1716160321, 1716714793, 1716774481, 1718013133, 1718088301,
+		1719197621, 1721061497, 1721986313, 1722007169, 1722685777, 1725675451, 1726372441, 1731048937, 1731995497, 1732924001,
+		1734059291, 1734285601, 1735071913, 1736481601, 1738687469, 1740214841, 1742288881, 1742815621, 1743166441, 1744605097,
+		1746692641, 1746721681, 1749124829, 1750412161, 1754818561, 1757148121, 1760014561, 1766984389, 1767234613, 1769091241,
+		1769267761, 1770236893, 1771303801, 1772267281, 1773582977, 1776439261, 1776820033, 1779649381, 1779892577, 1784306273,
+		1784638309, 1785843547, 1786005521, 1787934881, 1790023861, 1791426787, 1792442737, 1792588813, 1794814103, 1801558201,
+		1801774081, 1802510669, 1803768091, 1804906517, 1805947313, 1809888967, 1816408273, 1817067169, 1819829749, 1820306953,
+		1821514633, 1828682101, 1828887061, 1831258601, 1835114401, 1837156049, 1837599769, 1839568981, 1841034961, 1841099261,
+		1841479501, 1844028961, 1846171781, 1847811673, 1849964117, 1850233897, 1850598961, 1852496761, 1853926777, 1854084649,
+		1854940231, 1856689453, 1857221281, 1858098497, 1858197961, 1860373241, 1861026133, 1861880689, 1862880401, 1866409861,
+		1867906721, 1868682241, 1871987041, 1872937057, 1873177693, 1874634721, 1874849929, 1878691753, 1879111697, 1879623157,
+		1879775501, 1883509633, 1883785681, 1885915841, 1894909141, 1894955311, 1897700113, 1899081757, 1899525601, 1900687381,
+		1903447841, 1904658913, 1905958891, 1908088001, 1909566073, 1910134309, 1911197947, 1912950241, 1914303841, 1915391521,
+		1916987593, 1917397637, 1920301951, 1921309633, 1922092567, 1922687293, 1923224689, 1923311317, 1923845801, 1924201501,
+		1925042737, 1928903971, 1929862849, 1930403333, 1930447501, 1930534453, 1930915169, 1934350351, 1938264241, 1940048881,
+		1943951041, 1944125633, 1945042181, 1950987193, 1952513369, 1952968753, 1957705177, 1959659857, 1960708261, 1963149553,
+		1965007601, 1968002149, 1970065681, 1974474049, 1977257441, 1982123893, 1982826961, 1988071801, 1988713189, 1988835713,
+		1988965861, 1989192277, 1991063449, 1995784961, 1995830761, 1996231189, 1996339649, 1997844157, 1998780001, 1999053601,
+		1999111801, 1999743661, 2004299641, 2007646961, 2013554869, 2013834961, 2016481477, 2017021333, 2017509601, 2019564769,
+		2021392369, 2021884343, 2027675701, 2028279793, 2028631361, 2028812399, 2029830409, 2030600833, 2036224321, 2043173273,
+		2049293401, 2050617713, 2052149221, 2054711381, 2055634561, 2057267941, 2057835781, 2058072041, 2059739221, 2062612033,
+		2068867841, 2070739441, 2072624761, 2076192007, 2081039297, 2081551753, 2082146617, 2083034113, 2083997441, 2085453649,
+		2085882661, 2086645009, 2093300401, 2095627153, 2096046457, 2097317377, 2100292841, 2101470541, 2101744837, 2104994449,
+		2106147457, 2107148761, 2114643217, 2115769633, 2115986557, 2116483027, 2116541221, 2117031263, 2117555641, 2118621097,
+		2120096161, 2123601751, 2124078653, 2124691213, 2127197489, 2128104001, 2129304997, 2130134533, 2131004737, 2131811501,
+		2140699681, 2140771609, 2141340833, 2144961253, 2147418113, 2147429509, 2152627801, 2154446641, 2155416251, 2156151313,
+		2164282177, 2168431201, 2170282969, 2172155819, 2173499329, 2173540951, 2173579801, 2175126601, 2175406201, 2175646177,
+		2177374321, 2177645557, 2178082901, 2178939221, 2180221201, 2182281601, 2182802689, 2185362233, 2187717761, 2193980881,
+		2199617701, 2200115713, 2201924341, 2202101761, 2202205897, 2203649197, 2203856497, 2206095589, 2210578759, 2213431729,
+		2216960929, 2217879901, 2219072017, 2224252801, 2229468697, 2231332357, 2233031701, 2240507821, 2241880033, 2241982009,
+		2244932281, 2245519981, 2246762899, 2248354153, 2251732033, 2254314241, 2254757077, 2256197761, 2256748777, 2256751837,
+		2262861901, 2269307587, 2274584089, 2283289681, 2284416181, 2289251669, 2289624793, 2290316377, 2290910257, 2291205461,
+		2292068143, 2295209281, 2296995121, 2299190401, 2300628601, 2300795353, 2301745249, 2304120001, 2308966661, 2309241601,
+		2309405617, 2311558021, 2311575001, 2315137261, 2320527613, 2323147201, 2324867399, 2329584217, 2330569541, 2331181621,
+		2335341601, 2338157597, 2338728001, 2340460487, 2345907961, 2347597981, 2352371251, 2354453561, 2355230749, 2355320101,
+		2355622721, 2355649921, 2355735089, 2358534361, 2360261989, 2370771181, 2370928337, 2371350101, 2372976563, 2374232977,
+		2375415841, 2377166401, 2378309041, 2381782597, 2382678101, 2383164577, 2385574201, 2389072321, 2389544977, 2393708761,
+		2394311233, 2398393661, 2404912501, 2411128441, 2412172153, 2412675721, 2413973071, 2422296241, 2423401681, 2425249601,
+		2428648967, 2428870753, 2428986913, 2429407961, 2430697513, 2431136401, 2431144801, 2432761633, 2432860273, 2433791593,
+		2434964321, 2434974433, 2435091221, 2436691321, 2437907779, 2438778413, 2442050353, 2442454561, 2443708961, 2444950561,
+		2448039497, 2448374689, 2453473049, 2454285751, 2456536681, 2457846161, 2463713281, 2471205361, 2473120961, 2473189441,
+		2473823353, 2474308069, 2474676949, 2476283239, 2477814193, 2478643907, 2480147521, 2480343553, 2482435981, 2482682131,
+		2484408301, 2486017249, 2488420801, 2488591117, 2492480233, 2494660033, 2494984321, 2495834329, 2499327041, 2501012599,
+		2501771329, 2502525637, 2504008609, 2506529257, 2506733189, 2507121037, 2508178843, 2513230891, 2516684801, 2519297089,
+		2525070241, 2526566041, 2528291341, 2529410281, 2529827821, 2529854713, 2530351561, 2532630787, 2533465661, 2533797017,
+		2535516173, 2537105761, 2539406281, 2539736257, 2540469901, 2541660367, 2542479481, 2544590161, 2545934077, 2548051801,
+		2550139253, 2550780277, 2551365769, 2552418761, 2553272929, 2555391481, 2561945401, 2564536201, 2565186137, 2570087521,
+		2571180247, 2575060949, 2575737361, 2577345541, 2582092189, 2582246701, 2582952769, 2583322381, 2584460701, 2588054401,
+		2588582089, 2590663681, 2593065721, 2595276353, 2597289241, 2597294701, 2598933481, 2600611861, 2602343521, 2602378721,
+		2604465013, 2604803701, 2611122229, 2611461529, 2613382201, 2614688801, 2616180821, 2617563031, 2621080741, 2621977627,
+		2622993661, 2624549929, 2625903601, 2626783921, 2627284987, 2630643401, 2632605049, 2634284801, 2634804481, 2634820813,
+		2638067881, 2639099233, 2642159809, 2642582251, 2646751249, 2646790033, 2648662777, 2649907201, 2650820329, 2651507713,
+		2654716321, 2656494271, 2658630913, 2658696301, 2659265701, 2668095181, 2668469431, 2670972949, 2672605657, 2672651521,
+		2676053333, 2677147201, 2677821121, 2678785621, 2681041843, 2682823681, 2683742491, 2684284441, 2687655169, 2688124001,
+		2689427281, 2690408533, 2690867401, 2693739751, 2695115473, 2700818017, 2700891839, 2701878941, 2704957909, 2706863833,
+		2707661501, 2716157989, 2716275007, 2717428033, 2719319513, 2721666817, 2721721939, 2723859001, 2725357249, 2733156029,
+		2736316301, 2738184697, 2740336561, 2744329909, 2746021741, 2753333227, 2753538001, 2759392633, 2765323397, 2766006253,
+		2767672189, 2769080161, 2769602333, 2774295577, 2777887297, 2778304273, 2779477741, 2781117721, 2781226477, 2786028337,
+		2787998641, 2789218909, 2800352011, 2805762961, 2809635901, 2812672981, 2814748201, 2823570433, 2824256377, 2824804693,
+		2824854913, 2828205397, 2832384133, 2832743713, 2837697773, 2837917633, 2840634109, 2840871041, 2841190381, 2847894377,
+		2848466281, 2848722131, 2855046421, 2855071801, 2855512909, 2862066481, 2865483601, 2866005139, 2866527841, 2870377309,
+		2871536561, 2872527733, 2872948321, 2874382853, 2877769501, 2881429741, 2882370481, 2885594497, 2887955533, 2890316801,
+		2890414873, 2892426029, 2894667781, 2895004927, 2899294889, 2903776129, 2915953633, 2916247819, 2918295451, 2920691161,
+		2923042141, 2924158001, 2929062533, 2929106753, 2930831641, 2931708097, 2932327549, 2936227603, 2936958181, 2941174897,
+		2941343633, 2944555681, 2944677961, 2945208001, 2945549881, 2951136343, 2956724317, 2957320351, 2965700233, 2967053953,
+		2968206601, 2974506841, 2975377429, 2976930001, 2978766341, 2980689601, 2986025677, 2987414977, 2990152901, 2993462713,
+		2993495041, 2994098281, 2994415201, 2998202353, 2998919873, 3000688381, 3001561441, 3002647829, 3004443679, 3009628301,
+		3011421841, 3014101261, 3015502181, 3016957381, 3017444761, 3018147217, 3018576689, 3019916461, 3025350343, 3026575553,
+		3028586471, 3030393901, 3033332641, 3034402681, 3034817209, 3035375047, 3036079729, 3037295801, 3037781251, 3038880473,
+		3039681457, 3041984353, 3042630533, 3048159841, 3050190163, 3056100623, 3056160929, 3057886591, 3058670677, 3059397793,
+		3063685633, 3065998717, 3076505209, 3077122133, 3079496551, 3082054697, 3082068013, 3083053387, 3083537689, 3083884651,
+		3088408429, 3089013313, 3091019777, 3094763851, 3099670657, 3103800701, 3112974481, 3114125071, 3115667521, 3120445697,
+		3122287981, 3129914881, 3133899409, 3135040133, 3143282221, 3145410761, 3150972917, 3156599161, 3156643141, 3157579861,
+		3163106953, 3166504273, 3167442721, 3170262409, 3172658653, 3175204531, 3175255717, 3178375201, 3181356263, 3181391641,
+		3182606857, 3182655361, 3182891401, 3185472001, 3187035113, 3187421077, 3187939921, 3196397821, 3196431829, 3197565001,
+		3197632441, 3197911001, 3197911741, 3199164901, 3205663921, 3207297773, 3208902491, 3212465437, 3215031751, 3217412881,
+		3219808411, 3221580281, 3222693421, 3224143441, 3225081473, 3227082823, 3227209057, 3229131137, 3233558021, 3237992101,
+		3242533897, 3248236309, 3250348417, 3250700737, 3252148621, 3257334541, 3258647809, 3258892801, 3261114601, 3263097641,
+		3263568901, 3263626957, 3264820001, 3265122451, 3267417677, 3268506541, 3268841941, 3270933121, 3271999249, 3272030401,
+		3272702497, 3274264033, 3275671969, 3276075709, 3277047649, 3278640289, 3280067129, 3282974857, 3287174129, 3288757249,
+		3295362727, 3296403601, 3299246833, 3302322241, 3304307341, 3305829073, 3306686659, 3306957593, 3310858777, 3312489577,
+		3312536569, 3313196881, 3315139717, 3320669437, 3323308501, 3323590463, 3323829169, 3328354801, 3332800021, 3334350781,
+		3340214413, 3342005633, 3344191241, 3346172189, 3347908801, 3349218881, 3350993969, 3352091557, 3355382857, 3355953001,
+		3357417181, 3359737921, 3360511981, 3369139201, 3371024521, 3371452921, 3371693063, 3372667121, 3373086601, 3381052177,
+		3381901921, 3385842877, 3386603221, 3387014401, 3387487351, 3389030261, 3395091311, 3399205591, 3399890413, 3402234749,
+		3407609221, 3407772817, 3407952169, 3408135121, 3409339393, 3411250081, 3411574801, 3411829693, 3412575097, 3415379701,
+		3415832137, 3417522841, 3420143941, 3421845001, 3423222757, 3423580481, 3427050673, 3428133103, 3429457921, 3429982081,
+		3430804297, 3432695921, 3432997537, 3433458073, 3434575327, 3435973837, 3440195713, 3443704261, 3449768513, 3450717901,
+		3453900913, 3458257741, 3461861761, 3463907761, 3464236901, 3466158361, 3470716657, 3474335437, 3480174001, 3482161261,
+		3485747521, 3489958697, 3491763493, 3492178873, 3492883081, 3493262761, 3497607433, 3504132113, 3512030497, 3512291021,
+		3512369857, 3513604657, 3516565057, 3519318721, 3524086333, 3525088961, 3529119361, 3529864391, 3532687201, 3533662129,
+		3533856913, 3538213381, 3542303047, 3543203333, 3548378341, 3549286001, 3549988261, 3552158521, 3553567057, 3557646401,
+		3562963973, 3563340457, 3566428301, 3574891757, 3582711841, 3583249921, 3583604161, 3584800801, 3586833253, 3587553971,
+		3589937261, 3590409439, 3593276353, 3594110081, 3596491907, 3596815169, 3598772761, 3602006101, 3605151241, 3611571121,
+		3612298321, 3612825221, 3614770573, 3616574081, 3620631169, 3628526287, 3630596257, 3631828481, 3632452741, 3635993089,
+		3649116277, 3649965281, 3650158849, 3651572609, 3656355841, 3658730893, 3662387977, 3662503093, 3663084541, 3668926801,
+		3669587533, 3672754633, 3677180797, 3679657997, 3682471321, 3685647701, 3685775741, 3692307161, 3695628133, 3697278427,
+		3700801861, 3705582073, 3705623281, 3708123301, 3708905341, 3709626961, 3712887289, 3713287801, 3713448769, 3718226401,
+		3721486081, 3723410161, 3723699373, 3725016749, 3727828501, 3729097633, 3733761739, 3736293461, 3745192001, 3746101189,
+		3749383681, 3751554581, 3751782737, 3754680403, 3756668401, 3759781369, 3760622689, 3760896133, 3762110881, 3767640601,
+		3773061337, 3774337201, 3784123501, 3787491457, 3798040471, 3798626833, 3799111681, 3800084401, 3805699501, 3807112123,
+		3807308269, 3807749821, 3809018947, 3813919453, 3817561777, 3817706621, 3821233121, 3827035237, 3832807681, 3833208961,
+		3842941741, 3846174151, 3846532801, 3847106803, 3850058689, 3852800033, 3863326897, 3865604023, 3867183937, 3874471147,
+		3874523017, 3875096893, 3875965417, 3886515361, 3886643801, 3887423437, 3887635753, 3891892421, 3891919417, 3894053311,
+		3896079281, 3897241129, 3897869201, 3898906129, 3900327241, 3903711841, 3905533721, 3905876501, 3907577521, 3907752241,
+		3912174421, 3914880337, 3914923211, 3915467341, 3915604421, 3915921241, 3918227437, 3922321561, 3926912669, 3929293061,
+		3934940833, 3935864017, 3936123601, 3945165841, 3947233201, 3947383201, 3953408801, 3953949421, 3955572001, 3958597301,
+		3958930441, 3959578801, 3960728641, 3962037061, 3966350203, 3967343161, 3971095301, 3973556837, 3979485931, 3982017601,
+		3987528793, 3987960913, 3991124341, 3992697997, 3997536427, 4005660961, 4007365741, 4011996871, 4015548769, 4017684529,
+		4018283501, 4020144133, 4026822577, 4027012021, 4027518961, 4028465873, 4028771849, 4031223841, 4034969401, 4034993269,
+		4035498409, 4036395581, 4042538497, 4044601751, 4044884689, 4048493983, 4053267217, 4054039841, 4057195309, 4058433931,
+		4059776533, 4060942381, 4061009971, 4064633821, 4067039461, 4067887501, 4068671881, 4071644893, 4075241633, 4075721921,
+		4076009857, 4079665633, 4079682361, 4083376067, 4085074909, 4088147617, 4088838913, 4092929149, 4098258707, 4099180801,
+		4100934241, 4103745689, 4105691393, 4108970251, 4109461709, 4109711581, 4110320663, 4113013141, 4115891893, 4117058221,
+		4117447441, 4121286907, 4127050621, 4129914673, 4133928761, 4135847101, 4136916001, 4137262541, 4138838401, 4139015987,
+		4150174393, 4155375349, 4157008813, 4162880401, 4166032873, 4183664101, 4185636781, 4186561633, 4187360341, 4191864013,
+		4192060699, 4195843037, 4196323561, 4204344601, 4206006229, 4206295433, 4212105409, 4215885697, 4218900001, 4220122321,
+		4232966251, 4234224601, 4237212061, 4243744201, 4244022301, 4244663651, 4247990917, 4250920459, 4251904273, 4255695013,
+		4257003353, 4261352869, 4271267333, 4275011401, 4277526901, 4278305651, 4282867213, 4285148981, 4293088801, 4294901761,
+	}
+
+	primes16 = [65536]byte{
+		2, 1, 1, 2, 1, 2, 1, 4, 3, 2, // 0-9
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 10-19
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 20-29
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 30-39
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 40-49
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 50-59
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 60-69
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 70-79
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 80-89
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 90-99
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 100-109
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 110-119
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 120-129
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 130-139
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 140-149
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 150-159
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 160-169
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 170-179
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 180-189
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 190-199
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 200-209
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 210-219
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 220-229
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 230-239
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 240-249
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 250-259
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 260-269
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 270-279
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 280-289
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 290-299
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 300-309
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 310-319
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 320-329
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 330-339
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 340-349
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 350-359
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 360-369
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 370-379
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 380-389
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 390-399
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 400-409
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 410-419
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 420-429
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 430-439
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 440-449
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 450-459
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 460-469
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 470-479
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 480-489
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 490-499
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 500-509
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 510-519
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 520-529
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 530-539
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 540-549
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 550-559
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 560-569
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 570-579
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 580-589
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 590-599
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 600-609
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 610-619
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 620-629
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 630-639
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 640-649
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 650-659
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 660-669
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 670-679
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 680-689
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 690-699
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 700-709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 710-719
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 720-729
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 730-739
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 740-749
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 750-759
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 760-769
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 770-779
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 780-789
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 790-799
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 800-809
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 810-819
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 820-829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 830-839
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 840-849
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 850-859
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 860-869
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 870-879
+		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 880-889
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 890-899
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 900-909
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 910-919
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 920-929
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 930-939
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 940-949
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 950-959
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 960-969
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 970-979
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 980-989
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 990-999
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 1000-1009
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 1010-1019
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1020-1029
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 1030-1039
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 1040-1049
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1050-1059
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 1060-1069
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1070-1079
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1080-1089
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 1090-1099
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 1100-1109
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1110-1119
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 1120-1129
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 1130-1139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1140-1149
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 1150-1159
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1160-1169
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1170-1179
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1180-1189
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1190-1199
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1200-1209
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 1210-1219
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 1220-1229
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 1230-1239
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 1240-1249
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 1250-1259
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1260-1269
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 1270-1279
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 1280-1289
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1290-1299
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 1300-1309
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 1310-1319
+		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 1320-1329
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 1330-1339
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 1340-1349
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1350-1359
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1360-1369
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1370-1379
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 1380-1389
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 1390-1399
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 1400-1409
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1410-1419
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 1420-1429
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 1430-1439
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1440-1449
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 1450-1459
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1460-1469
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1470-1479
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 1480-1489
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 1490-1499
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1500-1509
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1510-1519
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1520-1529
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1530-1539
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 1540-1549
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 1550-1559
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1560-1569
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 1570-1579
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 1580-1589
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1590-1599
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 1600-1609
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 1610-1619
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 1620-1629
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 1630-1639
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1640-1649
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1650-1659
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 24, // 1660-1669
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 1670-1679
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1680-1689
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 1690-1699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 1700-1709
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1710-1719
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 1720-1729
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1730-1739
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1740-1749
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 1750-1759
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1760-1769
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1770-1779
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 1780-1789
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1790-1799
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1800-1809
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1810-1819
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1820-1829
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1830-1839
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 1840-1849
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1850-1859
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1860-1869
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 1870-1879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 1880-1889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1890-1899
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1900-1909
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 1910-1919
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1920-1929
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 1930-1939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 1940-1949
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 1950-1959
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1960-1969
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 1970-1979
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1980-1989
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 1990-1999
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2000-2009
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2010-2019
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 2020-2029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 2030-2039
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2040-2049
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 2050-2059
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 2060-2069
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2070-2079
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 2080-2089
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 2090-2099
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2100-2109
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 2110-2119
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2120-2129
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2130-2139
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 2140-2149
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2150-2159
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 2160-2169
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 2170-2179
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 2180-2189
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2190-2199
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 2200-2209
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2210-2219
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 2220-2229
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 2230-2239
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2240-2249
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 2250-2259
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 2260-2269
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2270-2279
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2280-2289
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 2290-2299
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2300-2309
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 2310-2319
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2320-2329
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 2330-2339
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2340-2349
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 2350-2359
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2360-2369
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2370-2379
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 2380-2389
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 2390-2399
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2400-2409
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2410-2419
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 2420-2429
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2430-2439
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 2440-2449
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 2450-2459
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2460-2469
+		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 2470-2479
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 2480-2489
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2490-2499
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 2500-2509
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2510-2519
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2520-2529
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 2530-2539
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 2540-2549
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 2550-2559
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 2560-2569
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 2570-2579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2580-2589
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 2590-2599
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 2600-2609
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2610-2619
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2620-2629
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 2630-2639
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2640-2649
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 2650-2659
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2660-2669
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2670-2679
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 2680-2689
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 2690-2699
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2700-2709
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 2710-2719
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2720-2729
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2730-2739
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 2740-2749
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 2750-2759
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2760-2769
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 2770-2779
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2780-2789
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2790-2799
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 2800-2809
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 2810-2819
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2820-2829
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 2830-2839
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2840-2849
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2850-2859
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 2860-2869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 2870-2879
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2880-2889
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2890-2899
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 2900-2909
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2910-2919
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 2920-2929
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 2930-2939
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2940-2949
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 2950-2959
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 2960-2969
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 2970-2979
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 2980-2989
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2990-2999
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3000-3009
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 3010-3019
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 3020-3029
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3030-3039
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 3040-3049
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3050-3059
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 3060-3069
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 3070-3079
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 3080-3089
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 3090-3099
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 3100-3109
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 3110-3119
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 3120-3129
+		7, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 3130-3139
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 3140-3149
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3150-3159
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 3160-3169
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3170-3179
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3180-3189
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3190-3199
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 3200-3209
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3210-3219
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 3220-3229
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 3230-3239
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3240-3249
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 3250-3259
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3260-3269
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 3270-3279
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 3280-3289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 3290-3299
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3300-3309
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 3310-3319
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 3320-3329
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3330-3339
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 3340-3349
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 3350-3359
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3360-3369
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 3370-3379
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 3380-3389
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 3390-3399
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3400-3409
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 3410-3419
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3420-3429
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 3430-3439
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 3440-3449
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3450-3459
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 3460-3469
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 3470-3479
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3480-3489
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 3490-3499
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3500-3509
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 3510-3519
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 3520-3529
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 3530-3539
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 3540-3549
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 3550-3559
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3560-3569
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3570-3579
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 3580-3589
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 3590-3599
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3600-3609
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 3610-3619
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 3620-3629
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3630-3639
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 3640-3649
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 3650-3659
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3660-3669
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 3670-3679
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3680-3689
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3690-3699
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 3700-3709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 3710-3719
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3720-3729
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 3730-3739
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 3740-3749
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3750-3759
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 3760-3769
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 3770-3779
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3780-3789
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 3790-3799
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 3800-3809
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3810-3819
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 3820-3829
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 3830-3839
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3840-3849
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 3850-3859
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 3860-3869
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3870-3879
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 3880-3889
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 3890-3899
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3900-3909
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 3910-3919
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 3920-3929
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3930-3939
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 3940-3949
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 3950-3959
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 3960-3969
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 3970-3979
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 3980-3989
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3990-3999
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 4000-4009
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 4010-4019
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 4020-4029
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 4030-4039
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 4040-4049
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 4050-4059
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4060-4069
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 4070-4079
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4080-4089
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 4090-4099
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4100-4109
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4110-4119
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 4120-4129
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 4130-4139
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4140-4149
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 18, // 4150-4159
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4160-4169
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 4170-4179
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 4180-4189
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4190-4199
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4200-4209
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 4210-4219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 4220-4229
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4230-4239
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4240-4249
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 4250-4259
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4260-4269
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4270-4279
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 4280-4289
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 4290-4299
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 4300-4309
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4310-4319
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 4320-4329
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 4330-4339
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 4340-4349
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4350-4359
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4360-4369
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4370-4379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4380-4389
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 4390-4399
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 4400-4409
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4410-4419
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4420-4429
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4430-4439
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 4440-4449
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4450-4459
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4460-4469
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4470-4479
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4480-4489
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 4490-4499
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4500-4509
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 4510-4519
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 4520-4529
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4530-4539
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 4540-4549
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4550-4559
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 4560-4569
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4570-4579
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 4580-4589
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4590-4599
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4600-4609
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4610-4619
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4620-4629
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 4630-4639
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 4640-4649
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4650-4659
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4660-4669
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 4670-4679
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4680-4689
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4690-4699
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4700-4709
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4710-4719
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 4720-4729
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4730-4739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4740-4749
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 4750-4759
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 4760-4769
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4770-4779
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 4780-4789
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 4790-4799
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4800-4809
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 4810-4819
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4820-4829
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 4830-4839
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 4840-4849
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4850-4859
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4860-4869
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 4870-4879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 4880-4889
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4890-4899
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 4900-4909
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 4910-4919
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4920-4929
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 4930-4939
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 4940-4949
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 4950-4959
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 4960-4969
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 4970-4979
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4980-4989
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 4990-4999
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 5000-5009
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5010-5019
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 5020-5029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 5030-5039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5040-5049
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 5050-5059
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5060-5069
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5070-5079
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 5080-5089
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 5090-5099
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5100-5109
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 5110-5119
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 5120-5129
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5130-5139
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5140-5149
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 5150-5159
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5160-5169
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 5170-5179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 5180-5189
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 5190-5199
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 5200-5209
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5210-5219
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5220-5229
+		1, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 5230-5239
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 5240-5249
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5250-5259
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5260-5269
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 5270-5279
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5280-5289
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5290-5299
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 5300-5309
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5310-5319
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 5320-5329
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 5330-5339
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5340-5349
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 5350-5359
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 5360-5369
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5370-5379
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5380-5389
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 5390-5399
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5400-5409
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 5410-5419
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5420-5429
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5430-5439
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 5440-5449
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 5450-5459
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5460-5469
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 5470-5479
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 5480-5489
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5490-5499
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 5500-5509
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 5510-5519
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5520-5529
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 5530-5539
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5540-5549
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5550-5559
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 5560-5569
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 5570-5579
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5580-5589
+		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 5590-5599
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 5600-5609
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5610-5619
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 5620-5629
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 5630-5639
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5640-5649
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 5650-5659
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 5660-5669
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5670-5679
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 5680-5689
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 5690-5699
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5700-5709
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 5710-5719
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5720-5729
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5730-5739
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 5740-5749
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 5750-5759
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 5760-5769
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 5770-5779
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 5780-5789
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5790-5799
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5800-5809
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 5810-5819
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 5820-5829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 5830-5839
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 5840-5849
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5850-5859
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 5860-5869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 5870-5879
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5880-5889
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5890-5899
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 5900-5909
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5910-5919
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 5920-5929
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 5930-5939
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5940-5949
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 5950-5959
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 5960-5969
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5970-5979
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 5980-5989
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5990-5999
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6000-6009
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 6010-6019
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 6020-6029
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6030-6039
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 6040-6049
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 6050-6059
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6060-6069
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 6070-6079
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6080-6089
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6090-6099
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6100-6109
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6110-6119
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6120-6129
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6130-6139
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6140-6149
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6150-6159
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6160-6169
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 6170-6179
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6180-6189
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 6190-6199
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6200-6209
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6210-6219
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 6220-6229
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6230-6239
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 6240-6249
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6250-6259
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6260-6269
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 6270-6279
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 6280-6289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6290-6299
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6300-6309
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6310-6319
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 6320-6329
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6330-6339
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6340-6349
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6350-6359
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6360-6369
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 6370-6379
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 6380-6389
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 6390-6399
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 6400-6409
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6410-6419
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 6420-6429
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 6430-6439
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6440-6449
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 6450-6459
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 6460-6469
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6470-6479
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6480-6489
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 6490-6499
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 6500-6509
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6510-6519
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 6520-6529
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6530-6539
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6540-6549
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6550-6559
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6560-6569
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6570-6579
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 6580-6589
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 6590-6599
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 6600-6609
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 6610-6619
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6620-6629
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 6630-6639
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6640-6649
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6650-6659
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6660-6669
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 6670-6679
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6680-6689
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6690-6699
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 6700-6709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 6710-6719
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6720-6729
+		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 6730-6739
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 6740-6749
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6750-6759
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 6760-6769
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6770-6779
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6780-6789
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6790-6799
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 6800-6809
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6810-6819
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 6820-6829
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6830-6839
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6840-6849
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6850-6859
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6860-6869
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6870-6879
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 6880-6889
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 6890-6899
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6900-6909
+		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 6910-6919
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 6920-6929
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6930-6939
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 6940-6949
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6950-6959
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6960-6969
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6970-6979
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6980-6989
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6990-6999
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7000-7009
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 7010-7019
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 7020-7029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7030-7039
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7040-7049
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 7050-7059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 7060-7069
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 7070-7079
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 7080-7089
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7090-7099
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 7100-7109
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7110-7119
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 7120-7129
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 7130-7139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7140-7149
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 7150-7159
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 7160-7169
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 7170-7179
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7180-7189
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7190-7199
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 7200-7209
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 7210-7219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 7220-7229
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7230-7239
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 7240-7249
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 7250-7259
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 7260-7269
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7270-7279
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7280-7289
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 7290-7299
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 7300-7309
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7310-7319
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7320-7329
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 7330-7339
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 7340-7349
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 7350-7359
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 7360-7369
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 7370-7379
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7380-7389
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 7390-7399
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7400-7409
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 7410-7419
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7420-7429
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 7430-7439
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7440-7449
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 7450-7459
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 7460-7469
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 7470-7479
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 7480-7489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 7490-7499
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 7500-7509
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7510-7519
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 7520-7529
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 7530-7539
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 7540-7549
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 7550-7559
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7560-7569
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 7570-7579
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 7580-7589
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7590-7599
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 7600-7609
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7610-7619
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 7620-7629
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7630-7639
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 7640-7649
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 7650-7659
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7660-7669
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 7670-7679
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 7680-7689
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7690-7699
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7700-7709
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7710-7719
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 7720-7729
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7730-7739
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7740-7749
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 30, // 7750-7759
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 7760-7769
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 7770-7779
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7780-7789
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 7790-7799
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 7800-7809
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7810-7819
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 7820-7829
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7830-7839
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7840-7849
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7850-7859
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7860-7869
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 7870-7879
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 7880-7889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7890-7899
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 7900-7909
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 7910-7919
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7920-7929
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 7930-7939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 7940-7949
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7950-7959
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 7960-7969
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 7970-7979
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7980-7989
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 7990-7999
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 8000-8009
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 8010-8019
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8020-8029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 8030-8039
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8040-8049
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 8050-8059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 8060-8069
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8070-8079
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 8080-8089
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8090-8099
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8100-8109
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 8110-8119
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 8120-8129
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 8130-8139
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 8140-8149
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8150-8159
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 8160-8169
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 8170-8179
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8180-8189
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8190-8199
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 8200-8209
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 8210-8219
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8220-8229
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 8230-8239
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 8240-8249
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8250-8259
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 8260-8269
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 8270-8279
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 8280-8289
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 8290-8299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8300-8309
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 8310-8319
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 8320-8329
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 8330-8339
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8340-8349
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 8350-8359
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 8360-8369
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 8370-8379
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 30, // 8380-8389
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 8390-8399
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8400-8409
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 8410-8419
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 8420-8429
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8430-8439
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 8440-8449
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8450-8459
+		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 8460-8469
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 8470-8479
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 8480-8489
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8490-8499
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8500-8509
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8510-8519
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 8520-8529
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 8530-8539
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 8540-8549
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8550-8559
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 8560-8569
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8570-8579
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 8580-8589
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 8590-8599
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 8600-8609
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8610-8619
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 8620-8629
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8630-8639
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 8640-8649
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8650-8659
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 8660-8669
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 8670-8679
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 8680-8689
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 8690-8699
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 8700-8709
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 8710-8719
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8720-8729
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 8730-8739
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 8740-8749
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8750-8759
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8760-8769
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 8770-8779
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 8780-8789
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8790-8799
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 8800-8809
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 8810-8819
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8820-8829
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 8830-8839
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 8840-8849
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8850-8859
+		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 8860-8869
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 8870-8879
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 8880-8889
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 8890-8899
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 8900-8909
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8910-8919
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 8920-8929
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8930-8939
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8940-8949
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8950-8959
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 8960-8969
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 8970-8979
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8980-8989
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 8990-8999
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9000-9009
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 9010-9019
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 9020-9029
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9030-9039
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 9040-9049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 9050-9059
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 9060-9069
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 9070-9079
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9080-9089
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9090-9099
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 9100-9109
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9110-9119
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 9120-9129
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 9130-9139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9140-9149
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9150-9159
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9160-9169
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 9170-9179
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 9180-9189
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 9190-9199
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 9200-9209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9210-9219
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 9220-9229
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 9230-9239
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9240-9249
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 9250-9259
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9260-9269
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9270-9279
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 9280-9289
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 9290-9299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9300-9309
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 9310-9319
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 9320-9329
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9330-9339
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 9340-9349
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 9350-9359
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9360-9369
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 9370-9379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9380-9389
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 9390-9399
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 9400-9409
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 9410-9419
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9420-9429
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 9430-9439
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 9440-9449
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9450-9459
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 9460-9469
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 9470-9479
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9480-9489
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 9490-9499
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9500-9509
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9510-9519
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9520-9529
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 9530-9539
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9540-9549
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 9550-9559
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 9560-9569
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9570-9579
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 9580-9589
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9590-9599
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9600-9609
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 9610-9619
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 9620-9629
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9630-9639
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 9640-9649
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9650-9659
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9660-9669
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 9670-9679
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 9680-9689
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 9690-9699
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 9700-9709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 9710-9719
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9720-9729
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 9730-9739
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 9740-9749
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9750-9759
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 9760-9769
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9770-9779
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9780-9789
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9790-9799
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 9800-9809
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 9810-9819
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 9820-9829
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 9830-9839
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9840-9849
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 9850-9859
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9860-9869
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9870-9879
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 9880-9889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9890-9899
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 9900-9909
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9910-9919
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 9920-9929
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9930-9939
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 9940-9949
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9950-9959
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 9960-9969
+		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 9970-9979
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 9980-9989
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9990-9999
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 10000-10009
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 10010-10019
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 10020-10029
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 10030-10039
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 10040-10049
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10050-10059
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 10060-10069
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 10070-10079
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10080-10089
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 10090-10099
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 10100-10109
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 10110-10119
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10120-10129
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 10130-10139
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10140-10149
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 10150-10159
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 10160-10169
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10170-10179
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10180-10189
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 10190-10199
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10200-10209
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10210-10219
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 10220-10229
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10230-10239
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 10240-10249
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 10250-10259
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10260-10269
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 10270-10279
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 10280-10289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10290-10299
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 10300-10309
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 10310-10319
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10320-10329
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 10330-10339
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 10340-10349
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 10350-10359
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 10360-10369
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 10370-10379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10380-10389
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 10390-10399
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 10400-10409
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 10410-10419
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 10420-10429
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 10430-10439
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10440-10449
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 10450-10459
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 10460-10469
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 10470-10479
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 10480-10489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 10490-10499
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10500-10509
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 10510-10519
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 10520-10529
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 10530-10539
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 10540-10549
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 10550-10559
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 10560-10569
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 10570-10579
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 10580-10589
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10590-10599
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 10600-10609
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 10610-10619
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10620-10629
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 10630-10639
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10640-10649
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 10650-10659
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 10660-10669
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 10670-10679
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10680-10689
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 10690-10699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 10700-10709
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10710-10719
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 10720-10729
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 10730-10739
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10740-10749
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 10750-10759
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10760-10769
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10770-10779
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 10780-10789
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 10790-10799
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 10800-10809
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 10810-10819
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10820-10829
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 10830-10839
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 10840-10849
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 10850-10859
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 10860-10869
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10870-10879
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 10880-10889
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10890-10899
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 10900-10909
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 10910-10919
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 10920-10929
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 10930-10939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 10940-10949
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 10950-10959
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10960-10969
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 10970-10979
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 10980-10989
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 10990-10999
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 11000-11009
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11010-11019
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 11020-11029
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11030-11039
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 11040-11049
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 11050-11059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11060-11069
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11070-11079
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 11080-11089
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 11090-11099
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11100-11109
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 11110-11119
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11120-11129
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 11130-11139
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 11140-11149
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11150-11159
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11160-11169
+		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 11170-11179
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11180-11189
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 11190-11199
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11200-11209
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 11210-11219
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 11220-11229
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 11230-11239
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 11240-11249
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11250-11259
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11260-11269
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 11270-11279
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 11280-11289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 11290-11299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11300-11309
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11310-11319
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 11320-11329
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 11330-11339
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11340-11349
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 11350-11359
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 11360-11369
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11370-11379
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 11380-11389
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 11390-11399
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11400-11409
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11410-11419
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 11420-11429
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11430-11439
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 11440-11449
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11450-11459
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11460-11469
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11470-11479
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 11480-11489
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11490-11499
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 11500-11509
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 11510-11519
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 11520-11529
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 11530-11539
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11540-11549
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 11550-11559
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 11560-11569
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 11570-11579
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11580-11589
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 11590-11599
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11600-11609
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11610-11619
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11620-11629
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 11630-11639
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11640-11649
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 11650-11659
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11660-11669
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11670-11679
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 11680-11689
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11690-11699
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11700-11709
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 11710-11719
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11720-11729
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11730-11739
+		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 11740-11749
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 11750-11759
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11760-11769
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 11770-11779
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 11780-11789
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11790-11799
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11800-11809
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 11810-11819
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11820-11829
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 11830-11839
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 11840-11849
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11850-11859
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 11860-11869
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11870-11879
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 11880-11889
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11890-11899
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 11900-11909
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11910-11919
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 11920-11929
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 11930-11939
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11940-11949
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 11950-11959
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11960-11969
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11970-11979
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 11980-11989
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11990-11999
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12000-12009
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 12010-12019
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12020-12029
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12030-12039
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 12040-12049
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 12050-12059
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12060-12069
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 12070-12079
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12080-12089
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12090-12099
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 12100-12109
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 12110-12119
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 12120-12129
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12130-12139
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12140-12149
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12150-12159
+		1, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 12160-12169
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 12170-12179
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12180-12189
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12190-12199
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 12200-12209
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12210-12219
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 12220-12229
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 12230-12239
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12240-12249
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 12250-12259
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12260-12269
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12270-12279
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 12280-12289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12290-12299
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 12300-12309
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12310-12319
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 12320-12329
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12330-12339
+		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 12340-12349
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 12350-12359
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12360-12369
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 12370-12379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12380-12389
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12390-12399
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 12400-12409
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 12410-12419
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12420-12429
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 12430-12439
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12440-12449
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 12450-12459
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12460-12469
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12470-12479
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12480-12489
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12490-12499
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 12500-12509
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 12510-12519
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 12520-12529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 12530-12539
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12540-12549
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 12550-12559
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 12560-12569
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12570-12579
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 12580-12589
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12590-12599
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12600-12609
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 12610-12619
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12620-12629
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12630-12639
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12640-12649
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 12650-12659
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12660-12669
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 12670-12679
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 12680-12689
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12690-12699
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 12700-12709
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 12710-12719
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 12720-12729
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 12730-12739
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 12740-12749
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12750-12759
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 12760-12769
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12770-12779
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12780-12789
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 12790-12799
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 12800-12809
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12810-12819
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 12820-12829
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12830-12839
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12840-12849
+		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 12850-12859
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 12860-12869
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 12870-12879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 12880-12889
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12890-12899
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12900-12909
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 12910-12919
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 12920-12929
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12930-12939
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12940-12949
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12950-12959
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12960-12969
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 12970-12979
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 12980-12989
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12990-12999
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 24, // 13000-13009
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 13010-13019
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13020-13029
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 13030-13039
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 13040-13049
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13050-13059
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 13060-13069
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 13070-13079
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13080-13089
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 13090-13099
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 13100-13109
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13110-13119
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 13120-13129
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13130-13139
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 13140-13149
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 13150-13159
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 13160-13169
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 13170-13179
+		3, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 13180-13189
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 13190-13199
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13200-13209
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 13210-13219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 13220-13229
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13230-13239
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 13240-13249
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 13250-13259
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 13260-13269
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 13270-13279
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13280-13289
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 13290-13299
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 13300-13309
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 13310-13319
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 13320-13329
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 13330-13339
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 13340-13349
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13350-13359
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 13360-13369
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13370-13379
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13380-13389
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 13390-13399
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13400-13409
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 13410-13419
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 13420-13429
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13430-13439
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13440-13449
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 13450-13459
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 13460-13469
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 13470-13479
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 13480-13489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 13490-13499
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13500-13509
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 13510-13519
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 13520-13529
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 13530-13539
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13540-13549
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 13550-13559
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 13560-13569
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 13570-13579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13580-13589
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 13590-13599
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13600-13609
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 13610-13619
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 13620-13629
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 13630-13639
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 13640-13649
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 13650-13659
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 13660-13669
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 13670-13679
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 13680-13689
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 13690-13699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 13700-13709
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13710-13719
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 13720-13729
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 13730-13739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13740-13749
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 13750-13759
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 13760-13769
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13770-13779
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 13780-13789
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 13790-13799
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 13800-13809
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 13810-13819
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 13820-13829
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13830-13839
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 13840-13849
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 13850-13859
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13860-13869
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 13870-13879
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 13880-13889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13890-13899
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 13900-13909
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 13910-13919
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13920-13929
+		1, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 13930-13939
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 13940-13949
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13950-13959
+		3, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 13960-13969
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 13970-13979
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13980-13989
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 13990-13999
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 14000-14009
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 14010-14019
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 14020-14029
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 14030-14039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14040-14049
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 14050-14059
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14060-14069
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14070-14079
+		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 14080-14089
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 14090-14099
+		7, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 14100-14109
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 14110-14119
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 14120-14129
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14130-14139
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 14140-14149
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 14150-14159
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14160-14169
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 14170-14179
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 14180-14189
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 14190-14199
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 14200-14209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14210-14219
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 14220-14229
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14230-14239
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 14240-14249
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 14250-14259
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 14260-14269
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14270-14279
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14280-14289
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 14290-14299
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 14300-14309
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14310-14319
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 14320-14329
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14330-14339
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 14340-14349
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 14350-14359
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 14360-14369
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 14370-14379
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 14380-14389
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14390-14399
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14400-14409
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 14410-14419
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 14420-14429
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 14430-14439
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 14440-14449
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14450-14459
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 14460-14469
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 14470-14479
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14480-14489
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14490-14499
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 14500-14509
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14510-14519
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14520-14529
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 14530-14539
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 14540-14549
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14550-14559
+		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 14560-14569
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 14570-14579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14580-14589
+		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 14590-14599
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 14600-14609
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14610-14619
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 14620-14629
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 14630-14639
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14640-14649
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 14650-14659
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14660-14669
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14670-14679
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 14680-14689
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14690-14699
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14700-14709
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 14710-14719
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 14720-14729
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14730-14739
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 14740-14749
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 14750-14759
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14760-14769
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 14770-14779
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 14780-14789
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 14790-14799
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14800-14809
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 14810-14819
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14820-14829
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14830-14839
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 14840-14849
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 14850-14859
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 14860-14869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 14870-14879
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14880-14889
+		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 14890-14899
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 14900-14909
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14910-14919
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 14920-14929
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 14930-14939
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14940-14949
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 14950-14959
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14960-14969
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14970-14979
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 14980-14989
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 14990-14999
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15000-15009
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 15010-15019
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15020-15029
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 15030-15039
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15040-15049
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15050-15059
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15060-15069
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 15070-15079
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15080-15089
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15090-15099
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 15100-15109
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15110-15119
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15120-15129
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 15130-15139
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15140-15149
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15150-15159
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15160-15169
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 15170-15179
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15180-15189
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 15190-15199
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 15200-15209
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 15210-15219
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15220-15229
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15230-15239
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 15240-15249
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 15250-15259
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 15260-15269
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 15270-15279
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 15280-15289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 15290-15299
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15300-15309
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 15310-15319
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 15320-15329
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 15330-15339
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 15340-15349
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 15350-15359
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15360-15369
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 15370-15379
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15380-15389
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15390-15399
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15400-15409
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 15410-15419
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 15420-15429
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 15430-15439
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15440-15449
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15450-15459
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15460-15469
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 15470-15479
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15480-15489
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 15490-15499
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15500-15509
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 15510-15519
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 15520-15529
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15530-15539
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15540-15549
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 15550-15559
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15560-15569
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15570-15579
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 15580-15589
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15590-15599
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 15600-15609
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 15610-15619
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15620-15629
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15630-15639
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 15640-15649
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15650-15659
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 15660-15669
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 15670-15679
+		3, 2, 1, 44, 43, 42, 41, 40, 39, 38, // 15680-15689
+		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 15690-15699
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 15700-15709
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 15710-15719
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 15720-15729
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 15730-15739
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15740-15749
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15750-15759
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15760-15769
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 15770-15779
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 15780-15789
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15790-15799
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 15800-15809
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15810-15819
+		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 15820-15829
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 15830-15839
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 15840-15849
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 15850-15859
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 15860-15869
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 15870-15879
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 15880-15889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15890-15899
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15900-15909
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 15910-15919
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 15920-15929
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 15930-15939
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 15940-15949
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15950-15959
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15960-15969
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 15970-15979
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15980-15989
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15990-15999
+		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 16000-16009
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 16010-16019
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16020-16029
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 16030-16039
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16040-16049
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16050-16059
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 16060-16069
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 16070-16079
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16080-16089
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16090-16099
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 16100-16109
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16110-16119
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 16120-16129
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 16130-16139
+		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 16140-16149
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 16150-16159
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 16160-16169
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16170-16179
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 16180-16189
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 16190-16199
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16200-16209
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16210-16219
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 16220-16229
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 16230-16239
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 16240-16249
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 16250-16259
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16260-16269
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 16270-16279
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 16280-16289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16290-16299
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 16300-16309
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 16310-16319
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16320-16329
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 16330-16339
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 16340-16349
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16350-16359
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 16360-16369
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16370-16379
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 16380-16389
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 16390-16399
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16400-16409
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16410-16419
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16420-16429
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 16430-16439
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16440-16449
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 16450-16459
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16460-16469
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16470-16479
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16480-16489
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 16490-16499
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 16500-16509
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 16510-16519
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 16520-16529
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16530-16539
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16540-16549
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 16550-16559
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16560-16569
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 16570-16579
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 16580-16589
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16590-16599
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 16600-16609
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 16610-16619
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16620-16629
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 16630-16639
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 16640-16649
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16650-16659
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16660-16669
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 16670-16679
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16680-16689
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 16690-16699
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 16700-16709
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 16710-16719
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 16720-16729
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16730-16739
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 16740-16749
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 16750-16759
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 16760-16769
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16770-16779
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 16780-16789
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 16790-16799
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16800-16809
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16810-16819
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 16820-16829
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16830-16839
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 16840-16849
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 16850-16859
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16860-16869
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 16870-16879
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 16880-16889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16890-16899
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 16900-16909
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16910-16919
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16920-16929
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16930-16939
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 16940-16949
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16950-16959
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 16960-16969
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 16970-16979
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16980-16989
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 16990-16999
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17000-17009
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17010-17019
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 17020-17029
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 17030-17039
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17040-17049
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 17050-17059
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17060-17069
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 17070-17079
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17080-17089
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 17090-17099
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 17100-17109
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17110-17119
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 17120-17129
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 17130-17139
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 17140-17149
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 17150-17159
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 17160-17169
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17170-17179
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17180-17189
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17190-17199
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 17200-17209
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 17210-17219
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17220-17229
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 17230-17239
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17240-17249
+		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 17250-17259
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 17260-17269
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 17270-17279
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17280-17289
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 17290-17299
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17300-17309
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 17310-17319
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17320-17329
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 17330-17339
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17340-17349
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 17350-17359
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17360-17369
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17370-17379
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 17380-17389
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 17390-17399
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17400-17409
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 17410-17419
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17420-17429
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17430-17439
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 17440-17449
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17450-17459
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 17460-17469
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17470-17479
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17480-17489
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 17490-17499
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 17500-17509
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 17510-17519
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 17520-17529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 17530-17539
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17540-17549
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 17550-17559
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 17560-17569
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17570-17579
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17580-17589
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 17590-17599
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 17600-17609
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17610-17619
+		3, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 17620-17629
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 17630-17639
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17640-17649
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 17650-17659
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 17660-17669
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17670-17679
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 17680-17689
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17690-17699
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17700-17709
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 17710-17719
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 17720-17729
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 17730-17739
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 17740-17749
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17750-17759
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 17760-17769
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17770-17779
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17780-17789
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17790-17799
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 17800-17809
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17810-17819
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 17820-17829
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 17830-17839
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17840-17849
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17850-17859
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 17860-17869
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17870-17879
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17880-17889
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17890-17899
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17900-17909
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17910-17919
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 17920-17929
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 17930-17939
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17940-17949
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 17950-17959
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17960-17969
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 17970-17979
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 24, // 17980-17989
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 17990-17999
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18000-18009
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 18010-18019
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 18020-18029
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18030-18039
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 18040-18049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 18050-18059
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18060-18069
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 18070-18079
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 18080-18089
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 18090-18099
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18100-18109
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 18110-18119
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18120-18129
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 18130-18139
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 18140-18149
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18150-18159
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18160-18169
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18170-18179
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18180-18189
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18190-18199
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18200-18209
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 18210-18219
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 18220-18229
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 18230-18239
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18240-18249
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 18250-18259
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 18260-18269
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18270-18279
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 18280-18289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18290-18299
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18300-18309
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 18310-18319
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18320-18329
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18330-18339
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18340-18349
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 18350-18359
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18360-18369
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 18370-18379
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18380-18389
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18390-18399
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18400-18409
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 18410-18419
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 18420-18429
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 18430-18439
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 18440-18449
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18450-18459
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 18460-18469
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18470-18479
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18480-18489
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 18490-18499
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 18500-18509
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18510-18519
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 18520-18529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 18530-18539
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18540-18549
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 18550-18559
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 18560-18569
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18570-18579
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 18580-18589
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 18590-18599
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18600-18609
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 18610-18619
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18620-18629
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 18630-18639
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 18640-18649
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18650-18659
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18660-18669
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18670-18679
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18680-18689
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18690-18699
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18700-18709
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 18710-18719
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18720-18729
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18730-18739
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 18740-18749
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 18750-18759
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18760-18769
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 18770-18779
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 18780-18789
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 18790-18799
+		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 18800-18809
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 18810-18819
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18820-18829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 18830-18839
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18840-18849
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 18850-18859
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 18860-18869
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 18870-18879
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18880-18889
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18890-18899
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18900-18909
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 28, // 18910-18919
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 18920-18929
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18930-18939
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 18940-18949
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 18950-18959
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18960-18969
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 18970-18979
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 18980-18989
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18990-18999
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 19000-19009
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 19010-19019
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19020-19029
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 19030-19039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19040-19049
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 19050-19059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 19060-19069
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 19070-19079
+		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 19080-19089
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 19090-19099
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19100-19109
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19110-19119
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 19120-19129
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 19130-19139
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 19140-19149
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19150-19159
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 19160-19169
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19170-19179
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 19180-19189
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 19190-19199
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 19200-19209
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 19210-19219
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19220-19229
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 19230-19239
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 19240-19249
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 19250-19259
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19260-19269
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 19270-19279
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 19280-19289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19290-19299
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 19300-19309
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 19310-19319
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19320-19329
+		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 19330-19339
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 19340-19349
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 19350-19359
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19360-19369
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 19370-19379
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 19380-19389
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19390-19399
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 19400-19409
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 19410-19419
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 19420-19429
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 19430-19439
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 19440-19449
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19450-19459
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 19460-19469
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19470-19479
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 19480-19489
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19490-19499
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 19500-19509
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19510-19519
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19520-19529
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19530-19539
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 19540-19549
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 19550-19559
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19560-19569
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19570-19579
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 19580-19589
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19590-19599
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 52, // 19600-19609
+		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 19610-19619
+		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 19620-19629
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 19630-19639
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19640-19649
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19650-19659
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19660-19669
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19670-19679
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 19680-19689
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 19690-19699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 19700-19709
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 19710-19719
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 19720-19729
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 19730-19739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19740-19749
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 19750-19759
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 19760-19769
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 19770-19779
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19780-19789
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 19790-19799
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19800-19809
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 19810-19819
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19820-19829
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19830-19839
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 19840-19849
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 19850-19859
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 19860-19869
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 19870-19879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 19880-19889
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 19890-19899
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19900-19909
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 19910-19919
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 19920-19929
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 19930-19939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 19940-19949
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19950-19959
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 19960-19969
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 19970-19979
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19980-19989
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 19990-19999
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20000-20009
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20010-20019
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 20020-20029
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20030-20039
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 20040-20049
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20050-20059
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 20060-20069
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 20070-20079
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 20080-20089
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20090-20099
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 20100-20109
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 20110-20119
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 20120-20129
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20130-20139
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 20140-20149
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20150-20159
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20160-20169
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 20170-20179
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20180-20189
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20190-20199
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 20200-20209
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 20210-20219
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20220-20229
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 20230-20239
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 20240-20249
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20250-20259
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 20260-20269
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20270-20279
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 20280-20289
+		7, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 20290-20299
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 20300-20309
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20310-20319
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 20320-20329
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 20330-20339
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 20340-20349
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 20350-20359
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 20360-20369
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 20370-20379
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 20380-20389
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 20390-20399
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 20400-20409
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 20410-20419
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20420-20429
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20430-20439
+		1, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 20440-20449
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 20450-20459
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20460-20469
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 20470-20479
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 20480-20489
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20490-20499
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 20500-20509
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20510-20519
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20520-20529
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 20530-20539
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 20540-20549
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20550-20559
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 20560-20569
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 20570-20579
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20580-20589
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 20590-20599
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20600-20609
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20610-20619
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 20620-20629
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 20630-20639
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 20640-20649
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20650-20659
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20660-20669
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20670-20679
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20680-20689
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 20690-20699
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 20700-20709
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 20710-20719
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20720-20729
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20730-20739
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 20740-20749
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 20750-20759
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20760-20769
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 20770-20779
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 20780-20789
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20790-20799
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 40, // 20800-20809
+		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 20810-20819
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 20820-20829
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 20830-20839
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 20840-20849
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 20850-20859
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20860-20869
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 20870-20879
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 20880-20889
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 20890-20899
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20900-20909
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20910-20919
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 20920-20929
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 20930-20939
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 20940-20949
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 20950-20959
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20960-20969
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20970-20979
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20980-20989
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20990-20999
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21000-21009
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 21010-21019
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 21020-21029
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 21030-21039
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21040-21049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 21050-21059
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 21060-21069
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21070-21079
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 21080-21089
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21090-21099
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 21100-21109
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21110-21119
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21120-21129
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 21130-21139
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 21140-21149
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21150-21159
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 21160-21169
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 21170-21179
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21180-21189
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21190-21199
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21200-21209
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21210-21219
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 21220-21229
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21230-21239
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 21240-21249
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21250-21259
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 21260-21269
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21270-21279
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 21280-21289
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 21290-21299
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21300-21309
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 21310-21319
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21320-21329
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21330-21339
+		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 21340-21349
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 21350-21359
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21360-21369
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 21370-21379
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 21380-21389
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21390-21399
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 21400-21409
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 21410-21419
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21420-21429
+		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 21430-21439
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 21440-21449
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21450-21459
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 21460-21469
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21470-21479
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21480-21489
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 21490-21499
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 21500-21509
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21510-21519
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 21520-21529
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 21530-21539
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21540-21549
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 21550-21559
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 21560-21569
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 21570-21579
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 21580-21589
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 21590-21599
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21600-21609
+		1, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 21610-21619
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 21620-21629
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21630-21639
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 21640-21649
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21650-21659
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21660-21669
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 21670-21679
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21680-21689
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21690-21699
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21700-21709
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 21710-21719
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 21720-21729
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 21730-21739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21740-21749
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 21750-21759
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21760-21769
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 21770-21779
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 21780-21789
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 21790-21799
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 21800-21809
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21810-21819
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21820-21829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 21830-21839
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21840-21849
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 21850-21859
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 21860-21869
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21870-21879
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21880-21889
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21890-21899
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21900-21909
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21910-21919
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 21920-21929
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21930-21939
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21940-21949
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21950-21959
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21960-21969
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 21970-21979
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21980-21989
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21990-21999
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 22000-22009
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 22010-22019
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 22020-22029
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 22030-22039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22040-22049
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22050-22059
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 22060-22069
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 22070-22079
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22080-22089
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 22090-22099
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 22100-22109
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22110-22119
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 22120-22129
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 22130-22139
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 22140-22149
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 22150-22159
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22160-22169
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 22170-22179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 22180-22189
+		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 22190-22199
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 22200-22209
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 22210-22219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 22220-22229
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22230-22239
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 22240-22249
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 22250-22259
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22260-22269
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 22270-22279
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 22280-22289
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22290-22299
+		3, 2, 1, 4, 3, 2, 1, 36, 35, 34, // 22300-22309
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 22310-22319
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 22320-22329
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22330-22339
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 22340-22349
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22350-22359
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 22360-22369
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22370-22379
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22380-22389
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 22390-22399
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 22400-22409
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 22410-22419
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22420-22429
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 22430-22439
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 22440-22449
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 22450-22459
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 22460-22469
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22470-22479
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 22480-22489
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22490-22499
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22500-22509
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 22510-22519
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22520-22529
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22530-22539
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 22540-22549
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22550-22559
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 22560-22569
+		1, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 22570-22579
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 22580-22589
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 22590-22599
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22600-22609
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 22610-22619
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22620-22629
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 22630-22639
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 22640-22649
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 22650-22659
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 22660-22669
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 22670-22679
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22680-22689
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 22690-22699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 22700-22709
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 22710-22719
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 22720-22729
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 22730-22739
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22740-22749
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 22750-22759
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 22760-22769
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 22770-22779
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 22780-22789
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22790-22799
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 22800-22809
+		1, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 22810-22819
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 22820-22829
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 22830-22839
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22840-22849
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 22850-22859
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22860-22869
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 22870-22879
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 22880-22889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22890-22899
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 22900-22909
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22910-22919
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22920-22929
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 22930-22939
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 22940-22949
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22950-22959
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 22960-22969
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 22970-22979
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22980-22989
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 22990-22999
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 23000-23009
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23010-23019
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 23020-23029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 23030-23039
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23040-23049
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 23050-23059
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 23060-23069
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23070-23079
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23080-23089
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 23090-23099
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23100-23109
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 23110-23119
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23120-23129
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23130-23139
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 23140-23149
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 23150-23159
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 23160-23169
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 23170-23179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 23180-23189
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23190-23199
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 23200-23209
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23210-23219
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 23220-23229
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 23230-23239
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23240-23249
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 23250-23259
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 23260-23269
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 23270-23279
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23280-23289
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 23290-23299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23300-23309
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23310-23319
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 23320-23329
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 23330-23339
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23340-23349
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23350-23359
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 23360-23369
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 23370-23379
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 23380-23389
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 23390-23399
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23400-23409
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 23410-23419
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23420-23429
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23430-23439
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23440-23449
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 23450-23459
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23460-23469
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 23470-23479
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23480-23489
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23490-23499
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 23500-23509
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 23510-23519
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23520-23529
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 23530-23539
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 23540-23549
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23550-23559
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 23560-23569
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23570-23579
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23580-23589
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 23590-23599
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 23600-23609
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23610-23619
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 23620-23629
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 23630-23639
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 23640-23649
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23650-23659
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 23660-23669
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 23670-23679
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 30, // 23680-23689
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 23690-23699
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 23700-23709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 23710-23719
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 23720-23729
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23730-23739
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 23740-23749
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 23750-23759
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 23760-23769
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 23770-23779
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 23780-23789
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23790-23799
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23800-23809
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 23810-23819
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23820-23829
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 23830-23839
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23840-23849
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23850-23859
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 23860-23869
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 23870-23879
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 23880-23889
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 23890-23899
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 23900-23909
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23910-23919
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 23920-23929
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 23930-23939
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23940-23949
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 23950-23959
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23960-23969
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23970-23979
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23980-23989
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 23990-23999
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 24000-24009
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 24010-24019
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 24020-24029
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24030-24039
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 24040-24049
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24050-24059
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24060-24069
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24070-24079
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24080-24089
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24090-24099
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 24100-24109
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24110-24119
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24120-24129
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 24130-24139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24140-24149
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24150-24159
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 24160-24169
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 24170-24179
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24180-24189
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24190-24199
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 24200-24209
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24210-24219
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 24220-24229
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 24230-24239
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 24240-24249
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 24250-24259
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 24260-24269
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24270-24279
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 24280-24289
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 24290-24299
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24300-24309
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 24310-24319
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 24320-24329
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 24330-24339
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24340-24349
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 24350-24359
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24360-24369
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 24370-24379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24380-24389
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24390-24399
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24400-24409
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 24410-24419
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24420-24429
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 24430-24439
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 24440-24449
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24450-24459
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 24460-24469
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24470-24479
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24480-24489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 24490-24499
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 24500-24509
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 24510-24519
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24520-24529
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 24530-24539
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 24540-24549
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 24550-24559
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24560-24569
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 24570-24579
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24580-24589
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 24590-24599
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24600-24609
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24610-24619
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24620-24629
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 24630-24639
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24640-24649
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 24650-24659
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24660-24669
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24670-24679
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24680-24689
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 24690-24699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 24700-24709
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 24710-24719
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24720-24729
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 24730-24739
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 24740-24749
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24750-24759
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 24760-24769
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24770-24779
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24780-24789
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 24790-24799
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 24800-24809
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24810-24819
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 24820-24829
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24830-24839
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 24840-24849
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 24850-24859
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24860-24869
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 24870-24879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 24880-24889
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24890-24899
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 24900-24909
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 24910-24919
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 24920-24929
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24930-24939
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 24940-24949
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 24950-24959
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 24960-24969
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 24970-24979
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 24980-24989
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 24990-24999
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25000-25009
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 25010-25019
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25020-25029
+		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 25030-25039
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25040-25049
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 25050-25059
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25060-25069
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 25070-25079
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 25080-25089
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 25090-25099
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25100-25109
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 25110-25119
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 25120-25129
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25130-25139
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25140-25149
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 25150-25159
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 25160-25169
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25170-25179
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 25180-25189
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 25190-25199
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25200-25209
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 25210-25219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 25220-25229
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25230-25239
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 25240-25249
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 25250-25259
+		1, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 25260-25269
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 25270-25279
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 25280-25289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25290-25299
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 25300-25309
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25310-25319
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25320-25329
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 25330-25339
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 25340-25349
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 25350-25359
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25360-25369
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 25370-25379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25380-25389
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25390-25399
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 25400-25409
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25410-25419
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 25420-25429
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 25430-25439
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25440-25449
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 25450-25459
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 25460-25469
+		1, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 25470-25479
+		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 25480-25489
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 25490-25499
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 25500-25509
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25510-25519
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 25520-25529
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 25530-25539
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 25540-25549
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25550-25559
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25560-25569
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 25570-25579
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 25580-25589
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25590-25599
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 25600-25609
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25610-25619
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25620-25629
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 25630-25639
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 25640-25649
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 25650-25659
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25660-25669
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 25670-25679
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25680-25689
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 25690-25699
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 25700-25709
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 25710-25719
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25720-25729
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 25730-25739
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 25740-25749
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 25750-25759
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 25760-25769
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 25770-25779
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25780-25789
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 25790-25799
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25800-25809
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 25810-25819
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 25820-25829
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25830-25839
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 25840-25849
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25850-25859
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25860-25869
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 25870-25879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 25880-25889
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25890-25899
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 25900-25909
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 25910-25919
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25920-25929
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 25930-25939
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 25940-25949
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25950-25959
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 25960-25969
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25970-25979
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25980-25989
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 25990-25999
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 26000-26009
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26010-26019
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 26020-26029
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26030-26039
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26040-26049
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 26050-26059
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 26060-26069
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26070-26079
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 26080-26089
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 26090-26099
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26100-26109
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 26110-26119
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 26120-26129
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26130-26139
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26140-26149
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 26150-26159
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26160-26169
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26170-26179
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 26180-26189
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26190-26199
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 26200-26209
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26210-26219
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 26220-26229
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 26230-26239
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 26240-26249
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26250-26259
+		1, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 26260-26269
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 26270-26279
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26280-26289
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 26290-26299
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 26300-26309
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26310-26319
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26320-26329
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 26330-26339
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 26340-26349
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 26350-26359
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26360-26369
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26370-26379
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26380-26389
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 26390-26399
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 26400-26409
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26410-26419
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 26420-26429
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 26430-26439
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 26440-26449
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 26450-26459
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26460-26469
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 26470-26479
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 26480-26489
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26490-26499
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26500-26509
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 26510-26519
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26520-26529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 26530-26539
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26540-26549
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26550-26559
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26560-26569
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 26570-26579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26580-26589
+		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 26590-26599
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 26600-26609
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26610-26619
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26620-26629
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 26630-26639
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 26640-26649
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26650-26659
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 26660-26669
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26670-26679
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 26680-26689
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 26690-26699
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26700-26709
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 26710-26719
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 26720-26729
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 26730-26739
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26740-26749
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 26750-26759
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26760-26769
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26770-26779
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 26780-26789
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26790-26799
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26800-26809
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 26810-26819
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26820-26829
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 26830-26839
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 26840-26849
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26850-26859
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 26860-26869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 26870-26879
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26880-26889
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 26890-26899
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 26900-26909
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26910-26919
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 26920-26929
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26930-26939
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26940-26949
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 26950-26959
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 26960-26969
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26970-26979
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26980-26989
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 26990-26999
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27000-27009
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 27010-27019
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27020-27029
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27030-27039
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 27040-27049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27050-27059
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 27060-27069
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 27070-27079
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27080-27089
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27090-27099
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 18, // 27100-27109
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27110-27119
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 27120-27129
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27130-27139
+		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 27140-27149
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 27150-27159
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27160-27169
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 27170-27179
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27180-27189
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 27190-27199
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27200-27209
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 27210-27219
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27220-27229
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27230-27239
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27240-27249
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 27250-27259
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27260-27269
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27270-27279
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 27280-27289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 27290-27299
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 27300-27309
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27310-27319
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 27320-27329
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 27330-27339
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 27340-27349
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27350-27359
+		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 27360-27369
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 27370-27379
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27380-27389
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 27390-27399
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 27400-27409
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27410-27419
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27420-27429
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 27430-27439
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 27440-27449
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 27450-27459
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27460-27469
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27470-27479
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 27480-27489
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27490-27499
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 27500-27509
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27510-27519
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 27520-27529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27530-27539
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27540-27549
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 27550-27559
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 27560-27569
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27570-27579
+		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 27580-27589
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 27590-27599
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27600-27609
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 27610-27619
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27620-27629
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27630-27639
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 27640-27649
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 27650-27659
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27660-27669
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 27670-27679
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27680-27689
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27690-27699
+		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 27700-27709
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 27710-27719
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27720-27729
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 27730-27739
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 27740-27749
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27750-27759
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 27760-27769
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 27770-27779
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27780-27789
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 27790-27799
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 27800-27809
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 27810-27819
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 27820-27829
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27830-27839
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27840-27849
+		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 27850-27859
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 27860-27869
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27870-27879
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 27880-27889
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 27890-27899
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27900-27909
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 27910-27919
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 27920-27929
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27930-27939
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 27940-27949
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 27950-27959
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 27960-27969
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27970-27979
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 27980-27989
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27990-27999
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28000-28009
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 28010-28019
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28020-28029
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 28030-28039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28040-28049
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 28050-28059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 28060-28069
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28070-28079
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 28080-28089
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 28090-28099
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 28100-28109
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28110-28119
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 28120-28129
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 28130-28139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28140-28149
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28150-28159
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 28160-28169
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28170-28179
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 28180-28189
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28190-28199
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28200-28209
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 28210-28219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 48, // 28220-28229
+		47, 46, 45, 44, 43, 42, 41, 40, 39, 38, // 28230-28239
+		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 28240-28249
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 28250-28259
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28260-28269
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 28270-28279
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 28280-28289
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 28290-28299
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 28300-28309
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 28310-28319
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 28320-28329
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28330-28339
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 28340-28349
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 28350-28359
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 28360-28369
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28370-28379
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28380-28389
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 28390-28399
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 28400-28409
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28410-28419
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 28420-28429
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 28430-28439
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 28440-28449
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28450-28459
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 28460-28469
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 28470-28479
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28480-28489
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 28490-28499
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28500-28509
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 28510-28519
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28520-28529
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28530-28539
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 28540-28549
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 28550-28559
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28560-28569
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 28570-28579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28580-28589
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28590-28599
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 28600-28609
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 28610-28619
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28620-28629
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28630-28639
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 28640-28649
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28650-28659
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 28660-28669
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28670-28679
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 28680-28689
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28690-28699
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 28700-28709
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28710-28719
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 28720-28729
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 28730-28739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28740-28749
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 28750-28759
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28760-28769
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28770-28779
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 28780-28789
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 28790-28799
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28800-28809
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 28810-28819
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28820-28829
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28830-28839
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 28840-28849
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 28850-28859
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28860-28869
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 28870-28879
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 28880-28889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28890-28899
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 28900-28909
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28910-28919
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28920-28929
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 28930-28939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 28940-28949
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28950-28959
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28960-28969
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 28970-28979
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 28980-28989
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28990-28999
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 29000-29009
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 29010-29019
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 29020-29029
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 29030-29039
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 29040-29049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 29050-29059
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 29060-29069
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 29070-29079
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 29080-29089
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29090-29099
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 29100-29109
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29110-29119
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 29120-29129
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 29130-29139
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29140-29149
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 29150-29159
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29160-29169
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 29170-29179
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29180-29189
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29190-29199
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 29200-29209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29210-29219
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29220-29229
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29230-29239
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 29240-29249
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 29250-29259
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 29260-29269
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29270-29279
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 29280-29289
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29290-29299
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 29300-29309
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29310-29319
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29320-29329
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 29330-29339
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 29340-29349
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29350-29359
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 29360-29369
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29370-29379
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 29380-29389
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 29390-29399
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29400-29409
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29410-29419
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 29420-29429
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29430-29439
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 29440-29449
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 29450-29459
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29460-29469
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 29470-29479
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 29480-29489
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29490-29499
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 29500-29509
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29510-29519
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 29520-29529
+		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 29530-29539
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 29540-29549
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29550-29559
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 29560-29569
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 29570-29579
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 29580-29589
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 29590-29599
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29600-29609
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 29610-29619
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 29620-29629
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 29630-29639
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 29640-29649
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29650-29659
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 29660-29669
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29670-29679
+		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 29680-29689
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 29690-29699
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29700-29709
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29710-29719
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 29720-29729
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29730-29739
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29740-29749
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 29750-29759
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 29760-29769
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 29770-29779
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 29780-29789
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29790-29799
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 29800-29809
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 29810-29819
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29820-29829
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 29830-29839
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29840-29849
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29850-29859
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 29860-29869
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 29870-29879
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 29880-29889
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 29890-29899
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29900-29909
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 29910-29919
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 29920-29929
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29930-29939
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 29940-29949
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 29950-29959
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 29960-29969
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29970-29979
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 29980-29989
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 29990-29999
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30000-30009
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 30010-30019
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 30020-30029
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30030-30039
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 30040-30049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 30050-30059
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30060-30069
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 30070-30079
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30080-30089
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30090-30099
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 30100-30109
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 30110-30119
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30120-30129
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 30130-30139
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30140-30149
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30150-30159
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 30160-30169
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30170-30179
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 30180-30189
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30190-30199
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 30200-30209
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30210-30219
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 30220-30229
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30230-30239
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30240-30249
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 30250-30259
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30260-30269
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 30270-30279
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30280-30289
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 30290-30299
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30300-30309
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 30310-30319
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 30320-30329
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30330-30339
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 30340-30349
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30350-30359
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 30360-30369
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 30370-30379
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30380-30389
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30390-30399
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 30400-30409
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30410-30419
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 30420-30429
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 30430-30439
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 30440-30449
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30450-30459
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 30460-30469
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30470-30479
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30480-30489
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 30490-30499
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 30500-30509
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 30510-30519
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 30520-30529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 30530-30539
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30540-30549
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 18, // 30550-30559
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30560-30569
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 30570-30579
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30580-30589
+		3, 2, 1, 38, 37, 36, 35, 34, 33, 32, // 30590-30599
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 30600-30609
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30610-30619
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30620-30629
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30630-30639
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 30640-30649
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30650-30659
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30660-30669
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 30670-30679
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 30680-30689
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30690-30699
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 30700-30709
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 30710-30719
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 30720-30729
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 30730-30739
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30740-30749
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30750-30759
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 30760-30769
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 30770-30779
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 30780-30789
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30790-30799
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 30800-30809
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 30810-30819
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 30820-30829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30830-30839
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30840-30849
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 30850-30859
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30860-30869
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30870-30879
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30880-30889
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 30890-30899
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30900-30909
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30910-30919
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30920-30929
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 30930-30939
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 30940-30949
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30950-30959
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30960-30969
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30970-30979
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 30980-30989
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 30990-30999
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31000-31009
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 31010-31019
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31020-31029
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 31030-31039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31040-31049
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31050-31059
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 31060-31069
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 31070-31079
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31080-31089
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 31090-31099
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 31100-31109
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31110-31119
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 31120-31129
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 31130-31139
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31140-31149
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 31150-31159
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31160-31169
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31170-31179
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 31180-31189
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 31190-31199
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 31200-31209
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 31210-31219
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 31220-31229
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 31230-31239
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 31240-31249
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 31250-31259
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31260-31269
+		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 31270-31279
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 31280-31289
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31290-31299
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 31300-31309
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 31310-31319
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 31320-31329
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 31330-31339
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31340-31349
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 31350-31359
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 31360-31369
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 31370-31379
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31380-31389
+		1, 2, 1, 4, 3, 2, 1, 72, 71, 70, // 31390-31399
+		69, 68, 67, 66, 65, 64, 63, 62, 61, 60, // 31400-31409
+		59, 58, 57, 56, 55, 54, 53, 52, 51, 50, // 31410-31419
+		49, 48, 47, 46, 45, 44, 43, 42, 41, 40, // 31420-31429
+		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 31430-31439
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 31440-31449
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 31450-31459
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 31460-31469
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31470-31479
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 31480-31489
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 31490-31499
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31500-31509
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 31510-31519
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31520-31529
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31530-31539
+		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 31540-31549
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31550-31559
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 31560-31569
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 31570-31579
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 31580-31589
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31590-31599
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 31600-31609
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31610-31619
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 31620-31629
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31630-31639
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 31640-31649
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 31650-31659
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 31660-31669
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31670-31679
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 31680-31689
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 31690-31699
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 31700-31709
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31710-31719
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 31720-31729
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31730-31739
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31740-31749
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 31750-31759
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 31760-31769
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 31770-31779
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31780-31789
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 31790-31799
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31800-31809
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 31810-31819
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 31820-31829
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31830-31839
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 31840-31849
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 31850-31859
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31860-31869
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 31870-31879
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 31880-31889
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31890-31899
+		7, 6, 5, 4, 3, 2, 1, 50, 49, 48, // 31900-31909
+		47, 46, 45, 44, 43, 42, 41, 40, 39, 38, // 31910-31919
+		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 31920-31929
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 31930-31939
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31940-31949
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 31950-31959
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 31960-31969
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 31970-31979
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31980-31989
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31990-31999
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 32000-32009
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32010-32019
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 32020-32029
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32030-32039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32040-32049
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 32050-32059
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 32060-32069
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32070-32079
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 32080-32089
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 32090-32099
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32100-32109
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 32110-32119
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32120-32129
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32130-32139
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 32140-32149
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 32150-32159
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32160-32169
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 32170-32179
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 32180-32189
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32190-32199
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 32200-32209
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 32210-32219
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32220-32229
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 32230-32239
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32240-32249
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 32250-32259
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 32260-32269
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 32270-32279
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32280-32289
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 32290-32299
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 32300-32309
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32310-32319
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 32320-32329
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32330-32339
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32340-32349
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 32350-32359
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 32360-32369
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 32370-32379
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32380-32389
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32390-32399
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32400-32409
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 32410-32419
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 32420-32429
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32430-32439
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 32440-32449
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32450-32459
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 32460-32469
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 32470-32479
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32480-32489
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32490-32499
+		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 32500-32509
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32510-32519
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32520-32529
+		1, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 32530-32539
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32540-32549
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32550-32559
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 32560-32569
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 32570-32579
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 32580-32589
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32590-32599
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 32600-32609
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32610-32619
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32620-32629
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 32630-32639
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32640-32649
+		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 32650-32659
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 32660-32669
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32670-32679
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32680-32689
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 32690-32699
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32700-32709
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 30, // 32710-32719
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 32720-32729
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 32730-32739
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 32740-32749
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32750-32759
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32760-32769
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 32770-32779
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 32780-32789
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 32790-32799
+		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 32800-32809
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32810-32819
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32820-32829
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 32830-32839
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 32840-32849
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 32850-32859
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 32860-32869
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32870-32879
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 32880-32889
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 32890-32899
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 32900-32909
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 32910-32919
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32920-32929
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 32930-32939
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32940-32949
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 32950-32959
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 32960-32969
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32970-32979
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 32980-32989
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 32990-32999
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33000-33009
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 33010-33019
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 33020-33029
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 33030-33039
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 33040-33049
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 33050-33059
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33060-33069
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 33070-33079
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33080-33089
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33090-33099
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 33100-33109
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 33110-33119
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 33120-33129
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33130-33139
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33140-33149
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33150-33159
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33160-33169
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33170-33179
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33180-33189
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 33190-33199
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33200-33209
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33210-33219
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 33220-33229
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33230-33239
+		7, 6, 5, 4, 3, 2, 1, 40, 39, 38, // 33240-33249
+		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 33250-33259
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 33260-33269
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33270-33279
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 33280-33289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33290-33299
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33300-33309
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 33310-33319
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33320-33329
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33330-33339
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 33340-33349
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 33350-33359
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33360-33369
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 33370-33379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33380-33389
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33390-33399
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 33400-33409
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 33410-33419
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 33420-33429
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 33430-33439
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33440-33449
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 33450-33459
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 33460-33469
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 33470-33479
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 33480-33489
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 33490-33499
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 33500-33509
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33510-33519
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 33520-33529
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 33530-33539
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 33540-33549
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33550-33559
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 33560-33569
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 33570-33579
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 33580-33589
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33590-33599
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33600-33609
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 33610-33619
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 33620-33629
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 33630-33639
+		1, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 33640-33649
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 33650-33659
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33660-33669
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 33670-33679
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 33680-33689
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33690-33699
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 33700-33709
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33710-33719
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33720-33729
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 33730-33739
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33740-33749
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 33750-33759
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 33760-33769
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 33770-33779
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33780-33789
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 33790-33799
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33800-33809
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33810-33819
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 33820-33829
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 33830-33839
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33840-33849
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 33850-33859
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33860-33869
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33870-33879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 33880-33889
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 33890-33899
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33900-33909
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33910-33919
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33920-33929
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 33930-33939
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 33940-33949
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33950-33959
+		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 33960-33969
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 33970-33979
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33980-33989
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 33990-33999
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 34000-34009
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 34010-34019
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34020-34029
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 34030-34039
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34040-34049
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 34050-34059
+		1, 62, 61, 60, 59, 58, 57, 56, 55, 54, // 34060-34069
+		53, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 34070-34079
+		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 34080-34089
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 34090-34099
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 34100-34109
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34110-34119
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 34120-34129
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34130-34139
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 34140-34149
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 34150-34159
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34160-34169
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34170-34179
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 34180-34189
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 34190-34199
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34200-34209
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 34210-34219
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34220-34229
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 34230-34239
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34240-34249
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 34250-34259
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34260-34269
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 34270-34279
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 34280-34289
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 34290-34299
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 34300-34309
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 34310-34319
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 34320-34329
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 34330-34339
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34340-34349
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34350-34359
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 34360-34369
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34370-34379
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 34380-34389
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34390-34399
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34400-34409
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34410-34419
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 34420-34429
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 34430-34439
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34440-34449
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 34450-34459
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 34460-34469
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34470-34479
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 34480-34489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 34490-34499
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34500-34509
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 34510-34519
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34520-34529
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34530-34539
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 34, // 34540-34549
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 34550-34559
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 34560-34569
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34570-34579
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 34580-34589
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34590-34599
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 34600-34609
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34610-34619
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34620-34629
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 34630-34639
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 34640-34649
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34650-34659
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34660-34669
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 34670-34679
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34680-34689
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 34690-34699
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34700-34709
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34710-34719
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 34720-34729
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 34730-34739
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 34740-34749
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 34750-34759
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34760-34769
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34770-34779
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 34780-34789
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34790-34799
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 34800-34809
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 34810-34819
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 34820-34829
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34830-34839
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 34840-34849
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 34850-34859
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34860-34869
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34870-34879
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 34880-34889
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 34890-34899
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34900-34909
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 34910-34919
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 34920-34929
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 34930-34939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 34940-34949
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34950-34959
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34960-34969
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34970-34979
+		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 34980-34989
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 34990-34999
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 35000-35009
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35010-35019
+		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 35020-35029
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35030-35039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35040-35049
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 35050-35059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 35060-35069
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35070-35079
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 35080-35089
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 35090-35099
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 35100-35109
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 35110-35119
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 35120-35129
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35130-35139
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 35140-35149
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 35150-35159
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35160-35169
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 35170-35179
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35180-35189
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35190-35199
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35200-35209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35210-35219
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 35220-35229
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35230-35239
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35240-35249
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 35250-35259
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 35260-35269
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 35270-35279
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35280-35289
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35290-35299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35300-35309
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 35310-35319
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 35320-35329
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 35330-35339
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35340-35349
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 35350-35359
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 35360-35369
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35370-35379
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35380-35389
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 35390-35399
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 35400-35409
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 35410-35419
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 35420-35429
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 35430-35439
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 35440-35449
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35450-35459
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 35460-35469
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35470-35479
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35480-35489
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 35490-35499
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 35500-35509
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35510-35519
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 35520-35529
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 35530-35539
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 35540-35549
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 35550-35559
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 35560-35569
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 35570-35579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35580-35589
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 35590-35599
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 35600-35609
+		7, 6, 5, 4, 3, 2, 1, 54, 53, 52, // 35610-35619
+		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 35620-35629
+		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 35630-35639
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 35640-35649
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35650-35659
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35660-35669
+		1, 6, 5, 4, 3, 2, 1, 52, 51, 50, // 35670-35679
+		49, 48, 47, 46, 45, 44, 43, 42, 41, 40, // 35680-35689
+		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 35690-35699
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 35700-35709
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 35710-35719
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 35720-35729
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 35730-35739
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 35740-35749
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 35750-35759
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35760-35769
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 35770-35779
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 35780-35789
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 35790-35799
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 35800-35809
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35810-35819
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35820-35829
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 35830-35839
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35840-35849
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35850-35859
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 35860-35869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 35870-35879
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 35880-35889
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 35890-35899
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35900-35909
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35910-35919
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 35920-35929
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 35930-35939
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35940-35949
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35950-35959
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 35960-35969
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 35970-35979
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 35980-35989
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 35990-35999
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 36000-36009
+		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 36010-36019
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 36020-36029
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 36030-36039
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 36040-36049
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36050-36059
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36060-36069
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 36070-36079
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 36080-36089
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 36090-36099
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 36100-36109
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 36110-36119
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36120-36129
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 36130-36139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36140-36149
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36150-36159
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 36160-36169
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 36170-36179
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 36180-36189
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 36190-36199
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 36200-36209
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 36210-36219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 36220-36229
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36230-36239
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36240-36249
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36250-36259
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 36260-36269
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 36270-36279
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36280-36289
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 36290-36299
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36300-36309
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 36310-36319
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 36320-36329
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36330-36339
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 36340-36349
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 36350-36359
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36360-36369
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 36370-36379
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 44, // 36380-36389
+		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 36390-36399
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 36400-36409
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 36410-36419
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36420-36429
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 36430-36439
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36440-36449
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 36450-36459
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 36460-36469
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 36470-36479
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36480-36489
+		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 36490-36499
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 36500-36509
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36510-36519
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 36520-36529
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36530-36539
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36540-36549
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 36550-36559
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 36560-36569
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36570-36579
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 36580-36589
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 36590-36599
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 36600-36609
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 36610-36619
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 36620-36629
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36630-36639
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 36640-36649
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 36650-36659
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36660-36669
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36670-36679
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 36680-36689
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 36690-36699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 36700-36709
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 36710-36719
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 36720-36729
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 36730-36739
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 36740-36749
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36750-36759
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 36760-36769
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 36770-36779
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 36780-36789
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 36790-36799
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 36800-36809
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36810-36819
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36820-36829
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 36830-36839
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 36840-36849
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 36850-36859
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36860-36869
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 36870-36879
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 36880-36889
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 36890-36899
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36900-36909
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 36910-36919
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 36920-36929
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36930-36939
+		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 36940-36949
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 36950-36959
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36960-36969
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 36970-36979
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 36980-36989
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36990-36999
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 37000-37009
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 37010-37019
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 37020-37029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 37030-37039
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 37040-37049
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37050-37059
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 37060-37069
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37070-37079
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 37080-37089
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 37090-37099
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37100-37109
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37110-37119
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 37120-37129
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 37130-37139
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 37140-37149
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 37150-37159
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37160-37169
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37170-37179
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 37180-37189
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 37190-37199
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37200-37209
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37210-37219
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 37220-37229
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37230-37239
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 37240-37249
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 37250-37259
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37260-37269
+		3, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 37270-37279
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 37280-37289
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37290-37299
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 37300-37309
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 37310-37319
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37320-37329
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 37330-37339
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37340-37349
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37350-37359
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 37360-37369
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 37370-37379
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37380-37389
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 37390-37399
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 37400-37409
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37410-37419
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 37420-37429
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37430-37439
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 37440-37449
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37450-37459
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 37460-37469
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37470-37479
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 37480-37489
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 37490-37499
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37500-37509
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 37510-37519
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 37520-37529
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 37530-37539
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 37540-37549
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37550-37559
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37560-37569
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 37570-37579
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 37580-37589
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37590-37599
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 37600-37609
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 37610-37619
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37620-37629
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 37630-37639
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 37640-37649
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37650-37659
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 37660-37669
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 37670-37679
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37680-37689
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 37690-37699
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37700-37709
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 37710-37719
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 37720-37729
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37730-37739
+		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 37740-37749
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 37750-37759
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 37760-37769
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37770-37779
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 37780-37789
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 37790-37799
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37800-37809
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 37810-37819
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37820-37829
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37830-37839
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37840-37849
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 37850-37859
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37860-37869
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 37870-37879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 37880-37889
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 37890-37899
+		7, 6, 5, 4, 3, 2, 1, 44, 43, 42, // 37900-37909
+		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 37910-37919
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 37920-37929
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 37930-37939
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37940-37949
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37950-37959
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 37960-37969
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37970-37979
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37980-37989
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 37990-37999
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38000-38009
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 38010-38019
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 38020-38029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 38030-38039
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 38040-38049
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 38050-38059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 38060-38069
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38070-38079
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 38080-38089
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 38090-38099
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38100-38109
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 38110-38119
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 38120-38129
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 38130-38139
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 38140-38149
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 38150-38159
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 38160-38169
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 38170-38179
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 38180-38189
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38190-38199
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 38200-38209
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 38210-38219
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38220-38229
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 38230-38239
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 38240-38249
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38250-38259
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38260-38269
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 38270-38279
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 38280-38289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 38290-38299
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 38300-38309
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38310-38319
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 38320-38329
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 38330-38339
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38340-38349
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 38350-38359
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38360-38369
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 38370-38379
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38380-38389
+		3, 2, 1, 38, 37, 36, 35, 34, 33, 32, // 38390-38399
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 38400-38409
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 38410-38419
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38420-38429
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 38430-38439
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 38440-38449
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 38450-38459
+		1, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 38460-38469
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 38470-38479
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 38480-38489
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38490-38499
+		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 38500-38509
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 38510-38519
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 38520-38529
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38530-38539
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 38540-38549
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38550-38559
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 24, // 38560-38569
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 38570-38579
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38580-38589
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 38590-38599
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 38600-38609
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 38610-38619
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 38620-38629
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 38630-38639
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38640-38649
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 38650-38659
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 38660-38669
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 38670-38679
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38680-38689
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 38690-38699
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38700-38709
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 38710-38719
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 38720-38729
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 38730-38739
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 38740-38749
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 38750-38759
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 38760-38769
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38770-38779
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 38780-38789
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38790-38799
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 38800-38809
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38810-38819
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38820-38829
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 38830-38839
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38840-38849
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38850-38859
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 38860-38869
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 38870-38879
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38880-38889
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38890-38899
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 38900-38909
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38910-38919
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 38920-38929
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 38930-38939
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38940-38949
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 38950-38959
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38960-38969
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 38970-38979
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38980-38989
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 38990-38999
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39000-39009
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39010-39019
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 39020-39029
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39030-39039
+		1, 2, 1, 4, 3, 2, 1, 32, 31, 30, // 39040-39049
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 39050-39059
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39060-39069
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 39070-39079
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39080-39089
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 39090-39099
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 39100-39109
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 39110-39119
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39120-39129
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 39130-39139
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 39140-39149
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 39150-39159
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 39160-39169
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39170-39179
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39180-39189
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 39190-39199
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39200-39209
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 39210-39219
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 39220-39229
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 39230-39239
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39240-39249
+		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 39250-39259
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 39260-39269
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 39270-39279
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39280-39289
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 39290-39299
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39300-39309
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 39310-39319
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 39320-39329
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39330-39339
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 39340-39349
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39350-39359
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 39360-39369
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 39370-39379
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 39380-39389
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 39390-39399
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 39400-39409
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 39410-39419
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39420-39429
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39430-39439
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 39440-39449
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39450-39459
+		1, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 39460-39469
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 39470-39479
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39480-39489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39490-39499
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 39500-39509
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39510-39519
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 39520-39529
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39530-39539
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39540-39549
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39550-39559
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 39560-39569
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39570-39579
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 39580-39589
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 39590-39599
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 39600-39609
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39610-39619
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 39620-39629
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 39630-39639
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39640-39649
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39650-39659
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 39660-39669
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 39670-39679
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 39680-39689
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39690-39699
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 39700-39709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39710-39719
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 39720-39729
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 39730-39739
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 39740-39749
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39750-39759
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 39760-39769
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 39770-39779
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39780-39789
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 39790-39799
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 39800-39809
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39810-39819
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 39820-39829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 39830-39839
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 39840-39849
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 39850-39859
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 39860-39869
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 39870-39879
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 39880-39889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39890-39899
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 39900-39909
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39910-39919
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39920-39929
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 39930-39939
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39940-39949
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 39950-39959
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39960-39969
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39970-39979
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 39980-39989
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39990-39999
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 40000-40009
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 40010-40019
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40020-40029
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 24, // 40030-40039
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 40040-40049
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40050-40059
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 40060-40069
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40070-40079
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40080-40089
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 40090-40099
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40100-40109
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40110-40119
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 40120-40129
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 40130-40139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40140-40149
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 40150-40159
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 40160-40169
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 40170-40179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 40180-40189
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 40190-40199
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40200-40209
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 40210-40219
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40220-40229
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 40230-40239
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40240-40249
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 40250-40259
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40260-40269
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40270-40279
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 54, // 40280-40289
+		53, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 40290-40299
+		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 40300-40309
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 40310-40319
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 40320-40329
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40330-40339
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 40340-40349
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 40350-40359
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 40360-40369
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40370-40379
+		7, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 40380-40389
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 40390-40399
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 40400-40409
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40410-40419
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 40420-40429
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 40430-40439
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 40440-40449
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 40450-40459
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40460-40469
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40470-40479
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 40480-40489
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 40490-40499
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 40500-40509
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 40510-40519
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 40520-40529
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40530-40539
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 40540-40549
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 40550-40559
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40560-40569
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40570-40579
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 40580-40589
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 40590-40599
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 40600-40609
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40610-40619
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 40620-40629
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 54, // 40630-40639
+		53, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 40640-40649
+		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 40650-40659
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 40660-40669
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 40670-40679
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40680-40689
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 40690-40699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 40700-40709
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 40710-40719
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 40720-40729
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 40730-40739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40740-40749
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 40750-40759
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 40760-40769
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40770-40779
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 40780-40789
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40790-40799
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40800-40809
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 40810-40819
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 40820-40829
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40830-40839
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 40840-40849
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 40850-40859
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 40860-40869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 40870-40879
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 40880-40889
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40890-40899
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 40900-40909
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40910-40919
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40920-40929
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 40930-40939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 40940-40949
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40950-40959
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40960-40969
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 40970-40979
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40980-40989
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 40990-40999
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41000-41009
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41010-41019
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 41020-41029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 41030-41039
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41040-41049
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 41050-41059
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 41060-41069
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41070-41079
+		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 41080-41089
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 41090-41099
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41100-41109
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 41110-41119
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41120-41129
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41130-41139
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 41140-41149
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41150-41159
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 41160-41169
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 41170-41179
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 41180-41189
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41190-41199
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 41200-41209
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 41210-41219
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41220-41229
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 41230-41239
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 41240-41249
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41250-41259
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 41260-41269
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41270-41279
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41280-41289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 34, // 41290-41299
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 41300-41309
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 41310-41319
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41320-41329
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 41330-41339
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41340-41349
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 41350-41359
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 41360-41369
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41370-41379
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 41380-41389
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 41390-41399
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41400-41409
+		1, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 41410-41419
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 41420-41429
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41430-41439
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 41440-41449
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 41450-41459
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 41460-41469
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 41470-41479
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41480-41489
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 41490-41499
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41500-41509
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 41510-41519
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41520-41529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 41530-41539
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 41540-41549
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 41550-41559
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41560-41569
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 41570-41579
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41580-41589
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 41590-41599
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 41600-41609
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41610-41619
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 41620-41629
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41630-41639
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41640-41649
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 41650-41659
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 41660-41669
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41670-41679
+		1, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 41680-41689
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 41690-41699
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41700-41709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 41710-41719
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 41720-41729
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 41730-41739
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41740-41749
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 41750-41759
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41760-41769
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 41770-41779
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 41780-41789
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41790-41799
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 41800-41809
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 41810-41819
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 41820-41829
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41830-41839
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 41840-41849
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41850-41859
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 41860-41869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 41870-41879
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41880-41889
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 41890-41899
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 41900-41909
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 41910-41919
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 41920-41929
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41930-41939
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41940-41949
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 41950-41959
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 41960-41969
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41970-41979
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 41980-41989
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 41990-41999
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42000-42009
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 42010-42019
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 42020-42029
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42030-42039
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 42040-42049
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42050-42059
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42060-42069
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 42070-42079
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 42080-42089
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42090-42099
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 42100-42109
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42110-42119
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42120-42129
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 42130-42139
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42140-42149
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42150-42159
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42160-42169
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 42170-42179
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42180-42189
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 42190-42199
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 42200-42209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42210-42219
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 42220-42229
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 42230-42239
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42240-42249
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 42250-42259
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42260-42269
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42270-42279
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 42280-42289
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 42290-42299
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 42300-42309
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42310-42319
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 42320-42329
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42330-42339
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42340-42349
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 42350-42359
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42360-42369
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 42370-42379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42380-42389
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42390-42399
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 24, // 42400-42409
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 42410-42419
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42420-42429
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 42430-42439
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 42440-42449
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 42450-42459
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 42460-42469
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 42470-42479
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 42480-42489
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42490-42499
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 42500-42509
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 42510-42519
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42520-42529
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 42530-42539
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42540-42549
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42550-42559
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 42560-42569
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42570-42579
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 42580-42589
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42590-42599
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42600-42609
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 42610-42619
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42620-42629
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42630-42639
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 42640-42649
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42650-42659
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 42660-42669
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42670-42679
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 42680-42689
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 42690-42699
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 42700-42709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 42710-42719
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 42720-42729
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42730-42739
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 42740-42749
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42750-42759
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42760-42769
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 42770-42779
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42780-42789
+		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 42790-42799
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42800-42809
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42810-42819
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42820-42829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 42830-42839
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42840-42849
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 42850-42859
+		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 42860-42869
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 42870-42879
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 42880-42889
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 42890-42899
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 42900-42909
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42910-42919
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 42920-42929
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42930-42939
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 42940-42949
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 42950-42959
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42960-42969
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42970-42979
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 42980-42989
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42990-42999
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 43000-43009
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 43010-43019
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43020-43029
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 43030-43039
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 43040-43049
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43050-43059
+		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 43060-43069
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43070-43079
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43080-43089
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 43090-43099
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43100-43109
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 43110-43119
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43120-43129
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 43130-43139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43140-43149
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 43150-43159
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43160-43169
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 43170-43179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 43180-43189
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43190-43199
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 43200-43209
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43210-43219
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43220-43229
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 43230-43239
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43240-43249
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43250-43259
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43260-43269
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43270-43279
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 43280-43289
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43290-43299
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43300-43309
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 43310-43319
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43320-43329
+		1, 60, 59, 58, 57, 56, 55, 54, 53, 52, // 43330-43339
+		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 43340-43349
+		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 43350-43359
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 43360-43369
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43370-43379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43380-43389
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 43390-43399
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 43400-43409
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43410-43419
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 43420-43429
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43430-43439
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43440-43449
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 43450-43459
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43460-43469
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43470-43479
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 43480-43489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 43490-43499
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43500-43509
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 43510-43519
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43520-43529
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43530-43539
+		1, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 43540-43549
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43550-43559
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43560-43569
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 43570-43579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43580-43589
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 43590-43599
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 43600-43609
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43610-43619
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 43620-43629
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 43630-43639
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 43640-43649
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43650-43659
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 43660-43669
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43670-43679
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43680-43689
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43690-43699
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43700-43709
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 43710-43719
+		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 43720-43729
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43730-43739
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43740-43749
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 43750-43759
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43760-43769
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 43770-43779
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 43780-43789
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 43790-43799
+		1, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 43800-43809
+		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 43810-43819
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 43820-43829
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43830-43839
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43840-43849
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43850-43859
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 43860-43869
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 43870-43879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 43880-43889
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43890-43899
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43900-43909
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 43910-43919
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43920-43929
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 43930-43939
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 43940-43949
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43950-43959
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 43960-43969
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43970-43979
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 43980-43989
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 43990-43999
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44000-44009
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 44010-44019
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 44020-44029
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44030-44039
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44040-44049
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 44050-44059
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44060-44069
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44070-44079
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 44080-44089
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44090-44099
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44100-44109
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 44110-44119
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 44120-44129
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 44130-44139
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44140-44149
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 44150-44159
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44160-44169
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 44170-44179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 44180-44189
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44190-44199
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 44200-44209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44210-44219
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 44220-44229
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44230-44239
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44240-44249
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 44250-44259
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 44260-44269
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 44270-44279
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44280-44289
+		3, 2, 1, 58, 57, 56, 55, 54, 53, 52, // 44290-44299
+		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 44300-44309
+		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 44310-44319
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 44320-44329
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 44330-44339
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44340-44349
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 44350-44359
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44360-44369
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44370-44379
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 44380-44389
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 44390-44399
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44400-44409
+		7, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 44410-44419
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 44420-44429
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44430-44439
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 44440-44449
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 44450-44459
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 44460-44469
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44470-44479
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 44480-44489
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 44490-44499
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 44500-44509
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 44510-44519
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44520-44529
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 44530-44539
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 44540-44549
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44550-44559
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 44560-44569
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44570-44579
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 44580-44589
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 44590-44599
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44600-44609
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 44610-44619
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 44620-44629
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 44630-44639
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 44640-44649
+		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 44650-44659
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 44660-44669
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44670-44679
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 44680-44689
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 44690-44699
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44700-44709
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44710-44719
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 44720-44729
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44730-44739
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44740-44749
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 44750-44759
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44760-44769
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 44770-44779
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44780-44789
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 44790-44799
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 44800-44809
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 44810-44819
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44820-44829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 44830-44839
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 44840-44849
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44850-44859
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 44860-44869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44870-44879
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 44880-44889
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 44890-44899
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44900-44909
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 44910-44919
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 44920-44929
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 44930-44939
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44940-44949
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 44950-44959
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 44960-44969
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44970-44979
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 44980-44989
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44990-44999
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45000-45009
+		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 45010-45019
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 45020-45029
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 45030-45039
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45040-45049
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 45050-45059
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45060-45069
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45070-45079
+		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 45080-45089
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 45090-45099
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 45100-45109
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 45110-45119
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 45120-45129
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 45130-45139
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 45140-45149
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45150-45159
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 45160-45169
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 45170-45179
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45180-45189
+		1, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 45190-45199
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 45200-45209
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 45210-45219
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45220-45229
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 45230-45239
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 45240-45249
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 45250-45259
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 45260-45269
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45270-45279
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 45280-45289
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 45290-45299
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 45300-45309
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 45310-45319
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 45320-45329
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 45330-45339
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 45340-45349
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45350-45359
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45360-45369
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 45370-45379
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 45380-45389
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45390-45399
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 45400-45409
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 45410-45419
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45420-45429
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 42, // 45430-45439
+		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 45440-45449
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 45450-45459
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 45460-45469
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45470-45479
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45480-45489
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45490-45499
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 45500-45509
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45510-45519
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 45520-45529
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 45530-45539
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45540-45549
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 45550-45559
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 45560-45569
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45570-45579
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 45580-45589
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 45590-45599
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45600-45609
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 45610-45619
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45620-45629
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45630-45639
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 45640-45649
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 45650-45659
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45660-45669
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 45670-45679
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45680-45689
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 45690-45699
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 45700-45709
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 45710-45719
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45720-45729
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 45730-45739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45740-45749
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45750-45759
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 45760-45769
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 38, // 45770-45779
+		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 45780-45789
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 45790-45799
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45800-45809
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 45810-45819
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 45820-45829
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 45830-45839
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45840-45849
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 45850-45859
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 45860-45869
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45870-45879
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45880-45889
+		3, 2, 1, 50, 49, 48, 47, 46, 45, 44, // 45890-45899
+		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 45900-45909
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 45910-45919
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 45920-45929
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45930-45939
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 45940-45949
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 45950-45959
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45960-45969
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 45970-45979
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 45980-45989
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 45990-45999
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 46000-46009
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46010-46019
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 46020-46029
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46030-46039
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46040-46049
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46050-46059
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46060-46069
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 46070-46079
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46080-46089
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 46090-46099
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 46100-46109
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 46110-46119
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46120-46129
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 46130-46139
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 46140-46149
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 46150-46159
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46160-46169
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46170-46179
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 46180-46189
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 46190-46199
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46200-46209
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 46210-46219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 46220-46229
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 46230-46239
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 46240-46249
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46250-46259
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46260-46269
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 46270-46279
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 46280-46289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46290-46299
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 46300-46309
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 46310-46319
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 46320-46329
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 46330-46339
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46340-46349
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 46350-46359
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 46360-46369
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46370-46379
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46380-46389
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 46390-46399
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46400-46409
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 46410-46419
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46420-46429
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46430-46439
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46440-46449
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 46450-46459
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46460-46469
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 46470-46479
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 46480-46489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 46490-46499
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46500-46509
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46510-46519
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 46520-46529
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46530-46539
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 46540-46549
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 46550-46559
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 46560-46569
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 46570-46579
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46580-46589
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46590-46599
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46600-46609
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 46610-46619
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46620-46629
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 46630-46639
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 46640-46649
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46650-46659
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 46660-46669
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46670-46679
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46680-46689
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46690-46699
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 46700-46709
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46710-46719
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 46720-46729
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 46730-46739
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46740-46749
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 46750-46759
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46760-46769
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 46770-46779
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 46780-46789
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 46790-46799
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46800-46809
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 46810-46819
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46820-46829
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 46830-46839
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46840-46849
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 46850-46859
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 46860-46869
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 46870-46879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 46880-46889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46890-46899
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46900-46909
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 46910-46919
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46920-46929
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 46930-46939
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 46940-46949
+		7, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 46950-46959
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 46960-46969
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 46970-46979
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46980-46989
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 46990-46999
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47000-47009
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 47010-47019
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 47020-47029
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47030-47039
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47040-47049
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 47050-47059
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 47060-47069
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47070-47079
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47080-47089
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 47090-47099
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47100-47109
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 47110-47119
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 47120-47129
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47130-47139
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 47140-47149
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47150-47159
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 47160-47169
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47170-47179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 47180-47189
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47190-47199
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 47200-47209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47210-47219
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47220-47229
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 47230-47239
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47240-47249
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47250-47259
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 47260-47269
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 47270-47279
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47280-47289
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 47290-47299
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 47300-47309
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 47310-47319
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47320-47329
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 47330-47339
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47340-47349
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 47350-47359
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 47360-47369
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47370-47379
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 47380-47389
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47390-47399
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 47400-47409
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 47410-47419
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47420-47429
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47430-47439
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47440-47449
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 47450-47459
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 47460-47469
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 47470-47479
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47480-47489
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 47490-47499
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47500-47509
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 47510-47519
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47520-47529
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 47530-47539
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 47540-47549
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47550-47559
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 47560-47569
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47570-47579
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47580-47589
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 47590-47599
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 47600-47609
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47610-47619
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 47620-47629
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 47630-47639
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47640-47649
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 47650-47659
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 47660-47669
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47670-47679
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47680-47689
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 47690-47699
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47700-47709
+		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 47710-47719
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47720-47729
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 47730-47739
+		1, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 47740-47749
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 47750-47759
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47760-47769
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 47770-47779
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47780-47789
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 47790-47799
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 47800-47809
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 47810-47819
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47820-47829
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47830-47839
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 47840-47849
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 47850-47859
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 47860-47869
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47870-47879
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 47880-47889
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47890-47899
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 47900-47909
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 47910-47919
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47920-47929
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 47930-47939
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 47940-47949
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47950-47959
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 47960-47969
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 47970-47979
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 47980-47989
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 47990-47999
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48000-48009
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 48010-48019
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 48020-48029
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48030-48039
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 48040-48049
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 48050-48059
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48060-48069
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 48070-48079
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48080-48089
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48090-48099
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 48100-48109
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 48110-48119
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48120-48129
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 48130-48139
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48140-48149
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 48150-48159
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 48160-48169
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 48170-48179
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 48180-48189
+		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 48190-48199
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 48200-48209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48210-48219
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48220-48229
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 48230-48239
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 48240-48249
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 48250-48259
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48260-48269
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48270-48279
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48280-48289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 48290-48299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48300-48309
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 48310-48319
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48320-48329
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 48330-48339
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48340-48349
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 48350-48359
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48360-48369
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48370-48379
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 48380-48389
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 48390-48399
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 48400-48409
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 48410-48419
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48420-48429
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 48430-48439
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 48440-48449
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48450-48459
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 48460-48469
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 48470-48479
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 48480-48489
+		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 48490-48499
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 48500-48509
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48510-48519
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 48520-48529
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 48530-48539
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 48540-48549
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48550-48559
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 48560-48569
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48570-48579
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 48580-48589
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 48590-48599
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48600-48609
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 48610-48619
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 48620-48629
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48630-48639
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 48640-48649
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48650-48659
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48660-48669
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 52, // 48670-48679
+		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 48680-48689
+		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 48690-48699
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 48700-48709
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 48710-48719
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48720-48729
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 48730-48739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48740-48749
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 48750-48759
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 48760-48769
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 48770-48779
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 48780-48789
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 48790-48799
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 48800-48809
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 48810-48819
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 48820-48829
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48830-48839
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 48840-48849
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 48850-48859
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 48860-48869
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48870-48879
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 48880-48889
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48890-48899
+		7, 6, 5, 4, 3, 2, 1, 40, 39, 38, // 48900-48909
+		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 48910-48919
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 48920-48929
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48930-48939
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 48940-48949
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 48950-48959
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48960-48969
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 48970-48979
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 48980-48989
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48990-48999
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 49000-49009
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 49010-49019
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49020-49029
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 49030-49039
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 49040-49049
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 49050-49059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 49060-49069
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49070-49079
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49080-49089
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49090-49099
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 49100-49109
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 49110-49119
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 49120-49129
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 49130-49139
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49140-49149
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 49150-49159
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 49160-49169
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 49170-49179
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49180-49189
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 49190-49199
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 49200-49209
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49210-49219
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 49220-49229
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49230-49239
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49240-49249
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 49250-49259
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49260-49269
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 49270-49279
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49280-49289
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 49290-49299
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 49300-49309
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 49310-49319
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49320-49329
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 49330-49339
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49340-49349
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49350-49359
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 49360-49369
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 49370-49379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49380-49389
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 49390-49399
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 49400-49409
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 49410-49419
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 49420-49429
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 49430-49439
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49440-49449
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 49450-49459
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 49460-49469
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 49470-49479
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 49480-49489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 49490-49499
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49500-49509
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49510-49519
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 49520-49529
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 49530-49539
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 49540-49549
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 38, // 49550-49559
+		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 49560-49569
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 49570-49579
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49580-49589
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 49590-49599
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 49600-49609
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 49610-49619
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 49620-49629
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 49630-49639
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49640-49649
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49650-49659
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 49660-49669
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49670-49679
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49680-49689
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 49690-49699
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49700-49709
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49710-49719
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 49720-49729
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 49730-49739
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 49740-49749
+		7, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 49750-49759
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49760-49769
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49770-49779
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 49780-49789
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49790-49799
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 49800-49809
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49810-49819
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 49820-49829
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49830-49839
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 49840-49849
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 49850-49859
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49860-49869
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 49870-49879
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49880-49889
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 49890-49899
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 49900-49909
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 49910-49919
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 49920-49929
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 49930-49939
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 49940-49949
+		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 49950-49959
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 49960-49969
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 49970-49979
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49980-49989
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 49990-49999
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50000-50009
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50010-50019
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 50020-50029
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50030-50039
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50040-50049
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 50050-50059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 50060-50069
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 50070-50079
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50080-50089
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 50090-50099
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50100-50109
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50110-50119
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 50120-50129
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50130-50139
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50140-50149
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 50150-50159
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50160-50169
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 50170-50179
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 50180-50189
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50190-50199
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 50200-50209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50210-50219
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50220-50229
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 50230-50239
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50240-50249
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50250-50259
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 50260-50269
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50270-50279
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50280-50289
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50290-50299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50300-50309
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50310-50319
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50320-50329
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 50330-50339
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 50340-50349
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50350-50359
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50360-50369
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50370-50379
+		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 50380-50389
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50390-50399
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50400-50409
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50410-50419
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 50420-50429
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50430-50439
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 50440-50449
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 50450-50459
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 50460-50469
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 50470-50479
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50480-50489
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50490-50499
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 50500-50509
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50510-50519
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 50520-50529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50530-50539
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 50540-50549
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 50550-50559
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50560-50569
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50570-50579
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50580-50589
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 50590-50599
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 50600-50609
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50610-50619
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 50620-50629
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50630-50639
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50640-50649
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50650-50659
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50660-50669
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50670-50679
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 50680-50689
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50690-50699
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 50700-50709
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50710-50719
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 50720-50729
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50730-50739
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50740-50749
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50750-50759
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50760-50769
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 50770-50779
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 50780-50789
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 50790-50799
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50800-50809
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50810-50819
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50820-50829
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 50830-50839
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 50840-50849
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 50850-50859
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50860-50869
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 50870-50879
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50880-50889
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 50890-50899
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 50900-50909
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50910-50919
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 50920-50929
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50930-50939
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50940-50949
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 50950-50959
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 50960-50969
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 50970-50979
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50980-50989
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 50990-50999
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 51000-51009
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 51010-51019
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51020-51029
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51030-51039
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 51040-51049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 51050-51059
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51060-51069
+		1, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 51070-51079
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 51080-51089
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51090-51099
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 51100-51109
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 51110-51119
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51120-51129
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 51130-51139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51140-51149
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 51150-51159
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 51160-51169
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 51170-51179
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51180-51189
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 51190-51199
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 51200-51209
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 51210-51219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 51220-51229
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 51230-51239
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51240-51249
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51250-51259
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 51260-51269
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51270-51279
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 51280-51289
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51290-51299
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 51300-51309
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51310-51319
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 51320-51329
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51330-51339
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 51340-51349
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51350-51359
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 51360-51369
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51370-51379
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 51380-51389
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51390-51399
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51400-51409
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 51410-51419
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 51420-51429
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 51430-51439
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 51440-51449
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51450-51459
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51460-51469
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 51470-51479
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 51480-51489
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51490-51499
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 51500-51509
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 51510-51519
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51520-51529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 51530-51539
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51540-51549
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51550-51559
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 51560-51569
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 51570-51579
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51580-51589
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 51590-51599
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51600-51609
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 51610-51619
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51620-51629
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 51630-51639
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 51640-51649
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 51650-51659
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51660-51669
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 51670-51679
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 51680-51689
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 51690-51699
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51700-51709
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 51710-51719
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 51720-51729
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51730-51739
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 51740-51749
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51750-51759
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 51760-51769
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51770-51779
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 51780-51789
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51790-51799
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 51800-51809
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 51810-51819
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 51820-51829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 51830-51839
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51840-51849
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 51850-51859
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 51860-51869
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 51870-51879
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51880-51889
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 51890-51899
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51900-51909
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 51910-51919
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 51920-51929
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51930-51939
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 51940-51949
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 51950-51959
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51960-51969
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 51970-51979
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51980-51989
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51990-51999
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 52000-52009
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52010-52019
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 52020-52029
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 52030-52039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52040-52049
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 52050-52059
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 52060-52069
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52070-52079
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 52080-52089
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52090-52099
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 52100-52109
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52110-52119
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 52120-52129
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52130-52139
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52140-52149
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 52150-52159
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 52160-52169
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 52170-52179
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 52180-52189
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52190-52199
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 52200-52209
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52210-52219
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 52220-52229
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 52230-52239
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 52240-52249
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 52250-52259
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 52260-52269
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52270-52279
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 52280-52289
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52290-52299
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52300-52309
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 52310-52319
+		1, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 52320-52329
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 52330-52339
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 52340-52349
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52350-52359
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 52360-52369
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 52370-52379
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 52380-52389
+		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 52390-52399
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 52400-52409
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 52410-52419
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52420-52429
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 52430-52439
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52440-52449
+		3, 2, 1, 4, 3, 2, 1, 32, 31, 30, // 52450-52459
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 52460-52469
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52470-52479
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 52480-52489
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52490-52499
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52500-52509
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 52510-52519
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 52520-52529
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52530-52539
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 52540-52549
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 52550-52559
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 52560-52569
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 52570-52579
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 52580-52589
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52590-52599
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 52600-52609
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52610-52619
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 52620-52629
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 52630-52639
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 52640-52649
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52650-52659
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52660-52669
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 52670-52679
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52680-52689
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 52690-52699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 52700-52709
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52710-52719
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52720-52729
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 52730-52739
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 52740-52749
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 52750-52759
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 52760-52769
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52770-52779
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 52780-52789
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52790-52799
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52800-52809
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 52810-52819
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52820-52829
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 52830-52839
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52840-52849
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 52850-52859
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52860-52869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 52870-52879
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 52880-52889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52890-52899
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 52900-52909
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 52910-52919
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52920-52929
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 52930-52939
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52940-52949
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52950-52959
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 52960-52969
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 52970-52979
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52980-52989
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 52990-52999
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 53000-53009
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 53010-53019
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 53020-53029
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53030-53039
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53040-53049
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53050-53059
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 53060-53069
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 53070-53079
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 53080-53089
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 53090-53099
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53100-53109
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 53110-53119
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 53120-53129
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53130-53139
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 53140-53149
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53150-53159
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53160-53169
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 53170-53179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 53180-53189
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53190-53199
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 53200-53209
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53210-53219
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53220-53229
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 53230-53239
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 53240-53249
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53250-53259
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 53260-53269
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 53270-53279
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53280-53289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 53290-53299
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 53300-53309
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53310-53319
+		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 53320-53329
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 53330-53339
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53340-53349
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 53350-53359
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53360-53369
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53370-53379
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53380-53389
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53390-53399
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53400-53409
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 53410-53419
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53420-53429
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53430-53439
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53440-53449
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 53450-53459
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53460-53469
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 53470-53479
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 53480-53489
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53490-53499
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 53500-53509
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53510-53519
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 53520-53529
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53530-53539
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 53540-53549
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53550-53559
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 53560-53569
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53570-53579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53580-53589
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 53590-53599
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 53600-53609
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 53610-53619
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 53620-53629
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 53630-53639
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53640-53649
+		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 53650-53659
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53660-53669
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53670-53679
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53680-53689
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 53690-53699
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53700-53709
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 53710-53719
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53720-53729
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 53730-53739
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53740-53749
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 53750-53759
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53760-53769
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 53770-53779
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 53780-53789
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 53790-53799
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53800-53809
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 53810-53819
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53820-53829
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53830-53839
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 53840-53849
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53850-53859
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53860-53869
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53870-53879
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53880-53889
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 53890-53899
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53900-53909
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 53910-53919
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 53920-53929
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 53930-53939
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53940-53949
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 53950-53959
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 53960-53969
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53970-53979
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 53980-53989
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 53990-53999
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54000-54009
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 54010-54019
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54020-54029
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 54030-54039
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 54040-54049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 54050-54059
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 54060-54069
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54070-54079
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 54080-54089
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54090-54099
+		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54100-54109
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54110-54119
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54120-54129
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 54130-54139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54140-54149
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54150-54159
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 54160-54169
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54170-54179
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54180-54189
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 54190-54199
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54200-54209
+		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 54210-54219
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 54220-54229
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54230-54239
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54240-54249
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54250-54259
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 54260-54269
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 54270-54279
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54280-54289
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 54290-54299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54300-54309
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 54310-54319
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 54320-54329
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54330-54339
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 54340-54349
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54350-54359
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 54360-54369
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 54370-54379
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54380-54389
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54390-54399
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 54400-54409
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 54410-54419
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54420-54429
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54430-54439
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 54440-54449
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54450-54459
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 54460-54469
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 54470-54479
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54480-54489
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 54490-54499
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 54500-54509
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 54510-54519
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54520-54529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 54530-54539
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 54540-54549
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 54550-54559
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 54560-54569
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 54570-54579
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 54580-54589
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54590-54599
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54600-54609
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54610-54619
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 54620-54629
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54630-54639
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 54640-54649
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54650-54659
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54660-54669
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 54670-54679
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 54680-54689
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54690-54699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 54700-54709
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 54710-54719
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 54720-54729
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54730-54739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54740-54749
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54750-54759
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54760-54769
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 54770-54779
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 54780-54789
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 54790-54799
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 54800-54809
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54810-54819
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 54820-54829
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 54830-54839
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54840-54849
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54850-54859
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 54860-54869
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 54870-54879
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 54880-54889
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54890-54899
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 54900-54909
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 54910-54919
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54920-54929
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54930-54939
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 54940-54949
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 54950-54959
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54960-54969
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 54970-54979
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 54980-54989
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54990-54999
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 55000-55009
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55010-55019
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 55020-55029
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55030-55039
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 55040-55049
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 55050-55059
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55060-55069
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 55070-55079
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 55080-55089
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55090-55099
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 55100-55109
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 55110-55119
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 55120-55129
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55130-55139
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 55140-55149
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55150-55159
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 55160-55169
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 55170-55179
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 55180-55189
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55190-55199
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55200-55209
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 55210-55219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 55220-55229
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55230-55239
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 55240-55249
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 55250-55259
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 55260-55269
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 55270-55279
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55280-55289
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 55290-55299
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55300-55309
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 55310-55319
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55320-55329
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 55330-55339
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 55340-55349
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 55350-55359
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55360-55369
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 55370-55379
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55380-55389
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 55390-55399
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55400-55409
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 55410-55419
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55420-55429
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 55430-55439
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55440-55449
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 55450-55459
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 55460-55469
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55470-55479
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 55480-55489
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55490-55499
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55500-55509
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55510-55519
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 55520-55529
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55530-55539
+		1, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 55540-55549
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 55550-55559
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55560-55569
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 55570-55579
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 55580-55589
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55590-55599
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 55600-55609
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 55610-55619
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55620-55629
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 55630-55639
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 55640-55649
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55650-55659
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 55660-55669
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 55670-55679
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55680-55689
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 55690-55699
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55700-55709
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 55710-55719
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55720-55729
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 55730-55739
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 55740-55749
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55750-55759
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 55760-55769
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55770-55779
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55780-55789
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 55790-55799
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55800-55809
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 55810-55819
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 55820-55829
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55830-55839
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 55840-55849
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 55850-55859
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55860-55869
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55870-55879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 55880-55889
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 55890-55899
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 55900-55909
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55910-55919
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 55920-55929
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 55930-55939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 55940-55949
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55950-55959
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 55960-55969
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55970-55979
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 55980-55989
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55990-55999
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 56000-56009
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 56010-56019
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56020-56029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 56030-56039
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56040-56049
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 56050-56059
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 56060-56069
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56070-56079
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56080-56089
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 56090-56099
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56100-56109
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 56110-56119
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 56120-56129
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56130-56139
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 56140-56149
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56150-56159
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 56160-56169
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 56170-56179
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56180-56189
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 56190-56199
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 56200-56209
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 56210-56219
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56220-56229
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 56230-56239
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 56240-56249
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56250-56259
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 30, // 56260-56269
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 56270-56279
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56280-56289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 56290-56299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56300-56309
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 56310-56319
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56320-56329
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 56330-56339
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56340-56349
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 56350-56359
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 56360-56369
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56370-56379
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 56380-56389
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 56390-56399
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56400-56409
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 56410-56419
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56420-56429
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56430-56439
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 56440-56449
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 56450-56459
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56460-56469
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 56470-56479
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 56480-56489
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56490-56499
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 56500-56509
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 56510-56519
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 56520-56529
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 56530-56539
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 56540-56549
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56550-56559
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 56560-56569
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 56570-56579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56580-56589
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 56590-56599
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56600-56609
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56610-56619
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 56620-56629
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 56630-56639
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56640-56649
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 56650-56659
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 56660-56669
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56670-56679
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 56680-56689
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56690-56699
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56700-56709
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 56710-56719
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56720-56729
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 56730-56739
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 56740-56749
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56750-56759
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56760-56769
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 56770-56779
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 56780-56789
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56790-56799
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 56800-56809
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 56810-56819
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 56820-56829
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56830-56839
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 56840-56849
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 56850-56859
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56860-56869
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 56870-56879
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56880-56889
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 56890-56899
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 56900-56909
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56910-56919
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 56920-56929
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56930-56939
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56940-56949
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56950-56959
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 56960-56969
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56970-56979
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 56980-56989
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 38, // 56990-56999
+		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 57000-57009
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 57010-57019
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57020-57029
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 57030-57039
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 57040-57049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 57050-57059
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57060-57069
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 57070-57079
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 57080-57089
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 57090-57099
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 57100-57109
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 57110-57119
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57120-57129
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 57130-57139
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 57140-57149
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57150-57159
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57160-57169
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 57170-57179
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57180-57189
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57190-57199
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 57200-57209
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57210-57219
+		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 57220-57229
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57230-57239
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57240-57249
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 57250-57259
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 57260-57269
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57270-57279
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 57280-57289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57290-57299
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 57300-57309
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 57310-57319
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 57320-57329
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57330-57339
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 57340-57349
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57350-57359
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57360-57369
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57370-57379
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 57380-57389
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 57390-57399
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57400-57409
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 57410-57419
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 57420-57429
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 57430-57439
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57440-57449
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 57450-57459
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 57460-57469
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57470-57479
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57480-57489
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57490-57499
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 57500-57509
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57510-57519
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 57520-57529
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 57530-57539
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57540-57549
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 57550-57559
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57560-57569
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57570-57579
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57580-57589
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 57590-57599
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 57600-57609
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 57610-57619
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57620-57629
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 57630-57639
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 57640-57649
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 57650-57659
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 57660-57669
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 57670-57679
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 57680-57689
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 57690-57699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 57700-57709
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 57710-57719
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 57720-57729
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 57730-57739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57740-57749
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 57750-57759
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57760-57769
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 57770-57779
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 57780-57789
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57790-57799
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 57800-57809
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 57810-57819
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 57820-57829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 57830-57839
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57840-57849
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 57850-57859
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 57860-57869
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57870-57879
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 57880-57889
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 57890-57899
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57900-57909
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57910-57919
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 57920-57929
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57930-57939
+		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 57940-57949
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 57950-57959
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57960-57969
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 57970-57979
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57980-57989
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 57990-57999
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 58000-58009
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 58010-58019
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58020-58029
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 58030-58039
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 58040-58049
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58050-58059
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58060-58069
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 58070-58079
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58080-58089
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 58090-58099
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 58100-58109
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58110-58119
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 58120-58129
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58130-58139
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58140-58149
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 58150-58159
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 58160-58169
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58170-58179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 58180-58189
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 58190-58199
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58200-58209
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 58210-58219
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 58220-58229
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58230-58239
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 58240-58249
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 58250-58259
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58260-58269
+		1, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 58270-58279
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 58280-58289
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58290-58299
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 58300-58309
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58310-58319
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58320-58329
+		7, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 58330-58339
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 58340-58349
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 58350-58359
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 58360-58369
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 58370-58379
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58380-58389
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 58390-58399
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58400-58409
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 58410-58419
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 58420-58429
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 58430-58439
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58440-58449
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 58450-58459
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58460-58469
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58470-58479
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 58480-58489
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 58490-58499
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58500-58509
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 58510-58519
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58520-58529
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58530-58539
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 58540-58549
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58550-58559
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58560-58569
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 58570-58579
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 58580-58589
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58590-58599
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 58600-58609
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 58610-58619
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58620-58629
+		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 58630-58639
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58640-58649
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58650-58659
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58660-58669
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 58670-58679
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58680-58689
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 58690-58699
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58700-58709
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58710-58719
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58720-58729
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58730-58739
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58740-58749
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58750-58759
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58760-58769
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58770-58779
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 42, // 58780-58789
+		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 58790-58799
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 58800-58809
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 58810-58819
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58820-58829
+		1, 58, 57, 56, 55, 54, 53, 52, 51, 50, // 58830-58839
+		49, 48, 47, 46, 45, 44, 43, 42, 41, 40, // 58840-58849
+		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 58850-58859
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 58860-58869
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58870-58879
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 58880-58889
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58890-58899
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 58900-58909
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58910-58919
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58920-58929
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58930-58939
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 58940-58949
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 58950-58959
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 58960-58969
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 58970-58979
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58980-58989
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 58990-58999
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 59000-59009
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59010-59019
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 59020-59029
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59030-59039
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59040-59049
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 59050-59059
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 59060-59069
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 59070-59079
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 59080-59089
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 59090-59099
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 59100-59109
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 59110-59119
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 59120-59129
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59130-59139
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 59140-59149
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 59150-59159
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 59160-59169
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59170-59179
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 59180-59189
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 59190-59199
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 59200-59209
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 59210-59219
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59220-59229
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 59230-59239
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 59240-59249
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59250-59259
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 59260-59269
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 59270-59279
+		1, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 59280-59289
+		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 59290-59299
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 59300-59309
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 59310-59319
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59320-59329
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 59330-59339
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59340-59349
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 59350-59359
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 59360-59369
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 59370-59379
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 59380-59389
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 59390-59399
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 59400-59409
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 59410-59419
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59420-59429
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59430-59439
+		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 59440-59449
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 59450-59459
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 59460-59469
+		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 59470-59479
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 59480-59489
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 59490-59499
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 59500-59509
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 59510-59519
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 59520-59529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 59530-59539
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 59540-59549
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 59550-59559
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 59560-59569
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59570-59579
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 59580-59589
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59590-59599
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59600-59609
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 59610-59619
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 59620-59629
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59630-59639
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59640-59649
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 59650-59659
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 59660-59669
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 59670-59679
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59680-59689
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 59690-59699
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 59700-59709
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59710-59719
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 59720-59729
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59730-59739
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 59740-59749
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 59750-59759
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59760-59769
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 59770-59779
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59780-59789
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 59790-59799
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 59800-59809
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 59810-59819
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59820-59829
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 59830-59839
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 59840-59849
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59850-59859
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 59860-59869
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 59870-59879
+		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 59880-59889
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 59890-59899
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59900-59909
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59910-59919
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 59920-59929
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59930-59939
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59940-59949
+		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 59950-59959
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59960-59969
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59970-59979
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 59980-59989
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 59990-59999
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60000-60009
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 60010-60019
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 60020-60029
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 60030-60039
+		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 60040-60049
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 60050-60059
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60060-60069
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60070-60079
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 60080-60089
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60090-60099
+		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 60100-60109
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60110-60119
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60120-60129
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 60130-60139
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 60140-60149
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60150-60159
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 40, // 60160-60169
+		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 60170-60179
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 60180-60189
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60190-60199
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 60200-60209
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60210-60219
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 60220-60229
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 60230-60239
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60240-60249
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 60250-60259
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60260-60269
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60270-60279
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 60280-60289
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 60290-60299
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60300-60309
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 60310-60319
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60320-60329
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60330-60339
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 60340-60349
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 60350-60359
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60360-60369
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 60370-60379
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 60380-60389
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 60390-60399
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60400-60409
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 60410-60419
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 60420-60429
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60430-60439
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 60440-60449
+		7, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 60450-60459
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 60460-60469
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 60470-60479
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60480-60489
+		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 60490-60499
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 60500-60509
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60510-60519
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 60520-60529
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 50, // 60530-60539
+		49, 48, 47, 46, 45, 44, 43, 42, 41, 40, // 60540-60549
+		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 60550-60559
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 60560-60569
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60570-60579
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 60580-60589
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60590-60599
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 60600-60609
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60610-60619
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 60620-60629
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 60630-60639
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 60640-60649
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 60650-60659
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60660-60669
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 60670-60679
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 60680-60689
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60690-60699
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 60700-60709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 60710-60719
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60720-60729
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 60730-60739
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60740-60749
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 60750-60759
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 60760-60769
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 60770-60779
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60780-60789
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 60790-60799
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60800-60809
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60810-60819
+		1, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 60820-60829
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 60830-60839
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60840-60849
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 60850-60859
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 60860-60869
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60870-60879
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 60880-60889
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 60890-60899
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60900-60909
+		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 60910-60919
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 60920-60929
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60930-60939
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 60940-60949
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 60950-60959
+		1, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 60960-60969
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 60970-60979
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 60980-60989
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60990-60999
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 61000-61009
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 61010-61019
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 61020-61029
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61030-61039
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61040-61049
+		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 61050-61059
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 61060-61069
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61070-61079
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61080-61089
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 61090-61099
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61100-61109
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61110-61119
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 61120-61129
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61130-61139
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61140-61149
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 61150-61159
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 42, // 61160-61169
+		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 61170-61179
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 61180-61189
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61190-61199
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61200-61209
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61210-61219
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61220-61229
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61230-61239
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61240-61249
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61250-61259
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61260-61269
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61270-61279
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61280-61289
+		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 61290-61299
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 61300-61309
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61310-61319
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61320-61329
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 61330-61339
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 61340-61349
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61350-61359
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 61360-61369
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 61370-61379
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61380-61389
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61390-61399
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 61400-61409
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 61410-61419
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61420-61429
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61430-61439
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61440-61449
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61450-61459
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 61460-61469
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61470-61479
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 61480-61489
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 61490-61499
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 61500-61509
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 61510-61519
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61520-61529
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61530-61539
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 61540-61549
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 61550-61559
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61560-61569
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61570-61579
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 61580-61589
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61590-61599
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 61600-61609
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 61610-61619
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 61620-61629
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61630-61639
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61640-61649
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 61650-61659
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61660-61669
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61670-61679
+		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 61680-61689
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61690-61699
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 61700-61709
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61710-61719
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 61720-61729
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61730-61739
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61740-61749
+		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 61750-61759
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61760-61769
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61770-61779
+		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 61780-61789
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61790-61799
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61800-61809
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 61810-61819
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 61820-61829
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61830-61839
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 61840-61849
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61850-61859
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61860-61869
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 61870-61879
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 61880-61889
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 61890-61899
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 61900-61909
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 61910-61919
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61920-61929
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 61930-61939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 61940-61949
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61950-61959
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 61960-61969
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 61970-61979
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 61980-61989
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61990-61999
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 62000-62009
+		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 62010-62019
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62020-62029
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 62030-62039
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62040-62049
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 62050-62059
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62060-62069
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62070-62079
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62080-62089
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 62090-62099
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62100-62109
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 62110-62119
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 62120-62129
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 62130-62139
+		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 62140-62149
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 62150-62159
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62160-62169
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62170-62179
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 62180-62189
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62190-62199
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62200-62209
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 62210-62219
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62220-62229
+		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 62230-62239
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 62240-62249
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62250-62259
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62260-62269
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 62270-62279
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 62280-62289
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 62290-62299
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 62300-62309
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62310-62319
+		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 62320-62329
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 62330-62339
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 62340-62349
+		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 62350-62359
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62360-62369
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62370-62379
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 62380-62389
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62390-62399
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 62400-62409
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62410-62419
+		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 62420-62429
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 62430-62439
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62440-62449
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 62450-62459
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62460-62469
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 62470-62479
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 62480-62489
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 62490-62499
+		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 62500-62509
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62510-62519
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62520-62529
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 62530-62539
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 62540-62549
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62550-62559
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 62560-62569
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62570-62579
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62580-62589
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62590-62599
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 62600-62609
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 62610-62619
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62620-62629
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 62630-62639
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62640-62649
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 62650-62659
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62660-62669
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62670-62679
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 62680-62689
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62690-62699
+		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62700-62709
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62710-62719
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 62720-62729
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62730-62739
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 62740-62749
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 62750-62759
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62760-62769
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 62770-62779
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62780-62789
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62790-62799
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62800-62809
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 62810-62819
+		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 62820-62829
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 62830-62839
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62840-62849
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62850-62859
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 62860-62869
+		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 62870-62879
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 62880-62889
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62890-62899
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 62900-62909
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62910-62919
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 62920-62929
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 62930-62939
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 62940-62949
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62950-62959
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 62960-62969
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62970-62979
+		1, 2, 1, 4, 3, 2, 1, 2, 1, 40, // 62980-62989
+		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 62990-62999
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 63000-63009
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63010-63019
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63020-63029
+		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 63030-63039
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63040-63049
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 63050-63059
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63060-63069
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 63070-63079
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63080-63089
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63090-63099
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 63100-63109
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 63110-63119
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 63120-63129
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63130-63139
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 63140-63149
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 63150-63159
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63160-63169
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 63170-63179
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63180-63189
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 63190-63199
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63200-63209
+		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 63210-63219
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 63220-63229
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63230-63239
+		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 63240-63249
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 63250-63259
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63260-63269
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 63270-63279
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63280-63289
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 63290-63299
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63300-63309
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 63310-63319
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63320-63329
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63330-63339
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63340-63349
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 63350-63359
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63360-63369
+		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 63370-63379
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63380-63389
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 63390-63399
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 63400-63409
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63410-63419
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63420-63429
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 63430-63439
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 63440-63449
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63450-63459
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 63460-63469
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 63470-63479
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63480-63489
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 63490-63499
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 63500-63509
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63510-63519
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63520-63529
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 63530-63539
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63540-63549
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 63550-63559
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63560-63569
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63570-63579
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 63580-63589
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63590-63599
+		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 63600-63609
+		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 63610-63619
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 63620-63629
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63630-63639
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 63640-63649
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 63650-63659
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 63660-63669
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63670-63679
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63680-63689
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63690-63699
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 63700-63709
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 63710-63719
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63720-63729
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63730-63739
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 63740-63749
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63750-63759
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63760-63769
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 63770-63779
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63780-63789
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 63790-63799
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 63800-63809
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63810-63819
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 63820-63829
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63830-63839
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63840-63849
+		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 63850-63859
+		3, 2, 1, 38, 37, 36, 35, 34, 33, 32, // 63860-63869
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 63870-63879
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 63880-63889
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63890-63899
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63900-63909
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 63910-63919
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 63920-63929
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63930-63939
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 63940-63949
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 63950-63959
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63960-63969
+		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 63970-63979
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63980-63989
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63990-63999
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64000-64009
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 64010-64019
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64020-64029
+		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 64030-64039
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64040-64049
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64050-64059
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 64060-64069
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64070-64079
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64080-64089
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64090-64099
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 64100-64109
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64110-64119
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 64120-64129
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 64130-64139
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64140-64149
+		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 64150-64159
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64160-64169
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 64170-64179
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 64180-64189
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 64190-64199
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 64200-64209
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64210-64219
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 64220-64229
+		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 64230-64239
+		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 64240-64249
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 64250-64259
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64260-64269
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 64270-64279
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 64280-64289
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64290-64299
+		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 64300-64309
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 64310-64319
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64320-64329
+		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 64330-64339
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 64340-64349
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64350-64359
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64360-64369
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 64370-64379
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64380-64389
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 64390-64399
+		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 64400-64409
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64410-64419
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64420-64429
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 64430-64439
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64440-64449
+		1, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 64450-64459
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64460-64469
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64470-64479
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 64480-64489
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 64490-64499
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64500-64509
+		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 64510-64519
+		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 64520-64529
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64530-64539
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64540-64549
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 64550-64559
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 64560-64569
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 64570-64579
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64580-64589
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64590-64599
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 64600-64609
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 64610-64619
+		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64620-64629
+		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 64630-64639
+		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 64640-64649
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64650-64659
+		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 64660-64669
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 64670-64679
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64680-64689
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 64690-64699
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 64700-64709
+		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 64710-64719
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 64720-64729
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 64730-64739
+		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 64740-64749
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64750-64759
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 64760-64769
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64770-64779
+		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 64780-64789
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 64790-64799
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64800-64809
+		1, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 64810-64819
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 64820-64829
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64830-64839
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 64840-64849
+		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 64850-64859
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64860-64869
+		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 64870-64879
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64880-64889
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64890-64899
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64900-64909
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 64910-64919
+		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 64920-64929
+		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 64930-64939
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64940-64949
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64950-64959
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 64960-64969
+		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 64970-64979
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 64980-64989
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64990-64999
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 65000-65009
+		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65010-65019
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 65020-65029
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 65030-65039
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65040-65049
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 65050-65059
+		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 65060-65069
+		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 65070-65079
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 65080-65089
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 65090-65099
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 65100-65109
+		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 65110-65119
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 65120-65129
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 65130-65139
+		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 65140-65149
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65150-65159
+		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 65160-65169
+		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 65170-65179
+		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 65180-65189
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65190-65199
+		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 65200-65209
+		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 65210-65219
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 65220-65229
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 65230-65239
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65240-65249
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 65250-65259
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 65260-65269
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65270-65279
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 65280-65289
+		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 65290-65299
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 65300-65309
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65310-65319
+		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 65320-65329
+		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 65330-65339
+		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65340-65349
+		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 65350-65359
+		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 65360-65369
+		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 65370-65379
+		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65380-65389
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 65390-65399
+		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 65400-65409
+		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 65410-65419
+		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 65420-65429
+		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 65430-65439
+		7, 6, 5, 4, 3, 2, 1, 2, 1, 30, // 65440-65449
+		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 65450-65459
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 65460-65469
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 65470-65479
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65480-65489
+		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 65490-65499
+		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 65500-65509
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 65510-65519
+		1, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 65520-65529
+		0, 0, 0, 0, 0, 0,
+	}
+
+	lohi [256]struct{ lo, hi int }
+)
+
+func init() {
+	for i, v := range liars {
+		blk := v >> 24
+		x := &lohi[blk]
+		if x.lo == 0 || i < x.lo {
+			x.lo = i
+		}
+		if i > x.hi {
+			x.hi = i
+		}
+	}
+}
diff --git a/vendor/github.com/cznic/mathutil/test_deps.go b/vendor/github.com/cznic/mathutil/test_deps.go
new file mode 100644
index 0000000000..40054dcad2
--- /dev/null
+++ b/vendor/github.com/cznic/mathutil/test_deps.go
@@ -0,0 +1,11 @@
+// Copyright (c) 2014 The mathutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mathutil
+
+// Pull test dependencies too.
+// Enables easy 'go test X' after 'go get X'
+import (
+// nothing yet
+)
diff --git a/vendor/github.com/cznic/ql/LICENSE b/vendor/github.com/cznic/ql/LICENSE
new file mode 100644
index 0000000000..0d10c02b92
--- /dev/null
+++ b/vendor/github.com/cznic/ql/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The ql Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/cznic/ql/blob.go b/vendor/github.com/cznic/ql/blob.go
new file mode 100644
index 0000000000..2005b52c7e
--- /dev/null
+++ b/vendor/github.com/cznic/ql/blob.go
@@ -0,0 +1,155 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"bytes"
+	"encoding/gob"
+	"math/big"
+	"sync"
+	"time"
+)
+
+const shortBlob = 256 // bytes
+
+var (
+	gobInitDuration = time.Duration(278)
+	gobInitInt      = big.NewInt(42)
+	gobInitRat      = big.NewRat(355, 113)
+	gobInitTime     time.Time
+)
+
+func init() {
+	var err error
+	if gobInitTime, err = time.ParseInLocation(
+		"Jan 2, 2006 at 3:04pm (MST)",
+		"Jul 9, 2012 at 5:02am (CEST)",
+		time.FixedZone("XYZ", 1234),
+	); err != nil {
+		panic(err)
+	}
+	newGobCoder()
+}
+
+type gobCoder struct {
+	buf bytes.Buffer
+	dec *gob.Decoder
+	enc *gob.Encoder
+	mu  sync.Mutex
+}
+
+func newGobCoder() (g *gobCoder) {
+	g = &gobCoder{}
+	g.enc = gob.NewEncoder(&g.buf)
+	if err := g.enc.Encode(gobInitInt); err != nil {
+		panic(err)
+	}
+
+	if err := g.enc.Encode(gobInitRat); err != nil {
+		panic(err)
+	}
+
+	if err := g.enc.Encode(gobInitTime); err != nil {
+		panic(err)
+	}
+
+	if err := g.enc.Encode(gobInitDuration); err != nil {
+		panic(err)
+	}
+
+	g.dec = gob.NewDecoder(&g.buf)
+	i := big.NewInt(0)
+	if err := g.dec.Decode(i); err != nil {
+		panic(err)
+	}
+
+	r := big.NewRat(3, 5)
+	if err := g.dec.Decode(r); err != nil {
+		panic(err)
+	}
+
+	t := time.Now()
+	if err := g.dec.Decode(&t); err != nil {
+		panic(err)
+	}
+
+	var d time.Duration
+	if err := g.dec.Decode(&d); err != nil {
+		panic(err)
+	}
+
+	return
+}
+
+func isBlobType(v interface{}) (bool, Type) {
+	switch v.(type) {
+	case []byte:
+		return true, Blob
+	case *big.Int:
+		return true, BigInt
+	case *big.Rat:
+		return true, BigRat
+	case time.Time:
+		return true, Time
+	case time.Duration:
+		return true, Duration
+	default:
+		return false, -1
+	}
+}
+
+func (g *gobCoder) encode(v interface{}) (b []byte, err error) {
+	g.mu.Lock()
+	defer g.mu.Unlock()
+
+	g.buf.Reset()
+	switch x := v.(type) {
+	case []byte:
+		return x, nil
+	case *big.Int:
+		err = g.enc.Encode(x)
+	case *big.Rat:
+		err = g.enc.Encode(x)
+	case time.Time:
+		err = g.enc.Encode(x)
+	case time.Duration:
+		err = g.enc.Encode(int64(x))
+	default:
+		panic("internal error 002")
+	}
+	b = g.buf.Bytes()
+	return
+}
+
+func (g *gobCoder) decode(b []byte, typ int) (v interface{}, err error) {
+	g.mu.Lock()
+	defer g.mu.Unlock()
+
+	g.buf.Reset()
+	g.buf.Write(b)
+	switch typ {
+	case qBlob:
+		return b, nil
+	case qBigInt:
+		x := big.NewInt(0)
+		err = g.dec.Decode(&x)
+		v = x
+	case qBigRat:
+		x := big.NewRat(1, 1)
+		err = g.dec.Decode(&x)
+		v = x
+	case qTime:
+		var x time.Time
+		err = g.dec.Decode(&x)
+		v = x
+	case qDuration:
+		var x int64
+		err = g.dec.Decode(&x)
+		v = time.Duration(x)
+	default:
+		panic("internal error 003")
+	}
+	return
+}
diff --git a/vendor/github.com/cznic/ql/btree.go b/vendor/github.com/cznic/ql/btree.go
new file mode 100644
index 0000000000..2b588b70d8
--- /dev/null
+++ b/vendor/github.com/cznic/ql/btree.go
@@ -0,0 +1,725 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"io"
+)
+
+const (
+	kx = 128 //DONE benchmark tune this number if using custom key/value type(s).
+	kd = 64  //DONE benchmark tune this number if using custom key/value type(s).
+)
+
+type (
+	// cmp compares a and b. Return value is:
+	//
+	//	< 0 if a <  b
+	//	  0 if a == b
+	//	> 0 if a >  b
+	//
+	cmp func(a, b []interface{}) int
+
+	d struct { // data page
+		c int
+		d [2*kd + 1]de
+		n *d
+		p *d
+	}
+
+	de struct { // d element
+		k []interface{}
+		v []interface{}
+	}
+
+	enumerator struct {
+		err error
+		hit bool
+		i   int
+		k   []interface{}
+		q   *d
+		t   *tree
+		ver int64
+	}
+
+	// tree is a B+tree.
+	tree struct {
+		c     int
+		cmp   cmp
+		first *d
+		last  *d
+		r     interface{}
+		ver   int64
+	}
+
+	xe struct { // x element
+		ch  interface{}
+		sep *d
+	}
+
+	x struct { // index page
+		c int
+		x [2*kx + 2]xe
+	}
+)
+
+var ( // R/O zero values
+	zd  d
+	zde de
+	zx  x
+	zxe xe
+)
+
+func clr(q interface{}) {
+	switch z := q.(type) {
+	case *x:
+		for i := 0; i <= z.c; i++ { // Ch0 Sep0 ... Chn-1 Sepn-1 Chn
+			clr(z.x[i].ch)
+		}
+		*z = zx // GC
+	case *d:
+		*z = zd // GC
+	}
+}
+
+// -------------------------------------------------------------------------- x
+
+func newX(ch0 interface{}) *x {
+	r := &x{}
+	r.x[0].ch = ch0
+	return r
+}
+
+func (q *x) extract(i int) {
+	q.c--
+	if i < q.c {
+		copy(q.x[i:], q.x[i+1:q.c+1])
+		q.x[q.c].ch = q.x[q.c+1].ch
+		q.x[q.c].sep = nil // GC
+		q.x[q.c+1] = zxe   // GC
+	}
+}
+
+func (q *x) insert(i int, d *d, ch interface{}) *x {
+	c := q.c
+	if i < c {
+		q.x[c+1].ch = q.x[c].ch
+		copy(q.x[i+2:], q.x[i+1:c])
+		q.x[i+1].sep = q.x[i].sep
+	}
+	c++
+	q.c = c
+	q.x[i].sep = d
+	q.x[i+1].ch = ch
+	return q
+}
+
+func (q *x) siblings(i int) (l, r *d) {
+	if i >= 0 {
+		if i > 0 {
+			l = q.x[i-1].ch.(*d)
+		}
+		if i < q.c {
+			r = q.x[i+1].ch.(*d)
+		}
+	}
+	return
+}
+
+// -------------------------------------------------------------------------- d
+
+func (l *d) mvL(r *d, c int) {
+	copy(l.d[l.c:], r.d[:c])
+	copy(r.d[:], r.d[c:r.c])
+	l.c += c
+	r.c -= c
+}
+
+func (l *d) mvR(r *d, c int) {
+	copy(r.d[c:], r.d[:r.c])
+	copy(r.d[:c], l.d[l.c-c:])
+	r.c += c
+	l.c -= c
+}
+
+// ----------------------------------------------------------------------- tree
+
+// treeNew returns a newly created, empty tree. The compare function is used
+// for key collation.
+func treeNew(cmp cmp) *tree {
+	return &tree{cmp: cmp}
+}
+
+// Clear removes all K/V pairs from the tree.
+func (t *tree) Clear() {
+	if t.r == nil {
+		return
+	}
+
+	clr(t.r)
+	t.c, t.first, t.last, t.r = 0, nil, nil, nil
+	t.ver++
+}
+
+func (t *tree) cat(p *x, q, r *d, pi int) {
+	t.ver++
+	q.mvL(r, r.c)
+	if r.n != nil {
+		r.n.p = q
+	} else {
+		t.last = q
+	}
+	q.n = r.n
+	if p.c > 1 {
+		p.extract(pi)
+		p.x[pi].ch = q
+	} else {
+		t.r = q
+	}
+}
+
+func (t *tree) catX(p, q, r *x, pi int) {
+	t.ver++
+	q.x[q.c].sep = p.x[pi].sep
+	copy(q.x[q.c+1:], r.x[:r.c])
+	q.c += r.c + 1
+	q.x[q.c].ch = r.x[r.c].ch
+	if p.c > 1 {
+		p.c--
+		pc := p.c
+		if pi < pc {
+			p.x[pi].sep = p.x[pi+1].sep
+			copy(p.x[pi+1:], p.x[pi+2:pc+1])
+			p.x[pc].ch = p.x[pc+1].ch
+			p.x[pc].sep = nil  // GC
+			p.x[pc+1].ch = nil // GC
+		}
+		return
+	}
+
+	t.r = q
+}
+
+//Delete removes the k's KV pair, if it exists, in which case Delete returns
+//true.
+func (t *tree) Delete(k []interface{}) (ok bool) {
+	pi := -1
+	var p *x
+	q := t.r
+	if q == nil {
+		return
+	}
+
+	for {
+		var i int
+		i, ok = t.find(q, k)
+		if ok {
+			switch z := q.(type) {
+			case *x:
+				dp := z.x[i].sep
+				switch {
+				case dp.c > kd:
+					t.extract(dp, 0)
+				default:
+					if z.c < kx && q != t.r {
+						t.underflowX(p, &z, pi, &i)
+					}
+					pi = i + 1
+					p = z
+					q = z.x[pi].ch
+					ok = false
+					continue
+				}
+			case *d:
+				t.extract(z, i)
+				if z.c >= kd {
+					return
+				}
+
+				if q != t.r {
+					t.underflow(p, z, pi)
+				} else if t.c == 0 {
+					t.Clear()
+				}
+			}
+			return
+		}
+
+		switch z := q.(type) {
+		case *x:
+			if z.c < kx && q != t.r {
+				t.underflowX(p, &z, pi, &i)
+			}
+			pi = i
+			p = z
+			q = z.x[i].ch
+		case *d:
+			return
+		}
+	}
+}
+
+func (t *tree) extract(q *d, i int) { // (r []interface{}) {
+	t.ver++
+	//r = q.d[i].v // prepared for Extract
+	q.c--
+	if i < q.c {
+		copy(q.d[i:], q.d[i+1:q.c+1])
+	}
+	q.d[q.c] = zde // GC
+	t.c--
+	return
+}
+
+func (t *tree) find(q interface{}, k []interface{}) (i int, ok bool) {
+	var mk []interface{}
+	l := 0
+	switch z := q.(type) {
+	case *x:
+		h := z.c - 1
+		for l <= h {
+			m := (l + h) >> 1
+			mk = z.x[m].sep.d[0].k
+			switch cmp := t.cmp(k, mk); {
+			case cmp > 0:
+				l = m + 1
+			case cmp == 0:
+				return m, true
+			default:
+				h = m - 1
+			}
+		}
+	case *d:
+		h := z.c - 1
+		for l <= h {
+			m := (l + h) >> 1
+			mk = z.d[m].k
+			switch cmp := t.cmp(k, mk); {
+			case cmp > 0:
+				l = m + 1
+			case cmp == 0:
+				return m, true
+			default:
+				h = m - 1
+			}
+		}
+	}
+	return l, false
+}
+
+// First returns the first item of the tree in the key collating order, or
+// (nil, nil) if the tree is empty.
+func (t *tree) First() (k []interface{}, v []interface{}) {
+	if q := t.first; q != nil {
+		q := &q.d[0]
+		k, v = q.k, q.v
+	}
+	return
+}
+
+// Get returns the value associated with k and true if it exists. Otherwise Get
+// returns (nil, false).
+func (t *tree) Get(k []interface{}) (v []interface{}, ok bool) {
+	q := t.r
+	if q == nil {
+		return
+	}
+
+	for {
+		var i int
+		if i, ok = t.find(q, k); ok {
+			switch z := q.(type) {
+			case *x:
+				return z.x[i].sep.d[0].v, true
+			case *d:
+				return z.d[i].v, true
+			}
+		}
+		switch z := q.(type) {
+		case *x:
+			q = z.x[i].ch
+		default:
+			return
+		}
+	}
+}
+
+func (t *tree) insert(q *d, i int, k []interface{}, v []interface{}) *d {
+	t.ver++
+	c := q.c
+	if i < c {
+		copy(q.d[i+1:], q.d[i:c])
+	}
+	c++
+	q.c = c
+	q.d[i].k, q.d[i].v = k, v
+	t.c++
+	return q
+}
+
+// Last returns the last item of the tree in the key collating order, or (nil,
+// nil) if the tree is empty.
+func (t *tree) Last() (k []interface{}, v []interface{}) {
+	if q := t.last; q != nil {
+		q := &q.d[q.c-1]
+		k, v = q.k, q.v
+	}
+	return
+}
+
+// Len returns the number of items in the tree.
+func (t *tree) Len() int {
+	return t.c
+}
+
+func (t *tree) overflow(p *x, q *d, pi, i int, k []interface{}, v []interface{}) {
+	t.ver++
+	l, r := p.siblings(pi)
+
+	if l != nil && l.c < 2*kd && i > 0 {
+		l.mvL(q, 1)
+		t.insert(q, i-1, k, v)
+		return
+	}
+
+	if r != nil && r.c < 2*kd {
+		if i < 2*kd {
+			q.mvR(r, 1)
+			t.insert(q, i, k, v)
+		} else {
+			t.insert(r, 0, k, v)
+		}
+		return
+	}
+
+	t.split(p, q, pi, i, k, v)
+}
+
+// Seek returns an enumerator positioned on a an item such that k >= item's
+// key. ok reports if k == item.key The enumerator's position is possibly
+// after the last item in the tree.
+func (t *tree) Seek(k []interface{}) (e *enumerator, ok bool) {
+	q := t.r
+	if q == nil {
+		e = &enumerator{nil, false, 0, k, nil, t, t.ver}
+		return
+	}
+
+	for {
+		var i int
+		if i, ok = t.find(q, k); ok {
+			switch z := q.(type) {
+			case *x:
+				e = &enumerator{nil, ok, 0, k, z.x[i].sep, t, t.ver}
+				return
+			case *d:
+				e = &enumerator{nil, ok, i, k, z, t, t.ver}
+				return
+			}
+		}
+		switch z := q.(type) {
+		case *x:
+			q = z.x[i].ch
+		case *d:
+			e = &enumerator{nil, ok, i, k, z, t, t.ver}
+			return
+		}
+	}
+}
+
+// SeekFirst returns an enumerator positioned on the first KV pair in the tree,
+// if any. For an empty tree, err == io.EOF is returned and e will be nil.
+func (t *tree) SeekFirst() (e *enumerator, err error) {
+	q := t.first
+	if q == nil {
+		return nil, io.EOF
+	}
+
+	return &enumerator{nil, true, 0, q.d[0].k, q, t, t.ver}, nil
+}
+
+// SeekLast returns an enumerator positioned on the last KV pair in the tree,
+// if any. For an empty tree, err == io.EOF is returned and e will be nil.
+func (t *tree) SeekLast() (e *enumerator, err error) {
+	q := t.last
+	if q == nil {
+		return nil, io.EOF
+	}
+
+	return &enumerator{nil, true, q.c - 1, q.d[q.c-1].k, q, t, t.ver}, nil
+}
+
+// Set sets the value associated with k.
+func (t *tree) Set(k []interface{}, v []interface{}) {
+	pi := -1
+	var p *x
+	q := t.r
+	if q != nil {
+		for {
+			i, ok := t.find(q, k)
+			if ok {
+				switch z := q.(type) {
+				case *x:
+					z.x[i].sep.d[0].v = v
+				case *d:
+					z.d[i].v = v
+				}
+				return
+			}
+
+			switch z := q.(type) {
+			case *x:
+				if z.c > 2*kx {
+					t.splitX(p, &z, pi, &i)
+				}
+				pi = i
+				p = z
+				q = z.x[i].ch
+			case *d:
+				switch {
+				case z.c < 2*kd:
+					t.insert(z, i, k, v)
+				default:
+					t.overflow(p, z, pi, i, k, v)
+				}
+				return
+			}
+		}
+	}
+
+	z := t.insert(&d{}, 0, k, v)
+	t.r, t.first, t.last = z, z, z
+	return
+}
+
+func (t *tree) split(p *x, q *d, pi, i int, k []interface{}, v []interface{}) {
+	t.ver++
+	r := &d{}
+	if q.n != nil {
+		r.n = q.n
+		r.n.p = r
+	} else {
+		t.last = r
+	}
+	q.n = r
+	r.p = q
+
+	copy(r.d[:], q.d[kd:2*kd])
+	for i := range q.d[kd:] {
+		q.d[kd+i] = zde
+	}
+	q.c = kd
+	r.c = kd
+	if pi >= 0 {
+		p.insert(pi, r, r)
+	} else {
+		t.r = newX(q).insert(0, r, r)
+	}
+	if i > kd {
+		t.insert(r, i-kd, k, v)
+		return
+	}
+
+	t.insert(q, i, k, v)
+}
+
+func (t *tree) splitX(p *x, pp **x, pi int, i *int) {
+	t.ver++
+	q := *pp
+	r := &x{}
+	copy(r.x[:], q.x[kx+1:])
+	q.c = kx
+	r.c = kx
+	if pi >= 0 {
+		p.insert(pi, q.x[kx].sep, r)
+	} else {
+		t.r = newX(q).insert(0, q.x[kx].sep, r)
+	}
+	q.x[kx].sep = nil
+	for i := range q.x[kx+1:] {
+		q.x[kx+i+1] = zxe
+	}
+	if *i > kx {
+		*pp = r
+		*i -= kx + 1
+	}
+}
+
+func (t *tree) underflow(p *x, q *d, pi int) {
+	t.ver++
+	l, r := p.siblings(pi)
+
+	if l != nil && l.c+q.c >= 2*kd {
+		l.mvR(q, 1)
+	} else if r != nil && q.c+r.c >= 2*kd {
+		q.mvL(r, 1)
+		r.d[r.c] = zde // GC
+	} else if l != nil {
+		t.cat(p, l, q, pi-1)
+	} else {
+		t.cat(p, q, r, pi)
+	}
+}
+
+func (t *tree) underflowX(p *x, pp **x, pi int, i *int) {
+	t.ver++
+	var l, r *x
+	q := *pp
+
+	if pi >= 0 {
+		if pi > 0 {
+			l = p.x[pi-1].ch.(*x)
+		}
+		if pi < p.c {
+			r = p.x[pi+1].ch.(*x)
+		}
+	}
+
+	if l != nil && l.c > kx {
+		q.x[q.c+1].ch = q.x[q.c].ch
+		copy(q.x[1:], q.x[:q.c])
+		q.x[0].ch = l.x[l.c].ch
+		q.x[0].sep = p.x[pi-1].sep
+		q.c++
+		*i++
+		l.c--
+		p.x[pi-1].sep = l.x[l.c].sep
+		return
+	}
+
+	if r != nil && r.c > kx {
+		q.x[q.c].sep = p.x[pi].sep
+		q.c++
+		q.x[q.c].ch = r.x[0].ch
+		p.x[pi].sep = r.x[0].sep
+		copy(r.x[:], r.x[1:r.c])
+		r.c--
+		rc := r.c
+		r.x[rc].ch = r.x[rc+1].ch
+		r.x[rc].sep = nil
+		r.x[rc+1].ch = nil
+		return
+	}
+
+	if l != nil {
+		*i += l.c + 1
+		t.catX(p, l, q, pi-1)
+		*pp = l
+		return
+	}
+
+	t.catX(p, q, r, pi)
+}
+
+// ----------------------------------------------------------------- enumerator
+
+// Next returns the currently enumerated item, if it exists and moves to the
+// next item in the key collation order. If there is no item to return, err ==
+// io.EOF is returned.
+func (e *enumerator) Next() (k []interface{}, v []interface{}, err error) {
+	if err = e.err; err != nil {
+		return
+	}
+
+	if e.ver != e.t.ver {
+		f, hit := e.t.Seek(e.k)
+		if !e.hit && hit {
+			if err = f.next(); err != nil {
+				return
+			}
+		}
+
+		*e = *f
+	}
+	if e.q == nil {
+		e.err, err = io.EOF, io.EOF
+		return
+	}
+
+	if e.i >= e.q.c {
+		if err = e.next(); err != nil {
+			return
+		}
+	}
+
+	i := e.q.d[e.i]
+	k, v = i.k, i.v
+	e.k, e.hit = k, false
+	e.next()
+	return
+}
+
+func (e *enumerator) next() error {
+	if e.q == nil {
+		e.err = io.EOF
+		return io.EOF
+	}
+
+	switch {
+	case e.i < e.q.c-1:
+		e.i++
+	default:
+		if e.q, e.i = e.q.n, 0; e.q == nil {
+			e.err = io.EOF
+		}
+	}
+	return e.err
+}
+
+// Prev returns the currently enumerated item, if it exists and moves to the
+// previous item in the key collation order. If there is no item to return, err
+// == io.EOF is returned.
+func (e *enumerator) Prev() (k []interface{}, v []interface{}, err error) {
+	if err = e.err; err != nil {
+		return
+	}
+
+	if e.ver != e.t.ver {
+		f, hit := e.t.Seek(e.k)
+		if !e.hit && hit {
+			if err = f.prev(); err != nil {
+				return
+			}
+		}
+
+		*e = *f
+	}
+	if e.q == nil {
+		e.err, err = io.EOF, io.EOF
+		return
+	}
+
+	if e.i >= e.q.c {
+		if err = e.next(); err != nil {
+			return
+		}
+	}
+
+	i := e.q.d[e.i]
+	k, v = i.k, i.v
+	e.k, e.hit = k, false
+	e.prev()
+	return
+}
+
+func (e *enumerator) prev() error {
+	if e.q == nil {
+		e.err = io.EOF
+		return io.EOF
+	}
+
+	switch {
+	case e.i > 0:
+		e.i--
+	default:
+		if e.q = e.q.p; e.q == nil {
+			e.err = io.EOF
+			break
+		}
+
+		e.i = e.q.c - 1
+	}
+	return e.err
+}
diff --git a/vendor/github.com/cznic/ql/builtin.go b/vendor/github.com/cznic/ql/builtin.go
new file mode 100644
index 0000000000..1c4bc1c1af
--- /dev/null
+++ b/vendor/github.com/cznic/ql/builtin.go
@@ -0,0 +1,991 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"fmt"
+	"math/rand"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+)
+
+//TODO agg bigint, bigrat, time, duration
+
+var builtin = map[string]struct {
+	f           func([]interface{}, map[interface{}]interface{}) (interface{}, error)
+	minArgs     int
+	maxArgs     int
+	isStatic    bool
+	isAggregate bool
+}{
+	"__testBlob":   {builtinTestBlob, 1, 1, true, false},
+	"__testString": {builtinTestString, 1, 1, true, false},
+	"avg":          {builtinAvg, 1, 1, false, true},
+	"complex":      {builtinComplex, 2, 2, true, false},
+	"contains":     {builtinContains, 2, 2, true, false},
+	"count":        {builtinCount, 0, 1, false, true},
+	"date":         {builtinDate, 8, 8, true, false},
+	"day":          {builtinDay, 1, 1, true, false},
+	"formatTime":   {builtinFormatTime, 2, 2, true, false},
+	"formatFloat":  {builtinFormatFloat, 1, 4, true, false},
+	"formatInt":    {builtinFormatInt, 1, 2, true, false},
+	"hasPrefix":    {builtinHasPrefix, 2, 2, true, false},
+	"hasSuffix":    {builtinHasSuffix, 2, 2, true, false},
+	"hour":         {builtinHour, 1, 1, true, false},
+	"hours":        {builtinHours, 1, 1, true, false},
+	"id":           {builtinID, 0, 1, false, false},
+	"imag":         {builtinImag, 1, 1, true, false},
+	"len":          {builtinLen, 1, 1, true, false},
+	"max":          {builtinMax, 1, 1, false, true},
+	"min":          {builtinMin, 1, 1, false, true},
+	"minute":       {builtinMinute, 1, 1, true, false},
+	"minutes":      {builtinMinutes, 1, 1, true, false},
+	"month":        {builtinMonth, 1, 1, true, false},
+	"nanosecond":   {builtinNanosecond, 1, 1, true, false},
+	"nanoseconds":  {builtinNanoseconds, 1, 1, true, false},
+	"now":          {builtinNow, 0, 0, false, false},
+	"parseTime":    {builtinParseTime, 2, 2, true, false},
+	"real":         {builtinReal, 1, 1, true, false},
+	"second":       {builtinSecond, 1, 1, true, false},
+	"seconds":      {builtinSeconds, 1, 1, true, false},
+	"since":        {builtinSince, 1, 1, false, false},
+	"sum":          {builtinSum, 1, 1, false, true},
+	"timeIn":       {builtinTimeIn, 2, 2, true, false},
+	"weekday":      {builtinWeekday, 1, 1, true, false},
+	"year":         {builtinYear, 1, 1, true, false},
+	"yearDay":      {builtinYearday, 1, 1, true, false},
+}
+
+func badNArgs(min int, s string, arg []interface{}) error {
+	a := []string{}
+	for _, v := range arg {
+		a = append(a, fmt.Sprintf("%v", v))
+	}
+	switch len(arg) < min {
+	case true:
+		return fmt.Errorf("missing argument to %s(%s)", s, strings.Join(a, ", "))
+	default: //case false:
+		return fmt.Errorf("too many arguments to %s(%s)", s, strings.Join(a, ", "))
+	}
+}
+
+func invArg(arg interface{}, s string) error {
+	return fmt.Errorf("invalid argument %v (type %T) for %s", arg, arg, s)
+}
+
+func builtinTestBlob(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	n, err := intExpr(arg[0])
+	if err != nil {
+		return nil, err
+	}
+
+	rng := rand.New(rand.NewSource(n))
+	b := make([]byte, n)
+	for i := range b {
+		b[i] = byte(rng.Int())
+	}
+	return b, nil
+}
+
+func builtinTestString(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	n, err := intExpr(arg[0])
+	if err != nil {
+		return nil, err
+	}
+
+	rng := rand.New(rand.NewSource(n))
+	b := make([]byte, n)
+	for i := range b {
+		b[i] = byte(rng.Int())
+	}
+	return string(b), nil
+}
+
+func builtinAvg(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	type avg struct {
+		sum interface{}
+		n   uint64
+	}
+
+	if _, ok := ctx["$agg0"]; ok {
+		return
+	}
+
+	fn := ctx["$fn"]
+	if _, ok := ctx["$agg"]; ok {
+		data, ok := ctx[fn].(avg)
+		if !ok {
+			return
+		}
+
+		switch x := data.sum.(type) {
+		case complex64:
+			return complex64(complex128(x) / complex(float64(data.n), 0)), nil
+		case complex128:
+			return complex64(complex128(x) / complex(float64(data.n), 0)), nil
+		case float32:
+			return float32(float64(x) / float64(data.n)), nil
+		case float64:
+			return float64(x) / float64(data.n), nil
+		case int8:
+			return int8(int64(x) / int64(data.n)), nil
+		case int16:
+			return int16(int64(x) / int64(data.n)), nil
+		case int32:
+			return int32(int64(x) / int64(data.n)), nil
+		case int64:
+			return int64(int64(x) / int64(data.n)), nil
+		case uint8:
+			return uint8(uint64(x) / data.n), nil
+		case uint16:
+			return uint16(uint64(x) / data.n), nil
+		case uint32:
+			return uint32(uint64(x) / data.n), nil
+		case uint64:
+			return uint64(uint64(x) / data.n), nil
+		}
+
+	}
+
+	data, _ := ctx[fn].(avg)
+	y := arg[0]
+	if y == nil {
+		return
+	}
+
+	switch x := data.sum.(type) {
+	case nil:
+		switch y := y.(type) {
+		case float32, float64, int8, int16, int32, int64, uint8, uint16, uint32, uint64:
+			data = avg{y, 0}
+		default:
+			return nil, fmt.Errorf("avg: cannot accept %v (value if type %T)", y, y)
+		}
+	case complex64:
+		data.sum = x + y.(complex64)
+	case complex128:
+		data.sum = x + y.(complex128)
+	case float32:
+		data.sum = x + y.(float32)
+	case float64:
+		data.sum = x + y.(float64)
+	case int8:
+		data.sum = x + y.(int8)
+	case int16:
+		data.sum = x + y.(int16)
+	case int32:
+		data.sum = x + y.(int32)
+	case int64:
+		data.sum = x + y.(int64)
+	case uint8:
+		data.sum = x + y.(uint8)
+	case uint16:
+		data.sum = x + y.(uint16)
+	case uint32:
+		data.sum = x + y.(uint32)
+	case uint64:
+		data.sum = x + y.(uint64)
+	}
+	data.n++
+	ctx[fn] = data
+	return
+}
+
+func builtinComplex(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
+	re, im := arg[0], arg[1]
+	if re == nil || im == nil {
+		return nil, nil
+	}
+
+	re, im = coerce(re, im)
+	if reflect.TypeOf(re) != reflect.TypeOf(im) {
+		return nil, fmt.Errorf("complex(%T(%#v), %T(%#v)): invalid types", re, re, im, im)
+	}
+
+	switch re := re.(type) {
+	case idealFloat:
+		return idealComplex(complex(float64(re), float64(im.(idealFloat)))), nil
+	case idealInt:
+		return idealComplex(complex(float64(re), float64(im.(idealInt)))), nil
+	case idealRune:
+		return idealComplex(complex(float64(re), float64(im.(idealRune)))), nil
+	case idealUint:
+		return idealComplex(complex(float64(re), float64(im.(idealUint)))), nil
+	case float32:
+		return complex(float32(re), im.(float32)), nil
+	case float64:
+		return complex(float64(re), im.(float64)), nil
+	case int8:
+		return complex(float64(re), float64(im.(int8))), nil
+	case int16:
+		return complex(float64(re), float64(im.(int16))), nil
+	case int32:
+		return complex(float64(re), float64(im.(int32))), nil
+	case int64:
+		return complex(float64(re), float64(im.(int64))), nil
+	case uint8:
+		return complex(float64(re), float64(im.(uint8))), nil
+	case uint16:
+		return complex(float64(re), float64(im.(uint16))), nil
+	case uint32:
+		return complex(float64(re), float64(im.(uint32))), nil
+	case uint64:
+		return complex(float64(re), float64(im.(uint64))), nil
+	default:
+		return nil, invArg(re, "complex")
+	}
+}
+
+func builtinContains(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
+	switch s := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case string:
+		switch chars := arg[1].(type) {
+		case nil:
+			return nil, nil
+		case string:
+			return strings.Contains(s, chars), nil
+		default:
+			return nil, invArg(chars, "string")
+		}
+	default:
+		return nil, invArg(s, "string")
+	}
+}
+
+func builtinCount(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	if _, ok := ctx["$agg0"]; ok {
+		return int64(0), nil
+	}
+
+	fn := ctx["$fn"]
+	if _, ok := ctx["$agg"]; ok {
+		return ctx[fn].(int64), nil
+	}
+
+	n, _ := ctx[fn].(int64)
+	switch len(arg) {
+	case 0:
+		n++
+	case 1:
+		if arg[0] != nil {
+			n++
+		}
+	default:
+		panic("internal error 067")
+	}
+	ctx[fn] = n
+	return
+}
+
+func builtinDate(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
+	for i, v := range arg {
+		switch i {
+		case 7:
+			switch x := v.(type) {
+			case string:
+			default:
+				return nil, invArg(x, "date")
+			}
+		default:
+			switch x := v.(type) {
+			case int64:
+			case idealInt:
+				arg[i] = int64(x)
+			default:
+				return nil, invArg(x, "date")
+			}
+		}
+	}
+
+	sloc := arg[7].(string)
+	loc := time.Local
+	switch sloc {
+	case "local":
+	default:
+		loc, err = time.LoadLocation(sloc)
+		if err != nil {
+			return
+		}
+	}
+
+	return time.Date(
+		int(arg[0].(int64)),
+		time.Month(arg[1].(int64)),
+		int(arg[2].(int64)),
+		int(arg[3].(int64)),
+		int(arg[4].(int64)),
+		int(arg[5].(int64)),
+		int(arg[6].(int64)),
+		loc,
+	), nil
+}
+
+func builtinLen(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case string:
+		return int64(len(x)), nil
+	default:
+		return nil, invArg(x, "len")
+	}
+}
+
+func builtinDay(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return int64(x.Day()), nil
+	default:
+		return nil, invArg(x, "day")
+	}
+}
+
+func builtinFormatTime(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		switch y := arg[1].(type) {
+		case nil:
+			return nil, nil
+		case string:
+			return x.Format(y), nil
+		default:
+			return nil, invArg(y, "formatTime")
+		}
+	default:
+		return nil, invArg(x, "formatTime")
+	}
+}
+
+func builtinFormatFloat(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	var val float64
+	var fmt byte = 'g'
+
+	prec := -1
+	bitSize := 64
+
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case float32:
+		val = float64(x)
+		bitSize = 32
+	case float64:
+		val = x
+	default:
+		return nil, invArg(x, "formatFloat")
+	}
+
+	switch len(arg) {
+	case 4:
+		arg3 := coerce1(arg[3], int64(0))
+		switch y := arg3.(type) {
+		case nil:
+			return nil, nil
+		case int64:
+			bitSize = int(y)
+		default:
+			return nil, invArg(y, "formatFloat")
+		}
+		fallthrough
+	case 3:
+		arg2 := coerce1(arg[2], int64(0))
+		switch y := arg2.(type) {
+		case nil:
+			return nil, nil
+		case int64:
+			prec = int(y)
+		default:
+			return nil, invArg(y, "formatFloat")
+		}
+		fallthrough
+	case 2:
+		arg1 := coerce1(arg[1], byte(0))
+		switch y := arg1.(type) {
+		case nil:
+			return nil, nil
+		case byte:
+			fmt = y
+		default:
+			return nil, invArg(y, "formatFloat")
+		}
+	}
+
+	return strconv.FormatFloat(val, fmt, prec, bitSize), nil
+}
+
+func builtinFormatInt(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	var intVal int64
+	var uintVal uint64
+
+	uintType := false
+	base := 10
+
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case int8:
+		intVal = int64(x)
+	case int16:
+		intVal = int64(x)
+	case int32:
+		intVal = int64(x)
+	case int64:
+		intVal = x
+	case uint8:
+		uintType = true
+		uintVal = uint64(x)
+	case uint16:
+		uintType = true
+		uintVal = uint64(x)
+	case uint32:
+		uintType = true
+		uintVal = uint64(x)
+	case uint64:
+		uintType = true
+		uintVal = x
+	default:
+		return nil, invArg(x, "formatInt")
+	}
+
+	switch len(arg) {
+	case 2:
+		arg1 := coerce1(arg[1], int64(0))
+		switch y := arg1.(type) {
+		case nil:
+			return nil, nil
+		case int64:
+			base = int(y)
+		default:
+			return nil, invArg(y, "formatInt")
+		}
+	}
+
+	if uintType {
+		return strconv.FormatUint(uintVal, base), nil
+	}
+
+	return strconv.FormatInt(intVal, base), nil
+}
+
+func builtinHasPrefix(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
+	switch s := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case string:
+		switch prefix := arg[1].(type) {
+		case nil:
+			return nil, nil
+		case string:
+			return strings.HasPrefix(s, prefix), nil
+		default:
+			return nil, invArg(prefix, "string")
+		}
+	default:
+		return nil, invArg(s, "string")
+	}
+}
+
+func builtinHasSuffix(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
+	switch s := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case string:
+		switch suffix := arg[1].(type) {
+		case nil:
+			return nil, nil
+		case string:
+			return strings.HasSuffix(s, suffix), nil
+		default:
+			return nil, invArg(suffix, "string")
+		}
+	default:
+		return nil, invArg(s, "string")
+	}
+}
+
+func builtinHour(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return int64(x.Hour()), nil
+	default:
+		return nil, invArg(x, "hour")
+	}
+}
+
+func builtinHours(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Duration:
+		return x.Hours(), nil
+	default:
+		return nil, invArg(x, "hours")
+	}
+}
+
+func builtinID(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := ctx["$id"].(type) {
+	case map[string]interface{}:
+		if len(arg) == 0 {
+			return nil, nil
+		}
+
+		tab := arg[0].(*ident)
+		id, ok := x[tab.s]
+		if !ok {
+			return nil, fmt.Errorf("value not available: id(%s)", tab)
+		}
+
+		if _, ok := id.(int64); ok {
+			return id, nil
+		}
+
+		return nil, fmt.Errorf("value not available: id(%s)", tab)
+	case int64:
+		return x, nil
+	default:
+		return nil, nil
+	}
+}
+
+func builtinImag(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case idealComplex:
+		return imag(x), nil
+	case complex64:
+		return imag(x), nil
+	case complex128:
+		return imag(x), nil
+	default:
+		return nil, invArg(x, "imag")
+	}
+}
+
+func builtinMax(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	if _, ok := ctx["$agg0"]; ok {
+		return
+	}
+
+	fn := ctx["$fn"]
+	if _, ok := ctx["$agg"]; ok {
+		if v, ok = ctx[fn]; ok {
+			return
+		}
+
+		return nil, nil
+	}
+
+	max := ctx[fn]
+	y := arg[0]
+	if y == nil {
+		return
+	}
+	switch x := max.(type) {
+	case nil:
+		switch y := y.(type) {
+		case float32, float64, string, int8, int16, int32, int64, uint8, uint16, uint32, uint64, time.Time:
+			max = y
+		default:
+			return nil, fmt.Errorf("max: cannot accept %v (value if type %T)", y, y)
+		}
+	case float32:
+		if y := y.(float32); y > x {
+			max = y
+		}
+	case float64:
+		if y := y.(float64); y > x {
+			max = y
+		}
+	case string:
+		if y := y.(string); y > x {
+			max = y
+		}
+	case int8:
+		if y := y.(int8); y > x {
+			max = y
+		}
+	case int16:
+		if y := y.(int16); y > x {
+			max = y
+		}
+	case int32:
+		if y := y.(int32); y > x {
+			max = y
+		}
+	case int64:
+		if y := y.(int64); y > x {
+			max = y
+		}
+	case uint8:
+		if y := y.(uint8); y > x {
+			max = y
+		}
+	case uint16:
+		if y := y.(uint16); y > x {
+			max = y
+		}
+	case uint32:
+		if y := y.(uint32); y > x {
+			max = y
+		}
+	case uint64:
+		if y := y.(uint64); y > x {
+			max = y
+		}
+	case time.Time:
+		if y := y.(time.Time); y.After(x) {
+			max = y
+		}
+	}
+	ctx[fn] = max
+	return
+}
+
+func builtinMin(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	if _, ok := ctx["$agg0"]; ok {
+		return
+	}
+
+	fn := ctx["$fn"]
+	if _, ok := ctx["$agg"]; ok {
+		if v, ok = ctx[fn]; ok {
+			return
+		}
+
+		return nil, nil
+	}
+
+	min := ctx[fn]
+	y := arg[0]
+	if y == nil {
+		return
+	}
+	switch x := min.(type) {
+	case nil:
+		switch y := y.(type) {
+		case float32, float64, string, int8, int16, int32, int64, uint8, uint16, uint32, uint64, time.Time:
+			min = y
+		default:
+			return nil, fmt.Errorf("min: cannot accept %v (value if type %T)", y, y)
+		}
+	case float32:
+		if y := y.(float32); y < x {
+			min = y
+		}
+	case float64:
+		if y := y.(float64); y < x {
+			min = y
+		}
+	case string:
+		if y := y.(string); y < x {
+			min = y
+		}
+	case int8:
+		if y := y.(int8); y < x {
+			min = y
+		}
+	case int16:
+		if y := y.(int16); y < x {
+			min = y
+		}
+	case int32:
+		if y := y.(int32); y < x {
+			min = y
+		}
+	case int64:
+		if y := y.(int64); y < x {
+			min = y
+		}
+	case uint8:
+		if y := y.(uint8); y < x {
+			min = y
+		}
+	case uint16:
+		if y := y.(uint16); y < x {
+			min = y
+		}
+	case uint32:
+		if y := y.(uint32); y < x {
+			min = y
+		}
+	case uint64:
+		if y := y.(uint64); y < x {
+			min = y
+		}
+	case time.Time:
+		if y := y.(time.Time); y.Before(x) {
+			min = y
+		}
+	}
+	ctx[fn] = min
+	return
+}
+
+func builtinMinute(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return int64(x.Minute()), nil
+	default:
+		return nil, invArg(x, "minute")
+	}
+}
+
+func builtinMinutes(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Duration:
+		return x.Minutes(), nil
+	default:
+		return nil, invArg(x, "minutes")
+	}
+}
+
+func builtinMonth(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return int64(x.Month()), nil
+	default:
+		return nil, invArg(x, "month")
+	}
+}
+
+func builtinNanosecond(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return int64(x.Nanosecond()), nil
+	default:
+		return nil, invArg(x, "nanosecond")
+	}
+}
+
+func builtinNanoseconds(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Duration:
+		return x.Nanoseconds(), nil
+	default:
+		return nil, invArg(x, "nanoseconds")
+	}
+}
+
+func builtinNow(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	return time.Now(), nil
+}
+
+func builtinParseTime(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	var a [2]string
+	for i, v := range arg {
+		switch x := v.(type) {
+		case nil:
+			return nil, nil
+		case string:
+			a[i] = x
+		default:
+			return nil, invArg(x, "parseTime")
+		}
+	}
+
+	t, err := time.Parse(a[0], a[1])
+	if err != nil {
+		return nil, err
+	}
+
+	ls := t.Location().String()
+	if ls == "UTC" {
+		return t, nil
+	}
+
+	l, err := time.LoadLocation(ls)
+	if err != nil {
+		return t, nil
+	}
+
+	return time.ParseInLocation(a[0], a[1], l)
+}
+
+func builtinReal(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case idealComplex:
+		return real(x), nil
+	case complex64:
+		return real(x), nil
+	case complex128:
+		return real(x), nil
+	default:
+		return nil, invArg(x, "real")
+	}
+}
+
+func builtinSecond(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return int64(x.Second()), nil
+	default:
+		return nil, invArg(x, "second")
+	}
+}
+
+func builtinSeconds(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Duration:
+		return x.Seconds(), nil
+	default:
+		return nil, invArg(x, "seconds")
+	}
+}
+
+func builtinSince(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return time.Since(x), nil
+	default:
+		return nil, invArg(x, "since")
+	}
+}
+
+func builtinSum(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	if _, ok := ctx["$agg0"]; ok {
+		return
+	}
+
+	fn := ctx["$fn"]
+	if _, ok := ctx["$agg"]; ok {
+		if v, ok = ctx[fn]; ok {
+			return
+		}
+
+		return nil, nil
+	}
+
+	sum := ctx[fn]
+	y := arg[0]
+	if y == nil {
+		return
+	}
+	switch x := sum.(type) {
+	case nil:
+		switch y := y.(type) {
+		case complex64, complex128, float32, float64, int8, int16, int32, int64, uint8, uint16, uint32, uint64:
+			sum = y
+		default:
+			return nil, fmt.Errorf("sum: cannot accept %v (value if type %T)", y, y)
+		}
+	case complex64:
+		sum = x + y.(complex64)
+	case complex128:
+		sum = x + y.(complex128)
+	case float32:
+		sum = x + y.(float32)
+	case float64:
+		sum = x + y.(float64)
+	case int8:
+		sum = x + y.(int8)
+	case int16:
+		sum = x + y.(int16)
+	case int32:
+		sum = x + y.(int32)
+	case int64:
+		sum = x + y.(int64)
+	case uint8:
+		sum = x + y.(uint8)
+	case uint16:
+		sum = x + y.(uint16)
+	case uint32:
+		sum = x + y.(uint32)
+	case uint64:
+		sum = x + y.(uint64)
+	}
+	ctx[fn] = sum
+	return
+}
+
+func builtinTimeIn(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		switch y := arg[1].(type) {
+		case nil:
+			return nil, nil
+		case string:
+			loc := time.Local
+			switch y {
+			case "local":
+			default:
+				loc, err = time.LoadLocation(y)
+				if err != nil {
+					return
+				}
+			}
+
+			return x.In(loc), nil
+		default:
+			return nil, invArg(x, "timeIn")
+		}
+	default:
+		return nil, invArg(x, "timeIn")
+	}
+}
+
+func builtinWeekday(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return int64(x.Weekday()), nil
+	default:
+		return nil, invArg(x, "weekday")
+	}
+}
+
+func builtinYear(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return int64(x.Year()), nil
+	default:
+		return nil, invArg(x, "year")
+	}
+}
+
+func builtinYearday(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	switch x := arg[0].(type) {
+	case nil:
+		return nil, nil
+	case time.Time:
+		return int64(x.YearDay()), nil
+	default:
+		return nil, invArg(x, "yearDay")
+	}
+}
diff --git a/vendor/github.com/cznic/ql/coerce.go b/vendor/github.com/cznic/ql/coerce.go
new file mode 100644
index 0000000000..bd384f93e6
--- /dev/null
+++ b/vendor/github.com/cznic/ql/coerce.go
@@ -0,0 +1,290 @@
+// Copyright 2013 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// CAUTION: This file was generated automatically by
+//
+//	$ go run helper/helper.go -o coerce.go
+//
+// DO NOT EDIT!
+
+package ql
+
+import (
+	"math"
+	"math/big"
+	"reflect"
+	"time"
+)
+
+func coerce(a, b interface{}) (x, y interface{}) {
+	if reflect.TypeOf(a) == reflect.TypeOf(b) {
+		return a, b
+	}
+
+	switch a.(type) {
+	case idealComplex, idealFloat, idealInt, idealRune, idealUint:
+		switch b.(type) {
+		case idealComplex, idealFloat, idealInt, idealRune, idealUint:
+			x, y = coerce1(a, b), b
+			if reflect.TypeOf(x) == reflect.TypeOf(y) {
+				return
+			}
+
+			return a, coerce1(b, a)
+		default:
+			return coerce1(a, b), b
+		}
+	default:
+		switch b.(type) {
+		case idealComplex, idealFloat, idealInt, idealRune, idealUint:
+			return a, coerce1(b, a)
+		default:
+			return a, b
+		}
+	}
+}
+
+func coerce1(inVal, otherVal interface{}) (coercedInVal interface{}) {
+	coercedInVal = inVal
+	if otherVal == nil {
+		return
+	}
+
+	switch x := inVal.(type) {
+	case nil:
+		return
+	case idealComplex:
+		switch otherVal.(type) {
+		//case idealComplex:
+		//case idealFloat:
+		//case idealInt:
+		//case idealRune:
+		//case idealUint:
+		//case bool:
+		case complex64:
+			return complex64(x)
+		case complex128:
+			return complex128(x)
+			//case float32:
+			//case float64:
+			//case int8:
+			//case int16:
+			//case int32:
+			//case int64:
+			//case string:
+			//case uint8:
+			//case uint16:
+			//case uint32:
+			//case uint64:
+			//case *big.Int:
+			//case *big.Rat:
+			//case time.Time:
+			//case time.Duration:
+		}
+	case idealFloat:
+		switch otherVal.(type) {
+		case idealComplex:
+			return idealComplex(complex(float64(x), 0))
+		case idealFloat:
+			return idealFloat(float64(x))
+		//case idealInt:
+		//case idealRune:
+		//case idealUint:
+		//case bool:
+		case complex64:
+			return complex64(complex(float32(x), 0))
+		case complex128:
+			return complex128(complex(float64(x), 0))
+		case float32:
+			return float32(float64(x))
+		case float64:
+			return float64(float64(x))
+		//case int8:
+		//case int16:
+		//case int32:
+		//case int64:
+		//case string:
+		//case uint8:
+		//case uint16:
+		//case uint32:
+		//case uint64:
+		//case *big.Int:
+		case *big.Rat:
+			return big.NewRat(1, 1).SetFloat64(float64(x))
+			//case time.Time:
+			//case time.Duration:
+		}
+	case idealInt:
+		switch otherVal.(type) {
+		case idealComplex:
+			return idealComplex(complex(float64(x), 0))
+		case idealFloat:
+			return idealFloat(int64(x))
+		case idealInt:
+			return idealInt(int64(x))
+		//case idealRune:
+		case idealUint:
+			if x >= 0 {
+				return idealUint(int64(x))
+			}
+		//case bool:
+		case complex64:
+			return complex64(complex(float32(x), 0))
+		case complex128:
+			return complex128(complex(float64(x), 0))
+		case float32:
+			return float32(int64(x))
+		case float64:
+			return float64(int64(x))
+		case int8:
+			if x >= math.MinInt8 && x <= math.MaxInt8 {
+				return int8(int64(x))
+			}
+		case int16:
+			if x >= math.MinInt16 && x <= math.MaxInt16 {
+				return int16(int64(x))
+			}
+		case int32:
+			if x >= math.MinInt32 && x <= math.MaxInt32 {
+				return int32(int64(x))
+			}
+		case int64:
+			return int64(int64(x))
+		//case string:
+		case uint8:
+			if x >= 0 && x <= math.MaxUint8 {
+				return uint8(int64(x))
+			}
+		case uint16:
+			if x >= 0 && x <= math.MaxUint16 {
+				return uint16(int64(x))
+			}
+		case uint32:
+			if x >= 0 && x <= math.MaxUint32 {
+				return uint32(int64(x))
+			}
+		case uint64:
+			if x >= 0 {
+				return uint64(int64(x))
+			}
+		case *big.Int:
+			return big.NewInt(int64(x))
+		case *big.Rat:
+			return big.NewRat(1, 1).SetInt64(int64(x))
+		//case time.Time:
+		case time.Duration:
+			return time.Duration(int64(x))
+		}
+	case idealRune:
+		switch otherVal.(type) {
+		case idealComplex:
+			return idealComplex(complex(float64(x), 0))
+		case idealFloat:
+			return idealFloat(int64(x))
+		case idealInt:
+			return idealInt(int64(x))
+		case idealRune:
+			return idealRune(int64(x))
+		case idealUint:
+			return idealUint(int64(x))
+		//case bool:
+		case complex64:
+			return complex64(complex(float32(x), 0))
+		case complex128:
+			return complex128(complex(float64(x), 0))
+		case float32:
+			return float32(int64(x))
+		case float64:
+			return float64(int64(x))
+		case int8:
+			return int8(int64(x))
+		case int16:
+			return int16(int64(x))
+		case int32:
+			return int32(int64(x))
+		case int64:
+			return int64(int64(x))
+		//case string:
+		case uint8:
+			return uint8(int64(x))
+		case uint16:
+			return uint16(int64(x))
+		case uint32:
+			return uint32(int64(x))
+		case uint64:
+			return uint64(int64(x))
+		case *big.Int:
+			return big.NewInt(int64(x))
+		case *big.Rat:
+			return big.NewRat(1, 1).SetInt64(int64(x))
+		//case time.Time:
+		case time.Duration:
+			return time.Duration(int64(x))
+		}
+	case idealUint:
+		switch otherVal.(type) {
+		case idealComplex:
+			return idealComplex(complex(float64(x), 0))
+		case idealFloat:
+			return idealFloat(uint64(x))
+		case idealInt:
+			if x <= math.MaxInt64 {
+				return idealInt(int64(x))
+			}
+		//case idealRune:
+		case idealUint:
+			return idealUint(uint64(x))
+		//case bool:
+		case complex64:
+			return complex64(complex(float32(x), 0))
+		case complex128:
+			return complex128(complex(float64(x), 0))
+		case float32:
+			return float32(uint64(x))
+		case float64:
+			return float64(uint64(x))
+		case int8:
+			if x <= math.MaxInt8 {
+				return int8(int64(x))
+			}
+		case int16:
+			if x <= math.MaxInt16 {
+				return int16(int64(x))
+			}
+		case int32:
+			if x <= math.MaxInt32 {
+				return int32(int64(x))
+			}
+		case int64:
+			if x <= math.MaxInt64 {
+				return int64(int64(x))
+			}
+		//case string:
+		case uint8:
+			if x >= 0 && x <= math.MaxUint8 {
+				return uint8(int64(x))
+			}
+		case uint16:
+			if x >= 0 && x <= math.MaxUint16 {
+				return uint16(int64(x))
+			}
+		case uint32:
+			if x >= 0 && x <= math.MaxUint32 {
+				return uint32(int64(x))
+			}
+		case uint64:
+			return uint64(uint64(x))
+		case *big.Int:
+			return big.NewInt(0).SetUint64(uint64(x))
+		case *big.Rat:
+			return big.NewRat(1, 1).SetInt(big.NewInt(0).SetUint64(uint64(x)))
+		//case time.Time:
+		case time.Duration:
+			if x <= math.MaxInt64 {
+				return time.Duration(int64(x))
+			}
+		}
+	}
+	return
+}
diff --git a/vendor/github.com/cznic/ql/doc.go b/vendor/github.com/cznic/ql/doc.go
new file mode 100644
index 0000000000..7a8baf10eb
--- /dev/null
+++ b/vendor/github.com/cznic/ql/doc.go
@@ -0,0 +1,2606 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//MAYBE set operations
+//MAYBE +=, -=, ...
+
+//TODO verify there's a graceful failure for a 2G+ blob on a 32 bit machine.
+
+// Package ql implements a pure Go embedded SQL database engine.
+//
+// QL is a member of the SQL family of languages. It is less complex and less
+// powerful than SQL (whichever specification SQL is considered to be).
+//
+// Change list
+//
+// 2015-06-15: To improve compatibility with other SQL implementations, the
+// count built-in aggregate function now accepts * as its argument.
+//
+// 2015-05-29: The execution planner was rewritten from scratch. It should use
+// indices in all places where they were used before plus in some additional
+// situations.  It is possible to investigate the plan using the newly added
+// EXPLAIN statement.  The QL tool is handy for such analysis. If the planner
+// would have used an index, but no such exists, the plan includes hints in
+// form of copy/paste ready CREATE INDEX statements.
+//
+// The planner is still quite simple and a lot of work on it is yet ahead. You
+// can help this process by filling an issue with a schema and query which
+// fails to use an index or indices when it should, in your opinion. Bonus
+// points for including output of `ql 'explain <query>'`.
+//
+// 2015-05-09: The grammar of the CREATE INDEX statement now accepts an
+// expression list instead of a single expression, which was further limited to
+// just a column name or the built-in id().  As a side effect, composite
+// indices are now functional. However, the values in the expression-list style
+// index are not yet used by other statements or the statement/query planner.
+// The composite index is useful while having UNIQUE clause to check for
+// semantically duplicate rows before they get added to the table or when such
+// a row is mutated using the UPDATE statement and the expression-list style
+// index tuple of the row is thus recomputed.
+//
+// 2015-05-02: The Schema field of table __Table now correctly reflects any
+// column constraints and/or defaults. Also, the (*DB).Info method now has that
+// information provided in new ColumInfo fields NotNull, Constraint and
+// Default.
+//
+// 2015-04-20: Added support for {LEFT,RIGHT,FULL} [OUTER] JOIN.
+//
+// 2015-04-18: Column definitions can now have constraints and defaults.
+// Details are discussed in the "Constraints and defaults" chapter below the
+// CREATE TABLE statement documentation.
+//
+// 2015-03-06: New built-in functions formatFloat and formatInt. Thanks
+// urandom! (https://github.com/urandom)
+//
+// 2015-02-16: IN predicate now accepts a SELECT statement. See the updated
+// "Predicates" section.
+//
+// 2015-01-17: Logical operators || and && have now alternative spellings: OR
+// and AND (case insensitive).  AND was a keyword before, but OR is a new one.
+// This can possibly break existing queries. For the record, it's a good idea
+// to not use any name appearing in, for example, [7] in your queries as the
+// list of QL's keywords may expand for gaining better compatibility with
+// existing SQL "standards".
+//
+// 2015-01-12: ACID guarantees were tightened at the cost of performance in
+// some cases. The write collecting window mechanism, a formerly used
+// implementation detail, was removed. Inserting rows one by one in a
+// transaction is now slow. I mean very slow. Try to avoid inserting single
+// rows in a transaction. Instead, whenever possible, perform batch updates of
+// tens to, say thousands of rows in a single transaction. See also:
+// http://www.sqlite.org/faq.html#q19, the discussed synchronization principles
+// involved are the same as for QL, modulo minor details.
+//
+// Note: A side effect is that closing a DB before exiting an application, both
+// for the Go API and through database/sql driver, is no more required,
+// strictly speaking. Beware that exiting an application while there is an open
+// (uncommitted) transaction in progress means losing the transaction data.
+// However, the DB will not become corrupted because of not closing it. Nor
+// that was the case before, but formerly failing to close a DB could have
+// resulted in losing the data of the last transaction.
+//
+// 2014-09-21: id() now optionally accepts a single argument - a table name.
+//
+// 2014-09-01: Added the DB.Flush() method and the LIKE pattern matching
+// predicate.
+//
+// 2014-08-08: The built in functions max and min now accept also time values.
+// Thanks opennota! (https://github.com/opennota)
+//
+// 2014-06-05: RecordSet interface extended by new methods FirstRow and Rows.
+//
+// 2014-06-02: Indices on id() are now used by SELECT statements.
+//
+// 2014-05-07: Introduction of Marshal, Schema, Unmarshal.
+//
+// 2014-04-15:
+//
+// Added optional IF NOT EXISTS clause to CREATE INDEX and optional IF EXISTS
+// clause to DROP INDEX.
+//
+// 2014-04-12:
+//
+// The column Unique in the virtual table __Index was renamed to IsUnique
+// because the old name is a keyword. Unfortunately, this is a breaking change,
+// sorry.
+//
+// 2014-04-11: Introduction of LIMIT, OFFSET.
+//
+// 2014-04-10: Introduction of query rewriting.
+//
+// 2014-04-07: Introduction of indices.
+//
+// Building non CGO QL
+//
+// QL imports zappy[8], a block-based compressor, which speeds up its
+// performance by using a C version of the compression/decompression
+// algorithms.  If a CGO-free (pure Go) version of QL, or an app using QL, is
+// required, please include 'purego' in the -tags option of go
+// {build,get,install}. For example:
+//
+//	$ go get -tags purego github.com/cznic/ql
+//
+// If zappy was installed before installing QL, it might be necessary to
+// rebuild zappy first (or rebuild QL with all its dependencies using the -a
+// option):
+//
+//	$ touch "$GOPATH"/src/github.com/cznic/zappy/*.go
+//	$ go install -tags purego github.com/cznic/zappy
+//	$ go install github.com/cznic/ql
+//
+// Notation
+//
+// The syntax is specified using Extended Backus-Naur Form (EBNF)
+//
+// 	Production  = production_name "=" [ Expression ] "." .
+// 	Expression  = Alternative { "|" Alternative } .
+// 	Alternative = Term { Term } .
+// 	Term        = production_name | token [ "…" token ] | Group | Option | Repetition .
+// 	Group       = "(" Expression ")" .
+// 	Option      = "[" Expression "]" .
+// 	Repetition  = "{" Expression "}" .
+// 	Productions are expressions constructed from terms and the following operators, in increasing precedence
+//
+// 	|   alternation
+// 	()  grouping
+// 	[]  option (0 or 1 times)
+// 	{}  repetition (0 to n times)
+//
+// Lower-case production names are used to identify lexical tokens.
+// Non-terminals are in CamelCase. Lexical tokens are enclosed in double quotes
+// "" or back quotes ``.
+//
+// The form a … b represents the set of characters from a through b as
+// alternatives. The horizontal ellipsis … is also used elsewhere in the spec
+// to informally denote various enumerations or code snippets that are not
+// further specified.
+//
+// QL source code representation
+//
+// QL source code is Unicode text encoded in UTF-8. The text is not
+// canonicalized, so a single accented code point is distinct from the same
+// character constructed from combining an accent and a letter; those are
+// treated as two code points.  For simplicity, this document will use the
+// unqualified term character to refer to a Unicode code point in the source
+// text.
+//
+// Each code point is distinct; for instance, upper and lower case letters are
+// different characters.
+//
+// Implementation restriction: For compatibility with other tools, the parser
+// may disallow the NUL character (U+0000) in the statement.
+//
+// Implementation restriction: A byte order mark is disallowed anywhere in QL
+// statements.
+//
+// Characters
+//
+// The following terms are used to denote specific character classes
+//
+//  newline        = . // the Unicode code point U+000A
+//  unicode_char   = . // an arbitrary Unicode code point except newline
+//  ascii_letter   = "a" … "z" | "A" … "Z" .
+//
+// Letters and digits
+//
+// The underscore character _ (U+005F) is considered a letter.
+//
+//  letter        = ascii_letter | "_" .
+//  decimal_digit = "0" … "9" .
+//  octal_digit   = "0" … "7" .
+//  hex_digit     = "0" … "9" | "A" … "F" | "a" … "f" .
+//
+// Lexical elements
+//
+// Lexical elements are comments, tokens, identifiers, keywords, operators and
+// delimiters, integer, floating-point, imaginary, rune and string literals and
+// QL parameters.
+//
+// Comments
+//
+// There are three forms of comments
+//
+// Line comments start with the character sequence // or -- and stop at the end
+// of the line. A line comment acts like a space.
+//
+// General comments start with the character sequence /* and continue through
+// the character sequence */. A general comment acts like a space.
+//
+// Comments do not nest.
+//
+// Tokens
+//
+// Tokens form the vocabulary of QL. There are four classes: identifiers,
+// keywords, operators and delimiters, and literals. White space, formed from
+// spaces (U+0020), horizontal tabs (U+0009), carriage returns (U+000D), and
+// newlines (U+000A), is ignored except as it separates tokens that would
+// otherwise combine into a single token.
+//
+// Semicolons
+//
+// The formal grammar uses semicolons ";" as separators of QL statements. A
+// single QL statement or the last QL statement in a list of statements can
+// have an optional semicolon terminator. (Actually a separator from the
+// following empty statement.)
+//
+// Identifiers
+//
+// Identifiers name entities such as tables or record set columns. An
+// identifier is a sequence of one or more letters and digits. The first
+// character in an identifier must be a letter.
+//
+//  identifier = letter { letter | decimal_digit } .
+//
+// For example
+//
+// 	price
+// 	_tmp42
+// 	Sales
+//
+// No identifiers are predeclared, however note that no keyword can be used as
+// an identifier.  Identifiers starting with two underscores are used for meta
+// data virtual tables names. For forward compatibility, users should generally
+// avoid using any identifiers starting with two underscores. For example
+//
+//	__Column
+//	__Column2
+//	__Index
+//	__Table
+//
+// Keywords
+//
+// The following keywords are reserved and may not be used as identifiers.
+//
+//	ADD      COLUMN      false     int32   ORDER     uint16
+//	ALTER    complex128  float     int64   OUTER     uint32
+//	AND      complex64   float32   int8    RIGHT     uint64
+//	AS       CREATE      float64   INTO    SELECT    uint8
+//	ASC      DEFAULT     FROM      JOIN    SET       UNIQUE
+//	BETWEEN  DELETE      GROUP     LEFT    string    UPDATE
+//	bigint   DESC        IF        LIMIT   TABLE     VALUES
+//	bigrat   DISTINCT    IN        LIKE    time      WHERE
+//	blob     DROP        INDEX     NOT     true
+//	bool     duration    INSERT    NULL    OR
+//	BY       EXISTS      int       OFFSET  TRUNCATE
+//	byte     EXPLAIN     int16     ON      uint
+//
+// Keywords are not case sensitive.
+//
+// Operators and Delimiters
+//
+// The following character sequences represent operators, delimiters, and other
+// special tokens
+//
+// 	+    &    &&    ==    !=    (    )
+// 	-    |    ||    <     <=    [    ]
+// 	*    ^          >     >=    ,    ;
+// 	/    <<         =           .
+// 	%    >>         !
+// 	     &^
+//
+// Operators consisting of more than one character are referred to by names in
+// the rest of the documentation
+//
+//  andand = "&&" .
+//  andnot = "&^" .
+//  lsh    = "<<" .
+//  le     = "<=" .
+//  eq     = "==" .
+//  ge     = ">=" .
+//  neq    = "!=" .
+//  oror   = "||" .
+//  rsh    = ">>" .
+//
+// Integer literals
+//
+// An integer literal is a sequence of digits representing an integer constant.
+// An optional prefix sets a non-decimal base: 0 for octal, 0x or 0X for
+// hexadecimal.  In hexadecimal literals, letters a-f and A-F represent values
+// 10 through 15.
+//
+//  int_lit     = decimal_lit | octal_lit | hex_lit .
+//  decimal_lit = ( "1" … "9" ) { decimal_digit } .
+//  octal_lit   = "0" { octal_digit } .
+//  hex_lit     = "0" ( "x" | "X" ) hex_digit { hex_digit } .
+//
+// For example
+//
+// 	42
+// 	0600
+// 	0xBadFace
+// 	1701411834604692
+//
+// Floating-point literals
+//
+// A floating-point literal is a decimal representation of a floating-point
+// constant. It has an integer part, a decimal point, a fractional part, and an
+// exponent part. The integer and fractional part comprise decimal digits; the
+// exponent part is an e or E followed by an optionally signed decimal
+// exponent.  One of the integer part or the fractional part may be elided; one
+// of the decimal point or the exponent may be elided.
+//
+//  float_lit = decimals "." [ decimals ] [ exponent ] |
+//              decimals exponent |
+//              "." decimals [ exponent ] .
+//  decimals  = decimal_digit { decimal_digit } .
+//  exponent  = ( "e" | "E" ) [ "+" | "-" ] decimals .
+//
+// For example
+//
+// 	0.
+// 	72.40
+// 	072.40  // == 72.40
+// 	2.71828
+// 	1.e+0
+// 	6.67428e-11
+// 	1E6
+// 	.25
+// 	.12345E+5
+//
+// Imaginary literals
+//
+// An imaginary literal is a decimal representation of the imaginary part of a
+// complex constant. It consists of a floating-point literal or decimal integer
+// followed by the lower-case letter i.
+//
+//  imaginary_lit = (decimals | float_lit) "i" .
+//
+// For example
+//
+// 	0i
+// 	011i  // == 11i
+// 	0.i
+// 	2.71828i
+// 	1.e+0i
+// 	6.67428e-11i
+// 	1E6i
+// 	.25i
+// 	.12345E+5i
+//
+// Rune literals
+//
+// A rune literal represents a rune constant, an integer value identifying a
+// Unicode code point. A rune literal is expressed as one or more characters
+// enclosed in single quotes. Within the quotes, any character may appear
+// except single quote and newline. A single quoted character represents the
+// Unicode value of the character itself, while multi-character sequences
+// beginning with a backslash encode values in various formats.
+//
+// The simplest form represents the single character within the quotes; since
+// QL statements are Unicode characters encoded in UTF-8, multiple
+// UTF-8-encoded bytes may represent a single integer value. For instance, the
+// literal 'a' holds a single byte representing a literal a, Unicode U+0061,
+// value 0x61, while 'ä' holds two bytes (0xc3 0xa4) representing a literal
+// a-dieresis, U+00E4, value 0xe4.
+//
+// Several backslash escapes allow arbitrary values to be encoded as ASCII
+// text.  There are four ways to represent the integer value as a numeric
+// constant: \x followed by exactly two hexadecimal digits; \u followed by
+// exactly four hexadecimal digits; \U followed by exactly eight hexadecimal
+// digits, and a plain backslash \ followed by exactly three octal digits. In
+// each case the value of the literal is the value represented by the digits in
+// the corresponding base.
+//
+// Although these representations all result in an integer, they have different
+// valid ranges. Octal escapes must represent a value between 0 and 255
+// inclusive.  Hexadecimal escapes satisfy this condition by construction. The
+// escapes \u and \U represent Unicode code points so within them some values
+// are illegal, in particular those above 0x10FFFF and surrogate halves.
+//
+// After a backslash, certain single-character escapes represent special
+// values
+//
+// 	\a   U+0007 alert or bell
+// 	\b   U+0008 backspace
+// 	\f   U+000C form feed
+// 	\n   U+000A line feed or newline
+// 	\r   U+000D carriage return
+// 	\t   U+0009 horizontal tab
+// 	\v   U+000b vertical tab
+// 	\\   U+005c backslash
+// 	\'   U+0027 single quote  (valid escape only within rune literals)
+// 	\"   U+0022 double quote  (valid escape only within string literals)
+//
+// All other sequences starting with a backslash are illegal inside rune
+// literals.
+//
+//  rune_lit         = "'" ( unicode_value | byte_value ) "'" .
+//  unicode_value    = unicode_char | little_u_value | big_u_value | escaped_char .
+//  byte_value       = octal_byte_value | hex_byte_value .
+//  octal_byte_value = `\` octal_digit octal_digit octal_digit .
+//  hex_byte_value   = `\` "x" hex_digit hex_digit .
+//  little_u_value   = `\` "u" hex_digit hex_digit hex_digit hex_digit .
+//  big_u_value      = `\` "U" hex_digit hex_digit hex_digit hex_digit
+//                             hex_digit hex_digit hex_digit hex_digit .
+//  escaped_char     = `\` ( "a" | "b" | "f" | "n" | "r" | "t" | "v" | `\` | "'" | `"` ) .
+//
+// For example
+//
+// 	'a'
+// 	'ä'
+// 	'本'
+// 	'\t'
+// 	'\000'
+// 	'\007'
+// 	'\377'
+// 	'\x07'
+// 	'\xff'
+// 	'\u12e4'
+// 	'\U00101234'
+// 	'aa'         // illegal: too many characters
+// 	'\xa'        // illegal: too few hexadecimal digits
+// 	'\0'         // illegal: too few octal digits
+// 	'\uDFFF'     // illegal: surrogate half
+// 	'\U00110000' // illegal: invalid Unicode code point
+//
+// String literals
+//
+// A string literal represents a string constant obtained from concatenating a
+// sequence of characters. There are two forms: raw string literals and
+// interpreted string literals.
+//
+// Raw string literals are character sequences between back quotes ``. Within
+// the quotes, any character is legal except back quote. The value of a raw
+// string literal is the string composed of the uninterpreted (implicitly
+// UTF-8-encoded) characters between the quotes; in particular, backslashes
+// have no special meaning and the string may contain newlines. Carriage
+// returns inside raw string literals are discarded from the raw string value.
+//
+// Interpreted string literals are character sequences between double quotes
+// "".  The text between the quotes, which may not contain newlines, forms the
+// value of the literal, with backslash escapes interpreted as they are in rune
+// literals (except that \' is illegal and \" is legal), with the same
+// restrictions. The three-digit octal (\nnn) and two-digit hexadecimal (\xnn)
+// escapes represent individual bytes of the resulting string; all other
+// escapes represent the (possibly multi-byte) UTF-8 encoding of individual
+// characters. Thus inside a string literal \377 and \xFF represent a single
+// byte of value 0xFF=255, while ÿ, \u00FF, \U000000FF and \xc3\xbf represent
+// the two bytes 0xc3 0xbf of the UTF-8 encoding of character U+00FF.
+//
+//  string_lit             = raw_string_lit | interpreted_string_lit .
+//  raw_string_lit         = "`" { unicode_char | newline } "`" .
+//  interpreted_string_lit = `"` { unicode_value | byte_value } `"` .
+//
+// For example
+//
+// 	`abc`  // same as "abc"
+// 	`\n
+// 	\n`    // same as "\\n\n\\n"
+// 	"\n"
+// 	""
+// 	"Hello, world!\n"
+// 	"日本語"
+// 	"\u65e5本\U00008a9e"
+// 	"\xff\u00FF"
+// 	"\uD800"       // illegal: surrogate half
+// 	"\U00110000"   // illegal: invalid Unicode code point
+//
+// These examples all represent the same string
+//
+// 	"日本語"                                 // UTF-8 input text
+// 	`日本語`                                 // UTF-8 input text as a raw literal
+// 	"\u65e5\u672c\u8a9e"                    // the explicit Unicode code points
+// 	"\U000065e5\U0000672c\U00008a9e"        // the explicit Unicode code points
+// 	"\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"  // the explicit UTF-8 bytes
+//
+// If the statement source represents a character as two code points, such as a
+// combining form involving an accent and a letter, the result will be an error
+// if placed in a rune literal (it is not a single code point), and will appear
+// as two code points if placed in a string literal.
+//
+// QL parameters
+//
+// Literals are assigned their values from the respective text representation
+// at "compile" (parse) time. QL parameters provide the same functionality as
+// literals, but their value is assigned at execution time from an expression
+// list passed to DB.Run or DB.Execute. Using '?' or '$' is completely
+// equivalent.
+//
+//  ql_parameter = ( "?" | "$" ) "1" … "9" { "0" … "9" } .
+//
+// For example
+//
+// 	SELECT DepartmentID
+// 	FROM department
+// 	WHERE DepartmentID == ?1
+// 	ORDER BY DepartmentName;
+//
+// 	SELECT employee.LastName
+// 	FROM department, employee
+// 	WHERE department.DepartmentID == $1 && employee.LastName > $2
+// 	ORDER BY DepartmentID;
+//
+// Constants
+//
+// Keywords 'false' and 'true' (not case sensitive) represent the two possible
+// constant values of type bool (also not case sensitive).
+//
+// Keyword 'NULL' (not case sensitive) represents an untyped constant which is
+// assignable to any type. NULL is distinct from any other value of any type.
+//
+// Types
+//
+// A type determines the set of values and operations specific to values of
+// that type. A type is specified by a type name.
+//
+//  Type = "bigint"      // http://golang.org/pkg/math/big/#Int
+//       | "bigrat"      // http://golang.org/pkg/math/big/#Rat
+//       | "blob"        // []byte
+//       | "bool"
+//       | "byte"        // alias for uint8
+//       | "complex128"
+//       | "complex64"
+//       | "duration"    // http://golang.org/pkg/time/#Duration
+//       | "float"       // alias for float64
+//       | "float32"
+//       | "float64"
+//       | "int"         // alias for int64
+//       | "int16"
+//       | "int32"
+//       | "int64"
+//       | "int8"
+//       | "rune"        // alias for int32
+//       | "string"
+//       | "time"        // http://golang.org/pkg/time/#Time
+//       | "uint"        // alias for uint64
+//       | "uint16"
+//       | "uint32"
+//       | "uint64"
+//       | "uint8" .
+//
+// Named instances of the boolean, numeric, and string types are keywords. The
+// names are not case sensitive.
+//
+// Note: The blob type is exchanged between the back end and the API as []byte.
+// On 32 bit platforms this limits the size which the implementation can handle
+// to 2G.
+//
+// Boolean types
+//
+// A boolean type represents the set of Boolean truth values denoted by the
+// predeclared constants true and false. The predeclared boolean type is bool.
+//
+// Duration type
+//
+// A duration type represents the elapsed time between two instants as an int64
+// nanosecond count. The representation limits the largest representable
+// duration to approximately 290 years.
+//
+// Numeric types
+//
+// A numeric type represents sets of integer or floating-point values. The
+// predeclared architecture-independent numeric types are
+//
+// 	uint8       the set of all unsigned  8-bit integers (0 to 255)
+// 	uint16      the set of all unsigned 16-bit integers (0 to 65535)
+// 	uint32      the set of all unsigned 32-bit integers (0 to 4294967295)
+// 	uint64      the set of all unsigned 64-bit integers (0 to 18446744073709551615)
+//
+// 	int8        the set of all signed  8-bit integers (-128 to 127)
+// 	int16       the set of all signed 16-bit integers (-32768 to 32767)
+// 	int32       the set of all signed 32-bit integers (-2147483648 to 2147483647)
+// 	int64       the set of all signed 64-bit integers (-9223372036854775808 to 9223372036854775807)
+// 	duration    the set of all signed 64-bit integers (-9223372036854775808 to 9223372036854775807)
+//	bigint      the set of all integers
+//
+//	bigrat      the set of all rational numbers
+//
+// 	float32     the set of all IEEE-754 32-bit floating-point numbers
+// 	float64     the set of all IEEE-754 64-bit floating-point numbers
+//
+// 	complex64   the set of all complex numbers with float32 real and imaginary parts
+// 	complex128  the set of all complex numbers with float64 real and imaginary parts
+//
+// 	byte        alias for uint8
+// 	float       alias for float64
+// 	int         alias for int64
+// 	rune        alias for int32
+// 	uint        alias for uint64
+//
+// The value of an n-bit integer is n bits wide and represented using two's
+// complement arithmetic.
+//
+// Conversions are required when different numeric types are mixed in an
+// expression or assignment.
+//
+// String types
+//
+// A string type represents the set of string values. A string value is a
+// (possibly empty) sequence of bytes. The case insensitive keyword for the
+// string type is 'string'.
+//
+// The length of a string (its size in bytes) can be discovered using the
+// built-in function len.
+//
+// Time types
+//
+// A time type represents an instant in time with nanosecond precision. Each
+// time has associated with it a location, consulted when computing the
+// presentation form of the time.
+//
+// Predeclared functions
+//
+// The following functions are implicitly declared
+//
+//	avg          complex     contains    count       date
+//	day          formatTime  formatFloat formatInt
+//	hasPrefix    hasSuffix   hour        hours       id
+//	imag         len         max         min         minute
+//	minutes      month       nanosecond  nanoseconds now
+//	parseTime    real        second      seconds     since
+//	sum          timeIn      weekday     year        yearDay
+//
+// Expressions
+//
+// An expression specifies the computation of a value by applying operators and
+// functions to operands.
+//
+// Operands
+//
+// Operands denote the elementary values in an expression. An operand may be a
+// literal, a (possibly qualified) identifier denoting a constant or a function
+// or a table/record set column, or a parenthesized expression.
+//
+//  Operand = Literal | QualifiedIdent | "(" Expression ")" .
+//  Literal = "FALSE" | "NULL" | "TRUE"
+//  	| float_lit | imaginary_lit | int_lit | rune_lit | string_lit
+//  	| ql_parameter .
+//
+// Qualified identifiers
+//
+// A qualified identifier is an identifier qualified with a table/record set
+// name prefix.
+//
+//  QualifiedIdent = identifier [ "." identifier ] .
+//
+// For example
+//
+// 	invoice.Num	// might denote column 'Num' from table 'invoice'
+//
+// Primary expressions
+//
+// Primary expression are the operands for unary and binary expressions.
+//
+//  PrimaryExpression = Operand
+//              | Conversion
+//              | PrimaryExpression Index
+//              | PrimaryExpression Slice
+//              | PrimaryExpression Call .
+//
+//  Call  = "(" [ "*" | ExpressionList ] ")" . // * only in count(*).
+//  Index = "[" Expression "]" .
+//  Slice = "[" [ Expression ] ":" [ Expression ] "]" .
+//
+// For example
+//
+// 	x
+// 	2
+// 	(s + ".txt")
+// 	f(3.1415, true)
+// 	s[i : j + 1]
+//
+// Index expressions
+//
+// A primary expression of the form
+//
+// 	s[x]
+//
+// denotes the element of a string indexed by x. Its type is byte. The value x
+// is called the index.  The following rules apply
+//
+// - The index x must be of integer type except bigint or duration; it is in
+// range if 0 <= x < len(s), otherwise it is out of range.
+//
+// - A constant index must be non-negative and representable by a value of type
+// int.
+//
+// - A constant index must be in range if the string a is a literal.
+//
+// - If x is out of range at run time, a run-time error occurs.
+//
+// - s[x] is the byte at index x and the type of s[x] is byte.
+//
+// If s is NULL or x is NULL then the result is NULL.
+//
+// Otherwise s[x] is illegal.
+//
+// Slices
+//
+// For a string, the primary expression
+//
+// 	s[low : high]
+//
+// constructs a substring. The indices low and high select which elements
+// appear in the result. The result has indices starting at 0 and length equal
+// to high - low.
+//
+// For convenience, any of the indices may be omitted. A missing low index
+// defaults to zero; a missing high index defaults to the length of the sliced
+// operand
+//
+// 	s[2:]  // same s[2 : len(s)]
+// 	s[:3]  // same as s[0 : 3]
+// 	s[:]   // same as s[0 : len(s)]
+//
+// The indices low and high are in range if 0 <= low <= high <= len(a),
+// otherwise they are out of range. A constant index must be non-negative and
+// representable by a value of type int. If both indices are constant, they
+// must satisfy low <= high. If the indices are out of range at run time, a
+// run-time error occurs.
+//
+// Integer values of type bigint or duration cannot be used as indices.
+//
+// If s is NULL the result is NULL. If low or high is not omitted and is NULL
+// then the result is NULL.
+//
+// Calls
+//
+// Given an identifier f denoting a predeclared function,
+//
+// 	f(a1, a2, … an)
+//
+// calls f with arguments a1, a2, … an. Arguments are evaluated before the
+// function is called. The type of the expression is the result type of f.
+//
+// 	complex(x, y)
+// 	len(name)
+//
+// In a function call, the function value and arguments are evaluated in the
+// usual order. After they are evaluated, the parameters of the call are passed
+// by value to the function and the called function begins execution. The
+// return value of the function is passed by value when the function returns.
+//
+// Calling an undefined function causes a compile-time error.
+//
+// Operators
+//
+// Operators combine operands into expressions.
+//
+//  Expression = Term { ( oror | "OR" ) Term } .
+//
+//  ExpressionList = Expression { "," Expression } [ "," ].
+//  Factor =  PrimaryFactor  { ( ge | ">" | le | "<" | neq | eq | "LIKE" ) PrimaryFactor } [ Predicate ] .
+//  PrimaryFactor = PrimaryTerm  { ( "^" | "|" | "-" | "+" ) PrimaryTerm } .
+//  PrimaryTerm = UnaryExpr { ( andnot | "&" | lsh | rsh | "%" | "/" | "*" ) UnaryExpr } .
+//  Term = Factor { ( andand | "AND" ) Factor } .
+//  UnaryExpr = [ "^" | "!" | "-" | "+" ] PrimaryExpression .
+//
+// Comparisons are discussed elsewhere. For other binary operators, the operand
+// types must be identical unless the operation involves shifts or untyped
+// constants. For operations involving constants only, see the section on
+// constant expressions.
+//
+// Except for shift operations, if one operand is an untyped constant and the
+// other operand is not, the constant is converted to the type of the other
+// operand.
+//
+// The right operand in a shift expression must have unsigned integer type or
+// be an untyped constant that can be converted to unsigned integer type. If
+// the left operand of a non-constant shift expression is an untyped constant,
+// the type of the constant is what it would be if the shift expression were
+// replaced by its left operand alone.
+//
+// Pattern matching
+//
+// Expressions of the form
+//
+//	expr1 LIKE expr2
+//
+// yeild a boolean value true if expr2, a regular expression, matches expr1
+// (see also [6]).  Both expression must be of type string. If any one of the
+// expressions is NULL the result is NULL.
+//
+// Predicates
+//
+// Predicates are special form expressions having a boolean result type.
+//
+// Expressions of the form
+//
+//	expr IN ( expr1, expr2, expr3, ... )		// case A
+//
+//	expr NOT IN ( expr1, expr2, expr3, ... )	// case B
+//
+// are equivalent, including NULL handling, to
+//
+//	expr == expr1 || expr == expr2 || expr == expr3 || ...	// case A
+//
+//	expr != expr1 && expr != expr2 && expr != expr3 && ...	// case B
+//
+// The types of involved expressions must be comparable as defined in
+// "Comparison operators".
+//
+// Another form of the IN predicate creates the expression list from a result
+// of a SelectStmt.
+//
+//	DELETE FROM t WHERE id() IN (SELECT id_t FROM u WHERE inactive_days > 365)
+//
+// The SelectStmt must select only one column. The produced expression list is
+// resource limited by the memory available to the process. NULL values
+// produced by the SelectStmt are ignored, but if all records of the SelectStmt
+// are NULL the predicate yields NULL. The select statement is evaluated only
+// once. If the type of expr is not the same as the type of the field returned
+// by the SelectStmt then the set operation yields false. The type of the
+// column returned by the SelectStmt must be one of the simple (non blob-like)
+// types:
+//
+//	bool
+//	byte         // alias uint8
+//	complex128
+//	complex64
+//	float        // alias float64
+//	float32
+//	float64
+//	int          // alias int64
+//	int16
+//	int32
+//	int64
+//	int8
+//	rune         // alias int32
+//	string
+//	uint         // alias uint64
+//	uint16
+//	uint32
+//	uint64
+//	uint8
+//
+// Expressions of the form
+//
+//	expr BETWEEN low AND high	// case A
+//
+//	expr NOT BETWEEN low AND high	// case B
+//
+// are equivalent, including NULL handling, to
+//
+//	expr >= low && expr <= high	// case A
+//
+//	expr < low || expr > high	// case B
+//
+// The types of involved expressions must be ordered as defined in "Comparison
+// operators".
+//
+//  Predicate = (
+//  			[ "NOT" ] (
+//  			  "IN" "(" ExpressionList ")"
+//  			| "IN" "(" SelectStmt [ ";" ] ")"
+//  			| "BETWEEN" PrimaryFactor "AND" PrimaryFactor
+//  			)
+//              |       "IS" [ "NOT" ] "NULL"
+//  	).
+//
+// Expressions of the form
+//
+//	expr IS NULL		// case A
+//
+//	expr IS NOT NULL	// case B
+//
+// yeild a boolean value true if expr does not have a specific type (case A) or
+// if expr has a specific type (case B). In other cases the result is a boolean
+// value false.
+//
+// Operator precedence
+//
+// Unary operators have the highest precedence.
+//
+// There are five precedence levels for binary operators. Multiplication
+// operators bind strongest, followed by addition operators, comparison
+// operators, && (logical AND), and finally || (logical OR)
+//
+// 	Precedence    Operator
+// 	    5             *  /  %  <<  >>  &  &^
+// 	    4             +  -  |  ^
+// 	    3             ==  !=  <  <=  >  >=
+// 	    2             &&
+// 	    1             ||
+//
+// Binary operators of the same precedence associate from left to right. For
+// instance, x / y * z is the same as (x / y) * z.
+//
+// 	+x
+// 	23 + 3*x[i]
+// 	x <= f()
+// 	^a >> b
+// 	f() || g()
+// 	x == y+1 && z > 0
+//
+// Note that the operator precedence is reflected explicitly by the grammar.
+//
+// Arithmetic operators
+//
+// Arithmetic operators apply to numeric values and yield a result of the same
+// type as the first operand. The four standard arithmetic operators (+, -, *,
+// /) apply to integer, rational, floating-point, and complex types; + also
+// applies to strings; +,- also applies to times.  All other arithmetic
+// operators apply to integers only.
+//
+// 	+    sum                    integers, rationals, floats, complex values, strings
+// 	-    difference             integers, rationals, floats, complex values, times
+// 	*    product                integers, rationals, floats, complex values
+// 	/    quotient               integers, rationals, floats, complex values
+// 	%    remainder              integers
+//
+// 	&    bitwise AND            integers
+// 	|    bitwise OR             integers
+// 	^    bitwise XOR            integers
+// 	&^   bit clear (AND NOT)    integers
+//
+// 	<<   left shift             integer << unsigned integer
+// 	>>   right shift            integer >> unsigned integer
+//
+// Strings can be concatenated using the + operator
+//
+// 	"hi" + string(c) + " and good bye"
+//
+// String addition creates a new string by concatenating the operands.
+//
+// A value of type duration can be added to or subtracted from a value of type time.
+//
+//	now() + duration("1h")	// time after 1 hour from now
+//	duration("1h") + now()	// time after 1 hour from now
+//	now() - duration("1h")	// time before 1 hour from now
+//	duration("1h") - now()	// illegal, negative times do not exist
+//
+// Times can subtracted from each other producing a value of type duration.
+//
+//	now() - t0	// elapsed time since t0
+//	now() + now()	// illegal, operator + not defined for times
+//
+// For two integer values x and y, the integer quotient q = x / y and remainder
+// r = x % y satisfy the following relationships
+//
+// 	x = q*y + r  and  |r| < |y|
+//
+// with x / y truncated towards zero ("truncated division").
+//
+// 	 x     y     x / y     x % y
+// 	 5     3       1         2
+// 	-5     3      -1        -2
+// 	 5    -3      -1         2
+// 	-5    -3       1        -2
+//
+// As an exception to this rule, if the dividend x is the most negative value
+// for the int type of x, the quotient q = x / -1 is equal to x (and r = 0).
+//
+// 				 x, q
+// 	int8                     -128
+// 	int16                  -32768
+// 	int32             -2147483648
+// 	int64    -9223372036854775808
+//
+// If the divisor is a constant expression, it must not be zero. If the divisor
+// is zero at run time, a run-time error occurs. If the dividend is
+// non-negative and the divisor is a constant power of 2, the division may be
+// replaced by a right shift, and computing the remainder may be replaced by a
+// bitwise AND operation
+//
+// 	 x     x / 4     x % 4     x >> 2     x & 3
+// 	 11      2         3         2          3
+// 	-11     -2        -3        -3          1
+//
+// The shift operators shift the left operand by the shift count specified by
+// the right operand. They implement arithmetic shifts if the left operand is a
+// signed integer and logical shifts if it is an unsigned integer. There is no
+// upper limit on the shift count. Shifts behave as if the left operand is
+// shifted n times by 1 for a shift count of n. As a result, x << 1 is the same
+// as x*2 and x >> 1 is the same as x/2 but truncated towards negative
+// infinity.
+//
+// For integer operands, the unary operators +, -, and ^ are defined as follows
+//
+// 	+x                          is 0 + x
+// 	-x    negation              is 0 - x
+// 	^x    bitwise complement    is m ^ x  with m = "all bits set to 1" for unsigned x
+// 	                                      and  m = -1 for signed x
+//
+// For floating-point and complex numbers, +x is the same as x, while -x is the
+// negation of x. The result of a floating-point or complex division by zero is
+// not specified beyond the IEEE-754 standard; whether a run-time error occurs
+// is implementation-specific.
+//
+// Whenever any operand of any arithmetic operation, unary or binary, is NULL,
+// as well as in the case of the string concatenating operation, the result is
+// NULL.
+//
+//	42*NULL		// the result is NULL
+//	NULL/x		// the result is NULL
+//	"foo"+NULL	// the result is NULL
+//
+// Integer overflow
+//
+// For unsigned integer values, the operations +, -, *, and << are computed
+// modulo 2n, where n is the bit width of the unsigned integer's type. Loosely
+// speaking, these unsigned integer operations discard high bits upon overflow,
+// and expressions may rely on ``wrap around''.
+//
+// For signed integers with a finite bit width, the operations +, -, *, and <<
+// may legally overflow and the resulting value exists and is deterministically
+// defined by the signed integer representation, the operation, and its
+// operands. No exception is raised as a result of overflow. An evaluator may
+// not optimize an expression under the assumption that overflow does not
+// occur. For instance, it may not assume that x < x + 1 is always true.
+//
+// Integers of type bigint and rationals do not overflow but their handling is
+// limited by the memory resources available to the program.
+//
+// Comparison operators
+//
+// Comparison operators compare two operands and yield a boolean value.
+//
+// 	==    equal
+// 	!=    not equal
+// 	<     less
+// 	<=    less or equal
+// 	>     greater
+// 	>=    greater or equal
+//
+// In any comparison, the first operand must be of same type as is the second
+// operand, or vice versa.
+//
+// The equality operators == and != apply to operands that are comparable. The
+// ordering operators <, <=, >, and >= apply to operands that are ordered.
+// These terms and the result of the comparisons are defined as follows
+//
+// - Boolean values are comparable. Two boolean values are equal if they are
+// either both true or both false.
+//
+// - Complex values are comparable. Two complex values u and v are equal if
+// both real(u) == real(v) and imag(u) == imag(v).
+//
+// - Integer values are comparable and ordered, in the usual way. Note that
+// durations are integers.
+//
+// - Floating point values are comparable and ordered, as defined by the
+// IEEE-754 standard.
+//
+// - Rational values are comparable and ordered, in the usual way.
+//
+// - String values are comparable and ordered, lexically byte-wise.
+//
+// - Time values are comparable and ordered.
+//
+// Whenever any operand of any comparison operation is NULL, the result is
+// NULL.
+//
+// Note that slices are always of type string.
+//
+// Logical operators
+//
+// Logical operators apply to boolean values and yield a boolean result. The
+// right operand is evaluated conditionally.
+//
+// 	&&    conditional AND    p && q  is  "if p then q else false"
+// 	||    conditional OR     p || q  is  "if p then true else q"
+// 	!     NOT                !p      is  "not p"
+//
+// The truth tables for logical operations with NULL values
+//
+// 	+-------+-------+---------+---------+
+// 	|   p   |   q   |  p || q |  p && q |
+// 	+-------+-------+---------+---------+
+// 	| true  | true  | *true   |  true   |
+// 	| true  | false | *true   |  false  |
+// 	| true  | NULL  | *true   |  NULL   |
+// 	| false | true  |  true   | *false  |
+// 	| false | false |  false  | *false  |
+// 	| false | NULL  |  NULL   | *false  |
+// 	| NULL  | true  |  true   |  NULL   |
+// 	| NULL  | false |  NULL   |  false  |
+// 	| NULL  | NULL  |  NULL   |  NULL   |
+// 	+-------+-------+---------+---------+
+// 	 * indicates q is not evaluated.
+//
+// 	+-------+-------+
+// 	|   p   |  !p   |
+// 	+-------+-------+
+// 	| true  | false |
+// 	| false | true  |
+// 	| NULL  | NULL  |
+// 	+-------+-------+
+//
+// Conversions
+//
+// Conversions are expressions of the form T(x) where T is a type and x is an
+// expression that can be converted to type T.
+//
+//  Conversion = Type "(" Expression ")" .
+//
+// A constant value x can be converted to type T in any of these cases:
+//
+// - x is representable by a value of type T.
+//
+// - x is a floating-point constant, T is a floating-point type, and x is
+// representable by a value of type T after rounding using IEEE 754
+// round-to-even rules. The constant T(x) is the rounded value.
+//
+// - x is an integer constant and T is a string type. The same rule as for
+// non-constant x applies in this case.
+//
+// Converting a constant yields a typed constant as result.
+//
+// 	float32(2.718281828)     // 2.718281828 of type float32
+// 	complex128(1)            // 1.0 + 0.0i of type complex128
+// 	float32(0.49999999)      // 0.5 of type float32
+// 	string('x')              // "x" of type string
+// 	string(0x266c)           // "♬" of type string
+// 	"foo" + "bar"            // "foobar"
+// 	int(1.2)                 // illegal: 1.2 cannot be represented as an int
+// 	string(65.0)             // illegal: 65.0 is not an integer constant
+//
+// A non-constant value x can be converted to type T in any of these cases:
+//
+// - x has type T.
+//
+// - x's type and T are both integer or floating point types.
+//
+// - x's type and T are both complex types.
+//
+// - x is an integer, except bigint or duration, and T is a string type.
+//
+// Specific rules apply to (non-constant) conversions between numeric types or
+// to and from a string type. These conversions may change the representation
+// of x and incur a run-time cost. All other conversions only change the type
+// but not the representation of x.
+//
+// A conversion of NULL to any type yields NULL.
+//
+// Conversions between numeric types
+//
+// For the conversion of non-constant numeric values, the following rules
+// apply
+//
+// 1. When converting between integer types, if the value is a signed integer,
+// it is sign extended to implicit infinite precision; otherwise it is zero
+// extended.  It is then truncated to fit in the result type's size. For
+// example, if v == uint16(0x10F0), then uint32(int8(v)) == 0xFFFFFFF0. The
+// conversion always yields a valid value; there is no indication of overflow.
+//
+// 2. When converting a floating-point number to an integer, the fraction is
+// discarded (truncation towards zero).
+//
+// 3. When converting an integer or floating-point number to a floating-point
+// type, or a complex number to another complex type, the result value is
+// rounded to the precision specified by the destination type. For instance,
+// the value of a variable x of type float32 may be stored using additional
+// precision beyond that of an IEEE-754 32-bit number, but float32(x)
+// represents the result of rounding x's value to 32-bit precision. Similarly,
+// x + 0.1 may use more than 32 bits of precision, but float32(x + 0.1) does
+// not.
+//
+// In all non-constant conversions involving floating-point or complex values,
+// if the result type cannot represent the value the conversion succeeds but
+// the result value is implementation-dependent.
+//
+// Conversions to and from a string type
+//
+// 1. Converting a signed or unsigned integer value to a string type yields a
+// string containing the UTF-8 representation of the integer. Values outside
+// the range of valid Unicode code points are converted to "\uFFFD".
+//
+// 	string('a')       // "a"
+// 	string(-1)        // "\ufffd" == "\xef\xbf\xbd"
+// 	string(0xf8)      // "\u00f8" == "ø" == "\xc3\xb8"
+// 	string(0x65e5)    // "\u65e5" == "日" == "\xe6\x97\xa5"
+//
+// 2. Converting a blob to a string type yields a string whose successive bytes
+// are the elements of the blob.
+//
+//	string(b /* []byte{'h', 'e', 'l', 'l', '\xc3', '\xb8'} */)   // "hellø"
+//	string(b /* []byte{} */)                                     // ""
+//	string(b /* []byte(nil) */)                                  // ""
+//
+// 3. Converting a value of a string type to a blob yields a blob whose
+// successive elements are the bytes of the string.
+//
+//	blob("hellø")   // []byte{'h', 'e', 'l', 'l', '\xc3', '\xb8'}
+//	blob("")        // []byte{}
+//
+// 4. Converting a value of a bigint type to a string yields a string
+// containing the decimal decimal representation of the integer.
+//
+//	string(M9)	// "2305843009213693951"
+//
+// 5. Converting a value of a string type to a bigint yields a bigint value
+// containing the integer represented by the string value. A prefix of “0x” or
+// “0X” selects base 16; the “0” prefix selects base 8, and a “0b” or “0B”
+// prefix selects base 2. Otherwise the value is interpreted in base 10. An
+// error occurs if the string value is not in any valid format.
+//
+//	bigint("2305843009213693951")		// M9
+//	bigint("0x1ffffffffffffffffffffff")	// M10 == 2^89-1
+//
+// 6. Converting a value of a rational type to a string yields a string
+// containing the decimal decimal representation of the rational in the form
+// "a/b" (even if b == 1).
+//
+//	string(bigrat(355)/bigrat(113))	// "355/113"
+//
+// 7. Converting a value of a string type to a bigrat yields a bigrat value
+// containing the rational represented by the string value. The string can be
+// given as a fraction "a/b" or as a floating-point number optionally followed
+// by an exponent. An error occurs if the string value is not in any valid
+// format.
+//
+//	bigrat("1.2e-34")
+//	bigrat("355/113")
+//
+// 8. Converting a value of a duration type to a string returns a string
+// representing the duration in the form "72h3m0.5s". Leading zero units are
+// omitted. As a special case, durations less than one second format using a
+// smaller unit (milli-, micro-, or nanoseconds) to ensure that the leading
+// digit is non-zero. The zero duration formats as 0, with no unit.
+//
+//	string(elapsed)	// "1h", for example
+//
+// 9. Converting a string value to a duration yields a duration represented by
+// the string.  A duration string is a possibly signed sequence of decimal
+// numbers, each with optional fraction and a unit suffix, such as "300ms",
+// "-1.5h" or "2h45m". Valid time units are "ns", "us" (or "µs"), "ms", "s",
+// "m", "h".
+//
+//	duration("1m")	// http://golang.org/pkg/time/#Minute
+//
+// 10. Converting a time value to a string returns the time formatted using the
+// format string
+//
+//	"2006-01-02 15:04:05.999999999 -0700 MST"
+//
+// Order of evaluation
+//
+// When evaluating the operands of an expression or of function calls,
+// operations are evaluated in lexical left-to-right order.
+//
+// For example, in the evaluation of
+//
+// 	g(h(), i()+x[j()], c)
+//
+// the function calls and evaluation of c happen in the order h(), i(), j(), c.
+//
+// Floating-point operations within a single expression are evaluated according
+// to the associativity of the operators. Explicit parentheses affect the
+// evaluation by overriding the default associativity. In the expression x + (y
+// + z) the addition y + z is performed before adding x.
+//
+// Statements
+//
+// Statements control execution.
+//
+//  Statement =  EmptyStmt | AlterTableStmt | BeginTransactionStmt | CommitStmt
+//  	| CreateIndexStmt | CreateTableStmt | DeleteFromStmt | DropIndexStmt
+//  	| DropTableStmt | InsertIntoStmt | RollbackStmt | SelectStmt
+//  	| TruncateTableStmt | UpdateStmt | ExplainStmt.
+//
+//  StatementList = Statement { ";" Statement } .
+//
+// Empty statements
+//
+// The empty statement does nothing.
+//
+//  EmptyStmt = .
+//
+// ALTER TABLE
+//
+// Alter table statements modify existing tables.  With the ADD clause it adds
+// a new column to the table. The column must not exist. With the DROP clause
+// it removes an existing column from a table. The column must exist and it
+// must be not the only (last) column of the table. IOW, there cannot be a
+// table with no columns.
+//
+//  AlterTableStmt = "ALTER" "TABLE" TableName ( "ADD" ColumnDef | "DROP" "COLUMN"  ColumnName ) .
+//
+// For example
+//
+//	BEGIN TRANSACTION;
+// 		ALTER TABLE Stock ADD Qty int;
+// 		ALTER TABLE Income DROP COLUMN Taxes;
+//	COMMIT;
+//
+// When adding a column to a table with existing data, the constraint clause of
+// the ColumnDef cannot be used. Adding a constrained column to an empty table
+// is fine.
+//
+// BEGIN TRANSACTION
+//
+// Begin transactions statements introduce a new transaction level. Every
+// transaction level must be eventually balanced by exactly one of COMMIT or
+// ROLLBACK statements. Note that when a transaction is roll-backed because of
+// a statement failure then no explicit balancing of the respective BEGIN
+// TRANSACTION is statement is required nor permitted.
+//
+// Failure to properly balance any opened transaction level may cause dead
+// locks and/or lose of data updated in the uppermost opened but never properly
+// closed transaction level.
+//
+//  BeginTransactionStmt = "BEGIN" "TRANSACTION" .
+//
+// For example
+//
+//	BEGIN TRANSACTION;
+//		INSERT INTO foo VALUES (42, 3.14);
+//		INSERT INTO foo VALUES (-1, 2.78);
+//	COMMIT;
+//
+// Mandatory transactions
+//
+// A database cannot be updated (mutated) outside of a transaction. Statements
+// requiring a transaction
+//
+//	ALTER TABLE
+//	COMMIT
+//	CREATE INDEX
+//	CREATE TABLE
+//	DELETE FROM
+//	DROP INDEX
+//	DROP TABLE
+//	INSERT INTO
+//	ROLLBACK
+//	TRUNCATE TABLE
+//	UPDATE
+//
+// A database is effectively read only outside of a transaction. Statements not
+// requiring a transaction
+//
+//	BEGIN TRANSACTION
+//	SELECT FROM
+//
+// COMMIT
+//
+// The commit statement closes the innermost transaction nesting level. If
+// that's the outermost level then the updates to the DB made by the
+// transaction are atomically made persistent.
+//
+//  CommitStmt = "COMMIT" .
+//
+// For example
+//
+//	BEGIN TRANSACTION;
+//		INSERT INTO AccountA (Amount) VALUES ($1);
+//		INSERT INTO AccountB (Amount) VALUES (-$1);
+//	COMMIT;
+//
+// CREATE INDEX
+//
+// Create index statements create new indices. Index is a named projection of
+// ordered values of a table column to the respective records. As a special
+// case the id() of the record can be indexed. Index name must not be the same
+// as any of the existing tables and it also cannot be the same as of any
+// column name of the table the index is on.
+//
+//  CreateIndexStmt = "CREATE" [ "UNIQUE" ] "INDEX" [ "IF" "NOT" "EXISTS" ]
+//  	IndexName "ON" TableName "(" ExpressionList ")" .
+//
+// For example
+//
+//	BEGIN TRANSACTION;
+//		CREATE TABLE Orders (CustomerID int, Date time);
+//		CREATE INDEX OrdersID ON Orders (id());
+//		CREATE INDEX OrdersDate ON Orders (Date);
+//		CREATE TABLE Items (OrderID int, ProductID int, Qty int);
+//		CREATE INDEX ItemsOrderID ON Items (OrderID);
+//	COMMIT;
+//
+// Now certain SELECT statements may use the indices to speed up joins and/or
+// to speed up record set filtering when the WHERE clause is used; or the
+// indices might be used to improve the performance when the ORDER BY clause is
+// present.
+//
+// The UNIQUE modifier requires the indexed values tuple to be index-wise
+// unique or have all values NULL.
+//
+// The optional IF NOT EXISTS clause makes the statement a no operation if the
+// index already exists.
+//
+// Simple index
+//
+// A simple index consists of only one expression which must be either a column
+// name or the built-in id().
+//
+// Expression list index
+//
+// A more complex and more general index is one that consists of more than one
+// expression or its single expression does not qualify as a simple index. In
+// this case the type of all expressions in the list must be one of the non
+// blob-like types.
+//
+// Note: Blob-like types are blob, bigint, bigrat, time and duration.
+//
+// CREATE TABLE
+//
+// Create table statements create new tables. A column definition declares the
+// column name and type. Table names and column names are case sensitive.
+// Neither a table or an index of the same name may exist in the DB.
+//
+//  CreateTableStmt = "CREATE" "TABLE" [ "IF" "NOT" "EXISTS" ] TableName
+//  	"(" ColumnDef { "," ColumnDef } [ "," ] ")" .
+//
+//  ColumnDef = ColumnName Type [ "NOT" "NULL" | Expression ] [ "DEFAULT" Expression ] .
+//  ColumnName = identifier .
+//  TableName = identifier .
+//
+// For example
+//
+//	BEGIN TRANSACTION;
+// 		CREATE TABLE department (
+// 			DepartmentID   int,
+// 			DepartmentName string,
+// 		);
+// 		CREATE TABLE employee (
+// 			LastName	string,
+// 			DepartmentID	int,
+// 		);
+//	COMMIT;
+//
+// The optional IF NOT EXISTS clause makes the statement a no operation if the
+// table already exists.
+//
+// The optional constraint clause has two forms. The first one is found in many
+// SQL dialects.
+//
+//	BEGIN TRANSACTION;
+// 		CREATE TABLE department (
+// 			DepartmentID   int,
+// 			DepartmentName string NOT NULL,
+// 		);
+//	COMMIT;
+//
+// This form prevents the data in column DepartmentName to be NULL.
+//
+// The second form allows an arbitrary boolean expression to be used to
+// validate the column. If the value of the expression is true then the
+// validation succeeded. If the value of the expression is false or NULL then
+// the validation fails. If the value of the expression is not of type bool an
+// error occurs.
+//
+//	BEGIN TRANSACTION;
+// 		CREATE TABLE department (
+// 			DepartmentID   int,
+// 			DepartmentName string DepartmentName IN ("HQ", "R/D", "Lab", "HR"),
+// 		);
+//	COMMIT;
+//
+//	BEGIN TRANSACTION;
+// 		CREATE TABLE t (
+//			TimeStamp time TimeStamp < now() && since(TimeStamp) < duration("10s"),
+//			Event string Event != "" && Event like "[0-9]+:[ \t]+.*",
+//		);
+//	COMMIT;
+//
+// The optional DEFAULT clause is an expression which, if present, is
+// substituted instead of a NULL value when the colum is assigned a value.
+//
+//	BEGIN TRANSACTION;
+// 		CREATE TABLE department (
+// 			DepartmentID   int,
+// 			DepartmentName string DepartmentName IN ("HQ", "R/D", "Lab", "HR") DEFAULT "HQ",
+// 		);
+//	COMMIT;
+//
+// Note that the constraint and/or default expressions may refer to other
+// columns by name:
+//
+//	BEGIN TRANSACTION;
+//		CREATE TABLE t (
+//			a int,
+//			b int b > a && b < c DEFAULT (a+c)/2,
+//			c int,
+//	);
+//	COMMIT;
+//
+//
+// Constraints and defaults
+//
+// When a table row is inserted by the INSERT INTO statement or when a table
+// row is updated by the UPDATE statement, the order of operations is as
+// follows:
+//
+// 1. The new values of the affected columns are set and the values of all the
+// row columns become the named values which can be referred to in default
+// expressions evaluated in step 2.
+//
+// 2. If any row column value is NULL and the DEFAULT clause is present in the
+// column's definition, the default expression is evaluated and its value is
+// set as the respective column value.
+//
+// 3. The values, potentially updated, of row columns become the named values
+// which can be referred to in constraint expressions evaluated during step 4.
+//
+// 4. All row columns which definition has the constraint clause present will
+// have that constraint checked. If any constraint violation is detected, the
+// overall operation fails and no changes to the table are made.
+//
+// DELETE FROM
+//
+// Delete from statements remove rows from a table, which must exist.
+//
+//  DeleteFromStmt = "DELETE" "FROM" TableName [ WhereClause ] .
+//
+// For example
+//
+//	BEGIN TRANSACTION;
+//		DELETE FROM DepartmentID
+//		WHERE DepartmentName == "Ponies";
+//	COMMIT;
+//
+// If the WHERE clause is not present then all rows are removed and the
+// statement is equivalent to the TRUNCATE TABLE statement.
+//
+// DROP INDEX
+//
+// Drop index statements remove indices from the DB. The index must exist.
+//
+//  DropIndexStmt = "DROP" "INDEX" [ "IF" "EXISTS" ] IndexName .
+//  IndexName = identifier .
+//
+// For example
+//
+//	BEGIN TRANSACTION;
+//		DROP INDEX ItemsOrderID;
+//	COMMIT;
+//
+// The optional IF EXISTS clause makes the statement a no operation if the
+// index does not exist.
+//
+// DROP TABLE
+//
+// Drop table statements remove tables from the DB. The table must exist.
+//
+//  DropTableStmt = "DROP" "TABLE" [ "IF" "EXISTS" ] TableName .
+//
+// For example
+//
+//	BEGIN TRANSACTION;
+// 		DROP TABLE Inventory;
+//	COMMIT;
+//
+// The optional IF EXISTS clause makes the statement a no operation if the
+// table does not exist.
+//
+// INSERT INTO
+//
+// Insert into statements insert new rows into tables. New rows come from
+// literal data, if using the VALUES clause, or are a result of select
+// statement. In the later case the select statement is fully evaluated before
+// the insertion of any rows is performed, allowing to insert values calculated
+// from the same table rows are to be inserted into. If the ColumnNameList part
+// is omitted then the number of values inserted in the row must be the same as
+// are columns in the table. If the ColumnNameList part is present then the
+// number of values per row must be same as the same number of column names.
+// All other columns of the record are set to NULL.  The type of the value
+// assigned to a column must be the same as is the column's type or the value
+// must be NULL.
+//
+//  InsertIntoStmt = "INSERT" "INTO" TableName [ "(" ColumnNameList ")" ] ( Values | SelectStmt ) .
+//
+//  ColumnNameList = ColumnName { "," ColumnName } [ "," ] .
+//  Values = "VALUES" "(" ExpressionList ")" { "," "(" ExpressionList ")" } [ "," ] .
+//
+// For example
+//
+//	BEGIN TRANSACTION;
+// 		INSERT INTO department (DepartmentID) VALUES (42);
+//
+// 		INSERT INTO department (
+// 			DepartmentName,
+// 			DepartmentID,
+// 		)
+// 		VALUES (
+// 			"R&D",
+// 			42,
+// 		);
+//
+// 		INSERT INTO department VALUES
+//			(42, "R&D"),
+//			(17, "Sales"),
+// 		;
+//	COMMIT;
+//
+//	BEGIN TRANSACTION;
+//		INSERT INTO department (DepartmentName, DepartmentID)
+//		SELECT DepartmentName+"/headquarters", DepartmentID+1000
+//		FROM department;
+//	COMMIT;
+//
+// If any of the columns of the table were defined using the optional
+// constraints clause or the optional defaults clause then those are processed
+// on a per row basis. The details are discussed in the "Constraints and
+// defaults" chapter below the CREATE TABLE statement documentation.
+//
+// Explain statement
+//
+// Explain statement produces a recordset consisting of lines of text which
+// describe the execution plan of a statement, if any.
+//
+//  ExplainStmt = "EXPLAIN" Statement .
+//
+// For example, the QL tool treats the explain statement specially and outputs
+// the joined lines:
+//
+//	$ ql 'create table t(i int); create table u(j int)'
+//	$ ql 'explain select * from t, u where t.i > 42 && u.j < 314'
+//	┌Compute Cartesian product of
+//	│   ┌Iterate all rows of table "t"
+//	│   └Output field names ["i"]
+//	│   ┌Iterate all rows of table "u"
+//	│   └Output field names ["j"]
+//	└Output field names ["t.i" "u.j"]
+//	┌Filter on t.i > 42 && u.j < 314
+//	│Possibly useful indices
+//	│CREATE INDEX xt_i ON t(i);
+//	│CREATE INDEX xu_j ON u(j);
+//	└Output field names ["t.i" "u.j"]
+//	$ ql 'CREATE INDEX xt_i ON t(i); CREATE INDEX xu_j ON u(j);'
+//	$ ql 'explain select * from t, u where t.i > 42 && u.j < 314'
+//	┌Compute Cartesian product of
+//	│   ┌Iterate all rows of table "t" using index "xt_i" where i > 42
+//	│   └Output field names ["i"]
+//	│   ┌Iterate all rows of table "u" using index "xu_j" where j < 314
+//	│   └Output field names ["j"]
+//	└Output field names ["t.i" "u.j"]
+//	$ ql 'explain select * from t where i > 12 and i between 10 and 20 and i < 42'
+//	┌Iterate all rows of table "t" using index "xt_i" where i > 12 && i <= 20
+//	└Output field names ["i"]
+//	$
+//
+// The explanation may aid in uderstanding how a statement/query would be
+// executed and if indices are used as expected - or which indices may possibly
+// improve the statement performance.  The create index statements above were
+// directly copy/pasted in the terminal from the suggestions provided by the
+// filter recordset pipeline part returned by the explain statement.
+//
+// If the statement has nothing special in its plan, the result is the original
+// statement.
+//
+//	$ ql 'explain delete from t where 42 < i'
+//	DELETE FROM t WHERE i > 42;
+//	$
+//
+// To get an explanation of the select statement of the IN predicate, use the EXPLAIN
+// statement with that particular select statement.
+//
+//	$ ql 'explain select * from t where i in (select j from u where j > 0)'
+//	┌Iterate all rows of table "t"
+//	└Output field names ["i"]
+//	┌Filter on i IN (SELECT j FROM u WHERE j > 0;)
+//	└Output field names ["i"]
+//	$ ql 'explain select j from u where j > 0'
+//	┌Iterate all rows of table "u" using index "xu_j" where j > 0
+//	└Output field names ["j"]
+//	$
+//
+// ROLLBACK
+//
+// The rollback statement closes the innermost transaction nesting level
+// discarding any updates to the DB made by it. If that's the outermost level
+// then the effects on the DB are as if the transaction never happened.
+//
+//  RollbackStmt = "ROLLBACK" .
+//
+// For example
+//
+//	// First statement list
+//	BEGIN TRANSACTION
+//		SELECT * INTO tmp FROM foo;
+//		INSERT INTO tmp SELECT * from bar;
+//		SELECT * from tmp;
+//
+// The (temporary) record set from the last statement is returned and can be
+// processed by the client.
+//
+//	// Second statement list
+//	ROLLBACK;
+//
+// In this case the rollback is the same as 'DROP TABLE tmp;' but it can be a
+// more complex operation.
+//
+// SELECT FROM
+//
+// Select from statements produce recordsets. The optional DISTINCT modifier
+// ensures all rows in the result recordset are unique. Either all of the
+// resulting fields are returned ('*') or only those named in FieldList.
+//
+// RecordSetList is a list of table names or parenthesized select statements,
+// optionally (re)named using the AS clause.
+//
+// The result can be filtered using a WhereClause and orderd by the OrderBy
+// clause.
+//
+//  SelectStmt = "SELECT" [ "DISTINCT" ] ( "*" | FieldList ) "FROM" RecordSetList
+//  	[ JoinClause ] [ WhereClause ] [ GroupByClause ] [ OrderBy ] [ Limit ] [ Offset ].
+//
+//  JoinClause = ( "LEFT" | "RIGHT" | "FULL" ) [ "OUTER" ] "JOIN" RecordSet "ON" Expression .
+//
+//  RecordSet = ( TableName | "(" SelectStmt [ ";" ] ")" ) [ "AS" identifier ] .
+//  RecordSetList = RecordSet { "," RecordSet } [ "," ] .
+//
+// For example
+//
+// 	SELECT * FROM Stock;
+//
+// 	SELECT DepartmentID
+// 	FROM department
+// 	WHERE DepartmentID == 42
+// 	ORDER BY DepartmentName;
+//
+// 	SELECT employee.LastName
+// 	FROM department, employee
+// 	WHERE department.DepartmentID == employee.DepartmentID
+// 	ORDER BY DepartmentID;
+//
+// If Recordset is a nested, parenthesized SelectStmt then it must be given a
+// name using the AS clause if its field are to be accessible in expressions.
+//
+// 	SELECT a.b, c.d
+// 	FROM
+// 		x AS a,
+// 		(
+// 			SELECT * FROM y;
+// 		) AS c
+//	WHERE a.e > c.e;
+//
+// Fields naming rules
+//
+// A field is an named expression. Identifiers, not used as a type in
+// conversion or a function name in the Call clause, denote names of (other)
+// fields, values of which should be used in the expression.
+//
+//  Field = Expression [ "AS" identifier ] .
+//
+// The expression can be named using the AS clause.  If the AS clause is not
+// present and the expression consists solely of a field name, then that field
+// name is used as the name of the resulting field. Otherwise the field is
+// unnamed.
+//
+// For example
+//
+//	SELECT 314, 42 as AUQLUE, DepartmentID, DepartmentID+1000, LastName as Name from employee;
+//	// Fields are []string{"", "AUQLUE", "DepartmentID", "", "Name"}
+//
+// The SELECT statement can optionally enumerate the desired/resulting fields
+// in a list.
+//
+//  FieldList = Field { "," Field } [ "," ] .
+//
+// No two identical field names can appear in the list.
+//
+//	SELECT DepartmentID, LastName, DepartmentID from employee;
+//	// duplicate field name "DepartmentID"
+//
+//	SELECT DepartmentID, LastName, DepartmentID as ID2 from employee;
+//	// works
+//
+// When more than one record set is used in the FROM clause record set list,
+// the result record set field names are rewritten to be qualified using
+// the record set names.
+//
+//	SELECT * FROM employee, department;
+//	// Fields are []string{"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
+//
+// If a particular record set doesn't have a name, its respective fields became
+// unnamed.
+//
+//	SELECT * FROM employee as e, ( SELECT * FROM department);
+//	// Fields are []string{"e.LastName", "e.DepartmentID", "", ""
+//
+//	SELECT * FROM employee AS e, ( SELECT * FROM department) AS d;
+//	// Fields are []string{"e.LastName", "e.DepartmentID", "d.DepartmentID", "d.DepartmentName"
+//
+// Outer joins
+//
+// The optional JOIN clause, for example
+//
+//	SELECT *
+//	FROM a
+//	LEFT OUTER JOIN b ON expr;
+//
+// is mostly equal to
+//
+//	SELECT *
+//	FROM a, b
+//	WHERE expr;
+//
+// except that the rows from a which, when they appear in the cross join, never
+// made expr to evaluate to true, are combined with a virtual row from b,
+// containing all nulls, and added to the result set. For the RIGHT JOIN
+// variant the discussed rules are used for rows from b not satisfying expr ==
+// true and the virtual, all-null row "comes" from a. The FULL JOIN adds the
+// respective rows which would be otherwise provided by the separate executions
+// of the LEFT JOIN and RIGHT JOIN variants. For more thorough OUTER JOIN
+// discussion please see the Wikipedia article at [10].
+//
+// Recordset ordering
+//
+// Resultins rows of a SELECT statement can be optionally ordered by the ORDER
+// BY clause.  Collating proceeds by considering the expressions in the
+// expression list left to right until a collating order is determined. Any
+// possibly remaining expressions are not evaluated.
+//
+//  OrderBy = "ORDER" "BY" ExpressionList [ "ASC" | "DESC" ] .
+//
+// All of the expression values must yield an ordered type or NULL. Ordered
+// types are defined in "Comparison operators". Collating of elements having a
+// NULL value is different compared to what the comparison operators yield in
+// expression evaluation (NULL result instead of a boolean value).
+//
+// Below, T denotes a non NULL value of any QL type.
+//
+// 	NULL < T
+//
+// NULL collates before any non NULL value (is considered smaller than T).
+//
+//	NULL == NULL
+//
+// Two NULLs have no collating order (are considered equal).
+//
+// Recordset filtering
+//
+// The WHERE clause restricts records considered by some statements, like
+// SELECT FROM, DELETE FROM, or UPDATE.
+//
+//	expression value	consider the record
+//	----------------	-------------------
+//	true			yes
+//	false or NULL		no
+//
+// It is an error if the expression evaluates to a non null value of non bool
+// type.
+//
+//  WhereClause = "WHERE" Expression .
+//
+// Recordset grouping
+//
+// The GROUP BY clause is used to project rows having common values into a
+// smaller set of rows.
+//
+// For example
+//
+//	SELECT Country, sum(Qty) FROM Sales GROUP BY Country;
+//
+//	SELECT Country, Product FROM Sales GROUP BY Country, Product;
+//
+//	SELECT DISTINCT Country, Product FROM Sales;
+//
+// Using the GROUP BY without any aggregate functions in the selected fields is
+// in certain cases equal to using the DISTINCT modifier. The last two examples
+// above produce the same resultsets.
+//
+//  GroupByClause = "GROUP BY" ColumnNameList .
+//
+// Skipping records
+//
+// The optional OFFSET clause allows to ignore first N records.  For example
+//
+//	SELECT * FROM t OFFSET 10;
+//
+// The above will produce only rows 11, 12, ... of the record set, if they
+// exist. The value of the expression must a non negative integer, but not
+// bigint or duration.
+//
+//  Offset = "OFFSET" Expression .
+//
+// Limiting the result set size
+//
+// The optional LIMIT clause allows to ignore all but first N records.  For
+// example
+//
+//	SELECT * FROM t LIMIT 10;
+//
+// The above will return at most the first 10 records of the record set. The
+// value of the expression must a non negative integer, but not bigint or
+// duration.
+//
+//  Limit = "Limit" Expression .
+//
+// The LIMIT and OFFSET clauses can be combined. For example
+//
+//	SELECT * FROM t LIMIT 5 OFFSET 3;
+//
+// Considering table t has, say 10 records, the above will produce only records
+// 4 - 8.
+//
+//	#1:	Ignore 1/3
+//	#2:	Ignore 2/3
+//	#3:	Ignore 3/3
+//	#4:	Return 1/5
+//	#5:	Return 2/5
+//	#6:	Return 3/5
+//	#7:	Return 4/5
+//	#8:	Return 5/5
+//
+// After returning record #8, no more result rows/records are computed.
+//
+// Select statement evaluation order
+//
+// 1. The FROM clause is evaluated, producing a Cartesian product of its source
+// record sets (tables or nested SELECT statements).
+//
+// 2. If present, the JOIN cluase is evaluated on the result set of the
+// previous evaluation and the recordset specified by the JOIN clause. (...
+// JOIN Recordset ON ...)
+//
+// 3. If present, the WHERE clause is evaluated on the result set of the
+// previous evaluation.
+//
+// 4. If present, the GROUP BY clause is evaluated on the result set of the
+// previous evaluation(s).
+//
+// 5. The SELECT field expressions are evaluated on the result set of the
+// previous evaluation(s).
+//
+// 6. If present, the DISTINCT modifier is evaluated on the result set of the
+// previous evaluation(s).
+//
+// 7. If present, the ORDER BY clause is evaluated on the result set of the
+// previous evaluation(s).
+//
+// 8. If present, the OFFSET clause is evaluated on the result set of the
+// previous evaluation(s). The offset expression is evaluated once for the
+// first record produced by the previous evaluations.
+//
+// 9. If present, the LIMIT clause is evaluated on the result set of the
+// previous evaluation(s). The limit expression is evaluated once for the first
+// record produced by the previous evaluations.
+//
+//
+// TRUNCATE TABLE
+//
+// Truncate table statements remove all records from a table. The table must
+// exist.
+//
+//  TruncateTableStmt = "TRUNCATE" "TABLE" TableName .
+//
+// For example
+//
+//	BEGIN TRANSACTION
+// 		TRUNCATE TABLE department;
+//	COMMIT;
+//
+// UPDATE
+//
+// Update statements change values of fields in rows of a table.
+//
+//  UpdateStmt = "UPDATE" TableName [ "SET" ] AssignmentList [ WhereClause ] .
+//
+//  AssignmentList = Assignment { "," Assignment } [ "," ] .
+//  Assignment = ColumnName "=" Expression .
+//
+// For example
+//
+//	BEGIN TRANSACTION
+// 		UPDATE department
+//			DepartmentName = DepartmentName + " dpt.",
+//			DepartmentID = 1000+DepartmentID,
+//		WHERE DepartmentID < 1000;
+//	COMMIT;
+//
+// Note: The SET clause is optional.
+//
+// If any of the columns of the table were defined using the optional
+// constraints clause or the optional defaults clause then those are processed
+// on a per row basis. The details are discussed in the "Constraints and
+// defaults" chapter below the CREATE TABLE statement documentation.
+//
+// System Tables
+//
+// To allow to query for DB meta data, there exist specially named tables, some
+// of them being virtual.
+//
+// Note: Virtual system tables may have fake table-wise unique but meaningless
+// and unstable record IDs. Do not apply the built-in id() to any system table.
+//
+// Tables Table
+//
+// The table __Table lists all tables in the DB. The schema is
+//
+//	CREATE TABLE __Table (Name string, Schema string);
+//
+// The Schema column returns the statement to (re)create table Name. This table
+// is virtual.
+//
+// Columns Table
+//
+// The table __Colum lists all columns of all tables in the DB. The schema is
+//
+//	CREATE TABLE __Column (TableName string, Ordinal int, Name string, Type string);
+//
+// The Ordinal column defines the 1-based index of the column in the record.
+// This table is virtual.
+//
+// Columns2 Table
+//
+// The table __Colum2 lists all columns of all tables in the DB which have the
+// constraint NOT NULL or which have a constraint expression defined or which
+// have a default expression defined. The schema is
+//
+//	CREATE TABLE __Column2 (TableName string, Name string, NotNull bool, ConstraintExpr string, DefaultExpr string)
+//
+// It's possible to obtain a consolidated recordset for all properties of all
+// DB columns using
+//
+//	SELECT
+//		__Column.TableName, __Column.Ordinal, __Column.Name, __Column.Type,
+//		__Column2.NotNull, __Column2.ConstraintExpr, __Column2.DefaultExpr,
+//	FROM __Column
+//	LEFT JOIN __Column2
+//	ON __Column.TableName == __Column2.TableName && __Column.Name == __Column2.Name
+//	ORDER BY __Column.TableName, __Column.Ordinal;
+//
+// The Name column is the column name in TableName.
+//
+// Indices table
+//
+// The table __Index lists all indices in the DB. The schema is
+//
+//	CREATE TABLE __Index (TableName string, ColumnName string, Name string, IsUnique bool);
+//
+// The IsUnique columns reflects if the index was created using the optional
+// UNIQUE clause. This table is virtual.
+//
+// Built-in functions
+//
+// Built-in functions are predeclared.
+//
+// Average
+//
+// The built-in aggregate function avg returns the average of values of an
+// expression.  Avg ignores NULL values, but returns NULL if all values of a
+// column are NULL or if avg is applied to an empty record set.
+//
+// 	func avg(e numeric) typeof(e)
+//
+// The column values must be of a numeric type.
+//
+//	SELECT salesperson, avg(sales) FROM salesforce GROUP BY salesperson;
+//
+// Contains
+//
+// The built-in function contains returns true if substr is within s.
+//
+//	func contains(s, substr string) bool
+//
+// If any argument to contains is NULL the result is NULL.
+//
+// Count
+//
+// The built-in aggregate function count returns how many times an expression
+// has a non NULL values or the number of rows in a record set. Note: count()
+// returns 0 for an empty record set.
+//
+//	func count() int             // The number of rows in a record set.
+//	func count(*) int            // Equivalent to count().
+// 	func count(e expression) int // The number of cases where the expression value is not NULL.
+//
+// For example
+//
+//	SELECT count() FROM department; // # of rows
+//
+//	SELECT count(*) FROM department; // # of rows
+//
+//	SELECT count(DepartmentID) FROM department; // # of records with non NULL field DepartmentID
+//
+//	SELECT count()-count(DepartmentID) FROM department; // # of records with NULL field DepartmentID
+//
+//	SELECT count(foo+bar*3) AS y FROM t; // # of cases where 'foo+bar*3' is non NULL
+//
+// Date
+//
+// Date returns the time corresponding to
+//
+//	yyyy-mm-dd hh:mm:ss + nsec nanoseconds
+//
+// in the appropriate zone for that time in the given location.
+//
+// The month, day, hour, min, sec, and nsec values may be outside their usual
+// ranges and will be normalized during the conversion. For example, October 32
+// converts to November 1.
+//
+// A daylight savings time transition skips or repeats times. For example, in
+// the United States, March 13, 2011 2:15am never occurred, while November 6,
+// 2011 1:15am occurred twice. In such cases, the choice of time zone, and
+// therefore the time, is not well-defined. Date returns a time that is correct
+// in one of the two zones involved in the transition, but it does not
+// guarantee which.
+//
+// 	func date(year, month, day, hour, min, sec, nsec int, loc string) time
+//
+// A location maps time instants to the zone in use at that time. Typically,
+// the location represents the collection of time offsets in use in a
+// geographical area, such as "CEST" and "CET" for central Europe.  "local"
+// represents the system's local time zone. "UTC" represents Universal
+// Coordinated Time (UTC).
+//
+// The month specifies a month of the year (January = 1, ...).
+//
+// If any argument to date is NULL the result is NULL.
+//
+// Day
+//
+// The built-in function day returns the day of the month specified by t.
+//
+// 	func day(t time) int
+//
+// If the argument to day is NULL the result is NULL.
+//
+// Format time
+//
+// The built-in function formatTime returns a textual representation of the
+// time value formatted according to layout, which defines the format by
+// showing how the reference time,
+//
+//	Mon Jan 2 15:04:05 -0700 MST 2006
+//
+// would be displayed if it were the value; it serves as an example of the
+// desired output. The same display rules will then be applied to the time
+// value.
+//
+// 	func formatTime(t time, layout string) string
+//
+// If any argument to formatTime is NULL the result is NULL.
+//
+// NOTE: The string value of the time zone, like "CET" or "ACDT", is dependent
+// on the time zone of the machine the function is run on. For example, if the
+// t value is in "CET", but the machine is in "ACDT", instead of "CET" the
+// result is "+0100". This is the same what Go (time.Time).String() returns and
+// in fact formatTime directly calls t.String().
+//
+//	formatTime(date(2006, 1, 2, 15, 4, 5, 999999999, "CET"))
+//
+// returns
+//
+//	2006-01-02 15:04:05.999999999 +0100 CET
+//
+// on a machine in the CET time zone, but may return
+//
+//	2006-01-02 15:04:05.999999999 +0100 +0100
+//
+// on a machine in the ACDT zone. The time value is in both cases the same so
+// its ordering and comparing is correct. Only the display value can differ.
+//
+// Format numbers
+//
+// The built-in functions formatFloat and formatInt format numbers
+// to strings using go's number format functions in the `strconv` package. For
+// all three functions, only the first argument is mandatory. The default values
+// of the rest are shown in the examples. If the first argument is NULL, the
+// result is NULL.
+//
+//	formatFloat(43.2[, 'g', -1, 64]) string
+//
+// returns
+//
+//	"43.2"
+//
+//	formatInt(-42[, 10]) string
+//
+// returns
+//
+//	"-42"
+//
+//	formatInt(uint32(42)[, 10]) string
+//
+// returns
+//
+//	"42"
+//
+// Unlike the `strconv` equivalent, the formatInt function handles all integer
+// types, both signed and unsigned.
+//
+// HasPrefix
+//
+// The built-in function hasPrefix tests whether the string s begins with prefix.
+//
+//	func hasPrefix(s, prefix string) bool
+//
+// If any argument to hasPrefix is NULL the result is NULL.
+//
+// HasSuffix
+//
+// The built-in function hasSuffix tests whether the string s ends with suffix.
+//
+//	func hasSuffix(s, suffix string) bool
+//
+// If any argument to hasSuffix is NULL the result is NULL.
+//
+// Hour
+//
+// The built-in function hour returns the hour within the day specified by t,
+// in the range [0, 23].
+//
+// 	func hour(t time) int
+//
+// If the argument to hour is NULL the result is NULL.
+//
+// Hours
+//
+// The built-in function hours returns the duration as a floating point number
+// of hours.
+//
+// 	func hours(d duration) float
+//
+// If the argument to hours is NULL the result is NULL.
+//
+// Record id
+//
+// The built-in function id takes zero or one arguments. If no argument is
+// provided, id() returns a table-unique automatically assigned numeric
+// identifier of type int. Ids of deleted records are not reused unless the DB
+// becomes completely empty (has no tables).
+//
+// 	func id() int
+//
+// For example
+//
+// 	SELECT id(), LastName
+// 	FROM employee;
+//
+// If id() without arguments is called for a row which is not a table record
+// then the result value is NULL.
+//
+// For example
+//
+//	SELECT id(), e.LastName, e.DepartmentID, d.DepartmentID
+//	FROM
+//		employee AS e,
+//		department AS d,
+//	WHERE e.DepartmentID == d.DepartmentID;
+//	// Will always return NULL in first field.
+//
+//	SELECT e.ID, e.LastName, e.DepartmentID, d.DepartmentID
+//	FROM
+//		(SELECT id() AS ID, LastName, DepartmentID FROM employee) AS e,
+//		department as d,
+//	WHERE e.DepartmentID == d.DepartmentID;
+//	// Will work.
+//
+// If id() has one argument it must be a table name of a table in a cross join.
+//
+// For example
+//
+// 	SELECT *
+// 	FROM foo, bar
+// 	WHERE bar.fooID == id(foo)
+// 	ORDER BY id(foo);
+//
+// Length
+//
+// The built-in function len takes a string argument and returns the lentgh of
+// the string in bytes.
+//
+// 	func len(s string) int
+//
+// The expression len(s) is constant if s is a string constant.
+//
+// If the argument to len is NULL the result is NULL.
+//
+// Maximum
+//
+// The built-in aggregate function max returns the largest value of an
+// expression in a record set.  Max ignores NULL values, but returns NULL if
+// all values of a column are NULL or if max is applied to an empty record set.
+//
+// 	func max(e expression) typeof(e) // The largest value of the expression.
+//
+// The expression values must be of an ordered type.
+//
+// For example
+//
+//	SELECT department, max(sales) FROM t GROUP BY department;
+//
+// Minimum
+//
+// The built-in aggregate function min returns the smallest value of an
+// expression in a record set.  Min ignores NULL values, but returns NULL if
+// all values of a column are NULL or if min is applied to an empty record set.
+//
+// 	func min(e expression) typeof(e) // The smallest value of the expression.
+//
+// For example
+//
+//	SELECT a, min(b) FROM t GROUP BY a;
+//
+// The column values must be of an ordered type.
+//
+// Minute
+//
+// The built-in function minute returns the minute offset within the hour
+// specified by t, in the range [0, 59].
+//
+// 	func minute(t time) int
+//
+// If the argument to minute is NULL the result is NULL.
+//
+// Minutes
+//
+// The built-in function minutes returns the duration as a floating point
+// number of minutes.
+//
+// 	func minutes(d duration) float
+//
+// If the argument to minutes is NULL the result is NULL.
+//
+// Month
+//
+// The built-in function month returns the month of the year specified by t
+// (January = 1, ...).
+//
+// 	func month(t time) int
+//
+// If the argument to month is NULL the result is NULL.
+//
+// Nanosecond
+//
+// The built-in function nanosecond returns the nanosecond offset within the
+// second specified by t, in the range [0, 999999999].
+//
+// 	func nanosecond(t time) int
+//
+// If the argument to nanosecond is NULL the result is NULL.
+//
+// Nanoseconds
+//
+// The built-in function nanoseconds returns the duration as an integer
+// nanosecond count.
+//
+// 	func nanoseconds(d duration) float
+//
+// If the argument to nanoseconds is NULL the result is NULL.
+//
+// Now
+//
+// The built-in function now returns the current local time.
+//
+// 	func now() time
+//
+// Parse time
+//
+// The built-in function parseTime parses a formatted string and returns the
+// time value it represents. The layout defines the format by showing how the
+// reference time,
+//
+//	Mon Jan 2 15:04:05 -0700 MST 2006
+//
+// would be interpreted if it were the value; it serves as an example of the
+// input format. The same interpretation will then be made to the input string.
+//
+// Elements omitted from the value are assumed to be zero or, when zero is
+// impossible, one, so parsing "3:04pm" returns the time corresponding to Jan
+// 1, year 0, 15:04:00 UTC (note that because the year is 0, this time is
+// before the zero Time). Years must be in the range 0000..9999. The day of the
+// week is checked for syntax but it is otherwise ignored.
+//
+// In the absence of a time zone indicator, parseTime returns a time in UTC.
+//
+// When parsing a time with a zone offset like -0700, if the offset corresponds
+// to a time zone used by the current location, then parseTime uses that
+// location and zone in the returned time. Otherwise it records the time as
+// being in a fabricated location with time fixed at the given zone offset.
+//
+// When parsing a time with a zone abbreviation like MST, if the zone
+// abbreviation has a defined offset in the current location, then that offset
+// is used. The zone abbreviation "UTC" is recognized as UTC regardless of
+// location. If the zone abbreviation is unknown, Parse records the time as
+// being in a fabricated location with the given zone abbreviation and a zero
+// offset. This choice means that such a time can be parses and reformatted
+// with the same layout losslessly, but the exact instant used in the
+// representation will differ by the actual zone offset. To avoid such
+// problems, prefer time layouts that use a numeric zone offset.
+//
+// 	func parseTime(layout, value string) time
+//
+// If any argument to parseTime is NULL the result is NULL.
+//
+// Second
+//
+// The built-in function second returns the second offset within the minute
+// specified by t, in the range [0, 59].
+//
+// 	func second(t time) int
+//
+// If the argument to second is NULL the result is NULL.
+//
+// Seconds
+//
+// The built-in function seconds returns the duration as a floating point
+// number of seconds.
+//
+// 	func seconds(d duration) float
+//
+// If the argument to seconds is NULL the result is NULL.
+//
+// Since
+//
+// The built-in function since returns the time elapsed since t. It is
+// shorthand for now()-t.
+//
+// 	func since(t time) duration
+//
+// If the argument to since is NULL the result is NULL.
+//
+// Sum
+//
+// The built-in aggregate function sum returns the sum of values of an
+// expression for all rows of a record set. Sum ignores NULL values, but
+// returns NULL if all values of a column are NULL or if sum is applied to an
+// empty record set.
+//
+// 	func sum(e expression) typeof(e) // The sum of the values of the expression.
+//
+// The column values must be of a numeric type.
+//
+//	SELECT salesperson, sum(sales) FROM salesforce GROUP BY salesperson;
+//
+// Time in a specific zone
+//
+// The built-in function timeIn returns t with the location information set to
+// loc. For discussion of the loc argument please see date().
+//
+// 	func timeIn(t time, loc string) time
+//
+// If any argument to timeIn is NULL the result is NULL.
+//
+// Weekday
+//
+// The built-in function weekday returns the day of the week specified by t.
+// Sunday == 0, Monday == 1, ...
+//
+// 	func weekday(t time) int
+//
+// If the argument to weekday is NULL the result is NULL.
+//
+// Year
+//
+// The built-in function year returns the year in which t occurs.
+//
+// 	func year(t time) int
+//
+// If the argument to year is NULL the result is NULL.
+//
+// Year day
+//
+// The built-in function yearDay returns the day of the year specified by t, in
+// the range [1,365] for non-leap years, and [1,366] in leap years.
+//
+// 	func yearDay(t time) int
+//
+// If the argument to yearDay is NULL the result is NULL.
+//
+// Manipulating complex numbers
+//
+// Three functions assemble and disassemble complex numbers. The built-in
+// function complex constructs a complex value from a floating-point real and
+// imaginary part, while real and imag extract the real and imaginary parts of
+// a complex value.
+//
+// 	complex(realPart, imaginaryPart floatT) complexT
+// 	real(complexT) floatT
+// 	imag(complexT) floatT
+//
+// The type of the arguments and return value correspond. For complex, the two
+// arguments must be of the same floating-point type and the return type is the
+// complex type with the corresponding floating-point constituents: complex64
+// for float32, complex128 for float64. The real and imag functions together
+// form the inverse, so for a complex value z, z == complex(real(z), imag(z)).
+//
+// If the operands of these functions are all constants, the return value is a
+// constant.
+//
+// 	complex(2, -2)             	// complex128
+// 	complex(1.0, -1.4)         	// complex128
+// 	float32(math.Cos(math.Pi/2))  	// float32
+// 	complex(5, float32(-x))         // complex64
+// 	imag(b)                   	// float64
+// 	real(complex(5, float32(-x)))   // float32
+//
+// If any argument to any of complex, real, imag functions is NULL the result
+// is NULL.
+//
+// Size guarantees
+//
+// For the numeric types, the following sizes are guaranteed
+//
+// 	type                                            size in bytes
+//
+// 	byte, uint8, int8                                1
+// 	uint16, int16                                    2
+// 	uint32, int32, float32                           4
+// 	uint, uint64, int, int64, float64, complex64     8
+// 	complex128                                      16
+//
+// License
+//
+// Portions of this specification page are modifications based on work[2]
+// created and shared by Google[3] and used according to terms described in the
+// Creative Commons 3.0 Attribution License[4].
+//
+// This specification is licensed under the Creative Commons Attribution 3.0
+// License, and code is licensed under a BSD license[5].
+//
+// References
+//
+// Links from the above documentation
+//
+// 	[1]: http://golang.org/ref/spec#Notation
+//	[2]: http://golang.org/ref/spec
+//	[3]: http://code.google.com/policies.html
+//	[4]: http://creativecommons.org/licenses/by/3.0/
+//	[5]: http://golang.org/LICENSE
+//	[6]: http://golang.org/pkg/regexp/#Regexp.MatchString
+//	[7]: http://developer.mimer.com/validator/sql-reserved-words.tml
+//	[8]: http://godoc.org/github.com/cznic/zappy
+//	[9]: http://www.w3schools.com/sql/sql_default.asp
+//	[10]: http://en.wikipedia.org/wiki/Join_(SQL)#Outer_join
+//
+// Implementation details
+//
+// This section is not part of the specification.
+//
+// Indices
+//
+// WARNING: The implementation of indices is new and it surely needs more time
+// to become mature.
+//
+// Indices are used currently used only by the WHERE clause. The following
+// expression patterns of 'WHERE expression' are recognized and trigger index
+// use.
+//
+// 	- WHERE c                   // For bool typed indexed column c
+// 	- WHERE !c                  // For bool typed indexed column c
+// 	- WHERE c relOp constExpr   // For indexed column c
+// 	- WHERE c relOp parameter   // For indexed column c
+// 	- WHERE parameter relOp c   // For indexed column c
+// 	- WHERE constExpr relOp c   // For indexed column c
+//
+// The relOp is one of the relation operators <, <=, ==, >=, >. For the
+// equality operator both operands must be of comparable types. For all other
+// operators both operands must be of ordered types. The constant expression is
+// a compile time constant expression. Some constant folding is still a TODO.
+// Parameter is a QL parameter ($1 etc.).
+//
+// Query rewriting
+//
+// Consider tables t and u, both with an indexed field f. The WHERE expression
+// doesn't comply with the above simple detected cases.
+//
+//	SELECT * FROM t, u WHERE t.f < x && u.f < y;
+//
+// However, such query is now automatically rewritten to
+//
+//	SELECT * FROM
+//		(SELECT * FROM t WHERE f < x),
+//		(SELECT * FROM u WHERE f < y);
+//
+// which will use both of the indices. The impact of using the indices can be
+// substantial (cf.  BenchmarkCrossJoin*) if the resulting rows have low
+// "selectivity", ie. only few rows from both tables are selected by the
+// respective WHERE filtering.
+//
+// Note: Existing QL DBs can be used and indices can be added to them. However,
+// once any indices are present in the DB, the old QL versions cannot work with
+// such DB anymore.
+//
+// Benchmarks
+//
+// Running a benchmark with -v (-test.v) outputs information about the scale
+// used to report records/s and a brief description of the benchmark. For
+// example
+//
+//	$ go test -run NONE -bench 'SelectMem.*1e[23]' -v
+//	PASS
+//	BenchmarkSelectMem1kBx1e2	   50000	     67680 ns/op	1477537.05 MB/s
+//	--- BENCH: BenchmarkSelectMem1kBx1e2
+//		all_test.go:310:
+//			=============================================================
+//			NOTE: All benchmarks report records/s as 1000000 bytes/s.
+//			=============================================================
+//		all_test.go:321: Having a table of 100 records, each of size 1kB, measure the performance of
+//			SELECT * FROM t;
+//
+//	BenchmarkSelectMem1kBx1e3	    5000	    634819 ns/op	1575251.01 MB/s
+//	--- BENCH: BenchmarkSelectMem1kBx1e3
+//		all_test.go:321: Having a table of 1000 records, each of size 1kB, measure the performance of
+//			SELECT * FROM t;
+//
+//	ok  	github.com/cznic/ql	7.496s
+//	$
+//
+// Running the full suite of benchmarks takes a lot of time. Use the -timeout
+// flag to avoid them being killed after the default time limit (10 minutes).
+package ql
diff --git a/vendor/github.com/cznic/ql/driver.go b/vendor/github.com/cznic/ql/driver.go
new file mode 100644
index 0000000000..b660e4cb65
--- /dev/null
+++ b/vendor/github.com/cznic/ql/driver.go
@@ -0,0 +1,523 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// database/sql/driver
+
+package ql
+
+import (
+	"bytes"
+	"database/sql"
+	"database/sql/driver"
+	"errors"
+	"fmt"
+	"io"
+	"math/big"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+)
+
+var (
+	_ driver.Conn    = (*driverConn)(nil)
+	_ driver.Driver  = (*sqlDriver)(nil)
+	_ driver.Execer  = (*driverConn)(nil)
+	_ driver.Queryer = (*driverConn)(nil)
+	_ driver.Result  = (*driverResult)(nil)
+	_ driver.Rows    = (*driverRows)(nil)
+	_ driver.Stmt    = (*driverStmt)(nil)
+	_ driver.Tx      = (*driverConn)(nil)
+
+	txBegin    = MustCompile("BEGIN TRANSACTION;")
+	txCommit   = MustCompile("COMMIT;")
+	txRollback = MustCompile("ROLLBACK;")
+
+	errNoResult = errors.New("query statement does not produce a result set (no top level SELECT)")
+)
+
+type errList []error
+
+func (e *errList) append(err error) {
+	if err != nil {
+		*e = append(*e, err)
+	}
+}
+
+func (e errList) error() error {
+	if len(e) == 0 {
+		return nil
+	}
+
+	return e
+}
+
+func (e errList) Error() string {
+	a := make([]string, len(e))
+	for i, v := range e {
+		a[i] = v.Error()
+	}
+	return strings.Join(a, "\n")
+}
+
+func params(args []driver.Value) []interface{} {
+	r := make([]interface{}, len(args))
+	for i, v := range args {
+		r[i] = interface{}(v)
+	}
+	return r
+}
+
+var (
+	fileDriver     = &sqlDriver{dbs: map[string]*driverDB{}}
+	fileDriverOnce sync.Once
+	memDriver      = &sqlDriver{isMem: true, dbs: map[string]*driverDB{}}
+	memDriverOnce  sync.Once
+)
+
+// RegisterDriver registers a QL database/sql/driver[0] named "ql". The name
+// parameter of
+//
+//	sql.Open("ql", name)
+//
+// is interpreted as a path name to a named DB file which will be created if
+// not present. The underlying QL database data are persisted on db.Close().
+// RegisterDriver can be safely called multiple times, it'll register the
+// driver only once.
+//
+// The name argument can be optionally prefixed by "file://". In that case the
+// prefix is stripped before interpreting it as a file name.
+//
+// The name argument can be optionally prefixed by "memory://". In that case
+// the prefix is stripped before interpreting it as a name of a memory-only,
+// volatile DB.
+//
+//  [0]: http://golang.org/pkg/database/sql/driver/
+func RegisterDriver() {
+	fileDriverOnce.Do(func() { sql.Register("ql", fileDriver) })
+}
+
+// RegisterMemDriver registers a QL memory database/sql/driver[0] named
+// "ql-mem".  The name parameter of
+//
+//	sql.Open("ql-mem", name)
+//
+// is interpreted as an unique memory DB name which will be created if not
+// present. The underlying QL memory database data are not persisted on
+// db.Close(). RegisterMemDriver can be safely called multiple times, it'll
+// register the driver only once.
+//
+//  [0]: http://golang.org/pkg/database/sql/driver/
+func RegisterMemDriver() {
+	memDriverOnce.Do(func() { sql.Register("ql-mem", memDriver) })
+}
+
+type driverDB struct {
+	db       *DB
+	name     string
+	refcount int
+}
+
+func newDriverDB(db *DB, name string) *driverDB {
+	return &driverDB{db: db, name: name, refcount: 1}
+}
+
+// sqlDriver implements the interface required by database/sql/driver.
+type sqlDriver struct {
+	dbs   map[string]*driverDB
+	isMem bool
+	mu    sync.Mutex
+}
+
+func (d *sqlDriver) lock() func() {
+	d.mu.Lock()
+	return d.mu.Unlock
+}
+
+// Open returns a new connection to the database.  The name is a string in a
+// driver-specific format.
+//
+// Open may return a cached connection (one previously closed), but doing so is
+// unnecessary; the sql package maintains a pool of idle connections for
+// efficient re-use.
+//
+// The returned connection is only used by one goroutine at a time.
+func (d *sqlDriver) Open(name string) (driver.Conn, error) {
+	if d != fileDriver && d != memDriver {
+		return nil, fmt.Errorf("open: unexpected/unsupported instance of driver.Driver: %p", d)
+	}
+
+	switch {
+	case d == fileDriver && strings.HasPrefix(name, "file://"):
+		name = name[len("file://"):]
+	case d == fileDriver && strings.HasPrefix(name, "memory://"):
+		d = memDriver
+		name = name[len("memory://"):]
+	}
+	name = filepath.Clean(name)
+	if name == "" || name == "." || name == string(os.PathSeparator) {
+		return nil, fmt.Errorf("invalid DB name %q", name)
+	}
+
+	defer d.lock()()
+	db := d.dbs[name]
+	if db == nil {
+		var err error
+		var db0 *DB
+		switch d.isMem {
+		case true:
+			db0, err = OpenMem()
+		default:
+			db0, err = OpenFile(name, &Options{CanCreate: true})
+		}
+		if err != nil {
+			return nil, err
+		}
+
+		db = newDriverDB(db0, name)
+		d.dbs[name] = db
+		return newDriverConn(d, db), nil
+	}
+
+	db.refcount++
+	return newDriverConn(d, db), nil
+}
+
+// driverConn is a connection to a database. It is not used concurrently by
+// multiple goroutines.
+//
+// Conn is assumed to be stateful.
+type driverConn struct {
+	ctx    *TCtx
+	db     *driverDB
+	driver *sqlDriver
+	stop   map[*driverStmt]struct{}
+	tnl    int
+}
+
+func newDriverConn(d *sqlDriver, ddb *driverDB) driver.Conn {
+	r := &driverConn{
+		db:     ddb,
+		driver: d,
+		stop:   map[*driverStmt]struct{}{},
+	}
+	return r
+}
+
+// Prepare returns a prepared statement, bound to this connection.
+func (c *driverConn) Prepare(query string) (driver.Stmt, error) {
+	list, err := Compile(query)
+	if err != nil {
+		return nil, err
+	}
+
+	s := &driverStmt{conn: c, stmt: list}
+	c.stop[s] = struct{}{}
+	return s, nil
+}
+
+// Close invalidates and potentially stops any current prepared statements and
+// transactions, marking this connection as no longer in use.
+//
+// Because the sql package maintains a free pool of connections and only calls
+// Close when there's a surplus of idle connections, it shouldn't be necessary
+// for drivers to do their own connection caching.
+func (c *driverConn) Close() error {
+	var err errList
+	for s := range c.stop {
+		err.append(s.Close())
+	}
+	defer c.driver.lock()()
+	dbs, name := c.driver.dbs, c.db.name
+	v := dbs[name]
+	v.refcount--
+	if v.refcount == 0 {
+		err.append(c.db.db.Close())
+		delete(dbs, name)
+	}
+	return err.error()
+}
+
+// Begin starts and returns a new transaction.
+func (c *driverConn) Begin() (driver.Tx, error) {
+	if c.ctx == nil {
+		c.ctx = NewRWCtx()
+	}
+
+	if _, _, err := c.db.db.Execute(c.ctx, txBegin); err != nil {
+		return nil, err
+	}
+
+	c.tnl++
+	return c, nil
+}
+
+func (c *driverConn) Commit() error {
+	if c.tnl == 0 || c.ctx == nil {
+		return errCommitNotInTransaction
+	}
+
+	if _, _, err := c.db.db.Execute(c.ctx, txCommit); err != nil {
+		return err
+	}
+
+	c.tnl--
+	if c.tnl == 0 {
+		c.ctx = nil
+	}
+	return nil
+}
+
+func (c *driverConn) Rollback() error {
+	if c.tnl == 0 || c.ctx == nil {
+		return errRollbackNotInTransaction
+	}
+
+	if _, _, err := c.db.db.Execute(c.ctx, txRollback); err != nil {
+		return err
+	}
+
+	c.tnl--
+	if c.tnl == 0 {
+		c.ctx = nil
+	}
+	return nil
+}
+
+// Execer is an optional interface that may be implemented by a Conn.
+//
+// If a Conn does not implement Execer, the sql package's DB.Exec will first
+// prepare a query, execute the statement, and then close the statement.
+//
+// Exec may return driver.ErrSkip.
+func (c *driverConn) Exec(query string, args []driver.Value) (driver.Result, error) {
+	list, err := Compile(query)
+	if err != nil {
+		return nil, err
+	}
+
+	return driverExec(c.db, c.ctx, list, args)
+}
+
+func driverExec(db *driverDB, ctx *TCtx, list List, args []driver.Value) (driver.Result, error) {
+	if _, _, err := db.db.Execute(ctx, list, params(args)...); err != nil {
+		return nil, err
+	}
+
+	if len(list.l) == 1 {
+		switch list.l[0].(type) {
+		case *createTableStmt, *dropTableStmt, *alterTableAddStmt,
+			*alterTableDropColumnStmt, *truncateTableStmt:
+			return driver.ResultNoRows, nil
+		}
+	}
+
+	r := &driverResult{}
+	if ctx != nil {
+		r.lastInsertID, r.rowsAffected = ctx.LastInsertID, ctx.RowsAffected
+	}
+	return r, nil
+}
+
+// Queryer is an optional interface that may be implemented by a Conn.
+//
+// If a Conn does not implement Queryer, the sql package's DB.Query will first
+// prepare a query, execute the statement, and then close the statement.
+//
+// Query may return driver.ErrSkip.
+func (c *driverConn) Query(query string, args []driver.Value) (driver.Rows, error) {
+	list, err := Compile(query)
+	if err != nil {
+		return nil, err
+	}
+
+	return driverQuery(c.db, c.ctx, list, args)
+}
+
+func driverQuery(db *driverDB, ctx *TCtx, list List, args []driver.Value) (driver.Rows, error) {
+	rss, _, err := db.db.Execute(ctx, list, params(args)...)
+	if err != nil {
+		return nil, err
+	}
+
+	switch n := len(rss); n {
+	case 0:
+		return nil, errNoResult
+	case 1:
+		return newdriverRows(rss[len(rss)-1]), nil
+	default:
+		return nil, fmt.Errorf("query produced %d result sets, expected only one", n)
+	}
+}
+
+// driverResult is the result of a query execution.
+type driverResult struct {
+	lastInsertID int64
+	rowsAffected int64
+}
+
+// LastInsertId returns the database's auto-generated ID after, for example, an
+// INSERT into a table with primary key.
+func (r *driverResult) LastInsertId() (int64, error) { // -golint
+	return r.lastInsertID, nil
+}
+
+// RowsAffected returns the number of rows affected by the query.
+func (r *driverResult) RowsAffected() (int64, error) {
+	return r.rowsAffected, nil
+}
+
+// driverRows is an iterator over an executed query's results.
+type driverRows struct {
+	rs   Recordset
+	done chan int
+	rows chan interface{}
+}
+
+func newdriverRows(rs Recordset) *driverRows {
+	r := &driverRows{
+		rs:   rs,
+		done: make(chan int),
+		rows: make(chan interface{}, 500),
+	}
+	go func() {
+		err := io.EOF
+		if e := r.rs.Do(false, func(data []interface{}) (bool, error) {
+			select {
+			case r.rows <- data:
+				return true, nil
+			case <-r.done:
+				return false, nil
+			}
+		}); e != nil {
+			err = e
+		}
+
+		select {
+		case r.rows <- err:
+		case <-r.done:
+		}
+	}()
+	return r
+}
+
+// Columns returns the names of the columns. The number of columns of the
+// result is inferred from the length of the slice.  If a particular column
+// name isn't known, an empty string should be returned for that entry.
+func (r *driverRows) Columns() []string {
+	f, _ := r.rs.Fields()
+	return f
+}
+
+// Close closes the rows iterator.
+func (r *driverRows) Close() error {
+	close(r.done)
+	return nil
+}
+
+// Next is called to populate the next row of data into the provided slice. The
+// provided slice will be the same size as the Columns() are wide.
+//
+// The dest slice may be populated only with a driver Value type, but excluding
+// string.  All string values must be converted to []byte.
+//
+// Next should return io.EOF when there are no more rows.
+func (r *driverRows) Next(dest []driver.Value) error {
+	select {
+	case rx := <-r.rows:
+		switch x := rx.(type) {
+		case error:
+			return x
+		case []interface{}:
+			if g, e := len(x), len(dest); g != e {
+				return fmt.Errorf("field count mismatch: got %d, need %d", g, e)
+			}
+
+			for i, xi := range x {
+				switch v := xi.(type) {
+				case nil, int64, float64, bool, []byte, time.Time:
+					dest[i] = v
+				case complex64, complex128, *big.Int, *big.Rat:
+					var buf bytes.Buffer
+					fmt.Fprintf(&buf, "%v", v)
+					dest[i] = buf.Bytes()
+				case int8:
+					dest[i] = int64(v)
+				case int16:
+					dest[i] = int64(v)
+				case int32:
+					dest[i] = int64(v)
+				case int:
+					dest[i] = int64(v)
+				case uint8:
+					dest[i] = int64(v)
+				case uint16:
+					dest[i] = int64(v)
+				case uint32:
+					dest[i] = int64(v)
+				case uint64:
+					dest[i] = int64(v)
+				case uint:
+					dest[i] = int64(v)
+				case time.Duration:
+					dest[i] = int64(v)
+				case string:
+					dest[i] = []byte(v)
+				default:
+					return fmt.Errorf("internal error 004")
+				}
+			}
+			return nil
+		default:
+			return fmt.Errorf("internal error 005")
+		}
+	case <-r.done:
+		return io.EOF
+	}
+}
+
+// driverStmt is a prepared statement. It is bound to a driverConn and not used
+// by multiple goroutines concurrently.
+type driverStmt struct {
+	conn *driverConn
+	stmt List
+}
+
+// Close closes the statement.
+//
+// As of Go 1.1, a Stmt will not be closed if it's in use by any queries.
+func (s *driverStmt) Close() error {
+	delete(s.conn.stop, s)
+	return nil
+}
+
+// NumInput returns the number of placeholder parameters.
+//
+// If NumInput returns >= 0, the sql package will sanity check argument counts
+// from callers and return errors to the caller before the statement's Exec or
+// Query methods are called.
+//
+// NumInput may also return -1, if the driver doesn't know its number of
+// placeholders. In that case, the sql package will not sanity check Exec or
+// Query argument counts.
+func (s *driverStmt) NumInput() int {
+	if x := s.stmt; len(x.l) == 1 {
+		return x.params
+	}
+
+	return -1
+}
+
+// Exec executes a query that doesn't return rows, such as an INSERT or UPDATE.
+func (s *driverStmt) Exec(args []driver.Value) (driver.Result, error) {
+	c := s.conn
+	return driverExec(c.db, c.ctx, s.stmt, args)
+}
+
+// Exec executes a query that may return rows, such as a SELECT.
+func (s *driverStmt) Query(args []driver.Value) (driver.Rows, error) {
+	c := s.conn
+	return driverQuery(c.db, c.ctx, s.stmt, args)
+}
diff --git a/vendor/github.com/cznic/ql/driver/driver.go b/vendor/github.com/cznic/ql/driver/driver.go
new file mode 100644
index 0000000000..557c70d828
--- /dev/null
+++ b/vendor/github.com/cznic/ql/driver/driver.go
@@ -0,0 +1,61 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+Package driver registers a QL sql/driver named "ql" and a memory driver named "ql-mem".
+
+See also [0], [1] and [3].
+
+Usage
+
+A skeleton program using ql/driver.
+
+	package main
+
+	import (
+		"database/sql"
+
+		_ "github.com/cznic/ql/driver"
+	)
+
+	func main() {
+		...
+		// Disk file DB
+		db, err := sql.Open("ql", "ql.db")  // [2]
+		// alternatively
+		db, err := sql.Open("ql", "file://ql.db")
+
+		// and/or
+
+		// RAM DB
+		mdb, err := sql.Open("ql-mem", "mem.db")
+		// alternatively
+		mdb, err := sql.Open("ql", "memory://mem.db")
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		// Use db/mdb here
+		...
+	}
+
+This package exports nothing.
+
+Links
+
+Referenced from above:
+
+  [0]: http://godoc.org/github.com/cznic/ql
+  [1]: http://golang.org/pkg/database/sql/
+  [2]: http://golang.org/pkg/database/sql/#Open
+  [3]: http://golang.org/pkg/database/sql/driver
+*/
+package driver
+
+import "github.com/cznic/ql"
+
+func init() {
+	ql.RegisterDriver()
+	ql.RegisterMemDriver()
+}
diff --git a/vendor/github.com/cznic/ql/errors.go b/vendor/github.com/cznic/ql/errors.go
new file mode 100644
index 0000000000..305414f4a9
--- /dev/null
+++ b/vendor/github.com/cznic/ql/errors.go
@@ -0,0 +1,18 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"errors"
+)
+
+var (
+	errBeginTransNoCtx          = errors.New("BEGIN TRANSACTION: Must use R/W context, have nil")
+	errCommitNotInTransaction   = errors.New("COMMIT: Not in transaction")
+	errDivByZero                = errors.New("division by zero")
+	errIncompatibleDBFormat     = errors.New("incompatible DB format")
+	errNoDataForHandle          = errors.New("read: no data for handle")
+	errRollbackNotInTransaction = errors.New("ROLLBACK: Not in transaction")
+)
diff --git a/vendor/github.com/cznic/ql/etc.go b/vendor/github.com/cznic/ql/etc.go
new file mode 100644
index 0000000000..c2e1524af0
--- /dev/null
+++ b/vendor/github.com/cznic/ql/etc.go
@@ -0,0 +1,2805 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"math"
+	"math/big"
+	"strings"
+	"time"
+)
+
+// QL types.
+const (
+	qBool       = 0x62 // 'b'
+	qComplex64  = 0x63 // 'c'
+	qComplex128 = 0x64 // 'd'
+	qFloat32    = 0x66 // 'f'
+	qFloat64    = 0x67 // 'g', alias float
+	qInt8       = 0x69 // 'i'
+	qInt16      = 0x6a // 'j'
+	qInt32      = 0x6b // 'k'
+	qInt64      = 0x6c // 'l', alias int
+	qString     = 0x73 // 's'
+	qUint8      = 0x75 // 'u', alias byte
+	qUint16     = 0x76 // 'v'
+	qUint32     = 0x77 // 'w'
+	qUint64     = 0x78 // 'x', alias uint
+
+	qBigInt   = 0x49 // 'I'
+	qBigRat   = 0x52 // 'R'
+	qBlob     = 0x42 // 'B'
+	qDuration = 0x44 // 'D'
+	qTime     = 0x54 // 'T'
+)
+
+var (
+	type2Str = map[int]string{
+		qBigInt:     "bigint",
+		qBigRat:     "bigrat",
+		qBlob:       "blob",
+		qBool:       "bool",
+		qComplex128: "complex128",
+		qComplex64:  "complex64",
+		qDuration:   "duration",
+		qFloat32:    "float32",
+		qFloat64:    "float64",
+		qInt16:      "int16",
+		qInt32:      "int32",
+		qInt64:      "int64",
+		qInt8:       "int8",
+		qString:     "string",
+		qTime:       "time",
+		qUint16:     "uint16",
+		qUint32:     "uint32",
+		qUint64:     "uint64",
+		qUint8:      "uint8",
+	}
+)
+
+func typeStr(typ int) (r string) {
+	return type2Str[typ]
+}
+
+func noEOF(err error) error {
+	if err == io.EOF {
+		err = nil
+	}
+	return err
+}
+
+func runErr(err error) error { return fmt.Errorf("run time error: %s", err) }
+
+func invXOp(s, x interface{}) error {
+	return fmt.Errorf("invalid operation: %v[%v] (index of type %T)", s, x, x)
+}
+
+func invSOp(s interface{}) error {
+	return fmt.Errorf("cannot slice %s (type %T)", s, s)
+}
+
+func invNegX(x interface{}) error {
+	return fmt.Errorf("invalid string index %v (index must be non-negative)", x)
+}
+
+func invNegLO(x interface{}) error {
+	return fmt.Errorf("invalid LIMIT or OFFSET value %v (must be non-negative)", x)
+}
+
+func invSliceNegX(x interface{}) error {
+	return fmt.Errorf("invalid slice index %v (index must be non-negative)", x)
+}
+
+func invBoundX(s string, x uint64) error {
+	return fmt.Errorf("invalid string index %d (out of bounds for %d-byte string)", x, len(s))
+}
+
+func invSliceBoundX(s string, x uint64) error {
+	return fmt.Errorf("invalid slice index %d (out of bounds for %d-byte string)", x, len(s))
+}
+
+func intExpr(x interface{}) (i int64, err error) {
+	switch x := x.(type) {
+	case idealInt:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return int64(x), nil
+	case idealRune:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return int64(x), nil
+	case idealUint:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return int64(x), nil
+	case int8:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return int64(x), nil
+	case int16:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return int64(x), nil
+	case int32:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return int64(x), nil
+	case int64:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return int64(x), nil
+	case uint8:
+		return int64(x), nil
+	case uint16:
+		return int64(x), nil
+	case uint32:
+		return int64(x), nil
+	case uint64:
+		return int64(x), nil
+	default:
+		return 0, fmt.Errorf("non-integer expression: %v (value of type %T)", x, x)
+	}
+}
+
+func limOffExpr(x interface{}) (i uint64, err error) {
+	switch x := x.(type) {
+	case idealInt:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return uint64(x), nil
+	case idealRune:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return uint64(x), nil
+	case idealUint:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return uint64(x), nil
+	case int8:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return uint64(x), nil
+	case int16:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return uint64(x), nil
+	case int32:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return uint64(x), nil
+	case int64:
+		if x < 0 {
+			return 0, invNegLO(x)
+		}
+
+		return uint64(x), nil
+	case uint8:
+		return uint64(x), nil
+	case uint16:
+		return uint64(x), nil
+	case uint32:
+		return uint64(x), nil
+	case uint64:
+		return uint64(x), nil
+	default:
+		return 0, fmt.Errorf("non-integer used in LIMIT or OFFSET: %v (value of type %T)", x, x)
+	}
+}
+
+func indexExpr(s *string, x interface{}) (i uint64, err error) {
+	switch x := x.(type) {
+	case idealFloat:
+		if x < 0 {
+			return 0, invNegX(x)
+		}
+
+		if s != nil && int(x) >= len(*s) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case idealInt:
+		if x < 0 {
+			return 0, invNegX(x)
+		}
+
+		if s != nil && int64(x) >= int64(len(*s)) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case idealRune:
+		if x < 0 {
+			return 0, invNegX(x)
+		}
+
+		if s != nil && int32(x) >= int32(len(*s)) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case idealUint:
+		if x < 0 {
+			return 0, invNegX(x)
+		}
+
+		if s != nil && uint64(x) >= uint64(len(*s)) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case int8:
+		if x < 0 {
+			return 0, invNegX(x)
+		}
+
+		if s != nil && int(x) >= len(*s) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case int16:
+		if x < 0 {
+			return 0, invNegX(x)
+		}
+
+		if s != nil && int(x) >= len(*s) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case int32:
+		if x < 0 {
+			return 0, invNegX(x)
+		}
+
+		if s != nil && int(x) >= len(*s) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case int64:
+		if x < 0 {
+			return 0, invNegX(x)
+		}
+
+		if s != nil && x >= int64(len(*s)) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case uint8:
+		if s != nil && int(x) >= len(*s) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case uint16:
+		if s != nil && int(x) >= len(*s) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case uint32:
+		if s != nil && x >= uint32(len(*s)) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case uint64:
+		if s != nil && x >= uint64(len(*s)) {
+			return 0, invBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	default:
+		return 0, fmt.Errorf("non-integer string index %v (value of type %T)", x, x)
+	}
+}
+
+func sliceExpr(s *string, x interface{}, mod int) (i uint64, err error) {
+	switch x := x.(type) {
+	case idealFloat:
+		if x < 0 {
+			return 0, invSliceNegX(x)
+		}
+
+		if s != nil && int(x) >= len(*s)+mod {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case idealInt:
+		if x < 0 {
+			return 0, invSliceNegX(x)
+		}
+
+		if s != nil && int64(x) >= int64(len(*s)+mod) {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case idealRune:
+		if x < 0 {
+			return 0, invSliceNegX(x)
+		}
+
+		if s != nil && int32(x) >= int32(len(*s)+mod) {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case idealUint:
+		if x < 0 {
+			return 0, invSliceNegX(x)
+		}
+
+		if s != nil && uint64(x) >= uint64(len(*s)+mod) {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case int8:
+		if x < 0 {
+			return 0, invSliceNegX(x)
+		}
+
+		if s != nil && int(x) >= len(*s)+mod {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case int16:
+		if x < 0 {
+			return 0, invSliceNegX(x)
+		}
+
+		if s != nil && int(x) >= len(*s)+mod {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case int32:
+		if x < 0 {
+			return 0, invSliceNegX(x)
+		}
+
+		if s != nil && int(x) >= len(*s)+mod {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case int64:
+		if x < 0 {
+			return 0, invSliceNegX(x)
+		}
+
+		if s != nil && x >= int64(len(*s)+mod) {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case uint8:
+		if s != nil && int(x) >= len(*s)+mod {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case uint16:
+		if s != nil && int(x) >= len(*s)+mod {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case uint32:
+		if s != nil && x >= uint32(len(*s)+mod) {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	case uint64:
+		if s != nil && x >= uint64(len(*s)+mod) {
+			return 0, invSliceBoundX(*s, uint64(x))
+		}
+
+		return uint64(x), nil
+	default:
+		return 0, fmt.Errorf("invalid slice index %s (type %T)", x, x)
+	}
+}
+
+type iop int
+
+func (o iop) String() string {
+	switch i := int(o); i {
+	case andand:
+		return "&&"
+	case andnot:
+		return "&^"
+	case lsh:
+		return "<<"
+	case le:
+		return "<="
+	case eq:
+		return "=="
+	case ge:
+		return ">="
+	case neq:
+		return "!="
+	case oror:
+		return "||"
+	case rsh:
+		return ">>"
+	default:
+		return string(i)
+	}
+}
+
+func ideal(v interface{}) interface{} {
+	switch x := v.(type) {
+	case idealComplex:
+		return complex128(x)
+	case idealFloat:
+		return float64(x)
+	case idealInt:
+		return int64(x)
+	case idealRune:
+		return int64(x)
+	case idealUint:
+		return uint64(x)
+	default:
+		return v
+	}
+}
+
+func eval(v expression, execCtx *execCtx, ctx map[interface{}]interface{}) (y interface{}) {
+	y, err := expand1(v.eval(execCtx, ctx))
+	if err != nil {
+		panic(err) // panic ok here
+	}
+	return
+}
+
+func eval2(a, b expression, execCtx *execCtx, ctx map[interface{}]interface{}) (x, y interface{}) {
+	return eval(a, execCtx, ctx), eval(b, execCtx, ctx)
+}
+
+func invOp2(x, y interface{}, o int) (interface{}, error) {
+	return nil, fmt.Errorf("invalid operation: %v %v %v (mismatched types %T and %T)", x, iop(o), y, ideal(x), ideal(y))
+}
+
+func undOp(x interface{}, o int) (interface{}, error) {
+	return nil, fmt.Errorf("invalid operation: %v%v (operator %v not defined on %T)", iop(o), x, iop(o), x)
+}
+
+func undOp2(x, y interface{}, o int) (interface{}, error) {
+	return nil, fmt.Errorf("invalid operation: %v %v %v (operator %v not defined on %T)", x, iop(o), y, iop(o), x)
+}
+
+func invConv(val interface{}, typ int) (interface{}, error) {
+	return nil, fmt.Errorf("cannot convert %v (type %T) to type %s", val, val, typeStr(typ))
+}
+
+func truncConv(val interface{}) (interface{}, error) {
+	return nil, fmt.Errorf("constant %v truncated to integer", val)
+}
+
+func convert(val interface{}, typ int) (v interface{}, err error) { //NTYPE
+	if val == nil {
+		return nil, nil
+	}
+
+	switch typ {
+	case qBool:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		//case idealFloat:
+		//case idealInt:
+		//case idealRune:
+		//case idealUint:
+		case bool:
+			return bool(x), nil
+		//case complex64:
+		//case complex128:
+		//case float32:
+		//case float64:
+		//case int8:
+		//case int16:
+		//case int32:
+		//case int64:
+		//case string:
+		//case uint8:
+		//case uint16:
+		//case uint32:
+		//case uint64:
+		default:
+			return invConv(val, typ)
+		}
+	case qComplex64:
+		switch x := val.(type) {
+		//case nil:
+		case idealComplex:
+			return complex64(x), nil
+		case idealFloat:
+			return complex(float32(x), 0), nil
+		case idealInt:
+			return complex(float32(x), 0), nil
+		case idealRune:
+			return complex(float32(x), 0), nil
+		case idealUint:
+			return complex(float32(x), 0), nil
+		//case bool:
+		case complex64:
+			return complex64(x), nil
+		case complex128:
+			return complex64(x), nil
+		//case float32:
+		//case float64:
+		//case int8:
+		//case int16:
+		//case int32:
+		//case int64:
+		//case string:
+		//case uint8:
+		//case uint16:
+		//case uint32:
+		//case uint64:
+		default:
+			return invConv(val, typ)
+		}
+	case qComplex128:
+		switch x := val.(type) {
+		//case nil:
+		case idealComplex:
+			return complex128(x), nil
+		case idealFloat:
+			return complex(float64(x), 0), nil
+		case idealInt:
+			return complex(float64(x), 0), nil
+		case idealRune:
+			return complex(float64(x), 0), nil
+		case idealUint:
+			return complex(float64(x), 0), nil
+		//case bool:
+		case complex64:
+			return complex128(x), nil
+		case complex128:
+			return complex128(x), nil
+		//case float32:
+		//case float64:
+		//case int8:
+		//case int16:
+		//case int32:
+		//case int64:
+		//case string:
+		//case uint8:
+		//case uint16:
+		//case uint32:
+		//case uint64:
+		default:
+			return invConv(val, typ)
+		}
+	case qFloat32:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			return float32(x), nil
+		case idealInt:
+			return float32(x), nil
+		case idealRune:
+			return float32(x), nil
+		case idealUint:
+			return float32(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return float32(x), nil
+		case float64:
+			return float32(x), nil
+		case int8:
+			return float32(x), nil
+		case int16:
+			return float32(x), nil
+		case int32:
+			return float32(x), nil
+		case int64:
+			return float32(x), nil
+		//case string:
+		case uint8:
+			return float32(x), nil
+		case uint16:
+			return float32(x), nil
+		case uint32:
+			return float32(x), nil
+		case uint64:
+			return float32(x), nil
+		case *big.Int:
+			v, _ := big.NewRat(1, 1).SetInt(x).Float64()
+			return float32(v), nil
+		case *big.Rat:
+			v, _ := x.Float64()
+			return float32(v), nil
+		case time.Duration:
+			return float32(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qFloat64:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			return float64(x), nil
+		case idealInt:
+			return float64(x), nil
+		case idealRune:
+			return float64(x), nil
+		case idealUint:
+			return float64(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return float64(x), nil
+		case float64:
+			return float64(x), nil
+		case int8:
+			return float64(x), nil
+		case int16:
+			return float64(x), nil
+		case int32:
+			return float64(x), nil
+		case int64:
+			return float64(x), nil
+		//case string:
+		case uint8:
+			return float64(x), nil
+		case uint16:
+			return float64(x), nil
+		case uint32:
+			return float64(x), nil
+		case uint64:
+			return float64(x), nil
+		case *big.Int:
+			v, _ := big.NewRat(1, 1).SetInt(x).Float64()
+			return v, nil
+		case *big.Rat:
+			v, _ := x.Float64()
+			return v, nil
+		case time.Duration:
+			return float64(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qInt8:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			if _, frac := math.Modf(float64(x)); frac != 0 {
+				return truncConv(x)
+			}
+
+			return int8(x), nil
+		case idealInt:
+			return int8(x), nil
+		case idealRune:
+			return int8(x), nil
+		case idealUint:
+			return int8(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return int8(x), nil
+		case float64:
+			return int8(x), nil
+		case int8:
+			return int8(x), nil
+		case int16:
+			return int8(x), nil
+		case int32:
+			return int8(x), nil
+		case int64:
+			return int8(x), nil
+		//case string:
+		case uint8:
+			return int8(x), nil
+		case uint16:
+			return int8(x), nil
+		case uint32:
+			return int8(x), nil
+		case uint64:
+			return int8(x), nil
+		case *big.Int:
+			return int8(x.Int64()), nil
+		case time.Duration:
+			return int8(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qInt16:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			if _, frac := math.Modf(float64(x)); frac != 0 {
+				return truncConv(x)
+			}
+
+			return int16(x), nil
+		case idealInt:
+			return int16(x), nil
+		case idealRune:
+			return int16(x), nil
+		case idealUint:
+			return int16(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return int16(x), nil
+		case float64:
+			return int16(x), nil
+		case int8:
+			return int16(x), nil
+		case int16:
+			return int16(x), nil
+		case int32:
+			return int16(x), nil
+		case int64:
+			return int16(x), nil
+		//case string:
+		case uint8:
+			return int16(x), nil
+		case uint16:
+			return int16(x), nil
+		case uint32:
+			return int16(x), nil
+		case uint64:
+			return int16(x), nil
+		case *big.Int:
+			return int16(x.Int64()), nil
+		case time.Duration:
+			return int16(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qInt32:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			if _, frac := math.Modf(float64(x)); frac != 0 {
+				return truncConv(x)
+			}
+
+			return int32(x), nil
+		case idealInt:
+			return int32(x), nil
+		case idealRune:
+			return int32(x), nil
+		case idealUint:
+			return int32(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return int32(x), nil
+		case float64:
+			return int32(x), nil
+		case int8:
+			return int32(x), nil
+		case int16:
+			return int32(x), nil
+		case int32:
+			return int32(x), nil
+		case int64:
+			return int32(x), nil
+		//case string:
+		case uint8:
+			return int32(x), nil
+		case uint16:
+			return int32(x), nil
+		case uint32:
+			return int32(x), nil
+		case uint64:
+			return int32(x), nil
+		case *big.Int:
+			return int32(x.Int64()), nil
+		case time.Duration:
+			return int32(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qInt64:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			if _, frac := math.Modf(float64(x)); frac != 0 {
+				return truncConv(x)
+			}
+
+			return int64(x), nil
+		case idealInt:
+			return int64(x), nil
+		case idealRune:
+			return int64(x), nil
+		case idealUint:
+			return int64(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return int64(x), nil
+		case float64:
+			return int64(x), nil
+		case int8:
+			return int64(x), nil
+		case int16:
+			return int64(x), nil
+		case int32:
+			return int64(x), nil
+		case int64:
+			return int64(x), nil
+		//case string:
+		case uint8:
+			return int64(x), nil
+		case uint16:
+			return int64(x), nil
+		case uint32:
+			return int64(x), nil
+		case uint64:
+			return int64(x), nil
+		case *big.Int:
+			return x.Int64(), nil
+		case time.Duration:
+			return int64(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qString:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		//case idealFloat:
+		case idealInt:
+			return string(x), nil
+		case idealRune:
+			return string(x), nil
+		case idealUint:
+			return string(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		//case float32:
+		//case float64:
+		case int8:
+			return string(x), nil
+		case int16:
+			return string(x), nil
+		case int32:
+			return string(x), nil
+		case int64:
+			return string(x), nil
+		case string:
+			return string(x), nil
+		case uint8:
+			return string(x), nil
+		case uint16:
+			return string(x), nil
+		case uint32:
+			return string(x), nil
+		case uint64:
+			return string(x), nil
+		case []byte:
+			return string(x), nil
+		case *big.Int:
+			return x.String(), nil
+		case time.Time:
+			return x.String(), nil
+		case time.Duration:
+			return x.String(), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qUint8:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			if _, frac := math.Modf(float64(x)); frac != 0 {
+				return truncConv(x)
+			}
+
+			return uint8(x), nil
+		case idealInt:
+			return uint8(x), nil
+		case idealRune:
+			return uint8(x), nil
+		case idealUint:
+			return uint8(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return uint8(x), nil
+		case float64:
+			return uint8(x), nil
+		case int8:
+			return uint8(x), nil
+		case int16:
+			return uint8(x), nil
+		case int32:
+			return uint8(x), nil
+		case int64:
+			return uint8(x), nil
+		//case string:
+		case uint8:
+			return uint8(x), nil
+		case uint16:
+			return uint8(x), nil
+		case uint32:
+			return uint8(x), nil
+		case uint64:
+			return uint8(x), nil
+		case *big.Int:
+			return uint8(x.Int64()), nil
+		case time.Duration:
+			return uint8(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qUint16:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			if _, frac := math.Modf(float64(x)); frac != 0 {
+				return truncConv(x)
+			}
+
+			return uint16(x), nil
+		case idealInt:
+			return uint16(x), nil
+		case idealRune:
+			return uint16(x), nil
+		case idealUint:
+			return uint16(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return uint16(x), nil
+		case float64:
+			return uint16(x), nil
+		case int8:
+			return uint16(x), nil
+		case int16:
+			return uint16(x), nil
+		case int32:
+			return uint16(x), nil
+		case int64:
+			return uint16(x), nil
+		//case string:
+		case uint8:
+			return uint16(x), nil
+		case uint16:
+			return uint16(x), nil
+		case uint32:
+			return uint16(x), nil
+		case uint64:
+			return uint16(x), nil
+		case *big.Int:
+			return uint16(x.Int64()), nil
+		case time.Duration:
+			return uint16(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qUint32:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			if _, frac := math.Modf(float64(x)); frac != 0 {
+				return truncConv(x)
+			}
+
+			return uint32(x), nil
+		case idealInt:
+			return uint32(x), nil
+		case idealRune:
+			return uint32(x), nil
+		case idealUint:
+			return uint32(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return uint32(x), nil
+		case float64:
+			return uint32(x), nil
+		case int8:
+			return uint32(x), nil
+		case int16:
+			return uint32(x), nil
+		case int32:
+			return uint32(x), nil
+		case int64:
+			return uint32(x), nil
+		//case string:
+		case uint8:
+			return uint32(x), nil
+		case uint16:
+			return uint32(x), nil
+		case uint32:
+			return uint32(x), nil
+		case uint64:
+			return uint32(x), nil
+		case *big.Int:
+			return uint32(x.Int64()), nil
+		case time.Duration:
+			return uint32(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qUint64:
+		switch x := val.(type) {
+		//case nil:
+		//case idealComplex:
+		case idealFloat:
+			if _, frac := math.Modf(float64(x)); frac != 0 {
+				return truncConv(x)
+			}
+
+			return uint64(x), nil
+		case idealInt:
+			return uint64(x), nil
+		case idealRune:
+			return uint64(x), nil
+		case idealUint:
+			return uint64(x), nil
+		//case bool:
+		//case complex64:
+		//case complex128:
+		case float32:
+			return uint64(x), nil
+		case float64:
+			return uint64(x), nil
+		case int8:
+			return uint64(x), nil
+		case int16:
+			return uint64(x), nil
+		case int32:
+			return uint64(x), nil
+		case int64:
+			return uint64(x), nil
+		//case string:
+		case uint8:
+			return uint64(x), nil
+		case uint16:
+			return uint64(x), nil
+		case uint32:
+			return uint64(x), nil
+		case uint64:
+			return uint64(x), nil
+		case *big.Int:
+			return x.Uint64(), nil
+		case time.Duration:
+			return uint64(x), nil
+		default:
+			return invConv(val, typ)
+		}
+	case qBlob:
+		switch x := val.(type) {
+		case string:
+			return []byte(x), nil
+		case []byte:
+			return x, nil
+		default:
+			return invConv(val, typ)
+		}
+	case qBigInt:
+		switch x := val.(type) {
+		// case blob
+		// case bool
+		//case idealComplex:
+		case idealFloat:
+			if _, frac := math.Modf(float64(x)); frac != 0 {
+				return truncConv(x)
+			}
+
+			rr := big.NewRat(1, 1).SetFloat64(float64(x))
+			ii := big.NewInt(0).Set(rr.Num())
+			ii.Quo(ii, rr.Denom())
+			return ii, nil
+		case idealInt:
+			return big.NewInt(0).SetInt64(int64(x)), nil
+		case idealRune:
+			return big.NewInt(0).SetInt64(int64(x)), nil
+		case idealUint:
+			return big.NewInt(0).SetUint64(uint64(x)), nil
+		//case complex64
+		//case complex128
+		case float32:
+			rr := big.NewRat(1, 1).SetFloat64(float64(x))
+			ii := big.NewInt(0).Set(rr.Num())
+			ii.Quo(ii, rr.Denom())
+			return ii, nil
+		case float64:
+			rr := big.NewRat(1, 1).SetFloat64(float64(x))
+			ii := big.NewInt(0).Set(rr.Num())
+			ii.Quo(ii, rr.Denom())
+			return ii, nil
+		case int8:
+			return big.NewInt(0).SetInt64(int64(x)), nil
+		case int16:
+			return big.NewInt(0).SetInt64(int64(x)), nil
+		case int32:
+			return big.NewInt(0).SetInt64(int64(x)), nil
+		case int64:
+			return big.NewInt(0).SetInt64(x), nil
+		case string:
+			y := big.NewInt(0)
+			if _, ok := y.SetString(x, 0); !ok {
+				return invConv(val, typ)
+			}
+
+			return y, nil
+		case uint8:
+			return big.NewInt(0).SetUint64(uint64(x)), nil
+		case uint16:
+			return big.NewInt(0).SetUint64(uint64(x)), nil
+		case uint32:
+			return big.NewInt(0).SetUint64(uint64(x)), nil
+		case uint64:
+			return big.NewInt(0).SetUint64(x), nil
+		case *big.Int:
+			return x, nil
+		case *big.Rat:
+			ii := big.NewInt(0).Set(x.Num())
+			ii.Div(ii, x.Denom())
+			return ii, nil
+		default:
+			return invConv(val, typ)
+		}
+	case qBigRat:
+		switch x := val.(type) {
+		// case blob
+		// case bool
+		//case idealComplex:
+		case idealFloat:
+			return big.NewRat(1, 1).SetFloat64(float64(x)), nil
+		case idealInt:
+			return big.NewRat(1, 1).SetInt64(int64(x)), nil
+		case idealRune:
+			return big.NewRat(1, 1).SetInt64(int64(x)), nil
+		case idealUint:
+			return big.NewRat(1, 1).SetInt(big.NewInt(0).SetUint64(uint64(x))), nil
+		//case complex64
+		//case complex128
+		case float32:
+			return big.NewRat(1, 1).SetFloat64(float64(x)), nil
+		case float64:
+			return big.NewRat(1, 1).SetFloat64(x), nil
+		case int8:
+			return big.NewRat(1, 1).SetInt64(int64(x)), nil
+		case int16:
+			return big.NewRat(1, 1).SetInt64(int64(x)), nil
+		case int32:
+			return big.NewRat(1, 1).SetInt64(int64(x)), nil
+		case int64:
+			return big.NewRat(1, 1).SetInt64(x), nil
+		case string:
+			y := big.NewRat(1, 1)
+			if _, ok := y.SetString(x); !ok {
+				return invConv(val, typ)
+			}
+
+			return y, nil
+		case uint8:
+			return big.NewRat(1, 1).SetInt64(int64(x)), nil
+		case uint16:
+			return big.NewRat(1, 1).SetInt64(int64(x)), nil
+		case uint32:
+			return big.NewRat(1, 1).SetInt64(int64(x)), nil
+		case uint64:
+			return big.NewRat(1, 1).SetInt(big.NewInt(0).SetUint64(x)), nil
+		case *big.Int:
+			return big.NewRat(1, 1).SetInt(x), nil
+		case *big.Rat:
+			return x, nil
+		default:
+			return invConv(val, typ)
+		}
+	case qDuration:
+		switch x := val.(type) {
+		// case blob
+		// case bool
+		//case idealComplex:
+		case idealFloat:
+			return time.Duration(x), nil
+		case idealInt:
+			return time.Duration(x), nil
+		case idealRune:
+			return time.Duration(x), nil
+		case idealUint:
+			return time.Duration(x), nil
+		//case complex64
+		//case complex128
+		case float32:
+			return time.Duration(x), nil
+		case float64:
+			return time.Duration(x), nil
+		case int8:
+			return time.Duration(x), nil
+		case int16:
+			return time.Duration(x), nil
+		case int32:
+			return time.Duration(x), nil
+		case int64:
+			return time.Duration(x), nil
+		case string:
+			return time.ParseDuration(x)
+		case uint8:
+			return time.Duration(x), nil
+		case uint16:
+			return time.Duration(x), nil
+		case uint32:
+			return time.Duration(x), nil
+		case uint64:
+			return time.Duration(x), nil
+		case *big.Int:
+			return time.Duration(x.Int64()), nil
+		case *big.Rat:
+			f, _ := x.Float64()
+			return time.Duration(f), nil
+		case time.Duration:
+			return x, nil
+		default:
+			return invConv(val, typ)
+		}
+	case qTime:
+		switch x := val.(type) {
+		// case blob
+		// case bool
+		//case idealComplex:
+		//case idealFloat:
+		//case idealInt:
+		//case idealRune:
+		//case idealUint:
+		//case complex64
+		//case complex128
+		//case float32:
+		//case float64:
+		//case int8:
+		//case int16:
+		//case int32:
+		//case int64:
+		//case string:
+		//case uint8:
+		//case uint16:
+		//case uint32:
+		//case uint64:
+		//case *big.Int:
+		//case *big.Rat:
+		//case time.Duration:
+		case time.Time:
+			return x, nil
+		default:
+			return invConv(val, typ)
+		}
+	default:
+		panic("internal error 006")
+	}
+}
+
+func invShiftRHS(lhs, rhs interface{}) (interface{}, error) {
+	return nil, fmt.Errorf("invalid operation: %v << %v (shift count type %T, must be unsigned integer)", lhs, rhs, rhs)
+}
+
+func invTruncInt(v interface{}) error {
+	return fmt.Errorf("constant %v truncated to integer", v)
+}
+
+func overflow(v interface{}, typ int) error {
+	return fmt.Errorf("constant %v overflows %s", v, typeStr(typ))
+}
+
+func typeCheck1(val interface{}, c *col) (interface{}, error) {
+	rec := []interface{}{val}
+	c = c.clone()
+	c.index = 0
+	if err := typeCheck(rec, []*col{c}); err != nil {
+		return nil, err
+	}
+
+	return rec[0], nil
+}
+
+func typeCheck(rec []interface{}, cols []*col) (err error) {
+	for _, c := range cols {
+		i := c.index
+		if v := rec[i]; !c.typeCheck(v) {
+			switch v.(type) {
+			case idealComplex:
+				y := complex128(v.(idealComplex))
+				switch c.typ {
+				case qBool:
+				case qComplex64:
+					rec[i] = complex64(y)
+					continue
+				case qComplex128:
+					rec[i] = complex128(y)
+					continue
+				case qFloat32, qFloat64, qInt8, qInt16, qInt32, qInt64, qUint8, qUint16, qUint32, qUint64:
+					return fmt.Errorf("constant %v truncated to real", y)
+				}
+			case idealFloat:
+				y := float64(v.(idealFloat))
+				switch c.typ {
+				case qBool:
+				case qComplex64:
+					rec[i] = complex(float32(y), 0)
+					continue
+				case qComplex128:
+					rec[i] = complex(float64(y), 0)
+					continue
+				case qFloat32:
+					rec[i] = float32(y)
+					continue
+				case qFloat64:
+					rec[i] = float64(y)
+					continue
+				case qInt8:
+					if math.Floor(y) != y {
+						return invTruncInt(y)
+					}
+
+					if y < math.MinInt8 || y > math.MaxInt8 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int8(y)
+					continue
+				case qInt16:
+					if math.Floor(y) != y {
+						return invTruncInt(y)
+					}
+
+					if y < math.MinInt16 || y > math.MaxInt16 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int16(y)
+					continue
+				case qInt32:
+					if math.Floor(y) != y {
+						return invTruncInt(y)
+					}
+
+					if y < math.MinInt32 || y > math.MaxInt32 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int32(y)
+					continue
+				case qInt64:
+					if math.Floor(y) != y {
+						return invTruncInt(y)
+					}
+
+					if y < math.MinInt64 || y > math.MaxInt64 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int64(y)
+					continue
+				case qString:
+				case qUint8:
+					if math.Floor(y) != y {
+						return invTruncInt(y)
+					}
+
+					if y < 0 || y > math.MaxUint8 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint8(y)
+					continue
+				case qUint16:
+					if math.Floor(y) != y {
+						return invTruncInt(y)
+					}
+
+					if y < 0 || y > math.MaxUint16 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint16(y)
+					continue
+				case qUint32:
+					if math.Floor(y) != y {
+						return invTruncInt(y)
+					}
+
+					if y < 0 || y > math.MaxUint32 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint32(y)
+					continue
+				case qUint64:
+					if math.Floor(y) != y {
+						return invTruncInt(y)
+					}
+
+					if y < 0 || y > math.MaxUint64 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint64(y)
+					continue
+				case qBigInt:
+					if math.Floor(y) != y {
+						return invTruncInt(y)
+					}
+
+					rr := big.NewRat(1, 1).SetFloat64(y)
+					ii := big.NewInt(0)
+					ii.Set(rr.Num())
+					ii.Quo(ii, rr.Denom())
+					rec[i] = ii
+					continue
+				case qBigRat:
+					rec[i] = big.NewRat(1, 1).SetFloat64(y)
+					continue
+				}
+			case idealInt:
+				y := int64(v.(idealInt))
+				switch c.typ {
+				case qBool:
+				case qComplex64:
+					rec[i] = complex(float32(y), 0)
+					continue
+				case qComplex128:
+					rec[i] = complex(float64(y), 0)
+					continue
+				case qFloat32:
+					rec[i] = float32(y)
+					continue
+				case qFloat64:
+					rec[i] = float64(y)
+					continue
+				case qInt8:
+					if y < math.MinInt8 || y > math.MaxInt8 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int8(y)
+					continue
+				case qInt16:
+					if y < math.MinInt16 || y > math.MaxInt16 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int16(y)
+					continue
+				case qInt32:
+					if y < math.MinInt32 || y > math.MaxInt32 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int32(y)
+					continue
+				case qInt64:
+					if y < math.MinInt64 || y > math.MaxInt64 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int64(y)
+					continue
+				case qString:
+				case qUint8:
+					if y < 0 || y > math.MaxUint8 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint8(y)
+					continue
+				case qUint16:
+					if y < 0 || y > math.MaxUint16 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint16(y)
+					continue
+				case qUint32:
+					if y < 0 || y > math.MaxUint32 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint32(y)
+					continue
+				case qUint64:
+					if y < 0 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint64(y)
+					continue
+				case qBigInt:
+					rec[i] = big.NewInt(y)
+					continue
+				case qBigRat:
+					rec[i] = big.NewRat(1, 1).SetInt64(y)
+					continue
+				}
+			case idealRune:
+				y := int64(v.(idealRune))
+				switch c.typ {
+				case qBool:
+				case qComplex64:
+					rec[i] = complex(float32(y), 0)
+					continue
+				case qComplex128:
+					rec[i] = complex(float64(y), 0)
+					continue
+				case qFloat32:
+					rec[i] = float32(y)
+					continue
+				case qFloat64:
+					rec[i] = float64(y)
+					continue
+				case qInt8:
+					if y < math.MinInt8 || y > math.MaxInt8 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int8(y)
+					continue
+				case qInt16:
+					if y < math.MinInt16 || y > math.MaxInt16 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int16(y)
+					continue
+				case qInt32:
+					if y < math.MinInt32 || y > math.MaxInt32 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int32(y)
+					continue
+				case qInt64:
+					if y < math.MinInt64 || y > math.MaxInt64 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int64(y)
+					continue
+				case qString:
+				case qUint8:
+					if y < 0 || y > math.MaxUint8 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint8(y)
+					continue
+				case qUint16:
+					if y < 0 || y > math.MaxUint16 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint16(y)
+					continue
+				case qUint32:
+					if y < 0 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint32(y)
+					continue
+				case qUint64:
+					if y < 0 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint64(y)
+					continue
+				case qBigInt:
+					rec[i] = big.NewInt(y)
+					continue
+				case qBigRat:
+					rec[i] = big.NewRat(1, 1).SetInt64(y)
+					continue
+				}
+			case idealUint:
+				y := uint64(v.(idealUint))
+				switch c.typ {
+				case qBool:
+				case qComplex64:
+					rec[i] = complex(float32(y), 0)
+					continue
+				case qComplex128:
+					rec[i] = complex(float64(y), 0)
+					continue
+				case qFloat32:
+					rec[i] = float32(y)
+					continue
+				case qFloat64:
+					rec[i] = float64(y)
+					continue
+				case qInt8:
+					if y > math.MaxInt8 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int8(y)
+					continue
+				case qInt16:
+					if y > math.MaxInt16 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int16(y)
+					continue
+				case qInt32:
+					if y > math.MaxInt32 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int32(y)
+					continue
+				case qInt64:
+					if y > math.MaxInt64 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = int64(y)
+					continue
+				case qString:
+					rec[i] = string(y)
+					continue
+				case qUint8:
+					if y > math.MaxUint8 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint8(y)
+					continue
+				case qUint16:
+					if y > math.MaxUint16 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint16(y)
+					continue
+				case qUint32:
+					if y > math.MaxUint32 {
+						return overflow(y, c.typ)
+					}
+
+					rec[i] = uint32(y)
+					continue
+				case qUint64:
+					rec[i] = uint64(y)
+					continue
+				case qBigInt:
+					rec[i] = big.NewInt(0).SetUint64(y)
+					continue
+				case qBigRat:
+					ii := big.NewInt(0).SetUint64(y)
+					rec[i] = big.NewRat(1, 1).SetInt(ii)
+					continue
+				}
+			}
+			return fmt.Errorf("cannot use %v (type %T) in assignment to, or comparison with, column %s (type %s)", v, ideal(v), c.name, typeStr(c.typ))
+		}
+	}
+	return
+}
+
+//TODO collate1 should return errors instead of panicing
+func collate1(a, b interface{}) int {
+	switch x := a.(type) {
+	case nil:
+		if b != nil {
+			return -1
+		}
+
+		return 0
+	case bool:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case bool:
+			if !x && y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		default:
+			// Make bool collate before anything except nil and
+			// other bool for index seeking first non NULL value.
+			return -1
+		}
+	case idealComplex:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case idealComplex:
+			if x == y {
+				return 0
+			}
+
+			if real(x) < real(y) {
+				return -1
+			}
+
+			if real(x) > real(y) {
+				return 1
+			}
+
+			if imag(x) < imag(y) {
+				return -1
+			}
+
+			return 1
+		case complex64:
+			{
+				x, y := complex64(x), complex64(y)
+				if x == y {
+					return 0
+				}
+
+				if real(x) < real(y) {
+					return -1
+				}
+
+				if real(x) > real(y) {
+					return 1
+				}
+
+				if imag(x) < imag(y) {
+					return -1
+				}
+
+				return 1
+			}
+		case complex128:
+			{
+				x := complex128(x)
+				if x == y {
+					return 0
+				}
+
+				if real(x) < real(y) {
+					return -1
+				}
+
+				if real(x) > real(y) {
+					return 1
+				}
+
+				if imag(x) < imag(y) {
+					return -1
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 012")
+		}
+	case idealUint:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case idealUint:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case uint8:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case uint16:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case uint32:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case uint64:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case uint:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 013")
+		}
+	case idealRune:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case idealRune:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case int8:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case int16:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case int32:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case int64:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case int:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 014")
+		}
+	case idealInt:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case idealInt:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case int8:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case int16:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case int32:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case int64:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case int:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 015")
+		}
+	case idealFloat:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case idealFloat:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case float32:
+			{
+				x, y := float64(x), float64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case float64:
+			{
+				x, y := float64(x), float64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 016")
+		}
+	case complex64:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case complex64:
+			if x == y {
+				return 0
+			}
+
+			if real(x) < real(y) {
+				return -1
+			}
+
+			if real(x) > real(y) {
+				return 1
+			}
+
+			if imag(x) < imag(y) {
+				return -1
+			}
+
+			return 1
+		case idealComplex:
+			{
+				x, y := complex64(x), complex64(y)
+				if x == y {
+					return 0
+				}
+
+				if real(x) < real(y) {
+					return -1
+				}
+
+				if real(x) > real(y) {
+					return 1
+				}
+
+				if imag(x) < imag(y) {
+					return -1
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 017")
+		}
+	case complex128:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case complex128:
+			if x == y {
+				return 0
+			}
+
+			if real(x) < real(y) {
+				return -1
+			}
+
+			if real(x) > real(y) {
+				return 1
+			}
+
+			if imag(x) < imag(y) {
+				return -1
+			}
+
+			return 1
+		case idealComplex:
+			{
+				x, y := complex128(x), complex128(y)
+				if x == y {
+					return 0
+				}
+
+				if real(x) < real(y) {
+					return -1
+				}
+
+				if real(x) > real(y) {
+					return 1
+				}
+
+				if imag(x) < imag(y) {
+					return -1
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 018")
+		}
+	case float32:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case float32:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealFloat:
+			{
+				x, y := float32(x), float32(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 019")
+		}
+	case float64:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case float64:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealFloat:
+			{
+				x, y := float64(x), float64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 020")
+		}
+	case int8:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case int8:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealInt:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 021")
+		}
+	case int16:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case int16:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealInt:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 022")
+		}
+	case int32:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case int32:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealInt:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 023")
+		}
+	case int64:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case int64:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealInt:
+			{
+				x, y := int64(x), int64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 024")
+		}
+	case uint8:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case uint8:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealInt:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case idealUint:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 025")
+		}
+	case uint16:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case uint16:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealInt:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case idealUint:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 026")
+		}
+	case uint32:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case uint32:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealInt:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case idealUint:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 027")
+		}
+	case uint64:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case uint64:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		case idealInt:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		case idealUint:
+			{
+				x, y := uint64(x), uint64(y)
+				if x < y {
+					return -1
+				}
+
+				if x == y {
+					return 0
+				}
+
+				return 1
+			}
+		default:
+			panic("internal error 028")
+		}
+	case string:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case string:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		default:
+			panic("internal error 029")
+		}
+	case []byte:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case []byte:
+			return bytes.Compare(x, y)
+		default:
+			panic("internal error 030")
+		}
+	case *big.Int:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case *big.Int:
+			return x.Cmp(y)
+		case idealInt:
+			{
+				y := big.NewInt(int64(y))
+				return x.Cmp(y)
+			}
+		case idealUint:
+			{
+				u := big.NewInt(0)
+				u.SetUint64(uint64(y))
+				return x.Cmp(u)
+			}
+		default:
+			panic("internal error 031")
+		}
+	case *big.Rat:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case *big.Rat:
+			return x.Cmp(y)
+		case idealInt:
+			{
+				y := big.NewRat(int64(y), 1)
+				return x.Cmp(y)
+			}
+		case idealUint:
+			{
+				u := big.NewInt(0)
+				u.SetUint64(uint64(y))
+				var y big.Rat
+				y.SetInt(u)
+				return x.Cmp(&y)
+			}
+		default:
+			panic("internal error 032")
+		}
+	case time.Time:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case time.Time:
+			if x.Before(y) {
+				return -1
+			}
+
+			if x.Equal(y) {
+				return 0
+			}
+
+			return 1
+		default:
+			panic("internal error 033")
+		}
+	case time.Duration:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case time.Duration:
+			if x < y {
+				return -1
+			}
+
+			if x == y {
+				return 0
+			}
+
+			return 1
+		default:
+			panic("internal error 034")
+		}
+	case chunk:
+		switch y := b.(type) {
+		case nil:
+			return 1
+		case chunk:
+			a, err := x.expand()
+			if err != nil {
+				panic(err)
+			}
+
+			b, err := y.expand()
+			if err != nil {
+				panic(err)
+			}
+
+			return collate1(a, b)
+		default:
+			panic("internal error 035")
+		}
+	default:
+		//dbg("%T(%v) %T(%v)", a, a, b, b)
+		panic("internal error 036")
+	}
+}
+
+//TODO collate should return errors from collate1
+func collate(x, y []interface{}) (r int) {
+	//defer func() { dbg("%v %v -> %v", x, y, r) }()
+	nx, ny := len(x), len(y)
+
+	switch {
+	case nx == 0 && ny != 0:
+		return -1
+	case nx == 0 && ny == 0:
+		return 0
+	case nx != 0 && ny == 0:
+		return 1
+	}
+
+	r = 1
+	if nx > ny {
+		x, y, r = y, x, -r
+	}
+
+	for i, xi := range x {
+		if c := collate1(xi, y[i]); c != 0 {
+			return c * r
+		}
+	}
+
+	if nx == ny {
+		return 0
+	}
+
+	return -r
+}
+
+var collators = map[bool]func(a, b []interface{}) int{false: collateDesc, true: collate}
+
+func collateDesc(a, b []interface{}) int {
+	return -collate(a, b)
+}
+
+func isOrderedType(v interface{}) (y interface{}, r bool, err error) {
+	//dbg("====")
+	//dbg("%T(%v)", v, v)
+	//defer func() { dbg("%T(%v)", y, y) }()
+	switch x := v.(type) {
+	case idealFloat, idealInt, idealRune, idealUint,
+		float32, float64,
+		int8, int16, int32, int64,
+		uint8, uint16, uint32, uint64,
+		string:
+		return v, true, nil
+	case *big.Int, *big.Rat, time.Time, time.Duration:
+		return x, true, nil
+	case chunk:
+		if y, err = x.expand(); err != nil {
+			return
+		}
+
+		return isOrderedType(y)
+	}
+
+	return v, false, nil
+}
+
+var isSystemName = map[string]bool{
+	"__Column":        true,
+	"__Column2":       true,
+	"__Index":         true,
+	"__Index2":        true,
+	"__Index2_Column": true,
+	"__Index2_Expr":   true,
+	"__Table":         true,
+}
+
+func qualifier(s string) string {
+	if pos := strings.IndexByte(s, '.'); pos >= 0 {
+		s = s[:pos]
+	}
+	return s
+}
+
+func mustQualifier(s string) string {
+	q := qualifier(s)
+	if q == s {
+		panic("internal error 068")
+	}
+
+	return q
+}
+
+func selector(s string) string {
+	if pos := strings.IndexByte(s, '.'); pos >= 0 {
+		s = s[pos+1:]
+	}
+	return s
+}
+
+func mustSelector(s string) string {
+	q := selector(s)
+	if q == s {
+		panic("internal error 053")
+	}
+
+	return q
+}
+
+func qnames(l []string) []string {
+	r := make([]string, len(l))
+	for i, v := range l {
+		r[i] = fmt.Sprintf("%q", v)
+	}
+	return r
+}
diff --git a/vendor/github.com/cznic/ql/expr.go b/vendor/github.com/cznic/ql/expr.go
new file mode 100644
index 0000000000..3e6954fbe6
--- /dev/null
+++ b/vendor/github.com/cznic/ql/expr.go
@@ -0,0 +1,4023 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found pIn the LICENSE file.
+
+package ql
+
+import (
+	"fmt"
+	"math/big"
+	"regexp"
+	"strings"
+	"time"
+)
+
+var (
+	_ expression = (*binaryOperation)(nil)
+	_ expression = (*call)(nil)
+	_ expression = (*conversion)(nil)
+	_ expression = (*ident)(nil)
+	_ expression = (*indexOp)(nil)
+	_ expression = (*isNull)(nil)
+	_ expression = (*pIn)(nil)
+	_ expression = (*pLike)(nil)
+	_ expression = (*parameter)(nil)
+	_ expression = (*pexpr)(nil)
+	_ expression = (*slice)(nil)
+	_ expression = (*unaryOperation)(nil)
+	_ expression = value{}
+)
+
+type expression interface {
+	clone(arg []interface{}, unqualify ...string) (expression, error)
+	eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error)
+	isStatic() bool
+	String() string
+}
+
+func cloneExpressionList(arg []interface{}, list []expression, unqualify ...string) ([]expression, error) {
+	r := make([]expression, len(list))
+	var err error
+	for i, v := range list {
+		if r[i], err = v.clone(arg, unqualify...); err != nil {
+			return nil, err
+		}
+	}
+	return r, nil
+}
+
+func isConstValue(v interface{}) interface{} {
+	switch x := v.(type) {
+	case value:
+		return x.val
+	case
+		idealComplex,
+		idealFloat,
+		idealInt,
+		idealRune,
+		idealUint:
+		return v
+	default:
+		return nil
+	}
+}
+
+func isColumnExpression(v expression) (bool, string) {
+	x, ok := v.(*ident)
+	if ok {
+		return true, x.s
+	}
+
+	c, ok := v.(*call)
+	if !ok || c.f != "id" || len(c.arg) != 0 {
+		return false, ""
+	}
+
+	return true, "id()"
+}
+
+func mentionedColumns0(e expression, q, nq bool, m map[string]struct{}) {
+	switch x := e.(type) {
+	case parameter,
+		value:
+		// nop
+	case *binaryOperation:
+		mentionedColumns0(x.l, q, nq, m)
+		mentionedColumns0(x.r, q, nq, m)
+	case *call:
+		if x.f != "id" {
+			for _, e := range x.arg {
+				mentionedColumns0(e, q, nq, m)
+			}
+		}
+	case *conversion:
+		mentionedColumns0(x.val, q, nq, m)
+	case *ident:
+		if q && x.isQualified() {
+			m[x.s] = struct{}{}
+		}
+		if nq && !x.isQualified() {
+			m[x.s] = struct{}{}
+		}
+	case *indexOp:
+		mentionedColumns0(x.expr, q, nq, m)
+		mentionedColumns0(x.x, q, nq, m)
+	case *isNull:
+		mentionedColumns0(x.expr, q, nq, m)
+	case *pexpr:
+		mentionedColumns0(x.expr, q, nq, m)
+	case *pIn:
+		mentionedColumns0(x.expr, q, nq, m)
+		for _, e := range x.list {
+			mentionedColumns0(e, q, nq, m)
+		}
+	case *pLike:
+		mentionedColumns0(x.expr, q, nq, m)
+		mentionedColumns0(x.pattern, q, nq, m)
+	case *slice:
+		mentionedColumns0(x.expr, q, nq, m)
+		if y := x.lo; y != nil {
+			mentionedColumns0(*y, q, nq, m)
+		}
+		if y := x.hi; y != nil {
+			mentionedColumns0(*y, q, nq, m)
+		}
+	case *unaryOperation:
+		mentionedColumns0(x.v, q, nq, m)
+	default:
+		panic("internal error 052")
+	}
+}
+
+func mentionedColumns(e expression) map[string]struct{} {
+	m := map[string]struct{}{}
+	mentionedColumns0(e, false, true, m)
+	return m
+}
+
+func mentionedQColumns(e expression) map[string]struct{} {
+	m := map[string]struct{}{}
+	mentionedColumns0(e, true, false, m)
+	return m
+}
+
+func staticExpr(e expression) (expression, error) {
+	if e.isStatic() {
+		v, err := e.eval(nil, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		if v == nil {
+			return value{nil}, nil
+		}
+
+		return value{v}, nil
+	}
+
+	return e, nil
+}
+
+type (
+	idealComplex complex128
+	idealFloat   float64
+	idealInt     int64
+	idealRune    int32
+	idealUint    uint64
+)
+
+type exprTab struct {
+	expr  expression
+	table string
+}
+
+type pexpr struct {
+	expr expression
+}
+
+func (p *pexpr) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	expr, err := p.expr.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pexpr{expr: expr}, nil
+}
+
+func (p *pexpr) isStatic() bool { return p.expr.isStatic() }
+
+func (p *pexpr) String() string {
+	return fmt.Sprintf("(%s)", p.expr)
+}
+
+func (p *pexpr) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	return p.expr.eval(execCtx, ctx)
+}
+
+//DONE newBetween
+//LATER like newBetween, check all others have and use new*
+
+func newBetween(expr, lo, hi interface{}, not bool) (expression, error) {
+	e, err := staticExpr(expr.(expression))
+	if err != nil {
+		return nil, err
+	}
+
+	l, err := staticExpr(lo.(expression))
+	if err != nil {
+		return nil, err
+	}
+
+	h, err := staticExpr(hi.(expression))
+	if err != nil {
+		return nil, err
+	}
+
+	var a, b expression
+	op := andand
+	switch {
+	case not: // e < l || e > h
+		op = oror
+		if a, err = newBinaryOperation('<', e, l); err != nil {
+			return nil, err
+		}
+
+		if b, err = newBinaryOperation('>', e, h); err != nil {
+			return nil, err
+		}
+	default: // e >= l && e <= h
+		if a, err = newBinaryOperation(ge, e, l); err != nil {
+			return nil, err
+		}
+
+		if b, err = newBinaryOperation(le, e, h); err != nil {
+			return nil, err
+		}
+	}
+
+	if a, err = staticExpr(a); err != nil {
+		return nil, err
+	}
+
+	if b, err = staticExpr(b); err != nil {
+		return nil, err
+	}
+
+	ret, err := newBinaryOperation(op, a, b)
+	if err != nil {
+		return nil, err
+	}
+
+	return staticExpr(ret)
+}
+
+type pLike struct {
+	expr    expression
+	pattern expression
+	re      *regexp.Regexp
+	sexpr   *string
+}
+
+func (p *pLike) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	expr, err := p.expr.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	pattern, err := p.pattern.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pLike{
+		expr:    expr,
+		pattern: pattern,
+		re:      p.re,
+		sexpr:   p.sexpr,
+	}, nil
+}
+
+func (p *pLike) isStatic() bool { return p.expr.isStatic() && p.pattern.isStatic() }
+func (p *pLike) String() string { return fmt.Sprintf("%s LIKE %s", p.expr, p.pattern) }
+
+func (p *pLike) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	var sexpr string
+	var ok bool
+	switch {
+	case p.sexpr != nil:
+		sexpr = *p.sexpr
+	default:
+		expr, err := expand1(p.expr.eval(execCtx, ctx))
+		if err != nil {
+			return nil, err
+		}
+
+		if expr == nil {
+			return nil, nil
+		}
+
+		sexpr, ok = expr.(string)
+		if !ok {
+			return nil, fmt.Errorf("non-string expression in LIKE: %v (value of type %T)", expr, expr)
+		}
+
+		if p.expr.isStatic() {
+			p.sexpr = new(string)
+			*p.sexpr = sexpr
+		}
+	}
+
+	re := p.re
+	if re == nil {
+		pattern, err := expand1(p.pattern.eval(execCtx, ctx))
+		if err != nil {
+			return nil, err
+		}
+
+		if pattern == nil {
+			return nil, nil
+		}
+
+		spattern, ok := pattern.(string)
+		if !ok {
+			return nil, fmt.Errorf("non-string pattern in LIKE: %v (value of type %T)", pattern, pattern)
+		}
+
+		if re, err = regexp.Compile(spattern); err != nil {
+			return nil, err
+		}
+
+		if p.pattern.isStatic() {
+			p.re = re
+		}
+	}
+
+	return re.MatchString(sexpr), nil
+}
+
+type binaryOperation struct {
+	op   int
+	l, r expression
+}
+
+func newBinaryOperation0(op int, x, y interface{}) (v expression, err error) {
+	if op == eq {
+		if l, ok := x.(value); ok {
+			if b, ok := l.val.(bool); ok {
+				if b { // true == y: y
+					return y.(expression), nil
+				}
+
+				// false == y: !y
+				return newUnaryOperation('!', y)
+			}
+		}
+
+		if r, ok := y.(value); ok {
+			if b, ok := r.val.(bool); ok {
+				if b { // x == true: x
+					return x.(expression), nil
+				}
+
+				// x == false: !x
+				return newUnaryOperation('!', x)
+			}
+		}
+	}
+
+	if op == neq {
+		if l, ok := x.(value); ok {
+			if b, ok := l.val.(bool); ok {
+				if b { // true != y: !y
+					return newUnaryOperation('!', y)
+				}
+
+				// false != y: y
+				return y.(expression), nil
+			}
+		}
+
+		if r, ok := y.(value); ok {
+			if b, ok := r.val.(bool); ok {
+				if b { // x != true: !x
+					return newUnaryOperation('!', x)
+				}
+
+				// x != false: x
+				return x.(expression), nil
+			}
+		}
+	}
+
+	b := binaryOperation{op, x.(expression), y.(expression)}
+	var lv interface{}
+	if e := b.l; e.isStatic() {
+		if lv, err = e.eval(nil, nil); err != nil {
+			return nil, err
+		}
+
+		b.l = value{lv}
+	}
+
+	if e := b.r; e.isStatic() {
+		v, err := e.eval(nil, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		if v == nil {
+			return value{nil}, nil
+		}
+
+		if op == '/' || op == '%' {
+			rb := binaryOperation{eq, e, value{idealInt(0)}}
+			val, err := rb.eval(nil, nil)
+			if err != nil {
+				return nil, err
+			}
+
+			if val.(bool) {
+				return nil, errDivByZero
+			}
+		}
+
+		if b.l.isStatic() && lv == nil {
+			return value{nil}, nil
+		}
+
+		b.r = value{v}
+	}
+
+	if !b.isStatic() {
+		return &b, nil
+	}
+
+	val, err := b.eval(nil, nil)
+	return value{val}, err
+}
+
+func newBinaryOperation(op int, x, y interface{}) (v expression, err error) {
+	expr, err := newBinaryOperation0(op, x, y)
+	if err != nil {
+		return nil, err
+	}
+
+	b, ok := expr.(*binaryOperation)
+	if !ok {
+		return expr, nil
+	}
+
+	if _, ok := b.l.(*ident); ok {
+		return expr, nil
+	}
+
+	if c, ok := b.l.(*call); ok && c.f == "id" {
+		return expr, nil
+	}
+
+	var r expression
+	if r, ok = b.r.(*ident); !ok {
+		r1, ok := b.r.(*call)
+		if !ok || r1.f != "id" || len(r1.arg) != 0 {
+			return expr, nil
+		}
+
+		r = r1
+	}
+
+	// Normalize expr relOp indent: ident invRelOp expr
+	switch b.op {
+	case '<':
+		return &binaryOperation{'>', r, b.l}, nil
+	case le:
+		return &binaryOperation{ge, r, b.l}, nil
+	case '>':
+		return &binaryOperation{'<', r, b.l}, nil
+	case ge:
+		return &binaryOperation{le, r, b.l}, nil
+	case eq, neq:
+		return &binaryOperation{b.op, r, b.l}, nil
+	default:
+		return expr, nil
+	}
+}
+
+func (o *binaryOperation) isIdentRelOpVal() (bool, string, interface{}, error) {
+	sid := ""
+	id, ok := o.l.(*ident)
+	if !ok {
+		f, ok := o.l.(*call)
+		if !ok || f.f != "id" || len(f.arg) != 0 {
+			return false, "", nil, nil
+		}
+
+		sid = "id()"
+	} else {
+		if id.isQualified() {
+			return false, "", nil, nil
+		}
+
+		sid = id.s
+	}
+
+	if v, ok := o.r.(value); ok {
+		switch o.op {
+		case '<',
+			le,
+			'>',
+			ge,
+			eq,
+			neq:
+			return true, sid, v.val, nil
+		default:
+			return false, "", nil, nil
+		}
+	}
+
+	return false, "", nil, nil
+}
+
+func (o *binaryOperation) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	l, err := o.l.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	r, err := o.r.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	return newBinaryOperation(o.op, l, r)
+}
+
+func (o *binaryOperation) isStatic() bool { return o.l.isStatic() && o.r.isStatic() }
+
+func (o *binaryOperation) String() string {
+	return fmt.Sprintf("%s %s %s", o.l, iop(o.op), o.r)
+}
+
+func (o *binaryOperation) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (r interface{}, err error) {
+	defer func() {
+		if e := recover(); e != nil {
+			switch x := e.(type) {
+			case error:
+				r, err = nil, x
+			default:
+				r, err = nil, fmt.Errorf("%v", x)
+			}
+		}
+	}()
+
+	switch op := o.op; op {
+	case andand:
+		a, err := expand1(o.l.eval(execCtx, ctx))
+		if err != nil {
+			return nil, err
+		}
+
+		switch x := a.(type) {
+		case nil:
+			b, err := expand1(o.r.eval(execCtx, ctx))
+			if err != nil {
+				return nil, err
+			}
+
+			switch y := b.(type) {
+			case nil:
+				return nil, nil
+			case bool:
+				if !y {
+					return false, nil
+				}
+
+				return nil, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			if !x {
+				return false, nil
+			}
+
+			b, err := expand1(o.r.eval(execCtx, ctx))
+			if err != nil {
+				return nil, err
+			}
+
+			switch y := b.(type) {
+			case nil:
+				return nil, nil
+			case bool:
+				return y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return undOp(x, op)
+		}
+	case oror:
+		a, err := expand1(o.l.eval(execCtx, ctx))
+		if err != nil {
+			return nil, err
+		}
+
+		switch x := a.(type) {
+		case nil:
+			b, err := expand1(o.r.eval(execCtx, ctx))
+			if err != nil {
+				return nil, err
+			}
+
+			switch y := b.(type) {
+			case nil:
+				return nil, nil
+			case bool:
+				if y {
+					return y, nil
+				}
+
+				return nil, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			if x {
+				return x, nil
+			}
+
+			b, err := expand1(o.r.eval(execCtx, ctx))
+			if err != nil {
+				return nil, err
+			}
+
+			switch y := b.(type) {
+			case nil:
+				return nil, nil
+			case bool:
+				return y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return undOp(x, op)
+		}
+	case '>':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			switch y := b.(type) {
+			case string:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				return x.Cmp(y) > 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				return x.Cmp(y) > 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x > y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Time:
+			switch y := b.(type) {
+			case time.Time:
+				return x.After(y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case '<':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			switch y := b.(type) {
+			case string:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				return x.Cmp(y) < 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				return x.Cmp(y) < 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x < y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Time:
+			switch y := b.(type) {
+			case time.Time:
+				return x.Before(y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case le:
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			switch y := b.(type) {
+			case string:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				return x.Cmp(y) <= 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				return x.Cmp(y) <= 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x <= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Time:
+			switch y := b.(type) {
+			case time.Time:
+				return x.Before(y) || x.Equal(y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case ge:
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			switch y := b.(type) {
+			case string:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				return x.Cmp(y) >= 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				return x.Cmp(y) >= 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x >= y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Time:
+			switch y := b.(type) {
+			case time.Time:
+				return x.After(y) || x.Equal(y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case neq:
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			switch y := b.(type) {
+			case idealComplex:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			switch y := b.(type) {
+			case bool:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case complex64:
+			switch y := b.(type) {
+			case complex64:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case complex128:
+			switch y := b.(type) {
+			case complex128:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			switch y := b.(type) {
+			case string:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				return x.Cmp(y) != 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				return x.Cmp(y) != 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x != y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Time:
+			switch y := b.(type) {
+			case time.Time:
+				return !x.Equal(y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case eq:
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			switch y := b.(type) {
+			case idealComplex:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			switch y := b.(type) {
+			case bool:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case complex64:
+			switch y := b.(type) {
+			case complex64:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case complex128:
+			switch y := b.(type) {
+			case complex128:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			switch y := b.(type) {
+			case string:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				return x.Cmp(y) == 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				return x.Cmp(y) == 0, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x == y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Time:
+			switch y := b.(type) {
+			case time.Time:
+				return x.Equal(y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case '+':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			switch y := b.(type) {
+			case idealComplex:
+				return idealComplex(complex64(x) + complex64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return idealFloat(float64(x) + float64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return idealInt(int64(x) + int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return idealRune(int64(x) + int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return idealUint(uint64(x) + uint64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			switch y := b.(type) {
+			case complex64:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case complex128:
+			switch y := b.(type) {
+			case complex128:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			switch y := b.(type) {
+			case string:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x + y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				var z big.Int
+				return z.Add(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				var z big.Rat
+				return z.Add(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x + y, nil
+			case time.Time:
+				return y.Add(x), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Time:
+			switch y := b.(type) {
+			case time.Duration:
+				return x.Add(y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case '-':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			switch y := b.(type) {
+			case idealComplex:
+				return idealComplex(complex64(x) - complex64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return idealFloat(float64(x) - float64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return idealInt(int64(x) - int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return idealRune(int64(x) - int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return idealUint(uint64(x) - uint64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			switch y := b.(type) {
+			case complex64:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case complex128:
+			switch y := b.(type) {
+			case complex128:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				var z big.Int
+				return z.Sub(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				var z big.Rat
+				return z.Sub(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x - y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Time:
+			switch y := b.(type) {
+			case time.Duration:
+				return x.Add(-y), nil
+			case time.Time:
+				return x.Sub(y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case rsh:
+		a, b := eval2(o.l, o.r, execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+
+		var cnt uint64
+		switch y := b.(type) {
+		//case nil:
+		case idealComplex:
+			return invShiftRHS(a, b)
+		case idealFloat:
+			return invShiftRHS(a, b)
+		case idealInt:
+			cnt = uint64(y)
+		case idealRune:
+			cnt = uint64(y)
+		case idealUint:
+			cnt = uint64(y)
+		case bool:
+			return invShiftRHS(a, b)
+		case complex64:
+			return invShiftRHS(a, b)
+		case complex128:
+			return invShiftRHS(a, b)
+		case float32:
+			return invShiftRHS(a, b)
+		case float64:
+			return invShiftRHS(a, b)
+		case int8:
+			return invShiftRHS(a, b)
+		case int16:
+			return invShiftRHS(a, b)
+		case int32:
+			return invShiftRHS(a, b)
+		case int64:
+			return invShiftRHS(a, b)
+		case string:
+			return invShiftRHS(a, b)
+		case uint8:
+			cnt = uint64(y)
+		case uint16:
+			cnt = uint64(y)
+		case uint32:
+			cnt = uint64(y)
+		case uint64:
+			cnt = uint64(y)
+		default:
+			return invOp2(a, b, op)
+		}
+
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			return undOp2(a, b, op)
+		case idealInt:
+			return idealInt(int64(x) >> cnt), nil
+		case idealRune:
+			return idealRune(int64(x) >> cnt), nil
+		case idealUint:
+			return idealUint(uint64(x) >> cnt), nil
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			return undOp2(a, b, op)
+		case float64:
+			return undOp2(a, b, op)
+		case int8:
+			return x >> cnt, nil
+		case int16:
+			return x >> cnt, nil
+		case int32:
+			return x >> cnt, nil
+		case int64:
+			return x >> cnt, nil
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			return x >> cnt, nil
+		case uint16:
+			return x >> cnt, nil
+		case uint32:
+			return x >> cnt, nil
+		case uint64:
+			return x >> cnt, nil
+		case *big.Int:
+			var z big.Int
+			return z.Rsh(x, uint(cnt)), nil
+		case time.Duration:
+			return x >> cnt, nil
+		default:
+			return invOp2(a, b, op)
+		}
+	case lsh:
+		a, b := eval2(o.l, o.r, execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+
+		var cnt uint64
+		switch y := b.(type) {
+		//case nil:
+		case idealComplex:
+			return invShiftRHS(a, b)
+		case idealFloat:
+			return invShiftRHS(a, b)
+		case idealInt:
+			cnt = uint64(y)
+		case idealRune:
+			cnt = uint64(y)
+		case idealUint:
+			cnt = uint64(y)
+		case bool:
+			return invShiftRHS(a, b)
+		case complex64:
+			return invShiftRHS(a, b)
+		case complex128:
+			return invShiftRHS(a, b)
+		case float32:
+			return invShiftRHS(a, b)
+		case float64:
+			return invShiftRHS(a, b)
+		case int8:
+			return invShiftRHS(a, b)
+		case int16:
+			return invShiftRHS(a, b)
+		case int32:
+			return invShiftRHS(a, b)
+		case int64:
+			return invShiftRHS(a, b)
+		case string:
+			return invShiftRHS(a, b)
+		case uint8:
+			cnt = uint64(y)
+		case uint16:
+			cnt = uint64(y)
+		case uint32:
+			cnt = uint64(y)
+		case uint64:
+			cnt = uint64(y)
+		default:
+			return invOp2(a, b, op)
+		}
+
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			return undOp2(a, b, op)
+		case idealInt:
+			return idealInt(int64(x) << cnt), nil
+		case idealRune:
+			return idealRune(int64(x) << cnt), nil
+		case idealUint:
+			return idealUint(uint64(x) << cnt), nil
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			return undOp2(a, b, op)
+		case float64:
+			return undOp2(a, b, op)
+		case int8:
+			return x << cnt, nil
+		case int16:
+			return x << cnt, nil
+		case int32:
+			return x << cnt, nil
+		case int64:
+			return x << cnt, nil
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			return x << cnt, nil
+		case uint16:
+			return x << cnt, nil
+		case uint32:
+			return x << cnt, nil
+		case uint64:
+			return x << cnt, nil
+		case *big.Int:
+			var z big.Int
+			return z.Lsh(x, uint(cnt)), nil
+		case time.Duration:
+			return x << cnt, nil
+		default:
+			return invOp2(a, b, op)
+		}
+	case '&':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			return undOp2(a, b, op)
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return idealInt(int64(x) & int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return idealRune(int64(x) & int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return idealUint(uint64(x) & uint64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			return undOp2(a, b, op)
+		case float64:
+			return undOp2(a, b, op)
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x & y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x & y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x & y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x & y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x & y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x & y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x & y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x & y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				var z big.Int
+				return z.And(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x & y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case '|':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			return undOp2(a, b, op)
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return idealInt(int64(x) | int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return idealRune(int64(x) | int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return idealUint(uint64(x) | uint64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			return undOp2(a, b, op)
+		case float64:
+			return undOp2(a, b, op)
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x | y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x | y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x | y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x | y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x | y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x | y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x | y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x | y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				var z big.Int
+				return z.Or(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x | y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case andnot:
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			return undOp2(a, b, op)
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return idealInt(int64(x) &^ int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return idealRune(int64(x) &^ int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return idealUint(uint64(x) &^ uint64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			return undOp2(a, b, op)
+		case float64:
+			return undOp2(a, b, op)
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x &^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x &^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x &^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x &^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x &^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x &^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x &^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x &^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				var z big.Int
+				return z.AndNot(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x &^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case '^':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			return undOp2(a, b, op)
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return idealInt(int64(x) ^ int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return idealRune(int64(x) ^ int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return idealUint(uint64(x) ^ uint64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			return undOp2(a, b, op)
+		case float64:
+			return undOp2(a, b, op)
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x ^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x ^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x ^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x ^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x ^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x ^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x ^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x ^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				var z big.Int
+				return z.Xor(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x ^ y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case '%':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp2(a, b, op)
+		case idealFloat:
+			return undOp2(a, b, op)
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return idealInt(int64(x) % int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return idealRune(int64(x) % int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return idealUint(uint64(x) % uint64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			return undOp2(a, b, op)
+		case complex128:
+			return undOp2(a, b, op)
+		case float32:
+			return undOp2(a, b, op)
+		case float64:
+			return undOp2(a, b, op)
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x % y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x % y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x % y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x % y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x % y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x % y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x % y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x % y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				if y.Sign() == 0 {
+					return nil, errDivByZero
+				}
+
+				var z big.Int
+				return z.Mod(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x % y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case '/':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			switch y := b.(type) {
+			case idealComplex:
+				return idealComplex(complex64(x) / complex64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return idealFloat(float64(x) / float64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return idealInt(int64(x) / int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return idealRune(int64(x) / int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return idealUint(uint64(x) / uint64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			switch y := b.(type) {
+			case complex64:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case complex128:
+			switch y := b.(type) {
+			case complex128:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				if y.Sign() == 0 {
+					return nil, errDivByZero
+				}
+
+				var z big.Int
+				return z.Quo(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				if y.Sign() == 0 {
+					return nil, errDivByZero
+				}
+
+				var z big.Rat
+				return z.Quo(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x / y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	case '*':
+		a, b := o.get2(execCtx, ctx)
+		if a == nil || b == nil {
+			return
+		}
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			switch y := b.(type) {
+			case idealComplex:
+				return idealComplex(complex64(x) * complex64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealFloat:
+			switch y := b.(type) {
+			case idealFloat:
+				return idealFloat(float64(x) * float64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealInt:
+			switch y := b.(type) {
+			case idealInt:
+				return idealInt(int64(x) * int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealRune:
+			switch y := b.(type) {
+			case idealRune:
+				return idealRune(int64(x) * int64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case idealUint:
+			switch y := b.(type) {
+			case idealUint:
+				return idealUint(uint64(x) * uint64(y)), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case bool:
+			return undOp2(a, b, op)
+		case complex64:
+			switch y := b.(type) {
+			case complex64:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case complex128:
+			switch y := b.(type) {
+			case complex128:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float32:
+			switch y := b.(type) {
+			case float32:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case float64:
+			switch y := b.(type) {
+			case float64:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int8:
+			switch y := b.(type) {
+			case int8:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int16:
+			switch y := b.(type) {
+			case int16:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int32:
+			switch y := b.(type) {
+			case int32:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case int64:
+			switch y := b.(type) {
+			case int64:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case string:
+			return undOp2(a, b, op)
+		case uint8:
+			switch y := b.(type) {
+			case uint8:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint16:
+			switch y := b.(type) {
+			case uint16:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint32:
+			switch y := b.(type) {
+			case uint32:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case uint64:
+			switch y := b.(type) {
+			case uint64:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Int:
+			switch y := b.(type) {
+			case *big.Int:
+				var z big.Int
+				return z.Mul(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case *big.Rat:
+			switch y := b.(type) {
+			case *big.Rat:
+				var z big.Rat
+				return z.Mul(x, y), nil
+			default:
+				return invOp2(x, y, op)
+			}
+		case time.Duration:
+			switch y := b.(type) {
+			case time.Duration:
+				return x * y, nil
+			default:
+				return invOp2(x, y, op)
+			}
+		default:
+			return invOp2(a, b, op)
+		}
+	default:
+		panic("internal error 037")
+	}
+}
+
+func (o *binaryOperation) get2(execCtx *execCtx, ctx map[interface{}]interface{}) (x, y interface{}) {
+	x, y = eval2(o.l, o.r, execCtx, ctx)
+	//dbg("get2 pIn     - ", x, y)
+	//defer func() {dbg("get2 coerced ", x, y)}()
+	return coerce(x, y)
+}
+
+type ident struct {
+	s string
+}
+
+func (i *ident) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	x := strings.IndexByte(i.s, '.')
+	if x < 0 {
+		return &ident{s: i.s}, nil
+	}
+
+	q := i.s[:x]
+	for _, v := range unqualify {
+		if q == v {
+			return &ident{i.s[x+1:]}, nil
+		}
+	}
+	return &ident{s: i.s}, nil
+}
+
+func (i *ident) isQualified() bool { return strings.Contains(i.s, ".") }
+
+func (i *ident) isStatic() bool { return false }
+
+func (i *ident) String() string { return i.s }
+
+func (i *ident) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	if _, ok := ctx["$agg0"]; ok {
+		return int64(0), nil
+	}
+
+	//defer func() { dbg("ident %q -> %v %v", i.s, v, err) }()
+	v, ok := ctx[i.s]
+	if !ok {
+		err = fmt.Errorf("unknown field %s", i.s)
+	}
+	return
+}
+
+type pInEval struct {
+	m      map[interface{}]struct{} // IN (SELECT...) results
+	sample interface{}
+}
+
+type pIn struct {
+	expr expression
+	list []expression
+	not  bool
+	sel  *selectStmt
+}
+
+func (n *pIn) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	expr, err := n.expr.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	list, err := cloneExpressionList(arg, n.list)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pIn{
+		expr: expr,
+		list: list,
+		not:  n.not,
+		sel:  n.sel,
+	}, nil
+}
+
+func (n *pIn) isStatic() bool {
+	if !n.expr.isStatic() || n.sel != nil {
+		return false
+	}
+
+	for _, v := range n.list {
+		if !v.isStatic() {
+			return false
+		}
+	}
+	return true
+}
+
+//LATER newIn
+
+func (n *pIn) String() string {
+	if n.sel == nil {
+		a := []string{}
+		for _, v := range n.list {
+			a = append(a, v.String())
+		}
+		if n.not {
+			return fmt.Sprintf("%s NOT IN (%s)", n.expr, strings.Join(a, ","))
+		}
+
+		return fmt.Sprintf("%s IN (%s)", n.expr, strings.Join(a, ","))
+	}
+
+	if n.not {
+		return fmt.Sprintf("%s NOT IN (%s)", n.expr, n.sel)
+	}
+
+	return fmt.Sprintf("%s IN (%s)", n.expr, n.sel)
+}
+
+func (n *pIn) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	lhs, err := expand1(n.expr.eval(execCtx, ctx))
+	if err != nil {
+		return nil, err
+	}
+
+	if lhs == nil {
+		return nil, nil //TODO Add test for NULL LHS.
+	}
+
+	if n.sel == nil {
+		for _, v := range n.list {
+			b, err := newBinaryOperation(eq, value{lhs}, v)
+			if err != nil {
+				return nil, err
+			}
+
+			eval, err := b.eval(execCtx, ctx)
+			if err != nil {
+				return nil, err
+			}
+
+			if x, ok := eval.(bool); ok && x {
+				return !n.not, nil
+			}
+		}
+		return n.not, nil
+	}
+
+	var ev *pInEval
+	ev0 := ctx[n]
+	if ev0 == nil { // SELECT not yet evaluated.
+		r, err := n.sel.plan(execCtx)
+		if err != nil {
+			return nil, err
+		}
+
+		if g, e := len(r.fieldNames()), 1; g != e {
+			return false, fmt.Errorf("IN (%s): mismatched field count, have %d, need %d", n.sel, g, e)
+		}
+
+		ev = &pInEval{m: map[interface{}]struct{}{}}
+		ctx[n] = ev
+		m := ev.m
+		typechecked := false
+		if err := r.do(execCtx, func(id interface{}, data []interface{}) (more bool, err error) {
+			if typechecked {
+				if data[0] == nil {
+					return true, nil
+				}
+
+				m[data[0]] = struct{}{}
+			}
+
+			if data[0] == nil {
+				return true, nil
+			}
+
+			ev.sample = data[0]
+			switch ev.sample.(type) {
+			case bool, byte, complex128, complex64, float32,
+				float64, int16, int32, int64, int8,
+				string, uint16, uint32, uint64:
+				typechecked = true
+				m[ev.sample] = struct{}{}
+				return true, nil
+			default:
+				return false, fmt.Errorf("IN (%s): invalid field type: %T", n.sel, data[0])
+			}
+
+		}); err != nil {
+			return nil, err
+		}
+	} else {
+		ev = ev0.(*pInEval)
+	}
+
+	if ev.sample == nil {
+		return nil, nil
+	}
+
+	_, ok := ev.m[coerce1(lhs, ev.sample)]
+	return ok != n.not, nil
+}
+
+type value struct {
+	val interface{}
+}
+
+func (l value) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	return value{val: l.val}, nil
+}
+
+func (l value) isStatic() bool { return true }
+
+func (l value) String() string {
+	switch x := l.val.(type) {
+	case nil:
+		return "NULL"
+	case idealComplex:
+		s := fmt.Sprint(x)
+		return s[1 : len(s)-1]
+	case complex64:
+		s := fmt.Sprint(x)
+		return s[1 : len(s)-1]
+	case complex128:
+		s := fmt.Sprint(x)
+		return s[1 : len(s)-1]
+	case string:
+		return fmt.Sprintf("%q", x)
+	case time.Duration:
+		return fmt.Sprintf("duration(%q)", l.val)
+	case time.Time:
+		return fmt.Sprintf("time(%q)", l.val)
+	case *big.Rat:
+		return fmt.Sprintf("bigrat(%q)", l.val)
+	case *big.Int:
+		return fmt.Sprintf(`bigint("%v")`, l.val)
+	default:
+		return fmt.Sprintf("%v", l.val)
+	}
+}
+
+func (l value) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (interface{}, error) {
+	return l.val, nil
+}
+
+type conversion struct {
+	typ int
+	val expression
+}
+
+func (c *conversion) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	val, err := c.val.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	return &conversion{typ: c.typ, val: val}, nil
+}
+
+func (c *conversion) isStatic() bool {
+	return c.val.isStatic()
+}
+
+//LATER newConversion or fake unary op
+
+func (c *conversion) String() string {
+	return fmt.Sprintf("%s(%s)", typeStr(c.typ), c.val)
+}
+
+func (c *conversion) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	val, err := expand1(c.val.eval(execCtx, ctx))
+	if err != nil {
+		return
+	}
+
+	return convert(val, c.typ)
+}
+
+type unaryOperation struct {
+	op int
+	v  expression
+}
+
+func newUnaryOperation(op int, x interface{}) (v expression, err error) {
+	l, ok := x.(expression)
+	if !ok {
+		panic("internal error 038")
+	}
+
+	for {
+		pe, ok := l.(*pexpr)
+		if ok {
+			l = pe.expr
+			continue
+		}
+
+		break
+	}
+
+	if l.isStatic() {
+		val, err := l.eval(nil, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		l = value{val}
+	}
+
+	if op == '!' {
+		b, ok := l.(*binaryOperation)
+		if ok {
+			switch b.op {
+			case eq:
+				b.op = neq
+				return b, nil
+			case neq:
+				b.op = eq
+				return b, nil
+			case '>':
+				b.op = le
+				return b, nil
+			case ge:
+				b.op = '<'
+				return b, nil
+			case '<':
+				b.op = ge
+				return b, nil
+			case le:
+				b.op = '>'
+				return b, nil
+			}
+		}
+
+		u, ok := l.(*unaryOperation)
+		if ok && u.op == '!' { // !!x: x
+			return u.v, nil
+		}
+	}
+
+	return &unaryOperation{op, l}, nil
+}
+
+func (u *unaryOperation) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	v, err := u.v.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	return &unaryOperation{op: u.op, v: v}, nil
+}
+
+func (u *unaryOperation) isStatic() bool { return u.v.isStatic() }
+
+func (u *unaryOperation) String() string {
+	switch u.v.(type) {
+	case *binaryOperation:
+		return fmt.Sprintf("%s(%s)", iop(u.op), u.v)
+	default:
+		return fmt.Sprintf("%s%s", iop(u.op), u.v)
+	}
+}
+
+// !ident
+func (u *unaryOperation) isNotQIdent() (bool, string, expression) {
+	if u.op != '!' {
+		return false, "", nil
+	}
+
+	id, ok := u.v.(*ident)
+	if ok && id.isQualified() {
+		return true, mustQualifier(id.s), &unaryOperation{'!', &ident{mustSelector(id.s)}}
+	}
+
+	return false, "", nil
+}
+
+func (u *unaryOperation) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (r interface{}, err error) {
+	defer func() {
+		if e := recover(); e != nil {
+			switch x := e.(type) {
+			case error:
+				r, err = nil, x
+			default:
+				r, err = nil, fmt.Errorf("%v", x)
+			}
+		}
+	}()
+
+	switch op := u.op; op {
+	case '!':
+		a := eval(u.v, execCtx, ctx)
+		if a == nil {
+			return
+		}
+
+		switch x := a.(type) {
+		case bool:
+			return !x, nil
+		default:
+			return undOp(a, op)
+		}
+	case '^':
+		a := eval(u.v, execCtx, ctx)
+		if a == nil {
+			return
+		}
+
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return undOp(a, op)
+		case idealFloat:
+			return undOp(a, op)
+		case idealInt:
+			return ^x, nil
+		case idealRune:
+			return ^x, nil
+		case idealUint:
+			return ^x, nil
+		case bool:
+			return undOp(a, op)
+		case complex64:
+			return undOp(a, op)
+		case complex128:
+			return undOp(a, op)
+		case float32:
+			return undOp(a, op)
+		case float64:
+			return undOp(a, op)
+		case int8:
+			return ^x, nil
+		case int16:
+			return ^x, nil
+		case int32:
+			return ^x, nil
+		case int64:
+			return ^x, nil
+		case string:
+			return undOp(a, op)
+		case uint8:
+			return ^x, nil
+		case uint16:
+			return ^x, nil
+		case uint32:
+			return ^x, nil
+		case uint64:
+			return ^x, nil
+		case *big.Int:
+			var z big.Int
+			return z.Not(x), nil
+		case time.Duration:
+			return ^x, nil
+		default:
+			return undOp(a, op)
+		}
+	case '+':
+		a := eval(u.v, execCtx, ctx)
+		if a == nil {
+			return
+		}
+
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return +x, nil
+		case idealFloat:
+			return +x, nil
+		case idealInt:
+			return +x, nil
+		case idealRune:
+			return +x, nil
+		case idealUint:
+			return +x, nil
+		case bool:
+			return undOp(a, op)
+		case complex64:
+			return +x, nil
+		case complex128:
+			return +x, nil
+		case float32:
+			return +x, nil
+		case float64:
+			return +x, nil
+		case int8:
+			return +x, nil
+		case int16:
+			return +x, nil
+		case int32:
+			return +x, nil
+		case int64:
+			return +x, nil
+		case string:
+			return undOp(a, op)
+		case uint8:
+			return +x, nil
+		case uint16:
+			return +x, nil
+		case uint32:
+			return +x, nil
+		case uint64:
+			return +x, nil
+		case *big.Int:
+			var z big.Int
+			return z.Set(x), nil
+		case *big.Rat:
+			var z big.Rat
+			return z.Set(x), nil
+		case time.Duration:
+			return x, nil
+		default:
+			return undOp(a, op)
+		}
+	case '-':
+		a := eval(u.v, execCtx, ctx)
+		if a == nil {
+			return
+		}
+
+		switch x := a.(type) {
+		//case nil:
+		case idealComplex:
+			return -x, nil
+		case idealFloat:
+			return -x, nil
+		case idealInt:
+			return -x, nil
+		case idealRune:
+			return -x, nil
+		case idealUint:
+			return -x, nil
+		case bool:
+			return undOp(a, op)
+		case complex64:
+			return -x, nil
+		case complex128:
+			return -x, nil
+		case float32:
+			return -x, nil
+		case float64:
+			return -x, nil
+		case int8:
+			return -x, nil
+		case int16:
+			return -x, nil
+		case int32:
+			return -x, nil
+		case int64:
+			return -x, nil
+		case string:
+			return undOp(a, op)
+		case uint8:
+			return -x, nil
+		case uint16:
+			return -x, nil
+		case uint32:
+			return -x, nil
+		case uint64:
+			return -x, nil
+		case *big.Int:
+			var z big.Int
+			return z.Neg(x), nil
+		case *big.Rat:
+			var z big.Rat
+			return z.Neg(x), nil
+		case time.Duration:
+			return -x, nil
+		default:
+			return undOp(a, op)
+		}
+	default:
+		panic("internal error 039")
+	}
+}
+
+type call struct {
+	f   string
+	arg []expression
+}
+
+func newCall(f string, arg []expression) (v expression, isAgg bool, err error) {
+	x := builtin[f]
+	if x.f == nil {
+		return nil, false, fmt.Errorf("undefined: %s", f)
+	}
+
+	isAgg = x.isAggregate
+	if g, min, max := len(arg), x.minArgs, x.maxArgs; g < min || g > max {
+		a := []interface{}{}
+		for _, v := range arg {
+			a = append(a, v)
+		}
+		return nil, false, badNArgs(min, f, a)
+	}
+
+	c := call{f: f}
+	for _, val := range arg {
+		if !val.isStatic() {
+			c.arg = append(c.arg, val)
+			continue
+		}
+
+		eval, err := val.eval(nil, nil)
+		if err != nil {
+			return nil, isAgg, err
+		}
+
+		c.arg = append(c.arg, value{eval})
+	}
+
+	return &c, isAgg, nil
+}
+
+func (c *call) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	list, err := cloneExpressionList(arg, c.arg)
+	if err != nil {
+		return nil, err
+	}
+
+	return &call{f: c.f, arg: list}, nil
+}
+
+func (c *call) isStatic() bool {
+	v := builtin[c.f]
+	if v.f == nil || !v.isStatic {
+		return false
+	}
+
+	for _, v := range c.arg {
+		if !v.isStatic() {
+			return false
+		}
+	}
+	return true
+}
+
+func (c *call) String() string {
+	a := []string{}
+	for _, v := range c.arg {
+		a = append(a, v.String())
+	}
+	return fmt.Sprintf("%s(%s)", c.f, strings.Join(a, ", "))
+}
+
+func (c *call) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	f, ok := builtin[c.f]
+	if !ok {
+		return nil, fmt.Errorf("unknown function %s", c.f)
+	}
+
+	isID := c.f == "id"
+	a := make([]interface{}, len(c.arg))
+	for i, arg := range c.arg {
+		if v, err = expand1(arg.eval(execCtx, ctx)); err != nil {
+			if !isID {
+				return nil, err
+			}
+
+			if _, ok := arg.(*ident); !ok {
+				return nil, err
+			}
+
+			a[i] = arg
+			continue
+		}
+
+		a[i] = v
+	}
+
+	if ctx != nil {
+		ctx["$fn"] = c
+	}
+	return f.f(a, ctx)
+}
+
+type parameter struct {
+	n int
+}
+
+func (p parameter) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	i := p.n - 1
+	if i < len(arg) {
+		return value{val: arg[i]}, nil
+	}
+
+	return nil, fmt.Errorf("missing %s", p)
+}
+
+func (parameter) isStatic() bool { return false }
+
+func (p parameter) String() string { return fmt.Sprintf("$%d", p.n) }
+
+func (p parameter) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	i := p.n - 1
+	if i < len(execCtx.arg) {
+		return execCtx.arg[i], nil
+	}
+
+	return nil, fmt.Errorf("missing %s", p)
+}
+
+//MAYBE make it an unary operation
+type isNull struct {
+	expr expression
+	not  bool
+}
+
+//LATER newIsNull
+
+func (is *isNull) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	expr, err := is.expr.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	return &isNull{expr: expr, not: is.not}, nil
+}
+
+func (is *isNull) isStatic() bool { return is.expr.isStatic() }
+
+func (is *isNull) String() string {
+	if is.not {
+		return fmt.Sprintf("%s IS NOT NULL", is.expr)
+	}
+
+	return fmt.Sprintf("%s IS NULL", is.expr)
+}
+
+func (is *isNull) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	val, err := is.expr.eval(execCtx, ctx)
+	if err != nil {
+		return
+	}
+
+	return val == nil != is.not, nil
+}
+
+type indexOp struct {
+	expr, x expression
+}
+
+func newIndex(sv, xv expression) (v expression, err error) {
+	s, fs, i := "", false, uint64(0)
+	x := indexOp{sv, xv}
+	if x.expr.isStatic() {
+		v, err := x.expr.eval(nil, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		if v == nil {
+			return value{nil}, nil
+		}
+
+		if s, fs = v.(string); !fs {
+			return nil, invXOp(sv, xv)
+		}
+
+		x.expr = value{s}
+	}
+
+	if x.x.isStatic() {
+		v, err := x.x.eval(nil, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		if v == nil {
+			return value{nil}, nil
+		}
+
+		var p *string
+		if fs {
+			p = &s
+		}
+		if i, err = indexExpr(p, v); err != nil {
+			return nil, err
+		}
+
+		x.x = value{i}
+	}
+
+	return &x, nil
+}
+
+func (x *indexOp) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	expr, err := x.expr.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	x2, err := x.x.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	return &indexOp{expr: expr, x: x2}, nil
+}
+
+func (x *indexOp) isStatic() bool {
+	return x.expr.isStatic() && x.x.isStatic()
+}
+
+func (x *indexOp) String() string { return fmt.Sprintf("%s[%s]", x.expr, x.x) }
+
+func (x *indexOp) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	s0, err := x.expr.eval(execCtx, ctx)
+	if err != nil {
+		return nil, runErr(err)
+	}
+
+	s, ok := s0.(string)
+	if !ok {
+		return nil, runErr(invXOp(s0, x.x))
+	}
+
+	i0, err := x.x.eval(execCtx, ctx)
+	if err != nil {
+		return nil, runErr(err)
+	}
+
+	if i0 == nil {
+		return nil, nil
+	}
+
+	i, err := indexExpr(&s, i0)
+	if err != nil {
+		return nil, runErr(err)
+	}
+
+	return s[i], nil
+}
+
+type slice struct {
+	expr   expression
+	lo, hi *expression
+}
+
+func newSlice(e expression, lo, hi *expression) (v expression, err error) {
+	y := slice{e, lo, hi}
+	var val interface{}
+	if e := y.expr; e.isStatic() {
+		if val, err = e.eval(nil, nil); err != nil {
+			return nil, err
+		}
+
+		if val == nil {
+			return value{nil}, nil
+		}
+
+		y.expr = value{val}
+	}
+
+	if p := y.lo; p != nil {
+		if e := expr(*p); e.isStatic() {
+			if val, err = e.eval(nil, nil); err != nil {
+				return nil, err
+			}
+
+			if val == nil {
+				return value{nil}, nil
+			}
+
+			v := expression(value{val})
+			y.lo = &v
+		}
+	}
+
+	if p := y.hi; p != nil {
+		if e := expr(*p); e.isStatic() {
+			if val, err = e.eval(nil, nil); err != nil {
+				return nil, err
+			}
+
+			if val == nil {
+				return value{nil}, nil
+			}
+
+			v := expression(value{val})
+			y.hi = &v
+		}
+	}
+	return &y, nil
+}
+
+func (s *slice) clone(arg []interface{}, unqualify ...string) (expression, error) {
+	expr, err := s.expr.clone(arg, unqualify...)
+	if err != nil {
+		return nil, err
+	}
+
+	r := &slice{expr: expr, lo: s.lo, hi: s.hi}
+	if s.lo != nil {
+		e, err := (*s.lo).clone(arg, unqualify...)
+		if err != nil {
+			return nil, err
+		}
+
+		r.lo = &e
+	}
+	if s.hi != nil {
+		e, err := (*s.hi).clone(arg, unqualify...)
+		if err != nil {
+			return nil, err
+		}
+
+		r.hi = &e
+	}
+	return r, nil
+}
+
+func (s *slice) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
+	s0, err := s.expr.eval(execCtx, ctx)
+	if err != nil {
+		return
+	}
+
+	if s0 == nil {
+		return
+	}
+
+	ss, ok := s0.(string)
+	if !ok {
+		return nil, runErr(invSOp(s0))
+	}
+
+	var iLo, iHi uint64
+	if s.lo != nil {
+		i, err := (*s.lo).eval(execCtx, ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		if i == nil {
+			return nil, err
+		}
+
+		if iLo, err = sliceExpr(&ss, i, 0); err != nil {
+			return nil, err
+		}
+	}
+
+	iHi = uint64(len(ss))
+	if s.hi != nil {
+		i, err := (*s.hi).eval(execCtx, ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		if i == nil {
+			return nil, err
+		}
+
+		if iHi, err = sliceExpr(&ss, i, 1); err != nil {
+			return nil, err
+		}
+	}
+
+	return ss[iLo:iHi], nil
+}
+
+func (s *slice) isStatic() bool {
+	if !s.expr.isStatic() {
+		return false
+	}
+
+	if p := s.lo; p != nil && !(*p).isStatic() {
+		return false
+	}
+
+	if p := s.hi; p != nil && !(*p).isStatic() {
+		return false
+	}
+
+	return false
+}
+
+func (s *slice) String() string {
+	switch {
+	case s.lo == nil && s.hi == nil:
+		return fmt.Sprintf("%v[:]", s.expr)
+	case s.lo == nil && s.hi != nil:
+		return fmt.Sprintf("%v[:%v]", s.expr, *s.hi)
+	case s.lo != nil && s.hi == nil:
+		return fmt.Sprintf("%v[%v:]", s.expr, *s.lo)
+	default: //case s.lo != nil && s.hi != nil:
+		return fmt.Sprintf("%v[%v:%v]", s.expr, *s.lo, *s.hi)
+	}
+}
diff --git a/vendor/github.com/cznic/ql/file.go b/vendor/github.com/cznic/ql/file.go
new file mode 100644
index 0000000000..c7fb7c95ed
--- /dev/null
+++ b/vendor/github.com/cznic/ql/file.go
@@ -0,0 +1,1279 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Well known handles
+// 1: root
+// 2: id
+
+package ql
+
+import (
+	"crypto/sha1"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"math/big"
+	"os"
+	"path/filepath"
+	"sync"
+	"time"
+
+	"github.com/camlistore/go4/lock"
+	"github.com/cznic/exp/lldb"
+	"github.com/cznic/mathutil"
+)
+
+const (
+	magic = "\x60\xdbql"
+)
+
+var (
+	_ btreeIndex    = (*fileIndex)(nil)
+	_ btreeIterator = (*fileBTreeIterator)(nil)
+	_ indexIterator = (*fileIndexIterator)(nil)
+	_ storage       = (*file)(nil)
+	_ temp          = (*fileTemp)(nil)
+)
+
+type chunk struct { // expanded to blob types lazily
+	f *file
+	b []byte
+}
+
+func (c chunk) expand() (v interface{}, err error) {
+	return c.f.loadChunks(c.b)
+}
+
+func expand1(data interface{}, e error) (v interface{}, err error) {
+	if e != nil {
+		return nil, e
+	}
+
+	c, ok := data.(chunk)
+	if !ok {
+		return data, nil
+	}
+
+	return c.expand()
+}
+
+func expand(data []interface{}) (err error) {
+	for i, v := range data {
+		if data[i], err = expand1(v, nil); err != nil {
+			return
+		}
+	}
+	return
+}
+
+// OpenFile returns a DB backed by a named file. The back end limits the size
+// of a record to about 64 kB.
+func OpenFile(name string, opt *Options) (db *DB, err error) {
+	var f lldb.OSFile
+	if f = opt.OSFile; f == nil {
+		f, err = os.OpenFile(name, os.O_RDWR, 0666)
+		if err != nil {
+			if !os.IsNotExist(err) {
+				return nil, err
+			}
+
+			if !opt.CanCreate {
+				return nil, err
+			}
+
+			f, err = os.OpenFile(name, os.O_CREATE|os.O_EXCL|os.O_RDWR, 0666)
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	fi, err := newFileFromOSFile(f) // always ACID
+	if err != nil {
+		return
+	}
+
+	if fi.tempFile = opt.TempFile; fi.tempFile == nil {
+		fi.tempFile = func(dir, prefix string) (f lldb.OSFile, err error) {
+			f0, err := ioutil.TempFile(dir, prefix)
+			return f0, err
+		}
+	}
+
+	return newDB(fi)
+}
+
+// Options amend the behavior of OpenFile.
+//
+// CanCreate
+//
+// The CanCreate option enables OpenFile to create the DB file if it does not
+// exists.
+//
+// OSFile
+//
+// OSFile allows to pass an os.File like back end providing, for example,
+// encrypted storage. If this field is nil then OpenFile uses the file named by
+// the 'name' parameter instead.
+//
+// TempFile
+//
+// TempFile provides a temporary file used for evaluating the GROUP BY, ORDER
+// BY, ... clauses. The hook is intended to be used by encrypted DB back ends
+// to avoid leaks of unecrypted data to such temp files by providing temp files
+// which are encrypted as well. Note that *os.File satisfies the lldb.OSFile
+// interface.
+//
+// If TempFile is nil it defaults to ioutil.TempFile.
+type Options struct {
+	CanCreate bool
+	OSFile    lldb.OSFile
+	TempFile  func(dir, prefix string) (f lldb.OSFile, err error)
+}
+
+type fileBTreeIterator struct {
+	en *lldb.BTreeEnumerator
+	t  *fileTemp
+}
+
+func (it *fileBTreeIterator) Next() (k, v []interface{}, err error) {
+	bk, bv, err := it.en.Next()
+	if err != nil {
+		return
+	}
+
+	if k, err = lldb.DecodeScalars(bk); err != nil {
+		return
+	}
+
+	for i, val := range k {
+		b, ok := val.([]byte)
+		if !ok {
+			continue
+		}
+
+		c := chunk{it.t.file, b}
+		if k[i], err = c.expand(); err != nil {
+			return nil, nil, err
+		}
+	}
+
+	if err = enforce(k, it.t.colsK); err != nil {
+		return
+	}
+
+	if v, err = lldb.DecodeScalars(bv); err != nil {
+		return
+	}
+
+	for i, val := range v {
+		b, ok := val.([]byte)
+		if !ok {
+			continue
+		}
+
+		c := chunk{it.t.file, b}
+		if v[i], err = c.expand(); err != nil {
+			return nil, nil, err
+		}
+	}
+
+	err = enforce(v, it.t.colsV)
+	return
+}
+
+func enforce(val []interface{}, cols []*col) (err error) {
+	for i, v := range val {
+		if val[i], err = convert(v, cols[i].typ); err != nil {
+			return
+		}
+	}
+	return
+}
+
+//NTYPE
+func infer(from []interface{}, to *[]*col) {
+	if len(*to) == 0 {
+		*to = make([]*col, len(from))
+		for i := range *to {
+			(*to)[i] = &col{}
+		}
+	}
+	for i, c := range *to {
+		if f := from[i]; f != nil {
+			switch x := f.(type) {
+			//case nil:
+			case idealComplex:
+				c.typ = qComplex128
+				from[i] = complex128(x)
+			case idealFloat:
+				c.typ = qFloat64
+				from[i] = float64(x)
+			case idealInt:
+				c.typ = qInt64
+				from[i] = int64(x)
+			case idealRune:
+				c.typ = qInt32
+				from[i] = int32(x)
+			case idealUint:
+				c.typ = qUint64
+				from[i] = uint64(x)
+			case bool:
+				c.typ = qBool
+			case complex128:
+				c.typ = qComplex128
+			case complex64:
+				c.typ = qComplex64
+			case float64:
+				c.typ = qFloat64
+			case float32:
+				c.typ = qFloat32
+			case int8:
+				c.typ = qInt8
+			case int16:
+				c.typ = qInt16
+			case int32:
+				c.typ = qInt32
+			case int64:
+				c.typ = qInt64
+			case string:
+				c.typ = qString
+			case uint8:
+				c.typ = qUint8
+			case uint16:
+				c.typ = qUint16
+			case uint32:
+				c.typ = qUint32
+			case uint64:
+				c.typ = qUint64
+			case []byte:
+				c.typ = qBlob
+			case *big.Int:
+				c.typ = qBigInt
+			case *big.Rat:
+				c.typ = qBigRat
+			case time.Time:
+				c.typ = qTime
+			case time.Duration:
+				c.typ = qDuration
+			case chunk:
+				vals, err := lldb.DecodeScalars([]byte(x.b))
+				if err != nil {
+					panic(err)
+				}
+
+				if len(vals) == 0 {
+					panic("internal error 040")
+				}
+
+				i, ok := vals[0].(int64)
+				if !ok {
+					panic("internal error 041")
+				}
+
+				c.typ = int(i)
+			case map[string]interface{}: // map of ids of a cross join
+			default:
+				panic("internal error 042")
+			}
+		}
+	}
+}
+
+type fileTemp struct {
+	*file
+	colsK []*col
+	colsV []*col
+	t     *lldb.BTree
+}
+
+func (t *fileTemp) BeginTransaction() error {
+	return nil
+}
+
+func (t *fileTemp) Get(k []interface{}) (v []interface{}, err error) {
+	if err = expand(k); err != nil {
+		return
+	}
+
+	if err = t.flatten(k); err != nil {
+		return nil, err
+	}
+
+	bk, err := lldb.EncodeScalars(k...)
+	if err != nil {
+		return
+	}
+
+	bv, err := t.t.Get(nil, bk)
+	if err != nil {
+		return
+	}
+
+	return lldb.DecodeScalars(bv)
+}
+
+func (t *fileTemp) Drop() (err error) {
+	if t.f0 == nil {
+		return
+	}
+
+	fn := t.f0.Name()
+	if err = t.f0.Close(); err != nil {
+		return
+	}
+
+	if fn == "" {
+		return
+	}
+
+	return os.Remove(fn)
+}
+
+func (t *fileTemp) SeekFirst() (it btreeIterator, err error) {
+	en, err := t.t.SeekFirst()
+	if err != nil {
+		return
+	}
+
+	return &fileBTreeIterator{t: t, en: en}, nil
+}
+
+func (t *fileTemp) Set(k, v []interface{}) (err error) {
+	if err = expand(k); err != nil {
+		return
+	}
+
+	if err = expand(v); err != nil {
+		return
+	}
+
+	infer(k, &t.colsK)
+	infer(v, &t.colsV)
+
+	if err = t.flatten(k); err != nil {
+		return
+	}
+
+	bk, err := lldb.EncodeScalars(k...)
+	if err != nil {
+		return
+	}
+
+	if err = t.flatten(v); err != nil {
+		return
+	}
+
+	bv, err := lldb.EncodeScalars(v...)
+	if err != nil {
+		return
+	}
+
+	return t.t.Set(bk, bv)
+}
+
+type file struct {
+	a        *lldb.Allocator
+	codec    *gobCoder
+	f        lldb.Filer
+	f0       lldb.OSFile
+	id       int64
+	lck      io.Closer
+	mu       sync.Mutex
+	name     string
+	tempFile func(dir, prefix string) (f lldb.OSFile, err error)
+	wal      *os.File
+}
+
+func newFileFromOSFile(f lldb.OSFile) (fi *file, err error) {
+	nm := lockName(f.Name())
+	lck, err := lock.Lock(nm)
+	if err != nil {
+		if lck != nil {
+			lck.Close()
+		}
+		return nil, err
+	}
+
+	close := true
+	defer func() {
+		if close && lck != nil {
+			lck.Close()
+		}
+	}()
+
+	var w *os.File
+	closew := false
+	wn := walName(f.Name())
+	w, err = os.OpenFile(wn, os.O_CREATE|os.O_EXCL|os.O_RDWR, 0666)
+	closew = true
+	defer func() {
+		if closew {
+			nm := w.Name()
+			w.Close()
+			os.Remove(nm)
+			w = nil
+		}
+	}()
+
+	if err != nil {
+		if !os.IsExist(err) {
+			return nil, err
+		}
+
+		closew = false
+		w, err = os.OpenFile(wn, os.O_RDWR, 0666)
+		if err != nil {
+			return nil, err
+		}
+
+		closew = true
+		st, err := w.Stat()
+		if err != nil {
+			return nil, err
+		}
+
+		if st.Size() != 0 {
+			return nil, fmt.Errorf("(file-001) non empty WAL file %s exists", wn)
+		}
+	}
+
+	info, err := f.Stat()
+	if err != nil {
+		return nil, err
+	}
+
+	switch sz := info.Size(); {
+	case sz == 0:
+		b := make([]byte, 16)
+		copy(b, []byte(magic))
+		if _, err := f.Write(b); err != nil {
+			return nil, err
+		}
+
+		filer := lldb.Filer(lldb.NewOSFiler(f))
+		filer = lldb.NewInnerFiler(filer, 16)
+		if filer, err = lldb.NewACIDFiler(filer, w); err != nil {
+			return nil, err
+		}
+
+		a, err := lldb.NewAllocator(filer, &lldb.Options{})
+		if err != nil {
+			return nil, err
+		}
+
+		a.Compress = true
+		s := &file{
+			a:     a,
+			codec: newGobCoder(),
+			f0:    f,
+			f:     filer,
+			lck:   lck,
+			name:  f.Name(),
+			wal:   w,
+		}
+		if err = s.BeginTransaction(); err != nil {
+			return nil, err
+		}
+
+		h, err := s.Create()
+		if err != nil {
+			return nil, err
+		}
+
+		if h != 1 { // root
+			panic("internal error 043")
+		}
+
+		if h, err = s.a.Alloc(make([]byte, 8)); err != nil {
+			return nil, err
+		}
+
+		if h != 2 { // id
+			panic("internal error 044")
+		}
+
+		close, closew = false, false
+		return s, s.Commit()
+	default:
+		b := make([]byte, 16)
+		if _, err := f.Read(b); err != nil {
+			return nil, err
+		}
+
+		if string(b[:len(magic)]) != magic {
+			return nil, fmt.Errorf("(file-002) unknown file format")
+		}
+
+		filer := lldb.Filer(lldb.NewOSFiler(f))
+		filer = lldb.NewInnerFiler(filer, 16)
+		if filer, err = lldb.NewACIDFiler(filer, w); err != nil {
+			return nil, err
+		}
+
+		a, err := lldb.NewAllocator(filer, &lldb.Options{})
+		if err != nil {
+			return nil, err
+		}
+
+		bid, err := a.Get(nil, 2) // id
+		if err != nil {
+			return nil, err
+		}
+
+		if len(bid) != 8 {
+			return nil, fmt.Errorf("(file-003) corrupted DB: id |% x|", bid)
+		}
+
+		id := int64(0)
+		for _, v := range bid {
+			id = (id << 8) | int64(v)
+		}
+
+		a.Compress = true
+		s := &file{
+			a:     a,
+			codec: newGobCoder(),
+			f0:    f,
+			f:     filer,
+			id:    id,
+			lck:   lck,
+			name:  f.Name(),
+			wal:   w,
+		}
+
+		close, closew = false, false
+		return s, nil
+	}
+}
+
+func (s *file) OpenIndex(unique bool, handle int64) (btreeIndex, error) {
+	t, err := lldb.OpenBTree(s.a, s.collate, handle)
+	if err != nil {
+		return nil, err
+	}
+
+	return &fileIndex{s, handle, t, unique}, nil
+}
+
+func (s *file) CreateIndex(unique bool) ( /* handle */ int64, btreeIndex, error) {
+	t, h, err := lldb.CreateBTree(s.a, s.collate)
+	if err != nil {
+		return -1, nil, err
+	}
+
+	return h, &fileIndex{s, h, t, unique}, nil
+}
+
+func (s *file) Acid() bool { return s.wal != nil }
+
+func errSet(p *error, errs ...error) (err error) {
+	err = *p
+	for _, e := range errs {
+		if err != nil {
+			return
+		}
+		*p, err = e, e
+	}
+	return
+}
+
+func (s *file) lock() func() {
+	s.mu.Lock()
+	return s.mu.Unlock
+}
+
+func (s *file) Close() (err error) {
+	defer s.lock()()
+
+	es := s.f0.Sync()
+	ef := s.f0.Close()
+	var ew error
+	if s.wal != nil {
+		ew = s.wal.Close()
+	}
+	el := s.lck.Close()
+	return errSet(&err, es, ef, ew, el)
+}
+
+func (s *file) Name() string { return s.name }
+
+func (s *file) Verify() (allocs int64, err error) {
+	defer s.lock()()
+	var stat lldb.AllocStats
+	if err = s.a.Verify(lldb.NewMemFiler(), nil, &stat); err != nil {
+		return
+	}
+
+	allocs = stat.AllocAtoms
+	return
+}
+
+func (s *file) expandBytes(d []interface{}) (err error) {
+	for i, v := range d {
+		b, ok := v.([]byte)
+		if !ok {
+			continue
+		}
+
+		d[i], err = s.loadChunks(b)
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+func (s *file) collate(a, b []byte) int { //TODO w/ error return
+	da, err := lldb.DecodeScalars(a)
+	if err != nil {
+		panic(err)
+	}
+
+	if err = s.expandBytes(da); err != nil {
+		panic(err)
+	}
+
+	db, err := lldb.DecodeScalars(b)
+	if err != nil {
+		panic(err)
+	}
+
+	if err = s.expandBytes(db); err != nil {
+		panic(err)
+	}
+
+	//dbg("da: %v, db: %v", da, db)
+	return collate(da, db)
+}
+
+func (s *file) CreateTemp(asc bool) (bt temp, err error) {
+	f, err := s.tempFile("", "ql-tmp-")
+	if err != nil {
+		return nil, err
+	}
+
+	fn := f.Name()
+	filer := lldb.NewOSFiler(f)
+	a, err := lldb.NewAllocator(filer, &lldb.Options{})
+	if err != nil {
+		f.Close()
+		os.Remove(fn)
+		return nil, err
+	}
+
+	k := 1
+	if !asc {
+		k = -1
+	}
+
+	t, _, err := lldb.CreateBTree(a, func(a, b []byte) int { //TODO w/ error return
+		return k * s.collate(a, b)
+	})
+	if err != nil {
+		f.Close()
+		if fn != "" {
+			os.Remove(fn)
+		}
+		return nil, err
+	}
+
+	x := &fileTemp{file: &file{
+		a:     a,
+		codec: newGobCoder(),
+		f0:    f,
+	},
+		t: t}
+	return x, nil
+}
+
+func (s *file) BeginTransaction() (err error) {
+	defer s.lock()()
+	return s.f.BeginUpdate()
+}
+
+func (s *file) Rollback() (err error) {
+	defer s.lock()()
+	return s.f.Rollback()
+}
+
+func (s *file) Commit() (err error) {
+	defer s.lock()()
+	return s.f.EndUpdate()
+}
+
+func (s *file) Create(data ...interface{}) (h int64, err error) {
+	if err = expand(data); err != nil {
+		return
+	}
+
+	if err = s.flatten(data); err != nil {
+		return
+	}
+
+	b, err := lldb.EncodeScalars(data...)
+	if err != nil {
+		return
+	}
+
+	defer s.lock()()
+	return s.a.Alloc(b)
+}
+
+func (s *file) Delete(h int64, blobCols ...*col) (err error) {
+	switch len(blobCols) {
+	case 0:
+		defer s.lock()()
+		return s.a.Free(h)
+	default:
+		return s.free(h, blobCols)
+	}
+}
+
+func (s *file) ResetID() (err error) {
+	s.id = 0
+	return
+}
+
+func (s *file) ID() (int64, error) {
+	defer s.lock()()
+
+	s.id++
+	b := make([]byte, 8)
+	id := s.id
+	for i := 7; i >= 0; i-- {
+		b[i] = byte(id)
+		id >>= 8
+	}
+
+	return s.id, s.a.Realloc(2, b)
+}
+
+func (s *file) free(h int64, blobCols []*col) (err error) {
+	b, err := s.a.Get(nil, h) //LATER +bufs
+	if err != nil {
+		return
+	}
+
+	rec, err := lldb.DecodeScalars(b)
+	if err != nil {
+		return
+	}
+
+	for _, col := range blobCols {
+		if col.index >= len(rec) {
+			return fmt.Errorf("(file-004) file.free: corrupted DB (record len)")
+		}
+		if col.index+2 >= len(rec) {
+			continue
+		}
+
+		switch x := rec[col.index+2].(type) {
+		case nil:
+			// nop
+		case []byte:
+			if err = s.freeChunks(x); err != nil {
+				return
+			}
+		}
+	}
+	defer s.lock()()
+	return s.a.Free(h)
+}
+
+func (s *file) Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error) { //NTYPE
+	b, err := s.a.Get(nil, h) //LATER +bufs
+	if err != nil {
+		return
+	}
+
+	rec, err := lldb.DecodeScalars(b)
+	if err != nil {
+		return
+	}
+
+	for _, col := range cols {
+		i := col.index + 2
+		if i >= len(rec) || rec[i] == nil {
+			continue
+		}
+
+		switch col.typ {
+		case 0:
+		case qBool:
+		case qComplex64:
+			rec[i] = complex64(rec[i].(complex128))
+		case qComplex128:
+		case qFloat32:
+			rec[i] = float32(rec[i].(float64))
+		case qFloat64:
+		case qInt8:
+			rec[i] = int8(rec[i].(int64))
+		case qInt16:
+			rec[i] = int16(rec[i].(int64))
+		case qInt32:
+			rec[i] = int32(rec[i].(int64))
+		case qInt64:
+		case qString:
+		case qUint8:
+			rec[i] = uint8(rec[i].(uint64))
+		case qUint16:
+			rec[i] = uint16(rec[i].(uint64))
+		case qUint32:
+			rec[i] = uint32(rec[i].(uint64))
+		case qUint64:
+		case qBlob, qBigInt, qBigRat, qTime, qDuration:
+			switch x := rec[i].(type) {
+			case []byte:
+				rec[i] = chunk{f: s, b: x}
+			default:
+				return nil, fmt.Errorf("(file-006) corrupted DB: non nil chunk type is not []byte")
+			}
+		default:
+			panic("internal error 045")
+		}
+	}
+
+	if cols != nil {
+		for n, dn := len(cols)+2, len(rec); dn < n; dn++ {
+			rec = append(rec, nil)
+		}
+	}
+
+	return rec, nil
+}
+
+func (s *file) freeChunks(enc []byte) (err error) {
+	items, err := lldb.DecodeScalars(enc)
+	if err != nil {
+		return
+	}
+
+	var ok bool
+	var next int64
+	switch len(items) {
+	case 2:
+		return
+	case 3:
+		if next, ok = items[1].(int64); !ok || next == 0 {
+			return fmt.Errorf("(file-007) corrupted DB: first chunk link")
+		}
+	default:
+		return fmt.Errorf("(file-008) corrupted DB: first chunk")
+	}
+
+	for next != 0 {
+		b, err := s.a.Get(nil, next)
+		if err != nil {
+			return err
+		}
+
+		if items, err = lldb.DecodeScalars(b); err != nil {
+			return err
+		}
+
+		var h int64
+		switch len(items) {
+		case 1:
+			// nop
+		case 2:
+			if h, ok = items[0].(int64); !ok {
+				return fmt.Errorf("(file-009) corrupted DB: chunk link")
+			}
+
+		default:
+			return fmt.Errorf("(file-010) corrupted DB: chunk items %d (%v)", len(items), items)
+		}
+
+		s.mu.Lock()
+		if err = s.a.Free(next); err != nil {
+			s.mu.Unlock()
+			return err
+		}
+
+		s.mu.Unlock()
+		next = h
+	}
+	return
+}
+
+func (s *file) loadChunks(enc []byte) (v interface{}, err error) {
+	items, err := lldb.DecodeScalars(enc)
+	if err != nil {
+		return
+	}
+
+	var ok bool
+	var next int64
+	switch len(items) {
+	case 2:
+		// nop
+	case 3:
+		if next, ok = items[1].(int64); !ok || next == 0 {
+			return nil, fmt.Errorf("(file-011) corrupted DB: first chunk link")
+		}
+	default:
+		//fmt.Printf("%d: %#v\n", len(items), items)
+		return nil, fmt.Errorf("(file-012) corrupted DB: first chunk")
+	}
+
+	typ, ok := items[0].(int64)
+	if !ok {
+		return nil, fmt.Errorf("(file-013) corrupted DB: first chunk tag")
+	}
+
+	buf, ok := items[len(items)-1].([]byte)
+	if !ok {
+		return nil, fmt.Errorf("(file-014) corrupted DB: first chunk data")
+	}
+
+	for next != 0 {
+		b, err := s.a.Get(nil, next)
+		if err != nil {
+			return nil, err
+		}
+
+		if items, err = lldb.DecodeScalars(b); err != nil {
+			return nil, err
+		}
+
+		switch len(items) {
+		case 1:
+			next = 0
+		case 2:
+			if next, ok = items[0].(int64); !ok {
+				return nil, fmt.Errorf("(file-015) corrupted DB: chunk link")
+			}
+
+			items = items[1:]
+		default:
+			return nil, fmt.Errorf("(file-016) corrupted DB: chunk items %d (%v)", len(items), items)
+		}
+
+		if b, ok = items[0].([]byte); !ok {
+			return nil, fmt.Errorf("(file-017) corrupted DB: chunk data")
+		}
+
+		buf = append(buf, b...)
+	}
+	return s.codec.decode(buf, int(typ))
+}
+
+func (s *file) Update(h int64, data ...interface{}) (err error) {
+	b, err := lldb.EncodeScalars(data...)
+	if err != nil {
+		return
+	}
+
+	defer s.lock()()
+	return s.a.Realloc(h, b)
+}
+
+func (s *file) UpdateRow(h int64, blobCols []*col, data ...interface{}) (err error) {
+	if len(blobCols) == 0 {
+		return s.Update(h, data...)
+	}
+
+	if err = expand(data); err != nil {
+		return
+	}
+
+	data0, err := s.Read(nil, h, blobCols...)
+	if err != nil {
+		return
+	}
+
+	for _, c := range blobCols {
+		if c.index+2 >= len(data0) {
+			continue
+		}
+
+		if x := data0[c.index+2]; x != nil {
+			if err = s.freeChunks(x.(chunk).b); err != nil {
+				return
+			}
+		}
+	}
+
+	if err = s.flatten(data); err != nil {
+		return
+	}
+
+	return s.Update(h, data...)
+}
+
+// []interface{}{qltype, ...}->[]interface{}{lldb scalar type, ...}
+// + long blobs are (pre)written to a chain of chunks.
+func (s *file) flatten(data []interface{}) (err error) {
+	for i, v := range data {
+		tag := 0
+		var b []byte
+		switch x := v.(type) {
+		case []byte:
+			tag = qBlob
+			b = x
+		case *big.Int:
+			tag = qBigInt
+			b, err = s.codec.encode(x)
+		case *big.Rat:
+			tag = qBigRat
+			b, err = s.codec.encode(x)
+		case time.Time:
+			tag = qTime
+			b, err = s.codec.encode(x)
+		case time.Duration:
+			tag = qDuration
+			b, err = s.codec.encode(x)
+		default:
+			continue
+		}
+		if err != nil {
+			return
+		}
+
+		const chunk = 1 << 16
+		chunks := 0
+		var next int64
+		var buf []byte
+		for rem := len(b); rem > shortBlob; {
+			n := mathutil.Min(rem, chunk)
+			part := b[rem-n:]
+			b = b[:rem-n]
+			rem -= n
+			switch next {
+			case 0: // last chunk
+				buf, err = lldb.EncodeScalars([]interface{}{part}...)
+			default: // middle chunk
+				buf, err = lldb.EncodeScalars([]interface{}{next, part}...)
+			}
+			if err != nil {
+				return
+			}
+
+			s.mu.Lock()
+			h, err := s.a.Alloc(buf)
+			s.mu.Unlock()
+			if err != nil {
+				return err
+			}
+
+			next = h
+			chunks++
+		}
+
+		switch next {
+		case 0: // single chunk
+			buf, err = lldb.EncodeScalars([]interface{}{tag, b}...)
+		default: // multi chunks
+			buf, err = lldb.EncodeScalars([]interface{}{tag, next, b}...)
+		}
+		if err != nil {
+			return
+		}
+
+		data[i] = buf
+	}
+	return
+}
+
+func lockName(dbname string) string {
+	base := filepath.Base(filepath.Clean(dbname)) + "lockfile"
+	h := sha1.New()
+	io.WriteString(h, base)
+	return filepath.Join(filepath.Dir(dbname), fmt.Sprintf(".%x", h.Sum(nil)))
+}
+
+func walName(dbname string) (r string) {
+	base := filepath.Base(filepath.Clean(dbname))
+	h := sha1.New()
+	io.WriteString(h, base)
+	return filepath.Join(filepath.Dir(dbname), fmt.Sprintf(".%x", h.Sum(nil)))
+}
+
+type fileIndex struct {
+	f      *file
+	h      int64
+	t      *lldb.BTree
+	unique bool
+}
+
+func (x *fileIndex) Clear() error {
+	return x.t.Clear()
+}
+
+var gbZeroInt64 []byte
+
+func init() {
+	var err error
+	if gbZeroInt64, err = lldb.EncodeScalars(int64(0)); err != nil {
+		panic(err)
+	}
+}
+
+func isIndexNull(data []interface{}) bool {
+	for _, v := range data {
+		if v != nil {
+			return false
+		}
+	}
+	return true
+}
+
+// The []byte version of the key in the BTree shares chunks, if any, with
+// the value stored in the record.
+func (x *fileIndex) Create(indexedValues []interface{}, h int64) error {
+	for i, indexedValue := range indexedValues {
+		chunk, ok := indexedValue.(chunk)
+		if ok {
+			indexedValues[i] = chunk.b
+		}
+	}
+
+	t := x.t
+	switch {
+	case !x.unique:
+		k, err := lldb.EncodeScalars(append(indexedValues, h)...)
+		if err != nil {
+			return err
+		}
+
+		return t.Set(k, gbZeroInt64)
+	case isIndexNull(indexedValues): // unique, NULL
+		k, err := lldb.EncodeScalars(nil, h)
+		if err != nil {
+			return err
+		}
+
+		return t.Set(k, gbZeroInt64)
+	default: // unique, non NULL
+		k, err := lldb.EncodeScalars(append(indexedValues, int64(0))...)
+		if err != nil {
+			return err
+		}
+
+		v, err := lldb.EncodeScalars(h)
+		if err != nil {
+			return err
+		}
+
+		_, _, err = t.Put(nil, k, func(key, old []byte) (new []byte, write bool, err error) {
+			if old == nil {
+				return v, true, nil
+			}
+
+			return nil, false, fmt.Errorf("(file-018) cannot insert into unique index: duplicate value(s): %v", indexedValues)
+		})
+		return err
+	}
+}
+
+func (x *fileIndex) Delete(indexedValues []interface{}, h int64) error {
+	for i, indexedValue := range indexedValues {
+		chunk, ok := indexedValue.(chunk)
+		if ok {
+			indexedValues[i] = chunk.b
+		}
+	}
+
+	t := x.t
+	var k []byte
+	var err error
+	switch {
+	case !x.unique:
+		k, err = lldb.EncodeScalars(append(indexedValues, h)...)
+	case isIndexNull(indexedValues): // unique, NULL
+		k, err = lldb.EncodeScalars(nil, h)
+	default: // unique, non NULL
+		k, err = lldb.EncodeScalars(append(indexedValues, int64(0))...)
+	}
+	if err != nil {
+		return err
+	}
+
+	return t.Delete(k)
+}
+
+func (x *fileIndex) Drop() error {
+	if err := x.Clear(); err != nil {
+		return err
+	}
+
+	return x.f.a.Free(x.h)
+}
+
+func (x *fileIndex) Seek(indexedValues []interface{}) (indexIterator, bool, error) { //TODO(indices) blobs: +test
+	k, err := lldb.EncodeScalars(append(indexedValues, 0)...)
+	if err != nil {
+		return nil, false, err
+	}
+
+	en, hit, err := x.t.Seek(k)
+	if err != nil {
+		return nil, false, err
+	}
+
+	return &fileIndexIterator{x.f, en, x.unique}, hit, nil
+}
+
+func (x *fileIndex) SeekFirst() (iter indexIterator, err error) {
+	en, err := x.t.SeekFirst()
+	return &fileIndexIterator{x.f, en, x.unique}, err
+}
+
+func (x *fileIndex) SeekLast() (iter indexIterator, err error) {
+	en, err := x.t.SeekLast()
+	return &fileIndexIterator{x.f, en, x.unique}, err
+}
+
+type fileIndexIterator struct {
+	f      *file
+	en     *lldb.BTreeEnumerator
+	unique bool
+}
+
+func (i *fileIndexIterator) nextPrev(f func() ([]byte, []byte, error)) ([]interface{}, int64, error) { //TODO(indices) blobs: +test
+	bk, bv, err := f()
+	if err != nil {
+		return nil, -1, err
+	}
+
+	dk, err := lldb.DecodeScalars(bk)
+	if err != nil {
+		return nil, -1, err
+	}
+
+	b, ok := dk[0].([]byte)
+	if ok {
+		dk[0] = chunk{i.f, b}
+		if expand(dk[:1]); err != nil {
+			return nil, -1, err
+		}
+	}
+
+	var k indexKey
+	k.value = dk[:len(dk)-1]
+	switch i.unique {
+	case true:
+		if isIndexNull(k.value) {
+			return nil, dk[len(dk)-1].(int64), nil
+		}
+
+		dv, err := lldb.DecodeScalars(bv)
+		if err != nil {
+			return nil, -1, err
+		}
+
+		return k.value, dv[0].(int64), nil
+	default:
+		return k.value, dk[len(dk)-1].(int64), nil
+	}
+}
+
+func (i *fileIndexIterator) Next() ([]interface{}, int64, error) { //TODO(indices) blobs: +test
+	return i.nextPrev(i.en.Next)
+}
+
+func (i *fileIndexIterator) Prev() ([]interface{}, int64, error) { //TODO(indices) blobs: +test
+	return i.nextPrev(i.en.Prev)
+}
diff --git a/vendor/github.com/cznic/ql/httpfs.go b/vendor/github.com/cznic/ql/httpfs.go
new file mode 100644
index 0000000000..89c6f89c52
--- /dev/null
+++ b/vendor/github.com/cznic/ql/httpfs.go
@@ -0,0 +1,302 @@
+// Copyright (c) 2014 ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/cznic/mathutil"
+)
+
+var (
+	_ http.FileSystem = (*HTTPFS)(nil)
+	_ http.File       = (*HTTPFile)(nil)
+	_ os.FileInfo     = (*HTTPFile)(nil)
+	_ os.FileInfo     = (*dirEntry)(nil)
+)
+
+type dirEntry string
+
+func (d dirEntry) Name() string       { return string(d) }
+func (d dirEntry) Size() int64        { return -1 }
+func (d dirEntry) Mode() os.FileMode  { return os.ModeDir }
+func (d dirEntry) ModTime() time.Time { return time.Time{} }
+func (d dirEntry) IsDir() bool        { return true }
+func (d dirEntry) Sys() interface{}   { return interface{}(nil) }
+
+// A HTTPFile is returned by the HTTPFS's Open method and can be served by the
+// http.FileServer implementation.
+type HTTPFile struct {
+	closed     bool
+	content    []byte
+	dirEntries []os.FileInfo
+	isFile     bool
+	name       string
+	off        int
+	sz         int
+}
+
+// Close implements http.File.
+func (f *HTTPFile) Close() error {
+	if f.closed {
+		return os.ErrInvalid
+	}
+
+	f.closed = true
+	return nil
+}
+
+// IsDir implements os.FileInfo
+func (f *HTTPFile) IsDir() bool { return !f.isFile }
+
+// Mode implements os.FileInfo
+func (f *HTTPFile) Mode() os.FileMode {
+	switch f.isFile {
+	case false:
+		return os.FileMode(0444)
+	default:
+		return os.ModeDir
+	}
+}
+
+// ModTime implements os.FileInfo
+func (f *HTTPFile) ModTime() time.Time {
+	return time.Time{}
+}
+
+// Name implements os.FileInfo
+func (f *HTTPFile) Name() string { return path.Base(f.name) }
+
+// Size implements os.FileInfo
+func (f *HTTPFile) Size() int64 {
+	switch f.isFile {
+	case false:
+		return -1
+	default:
+		return int64(len(f.content))
+	}
+}
+
+// Stat implements http.File.
+func (f *HTTPFile) Stat() (os.FileInfo, error) { return f, nil }
+
+// Sys implements os.FileInfo
+func (f *HTTPFile) Sys() interface{} { return interface{}(nil) }
+
+// Readdir implements http.File.
+func (f *HTTPFile) Readdir(count int) ([]os.FileInfo, error) {
+	if f.isFile {
+		return nil, fmt.Errorf("not a directory: %s", f.name)
+	}
+
+	if count <= 0 {
+		r := f.dirEntries
+		f.dirEntries = f.dirEntries[:0]
+		return r, nil
+	}
+
+	rq := mathutil.Min(count, len(f.dirEntries))
+	r := f.dirEntries[:rq]
+	f.dirEntries = f.dirEntries[rq:]
+	if len(r) != 0 {
+		return r, nil
+	}
+
+	return nil, io.EOF
+}
+
+// Read implements http.File.
+func (f *HTTPFile) Read(b []byte) (int, error) {
+	if f.closed {
+		return 0, os.ErrInvalid
+	}
+
+	n := copy(b, f.content[f.off:])
+	f.off += n
+	if n != 0 {
+		return n, nil
+	}
+
+	return 0, io.EOF
+}
+
+// Seek implements http.File.
+func (f *HTTPFile) Seek(offset int64, whence int) (int64, error) {
+	if f.closed {
+		return 0, os.ErrInvalid
+	}
+
+	if offset < 0 {
+		return int64(f.off), fmt.Errorf("cannot seek before start of file")
+	}
+
+	switch whence {
+	case 0:
+		noff := int64(f.off) + offset
+		if noff > mathutil.MaxInt {
+			return int64(f.off), fmt.Errorf("seek target overflows int: %d", noff)
+		}
+
+		f.off = mathutil.Min(int(offset), len(f.content))
+		if f.off == int(offset) {
+			return offset, nil
+		}
+
+		return int64(f.off), io.EOF
+	case 1:
+		noff := int64(f.off) + offset
+		if noff > mathutil.MaxInt {
+			return int64(f.off), fmt.Errorf("seek target overflows int: %d", noff)
+		}
+
+		off := mathutil.Min(f.off+int(offset), len(f.content))
+		if off == f.off+int(offset) {
+			f.off = off
+			return int64(off), nil
+		}
+
+		f.off = off
+		return int64(off), io.EOF
+	case 2:
+		noff := int64(f.off) - offset
+		if noff < 0 {
+			return int64(f.off), fmt.Errorf("cannot seek before start of file")
+		}
+
+		f.off = len(f.content) - int(offset)
+		return int64(f.off), nil
+	default:
+		return int64(f.off), fmt.Errorf("seek: invalid whence %d", whence)
+	}
+}
+
+// HTTPFS implements a http.FileSystem backed by data in a DB.
+type HTTPFS struct {
+	db       *DB
+	dir, get List
+}
+
+// NewHTTPFS returns a http.FileSystem backed by a result record set of query.
+// The record set provides two mandatory fields: path and content (the field
+// names are case sensitive). Type of name must be string and type of content
+// must be blob (ie. []byte). Field 'path' value is the "file" pathname, which
+// must be rooted; and field 'content' value is its "data".
+func (db *DB) NewHTTPFS(query string) (*HTTPFS, error) {
+	if _, err := Compile(query); err != nil {
+		return nil, err
+	}
+
+	dir, err := Compile(fmt.Sprintf("SELECT path FROM (%s) WHERE hasPrefix(path, $1)", query))
+	if err != nil {
+		return nil, err
+	}
+
+	get, err := Compile(fmt.Sprintf("SELECT content FROM (%s) WHERE path == $1", query))
+	if err != nil {
+		return nil, err
+	}
+
+	return &HTTPFS{db: db, dir: dir, get: get}, nil
+}
+
+// Open implements http.FileSystem. The name parameter represents a file path.
+// The elements in a file path are separated by slash ('/', U+002F) characters,
+// regardless of host operating system convention.
+func (f *HTTPFS) Open(name string) (http.File, error) {
+	if filepath.Separator != '/' && strings.IndexRune(name, filepath.Separator) >= 0 ||
+		strings.Contains(name, "\x00") {
+		return nil, fmt.Errorf("invalid character in file path: %q", name)
+	}
+
+	name = path.Clean("/" + name)
+	rs, _, err := f.db.Execute(nil, f.get, name)
+	if err != nil {
+		return nil, err
+	}
+
+	n := 0
+	var fdata []byte
+	if err = rs[0].Do(false, func(data []interface{}) (more bool, err error) {
+		switch n {
+		case 0:
+			var ok bool
+			fdata, ok = data[0].([]byte)
+			if !ok {
+				return false, fmt.Errorf("open: expected blob, got %T", data[0])
+			}
+			n++
+			return true, nil
+		default:
+			return false, fmt.Errorf("open: more than one result was returned for %s", name)
+		}
+	}); err != nil {
+		return nil, err
+	}
+
+	if n == 1 { // file found
+		return &HTTPFile{name: name, isFile: true, content: fdata}, nil
+	}
+
+	dirName := name
+	if dirName[len(dirName)-1] != filepath.Separator {
+		dirName += string(filepath.Separator)
+	}
+	// Open("/a/b"): {/a/b/c.x,/a/b/d.x,/a/e.x,/a/b/f/g.x} -> {c.x,d.x,f}
+	rs, _, err = f.db.Execute(nil, f.dir, dirName)
+	if err != nil {
+		return nil, err
+	}
+
+	n = 0
+	r := &HTTPFile{name: dirName}
+	m := map[string]bool{}
+	x := len(dirName)
+	if err = rs[0].Do(false, func(data []interface{}) (more bool, err error) {
+		n++
+		switch name := data[0].(type) {
+		case string:
+			if filepath.Separator != '/' && strings.IndexRune(name, filepath.Separator) >= 0 ||
+				strings.Contains(name, "\x00") {
+				return false, fmt.Errorf("invalid character in file path: %q", name)
+			}
+
+			name = path.Clean("/" + name)
+			rest := name[x:]
+			parts := strings.Split(rest, "/")
+			if len(parts) == 0 {
+				return true, nil
+			}
+
+			nm := parts[0]
+			switch len(parts) {
+			case 1: // file
+				r.dirEntries = append(r.dirEntries, &HTTPFile{isFile: true, name: nm})
+			default: // directory
+				if !m[nm] {
+					r.dirEntries = append(r.dirEntries, dirEntry(nm))
+				}
+				m[nm] = true
+			}
+			return true, nil
+		default:
+			return false, fmt.Errorf("expected string path, got %T(%v)", name, name)
+		}
+	}); err != nil {
+		return nil, err
+	}
+
+	if n != 0 {
+		return r, nil
+	}
+
+	return nil, os.ErrNotExist
+}
diff --git a/vendor/github.com/cznic/ql/introspection.go b/vendor/github.com/cznic/ql/introspection.go
new file mode 100644
index 0000000000..61ac9a928d
--- /dev/null
+++ b/vendor/github.com/cznic/ql/introspection.go
@@ -0,0 +1,625 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"bytes"
+	"fmt"
+	"go/ast"
+	"reflect"
+	"strings"
+	"sync"
+)
+
+var (
+	schemaCache = map[reflect.Type]*StructInfo{}
+	schemaMu    sync.RWMutex
+)
+
+// StructInfo describes a struct type. An instance of StructInfo obtained from
+// StructSchema is shared and must not be mutated.  That includes the values
+// pointed to by the elements of Fields and Indices.
+type StructInfo struct {
+	Fields  []*StructField // Fields describe the considered fields of a struct type.
+	HasID   bool           // Whether the struct has a considered field named ID of type int64.
+	Indices []*StructIndex // Indices describe indices defined by the index or uindex ql tags.
+	IsPtr   bool           // Whether the StructInfo was derived from a pointer to a struct.
+}
+
+// StructIndex describes an index defined by the ql tag index or uindex.
+type StructIndex struct {
+	ColumnName string // Name of the column the index is on.
+	Name       string // Name of the index.
+	Unique     bool   // Whether the index is unique.
+}
+
+// StructField describes a considered field of a struct type.
+type StructField struct {
+	Index         int               // Index is the index of the field for reflect.Value.Field.
+	IsID          bool              // Whether the field corresponds to record id().
+	IsPtr         bool              // Whether the field is a pointer type.
+	MarshalType   reflect.Type      // The reflect.Type a field must be converted to when marshaling or nil when it is assignable directly. (Field->value)
+	Name          string            // Field name or value of the name tag (like in `ql:"name foo"`).
+	ReflectType   reflect.Type      // The reflect.Type of the field.
+	Tags          map[string]string // QL tags of this field. (`ql:"a, b c, d"` -> {"a": "", "b": "c", "d": ""})
+	Type          Type              // QL type of the field.
+	UnmarshalType reflect.Type      // The reflect.Type a value must be converted to when unmarshaling or nil when it is assignable directly. (Field<-value)
+	ZeroPtr       reflect.Value     // The reflect.Zero value of the field if it's a pointer type.
+}
+
+func (s *StructField) check(v interface{}) error {
+	t := reflect.TypeOf(v)
+	if !s.ReflectType.AssignableTo(t) {
+		if !s.ReflectType.ConvertibleTo(t) {
+			return fmt.Errorf("type %s (%v) cannot be converted to %T", s.ReflectType.Name(), s.ReflectType.Kind(), t.Name())
+		}
+
+		s.MarshalType = t
+	}
+
+	if !t.AssignableTo(s.ReflectType) {
+		if !t.ConvertibleTo(s.ReflectType) {
+			return fmt.Errorf("type %s (%v) cannot be converted to %T", t.Name(), t.Kind(), s.ReflectType.Name())
+		}
+
+		s.UnmarshalType = s.ReflectType
+	}
+	return nil
+}
+
+func parseTag(s string) map[string]string {
+	m := map[string]string{}
+	for _, v := range strings.Split(s, ",") {
+		v = strings.TrimSpace(v)
+		switch n := strings.IndexRune(v, ' '); {
+		case n < 0:
+			m[v] = ""
+		default:
+			m[v[:n]] = v[n+1:]
+		}
+	}
+	return m
+}
+
+// StructSchema returns StructInfo for v which must be a struct instance or a
+// pointer to a struct.  The info is computed only once for every type.
+// Subsequent calls to StructSchema for the same type return a cached
+// StructInfo.
+//
+// Note: The returned StructSchema is shared and must be not mutated, including
+// any other data structures it may point to.
+func StructSchema(v interface{}) (*StructInfo, error) {
+	if v == nil {
+		return nil, fmt.Errorf("cannot derive schema for %T(%v)", v, v)
+	}
+
+	typ := reflect.TypeOf(v)
+	schemaMu.RLock()
+	if r, ok := schemaCache[typ]; ok {
+		schemaMu.RUnlock()
+		return r, nil
+	}
+
+	schemaMu.RUnlock()
+	var schemaPtr bool
+	t := typ
+	if t.Kind() == reflect.Ptr {
+		t = t.Elem()
+		schemaPtr = true
+	}
+	if k := t.Kind(); k != reflect.Struct {
+		return nil, fmt.Errorf("cannot derive schema for type %T (%v)", v, k)
+	}
+
+	r := &StructInfo{IsPtr: schemaPtr}
+	for i := 0; i < t.NumField(); i++ {
+		f := t.Field(i)
+		fn := f.Name
+		if !ast.IsExported(fn) {
+			continue
+		}
+
+		tags := parseTag(f.Tag.Get("ql"))
+		if _, ok := tags["-"]; ok {
+			continue
+		}
+
+		if s := tags["name"]; s != "" {
+			fn = s
+		}
+
+		if fn == "ID" && f.Type.Kind() == reflect.Int64 {
+			r.HasID = true
+		}
+		var ix, unique bool
+		var xn string
+		xfn := fn
+		if s := tags["index"]; s != "" {
+			if _, ok := tags["uindex"]; ok {
+				return nil, fmt.Errorf("both index and uindex in QL struct tag")
+			}
+
+			ix, xn = true, s
+		} else if s := tags["uindex"]; s != "" {
+			if _, ok := tags["index"]; ok {
+				return nil, fmt.Errorf("both index and uindex in QL struct tag")
+			}
+
+			ix, unique, xn = true, true, s
+		}
+		if ix {
+			if fn == "ID" && r.HasID {
+				xfn = "id()"
+			}
+			r.Indices = append(r.Indices, &StructIndex{Name: xn, ColumnName: xfn, Unique: unique})
+		}
+
+		sf := &StructField{Index: i, Name: fn, Tags: tags, Type: Type(-1), ReflectType: f.Type}
+		fk := sf.ReflectType.Kind()
+		if fk == reflect.Ptr {
+			sf.IsPtr = true
+			sf.ZeroPtr = reflect.Zero(sf.ReflectType)
+			sf.ReflectType = sf.ReflectType.Elem()
+			fk = sf.ReflectType.Kind()
+		}
+
+		switch fk {
+		case reflect.Bool:
+			sf.Type = Bool
+			if err := sf.check(false); err != nil {
+				return nil, err
+			}
+		case reflect.Int, reflect.Uint:
+			return nil, fmt.Errorf("only integers of fixed size can be used to derive a schema: %v", fk)
+		case reflect.Int8:
+			sf.Type = Int8
+			if err := sf.check(int8(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Int16:
+			if err := sf.check(int16(0)); err != nil {
+				return nil, err
+			}
+			sf.Type = Int16
+		case reflect.Int32:
+			if err := sf.check(int32(0)); err != nil {
+				return nil, err
+			}
+			sf.Type = Int32
+		case reflect.Int64:
+			if sf.ReflectType.Name() == "Duration" && sf.ReflectType.PkgPath() == "time" {
+				sf.Type = Duration
+				break
+			}
+
+			sf.Type = Int64
+			if err := sf.check(int64(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Uint8:
+			sf.Type = Uint8
+			if err := sf.check(uint8(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Uint16:
+			sf.Type = Uint16
+			if err := sf.check(uint16(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Uint32:
+			sf.Type = Uint32
+			if err := sf.check(uint32(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Uint64:
+			sf.Type = Uint64
+			if err := sf.check(uint64(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Float32:
+			sf.Type = Float32
+			if err := sf.check(float32(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Float64:
+			sf.Type = Float64
+			if err := sf.check(float64(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Complex64:
+			sf.Type = Complex64
+			if err := sf.check(complex64(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Complex128:
+			sf.Type = Complex128
+			if err := sf.check(complex128(0)); err != nil {
+				return nil, err
+			}
+		case reflect.Slice:
+			sf.Type = Blob
+			if err := sf.check([]byte(nil)); err != nil {
+				return nil, err
+			}
+		case reflect.Struct:
+			switch sf.ReflectType.PkgPath() {
+			case "math/big":
+				switch sf.ReflectType.Name() {
+				case "Int":
+					sf.Type = BigInt
+				case "Rat":
+					sf.Type = BigRat
+				}
+			case "time":
+				switch sf.ReflectType.Name() {
+				case "Time":
+					sf.Type = Time
+				}
+			}
+		case reflect.String:
+			sf.Type = String
+			if err := sf.check(""); err != nil {
+				return nil, err
+			}
+		}
+
+		if sf.Type < 0 {
+			return nil, fmt.Errorf("cannot derive schema for type %s (%v)", sf.ReflectType.Name(), fk)
+		}
+
+		sf.IsID = fn == "ID" && r.HasID
+		r.Fields = append(r.Fields, sf)
+	}
+
+	schemaMu.Lock()
+	schemaCache[typ] = r
+	if t != typ {
+		r2 := *r
+		r2.IsPtr = false
+		schemaCache[t] = &r2
+	}
+	schemaMu.Unlock()
+	return r, nil
+}
+
+// MustStructSchema is like StructSchema but panics on error. It simplifies
+// safe initialization of global variables holding StructInfo.
+//
+// MustStructSchema is safe for concurrent use by multiple goroutines.
+func MustStructSchema(v interface{}) *StructInfo {
+	s, err := StructSchema(v)
+	if err != nil {
+		panic(err)
+	}
+
+	return s
+}
+
+// SchemaOptions amend the result of Schema.
+type SchemaOptions struct {
+	// Don't wrap the CREATE statement(s) in a transaction.
+	NoTransaction bool
+
+	// Don't insert the IF NOT EXISTS clause in the CREATE statement(s).
+	NoIfNotExists bool
+
+	// Do not strip the "pkg." part from type name "pkg.Type", produce
+	// "pkg_Type" table name instead. Applies only when no name is passed
+	// to Schema().
+	KeepPrefix bool
+}
+
+var zeroSchemaOptions SchemaOptions
+
+// Schema returns a CREATE TABLE/INDEX statement(s) for a table derived from a
+// struct or an error, if any.  The table is named using the name parameter. If
+// name is an empty string then the type name of the struct is used while non
+// conforming characters are replaced by underscores. Value v can be also a
+// pointer to a struct.
+//
+// Every considered struct field type must be one of the QL types or a type
+// convertible to string, bool, int*, uint*, float* or complex* type or pointer
+// to such type. Integers with a width dependent on the architecture can not be
+// used. Only exported fields are considered. If an exported field QL tag
+// contains "-" (`ql:"-"`) then such field is not considered. A field with name
+// ID, having type int64, corresponds to id() - and is thus not a part of the
+// CREATE statement. A field QL tag containing "index name" or "uindex name"
+// triggers additionally creating an index or unique index on the respective
+// field.  Fields can be renamed using a QL tag "name newName".  Fields are
+// considered in the order of appearance. A QL tag is a struct tag part
+// prefixed by "ql:". Tags can be combined, for example:
+//
+//	type T struct {
+//		Foo	string	`ql:"index xFoo, name Bar"`
+//	}
+//
+// If opts.NoTransaction == true then the statement(s) are not wrapped in a
+// transaction. If opt.NoIfNotExists == true then the CREATE statement(s) omits
+// the IF NOT EXISTS clause. Passing nil opts is equal to passing
+// &SchemaOptions{}
+//
+// Schema is safe for concurrent use by multiple goroutines.
+func Schema(v interface{}, name string, opt *SchemaOptions) (List, error) {
+	if opt == nil {
+		opt = &zeroSchemaOptions
+	}
+	s, err := StructSchema(v)
+	if err != nil {
+		return List{}, err
+	}
+
+	var buf bytes.Buffer
+	if !opt.NoTransaction {
+		buf.WriteString("BEGIN TRANSACTION; ")
+	}
+	buf.WriteString("CREATE TABLE ")
+	if !opt.NoIfNotExists {
+		buf.WriteString("IF NOT EXISTS ")
+	}
+	if name == "" {
+		name = fmt.Sprintf("%T", v)
+		if !opt.KeepPrefix {
+			a := strings.Split(name, ".")
+			if l := len(a); l > 1 {
+				name = a[l-1]
+			}
+		}
+		nm := []rune{}
+		for _, v := range name {
+			switch {
+			case v >= '0' && v <= '9' || v == '_' || v >= 'a' && v <= 'z' || v >= 'A' && v <= 'Z':
+				// ok
+			default:
+				v = '_'
+			}
+			nm = append(nm, v)
+		}
+		name = string(nm)
+	}
+	buf.WriteString(name + " (")
+	for _, v := range s.Fields {
+		if v.IsID {
+			continue
+		}
+
+		buf.WriteString(fmt.Sprintf("%s %s, ", v.Name, v.Type))
+	}
+	buf.WriteString("); ")
+	for _, v := range s.Indices {
+		buf.WriteString("CREATE ")
+		if v.Unique {
+			buf.WriteString("UNIQUE ")
+		}
+		buf.WriteString("INDEX ")
+		if !opt.NoIfNotExists {
+			buf.WriteString("IF NOT EXISTS ")
+		}
+		buf.WriteString(fmt.Sprintf("%s ON %s (%s); ", v.Name, name, v.ColumnName))
+	}
+	if !opt.NoTransaction {
+		buf.WriteString("COMMIT; ")
+	}
+	l, err := Compile(buf.String())
+	if err != nil {
+		return List{}, fmt.Errorf("%s: %v", buf.String(), err)
+	}
+
+	return l, nil
+}
+
+// MustSchema is like Schema but panics on error. It simplifies safe
+// initialization of global variables holding compiled schemas.
+//
+// MustSchema is safe for concurrent use by multiple goroutines.
+func MustSchema(v interface{}, name string, opt *SchemaOptions) List {
+	l, err := Schema(v, name, opt)
+	if err != nil {
+		panic(err)
+	}
+
+	return l
+}
+
+// Marshal converts, in the order of appearance, fields of a struct instance v
+// to []interface{} or an error, if any. Value v can be also a pointer to a
+// struct.
+//
+// Every considered struct field type must be one of the QL types or a type
+// convertible to string, bool, int*, uint*, float* or complex* type or pointer
+// to such type. Integers with a width dependent on the architecture can not be
+// used. Only exported fields are considered. If an exported field QL tag
+// contains "-" then such field is not considered. A QL tag is a struct tag
+// part prefixed by "ql:".  Field with name ID, having type int64, corresponds
+// to id() - and is thus not part of the result.
+//
+// Marshal is safe for concurrent use by multiple goroutines.
+func Marshal(v interface{}) ([]interface{}, error) {
+	s, err := StructSchema(v)
+	if err != nil {
+		return nil, err
+	}
+
+	val := reflect.ValueOf(v)
+	if s.IsPtr {
+		val = val.Elem()
+	}
+	n := len(s.Fields)
+	if s.HasID {
+		n--
+	}
+	r := make([]interface{}, n)
+	j := 0
+	for _, v := range s.Fields {
+		if v.IsID {
+			continue
+		}
+
+		f := val.Field(v.Index)
+		if v.IsPtr {
+			if f.IsNil() {
+				r[j] = nil
+				j++
+				continue
+			}
+
+			f = f.Elem()
+		}
+		if m := v.MarshalType; m != nil {
+			f = f.Convert(m)
+		}
+		r[j] = f.Interface()
+		j++
+	}
+	return r, nil
+}
+
+// MustMarshal is like Marshal but panics on error. It simplifies marshaling of
+// "safe" types, like eg. those which were already verified by Schema or
+// MustSchema.  When the underlying Marshal returns an error, MustMarshal
+// panics.
+//
+// MustMarshal is safe for concurrent use by multiple goroutines.
+func MustMarshal(v interface{}) []interface{} {
+	r, err := Marshal(v)
+	if err != nil {
+		panic(err)
+	}
+
+	return r
+}
+
+// Unmarshal stores data from []interface{} in the struct value pointed to by
+// v.
+//
+// Every considered struct field type must be one of the QL types or a type
+// convertible to string, bool, int*, uint*, float* or complex* type or pointer
+// to such type. Integers with a width dependent on the architecture can not be
+// used. Only exported fields are considered. If an exported field QL tag
+// contains "-" then such field is not considered. A QL tag is a struct tag
+// part prefixed by "ql:".  Fields are considered in the order of appearance.
+// Types of values in data must be compatible with the corresponding considered
+// field of v.
+//
+// If the struct has no ID field then the number of values in data must be equal
+// to the number of considered fields of v.
+//
+//	type T struct {
+//		A bool
+//		B string
+//	}
+//
+// Assuming the schema is
+//
+//	CREATE TABLE T (A bool, B string);
+//
+// Data might be a result of queries like
+//
+//	SELECT * FROM T;
+//	SELECT A, B FROM T;
+//
+// If the struct has a considered ID field then the number of values in data
+// must be equal to the number of considered fields in v - or one less. In the
+// later case the ID field is not set.
+//
+//	type U struct {
+//		ID int64
+//		A  bool
+//		B  string
+//	}
+//
+// Assuming the schema is
+//
+//	CREATE TABLE T (A bool, B string);
+//
+// Data might be a result of queries like
+//
+//	SELECT * FROM T;             // ID not set
+//	SELECT A, B FROM T;          // ID not set
+//	SELECT id(), A, B FROM T;    // ID is set
+//
+// To unmarshal a value from data into a pointer field of v, Unmarshal first
+// handles the case of the value being nil. In that case, Unmarshal sets the
+// pointer to nil. Otherwise, Unmarshal unmarshals the data value into value
+// pointed at by the pointer. If the pointer is nil, Unmarshal allocates a new
+// value for it to point to.
+//
+// Unmarshal is safe for concurrent use by multiple goroutines.
+func Unmarshal(v interface{}, data []interface{}) (err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			var ok bool
+			if err, ok = r.(error); !ok {
+				err = fmt.Errorf("%v", r)
+			}
+			err = fmt.Errorf("unmarshal: %v", err)
+		}
+	}()
+
+	s, err := StructSchema(v)
+	if err != nil {
+		return err
+	}
+
+	if !s.IsPtr {
+		return fmt.Errorf("unmarshal: need a pointer to a struct")
+	}
+
+	id := false
+	nv, nf := len(data), len(s.Fields)
+	switch s.HasID {
+	case true:
+		switch {
+		case nv == nf:
+			id = true
+		case nv == nf-1:
+			// ok
+		default:
+			return fmt.Errorf("unmarshal: got %d values, need %d or %d", nv, nf-1, nf)
+		}
+	default:
+		switch {
+		case nv == nf:
+			// ok
+		default:
+			return fmt.Errorf("unmarshal: got %d values, need %d", nv, nf)
+		}
+	}
+
+	j := 0
+	vVal := reflect.ValueOf(v)
+	if s.IsPtr {
+		vVal = vVal.Elem()
+	}
+	for _, sf := range s.Fields {
+		if sf.IsID && !id {
+			continue
+		}
+
+		d := data[j]
+		val := reflect.ValueOf(d)
+		j++
+
+		fVal := vVal.Field(sf.Index)
+		if u := sf.UnmarshalType; u != nil {
+			val = val.Convert(u)
+		}
+		if !sf.IsPtr {
+			fVal.Set(val)
+			continue
+		}
+
+		if d == nil {
+			fVal.Set(sf.ZeroPtr)
+			continue
+		}
+
+		if fVal.IsNil() {
+			fVal.Set(reflect.New(sf.ReflectType))
+		}
+
+		fVal.Elem().Set(val)
+	}
+	return nil
+}
diff --git a/vendor/github.com/cznic/ql/mem.go b/vendor/github.com/cznic/ql/mem.go
new file mode 100644
index 0000000000..bd2a2dd269
--- /dev/null
+++ b/vendor/github.com/cznic/ql/mem.go
@@ -0,0 +1,1277 @@
+// Copyright (c) 2014 ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Plain memory storage back end.
+
+package ql
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"math/big"
+	"time"
+)
+
+var (
+	_ btreeIndex    = (*memIndex)(nil)
+	_ btreeIterator = (*memBTreeIterator)(nil)
+	_ indexIterator = (*xenumerator2)(nil)
+	_ storage       = (*mem)(nil)
+	_ temp          = (*memTemp)(nil)
+)
+
+type memIndex struct {
+	m      *mem
+	t      *xtree
+	unique bool
+}
+
+func newMemIndex(m *mem, unique bool) *memIndex {
+	r := &memIndex{t: xtreeNew(), unique: unique, m: m}
+	//dbg("newMemIndex %p, %p", r, m)
+	return r
+}
+
+func (x *memIndex) Clear() error {
+	//dbg("memIndex(%p, %p).Clear", x, x.m)
+	x.m.newUndo(undoClearX, 0, []interface{}{x, x.t})
+	x.t = xtreeNew()
+	return nil
+}
+
+func (x *memIndex) Create(indexedValues []interface{}, h int64) error {
+	//dbg("memIndex(%p, %p).Create %v, %v", x, x.m, indexedValues, h)
+	t := x.t
+	switch {
+	case !x.unique:
+		k := indexKey{indexedValues, h}
+		x.m.newUndo(undoCreateX, 0, []interface{}{x, k}) //TODO why is old value, if any, not saved?
+		t.Set(k, 0)
+	case isIndexNull(indexedValues): // unique, NULL
+		k := indexKey{nil, h}
+		x.m.newUndo(undoCreateX, 0, []interface{}{x, k}) //TODO why is old value, if any, not saved?
+		t.Set(k, 0)
+	default: // unique, non NULL
+		k := indexKey{indexedValues, 0}
+		if _, ok := t.Get(k); ok { //LATER need .Put
+			return fmt.Errorf("cannot insert into unique index: duplicate value(s): %v", indexedValues)
+		}
+
+		x.m.newUndo(undoCreateX, 0, []interface{}{x, k}) //TODO why is old value, if any, not saved?
+		t.Set(k, int(h))
+	}
+	return nil
+}
+
+func (x *memIndex) Delete(indexedValues []interface{}, h int64) error {
+	//dbg("memIndex(%p, %p).Delete %v, %v", x, x.m, indexedValues, h)
+	t := x.t
+	var k indexKey
+	var v interface{}
+	var ok, okv bool
+	switch {
+	case !x.unique:
+		k = indexKey{indexedValues, h}
+		v, okv = t.Get(k)
+		ok = t.delete(k)
+	case isIndexNull(indexedValues): // unique, NULL
+		k = indexKey{nil, h}
+		v, okv = t.Get(k)
+		ok = t.delete(k)
+	default: // unique, non NULL
+		k = indexKey{indexedValues, 0}
+		v, okv = t.Get(k)
+		ok = t.delete(k)
+	}
+	if ok {
+		if okv {
+			x.m.newUndo(undoDeleteX, int64(v.(int)), []interface{}{x, k})
+		}
+		return nil
+	}
+
+	return fmt.Errorf("internal error 047")
+}
+
+func (x *memIndex) Drop() error {
+	x.m.newUndo(undoDropX, 0, []interface{}{x, *x})
+	*x = memIndex{}
+	return nil
+}
+
+func (x *memIndex) Seek(indexedValues []interface{}) (indexIterator, bool, error) {
+	it, hit := x.t.Seek(indexKey{indexedValues, 0})
+	return &xenumerator2{*it, x.unique}, hit, nil
+}
+
+func (x *memIndex) SeekFirst() (iter indexIterator, err error) {
+	it, err := x.t.SeekFirst()
+	if err != nil {
+		return nil, err
+	}
+
+	return &xenumerator2{*it, x.unique}, nil
+}
+
+func (x *memIndex) SeekLast() (iter indexIterator, err error) {
+	it, err := x.t.SeekLast()
+	if err != nil {
+		return nil, err
+	}
+
+	return &xenumerator2{*it, x.unique}, nil
+}
+
+type xenumerator2 struct {
+	it     xenumerator
+	unique bool
+}
+
+func (it *xenumerator2) Next() ([]interface{}, int64, error) {
+	k, h, err := it.it.Next()
+	if err != nil {
+		return nil, -1, err
+	}
+
+	switch it.unique {
+	case true:
+		if k.value == nil {
+			return nil, k.h, nil
+		}
+
+		return k.value, h, nil
+	default:
+		return k.value, k.h, nil
+	}
+}
+
+func (it *xenumerator2) Prev() ([]interface{}, int64, error) {
+	k, h, err := it.it.Prev()
+	if err != nil {
+		return nil, -1, err
+	}
+
+	switch it.unique {
+	case true:
+		if k.value == nil {
+			return nil, k.h, nil
+		}
+
+		return k.value, h, nil
+	default:
+		return k.value, k.h, nil
+	}
+}
+
+type memBTreeIterator enumerator
+
+func (it *memBTreeIterator) Next() (k, v []interface{}, err error) {
+	return (*enumerator)(it).Next()
+}
+
+type memTemp struct {
+	tree  *tree
+	store *mem
+}
+
+func (t *memTemp) BeginTransaction() (err error) {
+	return nil
+}
+
+func (t *memTemp) Get(k []interface{}) (v []interface{}, err error) {
+	v, _ = t.tree.Get(k)
+	return
+}
+
+func (t *memTemp) Create(data ...interface{}) (h int64, err error) {
+	s := t.store
+	switch n := len(s.recycler); {
+	case n != 0:
+		h = int64(s.recycler[n-1])
+		s.recycler = s.recycler[:n-1]
+		s.data[h] = s.clone(data...)
+	default:
+		h = int64(len(s.data))
+		s.data = append(s.data, s.clone(data...))
+	}
+	return
+}
+
+func (t *memTemp) Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error) {
+	return t.store.Read(dst, h, cols...)
+}
+
+func (*memTemp) Drop() (err error) { return }
+
+func (t *memTemp) Set(k, v []interface{}) (err error) {
+	t.tree.Set(append([]interface{}(nil), k...), t.store.clone(v...))
+	return
+}
+
+func (t *memTemp) SeekFirst() (e btreeIterator, err error) {
+	en, err := t.tree.SeekFirst()
+	if err != nil {
+		return
+	}
+
+	return (*memBTreeIterator)(en), nil
+}
+
+const (
+	undoCreateNewHandle = iota
+	undoCreateRecycledHandle
+	undoUpdate
+	undoDelete
+	undoClearX  // {0: *memIndex, 1: *xtree}
+	undoCreateX // {0: *memIndex, 1: indexKey}
+	undoDeleteX // {0: *memIndex, 1: indexKey}
+	undoDropX   // {0: *memIndex, 1: memIndex}
+)
+
+type undo struct {
+	tag  int
+	h    int64
+	data []interface{}
+}
+
+type undos struct {
+	list   []undo
+	parent *undos
+}
+
+type mem struct {
+	data     [][]interface{}
+	id       int64
+	recycler []int
+	tnl      int
+	rollback *undos
+}
+
+func newMemStorage() (s *mem, err error) {
+	s = &mem{data: [][]interface{}{nil}}
+	if err = s.BeginTransaction(); err != nil {
+		return nil, err
+	}
+
+	h, err := s.Create()
+	if h != 1 {
+		panic("internal error 048")
+	}
+
+	if err = s.Commit(); err != nil {
+		return nil, err
+	}
+
+	return
+}
+
+func (s *mem) OpenIndex(unique bool, handle int64) (btreeIndex, error) { // Never called on the memory backend.
+	panic("internal error 049")
+}
+
+func (s *mem) newUndo(tag int, h int64, data []interface{}) {
+	s.rollback.list = append(s.rollback.list, undo{tag, h, data})
+}
+
+func (s *mem) Acid() bool { return false }
+
+func (s *mem) Close() (err error) {
+	if s.tnl != 0 {
+		return fmt.Errorf("cannot close DB while open transaction exist")
+	}
+	*s = mem{}
+	return
+}
+
+func (s *mem) CreateIndex(unique bool) ( /* handle */ int64, btreeIndex, error) {
+	return -1, newMemIndex(s, unique), nil // handle of memIndex should never be used
+}
+
+func (s *mem) Name() string { return fmt.Sprintf("/proc/self/mem/%p", s) } // fake, non existing name
+
+// OpenMem returns a new, empty DB backed by the process' memory. The back end
+// has no limits on field/record/table/DB size other than memory available to
+// the process.
+func OpenMem() (db *DB, err error) {
+	s, err := newMemStorage()
+	if err != nil {
+		return
+	}
+
+	if db, err = newDB(s); err != nil {
+		return nil, err
+	}
+
+	db.isMem = true
+	return db, nil
+}
+
+func (s *mem) Verify() (allocs int64, err error) {
+	for _, v := range s.recycler {
+		if s.data[v] != nil {
+			return 0, fmt.Errorf("corrupted: non nil free handle %d", s.data[v])
+		}
+	}
+
+	for _, v := range s.data {
+		if v != nil {
+			allocs++
+		}
+	}
+
+	if allocs != int64(len(s.data))-1-int64(len(s.recycler)) {
+		return 0, fmt.Errorf("corrupted: len(data) %d, len(recycler) %d, allocs %d", len(s.data), len(s.recycler), allocs)
+	}
+
+	return
+}
+
+func (s *mem) String() string {
+	var b bytes.Buffer
+	for i, v := range s.data {
+		b.WriteString(fmt.Sprintf("s.data[%d] %#v\n", i, v))
+	}
+	for i, v := range s.recycler {
+		b.WriteString(fmt.Sprintf("s.recycler[%d] %v\n", i, v))
+	}
+	return b.String()
+}
+
+func (s *mem) CreateTemp(asc bool) (_ temp, err error) {
+	st, err := newMemStorage()
+	if err != nil {
+		return
+	}
+
+	return &memTemp{
+		tree:  treeNew(collators[asc]),
+		store: st,
+	}, nil
+}
+
+func (s *mem) ResetID() (err error) {
+	s.id = 0
+	return
+}
+
+func (s *mem) ID() (id int64, err error) {
+	s.id++
+	return s.id, nil
+}
+
+func (s *mem) clone(data ...interface{}) []interface{} {
+	r := make([]interface{}, len(data))
+	for i, v := range data {
+		switch x := v.(type) {
+		case nil:
+			// nop
+		case idealComplex:
+			r[i] = complex128(x)
+		case idealFloat:
+			r[i] = float64(x)
+		case idealInt:
+			r[i] = int64(x)
+		case idealRune:
+			r[i] = int32(x)
+		case idealUint:
+			r[i] = uint64(x)
+		case bool:
+			r[i] = x
+		case complex64:
+			r[i] = x
+		case complex128:
+			r[i] = x
+		case float32:
+			r[i] = x
+		case float64:
+			r[i] = x
+		case int:
+			r[i] = int64(x)
+		case int8:
+			r[i] = x
+		case int16:
+			r[i] = x
+		case int32:
+			r[i] = x
+		case int64:
+			r[i] = x
+		case string:
+			r[i] = x
+		case uint:
+			r[i] = uint64(x)
+		case uint8:
+			r[i] = x
+		case uint16:
+			r[i] = x
+		case uint32:
+			r[i] = x
+		case uint64:
+			r[i] = x
+		case []byte:
+			r[i] = append([]byte(nil), x...)
+		case *big.Int:
+			r[i] = big.NewInt(0).Set(x)
+		case *big.Rat:
+			r[i] = big.NewRat(1, 2).Set(x)
+		case time.Time:
+			t := x
+			r[i] = t
+		case time.Duration:
+			r[i] = x
+		case map[string]interface{}: // map of ids of a cross join
+			r[i] = x
+		default:
+			panic("internal error 050")
+		}
+	}
+	return r
+}
+
+func (s *mem) Create(data ...interface{}) (h int64, err error) {
+	switch n := len(s.recycler); {
+	case n != 0:
+		h = int64(s.recycler[n-1])
+		s.recycler = s.recycler[:n-1]
+		s.data[h] = s.clone(data...)
+		r := s.rollback
+		r.list = append(r.list, undo{
+			tag: undoCreateRecycledHandle,
+			h:   h,
+		})
+	default:
+		h = int64(len(s.data))
+		s.data = append(s.data, s.clone(data...))
+		r := s.rollback
+		r.list = append(r.list, undo{
+			tag: undoCreateNewHandle,
+			h:   h,
+		})
+	}
+	return
+}
+
+func (s *mem) Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error) {
+	if i := int(h); i != 0 && i < len(s.data) {
+		d := s.clone(s.data[h]...)
+		if cols == nil {
+			return d, nil
+		}
+
+		for n, dn := len(cols)+2, len(d); dn < n; dn++ {
+			d = append(d, nil)
+		}
+		return d, nil
+	}
+
+	return nil, errNoDataForHandle
+}
+
+func (s *mem) UpdateRow(h int64, _ []*col, data ...interface{}) (err error) {
+	return s.Update(h, data...)
+}
+
+func (s *mem) Update(h int64, data ...interface{}) (err error) {
+	r := s.rollback
+	r.list = append(r.list, undo{
+		tag:  undoUpdate,
+		h:    h,
+		data: s.data[h],
+	})
+	s.data[h] = s.clone(data...)
+	return
+}
+
+func (s *mem) Delete(h int64, _ ...*col) (err error) {
+	r := s.rollback
+	r.list = append(r.list, undo{
+		tag:  undoDelete,
+		h:    h,
+		data: s.data[h],
+	})
+	s.recycler = append(s.recycler, int(h))
+	s.data[h] = nil
+	return
+}
+
+func (s *mem) BeginTransaction() (err error) {
+	s.rollback = &undos{parent: s.rollback}
+	s.tnl++
+	return nil
+}
+
+func (s *mem) Rollback() (err error) {
+	if s.tnl == 0 {
+		return errRollbackNotInTransaction
+	}
+
+	list := s.rollback.list
+	for i := len(list) - 1; i >= 0; i-- {
+		undo := list[i]
+		switch h, data := int(undo.h), undo.data; undo.tag {
+		case undoCreateNewHandle:
+			d := s.data
+			s.data = d[:len(d)-1]
+		case undoCreateRecycledHandle:
+			s.data[h] = nil
+			r := s.recycler
+			s.recycler = append(r, h)
+		case undoUpdate:
+			s.data[h] = data
+		case undoDelete:
+			s.data[h] = data
+			s.recycler = s.recycler[:len(s.recycler)-1]
+		case undoClearX:
+			x, t := data[0].(*memIndex), data[1].(*xtree)
+			x.t = t
+		case undoCreateX:
+			x, k := data[0].(*memIndex), data[1].(indexKey)
+			x.t.delete(k)
+		case undoDeleteX:
+			x, k := data[0].(*memIndex), data[1].(indexKey)
+			x.t.Set(k, h)
+		case undoDropX:
+			x, v := data[0].(*memIndex), data[1].(memIndex)
+			*x = v
+		default:
+			panic("internal error 051")
+		}
+	}
+
+	s.tnl--
+	s.rollback = s.rollback.parent
+	return nil
+}
+
+func (s *mem) Commit() (err error) {
+	if s.tnl == 0 {
+		return errCommitNotInTransaction
+	}
+
+	s.tnl--
+	s.rollback = s.rollback.parent
+	return nil
+}
+
+// Transaction index B+Tree
+//LATER make it just a wrapper of the implementation in btree.go.
+
+type (
+	xd struct { // data page
+		c  int
+		xd [2*kd + 1]xde
+		n  *xd
+		p  *xd
+	}
+
+	xde struct { // xd element
+		k indexKey
+		v int
+	}
+
+	// xenumerator captures the state of enumerating a tree. It is returned
+	// from the Seek* methods. The enumerator is aware of any mutations
+	// made to the tree in the process of enumerating it and automatically
+	// resumes the enumeration at the proper key, if possible.
+	//
+	// However, once an xenumerator returns io.EOF to signal "no more
+	// items", it does no more attempt to "resync" on tree mutation(s).  In
+	// other words, io.EOF from an Enumaretor is "sticky" (idempotent).
+	xenumerator struct {
+		err error
+		hit bool
+		i   int
+		k   indexKey
+		q   *xd
+		t   *xtree
+		ver int64
+	}
+
+	// xtree is a B+tree.
+	xtree struct {
+		c     int
+		first *xd
+		last  *xd
+		r     interface{}
+		ver   int64
+	}
+
+	xxe struct { // xx element
+		ch  interface{}
+		sep *xd
+	}
+
+	xx struct { // index page
+		c  int
+		xx [2*kx + 2]xxe
+	}
+)
+
+func (a *indexKey) cmp(b *indexKey) int {
+	r := collate(a.value, b.value)
+	if r != 0 {
+		return r
+	}
+
+	return int(a.h) - int(b.h)
+}
+
+var ( // R/O zero values
+	zxd  xd
+	zxde xde
+	zxx  xx
+	zxxe xxe
+)
+
+func xclr(q interface{}) {
+	switch xx := q.(type) {
+	case *xx:
+		for i := 0; i <= xx.c; i++ { // Ch0 Sep0 ... Chn-1 Sepn-1 Chn
+			xclr(xx.xx[i].ch)
+		}
+		*xx = zxx // GC
+	case *xd:
+		*xx = zxd // GC
+	}
+}
+
+// -------------------------------------------------------------------------- xx
+
+func xnewX(ch0 interface{}) *xx {
+	r := &xx{}
+	r.xx[0].ch = ch0
+	return r
+}
+
+func (q *xx) extract(i int) {
+	q.c--
+	if i < q.c {
+		copy(q.xx[i:], q.xx[i+1:q.c+1])
+		q.xx[q.c].ch = q.xx[q.c+1].ch
+		q.xx[q.c].sep = nil // GC
+		q.xx[q.c+1] = zxxe  // GC
+	}
+}
+
+func (q *xx) insert(i int, xd *xd, ch interface{}) *xx {
+	c := q.c
+	if i < c {
+		q.xx[c+1].ch = q.xx[c].ch
+		copy(q.xx[i+2:], q.xx[i+1:c])
+		q.xx[i+1].sep = q.xx[i].sep
+	}
+	c++
+	q.c = c
+	q.xx[i].sep = xd
+	q.xx[i+1].ch = ch
+	return q
+}
+
+func (q *xx) siblings(i int) (l, r *xd) {
+	if i >= 0 {
+		if i > 0 {
+			l = q.xx[i-1].ch.(*xd)
+		}
+		if i < q.c {
+			r = q.xx[i+1].ch.(*xd)
+		}
+	}
+	return
+}
+
+// -------------------------------------------------------------------------- xd
+
+func (l *xd) mvL(r *xd, c int) {
+	copy(l.xd[l.c:], r.xd[:c])
+	copy(r.xd[:], r.xd[c:r.c])
+	l.c += c
+	r.c -= c
+}
+
+func (l *xd) mvR(r *xd, c int) {
+	copy(r.xd[c:], r.xd[:r.c])
+	copy(r.xd[:c], l.xd[l.c-c:])
+	r.c += c
+	l.c -= c
+}
+
+// ----------------------------------------------------------------------- xtree
+
+// xtreeNew returns a newly created, empty xtree. The compare function is used
+// for key collation.
+func xtreeNew() *xtree {
+	return &xtree{}
+}
+
+// Clear removes all K/V pairs from the tree.
+func (t *xtree) Clear() {
+	if t.r == nil {
+		return
+	}
+
+	xclr(t.r)
+	t.c, t.first, t.last, t.r = 0, nil, nil, nil
+	t.ver++
+}
+
+func (t *xtree) cat(p *xx, q, r *xd, pi int) {
+	t.ver++
+	q.mvL(r, r.c)
+	if r.n != nil {
+		r.n.p = q
+	} else {
+		t.last = q
+	}
+	q.n = r.n
+	if p.c > 1 {
+		p.extract(pi)
+		p.xx[pi].ch = q
+	} else {
+		t.r = q
+	}
+}
+
+func (t *xtree) catX(p, q, r *xx, pi int) {
+	t.ver++
+	q.xx[q.c].sep = p.xx[pi].sep
+	copy(q.xx[q.c+1:], r.xx[:r.c])
+	q.c += r.c + 1
+	q.xx[q.c].ch = r.xx[r.c].ch
+	if p.c > 1 {
+		p.c--
+		pc := p.c
+		if pi < pc {
+			p.xx[pi].sep = p.xx[pi+1].sep
+			copy(p.xx[pi+1:], p.xx[pi+2:pc+1])
+			p.xx[pc].ch = p.xx[pc+1].ch
+			p.xx[pc].sep = nil  // GC
+			p.xx[pc+1].ch = nil // GC
+		}
+		return
+	}
+
+	t.r = q
+}
+
+//Delete removes the k's KV pair, if it exists, in which case Delete returns
+//true.
+func (t *xtree) delete(k indexKey) (ok bool) {
+	pi := -1
+	var p *xx
+	q := t.r
+	if q == nil {
+		return
+	}
+
+	for {
+		var i int
+		i, ok = t.find(q, k)
+		if ok {
+			switch xx := q.(type) {
+			case *xx:
+				dp := xx.xx[i].sep
+				switch {
+				case dp.c > kd:
+					t.extract(dp, 0)
+				default:
+					if xx.c < kx && q != t.r {
+						t.underflowX(p, &xx, pi, &i)
+					}
+					pi = i + 1
+					p = xx
+					q = xx.xx[pi].ch
+					ok = false
+					continue
+				}
+			case *xd:
+				t.extract(xx, i)
+				if xx.c >= kd {
+					return
+				}
+
+				if q != t.r {
+					t.underflow(p, xx, pi)
+				} else if t.c == 0 {
+					t.Clear()
+				}
+			}
+			return
+		}
+
+		switch xx := q.(type) {
+		case *xx:
+			if xx.c < kx && q != t.r {
+				t.underflowX(p, &xx, pi, &i)
+			}
+			pi = i
+			p = xx
+			q = xx.xx[i].ch
+		case *xd:
+			return
+		}
+	}
+}
+
+func (t *xtree) extract(q *xd, i int) { // (r int64) {
+	t.ver++
+	//r = q.xd[i].v // prepared for Extract
+	q.c--
+	if i < q.c {
+		copy(q.xd[i:], q.xd[i+1:q.c+1])
+	}
+	q.xd[q.c] = zxde // GC
+	t.c--
+	return
+}
+
+func (t *xtree) find(q interface{}, k indexKey) (i int, ok bool) {
+	var mk indexKey
+	l := 0
+	switch xx := q.(type) {
+	case *xx:
+		h := xx.c - 1
+		for l <= h {
+			m := (l + h) >> 1
+			mk = xx.xx[m].sep.xd[0].k
+			switch cmp := k.cmp(&mk); {
+			case cmp > 0:
+				l = m + 1
+			case cmp == 0:
+				return m, true
+			default:
+				h = m - 1
+			}
+		}
+	case *xd:
+		h := xx.c - 1
+		for l <= h {
+			m := (l + h) >> 1
+			mk = xx.xd[m].k
+			switch cmp := k.cmp(&mk); {
+			case cmp > 0:
+				l = m + 1
+			case cmp == 0:
+				return m, true
+			default:
+				h = m - 1
+			}
+		}
+	}
+	return l, false
+}
+
+// First returns the first item of the tree in the key collating order, or
+// (nil, nil) if the tree is empty.
+func (t *xtree) First() (k indexKey, v int) {
+	if q := t.first; q != nil {
+		q := &q.xd[0]
+		k, v = q.k, q.v
+	}
+	return
+}
+
+// Get returns the value associated with k and true if it exists. Otherwise Get
+// returns (nil, false).
+func (t *xtree) Get(k indexKey) (v int, ok bool) {
+	q := t.r
+	if q == nil {
+		return
+	}
+
+	for {
+		var i int
+		if i, ok = t.find(q, k); ok {
+			switch xx := q.(type) {
+			case *xx:
+				return xx.xx[i].sep.xd[0].v, true
+			case *xd:
+				return xx.xd[i].v, true
+			}
+		}
+		switch xx := q.(type) {
+		case *xx:
+			q = xx.xx[i].ch
+		default:
+			return
+		}
+	}
+}
+
+func (t *xtree) insert(q *xd, i int, k indexKey, v int) *xd {
+	t.ver++
+	c := q.c
+	if i < c {
+		copy(q.xd[i+1:], q.xd[i:c])
+	}
+	c++
+	q.c = c
+	q.xd[i].k, q.xd[i].v = k, v
+	t.c++
+	return q
+}
+
+// Last returns the last item of the tree in the key collating order, or (nil,
+// nil) if the tree is empty.
+func (t *xtree) Last() (k indexKey, v int) {
+	if q := t.last; q != nil {
+		q := &q.xd[q.c-1]
+		k, v = q.k, q.v
+	}
+	return
+}
+
+// Len returns the number of items in the tree.
+func (t *xtree) Len() int {
+	return t.c
+}
+
+func (t *xtree) overflow(p *xx, q *xd, pi, i int, k indexKey, v int) {
+	t.ver++
+	l, r := p.siblings(pi)
+
+	if l != nil && l.c < 2*kd {
+		l.mvL(q, 1)
+		t.insert(q, i-1, k, v)
+		return
+	}
+
+	if r != nil && r.c < 2*kd {
+		if i < 2*kd {
+			q.mvR(r, 1)
+			t.insert(q, i, k, v)
+		} else {
+			t.insert(r, 0, k, v)
+		}
+		return
+	}
+
+	t.split(p, q, pi, i, k, v)
+}
+
+// Seek returns an xenumerator positioned on a an item such that k >= item's
+// key. ok reports if k == item.key The xenumerator's position is possibly
+// after the last item in the tree.
+func (t *xtree) Seek(k indexKey) (e *xenumerator, ok bool) {
+	q := t.r
+	if q == nil {
+		e = &xenumerator{nil, false, 0, k, nil, t, t.ver}
+		return
+	}
+
+	for {
+		var i int
+		if i, ok = t.find(q, k); ok {
+			switch xx := q.(type) {
+			case *xx:
+				e = &xenumerator{nil, ok, 0, k, xx.xx[i].sep, t, t.ver}
+				return
+			case *xd:
+				e = &xenumerator{nil, ok, i, k, xx, t, t.ver}
+				return
+			}
+		}
+		switch xx := q.(type) {
+		case *xx:
+			q = xx.xx[i].ch
+		case *xd:
+			e = &xenumerator{nil, ok, i, k, xx, t, t.ver}
+			return
+		}
+	}
+}
+
+// SeekFirst returns an enumerator positioned on the first KV pair in the tree,
+// if any. For an empty tree, err == io.EOF is returned and e will be nil.
+func (t *xtree) SeekFirst() (e *xenumerator, err error) {
+	q := t.first
+	if q == nil {
+		return nil, io.EOF
+	}
+
+	return &xenumerator{nil, true, 0, q.xd[0].k, q, t, t.ver}, nil
+}
+
+// SeekLast returns an enumerator positioned on the last KV pair in the tree,
+// if any. For an empty tree, err == io.EOF is returned and e will be nil.
+func (t *xtree) SeekLast() (e *xenumerator, err error) {
+	q := t.last
+	if q == nil {
+		return nil, io.EOF
+	}
+
+	return &xenumerator{nil, true, q.c - 1, q.xd[q.c-1].k, q, t, t.ver}, nil
+}
+
+// Set sets the value associated with k.
+func (t *xtree) Set(k indexKey, v int) {
+	pi := -1
+	var p *xx
+	q := t.r
+	if q != nil {
+		for {
+			i, ok := t.find(q, k)
+			if ok {
+				switch xx := q.(type) {
+				case *xx:
+					xx.xx[i].sep.xd[0].v = v
+				case *xd:
+					xx.xd[i].v = v
+				}
+				return
+			}
+
+			switch xx := q.(type) {
+			case *xx:
+				if xx.c > 2*kx {
+					t.splitX(p, &xx, pi, &i)
+				}
+				pi = i
+				p = xx
+				q = xx.xx[i].ch
+			case *xd:
+				switch {
+				case xx.c < 2*kd:
+					t.insert(xx, i, k, v)
+				default:
+					t.overflow(p, xx, pi, i, k, v)
+				}
+				return
+			}
+		}
+	}
+
+	z := t.insert(&xd{}, 0, k, v)
+	t.r, t.first, t.last = z, z, z
+	return
+}
+
+func (t *xtree) split(p *xx, q *xd, pi, i int, k indexKey, v int) {
+	t.ver++
+	r := &xd{}
+	if q.n != nil {
+		r.n = q.n
+		r.n.p = r
+	} else {
+		t.last = r
+	}
+	q.n = r
+	r.p = q
+
+	copy(r.xd[:], q.xd[kd:2*kd])
+	for i := range q.xd[kd:] {
+		q.xd[kd+i] = zxde
+	}
+	q.c = kd
+	r.c = kd
+	if pi >= 0 {
+		p.insert(pi, r, r)
+	} else {
+		t.r = xnewX(q).insert(0, r, r)
+	}
+	if i > kd {
+		t.insert(r, i-kd, k, v)
+		return
+	}
+
+	t.insert(q, i, k, v)
+}
+
+func (t *xtree) splitX(p *xx, pp **xx, pi int, i *int) {
+	t.ver++
+	q := *pp
+	r := &xx{}
+	copy(r.xx[:], q.xx[kx+1:])
+	q.c = kx
+	r.c = kx
+	if pi >= 0 {
+		p.insert(pi, q.xx[kx].sep, r)
+	} else {
+		t.r = xnewX(q).insert(0, q.xx[kx].sep, r)
+	}
+	q.xx[kx].sep = nil
+	for i := range q.xx[kx+1:] {
+		q.xx[kx+i+1] = zxxe
+	}
+	if *i > kx {
+		*pp = r
+		*i -= kx + 1
+	}
+}
+
+func (t *xtree) underflow(p *xx, q *xd, pi int) {
+	t.ver++
+	l, r := p.siblings(pi)
+
+	if l != nil && l.c+q.c >= 2*kd {
+		l.mvR(q, 1)
+	} else if r != nil && q.c+r.c >= 2*kd {
+		q.mvL(r, 1)
+		r.xd[r.c] = zxde // GC
+	} else if l != nil {
+		t.cat(p, l, q, pi-1)
+	} else {
+		t.cat(p, q, r, pi)
+	}
+}
+
+func (t *xtree) underflowX(p *xx, pp **xx, pi int, i *int) {
+	t.ver++
+	var l, r *xx
+	q := *pp
+
+	if pi >= 0 {
+		if pi > 0 {
+			l = p.xx[pi-1].ch.(*xx)
+		}
+		if pi < p.c {
+			r = p.xx[pi+1].ch.(*xx)
+		}
+	}
+
+	if l != nil && l.c > kx {
+		q.xx[q.c+1].ch = q.xx[q.c].ch
+		copy(q.xx[1:], q.xx[:q.c])
+		q.xx[0].ch = l.xx[l.c].ch
+		q.xx[0].sep = p.xx[pi-1].sep
+		q.c++
+		*i++
+		l.c--
+		p.xx[pi-1].sep = l.xx[l.c].sep
+		return
+	}
+
+	if r != nil && r.c > kx {
+		q.xx[q.c].sep = p.xx[pi].sep
+		q.c++
+		q.xx[q.c].ch = r.xx[0].ch
+		p.xx[pi].sep = r.xx[0].sep
+		copy(r.xx[:], r.xx[1:r.c])
+		r.c--
+		rc := r.c
+		r.xx[rc].ch = r.xx[rc+1].ch
+		r.xx[rc].sep = nil
+		r.xx[rc+1].ch = nil
+		return
+	}
+
+	if l != nil {
+		*i += l.c + 1
+		t.catX(p, l, q, pi-1)
+		*pp = l
+		return
+	}
+
+	t.catX(p, q, r, pi)
+}
+
+// ----------------------------------------------------------------- xenumerator
+
+// Next returns the currently enumerated item, if it exists and moves to the
+// next item in the key collation order. If there is no item to return, err ==
+// io.EOF is returned.
+func (e *xenumerator) Next() (k indexKey, v int64, err error) {
+	if err = e.err; err != nil {
+		return
+	}
+
+	if e.ver != e.t.ver {
+		f, hit := e.t.Seek(e.k)
+		if !e.hit && hit {
+			if err = f.next(); err != nil {
+				return
+			}
+		}
+
+		*e = *f
+	}
+	if e.q == nil {
+		e.err, err = io.EOF, io.EOF
+		return
+	}
+
+	if e.i >= e.q.c {
+		if err = e.next(); err != nil {
+			return
+		}
+	}
+
+	i := e.q.xd[e.i]
+	k, v = i.k, int64(i.v)
+	e.k, e.hit = k, false
+	e.next()
+	return
+}
+
+func (e *xenumerator) next() error {
+	if e.q == nil {
+		e.err = io.EOF
+		return io.EOF
+	}
+
+	switch {
+	case e.i < e.q.c-1:
+		e.i++
+	default:
+		if e.q, e.i = e.q.n, 0; e.q == nil {
+			e.err = io.EOF
+		}
+	}
+	return e.err
+}
+
+// Prev returns the currently enumerated item, if it exists and moves to the
+// previous item in the key collation order. If there is no item to return, err
+// == io.EOF is returned.
+func (e *xenumerator) Prev() (k indexKey, v int64, err error) {
+	if err = e.err; err != nil {
+		return
+	}
+
+	if e.ver != e.t.ver {
+		f, hit := e.t.Seek(e.k)
+		if !e.hit && hit {
+			if err = f.prev(); err != nil {
+				return
+			}
+		}
+
+		*e = *f
+	}
+	if e.q == nil {
+		e.err, err = io.EOF, io.EOF
+		return
+	}
+
+	if e.i >= e.q.c {
+		if err = e.next(); err != nil {
+			return
+		}
+	}
+
+	i := e.q.xd[e.i]
+	k, v = i.k, int64(i.v)
+	e.k, e.hit = k, false
+	e.prev()
+	return
+}
+
+func (e *xenumerator) prev() error {
+	if e.q == nil {
+		e.err = io.EOF
+		return io.EOF
+	}
+
+	switch {
+	case e.i > 0:
+		e.i--
+	default:
+		if e.q = e.q.p; e.q == nil {
+			e.err = io.EOF
+			break
+		}
+
+		e.i = e.q.c - 1
+	}
+	return e.err
+}
diff --git a/vendor/github.com/cznic/ql/parser.go b/vendor/github.com/cznic/ql/parser.go
new file mode 100644
index 0000000000..1fb6e04a54
--- /dev/null
+++ b/vendor/github.com/cznic/ql/parser.go
@@ -0,0 +1,2637 @@
+// CAUTION: Generated file - DO NOT EDIT.
+
+// Copyright (c) 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Inital yacc source generated by ebnf2y[1]
+// at 2013-10-04 23:10:47.861401015 +0200 CEST
+//
+//  $ ebnf2y -o ql.y -oe ql.ebnf -start StatementList -pkg ql -p _
+//
+//   [1]: http://github.com/cznic/ebnf2y
+
+package ql
+
+import __yyfmt__ "fmt"
+
+import (
+	"fmt"
+
+	"github.com/cznic/mathutil"
+)
+
+type yySymType struct {
+	yys  int
+	line int
+	col  int
+	item interface{}
+	list []interface{}
+}
+
+type yyXError struct {
+	state, xsym int
+}
+
+const (
+	yyDefault       = 57437
+	yyEOFCode       = 57344
+	add             = 57352
+	alter           = 57353
+	and             = 57354
+	andand          = 57355
+	andnot          = 57356
+	as              = 57357
+	asc             = 57358
+	begin           = 57359
+	between         = 57360
+	bigIntType      = 57361
+	bigRatType      = 57362
+	blobType        = 57363
+	boolType        = 57364
+	by              = 57365
+	byteType        = 57366
+	column          = 57367
+	commit          = 57368
+	complex128Type  = 57369
+	complex64Type   = 57370
+	create          = 57371
+	defaultKwd      = 57372
+	deleteKwd       = 57373
+	desc            = 57374
+	distinct        = 57375
+	drop            = 57376
+	durationType    = 57377
+	eq              = 57378
+	yyErrCode       = 57345
+	exists          = 57379
+	explain         = 57380
+	falseKwd        = 57381
+	float32Type     = 57383
+	float64Type     = 57384
+	floatLit        = 57346
+	floatType       = 57382
+	from            = 57385
+	full            = 57386
+	ge              = 57387
+	group           = 57388
+	identifier      = 57347
+	ifKwd           = 57389
+	imaginaryLit    = 57348
+	in              = 57390
+	index           = 57391
+	insert          = 57392
+	int16Type       = 57394
+	int32Type       = 57395
+	int64Type       = 57396
+	int8Type        = 57397
+	intLit          = 57349
+	intType         = 57393
+	into            = 57398
+	is              = 57399
+	join            = 57400
+	le              = 57401
+	left            = 57402
+	like            = 57403
+	limit           = 57404
+	lsh             = 57405
+	neq             = 57406
+	not             = 57407
+	null            = 57408
+	offset          = 57409
+	on              = 57410
+	or              = 57411
+	order           = 57412
+	oror            = 57413
+	outer           = 57414
+	parseExpression = 57436
+	qlParam         = 57350
+	right           = 57415
+	rollback        = 57416
+	rsh             = 57417
+	runeType        = 57418
+	selectKwd       = 57419
+	set             = 57420
+	stringLit       = 57351
+	stringType      = 57421
+	tableKwd        = 57422
+	timeType        = 57423
+	transaction     = 57424
+	trueKwd         = 57425
+	truncate        = 57426
+	uint16Type      = 57428
+	uint32Type      = 57429
+	uint64Type      = 57430
+	uint8Type       = 57431
+	uintType        = 57427
+	unique          = 57432
+	update          = 57433
+	values          = 57434
+	where           = 57435
+
+	yyMaxDepth = 200
+	yyTabOfs   = -216
+)
+
+var (
+	yyXLAT = map[int]int{
+		59:    0,   // ';' (192x)
+		57344: 1,   // $end (191x)
+		41:    2,   // ')' (164x)
+		43:    3,   // '+' (133x)
+		45:    4,   // '-' (133x)
+		94:    5,   // '^' (133x)
+		44:    6,   // ',' (130x)
+		40:    7,   // '(' (125x)
+		57347: 8,   // identifier (116x)
+		57409: 9,   // offset (103x)
+		57404: 10,  // limit (101x)
+		57372: 11,  // defaultKwd (94x)
+		57412: 12,  // order (90x)
+		57435: 13,  // where (87x)
+		57408: 14,  // null (84x)
+		57361: 15,  // bigIntType (83x)
+		57362: 16,  // bigRatType (83x)
+		57363: 17,  // blobType (83x)
+		57364: 18,  // boolType (83x)
+		57366: 19,  // byteType (83x)
+		57369: 20,  // complex128Type (83x)
+		57370: 21,  // complex64Type (83x)
+		57377: 22,  // durationType (83x)
+		57383: 23,  // float32Type (83x)
+		57384: 24,  // float64Type (83x)
+		57382: 25,  // floatType (83x)
+		57394: 26,  // int16Type (83x)
+		57395: 27,  // int32Type (83x)
+		57396: 28,  // int64Type (83x)
+		57397: 29,  // int8Type (83x)
+		57393: 30,  // intType (83x)
+		57418: 31,  // runeType (83x)
+		57421: 32,  // stringType (83x)
+		57423: 33,  // timeType (83x)
+		57428: 34,  // uint16Type (83x)
+		57429: 35,  // uint32Type (83x)
+		57430: 36,  // uint64Type (83x)
+		57431: 37,  // uint8Type (83x)
+		57427: 38,  // uintType (83x)
+		57381: 39,  // falseKwd (81x)
+		57346: 40,  // floatLit (81x)
+		57388: 41,  // group (81x)
+		57348: 42,  // imaginaryLit (81x)
+		57349: 43,  // intLit (81x)
+		57407: 44,  // not (81x)
+		57411: 45,  // or (81x)
+		57413: 46,  // oror (81x)
+		57350: 47,  // qlParam (81x)
+		57351: 48,  // stringLit (81x)
+		57425: 49,  // trueKwd (81x)
+		33:    50,  // '!' (77x)
+		57385: 51,  // from (75x)
+		57358: 52,  // asc (71x)
+		57374: 53,  // desc (71x)
+		93:    54,  // ']' (70x)
+		57357: 55,  // as (69x)
+		58:    56,  // ':' (67x)
+		57354: 57,  // and (67x)
+		57355: 58,  // andand (65x)
+		124:   59,  // '|' (56x)
+		57360: 60,  // between (54x)
+		57390: 61,  // in (54x)
+		60:    62,  // '<' (53x)
+		62:    63,  // '>' (53x)
+		57378: 64,  // eq (53x)
+		57387: 65,  // ge (53x)
+		57399: 66,  // is (53x)
+		57401: 67,  // le (53x)
+		57403: 68,  // like (53x)
+		57406: 69,  // neq (53x)
+		57513: 70,  // Type (52x)
+		57453: 71,  // Conversion (51x)
+		57483: 72,  // Literal (51x)
+		57484: 73,  // Operand (51x)
+		57488: 74,  // PrimaryExpression (51x)
+		57491: 75,  // QualifiedIdent (51x)
+		42:    76,  // '*' (48x)
+		57514: 77,  // UnaryExpr (47x)
+		37:    78,  // '%' (44x)
+		38:    79,  // '&' (44x)
+		47:    80,  // '/' (44x)
+		57356: 81,  // andnot (44x)
+		57405: 82,  // lsh (44x)
+		57417: 83,  // rsh (44x)
+		57490: 84,  // PrimaryTerm (40x)
+		57489: 85,  // PrimaryFactor (36x)
+		91:    86,  // '[' (31x)
+		57470: 87,  // Factor (25x)
+		57471: 88,  // Factor1 (25x)
+		57511: 89,  // Term (24x)
+		57467: 90,  // Expression (23x)
+		57519: 91,  // logOr (16x)
+		57446: 92,  // ColumnName (10x)
+		57386: 93,  // full (10x)
+		57402: 94,  // left (10x)
+		57415: 95,  // right (10x)
+		57419: 96,  // selectKwd (10x)
+		57510: 97,  // TableName (9x)
+		57449: 98,  // CommaOpt (7x)
+		57468: 99,  // ExpressionList (7x)
+		57410: 100, // on (7x)
+		57497: 101, // SelectStmt (7x)
+		57400: 102, // join (6x)
+		57443: 103, // Call (5x)
+		57376: 104, // drop (5x)
+		57476: 105, // Index (5x)
+		57506: 106, // Slice (5x)
+		57445: 107, // ColumnDef (4x)
+		57379: 108, // exists (4x)
+		57389: 109, // ifKwd (4x)
+		57391: 110, // index (4x)
+		57414: 111, // outer (4x)
+		57422: 112, // tableKwd (4x)
+		57434: 113, // values (4x)
+		57353: 114, // alter (3x)
+		57438: 115, // AlterTableStmt (3x)
+		57359: 116, // begin (3x)
+		57442: 117, // BeginTransactionStmt (3x)
+		57368: 118, // commit (3x)
+		57450: 119, // CommitStmt (3x)
+		57371: 120, // create (3x)
+		57455: 121, // CreateIndexStmt (3x)
+		57457: 122, // CreateTableStmt (3x)
+		57461: 123, // DeleteFromStmt (3x)
+		57373: 124, // deleteKwd (3x)
+		57463: 125, // DropIndexStmt (3x)
+		57464: 126, // DropTableStmt (3x)
+		57465: 127, // EmptyStmt (3x)
+		57380: 128, // explain (3x)
+		57466: 129, // ExplainStmt (3x)
+		57392: 130, // insert (3x)
+		57477: 131, // InsertIntoStmt (3x)
+		57492: 132, // RecordSet (3x)
+		57493: 133, // RecordSet1 (3x)
+		57416: 134, // rollback (3x)
+		57496: 135, // RollbackStmt (3x)
+		57520: 136, // semiOpt (3x)
+		57508: 137, // Statement (3x)
+		57426: 138, // truncate (3x)
+		57512: 139, // TruncateTableStmt (3x)
+		57433: 140, // update (3x)
+		57515: 141, // UpdateStmt (3x)
+		57517: 142, // WhereClause (3x)
+		61:    143, // '=' (2x)
+		57352: 144, // add (2x)
+		57439: 145, // Assignment (2x)
+		57365: 146, // by (2x)
+		57447: 147, // ColumnNameList (2x)
+		57458: 148, // CreateTableStmt1 (2x)
+		57472: 149, // Field (2x)
+		57518: 150, // logAnd (2x)
+		57420: 151, // set (2x)
+		46:    152, // '.' (1x)
+		57440: 153, // AssignmentList (1x)
+		57441: 154, // AssignmentList1 (1x)
+		57444: 155, // Call1 (1x)
+		57367: 156, // column (1x)
+		57448: 157, // ColumnNameList1 (1x)
+		57451: 158, // Constraint (1x)
+		57452: 159, // ConstraintOpt (1x)
+		57454: 160, // CreateIndexIfNotExists (1x)
+		57456: 161, // CreateIndexStmtUnique (1x)
+		57459: 162, // Default (1x)
+		57460: 163, // DefaultOpt (1x)
+		57375: 164, // distinct (1x)
+		57462: 165, // DropIndexIfExists (1x)
+		57469: 166, // ExpressionList1 (1x)
+		57473: 167, // Field1 (1x)
+		57474: 168, // FieldList (1x)
+		57475: 169, // GroupByClause (1x)
+		57478: 170, // InsertIntoStmt1 (1x)
+		57479: 171, // InsertIntoStmt2 (1x)
+		57398: 172, // into (1x)
+		57480: 173, // JoinClause (1x)
+		57481: 174, // JoinClauseOpt (1x)
+		57482: 175, // JoinType (1x)
+		57485: 176, // OrderBy (1x)
+		57486: 177, // OrderBy1 (1x)
+		57487: 178, // OuterOpt (1x)
+		57436: 179, // parseExpression (1x)
+		57494: 180, // RecordSet2 (1x)
+		57495: 181, // RecordSetList (1x)
+		57498: 182, // SelectStmtDistinct (1x)
+		57499: 183, // SelectStmtFieldList (1x)
+		57500: 184, // SelectStmtGroup (1x)
+		57501: 185, // SelectStmtLimit (1x)
+		57502: 186, // SelectStmtOffset (1x)
+		57503: 187, // SelectStmtOrder (1x)
+		57504: 188, // SelectStmtWhere (1x)
+		57505: 189, // SetOpt (1x)
+		57507: 190, // Start (1x)
+		57509: 191, // StatementList (1x)
+		57424: 192, // transaction (1x)
+		57432: 193, // unique (1x)
+		57516: 194, // UpdateStmt1 (1x)
+		57437: 195, // $default (0x)
+		57345: 196, // error (0x)
+	}
+
+	yySymNames = []string{
+		"';'",
+		"$end",
+		"')'",
+		"'+'",
+		"'-'",
+		"'^'",
+		"','",
+		"'('",
+		"identifier",
+		"offset",
+		"limit",
+		"defaultKwd",
+		"order",
+		"where",
+		"null",
+		"bigIntType",
+		"bigRatType",
+		"blobType",
+		"boolType",
+		"byteType",
+		"complex128Type",
+		"complex64Type",
+		"durationType",
+		"float32Type",
+		"float64Type",
+		"floatType",
+		"int16Type",
+		"int32Type",
+		"int64Type",
+		"int8Type",
+		"intType",
+		"runeType",
+		"stringType",
+		"timeType",
+		"uint16Type",
+		"uint32Type",
+		"uint64Type",
+		"uint8Type",
+		"uintType",
+		"falseKwd",
+		"floatLit",
+		"group",
+		"imaginaryLit",
+		"intLit",
+		"not",
+		"or",
+		"oror",
+		"qlParam",
+		"stringLit",
+		"trueKwd",
+		"'!'",
+		"from",
+		"asc",
+		"desc",
+		"']'",
+		"as",
+		"':'",
+		"and",
+		"andand",
+		"'|'",
+		"between",
+		"in",
+		"'<'",
+		"'>'",
+		"eq",
+		"ge",
+		"is",
+		"le",
+		"like",
+		"neq",
+		"Type",
+		"Conversion",
+		"Literal",
+		"Operand",
+		"PrimaryExpression",
+		"QualifiedIdent",
+		"'*'",
+		"UnaryExpr",
+		"'%'",
+		"'&'",
+		"'/'",
+		"andnot",
+		"lsh",
+		"rsh",
+		"PrimaryTerm",
+		"PrimaryFactor",
+		"'['",
+		"Factor",
+		"Factor1",
+		"Term",
+		"Expression",
+		"logOr",
+		"ColumnName",
+		"full",
+		"left",
+		"right",
+		"selectKwd",
+		"TableName",
+		"CommaOpt",
+		"ExpressionList",
+		"on",
+		"SelectStmt",
+		"join",
+		"Call",
+		"drop",
+		"Index",
+		"Slice",
+		"ColumnDef",
+		"exists",
+		"ifKwd",
+		"index",
+		"outer",
+		"tableKwd",
+		"values",
+		"alter",
+		"AlterTableStmt",
+		"begin",
+		"BeginTransactionStmt",
+		"commit",
+		"CommitStmt",
+		"create",
+		"CreateIndexStmt",
+		"CreateTableStmt",
+		"DeleteFromStmt",
+		"deleteKwd",
+		"DropIndexStmt",
+		"DropTableStmt",
+		"EmptyStmt",
+		"explain",
+		"ExplainStmt",
+		"insert",
+		"InsertIntoStmt",
+		"RecordSet",
+		"RecordSet1",
+		"rollback",
+		"RollbackStmt",
+		"semiOpt",
+		"Statement",
+		"truncate",
+		"TruncateTableStmt",
+		"update",
+		"UpdateStmt",
+		"WhereClause",
+		"'='",
+		"add",
+		"Assignment",
+		"by",
+		"ColumnNameList",
+		"CreateTableStmt1",
+		"Field",
+		"logAnd",
+		"set",
+		"'.'",
+		"AssignmentList",
+		"AssignmentList1",
+		"Call1",
+		"column",
+		"ColumnNameList1",
+		"Constraint",
+		"ConstraintOpt",
+		"CreateIndexIfNotExists",
+		"CreateIndexStmtUnique",
+		"Default",
+		"DefaultOpt",
+		"distinct",
+		"DropIndexIfExists",
+		"ExpressionList1",
+		"Field1",
+		"FieldList",
+		"GroupByClause",
+		"InsertIntoStmt1",
+		"InsertIntoStmt2",
+		"into",
+		"JoinClause",
+		"JoinClauseOpt",
+		"JoinType",
+		"OrderBy",
+		"OrderBy1",
+		"OuterOpt",
+		"parseExpression",
+		"RecordSet2",
+		"RecordSetList",
+		"SelectStmtDistinct",
+		"SelectStmtFieldList",
+		"SelectStmtGroup",
+		"SelectStmtLimit",
+		"SelectStmtOffset",
+		"SelectStmtOrder",
+		"SelectStmtWhere",
+		"SetOpt",
+		"Start",
+		"StatementList",
+		"transaction",
+		"unique",
+		"UpdateStmt1",
+		"$default",
+		"error",
+	}
+
+	yyReductions = map[int]struct{ xsym, components int }{
+		0:   {0, 1},
+		1:   {190, 1},
+		2:   {190, 2},
+		3:   {115, 5},
+		4:   {115, 6},
+		5:   {145, 3},
+		6:   {153, 3},
+		7:   {154, 0},
+		8:   {154, 3},
+		9:   {117, 2},
+		10:  {103, 3},
+		11:  {103, 3},
+		12:  {155, 0},
+		13:  {155, 1},
+		14:  {107, 4},
+		15:  {92, 1},
+		16:  {147, 3},
+		17:  {157, 0},
+		18:  {157, 3},
+		19:  {119, 1},
+		20:  {158, 2},
+		21:  {158, 1},
+		22:  {159, 0},
+		23:  {159, 1},
+		24:  {71, 4},
+		25:  {121, 10},
+		26:  {160, 0},
+		27:  {160, 3},
+		28:  {161, 0},
+		29:  {161, 1},
+		30:  {122, 8},
+		31:  {122, 11},
+		32:  {148, 0},
+		33:  {148, 3},
+		34:  {162, 2},
+		35:  {163, 0},
+		36:  {163, 1},
+		37:  {123, 3},
+		38:  {123, 4},
+		39:  {125, 4},
+		40:  {165, 0},
+		41:  {165, 2},
+		42:  {126, 3},
+		43:  {126, 5},
+		44:  {127, 0},
+		45:  {129, 2},
+		46:  {90, 1},
+		47:  {90, 3},
+		48:  {91, 1},
+		49:  {91, 1},
+		50:  {99, 3},
+		51:  {166, 0},
+		52:  {166, 3},
+		53:  {87, 1},
+		54:  {87, 5},
+		55:  {87, 6},
+		56:  {87, 6},
+		57:  {87, 7},
+		58:  {87, 5},
+		59:  {87, 6},
+		60:  {87, 3},
+		61:  {87, 4},
+		62:  {88, 1},
+		63:  {88, 3},
+		64:  {88, 3},
+		65:  {88, 3},
+		66:  {88, 3},
+		67:  {88, 3},
+		68:  {88, 3},
+		69:  {88, 3},
+		70:  {149, 2},
+		71:  {167, 0},
+		72:  {167, 2},
+		73:  {168, 1},
+		74:  {168, 3},
+		75:  {169, 3},
+		76:  {105, 3},
+		77:  {131, 10},
+		78:  {131, 5},
+		79:  {170, 0},
+		80:  {170, 3},
+		81:  {171, 0},
+		82:  {171, 5},
+		83:  {72, 1},
+		84:  {72, 1},
+		85:  {72, 1},
+		86:  {72, 1},
+		87:  {72, 1},
+		88:  {72, 1},
+		89:  {72, 1},
+		90:  {73, 1},
+		91:  {73, 1},
+		92:  {73, 1},
+		93:  {73, 3},
+		94:  {176, 4},
+		95:  {177, 0},
+		96:  {177, 1},
+		97:  {177, 1},
+		98:  {74, 1},
+		99:  {74, 1},
+		100: {74, 2},
+		101: {74, 2},
+		102: {74, 2},
+		103: {85, 1},
+		104: {85, 3},
+		105: {85, 3},
+		106: {85, 3},
+		107: {85, 3},
+		108: {84, 1},
+		109: {84, 3},
+		110: {84, 3},
+		111: {84, 3},
+		112: {84, 3},
+		113: {84, 3},
+		114: {84, 3},
+		115: {84, 3},
+		116: {75, 1},
+		117: {75, 3},
+		118: {132, 2},
+		119: {133, 1},
+		120: {133, 4},
+		121: {136, 0},
+		122: {136, 1},
+		123: {180, 0},
+		124: {180, 2},
+		125: {181, 1},
+		126: {181, 3},
+		127: {135, 1},
+		128: {175, 1},
+		129: {175, 1},
+		130: {175, 1},
+		131: {178, 0},
+		132: {178, 1},
+		133: {173, 6},
+		134: {174, 0},
+		135: {174, 1},
+		136: {101, 12},
+		137: {185, 0},
+		138: {185, 2},
+		139: {186, 0},
+		140: {186, 2},
+		141: {182, 0},
+		142: {182, 1},
+		143: {183, 1},
+		144: {183, 1},
+		145: {183, 2},
+		146: {188, 0},
+		147: {188, 1},
+		148: {184, 0},
+		149: {184, 1},
+		150: {187, 0},
+		151: {187, 1},
+		152: {106, 3},
+		153: {106, 4},
+		154: {106, 4},
+		155: {106, 5},
+		156: {137, 1},
+		157: {137, 1},
+		158: {137, 1},
+		159: {137, 1},
+		160: {137, 1},
+		161: {137, 1},
+		162: {137, 1},
+		163: {137, 1},
+		164: {137, 1},
+		165: {137, 1},
+		166: {137, 1},
+		167: {137, 1},
+		168: {137, 1},
+		169: {137, 1},
+		170: {137, 1},
+		171: {191, 1},
+		172: {191, 3},
+		173: {97, 1},
+		174: {89, 1},
+		175: {89, 3},
+		176: {150, 1},
+		177: {150, 1},
+		178: {139, 3},
+		179: {70, 1},
+		180: {70, 1},
+		181: {70, 1},
+		182: {70, 1},
+		183: {70, 1},
+		184: {70, 1},
+		185: {70, 1},
+		186: {70, 1},
+		187: {70, 1},
+		188: {70, 1},
+		189: {70, 1},
+		190: {70, 1},
+		191: {70, 1},
+		192: {70, 1},
+		193: {70, 1},
+		194: {70, 1},
+		195: {70, 1},
+		196: {70, 1},
+		197: {70, 1},
+		198: {70, 1},
+		199: {70, 1},
+		200: {70, 1},
+		201: {70, 1},
+		202: {70, 1},
+		203: {141, 5},
+		204: {194, 0},
+		205: {194, 1},
+		206: {77, 1},
+		207: {77, 2},
+		208: {77, 2},
+		209: {77, 2},
+		210: {77, 2},
+		211: {142, 2},
+		212: {189, 0},
+		213: {189, 1},
+		214: {98, 0},
+		215: {98, 1},
+	}
+
+	yyXErrors = map[yyXError]string{
+		yyXError{1, -1}:   "expected $end",
+		yyXError{43, -1}:  "expected '('",
+		yyXError{157, -1}: "expected '('",
+		yyXError{181, -1}: "expected '('",
+		yyXError{281, -1}: "expected '('",
+		yyXError{309, -1}: "expected '('",
+		yyXError{313, -1}: "expected '('",
+		yyXError{344, -1}: "expected '('",
+		yyXError{118, -1}: "expected ')'",
+		yyXError{119, -1}: "expected ')'",
+		yyXError{120, -1}: "expected ')'",
+		yyXError{187, -1}: "expected ')'",
+		yyXError{189, -1}: "expected ')'",
+		yyXError{190, -1}: "expected ')'",
+		yyXError{194, -1}: "expected ')'",
+		yyXError{196, -1}: "expected ')'",
+		yyXError{265, -1}: "expected ')'",
+		yyXError{279, -1}: "expected ')'",
+		yyXError{284, -1}: "expected ')'",
+		yyXError{290, -1}: "expected ')'",
+		yyXError{318, -1}: "expected ')'",
+		yyXError{335, -1}: "expected ')'",
+		yyXError{346, -1}: "expected ')'",
+		yyXError{36, -1}:  "expected '='",
+		yyXError{233, -1}: "expected BY",
+		yyXError{236, -1}: "expected BY",
+		yyXError{352, -1}: "expected COLUMN",
+		yyXError{7, -1}:   "expected CREATE INDEX optional UNIQUE clause or one of [INDEX, TABLE, UNIQUE]",
+		yyXError{337, -1}: "expected CREATE INDEX statement optional IF NOT EXISTS cluse or one of [IF, identifier]",
+		yyXError{316, -1}: "expected CREATE TABLE statement colum definition list or optional comma or one of [')', ',']",
+		yyXError{333, -1}: "expected CREATE TABLE statement colum definition list or optional comma or one of [')', ',']",
+		yyXError{293, -1}: "expected DROP INDEX statement optional IF EXISTS clause or one of [IF, identifier]",
+		yyXError{296, -1}: "expected EXISTS",
+		yyXError{300, -1}: "expected EXISTS",
+		yyXError{311, -1}: "expected EXISTS",
+		yyXError{340, -1}: "expected EXISTS",
+		yyXError{8, -1}:   "expected FROM",
+		yyXError{215, -1}: "expected FROM",
+		yyXError{216, -1}: "expected FROM",
+		yyXError{306, -1}: "expected INDEX",
+		yyXError{307, -1}: "expected INDEX",
+		yyXError{276, -1}: "expected INSERT INTO statement optional column list clause or SELECT statement or one of ['(', SELECT, VALUES]",
+		yyXError{285, -1}: "expected INSERT INTO statement optional values list or optional comma or one of [$end, ',', ';']",
+		yyXError{11, -1}:  "expected INTO",
+		yyXError{257, -1}: "expected JOIN",
+		yyXError{258, -1}: "expected JOIN",
+		yyXError{310, -1}: "expected NOT",
+		yyXError{339, -1}: "expected NOT",
+		yyXError{176, -1}: "expected NULL",
+		yyXError{324, -1}: "expected NULL",
+		yyXError{260, -1}: "expected ON",
+		yyXError{342, -1}: "expected ON",
+		yyXError{246, -1}: "expected ORDER BY clause optional collation specification or one of [$end, ')', ';', ASC, DESC, LIMIT, OFFSET]",
+		yyXError{217, -1}: "expected RecordSetList or one of ['(', identifier]",
+		yyXError{13, -1}:  "expected SELECT statement field list or SELECT statement optional DISTINCT clause or one of ['!', '(', '*', '+', '-', '^', DISTINCT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{210, -1}: "expected SELECT statement field list or one of ['!', '(', '*', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{224, -1}: "expected SELECT statement optional GROUP BY clause or SELECT statement optional JOIN clause or SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or SELECT statement optional WHERE clause or one of [$end, ')', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE]",
+		yyXError{222, -1}: "expected SELECT statement optional GROUP BY clause or SELECT statement optional JOIN clause or SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or SELECT statement optional WHERE clause or optional comma or one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE]",
+		yyXError{230, -1}: "expected SELECT statement optional GROUP BY clause or SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or SELECT statement optional WHERE clause or one of [$end, ')', ';', GROUP, LIMIT, OFFSET, ORDER, WHERE]",
+		yyXError{231, -1}: "expected SELECT statement optional GROUP BY clause or SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or one of [$end, ')', ';', GROUP, LIMIT, OFFSET, ORDER]",
+		yyXError{234, -1}: "expected SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or one of [$end, ')', ';', LIMIT, OFFSET, ORDER]",
+		yyXError{237, -1}: "expected SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or one of [$end, ')', ';', LIMIT, OFFSET]",
+		yyXError{239, -1}: "expected SELECT statement optional OFFSET clause or one of [$end, ')', ';', OFFSET]",
+		yyXError{220, -1}: "expected SELECT statement or SELECT",
+		yyXError{186, -1}: "expected SELECT statement or expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, SELECT, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{193, -1}: "expected SELECT statement or expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, SELECT, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{277, -1}: "expected SELECT statement or one of [SELECT, VALUES]",
+		yyXError{33, -1}:  "expected SetOpt or assignment list or one of [SET, identifier]",
+		yyXError{0, -1}:   "expected Start or one of [$end, ';', ALTER, BEGIN, COMMIT, CREATE, DELETE, DROP, EXPLAIN, INSERT, ROLLBACK, SELECT, TRUNCATE, UPDATE, parse expression prefix]",
+		yyXError{4, -1}:   "expected TABLE",
+		yyXError{30, -1}:  "expected TABLE",
+		yyXError{5, -1}:   "expected TRANSACTION",
+		yyXError{39, -1}:  "expected UPDATE statement optional WHERE clause or one of [$end, ';', WHERE]",
+		yyXError{304, -1}: "expected WHERE clause or one of [$end, ';', WHERE]",
+		yyXError{37, -1}:  "expected assignment list optional trailing comma or optional comma or one of [$end, ',', ';', WHERE]",
+		yyXError{34, -1}:  "expected assignment list or identifier",
+		yyXError{204, -1}: "expected assignment or one of [$end, ';', WHERE, identifier]",
+		yyXError{250, -1}: "expected column name list or identifier",
+		yyXError{278, -1}: "expected column name list or identifier",
+		yyXError{251, -1}: "expected column name list with optional trailing comma or optional comma or one of [$end, ')', ',', ';', LIMIT, OFFSET, ORDER]",
+		yyXError{353, -1}: "expected column name or identifier",
+		yyXError{255, -1}: "expected column name or one of [$end, ')', ';', LIMIT, OFFSET, ORDER, identifier]",
+		yyXError{109, -1}: "expected expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{121, -1}: "expected expression list expression or logical or operator or optional comma or one of [$end, ')', ',', ';', ASC, DESC, LIMIT, OFFSET, OR, ||]",
+		yyXError{245, -1}: "expected expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{283, -1}: "expected expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{289, -1}: "expected expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{345, -1}: "expected expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{124, -1}: "expected expression or one of [$end, '!', '(', ')', '+', '-', ';', '^', ASC, DESC, LIMIT, NULL, OFFSET, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{96, -1}:  "expected expression or one of ['!', '(', '+', '-', ':', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{101, -1}: "expected expression or one of ['!', '(', '+', '-', ']', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{114, -1}: "expected expression or one of ['!', '(', '+', '-', ']', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{3, -1}:   "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{42, -1}:  "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{58, -1}:  "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{199, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{206, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{240, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{243, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{261, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{329, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{104, -1}: "expected expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{212, -1}: "expected field expression optional AS clause or logical or operator or one of [',', AS, FROM, OR, ||]",
+		yyXError{270, -1}: "expected field expression or one of ['!', '(', '+', '-', '^', FROM, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{95, -1}:  "expected function call optional argument list or one of ['!', '(', ')', '*', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{61, -1}:  "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{94, -1}:  "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{128, -1}: "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{129, -1}: "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{130, -1}: "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{35, -1}:  "expected identifier",
+		yyXError{131, -1}: "expected identifier",
+		yyXError{268, -1}: "expected identifier",
+		yyXError{273, -1}: "expected identifier",
+		yyXError{299, -1}: "expected identifier",
+		yyXError{301, -1}: "expected identifier",
+		yyXError{338, -1}: "expected identifier",
+		yyXError{341, -1}: "expected identifier",
+		yyXError{343, -1}: "expected identifier",
+		yyXError{44, -1}:  "expected logical and operator or one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{108, -1}: "expected logical and operator or one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{125, -1}: "expected logical or operator or one of [$end, ')', ',', ';', ASC, DESC, LIMIT, OFFSET, OR, ||]",
+		yyXError{325, -1}: "expected logical or operator or one of [$end, ')', ',', ';', DEFAULT, OR, ||]",
+		yyXError{331, -1}: "expected logical or operator or one of [$end, ')', ',', ';', OR, ||]",
+		yyXError{262, -1}: "expected logical or operator or one of [$end, ')', ';', GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{45, -1}:  "expected logical or operator or one of [$end, ')', ';', GROUP, LIMIT, OFFSET, OR, ORDER, ||]",
+		yyXError{241, -1}: "expected logical or operator or one of [$end, ')', ';', OFFSET, OR, ||]",
+		yyXError{244, -1}: "expected logical or operator or one of [$end, ')', ';', OR, ||]",
+		yyXError{207, -1}: "expected logical or operator or one of [$end, ',', ';', OR, WHERE, ||]",
+		yyXError{356, -1}: "expected logical or operator or one of [$end, OR, ||]",
+		yyXError{147, -1}: "expected logical or operator or one of [')', OR, ||]",
+		yyXError{200, -1}: "expected logical or operator or one of [')', OR, ||]",
+		yyXError{100, -1}: "expected logical or operator or one of [':', ']', OR, ||]",
+		yyXError{102, -1}: "expected logical or operator or one of [']', OR, ||]",
+		yyXError{115, -1}: "expected logical or operator or one of [']', OR, ||]",
+		yyXError{64, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '.', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{48, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{49, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{50, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{51, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{52, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{53, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{54, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{55, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{56, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{57, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{59, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{60, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{97, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{98, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{99, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{103, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{107, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{113, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{116, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{117, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{126, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{127, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{132, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{148, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{201, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{62, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{63, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{140, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{141, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{142, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{143, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{144, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{145, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{146, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{153, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{154, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{155, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{156, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{47, -1}:  "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{168, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{169, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{170, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{171, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{172, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{173, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{174, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{46, -1}:  "expected one of [!=, $end, &&, ')', ',', ':', ';', '<', '>', ']', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{180, -1}: "expected one of [$end, &&, ')', '+', ',', '-', ':', ';', ']', '^', '|', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{185, -1}: "expected one of [$end, &&, ')', '+', ',', '-', ':', ';', ']', '^', '|', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{65, -1}:  "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{112, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{175, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{177, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{191, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{192, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{197, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{198, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
+		yyXError{66, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{67, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{68, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{69, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{70, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{71, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{72, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{73, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{74, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{75, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{76, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{77, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{78, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{79, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{80, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{81, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{82, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{83, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{84, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{85, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{86, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{87, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{88, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{89, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{32, -1}:  "expected one of [$end, '(', ';', ADD, DROP, SELECT, SET, VALUES, WHERE, identifier]",
+		yyXError{288, -1}: "expected one of [$end, '(', ';']",
+		yyXError{38, -1}:  "expected one of [$end, ')', ',', ';', '=', LIMIT, OFFSET, ORDER, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, float, float32, float64, int, int16, int32, int64, int8, rune, string, time, uint, uint16, uint32, uint64, uint8]",
+		yyXError{219, -1}: "expected one of [$end, ')', ',', ';', AS, FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
+		yyXError{266, -1}: "expected one of [$end, ')', ',', ';', AS, FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
+		yyXError{326, -1}: "expected one of [$end, ')', ',', ';', DEFAULT]",
+		yyXError{327, -1}: "expected one of [$end, ')', ',', ';', DEFAULT]",
+		yyXError{267, -1}: "expected one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
+		yyXError{269, -1}: "expected one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
+		yyXError{221, -1}: "expected one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE]",
+		yyXError{263, -1}: "expected one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE]",
+		yyXError{256, -1}: "expected one of [$end, ')', ',', ';', LIMIT, OFFSET, ORDER]",
+		yyXError{328, -1}: "expected one of [$end, ')', ',', ';']",
+		yyXError{330, -1}: "expected one of [$end, ')', ',', ';']",
+		yyXError{123, -1}: "expected one of [$end, ')', ';', ASC, DESC, LIMIT, OFFSET]",
+		yyXError{229, -1}: "expected one of [$end, ')', ';', GROUP, LIMIT, OFFSET, ORDER, WHERE]",
+		yyXError{232, -1}: "expected one of [$end, ')', ';', GROUP, LIMIT, OFFSET, ORDER]",
+		yyXError{235, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET, ORDER]",
+		yyXError{252, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET, ORDER]",
+		yyXError{254, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET, ORDER]",
+		yyXError{238, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET]",
+		yyXError{247, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET]",
+		yyXError{248, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET]",
+		yyXError{249, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET]",
+		yyXError{242, -1}: "expected one of [$end, ')', ';']",
+		yyXError{205, -1}: "expected one of [$end, ',', ';', WHERE]",
+		yyXError{291, -1}: "expected one of [$end, ',', ';']",
+		yyXError{203, -1}: "expected one of [$end, ';', WHERE]",
+		yyXError{2, -1}:   "expected one of [$end, ';']",
+		yyXError{6, -1}:   "expected one of [$end, ';']",
+		yyXError{12, -1}:  "expected one of [$end, ';']",
+		yyXError{14, -1}:  "expected one of [$end, ';']",
+		yyXError{15, -1}:  "expected one of [$end, ';']",
+		yyXError{16, -1}:  "expected one of [$end, ';']",
+		yyXError{17, -1}:  "expected one of [$end, ';']",
+		yyXError{18, -1}:  "expected one of [$end, ';']",
+		yyXError{19, -1}:  "expected one of [$end, ';']",
+		yyXError{20, -1}:  "expected one of [$end, ';']",
+		yyXError{21, -1}:  "expected one of [$end, ';']",
+		yyXError{22, -1}:  "expected one of [$end, ';']",
+		yyXError{23, -1}:  "expected one of [$end, ';']",
+		yyXError{24, -1}:  "expected one of [$end, ';']",
+		yyXError{25, -1}:  "expected one of [$end, ';']",
+		yyXError{26, -1}:  "expected one of [$end, ';']",
+		yyXError{27, -1}:  "expected one of [$end, ';']",
+		yyXError{28, -1}:  "expected one of [$end, ';']",
+		yyXError{29, -1}:  "expected one of [$end, ';']",
+		yyXError{40, -1}:  "expected one of [$end, ';']",
+		yyXError{41, -1}:  "expected one of [$end, ';']",
+		yyXError{209, -1}: "expected one of [$end, ';']",
+		yyXError{282, -1}: "expected one of [$end, ';']",
+		yyXError{287, -1}: "expected one of [$end, ';']",
+		yyXError{292, -1}: "expected one of [$end, ';']",
+		yyXError{295, -1}: "expected one of [$end, ';']",
+		yyXError{298, -1}: "expected one of [$end, ';']",
+		yyXError{302, -1}: "expected one of [$end, ';']",
+		yyXError{305, -1}: "expected one of [$end, ';']",
+		yyXError{321, -1}: "expected one of [$end, ';']",
+		yyXError{336, -1}: "expected one of [$end, ';']",
+		yyXError{347, -1}: "expected one of [$end, ';']",
+		yyXError{348, -1}: "expected one of [$end, ';']",
+		yyXError{354, -1}: "expected one of [$end, ';']",
+		yyXError{355, -1}: "expected one of [$end, ';']",
+		yyXError{358, -1}: "expected one of [$end, ';']",
+		yyXError{211, -1}: "expected one of ['!', '(', '*', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{105, -1}: "expected one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{106, -1}: "expected one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{110, -1}: "expected one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{111, -1}: "expected one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{320, -1}: "expected one of [')', ',']",
+		yyXError{178, -1}: "expected one of ['+', '-', '^', '|', AND]",
+		yyXError{183, -1}: "expected one of ['+', '-', '^', '|', AND]",
+		yyXError{213, -1}: "expected one of [',', FROM]",
+		yyXError{214, -1}: "expected one of [',', FROM]",
+		yyXError{271, -1}: "expected one of [',', FROM]",
+		yyXError{272, -1}: "expected one of [',', FROM]",
+		yyXError{274, -1}: "expected one of [',', FROM]",
+		yyXError{350, -1}: "expected one of [ADD, DROP]",
+		yyXError{158, -1}: "expected one of [BETWEEN, IN]",
+		yyXError{9, -1}:   "expected one of [INDEX, TABLE]",
+		yyXError{225, -1}: "expected one of [JOIN, OUTER]",
+		yyXError{226, -1}: "expected one of [JOIN, OUTER]",
+		yyXError{227, -1}: "expected one of [JOIN, OUTER]",
+		yyXError{160, -1}: "expected one of [NOT, NULL]",
+		yyXError{280, -1}: "expected one of [SELECT, VALUES]",
+		yyXError{323, -1}: "expected optional DEFAULT clause or one of [$end, ')', ',', ';', DEFAULT]",
+		yyXError{322, -1}: "expected optional DEFAULT clause or optional column value constraint or one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{228, -1}: "expected optional OUTER clause or one of [JOIN, OUTER]",
+		yyXError{122, -1}: "expected optional comma or one of [$end, ')', ',', ';', ASC, DESC, LIMIT, OFFSET]",
+		yyXError{253, -1}: "expected optional comma or one of [$end, ')', ',', ';', LIMIT, OFFSET, ORDER]",
+		yyXError{202, -1}: "expected optional comma or one of [$end, ',', ';', WHERE]",
+		yyXError{286, -1}: "expected optional comma or one of [$end, ',', ';']",
+		yyXError{317, -1}: "expected optional comma or one of [')', ',']",
+		yyXError{334, -1}: "expected optional comma or one of [')', ',']",
+		yyXError{159, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{161, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{162, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{163, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{164, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{165, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{166, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{167, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{179, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{182, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{184, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{90, -1}:  "expected primary expression or one of ['(', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{91, -1}:  "expected primary expression or one of ['(', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{92, -1}:  "expected primary expression or one of ['(', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{93, -1}:  "expected primary expression or one of ['(', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{149, -1}: "expected primary expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{150, -1}: "expected primary expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{151, -1}: "expected primary expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{152, -1}: "expected primary expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{218, -1}: "expected record set optional AS clause or one of [$end, ')', ',', ';', AS, FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
+		yyXError{223, -1}: "expected record set or one of [$end, '(', ')', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE, identifier]",
+		yyXError{259, -1}: "expected record set or one of ['(', identifier]",
+		yyXError{188, -1}: "expected semiOpt or one of [')', ';']",
+		yyXError{195, -1}: "expected semiOpt or one of [')', ';']",
+		yyXError{264, -1}: "expected semiOpt or one of [')', ';']",
+		yyXError{10, -1}:  "expected statement or one of [$end, ';', ALTER, BEGIN, COMMIT, CREATE, DELETE, DROP, EXPLAIN, INSERT, ROLLBACK, SELECT, TRUNCATE, UPDATE]",
+		yyXError{357, -1}: "expected statement or one of [$end, ';', ALTER, BEGIN, COMMIT, CREATE, DELETE, DROP, EXPLAIN, INSERT, ROLLBACK, SELECT, TRUNCATE, UPDATE]",
+		yyXError{314, -1}: "expected table column definition or identifier",
+		yyXError{332, -1}: "expected table column definition or identifier",
+		yyXError{351, -1}: "expected table column definition or identifier",
+		yyXError{319, -1}: "expected table column definition or one of [')', identifier]",
+		yyXError{31, -1}:  "expected table name or identifier",
+		yyXError{208, -1}: "expected table name or identifier",
+		yyXError{275, -1}: "expected table name or identifier",
+		yyXError{297, -1}: "expected table name or identifier",
+		yyXError{303, -1}: "expected table name or identifier",
+		yyXError{312, -1}: "expected table name or identifier",
+		yyXError{349, -1}: "expected table name or identifier",
+		yyXError{294, -1}: "expected table name or one of [IF, identifier]",
+		yyXError{308, -1}: "expected table name or one of [IF, identifier]",
+		yyXError{315, -1}: "expected type or one of [bigint, bigrat, blob, bool, byte, complex128, complex64, duration, float, float32, float64, int, int16, int32, int64, int8, rune, string, time, uint, uint16, uint32, uint64, uint8]",
+		yyXError{133, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{134, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{135, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{136, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{137, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{138, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+		yyXError{139, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
+	}
+
+	yyParseTab = [359][]uint16{
+		// 0
+		{172, 172, 96: 229, 101: 242, 104: 225, 114: 220, 231, 221, 232, 222, 233, 223, 234, 235, 236, 224, 237, 238, 230, 226, 239, 227, 240, 134: 228, 241, 137: 245, 246, 243, 247, 244, 179: 219, 190: 217, 218},
+		{1: 216},
+		{573, 215},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 572},
+		{112: 565},
+		// 5
+		{192: 564},
+		{197, 197},
+		{110: 188, 112: 524, 161: 522, 193: 523},
+		{51: 519},
+		{110: 509, 112: 510},
+		// 10
+		{172, 172, 96: 229, 101: 242, 104: 225, 114: 220, 231, 221, 232, 222, 233, 223, 234, 235, 236, 224, 237, 238, 230, 226, 239, 227, 240, 134: 228, 241, 137: 508, 246, 243, 247, 244},
+		{172: 491},
+		{89, 89},
+		{3: 75, 75, 75, 7: 75, 75, 14: 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 42: 75, 75, 47: 75, 75, 75, 75, 76: 75, 164: 427, 182: 426},
+		{60, 60},
+		// 15
+		{59, 59},
+		{58, 58},
+		{57, 57},
+		{56, 56},
+		{55, 55},
+		// 20
+		{54, 54},
+		{53, 53},
+		{52, 52},
+		{51, 51},
+		{50, 50},
+		// 25
+		{49, 49},
+		{48, 48},
+		{47, 47},
+		{46, 46},
+		{45, 45},
+		// 30
+		{112: 424},
+		{8: 248, 97: 249},
+		{43, 43, 7: 43, 43, 13: 43, 96: 43, 104: 43, 113: 43, 144: 43, 151: 43},
+		{8: 4, 151: 251, 189: 250},
+		{8: 254, 92: 252, 145: 253, 153: 255},
+		// 35
+		{8: 3},
+		{143: 422},
+		{209, 209, 6: 209, 13: 209, 154: 418},
+		{201, 201, 201, 6: 201, 9: 201, 201, 12: 201, 15: 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 143: 201},
+		{12, 12, 13: 258, 142: 257, 194: 256},
+		// 40
+		{13, 13},
+		{11, 11},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 261},
+		{7: 415},
+		{170, 170, 170, 6: 170, 9: 170, 170, 170, 170, 170, 41: 170, 45: 170, 170, 51: 170, 170, 170, 170, 170, 170, 327, 326, 150: 325},
+		// 45
+		{5, 5, 5, 9: 5, 5, 12: 5, 41: 5, 45: 322, 321, 91: 320},
+		{163, 163, 163, 6: 163, 9: 163, 163, 163, 163, 163, 41: 163, 44: 374, 163, 163, 51: 163, 163, 163, 163, 163, 163, 163, 163, 60: 375, 373, 380, 378, 382, 377, 376, 379, 383, 381},
+		{154, 154, 154, 368, 367, 365, 154, 9: 154, 154, 154, 154, 154, 41: 154, 44: 154, 154, 154, 51: 154, 154, 154, 154, 154, 154, 154, 154, 366, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154},
+		{133, 133, 133, 133, 133, 133, 133, 133, 9: 133, 133, 133, 133, 133, 41: 133, 44: 133, 133, 133, 51: 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 76: 133, 78: 133, 133, 133, 133, 133, 133, 86: 133},
+		{132, 132, 132, 132, 132, 132, 132, 132, 9: 132, 132, 132, 132, 132, 41: 132, 44: 132, 132, 132, 51: 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 76: 132, 78: 132, 132, 132, 132, 132, 132, 86: 132},
+		// 50
+		{131, 131, 131, 131, 131, 131, 131, 131, 9: 131, 131, 131, 131, 131, 41: 131, 44: 131, 131, 131, 51: 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 76: 131, 78: 131, 131, 131, 131, 131, 131, 86: 131},
+		{130, 130, 130, 130, 130, 130, 130, 130, 9: 130, 130, 130, 130, 130, 41: 130, 44: 130, 130, 130, 51: 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 76: 130, 78: 130, 130, 130, 130, 130, 130, 86: 130},
+		{129, 129, 129, 129, 129, 129, 129, 129, 9: 129, 129, 129, 129, 129, 41: 129, 44: 129, 129, 129, 51: 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 76: 129, 78: 129, 129, 129, 129, 129, 129, 86: 129},
+		{128, 128, 128, 128, 128, 128, 128, 128, 9: 128, 128, 128, 128, 128, 41: 128, 44: 128, 128, 128, 51: 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 76: 128, 78: 128, 128, 128, 128, 128, 128, 86: 128},
+		{127, 127, 127, 127, 127, 127, 127, 127, 9: 127, 127, 127, 127, 127, 41: 127, 44: 127, 127, 127, 51: 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 76: 127, 78: 127, 127, 127, 127, 127, 127, 86: 127},
+		// 55
+		{126, 126, 126, 126, 126, 126, 126, 126, 9: 126, 126, 126, 126, 126, 41: 126, 44: 126, 126, 126, 51: 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 76: 126, 78: 126, 126, 126, 126, 126, 126, 86: 126},
+		{125, 125, 125, 125, 125, 125, 125, 125, 9: 125, 125, 125, 125, 125, 41: 125, 44: 125, 125, 125, 51: 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 76: 125, 78: 125, 125, 125, 125, 125, 125, 86: 125},
+		{124, 124, 124, 124, 124, 124, 124, 124, 9: 124, 124, 124, 124, 124, 41: 124, 44: 124, 124, 124, 51: 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 76: 124, 78: 124, 124, 124, 124, 124, 124, 86: 124},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 363},
+		{118, 118, 118, 118, 118, 118, 118, 118, 9: 118, 118, 118, 118, 118, 41: 118, 44: 118, 118, 118, 51: 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 76: 118, 78: 118, 118, 118, 118, 118, 118, 86: 118},
+		// 60
+		{117, 117, 117, 117, 117, 117, 117, 117, 9: 117, 117, 117, 117, 117, 41: 117, 44: 117, 117, 117, 51: 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 76: 117, 78: 117, 117, 117, 117, 117, 117, 86: 117},
+		{10, 10, 10, 10, 10, 10, 10, 311, 9: 10, 10, 10, 10, 10, 41: 10, 44: 10, 10, 10, 51: 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 76: 10, 78: 10, 10, 10, 10, 10, 10, 86: 312, 103: 315, 105: 313, 314},
+		{113, 113, 113, 113, 113, 113, 113, 9: 113, 113, 113, 113, 113, 41: 113, 44: 113, 113, 113, 51: 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 76: 355, 78: 353, 350, 354, 349, 351, 352},
+		{108, 108, 108, 108, 108, 108, 108, 9: 108, 108, 108, 108, 108, 41: 108, 44: 108, 108, 108, 51: 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 76: 108, 78: 108, 108, 108, 108, 108, 108},
+		{100, 100, 100, 100, 100, 100, 100, 100, 9: 100, 100, 100, 100, 100, 41: 100, 44: 100, 100, 100, 51: 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 76: 100, 78: 100, 100, 100, 100, 100, 100, 86: 100, 152: 347},
+		// 65
+		{42, 42, 42, 6: 42, 9: 42, 42, 42, 42, 42, 41: 42, 45: 42, 42, 51: 42, 42, 42, 42, 42, 42, 42, 42},
+		{37, 37, 37, 37, 37, 37, 37, 37, 37, 11: 37, 14: 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 42: 37, 37, 37, 47: 37, 37, 37, 37},
+		{36, 36, 36, 36, 36, 36, 36, 36, 36, 11: 36, 14: 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 42: 36, 36, 36, 47: 36, 36, 36, 36},
+		{35, 35, 35, 35, 35, 35, 35, 35, 35, 11: 35, 14: 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 42: 35, 35, 35, 47: 35, 35, 35, 35},
+		{34, 34, 34, 34, 34, 34, 34, 34, 34, 11: 34, 14: 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 42: 34, 34, 34, 47: 34, 34, 34, 34},
+		// 70
+		{33, 33, 33, 33, 33, 33, 33, 33, 33, 11: 33, 14: 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 42: 33, 33, 33, 47: 33, 33, 33, 33},
+		{32, 32, 32, 32, 32, 32, 32, 32, 32, 11: 32, 14: 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 42: 32, 32, 32, 47: 32, 32, 32, 32},
+		{31, 31, 31, 31, 31, 31, 31, 31, 31, 11: 31, 14: 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 42: 31, 31, 31, 47: 31, 31, 31, 31},
+		{30, 30, 30, 30, 30, 30, 30, 30, 30, 11: 30, 14: 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 42: 30, 30, 30, 47: 30, 30, 30, 30},
+		{29, 29, 29, 29, 29, 29, 29, 29, 29, 11: 29, 14: 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 42: 29, 29, 29, 47: 29, 29, 29, 29},
+		// 75
+		{28, 28, 28, 28, 28, 28, 28, 28, 28, 11: 28, 14: 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 42: 28, 28, 28, 47: 28, 28, 28, 28},
+		{27, 27, 27, 27, 27, 27, 27, 27, 27, 11: 27, 14: 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 42: 27, 27, 27, 47: 27, 27, 27, 27},
+		{26, 26, 26, 26, 26, 26, 26, 26, 26, 11: 26, 14: 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 42: 26, 26, 26, 47: 26, 26, 26, 26},
+		{25, 25, 25, 25, 25, 25, 25, 25, 25, 11: 25, 14: 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 42: 25, 25, 25, 47: 25, 25, 25, 25},
+		{24, 24, 24, 24, 24, 24, 24, 24, 24, 11: 24, 14: 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 42: 24, 24, 24, 47: 24, 24, 24, 24},
+		// 80
+		{23, 23, 23, 23, 23, 23, 23, 23, 23, 11: 23, 14: 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 42: 23, 23, 23, 47: 23, 23, 23, 23},
+		{22, 22, 22, 22, 22, 22, 22, 22, 22, 11: 22, 14: 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 42: 22, 22, 22, 47: 22, 22, 22, 22},
+		{21, 21, 21, 21, 21, 21, 21, 21, 21, 11: 21, 14: 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 42: 21, 21, 21, 47: 21, 21, 21, 21},
+		{20, 20, 20, 20, 20, 20, 20, 20, 20, 11: 20, 14: 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 42: 20, 20, 20, 47: 20, 20, 20, 20},
+		{19, 19, 19, 19, 19, 19, 19, 19, 19, 11: 19, 14: 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 42: 19, 19, 19, 47: 19, 19, 19, 19},
+		// 85
+		{18, 18, 18, 18, 18, 18, 18, 18, 18, 11: 18, 14: 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 42: 18, 18, 18, 47: 18, 18, 18, 18},
+		{17, 17, 17, 17, 17, 17, 17, 17, 17, 11: 17, 14: 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 42: 17, 17, 17, 47: 17, 17, 17, 17},
+		{16, 16, 16, 16, 16, 16, 16, 16, 16, 11: 16, 14: 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 42: 16, 16, 16, 47: 16, 16, 16, 16},
+		{15, 15, 15, 15, 15, 15, 15, 15, 15, 11: 15, 14: 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 42: 15, 15, 15, 47: 15, 15, 15, 15},
+		{14, 14, 14, 14, 14, 14, 14, 14, 14, 11: 14, 14: 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 42: 14, 14, 14, 47: 14, 14, 14, 14},
+		// 90
+		{7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 70: 259, 276, 271, 275, 346, 273},
+		{7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 70: 259, 276, 271, 275, 345, 273},
+		{7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 70: 259, 276, 271, 275, 344, 273},
+		{7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 70: 259, 276, 271, 275, 310, 273},
+		{6, 6, 6, 6, 6, 6, 6, 311, 9: 6, 6, 6, 6, 6, 41: 6, 44: 6, 6, 6, 51: 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 76: 6, 78: 6, 6, 6, 6, 6, 6, 86: 312, 103: 315, 105: 313, 314},
+		// 95
+		{2: 204, 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 335, 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 336, 155: 334},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 56: 317, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 316},
+		{116, 116, 116, 116, 116, 116, 116, 116, 9: 116, 116, 116, 116, 116, 41: 116, 44: 116, 116, 116, 51: 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 76: 116, 78: 116, 116, 116, 116, 116, 116, 86: 116},
+		{115, 115, 115, 115, 115, 115, 115, 115, 9: 115, 115, 115, 115, 115, 41: 115, 44: 115, 115, 115, 51: 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 76: 115, 78: 115, 115, 115, 115, 115, 115, 86: 115},
+		{114, 114, 114, 114, 114, 114, 114, 114, 9: 114, 114, 114, 114, 114, 41: 114, 44: 114, 114, 114, 51: 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 76: 114, 78: 114, 114, 114, 114, 114, 114, 86: 114},
+		// 100
+		{45: 322, 321, 54: 329, 56: 330, 91: 320},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 54: 319, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 318},
+		{45: 322, 321, 54: 323, 91: 320},
+		{64, 64, 64, 64, 64, 64, 64, 64, 9: 64, 64, 64, 64, 64, 41: 64, 44: 64, 64, 64, 51: 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 76: 64, 78: 64, 64, 64, 64, 64, 64, 86: 64},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 324},
+		// 105
+		{3: 168, 168, 168, 7: 168, 168, 14: 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 42: 168, 168, 47: 168, 168, 168, 168},
+		{3: 167, 167, 167, 7: 167, 167, 14: 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 42: 167, 167, 47: 167, 167, 167, 167},
+		{63, 63, 63, 63, 63, 63, 63, 63, 9: 63, 63, 63, 63, 63, 41: 63, 44: 63, 63, 63, 51: 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 76: 63, 78: 63, 63, 63, 63, 63, 63, 86: 63},
+		{169, 169, 169, 6: 169, 9: 169, 169, 169, 169, 169, 41: 169, 45: 169, 169, 51: 169, 169, 169, 169, 169, 169, 327, 326, 150: 325},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 328, 262},
+		// 110
+		{3: 40, 40, 40, 7: 40, 40, 14: 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 42: 40, 40, 47: 40, 40, 40, 40},
+		{3: 39, 39, 39, 7: 39, 39, 14: 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 42: 39, 39, 47: 39, 39, 39, 39},
+		{41, 41, 41, 6: 41, 9: 41, 41, 41, 41, 41, 41: 41, 45: 41, 41, 51: 41, 41, 41, 41, 41, 41, 41, 41},
+		{140, 140, 140, 140, 140, 140, 140, 140, 9: 140, 140, 140, 140, 140, 41: 140, 44: 140, 140, 140, 51: 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 76: 140, 78: 140, 140, 140, 140, 140, 140, 86: 140},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 54: 332, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 331},
+		// 115
+		{45: 322, 321, 54: 333, 91: 320},
+		{62, 62, 62, 62, 62, 62, 62, 62, 9: 62, 62, 62, 62, 62, 41: 62, 44: 62, 62, 62, 51: 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 76: 62, 78: 62, 62, 62, 62, 62, 62, 86: 62},
+		{61, 61, 61, 61, 61, 61, 61, 61, 9: 61, 61, 61, 61, 61, 41: 61, 44: 61, 61, 61, 51: 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 76: 61, 78: 61, 61, 61, 61, 61, 61, 86: 61},
+		{2: 343},
+		{2: 342},
+		// 120
+		{2: 203},
+		{165, 165, 165, 6: 165, 9: 165, 165, 45: 322, 321, 52: 165, 165, 91: 320, 166: 338},
+		{2, 2, 2, 6: 340, 9: 2, 2, 52: 2, 2, 98: 339},
+		{166, 166, 166, 9: 166, 166, 52: 166, 166},
+		{1, 1, 1, 309, 308, 306, 7: 274, 280, 1, 1, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 52: 1, 1, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 341},
+		// 125
+		{164, 164, 164, 6: 164, 9: 164, 164, 45: 322, 321, 52: 164, 164, 91: 320},
+		{205, 205, 205, 205, 205, 205, 205, 205, 9: 205, 205, 205, 205, 205, 41: 205, 44: 205, 205, 205, 51: 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 76: 205, 78: 205, 205, 205, 205, 205, 205, 86: 205},
+		{206, 206, 206, 206, 206, 206, 206, 206, 9: 206, 206, 206, 206, 206, 41: 206, 44: 206, 206, 206, 51: 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 76: 206, 78: 206, 206, 206, 206, 206, 206, 86: 206},
+		{7, 7, 7, 7, 7, 7, 7, 311, 9: 7, 7, 7, 7, 7, 41: 7, 44: 7, 7, 7, 51: 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 76: 7, 78: 7, 7, 7, 7, 7, 7, 86: 312, 103: 315, 105: 313, 314},
+		{8, 8, 8, 8, 8, 8, 8, 311, 9: 8, 8, 8, 8, 8, 41: 8, 44: 8, 8, 8, 51: 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 76: 8, 78: 8, 8, 8, 8, 8, 8, 86: 312, 103: 315, 105: 313, 314},
+		// 130
+		{9, 9, 9, 9, 9, 9, 9, 311, 9: 9, 9, 9, 9, 9, 41: 9, 44: 9, 9, 9, 51: 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 76: 9, 78: 9, 9, 9, 9, 9, 9, 86: 312, 103: 315, 105: 313, 314},
+		{8: 348},
+		{99, 99, 99, 99, 99, 99, 99, 99, 9: 99, 99, 99, 99, 99, 41: 99, 44: 99, 99, 99, 51: 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 76: 99, 78: 99, 99, 99, 99, 99, 99, 86: 99},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 362},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 361},
+		// 135
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 360},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 359},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 358},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 357},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 356},
+		// 140
+		{101, 101, 101, 101, 101, 101, 101, 9: 101, 101, 101, 101, 101, 41: 101, 44: 101, 101, 101, 51: 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 76: 101, 78: 101, 101, 101, 101, 101, 101},
+		{102, 102, 102, 102, 102, 102, 102, 9: 102, 102, 102, 102, 102, 41: 102, 44: 102, 102, 102, 51: 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 76: 102, 78: 102, 102, 102, 102, 102, 102},
+		{103, 103, 103, 103, 103, 103, 103, 9: 103, 103, 103, 103, 103, 41: 103, 44: 103, 103, 103, 51: 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 76: 103, 78: 103, 103, 103, 103, 103, 103},
+		{104, 104, 104, 104, 104, 104, 104, 9: 104, 104, 104, 104, 104, 41: 104, 44: 104, 104, 104, 51: 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 76: 104, 78: 104, 104, 104, 104, 104, 104},
+		{105, 105, 105, 105, 105, 105, 105, 9: 105, 105, 105, 105, 105, 41: 105, 44: 105, 105, 105, 51: 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 76: 105, 78: 105, 105, 105, 105, 105, 105},
+		// 145
+		{106, 106, 106, 106, 106, 106, 106, 9: 106, 106, 106, 106, 106, 41: 106, 44: 106, 106, 106, 51: 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 76: 106, 78: 106, 106, 106, 106, 106, 106},
+		{107, 107, 107, 107, 107, 107, 107, 9: 107, 107, 107, 107, 107, 41: 107, 44: 107, 107, 107, 51: 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 76: 107, 78: 107, 107, 107, 107, 107, 107},
+		{2: 364, 45: 322, 321, 91: 320},
+		{123, 123, 123, 123, 123, 123, 123, 123, 9: 123, 123, 123, 123, 123, 41: 123, 44: 123, 123, 123, 51: 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 76: 123, 78: 123, 123, 123, 123, 123, 123, 86: 123},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 372},
+		// 150
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 371},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 370},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 369},
+		{109, 109, 109, 109, 109, 109, 109, 9: 109, 109, 109, 109, 109, 41: 109, 44: 109, 109, 109, 51: 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 76: 355, 78: 353, 350, 354, 349, 351, 352},
+		{110, 110, 110, 110, 110, 110, 110, 9: 110, 110, 110, 110, 110, 41: 110, 44: 110, 110, 110, 51: 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 76: 355, 78: 353, 350, 354, 349, 351, 352},
+		// 155
+		{111, 111, 111, 111, 111, 111, 111, 9: 111, 111, 111, 111, 111, 41: 111, 44: 111, 111, 111, 51: 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 76: 355, 78: 353, 350, 354, 349, 351, 352},
+		{112, 112, 112, 112, 112, 112, 112, 9: 112, 112, 112, 112, 112, 41: 112, 44: 112, 112, 112, 51: 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 76: 355, 78: 353, 350, 354, 349, 351, 352},
+		{7: 409},
+		{60: 398, 397},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 394},
+		// 160
+		{14: 391, 44: 392},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 390},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 389},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 388},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 387},
+		// 165
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 386},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 385},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 384},
+		{147, 147, 147, 368, 367, 365, 147, 9: 147, 147, 147, 147, 147, 41: 147, 44: 147, 147, 147, 51: 147, 147, 147, 147, 147, 147, 147, 147, 366, 147, 147, 147, 147, 147, 147, 147, 147, 147, 147},
+		{148, 148, 148, 368, 367, 365, 148, 9: 148, 148, 148, 148, 148, 41: 148, 44: 148, 148, 148, 51: 148, 148, 148, 148, 148, 148, 148, 148, 366, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148},
+		// 170
+		{149, 149, 149, 368, 367, 365, 149, 9: 149, 149, 149, 149, 149, 41: 149, 44: 149, 149, 149, 51: 149, 149, 149, 149, 149, 149, 149, 149, 366, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149},
+		{150, 150, 150, 368, 367, 365, 150, 9: 150, 150, 150, 150, 150, 41: 150, 44: 150, 150, 150, 51: 150, 150, 150, 150, 150, 150, 150, 150, 366, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150},
+		{151, 151, 151, 368, 367, 365, 151, 9: 151, 151, 151, 151, 151, 41: 151, 44: 151, 151, 151, 51: 151, 151, 151, 151, 151, 151, 151, 151, 366, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151},
+		{152, 152, 152, 368, 367, 365, 152, 9: 152, 152, 152, 152, 152, 41: 152, 44: 152, 152, 152, 51: 152, 152, 152, 152, 152, 152, 152, 152, 366, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152},
+		{153, 153, 153, 368, 367, 365, 153, 9: 153, 153, 153, 153, 153, 41: 153, 44: 153, 153, 153, 51: 153, 153, 153, 153, 153, 153, 153, 153, 366, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153},
+		// 175
+		{156, 156, 156, 6: 156, 9: 156, 156, 156, 156, 156, 41: 156, 45: 156, 156, 51: 156, 156, 156, 156, 156, 156, 156, 156},
+		{14: 393},
+		{155, 155, 155, 6: 155, 9: 155, 155, 155, 155, 155, 41: 155, 45: 155, 155, 51: 155, 155, 155, 155, 155, 155, 155, 155},
+		{3: 368, 367, 365, 57: 395, 59: 366},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 396},
+		// 180
+		{158, 158, 158, 368, 367, 365, 158, 9: 158, 158, 158, 158, 158, 41: 158, 45: 158, 158, 51: 158, 158, 158, 158, 158, 158, 158, 158, 366},
+		{7: 402},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 399},
+		{3: 368, 367, 365, 57: 400, 59: 366},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 401},
+		// 185
+		{157, 157, 157, 368, 367, 365, 157, 9: 157, 157, 157, 157, 157, 41: 157, 45: 157, 157, 51: 157, 157, 157, 157, 157, 157, 157, 157, 366},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 96: 229, 99: 403, 101: 404},
+		{2: 408},
+		{406, 2: 95, 136: 405},
+		{2: 407},
+		// 190
+		{2: 94},
+		{159, 159, 159, 6: 159, 9: 159, 159, 159, 159, 159, 41: 159, 45: 159, 159, 51: 159, 159, 159, 159, 159, 159, 159, 159},
+		{161, 161, 161, 6: 161, 9: 161, 161, 161, 161, 161, 41: 161, 45: 161, 161, 51: 161, 161, 161, 161, 161, 161, 161, 161},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 96: 229, 99: 410, 101: 411},
+		{2: 414},
+		// 195
+		{406, 2: 95, 136: 412},
+		{2: 413},
+		{160, 160, 160, 6: 160, 9: 160, 160, 160, 160, 160, 41: 160, 45: 160, 160, 51: 160, 160, 160, 160, 160, 160, 160, 160},
+		{162, 162, 162, 6: 162, 9: 162, 162, 162, 162, 162, 41: 162, 45: 162, 162, 51: 162, 162, 162, 162, 162, 162, 162, 162},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 416},
+		// 200
+		{2: 417, 45: 322, 321, 91: 320},
+		{192, 192, 192, 192, 192, 192, 192, 192, 9: 192, 192, 192, 192, 192, 41: 192, 44: 192, 192, 192, 51: 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 76: 192, 78: 192, 192, 192, 192, 192, 192, 86: 192},
+		{2, 2, 6: 420, 13: 2, 98: 419},
+		{210, 210, 13: 210},
+		{1, 1, 8: 254, 13: 1, 92: 252, 145: 421},
+		// 205
+		{208, 208, 6: 208, 13: 208},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 423},
+		{211, 211, 6: 211, 13: 211, 45: 322, 321, 91: 320},
+		{8: 248, 97: 425},
+		{38, 38},
+		// 210
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 432, 279, 84: 278, 263, 87: 281, 262, 260, 428, 149: 429, 168: 430, 183: 431},
+		{3: 74, 74, 74, 7: 74, 74, 14: 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 42: 74, 74, 47: 74, 74, 74, 74, 76: 74},
+		{6: 145, 45: 322, 321, 51: 145, 55: 489, 91: 320, 167: 488},
+		{6: 143, 51: 143},
+		{6: 486, 51: 72},
+		// 215
+		{51: 433},
+		{51: 73},
+		{7: 436, 435, 132: 437, 434, 181: 438},
+		{93, 93, 93, 6: 93, 9: 93, 93, 12: 93, 93, 41: 93, 55: 484, 93: 93, 93, 93, 100: 93, 180: 483},
+		{97, 97, 97, 6: 97, 9: 97, 97, 12: 97, 97, 41: 97, 55: 97, 93: 97, 97, 97, 100: 97},
+		// 220
+		{96: 229, 101: 480},
+		{91, 91, 91, 6: 91, 9: 91, 91, 12: 91, 91, 41: 91, 93: 91, 91, 91},
+		{2, 2, 2, 6: 439, 9: 2, 2, 12: 2, 2, 41: 2, 93: 2, 2, 2, 98: 440},
+		{1, 1, 1, 7: 436, 435, 1, 1, 12: 1, 1, 41: 1, 93: 1, 1, 1, 132: 479, 434},
+		{82, 82, 82, 9: 82, 82, 12: 82, 82, 41: 82, 93: 443, 441, 442, 173: 445, 446, 444},
+		// 225
+		{102: 88, 111: 88},
+		{102: 87, 111: 87},
+		{102: 86, 111: 86},
+		{102: 85, 111: 473, 178: 474},
+		{81, 81, 81, 9: 81, 81, 12: 81, 81, 41: 81},
+		// 230
+		{70, 70, 70, 9: 70, 70, 12: 70, 258, 41: 70, 142: 448, 188: 447},
+		{68, 68, 68, 9: 68, 68, 12: 68, 41: 449, 169: 451, 184: 450},
+		{69, 69, 69, 9: 69, 69, 12: 69, 41: 69},
+		{146: 466},
+		{66, 66, 66, 9: 66, 66, 12: 452, 176: 454, 187: 453},
+		// 235
+		{67, 67, 67, 9: 67, 67, 12: 67},
+		{146: 461},
+		{79, 79, 79, 9: 79, 456, 185: 455},
+		{65, 65, 65, 9: 65, 65},
+		{77, 77, 77, 9: 459, 186: 458},
+		// 240
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 457},
+		{78, 78, 78, 9: 78, 45: 322, 321, 91: 320},
+		{80, 80, 80},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 460},
+		{76, 76, 76, 45: 322, 321, 91: 320},
+		// 245
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 462},
+		{121, 121, 121, 9: 121, 121, 52: 464, 465, 177: 463},
+		{122, 122, 122, 9: 122, 122},
+		{120, 120, 120, 9: 120, 120},
+		{119, 119, 119, 9: 119, 119},
+		// 250
+		{8: 254, 92: 467, 147: 468},
+		{199, 199, 199, 6: 199, 9: 199, 199, 12: 199, 157: 469},
+		{141, 141, 141, 9: 141, 141, 12: 141},
+		{2, 2, 2, 6: 471, 9: 2, 2, 12: 2, 98: 470},
+		{200, 200, 200, 9: 200, 200, 12: 200},
+		// 255
+		{1, 1, 1, 8: 254, 1, 1, 12: 1, 92: 472},
+		{198, 198, 198, 6: 198, 9: 198, 198, 12: 198},
+		{102: 84},
+		{102: 475},
+		{7: 436, 435, 132: 476, 434},
+		// 260
+		{100: 477},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 478},
+		{83, 83, 83, 9: 83, 83, 12: 83, 83, 41: 83, 45: 322, 321, 91: 320},
+		{90, 90, 90, 6: 90, 9: 90, 90, 12: 90, 90, 41: 90, 93: 90, 90, 90},
+		{406, 2: 95, 136: 481},
+		// 265
+		{2: 482},
+		{96, 96, 96, 6: 96, 9: 96, 96, 12: 96, 96, 41: 96, 55: 96, 93: 96, 96, 96, 100: 96},
+		{98, 98, 98, 6: 98, 9: 98, 98, 12: 98, 98, 41: 98, 93: 98, 98, 98, 100: 98},
+		{8: 485},
+		{92, 92, 92, 6: 92, 9: 92, 92, 12: 92, 92, 41: 92, 93: 92, 92, 92, 100: 92},
+		// 270
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 71, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 428, 149: 487},
+		{6: 142, 51: 142},
+		{6: 146, 51: 146},
+		{8: 490},
+		{6: 144, 51: 144},
+		// 275
+		{8: 248, 97: 492},
+		{7: 494, 96: 137, 113: 137, 170: 493},
+		{96: 229, 101: 498, 113: 497},
+		{8: 254, 92: 467, 147: 495},
+		{2: 496},
+		// 280
+		{96: 136, 113: 136},
+		{7: 499},
+		{138, 138},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 500},
+		{2: 501},
+		// 285
+		{135, 135, 6: 135, 171: 502},
+		{2, 2, 6: 504, 98: 503},
+		{139, 139},
+		{1, 1, 7: 505},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 506},
+		// 290
+		{2: 507},
+		{134, 134, 6: 134},
+		{171, 171},
+		{8: 176, 109: 516, 165: 515},
+		{8: 248, 97: 511, 109: 512},
+		// 295
+		{174, 174},
+		{108: 513},
+		{8: 248, 97: 514},
+		{173, 173},
+		{8: 518},
+		// 300
+		{108: 517},
+		{8: 175},
+		{177, 177},
+		{8: 248, 97: 520},
+		{179, 179, 13: 258, 142: 521},
+		// 305
+		{178, 178},
+		{110: 553},
+		{110: 187},
+		{8: 248, 97: 525, 109: 526},
+		{7: 548},
+		// 310
+		{44: 527},
+		{108: 528},
+		{8: 248, 97: 529},
+		{7: 530},
+		{8: 254, 92: 531, 107: 532},
+		// 315
+		{15: 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 70: 538},
+		{2: 184, 6: 184, 148: 533},
+		{2: 2, 6: 535, 98: 534},
+		{2: 537},
+		{2: 1, 8: 254, 92: 531, 107: 536},
+		// 320
+		{2: 183, 6: 183},
+		{185, 185},
+		{194, 194, 194, 309, 308, 306, 194, 274, 280, 11: 194, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 540, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 541, 158: 542, 539},
+		{181, 181, 181, 6: 181, 11: 545, 162: 546, 544},
+		{14: 543},
+		// 325
+		{195, 195, 195, 6: 195, 11: 195, 45: 322, 321, 91: 320},
+		{193, 193, 193, 6: 193, 11: 193},
+		{196, 196, 196, 6: 196, 11: 196},
+		{202, 202, 202, 6: 202},
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 547},
+		// 330
+		{180, 180, 180, 6: 180},
+		{182, 182, 182, 6: 182, 45: 322, 321, 91: 320},
+		{8: 254, 92: 531, 107: 549},
+		{2: 184, 6: 184, 148: 550},
+		{2: 2, 6: 535, 98: 551},
+		// 335
+		{2: 552},
+		{186, 186},
+		{8: 190, 109: 555, 160: 554},
+		{8: 558},
+		{44: 556},
+		// 340
+		{108: 557},
+		{8: 189},
+		{100: 559},
+		{8: 560},
+		{7: 561},
+		// 345
+		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 562},
+		{2: 563},
+		{191, 191},
+		{207, 207},
+		{8: 248, 97: 566},
+		// 350
+		{104: 568, 144: 567},
+		{8: 254, 92: 531, 107: 571},
+		{156: 569},
+		{8: 254, 92: 570},
+		{212, 212},
+		// 355
+		{213, 213},
+		{1: 214, 45: 322, 321, 91: 320},
+		{172, 172, 96: 229, 101: 242, 104: 225, 114: 220, 231, 221, 232, 222, 233, 223, 234, 235, 236, 224, 237, 238, 230, 226, 239, 227, 240, 134: 228, 241, 137: 574, 246, 243, 247, 244},
+		{44, 44},
+	}
+)
+
+var yyDebug = 0
+
+type yyLexer interface {
+	Lex(lval *yySymType) int
+	Error(s string)
+}
+
+type yyLexerEx interface {
+	yyLexer
+	Reduced(rule, state int, lval *yySymType) bool
+}
+
+func yySymName(c int) (s string) {
+	x, ok := yyXLAT[c]
+	if ok {
+		return yySymNames[x]
+	}
+
+	return __yyfmt__.Sprintf("%d", c)
+}
+
+func yylex1(yylex yyLexer, lval *yySymType) (n int) {
+	n = yylex.Lex(lval)
+	if n <= 0 {
+		n = yyEOFCode
+	}
+	if yyDebug >= 3 {
+		__yyfmt__.Printf("\nlex %s(%#x %d), lval: %+v\n", yySymName(n), n, n, lval)
+	}
+	return n
+}
+
+func yyParse(yylex yyLexer) int {
+	const yyError = 196
+
+	yyEx, _ := yylex.(yyLexerEx)
+	var yyn int
+	var yylval yySymType
+	var yyVAL yySymType
+	yyS := make([]yySymType, 200)
+
+	Nerrs := 0   /* number of errors */
+	Errflag := 0 /* error recovery flag */
+	yyerrok := func() {
+		if yyDebug >= 2 {
+			__yyfmt__.Printf("yyerrok()\n")
+		}
+		Errflag = 0
+	}
+	_ = yyerrok
+	yystate := 0
+	yychar := -1
+	var yyxchar int
+	var yyshift int
+	yyp := -1
+	goto yystack
+
+ret0:
+	return 0
+
+ret1:
+	return 1
+
+yystack:
+	/* put a state and value onto the stack */
+	yyp++
+	if yyp >= len(yyS) {
+		nyys := make([]yySymType, len(yyS)*2)
+		copy(nyys, yyS)
+		yyS = nyys
+	}
+	yyS[yyp] = yyVAL
+	yyS[yyp].yys = yystate
+
+yynewstate:
+	if yychar < 0 {
+		yychar = yylex1(yylex, &yylval)
+		var ok bool
+		if yyxchar, ok = yyXLAT[yychar]; !ok {
+			yyxchar = len(yySymNames) // > tab width
+		}
+	}
+	if yyDebug >= 4 {
+		var a []int
+		for _, v := range yyS[:yyp+1] {
+			a = append(a, v.yys)
+		}
+		__yyfmt__.Printf("state stack %v\n", a)
+	}
+	row := yyParseTab[yystate]
+	yyn = 0
+	if yyxchar < len(row) {
+		if yyn = int(row[yyxchar]); yyn != 0 {
+			yyn += yyTabOfs
+		}
+	}
+	switch {
+	case yyn > 0: // shift
+		yychar = -1
+		yyVAL = yylval
+		yystate = yyn
+		yyshift = yyn
+		if yyDebug >= 2 {
+			__yyfmt__.Printf("shift, and goto state %d\n", yystate)
+		}
+		if Errflag > 0 {
+			Errflag--
+		}
+		goto yystack
+	case yyn < 0: // reduce
+	case yystate == 1: // accept
+		if yyDebug >= 2 {
+			__yyfmt__.Println("accept")
+		}
+		goto ret0
+	}
+
+	if yyn == 0 {
+		/* error ... attempt to resume parsing */
+		switch Errflag {
+		case 0: /* brand new error */
+			if yyDebug >= 1 {
+				__yyfmt__.Printf("no action for %s in state %d\n", yySymName(yychar), yystate)
+			}
+			msg, ok := yyXErrors[yyXError{yystate, yyxchar}]
+			if !ok {
+				msg, ok = yyXErrors[yyXError{yystate, -1}]
+			}
+			if !ok && yyshift != 0 {
+				msg, ok = yyXErrors[yyXError{yyshift, yyxchar}]
+			}
+			if !ok {
+				msg, ok = yyXErrors[yyXError{yyshift, -1}]
+			}
+			if !ok || msg == "" {
+				msg = "syntax error"
+			}
+			yylex.Error(msg)
+			Nerrs++
+			fallthrough
+
+		case 1, 2: /* incompletely recovered error ... try again */
+			Errflag = 3
+
+			/* find a state where "error" is a legal shift action */
+			for yyp >= 0 {
+				row := yyParseTab[yyS[yyp].yys]
+				if yyError < len(row) {
+					yyn = int(row[yyError]) + yyTabOfs
+					if yyn > 0 { // hit
+						if yyDebug >= 2 {
+							__yyfmt__.Printf("error recovery found error shift in state %d\n", yyS[yyp].yys)
+						}
+						yystate = yyn /* simulate a shift of "error" */
+						goto yystack
+					}
+				}
+
+				/* the current p has no shift on "error", pop stack */
+				if yyDebug >= 2 {
+					__yyfmt__.Printf("error recovery pops state %d\n", yyS[yyp].yys)
+				}
+				yyp--
+			}
+			/* there is no state on the stack with an error shift ... abort */
+			if yyDebug >= 2 {
+				__yyfmt__.Printf("error recovery failed\n")
+			}
+			goto ret1
+
+		case 3: /* no shift yet; clobber input char */
+			if yyDebug >= 2 {
+				__yyfmt__.Printf("error recovery discards %s\n", yySymName(yychar))
+			}
+			if yychar == yyEOFCode {
+				goto ret1
+			}
+
+			yychar = -1
+			goto yynewstate /* try again in the same state */
+		}
+	}
+
+	r := -yyn
+	x0 := yyReductions[r]
+	x, n := x0.xsym, x0.components
+	yypt := yyp
+	_ = yypt // guard against "declared and not used"
+
+	yyp -= n
+	if yyp+1 >= len(yyS) {
+		nyys := make([]yySymType, len(yyS)*2)
+		copy(nyys, yyS)
+		yyS = nyys
+	}
+	yyVAL = yyS[yyp+1]
+
+	/* consult goto table to find next state */
+	exState := yystate
+	yystate = int(yyParseTab[yyS[yyp].yys][x]) + yyTabOfs
+	/* reduction by production r */
+	if yyDebug >= 2 {
+		__yyfmt__.Printf("reduce using rule %v (%s), and goto state %d\n", r, yySymNames[x], yystate)
+	}
+
+	switch r {
+	case 2:
+		{
+			yylex.(*lexer).expr = expr(yyS[yypt-0].item)
+		}
+	case 3:
+		{
+			yyVAL.item = &alterTableAddStmt{tableName: yyS[yypt-2].item.(string), c: yyS[yypt-0].item.(*col)}
+		}
+	case 4:
+		{
+			yyVAL.item = &alterTableDropColumnStmt{tableName: yyS[yypt-3].item.(string), colName: yyS[yypt-0].item.(string)}
+		}
+	case 5:
+		{
+			yyVAL.item = assignment{colName: yyS[yypt-2].item.(string), expr: expr(yyS[yypt-0].item)}
+		}
+	case 6:
+		{
+			yyVAL.item = append([]assignment{yyS[yypt-2].item.(assignment)}, yyS[yypt-1].item.([]assignment)...)
+		}
+	case 7:
+		{
+			yyVAL.item = []assignment{}
+		}
+	case 8:
+		{
+			yyVAL.item = append(yyS[yypt-2].item.([]assignment), yyS[yypt-0].item.(assignment))
+		}
+	case 9:
+		{
+			yyVAL.item = beginTransactionStmt{}
+		}
+	case 10:
+		{
+			yyVAL.item = yyS[yypt-1].item
+		}
+	case 11:
+		{
+			yyVAL.item = '*'
+		}
+	case 12:
+		{
+			yyVAL.item = []expression{}
+		}
+	case 14:
+		{
+			x := &col{name: yyS[yypt-3].item.(string), typ: yyS[yypt-2].item.(int), constraint: yyS[yypt-1].item.(*constraint)}
+			if yyS[yypt-0].item != nil {
+				x.dflt = expr(yyS[yypt-0].item)
+			}
+			yyVAL.item = x
+		}
+	case 16:
+		{
+			yyVAL.item = append([]string{yyS[yypt-2].item.(string)}, yyS[yypt-1].item.([]string)...)
+		}
+	case 17:
+		{
+			yyVAL.item = []string{}
+		}
+	case 18:
+		{
+			yyVAL.item = append(yyS[yypt-2].item.([]string), yyS[yypt-0].item.(string))
+		}
+	case 19:
+		{
+			yyVAL.item = commitStmt{}
+		}
+	case 20:
+		{
+			yyVAL.item = &constraint{}
+		}
+	case 21:
+		{
+			yyVAL.item = &constraint{expr(yyS[yypt-0].item)}
+		}
+	case 22:
+		{
+			yyVAL.item = (*constraint)(nil)
+		}
+	case 24:
+		{
+			yyVAL.item = &conversion{typ: yyS[yypt-3].item.(int), val: expr(yyS[yypt-1].item)}
+		}
+	case 25:
+		{
+			indexName, tableName, exprList := yyS[yypt-5].item.(string), yyS[yypt-3].item.(string), yyS[yypt-1].item.([]expression)
+			simpleIndex := len(exprList) == 1
+			var columnName string
+			if simpleIndex {
+				expr := exprList[0]
+				switch x := expr.(type) {
+				case *ident:
+					columnName = x.s
+				case *call:
+					if x.f == "id" && len(x.arg) == 0 {
+						columnName = "id()"
+						break
+					}
+
+					simpleIndex = false
+				default:
+					simpleIndex = false
+				}
+			}
+
+			if !simpleIndex {
+				columnName = ""
+			}
+			yyVAL.item = &createIndexStmt{unique: yyS[yypt-8].item.(bool), ifNotExists: yyS[yypt-6].item.(bool), indexName: indexName, tableName: tableName, colName: columnName, exprList: exprList}
+
+			if indexName == tableName || indexName == columnName {
+				yylex.(*lexer).err("index name collision: %s", indexName)
+				return 1
+			}
+
+			if yylex.(*lexer).root {
+				break
+			}
+
+			if isSystemName[indexName] || isSystemName[tableName] {
+				yylex.(*lexer).err("name is used for system tables: %s", indexName)
+				return 1
+			}
+		}
+	case 26:
+		{
+			yyVAL.item = false
+		}
+	case 27:
+		{
+			yyVAL.item = true
+		}
+	case 28:
+		{
+			yyVAL.item = false
+		}
+	case 29:
+		{
+			yyVAL.item = true
+		}
+	case 30:
+		{
+			nm := yyS[yypt-5].item.(string)
+			yyVAL.item = &createTableStmt{tableName: nm, cols: append([]*col{yyS[yypt-3].item.(*col)}, yyS[yypt-2].item.([]*col)...)}
+
+			if yylex.(*lexer).root {
+				break
+			}
+
+			if isSystemName[nm] {
+				yylex.(*lexer).err("name is used for system tables: %s", nm)
+				return 1
+			}
+		}
+	case 31:
+		{
+			nm := yyS[yypt-5].item.(string)
+			yyVAL.item = &createTableStmt{ifNotExists: true, tableName: nm, cols: append([]*col{yyS[yypt-3].item.(*col)}, yyS[yypt-2].item.([]*col)...)}
+
+			if yylex.(*lexer).root {
+				break
+			}
+
+			if isSystemName[nm] {
+				yylex.(*lexer).err("name is used for system tables: %s", nm)
+				return 1
+			}
+		}
+	case 32:
+		{
+			yyVAL.item = []*col{}
+		}
+	case 33:
+		{
+			yyVAL.item = append(yyS[yypt-2].item.([]*col), yyS[yypt-0].item.(*col))
+		}
+	case 34:
+		{
+			yyVAL.item = yyS[yypt-0].item
+		}
+	case 35:
+		{
+			yyVAL.item = nil
+		}
+	case 37:
+		{
+			yyVAL.item = &truncateTableStmt{yyS[yypt-0].item.(string)}
+
+			if yylex.(*lexer).root {
+				break
+			}
+
+			if isSystemName[yyS[yypt-0].item.(string)] {
+				yylex.(*lexer).err("name is used for system tables: %s", yyS[yypt-0].item.(string))
+				return 1
+			}
+		}
+	case 38:
+		{
+			yyVAL.item = &deleteStmt{tableName: yyS[yypt-1].item.(string), where: yyS[yypt-0].item.(*whereRset).expr}
+
+			if yylex.(*lexer).root {
+				break
+			}
+
+			if isSystemName[yyS[yypt-1].item.(string)] {
+				yylex.(*lexer).err("name is used for system tables: %s", yyS[yypt-1].item.(string))
+				return 1
+			}
+		}
+	case 39:
+		{
+			yyVAL.item = &dropIndexStmt{ifExists: yyS[yypt-1].item.(bool), indexName: yyS[yypt-0].item.(string)}
+		}
+	case 40:
+		{
+			yyVAL.item = false
+		}
+	case 41:
+		{
+			yyVAL.item = true
+		}
+	case 42:
+		{
+			nm := yyS[yypt-0].item.(string)
+			yyVAL.item = &dropTableStmt{tableName: nm}
+
+			if yylex.(*lexer).root {
+				break
+			}
+
+			if isSystemName[nm] {
+				yylex.(*lexer).err("name is used for system tables: %s", nm)
+				return 1
+			}
+		}
+	case 43:
+		{
+			nm := yyS[yypt-0].item.(string)
+			yyVAL.item = &dropTableStmt{ifExists: true, tableName: nm}
+
+			if yylex.(*lexer).root {
+				break
+			}
+
+			if isSystemName[nm] {
+				yylex.(*lexer).err("name is used for system tables: %s", nm)
+				return 1
+			}
+		}
+	case 44:
+		{
+			yyVAL.item = nil
+		}
+	case 45:
+		{
+			yyVAL.item = &explainStmt{yyS[yypt-0].item.(stmt)}
+		}
+	case 47:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation(oror, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 50:
+		{
+			yyVAL.item = append([]expression{expr(yyS[yypt-2].item)}, yyS[yypt-1].item.([]expression)...)
+		}
+	case 51:
+		{
+			yyVAL.item = []expression(nil)
+		}
+	case 52:
+		{
+			yyVAL.item = append(yyS[yypt-2].item.([]expression), expr(yyS[yypt-0].item))
+		}
+	case 54:
+		{
+			yyVAL.item = &pIn{expr: yyS[yypt-4].item.(expression), list: yyS[yypt-1].item.([]expression)}
+		}
+	case 55:
+		{
+			yyVAL.item = &pIn{expr: yyS[yypt-5].item.(expression), not: true, list: yyS[yypt-1].item.([]expression)}
+		}
+	case 56:
+		{
+			yyVAL.item = &pIn{expr: yyS[yypt-5].item.(expression), sel: yyS[yypt-2].item.(*selectStmt)}
+		}
+	case 57:
+		{
+			yyVAL.item = &pIn{expr: yyS[yypt-6].item.(expression), not: true, sel: yyS[yypt-2].item.(*selectStmt)}
+		}
+	case 58:
+		{
+			var err error
+			if yyVAL.item, err = newBetween(yyS[yypt-4].item, yyS[yypt-2].item, yyS[yypt-0].item, false); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 59:
+		{
+			var err error
+			if yyVAL.item, err = newBetween(yyS[yypt-5].item, yyS[yypt-2].item, yyS[yypt-0].item, true); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 60:
+		{
+			yyVAL.item = &isNull{expr: yyS[yypt-2].item.(expression)}
+		}
+	case 61:
+		{
+			yyVAL.item = &isNull{expr: yyS[yypt-3].item.(expression), not: true}
+		}
+	case 63:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation(ge, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 64:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation('>', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 65:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation(le, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 66:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation('<', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 67:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation(neq, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 68:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation(eq, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 69:
+		{
+			yyVAL.item = &pLike{expr: yyS[yypt-2].item.(expression), pattern: yyS[yypt-0].item.(expression)}
+		}
+	case 70:
+		{
+			expr, name := expr(yyS[yypt-1].item), yyS[yypt-0].item.(string)
+			if name == "" {
+				s, ok := expr.(*ident)
+				if ok {
+					name = s.s
+				}
+			}
+			yyVAL.item = &fld{expr: expr, name: name}
+		}
+	case 71:
+		{
+			yyVAL.item = ""
+		}
+	case 72:
+		{
+			yyVAL.item = yyS[yypt-0].item
+		}
+	case 73:
+		{
+			yyVAL.item = []*fld{yyS[yypt-0].item.(*fld)}
+		}
+	case 74:
+		{
+			l, f := yyS[yypt-2].item.([]*fld), yyS[yypt-0].item.(*fld)
+			if f.name != "" {
+				if f := findFld(l, f.name); f != nil {
+					yylex.(*lexer).err("duplicate field name %q", f.name)
+					return 1
+				}
+			}
+
+			yyVAL.item = append(yyS[yypt-2].item.([]*fld), yyS[yypt-0].item.(*fld))
+		}
+	case 75:
+		{
+			yyVAL.item = &groupByRset{colNames: yyS[yypt-0].item.([]string)}
+		}
+	case 76:
+		{
+			yyVAL.item = yyS[yypt-1].item
+		}
+	case 77:
+		{
+			yyVAL.item = &insertIntoStmt{tableName: yyS[yypt-7].item.(string), colNames: yyS[yypt-6].item.([]string), lists: append([][]expression{yyS[yypt-3].item.([]expression)}, yyS[yypt-1].item.([][]expression)...)}
+
+			if yylex.(*lexer).root {
+				break
+			}
+
+			if isSystemName[yyS[yypt-7].item.(string)] {
+				yylex.(*lexer).err("name is used for system tables: %s", yyS[yypt-7].item.(string))
+				return 1
+			}
+		}
+	case 78:
+		{
+			yyVAL.item = &insertIntoStmt{tableName: yyS[yypt-2].item.(string), colNames: yyS[yypt-1].item.([]string), sel: yyS[yypt-0].item.(*selectStmt)}
+		}
+	case 79:
+		{
+			yyVAL.item = []string{}
+		}
+	case 80:
+		{
+			yyVAL.item = yyS[yypt-1].item
+		}
+	case 81:
+		{
+			yyVAL.item = [][]expression{}
+		}
+	case 82:
+		{
+			yyVAL.item = append(yyS[yypt-4].item.([][]expression), yyS[yypt-1].item.([]expression))
+		}
+	case 90:
+		{
+			yyVAL.item = value{yyS[yypt-0].item}
+		}
+	case 91:
+		{
+			n := yyS[yypt-0].item.(int)
+			yyVAL.item = parameter{n}
+			l := yylex.(*lexer)
+			l.params = mathutil.Max(l.params, n)
+			if n == 0 {
+				l.err("parameter number must be non zero")
+				return 1
+			}
+		}
+	case 92:
+		{
+			yyVAL.item = &ident{yyS[yypt-0].item.(string)}
+		}
+	case 93:
+		{
+			yyVAL.item = &pexpr{expr: expr(yyS[yypt-1].item)}
+		}
+	case 94:
+		{
+			yyVAL.item = &orderByRset{by: yyS[yypt-1].item.([]expression), asc: yyS[yypt-0].item.(bool)}
+		}
+	case 95:
+		{
+			yyVAL.item = true // ASC by default
+		}
+	case 96:
+		{
+			yyVAL.item = true
+		}
+	case 97:
+		{
+			yyVAL.item = false
+		}
+	case 100:
+		{
+			var err error
+			if yyVAL.item, err = newIndex(yyS[yypt-1].item.(expression), expr(yyS[yypt-0].item)); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 101:
+		{
+			var err error
+			s := yyS[yypt-0].item.([2]*expression)
+			if yyVAL.item, err = newSlice(yyS[yypt-1].item.(expression), s[0], s[1]); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 102:
+		{
+			x := yylex.(*lexer)
+			f, ok := yyS[yypt-1].item.(*ident)
+			if !ok {
+				x.err("expected identifier or qualified identifier")
+				return 1
+			}
+
+			if r, ok := yyS[yypt-0].item.(rune); ok {
+				if f.isQualified() || f.s != "count" || r != '*' {
+					x.err(fmt.Sprintf("invalid expression %s(%c)", f, r))
+					return 1
+				}
+
+				yyS[yypt-0].item = []expression(nil)
+			}
+
+			var err error
+			var agg bool
+			if yyVAL.item, agg, err = newCall(f.s, yyS[yypt-0].item.([]expression)); err != nil {
+				x.err("%v", err)
+				return 1
+			}
+			if n := len(x.agg); n > 0 {
+				x.agg[n-1] = x.agg[n-1] || agg
+			}
+		}
+	case 104:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation('^', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 105:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation('|', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 106:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation('-', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 107:
+		{
+			var err error
+			yyVAL.item, err = newBinaryOperation('+', yyS[yypt-2].item, yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 109:
+		{
+			var err error
+			yyVAL.item, err = newBinaryOperation(andnot, yyS[yypt-2].item, yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 110:
+		{
+			var err error
+			yyVAL.item, err = newBinaryOperation('&', yyS[yypt-2].item, yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 111:
+		{
+			var err error
+			yyVAL.item, err = newBinaryOperation(lsh, yyS[yypt-2].item, yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 112:
+		{
+			var err error
+			yyVAL.item, err = newBinaryOperation(rsh, yyS[yypt-2].item, yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 113:
+		{
+			var err error
+			yyVAL.item, err = newBinaryOperation('%', yyS[yypt-2].item, yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 114:
+		{
+			var err error
+			yyVAL.item, err = newBinaryOperation('/', yyS[yypt-2].item, yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 115:
+		{
+			var err error
+			yyVAL.item, err = newBinaryOperation('*', yyS[yypt-2].item, yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 117:
+		{
+			yyVAL.item = fmt.Sprintf("%s.%s", yyS[yypt-2].item.(string), yyS[yypt-0].item.(string))
+		}
+	case 118:
+		{
+			yyVAL.item = []interface{}{yyS[yypt-1].item, yyS[yypt-0].item}
+		}
+	case 120:
+		{
+			yyVAL.item = yyS[yypt-2].item
+		}
+	case 123:
+		{
+			yyVAL.item = ""
+		}
+	case 124:
+		{
+			yyVAL.item = yyS[yypt-0].item
+		}
+	case 125:
+		{
+			yyVAL.list = []interface{}{yyS[yypt-0].item}
+		}
+	case 126:
+		{
+			yyVAL.list = append(yyS[yypt-2].list, yyS[yypt-0].item)
+		}
+	case 127:
+		{
+			yyVAL.item = rollbackStmt{}
+		}
+	case 128:
+		{
+			yyVAL.item = leftJoin
+		}
+	case 129:
+		{
+			yyVAL.item = rightJoin
+		}
+	case 130:
+		{
+			yyVAL.item = fullJoin
+		}
+	case 131:
+		{
+			yyVAL.item = nil
+		}
+	case 133:
+		{
+			yyVAL.item = []interface{}{yyS[yypt-5].item, yyS[yypt-2].item, yyS[yypt-0].item}
+		}
+	case 134:
+		{
+			yyVAL.item = nil
+		}
+	case 136:
+		{
+			x := yylex.(*lexer)
+			n := len(x.agg)
+			join := &joinRset{sources: yyS[yypt-7].list}
+			if o := yyS[yypt-5].item; o != nil {
+				o := o.([]interface{})
+				join.typ = o[0].(int)
+				join.sources = append(join.sources, o[1].([]interface{}))
+				join.on = o[2].(expression)
+			}
+			yyVAL.item = &selectStmt{
+				distinct:      yyS[yypt-10].item.(bool),
+				flds:          yyS[yypt-9].item.([]*fld),
+				from:          join,
+				hasAggregates: x.agg[n-1],
+				where:         yyS[yypt-4].item.(*whereRset),
+				group:         yyS[yypt-3].item.(*groupByRset),
+				order:         yyS[yypt-2].item.(*orderByRset),
+				limit:         yyS[yypt-1].item.(*limitRset),
+				offset:        yyS[yypt-0].item.(*offsetRset),
+			}
+			x.agg = x.agg[:n-1]
+		}
+	case 137:
+		{
+			yyVAL.item = (*limitRset)(nil)
+		}
+	case 138:
+		{
+			yyVAL.item = &limitRset{expr: expr(yyS[yypt-0].item)}
+		}
+	case 139:
+		{
+			yyVAL.item = (*offsetRset)(nil)
+		}
+	case 140:
+		{
+			yyVAL.item = &offsetRset{expr: expr(yyS[yypt-0].item)}
+		}
+	case 141:
+		{
+			yyVAL.item = false
+		}
+	case 142:
+		{
+			yyVAL.item = true
+		}
+	case 143:
+		{
+			yyVAL.item = []*fld{}
+		}
+	case 144:
+		{
+			yyVAL.item = yyS[yypt-0].item
+		}
+	case 145:
+		{
+			yyVAL.item = yyS[yypt-1].item
+		}
+	case 146:
+		{
+			yyVAL.item = (*whereRset)(nil)
+		}
+	case 148:
+		{
+			yyVAL.item = (*groupByRset)(nil)
+		}
+	case 150:
+		{
+			yyVAL.item = (*orderByRset)(nil)
+		}
+	case 152:
+		{
+			yyVAL.item = [2]*expression{nil, nil}
+		}
+	case 153:
+		{
+			hi := expr(yyS[yypt-1].item)
+			yyVAL.item = [2]*expression{nil, &hi}
+		}
+	case 154:
+		{
+			lo := expr(yyS[yypt-2].item)
+			yyVAL.item = [2]*expression{&lo, nil}
+		}
+	case 155:
+		{
+			lo := expr(yyS[yypt-3].item)
+			hi := expr(yyS[yypt-1].item)
+			yyVAL.item = [2]*expression{&lo, &hi}
+		}
+	case 171:
+		{
+			if yyS[yypt-0].item != nil {
+				yylex.(*lexer).list = []stmt{yyS[yypt-0].item.(stmt)}
+			}
+		}
+	case 172:
+		{
+			if yyS[yypt-0].item != nil {
+				yylex.(*lexer).list = append(yylex.(*lexer).list, yyS[yypt-0].item.(stmt))
+			}
+		}
+	case 175:
+		{
+			var err error
+			if yyVAL.item, err = newBinaryOperation(andand, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 178:
+		{
+			yyVAL.item = &truncateTableStmt{tableName: yyS[yypt-0].item.(string)}
+		}
+	case 203:
+		{
+			var expr expression
+			if w := yyS[yypt-0].item; w != nil {
+				expr = w.(*whereRset).expr
+			}
+			yyVAL.item = &updateStmt{tableName: yyS[yypt-3].item.(string), list: yyS[yypt-1].item.([]assignment), where: expr}
+
+			if yylex.(*lexer).root {
+				break
+			}
+
+			if isSystemName[yyS[yypt-3].item.(string)] {
+				yylex.(*lexer).err("name is used for system tables: %s", yyS[yypt-3].item.(string))
+				return 1
+			}
+		}
+	case 204:
+		{
+			yyVAL.item = nil
+		}
+	case 207:
+		{
+			var err error
+			yyVAL.item, err = newUnaryOperation('^', yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 208:
+		{
+			var err error
+			yyVAL.item, err = newUnaryOperation('!', yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 209:
+		{
+			var err error
+			yyVAL.item, err = newUnaryOperation('-', yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 210:
+		{
+			var err error
+			yyVAL.item, err = newUnaryOperation('+', yyS[yypt-0].item)
+			if err != nil {
+				yylex.(*lexer).err("%v", err)
+				return 1
+			}
+		}
+	case 211:
+		{
+			yyVAL.item = &whereRset{expr: expr(yyS[yypt-0].item)}
+		}
+
+	}
+
+	if yyEx != nil && yyEx.Reduced(r, exState, &yyVAL) {
+		return -1
+	}
+	goto yystack /* stack new state and value */
+}
+
+func expr(v interface{}) expression {
+	e := v.(expression)
+	for {
+		x, ok := e.(*pexpr)
+		if !ok {
+			return e
+		}
+		e = x.expr
+	}
+}
diff --git a/vendor/github.com/cznic/ql/plan.go b/vendor/github.com/cznic/ql/plan.go
new file mode 100644
index 0000000000..be52b72c6a
--- /dev/null
+++ b/vendor/github.com/cznic/ql/plan.go
@@ -0,0 +1,2800 @@
+// Copyright 2015 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+
+	"github.com/cznic/b"
+	"github.com/cznic/strutil"
+)
+
+const (
+	_               = iota
+	indexEq         // [L]
+	indexFalse      // [false]
+	indexGe         // [L, ...)
+	indexGt         // (L, ...)
+	indexIsNotNull  // (NULL, ...)
+	indexIsNull     // [NULL]
+	indexIntervalCC // [L, H]
+	indexIntervalCO // [L, H)
+	indexIntervalOC // (L, H]
+	indexIntervalOO // (L, H)
+	indexLe         // (..., H]
+	indexLt         // (..., H)
+	indexNe         // (L)
+	indexTrue       // [true]
+)
+
+// Note: All plans must have a pointer receiver. Enables planA == planB operation.
+var (
+	_ plan = (*crossJoinDefaultPlan)(nil)
+	_ plan = (*distinctDefaultPlan)(nil)
+	_ plan = (*explainDefaultPlan)(nil)
+	_ plan = (*filterDefaultPlan)(nil)
+	_ plan = (*fullJoinDefaultPlan)(nil)
+	_ plan = (*groupByDefaultPlan)(nil)
+	_ plan = (*indexPlan)(nil)
+	_ plan = (*leftJoinDefaultPlan)(nil)
+	_ plan = (*limitDefaultPlan)(nil)
+	_ plan = (*nullPlan)(nil)
+	_ plan = (*offsetDefaultPlan)(nil)
+	_ plan = (*orderByDefaultPlan)(nil)
+	_ plan = (*rightJoinDefaultPlan)(nil)
+	_ plan = (*selectFieldsDefaultPlan)(nil)
+	_ plan = (*selectFieldsGroupPlan)(nil)
+	_ plan = (*selectIndexDefaultPlan)(nil)
+	_ plan = (*sysColumnDefaultPlan)(nil)
+	_ plan = (*sysIndexDefaultPlan)(nil)
+	_ plan = (*sysTableDefaultPlan)(nil)
+	_ plan = (*tableDefaultPlan)(nil)
+	_ plan = (*tableNilPlan)(nil)
+)
+
+type plan interface {
+	do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error
+	explain(w strutil.Formatter)
+	fieldNames() []string
+	filter(expr expression) (p plan, indicesSought []string, err error)
+	hasID() bool
+}
+
+func isTableOrIndex(p plan) bool {
+	switch p.(type) {
+	case
+		*indexPlan,
+		*sysColumnDefaultPlan,
+		*sysIndexDefaultPlan,
+		*sysTableDefaultPlan,
+		*tableDefaultPlan:
+		return true
+	default:
+		return false
+	}
+}
+
+// Invariants
+// - All interval plans produce rows in ascending index value collating order.
+// - L <= H
+type indexPlan struct {
+	src   *table
+	cname string
+	xname string
+	x     btreeIndex
+	kind  int         // See interval* consts.
+	lval  interface{} // L, H: Ordered and comparable (lldb perspective).
+	hval  interface{}
+}
+
+func (r *indexPlan) doGe(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ...
+	// ---  ---  ---  ---  ---  +  +  +++  +++  +++
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{r.lval})
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		_, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doGt(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ...
+	// ---  ---  ---  ---  ---  -  -  +++  +++  +++
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{r.lval})
+	if err != nil {
+		return noEOF(err)
+	}
+
+	var ok bool
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		if !ok {
+			val, err := expand1(k[0], nil)
+			if err != nil {
+				return err
+			}
+
+			if collate1(val, r.lval) == 0 {
+				continue
+			}
+
+			ok = true
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doInterval00(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ..., H-1, H-1, H, H, H+1, H+1, ...
+	// ---  ---  ---  ---  ---  -  -  +++  +++  +++  +++  +++  -  -  ---  ---  ---
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{r.lval})
+	if err != nil {
+		return noEOF(err)
+	}
+
+	var ok bool
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		if !ok {
+			val, err := expand1(k[0], nil)
+			if err != nil {
+				return err
+			}
+
+			if collate1(val, r.lval) == 0 {
+				continue
+			}
+
+			ok = true
+		}
+
+		val, err := expand1(k[0], nil)
+		if err != nil {
+			return err
+		}
+
+		if collate1(val, r.hval) == 0 {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doIntervalOC(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ..., H-1, H-1, H, H, H+1, H+1, ...
+	// ---  ---  ---  ---  ---  -  -  +++  +++  +++  +++  +++  +  +  ---  ---  ---
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{r.lval})
+	if err != nil {
+		return noEOF(err)
+	}
+
+	var ok bool
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		if !ok {
+			val, err := expand1(k[0], nil)
+			if err != nil {
+				return err
+			}
+
+			if collate1(val, r.lval) == 0 {
+				continue
+			}
+
+			ok = true
+		}
+
+		val, err := expand1(k[0], nil)
+		if err != nil {
+			return err
+		}
+
+		if collate1(val, r.hval) > 0 {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doIntervalCC(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ..., H-1, H-1, H, H, H+1, H+1, ...
+	// ---  ---  ---  ---  ---  +  +  +++  +++  +++  +++  +++  +  +  ---  ---  ---
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{r.lval})
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		val, err := expand1(k[0], nil)
+		if err != nil {
+			return err
+		}
+
+		if collate1(val, r.hval) > 0 {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doIntervalCO(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ..., H-1, H-1, H, H, H+1, H+1, ...
+	// ---  ---  ---  ---  ---  +  +  +++  +++  +++  +++  +++  -  -  ---  ---  ---
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{r.lval})
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		val, err := expand1(k[0], nil)
+		if err != nil {
+			return err
+		}
+
+		if collate1(val, r.hval) >= 0 {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doLe(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., H-1, H-1, H, H, H+1, H+1, ...
+	// ---  ---  +++  +++  +++  +  +  ---  ---
+	t := r.src
+	it, err := r.x.SeekFirst()
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		if k == nil || k[0] == nil {
+			continue
+		}
+
+		val, err := expand1(k[0], nil)
+		if err != nil {
+			return err
+		}
+
+		if collate1(val, r.hval) > 0 {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doLt(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., H-1, H-1, H, H, H+1, H+1, ...
+	// ---  ---  +++  +++  +++  -  -  ---  ---
+	t := r.src
+	it, err := r.x.SeekFirst()
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		if k == nil || k[0] == nil {
+			continue
+		}
+
+		val, err := expand1(k[0], nil)
+		if err != nil {
+			return err
+		}
+
+		if collate1(val, r.hval) >= 0 {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doEq(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ...
+	// ---  ---  ---  ---  ---  +  +  ---  ---  ---
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{r.lval})
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		val, err := expand1(k[0], nil)
+		if err != nil {
+			return err
+		}
+
+		if collate1(val, r.lval) != 0 {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doNe(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ...
+	// ---  ---  +++  +++  +++  -  -  +++  +++  +++
+	t := r.src
+	it, err := r.x.SeekFirst()
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		if k == nil || k[0] == nil {
+			continue
+		}
+
+		val, err := expand1(k[0], nil)
+		if err != nil {
+			return err
+		}
+
+		if collate1(val, r.hval) == 0 {
+			continue
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doIsNull(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ...
+	// +++  +++  ---
+	t := r.src
+	it, err := r.x.SeekFirst()
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		if k != nil && k[0] != nil {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doIsNotNull(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	// nil, nil, ...
+	// ---  ---  +++
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{false}) // lldb collates false right after NULL.
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		_, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doFalse(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{false})
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		b, ok := k[0].(bool)
+		if !ok || b {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) doTrue(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	t := r.src
+	it, _, err := r.x.Seek([]interface{}{true})
+	if err != nil {
+		return noEOF(err)
+	}
+
+	for {
+		k, h, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		if _, ok := k[0].(bool); !ok {
+			return nil
+		}
+
+		id, data, err := t.row(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		if more, err := f(id, data); err != nil || !more {
+			return err
+		}
+	}
+}
+
+func (r *indexPlan) do(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
+	switch r.kind {
+	case indexEq:
+		return r.doEq(ctx, f)
+	case indexGe:
+		return r.doGe(ctx, f)
+	case indexGt:
+		return r.doGt(ctx, f)
+	case indexLe:
+		return r.doLe(ctx, f)
+	case indexLt:
+		return r.doLt(ctx, f)
+	case indexNe:
+		return r.doNe(ctx, f)
+	case indexIsNull:
+		return r.doIsNull(ctx, f)
+	case indexIsNotNull:
+		return r.doIsNotNull(ctx, f)
+	case indexFalse:
+		return r.doFalse(ctx, f)
+	case indexTrue:
+		return r.doTrue(ctx, f)
+	case indexIntervalOO:
+		return r.doInterval00(ctx, f)
+	case indexIntervalCC:
+		return r.doIntervalCC(ctx, f)
+	case indexIntervalOC:
+		return r.doIntervalOC(ctx, f)
+	case indexIntervalCO:
+		return r.doIntervalCO(ctx, f)
+	default:
+		//dbg("", r.kind)
+		panic("internal error 072")
+	}
+}
+
+func (r *indexPlan) explain(w strutil.Formatter) {
+	s := ""
+	if r.kind == indexFalse {
+		s = "!"
+	}
+	w.Format("┌Iterate all rows of table %q using index %q where %s%s", r.src.name, r.xname, s, r.cname)
+	switch r.kind {
+	case indexEq:
+		w.Format(" == %v", value{r.lval})
+	case indexGe:
+		w.Format(" >= %v", value{r.lval})
+	case indexGt:
+		w.Format(" > %v", value{r.lval})
+	case indexLe:
+		w.Format(" <= %v", value{r.hval})
+	case indexLt:
+		w.Format(" < %v", value{r.hval})
+	case indexNe:
+		w.Format(" != %v", value{r.lval})
+	case indexIsNull:
+		w.Format(" IS NULL")
+	case indexIsNotNull:
+		w.Format(" IS NOT NULL")
+	case indexFalse, indexTrue:
+		// nop
+	case indexIntervalOO:
+		w.Format(" > %v && %s < %v", value{r.lval}, r.cname, value{r.hval})
+	case indexIntervalCC:
+		w.Format(" >= %v && %s <= %v", value{r.lval}, r.cname, value{r.hval})
+	case indexIntervalCO:
+		w.Format(" >= %v && %s < %v", value{r.lval}, r.cname, value{r.hval})
+	case indexIntervalOC:
+		w.Format(" > %v && %s <= %v", value{r.lval}, r.cname, value{r.hval})
+	default:
+		//dbg("", r.kind)
+		panic("internal error 073")
+	}
+	w.Format("\n└Output field names %v\n", qnames(r.fieldNames()))
+}
+
+func (r *indexPlan) fieldNames() []string { return r.src.fieldNames() }
+
+func (r *indexPlan) filterEq(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(r.lval, val) == 0 {
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case ge:
+		if collate1(r.lval, val) >= 0 {
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case '>':
+		if collate1(r.lval, val) > 0 {
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case le:
+		if collate1(r.lval, val) <= 0 {
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case '<':
+		if collate1(r.lval, val) < 0 {
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case neq:
+		if collate1(r.lval, val) != 0 {
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filterGe(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(r.lval, val) <= 0 {
+			r.lval = val
+			r.kind = indexEq
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case ge:
+		if collate1(r.lval, val) < 0 {
+			r.lval = val
+		}
+		return r, nil, nil
+	case '>':
+		if collate1(r.lval, val) <= 0 {
+			r.lval = val
+			r.kind = indexGt
+		}
+		return r, nil, nil
+	case le:
+		switch c := collate1(r.lval, val); {
+		case c < 0:
+			r.hval = val
+			r.kind = indexIntervalCC
+			return r, nil, nil
+		case c == 0:
+			r.kind = indexEq
+			return r, nil, nil
+		default: // c > 0
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+	case '<':
+		if collate1(r.lval, val) < 0 {
+			r.hval = val
+			r.kind = indexIntervalCO
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case neq:
+		switch c := collate1(r.lval, val); {
+		case c < 0:
+			//MAYBE ORed intervals
+		case c == 0:
+			r.kind = indexGt
+			return r, nil, nil
+		default: // c > 0
+			return r, nil, nil
+		}
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filterGt(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(r.lval, val) < 0 {
+			r.lval = val
+			r.kind = indexEq
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case ge:
+		if collate1(r.lval, val) < 0 {
+			r.lval = val
+			r.kind = indexGe
+		}
+		return r, nil, nil
+	case '>':
+		if collate1(r.lval, val) < 0 {
+			r.lval = val
+		}
+		return r, nil, nil
+	case le:
+		if collate1(r.lval, val) < 0 {
+			r.hval = val
+			r.kind = indexIntervalOC
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case '<':
+		if collate1(r.lval, val) < 0 {
+			r.hval = val
+			r.kind = indexIntervalOO
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case neq:
+		if collate1(r.lval, val) >= 0 {
+			return r, nil, nil
+		}
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filterLe(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(r.hval, val) >= 0 {
+			r.lval = val
+			r.kind = indexEq
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case ge:
+		switch c := collate1(r.hval, val); {
+		case c < 0:
+			return &nullPlan{r.fieldNames()}, nil, nil
+		case c == 0:
+			r.lval = val
+			r.kind = indexEq
+			return r, nil, nil
+		default: // c > 0
+			r.lval = val
+			r.kind = indexIntervalCC
+			return r, nil, nil
+		}
+	case '>':
+		if collate1(r.hval, val) > 0 {
+			r.lval = val
+			r.kind = indexIntervalOC
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case le:
+		if collate1(r.hval, val) > 0 {
+			r.hval = val
+		}
+		return r, nil, nil
+	case '<':
+		if collate1(r.hval, val) >= 0 {
+			r.hval = val
+			r.kind = indexLt
+		}
+		return r, nil, nil
+	case neq:
+		switch c := collate1(r.hval, val); {
+		case c < 0:
+			return r, nil, nil
+		case c == 0:
+			r.kind = indexLt
+			return r, nil, nil
+		default: // c > 0
+			//bop
+		}
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filterLt(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(r.hval, val) > 0 {
+			r.lval = val
+			r.kind = indexEq
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case ge:
+		if collate1(r.hval, val) > 0 {
+			r.lval = val
+			r.kind = indexIntervalCO
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case '>':
+		if collate1(r.hval, val) > 0 {
+			r.lval = val
+			r.kind = indexIntervalOO
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case le:
+		if collate1(r.hval, val) > 0 {
+			r.hval = val
+			r.kind = indexLe
+		}
+		return r, nil, nil
+	case '<':
+		if collate1(r.hval, val) > 0 {
+			r.hval = val
+		}
+		return r, nil, nil
+	case neq:
+		if collate1(r.hval, val) > 0 {
+			return nil, nil, nil
+		}
+
+		return r, nil, nil
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filterCC(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(val, r.lval) < 0 || collate1(val, r.hval) > 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		r.lval = val
+		r.kind = indexEq
+		return r, nil, nil
+	case ge:
+		if collate1(val, r.lval) <= 0 {
+			return r, nil, nil
+		}
+
+		switch c := collate1(val, r.hval); {
+		case c < 0:
+			r.lval = val
+			return r, nil, nil
+		case c == 0:
+			r.lval = val
+			r.kind = indexEq
+			return r, nil, nil
+		default:
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+	case '>':
+		switch c := collate1(val, r.lval); {
+		case c < 0:
+			return r, nil, nil
+		case c == 0:
+			r.kind = indexIntervalOC
+			return r, nil, nil
+		default:
+			if collate1(val, r.hval) < 0 {
+				r.lval = val
+				r.kind = indexIntervalOC
+				return r, nil, nil
+			}
+
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+	case le:
+		switch c := collate1(val, r.lval); {
+		case c < 0:
+			return &nullPlan{r.fieldNames()}, nil, nil
+		case c == 0:
+			r.kind = indexEq
+			return r, nil, nil
+		default:
+			if collate1(val, r.hval) < 0 {
+				r.hval = val
+			}
+			return r, nil, nil
+		}
+	case '<':
+		if collate1(val, r.lval) <= 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		if collate1(val, r.hval) <= 0 {
+			r.hval = val
+			r.kind = indexIntervalCO
+		}
+		return r, nil, nil
+	case neq:
+		switch c := collate1(val, r.lval); {
+		case c < 0:
+			return r, nil, nil
+		case c == 0:
+			r.kind = indexIntervalOC
+			return r, nil, nil
+		default:
+			switch c := collate1(val, r.hval); {
+			case c == 0:
+				r.kind = indexIntervalCO
+				return r, nil, nil
+			case c > 0:
+				return r, nil, nil
+			default:
+				return nil, nil, nil
+			}
+		}
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filterOC(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(val, r.lval) <= 0 || collate1(val, r.hval) > 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		r.lval = val
+		r.kind = indexEq
+		return r, nil, nil
+	case ge:
+		if collate1(val, r.lval) <= 0 {
+			return r, nil, nil
+		}
+
+		switch c := collate1(val, r.hval); {
+		case c < 0:
+			r.lval = val
+			r.kind = indexIntervalCC
+			return r, nil, nil
+		case c == 0:
+			r.lval = val
+			r.kind = indexEq
+			return r, nil, nil
+		default:
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+	case '>':
+		if collate1(val, r.lval) <= 0 {
+			return r, nil, nil
+		}
+
+		if collate1(val, r.hval) < 0 {
+			r.lval = val
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case le:
+		if collate1(val, r.lval) <= 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		if collate1(val, r.hval) < 0 {
+			r.hval = val
+		}
+		return r, nil, nil
+	case '<':
+		if collate1(val, r.lval) <= 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		switch c := collate1(val, r.hval); {
+		case c < 0:
+			r.hval = val
+			r.kind = indexIntervalOO
+		case c == 0:
+			r.kind = indexIntervalOO
+		}
+		return r, nil, nil
+	case neq:
+		if collate1(val, r.lval) <= 0 {
+			return r, nil, nil
+		}
+
+		switch c := collate1(val, r.hval); {
+		case c < 0:
+			return nil, nil, nil
+		case c == 0:
+			r.kind = indexIntervalOO
+			return r, nil, nil
+		default:
+			return r, nil, nil
+		}
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filterOO(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(val, r.lval) <= 0 || collate1(val, r.hval) >= 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		r.lval = val
+		r.kind = indexEq
+		return r, nil, nil
+	case ge:
+		if collate1(val, r.lval) <= 0 {
+			return r, nil, nil
+		}
+
+		if collate1(val, r.hval) < 0 {
+			r.lval = val
+			r.kind = indexIntervalCO
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case '>':
+		if collate1(val, r.lval) <= 0 {
+			return r, nil, nil
+		}
+
+		if collate1(val, r.hval) < 0 {
+			r.lval = val
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case le:
+		if collate1(val, r.lval) <= 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		if collate1(val, r.hval) < 0 {
+			r.hval = val
+			r.kind = indexIntervalOC
+		}
+		return r, nil, nil
+	case '<':
+		if collate1(val, r.lval) <= 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		if collate1(val, r.hval) < 0 {
+			r.hval = val
+		}
+		return r, nil, nil
+	case neq:
+		if collate1(val, r.lval) <= 0 || collate1(val, r.hval) >= 0 {
+			return r, nil, nil
+		}
+
+		return nil, nil, nil
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filterCO(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(val, r.lval) < 0 || collate1(val, r.hval) >= 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		r.lval = val
+		r.kind = indexEq
+		return r, nil, nil
+	case ge:
+		if collate1(val, r.lval) <= 0 {
+			return r, nil, nil
+		}
+
+		if collate1(val, r.hval) < 0 {
+			r.lval = val
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case '>':
+		switch c := collate1(val, r.lval); {
+		case c < 0:
+			return r, nil, nil
+		case c == 0:
+			r.kind = indexIntervalOO
+			return r, nil, nil
+		default:
+			if collate1(val, r.hval) < 0 {
+				r.lval = val
+				r.kind = indexIntervalOO
+				return r, nil, nil
+			}
+
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+	case le:
+		switch c := collate1(val, r.lval); {
+		case c < 0:
+			return &nullPlan{r.fieldNames()}, nil, nil
+		case c == 0:
+			r.kind = indexEq
+			return r, nil, nil
+		default:
+			if collate1(val, r.hval) < 0 {
+				r.hval = val
+				r.kind = indexIntervalCC
+			}
+			return r, nil, nil
+		}
+	case '<':
+		if collate1(val, r.lval) <= 0 {
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+
+		if collate1(val, r.hval) < 0 {
+			r.hval = val
+		}
+		return r, nil, nil
+	case neq:
+		switch c := collate1(val, r.lval); {
+		case c < 0:
+			return r, nil, nil
+		case c == 0:
+			r.kind = indexIntervalOO
+			return r, nil, nil
+		default:
+			if collate1(val, r.hval) < 0 {
+				return nil, nil, nil
+			}
+
+			return r, nil, nil
+		}
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filterNe(binOp2 int, val interface{}) (plan, []string, error) {
+	switch binOp2 {
+	case eq:
+		if collate1(val, r.lval) != 0 {
+			r.lval = val
+			r.kind = indexEq
+			return r, nil, nil
+		}
+
+		return &nullPlan{r.fieldNames()}, nil, nil
+	case ge:
+		switch c := collate1(val, r.lval); {
+		case c < 0:
+			return nil, nil, nil //TODO
+		case c == 0:
+			r.kind = indexGt
+			return r, nil, nil
+		default:
+			r.lval = val
+			r.kind = indexGe
+			return r, nil, nil
+		}
+	case '>':
+		if collate1(val, r.lval) < 0 {
+			return nil, nil, nil //TODO
+		}
+
+		r.lval = val
+		r.kind = indexGt
+		return r, nil, nil
+	case le:
+		switch c := collate1(val, r.lval); {
+		case c < 0:
+			r.hval = val
+			r.kind = indexLe
+			return r, nil, nil
+		case c == 0:
+			r.kind = indexLt
+			return r, nil, nil
+		default:
+			return nil, nil, nil //TODO
+		}
+	case '<':
+		if collate1(val, r.lval) <= 0 {
+			r.hval = val
+			r.kind = indexLt
+			return r, nil, nil
+		}
+
+		return nil, nil, nil //TODO
+	case neq:
+		if collate1(val, r.lval) == 0 {
+			return r, nil, nil
+		}
+
+		return nil, nil, nil
+	}
+	return nil, nil, nil
+}
+
+func (r *indexPlan) filter(expr expression) (plan, []string, error) {
+	switch x := expr.(type) {
+	case *binaryOperation:
+		ok, cname, val, err := x.isIdentRelOpVal()
+		if err != nil {
+			return nil, nil, err
+		}
+
+		if !ok || r.cname != cname {
+			break
+		}
+
+		if val, err = typeCheck1(val, findCol(r.src.cols, cname)); err != nil {
+			return nil, nil, err
+		}
+
+		switch r.kind {
+		case indexEq: // [L]
+			return r.filterEq(x.op, val)
+		case indexGe: // [L, ...)
+			return r.filterGe(x.op, val)
+		case indexGt: // (L, ...)
+			return r.filterGt(x.op, val)
+		case indexIntervalCC: // [L, H]
+			return r.filterCC(x.op, val)
+		case indexIntervalCO: // [L, H)
+			return r.filterCO(x.op, val)
+		case indexIntervalOC: // (L, H]
+			return r.filterOC(x.op, val)
+		case indexIntervalOO: // (L, H)
+			return r.filterOO(x.op, val)
+		case indexLe: // (..., H]
+			return r.filterLe(x.op, val)
+		case indexLt: // (..., H)
+			return r.filterLt(x.op, val)
+		case indexNe: // (L)
+			return r.filterNe(x.op, val)
+		}
+	case *ident:
+		cname := x.s
+		if r.cname != cname {
+			break
+		}
+
+		switch r.kind {
+		case indexFalse: // [false]
+			return &nullPlan{r.fieldNames()}, nil, nil
+		case indexTrue: // [true]
+			return r, nil, nil
+		}
+	case *unaryOperation:
+		if x.op != '!' {
+			break
+		}
+
+		operand, ok := x.v.(*ident)
+		if !ok {
+			break
+		}
+
+		cname := operand.s
+		if r.cname != cname {
+			break
+		}
+
+		switch r.kind {
+		case indexFalse: // [false]
+			return r, nil, nil
+		case indexTrue: // [true]
+			return &nullPlan{r.fieldNames()}, nil, nil
+		}
+	}
+
+	return nil, nil, nil
+}
+
+func (r *indexPlan) hasID() bool { return true }
+
+type explainDefaultPlan struct {
+	s stmt
+}
+
+func (r *explainDefaultPlan) hasID() bool { return false }
+
+func (r *explainDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error {
+	var buf bytes.Buffer
+	switch x := r.s.(type) {
+	default:
+		w := strutil.IndentFormatter(&buf, "│   ")
+		x.explain(ctx, w)
+	}
+
+	a := bytes.Split(buf.Bytes(), []byte{'\n'})
+	for _, v := range a[:len(a)-1] {
+		if more, err := f(nil, []interface{}{string(v)}); !more || err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (r *explainDefaultPlan) explain(w strutil.Formatter) {
+	return
+}
+
+func (r *explainDefaultPlan) fieldNames() []string {
+	return []string{""}
+}
+
+func (r *explainDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+type filterDefaultPlan struct {
+	plan
+	expr expression
+	is   []string
+}
+
+func (r *filterDefaultPlan) hasID() bool { return r.plan.hasID() }
+
+func (r *filterDefaultPlan) explain(w strutil.Formatter) {
+	r.plan.explain(w)
+	w.Format("┌Filter on %v\n", r.expr)
+	if len(r.is) != 0 {
+		w.Format("│Possibly useful indices\n")
+		m := map[string]bool{}
+		for _, v := range r.is {
+			if !m[v] {
+				m[v] = true
+				n := ""
+				for _, r := range v {
+					if r >= '0' && r <= '9' || r >= 'a' && r <= 'z' || r >= 'A' && r <= 'Z' || r == '_' {
+						n += string(r)
+						continue
+					}
+
+					n += "_"
+				}
+				for strings.Contains(n, "__") {
+					n = strings.Replace(n, "__", "_", -1)
+				}
+				for strings.HasSuffix(n, "_") {
+					n = n[:len(n)-1]
+				}
+				w.Format("│CREATE INDEX x%s ON %s;\n", n, v)
+			}
+		}
+	}
+	w.Format("└Output field names %v\n", qnames(r.plan.fieldNames()))
+}
+
+func (r *filterDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
+	m := map[interface{}]interface{}{}
+	fields := r.plan.fieldNames()
+	return r.plan.do(ctx, func(rid interface{}, data []interface{}) (bool, error) {
+		for i, v := range fields {
+			m[v] = data[i]
+		}
+		m["$id"] = rid
+		val, err := r.expr.eval(ctx, m)
+		if err != nil {
+			return false, err
+		}
+
+		if val == nil {
+			return true, nil
+		}
+
+		x, ok := val.(bool)
+		if !ok {
+			return false, fmt.Errorf("invalid boolean expression %s (value of type %T)", val, val)
+		}
+
+		if !x {
+			return true, nil
+		}
+
+		return f(rid, data)
+	})
+}
+
+type crossJoinDefaultPlan struct {
+	rsets  []plan
+	names  []string
+	fields []string
+}
+
+func (r *crossJoinDefaultPlan) hasID() bool { return false }
+
+func (r *crossJoinDefaultPlan) explain(w strutil.Formatter) {
+	w.Format("┌Compute Cartesian product of%i\n")
+	for i, v := range r.rsets {
+		sel := !isTableOrIndex(v)
+		if sel {
+			w.Format("┌Iterate all rows of virtual table %q%i\n", r.names[i])
+		}
+		v.explain(w)
+		if sel {
+			w.Format("%u└Output field names %v\n", qnames(v.fieldNames()))
+		}
+	}
+	w.Format("%u└Output field names %v\n", qnames(r.fields))
+}
+
+func (r *crossJoinDefaultPlan) filter(expr expression) (plan, []string, error) {
+	var is []string
+	for i, v := range r.names {
+		e2, err := expr.clone(nil, v)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		p2, is2, err := r.rsets[i].filter(e2)
+		is = append(is, is2...)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		if p2 != nil {
+			r.rsets[i] = p2
+			return r, is, nil
+		}
+	}
+	return nil, is, nil
+}
+
+func (r *crossJoinDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
+	if len(r.rsets) == 1 {
+		return r.rsets[0].do(ctx, f)
+	}
+
+	ids := map[string]interface{}{}
+	var g func([]interface{}, []plan, int) error
+	g = func(prefix []interface{}, rsets []plan, x int) (err error) {
+		return rsets[0].do(ctx, func(id interface{}, in []interface{}) (bool, error) {
+			ids[r.names[x]] = id
+			if len(rsets) > 1 {
+				return true, g(append(prefix, in...), rsets[1:], x+1)
+			}
+
+			return f(ids, append(prefix, in...))
+		})
+	}
+	return g(nil, r.rsets, 0)
+}
+
+func (r *crossJoinDefaultPlan) fieldNames() []string { return r.fields }
+
+type distinctDefaultPlan struct {
+	src    plan
+	fields []string
+}
+
+func (r *distinctDefaultPlan) hasID() bool { return false }
+
+func (r *distinctDefaultPlan) explain(w strutil.Formatter) {
+	r.src.explain(w)
+	w.Format("┌Compute distinct rows\n└Output field names %v\n", r.fields)
+}
+
+func (r *distinctDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *distinctDefaultPlan) fieldNames() []string { return r.fields }
+
+func (r *distinctDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
+	t, err := ctx.db.store.CreateTemp(true)
+	if err != nil {
+		return
+	}
+
+	defer func() {
+		if derr := t.Drop(); derr != nil && err == nil {
+			err = derr
+		}
+	}()
+
+	if err = r.src.do(ctx, func(id interface{}, in []interface{}) (bool, error) {
+		if err = t.Set(in, nil); err != nil {
+			return false, err
+		}
+
+		return true, nil
+	}); err != nil {
+		return
+	}
+
+	var data []interface{}
+	more := true
+	it, err := t.SeekFirst()
+	for more && err == nil {
+		data, _, err = it.Next()
+		if err != nil {
+			break
+		}
+
+		more, err = f(nil, data)
+	}
+	return noEOF(err)
+}
+
+type groupByDefaultPlan struct {
+	colNames []string
+	src      plan
+	fields   []string
+}
+
+func (r *groupByDefaultPlan) hasID() bool { return false }
+
+func (r *groupByDefaultPlan) explain(w strutil.Formatter) {
+	r.src.explain(w)
+	switch {
+	case len(r.colNames) == 0: //TODO this case should not exist for this plan, should become tableDefaultPlan
+		w.Format("┌Group by distinct rows")
+	default:
+		w.Format("┌Group by")
+		for _, v := range r.colNames {
+			w.Format(" %s,", v)
+		}
+	}
+	w.Format("\n└Output field names %v\n", qnames(r.fields))
+}
+
+func (r *groupByDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *groupByDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
+	t, err := ctx.db.store.CreateTemp(true)
+	if err != nil {
+		return
+	}
+
+	defer func() {
+		if derr := t.Drop(); derr != nil && err == nil {
+			err = derr
+		}
+	}()
+
+	var gcols []*col
+	var cols []*col
+	m := map[string]int{}
+	for i, v := range r.src.fieldNames() {
+		m[v] = i
+	}
+	for _, c := range r.colNames {
+		i, ok := m[c]
+		if !ok {
+			return fmt.Errorf("unknown field %s", c)
+		}
+
+		gcols = append(gcols, &col{name: c, index: i})
+	}
+	k := make([]interface{}, len(r.colNames)) //TODO optimize when len(r.cols) == 0, should become tableDefaultPlan
+	if err = r.src.do(ctx, func(rid interface{}, in []interface{}) (more bool, err error) {
+		infer(in, &cols)
+		for i, c := range gcols {
+			k[i] = in[c.index]
+		}
+		h0, err := t.Get(k)
+		if err != nil {
+			return false, err
+		}
+
+		var h int64
+		if len(h0) != 0 {
+			h, _ = h0[0].(int64)
+		}
+		nh, err := t.Create(append([]interface{}{h, nil}, in...)...)
+		if err != nil {
+			return false, err
+		}
+
+		for i, c := range gcols {
+			k[i] = in[c.index]
+		}
+		err = t.Set(k, []interface{}{nh})
+		if err != nil {
+			return false, err
+		}
+
+		return true, nil
+	}); err != nil {
+		return
+	}
+
+	for i, v := range r.src.fieldNames()[:len(cols)] {
+		cols[i].name = v
+		cols[i].index = i
+	}
+	if more, err := f(nil, []interface{}{t, cols}); !more || err != nil {
+		return err
+	}
+
+	it, err := t.SeekFirst()
+	more := true
+	var data []interface{}
+	for more && err == nil {
+		if _, data, err = it.Next(); err != nil {
+			break
+		}
+
+		more, err = f(nil, data)
+	}
+	return noEOF(err)
+}
+
+func (r *groupByDefaultPlan) fieldNames() []string { return r.fields }
+
+type selectIndexDefaultPlan struct {
+	nm string
+	x  interface{}
+}
+
+func (r *selectIndexDefaultPlan) hasID() bool { return false }
+
+func (r *selectIndexDefaultPlan) explain(w strutil.Formatter) {
+	w.Format("┌Iterate all values of index %q\n└Output field names N/A\n", r.nm)
+}
+
+func (r *selectIndexDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *selectIndexDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
+	var x btreeIndex
+	switch ix := r.x.(type) {
+	case *indexedCol:
+		x = ix.x
+	case *index2:
+		x = ix.x
+	default:
+		panic("internal error 007")
+	}
+
+	en, err := x.SeekFirst()
+	if err != nil {
+		return noEOF(err)
+	}
+
+	var id int64
+	for {
+		k, _, err := en.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		id++
+		if more, err := f(id, k); !more || err != nil {
+			return err
+		}
+	}
+}
+
+func (r *selectIndexDefaultPlan) fieldNames() []string {
+	return []string{r.nm}
+}
+
+type limitDefaultPlan struct {
+	expr   expression
+	src    plan
+	fields []string
+}
+
+func (r *limitDefaultPlan) hasID() bool { return r.src.hasID() }
+
+func (r *limitDefaultPlan) explain(w strutil.Formatter) {
+	r.src.explain(w)
+	w.Format("┌Pass first %v records\n└Output field names %v\n", r.expr, r.fields)
+}
+
+func (r *limitDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *limitDefaultPlan) fieldNames() []string { return r.fields }
+
+func (r *limitDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) (err error) {
+	m := map[interface{}]interface{}{}
+	var eval bool
+	var lim uint64
+	return r.src.do(ctx, func(rid interface{}, in []interface{}) (more bool, err error) {
+		if !eval {
+			for i, fld := range r.fields {
+				if fld != "" {
+					m[fld] = in[i]
+				}
+			}
+			m["$id"] = rid
+			val, err := r.expr.eval(ctx, m)
+			if err != nil {
+				return false, err
+			}
+
+			if val == nil {
+				return true, nil
+			}
+
+			if lim, err = limOffExpr(val); err != nil {
+				return false, err
+			}
+
+			eval = true
+		}
+		switch lim {
+		case 0:
+			return false, nil
+		default:
+			lim--
+			return f(rid, in)
+		}
+	})
+}
+
+type offsetDefaultPlan struct {
+	expr   expression
+	src    plan
+	fields []string
+}
+
+func (r *offsetDefaultPlan) hasID() bool { return r.src.hasID() }
+
+func (r *offsetDefaultPlan) explain(w strutil.Formatter) {
+	r.src.explain(w)
+	w.Format("┌Skip first %v records\n└Output field names %v\n", r.expr, qnames(r.fields))
+}
+
+func (r *offsetDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *offsetDefaultPlan) fieldNames() []string { return r.fields }
+
+func (r *offsetDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
+	m := map[interface{}]interface{}{}
+	var eval bool
+	var off uint64
+	return r.src.do(ctx, func(rid interface{}, in []interface{}) (bool, error) {
+		if !eval {
+			for i, fld := range r.fields {
+				if fld != "" {
+					m[fld] = in[i]
+				}
+			}
+			m["$id"] = rid
+			val, err := r.expr.eval(ctx, m)
+			if err != nil {
+				return false, err
+			}
+
+			if val == nil {
+				return true, nil
+			}
+
+			if off, err = limOffExpr(val); err != nil {
+				return false, err
+			}
+
+			eval = true
+		}
+		if off > 0 {
+			off--
+			return true, nil
+		}
+
+		return f(rid, in)
+	})
+}
+
+type orderByDefaultPlan struct {
+	asc    bool
+	by     []expression
+	src    plan
+	fields []string
+}
+
+func (r *orderByDefaultPlan) hasID() bool { return r.src.hasID() }
+
+func (r *orderByDefaultPlan) explain(w strutil.Formatter) {
+	r.src.explain(w)
+	w.Format("┌Order%s by", map[bool]string{false: " descending"}[r.asc])
+	for _, v := range r.by {
+		w.Format(" %s,", v)
+	}
+	w.Format("\n└Output field names %v\n", qnames(r.fields))
+}
+
+func (r *orderByDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *orderByDefaultPlan) fieldNames() []string { return r.fields }
+
+func (r *orderByDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
+	t, err := ctx.db.store.CreateTemp(r.asc)
+	if err != nil {
+		return
+	}
+
+	defer func() {
+		if derr := t.Drop(); derr != nil && err == nil {
+			err = derr
+		}
+	}()
+
+	m := map[interface{}]interface{}{}
+	flds := r.fields
+	k := make([]interface{}, len(r.by)+1)
+	id := int64(-1)
+	if err = r.src.do(ctx, func(rid interface{}, in []interface{}) (bool, error) {
+		id++
+		for i, fld := range flds {
+			if fld != "" {
+				m[fld] = in[i]
+			}
+		}
+		m["$id"] = rid
+		for i, expr := range r.by {
+			val, err := expr.eval(ctx, m)
+			if err != nil {
+				return false, err
+			}
+
+			if val != nil {
+				val, ordered, err := isOrderedType(val)
+				if err != nil {
+					return false, err
+				}
+
+				if !ordered {
+					return false, fmt.Errorf("cannot order by %v (type %T)", val, val)
+
+				}
+			}
+
+			k[i] = val
+		}
+		k[len(r.by)] = id
+		if err = t.Set(k, in); err != nil {
+			return false, err
+		}
+
+		return true, nil
+	}); err != nil {
+		return
+	}
+
+	it, err := t.SeekFirst()
+	if err != nil {
+		return noEOF(err)
+	}
+
+	var data []interface{}
+	more := true
+	for more && err == nil {
+		if _, data, err = it.Next(); err != nil {
+			break
+		}
+
+		more, err = f(nil, data)
+	}
+	return noEOF(err)
+}
+
+type selectFieldsDefaultPlan struct {
+	flds   []*fld
+	src    plan
+	fields []string
+}
+
+func (r *selectFieldsDefaultPlan) hasID() bool { return r.src.hasID() }
+
+func (r *selectFieldsDefaultPlan) explain(w strutil.Formatter) {
+	//TODO check for non existing fields
+	r.src.explain(w)
+	w.Format("┌Evaluate")
+	for _, v := range r.flds {
+		w.Format(" %s as %s,", v.expr, fmt.Sprintf("%q", v.name))
+	}
+	w.Format("\n└Output field names %v\n", qnames(r.fields))
+}
+
+func (r *selectFieldsDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *selectFieldsDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
+	fields := r.src.fieldNames()
+	m := map[interface{}]interface{}{}
+	return r.src.do(ctx, func(rid interface{}, in []interface{}) (bool, error) {
+		for i, nm := range fields {
+			if nm != "" {
+				m[nm] = in[i]
+			}
+		}
+		m["$id"] = rid
+		out := make([]interface{}, len(r.flds))
+		for i, fld := range r.flds {
+			var err error
+			if out[i], err = fld.expr.eval(ctx, m); err != nil {
+				return false, err
+			}
+		}
+		return f(rid, out)
+	})
+}
+
+func (r *selectFieldsDefaultPlan) fieldNames() []string { return r.fields }
+
+type selectFieldsGroupPlan struct {
+	flds   []*fld
+	src    *groupByDefaultPlan
+	fields []string
+}
+
+func (r *selectFieldsGroupPlan) hasID() bool { return false }
+
+func (r *selectFieldsGroupPlan) explain(w strutil.Formatter) {
+	//TODO check for non existing fields
+	r.src.explain(w)
+	w.Format("┌Evaluate")
+	for _, v := range r.flds {
+		w.Format(" %s as %s,", v.expr, fmt.Sprintf("%q", v.name))
+	}
+	w.Format("\n└Output field names %v\n", qnames(r.fields))
+}
+
+func (r *selectFieldsGroupPlan) fieldNames() []string { return r.fields }
+
+func (r *selectFieldsGroupPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *selectFieldsGroupPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
+	var t temp
+	var cols []*col
+	var err error
+	out := make([]interface{}, len(r.flds))
+	ok := false
+	rows := false
+	if err = r.src.do(ctx, func(rid interface{}, in []interface{}) (bool, error) {
+		if ok {
+			h := in[0].(int64)
+			m := map[interface{}]interface{}{}
+			for h != 0 {
+				in, err = t.Read(nil, h, cols...)
+				if err != nil {
+					return false, err
+				}
+
+				rec := in[2:]
+				for i, c := range cols {
+					if nm := c.name; nm != "" {
+						m[nm] = rec[i]
+					}
+				}
+				m["$id"] = rid
+				for _, fld := range r.flds {
+					if _, err = fld.expr.eval(ctx, m); err != nil {
+						return false, err
+					}
+				}
+
+				h = in[0].(int64)
+			}
+			m["$agg"] = true
+			for i, fld := range r.flds {
+				if out[i], err = fld.expr.eval(ctx, m); err != nil {
+					return false, err
+				}
+			}
+			rows = true
+			return f(nil, out)
+		}
+
+		ok = true
+		t = in[0].(temp)
+		cols = in[1].([]*col)
+		if len(r.flds) == 0 { // SELECT *
+			r.flds = make([]*fld, len(cols))
+			for i, v := range cols {
+				r.flds[i] = &fld{expr: &ident{v.name}, name: v.name}
+			}
+			out = make([]interface{}, len(r.flds))
+		}
+		return true, nil
+	}); err != nil {
+		return err
+	}
+
+	if rows {
+		return nil
+	}
+
+	m := map[interface{}]interface{}{"$agg0": true} // aggregate empty record set
+	for i, fld := range r.flds {
+		if out[i], err = fld.expr.eval(ctx, m); err != nil {
+			return err
+		}
+	}
+	_, err = f(nil, out)
+
+	return err
+}
+
+type sysColumnDefaultPlan struct{}
+
+func (r *sysColumnDefaultPlan) hasID() bool { return false }
+
+func (r *sysColumnDefaultPlan) explain(w strutil.Formatter) {
+	w.Format("┌Iterate all rows of table \"__Column\"\n└Output field names %v\n", qnames(r.fieldNames()))
+}
+
+func (r *sysColumnDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *sysColumnDefaultPlan) fieldNames() []string {
+	return []string{"TableName", "Ordinal", "Name", "Type"}
+}
+
+func (r *sysColumnDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
+	rec := make([]interface{}, 4)
+	di, err := ctx.db.info()
+	if err != nil {
+		return err
+	}
+
+	var id int64
+	for _, ti := range di.Tables {
+		rec[0] = ti.Name
+		var ix int64
+		for _, ci := range ti.Columns {
+			ix++
+			rec[1] = ix
+			rec[2] = ci.Name
+			rec[3] = ci.Type.String()
+			id++
+			if more, err := f(id, rec); !more || err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+type sysIndexDefaultPlan struct{}
+
+func (r *sysIndexDefaultPlan) hasID() bool { return false }
+
+func (r *sysIndexDefaultPlan) explain(w strutil.Formatter) {
+	w.Format("┌Iterate all rows of table \"__Index\"\n└Output field names %v\n", qnames(r.fieldNames()))
+}
+
+func (r *sysIndexDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *sysIndexDefaultPlan) fieldNames() []string {
+	return []string{"TableName", "ColumnName", "Name", "IsUnique"}
+}
+
+func (r *sysIndexDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
+	rec := make([]interface{}, 4)
+	di, err := ctx.db.info()
+	if err != nil {
+		return err
+	}
+
+	var id int64
+	for _, xi := range di.Indices {
+		rec[0] = xi.Table
+		rec[1] = xi.Column
+		rec[2] = xi.Name
+		rec[3] = xi.Unique
+		id++
+		if more, err := f(id, rec); !more || err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+type sysTableDefaultPlan struct{}
+
+func (r *sysTableDefaultPlan) hasID() bool { return false }
+
+func (r *sysTableDefaultPlan) explain(w strutil.Formatter) {
+	w.Format("┌Iterate all rows of table \"__Table\"\n└Output field names %v\n", qnames(r.fieldNames()))
+}
+
+func (r *sysTableDefaultPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *sysTableDefaultPlan) fieldNames() []string { return []string{"Name", "Schema"} }
+
+func (r *sysTableDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
+	rec := make([]interface{}, 2)
+	di, err := ctx.db.info()
+	if err != nil {
+		return err
+	}
+
+	var id int64
+	for _, ti := range di.Tables {
+		rec[0] = ti.Name
+		a := []string{}
+		for _, ci := range ti.Columns {
+			s := ""
+			if ci.NotNull {
+				s += " NOT NULL"
+			}
+			if c := ci.Constraint; c != "" {
+				s += " " + c
+			}
+			if d := ci.Default; d != "" {
+				s += " DEFAULT " + d
+			}
+			a = append(a, fmt.Sprintf("%s %s%s", ci.Name, ci.Type, s))
+		}
+		rec[1] = fmt.Sprintf("CREATE TABLE %s (%s);", ti.Name, strings.Join(a, ", "))
+		id++
+		if more, err := f(id, rec); !more || err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+type tableNilPlan struct {
+	t *table
+}
+
+func (r *tableNilPlan) hasID() bool { return true }
+
+func (r *tableNilPlan) explain(w strutil.Formatter) {
+	w.Format("┌Iterate all rows of table %q\n└Output field names %v\n", r.t.name, qnames(r.fieldNames()))
+}
+
+func (r *tableNilPlan) fieldNames() []string { return []string{} }
+
+func (r *tableNilPlan) filter(expr expression) (plan, []string, error) {
+	return nil, nil, nil
+}
+
+func (r *tableNilPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
+	t := r.t
+	h := t.head
+	cols := t.cols
+	for h > 0 {
+		rec, err := t.store.Read(nil, h, cols...) // 0:next, 1:id, 2...: data
+		if err != nil {
+			return err
+		}
+
+		if m, err := f(rec[1], nil); !m || err != nil {
+			return err
+		}
+
+		h = rec[0].(int64) // next
+	}
+	return nil
+}
+
+type tableDefaultPlan struct {
+	t      *table
+	fields []string
+}
+
+func (r *tableDefaultPlan) hasID() bool { return true }
+
+func (r *tableDefaultPlan) explain(w strutil.Formatter) {
+	w.Format("┌Iterate all rows of table %q\n└Output field names %v\n", r.t.name, qnames(r.fields))
+}
+
+func (r *tableDefaultPlan) filterBinOp(x *binaryOperation) (plan, []string, error) {
+	ok, cn, rval, err := x.isIdentRelOpVal()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if !ok {
+		return nil, nil, nil
+	}
+
+	t := r.t
+	c, ix := t.findIndexByColName(cn)
+	if ix == nil { // Column cn has no index.
+		return nil, []string{fmt.Sprintf("%s(%s)", t.name, cn)}, nil
+	}
+
+	if rval, err = typeCheck1(rval, c); err != nil {
+		return nil, nil, err
+	}
+
+	switch x.op {
+	case eq:
+		return &indexPlan{t, cn, ix.name, ix.x, indexEq, rval, rval}, nil, nil
+	case '<':
+		return &indexPlan{t, cn, ix.name, ix.x, indexLt, nil, rval}, nil, nil
+	case le:
+		return &indexPlan{t, cn, ix.name, ix.x, indexLe, nil, rval}, nil, nil
+	case ge:
+		return &indexPlan{t, cn, ix.name, ix.x, indexGe, rval, nil}, nil, nil
+	case '>':
+		return &indexPlan{t, cn, ix.name, ix.x, indexGt, rval, nil}, nil, nil
+	case neq:
+		return &indexPlan{t, cn, ix.name, ix.x, indexNe, rval, rval}, nil, nil
+	default:
+		panic("internal error 069")
+	}
+}
+
+func (r *tableDefaultPlan) filterIdent(x *ident, trueValue bool) (plan, []string, error) {
+	cn := x.s
+	t := r.t
+	for _, v := range t.cols {
+		if v.name != cn {
+			continue
+		}
+
+		if v.typ != qBool {
+			return nil, nil, nil
+		}
+
+		xi := v.index + 1 // 0: id()
+		if xi >= len(t.indices) {
+			return nil, nil, nil
+		}
+
+		ix := t.indices[xi]
+		if ix == nil { // Column cn has no index.
+			return nil, []string{fmt.Sprintf("%s(%s)", t.name, cn)}, nil
+		}
+
+		kind := indexFalse
+		if trueValue {
+			kind = indexTrue
+		}
+		return &indexPlan{t, cn, ix.name, ix.x, kind, nil, nil}, nil, nil
+	}
+	return nil, nil, nil
+}
+
+func (r *tableDefaultPlan) filterIsNull(x *isNull) (plan, []string, error) {
+	ok, cn := isColumnExpression(x.expr)
+	if !ok {
+		return nil, nil, nil
+	}
+
+	t := r.t
+	_, ix := t.findIndexByColName(cn)
+	if ix == nil { // Column cn has no index.
+		return nil, []string{fmt.Sprintf("%s(%s)", t.name, cn)}, nil
+	}
+
+	switch {
+	case x.not:
+		return &indexPlan{t, cn, ix.name, ix.x, indexIsNotNull, nil, nil}, nil, nil
+	default:
+		return &indexPlan{t, cn, ix.name, ix.x, indexIsNull, nil, nil}, nil, nil
+	}
+}
+
+func (r *tableDefaultPlan) filter(expr expression) (plan, []string, error) {
+	cols := mentionedColumns(expr)
+	for _, v := range r.fields {
+		delete(cols, v)
+	}
+	for k := range cols {
+		return nil, nil, fmt.Errorf("unknown field %s", k)
+	}
+
+	var is []string
+
+	//TODO var sexpr string
+	//TODO for _, ix := range t.indices2 {
+	//TODO 	if len(ix.exprList) != 1 {
+	//TODO 		continue
+	//TODO 	}
+
+	//TODO 	if sexpr == "" {
+	//TODO 		sexpr = expr.String()
+	//TODO 	}
+	//TODO 	if ix.sources[0] != sexpr {
+	//TODO 		continue
+	//TODO 	}
+
+	//TODO }
+
+	switch x := expr.(type) {
+	case *binaryOperation:
+		return r.filterBinOp(x)
+	case *ident:
+		return r.filterIdent(x, true)
+	case *isNull:
+		return r.filterIsNull(x)
+	case *unaryOperation:
+		if x.op != '!' {
+			break
+		}
+
+		if operand, ok := x.v.(*ident); ok {
+			return r.filterIdent(operand, false)
+		}
+	default:
+		//dbg("", expr)
+		return nil, is, nil //TODO
+	}
+
+	return nil, is, nil
+}
+
+func (r *tableDefaultPlan) do(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) (err error) {
+	t := r.t
+	cols := t.cols
+	h := t.head
+	for h > 0 {
+		rec, err := t.row0(ctx, h)
+		if err != nil {
+			return err
+		}
+
+		h = rec[0].(int64)
+		id := rec[1].(int64)
+		for i, c := range cols {
+			rec[i] = rec[c.index+2]
+		}
+		if m, err := f(id, rec[:len(cols)]); !m || err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (r *tableDefaultPlan) fieldNames() []string { return r.fields }
+
+type nullPlan struct {
+	fields []string
+}
+
+func (r *nullPlan) hasID() bool { return false }
+
+func (r *nullPlan) fieldNames() []string { return r.fields }
+
+func (r *nullPlan) explain(w strutil.Formatter) {
+	w.Format("┌Iterate no rows\n└Output field names %v\n", qnames(r.fields))
+}
+
+func (r *nullPlan) do(*execCtx, func(interface{}, []interface{}) (bool, error)) error {
+	return nil
+}
+
+func (r *nullPlan) filter(expr expression) (plan, []string, error) {
+	return r, nil, nil
+}
+
+type leftJoinDefaultPlan struct {
+	on     expression
+	rsets  []plan
+	names  []string
+	right  int
+	fields []string
+}
+
+func (r *leftJoinDefaultPlan) hasID() bool { return false }
+
+func (r *leftJoinDefaultPlan) explain(w strutil.Formatter) {
+	w.Format("┌Compute Cartesian product of%i\n")
+	for i, v := range r.rsets {
+		sel := !isTableOrIndex(v)
+		if sel {
+			w.Format("┌Iterate all rows of virtual table %q%i\n", r.names[i])
+		}
+		v.explain(w)
+		if sel {
+			w.Format("%u└Output field names %v\n", qnames(v.fieldNames()))
+		}
+	}
+	w.Format("Extend the product with all NULL rows of %q when no match for %v%u\n", r.names[len(r.names)-1], r.on)
+	w.Format("└Output field names %v\n", qnames(r.fields))
+}
+
+func (r *leftJoinDefaultPlan) filter(expr expression) (plan, []string, error) {
+	var is []string
+	for i, v := range r.names {
+		e2, err := expr.clone(nil, v)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		p2, is2, err := r.rsets[i].filter(e2)
+		is = append(is, is2...)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		if p2 != nil {
+			r.rsets[i] = p2
+			return r, is, nil
+		}
+	}
+	return nil, is, nil
+}
+
+type rightJoinDefaultPlan struct {
+	leftJoinDefaultPlan
+}
+
+func (r *rightJoinDefaultPlan) hasID() bool { return false }
+
+func (r *rightJoinDefaultPlan) explain(w strutil.Formatter) {
+	w.Format("┌Compute Cartesian product of%i\n")
+	for i, v := range r.rsets {
+		sel := !isTableOrIndex(v)
+		if sel {
+			w.Format("┌Iterate all rows of virtual table %q%i\n", r.names[i])
+		}
+		v.explain(w)
+		if sel {
+			w.Format("%u└Output field names %v\n", qnames(v.fieldNames()))
+		}
+	}
+	w.Format("Extend the product with all NULL rows of all but %q when no match for %v%u\n", r.names[len(r.names)-1], r.on)
+	w.Format("└Output field names %v\n", qnames(r.fields))
+}
+
+func (r *rightJoinDefaultPlan) filter(expr expression) (plan, []string, error) {
+	var is []string
+	for i, v := range r.names {
+		e2, err := expr.clone(nil, v)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		p2, is2, err := r.rsets[i].filter(e2)
+		is = append(is, is2...)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		if p2 != nil {
+			r.rsets[i] = p2
+			return r, is, nil
+		}
+	}
+	return nil, is, nil
+}
+
+type fullJoinDefaultPlan struct {
+	leftJoinDefaultPlan
+}
+
+func (r *fullJoinDefaultPlan) hasID() bool { return false }
+
+func (r *fullJoinDefaultPlan) explain(w strutil.Formatter) {
+	w.Format("┌Compute Cartesian product of%i\n")
+	for i, v := range r.rsets {
+		sel := !isTableOrIndex(v)
+		if sel {
+			w.Format("┌Iterate all rows of virtual table %q%i\n", r.names[i])
+		}
+		v.explain(w)
+		if sel {
+			w.Format("%u└Output field names %v\n", qnames(v.fieldNames()))
+		}
+	}
+	w.Format("Extend the product with all NULL rows of %q when no match for %v\n", r.names[len(r.names)-1], r.on)
+	w.Format("Extend the product with all NULL rows of all but %q when no match for %v%u\n", r.names[len(r.names)-1], r.on)
+	w.Format("└Output field names %v\n", qnames(r.fields))
+}
+
+func (r *fullJoinDefaultPlan) filter(expr expression) (plan, []string, error) {
+	var is []string
+	for i, v := range r.names {
+		e2, err := expr.clone(nil, v)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		p2, is2, err := r.rsets[i].filter(e2)
+		is = append(is, is2...)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		if p2 != nil {
+			r.rsets[i] = p2
+			return r, is, nil
+		}
+	}
+	return nil, is, nil
+}
+
+func (r *leftJoinDefaultPlan) fieldNames() []string { return r.fields }
+
+func (r *leftJoinDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error {
+	m := map[interface{}]interface{}{}
+	ids := map[string]interface{}{}
+	var g func([]interface{}, []plan, int) error
+	var match bool
+	g = func(prefix []interface{}, rsets []plan, x int) (err error) {
+		return rsets[0].do(ctx, func(id interface{}, in []interface{}) (bool, error) {
+			ids[r.names[x]] = id
+			row := append(prefix, in...)
+			if len(rsets) > 1 {
+				if len(rsets) == 2 {
+					match = false
+				}
+				if err = g(row, rsets[1:], x+1); err != nil {
+					return false, err
+				}
+
+				if len(rsets) != 2 || match {
+					return true, nil
+				}
+
+				ids[r.names[x+1]] = nil
+				return f(ids, append(row, make([]interface{}, r.right)...))
+			}
+
+			for i, fld := range r.fields {
+				if fld != "" {
+					m[fld] = row[i]
+				}
+			}
+
+			val, err := r.on.eval(ctx, m)
+			if err != nil {
+				return false, err
+			}
+
+			if val == nil {
+				return true, nil
+			}
+
+			x, ok := val.(bool)
+			if !ok {
+				return false, fmt.Errorf("invalid ON expression %s (value of type %T)", val, val)
+			}
+
+			if !x {
+				return true, nil
+			}
+
+			match = true
+			return f(ids, row)
+		})
+	}
+	return g(nil, r.rsets, 0)
+}
+
+func (r *rightJoinDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error {
+	right := r.right
+	left := len(r.fields) - right
+	n := len(r.rsets)
+	m := map[interface{}]interface{}{}
+	ids := map[string]interface{}{}
+	var g func([]interface{}, []plan, int) error
+	var match bool
+	nf := len(r.fields)
+	fields := append(append([]string(nil), r.fields[nf-right:]...), r.fields[:nf-right]...)
+	g = func(prefix []interface{}, rsets []plan, x int) (err error) {
+		return rsets[0].do(ctx, func(id interface{}, in []interface{}) (bool, error) {
+			ids[r.names[x]] = id
+			row := append(prefix, in...)
+			if len(rsets) > 1 {
+				if len(rsets) == n {
+					match = false
+				}
+				if err = g(row, rsets[1:], x+1); err != nil {
+					return false, err
+				}
+
+				if len(rsets) != n || match {
+					return true, nil
+				}
+
+				for i := 0; i < n-1; i++ {
+					ids[r.names[i]] = nil
+				}
+
+				// rigth, left -> left, right
+				return f(ids, append(make([]interface{}, left), row[:right]...))
+			}
+
+			for i, fld := range fields {
+				if fld != "" {
+					m[fld] = row[i]
+				}
+			}
+
+			val, err := r.on.eval(ctx, m)
+			if err != nil {
+				return false, err
+			}
+
+			if val == nil {
+				return true, nil
+			}
+
+			x, ok := val.(bool)
+			if !ok {
+				return false, fmt.Errorf("invalid ON expression %s (value of type %T)", val, val)
+			}
+
+			if !x {
+				return true, nil
+			}
+
+			match = true
+			// rigth, left -> left, right
+			return f(ids, append(append([]interface{}(nil), row[right:]...), row[:right]...))
+		})
+	}
+	return g(nil, append([]plan{r.rsets[n-1]}, r.rsets[:n-1]...), 0)
+}
+
+func (r *fullJoinDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error {
+	b3 := b.TreeNew(func(a, b interface{}) int {
+		x := a.(int64)
+		y := b.(int64)
+		if x < y {
+			return -1
+		}
+
+		if x == y {
+			return 0
+		}
+
+		return 1
+	})
+	m := map[interface{}]interface{}{}
+	ids := map[string]interface{}{}
+	var g func([]interface{}, []plan, int) error
+	var match bool
+	var rid int64
+	firstR := true
+	g = func(prefix []interface{}, rsets []plan, x int) (err error) {
+		return rsets[0].do(ctx, func(id interface{}, in []interface{}) (bool, error) {
+			ids[r.names[x]] = id
+			row := append(prefix, in...)
+			if len(rsets) > 1 {
+				if len(rsets) == 2 {
+					match = false
+					rid = 0
+				}
+				if err = g(row, rsets[1:], x+1); err != nil {
+					return false, err
+				}
+
+				if len(rsets) == 2 {
+					firstR = false
+				}
+				if len(rsets) != 2 || match {
+					return true, nil
+				}
+
+				ids[r.names[x+1]] = nil
+				return f(ids, append(row, make([]interface{}, r.right)...))
+			}
+
+			rid++
+			if firstR {
+				b3.Set(rid, in)
+			}
+			for i, fld := range r.fields {
+				if fld != "" {
+					m[fld] = row[i]
+				}
+			}
+
+			val, err := r.on.eval(ctx, m)
+			if err != nil {
+				return false, err
+			}
+
+			if val == nil {
+				return true, nil
+			}
+
+			x, ok := val.(bool)
+			if !ok {
+				return false, fmt.Errorf("invalid ON expression %s (value of type %T)", val, val)
+			}
+
+			if !x {
+				return true, nil
+			}
+
+			match = true
+			b3.Delete(rid)
+			return f(ids, row)
+		})
+	}
+	if err := g(nil, r.rsets, 0); err != nil {
+		return err
+	}
+
+	it, err := b3.SeekFirst()
+	if err != nil {
+		return noEOF(err)
+	}
+
+	pref := make([]interface{}, len(r.fields)-r.right)
+	for {
+		_, v, err := it.Next()
+		if err != nil {
+			return noEOF(err)
+		}
+
+		more, err := f(nil, append(pref, v.([]interface{})...))
+		if err != nil || !more {
+			return err
+		}
+	}
+}
diff --git a/vendor/github.com/cznic/ql/ql.go b/vendor/github.com/cznic/ql/ql.go
new file mode 100644
index 0000000000..82c3c5fa58
--- /dev/null
+++ b/vendor/github.com/cznic/ql/ql.go
@@ -0,0 +1,1729 @@
+// Copyright 2014 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//LATER profile mem
+//LATER profile cpu
+//LATER coverage
+
+package ql
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"math/big"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/cznic/strutil"
+)
+
+const (
+	crossJoin = iota
+	leftJoin
+	rightJoin
+	fullJoin
+)
+
+// NOTE: all rset implementations must be safe for concurrent use by multiple
+// goroutines.  If the do method requires any execution domain local data, they
+// must be held out of the implementing instance.
+var (
+	_ rset = (*distinctRset)(nil)
+	_ rset = (*groupByRset)(nil)
+	_ rset = (*joinRset)(nil)
+	_ rset = (*limitRset)(nil)
+	_ rset = (*offsetRset)(nil)
+	_ rset = (*orderByRset)(nil)
+	_ rset = (*selectRset)(nil)
+	_ rset = (*selectStmt)(nil)
+	_ rset = (*tableRset)(nil)
+	_ rset = (*whereRset)(nil)
+
+	isTesting bool // enables test hook: select from an index
+)
+
+type rset interface {
+	plan(ctx *execCtx) (plan, error)
+}
+
+type recordset struct {
+	ctx *execCtx
+	plan
+	tx *TCtx
+}
+
+func (r recordset) fieldNames() []interface{} {
+	f := r.plan.fieldNames()
+	a := make([]interface{}, len(f))
+	for i, v := range f {
+		a[i] = v
+	}
+	return a
+}
+
+// Do implements Recordset.
+func (r recordset) Do(names bool, f func(data []interface{}) (bool, error)) error {
+	if names {
+		if more, err := f(r.fieldNames()); err != nil || !more {
+			return err
+		}
+	}
+	return r.ctx.db.do(r, f)
+}
+
+// Fields implements Recordset.
+func (r recordset) Fields() (names []string, err error) {
+	return r.plan.fieldNames(), nil
+}
+
+// FirstRow implements Recordset.
+func (r recordset) FirstRow() (row []interface{}, err error) {
+	rows, err := r.Rows(1, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(rows) != 0 {
+		return rows[0], nil
+	}
+
+	return nil, nil
+}
+
+// Rows implements Recordset.
+func (r recordset) Rows(limit, offset int) ([][]interface{}, error) {
+	var rows [][]interface{}
+	if err := r.Do(false, func(row []interface{}) (bool, error) {
+		if offset > 0 {
+			offset--
+			return true, nil
+		}
+
+		switch {
+		case limit < 0:
+			rows = append(rows, row)
+			return true, nil
+		case limit == 0:
+			return false, nil
+		default: // limit > 0
+			rows = append(rows, row)
+			limit--
+			return limit > 0, nil
+		}
+	}); err != nil {
+		return nil, err
+	}
+
+	return rows, nil
+}
+
+// List represents a group of compiled statements.
+type List struct {
+	l      []stmt
+	params int
+}
+
+// String implements fmt.Stringer
+func (l List) String() string {
+	var b bytes.Buffer
+	f := strutil.IndentFormatter(&b, "\t")
+	for _, s := range l.l {
+		switch s.(type) {
+		case beginTransactionStmt:
+			f.Format("%s\n%i", s)
+		case commitStmt, rollbackStmt:
+			f.Format("%u%s\n", s)
+		default:
+			f.Format("%s\n", s)
+		}
+	}
+	return b.String()
+}
+
+// IsExplainStmt reports whether l is a single EXPLAIN statment or a single EXPLAIN
+// statment enclosed in a transaction.
+func (l List) IsExplainStmt() bool {
+	switch len(l.l) {
+	case 1:
+		_, ok := l.l[0].(*explainStmt)
+		return ok
+	case 3:
+		if _, ok := l.l[0].(beginTransactionStmt); !ok {
+			return false
+		}
+		if _, ok := l.l[1].(*explainStmt); !ok {
+			return false
+		}
+		_, ok := l.l[2].(commitStmt)
+		return ok
+	default:
+		return false
+	}
+}
+
+type groupByRset struct {
+	colNames []string
+	src      plan
+}
+
+func (r *groupByRset) plan(ctx *execCtx) (plan, error) {
+	fields := r.src.fieldNames()
+	for _, v := range r.colNames {
+		found := false
+		for _, v2 := range fields {
+			if v == v2 {
+				found = true
+				break
+			}
+		}
+		if !found {
+			return nil, fmt.Errorf("unknown field %s", v)
+		}
+	}
+	return &groupByDefaultPlan{colNames: r.colNames, src: r.src, fields: fields}, nil
+}
+
+// TCtx represents transaction context. It enables to execute multiple
+// statement lists in the same context. The same context guarantees the state
+// of the DB cannot change in between the separated executions.
+//
+// LastInsertID
+//
+// LastInsertID is updated by INSERT INTO statements. The value considers
+// performed ROLLBACK statements, if any, even though roll backed IDs are not
+// reused. QL clients should treat the field as read only.
+//
+// RowsAffected
+//
+// RowsAffected is updated by INSERT INTO, DELETE FROM and UPDATE statements.
+// The value does not (yet) consider any ROLLBACK statements involved.  QL
+// clients should treat the field as read only.
+type TCtx struct {
+	LastInsertID int64
+	RowsAffected int64
+}
+
+// NewRWCtx returns a new read/write transaction context.  NewRWCtx is safe for
+// concurrent use by multiple goroutines, every one of them will get a new,
+// unique conext.
+func NewRWCtx() *TCtx { return &TCtx{} }
+
+// Recordset is a result of a select statment. It can call a user function for
+// every row (record) in the set using the Do method.
+//
+// Recordsets can be safely reused. Evaluation of the rows is performed lazily.
+// Every invocation of Do will see the current, potentially actualized data.
+//
+// Do
+//
+// Do will call f for every row (record) in the Recordset.
+//
+// If f returns more == false or err != nil then f will not be called for any
+// remaining rows in the set and the err value is returned from Do.
+//
+// If names == true then f is firstly called with a virtual row
+// consisting of field (column) names of the RecordSet.
+//
+// Do is executed in a read only context and performs a RLock of the
+// database.
+//
+// Do is safe for concurrent use by multiple goroutines.
+//
+// Fields
+//
+// Fields return a slice of field names of the recordset. The result is computed
+// without actually computing the recordset rows.
+//
+// FirstRow
+//
+// FirstRow will return the first row of the RecordSet or an error, if any. If
+// the Recordset has no rows the result is (nil, nil).
+//
+// Rows
+//
+// Rows will return rows in Recordset or an error, if any. The semantics of
+// limit and offset are the same as of the LIMIT and OFFSET clauses of the
+// SELECT statement. To get all rows pass limit < 0. If there are no rows to
+// return the result is (nil, nil).
+type Recordset interface {
+	Do(names bool, f func(data []interface{}) (more bool, err error)) error
+	Fields() (names []string, err error)
+	FirstRow() (row []interface{}, err error)
+	Rows(limit, offset int) (rows [][]interface{}, err error)
+}
+
+type assignment struct {
+	colName string
+	expr    expression
+}
+
+func (a *assignment) String() string {
+	return fmt.Sprintf("%s=%s", a.colName, a.expr)
+}
+
+type distinctRset struct {
+	src plan
+}
+
+func (r *distinctRset) plan(ctx *execCtx) (plan, error) {
+	return &distinctDefaultPlan{src: r.src, fields: r.src.fieldNames()}, nil
+}
+
+type orderByRset struct {
+	asc bool
+	by  []expression
+	src plan
+}
+
+func (r *orderByRset) String() string {
+	a := make([]string, len(r.by))
+	for i, v := range r.by {
+		a[i] = v.String()
+	}
+	s := strings.Join(a, ", ")
+	if !r.asc {
+		s += " DESC"
+	}
+	return s
+}
+
+func (r *orderByRset) plan(ctx *execCtx) (plan, error) {
+	if _, ok := r.src.(*nullPlan); ok {
+		return r.src, nil
+	}
+
+	var by []expression
+	fields := r.src.fieldNames()
+	for _, e := range r.by {
+		cols := mentionedColumns(e)
+		for k := range cols {
+			found := false
+			for _, v := range fields {
+				if k == v {
+					found = true
+					break
+				}
+			}
+			if !found {
+				return nil, fmt.Errorf("unknown field %s", k)
+			}
+		}
+		if len(cols) == 0 {
+			v, err := e.eval(ctx, nil)
+			if err != nil {
+				by = append(by, e)
+				continue
+			}
+
+			if isConstValue(v) != nil {
+				continue
+			}
+		}
+
+		by = append(by, e)
+	}
+	return &orderByDefaultPlan{asc: r.asc, by: by, src: r.src, fields: fields}, nil
+}
+
+type whereRset struct {
+	expr expression
+	src  plan
+}
+
+func (r *whereRset) planBinOp(x *binaryOperation) (plan, error) {
+	p := r.src
+	ok, cn := isColumnExpression(x.l)
+	if ok && cn == "id()" {
+		if v := isConstValue(x.r); v != nil {
+			v, err := typeCheck1(v, idCol)
+			if err != nil {
+				return nil, err
+			}
+
+			rv := v.(int64)
+			switch {
+			case p.hasID():
+				switch x.op {
+				case '<':
+					if rv <= 1 {
+						return &nullPlan{p.fieldNames()}, nil
+					}
+				case '>':
+					if rv <= 0 {
+						return p, nil
+					}
+				case ge:
+					if rv >= 1 {
+						return p, nil
+					}
+				case neq:
+					if rv <= 0 {
+						return p, nil
+					}
+				case eq:
+					if rv <= 0 {
+						return &nullPlan{p.fieldNames()}, nil
+					}
+				case le:
+					if rv <= 0 {
+						return &nullPlan{p.fieldNames()}, nil
+					}
+				}
+			}
+		}
+	}
+
+	var err error
+	var p2 plan
+	var is []string
+	switch x.op {
+	case eq, ge, '>', le, '<', neq:
+		if p2, is, err = p.filter(x); err != nil {
+			return nil, err
+		}
+
+		if p2 != nil {
+			return p2, nil
+		}
+	case andand:
+		var in []expression
+		var f func(expression)
+		f = func(e expression) {
+			b, ok := e.(*binaryOperation)
+			if !ok || b.op != andand {
+				in = append(in, e)
+				return
+			}
+
+			f(b.l)
+			f(b.r)
+		}
+		f(x)
+		out := []expression{}
+		p := r.src
+		isNewPlan := false
+		for _, e := range in {
+			p2, is2, err := p.filter(e)
+			if err != nil {
+				return nil, err
+			}
+
+			if p2 == nil {
+				is = append(is, is2...)
+				out = append(out, e)
+				continue
+			}
+
+			p = p2
+			isNewPlan = true
+		}
+
+		if !isNewPlan {
+			break
+		}
+
+		if len(out) == 0 {
+			return p, nil
+		}
+
+		for len(out) > 1 {
+			n := len(out)
+			e, err := newBinaryOperation(andand, out[n-2], out[n-1])
+			if err != nil {
+				return nil, err
+			}
+
+			out = out[:n-1]
+			out[n-2] = e
+		}
+
+		return &filterDefaultPlan{p, out[0], is}, nil
+	}
+
+	return &filterDefaultPlan{p, x, is}, nil
+}
+
+func (r *whereRset) planIdent(x *ident) (plan, error) {
+	p := r.src
+	p2, is, err := p.filter(x)
+	if err != nil {
+		return nil, err
+	}
+
+	if p2 != nil {
+		return p2, nil
+	}
+
+	return &filterDefaultPlan{p, x, is}, nil
+}
+
+func (r *whereRset) planIsNull(x *isNull) (plan, error) {
+	p := r.src
+	ok, cn := isColumnExpression(x.expr)
+	if !ok {
+		return &filterDefaultPlan{p, x, nil}, nil
+	}
+
+	if cn == "id()" {
+		switch {
+		case p.hasID():
+			switch {
+			case x.not: // IS NOT NULL
+				return p, nil
+			default: // IS NULL
+				return &nullPlan{p.fieldNames()}, nil
+			}
+		default:
+			switch {
+			case x.not: // IS NOT NULL
+				return &nullPlan{p.fieldNames()}, nil
+			default: // IS NULL
+				return p, nil
+			}
+		}
+	}
+
+	p2, is, err := p.filter(x)
+	if err != nil {
+		return nil, err
+	}
+
+	if p2 != nil {
+		return p2, nil
+	}
+
+	return &filterDefaultPlan{p, x, is}, nil
+}
+
+func (r *whereRset) planUnaryOp(x *unaryOperation) (plan, error) {
+	p := r.src
+	p2, is, err := p.filter(x)
+	if err != nil {
+		return nil, err
+	}
+
+	if p2 != nil {
+		return p2, nil
+	}
+
+	return &filterDefaultPlan{p, x, is}, nil
+}
+
+func (r *whereRset) plan(ctx *execCtx) (plan, error) {
+	expr, err := r.expr.clone(ctx.arg)
+	if err != nil {
+		return nil, err
+	}
+
+	switch r.src.(type) {
+	case *leftJoinDefaultPlan, *rightJoinDefaultPlan, *fullJoinDefaultPlan:
+		return &filterDefaultPlan{r.src, expr, nil}, nil
+	}
+
+	switch x := expr.(type) {
+	case *binaryOperation:
+		return r.planBinOp(x)
+	case *ident:
+		return r.planIdent(x)
+	case *isNull:
+		return r.planIsNull(x)
+	case *pIn:
+		//TODO optimize
+		//TODO show plan
+	case *pLike:
+		//TODO optimize
+	case *unaryOperation:
+		return r.planUnaryOp(x)
+	}
+
+	return &filterDefaultPlan{r.src, expr, nil}, nil
+}
+
+type offsetRset struct {
+	expr expression
+	src  plan
+}
+
+func (r *offsetRset) plan(ctx *execCtx) (plan, error) {
+	return &offsetDefaultPlan{expr: r.expr, src: r.src, fields: r.src.fieldNames()}, nil
+}
+
+type limitRset struct {
+	expr expression
+	src  plan
+}
+
+func (r *limitRset) plan(ctx *execCtx) (plan, error) {
+	return &limitDefaultPlan{expr: r.expr, src: r.src, fields: r.src.fieldNames()}, nil
+}
+
+type selectRset struct {
+	flds []*fld
+	src  plan
+}
+
+func (r *selectRset) plan(ctx *execCtx) (plan, error) {
+	var flds2 []*fld
+	if len(r.flds) != 0 {
+		m := map[string]struct{}{}
+		for _, v := range r.flds {
+			mentionedColumns0(v.expr, true, true, m)
+		}
+		for _, v := range r.src.fieldNames() {
+			delete(m, v)
+		}
+		for k := range m {
+			return nil, fmt.Errorf("unknown field %s", k)
+		}
+
+		flds2 = append(flds2, r.flds...)
+	}
+
+	if x, ok := r.src.(*groupByDefaultPlan); ok {
+		if len(r.flds) == 0 {
+			fields := x.fieldNames()
+			flds := make([]*fld, len(fields))
+			for i, v := range fields {
+				flds[i] = &fld{&ident{v}, v}
+			}
+			return &selectFieldsGroupPlan{flds: flds, src: x, fields: fields}, nil
+		}
+
+		p := &selectFieldsGroupPlan{flds: flds2, src: x}
+		for _, v := range r.flds {
+			p.fields = append(p.fields, v.name)
+		}
+		return p, nil
+	}
+
+	if len(r.flds) == 0 {
+		return r.src, nil
+	}
+
+	f0 := r.src.fieldNames()
+	if len(f0) == len(flds2) {
+		match := true
+		for i, v := range flds2 {
+			if x, ok := v.expr.(*ident); ok && x.s == f0[i] && v.name == f0[i] {
+				continue
+			}
+
+			match = false
+			break
+		}
+
+		if match {
+			return r.src, nil
+		}
+	}
+
+	src := r.src
+	if x, ok := src.(*tableDefaultPlan); ok {
+		isconst := true
+		for _, v := range flds2 {
+			if isConstValue(v.expr) == nil {
+				isconst = false
+				break
+			}
+		}
+		if isconst { // #250
+			src = &tableNilPlan{x.t}
+		}
+	}
+
+	p := &selectFieldsDefaultPlan{flds: flds2, src: src}
+	for _, v := range r.flds {
+		p.fields = append(p.fields, v.name)
+	}
+	return p, nil
+}
+
+type tableRset string
+
+func (r tableRset) plan(ctx *execCtx) (plan, error) {
+	switch r {
+	case "__Table":
+		return &sysTableDefaultPlan{}, nil
+	case "__Column":
+		return &sysColumnDefaultPlan{}, nil
+	case "__Index":
+		return &sysIndexDefaultPlan{}, nil
+	}
+
+	t, ok := ctx.db.root.tables[string(r)]
+	if !ok && isTesting {
+		if _, x0 := ctx.db.root.findIndexByName(string(r)); x0 != nil {
+			return &selectIndexDefaultPlan{nm: string(r), x: x0}, nil
+		}
+	}
+
+	if !ok {
+		return nil, fmt.Errorf("table %s does not exist", r)
+	}
+
+	rs := &tableDefaultPlan{t: t}
+	for _, col := range t.cols {
+		rs.fields = append(rs.fields, col.name)
+	}
+	return rs, nil
+}
+
+func findFldIndex(fields []*fld, name string) int {
+	for i, f := range fields {
+		if f.name == name {
+			return i
+		}
+	}
+
+	return -1
+}
+
+func findFld(fields []*fld, name string) (f *fld) {
+	for _, f = range fields {
+		if f.name == name {
+			return
+		}
+	}
+
+	return nil
+}
+
+type col struct {
+	index      int
+	name       string
+	typ        int
+	constraint *constraint
+	dflt       expression
+}
+
+var idCol = &col{name: "id()", typ: qInt64}
+
+func findCol(cols []*col, name string) (c *col) {
+	for _, c = range cols {
+		if c.name == name {
+			return
+		}
+	}
+
+	return nil
+}
+
+func (f *col) clone() *col {
+	var r col
+	r = *f
+	r.constraint = f.constraint.clone()
+	if f.dflt != nil {
+		r.dflt, _ = r.dflt.clone(nil)
+	}
+	return &r
+}
+
+func (f *col) typeCheck(x interface{}) (ok bool) { //NTYPE
+	switch x.(type) {
+	case nil:
+		return true
+	case bool:
+		return f.typ == qBool
+	case complex64:
+		return f.typ == qComplex64
+	case complex128:
+		return f.typ == qComplex128
+	case float32:
+		return f.typ == qFloat32
+	case float64:
+		return f.typ == qFloat64
+	case int8:
+		return f.typ == qInt8
+	case int16:
+		return f.typ == qInt16
+	case int32:
+		return f.typ == qInt32
+	case int64:
+		return f.typ == qInt64
+	case string:
+		return f.typ == qString
+	case uint8:
+		return f.typ == qUint8
+	case uint16:
+		return f.typ == qUint16
+	case uint32:
+		return f.typ == qUint32
+	case uint64:
+		return f.typ == qUint64
+	case []byte:
+		return f.typ == qBlob
+	case *big.Int:
+		return f.typ == qBigInt
+	case *big.Rat:
+		return f.typ == qBigRat
+	case time.Time:
+		return f.typ == qTime
+	case time.Duration:
+		return f.typ == qDuration
+	case chunk:
+		return true // was checked earlier
+	}
+	return
+}
+
+func cols2meta(f []*col) (s string) {
+	a := []string{}
+	for _, f := range f {
+		a = append(a, string(f.typ)+f.name)
+	}
+	return strings.Join(a, "|")
+}
+
+// DB represent the database capable of executing QL statements.
+type DB struct {
+	cc          *TCtx // Current transaction context
+	isMem       bool
+	mu          sync.Mutex
+	root        *root
+	rw          bool // DB FSM
+	rwmu        sync.RWMutex
+	store       storage
+	tnl         int // Transaction nesting level
+	exprCache   map[string]expression
+	exprCacheMu sync.Mutex
+	hasIndex2   int // 0: nope, 1: in progress, 2: yes.
+}
+
+var selIndex2Expr = MustCompile("select Expr from __Index2_Expr where Index2_ID == $1")
+
+func newDB(store storage) (db *DB, err error) {
+	db0 := &DB{
+		exprCache: map[string]expression{},
+		store:     store,
+	}
+	if db0.root, err = newRoot(store); err != nil {
+		return
+	}
+
+	ctx := &execCtx{db: db0}
+	for _, t := range db0.root.tables {
+		if err := t.constraintsAndDefaults(ctx); err != nil {
+			return nil, err
+		}
+	}
+
+	if !db0.hasAllIndex2() {
+		return db0, nil
+	}
+
+	db0.hasIndex2 = 2
+	rss, _, err := db0.Run(nil, "select id(), TableName, IndexName, IsUnique, Root from __Index2 where !IsSimple")
+	if err != nil {
+		return nil, err
+	}
+
+	rows, err := rss[0].Rows(-1, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, row := range rows {
+		defer func() {
+			if e := recover(); e != nil {
+				err = fmt.Errorf("error loading DB indices: %v", e)
+			}
+		}()
+
+		id := row[0].(int64)
+		tn := row[1].(string)
+		xn := row[2].(string)
+		unique := row[3].(bool)
+		xroot := row[4].(int64)
+
+		t := db0.root.tables[tn]
+		if t == nil {
+			return nil, fmt.Errorf("DB index refers to nonexistent table: %s", tn)
+		}
+
+		x, err := store.OpenIndex(unique, xroot)
+		if err != nil {
+			return nil, err
+		}
+
+		if v := t.indices2[xn]; v != nil {
+			return nil, fmt.Errorf("duplicate DB index: %s", xn)
+		}
+
+		ix := &index2{
+			unique: unique,
+			x:      x,
+			xroot:  xroot,
+		}
+
+		rss, _, err := db0.Execute(nil, selIndex2Expr, id)
+		if err != nil {
+			return nil, err
+		}
+
+		rows, err := rss[0].Rows(-1, 0)
+		if err != nil {
+			return nil, err
+		}
+
+		if len(rows) == 0 {
+			return nil, fmt.Errorf("index has no expression: %s", xn)
+		}
+
+		var sources []string
+		var list []expression
+		for _, row := range rows {
+			src, ok := row[0].(string)
+			if !ok {
+				return nil, fmt.Errorf("index %s: expression of type %T", xn, row[0])
+			}
+
+			expr, err := db0.str2expr(src)
+			if err != nil {
+				return nil, fmt.Errorf("index %s: expression error: %v", xn, err)
+			}
+
+			sources = append(sources, src)
+			list = append(list, expr)
+		}
+
+		ix.sources = sources
+		ix.exprList = list
+		if t.indices2 == nil {
+			t.indices2 = map[string]*index2{}
+		}
+		t.indices2[xn] = ix
+	}
+	return db0, nil
+}
+
+func (db *DB) deleteIndex2ByIndexName(nm string) error {
+	for _, s := range deleteIndex2ByIndexName.l {
+		if _, err := s.exec(&execCtx{db: db, arg: []interface{}{nm}}); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (db *DB) deleteIndex2ByTableName(nm string) error {
+	for _, s := range deleteIndex2ByTableName.l {
+		if _, err := s.exec(&execCtx{db: db, arg: []interface{}{nm}}); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (db *DB) createIndex2() error {
+	if db.hasIndex2 != 0 {
+		return nil
+	}
+
+	db.hasIndex2 = 1
+	ctx := execCtx{db: db}
+	for _, s := range createIndex2.l {
+		if _, err := s.exec(&ctx); err != nil {
+			db.hasIndex2 = 0
+			return err
+		}
+	}
+
+	for t := db.root.thead; t != nil; t = t.tnext {
+		for i, index := range t.indices {
+			if index == nil {
+				continue
+			}
+
+			expr := "id()"
+			if i != 0 {
+				expr = t.cols[i-1].name
+			}
+
+			if err := db.insertIndex2(t.name, index.name, []string{expr}, index.unique, true, index.xroot); err != nil {
+				db.hasIndex2 = 0
+				return err
+			}
+		}
+	}
+
+	db.hasIndex2 = 2
+	return nil
+}
+
+func (db *DB) insertIndex2(tableName, indexName string, expr []string, unique, isSimple bool, h int64) error {
+	ctx := execCtx{db: db}
+	ctx.arg = []interface{}{
+		tableName,
+		indexName,
+		unique,
+		isSimple,
+		h,
+	}
+	if _, err := insertIndex2.l[0].exec(&ctx); err != nil {
+		return err
+	}
+
+	id := db.root.lastInsertID
+	for _, e := range expr {
+		ctx.arg = []interface{}{id, e}
+		if _, err := insertIndex2Expr.l[0].exec(&ctx); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (db *DB) hasAllIndex2() bool {
+	t := db.root.tables
+	if _, ok := t["__Index2"]; !ok {
+		return false
+	}
+
+	_, ok := t["__Index2_Expr"]
+	return ok
+}
+
+func (db *DB) str2expr(expr string) (expression, error) {
+	db.exprCacheMu.Lock()
+	e := db.exprCache[expr]
+	db.exprCacheMu.Unlock()
+	if e != nil {
+		return e, nil
+	}
+
+	e, err := compileExpr(expr)
+	if err != nil {
+		return nil, err
+	}
+
+	db.exprCacheMu.Lock()
+	for k := range db.exprCache {
+		if len(db.exprCache) < 1000 {
+			break
+		}
+
+		delete(db.exprCache, k)
+	}
+	db.exprCache[expr] = e
+	db.exprCacheMu.Unlock()
+	return e, nil
+}
+
+// Name returns the name of the DB.
+func (db *DB) Name() string { return db.store.Name() }
+
+// Run compiles and executes a statement list.  It returns, if applicable, a
+// RecordSet slice and/or an index and error.
+//
+// For more details please see DB.Execute
+//
+// Run is safe for concurrent use by multiple goroutines.
+func (db *DB) Run(ctx *TCtx, ql string, arg ...interface{}) (rs []Recordset, index int, err error) {
+	l, err := Compile(ql)
+	if err != nil {
+		return nil, -1, err
+	}
+
+	return db.Execute(ctx, l, arg...)
+}
+
+func (db *DB) run(ctx *TCtx, ql string, arg ...interface{}) (rs []Recordset, index int, err error) {
+	l, err := compile(ql)
+	if err != nil {
+		return nil, -1, err
+	}
+
+	return db.Execute(ctx, l, arg...)
+}
+
+// Compile parses the ql statements from src and returns a compiled list for
+// DB.Execute or an error if any.
+//
+// Compile is safe for concurrent use by multiple goroutines.
+func Compile(src string) (List, error) {
+	l := newLexer(src)
+	if yyParse(l) != 0 {
+		return List{}, l.errs[0]
+	}
+
+	return List{l.list, l.params}, nil
+}
+
+func compileExpr(src string) (expression, error) {
+	l := newLexer(src)
+	l.inj = parseExpression
+	if yyParse(l) != 0 {
+		return nil, l.errs[0]
+	}
+
+	return l.expr, nil
+}
+
+func compile(src string) (List, error) {
+	l := newLexer(src)
+	l.root = true
+	if yyParse(l) != 0 {
+		return List{}, l.errs[0]
+	}
+
+	return List{l.list, l.params}, nil
+}
+
+// MustCompile is like Compile but panics if the ql statements in src cannot be
+// compiled. It simplifies safe initialization of global variables holding
+// compiled statement lists for DB.Execute.
+//
+// MustCompile is safe for concurrent use by multiple goroutines.
+func MustCompile(src string) List {
+	list, err := Compile(src)
+	if err != nil {
+		panic("ql: Compile(" + strconv.Quote(src) + "): " + err.Error()) // panic ok here
+	}
+
+	return list
+}
+
+func mustCompile(src string) List {
+	list, err := compile(src)
+	if err != nil {
+		panic("ql: compile(" + strconv.Quote(src) + "): " + err.Error()) // panic ok here
+	}
+
+	return list
+}
+
+// Execute executes statements in a list while substituting QL paramaters from
+// arg.
+//
+// The resulting []Recordset corresponds to the SELECT FROM statements in the
+// list.
+//
+// If err != nil then index is the zero based index of the failed QL statement.
+// Empty statements do not count.
+//
+// The FSM STT describing the relations between DB states, statements and the
+// ctx parameter.
+//
+//  +-----------+---------------------+------------------+------------------+------------------+
+//  |\  Event   |                     |                  |                  |                  |
+//  | \-------\ |     BEGIN           |                  |                  |    Other         |
+//  |   State  \|     TRANSACTION     |      COMMIT      |     ROLLBACK     |    statement     |
+//  +-----------+---------------------+------------------+------------------+------------------+
+//  | RD        | if PC == nil        | return error     | return error     | DB.RLock         |
+//  |           |     return error    |                  |                  | Execute(1)       |
+//  | CC == nil |                     |                  |                  | DB.RUnlock       |
+//  | TNL == 0  | DB.Lock             |                  |                  |                  |
+//  |           | CC = PC             |                  |                  |                  |
+//  |           | TNL++               |                  |                  |                  |
+//  |           | DB.BeginTransaction |                  |                  |                  |
+//  |           | State = WR          |                  |                  |                  |
+//  +-----------+---------------------+------------------+------------------+------------------+
+//  | WR        | if PC == nil        | if PC != CC      | if PC != CC      | if PC == nil     |
+//  |           |     return error    |     return error |     return error |     DB.Rlock     |
+//  | CC != nil |                     |                  |                  |     Execute(1)   |
+//  | TNL != 0  | if PC != CC         | DB.Commit        | DB.Rollback      |     RUnlock      |
+//  |           |     DB.Lock         | TNL--            | TNL--            | else if PC != CC |
+//  |           |     CC = PC         | if TNL == 0      | if TNL == 0      |     return error |
+//  |           |                     |     CC = nil     |     CC = nil     | else             |
+//  |           | TNL++               |     State = RD   |     State = RD   |     Execute(2)   |
+//  |           | DB.BeginTransaction |     DB.Unlock    |     DB.Unlock    |                  |
+//  +-----------+---------------------+------------------+------------------+------------------+
+//  CC: Curent transaction context
+//  PC: Passed transaction context
+//  TNL: Transaction nesting level
+//
+// Lock, Unlock, RLock, RUnlock semantics above are the same as in
+// sync.RWMutex.
+//
+// (1): Statement list is executed outside of a transaction. Attempts to update
+// the DB will fail, the execution context is read-only. Other statements with
+// read only context will execute concurrently. If any statement fails, the
+// execution of the statement list is aborted.
+//
+// Note that the RLock/RUnlock surrounds every single "other" statement when it
+// is executed outside of a transaction. If read consistency is required by a
+// list of more than one statement then an explicit BEGIN TRANSACTION / COMMIT
+// or ROLLBACK wrapper must be provided. Otherwise the state of the DB may
+// change in between executing any two out-of-transaction statements.
+//
+// (2): Statement list is executed inside an isolated transaction. Execution of
+// statements can update the DB, the execution context is read-write. If any
+// statement fails, the execution of the statement list is aborted and the DB
+// is automatically rolled back to the TNL which was active before the start of
+// execution of the statement list.
+//
+// Execute is safe for concurrent use by multiple goroutines, but one must
+// consider the blocking issues as discussed above.
+//
+// ACID
+//
+// Atomicity: Transactions are atomic. Transactions can be nested. Commit or
+// rollbacks work on the current transaction level. Transactions are made
+// persistent only on the top level commit. Reads made from within an open
+// transaction are dirty reads.
+//
+// Consistency: Transactions bring the DB from one structurally consistent
+// state to other structurally consistent state.
+//
+// Isolation: Transactions are isolated. Isolation is implemented by
+// serialization.
+//
+// Durability: Transactions are durable. A two phase commit protocol and a
+// write ahead log is used. Database is recovered after a crash from the write
+// ahead log automatically on open.
+func (db *DB) Execute(ctx *TCtx, l List, arg ...interface{}) (rs []Recordset, index int, err error) {
+	// Sanitize args
+	for i, v := range arg {
+		switch x := v.(type) {
+		case nil, bool, complex64, complex128, float32, float64, string,
+			int8, int16, int32, int64, int,
+			uint8, uint16, uint32, uint64, uint,
+			*big.Int, *big.Rat, []byte, time.Duration, time.Time:
+		case big.Int:
+			arg[i] = &x
+		case big.Rat:
+			arg[i] = &x
+		default:
+			return nil, 0, fmt.Errorf("cannot use arg[%d] (type %T):unsupported type", i, v)
+		}
+	}
+
+	tnl0 := -1
+	if ctx != nil {
+		ctx.LastInsertID, ctx.RowsAffected = 0, 0
+	}
+
+	list := l.l
+	for _, s := range list {
+		r, tnla, tnl, err := db.run1(ctx, s, arg...)
+		if tnl0 < 0 {
+			tnl0 = tnla
+		}
+		if err != nil {
+			for tnl > tnl0 {
+				var e2 error
+				if _, _, tnl, e2 = db.run1(ctx, rollbackStmt{}); e2 != nil {
+					err = e2
+				}
+			}
+			return rs, index, err
+		}
+
+		if r != nil {
+			if x, ok := r.(recordset); ok {
+				x.tx = ctx
+				r = x
+			}
+			rs = append(rs, r)
+		}
+	}
+	return
+}
+
+func (db *DB) run1(pc *TCtx, s stmt, arg ...interface{}) (rs Recordset, tnla, tnlb int, err error) {
+	db.mu.Lock()
+	tnla = db.tnl
+	tnlb = db.tnl
+	switch db.rw {
+	case false:
+		switch s.(type) {
+		case beginTransactionStmt:
+			defer db.mu.Unlock()
+			if pc == nil {
+				return nil, tnla, tnlb, errors.New("BEGIN TRANSACTION: cannot start a transaction in nil TransactionCtx")
+			}
+
+			if err = db.store.BeginTransaction(); err != nil {
+				return
+			}
+
+			db.beginTransaction()
+			db.rwmu.Lock()
+			db.cc = pc
+			db.tnl++
+			tnlb = db.tnl
+			db.rw = true
+			return
+		case commitStmt:
+			defer db.mu.Unlock()
+			return nil, tnla, tnlb, errCommitNotInTransaction
+		case rollbackStmt:
+			defer db.mu.Unlock()
+			return nil, tnla, tnlb, errRollbackNotInTransaction
+		default:
+			if s.isUpdating() {
+				db.mu.Unlock()
+				return nil, tnla, tnlb, fmt.Errorf("attempt to update the DB outside of a transaction")
+			}
+
+			db.rwmu.RLock() // can safely grab before Unlock
+			db.mu.Unlock()
+			defer db.rwmu.RUnlock()
+			rs, err = s.exec(&execCtx{db, arg}) // R/O tctx
+			return rs, tnla, tnlb, err
+		}
+	default: // case true:
+		switch s.(type) {
+		case beginTransactionStmt:
+			defer db.mu.Unlock()
+
+			if pc == nil {
+				return nil, tnla, tnlb, errBeginTransNoCtx
+			}
+
+			if pc != db.cc {
+				for db.rw == true {
+					db.mu.Unlock() // Transaction isolation
+					db.mu.Lock()
+				}
+
+				db.rw = true
+				db.rwmu.Lock()
+			}
+
+			if err = db.store.BeginTransaction(); err != nil {
+				return
+			}
+
+			db.beginTransaction()
+			db.cc = pc
+			db.tnl++
+			tnlb = db.tnl
+			return
+		case commitStmt:
+			defer db.mu.Unlock()
+			if pc != db.cc {
+				return nil, tnla, tnlb, fmt.Errorf("invalid passed transaction context")
+			}
+
+			db.commit()
+			err = db.store.Commit()
+			db.tnl--
+			tnlb = db.tnl
+			if db.tnl != 0 {
+				return
+			}
+
+			db.cc = nil
+			db.rw = false
+			db.rwmu.Unlock()
+			return
+		case rollbackStmt:
+			defer db.mu.Unlock()
+			defer func() { pc.LastInsertID = db.root.lastInsertID }()
+			if pc != db.cc {
+				return nil, tnla, tnlb, fmt.Errorf("invalid passed transaction context")
+			}
+
+			db.rollback()
+			err = db.store.Rollback()
+			db.tnl--
+			tnlb = db.tnl
+			if db.tnl != 0 {
+				return
+			}
+
+			db.cc = nil
+			db.rw = false
+			db.rwmu.Unlock()
+			return
+		default:
+			if pc == nil {
+				if s.isUpdating() {
+					db.mu.Unlock()
+					return nil, tnla, tnlb, fmt.Errorf("attempt to update the DB outside of a transaction")
+				}
+
+				db.mu.Unlock() // must Unlock before RLock
+				db.rwmu.RLock()
+				defer db.rwmu.RUnlock()
+				rs, err = s.exec(&execCtx{db, arg})
+				return rs, tnla, tnlb, err
+			}
+
+			defer db.mu.Unlock()
+			defer func() { pc.LastInsertID = db.root.lastInsertID }()
+			if pc != db.cc {
+				return nil, tnla, tnlb, fmt.Errorf("invalid passed transaction context")
+			}
+
+			rs, err = s.exec(&execCtx{db, arg})
+			return rs, tnla, tnlb, err
+		}
+	}
+}
+
+// Flush ends the transaction collecting window, if applicable. IOW, if the DB
+// is dirty, it schedules a 2PC (WAL + DB file) commit on the next outer most
+// DB.Commit or performs it synchronously if there's currently no open
+// transaction.
+//
+// The collecting window is an implementation detail and future versions of
+// Flush may become a no operation while keeping the operation semantics.
+func (db *DB) Flush() (err error) {
+	return nil
+}
+
+// Close will close the DB. Successful Close is idempotent.
+func (db *DB) Close() error {
+	db.mu.Lock()
+	defer db.mu.Unlock()
+	if db.store == nil {
+		return nil
+	}
+
+	if db.tnl != 0 {
+		return fmt.Errorf("cannot close DB while open transaction exist")
+	}
+
+	err := db.store.Close()
+	db.root, db.store = nil, nil
+	return err
+}
+
+func (db *DB) do(r recordset, f func(data []interface{}) (bool, error)) (err error) {
+	db.mu.Lock()
+	switch db.rw {
+	case false:
+		db.rwmu.RLock() // can safely grab before Unlock
+		db.mu.Unlock()
+		defer db.rwmu.RUnlock()
+	default: // case true:
+		if r.tx == nil {
+			db.mu.Unlock() // must Unlock before RLock
+			db.rwmu.RLock()
+			defer db.rwmu.RUnlock()
+			break
+		}
+
+		defer db.mu.Unlock()
+		if r.tx != db.cc {
+			return fmt.Errorf("invalid passed transaction context")
+		}
+	}
+
+	return r.do(r.ctx, func(id interface{}, data []interface{}) (bool, error) {
+		if err = expand(data); err != nil {
+			return false, err
+		}
+
+		return f(data)
+	})
+}
+
+func (db *DB) beginTransaction() { //TODO Rewrite, must use much smaller undo info!
+	root := *db.root
+	root.parent = db.root
+	root.tables = make(map[string]*table, len(db.root.tables))
+	var tprev *table
+	for t := db.root.thead; t != nil; t = t.tnext {
+		t2 := t.clone()
+		root.tables[t2.name] = t2
+		t2.tprev = tprev
+		switch {
+		case tprev == nil:
+			root.thead = t2
+		default:
+			tprev.tnext = t2
+		}
+		tprev = t2
+	}
+	db.root = &root
+}
+
+func (db *DB) rollback() {
+	db.root = db.root.parent
+}
+
+func (db *DB) commit() {
+	db.root.parent = db.root.parent.parent
+}
+
+// Type represents a QL type (bigint, int, string, ...)
+type Type int
+
+// Values of ColumnInfo.Type.
+const (
+	BigInt     Type = qBigInt
+	BigRat          = qBigRat
+	Blob            = qBlob
+	Bool            = qBool
+	Complex128      = qComplex128
+	Complex64       = qComplex64
+	Duration        = qDuration
+	Float32         = qFloat32
+	Float64         = qFloat64
+	Int16           = qInt16
+	Int32           = qInt32
+	Int64           = qInt64
+	Int8            = qInt8
+	String          = qString
+	Time            = qTime
+	Uint16          = qUint16
+	Uint32          = qUint32
+	Uint64          = qUint64
+	Uint8           = qUint8
+)
+
+// String implements fmt.Stringer.
+func (t Type) String() string {
+	return typeStr(int(t))
+}
+
+// ColumnInfo provides meta data describing a table column.
+type ColumnInfo struct {
+	Name       string // Column name.
+	Type       Type   // Column type (BigInt, BigRat, ...).
+	NotNull    bool   // Column cannot be NULL.
+	Constraint string // Constraint expression, if any.
+	Default    string // Default expression, if any.
+}
+
+// TableInfo provides meta data describing a DB table.
+type TableInfo struct {
+	// Table name.
+	Name string
+
+	// Table schema. Columns are listed in the order in which they appear
+	// in the schema.
+	Columns []ColumnInfo
+}
+
+// IndexInfo provides meta data describing a DB index.  It corresponds to the
+// statement
+//
+//	CREATE INDEX Name ON Table (Column);
+type IndexInfo struct {
+	Name           string   // Index name
+	Table          string   // Table name.
+	Column         string   // Column name.
+	Unique         bool     // Wheter the index is unique.
+	ExpressionList []string // Index expression list.
+}
+
+// DbInfo provides meta data describing a DB.
+type DbInfo struct {
+	Name    string      // DB name.
+	Tables  []TableInfo // Tables in the DB.
+	Indices []IndexInfo // Indices in the DB.
+}
+
+func (db *DB) info() (r *DbInfo, err error) {
+	_, hasColumn2 := db.root.tables["__Column2"]
+	r = &DbInfo{Name: db.Name()}
+	for nm, t := range db.root.tables {
+		ti := TableInfo{Name: nm}
+		m := map[string]*ColumnInfo{}
+		if hasColumn2 {
+			rs, err := selectColumn2.l[0].exec(&execCtx{db: db, arg: []interface{}{nm}})
+			if err != nil {
+				return nil, err
+			}
+
+			if err := rs.(recordset).do(
+				&execCtx{db: db, arg: []interface{}{nm}},
+				func(id interface{}, data []interface{}) (bool, error) {
+					ci := &ColumnInfo{NotNull: data[1].(bool), Constraint: data[2].(string), Default: data[3].(string)}
+					m[data[0].(string)] = ci
+					return true, nil
+				},
+			); err != nil {
+				return nil, err
+			}
+		}
+		for _, c := range t.cols {
+			ci := ColumnInfo{Name: c.name, Type: Type(c.typ)}
+			if c2 := m[c.name]; c2 != nil {
+				ci.NotNull = c2.NotNull
+				ci.Constraint = c2.Constraint
+				ci.Default = c2.Default
+			}
+			ti.Columns = append(ti.Columns, ci)
+		}
+		r.Tables = append(r.Tables, ti)
+		for i, x := range t.indices {
+			if x == nil {
+				continue
+			}
+
+			var cn string
+			switch {
+			case i == 0:
+				cn = "id()"
+			default:
+				cn = t.cols0[i-1].name
+			}
+			r.Indices = append(r.Indices, IndexInfo{x.name, nm, cn, x.unique, []string{cn}})
+		}
+		var a []string
+		for k := range t.indices2 {
+			a = append(a, k)
+		}
+		for _, k := range a {
+			x := t.indices2[k]
+			a = a[:0]
+			for _, e := range x.exprList {
+				a = append(a, e.String())
+			}
+			r.Indices = append(r.Indices, IndexInfo{k, nm, "", x.unique, a})
+		}
+	}
+	return
+}
+
+// Info provides meta data describing a DB or an error if any. It locks the DB
+// to obtain the result.
+func (db *DB) Info() (r *DbInfo, err error) {
+	db.mu.Lock()
+	defer db.mu.Unlock()
+	return db.info()
+}
+
+type constraint struct {
+	expr expression // If expr == nil: constraint is 'NOT NULL'
+}
+
+func (c *constraint) clone() *constraint {
+	if c == nil {
+		return nil
+	}
+
+	var e expression
+	if c.expr != nil {
+		e, _ = c.expr.clone(nil)
+	}
+	return &constraint{e}
+}
+
+type joinRset struct {
+	sources []interface{}
+	typ     int
+	on      expression
+}
+
+func (r *joinRset) String() string {
+	a := make([]string, len(r.sources))
+	for i, pair0 := range r.sources {
+		pair := pair0.([]interface{})
+		altName := pair[1].(string)
+		switch x := pair[0].(type) {
+		case string: // table name
+			switch {
+			case altName == "":
+				a[i] = x
+			default:
+				a[i] = fmt.Sprintf("%s AS %s", x, altName)
+			}
+		case *selectStmt:
+			switch {
+			case altName == "":
+				a[i] = fmt.Sprintf("(%s)", x)
+			default:
+				a[i] = fmt.Sprintf("(%s) AS %s", x, altName)
+			}
+		default:
+			panic("internal error 054")
+		}
+	}
+	n := len(a)
+	a2 := a[:n-1]
+	j := a[n-1]
+	var s string
+	switch r.typ {
+	case crossJoin:
+		return strings.Join(a, ", ")
+	case leftJoin:
+		s = strings.Join(a2, ",") + " LEFT"
+	case rightJoin:
+		s = strings.Join(a2, ",") + " RIGHT"
+	case fullJoin:
+		s = strings.Join(a2, ",") + " FULL"
+	}
+	s += " OUTER JOIN " + j + " ON " + r.on.String()
+	return s
+}
+
+func (r *joinRset) plan(ctx *execCtx) (plan, error) {
+	rsets := make([]plan, len(r.sources))
+	names := make([]string, len(r.sources))
+	var err error
+	m := map[string]bool{}
+	var fields []string
+	for i, v := range r.sources {
+		pair := v.([]interface{})
+		src := pair[0]
+		nm := pair[1].(string)
+		if s, ok := src.(string); ok {
+			src = tableRset(s)
+			if nm == "" {
+				nm = s
+			}
+		}
+		if m[nm] {
+			return nil, fmt.Errorf("%s: duplicate name %s", r.String(), nm)
+		}
+
+		if nm != "" {
+			m[nm] = true
+		}
+		names[i] = nm
+		var q plan
+		switch x := src.(type) {
+		case rset:
+			if q, err = x.plan(ctx); err != nil {
+				return nil, err
+			}
+		case plan:
+			q = x
+		default:
+			panic("internal error 008")
+		}
+
+		switch {
+		case len(r.sources) == 1:
+			fields = q.fieldNames()
+		default:
+			for _, f := range q.fieldNames() {
+				if strings.Contains(f, ".") {
+					return nil, fmt.Errorf("cannot join on recordset with already qualified field names (use the AS clause): %s", f)
+				}
+
+				if f != "" && nm != "" {
+					f = fmt.Sprintf("%s.%s", nm, f)
+				}
+				if nm == "" {
+					f = ""
+				}
+				fields = append(fields, f)
+			}
+		}
+		rsets[i] = q
+	}
+
+	if len(rsets) == 1 {
+		return rsets[0], nil
+	}
+
+	right := len(rsets[len(rsets)-1].fieldNames())
+	switch r.typ {
+	case crossJoin:
+		return &crossJoinDefaultPlan{rsets: rsets, names: names, fields: fields}, nil
+	case leftJoin:
+		return &leftJoinDefaultPlan{rsets: rsets, names: names, fields: fields, on: r.on, right: right}, nil
+	case rightJoin:
+		return &rightJoinDefaultPlan{leftJoinDefaultPlan{rsets: rsets, names: names, fields: fields, on: r.on, right: right}}, nil
+	case fullJoin:
+		return &fullJoinDefaultPlan{leftJoinDefaultPlan{rsets: rsets, names: names, fields: fields, on: r.on, right: right}}, nil
+	default:
+		panic("internal error 010")
+	}
+}
+
+type fld struct {
+	expr expression
+	name string
+}
diff --git a/vendor/github.com/cznic/ql/scanner.go b/vendor/github.com/cznic/ql/scanner.go
new file mode 100644
index 0000000000..aafa3cf8fa
--- /dev/null
+++ b/vendor/github.com/cznic/ql/scanner.go
@@ -0,0 +1,4129 @@
+// CAUTION: Generated file - DO NOT EDIT.
+
+/*
+Copyright (c) 2014 The ql Authors. All rights reserved.
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file.
+*/
+
+package ql
+
+import (
+	"fmt"
+	"math"
+	"strconv"
+	"unicode"
+)
+
+type lexer struct {
+	agg    []bool
+	c      int
+	col    int
+	errs   []error
+	expr   expression
+	i      int
+	inj    int
+	lcol   int
+	line   int
+	list   []stmt
+	ncol   int
+	nline  int
+	params int
+	sc     int
+	src    string
+	val    []byte
+	root   bool
+}
+
+func newLexer(src string) (l *lexer) {
+	l = &lexer{
+		src:   src,
+		nline: 1,
+		ncol:  0,
+	}
+	l.next()
+	return
+}
+
+func (l *lexer) next() int {
+	if l.c != 0 {
+		l.val = append(l.val, byte(l.c))
+	}
+	l.c = 0
+	if l.i < len(l.src) {
+		l.c = int(l.src[l.i])
+		l.i++
+	}
+	switch l.c {
+	case '\n':
+		l.lcol = l.ncol
+		l.nline++
+		l.ncol = 0
+	default:
+		l.ncol++
+	}
+	return l.c
+}
+
+func (l *lexer) err0(ln, c int, s string, arg ...interface{}) {
+	err := fmt.Errorf(fmt.Sprintf("%d:%d ", ln, c)+s, arg...)
+	l.errs = append(l.errs, err)
+}
+
+func (l *lexer) err(s string, arg ...interface{}) {
+	l.err0(l.line, l.col, s, arg...)
+}
+
+func (l *lexer) Error(s string) {
+	l.err(s)
+}
+
+func (l *lexer) Lex(lval *yySymType) (r int) {
+	//defer func() { dbg("Lex -> %d(%#x)", r, r) }()
+	defer func() {
+		lval.line, lval.col = l.line, l.col
+	}()
+	const (
+		INITIAL = iota
+		S1
+		S2
+	)
+
+	if n := l.inj; n != 0 {
+		l.inj = 0
+		return n
+	}
+
+	c0, c := 0, l.c
+
+yystate0:
+
+	l.val = l.val[:0]
+	c0, l.line, l.col = l.c, l.nline, l.ncol
+
+	switch yyt := l.sc; yyt {
+	default:
+		panic(fmt.Errorf(`invalid start condition %d`, yyt))
+	case 0: // start condition: INITIAL
+		goto yystart1
+	case 1: // start condition: S1
+		goto yystart319
+	case 2: // start condition: S2
+		goto yystart324
+	}
+
+	goto yystate0 // silence unused label error
+	goto yystate1 // silence unused label error
+yystate1:
+	c = l.next()
+yystart1:
+	switch {
+	default:
+		goto yystate3 // c >= '\x01' && c <= '\b' || c == '\v' || c == '\f' || c >= '\x0e' && c <= '\x1f' || c == '#' || c == '%%' || c >= '(' && c <= ',' || c == ':' || c == ';' || c == '@' || c >= '[' && c <= '^' || c == '{' || c >= '}' && c <= 'ÿ'
+	case c == '!':
+		goto yystate6
+	case c == '"':
+		goto yystate8
+	case c == '$' || c == '?':
+		goto yystate9
+	case c == '&':
+		goto yystate11
+	case c == '-':
+		goto yystate19
+	case c == '.':
+		goto yystate21
+	case c == '/':
+		goto yystate27
+	case c == '0':
+		goto yystate32
+	case c == '<':
+		goto yystate40
+	case c == '=':
+		goto yystate43
+	case c == '>':
+		goto yystate45
+	case c == 'A' || c == 'a':
+		goto yystate48
+	case c == 'B' || c == 'b':
+		goto yystate60
+	case c == 'C' || c == 'c':
+		goto yystate87
+	case c == 'D' || c == 'd':
+		goto yystate111
+	case c == 'E' || c == 'e':
+		goto yystate141
+	case c == 'F' || c == 'f':
+		goto yystate152
+	case c == 'G' || c == 'g':
+		goto yystate171
+	case c == 'H' || c == 'K' || c == 'M' || c == 'P' || c == 'Q' || c >= 'X' && c <= 'Z' || c == '_' || c == 'h' || c == 'k' || c == 'm' || c == 'p' || c == 'q' || c >= 'x' && c <= 'z':
+		goto yystate176
+	case c == 'I' || c == 'i':
+		goto yystate177
+	case c == 'J' || c == 'j':
+		goto yystate197
+	case c == 'L' || c == 'l':
+		goto yystate201
+	case c == 'N' || c == 'n':
+		goto yystate211
+	case c == 'O' || c == 'o':
+		goto yystate217
+	case c == 'R' || c == 'r':
+		goto yystate232
+	case c == 'S' || c == 's':
+		goto yystate247
+	case c == 'T' || c == 't':
+		goto yystate259
+	case c == 'U' || c == 'u':
+		goto yystate284
+	case c == 'V' || c == 'v':
+		goto yystate305
+	case c == 'W' || c == 'w':
+		goto yystate311
+	case c == '\'':
+		goto yystate14
+	case c == '\n':
+		goto yystate5
+	case c == '\t' || c == '\r' || c == ' ':
+		goto yystate4
+	case c == '\x00':
+		goto yystate2
+	case c == '`':
+		goto yystate316
+	case c == '|':
+		goto yystate317
+	case c >= '1' && c <= '9':
+		goto yystate38
+	}
+
+yystate2:
+	c = l.next()
+	goto yyrule1
+
+yystate3:
+	c = l.next()
+	goto yyrule101
+
+yystate4:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule2
+	case c == '\t' || c == '\n' || c == '\r' || c == ' ':
+		goto yystate5
+	}
+
+yystate5:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule2
+	case c == '\t' || c == '\n' || c == '\r' || c == ' ':
+		goto yystate5
+	}
+
+yystate6:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c == '=':
+		goto yystate7
+	}
+
+yystate7:
+	c = l.next()
+	goto yyrule21
+
+yystate8:
+	c = l.next()
+	goto yyrule10
+
+yystate9:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c >= '0' && c <= '9':
+		goto yystate10
+	}
+
+yystate10:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule100
+	case c >= '0' && c <= '9':
+		goto yystate10
+	}
+
+yystate11:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c == '&':
+		goto yystate12
+	case c == '^':
+		goto yystate13
+	}
+
+yystate12:
+	c = l.next()
+	goto yyrule15
+
+yystate13:
+	c = l.next()
+	goto yyrule16
+
+yystate14:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c == '\'':
+		goto yystate16
+	case c == '\\':
+		goto yystate17
+	case c >= '\x01' && c <= '&' || c >= '(' && c <= '[' || c >= ']' && c <= 'ÿ':
+		goto yystate15
+	}
+
+yystate15:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c == '\'':
+		goto yystate16
+	case c == '\\':
+		goto yystate17
+	case c >= '\x01' && c <= '&' || c >= '(' && c <= '[' || c >= ']' && c <= 'ÿ':
+		goto yystate15
+	}
+
+yystate16:
+	c = l.next()
+	goto yyrule12
+
+yystate17:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c == '\'':
+		goto yystate18
+	case c == '\\':
+		goto yystate17
+	case c >= '\x01' && c <= '&' || c >= '(' && c <= '[' || c >= ']' && c <= 'ÿ':
+		goto yystate15
+	}
+
+yystate18:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule12
+	case c == '\'':
+		goto yystate16
+	case c == '\\':
+		goto yystate17
+	case c >= '\x01' && c <= '&' || c >= '(' && c <= '[' || c >= ']' && c <= 'ÿ':
+		goto yystate15
+	}
+
+yystate19:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c == '-':
+		goto yystate20
+	}
+
+yystate20:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule3
+	case c >= '\x01' && c <= '\t' || c >= '\v' && c <= 'ÿ':
+		goto yystate20
+	}
+
+yystate21:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c >= '0' && c <= '9':
+		goto yystate22
+	}
+
+yystate22:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule9
+	case c == 'E' || c == 'e':
+		goto yystate23
+	case c == 'i':
+		goto yystate26
+	case c >= '0' && c <= '9':
+		goto yystate22
+	}
+
+yystate23:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c == '+' || c == '-':
+		goto yystate24
+	case c >= '0' && c <= '9':
+		goto yystate25
+	}
+
+yystate24:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c >= '0' && c <= '9':
+		goto yystate25
+	}
+
+yystate25:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule9
+	case c == 'i':
+		goto yystate26
+	case c >= '0' && c <= '9':
+		goto yystate25
+	}
+
+yystate26:
+	c = l.next()
+	goto yyrule7
+
+yystate27:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c == '*':
+		goto yystate28
+	case c == '/':
+		goto yystate31
+	}
+
+yystate28:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c == '*':
+		goto yystate29
+	case c >= '\x01' && c <= ')' || c >= '+' && c <= 'ÿ':
+		goto yystate28
+	}
+
+yystate29:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c == '*':
+		goto yystate29
+	case c == '/':
+		goto yystate30
+	case c >= '\x01' && c <= ')' || c >= '+' && c <= '.' || c >= '0' && c <= 'ÿ':
+		goto yystate28
+	}
+
+yystate30:
+	c = l.next()
+	goto yyrule5
+
+yystate31:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule4
+	case c >= '\x01' && c <= '\t' || c >= '\v' && c <= 'ÿ':
+		goto yystate31
+	}
+
+yystate32:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule8
+	case c == '.':
+		goto yystate22
+	case c == '8' || c == '9':
+		goto yystate34
+	case c == 'E' || c == 'e':
+		goto yystate23
+	case c == 'X' || c == 'x':
+		goto yystate36
+	case c == 'i':
+		goto yystate35
+	case c >= '0' && c <= '7':
+		goto yystate33
+	}
+
+yystate33:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule8
+	case c == '.':
+		goto yystate22
+	case c == '8' || c == '9':
+		goto yystate34
+	case c == 'E' || c == 'e':
+		goto yystate23
+	case c == 'i':
+		goto yystate35
+	case c >= '0' && c <= '7':
+		goto yystate33
+	}
+
+yystate34:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c == '.':
+		goto yystate22
+	case c == 'E' || c == 'e':
+		goto yystate23
+	case c == 'i':
+		goto yystate35
+	case c >= '0' && c <= '9':
+		goto yystate34
+	}
+
+yystate35:
+	c = l.next()
+	goto yyrule6
+
+yystate36:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'a' && c <= 'f':
+		goto yystate37
+	}
+
+yystate37:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule8
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'a' && c <= 'f':
+		goto yystate37
+	}
+
+yystate38:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule8
+	case c == '.':
+		goto yystate22
+	case c == 'E' || c == 'e':
+		goto yystate23
+	case c == 'i':
+		goto yystate35
+	case c >= '0' && c <= '9':
+		goto yystate39
+	}
+
+yystate39:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule8
+	case c == '.':
+		goto yystate22
+	case c == 'E' || c == 'e':
+		goto yystate23
+	case c == 'i':
+		goto yystate35
+	case c >= '0' && c <= '9':
+		goto yystate39
+	}
+
+yystate40:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c == '<':
+		goto yystate41
+	case c == '=':
+		goto yystate42
+	}
+
+yystate41:
+	c = l.next()
+	goto yyrule17
+
+yystate42:
+	c = l.next()
+	goto yyrule18
+
+yystate43:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c == '=':
+		goto yystate44
+	}
+
+yystate44:
+	c = l.next()
+	goto yyrule19
+
+yystate45:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c == '=':
+		goto yystate46
+	case c == '>':
+		goto yystate47
+	}
+
+yystate46:
+	c = l.next()
+	goto yyrule20
+
+yystate47:
+	c = l.next()
+	goto yyrule23
+
+yystate48:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'D' || c == 'd':
+		goto yystate50
+	case c == 'L' || c == 'l':
+		goto yystate52
+	case c == 'N' || c == 'n':
+		goto yystate56
+	case c == 'S' || c == 's':
+		goto yystate58
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'K' || c == 'M' || c >= 'O' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'k' || c == 'm' || c >= 'o' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate49:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate50:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'D' || c == 'd':
+		goto yystate51
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'z':
+		goto yystate49
+	}
+
+yystate51:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule24
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate52:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate53
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate53:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate54
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate54:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'R' || c == 'r':
+		goto yystate55
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate55:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule25
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate56:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'D' || c == 'd':
+		goto yystate57
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'z':
+		goto yystate49
+	}
+
+yystate57:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule26
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate58:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule28
+	case c == 'C' || c == 'c':
+		goto yystate59
+	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
+		goto yystate49
+	}
+
+yystate59:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule27
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate60:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate61
+	case c == 'I' || c == 'i':
+		goto yystate70
+	case c == 'L' || c == 'l':
+		goto yystate78
+	case c == 'O' || c == 'o':
+		goto yystate81
+	case c == 'Y' || c == 'y':
+		goto yystate84
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'H' || c == 'J' || c == 'K' || c == 'M' || c == 'N' || c >= 'P' && c <= 'X' || c == 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'h' || c == 'j' || c == 'k' || c == 'm' || c == 'n' || c >= 'p' && c <= 'x' || c == 'z':
+		goto yystate49
+	}
+
+yystate61:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'G' || c == 'g':
+		goto yystate62
+	case c == 'T' || c == 't':
+		goto yystate65
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'H' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'f' || c >= 'h' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate62:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate63
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate63:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate64
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate64:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule29
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate65:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'W' || c == 'w':
+		goto yystate66
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'V' || c >= 'X' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'v' || c >= 'x' && c <= 'z':
+		goto yystate49
+	}
+
+yystate66:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate67
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate67:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate68
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate68:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate69
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate69:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule30
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate70:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'G' || c == 'g':
+		goto yystate71
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'H' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'f' || c >= 'h' && c <= 'z':
+		goto yystate49
+	}
+
+yystate71:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate72
+	case c == 'R' || c == 'r':
+		goto yystate75
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate72:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate73
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate73:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate74
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate74:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule75
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate75:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate76
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate76:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate77
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate77:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule76
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate78:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate79
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	}
+
+yystate79:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'B' || c == 'b':
+		goto yystate80
+	case c >= '0' && c <= '9' || c == 'A' || c >= 'C' && c <= 'Z' || c == '_' || c == 'a' || c >= 'c' && c <= 'z':
+		goto yystate49
+	}
+
+yystate80:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule77
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate81:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate82
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	}
+
+yystate82:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate83
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate83:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule78
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate84:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule31
+	case c == 'T' || c == 't':
+		goto yystate85
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate85:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate86
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate86:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule79
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate87:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate88
+	case c == 'R' || c == 'r':
+		goto yystate106
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c == 'P' || c == 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c == 'p' || c == 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate88:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate89
+	case c == 'M' || c == 'm':
+		goto yystate93
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'n' && c <= 'z':
+		goto yystate49
+	}
+
+yystate89:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'U' || c == 'u':
+		goto yystate90
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate90:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'M' || c == 'm':
+		goto yystate91
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'L' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'l' || c >= 'n' && c <= 'z':
+		goto yystate49
+	}
+
+yystate91:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate92
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate92:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule32
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate93:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'M' || c == 'm':
+		goto yystate94
+	case c == 'P' || c == 'p':
+		goto yystate97
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'L' || c == 'N' || c == 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'l' || c == 'n' || c == 'o' || c >= 'q' && c <= 'z':
+		goto yystate49
+	}
+
+yystate94:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate95
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate95:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate96
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate96:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule33
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate97:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate98
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate98:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate99
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate99:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'X' || c == 'x':
+		goto yystate100
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'W' || c == 'Y' || c == 'Z' || c == '_' || c >= 'a' && c <= 'w' || c == 'y' || c == 'z':
+		goto yystate49
+	}
+
+yystate100:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '0' || c >= '2' && c <= '5' || c >= '7' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	case c == '1':
+		goto yystate101
+	case c == '6':
+		goto yystate104
+	}
+
+yystate101:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '0' || c == '1' || c >= '3' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	case c == '2':
+		goto yystate102
+	}
+
+yystate102:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '8':
+		goto yystate103
+	case c >= '0' && c <= '7' || c == '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate103:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule80
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate104:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '4':
+		goto yystate105
+	case c >= '0' && c <= '3' || c >= '5' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate105:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule81
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate106:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate107
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate107:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate108
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate108:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate109
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate109:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate110
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate110:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule34
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate111:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate112
+	case c == 'I' || c == 'i':
+		goto yystate124
+	case c == 'R' || c == 'r':
+		goto yystate131
+	case c == 'U' || c == 'u':
+		goto yystate134
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'H' || c >= 'J' && c <= 'Q' || c == 'S' || c == 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'h' || c >= 'j' && c <= 'q' || c == 's' || c == 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate112:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'F' || c == 'f':
+		goto yystate113
+	case c == 'L' || c == 'l':
+		goto yystate118
+	case c == 'S' || c == 's':
+		goto yystate122
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'K' || c >= 'M' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'k' || c >= 'm' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate113:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate114
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate114:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'U' || c == 'u':
+		goto yystate115
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate115:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate116
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate116:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate117
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate117:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule35
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate118:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate119
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate119:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate120
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate120:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate121
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate121:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule36
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate122:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'C' || c == 'c':
+		goto yystate123
+	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
+		goto yystate49
+	}
+
+yystate123:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule37
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate124:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'S' || c == 's':
+		goto yystate125
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate125:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate126
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate126:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate127
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate127:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate128
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate128:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'C' || c == 'c':
+		goto yystate129
+	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
+		goto yystate49
+	}
+
+yystate129:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate130
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate130:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule38
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate131:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate132
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	}
+
+yystate132:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'P' || c == 'p':
+		goto yystate133
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'o' || c >= 'q' && c <= 'z':
+		goto yystate49
+	}
+
+yystate133:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule39
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate134:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'R' || c == 'r':
+		goto yystate135
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate135:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate136
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate136:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate137
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate137:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate138
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate138:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate139
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	}
+
+yystate139:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate140
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate140:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule82
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate141:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'X' || c == 'x':
+		goto yystate142
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'W' || c == 'Y' || c == 'Z' || c == '_' || c >= 'a' && c <= 'w' || c == 'y' || c == 'z':
+		goto yystate49
+	}
+
+yystate142:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate143
+	case c == 'P' || c == 'p':
+		goto yystate147
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'o' || c >= 'q' && c <= 'z':
+		goto yystate49
+	}
+
+yystate143:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'S' || c == 's':
+		goto yystate144
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate144:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate145
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate145:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'S' || c == 's':
+		goto yystate146
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate146:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule40
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate147:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate148
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate148:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate149
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate149:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate150
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate150:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate151
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate151:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule41
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate152:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate153
+	case c == 'L' || c == 'l':
+		goto yystate157
+	case c == 'R' || c == 'r':
+		goto yystate165
+	case c == 'U' || c == 'u':
+		goto yystate168
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'K' || c >= 'M' && c <= 'Q' || c == 'S' || c == 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'k' || c >= 'm' && c <= 'q' || c == 's' || c == 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate153:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate154
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate154:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'S' || c == 's':
+		goto yystate155
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate155:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate156
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate156:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule73
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate157:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate158
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	}
+
+yystate158:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate159
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate159:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate160
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate160:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule83
+	case c == '3':
+		goto yystate161
+	case c == '6':
+		goto yystate163
+	case c >= '0' && c <= '2' || c == '4' || c == '5' || c >= '7' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate161:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '0' || c == '1' || c >= '3' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	case c == '2':
+		goto yystate162
+	}
+
+yystate162:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule84
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate163:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '4':
+		goto yystate164
+	case c >= '0' && c <= '3' || c >= '5' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate164:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule85
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate165:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate166
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	}
+
+yystate166:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'M' || c == 'm':
+		goto yystate167
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'L' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'l' || c >= 'n' && c <= 'z':
+		goto yystate49
+	}
+
+yystate167:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule42
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate168:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate169
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate169:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate170
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate170:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule43
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate171:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'R' || c == 'r':
+		goto yystate172
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate172:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate173
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	}
+
+yystate173:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'U' || c == 'u':
+		goto yystate174
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate174:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'P' || c == 'p':
+		goto yystate175
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'o' || c >= 'q' && c <= 'z':
+		goto yystate49
+	}
+
+yystate175:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule44
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate176:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate177:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'F' || c == 'f':
+		goto yystate178
+	case c == 'N' || c == 'n':
+		goto yystate179
+	case c == 'S' || c == 's':
+		goto yystate196
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'M' || c >= 'O' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'm' || c >= 'o' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate178:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule45
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate179:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule49
+	case c == 'D' || c == 'd':
+		goto yystate180
+	case c == 'S' || c == 's':
+		goto yystate183
+	case c == 'T' || c == 't':
+		goto yystate187
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'R' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'r' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate180:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate181
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate181:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'X' || c == 'x':
+		goto yystate182
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'W' || c == 'Y' || c == 'Z' || c == '_' || c >= 'a' && c <= 'w' || c == 'y' || c == 'z':
+		goto yystate49
+	}
+
+yystate182:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule46
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate183:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate184
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate184:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'R' || c == 'r':
+		goto yystate185
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate185:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate186
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate186:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule47
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate187:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule86
+	case c == '0' || c == '2' || c == '4' || c == '5' || c == '7' || c == '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	case c == '1':
+		goto yystate188
+	case c == '3':
+		goto yystate190
+	case c == '6':
+		goto yystate192
+	case c == '8':
+		goto yystate194
+	case c == 'O' || c == 'o':
+		goto yystate195
+	}
+
+yystate188:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '6':
+		goto yystate189
+	case c >= '0' && c <= '5' || c >= '7' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate189:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule87
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate190:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '0' || c == '1' || c >= '3' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	case c == '2':
+		goto yystate191
+	}
+
+yystate191:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule88
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate192:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '4':
+		goto yystate193
+	case c >= '0' && c <= '3' || c >= '5' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate193:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule89
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate194:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule90
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate195:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule48
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate196:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule50
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate197:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate198
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	}
+
+yystate198:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate199
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate199:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate200
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate200:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule51
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate201:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate202
+	case c == 'I' || c == 'i':
+		goto yystate205
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate202:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'F' || c == 'f':
+		goto yystate203
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'z':
+		goto yystate49
+	}
+
+yystate203:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate204
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate204:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule52
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate205:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'K' || c == 'k':
+		goto yystate206
+	case c == 'M' || c == 'm':
+		goto yystate208
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'J' || c == 'L' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'j' || c == 'l' || c >= 'n' && c <= 'z':
+		goto yystate49
+	}
+
+yystate206:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate207
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate207:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule53
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate208:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate209
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate209:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate210
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate210:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule54
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate211:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate212
+	case c == 'U' || c == 'u':
+		goto yystate214
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate212:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate213
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate213:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule55
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate214:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate215
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate215:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate216
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate216:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule72
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate217:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'F' || c == 'f':
+		goto yystate218
+	case c == 'N' || c == 'n':
+		goto yystate223
+	case c == 'R' || c == 'r':
+		goto yystate224
+	case c == 'U' || c == 'u':
+		goto yystate228
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'M' || c >= 'O' && c <= 'Q' || c == 'S' || c == 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'm' || c >= 'o' && c <= 'q' || c == 's' || c == 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate218:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'F' || c == 'f':
+		goto yystate219
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'z':
+		goto yystate49
+	}
+
+yystate219:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'S' || c == 's':
+		goto yystate220
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate220:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate221
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate221:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate222
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate222:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule56
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate223:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule57
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate224:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule59
+	case c == 'D' || c == 'd':
+		goto yystate225
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'z':
+		goto yystate49
+	}
+
+yystate225:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate226
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate226:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'R' || c == 'r':
+		goto yystate227
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate227:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule58
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate228:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate229
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate229:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate230
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate230:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'R' || c == 'r':
+		goto yystate231
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate231:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule60
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate232:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate233
+	case c == 'O' || c == 'o':
+		goto yystate237
+	case c == 'U' || c == 'u':
+		goto yystate244
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'N' || c >= 'P' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'n' || c >= 'p' && c <= 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate233:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'G' || c == 'g':
+		goto yystate234
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'H' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'f' || c >= 'h' && c <= 'z':
+		goto yystate49
+	}
+
+yystate234:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'H' || c == 'h':
+		goto yystate235
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'G' || c >= 'I' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'g' || c >= 'i' && c <= 'z':
+		goto yystate49
+	}
+
+yystate235:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate236
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate236:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule61
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate237:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate238
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate238:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate239
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate239:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'B' || c == 'b':
+		goto yystate240
+	case c >= '0' && c <= '9' || c == 'A' || c >= 'C' && c <= 'Z' || c == '_' || c == 'a' || c >= 'c' && c <= 'z':
+		goto yystate49
+	}
+
+yystate240:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate241
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate241:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'C' || c == 'c':
+		goto yystate242
+	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
+		goto yystate49
+	}
+
+yystate242:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'K' || c == 'k':
+		goto yystate243
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'J' || c >= 'L' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'j' || c >= 'l' && c <= 'z':
+		goto yystate49
+	}
+
+yystate243:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule62
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate244:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate245
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate245:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate246
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate246:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule91
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate247:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate248
+	case c == 'T' || c == 't':
+		goto yystate254
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate248:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate249
+	case c == 'T' || c == 't':
+		goto yystate253
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate249:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate250
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate250:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'C' || c == 'c':
+		goto yystate251
+	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
+		goto yystate49
+	}
+
+yystate251:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate252
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate252:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule63
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate253:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule64
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate254:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'R' || c == 'r':
+		goto yystate255
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate255:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate256
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate256:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate257
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate257:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'G' || c == 'g':
+		goto yystate258
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'H' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'f' || c >= 'h' && c <= 'z':
+		goto yystate49
+	}
+
+yystate258:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule92
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate259:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate260
+	case c == 'I' || c == 'i':
+		goto yystate264
+	case c == 'R' || c == 'r':
+		goto yystate267
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'H' || c >= 'J' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'h' || c >= 'j' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate260:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'B' || c == 'b':
+		goto yystate261
+	case c >= '0' && c <= '9' || c == 'A' || c >= 'C' && c <= 'Z' || c == '_' || c == 'a' || c >= 'c' && c <= 'z':
+		goto yystate49
+	}
+
+yystate261:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate262
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate262:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate263
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate263:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule65
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate264:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'M' || c == 'm':
+		goto yystate265
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'L' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'l' || c >= 'n' && c <= 'z':
+		goto yystate49
+	}
+
+yystate265:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate266
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate266:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule93
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate267:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate268
+	case c == 'U' || c == 'u':
+		goto yystate277
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'b' && c <= 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate268:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate269
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate269:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'S' || c == 's':
+		goto yystate270
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate270:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate271
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate271:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'C' || c == 'c':
+		goto yystate272
+	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
+		goto yystate49
+	}
+
+yystate272:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate273
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate273:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate274
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate274:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'O' || c == 'o':
+		goto yystate275
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
+		goto yystate49
+	}
+
+yystate275:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate276
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate276:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule66
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate277:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate278
+	case c == 'N' || c == 'n':
+		goto yystate279
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate278:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule74
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate279:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'C' || c == 'c':
+		goto yystate280
+	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
+		goto yystate49
+	}
+
+yystate280:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate281
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate281:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate282
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate282:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate283
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate283:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule67
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate284:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate285
+	case c == 'N' || c == 'n':
+		goto yystate295
+	case c == 'P' || c == 'p':
+		goto yystate300
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'M' || c == 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'm' || c == 'o' || c >= 'q' && c <= 'z':
+		goto yystate49
+	}
+
+yystate285:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'N' || c == 'n':
+		goto yystate286
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
+		goto yystate49
+	}
+
+yystate286:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate287
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate287:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule94
+	case c == '0' || c == '2' || c == '4' || c == '5' || c == '7' || c == '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	case c == '1':
+		goto yystate288
+	case c == '3':
+		goto yystate290
+	case c == '6':
+		goto yystate292
+	case c == '8':
+		goto yystate294
+	}
+
+yystate288:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '6':
+		goto yystate289
+	case c >= '0' && c <= '5' || c >= '7' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate289:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule95
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate290:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '0' || c == '1' || c >= '3' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	case c == '2':
+		goto yystate291
+	}
+
+yystate291:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule96
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate292:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == '4':
+		goto yystate293
+	case c >= '0' && c <= '3' || c >= '5' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate293:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule97
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate294:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule98
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate295:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'I' || c == 'i':
+		goto yystate296
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
+		goto yystate49
+	}
+
+yystate296:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'Q' || c == 'q':
+		goto yystate297
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'P' || c >= 'R' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'p' || c >= 'r' && c <= 'z':
+		goto yystate49
+	}
+
+yystate297:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'U' || c == 'u':
+		goto yystate298
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate298:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate299
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate299:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule69
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate300:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'D' || c == 'd':
+		goto yystate301
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'z':
+		goto yystate49
+	}
+
+yystate301:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate302
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate302:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'T' || c == 't':
+		goto yystate303
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
+		goto yystate49
+	}
+
+yystate303:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate304
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate304:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule68
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate305:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'A' || c == 'a':
+		goto yystate306
+	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
+		goto yystate49
+	}
+
+yystate306:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'L' || c == 'l':
+		goto yystate307
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
+		goto yystate49
+	}
+
+yystate307:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'U' || c == 'u':
+		goto yystate308
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
+		goto yystate49
+	}
+
+yystate308:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate309
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate309:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'S' || c == 's':
+		goto yystate310
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
+		goto yystate49
+	}
+
+yystate310:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule70
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate311:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'H' || c == 'h':
+		goto yystate312
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'G' || c >= 'I' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'g' || c >= 'i' && c <= 'z':
+		goto yystate49
+	}
+
+yystate312:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate313
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate313:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'R' || c == 'r':
+		goto yystate314
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
+		goto yystate49
+	}
+
+yystate314:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule99
+	case c == 'E' || c == 'e':
+		goto yystate315
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
+		goto yystate49
+	}
+
+yystate315:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule71
+	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
+		goto yystate49
+	}
+
+yystate316:
+	c = l.next()
+	goto yyrule11
+
+yystate317:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule101
+	case c == '|':
+		goto yystate318
+	}
+
+yystate318:
+	c = l.next()
+	goto yyrule22
+
+	goto yystate319 // silence unused label error
+yystate319:
+	c = l.next()
+yystart319:
+	switch {
+	default:
+		goto yystate320 // c >= '\x01' && c <= '!' || c >= '#' && c <= '[' || c >= ']' && c <= 'ÿ'
+	case c == '"':
+		goto yystate321
+	case c == '\\':
+		goto yystate322
+	case c == '\x00':
+		goto yystate2
+	}
+
+yystate320:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c == '"':
+		goto yystate321
+	case c == '\\':
+		goto yystate322
+	case c >= '\x01' && c <= '!' || c >= '#' && c <= '[' || c >= ']' && c <= 'ÿ':
+		goto yystate320
+	}
+
+yystate321:
+	c = l.next()
+	goto yyrule13
+
+yystate322:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c == '"':
+		goto yystate323
+	case c == '\\':
+		goto yystate322
+	case c >= '\x01' && c <= '!' || c >= '#' && c <= '[' || c >= ']' && c <= 'ÿ':
+		goto yystate320
+	}
+
+yystate323:
+	c = l.next()
+	switch {
+	default:
+		goto yyrule13
+	case c == '"':
+		goto yystate321
+	case c == '\\':
+		goto yystate322
+	case c >= '\x01' && c <= '!' || c >= '#' && c <= '[' || c >= ']' && c <= 'ÿ':
+		goto yystate320
+	}
+
+	goto yystate324 // silence unused label error
+yystate324:
+	c = l.next()
+yystart324:
+	switch {
+	default:
+		goto yystate325 // c >= '\x01' && c <= '_' || c >= 'a' && c <= 'ÿ'
+	case c == '\x00':
+		goto yystate2
+	case c == '`':
+		goto yystate326
+	}
+
+yystate325:
+	c = l.next()
+	switch {
+	default:
+		goto yyabort
+	case c == '`':
+		goto yystate326
+	case c >= '\x01' && c <= '_' || c >= 'a' && c <= 'ÿ':
+		goto yystate325
+	}
+
+yystate326:
+	c = l.next()
+	goto yyrule14
+
+yyrule1: // \0
+	{
+		return 0
+	}
+yyrule2: // [ \t\n\r]+
+
+	goto yystate0
+yyrule3: // --.*
+
+	goto yystate0
+yyrule4: // \/\/.*
+
+	goto yystate0
+yyrule5: // \/\*([^*]|\*+[^*/])*\*+\/
+
+	goto yystate0
+yyrule6: // {imaginary_ilit}
+	{
+		return l.int(lval, true)
+	}
+yyrule7: // {imaginary_lit}
+	{
+		return l.float(lval, true)
+	}
+yyrule8: // {int_lit}
+	{
+		return l.int(lval, false)
+	}
+yyrule9: // {float_lit}
+	{
+		return l.float(lval, false)
+	}
+yyrule10: // \"
+	{
+		l.sc = S1
+		goto yystate0
+	}
+yyrule11: // `
+	{
+		l.sc = S2
+		goto yystate0
+	}
+yyrule12: // '(\\.|[^'])*'
+	{
+		if ret := l.str(lval, ""); ret != stringLit {
+			return ret
+		}
+		lval.item = idealRune(lval.item.(string)[0])
+		return intLit
+	}
+yyrule13: // (\\.|[^\"])*\"
+	{
+		return l.str(lval, "\"")
+	}
+yyrule14: // ([^`]|\n)*`
+	{
+		return l.str(lval, "`")
+	}
+yyrule15: // "&&"
+	{
+		return andand
+	}
+yyrule16: // "&^"
+	{
+		return andnot
+	}
+yyrule17: // "<<"
+	{
+		return lsh
+	}
+yyrule18: // "<="
+	{
+		return le
+	}
+yyrule19: // "=="
+	{
+		return eq
+	}
+yyrule20: // ">="
+	{
+		return ge
+	}
+yyrule21: // "!="
+	{
+		return neq
+	}
+yyrule22: // "||"
+	{
+		return oror
+	}
+yyrule23: // ">>"
+	{
+		return rsh
+	}
+yyrule24: // {add}
+	{
+		return add
+	}
+yyrule25: // {alter}
+	{
+		return alter
+	}
+yyrule26: // {and}
+	{
+		return and
+	}
+yyrule27: // {asc}
+	{
+		return asc
+	}
+yyrule28: // {as}
+	{
+		return as
+	}
+yyrule29: // {begin}
+	{
+		return begin
+	}
+yyrule30: // {between}
+	{
+		return between
+	}
+yyrule31: // {by}
+	{
+		return by
+	}
+yyrule32: // {column}
+	{
+		return column
+	}
+yyrule33: // {commit}
+	{
+		return commit
+	}
+yyrule34: // {create}
+	{
+		return create
+	}
+yyrule35: // {default}
+	{
+		return defaultKwd
+	}
+yyrule36: // {delete}
+	{
+		return deleteKwd
+	}
+yyrule37: // {desc}
+	{
+		return desc
+	}
+yyrule38: // {distinct}
+	{
+		return distinct
+	}
+yyrule39: // {drop}
+	{
+		return drop
+	}
+yyrule40: // {exists}
+	{
+		return exists
+	}
+yyrule41: // {explain}
+	{
+		return explain
+	}
+yyrule42: // {from}
+	{
+		return from
+	}
+yyrule43: // {full}
+	{
+		return full
+	}
+yyrule44: // {group}
+	{
+		return group
+	}
+yyrule45: // {if}
+	{
+		return ifKwd
+	}
+yyrule46: // {index}
+	{
+		return index
+	}
+yyrule47: // {insert}
+	{
+		return insert
+	}
+yyrule48: // {into}
+	{
+		return into
+	}
+yyrule49: // {in}
+	{
+		return in
+	}
+yyrule50: // {is}
+	{
+		return is
+	}
+yyrule51: // {join}
+	{
+		return join
+	}
+yyrule52: // {left}
+	{
+		return left
+	}
+yyrule53: // {like}
+	{
+		return like
+	}
+yyrule54: // {limit}
+	{
+		return limit
+	}
+yyrule55: // {not}
+	{
+		return not
+	}
+yyrule56: // {offset}
+	{
+		return offset
+	}
+yyrule57: // {on}
+	{
+		return on
+	}
+yyrule58: // {order}
+	{
+		return order
+	}
+yyrule59: // {or}
+	{
+		return or
+	}
+yyrule60: // {outer}
+	{
+		return outer
+	}
+yyrule61: // {right}
+	{
+		return right
+	}
+yyrule62: // {rollback}
+	{
+		return rollback
+	}
+yyrule63: // {select}
+	{
+		l.agg = append(l.agg, false)
+		return selectKwd
+	}
+yyrule64: // {set}
+	{
+		return set
+	}
+yyrule65: // {table}
+	{
+		return tableKwd
+	}
+yyrule66: // {transaction}
+	{
+		return transaction
+	}
+yyrule67: // {truncate}
+	{
+		return truncate
+	}
+yyrule68: // {update}
+	{
+		return update
+	}
+yyrule69: // {unique}
+	{
+		return unique
+	}
+yyrule70: // {values}
+	{
+		return values
+	}
+yyrule71: // {where}
+	{
+		return where
+	}
+yyrule72: // {null}
+	{
+		lval.item = nil
+		return null
+	}
+yyrule73: // {false}
+	{
+		lval.item = false
+		return falseKwd
+	}
+yyrule74: // {true}
+	{
+		lval.item = true
+		return trueKwd
+	}
+yyrule75: // {bigint}
+	{
+		lval.item = qBigInt
+		return bigIntType
+	}
+yyrule76: // {bigrat}
+	{
+		lval.item = qBigRat
+		return bigRatType
+	}
+yyrule77: // {blob}
+	{
+		lval.item = qBlob
+		return blobType
+	}
+yyrule78: // {bool}
+	{
+		lval.item = qBool
+		return boolType
+	}
+yyrule79: // {byte}
+	{
+		lval.item = qUint8
+		return byteType
+	}
+yyrule80: // {complex}128
+	{
+		lval.item = qComplex128
+		return complex128Type
+	}
+yyrule81: // {complex}64
+	{
+		lval.item = qComplex64
+		return complex64Type
+	}
+yyrule82: // {duration}
+	{
+		lval.item = qDuration
+		return durationType
+	}
+yyrule83: // {float}
+	{
+		lval.item = qFloat64
+		return floatType
+	}
+yyrule84: // {float}32
+	{
+		lval.item = qFloat32
+		return float32Type
+	}
+yyrule85: // {float}64
+	{
+		lval.item = qFloat64
+		return float64Type
+	}
+yyrule86: // {int}
+	{
+		lval.item = qInt64
+		return intType
+	}
+yyrule87: // {int}16
+	{
+		lval.item = qInt16
+		return int16Type
+	}
+yyrule88: // {int}32
+	{
+		lval.item = qInt32
+		return int32Type
+	}
+yyrule89: // {int}64
+	{
+		lval.item = qInt64
+		return int64Type
+	}
+yyrule90: // {int}8
+	{
+		lval.item = qInt8
+		return int8Type
+	}
+yyrule91: // {rune}
+	{
+		lval.item = qInt32
+		return runeType
+	}
+yyrule92: // {string}
+	{
+		lval.item = qString
+		return stringType
+	}
+yyrule93: // {time}
+	{
+		lval.item = qTime
+		return timeType
+	}
+yyrule94: // {uint}
+	{
+		lval.item = qUint64
+		return uintType
+	}
+yyrule95: // {uint}16
+	{
+		lval.item = qUint16
+		return uint16Type
+	}
+yyrule96: // {uint}32
+	{
+		lval.item = qUint32
+		return uint32Type
+	}
+yyrule97: // {uint}64
+	{
+		lval.item = qUint64
+		return uint64Type
+	}
+yyrule98: // {uint}8
+	{
+		lval.item = qUint8
+		return uint8Type
+	}
+yyrule99: // {ident}
+	{
+		lval.item = string(l.val)
+		return identifier
+	}
+yyrule100: // ($|\?){D}
+	{
+		lval.item, _ = strconv.Atoi(string(l.val[1:]))
+		return qlParam
+	}
+yyrule101: // .
+	{
+		return c0
+	}
+	panic("unreachable")
+
+	goto yyabort // silence unused label error
+
+yyabort: // no lexem recognized
+	return int(unicode.ReplacementChar)
+}
+
+func (l *lexer) npos() (line, col int) {
+	if line, col = l.nline, l.ncol; col == 0 {
+		line--
+		col = l.lcol + 1
+	}
+	return
+}
+
+func (l *lexer) str(lval *yySymType, pref string) int {
+	l.sc = 0
+	s := pref + string(l.val)
+	s, err := strconv.Unquote(s)
+	if err != nil {
+		l.err("string literal: %v", err)
+		return int(unicode.ReplacementChar)
+	}
+
+	lval.item = s
+	return stringLit
+}
+
+func (l *lexer) int(lval *yySymType, im bool) int {
+	if im {
+		l.val = l.val[:len(l.val)-1]
+	}
+	n, err := strconv.ParseUint(string(l.val), 0, 64)
+	if err != nil {
+		l.err("integer literal: %v", err)
+		return int(unicode.ReplacementChar)
+	}
+
+	if im {
+		lval.item = idealComplex(complex(0, float64(n)))
+		return imaginaryLit
+	}
+
+	switch {
+	case n < math.MaxInt64:
+		lval.item = idealInt(n)
+	default:
+		lval.item = idealUint(n)
+	}
+	return intLit
+}
+
+func (l *lexer) float(lval *yySymType, im bool) int {
+	if im {
+		l.val = l.val[:len(l.val)-1]
+	}
+	n, err := strconv.ParseFloat(string(l.val), 64)
+	if err != nil {
+		l.err("float literal: %v", err)
+		return int(unicode.ReplacementChar)
+	}
+
+	if im {
+		lval.item = idealComplex(complex(0, n))
+		return imaginaryLit
+	}
+
+	lval.item = idealFloat(n)
+	return floatLit
+}
diff --git a/vendor/github.com/cznic/ql/stmt.go b/vendor/github.com/cznic/ql/stmt.go
new file mode 100644
index 0000000000..8de367d4c9
--- /dev/null
+++ b/vendor/github.com/cznic/ql/stmt.go
@@ -0,0 +1,1268 @@
+// Copyright (c) 2014 ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+	"sync"
+
+	"github.com/cznic/strutil"
+)
+
+// NOTE: all stmt implementations must be safe for concurrent use by multiple
+// goroutines.  If the exec method requires any execution domain local data,
+// they must be held out of the implementing instance.
+var (
+	_ stmt = (*alterTableAddStmt)(nil)
+	_ stmt = (*alterTableDropColumnStmt)(nil)
+	_ stmt = (*createIndexStmt)(nil)
+	_ stmt = (*createTableStmt)(nil)
+	_ stmt = (*deleteStmt)(nil) //TODO optimizer plan
+	_ stmt = (*dropIndexStmt)(nil)
+	_ stmt = (*dropTableStmt)(nil)
+	_ stmt = (*explainStmt)(nil)
+	_ stmt = (*insertIntoStmt)(nil)
+	_ stmt = (*selectStmt)(nil)
+	_ stmt = (*truncateTableStmt)(nil)
+	_ stmt = (*updateStmt)(nil) //TODO optimizer plan
+	_ stmt = beginTransactionStmt{}
+	_ stmt = commitStmt{}
+	_ stmt = rollbackStmt{}
+)
+
+var (
+	createColumn2 = mustCompile(`
+		create table if not exists __Column2 (
+			TableName string,
+			Name string,
+			NotNull bool,
+			ConstraintExpr string,
+			DefaultExpr string,
+		);
+		create index if not exists __Column2TableName on __Column2(TableName);
+	`)
+
+	insertColumn2 = mustCompile(`insert into __Column2 values($1, $2, $3, $4, $5)`)
+
+	selectColumn2 = MustCompile(`
+		select Name, NotNull, ConstraintExpr, DefaultExpr
+		from __Column2
+		where TableName == $1
+	`)
+
+	deleteColumn2 = mustCompile(`
+		delete from __Column2
+		where TableName == $1 && Name == $2
+	`)
+
+	createIndex2 = mustCompile(`
+		// Index register 2.
+		create table if not exists __Index2(
+			TableName string,
+			IndexName string,
+			IsUnique  bool,
+			IsSimple  bool,   // Just a column name or id().
+			Root      int64,  // BTree handle
+		);
+
+		// Expressions for given index. Compared in order of id(__Index2_Expr).
+		create table if not exists __Index2_Expr(
+			Index2_ID int,
+			Expr      string,
+		);
+
+		create index if not exists __xIndex2_TableName on __Index2(TableName);
+		create unique index if not exists __xIndex2_IndexName on __Index2(IndexName);
+		create index if not exists __xIndex2_ID on __Index2(id());
+		create index if not exists __xIndex2_Expr_Index2_ID on __Index2_Expr(Index2_ID);
+`)
+
+	insertIndex2     = mustCompile("insert into __Index2 values($1, $2, $3, $4, $5)")
+	insertIndex2Expr = mustCompile("insert into __Index2_Expr values($1, $2)")
+
+	deleteIndex2ByIndexName = mustCompile(`
+		delete from __Index2_Expr
+		where Index2_ID in (
+			select id() from __Index2 where IndexName == $1;
+		);	
+
+		delete from __Index2
+		where IndexName == $1;
+`)
+	deleteIndex2ByTableName = mustCompile(`
+		delete from __Index2_Expr
+		where Index2_ID in (
+			select id() from __Index2 where TableName == $1;
+		);	
+
+		delete from __Index2
+		where TableName == $1;
+`)
+)
+
+type stmt interface {
+	// never invoked for
+	// - beginTransactionStmt
+	// - commitStmt
+	// - rollbackStmt
+	exec(ctx *execCtx) (Recordset, error)
+
+	explain(ctx *execCtx, w strutil.Formatter)
+
+	// return value ignored for
+	// - beginTransactionStmt
+	// - commitStmt
+	// - rollbackStmt
+	isUpdating() bool
+	String() string
+}
+
+type execCtx struct { //LATER +shared temp
+	db  *DB
+	arg []interface{}
+}
+
+type explainStmt struct {
+	s stmt
+}
+
+func (s *explainStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	for {
+		x, ok := s.s.(*explainStmt)
+		if !ok {
+			s.s.explain(ctx, w)
+			return
+		}
+
+		s = x
+	}
+}
+
+func (s *explainStmt) String() string {
+	return "EXPLAIN " + s.s.String()
+}
+
+func (*explainStmt) isUpdating() bool { return false }
+
+func (s *explainStmt) exec(ctx *execCtx) (_ Recordset, err error) {
+	return recordset{ctx, &explainDefaultPlan{s.s}, ctx.db.cc}, nil
+}
+
+type updateStmt struct {
+	tableName string
+	list      []assignment
+	where     expression
+}
+
+func (s *updateStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *updateStmt) String() string {
+	u := fmt.Sprintf("UPDATE %s", s.tableName)
+	a := make([]string, len(s.list))
+	for i, v := range s.list {
+		a[i] = v.String()
+	}
+	w := ""
+	if s.where != nil {
+		w = fmt.Sprintf(" WHERE %s", s.where)
+	}
+	return fmt.Sprintf("%s %s%s;", u, strings.Join(a, ", "), w)
+}
+
+func (s *updateStmt) exec(ctx *execCtx) (_ Recordset, err error) {
+	t, ok := ctx.db.root.tables[s.tableName]
+	if !ok {
+		return nil, fmt.Errorf("UPDATE: table %s does not exist", s.tableName)
+	}
+
+	tcols := make([]*col, len(s.list))
+	for i, asgn := range s.list {
+		col := findCol(t.cols, asgn.colName)
+		if col == nil {
+			return nil, fmt.Errorf("UPDATE: unknown column %s", asgn.colName)
+		}
+		tcols[i] = col
+	}
+
+	m := map[interface{}]interface{}{}
+	var nh int64
+	expr := s.where
+	blobCols := t.blobCols()
+	cc := ctx.db.cc
+	var old []interface{}
+	var touched []bool
+	if t.hasIndices() {
+		old = make([]interface{}, len(t.cols0))
+		touched = make([]bool, len(t.cols0))
+	}
+	for h := t.head; h != 0; h = nh {
+		// Read can return lazily expanded chunks
+		data, err := t.store.Read(nil, h, t.cols...)
+		if err != nil {
+			return nil, err
+		}
+
+		nh = data[0].(int64)
+		for _, col := range t.cols {
+			m[col.name] = data[2+col.index]
+		}
+		id := data[1].(int64)
+		m["$id"] = id
+		if expr != nil {
+			val, err := s.where.eval(ctx, m)
+			if err != nil {
+				return nil, err
+			}
+
+			if val == nil {
+				continue
+			}
+
+			x, ok := val.(bool)
+			if !ok {
+				return nil, fmt.Errorf("invalid WHERE expression %s (value of type %T)", val, val)
+			}
+
+			if !x {
+				continue
+			}
+		}
+
+		// hit
+		for _, ix := range t.indices2 {
+			vlist, err := ix.eval(ctx, t.cols, id, data[2:])
+			if err != nil {
+				return nil, err
+			}
+
+			if err := ix.x.Delete(vlist, h); err != nil {
+				return nil, err
+			}
+		}
+		for i, asgn := range s.list {
+			val, err := asgn.expr.eval(ctx, m)
+			if err != nil {
+				return nil, err
+			}
+
+			colIndex := tcols[i].index
+			if t.hasIndices() {
+				old[colIndex] = data[2+colIndex]
+				touched[colIndex] = true
+			}
+			data[2+colIndex] = val
+		}
+		if err = typeCheck(data[2:], t.cols); err != nil {
+			return nil, err
+		}
+
+		if err = t.checkConstraintsAndDefaults(ctx, data[2:], m); err != nil {
+			return nil, err
+		}
+
+		for i, v := range t.indices {
+			if i == 0 { // id() N/A
+				continue
+			}
+
+			if v == nil || !touched[i-1] {
+				continue
+			}
+
+			if err = v.x.Delete([]interface{}{old[i-1]}, h); err != nil {
+				return nil, err
+			}
+		}
+
+		if err = t.store.UpdateRow(h, blobCols, data...); err != nil { //LATER detect which blobs are actually affected
+			return nil, err
+		}
+
+		for i, v := range t.indices {
+			if i == 0 { // id() N/A
+				continue
+			}
+
+			if v == nil || !touched[i-1] {
+				continue
+			}
+
+			if err = v.x.Create([]interface{}{data[2+i-1]}, h); err != nil {
+				return nil, err
+			}
+		}
+		for _, ix := range t.indices2 {
+			vlist, err := ix.eval(ctx, t.cols, id, data[2:])
+			if err != nil {
+				return nil, err
+			}
+
+			if err := ix.x.Create(vlist, h); err != nil {
+				return nil, err
+			}
+		}
+
+		cc.RowsAffected++
+	}
+	return
+}
+
+func (s *updateStmt) isUpdating() bool { return true }
+
+type deleteStmt struct {
+	tableName string
+	where     expression
+}
+
+func (s *deleteStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *deleteStmt) String() string {
+	switch {
+	case s.where == nil:
+		return fmt.Sprintf("DELETE FROM %s;", s.tableName)
+	default:
+		return fmt.Sprintf("DELETE FROM %s WHERE %s;", s.tableName, s.where)
+	}
+}
+
+func (s *deleteStmt) exec(ctx *execCtx) (_ Recordset, err error) {
+	t, ok := ctx.db.root.tables[s.tableName]
+	if !ok {
+		return nil, fmt.Errorf("DELETE FROM: table %s does not exist", s.tableName)
+	}
+
+	m := map[interface{}]interface{}{}
+	var ph, h, nh int64
+	var data []interface{}
+	blobCols := t.blobCols()
+	cc := ctx.db.cc
+	for h = t.head; h != 0; ph, h = h, nh {
+		for i, v := range data {
+			c, ok := v.(chunk)
+			if !ok {
+				continue
+			}
+
+			data[i] = c.b
+		}
+		// Read can return lazily expanded chunks
+		data, err = t.store.Read(nil, h, t.cols...)
+		if err != nil {
+			return nil, err
+		}
+
+		nh = data[0].(int64)
+		for _, col := range t.cols {
+			m[col.name] = data[2+col.index]
+		}
+		id := data[1].(int64)
+		m["$id"] = id
+		val, err := s.where.eval(ctx, m)
+		if err != nil {
+			return nil, err
+		}
+
+		if val == nil {
+			continue
+		}
+
+		x, ok := val.(bool)
+		if !ok {
+			return nil, fmt.Errorf("invalid WHERE expression %s (value of type %T)", val, val)
+		}
+
+		if !x {
+			continue
+		}
+
+		// hit
+		for i, v := range t.indices {
+			if v == nil {
+				continue
+			}
+
+			// overflow chunks left in place
+			if err = v.x.Delete([]interface{}{data[i+1]}, h); err != nil {
+				return nil, err
+			}
+		}
+		for _, ix := range t.indices2 {
+			vlist, err := ix.eval(ctx, t.cols, id, data[2:])
+			if err != nil {
+				return nil, err
+			}
+
+			if err := ix.x.Delete(vlist, h); err != nil {
+				return nil, err
+			}
+		}
+
+		// overflow chunks freed here
+		if err = t.store.Delete(h, blobCols...); err != nil {
+			return nil, err
+		}
+
+		cc.RowsAffected++
+		switch {
+		case ph == 0 && nh == 0: // "only"
+			fallthrough
+		case ph == 0 && nh != 0: // "first"
+			if err = t.store.Update(t.hhead, nh); err != nil {
+				return nil, err
+			}
+
+			t.head, h = nh, 0
+		case ph != 0 && nh == 0: // "last"
+			fallthrough
+		case ph != 0 && nh != 0: // "inner"
+			pdata, err := t.store.Read(nil, ph, t.cols...)
+			if err != nil {
+				return nil, err
+			}
+
+			for i, v := range pdata {
+				if x, ok := v.(chunk); ok {
+					pdata[i] = x.b
+				}
+			}
+			pdata[0] = nh
+			if err = t.store.Update(ph, pdata...); err != nil {
+				return nil, err
+			}
+
+			h = ph
+		}
+	}
+
+	return
+}
+
+func (s *deleteStmt) isUpdating() bool { return true }
+
+type truncateTableStmt struct {
+	tableName string
+}
+
+func (s *truncateTableStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *truncateTableStmt) String() string { return fmt.Sprintf("TRUNCATE TABLE %s;", s.tableName) }
+
+func (s *truncateTableStmt) exec(ctx *execCtx) (Recordset, error) {
+	t, ok := ctx.db.root.tables[s.tableName]
+	if !ok {
+		return nil, fmt.Errorf("TRUNCATE TABLE: table %s does not exist", s.tableName)
+	}
+
+	return nil, t.truncate()
+}
+
+func (s *truncateTableStmt) isUpdating() bool { return true }
+
+type dropIndexStmt struct {
+	ifExists  bool
+	indexName string
+}
+
+func (s *dropIndexStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *dropIndexStmt) String() string { return fmt.Sprintf("DROP INDEX %s;", s.indexName) }
+
+func (s *dropIndexStmt) exec(ctx *execCtx) (Recordset, error) {
+	t, x := ctx.db.root.findIndexByName(s.indexName)
+	if x == nil {
+		if s.ifExists {
+			return nil, nil
+		}
+
+		return nil, fmt.Errorf("DROP INDEX: index %s does not exist", s.indexName)
+	}
+
+	if ctx.db.hasAllIndex2() {
+		if err := ctx.db.deleteIndex2ByIndexName(s.indexName); err != nil {
+			return nil, err
+		}
+	}
+
+	switch ix := x.(type) {
+	case *indexedCol:
+		for i, v := range t.indices {
+			if v == nil || v.name != s.indexName {
+				continue
+			}
+
+			return nil, t.dropIndex(i)
+		}
+	case *index2:
+		delete(t.indices2, s.indexName)
+		return nil, ix.x.Drop()
+	}
+
+	panic("internal error 058")
+}
+
+func (s *dropIndexStmt) isUpdating() bool { return true }
+
+type dropTableStmt struct {
+	ifExists  bool
+	tableName string
+}
+
+func (s *dropTableStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *dropTableStmt) String() string { return fmt.Sprintf("DROP TABLE %s;", s.tableName) }
+
+func (s *dropTableStmt) exec(ctx *execCtx) (Recordset, error) {
+	t, ok := ctx.db.root.tables[s.tableName]
+	if !ok {
+		if s.ifExists {
+			return nil, nil
+		}
+
+		return nil, fmt.Errorf("DROP TABLE: table %s does not exist", s.tableName)
+	}
+
+	if ctx.db.hasAllIndex2() {
+		if err := ctx.db.deleteIndex2ByTableName(s.tableName); err != nil {
+			return nil, err
+		}
+	}
+
+	return nil, ctx.db.root.dropTable(t)
+}
+
+func (s *dropTableStmt) isUpdating() bool { return true }
+
+type alterTableDropColumnStmt struct {
+	tableName, colName string
+}
+
+func (s *alterTableDropColumnStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *alterTableDropColumnStmt) String() string {
+	return fmt.Sprintf("ALTER TABLE %s DROP COLUMN %s;", s.tableName, s.colName)
+}
+
+func (s *alterTableDropColumnStmt) exec(ctx *execCtx) (Recordset, error) {
+	t, ok := ctx.db.root.tables[s.tableName]
+	if !ok {
+		return nil, fmt.Errorf("ALTER TABLE: table %s does not exist", s.tableName)
+	}
+
+	cols := t.cols
+	for _, c := range cols {
+		if c.name == s.colName {
+			if len(cols) == 1 {
+				return nil, fmt.Errorf("ALTER TABLE %s DROP COLUMN: cannot drop the only column: %s", s.tableName, s.colName)
+			}
+
+			if _, ok := ctx.db.root.tables["__Column2"]; ok {
+				if _, err := deleteColumn2.l[0].exec(&execCtx{db: ctx.db, arg: []interface{}{s.tableName, c.name}}); err != nil {
+					return nil, err
+				}
+			}
+
+			c.name = ""
+			t.cols0[c.index].name = ""
+			if t.hasIndices() {
+				if len(t.indices) != 0 {
+					if v := t.indices[c.index+1]; v != nil {
+						if err := t.dropIndex(c.index + 1); err != nil {
+							return nil, err
+						}
+
+						if ctx.db.hasAllIndex2() {
+							if err := ctx.db.deleteIndex2ByIndexName(v.name); err != nil {
+								return nil, err
+							}
+						}
+					}
+				}
+
+				for nm, ix := range t.indices2 {
+					for _, e := range ix.exprList {
+						m := mentionedColumns(e)
+						if _, ok := m[s.colName]; ok {
+							if err := ctx.db.deleteIndex2ByIndexName(nm); err != nil {
+								return nil, err
+							}
+
+							if err := ix.x.Drop(); err != nil {
+								return nil, err
+							}
+
+							delete(t.indices2, nm)
+							break
+						}
+					}
+				}
+			}
+			if err := t.constraintsAndDefaults(ctx); err != nil {
+				return nil, err
+			}
+
+			return nil, t.updated()
+		}
+	}
+
+	return nil, fmt.Errorf("ALTER TABLE %s DROP COLUMN: column %s does not exist", s.tableName, s.colName)
+}
+
+func (s *alterTableDropColumnStmt) isUpdating() bool { return true }
+
+type alterTableAddStmt struct {
+	tableName string
+	c         *col
+}
+
+func (s *alterTableAddStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *alterTableAddStmt) String() string {
+	r := fmt.Sprintf("ALTER TABLE %s ADD %s %s", s.tableName, s.c.name, typeStr(s.c.typ))
+	c := s.c
+	if x := c.constraint; x != nil { //TODO add (*col).String()
+		switch e := x.expr; {
+		case e != nil:
+			r += " " + e.String()
+		default:
+			r += " NOT NULL"
+		}
+	}
+	if x := c.dflt; x != nil {
+		r += " DEFAULT " + x.String()
+	}
+	return r + ";"
+}
+
+func (s *alterTableAddStmt) exec(ctx *execCtx) (Recordset, error) {
+	t, ok := ctx.db.root.tables[s.tableName]
+	if !ok {
+		return nil, fmt.Errorf("ALTER TABLE: table %s does not exist", s.tableName)
+	}
+
+	hasRecords := t.head != 0
+	c := s.c
+	if c.constraint != nil && hasRecords {
+		return nil, fmt.Errorf("ALTER TABLE %s ADD %s: cannot add constrained column to table with existing data", s.tableName, c.name)
+	}
+
+	cols := t.cols
+	for _, c := range cols {
+		nm := c.name
+		if nm == s.c.name {
+			return nil, fmt.Errorf("ALTER TABLE %s ADD: column %s exists", s.tableName, nm)
+		}
+	}
+
+	if len(t.indices) != 0 {
+		t.indices = append(t.indices, nil)
+		t.xroots = append(t.xroots, 0)
+		if err := t.store.Update(t.hxroots, t.xroots...); err != nil {
+			return nil, err
+		}
+	}
+
+	if c.constraint != nil || c.dflt != nil {
+		for _, s := range createColumn2.l {
+			_, err := s.exec(&execCtx{db: ctx.db})
+			if err != nil {
+				return nil, err
+			}
+		}
+		notNull := c.constraint != nil && c.constraint.expr == nil
+		var co, d string
+		if c.constraint != nil && c.constraint.expr != nil {
+			co = c.constraint.expr.String()
+		}
+		if e := c.dflt; e != nil {
+			d = e.String()
+		}
+		if _, err := insertColumn2.l[0].exec(&execCtx{db: ctx.db, arg: []interface{}{s.tableName, c.name, notNull, co, d}}); err != nil {
+			return nil, err
+		}
+	}
+
+	t.cols0 = append(t.cols0, s.c)
+	if err := t.constraintsAndDefaults(ctx); err != nil {
+		return nil, err
+	}
+
+	return nil, t.updated()
+}
+
+func (s *alterTableAddStmt) isUpdating() bool { return true }
+
+type selectStmt struct {
+	distinct      bool
+	flds          []*fld
+	from          *joinRset
+	group         *groupByRset
+	hasAggregates bool
+	limit         *limitRset
+	mu            sync.Mutex
+	offset        *offsetRset
+	order         *orderByRset
+	where         *whereRset
+}
+
+func (s *selectStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	p, err := s.plan(ctx)
+	if err != nil {
+		w.Format("ERROR: %v\n", err)
+		return
+	}
+
+	p.explain(w)
+}
+
+func (s *selectStmt) String() string {
+	var b bytes.Buffer
+	b.WriteString("SELECT")
+	if s.distinct {
+		b.WriteString(" DISTINCT")
+	}
+	switch {
+	case len(s.flds) == 0:
+		b.WriteString(" *")
+	default:
+		a := make([]string, len(s.flds))
+		for i, v := range s.flds {
+			s := v.expr.String()
+			if v.name != "" && v.name != s {
+				s += " AS " + v.name
+			}
+			a[i] = s
+		}
+		b.WriteString(" " + strings.Join(a, ", "))
+	}
+	b.WriteString(" FROM ")
+	b.WriteString(s.from.String())
+	if s.where != nil {
+		b.WriteString(" WHERE ")
+		b.WriteString(s.where.expr.String())
+	}
+	if s.group != nil {
+		b.WriteString(" GROUP BY ")
+		b.WriteString(strings.Join(s.group.colNames, ", "))
+	}
+	if s.order != nil {
+		b.WriteString(" ORDER BY ")
+		b.WriteString(s.order.String())
+	}
+	if s.limit != nil {
+		b.WriteString(" LIMIT ")
+		b.WriteString(s.limit.expr.String())
+	}
+	if s.offset != nil {
+		b.WriteString(" OFFSET ")
+		b.WriteString(s.offset.expr.String())
+	}
+	b.WriteRune(';')
+	return b.String()
+}
+
+func (s *selectStmt) plan(ctx *execCtx) (plan, error) { //LATER overlapping goroutines/pipelines
+	r, err := s.from.plan(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	if w := s.where; w != nil {
+		if r, err = (&whereRset{expr: w.expr, src: r}).plan(ctx); err != nil {
+			return nil, err
+		}
+	}
+	switch {
+	case !s.hasAggregates && s.group == nil: // nop
+	case !s.hasAggregates && s.group != nil:
+		if r, err = (&groupByRset{colNames: s.group.colNames, src: r}).plan(ctx); err != nil {
+			return nil, err
+		}
+	case s.hasAggregates && s.group == nil:
+		if r, err = (&groupByRset{src: r}).plan(ctx); err != nil {
+			return nil, err
+		}
+	case s.hasAggregates && s.group != nil:
+		if r, err = (&groupByRset{colNames: s.group.colNames, src: r}).plan(ctx); err != nil {
+			return nil, err
+		}
+	}
+	if r, err = (&selectRset{flds: s.flds, src: r}).plan(ctx); err != nil {
+		return nil, err
+	}
+
+	if s.distinct {
+		if r, err = (&distinctRset{src: r}).plan(ctx); err != nil {
+			return nil, err
+		}
+	}
+	if s := s.order; s != nil {
+		if r, err = (&orderByRset{asc: s.asc, by: s.by, src: r}).plan(ctx); err != nil {
+			return nil, err
+		}
+	}
+	if s := s.offset; s != nil {
+		if r, err = (&offsetRset{s.expr, r}).plan(ctx); err != nil {
+			return nil, err
+		}
+	}
+	if s := s.limit; s != nil {
+		if r, err = (&limitRset{s.expr, r}).plan(ctx); err != nil {
+			return nil, err
+		}
+	}
+	return r, nil
+}
+
+func (s *selectStmt) exec(ctx *execCtx) (rs Recordset, err error) {
+	r, err := s.plan(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return recordset{ctx, r, nil}, nil
+}
+
+func (s *selectStmt) isUpdating() bool { return false }
+
+type insertIntoStmt struct {
+	colNames  []string
+	lists     [][]expression
+	sel       *selectStmt
+	tableName string
+}
+
+func (s *insertIntoStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *insertIntoStmt) String() string {
+	cn := ""
+	if len(s.colNames) != 0 {
+		cn = fmt.Sprintf(" (%s)", strings.Join(s.colNames, ", "))
+	}
+	switch {
+	case s.sel != nil:
+		return fmt.Sprintf("INSERT INTO %s%s %s;", s.tableName, cn, s.sel)
+	default:
+		a := make([]string, len(s.lists))
+		for i, v := range s.lists {
+			b := make([]string, len(v))
+			for i, v := range v {
+				b[i] = v.String()
+			}
+			a[i] = fmt.Sprintf("(%s)", strings.Join(b, ", "))
+		}
+		return fmt.Sprintf("INSERT INTO %s%s VALUES %s;", s.tableName, cn, strings.Join(a, ", "))
+	}
+}
+
+func (s *insertIntoStmt) execSelect(t *table, cols []*col, ctx *execCtx) (_ Recordset, err error) {
+	//TODO missing rs column number eq check
+	r, err := s.sel.plan(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	h := t.head
+	data0 := make([]interface{}, len(t.cols0)+2)
+	cc := ctx.db.cc
+	m := map[interface{}]interface{}{}
+	if err = r.do(ctx, func(_ interface{}, data []interface{}) (more bool, err error) {
+		for i, d := range data {
+			data0[cols[i].index+2] = d
+		}
+		if err = typeCheck(data0[2:], cols); err != nil {
+			return
+		}
+
+		if err = t.checkConstraintsAndDefaults(ctx, data0[2:], m); err != nil {
+			return false, err
+		}
+
+		id, err := t.store.ID()
+		if err != nil {
+			return false, err
+		}
+
+		data0[0] = h
+		data0[1] = id
+
+		// Any overflow chunks are written here.
+		if h, err = t.store.Create(data0...); err != nil {
+			return false, err
+		}
+
+		for i, v := range t.indices {
+			if v == nil {
+				continue
+			}
+
+			// Any overflow chunks are shared with the BTree key
+			if err = v.x.Create([]interface{}{data0[i+1]}, h); err != nil {
+				return false, err
+			}
+		}
+		for _, ix := range t.indices2 {
+			vlist, err := ix.eval(ctx, t.cols, id, data0[2:])
+			if err != nil {
+				return false, err
+			}
+
+			if err := ix.x.Create(vlist, h); err != nil {
+				return false, err
+			}
+		}
+
+		cc.RowsAffected++
+		ctx.db.root.lastInsertID = id
+		return true, nil
+	}); err != nil {
+		return nil, err
+	}
+
+	t.head = h
+	return nil, t.store.Update(t.hhead, h)
+}
+
+func (s *insertIntoStmt) exec(ctx *execCtx) (_ Recordset, err error) {
+	root := ctx.db.root
+	t, ok := root.tables[s.tableName]
+	if !ok {
+		return nil, fmt.Errorf("INSERT INTO %s: table does not exist", s.tableName)
+	}
+
+	var cols []*col
+	switch len(s.colNames) {
+	case 0:
+		cols = t.cols
+	default:
+		for _, colName := range s.colNames {
+			if col := findCol(t.cols, colName); col != nil {
+				cols = append(cols, col)
+				continue
+			}
+
+			return nil, fmt.Errorf("INSERT INTO %s: unknown column %s", s.tableName, colName)
+		}
+	}
+
+	if s.sel != nil {
+		return s.execSelect(t, cols, ctx)
+	}
+
+	for _, list := range s.lists {
+		if g, e := len(list), len(cols); g != e {
+			return nil, fmt.Errorf("INSERT INTO %s: expected %d value(s), have %d", s.tableName, e, g)
+		}
+	}
+
+	cc := ctx.db.cc
+	r := make([]interface{}, len(t.cols0))
+	m := map[interface{}]interface{}{}
+	for _, list := range s.lists {
+		for i, expr := range list {
+			val, err := expr.eval(ctx, m)
+			if err != nil {
+				return nil, err
+			}
+
+			r[cols[i].index] = val
+		}
+		if err = typeCheck(r, cols); err != nil {
+			return nil, err
+		}
+
+		if err = t.checkConstraintsAndDefaults(ctx, r, m); err != nil {
+			return nil, err
+		}
+
+		id, err := t.addRecord(ctx, r)
+		if err != nil {
+			return nil, err
+		}
+
+		cc.RowsAffected++
+		root.lastInsertID = id
+	}
+	return nil, nil
+}
+
+func (s *insertIntoStmt) isUpdating() bool { return true }
+
+type beginTransactionStmt struct{}
+
+func (s beginTransactionStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (beginTransactionStmt) String() string { return "BEGIN TRANSACTION;" }
+func (beginTransactionStmt) exec(*execCtx) (Recordset, error) {
+	panic("internal error 059")
+}
+func (beginTransactionStmt) isUpdating() bool {
+	panic("internal error 060")
+}
+
+type commitStmt struct{}
+
+func (s commitStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (commitStmt) String() string { return "COMMIT;" }
+func (commitStmt) exec(*execCtx) (Recordset, error) {
+	panic("internal error 061")
+}
+func (commitStmt) isUpdating() bool {
+	panic("internal error 062")
+}
+
+type rollbackStmt struct{}
+
+func (s rollbackStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (rollbackStmt) String() string { return "ROLLBACK;" }
+func (rollbackStmt) exec(*execCtx) (Recordset, error) {
+	panic("internal error 063")
+}
+func (rollbackStmt) isUpdating() bool {
+	panic("internal error 064")
+}
+
+type createIndexStmt struct {
+	colName     string // alt. "id()" for simple index on id()
+	ifNotExists bool
+	indexName   string
+	tableName   string
+	unique      bool
+	exprList    []expression
+}
+
+func (s *createIndexStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *createIndexStmt) isSimpleIndex() bool { return s.colName != "" }
+
+func (s *createIndexStmt) String() string {
+	u := ""
+	if s.unique {
+		u = "UNIQUE "
+	}
+	e := ""
+	if s.ifNotExists {
+		e = "IF NOT EXISTS "
+	}
+	expr := s.colName
+	if !s.isSimpleIndex() {
+		var a []string
+		for _, v := range s.exprList {
+			a = append(a, v.String())
+		}
+		expr = strings.Join(a, ", ")
+	}
+	return fmt.Sprintf("CREATE %sINDEX %s%s ON %s (%s);", u, e, s.indexName, s.tableName, expr)
+}
+
+func (s *createIndexStmt) exec(ctx *execCtx) (Recordset, error) {
+	root := ctx.db.root
+	if t, i := root.findIndexByName(s.indexName); i != nil {
+		if s.ifNotExists {
+			return nil, nil
+		}
+
+		return nil, fmt.Errorf("CREATE INDEX: table %s already has an index named %s", t.name, s.indexName)
+	}
+
+	if root.tables[s.indexName] != nil {
+		return nil, fmt.Errorf("CREATE INDEX: index name collision with existing table: %s", s.indexName)
+	}
+
+	t, ok := root.tables[s.tableName]
+	if !ok {
+		return nil, fmt.Errorf("CREATE INDEX: table does not exist %s", s.tableName)
+	}
+
+	if findCol(t.cols, s.indexName) != nil {
+		return nil, fmt.Errorf("CREATE INDEX: index name collision with existing column: %s", s.indexName)
+	}
+
+	var h int64
+	var err error
+	switch {
+	case s.isSimpleIndex():
+		colIndex := -1
+		if s.colName != "id()" {
+			c := findCol(t.cols, s.colName)
+			if c == nil {
+				return nil, fmt.Errorf("CREATE INDEX: column does not exist: %s", s.colName)
+			}
+
+			colIndex = c.index
+		}
+
+		if h, err = t.addIndex(s.unique, s.indexName, colIndex); err != nil {
+			return nil, fmt.Errorf("CREATE INDEX: %v", err)
+		}
+
+		if err = t.updated(); err != nil {
+			return nil, err
+		}
+	default:
+		for _, e := range s.exprList {
+			m := mentionedColumns(e)
+			for colName := range m {
+				c := findCol(t.cols, colName)
+				if c == nil {
+					return nil, fmt.Errorf("CREATE INDEX: column does not exist: %s", colName)
+				}
+			}
+		}
+		if h, err = t.addIndex2(ctx, s.unique, s.indexName, s.exprList); err != nil {
+			return nil, fmt.Errorf("CREATE INDEX: %v", err)
+		}
+	}
+
+	switch ctx.db.hasIndex2 {
+	case 0:
+		if err := ctx.db.createIndex2(); err != nil {
+			return nil, err
+		}
+
+		if s.isSimpleIndex() {
+			return nil, nil
+		}
+	case 1:
+		return nil, nil
+	case 2:
+		if s.isSimpleIndex() {
+			return nil, ctx.db.insertIndex2(s.tableName, s.indexName, []string{s.colName}, s.unique, true, h)
+		}
+	default:
+		panic("internal error 011")
+	}
+
+	exprList := make([]string, 0, len(s.exprList))
+	for _, e := range s.exprList {
+		exprList = append(exprList, e.String())
+	}
+	return nil, ctx.db.insertIndex2(s.tableName, s.indexName, exprList, s.unique, false, h)
+}
+
+func (s *createIndexStmt) isUpdating() bool { return true }
+
+type createTableStmt struct {
+	ifNotExists bool
+	tableName   string
+	cols        []*col
+}
+
+func (s *createTableStmt) explain(ctx *execCtx, w strutil.Formatter) {
+	w.Format("%s\n", s)
+}
+
+func (s *createTableStmt) String() string {
+	a := make([]string, len(s.cols))
+	for i, v := range s.cols {
+		var c, d string
+		if x := v.constraint; x != nil {
+			switch e := x.expr; {
+			case e != nil:
+				c = " " + e.String()
+			default:
+				c = " NOT NULL"
+			}
+		}
+		if x := v.dflt; x != nil {
+			d = " DEFAULT " + x.String()
+		}
+		a[i] = fmt.Sprintf("%s %s%s%s", v.name, typeStr(v.typ), c, d)
+	}
+	e := ""
+	if s.ifNotExists {
+		e = "IF NOT EXISTS "
+	}
+	return fmt.Sprintf("CREATE TABLE %s%s (%s);", e, s.tableName, strings.Join(a, ", "))
+}
+
+func (s *createTableStmt) exec(ctx *execCtx) (_ Recordset, err error) {
+	var cols []*col
+	for _, v := range s.cols {
+		cols = append(cols, v.clone())
+	}
+	root := ctx.db.root
+	if _, ok := root.tables[s.tableName]; ok {
+		if s.ifNotExists {
+			return nil, nil
+		}
+
+		return nil, fmt.Errorf("CREATE TABLE: table exists %s", s.tableName)
+	}
+
+	if t, x := root.findIndexByName(s.tableName); x != nil {
+		return nil, fmt.Errorf("CREATE TABLE: table %s has index %s", t.name, s.tableName)
+	}
+
+	m := map[string]bool{}
+	mustCreateColumn2 := true
+	for i, c := range cols {
+		nm := c.name
+		if m[nm] {
+			return nil, fmt.Errorf("CREATE TABLE: duplicate column %s", nm)
+		}
+
+		m[nm] = true
+		c.index = i
+		if c.constraint != nil || c.dflt != nil {
+			if mustCreateColumn2 {
+				for _, stmt := range createColumn2.l {
+					_, err := stmt.exec(&execCtx{db: ctx.db})
+					if err != nil {
+						return nil, err
+					}
+				}
+			}
+
+			mustCreateColumn2 = false
+			notNull := c.constraint != nil && c.constraint.expr == nil
+			var co, d string
+			if c.constraint != nil && c.constraint.expr != nil {
+				co = c.constraint.expr.String()
+			}
+			if e := c.dflt; e != nil {
+				d = e.String()
+			}
+			if _, err := insertColumn2.l[0].exec(&execCtx{db: ctx.db, arg: []interface{}{s.tableName, c.name, notNull, co, d}}); err != nil {
+				return nil, err
+			}
+		}
+	}
+	t, err := root.createTable(s.tableName, cols)
+	if err != nil {
+		return nil, err
+	}
+
+	return nil, t.constraintsAndDefaults(ctx)
+}
+
+func (s *createTableStmt) isUpdating() bool { return true }
diff --git a/vendor/github.com/cznic/ql/storage.go b/vendor/github.com/cznic/ql/storage.go
new file mode 100644
index 0000000000..fa7a4bf0c6
--- /dev/null
+++ b/vendor/github.com/cznic/ql/storage.go
@@ -0,0 +1,991 @@
+// Copyright (c) 2014 ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package ql
+
+import (
+	"fmt"
+	"strings"
+)
+
+type storage interface {
+	Acid() bool
+	BeginTransaction() error
+	Close() error
+	Commit() error
+	Create(data ...interface{}) (h int64, err error)
+	CreateIndex(unique bool) (handle int64, x btreeIndex, err error)
+	CreateTemp(asc bool) (bt temp, err error)
+	Delete(h int64, blobCols ...*col) error //LATER split the nil blobCols case
+	ID() (id int64, err error)
+	Name() string
+	OpenIndex(unique bool, handle int64) (btreeIndex, error) // Never called on the memory backend.
+	Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error)
+	ResetID() (err error)
+	Rollback() error
+	Update(h int64, data ...interface{}) error
+	UpdateRow(h int64, blobCols []*col, data ...interface{}) error
+	Verify() (allocs int64, err error)
+}
+
+type btreeIterator interface {
+	Next() (k, v []interface{}, err error)
+}
+
+type temp interface {
+	BeginTransaction() error
+	Create(data ...interface{}) (h int64, err error)
+	Drop() (err error)
+	Get(k []interface{}) (v []interface{}, err error)
+	Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error)
+	SeekFirst() (e btreeIterator, err error)
+	Set(k, v []interface{}) (err error)
+}
+
+type indexIterator interface {
+	Next() (k []interface{}, h int64, err error)
+	Prev() (k []interface{}, h int64, err error)
+}
+
+type btreeIndex interface {
+	Clear() error                                                               // supports truncate table statement
+	Create(indexedValues []interface{}, h int64) error                          // supports insert into statement
+	Delete(indexedValues []interface{}, h int64) error                          // supports delete from statement
+	Drop() error                                                                // supports drop table, drop index statements
+	Seek(indexedValues []interface{}) (iter indexIterator, hit bool, err error) // supports where clause
+	SeekFirst() (iter indexIterator, err error)                                 // supports aggregate min / ascending order by
+	SeekLast() (iter indexIterator, err error)                                  // supports aggregate max / descending order by
+}
+
+type indexedCol struct { // Column name or id() index.
+	name   string
+	unique bool
+	x      btreeIndex
+	xroot  int64
+}
+
+type index2 struct { // Expression list index.
+	unique   bool
+	x        btreeIndex
+	xroot    int64
+	sources  []string
+	exprList []expression
+}
+
+func (x *index2) eval(ctx *execCtx, cols []*col, id int64, r []interface{}) ([]interface{}, error) {
+	f, isFile := ctx.db.store.(*file)
+	vlist := make([]interface{}, len(x.exprList))
+	m := map[interface{}]interface{}{"$id": id}
+	for _, col := range cols {
+		ci := col.index
+		v := interface{}(nil)
+		if ci < len(r) {
+			v = r[ci]
+		}
+		if b, ok := v.([]byte); ok && isFile {
+			var err error
+			if v, err = expand1(chunk{f: f, b: b}, nil); err != nil {
+				return nil, err
+			}
+		}
+		m[col.name] = v
+	}
+	for i, e := range x.exprList {
+		v, err := e.eval(ctx, m)
+		if err != nil {
+			return nil, err
+		}
+
+		if ok, typ := isBlobType(v); ok {
+			return nil, fmt.Errorf("value of a complex index cannot be of blob-like type: %v", typ)
+		}
+
+		vlist[i] = v
+	}
+	return vlist, nil
+}
+
+type indexKey struct {
+	value []interface{}
+	h     int64
+}
+
+// storage fields
+// 0: next  int64
+// 1: scols string
+// 2: hhead int64
+// 3: name  string
+// 4: indices string - optional
+// 5: hxroots int64 - optional
+type table struct {
+	cols        []*col // logical
+	cols0       []*col // physical
+	h           int64  //
+	head        int64  // head of the single linked record list
+	hhead       int64  // handle of the head of the single linked record list
+	hxroots     int64
+	indices     []*indexedCol
+	indices2    map[string]*index2
+	name        string
+	next        int64 // single linked table list
+	store       storage
+	tnext       *table
+	tprev       *table
+	xroots      []interface{}
+	constraints []*constraint
+	defaults    []expression
+}
+
+func (t *table) hasIndices() bool  { return len(t.indices) != 0 || len(t.indices2) != 0 }
+func (t *table) hasIndices2() bool { return len(t.indices2) != 0 }
+
+func (t *table) constraintsAndDefaults(ctx *execCtx) error {
+	if isSystemName[t.name] {
+		return nil
+	}
+
+	_, ok := ctx.db.root.tables["__Column2"]
+	if !ok {
+		return nil
+	}
+
+	cols := t.cols
+	constraints := make([]*constraint, len(cols))
+	defaults := make([]expression, len(cols))
+	arg := []interface{}{t.name}
+	rs, err := selectColumn2.l[0].exec(&execCtx{db: ctx.db, arg: arg})
+	if err != nil {
+		return err
+	}
+
+	var rows [][]interface{}
+	ok = false
+	if err := rs.(recordset).do(
+		&execCtx{db: ctx.db, arg: arg},
+		func(id interface{}, data []interface{}) (more bool, err error) {
+			rows = append(rows, data)
+			return true, nil
+		},
+	); err != nil {
+		return err
+	}
+
+	for _, row := range rows {
+		nm := row[0].(string)
+		nonNull := row[1].(bool)
+		cexpr := row[2].(string)
+		dexpr := row[3].(string)
+		for i, c := range cols {
+			if c.name == nm {
+				var co *constraint
+				if nonNull || cexpr != "" {
+					co = &constraint{}
+					constraints[i] = co
+					if cexpr != "" {
+						if co.expr, err = ctx.db.str2expr(cexpr); err != nil {
+							return fmt.Errorf("constraint %q: %v", cexpr, err)
+						}
+					}
+
+					t.constraints = constraints
+				}
+				if dexpr != "" {
+					if defaults[i], err = ctx.db.str2expr(dexpr); err != nil {
+						return fmt.Errorf("constraint %q: %v", dexpr, err)
+					}
+
+					t.defaults = defaults
+				}
+			}
+		}
+	}
+	return nil
+}
+
+func (t *table) checkConstraintsAndDefaults(ctx *execCtx, row []interface{}, m map[interface{}]interface{}) error {
+	cols := t.cols
+
+	if len(t.defaults) != 0 {
+		// 1.
+		for _, c := range cols {
+			m[c.name] = row[c.index]
+		}
+
+		// 2.
+		for i, c := range cols {
+			val := row[c.index]
+			expr := t.defaults[i]
+			if val != nil || expr == nil {
+				continue
+			}
+
+			dval, err := expr.eval(ctx, m)
+			if err != nil {
+				return err
+			}
+
+			row[c.index] = dval
+			if err = typeCheck(row, []*col{c}); err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(t.constraints) != 0 {
+		// 3.
+		for _, c := range cols {
+			m[c.name] = row[c.index]
+		}
+
+		// 4.
+		for i, c := range cols {
+			constraint := t.constraints[i]
+			if constraint == nil {
+				continue
+			}
+
+			val := row[c.index]
+			expr := constraint.expr
+			if expr == nil { // Constraint: NOT NULL
+				if val == nil {
+					return fmt.Errorf("column %s: constraint violation: NOT NULL", c.name)
+				}
+
+				continue
+			}
+
+			// Constraint is an expression
+			cval, err := expr.eval(ctx, m)
+			if err != nil {
+				return err
+			}
+
+			if cval == nil {
+				return fmt.Errorf("column %s: constraint violation: %s", c.name, expr)
+			}
+
+			bval, ok := cval.(bool)
+			if !ok {
+				return fmt.Errorf("column %s: non bool constraint expression: %s", c.name, expr)
+			}
+
+			if !bval {
+				return fmt.Errorf("column %s: constraint violation: %s", c.name, expr)
+			}
+		}
+	}
+
+	return nil
+}
+
+func (t *table) clone() *table {
+	r := &table{}
+	*r = *t
+	r.constraints = append([]*constraint(nil), t.constraints...)
+	r.defaults = append([]expression(nil), t.defaults...)
+	r.indices2 = nil
+	if n := len(t.indices2); n != 0 {
+		r.indices2 = make(map[string]*index2, n)
+		for k, v := range t.indices2 {
+			r.indices2[k] = v
+		}
+	}
+	r.cols = make([]*col, len(t.cols))
+	for i, v := range t.cols {
+		c := &col{}
+		*c = *v
+		r.cols[i] = c
+	}
+	r.cols0 = make([]*col, len(t.cols0))
+	for i, v := range t.cols0 {
+		c := &col{}
+		*c = *v
+		r.cols0[i] = c
+	}
+	r.indices = make([]*indexedCol, len(t.indices))
+	for i, v := range t.indices {
+		if v != nil {
+			c := &indexedCol{}
+			*c = *v
+			r.indices[i] = c
+		}
+	}
+	r.xroots = make([]interface{}, len(t.xroots))
+	copy(r.xroots, t.xroots)
+	r.tnext, r.tprev = nil, nil
+	return r
+}
+
+func (t *table) findIndexByColName(name string) (*col, *indexedCol) {
+	for i, v := range t.indices {
+		if v == nil {
+			continue
+		}
+
+		if i == 0 {
+			if name == "id()" {
+				return idCol, v
+			}
+
+			continue
+		}
+
+		if c := t.cols[i-1]; c.name == name {
+			return c, v
+		}
+	}
+
+	return nil, nil
+}
+
+func (t *table) findIndexByName(name string) interface{} {
+	for _, v := range t.indices {
+		if v != nil && v.name == name {
+			return v
+		}
+	}
+	for k, v := range t.indices2 {
+		if k == name {
+			return v
+		}
+	}
+	return nil
+}
+
+func (t *table) load() (err error) {
+	data, err := t.store.Read(nil, t.h)
+	if err != nil {
+		return
+	}
+
+	var hasIndices bool
+	switch n := len(data); n {
+	case 4:
+	case 6:
+		hasIndices = true
+	default:
+		return fmt.Errorf("corrupted DB: table data len %d", n)
+	}
+
+	var ok bool
+	if t.next, ok = data[0].(int64); !ok {
+		return fmt.Errorf("corrupted DB: table data[0] of type %T", data[0])
+	}
+
+	scols, ok := data[1].(string)
+	if !ok {
+		return fmt.Errorf("corrupted DB: table data[1] of type %T", data[1])
+	}
+
+	if t.hhead, ok = data[2].(int64); !ok {
+		return fmt.Errorf("corrupted DB: table data[2] of type %T", data[2])
+	}
+
+	if t.name, ok = data[3].(string); !ok {
+		return fmt.Errorf("corrupted DB: table data[3] of type %T", data[3])
+	}
+
+	var head []interface{}
+	if head, err = t.store.Read(nil, t.hhead); err != nil {
+		return err
+	}
+
+	if len(head) != 1 {
+		return fmt.Errorf("corrupted DB: table head data len %d", len(head))
+	}
+
+	if t.head, ok = head[0].(int64); !ok {
+		return fmt.Errorf("corrupted DB: table head data[0] of type %T", head[0])
+	}
+
+	a := strings.Split(scols, "|")
+	t.cols0 = make([]*col, len(a))
+	for i, v := range a {
+		if len(v) < 1 {
+			return fmt.Errorf("corrupted DB: field info %q", v)
+		}
+
+		col := &col{name: v[1:], typ: int(v[0]), index: i}
+		t.cols0[i] = col
+		if col.name != "" {
+			t.cols = append(t.cols, col)
+		}
+	}
+
+	if !hasIndices {
+		return
+	}
+
+	if t.hxroots, ok = data[5].(int64); !ok {
+		return fmt.Errorf("corrupted DB: table data[5] of type %T", data[5])
+	}
+
+	xroots, err := t.store.Read(nil, t.hxroots)
+	if err != nil {
+		return err
+	}
+
+	if g, e := len(xroots), len(t.cols0)+1; g != e {
+		return fmt.Errorf("corrupted DB: got %d index roots, expected %d", g, e)
+	}
+
+	indices, ok := data[4].(string)
+	if !ok {
+		return fmt.Errorf("corrupted DB: table data[4] of type %T", data[4])
+	}
+
+	a = strings.Split(indices, "|")
+	if g, e := len(a), len(t.cols0)+1; g != e {
+		return fmt.Errorf("corrupted DB: got %d index definitions, expected %d", g, e)
+	}
+
+	t.indices = make([]*indexedCol, len(a))
+	for i, v := range a {
+		if v == "" {
+			continue
+		}
+
+		if len(v) < 2 {
+			return fmt.Errorf("corrupted DB: invalid index definition %q", v)
+		}
+
+		nm := v[1:]
+		h, ok := xroots[i].(int64)
+		if !ok {
+			return fmt.Errorf("corrupted DB: table index root of type %T", xroots[i])
+		}
+
+		if h == 0 {
+			return fmt.Errorf("corrupted DB: missing root for index %s", nm)
+		}
+
+		unique := v[0] == 'u'
+		x, err := t.store.OpenIndex(unique, h)
+		if err != nil {
+			return err
+		}
+
+		t.indices[i] = &indexedCol{nm, unique, x, h}
+	}
+	t.xroots = xroots
+
+	return
+}
+
+func newTable(store storage, name string, next int64, cols []*col, tprev, tnext *table) (t *table, err error) {
+	hhead, err := store.Create(int64(0))
+	if err != nil {
+		return
+	}
+
+	scols := cols2meta(cols)
+	h, err := store.Create(next, scols, hhead, name)
+	if err != nil {
+		return
+	}
+
+	t = &table{
+		cols0: cols,
+		h:     h,
+		hhead: hhead,
+		name:  name,
+		next:  next,
+		store: store,
+		tnext: tnext,
+		tprev: tprev,
+	}
+	return t.updateCols(), nil
+}
+
+func (t *table) blobCols() (r []*col) {
+	for _, c := range t.cols0 {
+		switch c.typ {
+		case qBlob, qBigInt, qBigRat, qTime, qDuration:
+			r = append(r, c)
+		}
+	}
+	return
+}
+
+func (t *table) truncate() (err error) {
+	h := t.head
+	var rec []interface{}
+	blobCols := t.blobCols()
+	for h != 0 {
+		rec, err := t.store.Read(rec, h)
+		if err != nil {
+			return err
+		}
+		nh := rec[0].(int64)
+
+		if err = t.store.Delete(h, blobCols...); err != nil { //LATER remove double read for len(blobCols) != 0
+			return err
+		}
+
+		h = nh
+	}
+	if err = t.store.Update(t.hhead, 0); err != nil {
+		return
+	}
+
+	for _, v := range t.indices {
+		if v == nil {
+			continue
+		}
+
+		if err := v.x.Clear(); err != nil {
+			return err
+		}
+	}
+	for _, ix := range t.indices2 {
+		if err := ix.x.Clear(); err != nil {
+			return err
+		}
+	}
+	t.head = 0
+	return t.updated()
+}
+
+func (t *table) addIndex0(unique bool, indexName string, colIndex int) (int64, btreeIndex, error) {
+	switch len(t.indices) {
+	case 0:
+		indices := make([]*indexedCol, len(t.cols0)+1)
+		h, x, err := t.store.CreateIndex(unique)
+		if err != nil {
+			return -1, nil, err
+		}
+
+		indices[colIndex+1] = &indexedCol{indexName, unique, x, h}
+		xroots := make([]interface{}, len(indices))
+		xroots[colIndex+1] = h
+		hx, err := t.store.Create(xroots...)
+		if err != nil {
+			return -1, nil, err
+		}
+
+		t.hxroots, t.xroots, t.indices = hx, xroots, indices
+		return h, x, t.updated()
+	default:
+		ex := t.indices[colIndex+1]
+		if ex != nil && ex.name != "" {
+			colName := "id()"
+			if colIndex >= 0 {
+				colName = t.cols0[colIndex].name
+			}
+			return -1, nil, fmt.Errorf("column %s already has an index: %s", colName, ex.name)
+		}
+
+		h, x, err := t.store.CreateIndex(unique)
+		if err != nil {
+			return -1, nil, err
+		}
+
+		t.xroots[colIndex+1] = h
+		if err := t.store.Update(t.hxroots, t.xroots...); err != nil {
+			return -1, nil, err
+		}
+
+		t.indices[colIndex+1] = &indexedCol{indexName, unique, x, h}
+		return h, x, t.updated()
+	}
+}
+
+func (t *table) addIndex(unique bool, indexName string, colIndex int) (int64, error) {
+	hx, x, err := t.addIndex0(unique, indexName, colIndex)
+	if err != nil {
+		return -1, err
+	}
+
+	// Must fill the new index.
+	ncols := len(t.cols0)
+	h, store := t.head, t.store
+	for h != 0 {
+		rec, err := store.Read(nil, h, t.cols...)
+		if err != nil {
+			return -1, err
+		}
+
+		if n := ncols + 2 - len(rec); n > 0 {
+			rec = append(rec, make([]interface{}, n)...)
+		}
+
+		if err = x.Create([]interface{}{rec[colIndex+2]}, h); err != nil {
+			return -1, err
+		}
+
+		h = rec[0].(int64)
+	}
+	return hx, nil
+}
+
+func (t *table) addIndex2(execCtx *execCtx, unique bool, indexName string, exprList []expression) (int64, error) {
+	if _, ok := t.indices2[indexName]; ok {
+		panic("internal error 009")
+	}
+
+	hx, x, err := t.store.CreateIndex(unique)
+	if err != nil {
+		return -1, err
+	}
+	var a []string
+	for _, v := range exprList {
+		a = append(a, v.String())
+	}
+	x2 := &index2{unique, x, hx, a, exprList}
+	if t.indices2 == nil {
+		t.indices2 = map[string]*index2{}
+	}
+	t.indices2[indexName] = x2
+
+	// Must fill the new index.
+	m := map[interface{}]interface{}{}
+	h, store := t.head, t.store
+	for h != 0 {
+		rec, err := store.Read(nil, h, t.cols...)
+		if err != nil {
+			return -1, err
+		}
+
+		for _, col := range t.cols {
+			ci := col.index
+			v := interface{}(nil)
+			if ci < len(rec) {
+				v = rec[ci+2]
+			}
+			m[col.name] = v
+		}
+
+		id := rec[1].(int64)
+		vlist, err := x2.eval(execCtx, t.cols, id, rec[2:])
+		if err != nil {
+			return -1, err
+		}
+
+		if err := x2.x.Create(vlist, h); err != nil {
+			return -1, err
+		}
+
+		h = rec[0].(int64)
+	}
+	return hx, nil
+}
+
+func (t *table) dropIndex(xIndex int) error {
+	t.xroots[xIndex] = 0
+	if err := t.indices[xIndex].x.Drop(); err != nil {
+		return err
+	}
+
+	t.indices[xIndex] = nil
+	return t.updated()
+}
+
+func (t *table) updated() (err error) {
+	switch {
+	case len(t.indices) != 0:
+		a := []string{}
+		for _, v := range t.indices {
+			if v == nil {
+				a = append(a, "")
+				continue
+			}
+
+			s := "n"
+			if v.unique {
+				s = "u"
+			}
+			a = append(a, s+v.name)
+		}
+		return t.store.Update(t.h, t.next, cols2meta(t.updateCols().cols0), t.hhead, t.name, strings.Join(a, "|"), t.hxroots)
+	default:
+		return t.store.Update(t.h, t.next, cols2meta(t.updateCols().cols0), t.hhead, t.name)
+	}
+}
+
+// storage fields
+// 0: next record handle int64
+// 1: record id          int64
+// 2...: data row
+func (t *table) addRecord(execCtx *execCtx, r []interface{}) (id int64, err error) {
+	if id, err = t.store.ID(); err != nil {
+		return
+	}
+
+	r = append([]interface{}{t.head, id}, r...)
+	h, err := t.store.Create(r...)
+	if err != nil {
+		return
+	}
+
+	for i, v := range t.indices {
+		if v == nil {
+			continue
+		}
+
+		if err = v.x.Create([]interface{}{r[i+1]}, h); err != nil {
+			return
+		}
+	}
+
+	for _, ix := range t.indices2 {
+		vlist, err := ix.eval(execCtx, t.cols, id, r[2:])
+		if err != nil {
+			return -1, err
+		}
+
+		if err := ix.x.Create(vlist, h); err != nil {
+			return -1, err
+		}
+	}
+
+	if err = t.store.Update(t.hhead, h); err != nil {
+		return
+	}
+
+	t.head = h
+	return
+}
+
+func (t *table) flds() (r []*fld) {
+	r = make([]*fld, len(t.cols))
+	for i, v := range t.cols {
+		r[i] = &fld{expr: &ident{v.name}, name: v.name}
+	}
+	return
+}
+
+func (t *table) fieldNames() []string {
+	r := make([]string, len(t.cols))
+	for i, v := range t.cols {
+		r[i] = v.name
+	}
+	return r
+}
+
+func (t *table) updateCols() *table {
+	t.cols = t.cols[:0]
+	for i, c := range t.cols0 {
+		if c.name != "" {
+			c.index = i
+			t.cols = append(t.cols, c)
+		}
+	}
+	return t
+}
+
+func (t *table) row0(ctx *execCtx, h int64) ([]interface{}, error) {
+	rec, err := ctx.db.store.Read(nil, h, t.cols...)
+	if err != nil {
+		return nil, err
+	}
+
+	if d := len(t.cols) - (len(rec) - 2); d > 0 {
+		rec = append(rec, make([]interface{}, d)...)
+	}
+
+	return rec, nil
+}
+
+func (t *table) row(ctx *execCtx, h int64) (int64, []interface{}, error) {
+	rec, err := t.row0(ctx, h)
+	if err != nil {
+		return -1, nil, err
+	}
+
+	return rec[1].(int64), rec[2:], nil
+}
+
+// storage fields
+// 0: handle of first table in DB int64
+type root struct {
+	head         int64 // Single linked table list
+	lastInsertID int64
+	parent       *root
+	rowsAffected int64 //LATER implement
+	store        storage
+	tables       map[string]*table
+	thead        *table
+}
+
+func newRoot(store storage) (r *root, err error) {
+	data, err := store.Read(nil, 1)
+	if err != nil {
+		return
+	}
+
+	switch len(data) {
+	case 0: // new empty DB, create empty table list
+		if err = store.BeginTransaction(); err != nil {
+			return
+		}
+
+		if err = store.Update(1, int64(0)); err != nil {
+			store.Rollback()
+			return
+		}
+
+		if err = store.Commit(); err != nil {
+			return
+		}
+
+		return &root{
+			store:  store,
+			tables: map[string]*table{},
+		}, nil
+	case 1: // existing DB, load tables
+		if len(data) != 1 {
+			return nil, fmt.Errorf("corrupted DB: root is an %d-scalar", len(data))
+		}
+
+		p, ok := data[0].(int64)
+		if !ok {
+			return nil, fmt.Errorf("corrupted DB: root head has type %T", data[0])
+		}
+
+		r := &root{
+			head:   p,
+			store:  store,
+			tables: map[string]*table{},
+		}
+
+		var tprev *table
+		for p != 0 {
+			t := &table{
+				h:     p,
+				store: store,
+				tprev: tprev,
+			}
+
+			if r.thead == nil {
+				r.thead = t
+			}
+			if tprev != nil {
+				tprev.tnext = t
+			}
+			tprev = t
+
+			if err = t.load(); err != nil {
+				return nil, err
+			}
+
+			if r.tables[t.name] != nil { // duplicate
+				return nil, fmt.Errorf("corrupted DB: duplicate table metadata for table %s", t.name)
+			}
+
+			r.tables[t.name] = t
+			p = t.next
+		}
+		return r, nil
+	default:
+		return nil, errIncompatibleDBFormat
+	}
+}
+
+func (r *root) findIndexByName(name string) (*table, interface{}) {
+	for _, t := range r.tables {
+		if i := t.findIndexByName(name); i != nil {
+			return t, i
+		}
+	}
+
+	return nil, nil
+}
+
+func (r *root) updated() (err error) {
+	return r.store.Update(1, r.head)
+}
+
+func (r *root) createTable(name string, cols []*col) (t *table, err error) {
+	if _, ok := r.tables[name]; ok {
+		panic("internal error 065")
+	}
+
+	if t, err = newTable(r.store, name, r.head, cols, nil, r.thead); err != nil {
+		return nil, err
+	}
+
+	if err = r.store.Update(1, t.h); err != nil {
+		return nil, err
+	}
+
+	if p := r.thead; p != nil {
+		p.tprev = t
+	}
+	r.tables[name], r.head, r.thead = t, t.h, t
+	return
+}
+
+func (r *root) dropTable(t *table) (err error) {
+	defer func() {
+		if err != nil {
+			return
+		}
+
+		delete(r.tables, t.name)
+	}()
+
+	if err = t.truncate(); err != nil {
+		return
+	}
+
+	if err = t.store.Delete(t.hhead); err != nil {
+		return
+	}
+
+	if err = t.store.Delete(t.h); err != nil {
+		return
+	}
+
+	for _, v := range t.indices {
+		if v != nil && v.x != nil {
+			if err = v.x.Drop(); err != nil {
+				return
+			}
+		}
+	}
+	for _, v := range t.indices2 {
+		if err = v.x.Drop(); err != nil {
+			return
+		}
+	}
+
+	if h := t.hxroots; h != 0 {
+		if err = t.store.Delete(h); err != nil {
+			return
+		}
+	}
+
+	switch {
+	case t.tprev == nil && t.tnext == nil:
+		r.head = 0
+		r.thead = nil
+		err = r.updated()
+		return errSet(&err, r.store.ResetID())
+	case t.tprev == nil && t.tnext != nil:
+		next := t.tnext
+		next.tprev = nil
+		r.head = next.h
+		r.thead = next
+		if err = r.updated(); err != nil {
+			return
+		}
+
+		return next.updated()
+	case t.tprev != nil && t.tnext == nil: // last in list
+		prev := t.tprev
+		prev.next = 0
+		prev.tnext = nil
+		return prev.updated()
+	default: //case t.tprev != nil && t.tnext != nil:
+		prev, next := t.tprev, t.tnext
+		prev.next = next.h
+		prev.tnext = next
+		next.tprev = prev
+		if err = prev.updated(); err != nil {
+			return
+		}
+
+		return next.updated()
+	}
+}
diff --git a/vendor/github.com/cznic/sortutil/LICENSE b/vendor/github.com/cznic/sortutil/LICENSE
new file mode 100644
index 0000000000..67983e0e61
--- /dev/null
+++ b/vendor/github.com/cznic/sortutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The sortutil Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/cznic/sortutil/sortutil.go b/vendor/github.com/cznic/sortutil/sortutil.go
new file mode 100644
index 0000000000..c0ced542d3
--- /dev/null
+++ b/vendor/github.com/cznic/sortutil/sortutil.go
@@ -0,0 +1,227 @@
+// Copyright 2014 The sortutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package sortutil provides utilities supplementing the standard 'sort' package.
+package sortutil
+
+import "sort"
+
+// ByteSlice attaches the methods of sort.Interface to []byte, sorting in increasing order.
+type ByteSlice []byte
+
+func (s ByteSlice) Len() int           { return len(s) }
+func (s ByteSlice) Less(i, j int) bool { return s[i] < s[j] }
+func (s ByteSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s ByteSlice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchBytes searches for x in a sorted slice of bytes and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchBytes(a []byte, x byte) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// Float32Slice attaches the methods of sort.Interface to []float32, sorting in increasing order.
+type Float32Slice []float32
+
+func (s Float32Slice) Len() int           { return len(s) }
+func (s Float32Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s Float32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s Float32Slice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchFloat32s searches for x in a sorted slice of float32 and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchFloat32s(a []float32, x float32) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// Int8Slice attaches the methods of sort.Interface to []int8, sorting in increasing order.
+type Int8Slice []int8
+
+func (s Int8Slice) Len() int           { return len(s) }
+func (s Int8Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s Int8Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s Int8Slice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchInt8s searches for x in a sorted slice of int8 and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchInt8s(a []int8, x int8) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// Int16Slice attaches the methods of sort.Interface to []int16, sorting in increasing order.
+type Int16Slice []int16
+
+func (s Int16Slice) Len() int           { return len(s) }
+func (s Int16Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s Int16Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s Int16Slice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchInt16s searches for x in a sorted slice of int16 and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchInt16s(a []int16, x int16) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// Int32Slice attaches the methods of sort.Interface to []int32, sorting in increasing order.
+type Int32Slice []int32
+
+func (s Int32Slice) Len() int           { return len(s) }
+func (s Int32Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s Int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s Int32Slice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchInt32s searches for x in a sorted slice of int32 and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchInt32s(a []int32, x int32) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// Int64Slice attaches the methods of sort.Interface to []int64, sorting in increasing order.
+type Int64Slice []int64
+
+func (s Int64Slice) Len() int           { return len(s) }
+func (s Int64Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s Int64Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s Int64Slice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchInt64s searches for x in a sorted slice of int64 and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchInt64s(a []int64, x int64) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// UintSlice attaches the methods of sort.Interface to []uint, sorting in increasing order.
+type UintSlice []uint
+
+func (s UintSlice) Len() int           { return len(s) }
+func (s UintSlice) Less(i, j int) bool { return s[i] < s[j] }
+func (s UintSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s UintSlice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchUints searches for x in a sorted slice of uints and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchUints(a []uint, x uint) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// Uint16Slice attaches the methods of sort.Interface to []uint16, sorting in increasing order.
+type Uint16Slice []uint16
+
+func (s Uint16Slice) Len() int           { return len(s) }
+func (s Uint16Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s Uint16Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s Uint16Slice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchUint16s searches for x in a sorted slice of uint16 and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchUint16s(a []uint16, x uint16) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// Uint32Slice attaches the methods of sort.Interface to []uint32, sorting in increasing order.
+type Uint32Slice []uint32
+
+func (s Uint32Slice) Len() int           { return len(s) }
+func (s Uint32Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s Uint32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s Uint32Slice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchUint32s searches for x in a sorted slice of uint32 and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchUint32s(a []uint32, x uint32) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// Uint64Slice attaches the methods of sort.Interface to []uint64, sorting in increasing order.
+type Uint64Slice []uint64
+
+func (s Uint64Slice) Len() int           { return len(s) }
+func (s Uint64Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s Uint64Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s Uint64Slice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchUint64s searches for x in a sorted slice of uint64 and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchUint64s(a []uint64, x uint64) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// RuneSlice attaches the methods of sort.Interface to []rune, sorting in increasing order.
+type RuneSlice []rune
+
+func (s RuneSlice) Len() int           { return len(s) }
+func (s RuneSlice) Less(i, j int) bool { return s[i] < s[j] }
+func (s RuneSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// Sort is a convenience method.
+func (s RuneSlice) Sort() {
+	sort.Sort(s)
+}
+
+// SearchRunes searches for x in a sorted slice of uint64 and returns the index
+// as specified by sort.Search. The slice must be sorted in ascending order.
+func SearchRunes(a []rune, x rune) int {
+	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
+}
+
+// Dedupe returns n, the number of distinct elements in data. The resulting
+// elements are sorted in elements [0, n) or data[:n] for a slice.
+func Dedupe(data sort.Interface) (n int) {
+	if n = data.Len(); n < 2 {
+		return n
+	}
+
+	sort.Sort(data)
+	a, b := 0, 1
+	for b < n {
+		if data.Less(a, b) {
+			a++
+			if a != b {
+				data.Swap(a, b)
+			}
+		}
+		b++
+	}
+	return a + 1
+}
diff --git a/vendor/github.com/cznic/strutil/LICENSE b/vendor/github.com/cznic/strutil/LICENSE
new file mode 100644
index 0000000000..2fdd92cf71
--- /dev/null
+++ b/vendor/github.com/cznic/strutil/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The strutil Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/cznic/strutil/strutil.go b/vendor/github.com/cznic/strutil/strutil.go
new file mode 100644
index 0000000000..ba83489df7
--- /dev/null
+++ b/vendor/github.com/cznic/strutil/strutil.go
@@ -0,0 +1,428 @@
+// Copyright (c) 2014 The sortutil Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package strutil collects utils supplemental to the standard strings package.
+package strutil
+
+import (
+	"bytes"
+	"encoding/base32"
+	"encoding/base64"
+	"fmt"
+	"io"
+	"strings"
+	"sync"
+)
+
+// Base32ExtDecode decodes base32 extended (RFC 4648) text to binary data.
+func Base32ExtDecode(text []byte) (data []byte, err error) {
+	n := base32.HexEncoding.DecodedLen(len(text))
+	data = make([]byte, n)
+	decoder := base32.NewDecoder(base32.HexEncoding, bytes.NewBuffer(text))
+	if n, err = decoder.Read(data); err != nil {
+		n = 0
+	}
+	data = data[:n]
+	return
+}
+
+// Base32ExtEncode encodes binary data to base32 extended (RFC 4648) encoded text.
+func Base32ExtEncode(data []byte) (text []byte) {
+	n := base32.HexEncoding.EncodedLen(len(data))
+	buf := bytes.NewBuffer(make([]byte, 0, n))
+	encoder := base32.NewEncoder(base32.HexEncoding, buf)
+	encoder.Write(data)
+	encoder.Close()
+	if buf.Len() != n {
+		panic("internal error")
+	}
+	return buf.Bytes()
+}
+
+// Base64Decode decodes base64 text to binary data.
+func Base64Decode(text []byte) (data []byte, err error) {
+	n := base64.StdEncoding.DecodedLen(len(text))
+	data = make([]byte, n)
+	decoder := base64.NewDecoder(base64.StdEncoding, bytes.NewBuffer(text))
+	if n, err = decoder.Read(data); err != nil {
+		n = 0
+	}
+	data = data[:n]
+	return
+}
+
+// Base64Encode encodes binary data to base64 encoded text.
+func Base64Encode(data []byte) (text []byte) {
+	n := base64.StdEncoding.EncodedLen(len(data))
+	buf := bytes.NewBuffer(make([]byte, 0, n))
+	encoder := base64.NewEncoder(base64.StdEncoding, buf)
+	encoder.Write(data)
+	encoder.Close()
+	if buf.Len() != n {
+		panic("internal error")
+	}
+	return buf.Bytes()
+}
+
+// Formatter is an io.Writer extended by a fmt.Printf like function Format
+type Formatter interface {
+	io.Writer
+	Format(format string, args ...interface{}) (n int, errno error)
+}
+
+type indentFormatter struct {
+	io.Writer
+	indent      []byte
+	indentLevel int
+	state       int
+}
+
+const (
+	st0 = iota
+	stBOL
+	stPERC
+	stBOL_PERC
+)
+
+// IndentFormatter returns a new Formatter which interprets %i and %u in the
+// Format() format string as indent and undent commands. The commands can
+// nest. The Formatter writes to io.Writer 'w' and inserts one 'indent'
+// string per current indent level value.
+// Behaviour of commands reaching negative indent levels is undefined.
+//	IndentFormatter(os.Stdout, "\t").Format("abc%d%%e%i\nx\ny\n%uz\n", 3)
+// output:
+//	abc3%e
+//		x
+//		y
+//	z
+// The Go quoted string literal form of the above is:
+//	"abc%%e\n\tx\n\tx\nz\n"
+// The commands can be scattered between separate invocations of Format(),
+// i.e. the formatter keeps track of the indent level and knows if it is
+// positioned on start of a line and should emit indentation(s).
+// The same output as above can be produced by e.g.:
+//	f := IndentFormatter(os.Stdout, " ")
+//	f.Format("abc%d%%e%i\nx\n", 3)
+//	f.Format("y\n%uz\n")
+func IndentFormatter(w io.Writer, indent string) Formatter {
+	return &indentFormatter{w, []byte(indent), 0, stBOL}
+}
+
+func (f *indentFormatter) format(flat bool, format string, args ...interface{}) (n int, errno error) {
+	buf := []byte{}
+	for i := 0; i < len(format); i++ {
+		c := format[i]
+		switch f.state {
+		case st0:
+			switch c {
+			case '\n':
+				cc := c
+				if flat && f.indentLevel != 0 {
+					cc = ' '
+				}
+				buf = append(buf, cc)
+				f.state = stBOL
+			case '%':
+				f.state = stPERC
+			default:
+				buf = append(buf, c)
+			}
+		case stBOL:
+			switch c {
+			case '\n':
+				cc := c
+				if flat && f.indentLevel != 0 {
+					cc = ' '
+				}
+				buf = append(buf, cc)
+			case '%':
+				f.state = stBOL_PERC
+			default:
+				if !flat {
+					for i := 0; i < f.indentLevel; i++ {
+						buf = append(buf, f.indent...)
+					}
+				}
+				buf = append(buf, c)
+				f.state = st0
+			}
+		case stBOL_PERC:
+			switch c {
+			case 'i':
+				f.indentLevel++
+				f.state = stBOL
+			case 'u':
+				f.indentLevel--
+				f.state = stBOL
+			default:
+				if !flat {
+					for i := 0; i < f.indentLevel; i++ {
+						buf = append(buf, f.indent...)
+					}
+				}
+				buf = append(buf, '%', c)
+				f.state = st0
+			}
+		case stPERC:
+			switch c {
+			case 'i':
+				f.indentLevel++
+				f.state = st0
+			case 'u':
+				f.indentLevel--
+				f.state = st0
+			default:
+				buf = append(buf, '%', c)
+				f.state = st0
+			}
+		default:
+			panic("unexpected state")
+		}
+	}
+	switch f.state {
+	case stPERC, stBOL_PERC:
+		buf = append(buf, '%')
+	}
+	return f.Write([]byte(fmt.Sprintf(string(buf), args...)))
+}
+
+func (f *indentFormatter) Format(format string, args ...interface{}) (n int, errno error) {
+	return f.format(false, format, args...)
+}
+
+type flatFormatter indentFormatter
+
+// FlatFormatter returns a newly created Formatter with the same functionality as the one returned
+// by IndentFormatter except it allows a newline in the 'format' string argument of Format
+// to pass through iff indent level is currently zero.
+//
+// If indent level is non-zero then such new lines are changed to a space character.
+// There is no indent string, the %i and %u format verbs are used solely to determine the indent level.
+//
+// The FlatFormatter is intended for flattening of normally nested structure textual representation to
+// a one top level structure per line form.
+//	FlatFormatter(os.Stdout, " ").Format("abc%d%%e%i\nx\ny\n%uz\n", 3)
+// output in the form of a Go quoted string literal:
+//	"abc3%%e x y z\n"
+func FlatFormatter(w io.Writer) Formatter {
+	return (*flatFormatter)(IndentFormatter(w, "").(*indentFormatter))
+}
+
+func (f *flatFormatter) Format(format string, args ...interface{}) (n int, errno error) {
+	return (*indentFormatter)(f).format(true, format, args...)
+}
+
+// Pool handles aligning of strings having equal values to the same string instance.
+// Intended use is to conserve some memory e.g. where a large number of identically valued strings
+// with non identical backing arrays may exists in several semantically distinct instances of some structs.
+// Pool is *not* concurrent access safe. It doesn't handle common prefix/suffix aligning,
+// e.g. having s1 == "abc" and s2 == "bc", s2 is not automatically aligned as s1[1:].
+type Pool struct {
+	pool map[string]string
+}
+
+// NewPool returns a newly created Pool.
+func NewPool() *Pool {
+	return &Pool{map[string]string{}}
+}
+
+// Align returns a string with the same value as its argument. It guarantees that
+// all aligned strings share a single instance in memory.
+func (p *Pool) Align(s string) string {
+	if a, ok := p.pool[s]; ok {
+		return a
+	}
+
+	s = StrPack(s)
+	p.pool[s] = s
+	return s
+}
+
+// Count returns the number of items in the pool.
+func (p *Pool) Count() int {
+	return len(p.pool)
+}
+
+// GoPool is a concurrent access safe version of Pool.
+type GoPool struct {
+	pool map[string]string
+	rwm  *sync.RWMutex
+}
+
+// NewGoPool returns a newly created GoPool.
+func NewGoPool() (p *GoPool) {
+	return &GoPool{map[string]string{}, &sync.RWMutex{}}
+}
+
+// Align returns a string with the same value as its argument. It guarantees that
+// all aligned strings share a single instance in memory.
+func (p *GoPool) Align(s string) (y string) {
+	if s != "" {
+		p.rwm.RLock()               // R++
+		if a, ok := p.pool[s]; ok { // found
+			p.rwm.RUnlock() // R--
+			return a
+		}
+
+		p.rwm.RUnlock() // R--
+		// not found but with a race condition, retry within a write lock
+		p.rwm.Lock()                // W++
+		defer p.rwm.Unlock()        // W--
+		if a, ok := p.pool[s]; ok { // done in a race
+			return a
+		}
+
+		// we won
+		s = StrPack(s)
+		p.pool[s] = s
+		return s
+	}
+
+	return
+}
+
+// Count returns the number of items in the pool.
+func (p *GoPool) Count() int {
+	return len(p.pool)
+}
+
+// Dict is a string <-> id bijection. Dict is *not* concurrent access safe for assigning new ids
+// to strings not yet contained in the bijection.
+// Id for an empty string is guaranteed to be 0,
+// thus Id for any non empty string is guaranteed to be non zero.
+type Dict struct {
+	si map[string]int
+	is []string
+}
+
+// NewDict returns a newly created Dict.
+func NewDict() (d *Dict) {
+	d = &Dict{map[string]int{}, []string{}}
+	d.Id("")
+	return
+}
+
+// Count returns the number of items in the dict.
+func (d *Dict) Count() int {
+	return len(d.is)
+}
+
+// Id maps string s to its numeric identificator.
+func (d *Dict) Id(s string) (y int) {
+	if y, ok := d.si[s]; ok {
+		return y
+	}
+
+	s = StrPack(s)
+	y = len(d.is)
+	d.si[s] = y
+	d.is = append(d.is, s)
+	return
+}
+
+// S maps an id to its string value and ok == true. Id values not contained in the bijection
+// return "", false.
+func (d *Dict) S(id int) (s string, ok bool) {
+	if id >= len(d.is) {
+		return "", false
+	}
+	return d.is[id], true
+}
+
+// GoDict is a concurrent access safe version of Dict.
+type GoDict struct {
+	si  map[string]int
+	is  []string
+	rwm *sync.RWMutex
+}
+
+// NewGoDict returns a newly created GoDict.
+func NewGoDict() (d *GoDict) {
+	d = &GoDict{map[string]int{}, []string{}, &sync.RWMutex{}}
+	d.Id("")
+	return
+}
+
+// Count returns the number of items in the dict.
+func (d *GoDict) Count() int {
+	return len(d.is)
+}
+
+// Id maps string s to its numeric identificator. The implementation honors getting
+// an existing id at the cost of assigning a new one.
+func (d *GoDict) Id(s string) (y int) {
+	d.rwm.RLock()             // R++
+	if y, ok := d.si[s]; ok { // found
+		d.rwm.RUnlock() // R--
+		return y
+	}
+
+	d.rwm.RUnlock() // R--
+
+	// not found but with a race condition
+	d.rwm.Lock()              // W++ recheck with write lock
+	defer d.rwm.Unlock()      // W--
+	if y, ok := d.si[s]; ok { // some other goroutine won already
+		return y
+	}
+
+	// a race free not found state => insert the string
+	s = StrPack(s)
+	y = len(d.is)
+	d.si[s] = y
+	d.is = append(d.is, s)
+	return
+}
+
+// S maps an id to its string value and ok == true. Id values not contained in the bijection
+// return "", false.
+func (d *GoDict) S(id int) (s string, ok bool) {
+	d.rwm.RLock()         // R++
+	defer d.rwm.RUnlock() // R--
+	if id >= len(d.is) {
+		return "", false
+	}
+	return d.is[id], true
+}
+
+// StrPack returns a new instance of s which is tightly packed in memory.
+// It is intended for avoiding the situation where having a live reference
+// to a string slice over an unreferenced biger underlying string keeps the biger one
+// in memory anyway - it can't be GCed.
+func StrPack(s string) string {
+	return string([]byte(s))
+}
+
+// JoinFields returns strings in flds joined by sep. Flds may contain arbitrary
+// bytes, including the sep as they are safely escaped. JoinFields panics if
+// sep is the backslash character or if len(sep) != 1.
+func JoinFields(flds []string, sep string) string {
+	if len(sep) != 1 || sep == "\\" {
+		panic("invalid separator")
+	}
+
+	a := make([]string, len(flds))
+	for i, v := range flds {
+		v = strings.Replace(v, "\\", "\\0", -1)
+		a[i] = strings.Replace(v, sep, "\\1", -1)
+	}
+	return strings.Join(a, sep)
+}
+
+// SplitFields splits s, which must be produced by JoinFields using the same
+// sep, into flds.  SplitFields panics if sep is the backslash character or if
+// len(sep) != 1.
+func SplitFields(s, sep string) (flds []string) {
+	if len(sep) != 1 || sep == "\\" {
+		panic("invalid separator")
+	}
+
+	a := strings.Split(s, sep)
+	r := make([]string, len(a))
+	for i, v := range a {
+		v = strings.Replace(v, "\\1", sep, -1)
+		r[i] = strings.Replace(v, "\\0", "\\", -1)
+	}
+	return r
+}
diff --git a/vendor/github.com/cznic/zappy/LICENSE b/vendor/github.com/cznic/zappy/LICENSE
new file mode 100644
index 0000000000..bc67059c52
--- /dev/null
+++ b/vendor/github.com/cznic/zappy/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014 The zappy Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the names of the authors nor the names of the
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/cznic/zappy/decode.go b/vendor/github.com/cznic/zappy/decode.go
new file mode 100644
index 0000000000..867c8deea5
--- /dev/null
+++ b/vendor/github.com/cznic/zappy/decode.go
@@ -0,0 +1,38 @@
+// Copyright 2014 The zappy Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Copyright 2011 The Snappy-Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the SNAPPY-GO-LICENSE file.
+
+package zappy
+
+import (
+	"encoding/binary"
+	"errors"
+)
+
+// ErrCorrupt reports that the input is invalid.
+var ErrCorrupt = errors.New("zappy: corrupt input")
+
+// DecodedLen returns the length of the decoded block.
+func DecodedLen(src []byte) (int, error) {
+	v, _, err := decodedLen(src)
+	return v, err
+}
+
+// decodedLen returns the length of the decoded block and the number of bytes
+// that the length header occupied.
+func decodedLen(src []byte) (blockLen, headerLen int, err error) {
+	v, n := binary.Uvarint(src)
+	if n == 0 {
+		return 0, 0, ErrCorrupt
+	}
+
+	if uint64(int(v)) != v {
+		return 0, 0, errors.New("zappy: decoded block is too large")
+	}
+
+	return int(v), n, nil
+}
diff --git a/vendor/github.com/cznic/zappy/decode_cgo.go b/vendor/github.com/cznic/zappy/decode_cgo.go
new file mode 100644
index 0000000000..993c99242b
--- /dev/null
+++ b/vendor/github.com/cznic/zappy/decode_cgo.go
@@ -0,0 +1,121 @@
+// Copyright 2014 The zappy Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Copyright 2011 The Snappy-Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the SNAPPY-GO-LICENSE file.
+
+// +build cgo,!purego
+
+package zappy
+
+/*
+
+#include <stdint.h>
+#include <string.h>
+
+// supports only uint32 encoded values
+int uvarint(unsigned int* n, uint8_t* src, int len) {
+	int r = 0;
+	unsigned int v = 0;
+	unsigned int s = 0;
+	while ((len-- != 0) && (++r <= 5)) {
+		uint8_t b = *src++;
+		v = v | ((b&0x7f)<<s);
+		if (b < 0x80) {
+			*n = v;
+			return r;
+		}
+
+		s += 7;
+	}
+	return -1;
+}
+
+int varint(int* n, uint8_t* src, int len) {
+	unsigned int u;
+	int i = uvarint(&u, src, len);
+	int x = u>>1;
+	if ((u&1) != 0)
+		x = ~x;
+	*n = x;
+	return i;
+}
+
+int decode(int s, int len_src, uint8_t* src, int len_dst, uint8_t* dst) {
+	int d = 0;
+	int length;
+	while (s < len_src) {
+		int n, i = varint(&n, src+s, len_src-s);
+		if (i <= 0) {
+			return -1;
+		}
+
+		s += i;
+		if (n >= 0) {
+			length = n+1;
+			if ((length > len_dst-d) || (length > len_src-s))
+				return -1;
+
+			memcpy(dst+d, src+s, length);
+			d += length;
+			s += length;
+			continue;
+		}
+
+
+		length = -n;
+		int offset;
+		i = uvarint((unsigned int*)(&offset), src+s, len_src-s);
+		if (i <= 0)
+			return -1;
+
+		s += i;
+		if (s > len_src)
+			return -1;
+
+		int end = d+length;
+		if ((offset > d) || (end > len_dst))
+			return -1;
+
+		for( ; d < end; d++)
+			*(dst+d) = *(dst+d-offset);
+	}
+	return d;
+}
+
+*/
+import "C"
+
+func puregoDecode() bool { return false }
+
+// Decode returns the decoded form of src. The returned slice may be a sub-
+// slice of buf if buf was large enough to hold the entire decoded block.
+// Otherwise, a newly allocated slice will be returned.
+// It is valid to pass a nil buf.
+func Decode(buf, src []byte) ([]byte, error) {
+	dLen, s, err := decodedLen(src)
+	if err != nil {
+		return nil, err
+	}
+
+	if dLen == 0 {
+		if len(src) == 1 {
+			return nil, nil
+		}
+
+		return nil, ErrCorrupt
+	}
+
+	if len(buf) < dLen {
+		buf = make([]byte, dLen)
+	}
+
+	d := int(C.decode(C.int(s), C.int(len(src)), (*C.uint8_t)(&src[0]), C.int(len(buf)), (*C.uint8_t)(&buf[0])))
+	if d != dLen {
+		return nil, ErrCorrupt
+	}
+
+	return buf[:d], nil
+}
diff --git a/vendor/github.com/cznic/zappy/decode_nocgo.go b/vendor/github.com/cznic/zappy/decode_nocgo.go
new file mode 100644
index 0000000000..75b782f8fa
--- /dev/null
+++ b/vendor/github.com/cznic/zappy/decode_nocgo.go
@@ -0,0 +1,89 @@
+// Copyright 2014 The zappy Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Copyright 2011 The Snappy-Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the SNAPPY-GO-LICENSE file.
+
+// +build !cgo purego
+
+package zappy
+
+import (
+	"encoding/binary"
+)
+
+func puregoDecode() bool { return true }
+
+// Decode returns the decoded form of src. The returned slice may be a sub-
+// slice of buf if buf was large enough to hold the entire decoded block.
+// Otherwise, a newly allocated slice will be returned.
+// It is valid to pass a nil buf.
+func Decode(buf, src []byte) ([]byte, error) {
+	dLen, s, err := decodedLen(src)
+	if err != nil {
+		return nil, err
+	}
+
+	if dLen == 0 {
+		if len(src) == 1 {
+			return nil, nil
+		}
+
+		return nil, ErrCorrupt
+	}
+
+	if len(buf) < dLen {
+		buf = make([]byte, dLen)
+	}
+
+	var d, offset, length int
+	for s < len(src) {
+		n, i := binary.Varint(src[s:])
+		if i <= 0 {
+			return nil, ErrCorrupt
+		}
+
+		s += i
+		if n >= 0 {
+			length = int(n + 1)
+			if length > len(buf)-d || length > len(src)-s {
+				return nil, ErrCorrupt
+			}
+
+			copy(buf[d:], src[s:s+length])
+			d += length
+			s += length
+			continue
+		}
+
+		length = int(-n)
+		off64, i := binary.Uvarint(src[s:])
+		if i <= 0 {
+			return nil, ErrCorrupt
+		}
+
+		offset = int(off64)
+		s += i
+		if s > len(src) {
+			return nil, ErrCorrupt
+		}
+
+		end := d + length
+		if offset > d || end > len(buf) {
+			return nil, ErrCorrupt
+		}
+
+		for s, v := range buf[d-offset : end-offset] {
+			buf[d+s] = v
+		}
+		d = end
+
+	}
+	if d != dLen {
+		return nil, ErrCorrupt
+	}
+
+	return buf[:d], nil
+}
diff --git a/vendor/github.com/cznic/zappy/encode.go b/vendor/github.com/cznic/zappy/encode.go
new file mode 100644
index 0000000000..27ceba03b8
--- /dev/null
+++ b/vendor/github.com/cznic/zappy/encode.go
@@ -0,0 +1,37 @@
+// Copyright 2014 The zappy Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Copyright 2011 The Snappy-Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the SNAPPY-GO-LICENSE file.
+
+package zappy
+
+import (
+	"encoding/binary"
+)
+
+// We limit how far copy back-references can go, the same as the snappy C++
+// code.
+const maxOffset = 1 << 20
+
+// emitCopy writes a copy chunk and returns the number of bytes written.
+func emitCopy(dst []byte, offset, length int) (n int) {
+	n = binary.PutVarint(dst, int64(-length))
+	n += binary.PutUvarint(dst[n:], uint64(offset))
+	return
+}
+
+// emitLiteral writes a literal chunk and returns the number of bytes written.
+func emitLiteral(dst, lit []byte) (n int) {
+	n = binary.PutVarint(dst, int64(len(lit)-1))
+	n += copy(dst[n:], lit)
+	return
+}
+
+// MaxEncodedLen returns the maximum length of a zappy block, given its
+// uncompressed length.
+func MaxEncodedLen(srcLen int) int {
+	return 10 + srcLen
+}
diff --git a/vendor/github.com/cznic/zappy/encode_cgo.go b/vendor/github.com/cznic/zappy/encode_cgo.go
new file mode 100644
index 0000000000..6c343f58eb
--- /dev/null
+++ b/vendor/github.com/cznic/zappy/encode_cgo.go
@@ -0,0 +1,140 @@
+// Copyright 2014 The zappy Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Copyright 2011 The Snappy-Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the SNAPPY-GO-LICENSE file.
+
+// +build cgo,!purego
+
+package zappy
+
+/*
+
+#include <stdint.h>
+#include <string.h>
+
+#define MAXOFFSET 1<<20
+
+int putUvarint(uint8_t* buf, unsigned int x) {
+	int i = 1;
+	for (; x >= 0x80; i++) {
+		*buf++ = x|0x80;
+		x >>= 7;
+	}
+	*buf = x;
+	return i;
+}
+
+int putVarint(uint8_t* buf, int x) {
+	unsigned int ux = x << 1;
+	if (x < 0)
+		ux = ~ux;
+	return putUvarint(buf, ux);
+}
+
+int emitLiteral(uint8_t* dst, uint8_t* lit, int len_lit) {
+	int n = putVarint(dst, len_lit-1);
+	memcpy(dst+n, lit, len_lit);
+	return n+len_lit;
+}
+
+int emitCopy(uint8_t* dst, int off, int len) {
+	int n = putVarint(dst, -len);
+	return n+putUvarint(dst+n, (unsigned int)off);
+}
+
+int encode(int d, uint8_t* dst, uint8_t* src, int len_src) {
+	int table[1<<12];
+	int s = 0;
+	int t = 0;
+	int lit = 0;
+	int lim = 0;
+	memset(table, 0, sizeof(table));
+	for (lim = len_src-3; s < lim; ) {
+		// Update the hash table.
+		uint32_t b0 = src[s];
+		uint32_t b1 = src[s+1];
+		uint32_t b2 = src[s+2];
+		uint32_t b3 = src[s+3];
+		uint32_t h = b0 | (b1<<8) | (b2<<16) | (b3<<24);
+		uint32_t i;
+more:
+		i = (h*0x1e35a7bd)>>20;
+		t = table[i];
+		table[i] = s;
+		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+		if ((t == 0) || (s-t >= MAXOFFSET) || (b0 != src[t]) || (b1 != src[t+1]) || (b2 != src[t+2]) || (b3 != src[t+3])) {
+			s++;
+			if (s >= lim)
+				break;
+
+			b0 = b1;
+			b1 = b2;
+			b2 = b3;
+			b3 = src[s+3];
+			h = (h>>8) | ((b3)<<24);
+			goto more;
+		}
+
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if (lit != s) {
+			d += emitLiteral(dst+d, src+lit, s-lit);
+		}
+		// Extend the match to be as long as possible.
+		int s0 = s;
+		s += 4;
+		t += 4;
+		while ((s < len_src) && (src[s] == src[t])) {
+			s++;
+			t++;
+		}
+		d += emitCopy(dst+d, s-t, s-s0);
+		lit = s;
+	}
+	// Emit any final pending literal bytes and return.
+	if (lit != len_src) {
+		d += emitLiteral(dst+d, src+lit, len_src-lit);
+	}
+	return d;
+}
+
+*/
+import "C"
+
+import (
+	"encoding/binary"
+	"fmt"
+	"math"
+)
+
+func puregoEncode() bool { return false }
+
+// Encode returns the encoded form of src. The returned slice may be a sub-
+// slice of buf if buf was large enough to hold the entire encoded block.
+// Otherwise, a newly allocated slice will be returned.
+// It is valid to pass a nil buf.
+func Encode(buf, src []byte) ([]byte, error) {
+	if n := MaxEncodedLen(len(src)); len(buf) < n {
+		buf = make([]byte, n)
+	}
+
+	if len(src) > math.MaxInt32 {
+		return nil, fmt.Errorf("zappy.Encode: too long data: %d bytes", len(src))
+	}
+
+	// The block starts with the varint-encoded length of the decompressed bytes.
+	d := binary.PutUvarint(buf, uint64(len(src)))
+
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			d += emitLiteral(buf[d:], src)
+		}
+		return buf[:d], nil
+	}
+
+	d = int(C.encode(C.int(d), (*C.uint8_t)(&buf[0]), (*C.uint8_t)(&src[0]), C.int(len(src))))
+	return buf[:d], nil
+}
diff --git a/vendor/github.com/cznic/zappy/encode_nocgo.go b/vendor/github.com/cznic/zappy/encode_nocgo.go
new file mode 100644
index 0000000000..1d1df44395
--- /dev/null
+++ b/vendor/github.com/cznic/zappy/encode_nocgo.go
@@ -0,0 +1,92 @@
+// Copyright 2014 The zappy Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Copyright 2011 The Snappy-Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the SNAPPY-GO-LICENSE file.
+
+// +build !cgo purego
+
+package zappy
+
+import (
+	"encoding/binary"
+	"fmt"
+	"math"
+)
+
+func puregoEncode() bool { return true }
+
+// Encode returns the encoded form of src. The returned slice may be a sub-
+// slice of buf if buf was large enough to hold the entire encoded block.
+// Otherwise, a newly allocated slice will be returned.
+// It is valid to pass a nil buf.
+func Encode(buf, src []byte) ([]byte, error) {
+	if n := MaxEncodedLen(len(src)); len(buf) < n {
+		buf = make([]byte, n)
+	}
+
+	if len(src) > math.MaxInt32 {
+		return nil, fmt.Errorf("zappy.Encode: too long data: %d bytes", len(src))
+	}
+
+	// The block starts with the varint-encoded length of the decompressed bytes.
+	d := binary.PutUvarint(buf, uint64(len(src)))
+
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			d += emitLiteral(buf[d:], src)
+		}
+		return buf[:d], nil
+	}
+
+	// Iterate over the source bytes.
+	var (
+		table [1 << 12]int // Hash table
+		s     int          // The iterator position.
+		t     int          // The last position with the same hash as s.
+		lit   int          // The start position of any pending literal bytes.
+	)
+	for lim := len(src) - 3; s < lim; {
+		// Update the hash table.
+		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
+		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
+	more:
+		p := &table[(h*0x1e35a7bd)>>20]
+		t, *p = *p, s
+		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+		if t == 0 || s-t >= maxOffset || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
+			s++
+			if s >= lim {
+				break
+			}
+
+			b0, b1, b2, b3 = b1, b2, b3, src[s+3]
+			h = h>>8 | uint32(b3)<<24
+			goto more
+		}
+
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			d += emitLiteral(buf[d:], src[lit:s])
+		}
+		// Extend the match to be as long as possible.
+		s0 := s
+		s, t = s+4, t+4
+		for s < len(src) && src[s] == src[t] {
+			s++
+			t++
+		}
+		// Emit the copied bytes.
+		d += emitCopy(buf[d:], s-t, s-s0)
+		lit = s
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		d += emitLiteral(buf[d:], src[lit:])
+	}
+	return buf[:d], nil
+}
diff --git a/vendor/github.com/cznic/zappy/zappy.go b/vendor/github.com/cznic/zappy/zappy.go
new file mode 100644
index 0000000000..760df34a15
--- /dev/null
+++ b/vendor/github.com/cznic/zappy/zappy.go
@@ -0,0 +1,241 @@
+// Copyright 2014 The zappy Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Copyright 2011 The Snappy-Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the SNAPPY-GO-LICENSE file.
+
+/*
+Package zappy implements the zappy block-based compression format.  It aims for
+a combination of good speed and reasonable compression.
+
+Zappy is a format incompatible, API compatible fork of snappy-go[1]. The C++
+snappy implementation is at [2].
+
+Reasons for the fork
+
+The snappy compression is pretty good. Yet it has one problem built into its
+format definition[3] - the maximum length of a copy "instruction" is 64 bytes.
+For some specific usage patterns with long runs of repeated data, it turns out
+the compression is suboptimal. For example a 1:1000 "sparseness" 64kB bit index
+with only few set bits is compressed to about 3kB (about 1000 of 64B copy, 3
+byte "instructions").
+
+Format description
+
+Zappy uses much less complicated format than snappy. Each encoded block begins
+with the uvarint-encoded[4] length of the decoded data, followed by a sequence
+of chunks. Chunks begin and end on byte boundaries. The chunk starts with a
+varint encoded number N:
+
+	N >= 0: N+1 literal bytes follow.
+
+	N < 0: copy -N bytes, starting at offset M (in the following uvarint).
+
+Performance issues
+
+Compression rate is roughly the same as of snappy for the reference data set:
+
+                  testdata/html: snappy   23320, zappy   22943, 0.984, orig  102400
+              testdata/urls.10K: snappy  334437, zappy  355163, 1.062, orig  702087
+             testdata/house.jpg: snappy  126711, zappy  126694, 1.000, orig  126958
+  testdata/mapreduce-osdi-1.pdf: snappy   77227, zappy   77646, 1.005, orig   94330
+              testdata/html_x_4: snappy   92350, zappy   22956, 0.249, orig  409600
+               testdata/cp.html: snappy   11938, zappy   12961, 1.086, orig   24603
+              testdata/fields.c: snappy    4825, zappy    5395, 1.118, orig   11150
+           testdata/grammar.lsp: snappy    1814, zappy    1933, 1.066, orig    3721
+           testdata/kennedy.xls: snappy  423518, zappy  440597, 1.040, orig 1029744
+           testdata/alice29.txt: snappy   89550, zappy  104016, 1.162, orig  152089
+          testdata/asyoulik.txt: snappy   79583, zappy   91345, 1.148, orig  125179
+            testdata/lcet10.txt: snappy  238761, zappy  275488, 1.154, orig  426754
+          testdata/plrabn12.txt: snappy  324567, zappy  376885, 1.161, orig  481861
+                  testdata/ptt5: snappy   96350, zappy   91465, 0.949, orig  513216
+                   testdata/sum: snappy   18927, zappy   20015, 1.057, orig   38240
+               testdata/xargs.1: snappy    2532, zappy    2793, 1.103, orig    4227
+         testdata/geo.protodata: snappy   23362, zappy   20759, 0.889, orig  118588
+             testdata/kppkn.gtb: snappy   73962, zappy   87200, 1.179, orig  184320
+                          TOTAL: snappy 2043734, zappy 2136254, 1.045, orig 4549067
+
+Zappy has better RLE handling (1/1000+1 non zero bytes in each index):
+
+     Sparse bit index      16 B: snappy       9, zappy       9, 1.000
+     Sparse bit index      32 B: snappy      10, zappy      10, 1.000
+     Sparse bit index      64 B: snappy      11, zappy      10, 0.909
+     Sparse bit index     128 B: snappy      16, zappy      14, 0.875
+     Sparse bit index     256 B: snappy      22, zappy      14, 0.636
+     Sparse bit index     512 B: snappy      36, zappy      16, 0.444
+     Sparse bit index    1024 B: snappy      57, zappy      18, 0.316
+     Sparse bit index    2048 B: snappy     111, zappy      32, 0.288
+     Sparse bit index    4096 B: snappy     210, zappy      31, 0.148
+     Sparse bit index    8192 B: snappy     419, zappy      75, 0.179
+     Sparse bit index   16384 B: snappy     821, zappy     138, 0.168
+     Sparse bit index   32768 B: snappy    1627, zappy     232, 0.143
+     Sparse bit index   65536 B: snappy    3243, zappy     451, 0.139
+
+When compiled with CGO_ENABLED=1, zappy is now faster than snappy-go.
+Old=snappy-go, new=zappy:
+
+ benchmark                   old MB/s     new MB/s  speedup
+ BenchmarkWordsDecode1e3       148.98       189.04    1.27x
+ BenchmarkWordsDecode1e4       150.29       182.51    1.21x
+ BenchmarkWordsDecode1e5       145.79       182.95    1.25x
+ BenchmarkWordsDecode1e6       167.43       187.69    1.12x
+ BenchmarkWordsEncode1e3        47.11       145.69    3.09x
+ BenchmarkWordsEncode1e4        81.47       136.50    1.68x
+ BenchmarkWordsEncode1e5        78.86       127.93    1.62x
+ BenchmarkWordsEncode1e6        96.81       142.95    1.48x
+ Benchmark_UFlat0              316.87       463.19    1.46x
+ Benchmark_UFlat1              231.56       350.32    1.51x
+ Benchmark_UFlat2             3656.68      8258.39    2.26x
+ Benchmark_UFlat3              892.56      1270.09    1.42x
+ Benchmark_UFlat4              315.84       959.08    3.04x
+ Benchmark_UFlat5              211.70       301.55    1.42x
+ Benchmark_UFlat6              211.59       258.29    1.22x
+ Benchmark_UFlat7              209.80       272.21    1.30x
+ Benchmark_UFlat8              254.59       301.70    1.19x
+ Benchmark_UFlat9              163.39       192.66    1.18x
+ Benchmark_UFlat10             155.46       189.70    1.22x
+ Benchmark_UFlat11             170.11       198.95    1.17x
+ Benchmark_UFlat12             148.32       178.78    1.21x
+ Benchmark_UFlat13             359.25       579.99    1.61x
+ Benchmark_UFlat14             197.27       291.33    1.48x
+ Benchmark_UFlat15             185.75       248.07    1.34x
+ Benchmark_UFlat16             362.74       582.66    1.61x
+ Benchmark_UFlat17             222.95       240.01    1.08x
+ Benchmark_ZFlat0              188.66       311.89    1.65x
+ Benchmark_ZFlat1              101.46       201.34    1.98x
+ Benchmark_ZFlat2               93.62       244.50    2.61x
+ Benchmark_ZFlat3              102.79       243.34    2.37x
+ Benchmark_ZFlat4              191.64       625.32    3.26x
+ Benchmark_ZFlat5              103.09       169.39    1.64x
+ Benchmark_ZFlat6              110.35       182.57    1.65x
+ Benchmark_ZFlat7               89.56       190.53    2.13x
+ Benchmark_ZFlat8              154.05       235.68    1.53x
+ Benchmark_ZFlat9               87.58       133.51    1.52x
+ Benchmark_ZFlat10              82.08       127.51    1.55x
+ Benchmark_ZFlat11              91.36       138.91    1.52x
+ Benchmark_ZFlat12              79.24       123.02    1.55x
+ Benchmark_ZFlat13             217.04       374.26    1.72x
+ Benchmark_ZFlat14             100.33       168.03    1.67x
+ Benchmark_ZFlat15              80.79       160.46    1.99x
+ Benchmark_ZFlat16             213.32       375.79    1.76x
+ Benchmark_ZFlat17             135.37       197.13    1.46x
+
+The package builds with CGO_ENABLED=0 as well, but the performance is worse.
+
+
+ $ CGO_ENABLED=0 go test -test.run=NONE -test.bench=. > old.benchcmp
+ $ CGO_ENABLED=1 go test -test.run=NONE -test.bench=. > new.benchcmp
+ $ benchcmp old.benchcmp new.benchcmp
+ benchmark                  old ns/op    new ns/op    delta
+ BenchmarkWordsDecode1e3         9735         5288  -45.68%
+ BenchmarkWordsDecode1e4       100229        55369  -44.76%
+ BenchmarkWordsDecode1e5      1037611       546420  -47.34%
+ BenchmarkWordsDecode1e6      9559352      5335307  -44.19%
+ BenchmarkWordsEncode1e3        16206         6629  -59.10%
+ BenchmarkWordsEncode1e4       140283        73161  -47.85%
+ BenchmarkWordsEncode1e5      1476657       781756  -47.06%
+ BenchmarkWordsEncode1e6     12702229      6997656  -44.91%
+ Benchmark_UFlat0              397307       221198  -44.33%
+ Benchmark_UFlat1             3890483      2008341  -48.38%
+ Benchmark_UFlat2               35810        15398  -57.00%
+ Benchmark_UFlat3              140850        74194  -47.32%
+ Benchmark_UFlat4              814575       426783  -47.61%
+ Benchmark_UFlat5              156995        81473  -48.10%
+ Benchmark_UFlat6               77645        43161  -44.41%
+ Benchmark_UFlat7               25415        13579  -46.57%
+ Benchmark_UFlat8             6372440      3412916  -46.44%
+ Benchmark_UFlat9             1453679       789956  -45.66%
+ Benchmark_UFlat10            1243146       660747  -46.85%
+ Benchmark_UFlat11            3903493      2146334  -45.02%
+ Benchmark_UFlat12            5106250      2696144  -47.20%
+ Benchmark_UFlat13            1641394       884969  -46.08%
+ Benchmark_UFlat14             262206       131174  -49.97%
+ Benchmark_UFlat15              32325        17047  -47.26%
+ Benchmark_UFlat16             366991       204877  -44.17%
+ Benchmark_UFlat17            1343988       770907  -42.64%
+ Benchmark_ZFlat0              579954       329812  -43.13%
+ Benchmark_ZFlat1             6564692      3504867  -46.61%
+ Benchmark_ZFlat2              902029       513700  -43.05%
+ Benchmark_ZFlat3              678722       384312  -43.38%
+ Benchmark_ZFlat4             1197389       654361  -45.35%
+ Benchmark_ZFlat5              262677       144939  -44.82%
+ Benchmark_ZFlat6              111249        60876  -45.28%
+ Benchmark_ZFlat7               39024        19420  -50.24%
+ Benchmark_ZFlat8             8046106      4387928  -45.47%
+ Benchmark_ZFlat9             2043167      1143139  -44.05%
+ Benchmark_ZFlat10            1781604       980528  -44.96%
+ Benchmark_ZFlat11            5478647      3078585  -43.81%
+ Benchmark_ZFlat12            7245995      3929863  -45.77%
+ Benchmark_ZFlat13            2432529      1371606  -43.61%
+ Benchmark_ZFlat14             420315       227494  -45.88%
+ Benchmark_ZFlat15              52378        26564  -49.28%
+ Benchmark_ZFlat16             567047       316196  -44.24%
+ Benchmark_ZFlat17            1630820       937310  -42.53%
+
+ benchmark                   old MB/s     new MB/s  speedup
+ BenchmarkWordsDecode1e3       102.71       189.08    1.84x
+ BenchmarkWordsDecode1e4        99.77       180.60    1.81x
+ BenchmarkWordsDecode1e5        96.38       183.01    1.90x
+ BenchmarkWordsDecode1e6       104.61       187.43    1.79x
+ BenchmarkWordsEncode1e3        61.70       150.85    2.44x
+ BenchmarkWordsEncode1e4        71.28       136.68    1.92x
+ BenchmarkWordsEncode1e5        67.72       127.92    1.89x
+ BenchmarkWordsEncode1e6        78.73       142.90    1.82x
+ Benchmark_UFlat0              257.73       462.93    1.80x
+ Benchmark_UFlat1              180.46       349.59    1.94x
+ Benchmark_UFlat2             3545.30      8244.61    2.33x
+ Benchmark_UFlat3              669.72      1271.39    1.90x
+ Benchmark_UFlat4              502.84       959.74    1.91x
+ Benchmark_UFlat5              156.71       301.98    1.93x
+ Benchmark_UFlat6              143.60       258.33    1.80x
+ Benchmark_UFlat7              146.41       274.01    1.87x
+ Benchmark_UFlat8              161.59       301.72    1.87x
+ Benchmark_UFlat9              104.62       192.53    1.84x
+ Benchmark_UFlat10             100.70       189.45    1.88x
+ Benchmark_UFlat11             109.33       198.83    1.82x
+ Benchmark_UFlat12              94.37       178.72    1.89x
+ Benchmark_UFlat13             312.67       579.93    1.85x
+ Benchmark_UFlat14             145.84       291.52    2.00x
+ Benchmark_UFlat15             130.77       247.95    1.90x
+ Benchmark_UFlat16             323.14       578.82    1.79x
+ Benchmark_UFlat17             137.14       239.09    1.74x
+ Benchmark_ZFlat0              176.57       310.48    1.76x
+ Benchmark_ZFlat1              106.95       200.32    1.87x
+ Benchmark_ZFlat2              140.75       247.14    1.76x
+ Benchmark_ZFlat3              138.98       245.45    1.77x
+ Benchmark_ZFlat4              342.08       625.95    1.83x
+ Benchmark_ZFlat5               93.66       169.75    1.81x
+ Benchmark_ZFlat6              100.23       183.16    1.83x
+ Benchmark_ZFlat7               95.35       191.60    2.01x
+ Benchmark_ZFlat8              127.98       234.68    1.83x
+ Benchmark_ZFlat9               74.44       133.04    1.79x
+ Benchmark_ZFlat10              70.26       127.66    1.82x
+ Benchmark_ZFlat11              77.89       138.62    1.78x
+ Benchmark_ZFlat12              66.50       122.62    1.84x
+ Benchmark_ZFlat13             210.98       374.17    1.77x
+ Benchmark_ZFlat14              90.98       168.09    1.85x
+ Benchmark_ZFlat15              80.70       159.12    1.97x
+ Benchmark_ZFlat16             209.13       375.04    1.79x
+ Benchmark_ZFlat17             113.02       196.65    1.74x
+ $
+
+Build tags
+
+If a constraint 'purego' appears in the build constraints [5] then a pure Go
+version is built regardless of the $CGO_ENABLED value.
+
+	$ touch zappy.go ; go install -tags purego github.com/cznic/zappy # for example
+
+Information sources
+
+... referenced from the above documentation.
+
+ [1]: http://code.google.com/p/snappy-go/
+ [2]: http://code.google.com/p/snappy/
+ [3]: http://code.google.com/p/snappy/source/browse/trunk/format_description.txt
+ [4]: http://golang.org/pkg/encoding/binary/
+ [5]: http://golang.org/pkg/go/build/#hdr-Build_Constraints
+*/
+package zappy
diff --git a/vendor/github.com/d2g/dhcp4/LICENSE b/vendor/github.com/d2g/dhcp4/LICENSE
new file mode 100644
index 0000000000..f7d058a358
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013 Skagerrak Software Limited. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Skagerrak Software Limited nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/vendor/github.com/d2g/dhcp4/constants.go b/vendor/github.com/d2g/dhcp4/constants.go
new file mode 100644
index 0000000000..183a778371
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4/constants.go
@@ -0,0 +1,121 @@
+package dhcp4
+
+// OpCodes
+const (
+	BootRequest OpCode = 1 // From Client
+	BootReply   OpCode = 2 // From Server
+)
+
+// DHCP Message Type 53
+const (
+	Discover MessageType = 1 // Broadcast Packet From Client - Can I have an IP?
+	Offer    MessageType = 2 // Broadcast From Server - Here's an IP
+	Request  MessageType = 3 // Broadcast From Client - I'll take that IP (Also start for renewals)
+	Decline  MessageType = 4 // Broadcast From Client - Sorry I can't use that IP
+	ACK      MessageType = 5 // From Server, Yes you can have that IP
+	NAK      MessageType = 6 // From Server, No you cannot have that IP
+	Release  MessageType = 7 // From Client, I don't need that IP anymore
+	Inform   MessageType = 8 // From Client, I have this IP and there's nothing you can do about it
+)
+
+// DHCP Options
+const (
+	End                          OptionCode = 255
+	Pad                          OptionCode = 0
+	OptionSubnetMask             OptionCode = 1
+	OptionTimeOffset             OptionCode = 2
+	OptionRouter                 OptionCode = 3
+	OptionTimeServer             OptionCode = 4
+	OptionNameServer             OptionCode = 5
+	OptionDomainNameServer       OptionCode = 6
+	OptionLogServer              OptionCode = 7
+	OptionCookieServer           OptionCode = 8
+	OptionLPRServer              OptionCode = 9
+	OptionImpressServer          OptionCode = 10
+	OptionResourceLocationServer OptionCode = 11
+	OptionHostName               OptionCode = 12
+	OptionBootFileSize           OptionCode = 13
+	OptionMeritDumpFile          OptionCode = 14
+	OptionDomainName             OptionCode = 15
+	OptionSwapServer             OptionCode = 16
+	OptionRootPath               OptionCode = 17
+	OptionExtensionsPath         OptionCode = 18
+
+	// IP Layer Parameters per Host
+	OptionIPForwardingEnableDisable          OptionCode = 19
+	OptionNonLocalSourceRoutingEnableDisable OptionCode = 20
+	OptionPolicyFilter                       OptionCode = 21
+	OptionMaximumDatagramReassemblySize      OptionCode = 22
+	OptionDefaultIPTimeToLive                OptionCode = 23
+	OptionPathMTUAgingTimeout                OptionCode = 24
+	OptionPathMTUPlateauTable                OptionCode = 25
+
+	// IP Layer Parameters per Interface
+	OptionInterfaceMTU              OptionCode = 26
+	OptionAllSubnetsAreLocal        OptionCode = 27
+	OptionBroadcastAddress          OptionCode = 28
+	OptionPerformMaskDiscovery      OptionCode = 29
+	OptionMaskSupplier              OptionCode = 30
+	OptionPerformRouterDiscovery    OptionCode = 31
+	OptionRouterSolicitationAddress OptionCode = 32
+	OptionStaticRoute               OptionCode = 33
+
+	// Link Layer Parameters per Interface
+	OptionTrailerEncapsulation  OptionCode = 34
+	OptionARPCacheTimeout       OptionCode = 35
+	OptionEthernetEncapsulation OptionCode = 36
+
+	// TCP Parameters
+	OptionTCPDefaultTTL        OptionCode = 37
+	OptionTCPKeepaliveInterval OptionCode = 38
+	OptionTCPKeepaliveGarbage  OptionCode = 39
+
+	// Application and Service Parameters
+	OptionNetworkInformationServiceDomain            OptionCode = 40
+	OptionNetworkInformationServers                  OptionCode = 41
+	OptionNetworkTimeProtocolServers                 OptionCode = 42
+	OptionVendorSpecificInformation                  OptionCode = 43
+	OptionNetBIOSOverTCPIPNameServer                 OptionCode = 44
+	OptionNetBIOSOverTCPIPDatagramDistributionServer OptionCode = 45
+	OptionNetBIOSOverTCPIPNodeType                   OptionCode = 46
+	OptionNetBIOSOverTCPIPScope                      OptionCode = 47
+	OptionXWindowSystemFontServer                    OptionCode = 48
+	OptionXWindowSystemDisplayManager                OptionCode = 49
+	OptionNetworkInformationServicePlusDomain        OptionCode = 64
+	OptionNetworkInformationServicePlusServers       OptionCode = 65
+	OptionMobileIPHomeAgent                          OptionCode = 68
+	OptionSimpleMailTransportProtocol                OptionCode = 69
+	OptionPostOfficeProtocolServer                   OptionCode = 70
+	OptionNetworkNewsTransportProtocol               OptionCode = 71
+	OptionDefaultWorldWideWebServer                  OptionCode = 72
+	OptionDefaultFingerServer                        OptionCode = 73
+	OptionDefaultInternetRelayChatServer             OptionCode = 74
+	OptionStreetTalkServer                           OptionCode = 75
+	OptionStreetTalkDirectoryAssistance              OptionCode = 76
+
+	// DHCP Extensions
+	OptionRequestedIPAddress     OptionCode = 50
+	OptionIPAddressLeaseTime     OptionCode = 51
+	OptionOverload               OptionCode = 52
+	OptionDHCPMessageType        OptionCode = 53
+	OptionServerIdentifier       OptionCode = 54
+	OptionParameterRequestList   OptionCode = 55
+	OptionMessage                OptionCode = 56
+	OptionMaximumDHCPMessageSize OptionCode = 57
+	OptionRenewalTimeValue       OptionCode = 58
+	OptionRebindingTimeValue     OptionCode = 59
+	OptionVendorClassIdentifier  OptionCode = 60
+	OptionClientIdentifier       OptionCode = 61
+
+	OptionTFTPServerName OptionCode = 66
+	OptionBootFileName   OptionCode = 67
+
+	OptionUserClass OptionCode = 77
+
+	OptionClientArchitecture OptionCode = 93
+
+	OptionTZPOSIXString    OptionCode = 100
+	OptionTZDatabaseString OptionCode = 101
+
+	OptionClasslessRouteFormat OptionCode = 121
+)
diff --git a/vendor/github.com/d2g/dhcp4/helpers.go b/vendor/github.com/d2g/dhcp4/helpers.go
new file mode 100644
index 0000000000..4b1463869f
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4/helpers.go
@@ -0,0 +1,58 @@
+package dhcp4
+
+import (
+	"encoding/binary"
+	"net"
+	"time"
+)
+
+// IPRange returns how many ips in the ip range from start to stop (inclusive)
+func IPRange(start, stop net.IP) int {
+	//return int(Uint([]byte(stop))-Uint([]byte(start))) + 1
+	return int(binary.BigEndian.Uint32(stop.To4())) - int(binary.BigEndian.Uint32(start.To4())) + 1
+}
+
+// IPAdd returns a copy of start + add.
+// IPAdd(net.IP{192,168,1,1},30) returns net.IP{192.168.1.31}
+func IPAdd(start net.IP, add int) net.IP { // IPv4 only
+	start = start.To4()
+	//v := Uvarint([]byte(start))
+	result := make(net.IP, 4)
+	binary.BigEndian.PutUint32(result, binary.BigEndian.Uint32(start)+uint32(add))
+	//PutUint([]byte(result), v+uint64(add))
+	return result
+}
+
+// IPLess returns where IP a is less than IP b.
+func IPLess(a, b net.IP) bool {
+	b = b.To4()
+	for i, ai := range a.To4() {
+		if ai != b[i] {
+			return ai < b[i]
+		}
+	}
+	return false
+}
+
+// IPInRange returns true if ip is between (inclusive) start and stop.
+func IPInRange(start, stop, ip net.IP) bool {
+	return !(IPLess(ip, start) || IPLess(stop, ip))
+}
+
+// OptionsLeaseTime - converts a time.Duration to a 4 byte slice, compatible
+// with OptionIPAddressLeaseTime.
+func OptionsLeaseTime(d time.Duration) []byte {
+	leaseBytes := make([]byte, 4)
+	binary.BigEndian.PutUint32(leaseBytes, uint32(d/time.Second))
+	//PutUvarint(leaseBytes, uint64(d/time.Second))
+	return leaseBytes
+}
+
+// JoinIPs returns a byte slice of IP addresses, one immediately after the other
+// This may be useful for creating multiple IP options such as OptionRouter.
+func JoinIPs(ips []net.IP) (b []byte) {
+	for _, v := range ips {
+		b = append(b, v.To4()...)
+	}
+	return
+}
diff --git a/vendor/github.com/d2g/dhcp4/option.go b/vendor/github.com/d2g/dhcp4/option.go
new file mode 100644
index 0000000000..f3239e1980
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4/option.go
@@ -0,0 +1,40 @@
+package dhcp4
+
+type OptionCode byte
+
+type Option struct {
+	Code  OptionCode
+	Value []byte
+}
+
+// Map of DHCP options
+type Options map[OptionCode][]byte
+
+// SelectOrderOrAll has same functionality as SelectOrder, except if the order
+// param is nil, whereby all options are added (in arbitary order).
+func (o Options) SelectOrderOrAll(order []byte) []Option {
+	if order == nil {
+		opts := make([]Option, 0, len(o))
+		for i, v := range o {
+			opts = append(opts, Option{Code: i, Value: v})
+		}
+		return opts
+	}
+	return o.SelectOrder(order)
+}
+
+// SelectOrder returns a slice of options ordered and selected by a byte array
+// usually defined by OptionParameterRequestList.  This result is expected to be
+// used in ReplyPacket()'s []Option parameter.
+func (o Options) SelectOrder(order []byte) []Option {
+	opts := make([]Option, 0, len(order))
+	for _, v := range order {
+		if data, ok := o[OptionCode(v)]; ok {
+			opts = append(opts, Option{Code: OptionCode(v), Value: data})
+		}
+	}
+	return opts
+}
+
+type OpCode byte
+type MessageType byte // Option 53
diff --git a/vendor/github.com/d2g/dhcp4/packet.go b/vendor/github.com/d2g/dhcp4/packet.go
new file mode 100644
index 0000000000..5e547c86fa
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4/packet.go
@@ -0,0 +1,149 @@
+package dhcp4
+
+import (
+	"net"
+	"time"
+)
+
+// A DHCP packet
+type Packet []byte
+
+func (p Packet) OpCode() OpCode { return OpCode(p[0]) }
+func (p Packet) HType() byte    { return p[1] }
+func (p Packet) HLen() byte     { return p[2] }
+func (p Packet) Hops() byte     { return p[3] }
+func (p Packet) XId() []byte    { return p[4:8] }
+func (p Packet) Secs() []byte   { return p[8:10] } // Never Used?
+func (p Packet) Flags() []byte  { return p[10:12] }
+func (p Packet) CIAddr() net.IP { return net.IP(p[12:16]) }
+func (p Packet) YIAddr() net.IP { return net.IP(p[16:20]) }
+func (p Packet) SIAddr() net.IP { return net.IP(p[20:24]) }
+func (p Packet) GIAddr() net.IP { return net.IP(p[24:28]) }
+func (p Packet) CHAddr() net.HardwareAddr {
+	hLen := p.HLen()
+	if hLen > 16 { // Prevent chaddr exceeding p boundary
+		hLen = 16
+	}
+	return net.HardwareAddr(p[28 : 28+hLen]) // max endPos 44
+}
+
+// 192 bytes of zeros BOOTP legacy
+func (p Packet) Cookie() []byte { return p[236:240] }
+func (p Packet) Options() []byte {
+	if len(p) > 240 {
+		return p[240:]
+	}
+	return nil
+}
+
+func (p Packet) Broadcast() bool { return p.Flags()[0] > 127 }
+
+func (p Packet) SetBroadcast(broadcast bool) {
+	if p.Broadcast() != broadcast {
+		p.Flags()[0] ^= 128
+	}
+}
+
+func (p Packet) SetOpCode(c OpCode) { p[0] = byte(c) }
+func (p Packet) SetCHAddr(a net.HardwareAddr) {
+	copy(p[28:44], a)
+	p[2] = byte(len(a))
+}
+func (p Packet) SetHType(hType byte)     { p[1] = hType }
+func (p Packet) SetCookie(cookie []byte) { copy(p.Cookie(), cookie) }
+func (p Packet) SetHops(hops byte)       { p[3] = hops }
+func (p Packet) SetXId(xId []byte)       { copy(p.XId(), xId) }
+func (p Packet) SetSecs(secs []byte)     { copy(p.Secs(), secs) }
+func (p Packet) SetFlags(flags []byte)   { copy(p.Flags(), flags) }
+func (p Packet) SetCIAddr(ip net.IP)     { copy(p.CIAddr(), ip.To4()) }
+func (p Packet) SetYIAddr(ip net.IP)     { copy(p.YIAddr(), ip.To4()) }
+func (p Packet) SetSIAddr(ip net.IP)     { copy(p.SIAddr(), ip.To4()) }
+func (p Packet) SetGIAddr(ip net.IP)     { copy(p.GIAddr(), ip.To4()) }
+
+// Parses the packet's options into an Options map
+func (p Packet) ParseOptions() Options {
+	opts := p.Options()
+	options := make(Options, 10)
+	for len(opts) >= 2 && OptionCode(opts[0]) != End {
+		if OptionCode(opts[0]) == Pad {
+			opts = opts[1:]
+			continue
+		}
+		size := int(opts[1])
+		if len(opts) < 2+size {
+			break
+		}
+		options[OptionCode(opts[0])] = opts[2 : 2+size]
+		opts = opts[2+size:]
+	}
+	return options
+}
+
+func NewPacket(opCode OpCode) Packet {
+	p := make(Packet, 241)
+	p.SetOpCode(opCode)
+	p.SetHType(1) // Ethernet
+	p.SetCookie([]byte{99, 130, 83, 99})
+	p[240] = byte(End)
+	return p
+}
+
+// Appends a DHCP option to the end of a packet
+func (p *Packet) AddOption(o OptionCode, value []byte) {
+	*p = append((*p)[:len(*p)-1], []byte{byte(o), byte(len(value))}...) // Strip off End, Add OptionCode and Length
+	*p = append(*p, value...)                                           // Add Option Value
+	*p = append(*p, byte(End))                                          // Add on new End
+}
+
+// Removes all options from packet.
+func (p *Packet) StripOptions() {
+	*p = append((*p)[:240], byte(End))
+}
+
+// Creates a request packet that a Client would send to a server.
+func RequestPacket(mt MessageType, chAddr net.HardwareAddr, cIAddr net.IP, xId []byte, broadcast bool, options []Option) Packet {
+	p := NewPacket(BootRequest)
+	p.SetCHAddr(chAddr)
+	p.SetXId(xId)
+	if cIAddr != nil {
+		p.SetCIAddr(cIAddr)
+	}
+	p.SetBroadcast(broadcast)
+	p.AddOption(OptionDHCPMessageType, []byte{byte(mt)})
+	for _, o := range options {
+		p.AddOption(o.Code, o.Value)
+	}
+	p.PadToMinSize()
+	return p
+}
+
+// ReplyPacket creates a reply packet that a Server would send to a client.
+// It uses the req Packet param to copy across common/necessary fields to
+// associate the reply the request.
+func ReplyPacket(req Packet, mt MessageType, serverId, yIAddr net.IP, leaseDuration time.Duration, options []Option) Packet {
+	p := NewPacket(BootReply)
+	p.SetXId(req.XId())
+	p.SetFlags(req.Flags())
+	p.SetYIAddr(yIAddr)
+	p.SetGIAddr(req.GIAddr())
+	p.SetCHAddr(req.CHAddr())
+	p.SetSecs(req.Secs())
+	p.AddOption(OptionDHCPMessageType, []byte{byte(mt)})
+	p.AddOption(OptionServerIdentifier, []byte(serverId))
+	p.AddOption(OptionIPAddressLeaseTime, OptionsLeaseTime(leaseDuration))
+	for _, o := range options {
+		p.AddOption(o.Code, o.Value)
+	}
+	p.PadToMinSize()
+	return p
+}
+
+// PadToMinSize pads a packet so that when sent over UDP, the entire packet,
+// is 300 bytes (BOOTP min), to be compatible with really old devices.
+var padder [272]byte
+
+func (p *Packet) PadToMinSize() {
+	if n := len(*p); n < 272 {
+		*p = append(*p, padder[:272-n]...)
+	}
+}
diff --git a/vendor/github.com/d2g/dhcp4client/LICENSE b/vendor/github.com/d2g/dhcp4client/LICENSE
new file mode 100644
index 0000000000..c33dcc7c92
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4client/LICENSE
@@ -0,0 +1,354 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. “Contributor”
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. “Contributor Version”
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. “Contribution”
+
+     means Covered Software of a particular Contributor.
+
+1.4. “Covered Software”
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. “Incompatible With Secondary Licenses”
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. “Executable Form”
+
+     means any form of the work other than Source Code Form.
+
+1.7. “Larger Work”
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. “License”
+
+     means this document.
+
+1.9. “Licensable”
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. “Modifications”
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. “Patent Claims” of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. “Secondary License”
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. “Source Code Form”
+
+      means the form of the work preferred for making modifications.
+
+1.14. “You” (or “Your”)
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, “You” includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, “control” means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an “as is” basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - “Incompatible With Secondary Licenses” Notice
+
+      This Source Code Form is “Incompatible
+      With Secondary Licenses”, as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/vendor/github.com/d2g/dhcp4client/client.go b/vendor/github.com/d2g/dhcp4client/client.go
new file mode 100644
index 0000000000..ab852c650e
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4client/client.go
@@ -0,0 +1,366 @@
+package dhcp4client
+
+import (
+	"bytes"
+	"crypto/rand"
+	"net"
+	"time"
+
+	"github.com/d2g/dhcp4"
+)
+
+const (
+	MaxDHCPLen = 576
+)
+
+type Client struct {
+	hardwareAddr  net.HardwareAddr //The HardwareAddr to send in the request.
+	ignoreServers []net.IP         //List of Servers to Ignore requests from.
+	timeout       time.Duration    //Time before we timeout.
+	broadcast     bool             //Set the Bcast flag in BOOTP Flags
+	connection    connection       //The Connection Method to use
+}
+
+/*
+ * Abstracts the type of underlying socket used
+ */
+type connection interface {
+	Close() error
+	Write(packet []byte) error
+	ReadFrom() ([]byte, net.IP, error)
+	SetReadTimeout(t time.Duration) error
+}
+
+func New(options ...func(*Client) error) (*Client, error) {
+	c := Client{
+		timeout:   time.Second * 10,
+		broadcast: true,
+	}
+
+	err := c.SetOption(options...)
+	if err != nil {
+		return nil, err
+	}
+
+	//if connection hasn't been set as an option create the default.
+	if c.connection == nil {
+		conn, err := NewInetSock()
+		if err != nil {
+			return nil, err
+		}
+		c.connection = conn
+	}
+
+	return &c, nil
+}
+
+func (c *Client) SetOption(options ...func(*Client) error) error {
+	for _, opt := range options {
+		if err := opt(c); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func Timeout(t time.Duration) func(*Client) error {
+	return func(c *Client) error {
+		c.timeout = t
+		return nil
+	}
+}
+
+func IgnoreServers(s []net.IP) func(*Client) error {
+	return func(c *Client) error {
+		c.ignoreServers = s
+		return nil
+	}
+}
+
+func HardwareAddr(h net.HardwareAddr) func(*Client) error {
+	return func(c *Client) error {
+		c.hardwareAddr = h
+		return nil
+	}
+}
+
+func Broadcast(b bool) func(*Client) error {
+	return func(c *Client) error {
+		c.broadcast = b
+		return nil
+	}
+}
+
+func Connection(conn connection) func(*Client) error {
+	return func(c *Client) error {
+		c.connection = conn
+		return nil
+	}
+}
+
+/*
+ * Close Connections
+ */
+func (c *Client) Close() error {
+	if c.connection != nil {
+		return c.connection.Close()
+	}
+	return nil
+}
+
+/*
+ * Send the Discovery Packet to the Broadcast Channel
+ */
+func (c *Client) SendDiscoverPacket() (dhcp4.Packet, error) {
+	discoveryPacket := c.DiscoverPacket()
+	discoveryPacket.PadToMinSize()
+
+	return discoveryPacket, c.SendPacket(discoveryPacket)
+}
+
+/*
+ * Retreive Offer...
+ * Wait for the offer for a specific Discovery Packet.
+ */
+func (c *Client) GetOffer(discoverPacket *dhcp4.Packet) (dhcp4.Packet, error) {
+	for {
+		c.connection.SetReadTimeout(c.timeout)
+		readBuffer, source, err := c.connection.ReadFrom()
+		if err != nil {
+			return dhcp4.Packet{}, err
+		}
+
+		offerPacket := dhcp4.Packet(readBuffer)
+		offerPacketOptions := offerPacket.ParseOptions()
+
+		// Ignore Servers in my Ignore list
+		for _, ignoreServer := range c.ignoreServers {
+			if source.Equal(ignoreServer) {
+				continue
+			}
+
+			if offerPacket.SIAddr().Equal(ignoreServer) {
+				continue
+			}
+		}
+
+		if len(offerPacketOptions[dhcp4.OptionDHCPMessageType]) < 1 || dhcp4.MessageType(offerPacketOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.Offer || !bytes.Equal(discoverPacket.XId(), offerPacket.XId()) {
+			continue
+		}
+
+		return offerPacket, nil
+	}
+
+}
+
+/*
+ * Send Request Based On the offer Received.
+ */
+func (c *Client) SendRequest(offerPacket *dhcp4.Packet) (dhcp4.Packet, error) {
+	requestPacket := c.RequestPacket(offerPacket)
+	requestPacket.PadToMinSize()
+
+	return requestPacket, c.SendPacket(requestPacket)
+}
+
+/*
+ * Retreive Acknowledgement
+ * Wait for the offer for a specific Request Packet.
+ */
+func (c *Client) GetAcknowledgement(requestPacket *dhcp4.Packet) (dhcp4.Packet, error) {
+	for {
+		c.connection.SetReadTimeout(c.timeout)
+		readBuffer, source, err := c.connection.ReadFrom()
+		if err != nil {
+			return dhcp4.Packet{}, err
+		}
+
+		acknowledgementPacket := dhcp4.Packet(readBuffer)
+		acknowledgementPacketOptions := acknowledgementPacket.ParseOptions()
+
+		// Ignore Servers in my Ignore list
+		for _, ignoreServer := range c.ignoreServers {
+			if source.Equal(ignoreServer) {
+				continue
+			}
+
+			if acknowledgementPacket.SIAddr().Equal(ignoreServer) {
+				continue
+			}
+		}
+
+		if !bytes.Equal(requestPacket.XId(), acknowledgementPacket.XId()) || len(acknowledgementPacketOptions[dhcp4.OptionDHCPMessageType]) < 1 || (dhcp4.MessageType(acknowledgementPacketOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.ACK && dhcp4.MessageType(acknowledgementPacketOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.NAK) {
+			continue
+		}
+
+		return acknowledgementPacket, nil
+	}
+}
+
+/*
+ * Send a DHCP Packet.
+ */
+func (c *Client) SendPacket(packet dhcp4.Packet) error {
+	return c.connection.Write(packet)
+}
+
+/*
+ * Create Discover Packet
+ */
+func (c *Client) DiscoverPacket() dhcp4.Packet {
+	messageid := make([]byte, 4)
+	if _, err := rand.Read(messageid); err != nil {
+		panic(err)
+	}
+
+	packet := dhcp4.NewPacket(dhcp4.BootRequest)
+	packet.SetCHAddr(c.hardwareAddr)
+	packet.SetXId(messageid)
+	packet.SetBroadcast(c.broadcast)
+
+	packet.AddOption(dhcp4.OptionDHCPMessageType, []byte{byte(dhcp4.Discover)})
+	//packet.PadToMinSize()
+	return packet
+}
+
+/*
+ * Create Request Packet
+ */
+func (c *Client) RequestPacket(offerPacket *dhcp4.Packet) dhcp4.Packet {
+	offerOptions := offerPacket.ParseOptions()
+
+	packet := dhcp4.NewPacket(dhcp4.BootRequest)
+	packet.SetCHAddr(c.hardwareAddr)
+
+	packet.SetXId(offerPacket.XId())
+	packet.SetCIAddr(offerPacket.CIAddr())
+	packet.SetSIAddr(offerPacket.SIAddr())
+
+	packet.SetBroadcast(c.broadcast)
+	packet.AddOption(dhcp4.OptionDHCPMessageType, []byte{byte(dhcp4.Request)})
+	packet.AddOption(dhcp4.OptionRequestedIPAddress, (offerPacket.YIAddr()).To4())
+	packet.AddOption(dhcp4.OptionServerIdentifier, offerOptions[dhcp4.OptionServerIdentifier])
+
+	//packet.PadToMinSize()
+	return packet
+}
+
+/*
+ * Create Request Packet For a Renew
+ */
+func (c *Client) RenewalRequestPacket(acknowledgement *dhcp4.Packet) dhcp4.Packet {
+	messageid := make([]byte, 4)
+	if _, err := rand.Read(messageid); err != nil {
+		panic(err)
+	}
+
+	acknowledgementOptions := acknowledgement.ParseOptions()
+
+	packet := dhcp4.NewPacket(dhcp4.BootRequest)
+	packet.SetCHAddr(acknowledgement.CHAddr())
+
+	packet.SetXId(messageid)
+	packet.SetCIAddr(acknowledgement.YIAddr())
+	packet.SetSIAddr(acknowledgement.SIAddr())
+
+	packet.SetBroadcast(c.broadcast)
+	packet.AddOption(dhcp4.OptionDHCPMessageType, []byte{byte(dhcp4.Request)})
+	packet.AddOption(dhcp4.OptionRequestedIPAddress, (acknowledgement.YIAddr()).To4())
+	packet.AddOption(dhcp4.OptionServerIdentifier, acknowledgementOptions[dhcp4.OptionServerIdentifier])
+
+	//packet.PadToMinSize()
+	return packet
+}
+
+/*
+ * Create Release Packet For a Release
+ */
+func (c *Client) ReleasePacket(acknowledgement *dhcp4.Packet) dhcp4.Packet {
+	messageid := make([]byte, 4)
+	if _, err := rand.Read(messageid); err != nil {
+		panic(err)
+	}
+
+	acknowledgementOptions := acknowledgement.ParseOptions()
+
+	packet := dhcp4.NewPacket(dhcp4.BootRequest)
+	packet.SetCHAddr(acknowledgement.CHAddr())
+
+	packet.SetXId(messageid)
+	packet.SetCIAddr(acknowledgement.YIAddr())
+
+	packet.AddOption(dhcp4.OptionDHCPMessageType, []byte{byte(dhcp4.Release)})
+	packet.AddOption(dhcp4.OptionServerIdentifier, acknowledgementOptions[dhcp4.OptionServerIdentifier])
+
+	//packet.PadToMinSize()
+	return packet
+}
+
+/*
+ * Lets do a Full DHCP Request.
+ */
+func (c *Client) Request() (bool, dhcp4.Packet, error) {
+	discoveryPacket, err := c.SendDiscoverPacket()
+	if err != nil {
+		return false, discoveryPacket, err
+	}
+
+	offerPacket, err := c.GetOffer(&discoveryPacket)
+	if err != nil {
+		return false, offerPacket, err
+	}
+
+	requestPacket, err := c.SendRequest(&offerPacket)
+	if err != nil {
+		return false, requestPacket, err
+	}
+
+	acknowledgement, err := c.GetAcknowledgement(&requestPacket)
+	if err != nil {
+		return false, acknowledgement, err
+	}
+
+	acknowledgementOptions := acknowledgement.ParseOptions()
+	if dhcp4.MessageType(acknowledgementOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.ACK {
+		return false, acknowledgement, nil
+	}
+
+	return true, acknowledgement, nil
+}
+
+/*
+ * Renew a lease backed on the Acknowledgement Packet.
+ * Returns Sucessfull, The AcknoledgementPacket, Any Errors
+ */
+func (c *Client) Renew(acknowledgement dhcp4.Packet) (bool, dhcp4.Packet, error) {
+	renewRequest := c.RenewalRequestPacket(&acknowledgement)
+	renewRequest.PadToMinSize()
+
+	err := c.SendPacket(renewRequest)
+	if err != nil {
+		return false, renewRequest, err
+	}
+
+	newAcknowledgement, err := c.GetAcknowledgement(&renewRequest)
+	if err != nil {
+		return false, newAcknowledgement, err
+	}
+
+	newAcknowledgementOptions := newAcknowledgement.ParseOptions()
+	if dhcp4.MessageType(newAcknowledgementOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.ACK {
+		return false, newAcknowledgement, nil
+	}
+
+	return true, newAcknowledgement, nil
+}
+
+/*
+ * Release a lease backed on the Acknowledgement Packet.
+ * Returns Any Errors
+ */
+func (c *Client) Release(acknowledgement dhcp4.Packet) error {
+	release := c.ReleasePacket(&acknowledgement)
+	release.PadToMinSize()
+
+	return c.SendPacket(release)
+}
diff --git a/vendor/github.com/d2g/dhcp4client/inetsock.go b/vendor/github.com/d2g/dhcp4client/inetsock.go
new file mode 100644
index 0000000000..293f186538
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4client/inetsock.go
@@ -0,0 +1,75 @@
+package dhcp4client
+
+import (
+	"net"
+	"time"
+)
+
+type inetSock struct {
+	*net.UDPConn
+
+	laddr net.UDPAddr
+	raddr net.UDPAddr
+}
+
+func NewInetSock(options ...func(*inetSock) error) (*inetSock, error) {
+	c := &inetSock{
+		laddr: net.UDPAddr{IP: net.IPv4(0, 0, 0, 0), Port: 68},
+		raddr: net.UDPAddr{IP: net.IPv4bcast, Port: 67},
+	}
+
+	err := c.setOption(options...)
+	if err != nil {
+		return nil, err
+	}
+
+	conn, err := net.ListenUDP("udp4", &c.laddr)
+	if err != nil {
+		return nil, err
+	}
+
+	c.UDPConn = conn
+	return c, err
+}
+
+func (c *inetSock) setOption(options ...func(*inetSock) error) error {
+	for _, opt := range options {
+		if err := opt(c); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func SetLocalAddr(l net.UDPAddr) func(*inetSock) error {
+	return func(c *inetSock) error {
+		c.laddr = l
+		return nil
+	}
+}
+
+func SetRemoteAddr(r net.UDPAddr) func(*inetSock) error {
+	return func(c *inetSock) error {
+		c.raddr = r
+		return nil
+	}
+}
+
+func (c *inetSock) Write(packet []byte) error {
+	_, err := c.WriteToUDP(packet, &c.raddr)
+	return err
+}
+
+func (c *inetSock) ReadFrom() ([]byte, net.IP, error) {
+	readBuffer := make([]byte, MaxDHCPLen)
+	n, source, err := c.ReadFromUDP(readBuffer)
+	if source != nil {
+		return readBuffer[:n], source.IP, err
+	} else {
+		return readBuffer[:n], net.IP{}, err
+	}
+}
+
+func (c *inetSock) SetReadTimeout(t time.Duration) error {
+	return c.SetReadDeadline(time.Now().Add(t))
+}
diff --git a/vendor/github.com/d2g/dhcp4client/init.go b/vendor/github.com/d2g/dhcp4client/init.go
new file mode 100644
index 0000000000..67ae8a3a13
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4client/init.go
@@ -0,0 +1,10 @@
+package dhcp4client
+
+import (
+	"math/rand"
+	"time"
+)
+
+func init() {
+	rand.Seed(time.Now().Unix())
+}
diff --git a/vendor/github.com/d2g/dhcp4client/pktsock_linux.go b/vendor/github.com/d2g/dhcp4client/pktsock_linux.go
new file mode 100644
index 0000000000..a21c265fb4
--- /dev/null
+++ b/vendor/github.com/d2g/dhcp4client/pktsock_linux.go
@@ -0,0 +1,147 @@
+package dhcp4client
+
+import (
+	"crypto/rand"
+	"encoding/binary"
+	"net"
+	"time"
+
+	"golang.org/x/sys/unix"
+)
+
+const (
+	minIPHdrLen = 20
+	maxIPHdrLen = 60
+	udpHdrLen   = 8
+	ip4Ver      = 0x40
+	ttl         = 16
+	srcPort     = 68
+	dstPort     = 67
+)
+
+var (
+	bcastMAC = []byte{255, 255, 255, 255, 255, 255}
+)
+
+// abstracts AF_PACKET
+type packetSock struct {
+	fd      int
+	ifindex int
+}
+
+func NewPacketSock(ifindex int) (*packetSock, error) {
+	fd, err := unix.Socket(unix.AF_PACKET, unix.SOCK_DGRAM, int(swap16(unix.ETH_P_IP)))
+	if err != nil {
+		return nil, err
+	}
+
+	addr := unix.SockaddrLinklayer{
+		Ifindex:  ifindex,
+		Protocol: swap16(unix.ETH_P_IP),
+	}
+
+	if err = unix.Bind(fd, &addr); err != nil {
+		return nil, err
+	}
+
+	return &packetSock{
+		fd:      fd,
+		ifindex: ifindex,
+	}, nil
+}
+
+func (pc *packetSock) Close() error {
+	return unix.Close(pc.fd)
+}
+
+func (pc *packetSock) Write(packet []byte) error {
+	lladdr := unix.SockaddrLinklayer{
+		Ifindex:  pc.ifindex,
+		Protocol: swap16(unix.ETH_P_IP),
+		Halen:    uint8(len(bcastMAC)),
+	}
+	copy(lladdr.Addr[:], bcastMAC)
+
+	pkt := make([]byte, minIPHdrLen+udpHdrLen+len(packet))
+
+	fillIPHdr(pkt[0:minIPHdrLen], udpHdrLen+uint16(len(packet)))
+	fillUDPHdr(pkt[minIPHdrLen:minIPHdrLen+udpHdrLen], uint16(len(packet)))
+
+	// payload
+	copy(pkt[minIPHdrLen+udpHdrLen:len(pkt)], packet)
+
+	return unix.Sendto(pc.fd, pkt, 0, &lladdr)
+}
+
+func (pc *packetSock) ReadFrom() ([]byte, net.IP, error) {
+	pkt := make([]byte, maxIPHdrLen+udpHdrLen+MaxDHCPLen)
+	n, _, err := unix.Recvfrom(pc.fd, pkt, 0)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// IP hdr len
+	ihl := int(pkt[0]&0x0F) * 4
+	// Source IP address
+	src := net.IP(pkt[12:16])
+
+	return pkt[ihl+udpHdrLen : n], src, nil
+}
+
+func (pc *packetSock) SetReadTimeout(t time.Duration) error {
+
+	tv := unix.NsecToTimeval(t.Nanoseconds())
+	return unix.SetsockoptTimeval(pc.fd, unix.SOL_SOCKET, unix.SO_RCVTIMEO, &tv)
+}
+
+// compute's 1's complement checksum
+func chksum(p []byte, csum []byte) {
+	cklen := len(p)
+	s := uint32(0)
+	for i := 0; i < (cklen - 1); i += 2 {
+		s += uint32(p[i+1])<<8 | uint32(p[i])
+	}
+	if cklen&1 == 1 {
+		s += uint32(p[cklen-1])
+	}
+	s = (s >> 16) + (s & 0xffff)
+	s = s + (s >> 16)
+	s = ^s
+
+	csum[0] = uint8(s & 0xff)
+	csum[1] = uint8(s >> 8)
+}
+
+func fillIPHdr(hdr []byte, payloadLen uint16) {
+	// version + IHL
+	hdr[0] = ip4Ver | (minIPHdrLen / 4)
+	// total length
+	binary.BigEndian.PutUint16(hdr[2:4], uint16(len(hdr))+payloadLen)
+	// identification
+	if _, err := rand.Read(hdr[4:5]); err != nil {
+		panic(err)
+	}
+	// TTL
+	hdr[8] = 16
+	// Protocol
+	hdr[9] = unix.IPPROTO_UDP
+	// dst IP
+	copy(hdr[16:20], net.IPv4bcast.To4())
+	// compute IP hdr checksum
+	chksum(hdr[0:len(hdr)], hdr[10:12])
+}
+
+func fillUDPHdr(hdr []byte, payloadLen uint16) {
+	// src port
+	binary.BigEndian.PutUint16(hdr[0:2], srcPort)
+	// dest port
+	binary.BigEndian.PutUint16(hdr[2:4], dstPort)
+	// length
+	binary.BigEndian.PutUint16(hdr[4:6], udpHdrLen+payloadLen)
+}
+
+func swap16(x uint16) uint16 {
+	var b [2]byte
+	binary.BigEndian.PutUint16(b[:], x)
+	return binary.LittleEndian.Uint16(b[:])
+}
diff --git a/vendor/github.com/docker/distribution/LICENSE b/vendor/github.com/docker/distribution/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/vendor/github.com/docker/distribution/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/docker/distribution/blobs.go b/vendor/github.com/docker/distribution/blobs.go
new file mode 100644
index 0000000000..ce43ea2ef6
--- /dev/null
+++ b/vendor/github.com/docker/distribution/blobs.go
@@ -0,0 +1,233 @@
+package distribution
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"time"
+
+	"github.com/docker/distribution/context"
+	"github.com/docker/distribution/digest"
+	"github.com/docker/distribution/reference"
+)
+
+var (
+	// ErrBlobExists returned when blob already exists
+	ErrBlobExists = errors.New("blob exists")
+
+	// ErrBlobDigestUnsupported when blob digest is an unsupported version.
+	ErrBlobDigestUnsupported = errors.New("unsupported blob digest")
+
+	// ErrBlobUnknown when blob is not found.
+	ErrBlobUnknown = errors.New("unknown blob")
+
+	// ErrBlobUploadUnknown returned when upload is not found.
+	ErrBlobUploadUnknown = errors.New("blob upload unknown")
+
+	// ErrBlobInvalidLength returned when the blob has an expected length on
+	// commit, meaning mismatched with the descriptor or an invalid value.
+	ErrBlobInvalidLength = errors.New("blob invalid length")
+)
+
+// ErrBlobInvalidDigest returned when digest check fails.
+type ErrBlobInvalidDigest struct {
+	Digest digest.Digest
+	Reason error
+}
+
+func (err ErrBlobInvalidDigest) Error() string {
+	return fmt.Sprintf("invalid digest for referenced layer: %v, %v",
+		err.Digest, err.Reason)
+}
+
+// ErrBlobMounted returned when a blob is mounted from another repository
+// instead of initiating an upload session.
+type ErrBlobMounted struct {
+	From       reference.Canonical
+	Descriptor Descriptor
+}
+
+func (err ErrBlobMounted) Error() string {
+	return fmt.Sprintf("blob mounted from: %v to: %v",
+		err.From, err.Descriptor)
+}
+
+// Descriptor describes targeted content. Used in conjunction with a blob
+// store, a descriptor can be used to fetch, store and target any kind of
+// blob. The struct also describes the wire protocol format. Fields should
+// only be added but never changed.
+type Descriptor struct {
+	// MediaType describe the type of the content. All text based formats are
+	// encoded as utf-8.
+	MediaType string `json:"mediaType,omitempty"`
+
+	// Size in bytes of content.
+	Size int64 `json:"size,omitempty"`
+
+	// Digest uniquely identifies the content. A byte stream can be verified
+	// against against this digest.
+	Digest digest.Digest `json:"digest,omitempty"`
+
+	// NOTE: Before adding a field here, please ensure that all
+	// other options have been exhausted. Much of the type relationships
+	// depend on the simplicity of this type.
+}
+
+// Descriptor returns the descriptor, to make it satisfy the Describable
+// interface. Note that implementations of Describable are generally objects
+// which can be described, not simply descriptors; this exception is in place
+// to make it more convenient to pass actual descriptors to functions that
+// expect Describable objects.
+func (d Descriptor) Descriptor() Descriptor {
+	return d
+}
+
+// BlobStatter makes blob descriptors available by digest. The service may
+// provide a descriptor of a different digest if the provided digest is not
+// canonical.
+type BlobStatter interface {
+	// Stat provides metadata about a blob identified by the digest. If the
+	// blob is unknown to the describer, ErrBlobUnknown will be returned.
+	Stat(ctx context.Context, dgst digest.Digest) (Descriptor, error)
+}
+
+// BlobDeleter enables deleting blobs from storage.
+type BlobDeleter interface {
+	Delete(ctx context.Context, dgst digest.Digest) error
+}
+
+// BlobDescriptorService manages metadata about a blob by digest. Most
+// implementations will not expose such an interface explicitly. Such mappings
+// should be maintained by interacting with the BlobIngester. Hence, this is
+// left off of BlobService and BlobStore.
+type BlobDescriptorService interface {
+	BlobStatter
+
+	// SetDescriptor assigns the descriptor to the digest. The provided digest and
+	// the digest in the descriptor must map to identical content but they may
+	// differ on their algorithm. The descriptor must have the canonical
+	// digest of the content and the digest algorithm must match the
+	// annotators canonical algorithm.
+	//
+	// Such a facility can be used to map blobs between digest domains, with
+	// the restriction that the algorithm of the descriptor must match the
+	// canonical algorithm (ie sha256) of the annotator.
+	SetDescriptor(ctx context.Context, dgst digest.Digest, desc Descriptor) error
+
+	// Clear enables descriptors to be unlinked
+	Clear(ctx context.Context, dgst digest.Digest) error
+}
+
+// ReadSeekCloser is the primary reader type for blob data, combining
+// io.ReadSeeker with io.Closer.
+type ReadSeekCloser interface {
+	io.ReadSeeker
+	io.Closer
+}
+
+// BlobProvider describes operations for getting blob data.
+type BlobProvider interface {
+	// Get returns the entire blob identified by digest along with the descriptor.
+	Get(ctx context.Context, dgst digest.Digest) ([]byte, error)
+
+	// Open provides a ReadSeekCloser to the blob identified by the provided
+	// descriptor. If the blob is not known to the service, an error will be
+	// returned.
+	Open(ctx context.Context, dgst digest.Digest) (ReadSeekCloser, error)
+}
+
+// BlobServer can serve blobs via http.
+type BlobServer interface {
+	// ServeBlob attempts to serve the blob, identifed by dgst, via http. The
+	// service may decide to redirect the client elsewhere or serve the data
+	// directly.
+	//
+	// This handler only issues successful responses, such as 2xx or 3xx,
+	// meaning it serves data or issues a redirect. If the blob is not
+	// available, an error will be returned and the caller may still issue a
+	// response.
+	//
+	// The implementation may serve the same blob from a different digest
+	// domain. The appropriate headers will be set for the blob, unless they
+	// have already been set by the caller.
+	ServeBlob(ctx context.Context, w http.ResponseWriter, r *http.Request, dgst digest.Digest) error
+}
+
+// BlobIngester ingests blob data.
+type BlobIngester interface {
+	// Put inserts the content p into the blob service, returning a descriptor
+	// or an error.
+	Put(ctx context.Context, mediaType string, p []byte) (Descriptor, error)
+
+	// Create allocates a new blob writer to add a blob to this service. The
+	// returned handle can be written to and later resumed using an opaque
+	// identifier. With this approach, one can Close and Resume a BlobWriter
+	// multiple times until the BlobWriter is committed or cancelled.
+	Create(ctx context.Context, options ...BlobCreateOption) (BlobWriter, error)
+
+	// Resume attempts to resume a write to a blob, identified by an id.
+	Resume(ctx context.Context, id string) (BlobWriter, error)
+}
+
+// BlobCreateOption is a general extensible function argument for blob creation
+// methods. A BlobIngester may choose to honor any or none of the given
+// BlobCreateOptions, which can be specific to the implementation of the
+// BlobIngester receiving them.
+// TODO (brianbland): unify this with ManifestServiceOption in the future
+type BlobCreateOption interface {
+	Apply(interface{}) error
+}
+
+// BlobWriter provides a handle for inserting data into a blob store.
+// Instances should be obtained from BlobWriteService.Writer and
+// BlobWriteService.Resume. If supported by the store, a writer can be
+// recovered with the id.
+type BlobWriter interface {
+	io.WriteSeeker
+	io.ReaderFrom
+	io.Closer
+
+	// ID returns the identifier for this writer. The ID can be used with the
+	// Blob service to later resume the write.
+	ID() string
+
+	// StartedAt returns the time this blob write was started.
+	StartedAt() time.Time
+
+	// Commit completes the blob writer process. The content is verified
+	// against the provided provisional descriptor, which may result in an
+	// error. Depending on the implementation, written data may be validated
+	// against the provisional descriptor fields. If MediaType is not present,
+	// the implementation may reject the commit or assign "application/octet-
+	// stream" to the blob. The returned descriptor may have a different
+	// digest depending on the blob store, referred to as the canonical
+	// descriptor.
+	Commit(ctx context.Context, provisional Descriptor) (canonical Descriptor, err error)
+
+	// Cancel ends the blob write without storing any data and frees any
+	// associated resources. Any data written thus far will be lost. Cancel
+	// implementations should allow multiple calls even after a commit that
+	// result in a no-op. This allows use of Cancel in a defer statement,
+	// increasing the assurance that it is correctly called.
+	Cancel(ctx context.Context) error
+
+	// Get a reader to the blob being written by this BlobWriter
+	Reader() (io.ReadCloser, error)
+}
+
+// BlobService combines the operations to access, read and write blobs. This
+// can be used to describe remote blob services.
+type BlobService interface {
+	BlobStatter
+	BlobProvider
+	BlobIngester
+}
+
+// BlobStore represent the entire suite of blob related operations. Such an
+// implementation can access, read, write, delete and serve blobs.
+type BlobStore interface {
+	BlobService
+	BlobServer
+	BlobDeleter
+}
diff --git a/vendor/github.com/docker/distribution/digest/digest.go b/vendor/github.com/docker/distribution/digest/digest.go
new file mode 100644
index 0000000000..31d821bba7
--- /dev/null
+++ b/vendor/github.com/docker/distribution/digest/digest.go
@@ -0,0 +1,139 @@
+package digest
+
+import (
+	"fmt"
+	"hash"
+	"io"
+	"regexp"
+	"strings"
+)
+
+const (
+	// DigestSha256EmptyTar is the canonical sha256 digest of empty data
+	DigestSha256EmptyTar = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+)
+
+// Digest allows simple protection of hex formatted digest strings, prefixed
+// by their algorithm. Strings of type Digest have some guarantee of being in
+// the correct format and it provides quick access to the components of a
+// digest string.
+//
+// The following is an example of the contents of Digest types:
+//
+// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
+//
+// This allows to abstract the digest behind this type and work only in those
+// terms.
+type Digest string
+
+// NewDigest returns a Digest from alg and a hash.Hash object.
+func NewDigest(alg Algorithm, h hash.Hash) Digest {
+	return NewDigestFromBytes(alg, h.Sum(nil))
+}
+
+// NewDigestFromBytes returns a new digest from the byte contents of p.
+// Typically, this can come from hash.Hash.Sum(...) or xxx.SumXXX(...)
+// functions. This is also useful for rebuilding digests from binary
+// serializations.
+func NewDigestFromBytes(alg Algorithm, p []byte) Digest {
+	return Digest(fmt.Sprintf("%s:%x", alg, p))
+}
+
+// NewDigestFromHex returns a Digest from alg and a the hex encoded digest.
+func NewDigestFromHex(alg, hex string) Digest {
+	return Digest(fmt.Sprintf("%s:%s", alg, hex))
+}
+
+// DigestRegexp matches valid digest types.
+var DigestRegexp = regexp.MustCompile(`[a-zA-Z0-9-_+.]+:[a-fA-F0-9]+`)
+
+// DigestRegexpAnchored matches valid digest types, anchored to the start and end of the match.
+var DigestRegexpAnchored = regexp.MustCompile(`^` + DigestRegexp.String() + `$`)
+
+var (
+	// ErrDigestInvalidFormat returned when digest format invalid.
+	ErrDigestInvalidFormat = fmt.Errorf("invalid checksum digest format")
+
+	// ErrDigestInvalidLength returned when digest has invalid length.
+	ErrDigestInvalidLength = fmt.Errorf("invalid checksum digest length")
+
+	// ErrDigestUnsupported returned when the digest algorithm is unsupported.
+	ErrDigestUnsupported = fmt.Errorf("unsupported digest algorithm")
+)
+
+// ParseDigest parses s and returns the validated digest object. An error will
+// be returned if the format is invalid.
+func ParseDigest(s string) (Digest, error) {
+	d := Digest(s)
+
+	return d, d.Validate()
+}
+
+// FromReader returns the most valid digest for the underlying content using
+// the canonical digest algorithm.
+func FromReader(rd io.Reader) (Digest, error) {
+	return Canonical.FromReader(rd)
+}
+
+// FromBytes digests the input and returns a Digest.
+func FromBytes(p []byte) Digest {
+	return Canonical.FromBytes(p)
+}
+
+// Validate checks that the contents of d is a valid digest, returning an
+// error if not.
+func (d Digest) Validate() error {
+	s := string(d)
+
+	if !DigestRegexpAnchored.MatchString(s) {
+		return ErrDigestInvalidFormat
+	}
+
+	i := strings.Index(s, ":")
+	if i < 0 {
+		return ErrDigestInvalidFormat
+	}
+
+	// case: "sha256:" with no hex.
+	if i+1 == len(s) {
+		return ErrDigestInvalidFormat
+	}
+
+	switch algorithm := Algorithm(s[:i]); algorithm {
+	case SHA256, SHA384, SHA512:
+		if algorithm.Size()*2 != len(s[i+1:]) {
+			return ErrDigestInvalidLength
+		}
+		break
+	default:
+		return ErrDigestUnsupported
+	}
+
+	return nil
+}
+
+// Algorithm returns the algorithm portion of the digest. This will panic if
+// the underlying digest is not in a valid format.
+func (d Digest) Algorithm() Algorithm {
+	return Algorithm(d[:d.sepIndex()])
+}
+
+// Hex returns the hex digest portion of the digest. This will panic if the
+// underlying digest is not in a valid format.
+func (d Digest) Hex() string {
+	return string(d[d.sepIndex()+1:])
+}
+
+func (d Digest) String() string {
+	return string(d)
+}
+
+func (d Digest) sepIndex() int {
+	i := strings.Index(string(d), ":")
+
+	if i < 0 {
+		panic("could not find ':' in digest: " + d)
+	}
+
+	return i
+}
diff --git a/vendor/github.com/docker/distribution/digest/digester.go b/vendor/github.com/docker/distribution/digest/digester.go
new file mode 100644
index 0000000000..f3105a45b6
--- /dev/null
+++ b/vendor/github.com/docker/distribution/digest/digester.go
@@ -0,0 +1,155 @@
+package digest
+
+import (
+	"crypto"
+	"fmt"
+	"hash"
+	"io"
+)
+
+// Algorithm identifies and implementation of a digester by an identifier.
+// Note the that this defines both the hash algorithm used and the string
+// encoding.
+type Algorithm string
+
+// supported digest types
+const (
+	SHA256 Algorithm = "sha256" // sha256 with hex encoding
+	SHA384 Algorithm = "sha384" // sha384 with hex encoding
+	SHA512 Algorithm = "sha512" // sha512 with hex encoding
+
+	// Canonical is the primary digest algorithm used with the distribution
+	// project. Other digests may be used but this one is the primary storage
+	// digest.
+	Canonical = SHA256
+)
+
+var (
+	// TODO(stevvooe): Follow the pattern of the standard crypto package for
+	// registration of digests. Effectively, we are a registerable set and
+	// common symbol access.
+
+	// algorithms maps values to hash.Hash implementations. Other algorithms
+	// may be available but they cannot be calculated by the digest package.
+	algorithms = map[Algorithm]crypto.Hash{
+		SHA256: crypto.SHA256,
+		SHA384: crypto.SHA384,
+		SHA512: crypto.SHA512,
+	}
+)
+
+// Available returns true if the digest type is available for use. If this
+// returns false, New and Hash will return nil.
+func (a Algorithm) Available() bool {
+	h, ok := algorithms[a]
+	if !ok {
+		return false
+	}
+
+	// check availability of the hash, as well
+	return h.Available()
+}
+
+func (a Algorithm) String() string {
+	return string(a)
+}
+
+// Size returns number of bytes returned by the hash.
+func (a Algorithm) Size() int {
+	h, ok := algorithms[a]
+	if !ok {
+		return 0
+	}
+	return h.Size()
+}
+
+// Set implemented to allow use of Algorithm as a command line flag.
+func (a *Algorithm) Set(value string) error {
+	if value == "" {
+		*a = Canonical
+	} else {
+		// just do a type conversion, support is queried with Available.
+		*a = Algorithm(value)
+	}
+
+	return nil
+}
+
+// New returns a new digester for the specified algorithm. If the algorithm
+// does not have a digester implementation, nil will be returned. This can be
+// checked by calling Available before calling New.
+func (a Algorithm) New() Digester {
+	return &digester{
+		alg:  a,
+		hash: a.Hash(),
+	}
+}
+
+// Hash returns a new hash as used by the algorithm. If not available, the
+// method will panic. Check Algorithm.Available() before calling.
+func (a Algorithm) Hash() hash.Hash {
+	if !a.Available() {
+		// NOTE(stevvooe): A missing hash is usually a programming error that
+		// must be resolved at compile time. We don't import in the digest
+		// package to allow users to choose their hash implementation (such as
+		// when using stevvooe/resumable or a hardware accelerated package).
+		//
+		// Applications that may want to resolve the hash at runtime should
+		// call Algorithm.Available before call Algorithm.Hash().
+		panic(fmt.Sprintf("%v not available (make sure it is imported)", a))
+	}
+
+	return algorithms[a].New()
+}
+
+// FromReader returns the digest of the reader using the algorithm.
+func (a Algorithm) FromReader(rd io.Reader) (Digest, error) {
+	digester := a.New()
+
+	if _, err := io.Copy(digester.Hash(), rd); err != nil {
+		return "", err
+	}
+
+	return digester.Digest(), nil
+}
+
+// FromBytes digests the input and returns a Digest.
+func (a Algorithm) FromBytes(p []byte) Digest {
+	digester := a.New()
+
+	if _, err := digester.Hash().Write(p); err != nil {
+		// Writes to a Hash should never fail. None of the existing
+		// hash implementations in the stdlib or hashes vendored
+		// here can return errors from Write. Having a panic in this
+		// condition instead of having FromBytes return an error value
+		// avoids unnecessary error handling paths in all callers.
+		panic("write to hash function returned error: " + err.Error())
+	}
+
+	return digester.Digest()
+}
+
+// TODO(stevvooe): Allow resolution of verifiers using the digest type and
+// this registration system.
+
+// Digester calculates the digest of written data. Writes should go directly
+// to the return value of Hash, while calling Digest will return the current
+// value of the digest.
+type Digester interface {
+	Hash() hash.Hash // provides direct access to underlying hash instance.
+	Digest() Digest
+}
+
+// digester provides a simple digester definition that embeds a hasher.
+type digester struct {
+	alg  Algorithm
+	hash hash.Hash
+}
+
+func (d *digester) Hash() hash.Hash {
+	return d.hash
+}
+
+func (d *digester) Digest() Digest {
+	return NewDigest(d.alg, d.hash)
+}
diff --git a/vendor/github.com/docker/distribution/digest/doc.go b/vendor/github.com/docker/distribution/digest/doc.go
new file mode 100644
index 0000000000..f64b0db32b
--- /dev/null
+++ b/vendor/github.com/docker/distribution/digest/doc.go
@@ -0,0 +1,42 @@
+// Package digest provides a generalized type to opaquely represent message
+// digests and their operations within the registry. The Digest type is
+// designed to serve as a flexible identifier in a content-addressable system.
+// More importantly, it provides tools and wrappers to work with
+// hash.Hash-based digests with little effort.
+//
+// Basics
+//
+// The format of a digest is simply a string with two parts, dubbed the
+// "algorithm" and the "digest", separated by a colon:
+//
+// 	<algorithm>:<digest>
+//
+// An example of a sha256 digest representation follows:
+//
+// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
+//
+// In this case, the string "sha256" is the algorithm and the hex bytes are
+// the "digest".
+//
+// Because the Digest type is simply a string, once a valid Digest is
+// obtained, comparisons are cheap, quick and simple to express with the
+// standard equality operator.
+//
+// Verification
+//
+// The main benefit of using the Digest type is simple verification against a
+// given digest. The Verifier interface, modeled after the stdlib hash.Hash
+// interface, provides a common write sink for digest verification. After
+// writing is complete, calling the Verifier.Verified method will indicate
+// whether or not the stream of bytes matches the target digest.
+//
+// Missing Features
+//
+// In addition to the above, we intend to add the following features to this
+// package:
+//
+// 1. A Digester type that supports write sink digest calculation.
+//
+// 2. Suspend and resume of ongoing digest calculations to support efficient digest verification in the registry.
+//
+package digest
diff --git a/vendor/github.com/docker/distribution/digest/set.go b/vendor/github.com/docker/distribution/digest/set.go
new file mode 100644
index 0000000000..3fac41b40f
--- /dev/null
+++ b/vendor/github.com/docker/distribution/digest/set.go
@@ -0,0 +1,245 @@
+package digest
+
+import (
+	"errors"
+	"sort"
+	"strings"
+	"sync"
+)
+
+var (
+	// ErrDigestNotFound is used when a matching digest
+	// could not be found in a set.
+	ErrDigestNotFound = errors.New("digest not found")
+
+	// ErrDigestAmbiguous is used when multiple digests
+	// are found in a set. None of the matching digests
+	// should be considered valid matches.
+	ErrDigestAmbiguous = errors.New("ambiguous digest string")
+)
+
+// Set is used to hold a unique set of digests which
+// may be easily referenced by easily  referenced by a string
+// representation of the digest as well as short representation.
+// The uniqueness of the short representation is based on other
+// digests in the set. If digests are ommited from this set,
+// collisions in a larger set may not be detected, therefore it
+// is important to always do short representation lookups on
+// the complete set of digests. To mitigate collisions, an
+// appropriately long short code should be used.
+type Set struct {
+	mutex   sync.RWMutex
+	entries digestEntries
+}
+
+// NewSet creates an empty set of digests
+// which may have digests added.
+func NewSet() *Set {
+	return &Set{
+		entries: digestEntries{},
+	}
+}
+
+// checkShortMatch checks whether two digests match as either whole
+// values or short values. This function does not test equality,
+// rather whether the second value could match against the first
+// value.
+func checkShortMatch(alg Algorithm, hex, shortAlg, shortHex string) bool {
+	if len(hex) == len(shortHex) {
+		if hex != shortHex {
+			return false
+		}
+		if len(shortAlg) > 0 && string(alg) != shortAlg {
+			return false
+		}
+	} else if !strings.HasPrefix(hex, shortHex) {
+		return false
+	} else if len(shortAlg) > 0 && string(alg) != shortAlg {
+		return false
+	}
+	return true
+}
+
+// Lookup looks for a digest matching the given string representation.
+// If no digests could be found ErrDigestNotFound will be returned
+// with an empty digest value. If multiple matches are found
+// ErrDigestAmbiguous will be returned with an empty digest value.
+func (dst *Set) Lookup(d string) (Digest, error) {
+	dst.mutex.RLock()
+	defer dst.mutex.RUnlock()
+	if len(dst.entries) == 0 {
+		return "", ErrDigestNotFound
+	}
+	var (
+		searchFunc func(int) bool
+		alg        Algorithm
+		hex        string
+	)
+	dgst, err := ParseDigest(d)
+	if err == ErrDigestInvalidFormat {
+		hex = d
+		searchFunc = func(i int) bool {
+			return dst.entries[i].val >= d
+		}
+	} else {
+		hex = dgst.Hex()
+		alg = dgst.Algorithm()
+		searchFunc = func(i int) bool {
+			if dst.entries[i].val == hex {
+				return dst.entries[i].alg >= alg
+			}
+			return dst.entries[i].val >= hex
+		}
+	}
+	idx := sort.Search(len(dst.entries), searchFunc)
+	if idx == len(dst.entries) || !checkShortMatch(dst.entries[idx].alg, dst.entries[idx].val, string(alg), hex) {
+		return "", ErrDigestNotFound
+	}
+	if dst.entries[idx].alg == alg && dst.entries[idx].val == hex {
+		return dst.entries[idx].digest, nil
+	}
+	if idx+1 < len(dst.entries) && checkShortMatch(dst.entries[idx+1].alg, dst.entries[idx+1].val, string(alg), hex) {
+		return "", ErrDigestAmbiguous
+	}
+
+	return dst.entries[idx].digest, nil
+}
+
+// Add adds the given digest to the set. An error will be returned
+// if the given digest is invalid. If the digest already exists in the
+// set, this operation will be a no-op.
+func (dst *Set) Add(d Digest) error {
+	if err := d.Validate(); err != nil {
+		return err
+	}
+	dst.mutex.Lock()
+	defer dst.mutex.Unlock()
+	entry := &digestEntry{alg: d.Algorithm(), val: d.Hex(), digest: d}
+	searchFunc := func(i int) bool {
+		if dst.entries[i].val == entry.val {
+			return dst.entries[i].alg >= entry.alg
+		}
+		return dst.entries[i].val >= entry.val
+	}
+	idx := sort.Search(len(dst.entries), searchFunc)
+	if idx == len(dst.entries) {
+		dst.entries = append(dst.entries, entry)
+		return nil
+	} else if dst.entries[idx].digest == d {
+		return nil
+	}
+
+	entries := append(dst.entries, nil)
+	copy(entries[idx+1:], entries[idx:len(entries)-1])
+	entries[idx] = entry
+	dst.entries = entries
+	return nil
+}
+
+// Remove removes the given digest from the set. An err will be
+// returned if the given digest is invalid. If the digest does
+// not exist in the set, this operation will be a no-op.
+func (dst *Set) Remove(d Digest) error {
+	if err := d.Validate(); err != nil {
+		return err
+	}
+	dst.mutex.Lock()
+	defer dst.mutex.Unlock()
+	entry := &digestEntry{alg: d.Algorithm(), val: d.Hex(), digest: d}
+	searchFunc := func(i int) bool {
+		if dst.entries[i].val == entry.val {
+			return dst.entries[i].alg >= entry.alg
+		}
+		return dst.entries[i].val >= entry.val
+	}
+	idx := sort.Search(len(dst.entries), searchFunc)
+	// Not found if idx is after or value at idx is not digest
+	if idx == len(dst.entries) || dst.entries[idx].digest != d {
+		return nil
+	}
+
+	entries := dst.entries
+	copy(entries[idx:], entries[idx+1:])
+	entries = entries[:len(entries)-1]
+	dst.entries = entries
+
+	return nil
+}
+
+// All returns all the digests in the set
+func (dst *Set) All() []Digest {
+	dst.mutex.RLock()
+	defer dst.mutex.RUnlock()
+	retValues := make([]Digest, len(dst.entries))
+	for i := range dst.entries {
+		retValues[i] = dst.entries[i].digest
+	}
+
+	return retValues
+}
+
+// ShortCodeTable returns a map of Digest to unique short codes. The
+// length represents the minimum value, the maximum length may be the
+// entire value of digest if uniqueness cannot be achieved without the
+// full value. This function will attempt to make short codes as short
+// as possible to be unique.
+func ShortCodeTable(dst *Set, length int) map[Digest]string {
+	dst.mutex.RLock()
+	defer dst.mutex.RUnlock()
+	m := make(map[Digest]string, len(dst.entries))
+	l := length
+	resetIdx := 0
+	for i := 0; i < len(dst.entries); i++ {
+		var short string
+		extended := true
+		for extended {
+			extended = false
+			if len(dst.entries[i].val) <= l {
+				short = dst.entries[i].digest.String()
+			} else {
+				short = dst.entries[i].val[:l]
+				for j := i + 1; j < len(dst.entries); j++ {
+					if checkShortMatch(dst.entries[j].alg, dst.entries[j].val, "", short) {
+						if j > resetIdx {
+							resetIdx = j
+						}
+						extended = true
+					} else {
+						break
+					}
+				}
+				if extended {
+					l++
+				}
+			}
+		}
+		m[dst.entries[i].digest] = short
+		if i >= resetIdx {
+			l = length
+		}
+	}
+	return m
+}
+
+type digestEntry struct {
+	alg    Algorithm
+	val    string
+	digest Digest
+}
+
+type digestEntries []*digestEntry
+
+func (d digestEntries) Len() int {
+	return len(d)
+}
+
+func (d digestEntries) Less(i, j int) bool {
+	if d[i].val != d[j].val {
+		return d[i].val < d[j].val
+	}
+	return d[i].alg < d[j].alg
+}
+
+func (d digestEntries) Swap(i, j int) {
+	d[i], d[j] = d[j], d[i]
+}
diff --git a/vendor/github.com/docker/distribution/digest/verifiers.go b/vendor/github.com/docker/distribution/digest/verifiers.go
new file mode 100644
index 0000000000..9af3be1341
--- /dev/null
+++ b/vendor/github.com/docker/distribution/digest/verifiers.go
@@ -0,0 +1,44 @@
+package digest
+
+import (
+	"hash"
+	"io"
+)
+
+// Verifier presents a general verification interface to be used with message
+// digests and other byte stream verifications. Users instantiate a Verifier
+// from one of the various methods, write the data under test to it then check
+// the result with the Verified method.
+type Verifier interface {
+	io.Writer
+
+	// Verified will return true if the content written to Verifier matches
+	// the digest.
+	Verified() bool
+}
+
+// NewDigestVerifier returns a verifier that compares the written bytes
+// against a passed in digest.
+func NewDigestVerifier(d Digest) (Verifier, error) {
+	if err := d.Validate(); err != nil {
+		return nil, err
+	}
+
+	return hashVerifier{
+		hash:   d.Algorithm().Hash(),
+		digest: d,
+	}, nil
+}
+
+type hashVerifier struct {
+	digest Digest
+	hash   hash.Hash
+}
+
+func (hv hashVerifier) Write(p []byte) (n int, err error) {
+	return hv.hash.Write(p)
+}
+
+func (hv hashVerifier) Verified() bool {
+	return hv.digest == NewDigest(hv.digest.Algorithm(), hv.hash)
+}
diff --git a/vendor/github.com/docker/distribution/doc.go b/vendor/github.com/docker/distribution/doc.go
new file mode 100644
index 0000000000..bdd8cb708e
--- /dev/null
+++ b/vendor/github.com/docker/distribution/doc.go
@@ -0,0 +1,7 @@
+// Package distribution will define the interfaces for the components of
+// docker distribution. The goal is to allow users to reliably package, ship
+// and store content related to docker images.
+//
+// This is currently a work in progress. More details are available in the
+// README.md.
+package distribution
diff --git a/vendor/github.com/docker/distribution/errors.go b/vendor/github.com/docker/distribution/errors.go
new file mode 100644
index 0000000000..77bd096ec8
--- /dev/null
+++ b/vendor/github.com/docker/distribution/errors.go
@@ -0,0 +1,111 @@
+package distribution
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/docker/distribution/digest"
+)
+
+// ErrManifestNotModified is returned when a conditional manifest GetByTag
+// returns nil due to the client indicating it has the latest version
+var ErrManifestNotModified = errors.New("manifest not modified")
+
+// ErrUnsupported is returned when an unimplemented or unsupported action is
+// performed
+var ErrUnsupported = errors.New("operation unsupported")
+
+// ErrTagUnknown is returned if the given tag is not known by the tag service
+type ErrTagUnknown struct {
+	Tag string
+}
+
+func (err ErrTagUnknown) Error() string {
+	return fmt.Sprintf("unknown tag=%s", err.Tag)
+}
+
+// ErrRepositoryUnknown is returned if the named repository is not known by
+// the registry.
+type ErrRepositoryUnknown struct {
+	Name string
+}
+
+func (err ErrRepositoryUnknown) Error() string {
+	return fmt.Sprintf("unknown repository name=%s", err.Name)
+}
+
+// ErrRepositoryNameInvalid should be used to denote an invalid repository
+// name. Reason may set, indicating the cause of invalidity.
+type ErrRepositoryNameInvalid struct {
+	Name   string
+	Reason error
+}
+
+func (err ErrRepositoryNameInvalid) Error() string {
+	return fmt.Sprintf("repository name %q invalid: %v", err.Name, err.Reason)
+}
+
+// ErrManifestUnknown is returned if the manifest is not known by the
+// registry.
+type ErrManifestUnknown struct {
+	Name string
+	Tag  string
+}
+
+func (err ErrManifestUnknown) Error() string {
+	return fmt.Sprintf("unknown manifest name=%s tag=%s", err.Name, err.Tag)
+}
+
+// ErrManifestUnknownRevision is returned when a manifest cannot be found by
+// revision within a repository.
+type ErrManifestUnknownRevision struct {
+	Name     string
+	Revision digest.Digest
+}
+
+func (err ErrManifestUnknownRevision) Error() string {
+	return fmt.Sprintf("unknown manifest name=%s revision=%s", err.Name, err.Revision)
+}
+
+// ErrManifestUnverified is returned when the registry is unable to verify
+// the manifest.
+type ErrManifestUnverified struct{}
+
+func (ErrManifestUnverified) Error() string {
+	return fmt.Sprintf("unverified manifest")
+}
+
+// ErrManifestVerification provides a type to collect errors encountered
+// during manifest verification. Currently, it accepts errors of all types,
+// but it may be narrowed to those involving manifest verification.
+type ErrManifestVerification []error
+
+func (errs ErrManifestVerification) Error() string {
+	var parts []string
+	for _, err := range errs {
+		parts = append(parts, err.Error())
+	}
+
+	return fmt.Sprintf("errors verifying manifest: %v", strings.Join(parts, ","))
+}
+
+// ErrManifestBlobUnknown returned when a referenced blob cannot be found.
+type ErrManifestBlobUnknown struct {
+	Digest digest.Digest
+}
+
+func (err ErrManifestBlobUnknown) Error() string {
+	return fmt.Sprintf("unknown blob %v on manifest", err.Digest)
+}
+
+// ErrManifestNameInvalid should be used to denote an invalid manifest
+// name. Reason may set, indicating the cause of invalidity.
+type ErrManifestNameInvalid struct {
+	Name   string
+	Reason error
+}
+
+func (err ErrManifestNameInvalid) Error() string {
+	return fmt.Sprintf("manifest name %q invalid: %v", err.Name, err.Reason)
+}
diff --git a/vendor/github.com/docker/distribution/manifests.go b/vendor/github.com/docker/distribution/manifests.go
new file mode 100644
index 0000000000..1acb0500d7
--- /dev/null
+++ b/vendor/github.com/docker/distribution/manifests.go
@@ -0,0 +1,117 @@
+package distribution
+
+import (
+	"fmt"
+	"mime"
+
+	"github.com/docker/distribution/context"
+	"github.com/docker/distribution/digest"
+)
+
+// Manifest represents a registry object specifying a set of
+// references and an optional target
+type Manifest interface {
+	// References returns a list of objects which make up this manifest.
+	// The references are strictly ordered from base to head. A reference
+	// is anything which can be represented by a distribution.Descriptor
+	References() []Descriptor
+
+	// Payload provides the serialized format of the manifest, in addition to
+	// the mediatype.
+	Payload() (mediatype string, payload []byte, err error)
+}
+
+// ManifestBuilder creates a manifest allowing one to include dependencies.
+// Instances can be obtained from a version-specific manifest package.  Manifest
+// specific data is passed into the function which creates the builder.
+type ManifestBuilder interface {
+	// Build creates the manifest from his builder.
+	Build(ctx context.Context) (Manifest, error)
+
+	// References returns a list of objects which have been added to this
+	// builder. The dependencies are returned in the order they were added,
+	// which should be from base to head.
+	References() []Descriptor
+
+	// AppendReference includes the given object in the manifest after any
+	// existing dependencies. If the add fails, such as when adding an
+	// unsupported dependency, an error may be returned.
+	AppendReference(dependency Describable) error
+}
+
+// ManifestService describes operations on image manifests.
+type ManifestService interface {
+	// Exists returns true if the manifest exists.
+	Exists(ctx context.Context, dgst digest.Digest) (bool, error)
+
+	// Get retrieves the manifest specified by the given digest
+	Get(ctx context.Context, dgst digest.Digest, options ...ManifestServiceOption) (Manifest, error)
+
+	// Put creates or updates the given manifest returning the manifest digest
+	Put(ctx context.Context, manifest Manifest, options ...ManifestServiceOption) (digest.Digest, error)
+
+	// Delete removes the manifest specified by the given digest. Deleting
+	// a manifest that doesn't exist will return ErrManifestNotFound
+	Delete(ctx context.Context, dgst digest.Digest) error
+
+	// Enumerate fills 'manifests' with the manifests in this service up
+	// to the size of 'manifests' and returns 'n' for the number of entries
+	// which were filled.  'last' contains an offset in the manifest set
+	// and can be used to resume iteration.
+	//Enumerate(ctx context.Context, manifests []Manifest, last Manifest) (n int, err error)
+}
+
+// Describable is an interface for descriptors
+type Describable interface {
+	Descriptor() Descriptor
+}
+
+// ManifestMediaTypes returns the supported media types for manifests.
+func ManifestMediaTypes() (mediaTypes []string) {
+	for t := range mappings {
+		if t != "" {
+			mediaTypes = append(mediaTypes, t)
+		}
+	}
+	return
+}
+
+// UnmarshalFunc implements manifest unmarshalling a given MediaType
+type UnmarshalFunc func([]byte) (Manifest, Descriptor, error)
+
+var mappings = make(map[string]UnmarshalFunc, 0)
+
+// UnmarshalManifest looks up manifest unmarshall functions based on
+// MediaType
+func UnmarshalManifest(ctHeader string, p []byte) (Manifest, Descriptor, error) {
+	// Need to look up by the actual media type, not the raw contents of
+	// the header. Strip semicolons and anything following them.
+	var mediatype string
+	if ctHeader != "" {
+		var err error
+		mediatype, _, err = mime.ParseMediaType(ctHeader)
+		if err != nil {
+			return nil, Descriptor{}, err
+		}
+	}
+
+	unmarshalFunc, ok := mappings[mediatype]
+	if !ok {
+		unmarshalFunc, ok = mappings[""]
+		if !ok {
+			return nil, Descriptor{}, fmt.Errorf("unsupported manifest mediatype and no default available: %s", mediatype)
+		}
+	}
+
+	return unmarshalFunc(p)
+}
+
+// RegisterManifestSchema registers an UnmarshalFunc for a given schema type.  This
+// should be called from specific
+func RegisterManifestSchema(mediatype string, u UnmarshalFunc) error {
+	if _, ok := mappings[mediatype]; ok {
+		return fmt.Errorf("manifest mediatype registration would overwrite existing: %s", mediatype)
+	}
+	mappings[mediatype] = u
+	return nil
+}
diff --git a/vendor/github.com/docker/distribution/reference/reference.go b/vendor/github.com/docker/distribution/reference/reference.go
new file mode 100644
index 0000000000..c188472a40
--- /dev/null
+++ b/vendor/github.com/docker/distribution/reference/reference.go
@@ -0,0 +1,334 @@
+// Package reference provides a general type to represent any way of referencing images within the registry.
+// Its main purpose is to abstract tags and digests (content-addressable hash).
+//
+// Grammar
+//
+// 	reference                       := repository [ ":" tag ] [ "@" digest ]
+//	name                            := [hostname '/'] component ['/' component]*
+//	hostname                        := hostcomponent ['.' hostcomponent]* [':' port-number]
+//	hostcomponent                   := /([a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])/
+//	port-number                     := /[0-9]+/
+//	component                       := alpha-numeric [separator alpha-numeric]*
+// 	alpha-numeric                   := /[a-z0-9]+/
+//	separator                       := /[_.]|__|[-]*/
+//
+//	tag                             := /[\w][\w.-]{0,127}/
+//
+//	digest                          := digest-algorithm ":" digest-hex
+//	digest-algorithm                := digest-algorithm-component [ digest-algorithm-separator digest-algorithm-component ]
+//	digest-algorithm-separator      := /[+.-_]/
+//	digest-algorithm-component      := /[A-Za-z][A-Za-z0-9]*/
+//	digest-hex                      := /[0-9a-fA-F]{32,}/ ; At least 128 bit digest value
+package reference
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/docker/distribution/digest"
+)
+
+const (
+	// NameTotalLengthMax is the maximum total number of characters in a repository name.
+	NameTotalLengthMax = 255
+)
+
+var (
+	// ErrReferenceInvalidFormat represents an error while trying to parse a string as a reference.
+	ErrReferenceInvalidFormat = errors.New("invalid reference format")
+
+	// ErrTagInvalidFormat represents an error while trying to parse a string as a tag.
+	ErrTagInvalidFormat = errors.New("invalid tag format")
+
+	// ErrDigestInvalidFormat represents an error while trying to parse a string as a tag.
+	ErrDigestInvalidFormat = errors.New("invalid digest format")
+
+	// ErrNameEmpty is returned for empty, invalid repository names.
+	ErrNameEmpty = errors.New("repository name must have at least one component")
+
+	// ErrNameTooLong is returned when a repository name is longer than NameTotalLengthMax.
+	ErrNameTooLong = fmt.Errorf("repository name must not be more than %v characters", NameTotalLengthMax)
+)
+
+// Reference is an opaque object reference identifier that may include
+// modifiers such as a hostname, name, tag, and digest.
+type Reference interface {
+	// String returns the full reference
+	String() string
+}
+
+// Field provides a wrapper type for resolving correct reference types when
+// working with encoding.
+type Field struct {
+	reference Reference
+}
+
+// AsField wraps a reference in a Field for encoding.
+func AsField(reference Reference) Field {
+	return Field{reference}
+}
+
+// Reference unwraps the reference type from the field to
+// return the Reference object. This object should be
+// of the appropriate type to further check for different
+// reference types.
+func (f Field) Reference() Reference {
+	return f.reference
+}
+
+// MarshalText serializes the field to byte text which
+// is the string of the reference.
+func (f Field) MarshalText() (p []byte, err error) {
+	return []byte(f.reference.String()), nil
+}
+
+// UnmarshalText parses text bytes by invoking the
+// reference parser to ensure the appropriately
+// typed reference object is wrapped by field.
+func (f *Field) UnmarshalText(p []byte) error {
+	r, err := Parse(string(p))
+	if err != nil {
+		return err
+	}
+
+	f.reference = r
+	return nil
+}
+
+// Named is an object with a full name
+type Named interface {
+	Reference
+	Name() string
+}
+
+// Tagged is an object which has a tag
+type Tagged interface {
+	Reference
+	Tag() string
+}
+
+// NamedTagged is an object including a name and tag.
+type NamedTagged interface {
+	Named
+	Tag() string
+}
+
+// Digested is an object which has a digest
+// in which it can be referenced by
+type Digested interface {
+	Reference
+	Digest() digest.Digest
+}
+
+// Canonical reference is an object with a fully unique
+// name including a name with hostname and digest
+type Canonical interface {
+	Named
+	Digest() digest.Digest
+}
+
+// SplitHostname splits a named reference into a
+// hostname and name string. If no valid hostname is
+// found, the hostname is empty and the full value
+// is returned as name
+func SplitHostname(named Named) (string, string) {
+	name := named.Name()
+	match := anchoredNameRegexp.FindStringSubmatch(name)
+	if match == nil || len(match) != 3 {
+		return "", name
+	}
+	return match[1], match[2]
+}
+
+// Parse parses s and returns a syntactically valid Reference.
+// If an error was encountered it is returned, along with a nil Reference.
+// NOTE: Parse will not handle short digests.
+func Parse(s string) (Reference, error) {
+	matches := ReferenceRegexp.FindStringSubmatch(s)
+	if matches == nil {
+		if s == "" {
+			return nil, ErrNameEmpty
+		}
+		// TODO(dmcgowan): Provide more specific and helpful error
+		return nil, ErrReferenceInvalidFormat
+	}
+
+	if len(matches[1]) > NameTotalLengthMax {
+		return nil, ErrNameTooLong
+	}
+
+	ref := reference{
+		name: matches[1],
+		tag:  matches[2],
+	}
+	if matches[3] != "" {
+		var err error
+		ref.digest, err = digest.ParseDigest(matches[3])
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	r := getBestReferenceType(ref)
+	if r == nil {
+		return nil, ErrNameEmpty
+	}
+
+	return r, nil
+}
+
+// ParseNamed parses s and returns a syntactically valid reference implementing
+// the Named interface. The reference must have a name, otherwise an error is
+// returned.
+// If an error was encountered it is returned, along with a nil Reference.
+// NOTE: ParseNamed will not handle short digests.
+func ParseNamed(s string) (Named, error) {
+	ref, err := Parse(s)
+	if err != nil {
+		return nil, err
+	}
+	named, isNamed := ref.(Named)
+	if !isNamed {
+		return nil, fmt.Errorf("reference %s has no name", ref.String())
+	}
+	return named, nil
+}
+
+// WithName returns a named object representing the given string. If the input
+// is invalid ErrReferenceInvalidFormat will be returned.
+func WithName(name string) (Named, error) {
+	if len(name) > NameTotalLengthMax {
+		return nil, ErrNameTooLong
+	}
+	if !anchoredNameRegexp.MatchString(name) {
+		return nil, ErrReferenceInvalidFormat
+	}
+	return repository(name), nil
+}
+
+// WithTag combines the name from "name" and the tag from "tag" to form a
+// reference incorporating both the name and the tag.
+func WithTag(name Named, tag string) (NamedTagged, error) {
+	if !anchoredTagRegexp.MatchString(tag) {
+		return nil, ErrTagInvalidFormat
+	}
+	return taggedReference{
+		name: name.Name(),
+		tag:  tag,
+	}, nil
+}
+
+// WithDigest combines the name from "name" and the digest from "digest" to form
+// a reference incorporating both the name and the digest.
+func WithDigest(name Named, digest digest.Digest) (Canonical, error) {
+	if !anchoredDigestRegexp.MatchString(digest.String()) {
+		return nil, ErrDigestInvalidFormat
+	}
+	return canonicalReference{
+		name:   name.Name(),
+		digest: digest,
+	}, nil
+}
+
+func getBestReferenceType(ref reference) Reference {
+	if ref.name == "" {
+		// Allow digest only references
+		if ref.digest != "" {
+			return digestReference(ref.digest)
+		}
+		return nil
+	}
+	if ref.tag == "" {
+		if ref.digest != "" {
+			return canonicalReference{
+				name:   ref.name,
+				digest: ref.digest,
+			}
+		}
+		return repository(ref.name)
+	}
+	if ref.digest == "" {
+		return taggedReference{
+			name: ref.name,
+			tag:  ref.tag,
+		}
+	}
+
+	return ref
+}
+
+type reference struct {
+	name   string
+	tag    string
+	digest digest.Digest
+}
+
+func (r reference) String() string {
+	return r.name + ":" + r.tag + "@" + r.digest.String()
+}
+
+func (r reference) Name() string {
+	return r.name
+}
+
+func (r reference) Tag() string {
+	return r.tag
+}
+
+func (r reference) Digest() digest.Digest {
+	return r.digest
+}
+
+type repository string
+
+func (r repository) String() string {
+	return string(r)
+}
+
+func (r repository) Name() string {
+	return string(r)
+}
+
+type digestReference digest.Digest
+
+func (d digestReference) String() string {
+	return d.String()
+}
+
+func (d digestReference) Digest() digest.Digest {
+	return digest.Digest(d)
+}
+
+type taggedReference struct {
+	name string
+	tag  string
+}
+
+func (t taggedReference) String() string {
+	return t.name + ":" + t.tag
+}
+
+func (t taggedReference) Name() string {
+	return t.name
+}
+
+func (t taggedReference) Tag() string {
+	return t.tag
+}
+
+type canonicalReference struct {
+	name   string
+	digest digest.Digest
+}
+
+func (c canonicalReference) String() string {
+	return c.name + "@" + c.digest.String()
+}
+
+func (c canonicalReference) Name() string {
+	return c.name
+}
+
+func (c canonicalReference) Digest() digest.Digest {
+	return c.digest
+}
diff --git a/vendor/github.com/docker/distribution/reference/regexp.go b/vendor/github.com/docker/distribution/reference/regexp.go
new file mode 100644
index 0000000000..a4ffe5b642
--- /dev/null
+++ b/vendor/github.com/docker/distribution/reference/regexp.go
@@ -0,0 +1,124 @@
+package reference
+
+import "regexp"
+
+var (
+	// alphaNumericRegexp defines the alpha numeric atom, typically a
+	// component of names. This only allows lower case characters and digits.
+	alphaNumericRegexp = match(`[a-z0-9]+`)
+
+	// separatorRegexp defines the separators allowed to be embedded in name
+	// components. This allow one period, one or two underscore and multiple
+	// dashes.
+	separatorRegexp = match(`(?:[._]|__|[-]*)`)
+
+	// nameComponentRegexp restricts registry path component names to start
+	// with at least one letter or number, with following parts able to be
+	// separated by one period, one or two underscore and multiple dashes.
+	nameComponentRegexp = expression(
+		alphaNumericRegexp,
+		optional(repeated(separatorRegexp, alphaNumericRegexp)))
+
+	// hostnameComponentRegexp restricts the registry hostname component of a
+	// repository name to start with a component as defined by hostnameRegexp
+	// and followed by an optional port.
+	hostnameComponentRegexp = match(`(?:[a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])`)
+
+	// hostnameRegexp defines the structure of potential hostname components
+	// that may be part of image names. This is purposely a subset of what is
+	// allowed by DNS to ensure backwards compatibility with Docker image
+	// names.
+	hostnameRegexp = expression(
+		hostnameComponentRegexp,
+		optional(repeated(literal(`.`), hostnameComponentRegexp)),
+		optional(literal(`:`), match(`[0-9]+`)))
+
+	// TagRegexp matches valid tag names. From docker/docker:graph/tags.go.
+	TagRegexp = match(`[\w][\w.-]{0,127}`)
+
+	// anchoredTagRegexp matches valid tag names, anchored at the start and
+	// end of the matched string.
+	anchoredTagRegexp = anchored(TagRegexp)
+
+	// DigestRegexp matches valid digests.
+	DigestRegexp = match(`[A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][[:xdigit:]]{32,}`)
+
+	// anchoredDigestRegexp matches valid digests, anchored at the start and
+	// end of the matched string.
+	anchoredDigestRegexp = anchored(DigestRegexp)
+
+	// NameRegexp is the format for the name component of references. The
+	// regexp has capturing groups for the hostname and name part omitting
+	// the seperating forward slash from either.
+	NameRegexp = expression(
+		optional(hostnameRegexp, literal(`/`)),
+		nameComponentRegexp,
+		optional(repeated(literal(`/`), nameComponentRegexp)))
+
+	// anchoredNameRegexp is used to parse a name value, capturing the
+	// hostname and trailing components.
+	anchoredNameRegexp = anchored(
+		optional(capture(hostnameRegexp), literal(`/`)),
+		capture(nameComponentRegexp,
+			optional(repeated(literal(`/`), nameComponentRegexp))))
+
+	// ReferenceRegexp is the full supported format of a reference. The regexp
+	// is anchored and has capturing groups for name, tag, and digest
+	// components.
+	ReferenceRegexp = anchored(capture(NameRegexp),
+		optional(literal(":"), capture(TagRegexp)),
+		optional(literal("@"), capture(DigestRegexp)))
+)
+
+// match compiles the string to a regular expression.
+var match = regexp.MustCompile
+
+// literal compiles s into a literal regular expression, escaping any regexp
+// reserved characters.
+func literal(s string) *regexp.Regexp {
+	re := match(regexp.QuoteMeta(s))
+
+	if _, complete := re.LiteralPrefix(); !complete {
+		panic("must be a literal")
+	}
+
+	return re
+}
+
+// expression defines a full expression, where each regular expression must
+// follow the previous.
+func expression(res ...*regexp.Regexp) *regexp.Regexp {
+	var s string
+	for _, re := range res {
+		s += re.String()
+	}
+
+	return match(s)
+}
+
+// optional wraps the expression in a non-capturing group and makes the
+// production optional.
+func optional(res ...*regexp.Regexp) *regexp.Regexp {
+	return match(group(expression(res...)).String() + `?`)
+}
+
+// repeated wraps the regexp in a non-capturing group to get one or more
+// matches.
+func repeated(res ...*regexp.Regexp) *regexp.Regexp {
+	return match(group(expression(res...)).String() + `+`)
+}
+
+// group wraps the regexp in a non-capturing group.
+func group(res ...*regexp.Regexp) *regexp.Regexp {
+	return match(`(?:` + expression(res...).String() + `)`)
+}
+
+// capture wraps the expression in a capturing group.
+func capture(res ...*regexp.Regexp) *regexp.Regexp {
+	return match(`(` + expression(res...).String() + `)`)
+}
+
+// anchored anchors the regular expression by adding start and end delimiters.
+func anchored(res ...*regexp.Regexp) *regexp.Regexp {
+	return match(`^` + expression(res...).String() + `$`)
+}
diff --git a/vendor/github.com/docker/distribution/registry.go b/vendor/github.com/docker/distribution/registry.go
new file mode 100644
index 0000000000..dcb35c3744
--- /dev/null
+++ b/vendor/github.com/docker/distribution/registry.go
@@ -0,0 +1,72 @@
+package distribution
+
+import (
+	"github.com/docker/distribution/context"
+	"github.com/docker/distribution/reference"
+)
+
+// Scope defines the set of items that match a namespace.
+type Scope interface {
+	// Contains returns true if the name belongs to the namespace.
+	Contains(name string) bool
+}
+
+type fullScope struct{}
+
+func (f fullScope) Contains(string) bool {
+	return true
+}
+
+// GlobalScope represents the full namespace scope which contains
+// all other scopes.
+var GlobalScope = Scope(fullScope{})
+
+// Namespace represents a collection of repositories, addressable by name.
+// Generally, a namespace is backed by a set of one or more services,
+// providing facilities such as registry access, trust, and indexing.
+type Namespace interface {
+	// Scope describes the names that can be used with this Namespace. The
+	// global namespace will have a scope that matches all names. The scope
+	// effectively provides an identity for the namespace.
+	Scope() Scope
+
+	// Repository should return a reference to the named repository. The
+	// registry may or may not have the repository but should always return a
+	// reference.
+	Repository(ctx context.Context, name reference.Named) (Repository, error)
+
+	// Repositories fills 'repos' with a lexigraphically sorted catalog of repositories
+	// up to the size of 'repos' and returns the value 'n' for the number of entries
+	// which were filled.  'last' contains an offset in the catalog, and 'err' will be
+	// set to io.EOF if there are no more entries to obtain.
+	Repositories(ctx context.Context, repos []string, last string) (n int, err error)
+}
+
+// ManifestServiceOption is a function argument for Manifest Service methods
+type ManifestServiceOption interface {
+	Apply(ManifestService) error
+}
+
+// Repository is a named collection of manifests and layers.
+type Repository interface {
+	// Name returns the name of the repository.
+	Name() reference.Named
+
+	// Manifests returns a reference to this repository's manifest service.
+	// with the supplied options applied.
+	Manifests(ctx context.Context, options ...ManifestServiceOption) (ManifestService, error)
+
+	// Blobs returns a reference to this repository's blob service.
+	Blobs(ctx context.Context) BlobStore
+
+	// TODO(stevvooe): The above BlobStore return can probably be relaxed to
+	// be a BlobService for use with clients. This will allow such
+	// implementations to avoid implementing ServeBlob.
+
+	// Tags returns a reference to this repositories tag service
+	Tags(ctx context.Context) TagService
+}
+
+// TODO(stevvooe): Must add close methods to all these. May want to change the
+// way instances are created to better reflect internal dependency
+// relationships.
diff --git a/vendor/github.com/docker/distribution/tags.go b/vendor/github.com/docker/distribution/tags.go
new file mode 100644
index 0000000000..5030565963
--- /dev/null
+++ b/vendor/github.com/docker/distribution/tags.go
@@ -0,0 +1,27 @@
+package distribution
+
+import (
+	"github.com/docker/distribution/context"
+)
+
+// TagService provides access to information about tagged objects.
+type TagService interface {
+	// Get retrieves the descriptor identified by the tag. Some
+	// implementations may differentiate between "trusted" tags and
+	// "untrusted" tags. If a tag is "untrusted", the mapping will be returned
+	// as an ErrTagUntrusted error, with the target descriptor.
+	Get(ctx context.Context, tag string) (Descriptor, error)
+
+	// Tag associates the tag with the provided descriptor, updating the
+	// current association, if needed.
+	Tag(ctx context.Context, tag string, desc Descriptor) error
+
+	// Untag removes the given tag association
+	Untag(ctx context.Context, tag string) error
+
+	// All returns the set of tags managed by this tag service
+	All(ctx context.Context) ([]string, error)
+
+	// Lookup returns the set of tags referencing the given digest.
+	Lookup(ctx context.Context, digest Descriptor) ([]string, error)
+}
diff --git a/vendor/github.com/dustin/go-humanize/LICENSE b/vendor/github.com/dustin/go-humanize/LICENSE
new file mode 100644
index 0000000000..8d9a94a906
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2005-2008  Dustin Sallings <dustin@spy.net>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+<http://www.opensource.org/licenses/mit-license.php>
diff --git a/vendor/github.com/dustin/go-humanize/big.go b/vendor/github.com/dustin/go-humanize/big.go
new file mode 100644
index 0000000000..f49dc337dc
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/big.go
@@ -0,0 +1,31 @@
+package humanize
+
+import (
+	"math/big"
+)
+
+// order of magnitude (to a max order)
+func oomm(n, b *big.Int, maxmag int) (float64, int) {
+	mag := 0
+	m := &big.Int{}
+	for n.Cmp(b) >= 0 {
+		n.DivMod(n, b, m)
+		mag++
+		if mag == maxmag && maxmag >= 0 {
+			break
+		}
+	}
+	return float64(n.Int64()) + (float64(m.Int64()) / float64(b.Int64())), mag
+}
+
+// total order of magnitude
+// (same as above, but with no upper limit)
+func oom(n, b *big.Int) (float64, int) {
+	mag := 0
+	m := &big.Int{}
+	for n.Cmp(b) >= 0 {
+		n.DivMod(n, b, m)
+		mag++
+	}
+	return float64(n.Int64()) + (float64(m.Int64()) / float64(b.Int64())), mag
+}
diff --git a/vendor/github.com/dustin/go-humanize/bigbytes.go b/vendor/github.com/dustin/go-humanize/bigbytes.go
new file mode 100644
index 0000000000..e4a814a904
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/bigbytes.go
@@ -0,0 +1,164 @@
+package humanize
+
+import (
+	"fmt"
+	"math/big"
+	"strings"
+	"unicode"
+)
+
+var (
+	bigIECExp = big.NewInt(1024)
+
+	// BigByte is one byte in bit.Ints
+	BigByte = big.NewInt(1)
+	// BigKiByte is 1,024 bytes in bit.Ints
+	BigKiByte = (&big.Int{}).Mul(BigByte, bigIECExp)
+	// BigMiByte is 1,024 k bytes in bit.Ints
+	BigMiByte = (&big.Int{}).Mul(BigKiByte, bigIECExp)
+	// BigGiByte is 1,024 m bytes in bit.Ints
+	BigGiByte = (&big.Int{}).Mul(BigMiByte, bigIECExp)
+	// BigTiByte is 1,024 g bytes in bit.Ints
+	BigTiByte = (&big.Int{}).Mul(BigGiByte, bigIECExp)
+	// BigPiByte is 1,024 t bytes in bit.Ints
+	BigPiByte = (&big.Int{}).Mul(BigTiByte, bigIECExp)
+	// BigEiByte is 1,024 p bytes in bit.Ints
+	BigEiByte = (&big.Int{}).Mul(BigPiByte, bigIECExp)
+	// BigZiByte is 1,024 e bytes in bit.Ints
+	BigZiByte = (&big.Int{}).Mul(BigEiByte, bigIECExp)
+	// BigYiByte is 1,024 z bytes in bit.Ints
+	BigYiByte = (&big.Int{}).Mul(BigZiByte, bigIECExp)
+)
+
+var (
+	bigSIExp = big.NewInt(1000)
+
+	// BigSIByte is one SI byte in big.Ints
+	BigSIByte = big.NewInt(1)
+	// BigKByte is 1,000 SI bytes in big.Ints
+	BigKByte = (&big.Int{}).Mul(BigSIByte, bigSIExp)
+	// BigMByte is 1,000 SI k bytes in big.Ints
+	BigMByte = (&big.Int{}).Mul(BigKByte, bigSIExp)
+	// BigGByte is 1,000 SI m bytes in big.Ints
+	BigGByte = (&big.Int{}).Mul(BigMByte, bigSIExp)
+	// BigTByte is 1,000 SI g bytes in big.Ints
+	BigTByte = (&big.Int{}).Mul(BigGByte, bigSIExp)
+	// BigPByte is 1,000 SI t bytes in big.Ints
+	BigPByte = (&big.Int{}).Mul(BigTByte, bigSIExp)
+	// BigEByte is 1,000 SI p bytes in big.Ints
+	BigEByte = (&big.Int{}).Mul(BigPByte, bigSIExp)
+	// BigZByte is 1,000 SI e bytes in big.Ints
+	BigZByte = (&big.Int{}).Mul(BigEByte, bigSIExp)
+	// BigYByte is 1,000 SI z bytes in big.Ints
+	BigYByte = (&big.Int{}).Mul(BigZByte, bigSIExp)
+)
+
+var bigBytesSizeTable = map[string]*big.Int{
+	"b":   BigByte,
+	"kib": BigKiByte,
+	"kb":  BigKByte,
+	"mib": BigMiByte,
+	"mb":  BigMByte,
+	"gib": BigGiByte,
+	"gb":  BigGByte,
+	"tib": BigTiByte,
+	"tb":  BigTByte,
+	"pib": BigPiByte,
+	"pb":  BigPByte,
+	"eib": BigEiByte,
+	"eb":  BigEByte,
+	"zib": BigZiByte,
+	"zb":  BigZByte,
+	"yib": BigYiByte,
+	"yb":  BigYByte,
+	// Without suffix
+	"":   BigByte,
+	"ki": BigKiByte,
+	"k":  BigKByte,
+	"mi": BigMiByte,
+	"m":  BigMByte,
+	"gi": BigGiByte,
+	"g":  BigGByte,
+	"ti": BigTiByte,
+	"t":  BigTByte,
+	"pi": BigPiByte,
+	"p":  BigPByte,
+	"ei": BigEiByte,
+	"e":  BigEByte,
+	"z":  BigZByte,
+	"zi": BigZiByte,
+	"y":  BigYByte,
+	"yi": BigYiByte,
+}
+
+var ten = big.NewInt(10)
+
+func humanateBigBytes(s, base *big.Int, sizes []string) string {
+	if s.Cmp(ten) < 0 {
+		return fmt.Sprintf("%dB", s)
+	}
+	c := (&big.Int{}).Set(s)
+	val, mag := oomm(c, base, len(sizes)-1)
+	suffix := sizes[mag]
+	f := "%.0f%s"
+	if val < 10 {
+		f = "%.1f%s"
+	}
+
+	return fmt.Sprintf(f, val, suffix)
+
+}
+
+// BigBytes produces a human readable representation of an SI size.
+//
+// See also: ParseBigBytes.
+//
+// BigBytes(82854982) -> 83MB
+func BigBytes(s *big.Int) string {
+	sizes := []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
+	return humanateBigBytes(s, bigSIExp, sizes)
+}
+
+// BigIBytes produces a human readable representation of an IEC size.
+//
+// See also: ParseBigBytes.
+//
+// BigIBytes(82854982) -> 79MiB
+func BigIBytes(s *big.Int) string {
+	sizes := []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"}
+	return humanateBigBytes(s, bigIECExp, sizes)
+}
+
+// ParseBigBytes parses a string representation of bytes into the number
+// of bytes it represents.
+//
+// See also: BigBytes, BigIBytes.
+//
+// ParseBigBytes("42MB") -> 42000000, nil
+// ParseBigBytes("42mib") -> 44040192, nil
+func ParseBigBytes(s string) (*big.Int, error) {
+	lastDigit := 0
+	for _, r := range s {
+		if !(unicode.IsDigit(r) || r == '.') {
+			break
+		}
+		lastDigit++
+	}
+
+	val := &big.Rat{}
+	_, err := fmt.Sscanf(s[:lastDigit], "%f", val)
+	if err != nil {
+		return nil, err
+	}
+
+	extra := strings.ToLower(strings.TrimSpace(s[lastDigit:]))
+	if m, ok := bigBytesSizeTable[extra]; ok {
+		mv := (&big.Rat{}).SetInt(m)
+		val.Mul(val, mv)
+		rv := &big.Int{}
+		rv.Div(val.Num(), val.Denom())
+		return rv, nil
+	}
+
+	return nil, fmt.Errorf("unhandled size name: %v", extra)
+}
diff --git a/vendor/github.com/dustin/go-humanize/bytes.go b/vendor/github.com/dustin/go-humanize/bytes.go
new file mode 100644
index 0000000000..b7a77b5296
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/bytes.go
@@ -0,0 +1,134 @@
+package humanize
+
+import (
+	"fmt"
+	"math"
+	"strconv"
+	"strings"
+	"unicode"
+)
+
+// IEC Sizes.
+// kibis of bits
+const (
+	Byte = 1 << (iota * 10)
+	KiByte
+	MiByte
+	GiByte
+	TiByte
+	PiByte
+	EiByte
+)
+
+// SI Sizes.
+const (
+	IByte = 1
+	KByte = IByte * 1000
+	MByte = KByte * 1000
+	GByte = MByte * 1000
+	TByte = GByte * 1000
+	PByte = TByte * 1000
+	EByte = PByte * 1000
+)
+
+var bytesSizeTable = map[string]uint64{
+	"b":   Byte,
+	"kib": KiByte,
+	"kb":  KByte,
+	"mib": MiByte,
+	"mb":  MByte,
+	"gib": GiByte,
+	"gb":  GByte,
+	"tib": TiByte,
+	"tb":  TByte,
+	"pib": PiByte,
+	"pb":  PByte,
+	"eib": EiByte,
+	"eb":  EByte,
+	// Without suffix
+	"":   Byte,
+	"ki": KiByte,
+	"k":  KByte,
+	"mi": MiByte,
+	"m":  MByte,
+	"gi": GiByte,
+	"g":  GByte,
+	"ti": TiByte,
+	"t":  TByte,
+	"pi": PiByte,
+	"p":  PByte,
+	"ei": EiByte,
+	"e":  EByte,
+}
+
+func logn(n, b float64) float64 {
+	return math.Log(n) / math.Log(b)
+}
+
+func humanateBytes(s uint64, base float64, sizes []string) string {
+	if s < 10 {
+		return fmt.Sprintf("%dB", s)
+	}
+	e := math.Floor(logn(float64(s), base))
+	suffix := sizes[int(e)]
+	val := math.Floor(float64(s)/math.Pow(base, e)*10+0.5) / 10
+	f := "%.0f%s"
+	if val < 10 {
+		f = "%.1f%s"
+	}
+
+	return fmt.Sprintf(f, val, suffix)
+}
+
+// Bytes produces a human readable representation of an SI size.
+//
+// See also: ParseBytes.
+//
+// Bytes(82854982) -> 83MB
+func Bytes(s uint64) string {
+	sizes := []string{"B", "kB", "MB", "GB", "TB", "PB", "EB"}
+	return humanateBytes(s, 1000, sizes)
+}
+
+// IBytes produces a human readable representation of an IEC size.
+//
+// See also: ParseBytes.
+//
+// IBytes(82854982) -> 79MiB
+func IBytes(s uint64) string {
+	sizes := []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"}
+	return humanateBytes(s, 1024, sizes)
+}
+
+// ParseBytes parses a string representation of bytes into the number
+// of bytes it represents.
+//
+// See Also: Bytes, IBytes.
+//
+// ParseBytes("42MB") -> 42000000, nil
+// ParseBytes("42mib") -> 44040192, nil
+func ParseBytes(s string) (uint64, error) {
+	lastDigit := 0
+	for _, r := range s {
+		if !(unicode.IsDigit(r) || r == '.') {
+			break
+		}
+		lastDigit++
+	}
+
+	f, err := strconv.ParseFloat(s[:lastDigit], 64)
+	if err != nil {
+		return 0, err
+	}
+
+	extra := strings.ToLower(strings.TrimSpace(s[lastDigit:]))
+	if m, ok := bytesSizeTable[extra]; ok {
+		f *= float64(m)
+		if f >= math.MaxUint64 {
+			return 0, fmt.Errorf("too large: %v", s)
+		}
+		return uint64(f), nil
+	}
+
+	return 0, fmt.Errorf("unhandled size name: %v", extra)
+}
diff --git a/vendor/github.com/dustin/go-humanize/comma.go b/vendor/github.com/dustin/go-humanize/comma.go
new file mode 100644
index 0000000000..b65ea6fa78
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/comma.go
@@ -0,0 +1,101 @@
+package humanize
+
+import (
+	"bytes"
+	"math/big"
+	"strconv"
+	"strings"
+)
+
+// Comma produces a string form of the given number in base 10 with
+// commas after every three orders of magnitude.
+//
+// e.g. Comma(834142) -> 834,142
+func Comma(v int64) string {
+	sign := ""
+	if v < 0 {
+		sign = "-"
+		v = 0 - v
+	}
+
+	parts := []string{"", "", "", "", "", "", ""}
+	j := len(parts) - 1
+
+	for v > 999 {
+		parts[j] = strconv.FormatInt(v%1000, 10)
+		switch len(parts[j]) {
+		case 2:
+			parts[j] = "0" + parts[j]
+		case 1:
+			parts[j] = "00" + parts[j]
+		}
+		v = v / 1000
+		j--
+	}
+	parts[j] = strconv.Itoa(int(v))
+	return sign + strings.Join(parts[j:], ",")
+}
+
+// Commaf produces a string form of the given number in base 10 with
+// commas after every three orders of magnitude.
+//
+// e.g. Comma(834142.32) -> 834,142.32
+func Commaf(v float64) string {
+	buf := &bytes.Buffer{}
+	if v < 0 {
+		buf.Write([]byte{'-'})
+		v = 0 - v
+	}
+
+	comma := []byte{','}
+
+	parts := strings.Split(strconv.FormatFloat(v, 'f', -1, 64), ".")
+	pos := 0
+	if len(parts[0])%3 != 0 {
+		pos += len(parts[0]) % 3
+		buf.WriteString(parts[0][:pos])
+		buf.Write(comma)
+	}
+	for ; pos < len(parts[0]); pos += 3 {
+		buf.WriteString(parts[0][pos : pos+3])
+		buf.Write(comma)
+	}
+	buf.Truncate(buf.Len() - 1)
+
+	if len(parts) > 1 {
+		buf.Write([]byte{'.'})
+		buf.WriteString(parts[1])
+	}
+	return buf.String()
+}
+
+// BigComma produces a string form of the given big.Int in base 10
+// with commas after every three orders of magnitude.
+func BigComma(b *big.Int) string {
+	sign := ""
+	if b.Sign() < 0 {
+		sign = "-"
+		b.Abs(b)
+	}
+
+	athousand := big.NewInt(1000)
+	c := (&big.Int{}).Set(b)
+	_, m := oom(c, athousand)
+	parts := make([]string, m+1)
+	j := len(parts) - 1
+
+	mod := &big.Int{}
+	for b.Cmp(athousand) >= 0 {
+		b.DivMod(b, athousand, mod)
+		parts[j] = strconv.FormatInt(mod.Int64(), 10)
+		switch len(parts[j]) {
+		case 2:
+			parts[j] = "0" + parts[j]
+		case 1:
+			parts[j] = "00" + parts[j]
+		}
+		j--
+	}
+	parts[j] = strconv.Itoa(int(b.Int64()))
+	return sign + strings.Join(parts[j:], ",")
+}
diff --git a/vendor/github.com/dustin/go-humanize/ftoa.go b/vendor/github.com/dustin/go-humanize/ftoa.go
new file mode 100644
index 0000000000..c76190b106
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/ftoa.go
@@ -0,0 +1,23 @@
+package humanize
+
+import "strconv"
+
+func stripTrailingZeros(s string) string {
+	offset := len(s) - 1
+	for offset > 0 {
+		if s[offset] == '.' {
+			offset--
+			break
+		}
+		if s[offset] != '0' {
+			break
+		}
+		offset--
+	}
+	return s[:offset+1]
+}
+
+// Ftoa converts a float to a string with no trailing zeros.
+func Ftoa(num float64) string {
+	return stripTrailingZeros(strconv.FormatFloat(num, 'f', 6, 64))
+}
diff --git a/vendor/github.com/dustin/go-humanize/humanize.go b/vendor/github.com/dustin/go-humanize/humanize.go
new file mode 100644
index 0000000000..a69540a06b
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/humanize.go
@@ -0,0 +1,8 @@
+/*
+Package humanize converts boring ugly numbers to human-friendly strings and back.
+
+Durations can be turned into strings such as "3 days ago", numbers
+representing sizes like 82854982 into useful strings like, "83MB" or
+"79MiB" (whichever you prefer).
+*/
+package humanize
diff --git a/vendor/github.com/dustin/go-humanize/number.go b/vendor/github.com/dustin/go-humanize/number.go
new file mode 100644
index 0000000000..32141348c8
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/number.go
@@ -0,0 +1,192 @@
+package humanize
+
+/*
+Slightly adapted from the source to fit go-humanize.
+
+Author: https://github.com/gorhill
+Source: https://gist.github.com/gorhill/5285193
+
+*/
+
+import (
+	"math"
+	"strconv"
+)
+
+var (
+	renderFloatPrecisionMultipliers = [...]float64{
+		1,
+		10,
+		100,
+		1000,
+		10000,
+		100000,
+		1000000,
+		10000000,
+		100000000,
+		1000000000,
+	}
+
+	renderFloatPrecisionRounders = [...]float64{
+		0.5,
+		0.05,
+		0.005,
+		0.0005,
+		0.00005,
+		0.000005,
+		0.0000005,
+		0.00000005,
+		0.000000005,
+		0.0000000005,
+	}
+)
+
+// FormatFloat produces a formatted number as string based on the following user-specified criteria:
+// * thousands separator
+// * decimal separator
+// * decimal precision
+//
+// Usage: s := RenderFloat(format, n)
+// The format parameter tells how to render the number n.
+//
+// See examples: http://play.golang.org/p/LXc1Ddm1lJ
+//
+// Examples of format strings, given n = 12345.6789:
+// "#,###.##" => "12,345.67"
+// "#,###." => "12,345"
+// "#,###" => "12345,678"
+// "#\u202F###,##" => "12 345,68"
+// "#.###,###### => 12.345,678900
+// "" (aka default format) => 12,345.67
+//
+// The highest precision allowed is 9 digits after the decimal symbol.
+// There is also a version for integer number, FormatInteger(),
+// which is convenient for calls within template.
+func FormatFloat(format string, n float64) string {
+	// Special cases:
+	//   NaN = "NaN"
+	//   +Inf = "+Infinity"
+	//   -Inf = "-Infinity"
+	if math.IsNaN(n) {
+		return "NaN"
+	}
+	if n > math.MaxFloat64 {
+		return "Infinity"
+	}
+	if n < -math.MaxFloat64 {
+		return "-Infinity"
+	}
+
+	// default format
+	precision := 2
+	decimalStr := "."
+	thousandStr := ","
+	positiveStr := ""
+	negativeStr := "-"
+
+	if len(format) > 0 {
+		format := []rune(format)
+
+		// If there is an explicit format directive,
+		// then default values are these:
+		precision = 9
+		thousandStr = ""
+
+		// collect indices of meaningful formatting directives
+		formatIndx := []int{}
+		for i, char := range format {
+			if char != '#' && char != '0' {
+				formatIndx = append(formatIndx, i)
+			}
+		}
+
+		if len(formatIndx) > 0 {
+			// Directive at index 0:
+			//   Must be a '+'
+			//   Raise an error if not the case
+			// index: 0123456789
+			//        +0.000,000
+			//        +000,000.0
+			//        +0000.00
+			//        +0000
+			if formatIndx[0] == 0 {
+				if format[formatIndx[0]] != '+' {
+					panic("RenderFloat(): invalid positive sign directive")
+				}
+				positiveStr = "+"
+				formatIndx = formatIndx[1:]
+			}
+
+			// Two directives:
+			//   First is thousands separator
+			//   Raise an error if not followed by 3-digit
+			// 0123456789
+			// 0.000,000
+			// 000,000.00
+			if len(formatIndx) == 2 {
+				if (formatIndx[1] - formatIndx[0]) != 4 {
+					panic("RenderFloat(): thousands separator directive must be followed by 3 digit-specifiers")
+				}
+				thousandStr = string(format[formatIndx[0]])
+				formatIndx = formatIndx[1:]
+			}
+
+			// One directive:
+			//   Directive is decimal separator
+			//   The number of digit-specifier following the separator indicates wanted precision
+			// 0123456789
+			// 0.00
+			// 000,0000
+			if len(formatIndx) == 1 {
+				decimalStr = string(format[formatIndx[0]])
+				precision = len(format) - formatIndx[0] - 1
+			}
+		}
+	}
+
+	// generate sign part
+	var signStr string
+	if n >= 0.000000001 {
+		signStr = positiveStr
+	} else if n <= -0.000000001 {
+		signStr = negativeStr
+		n = -n
+	} else {
+		signStr = ""
+		n = 0.0
+	}
+
+	// split number into integer and fractional parts
+	intf, fracf := math.Modf(n + renderFloatPrecisionRounders[precision])
+
+	// generate integer part string
+	intStr := strconv.Itoa(int(intf))
+
+	// add thousand separator if required
+	if len(thousandStr) > 0 {
+		for i := len(intStr); i > 3; {
+			i -= 3
+			intStr = intStr[:i] + thousandStr + intStr[i:]
+		}
+	}
+
+	// no fractional part, we can leave now
+	if precision == 0 {
+		return signStr + intStr
+	}
+
+	// generate fractional part
+	fracStr := strconv.Itoa(int(fracf * renderFloatPrecisionMultipliers[precision]))
+	// may need padding
+	if len(fracStr) < precision {
+		fracStr = "000000000000000"[:precision-len(fracStr)] + fracStr
+	}
+
+	return signStr + intStr + decimalStr + fracStr
+}
+
+// FormatInteger produces a formatted number as string.
+// See FormatFloat.
+func FormatInteger(format string, n int) string {
+	return FormatFloat(format, float64(n))
+}
diff --git a/vendor/github.com/dustin/go-humanize/ordinals.go b/vendor/github.com/dustin/go-humanize/ordinals.go
new file mode 100644
index 0000000000..43d88a8619
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/ordinals.go
@@ -0,0 +1,25 @@
+package humanize
+
+import "strconv"
+
+// Ordinal gives you the input number in a rank/ordinal format.
+//
+// Ordinal(3) -> 3rd
+func Ordinal(x int) string {
+	suffix := "th"
+	switch x % 10 {
+	case 1:
+		if x%100 != 11 {
+			suffix = "st"
+		}
+	case 2:
+		if x%100 != 12 {
+			suffix = "nd"
+		}
+	case 3:
+		if x%100 != 13 {
+			suffix = "rd"
+		}
+	}
+	return strconv.Itoa(x) + suffix
+}
diff --git a/vendor/github.com/dustin/go-humanize/si.go b/vendor/github.com/dustin/go-humanize/si.go
new file mode 100644
index 0000000000..dee8b765a0
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/si.go
@@ -0,0 +1,110 @@
+package humanize
+
+import (
+	"errors"
+	"math"
+	"regexp"
+	"strconv"
+)
+
+var siPrefixTable = map[float64]string{
+	-24: "y", // yocto
+	-21: "z", // zepto
+	-18: "a", // atto
+	-15: "f", // femto
+	-12: "p", // pico
+	-9:  "n", // nano
+	-6:  "µ", // micro
+	-3:  "m", // milli
+	0:   "",
+	3:   "k", // kilo
+	6:   "M", // mega
+	9:   "G", // giga
+	12:  "T", // tera
+	15:  "P", // peta
+	18:  "E", // exa
+	21:  "Z", // zetta
+	24:  "Y", // yotta
+}
+
+var revSIPrefixTable = revfmap(siPrefixTable)
+
+// revfmap reverses the map and precomputes the power multiplier
+func revfmap(in map[float64]string) map[string]float64 {
+	rv := map[string]float64{}
+	for k, v := range in {
+		rv[v] = math.Pow(10, k)
+	}
+	return rv
+}
+
+var riParseRegex *regexp.Regexp
+
+func init() {
+	ri := `^([0-9.]+)([`
+	for _, v := range siPrefixTable {
+		ri += v
+	}
+	ri += `]?)(.*)`
+
+	riParseRegex = regexp.MustCompile(ri)
+}
+
+// ComputeSI finds the most appropriate SI prefix for the given number
+// and returns the prefix along with the value adjusted to be within
+// that prefix.
+//
+// See also: SI, ParseSI.
+//
+// e.g. ComputeSI(2.2345e-12) -> (2.2345, "p")
+func ComputeSI(input float64) (float64, string) {
+	if input == 0 {
+		return 0, ""
+	}
+	exponent := math.Floor(logn(input, 10))
+	exponent = math.Floor(exponent/3) * 3
+
+	value := input / math.Pow(10, exponent)
+
+	// Handle special case where value is exactly 1000.0
+	// Should return 1M instead of 1000k
+	if value == 1000.0 {
+		exponent += 3
+		value = input / math.Pow(10, exponent)
+	}
+
+	prefix := siPrefixTable[exponent]
+	return value, prefix
+}
+
+// SI returns a string with default formatting.
+//
+// SI uses Ftoa to format float value, removing trailing zeros.
+//
+// See also: ComputeSI, ParseSI.
+//
+// e.g. SI(1000000, B) -> 1MB
+// e.g. SI(2.2345e-12, "F") -> 2.2345pF
+func SI(input float64, unit string) string {
+	value, prefix := ComputeSI(input)
+	return Ftoa(value) + prefix + unit
+}
+
+var errInvalid = errors.New("invalid input")
+
+// ParseSI parses an SI string back into the number and unit.
+//
+// See also: SI, ComputeSI.
+//
+// e.g. ParseSI(2.2345pF) -> (2.2345e-12, "F", nil)
+func ParseSI(input string) (float64, string, error) {
+	found := riParseRegex.FindStringSubmatch(input)
+	if len(found) != 4 {
+		return 0, "", errInvalid
+	}
+	mag := revSIPrefixTable[found[2]]
+	unit := found[3]
+
+	base, err := strconv.ParseFloat(found[1], 64)
+	return base * mag, unit, err
+}
diff --git a/vendor/github.com/dustin/go-humanize/times.go b/vendor/github.com/dustin/go-humanize/times.go
new file mode 100644
index 0000000000..592ebe1d62
--- /dev/null
+++ b/vendor/github.com/dustin/go-humanize/times.go
@@ -0,0 +1,91 @@
+package humanize
+
+import (
+	"fmt"
+	"math"
+	"sort"
+	"time"
+)
+
+// Seconds-based time units
+const (
+	Minute   = 60
+	Hour     = 60 * Minute
+	Day      = 24 * Hour
+	Week     = 7 * Day
+	Month    = 30 * Day
+	Year     = 12 * Month
+	LongTime = 37 * Year
+)
+
+// Time formats a time into a relative string.
+//
+// Time(someT) -> "3 weeks ago"
+func Time(then time.Time) string {
+	return RelTime(then, time.Now(), "ago", "from now")
+}
+
+var magnitudes = []struct {
+	d      int64
+	format string
+	divby  int64
+}{
+	{1, "now", 1},
+	{2, "1 second %s", 1},
+	{Minute, "%d seconds %s", 1},
+	{2 * Minute, "1 minute %s", 1},
+	{Hour, "%d minutes %s", Minute},
+	{2 * Hour, "1 hour %s", 1},
+	{Day, "%d hours %s", Hour},
+	{2 * Day, "1 day %s", 1},
+	{Week, "%d days %s", Day},
+	{2 * Week, "1 week %s", 1},
+	{Month, "%d weeks %s", Week},
+	{2 * Month, "1 month %s", 1},
+	{Year, "%d months %s", Month},
+	{18 * Month, "1 year %s", 1},
+	{2 * Year, "2 years %s", 1},
+	{LongTime, "%d years %s", Year},
+	{math.MaxInt64, "a long while %s", 1},
+}
+
+// RelTime formats a time into a relative string.
+//
+// It takes two times and two labels.  In addition to the generic time
+// delta string (e.g. 5 minutes), the labels are used applied so that
+// the label corresponding to the smaller time is applied.
+//
+// RelTime(timeInPast, timeInFuture, "earlier", "later") -> "3 weeks earlier"
+func RelTime(a, b time.Time, albl, blbl string) string {
+	lbl := albl
+	diff := b.Unix() - a.Unix()
+
+	after := a.After(b)
+	if after {
+		lbl = blbl
+		diff = a.Unix() - b.Unix()
+	}
+
+	n := sort.Search(len(magnitudes), func(i int) bool {
+		return magnitudes[i].d > diff
+	})
+
+	mag := magnitudes[n]
+	args := []interface{}{}
+	escaped := false
+	for _, ch := range mag.format {
+		if escaped {
+			switch ch {
+			case '%':
+			case 's':
+				args = append(args, lbl)
+			case 'd':
+				args = append(args, diff/mag.divby)
+			}
+			escaped = false
+		} else {
+			escaped = ch == '%'
+		}
+	}
+	return fmt.Sprintf(mag.format, args...)
+}
diff --git a/vendor/github.com/go-ini/ini/LICENSE b/vendor/github.com/go-ini/ini/LICENSE
new file mode 100644
index 0000000000..37ec93a14f
--- /dev/null
+++ b/vendor/github.com/go-ini/ini/LICENSE
@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/go-ini/ini/ini.go b/vendor/github.com/go-ini/ini/ini.go
new file mode 100644
index 0000000000..f186148aad
--- /dev/null
+++ b/vendor/github.com/go-ini/ini/ini.go
@@ -0,0 +1,465 @@
+// Copyright 2014 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// Package ini provides INI file read and write functionality in Go.
+package ini
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"regexp"
+	"runtime"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+)
+
+const (
+	// Name for default section. You can use this constant or the string literal.
+	// In most of cases, an empty string is all you need to access the section.
+	DEFAULT_SECTION = "DEFAULT"
+
+	// Maximum allowed depth when recursively substituing variable names.
+	_DEPTH_VALUES = 99
+	_VERSION      = "1.11.0"
+)
+
+// Version returns current package version literal.
+func Version() string {
+	return _VERSION
+}
+
+var (
+	// Delimiter to determine or compose a new line.
+	// This variable will be changed to "\r\n" automatically on Windows
+	// at package init time.
+	LineBreak = "\n"
+
+	// Variable regexp pattern: %(variable)s
+	varPattern = regexp.MustCompile(`%\(([^\)]+)\)s`)
+
+	// Indicate whether to align "=" sign with spaces to produce pretty output
+	// or reduce all possible spaces for compact format.
+	PrettyFormat = true
+
+	// Explicitly write DEFAULT section header
+	DefaultHeader = false
+)
+
+func init() {
+	if runtime.GOOS == "windows" {
+		LineBreak = "\r\n"
+	}
+}
+
+func inSlice(str string, s []string) bool {
+	for _, v := range s {
+		if str == v {
+			return true
+		}
+	}
+	return false
+}
+
+// dataSource is an interface that returns object which can be read and closed.
+type dataSource interface {
+	ReadCloser() (io.ReadCloser, error)
+}
+
+// sourceFile represents an object that contains content on the local file system.
+type sourceFile struct {
+	name string
+}
+
+func (s sourceFile) ReadCloser() (_ io.ReadCloser, err error) {
+	return os.Open(s.name)
+}
+
+type bytesReadCloser struct {
+	reader io.Reader
+}
+
+func (rc *bytesReadCloser) Read(p []byte) (n int, err error) {
+	return rc.reader.Read(p)
+}
+
+func (rc *bytesReadCloser) Close() error {
+	return nil
+}
+
+// sourceData represents an object that contains content in memory.
+type sourceData struct {
+	data []byte
+}
+
+func (s *sourceData) ReadCloser() (io.ReadCloser, error) {
+	return &bytesReadCloser{bytes.NewReader(s.data)}, nil
+}
+
+// File represents a combination of a or more INI file(s) in memory.
+type File struct {
+	// Should make things safe, but sometimes doesn't matter.
+	BlockMode bool
+	// Make sure data is safe in multiple goroutines.
+	lock sync.RWMutex
+
+	// Allow combination of multiple data sources.
+	dataSources []dataSource
+	// Actual data is stored here.
+	sections map[string]*Section
+
+	// To keep data in order.
+	sectionList []string
+
+	// Whether the parser should ignore nonexistent files or return error.
+	looseMode bool
+
+	NameMapper
+}
+
+// newFile initializes File object with given data sources.
+func newFile(dataSources []dataSource, looseMode bool) *File {
+	return &File{
+		BlockMode:   true,
+		dataSources: dataSources,
+		sections:    make(map[string]*Section),
+		sectionList: make([]string, 0, 10),
+		looseMode:   looseMode,
+	}
+}
+
+func parseDataSource(source interface{}) (dataSource, error) {
+	switch s := source.(type) {
+	case string:
+		return sourceFile{s}, nil
+	case []byte:
+		return &sourceData{s}, nil
+	default:
+		return nil, fmt.Errorf("error parsing data source: unknown type '%s'", s)
+	}
+}
+
+func loadSources(looseMode bool, source interface{}, others ...interface{}) (_ *File, err error) {
+	sources := make([]dataSource, len(others)+1)
+	sources[0], err = parseDataSource(source)
+	if err != nil {
+		return nil, err
+	}
+	for i := range others {
+		sources[i+1], err = parseDataSource(others[i])
+		if err != nil {
+			return nil, err
+		}
+	}
+	f := newFile(sources, looseMode)
+	if err = f.Reload(); err != nil {
+		return nil, err
+	}
+	return f, nil
+}
+
+// Load loads and parses from INI data sources.
+// Arguments can be mixed of file name with string type, or raw data in []byte.
+// It will return error if list contains nonexistent files.
+func Load(source interface{}, others ...interface{}) (*File, error) {
+	return loadSources(false, source, others...)
+}
+
+// LooseLoad has exactly same functionality as Load function
+// except it ignores nonexistent files instead of returning error.
+func LooseLoad(source interface{}, others ...interface{}) (*File, error) {
+	return loadSources(true, source, others...)
+}
+
+// Empty returns an empty file object.
+func Empty() *File {
+	// Ignore error here, we sure our data is good.
+	f, _ := Load([]byte(""))
+	return f
+}
+
+// NewSection creates a new section.
+func (f *File) NewSection(name string) (*Section, error) {
+	if len(name) == 0 {
+		return nil, errors.New("error creating new section: empty section name")
+	}
+
+	if f.BlockMode {
+		f.lock.Lock()
+		defer f.lock.Unlock()
+	}
+
+	if inSlice(name, f.sectionList) {
+		return f.sections[name], nil
+	}
+
+	f.sectionList = append(f.sectionList, name)
+	f.sections[name] = newSection(f, name)
+	return f.sections[name], nil
+}
+
+// NewSections creates a list of sections.
+func (f *File) NewSections(names ...string) (err error) {
+	for _, name := range names {
+		if _, err = f.NewSection(name); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// GetSection returns section by given name.
+func (f *File) GetSection(name string) (*Section, error) {
+	if len(name) == 0 {
+		name = DEFAULT_SECTION
+	}
+
+	if f.BlockMode {
+		f.lock.RLock()
+		defer f.lock.RUnlock()
+	}
+
+	sec := f.sections[name]
+	if sec == nil {
+		return nil, fmt.Errorf("section '%s' does not exist", name)
+	}
+	return sec, nil
+}
+
+// Section assumes named section exists and returns a zero-value when not.
+func (f *File) Section(name string) *Section {
+	sec, err := f.GetSection(name)
+	if err != nil {
+		// Note: It's OK here because the only possible error is empty section name,
+		// but if it's empty, this piece of code won't be executed.
+		sec, _ = f.NewSection(name)
+		return sec
+	}
+	return sec
+}
+
+// Section returns list of Section.
+func (f *File) Sections() []*Section {
+	sections := make([]*Section, len(f.sectionList))
+	for i := range f.sectionList {
+		sections[i] = f.Section(f.sectionList[i])
+	}
+	return sections
+}
+
+// SectionStrings returns list of section names.
+func (f *File) SectionStrings() []string {
+	list := make([]string, len(f.sectionList))
+	copy(list, f.sectionList)
+	return list
+}
+
+// DeleteSection deletes a section.
+func (f *File) DeleteSection(name string) {
+	if f.BlockMode {
+		f.lock.Lock()
+		defer f.lock.Unlock()
+	}
+
+	if len(name) == 0 {
+		name = DEFAULT_SECTION
+	}
+
+	for i, s := range f.sectionList {
+		if s == name {
+			f.sectionList = append(f.sectionList[:i], f.sectionList[i+1:]...)
+			delete(f.sections, name)
+			return
+		}
+	}
+}
+
+func (f *File) reload(s dataSource) error {
+	r, err := s.ReadCloser()
+	if err != nil {
+		return err
+	}
+	defer r.Close()
+
+	return f.parse(r)
+}
+
+// Reload reloads and parses all data sources.
+func (f *File) Reload() (err error) {
+	for _, s := range f.dataSources {
+		if err = f.reload(s); err != nil {
+			// In loose mode, we create an empty default section for nonexistent files.
+			if os.IsNotExist(err) && f.looseMode {
+				f.parse(bytes.NewBuffer(nil))
+				continue
+			}
+			return err
+		}
+	}
+	return nil
+}
+
+// Append appends one or more data sources and reloads automatically.
+func (f *File) Append(source interface{}, others ...interface{}) error {
+	ds, err := parseDataSource(source)
+	if err != nil {
+		return err
+	}
+	f.dataSources = append(f.dataSources, ds)
+	for _, s := range others {
+		ds, err = parseDataSource(s)
+		if err != nil {
+			return err
+		}
+		f.dataSources = append(f.dataSources, ds)
+	}
+	return f.Reload()
+}
+
+// WriteToIndent writes content into io.Writer with given indention.
+// If PrettyFormat has been set to be true,
+// it will align "=" sign with spaces under each section.
+func (f *File) WriteToIndent(w io.Writer, indent string) (n int64, err error) {
+	equalSign := "="
+	if PrettyFormat {
+		equalSign = " = "
+	}
+
+	// Use buffer to make sure target is safe until finish encoding.
+	buf := bytes.NewBuffer(nil)
+	for i, sname := range f.sectionList {
+		sec := f.Section(sname)
+		if len(sec.Comment) > 0 {
+			if sec.Comment[0] != '#' && sec.Comment[0] != ';' {
+				sec.Comment = "; " + sec.Comment
+			}
+			if _, err = buf.WriteString(sec.Comment + LineBreak); err != nil {
+				return 0, err
+			}
+		}
+
+		if i > 0 || DefaultHeader {
+			if _, err = buf.WriteString("[" + sname + "]" + LineBreak); err != nil {
+				return 0, err
+			}
+		} else {
+			// Write nothing if default section is empty
+			if len(sec.keyList) == 0 {
+				continue
+			}
+		}
+
+		// Count and generate alignment length and buffer spaces
+		alignLength := 0
+		if PrettyFormat {
+			for i := 0; i < len(sec.keyList); i++ {
+				if len(sec.keyList[i]) > alignLength {
+					alignLength = len(sec.keyList[i])
+				}
+			}
+		}
+		alignSpaces := bytes.Repeat([]byte(" "), alignLength)
+
+		for _, kname := range sec.keyList {
+			key := sec.Key(kname)
+			if len(key.Comment) > 0 {
+				if len(indent) > 0 && sname != DEFAULT_SECTION {
+					buf.WriteString(indent)
+				}
+				if key.Comment[0] != '#' && key.Comment[0] != ';' {
+					key.Comment = "; " + key.Comment
+				}
+				if _, err = buf.WriteString(key.Comment + LineBreak); err != nil {
+					return 0, err
+				}
+			}
+
+			if len(indent) > 0 && sname != DEFAULT_SECTION {
+				buf.WriteString(indent)
+			}
+
+			switch {
+			case key.isAutoIncr:
+				kname = "-"
+			case strings.ContainsAny(kname, "\"=:"):
+				kname = "`" + kname + "`"
+			case strings.Contains(kname, "`"):
+				kname = `"""` + kname + `"""`
+			}
+			if _, err = buf.WriteString(kname); err != nil {
+				return 0, err
+			}
+
+			// Write out alignment spaces before "=" sign
+			if PrettyFormat {
+				buf.Write(alignSpaces[:alignLength-len(kname)])
+			}
+
+			val := key.value
+			// In case key value contains "\n", "`", "\"", "#" or ";"
+			if strings.ContainsAny(val, "\n`") {
+				val = `"""` + val + `"""`
+			} else if strings.ContainsAny(val, "#;") {
+				val = "`" + val + "`"
+			}
+			if _, err = buf.WriteString(equalSign + val + LineBreak); err != nil {
+				return 0, err
+			}
+		}
+
+		// Put a line between sections
+		if _, err = buf.WriteString(LineBreak); err != nil {
+			return 0, err
+		}
+	}
+
+	return buf.WriteTo(w)
+}
+
+// WriteTo writes file content into io.Writer.
+func (f *File) WriteTo(w io.Writer) (int64, error) {
+	return f.WriteToIndent(w, "")
+}
+
+// SaveToIndent writes content to file system with given value indention.
+func (f *File) SaveToIndent(filename, indent string) error {
+	// Note: Because we are truncating with os.Create,
+	// 	so it's safer to save to a temporary file location and rename afte done.
+	tmpPath := filename + "." + strconv.Itoa(time.Now().Nanosecond()) + ".tmp"
+	defer os.Remove(tmpPath)
+
+	fw, err := os.Create(tmpPath)
+	if err != nil {
+		return err
+	}
+
+	if _, err = f.WriteToIndent(fw, indent); err != nil {
+		fw.Close()
+		return err
+	}
+	fw.Close()
+
+	// Remove old file and rename the new one.
+	os.Remove(filename)
+	return os.Rename(tmpPath, filename)
+}
+
+// SaveTo writes content to file system.
+func (f *File) SaveTo(filename string) error {
+	return f.SaveToIndent(filename, "")
+}
diff --git a/vendor/github.com/go-ini/ini/key.go b/vendor/github.com/go-ini/ini/key.go
new file mode 100644
index 0000000000..7cbccd38e6
--- /dev/null
+++ b/vendor/github.com/go-ini/ini/key.go
@@ -0,0 +1,616 @@
+// Copyright 2014 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package ini
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// Key represents a key under a section.
+type Key struct {
+	s          *Section
+	Comment    string
+	name       string
+	value      string
+	isAutoIncr bool
+}
+
+// Name returns name of key.
+func (k *Key) Name() string {
+	return k.name
+}
+
+// Value returns raw value of key for performance purpose.
+func (k *Key) Value() string {
+	return k.value
+}
+
+// String returns string representation of value.
+func (k *Key) String() string {
+	val := k.value
+	if strings.Index(val, "%") == -1 {
+		return val
+	}
+
+	for i := 0; i < _DEPTH_VALUES; i++ {
+		vr := varPattern.FindString(val)
+		if len(vr) == 0 {
+			break
+		}
+
+		// Take off leading '%(' and trailing ')s'.
+		noption := strings.TrimLeft(vr, "%(")
+		noption = strings.TrimRight(noption, ")s")
+
+		// Search in the same section.
+		nk, err := k.s.GetKey(noption)
+		if err != nil {
+			// Search again in default section.
+			nk, _ = k.s.f.Section("").GetKey(noption)
+		}
+
+		// Substitute by new value and take off leading '%(' and trailing ')s'.
+		val = strings.Replace(val, vr, nk.value, -1)
+	}
+	return val
+}
+
+// Validate accepts a validate function which can
+// return modifed result as key value.
+func (k *Key) Validate(fn func(string) string) string {
+	return fn(k.String())
+}
+
+// parseBool returns the boolean value represented by the string.
+//
+// It accepts 1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On,
+// 0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off.
+// Any other value returns an error.
+func parseBool(str string) (value bool, err error) {
+	switch str {
+	case "1", "t", "T", "true", "TRUE", "True", "YES", "yes", "Yes", "y", "ON", "on", "On":
+		return true, nil
+	case "0", "f", "F", "false", "FALSE", "False", "NO", "no", "No", "n", "OFF", "off", "Off":
+		return false, nil
+	}
+	return false, fmt.Errorf("parsing \"%s\": invalid syntax", str)
+}
+
+// Bool returns bool type value.
+func (k *Key) Bool() (bool, error) {
+	return parseBool(k.String())
+}
+
+// Float64 returns float64 type value.
+func (k *Key) Float64() (float64, error) {
+	return strconv.ParseFloat(k.String(), 64)
+}
+
+// Int returns int type value.
+func (k *Key) Int() (int, error) {
+	return strconv.Atoi(k.String())
+}
+
+// Int64 returns int64 type value.
+func (k *Key) Int64() (int64, error) {
+	return strconv.ParseInt(k.String(), 10, 64)
+}
+
+// Uint returns uint type valued.
+func (k *Key) Uint() (uint, error) {
+	u, e := strconv.ParseUint(k.String(), 10, 64)
+	return uint(u), e
+}
+
+// Uint64 returns uint64 type value.
+func (k *Key) Uint64() (uint64, error) {
+	return strconv.ParseUint(k.String(), 10, 64)
+}
+
+// Duration returns time.Duration type value.
+func (k *Key) Duration() (time.Duration, error) {
+	return time.ParseDuration(k.String())
+}
+
+// TimeFormat parses with given format and returns time.Time type value.
+func (k *Key) TimeFormat(format string) (time.Time, error) {
+	return time.Parse(format, k.String())
+}
+
+// Time parses with RFC3339 format and returns time.Time type value.
+func (k *Key) Time() (time.Time, error) {
+	return k.TimeFormat(time.RFC3339)
+}
+
+// MustString returns default value if key value is empty.
+func (k *Key) MustString(defaultVal string) string {
+	val := k.String()
+	if len(val) == 0 {
+		return defaultVal
+	}
+	return val
+}
+
+// MustBool always returns value without error,
+// it returns false if error occurs.
+func (k *Key) MustBool(defaultVal ...bool) bool {
+	val, err := k.Bool()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustFloat64 always returns value without error,
+// it returns 0.0 if error occurs.
+func (k *Key) MustFloat64(defaultVal ...float64) float64 {
+	val, err := k.Float64()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustInt always returns value without error,
+// it returns 0 if error occurs.
+func (k *Key) MustInt(defaultVal ...int) int {
+	val, err := k.Int()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustInt64 always returns value without error,
+// it returns 0 if error occurs.
+func (k *Key) MustInt64(defaultVal ...int64) int64 {
+	val, err := k.Int64()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustUint always returns value without error,
+// it returns 0 if error occurs.
+func (k *Key) MustUint(defaultVal ...uint) uint {
+	val, err := k.Uint()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustUint64 always returns value without error,
+// it returns 0 if error occurs.
+func (k *Key) MustUint64(defaultVal ...uint64) uint64 {
+	val, err := k.Uint64()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustDuration always returns value without error,
+// it returns zero value if error occurs.
+func (k *Key) MustDuration(defaultVal ...time.Duration) time.Duration {
+	val, err := k.Duration()
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustTimeFormat always parses with given format and returns value without error,
+// it returns zero value if error occurs.
+func (k *Key) MustTimeFormat(format string, defaultVal ...time.Time) time.Time {
+	val, err := k.TimeFormat(format)
+	if len(defaultVal) > 0 && err != nil {
+		return defaultVal[0]
+	}
+	return val
+}
+
+// MustTime always parses with RFC3339 format and returns value without error,
+// it returns zero value if error occurs.
+func (k *Key) MustTime(defaultVal ...time.Time) time.Time {
+	return k.MustTimeFormat(time.RFC3339, defaultVal...)
+}
+
+// In always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) In(defaultVal string, candidates []string) string {
+	val := k.String()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InFloat64 always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InFloat64(defaultVal float64, candidates []float64) float64 {
+	val := k.MustFloat64()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InInt always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InInt(defaultVal int, candidates []int) int {
+	val := k.MustInt()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InInt64 always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InInt64(defaultVal int64, candidates []int64) int64 {
+	val := k.MustInt64()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InUint always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InUint(defaultVal uint, candidates []uint) uint {
+	val := k.MustUint()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InUint64 always returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InUint64(defaultVal uint64, candidates []uint64) uint64 {
+	val := k.MustUint64()
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InTimeFormat always parses with given format and returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InTimeFormat(format string, defaultVal time.Time, candidates []time.Time) time.Time {
+	val := k.MustTimeFormat(format)
+	for _, cand := range candidates {
+		if val == cand {
+			return val
+		}
+	}
+	return defaultVal
+}
+
+// InTime always parses with RFC3339 format and returns value without error,
+// it returns default value if error occurs or doesn't fit into candidates.
+func (k *Key) InTime(defaultVal time.Time, candidates []time.Time) time.Time {
+	return k.InTimeFormat(time.RFC3339, defaultVal, candidates)
+}
+
+// RangeFloat64 checks if value is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeFloat64(defaultVal, min, max float64) float64 {
+	val := k.MustFloat64()
+	if val < min || val > max {
+		return defaultVal
+	}
+	return val
+}
+
+// RangeInt checks if value is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeInt(defaultVal, min, max int) int {
+	val := k.MustInt()
+	if val < min || val > max {
+		return defaultVal
+	}
+	return val
+}
+
+// RangeInt64 checks if value is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeInt64(defaultVal, min, max int64) int64 {
+	val := k.MustInt64()
+	if val < min || val > max {
+		return defaultVal
+	}
+	return val
+}
+
+// RangeTimeFormat checks if value with given format is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeTimeFormat(format string, defaultVal, min, max time.Time) time.Time {
+	val := k.MustTimeFormat(format)
+	if val.Unix() < min.Unix() || val.Unix() > max.Unix() {
+		return defaultVal
+	}
+	return val
+}
+
+// RangeTime checks if value with RFC3339 format is in given range inclusively,
+// and returns default value if it's not.
+func (k *Key) RangeTime(defaultVal, min, max time.Time) time.Time {
+	return k.RangeTimeFormat(time.RFC3339, defaultVal, min, max)
+}
+
+// Strings returns list of string divided by given delimiter.
+func (k *Key) Strings(delim string) []string {
+	str := k.String()
+	if len(str) == 0 {
+		return []string{}
+	}
+
+	vals := strings.Split(str, delim)
+	for i := range vals {
+		vals[i] = strings.TrimSpace(vals[i])
+	}
+	return vals
+}
+
+// Float64s returns list of float64 divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Float64s(delim string) []float64 {
+	vals, _ := k.getFloat64s(delim, true, false)
+	return vals
+}
+
+// Ints returns list of int divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Ints(delim string) []int {
+	vals, _ := k.getInts(delim, true, false)
+	return vals
+}
+
+// Int64s returns list of int64 divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Int64s(delim string) []int64 {
+	vals, _ := k.getInt64s(delim, true, false)
+	return vals
+}
+
+// Uints returns list of uint divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Uints(delim string) []uint {
+	vals, _ := k.getUints(delim, true, false)
+	return vals
+}
+
+// Uint64s returns list of uint64 divided by given delimiter. Any invalid input will be treated as zero value.
+func (k *Key) Uint64s(delim string) []uint64 {
+	vals, _ := k.getUint64s(delim, true, false)
+	return vals
+}
+
+// TimesFormat parses with given format and returns list of time.Time divided by given delimiter.
+// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
+func (k *Key) TimesFormat(format, delim string) []time.Time {
+	vals, _ := k.getTimesFormat(format, delim, true, false)
+	return vals
+}
+
+// Times parses with RFC3339 format and returns list of time.Time divided by given delimiter.
+// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
+func (k *Key) Times(delim string) []time.Time {
+	return k.TimesFormat(time.RFC3339, delim)
+}
+
+// ValidFloat64s returns list of float64 divided by given delimiter. If some value is not float, then
+// it will not be included to result list.
+func (k *Key) ValidFloat64s(delim string) []float64 {
+	vals, _ := k.getFloat64s(delim, false, false)
+	return vals
+}
+
+// ValidInts returns list of int divided by given delimiter. If some value is not integer, then it will
+// not be included to result list.
+func (k *Key) ValidInts(delim string) []int {
+	vals, _ := k.getInts(delim, false, false)
+	return vals
+}
+
+// ValidInt64s returns list of int64 divided by given delimiter. If some value is not 64-bit integer,
+// then it will not be included to result list.
+func (k *Key) ValidInt64s(delim string) []int64 {
+	vals, _ := k.getInt64s(delim, false, false)
+	return vals
+}
+
+// ValidUints returns list of uint divided by given delimiter. If some value is not unsigned integer,
+// then it will not be included to result list.
+func (k *Key) ValidUints(delim string) []uint {
+	vals, _ := k.getUints(delim, false, false)
+	return vals
+}
+
+// ValidUint64s returns list of uint64 divided by given delimiter. If some value is not 64-bit unsigned
+// integer, then it will not be included to result list.
+func (k *Key) ValidUint64s(delim string) []uint64 {
+	vals, _ := k.getUint64s(delim, false, false)
+	return vals
+}
+
+// ValidTimesFormat parses with given format and returns list of time.Time divided by given delimiter.
+func (k *Key) ValidTimesFormat(format, delim string) []time.Time {
+	vals, _ := k.getTimesFormat(format, delim, false, false)
+	return vals
+}
+
+// ValidTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter.
+func (k *Key) ValidTimes(delim string) []time.Time {
+	return k.ValidTimesFormat(time.RFC3339, delim)
+}
+
+// StrictFloat64s returns list of float64 divided by given delimiter or error on first invalid input.
+func (k *Key) StrictFloat64s(delim string) ([]float64, error) {
+	return k.getFloat64s(delim, false, true)
+}
+
+// StrictInts returns list of int divided by given delimiter or error on first invalid input.
+func (k *Key) StrictInts(delim string) ([]int, error) {
+	return k.getInts(delim, false, true)
+}
+
+// StrictInt64s returns list of int64 divided by given delimiter or error on first invalid input.
+func (k *Key) StrictInt64s(delim string) ([]int64, error) {
+	return k.getInt64s(delim, false, true)
+}
+
+// StrictUints returns list of uint divided by given delimiter or error on first invalid input.
+func (k *Key) StrictUints(delim string) ([]uint, error) {
+	return k.getUints(delim, false, true)
+}
+
+// StrictUint64s returns list of uint64 divided by given delimiter or error on first invalid input.
+func (k *Key) StrictUint64s(delim string) ([]uint64, error) {
+	return k.getUint64s(delim, false, true)
+}
+
+// StrictTimesFormat parses with given format and returns list of time.Time divided by given delimiter
+// or error on first invalid input.
+func (k *Key) StrictTimesFormat(format, delim string) ([]time.Time, error) {
+	return k.getTimesFormat(format, delim, false, true)
+}
+
+// StrictTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter
+// or error on first invalid input.
+func (k *Key) StrictTimes(delim string) ([]time.Time, error) {
+	return k.StrictTimesFormat(time.RFC3339, delim)
+}
+
+// getFloat64s returns list of float64 divided by given delimiter.
+func (k *Key) getFloat64s(delim string, addInvalid, returnOnInvalid bool) ([]float64, error) {
+	strs := k.Strings(delim)
+	vals := make([]float64, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.ParseFloat(str, 64)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// getInts returns list of int divided by given delimiter.
+func (k *Key) getInts(delim string, addInvalid, returnOnInvalid bool) ([]int, error) {
+	strs := k.Strings(delim)
+	vals := make([]int, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.Atoi(str)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// getInt64s returns list of int64 divided by given delimiter.
+func (k *Key) getInt64s(delim string, addInvalid, returnOnInvalid bool) ([]int64, error) {
+	strs := k.Strings(delim)
+	vals := make([]int64, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.ParseInt(str, 10, 64)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// getUints returns list of uint divided by given delimiter.
+func (k *Key) getUints(delim string, addInvalid, returnOnInvalid bool) ([]uint, error) {
+	strs := k.Strings(delim)
+	vals := make([]uint, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.ParseUint(str, 10, 0)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, uint(val))
+		}
+	}
+	return vals, nil
+}
+
+// getUint64s returns list of uint64 divided by given delimiter.
+func (k *Key) getUint64s(delim string, addInvalid, returnOnInvalid bool) ([]uint64, error) {
+	strs := k.Strings(delim)
+	vals := make([]uint64, 0, len(strs))
+	for _, str := range strs {
+		val, err := strconv.ParseUint(str, 10, 64)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// getTimesFormat parses with given format and returns list of time.Time divided by given delimiter.
+func (k *Key) getTimesFormat(format, delim string, addInvalid, returnOnInvalid bool) ([]time.Time, error) {
+	strs := k.Strings(delim)
+	vals := make([]time.Time, 0, len(strs))
+	for _, str := range strs {
+		val, err := time.Parse(format, str)
+		if err != nil && returnOnInvalid {
+			return nil, err
+		}
+		if err == nil || addInvalid {
+			vals = append(vals, val)
+		}
+	}
+	return vals, nil
+}
+
+// SetValue changes key value.
+func (k *Key) SetValue(v string) {
+	if k.s.f.BlockMode {
+		k.s.f.lock.Lock()
+		defer k.s.f.lock.Unlock()
+	}
+
+	k.value = v
+	k.s.keysHash[k.name] = v
+}
diff --git a/vendor/github.com/go-ini/ini/parser.go b/vendor/github.com/go-ini/ini/parser.go
new file mode 100644
index 0000000000..1c1bf91f0e
--- /dev/null
+++ b/vendor/github.com/go-ini/ini/parser.go
@@ -0,0 +1,312 @@
+// Copyright 2015 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package ini
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"io"
+	"strconv"
+	"strings"
+	"unicode"
+)
+
+type tokenType int
+
+const (
+	_TOKEN_INVALID tokenType = iota
+	_TOKEN_COMMENT
+	_TOKEN_SECTION
+	_TOKEN_KEY
+)
+
+type parser struct {
+	buf     *bufio.Reader
+	isEOF   bool
+	count   int
+	comment *bytes.Buffer
+}
+
+func newParser(r io.Reader) *parser {
+	return &parser{
+		buf:     bufio.NewReader(r),
+		count:   1,
+		comment: &bytes.Buffer{},
+	}
+}
+
+// BOM handles header of BOM-UTF8 format.
+// http://en.wikipedia.org/wiki/Byte_order_mark#Representations_of_byte_order_marks_by_encoding
+func (p *parser) BOM() error {
+	mask, err := p.buf.Peek(3)
+	if err != nil && err != io.EOF {
+		return err
+	} else if len(mask) < 3 {
+		return nil
+	} else if mask[0] == 239 && mask[1] == 187 && mask[2] == 191 {
+		p.buf.Read(mask)
+	}
+	return nil
+}
+
+func (p *parser) readUntil(delim byte) ([]byte, error) {
+	data, err := p.buf.ReadBytes(delim)
+	if err != nil {
+		if err == io.EOF {
+			p.isEOF = true
+		} else {
+			return nil, err
+		}
+	}
+	return data, nil
+}
+
+func cleanComment(in []byte) ([]byte, bool) {
+	i := bytes.IndexAny(in, "#;")
+	if i == -1 {
+		return nil, false
+	}
+	return in[i:], true
+}
+
+func readKeyName(in []byte) (string, int, error) {
+	line := string(in)
+
+	// Check if key name surrounded by quotes.
+	var keyQuote string
+	if line[0] == '"' {
+		if len(line) > 6 && string(line[0:3]) == `"""` {
+			keyQuote = `"""`
+		} else {
+			keyQuote = `"`
+		}
+	} else if line[0] == '`' {
+		keyQuote = "`"
+	}
+
+	// Get out key name
+	endIdx := -1
+	if len(keyQuote) > 0 {
+		startIdx := len(keyQuote)
+		// FIXME: fail case -> """"""name"""=value
+		pos := strings.Index(line[startIdx:], keyQuote)
+		if pos == -1 {
+			return "", -1, fmt.Errorf("missing closing key quote: %s", line)
+		}
+		pos += startIdx
+
+		// Find key-value delimiter
+		i := strings.IndexAny(line[pos+startIdx:], "=:")
+		if i < 0 {
+			return "", -1, fmt.Errorf("key-value delimiter not found: %s", line)
+		}
+		endIdx = pos + i
+		return strings.TrimSpace(line[startIdx:pos]), endIdx + startIdx + 1, nil
+	}
+
+	endIdx = strings.IndexAny(line, "=:")
+	if endIdx < 0 {
+		return "", -1, fmt.Errorf("key-value delimiter not found: %s", line)
+	}
+	return strings.TrimSpace(line[0:endIdx]), endIdx + 1, nil
+}
+
+func (p *parser) readMultilines(line, val, valQuote string) (string, error) {
+	for {
+		data, err := p.readUntil('\n')
+		if err != nil {
+			return "", err
+		}
+		next := string(data)
+
+		pos := strings.LastIndex(next, valQuote)
+		if pos > -1 {
+			val += next[:pos]
+
+			comment, has := cleanComment([]byte(next[pos:]))
+			if has {
+				p.comment.Write(bytes.TrimSpace(comment))
+			}
+			break
+		}
+		val += next
+		if p.isEOF {
+			return "", fmt.Errorf("missing closing key quote from '%s' to '%s'", line, next)
+		}
+	}
+	return val, nil
+}
+
+func (p *parser) readContinuationLines(val string) (string, error) {
+	for {
+		data, err := p.readUntil('\n')
+		if err != nil {
+			return "", err
+		}
+		next := strings.TrimSpace(string(data))
+
+		if len(next) == 0 {
+			break
+		}
+		val += next
+		if val[len(val)-1] != '\\' {
+			break
+		}
+		val = val[:len(val)-1]
+	}
+	return val, nil
+}
+
+// hasSurroundedQuote check if and only if the first and last characters
+// are quotes \" or \'.
+// It returns false if any other parts also contain same kind of quotes.
+func hasSurroundedQuote(in string, quote byte) bool {
+	return len(in) > 2 && in[0] == quote && in[len(in)-1] == quote &&
+		strings.IndexByte(in[1:], quote) == len(in)-2
+}
+
+func (p *parser) readValue(in []byte) (string, error) {
+	line := strings.TrimLeftFunc(string(in), unicode.IsSpace)
+	if len(line) == 0 {
+		return "", nil
+	}
+
+	var valQuote string
+	if len(line) > 3 && string(line[0:3]) == `"""` {
+		valQuote = `"""`
+	} else if line[0] == '`' {
+		valQuote = "`"
+	}
+
+	if len(valQuote) > 0 {
+		startIdx := len(valQuote)
+		pos := strings.LastIndex(line[startIdx:], valQuote)
+		// Check for multi-line value
+		if pos == -1 {
+			return p.readMultilines(line, line[startIdx:], valQuote)
+		}
+
+		return line[startIdx : pos+startIdx], nil
+	}
+
+	// Won't be able to reach here if value only contains whitespace.
+	line = strings.TrimSpace(line)
+
+	// Check continuation lines
+	if line[len(line)-1] == '\\' {
+		return p.readContinuationLines(line[:len(line)-1])
+	}
+
+	i := strings.IndexAny(line, "#;")
+	if i > -1 {
+		p.comment.WriteString(line[i:])
+		line = strings.TrimSpace(line[:i])
+	}
+
+	// Trim single quotes
+	if hasSurroundedQuote(line, '\'') ||
+		hasSurroundedQuote(line, '"') {
+		line = line[1 : len(line)-1]
+	}
+	return line, nil
+}
+
+// parse parses data through an io.Reader.
+func (f *File) parse(reader io.Reader) (err error) {
+	p := newParser(reader)
+	if err = p.BOM(); err != nil {
+		return fmt.Errorf("BOM: %v", err)
+	}
+
+	// Ignore error because default section name is never empty string.
+	section, _ := f.NewSection(DEFAULT_SECTION)
+
+	var line []byte
+	for !p.isEOF {
+		line, err = p.readUntil('\n')
+		if err != nil {
+			return err
+		}
+
+		line = bytes.TrimLeftFunc(line, unicode.IsSpace)
+		if len(line) == 0 {
+			continue
+		}
+
+		// Comments
+		if line[0] == '#' || line[0] == ';' {
+			// Note: we do not care ending line break,
+			// it is needed for adding second line,
+			// so just clean it once at the end when set to value.
+			p.comment.Write(line)
+			continue
+		}
+
+		// Section
+		if line[0] == '[' {
+			// Read to the next ']' (TODO: support quoted strings)
+			closeIdx := bytes.IndexByte(line, ']')
+			if closeIdx == -1 {
+				return fmt.Errorf("unclosed section: %s", line)
+			}
+
+			section, err = f.NewSection(string(line[1:closeIdx]))
+			if err != nil {
+				return err
+			}
+
+			comment, has := cleanComment(line[closeIdx+1:])
+			if has {
+				p.comment.Write(comment)
+			}
+
+			section.Comment = strings.TrimSpace(p.comment.String())
+
+			// Reset aotu-counter and comments
+			p.comment.Reset()
+			p.count = 1
+			continue
+		}
+
+		kname, offset, err := readKeyName(line)
+		if err != nil {
+			return err
+		}
+
+		// Auto increment.
+		isAutoIncr := false
+		if kname == "-" {
+			isAutoIncr = true
+			kname = "#" + strconv.Itoa(p.count)
+			p.count++
+		}
+
+		key, err := section.NewKey(kname, "")
+		if err != nil {
+			return err
+		}
+		key.isAutoIncr = isAutoIncr
+
+		value, err := p.readValue(line[offset:])
+		if err != nil {
+			return err
+		}
+		key.SetValue(value)
+		key.Comment = strings.TrimSpace(p.comment.String())
+		p.comment.Reset()
+	}
+	return nil
+}
diff --git a/vendor/github.com/go-ini/ini/section.go b/vendor/github.com/go-ini/ini/section.go
new file mode 100644
index 0000000000..ed8cbdb54a
--- /dev/null
+++ b/vendor/github.com/go-ini/ini/section.go
@@ -0,0 +1,177 @@
+// Copyright 2014 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package ini
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+)
+
+// Section represents a config section.
+type Section struct {
+	f        *File
+	Comment  string
+	name     string
+	keys     map[string]*Key
+	keyList  []string
+	keysHash map[string]string
+}
+
+func newSection(f *File, name string) *Section {
+	return &Section{f, "", name, make(map[string]*Key), make([]string, 0, 10), make(map[string]string)}
+}
+
+// Name returns name of Section.
+func (s *Section) Name() string {
+	return s.name
+}
+
+// NewKey creates a new key to given section.
+func (s *Section) NewKey(name, val string) (*Key, error) {
+	if len(name) == 0 {
+		return nil, errors.New("error creating new key: empty key name")
+	}
+
+	if s.f.BlockMode {
+		s.f.lock.Lock()
+		defer s.f.lock.Unlock()
+	}
+
+	if inSlice(name, s.keyList) {
+		s.keys[name].value = val
+		return s.keys[name], nil
+	}
+
+	s.keyList = append(s.keyList, name)
+	s.keys[name] = &Key{s, "", name, val, false}
+	s.keysHash[name] = val
+	return s.keys[name], nil
+}
+
+// GetKey returns key in section by given name.
+func (s *Section) GetKey(name string) (*Key, error) {
+	// FIXME: change to section level lock?
+	if s.f.BlockMode {
+		s.f.lock.RLock()
+	}
+	key := s.keys[name]
+	if s.f.BlockMode {
+		s.f.lock.RUnlock()
+	}
+
+	if key == nil {
+		// Check if it is a child-section.
+		sname := s.name
+		for {
+			if i := strings.LastIndex(sname, "."); i > -1 {
+				sname = sname[:i]
+				sec, err := s.f.GetSection(sname)
+				if err != nil {
+					continue
+				}
+				return sec.GetKey(name)
+			} else {
+				break
+			}
+		}
+		return nil, fmt.Errorf("error when getting key of section '%s': key '%s' not exists", s.name, name)
+	}
+	return key, nil
+}
+
+// HasKey returns true if section contains a key with given name.
+func (s *Section) HasKey(name string) bool {
+	key, _ := s.GetKey(name)
+	return key != nil
+}
+
+// Haskey is a backwards-compatible name for HasKey.
+func (s *Section) Haskey(name string) bool {
+	return s.HasKey(name)
+}
+
+// HasValue returns true if section contains given raw value.
+func (s *Section) HasValue(value string) bool {
+	if s.f.BlockMode {
+		s.f.lock.RLock()
+		defer s.f.lock.RUnlock()
+	}
+
+	for _, k := range s.keys {
+		if value == k.value {
+			return true
+		}
+	}
+	return false
+}
+
+// Key assumes named Key exists in section and returns a zero-value when not.
+func (s *Section) Key(name string) *Key {
+	key, err := s.GetKey(name)
+	if err != nil {
+		// It's OK here because the only possible error is empty key name,
+		// but if it's empty, this piece of code won't be executed.
+		key, _ = s.NewKey(name, "")
+		return key
+	}
+	return key
+}
+
+// Keys returns list of keys of section.
+func (s *Section) Keys() []*Key {
+	keys := make([]*Key, len(s.keyList))
+	for i := range s.keyList {
+		keys[i] = s.Key(s.keyList[i])
+	}
+	return keys
+}
+
+// KeyStrings returns list of key names of section.
+func (s *Section) KeyStrings() []string {
+	list := make([]string, len(s.keyList))
+	copy(list, s.keyList)
+	return list
+}
+
+// KeysHash returns keys hash consisting of names and values.
+func (s *Section) KeysHash() map[string]string {
+	if s.f.BlockMode {
+		s.f.lock.RLock()
+		defer s.f.lock.RUnlock()
+	}
+
+	hash := map[string]string{}
+	for key, value := range s.keysHash {
+		hash[key] = value
+	}
+	return hash
+}
+
+// DeleteKey deletes a key from section.
+func (s *Section) DeleteKey(name string) {
+	if s.f.BlockMode {
+		s.f.lock.Lock()
+		defer s.f.lock.Unlock()
+	}
+
+	for i, k := range s.keyList {
+		if k == name {
+			s.keyList = append(s.keyList[:i], s.keyList[i+1:]...)
+			delete(s.keys, name)
+			return
+		}
+	}
+}
diff --git a/vendor/github.com/go-ini/ini/struct.go b/vendor/github.com/go-ini/ini/struct.go
new file mode 100644
index 0000000000..3fb92c3962
--- /dev/null
+++ b/vendor/github.com/go-ini/ini/struct.go
@@ -0,0 +1,351 @@
+// Copyright 2014 Unknwon
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package ini
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"reflect"
+	"time"
+	"unicode"
+)
+
+// NameMapper represents a ini tag name mapper.
+type NameMapper func(string) string
+
+// Built-in name getters.
+var (
+	// AllCapsUnderscore converts to format ALL_CAPS_UNDERSCORE.
+	AllCapsUnderscore NameMapper = func(raw string) string {
+		newstr := make([]rune, 0, len(raw))
+		for i, chr := range raw {
+			if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
+				if i > 0 {
+					newstr = append(newstr, '_')
+				}
+			}
+			newstr = append(newstr, unicode.ToUpper(chr))
+		}
+		return string(newstr)
+	}
+	// TitleUnderscore converts to format title_underscore.
+	TitleUnderscore NameMapper = func(raw string) string {
+		newstr := make([]rune, 0, len(raw))
+		for i, chr := range raw {
+			if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
+				if i > 0 {
+					newstr = append(newstr, '_')
+				}
+				chr -= ('A' - 'a')
+			}
+			newstr = append(newstr, chr)
+		}
+		return string(newstr)
+	}
+)
+
+func (s *Section) parseFieldName(raw, actual string) string {
+	if len(actual) > 0 {
+		return actual
+	}
+	if s.f.NameMapper != nil {
+		return s.f.NameMapper(raw)
+	}
+	return raw
+}
+
+func parseDelim(actual string) string {
+	if len(actual) > 0 {
+		return actual
+	}
+	return ","
+}
+
+var reflectTime = reflect.TypeOf(time.Now()).Kind()
+
+// setWithProperType sets proper value to field based on its type,
+// but it does not return error for failing parsing,
+// because we want to use default value that is already assigned to strcut.
+func setWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string) error {
+	switch t.Kind() {
+	case reflect.String:
+		if len(key.String()) == 0 {
+			return nil
+		}
+		field.SetString(key.String())
+	case reflect.Bool:
+		boolVal, err := key.Bool()
+		if err != nil {
+			return nil
+		}
+		field.SetBool(boolVal)
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		durationVal, err := key.Duration()
+		// Skip zero value
+		if err == nil && int(durationVal) > 0 {
+			field.Set(reflect.ValueOf(durationVal))
+			return nil
+		}
+
+		intVal, err := key.Int64()
+		if err != nil || intVal == 0 {
+			return nil
+		}
+		field.SetInt(intVal)
+	//	byte is an alias for uint8, so supporting uint8 breaks support for byte
+	case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		durationVal, err := key.Duration()
+		if err == nil {
+			field.Set(reflect.ValueOf(durationVal))
+			return nil
+		}
+
+		uintVal, err := key.Uint64()
+		if err != nil {
+			return nil
+		}
+		field.SetUint(uintVal)
+
+	case reflect.Float64:
+		floatVal, err := key.Float64()
+		if err != nil {
+			return nil
+		}
+		field.SetFloat(floatVal)
+	case reflectTime:
+		timeVal, err := key.Time()
+		if err != nil {
+			return nil
+		}
+		field.Set(reflect.ValueOf(timeVal))
+	case reflect.Slice:
+		vals := key.Strings(delim)
+		numVals := len(vals)
+		if numVals == 0 {
+			return nil
+		}
+
+		sliceOf := field.Type().Elem().Kind()
+
+		var times []time.Time
+		if sliceOf == reflectTime {
+			times = key.Times(delim)
+		}
+
+		slice := reflect.MakeSlice(field.Type(), numVals, numVals)
+		for i := 0; i < numVals; i++ {
+			switch sliceOf {
+			case reflectTime:
+				slice.Index(i).Set(reflect.ValueOf(times[i]))
+			default:
+				slice.Index(i).Set(reflect.ValueOf(vals[i]))
+			}
+		}
+		field.Set(slice)
+	default:
+		return fmt.Errorf("unsupported type '%s'", t)
+	}
+	return nil
+}
+
+func (s *Section) mapTo(val reflect.Value) error {
+	if val.Kind() == reflect.Ptr {
+		val = val.Elem()
+	}
+	typ := val.Type()
+
+	for i := 0; i < typ.NumField(); i++ {
+		field := val.Field(i)
+		tpField := typ.Field(i)
+
+		tag := tpField.Tag.Get("ini")
+		if tag == "-" {
+			continue
+		}
+
+		fieldName := s.parseFieldName(tpField.Name, tag)
+		if len(fieldName) == 0 || !field.CanSet() {
+			continue
+		}
+
+		isAnonymous := tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous
+		isStruct := tpField.Type.Kind() == reflect.Struct
+		if isAnonymous {
+			field.Set(reflect.New(tpField.Type.Elem()))
+		}
+
+		if isAnonymous || isStruct {
+			if sec, err := s.f.GetSection(fieldName); err == nil {
+				if err = sec.mapTo(field); err != nil {
+					return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
+				}
+				continue
+			}
+		}
+
+		if key, err := s.GetKey(fieldName); err == nil {
+			if err = setWithProperType(tpField.Type, key, field, parseDelim(tpField.Tag.Get("delim"))); err != nil {
+				return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
+			}
+		}
+	}
+	return nil
+}
+
+// MapTo maps section to given struct.
+func (s *Section) MapTo(v interface{}) error {
+	typ := reflect.TypeOf(v)
+	val := reflect.ValueOf(v)
+	if typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+		val = val.Elem()
+	} else {
+		return errors.New("cannot map to non-pointer struct")
+	}
+
+	return s.mapTo(val)
+}
+
+// MapTo maps file to given struct.
+func (f *File) MapTo(v interface{}) error {
+	return f.Section("").MapTo(v)
+}
+
+// MapTo maps data sources to given struct with name mapper.
+func MapToWithMapper(v interface{}, mapper NameMapper, source interface{}, others ...interface{}) error {
+	cfg, err := Load(source, others...)
+	if err != nil {
+		return err
+	}
+	cfg.NameMapper = mapper
+	return cfg.MapTo(v)
+}
+
+// MapTo maps data sources to given struct.
+func MapTo(v, source interface{}, others ...interface{}) error {
+	return MapToWithMapper(v, nil, source, others...)
+}
+
+// reflectWithProperType does the opposite thing with setWithProperType.
+func reflectWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string) error {
+	switch t.Kind() {
+	case reflect.String:
+		key.SetValue(field.String())
+	case reflect.Bool,
+		reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
+		reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
+		reflect.Float64,
+		reflectTime:
+		key.SetValue(fmt.Sprint(field))
+	case reflect.Slice:
+		vals := field.Slice(0, field.Len())
+		if field.Len() == 0 {
+			return nil
+		}
+
+		var buf bytes.Buffer
+		isTime := fmt.Sprint(field.Type()) == "[]time.Time"
+		for i := 0; i < field.Len(); i++ {
+			if isTime {
+				buf.WriteString(vals.Index(i).Interface().(time.Time).Format(time.RFC3339))
+			} else {
+				buf.WriteString(fmt.Sprint(vals.Index(i)))
+			}
+			buf.WriteString(delim)
+		}
+		key.SetValue(buf.String()[:buf.Len()-1])
+	default:
+		return fmt.Errorf("unsupported type '%s'", t)
+	}
+	return nil
+}
+
+func (s *Section) reflectFrom(val reflect.Value) error {
+	if val.Kind() == reflect.Ptr {
+		val = val.Elem()
+	}
+	typ := val.Type()
+
+	for i := 0; i < typ.NumField(); i++ {
+		field := val.Field(i)
+		tpField := typ.Field(i)
+
+		tag := tpField.Tag.Get("ini")
+		if tag == "-" {
+			continue
+		}
+
+		fieldName := s.parseFieldName(tpField.Name, tag)
+		if len(fieldName) == 0 || !field.CanSet() {
+			continue
+		}
+
+		if (tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous) ||
+			(tpField.Type.Kind() == reflect.Struct) {
+			// Note: The only error here is section doesn't exist.
+			sec, err := s.f.GetSection(fieldName)
+			if err != nil {
+				// Note: fieldName can never be empty here, ignore error.
+				sec, _ = s.f.NewSection(fieldName)
+			}
+			if err = sec.reflectFrom(field); err != nil {
+				return fmt.Errorf("error reflecting field(%s): %v", fieldName, err)
+			}
+			continue
+		}
+
+		// Note: Same reason as secion.
+		key, err := s.GetKey(fieldName)
+		if err != nil {
+			key, _ = s.NewKey(fieldName, "")
+		}
+		if err = reflectWithProperType(tpField.Type, key, field, parseDelim(tpField.Tag.Get("delim"))); err != nil {
+			return fmt.Errorf("error reflecting field(%s): %v", fieldName, err)
+		}
+
+	}
+	return nil
+}
+
+// ReflectFrom reflects secion from given struct.
+func (s *Section) ReflectFrom(v interface{}) error {
+	typ := reflect.TypeOf(v)
+	val := reflect.ValueOf(v)
+	if typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+		val = val.Elem()
+	} else {
+		return errors.New("cannot reflect from non-pointer struct")
+	}
+
+	return s.reflectFrom(val)
+}
+
+// ReflectFrom reflects file from given struct.
+func (f *File) ReflectFrom(v interface{}) error {
+	return f.Section("").ReflectFrom(v)
+}
+
+// ReflectFrom reflects data sources from given struct with name mapper.
+func ReflectFromWithMapper(cfg *File, v interface{}, mapper NameMapper) error {
+	cfg.NameMapper = mapper
+	return cfg.ReflectFrom(v)
+}
+
+// ReflectFrom reflects data sources from given struct.
+func ReflectFrom(cfg *File, v interface{}) error {
+	return ReflectFromWithMapper(cfg, v, nil)
+}
diff --git a/vendor/github.com/go-ole/go-ole/com.go b/vendor/github.com/go-ole/go-ole/com.go
new file mode 100644
index 0000000000..f224fa069a
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/com.go
@@ -0,0 +1,329 @@
+// +build windows
+
+package ole
+
+import (
+	"errors"
+	"syscall"
+	"time"
+	"unicode/utf16"
+	"unsafe"
+)
+
+var (
+	procCoInitialize, _            = modole32.FindProc("CoInitialize")
+	procCoInitializeEx, _          = modole32.FindProc("CoInitializeEx")
+	procCoUninitialize, _          = modole32.FindProc("CoUninitialize")
+	procCoCreateInstance, _        = modole32.FindProc("CoCreateInstance")
+	procCoTaskMemFree, _           = modole32.FindProc("CoTaskMemFree")
+	procCLSIDFromProgID, _         = modole32.FindProc("CLSIDFromProgID")
+	procCLSIDFromString, _         = modole32.FindProc("CLSIDFromString")
+	procStringFromCLSID, _         = modole32.FindProc("StringFromCLSID")
+	procStringFromIID, _           = modole32.FindProc("StringFromIID")
+	procIIDFromString, _           = modole32.FindProc("IIDFromString")
+	procGetUserDefaultLCID, _      = modkernel32.FindProc("GetUserDefaultLCID")
+	procCopyMemory, _              = modkernel32.FindProc("RtlMoveMemory")
+	procVariantInit, _             = modoleaut32.FindProc("VariantInit")
+	procVariantClear, _            = modoleaut32.FindProc("VariantClear")
+	procVariantTimeToSystemTime, _ = modoleaut32.FindProc("VariantTimeToSystemTime")
+	procSysAllocString, _          = modoleaut32.FindProc("SysAllocString")
+	procSysAllocStringLen, _       = modoleaut32.FindProc("SysAllocStringLen")
+	procSysFreeString, _           = modoleaut32.FindProc("SysFreeString")
+	procSysStringLen, _            = modoleaut32.FindProc("SysStringLen")
+	procCreateDispTypeInfo, _      = modoleaut32.FindProc("CreateDispTypeInfo")
+	procCreateStdDispatch, _       = modoleaut32.FindProc("CreateStdDispatch")
+	procGetActiveObject, _         = modoleaut32.FindProc("GetActiveObject")
+
+	procGetMessageW, _      = moduser32.FindProc("GetMessageW")
+	procDispatchMessageW, _ = moduser32.FindProc("DispatchMessageW")
+)
+
+// coInitialize initializes COM library on current thread.
+//
+// MSDN documentation suggests that this function should not be called. Call
+// CoInitializeEx() instead. The reason has to do with threading and this
+// function is only for single-threaded apartments.
+//
+// That said, most users of the library have gotten away with just this
+// function. If you are experiencing threading issues, then use
+// CoInitializeEx().
+func coInitialize() (err error) {
+	// http://msdn.microsoft.com/en-us/library/windows/desktop/ms678543(v=vs.85).aspx
+	// Suggests that no value should be passed to CoInitialized.
+	// Could just be Call() since the parameter is optional. <-- Needs testing to be sure.
+	hr, _, _ := procCoInitialize.Call(uintptr(0))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// coInitializeEx initializes COM library with concurrency model.
+func coInitializeEx(coinit uint32) (err error) {
+	// http://msdn.microsoft.com/en-us/library/windows/desktop/ms695279(v=vs.85).aspx
+	// Suggests that the first parameter is not only optional but should always be NULL.
+	hr, _, _ := procCoInitializeEx.Call(uintptr(0), uintptr(coinit))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// CoInitialize initializes COM library on current thread.
+//
+// MSDN documentation suggests that this function should not be called. Call
+// CoInitializeEx() instead. The reason has to do with threading and this
+// function is only for single-threaded apartments.
+//
+// That said, most users of the library have gotten away with just this
+// function. If you are experiencing threading issues, then use
+// CoInitializeEx().
+func CoInitialize(p uintptr) (err error) {
+	// p is ignored and won't be used.
+	// Avoid any variable not used errors.
+	p = uintptr(0)
+	return coInitialize()
+}
+
+// CoInitializeEx initializes COM library with concurrency model.
+func CoInitializeEx(p uintptr, coinit uint32) (err error) {
+	// Avoid any variable not used errors.
+	p = uintptr(0)
+	return coInitializeEx(coinit)
+}
+
+// CoUninitialize uninitializes COM Library.
+func CoUninitialize() {
+	procCoUninitialize.Call()
+}
+
+// CoTaskMemFree frees memory pointer.
+func CoTaskMemFree(memptr uintptr) {
+	procCoTaskMemFree.Call(memptr)
+}
+
+// CLSIDFromProgID retrieves Class Identifier with the given Program Identifier.
+//
+// The Programmatic Identifier must be registered, because it will be looked up
+// in the Windows Registry. The registry entry has the following keys: CLSID,
+// Insertable, Protocol and Shell
+// (https://msdn.microsoft.com/en-us/library/dd542719(v=vs.85).aspx).
+//
+// programID identifies the class id with less precision and is not guaranteed
+// to be unique. These are usually found in the registry under
+// HKEY_LOCAL_MACHINE\SOFTWARE\Classes, usually with the format of
+// "Program.Component.Version" with version being optional.
+//
+// CLSIDFromProgID in Windows API.
+func CLSIDFromProgID(progId string) (clsid *GUID, err error) {
+	var guid GUID
+	lpszProgID := uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(progId)))
+	hr, _, _ := procCLSIDFromProgID.Call(lpszProgID, uintptr(unsafe.Pointer(&guid)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	clsid = &guid
+	return
+}
+
+// CLSIDFromString retrieves Class ID from string representation.
+//
+// This is technically the string version of the GUID and will convert the
+// string to object.
+//
+// CLSIDFromString in Windows API.
+func CLSIDFromString(str string) (clsid *GUID, err error) {
+	var guid GUID
+	lpsz := uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(str)))
+	hr, _, _ := procCLSIDFromString.Call(lpsz, uintptr(unsafe.Pointer(&guid)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	clsid = &guid
+	return
+}
+
+// StringFromCLSID returns GUID formated string from GUID object.
+func StringFromCLSID(clsid *GUID) (str string, err error) {
+	var p *uint16
+	hr, _, _ := procStringFromCLSID.Call(uintptr(unsafe.Pointer(clsid)), uintptr(unsafe.Pointer(&p)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	str = LpOleStrToString(p)
+	return
+}
+
+// IIDFromString returns GUID from program ID.
+func IIDFromString(progId string) (clsid *GUID, err error) {
+	var guid GUID
+	lpsz := uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(progId)))
+	hr, _, _ := procIIDFromString.Call(lpsz, uintptr(unsafe.Pointer(&guid)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	clsid = &guid
+	return
+}
+
+// StringFromIID returns GUID formatted string from GUID object.
+func StringFromIID(iid *GUID) (str string, err error) {
+	var p *uint16
+	hr, _, _ := procStringFromIID.Call(uintptr(unsafe.Pointer(iid)), uintptr(unsafe.Pointer(&p)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	str = LpOleStrToString(p)
+	return
+}
+
+// CreateInstance of single uninitialized object with GUID.
+func CreateInstance(clsid *GUID, iid *GUID) (unk *IUnknown, err error) {
+	if iid == nil {
+		iid = IID_IUnknown
+	}
+	hr, _, _ := procCoCreateInstance.Call(
+		uintptr(unsafe.Pointer(clsid)),
+		0,
+		CLSCTX_SERVER,
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(&unk)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// GetActiveObject retrieves pointer to active object.
+func GetActiveObject(clsid *GUID, iid *GUID) (unk *IUnknown, err error) {
+	if iid == nil {
+		iid = IID_IUnknown
+	}
+	hr, _, _ := procGetActiveObject.Call(
+		uintptr(unsafe.Pointer(clsid)),
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(&unk)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// VariantInit initializes variant.
+func VariantInit(v *VARIANT) (err error) {
+	hr, _, _ := procVariantInit.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// VariantClear clears value in Variant settings to VT_EMPTY.
+func VariantClear(v *VARIANT) (err error) {
+	hr, _, _ := procVariantClear.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// SysAllocString allocates memory for string and copies string into memory.
+func SysAllocString(v string) (ss *int16) {
+	pss, _, _ := procSysAllocString.Call(uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(v))))
+	ss = (*int16)(unsafe.Pointer(pss))
+	return
+}
+
+// SysAllocStringLen copies up to length of given string returning pointer.
+func SysAllocStringLen(v string) (ss *int16) {
+	utf16 := utf16.Encode([]rune(v + "\x00"))
+	ptr := &utf16[0]
+
+	pss, _, _ := procSysAllocStringLen.Call(uintptr(unsafe.Pointer(ptr)), uintptr(len(utf16)-1))
+	ss = (*int16)(unsafe.Pointer(pss))
+	return
+}
+
+// SysFreeString frees string system memory. This must be called with SysAllocString.
+func SysFreeString(v *int16) (err error) {
+	hr, _, _ := procSysFreeString.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// SysStringLen is the length of the system allocated string.
+func SysStringLen(v *int16) uint32 {
+	l, _, _ := procSysStringLen.Call(uintptr(unsafe.Pointer(v)))
+	return uint32(l)
+}
+
+// CreateStdDispatch provides default IDispatch implementation for IUnknown.
+//
+// This handles default IDispatch implementation for objects. It haves a few
+// limitations with only supporting one language. It will also only return
+// default exception codes.
+func CreateStdDispatch(unk *IUnknown, v uintptr, ptinfo *IUnknown) (disp *IDispatch, err error) {
+	hr, _, _ := procCreateStdDispatch.Call(
+		uintptr(unsafe.Pointer(unk)),
+		v,
+		uintptr(unsafe.Pointer(ptinfo)),
+		uintptr(unsafe.Pointer(&disp)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// CreateDispTypeInfo provides default ITypeInfo implementation for IDispatch.
+//
+// This will not handle the full implementation of the interface.
+func CreateDispTypeInfo(idata *INTERFACEDATA) (pptinfo *IUnknown, err error) {
+	hr, _, _ := procCreateDispTypeInfo.Call(
+		uintptr(unsafe.Pointer(idata)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(unsafe.Pointer(&pptinfo)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// copyMemory moves location of a block of memory.
+func copyMemory(dest unsafe.Pointer, src unsafe.Pointer, length uint32) {
+	procCopyMemory.Call(uintptr(dest), uintptr(src), uintptr(length))
+}
+
+// GetUserDefaultLCID retrieves current user default locale.
+func GetUserDefaultLCID() (lcid uint32) {
+	ret, _, _ := procGetUserDefaultLCID.Call()
+	lcid = uint32(ret)
+	return
+}
+
+// GetMessage in message queue from runtime.
+//
+// This function appears to block. PeekMessage does not block.
+func GetMessage(msg *Msg, hwnd uint32, MsgFilterMin uint32, MsgFilterMax uint32) (ret int32, err error) {
+	r0, _, err := procGetMessageW.Call(uintptr(unsafe.Pointer(msg)), uintptr(hwnd), uintptr(MsgFilterMin), uintptr(MsgFilterMax))
+	ret = int32(r0)
+	return
+}
+
+// DispatchMessage to window procedure.
+func DispatchMessage(msg *Msg) (ret int32) {
+	r0, _, _ := procDispatchMessageW.Call(uintptr(unsafe.Pointer(msg)))
+	ret = int32(r0)
+	return
+}
+
+// GetVariantDate converts COM Variant Time value to Go time.Time.
+func GetVariantDate(value float64) (time.Time, error) {
+	var st syscall.Systemtime
+	r, _, _ := procVariantTimeToSystemTime.Call(uintptr(unsafe.Pointer(&value)), uintptr(unsafe.Pointer(&st)))
+	if r != 0 {
+		return time.Date(int(st.Year), time.Month(st.Month), int(st.Day), int(st.Hour), int(st.Minute), int(st.Second), int(st.Milliseconds/1000), nil), nil
+	}
+	return time.Now(), errors.New("Could not convert to time, passing current time.")
+}
diff --git a/vendor/github.com/go-ole/go-ole/com_func.go b/vendor/github.com/go-ole/go-ole/com_func.go
new file mode 100644
index 0000000000..425aad3233
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/com_func.go
@@ -0,0 +1,174 @@
+// +build !windows
+
+package ole
+
+import (
+	"time"
+	"unsafe"
+)
+
+// coInitialize initializes COM library on current thread.
+//
+// MSDN documentation suggests that this function should not be called. Call
+// CoInitializeEx() instead. The reason has to do with threading and this
+// function is only for single-threaded apartments.
+//
+// That said, most users of the library have gotten away with just this
+// function. If you are experiencing threading issues, then use
+// CoInitializeEx().
+func coInitialize() error {
+	return NewError(E_NOTIMPL)
+}
+
+// coInitializeEx initializes COM library with concurrency model.
+func coInitializeEx(coinit uint32) error {
+	return NewError(E_NOTIMPL)
+}
+
+// CoInitialize initializes COM library on current thread.
+//
+// MSDN documentation suggests that this function should not be called. Call
+// CoInitializeEx() instead. The reason has to do with threading and this
+// function is only for single-threaded apartments.
+//
+// That said, most users of the library have gotten away with just this
+// function. If you are experiencing threading issues, then use
+// CoInitializeEx().
+func CoInitialize(p uintptr) error {
+	return NewError(E_NOTIMPL)
+}
+
+// CoInitializeEx initializes COM library with concurrency model.
+func CoInitializeEx(p uintptr, coinit uint32) error {
+	return NewError(E_NOTIMPL)
+}
+
+// CoUninitialize uninitializes COM Library.
+func CoUninitialize() {}
+
+// CoTaskMemFree frees memory pointer.
+func CoTaskMemFree(memptr uintptr) {}
+
+// CLSIDFromProgID retrieves Class Identifier with the given Program Identifier.
+//
+// The Programmatic Identifier must be registered, because it will be looked up
+// in the Windows Registry. The registry entry has the following keys: CLSID,
+// Insertable, Protocol and Shell
+// (https://msdn.microsoft.com/en-us/library/dd542719(v=vs.85).aspx).
+//
+// programID identifies the class id with less precision and is not guaranteed
+// to be unique. These are usually found in the registry under
+// HKEY_LOCAL_MACHINE\SOFTWARE\Classes, usually with the format of
+// "Program.Component.Version" with version being optional.
+//
+// CLSIDFromProgID in Windows API.
+func CLSIDFromProgID(progId string) (*GUID, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// CLSIDFromString retrieves Class ID from string representation.
+//
+// This is technically the string version of the GUID and will convert the
+// string to object.
+//
+// CLSIDFromString in Windows API.
+func CLSIDFromString(str string) (*GUID, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// StringFromCLSID returns GUID formated string from GUID object.
+func StringFromCLSID(clsid *GUID) (string, error) {
+	return "", NewError(E_NOTIMPL)
+}
+
+// IIDFromString returns GUID from program ID.
+func IIDFromString(progId string) (*GUID, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// StringFromIID returns GUID formatted string from GUID object.
+func StringFromIID(iid *GUID) (string, error) {
+	return "", NewError(E_NOTIMPL)
+}
+
+// CreateInstance of single uninitialized object with GUID.
+func CreateInstance(clsid *GUID, iid *GUID) (*IUnknown, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// GetActiveObject retrieves pointer to active object.
+func GetActiveObject(clsid *GUID, iid *GUID) (*IUnknown, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// VariantInit initializes variant.
+func VariantInit(v *VARIANT) error {
+	return NewError(E_NOTIMPL)
+}
+
+// VariantClear clears value in Variant settings to VT_EMPTY.
+func VariantClear(v *VARIANT) error {
+	return NewError(E_NOTIMPL)
+}
+
+// SysAllocString allocates memory for string and copies string into memory.
+func SysAllocString(v string) *int16 {
+	u := int16(0)
+	return &u
+}
+
+// SysAllocStringLen copies up to length of given string returning pointer.
+func SysAllocStringLen(v string) *int16 {
+	u := int16(0)
+	return &u
+}
+
+// SysFreeString frees string system memory. This must be called with SysAllocString.
+func SysFreeString(v *int16) error {
+	return NewError(E_NOTIMPL)
+}
+
+// SysStringLen is the length of the system allocated string.
+func SysStringLen(v *int16) uint32 {
+	return uint32(0)
+}
+
+// CreateStdDispatch provides default IDispatch implementation for IUnknown.
+//
+// This handles default IDispatch implementation for objects. It haves a few
+// limitations with only supporting one language. It will also only return
+// default exception codes.
+func CreateStdDispatch(unk *IUnknown, v uintptr, ptinfo *IUnknown) (*IDispatch, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// CreateDispTypeInfo provides default ITypeInfo implementation for IDispatch.
+//
+// This will not handle the full implementation of the interface.
+func CreateDispTypeInfo(idata *INTERFACEDATA) (*IUnknown, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// copyMemory moves location of a block of memory.
+func copyMemory(dest unsafe.Pointer, src unsafe.Pointer, length uint32) {}
+
+// GetUserDefaultLCID retrieves current user default locale.
+func GetUserDefaultLCID() uint32 {
+	return uint32(0)
+}
+
+// GetMessage in message queue from runtime.
+//
+// This function appears to block. PeekMessage does not block.
+func GetMessage(msg *Msg, hwnd uint32, MsgFilterMin uint32, MsgFilterMax uint32) (int32, error) {
+	return int32(0), NewError(E_NOTIMPL)
+}
+
+// DispatchMessage to window procedure.
+func DispatchMessage(msg *Msg) int32 {
+	return int32(0)
+}
+
+func GetVariantDate(value float64) (time.Time, error) {
+	return time.Now(), NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/connect.go b/vendor/github.com/go-ole/go-ole/connect.go
new file mode 100644
index 0000000000..b2ac2ec67a
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/connect.go
@@ -0,0 +1,192 @@
+package ole
+
+// Connection contains IUnknown for fluent interface interaction.
+//
+// Deprecated. Use oleutil package instead.
+type Connection struct {
+	Object *IUnknown // Access COM
+}
+
+// Initialize COM.
+func (*Connection) Initialize() (err error) {
+	return coInitialize()
+}
+
+// Uninitialize COM.
+func (*Connection) Uninitialize() {
+	CoUninitialize()
+}
+
+// Create IUnknown object based first on ProgId and then from String.
+func (c *Connection) Create(progId string) (err error) {
+	var clsid *GUID
+	clsid, err = CLSIDFromProgID(progId)
+	if err != nil {
+		clsid, err = CLSIDFromString(progId)
+		if err != nil {
+			return
+		}
+	}
+
+	unknown, err := CreateInstance(clsid, IID_IUnknown)
+	if err != nil {
+		return
+	}
+	c.Object = unknown
+
+	return
+}
+
+// Release IUnknown object.
+func (c *Connection) Release() {
+	c.Object.Release()
+}
+
+// Load COM object from list of programIDs or strings.
+func (c *Connection) Load(names ...string) (errors []error) {
+	var tempErrors []error = make([]error, len(names))
+	var numErrors int = 0
+	for _, name := range names {
+		err := c.Create(name)
+		if err != nil {
+			tempErrors = append(tempErrors, err)
+			numErrors += 1
+			continue
+		}
+		break
+	}
+
+	copy(errors, tempErrors[0:numErrors])
+	return
+}
+
+// Dispatch returns Dispatch object.
+func (c *Connection) Dispatch() (object *Dispatch, err error) {
+	dispatch, err := c.Object.QueryInterface(IID_IDispatch)
+	if err != nil {
+		return
+	}
+	object = &Dispatch{dispatch}
+	return
+}
+
+// Dispatch stores IDispatch object.
+type Dispatch struct {
+	Object *IDispatch // Dispatch object.
+}
+
+// Call method on IDispatch with parameters.
+func (d *Dispatch) Call(method string, params ...interface{}) (result *VARIANT, err error) {
+	id, err := d.GetId(method)
+	if err != nil {
+		return
+	}
+
+	result, err = d.Invoke(id, DISPATCH_METHOD, params)
+	return
+}
+
+// MustCall method on IDispatch with parameters.
+func (d *Dispatch) MustCall(method string, params ...interface{}) (result *VARIANT) {
+	id, err := d.GetId(method)
+	if err != nil {
+		panic(err)
+	}
+
+	result, err = d.Invoke(id, DISPATCH_METHOD, params)
+	if err != nil {
+		panic(err)
+	}
+
+	return
+}
+
+// Get property on IDispatch with parameters.
+func (d *Dispatch) Get(name string, params ...interface{}) (result *VARIANT, err error) {
+	id, err := d.GetId(name)
+	if err != nil {
+		return
+	}
+	result, err = d.Invoke(id, DISPATCH_PROPERTYGET, params)
+	return
+}
+
+// MustGet property on IDispatch with parameters.
+func (d *Dispatch) MustGet(name string, params ...interface{}) (result *VARIANT) {
+	id, err := d.GetId(name)
+	if err != nil {
+		panic(err)
+	}
+
+	result, err = d.Invoke(id, DISPATCH_PROPERTYGET, params)
+	if err != nil {
+		panic(err)
+	}
+	return
+}
+
+// Set property on IDispatch with parameters.
+func (d *Dispatch) Set(name string, params ...interface{}) (result *VARIANT, err error) {
+	id, err := d.GetId(name)
+	if err != nil {
+		return
+	}
+	result, err = d.Invoke(id, DISPATCH_PROPERTYPUT, params)
+	return
+}
+
+// MustSet property on IDispatch with parameters.
+func (d *Dispatch) MustSet(name string, params ...interface{}) (result *VARIANT) {
+	id, err := d.GetId(name)
+	if err != nil {
+		panic(err)
+	}
+
+	result, err = d.Invoke(id, DISPATCH_PROPERTYPUT, params)
+	if err != nil {
+		panic(err)
+	}
+	return
+}
+
+// GetId retrieves ID of name on IDispatch.
+func (d *Dispatch) GetId(name string) (id int32, err error) {
+	var dispid []int32
+	dispid, err = d.Object.GetIDsOfName([]string{name})
+	if err != nil {
+		return
+	}
+	id = dispid[0]
+	return
+}
+
+// GetIds retrieves all IDs of names on IDispatch.
+func (d *Dispatch) GetIds(names ...string) (dispid []int32, err error) {
+	dispid, err = d.Object.GetIDsOfName(names)
+	return
+}
+
+// Invoke IDispatch on DisplayID of dispatch type with parameters.
+//
+// There have been problems where if send cascading params..., it would error
+// out because the parameters would be empty.
+func (d *Dispatch) Invoke(id int32, dispatch int16, params []interface{}) (result *VARIANT, err error) {
+	if len(params) < 1 {
+		result, err = d.Object.Invoke(id, dispatch)
+	} else {
+		result, err = d.Object.Invoke(id, dispatch, params...)
+	}
+	return
+}
+
+// Release IDispatch object.
+func (d *Dispatch) Release() {
+	d.Object.Release()
+}
+
+// Connect initializes COM and attempts to load IUnknown based on given names.
+func Connect(names ...string) (connection *Connection) {
+	connection.Initialize()
+	connection.Load(names...)
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/constants.go b/vendor/github.com/go-ole/go-ole/constants.go
new file mode 100644
index 0000000000..fd0c6d74b0
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/constants.go
@@ -0,0 +1,153 @@
+package ole
+
+const (
+	CLSCTX_INPROC_SERVER   = 1
+	CLSCTX_INPROC_HANDLER  = 2
+	CLSCTX_LOCAL_SERVER    = 4
+	CLSCTX_INPROC_SERVER16 = 8
+	CLSCTX_REMOTE_SERVER   = 16
+	CLSCTX_ALL             = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER
+	CLSCTX_INPROC          = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER
+	CLSCTX_SERVER          = CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER
+)
+
+const (
+	COINIT_APARTMENTTHREADED = 0x2
+	COINIT_MULTITHREADED     = 0x0
+	COINIT_DISABLE_OLE1DDE   = 0x4
+	COINIT_SPEED_OVER_MEMORY = 0x8
+)
+
+const (
+	DISPATCH_METHOD         = 1
+	DISPATCH_PROPERTYGET    = 2
+	DISPATCH_PROPERTYPUT    = 4
+	DISPATCH_PROPERTYPUTREF = 8
+)
+
+const (
+	S_OK           = 0x00000000
+	E_UNEXPECTED   = 0x8000FFFF
+	E_NOTIMPL      = 0x80004001
+	E_OUTOFMEMORY  = 0x8007000E
+	E_INVALIDARG   = 0x80070057
+	E_NOINTERFACE  = 0x80004002
+	E_POINTER      = 0x80004003
+	E_HANDLE       = 0x80070006
+	E_ABORT        = 0x80004004
+	E_FAIL         = 0x80004005
+	E_ACCESSDENIED = 0x80070005
+	E_PENDING      = 0x8000000A
+
+	CO_E_CLASSSTRING = 0x800401F3
+)
+
+const (
+	CC_FASTCALL = iota
+	CC_CDECL
+	CC_MSCPASCAL
+	CC_PASCAL = CC_MSCPASCAL
+	CC_MACPASCAL
+	CC_STDCALL
+	CC_FPFASTCALL
+	CC_SYSCALL
+	CC_MPWCDECL
+	CC_MPWPASCAL
+	CC_MAX = CC_MPWPASCAL
+)
+
+type VT uint16
+
+const (
+	VT_EMPTY           VT = 0x0
+	VT_NULL            VT = 0x1
+	VT_I2              VT = 0x2
+	VT_I4              VT = 0x3
+	VT_R4              VT = 0x4
+	VT_R8              VT = 0x5
+	VT_CY              VT = 0x6
+	VT_DATE            VT = 0x7
+	VT_BSTR            VT = 0x8
+	VT_DISPATCH        VT = 0x9
+	VT_ERROR           VT = 0xa
+	VT_BOOL            VT = 0xb
+	VT_VARIANT         VT = 0xc
+	VT_UNKNOWN         VT = 0xd
+	VT_DECIMAL         VT = 0xe
+	VT_I1              VT = 0x10
+	VT_UI1             VT = 0x11
+	VT_UI2             VT = 0x12
+	VT_UI4             VT = 0x13
+	VT_I8              VT = 0x14
+	VT_UI8             VT = 0x15
+	VT_INT             VT = 0x16
+	VT_UINT            VT = 0x17
+	VT_VOID            VT = 0x18
+	VT_HRESULT         VT = 0x19
+	VT_PTR             VT = 0x1a
+	VT_SAFEARRAY       VT = 0x1b
+	VT_CARRAY          VT = 0x1c
+	VT_USERDEFINED     VT = 0x1d
+	VT_LPSTR           VT = 0x1e
+	VT_LPWSTR          VT = 0x1f
+	VT_RECORD          VT = 0x24
+	VT_INT_PTR         VT = 0x25
+	VT_UINT_PTR        VT = 0x26
+	VT_FILETIME        VT = 0x40
+	VT_BLOB            VT = 0x41
+	VT_STREAM          VT = 0x42
+	VT_STORAGE         VT = 0x43
+	VT_STREAMED_OBJECT VT = 0x44
+	VT_STORED_OBJECT   VT = 0x45
+	VT_BLOB_OBJECT     VT = 0x46
+	VT_CF              VT = 0x47
+	VT_CLSID           VT = 0x48
+	VT_BSTR_BLOB       VT = 0xfff
+	VT_VECTOR          VT = 0x1000
+	VT_ARRAY           VT = 0x2000
+	VT_BYREF           VT = 0x4000
+	VT_RESERVED        VT = 0x8000
+	VT_ILLEGAL         VT = 0xffff
+	VT_ILLEGALMASKED   VT = 0xfff
+	VT_TYPEMASK        VT = 0xfff
+)
+
+const (
+	DISPID_UNKNOWN     = -1
+	DISPID_VALUE       = 0
+	DISPID_PROPERTYPUT = -3
+	DISPID_NEWENUM     = -4
+	DISPID_EVALUATE    = -5
+	DISPID_CONSTRUCTOR = -6
+	DISPID_DESTRUCTOR  = -7
+	DISPID_COLLECT     = -8
+)
+
+const (
+	TKIND_ENUM      = 1
+	TKIND_RECORD    = 2
+	TKIND_MODULE    = 3
+	TKIND_INTERFACE = 4
+	TKIND_DISPATCH  = 5
+	TKIND_COCLASS   = 6
+	TKIND_ALIAS     = 7
+	TKIND_UNION     = 8
+	TKIND_MAX       = 9
+)
+
+// Safe Array Feature Flags
+
+const (
+	FADF_AUTO        = 0x0001
+	FADF_STATIC      = 0x0002
+	FADF_EMBEDDED    = 0x0004
+	FADF_FIXEDSIZE   = 0x0010
+	FADF_RECORD      = 0x0020
+	FADF_HAVEIID     = 0x0040
+	FADF_HAVEVARTYPE = 0x0080
+	FADF_BSTR        = 0x0100
+	FADF_UNKNOWN     = 0x0200
+	FADF_DISPATCH    = 0x0400
+	FADF_VARIANT     = 0x0800
+	FADF_RESERVED    = 0xF008
+)
diff --git a/vendor/github.com/go-ole/go-ole/error.go b/vendor/github.com/go-ole/go-ole/error.go
new file mode 100644
index 0000000000..096b456d3a
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/error.go
@@ -0,0 +1,51 @@
+package ole
+
+// OleError stores COM errors.
+type OleError struct {
+	hr          uintptr
+	description string
+	subError    error
+}
+
+// NewError creates new error with HResult.
+func NewError(hr uintptr) *OleError {
+	return &OleError{hr: hr}
+}
+
+// NewErrorWithDescription creates new COM error with HResult and description.
+func NewErrorWithDescription(hr uintptr, description string) *OleError {
+	return &OleError{hr: hr, description: description}
+}
+
+// NewErrorWithSubError creates new COM error with parent error.
+func NewErrorWithSubError(hr uintptr, description string, err error) *OleError {
+	return &OleError{hr: hr, description: description, subError: err}
+}
+
+// Code is the HResult.
+func (v *OleError) Code() uintptr {
+	return uintptr(v.hr)
+}
+
+// String description, either manually set or format message with error code.
+func (v *OleError) String() string {
+	if v.description != "" {
+		return errstr(int(v.hr)) + " (" + v.description + ")"
+	}
+	return errstr(int(v.hr))
+}
+
+// Error implements error interface.
+func (v *OleError) Error() string {
+	return v.String()
+}
+
+// Description retrieves error summary, if there is one.
+func (v *OleError) Description() string {
+	return v.description
+}
+
+// SubError returns parent error, if there is one.
+func (v *OleError) SubError() error {
+	return v.subError
+}
diff --git a/vendor/github.com/go-ole/go-ole/error_func.go b/vendor/github.com/go-ole/go-ole/error_func.go
new file mode 100644
index 0000000000..8a2ffaa272
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/error_func.go
@@ -0,0 +1,8 @@
+// +build !windows
+
+package ole
+
+// errstr converts error code to string.
+func errstr(errno int) string {
+	return ""
+}
diff --git a/vendor/github.com/go-ole/go-ole/error_windows.go b/vendor/github.com/go-ole/go-ole/error_windows.go
new file mode 100644
index 0000000000..d0e8e68595
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/error_windows.go
@@ -0,0 +1,24 @@
+// +build windows
+
+package ole
+
+import (
+	"fmt"
+	"syscall"
+	"unicode/utf16"
+)
+
+// errstr converts error code to string.
+func errstr(errno int) string {
+	// ask windows for the remaining errors
+	var flags uint32 = syscall.FORMAT_MESSAGE_FROM_SYSTEM | syscall.FORMAT_MESSAGE_ARGUMENT_ARRAY | syscall.FORMAT_MESSAGE_IGNORE_INSERTS
+	b := make([]uint16, 300)
+	n, err := syscall.FormatMessage(flags, 0, uint32(errno), 0, b, nil)
+	if err != nil {
+		return fmt.Sprintf("error %d (FormatMessage failed with: %v)", errno, err)
+	}
+	// trim terminating \r and \n
+	for ; n > 0 && (b[n-1] == '\n' || b[n-1] == '\r'); n-- {
+	}
+	return string(utf16.Decode(b[:n]))
+}
diff --git a/vendor/github.com/go-ole/go-ole/guid.go b/vendor/github.com/go-ole/go-ole/guid.go
new file mode 100644
index 0000000000..609ef0bfe3
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/guid.go
@@ -0,0 +1,118 @@
+package ole
+
+var (
+	// IID_NULL is null Interface ID, used when no other Interface ID is known.
+	IID_NULL = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
+
+	// IID_IUnknown is for IUnknown interfaces.
+	IID_IUnknown = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+
+	// IID_IDispatch is for IDispatch interfaces.
+	IID_IDispatch = &GUID{0x00020400, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+
+	// IID_IEnumVariant is for IEnumVariant interfaces
+	IID_IEnumVariant = &GUID{0x00020404, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+
+	// IID_IConnectionPointContainer is for IConnectionPointContainer interfaces.
+	IID_IConnectionPointContainer = &GUID{0xB196B284, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+
+	// IID_IConnectionPoint is for IConnectionPoint interfaces.
+	IID_IConnectionPoint = &GUID{0xB196B286, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+
+	// IID_IInspectable is for IInspectable interfaces.
+	IID_IInspectable = &GUID{0xaf86e2e0, 0xb12d, 0x4c6a, [8]byte{0x9c, 0x5a, 0xd7, 0xaa, 0x65, 0x10, 0x1e, 0x90}}
+
+	// IID_IProvideClassInfo is for IProvideClassInfo interfaces.
+	IID_IProvideClassInfo = &GUID{0xb196b283, 0xbab4, 0x101a, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+)
+
+// These are for testing and not part of any library.
+var (
+	// IID_ICOMTestString is for ICOMTestString interfaces.
+	//
+	// {E0133EB4-C36F-469A-9D3D-C66B84BE19ED}
+	IID_ICOMTestString = &GUID{0xe0133eb4, 0xc36f, 0x469a, [8]byte{0x9d, 0x3d, 0xc6, 0x6b, 0x84, 0xbe, 0x19, 0xed}}
+
+	// IID_ICOMTestInt8 is for ICOMTestInt8 interfaces.
+	//
+	// {BEB06610-EB84-4155-AF58-E2BFF53608B4}
+	IID_ICOMTestInt8 = &GUID{0xbeb06610, 0xeb84, 0x4155, [8]byte{0xaf, 0x58, 0xe2, 0xbf, 0xf5, 0x36, 0x80, 0xb4}}
+
+	// IID_ICOMTestInt16 is for ICOMTestInt16 interfaces.
+	//
+	// {DAA3F9FA-761E-4976-A860-8364CE55F6FC}
+	IID_ICOMTestInt16 = &GUID{0xdaa3f9fa, 0x761e, 0x4976, [8]byte{0xa8, 0x60, 0x83, 0x64, 0xce, 0x55, 0xf6, 0xfc}}
+
+	// IID_ICOMTestInt32 is for ICOMTestInt32 interfaces.
+	//
+	// {E3DEDEE7-38A2-4540-91D1-2EEF1D8891B0}
+	IID_ICOMTestInt32 = &GUID{0xe3dedee7, 0x38a2, 0x4540, [8]byte{0x91, 0xd1, 0x2e, 0xef, 0x1d, 0x88, 0x91, 0xb0}}
+
+	// IID_ICOMTestInt64 is for ICOMTestInt64 interfaces.
+	//
+	// {8D437CBC-B3ED-485C-BC32-C336432A1623}
+	IID_ICOMTestInt64 = &GUID{0x8d437cbc, 0xb3ed, 0x485c, [8]byte{0xbc, 0x32, 0xc3, 0x36, 0x43, 0x2a, 0x16, 0x23}}
+
+	// IID_ICOMTestFloat is for ICOMTestFloat interfaces.
+	//
+	// {BF1ED004-EA02-456A-AA55-2AC8AC6B054C}
+	IID_ICOMTestFloat = &GUID{0xbf1ed004, 0xea02, 0x456a, [8]byte{0xaa, 0x55, 0x2a, 0xc8, 0xac, 0x6b, 0x5, 0x4c}}
+
+	// IID_ICOMTestDouble is for ICOMTestDouble interfaces.
+	//
+	// {BF908A81-8687-4E93-999F-D86FAB284BA0}
+	IID_ICOMTestDouble = &GUID{0xbf908a81, 0x8687, 0x4e93, [8]byte{0x99, 0x9f, 0xd8, 0x6f, 0xab, 0x28, 0x4b, 0xa0}}
+
+	// IID_ICOMTestBoolean is for ICOMTestBoolean interfaces.
+	//
+	// {D530E7A6-4EE8-40D1-8931-3D63B8605001}
+	IID_ICOMTestBoolean = &GUID{0xd530e7a6, 0x4ee8, 0x40d1, [8]byte{0x89, 0x31, 0x3d, 0x63, 0xb8, 0x60, 0x50, 0x10}}
+
+	// IID_ICOMEchoTestObject is for ICOMEchoTestObject interfaces.
+	//
+	// {6485B1EF-D780-4834-A4FE-1EBB51746CA3}
+	IID_ICOMEchoTestObject = &GUID{0x6485b1ef, 0xd780, 0x4834, [8]byte{0xa4, 0xfe, 0x1e, 0xbb, 0x51, 0x74, 0x6c, 0xa3}}
+
+	// IID_ICOMTestTypes is for ICOMTestTypes interfaces.
+	//
+	// {CCA8D7AE-91C0-4277-A8B3-FF4EDF28D3C0}
+	IID_ICOMTestTypes = &GUID{0xcca8d7ae, 0x91c0, 0x4277, [8]byte{0xa8, 0xb3, 0xff, 0x4e, 0xdf, 0x28, 0xd3, 0xc0}}
+
+	// CLSID_COMEchoTestObject is for COMEchoTestObject class.
+	//
+	// {3C24506A-AE9E-4D50-9157-EF317281F1B0}
+	CLSID_COMEchoTestObject = &GUID{0x3c24506a, 0xae9e, 0x4d50, [8]byte{0x91, 0x57, 0xef, 0x31, 0x72, 0x81, 0xf1, 0xb0}}
+
+	// CLSID_COMTestScalarClass is for COMTestScalarClass class.
+	//
+	// {865B85C5-0334-4AC6-9EF6-AACEC8FC5E86}
+	CLSID_COMTestScalarClass = &GUID{0x865b85c5, 0x0334, 0x4ac6, [8]byte{0x9e, 0xf6, 0xaa, 0xce, 0xc8, 0xfc, 0x5e, 0x86}}
+)
+
+// GUID is Windows API specific GUID type.
+//
+// This exists to match Windows GUID type for direct passing for COM.
+// Format is in xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxxxxxx.
+type GUID struct {
+	Data1 uint32
+	Data2 uint16
+	Data3 uint16
+	Data4 [8]byte
+}
+
+// IsEqualGUID compares two GUID.
+//
+// Not constant time comparison.
+func IsEqualGUID(guid1 *GUID, guid2 *GUID) bool {
+	return guid1.Data1 == guid2.Data1 &&
+		guid1.Data2 == guid2.Data2 &&
+		guid1.Data3 == guid2.Data3 &&
+		guid1.Data4[0] == guid2.Data4[0] &&
+		guid1.Data4[1] == guid2.Data4[1] &&
+		guid1.Data4[2] == guid2.Data4[2] &&
+		guid1.Data4[3] == guid2.Data4[3] &&
+		guid1.Data4[4] == guid2.Data4[4] &&
+		guid1.Data4[5] == guid2.Data4[5] &&
+		guid1.Data4[6] == guid2.Data4[6] &&
+		guid1.Data4[7] == guid2.Data4[7]
+}
diff --git a/vendor/github.com/go-ole/go-ole/iconnectionpoint.go b/vendor/github.com/go-ole/go-ole/iconnectionpoint.go
new file mode 100644
index 0000000000..9e6c49f41f
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iconnectionpoint.go
@@ -0,0 +1,20 @@
+package ole
+
+import "unsafe"
+
+type IConnectionPoint struct {
+	IUnknown
+}
+
+type IConnectionPointVtbl struct {
+	IUnknownVtbl
+	GetConnectionInterface      uintptr
+	GetConnectionPointContainer uintptr
+	Advise                      uintptr
+	Unadvise                    uintptr
+	EnumConnections             uintptr
+}
+
+func (v *IConnectionPoint) VTable() *IConnectionPointVtbl {
+	return (*IConnectionPointVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/vendor/github.com/go-ole/go-ole/iconnectionpoint_func.go b/vendor/github.com/go-ole/go-ole/iconnectionpoint_func.go
new file mode 100644
index 0000000000..5414dc3cd3
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iconnectionpoint_func.go
@@ -0,0 +1,21 @@
+// +build !windows
+
+package ole
+
+import "unsafe"
+
+func (v *IConnectionPoint) GetConnectionInterface(piid **GUID) int32 {
+	return int32(0)
+}
+
+func (v *IConnectionPoint) Advise(unknown *IUnknown) (uint32, error) {
+	return uint32(0), NewError(E_NOTIMPL)
+}
+
+func (v *IConnectionPoint) Unadvise(cookie uint32) error {
+	return NewError(E_NOTIMPL)
+}
+
+func (v *IConnectionPoint) EnumConnections(p *unsafe.Pointer) (err error) {
+	return NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/iconnectionpoint_windows.go b/vendor/github.com/go-ole/go-ole/iconnectionpoint_windows.go
new file mode 100644
index 0000000000..32bc183248
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iconnectionpoint_windows.go
@@ -0,0 +1,43 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func (v *IConnectionPoint) GetConnectionInterface(piid **GUID) int32 {
+	// XXX: This doesn't look like it does what it's supposed to
+	return release((*IUnknown)(unsafe.Pointer(v)))
+}
+
+func (v *IConnectionPoint) Advise(unknown *IUnknown) (cookie uint32, err error) {
+	hr, _, _ := syscall.Syscall(
+		v.VTable().Advise,
+		3,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(unknown)),
+		uintptr(unsafe.Pointer(&cookie)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (v *IConnectionPoint) Unadvise(cookie uint32) (err error) {
+	hr, _, _ := syscall.Syscall(
+		v.VTable().Unadvise,
+		2,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(cookie),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (v *IConnectionPoint) EnumConnections(p *unsafe.Pointer) error {
+	return NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/iconnectionpointcontainer.go b/vendor/github.com/go-ole/go-ole/iconnectionpointcontainer.go
new file mode 100644
index 0000000000..165860d199
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iconnectionpointcontainer.go
@@ -0,0 +1,17 @@
+package ole
+
+import "unsafe"
+
+type IConnectionPointContainer struct {
+	IUnknown
+}
+
+type IConnectionPointContainerVtbl struct {
+	IUnknownVtbl
+	EnumConnectionPoints uintptr
+	FindConnectionPoint  uintptr
+}
+
+func (v *IConnectionPointContainer) VTable() *IConnectionPointContainerVtbl {
+	return (*IConnectionPointContainerVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/vendor/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go b/vendor/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go
new file mode 100644
index 0000000000..5dfa42aaeb
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go
@@ -0,0 +1,11 @@
+// +build !windows
+
+package ole
+
+func (v *IConnectionPointContainer) EnumConnectionPoints(points interface{}) error {
+	return NewError(E_NOTIMPL)
+}
+
+func (v *IConnectionPointContainer) FindConnectionPoint(iid *GUID, point **IConnectionPoint) error {
+	return NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go b/vendor/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go
new file mode 100644
index 0000000000..ad30d79efc
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go
@@ -0,0 +1,25 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func (v *IConnectionPointContainer) EnumConnectionPoints(points interface{}) error {
+	return NewError(E_NOTIMPL)
+}
+
+func (v *IConnectionPointContainer) FindConnectionPoint(iid *GUID, point **IConnectionPoint) (err error) {
+	hr, _, _ := syscall.Syscall(
+		v.VTable().FindConnectionPoint,
+		3,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(point)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/idispatch.go b/vendor/github.com/go-ole/go-ole/idispatch.go
new file mode 100644
index 0000000000..d4af124092
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/idispatch.go
@@ -0,0 +1,94 @@
+package ole
+
+import "unsafe"
+
+type IDispatch struct {
+	IUnknown
+}
+
+type IDispatchVtbl struct {
+	IUnknownVtbl
+	GetTypeInfoCount uintptr
+	GetTypeInfo      uintptr
+	GetIDsOfNames    uintptr
+	Invoke           uintptr
+}
+
+func (v *IDispatch) VTable() *IDispatchVtbl {
+	return (*IDispatchVtbl)(unsafe.Pointer(v.RawVTable))
+}
+
+func (v *IDispatch) GetIDsOfName(names []string) (dispid []int32, err error) {
+	dispid, err = getIDsOfName(v, names)
+	return
+}
+
+func (v *IDispatch) Invoke(dispid int32, dispatch int16, params ...interface{}) (result *VARIANT, err error) {
+	result, err = invoke(v, dispid, dispatch, params...)
+	return
+}
+
+func (v *IDispatch) GetTypeInfoCount() (c uint32, err error) {
+	c, err = getTypeInfoCount(v)
+	return
+}
+
+func (v *IDispatch) GetTypeInfo() (tinfo *ITypeInfo, err error) {
+	tinfo, err = getTypeInfo(v)
+	return
+}
+
+// GetSingleIDOfName is a helper that returns single display ID for IDispatch name.
+//
+// This replaces the common pattern of attempting to get a single name from the list of available
+// IDs. It gives the first ID, if it is available.
+func (v *IDispatch) GetSingleIDOfName(name string) (displayID int32, err error) {
+	var displayIDs []int32
+	displayIDs, err = v.GetIDsOfName([]string{name})
+	if err != nil {
+		return
+	}
+	displayID = displayIDs[0]
+	return
+}
+
+// InvokeWithOptionalArgs accepts arguments as an array, works like Invoke.
+//
+// Accepts name and will attempt to retrieve Display ID to pass to Invoke.
+//
+// Passing params as an array is a workaround that could be fixed in later versions of Go that
+// prevent passing empty params. During testing it was discovered that this is an acceptable way of
+// getting around not being able to pass params normally.
+func (v *IDispatch) InvokeWithOptionalArgs(name string, dispatch int16, params []interface{}) (result *VARIANT, err error) {
+	displayID, err := v.GetSingleIDOfName(name)
+	if err != nil {
+		return
+	}
+
+	if len(params) < 1 {
+		result, err = v.Invoke(displayID, dispatch)
+	} else {
+		result, err = v.Invoke(displayID, dispatch, params...)
+	}
+
+	return
+}
+
+// CallMethod invokes named function with arguments on object.
+func (v *IDispatch) CallMethod(name string, params ...interface{}) (*VARIANT, error) {
+	return v.InvokeWithOptionalArgs(name, DISPATCH_METHOD, params)
+}
+
+// GetProperty retrieves the property with the name with the ability to pass arguments.
+//
+// Most of the time you will not need to pass arguments as most objects do not allow for this
+// feature. Or at least, should not allow for this feature. Some servers don't follow best practices
+// and this is provided for those edge cases.
+func (v *IDispatch) GetProperty(name string, params ...interface{}) (*VARIANT, error) {
+	return v.InvokeWithOptionalArgs(name, DISPATCH_PROPERTYGET, params)
+}
+
+// PutProperty attempts to mutate a property in the object.
+func (v *IDispatch) PutProperty(name string, params ...interface{}) (*VARIANT, error) {
+	return v.InvokeWithOptionalArgs(name, DISPATCH_PROPERTYPUT, params)
+}
diff --git a/vendor/github.com/go-ole/go-ole/idispatch_func.go b/vendor/github.com/go-ole/go-ole/idispatch_func.go
new file mode 100644
index 0000000000..b8fbbe319f
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/idispatch_func.go
@@ -0,0 +1,19 @@
+// +build !windows
+
+package ole
+
+func getIDsOfName(disp *IDispatch, names []string) ([]int32, error) {
+	return []int32{}, NewError(E_NOTIMPL)
+}
+
+func getTypeInfoCount(disp *IDispatch) (uint32, error) {
+	return uint32(0), NewError(E_NOTIMPL)
+}
+
+func getTypeInfo(disp *IDispatch) (*ITypeInfo, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+func invoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{}) (*VARIANT, error) {
+	return nil, NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/idispatch_windows.go b/vendor/github.com/go-ole/go-ole/idispatch_windows.go
new file mode 100644
index 0000000000..bb73690382
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/idispatch_windows.go
@@ -0,0 +1,193 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"time"
+	"unsafe"
+)
+
+func getIDsOfName(disp *IDispatch, names []string) (dispid []int32, err error) {
+	wnames := make([]*uint16, len(names))
+	for i := 0; i < len(names); i++ {
+		wnames[i] = syscall.StringToUTF16Ptr(names[i])
+	}
+	dispid = make([]int32, len(names))
+	namelen := uint32(len(names))
+	hr, _, _ := syscall.Syscall6(
+		disp.VTable().GetIDsOfNames,
+		6,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(unsafe.Pointer(IID_NULL)),
+		uintptr(unsafe.Pointer(&wnames[0])),
+		uintptr(namelen),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(unsafe.Pointer(&dispid[0])))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func getTypeInfoCount(disp *IDispatch) (c uint32, err error) {
+	hr, _, _ := syscall.Syscall(
+		disp.VTable().GetTypeInfoCount,
+		2,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(unsafe.Pointer(&c)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func getTypeInfo(disp *IDispatch) (tinfo *ITypeInfo, err error) {
+	hr, _, _ := syscall.Syscall(
+		disp.VTable().GetTypeInfo,
+		3,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(unsafe.Pointer(&tinfo)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func invoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{}) (result *VARIANT, err error) {
+	var dispparams DISPPARAMS
+
+	if dispatch&DISPATCH_PROPERTYPUT != 0 {
+		dispnames := [1]int32{DISPID_PROPERTYPUT}
+		dispparams.rgdispidNamedArgs = uintptr(unsafe.Pointer(&dispnames[0]))
+		dispparams.cNamedArgs = 1
+	}
+	var vargs []VARIANT
+	if len(params) > 0 {
+		vargs = make([]VARIANT, len(params))
+		for i, v := range params {
+			//n := len(params)-i-1
+			n := len(params) - i - 1
+			VariantInit(&vargs[n])
+			switch vv := v.(type) {
+			case bool:
+				if vv {
+					vargs[n] = NewVariant(VT_BOOL, 0xffff)
+				} else {
+					vargs[n] = NewVariant(VT_BOOL, 0)
+				}
+			case *bool:
+				vargs[n] = NewVariant(VT_BOOL|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*bool)))))
+			case uint8:
+				vargs[n] = NewVariant(VT_I1, int64(v.(uint8)))
+			case *uint8:
+				vargs[n] = NewVariant(VT_I1|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint8)))))
+			case int8:
+				vargs[n] = NewVariant(VT_I1, int64(v.(int8)))
+			case *int8:
+				vargs[n] = NewVariant(VT_I1|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint8)))))
+			case int16:
+				vargs[n] = NewVariant(VT_I2, int64(v.(int16)))
+			case *int16:
+				vargs[n] = NewVariant(VT_I2|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int16)))))
+			case uint16:
+				vargs[n] = NewVariant(VT_UI2, int64(v.(uint16)))
+			case *uint16:
+				vargs[n] = NewVariant(VT_UI2|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint16)))))
+			case int32:
+				vargs[n] = NewVariant(VT_I4, int64(v.(int32)))
+			case *int32:
+				vargs[n] = NewVariant(VT_I4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int32)))))
+			case uint32:
+				vargs[n] = NewVariant(VT_UI4, int64(v.(uint32)))
+			case *uint32:
+				vargs[n] = NewVariant(VT_UI4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint32)))))
+			case int64:
+				vargs[n] = NewVariant(VT_I8, int64(v.(int64)))
+			case *int64:
+				vargs[n] = NewVariant(VT_I8|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int64)))))
+			case uint64:
+				vargs[n] = NewVariant(VT_UI8, int64(uintptr(v.(uint64))))
+			case *uint64:
+				vargs[n] = NewVariant(VT_UI8|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint64)))))
+			case int:
+				vargs[n] = NewVariant(VT_I4, int64(v.(int)))
+			case *int:
+				vargs[n] = NewVariant(VT_I4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int)))))
+			case uint:
+				vargs[n] = NewVariant(VT_UI4, int64(v.(uint)))
+			case *uint:
+				vargs[n] = NewVariant(VT_UI4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint)))))
+			case float32:
+				vargs[n] = NewVariant(VT_R4, *(*int64)(unsafe.Pointer(&vv)))
+			case *float32:
+				vargs[n] = NewVariant(VT_R4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*float32)))))
+			case float64:
+				vargs[n] = NewVariant(VT_R8, *(*int64)(unsafe.Pointer(&vv)))
+			case *float64:
+				vargs[n] = NewVariant(VT_R8|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*float64)))))
+			case string:
+				vargs[n] = NewVariant(VT_BSTR, int64(uintptr(unsafe.Pointer(SysAllocStringLen(v.(string))))))
+			case *string:
+				vargs[n] = NewVariant(VT_BSTR|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*string)))))
+			case time.Time:
+				s := vv.Format("2006-01-02 15:04:05")
+				vargs[n] = NewVariant(VT_BSTR, int64(uintptr(unsafe.Pointer(SysAllocStringLen(s)))))
+			case *time.Time:
+				s := vv.Format("2006-01-02 15:04:05")
+				vargs[n] = NewVariant(VT_BSTR|VT_BYREF, int64(uintptr(unsafe.Pointer(&s))))
+			case *IDispatch:
+				vargs[n] = NewVariant(VT_DISPATCH, int64(uintptr(unsafe.Pointer(v.(*IDispatch)))))
+			case **IDispatch:
+				vargs[n] = NewVariant(VT_DISPATCH|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(**IDispatch)))))
+			case nil:
+				vargs[n] = NewVariant(VT_NULL, 0)
+			case *VARIANT:
+				vargs[n] = NewVariant(VT_VARIANT|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*VARIANT)))))
+			case []byte:
+				safeByteArray := safeArrayFromByteSlice(v.([]byte))
+				vargs[n] = NewVariant(VT_ARRAY|VT_UI1, int64(uintptr(unsafe.Pointer(safeByteArray))))
+				defer VariantClear(&vargs[n])
+			case []string:
+				safeByteArray := safeArrayFromStringSlice(v.([]string))
+				vargs[n] = NewVariant(VT_ARRAY|VT_BSTR, int64(uintptr(unsafe.Pointer(safeByteArray))))
+				defer VariantClear(&vargs[n])
+			default:
+				panic("unknown type")
+			}
+		}
+		dispparams.rgvarg = uintptr(unsafe.Pointer(&vargs[0]))
+		dispparams.cArgs = uint32(len(params))
+	}
+
+	result = new(VARIANT)
+	var excepInfo EXCEPINFO
+	VariantInit(result)
+	hr, _, _ := syscall.Syscall9(
+		disp.VTable().Invoke,
+		9,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(dispid),
+		uintptr(unsafe.Pointer(IID_NULL)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(dispatch),
+		uintptr(unsafe.Pointer(&dispparams)),
+		uintptr(unsafe.Pointer(result)),
+		uintptr(unsafe.Pointer(&excepInfo)),
+		0)
+	if hr != 0 {
+		err = NewErrorWithSubError(hr, BstrToString(excepInfo.bstrDescription), excepInfo)
+	}
+	for i, varg := range vargs {
+		n := len(params) - i - 1
+		if varg.VT == VT_BSTR && varg.Val != 0 {
+			SysFreeString(((*int16)(unsafe.Pointer(uintptr(varg.Val)))))
+		}
+		if varg.VT == (VT_BSTR|VT_BYREF) && varg.Val != 0 {
+			*(params[n].(*string)) = LpOleStrToString(*(**uint16)(unsafe.Pointer(uintptr(varg.Val))))
+		}
+	}
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/ienumvariant.go b/vendor/github.com/go-ole/go-ole/ienumvariant.go
new file mode 100644
index 0000000000..2433897544
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/ienumvariant.go
@@ -0,0 +1,19 @@
+package ole
+
+import "unsafe"
+
+type IEnumVARIANT struct {
+	IUnknown
+}
+
+type IEnumVARIANTVtbl struct {
+	IUnknownVtbl
+	Next  uintptr
+	Skip  uintptr
+	Reset uintptr
+	Clone uintptr
+}
+
+func (v *IEnumVARIANT) VTable() *IEnumVARIANTVtbl {
+	return (*IEnumVARIANTVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/vendor/github.com/go-ole/go-ole/ienumvariant_func.go b/vendor/github.com/go-ole/go-ole/ienumvariant_func.go
new file mode 100644
index 0000000000..c14848199c
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/ienumvariant_func.go
@@ -0,0 +1,19 @@
+// +build !windows
+
+package ole
+
+func (enum *IEnumVARIANT) Clone() (*IEnumVARIANT, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+func (enum *IEnumVARIANT) Reset() error {
+	return NewError(E_NOTIMPL)
+}
+
+func (enum *IEnumVARIANT) Skip(celt uint) error {
+	return NewError(E_NOTIMPL)
+}
+
+func (enum *IEnumVARIANT) Next(celt uint) (VARIANT, uint, error) {
+	return NewVariant(VT_NULL, int64(0)), 0, NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/ienumvariant_windows.go b/vendor/github.com/go-ole/go-ole/ienumvariant_windows.go
new file mode 100644
index 0000000000..4781f3b8b0
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/ienumvariant_windows.go
@@ -0,0 +1,63 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func (enum *IEnumVARIANT) Clone() (cloned *IEnumVARIANT, err error) {
+	hr, _, _ := syscall.Syscall(
+		enum.VTable().Clone,
+		2,
+		uintptr(unsafe.Pointer(enum)),
+		uintptr(unsafe.Pointer(&cloned)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (enum *IEnumVARIANT) Reset() (err error) {
+	hr, _, _ := syscall.Syscall(
+		enum.VTable().Reset,
+		1,
+		uintptr(unsafe.Pointer(enum)),
+		0,
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (enum *IEnumVARIANT) Skip(celt uint) (err error) {
+	hr, _, _ := syscall.Syscall(
+		enum.VTable().Skip,
+		2,
+		uintptr(unsafe.Pointer(enum)),
+		uintptr(celt),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func (enum *IEnumVARIANT) Next(celt uint) (array VARIANT, length uint, err error) {
+	hr, _, _ := syscall.Syscall6(
+		enum.VTable().Next,
+		4,
+		uintptr(unsafe.Pointer(enum)),
+		uintptr(celt),
+		uintptr(unsafe.Pointer(&array)),
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/iinspectable.go b/vendor/github.com/go-ole/go-ole/iinspectable.go
new file mode 100644
index 0000000000..f4a19e253a
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iinspectable.go
@@ -0,0 +1,18 @@
+package ole
+
+import "unsafe"
+
+type IInspectable struct {
+	IUnknown
+}
+
+type IInspectableVtbl struct {
+	IUnknownVtbl
+	GetIIds             uintptr
+	GetRuntimeClassName uintptr
+	GetTrustLevel       uintptr
+}
+
+func (v *IInspectable) VTable() *IInspectableVtbl {
+	return (*IInspectableVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/vendor/github.com/go-ole/go-ole/iinspectable_func.go b/vendor/github.com/go-ole/go-ole/iinspectable_func.go
new file mode 100644
index 0000000000..348829bf06
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iinspectable_func.go
@@ -0,0 +1,15 @@
+// +build !windows
+
+package ole
+
+func (v *IInspectable) GetIids() ([]*GUID, error) {
+	return []*GUID{}, NewError(E_NOTIMPL)
+}
+
+func (v *IInspectable) GetRuntimeClassName() (string, error) {
+	return "", NewError(E_NOTIMPL)
+}
+
+func (v *IInspectable) GetTrustLevel() (uint32, error) {
+	return uint32(0), NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/iinspectable_windows.go b/vendor/github.com/go-ole/go-ole/iinspectable_windows.go
new file mode 100644
index 0000000000..4519a4aa44
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iinspectable_windows.go
@@ -0,0 +1,72 @@
+// +build windows
+
+package ole
+
+import (
+	"bytes"
+	"encoding/binary"
+	"reflect"
+	"syscall"
+	"unsafe"
+)
+
+func (v *IInspectable) GetIids() (iids []*GUID, err error) {
+	var count uint32
+	var array uintptr
+	hr, _, _ := syscall.Syscall(
+		v.VTable().GetIIds,
+		3,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(&count)),
+		uintptr(unsafe.Pointer(&array)))
+	if hr != 0 {
+		err = NewError(hr)
+		return
+	}
+	defer CoTaskMemFree(array)
+
+	iids = make([]*GUID, count)
+	byteCount := count * uint32(unsafe.Sizeof(GUID{}))
+	slicehdr := reflect.SliceHeader{Data: array, Len: int(byteCount), Cap: int(byteCount)}
+	byteSlice := *(*[]byte)(unsafe.Pointer(&slicehdr))
+	reader := bytes.NewReader(byteSlice)
+	for i := range iids {
+		guid := GUID{}
+		err = binary.Read(reader, binary.LittleEndian, &guid)
+		if err != nil {
+			return
+		}
+		iids[i] = &guid
+	}
+	return
+}
+
+func (v *IInspectable) GetRuntimeClassName() (s string, err error) {
+	var hstring HString
+	hr, _, _ := syscall.Syscall(
+		v.VTable().GetRuntimeClassName,
+		2,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(&hstring)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+		return
+	}
+	s = hstring.String()
+	DeleteHString(hstring)
+	return
+}
+
+func (v *IInspectable) GetTrustLevel() (level uint32, err error) {
+	hr, _, _ := syscall.Syscall(
+		v.VTable().GetTrustLevel,
+		2,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(&level)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/iprovideclassinfo.go b/vendor/github.com/go-ole/go-ole/iprovideclassinfo.go
new file mode 100644
index 0000000000..25f3a6f24a
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iprovideclassinfo.go
@@ -0,0 +1,21 @@
+package ole
+
+import "unsafe"
+
+type IProvideClassInfo struct {
+	IUnknown
+}
+
+type IProvideClassInfoVtbl struct {
+	IUnknownVtbl
+	GetClassInfo uintptr
+}
+
+func (v *IProvideClassInfo) VTable() *IProvideClassInfoVtbl {
+	return (*IProvideClassInfoVtbl)(unsafe.Pointer(v.RawVTable))
+}
+
+func (v *IProvideClassInfo) GetClassInfo() (cinfo *ITypeInfo, err error) {
+	cinfo, err = getClassInfo(v)
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/iprovideclassinfo_func.go b/vendor/github.com/go-ole/go-ole/iprovideclassinfo_func.go
new file mode 100644
index 0000000000..7e3cb63ea7
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iprovideclassinfo_func.go
@@ -0,0 +1,7 @@
+// +build !windows
+
+package ole
+
+func getClassInfo(disp *IProvideClassInfo) (tinfo *ITypeInfo, err error) {
+	return nil, NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/iprovideclassinfo_windows.go b/vendor/github.com/go-ole/go-ole/iprovideclassinfo_windows.go
new file mode 100644
index 0000000000..2ad0163949
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iprovideclassinfo_windows.go
@@ -0,0 +1,21 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func getClassInfo(disp *IProvideClassInfo) (tinfo *ITypeInfo, err error) {
+	hr, _, _ := syscall.Syscall(
+		disp.VTable().GetClassInfo,
+		2,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(unsafe.Pointer(&tinfo)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/itypeinfo.go b/vendor/github.com/go-ole/go-ole/itypeinfo.go
new file mode 100644
index 0000000000..dd3c5e21bb
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/itypeinfo.go
@@ -0,0 +1,34 @@
+package ole
+
+import "unsafe"
+
+type ITypeInfo struct {
+	IUnknown
+}
+
+type ITypeInfoVtbl struct {
+	IUnknownVtbl
+	GetTypeAttr          uintptr
+	GetTypeComp          uintptr
+	GetFuncDesc          uintptr
+	GetVarDesc           uintptr
+	GetNames             uintptr
+	GetRefTypeOfImplType uintptr
+	GetImplTypeFlags     uintptr
+	GetIDsOfNames        uintptr
+	Invoke               uintptr
+	GetDocumentation     uintptr
+	GetDllEntry          uintptr
+	GetRefTypeInfo       uintptr
+	AddressOfMember      uintptr
+	CreateInstance       uintptr
+	GetMops              uintptr
+	GetContainingTypeLib uintptr
+	ReleaseTypeAttr      uintptr
+	ReleaseFuncDesc      uintptr
+	ReleaseVarDesc       uintptr
+}
+
+func (v *ITypeInfo) VTable() *ITypeInfoVtbl {
+	return (*ITypeInfoVtbl)(unsafe.Pointer(v.RawVTable))
+}
diff --git a/vendor/github.com/go-ole/go-ole/itypeinfo_func.go b/vendor/github.com/go-ole/go-ole/itypeinfo_func.go
new file mode 100644
index 0000000000..8364a659ba
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/itypeinfo_func.go
@@ -0,0 +1,7 @@
+// +build !windows
+
+package ole
+
+func (v *ITypeInfo) GetTypeAttr() (*TYPEATTR, error) {
+	return nil, NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/itypeinfo_windows.go b/vendor/github.com/go-ole/go-ole/itypeinfo_windows.go
new file mode 100644
index 0000000000..54782b3da5
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/itypeinfo_windows.go
@@ -0,0 +1,21 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func (v *ITypeInfo) GetTypeAttr() (tattr *TYPEATTR, err error) {
+	hr, _, _ := syscall.Syscall(
+		uintptr(v.VTable().GetTypeAttr),
+		2,
+		uintptr(unsafe.Pointer(v)),
+		uintptr(unsafe.Pointer(&tattr)),
+		0)
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/iunknown.go b/vendor/github.com/go-ole/go-ole/iunknown.go
new file mode 100644
index 0000000000..108f28ea61
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iunknown.go
@@ -0,0 +1,57 @@
+package ole
+
+import "unsafe"
+
+type IUnknown struct {
+	RawVTable *interface{}
+}
+
+type IUnknownVtbl struct {
+	QueryInterface uintptr
+	AddRef         uintptr
+	Release        uintptr
+}
+
+type UnknownLike interface {
+	QueryInterface(iid *GUID) (disp *IDispatch, err error)
+	AddRef() int32
+	Release() int32
+}
+
+func (v *IUnknown) VTable() *IUnknownVtbl {
+	return (*IUnknownVtbl)(unsafe.Pointer(v.RawVTable))
+}
+
+func (v *IUnknown) PutQueryInterface(interfaceID *GUID, obj interface{}) error {
+	return reflectQueryInterface(v, v.VTable().QueryInterface, interfaceID, obj)
+}
+
+func (v *IUnknown) IDispatch(interfaceID *GUID) (dispatch *IDispatch, err error) {
+	err = v.PutQueryInterface(interfaceID, &dispatch)
+	return
+}
+
+func (v *IUnknown) IEnumVARIANT(interfaceID *GUID) (enum *IEnumVARIANT, err error) {
+	err = v.PutQueryInterface(interfaceID, &enum)
+	return
+}
+
+func (v *IUnknown) QueryInterface(iid *GUID) (*IDispatch, error) {
+	return queryInterface(v, iid)
+}
+
+func (v *IUnknown) MustQueryInterface(iid *GUID) (disp *IDispatch) {
+	unk, err := queryInterface(v, iid)
+	if err != nil {
+		panic(err)
+	}
+	return unk
+}
+
+func (v *IUnknown) AddRef() int32 {
+	return addRef(v)
+}
+
+func (v *IUnknown) Release() int32 {
+	return release(v)
+}
diff --git a/vendor/github.com/go-ole/go-ole/iunknown_func.go b/vendor/github.com/go-ole/go-ole/iunknown_func.go
new file mode 100644
index 0000000000..d0a62cfd73
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iunknown_func.go
@@ -0,0 +1,19 @@
+// +build !windows
+
+package ole
+
+func reflectQueryInterface(self interface{}, method uintptr, interfaceID *GUID, obj interface{}) (err error) {
+	return NewError(E_NOTIMPL)
+}
+
+func queryInterface(unk *IUnknown, iid *GUID) (disp *IDispatch, err error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+func addRef(unk *IUnknown) int32 {
+	return 0
+}
+
+func release(unk *IUnknown) int32 {
+	return 0
+}
diff --git a/vendor/github.com/go-ole/go-ole/iunknown_windows.go b/vendor/github.com/go-ole/go-ole/iunknown_windows.go
new file mode 100644
index 0000000000..ede5bb8c17
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/iunknown_windows.go
@@ -0,0 +1,58 @@
+// +build windows
+
+package ole
+
+import (
+	"reflect"
+	"syscall"
+	"unsafe"
+)
+
+func reflectQueryInterface(self interface{}, method uintptr, interfaceID *GUID, obj interface{}) (err error) {
+	selfValue := reflect.ValueOf(self).Elem()
+	objValue := reflect.ValueOf(obj).Elem()
+
+	hr, _, _ := syscall.Syscall(
+		method,
+		3,
+		selfValue.UnsafeAddr(),
+		uintptr(unsafe.Pointer(interfaceID)),
+		objValue.Addr().Pointer())
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func queryInterface(unk *IUnknown, iid *GUID) (disp *IDispatch, err error) {
+	hr, _, _ := syscall.Syscall(
+		unk.VTable().QueryInterface,
+		3,
+		uintptr(unsafe.Pointer(unk)),
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(&disp)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func addRef(unk *IUnknown) int32 {
+	ret, _, _ := syscall.Syscall(
+		unk.VTable().AddRef,
+		1,
+		uintptr(unsafe.Pointer(unk)),
+		0,
+		0)
+	return int32(ret)
+}
+
+func release(unk *IUnknown) int32 {
+	ret, _, _ := syscall.Syscall(
+		unk.VTable().Release,
+		1,
+		uintptr(unsafe.Pointer(unk)),
+		0,
+		0)
+	return int32(ret)
+}
diff --git a/vendor/github.com/go-ole/go-ole/ole.go b/vendor/github.com/go-ole/go-ole/ole.go
new file mode 100644
index 0000000000..b92b4ea189
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/ole.go
@@ -0,0 +1,147 @@
+package ole
+
+import (
+	"fmt"
+	"strings"
+)
+
+// DISPPARAMS are the arguments that passed to methods or property.
+type DISPPARAMS struct {
+	rgvarg            uintptr
+	rgdispidNamedArgs uintptr
+	cArgs             uint32
+	cNamedArgs        uint32
+}
+
+// EXCEPINFO defines exception info.
+type EXCEPINFO struct {
+	wCode             uint16
+	wReserved         uint16
+	bstrSource        *uint16
+	bstrDescription   *uint16
+	bstrHelpFile      *uint16
+	dwHelpContext     uint32
+	pvReserved        uintptr
+	pfnDeferredFillIn uintptr
+	scode             uint32
+}
+
+// String convert EXCEPINFO to string.
+func (e EXCEPINFO) String() string {
+	var src, desc, hlp string
+	if e.bstrSource == nil {
+		src = "<nil>"
+	} else {
+		src = BstrToString(e.bstrSource)
+	}
+
+	if e.bstrDescription == nil {
+		desc = "<nil>"
+	} else {
+		desc = BstrToString(e.bstrDescription)
+	}
+
+	if e.bstrHelpFile == nil {
+		hlp = "<nil>"
+	} else {
+		hlp = BstrToString(e.bstrHelpFile)
+	}
+
+	return fmt.Sprintf(
+		"wCode: %#x, bstrSource: %v, bstrDescription: %v, bstrHelpFile: %v, dwHelpContext: %#x, scode: %#x",
+		e.wCode, src, desc, hlp, e.dwHelpContext, e.scode,
+	)
+}
+
+// Error implements error interface and returns error string.
+func (e EXCEPINFO) Error() string {
+	if e.bstrDescription != nil {
+		return strings.TrimSpace(BstrToString(e.bstrDescription))
+	}
+
+	src := "Unknown"
+	if e.bstrSource != nil {
+		src = BstrToString(e.bstrSource)
+	}
+
+	code := e.scode
+	if e.wCode != 0 {
+		code = uint32(e.wCode)
+	}
+
+	return fmt.Sprintf("%v: %#x", src, code)
+}
+
+// PARAMDATA defines parameter data type.
+type PARAMDATA struct {
+	Name *int16
+	Vt   uint16
+}
+
+// METHODDATA defines method info.
+type METHODDATA struct {
+	Name     *uint16
+	Data     *PARAMDATA
+	Dispid   int32
+	Meth     uint32
+	CC       int32
+	CArgs    uint32
+	Flags    uint16
+	VtReturn uint32
+}
+
+// INTERFACEDATA defines interface info.
+type INTERFACEDATA struct {
+	MethodData *METHODDATA
+	CMembers   uint32
+}
+
+// Point is 2D vector type.
+type Point struct {
+	X int32
+	Y int32
+}
+
+// Msg is message between processes.
+type Msg struct {
+	Hwnd    uint32
+	Message uint32
+	Wparam  int32
+	Lparam  int32
+	Time    uint32
+	Pt      Point
+}
+
+// TYPEDESC defines data type.
+type TYPEDESC struct {
+	Hreftype uint32
+	VT       uint16
+}
+
+// IDLDESC defines IDL info.
+type IDLDESC struct {
+	DwReserved uint32
+	WIDLFlags  uint16
+}
+
+// TYPEATTR defines type info.
+type TYPEATTR struct {
+	Guid             GUID
+	Lcid             uint32
+	dwReserved       uint32
+	MemidConstructor int32
+	MemidDestructor  int32
+	LpstrSchema      *uint16
+	CbSizeInstance   uint32
+	Typekind         int32
+	CFuncs           uint16
+	CVars            uint16
+	CImplTypes       uint16
+	CbSizeVft        uint16
+	CbAlignment      uint16
+	WTypeFlags       uint16
+	WMajorVerNum     uint16
+	WMinorVerNum     uint16
+	TdescAlias       TYPEDESC
+	IdldescType      IDLDESC
+}
diff --git a/vendor/github.com/go-ole/go-ole/oleutil/connection.go b/vendor/github.com/go-ole/go-ole/oleutil/connection.go
new file mode 100644
index 0000000000..60df73cda0
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/oleutil/connection.go
@@ -0,0 +1,100 @@
+// +build windows
+
+package oleutil
+
+import (
+	"reflect"
+	"unsafe"
+
+	ole "github.com/go-ole/go-ole"
+)
+
+type stdDispatch struct {
+	lpVtbl  *stdDispatchVtbl
+	ref     int32
+	iid     *ole.GUID
+	iface   interface{}
+	funcMap map[string]int32
+}
+
+type stdDispatchVtbl struct {
+	pQueryInterface   uintptr
+	pAddRef           uintptr
+	pRelease          uintptr
+	pGetTypeInfoCount uintptr
+	pGetTypeInfo      uintptr
+	pGetIDsOfNames    uintptr
+	pInvoke           uintptr
+}
+
+func dispQueryInterface(this *ole.IUnknown, iid *ole.GUID, punk **ole.IUnknown) uint32 {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	*punk = nil
+	if ole.IsEqualGUID(iid, ole.IID_IUnknown) ||
+		ole.IsEqualGUID(iid, ole.IID_IDispatch) {
+		dispAddRef(this)
+		*punk = this
+		return ole.S_OK
+	}
+	if ole.IsEqualGUID(iid, pthis.iid) {
+		dispAddRef(this)
+		*punk = this
+		return ole.S_OK
+	}
+	return ole.E_NOINTERFACE
+}
+
+func dispAddRef(this *ole.IUnknown) int32 {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	pthis.ref++
+	return pthis.ref
+}
+
+func dispRelease(this *ole.IUnknown) int32 {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	pthis.ref--
+	return pthis.ref
+}
+
+func dispGetIDsOfNames(this *ole.IUnknown, iid *ole.GUID, wnames []*uint16, namelen int, lcid int, pdisp []int32) uintptr {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	names := make([]string, len(wnames))
+	for i := 0; i < len(names); i++ {
+		names[i] = ole.LpOleStrToString(wnames[i])
+	}
+	for n := 0; n < namelen; n++ {
+		if id, ok := pthis.funcMap[names[n]]; ok {
+			pdisp[n] = id
+		}
+	}
+	return ole.S_OK
+}
+
+func dispGetTypeInfoCount(pcount *int) uintptr {
+	if pcount != nil {
+		*pcount = 0
+	}
+	return ole.S_OK
+}
+
+func dispGetTypeInfo(ptypeif *uintptr) uintptr {
+	return ole.E_NOTIMPL
+}
+
+func dispInvoke(this *ole.IDispatch, dispid int32, riid *ole.GUID, lcid int, flags int16, dispparams *ole.DISPPARAMS, result *ole.VARIANT, pexcepinfo *ole.EXCEPINFO, nerr *uint) uintptr {
+	pthis := (*stdDispatch)(unsafe.Pointer(this))
+	found := ""
+	for name, id := range pthis.funcMap {
+		if id == dispid {
+			found = name
+		}
+	}
+	if found != "" {
+		rv := reflect.ValueOf(pthis.iface).Elem()
+		rm := rv.MethodByName(found)
+		rr := rm.Call([]reflect.Value{})
+		println(len(rr))
+		return ole.S_OK
+	}
+	return ole.E_NOTIMPL
+}
diff --git a/vendor/github.com/go-ole/go-ole/oleutil/connection_func.go b/vendor/github.com/go-ole/go-ole/oleutil/connection_func.go
new file mode 100644
index 0000000000..8818fb8275
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/oleutil/connection_func.go
@@ -0,0 +1,10 @@
+// +build !windows
+
+package oleutil
+
+import ole "github.com/go-ole/go-ole"
+
+// ConnectObject creates a connection point between two services for communication.
+func ConnectObject(disp *ole.IDispatch, iid *ole.GUID, idisp interface{}) (uint32, error) {
+	return 0, ole.NewError(ole.E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/oleutil/connection_windows.go b/vendor/github.com/go-ole/go-ole/oleutil/connection_windows.go
new file mode 100644
index 0000000000..6b5c059993
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/oleutil/connection_windows.go
@@ -0,0 +1,57 @@
+// +build windows
+
+package oleutil
+
+import (
+	"reflect"
+	"syscall"
+	"unsafe"
+
+	ole "github.com/go-ole/go-ole"
+)
+
+// ConnectObject creates a connection point between two services for communication.
+func ConnectObject(disp *ole.IDispatch, iid *ole.GUID, idisp interface{}) (cookie uint32, err error) {
+	unknown, err := disp.QueryInterface(ole.IID_IConnectionPointContainer)
+	if err != nil {
+		return
+	}
+
+	container := (*ole.IConnectionPointContainer)(unsafe.Pointer(unknown))
+	var point *ole.IConnectionPoint
+	err = container.FindConnectionPoint(iid, &point)
+	if err != nil {
+		return
+	}
+	if edisp, ok := idisp.(*ole.IUnknown); ok {
+		cookie, err = point.Advise(edisp)
+		container.Release()
+		if err != nil {
+			return
+		}
+	}
+	rv := reflect.ValueOf(disp).Elem()
+	if rv.Type().Kind() == reflect.Struct {
+		dest := &stdDispatch{}
+		dest.lpVtbl = &stdDispatchVtbl{}
+		dest.lpVtbl.pQueryInterface = syscall.NewCallback(dispQueryInterface)
+		dest.lpVtbl.pAddRef = syscall.NewCallback(dispAddRef)
+		dest.lpVtbl.pRelease = syscall.NewCallback(dispRelease)
+		dest.lpVtbl.pGetTypeInfoCount = syscall.NewCallback(dispGetTypeInfoCount)
+		dest.lpVtbl.pGetTypeInfo = syscall.NewCallback(dispGetTypeInfo)
+		dest.lpVtbl.pGetIDsOfNames = syscall.NewCallback(dispGetIDsOfNames)
+		dest.lpVtbl.pInvoke = syscall.NewCallback(dispInvoke)
+		dest.iface = disp
+		dest.iid = iid
+		cookie, err = point.Advise((*ole.IUnknown)(unsafe.Pointer(dest)))
+		container.Release()
+		if err != nil {
+			point.Release()
+			return
+		}
+	}
+
+	container.Release()
+
+	return 0, ole.NewError(ole.E_INVALIDARG)
+}
diff --git a/vendor/github.com/go-ole/go-ole/oleutil/go-get.go b/vendor/github.com/go-ole/go-ole/oleutil/go-get.go
new file mode 100644
index 0000000000..58347628f2
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/oleutil/go-get.go
@@ -0,0 +1,6 @@
+// This file is here so go get succeeds as without it errors with:
+// no buildable Go source files in ...
+//
+// +build !windows
+
+package oleutil
diff --git a/vendor/github.com/go-ole/go-ole/oleutil/oleutil.go b/vendor/github.com/go-ole/go-ole/oleutil/oleutil.go
new file mode 100644
index 0000000000..55e072a636
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/oleutil/oleutil.go
@@ -0,0 +1,89 @@
+package oleutil
+
+import ole "github.com/go-ole/go-ole"
+
+// ClassIDFrom retrieves class ID whether given is program ID or application string.
+func ClassIDFrom(programID string) (classID *ole.GUID, err error) {
+	return ole.ClassIDFrom(programID)
+}
+
+// CreateObject creates object from programID based on interface type.
+//
+// Only supports IUnknown.
+//
+// Program ID can be either program ID or application string.
+func CreateObject(programID string) (unknown *ole.IUnknown, err error) {
+	classID, err := ole.ClassIDFrom(programID)
+	if err != nil {
+		return
+	}
+
+	unknown, err = ole.CreateInstance(classID, ole.IID_IUnknown)
+	if err != nil {
+		return
+	}
+
+	return
+}
+
+// GetActiveObject retrieves active object for program ID and interface ID based
+// on interface type.
+//
+// Only supports IUnknown.
+//
+// Program ID can be either program ID or application string.
+func GetActiveObject(programID string) (unknown *ole.IUnknown, err error) {
+	classID, err := ole.ClassIDFrom(programID)
+	if err != nil {
+		return
+	}
+
+	unknown, err = ole.GetActiveObject(classID, ole.IID_IUnknown)
+	if err != nil {
+		return
+	}
+
+	return
+}
+
+// CallMethod calls method on IDispatch with parameters.
+func CallMethod(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT, err error) {
+	return disp.InvokeWithOptionalArgs(name, ole.DISPATCH_METHOD, params)
+}
+
+// MustCallMethod calls method on IDispatch with parameters or panics.
+func MustCallMethod(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT) {
+	r, err := CallMethod(disp, name, params...)
+	if err != nil {
+		panic(err.Error())
+	}
+	return r
+}
+
+// GetProperty retrieves property from IDispatch.
+func GetProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT, err error) {
+	return disp.InvokeWithOptionalArgs(name, ole.DISPATCH_PROPERTYGET, params)
+}
+
+// MustGetProperty retrieves property from IDispatch or panics.
+func MustGetProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT) {
+	r, err := GetProperty(disp, name, params...)
+	if err != nil {
+		panic(err.Error())
+	}
+	return r
+}
+
+// PutProperty mutates property.
+func PutProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT, err error) {
+	return disp.InvokeWithOptionalArgs(name, ole.DISPATCH_PROPERTYPUT, params)
+}
+
+// MustPutProperty mutates property or panics.
+func MustPutProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT) {
+	r, err := PutProperty(disp, name, params...)
+	if err != nil {
+		panic(err.Error())
+	}
+	return r
+}
diff --git a/vendor/github.com/go-ole/go-ole/safearray.go b/vendor/github.com/go-ole/go-ole/safearray.go
new file mode 100644
index 0000000000..a5201b56c3
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/safearray.go
@@ -0,0 +1,27 @@
+// Package is meant to retrieve and process safe array data returned from COM.
+
+package ole
+
+// SafeArrayBound defines the SafeArray boundaries.
+type SafeArrayBound struct {
+	Elements   uint32
+	LowerBound int32
+}
+
+// SafeArray is how COM handles arrays.
+type SafeArray struct {
+	Dimensions   uint16
+	FeaturesFlag uint16
+	ElementsSize uint32
+	LocksAmount  uint32
+	Data         uint32
+	Bounds       [16]byte
+}
+
+// SAFEARRAY is obsolete, exists for backwards compatibility.
+// Use SafeArray
+type SAFEARRAY SafeArray
+
+// SAFEARRAYBOUND is obsolete, exists for backwards compatibility.
+// Use SafeArrayBound
+type SAFEARRAYBOUND SafeArrayBound
diff --git a/vendor/github.com/go-ole/go-ole/safearray_func.go b/vendor/github.com/go-ole/go-ole/safearray_func.go
new file mode 100644
index 0000000000..8ff0baa41d
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/safearray_func.go
@@ -0,0 +1,211 @@
+// +build !windows
+
+package ole
+
+import (
+	"unsafe"
+)
+
+// safeArrayAccessData returns raw array pointer.
+//
+// AKA: SafeArrayAccessData in Windows API.
+func safeArrayAccessData(safearray *SafeArray) (uintptr, error) {
+	return uintptr(0), NewError(E_NOTIMPL)
+}
+
+// safeArrayUnaccessData releases raw array.
+//
+// AKA: SafeArrayUnaccessData in Windows API.
+func safeArrayUnaccessData(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayAllocData allocates SafeArray.
+//
+// AKA: SafeArrayAllocData in Windows API.
+func safeArrayAllocData(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayAllocDescriptor allocates SafeArray.
+//
+// AKA: SafeArrayAllocDescriptor in Windows API.
+func safeArrayAllocDescriptor(dimensions uint32) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayAllocDescriptorEx allocates SafeArray.
+//
+// AKA: SafeArrayAllocDescriptorEx in Windows API.
+func safeArrayAllocDescriptorEx(variantType VT, dimensions uint32) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCopy returns copy of SafeArray.
+//
+// AKA: SafeArrayCopy in Windows API.
+func safeArrayCopy(original *SafeArray) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCopyData duplicates SafeArray into another SafeArray object.
+//
+// AKA: SafeArrayCopyData in Windows API.
+func safeArrayCopyData(original *SafeArray, duplicate *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayCreate creates SafeArray.
+//
+// AKA: SafeArrayCreate in Windows API.
+func safeArrayCreate(variantType VT, dimensions uint32, bounds *SafeArrayBound) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCreateEx creates SafeArray.
+//
+// AKA: SafeArrayCreateEx in Windows API.
+func safeArrayCreateEx(variantType VT, dimensions uint32, bounds *SafeArrayBound, extra uintptr) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCreateVector creates SafeArray.
+//
+// AKA: SafeArrayCreateVector in Windows API.
+func safeArrayCreateVector(variantType VT, lowerBound int32, length uint32) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayCreateVectorEx creates SafeArray.
+//
+// AKA: SafeArrayCreateVectorEx in Windows API.
+func safeArrayCreateVectorEx(variantType VT, lowerBound int32, length uint32, extra uintptr) (*SafeArray, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayDestroy destroys SafeArray object.
+//
+// AKA: SafeArrayDestroy in Windows API.
+func safeArrayDestroy(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayDestroyData destroys SafeArray object.
+//
+// AKA: SafeArrayDestroyData in Windows API.
+func safeArrayDestroyData(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayDestroyDescriptor destroys SafeArray object.
+//
+// AKA: SafeArrayDestroyDescriptor in Windows API.
+func safeArrayDestroyDescriptor(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayGetDim is the amount of dimensions in the SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetDim in Windows API.
+func safeArrayGetDim(safearray *SafeArray) (*uint32, error) {
+	u := uint32(0)
+	return &u, NewError(E_NOTIMPL)
+}
+
+// safeArrayGetElementSize is the element size in bytes.
+//
+// AKA: SafeArrayGetElemsize in Windows API.
+func safeArrayGetElementSize(safearray *SafeArray) (*uint32, error) {
+	u := uint32(0)
+	return &u, NewError(E_NOTIMPL)
+}
+
+// safeArrayGetElement retrieves element at given index.
+func safeArrayGetElement(safearray *SafeArray, index int64, pv unsafe.Pointer) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayGetElement retrieves element at given index and converts to string.
+func safeArrayGetElementString(safearray *SafeArray, index int64) (string, error) {
+	return "", NewError(E_NOTIMPL)
+}
+
+// safeArrayGetIID is the InterfaceID of the elements in the SafeArray.
+//
+// AKA: SafeArrayGetIID in Windows API.
+func safeArrayGetIID(safearray *SafeArray) (*GUID, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArrayGetLBound returns lower bounds of SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetLBound in Windows API.
+func safeArrayGetLBound(safearray *SafeArray, dimension uint32) (int64, error) {
+	return int64(0), NewError(E_NOTIMPL)
+}
+
+// safeArrayGetUBound returns upper bounds of SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetUBound in Windows API.
+func safeArrayGetUBound(safearray *SafeArray, dimension uint32) (int64, error) {
+	return int64(0), NewError(E_NOTIMPL)
+}
+
+// safeArrayGetVartype returns data type of SafeArray.
+//
+// AKA: SafeArrayGetVartype in Windows API.
+func safeArrayGetVartype(safearray *SafeArray) (uint16, error) {
+	return uint16(0), NewError(E_NOTIMPL)
+}
+
+// safeArrayLock locks SafeArray for reading to modify SafeArray.
+//
+// This must be called during some calls to ensure that another process does not
+// read or write to the SafeArray during editing.
+//
+// AKA: SafeArrayLock in Windows API.
+func safeArrayLock(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayUnlock unlocks SafeArray for reading.
+//
+// AKA: SafeArrayUnlock in Windows API.
+func safeArrayUnlock(safearray *SafeArray) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayPutElement stores the data element at the specified location in the
+// array.
+//
+// AKA: SafeArrayPutElement in Windows API.
+func safeArrayPutElement(safearray *SafeArray, index int64, element uintptr) error {
+	return NewError(E_NOTIMPL)
+}
+
+// safeArrayGetRecordInfo accesses IRecordInfo info for custom types.
+//
+// AKA: SafeArrayGetRecordInfo in Windows API.
+//
+// XXX: Must implement IRecordInfo interface for this to return.
+func safeArrayGetRecordInfo(safearray *SafeArray) (interface{}, error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// safeArraySetRecordInfo mutates IRecordInfo info for custom types.
+//
+// AKA: SafeArraySetRecordInfo in Windows API.
+//
+// XXX: Must implement IRecordInfo interface for this to return.
+func safeArraySetRecordInfo(safearray *SafeArray, recordInfo interface{}) error {
+	return NewError(E_NOTIMPL)
+}
diff --git a/vendor/github.com/go-ole/go-ole/safearray_windows.go b/vendor/github.com/go-ole/go-ole/safearray_windows.go
new file mode 100644
index 0000000000..b27936e24e
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/safearray_windows.go
@@ -0,0 +1,337 @@
+// +build windows
+
+package ole
+
+import (
+	"unsafe"
+)
+
+var (
+	procSafeArrayAccessData, _        = modoleaut32.FindProc("SafeArrayAccessData")
+	procSafeArrayAllocData, _         = modoleaut32.FindProc("SafeArrayAllocData")
+	procSafeArrayAllocDescriptor, _   = modoleaut32.FindProc("SafeArrayAllocDescriptor")
+	procSafeArrayAllocDescriptorEx, _ = modoleaut32.FindProc("SafeArrayAllocDescriptorEx")
+	procSafeArrayCopy, _              = modoleaut32.FindProc("SafeArrayCopy")
+	procSafeArrayCopyData, _          = modoleaut32.FindProc("SafeArrayCopyData")
+	procSafeArrayCreate, _            = modoleaut32.FindProc("SafeArrayCreate")
+	procSafeArrayCreateEx, _          = modoleaut32.FindProc("SafeArrayCreateEx")
+	procSafeArrayCreateVector, _      = modoleaut32.FindProc("SafeArrayCreateVector")
+	procSafeArrayCreateVectorEx, _    = modoleaut32.FindProc("SafeArrayCreateVectorEx")
+	procSafeArrayDestroy, _           = modoleaut32.FindProc("SafeArrayDestroy")
+	procSafeArrayDestroyData, _       = modoleaut32.FindProc("SafeArrayDestroyData")
+	procSafeArrayDestroyDescriptor, _ = modoleaut32.FindProc("SafeArrayDestroyDescriptor")
+	procSafeArrayGetDim, _            = modoleaut32.FindProc("SafeArrayGetDim")
+	procSafeArrayGetElement, _        = modoleaut32.FindProc("SafeArrayGetElement")
+	procSafeArrayGetElemsize, _       = modoleaut32.FindProc("SafeArrayGetElemsize")
+	procSafeArrayGetIID, _            = modoleaut32.FindProc("SafeArrayGetIID")
+	procSafeArrayGetLBound, _         = modoleaut32.FindProc("SafeArrayGetLBound")
+	procSafeArrayGetUBound, _         = modoleaut32.FindProc("SafeArrayGetUBound")
+	procSafeArrayGetVartype, _        = modoleaut32.FindProc("SafeArrayGetVartype")
+	procSafeArrayLock, _              = modoleaut32.FindProc("SafeArrayLock")
+	procSafeArrayPtrOfIndex, _        = modoleaut32.FindProc("SafeArrayPtrOfIndex")
+	procSafeArrayUnaccessData, _      = modoleaut32.FindProc("SafeArrayUnaccessData")
+	procSafeArrayUnlock, _            = modoleaut32.FindProc("SafeArrayUnlock")
+	procSafeArrayPutElement, _        = modoleaut32.FindProc("SafeArrayPutElement")
+	//procSafeArrayRedim, _             = modoleaut32.FindProc("SafeArrayRedim") // TODO
+	//procSafeArraySetIID, _            = modoleaut32.FindProc("SafeArraySetIID") // TODO
+	procSafeArrayGetRecordInfo, _ = modoleaut32.FindProc("SafeArrayGetRecordInfo")
+	procSafeArraySetRecordInfo, _ = modoleaut32.FindProc("SafeArraySetRecordInfo")
+)
+
+// safeArrayAccessData returns raw array pointer.
+//
+// AKA: SafeArrayAccessData in Windows API.
+// Todo: Test
+func safeArrayAccessData(safearray *SafeArray) (element uintptr, err error) {
+	err = convertHresultToError(
+		procSafeArrayAccessData.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&element))))
+	return
+}
+
+// safeArrayUnaccessData releases raw array.
+//
+// AKA: SafeArrayUnaccessData in Windows API.
+func safeArrayUnaccessData(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayUnaccessData.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayAllocData allocates SafeArray.
+//
+// AKA: SafeArrayAllocData in Windows API.
+func safeArrayAllocData(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayAllocData.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayAllocDescriptor allocates SafeArray.
+//
+// AKA: SafeArrayAllocDescriptor in Windows API.
+func safeArrayAllocDescriptor(dimensions uint32) (safearray *SafeArray, err error) {
+	err = convertHresultToError(
+		procSafeArrayAllocDescriptor.Call(uintptr(dimensions), uintptr(unsafe.Pointer(&safearray))))
+	return
+}
+
+// safeArrayAllocDescriptorEx allocates SafeArray.
+//
+// AKA: SafeArrayAllocDescriptorEx in Windows API.
+func safeArrayAllocDescriptorEx(variantType VT, dimensions uint32) (safearray *SafeArray, err error) {
+	err = convertHresultToError(
+		procSafeArrayAllocDescriptorEx.Call(
+			uintptr(variantType),
+			uintptr(dimensions),
+			uintptr(unsafe.Pointer(&safearray))))
+	return
+}
+
+// safeArrayCopy returns copy of SafeArray.
+//
+// AKA: SafeArrayCopy in Windows API.
+func safeArrayCopy(original *SafeArray) (safearray *SafeArray, err error) {
+	err = convertHresultToError(
+		procSafeArrayCopy.Call(
+			uintptr(unsafe.Pointer(original)),
+			uintptr(unsafe.Pointer(&safearray))))
+	return
+}
+
+// safeArrayCopyData duplicates SafeArray into another SafeArray object.
+//
+// AKA: SafeArrayCopyData in Windows API.
+func safeArrayCopyData(original *SafeArray, duplicate *SafeArray) (err error) {
+	err = convertHresultToError(
+		procSafeArrayCopyData.Call(
+			uintptr(unsafe.Pointer(original)),
+			uintptr(unsafe.Pointer(duplicate))))
+	return
+}
+
+// safeArrayCreate creates SafeArray.
+//
+// AKA: SafeArrayCreate in Windows API.
+func safeArrayCreate(variantType VT, dimensions uint32, bounds *SafeArrayBound) (safearray *SafeArray, err error) {
+	sa, _, err := procSafeArrayCreate.Call(
+		uintptr(variantType),
+		uintptr(dimensions),
+		uintptr(unsafe.Pointer(bounds)))
+	safearray = (*SafeArray)(unsafe.Pointer(&sa))
+	return
+}
+
+// safeArrayCreateEx creates SafeArray.
+//
+// AKA: SafeArrayCreateEx in Windows API.
+func safeArrayCreateEx(variantType VT, dimensions uint32, bounds *SafeArrayBound, extra uintptr) (safearray *SafeArray, err error) {
+	sa, _, err := procSafeArrayCreateEx.Call(
+		uintptr(variantType),
+		uintptr(dimensions),
+		uintptr(unsafe.Pointer(bounds)),
+		extra)
+	safearray = (*SafeArray)(unsafe.Pointer(sa))
+	return
+}
+
+// safeArrayCreateVector creates SafeArray.
+//
+// AKA: SafeArrayCreateVector in Windows API.
+func safeArrayCreateVector(variantType VT, lowerBound int32, length uint32) (safearray *SafeArray, err error) {
+	sa, _, err := procSafeArrayCreateVector.Call(
+		uintptr(variantType),
+		uintptr(lowerBound),
+		uintptr(length))
+	safearray = (*SafeArray)(unsafe.Pointer(sa))
+	return
+}
+
+// safeArrayCreateVectorEx creates SafeArray.
+//
+// AKA: SafeArrayCreateVectorEx in Windows API.
+func safeArrayCreateVectorEx(variantType VT, lowerBound int32, length uint32, extra uintptr) (safearray *SafeArray, err error) {
+	sa, _, err := procSafeArrayCreateVectorEx.Call(
+		uintptr(variantType),
+		uintptr(lowerBound),
+		uintptr(length),
+		extra)
+	safearray = (*SafeArray)(unsafe.Pointer(sa))
+	return
+}
+
+// safeArrayDestroy destroys SafeArray object.
+//
+// AKA: SafeArrayDestroy in Windows API.
+func safeArrayDestroy(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayDestroy.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayDestroyData destroys SafeArray object.
+//
+// AKA: SafeArrayDestroyData in Windows API.
+func safeArrayDestroyData(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayDestroyData.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayDestroyDescriptor destroys SafeArray object.
+//
+// AKA: SafeArrayDestroyDescriptor in Windows API.
+func safeArrayDestroyDescriptor(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayDestroyDescriptor.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayGetDim is the amount of dimensions in the SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetDim in Windows API.
+func safeArrayGetDim(safearray *SafeArray) (dimensions *uint32, err error) {
+	l, _, err := procSafeArrayGetDim.Call(uintptr(unsafe.Pointer(safearray)))
+	dimensions = (*uint32)(unsafe.Pointer(l))
+	return
+}
+
+// safeArrayGetElementSize is the element size in bytes.
+//
+// AKA: SafeArrayGetElemsize in Windows API.
+func safeArrayGetElementSize(safearray *SafeArray) (length *uint32, err error) {
+	l, _, err := procSafeArrayGetElemsize.Call(uintptr(unsafe.Pointer(safearray)))
+	length = (*uint32)(unsafe.Pointer(l))
+	return
+}
+
+// safeArrayGetElement retrieves element at given index.
+func safeArrayGetElement(safearray *SafeArray, index int64, pv unsafe.Pointer) error {
+	return convertHresultToError(
+		procSafeArrayGetElement.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&index)),
+			uintptr(pv)))
+}
+
+// safeArrayGetElementString retrieves element at given index and converts to string.
+func safeArrayGetElementString(safearray *SafeArray, index int64) (str string, err error) {
+	var element *int16
+	err = convertHresultToError(
+		procSafeArrayGetElement.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&index)),
+			uintptr(unsafe.Pointer(&element))))
+	str = BstrToString(*(**uint16)(unsafe.Pointer(&element)))
+	SysFreeString(element)
+	return
+}
+
+// safeArrayGetIID is the InterfaceID of the elements in the SafeArray.
+//
+// AKA: SafeArrayGetIID in Windows API.
+func safeArrayGetIID(safearray *SafeArray) (guid *GUID, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetIID.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&guid))))
+	return
+}
+
+// safeArrayGetLBound returns lower bounds of SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetLBound in Windows API.
+func safeArrayGetLBound(safearray *SafeArray, dimension uint32) (lowerBound int64, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetLBound.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(dimension),
+			uintptr(unsafe.Pointer(&lowerBound))))
+	return
+}
+
+// safeArrayGetUBound returns upper bounds of SafeArray.
+//
+// SafeArrays may have multiple dimensions. Meaning, it could be
+// multidimensional array.
+//
+// AKA: SafeArrayGetUBound in Windows API.
+func safeArrayGetUBound(safearray *SafeArray, dimension uint32) (upperBound int64, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetUBound.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(dimension),
+			uintptr(unsafe.Pointer(&upperBound))))
+	return
+}
+
+// safeArrayGetVartype returns data type of SafeArray.
+//
+// AKA: SafeArrayGetVartype in Windows API.
+func safeArrayGetVartype(safearray *SafeArray) (varType uint16, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetVartype.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&varType))))
+	return
+}
+
+// safeArrayLock locks SafeArray for reading to modify SafeArray.
+//
+// This must be called during some calls to ensure that another process does not
+// read or write to the SafeArray during editing.
+//
+// AKA: SafeArrayLock in Windows API.
+func safeArrayLock(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayLock.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayUnlock unlocks SafeArray for reading.
+//
+// AKA: SafeArrayUnlock in Windows API.
+func safeArrayUnlock(safearray *SafeArray) (err error) {
+	err = convertHresultToError(procSafeArrayUnlock.Call(uintptr(unsafe.Pointer(safearray))))
+	return
+}
+
+// safeArrayPutElement stores the data element at the specified location in the
+// array.
+//
+// AKA: SafeArrayPutElement in Windows API.
+func safeArrayPutElement(safearray *SafeArray, index int64, element uintptr) (err error) {
+	err = convertHresultToError(
+		procSafeArrayPutElement.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&index)),
+			uintptr(unsafe.Pointer(element))))
+	return
+}
+
+// safeArrayGetRecordInfo accesses IRecordInfo info for custom types.
+//
+// AKA: SafeArrayGetRecordInfo in Windows API.
+//
+// XXX: Must implement IRecordInfo interface for this to return.
+func safeArrayGetRecordInfo(safearray *SafeArray) (recordInfo interface{}, err error) {
+	err = convertHresultToError(
+		procSafeArrayGetRecordInfo.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&recordInfo))))
+	return
+}
+
+// safeArraySetRecordInfo mutates IRecordInfo info for custom types.
+//
+// AKA: SafeArraySetRecordInfo in Windows API.
+//
+// XXX: Must implement IRecordInfo interface for this to return.
+func safeArraySetRecordInfo(safearray *SafeArray, recordInfo interface{}) (err error) {
+	err = convertHresultToError(
+		procSafeArraySetRecordInfo.Call(
+			uintptr(unsafe.Pointer(safearray)),
+			uintptr(unsafe.Pointer(&recordInfo))))
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/safearrayconversion.go b/vendor/github.com/go-ole/go-ole/safearrayconversion.go
new file mode 100644
index 0000000000..ffeb2b97b0
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/safearrayconversion.go
@@ -0,0 +1,140 @@
+// Helper for converting SafeArray to array of objects.
+
+package ole
+
+import (
+	"unsafe"
+)
+
+type SafeArrayConversion struct {
+	Array *SafeArray
+}
+
+func (sac *SafeArrayConversion) ToStringArray() (strings []string) {
+	totalElements, _ := sac.TotalElements(0)
+	strings = make([]string, totalElements)
+
+	for i := int64(0); i < totalElements; i++ {
+		strings[int32(i)], _ = safeArrayGetElementString(sac.Array, i)
+	}
+
+	return
+}
+
+func (sac *SafeArrayConversion) ToByteArray() (bytes []byte) {
+	totalElements, _ := sac.TotalElements(0)
+	bytes = make([]byte, totalElements)
+
+	for i := int64(0); i < totalElements; i++ {
+		safeArrayGetElement(sac.Array, i, unsafe.Pointer(&bytes[int32(i)]))
+	}
+
+	return
+}
+
+func (sac *SafeArrayConversion) ToValueArray() (values []interface{}) {
+	totalElements, _ := sac.TotalElements(0)
+	values = make([]interface{}, totalElements)
+	vt, _ := safeArrayGetVartype(sac.Array)
+
+	for i := 0; i < int(totalElements); i++ {
+		switch VT(vt) {
+		case VT_BOOL:
+			var v bool
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_I1:
+			var v int8
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_I2:
+			var v int16
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_I4:
+			var v int32
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_I8:
+			var v int64
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_UI1:
+			var v uint8
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_UI2:
+			var v uint16
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_UI4:
+			var v uint32
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_UI8:
+			var v uint64
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_R4:
+			var v float32
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_R8:
+			var v float64
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_BSTR:
+			var v string
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v
+		case VT_VARIANT:
+			var v VARIANT
+			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
+			values[i] = v.Value()
+		default:
+			// TODO
+		}
+	}
+
+	return
+}
+
+func (sac *SafeArrayConversion) GetType() (varType uint16, err error) {
+	return safeArrayGetVartype(sac.Array)
+}
+
+func (sac *SafeArrayConversion) GetDimensions() (dimensions *uint32, err error) {
+	return safeArrayGetDim(sac.Array)
+}
+
+func (sac *SafeArrayConversion) GetSize() (length *uint32, err error) {
+	return safeArrayGetElementSize(sac.Array)
+}
+
+func (sac *SafeArrayConversion) TotalElements(index uint32) (totalElements int64, err error) {
+	if index < 1 {
+		index = 1
+	}
+
+	// Get array bounds
+	var LowerBounds int64
+	var UpperBounds int64
+
+	LowerBounds, err = safeArrayGetLBound(sac.Array, index)
+	if err != nil {
+		return
+	}
+
+	UpperBounds, err = safeArrayGetUBound(sac.Array, index)
+	if err != nil {
+		return
+	}
+
+	totalElements = UpperBounds - LowerBounds + 1
+	return
+}
+
+// Release Safe Array memory
+func (sac *SafeArrayConversion) Release() {
+	safeArrayDestroy(sac.Array)
+}
diff --git a/vendor/github.com/go-ole/go-ole/safearrayslices.go b/vendor/github.com/go-ole/go-ole/safearrayslices.go
new file mode 100644
index 0000000000..a9fa885f1d
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/safearrayslices.go
@@ -0,0 +1,33 @@
+// +build windows
+
+package ole
+
+import (
+	"unsafe"
+)
+
+func safeArrayFromByteSlice(slice []byte) *SafeArray {
+	array, _ := safeArrayCreateVector(VT_UI1, 0, uint32(len(slice)))
+
+	if array == nil {
+		panic("Could not convert []byte to SAFEARRAY")
+	}
+
+	for i, v := range slice {
+		safeArrayPutElement(array, int64(i), uintptr(unsafe.Pointer(&v)))
+	}
+	return array
+}
+
+func safeArrayFromStringSlice(slice []string) *SafeArray {
+	array, _ := safeArrayCreateVector(VT_BSTR, 0, uint32(len(slice)))
+
+	if array == nil {
+		panic("Could not convert []string to SAFEARRAY")
+	}
+	// SysAllocStringLen(s)
+	for i, v := range slice {
+		safeArrayPutElement(array, int64(i), uintptr(unsafe.Pointer(SysAllocStringLen(v))))
+	}
+	return array
+}
diff --git a/vendor/github.com/go-ole/go-ole/utility.go b/vendor/github.com/go-ole/go-ole/utility.go
new file mode 100644
index 0000000000..99ee82dc34
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/utility.go
@@ -0,0 +1,101 @@
+package ole
+
+import (
+	"unicode/utf16"
+	"unsafe"
+)
+
+// ClassIDFrom retrieves class ID whether given is program ID or application string.
+//
+// Helper that provides check against both Class ID from Program ID and Class ID from string. It is
+// faster, if you know which you are using, to use the individual functions, but this will check
+// against available functions for you.
+func ClassIDFrom(programID string) (classID *GUID, err error) {
+	classID, err = CLSIDFromProgID(programID)
+	if err != nil {
+		classID, err = CLSIDFromString(programID)
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+// BytePtrToString converts byte pointer to a Go string.
+func BytePtrToString(p *byte) string {
+	a := (*[10000]uint8)(unsafe.Pointer(p))
+	i := 0
+	for a[i] != 0 {
+		i++
+	}
+	return string(a[:i])
+}
+
+// UTF16PtrToString is alias for LpOleStrToString.
+//
+// Kept for compatibility reasons.
+func UTF16PtrToString(p *uint16) string {
+	return LpOleStrToString(p)
+}
+
+// LpOleStrToString converts COM Unicode to Go string.
+func LpOleStrToString(p *uint16) string {
+	if p == nil {
+		return ""
+	}
+
+	length := lpOleStrLen(p)
+	a := make([]uint16, length)
+
+	ptr := unsafe.Pointer(p)
+
+	for i := 0; i < int(length); i++ {
+		a[i] = *(*uint16)(ptr)
+		ptr = unsafe.Pointer(uintptr(ptr) + 2)
+	}
+
+	return string(utf16.Decode(a))
+}
+
+// BstrToString converts COM binary string to Go string.
+func BstrToString(p *uint16) string {
+	if p == nil {
+		return ""
+	}
+	length := SysStringLen((*int16)(unsafe.Pointer(p)))
+	a := make([]uint16, length)
+
+	ptr := unsafe.Pointer(p)
+
+	for i := 0; i < int(length); i++ {
+		a[i] = *(*uint16)(ptr)
+		ptr = unsafe.Pointer(uintptr(ptr) + 2)
+	}
+	return string(utf16.Decode(a))
+}
+
+// lpOleStrLen returns the length of Unicode string.
+func lpOleStrLen(p *uint16) (length int64) {
+	if p == nil {
+		return 0
+	}
+
+	ptr := unsafe.Pointer(p)
+
+	for i := 0; ; i++ {
+		if 0 == *(*uint16)(ptr) {
+			length = int64(i)
+			break
+		}
+		ptr = unsafe.Pointer(uintptr(ptr) + 2)
+	}
+	return
+}
+
+// convertHresultToError converts syscall to error, if call is unsuccessful.
+func convertHresultToError(hr uintptr, r2 uintptr, ignore error) (err error) {
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
diff --git a/vendor/github.com/go-ole/go-ole/variables.go b/vendor/github.com/go-ole/go-ole/variables.go
new file mode 100644
index 0000000000..ebe00f1cfc
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/variables.go
@@ -0,0 +1,16 @@
+// +build windows
+
+package ole
+
+import (
+	"syscall"
+)
+
+var (
+	modcombase     = syscall.NewLazyDLL("combase.dll")
+	modkernel32, _ = syscall.LoadDLL("kernel32.dll")
+	modole32, _    = syscall.LoadDLL("ole32.dll")
+	modoleaut32, _ = syscall.LoadDLL("oleaut32.dll")
+	modmsvcrt, _   = syscall.LoadDLL("msvcrt.dll")
+	moduser32, _   = syscall.LoadDLL("user32.dll")
+)
diff --git a/vendor/github.com/go-ole/go-ole/variant.go b/vendor/github.com/go-ole/go-ole/variant.go
new file mode 100644
index 0000000000..36969725eb
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/variant.go
@@ -0,0 +1,105 @@
+package ole
+
+import "unsafe"
+
+// NewVariant returns new variant based on type and value.
+func NewVariant(vt VT, val int64) VARIANT {
+	return VARIANT{VT: vt, Val: val}
+}
+
+// ToIUnknown converts Variant to Unknown object.
+func (v *VARIANT) ToIUnknown() *IUnknown {
+	if v.VT != VT_UNKNOWN {
+		return nil
+	}
+	return (*IUnknown)(unsafe.Pointer(uintptr(v.Val)))
+}
+
+// ToIDispatch converts variant to dispatch object.
+func (v *VARIANT) ToIDispatch() *IDispatch {
+	if v.VT != VT_DISPATCH {
+		return nil
+	}
+	return (*IDispatch)(unsafe.Pointer(uintptr(v.Val)))
+}
+
+// ToArray converts variant to SafeArray helper.
+func (v *VARIANT) ToArray() *SafeArrayConversion {
+	if v.VT != VT_SAFEARRAY {
+		if v.VT&VT_ARRAY == 0 {
+			return nil
+		}
+	}
+	var safeArray *SafeArray = (*SafeArray)(unsafe.Pointer(uintptr(v.Val)))
+	return &SafeArrayConversion{safeArray}
+}
+
+// ToString converts variant to Go string.
+func (v *VARIANT) ToString() string {
+	if v.VT != VT_BSTR {
+		return ""
+	}
+	return BstrToString(*(**uint16)(unsafe.Pointer(&v.Val)))
+}
+
+// Clear the memory of variant object.
+func (v *VARIANT) Clear() error {
+	return VariantClear(v)
+}
+
+// Value returns variant value based on its type.
+//
+// Currently supported types: 2- and 4-byte integers, strings, bools.
+// Note that 64-bit integers, datetimes, and other types are stored as strings
+// and will be returned as strings.
+//
+// Needs to be further converted, because this returns an interface{}.
+func (v *VARIANT) Value() interface{} {
+	switch v.VT {
+	case VT_I1:
+		return int8(v.Val)
+	case VT_UI1:
+		return uint8(v.Val)
+	case VT_I2:
+		return int16(v.Val)
+	case VT_UI2:
+		return uint16(v.Val)
+	case VT_I4:
+		return int32(v.Val)
+	case VT_UI4:
+		return uint32(v.Val)
+	case VT_I8:
+		return int64(v.Val)
+	case VT_UI8:
+		return uint64(v.Val)
+	case VT_INT:
+		return int(v.Val)
+	case VT_UINT:
+		return uint(v.Val)
+	case VT_INT_PTR:
+		return uintptr(v.Val) // TODO
+	case VT_UINT_PTR:
+		return uintptr(v.Val)
+	case VT_R4:
+		return *(*float32)(unsafe.Pointer(&v.Val))
+	case VT_R8:
+		return *(*float64)(unsafe.Pointer(&v.Val))
+	case VT_BSTR:
+		return v.ToString()
+	case VT_DATE:
+		// VT_DATE type will either return float64 or time.Time.
+		d := float64(v.Val)
+		date, err := GetVariantDate(d)
+		if err != nil {
+			return d
+		}
+		return date
+	case VT_UNKNOWN:
+		return v.ToIUnknown()
+	case VT_DISPATCH:
+		return v.ToIDispatch()
+	case VT_BOOL:
+		return v.Val != 0
+	}
+	return nil
+}
diff --git a/vendor/github.com/go-ole/go-ole/variant_386.go b/vendor/github.com/go-ole/go-ole/variant_386.go
new file mode 100644
index 0000000000..e73736bf39
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/variant_386.go
@@ -0,0 +1,11 @@
+// +build 386
+
+package ole
+
+type VARIANT struct {
+	VT         VT     //  2
+	wReserved1 uint16 //  4
+	wReserved2 uint16 //  6
+	wReserved3 uint16 //  8
+	Val        int64  // 16
+}
diff --git a/vendor/github.com/go-ole/go-ole/variant_amd64.go b/vendor/github.com/go-ole/go-ole/variant_amd64.go
new file mode 100644
index 0000000000..dccdde1323
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/variant_amd64.go
@@ -0,0 +1,12 @@
+// +build amd64
+
+package ole
+
+type VARIANT struct {
+	VT         VT      //  2
+	wReserved1 uint16  //  4
+	wReserved2 uint16  //  6
+	wReserved3 uint16  //  8
+	Val        int64   // 16
+	_          [8]byte // 24
+}
diff --git a/vendor/github.com/go-ole/go-ole/vt_string.go b/vendor/github.com/go-ole/go-ole/vt_string.go
new file mode 100644
index 0000000000..729b4a04dd
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/vt_string.go
@@ -0,0 +1,58 @@
+// generated by stringer -output vt_string.go -type VT; DO NOT EDIT
+
+package ole
+
+import "fmt"
+
+const (
+	_VT_name_0 = "VT_EMPTYVT_NULLVT_I2VT_I4VT_R4VT_R8VT_CYVT_DATEVT_BSTRVT_DISPATCHVT_ERRORVT_BOOLVT_VARIANTVT_UNKNOWNVT_DECIMAL"
+	_VT_name_1 = "VT_I1VT_UI1VT_UI2VT_UI4VT_I8VT_UI8VT_INTVT_UINTVT_VOIDVT_HRESULTVT_PTRVT_SAFEARRAYVT_CARRAYVT_USERDEFINEDVT_LPSTRVT_LPWSTR"
+	_VT_name_2 = "VT_RECORDVT_INT_PTRVT_UINT_PTR"
+	_VT_name_3 = "VT_FILETIMEVT_BLOBVT_STREAMVT_STORAGEVT_STREAMED_OBJECTVT_STORED_OBJECTVT_BLOB_OBJECTVT_CFVT_CLSID"
+	_VT_name_4 = "VT_BSTR_BLOBVT_VECTOR"
+	_VT_name_5 = "VT_ARRAY"
+	_VT_name_6 = "VT_BYREF"
+	_VT_name_7 = "VT_RESERVED"
+	_VT_name_8 = "VT_ILLEGAL"
+)
+
+var (
+	_VT_index_0 = [...]uint8{0, 8, 15, 20, 25, 30, 35, 40, 47, 54, 65, 73, 80, 90, 100, 110}
+	_VT_index_1 = [...]uint8{0, 5, 11, 17, 23, 28, 34, 40, 47, 54, 64, 70, 82, 91, 105, 113, 122}
+	_VT_index_2 = [...]uint8{0, 9, 19, 30}
+	_VT_index_3 = [...]uint8{0, 11, 18, 27, 37, 55, 71, 85, 90, 98}
+	_VT_index_4 = [...]uint8{0, 12, 21}
+	_VT_index_5 = [...]uint8{0, 8}
+	_VT_index_6 = [...]uint8{0, 8}
+	_VT_index_7 = [...]uint8{0, 11}
+	_VT_index_8 = [...]uint8{0, 10}
+)
+
+func (i VT) String() string {
+	switch {
+	case 0 <= i && i <= 14:
+		return _VT_name_0[_VT_index_0[i]:_VT_index_0[i+1]]
+	case 16 <= i && i <= 31:
+		i -= 16
+		return _VT_name_1[_VT_index_1[i]:_VT_index_1[i+1]]
+	case 36 <= i && i <= 38:
+		i -= 36
+		return _VT_name_2[_VT_index_2[i]:_VT_index_2[i+1]]
+	case 64 <= i && i <= 72:
+		i -= 64
+		return _VT_name_3[_VT_index_3[i]:_VT_index_3[i+1]]
+	case 4095 <= i && i <= 4096:
+		i -= 4095
+		return _VT_name_4[_VT_index_4[i]:_VT_index_4[i+1]]
+	case i == 8192:
+		return _VT_name_5
+	case i == 16384:
+		return _VT_name_6
+	case i == 32768:
+		return _VT_name_7
+	case i == 65535:
+		return _VT_name_8
+	default:
+		return fmt.Sprintf("VT(%d)", i)
+	}
+}
diff --git a/vendor/github.com/go-ole/go-ole/winrt.go b/vendor/github.com/go-ole/go-ole/winrt.go
new file mode 100644
index 0000000000..4e9eca7324
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/winrt.go
@@ -0,0 +1,99 @@
+// +build windows
+
+package ole
+
+import (
+	"reflect"
+	"syscall"
+	"unicode/utf8"
+	"unsafe"
+)
+
+var (
+	procRoInitialize              = modcombase.NewProc("RoInitialize")
+	procRoActivateInstance        = modcombase.NewProc("RoActivateInstance")
+	procRoGetActivationFactory    = modcombase.NewProc("RoGetActivationFactory")
+	procWindowsCreateString       = modcombase.NewProc("WindowsCreateString")
+	procWindowsDeleteString       = modcombase.NewProc("WindowsDeleteString")
+	procWindowsGetStringRawBuffer = modcombase.NewProc("WindowsGetStringRawBuffer")
+)
+
+func RoInitialize(thread_type uint32) (err error) {
+	hr, _, _ := procRoInitialize.Call(uintptr(thread_type))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func RoActivateInstance(clsid string) (ins *IInspectable, err error) {
+	hClsid, err := NewHString(clsid)
+	if err != nil {
+		return nil, err
+	}
+	defer DeleteHString(hClsid)
+
+	hr, _, _ := procRoActivateInstance.Call(
+		uintptr(unsafe.Pointer(hClsid)),
+		uintptr(unsafe.Pointer(&ins)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+func RoGetActivationFactory(clsid string, iid *GUID) (ins *IInspectable, err error) {
+	hClsid, err := NewHString(clsid)
+	if err != nil {
+		return nil, err
+	}
+	defer DeleteHString(hClsid)
+
+	hr, _, _ := procRoGetActivationFactory.Call(
+		uintptr(unsafe.Pointer(hClsid)),
+		uintptr(unsafe.Pointer(iid)),
+		uintptr(unsafe.Pointer(&ins)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// HString is handle string for pointers.
+type HString uintptr
+
+// NewHString returns a new HString for Go string.
+func NewHString(s string) (hstring HString, err error) {
+	u16 := syscall.StringToUTF16Ptr(s)
+	len := uint32(utf8.RuneCountInString(s))
+	hr, _, _ := procWindowsCreateString.Call(
+		uintptr(unsafe.Pointer(u16)),
+		uintptr(len),
+		uintptr(unsafe.Pointer(&hstring)))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// DeleteHString deletes HString.
+func DeleteHString(hstring HString) (err error) {
+	hr, _, _ := procWindowsDeleteString.Call(uintptr(hstring))
+	if hr != 0 {
+		err = NewError(hr)
+	}
+	return
+}
+
+// String returns Go string value of HString.
+func (h HString) String() string {
+	var u16buf uintptr
+	var u16len uint32
+	u16buf, _, _ = procWindowsGetStringRawBuffer.Call(
+		uintptr(h),
+		uintptr(unsafe.Pointer(&u16len)))
+
+	u16hdr := reflect.SliceHeader{Data: u16buf, Len: int(u16len), Cap: int(u16len)}
+	u16 := *(*[]uint16)(unsafe.Pointer(&u16hdr))
+	return syscall.UTF16ToString(u16)
+}
diff --git a/vendor/github.com/go-ole/go-ole/winrt_doc.go b/vendor/github.com/go-ole/go-ole/winrt_doc.go
new file mode 100644
index 0000000000..52e6d74c9a
--- /dev/null
+++ b/vendor/github.com/go-ole/go-ole/winrt_doc.go
@@ -0,0 +1,36 @@
+// +build !windows
+
+package ole
+
+// RoInitialize
+func RoInitialize(thread_type uint32) (err error) {
+	return NewError(E_NOTIMPL)
+}
+
+// RoActivateInstance
+func RoActivateInstance(clsid string) (ins *IInspectable, err error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// RoGetActivationFactory
+func RoGetActivationFactory(clsid string, iid *GUID) (ins *IInspectable, err error) {
+	return nil, NewError(E_NOTIMPL)
+}
+
+// HString is handle string for pointers.
+type HString uintptr
+
+// NewHString returns a new HString for Go string.
+func NewHString(s string) (hstring HString, err error) {
+	return HString(uintptr(0)), NewError(E_NOTIMPL)
+}
+
+// DeleteHString deletes HString.
+func DeleteHString(hstring HString) (err error) {
+	return NewError(E_NOTIMPL)
+}
+
+// String returns Go string value of HString.
+func (h HString) String() string {
+	return ""
+}
diff --git a/vendor/github.com/godbus/dbus/LICENSE b/vendor/github.com/godbus/dbus/LICENSE
new file mode 100644
index 0000000000..670d88fcaa
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>), Google
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/godbus/dbus/auth.go b/vendor/github.com/godbus/dbus/auth.go
new file mode 100644
index 0000000000..98017b693e
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/auth.go
@@ -0,0 +1,253 @@
+package dbus
+
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"io"
+	"os"
+	"strconv"
+)
+
+// AuthStatus represents the Status of an authentication mechanism.
+type AuthStatus byte
+
+const (
+	// AuthOk signals that authentication is finished; the next command
+	// from the server should be an OK.
+	AuthOk AuthStatus = iota
+
+	// AuthContinue signals that additional data is needed; the next command
+	// from the server should be a DATA.
+	AuthContinue
+
+	// AuthError signals an error; the server sent invalid data or some
+	// other unexpected thing happened and the current authentication
+	// process should be aborted.
+	AuthError
+)
+
+type authState byte
+
+const (
+	waitingForData authState = iota
+	waitingForOk
+	waitingForReject
+)
+
+// Auth defines the behaviour of an authentication mechanism.
+type Auth interface {
+	// Return the name of the mechnism, the argument to the first AUTH command
+	// and the next status.
+	FirstData() (name, resp []byte, status AuthStatus)
+
+	// Process the given DATA command, and return the argument to the DATA
+	// command and the next status. If len(resp) == 0, no DATA command is sent.
+	HandleData(data []byte) (resp []byte, status AuthStatus)
+}
+
+// Auth authenticates the connection, trying the given list of authentication
+// mechanisms (in that order). If nil is passed, the EXTERNAL and
+// DBUS_COOKIE_SHA1 mechanisms are tried for the current user. For private
+// connections, this method must be called before sending any messages to the
+// bus. Auth must not be called on shared connections.
+func (conn *Conn) Auth(methods []Auth) error {
+	if methods == nil {
+		uid := strconv.Itoa(os.Getuid())
+		methods = []Auth{AuthExternal(uid), AuthCookieSha1(uid, getHomeDir())}
+	}
+	in := bufio.NewReader(conn.transport)
+	err := conn.transport.SendNullByte()
+	if err != nil {
+		return err
+	}
+	err = authWriteLine(conn.transport, []byte("AUTH"))
+	if err != nil {
+		return err
+	}
+	s, err := authReadLine(in)
+	if err != nil {
+		return err
+	}
+	if len(s) < 2 || !bytes.Equal(s[0], []byte("REJECTED")) {
+		return errors.New("dbus: authentication protocol error")
+	}
+	s = s[1:]
+	for _, v := range s {
+		for _, m := range methods {
+			if name, data, status := m.FirstData(); bytes.Equal(v, name) {
+				var ok bool
+				err = authWriteLine(conn.transport, []byte("AUTH"), []byte(v), data)
+				if err != nil {
+					return err
+				}
+				switch status {
+				case AuthOk:
+					err, ok = conn.tryAuth(m, waitingForOk, in)
+				case AuthContinue:
+					err, ok = conn.tryAuth(m, waitingForData, in)
+				default:
+					panic("dbus: invalid authentication status")
+				}
+				if err != nil {
+					return err
+				}
+				if ok {
+					if conn.transport.SupportsUnixFDs() {
+						err = authWriteLine(conn, []byte("NEGOTIATE_UNIX_FD"))
+						if err != nil {
+							return err
+						}
+						line, err := authReadLine(in)
+						if err != nil {
+							return err
+						}
+						switch {
+						case bytes.Equal(line[0], []byte("AGREE_UNIX_FD")):
+							conn.EnableUnixFDs()
+							conn.unixFD = true
+						case bytes.Equal(line[0], []byte("ERROR")):
+						default:
+							return errors.New("dbus: authentication protocol error")
+						}
+					}
+					err = authWriteLine(conn.transport, []byte("BEGIN"))
+					if err != nil {
+						return err
+					}
+					go conn.inWorker()
+					go conn.outWorker()
+					return nil
+				}
+			}
+		}
+	}
+	return errors.New("dbus: authentication failed")
+}
+
+// tryAuth tries to authenticate with m as the mechanism, using state as the
+// initial authState and in for reading input. It returns (nil, true) on
+// success, (nil, false) on a REJECTED and (someErr, false) if some other
+// error occured.
+func (conn *Conn) tryAuth(m Auth, state authState, in *bufio.Reader) (error, bool) {
+	for {
+		s, err := authReadLine(in)
+		if err != nil {
+			return err, false
+		}
+		switch {
+		case state == waitingForData && string(s[0]) == "DATA":
+			if len(s) != 2 {
+				err = authWriteLine(conn.transport, []byte("ERROR"))
+				if err != nil {
+					return err, false
+				}
+				continue
+			}
+			data, status := m.HandleData(s[1])
+			switch status {
+			case AuthOk, AuthContinue:
+				if len(data) != 0 {
+					err = authWriteLine(conn.transport, []byte("DATA"), data)
+					if err != nil {
+						return err, false
+					}
+				}
+				if status == AuthOk {
+					state = waitingForOk
+				}
+			case AuthError:
+				err = authWriteLine(conn.transport, []byte("ERROR"))
+				if err != nil {
+					return err, false
+				}
+			}
+		case state == waitingForData && string(s[0]) == "REJECTED":
+			return nil, false
+		case state == waitingForData && string(s[0]) == "ERROR":
+			err = authWriteLine(conn.transport, []byte("CANCEL"))
+			if err != nil {
+				return err, false
+			}
+			state = waitingForReject
+		case state == waitingForData && string(s[0]) == "OK":
+			if len(s) != 2 {
+				err = authWriteLine(conn.transport, []byte("CANCEL"))
+				if err != nil {
+					return err, false
+				}
+				state = waitingForReject
+			}
+			conn.uuid = string(s[1])
+			return nil, true
+		case state == waitingForData:
+			err = authWriteLine(conn.transport, []byte("ERROR"))
+			if err != nil {
+				return err, false
+			}
+		case state == waitingForOk && string(s[0]) == "OK":
+			if len(s) != 2 {
+				err = authWriteLine(conn.transport, []byte("CANCEL"))
+				if err != nil {
+					return err, false
+				}
+				state = waitingForReject
+			}
+			conn.uuid = string(s[1])
+			return nil, true
+		case state == waitingForOk && string(s[0]) == "REJECTED":
+			return nil, false
+		case state == waitingForOk && (string(s[0]) == "DATA" ||
+			string(s[0]) == "ERROR"):
+
+			err = authWriteLine(conn.transport, []byte("CANCEL"))
+			if err != nil {
+				return err, false
+			}
+			state = waitingForReject
+		case state == waitingForOk:
+			err = authWriteLine(conn.transport, []byte("ERROR"))
+			if err != nil {
+				return err, false
+			}
+		case state == waitingForReject && string(s[0]) == "REJECTED":
+			return nil, false
+		case state == waitingForReject:
+			return errors.New("dbus: authentication protocol error"), false
+		default:
+			panic("dbus: invalid auth state")
+		}
+	}
+}
+
+// authReadLine reads a line and separates it into its fields.
+func authReadLine(in *bufio.Reader) ([][]byte, error) {
+	data, err := in.ReadBytes('\n')
+	if err != nil {
+		return nil, err
+	}
+	data = bytes.TrimSuffix(data, []byte("\r\n"))
+	return bytes.Split(data, []byte{' '}), nil
+}
+
+// authWriteLine writes the given line in the authentication protocol format
+// (elements of data separated by a " " and terminated by "\r\n").
+func authWriteLine(out io.Writer, data ...[]byte) error {
+	buf := make([]byte, 0)
+	for i, v := range data {
+		buf = append(buf, v...)
+		if i != len(data)-1 {
+			buf = append(buf, ' ')
+		}
+	}
+	buf = append(buf, '\r')
+	buf = append(buf, '\n')
+	n, err := out.Write(buf)
+	if err != nil {
+		return err
+	}
+	if n != len(buf) {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
diff --git a/vendor/github.com/godbus/dbus/auth_external.go b/vendor/github.com/godbus/dbus/auth_external.go
new file mode 100644
index 0000000000..7e376d3ef6
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/auth_external.go
@@ -0,0 +1,26 @@
+package dbus
+
+import (
+	"encoding/hex"
+)
+
+// AuthExternal returns an Auth that authenticates as the given user with the
+// EXTERNAL mechanism.
+func AuthExternal(user string) Auth {
+	return authExternal{user}
+}
+
+// AuthExternal implements the EXTERNAL authentication mechanism.
+type authExternal struct {
+	user string
+}
+
+func (a authExternal) FirstData() ([]byte, []byte, AuthStatus) {
+	b := make([]byte, 2*len(a.user))
+	hex.Encode(b, []byte(a.user))
+	return []byte("EXTERNAL"), b, AuthOk
+}
+
+func (a authExternal) HandleData(b []byte) ([]byte, AuthStatus) {
+	return nil, AuthError
+}
diff --git a/vendor/github.com/godbus/dbus/auth_sha1.go b/vendor/github.com/godbus/dbus/auth_sha1.go
new file mode 100644
index 0000000000..df15b46119
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/auth_sha1.go
@@ -0,0 +1,102 @@
+package dbus
+
+import (
+	"bufio"
+	"bytes"
+	"crypto/rand"
+	"crypto/sha1"
+	"encoding/hex"
+	"os"
+)
+
+// AuthCookieSha1 returns an Auth that authenticates as the given user with the
+// DBUS_COOKIE_SHA1 mechanism. The home parameter should specify the home
+// directory of the user.
+func AuthCookieSha1(user, home string) Auth {
+	return authCookieSha1{user, home}
+}
+
+type authCookieSha1 struct {
+	user, home string
+}
+
+func (a authCookieSha1) FirstData() ([]byte, []byte, AuthStatus) {
+	b := make([]byte, 2*len(a.user))
+	hex.Encode(b, []byte(a.user))
+	return []byte("DBUS_COOKIE_SHA1"), b, AuthContinue
+}
+
+func (a authCookieSha1) HandleData(data []byte) ([]byte, AuthStatus) {
+	challenge := make([]byte, len(data)/2)
+	_, err := hex.Decode(challenge, data)
+	if err != nil {
+		return nil, AuthError
+	}
+	b := bytes.Split(challenge, []byte{' '})
+	if len(b) != 3 {
+		return nil, AuthError
+	}
+	context := b[0]
+	id := b[1]
+	svchallenge := b[2]
+	cookie := a.getCookie(context, id)
+	if cookie == nil {
+		return nil, AuthError
+	}
+	clchallenge := a.generateChallenge()
+	if clchallenge == nil {
+		return nil, AuthError
+	}
+	hash := sha1.New()
+	hash.Write(bytes.Join([][]byte{svchallenge, clchallenge, cookie}, []byte{':'}))
+	hexhash := make([]byte, 2*hash.Size())
+	hex.Encode(hexhash, hash.Sum(nil))
+	data = append(clchallenge, ' ')
+	data = append(data, hexhash...)
+	resp := make([]byte, 2*len(data))
+	hex.Encode(resp, data)
+	return resp, AuthOk
+}
+
+// getCookie searches for the cookie identified by id in context and returns
+// the cookie content or nil. (Since HandleData can't return a specific error,
+// but only whether an error occured, this function also doesn't bother to
+// return an error.)
+func (a authCookieSha1) getCookie(context, id []byte) []byte {
+	file, err := os.Open(a.home + "/.dbus-keyrings/" + string(context))
+	if err != nil {
+		return nil
+	}
+	defer file.Close()
+	rd := bufio.NewReader(file)
+	for {
+		line, err := rd.ReadBytes('\n')
+		if err != nil {
+			return nil
+		}
+		line = line[:len(line)-1]
+		b := bytes.Split(line, []byte{' '})
+		if len(b) != 3 {
+			return nil
+		}
+		if bytes.Equal(b[0], id) {
+			return b[2]
+		}
+	}
+}
+
+// generateChallenge returns a random, hex-encoded challenge, or nil on error
+// (see above).
+func (a authCookieSha1) generateChallenge() []byte {
+	b := make([]byte, 16)
+	n, err := rand.Read(b)
+	if err != nil {
+		return nil
+	}
+	if n != 16 {
+		return nil
+	}
+	enc := make([]byte, 32)
+	hex.Encode(enc, b)
+	return enc
+}
diff --git a/vendor/github.com/godbus/dbus/call.go b/vendor/github.com/godbus/dbus/call.go
new file mode 100644
index 0000000000..ba6e73f607
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/call.go
@@ -0,0 +1,36 @@
+package dbus
+
+import (
+	"errors"
+)
+
+// Call represents a pending or completed method call.
+type Call struct {
+	Destination string
+	Path        ObjectPath
+	Method      string
+	Args        []interface{}
+
+	// Strobes when the call is complete.
+	Done chan *Call
+
+	// After completion, the error status. If this is non-nil, it may be an
+	// error message from the peer (with Error as its type) or some other error.
+	Err error
+
+	// Holds the response once the call is done.
+	Body []interface{}
+}
+
+var errSignature = errors.New("dbus: mismatched signature")
+
+// Store stores the body of the reply into the provided pointers. It returns
+// an error if the signatures of the body and retvalues don't match, or if
+// the error status is not nil.
+func (c *Call) Store(retvalues ...interface{}) error {
+	if c.Err != nil {
+		return c.Err
+	}
+
+	return Store(c.Body, retvalues...)
+}
diff --git a/vendor/github.com/godbus/dbus/conn.go b/vendor/github.com/godbus/dbus/conn.go
new file mode 100644
index 0000000000..a4f5394010
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/conn.go
@@ -0,0 +1,625 @@
+package dbus
+
+import (
+	"errors"
+	"io"
+	"os"
+	"reflect"
+	"strings"
+	"sync"
+)
+
+const defaultSystemBusAddress = "unix:path=/var/run/dbus/system_bus_socket"
+
+var (
+	systemBus     *Conn
+	systemBusLck  sync.Mutex
+	sessionBus    *Conn
+	sessionBusLck sync.Mutex
+)
+
+// ErrClosed is the error returned by calls on a closed connection.
+var ErrClosed = errors.New("dbus: connection closed by user")
+
+// Conn represents a connection to a message bus (usually, the system or
+// session bus).
+//
+// Connections are either shared or private. Shared connections
+// are shared between calls to the functions that return them. As a result,
+// the methods Close, Auth and Hello must not be called on them.
+//
+// Multiple goroutines may invoke methods on a connection simultaneously.
+type Conn struct {
+	transport
+
+	busObj BusObject
+	unixFD bool
+	uuid   string
+
+	names    []string
+	namesLck sync.RWMutex
+
+	serialLck  sync.Mutex
+	nextSerial uint32
+	serialUsed map[uint32]bool
+
+	calls    map[uint32]*Call
+	callsLck sync.RWMutex
+
+	handlers    map[ObjectPath]map[string]exportWithMapping
+	handlersLck sync.RWMutex
+
+	out    chan *Message
+	closed bool
+	outLck sync.RWMutex
+
+	signals    []chan<- *Signal
+	signalsLck sync.Mutex
+
+	eavesdropped    chan<- *Message
+	eavesdroppedLck sync.Mutex
+}
+
+// SessionBus returns a shared connection to the session bus, connecting to it
+// if not already done.
+func SessionBus() (conn *Conn, err error) {
+	sessionBusLck.Lock()
+	defer sessionBusLck.Unlock()
+	if sessionBus != nil {
+		return sessionBus, nil
+	}
+	defer func() {
+		if conn != nil {
+			sessionBus = conn
+		}
+	}()
+	conn, err = SessionBusPrivate()
+	if err != nil {
+		return
+	}
+	if err = conn.Auth(nil); err != nil {
+		conn.Close()
+		conn = nil
+		return
+	}
+	if err = conn.Hello(); err != nil {
+		conn.Close()
+		conn = nil
+	}
+	return
+}
+
+// SessionBusPrivate returns a new private connection to the session bus.
+func SessionBusPrivate() (*Conn, error) {
+	address := os.Getenv("DBUS_SESSION_BUS_ADDRESS")
+	if address != "" && address != "autolaunch:" {
+		return Dial(address)
+	}
+
+	return sessionBusPlatform()
+}
+
+// SystemBus returns a shared connection to the system bus, connecting to it if
+// not already done.
+func SystemBus() (conn *Conn, err error) {
+	systemBusLck.Lock()
+	defer systemBusLck.Unlock()
+	if systemBus != nil {
+		return systemBus, nil
+	}
+	defer func() {
+		if conn != nil {
+			systemBus = conn
+		}
+	}()
+	conn, err = SystemBusPrivate()
+	if err != nil {
+		return
+	}
+	if err = conn.Auth(nil); err != nil {
+		conn.Close()
+		conn = nil
+		return
+	}
+	if err = conn.Hello(); err != nil {
+		conn.Close()
+		conn = nil
+	}
+	return
+}
+
+// SystemBusPrivate returns a new private connection to the system bus.
+func SystemBusPrivate() (*Conn, error) {
+	address := os.Getenv("DBUS_SYSTEM_BUS_ADDRESS")
+	if address != "" {
+		return Dial(address)
+	}
+	return Dial(defaultSystemBusAddress)
+}
+
+// Dial establishes a new private connection to the message bus specified by address.
+func Dial(address string) (*Conn, error) {
+	tr, err := getTransport(address)
+	if err != nil {
+		return nil, err
+	}
+	return newConn(tr)
+}
+
+// NewConn creates a new private *Conn from an already established connection.
+func NewConn(conn io.ReadWriteCloser) (*Conn, error) {
+	return newConn(genericTransport{conn})
+}
+
+// newConn creates a new *Conn from a transport.
+func newConn(tr transport) (*Conn, error) {
+	conn := new(Conn)
+	conn.transport = tr
+	conn.calls = make(map[uint32]*Call)
+	conn.out = make(chan *Message, 10)
+	conn.handlers = make(map[ObjectPath]map[string]exportWithMapping)
+	conn.nextSerial = 1
+	conn.serialUsed = map[uint32]bool{0: true}
+	conn.busObj = conn.Object("org.freedesktop.DBus", "/org/freedesktop/DBus")
+	return conn, nil
+}
+
+// BusObject returns the object owned by the bus daemon which handles
+// administrative requests.
+func (conn *Conn) BusObject() BusObject {
+	return conn.busObj
+}
+
+// Close closes the connection. Any blocked operations will return with errors
+// and the channels passed to Eavesdrop and Signal are closed. This method must
+// not be called on shared connections.
+func (conn *Conn) Close() error {
+	conn.outLck.Lock()
+	if conn.closed {
+		// inWorker calls Close on read error, the read error may
+		// be caused by another caller calling Close to shutdown the
+		// dbus connection, a double-close scenario we prevent here.
+		conn.outLck.Unlock()
+		return nil
+	}
+	close(conn.out)
+	conn.closed = true
+	conn.outLck.Unlock()
+	conn.signalsLck.Lock()
+	for _, ch := range conn.signals {
+		close(ch)
+	}
+	conn.signalsLck.Unlock()
+	conn.eavesdroppedLck.Lock()
+	if conn.eavesdropped != nil {
+		close(conn.eavesdropped)
+	}
+	conn.eavesdroppedLck.Unlock()
+	return conn.transport.Close()
+}
+
+// Eavesdrop causes conn to send all incoming messages to the given channel
+// without further processing. Method replies, errors and signals will not be
+// sent to the appropiate channels and method calls will not be handled. If nil
+// is passed, the normal behaviour is restored.
+//
+// The caller has to make sure that ch is sufficiently buffered;
+// if a message arrives when a write to ch is not possible, the message is
+// discarded.
+func (conn *Conn) Eavesdrop(ch chan<- *Message) {
+	conn.eavesdroppedLck.Lock()
+	conn.eavesdropped = ch
+	conn.eavesdroppedLck.Unlock()
+}
+
+// getSerial returns an unused serial.
+func (conn *Conn) getSerial() uint32 {
+	conn.serialLck.Lock()
+	defer conn.serialLck.Unlock()
+	n := conn.nextSerial
+	for conn.serialUsed[n] {
+		n++
+	}
+	conn.serialUsed[n] = true
+	conn.nextSerial = n + 1
+	return n
+}
+
+// Hello sends the initial org.freedesktop.DBus.Hello call. This method must be
+// called after authentication, but before sending any other messages to the
+// bus. Hello must not be called for shared connections.
+func (conn *Conn) Hello() error {
+	var s string
+	err := conn.busObj.Call("org.freedesktop.DBus.Hello", 0).Store(&s)
+	if err != nil {
+		return err
+	}
+	conn.namesLck.Lock()
+	conn.names = make([]string, 1)
+	conn.names[0] = s
+	conn.namesLck.Unlock()
+	return nil
+}
+
+// inWorker runs in an own goroutine, reading incoming messages from the
+// transport and dispatching them appropiately.
+func (conn *Conn) inWorker() {
+	for {
+		msg, err := conn.ReadMessage()
+		if err == nil {
+			conn.eavesdroppedLck.Lock()
+			if conn.eavesdropped != nil {
+				select {
+				case conn.eavesdropped <- msg:
+				default:
+				}
+				conn.eavesdroppedLck.Unlock()
+				continue
+			}
+			conn.eavesdroppedLck.Unlock()
+			dest, _ := msg.Headers[FieldDestination].value.(string)
+			found := false
+			if dest == "" {
+				found = true
+			} else {
+				conn.namesLck.RLock()
+				if len(conn.names) == 0 {
+					found = true
+				}
+				for _, v := range conn.names {
+					if dest == v {
+						found = true
+						break
+					}
+				}
+				conn.namesLck.RUnlock()
+			}
+			if !found {
+				// Eavesdropped a message, but no channel for it is registered.
+				// Ignore it.
+				continue
+			}
+			switch msg.Type {
+			case TypeMethodReply, TypeError:
+				serial := msg.Headers[FieldReplySerial].value.(uint32)
+				conn.callsLck.Lock()
+				if c, ok := conn.calls[serial]; ok {
+					if msg.Type == TypeError {
+						name, _ := msg.Headers[FieldErrorName].value.(string)
+						c.Err = Error{name, msg.Body}
+					} else {
+						c.Body = msg.Body
+					}
+					c.Done <- c
+					conn.serialLck.Lock()
+					delete(conn.serialUsed, serial)
+					conn.serialLck.Unlock()
+					delete(conn.calls, serial)
+				}
+				conn.callsLck.Unlock()
+			case TypeSignal:
+				iface := msg.Headers[FieldInterface].value.(string)
+				member := msg.Headers[FieldMember].value.(string)
+				// as per http://dbus.freedesktop.org/doc/dbus-specification.html ,
+				// sender is optional for signals.
+				sender, _ := msg.Headers[FieldSender].value.(string)
+				if iface == "org.freedesktop.DBus" && sender == "org.freedesktop.DBus" {
+					if member == "NameLost" {
+						// If we lost the name on the bus, remove it from our
+						// tracking list.
+						name, ok := msg.Body[0].(string)
+						if !ok {
+							panic("Unable to read the lost name")
+						}
+						conn.namesLck.Lock()
+						for i, v := range conn.names {
+							if v == name {
+								conn.names = append(conn.names[:i],
+									conn.names[i+1:]...)
+							}
+						}
+						conn.namesLck.Unlock()
+					} else if member == "NameAcquired" {
+						// If we acquired the name on the bus, add it to our
+						// tracking list.
+						name, ok := msg.Body[0].(string)
+						if !ok {
+							panic("Unable to read the acquired name")
+						}
+						conn.namesLck.Lock()
+						conn.names = append(conn.names, name)
+						conn.namesLck.Unlock()
+					}
+				}
+				signal := &Signal{
+					Sender: sender,
+					Path:   msg.Headers[FieldPath].value.(ObjectPath),
+					Name:   iface + "." + member,
+					Body:   msg.Body,
+				}
+				conn.signalsLck.Lock()
+				for _, ch := range conn.signals {
+					ch <- signal
+				}
+				conn.signalsLck.Unlock()
+			case TypeMethodCall:
+				go conn.handleCall(msg)
+			}
+		} else if _, ok := err.(InvalidMessageError); !ok {
+			// Some read error occured (usually EOF); we can't really do
+			// anything but to shut down all stuff and returns errors to all
+			// pending replies.
+			conn.Close()
+			conn.callsLck.RLock()
+			for _, v := range conn.calls {
+				v.Err = err
+				v.Done <- v
+			}
+			conn.callsLck.RUnlock()
+			return
+		}
+		// invalid messages are ignored
+	}
+}
+
+// Names returns the list of all names that are currently owned by this
+// connection. The slice is always at least one element long, the first element
+// being the unique name of the connection.
+func (conn *Conn) Names() []string {
+	conn.namesLck.RLock()
+	// copy the slice so it can't be modified
+	s := make([]string, len(conn.names))
+	copy(s, conn.names)
+	conn.namesLck.RUnlock()
+	return s
+}
+
+// Object returns the object identified by the given destination name and path.
+func (conn *Conn) Object(dest string, path ObjectPath) BusObject {
+	return &Object{conn, dest, path}
+}
+
+// outWorker runs in an own goroutine, encoding and sending messages that are
+// sent to conn.out.
+func (conn *Conn) outWorker() {
+	for msg := range conn.out {
+		err := conn.SendMessage(msg)
+		conn.callsLck.RLock()
+		if err != nil {
+			if c := conn.calls[msg.serial]; c != nil {
+				c.Err = err
+				c.Done <- c
+			}
+			conn.serialLck.Lock()
+			delete(conn.serialUsed, msg.serial)
+			conn.serialLck.Unlock()
+		} else if msg.Type != TypeMethodCall {
+			conn.serialLck.Lock()
+			delete(conn.serialUsed, msg.serial)
+			conn.serialLck.Unlock()
+		}
+		conn.callsLck.RUnlock()
+	}
+}
+
+// Send sends the given message to the message bus. You usually don't need to
+// use this; use the higher-level equivalents (Call / Go, Emit and Export)
+// instead. If msg is a method call and NoReplyExpected is not set, a non-nil
+// call is returned and the same value is sent to ch (which must be buffered)
+// once the call is complete. Otherwise, ch is ignored and a Call structure is
+// returned of which only the Err member is valid.
+func (conn *Conn) Send(msg *Message, ch chan *Call) *Call {
+	var call *Call
+
+	msg.serial = conn.getSerial()
+	if msg.Type == TypeMethodCall && msg.Flags&FlagNoReplyExpected == 0 {
+		if ch == nil {
+			ch = make(chan *Call, 5)
+		} else if cap(ch) == 0 {
+			panic("dbus: unbuffered channel passed to (*Conn).Send")
+		}
+		call = new(Call)
+		call.Destination, _ = msg.Headers[FieldDestination].value.(string)
+		call.Path, _ = msg.Headers[FieldPath].value.(ObjectPath)
+		iface, _ := msg.Headers[FieldInterface].value.(string)
+		member, _ := msg.Headers[FieldMember].value.(string)
+		call.Method = iface + "." + member
+		call.Args = msg.Body
+		call.Done = ch
+		conn.callsLck.Lock()
+		conn.calls[msg.serial] = call
+		conn.callsLck.Unlock()
+		conn.outLck.RLock()
+		if conn.closed {
+			call.Err = ErrClosed
+			call.Done <- call
+		} else {
+			conn.out <- msg
+		}
+		conn.outLck.RUnlock()
+	} else {
+		conn.outLck.RLock()
+		if conn.closed {
+			call = &Call{Err: ErrClosed}
+		} else {
+			conn.out <- msg
+			call = &Call{Err: nil}
+		}
+		conn.outLck.RUnlock()
+	}
+	return call
+}
+
+// sendError creates an error message corresponding to the parameters and sends
+// it to conn.out.
+func (conn *Conn) sendError(e Error, dest string, serial uint32) {
+	msg := new(Message)
+	msg.Type = TypeError
+	msg.serial = conn.getSerial()
+	msg.Headers = make(map[HeaderField]Variant)
+	if dest != "" {
+		msg.Headers[FieldDestination] = MakeVariant(dest)
+	}
+	msg.Headers[FieldErrorName] = MakeVariant(e.Name)
+	msg.Headers[FieldReplySerial] = MakeVariant(serial)
+	msg.Body = e.Body
+	if len(e.Body) > 0 {
+		msg.Headers[FieldSignature] = MakeVariant(SignatureOf(e.Body...))
+	}
+	conn.outLck.RLock()
+	if !conn.closed {
+		conn.out <- msg
+	}
+	conn.outLck.RUnlock()
+}
+
+// sendReply creates a method reply message corresponding to the parameters and
+// sends it to conn.out.
+func (conn *Conn) sendReply(dest string, serial uint32, values ...interface{}) {
+	msg := new(Message)
+	msg.Type = TypeMethodReply
+	msg.serial = conn.getSerial()
+	msg.Headers = make(map[HeaderField]Variant)
+	if dest != "" {
+		msg.Headers[FieldDestination] = MakeVariant(dest)
+	}
+	msg.Headers[FieldReplySerial] = MakeVariant(serial)
+	msg.Body = values
+	if len(values) > 0 {
+		msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
+	}
+	conn.outLck.RLock()
+	if !conn.closed {
+		conn.out <- msg
+	}
+	conn.outLck.RUnlock()
+}
+
+// Signal registers the given channel to be passed all received signal messages.
+// The caller has to make sure that ch is sufficiently buffered; if a message
+// arrives when a write to c is not possible, it is discarded.
+//
+// Multiple of these channels can be registered at the same time. Passing a
+// channel that already is registered will remove it from the list of the
+// registered channels.
+//
+// These channels are "overwritten" by Eavesdrop; i.e., if there currently is a
+// channel for eavesdropped messages, this channel receives all signals, and
+// none of the channels passed to Signal will receive any signals.
+func (conn *Conn) Signal(ch chan<- *Signal) {
+	conn.signalsLck.Lock()
+	conn.signals = append(conn.signals, ch)
+	conn.signalsLck.Unlock()
+}
+
+// SupportsUnixFDs returns whether the underlying transport supports passing of
+// unix file descriptors. If this is false, method calls containing unix file
+// descriptors will return an error and emitted signals containing them will
+// not be sent.
+func (conn *Conn) SupportsUnixFDs() bool {
+	return conn.unixFD
+}
+
+// Error represents a D-Bus message of type Error.
+type Error struct {
+	Name string
+	Body []interface{}
+}
+
+func NewError(name string, body []interface{}) *Error {
+	return &Error{name, body}
+}
+
+func (e Error) Error() string {
+	if len(e.Body) >= 1 {
+		s, ok := e.Body[0].(string)
+		if ok {
+			return s
+		}
+	}
+	return e.Name
+}
+
+// Signal represents a D-Bus message of type Signal. The name member is given in
+// "interface.member" notation, e.g. org.freedesktop.D-Bus.NameLost.
+type Signal struct {
+	Sender string
+	Path   ObjectPath
+	Name   string
+	Body   []interface{}
+}
+
+// transport is a D-Bus transport.
+type transport interface {
+	// Read and Write raw data (for example, for the authentication protocol).
+	io.ReadWriteCloser
+
+	// Send the initial null byte used for the EXTERNAL mechanism.
+	SendNullByte() error
+
+	// Returns whether this transport supports passing Unix FDs.
+	SupportsUnixFDs() bool
+
+	// Signal the transport that Unix FD passing is enabled for this connection.
+	EnableUnixFDs()
+
+	// Read / send a message, handling things like Unix FDs.
+	ReadMessage() (*Message, error)
+	SendMessage(*Message) error
+}
+
+var (
+	transports = make(map[string]func(string) (transport, error))
+)
+
+func getTransport(address string) (transport, error) {
+	var err error
+	var t transport
+
+	addresses := strings.Split(address, ";")
+	for _, v := range addresses {
+		i := strings.IndexRune(v, ':')
+		if i == -1 {
+			err = errors.New("dbus: invalid bus address (no transport)")
+			continue
+		}
+		f := transports[v[:i]]
+		if f == nil {
+			err = errors.New("dbus: invalid bus address (invalid or unsupported transport)")
+			continue
+		}
+		t, err = f(v[i+1:])
+		if err == nil {
+			return t, nil
+		}
+	}
+	return nil, err
+}
+
+// dereferenceAll returns a slice that, assuming that vs is a slice of pointers
+// of arbitrary types, containes the values that are obtained from dereferencing
+// all elements in vs.
+func dereferenceAll(vs []interface{}) []interface{} {
+	for i := range vs {
+		v := reflect.ValueOf(vs[i])
+		v = v.Elem()
+		vs[i] = v.Interface()
+	}
+	return vs
+}
+
+// getKey gets a key from a the list of keys. Returns "" on error / not found...
+func getKey(s, key string) string {
+	i := strings.Index(s, key)
+	if i == -1 {
+		return ""
+	}
+	if i+len(key)+1 >= len(s) || s[i+len(key)] != '=' {
+		return ""
+	}
+	j := strings.Index(s, ",")
+	if j == -1 {
+		j = len(s)
+	}
+	return s[i+len(key)+1 : j]
+}
diff --git a/vendor/github.com/godbus/dbus/conn_darwin.go b/vendor/github.com/godbus/dbus/conn_darwin.go
new file mode 100644
index 0000000000..b67bb1b81d
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/conn_darwin.go
@@ -0,0 +1,21 @@
+package dbus
+
+import (
+	"errors"
+	"os/exec"
+)
+
+func sessionBusPlatform() (*Conn, error) {
+	cmd := exec.Command("launchctl", "getenv", "DBUS_LAUNCHD_SESSION_BUS_SOCKET")
+	b, err := cmd.CombinedOutput()
+
+	if err != nil {
+		return nil, err
+	}
+
+	if len(b) == 0 {
+		return nil, errors.New("dbus: couldn't determine address of session bus")
+	}
+
+	return Dial("unix:path=" + string(b[:len(b)-1]))
+}
diff --git a/vendor/github.com/godbus/dbus/conn_other.go b/vendor/github.com/godbus/dbus/conn_other.go
new file mode 100644
index 0000000000..f74b8758d4
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/conn_other.go
@@ -0,0 +1,27 @@
+// +build !darwin
+
+package dbus
+
+import (
+	"bytes"
+	"errors"
+	"os/exec"
+)
+
+func sessionBusPlatform() (*Conn, error) {
+	cmd := exec.Command("dbus-launch")
+	b, err := cmd.CombinedOutput()
+
+	if err != nil {
+		return nil, err
+	}
+
+	i := bytes.IndexByte(b, '=')
+	j := bytes.IndexByte(b, '\n')
+
+	if i == -1 || j == -1 {
+		return nil, errors.New("dbus: couldn't determine address of session bus")
+	}
+
+	return Dial(string(b[i+1 : j]))
+}
diff --git a/vendor/github.com/godbus/dbus/dbus.go b/vendor/github.com/godbus/dbus/dbus.go
new file mode 100644
index 0000000000..2ce68735cd
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/dbus.go
@@ -0,0 +1,258 @@
+package dbus
+
+import (
+	"errors"
+	"reflect"
+	"strings"
+)
+
+var (
+	byteType        = reflect.TypeOf(byte(0))
+	boolType        = reflect.TypeOf(false)
+	uint8Type       = reflect.TypeOf(uint8(0))
+	int16Type       = reflect.TypeOf(int16(0))
+	uint16Type      = reflect.TypeOf(uint16(0))
+	int32Type       = reflect.TypeOf(int32(0))
+	uint32Type      = reflect.TypeOf(uint32(0))
+	int64Type       = reflect.TypeOf(int64(0))
+	uint64Type      = reflect.TypeOf(uint64(0))
+	float64Type     = reflect.TypeOf(float64(0))
+	stringType      = reflect.TypeOf("")
+	signatureType   = reflect.TypeOf(Signature{""})
+	objectPathType  = reflect.TypeOf(ObjectPath(""))
+	variantType     = reflect.TypeOf(Variant{Signature{""}, nil})
+	interfacesType  = reflect.TypeOf([]interface{}{})
+	unixFDType      = reflect.TypeOf(UnixFD(0))
+	unixFDIndexType = reflect.TypeOf(UnixFDIndex(0))
+)
+
+// An InvalidTypeError signals that a value which cannot be represented in the
+// D-Bus wire format was passed to a function.
+type InvalidTypeError struct {
+	Type reflect.Type
+}
+
+func (e InvalidTypeError) Error() string {
+	return "dbus: invalid type " + e.Type.String()
+}
+
+// Store copies the values contained in src to dest, which must be a slice of
+// pointers. It converts slices of interfaces from src to corresponding structs
+// in dest. An error is returned if the lengths of src and dest or the types of
+// their elements don't match.
+func Store(src []interface{}, dest ...interface{}) error {
+	if len(src) != len(dest) {
+		return errors.New("dbus.Store: length mismatch")
+	}
+
+	for i := range src {
+		if err := store(src[i], dest[i]); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func store(src, dest interface{}) error {
+	if reflect.TypeOf(dest).Elem() == reflect.TypeOf(src) {
+		reflect.ValueOf(dest).Elem().Set(reflect.ValueOf(src))
+		return nil
+	} else if hasStruct(dest) {
+		rv := reflect.ValueOf(dest).Elem()
+		switch rv.Kind() {
+		case reflect.Struct:
+			vs, ok := src.([]interface{})
+			if !ok {
+				return errors.New("dbus.Store: type mismatch")
+			}
+			t := rv.Type()
+			ndest := make([]interface{}, 0, rv.NumField())
+			for i := 0; i < rv.NumField(); i++ {
+				field := t.Field(i)
+				if field.PkgPath == "" && field.Tag.Get("dbus") != "-" {
+					ndest = append(ndest, rv.Field(i).Addr().Interface())
+				}
+			}
+			if len(vs) != len(ndest) {
+				return errors.New("dbus.Store: type mismatch")
+			}
+			err := Store(vs, ndest...)
+			if err != nil {
+				return errors.New("dbus.Store: type mismatch")
+			}
+		case reflect.Slice:
+			sv := reflect.ValueOf(src)
+			if sv.Kind() != reflect.Slice {
+				return errors.New("dbus.Store: type mismatch")
+			}
+			rv.Set(reflect.MakeSlice(rv.Type(), sv.Len(), sv.Len()))
+			for i := 0; i < sv.Len(); i++ {
+				if err := store(sv.Index(i).Interface(), rv.Index(i).Addr().Interface()); err != nil {
+					return err
+				}
+			}
+		case reflect.Map:
+			sv := reflect.ValueOf(src)
+			if sv.Kind() != reflect.Map {
+				return errors.New("dbus.Store: type mismatch")
+			}
+			keys := sv.MapKeys()
+			rv.Set(reflect.MakeMap(sv.Type()))
+			for _, key := range keys {
+				v := reflect.New(sv.Type().Elem())
+				if err := store(v, sv.MapIndex(key).Interface()); err != nil {
+					return err
+				}
+				rv.SetMapIndex(key, v.Elem())
+			}
+		default:
+			return errors.New("dbus.Store: type mismatch")
+		}
+		return nil
+	} else {
+		return errors.New("dbus.Store: type mismatch")
+	}
+}
+
+func hasStruct(v interface{}) bool {
+	t := reflect.TypeOf(v)
+	for {
+		switch t.Kind() {
+		case reflect.Struct:
+			return true
+		case reflect.Slice, reflect.Ptr, reflect.Map:
+			t = t.Elem()
+		default:
+			return false
+		}
+	}
+}
+
+// An ObjectPath is an object path as defined by the D-Bus spec.
+type ObjectPath string
+
+// IsValid returns whether the object path is valid.
+func (o ObjectPath) IsValid() bool {
+	s := string(o)
+	if len(s) == 0 {
+		return false
+	}
+	if s[0] != '/' {
+		return false
+	}
+	if s[len(s)-1] == '/' && len(s) != 1 {
+		return false
+	}
+	// probably not used, but technically possible
+	if s == "/" {
+		return true
+	}
+	split := strings.Split(s[1:], "/")
+	for _, v := range split {
+		if len(v) == 0 {
+			return false
+		}
+		for _, c := range v {
+			if !isMemberChar(c) {
+				return false
+			}
+		}
+	}
+	return true
+}
+
+// A UnixFD is a Unix file descriptor sent over the wire. See the package-level
+// documentation for more information about Unix file descriptor passsing.
+type UnixFD int32
+
+// A UnixFDIndex is the representation of a Unix file descriptor in a message.
+type UnixFDIndex uint32
+
+// alignment returns the alignment of values of type t.
+func alignment(t reflect.Type) int {
+	switch t {
+	case variantType:
+		return 1
+	case objectPathType:
+		return 4
+	case signatureType:
+		return 1
+	case interfacesType: // sometimes used for structs
+		return 8
+	}
+	switch t.Kind() {
+	case reflect.Uint8:
+		return 1
+	case reflect.Uint16, reflect.Int16:
+		return 2
+	case reflect.Uint32, reflect.Int32, reflect.String, reflect.Array, reflect.Slice, reflect.Map:
+		return 4
+	case reflect.Uint64, reflect.Int64, reflect.Float64, reflect.Struct:
+		return 8
+	case reflect.Ptr:
+		return alignment(t.Elem())
+	}
+	return 1
+}
+
+// isKeyType returns whether t is a valid type for a D-Bus dict.
+func isKeyType(t reflect.Type) bool {
+	switch t.Kind() {
+	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
+		reflect.Int16, reflect.Int32, reflect.Int64, reflect.Float64,
+		reflect.String:
+
+		return true
+	}
+	return false
+}
+
+// isValidInterface returns whether s is a valid name for an interface.
+func isValidInterface(s string) bool {
+	if len(s) == 0 || len(s) > 255 || s[0] == '.' {
+		return false
+	}
+	elem := strings.Split(s, ".")
+	if len(elem) < 2 {
+		return false
+	}
+	for _, v := range elem {
+		if len(v) == 0 {
+			return false
+		}
+		if v[0] >= '0' && v[0] <= '9' {
+			return false
+		}
+		for _, c := range v {
+			if !isMemberChar(c) {
+				return false
+			}
+		}
+	}
+	return true
+}
+
+// isValidMember returns whether s is a valid name for a member.
+func isValidMember(s string) bool {
+	if len(s) == 0 || len(s) > 255 {
+		return false
+	}
+	i := strings.Index(s, ".")
+	if i != -1 {
+		return false
+	}
+	if s[0] >= '0' && s[0] <= '9' {
+		return false
+	}
+	for _, c := range s {
+		if !isMemberChar(c) {
+			return false
+		}
+	}
+	return true
+}
+
+func isMemberChar(c rune) bool {
+	return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') ||
+		(c >= 'a' && c <= 'z') || c == '_'
+}
diff --git a/vendor/github.com/godbus/dbus/decoder.go b/vendor/github.com/godbus/dbus/decoder.go
new file mode 100644
index 0000000000..ef50dcab98
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/decoder.go
@@ -0,0 +1,228 @@
+package dbus
+
+import (
+	"encoding/binary"
+	"io"
+	"reflect"
+)
+
+type decoder struct {
+	in    io.Reader
+	order binary.ByteOrder
+	pos   int
+}
+
+// newDecoder returns a new decoder that reads values from in. The input is
+// expected to be in the given byte order.
+func newDecoder(in io.Reader, order binary.ByteOrder) *decoder {
+	dec := new(decoder)
+	dec.in = in
+	dec.order = order
+	return dec
+}
+
+// align aligns the input to the given boundary and panics on error.
+func (dec *decoder) align(n int) {
+	if dec.pos%n != 0 {
+		newpos := (dec.pos + n - 1) & ^(n - 1)
+		empty := make([]byte, newpos-dec.pos)
+		if _, err := io.ReadFull(dec.in, empty); err != nil {
+			panic(err)
+		}
+		dec.pos = newpos
+	}
+}
+
+// Calls binary.Read(dec.in, dec.order, v) and panics on read errors.
+func (dec *decoder) binread(v interface{}) {
+	if err := binary.Read(dec.in, dec.order, v); err != nil {
+		panic(err)
+	}
+}
+
+func (dec *decoder) Decode(sig Signature) (vs []interface{}, err error) {
+	defer func() {
+		var ok bool
+		v := recover()
+		if err, ok = v.(error); ok {
+			if err == io.EOF || err == io.ErrUnexpectedEOF {
+				err = FormatError("unexpected EOF")
+			}
+		}
+	}()
+	vs = make([]interface{}, 0)
+	s := sig.str
+	for s != "" {
+		err, rem := validSingle(s, 0)
+		if err != nil {
+			return nil, err
+		}
+		v := dec.decode(s[:len(s)-len(rem)], 0)
+		vs = append(vs, v)
+		s = rem
+	}
+	return vs, nil
+}
+
+func (dec *decoder) decode(s string, depth int) interface{} {
+	dec.align(alignment(typeFor(s)))
+	switch s[0] {
+	case 'y':
+		var b [1]byte
+		if _, err := dec.in.Read(b[:]); err != nil {
+			panic(err)
+		}
+		dec.pos++
+		return b[0]
+	case 'b':
+		i := dec.decode("u", depth).(uint32)
+		switch {
+		case i == 0:
+			return false
+		case i == 1:
+			return true
+		default:
+			panic(FormatError("invalid value for boolean"))
+		}
+	case 'n':
+		var i int16
+		dec.binread(&i)
+		dec.pos += 2
+		return i
+	case 'i':
+		var i int32
+		dec.binread(&i)
+		dec.pos += 4
+		return i
+	case 'x':
+		var i int64
+		dec.binread(&i)
+		dec.pos += 8
+		return i
+	case 'q':
+		var i uint16
+		dec.binread(&i)
+		dec.pos += 2
+		return i
+	case 'u':
+		var i uint32
+		dec.binread(&i)
+		dec.pos += 4
+		return i
+	case 't':
+		var i uint64
+		dec.binread(&i)
+		dec.pos += 8
+		return i
+	case 'd':
+		var f float64
+		dec.binread(&f)
+		dec.pos += 8
+		return f
+	case 's':
+		length := dec.decode("u", depth).(uint32)
+		b := make([]byte, int(length)+1)
+		if _, err := io.ReadFull(dec.in, b); err != nil {
+			panic(err)
+		}
+		dec.pos += int(length) + 1
+		return string(b[:len(b)-1])
+	case 'o':
+		return ObjectPath(dec.decode("s", depth).(string))
+	case 'g':
+		length := dec.decode("y", depth).(byte)
+		b := make([]byte, int(length)+1)
+		if _, err := io.ReadFull(dec.in, b); err != nil {
+			panic(err)
+		}
+		dec.pos += int(length) + 1
+		sig, err := ParseSignature(string(b[:len(b)-1]))
+		if err != nil {
+			panic(err)
+		}
+		return sig
+	case 'v':
+		if depth >= 64 {
+			panic(FormatError("input exceeds container depth limit"))
+		}
+		var variant Variant
+		sig := dec.decode("g", depth).(Signature)
+		if len(sig.str) == 0 {
+			panic(FormatError("variant signature is empty"))
+		}
+		err, rem := validSingle(sig.str, 0)
+		if err != nil {
+			panic(err)
+		}
+		if rem != "" {
+			panic(FormatError("variant signature has multiple types"))
+		}
+		variant.sig = sig
+		variant.value = dec.decode(sig.str, depth+1)
+		return variant
+	case 'h':
+		return UnixFDIndex(dec.decode("u", depth).(uint32))
+	case 'a':
+		if len(s) > 1 && s[1] == '{' {
+			ksig := s[2:3]
+			vsig := s[3 : len(s)-1]
+			v := reflect.MakeMap(reflect.MapOf(typeFor(ksig), typeFor(vsig)))
+			if depth >= 63 {
+				panic(FormatError("input exceeds container depth limit"))
+			}
+			length := dec.decode("u", depth).(uint32)
+			// Even for empty maps, the correct padding must be included
+			dec.align(8)
+			spos := dec.pos
+			for dec.pos < spos+int(length) {
+				dec.align(8)
+				if !isKeyType(v.Type().Key()) {
+					panic(InvalidTypeError{v.Type()})
+				}
+				kv := dec.decode(ksig, depth+2)
+				vv := dec.decode(vsig, depth+2)
+				v.SetMapIndex(reflect.ValueOf(kv), reflect.ValueOf(vv))
+			}
+			return v.Interface()
+		}
+		if depth >= 64 {
+			panic(FormatError("input exceeds container depth limit"))
+		}
+		length := dec.decode("u", depth).(uint32)
+		v := reflect.MakeSlice(reflect.SliceOf(typeFor(s[1:])), 0, int(length))
+		// Even for empty arrays, the correct padding must be included
+		dec.align(alignment(typeFor(s[1:])))
+		spos := dec.pos
+		for dec.pos < spos+int(length) {
+			ev := dec.decode(s[1:], depth+1)
+			v = reflect.Append(v, reflect.ValueOf(ev))
+		}
+		return v.Interface()
+	case '(':
+		if depth >= 64 {
+			panic(FormatError("input exceeds container depth limit"))
+		}
+		dec.align(8)
+		v := make([]interface{}, 0)
+		s = s[1 : len(s)-1]
+		for s != "" {
+			err, rem := validSingle(s, 0)
+			if err != nil {
+				panic(err)
+			}
+			ev := dec.decode(s[:len(s)-len(rem)], depth+1)
+			v = append(v, ev)
+			s = rem
+		}
+		return v
+	default:
+		panic(SignatureError{Sig: s})
+	}
+}
+
+// A FormatError is an error in the wire format.
+type FormatError string
+
+func (e FormatError) Error() string {
+	return "dbus: wire format error: " + string(e)
+}
diff --git a/vendor/github.com/godbus/dbus/doc.go b/vendor/github.com/godbus/dbus/doc.go
new file mode 100644
index 0000000000..deff554a38
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/doc.go
@@ -0,0 +1,63 @@
+/*
+Package dbus implements bindings to the D-Bus message bus system.
+
+To use the message bus API, you first need to connect to a bus (usually the
+session or system bus). The acquired connection then can be used to call methods
+on remote objects and emit or receive signals. Using the Export method, you can
+arrange D-Bus methods calls to be directly translated to method calls on a Go
+value.
+
+Conversion Rules
+
+For outgoing messages, Go types are automatically converted to the
+corresponding D-Bus types. The following types are directly encoded as their
+respective D-Bus equivalents:
+
+     Go type     | D-Bus type
+     ------------+-----------
+     byte        | BYTE
+     bool        | BOOLEAN
+     int16       | INT16
+     uint16      | UINT16
+     int32       | INT32
+     uint32      | UINT32
+     int64       | INT64
+     uint64      | UINT64
+     float64     | DOUBLE
+     string      | STRING
+     ObjectPath  | OBJECT_PATH
+     Signature   | SIGNATURE
+     Variant     | VARIANT
+     UnixFDIndex | UNIX_FD
+
+Slices and arrays encode as ARRAYs of their element type.
+
+Maps encode as DICTs, provided that their key type can be used as a key for
+a DICT.
+
+Structs other than Variant and Signature encode as a STRUCT containing their
+exported fields. Fields whose tags contain `dbus:"-"` and unexported fields will
+be skipped.
+
+Pointers encode as the value they're pointed to.
+
+Trying to encode any other type or a slice, map or struct containing an
+unsupported type will result in an InvalidTypeError.
+
+For incoming messages, the inverse of these rules are used, with the exception
+of STRUCTs. Incoming STRUCTS are represented as a slice of empty interfaces
+containing the struct fields in the correct order. The Store function can be
+used to convert such values to Go structs.
+
+Unix FD passing
+
+Handling Unix file descriptors deserves special mention. To use them, you should
+first check that they are supported on a connection by calling SupportsUnixFDs.
+If it returns true, all method of Connection will translate messages containing
+UnixFD's to messages that are accompanied by the given file descriptors with the
+UnixFD values being substituted by the correct indices. Similarily, the indices
+of incoming messages are automatically resolved. It shouldn't be necessary to use
+UnixFDIndex.
+
+*/
+package dbus
diff --git a/vendor/github.com/godbus/dbus/encoder.go b/vendor/github.com/godbus/dbus/encoder.go
new file mode 100644
index 0000000000..9f0a9e89ea
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/encoder.go
@@ -0,0 +1,208 @@
+package dbus
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io"
+	"reflect"
+)
+
+// An encoder encodes values to the D-Bus wire format.
+type encoder struct {
+	out   io.Writer
+	order binary.ByteOrder
+	pos   int
+}
+
+// NewEncoder returns a new encoder that writes to out in the given byte order.
+func newEncoder(out io.Writer, order binary.ByteOrder) *encoder {
+	return newEncoderAtOffset(out, 0, order)
+}
+
+// newEncoderAtOffset returns a new encoder that writes to out in the given
+// byte order. Specify the offset to initialize pos for proper alignment
+// computation.
+func newEncoderAtOffset(out io.Writer, offset int, order binary.ByteOrder) *encoder {
+	enc := new(encoder)
+	enc.out = out
+	enc.order = order
+	enc.pos = offset
+	return enc
+}
+
+// Aligns the next output to be on a multiple of n. Panics on write errors.
+func (enc *encoder) align(n int) {
+	pad := enc.padding(0, n)
+	if pad > 0 {
+		empty := make([]byte, pad)
+		if _, err := enc.out.Write(empty); err != nil {
+			panic(err)
+		}
+		enc.pos += pad
+	}
+}
+
+// pad returns the number of bytes of padding, based on current position and additional offset.
+// and alignment.
+func (enc *encoder) padding(offset, algn int) int {
+	abs := enc.pos + offset
+	if abs%algn != 0 {
+		newabs := (abs + algn - 1) & ^(algn - 1)
+		return newabs - abs
+	}
+	return 0
+}
+
+// Calls binary.Write(enc.out, enc.order, v) and panics on write errors.
+func (enc *encoder) binwrite(v interface{}) {
+	if err := binary.Write(enc.out, enc.order, v); err != nil {
+		panic(err)
+	}
+}
+
+// Encode encodes the given values to the underyling reader. All written values
+// are aligned properly as required by the D-Bus spec.
+func (enc *encoder) Encode(vs ...interface{}) (err error) {
+	defer func() {
+		err, _ = recover().(error)
+	}()
+	for _, v := range vs {
+		enc.encode(reflect.ValueOf(v), 0)
+	}
+	return nil
+}
+
+// encode encodes the given value to the writer and panics on error. depth holds
+// the depth of the container nesting.
+func (enc *encoder) encode(v reflect.Value, depth int) {
+	enc.align(alignment(v.Type()))
+	switch v.Kind() {
+	case reflect.Uint8:
+		var b [1]byte
+		b[0] = byte(v.Uint())
+		if _, err := enc.out.Write(b[:]); err != nil {
+			panic(err)
+		}
+		enc.pos++
+	case reflect.Bool:
+		if v.Bool() {
+			enc.encode(reflect.ValueOf(uint32(1)), depth)
+		} else {
+			enc.encode(reflect.ValueOf(uint32(0)), depth)
+		}
+	case reflect.Int16:
+		enc.binwrite(int16(v.Int()))
+		enc.pos += 2
+	case reflect.Uint16:
+		enc.binwrite(uint16(v.Uint()))
+		enc.pos += 2
+	case reflect.Int32:
+		enc.binwrite(int32(v.Int()))
+		enc.pos += 4
+	case reflect.Uint32:
+		enc.binwrite(uint32(v.Uint()))
+		enc.pos += 4
+	case reflect.Int64:
+		enc.binwrite(v.Int())
+		enc.pos += 8
+	case reflect.Uint64:
+		enc.binwrite(v.Uint())
+		enc.pos += 8
+	case reflect.Float64:
+		enc.binwrite(v.Float())
+		enc.pos += 8
+	case reflect.String:
+		enc.encode(reflect.ValueOf(uint32(len(v.String()))), depth)
+		b := make([]byte, v.Len()+1)
+		copy(b, v.String())
+		b[len(b)-1] = 0
+		n, err := enc.out.Write(b)
+		if err != nil {
+			panic(err)
+		}
+		enc.pos += n
+	case reflect.Ptr:
+		enc.encode(v.Elem(), depth)
+	case reflect.Slice, reflect.Array:
+		if depth >= 64 {
+			panic(FormatError("input exceeds container depth limit"))
+		}
+		// Lookahead offset: 4 bytes for uint32 length (with alignment),
+		// plus alignment for elements.
+		n := enc.padding(0, 4) + 4
+		offset := enc.pos + n + enc.padding(n, alignment(v.Type().Elem()))
+
+		var buf bytes.Buffer
+		bufenc := newEncoderAtOffset(&buf, offset, enc.order)
+
+		for i := 0; i < v.Len(); i++ {
+			bufenc.encode(v.Index(i), depth+1)
+		}
+		enc.encode(reflect.ValueOf(uint32(buf.Len())), depth)
+		length := buf.Len()
+		enc.align(alignment(v.Type().Elem()))
+		if _, err := buf.WriteTo(enc.out); err != nil {
+			panic(err)
+		}
+		enc.pos += length
+	case reflect.Struct:
+		if depth >= 64 && v.Type() != signatureType {
+			panic(FormatError("input exceeds container depth limit"))
+		}
+		switch t := v.Type(); t {
+		case signatureType:
+			str := v.Field(0)
+			enc.encode(reflect.ValueOf(byte(str.Len())), depth+1)
+			b := make([]byte, str.Len()+1)
+			copy(b, str.String())
+			b[len(b)-1] = 0
+			n, err := enc.out.Write(b)
+			if err != nil {
+				panic(err)
+			}
+			enc.pos += n
+		case variantType:
+			variant := v.Interface().(Variant)
+			enc.encode(reflect.ValueOf(variant.sig), depth+1)
+			enc.encode(reflect.ValueOf(variant.value), depth+1)
+		default:
+			for i := 0; i < v.Type().NumField(); i++ {
+				field := t.Field(i)
+				if field.PkgPath == "" && field.Tag.Get("dbus") != "-" {
+					enc.encode(v.Field(i), depth+1)
+				}
+			}
+		}
+	case reflect.Map:
+		// Maps are arrays of structures, so they actually increase the depth by
+		// 2.
+		if depth >= 63 {
+			panic(FormatError("input exceeds container depth limit"))
+		}
+		if !isKeyType(v.Type().Key()) {
+			panic(InvalidTypeError{v.Type()})
+		}
+		keys := v.MapKeys()
+		// Lookahead offset: 4 bytes for uint32 length (with alignment),
+		// plus 8-byte alignment
+		n := enc.padding(0, 4) + 4
+		offset := enc.pos + n + enc.padding(n, 8)
+
+		var buf bytes.Buffer
+		bufenc := newEncoderAtOffset(&buf, offset, enc.order)
+		for _, k := range keys {
+			bufenc.align(8)
+			bufenc.encode(k, depth+2)
+			bufenc.encode(v.MapIndex(k), depth+2)
+		}
+		enc.encode(reflect.ValueOf(uint32(buf.Len())), depth)
+		length := buf.Len()
+		enc.align(8)
+		if _, err := buf.WriteTo(enc.out); err != nil {
+			panic(err)
+		}
+		enc.pos += length
+	default:
+		panic(InvalidTypeError{v.Type()})
+	}
+}
diff --git a/vendor/github.com/godbus/dbus/export.go b/vendor/github.com/godbus/dbus/export.go
new file mode 100644
index 0000000000..c6440a7416
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/export.go
@@ -0,0 +1,411 @@
+package dbus
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+var (
+	errmsgInvalidArg = Error{
+		"org.freedesktop.DBus.Error.InvalidArgs",
+		[]interface{}{"Invalid type / number of args"},
+	}
+	errmsgNoObject = Error{
+		"org.freedesktop.DBus.Error.NoSuchObject",
+		[]interface{}{"No such object"},
+	}
+	errmsgUnknownMethod = Error{
+		"org.freedesktop.DBus.Error.UnknownMethod",
+		[]interface{}{"Unknown / invalid method"},
+	}
+)
+
+// exportWithMapping represents an exported struct along with a method name
+// mapping to allow for exporting lower-case methods, etc.
+type exportWithMapping struct {
+	export interface{}
+
+	// Method name mapping; key -> struct method, value -> dbus method.
+	mapping map[string]string
+
+	// Whether or not this export is for the entire subtree
+	includeSubtree bool
+}
+
+// Sender is a type which can be used in exported methods to receive the message
+// sender.
+type Sender string
+
+func exportedMethod(export exportWithMapping, name string) reflect.Value {
+	if export.export == nil {
+		return reflect.Value{}
+	}
+
+	// If a mapping was included in the export, check the map to see if we
+	// should be looking for a different method in the export.
+	if export.mapping != nil {
+		for key, value := range export.mapping {
+			if value == name {
+				name = key
+				break
+			}
+
+			// Catch the case where a method is aliased but the client is calling
+			// the original, e.g. the "Foo" method was exported mapped to
+			// "foo," and dbus client called the original "Foo."
+			if key == name {
+				return reflect.Value{}
+			}
+		}
+	}
+
+	value := reflect.ValueOf(export.export)
+	m := value.MethodByName(name)
+
+	// Catch the case of attempting to call an unexported method
+	method, ok := value.Type().MethodByName(name)
+
+	if !m.IsValid() || !ok || method.PkgPath != "" {
+		return reflect.Value{}
+	}
+	t := m.Type()
+	if t.NumOut() == 0 ||
+		t.Out(t.NumOut()-1) != reflect.TypeOf(&errmsgInvalidArg) {
+
+		return reflect.Value{}
+	}
+	return m
+}
+
+// searchHandlers will look through all registered handlers looking for one
+// to handle the given path. If a verbatim one isn't found, it will check for
+// a subtree registration for the path as well.
+func (conn *Conn) searchHandlers(path ObjectPath) (map[string]exportWithMapping, bool) {
+	conn.handlersLck.RLock()
+	defer conn.handlersLck.RUnlock()
+
+	handlers, ok := conn.handlers[path]
+	if ok {
+		return handlers, ok
+	}
+
+	// If handlers weren't found for this exact path, look for a matching subtree
+	// registration
+	handlers = make(map[string]exportWithMapping)
+	path = path[:strings.LastIndex(string(path), "/")]
+	for len(path) > 0 {
+		var subtreeHandlers map[string]exportWithMapping
+		subtreeHandlers, ok = conn.handlers[path]
+		if ok {
+			for iface, handler := range subtreeHandlers {
+				// Only include this handler if it registered for the subtree
+				if handler.includeSubtree {
+					handlers[iface] = handler
+				}
+			}
+
+			break
+		}
+
+		path = path[:strings.LastIndex(string(path), "/")]
+	}
+
+	return handlers, ok
+}
+
+// handleCall handles the given method call (i.e. looks if it's one of the
+// pre-implemented ones and searches for a corresponding handler if not).
+func (conn *Conn) handleCall(msg *Message) {
+	name := msg.Headers[FieldMember].value.(string)
+	path := msg.Headers[FieldPath].value.(ObjectPath)
+	ifaceName, hasIface := msg.Headers[FieldInterface].value.(string)
+	sender, hasSender := msg.Headers[FieldSender].value.(string)
+	serial := msg.serial
+	if ifaceName == "org.freedesktop.DBus.Peer" {
+		switch name {
+		case "Ping":
+			conn.sendReply(sender, serial)
+		case "GetMachineId":
+			conn.sendReply(sender, serial, conn.uuid)
+		default:
+			conn.sendError(errmsgUnknownMethod, sender, serial)
+		}
+		return
+	}
+	if len(name) == 0 {
+		conn.sendError(errmsgUnknownMethod, sender, serial)
+	}
+
+	// Find the exported handler (if any) for this path
+	handlers, ok := conn.searchHandlers(path)
+	if !ok {
+		conn.sendError(errmsgNoObject, sender, serial)
+		return
+	}
+
+	var m reflect.Value
+	if hasIface {
+		iface := handlers[ifaceName]
+		m = exportedMethod(iface, name)
+	} else {
+		for _, v := range handlers {
+			m = exportedMethod(v, name)
+			if m.IsValid() {
+				break
+			}
+		}
+	}
+
+	if !m.IsValid() {
+		conn.sendError(errmsgUnknownMethod, sender, serial)
+		return
+	}
+
+	t := m.Type()
+	vs := msg.Body
+	pointers := make([]interface{}, t.NumIn())
+	decode := make([]interface{}, 0, len(vs))
+	for i := 0; i < t.NumIn(); i++ {
+		tp := t.In(i)
+		val := reflect.New(tp)
+		pointers[i] = val.Interface()
+		if tp == reflect.TypeOf((*Sender)(nil)).Elem() {
+			val.Elem().SetString(sender)
+		} else if tp == reflect.TypeOf((*Message)(nil)).Elem() {
+			val.Elem().Set(reflect.ValueOf(*msg))
+		} else {
+			decode = append(decode, pointers[i])
+		}
+	}
+
+	if len(decode) != len(vs) {
+		conn.sendError(errmsgInvalidArg, sender, serial)
+		return
+	}
+
+	if err := Store(vs, decode...); err != nil {
+		conn.sendError(errmsgInvalidArg, sender, serial)
+		return
+	}
+
+	// Extract parameters
+	params := make([]reflect.Value, len(pointers))
+	for i := 0; i < len(pointers); i++ {
+		params[i] = reflect.ValueOf(pointers[i]).Elem()
+	}
+
+	// Call method
+	ret := m.Call(params)
+	if em := ret[t.NumOut()-1].Interface().(*Error); em != nil {
+		conn.sendError(*em, sender, serial)
+		return
+	}
+
+	if msg.Flags&FlagNoReplyExpected == 0 {
+		reply := new(Message)
+		reply.Type = TypeMethodReply
+		reply.serial = conn.getSerial()
+		reply.Headers = make(map[HeaderField]Variant)
+		if hasSender {
+			reply.Headers[FieldDestination] = msg.Headers[FieldSender]
+		}
+		reply.Headers[FieldReplySerial] = MakeVariant(msg.serial)
+		reply.Body = make([]interface{}, len(ret)-1)
+		for i := 0; i < len(ret)-1; i++ {
+			reply.Body[i] = ret[i].Interface()
+		}
+		if len(ret) != 1 {
+			reply.Headers[FieldSignature] = MakeVariant(SignatureOf(reply.Body...))
+		}
+		conn.outLck.RLock()
+		if !conn.closed {
+			conn.out <- reply
+		}
+		conn.outLck.RUnlock()
+	}
+}
+
+// Emit emits the given signal on the message bus. The name parameter must be
+// formatted as "interface.member", e.g., "org.freedesktop.DBus.NameLost".
+func (conn *Conn) Emit(path ObjectPath, name string, values ...interface{}) error {
+	if !path.IsValid() {
+		return errors.New("dbus: invalid object path")
+	}
+	i := strings.LastIndex(name, ".")
+	if i == -1 {
+		return errors.New("dbus: invalid method name")
+	}
+	iface := name[:i]
+	member := name[i+1:]
+	if !isValidMember(member) {
+		return errors.New("dbus: invalid method name")
+	}
+	if !isValidInterface(iface) {
+		return errors.New("dbus: invalid interface name")
+	}
+	msg := new(Message)
+	msg.Type = TypeSignal
+	msg.serial = conn.getSerial()
+	msg.Headers = make(map[HeaderField]Variant)
+	msg.Headers[FieldInterface] = MakeVariant(iface)
+	msg.Headers[FieldMember] = MakeVariant(member)
+	msg.Headers[FieldPath] = MakeVariant(path)
+	msg.Body = values
+	if len(values) > 0 {
+		msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
+	}
+	conn.outLck.RLock()
+	defer conn.outLck.RUnlock()
+	if conn.closed {
+		return ErrClosed
+	}
+	conn.out <- msg
+	return nil
+}
+
+// Export registers the given value to be exported as an object on the
+// message bus.
+//
+// If a method call on the given path and interface is received, an exported
+// method with the same name is called with v as the receiver if the
+// parameters match and the last return value is of type *Error. If this
+// *Error is not nil, it is sent back to the caller as an error.
+// Otherwise, a method reply is sent with the other return values as its body.
+//
+// Any parameters with the special type Sender are set to the sender of the
+// dbus message when the method is called. Parameters of this type do not
+// contribute to the dbus signature of the method (i.e. the method is exposed
+// as if the parameters of type Sender were not there).
+//
+// Similarly, any parameters with the type Message are set to the raw message
+// received on the bus. Again, parameters of this type do not contribute to the
+// dbus signature of the method.
+//
+// Every method call is executed in a new goroutine, so the method may be called
+// in multiple goroutines at once.
+//
+// Method calls on the interface org.freedesktop.DBus.Peer will be automatically
+// handled for every object.
+//
+// Passing nil as the first parameter will cause conn to cease handling calls on
+// the given combination of path and interface.
+//
+// Export returns an error if path is not a valid path name.
+func (conn *Conn) Export(v interface{}, path ObjectPath, iface string) error {
+	return conn.ExportWithMap(v, nil, path, iface)
+}
+
+// ExportWithMap works exactly like Export but provides the ability to remap
+// method names (e.g. export a lower-case method).
+//
+// The keys in the map are the real method names (exported on the struct), and
+// the values are the method names to be exported on DBus.
+func (conn *Conn) ExportWithMap(v interface{}, mapping map[string]string, path ObjectPath, iface string) error {
+	return conn.exportWithMap(v, mapping, path, iface, false)
+}
+
+// ExportSubtree works exactly like Export but registers the given value for
+// an entire subtree rather under the root path provided.
+//
+// In order to make this useful, one parameter in each of the value's exported
+// methods should be a Message, in which case it will contain the raw message
+// (allowing one to get access to the path that caused the method to be called).
+//
+// Note that more specific export paths take precedence over less specific. For
+// example, a method call using the ObjectPath /foo/bar/baz will call a method
+// exported on /foo/bar before a method exported on /foo.
+func (conn *Conn) ExportSubtree(v interface{}, path ObjectPath, iface string) error {
+	return conn.ExportSubtreeWithMap(v, nil, path, iface)
+}
+
+// ExportSubtreeWithMap works exactly like ExportSubtree but provides the
+// ability to remap method names (e.g. export a lower-case method).
+//
+// The keys in the map are the real method names (exported on the struct), and
+// the values are the method names to be exported on DBus.
+func (conn *Conn) ExportSubtreeWithMap(v interface{}, mapping map[string]string, path ObjectPath, iface string) error {
+	return conn.exportWithMap(v, mapping, path, iface, true)
+}
+
+// exportWithMap is the worker function for all exports/registrations.
+func (conn *Conn) exportWithMap(v interface{}, mapping map[string]string, path ObjectPath, iface string, includeSubtree bool) error {
+	if !path.IsValid() {
+		return fmt.Errorf(`dbus: Invalid path name: "%s"`, path)
+	}
+
+	conn.handlersLck.Lock()
+	defer conn.handlersLck.Unlock()
+
+	// Remove a previous export if the interface is nil
+	if v == nil {
+		if _, ok := conn.handlers[path]; ok {
+			delete(conn.handlers[path], iface)
+			if len(conn.handlers[path]) == 0 {
+				delete(conn.handlers, path)
+			}
+		}
+
+		return nil
+	}
+
+	// If this is the first handler for this path, make a new map to hold all
+	// handlers for this path.
+	if _, ok := conn.handlers[path]; !ok {
+		conn.handlers[path] = make(map[string]exportWithMapping)
+	}
+
+	// Finally, save this handler
+	conn.handlers[path][iface] = exportWithMapping{export: v, mapping: mapping, includeSubtree: includeSubtree}
+
+	return nil
+}
+
+// ReleaseName calls org.freedesktop.DBus.ReleaseName and awaits a response.
+func (conn *Conn) ReleaseName(name string) (ReleaseNameReply, error) {
+	var r uint32
+	err := conn.busObj.Call("org.freedesktop.DBus.ReleaseName", 0, name).Store(&r)
+	if err != nil {
+		return 0, err
+	}
+	return ReleaseNameReply(r), nil
+}
+
+// RequestName calls org.freedesktop.DBus.RequestName and awaits a response.
+func (conn *Conn) RequestName(name string, flags RequestNameFlags) (RequestNameReply, error) {
+	var r uint32
+	err := conn.busObj.Call("org.freedesktop.DBus.RequestName", 0, name, flags).Store(&r)
+	if err != nil {
+		return 0, err
+	}
+	return RequestNameReply(r), nil
+}
+
+// ReleaseNameReply is the reply to a ReleaseName call.
+type ReleaseNameReply uint32
+
+const (
+	ReleaseNameReplyReleased ReleaseNameReply = 1 + iota
+	ReleaseNameReplyNonExistent
+	ReleaseNameReplyNotOwner
+)
+
+// RequestNameFlags represents the possible flags for a RequestName call.
+type RequestNameFlags uint32
+
+const (
+	NameFlagAllowReplacement RequestNameFlags = 1 << iota
+	NameFlagReplaceExisting
+	NameFlagDoNotQueue
+)
+
+// RequestNameReply is the reply to a RequestName call.
+type RequestNameReply uint32
+
+const (
+	RequestNameReplyPrimaryOwner RequestNameReply = 1 + iota
+	RequestNameReplyInQueue
+	RequestNameReplyExists
+	RequestNameReplyAlreadyOwner
+)
diff --git a/vendor/github.com/godbus/dbus/homedir.go b/vendor/github.com/godbus/dbus/homedir.go
new file mode 100644
index 0000000000..0b745f9313
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/homedir.go
@@ -0,0 +1,28 @@
+package dbus
+
+import (
+	"os"
+	"sync"
+)
+
+var (
+	homeDir     string
+	homeDirLock sync.Mutex
+)
+
+func getHomeDir() string {
+	homeDirLock.Lock()
+	defer homeDirLock.Unlock()
+
+	if homeDir != "" {
+		return homeDir
+	}
+
+	homeDir = os.Getenv("HOME")
+	if homeDir != "" {
+		return homeDir
+	}
+
+	homeDir = lookupHomeDir()
+	return homeDir
+}
diff --git a/vendor/github.com/godbus/dbus/homedir_dynamic.go b/vendor/github.com/godbus/dbus/homedir_dynamic.go
new file mode 100644
index 0000000000..2732081e73
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/homedir_dynamic.go
@@ -0,0 +1,15 @@
+// +build !static_build
+
+package dbus
+
+import (
+	"os/user"
+)
+
+func lookupHomeDir() string {
+	u, err := user.Current()
+	if err != nil {
+		return "/"
+	}
+	return u.HomeDir
+}
diff --git a/vendor/github.com/godbus/dbus/homedir_static.go b/vendor/github.com/godbus/dbus/homedir_static.go
new file mode 100644
index 0000000000..b9d9cb5525
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/homedir_static.go
@@ -0,0 +1,45 @@
+// +build static_build
+
+package dbus
+
+import (
+	"bufio"
+	"os"
+	"strconv"
+	"strings"
+)
+
+func lookupHomeDir() string {
+	myUid := os.Getuid()
+
+	f, err := os.Open("/etc/passwd")
+	if err != nil {
+		return "/"
+	}
+	defer f.Close()
+
+	s := bufio.NewScanner(f)
+
+	for s.Scan() {
+		if err := s.Err(); err != nil {
+			break
+		}
+
+		line := strings.TrimSpace(s.Text())
+		if line == "" {
+			continue
+		}
+
+		parts := strings.Split(line, ":")
+
+		if len(parts) >= 6 {
+			uid, err := strconv.Atoi(parts[2])
+			if err == nil && uid == myUid {
+				return parts[5]
+			}
+		}
+	}
+
+	// Default to / if we can't get a better value
+	return "/"
+}
diff --git a/vendor/github.com/godbus/dbus/introspect/call.go b/vendor/github.com/godbus/dbus/introspect/call.go
new file mode 100644
index 0000000000..790a23ec24
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/introspect/call.go
@@ -0,0 +1,27 @@
+package introspect
+
+import (
+	"encoding/xml"
+	"github.com/godbus/dbus"
+	"strings"
+)
+
+// Call calls org.freedesktop.Introspectable.Introspect on a remote object
+// and returns the introspection data.
+func Call(o dbus.BusObject) (*Node, error) {
+	var xmldata string
+	var node Node
+
+	err := o.Call("org.freedesktop.DBus.Introspectable.Introspect", 0).Store(&xmldata)
+	if err != nil {
+		return nil, err
+	}
+	err = xml.NewDecoder(strings.NewReader(xmldata)).Decode(&node)
+	if err != nil {
+		return nil, err
+	}
+	if node.Name == "" {
+		node.Name = string(o.Path())
+	}
+	return &node, nil
+}
diff --git a/vendor/github.com/godbus/dbus/introspect/introspect.go b/vendor/github.com/godbus/dbus/introspect/introspect.go
new file mode 100644
index 0000000000..b06c3f1cf2
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/introspect/introspect.go
@@ -0,0 +1,86 @@
+// Package introspect provides some utilities for dealing with the DBus
+// introspection format.
+package introspect
+
+import "encoding/xml"
+
+// The introspection data for the org.freedesktop.DBus.Introspectable interface.
+var IntrospectData = Interface{
+	Name: "org.freedesktop.DBus.Introspectable",
+	Methods: []Method{
+		{
+			Name: "Introspect",
+			Args: []Arg{
+				{"out", "s", "out"},
+			},
+		},
+	},
+}
+
+// XML document type declaration of the introspection format version 1.0
+const IntrospectDeclarationString = `
+	<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+	 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+`
+
+// The introspection data for the org.freedesktop.DBus.Introspectable interface,
+// as a string.
+const IntrospectDataString = `
+	<interface name="org.freedesktop.DBus.Introspectable">
+		<method name="Introspect">
+			<arg name="out" direction="out" type="s"/>
+		</method>
+	</interface>
+`
+
+// Node is the root element of an introspection.
+type Node struct {
+	XMLName    xml.Name    `xml:"node"`
+	Name       string      `xml:"name,attr,omitempty"`
+	Interfaces []Interface `xml:"interface"`
+	Children   []Node      `xml:"node,omitempty"`
+}
+
+// Interface describes a DBus interface that is available on the message bus.
+type Interface struct {
+	Name        string       `xml:"name,attr"`
+	Methods     []Method     `xml:"method"`
+	Signals     []Signal     `xml:"signal"`
+	Properties  []Property   `xml:"property"`
+	Annotations []Annotation `xml:"annotation"`
+}
+
+// Method describes a Method on an Interface as retured by an introspection.
+type Method struct {
+	Name        string       `xml:"name,attr"`
+	Args        []Arg        `xml:"arg"`
+	Annotations []Annotation `xml:"annotation"`
+}
+
+// Signal describes a Signal emitted on an Interface.
+type Signal struct {
+	Name        string       `xml:"name,attr"`
+	Args        []Arg        `xml:"arg"`
+	Annotations []Annotation `xml:"annotation"`
+}
+
+// Property describes a property of an Interface.
+type Property struct {
+	Name        string       `xml:"name,attr"`
+	Type        string       `xml:"type,attr"`
+	Access      string       `xml:"access,attr"`
+	Annotations []Annotation `xml:"annotation"`
+}
+
+// Arg represents an argument of a method or a signal.
+type Arg struct {
+	Name      string `xml:"name,attr,omitempty"`
+	Type      string `xml:"type,attr"`
+	Direction string `xml:"direction,attr,omitempty"`
+}
+
+// Annotation is an annotation in the introspection format.
+type Annotation struct {
+	Name  string `xml:"name,attr"`
+	Value string `xml:"value,attr"`
+}
diff --git a/vendor/github.com/godbus/dbus/introspect/introspectable.go b/vendor/github.com/godbus/dbus/introspect/introspectable.go
new file mode 100644
index 0000000000..2f16690b99
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/introspect/introspectable.go
@@ -0,0 +1,76 @@
+package introspect
+
+import (
+	"encoding/xml"
+	"github.com/godbus/dbus"
+	"reflect"
+	"strings"
+)
+
+// Introspectable implements org.freedesktop.Introspectable.
+//
+// You can create it by converting the XML-formatted introspection data from a
+// string to an Introspectable or call NewIntrospectable with a Node. Then,
+// export it as org.freedesktop.Introspectable on you object.
+type Introspectable string
+
+// NewIntrospectable returns an Introspectable that returns the introspection
+// data that corresponds to the given Node. If n.Interfaces doesn't contain the
+// data for org.freedesktop.DBus.Introspectable, it is added automatically.
+func NewIntrospectable(n *Node) Introspectable {
+	found := false
+	for _, v := range n.Interfaces {
+		if v.Name == "org.freedesktop.DBus.Introspectable" {
+			found = true
+			break
+		}
+	}
+	if !found {
+		n.Interfaces = append(n.Interfaces, IntrospectData)
+	}
+	b, err := xml.Marshal(n)
+	if err != nil {
+		panic(err)
+	}
+	return Introspectable(strings.TrimSpace(IntrospectDeclarationString) + string(b))
+}
+
+// Introspect implements org.freedesktop.Introspectable.Introspect.
+func (i Introspectable) Introspect() (string, *dbus.Error) {
+	return string(i), nil
+}
+
+// Methods returns the description of the methods of v. This can be used to
+// create a Node which can be passed to NewIntrospectable.
+func Methods(v interface{}) []Method {
+	t := reflect.TypeOf(v)
+	ms := make([]Method, 0, t.NumMethod())
+	for i := 0; i < t.NumMethod(); i++ {
+		if t.Method(i).PkgPath != "" {
+			continue
+		}
+		mt := t.Method(i).Type
+		if mt.NumOut() == 0 ||
+			mt.Out(mt.NumOut()-1) != reflect.TypeOf(&dbus.Error{}) {
+
+			continue
+		}
+		var m Method
+		m.Name = t.Method(i).Name
+		m.Args = make([]Arg, 0, mt.NumIn()+mt.NumOut()-2)
+		for j := 1; j < mt.NumIn(); j++ {
+			if mt.In(j) != reflect.TypeOf((*dbus.Sender)(nil)).Elem() &&
+				mt.In(j) != reflect.TypeOf((*dbus.Message)(nil)).Elem() {
+				arg := Arg{"", dbus.SignatureOfType(mt.In(j)).String(), "in"}
+				m.Args = append(m.Args, arg)
+			}
+		}
+		for j := 0; j < mt.NumOut()-1; j++ {
+			arg := Arg{"", dbus.SignatureOfType(mt.Out(j)).String(), "out"}
+			m.Args = append(m.Args, arg)
+		}
+		m.Annotations = make([]Annotation, 0)
+		ms = append(ms, m)
+	}
+	return ms
+}
diff --git a/vendor/github.com/godbus/dbus/message.go b/vendor/github.com/godbus/dbus/message.go
new file mode 100644
index 0000000000..075d6e38ba
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/message.go
@@ -0,0 +1,346 @@
+package dbus
+
+import (
+	"bytes"
+	"encoding/binary"
+	"errors"
+	"io"
+	"reflect"
+	"strconv"
+)
+
+const protoVersion byte = 1
+
+// Flags represents the possible flags of a D-Bus message.
+type Flags byte
+
+const (
+	// FlagNoReplyExpected signals that the message is not expected to generate
+	// a reply. If this flag is set on outgoing messages, any possible reply
+	// will be discarded.
+	FlagNoReplyExpected Flags = 1 << iota
+	// FlagNoAutoStart signals that the message bus should not automatically
+	// start an application when handling this message.
+	FlagNoAutoStart
+)
+
+// Type represents the possible types of a D-Bus message.
+type Type byte
+
+const (
+	TypeMethodCall Type = 1 + iota
+	TypeMethodReply
+	TypeError
+	TypeSignal
+	typeMax
+)
+
+func (t Type) String() string {
+	switch t {
+	case TypeMethodCall:
+		return "method call"
+	case TypeMethodReply:
+		return "reply"
+	case TypeError:
+		return "error"
+	case TypeSignal:
+		return "signal"
+	}
+	return "invalid"
+}
+
+// HeaderField represents the possible byte codes for the headers
+// of a D-Bus message.
+type HeaderField byte
+
+const (
+	FieldPath HeaderField = 1 + iota
+	FieldInterface
+	FieldMember
+	FieldErrorName
+	FieldReplySerial
+	FieldDestination
+	FieldSender
+	FieldSignature
+	FieldUnixFDs
+	fieldMax
+)
+
+// An InvalidMessageError describes the reason why a D-Bus message is regarded as
+// invalid.
+type InvalidMessageError string
+
+func (e InvalidMessageError) Error() string {
+	return "dbus: invalid message: " + string(e)
+}
+
+// fieldType are the types of the various header fields.
+var fieldTypes = [fieldMax]reflect.Type{
+	FieldPath:        objectPathType,
+	FieldInterface:   stringType,
+	FieldMember:      stringType,
+	FieldErrorName:   stringType,
+	FieldReplySerial: uint32Type,
+	FieldDestination: stringType,
+	FieldSender:      stringType,
+	FieldSignature:   signatureType,
+	FieldUnixFDs:     uint32Type,
+}
+
+// requiredFields lists the header fields that are required by the different
+// message types.
+var requiredFields = [typeMax][]HeaderField{
+	TypeMethodCall:  {FieldPath, FieldMember},
+	TypeMethodReply: {FieldReplySerial},
+	TypeError:       {FieldErrorName, FieldReplySerial},
+	TypeSignal:      {FieldPath, FieldInterface, FieldMember},
+}
+
+// Message represents a single D-Bus message.
+type Message struct {
+	Type
+	Flags
+	Headers map[HeaderField]Variant
+	Body    []interface{}
+
+	serial uint32
+}
+
+type header struct {
+	Field byte
+	Variant
+}
+
+// DecodeMessage tries to decode a single message in the D-Bus wire format
+// from the given reader. The byte order is figured out from the first byte.
+// The possibly returned error can be an error of the underlying reader, an
+// InvalidMessageError or a FormatError.
+func DecodeMessage(rd io.Reader) (msg *Message, err error) {
+	var order binary.ByteOrder
+	var hlength, length uint32
+	var typ, flags, proto byte
+	var headers []header
+
+	b := make([]byte, 1)
+	_, err = rd.Read(b)
+	if err != nil {
+		return
+	}
+	switch b[0] {
+	case 'l':
+		order = binary.LittleEndian
+	case 'B':
+		order = binary.BigEndian
+	default:
+		return nil, InvalidMessageError("invalid byte order")
+	}
+
+	dec := newDecoder(rd, order)
+	dec.pos = 1
+
+	msg = new(Message)
+	vs, err := dec.Decode(Signature{"yyyuu"})
+	if err != nil {
+		return nil, err
+	}
+	if err = Store(vs, &typ, &flags, &proto, &length, &msg.serial); err != nil {
+		return nil, err
+	}
+	msg.Type = Type(typ)
+	msg.Flags = Flags(flags)
+
+	// get the header length separately because we need it later
+	b = make([]byte, 4)
+	_, err = io.ReadFull(rd, b)
+	if err != nil {
+		return nil, err
+	}
+	binary.Read(bytes.NewBuffer(b), order, &hlength)
+	if hlength+length+16 > 1<<27 {
+		return nil, InvalidMessageError("message is too long")
+	}
+	dec = newDecoder(io.MultiReader(bytes.NewBuffer(b), rd), order)
+	dec.pos = 12
+	vs, err = dec.Decode(Signature{"a(yv)"})
+	if err != nil {
+		return nil, err
+	}
+	if err = Store(vs, &headers); err != nil {
+		return nil, err
+	}
+
+	msg.Headers = make(map[HeaderField]Variant)
+	for _, v := range headers {
+		msg.Headers[HeaderField(v.Field)] = v.Variant
+	}
+
+	dec.align(8)
+	body := make([]byte, int(length))
+	if length != 0 {
+		_, err := io.ReadFull(rd, body)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if err = msg.IsValid(); err != nil {
+		return nil, err
+	}
+	sig, _ := msg.Headers[FieldSignature].value.(Signature)
+	if sig.str != "" {
+		buf := bytes.NewBuffer(body)
+		dec = newDecoder(buf, order)
+		vs, err := dec.Decode(sig)
+		if err != nil {
+			return nil, err
+		}
+		msg.Body = vs
+	}
+
+	return
+}
+
+// EncodeTo encodes and sends a message to the given writer. The byte order must
+// be either binary.LittleEndian or binary.BigEndian. If the message is not
+// valid or an error occurs when writing, an error is returned.
+func (msg *Message) EncodeTo(out io.Writer, order binary.ByteOrder) error {
+	if err := msg.IsValid(); err != nil {
+		return err
+	}
+	var vs [7]interface{}
+	switch order {
+	case binary.LittleEndian:
+		vs[0] = byte('l')
+	case binary.BigEndian:
+		vs[0] = byte('B')
+	default:
+		return errors.New("dbus: invalid byte order")
+	}
+	body := new(bytes.Buffer)
+	enc := newEncoder(body, order)
+	if len(msg.Body) != 0 {
+		enc.Encode(msg.Body...)
+	}
+	vs[1] = msg.Type
+	vs[2] = msg.Flags
+	vs[3] = protoVersion
+	vs[4] = uint32(len(body.Bytes()))
+	vs[5] = msg.serial
+	headers := make([]header, 0, len(msg.Headers))
+	for k, v := range msg.Headers {
+		headers = append(headers, header{byte(k), v})
+	}
+	vs[6] = headers
+	var buf bytes.Buffer
+	enc = newEncoder(&buf, order)
+	enc.Encode(vs[:]...)
+	enc.align(8)
+	body.WriteTo(&buf)
+	if buf.Len() > 1<<27 {
+		return InvalidMessageError("message is too long")
+	}
+	if _, err := buf.WriteTo(out); err != nil {
+		return err
+	}
+	return nil
+}
+
+// IsValid checks whether msg is a valid message and returns an
+// InvalidMessageError if it is not.
+func (msg *Message) IsValid() error {
+	if msg.Flags & ^(FlagNoAutoStart|FlagNoReplyExpected) != 0 {
+		return InvalidMessageError("invalid flags")
+	}
+	if msg.Type == 0 || msg.Type >= typeMax {
+		return InvalidMessageError("invalid message type")
+	}
+	for k, v := range msg.Headers {
+		if k == 0 || k >= fieldMax {
+			return InvalidMessageError("invalid header")
+		}
+		if reflect.TypeOf(v.value) != fieldTypes[k] {
+			return InvalidMessageError("invalid type of header field")
+		}
+	}
+	for _, v := range requiredFields[msg.Type] {
+		if _, ok := msg.Headers[v]; !ok {
+			return InvalidMessageError("missing required header")
+		}
+	}
+	if path, ok := msg.Headers[FieldPath]; ok {
+		if !path.value.(ObjectPath).IsValid() {
+			return InvalidMessageError("invalid path name")
+		}
+	}
+	if iface, ok := msg.Headers[FieldInterface]; ok {
+		if !isValidInterface(iface.value.(string)) {
+			return InvalidMessageError("invalid interface name")
+		}
+	}
+	if member, ok := msg.Headers[FieldMember]; ok {
+		if !isValidMember(member.value.(string)) {
+			return InvalidMessageError("invalid member name")
+		}
+	}
+	if errname, ok := msg.Headers[FieldErrorName]; ok {
+		if !isValidInterface(errname.value.(string)) {
+			return InvalidMessageError("invalid error name")
+		}
+	}
+	if len(msg.Body) != 0 {
+		if _, ok := msg.Headers[FieldSignature]; !ok {
+			return InvalidMessageError("missing signature")
+		}
+	}
+	return nil
+}
+
+// Serial returns the message's serial number. The returned value is only valid
+// for messages received by eavesdropping.
+func (msg *Message) Serial() uint32 {
+	return msg.serial
+}
+
+// String returns a string representation of a message similar to the format of
+// dbus-monitor.
+func (msg *Message) String() string {
+	if err := msg.IsValid(); err != nil {
+		return "<invalid>"
+	}
+	s := msg.Type.String()
+	if v, ok := msg.Headers[FieldSender]; ok {
+		s += " from " + v.value.(string)
+	}
+	if v, ok := msg.Headers[FieldDestination]; ok {
+		s += " to " + v.value.(string)
+	}
+	s += " serial " + strconv.FormatUint(uint64(msg.serial), 10)
+	if v, ok := msg.Headers[FieldReplySerial]; ok {
+		s += " reply_serial " + strconv.FormatUint(uint64(v.value.(uint32)), 10)
+	}
+	if v, ok := msg.Headers[FieldUnixFDs]; ok {
+		s += " unixfds " + strconv.FormatUint(uint64(v.value.(uint32)), 10)
+	}
+	if v, ok := msg.Headers[FieldPath]; ok {
+		s += " path " + string(v.value.(ObjectPath))
+	}
+	if v, ok := msg.Headers[FieldInterface]; ok {
+		s += " interface " + v.value.(string)
+	}
+	if v, ok := msg.Headers[FieldErrorName]; ok {
+		s += " error " + v.value.(string)
+	}
+	if v, ok := msg.Headers[FieldMember]; ok {
+		s += " member " + v.value.(string)
+	}
+	if len(msg.Body) != 0 {
+		s += "\n"
+	}
+	for i, v := range msg.Body {
+		s += "  " + MakeVariant(v).String()
+		if i != len(msg.Body)-1 {
+			s += "\n"
+		}
+	}
+	return s
+}
diff --git a/vendor/github.com/godbus/dbus/object.go b/vendor/github.com/godbus/dbus/object.go
new file mode 100644
index 0000000000..9573b7095a
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/object.go
@@ -0,0 +1,136 @@
+package dbus
+
+import (
+	"errors"
+	"strings"
+)
+
+// BusObject is the interface of a remote object on which methods can be
+// invoked.
+type BusObject interface {
+	Call(method string, flags Flags, args ...interface{}) *Call
+	Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call
+	GetProperty(p string) (Variant, error)
+	Destination() string
+	Path() ObjectPath
+}
+
+// Object represents a remote object on which methods can be invoked.
+type Object struct {
+	conn *Conn
+	dest string
+	path ObjectPath
+}
+
+// Call calls a method with (*Object).Go and waits for its reply.
+func (o *Object) Call(method string, flags Flags, args ...interface{}) *Call {
+	return <-o.Go(method, flags, make(chan *Call, 1), args...).Done
+}
+
+// AddMatchSignal subscribes BusObject to signals from specified interface and
+// method (member).
+func (o *Object) AddMatchSignal(iface, member string) *Call {
+	return o.Call(
+		"org.freedesktop.DBus.AddMatch",
+		0,
+		"type='signal',interface='"+iface+"',member='"+member+"'",
+	)
+}
+
+// Go calls a method with the given arguments asynchronously. It returns a
+// Call structure representing this method call. The passed channel will
+// return the same value once the call is done. If ch is nil, a new channel
+// will be allocated. Otherwise, ch has to be buffered or Go will panic.
+//
+// If the flags include FlagNoReplyExpected, ch is ignored and a Call structure
+// is returned of which only the Err member is valid.
+//
+// If the method parameter contains a dot ('.'), the part before the last dot
+// specifies the interface on which the method is called.
+func (o *Object) Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call {
+	iface := ""
+	i := strings.LastIndex(method, ".")
+	if i != -1 {
+		iface = method[:i]
+	}
+	method = method[i+1:]
+	msg := new(Message)
+	msg.Type = TypeMethodCall
+	msg.serial = o.conn.getSerial()
+	msg.Flags = flags & (FlagNoAutoStart | FlagNoReplyExpected)
+	msg.Headers = make(map[HeaderField]Variant)
+	msg.Headers[FieldPath] = MakeVariant(o.path)
+	msg.Headers[FieldDestination] = MakeVariant(o.dest)
+	msg.Headers[FieldMember] = MakeVariant(method)
+	if iface != "" {
+		msg.Headers[FieldInterface] = MakeVariant(iface)
+	}
+	msg.Body = args
+	if len(args) > 0 {
+		msg.Headers[FieldSignature] = MakeVariant(SignatureOf(args...))
+	}
+	if msg.Flags&FlagNoReplyExpected == 0 {
+		if ch == nil {
+			ch = make(chan *Call, 10)
+		} else if cap(ch) == 0 {
+			panic("dbus: unbuffered channel passed to (*Object).Go")
+		}
+		call := &Call{
+			Destination: o.dest,
+			Path:        o.path,
+			Method:      method,
+			Args:        args,
+			Done:        ch,
+		}
+		o.conn.callsLck.Lock()
+		o.conn.calls[msg.serial] = call
+		o.conn.callsLck.Unlock()
+		o.conn.outLck.RLock()
+		if o.conn.closed {
+			call.Err = ErrClosed
+			call.Done <- call
+		} else {
+			o.conn.out <- msg
+		}
+		o.conn.outLck.RUnlock()
+		return call
+	}
+	o.conn.outLck.RLock()
+	defer o.conn.outLck.RUnlock()
+	if o.conn.closed {
+		return &Call{Err: ErrClosed}
+	}
+	o.conn.out <- msg
+	return &Call{Err: nil}
+}
+
+// GetProperty calls org.freedesktop.DBus.Properties.GetProperty on the given
+// object. The property name must be given in interface.member notation.
+func (o *Object) GetProperty(p string) (Variant, error) {
+	idx := strings.LastIndex(p, ".")
+	if idx == -1 || idx+1 == len(p) {
+		return Variant{}, errors.New("dbus: invalid property " + p)
+	}
+
+	iface := p[:idx]
+	prop := p[idx+1:]
+
+	result := Variant{}
+	err := o.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop).Store(&result)
+
+	if err != nil {
+		return Variant{}, err
+	}
+
+	return result, nil
+}
+
+// Destination returns the destination that calls on o are sent to.
+func (o *Object) Destination() string {
+	return o.dest
+}
+
+// Path returns the path that calls on o are sent to.
+func (o *Object) Path() ObjectPath {
+	return o.path
+}
diff --git a/vendor/github.com/godbus/dbus/sig.go b/vendor/github.com/godbus/dbus/sig.go
new file mode 100644
index 0000000000..f45b53ce1b
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/sig.go
@@ -0,0 +1,257 @@
+package dbus
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+var sigToType = map[byte]reflect.Type{
+	'y': byteType,
+	'b': boolType,
+	'n': int16Type,
+	'q': uint16Type,
+	'i': int32Type,
+	'u': uint32Type,
+	'x': int64Type,
+	't': uint64Type,
+	'd': float64Type,
+	's': stringType,
+	'g': signatureType,
+	'o': objectPathType,
+	'v': variantType,
+	'h': unixFDIndexType,
+}
+
+// Signature represents a correct type signature as specified by the D-Bus
+// specification. The zero value represents the empty signature, "".
+type Signature struct {
+	str string
+}
+
+// SignatureOf returns the concatenation of all the signatures of the given
+// values. It panics if one of them is not representable in D-Bus.
+func SignatureOf(vs ...interface{}) Signature {
+	var s string
+	for _, v := range vs {
+		s += getSignature(reflect.TypeOf(v))
+	}
+	return Signature{s}
+}
+
+// SignatureOfType returns the signature of the given type. It panics if the
+// type is not representable in D-Bus.
+func SignatureOfType(t reflect.Type) Signature {
+	return Signature{getSignature(t)}
+}
+
+// getSignature returns the signature of the given type and panics on unknown types.
+func getSignature(t reflect.Type) string {
+	// handle simple types first
+	switch t.Kind() {
+	case reflect.Uint8:
+		return "y"
+	case reflect.Bool:
+		return "b"
+	case reflect.Int16:
+		return "n"
+	case reflect.Uint16:
+		return "q"
+	case reflect.Int32:
+		if t == unixFDType {
+			return "h"
+		}
+		return "i"
+	case reflect.Uint32:
+		if t == unixFDIndexType {
+			return "h"
+		}
+		return "u"
+	case reflect.Int64:
+		return "x"
+	case reflect.Uint64:
+		return "t"
+	case reflect.Float64:
+		return "d"
+	case reflect.Ptr:
+		return getSignature(t.Elem())
+	case reflect.String:
+		if t == objectPathType {
+			return "o"
+		}
+		return "s"
+	case reflect.Struct:
+		if t == variantType {
+			return "v"
+		} else if t == signatureType {
+			return "g"
+		}
+		var s string
+		for i := 0; i < t.NumField(); i++ {
+			field := t.Field(i)
+			if field.PkgPath == "" && field.Tag.Get("dbus") != "-" {
+				s += getSignature(t.Field(i).Type)
+			}
+		}
+		return "(" + s + ")"
+	case reflect.Array, reflect.Slice:
+		return "a" + getSignature(t.Elem())
+	case reflect.Map:
+		if !isKeyType(t.Key()) {
+			panic(InvalidTypeError{t})
+		}
+		return "a{" + getSignature(t.Key()) + getSignature(t.Elem()) + "}"
+	}
+	panic(InvalidTypeError{t})
+}
+
+// ParseSignature returns the signature represented by this string, or a
+// SignatureError if the string is not a valid signature.
+func ParseSignature(s string) (sig Signature, err error) {
+	if len(s) == 0 {
+		return
+	}
+	if len(s) > 255 {
+		return Signature{""}, SignatureError{s, "too long"}
+	}
+	sig.str = s
+	for err == nil && len(s) != 0 {
+		err, s = validSingle(s, 0)
+	}
+	if err != nil {
+		sig = Signature{""}
+	}
+
+	return
+}
+
+// ParseSignatureMust behaves like ParseSignature, except that it panics if s
+// is not valid.
+func ParseSignatureMust(s string) Signature {
+	sig, err := ParseSignature(s)
+	if err != nil {
+		panic(err)
+	}
+	return sig
+}
+
+// Empty retruns whether the signature is the empty signature.
+func (s Signature) Empty() bool {
+	return s.str == ""
+}
+
+// Single returns whether the signature represents a single, complete type.
+func (s Signature) Single() bool {
+	err, r := validSingle(s.str, 0)
+	return err != nil && r == ""
+}
+
+// String returns the signature's string representation.
+func (s Signature) String() string {
+	return s.str
+}
+
+// A SignatureError indicates that a signature passed to a function or received
+// on a connection is not a valid signature.
+type SignatureError struct {
+	Sig    string
+	Reason string
+}
+
+func (e SignatureError) Error() string {
+	return fmt.Sprintf("dbus: invalid signature: %q (%s)", e.Sig, e.Reason)
+}
+
+// Try to read a single type from this string. If it was successfull, err is nil
+// and rem is the remaining unparsed part. Otherwise, err is a non-nil
+// SignatureError and rem is "". depth is the current recursion depth which may
+// not be greater than 64 and should be given as 0 on the first call.
+func validSingle(s string, depth int) (err error, rem string) {
+	if s == "" {
+		return SignatureError{Sig: s, Reason: "empty signature"}, ""
+	}
+	if depth > 64 {
+		return SignatureError{Sig: s, Reason: "container nesting too deep"}, ""
+	}
+	switch s[0] {
+	case 'y', 'b', 'n', 'q', 'i', 'u', 'x', 't', 'd', 's', 'g', 'o', 'v', 'h':
+		return nil, s[1:]
+	case 'a':
+		if len(s) > 1 && s[1] == '{' {
+			i := findMatching(s[1:], '{', '}')
+			if i == -1 {
+				return SignatureError{Sig: s, Reason: "unmatched '{'"}, ""
+			}
+			i++
+			rem = s[i+1:]
+			s = s[2:i]
+			if err, _ = validSingle(s[:1], depth+1); err != nil {
+				return err, ""
+			}
+			err, nr := validSingle(s[1:], depth+1)
+			if err != nil {
+				return err, ""
+			}
+			if nr != "" {
+				return SignatureError{Sig: s, Reason: "too many types in dict"}, ""
+			}
+			return nil, rem
+		}
+		return validSingle(s[1:], depth+1)
+	case '(':
+		i := findMatching(s, '(', ')')
+		if i == -1 {
+			return SignatureError{Sig: s, Reason: "unmatched ')'"}, ""
+		}
+		rem = s[i+1:]
+		s = s[1:i]
+		for err == nil && s != "" {
+			err, s = validSingle(s, depth+1)
+		}
+		if err != nil {
+			rem = ""
+		}
+		return
+	}
+	return SignatureError{Sig: s, Reason: "invalid type character"}, ""
+}
+
+func findMatching(s string, left, right rune) int {
+	n := 0
+	for i, v := range s {
+		if v == left {
+			n++
+		} else if v == right {
+			n--
+		}
+		if n == 0 {
+			return i
+		}
+	}
+	return -1
+}
+
+// typeFor returns the type of the given signature. It ignores any left over
+// characters and panics if s doesn't start with a valid type signature.
+func typeFor(s string) (t reflect.Type) {
+	err, _ := validSingle(s, 0)
+	if err != nil {
+		panic(err)
+	}
+
+	if t, ok := sigToType[s[0]]; ok {
+		return t
+	}
+	switch s[0] {
+	case 'a':
+		if s[1] == '{' {
+			i := strings.LastIndex(s, "}")
+			t = reflect.MapOf(sigToType[s[2]], typeFor(s[3:i]))
+		} else {
+			t = reflect.SliceOf(typeFor(s[1:]))
+		}
+	case '(':
+		t = interfacesType
+	}
+	return
+}
diff --git a/vendor/github.com/godbus/dbus/transport_darwin.go b/vendor/github.com/godbus/dbus/transport_darwin.go
new file mode 100644
index 0000000000..1bba0d6bf7
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/transport_darwin.go
@@ -0,0 +1,6 @@
+package dbus
+
+func (t *unixTransport) SendNullByte() error {
+	_, err := t.Write([]byte{0})
+	return err
+}
diff --git a/vendor/github.com/godbus/dbus/transport_generic.go b/vendor/github.com/godbus/dbus/transport_generic.go
new file mode 100644
index 0000000000..46f8f49d69
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/transport_generic.go
@@ -0,0 +1,35 @@
+package dbus
+
+import (
+	"encoding/binary"
+	"errors"
+	"io"
+)
+
+type genericTransport struct {
+	io.ReadWriteCloser
+}
+
+func (t genericTransport) SendNullByte() error {
+	_, err := t.Write([]byte{0})
+	return err
+}
+
+func (t genericTransport) SupportsUnixFDs() bool {
+	return false
+}
+
+func (t genericTransport) EnableUnixFDs() {}
+
+func (t genericTransport) ReadMessage() (*Message, error) {
+	return DecodeMessage(t)
+}
+
+func (t genericTransport) SendMessage(msg *Message) error {
+	for _, v := range msg.Body {
+		if _, ok := v.(UnixFD); ok {
+			return errors.New("dbus: unix fd passing not enabled")
+		}
+	}
+	return msg.EncodeTo(t, binary.LittleEndian)
+}
diff --git a/vendor/github.com/godbus/dbus/transport_unix.go b/vendor/github.com/godbus/dbus/transport_unix.go
new file mode 100644
index 0000000000..3fafeabb15
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/transport_unix.go
@@ -0,0 +1,196 @@
+//+build !windows
+
+package dbus
+
+import (
+	"bytes"
+	"encoding/binary"
+	"errors"
+	"io"
+	"net"
+	"syscall"
+)
+
+type oobReader struct {
+	conn *net.UnixConn
+	oob  []byte
+	buf  [4096]byte
+}
+
+func (o *oobReader) Read(b []byte) (n int, err error) {
+	n, oobn, flags, _, err := o.conn.ReadMsgUnix(b, o.buf[:])
+	if err != nil {
+		return n, err
+	}
+	if flags&syscall.MSG_CTRUNC != 0 {
+		return n, errors.New("dbus: control data truncated (too many fds received)")
+	}
+	o.oob = append(o.oob, o.buf[:oobn]...)
+	return n, nil
+}
+
+type unixTransport struct {
+	*net.UnixConn
+	hasUnixFDs bool
+}
+
+func newUnixTransport(keys string) (transport, error) {
+	var err error
+
+	t := new(unixTransport)
+	abstract := getKey(keys, "abstract")
+	path := getKey(keys, "path")
+	switch {
+	case abstract == "" && path == "":
+		return nil, errors.New("dbus: invalid address (neither path nor abstract set)")
+	case abstract != "" && path == "":
+		t.UnixConn, err = net.DialUnix("unix", nil, &net.UnixAddr{Name: "@" + abstract, Net: "unix"})
+		if err != nil {
+			return nil, err
+		}
+		return t, nil
+	case abstract == "" && path != "":
+		t.UnixConn, err = net.DialUnix("unix", nil, &net.UnixAddr{Name: path, Net: "unix"})
+		if err != nil {
+			return nil, err
+		}
+		return t, nil
+	default:
+		return nil, errors.New("dbus: invalid address (both path and abstract set)")
+	}
+}
+
+func init() {
+	transports["unix"] = newUnixTransport
+}
+
+func (t *unixTransport) EnableUnixFDs() {
+	t.hasUnixFDs = true
+}
+
+func (t *unixTransport) ReadMessage() (*Message, error) {
+	var (
+		blen, hlen uint32
+		csheader   [16]byte
+		headers    []header
+		order      binary.ByteOrder
+		unixfds    uint32
+	)
+	// To be sure that all bytes of out-of-band data are read, we use a special
+	// reader that uses ReadUnix on the underlying connection instead of Read
+	// and gathers the out-of-band data in a buffer.
+	rd := &oobReader{conn: t.UnixConn}
+	// read the first 16 bytes (the part of the header that has a constant size),
+	// from which we can figure out the length of the rest of the message
+	if _, err := io.ReadFull(rd, csheader[:]); err != nil {
+		return nil, err
+	}
+	switch csheader[0] {
+	case 'l':
+		order = binary.LittleEndian
+	case 'B':
+		order = binary.BigEndian
+	default:
+		return nil, InvalidMessageError("invalid byte order")
+	}
+	// csheader[4:8] -> length of message body, csheader[12:16] -> length of
+	// header fields (without alignment)
+	binary.Read(bytes.NewBuffer(csheader[4:8]), order, &blen)
+	binary.Read(bytes.NewBuffer(csheader[12:]), order, &hlen)
+	if hlen%8 != 0 {
+		hlen += 8 - (hlen % 8)
+	}
+
+	// decode headers and look for unix fds
+	headerdata := make([]byte, hlen+4)
+	copy(headerdata, csheader[12:])
+	if _, err := io.ReadFull(t, headerdata[4:]); err != nil {
+		return nil, err
+	}
+	dec := newDecoder(bytes.NewBuffer(headerdata), order)
+	dec.pos = 12
+	vs, err := dec.Decode(Signature{"a(yv)"})
+	if err != nil {
+		return nil, err
+	}
+	Store(vs, &headers)
+	for _, v := range headers {
+		if v.Field == byte(FieldUnixFDs) {
+			unixfds, _ = v.Variant.value.(uint32)
+		}
+	}
+	all := make([]byte, 16+hlen+blen)
+	copy(all, csheader[:])
+	copy(all[16:], headerdata[4:])
+	if _, err := io.ReadFull(rd, all[16+hlen:]); err != nil {
+		return nil, err
+	}
+	if unixfds != 0 {
+		if !t.hasUnixFDs {
+			return nil, errors.New("dbus: got unix fds on unsupported transport")
+		}
+		// read the fds from the OOB data
+		scms, err := syscall.ParseSocketControlMessage(rd.oob)
+		if err != nil {
+			return nil, err
+		}
+		if len(scms) != 1 {
+			return nil, errors.New("dbus: received more than one socket control message")
+		}
+		fds, err := syscall.ParseUnixRights(&scms[0])
+		if err != nil {
+			return nil, err
+		}
+		msg, err := DecodeMessage(bytes.NewBuffer(all))
+		if err != nil {
+			return nil, err
+		}
+		// substitute the values in the message body (which are indices for the
+		// array receiver via OOB) with the actual values
+		for i, v := range msg.Body {
+			if j, ok := v.(UnixFDIndex); ok {
+				if uint32(j) >= unixfds {
+					return nil, InvalidMessageError("invalid index for unix fd")
+				}
+				msg.Body[i] = UnixFD(fds[j])
+			}
+		}
+		return msg, nil
+	}
+	return DecodeMessage(bytes.NewBuffer(all))
+}
+
+func (t *unixTransport) SendMessage(msg *Message) error {
+	fds := make([]int, 0)
+	for i, v := range msg.Body {
+		if fd, ok := v.(UnixFD); ok {
+			msg.Body[i] = UnixFDIndex(len(fds))
+			fds = append(fds, int(fd))
+		}
+	}
+	if len(fds) != 0 {
+		if !t.hasUnixFDs {
+			return errors.New("dbus: unix fd passing not enabled")
+		}
+		msg.Headers[FieldUnixFDs] = MakeVariant(uint32(len(fds)))
+		oob := syscall.UnixRights(fds...)
+		buf := new(bytes.Buffer)
+		msg.EncodeTo(buf, binary.LittleEndian)
+		n, oobn, err := t.UnixConn.WriteMsgUnix(buf.Bytes(), oob, nil)
+		if err != nil {
+			return err
+		}
+		if n != buf.Len() || oobn != len(oob) {
+			return io.ErrShortWrite
+		}
+	} else {
+		if err := msg.EncodeTo(t, binary.LittleEndian); err != nil {
+			return nil
+		}
+	}
+	return nil
+}
+
+func (t *unixTransport) SupportsUnixFDs() bool {
+	return true
+}
diff --git a/vendor/github.com/godbus/dbus/transport_unixcred_dragonfly.go b/vendor/github.com/godbus/dbus/transport_unixcred_dragonfly.go
new file mode 100644
index 0000000000..a8cd39395f
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/transport_unixcred_dragonfly.go
@@ -0,0 +1,95 @@
+// The UnixCredentials system call is currently only implemented on Linux
+// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
+// https://golang.org/s/go1.4-syscall
+// http://code.google.com/p/go/source/browse/unix/sockcmsg_linux.go?repo=sys
+
+// Local implementation of the UnixCredentials system call for DragonFly BSD
+
+package dbus
+
+/*
+#include <sys/ucred.h>
+*/
+import "C"
+
+import (
+	"io"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+// http://golang.org/src/pkg/syscall/ztypes_linux_amd64.go
+// http://golang.org/src/pkg/syscall/ztypes_dragonfly_amd64.go
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+// http://golang.org/src/pkg/syscall/types_linux.go
+// http://golang.org/src/pkg/syscall/types_dragonfly.go
+// https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/ucred.h
+const (
+	SizeofUcred = C.sizeof_struct_ucred
+)
+
+// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
+func cmsgAlignOf(salen int) int {
+	// From http://golang.org/src/pkg/syscall/sockcmsg_unix.go
+	//salign := sizeofPtr
+	// NOTE: It seems like 64-bit Darwin and DragonFly BSD kernels
+	// still require 32-bit aligned access to network subsystem.
+	//if darwin64Bit || dragonfly64Bit {
+	//	salign = 4
+	//}
+	salign := 4
+	return (salen + salign - 1) & ^(salign - 1)
+}
+
+// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
+func cmsgData(h *syscall.Cmsghdr) unsafe.Pointer {
+	return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(syscall.SizeofCmsghdr)))
+}
+
+// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
+// UnixCredentials encodes credentials into a socket control message
+// for sending to another process. This can be used for
+// authentication.
+func UnixCredentials(ucred *Ucred) []byte {
+	b := make([]byte, syscall.CmsgSpace(SizeofUcred))
+	h := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
+	h.Level = syscall.SOL_SOCKET
+	h.Type = syscall.SCM_CREDS
+	h.SetLen(syscall.CmsgLen(SizeofUcred))
+	*((*Ucred)(cmsgData(h))) = *ucred
+	return b
+}
+
+// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
+// ParseUnixCredentials decodes a socket control message that contains
+// credentials in a Ucred structure. To receive such a message, the
+// SO_PASSCRED option must be enabled on the socket.
+func ParseUnixCredentials(m *syscall.SocketControlMessage) (*Ucred, error) {
+	if m.Header.Level != syscall.SOL_SOCKET {
+		return nil, syscall.EINVAL
+	}
+	if m.Header.Type != syscall.SCM_CREDS {
+		return nil, syscall.EINVAL
+	}
+	ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
+	return &ucred, nil
+}
+
+func (t *unixTransport) SendNullByte() error {
+	ucred := &Ucred{Pid: int32(os.Getpid()), Uid: uint32(os.Getuid()), Gid: uint32(os.Getgid())}
+	b := UnixCredentials(ucred)
+	_, oobn, err := t.UnixConn.WriteMsgUnix([]byte{0}, b, nil)
+	if err != nil {
+		return err
+	}
+	if oobn != len(b) {
+		return io.ErrShortWrite
+	}
+	return nil
+}
diff --git a/vendor/github.com/godbus/dbus/transport_unixcred_linux.go b/vendor/github.com/godbus/dbus/transport_unixcred_linux.go
new file mode 100644
index 0000000000..d9dfdf6982
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/transport_unixcred_linux.go
@@ -0,0 +1,25 @@
+// The UnixCredentials system call is currently only implemented on Linux
+// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
+// https://golang.org/s/go1.4-syscall
+// http://code.google.com/p/go/source/browse/unix/sockcmsg_linux.go?repo=sys
+
+package dbus
+
+import (
+	"io"
+	"os"
+	"syscall"
+)
+
+func (t *unixTransport) SendNullByte() error {
+	ucred := &syscall.Ucred{Pid: int32(os.Getpid()), Uid: uint32(os.Getuid()), Gid: uint32(os.Getgid())}
+	b := syscall.UnixCredentials(ucred)
+	_, oobn, err := t.UnixConn.WriteMsgUnix([]byte{0}, b, nil)
+	if err != nil {
+		return err
+	}
+	if oobn != len(b) {
+		return io.ErrShortWrite
+	}
+	return nil
+}
diff --git a/vendor/github.com/godbus/dbus/variant.go b/vendor/github.com/godbus/dbus/variant.go
new file mode 100644
index 0000000000..b7b13ae90d
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/variant.go
@@ -0,0 +1,139 @@
+package dbus
+
+import (
+	"bytes"
+	"fmt"
+	"reflect"
+	"sort"
+	"strconv"
+)
+
+// Variant represents the D-Bus variant type.
+type Variant struct {
+	sig   Signature
+	value interface{}
+}
+
+// MakeVariant converts the given value to a Variant. It panics if v cannot be
+// represented as a D-Bus type.
+func MakeVariant(v interface{}) Variant {
+	return Variant{SignatureOf(v), v}
+}
+
+// ParseVariant parses the given string as a variant as described at
+// https://developer.gnome.org/glib/unstable/gvariant-text.html. If sig is not
+// empty, it is taken to be the expected signature for the variant.
+func ParseVariant(s string, sig Signature) (Variant, error) {
+	tokens := varLex(s)
+	p := &varParser{tokens: tokens}
+	n, err := varMakeNode(p)
+	if err != nil {
+		return Variant{}, err
+	}
+	if sig.str == "" {
+		sig, err = varInfer(n)
+		if err != nil {
+			return Variant{}, err
+		}
+	}
+	v, err := n.Value(sig)
+	if err != nil {
+		return Variant{}, err
+	}
+	return MakeVariant(v), nil
+}
+
+// format returns a formatted version of v and whether this string can be parsed
+// unambigously.
+func (v Variant) format() (string, bool) {
+	switch v.sig.str[0] {
+	case 'b', 'i':
+		return fmt.Sprint(v.value), true
+	case 'n', 'q', 'u', 'x', 't', 'd', 'h':
+		return fmt.Sprint(v.value), false
+	case 's':
+		return strconv.Quote(v.value.(string)), true
+	case 'o':
+		return strconv.Quote(string(v.value.(ObjectPath))), false
+	case 'g':
+		return strconv.Quote(v.value.(Signature).str), false
+	case 'v':
+		s, unamb := v.value.(Variant).format()
+		if !unamb {
+			return "<@" + v.value.(Variant).sig.str + " " + s + ">", true
+		}
+		return "<" + s + ">", true
+	case 'y':
+		return fmt.Sprintf("%#x", v.value.(byte)), false
+	}
+	rv := reflect.ValueOf(v.value)
+	switch rv.Kind() {
+	case reflect.Slice:
+		if rv.Len() == 0 {
+			return "[]", false
+		}
+		unamb := true
+		buf := bytes.NewBuffer([]byte("["))
+		for i := 0; i < rv.Len(); i++ {
+			// TODO: slooow
+			s, b := MakeVariant(rv.Index(i).Interface()).format()
+			unamb = unamb && b
+			buf.WriteString(s)
+			if i != rv.Len()-1 {
+				buf.WriteString(", ")
+			}
+		}
+		buf.WriteByte(']')
+		return buf.String(), unamb
+	case reflect.Map:
+		if rv.Len() == 0 {
+			return "{}", false
+		}
+		unamb := true
+		var buf bytes.Buffer
+		kvs := make([]string, rv.Len())
+		for i, k := range rv.MapKeys() {
+			s, b := MakeVariant(k.Interface()).format()
+			unamb = unamb && b
+			buf.Reset()
+			buf.WriteString(s)
+			buf.WriteString(": ")
+			s, b = MakeVariant(rv.MapIndex(k).Interface()).format()
+			unamb = unamb && b
+			buf.WriteString(s)
+			kvs[i] = buf.String()
+		}
+		buf.Reset()
+		buf.WriteByte('{')
+		sort.Strings(kvs)
+		for i, kv := range kvs {
+			if i > 0 {
+				buf.WriteString(", ")
+			}
+			buf.WriteString(kv)
+		}
+		buf.WriteByte('}')
+		return buf.String(), unamb
+	}
+	return `"INVALID"`, true
+}
+
+// Signature returns the D-Bus signature of the underlying value of v.
+func (v Variant) Signature() Signature {
+	return v.sig
+}
+
+// String returns the string representation of the underlying value of v as
+// described at https://developer.gnome.org/glib/unstable/gvariant-text.html.
+func (v Variant) String() string {
+	s, unamb := v.format()
+	if !unamb {
+		return "@" + v.sig.str + " " + s
+	}
+	return s
+}
+
+// Value returns the underlying value of v.
+func (v Variant) Value() interface{} {
+	return v.value
+}
diff --git a/vendor/github.com/godbus/dbus/variant_lexer.go b/vendor/github.com/godbus/dbus/variant_lexer.go
new file mode 100644
index 0000000000..332007d6f1
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/variant_lexer.go
@@ -0,0 +1,284 @@
+package dbus
+
+import (
+	"fmt"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+)
+
+// Heavily inspired by the lexer from text/template.
+
+type varToken struct {
+	typ varTokenType
+	val string
+}
+
+type varTokenType byte
+
+const (
+	tokEOF varTokenType = iota
+	tokError
+	tokNumber
+	tokString
+	tokBool
+	tokArrayStart
+	tokArrayEnd
+	tokDictStart
+	tokDictEnd
+	tokVariantStart
+	tokVariantEnd
+	tokComma
+	tokColon
+	tokType
+	tokByteString
+)
+
+type varLexer struct {
+	input  string
+	start  int
+	pos    int
+	width  int
+	tokens []varToken
+}
+
+type lexState func(*varLexer) lexState
+
+func varLex(s string) []varToken {
+	l := &varLexer{input: s}
+	l.run()
+	return l.tokens
+}
+
+func (l *varLexer) accept(valid string) bool {
+	if strings.IndexRune(valid, l.next()) >= 0 {
+		return true
+	}
+	l.backup()
+	return false
+}
+
+func (l *varLexer) backup() {
+	l.pos -= l.width
+}
+
+func (l *varLexer) emit(t varTokenType) {
+	l.tokens = append(l.tokens, varToken{t, l.input[l.start:l.pos]})
+	l.start = l.pos
+}
+
+func (l *varLexer) errorf(format string, v ...interface{}) lexState {
+	l.tokens = append(l.tokens, varToken{
+		tokError,
+		fmt.Sprintf(format, v...),
+	})
+	return nil
+}
+
+func (l *varLexer) ignore() {
+	l.start = l.pos
+}
+
+func (l *varLexer) next() rune {
+	var r rune
+
+	if l.pos >= len(l.input) {
+		l.width = 0
+		return -1
+	}
+	r, l.width = utf8.DecodeRuneInString(l.input[l.pos:])
+	l.pos += l.width
+	return r
+}
+
+func (l *varLexer) run() {
+	for state := varLexNormal; state != nil; {
+		state = state(l)
+	}
+}
+
+func (l *varLexer) peek() rune {
+	r := l.next()
+	l.backup()
+	return r
+}
+
+func varLexNormal(l *varLexer) lexState {
+	for {
+		r := l.next()
+		switch {
+		case r == -1:
+			l.emit(tokEOF)
+			return nil
+		case r == '[':
+			l.emit(tokArrayStart)
+		case r == ']':
+			l.emit(tokArrayEnd)
+		case r == '{':
+			l.emit(tokDictStart)
+		case r == '}':
+			l.emit(tokDictEnd)
+		case r == '<':
+			l.emit(tokVariantStart)
+		case r == '>':
+			l.emit(tokVariantEnd)
+		case r == ':':
+			l.emit(tokColon)
+		case r == ',':
+			l.emit(tokComma)
+		case r == '\'' || r == '"':
+			l.backup()
+			return varLexString
+		case r == '@':
+			l.backup()
+			return varLexType
+		case unicode.IsSpace(r):
+			l.ignore()
+		case unicode.IsNumber(r) || r == '+' || r == '-':
+			l.backup()
+			return varLexNumber
+		case r == 'b':
+			pos := l.start
+			if n := l.peek(); n == '"' || n == '\'' {
+				return varLexByteString
+			}
+			// not a byte string; try to parse it as a type or bool below
+			l.pos = pos + 1
+			l.width = 1
+			fallthrough
+		default:
+			// either a bool or a type. Try bools first.
+			l.backup()
+			if l.pos+4 <= len(l.input) {
+				if l.input[l.pos:l.pos+4] == "true" {
+					l.pos += 4
+					l.emit(tokBool)
+					continue
+				}
+			}
+			if l.pos+5 <= len(l.input) {
+				if l.input[l.pos:l.pos+5] == "false" {
+					l.pos += 5
+					l.emit(tokBool)
+					continue
+				}
+			}
+			// must be a type.
+			return varLexType
+		}
+	}
+}
+
+var varTypeMap = map[string]string{
+	"boolean":    "b",
+	"byte":       "y",
+	"int16":      "n",
+	"uint16":     "q",
+	"int32":      "i",
+	"uint32":     "u",
+	"int64":      "x",
+	"uint64":     "t",
+	"double":     "f",
+	"string":     "s",
+	"objectpath": "o",
+	"signature":  "g",
+}
+
+func varLexByteString(l *varLexer) lexState {
+	q := l.next()
+Loop:
+	for {
+		switch l.next() {
+		case '\\':
+			if r := l.next(); r != -1 {
+				break
+			}
+			fallthrough
+		case -1:
+			return l.errorf("unterminated bytestring")
+		case q:
+			break Loop
+		}
+	}
+	l.emit(tokByteString)
+	return varLexNormal
+}
+
+func varLexNumber(l *varLexer) lexState {
+	l.accept("+-")
+	digits := "0123456789"
+	if l.accept("0") {
+		if l.accept("x") {
+			digits = "0123456789abcdefABCDEF"
+		} else {
+			digits = "01234567"
+		}
+	}
+	for strings.IndexRune(digits, l.next()) >= 0 {
+	}
+	l.backup()
+	if l.accept(".") {
+		for strings.IndexRune(digits, l.next()) >= 0 {
+		}
+		l.backup()
+	}
+	if l.accept("eE") {
+		l.accept("+-")
+		for strings.IndexRune("0123456789", l.next()) >= 0 {
+		}
+		l.backup()
+	}
+	if r := l.peek(); unicode.IsLetter(r) {
+		l.next()
+		return l.errorf("bad number syntax: %q", l.input[l.start:l.pos])
+	}
+	l.emit(tokNumber)
+	return varLexNormal
+}
+
+func varLexString(l *varLexer) lexState {
+	q := l.next()
+Loop:
+	for {
+		switch l.next() {
+		case '\\':
+			if r := l.next(); r != -1 {
+				break
+			}
+			fallthrough
+		case -1:
+			return l.errorf("unterminated string")
+		case q:
+			break Loop
+		}
+	}
+	l.emit(tokString)
+	return varLexNormal
+}
+
+func varLexType(l *varLexer) lexState {
+	at := l.accept("@")
+	for {
+		r := l.next()
+		if r == -1 {
+			break
+		}
+		if unicode.IsSpace(r) {
+			l.backup()
+			break
+		}
+	}
+	if at {
+		if _, err := ParseSignature(l.input[l.start+1 : l.pos]); err != nil {
+			return l.errorf("%s", err)
+		}
+	} else {
+		if _, ok := varTypeMap[l.input[l.start:l.pos]]; ok {
+			l.emit(tokType)
+			return varLexNormal
+		}
+		return l.errorf("unrecognized type %q", l.input[l.start:l.pos])
+	}
+	l.emit(tokType)
+	return varLexNormal
+}
diff --git a/vendor/github.com/godbus/dbus/variant_parser.go b/vendor/github.com/godbus/dbus/variant_parser.go
new file mode 100644
index 0000000000..d20f5da6dd
--- /dev/null
+++ b/vendor/github.com/godbus/dbus/variant_parser.go
@@ -0,0 +1,817 @@
+package dbus
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"reflect"
+	"strconv"
+	"strings"
+	"unicode/utf8"
+)
+
+type varParser struct {
+	tokens []varToken
+	i      int
+}
+
+func (p *varParser) backup() {
+	p.i--
+}
+
+func (p *varParser) next() varToken {
+	if p.i < len(p.tokens) {
+		t := p.tokens[p.i]
+		p.i++
+		return t
+	}
+	return varToken{typ: tokEOF}
+}
+
+type varNode interface {
+	Infer() (Signature, error)
+	String() string
+	Sigs() sigSet
+	Value(Signature) (interface{}, error)
+}
+
+func varMakeNode(p *varParser) (varNode, error) {
+	var sig Signature
+
+	for {
+		t := p.next()
+		switch t.typ {
+		case tokEOF:
+			return nil, io.ErrUnexpectedEOF
+		case tokError:
+			return nil, errors.New(t.val)
+		case tokNumber:
+			return varMakeNumNode(t, sig)
+		case tokString:
+			return varMakeStringNode(t, sig)
+		case tokBool:
+			if sig.str != "" && sig.str != "b" {
+				return nil, varTypeError{t.val, sig}
+			}
+			b, err := strconv.ParseBool(t.val)
+			if err != nil {
+				return nil, err
+			}
+			return boolNode(b), nil
+		case tokArrayStart:
+			return varMakeArrayNode(p, sig)
+		case tokVariantStart:
+			return varMakeVariantNode(p, sig)
+		case tokDictStart:
+			return varMakeDictNode(p, sig)
+		case tokType:
+			if sig.str != "" {
+				return nil, errors.New("unexpected type annotation")
+			}
+			if t.val[0] == '@' {
+				sig.str = t.val[1:]
+			} else {
+				sig.str = varTypeMap[t.val]
+			}
+		case tokByteString:
+			if sig.str != "" && sig.str != "ay" {
+				return nil, varTypeError{t.val, sig}
+			}
+			b, err := varParseByteString(t.val)
+			if err != nil {
+				return nil, err
+			}
+			return byteStringNode(b), nil
+		default:
+			return nil, fmt.Errorf("unexpected %q", t.val)
+		}
+	}
+}
+
+type varTypeError struct {
+	val string
+	sig Signature
+}
+
+func (e varTypeError) Error() string {
+	return fmt.Sprintf("dbus: can't parse %q as type %q", e.val, e.sig.str)
+}
+
+type sigSet map[Signature]bool
+
+func (s sigSet) Empty() bool {
+	return len(s) == 0
+}
+
+func (s sigSet) Intersect(s2 sigSet) sigSet {
+	r := make(sigSet)
+	for k := range s {
+		if s2[k] {
+			r[k] = true
+		}
+	}
+	return r
+}
+
+func (s sigSet) Single() (Signature, bool) {
+	if len(s) == 1 {
+		for k := range s {
+			return k, true
+		}
+	}
+	return Signature{}, false
+}
+
+func (s sigSet) ToArray() sigSet {
+	r := make(sigSet, len(s))
+	for k := range s {
+		r[Signature{"a" + k.str}] = true
+	}
+	return r
+}
+
+type numNode struct {
+	sig Signature
+	str string
+	val interface{}
+}
+
+var numSigSet = sigSet{
+	Signature{"y"}: true,
+	Signature{"n"}: true,
+	Signature{"q"}: true,
+	Signature{"i"}: true,
+	Signature{"u"}: true,
+	Signature{"x"}: true,
+	Signature{"t"}: true,
+	Signature{"d"}: true,
+}
+
+func (n numNode) Infer() (Signature, error) {
+	if strings.ContainsAny(n.str, ".e") {
+		return Signature{"d"}, nil
+	}
+	return Signature{"i"}, nil
+}
+
+func (n numNode) String() string {
+	return n.str
+}
+
+func (n numNode) Sigs() sigSet {
+	if n.sig.str != "" {
+		return sigSet{n.sig: true}
+	}
+	if strings.ContainsAny(n.str, ".e") {
+		return sigSet{Signature{"d"}: true}
+	}
+	return numSigSet
+}
+
+func (n numNode) Value(sig Signature) (interface{}, error) {
+	if n.sig.str != "" && n.sig != sig {
+		return nil, varTypeError{n.str, sig}
+	}
+	if n.val != nil {
+		return n.val, nil
+	}
+	return varNumAs(n.str, sig)
+}
+
+func varMakeNumNode(tok varToken, sig Signature) (varNode, error) {
+	if sig.str == "" {
+		return numNode{str: tok.val}, nil
+	}
+	num, err := varNumAs(tok.val, sig)
+	if err != nil {
+		return nil, err
+	}
+	return numNode{sig: sig, val: num}, nil
+}
+
+func varNumAs(s string, sig Signature) (interface{}, error) {
+	isUnsigned := false
+	size := 32
+	switch sig.str {
+	case "n":
+		size = 16
+	case "i":
+	case "x":
+		size = 64
+	case "y":
+		size = 8
+		isUnsigned = true
+	case "q":
+		size = 16
+		isUnsigned = true
+	case "u":
+		isUnsigned = true
+	case "t":
+		size = 64
+		isUnsigned = true
+	case "d":
+		d, err := strconv.ParseFloat(s, 64)
+		if err != nil {
+			return nil, err
+		}
+		return d, nil
+	default:
+		return nil, varTypeError{s, sig}
+	}
+	base := 10
+	if strings.HasPrefix(s, "0x") {
+		base = 16
+		s = s[2:]
+	}
+	if strings.HasPrefix(s, "0") && len(s) != 1 {
+		base = 8
+		s = s[1:]
+	}
+	if isUnsigned {
+		i, err := strconv.ParseUint(s, base, size)
+		if err != nil {
+			return nil, err
+		}
+		var v interface{} = i
+		switch sig.str {
+		case "y":
+			v = byte(i)
+		case "q":
+			v = uint16(i)
+		case "u":
+			v = uint32(i)
+		}
+		return v, nil
+	}
+	i, err := strconv.ParseInt(s, base, size)
+	if err != nil {
+		return nil, err
+	}
+	var v interface{} = i
+	switch sig.str {
+	case "n":
+		v = int16(i)
+	case "i":
+		v = int32(i)
+	}
+	return v, nil
+}
+
+type stringNode struct {
+	sig Signature
+	str string      // parsed
+	val interface{} // has correct type
+}
+
+var stringSigSet = sigSet{
+	Signature{"s"}: true,
+	Signature{"g"}: true,
+	Signature{"o"}: true,
+}
+
+func (n stringNode) Infer() (Signature, error) {
+	return Signature{"s"}, nil
+}
+
+func (n stringNode) String() string {
+	return n.str
+}
+
+func (n stringNode) Sigs() sigSet {
+	if n.sig.str != "" {
+		return sigSet{n.sig: true}
+	}
+	return stringSigSet
+}
+
+func (n stringNode) Value(sig Signature) (interface{}, error) {
+	if n.sig.str != "" && n.sig != sig {
+		return nil, varTypeError{n.str, sig}
+	}
+	if n.val != nil {
+		return n.val, nil
+	}
+	switch {
+	case sig.str == "g":
+		return Signature{n.str}, nil
+	case sig.str == "o":
+		return ObjectPath(n.str), nil
+	case sig.str == "s":
+		return n.str, nil
+	default:
+		return nil, varTypeError{n.str, sig}
+	}
+}
+
+func varMakeStringNode(tok varToken, sig Signature) (varNode, error) {
+	if sig.str != "" && sig.str != "s" && sig.str != "g" && sig.str != "o" {
+		return nil, fmt.Errorf("invalid type %q for string", sig.str)
+	}
+	s, err := varParseString(tok.val)
+	if err != nil {
+		return nil, err
+	}
+	n := stringNode{str: s}
+	if sig.str == "" {
+		return stringNode{str: s}, nil
+	}
+	n.sig = sig
+	switch sig.str {
+	case "o":
+		n.val = ObjectPath(s)
+	case "g":
+		n.val = Signature{s}
+	case "s":
+		n.val = s
+	}
+	return n, nil
+}
+
+func varParseString(s string) (string, error) {
+	// quotes are guaranteed to be there
+	s = s[1 : len(s)-1]
+	buf := new(bytes.Buffer)
+	for len(s) != 0 {
+		r, size := utf8.DecodeRuneInString(s)
+		if r == utf8.RuneError && size == 1 {
+			return "", errors.New("invalid UTF-8")
+		}
+		s = s[size:]
+		if r != '\\' {
+			buf.WriteRune(r)
+			continue
+		}
+		r, size = utf8.DecodeRuneInString(s)
+		if r == utf8.RuneError && size == 1 {
+			return "", errors.New("invalid UTF-8")
+		}
+		s = s[size:]
+		switch r {
+		case 'a':
+			buf.WriteRune(0x7)
+		case 'b':
+			buf.WriteRune(0x8)
+		case 'f':
+			buf.WriteRune(0xc)
+		case 'n':
+			buf.WriteRune('\n')
+		case 'r':
+			buf.WriteRune('\r')
+		case 't':
+			buf.WriteRune('\t')
+		case '\n':
+		case 'u':
+			if len(s) < 4 {
+				return "", errors.New("short unicode escape")
+			}
+			r, err := strconv.ParseUint(s[:4], 16, 32)
+			if err != nil {
+				return "", err
+			}
+			buf.WriteRune(rune(r))
+			s = s[4:]
+		case 'U':
+			if len(s) < 8 {
+				return "", errors.New("short unicode escape")
+			}
+			r, err := strconv.ParseUint(s[:8], 16, 32)
+			if err != nil {
+				return "", err
+			}
+			buf.WriteRune(rune(r))
+			s = s[8:]
+		default:
+			buf.WriteRune(r)
+		}
+	}
+	return buf.String(), nil
+}
+
+var boolSigSet = sigSet{Signature{"b"}: true}
+
+type boolNode bool
+
+func (boolNode) Infer() (Signature, error) {
+	return Signature{"b"}, nil
+}
+
+func (b boolNode) String() string {
+	if b {
+		return "true"
+	}
+	return "false"
+}
+
+func (boolNode) Sigs() sigSet {
+	return boolSigSet
+}
+
+func (b boolNode) Value(sig Signature) (interface{}, error) {
+	if sig.str != "b" {
+		return nil, varTypeError{b.String(), sig}
+	}
+	return bool(b), nil
+}
+
+type arrayNode struct {
+	set      sigSet
+	children []varNode
+	val      interface{}
+}
+
+func (n arrayNode) Infer() (Signature, error) {
+	for _, v := range n.children {
+		csig, err := varInfer(v)
+		if err != nil {
+			continue
+		}
+		return Signature{"a" + csig.str}, nil
+	}
+	return Signature{}, fmt.Errorf("can't infer type for %q", n.String())
+}
+
+func (n arrayNode) String() string {
+	s := "["
+	for i, v := range n.children {
+		s += v.String()
+		if i != len(n.children)-1 {
+			s += ", "
+		}
+	}
+	return s + "]"
+}
+
+func (n arrayNode) Sigs() sigSet {
+	return n.set
+}
+
+func (n arrayNode) Value(sig Signature) (interface{}, error) {
+	if n.set.Empty() {
+		// no type information whatsoever, so this must be an empty slice
+		return reflect.MakeSlice(typeFor(sig.str), 0, 0).Interface(), nil
+	}
+	if !n.set[sig] {
+		return nil, varTypeError{n.String(), sig}
+	}
+	s := reflect.MakeSlice(typeFor(sig.str), len(n.children), len(n.children))
+	for i, v := range n.children {
+		rv, err := v.Value(Signature{sig.str[1:]})
+		if err != nil {
+			return nil, err
+		}
+		s.Index(i).Set(reflect.ValueOf(rv))
+	}
+	return s.Interface(), nil
+}
+
+func varMakeArrayNode(p *varParser, sig Signature) (varNode, error) {
+	var n arrayNode
+	if sig.str != "" {
+		n.set = sigSet{sig: true}
+	}
+	if t := p.next(); t.typ == tokArrayEnd {
+		return n, nil
+	} else {
+		p.backup()
+	}
+Loop:
+	for {
+		t := p.next()
+		switch t.typ {
+		case tokEOF:
+			return nil, io.ErrUnexpectedEOF
+		case tokError:
+			return nil, errors.New(t.val)
+		}
+		p.backup()
+		cn, err := varMakeNode(p)
+		if err != nil {
+			return nil, err
+		}
+		if cset := cn.Sigs(); !cset.Empty() {
+			if n.set.Empty() {
+				n.set = cset.ToArray()
+			} else {
+				nset := cset.ToArray().Intersect(n.set)
+				if nset.Empty() {
+					return nil, fmt.Errorf("can't parse %q with given type information", cn.String())
+				}
+				n.set = nset
+			}
+		}
+		n.children = append(n.children, cn)
+		switch t := p.next(); t.typ {
+		case tokEOF:
+			return nil, io.ErrUnexpectedEOF
+		case tokError:
+			return nil, errors.New(t.val)
+		case tokArrayEnd:
+			break Loop
+		case tokComma:
+			continue
+		default:
+			return nil, fmt.Errorf("unexpected %q", t.val)
+		}
+	}
+	return n, nil
+}
+
+type variantNode struct {
+	n varNode
+}
+
+var variantSet = sigSet{
+	Signature{"v"}: true,
+}
+
+func (variantNode) Infer() (Signature, error) {
+	return Signature{"v"}, nil
+}
+
+func (n variantNode) String() string {
+	return "<" + n.n.String() + ">"
+}
+
+func (variantNode) Sigs() sigSet {
+	return variantSet
+}
+
+func (n variantNode) Value(sig Signature) (interface{}, error) {
+	if sig.str != "v" {
+		return nil, varTypeError{n.String(), sig}
+	}
+	sig, err := varInfer(n.n)
+	if err != nil {
+		return nil, err
+	}
+	v, err := n.n.Value(sig)
+	if err != nil {
+		return nil, err
+	}
+	return MakeVariant(v), nil
+}
+
+func varMakeVariantNode(p *varParser, sig Signature) (varNode, error) {
+	n, err := varMakeNode(p)
+	if err != nil {
+		return nil, err
+	}
+	if t := p.next(); t.typ != tokVariantEnd {
+		return nil, fmt.Errorf("unexpected %q", t.val)
+	}
+	vn := variantNode{n}
+	if sig.str != "" && sig.str != "v" {
+		return nil, varTypeError{vn.String(), sig}
+	}
+	return variantNode{n}, nil
+}
+
+type dictEntry struct {
+	key, val varNode
+}
+
+type dictNode struct {
+	kset, vset sigSet
+	children   []dictEntry
+	val        interface{}
+}
+
+func (n dictNode) Infer() (Signature, error) {
+	for _, v := range n.children {
+		ksig, err := varInfer(v.key)
+		if err != nil {
+			continue
+		}
+		vsig, err := varInfer(v.val)
+		if err != nil {
+			continue
+		}
+		return Signature{"a{" + ksig.str + vsig.str + "}"}, nil
+	}
+	return Signature{}, fmt.Errorf("can't infer type for %q", n.String())
+}
+
+func (n dictNode) String() string {
+	s := "{"
+	for i, v := range n.children {
+		s += v.key.String() + ": " + v.val.String()
+		if i != len(n.children)-1 {
+			s += ", "
+		}
+	}
+	return s + "}"
+}
+
+func (n dictNode) Sigs() sigSet {
+	r := sigSet{}
+	for k := range n.kset {
+		for v := range n.vset {
+			sig := "a{" + k.str + v.str + "}"
+			r[Signature{sig}] = true
+		}
+	}
+	return r
+}
+
+func (n dictNode) Value(sig Signature) (interface{}, error) {
+	set := n.Sigs()
+	if set.Empty() {
+		// no type information -> empty dict
+		return reflect.MakeMap(typeFor(sig.str)).Interface(), nil
+	}
+	if !set[sig] {
+		return nil, varTypeError{n.String(), sig}
+	}
+	m := reflect.MakeMap(typeFor(sig.str))
+	ksig := Signature{sig.str[2:3]}
+	vsig := Signature{sig.str[3 : len(sig.str)-1]}
+	for _, v := range n.children {
+		kv, err := v.key.Value(ksig)
+		if err != nil {
+			return nil, err
+		}
+		vv, err := v.val.Value(vsig)
+		if err != nil {
+			return nil, err
+		}
+		m.SetMapIndex(reflect.ValueOf(kv), reflect.ValueOf(vv))
+	}
+	return m.Interface(), nil
+}
+
+func varMakeDictNode(p *varParser, sig Signature) (varNode, error) {
+	var n dictNode
+
+	if sig.str != "" {
+		if len(sig.str) < 5 {
+			return nil, fmt.Errorf("invalid signature %q for dict type", sig)
+		}
+		ksig := Signature{string(sig.str[2])}
+		vsig := Signature{sig.str[3 : len(sig.str)-1]}
+		n.kset = sigSet{ksig: true}
+		n.vset = sigSet{vsig: true}
+	}
+	if t := p.next(); t.typ == tokDictEnd {
+		return n, nil
+	} else {
+		p.backup()
+	}
+Loop:
+	for {
+		t := p.next()
+		switch t.typ {
+		case tokEOF:
+			return nil, io.ErrUnexpectedEOF
+		case tokError:
+			return nil, errors.New(t.val)
+		}
+		p.backup()
+		kn, err := varMakeNode(p)
+		if err != nil {
+			return nil, err
+		}
+		if kset := kn.Sigs(); !kset.Empty() {
+			if n.kset.Empty() {
+				n.kset = kset
+			} else {
+				n.kset = kset.Intersect(n.kset)
+				if n.kset.Empty() {
+					return nil, fmt.Errorf("can't parse %q with given type information", kn.String())
+				}
+			}
+		}
+		t = p.next()
+		switch t.typ {
+		case tokEOF:
+			return nil, io.ErrUnexpectedEOF
+		case tokError:
+			return nil, errors.New(t.val)
+		case tokColon:
+		default:
+			return nil, fmt.Errorf("unexpected %q", t.val)
+		}
+		t = p.next()
+		switch t.typ {
+		case tokEOF:
+			return nil, io.ErrUnexpectedEOF
+		case tokError:
+			return nil, errors.New(t.val)
+		}
+		p.backup()
+		vn, err := varMakeNode(p)
+		if err != nil {
+			return nil, err
+		}
+		if vset := vn.Sigs(); !vset.Empty() {
+			if n.vset.Empty() {
+				n.vset = vset
+			} else {
+				n.vset = n.vset.Intersect(vset)
+				if n.vset.Empty() {
+					return nil, fmt.Errorf("can't parse %q with given type information", vn.String())
+				}
+			}
+		}
+		n.children = append(n.children, dictEntry{kn, vn})
+		t = p.next()
+		switch t.typ {
+		case tokEOF:
+			return nil, io.ErrUnexpectedEOF
+		case tokError:
+			return nil, errors.New(t.val)
+		case tokDictEnd:
+			break Loop
+		case tokComma:
+			continue
+		default:
+			return nil, fmt.Errorf("unexpected %q", t.val)
+		}
+	}
+	return n, nil
+}
+
+type byteStringNode []byte
+
+var byteStringSet = sigSet{
+	Signature{"ay"}: true,
+}
+
+func (byteStringNode) Infer() (Signature, error) {
+	return Signature{"ay"}, nil
+}
+
+func (b byteStringNode) String() string {
+	return string(b)
+}
+
+func (b byteStringNode) Sigs() sigSet {
+	return byteStringSet
+}
+
+func (b byteStringNode) Value(sig Signature) (interface{}, error) {
+	if sig.str != "ay" {
+		return nil, varTypeError{b.String(), sig}
+	}
+	return []byte(b), nil
+}
+
+func varParseByteString(s string) ([]byte, error) {
+	// quotes and b at start are guaranteed to be there
+	b := make([]byte, 0, 1)
+	s = s[2 : len(s)-1]
+	for len(s) != 0 {
+		c := s[0]
+		s = s[1:]
+		if c != '\\' {
+			b = append(b, c)
+			continue
+		}
+		c = s[0]
+		s = s[1:]
+		switch c {
+		case 'a':
+			b = append(b, 0x7)
+		case 'b':
+			b = append(b, 0x8)
+		case 'f':
+			b = append(b, 0xc)
+		case 'n':
+			b = append(b, '\n')
+		case 'r':
+			b = append(b, '\r')
+		case 't':
+			b = append(b, '\t')
+		case 'x':
+			if len(s) < 2 {
+				return nil, errors.New("short escape")
+			}
+			n, err := strconv.ParseUint(s[:2], 16, 8)
+			if err != nil {
+				return nil, err
+			}
+			b = append(b, byte(n))
+			s = s[2:]
+		case '0':
+			if len(s) < 3 {
+				return nil, errors.New("short escape")
+			}
+			n, err := strconv.ParseUint(s[:3], 8, 8)
+			if err != nil {
+				return nil, err
+			}
+			b = append(b, byte(n))
+			s = s[3:]
+		default:
+			b = append(b, c)
+		}
+	}
+	return append(b, 0), nil
+}
+
+func varInfer(n varNode) (Signature, error) {
+	if sig, ok := n.Sigs().Single(); ok {
+		return sig, nil
+	}
+	return n.Infer()
+}
diff --git a/vendor/github.com/gogo/protobuf/LICENSE b/vendor/github.com/gogo/protobuf/LICENSE
new file mode 100644
index 0000000000..335e38e19b
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/LICENSE
@@ -0,0 +1,36 @@
+Extensions for Protocol Buffers to create more go like structures.
+
+Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+http://github.com/gogo/protobuf/gogoproto
+
+Go support for Protocol Buffers - Google's data interchange format
+
+Copyright 2010 The Go Authors.  All rights reserved.
+https://github.com/golang/protobuf
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/vendor/github.com/gogo/protobuf/proto/clone.go b/vendor/github.com/gogo/protobuf/proto/clone.go
new file mode 100644
index 0000000000..79edb86119
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/clone.go
@@ -0,0 +1,228 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2011 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Protocol buffer deep copy and merge.
+// TODO: RawMessage.
+
+package proto
+
+import (
+	"log"
+	"reflect"
+	"strings"
+)
+
+// Clone returns a deep copy of a protocol buffer.
+func Clone(pb Message) Message {
+	in := reflect.ValueOf(pb)
+	if in.IsNil() {
+		return pb
+	}
+
+	out := reflect.New(in.Type().Elem())
+	// out is empty so a merge is a deep copy.
+	mergeStruct(out.Elem(), in.Elem())
+	return out.Interface().(Message)
+}
+
+// Merge merges src into dst.
+// Required and optional fields that are set in src will be set to that value in dst.
+// Elements of repeated fields will be appended.
+// Merge panics if src and dst are not the same type, or if dst is nil.
+func Merge(dst, src Message) {
+	in := reflect.ValueOf(src)
+	out := reflect.ValueOf(dst)
+	if out.IsNil() {
+		panic("proto: nil destination")
+	}
+	if in.Type() != out.Type() {
+		// Explicit test prior to mergeStruct so that mistyped nils will fail
+		panic("proto: type mismatch")
+	}
+	if in.IsNil() {
+		// Merging nil into non-nil is a quiet no-op
+		return
+	}
+	mergeStruct(out.Elem(), in.Elem())
+}
+
+func mergeStruct(out, in reflect.Value) {
+	sprop := GetProperties(in.Type())
+	for i := 0; i < in.NumField(); i++ {
+		f := in.Type().Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
+	}
+
+	if emIn, ok := in.Addr().Interface().(extensionsMap); ok {
+		emOut := out.Addr().Interface().(extensionsMap)
+		mergeExtension(emOut.ExtensionMap(), emIn.ExtensionMap())
+	} else if emIn, ok := in.Addr().Interface().(extensionsBytes); ok {
+		emOut := out.Addr().Interface().(extensionsBytes)
+		bIn := emIn.GetExtensions()
+		bOut := emOut.GetExtensions()
+		*bOut = append(*bOut, *bIn...)
+	}
+
+	uf := in.FieldByName("XXX_unrecognized")
+	if !uf.IsValid() {
+		return
+	}
+	uin := uf.Bytes()
+	if len(uin) > 0 {
+		out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...))
+	}
+}
+
+// mergeAny performs a merge between two values of the same type.
+// viaPtr indicates whether the values were indirected through a pointer (implying proto2).
+// prop is set if this is a struct field (it may be nil).
+func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
+	if in.Type() == protoMessageType {
+		if !in.IsNil() {
+			if out.IsNil() {
+				out.Set(reflect.ValueOf(Clone(in.Interface().(Message))))
+			} else {
+				Merge(out.Interface().(Message), in.Interface().(Message))
+			}
+		}
+		return
+	}
+	switch in.Kind() {
+	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
+		reflect.String, reflect.Uint32, reflect.Uint64:
+		if !viaPtr && isProto3Zero(in) {
+			return
+		}
+		out.Set(in)
+	case reflect.Interface:
+		// Probably a oneof field; copy non-nil values.
+		if in.IsNil() {
+			return
+		}
+		// Allocate destination if it is not set, or set to a different type.
+		// Otherwise we will merge as normal.
+		if out.IsNil() || out.Elem().Type() != in.Elem().Type() {
+			out.Set(reflect.New(in.Elem().Elem().Type())) // interface -> *T -> T -> new(T)
+		}
+		mergeAny(out.Elem(), in.Elem(), false, nil)
+	case reflect.Map:
+		if in.Len() == 0 {
+			return
+		}
+		if out.IsNil() {
+			out.Set(reflect.MakeMap(in.Type()))
+		}
+		// For maps with value types of *T or []byte we need to deep copy each value.
+		elemKind := in.Type().Elem().Kind()
+		for _, key := range in.MapKeys() {
+			var val reflect.Value
+			switch elemKind {
+			case reflect.Ptr:
+				val = reflect.New(in.Type().Elem().Elem())
+				mergeAny(val, in.MapIndex(key), false, nil)
+			case reflect.Slice:
+				val = in.MapIndex(key)
+				val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
+			default:
+				val = in.MapIndex(key)
+			}
+			out.SetMapIndex(key, val)
+		}
+	case reflect.Ptr:
+		if in.IsNil() {
+			return
+		}
+		if out.IsNil() {
+			out.Set(reflect.New(in.Elem().Type()))
+		}
+		mergeAny(out.Elem(), in.Elem(), true, nil)
+	case reflect.Slice:
+		if in.IsNil() {
+			return
+		}
+		if in.Type().Elem().Kind() == reflect.Uint8 {
+			// []byte is a scalar bytes field, not a repeated field.
+
+			// Edge case: if this is in a proto3 message, a zero length
+			// bytes field is considered the zero value, and should not
+			// be merged.
+			if prop != nil && prop.proto3 && in.Len() == 0 {
+				return
+			}
+
+			// Make a deep copy.
+			// Append to []byte{} instead of []byte(nil) so that we never end up
+			// with a nil result.
+			out.SetBytes(append([]byte{}, in.Bytes()...))
+			return
+		}
+		n := in.Len()
+		if out.IsNil() {
+			out.Set(reflect.MakeSlice(in.Type(), 0, n))
+		}
+		switch in.Type().Elem().Kind() {
+		case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
+			reflect.String, reflect.Uint32, reflect.Uint64:
+			out.Set(reflect.AppendSlice(out, in))
+		default:
+			for i := 0; i < n; i++ {
+				x := reflect.Indirect(reflect.New(in.Type().Elem()))
+				mergeAny(x, in.Index(i), false, nil)
+				out.Set(reflect.Append(out, x))
+			}
+		}
+	case reflect.Struct:
+		mergeStruct(out, in)
+	default:
+		// unknown type, so not a protocol buffer
+		log.Printf("proto: don't know how to copy %v", in)
+	}
+}
+
+func mergeExtension(out, in map[int32]Extension) {
+	for extNum, eIn := range in {
+		eOut := Extension{desc: eIn.desc}
+		if eIn.value != nil {
+			v := reflect.New(reflect.TypeOf(eIn.value)).Elem()
+			mergeAny(v, reflect.ValueOf(eIn.value), false, nil)
+			eOut.value = v.Interface()
+		}
+		if eIn.enc != nil {
+			eOut.enc = make([]byte, len(eIn.enc))
+			copy(eOut.enc, eIn.enc)
+		}
+
+		out[extNum] = eOut
+	}
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/decode.go b/vendor/github.com/gogo/protobuf/proto/decode.go
new file mode 100644
index 0000000000..cb5b213f9b
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/decode.go
@@ -0,0 +1,872 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Routines for decoding protocol buffer data to construct in-memory representations.
+ */
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"reflect"
+)
+
+// errOverflow is returned when an integer is too large to be represented.
+var errOverflow = errors.New("proto: integer overflow")
+
+// ErrInternalBadWireType is returned by generated code when an incorrect
+// wire type is encountered. It does not get returned to user code.
+var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
+
+// The fundamental decoders that interpret bytes on the wire.
+// Those that take integer types all return uint64 and are
+// therefore of type valueDecoder.
+
+// DecodeVarint reads a varint-encoded integer from the slice.
+// It returns the integer and the number of bytes consumed, or
+// zero if there is not enough.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func DecodeVarint(buf []byte) (x uint64, n int) {
+	// x, n already 0
+	for shift := uint(0); shift < 64; shift += 7 {
+		if n >= len(buf) {
+			return 0, 0
+		}
+		b := uint64(buf[n])
+		n++
+		x |= (b & 0x7F) << shift
+		if (b & 0x80) == 0 {
+			return x, n
+		}
+	}
+
+	// The number is too large to represent in a 64-bit value.
+	return 0, 0
+}
+
+// DecodeVarint reads a varint-encoded integer from the Buffer.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func (p *Buffer) DecodeVarint() (x uint64, err error) {
+	// x, err already 0
+
+	i := p.index
+	l := len(p.buf)
+
+	for shift := uint(0); shift < 64; shift += 7 {
+		if i >= l {
+			err = io.ErrUnexpectedEOF
+			return
+		}
+		b := p.buf[i]
+		i++
+		x |= (uint64(b) & 0x7F) << shift
+		if b < 0x80 {
+			p.index = i
+			return
+		}
+	}
+
+	// The number is too large to represent in a 64-bit value.
+	err = errOverflow
+	return
+}
+
+// DecodeFixed64 reads a 64-bit integer from the Buffer.
+// This is the format for the
+// fixed64, sfixed64, and double protocol buffer types.
+func (p *Buffer) DecodeFixed64() (x uint64, err error) {
+	// x, err already 0
+	i := p.index + 8
+	if i < 0 || i > len(p.buf) {
+		err = io.ErrUnexpectedEOF
+		return
+	}
+	p.index = i
+
+	x = uint64(p.buf[i-8])
+	x |= uint64(p.buf[i-7]) << 8
+	x |= uint64(p.buf[i-6]) << 16
+	x |= uint64(p.buf[i-5]) << 24
+	x |= uint64(p.buf[i-4]) << 32
+	x |= uint64(p.buf[i-3]) << 40
+	x |= uint64(p.buf[i-2]) << 48
+	x |= uint64(p.buf[i-1]) << 56
+	return
+}
+
+// DecodeFixed32 reads a 32-bit integer from the Buffer.
+// This is the format for the
+// fixed32, sfixed32, and float protocol buffer types.
+func (p *Buffer) DecodeFixed32() (x uint64, err error) {
+	// x, err already 0
+	i := p.index + 4
+	if i < 0 || i > len(p.buf) {
+		err = io.ErrUnexpectedEOF
+		return
+	}
+	p.index = i
+
+	x = uint64(p.buf[i-4])
+	x |= uint64(p.buf[i-3]) << 8
+	x |= uint64(p.buf[i-2]) << 16
+	x |= uint64(p.buf[i-1]) << 24
+	return
+}
+
+// DecodeZigzag64 reads a zigzag-encoded 64-bit integer
+// from the Buffer.
+// This is the format used for the sint64 protocol buffer type.
+func (p *Buffer) DecodeZigzag64() (x uint64, err error) {
+	x, err = p.DecodeVarint()
+	if err != nil {
+		return
+	}
+	x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63)
+	return
+}
+
+// DecodeZigzag32 reads a zigzag-encoded 32-bit integer
+// from  the Buffer.
+// This is the format used for the sint32 protocol buffer type.
+func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
+	x, err = p.DecodeVarint()
+	if err != nil {
+		return
+	}
+	x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31))
+	return
+}
+
+// These are not ValueDecoders: they produce an array of bytes or a string.
+// bytes, embedded messages
+
+// DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
+// This is the format used for the bytes protocol buffer
+// type and for embedded messages.
+func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) {
+	n, err := p.DecodeVarint()
+	if err != nil {
+		return nil, err
+	}
+
+	nb := int(n)
+	if nb < 0 {
+		return nil, fmt.Errorf("proto: bad byte length %d", nb)
+	}
+	end := p.index + nb
+	if end < p.index || end > len(p.buf) {
+		return nil, io.ErrUnexpectedEOF
+	}
+
+	if !alloc {
+		// todo: check if can get more uses of alloc=false
+		buf = p.buf[p.index:end]
+		p.index += nb
+		return
+	}
+
+	buf = make([]byte, nb)
+	copy(buf, p.buf[p.index:])
+	p.index += nb
+	return
+}
+
+// DecodeStringBytes reads an encoded string from the Buffer.
+// This is the format used for the proto2 string type.
+func (p *Buffer) DecodeStringBytes() (s string, err error) {
+	buf, err := p.DecodeRawBytes(false)
+	if err != nil {
+		return
+	}
+	return string(buf), nil
+}
+
+// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
+// If the protocol buffer has extensions, and the field matches, add it as an extension.
+// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
+func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
+	oi := o.index
+
+	err := o.skip(t, tag, wire)
+	if err != nil {
+		return err
+	}
+
+	if !unrecField.IsValid() {
+		return nil
+	}
+
+	ptr := structPointer_Bytes(base, unrecField)
+
+	// Add the skipped field to struct field
+	obuf := o.buf
+
+	o.buf = *ptr
+	o.EncodeVarint(uint64(tag<<3 | wire))
+	*ptr = append(o.buf, obuf[oi:o.index]...)
+
+	o.buf = obuf
+
+	return nil
+}
+
+// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
+func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
+
+	var u uint64
+	var err error
+
+	switch wire {
+	case WireVarint:
+		_, err = o.DecodeVarint()
+	case WireFixed64:
+		_, err = o.DecodeFixed64()
+	case WireBytes:
+		_, err = o.DecodeRawBytes(false)
+	case WireFixed32:
+		_, err = o.DecodeFixed32()
+	case WireStartGroup:
+		for {
+			u, err = o.DecodeVarint()
+			if err != nil {
+				break
+			}
+			fwire := int(u & 0x7)
+			if fwire == WireEndGroup {
+				break
+			}
+			ftag := int(u >> 3)
+			err = o.skip(t, ftag, fwire)
+			if err != nil {
+				break
+			}
+		}
+	default:
+		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
+	}
+	return err
+}
+
+// Unmarshaler is the interface representing objects that can
+// unmarshal themselves.  The method should reset the receiver before
+// decoding starts.  The argument points to data that may be
+// overwritten, so implementations should not keep references to the
+// buffer.
+type Unmarshaler interface {
+	Unmarshal([]byte) error
+}
+
+// Unmarshal parses the protocol buffer representation in buf and places the
+// decoded result in pb.  If the struct underlying pb does not match
+// the data in buf, the results can be unpredictable.
+//
+// Unmarshal resets pb before starting to unmarshal, so any
+// existing data in pb is always removed. Use UnmarshalMerge
+// to preserve and append to existing data.
+func Unmarshal(buf []byte, pb Message) error {
+	pb.Reset()
+	return UnmarshalMerge(buf, pb)
+}
+
+// UnmarshalMerge parses the protocol buffer representation in buf and
+// writes the decoded result to pb.  If the struct underlying pb does not match
+// the data in buf, the results can be unpredictable.
+//
+// UnmarshalMerge merges into existing data in pb.
+// Most code should use Unmarshal instead.
+func UnmarshalMerge(buf []byte, pb Message) error {
+	// If the object can unmarshal itself, let it.
+	if u, ok := pb.(Unmarshaler); ok {
+		return u.Unmarshal(buf)
+	}
+	return NewBuffer(buf).Unmarshal(pb)
+}
+
+// DecodeMessage reads a count-delimited message from the Buffer.
+func (p *Buffer) DecodeMessage(pb Message) error {
+	enc, err := p.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+	return NewBuffer(enc).Unmarshal(pb)
+}
+
+// DecodeGroup reads a tag-delimited group from the Buffer.
+func (p *Buffer) DecodeGroup(pb Message) error {
+	typ, base, err := getbase(pb)
+	if err != nil {
+		return err
+	}
+	return p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), true, base)
+}
+
+// Unmarshal parses the protocol buffer representation in the
+// Buffer and places the decoded result in pb.  If the struct
+// underlying pb does not match the data in the buffer, the results can be
+// unpredictable.
+func (p *Buffer) Unmarshal(pb Message) error {
+	// If the object can unmarshal itself, let it.
+	if u, ok := pb.(Unmarshaler); ok {
+		err := u.Unmarshal(p.buf[p.index:])
+		p.index = len(p.buf)
+		return err
+	}
+
+	typ, base, err := getbase(pb)
+	if err != nil {
+		return err
+	}
+
+	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
+
+	if collectStats {
+		stats.Decode++
+	}
+
+	return err
+}
+
+// unmarshalType does the work of unmarshaling a structure.
+func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
+	var state errorState
+	required, reqFields := prop.reqCount, uint64(0)
+
+	var err error
+	for err == nil && o.index < len(o.buf) {
+		oi := o.index
+		var u uint64
+		u, err = o.DecodeVarint()
+		if err != nil {
+			break
+		}
+		wire := int(u & 0x7)
+		if wire == WireEndGroup {
+			if is_group {
+				return nil // input is satisfied
+			}
+			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
+		}
+		tag := int(u >> 3)
+		if tag <= 0 {
+			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
+		}
+		fieldnum, ok := prop.decoderTags.get(tag)
+		if !ok {
+			// Maybe it's an extension?
+			if prop.extendable {
+				if e := structPointer_Interface(base, st).(extendableProto); isExtensionField(e, int32(tag)) {
+					if err = o.skip(st, tag, wire); err == nil {
+						if ee, eok := e.(extensionsMap); eok {
+							ext := ee.ExtensionMap()[int32(tag)] // may be missing
+							ext.enc = append(ext.enc, o.buf[oi:o.index]...)
+							ee.ExtensionMap()[int32(tag)] = ext
+						} else if ee, eok := e.(extensionsBytes); eok {
+							ext := ee.GetExtensions()
+							*ext = append(*ext, o.buf[oi:o.index]...)
+						}
+					}
+					continue
+				}
+			}
+			// Maybe it's a oneof?
+			if prop.oneofUnmarshaler != nil {
+				m := structPointer_Interface(base, st).(Message)
+				// First return value indicates whether tag is a oneof field.
+				ok, err = prop.oneofUnmarshaler(m, tag, wire, o)
+				if err == ErrInternalBadWireType {
+					// Map the error to something more descriptive.
+					// Do the formatting here to save generated code space.
+					err = fmt.Errorf("bad wiretype for oneof field in %T", m)
+				}
+				if ok {
+					continue
+				}
+			}
+			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
+			continue
+		}
+		p := prop.Prop[fieldnum]
+
+		if p.dec == nil {
+			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
+			continue
+		}
+		dec := p.dec
+		if wire != WireStartGroup && wire != p.WireType {
+			if wire == WireBytes && p.packedDec != nil {
+				// a packable field
+				dec = p.packedDec
+			} else {
+				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
+				continue
+			}
+		}
+		decErr := dec(o, p, base)
+		if decErr != nil && !state.shouldContinue(decErr, p) {
+			err = decErr
+		}
+		if err == nil && p.Required {
+			// Successfully decoded a required field.
+			if tag <= 64 {
+				// use bitmap for fields 1-64 to catch field reuse.
+				var mask uint64 = 1 << uint64(tag-1)
+				if reqFields&mask == 0 {
+					// new required field
+					reqFields |= mask
+					required--
+				}
+			} else {
+				// This is imprecise. It can be fooled by a required field
+				// with a tag > 64 that is encoded twice; that's very rare.
+				// A fully correct implementation would require allocating
+				// a data structure, which we would like to avoid.
+				required--
+			}
+		}
+	}
+	if err == nil {
+		if is_group {
+			return io.ErrUnexpectedEOF
+		}
+		if state.err != nil {
+			return state.err
+		}
+		if required > 0 {
+			// Not enough information to determine the exact field. If we use extra
+			// CPU, we could determine the field only if the missing required field
+			// has a tag <= 64 and we check reqFields.
+			return &RequiredNotSetError{"{Unknown}"}
+		}
+	}
+	return err
+}
+
+// Individual type decoders
+// For each,
+//	u is the decoded value,
+//	v is a pointer to the field (pointer) in the struct
+
+// Sizes of the pools to allocate inside the Buffer.
+// The goal is modest amortization and allocation
+// on at least 16-byte boundaries.
+const (
+	boolPoolSize   = 16
+	uint32PoolSize = 8
+	uint64PoolSize = 4
+)
+
+// Decode a bool.
+func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	if len(o.bools) == 0 {
+		o.bools = make([]bool, boolPoolSize)
+	}
+	o.bools[0] = u != 0
+	*structPointer_Bool(base, p.field) = &o.bools[0]
+	o.bools = o.bools[1:]
+	return nil
+}
+
+func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	*structPointer_BoolVal(base, p.field) = u != 0
+	return nil
+}
+
+// Decode an int32.
+func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
+	return nil
+}
+
+func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
+	return nil
+}
+
+// Decode an int64.
+func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word64_Set(structPointer_Word64(base, p.field), o, u)
+	return nil
+}
+
+func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
+	return nil
+}
+
+// Decode a string.
+func (o *Buffer) dec_string(p *Properties, base structPointer) error {
+	s, err := o.DecodeStringBytes()
+	if err != nil {
+		return err
+	}
+	*structPointer_String(base, p.field) = &s
+	return nil
+}
+
+func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
+	s, err := o.DecodeStringBytes()
+	if err != nil {
+		return err
+	}
+	*structPointer_StringVal(base, p.field) = s
+	return nil
+}
+
+// Decode a slice of bytes ([]byte).
+func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	*structPointer_Bytes(base, p.field) = b
+	return nil
+}
+
+// Decode a slice of bools ([]bool).
+func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	v := structPointer_BoolSlice(base, p.field)
+	*v = append(*v, u != 0)
+	return nil
+}
+
+// Decode a slice of bools ([]bool) in packed format.
+func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
+	v := structPointer_BoolSlice(base, p.field)
+
+	nn, err := o.DecodeVarint()
+	if err != nil {
+		return err
+	}
+	nb := int(nn) // number of bytes of encoded bools
+	fin := o.index + nb
+	if fin < o.index {
+		return errOverflow
+	}
+
+	y := *v
+	for o.index < fin {
+		u, err := p.valDec(o)
+		if err != nil {
+			return err
+		}
+		y = append(y, u != 0)
+	}
+
+	*v = y
+	return nil
+}
+
+// Decode a slice of int32s ([]int32).
+func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	structPointer_Word32Slice(base, p.field).Append(uint32(u))
+	return nil
+}
+
+// Decode a slice of int32s ([]int32) in packed format.
+func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Slice(base, p.field)
+
+	nn, err := o.DecodeVarint()
+	if err != nil {
+		return err
+	}
+	nb := int(nn) // number of bytes of encoded int32s
+
+	fin := o.index + nb
+	if fin < o.index {
+		return errOverflow
+	}
+	for o.index < fin {
+		u, err := p.valDec(o)
+		if err != nil {
+			return err
+		}
+		v.Append(uint32(u))
+	}
+	return nil
+}
+
+// Decode a slice of int64s ([]int64).
+func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+
+	structPointer_Word64Slice(base, p.field).Append(u)
+	return nil
+}
+
+// Decode a slice of int64s ([]int64) in packed format.
+func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64Slice(base, p.field)
+
+	nn, err := o.DecodeVarint()
+	if err != nil {
+		return err
+	}
+	nb := int(nn) // number of bytes of encoded int64s
+
+	fin := o.index + nb
+	if fin < o.index {
+		return errOverflow
+	}
+	for o.index < fin {
+		u, err := p.valDec(o)
+		if err != nil {
+			return err
+		}
+		v.Append(u)
+	}
+	return nil
+}
+
+// Decode a slice of strings ([]string).
+func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
+	s, err := o.DecodeStringBytes()
+	if err != nil {
+		return err
+	}
+	v := structPointer_StringSlice(base, p.field)
+	*v = append(*v, s)
+	return nil
+}
+
+// Decode a slice of slice of bytes ([][]byte).
+func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	v := structPointer_BytesSlice(base, p.field)
+	*v = append(*v, b)
+	return nil
+}
+
+// Decode a map field.
+func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
+	raw, err := o.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+	oi := o.index       // index at the end of this map entry
+	o.index -= len(raw) // move buffer back to start of map entry
+
+	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
+	if mptr.Elem().IsNil() {
+		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
+	}
+	v := mptr.Elem() // map[K]V
+
+	// Prepare addressable doubly-indirect placeholders for the key and value types.
+	// See enc_new_map for why.
+	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
+	keybase := toStructPointer(keyptr.Addr())                  // **K
+
+	var valbase structPointer
+	var valptr reflect.Value
+	switch p.mtype.Elem().Kind() {
+	case reflect.Slice:
+		// []byte
+		var dummy []byte
+		valptr = reflect.ValueOf(&dummy)  // *[]byte
+		valbase = toStructPointer(valptr) // *[]byte
+	case reflect.Ptr:
+		// message; valptr is **Msg; need to allocate the intermediate pointer
+		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
+		valptr.Set(reflect.New(valptr.Type().Elem()))
+		valbase = toStructPointer(valptr)
+	default:
+		// everything else
+		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
+		valbase = toStructPointer(valptr.Addr())                   // **V
+	}
+
+	// Decode.
+	// This parses a restricted wire format, namely the encoding of a message
+	// with two fields. See enc_new_map for the format.
+	for o.index < oi {
+		// tagcode for key and value properties are always a single byte
+		// because they have tags 1 and 2.
+		tagcode := o.buf[o.index]
+		o.index++
+		switch tagcode {
+		case p.mkeyprop.tagcode[0]:
+			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
+				return err
+			}
+		case p.mvalprop.tagcode[0]:
+			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
+				return err
+			}
+		default:
+			// TODO: Should we silently skip this instead?
+			return fmt.Errorf("proto: bad map data tag %d", raw[0])
+		}
+	}
+	keyelem, valelem := keyptr.Elem(), valptr.Elem()
+	if !keyelem.IsValid() || !valelem.IsValid() {
+		// We did not decode the key or the value in the map entry.
+		// Either way, it's an invalid map entry.
+		return fmt.Errorf("proto: bad map data: missing key/val")
+	}
+
+	v.SetMapIndex(keyelem, valelem)
+	return nil
+}
+
+// Decode a group.
+func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
+	bas := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(bas) {
+		// allocate new nested message
+		bas = toStructPointer(reflect.New(p.stype))
+		structPointer_SetStructPointer(base, p.field, bas)
+	}
+	return o.unmarshalType(p.stype, p.sprop, true, bas)
+}
+
+// Decode an embedded message.
+func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
+	raw, e := o.DecodeRawBytes(false)
+	if e != nil {
+		return e
+	}
+
+	bas := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(bas) {
+		// allocate new nested message
+		bas = toStructPointer(reflect.New(p.stype))
+		structPointer_SetStructPointer(base, p.field, bas)
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		iv := structPointer_Interface(bas, p.stype)
+		return iv.(Unmarshaler).Unmarshal(raw)
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	err = o.unmarshalType(p.stype, p.sprop, false, bas)
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
+
+// Decode a slice of embedded messages.
+func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
+	return o.dec_slice_struct(p, false, base)
+}
+
+// Decode a slice of embedded groups.
+func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
+	return o.dec_slice_struct(p, true, base)
+}
+
+// Decode a slice of structs ([]*struct).
+func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
+	v := reflect.New(p.stype)
+	bas := toStructPointer(v)
+	structPointer_StructPointerSlice(base, p.field).Append(bas)
+
+	if is_group {
+		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
+		return err
+	}
+
+	raw, err := o.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		iv := v.Interface()
+		return iv.(Unmarshaler).Unmarshal(raw)
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
+
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/decode_gogo.go b/vendor/github.com/gogo/protobuf/proto/decode_gogo.go
new file mode 100644
index 0000000000..6a77aad766
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/decode_gogo.go
@@ -0,0 +1,175 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"reflect"
+)
+
+// Decode a reference to a struct pointer.
+func (o *Buffer) dec_ref_struct_message(p *Properties, base structPointer) (err error) {
+	raw, e := o.DecodeRawBytes(false)
+	if e != nil {
+		return e
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		panic("not supported, since this is a pointer receiver")
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	bas := structPointer_FieldPointer(base, p.field)
+
+	err = o.unmarshalType(p.stype, p.sprop, false, bas)
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
+
+// Decode a slice of references to struct pointers ([]struct).
+func (o *Buffer) dec_slice_ref_struct(p *Properties, is_group bool, base structPointer) error {
+	newBas := appendStructPointer(base, p.field, p.sstype)
+
+	if is_group {
+		panic("not supported, maybe in future, if requested.")
+	}
+
+	raw, err := o.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		panic("not supported, since this is not a pointer receiver.")
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	err = o.unmarshalType(p.stype, p.sprop, is_group, newBas)
+
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
+
+// Decode a slice of references to struct pointers.
+func (o *Buffer) dec_slice_ref_struct_message(p *Properties, base structPointer) error {
+	return o.dec_slice_ref_struct(p, false, base)
+}
+
+func setPtrCustomType(base structPointer, f field, v interface{}) {
+	if v == nil {
+		return
+	}
+	structPointer_SetStructPointer(base, f, structPointer(reflect.ValueOf(v).Pointer()))
+}
+
+func setCustomType(base structPointer, f field, value interface{}) {
+	if value == nil {
+		return
+	}
+	v := reflect.ValueOf(value).Elem()
+	t := reflect.TypeOf(value).Elem()
+	kind := t.Kind()
+	switch kind {
+	case reflect.Slice:
+		slice := reflect.MakeSlice(t, v.Len(), v.Cap())
+		reflect.Copy(slice, v)
+		oldHeader := structPointer_GetSliceHeader(base, f)
+		oldHeader.Data = slice.Pointer()
+		oldHeader.Len = v.Len()
+		oldHeader.Cap = v.Cap()
+	default:
+		l := 1
+		size := reflect.TypeOf(value).Elem().Size()
+		if kind == reflect.Array {
+			l = reflect.TypeOf(value).Elem().Len()
+			size = reflect.TypeOf(value).Size()
+		}
+		total := int(size) * l
+		structPointer_Copy(toStructPointer(reflect.ValueOf(value)), structPointer_Add(base, f), total)
+	}
+}
+
+func (o *Buffer) dec_custom_bytes(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	i := reflect.New(p.ctype.Elem()).Interface()
+	custom := (i).(Unmarshaler)
+	if err := custom.Unmarshal(b); err != nil {
+		return err
+	}
+	setPtrCustomType(base, p.field, custom)
+	return nil
+}
+
+func (o *Buffer) dec_custom_ref_bytes(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	i := reflect.New(p.ctype).Interface()
+	custom := (i).(Unmarshaler)
+	if err := custom.Unmarshal(b); err != nil {
+		return err
+	}
+	if custom != nil {
+		setCustomType(base, p.field, custom)
+	}
+	return nil
+}
+
+// Decode a slice of bytes ([]byte) into a slice of custom types.
+func (o *Buffer) dec_custom_slice_bytes(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	i := reflect.New(p.ctype.Elem()).Interface()
+	custom := (i).(Unmarshaler)
+	if err := custom.Unmarshal(b); err != nil {
+		return err
+	}
+	newBas := appendStructPointer(base, p.field, p.ctype)
+
+	setCustomType(newBas, 0, custom)
+
+	return nil
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/encode.go b/vendor/github.com/gogo/protobuf/proto/encode.go
new file mode 100644
index 0000000000..231b07401a
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/encode.go
@@ -0,0 +1,1325 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Routines for encoding data into the wire format for protocol buffers.
+ */
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"sort"
+)
+
+// RequiredNotSetError is the error returned if Marshal is called with
+// a protocol buffer struct whose required fields have not
+// all been initialized. It is also the error returned if Unmarshal is
+// called with an encoded protocol buffer that does not include all the
+// required fields.
+//
+// When printed, RequiredNotSetError reports the first unset required field in a
+// message. If the field cannot be precisely determined, it is reported as
+// "{Unknown}".
+type RequiredNotSetError struct {
+	field string
+}
+
+func (e *RequiredNotSetError) Error() string {
+	return fmt.Sprintf("proto: required field %q not set", e.field)
+}
+
+var (
+	// errRepeatedHasNil is the error returned if Marshal is called with
+	// a struct with a repeated field containing a nil element.
+	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
+
+	// ErrNil is the error returned if Marshal is called with nil.
+	ErrNil = errors.New("proto: Marshal called with nil")
+)
+
+// The fundamental encoders that put bytes on the wire.
+// Those that take integer types all accept uint64 and are
+// therefore of type valueEncoder.
+
+const maxVarintBytes = 10 // maximum length of a varint
+
+// EncodeVarint returns the varint encoding of x.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+// Not used by the package itself, but helpful to clients
+// wishing to use the same encoding.
+func EncodeVarint(x uint64) []byte {
+	var buf [maxVarintBytes]byte
+	var n int
+	for n = 0; x > 127; n++ {
+		buf[n] = 0x80 | uint8(x&0x7F)
+		x >>= 7
+	}
+	buf[n] = uint8(x)
+	n++
+	return buf[0:n]
+}
+
+// EncodeVarint writes a varint-encoded integer to the Buffer.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func (p *Buffer) EncodeVarint(x uint64) error {
+	for x >= 1<<7 {
+		p.buf = append(p.buf, uint8(x&0x7f|0x80))
+		x >>= 7
+	}
+	p.buf = append(p.buf, uint8(x))
+	return nil
+}
+
+// SizeVarint returns the varint encoding size of an integer.
+func SizeVarint(x uint64) int {
+	return sizeVarint(x)
+}
+
+func sizeVarint(x uint64) (n int) {
+	for {
+		n++
+		x >>= 7
+		if x == 0 {
+			break
+		}
+	}
+	return n
+}
+
+// EncodeFixed64 writes a 64-bit integer to the Buffer.
+// This is the format for the
+// fixed64, sfixed64, and double protocol buffer types.
+func (p *Buffer) EncodeFixed64(x uint64) error {
+	p.buf = append(p.buf,
+		uint8(x),
+		uint8(x>>8),
+		uint8(x>>16),
+		uint8(x>>24),
+		uint8(x>>32),
+		uint8(x>>40),
+		uint8(x>>48),
+		uint8(x>>56))
+	return nil
+}
+
+func sizeFixed64(x uint64) int {
+	return 8
+}
+
+// EncodeFixed32 writes a 32-bit integer to the Buffer.
+// This is the format for the
+// fixed32, sfixed32, and float protocol buffer types.
+func (p *Buffer) EncodeFixed32(x uint64) error {
+	p.buf = append(p.buf,
+		uint8(x),
+		uint8(x>>8),
+		uint8(x>>16),
+		uint8(x>>24))
+	return nil
+}
+
+func sizeFixed32(x uint64) int {
+	return 4
+}
+
+// EncodeZigzag64 writes a zigzag-encoded 64-bit integer
+// to the Buffer.
+// This is the format used for the sint64 protocol buffer type.
+func (p *Buffer) EncodeZigzag64(x uint64) error {
+	// use signed number to get arithmetic right shift.
+	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+
+func sizeZigzag64(x uint64) int {
+	return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+
+// EncodeZigzag32 writes a zigzag-encoded 32-bit integer
+// to the Buffer.
+// This is the format used for the sint32 protocol buffer type.
+func (p *Buffer) EncodeZigzag32(x uint64) error {
+	// use signed number to get arithmetic right shift.
+	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
+}
+
+func sizeZigzag32(x uint64) int {
+	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
+}
+
+// EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
+// This is the format used for the bytes protocol buffer
+// type and for embedded messages.
+func (p *Buffer) EncodeRawBytes(b []byte) error {
+	p.EncodeVarint(uint64(len(b)))
+	p.buf = append(p.buf, b...)
+	return nil
+}
+
+func sizeRawBytes(b []byte) int {
+	return sizeVarint(uint64(len(b))) +
+		len(b)
+}
+
+// EncodeStringBytes writes an encoded string to the Buffer.
+// This is the format used for the proto2 string type.
+func (p *Buffer) EncodeStringBytes(s string) error {
+	p.EncodeVarint(uint64(len(s)))
+	p.buf = append(p.buf, s...)
+	return nil
+}
+
+func sizeStringBytes(s string) int {
+	return sizeVarint(uint64(len(s))) +
+		len(s)
+}
+
+// Marshaler is the interface representing objects that can marshal themselves.
+type Marshaler interface {
+	Marshal() ([]byte, error)
+}
+
+// Marshal takes the protocol buffer
+// and encodes it into the wire format, returning the data.
+func Marshal(pb Message) ([]byte, error) {
+	// Can the object marshal itself?
+	if m, ok := pb.(Marshaler); ok {
+		return m.Marshal()
+	}
+	p := NewBuffer(nil)
+	err := p.Marshal(pb)
+	var state errorState
+	if err != nil && !state.shouldContinue(err, nil) {
+		return nil, err
+	}
+	if p.buf == nil && err == nil {
+		// Return a non-nil slice on success.
+		return []byte{}, nil
+	}
+	return p.buf, err
+}
+
+// EncodeMessage writes the protocol buffer to the Buffer,
+// prefixed by a varint-encoded length.
+func (p *Buffer) EncodeMessage(pb Message) error {
+	t, base, err := getbase(pb)
+	if structPointer_IsNil(base) {
+		return ErrNil
+	}
+	if err == nil {
+		var state errorState
+		err = p.enc_len_struct(GetProperties(t.Elem()), base, &state)
+	}
+	return err
+}
+
+// Marshal takes the protocol buffer
+// and encodes it into the wire format, writing the result to the
+// Buffer.
+func (p *Buffer) Marshal(pb Message) error {
+	// Can the object marshal itself?
+	if m, ok := pb.(Marshaler); ok {
+		data, err := m.Marshal()
+		if err != nil {
+			return err
+		}
+		p.buf = append(p.buf, data...)
+		return nil
+	}
+
+	t, base, err := getbase(pb)
+	if structPointer_IsNil(base) {
+		return ErrNil
+	}
+	if err == nil {
+		err = p.enc_struct(GetProperties(t.Elem()), base)
+	}
+
+	if collectStats {
+		stats.Encode++
+	}
+
+	return err
+}
+
+// Size returns the encoded size of a protocol buffer.
+func Size(pb Message) (n int) {
+	// Can the object marshal itself?  If so, Size is slow.
+	// TODO: add Size to Marshaler, or add a Sizer interface.
+	if m, ok := pb.(Marshaler); ok {
+		b, _ := m.Marshal()
+		return len(b)
+	}
+
+	t, base, err := getbase(pb)
+	if structPointer_IsNil(base) {
+		return 0
+	}
+	if err == nil {
+		n = size_struct(GetProperties(t.Elem()), base)
+	}
+
+	if collectStats {
+		stats.Size++
+	}
+
+	return
+}
+
+// Individual type encoders.
+
+// Encode a bool.
+func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
+	v := *structPointer_Bool(base, p.field)
+	if v == nil {
+		return ErrNil
+	}
+	x := 0
+	if *v {
+		x = 1
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
+	v := *structPointer_BoolVal(base, p.field)
+	if !v {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, 1)
+	return nil
+}
+
+func size_bool(p *Properties, base structPointer) int {
+	v := *structPointer_Bool(base, p.field)
+	if v == nil {
+		return 0
+	}
+	return len(p.tagcode) + 1 // each bool takes exactly one byte
+}
+
+func size_proto3_bool(p *Properties, base structPointer) int {
+	v := *structPointer_BoolVal(base, p.field)
+	if !v && !p.oneof {
+		return 0
+	}
+	return len(p.tagcode) + 1 // each bool takes exactly one byte
+}
+
+// Encode an int32.
+func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return ErrNil
+	}
+	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
+	if x == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_int32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return 0
+	}
+	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+func size_proto3_int32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
+	if x == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+// Encode a uint32.
+// Exactly the same as int32, except for no sign extension.
+func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return ErrNil
+	}
+	x := word32_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	if x == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_uint32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return 0
+	}
+	x := word32_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+func size_proto3_uint32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	if x == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+// Encode an int64.
+func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64(base, p.field)
+	if word64_IsNil(v) {
+		return ErrNil
+	}
+	x := word64_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, x)
+	return nil
+}
+
+func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	if x == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, x)
+	return nil
+}
+
+func size_int64(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word64(base, p.field)
+	if word64_IsNil(v) {
+		return 0
+	}
+	x := word64_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(x)
+	return
+}
+
+func size_proto3_int64(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	if x == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += p.valSize(x)
+	return
+}
+
+// Encode a string.
+func (o *Buffer) enc_string(p *Properties, base structPointer) error {
+	v := *structPointer_String(base, p.field)
+	if v == nil {
+		return ErrNil
+	}
+	x := *v
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeStringBytes(x)
+	return nil
+}
+
+func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
+	v := *structPointer_StringVal(base, p.field)
+	if v == "" {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeStringBytes(v)
+	return nil
+}
+
+func size_string(p *Properties, base structPointer) (n int) {
+	v := *structPointer_String(base, p.field)
+	if v == nil {
+		return 0
+	}
+	x := *v
+	n += len(p.tagcode)
+	n += sizeStringBytes(x)
+	return
+}
+
+func size_proto3_string(p *Properties, base structPointer) (n int) {
+	v := *structPointer_StringVal(base, p.field)
+	if v == "" && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeStringBytes(v)
+	return
+}
+
+// All protocol buffer fields are nillable, but be careful.
+func isNil(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
+		return v.IsNil()
+	}
+	return false
+}
+
+// Encode a message struct.
+func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	structp := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return ErrNil
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, err := m.Marshal()
+		if err != nil && !state.shouldContinue(err, nil) {
+			return err
+		}
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(data)
+		return state.err
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	return o.enc_len_struct(p.sprop, structp, &state)
+}
+
+func size_struct_message(p *Properties, base structPointer) int {
+	structp := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return 0
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, _ := m.Marshal()
+		n0 := len(p.tagcode)
+		n1 := sizeRawBytes(data)
+		return n0 + n1
+	}
+
+	n0 := len(p.tagcode)
+	n1 := size_struct(p.sprop, structp)
+	n2 := sizeVarint(uint64(n1)) // size of encoded length
+	return n0 + n1 + n2
+}
+
+// Encode a group struct.
+func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
+	var state errorState
+	b := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(b) {
+		return ErrNil
+	}
+
+	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
+	err := o.enc_struct(p.sprop, b)
+	if err != nil && !state.shouldContinue(err, nil) {
+		return err
+	}
+	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
+	return state.err
+}
+
+func size_struct_group(p *Properties, base structPointer) (n int) {
+	b := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(b) {
+		return 0
+	}
+
+	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
+	n += size_struct(p.sprop, b)
+	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
+	return
+}
+
+// Encode a slice of bools ([]bool).
+func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return ErrNil
+	}
+	for _, x := range s {
+		o.buf = append(o.buf, p.tagcode...)
+		v := uint64(0)
+		if x {
+			v = 1
+		}
+		p.valEnc(o, v)
+	}
+	return nil
+}
+
+func size_slice_bool(p *Properties, base structPointer) int {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return 0
+	}
+	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
+}
+
+// Encode a slice of bools ([]bool) in packed format.
+func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
+	for _, x := range s {
+		v := uint64(0)
+		if x {
+			v = 1
+		}
+		p.valEnc(o, v)
+	}
+	return nil
+}
+
+func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(l))
+	n += l // each bool takes exactly one byte
+	return
+}
+
+// Encode a slice of bytes ([]byte).
+func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(s)
+	return nil
+}
+
+func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
+	s := *structPointer_Bytes(base, p.field)
+	if len(s) == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(s)
+	return nil
+}
+
+func size_slice_byte(p *Properties, base structPointer) (n int) {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeRawBytes(s)
+	return
+}
+
+func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
+	s := *structPointer_Bytes(base, p.field)
+	if len(s) == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeRawBytes(s)
+	return
+}
+
+// Encode a slice of int32s ([]int32).
+func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		p.valEnc(o, uint64(x))
+	}
+	return nil
+}
+
+func size_slice_int32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	for i := 0; i < l; i++ {
+		n += len(p.tagcode)
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		n += p.valSize(uint64(x))
+	}
+	return
+}
+
+// Encode a slice of int32s ([]int32) in packed format.
+func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	// TODO: Reuse a Buffer.
+	buf := NewBuffer(nil)
+	for i := 0; i < l; i++ {
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		p.valEnc(buf, uint64(x))
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(len(buf.buf)))
+	o.buf = append(o.buf, buf.buf...)
+	return nil
+}
+
+func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	var bufSize int
+	for i := 0; i < l; i++ {
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		bufSize += p.valSize(uint64(x))
+	}
+
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(bufSize))
+	n += bufSize
+	return
+}
+
+// Encode a slice of uint32s ([]uint32).
+// Exactly the same as int32, except for no sign extension.
+func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		x := s.Index(i)
+		p.valEnc(o, uint64(x))
+	}
+	return nil
+}
+
+func size_slice_uint32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	for i := 0; i < l; i++ {
+		n += len(p.tagcode)
+		x := s.Index(i)
+		n += p.valSize(uint64(x))
+	}
+	return
+}
+
+// Encode a slice of uint32s ([]uint32) in packed format.
+// Exactly the same as int32, except for no sign extension.
+func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	// TODO: Reuse a Buffer.
+	buf := NewBuffer(nil)
+	for i := 0; i < l; i++ {
+		p.valEnc(buf, uint64(s.Index(i)))
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(len(buf.buf)))
+	o.buf = append(o.buf, buf.buf...)
+	return nil
+}
+
+func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	var bufSize int
+	for i := 0; i < l; i++ {
+		bufSize += p.valSize(uint64(s.Index(i)))
+	}
+
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(bufSize))
+	n += bufSize
+	return
+}
+
+// Encode a slice of int64s ([]int64).
+func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		p.valEnc(o, s.Index(i))
+	}
+	return nil
+}
+
+func size_slice_int64(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	for i := 0; i < l; i++ {
+		n += len(p.tagcode)
+		n += p.valSize(s.Index(i))
+	}
+	return
+}
+
+// Encode a slice of int64s ([]int64) in packed format.
+func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	// TODO: Reuse a Buffer.
+	buf := NewBuffer(nil)
+	for i := 0; i < l; i++ {
+		p.valEnc(buf, s.Index(i))
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(len(buf.buf)))
+	o.buf = append(o.buf, buf.buf...)
+	return nil
+}
+
+func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	var bufSize int
+	for i := 0; i < l; i++ {
+		bufSize += p.valSize(s.Index(i))
+	}
+
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(bufSize))
+	n += bufSize
+	return
+}
+
+// Encode a slice of slice of bytes ([][]byte).
+func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
+	ss := *structPointer_BytesSlice(base, p.field)
+	l := len(ss)
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(ss[i])
+	}
+	return nil
+}
+
+func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
+	ss := *structPointer_BytesSlice(base, p.field)
+	l := len(ss)
+	if l == 0 {
+		return 0
+	}
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		n += sizeRawBytes(ss[i])
+	}
+	return
+}
+
+// Encode a slice of strings ([]string).
+func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
+	ss := *structPointer_StringSlice(base, p.field)
+	l := len(ss)
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeStringBytes(ss[i])
+	}
+	return nil
+}
+
+func size_slice_string(p *Properties, base structPointer) (n int) {
+	ss := *structPointer_StringSlice(base, p.field)
+	l := len(ss)
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		n += sizeStringBytes(ss[i])
+	}
+	return
+}
+
+// Encode a slice of message structs ([]*struct).
+func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+
+	for i := 0; i < l; i++ {
+		structp := s.Index(i)
+		if structPointer_IsNil(structp) {
+			return errRepeatedHasNil
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, err := m.Marshal()
+			if err != nil && !state.shouldContinue(err, nil) {
+				return err
+			}
+			o.buf = append(o.buf, p.tagcode...)
+			o.EncodeRawBytes(data)
+			continue
+		}
+
+		o.buf = append(o.buf, p.tagcode...)
+		err := o.enc_len_struct(p.sprop, structp, &state)
+		if err != nil && !state.shouldContinue(err, nil) {
+			if err == ErrNil {
+				return errRepeatedHasNil
+			}
+			return err
+		}
+	}
+	return state.err
+}
+
+func size_slice_struct_message(p *Properties, base structPointer) (n int) {
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		structp := s.Index(i)
+		if structPointer_IsNil(structp) {
+			return // return the size up to this point
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, _ := m.Marshal()
+			n += len(p.tagcode)
+			n += sizeRawBytes(data)
+			continue
+		}
+
+		n0 := size_struct(p.sprop, structp)
+		n1 := sizeVarint(uint64(n0)) // size of encoded length
+		n += n0 + n1
+	}
+	return
+}
+
+// Encode a slice of group structs ([]*struct).
+func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
+	var state errorState
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+
+	for i := 0; i < l; i++ {
+		b := s.Index(i)
+		if structPointer_IsNil(b) {
+			return errRepeatedHasNil
+		}
+
+		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
+
+		err := o.enc_struct(p.sprop, b)
+
+		if err != nil && !state.shouldContinue(err, nil) {
+			if err == ErrNil {
+				return errRepeatedHasNil
+			}
+			return err
+		}
+
+		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
+	}
+	return state.err
+}
+
+func size_slice_struct_group(p *Properties, base structPointer) (n int) {
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+
+	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
+	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
+	for i := 0; i < l; i++ {
+		b := s.Index(i)
+		if structPointer_IsNil(b) {
+			return // return size up to this point
+		}
+
+		n += size_struct(p.sprop, b)
+	}
+	return
+}
+
+// Encode an extension map.
+func (o *Buffer) enc_map(p *Properties, base structPointer) error {
+	v := *structPointer_ExtMap(base, p.field)
+	if err := encodeExtensionMap(v); err != nil {
+		return err
+	}
+	// Fast-path for common cases: zero or one extensions.
+	if len(v) <= 1 {
+		for _, e := range v {
+			o.buf = append(o.buf, e.enc...)
+		}
+		return nil
+	}
+
+	// Sort keys to provide a deterministic encoding.
+	keys := make([]int, 0, len(v))
+	for k := range v {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+
+	for _, k := range keys {
+		o.buf = append(o.buf, v[int32(k)].enc...)
+	}
+	return nil
+}
+
+func size_map(p *Properties, base structPointer) int {
+	v := *structPointer_ExtMap(base, p.field)
+	return sizeExtensionMap(v)
+}
+
+// Encode a map field.
+func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
+	var state errorState // XXX: or do we need to plumb this through?
+
+	/*
+		A map defined as
+			map<key_type, value_type> map_field = N;
+		is encoded in the same way as
+			message MapFieldEntry {
+				key_type key = 1;
+				value_type value = 2;
+			}
+			repeated MapFieldEntry map_field = N;
+	*/
+
+	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
+	if v.Len() == 0 {
+		return nil
+	}
+
+	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
+
+	enc := func() error {
+		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
+			return err
+		}
+		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	// Don't sort map keys. It is not required by the spec, and C++ doesn't do it.
+	for _, key := range v.MapKeys() {
+		val := v.MapIndex(key)
+
+		// The only illegal map entry values are nil message pointers.
+		if val.Kind() == reflect.Ptr && val.IsNil() {
+			return errors.New("proto: map has nil element")
+		}
+
+		keycopy.Set(key)
+		valcopy.Set(val)
+
+		o.buf = append(o.buf, p.tagcode...)
+		if err := o.enc_len_thing(enc, &state); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func size_new_map(p *Properties, base structPointer) int {
+	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
+
+	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
+
+	n := 0
+	for _, key := range v.MapKeys() {
+		val := v.MapIndex(key)
+		keycopy.Set(key)
+		valcopy.Set(val)
+
+		// Tag codes for key and val are the responsibility of the sub-sizer.
+		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
+		valsize := p.mvalprop.size(p.mvalprop, valbase)
+		entry := keysize + valsize
+		// Add on tag code and length of map entry itself.
+		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
+	}
+	return n
+}
+
+// mapEncodeScratch returns a new reflect.Value matching the map's value type,
+// and a structPointer suitable for passing to an encoder or sizer.
+func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
+	// Prepare addressable doubly-indirect placeholders for the key and value types.
+	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
+
+	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
+	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
+	keyptr.Set(keycopy.Addr())                                  //
+	keybase = toStructPointer(keyptr.Addr())                    // **K
+
+	// Value types are more varied and require special handling.
+	switch mapType.Elem().Kind() {
+	case reflect.Slice:
+		// []byte
+		var dummy []byte
+		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
+		valbase = toStructPointer(valcopy.Addr())
+	case reflect.Ptr:
+		// message; the generated field type is map[K]*Msg (so V is *Msg),
+		// so we only need one level of indirection.
+		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
+		valbase = toStructPointer(valcopy.Addr())
+	default:
+		// everything else
+		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
+		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
+		valptr.Set(valcopy.Addr())                                  //
+		valbase = toStructPointer(valptr.Addr())                    // **V
+	}
+	return
+}
+
+// Encode a struct.
+func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
+	var state errorState
+	// Encode fields in tag order so that decoders may use optimizations
+	// that depend on the ordering.
+	// https://developers.google.com/protocol-buffers/docs/encoding#order
+	for _, i := range prop.order {
+		p := prop.Prop[i]
+		if p.enc != nil {
+			err := p.enc(o, p, base)
+			if err != nil {
+				if err == ErrNil {
+					if p.Required && state.err == nil {
+						state.err = &RequiredNotSetError{p.Name}
+					}
+				} else if err == errRepeatedHasNil {
+					// Give more context to nil values in repeated fields.
+					return errors.New("repeated field " + p.OrigName + " has nil element")
+				} else if !state.shouldContinue(err, p) {
+					return err
+				}
+			}
+		}
+	}
+
+	// Do oneof fields.
+	if prop.oneofMarshaler != nil {
+		m := structPointer_Interface(base, prop.stype).(Message)
+		if err := prop.oneofMarshaler(m, o); err != nil {
+			return err
+		}
+	}
+
+	// Add unrecognized fields at the end.
+	if prop.unrecField.IsValid() {
+		v := *structPointer_Bytes(base, prop.unrecField)
+		if len(v) > 0 {
+			o.buf = append(o.buf, v...)
+		}
+	}
+
+	return state.err
+}
+
+func size_struct(prop *StructProperties, base structPointer) (n int) {
+	for _, i := range prop.order {
+		p := prop.Prop[i]
+		if p.size != nil {
+			n += p.size(p, base)
+		}
+	}
+
+	// Add unrecognized fields at the end.
+	if prop.unrecField.IsValid() {
+		v := *structPointer_Bytes(base, prop.unrecField)
+		n += len(v)
+	}
+
+	// Factor in any oneof fields.
+	if prop.oneofSizer != nil {
+		m := structPointer_Interface(base, prop.stype).(Message)
+		n += prop.oneofSizer(m)
+	}
+
+	return
+}
+
+var zeroes [20]byte // longer than any conceivable sizeVarint
+
+// Encode a struct, preceded by its encoded length (as a varint).
+func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
+	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
+}
+
+// Encode something, preceded by its encoded length (as a varint).
+func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
+	iLen := len(o.buf)
+	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
+	iMsg := len(o.buf)
+	err := enc()
+	if err != nil && !state.shouldContinue(err, nil) {
+		return err
+	}
+	lMsg := len(o.buf) - iMsg
+	lLen := sizeVarint(uint64(lMsg))
+	switch x := lLen - (iMsg - iLen); {
+	case x > 0: // actual length is x bytes larger than the space we reserved
+		// Move msg x bytes right.
+		o.buf = append(o.buf, zeroes[:x]...)
+		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
+	case x < 0: // actual length is x bytes smaller than the space we reserved
+		// Move msg x bytes left.
+		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
+		o.buf = o.buf[:len(o.buf)+x] // x is negative
+	}
+	// Encode the length in the reserved space.
+	o.buf = o.buf[:iLen]
+	o.EncodeVarint(uint64(lMsg))
+	o.buf = o.buf[:len(o.buf)+lMsg]
+	return state.err
+}
+
+// errorState maintains the first error that occurs and updates that error
+// with additional context.
+type errorState struct {
+	err error
+}
+
+// shouldContinue reports whether encoding should continue upon encountering the
+// given error. If the error is RequiredNotSetError, shouldContinue returns true
+// and, if this is the first appearance of that error, remembers it for future
+// reporting.
+//
+// If prop is not nil, it may update any error with additional context about the
+// field with the error.
+func (s *errorState) shouldContinue(err error, prop *Properties) bool {
+	// Ignore unset required fields.
+	reqNotSet, ok := err.(*RequiredNotSetError)
+	if !ok {
+		return false
+	}
+	if s.err == nil {
+		if prop != nil {
+			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
+		}
+		s.err = err
+	}
+	return true
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/encode_gogo.go b/vendor/github.com/gogo/protobuf/proto/encode_gogo.go
new file mode 100644
index 0000000000..f77cfb1eea
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/encode_gogo.go
@@ -0,0 +1,354 @@
+// Extensions for Protocol Buffers to create more go like structures.
+//
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// http://github.com/golang/protobuf/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"reflect"
+)
+
+func NewRequiredNotSetError(field string) *RequiredNotSetError {
+	return &RequiredNotSetError{field}
+}
+
+type Sizer interface {
+	Size() int
+}
+
+func (o *Buffer) enc_ext_slice_byte(p *Properties, base structPointer) error {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil {
+		return ErrNil
+	}
+	o.buf = append(o.buf, s...)
+	return nil
+}
+
+func size_ext_slice_byte(p *Properties, base structPointer) (n int) {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil {
+		return 0
+	}
+	n += len(s)
+	return
+}
+
+// Encode a reference to bool pointer.
+func (o *Buffer) enc_ref_bool(p *Properties, base structPointer) error {
+	v := *structPointer_BoolVal(base, p.field)
+	x := 0
+	if v {
+		x = 1
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_ref_bool(p *Properties, base structPointer) int {
+	return len(p.tagcode) + 1 // each bool takes exactly one byte
+}
+
+// Encode a reference to int32 pointer.
+func (o *Buffer) enc_ref_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v))
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_ref_int32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v))
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+func (o *Buffer) enc_ref_uint32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_ref_uint32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+// Encode a reference to an int64 pointer.
+func (o *Buffer) enc_ref_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, x)
+	return nil
+}
+
+func size_ref_int64(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(x)
+	return
+}
+
+// Encode a reference to a string pointer.
+func (o *Buffer) enc_ref_string(p *Properties, base structPointer) error {
+	v := *structPointer_StringVal(base, p.field)
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeStringBytes(v)
+	return nil
+}
+
+func size_ref_string(p *Properties, base structPointer) (n int) {
+	v := *structPointer_StringVal(base, p.field)
+	n += len(p.tagcode)
+	n += sizeStringBytes(v)
+	return
+}
+
+// Encode a reference to a message struct.
+func (o *Buffer) enc_ref_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	structp := structPointer_GetRefStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return ErrNil
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, err := m.Marshal()
+		if err != nil && !state.shouldContinue(err, nil) {
+			return err
+		}
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(data)
+		return nil
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	return o.enc_len_struct(p.sprop, structp, &state)
+}
+
+//TODO this is only copied, please fix this
+func size_ref_struct_message(p *Properties, base structPointer) int {
+	structp := structPointer_GetRefStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return 0
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, _ := m.Marshal()
+		n0 := len(p.tagcode)
+		n1 := sizeRawBytes(data)
+		return n0 + n1
+	}
+
+	n0 := len(p.tagcode)
+	n1 := size_struct(p.sprop, structp)
+	n2 := sizeVarint(uint64(n1)) // size of encoded length
+	return n0 + n1 + n2
+}
+
+// Encode a slice of references to message struct pointers ([]struct).
+func (o *Buffer) enc_slice_ref_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	ss := structPointer_GetStructPointer(base, p.field)
+	ss1 := structPointer_GetRefStructPointer(ss, field(0))
+	size := p.stype.Size()
+	l := structPointer_Len(base, p.field)
+	for i := 0; i < l; i++ {
+		structp := structPointer_Add(ss1, field(uintptr(i)*size))
+		if structPointer_IsNil(structp) {
+			return errRepeatedHasNil
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, err := m.Marshal()
+			if err != nil && !state.shouldContinue(err, nil) {
+				return err
+			}
+			o.buf = append(o.buf, p.tagcode...)
+			o.EncodeRawBytes(data)
+			continue
+		}
+
+		o.buf = append(o.buf, p.tagcode...)
+		err := o.enc_len_struct(p.sprop, structp, &state)
+		if err != nil && !state.shouldContinue(err, nil) {
+			if err == ErrNil {
+				return errRepeatedHasNil
+			}
+			return err
+		}
+
+	}
+	return state.err
+}
+
+//TODO this is only copied, please fix this
+func size_slice_ref_struct_message(p *Properties, base structPointer) (n int) {
+	ss := structPointer_GetStructPointer(base, p.field)
+	ss1 := structPointer_GetRefStructPointer(ss, field(0))
+	size := p.stype.Size()
+	l := structPointer_Len(base, p.field)
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		structp := structPointer_Add(ss1, field(uintptr(i)*size))
+		if structPointer_IsNil(structp) {
+			return // return the size up to this point
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, _ := m.Marshal()
+			n += len(p.tagcode)
+			n += sizeRawBytes(data)
+			continue
+		}
+
+		n0 := size_struct(p.sprop, structp)
+		n1 := sizeVarint(uint64(n0)) // size of encoded length
+		n += n0 + n1
+	}
+	return
+}
+
+func (o *Buffer) enc_custom_bytes(p *Properties, base structPointer) error {
+	i := structPointer_InterfaceRef(base, p.field, p.ctype)
+	if i == nil {
+		return ErrNil
+	}
+	custom := i.(Marshaler)
+	data, err := custom.Marshal()
+	if err != nil {
+		return err
+	}
+	if data == nil {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(data)
+	return nil
+}
+
+func size_custom_bytes(p *Properties, base structPointer) (n int) {
+	n += len(p.tagcode)
+	i := structPointer_InterfaceRef(base, p.field, p.ctype)
+	if i == nil {
+		return 0
+	}
+	custom := i.(Marshaler)
+	data, _ := custom.Marshal()
+	n += sizeRawBytes(data)
+	return
+}
+
+func (o *Buffer) enc_custom_ref_bytes(p *Properties, base structPointer) error {
+	custom := structPointer_InterfaceAt(base, p.field, p.ctype).(Marshaler)
+	data, err := custom.Marshal()
+	if err != nil {
+		return err
+	}
+	if data == nil {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(data)
+	return nil
+}
+
+func size_custom_ref_bytes(p *Properties, base structPointer) (n int) {
+	n += len(p.tagcode)
+	i := structPointer_InterfaceAt(base, p.field, p.ctype)
+	if i == nil {
+		return 0
+	}
+	custom := i.(Marshaler)
+	data, _ := custom.Marshal()
+	n += sizeRawBytes(data)
+	return
+}
+
+func (o *Buffer) enc_custom_slice_bytes(p *Properties, base structPointer) error {
+	inter := structPointer_InterfaceRef(base, p.field, p.ctype)
+	if inter == nil {
+		return ErrNil
+	}
+	slice := reflect.ValueOf(inter)
+	l := slice.Len()
+	for i := 0; i < l; i++ {
+		v := slice.Index(i)
+		custom := v.Interface().(Marshaler)
+		data, err := custom.Marshal()
+		if err != nil {
+			return err
+		}
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(data)
+	}
+	return nil
+}
+
+func size_custom_slice_bytes(p *Properties, base structPointer) (n int) {
+	inter := structPointer_InterfaceRef(base, p.field, p.ctype)
+	if inter == nil {
+		return 0
+	}
+	slice := reflect.ValueOf(inter)
+	l := slice.Len()
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		v := slice.Index(i)
+		custom := v.Interface().(Marshaler)
+		data, _ := custom.Marshal()
+		n += sizeRawBytes(data)
+	}
+	return
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/equal.go b/vendor/github.com/gogo/protobuf/proto/equal.go
new file mode 100644
index 0000000000..f5db1def3c
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/equal.go
@@ -0,0 +1,276 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2011 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Protocol buffer comparison.
+
+package proto
+
+import (
+	"bytes"
+	"log"
+	"reflect"
+	"strings"
+)
+
+/*
+Equal returns true iff protocol buffers a and b are equal.
+The arguments must both be pointers to protocol buffer structs.
+
+Equality is defined in this way:
+  - Two messages are equal iff they are the same type,
+    corresponding fields are equal, unknown field sets
+    are equal, and extensions sets are equal.
+  - Two set scalar fields are equal iff their values are equal.
+    If the fields are of a floating-point type, remember that
+    NaN != x for all x, including NaN. If the message is defined
+    in a proto3 .proto file, fields are not "set"; specifically,
+    zero length proto3 "bytes" fields are equal (nil == {}).
+  - Two repeated fields are equal iff their lengths are the same,
+    and their corresponding elements are equal (a "bytes" field,
+    although represented by []byte, is not a repeated field)
+  - Two unset fields are equal.
+  - Two unknown field sets are equal if their current
+    encoded state is equal.
+  - Two extension sets are equal iff they have corresponding
+    elements that are pairwise equal.
+  - Every other combination of things are not equal.
+
+The return value is undefined if a and b are not protocol buffers.
+*/
+func Equal(a, b Message) bool {
+	if a == nil || b == nil {
+		return a == b
+	}
+	v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	if v1.Kind() == reflect.Ptr {
+		if v1.IsNil() {
+			return v2.IsNil()
+		}
+		if v2.IsNil() {
+			return false
+		}
+		v1, v2 = v1.Elem(), v2.Elem()
+	}
+	if v1.Kind() != reflect.Struct {
+		return false
+	}
+	return equalStruct(v1, v2)
+}
+
+// v1 and v2 are known to have the same type.
+func equalStruct(v1, v2 reflect.Value) bool {
+	sprop := GetProperties(v1.Type())
+	for i := 0; i < v1.NumField(); i++ {
+		f := v1.Type().Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		f1, f2 := v1.Field(i), v2.Field(i)
+		if f.Type.Kind() == reflect.Ptr {
+			if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
+				// both unset
+				continue
+			} else if n1 != n2 {
+				// set/unset mismatch
+				return false
+			}
+			b1, ok := f1.Interface().(raw)
+			if ok {
+				b2 := f2.Interface().(raw)
+				// RawMessage
+				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
+					return false
+				}
+				continue
+			}
+			f1, f2 = f1.Elem(), f2.Elem()
+		}
+		if !equalAny(f1, f2, sprop.Prop[i]) {
+			return false
+		}
+	}
+
+	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
+		em2 := v2.FieldByName("XXX_extensions")
+		if !equalExtensions(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
+			return false
+		}
+	}
+
+	uf := v1.FieldByName("XXX_unrecognized")
+	if !uf.IsValid() {
+		return true
+	}
+
+	u1 := uf.Bytes()
+	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
+	if !bytes.Equal(u1, u2) {
+		return false
+	}
+
+	return true
+}
+
+// v1 and v2 are known to have the same type.
+// prop may be nil.
+func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
+	if v1.Type() == protoMessageType {
+		m1, _ := v1.Interface().(Message)
+		m2, _ := v2.Interface().(Message)
+		return Equal(m1, m2)
+	}
+	switch v1.Kind() {
+	case reflect.Bool:
+		return v1.Bool() == v2.Bool()
+	case reflect.Float32, reflect.Float64:
+		return v1.Float() == v2.Float()
+	case reflect.Int32, reflect.Int64:
+		return v1.Int() == v2.Int()
+	case reflect.Interface:
+		// Probably a oneof field; compare the inner values.
+		n1, n2 := v1.IsNil(), v2.IsNil()
+		if n1 || n2 {
+			return n1 == n2
+		}
+		e1, e2 := v1.Elem(), v2.Elem()
+		if e1.Type() != e2.Type() {
+			return false
+		}
+		return equalAny(e1, e2, nil)
+	case reflect.Map:
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		for _, key := range v1.MapKeys() {
+			val2 := v2.MapIndex(key)
+			if !val2.IsValid() {
+				// This key was not found in the second map.
+				return false
+			}
+			if !equalAny(v1.MapIndex(key), val2, nil) {
+				return false
+			}
+		}
+		return true
+	case reflect.Ptr:
+		return equalAny(v1.Elem(), v2.Elem(), prop)
+	case reflect.Slice:
+		if v1.Type().Elem().Kind() == reflect.Uint8 {
+			// short circuit: []byte
+
+			// Edge case: if this is in a proto3 message, a zero length
+			// bytes field is considered the zero value.
+			if prop != nil && prop.proto3 && v1.Len() == 0 && v2.Len() == 0 {
+				return true
+			}
+			if v1.IsNil() != v2.IsNil() {
+				return false
+			}
+			return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
+		}
+
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		for i := 0; i < v1.Len(); i++ {
+			if !equalAny(v1.Index(i), v2.Index(i), prop) {
+				return false
+			}
+		}
+		return true
+	case reflect.String:
+		return v1.Interface().(string) == v2.Interface().(string)
+	case reflect.Struct:
+		return equalStruct(v1, v2)
+	case reflect.Uint32, reflect.Uint64:
+		return v1.Uint() == v2.Uint()
+	}
+
+	// unknown type, so not a protocol buffer
+	log.Printf("proto: don't know how to compare %v", v1)
+	return false
+}
+
+// base is the struct type that the extensions are based on.
+// em1 and em2 are extension maps.
+func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
+	if len(em1) != len(em2) {
+		return false
+	}
+
+	for extNum, e1 := range em1 {
+		e2, ok := em2[extNum]
+		if !ok {
+			return false
+		}
+
+		m1, m2 := e1.value, e2.value
+
+		if m1 != nil && m2 != nil {
+			// Both are unencoded.
+			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
+				return false
+			}
+			continue
+		}
+
+		// At least one is encoded. To do a semantically correct comparison
+		// we need to unmarshal them first.
+		var desc *ExtensionDesc
+		if m := extensionMaps[base]; m != nil {
+			desc = m[extNum]
+		}
+		if desc == nil {
+			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
+			continue
+		}
+		var err error
+		if m1 == nil {
+			m1, err = decodeExtension(e1.enc, desc)
+		}
+		if m2 == nil && err == nil {
+			m2, err = decodeExtension(e2.enc, desc)
+		}
+		if err != nil {
+			// The encoded form is invalid.
+			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
+			return false
+		}
+		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/extensions.go b/vendor/github.com/gogo/protobuf/proto/extensions.go
new file mode 100644
index 0000000000..6180347e39
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/extensions.go
@@ -0,0 +1,518 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Types and routines for supporting protocol buffer extensions.
+ */
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+	"sync"
+)
+
+// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
+var ErrMissingExtension = errors.New("proto: missing extension")
+
+// ExtensionRange represents a range of message extensions for a protocol buffer.
+// Used in code generated by the protocol compiler.
+type ExtensionRange struct {
+	Start, End int32 // both inclusive
+}
+
+// extendableProto is an interface implemented by any protocol buffer that may be extended.
+type extendableProto interface {
+	Message
+	ExtensionRangeArray() []ExtensionRange
+}
+
+type extensionsMap interface {
+	extendableProto
+	ExtensionMap() map[int32]Extension
+}
+
+type extensionsBytes interface {
+	extendableProto
+	GetExtensions() *[]byte
+}
+
+var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
+
+// ExtensionDesc represents an extension specification.
+// Used in generated code from the protocol compiler.
+type ExtensionDesc struct {
+	ExtendedType  Message     // nil pointer to the type that is being extended
+	ExtensionType interface{} // nil pointer to the extension type
+	Field         int32       // field number
+	Name          string      // fully-qualified name of extension, for text formatting
+	Tag           string      // protobuf tag style
+}
+
+func (ed *ExtensionDesc) repeated() bool {
+	t := reflect.TypeOf(ed.ExtensionType)
+	return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
+}
+
+// Extension represents an extension in a message.
+type Extension struct {
+	// When an extension is stored in a message using SetExtension
+	// only desc and value are set. When the message is marshaled
+	// enc will be set to the encoded form of the message.
+	//
+	// When a message is unmarshaled and contains extensions, each
+	// extension will have only enc set. When such an extension is
+	// accessed using GetExtension (or GetExtensions) desc and value
+	// will be set.
+	desc  *ExtensionDesc
+	value interface{}
+	enc   []byte
+}
+
+// SetRawExtension is for testing only.
+func SetRawExtension(base extendableProto, id int32, b []byte) {
+	if ebase, ok := base.(extensionsMap); ok {
+		ebase.ExtensionMap()[id] = Extension{enc: b}
+	} else if ebase, ok := base.(extensionsBytes); ok {
+		clearExtension(base, id)
+		ext := ebase.GetExtensions()
+		*ext = append(*ext, b...)
+	} else {
+		panic("unreachable")
+	}
+}
+
+// isExtensionField returns true iff the given field number is in an extension range.
+func isExtensionField(pb extendableProto, field int32) bool {
+	for _, er := range pb.ExtensionRangeArray() {
+		if er.Start <= field && field <= er.End {
+			return true
+		}
+	}
+	return false
+}
+
+// checkExtensionTypes checks that the given extension is valid for pb.
+func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
+	// Check the extended type.
+	if a, b := reflect.TypeOf(pb), reflect.TypeOf(extension.ExtendedType); a != b {
+		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
+	}
+	// Check the range.
+	if !isExtensionField(pb, extension.Field) {
+		return errors.New("proto: bad extension number; not in declared ranges")
+	}
+	return nil
+}
+
+// extPropKey is sufficient to uniquely identify an extension.
+type extPropKey struct {
+	base  reflect.Type
+	field int32
+}
+
+var extProp = struct {
+	sync.RWMutex
+	m map[extPropKey]*Properties
+}{
+	m: make(map[extPropKey]*Properties),
+}
+
+func extensionProperties(ed *ExtensionDesc) *Properties {
+	key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
+
+	extProp.RLock()
+	if prop, ok := extProp.m[key]; ok {
+		extProp.RUnlock()
+		return prop
+	}
+	extProp.RUnlock()
+
+	extProp.Lock()
+	defer extProp.Unlock()
+	// Check again.
+	if prop, ok := extProp.m[key]; ok {
+		return prop
+	}
+
+	prop := new(Properties)
+	prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
+	extProp.m[key] = prop
+	return prop
+}
+
+// encodeExtensionMap encodes any unmarshaled (unencoded) extensions in m.
+func encodeExtensionMap(m map[int32]Extension) error {
+	for k, e := range m {
+		err := encodeExtension(&e)
+		if err != nil {
+			return err
+		}
+		m[k] = e
+	}
+	return nil
+}
+
+func encodeExtension(e *Extension) error {
+	if e.value == nil || e.desc == nil {
+		// Extension is only in its encoded form.
+		return nil
+	}
+	// We don't skip extensions that have an encoded form set,
+	// because the extension value may have been mutated after
+	// the last time this function was called.
+
+	et := reflect.TypeOf(e.desc.ExtensionType)
+	props := extensionProperties(e.desc)
+
+	p := NewBuffer(nil)
+	// If e.value has type T, the encoder expects a *struct{ X T }.
+	// Pass a *T with a zero field and hope it all works out.
+	x := reflect.New(et)
+	x.Elem().Set(reflect.ValueOf(e.value))
+	if err := props.enc(p, props, toStructPointer(x)); err != nil {
+		return err
+	}
+	e.enc = p.buf
+	return nil
+}
+
+func sizeExtensionMap(m map[int32]Extension) (n int) {
+	for _, e := range m {
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			n += len(e.enc)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		et := reflect.TypeOf(e.desc.ExtensionType)
+		props := extensionProperties(e.desc)
+
+		// If e.value has type T, the encoder expects a *struct{ X T }.
+		// Pass a *T with a zero field and hope it all works out.
+		x := reflect.New(et)
+		x.Elem().Set(reflect.ValueOf(e.value))
+		n += props.size(props, toStructPointer(x))
+	}
+	return
+}
+
+// HasExtension returns whether the given extension is present in pb.
+func HasExtension(pb extendableProto, extension *ExtensionDesc) bool {
+	// TODO: Check types, field numbers, etc.?
+	if epb, doki := pb.(extensionsMap); doki {
+		_, ok := epb.ExtensionMap()[extension.Field]
+		return ok
+	} else if epb, doki := pb.(extensionsBytes); doki {
+		ext := epb.GetExtensions()
+		buf := *ext
+		o := 0
+		for o < len(buf) {
+			tag, n := DecodeVarint(buf[o:])
+			fieldNum := int32(tag >> 3)
+			if int32(fieldNum) == extension.Field {
+				return true
+			}
+			wireType := int(tag & 0x7)
+			o += n
+			l, err := size(buf[o:], wireType)
+			if err != nil {
+				return false
+			}
+			o += l
+		}
+		return false
+	}
+	panic("unreachable")
+}
+
+func deleteExtension(pb extensionsBytes, theFieldNum int32, offset int) int {
+	ext := pb.GetExtensions()
+	for offset < len(*ext) {
+		tag, n1 := DecodeVarint((*ext)[offset:])
+		fieldNum := int32(tag >> 3)
+		wireType := int(tag & 0x7)
+		n2, err := size((*ext)[offset+n1:], wireType)
+		if err != nil {
+			panic(err)
+		}
+		newOffset := offset + n1 + n2
+		if fieldNum == theFieldNum {
+			*ext = append((*ext)[:offset], (*ext)[newOffset:]...)
+			return offset
+		}
+		offset = newOffset
+	}
+	return -1
+}
+
+func clearExtension(pb extendableProto, fieldNum int32) {
+	if epb, doki := pb.(extensionsMap); doki {
+		delete(epb.ExtensionMap(), fieldNum)
+	} else if epb, doki := pb.(extensionsBytes); doki {
+		offset := 0
+		for offset != -1 {
+			offset = deleteExtension(epb, fieldNum, offset)
+		}
+	} else {
+		panic("unreachable")
+	}
+}
+
+// ClearExtension removes the given extension from pb.
+func ClearExtension(pb extendableProto, extension *ExtensionDesc) {
+	// TODO: Check types, field numbers, etc.?
+	clearExtension(pb, extension.Field)
+}
+
+// GetExtension parses and returns the given extension of pb.
+// If the extension is not present it returns ErrMissingExtension.
+func GetExtension(pb extendableProto, extension *ExtensionDesc) (interface{}, error) {
+	if err := checkExtensionTypes(pb, extension); err != nil {
+		return nil, err
+	}
+
+	if epb, doki := pb.(extensionsMap); doki {
+		emap := epb.ExtensionMap()
+		e, ok := emap[extension.Field]
+		if !ok {
+			// defaultExtensionValue returns the default value or
+			// ErrMissingExtension if there is no default.
+			return defaultExtensionValue(extension)
+		}
+		if e.value != nil {
+			// Already decoded. Check the descriptor, though.
+			if e.desc != extension {
+				// This shouldn't happen. If it does, it means that
+				// GetExtension was called twice with two different
+				// descriptors with the same field number.
+				return nil, errors.New("proto: descriptor conflict")
+			}
+			return e.value, nil
+		}
+
+		v, err := decodeExtension(e.enc, extension)
+		if err != nil {
+			return nil, err
+		}
+
+		// Remember the decoded version and drop the encoded version.
+		// That way it is safe to mutate what we return.
+		e.value = v
+		e.desc = extension
+		e.enc = nil
+		emap[extension.Field] = e
+		return e.value, nil
+	} else if epb, doki := pb.(extensionsBytes); doki {
+		ext := epb.GetExtensions()
+		o := 0
+		for o < len(*ext) {
+			tag, n := DecodeVarint((*ext)[o:])
+			fieldNum := int32(tag >> 3)
+			wireType := int(tag & 0x7)
+			l, err := size((*ext)[o+n:], wireType)
+			if err != nil {
+				return nil, err
+			}
+			if int32(fieldNum) == extension.Field {
+				v, err := decodeExtension((*ext)[o:o+n+l], extension)
+				if err != nil {
+					return nil, err
+				}
+				return v, nil
+			}
+			o += n + l
+		}
+		return defaultExtensionValue(extension)
+	}
+	panic("unreachable")
+}
+
+// defaultExtensionValue returns the default value for extension.
+// If no default for an extension is defined ErrMissingExtension is returned.
+func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
+	t := reflect.TypeOf(extension.ExtensionType)
+	props := extensionProperties(extension)
+
+	sf, _, err := fieldDefault(t, props)
+	if err != nil {
+		return nil, err
+	}
+
+	if sf == nil || sf.value == nil {
+		// There is no default value.
+		return nil, ErrMissingExtension
+	}
+
+	if t.Kind() != reflect.Ptr {
+		// We do not need to return a Ptr, we can directly return sf.value.
+		return sf.value, nil
+	}
+
+	// We need to return an interface{} that is a pointer to sf.value.
+	value := reflect.New(t).Elem()
+	value.Set(reflect.New(value.Type().Elem()))
+	if sf.kind == reflect.Int32 {
+		// We may have an int32 or an enum, but the underlying data is int32.
+		// Since we can't set an int32 into a non int32 reflect.value directly
+		// set it as a int32.
+		value.Elem().SetInt(int64(sf.value.(int32)))
+	} else {
+		value.Elem().Set(reflect.ValueOf(sf.value))
+	}
+	return value.Interface(), nil
+}
+
+// decodeExtension decodes an extension encoded in b.
+func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
+	o := NewBuffer(b)
+
+	t := reflect.TypeOf(extension.ExtensionType)
+
+	props := extensionProperties(extension)
+
+	// t is a pointer to a struct, pointer to basic type or a slice.
+	// Allocate a "field" to store the pointer/slice itself; the
+	// pointer/slice will be stored here. We pass
+	// the address of this field to props.dec.
+	// This passes a zero field and a *t and lets props.dec
+	// interpret it as a *struct{ x t }.
+	value := reflect.New(t).Elem()
+
+	for {
+		// Discard wire type and field number varint. It isn't needed.
+		if _, err := o.DecodeVarint(); err != nil {
+			return nil, err
+		}
+
+		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
+			return nil, err
+		}
+
+		if o.index >= len(o.buf) {
+			break
+		}
+	}
+	return value.Interface(), nil
+}
+
+// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
+// The returned slice has the same length as es; missing extensions will appear as nil elements.
+func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
+	epb, ok := pb.(extendableProto)
+	if !ok {
+		err = errors.New("proto: not an extendable proto")
+		return
+	}
+	extensions = make([]interface{}, len(es))
+	for i, e := range es {
+		extensions[i], err = GetExtension(epb, e)
+		if err == ErrMissingExtension {
+			err = nil
+		}
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+// SetExtension sets the specified extension of pb to the specified value.
+func SetExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
+	if err := checkExtensionTypes(pb, extension); err != nil {
+		return err
+	}
+	typ := reflect.TypeOf(extension.ExtensionType)
+	if typ != reflect.TypeOf(value) {
+		return errors.New("proto: bad extension value type")
+	}
+	// nil extension values need to be caught early, because the
+	// encoder can't distinguish an ErrNil due to a nil extension
+	// from an ErrNil due to a missing field. Extensions are
+	// always optional, so the encoder would just swallow the error
+	// and drop all the extensions from the encoded message.
+	if reflect.ValueOf(value).IsNil() {
+		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
+	}
+	return setExtension(pb, extension, value)
+}
+
+func setExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
+	if epb, doki := pb.(extensionsMap); doki {
+		epb.ExtensionMap()[extension.Field] = Extension{desc: extension, value: value}
+	} else if epb, doki := pb.(extensionsBytes); doki {
+		ClearExtension(pb, extension)
+		ext := epb.GetExtensions()
+		et := reflect.TypeOf(extension.ExtensionType)
+		props := extensionProperties(extension)
+		p := NewBuffer(nil)
+		x := reflect.New(et)
+		x.Elem().Set(reflect.ValueOf(value))
+		if err := props.enc(p, props, toStructPointer(x)); err != nil {
+			return err
+		}
+		*ext = append(*ext, p.buf...)
+	}
+	return nil
+}
+
+// A global registry of extensions.
+// The generated code will register the generated descriptors by calling RegisterExtension.
+
+var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
+
+// RegisterExtension is called from the generated code.
+func RegisterExtension(desc *ExtensionDesc) {
+	st := reflect.TypeOf(desc.ExtendedType).Elem()
+	m := extensionMaps[st]
+	if m == nil {
+		m = make(map[int32]*ExtensionDesc)
+		extensionMaps[st] = m
+	}
+	if _, ok := m[desc.Field]; ok {
+		panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
+	}
+	m[desc.Field] = desc
+}
+
+// RegisteredExtensions returns a map of the registered extensions of a
+// protocol buffer struct, indexed by the extension number.
+// The argument pb should be a nil pointer to the struct type.
+func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
+	return extensionMaps[reflect.TypeOf(pb).Elem()]
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go b/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
new file mode 100644
index 0000000000..bd55fb68b6
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
@@ -0,0 +1,221 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"reflect"
+	"sort"
+	"strings"
+)
+
+func GetBoolExtension(pb extendableProto, extension *ExtensionDesc, ifnotset bool) bool {
+	if reflect.ValueOf(pb).IsNil() {
+		return ifnotset
+	}
+	value, err := GetExtension(pb, extension)
+	if err != nil {
+		return ifnotset
+	}
+	if value == nil {
+		return ifnotset
+	}
+	if value.(*bool) == nil {
+		return ifnotset
+	}
+	return *(value.(*bool))
+}
+
+func (this *Extension) Equal(that *Extension) bool {
+	return bytes.Equal(this.enc, that.enc)
+}
+
+func SizeOfExtensionMap(m map[int32]Extension) (n int) {
+	return sizeExtensionMap(m)
+}
+
+type sortableMapElem struct {
+	field int32
+	ext   Extension
+}
+
+func newSortableExtensionsFromMap(m map[int32]Extension) sortableExtensions {
+	s := make(sortableExtensions, 0, len(m))
+	for k, v := range m {
+		s = append(s, &sortableMapElem{field: k, ext: v})
+	}
+	return s
+}
+
+type sortableExtensions []*sortableMapElem
+
+func (this sortableExtensions) Len() int { return len(this) }
+
+func (this sortableExtensions) Swap(i, j int) { this[i], this[j] = this[j], this[i] }
+
+func (this sortableExtensions) Less(i, j int) bool { return this[i].field < this[j].field }
+
+func (this sortableExtensions) String() string {
+	sort.Sort(this)
+	ss := make([]string, len(this))
+	for i := range this {
+		ss[i] = fmt.Sprintf("%d: %v", this[i].field, this[i].ext)
+	}
+	return "map[" + strings.Join(ss, ",") + "]"
+}
+
+func StringFromExtensionsMap(m map[int32]Extension) string {
+	return newSortableExtensionsFromMap(m).String()
+}
+
+func StringFromExtensionsBytes(ext []byte) string {
+	m, err := BytesToExtensionsMap(ext)
+	if err != nil {
+		panic(err)
+	}
+	return StringFromExtensionsMap(m)
+}
+
+func EncodeExtensionMap(m map[int32]Extension, data []byte) (n int, err error) {
+	if err := encodeExtensionMap(m); err != nil {
+		return 0, err
+	}
+	keys := make([]int, 0, len(m))
+	for k := range m {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+	for _, k := range keys {
+		n += copy(data[n:], m[int32(k)].enc)
+	}
+	return n, nil
+}
+
+func GetRawExtension(m map[int32]Extension, id int32) ([]byte, error) {
+	if m[id].value == nil || m[id].desc == nil {
+		return m[id].enc, nil
+	}
+	if err := encodeExtensionMap(m); err != nil {
+		return nil, err
+	}
+	return m[id].enc, nil
+}
+
+func size(buf []byte, wire int) (int, error) {
+	switch wire {
+	case WireVarint:
+		_, n := DecodeVarint(buf)
+		return n, nil
+	case WireFixed64:
+		return 8, nil
+	case WireBytes:
+		v, n := DecodeVarint(buf)
+		return int(v) + n, nil
+	case WireFixed32:
+		return 4, nil
+	case WireStartGroup:
+		offset := 0
+		for {
+			u, n := DecodeVarint(buf[offset:])
+			fwire := int(u & 0x7)
+			offset += n
+			if fwire == WireEndGroup {
+				return offset, nil
+			}
+			s, err := size(buf[offset:], wire)
+			if err != nil {
+				return 0, err
+			}
+			offset += s
+		}
+	}
+	return 0, fmt.Errorf("proto: can't get size for unknown wire type %d", wire)
+}
+
+func BytesToExtensionsMap(buf []byte) (map[int32]Extension, error) {
+	m := make(map[int32]Extension)
+	i := 0
+	for i < len(buf) {
+		tag, n := DecodeVarint(buf[i:])
+		if n <= 0 {
+			return nil, fmt.Errorf("unable to decode varint")
+		}
+		fieldNum := int32(tag >> 3)
+		wireType := int(tag & 0x7)
+		l, err := size(buf[i+n:], wireType)
+		if err != nil {
+			return nil, err
+		}
+		end := i + int(l) + n
+		m[int32(fieldNum)] = Extension{enc: buf[i:end]}
+		i = end
+	}
+	return m, nil
+}
+
+func NewExtension(e []byte) Extension {
+	ee := Extension{enc: make([]byte, len(e))}
+	copy(ee.enc, e)
+	return ee
+}
+
+func (this Extension) GoString() string {
+	if this.enc == nil {
+		if err := encodeExtension(&this); err != nil {
+			panic(err)
+		}
+	}
+	return fmt.Sprintf("proto.NewExtension(%#v)", this.enc)
+}
+
+func SetUnsafeExtension(pb extendableProto, fieldNum int32, value interface{}) error {
+	typ := reflect.TypeOf(pb).Elem()
+	ext, ok := extensionMaps[typ]
+	if !ok {
+		return fmt.Errorf("proto: bad extended type; %s is not extendable", typ.String())
+	}
+	desc, ok := ext[fieldNum]
+	if !ok {
+		return errors.New("proto: bad extension number; not in declared ranges")
+	}
+	return setExtension(pb, desc, value)
+}
+
+func GetUnsafeExtension(pb extendableProto, fieldNum int32) (interface{}, error) {
+	typ := reflect.TypeOf(pb).Elem()
+	ext, ok := extensionMaps[typ]
+	if !ok {
+		return nil, fmt.Errorf("proto: bad extended type; %s is not extendable", typ.String())
+	}
+	desc, ok := ext[fieldNum]
+	if !ok {
+		return nil, fmt.Errorf("unregistered field number %d", fieldNum)
+	}
+	return GetExtension(pb, desc)
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/lib.go b/vendor/github.com/gogo/protobuf/proto/lib.go
new file mode 100644
index 0000000000..2e35ae2d2a
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/lib.go
@@ -0,0 +1,894 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+Package proto converts data structures to and from the wire format of
+protocol buffers.  It works in concert with the Go source code generated
+for .proto files by the protocol compiler.
+
+A summary of the properties of the protocol buffer interface
+for a protocol buffer variable v:
+
+  - Names are turned from camel_case to CamelCase for export.
+  - There are no methods on v to set fields; just treat
+	them as structure fields.
+  - There are getters that return a field's value if set,
+	and return the field's default value if unset.
+	The getters work even if the receiver is a nil message.
+  - The zero value for a struct is its correct initialization state.
+	All desired fields must be set before marshaling.
+  - A Reset() method will restore a protobuf struct to its zero state.
+  - Non-repeated fields are pointers to the values; nil means unset.
+	That is, optional or required field int32 f becomes F *int32.
+  - Repeated fields are slices.
+  - Helper functions are available to aid the setting of fields.
+	msg.Foo = proto.String("hello") // set field
+  - Constants are defined to hold the default values of all fields that
+	have them.  They have the form Default_StructName_FieldName.
+	Because the getter methods handle defaulted values,
+	direct use of these constants should be rare.
+  - Enums are given type names and maps from names to values.
+	Enum values are prefixed by the enclosing message's name, or by the
+	enum's type name if it is a top-level enum. Enum types have a String
+	method, and a Enum method to assist in message construction.
+  - Nested messages, groups and enums have type names prefixed with the name of
+	the surrounding message type.
+  - Extensions are given descriptor names that start with E_,
+	followed by an underscore-delimited list of the nested messages
+	that contain it (if any) followed by the CamelCased name of the
+	extension field itself.  HasExtension, ClearExtension, GetExtension
+	and SetExtension are functions for manipulating extensions.
+  - Oneof field sets are given a single field in their message,
+	with distinguished wrapper types for each possible field value.
+  - Marshal and Unmarshal are functions to encode and decode the wire format.
+
+When the .proto file specifies `syntax="proto3"`, there are some differences:
+
+  - Non-repeated fields of non-message type are values instead of pointers.
+  - Getters are only generated for message and oneof fields.
+  - Enum types do not get an Enum method.
+
+The simplest way to describe this is to see an example.
+Given file test.proto, containing
+
+	package example;
+
+	enum FOO { X = 17; }
+
+	message Test {
+	  required string label = 1;
+	  optional int32 type = 2 [default=77];
+	  repeated int64 reps = 3;
+	  optional group OptionalGroup = 4 {
+	    required string RequiredField = 5;
+	  }
+	  oneof union {
+	    int32 number = 6;
+	    string name = 7;
+	  }
+	}
+
+The resulting file, test.pb.go, is:
+
+	package example
+
+	import proto "github.com/gogo/protobuf/proto"
+	import math "math"
+
+	type FOO int32
+	const (
+		FOO_X FOO = 17
+	)
+	var FOO_name = map[int32]string{
+		17: "X",
+	}
+	var FOO_value = map[string]int32{
+		"X": 17,
+	}
+
+	func (x FOO) Enum() *FOO {
+		p := new(FOO)
+		*p = x
+		return p
+	}
+	func (x FOO) String() string {
+		return proto.EnumName(FOO_name, int32(x))
+	}
+	func (x *FOO) UnmarshalJSON(data []byte) error {
+		value, err := proto.UnmarshalJSONEnum(FOO_value, data)
+		if err != nil {
+			return err
+		}
+		*x = FOO(value)
+		return nil
+	}
+
+	type Test struct {
+		Label         *string             `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
+		Type          *int32              `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
+		Reps          []int64             `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
+		Optionalgroup *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
+		// Types that are valid to be assigned to Union:
+		//	*Test_Number
+		//	*Test_Name
+		Union            isTest_Union `protobuf_oneof:"union"`
+		XXX_unrecognized []byte       `json:"-"`
+	}
+	func (m *Test) Reset()         { *m = Test{} }
+	func (m *Test) String() string { return proto.CompactTextString(m) }
+	func (*Test) ProtoMessage() {}
+
+	type isTest_Union interface {
+		isTest_Union()
+	}
+
+	type Test_Number struct {
+		Number int32 `protobuf:"varint,6,opt,name=number"`
+	}
+	type Test_Name struct {
+		Name string `protobuf:"bytes,7,opt,name=name"`
+	}
+
+	func (*Test_Number) isTest_Union() {}
+	func (*Test_Name) isTest_Union()   {}
+
+	func (m *Test) GetUnion() isTest_Union {
+		if m != nil {
+			return m.Union
+		}
+		return nil
+	}
+	const Default_Test_Type int32 = 77
+
+	func (m *Test) GetLabel() string {
+		if m != nil && m.Label != nil {
+			return *m.Label
+		}
+		return ""
+	}
+
+	func (m *Test) GetType() int32 {
+		if m != nil && m.Type != nil {
+			return *m.Type
+		}
+		return Default_Test_Type
+	}
+
+	func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
+		if m != nil {
+			return m.Optionalgroup
+		}
+		return nil
+	}
+
+	type Test_OptionalGroup struct {
+		RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
+	}
+	func (m *Test_OptionalGroup) Reset()         { *m = Test_OptionalGroup{} }
+	func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
+
+	func (m *Test_OptionalGroup) GetRequiredField() string {
+		if m != nil && m.RequiredField != nil {
+			return *m.RequiredField
+		}
+		return ""
+	}
+
+	func (m *Test) GetNumber() int32 {
+		if x, ok := m.GetUnion().(*Test_Number); ok {
+			return x.Number
+		}
+		return 0
+	}
+
+	func (m *Test) GetName() string {
+		if x, ok := m.GetUnion().(*Test_Name); ok {
+			return x.Name
+		}
+		return ""
+	}
+
+	func init() {
+		proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
+	}
+
+To create and play with a Test object:
+
+	package main
+
+	import (
+		"log"
+
+		"github.com/gogo/protobuf/proto"
+		pb "./example.pb"
+	)
+
+	func main() {
+		test := &pb.Test{
+			Label: proto.String("hello"),
+			Type:  proto.Int32(17),
+			Reps:  []int64{1, 2, 3},
+			Optionalgroup: &pb.Test_OptionalGroup{
+				RequiredField: proto.String("good bye"),
+			},
+			Union: &pb.Test_Name{"fred"},
+		}
+		data, err := proto.Marshal(test)
+		if err != nil {
+			log.Fatal("marshaling error: ", err)
+		}
+		newTest := &pb.Test{}
+		err = proto.Unmarshal(data, newTest)
+		if err != nil {
+			log.Fatal("unmarshaling error: ", err)
+		}
+		// Now test and newTest contain the same data.
+		if test.GetLabel() != newTest.GetLabel() {
+			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
+		}
+		// Use a type switch to determine which oneof was set.
+		switch u := test.Union.(type) {
+		case *pb.Test_Number: // u.Number contains the number.
+		case *pb.Test_Name: // u.Name contains the string.
+		}
+		// etc.
+	}
+*/
+package proto
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"reflect"
+	"sort"
+	"strconv"
+	"sync"
+)
+
+// Message is implemented by generated protocol buffer messages.
+type Message interface {
+	Reset()
+	String() string
+	ProtoMessage()
+}
+
+// Stats records allocation details about the protocol buffer encoders
+// and decoders.  Useful for tuning the library itself.
+type Stats struct {
+	Emalloc uint64 // mallocs in encode
+	Dmalloc uint64 // mallocs in decode
+	Encode  uint64 // number of encodes
+	Decode  uint64 // number of decodes
+	Chit    uint64 // number of cache hits
+	Cmiss   uint64 // number of cache misses
+	Size    uint64 // number of sizes
+}
+
+// Set to true to enable stats collection.
+const collectStats = false
+
+var stats Stats
+
+// GetStats returns a copy of the global Stats structure.
+func GetStats() Stats { return stats }
+
+// A Buffer is a buffer manager for marshaling and unmarshaling
+// protocol buffers.  It may be reused between invocations to
+// reduce memory usage.  It is not necessary to use a Buffer;
+// the global functions Marshal and Unmarshal create a
+// temporary Buffer and are fine for most applications.
+type Buffer struct {
+	buf   []byte // encode/decode byte stream
+	index int    // write point
+
+	// pools of basic types to amortize allocation.
+	bools   []bool
+	uint32s []uint32
+	uint64s []uint64
+
+	// extra pools, only used with pointer_reflect.go
+	int32s   []int32
+	int64s   []int64
+	float32s []float32
+	float64s []float64
+}
+
+// NewBuffer allocates a new Buffer and initializes its internal data to
+// the contents of the argument slice.
+func NewBuffer(e []byte) *Buffer {
+	return &Buffer{buf: e}
+}
+
+// Reset resets the Buffer, ready for marshaling a new protocol buffer.
+func (p *Buffer) Reset() {
+	p.buf = p.buf[0:0] // for reading/writing
+	p.index = 0        // for reading
+}
+
+// SetBuf replaces the internal buffer with the slice,
+// ready for unmarshaling the contents of the slice.
+func (p *Buffer) SetBuf(s []byte) {
+	p.buf = s
+	p.index = 0
+}
+
+// Bytes returns the contents of the Buffer.
+func (p *Buffer) Bytes() []byte { return p.buf }
+
+/*
+ * Helper routines for simplifying the creation of optional fields of basic type.
+ */
+
+// Bool is a helper routine that allocates a new bool value
+// to store v and returns a pointer to it.
+func Bool(v bool) *bool {
+	return &v
+}
+
+// Int32 is a helper routine that allocates a new int32 value
+// to store v and returns a pointer to it.
+func Int32(v int32) *int32 {
+	return &v
+}
+
+// Int is a helper routine that allocates a new int32 value
+// to store v and returns a pointer to it, but unlike Int32
+// its argument value is an int.
+func Int(v int) *int32 {
+	p := new(int32)
+	*p = int32(v)
+	return p
+}
+
+// Int64 is a helper routine that allocates a new int64 value
+// to store v and returns a pointer to it.
+func Int64(v int64) *int64 {
+	return &v
+}
+
+// Float32 is a helper routine that allocates a new float32 value
+// to store v and returns a pointer to it.
+func Float32(v float32) *float32 {
+	return &v
+}
+
+// Float64 is a helper routine that allocates a new float64 value
+// to store v and returns a pointer to it.
+func Float64(v float64) *float64 {
+	return &v
+}
+
+// Uint32 is a helper routine that allocates a new uint32 value
+// to store v and returns a pointer to it.
+func Uint32(v uint32) *uint32 {
+	return &v
+}
+
+// Uint64 is a helper routine that allocates a new uint64 value
+// to store v and returns a pointer to it.
+func Uint64(v uint64) *uint64 {
+	return &v
+}
+
+// String is a helper routine that allocates a new string value
+// to store v and returns a pointer to it.
+func String(v string) *string {
+	return &v
+}
+
+// EnumName is a helper function to simplify printing protocol buffer enums
+// by name.  Given an enum map and a value, it returns a useful string.
+func EnumName(m map[int32]string, v int32) string {
+	s, ok := m[v]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(v))
+}
+
+// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
+// from their JSON-encoded representation. Given a map from the enum's symbolic
+// names to its int values, and a byte buffer containing the JSON-encoded
+// value, it returns an int32 that can be cast to the enum type by the caller.
+//
+// The function can deal with both JSON representations, numeric and symbolic.
+func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
+	if data[0] == '"' {
+		// New style: enums are strings.
+		var repr string
+		if err := json.Unmarshal(data, &repr); err != nil {
+			return -1, err
+		}
+		val, ok := m[repr]
+		if !ok {
+			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
+		}
+		return val, nil
+	}
+	// Old style: enums are ints.
+	var val int32
+	if err := json.Unmarshal(data, &val); err != nil {
+		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
+	}
+	return val, nil
+}
+
+// DebugPrint dumps the encoded data in b in a debugging format with a header
+// including the string s. Used in testing but made available for general debugging.
+func (p *Buffer) DebugPrint(s string, b []byte) {
+	var u uint64
+
+	obuf := p.buf
+	sindex := p.index
+	p.buf = b
+	p.index = 0
+	depth := 0
+
+	fmt.Printf("\n--- %s ---\n", s)
+
+out:
+	for {
+		for i := 0; i < depth; i++ {
+			fmt.Print("  ")
+		}
+
+		index := p.index
+		if index == len(p.buf) {
+			break
+		}
+
+		op, err := p.DecodeVarint()
+		if err != nil {
+			fmt.Printf("%3d: fetching op err %v\n", index, err)
+			break out
+		}
+		tag := op >> 3
+		wire := op & 7
+
+		switch wire {
+		default:
+			fmt.Printf("%3d: t=%3d unknown wire=%d\n",
+				index, tag, wire)
+			break out
+
+		case WireBytes:
+			var r []byte
+
+			r, err = p.DecodeRawBytes(false)
+			if err != nil {
+				break out
+			}
+			fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
+			if len(r) <= 6 {
+				for i := 0; i < len(r); i++ {
+					fmt.Printf(" %.2x", r[i])
+				}
+			} else {
+				for i := 0; i < 3; i++ {
+					fmt.Printf(" %.2x", r[i])
+				}
+				fmt.Printf(" ..")
+				for i := len(r) - 3; i < len(r); i++ {
+					fmt.Printf(" %.2x", r[i])
+				}
+			}
+			fmt.Printf("\n")
+
+		case WireFixed32:
+			u, err = p.DecodeFixed32()
+			if err != nil {
+				fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
+				break out
+			}
+			fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
+
+		case WireFixed64:
+			u, err = p.DecodeFixed64()
+			if err != nil {
+				fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
+				break out
+			}
+			fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
+
+		case WireVarint:
+			u, err = p.DecodeVarint()
+			if err != nil {
+				fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
+				break out
+			}
+			fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
+
+		case WireStartGroup:
+			fmt.Printf("%3d: t=%3d start\n", index, tag)
+			depth++
+
+		case WireEndGroup:
+			depth--
+			fmt.Printf("%3d: t=%3d end\n", index, tag)
+		}
+	}
+
+	if depth != 0 {
+		fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
+	}
+	fmt.Printf("\n")
+
+	p.buf = obuf
+	p.index = sindex
+}
+
+// SetDefaults sets unset protocol buffer fields to their default values.
+// It only modifies fields that are both unset and have defined defaults.
+// It recursively sets default values in any non-nil sub-messages.
+func SetDefaults(pb Message) {
+	setDefaults(reflect.ValueOf(pb), true, false)
+}
+
+// v is a pointer to a struct.
+func setDefaults(v reflect.Value, recur, zeros bool) {
+	v = v.Elem()
+
+	defaultMu.RLock()
+	dm, ok := defaults[v.Type()]
+	defaultMu.RUnlock()
+	if !ok {
+		dm = buildDefaultMessage(v.Type())
+		defaultMu.Lock()
+		defaults[v.Type()] = dm
+		defaultMu.Unlock()
+	}
+
+	for _, sf := range dm.scalars {
+		f := v.Field(sf.index)
+		if !f.IsNil() {
+			// field already set
+			continue
+		}
+		dv := sf.value
+		if dv == nil && !zeros {
+			// no explicit default, and don't want to set zeros
+			continue
+		}
+		fptr := f.Addr().Interface() // **T
+		// TODO: Consider batching the allocations we do here.
+		switch sf.kind {
+		case reflect.Bool:
+			b := new(bool)
+			if dv != nil {
+				*b = dv.(bool)
+			}
+			*(fptr.(**bool)) = b
+		case reflect.Float32:
+			f := new(float32)
+			if dv != nil {
+				*f = dv.(float32)
+			}
+			*(fptr.(**float32)) = f
+		case reflect.Float64:
+			f := new(float64)
+			if dv != nil {
+				*f = dv.(float64)
+			}
+			*(fptr.(**float64)) = f
+		case reflect.Int32:
+			// might be an enum
+			if ft := f.Type(); ft != int32PtrType {
+				// enum
+				f.Set(reflect.New(ft.Elem()))
+				if dv != nil {
+					f.Elem().SetInt(int64(dv.(int32)))
+				}
+			} else {
+				// int32 field
+				i := new(int32)
+				if dv != nil {
+					*i = dv.(int32)
+				}
+				*(fptr.(**int32)) = i
+			}
+		case reflect.Int64:
+			i := new(int64)
+			if dv != nil {
+				*i = dv.(int64)
+			}
+			*(fptr.(**int64)) = i
+		case reflect.String:
+			s := new(string)
+			if dv != nil {
+				*s = dv.(string)
+			}
+			*(fptr.(**string)) = s
+		case reflect.Uint8:
+			// exceptional case: []byte
+			var b []byte
+			if dv != nil {
+				db := dv.([]byte)
+				b = make([]byte, len(db))
+				copy(b, db)
+			} else {
+				b = []byte{}
+			}
+			*(fptr.(*[]byte)) = b
+		case reflect.Uint32:
+			u := new(uint32)
+			if dv != nil {
+				*u = dv.(uint32)
+			}
+			*(fptr.(**uint32)) = u
+		case reflect.Uint64:
+			u := new(uint64)
+			if dv != nil {
+				*u = dv.(uint64)
+			}
+			*(fptr.(**uint64)) = u
+		default:
+			log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
+		}
+	}
+
+	for _, ni := range dm.nested {
+		f := v.Field(ni)
+		// f is *T or []*T or map[T]*T
+		switch f.Kind() {
+		case reflect.Ptr:
+			if f.IsNil() {
+				continue
+			}
+			setDefaults(f, recur, zeros)
+
+		case reflect.Slice:
+			for i := 0; i < f.Len(); i++ {
+				e := f.Index(i)
+				if e.IsNil() {
+					continue
+				}
+				setDefaults(e, recur, zeros)
+			}
+
+		case reflect.Map:
+			for _, k := range f.MapKeys() {
+				e := f.MapIndex(k)
+				if e.IsNil() {
+					continue
+				}
+				setDefaults(e, recur, zeros)
+			}
+		}
+	}
+}
+
+var (
+	// defaults maps a protocol buffer struct type to a slice of the fields,
+	// with its scalar fields set to their proto-declared non-zero default values.
+	defaultMu sync.RWMutex
+	defaults  = make(map[reflect.Type]defaultMessage)
+
+	int32PtrType = reflect.TypeOf((*int32)(nil))
+)
+
+// defaultMessage represents information about the default values of a message.
+type defaultMessage struct {
+	scalars []scalarField
+	nested  []int // struct field index of nested messages
+}
+
+type scalarField struct {
+	index int          // struct field index
+	kind  reflect.Kind // element type (the T in *T or []T)
+	value interface{}  // the proto-declared default value, or nil
+}
+
+// t is a struct type.
+func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
+	sprop := GetProperties(t)
+	for _, prop := range sprop.Prop {
+		fi, ok := sprop.decoderTags.get(prop.Tag)
+		if !ok {
+			// XXX_unrecognized
+			continue
+		}
+		ft := t.Field(fi).Type
+
+		sf, nested, err := fieldDefault(ft, prop)
+		switch {
+		case err != nil:
+			log.Print(err)
+		case nested:
+			dm.nested = append(dm.nested, fi)
+		case sf != nil:
+			sf.index = fi
+			dm.scalars = append(dm.scalars, *sf)
+		}
+	}
+
+	return dm
+}
+
+// fieldDefault returns the scalarField for field type ft.
+// sf will be nil if the field can not have a default.
+// nestedMessage will be true if this is a nested message.
+// Note that sf.index is not set on return.
+func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
+	var canHaveDefault bool
+	switch ft.Kind() {
+	case reflect.Ptr:
+		if ft.Elem().Kind() == reflect.Struct {
+			nestedMessage = true
+		} else {
+			canHaveDefault = true // proto2 scalar field
+		}
+
+	case reflect.Slice:
+		switch ft.Elem().Kind() {
+		case reflect.Ptr:
+			nestedMessage = true // repeated message
+		case reflect.Uint8:
+			canHaveDefault = true // bytes field
+		}
+
+	case reflect.Map:
+		if ft.Elem().Kind() == reflect.Ptr {
+			nestedMessage = true // map with message values
+		}
+	}
+
+	if !canHaveDefault {
+		if nestedMessage {
+			return nil, true, nil
+		}
+		return nil, false, nil
+	}
+
+	// We now know that ft is a pointer or slice.
+	sf = &scalarField{kind: ft.Elem().Kind()}
+
+	// scalar fields without defaults
+	if !prop.HasDefault {
+		return sf, false, nil
+	}
+
+	// a scalar field: either *T or []byte
+	switch ft.Elem().Kind() {
+	case reflect.Bool:
+		x, err := strconv.ParseBool(prop.Default)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	case reflect.Float32:
+		x, err := strconv.ParseFloat(prop.Default, 32)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
+		}
+		sf.value = float32(x)
+	case reflect.Float64:
+		x, err := strconv.ParseFloat(prop.Default, 64)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	case reflect.Int32:
+		x, err := strconv.ParseInt(prop.Default, 10, 32)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
+		}
+		sf.value = int32(x)
+	case reflect.Int64:
+		x, err := strconv.ParseInt(prop.Default, 10, 64)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	case reflect.String:
+		sf.value = prop.Default
+	case reflect.Uint8:
+		// []byte (not *uint8)
+		sf.value = []byte(prop.Default)
+	case reflect.Uint32:
+		x, err := strconv.ParseUint(prop.Default, 10, 32)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
+		}
+		sf.value = uint32(x)
+	case reflect.Uint64:
+		x, err := strconv.ParseUint(prop.Default, 10, 64)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	default:
+		return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
+	}
+
+	return sf, false, nil
+}
+
+// Map fields may have key types of non-float scalars, strings and enums.
+// The easiest way to sort them in some deterministic order is to use fmt.
+// If this turns out to be inefficient we can always consider other options,
+// such as doing a Schwartzian transform.
+
+func mapKeys(vs []reflect.Value) sort.Interface {
+	s := mapKeySorter{
+		vs: vs,
+		// default Less function: textual comparison
+		less: func(a, b reflect.Value) bool {
+			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
+		},
+	}
+
+	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
+	// numeric keys are sorted numerically.
+	if len(vs) == 0 {
+		return s
+	}
+	switch vs[0].Kind() {
+	case reflect.Int32, reflect.Int64:
+		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
+	case reflect.Uint32, reflect.Uint64:
+		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
+	}
+
+	return s
+}
+
+type mapKeySorter struct {
+	vs   []reflect.Value
+	less func(a, b reflect.Value) bool
+}
+
+func (s mapKeySorter) Len() int      { return len(s.vs) }
+func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
+func (s mapKeySorter) Less(i, j int) bool {
+	return s.less(s.vs[i], s.vs[j])
+}
+
+// isProto3Zero reports whether v is a zero proto3 value.
+func isProto3Zero(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.Bool:
+		return !v.Bool()
+	case reflect.Int32, reflect.Int64:
+		return v.Int() == 0
+	case reflect.Uint32, reflect.Uint64:
+		return v.Uint() == 0
+	case reflect.Float32, reflect.Float64:
+		return v.Float() == 0
+	case reflect.String:
+		return v.String() == ""
+	}
+	return false
+}
+
+// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
+// to assert that that code is compatible with this version of the proto package.
+const GoGoProtoPackageIsVersion1 = true
diff --git a/vendor/github.com/gogo/protobuf/proto/lib_gogo.go b/vendor/github.com/gogo/protobuf/proto/lib_gogo.go
new file mode 100644
index 0000000000..a6c2c06b23
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/lib_gogo.go
@@ -0,0 +1,40 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"encoding/json"
+	"strconv"
+)
+
+func MarshalJSONEnum(m map[int32]string, value int32) ([]byte, error) {
+	s, ok := m[value]
+	if !ok {
+		s = strconv.Itoa(int(value))
+	}
+	return json.Marshal(s)
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/message_set.go b/vendor/github.com/gogo/protobuf/proto/message_set.go
new file mode 100644
index 0000000000..e25e01e637
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/message_set.go
@@ -0,0 +1,280 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Support for message sets.
+ */
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"reflect"
+	"sort"
+)
+
+// errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
+// A message type ID is required for storing a protocol buffer in a message set.
+var errNoMessageTypeID = errors.New("proto does not have a message type ID")
+
+// The first two types (_MessageSet_Item and messageSet)
+// model what the protocol compiler produces for the following protocol message:
+//   message MessageSet {
+//     repeated group Item = 1 {
+//       required int32 type_id = 2;
+//       required string message = 3;
+//     };
+//   }
+// That is the MessageSet wire format. We can't use a proto to generate these
+// because that would introduce a circular dependency between it and this package.
+
+type _MessageSet_Item struct {
+	TypeId  *int32 `protobuf:"varint,2,req,name=type_id"`
+	Message []byte `protobuf:"bytes,3,req,name=message"`
+}
+
+type messageSet struct {
+	Item             []*_MessageSet_Item `protobuf:"group,1,rep"`
+	XXX_unrecognized []byte
+	// TODO: caching?
+}
+
+// Make sure messageSet is a Message.
+var _ Message = (*messageSet)(nil)
+
+// messageTypeIder is an interface satisfied by a protocol buffer type
+// that may be stored in a MessageSet.
+type messageTypeIder interface {
+	MessageTypeId() int32
+}
+
+func (ms *messageSet) find(pb Message) *_MessageSet_Item {
+	mti, ok := pb.(messageTypeIder)
+	if !ok {
+		return nil
+	}
+	id := mti.MessageTypeId()
+	for _, item := range ms.Item {
+		if *item.TypeId == id {
+			return item
+		}
+	}
+	return nil
+}
+
+func (ms *messageSet) Has(pb Message) bool {
+	if ms.find(pb) != nil {
+		return true
+	}
+	return false
+}
+
+func (ms *messageSet) Unmarshal(pb Message) error {
+	if item := ms.find(pb); item != nil {
+		return Unmarshal(item.Message, pb)
+	}
+	if _, ok := pb.(messageTypeIder); !ok {
+		return errNoMessageTypeID
+	}
+	return nil // TODO: return error instead?
+}
+
+func (ms *messageSet) Marshal(pb Message) error {
+	msg, err := Marshal(pb)
+	if err != nil {
+		return err
+	}
+	if item := ms.find(pb); item != nil {
+		// reuse existing item
+		item.Message = msg
+		return nil
+	}
+
+	mti, ok := pb.(messageTypeIder)
+	if !ok {
+		return errNoMessageTypeID
+	}
+
+	mtid := mti.MessageTypeId()
+	ms.Item = append(ms.Item, &_MessageSet_Item{
+		TypeId:  &mtid,
+		Message: msg,
+	})
+	return nil
+}
+
+func (ms *messageSet) Reset()         { *ms = messageSet{} }
+func (ms *messageSet) String() string { return CompactTextString(ms) }
+func (*messageSet) ProtoMessage()     {}
+
+// Support for the message_set_wire_format message option.
+
+func skipVarint(buf []byte) []byte {
+	i := 0
+	for ; buf[i]&0x80 != 0; i++ {
+	}
+	return buf[i+1:]
+}
+
+// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
+// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
+func MarshalMessageSet(m map[int32]Extension) ([]byte, error) {
+	if err := encodeExtensionMap(m); err != nil {
+		return nil, err
+	}
+
+	// Sort extension IDs to provide a deterministic encoding.
+	// See also enc_map in encode.go.
+	ids := make([]int, 0, len(m))
+	for id := range m {
+		ids = append(ids, int(id))
+	}
+	sort.Ints(ids)
+
+	ms := &messageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
+	for _, id := range ids {
+		e := m[int32(id)]
+		// Remove the wire type and field number varint, as well as the length varint.
+		msg := skipVarint(skipVarint(e.enc))
+
+		ms.Item = append(ms.Item, &_MessageSet_Item{
+			TypeId:  Int32(int32(id)),
+			Message: msg,
+		})
+	}
+	return Marshal(ms)
+}
+
+// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
+// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
+func UnmarshalMessageSet(buf []byte, m map[int32]Extension) error {
+	ms := new(messageSet)
+	if err := Unmarshal(buf, ms); err != nil {
+		return err
+	}
+	for _, item := range ms.Item {
+		id := *item.TypeId
+		msg := item.Message
+
+		// Restore wire type and field number varint, plus length varint.
+		// Be careful to preserve duplicate items.
+		b := EncodeVarint(uint64(id)<<3 | WireBytes)
+		if ext, ok := m[id]; ok {
+			// Existing data; rip off the tag and length varint
+			// so we join the new data correctly.
+			// We can assume that ext.enc is set because we are unmarshaling.
+			o := ext.enc[len(b):]   // skip wire type and field number
+			_, n := DecodeVarint(o) // calculate length of length varint
+			o = o[n:]               // skip length varint
+			msg = append(o, msg...) // join old data and new data
+		}
+		b = append(b, EncodeVarint(uint64(len(msg)))...)
+		b = append(b, msg...)
+
+		m[id] = Extension{enc: b}
+	}
+	return nil
+}
+
+// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
+// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
+func MarshalMessageSetJSON(m map[int32]Extension) ([]byte, error) {
+	var b bytes.Buffer
+	b.WriteByte('{')
+
+	// Process the map in key order for deterministic output.
+	ids := make([]int32, 0, len(m))
+	for id := range m {
+		ids = append(ids, id)
+	}
+	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
+
+	for i, id := range ids {
+		ext := m[id]
+		if i > 0 {
+			b.WriteByte(',')
+		}
+
+		msd, ok := messageSetMap[id]
+		if !ok {
+			// Unknown type; we can't render it, so skip it.
+			continue
+		}
+		fmt.Fprintf(&b, `"[%s]":`, msd.name)
+
+		x := ext.value
+		if x == nil {
+			x = reflect.New(msd.t.Elem()).Interface()
+			if err := Unmarshal(ext.enc, x.(Message)); err != nil {
+				return nil, err
+			}
+		}
+		d, err := json.Marshal(x)
+		if err != nil {
+			return nil, err
+		}
+		b.Write(d)
+	}
+	b.WriteByte('}')
+	return b.Bytes(), nil
+}
+
+// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
+// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
+func UnmarshalMessageSetJSON(buf []byte, m map[int32]Extension) error {
+	// Common-case fast path.
+	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
+		return nil
+	}
+
+	// This is fairly tricky, and it's not clear that it is needed.
+	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
+}
+
+// A global registry of types that can be used in a MessageSet.
+
+var messageSetMap = make(map[int32]messageSetDesc)
+
+type messageSetDesc struct {
+	t    reflect.Type // pointer to struct
+	name string
+}
+
+// RegisterMessageSetType is called from the generated code.
+func RegisterMessageSetType(m Message, fieldNum int32, name string) {
+	messageSetMap[fieldNum] = messageSetDesc{
+		t:    reflect.TypeOf(m),
+		name: name,
+	}
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/pointer_reflect.go b/vendor/github.com/gogo/protobuf/proto/pointer_reflect.go
new file mode 100644
index 0000000000..749919d250
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/pointer_reflect.go
@@ -0,0 +1,479 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2012 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// +build appengine
+
+// This file contains an implementation of proto field accesses using package reflect.
+// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
+// be used on App Engine.
+
+package proto
+
+import (
+	"math"
+	"reflect"
+)
+
+// A structPointer is a pointer to a struct.
+type structPointer struct {
+	v reflect.Value
+}
+
+// toStructPointer returns a structPointer equivalent to the given reflect value.
+// The reflect value must itself be a pointer to a struct.
+func toStructPointer(v reflect.Value) structPointer {
+	return structPointer{v}
+}
+
+// IsNil reports whether p is nil.
+func structPointer_IsNil(p structPointer) bool {
+	return p.v.IsNil()
+}
+
+// Interface returns the struct pointer as an interface value.
+func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
+	return p.v.Interface()
+}
+
+// A field identifies a field in a struct, accessible from a structPointer.
+// In this implementation, a field is identified by the sequence of field indices
+// passed to reflect's FieldByIndex.
+type field []int
+
+// toField returns a field equivalent to the given reflect field.
+func toField(f *reflect.StructField) field {
+	return f.Index
+}
+
+// invalidField is an invalid field identifier.
+var invalidField = field(nil)
+
+// IsValid reports whether the field identifier is valid.
+func (f field) IsValid() bool { return f != nil }
+
+// field returns the given field in the struct as a reflect value.
+func structPointer_field(p structPointer, f field) reflect.Value {
+	// Special case: an extension map entry with a value of type T
+	// passes a *T to the struct-handling code with a zero field,
+	// expecting that it will be treated as equivalent to *struct{ X T },
+	// which has the same memory layout. We have to handle that case
+	// specially, because reflect will panic if we call FieldByIndex on a
+	// non-struct.
+	if f == nil {
+		return p.v.Elem()
+	}
+
+	return p.v.Elem().FieldByIndex(f)
+}
+
+// ifield returns the given field in the struct as an interface value.
+func structPointer_ifield(p structPointer, f field) interface{} {
+	return structPointer_field(p, f).Addr().Interface()
+}
+
+// Bytes returns the address of a []byte field in the struct.
+func structPointer_Bytes(p structPointer, f field) *[]byte {
+	return structPointer_ifield(p, f).(*[]byte)
+}
+
+// BytesSlice returns the address of a [][]byte field in the struct.
+func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
+	return structPointer_ifield(p, f).(*[][]byte)
+}
+
+// Bool returns the address of a *bool field in the struct.
+func structPointer_Bool(p structPointer, f field) **bool {
+	return structPointer_ifield(p, f).(**bool)
+}
+
+// BoolVal returns the address of a bool field in the struct.
+func structPointer_BoolVal(p structPointer, f field) *bool {
+	return structPointer_ifield(p, f).(*bool)
+}
+
+// BoolSlice returns the address of a []bool field in the struct.
+func structPointer_BoolSlice(p structPointer, f field) *[]bool {
+	return structPointer_ifield(p, f).(*[]bool)
+}
+
+// String returns the address of a *string field in the struct.
+func structPointer_String(p structPointer, f field) **string {
+	return structPointer_ifield(p, f).(**string)
+}
+
+// StringVal returns the address of a string field in the struct.
+func structPointer_StringVal(p structPointer, f field) *string {
+	return structPointer_ifield(p, f).(*string)
+}
+
+// StringSlice returns the address of a []string field in the struct.
+func structPointer_StringSlice(p structPointer, f field) *[]string {
+	return structPointer_ifield(p, f).(*[]string)
+}
+
+// ExtMap returns the address of an extension map field in the struct.
+func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
+	return structPointer_ifield(p, f).(*map[int32]Extension)
+}
+
+// NewAt returns the reflect.Value for a pointer to a field in the struct.
+func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
+	return structPointer_field(p, f).Addr()
+}
+
+// SetStructPointer writes a *struct field in the struct.
+func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
+	structPointer_field(p, f).Set(q.v)
+}
+
+// GetStructPointer reads a *struct field in the struct.
+func structPointer_GetStructPointer(p structPointer, f field) structPointer {
+	return structPointer{structPointer_field(p, f)}
+}
+
+// StructPointerSlice the address of a []*struct field in the struct.
+func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
+	return structPointerSlice{structPointer_field(p, f)}
+}
+
+// A structPointerSlice represents the address of a slice of pointers to structs
+// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
+type structPointerSlice struct {
+	v reflect.Value
+}
+
+func (p structPointerSlice) Len() int                  { return p.v.Len() }
+func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
+func (p structPointerSlice) Append(q structPointer) {
+	p.v.Set(reflect.Append(p.v, q.v))
+}
+
+var (
+	int32Type   = reflect.TypeOf(int32(0))
+	uint32Type  = reflect.TypeOf(uint32(0))
+	float32Type = reflect.TypeOf(float32(0))
+	int64Type   = reflect.TypeOf(int64(0))
+	uint64Type  = reflect.TypeOf(uint64(0))
+	float64Type = reflect.TypeOf(float64(0))
+)
+
+// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
+// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
+type word32 struct {
+	v reflect.Value
+}
+
+// IsNil reports whether p is nil.
+func word32_IsNil(p word32) bool {
+	return p.v.IsNil()
+}
+
+// Set sets p to point at a newly allocated word with bits set to x.
+func word32_Set(p word32, o *Buffer, x uint32) {
+	t := p.v.Type().Elem()
+	switch t {
+	case int32Type:
+		if len(o.int32s) == 0 {
+			o.int32s = make([]int32, uint32PoolSize)
+		}
+		o.int32s[0] = int32(x)
+		p.v.Set(reflect.ValueOf(&o.int32s[0]))
+		o.int32s = o.int32s[1:]
+		return
+	case uint32Type:
+		if len(o.uint32s) == 0 {
+			o.uint32s = make([]uint32, uint32PoolSize)
+		}
+		o.uint32s[0] = x
+		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
+		o.uint32s = o.uint32s[1:]
+		return
+	case float32Type:
+		if len(o.float32s) == 0 {
+			o.float32s = make([]float32, uint32PoolSize)
+		}
+		o.float32s[0] = math.Float32frombits(x)
+		p.v.Set(reflect.ValueOf(&o.float32s[0]))
+		o.float32s = o.float32s[1:]
+		return
+	}
+
+	// must be enum
+	p.v.Set(reflect.New(t))
+	p.v.Elem().SetInt(int64(int32(x)))
+}
+
+// Get gets the bits pointed at by p, as a uint32.
+func word32_Get(p word32) uint32 {
+	elem := p.v.Elem()
+	switch elem.Kind() {
+	case reflect.Int32:
+		return uint32(elem.Int())
+	case reflect.Uint32:
+		return uint32(elem.Uint())
+	case reflect.Float32:
+		return math.Float32bits(float32(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
+func structPointer_Word32(p structPointer, f field) word32 {
+	return word32{structPointer_field(p, f)}
+}
+
+// A word32Val represents a field of type int32, uint32, float32, or enum.
+// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
+type word32Val struct {
+	v reflect.Value
+}
+
+// Set sets *p to x.
+func word32Val_Set(p word32Val, x uint32) {
+	switch p.v.Type() {
+	case int32Type:
+		p.v.SetInt(int64(x))
+		return
+	case uint32Type:
+		p.v.SetUint(uint64(x))
+		return
+	case float32Type:
+		p.v.SetFloat(float64(math.Float32frombits(x)))
+		return
+	}
+
+	// must be enum
+	p.v.SetInt(int64(int32(x)))
+}
+
+// Get gets the bits pointed at by p, as a uint32.
+func word32Val_Get(p word32Val) uint32 {
+	elem := p.v
+	switch elem.Kind() {
+	case reflect.Int32:
+		return uint32(elem.Int())
+	case reflect.Uint32:
+		return uint32(elem.Uint())
+	case reflect.Float32:
+		return math.Float32bits(float32(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
+func structPointer_Word32Val(p structPointer, f field) word32Val {
+	return word32Val{structPointer_field(p, f)}
+}
+
+// A word32Slice is a slice of 32-bit values.
+// That is, v.Type() is []int32, []uint32, []float32, or []enum.
+type word32Slice struct {
+	v reflect.Value
+}
+
+func (p word32Slice) Append(x uint32) {
+	n, m := p.v.Len(), p.v.Cap()
+	if n < m {
+		p.v.SetLen(n + 1)
+	} else {
+		t := p.v.Type().Elem()
+		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
+	}
+	elem := p.v.Index(n)
+	switch elem.Kind() {
+	case reflect.Int32:
+		elem.SetInt(int64(int32(x)))
+	case reflect.Uint32:
+		elem.SetUint(uint64(x))
+	case reflect.Float32:
+		elem.SetFloat(float64(math.Float32frombits(x)))
+	}
+}
+
+func (p word32Slice) Len() int {
+	return p.v.Len()
+}
+
+func (p word32Slice) Index(i int) uint32 {
+	elem := p.v.Index(i)
+	switch elem.Kind() {
+	case reflect.Int32:
+		return uint32(elem.Int())
+	case reflect.Uint32:
+		return uint32(elem.Uint())
+	case reflect.Float32:
+		return math.Float32bits(float32(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
+func structPointer_Word32Slice(p structPointer, f field) word32Slice {
+	return word32Slice{structPointer_field(p, f)}
+}
+
+// word64 is like word32 but for 64-bit values.
+type word64 struct {
+	v reflect.Value
+}
+
+func word64_Set(p word64, o *Buffer, x uint64) {
+	t := p.v.Type().Elem()
+	switch t {
+	case int64Type:
+		if len(o.int64s) == 0 {
+			o.int64s = make([]int64, uint64PoolSize)
+		}
+		o.int64s[0] = int64(x)
+		p.v.Set(reflect.ValueOf(&o.int64s[0]))
+		o.int64s = o.int64s[1:]
+		return
+	case uint64Type:
+		if len(o.uint64s) == 0 {
+			o.uint64s = make([]uint64, uint64PoolSize)
+		}
+		o.uint64s[0] = x
+		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
+		o.uint64s = o.uint64s[1:]
+		return
+	case float64Type:
+		if len(o.float64s) == 0 {
+			o.float64s = make([]float64, uint64PoolSize)
+		}
+		o.float64s[0] = math.Float64frombits(x)
+		p.v.Set(reflect.ValueOf(&o.float64s[0]))
+		o.float64s = o.float64s[1:]
+		return
+	}
+	panic("unreachable")
+}
+
+func word64_IsNil(p word64) bool {
+	return p.v.IsNil()
+}
+
+func word64_Get(p word64) uint64 {
+	elem := p.v.Elem()
+	switch elem.Kind() {
+	case reflect.Int64:
+		return uint64(elem.Int())
+	case reflect.Uint64:
+		return elem.Uint()
+	case reflect.Float64:
+		return math.Float64bits(elem.Float())
+	}
+	panic("unreachable")
+}
+
+func structPointer_Word64(p structPointer, f field) word64 {
+	return word64{structPointer_field(p, f)}
+}
+
+// word64Val is like word32Val but for 64-bit values.
+type word64Val struct {
+	v reflect.Value
+}
+
+func word64Val_Set(p word64Val, o *Buffer, x uint64) {
+	switch p.v.Type() {
+	case int64Type:
+		p.v.SetInt(int64(x))
+		return
+	case uint64Type:
+		p.v.SetUint(x)
+		return
+	case float64Type:
+		p.v.SetFloat(math.Float64frombits(x))
+		return
+	}
+	panic("unreachable")
+}
+
+func word64Val_Get(p word64Val) uint64 {
+	elem := p.v
+	switch elem.Kind() {
+	case reflect.Int64:
+		return uint64(elem.Int())
+	case reflect.Uint64:
+		return elem.Uint()
+	case reflect.Float64:
+		return math.Float64bits(elem.Float())
+	}
+	panic("unreachable")
+}
+
+func structPointer_Word64Val(p structPointer, f field) word64Val {
+	return word64Val{structPointer_field(p, f)}
+}
+
+type word64Slice struct {
+	v reflect.Value
+}
+
+func (p word64Slice) Append(x uint64) {
+	n, m := p.v.Len(), p.v.Cap()
+	if n < m {
+		p.v.SetLen(n + 1)
+	} else {
+		t := p.v.Type().Elem()
+		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
+	}
+	elem := p.v.Index(n)
+	switch elem.Kind() {
+	case reflect.Int64:
+		elem.SetInt(int64(int64(x)))
+	case reflect.Uint64:
+		elem.SetUint(uint64(x))
+	case reflect.Float64:
+		elem.SetFloat(float64(math.Float64frombits(x)))
+	}
+}
+
+func (p word64Slice) Len() int {
+	return p.v.Len()
+}
+
+func (p word64Slice) Index(i int) uint64 {
+	elem := p.v.Index(i)
+	switch elem.Kind() {
+	case reflect.Int64:
+		return uint64(elem.Int())
+	case reflect.Uint64:
+		return uint64(elem.Uint())
+	case reflect.Float64:
+		return math.Float64bits(float64(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+func structPointer_Word64Slice(p structPointer, f field) word64Slice {
+	return word64Slice{structPointer_field(p, f)}
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go
new file mode 100644
index 0000000000..e9be0fe92e
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go
@@ -0,0 +1,266 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2012 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// +build !appengine
+
+// This file contains the implementation of the proto field accesses using package unsafe.
+
+package proto
+
+import (
+	"reflect"
+	"unsafe"
+)
+
+// NOTE: These type_Foo functions would more idiomatically be methods,
+// but Go does not allow methods on pointer types, and we must preserve
+// some pointer type for the garbage collector. We use these
+// funcs with clunky names as our poor approximation to methods.
+//
+// An alternative would be
+//	type structPointer struct { p unsafe.Pointer }
+// but that does not registerize as well.
+
+// A structPointer is a pointer to a struct.
+type structPointer unsafe.Pointer
+
+// toStructPointer returns a structPointer equivalent to the given reflect value.
+func toStructPointer(v reflect.Value) structPointer {
+	return structPointer(unsafe.Pointer(v.Pointer()))
+}
+
+// IsNil reports whether p is nil.
+func structPointer_IsNil(p structPointer) bool {
+	return p == nil
+}
+
+// Interface returns the struct pointer, assumed to have element type t,
+// as an interface value.
+func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
+	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
+}
+
+// A field identifies a field in a struct, accessible from a structPointer.
+// In this implementation, a field is identified by its byte offset from the start of the struct.
+type field uintptr
+
+// toField returns a field equivalent to the given reflect field.
+func toField(f *reflect.StructField) field {
+	return field(f.Offset)
+}
+
+// invalidField is an invalid field identifier.
+const invalidField = ^field(0)
+
+// IsValid reports whether the field identifier is valid.
+func (f field) IsValid() bool {
+	return f != ^field(0)
+}
+
+// Bytes returns the address of a []byte field in the struct.
+func structPointer_Bytes(p structPointer, f field) *[]byte {
+	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// BytesSlice returns the address of a [][]byte field in the struct.
+func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
+	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// Bool returns the address of a *bool field in the struct.
+func structPointer_Bool(p structPointer, f field) **bool {
+	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// BoolVal returns the address of a bool field in the struct.
+func structPointer_BoolVal(p structPointer, f field) *bool {
+	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// BoolSlice returns the address of a []bool field in the struct.
+func structPointer_BoolSlice(p structPointer, f field) *[]bool {
+	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// String returns the address of a *string field in the struct.
+func structPointer_String(p structPointer, f field) **string {
+	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// StringVal returns the address of a string field in the struct.
+func structPointer_StringVal(p structPointer, f field) *string {
+	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// StringSlice returns the address of a []string field in the struct.
+func structPointer_StringSlice(p structPointer, f field) *[]string {
+	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// ExtMap returns the address of an extension map field in the struct.
+func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
+	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// NewAt returns the reflect.Value for a pointer to a field in the struct.
+func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
+	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
+}
+
+// SetStructPointer writes a *struct field in the struct.
+func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
+	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
+}
+
+// GetStructPointer reads a *struct field in the struct.
+func structPointer_GetStructPointer(p structPointer, f field) structPointer {
+	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// StructPointerSlice the address of a []*struct field in the struct.
+func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
+	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
+type structPointerSlice []structPointer
+
+func (v *structPointerSlice) Len() int                  { return len(*v) }
+func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
+func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
+
+// A word32 is the address of a "pointer to 32-bit value" field.
+type word32 **uint32
+
+// IsNil reports whether *v is nil.
+func word32_IsNil(p word32) bool {
+	return *p == nil
+}
+
+// Set sets *v to point at a newly allocated word set to x.
+func word32_Set(p word32, o *Buffer, x uint32) {
+	if len(o.uint32s) == 0 {
+		o.uint32s = make([]uint32, uint32PoolSize)
+	}
+	o.uint32s[0] = x
+	*p = &o.uint32s[0]
+	o.uint32s = o.uint32s[1:]
+}
+
+// Get gets the value pointed at by *v.
+func word32_Get(p word32) uint32 {
+	return **p
+}
+
+// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
+func structPointer_Word32(p structPointer, f field) word32 {
+	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// A word32Val is the address of a 32-bit value field.
+type word32Val *uint32
+
+// Set sets *p to x.
+func word32Val_Set(p word32Val, x uint32) {
+	*p = x
+}
+
+// Get gets the value pointed at by p.
+func word32Val_Get(p word32Val) uint32 {
+	return *p
+}
+
+// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
+func structPointer_Word32Val(p structPointer, f field) word32Val {
+	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// A word32Slice is a slice of 32-bit values.
+type word32Slice []uint32
+
+func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
+func (v *word32Slice) Len() int           { return len(*v) }
+func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
+
+// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
+func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
+	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// word64 is like word32 but for 64-bit values.
+type word64 **uint64
+
+func word64_Set(p word64, o *Buffer, x uint64) {
+	if len(o.uint64s) == 0 {
+		o.uint64s = make([]uint64, uint64PoolSize)
+	}
+	o.uint64s[0] = x
+	*p = &o.uint64s[0]
+	o.uint64s = o.uint64s[1:]
+}
+
+func word64_IsNil(p word64) bool {
+	return *p == nil
+}
+
+func word64_Get(p word64) uint64 {
+	return **p
+}
+
+func structPointer_Word64(p structPointer, f field) word64 {
+	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// word64Val is like word32Val but for 64-bit values.
+type word64Val *uint64
+
+func word64Val_Set(p word64Val, o *Buffer, x uint64) {
+	*p = x
+}
+
+func word64Val_Get(p word64Val) uint64 {
+	return *p
+}
+
+func structPointer_Word64Val(p structPointer, f field) word64Val {
+	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// word64Slice is like word32Slice but for 64-bit values.
+type word64Slice []uint64
+
+func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
+func (v *word64Slice) Len() int           { return len(*v) }
+func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
+
+func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
+	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
new file mode 100644
index 0000000000..6bc85fa987
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
@@ -0,0 +1,108 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// +build !appengine
+
+// This file contains the implementation of the proto field accesses using package unsafe.
+
+package proto
+
+import (
+	"reflect"
+	"unsafe"
+)
+
+func structPointer_InterfaceAt(p structPointer, f field, t reflect.Type) interface{} {
+	point := unsafe.Pointer(uintptr(p) + uintptr(f))
+	r := reflect.NewAt(t, point)
+	return r.Interface()
+}
+
+func structPointer_InterfaceRef(p structPointer, f field, t reflect.Type) interface{} {
+	point := unsafe.Pointer(uintptr(p) + uintptr(f))
+	r := reflect.NewAt(t, point)
+	if r.Elem().IsNil() {
+		return nil
+	}
+	return r.Elem().Interface()
+}
+
+func copyUintPtr(oldptr, newptr uintptr, size int) {
+	oldbytes := make([]byte, 0)
+	oldslice := (*reflect.SliceHeader)(unsafe.Pointer(&oldbytes))
+	oldslice.Data = oldptr
+	oldslice.Len = size
+	oldslice.Cap = size
+	newbytes := make([]byte, 0)
+	newslice := (*reflect.SliceHeader)(unsafe.Pointer(&newbytes))
+	newslice.Data = newptr
+	newslice.Len = size
+	newslice.Cap = size
+	copy(newbytes, oldbytes)
+}
+
+func structPointer_Copy(oldptr structPointer, newptr structPointer, size int) {
+	copyUintPtr(uintptr(oldptr), uintptr(newptr), size)
+}
+
+func appendStructPointer(base structPointer, f field, typ reflect.Type) structPointer {
+	size := typ.Elem().Size()
+	oldHeader := structPointer_GetSliceHeader(base, f)
+	newLen := oldHeader.Len + 1
+	slice := reflect.MakeSlice(typ, newLen, newLen)
+	bas := toStructPointer(slice)
+	for i := 0; i < oldHeader.Len; i++ {
+		newElemptr := uintptr(bas) + uintptr(i)*size
+		oldElemptr := oldHeader.Data + uintptr(i)*size
+		copyUintPtr(oldElemptr, newElemptr, int(size))
+	}
+
+	oldHeader.Data = uintptr(bas)
+	oldHeader.Len = newLen
+	oldHeader.Cap = newLen
+
+	return structPointer(unsafe.Pointer(uintptr(unsafe.Pointer(bas)) + uintptr(uintptr(newLen-1)*size)))
+}
+
+func structPointer_FieldPointer(p structPointer, f field) structPointer {
+	return structPointer(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+func structPointer_GetRefStructPointer(p structPointer, f field) structPointer {
+	return structPointer((*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+func structPointer_GetSliceHeader(p structPointer, f field) *reflect.SliceHeader {
+	return (*reflect.SliceHeader)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+func structPointer_Add(p structPointer, size field) structPointer {
+	return structPointer(unsafe.Pointer(uintptr(p) + uintptr(size)))
+}
+
+func structPointer_Len(p structPointer, f field) int {
+	return len(*(*[]interface{})(unsafe.Pointer(structPointer_GetRefStructPointer(p, f))))
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/properties.go b/vendor/github.com/gogo/protobuf/proto/properties.go
new file mode 100644
index 0000000000..5e6a0b3ba7
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/properties.go
@@ -0,0 +1,923 @@
+// Extensions for Protocol Buffers to create more go like structures.
+//
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Routines for encoding data into the wire format for protocol buffers.
+ */
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"reflect"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+const debug bool = false
+
+// Constants that identify the encoding of a value on the wire.
+const (
+	WireVarint     = 0
+	WireFixed64    = 1
+	WireBytes      = 2
+	WireStartGroup = 3
+	WireEndGroup   = 4
+	WireFixed32    = 5
+)
+
+const startSize = 10 // initial slice/string sizes
+
+// Encoders are defined in encode.go
+// An encoder outputs the full representation of a field, including its
+// tag and encoder type.
+type encoder func(p *Buffer, prop *Properties, base structPointer) error
+
+// A valueEncoder encodes a single integer in a particular encoding.
+type valueEncoder func(o *Buffer, x uint64) error
+
+// Sizers are defined in encode.go
+// A sizer returns the encoded size of a field, including its tag and encoder
+// type.
+type sizer func(prop *Properties, base structPointer) int
+
+// A valueSizer returns the encoded size of a single integer in a particular
+// encoding.
+type valueSizer func(x uint64) int
+
+// Decoders are defined in decode.go
+// A decoder creates a value from its wire representation.
+// Unrecognized subelements are saved in unrec.
+type decoder func(p *Buffer, prop *Properties, base structPointer) error
+
+// A valueDecoder decodes a single integer in a particular encoding.
+type valueDecoder func(o *Buffer) (x uint64, err error)
+
+// A oneofMarshaler does the marshaling for all oneof fields in a message.
+type oneofMarshaler func(Message, *Buffer) error
+
+// A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
+type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
+
+// A oneofSizer does the sizing for all oneof fields in a message.
+type oneofSizer func(Message) int
+
+// tagMap is an optimization over map[int]int for typical protocol buffer
+// use-cases. Encoded protocol buffers are often in tag order with small tag
+// numbers.
+type tagMap struct {
+	fastTags []int
+	slowTags map[int]int
+}
+
+// tagMapFastLimit is the upper bound on the tag number that will be stored in
+// the tagMap slice rather than its map.
+const tagMapFastLimit = 1024
+
+func (p *tagMap) get(t int) (int, bool) {
+	if t > 0 && t < tagMapFastLimit {
+		if t >= len(p.fastTags) {
+			return 0, false
+		}
+		fi := p.fastTags[t]
+		return fi, fi >= 0
+	}
+	fi, ok := p.slowTags[t]
+	return fi, ok
+}
+
+func (p *tagMap) put(t int, fi int) {
+	if t > 0 && t < tagMapFastLimit {
+		for len(p.fastTags) < t+1 {
+			p.fastTags = append(p.fastTags, -1)
+		}
+		p.fastTags[t] = fi
+		return
+	}
+	if p.slowTags == nil {
+		p.slowTags = make(map[int]int)
+	}
+	p.slowTags[t] = fi
+}
+
+// StructProperties represents properties for all the fields of a struct.
+// decoderTags and decoderOrigNames should only be used by the decoder.
+type StructProperties struct {
+	Prop             []*Properties  // properties for each field
+	reqCount         int            // required count
+	decoderTags      tagMap         // map from proto tag to struct field number
+	decoderOrigNames map[string]int // map from original name to struct field number
+	order            []int          // list of struct field numbers in tag order
+	unrecField       field          // field id of the XXX_unrecognized []byte field
+	extendable       bool           // is this an extendable proto
+
+	oneofMarshaler   oneofMarshaler
+	oneofUnmarshaler oneofUnmarshaler
+	oneofSizer       oneofSizer
+	stype            reflect.Type
+
+	// OneofTypes contains information about the oneof fields in this message.
+	// It is keyed by the original name of a field.
+	OneofTypes map[string]*OneofProperties
+}
+
+// OneofProperties represents information about a specific field in a oneof.
+type OneofProperties struct {
+	Type  reflect.Type // pointer to generated struct type for this oneof field
+	Field int          // struct field number of the containing oneof in the message
+	Prop  *Properties
+}
+
+// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
+// See encode.go, (*Buffer).enc_struct.
+
+func (sp *StructProperties) Len() int { return len(sp.order) }
+func (sp *StructProperties) Less(i, j int) bool {
+	return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
+}
+func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
+
+// Properties represents the protocol-specific behavior of a single struct field.
+type Properties struct {
+	Name     string // name of the field, for error messages
+	OrigName string // original name before protocol compiler (always set)
+	JSONName string // name to use for JSON; determined by protoc
+	Wire     string
+	WireType int
+	Tag      int
+	Required bool
+	Optional bool
+	Repeated bool
+	Packed   bool   // relevant for repeated primitives only
+	Enum     string // set for enum types only
+	proto3   bool   // whether this is known to be a proto3 field; set for []byte only
+	oneof    bool   // whether this is a oneof field
+
+	Default    string // default value
+	HasDefault bool   // whether an explicit default was provided
+	CustomType string
+	def_uint64 uint64
+
+	enc           encoder
+	valEnc        valueEncoder // set for bool and numeric types only
+	field         field
+	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
+	tagbuf        [8]byte
+	stype         reflect.Type      // set for struct types only
+	sstype        reflect.Type      // set for slices of structs types only
+	ctype         reflect.Type      // set for custom types only
+	sprop         *StructProperties // set for struct types only
+	isMarshaler   bool
+	isUnmarshaler bool
+
+	mtype    reflect.Type // set for map types only
+	mkeyprop *Properties  // set for map types only
+	mvalprop *Properties  // set for map types only
+
+	size    sizer
+	valSize valueSizer // set for bool and numeric types only
+
+	dec    decoder
+	valDec valueDecoder // set for bool and numeric types only
+
+	// If this is a packable field, this will be the decoder for the packed version of the field.
+	packedDec decoder
+}
+
+// String formats the properties in the protobuf struct field tag style.
+func (p *Properties) String() string {
+	s := p.Wire
+	s = ","
+	s += strconv.Itoa(p.Tag)
+	if p.Required {
+		s += ",req"
+	}
+	if p.Optional {
+		s += ",opt"
+	}
+	if p.Repeated {
+		s += ",rep"
+	}
+	if p.Packed {
+		s += ",packed"
+	}
+	s += ",name=" + p.OrigName
+	if p.JSONName != p.OrigName {
+		s += ",json=" + p.JSONName
+	}
+	if p.proto3 {
+		s += ",proto3"
+	}
+	if p.oneof {
+		s += ",oneof"
+	}
+	if len(p.Enum) > 0 {
+		s += ",enum=" + p.Enum
+	}
+	if p.HasDefault {
+		s += ",def=" + p.Default
+	}
+	return s
+}
+
+// Parse populates p by parsing a string in the protobuf struct field tag style.
+func (p *Properties) Parse(s string) {
+	// "bytes,49,opt,name=foo,def=hello!"
+	fields := strings.Split(s, ",") // breaks def=, but handled below.
+	if len(fields) < 2 {
+		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
+		return
+	}
+
+	p.Wire = fields[0]
+	switch p.Wire {
+	case "varint":
+		p.WireType = WireVarint
+		p.valEnc = (*Buffer).EncodeVarint
+		p.valDec = (*Buffer).DecodeVarint
+		p.valSize = sizeVarint
+	case "fixed32":
+		p.WireType = WireFixed32
+		p.valEnc = (*Buffer).EncodeFixed32
+		p.valDec = (*Buffer).DecodeFixed32
+		p.valSize = sizeFixed32
+	case "fixed64":
+		p.WireType = WireFixed64
+		p.valEnc = (*Buffer).EncodeFixed64
+		p.valDec = (*Buffer).DecodeFixed64
+		p.valSize = sizeFixed64
+	case "zigzag32":
+		p.WireType = WireVarint
+		p.valEnc = (*Buffer).EncodeZigzag32
+		p.valDec = (*Buffer).DecodeZigzag32
+		p.valSize = sizeZigzag32
+	case "zigzag64":
+		p.WireType = WireVarint
+		p.valEnc = (*Buffer).EncodeZigzag64
+		p.valDec = (*Buffer).DecodeZigzag64
+		p.valSize = sizeZigzag64
+	case "bytes", "group":
+		p.WireType = WireBytes
+		// no numeric converter for non-numeric types
+	default:
+		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
+		return
+	}
+
+	var err error
+	p.Tag, err = strconv.Atoi(fields[1])
+	if err != nil {
+		return
+	}
+
+	for i := 2; i < len(fields); i++ {
+		f := fields[i]
+		switch {
+		case f == "req":
+			p.Required = true
+		case f == "opt":
+			p.Optional = true
+		case f == "rep":
+			p.Repeated = true
+		case f == "packed":
+			p.Packed = true
+		case strings.HasPrefix(f, "name="):
+			p.OrigName = f[5:]
+		case strings.HasPrefix(f, "json="):
+			p.JSONName = f[5:]
+		case strings.HasPrefix(f, "enum="):
+			p.Enum = f[5:]
+		case f == "proto3":
+			p.proto3 = true
+		case f == "oneof":
+			p.oneof = true
+		case strings.HasPrefix(f, "def="):
+			p.HasDefault = true
+			p.Default = f[4:] // rest of string
+			if i+1 < len(fields) {
+				// Commas aren't escaped, and def is always last.
+				p.Default += "," + strings.Join(fields[i+1:], ",")
+				break
+			}
+		case strings.HasPrefix(f, "embedded="):
+			p.OrigName = strings.Split(f, "=")[1]
+		case strings.HasPrefix(f, "customtype="):
+			p.CustomType = strings.Split(f, "=")[1]
+		}
+	}
+}
+
+func logNoSliceEnc(t1, t2 reflect.Type) {
+	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
+}
+
+var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
+
+// Initialize the fields for encoding and decoding.
+func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
+	p.enc = nil
+	p.dec = nil
+	p.size = nil
+	if len(p.CustomType) > 0 {
+		p.setCustomEncAndDec(typ)
+		p.setTag(lockGetProp)
+		return
+	}
+	switch t1 := typ; t1.Kind() {
+	default:
+		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
+
+	// proto3 scalar types
+
+	case reflect.Bool:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_bool
+			p.dec = (*Buffer).dec_proto3_bool
+			p.size = size_proto3_bool
+		} else {
+			p.enc = (*Buffer).enc_ref_bool
+			p.dec = (*Buffer).dec_proto3_bool
+			p.size = size_ref_bool
+		}
+	case reflect.Int32:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_int32
+			p.dec = (*Buffer).dec_proto3_int32
+			p.size = size_proto3_int32
+		} else {
+			p.enc = (*Buffer).enc_ref_int32
+			p.dec = (*Buffer).dec_proto3_int32
+			p.size = size_ref_int32
+		}
+	case reflect.Uint32:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_uint32
+			p.dec = (*Buffer).dec_proto3_int32 // can reuse
+			p.size = size_proto3_uint32
+		} else {
+			p.enc = (*Buffer).enc_ref_uint32
+			p.dec = (*Buffer).dec_proto3_int32 // can reuse
+			p.size = size_ref_uint32
+		}
+	case reflect.Int64, reflect.Uint64:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_int64
+			p.dec = (*Buffer).dec_proto3_int64
+			p.size = size_proto3_int64
+		} else {
+			p.enc = (*Buffer).enc_ref_int64
+			p.dec = (*Buffer).dec_proto3_int64
+			p.size = size_ref_int64
+		}
+	case reflect.Float32:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
+			p.dec = (*Buffer).dec_proto3_int32
+			p.size = size_proto3_uint32
+		} else {
+			p.enc = (*Buffer).enc_ref_uint32 // can just treat them as bits
+			p.dec = (*Buffer).dec_proto3_int32
+			p.size = size_ref_uint32
+		}
+	case reflect.Float64:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
+			p.dec = (*Buffer).dec_proto3_int64
+			p.size = size_proto3_int64
+		} else {
+			p.enc = (*Buffer).enc_ref_int64 // can just treat them as bits
+			p.dec = (*Buffer).dec_proto3_int64
+			p.size = size_ref_int64
+		}
+	case reflect.String:
+		if p.proto3 {
+			p.enc = (*Buffer).enc_proto3_string
+			p.dec = (*Buffer).dec_proto3_string
+			p.size = size_proto3_string
+		} else {
+			p.enc = (*Buffer).enc_ref_string
+			p.dec = (*Buffer).dec_proto3_string
+			p.size = size_ref_string
+		}
+	case reflect.Struct:
+		p.stype = typ
+		p.isMarshaler = isMarshaler(typ)
+		p.isUnmarshaler = isUnmarshaler(typ)
+		if p.Wire == "bytes" {
+			p.enc = (*Buffer).enc_ref_struct_message
+			p.dec = (*Buffer).dec_ref_struct_message
+			p.size = size_ref_struct_message
+		} else {
+			fmt.Fprintf(os.Stderr, "proto: no coders for struct %T\n", typ)
+		}
+
+	case reflect.Ptr:
+		switch t2 := t1.Elem(); t2.Kind() {
+		default:
+			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
+			break
+		case reflect.Bool:
+			p.enc = (*Buffer).enc_bool
+			p.dec = (*Buffer).dec_bool
+			p.size = size_bool
+		case reflect.Int32:
+			p.enc = (*Buffer).enc_int32
+			p.dec = (*Buffer).dec_int32
+			p.size = size_int32
+		case reflect.Uint32:
+			p.enc = (*Buffer).enc_uint32
+			p.dec = (*Buffer).dec_int32 // can reuse
+			p.size = size_uint32
+		case reflect.Int64, reflect.Uint64:
+			p.enc = (*Buffer).enc_int64
+			p.dec = (*Buffer).dec_int64
+			p.size = size_int64
+		case reflect.Float32:
+			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
+			p.dec = (*Buffer).dec_int32
+			p.size = size_uint32
+		case reflect.Float64:
+			p.enc = (*Buffer).enc_int64 // can just treat them as bits
+			p.dec = (*Buffer).dec_int64
+			p.size = size_int64
+		case reflect.String:
+			p.enc = (*Buffer).enc_string
+			p.dec = (*Buffer).dec_string
+			p.size = size_string
+		case reflect.Struct:
+			p.stype = t1.Elem()
+			p.isMarshaler = isMarshaler(t1)
+			p.isUnmarshaler = isUnmarshaler(t1)
+			if p.Wire == "bytes" {
+				p.enc = (*Buffer).enc_struct_message
+				p.dec = (*Buffer).dec_struct_message
+				p.size = size_struct_message
+			} else {
+				p.enc = (*Buffer).enc_struct_group
+				p.dec = (*Buffer).dec_struct_group
+				p.size = size_struct_group
+			}
+		}
+
+	case reflect.Slice:
+		switch t2 := t1.Elem(); t2.Kind() {
+		default:
+			logNoSliceEnc(t1, t2)
+			break
+		case reflect.Bool:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_bool
+				p.size = size_slice_packed_bool
+			} else {
+				p.enc = (*Buffer).enc_slice_bool
+				p.size = size_slice_bool
+			}
+			p.dec = (*Buffer).dec_slice_bool
+			p.packedDec = (*Buffer).dec_slice_packed_bool
+		case reflect.Int32:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_int32
+				p.size = size_slice_packed_int32
+			} else {
+				p.enc = (*Buffer).enc_slice_int32
+				p.size = size_slice_int32
+			}
+			p.dec = (*Buffer).dec_slice_int32
+			p.packedDec = (*Buffer).dec_slice_packed_int32
+		case reflect.Uint32:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_uint32
+				p.size = size_slice_packed_uint32
+			} else {
+				p.enc = (*Buffer).enc_slice_uint32
+				p.size = size_slice_uint32
+			}
+			p.dec = (*Buffer).dec_slice_int32
+			p.packedDec = (*Buffer).dec_slice_packed_int32
+		case reflect.Int64, reflect.Uint64:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_int64
+				p.size = size_slice_packed_int64
+			} else {
+				p.enc = (*Buffer).enc_slice_int64
+				p.size = size_slice_int64
+			}
+			p.dec = (*Buffer).dec_slice_int64
+			p.packedDec = (*Buffer).dec_slice_packed_int64
+		case reflect.Uint8:
+			p.enc = (*Buffer).enc_slice_byte
+			p.dec = (*Buffer).dec_slice_byte
+			p.size = size_slice_byte
+			// This is a []byte, which is either a bytes field,
+			// or the value of a map field. In the latter case,
+			// we always encode an empty []byte, so we should not
+			// use the proto3 enc/size funcs.
+			// f == nil iff this is the key/value of a map field.
+			if p.proto3 && f != nil {
+				p.enc = (*Buffer).enc_proto3_slice_byte
+				p.size = size_proto3_slice_byte
+			}
+		case reflect.Float32, reflect.Float64:
+			switch t2.Bits() {
+			case 32:
+				// can just treat them as bits
+				if p.Packed {
+					p.enc = (*Buffer).enc_slice_packed_uint32
+					p.size = size_slice_packed_uint32
+				} else {
+					p.enc = (*Buffer).enc_slice_uint32
+					p.size = size_slice_uint32
+				}
+				p.dec = (*Buffer).dec_slice_int32
+				p.packedDec = (*Buffer).dec_slice_packed_int32
+			case 64:
+				// can just treat them as bits
+				if p.Packed {
+					p.enc = (*Buffer).enc_slice_packed_int64
+					p.size = size_slice_packed_int64
+				} else {
+					p.enc = (*Buffer).enc_slice_int64
+					p.size = size_slice_int64
+				}
+				p.dec = (*Buffer).dec_slice_int64
+				p.packedDec = (*Buffer).dec_slice_packed_int64
+			default:
+				logNoSliceEnc(t1, t2)
+				break
+			}
+		case reflect.String:
+			p.enc = (*Buffer).enc_slice_string
+			p.dec = (*Buffer).dec_slice_string
+			p.size = size_slice_string
+		case reflect.Ptr:
+			switch t3 := t2.Elem(); t3.Kind() {
+			default:
+				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
+				break
+			case reflect.Struct:
+				p.stype = t2.Elem()
+				p.isMarshaler = isMarshaler(t2)
+				p.isUnmarshaler = isUnmarshaler(t2)
+				if p.Wire == "bytes" {
+					p.enc = (*Buffer).enc_slice_struct_message
+					p.dec = (*Buffer).dec_slice_struct_message
+					p.size = size_slice_struct_message
+				} else {
+					p.enc = (*Buffer).enc_slice_struct_group
+					p.dec = (*Buffer).dec_slice_struct_group
+					p.size = size_slice_struct_group
+				}
+			}
+		case reflect.Slice:
+			switch t2.Elem().Kind() {
+			default:
+				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
+				break
+			case reflect.Uint8:
+				p.enc = (*Buffer).enc_slice_slice_byte
+				p.dec = (*Buffer).dec_slice_slice_byte
+				p.size = size_slice_slice_byte
+			}
+		case reflect.Struct:
+			p.setSliceOfNonPointerStructs(t1)
+		}
+
+	case reflect.Map:
+		p.enc = (*Buffer).enc_new_map
+		p.dec = (*Buffer).dec_new_map
+		p.size = size_new_map
+
+		p.mtype = t1
+		p.mkeyprop = &Properties{}
+		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
+		p.mvalprop = &Properties{}
+		vtype := p.mtype.Elem()
+		if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
+			// The value type is not a message (*T) or bytes ([]byte),
+			// so we need encoders for the pointer to this type.
+			vtype = reflect.PtrTo(vtype)
+		}
+		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
+	}
+	p.setTag(lockGetProp)
+}
+
+func (p *Properties) setTag(lockGetProp bool) {
+	// precalculate tag code
+	wire := p.WireType
+	if p.Packed {
+		wire = WireBytes
+	}
+	x := uint32(p.Tag)<<3 | uint32(wire)
+	i := 0
+	for i = 0; x > 127; i++ {
+		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
+		x >>= 7
+	}
+	p.tagbuf[i] = uint8(x)
+	p.tagcode = p.tagbuf[0 : i+1]
+
+	if p.stype != nil {
+		if lockGetProp {
+			p.sprop = GetProperties(p.stype)
+		} else {
+			p.sprop = getPropertiesLocked(p.stype)
+		}
+	}
+}
+
+var (
+	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
+	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
+)
+
+// isMarshaler reports whether type t implements Marshaler.
+func isMarshaler(t reflect.Type) bool {
+	return t.Implements(marshalerType)
+}
+
+// isUnmarshaler reports whether type t implements Unmarshaler.
+func isUnmarshaler(t reflect.Type) bool {
+	return t.Implements(unmarshalerType)
+}
+
+// Init populates the properties from a protocol buffer struct tag.
+func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
+	p.init(typ, name, tag, f, true)
+}
+
+func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
+	// "bytes,49,opt,def=hello!"
+	p.Name = name
+	p.OrigName = name
+	if f != nil {
+		p.field = toField(f)
+	}
+	if tag == "" {
+		return
+	}
+	p.Parse(tag)
+	p.setEncAndDec(typ, f, lockGetProp)
+}
+
+var (
+	propertiesMu  sync.RWMutex
+	propertiesMap = make(map[reflect.Type]*StructProperties)
+)
+
+// GetProperties returns the list of properties for the type represented by t.
+// t must represent a generated struct type of a protocol message.
+func GetProperties(t reflect.Type) *StructProperties {
+	if t.Kind() != reflect.Struct {
+		panic("proto: type must have kind struct")
+	}
+
+	// Most calls to GetProperties in a long-running program will be
+	// retrieving details for types we have seen before.
+	propertiesMu.RLock()
+	sprop, ok := propertiesMap[t]
+	propertiesMu.RUnlock()
+	if ok {
+		if collectStats {
+			stats.Chit++
+		}
+		return sprop
+	}
+
+	propertiesMu.Lock()
+	sprop = getPropertiesLocked(t)
+	propertiesMu.Unlock()
+	return sprop
+}
+
+// getPropertiesLocked requires that propertiesMu is held.
+func getPropertiesLocked(t reflect.Type) *StructProperties {
+	if prop, ok := propertiesMap[t]; ok {
+		if collectStats {
+			stats.Chit++
+		}
+		return prop
+	}
+	if collectStats {
+		stats.Cmiss++
+	}
+
+	prop := new(StructProperties)
+	// in case of recursive protos, fill this in now.
+	propertiesMap[t] = prop
+
+	// build properties
+	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType)
+	prop.unrecField = invalidField
+	prop.Prop = make([]*Properties, t.NumField())
+	prop.order = make([]int, t.NumField())
+
+	isOneofMessage := false
+	for i := 0; i < t.NumField(); i++ {
+		f := t.Field(i)
+		p := new(Properties)
+		name := f.Name
+		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
+
+		if f.Name == "XXX_extensions" { // special case
+			if len(f.Tag.Get("protobuf")) > 0 {
+				p.enc = (*Buffer).enc_ext_slice_byte
+				p.dec = nil // not needed
+				p.size = size_ext_slice_byte
+			} else {
+				p.enc = (*Buffer).enc_map
+				p.dec = nil // not needed
+				p.size = size_map
+			}
+		}
+		if f.Name == "XXX_unrecognized" { // special case
+			prop.unrecField = toField(&f)
+		}
+		oneof := f.Tag.Get("protobuf_oneof") != "" // special case
+		if oneof {
+			isOneofMessage = true
+		}
+		prop.Prop[i] = p
+		prop.order[i] = i
+		if debug {
+			print(i, " ", f.Name, " ", t.String(), " ")
+			if p.Tag > 0 {
+				print(p.String())
+			}
+			print("\n")
+		}
+		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && !oneof {
+			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
+		}
+	}
+
+	// Re-order prop.order.
+	sort.Sort(prop)
+
+	type oneofMessage interface {
+		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
+	}
+	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); isOneofMessage && ok {
+		var oots []interface{}
+		prop.oneofMarshaler, prop.oneofUnmarshaler, prop.oneofSizer, oots = om.XXX_OneofFuncs()
+		prop.stype = t
+
+		// Interpret oneof metadata.
+		prop.OneofTypes = make(map[string]*OneofProperties)
+		for _, oot := range oots {
+			oop := &OneofProperties{
+				Type: reflect.ValueOf(oot).Type(), // *T
+				Prop: new(Properties),
+			}
+			sft := oop.Type.Elem().Field(0)
+			oop.Prop.Name = sft.Name
+			oop.Prop.Parse(sft.Tag.Get("protobuf"))
+			// There will be exactly one interface field that
+			// this new value is assignable to.
+			for i := 0; i < t.NumField(); i++ {
+				f := t.Field(i)
+				if f.Type.Kind() != reflect.Interface {
+					continue
+				}
+				if !oop.Type.AssignableTo(f.Type) {
+					continue
+				}
+				oop.Field = i
+				break
+			}
+			prop.OneofTypes[oop.Prop.OrigName] = oop
+		}
+	}
+
+	// build required counts
+	// build tags
+	reqCount := 0
+	prop.decoderOrigNames = make(map[string]int)
+	for i, p := range prop.Prop {
+		if strings.HasPrefix(p.Name, "XXX_") {
+			// Internal fields should not appear in tags/origNames maps.
+			// They are handled specially when encoding and decoding.
+			continue
+		}
+		if p.Required {
+			reqCount++
+		}
+		prop.decoderTags.put(p.Tag, i)
+		prop.decoderOrigNames[p.OrigName] = i
+	}
+	prop.reqCount = reqCount
+
+	return prop
+}
+
+// Return the Properties object for the x[0]'th field of the structure.
+func propByIndex(t reflect.Type, x []int) *Properties {
+	if len(x) != 1 {
+		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
+		return nil
+	}
+	prop := GetProperties(t)
+	return prop.Prop[x[0]]
+}
+
+// Get the address and type of a pointer to a struct from an interface.
+func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
+	if pb == nil {
+		err = ErrNil
+		return
+	}
+	// get the reflect type of the pointer to the struct.
+	t = reflect.TypeOf(pb)
+	// get the address of the struct.
+	value := reflect.ValueOf(pb)
+	b = toStructPointer(value)
+	return
+}
+
+// A global registry of enum types.
+// The generated code will register the generated maps by calling RegisterEnum.
+
+var enumValueMaps = make(map[string]map[string]int32)
+var enumStringMaps = make(map[string]map[int32]string)
+
+// RegisterEnum is called from the generated code to install the enum descriptor
+// maps into the global table to aid parsing text format protocol buffers.
+func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
+	if _, ok := enumValueMaps[typeName]; ok {
+		panic("proto: duplicate enum registered: " + typeName)
+	}
+	enumValueMaps[typeName] = valueMap
+	if _, ok := enumStringMaps[typeName]; ok {
+		panic("proto: duplicate enum registered: " + typeName)
+	}
+	enumStringMaps[typeName] = unusedNameMap
+}
+
+// EnumValueMap returns the mapping from names to integers of the
+// enum type enumType, or a nil if not found.
+func EnumValueMap(enumType string) map[string]int32 {
+	return enumValueMaps[enumType]
+}
+
+// A registry of all linked message types.
+// The string is a fully-qualified proto name ("pkg.Message").
+var (
+	protoTypes    = make(map[string]reflect.Type)
+	revProtoTypes = make(map[reflect.Type]string)
+)
+
+// RegisterType is called from generated code and maps from the fully qualified
+// proto name to the type (pointer to struct) of the protocol buffer.
+func RegisterType(x Message, name string) {
+	if _, ok := protoTypes[name]; ok {
+		// TODO: Some day, make this a panic.
+		log.Printf("proto: duplicate proto type registered: %s", name)
+		return
+	}
+	t := reflect.TypeOf(x)
+	protoTypes[name] = t
+	revProtoTypes[t] = name
+}
+
+// MessageName returns the fully-qualified proto name for the given message type.
+func MessageName(x Message) string { return revProtoTypes[reflect.TypeOf(x)] }
+
+// MessageType returns the message type (pointer to struct) for a named message.
+func MessageType(name string) reflect.Type { return protoTypes[name] }
diff --git a/vendor/github.com/gogo/protobuf/proto/properties_gogo.go b/vendor/github.com/gogo/protobuf/proto/properties_gogo.go
new file mode 100644
index 0000000000..8daf9f7768
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/properties_gogo.go
@@ -0,0 +1,64 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"fmt"
+	"os"
+	"reflect"
+)
+
+func (p *Properties) setCustomEncAndDec(typ reflect.Type) {
+	p.ctype = typ
+	if p.Repeated {
+		p.enc = (*Buffer).enc_custom_slice_bytes
+		p.dec = (*Buffer).dec_custom_slice_bytes
+		p.size = size_custom_slice_bytes
+	} else if typ.Kind() == reflect.Ptr {
+		p.enc = (*Buffer).enc_custom_bytes
+		p.dec = (*Buffer).dec_custom_bytes
+		p.size = size_custom_bytes
+	} else {
+		p.enc = (*Buffer).enc_custom_ref_bytes
+		p.dec = (*Buffer).dec_custom_ref_bytes
+		p.size = size_custom_ref_bytes
+	}
+}
+
+func (p *Properties) setSliceOfNonPointerStructs(typ reflect.Type) {
+	t2 := typ.Elem()
+	p.sstype = typ
+	p.stype = t2
+	p.isMarshaler = isMarshaler(t2)
+	p.isUnmarshaler = isUnmarshaler(t2)
+	p.enc = (*Buffer).enc_slice_ref_struct_message
+	p.dec = (*Buffer).dec_slice_ref_struct_message
+	p.size = size_slice_ref_struct_message
+	if p.Wire != "bytes" {
+		fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T \n", typ, t2)
+	}
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/skip_gogo.go b/vendor/github.com/gogo/protobuf/proto/skip_gogo.go
new file mode 100644
index 0000000000..4fe7e0815c
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/skip_gogo.go
@@ -0,0 +1,117 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"fmt"
+	"io"
+)
+
+func Skip(data []byte) (n int, err error) {
+	l := len(data)
+	index := 0
+	for index < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if index >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := data[index]
+			index++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for {
+				if index >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				index++
+				if data[index-1] < 0x80 {
+					break
+				}
+			}
+			return index, nil
+		case 1:
+			index += 8
+			return index, nil
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if index >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := data[index]
+				index++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			index += length
+			return index, nil
+		case 3:
+			for {
+				var innerWire uint64
+				var start int = index
+				for shift := uint(0); ; shift += 7 {
+					if index >= l {
+						return 0, io.ErrUnexpectedEOF
+					}
+					b := data[index]
+					index++
+					innerWire |= (uint64(b) & 0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				innerWireType := int(innerWire & 0x7)
+				if innerWireType == 4 {
+					break
+				}
+				next, err := Skip(data[start:])
+				if err != nil {
+					return 0, err
+				}
+				index = start + next
+			}
+			return index, nil
+		case 4:
+			return index, nil
+		case 5:
+			index += 4
+			return index, nil
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+	}
+	panic("unreachable")
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/text.go b/vendor/github.com/gogo/protobuf/proto/text.go
new file mode 100644
index 0000000000..e2b99b122d
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/text.go
@@ -0,0 +1,793 @@
+// Extensions for Protocol Buffers to create more go like structures.
+//
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+// Functions for writing the text protocol buffer format.
+
+import (
+	"bufio"
+	"bytes"
+	"encoding"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"math"
+	"reflect"
+	"sort"
+	"strings"
+)
+
+var (
+	newline         = []byte("\n")
+	spaces          = []byte("                                        ")
+	gtNewline       = []byte(">\n")
+	endBraceNewline = []byte("}\n")
+	backslashN      = []byte{'\\', 'n'}
+	backslashR      = []byte{'\\', 'r'}
+	backslashT      = []byte{'\\', 't'}
+	backslashDQ     = []byte{'\\', '"'}
+	backslashBS     = []byte{'\\', '\\'}
+	posInf          = []byte("inf")
+	negInf          = []byte("-inf")
+	nan             = []byte("nan")
+)
+
+type writer interface {
+	io.Writer
+	WriteByte(byte) error
+}
+
+// textWriter is an io.Writer that tracks its indentation level.
+type textWriter struct {
+	ind      int
+	complete bool // if the current position is a complete line
+	compact  bool // whether to write out as a one-liner
+	w        writer
+}
+
+func (w *textWriter) WriteString(s string) (n int, err error) {
+	if !strings.Contains(s, "\n") {
+		if !w.compact && w.complete {
+			w.writeIndent()
+		}
+		w.complete = false
+		return io.WriteString(w.w, s)
+	}
+	// WriteString is typically called without newlines, so this
+	// codepath and its copy are rare.  We copy to avoid
+	// duplicating all of Write's logic here.
+	return w.Write([]byte(s))
+}
+
+func (w *textWriter) Write(p []byte) (n int, err error) {
+	newlines := bytes.Count(p, newline)
+	if newlines == 0 {
+		if !w.compact && w.complete {
+			w.writeIndent()
+		}
+		n, err = w.w.Write(p)
+		w.complete = false
+		return n, err
+	}
+
+	frags := bytes.SplitN(p, newline, newlines+1)
+	if w.compact {
+		for i, frag := range frags {
+			if i > 0 {
+				if err := w.w.WriteByte(' '); err != nil {
+					return n, err
+				}
+				n++
+			}
+			nn, err := w.w.Write(frag)
+			n += nn
+			if err != nil {
+				return n, err
+			}
+		}
+		return n, nil
+	}
+
+	for i, frag := range frags {
+		if w.complete {
+			w.writeIndent()
+		}
+		nn, err := w.w.Write(frag)
+		n += nn
+		if err != nil {
+			return n, err
+		}
+		if i+1 < len(frags) {
+			if err := w.w.WriteByte('\n'); err != nil {
+				return n, err
+			}
+			n++
+		}
+	}
+	w.complete = len(frags[len(frags)-1]) == 0
+	return n, nil
+}
+
+func (w *textWriter) WriteByte(c byte) error {
+	if w.compact && c == '\n' {
+		c = ' '
+	}
+	if !w.compact && w.complete {
+		w.writeIndent()
+	}
+	err := w.w.WriteByte(c)
+	w.complete = c == '\n'
+	return err
+}
+
+func (w *textWriter) indent() { w.ind++ }
+
+func (w *textWriter) unindent() {
+	if w.ind == 0 {
+		log.Printf("proto: textWriter unindented too far")
+		return
+	}
+	w.ind--
+}
+
+func writeName(w *textWriter, props *Properties) error {
+	if _, err := w.WriteString(props.OrigName); err != nil {
+		return err
+	}
+	if props.Wire != "group" {
+		return w.WriteByte(':')
+	}
+	return nil
+}
+
+// raw is the interface satisfied by RawMessage.
+type raw interface {
+	Bytes() []byte
+}
+
+func writeStruct(w *textWriter, sv reflect.Value) error {
+	st := sv.Type()
+	sprops := GetProperties(st)
+	for i := 0; i < sv.NumField(); i++ {
+		fv := sv.Field(i)
+		props := sprops.Prop[i]
+		name := st.Field(i).Name
+
+		if strings.HasPrefix(name, "XXX_") {
+			// There are two XXX_ fields:
+			//   XXX_unrecognized []byte
+			//   XXX_extensions   map[int32]proto.Extension
+			// The first is handled here;
+			// the second is handled at the bottom of this function.
+			if name == "XXX_unrecognized" && !fv.IsNil() {
+				if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		if fv.Kind() == reflect.Ptr && fv.IsNil() {
+			// Field not filled in. This could be an optional field or
+			// a required field that wasn't filled in. Either way, there
+			// isn't anything we can show for it.
+			continue
+		}
+		if fv.Kind() == reflect.Slice && fv.IsNil() {
+			// Repeated field that is empty, or a bytes field that is unused.
+			continue
+		}
+
+		if props.Repeated && fv.Kind() == reflect.Slice {
+			// Repeated field.
+			for j := 0; j < fv.Len(); j++ {
+				if err := writeName(w, props); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+				}
+				v := fv.Index(j)
+				if v.Kind() == reflect.Ptr && v.IsNil() {
+					// A nil message in a repeated field is not valid,
+					// but we can handle that more gracefully than panicking.
+					if _, err := w.Write([]byte("<nil>\n")); err != nil {
+						return err
+					}
+					continue
+				}
+				if len(props.Enum) > 0 {
+					if err := writeEnum(w, v, props); err != nil {
+						return err
+					}
+				} else if err := writeAny(w, v, props); err != nil {
+					return err
+				}
+				if err := w.WriteByte('\n'); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		if fv.Kind() == reflect.Map {
+			// Map fields are rendered as a repeated struct with key/value fields.
+			keys := fv.MapKeys()
+			sort.Sort(mapKeys(keys))
+			for _, key := range keys {
+				val := fv.MapIndex(key)
+				if err := writeName(w, props); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+				}
+				// open struct
+				if err := w.WriteByte('<'); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte('\n'); err != nil {
+						return err
+					}
+				}
+				w.indent()
+				// key
+				if _, err := w.WriteString("key:"); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+				}
+				if err := writeAny(w, key, props.mkeyprop); err != nil {
+					return err
+				}
+				if err := w.WriteByte('\n'); err != nil {
+					return err
+				}
+				// nil values aren't legal, but we can avoid panicking because of them.
+				if val.Kind() != reflect.Ptr || !val.IsNil() {
+					// value
+					if _, err := w.WriteString("value:"); err != nil {
+						return err
+					}
+					if !w.compact {
+						if err := w.WriteByte(' '); err != nil {
+							return err
+						}
+					}
+					if err := writeAny(w, val, props.mvalprop); err != nil {
+						return err
+					}
+					if err := w.WriteByte('\n'); err != nil {
+						return err
+					}
+				}
+				// close struct
+				w.unindent()
+				if err := w.WriteByte('>'); err != nil {
+					return err
+				}
+				if err := w.WriteByte('\n'); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
+			// empty bytes field
+			continue
+		}
+		if props.proto3 && fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
+			// proto3 non-repeated scalar field; skip if zero value
+			if isProto3Zero(fv) {
+				continue
+			}
+		}
+
+		if fv.Kind() == reflect.Interface {
+			// Check if it is a oneof.
+			if st.Field(i).Tag.Get("protobuf_oneof") != "" {
+				// fv is nil, or holds a pointer to generated struct.
+				// That generated struct has exactly one field,
+				// which has a protobuf struct tag.
+				if fv.IsNil() {
+					continue
+				}
+				inner := fv.Elem().Elem() // interface -> *T -> T
+				tag := inner.Type().Field(0).Tag.Get("protobuf")
+				props.Parse(tag) // Overwrite the outer props.
+				// Write the value in the oneof, not the oneof itself.
+				fv = inner.Field(0)
+
+				// Special case to cope with malformed messages gracefully:
+				// If the value in the oneof is a nil pointer, don't panic
+				// in writeAny.
+				if fv.Kind() == reflect.Ptr && fv.IsNil() {
+					// Use errors.New so writeAny won't render quotes.
+					msg := errors.New("/* nil */")
+					fv = reflect.ValueOf(&msg).Elem()
+				}
+			}
+		}
+
+		if err := writeName(w, props); err != nil {
+			return err
+		}
+		if !w.compact {
+			if err := w.WriteByte(' '); err != nil {
+				return err
+			}
+		}
+		if b, ok := fv.Interface().(raw); ok {
+			if err := writeRaw(w, b.Bytes()); err != nil {
+				return err
+			}
+			continue
+		}
+
+		if len(props.Enum) > 0 {
+			if err := writeEnum(w, fv, props); err != nil {
+				return err
+			}
+		} else if err := writeAny(w, fv, props); err != nil {
+			return err
+		}
+
+		if err := w.WriteByte('\n'); err != nil {
+			return err
+		}
+	}
+
+	// Extensions (the XXX_extensions field).
+	pv := sv
+	if pv.CanAddr() {
+		pv = sv.Addr()
+	} else {
+		pv = reflect.New(sv.Type())
+		pv.Elem().Set(sv)
+	}
+	if pv.Type().Implements(extendableProtoType) {
+		if err := writeExtensions(w, pv); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// writeRaw writes an uninterpreted raw message.
+func writeRaw(w *textWriter, b []byte) error {
+	if err := w.WriteByte('<'); err != nil {
+		return err
+	}
+	if !w.compact {
+		if err := w.WriteByte('\n'); err != nil {
+			return err
+		}
+	}
+	w.indent()
+	if err := writeUnknownStruct(w, b); err != nil {
+		return err
+	}
+	w.unindent()
+	if err := w.WriteByte('>'); err != nil {
+		return err
+	}
+	return nil
+}
+
+// writeAny writes an arbitrary field.
+func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
+	v = reflect.Indirect(v)
+
+	if props != nil && len(props.CustomType) > 0 {
+		custom, ok := v.Interface().(Marshaler)
+		if ok {
+			data, err := custom.Marshal()
+			if err != nil {
+				return err
+			}
+			if err := writeString(w, string(data)); err != nil {
+				return err
+			}
+			return nil
+		}
+	}
+
+	// Floats have special cases.
+	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
+		x := v.Float()
+		var b []byte
+		switch {
+		case math.IsInf(x, 1):
+			b = posInf
+		case math.IsInf(x, -1):
+			b = negInf
+		case math.IsNaN(x):
+			b = nan
+		}
+		if b != nil {
+			_, err := w.Write(b)
+			return err
+		}
+		// Other values are handled below.
+	}
+
+	// We don't attempt to serialise every possible value type; only those
+	// that can occur in protocol buffers.
+	switch v.Kind() {
+	case reflect.Slice:
+		// Should only be a []byte; repeated fields are handled in writeStruct.
+		if err := writeString(w, string(v.Bytes())); err != nil {
+			return err
+		}
+	case reflect.String:
+		if err := writeString(w, v.String()); err != nil {
+			return err
+		}
+	case reflect.Struct:
+		// Required/optional group/message.
+		var bra, ket byte = '<', '>'
+		if props != nil && props.Wire == "group" {
+			bra, ket = '{', '}'
+		}
+		if err := w.WriteByte(bra); err != nil {
+			return err
+		}
+		if !w.compact {
+			if err := w.WriteByte('\n'); err != nil {
+				return err
+			}
+		}
+		w.indent()
+		if tm, ok := v.Interface().(encoding.TextMarshaler); ok {
+			text, err := tm.MarshalText()
+			if err != nil {
+				return err
+			}
+			if _, err = w.Write(text); err != nil {
+				return err
+			}
+		} else if err := writeStruct(w, v); err != nil {
+			return err
+		}
+		w.unindent()
+		if err := w.WriteByte(ket); err != nil {
+			return err
+		}
+	default:
+		_, err := fmt.Fprint(w, v.Interface())
+		return err
+	}
+	return nil
+}
+
+// equivalent to C's isprint.
+func isprint(c byte) bool {
+	return c >= 0x20 && c < 0x7f
+}
+
+// writeString writes a string in the protocol buffer text format.
+// It is similar to strconv.Quote except we don't use Go escape sequences,
+// we treat the string as a byte sequence, and we use octal escapes.
+// These differences are to maintain interoperability with the other
+// languages' implementations of the text format.
+func writeString(w *textWriter, s string) error {
+	// use WriteByte here to get any needed indent
+	if err := w.WriteByte('"'); err != nil {
+		return err
+	}
+	// Loop over the bytes, not the runes.
+	for i := 0; i < len(s); i++ {
+		var err error
+		// Divergence from C++: we don't escape apostrophes.
+		// There's no need to escape them, and the C++ parser
+		// copes with a naked apostrophe.
+		switch c := s[i]; c {
+		case '\n':
+			_, err = w.w.Write(backslashN)
+		case '\r':
+			_, err = w.w.Write(backslashR)
+		case '\t':
+			_, err = w.w.Write(backslashT)
+		case '"':
+			_, err = w.w.Write(backslashDQ)
+		case '\\':
+			_, err = w.w.Write(backslashBS)
+		default:
+			if isprint(c) {
+				err = w.w.WriteByte(c)
+			} else {
+				_, err = fmt.Fprintf(w.w, "\\%03o", c)
+			}
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return w.WriteByte('"')
+}
+
+func writeUnknownStruct(w *textWriter, data []byte) (err error) {
+	if !w.compact {
+		if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
+			return err
+		}
+	}
+	b := NewBuffer(data)
+	for b.index < len(b.buf) {
+		x, err := b.DecodeVarint()
+		if err != nil {
+			_, ferr := fmt.Fprintf(w, "/* %v */\n", err)
+			return ferr
+		}
+		wire, tag := x&7, x>>3
+		if wire == WireEndGroup {
+			w.unindent()
+			if _, werr := w.Write(endBraceNewline); werr != nil {
+				return werr
+			}
+			continue
+		}
+		if _, ferr := fmt.Fprint(w, tag); ferr != nil {
+			return ferr
+		}
+		if wire != WireStartGroup {
+			if err = w.WriteByte(':'); err != nil {
+				return err
+			}
+		}
+		if !w.compact || wire == WireStartGroup {
+			if err = w.WriteByte(' '); err != nil {
+				return err
+			}
+		}
+		switch wire {
+		case WireBytes:
+			buf, e := b.DecodeRawBytes(false)
+			if e == nil {
+				_, err = fmt.Fprintf(w, "%q", buf)
+			} else {
+				_, err = fmt.Fprintf(w, "/* %v */", e)
+			}
+		case WireFixed32:
+			x, err = b.DecodeFixed32()
+			err = writeUnknownInt(w, x, err)
+		case WireFixed64:
+			x, err = b.DecodeFixed64()
+			err = writeUnknownInt(w, x, err)
+		case WireStartGroup:
+			err = w.WriteByte('{')
+			w.indent()
+		case WireVarint:
+			x, err = b.DecodeVarint()
+			err = writeUnknownInt(w, x, err)
+		default:
+			_, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
+		}
+		if err != nil {
+			return err
+		}
+		if err := w.WriteByte('\n'); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func writeUnknownInt(w *textWriter, x uint64, err error) error {
+	if err == nil {
+		_, err = fmt.Fprint(w, x)
+	} else {
+		_, err = fmt.Fprintf(w, "/* %v */", err)
+	}
+	return err
+}
+
+type int32Slice []int32
+
+func (s int32Slice) Len() int           { return len(s) }
+func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// writeExtensions writes all the extensions in pv.
+// pv is assumed to be a pointer to a protocol message struct that is extendable.
+func writeExtensions(w *textWriter, pv reflect.Value) error {
+	emap := extensionMaps[pv.Type().Elem()]
+	ep := pv.Interface().(extendableProto)
+
+	// Order the extensions by ID.
+	// This isn't strictly necessary, but it will give us
+	// canonical output, which will also make testing easier.
+	var m map[int32]Extension
+	if em, ok := ep.(extensionsMap); ok {
+		m = em.ExtensionMap()
+	} else if em, ok := ep.(extensionsBytes); ok {
+		eb := em.GetExtensions()
+		var err error
+		m, err = BytesToExtensionsMap(*eb)
+		if err != nil {
+			return err
+		}
+	}
+
+	ids := make([]int32, 0, len(m))
+	for id := range m {
+		ids = append(ids, id)
+	}
+	sort.Sort(int32Slice(ids))
+
+	for _, extNum := range ids {
+		ext := m[extNum]
+		var desc *ExtensionDesc
+		if emap != nil {
+			desc = emap[extNum]
+		}
+		if desc == nil {
+			// Unknown extension.
+			if err := writeUnknownStruct(w, ext.enc); err != nil {
+				return err
+			}
+			continue
+		}
+
+		pb, err := GetExtension(ep, desc)
+		if err != nil {
+			return fmt.Errorf("failed getting extension: %v", err)
+		}
+
+		// Repeated extensions will appear as a slice.
+		if !desc.repeated() {
+			if err := writeExtension(w, desc.Name, pb); err != nil {
+				return err
+			}
+		} else {
+			v := reflect.ValueOf(pb)
+			for i := 0; i < v.Len(); i++ {
+				if err := writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
+					return err
+				}
+			}
+		}
+	}
+	return nil
+}
+
+func writeExtension(w *textWriter, name string, pb interface{}) error {
+	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
+		return err
+	}
+	if !w.compact {
+		if err := w.WriteByte(' '); err != nil {
+			return err
+		}
+	}
+	if err := writeAny(w, reflect.ValueOf(pb), nil); err != nil {
+		return err
+	}
+	if err := w.WriteByte('\n'); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (w *textWriter) writeIndent() {
+	if !w.complete {
+		return
+	}
+	remain := w.ind * 2
+	for remain > 0 {
+		n := remain
+		if n > len(spaces) {
+			n = len(spaces)
+		}
+		w.w.Write(spaces[:n])
+		remain -= n
+	}
+	w.complete = false
+}
+
+func marshalText(w io.Writer, pb Message, compact bool) error {
+	val := reflect.ValueOf(pb)
+	if pb == nil || val.IsNil() {
+		w.Write([]byte("<nil>"))
+		return nil
+	}
+	var bw *bufio.Writer
+	ww, ok := w.(writer)
+	if !ok {
+		bw = bufio.NewWriter(w)
+		ww = bw
+	}
+	aw := &textWriter{
+		w:        ww,
+		complete: true,
+		compact:  compact,
+	}
+
+	if tm, ok := pb.(encoding.TextMarshaler); ok {
+		text, err := tm.MarshalText()
+		if err != nil {
+			return err
+		}
+		if _, err = aw.Write(text); err != nil {
+			return err
+		}
+		if bw != nil {
+			return bw.Flush()
+		}
+		return nil
+	}
+	// Dereference the received pointer so we don't have outer < and >.
+	v := reflect.Indirect(val)
+	if err := writeStruct(aw, v); err != nil {
+		return err
+	}
+	if bw != nil {
+		return bw.Flush()
+	}
+	return nil
+}
+
+// MarshalText writes a given protocol buffer in text format.
+// The only errors returned are from w.
+func MarshalText(w io.Writer, pb Message) error {
+	return marshalText(w, pb, false)
+}
+
+// MarshalTextString is the same as MarshalText, but returns the string directly.
+func MarshalTextString(pb Message) string {
+	var buf bytes.Buffer
+	marshalText(&buf, pb, false)
+	return buf.String()
+}
+
+// CompactText writes a given protocol buffer in compact text format (one line).
+func CompactText(w io.Writer, pb Message) error { return marshalText(w, pb, true) }
+
+// CompactTextString is the same as CompactText, but returns the string directly.
+func CompactTextString(pb Message) string {
+	var buf bytes.Buffer
+	marshalText(&buf, pb, true)
+	return buf.String()
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/text_gogo.go b/vendor/github.com/gogo/protobuf/proto/text_gogo.go
new file mode 100644
index 0000000000..cdb23373c3
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/text_gogo.go
@@ -0,0 +1,55 @@
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"fmt"
+	"reflect"
+)
+
+func writeEnum(w *textWriter, v reflect.Value, props *Properties) error {
+	m, ok := enumStringMaps[props.Enum]
+	if !ok {
+		if err := writeAny(w, v, props); err != nil {
+			return err
+		}
+	}
+	key := int32(0)
+	if v.Kind() == reflect.Ptr {
+		key = int32(v.Elem().Int())
+	} else {
+		key = int32(v.Int())
+	}
+	s, ok := m[key]
+	if !ok {
+		if err := writeAny(w, v, props); err != nil {
+			return err
+		}
+	}
+	_, err := fmt.Fprint(w, s)
+	return err
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/text_parser.go b/vendor/github.com/gogo/protobuf/proto/text_parser.go
new file mode 100644
index 0000000000..61b4bc8cc8
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/text_parser.go
@@ -0,0 +1,849 @@
+// Extensions for Protocol Buffers to create more go like structures.
+//
+// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
+// http://github.com/gogo/protobuf/gogoproto
+//
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+// Functions for parsing the Text protocol buffer format.
+// TODO: message sets.
+
+import (
+	"encoding"
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+	"unicode/utf8"
+)
+
+type ParseError struct {
+	Message string
+	Line    int // 1-based line number
+	Offset  int // 0-based byte offset from start of input
+}
+
+func (p *ParseError) Error() string {
+	if p.Line == 1 {
+		// show offset only for first line
+		return fmt.Sprintf("line 1.%d: %v", p.Offset, p.Message)
+	}
+	return fmt.Sprintf("line %d: %v", p.Line, p.Message)
+}
+
+type token struct {
+	value    string
+	err      *ParseError
+	line     int    // line number
+	offset   int    // byte number from start of input, not start of line
+	unquoted string // the unquoted version of value, if it was a quoted string
+}
+
+func (t *token) String() string {
+	if t.err == nil {
+		return fmt.Sprintf("%q (line=%d, offset=%d)", t.value, t.line, t.offset)
+	}
+	return fmt.Sprintf("parse error: %v", t.err)
+}
+
+type textParser struct {
+	s            string // remaining input
+	done         bool   // whether the parsing is finished (success or error)
+	backed       bool   // whether back() was called
+	offset, line int
+	cur          token
+}
+
+func newTextParser(s string) *textParser {
+	p := new(textParser)
+	p.s = s
+	p.line = 1
+	p.cur.line = 1
+	return p
+}
+
+func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
+	pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
+	p.cur.err = pe
+	p.done = true
+	return pe
+}
+
+// Numbers and identifiers are matched by [-+._A-Za-z0-9]
+func isIdentOrNumberChar(c byte) bool {
+	switch {
+	case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
+		return true
+	case '0' <= c && c <= '9':
+		return true
+	}
+	switch c {
+	case '-', '+', '.', '_':
+		return true
+	}
+	return false
+}
+
+func isWhitespace(c byte) bool {
+	switch c {
+	case ' ', '\t', '\n', '\r':
+		return true
+	}
+	return false
+}
+
+func isQuote(c byte) bool {
+	switch c {
+	case '"', '\'':
+		return true
+	}
+	return false
+}
+
+func (p *textParser) skipWhitespace() {
+	i := 0
+	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
+		if p.s[i] == '#' {
+			// comment; skip to end of line or input
+			for i < len(p.s) && p.s[i] != '\n' {
+				i++
+			}
+			if i == len(p.s) {
+				break
+			}
+		}
+		if p.s[i] == '\n' {
+			p.line++
+		}
+		i++
+	}
+	p.offset += i
+	p.s = p.s[i:len(p.s)]
+	if len(p.s) == 0 {
+		p.done = true
+	}
+}
+
+func (p *textParser) advance() {
+	// Skip whitespace
+	p.skipWhitespace()
+	if p.done {
+		return
+	}
+
+	// Start of non-whitespace
+	p.cur.err = nil
+	p.cur.offset, p.cur.line = p.offset, p.line
+	p.cur.unquoted = ""
+	switch p.s[0] {
+	case '<', '>', '{', '}', ':', '[', ']', ';', ',':
+		// Single symbol
+		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
+	case '"', '\'':
+		// Quoted string
+		i := 1
+		for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
+			if p.s[i] == '\\' && i+1 < len(p.s) {
+				// skip escaped char
+				i++
+			}
+			i++
+		}
+		if i >= len(p.s) || p.s[i] != p.s[0] {
+			p.errorf("unmatched quote")
+			return
+		}
+		unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
+		if err != nil {
+			p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
+			return
+		}
+		p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
+		p.cur.unquoted = unq
+	default:
+		i := 0
+		for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
+			i++
+		}
+		if i == 0 {
+			p.errorf("unexpected byte %#x", p.s[0])
+			return
+		}
+		p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
+	}
+	p.offset += len(p.cur.value)
+}
+
+var (
+	errBadUTF8 = errors.New("proto: bad UTF-8")
+	errBadHex  = errors.New("proto: bad hexadecimal")
+)
+
+func unquoteC(s string, quote rune) (string, error) {
+	// This is based on C++'s tokenizer.cc.
+	// Despite its name, this is *not* parsing C syntax.
+	// For instance, "\0" is an invalid quoted string.
+
+	// Avoid allocation in trivial cases.
+	simple := true
+	for _, r := range s {
+		if r == '\\' || r == quote {
+			simple = false
+			break
+		}
+	}
+	if simple {
+		return s, nil
+	}
+
+	buf := make([]byte, 0, 3*len(s)/2)
+	for len(s) > 0 {
+		r, n := utf8.DecodeRuneInString(s)
+		if r == utf8.RuneError && n == 1 {
+			return "", errBadUTF8
+		}
+		s = s[n:]
+		if r != '\\' {
+			if r < utf8.RuneSelf {
+				buf = append(buf, byte(r))
+			} else {
+				buf = append(buf, string(r)...)
+			}
+			continue
+		}
+
+		ch, tail, err := unescape(s)
+		if err != nil {
+			return "", err
+		}
+		buf = append(buf, ch...)
+		s = tail
+	}
+	return string(buf), nil
+}
+
+func unescape(s string) (ch string, tail string, err error) {
+	r, n := utf8.DecodeRuneInString(s)
+	if r == utf8.RuneError && n == 1 {
+		return "", "", errBadUTF8
+	}
+	s = s[n:]
+	switch r {
+	case 'a':
+		return "\a", s, nil
+	case 'b':
+		return "\b", s, nil
+	case 'f':
+		return "\f", s, nil
+	case 'n':
+		return "\n", s, nil
+	case 'r':
+		return "\r", s, nil
+	case 't':
+		return "\t", s, nil
+	case 'v':
+		return "\v", s, nil
+	case '?':
+		return "?", s, nil // trigraph workaround
+	case '\'', '"', '\\':
+		return string(r), s, nil
+	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
+		if len(s) < 2 {
+			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
+		}
+		base := 8
+		ss := s[:2]
+		s = s[2:]
+		if r == 'x' || r == 'X' {
+			base = 16
+		} else {
+			ss = string(r) + ss
+		}
+		i, err := strconv.ParseUint(ss, base, 8)
+		if err != nil {
+			return "", "", err
+		}
+		return string([]byte{byte(i)}), s, nil
+	case 'u', 'U':
+		n := 4
+		if r == 'U' {
+			n = 8
+		}
+		if len(s) < n {
+			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
+		}
+
+		bs := make([]byte, n/2)
+		for i := 0; i < n; i += 2 {
+			a, ok1 := unhex(s[i])
+			b, ok2 := unhex(s[i+1])
+			if !ok1 || !ok2 {
+				return "", "", errBadHex
+			}
+			bs[i/2] = a<<4 | b
+		}
+		s = s[n:]
+		return string(bs), s, nil
+	}
+	return "", "", fmt.Errorf(`unknown escape \%c`, r)
+}
+
+// Adapted from src/pkg/strconv/quote.go.
+func unhex(b byte) (v byte, ok bool) {
+	switch {
+	case '0' <= b && b <= '9':
+		return b - '0', true
+	case 'a' <= b && b <= 'f':
+		return b - 'a' + 10, true
+	case 'A' <= b && b <= 'F':
+		return b - 'A' + 10, true
+	}
+	return 0, false
+}
+
+// Back off the parser by one token. Can only be done between calls to next().
+// It makes the next advance() a no-op.
+func (p *textParser) back() { p.backed = true }
+
+// Advances the parser and returns the new current token.
+func (p *textParser) next() *token {
+	if p.backed || p.done {
+		p.backed = false
+		return &p.cur
+	}
+	p.advance()
+	if p.done {
+		p.cur.value = ""
+	} else if len(p.cur.value) > 0 && isQuote(p.cur.value[0]) {
+		// Look for multiple quoted strings separated by whitespace,
+		// and concatenate them.
+		cat := p.cur
+		for {
+			p.skipWhitespace()
+			if p.done || !isQuote(p.s[0]) {
+				break
+			}
+			p.advance()
+			if p.cur.err != nil {
+				return &p.cur
+			}
+			cat.value += " " + p.cur.value
+			cat.unquoted += p.cur.unquoted
+		}
+		p.done = false // parser may have seen EOF, but we want to return cat
+		p.cur = cat
+	}
+	return &p.cur
+}
+
+func (p *textParser) consumeToken(s string) error {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value != s {
+		p.back()
+		return p.errorf("expected %q, found %q", s, tok.value)
+	}
+	return nil
+}
+
+// Return a RequiredNotSetError indicating which required field was not set.
+func (p *textParser) missingRequiredFieldError(sv reflect.Value) *RequiredNotSetError {
+	st := sv.Type()
+	sprops := GetProperties(st)
+	for i := 0; i < st.NumField(); i++ {
+		if !isNil(sv.Field(i)) {
+			continue
+		}
+
+		props := sprops.Prop[i]
+		if props.Required {
+			return &RequiredNotSetError{fmt.Sprintf("%v.%v", st, props.OrigName)}
+		}
+	}
+	return &RequiredNotSetError{fmt.Sprintf("%v.<unknown field name>", st)} // should not happen
+}
+
+// Returns the index in the struct for the named field, as well as the parsed tag properties.
+func structFieldByName(sprops *StructProperties, name string) (int, *Properties, bool) {
+	i, ok := sprops.decoderOrigNames[name]
+	if ok {
+		return i, sprops.Prop[i], true
+	}
+	return -1, nil, false
+}
+
+// Consume a ':' from the input stream (if the next token is a colon),
+// returning an error if a colon is needed but not present.
+func (p *textParser) checkForColon(props *Properties, typ reflect.Type) *ParseError {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value != ":" {
+		// Colon is optional when the field is a group or message.
+		needColon := true
+		switch props.Wire {
+		case "group":
+			needColon = false
+		case "bytes":
+			// A "bytes" field is either a message, a string, or a repeated field;
+			// those three become *T, *string and []T respectively, so we can check for
+			// this field being a pointer to a non-string.
+			if typ.Kind() == reflect.Ptr {
+				// *T or *string
+				if typ.Elem().Kind() == reflect.String {
+					break
+				}
+			} else if typ.Kind() == reflect.Slice {
+				// []T or []*T
+				if typ.Elem().Kind() != reflect.Ptr {
+					break
+				}
+			} else if typ.Kind() == reflect.String {
+				// The proto3 exception is for a string field,
+				// which requires a colon.
+				break
+			}
+			needColon = false
+		}
+		if needColon {
+			return p.errorf("expected ':', found %q", tok.value)
+		}
+		p.back()
+	}
+	return nil
+}
+
+func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
+	st := sv.Type()
+	sprops := GetProperties(st)
+	reqCount := sprops.reqCount
+	var reqFieldErr error
+	fieldSet := make(map[string]bool)
+	// A struct is a sequence of "name: value", terminated by one of
+	// '>' or '}', or the end of the input.  A name may also be
+	// "[extension]".
+	for {
+		tok := p.next()
+		if tok.err != nil {
+			return tok.err
+		}
+		if tok.value == terminator {
+			break
+		}
+		if tok.value == "[" {
+			// Looks like an extension.
+			//
+			// TODO: Check whether we need to handle
+			// namespace rooted names (e.g. ".something.Foo").
+			tok = p.next()
+			if tok.err != nil {
+				return tok.err
+			}
+			var desc *ExtensionDesc
+			// This could be faster, but it's functional.
+			// TODO: Do something smarter than a linear scan.
+			for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
+				if d.Name == tok.value {
+					desc = d
+					break
+				}
+			}
+			if desc == nil {
+				return p.errorf("unrecognized extension %q", tok.value)
+			}
+			// Check the extension terminator.
+			tok = p.next()
+			if tok.err != nil {
+				return tok.err
+			}
+			if tok.value != "]" {
+				return p.errorf("unrecognized extension terminator %q", tok.value)
+			}
+
+			props := &Properties{}
+			props.Parse(desc.Tag)
+
+			typ := reflect.TypeOf(desc.ExtensionType)
+			if err := p.checkForColon(props, typ); err != nil {
+				return err
+			}
+
+			rep := desc.repeated()
+
+			// Read the extension structure, and set it in
+			// the value we're constructing.
+			var ext reflect.Value
+			if !rep {
+				ext = reflect.New(typ).Elem()
+			} else {
+				ext = reflect.New(typ.Elem()).Elem()
+			}
+			if err := p.readAny(ext, props); err != nil {
+				if _, ok := err.(*RequiredNotSetError); !ok {
+					return err
+				}
+				reqFieldErr = err
+			}
+			ep := sv.Addr().Interface().(extendableProto)
+			if !rep {
+				SetExtension(ep, desc, ext.Interface())
+			} else {
+				old, err := GetExtension(ep, desc)
+				var sl reflect.Value
+				if err == nil {
+					sl = reflect.ValueOf(old) // existing slice
+				} else {
+					sl = reflect.MakeSlice(typ, 0, 1)
+				}
+				sl = reflect.Append(sl, ext)
+				SetExtension(ep, desc, sl.Interface())
+			}
+			if err := p.consumeOptionalSeparator(); err != nil {
+				return err
+			}
+			continue
+		}
+
+		// This is a normal, non-extension field.
+		name := tok.value
+		var dst reflect.Value
+		fi, props, ok := structFieldByName(sprops, name)
+		if ok {
+			dst = sv.Field(fi)
+		} else if oop, ok := sprops.OneofTypes[name]; ok {
+			// It is a oneof.
+			props = oop.Prop
+			nv := reflect.New(oop.Type.Elem())
+			dst = nv.Elem().Field(0)
+			sv.Field(oop.Field).Set(nv)
+		}
+		if !dst.IsValid() {
+			return p.errorf("unknown field name %q in %v", name, st)
+		}
+
+		if dst.Kind() == reflect.Map {
+			// Consume any colon.
+			if err := p.checkForColon(props, dst.Type()); err != nil {
+				return err
+			}
+
+			// Construct the map if it doesn't already exist.
+			if dst.IsNil() {
+				dst.Set(reflect.MakeMap(dst.Type()))
+			}
+			key := reflect.New(dst.Type().Key()).Elem()
+			val := reflect.New(dst.Type().Elem()).Elem()
+
+			// The map entry should be this sequence of tokens:
+			//	< key : KEY value : VALUE >
+			// Technically the "key" and "value" could come in any order,
+			// but in practice they won't.
+
+			tok := p.next()
+			var terminator string
+			switch tok.value {
+			case "<":
+				terminator = ">"
+			case "{":
+				terminator = "}"
+			default:
+				return p.errorf("expected '{' or '<', found %q", tok.value)
+			}
+			if err := p.consumeToken("key"); err != nil {
+				return err
+			}
+			if err := p.consumeToken(":"); err != nil {
+				return err
+			}
+			if err := p.readAny(key, props.mkeyprop); err != nil {
+				return err
+			}
+			if err := p.consumeOptionalSeparator(); err != nil {
+				return err
+			}
+			if err := p.consumeToken("value"); err != nil {
+				return err
+			}
+			if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
+				return err
+			}
+			if err := p.readAny(val, props.mvalprop); err != nil {
+				return err
+			}
+			if err := p.consumeOptionalSeparator(); err != nil {
+				return err
+			}
+			if err := p.consumeToken(terminator); err != nil {
+				return err
+			}
+
+			dst.SetMapIndex(key, val)
+			continue
+		}
+
+		// Check that it's not already set if it's not a repeated field.
+		if !props.Repeated && fieldSet[name] {
+			return p.errorf("non-repeated field %q was repeated", name)
+		}
+
+		if err := p.checkForColon(props, dst.Type()); err != nil {
+			return err
+		}
+
+		// Parse into the field.
+		fieldSet[name] = true
+		if err := p.readAny(dst, props); err != nil {
+			if _, ok := err.(*RequiredNotSetError); !ok {
+				return err
+			}
+			reqFieldErr = err
+		} else if props.Required {
+			reqCount--
+		}
+
+		if err := p.consumeOptionalSeparator(); err != nil {
+			return err
+		}
+
+	}
+
+	if reqCount > 0 {
+		return p.missingRequiredFieldError(sv)
+	}
+	return reqFieldErr
+}
+
+// consumeOptionalSeparator consumes an optional semicolon or comma.
+// It is used in readStruct to provide backward compatibility.
+func (p *textParser) consumeOptionalSeparator() error {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value != ";" && tok.value != "," {
+		p.back()
+	}
+	return nil
+}
+
+func (p *textParser) readAny(v reflect.Value, props *Properties) error {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value == "" {
+		return p.errorf("unexpected EOF")
+	}
+	if len(props.CustomType) > 0 {
+		if props.Repeated {
+			t := reflect.TypeOf(v.Interface())
+			if t.Kind() == reflect.Slice {
+				tc := reflect.TypeOf(new(Marshaler))
+				ok := t.Elem().Implements(tc.Elem())
+				if ok {
+					fv := v
+					flen := fv.Len()
+					if flen == fv.Cap() {
+						nav := reflect.MakeSlice(v.Type(), flen, 2*flen+1)
+						reflect.Copy(nav, fv)
+						fv.Set(nav)
+					}
+					fv.SetLen(flen + 1)
+
+					// Read one.
+					p.back()
+					return p.readAny(fv.Index(flen), props)
+				}
+			}
+		}
+		if reflect.TypeOf(v.Interface()).Kind() == reflect.Ptr {
+			custom := reflect.New(props.ctype.Elem()).Interface().(Unmarshaler)
+			err := custom.Unmarshal([]byte(tok.unquoted))
+			if err != nil {
+				return p.errorf("%v %v: %v", err, v.Type(), tok.value)
+			}
+			v.Set(reflect.ValueOf(custom))
+		} else {
+			custom := reflect.New(reflect.TypeOf(v.Interface())).Interface().(Unmarshaler)
+			err := custom.Unmarshal([]byte(tok.unquoted))
+			if err != nil {
+				return p.errorf("%v %v: %v", err, v.Type(), tok.value)
+			}
+			v.Set(reflect.Indirect(reflect.ValueOf(custom)))
+		}
+		return nil
+	}
+	switch fv := v; fv.Kind() {
+	case reflect.Slice:
+		at := v.Type()
+		if at.Elem().Kind() == reflect.Uint8 {
+			// Special case for []byte
+			if tok.value[0] != '"' && tok.value[0] != '\'' {
+				// Deliberately written out here, as the error after
+				// this switch statement would write "invalid []byte: ...",
+				// which is not as user-friendly.
+				return p.errorf("invalid string: %v", tok.value)
+			}
+			bytes := []byte(tok.unquoted)
+			fv.Set(reflect.ValueOf(bytes))
+			return nil
+		}
+		// Repeated field.
+		if tok.value == "[" {
+			// Repeated field with list notation, like [1,2,3].
+			for {
+				fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
+				err := p.readAny(fv.Index(fv.Len()-1), props)
+				if err != nil {
+					return err
+				}
+				ntok := p.next()
+				if ntok.err != nil {
+					return ntok.err
+				}
+				if ntok.value == "]" {
+					break
+				}
+				if ntok.value != "," {
+					return p.errorf("Expected ']' or ',' found %q", ntok.value)
+				}
+			}
+			return nil
+		}
+		// One value of the repeated field.
+		p.back()
+		fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
+		return p.readAny(fv.Index(fv.Len()-1), props)
+	case reflect.Bool:
+		// Either "true", "false", 1 or 0.
+		switch tok.value {
+		case "true", "1":
+			fv.SetBool(true)
+			return nil
+		case "false", "0":
+			fv.SetBool(false)
+			return nil
+		}
+	case reflect.Float32, reflect.Float64:
+		v := tok.value
+		// Ignore 'f' for compatibility with output generated by C++, but don't
+		// remove 'f' when the value is "-inf" or "inf".
+		if strings.HasSuffix(v, "f") && tok.value != "-inf" && tok.value != "inf" {
+			v = v[:len(v)-1]
+		}
+		if f, err := strconv.ParseFloat(v, fv.Type().Bits()); err == nil {
+			fv.SetFloat(f)
+			return nil
+		}
+	case reflect.Int32:
+		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
+			fv.SetInt(x)
+			return nil
+		}
+
+		if len(props.Enum) == 0 {
+			break
+		}
+		m, ok := enumValueMaps[props.Enum]
+		if !ok {
+			break
+		}
+		x, ok := m[tok.value]
+		if !ok {
+			break
+		}
+		fv.SetInt(int64(x))
+		return nil
+	case reflect.Int64:
+		if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
+			fv.SetInt(x)
+			return nil
+		}
+
+	case reflect.Ptr:
+		// A basic field (indirected through pointer), or a repeated message/group
+		p.back()
+		fv.Set(reflect.New(fv.Type().Elem()))
+		return p.readAny(fv.Elem(), props)
+	case reflect.String:
+		if tok.value[0] == '"' || tok.value[0] == '\'' {
+			fv.SetString(tok.unquoted)
+			return nil
+		}
+	case reflect.Struct:
+		var terminator string
+		switch tok.value {
+		case "{":
+			terminator = "}"
+		case "<":
+			terminator = ">"
+		default:
+			return p.errorf("expected '{' or '<', found %q", tok.value)
+		}
+		// TODO: Handle nested messages which implement encoding.TextUnmarshaler.
+		return p.readStruct(fv, terminator)
+	case reflect.Uint32:
+		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
+			fv.SetUint(uint64(x))
+			return nil
+		}
+	case reflect.Uint64:
+		if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
+			fv.SetUint(x)
+			return nil
+		}
+	}
+	return p.errorf("invalid %v: %v", v.Type(), tok.value)
+}
+
+// UnmarshalText reads a protocol buffer in Text format. UnmarshalText resets pb
+// before starting to unmarshal, so any existing data in pb is always removed.
+// If a required field is not set and no other error occurs,
+// UnmarshalText returns *RequiredNotSetError.
+func UnmarshalText(s string, pb Message) error {
+	if um, ok := pb.(encoding.TextUnmarshaler); ok {
+		err := um.UnmarshalText([]byte(s))
+		return err
+	}
+	pb.Reset()
+	v := reflect.ValueOf(pb)
+	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
+		return pe
+	}
+	return nil
+}
diff --git a/vendor/github.com/golang/protobuf/LICENSE b/vendor/github.com/golang/protobuf/LICENSE
new file mode 100644
index 0000000000..1b1b1921ef
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/LICENSE
@@ -0,0 +1,31 @@
+Go support for Protocol Buffers - Google's data interchange format
+
+Copyright 2010 The Go Authors.  All rights reserved.
+https://github.com/golang/protobuf
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/vendor/github.com/golang/protobuf/proto/clone.go b/vendor/github.com/golang/protobuf/proto/clone.go
new file mode 100644
index 0000000000..e98ddec981
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/clone.go
@@ -0,0 +1,223 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2011 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Protocol buffer deep copy and merge.
+// TODO: RawMessage.
+
+package proto
+
+import (
+	"log"
+	"reflect"
+	"strings"
+)
+
+// Clone returns a deep copy of a protocol buffer.
+func Clone(pb Message) Message {
+	in := reflect.ValueOf(pb)
+	if in.IsNil() {
+		return pb
+	}
+
+	out := reflect.New(in.Type().Elem())
+	// out is empty so a merge is a deep copy.
+	mergeStruct(out.Elem(), in.Elem())
+	return out.Interface().(Message)
+}
+
+// Merge merges src into dst.
+// Required and optional fields that are set in src will be set to that value in dst.
+// Elements of repeated fields will be appended.
+// Merge panics if src and dst are not the same type, or if dst is nil.
+func Merge(dst, src Message) {
+	in := reflect.ValueOf(src)
+	out := reflect.ValueOf(dst)
+	if out.IsNil() {
+		panic("proto: nil destination")
+	}
+	if in.Type() != out.Type() {
+		// Explicit test prior to mergeStruct so that mistyped nils will fail
+		panic("proto: type mismatch")
+	}
+	if in.IsNil() {
+		// Merging nil into non-nil is a quiet no-op
+		return
+	}
+	mergeStruct(out.Elem(), in.Elem())
+}
+
+func mergeStruct(out, in reflect.Value) {
+	sprop := GetProperties(in.Type())
+	for i := 0; i < in.NumField(); i++ {
+		f := in.Type().Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
+	}
+
+	if emIn, ok := in.Addr().Interface().(extendableProto); ok {
+		emOut := out.Addr().Interface().(extendableProto)
+		mergeExtension(emOut.ExtensionMap(), emIn.ExtensionMap())
+	}
+
+	uf := in.FieldByName("XXX_unrecognized")
+	if !uf.IsValid() {
+		return
+	}
+	uin := uf.Bytes()
+	if len(uin) > 0 {
+		out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...))
+	}
+}
+
+// mergeAny performs a merge between two values of the same type.
+// viaPtr indicates whether the values were indirected through a pointer (implying proto2).
+// prop is set if this is a struct field (it may be nil).
+func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
+	if in.Type() == protoMessageType {
+		if !in.IsNil() {
+			if out.IsNil() {
+				out.Set(reflect.ValueOf(Clone(in.Interface().(Message))))
+			} else {
+				Merge(out.Interface().(Message), in.Interface().(Message))
+			}
+		}
+		return
+	}
+	switch in.Kind() {
+	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
+		reflect.String, reflect.Uint32, reflect.Uint64:
+		if !viaPtr && isProto3Zero(in) {
+			return
+		}
+		out.Set(in)
+	case reflect.Interface:
+		// Probably a oneof field; copy non-nil values.
+		if in.IsNil() {
+			return
+		}
+		// Allocate destination if it is not set, or set to a different type.
+		// Otherwise we will merge as normal.
+		if out.IsNil() || out.Elem().Type() != in.Elem().Type() {
+			out.Set(reflect.New(in.Elem().Elem().Type())) // interface -> *T -> T -> new(T)
+		}
+		mergeAny(out.Elem(), in.Elem(), false, nil)
+	case reflect.Map:
+		if in.Len() == 0 {
+			return
+		}
+		if out.IsNil() {
+			out.Set(reflect.MakeMap(in.Type()))
+		}
+		// For maps with value types of *T or []byte we need to deep copy each value.
+		elemKind := in.Type().Elem().Kind()
+		for _, key := range in.MapKeys() {
+			var val reflect.Value
+			switch elemKind {
+			case reflect.Ptr:
+				val = reflect.New(in.Type().Elem().Elem())
+				mergeAny(val, in.MapIndex(key), false, nil)
+			case reflect.Slice:
+				val = in.MapIndex(key)
+				val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
+			default:
+				val = in.MapIndex(key)
+			}
+			out.SetMapIndex(key, val)
+		}
+	case reflect.Ptr:
+		if in.IsNil() {
+			return
+		}
+		if out.IsNil() {
+			out.Set(reflect.New(in.Elem().Type()))
+		}
+		mergeAny(out.Elem(), in.Elem(), true, nil)
+	case reflect.Slice:
+		if in.IsNil() {
+			return
+		}
+		if in.Type().Elem().Kind() == reflect.Uint8 {
+			// []byte is a scalar bytes field, not a repeated field.
+
+			// Edge case: if this is in a proto3 message, a zero length
+			// bytes field is considered the zero value, and should not
+			// be merged.
+			if prop != nil && prop.proto3 && in.Len() == 0 {
+				return
+			}
+
+			// Make a deep copy.
+			// Append to []byte{} instead of []byte(nil) so that we never end up
+			// with a nil result.
+			out.SetBytes(append([]byte{}, in.Bytes()...))
+			return
+		}
+		n := in.Len()
+		if out.IsNil() {
+			out.Set(reflect.MakeSlice(in.Type(), 0, n))
+		}
+		switch in.Type().Elem().Kind() {
+		case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
+			reflect.String, reflect.Uint32, reflect.Uint64:
+			out.Set(reflect.AppendSlice(out, in))
+		default:
+			for i := 0; i < n; i++ {
+				x := reflect.Indirect(reflect.New(in.Type().Elem()))
+				mergeAny(x, in.Index(i), false, nil)
+				out.Set(reflect.Append(out, x))
+			}
+		}
+	case reflect.Struct:
+		mergeStruct(out, in)
+	default:
+		// unknown type, so not a protocol buffer
+		log.Printf("proto: don't know how to copy %v", in)
+	}
+}
+
+func mergeExtension(out, in map[int32]Extension) {
+	for extNum, eIn := range in {
+		eOut := Extension{desc: eIn.desc}
+		if eIn.value != nil {
+			v := reflect.New(reflect.TypeOf(eIn.value)).Elem()
+			mergeAny(v, reflect.ValueOf(eIn.value), false, nil)
+			eOut.value = v.Interface()
+		}
+		if eIn.enc != nil {
+			eOut.enc = make([]byte, len(eIn.enc))
+			copy(eOut.enc, eIn.enc)
+		}
+
+		out[extNum] = eOut
+	}
+}
diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go
new file mode 100644
index 0000000000..5810782fd8
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/decode.go
@@ -0,0 +1,867 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Routines for decoding protocol buffer data to construct in-memory representations.
+ */
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"reflect"
+)
+
+// errOverflow is returned when an integer is too large to be represented.
+var errOverflow = errors.New("proto: integer overflow")
+
+// ErrInternalBadWireType is returned by generated code when an incorrect
+// wire type is encountered. It does not get returned to user code.
+var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
+
+// The fundamental decoders that interpret bytes on the wire.
+// Those that take integer types all return uint64 and are
+// therefore of type valueDecoder.
+
+// DecodeVarint reads a varint-encoded integer from the slice.
+// It returns the integer and the number of bytes consumed, or
+// zero if there is not enough.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func DecodeVarint(buf []byte) (x uint64, n int) {
+	// x, n already 0
+	for shift := uint(0); shift < 64; shift += 7 {
+		if n >= len(buf) {
+			return 0, 0
+		}
+		b := uint64(buf[n])
+		n++
+		x |= (b & 0x7F) << shift
+		if (b & 0x80) == 0 {
+			return x, n
+		}
+	}
+
+	// The number is too large to represent in a 64-bit value.
+	return 0, 0
+}
+
+// DecodeVarint reads a varint-encoded integer from the Buffer.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func (p *Buffer) DecodeVarint() (x uint64, err error) {
+	// x, err already 0
+
+	i := p.index
+	l := len(p.buf)
+
+	for shift := uint(0); shift < 64; shift += 7 {
+		if i >= l {
+			err = io.ErrUnexpectedEOF
+			return
+		}
+		b := p.buf[i]
+		i++
+		x |= (uint64(b) & 0x7F) << shift
+		if b < 0x80 {
+			p.index = i
+			return
+		}
+	}
+
+	// The number is too large to represent in a 64-bit value.
+	err = errOverflow
+	return
+}
+
+// DecodeFixed64 reads a 64-bit integer from the Buffer.
+// This is the format for the
+// fixed64, sfixed64, and double protocol buffer types.
+func (p *Buffer) DecodeFixed64() (x uint64, err error) {
+	// x, err already 0
+	i := p.index + 8
+	if i < 0 || i > len(p.buf) {
+		err = io.ErrUnexpectedEOF
+		return
+	}
+	p.index = i
+
+	x = uint64(p.buf[i-8])
+	x |= uint64(p.buf[i-7]) << 8
+	x |= uint64(p.buf[i-6]) << 16
+	x |= uint64(p.buf[i-5]) << 24
+	x |= uint64(p.buf[i-4]) << 32
+	x |= uint64(p.buf[i-3]) << 40
+	x |= uint64(p.buf[i-2]) << 48
+	x |= uint64(p.buf[i-1]) << 56
+	return
+}
+
+// DecodeFixed32 reads a 32-bit integer from the Buffer.
+// This is the format for the
+// fixed32, sfixed32, and float protocol buffer types.
+func (p *Buffer) DecodeFixed32() (x uint64, err error) {
+	// x, err already 0
+	i := p.index + 4
+	if i < 0 || i > len(p.buf) {
+		err = io.ErrUnexpectedEOF
+		return
+	}
+	p.index = i
+
+	x = uint64(p.buf[i-4])
+	x |= uint64(p.buf[i-3]) << 8
+	x |= uint64(p.buf[i-2]) << 16
+	x |= uint64(p.buf[i-1]) << 24
+	return
+}
+
+// DecodeZigzag64 reads a zigzag-encoded 64-bit integer
+// from the Buffer.
+// This is the format used for the sint64 protocol buffer type.
+func (p *Buffer) DecodeZigzag64() (x uint64, err error) {
+	x, err = p.DecodeVarint()
+	if err != nil {
+		return
+	}
+	x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63)
+	return
+}
+
+// DecodeZigzag32 reads a zigzag-encoded 32-bit integer
+// from  the Buffer.
+// This is the format used for the sint32 protocol buffer type.
+func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
+	x, err = p.DecodeVarint()
+	if err != nil {
+		return
+	}
+	x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31))
+	return
+}
+
+// These are not ValueDecoders: they produce an array of bytes or a string.
+// bytes, embedded messages
+
+// DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
+// This is the format used for the bytes protocol buffer
+// type and for embedded messages.
+func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) {
+	n, err := p.DecodeVarint()
+	if err != nil {
+		return nil, err
+	}
+
+	nb := int(n)
+	if nb < 0 {
+		return nil, fmt.Errorf("proto: bad byte length %d", nb)
+	}
+	end := p.index + nb
+	if end < p.index || end > len(p.buf) {
+		return nil, io.ErrUnexpectedEOF
+	}
+
+	if !alloc {
+		// todo: check if can get more uses of alloc=false
+		buf = p.buf[p.index:end]
+		p.index += nb
+		return
+	}
+
+	buf = make([]byte, nb)
+	copy(buf, p.buf[p.index:])
+	p.index += nb
+	return
+}
+
+// DecodeStringBytes reads an encoded string from the Buffer.
+// This is the format used for the proto2 string type.
+func (p *Buffer) DecodeStringBytes() (s string, err error) {
+	buf, err := p.DecodeRawBytes(false)
+	if err != nil {
+		return
+	}
+	return string(buf), nil
+}
+
+// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
+// If the protocol buffer has extensions, and the field matches, add it as an extension.
+// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
+func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
+	oi := o.index
+
+	err := o.skip(t, tag, wire)
+	if err != nil {
+		return err
+	}
+
+	if !unrecField.IsValid() {
+		return nil
+	}
+
+	ptr := structPointer_Bytes(base, unrecField)
+
+	// Add the skipped field to struct field
+	obuf := o.buf
+
+	o.buf = *ptr
+	o.EncodeVarint(uint64(tag<<3 | wire))
+	*ptr = append(o.buf, obuf[oi:o.index]...)
+
+	o.buf = obuf
+
+	return nil
+}
+
+// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
+func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
+
+	var u uint64
+	var err error
+
+	switch wire {
+	case WireVarint:
+		_, err = o.DecodeVarint()
+	case WireFixed64:
+		_, err = o.DecodeFixed64()
+	case WireBytes:
+		_, err = o.DecodeRawBytes(false)
+	case WireFixed32:
+		_, err = o.DecodeFixed32()
+	case WireStartGroup:
+		for {
+			u, err = o.DecodeVarint()
+			if err != nil {
+				break
+			}
+			fwire := int(u & 0x7)
+			if fwire == WireEndGroup {
+				break
+			}
+			ftag := int(u >> 3)
+			err = o.skip(t, ftag, fwire)
+			if err != nil {
+				break
+			}
+		}
+	default:
+		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
+	}
+	return err
+}
+
+// Unmarshaler is the interface representing objects that can
+// unmarshal themselves.  The method should reset the receiver before
+// decoding starts.  The argument points to data that may be
+// overwritten, so implementations should not keep references to the
+// buffer.
+type Unmarshaler interface {
+	Unmarshal([]byte) error
+}
+
+// Unmarshal parses the protocol buffer representation in buf and places the
+// decoded result in pb.  If the struct underlying pb does not match
+// the data in buf, the results can be unpredictable.
+//
+// Unmarshal resets pb before starting to unmarshal, so any
+// existing data in pb is always removed. Use UnmarshalMerge
+// to preserve and append to existing data.
+func Unmarshal(buf []byte, pb Message) error {
+	pb.Reset()
+	return UnmarshalMerge(buf, pb)
+}
+
+// UnmarshalMerge parses the protocol buffer representation in buf and
+// writes the decoded result to pb.  If the struct underlying pb does not match
+// the data in buf, the results can be unpredictable.
+//
+// UnmarshalMerge merges into existing data in pb.
+// Most code should use Unmarshal instead.
+func UnmarshalMerge(buf []byte, pb Message) error {
+	// If the object can unmarshal itself, let it.
+	if u, ok := pb.(Unmarshaler); ok {
+		return u.Unmarshal(buf)
+	}
+	return NewBuffer(buf).Unmarshal(pb)
+}
+
+// DecodeMessage reads a count-delimited message from the Buffer.
+func (p *Buffer) DecodeMessage(pb Message) error {
+	enc, err := p.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+	return NewBuffer(enc).Unmarshal(pb)
+}
+
+// DecodeGroup reads a tag-delimited group from the Buffer.
+func (p *Buffer) DecodeGroup(pb Message) error {
+	typ, base, err := getbase(pb)
+	if err != nil {
+		return err
+	}
+	return p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), true, base)
+}
+
+// Unmarshal parses the protocol buffer representation in the
+// Buffer and places the decoded result in pb.  If the struct
+// underlying pb does not match the data in the buffer, the results can be
+// unpredictable.
+func (p *Buffer) Unmarshal(pb Message) error {
+	// If the object can unmarshal itself, let it.
+	if u, ok := pb.(Unmarshaler); ok {
+		err := u.Unmarshal(p.buf[p.index:])
+		p.index = len(p.buf)
+		return err
+	}
+
+	typ, base, err := getbase(pb)
+	if err != nil {
+		return err
+	}
+
+	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
+
+	if collectStats {
+		stats.Decode++
+	}
+
+	return err
+}
+
+// unmarshalType does the work of unmarshaling a structure.
+func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
+	var state errorState
+	required, reqFields := prop.reqCount, uint64(0)
+
+	var err error
+	for err == nil && o.index < len(o.buf) {
+		oi := o.index
+		var u uint64
+		u, err = o.DecodeVarint()
+		if err != nil {
+			break
+		}
+		wire := int(u & 0x7)
+		if wire == WireEndGroup {
+			if is_group {
+				return nil // input is satisfied
+			}
+			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
+		}
+		tag := int(u >> 3)
+		if tag <= 0 {
+			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
+		}
+		fieldnum, ok := prop.decoderTags.get(tag)
+		if !ok {
+			// Maybe it's an extension?
+			if prop.extendable {
+				if e := structPointer_Interface(base, st).(extendableProto); isExtensionField(e, int32(tag)) {
+					if err = o.skip(st, tag, wire); err == nil {
+						ext := e.ExtensionMap()[int32(tag)] // may be missing
+						ext.enc = append(ext.enc, o.buf[oi:o.index]...)
+						e.ExtensionMap()[int32(tag)] = ext
+					}
+					continue
+				}
+			}
+			// Maybe it's a oneof?
+			if prop.oneofUnmarshaler != nil {
+				m := structPointer_Interface(base, st).(Message)
+				// First return value indicates whether tag is a oneof field.
+				ok, err = prop.oneofUnmarshaler(m, tag, wire, o)
+				if err == ErrInternalBadWireType {
+					// Map the error to something more descriptive.
+					// Do the formatting here to save generated code space.
+					err = fmt.Errorf("bad wiretype for oneof field in %T", m)
+				}
+				if ok {
+					continue
+				}
+			}
+			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
+			continue
+		}
+		p := prop.Prop[fieldnum]
+
+		if p.dec == nil {
+			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
+			continue
+		}
+		dec := p.dec
+		if wire != WireStartGroup && wire != p.WireType {
+			if wire == WireBytes && p.packedDec != nil {
+				// a packable field
+				dec = p.packedDec
+			} else {
+				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
+				continue
+			}
+		}
+		decErr := dec(o, p, base)
+		if decErr != nil && !state.shouldContinue(decErr, p) {
+			err = decErr
+		}
+		if err == nil && p.Required {
+			// Successfully decoded a required field.
+			if tag <= 64 {
+				// use bitmap for fields 1-64 to catch field reuse.
+				var mask uint64 = 1 << uint64(tag-1)
+				if reqFields&mask == 0 {
+					// new required field
+					reqFields |= mask
+					required--
+				}
+			} else {
+				// This is imprecise. It can be fooled by a required field
+				// with a tag > 64 that is encoded twice; that's very rare.
+				// A fully correct implementation would require allocating
+				// a data structure, which we would like to avoid.
+				required--
+			}
+		}
+	}
+	if err == nil {
+		if is_group {
+			return io.ErrUnexpectedEOF
+		}
+		if state.err != nil {
+			return state.err
+		}
+		if required > 0 {
+			// Not enough information to determine the exact field. If we use extra
+			// CPU, we could determine the field only if the missing required field
+			// has a tag <= 64 and we check reqFields.
+			return &RequiredNotSetError{"{Unknown}"}
+		}
+	}
+	return err
+}
+
+// Individual type decoders
+// For each,
+//	u is the decoded value,
+//	v is a pointer to the field (pointer) in the struct
+
+// Sizes of the pools to allocate inside the Buffer.
+// The goal is modest amortization and allocation
+// on at least 16-byte boundaries.
+const (
+	boolPoolSize   = 16
+	uint32PoolSize = 8
+	uint64PoolSize = 4
+)
+
+// Decode a bool.
+func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	if len(o.bools) == 0 {
+		o.bools = make([]bool, boolPoolSize)
+	}
+	o.bools[0] = u != 0
+	*structPointer_Bool(base, p.field) = &o.bools[0]
+	o.bools = o.bools[1:]
+	return nil
+}
+
+func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	*structPointer_BoolVal(base, p.field) = u != 0
+	return nil
+}
+
+// Decode an int32.
+func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
+	return nil
+}
+
+func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
+	return nil
+}
+
+// Decode an int64.
+func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word64_Set(structPointer_Word64(base, p.field), o, u)
+	return nil
+}
+
+func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
+	return nil
+}
+
+// Decode a string.
+func (o *Buffer) dec_string(p *Properties, base structPointer) error {
+	s, err := o.DecodeStringBytes()
+	if err != nil {
+		return err
+	}
+	*structPointer_String(base, p.field) = &s
+	return nil
+}
+
+func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
+	s, err := o.DecodeStringBytes()
+	if err != nil {
+		return err
+	}
+	*structPointer_StringVal(base, p.field) = s
+	return nil
+}
+
+// Decode a slice of bytes ([]byte).
+func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	*structPointer_Bytes(base, p.field) = b
+	return nil
+}
+
+// Decode a slice of bools ([]bool).
+func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	v := structPointer_BoolSlice(base, p.field)
+	*v = append(*v, u != 0)
+	return nil
+}
+
+// Decode a slice of bools ([]bool) in packed format.
+func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
+	v := structPointer_BoolSlice(base, p.field)
+
+	nn, err := o.DecodeVarint()
+	if err != nil {
+		return err
+	}
+	nb := int(nn) // number of bytes of encoded bools
+	fin := o.index + nb
+	if fin < o.index {
+		return errOverflow
+	}
+
+	y := *v
+	for o.index < fin {
+		u, err := p.valDec(o)
+		if err != nil {
+			return err
+		}
+		y = append(y, u != 0)
+	}
+
+	*v = y
+	return nil
+}
+
+// Decode a slice of int32s ([]int32).
+func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+	structPointer_Word32Slice(base, p.field).Append(uint32(u))
+	return nil
+}
+
+// Decode a slice of int32s ([]int32) in packed format.
+func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Slice(base, p.field)
+
+	nn, err := o.DecodeVarint()
+	if err != nil {
+		return err
+	}
+	nb := int(nn) // number of bytes of encoded int32s
+
+	fin := o.index + nb
+	if fin < o.index {
+		return errOverflow
+	}
+	for o.index < fin {
+		u, err := p.valDec(o)
+		if err != nil {
+			return err
+		}
+		v.Append(uint32(u))
+	}
+	return nil
+}
+
+// Decode a slice of int64s ([]int64).
+func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
+	u, err := p.valDec(o)
+	if err != nil {
+		return err
+	}
+
+	structPointer_Word64Slice(base, p.field).Append(u)
+	return nil
+}
+
+// Decode a slice of int64s ([]int64) in packed format.
+func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64Slice(base, p.field)
+
+	nn, err := o.DecodeVarint()
+	if err != nil {
+		return err
+	}
+	nb := int(nn) // number of bytes of encoded int64s
+
+	fin := o.index + nb
+	if fin < o.index {
+		return errOverflow
+	}
+	for o.index < fin {
+		u, err := p.valDec(o)
+		if err != nil {
+			return err
+		}
+		v.Append(u)
+	}
+	return nil
+}
+
+// Decode a slice of strings ([]string).
+func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
+	s, err := o.DecodeStringBytes()
+	if err != nil {
+		return err
+	}
+	v := structPointer_StringSlice(base, p.field)
+	*v = append(*v, s)
+	return nil
+}
+
+// Decode a slice of slice of bytes ([][]byte).
+func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
+	b, err := o.DecodeRawBytes(true)
+	if err != nil {
+		return err
+	}
+	v := structPointer_BytesSlice(base, p.field)
+	*v = append(*v, b)
+	return nil
+}
+
+// Decode a map field.
+func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
+	raw, err := o.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+	oi := o.index       // index at the end of this map entry
+	o.index -= len(raw) // move buffer back to start of map entry
+
+	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
+	if mptr.Elem().IsNil() {
+		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
+	}
+	v := mptr.Elem() // map[K]V
+
+	// Prepare addressable doubly-indirect placeholders for the key and value types.
+	// See enc_new_map for why.
+	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
+	keybase := toStructPointer(keyptr.Addr())                  // **K
+
+	var valbase structPointer
+	var valptr reflect.Value
+	switch p.mtype.Elem().Kind() {
+	case reflect.Slice:
+		// []byte
+		var dummy []byte
+		valptr = reflect.ValueOf(&dummy)  // *[]byte
+		valbase = toStructPointer(valptr) // *[]byte
+	case reflect.Ptr:
+		// message; valptr is **Msg; need to allocate the intermediate pointer
+		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
+		valptr.Set(reflect.New(valptr.Type().Elem()))
+		valbase = toStructPointer(valptr)
+	default:
+		// everything else
+		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
+		valbase = toStructPointer(valptr.Addr())                   // **V
+	}
+
+	// Decode.
+	// This parses a restricted wire format, namely the encoding of a message
+	// with two fields. See enc_new_map for the format.
+	for o.index < oi {
+		// tagcode for key and value properties are always a single byte
+		// because they have tags 1 and 2.
+		tagcode := o.buf[o.index]
+		o.index++
+		switch tagcode {
+		case p.mkeyprop.tagcode[0]:
+			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
+				return err
+			}
+		case p.mvalprop.tagcode[0]:
+			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
+				return err
+			}
+		default:
+			// TODO: Should we silently skip this instead?
+			return fmt.Errorf("proto: bad map data tag %d", raw[0])
+		}
+	}
+	keyelem, valelem := keyptr.Elem(), valptr.Elem()
+	if !keyelem.IsValid() || !valelem.IsValid() {
+		// We did not decode the key or the value in the map entry.
+		// Either way, it's an invalid map entry.
+		return fmt.Errorf("proto: bad map data: missing key/val")
+	}
+
+	v.SetMapIndex(keyelem, valelem)
+	return nil
+}
+
+// Decode a group.
+func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
+	bas := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(bas) {
+		// allocate new nested message
+		bas = toStructPointer(reflect.New(p.stype))
+		structPointer_SetStructPointer(base, p.field, bas)
+	}
+	return o.unmarshalType(p.stype, p.sprop, true, bas)
+}
+
+// Decode an embedded message.
+func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
+	raw, e := o.DecodeRawBytes(false)
+	if e != nil {
+		return e
+	}
+
+	bas := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(bas) {
+		// allocate new nested message
+		bas = toStructPointer(reflect.New(p.stype))
+		structPointer_SetStructPointer(base, p.field, bas)
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		iv := structPointer_Interface(bas, p.stype)
+		return iv.(Unmarshaler).Unmarshal(raw)
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	err = o.unmarshalType(p.stype, p.sprop, false, bas)
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
+
+// Decode a slice of embedded messages.
+func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
+	return o.dec_slice_struct(p, false, base)
+}
+
+// Decode a slice of embedded groups.
+func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
+	return o.dec_slice_struct(p, true, base)
+}
+
+// Decode a slice of structs ([]*struct).
+func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
+	v := reflect.New(p.stype)
+	bas := toStructPointer(v)
+	structPointer_StructPointerSlice(base, p.field).Append(bas)
+
+	if is_group {
+		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
+		return err
+	}
+
+	raw, err := o.DecodeRawBytes(false)
+	if err != nil {
+		return err
+	}
+
+	// If the object can unmarshal itself, let it.
+	if p.isUnmarshaler {
+		iv := v.Interface()
+		return iv.(Unmarshaler).Unmarshal(raw)
+	}
+
+	obuf := o.buf
+	oi := o.index
+	o.buf = raw
+	o.index = 0
+
+	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
+
+	o.buf = obuf
+	o.index = oi
+
+	return err
+}
diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go
new file mode 100644
index 0000000000..231b07401a
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/encode.go
@@ -0,0 +1,1325 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Routines for encoding data into the wire format for protocol buffers.
+ */
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"sort"
+)
+
+// RequiredNotSetError is the error returned if Marshal is called with
+// a protocol buffer struct whose required fields have not
+// all been initialized. It is also the error returned if Unmarshal is
+// called with an encoded protocol buffer that does not include all the
+// required fields.
+//
+// When printed, RequiredNotSetError reports the first unset required field in a
+// message. If the field cannot be precisely determined, it is reported as
+// "{Unknown}".
+type RequiredNotSetError struct {
+	field string
+}
+
+func (e *RequiredNotSetError) Error() string {
+	return fmt.Sprintf("proto: required field %q not set", e.field)
+}
+
+var (
+	// errRepeatedHasNil is the error returned if Marshal is called with
+	// a struct with a repeated field containing a nil element.
+	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
+
+	// ErrNil is the error returned if Marshal is called with nil.
+	ErrNil = errors.New("proto: Marshal called with nil")
+)
+
+// The fundamental encoders that put bytes on the wire.
+// Those that take integer types all accept uint64 and are
+// therefore of type valueEncoder.
+
+const maxVarintBytes = 10 // maximum length of a varint
+
+// EncodeVarint returns the varint encoding of x.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+// Not used by the package itself, but helpful to clients
+// wishing to use the same encoding.
+func EncodeVarint(x uint64) []byte {
+	var buf [maxVarintBytes]byte
+	var n int
+	for n = 0; x > 127; n++ {
+		buf[n] = 0x80 | uint8(x&0x7F)
+		x >>= 7
+	}
+	buf[n] = uint8(x)
+	n++
+	return buf[0:n]
+}
+
+// EncodeVarint writes a varint-encoded integer to the Buffer.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func (p *Buffer) EncodeVarint(x uint64) error {
+	for x >= 1<<7 {
+		p.buf = append(p.buf, uint8(x&0x7f|0x80))
+		x >>= 7
+	}
+	p.buf = append(p.buf, uint8(x))
+	return nil
+}
+
+// SizeVarint returns the varint encoding size of an integer.
+func SizeVarint(x uint64) int {
+	return sizeVarint(x)
+}
+
+func sizeVarint(x uint64) (n int) {
+	for {
+		n++
+		x >>= 7
+		if x == 0 {
+			break
+		}
+	}
+	return n
+}
+
+// EncodeFixed64 writes a 64-bit integer to the Buffer.
+// This is the format for the
+// fixed64, sfixed64, and double protocol buffer types.
+func (p *Buffer) EncodeFixed64(x uint64) error {
+	p.buf = append(p.buf,
+		uint8(x),
+		uint8(x>>8),
+		uint8(x>>16),
+		uint8(x>>24),
+		uint8(x>>32),
+		uint8(x>>40),
+		uint8(x>>48),
+		uint8(x>>56))
+	return nil
+}
+
+func sizeFixed64(x uint64) int {
+	return 8
+}
+
+// EncodeFixed32 writes a 32-bit integer to the Buffer.
+// This is the format for the
+// fixed32, sfixed32, and float protocol buffer types.
+func (p *Buffer) EncodeFixed32(x uint64) error {
+	p.buf = append(p.buf,
+		uint8(x),
+		uint8(x>>8),
+		uint8(x>>16),
+		uint8(x>>24))
+	return nil
+}
+
+func sizeFixed32(x uint64) int {
+	return 4
+}
+
+// EncodeZigzag64 writes a zigzag-encoded 64-bit integer
+// to the Buffer.
+// This is the format used for the sint64 protocol buffer type.
+func (p *Buffer) EncodeZigzag64(x uint64) error {
+	// use signed number to get arithmetic right shift.
+	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+
+func sizeZigzag64(x uint64) int {
+	return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+
+// EncodeZigzag32 writes a zigzag-encoded 32-bit integer
+// to the Buffer.
+// This is the format used for the sint32 protocol buffer type.
+func (p *Buffer) EncodeZigzag32(x uint64) error {
+	// use signed number to get arithmetic right shift.
+	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
+}
+
+func sizeZigzag32(x uint64) int {
+	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
+}
+
+// EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
+// This is the format used for the bytes protocol buffer
+// type and for embedded messages.
+func (p *Buffer) EncodeRawBytes(b []byte) error {
+	p.EncodeVarint(uint64(len(b)))
+	p.buf = append(p.buf, b...)
+	return nil
+}
+
+func sizeRawBytes(b []byte) int {
+	return sizeVarint(uint64(len(b))) +
+		len(b)
+}
+
+// EncodeStringBytes writes an encoded string to the Buffer.
+// This is the format used for the proto2 string type.
+func (p *Buffer) EncodeStringBytes(s string) error {
+	p.EncodeVarint(uint64(len(s)))
+	p.buf = append(p.buf, s...)
+	return nil
+}
+
+func sizeStringBytes(s string) int {
+	return sizeVarint(uint64(len(s))) +
+		len(s)
+}
+
+// Marshaler is the interface representing objects that can marshal themselves.
+type Marshaler interface {
+	Marshal() ([]byte, error)
+}
+
+// Marshal takes the protocol buffer
+// and encodes it into the wire format, returning the data.
+func Marshal(pb Message) ([]byte, error) {
+	// Can the object marshal itself?
+	if m, ok := pb.(Marshaler); ok {
+		return m.Marshal()
+	}
+	p := NewBuffer(nil)
+	err := p.Marshal(pb)
+	var state errorState
+	if err != nil && !state.shouldContinue(err, nil) {
+		return nil, err
+	}
+	if p.buf == nil && err == nil {
+		// Return a non-nil slice on success.
+		return []byte{}, nil
+	}
+	return p.buf, err
+}
+
+// EncodeMessage writes the protocol buffer to the Buffer,
+// prefixed by a varint-encoded length.
+func (p *Buffer) EncodeMessage(pb Message) error {
+	t, base, err := getbase(pb)
+	if structPointer_IsNil(base) {
+		return ErrNil
+	}
+	if err == nil {
+		var state errorState
+		err = p.enc_len_struct(GetProperties(t.Elem()), base, &state)
+	}
+	return err
+}
+
+// Marshal takes the protocol buffer
+// and encodes it into the wire format, writing the result to the
+// Buffer.
+func (p *Buffer) Marshal(pb Message) error {
+	// Can the object marshal itself?
+	if m, ok := pb.(Marshaler); ok {
+		data, err := m.Marshal()
+		if err != nil {
+			return err
+		}
+		p.buf = append(p.buf, data...)
+		return nil
+	}
+
+	t, base, err := getbase(pb)
+	if structPointer_IsNil(base) {
+		return ErrNil
+	}
+	if err == nil {
+		err = p.enc_struct(GetProperties(t.Elem()), base)
+	}
+
+	if collectStats {
+		stats.Encode++
+	}
+
+	return err
+}
+
+// Size returns the encoded size of a protocol buffer.
+func Size(pb Message) (n int) {
+	// Can the object marshal itself?  If so, Size is slow.
+	// TODO: add Size to Marshaler, or add a Sizer interface.
+	if m, ok := pb.(Marshaler); ok {
+		b, _ := m.Marshal()
+		return len(b)
+	}
+
+	t, base, err := getbase(pb)
+	if structPointer_IsNil(base) {
+		return 0
+	}
+	if err == nil {
+		n = size_struct(GetProperties(t.Elem()), base)
+	}
+
+	if collectStats {
+		stats.Size++
+	}
+
+	return
+}
+
+// Individual type encoders.
+
+// Encode a bool.
+func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
+	v := *structPointer_Bool(base, p.field)
+	if v == nil {
+		return ErrNil
+	}
+	x := 0
+	if *v {
+		x = 1
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
+	v := *structPointer_BoolVal(base, p.field)
+	if !v {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, 1)
+	return nil
+}
+
+func size_bool(p *Properties, base structPointer) int {
+	v := *structPointer_Bool(base, p.field)
+	if v == nil {
+		return 0
+	}
+	return len(p.tagcode) + 1 // each bool takes exactly one byte
+}
+
+func size_proto3_bool(p *Properties, base structPointer) int {
+	v := *structPointer_BoolVal(base, p.field)
+	if !v && !p.oneof {
+		return 0
+	}
+	return len(p.tagcode) + 1 // each bool takes exactly one byte
+}
+
+// Encode an int32.
+func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return ErrNil
+	}
+	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
+	if x == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_int32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return 0
+	}
+	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+func size_proto3_int32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
+	if x == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+// Encode a uint32.
+// Exactly the same as int32, except for no sign extension.
+func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return ErrNil
+	}
+	x := word32_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	if x == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, uint64(x))
+	return nil
+}
+
+func size_uint32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32(base, p.field)
+	if word32_IsNil(v) {
+		return 0
+	}
+	x := word32_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+func size_proto3_uint32(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word32Val(base, p.field)
+	x := word32Val_Get(v)
+	if x == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += p.valSize(uint64(x))
+	return
+}
+
+// Encode an int64.
+func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64(base, p.field)
+	if word64_IsNil(v) {
+		return ErrNil
+	}
+	x := word64_Get(v)
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, x)
+	return nil
+}
+
+func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	if x == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	p.valEnc(o, x)
+	return nil
+}
+
+func size_int64(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word64(base, p.field)
+	if word64_IsNil(v) {
+		return 0
+	}
+	x := word64_Get(v)
+	n += len(p.tagcode)
+	n += p.valSize(x)
+	return
+}
+
+func size_proto3_int64(p *Properties, base structPointer) (n int) {
+	v := structPointer_Word64Val(base, p.field)
+	x := word64Val_Get(v)
+	if x == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += p.valSize(x)
+	return
+}
+
+// Encode a string.
+func (o *Buffer) enc_string(p *Properties, base structPointer) error {
+	v := *structPointer_String(base, p.field)
+	if v == nil {
+		return ErrNil
+	}
+	x := *v
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeStringBytes(x)
+	return nil
+}
+
+func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
+	v := *structPointer_StringVal(base, p.field)
+	if v == "" {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeStringBytes(v)
+	return nil
+}
+
+func size_string(p *Properties, base structPointer) (n int) {
+	v := *structPointer_String(base, p.field)
+	if v == nil {
+		return 0
+	}
+	x := *v
+	n += len(p.tagcode)
+	n += sizeStringBytes(x)
+	return
+}
+
+func size_proto3_string(p *Properties, base structPointer) (n int) {
+	v := *structPointer_StringVal(base, p.field)
+	if v == "" && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeStringBytes(v)
+	return
+}
+
+// All protocol buffer fields are nillable, but be careful.
+func isNil(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
+		return v.IsNil()
+	}
+	return false
+}
+
+// Encode a message struct.
+func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	structp := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return ErrNil
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, err := m.Marshal()
+		if err != nil && !state.shouldContinue(err, nil) {
+			return err
+		}
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(data)
+		return state.err
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	return o.enc_len_struct(p.sprop, structp, &state)
+}
+
+func size_struct_message(p *Properties, base structPointer) int {
+	structp := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(structp) {
+		return 0
+	}
+
+	// Can the object marshal itself?
+	if p.isMarshaler {
+		m := structPointer_Interface(structp, p.stype).(Marshaler)
+		data, _ := m.Marshal()
+		n0 := len(p.tagcode)
+		n1 := sizeRawBytes(data)
+		return n0 + n1
+	}
+
+	n0 := len(p.tagcode)
+	n1 := size_struct(p.sprop, structp)
+	n2 := sizeVarint(uint64(n1)) // size of encoded length
+	return n0 + n1 + n2
+}
+
+// Encode a group struct.
+func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
+	var state errorState
+	b := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(b) {
+		return ErrNil
+	}
+
+	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
+	err := o.enc_struct(p.sprop, b)
+	if err != nil && !state.shouldContinue(err, nil) {
+		return err
+	}
+	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
+	return state.err
+}
+
+func size_struct_group(p *Properties, base structPointer) (n int) {
+	b := structPointer_GetStructPointer(base, p.field)
+	if structPointer_IsNil(b) {
+		return 0
+	}
+
+	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
+	n += size_struct(p.sprop, b)
+	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
+	return
+}
+
+// Encode a slice of bools ([]bool).
+func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return ErrNil
+	}
+	for _, x := range s {
+		o.buf = append(o.buf, p.tagcode...)
+		v := uint64(0)
+		if x {
+			v = 1
+		}
+		p.valEnc(o, v)
+	}
+	return nil
+}
+
+func size_slice_bool(p *Properties, base structPointer) int {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return 0
+	}
+	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
+}
+
+// Encode a slice of bools ([]bool) in packed format.
+func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
+	for _, x := range s {
+		v := uint64(0)
+		if x {
+			v = 1
+		}
+		p.valEnc(o, v)
+	}
+	return nil
+}
+
+func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
+	s := *structPointer_BoolSlice(base, p.field)
+	l := len(s)
+	if l == 0 {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(l))
+	n += l // each bool takes exactly one byte
+	return
+}
+
+// Encode a slice of bytes ([]byte).
+func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(s)
+	return nil
+}
+
+func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
+	s := *structPointer_Bytes(base, p.field)
+	if len(s) == 0 {
+		return ErrNil
+	}
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeRawBytes(s)
+	return nil
+}
+
+func size_slice_byte(p *Properties, base structPointer) (n int) {
+	s := *structPointer_Bytes(base, p.field)
+	if s == nil && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeRawBytes(s)
+	return
+}
+
+func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
+	s := *structPointer_Bytes(base, p.field)
+	if len(s) == 0 && !p.oneof {
+		return 0
+	}
+	n += len(p.tagcode)
+	n += sizeRawBytes(s)
+	return
+}
+
+// Encode a slice of int32s ([]int32).
+func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		p.valEnc(o, uint64(x))
+	}
+	return nil
+}
+
+func size_slice_int32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	for i := 0; i < l; i++ {
+		n += len(p.tagcode)
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		n += p.valSize(uint64(x))
+	}
+	return
+}
+
+// Encode a slice of int32s ([]int32) in packed format.
+func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	// TODO: Reuse a Buffer.
+	buf := NewBuffer(nil)
+	for i := 0; i < l; i++ {
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		p.valEnc(buf, uint64(x))
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(len(buf.buf)))
+	o.buf = append(o.buf, buf.buf...)
+	return nil
+}
+
+func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	var bufSize int
+	for i := 0; i < l; i++ {
+		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
+		bufSize += p.valSize(uint64(x))
+	}
+
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(bufSize))
+	n += bufSize
+	return
+}
+
+// Encode a slice of uint32s ([]uint32).
+// Exactly the same as int32, except for no sign extension.
+func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		x := s.Index(i)
+		p.valEnc(o, uint64(x))
+	}
+	return nil
+}
+
+func size_slice_uint32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	for i := 0; i < l; i++ {
+		n += len(p.tagcode)
+		x := s.Index(i)
+		n += p.valSize(uint64(x))
+	}
+	return
+}
+
+// Encode a slice of uint32s ([]uint32) in packed format.
+// Exactly the same as int32, except for no sign extension.
+func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	// TODO: Reuse a Buffer.
+	buf := NewBuffer(nil)
+	for i := 0; i < l; i++ {
+		p.valEnc(buf, uint64(s.Index(i)))
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(len(buf.buf)))
+	o.buf = append(o.buf, buf.buf...)
+	return nil
+}
+
+func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word32Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	var bufSize int
+	for i := 0; i < l; i++ {
+		bufSize += p.valSize(uint64(s.Index(i)))
+	}
+
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(bufSize))
+	n += bufSize
+	return
+}
+
+// Encode a slice of int64s ([]int64).
+func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		p.valEnc(o, s.Index(i))
+	}
+	return nil
+}
+
+func size_slice_int64(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	for i := 0; i < l; i++ {
+		n += len(p.tagcode)
+		n += p.valSize(s.Index(i))
+	}
+	return
+}
+
+// Encode a slice of int64s ([]int64) in packed format.
+func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return ErrNil
+	}
+	// TODO: Reuse a Buffer.
+	buf := NewBuffer(nil)
+	for i := 0; i < l; i++ {
+		p.valEnc(buf, s.Index(i))
+	}
+
+	o.buf = append(o.buf, p.tagcode...)
+	o.EncodeVarint(uint64(len(buf.buf)))
+	o.buf = append(o.buf, buf.buf...)
+	return nil
+}
+
+func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
+	s := structPointer_Word64Slice(base, p.field)
+	l := s.Len()
+	if l == 0 {
+		return 0
+	}
+	var bufSize int
+	for i := 0; i < l; i++ {
+		bufSize += p.valSize(s.Index(i))
+	}
+
+	n += len(p.tagcode)
+	n += sizeVarint(uint64(bufSize))
+	n += bufSize
+	return
+}
+
+// Encode a slice of slice of bytes ([][]byte).
+func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
+	ss := *structPointer_BytesSlice(base, p.field)
+	l := len(ss)
+	if l == 0 {
+		return ErrNil
+	}
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeRawBytes(ss[i])
+	}
+	return nil
+}
+
+func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
+	ss := *structPointer_BytesSlice(base, p.field)
+	l := len(ss)
+	if l == 0 {
+		return 0
+	}
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		n += sizeRawBytes(ss[i])
+	}
+	return
+}
+
+// Encode a slice of strings ([]string).
+func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
+	ss := *structPointer_StringSlice(base, p.field)
+	l := len(ss)
+	for i := 0; i < l; i++ {
+		o.buf = append(o.buf, p.tagcode...)
+		o.EncodeStringBytes(ss[i])
+	}
+	return nil
+}
+
+func size_slice_string(p *Properties, base structPointer) (n int) {
+	ss := *structPointer_StringSlice(base, p.field)
+	l := len(ss)
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		n += sizeStringBytes(ss[i])
+	}
+	return
+}
+
+// Encode a slice of message structs ([]*struct).
+func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
+	var state errorState
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+
+	for i := 0; i < l; i++ {
+		structp := s.Index(i)
+		if structPointer_IsNil(structp) {
+			return errRepeatedHasNil
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, err := m.Marshal()
+			if err != nil && !state.shouldContinue(err, nil) {
+				return err
+			}
+			o.buf = append(o.buf, p.tagcode...)
+			o.EncodeRawBytes(data)
+			continue
+		}
+
+		o.buf = append(o.buf, p.tagcode...)
+		err := o.enc_len_struct(p.sprop, structp, &state)
+		if err != nil && !state.shouldContinue(err, nil) {
+			if err == ErrNil {
+				return errRepeatedHasNil
+			}
+			return err
+		}
+	}
+	return state.err
+}
+
+func size_slice_struct_message(p *Properties, base structPointer) (n int) {
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+	n += l * len(p.tagcode)
+	for i := 0; i < l; i++ {
+		structp := s.Index(i)
+		if structPointer_IsNil(structp) {
+			return // return the size up to this point
+		}
+
+		// Can the object marshal itself?
+		if p.isMarshaler {
+			m := structPointer_Interface(structp, p.stype).(Marshaler)
+			data, _ := m.Marshal()
+			n += len(p.tagcode)
+			n += sizeRawBytes(data)
+			continue
+		}
+
+		n0 := size_struct(p.sprop, structp)
+		n1 := sizeVarint(uint64(n0)) // size of encoded length
+		n += n0 + n1
+	}
+	return
+}
+
+// Encode a slice of group structs ([]*struct).
+func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
+	var state errorState
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+
+	for i := 0; i < l; i++ {
+		b := s.Index(i)
+		if structPointer_IsNil(b) {
+			return errRepeatedHasNil
+		}
+
+		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
+
+		err := o.enc_struct(p.sprop, b)
+
+		if err != nil && !state.shouldContinue(err, nil) {
+			if err == ErrNil {
+				return errRepeatedHasNil
+			}
+			return err
+		}
+
+		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
+	}
+	return state.err
+}
+
+func size_slice_struct_group(p *Properties, base structPointer) (n int) {
+	s := structPointer_StructPointerSlice(base, p.field)
+	l := s.Len()
+
+	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
+	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
+	for i := 0; i < l; i++ {
+		b := s.Index(i)
+		if structPointer_IsNil(b) {
+			return // return size up to this point
+		}
+
+		n += size_struct(p.sprop, b)
+	}
+	return
+}
+
+// Encode an extension map.
+func (o *Buffer) enc_map(p *Properties, base structPointer) error {
+	v := *structPointer_ExtMap(base, p.field)
+	if err := encodeExtensionMap(v); err != nil {
+		return err
+	}
+	// Fast-path for common cases: zero or one extensions.
+	if len(v) <= 1 {
+		for _, e := range v {
+			o.buf = append(o.buf, e.enc...)
+		}
+		return nil
+	}
+
+	// Sort keys to provide a deterministic encoding.
+	keys := make([]int, 0, len(v))
+	for k := range v {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+
+	for _, k := range keys {
+		o.buf = append(o.buf, v[int32(k)].enc...)
+	}
+	return nil
+}
+
+func size_map(p *Properties, base structPointer) int {
+	v := *structPointer_ExtMap(base, p.field)
+	return sizeExtensionMap(v)
+}
+
+// Encode a map field.
+func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
+	var state errorState // XXX: or do we need to plumb this through?
+
+	/*
+		A map defined as
+			map<key_type, value_type> map_field = N;
+		is encoded in the same way as
+			message MapFieldEntry {
+				key_type key = 1;
+				value_type value = 2;
+			}
+			repeated MapFieldEntry map_field = N;
+	*/
+
+	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
+	if v.Len() == 0 {
+		return nil
+	}
+
+	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
+
+	enc := func() error {
+		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
+			return err
+		}
+		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	// Don't sort map keys. It is not required by the spec, and C++ doesn't do it.
+	for _, key := range v.MapKeys() {
+		val := v.MapIndex(key)
+
+		// The only illegal map entry values are nil message pointers.
+		if val.Kind() == reflect.Ptr && val.IsNil() {
+			return errors.New("proto: map has nil element")
+		}
+
+		keycopy.Set(key)
+		valcopy.Set(val)
+
+		o.buf = append(o.buf, p.tagcode...)
+		if err := o.enc_len_thing(enc, &state); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func size_new_map(p *Properties, base structPointer) int {
+	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
+
+	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
+
+	n := 0
+	for _, key := range v.MapKeys() {
+		val := v.MapIndex(key)
+		keycopy.Set(key)
+		valcopy.Set(val)
+
+		// Tag codes for key and val are the responsibility of the sub-sizer.
+		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
+		valsize := p.mvalprop.size(p.mvalprop, valbase)
+		entry := keysize + valsize
+		// Add on tag code and length of map entry itself.
+		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
+	}
+	return n
+}
+
+// mapEncodeScratch returns a new reflect.Value matching the map's value type,
+// and a structPointer suitable for passing to an encoder or sizer.
+func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
+	// Prepare addressable doubly-indirect placeholders for the key and value types.
+	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
+
+	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
+	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
+	keyptr.Set(keycopy.Addr())                                  //
+	keybase = toStructPointer(keyptr.Addr())                    // **K
+
+	// Value types are more varied and require special handling.
+	switch mapType.Elem().Kind() {
+	case reflect.Slice:
+		// []byte
+		var dummy []byte
+		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
+		valbase = toStructPointer(valcopy.Addr())
+	case reflect.Ptr:
+		// message; the generated field type is map[K]*Msg (so V is *Msg),
+		// so we only need one level of indirection.
+		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
+		valbase = toStructPointer(valcopy.Addr())
+	default:
+		// everything else
+		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
+		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
+		valptr.Set(valcopy.Addr())                                  //
+		valbase = toStructPointer(valptr.Addr())                    // **V
+	}
+	return
+}
+
+// Encode a struct.
+func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
+	var state errorState
+	// Encode fields in tag order so that decoders may use optimizations
+	// that depend on the ordering.
+	// https://developers.google.com/protocol-buffers/docs/encoding#order
+	for _, i := range prop.order {
+		p := prop.Prop[i]
+		if p.enc != nil {
+			err := p.enc(o, p, base)
+			if err != nil {
+				if err == ErrNil {
+					if p.Required && state.err == nil {
+						state.err = &RequiredNotSetError{p.Name}
+					}
+				} else if err == errRepeatedHasNil {
+					// Give more context to nil values in repeated fields.
+					return errors.New("repeated field " + p.OrigName + " has nil element")
+				} else if !state.shouldContinue(err, p) {
+					return err
+				}
+			}
+		}
+	}
+
+	// Do oneof fields.
+	if prop.oneofMarshaler != nil {
+		m := structPointer_Interface(base, prop.stype).(Message)
+		if err := prop.oneofMarshaler(m, o); err != nil {
+			return err
+		}
+	}
+
+	// Add unrecognized fields at the end.
+	if prop.unrecField.IsValid() {
+		v := *structPointer_Bytes(base, prop.unrecField)
+		if len(v) > 0 {
+			o.buf = append(o.buf, v...)
+		}
+	}
+
+	return state.err
+}
+
+func size_struct(prop *StructProperties, base structPointer) (n int) {
+	for _, i := range prop.order {
+		p := prop.Prop[i]
+		if p.size != nil {
+			n += p.size(p, base)
+		}
+	}
+
+	// Add unrecognized fields at the end.
+	if prop.unrecField.IsValid() {
+		v := *structPointer_Bytes(base, prop.unrecField)
+		n += len(v)
+	}
+
+	// Factor in any oneof fields.
+	if prop.oneofSizer != nil {
+		m := structPointer_Interface(base, prop.stype).(Message)
+		n += prop.oneofSizer(m)
+	}
+
+	return
+}
+
+var zeroes [20]byte // longer than any conceivable sizeVarint
+
+// Encode a struct, preceded by its encoded length (as a varint).
+func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
+	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
+}
+
+// Encode something, preceded by its encoded length (as a varint).
+func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
+	iLen := len(o.buf)
+	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
+	iMsg := len(o.buf)
+	err := enc()
+	if err != nil && !state.shouldContinue(err, nil) {
+		return err
+	}
+	lMsg := len(o.buf) - iMsg
+	lLen := sizeVarint(uint64(lMsg))
+	switch x := lLen - (iMsg - iLen); {
+	case x > 0: // actual length is x bytes larger than the space we reserved
+		// Move msg x bytes right.
+		o.buf = append(o.buf, zeroes[:x]...)
+		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
+	case x < 0: // actual length is x bytes smaller than the space we reserved
+		// Move msg x bytes left.
+		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
+		o.buf = o.buf[:len(o.buf)+x] // x is negative
+	}
+	// Encode the length in the reserved space.
+	o.buf = o.buf[:iLen]
+	o.EncodeVarint(uint64(lMsg))
+	o.buf = o.buf[:len(o.buf)+lMsg]
+	return state.err
+}
+
+// errorState maintains the first error that occurs and updates that error
+// with additional context.
+type errorState struct {
+	err error
+}
+
+// shouldContinue reports whether encoding should continue upon encountering the
+// given error. If the error is RequiredNotSetError, shouldContinue returns true
+// and, if this is the first appearance of that error, remembers it for future
+// reporting.
+//
+// If prop is not nil, it may update any error with additional context about the
+// field with the error.
+func (s *errorState) shouldContinue(err error, prop *Properties) bool {
+	// Ignore unset required fields.
+	reqNotSet, ok := err.(*RequiredNotSetError)
+	if !ok {
+		return false
+	}
+	if s.err == nil {
+		if prop != nil {
+			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
+		}
+		s.err = err
+	}
+	return true
+}
diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go
new file mode 100644
index 0000000000..f5db1def3c
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/equal.go
@@ -0,0 +1,276 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2011 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Protocol buffer comparison.
+
+package proto
+
+import (
+	"bytes"
+	"log"
+	"reflect"
+	"strings"
+)
+
+/*
+Equal returns true iff protocol buffers a and b are equal.
+The arguments must both be pointers to protocol buffer structs.
+
+Equality is defined in this way:
+  - Two messages are equal iff they are the same type,
+    corresponding fields are equal, unknown field sets
+    are equal, and extensions sets are equal.
+  - Two set scalar fields are equal iff their values are equal.
+    If the fields are of a floating-point type, remember that
+    NaN != x for all x, including NaN. If the message is defined
+    in a proto3 .proto file, fields are not "set"; specifically,
+    zero length proto3 "bytes" fields are equal (nil == {}).
+  - Two repeated fields are equal iff their lengths are the same,
+    and their corresponding elements are equal (a "bytes" field,
+    although represented by []byte, is not a repeated field)
+  - Two unset fields are equal.
+  - Two unknown field sets are equal if their current
+    encoded state is equal.
+  - Two extension sets are equal iff they have corresponding
+    elements that are pairwise equal.
+  - Every other combination of things are not equal.
+
+The return value is undefined if a and b are not protocol buffers.
+*/
+func Equal(a, b Message) bool {
+	if a == nil || b == nil {
+		return a == b
+	}
+	v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	if v1.Kind() == reflect.Ptr {
+		if v1.IsNil() {
+			return v2.IsNil()
+		}
+		if v2.IsNil() {
+			return false
+		}
+		v1, v2 = v1.Elem(), v2.Elem()
+	}
+	if v1.Kind() != reflect.Struct {
+		return false
+	}
+	return equalStruct(v1, v2)
+}
+
+// v1 and v2 are known to have the same type.
+func equalStruct(v1, v2 reflect.Value) bool {
+	sprop := GetProperties(v1.Type())
+	for i := 0; i < v1.NumField(); i++ {
+		f := v1.Type().Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		f1, f2 := v1.Field(i), v2.Field(i)
+		if f.Type.Kind() == reflect.Ptr {
+			if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
+				// both unset
+				continue
+			} else if n1 != n2 {
+				// set/unset mismatch
+				return false
+			}
+			b1, ok := f1.Interface().(raw)
+			if ok {
+				b2 := f2.Interface().(raw)
+				// RawMessage
+				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
+					return false
+				}
+				continue
+			}
+			f1, f2 = f1.Elem(), f2.Elem()
+		}
+		if !equalAny(f1, f2, sprop.Prop[i]) {
+			return false
+		}
+	}
+
+	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
+		em2 := v2.FieldByName("XXX_extensions")
+		if !equalExtensions(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
+			return false
+		}
+	}
+
+	uf := v1.FieldByName("XXX_unrecognized")
+	if !uf.IsValid() {
+		return true
+	}
+
+	u1 := uf.Bytes()
+	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
+	if !bytes.Equal(u1, u2) {
+		return false
+	}
+
+	return true
+}
+
+// v1 and v2 are known to have the same type.
+// prop may be nil.
+func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
+	if v1.Type() == protoMessageType {
+		m1, _ := v1.Interface().(Message)
+		m2, _ := v2.Interface().(Message)
+		return Equal(m1, m2)
+	}
+	switch v1.Kind() {
+	case reflect.Bool:
+		return v1.Bool() == v2.Bool()
+	case reflect.Float32, reflect.Float64:
+		return v1.Float() == v2.Float()
+	case reflect.Int32, reflect.Int64:
+		return v1.Int() == v2.Int()
+	case reflect.Interface:
+		// Probably a oneof field; compare the inner values.
+		n1, n2 := v1.IsNil(), v2.IsNil()
+		if n1 || n2 {
+			return n1 == n2
+		}
+		e1, e2 := v1.Elem(), v2.Elem()
+		if e1.Type() != e2.Type() {
+			return false
+		}
+		return equalAny(e1, e2, nil)
+	case reflect.Map:
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		for _, key := range v1.MapKeys() {
+			val2 := v2.MapIndex(key)
+			if !val2.IsValid() {
+				// This key was not found in the second map.
+				return false
+			}
+			if !equalAny(v1.MapIndex(key), val2, nil) {
+				return false
+			}
+		}
+		return true
+	case reflect.Ptr:
+		return equalAny(v1.Elem(), v2.Elem(), prop)
+	case reflect.Slice:
+		if v1.Type().Elem().Kind() == reflect.Uint8 {
+			// short circuit: []byte
+
+			// Edge case: if this is in a proto3 message, a zero length
+			// bytes field is considered the zero value.
+			if prop != nil && prop.proto3 && v1.Len() == 0 && v2.Len() == 0 {
+				return true
+			}
+			if v1.IsNil() != v2.IsNil() {
+				return false
+			}
+			return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
+		}
+
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		for i := 0; i < v1.Len(); i++ {
+			if !equalAny(v1.Index(i), v2.Index(i), prop) {
+				return false
+			}
+		}
+		return true
+	case reflect.String:
+		return v1.Interface().(string) == v2.Interface().(string)
+	case reflect.Struct:
+		return equalStruct(v1, v2)
+	case reflect.Uint32, reflect.Uint64:
+		return v1.Uint() == v2.Uint()
+	}
+
+	// unknown type, so not a protocol buffer
+	log.Printf("proto: don't know how to compare %v", v1)
+	return false
+}
+
+// base is the struct type that the extensions are based on.
+// em1 and em2 are extension maps.
+func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
+	if len(em1) != len(em2) {
+		return false
+	}
+
+	for extNum, e1 := range em1 {
+		e2, ok := em2[extNum]
+		if !ok {
+			return false
+		}
+
+		m1, m2 := e1.value, e2.value
+
+		if m1 != nil && m2 != nil {
+			// Both are unencoded.
+			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
+				return false
+			}
+			continue
+		}
+
+		// At least one is encoded. To do a semantically correct comparison
+		// we need to unmarshal them first.
+		var desc *ExtensionDesc
+		if m := extensionMaps[base]; m != nil {
+			desc = m[extNum]
+		}
+		if desc == nil {
+			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
+			continue
+		}
+		var err error
+		if m1 == nil {
+			m1, err = decodeExtension(e1.enc, desc)
+		}
+		if m2 == nil && err == nil {
+			m2, err = decodeExtension(e2.enc, desc)
+		}
+		if err != nil {
+			// The encoded form is invalid.
+			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
+			return false
+		}
+		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/vendor/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go
new file mode 100644
index 0000000000..054f4f1df7
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/extensions.go
@@ -0,0 +1,399 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Types and routines for supporting protocol buffer extensions.
+ */
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+	"sync"
+)
+
+// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
+var ErrMissingExtension = errors.New("proto: missing extension")
+
+// ExtensionRange represents a range of message extensions for a protocol buffer.
+// Used in code generated by the protocol compiler.
+type ExtensionRange struct {
+	Start, End int32 // both inclusive
+}
+
+// extendableProto is an interface implemented by any protocol buffer that may be extended.
+type extendableProto interface {
+	Message
+	ExtensionRangeArray() []ExtensionRange
+	ExtensionMap() map[int32]Extension
+}
+
+var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
+
+// ExtensionDesc represents an extension specification.
+// Used in generated code from the protocol compiler.
+type ExtensionDesc struct {
+	ExtendedType  Message     // nil pointer to the type that is being extended
+	ExtensionType interface{} // nil pointer to the extension type
+	Field         int32       // field number
+	Name          string      // fully-qualified name of extension, for text formatting
+	Tag           string      // protobuf tag style
+}
+
+func (ed *ExtensionDesc) repeated() bool {
+	t := reflect.TypeOf(ed.ExtensionType)
+	return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
+}
+
+// Extension represents an extension in a message.
+type Extension struct {
+	// When an extension is stored in a message using SetExtension
+	// only desc and value are set. When the message is marshaled
+	// enc will be set to the encoded form of the message.
+	//
+	// When a message is unmarshaled and contains extensions, each
+	// extension will have only enc set. When such an extension is
+	// accessed using GetExtension (or GetExtensions) desc and value
+	// will be set.
+	desc  *ExtensionDesc
+	value interface{}
+	enc   []byte
+}
+
+// SetRawExtension is for testing only.
+func SetRawExtension(base extendableProto, id int32, b []byte) {
+	base.ExtensionMap()[id] = Extension{enc: b}
+}
+
+// isExtensionField returns true iff the given field number is in an extension range.
+func isExtensionField(pb extendableProto, field int32) bool {
+	for _, er := range pb.ExtensionRangeArray() {
+		if er.Start <= field && field <= er.End {
+			return true
+		}
+	}
+	return false
+}
+
+// checkExtensionTypes checks that the given extension is valid for pb.
+func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
+	// Check the extended type.
+	if a, b := reflect.TypeOf(pb), reflect.TypeOf(extension.ExtendedType); a != b {
+		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
+	}
+	// Check the range.
+	if !isExtensionField(pb, extension.Field) {
+		return errors.New("proto: bad extension number; not in declared ranges")
+	}
+	return nil
+}
+
+// extPropKey is sufficient to uniquely identify an extension.
+type extPropKey struct {
+	base  reflect.Type
+	field int32
+}
+
+var extProp = struct {
+	sync.RWMutex
+	m map[extPropKey]*Properties
+}{
+	m: make(map[extPropKey]*Properties),
+}
+
+func extensionProperties(ed *ExtensionDesc) *Properties {
+	key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
+
+	extProp.RLock()
+	if prop, ok := extProp.m[key]; ok {
+		extProp.RUnlock()
+		return prop
+	}
+	extProp.RUnlock()
+
+	extProp.Lock()
+	defer extProp.Unlock()
+	// Check again.
+	if prop, ok := extProp.m[key]; ok {
+		return prop
+	}
+
+	prop := new(Properties)
+	prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
+	extProp.m[key] = prop
+	return prop
+}
+
+// encodeExtensionMap encodes any unmarshaled (unencoded) extensions in m.
+func encodeExtensionMap(m map[int32]Extension) error {
+	for k, e := range m {
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		et := reflect.TypeOf(e.desc.ExtensionType)
+		props := extensionProperties(e.desc)
+
+		p := NewBuffer(nil)
+		// If e.value has type T, the encoder expects a *struct{ X T }.
+		// Pass a *T with a zero field and hope it all works out.
+		x := reflect.New(et)
+		x.Elem().Set(reflect.ValueOf(e.value))
+		if err := props.enc(p, props, toStructPointer(x)); err != nil {
+			return err
+		}
+		e.enc = p.buf
+		m[k] = e
+	}
+	return nil
+}
+
+func sizeExtensionMap(m map[int32]Extension) (n int) {
+	for _, e := range m {
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			n += len(e.enc)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		et := reflect.TypeOf(e.desc.ExtensionType)
+		props := extensionProperties(e.desc)
+
+		// If e.value has type T, the encoder expects a *struct{ X T }.
+		// Pass a *T with a zero field and hope it all works out.
+		x := reflect.New(et)
+		x.Elem().Set(reflect.ValueOf(e.value))
+		n += props.size(props, toStructPointer(x))
+	}
+	return
+}
+
+// HasExtension returns whether the given extension is present in pb.
+func HasExtension(pb extendableProto, extension *ExtensionDesc) bool {
+	// TODO: Check types, field numbers, etc.?
+	_, ok := pb.ExtensionMap()[extension.Field]
+	return ok
+}
+
+// ClearExtension removes the given extension from pb.
+func ClearExtension(pb extendableProto, extension *ExtensionDesc) {
+	// TODO: Check types, field numbers, etc.?
+	delete(pb.ExtensionMap(), extension.Field)
+}
+
+// GetExtension parses and returns the given extension of pb.
+// If the extension is not present and has no default value it returns ErrMissingExtension.
+func GetExtension(pb extendableProto, extension *ExtensionDesc) (interface{}, error) {
+	if err := checkExtensionTypes(pb, extension); err != nil {
+		return nil, err
+	}
+
+	emap := pb.ExtensionMap()
+	e, ok := emap[extension.Field]
+	if !ok {
+		// defaultExtensionValue returns the default value or
+		// ErrMissingExtension if there is no default.
+		return defaultExtensionValue(extension)
+	}
+
+	if e.value != nil {
+		// Already decoded. Check the descriptor, though.
+		if e.desc != extension {
+			// This shouldn't happen. If it does, it means that
+			// GetExtension was called twice with two different
+			// descriptors with the same field number.
+			return nil, errors.New("proto: descriptor conflict")
+		}
+		return e.value, nil
+	}
+
+	v, err := decodeExtension(e.enc, extension)
+	if err != nil {
+		return nil, err
+	}
+
+	// Remember the decoded version and drop the encoded version.
+	// That way it is safe to mutate what we return.
+	e.value = v
+	e.desc = extension
+	e.enc = nil
+	emap[extension.Field] = e
+	return e.value, nil
+}
+
+// defaultExtensionValue returns the default value for extension.
+// If no default for an extension is defined ErrMissingExtension is returned.
+func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
+	t := reflect.TypeOf(extension.ExtensionType)
+	props := extensionProperties(extension)
+
+	sf, _, err := fieldDefault(t, props)
+	if err != nil {
+		return nil, err
+	}
+
+	if sf == nil || sf.value == nil {
+		// There is no default value.
+		return nil, ErrMissingExtension
+	}
+
+	if t.Kind() != reflect.Ptr {
+		// We do not need to return a Ptr, we can directly return sf.value.
+		return sf.value, nil
+	}
+
+	// We need to return an interface{} that is a pointer to sf.value.
+	value := reflect.New(t).Elem()
+	value.Set(reflect.New(value.Type().Elem()))
+	if sf.kind == reflect.Int32 {
+		// We may have an int32 or an enum, but the underlying data is int32.
+		// Since we can't set an int32 into a non int32 reflect.value directly
+		// set it as a int32.
+		value.Elem().SetInt(int64(sf.value.(int32)))
+	} else {
+		value.Elem().Set(reflect.ValueOf(sf.value))
+	}
+	return value.Interface(), nil
+}
+
+// decodeExtension decodes an extension encoded in b.
+func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
+	o := NewBuffer(b)
+
+	t := reflect.TypeOf(extension.ExtensionType)
+
+	props := extensionProperties(extension)
+
+	// t is a pointer to a struct, pointer to basic type or a slice.
+	// Allocate a "field" to store the pointer/slice itself; the
+	// pointer/slice will be stored here. We pass
+	// the address of this field to props.dec.
+	// This passes a zero field and a *t and lets props.dec
+	// interpret it as a *struct{ x t }.
+	value := reflect.New(t).Elem()
+
+	for {
+		// Discard wire type and field number varint. It isn't needed.
+		if _, err := o.DecodeVarint(); err != nil {
+			return nil, err
+		}
+
+		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
+			return nil, err
+		}
+
+		if o.index >= len(o.buf) {
+			break
+		}
+	}
+	return value.Interface(), nil
+}
+
+// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
+// The returned slice has the same length as es; missing extensions will appear as nil elements.
+func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
+	epb, ok := pb.(extendableProto)
+	if !ok {
+		err = errors.New("proto: not an extendable proto")
+		return
+	}
+	extensions = make([]interface{}, len(es))
+	for i, e := range es {
+		extensions[i], err = GetExtension(epb, e)
+		if err == ErrMissingExtension {
+			err = nil
+		}
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+// SetExtension sets the specified extension of pb to the specified value.
+func SetExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
+	if err := checkExtensionTypes(pb, extension); err != nil {
+		return err
+	}
+	typ := reflect.TypeOf(extension.ExtensionType)
+	if typ != reflect.TypeOf(value) {
+		return errors.New("proto: bad extension value type")
+	}
+	// nil extension values need to be caught early, because the
+	// encoder can't distinguish an ErrNil due to a nil extension
+	// from an ErrNil due to a missing field. Extensions are
+	// always optional, so the encoder would just swallow the error
+	// and drop all the extensions from the encoded message.
+	if reflect.ValueOf(value).IsNil() {
+		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
+	}
+
+	pb.ExtensionMap()[extension.Field] = Extension{desc: extension, value: value}
+	return nil
+}
+
+// A global registry of extensions.
+// The generated code will register the generated descriptors by calling RegisterExtension.
+
+var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
+
+// RegisterExtension is called from the generated code.
+func RegisterExtension(desc *ExtensionDesc) {
+	st := reflect.TypeOf(desc.ExtendedType).Elem()
+	m := extensionMaps[st]
+	if m == nil {
+		m = make(map[int32]*ExtensionDesc)
+		extensionMaps[st] = m
+	}
+	if _, ok := m[desc.Field]; ok {
+		panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
+	}
+	m[desc.Field] = desc
+}
+
+// RegisteredExtensions returns a map of the registered extensions of a
+// protocol buffer struct, indexed by the extension number.
+// The argument pb should be a nil pointer to the struct type.
+func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
+	return extensionMaps[reflect.TypeOf(pb).Elem()]
+}
diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go
new file mode 100644
index 0000000000..42a58c6fd4
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/lib.go
@@ -0,0 +1,893 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+Package proto converts data structures to and from the wire format of
+protocol buffers.  It works in concert with the Go source code generated
+for .proto files by the protocol compiler.
+
+A summary of the properties of the protocol buffer interface
+for a protocol buffer variable v:
+
+  - Names are turned from camel_case to CamelCase for export.
+  - There are no methods on v to set fields; just treat
+	them as structure fields.
+  - There are getters that return a field's value if set,
+	and return the field's default value if unset.
+	The getters work even if the receiver is a nil message.
+  - The zero value for a struct is its correct initialization state.
+	All desired fields must be set before marshaling.
+  - A Reset() method will restore a protobuf struct to its zero state.
+  - Non-repeated fields are pointers to the values; nil means unset.
+	That is, optional or required field int32 f becomes F *int32.
+  - Repeated fields are slices.
+  - Helper functions are available to aid the setting of fields.
+	msg.Foo = proto.String("hello") // set field
+  - Constants are defined to hold the default values of all fields that
+	have them.  They have the form Default_StructName_FieldName.
+	Because the getter methods handle defaulted values,
+	direct use of these constants should be rare.
+  - Enums are given type names and maps from names to values.
+	Enum values are prefixed by the enclosing message's name, or by the
+	enum's type name if it is a top-level enum. Enum types have a String
+	method, and a Enum method to assist in message construction.
+  - Nested messages, groups and enums have type names prefixed with the name of
+	the surrounding message type.
+  - Extensions are given descriptor names that start with E_,
+	followed by an underscore-delimited list of the nested messages
+	that contain it (if any) followed by the CamelCased name of the
+	extension field itself.  HasExtension, ClearExtension, GetExtension
+	and SetExtension are functions for manipulating extensions.
+  - Oneof field sets are given a single field in their message,
+	with distinguished wrapper types for each possible field value.
+  - Marshal and Unmarshal are functions to encode and decode the wire format.
+
+When the .proto file specifies `syntax="proto3"`, there are some differences:
+
+  - Non-repeated fields of non-message type are values instead of pointers.
+  - Getters are only generated for message and oneof fields.
+  - Enum types do not get an Enum method.
+
+The simplest way to describe this is to see an example.
+Given file test.proto, containing
+
+	package example;
+
+	enum FOO { X = 17; }
+
+	message Test {
+	  required string label = 1;
+	  optional int32 type = 2 [default=77];
+	  repeated int64 reps = 3;
+	  optional group OptionalGroup = 4 {
+	    required string RequiredField = 5;
+	  }
+	  oneof union {
+	    int32 number = 6;
+	    string name = 7;
+	  }
+	}
+
+The resulting file, test.pb.go, is:
+
+	package example
+
+	import proto "github.com/golang/protobuf/proto"
+	import math "math"
+
+	type FOO int32
+	const (
+		FOO_X FOO = 17
+	)
+	var FOO_name = map[int32]string{
+		17: "X",
+	}
+	var FOO_value = map[string]int32{
+		"X": 17,
+	}
+
+	func (x FOO) Enum() *FOO {
+		p := new(FOO)
+		*p = x
+		return p
+	}
+	func (x FOO) String() string {
+		return proto.EnumName(FOO_name, int32(x))
+	}
+	func (x *FOO) UnmarshalJSON(data []byte) error {
+		value, err := proto.UnmarshalJSONEnum(FOO_value, data)
+		if err != nil {
+			return err
+		}
+		*x = FOO(value)
+		return nil
+	}
+
+	type Test struct {
+		Label         *string             `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
+		Type          *int32              `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
+		Reps          []int64             `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
+		Optionalgroup *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
+		// Types that are valid to be assigned to Union:
+		//	*Test_Number
+		//	*Test_Name
+		Union            isTest_Union `protobuf_oneof:"union"`
+		XXX_unrecognized []byte       `json:"-"`
+	}
+	func (m *Test) Reset()         { *m = Test{} }
+	func (m *Test) String() string { return proto.CompactTextString(m) }
+	func (*Test) ProtoMessage() {}
+
+	type isTest_Union interface {
+		isTest_Union()
+	}
+
+	type Test_Number struct {
+		Number int32 `protobuf:"varint,6,opt,name=number"`
+	}
+	type Test_Name struct {
+		Name string `protobuf:"bytes,7,opt,name=name"`
+	}
+
+	func (*Test_Number) isTest_Union() {}
+	func (*Test_Name) isTest_Union()   {}
+
+	func (m *Test) GetUnion() isTest_Union {
+		if m != nil {
+			return m.Union
+		}
+		return nil
+	}
+	const Default_Test_Type int32 = 77
+
+	func (m *Test) GetLabel() string {
+		if m != nil && m.Label != nil {
+			return *m.Label
+		}
+		return ""
+	}
+
+	func (m *Test) GetType() int32 {
+		if m != nil && m.Type != nil {
+			return *m.Type
+		}
+		return Default_Test_Type
+	}
+
+	func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
+		if m != nil {
+			return m.Optionalgroup
+		}
+		return nil
+	}
+
+	type Test_OptionalGroup struct {
+		RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
+	}
+	func (m *Test_OptionalGroup) Reset()         { *m = Test_OptionalGroup{} }
+	func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
+
+	func (m *Test_OptionalGroup) GetRequiredField() string {
+		if m != nil && m.RequiredField != nil {
+			return *m.RequiredField
+		}
+		return ""
+	}
+
+	func (m *Test) GetNumber() int32 {
+		if x, ok := m.GetUnion().(*Test_Number); ok {
+			return x.Number
+		}
+		return 0
+	}
+
+	func (m *Test) GetName() string {
+		if x, ok := m.GetUnion().(*Test_Name); ok {
+			return x.Name
+		}
+		return ""
+	}
+
+	func init() {
+		proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
+	}
+
+To create and play with a Test object:
+
+	package main
+
+	import (
+		"log"
+
+		"github.com/golang/protobuf/proto"
+		pb "./example.pb"
+	)
+
+	func main() {
+		test := &pb.Test{
+			Label: proto.String("hello"),
+			Type:  proto.Int32(17),
+			Optionalgroup: &pb.Test_OptionalGroup{
+				RequiredField: proto.String("good bye"),
+			},
+			Union: &pb.Test_Name{"fred"},
+		}
+		data, err := proto.Marshal(test)
+		if err != nil {
+			log.Fatal("marshaling error: ", err)
+		}
+		newTest := &pb.Test{}
+		err = proto.Unmarshal(data, newTest)
+		if err != nil {
+			log.Fatal("unmarshaling error: ", err)
+		}
+		// Now test and newTest contain the same data.
+		if test.GetLabel() != newTest.GetLabel() {
+			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
+		}
+		// Use a type switch to determine which oneof was set.
+		switch u := test.Union.(type) {
+		case *pb.Test_Number: // u.Number contains the number.
+		case *pb.Test_Name: // u.Name contains the string.
+		}
+		// etc.
+	}
+*/
+package proto
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"reflect"
+	"sort"
+	"strconv"
+	"sync"
+)
+
+// Message is implemented by generated protocol buffer messages.
+type Message interface {
+	Reset()
+	String() string
+	ProtoMessage()
+}
+
+// Stats records allocation details about the protocol buffer encoders
+// and decoders.  Useful for tuning the library itself.
+type Stats struct {
+	Emalloc uint64 // mallocs in encode
+	Dmalloc uint64 // mallocs in decode
+	Encode  uint64 // number of encodes
+	Decode  uint64 // number of decodes
+	Chit    uint64 // number of cache hits
+	Cmiss   uint64 // number of cache misses
+	Size    uint64 // number of sizes
+}
+
+// Set to true to enable stats collection.
+const collectStats = false
+
+var stats Stats
+
+// GetStats returns a copy of the global Stats structure.
+func GetStats() Stats { return stats }
+
+// A Buffer is a buffer manager for marshaling and unmarshaling
+// protocol buffers.  It may be reused between invocations to
+// reduce memory usage.  It is not necessary to use a Buffer;
+// the global functions Marshal and Unmarshal create a
+// temporary Buffer and are fine for most applications.
+type Buffer struct {
+	buf   []byte // encode/decode byte stream
+	index int    // write point
+
+	// pools of basic types to amortize allocation.
+	bools   []bool
+	uint32s []uint32
+	uint64s []uint64
+
+	// extra pools, only used with pointer_reflect.go
+	int32s   []int32
+	int64s   []int64
+	float32s []float32
+	float64s []float64
+}
+
+// NewBuffer allocates a new Buffer and initializes its internal data to
+// the contents of the argument slice.
+func NewBuffer(e []byte) *Buffer {
+	return &Buffer{buf: e}
+}
+
+// Reset resets the Buffer, ready for marshaling a new protocol buffer.
+func (p *Buffer) Reset() {
+	p.buf = p.buf[0:0] // for reading/writing
+	p.index = 0        // for reading
+}
+
+// SetBuf replaces the internal buffer with the slice,
+// ready for unmarshaling the contents of the slice.
+func (p *Buffer) SetBuf(s []byte) {
+	p.buf = s
+	p.index = 0
+}
+
+// Bytes returns the contents of the Buffer.
+func (p *Buffer) Bytes() []byte { return p.buf }
+
+/*
+ * Helper routines for simplifying the creation of optional fields of basic type.
+ */
+
+// Bool is a helper routine that allocates a new bool value
+// to store v and returns a pointer to it.
+func Bool(v bool) *bool {
+	return &v
+}
+
+// Int32 is a helper routine that allocates a new int32 value
+// to store v and returns a pointer to it.
+func Int32(v int32) *int32 {
+	return &v
+}
+
+// Int is a helper routine that allocates a new int32 value
+// to store v and returns a pointer to it, but unlike Int32
+// its argument value is an int.
+func Int(v int) *int32 {
+	p := new(int32)
+	*p = int32(v)
+	return p
+}
+
+// Int64 is a helper routine that allocates a new int64 value
+// to store v and returns a pointer to it.
+func Int64(v int64) *int64 {
+	return &v
+}
+
+// Float32 is a helper routine that allocates a new float32 value
+// to store v and returns a pointer to it.
+func Float32(v float32) *float32 {
+	return &v
+}
+
+// Float64 is a helper routine that allocates a new float64 value
+// to store v and returns a pointer to it.
+func Float64(v float64) *float64 {
+	return &v
+}
+
+// Uint32 is a helper routine that allocates a new uint32 value
+// to store v and returns a pointer to it.
+func Uint32(v uint32) *uint32 {
+	return &v
+}
+
+// Uint64 is a helper routine that allocates a new uint64 value
+// to store v and returns a pointer to it.
+func Uint64(v uint64) *uint64 {
+	return &v
+}
+
+// String is a helper routine that allocates a new string value
+// to store v and returns a pointer to it.
+func String(v string) *string {
+	return &v
+}
+
+// EnumName is a helper function to simplify printing protocol buffer enums
+// by name.  Given an enum map and a value, it returns a useful string.
+func EnumName(m map[int32]string, v int32) string {
+	s, ok := m[v]
+	if ok {
+		return s
+	}
+	return strconv.Itoa(int(v))
+}
+
+// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
+// from their JSON-encoded representation. Given a map from the enum's symbolic
+// names to its int values, and a byte buffer containing the JSON-encoded
+// value, it returns an int32 that can be cast to the enum type by the caller.
+//
+// The function can deal with both JSON representations, numeric and symbolic.
+func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
+	if data[0] == '"' {
+		// New style: enums are strings.
+		var repr string
+		if err := json.Unmarshal(data, &repr); err != nil {
+			return -1, err
+		}
+		val, ok := m[repr]
+		if !ok {
+			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
+		}
+		return val, nil
+	}
+	// Old style: enums are ints.
+	var val int32
+	if err := json.Unmarshal(data, &val); err != nil {
+		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
+	}
+	return val, nil
+}
+
+// DebugPrint dumps the encoded data in b in a debugging format with a header
+// including the string s. Used in testing but made available for general debugging.
+func (p *Buffer) DebugPrint(s string, b []byte) {
+	var u uint64
+
+	obuf := p.buf
+	index := p.index
+	p.buf = b
+	p.index = 0
+	depth := 0
+
+	fmt.Printf("\n--- %s ---\n", s)
+
+out:
+	for {
+		for i := 0; i < depth; i++ {
+			fmt.Print("  ")
+		}
+
+		index := p.index
+		if index == len(p.buf) {
+			break
+		}
+
+		op, err := p.DecodeVarint()
+		if err != nil {
+			fmt.Printf("%3d: fetching op err %v\n", index, err)
+			break out
+		}
+		tag := op >> 3
+		wire := op & 7
+
+		switch wire {
+		default:
+			fmt.Printf("%3d: t=%3d unknown wire=%d\n",
+				index, tag, wire)
+			break out
+
+		case WireBytes:
+			var r []byte
+
+			r, err = p.DecodeRawBytes(false)
+			if err != nil {
+				break out
+			}
+			fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
+			if len(r) <= 6 {
+				for i := 0; i < len(r); i++ {
+					fmt.Printf(" %.2x", r[i])
+				}
+			} else {
+				for i := 0; i < 3; i++ {
+					fmt.Printf(" %.2x", r[i])
+				}
+				fmt.Printf(" ..")
+				for i := len(r) - 3; i < len(r); i++ {
+					fmt.Printf(" %.2x", r[i])
+				}
+			}
+			fmt.Printf("\n")
+
+		case WireFixed32:
+			u, err = p.DecodeFixed32()
+			if err != nil {
+				fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
+				break out
+			}
+			fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
+
+		case WireFixed64:
+			u, err = p.DecodeFixed64()
+			if err != nil {
+				fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
+				break out
+			}
+			fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
+
+		case WireVarint:
+			u, err = p.DecodeVarint()
+			if err != nil {
+				fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
+				break out
+			}
+			fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
+
+		case WireStartGroup:
+			fmt.Printf("%3d: t=%3d start\n", index, tag)
+			depth++
+
+		case WireEndGroup:
+			depth--
+			fmt.Printf("%3d: t=%3d end\n", index, tag)
+		}
+	}
+
+	if depth != 0 {
+		fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
+	}
+	fmt.Printf("\n")
+
+	p.buf = obuf
+	p.index = index
+}
+
+// SetDefaults sets unset protocol buffer fields to their default values.
+// It only modifies fields that are both unset and have defined defaults.
+// It recursively sets default values in any non-nil sub-messages.
+func SetDefaults(pb Message) {
+	setDefaults(reflect.ValueOf(pb), true, false)
+}
+
+// v is a pointer to a struct.
+func setDefaults(v reflect.Value, recur, zeros bool) {
+	v = v.Elem()
+
+	defaultMu.RLock()
+	dm, ok := defaults[v.Type()]
+	defaultMu.RUnlock()
+	if !ok {
+		dm = buildDefaultMessage(v.Type())
+		defaultMu.Lock()
+		defaults[v.Type()] = dm
+		defaultMu.Unlock()
+	}
+
+	for _, sf := range dm.scalars {
+		f := v.Field(sf.index)
+		if !f.IsNil() {
+			// field already set
+			continue
+		}
+		dv := sf.value
+		if dv == nil && !zeros {
+			// no explicit default, and don't want to set zeros
+			continue
+		}
+		fptr := f.Addr().Interface() // **T
+		// TODO: Consider batching the allocations we do here.
+		switch sf.kind {
+		case reflect.Bool:
+			b := new(bool)
+			if dv != nil {
+				*b = dv.(bool)
+			}
+			*(fptr.(**bool)) = b
+		case reflect.Float32:
+			f := new(float32)
+			if dv != nil {
+				*f = dv.(float32)
+			}
+			*(fptr.(**float32)) = f
+		case reflect.Float64:
+			f := new(float64)
+			if dv != nil {
+				*f = dv.(float64)
+			}
+			*(fptr.(**float64)) = f
+		case reflect.Int32:
+			// might be an enum
+			if ft := f.Type(); ft != int32PtrType {
+				// enum
+				f.Set(reflect.New(ft.Elem()))
+				if dv != nil {
+					f.Elem().SetInt(int64(dv.(int32)))
+				}
+			} else {
+				// int32 field
+				i := new(int32)
+				if dv != nil {
+					*i = dv.(int32)
+				}
+				*(fptr.(**int32)) = i
+			}
+		case reflect.Int64:
+			i := new(int64)
+			if dv != nil {
+				*i = dv.(int64)
+			}
+			*(fptr.(**int64)) = i
+		case reflect.String:
+			s := new(string)
+			if dv != nil {
+				*s = dv.(string)
+			}
+			*(fptr.(**string)) = s
+		case reflect.Uint8:
+			// exceptional case: []byte
+			var b []byte
+			if dv != nil {
+				db := dv.([]byte)
+				b = make([]byte, len(db))
+				copy(b, db)
+			} else {
+				b = []byte{}
+			}
+			*(fptr.(*[]byte)) = b
+		case reflect.Uint32:
+			u := new(uint32)
+			if dv != nil {
+				*u = dv.(uint32)
+			}
+			*(fptr.(**uint32)) = u
+		case reflect.Uint64:
+			u := new(uint64)
+			if dv != nil {
+				*u = dv.(uint64)
+			}
+			*(fptr.(**uint64)) = u
+		default:
+			log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
+		}
+	}
+
+	for _, ni := range dm.nested {
+		f := v.Field(ni)
+		// f is *T or []*T or map[T]*T
+		switch f.Kind() {
+		case reflect.Ptr:
+			if f.IsNil() {
+				continue
+			}
+			setDefaults(f, recur, zeros)
+
+		case reflect.Slice:
+			for i := 0; i < f.Len(); i++ {
+				e := f.Index(i)
+				if e.IsNil() {
+					continue
+				}
+				setDefaults(e, recur, zeros)
+			}
+
+		case reflect.Map:
+			for _, k := range f.MapKeys() {
+				e := f.MapIndex(k)
+				if e.IsNil() {
+					continue
+				}
+				setDefaults(e, recur, zeros)
+			}
+		}
+	}
+}
+
+var (
+	// defaults maps a protocol buffer struct type to a slice of the fields,
+	// with its scalar fields set to their proto-declared non-zero default values.
+	defaultMu sync.RWMutex
+	defaults  = make(map[reflect.Type]defaultMessage)
+
+	int32PtrType = reflect.TypeOf((*int32)(nil))
+)
+
+// defaultMessage represents information about the default values of a message.
+type defaultMessage struct {
+	scalars []scalarField
+	nested  []int // struct field index of nested messages
+}
+
+type scalarField struct {
+	index int          // struct field index
+	kind  reflect.Kind // element type (the T in *T or []T)
+	value interface{}  // the proto-declared default value, or nil
+}
+
+// t is a struct type.
+func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
+	sprop := GetProperties(t)
+	for _, prop := range sprop.Prop {
+		fi, ok := sprop.decoderTags.get(prop.Tag)
+		if !ok {
+			// XXX_unrecognized
+			continue
+		}
+		ft := t.Field(fi).Type
+
+		sf, nested, err := fieldDefault(ft, prop)
+		switch {
+		case err != nil:
+			log.Print(err)
+		case nested:
+			dm.nested = append(dm.nested, fi)
+		case sf != nil:
+			sf.index = fi
+			dm.scalars = append(dm.scalars, *sf)
+		}
+	}
+
+	return dm
+}
+
+// fieldDefault returns the scalarField for field type ft.
+// sf will be nil if the field can not have a default.
+// nestedMessage will be true if this is a nested message.
+// Note that sf.index is not set on return.
+func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
+	var canHaveDefault bool
+	switch ft.Kind() {
+	case reflect.Ptr:
+		if ft.Elem().Kind() == reflect.Struct {
+			nestedMessage = true
+		} else {
+			canHaveDefault = true // proto2 scalar field
+		}
+
+	case reflect.Slice:
+		switch ft.Elem().Kind() {
+		case reflect.Ptr:
+			nestedMessage = true // repeated message
+		case reflect.Uint8:
+			canHaveDefault = true // bytes field
+		}
+
+	case reflect.Map:
+		if ft.Elem().Kind() == reflect.Ptr {
+			nestedMessage = true // map with message values
+		}
+	}
+
+	if !canHaveDefault {
+		if nestedMessage {
+			return nil, true, nil
+		}
+		return nil, false, nil
+	}
+
+	// We now know that ft is a pointer or slice.
+	sf = &scalarField{kind: ft.Elem().Kind()}
+
+	// scalar fields without defaults
+	if !prop.HasDefault {
+		return sf, false, nil
+	}
+
+	// a scalar field: either *T or []byte
+	switch ft.Elem().Kind() {
+	case reflect.Bool:
+		x, err := strconv.ParseBool(prop.Default)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	case reflect.Float32:
+		x, err := strconv.ParseFloat(prop.Default, 32)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
+		}
+		sf.value = float32(x)
+	case reflect.Float64:
+		x, err := strconv.ParseFloat(prop.Default, 64)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	case reflect.Int32:
+		x, err := strconv.ParseInt(prop.Default, 10, 32)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
+		}
+		sf.value = int32(x)
+	case reflect.Int64:
+		x, err := strconv.ParseInt(prop.Default, 10, 64)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	case reflect.String:
+		sf.value = prop.Default
+	case reflect.Uint8:
+		// []byte (not *uint8)
+		sf.value = []byte(prop.Default)
+	case reflect.Uint32:
+		x, err := strconv.ParseUint(prop.Default, 10, 32)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
+		}
+		sf.value = uint32(x)
+	case reflect.Uint64:
+		x, err := strconv.ParseUint(prop.Default, 10, 64)
+		if err != nil {
+			return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
+		}
+		sf.value = x
+	default:
+		return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
+	}
+
+	return sf, false, nil
+}
+
+// Map fields may have key types of non-float scalars, strings and enums.
+// The easiest way to sort them in some deterministic order is to use fmt.
+// If this turns out to be inefficient we can always consider other options,
+// such as doing a Schwartzian transform.
+
+func mapKeys(vs []reflect.Value) sort.Interface {
+	s := mapKeySorter{
+		vs: vs,
+		// default Less function: textual comparison
+		less: func(a, b reflect.Value) bool {
+			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
+		},
+	}
+
+	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
+	// numeric keys are sorted numerically.
+	if len(vs) == 0 {
+		return s
+	}
+	switch vs[0].Kind() {
+	case reflect.Int32, reflect.Int64:
+		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
+	case reflect.Uint32, reflect.Uint64:
+		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
+	}
+
+	return s
+}
+
+type mapKeySorter struct {
+	vs   []reflect.Value
+	less func(a, b reflect.Value) bool
+}
+
+func (s mapKeySorter) Len() int      { return len(s.vs) }
+func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
+func (s mapKeySorter) Less(i, j int) bool {
+	return s.less(s.vs[i], s.vs[j])
+}
+
+// isProto3Zero reports whether v is a zero proto3 value.
+func isProto3Zero(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.Bool:
+		return !v.Bool()
+	case reflect.Int32, reflect.Int64:
+		return v.Int() == 0
+	case reflect.Uint32, reflect.Uint64:
+		return v.Uint() == 0
+	case reflect.Float32, reflect.Float64:
+		return v.Float() == 0
+	case reflect.String:
+		return v.String() == ""
+	}
+	return false
+}
+
+// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
+// to assert that that code is compatible with this version of the proto package.
+const ProtoPackageIsVersion1 = true
diff --git a/vendor/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go
new file mode 100644
index 0000000000..e25e01e637
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/message_set.go
@@ -0,0 +1,280 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Support for message sets.
+ */
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"reflect"
+	"sort"
+)
+
+// errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
+// A message type ID is required for storing a protocol buffer in a message set.
+var errNoMessageTypeID = errors.New("proto does not have a message type ID")
+
+// The first two types (_MessageSet_Item and messageSet)
+// model what the protocol compiler produces for the following protocol message:
+//   message MessageSet {
+//     repeated group Item = 1 {
+//       required int32 type_id = 2;
+//       required string message = 3;
+//     };
+//   }
+// That is the MessageSet wire format. We can't use a proto to generate these
+// because that would introduce a circular dependency between it and this package.
+
+type _MessageSet_Item struct {
+	TypeId  *int32 `protobuf:"varint,2,req,name=type_id"`
+	Message []byte `protobuf:"bytes,3,req,name=message"`
+}
+
+type messageSet struct {
+	Item             []*_MessageSet_Item `protobuf:"group,1,rep"`
+	XXX_unrecognized []byte
+	// TODO: caching?
+}
+
+// Make sure messageSet is a Message.
+var _ Message = (*messageSet)(nil)
+
+// messageTypeIder is an interface satisfied by a protocol buffer type
+// that may be stored in a MessageSet.
+type messageTypeIder interface {
+	MessageTypeId() int32
+}
+
+func (ms *messageSet) find(pb Message) *_MessageSet_Item {
+	mti, ok := pb.(messageTypeIder)
+	if !ok {
+		return nil
+	}
+	id := mti.MessageTypeId()
+	for _, item := range ms.Item {
+		if *item.TypeId == id {
+			return item
+		}
+	}
+	return nil
+}
+
+func (ms *messageSet) Has(pb Message) bool {
+	if ms.find(pb) != nil {
+		return true
+	}
+	return false
+}
+
+func (ms *messageSet) Unmarshal(pb Message) error {
+	if item := ms.find(pb); item != nil {
+		return Unmarshal(item.Message, pb)
+	}
+	if _, ok := pb.(messageTypeIder); !ok {
+		return errNoMessageTypeID
+	}
+	return nil // TODO: return error instead?
+}
+
+func (ms *messageSet) Marshal(pb Message) error {
+	msg, err := Marshal(pb)
+	if err != nil {
+		return err
+	}
+	if item := ms.find(pb); item != nil {
+		// reuse existing item
+		item.Message = msg
+		return nil
+	}
+
+	mti, ok := pb.(messageTypeIder)
+	if !ok {
+		return errNoMessageTypeID
+	}
+
+	mtid := mti.MessageTypeId()
+	ms.Item = append(ms.Item, &_MessageSet_Item{
+		TypeId:  &mtid,
+		Message: msg,
+	})
+	return nil
+}
+
+func (ms *messageSet) Reset()         { *ms = messageSet{} }
+func (ms *messageSet) String() string { return CompactTextString(ms) }
+func (*messageSet) ProtoMessage()     {}
+
+// Support for the message_set_wire_format message option.
+
+func skipVarint(buf []byte) []byte {
+	i := 0
+	for ; buf[i]&0x80 != 0; i++ {
+	}
+	return buf[i+1:]
+}
+
+// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
+// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
+func MarshalMessageSet(m map[int32]Extension) ([]byte, error) {
+	if err := encodeExtensionMap(m); err != nil {
+		return nil, err
+	}
+
+	// Sort extension IDs to provide a deterministic encoding.
+	// See also enc_map in encode.go.
+	ids := make([]int, 0, len(m))
+	for id := range m {
+		ids = append(ids, int(id))
+	}
+	sort.Ints(ids)
+
+	ms := &messageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
+	for _, id := range ids {
+		e := m[int32(id)]
+		// Remove the wire type and field number varint, as well as the length varint.
+		msg := skipVarint(skipVarint(e.enc))
+
+		ms.Item = append(ms.Item, &_MessageSet_Item{
+			TypeId:  Int32(int32(id)),
+			Message: msg,
+		})
+	}
+	return Marshal(ms)
+}
+
+// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
+// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
+func UnmarshalMessageSet(buf []byte, m map[int32]Extension) error {
+	ms := new(messageSet)
+	if err := Unmarshal(buf, ms); err != nil {
+		return err
+	}
+	for _, item := range ms.Item {
+		id := *item.TypeId
+		msg := item.Message
+
+		// Restore wire type and field number varint, plus length varint.
+		// Be careful to preserve duplicate items.
+		b := EncodeVarint(uint64(id)<<3 | WireBytes)
+		if ext, ok := m[id]; ok {
+			// Existing data; rip off the tag and length varint
+			// so we join the new data correctly.
+			// We can assume that ext.enc is set because we are unmarshaling.
+			o := ext.enc[len(b):]   // skip wire type and field number
+			_, n := DecodeVarint(o) // calculate length of length varint
+			o = o[n:]               // skip length varint
+			msg = append(o, msg...) // join old data and new data
+		}
+		b = append(b, EncodeVarint(uint64(len(msg)))...)
+		b = append(b, msg...)
+
+		m[id] = Extension{enc: b}
+	}
+	return nil
+}
+
+// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
+// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
+func MarshalMessageSetJSON(m map[int32]Extension) ([]byte, error) {
+	var b bytes.Buffer
+	b.WriteByte('{')
+
+	// Process the map in key order for deterministic output.
+	ids := make([]int32, 0, len(m))
+	for id := range m {
+		ids = append(ids, id)
+	}
+	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
+
+	for i, id := range ids {
+		ext := m[id]
+		if i > 0 {
+			b.WriteByte(',')
+		}
+
+		msd, ok := messageSetMap[id]
+		if !ok {
+			// Unknown type; we can't render it, so skip it.
+			continue
+		}
+		fmt.Fprintf(&b, `"[%s]":`, msd.name)
+
+		x := ext.value
+		if x == nil {
+			x = reflect.New(msd.t.Elem()).Interface()
+			if err := Unmarshal(ext.enc, x.(Message)); err != nil {
+				return nil, err
+			}
+		}
+		d, err := json.Marshal(x)
+		if err != nil {
+			return nil, err
+		}
+		b.Write(d)
+	}
+	b.WriteByte('}')
+	return b.Bytes(), nil
+}
+
+// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
+// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
+func UnmarshalMessageSetJSON(buf []byte, m map[int32]Extension) error {
+	// Common-case fast path.
+	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
+		return nil
+	}
+
+	// This is fairly tricky, and it's not clear that it is needed.
+	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
+}
+
+// A global registry of types that can be used in a MessageSet.
+
+var messageSetMap = make(map[int32]messageSetDesc)
+
+type messageSetDesc struct {
+	t    reflect.Type // pointer to struct
+	name string
+}
+
+// RegisterMessageSetType is called from the generated code.
+func RegisterMessageSetType(m Message, fieldNum int32, name string) {
+	messageSetMap[fieldNum] = messageSetDesc{
+		t:    reflect.TypeOf(m),
+		name: name,
+	}
+}
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
new file mode 100644
index 0000000000..749919d250
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
@@ -0,0 +1,479 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2012 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// +build appengine
+
+// This file contains an implementation of proto field accesses using package reflect.
+// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
+// be used on App Engine.
+
+package proto
+
+import (
+	"math"
+	"reflect"
+)
+
+// A structPointer is a pointer to a struct.
+type structPointer struct {
+	v reflect.Value
+}
+
+// toStructPointer returns a structPointer equivalent to the given reflect value.
+// The reflect value must itself be a pointer to a struct.
+func toStructPointer(v reflect.Value) structPointer {
+	return structPointer{v}
+}
+
+// IsNil reports whether p is nil.
+func structPointer_IsNil(p structPointer) bool {
+	return p.v.IsNil()
+}
+
+// Interface returns the struct pointer as an interface value.
+func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
+	return p.v.Interface()
+}
+
+// A field identifies a field in a struct, accessible from a structPointer.
+// In this implementation, a field is identified by the sequence of field indices
+// passed to reflect's FieldByIndex.
+type field []int
+
+// toField returns a field equivalent to the given reflect field.
+func toField(f *reflect.StructField) field {
+	return f.Index
+}
+
+// invalidField is an invalid field identifier.
+var invalidField = field(nil)
+
+// IsValid reports whether the field identifier is valid.
+func (f field) IsValid() bool { return f != nil }
+
+// field returns the given field in the struct as a reflect value.
+func structPointer_field(p structPointer, f field) reflect.Value {
+	// Special case: an extension map entry with a value of type T
+	// passes a *T to the struct-handling code with a zero field,
+	// expecting that it will be treated as equivalent to *struct{ X T },
+	// which has the same memory layout. We have to handle that case
+	// specially, because reflect will panic if we call FieldByIndex on a
+	// non-struct.
+	if f == nil {
+		return p.v.Elem()
+	}
+
+	return p.v.Elem().FieldByIndex(f)
+}
+
+// ifield returns the given field in the struct as an interface value.
+func structPointer_ifield(p structPointer, f field) interface{} {
+	return structPointer_field(p, f).Addr().Interface()
+}
+
+// Bytes returns the address of a []byte field in the struct.
+func structPointer_Bytes(p structPointer, f field) *[]byte {
+	return structPointer_ifield(p, f).(*[]byte)
+}
+
+// BytesSlice returns the address of a [][]byte field in the struct.
+func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
+	return structPointer_ifield(p, f).(*[][]byte)
+}
+
+// Bool returns the address of a *bool field in the struct.
+func structPointer_Bool(p structPointer, f field) **bool {
+	return structPointer_ifield(p, f).(**bool)
+}
+
+// BoolVal returns the address of a bool field in the struct.
+func structPointer_BoolVal(p structPointer, f field) *bool {
+	return structPointer_ifield(p, f).(*bool)
+}
+
+// BoolSlice returns the address of a []bool field in the struct.
+func structPointer_BoolSlice(p structPointer, f field) *[]bool {
+	return structPointer_ifield(p, f).(*[]bool)
+}
+
+// String returns the address of a *string field in the struct.
+func structPointer_String(p structPointer, f field) **string {
+	return structPointer_ifield(p, f).(**string)
+}
+
+// StringVal returns the address of a string field in the struct.
+func structPointer_StringVal(p structPointer, f field) *string {
+	return structPointer_ifield(p, f).(*string)
+}
+
+// StringSlice returns the address of a []string field in the struct.
+func structPointer_StringSlice(p structPointer, f field) *[]string {
+	return structPointer_ifield(p, f).(*[]string)
+}
+
+// ExtMap returns the address of an extension map field in the struct.
+func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
+	return structPointer_ifield(p, f).(*map[int32]Extension)
+}
+
+// NewAt returns the reflect.Value for a pointer to a field in the struct.
+func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
+	return structPointer_field(p, f).Addr()
+}
+
+// SetStructPointer writes a *struct field in the struct.
+func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
+	structPointer_field(p, f).Set(q.v)
+}
+
+// GetStructPointer reads a *struct field in the struct.
+func structPointer_GetStructPointer(p structPointer, f field) structPointer {
+	return structPointer{structPointer_field(p, f)}
+}
+
+// StructPointerSlice the address of a []*struct field in the struct.
+func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
+	return structPointerSlice{structPointer_field(p, f)}
+}
+
+// A structPointerSlice represents the address of a slice of pointers to structs
+// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
+type structPointerSlice struct {
+	v reflect.Value
+}
+
+func (p structPointerSlice) Len() int                  { return p.v.Len() }
+func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
+func (p structPointerSlice) Append(q structPointer) {
+	p.v.Set(reflect.Append(p.v, q.v))
+}
+
+var (
+	int32Type   = reflect.TypeOf(int32(0))
+	uint32Type  = reflect.TypeOf(uint32(0))
+	float32Type = reflect.TypeOf(float32(0))
+	int64Type   = reflect.TypeOf(int64(0))
+	uint64Type  = reflect.TypeOf(uint64(0))
+	float64Type = reflect.TypeOf(float64(0))
+)
+
+// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
+// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
+type word32 struct {
+	v reflect.Value
+}
+
+// IsNil reports whether p is nil.
+func word32_IsNil(p word32) bool {
+	return p.v.IsNil()
+}
+
+// Set sets p to point at a newly allocated word with bits set to x.
+func word32_Set(p word32, o *Buffer, x uint32) {
+	t := p.v.Type().Elem()
+	switch t {
+	case int32Type:
+		if len(o.int32s) == 0 {
+			o.int32s = make([]int32, uint32PoolSize)
+		}
+		o.int32s[0] = int32(x)
+		p.v.Set(reflect.ValueOf(&o.int32s[0]))
+		o.int32s = o.int32s[1:]
+		return
+	case uint32Type:
+		if len(o.uint32s) == 0 {
+			o.uint32s = make([]uint32, uint32PoolSize)
+		}
+		o.uint32s[0] = x
+		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
+		o.uint32s = o.uint32s[1:]
+		return
+	case float32Type:
+		if len(o.float32s) == 0 {
+			o.float32s = make([]float32, uint32PoolSize)
+		}
+		o.float32s[0] = math.Float32frombits(x)
+		p.v.Set(reflect.ValueOf(&o.float32s[0]))
+		o.float32s = o.float32s[1:]
+		return
+	}
+
+	// must be enum
+	p.v.Set(reflect.New(t))
+	p.v.Elem().SetInt(int64(int32(x)))
+}
+
+// Get gets the bits pointed at by p, as a uint32.
+func word32_Get(p word32) uint32 {
+	elem := p.v.Elem()
+	switch elem.Kind() {
+	case reflect.Int32:
+		return uint32(elem.Int())
+	case reflect.Uint32:
+		return uint32(elem.Uint())
+	case reflect.Float32:
+		return math.Float32bits(float32(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
+func structPointer_Word32(p structPointer, f field) word32 {
+	return word32{structPointer_field(p, f)}
+}
+
+// A word32Val represents a field of type int32, uint32, float32, or enum.
+// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
+type word32Val struct {
+	v reflect.Value
+}
+
+// Set sets *p to x.
+func word32Val_Set(p word32Val, x uint32) {
+	switch p.v.Type() {
+	case int32Type:
+		p.v.SetInt(int64(x))
+		return
+	case uint32Type:
+		p.v.SetUint(uint64(x))
+		return
+	case float32Type:
+		p.v.SetFloat(float64(math.Float32frombits(x)))
+		return
+	}
+
+	// must be enum
+	p.v.SetInt(int64(int32(x)))
+}
+
+// Get gets the bits pointed at by p, as a uint32.
+func word32Val_Get(p word32Val) uint32 {
+	elem := p.v
+	switch elem.Kind() {
+	case reflect.Int32:
+		return uint32(elem.Int())
+	case reflect.Uint32:
+		return uint32(elem.Uint())
+	case reflect.Float32:
+		return math.Float32bits(float32(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
+func structPointer_Word32Val(p structPointer, f field) word32Val {
+	return word32Val{structPointer_field(p, f)}
+}
+
+// A word32Slice is a slice of 32-bit values.
+// That is, v.Type() is []int32, []uint32, []float32, or []enum.
+type word32Slice struct {
+	v reflect.Value
+}
+
+func (p word32Slice) Append(x uint32) {
+	n, m := p.v.Len(), p.v.Cap()
+	if n < m {
+		p.v.SetLen(n + 1)
+	} else {
+		t := p.v.Type().Elem()
+		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
+	}
+	elem := p.v.Index(n)
+	switch elem.Kind() {
+	case reflect.Int32:
+		elem.SetInt(int64(int32(x)))
+	case reflect.Uint32:
+		elem.SetUint(uint64(x))
+	case reflect.Float32:
+		elem.SetFloat(float64(math.Float32frombits(x)))
+	}
+}
+
+func (p word32Slice) Len() int {
+	return p.v.Len()
+}
+
+func (p word32Slice) Index(i int) uint32 {
+	elem := p.v.Index(i)
+	switch elem.Kind() {
+	case reflect.Int32:
+		return uint32(elem.Int())
+	case reflect.Uint32:
+		return uint32(elem.Uint())
+	case reflect.Float32:
+		return math.Float32bits(float32(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
+func structPointer_Word32Slice(p structPointer, f field) word32Slice {
+	return word32Slice{structPointer_field(p, f)}
+}
+
+// word64 is like word32 but for 64-bit values.
+type word64 struct {
+	v reflect.Value
+}
+
+func word64_Set(p word64, o *Buffer, x uint64) {
+	t := p.v.Type().Elem()
+	switch t {
+	case int64Type:
+		if len(o.int64s) == 0 {
+			o.int64s = make([]int64, uint64PoolSize)
+		}
+		o.int64s[0] = int64(x)
+		p.v.Set(reflect.ValueOf(&o.int64s[0]))
+		o.int64s = o.int64s[1:]
+		return
+	case uint64Type:
+		if len(o.uint64s) == 0 {
+			o.uint64s = make([]uint64, uint64PoolSize)
+		}
+		o.uint64s[0] = x
+		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
+		o.uint64s = o.uint64s[1:]
+		return
+	case float64Type:
+		if len(o.float64s) == 0 {
+			o.float64s = make([]float64, uint64PoolSize)
+		}
+		o.float64s[0] = math.Float64frombits(x)
+		p.v.Set(reflect.ValueOf(&o.float64s[0]))
+		o.float64s = o.float64s[1:]
+		return
+	}
+	panic("unreachable")
+}
+
+func word64_IsNil(p word64) bool {
+	return p.v.IsNil()
+}
+
+func word64_Get(p word64) uint64 {
+	elem := p.v.Elem()
+	switch elem.Kind() {
+	case reflect.Int64:
+		return uint64(elem.Int())
+	case reflect.Uint64:
+		return elem.Uint()
+	case reflect.Float64:
+		return math.Float64bits(elem.Float())
+	}
+	panic("unreachable")
+}
+
+func structPointer_Word64(p structPointer, f field) word64 {
+	return word64{structPointer_field(p, f)}
+}
+
+// word64Val is like word32Val but for 64-bit values.
+type word64Val struct {
+	v reflect.Value
+}
+
+func word64Val_Set(p word64Val, o *Buffer, x uint64) {
+	switch p.v.Type() {
+	case int64Type:
+		p.v.SetInt(int64(x))
+		return
+	case uint64Type:
+		p.v.SetUint(x)
+		return
+	case float64Type:
+		p.v.SetFloat(math.Float64frombits(x))
+		return
+	}
+	panic("unreachable")
+}
+
+func word64Val_Get(p word64Val) uint64 {
+	elem := p.v
+	switch elem.Kind() {
+	case reflect.Int64:
+		return uint64(elem.Int())
+	case reflect.Uint64:
+		return elem.Uint()
+	case reflect.Float64:
+		return math.Float64bits(elem.Float())
+	}
+	panic("unreachable")
+}
+
+func structPointer_Word64Val(p structPointer, f field) word64Val {
+	return word64Val{structPointer_field(p, f)}
+}
+
+type word64Slice struct {
+	v reflect.Value
+}
+
+func (p word64Slice) Append(x uint64) {
+	n, m := p.v.Len(), p.v.Cap()
+	if n < m {
+		p.v.SetLen(n + 1)
+	} else {
+		t := p.v.Type().Elem()
+		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
+	}
+	elem := p.v.Index(n)
+	switch elem.Kind() {
+	case reflect.Int64:
+		elem.SetInt(int64(int64(x)))
+	case reflect.Uint64:
+		elem.SetUint(uint64(x))
+	case reflect.Float64:
+		elem.SetFloat(float64(math.Float64frombits(x)))
+	}
+}
+
+func (p word64Slice) Len() int {
+	return p.v.Len()
+}
+
+func (p word64Slice) Index(i int) uint64 {
+	elem := p.v.Index(i)
+	switch elem.Kind() {
+	case reflect.Int64:
+		return uint64(elem.Int())
+	case reflect.Uint64:
+		return uint64(elem.Uint())
+	case reflect.Float64:
+		return math.Float64bits(float64(elem.Float()))
+	}
+	panic("unreachable")
+}
+
+func structPointer_Word64Slice(p structPointer, f field) word64Slice {
+	return word64Slice{structPointer_field(p, f)}
+}
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
new file mode 100644
index 0000000000..e9be0fe92e
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
@@ -0,0 +1,266 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2012 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// +build !appengine
+
+// This file contains the implementation of the proto field accesses using package unsafe.
+
+package proto
+
+import (
+	"reflect"
+	"unsafe"
+)
+
+// NOTE: These type_Foo functions would more idiomatically be methods,
+// but Go does not allow methods on pointer types, and we must preserve
+// some pointer type for the garbage collector. We use these
+// funcs with clunky names as our poor approximation to methods.
+//
+// An alternative would be
+//	type structPointer struct { p unsafe.Pointer }
+// but that does not registerize as well.
+
+// A structPointer is a pointer to a struct.
+type structPointer unsafe.Pointer
+
+// toStructPointer returns a structPointer equivalent to the given reflect value.
+func toStructPointer(v reflect.Value) structPointer {
+	return structPointer(unsafe.Pointer(v.Pointer()))
+}
+
+// IsNil reports whether p is nil.
+func structPointer_IsNil(p structPointer) bool {
+	return p == nil
+}
+
+// Interface returns the struct pointer, assumed to have element type t,
+// as an interface value.
+func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
+	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
+}
+
+// A field identifies a field in a struct, accessible from a structPointer.
+// In this implementation, a field is identified by its byte offset from the start of the struct.
+type field uintptr
+
+// toField returns a field equivalent to the given reflect field.
+func toField(f *reflect.StructField) field {
+	return field(f.Offset)
+}
+
+// invalidField is an invalid field identifier.
+const invalidField = ^field(0)
+
+// IsValid reports whether the field identifier is valid.
+func (f field) IsValid() bool {
+	return f != ^field(0)
+}
+
+// Bytes returns the address of a []byte field in the struct.
+func structPointer_Bytes(p structPointer, f field) *[]byte {
+	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// BytesSlice returns the address of a [][]byte field in the struct.
+func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
+	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// Bool returns the address of a *bool field in the struct.
+func structPointer_Bool(p structPointer, f field) **bool {
+	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// BoolVal returns the address of a bool field in the struct.
+func structPointer_BoolVal(p structPointer, f field) *bool {
+	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// BoolSlice returns the address of a []bool field in the struct.
+func structPointer_BoolSlice(p structPointer, f field) *[]bool {
+	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// String returns the address of a *string field in the struct.
+func structPointer_String(p structPointer, f field) **string {
+	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// StringVal returns the address of a string field in the struct.
+func structPointer_StringVal(p structPointer, f field) *string {
+	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// StringSlice returns the address of a []string field in the struct.
+func structPointer_StringSlice(p structPointer, f field) *[]string {
+	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// ExtMap returns the address of an extension map field in the struct.
+func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
+	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// NewAt returns the reflect.Value for a pointer to a field in the struct.
+func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
+	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
+}
+
+// SetStructPointer writes a *struct field in the struct.
+func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
+	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
+}
+
+// GetStructPointer reads a *struct field in the struct.
+func structPointer_GetStructPointer(p structPointer, f field) structPointer {
+	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// StructPointerSlice the address of a []*struct field in the struct.
+func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
+	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
+type structPointerSlice []structPointer
+
+func (v *structPointerSlice) Len() int                  { return len(*v) }
+func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
+func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
+
+// A word32 is the address of a "pointer to 32-bit value" field.
+type word32 **uint32
+
+// IsNil reports whether *v is nil.
+func word32_IsNil(p word32) bool {
+	return *p == nil
+}
+
+// Set sets *v to point at a newly allocated word set to x.
+func word32_Set(p word32, o *Buffer, x uint32) {
+	if len(o.uint32s) == 0 {
+		o.uint32s = make([]uint32, uint32PoolSize)
+	}
+	o.uint32s[0] = x
+	*p = &o.uint32s[0]
+	o.uint32s = o.uint32s[1:]
+}
+
+// Get gets the value pointed at by *v.
+func word32_Get(p word32) uint32 {
+	return **p
+}
+
+// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
+func structPointer_Word32(p structPointer, f field) word32 {
+	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// A word32Val is the address of a 32-bit value field.
+type word32Val *uint32
+
+// Set sets *p to x.
+func word32Val_Set(p word32Val, x uint32) {
+	*p = x
+}
+
+// Get gets the value pointed at by p.
+func word32Val_Get(p word32Val) uint32 {
+	return *p
+}
+
+// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
+func structPointer_Word32Val(p structPointer, f field) word32Val {
+	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// A word32Slice is a slice of 32-bit values.
+type word32Slice []uint32
+
+func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
+func (v *word32Slice) Len() int           { return len(*v) }
+func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
+
+// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
+func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
+	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
+// word64 is like word32 but for 64-bit values.
+type word64 **uint64
+
+func word64_Set(p word64, o *Buffer, x uint64) {
+	if len(o.uint64s) == 0 {
+		o.uint64s = make([]uint64, uint64PoolSize)
+	}
+	o.uint64s[0] = x
+	*p = &o.uint64s[0]
+	o.uint64s = o.uint64s[1:]
+}
+
+func word64_IsNil(p word64) bool {
+	return *p == nil
+}
+
+func word64_Get(p word64) uint64 {
+	return **p
+}
+
+func structPointer_Word64(p structPointer, f field) word64 {
+	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// word64Val is like word32Val but for 64-bit values.
+type word64Val *uint64
+
+func word64Val_Set(p word64Val, o *Buffer, x uint64) {
+	*p = x
+}
+
+func word64Val_Get(p word64Val) uint64 {
+	return *p
+}
+
+func structPointer_Word64Val(p structPointer, f field) word64Val {
+	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+}
+
+// word64Slice is like word32Slice but for 64-bit values.
+type word64Slice []uint64
+
+func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
+func (v *word64Slice) Len() int           { return len(*v) }
+func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
+
+func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
+	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go
new file mode 100644
index 0000000000..d4531c0563
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/properties.go
@@ -0,0 +1,842 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+/*
+ * Routines for encoding data into the wire format for protocol buffers.
+ */
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"reflect"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+const debug bool = false
+
+// Constants that identify the encoding of a value on the wire.
+const (
+	WireVarint     = 0
+	WireFixed64    = 1
+	WireBytes      = 2
+	WireStartGroup = 3
+	WireEndGroup   = 4
+	WireFixed32    = 5
+)
+
+const startSize = 10 // initial slice/string sizes
+
+// Encoders are defined in encode.go
+// An encoder outputs the full representation of a field, including its
+// tag and encoder type.
+type encoder func(p *Buffer, prop *Properties, base structPointer) error
+
+// A valueEncoder encodes a single integer in a particular encoding.
+type valueEncoder func(o *Buffer, x uint64) error
+
+// Sizers are defined in encode.go
+// A sizer returns the encoded size of a field, including its tag and encoder
+// type.
+type sizer func(prop *Properties, base structPointer) int
+
+// A valueSizer returns the encoded size of a single integer in a particular
+// encoding.
+type valueSizer func(x uint64) int
+
+// Decoders are defined in decode.go
+// A decoder creates a value from its wire representation.
+// Unrecognized subelements are saved in unrec.
+type decoder func(p *Buffer, prop *Properties, base structPointer) error
+
+// A valueDecoder decodes a single integer in a particular encoding.
+type valueDecoder func(o *Buffer) (x uint64, err error)
+
+// A oneofMarshaler does the marshaling for all oneof fields in a message.
+type oneofMarshaler func(Message, *Buffer) error
+
+// A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
+type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
+
+// A oneofSizer does the sizing for all oneof fields in a message.
+type oneofSizer func(Message) int
+
+// tagMap is an optimization over map[int]int for typical protocol buffer
+// use-cases. Encoded protocol buffers are often in tag order with small tag
+// numbers.
+type tagMap struct {
+	fastTags []int
+	slowTags map[int]int
+}
+
+// tagMapFastLimit is the upper bound on the tag number that will be stored in
+// the tagMap slice rather than its map.
+const tagMapFastLimit = 1024
+
+func (p *tagMap) get(t int) (int, bool) {
+	if t > 0 && t < tagMapFastLimit {
+		if t >= len(p.fastTags) {
+			return 0, false
+		}
+		fi := p.fastTags[t]
+		return fi, fi >= 0
+	}
+	fi, ok := p.slowTags[t]
+	return fi, ok
+}
+
+func (p *tagMap) put(t int, fi int) {
+	if t > 0 && t < tagMapFastLimit {
+		for len(p.fastTags) < t+1 {
+			p.fastTags = append(p.fastTags, -1)
+		}
+		p.fastTags[t] = fi
+		return
+	}
+	if p.slowTags == nil {
+		p.slowTags = make(map[int]int)
+	}
+	p.slowTags[t] = fi
+}
+
+// StructProperties represents properties for all the fields of a struct.
+// decoderTags and decoderOrigNames should only be used by the decoder.
+type StructProperties struct {
+	Prop             []*Properties  // properties for each field
+	reqCount         int            // required count
+	decoderTags      tagMap         // map from proto tag to struct field number
+	decoderOrigNames map[string]int // map from original name to struct field number
+	order            []int          // list of struct field numbers in tag order
+	unrecField       field          // field id of the XXX_unrecognized []byte field
+	extendable       bool           // is this an extendable proto
+
+	oneofMarshaler   oneofMarshaler
+	oneofUnmarshaler oneofUnmarshaler
+	oneofSizer       oneofSizer
+	stype            reflect.Type
+
+	// OneofTypes contains information about the oneof fields in this message.
+	// It is keyed by the original name of a field.
+	OneofTypes map[string]*OneofProperties
+}
+
+// OneofProperties represents information about a specific field in a oneof.
+type OneofProperties struct {
+	Type  reflect.Type // pointer to generated struct type for this oneof field
+	Field int          // struct field number of the containing oneof in the message
+	Prop  *Properties
+}
+
+// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
+// See encode.go, (*Buffer).enc_struct.
+
+func (sp *StructProperties) Len() int { return len(sp.order) }
+func (sp *StructProperties) Less(i, j int) bool {
+	return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
+}
+func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
+
+// Properties represents the protocol-specific behavior of a single struct field.
+type Properties struct {
+	Name     string // name of the field, for error messages
+	OrigName string // original name before protocol compiler (always set)
+	Wire     string
+	WireType int
+	Tag      int
+	Required bool
+	Optional bool
+	Repeated bool
+	Packed   bool   // relevant for repeated primitives only
+	Enum     string // set for enum types only
+	proto3   bool   // whether this is known to be a proto3 field; set for []byte only
+	oneof    bool   // whether this is a oneof field
+
+	Default    string // default value
+	HasDefault bool   // whether an explicit default was provided
+	def_uint64 uint64
+
+	enc           encoder
+	valEnc        valueEncoder // set for bool and numeric types only
+	field         field
+	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
+	tagbuf        [8]byte
+	stype         reflect.Type      // set for struct types only
+	sprop         *StructProperties // set for struct types only
+	isMarshaler   bool
+	isUnmarshaler bool
+
+	mtype    reflect.Type // set for map types only
+	mkeyprop *Properties  // set for map types only
+	mvalprop *Properties  // set for map types only
+
+	size    sizer
+	valSize valueSizer // set for bool and numeric types only
+
+	dec    decoder
+	valDec valueDecoder // set for bool and numeric types only
+
+	// If this is a packable field, this will be the decoder for the packed version of the field.
+	packedDec decoder
+}
+
+// String formats the properties in the protobuf struct field tag style.
+func (p *Properties) String() string {
+	s := p.Wire
+	s = ","
+	s += strconv.Itoa(p.Tag)
+	if p.Required {
+		s += ",req"
+	}
+	if p.Optional {
+		s += ",opt"
+	}
+	if p.Repeated {
+		s += ",rep"
+	}
+	if p.Packed {
+		s += ",packed"
+	}
+	if p.OrigName != p.Name {
+		s += ",name=" + p.OrigName
+	}
+	if p.proto3 {
+		s += ",proto3"
+	}
+	if p.oneof {
+		s += ",oneof"
+	}
+	if len(p.Enum) > 0 {
+		s += ",enum=" + p.Enum
+	}
+	if p.HasDefault {
+		s += ",def=" + p.Default
+	}
+	return s
+}
+
+// Parse populates p by parsing a string in the protobuf struct field tag style.
+func (p *Properties) Parse(s string) {
+	// "bytes,49,opt,name=foo,def=hello!"
+	fields := strings.Split(s, ",") // breaks def=, but handled below.
+	if len(fields) < 2 {
+		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
+		return
+	}
+
+	p.Wire = fields[0]
+	switch p.Wire {
+	case "varint":
+		p.WireType = WireVarint
+		p.valEnc = (*Buffer).EncodeVarint
+		p.valDec = (*Buffer).DecodeVarint
+		p.valSize = sizeVarint
+	case "fixed32":
+		p.WireType = WireFixed32
+		p.valEnc = (*Buffer).EncodeFixed32
+		p.valDec = (*Buffer).DecodeFixed32
+		p.valSize = sizeFixed32
+	case "fixed64":
+		p.WireType = WireFixed64
+		p.valEnc = (*Buffer).EncodeFixed64
+		p.valDec = (*Buffer).DecodeFixed64
+		p.valSize = sizeFixed64
+	case "zigzag32":
+		p.WireType = WireVarint
+		p.valEnc = (*Buffer).EncodeZigzag32
+		p.valDec = (*Buffer).DecodeZigzag32
+		p.valSize = sizeZigzag32
+	case "zigzag64":
+		p.WireType = WireVarint
+		p.valEnc = (*Buffer).EncodeZigzag64
+		p.valDec = (*Buffer).DecodeZigzag64
+		p.valSize = sizeZigzag64
+	case "bytes", "group":
+		p.WireType = WireBytes
+		// no numeric converter for non-numeric types
+	default:
+		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
+		return
+	}
+
+	var err error
+	p.Tag, err = strconv.Atoi(fields[1])
+	if err != nil {
+		return
+	}
+
+	for i := 2; i < len(fields); i++ {
+		f := fields[i]
+		switch {
+		case f == "req":
+			p.Required = true
+		case f == "opt":
+			p.Optional = true
+		case f == "rep":
+			p.Repeated = true
+		case f == "packed":
+			p.Packed = true
+		case strings.HasPrefix(f, "name="):
+			p.OrigName = f[5:]
+		case strings.HasPrefix(f, "enum="):
+			p.Enum = f[5:]
+		case f == "proto3":
+			p.proto3 = true
+		case f == "oneof":
+			p.oneof = true
+		case strings.HasPrefix(f, "def="):
+			p.HasDefault = true
+			p.Default = f[4:] // rest of string
+			if i+1 < len(fields) {
+				// Commas aren't escaped, and def is always last.
+				p.Default += "," + strings.Join(fields[i+1:], ",")
+				break
+			}
+		}
+	}
+}
+
+func logNoSliceEnc(t1, t2 reflect.Type) {
+	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
+}
+
+var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
+
+// Initialize the fields for encoding and decoding.
+func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
+	p.enc = nil
+	p.dec = nil
+	p.size = nil
+
+	switch t1 := typ; t1.Kind() {
+	default:
+		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
+
+	// proto3 scalar types
+
+	case reflect.Bool:
+		p.enc = (*Buffer).enc_proto3_bool
+		p.dec = (*Buffer).dec_proto3_bool
+		p.size = size_proto3_bool
+	case reflect.Int32:
+		p.enc = (*Buffer).enc_proto3_int32
+		p.dec = (*Buffer).dec_proto3_int32
+		p.size = size_proto3_int32
+	case reflect.Uint32:
+		p.enc = (*Buffer).enc_proto3_uint32
+		p.dec = (*Buffer).dec_proto3_int32 // can reuse
+		p.size = size_proto3_uint32
+	case reflect.Int64, reflect.Uint64:
+		p.enc = (*Buffer).enc_proto3_int64
+		p.dec = (*Buffer).dec_proto3_int64
+		p.size = size_proto3_int64
+	case reflect.Float32:
+		p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
+		p.dec = (*Buffer).dec_proto3_int32
+		p.size = size_proto3_uint32
+	case reflect.Float64:
+		p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
+		p.dec = (*Buffer).dec_proto3_int64
+		p.size = size_proto3_int64
+	case reflect.String:
+		p.enc = (*Buffer).enc_proto3_string
+		p.dec = (*Buffer).dec_proto3_string
+		p.size = size_proto3_string
+
+	case reflect.Ptr:
+		switch t2 := t1.Elem(); t2.Kind() {
+		default:
+			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
+			break
+		case reflect.Bool:
+			p.enc = (*Buffer).enc_bool
+			p.dec = (*Buffer).dec_bool
+			p.size = size_bool
+		case reflect.Int32:
+			p.enc = (*Buffer).enc_int32
+			p.dec = (*Buffer).dec_int32
+			p.size = size_int32
+		case reflect.Uint32:
+			p.enc = (*Buffer).enc_uint32
+			p.dec = (*Buffer).dec_int32 // can reuse
+			p.size = size_uint32
+		case reflect.Int64, reflect.Uint64:
+			p.enc = (*Buffer).enc_int64
+			p.dec = (*Buffer).dec_int64
+			p.size = size_int64
+		case reflect.Float32:
+			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
+			p.dec = (*Buffer).dec_int32
+			p.size = size_uint32
+		case reflect.Float64:
+			p.enc = (*Buffer).enc_int64 // can just treat them as bits
+			p.dec = (*Buffer).dec_int64
+			p.size = size_int64
+		case reflect.String:
+			p.enc = (*Buffer).enc_string
+			p.dec = (*Buffer).dec_string
+			p.size = size_string
+		case reflect.Struct:
+			p.stype = t1.Elem()
+			p.isMarshaler = isMarshaler(t1)
+			p.isUnmarshaler = isUnmarshaler(t1)
+			if p.Wire == "bytes" {
+				p.enc = (*Buffer).enc_struct_message
+				p.dec = (*Buffer).dec_struct_message
+				p.size = size_struct_message
+			} else {
+				p.enc = (*Buffer).enc_struct_group
+				p.dec = (*Buffer).dec_struct_group
+				p.size = size_struct_group
+			}
+		}
+
+	case reflect.Slice:
+		switch t2 := t1.Elem(); t2.Kind() {
+		default:
+			logNoSliceEnc(t1, t2)
+			break
+		case reflect.Bool:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_bool
+				p.size = size_slice_packed_bool
+			} else {
+				p.enc = (*Buffer).enc_slice_bool
+				p.size = size_slice_bool
+			}
+			p.dec = (*Buffer).dec_slice_bool
+			p.packedDec = (*Buffer).dec_slice_packed_bool
+		case reflect.Int32:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_int32
+				p.size = size_slice_packed_int32
+			} else {
+				p.enc = (*Buffer).enc_slice_int32
+				p.size = size_slice_int32
+			}
+			p.dec = (*Buffer).dec_slice_int32
+			p.packedDec = (*Buffer).dec_slice_packed_int32
+		case reflect.Uint32:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_uint32
+				p.size = size_slice_packed_uint32
+			} else {
+				p.enc = (*Buffer).enc_slice_uint32
+				p.size = size_slice_uint32
+			}
+			p.dec = (*Buffer).dec_slice_int32
+			p.packedDec = (*Buffer).dec_slice_packed_int32
+		case reflect.Int64, reflect.Uint64:
+			if p.Packed {
+				p.enc = (*Buffer).enc_slice_packed_int64
+				p.size = size_slice_packed_int64
+			} else {
+				p.enc = (*Buffer).enc_slice_int64
+				p.size = size_slice_int64
+			}
+			p.dec = (*Buffer).dec_slice_int64
+			p.packedDec = (*Buffer).dec_slice_packed_int64
+		case reflect.Uint8:
+			p.enc = (*Buffer).enc_slice_byte
+			p.dec = (*Buffer).dec_slice_byte
+			p.size = size_slice_byte
+			// This is a []byte, which is either a bytes field,
+			// or the value of a map field. In the latter case,
+			// we always encode an empty []byte, so we should not
+			// use the proto3 enc/size funcs.
+			// f == nil iff this is the key/value of a map field.
+			if p.proto3 && f != nil {
+				p.enc = (*Buffer).enc_proto3_slice_byte
+				p.size = size_proto3_slice_byte
+			}
+		case reflect.Float32, reflect.Float64:
+			switch t2.Bits() {
+			case 32:
+				// can just treat them as bits
+				if p.Packed {
+					p.enc = (*Buffer).enc_slice_packed_uint32
+					p.size = size_slice_packed_uint32
+				} else {
+					p.enc = (*Buffer).enc_slice_uint32
+					p.size = size_slice_uint32
+				}
+				p.dec = (*Buffer).dec_slice_int32
+				p.packedDec = (*Buffer).dec_slice_packed_int32
+			case 64:
+				// can just treat them as bits
+				if p.Packed {
+					p.enc = (*Buffer).enc_slice_packed_int64
+					p.size = size_slice_packed_int64
+				} else {
+					p.enc = (*Buffer).enc_slice_int64
+					p.size = size_slice_int64
+				}
+				p.dec = (*Buffer).dec_slice_int64
+				p.packedDec = (*Buffer).dec_slice_packed_int64
+			default:
+				logNoSliceEnc(t1, t2)
+				break
+			}
+		case reflect.String:
+			p.enc = (*Buffer).enc_slice_string
+			p.dec = (*Buffer).dec_slice_string
+			p.size = size_slice_string
+		case reflect.Ptr:
+			switch t3 := t2.Elem(); t3.Kind() {
+			default:
+				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
+				break
+			case reflect.Struct:
+				p.stype = t2.Elem()
+				p.isMarshaler = isMarshaler(t2)
+				p.isUnmarshaler = isUnmarshaler(t2)
+				if p.Wire == "bytes" {
+					p.enc = (*Buffer).enc_slice_struct_message
+					p.dec = (*Buffer).dec_slice_struct_message
+					p.size = size_slice_struct_message
+				} else {
+					p.enc = (*Buffer).enc_slice_struct_group
+					p.dec = (*Buffer).dec_slice_struct_group
+					p.size = size_slice_struct_group
+				}
+			}
+		case reflect.Slice:
+			switch t2.Elem().Kind() {
+			default:
+				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
+				break
+			case reflect.Uint8:
+				p.enc = (*Buffer).enc_slice_slice_byte
+				p.dec = (*Buffer).dec_slice_slice_byte
+				p.size = size_slice_slice_byte
+			}
+		}
+
+	case reflect.Map:
+		p.enc = (*Buffer).enc_new_map
+		p.dec = (*Buffer).dec_new_map
+		p.size = size_new_map
+
+		p.mtype = t1
+		p.mkeyprop = &Properties{}
+		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
+		p.mvalprop = &Properties{}
+		vtype := p.mtype.Elem()
+		if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
+			// The value type is not a message (*T) or bytes ([]byte),
+			// so we need encoders for the pointer to this type.
+			vtype = reflect.PtrTo(vtype)
+		}
+		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
+	}
+
+	// precalculate tag code
+	wire := p.WireType
+	if p.Packed {
+		wire = WireBytes
+	}
+	x := uint32(p.Tag)<<3 | uint32(wire)
+	i := 0
+	for i = 0; x > 127; i++ {
+		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
+		x >>= 7
+	}
+	p.tagbuf[i] = uint8(x)
+	p.tagcode = p.tagbuf[0 : i+1]
+
+	if p.stype != nil {
+		if lockGetProp {
+			p.sprop = GetProperties(p.stype)
+		} else {
+			p.sprop = getPropertiesLocked(p.stype)
+		}
+	}
+}
+
+var (
+	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
+	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
+)
+
+// isMarshaler reports whether type t implements Marshaler.
+func isMarshaler(t reflect.Type) bool {
+	// We're checking for (likely) pointer-receiver methods
+	// so if t is not a pointer, something is very wrong.
+	// The calls above only invoke isMarshaler on pointer types.
+	if t.Kind() != reflect.Ptr {
+		panic("proto: misuse of isMarshaler")
+	}
+	return t.Implements(marshalerType)
+}
+
+// isUnmarshaler reports whether type t implements Unmarshaler.
+func isUnmarshaler(t reflect.Type) bool {
+	// We're checking for (likely) pointer-receiver methods
+	// so if t is not a pointer, something is very wrong.
+	// The calls above only invoke isUnmarshaler on pointer types.
+	if t.Kind() != reflect.Ptr {
+		panic("proto: misuse of isUnmarshaler")
+	}
+	return t.Implements(unmarshalerType)
+}
+
+// Init populates the properties from a protocol buffer struct tag.
+func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
+	p.init(typ, name, tag, f, true)
+}
+
+func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
+	// "bytes,49,opt,def=hello!"
+	p.Name = name
+	p.OrigName = name
+	if f != nil {
+		p.field = toField(f)
+	}
+	if tag == "" {
+		return
+	}
+	p.Parse(tag)
+	p.setEncAndDec(typ, f, lockGetProp)
+}
+
+var (
+	propertiesMu  sync.RWMutex
+	propertiesMap = make(map[reflect.Type]*StructProperties)
+)
+
+// GetProperties returns the list of properties for the type represented by t.
+// t must represent a generated struct type of a protocol message.
+func GetProperties(t reflect.Type) *StructProperties {
+	if t.Kind() != reflect.Struct {
+		panic("proto: type must have kind struct")
+	}
+
+	// Most calls to GetProperties in a long-running program will be
+	// retrieving details for types we have seen before.
+	propertiesMu.RLock()
+	sprop, ok := propertiesMap[t]
+	propertiesMu.RUnlock()
+	if ok {
+		if collectStats {
+			stats.Chit++
+		}
+		return sprop
+	}
+
+	propertiesMu.Lock()
+	sprop = getPropertiesLocked(t)
+	propertiesMu.Unlock()
+	return sprop
+}
+
+// getPropertiesLocked requires that propertiesMu is held.
+func getPropertiesLocked(t reflect.Type) *StructProperties {
+	if prop, ok := propertiesMap[t]; ok {
+		if collectStats {
+			stats.Chit++
+		}
+		return prop
+	}
+	if collectStats {
+		stats.Cmiss++
+	}
+
+	prop := new(StructProperties)
+	// in case of recursive protos, fill this in now.
+	propertiesMap[t] = prop
+
+	// build properties
+	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType)
+	prop.unrecField = invalidField
+	prop.Prop = make([]*Properties, t.NumField())
+	prop.order = make([]int, t.NumField())
+
+	for i := 0; i < t.NumField(); i++ {
+		f := t.Field(i)
+		p := new(Properties)
+		name := f.Name
+		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
+
+		if f.Name == "XXX_extensions" { // special case
+			p.enc = (*Buffer).enc_map
+			p.dec = nil // not needed
+			p.size = size_map
+		}
+		if f.Name == "XXX_unrecognized" { // special case
+			prop.unrecField = toField(&f)
+		}
+		oneof := f.Tag.Get("protobuf_oneof") != "" // special case
+		prop.Prop[i] = p
+		prop.order[i] = i
+		if debug {
+			print(i, " ", f.Name, " ", t.String(), " ")
+			if p.Tag > 0 {
+				print(p.String())
+			}
+			print("\n")
+		}
+		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && !oneof {
+			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
+		}
+	}
+
+	// Re-order prop.order.
+	sort.Sort(prop)
+
+	type oneofMessage interface {
+		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
+	}
+	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
+		var oots []interface{}
+		prop.oneofMarshaler, prop.oneofUnmarshaler, prop.oneofSizer, oots = om.XXX_OneofFuncs()
+		prop.stype = t
+
+		// Interpret oneof metadata.
+		prop.OneofTypes = make(map[string]*OneofProperties)
+		for _, oot := range oots {
+			oop := &OneofProperties{
+				Type: reflect.ValueOf(oot).Type(), // *T
+				Prop: new(Properties),
+			}
+			sft := oop.Type.Elem().Field(0)
+			oop.Prop.Name = sft.Name
+			oop.Prop.Parse(sft.Tag.Get("protobuf"))
+			// There will be exactly one interface field that
+			// this new value is assignable to.
+			for i := 0; i < t.NumField(); i++ {
+				f := t.Field(i)
+				if f.Type.Kind() != reflect.Interface {
+					continue
+				}
+				if !oop.Type.AssignableTo(f.Type) {
+					continue
+				}
+				oop.Field = i
+				break
+			}
+			prop.OneofTypes[oop.Prop.OrigName] = oop
+		}
+	}
+
+	// build required counts
+	// build tags
+	reqCount := 0
+	prop.decoderOrigNames = make(map[string]int)
+	for i, p := range prop.Prop {
+		if strings.HasPrefix(p.Name, "XXX_") {
+			// Internal fields should not appear in tags/origNames maps.
+			// They are handled specially when encoding and decoding.
+			continue
+		}
+		if p.Required {
+			reqCount++
+		}
+		prop.decoderTags.put(p.Tag, i)
+		prop.decoderOrigNames[p.OrigName] = i
+	}
+	prop.reqCount = reqCount
+
+	return prop
+}
+
+// Return the Properties object for the x[0]'th field of the structure.
+func propByIndex(t reflect.Type, x []int) *Properties {
+	if len(x) != 1 {
+		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
+		return nil
+	}
+	prop := GetProperties(t)
+	return prop.Prop[x[0]]
+}
+
+// Get the address and type of a pointer to a struct from an interface.
+func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
+	if pb == nil {
+		err = ErrNil
+		return
+	}
+	// get the reflect type of the pointer to the struct.
+	t = reflect.TypeOf(pb)
+	// get the address of the struct.
+	value := reflect.ValueOf(pb)
+	b = toStructPointer(value)
+	return
+}
+
+// A global registry of enum types.
+// The generated code will register the generated maps by calling RegisterEnum.
+
+var enumValueMaps = make(map[string]map[string]int32)
+
+// RegisterEnum is called from the generated code to install the enum descriptor
+// maps into the global table to aid parsing text format protocol buffers.
+func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
+	if _, ok := enumValueMaps[typeName]; ok {
+		panic("proto: duplicate enum registered: " + typeName)
+	}
+	enumValueMaps[typeName] = valueMap
+}
+
+// EnumValueMap returns the mapping from names to integers of the
+// enum type enumType, or a nil if not found.
+func EnumValueMap(enumType string) map[string]int32 {
+	return enumValueMaps[enumType]
+}
+
+// A registry of all linked message types.
+// The string is a fully-qualified proto name ("pkg.Message").
+var (
+	protoTypes    = make(map[string]reflect.Type)
+	revProtoTypes = make(map[reflect.Type]string)
+)
+
+// RegisterType is called from generated code and maps from the fully qualified
+// proto name to the type (pointer to struct) of the protocol buffer.
+func RegisterType(x Message, name string) {
+	if _, ok := protoTypes[name]; ok {
+		// TODO: Some day, make this a panic.
+		log.Printf("proto: duplicate proto type registered: %s", name)
+		return
+	}
+	t := reflect.TypeOf(x)
+	protoTypes[name] = t
+	revProtoTypes[t] = name
+}
+
+// MessageName returns the fully-qualified proto name for the given message type.
+func MessageName(x Message) string { return revProtoTypes[reflect.TypeOf(x)] }
+
+// MessageType returns the message type (pointer to struct) for a named message.
+func MessageType(name string) reflect.Type { return protoTypes[name] }
diff --git a/vendor/github.com/golang/protobuf/proto/text.go b/vendor/github.com/golang/protobuf/proto/text.go
new file mode 100644
index 0000000000..2336b144c1
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/text.go
@@ -0,0 +1,751 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+// Functions for writing the text protocol buffer format.
+
+import (
+	"bufio"
+	"bytes"
+	"encoding"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"math"
+	"reflect"
+	"sort"
+	"strings"
+)
+
+var (
+	newline         = []byte("\n")
+	spaces          = []byte("                                        ")
+	gtNewline       = []byte(">\n")
+	endBraceNewline = []byte("}\n")
+	backslashN      = []byte{'\\', 'n'}
+	backslashR      = []byte{'\\', 'r'}
+	backslashT      = []byte{'\\', 't'}
+	backslashDQ     = []byte{'\\', '"'}
+	backslashBS     = []byte{'\\', '\\'}
+	posInf          = []byte("inf")
+	negInf          = []byte("-inf")
+	nan             = []byte("nan")
+)
+
+type writer interface {
+	io.Writer
+	WriteByte(byte) error
+}
+
+// textWriter is an io.Writer that tracks its indentation level.
+type textWriter struct {
+	ind      int
+	complete bool // if the current position is a complete line
+	compact  bool // whether to write out as a one-liner
+	w        writer
+}
+
+func (w *textWriter) WriteString(s string) (n int, err error) {
+	if !strings.Contains(s, "\n") {
+		if !w.compact && w.complete {
+			w.writeIndent()
+		}
+		w.complete = false
+		return io.WriteString(w.w, s)
+	}
+	// WriteString is typically called without newlines, so this
+	// codepath and its copy are rare.  We copy to avoid
+	// duplicating all of Write's logic here.
+	return w.Write([]byte(s))
+}
+
+func (w *textWriter) Write(p []byte) (n int, err error) {
+	newlines := bytes.Count(p, newline)
+	if newlines == 0 {
+		if !w.compact && w.complete {
+			w.writeIndent()
+		}
+		n, err = w.w.Write(p)
+		w.complete = false
+		return n, err
+	}
+
+	frags := bytes.SplitN(p, newline, newlines+1)
+	if w.compact {
+		for i, frag := range frags {
+			if i > 0 {
+				if err := w.w.WriteByte(' '); err != nil {
+					return n, err
+				}
+				n++
+			}
+			nn, err := w.w.Write(frag)
+			n += nn
+			if err != nil {
+				return n, err
+			}
+		}
+		return n, nil
+	}
+
+	for i, frag := range frags {
+		if w.complete {
+			w.writeIndent()
+		}
+		nn, err := w.w.Write(frag)
+		n += nn
+		if err != nil {
+			return n, err
+		}
+		if i+1 < len(frags) {
+			if err := w.w.WriteByte('\n'); err != nil {
+				return n, err
+			}
+			n++
+		}
+	}
+	w.complete = len(frags[len(frags)-1]) == 0
+	return n, nil
+}
+
+func (w *textWriter) WriteByte(c byte) error {
+	if w.compact && c == '\n' {
+		c = ' '
+	}
+	if !w.compact && w.complete {
+		w.writeIndent()
+	}
+	err := w.w.WriteByte(c)
+	w.complete = c == '\n'
+	return err
+}
+
+func (w *textWriter) indent() { w.ind++ }
+
+func (w *textWriter) unindent() {
+	if w.ind == 0 {
+		log.Printf("proto: textWriter unindented too far")
+		return
+	}
+	w.ind--
+}
+
+func writeName(w *textWriter, props *Properties) error {
+	if _, err := w.WriteString(props.OrigName); err != nil {
+		return err
+	}
+	if props.Wire != "group" {
+		return w.WriteByte(':')
+	}
+	return nil
+}
+
+// raw is the interface satisfied by RawMessage.
+type raw interface {
+	Bytes() []byte
+}
+
+func writeStruct(w *textWriter, sv reflect.Value) error {
+	st := sv.Type()
+	sprops := GetProperties(st)
+	for i := 0; i < sv.NumField(); i++ {
+		fv := sv.Field(i)
+		props := sprops.Prop[i]
+		name := st.Field(i).Name
+
+		if strings.HasPrefix(name, "XXX_") {
+			// There are two XXX_ fields:
+			//   XXX_unrecognized []byte
+			//   XXX_extensions   map[int32]proto.Extension
+			// The first is handled here;
+			// the second is handled at the bottom of this function.
+			if name == "XXX_unrecognized" && !fv.IsNil() {
+				if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		if fv.Kind() == reflect.Ptr && fv.IsNil() {
+			// Field not filled in. This could be an optional field or
+			// a required field that wasn't filled in. Either way, there
+			// isn't anything we can show for it.
+			continue
+		}
+		if fv.Kind() == reflect.Slice && fv.IsNil() {
+			// Repeated field that is empty, or a bytes field that is unused.
+			continue
+		}
+
+		if props.Repeated && fv.Kind() == reflect.Slice {
+			// Repeated field.
+			for j := 0; j < fv.Len(); j++ {
+				if err := writeName(w, props); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+				}
+				v := fv.Index(j)
+				if v.Kind() == reflect.Ptr && v.IsNil() {
+					// A nil message in a repeated field is not valid,
+					// but we can handle that more gracefully than panicking.
+					if _, err := w.Write([]byte("<nil>\n")); err != nil {
+						return err
+					}
+					continue
+				}
+				if err := writeAny(w, v, props); err != nil {
+					return err
+				}
+				if err := w.WriteByte('\n'); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		if fv.Kind() == reflect.Map {
+			// Map fields are rendered as a repeated struct with key/value fields.
+			keys := fv.MapKeys()
+			sort.Sort(mapKeys(keys))
+			for _, key := range keys {
+				val := fv.MapIndex(key)
+				if err := writeName(w, props); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+				}
+				// open struct
+				if err := w.WriteByte('<'); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte('\n'); err != nil {
+						return err
+					}
+				}
+				w.indent()
+				// key
+				if _, err := w.WriteString("key:"); err != nil {
+					return err
+				}
+				if !w.compact {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+				}
+				if err := writeAny(w, key, props.mkeyprop); err != nil {
+					return err
+				}
+				if err := w.WriteByte('\n'); err != nil {
+					return err
+				}
+				// nil values aren't legal, but we can avoid panicking because of them.
+				if val.Kind() != reflect.Ptr || !val.IsNil() {
+					// value
+					if _, err := w.WriteString("value:"); err != nil {
+						return err
+					}
+					if !w.compact {
+						if err := w.WriteByte(' '); err != nil {
+							return err
+						}
+					}
+					if err := writeAny(w, val, props.mvalprop); err != nil {
+						return err
+					}
+					if err := w.WriteByte('\n'); err != nil {
+						return err
+					}
+				}
+				// close struct
+				w.unindent()
+				if err := w.WriteByte('>'); err != nil {
+					return err
+				}
+				if err := w.WriteByte('\n'); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
+			// empty bytes field
+			continue
+		}
+		if fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
+			// proto3 non-repeated scalar field; skip if zero value
+			if isProto3Zero(fv) {
+				continue
+			}
+		}
+
+		if fv.Kind() == reflect.Interface {
+			// Check if it is a oneof.
+			if st.Field(i).Tag.Get("protobuf_oneof") != "" {
+				// fv is nil, or holds a pointer to generated struct.
+				// That generated struct has exactly one field,
+				// which has a protobuf struct tag.
+				if fv.IsNil() {
+					continue
+				}
+				inner := fv.Elem().Elem() // interface -> *T -> T
+				tag := inner.Type().Field(0).Tag.Get("protobuf")
+				props = new(Properties) // Overwrite the outer props var, but not its pointee.
+				props.Parse(tag)
+				// Write the value in the oneof, not the oneof itself.
+				fv = inner.Field(0)
+
+				// Special case to cope with malformed messages gracefully:
+				// If the value in the oneof is a nil pointer, don't panic
+				// in writeAny.
+				if fv.Kind() == reflect.Ptr && fv.IsNil() {
+					// Use errors.New so writeAny won't render quotes.
+					msg := errors.New("/* nil */")
+					fv = reflect.ValueOf(&msg).Elem()
+				}
+			}
+		}
+
+		if err := writeName(w, props); err != nil {
+			return err
+		}
+		if !w.compact {
+			if err := w.WriteByte(' '); err != nil {
+				return err
+			}
+		}
+		if b, ok := fv.Interface().(raw); ok {
+			if err := writeRaw(w, b.Bytes()); err != nil {
+				return err
+			}
+			continue
+		}
+
+		// Enums have a String method, so writeAny will work fine.
+		if err := writeAny(w, fv, props); err != nil {
+			return err
+		}
+
+		if err := w.WriteByte('\n'); err != nil {
+			return err
+		}
+	}
+
+	// Extensions (the XXX_extensions field).
+	pv := sv.Addr()
+	if pv.Type().Implements(extendableProtoType) {
+		if err := writeExtensions(w, pv); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// writeRaw writes an uninterpreted raw message.
+func writeRaw(w *textWriter, b []byte) error {
+	if err := w.WriteByte('<'); err != nil {
+		return err
+	}
+	if !w.compact {
+		if err := w.WriteByte('\n'); err != nil {
+			return err
+		}
+	}
+	w.indent()
+	if err := writeUnknownStruct(w, b); err != nil {
+		return err
+	}
+	w.unindent()
+	if err := w.WriteByte('>'); err != nil {
+		return err
+	}
+	return nil
+}
+
+// writeAny writes an arbitrary field.
+func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
+	v = reflect.Indirect(v)
+
+	// Floats have special cases.
+	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
+		x := v.Float()
+		var b []byte
+		switch {
+		case math.IsInf(x, 1):
+			b = posInf
+		case math.IsInf(x, -1):
+			b = negInf
+		case math.IsNaN(x):
+			b = nan
+		}
+		if b != nil {
+			_, err := w.Write(b)
+			return err
+		}
+		// Other values are handled below.
+	}
+
+	// We don't attempt to serialise every possible value type; only those
+	// that can occur in protocol buffers.
+	switch v.Kind() {
+	case reflect.Slice:
+		// Should only be a []byte; repeated fields are handled in writeStruct.
+		if err := writeString(w, string(v.Interface().([]byte))); err != nil {
+			return err
+		}
+	case reflect.String:
+		if err := writeString(w, v.String()); err != nil {
+			return err
+		}
+	case reflect.Struct:
+		// Required/optional group/message.
+		var bra, ket byte = '<', '>'
+		if props != nil && props.Wire == "group" {
+			bra, ket = '{', '}'
+		}
+		if err := w.WriteByte(bra); err != nil {
+			return err
+		}
+		if !w.compact {
+			if err := w.WriteByte('\n'); err != nil {
+				return err
+			}
+		}
+		w.indent()
+		if tm, ok := v.Interface().(encoding.TextMarshaler); ok {
+			text, err := tm.MarshalText()
+			if err != nil {
+				return err
+			}
+			if _, err = w.Write(text); err != nil {
+				return err
+			}
+		} else if err := writeStruct(w, v); err != nil {
+			return err
+		}
+		w.unindent()
+		if err := w.WriteByte(ket); err != nil {
+			return err
+		}
+	default:
+		_, err := fmt.Fprint(w, v.Interface())
+		return err
+	}
+	return nil
+}
+
+// equivalent to C's isprint.
+func isprint(c byte) bool {
+	return c >= 0x20 && c < 0x7f
+}
+
+// writeString writes a string in the protocol buffer text format.
+// It is similar to strconv.Quote except we don't use Go escape sequences,
+// we treat the string as a byte sequence, and we use octal escapes.
+// These differences are to maintain interoperability with the other
+// languages' implementations of the text format.
+func writeString(w *textWriter, s string) error {
+	// use WriteByte here to get any needed indent
+	if err := w.WriteByte('"'); err != nil {
+		return err
+	}
+	// Loop over the bytes, not the runes.
+	for i := 0; i < len(s); i++ {
+		var err error
+		// Divergence from C++: we don't escape apostrophes.
+		// There's no need to escape them, and the C++ parser
+		// copes with a naked apostrophe.
+		switch c := s[i]; c {
+		case '\n':
+			_, err = w.w.Write(backslashN)
+		case '\r':
+			_, err = w.w.Write(backslashR)
+		case '\t':
+			_, err = w.w.Write(backslashT)
+		case '"':
+			_, err = w.w.Write(backslashDQ)
+		case '\\':
+			_, err = w.w.Write(backslashBS)
+		default:
+			if isprint(c) {
+				err = w.w.WriteByte(c)
+			} else {
+				_, err = fmt.Fprintf(w.w, "\\%03o", c)
+			}
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return w.WriteByte('"')
+}
+
+func writeUnknownStruct(w *textWriter, data []byte) (err error) {
+	if !w.compact {
+		if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
+			return err
+		}
+	}
+	b := NewBuffer(data)
+	for b.index < len(b.buf) {
+		x, err := b.DecodeVarint()
+		if err != nil {
+			_, err := fmt.Fprintf(w, "/* %v */\n", err)
+			return err
+		}
+		wire, tag := x&7, x>>3
+		if wire == WireEndGroup {
+			w.unindent()
+			if _, err := w.Write(endBraceNewline); err != nil {
+				return err
+			}
+			continue
+		}
+		if _, err := fmt.Fprint(w, tag); err != nil {
+			return err
+		}
+		if wire != WireStartGroup {
+			if err := w.WriteByte(':'); err != nil {
+				return err
+			}
+		}
+		if !w.compact || wire == WireStartGroup {
+			if err := w.WriteByte(' '); err != nil {
+				return err
+			}
+		}
+		switch wire {
+		case WireBytes:
+			buf, e := b.DecodeRawBytes(false)
+			if e == nil {
+				_, err = fmt.Fprintf(w, "%q", buf)
+			} else {
+				_, err = fmt.Fprintf(w, "/* %v */", e)
+			}
+		case WireFixed32:
+			x, err = b.DecodeFixed32()
+			err = writeUnknownInt(w, x, err)
+		case WireFixed64:
+			x, err = b.DecodeFixed64()
+			err = writeUnknownInt(w, x, err)
+		case WireStartGroup:
+			err = w.WriteByte('{')
+			w.indent()
+		case WireVarint:
+			x, err = b.DecodeVarint()
+			err = writeUnknownInt(w, x, err)
+		default:
+			_, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
+		}
+		if err != nil {
+			return err
+		}
+		if err = w.WriteByte('\n'); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func writeUnknownInt(w *textWriter, x uint64, err error) error {
+	if err == nil {
+		_, err = fmt.Fprint(w, x)
+	} else {
+		_, err = fmt.Fprintf(w, "/* %v */", err)
+	}
+	return err
+}
+
+type int32Slice []int32
+
+func (s int32Slice) Len() int           { return len(s) }
+func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
+func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// writeExtensions writes all the extensions in pv.
+// pv is assumed to be a pointer to a protocol message struct that is extendable.
+func writeExtensions(w *textWriter, pv reflect.Value) error {
+	emap := extensionMaps[pv.Type().Elem()]
+	ep := pv.Interface().(extendableProto)
+
+	// Order the extensions by ID.
+	// This isn't strictly necessary, but it will give us
+	// canonical output, which will also make testing easier.
+	m := ep.ExtensionMap()
+	ids := make([]int32, 0, len(m))
+	for id := range m {
+		ids = append(ids, id)
+	}
+	sort.Sort(int32Slice(ids))
+
+	for _, extNum := range ids {
+		ext := m[extNum]
+		var desc *ExtensionDesc
+		if emap != nil {
+			desc = emap[extNum]
+		}
+		if desc == nil {
+			// Unknown extension.
+			if err := writeUnknownStruct(w, ext.enc); err != nil {
+				return err
+			}
+			continue
+		}
+
+		pb, err := GetExtension(ep, desc)
+		if err != nil {
+			return fmt.Errorf("failed getting extension: %v", err)
+		}
+
+		// Repeated extensions will appear as a slice.
+		if !desc.repeated() {
+			if err := writeExtension(w, desc.Name, pb); err != nil {
+				return err
+			}
+		} else {
+			v := reflect.ValueOf(pb)
+			for i := 0; i < v.Len(); i++ {
+				if err := writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
+					return err
+				}
+			}
+		}
+	}
+	return nil
+}
+
+func writeExtension(w *textWriter, name string, pb interface{}) error {
+	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
+		return err
+	}
+	if !w.compact {
+		if err := w.WriteByte(' '); err != nil {
+			return err
+		}
+	}
+	if err := writeAny(w, reflect.ValueOf(pb), nil); err != nil {
+		return err
+	}
+	if err := w.WriteByte('\n'); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (w *textWriter) writeIndent() {
+	if !w.complete {
+		return
+	}
+	remain := w.ind * 2
+	for remain > 0 {
+		n := remain
+		if n > len(spaces) {
+			n = len(spaces)
+		}
+		w.w.Write(spaces[:n])
+		remain -= n
+	}
+	w.complete = false
+}
+
+func marshalText(w io.Writer, pb Message, compact bool) error {
+	val := reflect.ValueOf(pb)
+	if pb == nil || val.IsNil() {
+		w.Write([]byte("<nil>"))
+		return nil
+	}
+	var bw *bufio.Writer
+	ww, ok := w.(writer)
+	if !ok {
+		bw = bufio.NewWriter(w)
+		ww = bw
+	}
+	aw := &textWriter{
+		w:        ww,
+		complete: true,
+		compact:  compact,
+	}
+
+	if tm, ok := pb.(encoding.TextMarshaler); ok {
+		text, err := tm.MarshalText()
+		if err != nil {
+			return err
+		}
+		if _, err = aw.Write(text); err != nil {
+			return err
+		}
+		if bw != nil {
+			return bw.Flush()
+		}
+		return nil
+	}
+	// Dereference the received pointer so we don't have outer < and >.
+	v := reflect.Indirect(val)
+	if err := writeStruct(aw, v); err != nil {
+		return err
+	}
+	if bw != nil {
+		return bw.Flush()
+	}
+	return nil
+}
+
+// MarshalText writes a given protocol buffer in text format.
+// The only errors returned are from w.
+func MarshalText(w io.Writer, pb Message) error {
+	return marshalText(w, pb, false)
+}
+
+// MarshalTextString is the same as MarshalText, but returns the string directly.
+func MarshalTextString(pb Message) string {
+	var buf bytes.Buffer
+	marshalText(&buf, pb, false)
+	return buf.String()
+}
+
+// CompactText writes a given protocol buffer in compact text format (one line).
+func CompactText(w io.Writer, pb Message) error { return marshalText(w, pb, true) }
+
+// CompactTextString is the same as CompactText, but returns the string directly.
+func CompactTextString(pb Message) string {
+	var buf bytes.Buffer
+	marshalText(&buf, pb, true)
+	return buf.String()
+}
diff --git a/vendor/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go
new file mode 100644
index 0000000000..6d0cf25894
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/proto/text_parser.go
@@ -0,0 +1,798 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+// Functions for parsing the Text protocol buffer format.
+// TODO: message sets.
+
+import (
+	"encoding"
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+	"unicode/utf8"
+)
+
+type ParseError struct {
+	Message string
+	Line    int // 1-based line number
+	Offset  int // 0-based byte offset from start of input
+}
+
+func (p *ParseError) Error() string {
+	if p.Line == 1 {
+		// show offset only for first line
+		return fmt.Sprintf("line 1.%d: %v", p.Offset, p.Message)
+	}
+	return fmt.Sprintf("line %d: %v", p.Line, p.Message)
+}
+
+type token struct {
+	value    string
+	err      *ParseError
+	line     int    // line number
+	offset   int    // byte number from start of input, not start of line
+	unquoted string // the unquoted version of value, if it was a quoted string
+}
+
+func (t *token) String() string {
+	if t.err == nil {
+		return fmt.Sprintf("%q (line=%d, offset=%d)", t.value, t.line, t.offset)
+	}
+	return fmt.Sprintf("parse error: %v", t.err)
+}
+
+type textParser struct {
+	s            string // remaining input
+	done         bool   // whether the parsing is finished (success or error)
+	backed       bool   // whether back() was called
+	offset, line int
+	cur          token
+}
+
+func newTextParser(s string) *textParser {
+	p := new(textParser)
+	p.s = s
+	p.line = 1
+	p.cur.line = 1
+	return p
+}
+
+func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
+	pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
+	p.cur.err = pe
+	p.done = true
+	return pe
+}
+
+// Numbers and identifiers are matched by [-+._A-Za-z0-9]
+func isIdentOrNumberChar(c byte) bool {
+	switch {
+	case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
+		return true
+	case '0' <= c && c <= '9':
+		return true
+	}
+	switch c {
+	case '-', '+', '.', '_':
+		return true
+	}
+	return false
+}
+
+func isWhitespace(c byte) bool {
+	switch c {
+	case ' ', '\t', '\n', '\r':
+		return true
+	}
+	return false
+}
+
+func (p *textParser) skipWhitespace() {
+	i := 0
+	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
+		if p.s[i] == '#' {
+			// comment; skip to end of line or input
+			for i < len(p.s) && p.s[i] != '\n' {
+				i++
+			}
+			if i == len(p.s) {
+				break
+			}
+		}
+		if p.s[i] == '\n' {
+			p.line++
+		}
+		i++
+	}
+	p.offset += i
+	p.s = p.s[i:len(p.s)]
+	if len(p.s) == 0 {
+		p.done = true
+	}
+}
+
+func (p *textParser) advance() {
+	// Skip whitespace
+	p.skipWhitespace()
+	if p.done {
+		return
+	}
+
+	// Start of non-whitespace
+	p.cur.err = nil
+	p.cur.offset, p.cur.line = p.offset, p.line
+	p.cur.unquoted = ""
+	switch p.s[0] {
+	case '<', '>', '{', '}', ':', '[', ']', ';', ',':
+		// Single symbol
+		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
+	case '"', '\'':
+		// Quoted string
+		i := 1
+		for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
+			if p.s[i] == '\\' && i+1 < len(p.s) {
+				// skip escaped char
+				i++
+			}
+			i++
+		}
+		if i >= len(p.s) || p.s[i] != p.s[0] {
+			p.errorf("unmatched quote")
+			return
+		}
+		unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
+		if err != nil {
+			p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
+			return
+		}
+		p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
+		p.cur.unquoted = unq
+	default:
+		i := 0
+		for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
+			i++
+		}
+		if i == 0 {
+			p.errorf("unexpected byte %#x", p.s[0])
+			return
+		}
+		p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
+	}
+	p.offset += len(p.cur.value)
+}
+
+var (
+	errBadUTF8 = errors.New("proto: bad UTF-8")
+	errBadHex  = errors.New("proto: bad hexadecimal")
+)
+
+func unquoteC(s string, quote rune) (string, error) {
+	// This is based on C++'s tokenizer.cc.
+	// Despite its name, this is *not* parsing C syntax.
+	// For instance, "\0" is an invalid quoted string.
+
+	// Avoid allocation in trivial cases.
+	simple := true
+	for _, r := range s {
+		if r == '\\' || r == quote {
+			simple = false
+			break
+		}
+	}
+	if simple {
+		return s, nil
+	}
+
+	buf := make([]byte, 0, 3*len(s)/2)
+	for len(s) > 0 {
+		r, n := utf8.DecodeRuneInString(s)
+		if r == utf8.RuneError && n == 1 {
+			return "", errBadUTF8
+		}
+		s = s[n:]
+		if r != '\\' {
+			if r < utf8.RuneSelf {
+				buf = append(buf, byte(r))
+			} else {
+				buf = append(buf, string(r)...)
+			}
+			continue
+		}
+
+		ch, tail, err := unescape(s)
+		if err != nil {
+			return "", err
+		}
+		buf = append(buf, ch...)
+		s = tail
+	}
+	return string(buf), nil
+}
+
+func unescape(s string) (ch string, tail string, err error) {
+	r, n := utf8.DecodeRuneInString(s)
+	if r == utf8.RuneError && n == 1 {
+		return "", "", errBadUTF8
+	}
+	s = s[n:]
+	switch r {
+	case 'a':
+		return "\a", s, nil
+	case 'b':
+		return "\b", s, nil
+	case 'f':
+		return "\f", s, nil
+	case 'n':
+		return "\n", s, nil
+	case 'r':
+		return "\r", s, nil
+	case 't':
+		return "\t", s, nil
+	case 'v':
+		return "\v", s, nil
+	case '?':
+		return "?", s, nil // trigraph workaround
+	case '\'', '"', '\\':
+		return string(r), s, nil
+	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
+		if len(s) < 2 {
+			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
+		}
+		base := 8
+		ss := s[:2]
+		s = s[2:]
+		if r == 'x' || r == 'X' {
+			base = 16
+		} else {
+			ss = string(r) + ss
+		}
+		i, err := strconv.ParseUint(ss, base, 8)
+		if err != nil {
+			return "", "", err
+		}
+		return string([]byte{byte(i)}), s, nil
+	case 'u', 'U':
+		n := 4
+		if r == 'U' {
+			n = 8
+		}
+		if len(s) < n {
+			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
+		}
+
+		bs := make([]byte, n/2)
+		for i := 0; i < n; i += 2 {
+			a, ok1 := unhex(s[i])
+			b, ok2 := unhex(s[i+1])
+			if !ok1 || !ok2 {
+				return "", "", errBadHex
+			}
+			bs[i/2] = a<<4 | b
+		}
+		s = s[n:]
+		return string(bs), s, nil
+	}
+	return "", "", fmt.Errorf(`unknown escape \%c`, r)
+}
+
+// Adapted from src/pkg/strconv/quote.go.
+func unhex(b byte) (v byte, ok bool) {
+	switch {
+	case '0' <= b && b <= '9':
+		return b - '0', true
+	case 'a' <= b && b <= 'f':
+		return b - 'a' + 10, true
+	case 'A' <= b && b <= 'F':
+		return b - 'A' + 10, true
+	}
+	return 0, false
+}
+
+// Back off the parser by one token. Can only be done between calls to next().
+// It makes the next advance() a no-op.
+func (p *textParser) back() { p.backed = true }
+
+// Advances the parser and returns the new current token.
+func (p *textParser) next() *token {
+	if p.backed || p.done {
+		p.backed = false
+		return &p.cur
+	}
+	p.advance()
+	if p.done {
+		p.cur.value = ""
+	} else if len(p.cur.value) > 0 && p.cur.value[0] == '"' {
+		// Look for multiple quoted strings separated by whitespace,
+		// and concatenate them.
+		cat := p.cur
+		for {
+			p.skipWhitespace()
+			if p.done || p.s[0] != '"' {
+				break
+			}
+			p.advance()
+			if p.cur.err != nil {
+				return &p.cur
+			}
+			cat.value += " " + p.cur.value
+			cat.unquoted += p.cur.unquoted
+		}
+		p.done = false // parser may have seen EOF, but we want to return cat
+		p.cur = cat
+	}
+	return &p.cur
+}
+
+func (p *textParser) consumeToken(s string) error {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value != s {
+		p.back()
+		return p.errorf("expected %q, found %q", s, tok.value)
+	}
+	return nil
+}
+
+// Return a RequiredNotSetError indicating which required field was not set.
+func (p *textParser) missingRequiredFieldError(sv reflect.Value) *RequiredNotSetError {
+	st := sv.Type()
+	sprops := GetProperties(st)
+	for i := 0; i < st.NumField(); i++ {
+		if !isNil(sv.Field(i)) {
+			continue
+		}
+
+		props := sprops.Prop[i]
+		if props.Required {
+			return &RequiredNotSetError{fmt.Sprintf("%v.%v", st, props.OrigName)}
+		}
+	}
+	return &RequiredNotSetError{fmt.Sprintf("%v.<unknown field name>", st)} // should not happen
+}
+
+// Returns the index in the struct for the named field, as well as the parsed tag properties.
+func structFieldByName(sprops *StructProperties, name string) (int, *Properties, bool) {
+	i, ok := sprops.decoderOrigNames[name]
+	if ok {
+		return i, sprops.Prop[i], true
+	}
+	return -1, nil, false
+}
+
+// Consume a ':' from the input stream (if the next token is a colon),
+// returning an error if a colon is needed but not present.
+func (p *textParser) checkForColon(props *Properties, typ reflect.Type) *ParseError {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value != ":" {
+		// Colon is optional when the field is a group or message.
+		needColon := true
+		switch props.Wire {
+		case "group":
+			needColon = false
+		case "bytes":
+			// A "bytes" field is either a message, a string, or a repeated field;
+			// those three become *T, *string and []T respectively, so we can check for
+			// this field being a pointer to a non-string.
+			if typ.Kind() == reflect.Ptr {
+				// *T or *string
+				if typ.Elem().Kind() == reflect.String {
+					break
+				}
+			} else if typ.Kind() == reflect.Slice {
+				// []T or []*T
+				if typ.Elem().Kind() != reflect.Ptr {
+					break
+				}
+			} else if typ.Kind() == reflect.String {
+				// The proto3 exception is for a string field,
+				// which requires a colon.
+				break
+			}
+			needColon = false
+		}
+		if needColon {
+			return p.errorf("expected ':', found %q", tok.value)
+		}
+		p.back()
+	}
+	return nil
+}
+
+func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
+	st := sv.Type()
+	sprops := GetProperties(st)
+	reqCount := sprops.reqCount
+	var reqFieldErr error
+	fieldSet := make(map[string]bool)
+	// A struct is a sequence of "name: value", terminated by one of
+	// '>' or '}', or the end of the input.  A name may also be
+	// "[extension]".
+	for {
+		tok := p.next()
+		if tok.err != nil {
+			return tok.err
+		}
+		if tok.value == terminator {
+			break
+		}
+		if tok.value == "[" {
+			// Looks like an extension.
+			//
+			// TODO: Check whether we need to handle
+			// namespace rooted names (e.g. ".something.Foo").
+			tok = p.next()
+			if tok.err != nil {
+				return tok.err
+			}
+			var desc *ExtensionDesc
+			// This could be faster, but it's functional.
+			// TODO: Do something smarter than a linear scan.
+			for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
+				if d.Name == tok.value {
+					desc = d
+					break
+				}
+			}
+			if desc == nil {
+				return p.errorf("unrecognized extension %q", tok.value)
+			}
+			// Check the extension terminator.
+			tok = p.next()
+			if tok.err != nil {
+				return tok.err
+			}
+			if tok.value != "]" {
+				return p.errorf("unrecognized extension terminator %q", tok.value)
+			}
+
+			props := &Properties{}
+			props.Parse(desc.Tag)
+
+			typ := reflect.TypeOf(desc.ExtensionType)
+			if err := p.checkForColon(props, typ); err != nil {
+				return err
+			}
+
+			rep := desc.repeated()
+
+			// Read the extension structure, and set it in
+			// the value we're constructing.
+			var ext reflect.Value
+			if !rep {
+				ext = reflect.New(typ).Elem()
+			} else {
+				ext = reflect.New(typ.Elem()).Elem()
+			}
+			if err := p.readAny(ext, props); err != nil {
+				if _, ok := err.(*RequiredNotSetError); !ok {
+					return err
+				}
+				reqFieldErr = err
+			}
+			ep := sv.Addr().Interface().(extendableProto)
+			if !rep {
+				SetExtension(ep, desc, ext.Interface())
+			} else {
+				old, err := GetExtension(ep, desc)
+				var sl reflect.Value
+				if err == nil {
+					sl = reflect.ValueOf(old) // existing slice
+				} else {
+					sl = reflect.MakeSlice(typ, 0, 1)
+				}
+				sl = reflect.Append(sl, ext)
+				SetExtension(ep, desc, sl.Interface())
+			}
+			if err := p.consumeOptionalSeparator(); err != nil {
+				return err
+			}
+			continue
+		}
+
+		// This is a normal, non-extension field.
+		name := tok.value
+		var dst reflect.Value
+		fi, props, ok := structFieldByName(sprops, name)
+		if ok {
+			dst = sv.Field(fi)
+		} else if oop, ok := sprops.OneofTypes[name]; ok {
+			// It is a oneof.
+			props = oop.Prop
+			nv := reflect.New(oop.Type.Elem())
+			dst = nv.Elem().Field(0)
+			sv.Field(oop.Field).Set(nv)
+		}
+		if !dst.IsValid() {
+			return p.errorf("unknown field name %q in %v", name, st)
+		}
+
+		if dst.Kind() == reflect.Map {
+			// Consume any colon.
+			if err := p.checkForColon(props, dst.Type()); err != nil {
+				return err
+			}
+
+			// Construct the map if it doesn't already exist.
+			if dst.IsNil() {
+				dst.Set(reflect.MakeMap(dst.Type()))
+			}
+			key := reflect.New(dst.Type().Key()).Elem()
+			val := reflect.New(dst.Type().Elem()).Elem()
+
+			// The map entry should be this sequence of tokens:
+			//	< key : KEY value : VALUE >
+			// Technically the "key" and "value" could come in any order,
+			// but in practice they won't.
+
+			tok := p.next()
+			var terminator string
+			switch tok.value {
+			case "<":
+				terminator = ">"
+			case "{":
+				terminator = "}"
+			default:
+				return p.errorf("expected '{' or '<', found %q", tok.value)
+			}
+			if err := p.consumeToken("key"); err != nil {
+				return err
+			}
+			if err := p.consumeToken(":"); err != nil {
+				return err
+			}
+			if err := p.readAny(key, props.mkeyprop); err != nil {
+				return err
+			}
+			if err := p.consumeOptionalSeparator(); err != nil {
+				return err
+			}
+			if err := p.consumeToken("value"); err != nil {
+				return err
+			}
+			if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
+				return err
+			}
+			if err := p.readAny(val, props.mvalprop); err != nil {
+				return err
+			}
+			if err := p.consumeOptionalSeparator(); err != nil {
+				return err
+			}
+			if err := p.consumeToken(terminator); err != nil {
+				return err
+			}
+
+			dst.SetMapIndex(key, val)
+			continue
+		}
+
+		// Check that it's not already set if it's not a repeated field.
+		if !props.Repeated && fieldSet[name] {
+			return p.errorf("non-repeated field %q was repeated", name)
+		}
+
+		if err := p.checkForColon(props, dst.Type()); err != nil {
+			return err
+		}
+
+		// Parse into the field.
+		fieldSet[name] = true
+		if err := p.readAny(dst, props); err != nil {
+			if _, ok := err.(*RequiredNotSetError); !ok {
+				return err
+			}
+			reqFieldErr = err
+		} else if props.Required {
+			reqCount--
+		}
+
+		if err := p.consumeOptionalSeparator(); err != nil {
+			return err
+		}
+
+	}
+
+	if reqCount > 0 {
+		return p.missingRequiredFieldError(sv)
+	}
+	return reqFieldErr
+}
+
+// consumeOptionalSeparator consumes an optional semicolon or comma.
+// It is used in readStruct to provide backward compatibility.
+func (p *textParser) consumeOptionalSeparator() error {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value != ";" && tok.value != "," {
+		p.back()
+	}
+	return nil
+}
+
+func (p *textParser) readAny(v reflect.Value, props *Properties) error {
+	tok := p.next()
+	if tok.err != nil {
+		return tok.err
+	}
+	if tok.value == "" {
+		return p.errorf("unexpected EOF")
+	}
+
+	switch fv := v; fv.Kind() {
+	case reflect.Slice:
+		at := v.Type()
+		if at.Elem().Kind() == reflect.Uint8 {
+			// Special case for []byte
+			if tok.value[0] != '"' && tok.value[0] != '\'' {
+				// Deliberately written out here, as the error after
+				// this switch statement would write "invalid []byte: ...",
+				// which is not as user-friendly.
+				return p.errorf("invalid string: %v", tok.value)
+			}
+			bytes := []byte(tok.unquoted)
+			fv.Set(reflect.ValueOf(bytes))
+			return nil
+		}
+		// Repeated field.
+		if tok.value == "[" {
+			// Repeated field with list notation, like [1,2,3].
+			for {
+				fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
+				err := p.readAny(fv.Index(fv.Len()-1), props)
+				if err != nil {
+					return err
+				}
+				tok := p.next()
+				if tok.err != nil {
+					return tok.err
+				}
+				if tok.value == "]" {
+					break
+				}
+				if tok.value != "," {
+					return p.errorf("Expected ']' or ',' found %q", tok.value)
+				}
+			}
+			return nil
+		}
+		// One value of the repeated field.
+		p.back()
+		fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
+		return p.readAny(fv.Index(fv.Len()-1), props)
+	case reflect.Bool:
+		// Either "true", "false", 1 or 0.
+		switch tok.value {
+		case "true", "1":
+			fv.SetBool(true)
+			return nil
+		case "false", "0":
+			fv.SetBool(false)
+			return nil
+		}
+	case reflect.Float32, reflect.Float64:
+		v := tok.value
+		// Ignore 'f' for compatibility with output generated by C++, but don't
+		// remove 'f' when the value is "-inf" or "inf".
+		if strings.HasSuffix(v, "f") && tok.value != "-inf" && tok.value != "inf" {
+			v = v[:len(v)-1]
+		}
+		if f, err := strconv.ParseFloat(v, fv.Type().Bits()); err == nil {
+			fv.SetFloat(f)
+			return nil
+		}
+	case reflect.Int32:
+		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
+			fv.SetInt(x)
+			return nil
+		}
+
+		if len(props.Enum) == 0 {
+			break
+		}
+		m, ok := enumValueMaps[props.Enum]
+		if !ok {
+			break
+		}
+		x, ok := m[tok.value]
+		if !ok {
+			break
+		}
+		fv.SetInt(int64(x))
+		return nil
+	case reflect.Int64:
+		if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
+			fv.SetInt(x)
+			return nil
+		}
+
+	case reflect.Ptr:
+		// A basic field (indirected through pointer), or a repeated message/group
+		p.back()
+		fv.Set(reflect.New(fv.Type().Elem()))
+		return p.readAny(fv.Elem(), props)
+	case reflect.String:
+		if tok.value[0] == '"' || tok.value[0] == '\'' {
+			fv.SetString(tok.unquoted)
+			return nil
+		}
+	case reflect.Struct:
+		var terminator string
+		switch tok.value {
+		case "{":
+			terminator = "}"
+		case "<":
+			terminator = ">"
+		default:
+			return p.errorf("expected '{' or '<', found %q", tok.value)
+		}
+		// TODO: Handle nested messages which implement encoding.TextUnmarshaler.
+		return p.readStruct(fv, terminator)
+	case reflect.Uint32:
+		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
+			fv.SetUint(uint64(x))
+			return nil
+		}
+	case reflect.Uint64:
+		if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
+			fv.SetUint(x)
+			return nil
+		}
+	}
+	return p.errorf("invalid %v: %v", v.Type(), tok.value)
+}
+
+// UnmarshalText reads a protocol buffer in Text format. UnmarshalText resets pb
+// before starting to unmarshal, so any existing data in pb is always removed.
+// If a required field is not set and no other error occurs,
+// UnmarshalText returns *RequiredNotSetError.
+func UnmarshalText(s string, pb Message) error {
+	if um, ok := pb.(encoding.TextUnmarshaler); ok {
+		err := um.UnmarshalText([]byte(s))
+		return err
+	}
+	pb.Reset()
+	v := reflect.ValueOf(pb)
+	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
+		return pe
+	}
+	return nil
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
new file mode 100644
index 0000000000..6a3be28eb6
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
@@ -0,0 +1,1812 @@
+// Code generated by protoc-gen-go.
+// source: google/protobuf/descriptor.proto
+// DO NOT EDIT!
+
+/*
+Package google_protobuf is a generated protocol buffer package.
+
+It is generated from these files:
+	google/protobuf/descriptor.proto
+
+It has these top-level messages:
+	FileDescriptorSet
+	FileDescriptorProto
+	DescriptorProto
+	FieldDescriptorProto
+	OneofDescriptorProto
+	EnumDescriptorProto
+	EnumValueDescriptorProto
+	ServiceDescriptorProto
+	MethodDescriptorProto
+	FileOptions
+	MessageOptions
+	FieldOptions
+	EnumOptions
+	EnumValueOptions
+	ServiceOptions
+	MethodOptions
+	UninterpretedOption
+	SourceCodeInfo
+*/
+package descriptor
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+const _ = proto.ProtoPackageIsVersion1
+
+type FieldDescriptorProto_Type int32
+
+const (
+	// 0 is reserved for errors.
+	// Order is weird for historical reasons.
+	FieldDescriptorProto_TYPE_DOUBLE FieldDescriptorProto_Type = 1
+	FieldDescriptorProto_TYPE_FLOAT  FieldDescriptorProto_Type = 2
+	// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
+	// negative values are likely.
+	FieldDescriptorProto_TYPE_INT64  FieldDescriptorProto_Type = 3
+	FieldDescriptorProto_TYPE_UINT64 FieldDescriptorProto_Type = 4
+	// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
+	// negative values are likely.
+	FieldDescriptorProto_TYPE_INT32   FieldDescriptorProto_Type = 5
+	FieldDescriptorProto_TYPE_FIXED64 FieldDescriptorProto_Type = 6
+	FieldDescriptorProto_TYPE_FIXED32 FieldDescriptorProto_Type = 7
+	FieldDescriptorProto_TYPE_BOOL    FieldDescriptorProto_Type = 8
+	FieldDescriptorProto_TYPE_STRING  FieldDescriptorProto_Type = 9
+	FieldDescriptorProto_TYPE_GROUP   FieldDescriptorProto_Type = 10
+	FieldDescriptorProto_TYPE_MESSAGE FieldDescriptorProto_Type = 11
+	// New in version 2.
+	FieldDescriptorProto_TYPE_BYTES    FieldDescriptorProto_Type = 12
+	FieldDescriptorProto_TYPE_UINT32   FieldDescriptorProto_Type = 13
+	FieldDescriptorProto_TYPE_ENUM     FieldDescriptorProto_Type = 14
+	FieldDescriptorProto_TYPE_SFIXED32 FieldDescriptorProto_Type = 15
+	FieldDescriptorProto_TYPE_SFIXED64 FieldDescriptorProto_Type = 16
+	FieldDescriptorProto_TYPE_SINT32   FieldDescriptorProto_Type = 17
+	FieldDescriptorProto_TYPE_SINT64   FieldDescriptorProto_Type = 18
+)
+
+var FieldDescriptorProto_Type_name = map[int32]string{
+	1:  "TYPE_DOUBLE",
+	2:  "TYPE_FLOAT",
+	3:  "TYPE_INT64",
+	4:  "TYPE_UINT64",
+	5:  "TYPE_INT32",
+	6:  "TYPE_FIXED64",
+	7:  "TYPE_FIXED32",
+	8:  "TYPE_BOOL",
+	9:  "TYPE_STRING",
+	10: "TYPE_GROUP",
+	11: "TYPE_MESSAGE",
+	12: "TYPE_BYTES",
+	13: "TYPE_UINT32",
+	14: "TYPE_ENUM",
+	15: "TYPE_SFIXED32",
+	16: "TYPE_SFIXED64",
+	17: "TYPE_SINT32",
+	18: "TYPE_SINT64",
+}
+var FieldDescriptorProto_Type_value = map[string]int32{
+	"TYPE_DOUBLE":   1,
+	"TYPE_FLOAT":    2,
+	"TYPE_INT64":    3,
+	"TYPE_UINT64":   4,
+	"TYPE_INT32":    5,
+	"TYPE_FIXED64":  6,
+	"TYPE_FIXED32":  7,
+	"TYPE_BOOL":     8,
+	"TYPE_STRING":   9,
+	"TYPE_GROUP":    10,
+	"TYPE_MESSAGE":  11,
+	"TYPE_BYTES":    12,
+	"TYPE_UINT32":   13,
+	"TYPE_ENUM":     14,
+	"TYPE_SFIXED32": 15,
+	"TYPE_SFIXED64": 16,
+	"TYPE_SINT32":   17,
+	"TYPE_SINT64":   18,
+}
+
+func (x FieldDescriptorProto_Type) Enum() *FieldDescriptorProto_Type {
+	p := new(FieldDescriptorProto_Type)
+	*p = x
+	return p
+}
+func (x FieldDescriptorProto_Type) String() string {
+	return proto.EnumName(FieldDescriptorProto_Type_name, int32(x))
+}
+func (x *FieldDescriptorProto_Type) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Type_value, data, "FieldDescriptorProto_Type")
+	if err != nil {
+		return err
+	}
+	*x = FieldDescriptorProto_Type(value)
+	return nil
+}
+func (FieldDescriptorProto_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 0} }
+
+type FieldDescriptorProto_Label int32
+
+const (
+	// 0 is reserved for errors
+	FieldDescriptorProto_LABEL_OPTIONAL FieldDescriptorProto_Label = 1
+	FieldDescriptorProto_LABEL_REQUIRED FieldDescriptorProto_Label = 2
+	FieldDescriptorProto_LABEL_REPEATED FieldDescriptorProto_Label = 3
+)
+
+var FieldDescriptorProto_Label_name = map[int32]string{
+	1: "LABEL_OPTIONAL",
+	2: "LABEL_REQUIRED",
+	3: "LABEL_REPEATED",
+}
+var FieldDescriptorProto_Label_value = map[string]int32{
+	"LABEL_OPTIONAL": 1,
+	"LABEL_REQUIRED": 2,
+	"LABEL_REPEATED": 3,
+}
+
+func (x FieldDescriptorProto_Label) Enum() *FieldDescriptorProto_Label {
+	p := new(FieldDescriptorProto_Label)
+	*p = x
+	return p
+}
+func (x FieldDescriptorProto_Label) String() string {
+	return proto.EnumName(FieldDescriptorProto_Label_name, int32(x))
+}
+func (x *FieldDescriptorProto_Label) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Label_value, data, "FieldDescriptorProto_Label")
+	if err != nil {
+		return err
+	}
+	*x = FieldDescriptorProto_Label(value)
+	return nil
+}
+func (FieldDescriptorProto_Label) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{3, 1}
+}
+
+// Generated classes can be optimized for speed or code size.
+type FileOptions_OptimizeMode int32
+
+const (
+	FileOptions_SPEED FileOptions_OptimizeMode = 1
+	// etc.
+	FileOptions_CODE_SIZE    FileOptions_OptimizeMode = 2
+	FileOptions_LITE_RUNTIME FileOptions_OptimizeMode = 3
+)
+
+var FileOptions_OptimizeMode_name = map[int32]string{
+	1: "SPEED",
+	2: "CODE_SIZE",
+	3: "LITE_RUNTIME",
+}
+var FileOptions_OptimizeMode_value = map[string]int32{
+	"SPEED":        1,
+	"CODE_SIZE":    2,
+	"LITE_RUNTIME": 3,
+}
+
+func (x FileOptions_OptimizeMode) Enum() *FileOptions_OptimizeMode {
+	p := new(FileOptions_OptimizeMode)
+	*p = x
+	return p
+}
+func (x FileOptions_OptimizeMode) String() string {
+	return proto.EnumName(FileOptions_OptimizeMode_name, int32(x))
+}
+func (x *FileOptions_OptimizeMode) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FileOptions_OptimizeMode_value, data, "FileOptions_OptimizeMode")
+	if err != nil {
+		return err
+	}
+	*x = FileOptions_OptimizeMode(value)
+	return nil
+}
+func (FileOptions_OptimizeMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} }
+
+type FieldOptions_CType int32
+
+const (
+	// Default mode.
+	FieldOptions_STRING       FieldOptions_CType = 0
+	FieldOptions_CORD         FieldOptions_CType = 1
+	FieldOptions_STRING_PIECE FieldOptions_CType = 2
+)
+
+var FieldOptions_CType_name = map[int32]string{
+	0: "STRING",
+	1: "CORD",
+	2: "STRING_PIECE",
+}
+var FieldOptions_CType_value = map[string]int32{
+	"STRING":       0,
+	"CORD":         1,
+	"STRING_PIECE": 2,
+}
+
+func (x FieldOptions_CType) Enum() *FieldOptions_CType {
+	p := new(FieldOptions_CType)
+	*p = x
+	return p
+}
+func (x FieldOptions_CType) String() string {
+	return proto.EnumName(FieldOptions_CType_name, int32(x))
+}
+func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FieldOptions_CType_value, data, "FieldOptions_CType")
+	if err != nil {
+		return err
+	}
+	*x = FieldOptions_CType(value)
+	return nil
+}
+func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{11, 0} }
+
+// The protocol compiler can output a FileDescriptorSet containing the .proto
+// files it parses.
+type FileDescriptorSet struct {
+	File             []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
+	XXX_unrecognized []byte                 `json:"-"`
+}
+
+func (m *FileDescriptorSet) Reset()                    { *m = FileDescriptorSet{} }
+func (m *FileDescriptorSet) String() string            { return proto.CompactTextString(m) }
+func (*FileDescriptorSet) ProtoMessage()               {}
+func (*FileDescriptorSet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *FileDescriptorSet) GetFile() []*FileDescriptorProto {
+	if m != nil {
+		return m.File
+	}
+	return nil
+}
+
+// Describes a complete .proto file.
+type FileDescriptorProto struct {
+	Name    *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Package *string `protobuf:"bytes,2,opt,name=package" json:"package,omitempty"`
+	// Names of files imported by this file.
+	Dependency []string `protobuf:"bytes,3,rep,name=dependency" json:"dependency,omitempty"`
+	// Indexes of the public imported files in the dependency list above.
+	PublicDependency []int32 `protobuf:"varint,10,rep,name=public_dependency" json:"public_dependency,omitempty"`
+	// Indexes of the weak imported files in the dependency list.
+	// For Google-internal migration only. Do not use.
+	WeakDependency []int32 `protobuf:"varint,11,rep,name=weak_dependency" json:"weak_dependency,omitempty"`
+	// All top-level definitions in this file.
+	MessageType []*DescriptorProto        `protobuf:"bytes,4,rep,name=message_type" json:"message_type,omitempty"`
+	EnumType    []*EnumDescriptorProto    `protobuf:"bytes,5,rep,name=enum_type" json:"enum_type,omitempty"`
+	Service     []*ServiceDescriptorProto `protobuf:"bytes,6,rep,name=service" json:"service,omitempty"`
+	Extension   []*FieldDescriptorProto   `protobuf:"bytes,7,rep,name=extension" json:"extension,omitempty"`
+	Options     *FileOptions              `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
+	// This field contains optional information about the original source code.
+	// You may safely remove this entire field without harming runtime
+	// functionality of the descriptors -- the information is needed only by
+	// development tools.
+	SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info" json:"source_code_info,omitempty"`
+	// The syntax of the proto file.
+	// The supported values are "proto2" and "proto3".
+	Syntax           *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *FileDescriptorProto) Reset()                    { *m = FileDescriptorProto{} }
+func (m *FileDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*FileDescriptorProto) ProtoMessage()               {}
+func (*FileDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *FileDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *FileDescriptorProto) GetPackage() string {
+	if m != nil && m.Package != nil {
+		return *m.Package
+	}
+	return ""
+}
+
+func (m *FileDescriptorProto) GetDependency() []string {
+	if m != nil {
+		return m.Dependency
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetPublicDependency() []int32 {
+	if m != nil {
+		return m.PublicDependency
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetWeakDependency() []int32 {
+	if m != nil {
+		return m.WeakDependency
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetMessageType() []*DescriptorProto {
+	if m != nil {
+		return m.MessageType
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetEnumType() []*EnumDescriptorProto {
+	if m != nil {
+		return m.EnumType
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetService() []*ServiceDescriptorProto {
+	if m != nil {
+		return m.Service
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetExtension() []*FieldDescriptorProto {
+	if m != nil {
+		return m.Extension
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetOptions() *FileOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetSourceCodeInfo() *SourceCodeInfo {
+	if m != nil {
+		return m.SourceCodeInfo
+	}
+	return nil
+}
+
+func (m *FileDescriptorProto) GetSyntax() string {
+	if m != nil && m.Syntax != nil {
+		return *m.Syntax
+	}
+	return ""
+}
+
+// Describes a message type.
+type DescriptorProto struct {
+	Name             *string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Field            []*FieldDescriptorProto           `protobuf:"bytes,2,rep,name=field" json:"field,omitempty"`
+	Extension        []*FieldDescriptorProto           `protobuf:"bytes,6,rep,name=extension" json:"extension,omitempty"`
+	NestedType       []*DescriptorProto                `protobuf:"bytes,3,rep,name=nested_type" json:"nested_type,omitempty"`
+	EnumType         []*EnumDescriptorProto            `protobuf:"bytes,4,rep,name=enum_type" json:"enum_type,omitempty"`
+	ExtensionRange   []*DescriptorProto_ExtensionRange `protobuf:"bytes,5,rep,name=extension_range" json:"extension_range,omitempty"`
+	OneofDecl        []*OneofDescriptorProto           `protobuf:"bytes,8,rep,name=oneof_decl" json:"oneof_decl,omitempty"`
+	Options          *MessageOptions                   `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte                            `json:"-"`
+}
+
+func (m *DescriptorProto) Reset()                    { *m = DescriptorProto{} }
+func (m *DescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*DescriptorProto) ProtoMessage()               {}
+func (*DescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+
+func (m *DescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *DescriptorProto) GetField() []*FieldDescriptorProto {
+	if m != nil {
+		return m.Field
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetExtension() []*FieldDescriptorProto {
+	if m != nil {
+		return m.Extension
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetNestedType() []*DescriptorProto {
+	if m != nil {
+		return m.NestedType
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetEnumType() []*EnumDescriptorProto {
+	if m != nil {
+		return m.EnumType
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetExtensionRange() []*DescriptorProto_ExtensionRange {
+	if m != nil {
+		return m.ExtensionRange
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetOneofDecl() []*OneofDescriptorProto {
+	if m != nil {
+		return m.OneofDecl
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetOptions() *MessageOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+type DescriptorProto_ExtensionRange struct {
+	Start            *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End              *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	XXX_unrecognized []byte `json:"-"`
+}
+
+func (m *DescriptorProto_ExtensionRange) Reset()         { *m = DescriptorProto_ExtensionRange{} }
+func (m *DescriptorProto_ExtensionRange) String() string { return proto.CompactTextString(m) }
+func (*DescriptorProto_ExtensionRange) ProtoMessage()    {}
+func (*DescriptorProto_ExtensionRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{2, 0}
+}
+
+func (m *DescriptorProto_ExtensionRange) GetStart() int32 {
+	if m != nil && m.Start != nil {
+		return *m.Start
+	}
+	return 0
+}
+
+func (m *DescriptorProto_ExtensionRange) GetEnd() int32 {
+	if m != nil && m.End != nil {
+		return *m.End
+	}
+	return 0
+}
+
+// Describes a field within a message.
+type FieldDescriptorProto struct {
+	Name   *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Number *int32                      `protobuf:"varint,3,opt,name=number" json:"number,omitempty"`
+	Label  *FieldDescriptorProto_Label `protobuf:"varint,4,opt,name=label,enum=google.protobuf.FieldDescriptorProto_Label" json:"label,omitempty"`
+	// If type_name is set, this need not be set.  If both this and type_name
+	// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
+	Type *FieldDescriptorProto_Type `protobuf:"varint,5,opt,name=type,enum=google.protobuf.FieldDescriptorProto_Type" json:"type,omitempty"`
+	// For message and enum types, this is the name of the type.  If the name
+	// starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
+	// rules are used to find the type (i.e. first the nested types within this
+	// message are searched, then within the parent, on up to the root
+	// namespace).
+	TypeName *string `protobuf:"bytes,6,opt,name=type_name" json:"type_name,omitempty"`
+	// For extensions, this is the name of the type being extended.  It is
+	// resolved in the same manner as type_name.
+	Extendee *string `protobuf:"bytes,2,opt,name=extendee" json:"extendee,omitempty"`
+	// For numeric types, contains the original text representation of the value.
+	// For booleans, "true" or "false".
+	// For strings, contains the default text contents (not escaped in any way).
+	// For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
+	// TODO(kenton):  Base-64 encode?
+	DefaultValue *string `protobuf:"bytes,7,opt,name=default_value" json:"default_value,omitempty"`
+	// If set, gives the index of a oneof in the containing type's oneof_decl
+	// list.  This field is a member of that oneof.  Extensions of a oneof should
+	// not set this since the oneof to which they belong will be inferred based
+	// on the extension range containing the extension's field number.
+	OneofIndex *int32 `protobuf:"varint,9,opt,name=oneof_index" json:"oneof_index,omitempty"`
+	// JSON name of this field. The value is set by protocol compiler. If the
+	// user has set a "json_name" option on this field, that option's value
+	// will be used. Otherwise, it's deduced from the field's name by converting
+	// it to camelCase.
+	JsonName         *string       `protobuf:"bytes,10,opt,name=json_name" json:"json_name,omitempty"`
+	Options          *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte        `json:"-"`
+}
+
+func (m *FieldDescriptorProto) Reset()                    { *m = FieldDescriptorProto{} }
+func (m *FieldDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*FieldDescriptorProto) ProtoMessage()               {}
+func (*FieldDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+
+func (m *FieldDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetNumber() int32 {
+	if m != nil && m.Number != nil {
+		return *m.Number
+	}
+	return 0
+}
+
+func (m *FieldDescriptorProto) GetLabel() FieldDescriptorProto_Label {
+	if m != nil && m.Label != nil {
+		return *m.Label
+	}
+	return FieldDescriptorProto_LABEL_OPTIONAL
+}
+
+func (m *FieldDescriptorProto) GetType() FieldDescriptorProto_Type {
+	if m != nil && m.Type != nil {
+		return *m.Type
+	}
+	return FieldDescriptorProto_TYPE_DOUBLE
+}
+
+func (m *FieldDescriptorProto) GetTypeName() string {
+	if m != nil && m.TypeName != nil {
+		return *m.TypeName
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetExtendee() string {
+	if m != nil && m.Extendee != nil {
+		return *m.Extendee
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetDefaultValue() string {
+	if m != nil && m.DefaultValue != nil {
+		return *m.DefaultValue
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetOneofIndex() int32 {
+	if m != nil && m.OneofIndex != nil {
+		return *m.OneofIndex
+	}
+	return 0
+}
+
+func (m *FieldDescriptorProto) GetJsonName() string {
+	if m != nil && m.JsonName != nil {
+		return *m.JsonName
+	}
+	return ""
+}
+
+func (m *FieldDescriptorProto) GetOptions() *FieldOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+// Describes a oneof.
+type OneofDescriptorProto struct {
+	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *OneofDescriptorProto) Reset()                    { *m = OneofDescriptorProto{} }
+func (m *OneofDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*OneofDescriptorProto) ProtoMessage()               {}
+func (*OneofDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+
+func (m *OneofDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+// Describes an enum type.
+type EnumDescriptorProto struct {
+	Name             *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Value            []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
+	Options          *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte                      `json:"-"`
+}
+
+func (m *EnumDescriptorProto) Reset()                    { *m = EnumDescriptorProto{} }
+func (m *EnumDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*EnumDescriptorProto) ProtoMessage()               {}
+func (*EnumDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+
+func (m *EnumDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *EnumDescriptorProto) GetValue() []*EnumValueDescriptorProto {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+func (m *EnumDescriptorProto) GetOptions() *EnumOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+// Describes a value within an enum.
+type EnumValueDescriptorProto struct {
+	Name             *string           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Number           *int32            `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
+	Options          *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte            `json:"-"`
+}
+
+func (m *EnumValueDescriptorProto) Reset()                    { *m = EnumValueDescriptorProto{} }
+func (m *EnumValueDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*EnumValueDescriptorProto) ProtoMessage()               {}
+func (*EnumValueDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+
+func (m *EnumValueDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *EnumValueDescriptorProto) GetNumber() int32 {
+	if m != nil && m.Number != nil {
+		return *m.Number
+	}
+	return 0
+}
+
+func (m *EnumValueDescriptorProto) GetOptions() *EnumValueOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+// Describes a service.
+type ServiceDescriptorProto struct {
+	Name             *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Method           []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
+	Options          *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte                   `json:"-"`
+}
+
+func (m *ServiceDescriptorProto) Reset()                    { *m = ServiceDescriptorProto{} }
+func (m *ServiceDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*ServiceDescriptorProto) ProtoMessage()               {}
+func (*ServiceDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+
+func (m *ServiceDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *ServiceDescriptorProto) GetMethod() []*MethodDescriptorProto {
+	if m != nil {
+		return m.Method
+	}
+	return nil
+}
+
+func (m *ServiceDescriptorProto) GetOptions() *ServiceOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+// Describes a method of a service.
+type MethodDescriptorProto struct {
+	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// Input and output type names.  These are resolved in the same way as
+	// FieldDescriptorProto.type_name, but must refer to a message type.
+	InputType  *string        `protobuf:"bytes,2,opt,name=input_type" json:"input_type,omitempty"`
+	OutputType *string        `protobuf:"bytes,3,opt,name=output_type" json:"output_type,omitempty"`
+	Options    *MethodOptions `protobuf:"bytes,4,opt,name=options" json:"options,omitempty"`
+	// Identifies if client streams multiple client messages
+	ClientStreaming *bool `protobuf:"varint,5,opt,name=client_streaming,def=0" json:"client_streaming,omitempty"`
+	// Identifies if server streams multiple server messages
+	ServerStreaming  *bool  `protobuf:"varint,6,opt,name=server_streaming,def=0" json:"server_streaming,omitempty"`
+	XXX_unrecognized []byte `json:"-"`
+}
+
+func (m *MethodDescriptorProto) Reset()                    { *m = MethodDescriptorProto{} }
+func (m *MethodDescriptorProto) String() string            { return proto.CompactTextString(m) }
+func (*MethodDescriptorProto) ProtoMessage()               {}
+func (*MethodDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+
+const Default_MethodDescriptorProto_ClientStreaming bool = false
+const Default_MethodDescriptorProto_ServerStreaming bool = false
+
+func (m *MethodDescriptorProto) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *MethodDescriptorProto) GetInputType() string {
+	if m != nil && m.InputType != nil {
+		return *m.InputType
+	}
+	return ""
+}
+
+func (m *MethodDescriptorProto) GetOutputType() string {
+	if m != nil && m.OutputType != nil {
+		return *m.OutputType
+	}
+	return ""
+}
+
+func (m *MethodDescriptorProto) GetOptions() *MethodOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
+func (m *MethodDescriptorProto) GetClientStreaming() bool {
+	if m != nil && m.ClientStreaming != nil {
+		return *m.ClientStreaming
+	}
+	return Default_MethodDescriptorProto_ClientStreaming
+}
+
+func (m *MethodDescriptorProto) GetServerStreaming() bool {
+	if m != nil && m.ServerStreaming != nil {
+		return *m.ServerStreaming
+	}
+	return Default_MethodDescriptorProto_ServerStreaming
+}
+
+type FileOptions struct {
+	// Sets the Java package where classes generated from this .proto will be
+	// placed.  By default, the proto package is used, but this is often
+	// inappropriate because proto packages do not normally start with backwards
+	// domain names.
+	JavaPackage *string `protobuf:"bytes,1,opt,name=java_package" json:"java_package,omitempty"`
+	// If set, all the classes from the .proto file are wrapped in a single
+	// outer class with the given name.  This applies to both Proto1
+	// (equivalent to the old "--one_java_file" option) and Proto2 (where
+	// a .proto always translates to a single class, but you may want to
+	// explicitly choose the class name).
+	JavaOuterClassname *string `protobuf:"bytes,8,opt,name=java_outer_classname" json:"java_outer_classname,omitempty"`
+	// If set true, then the Java code generator will generate a separate .java
+	// file for each top-level message, enum, and service defined in the .proto
+	// file.  Thus, these types will *not* be nested inside the outer class
+	// named by java_outer_classname.  However, the outer class will still be
+	// generated to contain the file's getDescriptor() method as well as any
+	// top-level extensions defined in the file.
+	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,def=0" json:"java_multiple_files,omitempty"`
+	// If set true, then the Java code generator will generate equals() and
+	// hashCode() methods for all messages defined in the .proto file.
+	// - In the full runtime, this is purely a speed optimization, as the
+	// AbstractMessage base class includes reflection-based implementations of
+	// these methods.
+	// - In the lite runtime, setting this option changes the semantics of
+	// equals() and hashCode() to more closely match those of the full runtime;
+	// the generated methods compute their results based on field values rather
+	// than object identity. (Implementations should not assume that hashcodes
+	// will be consistent across runtimes or versions of the protocol compiler.)
+	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,def=0" json:"java_generate_equals_and_hash,omitempty"`
+	// If set true, then the Java2 code generator will generate code that
+	// throws an exception whenever an attempt is made to assign a non-UTF-8
+	// byte sequence to a string field.
+	// Message reflection will do the same.
+	// However, an extension field still accepts non-UTF-8 byte sequences.
+	// This option has no effect on when used with the lite runtime.
+	JavaStringCheckUtf8 *bool                     `protobuf:"varint,27,opt,name=java_string_check_utf8,def=0" json:"java_string_check_utf8,omitempty"`
+	OptimizeFor         *FileOptions_OptimizeMode `protobuf:"varint,9,opt,name=optimize_for,enum=google.protobuf.FileOptions_OptimizeMode,def=1" json:"optimize_for,omitempty"`
+	// Sets the Go package where structs generated from this .proto will be
+	// placed. If omitted, the Go package will be derived from the following:
+	//   - The basename of the package import path, if provided.
+	//   - Otherwise, the package statement in the .proto file, if present.
+	//   - Otherwise, the basename of the .proto file, without extension.
+	GoPackage *string `protobuf:"bytes,11,opt,name=go_package" json:"go_package,omitempty"`
+	// Should generic services be generated in each language?  "Generic" services
+	// are not specific to any particular RPC system.  They are generated by the
+	// main code generators in each language (without additional plugins).
+	// Generic services were the only kind of service generation supported by
+	// early versions of google.protobuf.
+	//
+	// Generic services are now considered deprecated in favor of using plugins
+	// that generate code specific to your particular RPC system.  Therefore,
+	// these default to false.  Old code which depends on generic services should
+	// explicitly set them to true.
+	CcGenericServices   *bool `protobuf:"varint,16,opt,name=cc_generic_services,def=0" json:"cc_generic_services,omitempty"`
+	JavaGenericServices *bool `protobuf:"varint,17,opt,name=java_generic_services,def=0" json:"java_generic_services,omitempty"`
+	PyGenericServices   *bool `protobuf:"varint,18,opt,name=py_generic_services,def=0" json:"py_generic_services,omitempty"`
+	// Is this file deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for everything in the file, or it will be completely ignored; in the very
+	// least, this is a formalization for deprecating files.
+	Deprecated *bool `protobuf:"varint,23,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// Enables the use of arenas for the proto messages in this file. This applies
+	// only to generated classes for C++.
+	CcEnableArenas *bool `protobuf:"varint,31,opt,name=cc_enable_arenas,def=0" json:"cc_enable_arenas,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *FileOptions) Reset()                    { *m = FileOptions{} }
+func (m *FileOptions) String() string            { return proto.CompactTextString(m) }
+func (*FileOptions) ProtoMessage()               {}
+func (*FileOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+
+var extRange_FileOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*FileOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_FileOptions
+}
+func (m *FileOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_FileOptions_JavaMultipleFiles bool = false
+const Default_FileOptions_JavaGenerateEqualsAndHash bool = false
+const Default_FileOptions_JavaStringCheckUtf8 bool = false
+const Default_FileOptions_OptimizeFor FileOptions_OptimizeMode = FileOptions_SPEED
+const Default_FileOptions_CcGenericServices bool = false
+const Default_FileOptions_JavaGenericServices bool = false
+const Default_FileOptions_PyGenericServices bool = false
+const Default_FileOptions_Deprecated bool = false
+const Default_FileOptions_CcEnableArenas bool = false
+
+func (m *FileOptions) GetJavaPackage() string {
+	if m != nil && m.JavaPackage != nil {
+		return *m.JavaPackage
+	}
+	return ""
+}
+
+func (m *FileOptions) GetJavaOuterClassname() string {
+	if m != nil && m.JavaOuterClassname != nil {
+		return *m.JavaOuterClassname
+	}
+	return ""
+}
+
+func (m *FileOptions) GetJavaMultipleFiles() bool {
+	if m != nil && m.JavaMultipleFiles != nil {
+		return *m.JavaMultipleFiles
+	}
+	return Default_FileOptions_JavaMultipleFiles
+}
+
+func (m *FileOptions) GetJavaGenerateEqualsAndHash() bool {
+	if m != nil && m.JavaGenerateEqualsAndHash != nil {
+		return *m.JavaGenerateEqualsAndHash
+	}
+	return Default_FileOptions_JavaGenerateEqualsAndHash
+}
+
+func (m *FileOptions) GetJavaStringCheckUtf8() bool {
+	if m != nil && m.JavaStringCheckUtf8 != nil {
+		return *m.JavaStringCheckUtf8
+	}
+	return Default_FileOptions_JavaStringCheckUtf8
+}
+
+func (m *FileOptions) GetOptimizeFor() FileOptions_OptimizeMode {
+	if m != nil && m.OptimizeFor != nil {
+		return *m.OptimizeFor
+	}
+	return Default_FileOptions_OptimizeFor
+}
+
+func (m *FileOptions) GetGoPackage() string {
+	if m != nil && m.GoPackage != nil {
+		return *m.GoPackage
+	}
+	return ""
+}
+
+func (m *FileOptions) GetCcGenericServices() bool {
+	if m != nil && m.CcGenericServices != nil {
+		return *m.CcGenericServices
+	}
+	return Default_FileOptions_CcGenericServices
+}
+
+func (m *FileOptions) GetJavaGenericServices() bool {
+	if m != nil && m.JavaGenericServices != nil {
+		return *m.JavaGenericServices
+	}
+	return Default_FileOptions_JavaGenericServices
+}
+
+func (m *FileOptions) GetPyGenericServices() bool {
+	if m != nil && m.PyGenericServices != nil {
+		return *m.PyGenericServices
+	}
+	return Default_FileOptions_PyGenericServices
+}
+
+func (m *FileOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_FileOptions_Deprecated
+}
+
+func (m *FileOptions) GetCcEnableArenas() bool {
+	if m != nil && m.CcEnableArenas != nil {
+		return *m.CcEnableArenas
+	}
+	return Default_FileOptions_CcEnableArenas
+}
+
+func (m *FileOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type MessageOptions struct {
+	// Set true to use the old proto1 MessageSet wire format for extensions.
+	// This is provided for backwards-compatibility with the MessageSet wire
+	// format.  You should not use this for any other reason:  It's less
+	// efficient, has fewer features, and is more complicated.
+	//
+	// The message must be defined exactly as follows:
+	//   message Foo {
+	//     option message_set_wire_format = true;
+	//     extensions 4 to max;
+	//   }
+	// Note that the message cannot have any defined fields; MessageSets only
+	// have extensions.
+	//
+	// All extensions of your type must be singular messages; e.g. they cannot
+	// be int32s, enums, or repeated messages.
+	//
+	// Because this is an option, the above two restrictions are not enforced by
+	// the protocol compiler.
+	MessageSetWireFormat *bool `protobuf:"varint,1,opt,name=message_set_wire_format,def=0" json:"message_set_wire_format,omitempty"`
+	// Disables the generation of the standard "descriptor()" accessor, which can
+	// conflict with a field of the same name.  This is meant to make migration
+	// from proto1 easier; new code should avoid fields named "descriptor".
+	NoStandardDescriptorAccessor *bool `protobuf:"varint,2,opt,name=no_standard_descriptor_accessor,def=0" json:"no_standard_descriptor_accessor,omitempty"`
+	// Is this message deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the message, or it will be completely ignored; in the very least,
+	// this is a formalization for deprecating messages.
+	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// Whether the message is an automatically generated map entry type for the
+	// maps field.
+	//
+	// For maps fields:
+	//     map<KeyType, ValueType> map_field = 1;
+	// The parsed descriptor looks like:
+	//     message MapFieldEntry {
+	//         option map_entry = true;
+	//         optional KeyType key = 1;
+	//         optional ValueType value = 2;
+	//     }
+	//     repeated MapFieldEntry map_field = 1;
+	//
+	// Implementations may choose not to generate the map_entry=true message, but
+	// use a native map in the target language to hold the keys and values.
+	// The reflection APIs in such implementions still need to work as
+	// if the field is a repeated message field.
+	//
+	// NOTE: Do not set the option in .proto files. Always use the maps syntax
+	// instead. The option should only be implicitly set by the proto compiler
+	// parser.
+	MapEntry *bool `protobuf:"varint,7,opt,name=map_entry" json:"map_entry,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *MessageOptions) Reset()                    { *m = MessageOptions{} }
+func (m *MessageOptions) String() string            { return proto.CompactTextString(m) }
+func (*MessageOptions) ProtoMessage()               {}
+func (*MessageOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+
+var extRange_MessageOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*MessageOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_MessageOptions
+}
+func (m *MessageOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_MessageOptions_MessageSetWireFormat bool = false
+const Default_MessageOptions_NoStandardDescriptorAccessor bool = false
+const Default_MessageOptions_Deprecated bool = false
+
+func (m *MessageOptions) GetMessageSetWireFormat() bool {
+	if m != nil && m.MessageSetWireFormat != nil {
+		return *m.MessageSetWireFormat
+	}
+	return Default_MessageOptions_MessageSetWireFormat
+}
+
+func (m *MessageOptions) GetNoStandardDescriptorAccessor() bool {
+	if m != nil && m.NoStandardDescriptorAccessor != nil {
+		return *m.NoStandardDescriptorAccessor
+	}
+	return Default_MessageOptions_NoStandardDescriptorAccessor
+}
+
+func (m *MessageOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_MessageOptions_Deprecated
+}
+
+func (m *MessageOptions) GetMapEntry() bool {
+	if m != nil && m.MapEntry != nil {
+		return *m.MapEntry
+	}
+	return false
+}
+
+func (m *MessageOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type FieldOptions struct {
+	// The ctype option instructs the C++ code generator to use a different
+	// representation of the field than it normally would.  See the specific
+	// options below.  This option is not yet implemented in the open source
+	// release -- sorry, we'll try to include it in a future version!
+	Ctype *FieldOptions_CType `protobuf:"varint,1,opt,name=ctype,enum=google.protobuf.FieldOptions_CType,def=0" json:"ctype,omitempty"`
+	// The packed option can be enabled for repeated primitive fields to enable
+	// a more efficient representation on the wire. Rather than repeatedly
+	// writing the tag and type for each element, the entire array is encoded as
+	// a single length-delimited blob.
+	Packed *bool `protobuf:"varint,2,opt,name=packed" json:"packed,omitempty"`
+	// Should this field be parsed lazily?  Lazy applies only to message-type
+	// fields.  It means that when the outer message is initially parsed, the
+	// inner message's contents will not be parsed but instead stored in encoded
+	// form.  The inner message will actually be parsed when it is first accessed.
+	//
+	// This is only a hint.  Implementations are free to choose whether to use
+	// eager or lazy parsing regardless of the value of this option.  However,
+	// setting this option true suggests that the protocol author believes that
+	// using lazy parsing on this field is worth the additional bookkeeping
+	// overhead typically needed to implement it.
+	//
+	// This option does not affect the public interface of any generated code;
+	// all method signatures remain the same.  Furthermore, thread-safety of the
+	// interface is not affected by this option; const methods remain safe to
+	// call from multiple threads concurrently, while non-const methods continue
+	// to require exclusive access.
+	//
+	//
+	// Note that implementations may choose not to check required fields within
+	// a lazy sub-message.  That is, calling IsInitialized() on the outher message
+	// may return true even if the inner message has missing required fields.
+	// This is necessary because otherwise the inner message would have to be
+	// parsed in order to perform the check, defeating the purpose of lazy
+	// parsing.  An implementation which chooses not to check required fields
+	// must be consistent about it.  That is, for any particular sub-message, the
+	// implementation must either *always* check its required fields, or *never*
+	// check its required fields, regardless of whether or not the message has
+	// been parsed.
+	Lazy *bool `protobuf:"varint,5,opt,name=lazy,def=0" json:"lazy,omitempty"`
+	// Is this field deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for accessors, or it will be completely ignored; in the very least, this
+	// is a formalization for deprecating fields.
+	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// For Google-internal migration only. Do not use.
+	Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *FieldOptions) Reset()                    { *m = FieldOptions{} }
+func (m *FieldOptions) String() string            { return proto.CompactTextString(m) }
+func (*FieldOptions) ProtoMessage()               {}
+func (*FieldOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+
+var extRange_FieldOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*FieldOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_FieldOptions
+}
+func (m *FieldOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_FieldOptions_Ctype FieldOptions_CType = FieldOptions_STRING
+const Default_FieldOptions_Lazy bool = false
+const Default_FieldOptions_Deprecated bool = false
+const Default_FieldOptions_Weak bool = false
+
+func (m *FieldOptions) GetCtype() FieldOptions_CType {
+	if m != nil && m.Ctype != nil {
+		return *m.Ctype
+	}
+	return Default_FieldOptions_Ctype
+}
+
+func (m *FieldOptions) GetPacked() bool {
+	if m != nil && m.Packed != nil {
+		return *m.Packed
+	}
+	return false
+}
+
+func (m *FieldOptions) GetLazy() bool {
+	if m != nil && m.Lazy != nil {
+		return *m.Lazy
+	}
+	return Default_FieldOptions_Lazy
+}
+
+func (m *FieldOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_FieldOptions_Deprecated
+}
+
+func (m *FieldOptions) GetWeak() bool {
+	if m != nil && m.Weak != nil {
+		return *m.Weak
+	}
+	return Default_FieldOptions_Weak
+}
+
+func (m *FieldOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type EnumOptions struct {
+	// Set this option to true to allow mapping different tag names to the same
+	// value.
+	AllowAlias *bool `protobuf:"varint,2,opt,name=allow_alias" json:"allow_alias,omitempty"`
+	// Is this enum deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the enum, or it will be completely ignored; in the very least, this
+	// is a formalization for deprecating enums.
+	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *EnumOptions) Reset()                    { *m = EnumOptions{} }
+func (m *EnumOptions) String() string            { return proto.CompactTextString(m) }
+func (*EnumOptions) ProtoMessage()               {}
+func (*EnumOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+
+var extRange_EnumOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*EnumOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_EnumOptions
+}
+func (m *EnumOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_EnumOptions_Deprecated bool = false
+
+func (m *EnumOptions) GetAllowAlias() bool {
+	if m != nil && m.AllowAlias != nil {
+		return *m.AllowAlias
+	}
+	return false
+}
+
+func (m *EnumOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_EnumOptions_Deprecated
+}
+
+func (m *EnumOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type EnumValueOptions struct {
+	// Is this enum value deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the enum value, or it will be completely ignored; in the very least,
+	// this is a formalization for deprecating enum values.
+	Deprecated *bool `protobuf:"varint,1,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *EnumValueOptions) Reset()                    { *m = EnumValueOptions{} }
+func (m *EnumValueOptions) String() string            { return proto.CompactTextString(m) }
+func (*EnumValueOptions) ProtoMessage()               {}
+func (*EnumValueOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+
+var extRange_EnumValueOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*EnumValueOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_EnumValueOptions
+}
+func (m *EnumValueOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_EnumValueOptions_Deprecated bool = false
+
+func (m *EnumValueOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_EnumValueOptions_Deprecated
+}
+
+func (m *EnumValueOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type ServiceOptions struct {
+	// Is this service deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the service, or it will be completely ignored; in the very least,
+	// this is a formalization for deprecating services.
+	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *ServiceOptions) Reset()                    { *m = ServiceOptions{} }
+func (m *ServiceOptions) String() string            { return proto.CompactTextString(m) }
+func (*ServiceOptions) ProtoMessage()               {}
+func (*ServiceOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+
+var extRange_ServiceOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*ServiceOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_ServiceOptions
+}
+func (m *ServiceOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_ServiceOptions_Deprecated bool = false
+
+func (m *ServiceOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_ServiceOptions_Deprecated
+}
+
+func (m *ServiceOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+type MethodOptions struct {
+	// Is this method deprecated?
+	// Depending on the target platform, this can emit Deprecated annotations
+	// for the method, or it will be completely ignored; in the very least,
+	// this is a formalization for deprecating methods.
+	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
+	XXX_extensions      map[int32]proto.Extension `json:"-"`
+	XXX_unrecognized    []byte                    `json:"-"`
+}
+
+func (m *MethodOptions) Reset()                    { *m = MethodOptions{} }
+func (m *MethodOptions) String() string            { return proto.CompactTextString(m) }
+func (*MethodOptions) ProtoMessage()               {}
+func (*MethodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+
+var extRange_MethodOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*MethodOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_MethodOptions
+}
+func (m *MethodOptions) ExtensionMap() map[int32]proto.Extension {
+	if m.XXX_extensions == nil {
+		m.XXX_extensions = make(map[int32]proto.Extension)
+	}
+	return m.XXX_extensions
+}
+
+const Default_MethodOptions_Deprecated bool = false
+
+func (m *MethodOptions) GetDeprecated() bool {
+	if m != nil && m.Deprecated != nil {
+		return *m.Deprecated
+	}
+	return Default_MethodOptions_Deprecated
+}
+
+func (m *MethodOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
+// A message representing a option the parser does not recognize. This only
+// appears in options protos created by the compiler::Parser class.
+// DescriptorPool resolves these when building Descriptor objects. Therefore,
+// options protos in descriptor objects (e.g. returned by Descriptor::options(),
+// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
+// in them.
+type UninterpretedOption struct {
+	Name []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
+	// The value of the uninterpreted option, in whatever type the tokenizer
+	// identified it as during parsing. Exactly one of these should be set.
+	IdentifierValue  *string  `protobuf:"bytes,3,opt,name=identifier_value" json:"identifier_value,omitempty"`
+	PositiveIntValue *uint64  `protobuf:"varint,4,opt,name=positive_int_value" json:"positive_int_value,omitempty"`
+	NegativeIntValue *int64   `protobuf:"varint,5,opt,name=negative_int_value" json:"negative_int_value,omitempty"`
+	DoubleValue      *float64 `protobuf:"fixed64,6,opt,name=double_value" json:"double_value,omitempty"`
+	StringValue      []byte   `protobuf:"bytes,7,opt,name=string_value" json:"string_value,omitempty"`
+	AggregateValue   *string  `protobuf:"bytes,8,opt,name=aggregate_value" json:"aggregate_value,omitempty"`
+	XXX_unrecognized []byte   `json:"-"`
+}
+
+func (m *UninterpretedOption) Reset()                    { *m = UninterpretedOption{} }
+func (m *UninterpretedOption) String() string            { return proto.CompactTextString(m) }
+func (*UninterpretedOption) ProtoMessage()               {}
+func (*UninterpretedOption) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+
+func (m *UninterpretedOption) GetName() []*UninterpretedOption_NamePart {
+	if m != nil {
+		return m.Name
+	}
+	return nil
+}
+
+func (m *UninterpretedOption) GetIdentifierValue() string {
+	if m != nil && m.IdentifierValue != nil {
+		return *m.IdentifierValue
+	}
+	return ""
+}
+
+func (m *UninterpretedOption) GetPositiveIntValue() uint64 {
+	if m != nil && m.PositiveIntValue != nil {
+		return *m.PositiveIntValue
+	}
+	return 0
+}
+
+func (m *UninterpretedOption) GetNegativeIntValue() int64 {
+	if m != nil && m.NegativeIntValue != nil {
+		return *m.NegativeIntValue
+	}
+	return 0
+}
+
+func (m *UninterpretedOption) GetDoubleValue() float64 {
+	if m != nil && m.DoubleValue != nil {
+		return *m.DoubleValue
+	}
+	return 0
+}
+
+func (m *UninterpretedOption) GetStringValue() []byte {
+	if m != nil {
+		return m.StringValue
+	}
+	return nil
+}
+
+func (m *UninterpretedOption) GetAggregateValue() string {
+	if m != nil && m.AggregateValue != nil {
+		return *m.AggregateValue
+	}
+	return ""
+}
+
+// The name of the uninterpreted option.  Each string represents a segment in
+// a dot-separated name.  is_extension is true iff a segment represents an
+// extension (denoted with parentheses in options specs in .proto files).
+// E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
+// "foo.(bar.baz).qux".
+type UninterpretedOption_NamePart struct {
+	NamePart         *string `protobuf:"bytes,1,req,name=name_part" json:"name_part,omitempty"`
+	IsExtension      *bool   `protobuf:"varint,2,req,name=is_extension" json:"is_extension,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *UninterpretedOption_NamePart) Reset()         { *m = UninterpretedOption_NamePart{} }
+func (m *UninterpretedOption_NamePart) String() string { return proto.CompactTextString(m) }
+func (*UninterpretedOption_NamePart) ProtoMessage()    {}
+func (*UninterpretedOption_NamePart) Descriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{16, 0}
+}
+
+func (m *UninterpretedOption_NamePart) GetNamePart() string {
+	if m != nil && m.NamePart != nil {
+		return *m.NamePart
+	}
+	return ""
+}
+
+func (m *UninterpretedOption_NamePart) GetIsExtension() bool {
+	if m != nil && m.IsExtension != nil {
+		return *m.IsExtension
+	}
+	return false
+}
+
+// Encapsulates information about the original source file from which a
+// FileDescriptorProto was generated.
+type SourceCodeInfo struct {
+	// A Location identifies a piece of source code in a .proto file which
+	// corresponds to a particular definition.  This information is intended
+	// to be useful to IDEs, code indexers, documentation generators, and similar
+	// tools.
+	//
+	// For example, say we have a file like:
+	//   message Foo {
+	//     optional string foo = 1;
+	//   }
+	// Let's look at just the field definition:
+	//   optional string foo = 1;
+	//   ^       ^^     ^^  ^  ^^^
+	//   a       bc     de  f  ghi
+	// We have the following locations:
+	//   span   path               represents
+	//   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
+	//   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
+	//   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
+	//   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
+	//   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
+	//
+	// Notes:
+	// - A location may refer to a repeated field itself (i.e. not to any
+	//   particular index within it).  This is used whenever a set of elements are
+	//   logically enclosed in a single code segment.  For example, an entire
+	//   extend block (possibly containing multiple extension definitions) will
+	//   have an outer location whose path refers to the "extensions" repeated
+	//   field without an index.
+	// - Multiple locations may have the same path.  This happens when a single
+	//   logical declaration is spread out across multiple places.  The most
+	//   obvious example is the "extend" block again -- there may be multiple
+	//   extend blocks in the same scope, each of which will have the same path.
+	// - A location's span is not always a subset of its parent's span.  For
+	//   example, the "extendee" of an extension declaration appears at the
+	//   beginning of the "extend" block and is shared by all extensions within
+	//   the block.
+	// - Just because a location's span is a subset of some other location's span
+	//   does not mean that it is a descendent.  For example, a "group" defines
+	//   both a type and a field in a single declaration.  Thus, the locations
+	//   corresponding to the type and field and their components will overlap.
+	// - Code which tries to interpret locations should probably be designed to
+	//   ignore those that it doesn't understand, as more types of locations could
+	//   be recorded in the future.
+	Location         []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
+	XXX_unrecognized []byte                     `json:"-"`
+}
+
+func (m *SourceCodeInfo) Reset()                    { *m = SourceCodeInfo{} }
+func (m *SourceCodeInfo) String() string            { return proto.CompactTextString(m) }
+func (*SourceCodeInfo) ProtoMessage()               {}
+func (*SourceCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+
+func (m *SourceCodeInfo) GetLocation() []*SourceCodeInfo_Location {
+	if m != nil {
+		return m.Location
+	}
+	return nil
+}
+
+type SourceCodeInfo_Location struct {
+	// Identifies which part of the FileDescriptorProto was defined at this
+	// location.
+	//
+	// Each element is a field number or an index.  They form a path from
+	// the root FileDescriptorProto to the place where the definition.  For
+	// example, this path:
+	//   [ 4, 3, 2, 7, 1 ]
+	// refers to:
+	//   file.message_type(3)  // 4, 3
+	//       .field(7)         // 2, 7
+	//       .name()           // 1
+	// This is because FileDescriptorProto.message_type has field number 4:
+	//   repeated DescriptorProto message_type = 4;
+	// and DescriptorProto.field has field number 2:
+	//   repeated FieldDescriptorProto field = 2;
+	// and FieldDescriptorProto.name has field number 1:
+	//   optional string name = 1;
+	//
+	// Thus, the above path gives the location of a field name.  If we removed
+	// the last element:
+	//   [ 4, 3, 2, 7 ]
+	// this path refers to the whole field declaration (from the beginning
+	// of the label to the terminating semicolon).
+	Path []int32 `protobuf:"varint,1,rep,packed,name=path" json:"path,omitempty"`
+	// Always has exactly three or four elements: start line, start column,
+	// end line (optional, otherwise assumed same as start line), end column.
+	// These are packed into a single field for efficiency.  Note that line
+	// and column numbers are zero-based -- typically you will want to add
+	// 1 to each before displaying to a user.
+	Span []int32 `protobuf:"varint,2,rep,packed,name=span" json:"span,omitempty"`
+	// If this SourceCodeInfo represents a complete declaration, these are any
+	// comments appearing before and after the declaration which appear to be
+	// attached to the declaration.
+	//
+	// A series of line comments appearing on consecutive lines, with no other
+	// tokens appearing on those lines, will be treated as a single comment.
+	//
+	// Only the comment content is provided; comment markers (e.g. //) are
+	// stripped out.  For block comments, leading whitespace and an asterisk
+	// will be stripped from the beginning of each line other than the first.
+	// Newlines are included in the output.
+	//
+	// Examples:
+	//
+	//   optional int32 foo = 1;  // Comment attached to foo.
+	//   // Comment attached to bar.
+	//   optional int32 bar = 2;
+	//
+	//   optional string baz = 3;
+	//   // Comment attached to baz.
+	//   // Another line attached to baz.
+	//
+	//   // Comment attached to qux.
+	//   //
+	//   // Another line attached to qux.
+	//   optional double qux = 4;
+	//
+	//   optional string corge = 5;
+	//   /* Block comment attached
+	//    * to corge.  Leading asterisks
+	//    * will be removed. */
+	//   /* Block comment attached to
+	//    * grault. */
+	//   optional int32 grault = 6;
+	LeadingComments  *string `protobuf:"bytes,3,opt,name=leading_comments" json:"leading_comments,omitempty"`
+	TrailingComments *string `protobuf:"bytes,4,opt,name=trailing_comments" json:"trailing_comments,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *SourceCodeInfo_Location) Reset()                    { *m = SourceCodeInfo_Location{} }
+func (m *SourceCodeInfo_Location) String() string            { return proto.CompactTextString(m) }
+func (*SourceCodeInfo_Location) ProtoMessage()               {}
+func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17, 0} }
+
+func (m *SourceCodeInfo_Location) GetPath() []int32 {
+	if m != nil {
+		return m.Path
+	}
+	return nil
+}
+
+func (m *SourceCodeInfo_Location) GetSpan() []int32 {
+	if m != nil {
+		return m.Span
+	}
+	return nil
+}
+
+func (m *SourceCodeInfo_Location) GetLeadingComments() string {
+	if m != nil && m.LeadingComments != nil {
+		return *m.LeadingComments
+	}
+	return ""
+}
+
+func (m *SourceCodeInfo_Location) GetTrailingComments() string {
+	if m != nil && m.TrailingComments != nil {
+		return *m.TrailingComments
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*FileDescriptorSet)(nil), "google.protobuf.FileDescriptorSet")
+	proto.RegisterType((*FileDescriptorProto)(nil), "google.protobuf.FileDescriptorProto")
+	proto.RegisterType((*DescriptorProto)(nil), "google.protobuf.DescriptorProto")
+	proto.RegisterType((*DescriptorProto_ExtensionRange)(nil), "google.protobuf.DescriptorProto.ExtensionRange")
+	proto.RegisterType((*FieldDescriptorProto)(nil), "google.protobuf.FieldDescriptorProto")
+	proto.RegisterType((*OneofDescriptorProto)(nil), "google.protobuf.OneofDescriptorProto")
+	proto.RegisterType((*EnumDescriptorProto)(nil), "google.protobuf.EnumDescriptorProto")
+	proto.RegisterType((*EnumValueDescriptorProto)(nil), "google.protobuf.EnumValueDescriptorProto")
+	proto.RegisterType((*ServiceDescriptorProto)(nil), "google.protobuf.ServiceDescriptorProto")
+	proto.RegisterType((*MethodDescriptorProto)(nil), "google.protobuf.MethodDescriptorProto")
+	proto.RegisterType((*FileOptions)(nil), "google.protobuf.FileOptions")
+	proto.RegisterType((*MessageOptions)(nil), "google.protobuf.MessageOptions")
+	proto.RegisterType((*FieldOptions)(nil), "google.protobuf.FieldOptions")
+	proto.RegisterType((*EnumOptions)(nil), "google.protobuf.EnumOptions")
+	proto.RegisterType((*EnumValueOptions)(nil), "google.protobuf.EnumValueOptions")
+	proto.RegisterType((*ServiceOptions)(nil), "google.protobuf.ServiceOptions")
+	proto.RegisterType((*MethodOptions)(nil), "google.protobuf.MethodOptions")
+	proto.RegisterType((*UninterpretedOption)(nil), "google.protobuf.UninterpretedOption")
+	proto.RegisterType((*UninterpretedOption_NamePart)(nil), "google.protobuf.UninterpretedOption.NamePart")
+	proto.RegisterType((*SourceCodeInfo)(nil), "google.protobuf.SourceCodeInfo")
+	proto.RegisterType((*SourceCodeInfo_Location)(nil), "google.protobuf.SourceCodeInfo.Location")
+	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Type", FieldDescriptorProto_Type_name, FieldDescriptorProto_Type_value)
+	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Label", FieldDescriptorProto_Label_name, FieldDescriptorProto_Label_value)
+	proto.RegisterEnum("google.protobuf.FileOptions_OptimizeMode", FileOptions_OptimizeMode_name, FileOptions_OptimizeMode_value)
+	proto.RegisterEnum("google.protobuf.FieldOptions_CType", FieldOptions_CType_name, FieldOptions_CType_value)
+}
+
+var fileDescriptor0 = []byte{
+	// 1635 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x72, 0xdb, 0xd4,
+	0x17, 0xff, 0xfb, 0x43, 0xfe, 0x38, 0x76, 0x1c, 0x45, 0x49, 0x5b, 0x35, 0xff, 0x96, 0xb4, 0xa6,
+	0x2d, 0x69, 0x69, 0x1d, 0x26, 0x2d, 0xa5, 0x84, 0x55, 0x3e, 0xd4, 0xd4, 0x33, 0x4e, 0x6c, 0x12,
+	0x87, 0xa1, 0x6c, 0x34, 0x37, 0xf2, 0xb5, 0xa3, 0x56, 0x96, 0x8c, 0x24, 0xa7, 0x4d, 0x19, 0x66,
+	0x78, 0x00, 0x98, 0xe1, 0x09, 0x18, 0x5e, 0x81, 0x0d, 0x2b, 0x36, 0xec, 0x79, 0x03, 0xb6, 0x0c,
+	0xf0, 0x18, 0x9c, 0x7b, 0xaf, 0x25, 0x4b, 0x8a, 0x9d, 0xb6, 0x4c, 0x4b, 0x57, 0xee, 0xb9, 0xbf,
+	0x73, 0xce, 0xef, 0x9e, 0xcf, 0xab, 0xc0, 0x95, 0x9e, 0xe3, 0xf4, 0x2c, 0xba, 0x32, 0x70, 0x1d,
+	0xdf, 0x39, 0x1c, 0x76, 0x57, 0x3a, 0xd4, 0x33, 0x5c, 0x73, 0xe0, 0x3b, 0x6e, 0x8d, 0xcb, 0x94,
+	0x59, 0x81, 0xa8, 0x05, 0x88, 0xea, 0x36, 0xcc, 0x3d, 0x34, 0x2d, 0xba, 0x15, 0x02, 0xf7, 0xa9,
+	0xaf, 0xac, 0x42, 0xb6, 0x8b, 0x42, 0x35, 0x75, 0x25, 0xb3, 0x5c, 0x5a, 0xbd, 0x56, 0x4b, 0x28,
+	0xd5, 0xe2, 0x1a, 0x2d, 0x26, 0xae, 0xfe, 0x9e, 0x81, 0xf9, 0x09, 0x72, 0xa5, 0x0c, 0x59, 0x9b,
+	0xf4, 0x99, 0xad, 0xd4, 0x72, 0x51, 0x99, 0x85, 0xfc, 0x80, 0x18, 0x4f, 0x49, 0x8f, 0xaa, 0x69,
+	0x2e, 0x50, 0x00, 0x3a, 0x74, 0x40, 0xed, 0x0e, 0xb5, 0x8d, 0x13, 0x35, 0x83, 0x0e, 0x8b, 0xca,
+	0x45, 0x98, 0x1b, 0x0c, 0x0f, 0x2d, 0xd3, 0xd0, 0x23, 0x47, 0x80, 0x47, 0x92, 0x72, 0x01, 0x66,
+	0x9f, 0x51, 0xf2, 0x34, 0x7a, 0x50, 0xe2, 0x07, 0xf7, 0xa1, 0xdc, 0xa7, 0x9e, 0x87, 0x86, 0x75,
+	0xff, 0x64, 0x40, 0xd5, 0x2c, 0xa7, 0x7e, 0xe5, 0x14, 0xf5, 0x24, 0xbd, 0x8f, 0xa0, 0x48, 0xed,
+	0x61, 0x5f, 0x28, 0x49, 0x53, 0xee, 0xab, 0x21, 0x22, 0xa9, 0xf8, 0x00, 0xf2, 0x1e, 0x75, 0x8f,
+	0x4d, 0x83, 0xaa, 0x39, 0xae, 0xf6, 0xde, 0x29, 0xb5, 0x7d, 0x71, 0x7e, 0x5a, 0xb3, 0x48, 0x9f,
+	0xfb, 0xd4, 0xf6, 0x4c, 0xc7, 0x56, 0xf3, 0x5c, 0xf7, 0xfa, 0x84, 0x10, 0x53, 0xab, 0x93, 0xd4,
+	0xbc, 0x03, 0x79, 0x67, 0xe0, 0xa3, 0x9a, 0xa7, 0x16, 0x30, 0x7a, 0xa5, 0xd5, 0x4b, 0x13, 0x53,
+	0xd3, 0x14, 0x18, 0xe5, 0x63, 0x90, 0x3d, 0x67, 0xe8, 0x1a, 0x54, 0x37, 0x9c, 0x0e, 0xd5, 0x4d,
+	0xbb, 0xeb, 0xa8, 0x45, 0xae, 0xb7, 0x74, 0x9a, 0x2b, 0x07, 0x6e, 0x22, 0xae, 0x8e, 0x30, 0xa5,
+	0x02, 0x39, 0xef, 0xc4, 0xf6, 0xc9, 0x73, 0xb5, 0xcc, 0xd2, 0x54, 0xfd, 0x23, 0x03, 0xb3, 0x67,
+	0x67, 0xf6, 0x1e, 0x48, 0x5d, 0xc6, 0x19, 0xf3, 0xfa, 0x1a, 0x37, 0x8a, 0xc5, 0x22, 0xf7, 0x3a,
+	0x9a, 0x1f, 0x42, 0xc9, 0xa6, 0x9e, 0x4f, 0x3b, 0x22, 0x75, 0x99, 0x7f, 0x93, 0xef, 0xec, 0x6b,
+	0xe4, 0xfb, 0x11, 0xcc, 0x86, 0x4c, 0x75, 0x97, 0xd8, 0xbd, 0xa0, 0x5c, 0x56, 0x5e, 0xe6, 0xb3,
+	0xa6, 0x05, 0x7a, 0x7b, 0x4c, 0x0d, 0xd3, 0x02, 0x8e, 0x4d, 0x9d, 0x2e, 0x16, 0xb1, 0x61, 0x61,
+	0x22, 0x27, 0x5f, 0xba, 0xc9, 0x20, 0x49, 0x12, 0x1f, 0x8c, 0x0b, 0x20, 0x3f, 0x25, 0x91, 0x3b,
+	0xa2, 0x0b, 0x46, 0x35, 0xb0, 0x78, 0x1b, 0x2a, 0x09, 0xf7, 0x33, 0x20, 0x79, 0x3e, 0x71, 0x7d,
+	0x9e, 0x37, 0x49, 0x29, 0x41, 0x06, 0x3b, 0x89, 0x77, 0xa3, 0x54, 0xfd, 0x45, 0x82, 0x85, 0x89,
+	0xd1, 0x8e, 0xe7, 0x1a, 0xab, 0x03, 0x23, 0x74, 0x48, 0x5d, 0x0c, 0x3b, 0xb3, 0xb1, 0x06, 0x92,
+	0x45, 0x0e, 0xa9, 0x85, 0x01, 0x4d, 0x2d, 0x57, 0x56, 0xdf, 0x7f, 0xa5, 0x0c, 0xd6, 0x1a, 0x4c,
+	0x05, 0x2b, 0x20, 0x3b, 0xea, 0x3d, 0xa6, 0x7a, 0xeb, 0xd5, 0x54, 0xdb, 0xa8, 0xa1, 0xcc, 0x41,
+	0x91, 0x69, 0xea, 0x9c, 0x58, 0x8e, 0x13, 0x93, 0xa1, 0xc0, 0x93, 0xd4, 0xa1, 0xc1, 0x7c, 0x39,
+	0x07, 0x33, 0x1d, 0xda, 0x25, 0x43, 0xcb, 0xd7, 0x8f, 0x89, 0x35, 0xa4, 0x3c, 0x6e, 0x45, 0x65,
+	0x1e, 0x4a, 0x22, 0x07, 0x26, 0x62, 0x9f, 0xf3, 0xae, 0x90, 0x98, 0xc1, 0x27, 0x1e, 0x66, 0x97,
+	0x1b, 0x04, 0x8e, 0xab, 0x25, 0x3b, 0xee, 0xf2, 0x64, 0x82, 0xa3, 0x70, 0x57, 0x7f, 0x4e, 0x43,
+	0x96, 0x93, 0x9b, 0x85, 0x52, 0xfb, 0x71, 0x4b, 0xd3, 0xb7, 0x9a, 0x07, 0x1b, 0x0d, 0x4d, 0x4e,
+	0x61, 0xcc, 0x80, 0x0b, 0x1e, 0x36, 0x9a, 0xeb, 0x6d, 0x39, 0x1d, 0xfe, 0xbf, 0xbe, 0xdb, 0xbe,
+	0x7f, 0x4f, 0xce, 0x84, 0x0a, 0x07, 0x42, 0x90, 0x8d, 0x02, 0xee, 0xae, 0xca, 0x12, 0xde, 0xad,
+	0x2c, 0x0c, 0xd4, 0x3f, 0xd7, 0xb6, 0x10, 0x91, 0x8b, 0x4b, 0x10, 0x93, 0xc7, 0xdc, 0x16, 0xb9,
+	0x64, 0xa3, 0xd9, 0x6c, 0xc8, 0x85, 0xd0, 0xe6, 0x7e, 0x7b, 0xaf, 0xbe, 0xbb, 0x2d, 0x17, 0x43,
+	0x9b, 0xdb, 0x7b, 0xcd, 0x83, 0x96, 0x0c, 0xa1, 0x85, 0x1d, 0x6d, 0x7f, 0x7f, 0x7d, 0x5b, 0x93,
+	0x4b, 0x21, 0x62, 0xe3, 0x71, 0x5b, 0xdb, 0x97, 0xcb, 0x31, 0x5a, 0xe8, 0x62, 0x26, 0x74, 0xa1,
+	0xed, 0x1e, 0xec, 0xc8, 0x15, 0x8c, 0xd9, 0x8c, 0x70, 0x11, 0x90, 0x98, 0x4d, 0x88, 0x90, 0xa9,
+	0x3c, 0x26, 0x22, 0xac, 0xcc, 0xc5, 0x04, 0x88, 0x50, 0xaa, 0x9b, 0x20, 0x89, 0x7a, 0x50, 0xa0,
+	0xd2, 0x58, 0xdf, 0xd0, 0x1a, 0x7a, 0xb3, 0xd5, 0xae, 0x37, 0x77, 0xd7, 0x1b, 0x18, 0xbb, 0x50,
+	0xb6, 0xa7, 0x7d, 0x7a, 0x50, 0xdf, 0xd3, 0xb6, 0x30, 0x7e, 0x11, 0x59, 0x4b, 0x5b, 0x6f, 0xa3,
+	0x2c, 0x53, 0xbd, 0x06, 0x0b, 0x13, 0xdb, 0x26, 0x56, 0xbd, 0xd5, 0x6f, 0x53, 0x30, 0x3f, 0xa9,
+	0xc3, 0xe3, 0x35, 0xfe, 0x00, 0x24, 0x51, 0x30, 0x62, 0x9e, 0xdd, 0x9c, 0x38, 0x24, 0x3e, 0x63,
+	0x88, 0x33, 0xa6, 0x74, 0x66, 0xca, 0x94, 0x66, 0xba, 0x41, 0xc9, 0x58, 0xa0, 0x4e, 0x35, 0x35,
+	0xad, 0xed, 0x78, 0xb7, 0xe2, 0x9a, 0x4e, 0x38, 0xba, 0x3a, 0x9d, 0x64, 0xe0, 0xed, 0xfb, 0x14,
+	0x9c, 0x9f, 0xb2, 0x97, 0xe2, 0xce, 0xee, 0x43, 0xae, 0x4f, 0xfd, 0x23, 0x27, 0x18, 0xe8, 0x37,
+	0x26, 0x4c, 0x1a, 0x76, 0x7c, 0xc6, 0x88, 0xca, 0x4c, 0xdb, 0x35, 0xc2, 0x7f, 0x40, 0xe9, 0xd7,
+	0x14, 0x9c, 0x9b, 0x6c, 0x2b, 0xce, 0x08, 0x9f, 0x0a, 0xa6, 0x3d, 0x18, 0xfa, 0x62, 0x76, 0xa7,
+	0xc3, 0x3e, 0x1e, 0xfa, 0xa1, 0x30, 0xc3, 0x85, 0x2b, 0x63, 0x0a, 0x59, 0x4e, 0xe1, 0x9d, 0x29,
+	0xdc, 0x83, 0x45, 0xb9, 0x04, 0xb2, 0x61, 0x99, 0xd4, 0xf6, 0x75, 0xcf, 0x77, 0x29, 0xe9, 0x9b,
+	0x76, 0x8f, 0xcf, 0xa3, 0xc2, 0x9a, 0xd4, 0x25, 0x96, 0x47, 0x19, 0x80, 0x2d, 0x7b, 0xea, 0x46,
+	0x00, 0xb9, 0x08, 0xa0, 0xfa, 0x5b, 0x16, 0x4a, 0xd1, 0xd5, 0xbb, 0x00, 0xe5, 0x27, 0xe4, 0x98,
+	0xe8, 0xc1, 0x63, 0x47, 0xdc, 0xe0, 0x12, 0x2c, 0x70, 0x29, 0x52, 0x46, 0x53, 0x86, 0x45, 0x3c,
+	0x8f, 0xdf, 0xaf, 0xc0, 0x4f, 0xab, 0x30, 0xcf, 0x4f, 0xfb, 0x38, 0xac, 0xcc, 0x81, 0x45, 0x75,
+	0xf6, 0x06, 0xf3, 0xf8, 0x20, 0x0a, 0x89, 0xdc, 0x86, 0xcb, 0x1c, 0xd3, 0xa3, 0x36, 0x75, 0x89,
+	0x4f, 0x75, 0xfa, 0xe5, 0x10, 0x0f, 0x74, 0x62, 0x77, 0xf4, 0x23, 0xe2, 0x1d, 0xa9, 0x0b, 0x51,
+	0xf4, 0x75, 0x38, 0xcf, 0xd1, 0x48, 0x1a, 0x19, 0xeb, 0xc6, 0x11, 0x35, 0x9e, 0xea, 0x43, 0xbf,
+	0xfb, 0x40, 0xfd, 0x7f, 0x14, 0xf6, 0x10, 0xca, 0x2c, 0x5e, 0x7d, 0xf3, 0x05, 0xfa, 0x74, 0x5c,
+	0x3e, 0x0d, 0x2b, 0x13, 0x2a, 0x3e, 0x72, 0xc1, 0x5a, 0x73, 0xa4, 0xb0, 0x83, 0x2f, 0x86, 0x35,
+	0x69, 0xbf, 0xa5, 0x69, 0x5b, 0x2c, 0x41, 0x3d, 0x27, 0xbc, 0x72, 0x29, 0xb8, 0x94, 0x61, 0x08,
+	0xba, 0xf8, 0x9e, 0x1b, 0xbd, 0x98, 0x3c, 0x55, 0x8e, 0xfa, 0xbf, 0x06, 0xe7, 0xc6, 0x97, 0x8a,
+	0xa2, 0xe6, 0xa2, 0x28, 0xb4, 0x34, 0x38, 0x39, 0x8d, 0x51, 0xa2, 0x98, 0x8b, 0xfc, 0x35, 0xe9,
+	0x52, 0x03, 0x43, 0xd3, 0x51, 0x2f, 0x24, 0x52, 0x88, 0x44, 0xa8, 0x4d, 0x0e, 0x31, 0xb2, 0xc4,
+	0xc5, 0x1f, 0x9e, 0xba, 0x14, 0x05, 0x6c, 0xc2, 0xc2, 0xd0, 0x36, 0x6d, 0xcc, 0x0c, 0x1a, 0x60,
+	0xef, 0x0a, 0x51, 0x43, 0xea, 0x5f, 0xf9, 0x29, 0xaf, 0x84, 0x83, 0x28, 0x5a, 0xc4, 0xa5, 0xba,
+	0x06, 0xe5, 0x68, 0x64, 0x94, 0x22, 0x88, 0xd8, 0xe0, 0x10, 0xc3, 0xc1, 0xb9, 0xd9, 0xdc, 0x62,
+	0x23, 0xef, 0x0b, 0x0d, 0xe7, 0x17, 0x8e, 0xde, 0x46, 0xbd, 0xad, 0xe9, 0x7b, 0x07, 0xbb, 0xed,
+	0xfa, 0x8e, 0x26, 0x67, 0x6e, 0x15, 0x0b, 0x7f, 0xe7, 0xe5, 0x6f, 0xf0, 0x5f, 0xba, 0xfa, 0x67,
+	0x0a, 0x2a, 0xf1, 0x45, 0xae, 0xdc, 0x80, 0x0b, 0xc1, 0x03, 0xd7, 0xa3, 0xbe, 0xfe, 0xcc, 0x74,
+	0x79, 0xb2, 0xfa, 0x44, 0x2c, 0xf2, 0xf0, 0x1a, 0x35, 0x58, 0xb2, 0x1d, 0xcc, 0x38, 0x56, 0x04,
+	0x71, 0x3b, 0xfa, 0xf8, 0x0b, 0x40, 0x27, 0x06, 0xc6, 0xcb, 0x73, 0xc4, 0xf4, 0x98, 0x12, 0xb2,
+	0x4c, 0xf4, 0x08, 0xf7, 0x61, 0x9f, 0x0c, 0x30, 0x66, 0xbe, 0x7b, 0xc2, 0xf7, 0x66, 0xe1, 0x8d,
+	0x04, 0x29, 0x7a, 0xd1, 0x1f, 0xd3, 0x50, 0x8e, 0x2e, 0x50, 0xf6, 0x94, 0x30, 0x78, 0x2b, 0xa7,
+	0x78, 0x11, 0xbe, 0x7b, 0xe6, 0xba, 0xad, 0x6d, 0xb2, 0x5d, 0xbb, 0x96, 0x13, 0xfb, 0x8d, 0xcd,
+	0x47, 0x56, 0x7c, 0x54, 0xbc, 0x66, 0x0a, 0x38, 0x1c, 0xb2, 0x16, 0x79, 0x71, 0x12, 0x6f, 0xe5,
+	0x33, 0xee, 0x8b, 0x78, 0xf6, 0x71, 0x11, 0xef, 0xb8, 0x37, 0x52, 0x16, 0x2b, 0x20, 0x71, 0xaa,
+	0xd8, 0x21, 0x23, 0xb2, 0xf2, 0xff, 0x94, 0x02, 0x64, 0x37, 0x9b, 0x7b, 0xac, 0x34, 0xb0, 0x16,
+	0x84, 0x54, 0x6f, 0xd5, 0xb5, 0x4d, 0xac, 0x8e, 0x68, 0x88, 0xbe, 0x4b, 0x41, 0x29, 0xb2, 0x2f,
+	0xd8, 0xc8, 0x23, 0x96, 0xe5, 0x3c, 0xd3, 0x89, 0x65, 0x62, 0x0d, 0x8b, 0xab, 0x9e, 0x71, 0xab,
+	0x37, 0x9d, 0xb2, 0xaf, 0x41, 0x4e, 0x6e, 0x95, 0x84, 0xfb, 0xd4, 0xdb, 0x74, 0xff, 0x15, 0x54,
+	0xe2, 0xfb, 0x23, 0xe1, 0xfc, 0xea, 0xdb, 0x74, 0xfe, 0x02, 0x66, 0xe2, 0x9b, 0xe3, 0x3f, 0xf4,
+	0xfd, 0x43, 0x1a, 0xe6, 0x27, 0x40, 0x94, 0x4f, 0x46, 0x4b, 0x52, 0xac, 0xe9, 0x3b, 0xaf, 0x62,
+	0xb6, 0xb6, 0x8b, 0x0a, 0x2d, 0xfc, 0x06, 0x50, 0x54, 0x90, 0x4d, 0xfc, 0x8c, 0xf6, 0x4d, 0xfc,
+	0x76, 0x73, 0x47, 0x2f, 0x64, 0xb1, 0x44, 0x17, 0x41, 0x19, 0x38, 0x9e, 0xe9, 0x9b, 0xc7, 0xec,
+	0xcb, 0x31, 0x78, 0x3d, 0xb3, 0x7d, 0x9a, 0x65, 0x67, 0x36, 0xed, 0x91, 0xc4, 0x19, 0x6b, 0xb3,
+	0x0c, 0xdb, 0x7c, 0x1d, 0x67, 0xc8, 0x86, 0xac, 0x90, 0xb2, 0x35, 0x99, 0x62, 0xd2, 0xd1, 0x12,
+	0x1a, 0xbf, 0xc2, 0xcb, 0xec, 0x6b, 0x9e, 0xf4, 0x7a, 0x2e, 0x33, 0x15, 0xc0, 0xf9, 0x2a, 0x5c,
+	0xbc, 0x0b, 0x85, 0x90, 0x22, 0x4e, 0x21, 0x76, 0x3f, 0xdc, 0x2b, 0xfc, 0x9b, 0x25, 0x8d, 0xdc,
+	0xd0, 0x9a, 0xe9, 0xe9, 0xe3, 0x0f, 0xc7, 0x34, 0x4a, 0x0b, 0xd5, 0x9f, 0x70, 0x68, 0x26, 0x3e,
+	0x63, 0xd7, 0xa0, 0x60, 0x39, 0x98, 0x1b, 0x06, 0x12, 0x7f, 0xcc, 0x58, 0x7e, 0xc9, 0x97, 0x6f,
+	0xad, 0x31, 0xc2, 0x2f, 0x1a, 0x50, 0x08, 0x7e, 0x63, 0x83, 0x66, 0x07, 0xc4, 0x3f, 0xe2, 0x36,
+	0xa4, 0x8d, 0x34, 0x6f, 0xd9, 0xac, 0x37, 0x20, 0x36, 0x8f, 0xba, 0x90, 0x60, 0x28, 0x2d, 0x4a,
+	0x3a, 0x7c, 0xd1, 0x3a, 0xfd, 0x3e, 0x06, 0xd5, 0x1b, 0x85, 0xf2, 0x22, 0xcc, 0xf9, 0x2e, 0x31,
+	0xad, 0xd8, 0x11, 0x8b, 0x64, 0x71, 0xe3, 0x26, 0xae, 0x47, 0xa7, 0x9f, 0xe4, 0xb4, 0x21, 0x27,
+	0x5e, 0x42, 0xde, 0xa3, 0xd4, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xe5, 0x5c, 0x96, 0xdd,
+	0x11, 0x00, 0x00,
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/doc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/doc.go
new file mode 100644
index 0000000000..0d6055d610
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/doc.go
@@ -0,0 +1,51 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+	A plugin for the Google protocol buffer compiler to generate Go code.
+	Run it by building this program and putting it in your path with the name
+		protoc-gen-go
+	That word 'go' at the end becomes part of the option string set for the
+	protocol compiler, so once the protocol compiler (protoc) is installed
+	you can run
+		protoc --go_out=output_directory input_directory/file.proto
+	to generate Go bindings for the protocol defined by file.proto.
+	With that input, the output will be written to
+		output_directory/file.pb.go
+
+	The generated code is documented in the package comment for
+	the library.
+
+	See the README and documentation for protocol buffers to learn more:
+		https://developers.google.com/protocol-buffers/
+
+*/
+package documentation
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
new file mode 100644
index 0000000000..c2c96bf720
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
@@ -0,0 +1,2715 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+	The code generator for the plugin for the Google protocol buffer compiler.
+	It generates Go code from the protocol buffer description files read by the
+	main routine.
+*/
+package generator
+
+import (
+	"bufio"
+	"bytes"
+	"compress/gzip"
+	"fmt"
+	"go/parser"
+	"go/printer"
+	"go/token"
+	"log"
+	"os"
+	"path"
+	"strconv"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"github.com/golang/protobuf/proto"
+
+	"github.com/golang/protobuf/protoc-gen-go/descriptor"
+	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
+)
+
+// generatedCodeVersion indicates a version of the generated code.
+// It is incremented whenever an incompatibility between the generated code and
+// proto package is introduced; the generated code references
+// a constant, proto.ProtoPackageIsVersionN (where N is generatedCodeVersion).
+const generatedCodeVersion = 1
+
+// A Plugin provides functionality to add to the output during Go code generation,
+// such as to produce RPC stubs.
+type Plugin interface {
+	// Name identifies the plugin.
+	Name() string
+	// Init is called once after data structures are built but before
+	// code generation begins.
+	Init(g *Generator)
+	// Generate produces the code generated by the plugin for this file,
+	// except for the imports, by calling the generator's methods P, In, and Out.
+	Generate(file *FileDescriptor)
+	// GenerateImports produces the import declarations for this file.
+	// It is called after Generate.
+	GenerateImports(file *FileDescriptor)
+}
+
+var plugins []Plugin
+
+// RegisterPlugin installs a (second-order) plugin to be run when the Go output is generated.
+// It is typically called during initialization.
+func RegisterPlugin(p Plugin) {
+	plugins = append(plugins, p)
+}
+
+// Each type we import as a protocol buffer (other than FileDescriptorProto) needs
+// a pointer to the FileDescriptorProto that represents it.  These types achieve that
+// wrapping by placing each Proto inside a struct with the pointer to its File. The
+// structs have the same names as their contents, with "Proto" removed.
+// FileDescriptor is used to store the things that it points to.
+
+// The file and package name method are common to messages and enums.
+type common struct {
+	file *descriptor.FileDescriptorProto // File this object comes from.
+}
+
+// PackageName is name in the package clause in the generated file.
+func (c *common) PackageName() string { return uniquePackageOf(c.file) }
+
+func (c *common) File() *descriptor.FileDescriptorProto { return c.file }
+
+func fileIsProto3(file *descriptor.FileDescriptorProto) bool {
+	return file.GetSyntax() == "proto3"
+}
+
+func (c *common) proto3() bool { return fileIsProto3(c.file) }
+
+// Descriptor represents a protocol buffer message.
+type Descriptor struct {
+	common
+	*descriptor.DescriptorProto
+	parent   *Descriptor            // The containing message, if any.
+	nested   []*Descriptor          // Inner messages, if any.
+	enums    []*EnumDescriptor      // Inner enums, if any.
+	ext      []*ExtensionDescriptor // Extensions, if any.
+	typename []string               // Cached typename vector.
+	index    int                    // The index into the container, whether the file or another message.
+	path     string                 // The SourceCodeInfo path as comma-separated integers.
+	group    bool
+}
+
+// TypeName returns the elements of the dotted type name.
+// The package name is not part of this name.
+func (d *Descriptor) TypeName() []string {
+	if d.typename != nil {
+		return d.typename
+	}
+	n := 0
+	for parent := d; parent != nil; parent = parent.parent {
+		n++
+	}
+	s := make([]string, n, n)
+	for parent := d; parent != nil; parent = parent.parent {
+		n--
+		s[n] = parent.GetName()
+	}
+	d.typename = s
+	return s
+}
+
+// EnumDescriptor describes an enum. If it's at top level, its parent will be nil.
+// Otherwise it will be the descriptor of the message in which it is defined.
+type EnumDescriptor struct {
+	common
+	*descriptor.EnumDescriptorProto
+	parent   *Descriptor // The containing message, if any.
+	typename []string    // Cached typename vector.
+	index    int         // The index into the container, whether the file or a message.
+	path     string      // The SourceCodeInfo path as comma-separated integers.
+}
+
+// TypeName returns the elements of the dotted type name.
+// The package name is not part of this name.
+func (e *EnumDescriptor) TypeName() (s []string) {
+	if e.typename != nil {
+		return e.typename
+	}
+	name := e.GetName()
+	if e.parent == nil {
+		s = make([]string, 1)
+	} else {
+		pname := e.parent.TypeName()
+		s = make([]string, len(pname)+1)
+		copy(s, pname)
+	}
+	s[len(s)-1] = name
+	e.typename = s
+	return s
+}
+
+// Everything but the last element of the full type name, CamelCased.
+// The values of type Foo.Bar are call Foo_value1... not Foo_Bar_value1... .
+func (e *EnumDescriptor) prefix() string {
+	if e.parent == nil {
+		// If the enum is not part of a message, the prefix is just the type name.
+		return CamelCase(*e.Name) + "_"
+	}
+	typeName := e.TypeName()
+	return CamelCaseSlice(typeName[0:len(typeName)-1]) + "_"
+}
+
+// The integer value of the named constant in this enumerated type.
+func (e *EnumDescriptor) integerValueAsString(name string) string {
+	for _, c := range e.Value {
+		if c.GetName() == name {
+			return fmt.Sprint(c.GetNumber())
+		}
+	}
+	log.Fatal("cannot find value for enum constant")
+	return ""
+}
+
+// ExtensionDescriptor describes an extension. If it's at top level, its parent will be nil.
+// Otherwise it will be the descriptor of the message in which it is defined.
+type ExtensionDescriptor struct {
+	common
+	*descriptor.FieldDescriptorProto
+	parent *Descriptor // The containing message, if any.
+}
+
+// TypeName returns the elements of the dotted type name.
+// The package name is not part of this name.
+func (e *ExtensionDescriptor) TypeName() (s []string) {
+	name := e.GetName()
+	if e.parent == nil {
+		// top-level extension
+		s = make([]string, 1)
+	} else {
+		pname := e.parent.TypeName()
+		s = make([]string, len(pname)+1)
+		copy(s, pname)
+	}
+	s[len(s)-1] = name
+	return s
+}
+
+// DescName returns the variable name used for the generated descriptor.
+func (e *ExtensionDescriptor) DescName() string {
+	// The full type name.
+	typeName := e.TypeName()
+	// Each scope of the extension is individually CamelCased, and all are joined with "_" with an "E_" prefix.
+	for i, s := range typeName {
+		typeName[i] = CamelCase(s)
+	}
+	return "E_" + strings.Join(typeName, "_")
+}
+
+// ImportedDescriptor describes a type that has been publicly imported from another file.
+type ImportedDescriptor struct {
+	common
+	o Object
+}
+
+func (id *ImportedDescriptor) TypeName() []string { return id.o.TypeName() }
+
+// FileDescriptor describes an protocol buffer descriptor file (.proto).
+// It includes slices of all the messages and enums defined within it.
+// Those slices are constructed by WrapTypes.
+type FileDescriptor struct {
+	*descriptor.FileDescriptorProto
+	desc []*Descriptor          // All the messages defined in this file.
+	enum []*EnumDescriptor      // All the enums defined in this file.
+	ext  []*ExtensionDescriptor // All the top-level extensions defined in this file.
+	imp  []*ImportedDescriptor  // All types defined in files publicly imported by this file.
+
+	// Comments, stored as a map of path (comma-separated integers) to the comment.
+	comments map[string]*descriptor.SourceCodeInfo_Location
+
+	// The full list of symbols that are exported,
+	// as a map from the exported object to its symbols.
+	// This is used for supporting public imports.
+	exported map[Object][]symbol
+
+	index int // The index of this file in the list of files to generate code for
+
+	proto3 bool // whether to generate proto3 code for this file
+}
+
+// PackageName is the package name we'll use in the generated code to refer to this file.
+func (d *FileDescriptor) PackageName() string { return uniquePackageOf(d.FileDescriptorProto) }
+
+// goPackageName returns the Go package name to use in the
+// generated Go file.  The result explicit reports whether the name
+// came from an option go_package statement.  If explicit is false,
+// the name was derived from the protocol buffer's package statement
+// or the input file name.
+func (d *FileDescriptor) goPackageName() (name string, explicit bool) {
+	// Does the file have a "go_package" option?
+	if opts := d.Options; opts != nil {
+		if pkg := opts.GetGoPackage(); pkg != "" {
+			return pkg, true
+		}
+	}
+
+	// Does the file have a package clause?
+	if pkg := d.GetPackage(); pkg != "" {
+		return pkg, false
+	}
+	// Use the file base name.
+	return baseName(d.GetName()), false
+}
+
+func (d *FileDescriptor) addExport(obj Object, sym symbol) {
+	d.exported[obj] = append(d.exported[obj], sym)
+}
+
+// symbol is an interface representing an exported Go symbol.
+type symbol interface {
+	// GenerateAlias should generate an appropriate alias
+	// for the symbol from the named package.
+	GenerateAlias(g *Generator, pkg string)
+}
+
+type messageSymbol struct {
+	sym                         string
+	hasExtensions, isMessageSet bool
+	hasOneof                    bool
+	getters                     []getterSymbol
+}
+
+type getterSymbol struct {
+	name     string
+	typ      string
+	typeName string // canonical name in proto world; empty for proto.Message and similar
+	genType  bool   // whether typ contains a generated type (message/group/enum)
+}
+
+func (ms *messageSymbol) GenerateAlias(g *Generator, pkg string) {
+	remoteSym := pkg + "." + ms.sym
+
+	g.P("type ", ms.sym, " ", remoteSym)
+	g.P("func (m *", ms.sym, ") Reset() { (*", remoteSym, ")(m).Reset() }")
+	g.P("func (m *", ms.sym, ") String() string { return (*", remoteSym, ")(m).String() }")
+	g.P("func (*", ms.sym, ") ProtoMessage() {}")
+	if ms.hasExtensions {
+		g.P("func (*", ms.sym, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange ",
+			"{ return (*", remoteSym, ")(nil).ExtensionRangeArray() }")
+		g.P("func (m *", ms.sym, ") ExtensionMap() map[int32]", g.Pkg["proto"], ".Extension ",
+			"{ return (*", remoteSym, ")(m).ExtensionMap() }")
+		if ms.isMessageSet {
+			g.P("func (m *", ms.sym, ") Marshal() ([]byte, error) ",
+				"{ return (*", remoteSym, ")(m).Marshal() }")
+			g.P("func (m *", ms.sym, ") Unmarshal(buf []byte) error ",
+				"{ return (*", remoteSym, ")(m).Unmarshal(buf) }")
+		}
+	}
+	if ms.hasOneof {
+		// Oneofs and public imports do not mix well.
+		// We can make them work okay for the binary format,
+		// but they're going to break weirdly for text/JSON.
+		enc := "_" + ms.sym + "_OneofMarshaler"
+		dec := "_" + ms.sym + "_OneofUnmarshaler"
+		size := "_" + ms.sym + "_OneofSizer"
+		encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error"
+		decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)"
+		sizeSig := "(msg " + g.Pkg["proto"] + ".Message) int"
+		g.P("func (m *", ms.sym, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {")
+		g.P("return ", enc, ", ", dec, ", ", size, ", nil")
+		g.P("}")
+
+		g.P("func ", enc, encSig, " {")
+		g.P("m := msg.(*", ms.sym, ")")
+		g.P("m0 := (*", remoteSym, ")(m)")
+		g.P("enc, _, _, _ := m0.XXX_OneofFuncs()")
+		g.P("return enc(m0, b)")
+		g.P("}")
+
+		g.P("func ", dec, decSig, " {")
+		g.P("m := msg.(*", ms.sym, ")")
+		g.P("m0 := (*", remoteSym, ")(m)")
+		g.P("_, dec, _, _ := m0.XXX_OneofFuncs()")
+		g.P("return dec(m0, tag, wire, b)")
+		g.P("}")
+
+		g.P("func ", size, sizeSig, " {")
+		g.P("m := msg.(*", ms.sym, ")")
+		g.P("m0 := (*", remoteSym, ")(m)")
+		g.P("_, _, size, _ := m0.XXX_OneofFuncs()")
+		g.P("return size(m0)")
+		g.P("}")
+	}
+	for _, get := range ms.getters {
+
+		if get.typeName != "" {
+			g.RecordTypeUse(get.typeName)
+		}
+		typ := get.typ
+		val := "(*" + remoteSym + ")(m)." + get.name + "()"
+		if get.genType {
+			// typ will be "*pkg.T" (message/group) or "pkg.T" (enum)
+			// or "map[t]*pkg.T" (map to message/enum).
+			// The first two of those might have a "[]" prefix if it is repeated.
+			// Drop any package qualifier since we have hoisted the type into this package.
+			rep := strings.HasPrefix(typ, "[]")
+			if rep {
+				typ = typ[2:]
+			}
+			isMap := strings.HasPrefix(typ, "map[")
+			star := typ[0] == '*'
+			if !isMap { // map types handled lower down
+				typ = typ[strings.Index(typ, ".")+1:]
+			}
+			if star {
+				typ = "*" + typ
+			}
+			if rep {
+				// Go does not permit conversion between slice types where both
+				// element types are named. That means we need to generate a bit
+				// of code in this situation.
+				// typ is the element type.
+				// val is the expression to get the slice from the imported type.
+
+				ctyp := typ // conversion type expression; "Foo" or "(*Foo)"
+				if star {
+					ctyp = "(" + typ + ")"
+				}
+
+				g.P("func (m *", ms.sym, ") ", get.name, "() []", typ, " {")
+				g.In()
+				g.P("o := ", val)
+				g.P("if o == nil {")
+				g.In()
+				g.P("return nil")
+				g.Out()
+				g.P("}")
+				g.P("s := make([]", typ, ", len(o))")
+				g.P("for i, x := range o {")
+				g.In()
+				g.P("s[i] = ", ctyp, "(x)")
+				g.Out()
+				g.P("}")
+				g.P("return s")
+				g.Out()
+				g.P("}")
+				continue
+			}
+			if isMap {
+				// Split map[keyTyp]valTyp.
+				bra, ket := strings.Index(typ, "["), strings.Index(typ, "]")
+				keyTyp, valTyp := typ[bra+1:ket], typ[ket+1:]
+				// Drop any package qualifier.
+				// Only the value type may be foreign.
+				star := valTyp[0] == '*'
+				valTyp = valTyp[strings.Index(valTyp, ".")+1:]
+				if star {
+					valTyp = "*" + valTyp
+				}
+
+				typ := "map[" + keyTyp + "]" + valTyp
+				g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " {")
+				g.P("o := ", val)
+				g.P("if o == nil { return nil }")
+				g.P("s := make(", typ, ", len(o))")
+				g.P("for k, v := range o {")
+				g.P("s[k] = (", valTyp, ")(v)")
+				g.P("}")
+				g.P("return s")
+				g.P("}")
+				continue
+			}
+			// Convert imported type into the forwarding type.
+			val = "(" + typ + ")(" + val + ")"
+		}
+
+		g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " { return ", val, " }")
+	}
+
+}
+
+type enumSymbol struct {
+	name   string
+	proto3 bool // Whether this came from a proto3 file.
+}
+
+func (es enumSymbol) GenerateAlias(g *Generator, pkg string) {
+	s := es.name
+	g.P("type ", s, " ", pkg, ".", s)
+	g.P("var ", s, "_name = ", pkg, ".", s, "_name")
+	g.P("var ", s, "_value = ", pkg, ".", s, "_value")
+	g.P("func (x ", s, ") String() string { return (", pkg, ".", s, ")(x).String() }")
+	if !es.proto3 {
+		g.P("func (x ", s, ") Enum() *", s, "{ return (*", s, ")((", pkg, ".", s, ")(x).Enum()) }")
+		g.P("func (x *", s, ") UnmarshalJSON(data []byte) error { return (*", pkg, ".", s, ")(x).UnmarshalJSON(data) }")
+	}
+}
+
+type constOrVarSymbol struct {
+	sym  string
+	typ  string // either "const" or "var"
+	cast string // if non-empty, a type cast is required (used for enums)
+}
+
+func (cs constOrVarSymbol) GenerateAlias(g *Generator, pkg string) {
+	v := pkg + "." + cs.sym
+	if cs.cast != "" {
+		v = cs.cast + "(" + v + ")"
+	}
+	g.P(cs.typ, " ", cs.sym, " = ", v)
+}
+
+// Object is an interface abstracting the abilities shared by enums, messages, extensions and imported objects.
+type Object interface {
+	PackageName() string // The name we use in our output (a_b_c), possibly renamed for uniqueness.
+	TypeName() []string
+	File() *descriptor.FileDescriptorProto
+}
+
+// Each package name we generate must be unique. The package we're generating
+// gets its own name but every other package must have a unique name that does
+// not conflict in the code we generate.  These names are chosen globally (although
+// they don't have to be, it simplifies things to do them globally).
+func uniquePackageOf(fd *descriptor.FileDescriptorProto) string {
+	s, ok := uniquePackageName[fd]
+	if !ok {
+		log.Fatal("internal error: no package name defined for " + fd.GetName())
+	}
+	return s
+}
+
+// Generator is the type whose methods generate the output, stored in the associated response structure.
+type Generator struct {
+	*bytes.Buffer
+
+	Request  *plugin.CodeGeneratorRequest  // The input.
+	Response *plugin.CodeGeneratorResponse // The output.
+
+	Param             map[string]string // Command-line parameters.
+	PackageImportPath string            // Go import path of the package we're generating code for
+	ImportPrefix      string            // String to prefix to imported package file names.
+	ImportMap         map[string]string // Mapping from import name to generated name
+
+	Pkg map[string]string // The names under which we import support packages
+
+	packageName      string                     // What we're calling ourselves.
+	allFiles         []*FileDescriptor          // All files in the tree
+	allFilesByName   map[string]*FileDescriptor // All files by filename.
+	genFiles         []*FileDescriptor          // Those files we will generate output for.
+	file             *FileDescriptor            // The file we are compiling now.
+	usedPackages     map[string]bool            // Names of packages used in current file.
+	typeNameToObject map[string]Object          // Key is a fully-qualified name in input syntax.
+	init             []string                   // Lines to emit in the init function.
+	indent           string
+	writeOutput      bool
+}
+
+// New creates a new generator and allocates the request and response protobufs.
+func New() *Generator {
+	g := new(Generator)
+	g.Buffer = new(bytes.Buffer)
+	g.Request = new(plugin.CodeGeneratorRequest)
+	g.Response = new(plugin.CodeGeneratorResponse)
+	return g
+}
+
+// Error reports a problem, including an error, and exits the program.
+func (g *Generator) Error(err error, msgs ...string) {
+	s := strings.Join(msgs, " ") + ":" + err.Error()
+	log.Print("protoc-gen-go: error:", s)
+	os.Exit(1)
+}
+
+// Fail reports a problem and exits the program.
+func (g *Generator) Fail(msgs ...string) {
+	s := strings.Join(msgs, " ")
+	log.Print("protoc-gen-go: error:", s)
+	os.Exit(1)
+}
+
+// CommandLineParameters breaks the comma-separated list of key=value pairs
+// in the parameter (a member of the request protobuf) into a key/value map.
+// It then sets file name mappings defined by those entries.
+func (g *Generator) CommandLineParameters(parameter string) {
+	g.Param = make(map[string]string)
+	for _, p := range strings.Split(parameter, ",") {
+		if i := strings.Index(p, "="); i < 0 {
+			g.Param[p] = ""
+		} else {
+			g.Param[p[0:i]] = p[i+1:]
+		}
+	}
+
+	g.ImportMap = make(map[string]string)
+	pluginList := "none" // Default list of plugin names to enable (empty means all).
+	for k, v := range g.Param {
+		switch k {
+		case "import_prefix":
+			g.ImportPrefix = v
+		case "import_path":
+			g.PackageImportPath = v
+		case "plugins":
+			pluginList = v
+		default:
+			if len(k) > 0 && k[0] == 'M' {
+				g.ImportMap[k[1:]] = v
+			}
+		}
+	}
+
+	if pluginList != "" {
+		// Amend the set of plugins.
+		enabled := make(map[string]bool)
+		for _, name := range strings.Split(pluginList, "+") {
+			enabled[name] = true
+		}
+		var nplugins []Plugin
+		for _, p := range plugins {
+			if enabled[p.Name()] {
+				nplugins = append(nplugins, p)
+			}
+		}
+		plugins = nplugins
+	}
+}
+
+// DefaultPackageName returns the package name printed for the object.
+// If its file is in a different package, it returns the package name we're using for this file, plus ".".
+// Otherwise it returns the empty string.
+func (g *Generator) DefaultPackageName(obj Object) string {
+	pkg := obj.PackageName()
+	if pkg == g.packageName {
+		return ""
+	}
+	return pkg + "."
+}
+
+// For each input file, the unique package name to use, underscored.
+var uniquePackageName = make(map[*descriptor.FileDescriptorProto]string)
+
+// Package names already registered.  Key is the name from the .proto file;
+// value is the name that appears in the generated code.
+var pkgNamesInUse = make(map[string]bool)
+
+// Create and remember a guaranteed unique package name for this file descriptor.
+// Pkg is the candidate name.  If f is nil, it's a builtin package like "proto" and
+// has no file descriptor.
+func RegisterUniquePackageName(pkg string, f *FileDescriptor) string {
+	// Convert dots to underscores before finding a unique alias.
+	pkg = strings.Map(badToUnderscore, pkg)
+
+	for i, orig := 1, pkg; pkgNamesInUse[pkg]; i++ {
+		// It's a duplicate; must rename.
+		pkg = orig + strconv.Itoa(i)
+	}
+	// Install it.
+	pkgNamesInUse[pkg] = true
+	if f != nil {
+		uniquePackageName[f.FileDescriptorProto] = pkg
+	}
+	return pkg
+}
+
+var isGoKeyword = map[string]bool{
+	"break":       true,
+	"case":        true,
+	"chan":        true,
+	"const":       true,
+	"continue":    true,
+	"default":     true,
+	"else":        true,
+	"defer":       true,
+	"fallthrough": true,
+	"for":         true,
+	"func":        true,
+	"go":          true,
+	"goto":        true,
+	"if":          true,
+	"import":      true,
+	"interface":   true,
+	"map":         true,
+	"package":     true,
+	"range":       true,
+	"return":      true,
+	"select":      true,
+	"struct":      true,
+	"switch":      true,
+	"type":        true,
+	"var":         true,
+}
+
+// defaultGoPackage returns the package name to use,
+// derived from the import path of the package we're building code for.
+func (g *Generator) defaultGoPackage() string {
+	p := g.PackageImportPath
+	if i := strings.LastIndex(p, "/"); i >= 0 {
+		p = p[i+1:]
+	}
+	if p == "" {
+		return ""
+	}
+
+	p = strings.Map(badToUnderscore, p)
+	// Identifier must not be keyword: insert _.
+	if isGoKeyword[p] {
+		p = "_" + p
+	}
+	// Identifier must not begin with digit: insert _.
+	if r, _ := utf8.DecodeRuneInString(p); unicode.IsDigit(r) {
+		p = "_" + p
+	}
+	return p
+}
+
+// SetPackageNames sets the package name for this run.
+// The package name must agree across all files being generated.
+// It also defines unique package names for all imported files.
+func (g *Generator) SetPackageNames() {
+	// Register the name for this package.  It will be the first name
+	// registered so is guaranteed to be unmodified.
+	pkg, explicit := g.genFiles[0].goPackageName()
+
+	// Check all files for an explicit go_package option.
+	for _, f := range g.genFiles {
+		thisPkg, thisExplicit := f.goPackageName()
+		if thisExplicit {
+			if !explicit {
+				// Let this file's go_package option serve for all input files.
+				pkg, explicit = thisPkg, true
+			} else if thisPkg != pkg {
+				g.Fail("inconsistent package names:", thisPkg, pkg)
+			}
+		}
+	}
+
+	// If we don't have an explicit go_package option but we have an
+	// import path, use that.
+	if !explicit {
+		p := g.defaultGoPackage()
+		if p != "" {
+			pkg, explicit = p, true
+		}
+	}
+
+	// If there was no go_package and no import path to use,
+	// double-check that all the inputs have the same implicit
+	// Go package name.
+	if !explicit {
+		for _, f := range g.genFiles {
+			thisPkg, _ := f.goPackageName()
+			if thisPkg != pkg {
+				g.Fail("inconsistent package names:", thisPkg, pkg)
+			}
+		}
+	}
+
+	g.packageName = RegisterUniquePackageName(pkg, g.genFiles[0])
+
+	// Register the support package names. They might collide with the
+	// name of a package we import.
+	g.Pkg = map[string]string{
+		"fmt":   RegisterUniquePackageName("fmt", nil),
+		"math":  RegisterUniquePackageName("math", nil),
+		"proto": RegisterUniquePackageName("proto", nil),
+	}
+
+AllFiles:
+	for _, f := range g.allFiles {
+		for _, genf := range g.genFiles {
+			if f == genf {
+				// In this package already.
+				uniquePackageName[f.FileDescriptorProto] = g.packageName
+				continue AllFiles
+			}
+		}
+		// The file is a dependency, so we want to ignore its go_package option
+		// because that is only relevant for its specific generated output.
+		pkg := f.GetPackage()
+		if pkg == "" {
+			pkg = baseName(*f.Name)
+		}
+		RegisterUniquePackageName(pkg, f)
+	}
+}
+
+// WrapTypes walks the incoming data, wrapping DescriptorProtos, EnumDescriptorProtos
+// and FileDescriptorProtos into file-referenced objects within the Generator.
+// It also creates the list of files to generate and so should be called before GenerateAllFiles.
+func (g *Generator) WrapTypes() {
+	g.allFiles = make([]*FileDescriptor, len(g.Request.ProtoFile))
+	g.allFilesByName = make(map[string]*FileDescriptor, len(g.allFiles))
+	for i, f := range g.Request.ProtoFile {
+		// We must wrap the descriptors before we wrap the enums
+		descs := wrapDescriptors(f)
+		g.buildNestedDescriptors(descs)
+		enums := wrapEnumDescriptors(f, descs)
+		g.buildNestedEnums(descs, enums)
+		exts := wrapExtensions(f)
+		fd := &FileDescriptor{
+			FileDescriptorProto: f,
+			desc:                descs,
+			enum:                enums,
+			ext:                 exts,
+			exported:            make(map[Object][]symbol),
+			proto3:              fileIsProto3(f),
+		}
+		extractComments(fd)
+		g.allFiles[i] = fd
+		g.allFilesByName[f.GetName()] = fd
+	}
+	for _, fd := range g.allFiles {
+		fd.imp = wrapImported(fd.FileDescriptorProto, g)
+	}
+
+	g.genFiles = make([]*FileDescriptor, len(g.Request.FileToGenerate))
+	for i, fileName := range g.Request.FileToGenerate {
+		g.genFiles[i] = g.allFilesByName[fileName]
+		if g.genFiles[i] == nil {
+			g.Fail("could not find file named", fileName)
+		}
+		g.genFiles[i].index = i
+	}
+	g.Response.File = make([]*plugin.CodeGeneratorResponse_File, len(g.genFiles))
+}
+
+// Scan the descriptors in this file.  For each one, build the slice of nested descriptors
+func (g *Generator) buildNestedDescriptors(descs []*Descriptor) {
+	for _, desc := range descs {
+		if len(desc.NestedType) != 0 {
+			for _, nest := range descs {
+				if nest.parent == desc {
+					desc.nested = append(desc.nested, nest)
+				}
+			}
+			if len(desc.nested) != len(desc.NestedType) {
+				g.Fail("internal error: nesting failure for", desc.GetName())
+			}
+		}
+	}
+}
+
+func (g *Generator) buildNestedEnums(descs []*Descriptor, enums []*EnumDescriptor) {
+	for _, desc := range descs {
+		if len(desc.EnumType) != 0 {
+			for _, enum := range enums {
+				if enum.parent == desc {
+					desc.enums = append(desc.enums, enum)
+				}
+			}
+			if len(desc.enums) != len(desc.EnumType) {
+				g.Fail("internal error: enum nesting failure for", desc.GetName())
+			}
+		}
+	}
+}
+
+// Construct the Descriptor
+func newDescriptor(desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *Descriptor {
+	d := &Descriptor{
+		common:          common{file},
+		DescriptorProto: desc,
+		parent:          parent,
+		index:           index,
+	}
+	if parent == nil {
+		d.path = fmt.Sprintf("%d,%d", messagePath, index)
+	} else {
+		d.path = fmt.Sprintf("%s,%d,%d", parent.path, messageMessagePath, index)
+	}
+
+	// The only way to distinguish a group from a message is whether
+	// the containing message has a TYPE_GROUP field that matches.
+	if parent != nil {
+		parts := d.TypeName()
+		if file.Package != nil {
+			parts = append([]string{*file.Package}, parts...)
+		}
+		exp := "." + strings.Join(parts, ".")
+		for _, field := range parent.Field {
+			if field.GetType() == descriptor.FieldDescriptorProto_TYPE_GROUP && field.GetTypeName() == exp {
+				d.group = true
+				break
+			}
+		}
+	}
+
+	d.ext = make([]*ExtensionDescriptor, len(desc.Extension))
+	for i, field := range desc.Extension {
+		d.ext[i] = &ExtensionDescriptor{common{file}, field, d}
+	}
+
+	return d
+}
+
+// Return a slice of all the Descriptors defined within this file
+func wrapDescriptors(file *descriptor.FileDescriptorProto) []*Descriptor {
+	sl := make([]*Descriptor, 0, len(file.MessageType)+10)
+	for i, desc := range file.MessageType {
+		sl = wrapThisDescriptor(sl, desc, nil, file, i)
+	}
+	return sl
+}
+
+// Wrap this Descriptor, recursively
+func wrapThisDescriptor(sl []*Descriptor, desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) []*Descriptor {
+	sl = append(sl, newDescriptor(desc, parent, file, index))
+	me := sl[len(sl)-1]
+	for i, nested := range desc.NestedType {
+		sl = wrapThisDescriptor(sl, nested, me, file, i)
+	}
+	return sl
+}
+
+// Construct the EnumDescriptor
+func newEnumDescriptor(desc *descriptor.EnumDescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *EnumDescriptor {
+	ed := &EnumDescriptor{
+		common:              common{file},
+		EnumDescriptorProto: desc,
+		parent:              parent,
+		index:               index,
+	}
+	if parent == nil {
+		ed.path = fmt.Sprintf("%d,%d", enumPath, index)
+	} else {
+		ed.path = fmt.Sprintf("%s,%d,%d", parent.path, messageEnumPath, index)
+	}
+	return ed
+}
+
+// Return a slice of all the EnumDescriptors defined within this file
+func wrapEnumDescriptors(file *descriptor.FileDescriptorProto, descs []*Descriptor) []*EnumDescriptor {
+	sl := make([]*EnumDescriptor, 0, len(file.EnumType)+10)
+	// Top-level enums.
+	for i, enum := range file.EnumType {
+		sl = append(sl, newEnumDescriptor(enum, nil, file, i))
+	}
+	// Enums within messages. Enums within embedded messages appear in the outer-most message.
+	for _, nested := range descs {
+		for i, enum := range nested.EnumType {
+			sl = append(sl, newEnumDescriptor(enum, nested, file, i))
+		}
+	}
+	return sl
+}
+
+// Return a slice of all the top-level ExtensionDescriptors defined within this file.
+func wrapExtensions(file *descriptor.FileDescriptorProto) []*ExtensionDescriptor {
+	sl := make([]*ExtensionDescriptor, len(file.Extension))
+	for i, field := range file.Extension {
+		sl[i] = &ExtensionDescriptor{common{file}, field, nil}
+	}
+	return sl
+}
+
+// Return a slice of all the types that are publicly imported into this file.
+func wrapImported(file *descriptor.FileDescriptorProto, g *Generator) (sl []*ImportedDescriptor) {
+	for _, index := range file.PublicDependency {
+		df := g.fileByName(file.Dependency[index])
+		for _, d := range df.desc {
+			if d.GetOptions().GetMapEntry() {
+				continue
+			}
+			sl = append(sl, &ImportedDescriptor{common{file}, d})
+		}
+		for _, e := range df.enum {
+			sl = append(sl, &ImportedDescriptor{common{file}, e})
+		}
+		for _, ext := range df.ext {
+			sl = append(sl, &ImportedDescriptor{common{file}, ext})
+		}
+	}
+	return
+}
+
+func extractComments(file *FileDescriptor) {
+	file.comments = make(map[string]*descriptor.SourceCodeInfo_Location)
+	for _, loc := range file.GetSourceCodeInfo().GetLocation() {
+		if loc.LeadingComments == nil {
+			continue
+		}
+		var p []string
+		for _, n := range loc.Path {
+			p = append(p, strconv.Itoa(int(n)))
+		}
+		file.comments[strings.Join(p, ",")] = loc
+	}
+}
+
+// BuildTypeNameMap builds the map from fully qualified type names to objects.
+// The key names for the map come from the input data, which puts a period at the beginning.
+// It should be called after SetPackageNames and before GenerateAllFiles.
+func (g *Generator) BuildTypeNameMap() {
+	g.typeNameToObject = make(map[string]Object)
+	for _, f := range g.allFiles {
+		// The names in this loop are defined by the proto world, not us, so the
+		// package name may be empty.  If so, the dotted package name of X will
+		// be ".X"; otherwise it will be ".pkg.X".
+		dottedPkg := "." + f.GetPackage()
+		if dottedPkg != "." {
+			dottedPkg += "."
+		}
+		for _, enum := range f.enum {
+			name := dottedPkg + dottedSlice(enum.TypeName())
+			g.typeNameToObject[name] = enum
+		}
+		for _, desc := range f.desc {
+			name := dottedPkg + dottedSlice(desc.TypeName())
+			g.typeNameToObject[name] = desc
+		}
+	}
+}
+
+// ObjectNamed, given a fully-qualified input type name as it appears in the input data,
+// returns the descriptor for the message or enum with that name.
+func (g *Generator) ObjectNamed(typeName string) Object {
+	o, ok := g.typeNameToObject[typeName]
+	if !ok {
+		g.Fail("can't find object with type", typeName)
+	}
+
+	// If the file of this object isn't a direct dependency of the current file,
+	// or in the current file, then this object has been publicly imported into
+	// a dependency of the current file.
+	// We should return the ImportedDescriptor object for it instead.
+	direct := *o.File().Name == *g.file.Name
+	if !direct {
+		for _, dep := range g.file.Dependency {
+			if *g.fileByName(dep).Name == *o.File().Name {
+				direct = true
+				break
+			}
+		}
+	}
+	if !direct {
+		found := false
+	Loop:
+		for _, dep := range g.file.Dependency {
+			df := g.fileByName(*g.fileByName(dep).Name)
+			for _, td := range df.imp {
+				if td.o == o {
+					// Found it!
+					o = td
+					found = true
+					break Loop
+				}
+			}
+		}
+		if !found {
+			log.Printf("protoc-gen-go: WARNING: failed finding publicly imported dependency for %v, used in %v", typeName, *g.file.Name)
+		}
+	}
+
+	return o
+}
+
+// P prints the arguments to the generated output.  It handles strings and int32s, plus
+// handling indirections because they may be *string, etc.
+func (g *Generator) P(str ...interface{}) {
+	if !g.writeOutput {
+		return
+	}
+	g.WriteString(g.indent)
+	for _, v := range str {
+		switch s := v.(type) {
+		case string:
+			g.WriteString(s)
+		case *string:
+			g.WriteString(*s)
+		case bool:
+			fmt.Fprintf(g, "%t", s)
+		case *bool:
+			fmt.Fprintf(g, "%t", *s)
+		case int:
+			fmt.Fprintf(g, "%d", s)
+		case *int32:
+			fmt.Fprintf(g, "%d", *s)
+		case *int64:
+			fmt.Fprintf(g, "%d", *s)
+		case float64:
+			fmt.Fprintf(g, "%g", s)
+		case *float64:
+			fmt.Fprintf(g, "%g", *s)
+		default:
+			g.Fail(fmt.Sprintf("unknown type in printer: %T", v))
+		}
+	}
+	g.WriteByte('\n')
+}
+
+// addInitf stores the given statement to be printed inside the file's init function.
+// The statement is given as a format specifier and arguments.
+func (g *Generator) addInitf(stmt string, a ...interface{}) {
+	g.init = append(g.init, fmt.Sprintf(stmt, a...))
+}
+
+// In Indents the output one tab stop.
+func (g *Generator) In() { g.indent += "\t" }
+
+// Out unindents the output one tab stop.
+func (g *Generator) Out() {
+	if len(g.indent) > 0 {
+		g.indent = g.indent[1:]
+	}
+}
+
+// GenerateAllFiles generates the output for all the files we're outputting.
+func (g *Generator) GenerateAllFiles() {
+	// Initialize the plugins
+	for _, p := range plugins {
+		p.Init(g)
+	}
+	// Generate the output. The generator runs for every file, even the files
+	// that we don't generate output for, so that we can collate the full list
+	// of exported symbols to support public imports.
+	genFileMap := make(map[*FileDescriptor]bool, len(g.genFiles))
+	for _, file := range g.genFiles {
+		genFileMap[file] = true
+	}
+	i := 0
+	for _, file := range g.allFiles {
+		g.Reset()
+		g.writeOutput = genFileMap[file]
+		g.generate(file)
+		if !g.writeOutput {
+			continue
+		}
+		g.Response.File[i] = new(plugin.CodeGeneratorResponse_File)
+		g.Response.File[i].Name = proto.String(goFileName(*file.Name))
+		g.Response.File[i].Content = proto.String(g.String())
+		i++
+	}
+}
+
+// Run all the plugins associated with the file.
+func (g *Generator) runPlugins(file *FileDescriptor) {
+	for _, p := range plugins {
+		p.Generate(file)
+	}
+}
+
+// FileOf return the FileDescriptor for this FileDescriptorProto.
+func (g *Generator) FileOf(fd *descriptor.FileDescriptorProto) *FileDescriptor {
+	for _, file := range g.allFiles {
+		if file.FileDescriptorProto == fd {
+			return file
+		}
+	}
+	g.Fail("could not find file in table:", fd.GetName())
+	return nil
+}
+
+// Fill the response protocol buffer with the generated output for all the files we're
+// supposed to generate.
+func (g *Generator) generate(file *FileDescriptor) {
+	g.file = g.FileOf(file.FileDescriptorProto)
+	g.usedPackages = make(map[string]bool)
+
+	if g.file.index == 0 {
+		// For one file in the package, assert version compatibility.
+		g.P("// This is a compile-time assertion to ensure that this generated file")
+		g.P("// is compatible with the proto package it is being compiled against.")
+		g.P("const _ = ", g.Pkg["proto"], ".ProtoPackageIsVersion", generatedCodeVersion)
+		g.P()
+	}
+
+	for _, td := range g.file.imp {
+		g.generateImported(td)
+	}
+	for _, enum := range g.file.enum {
+		g.generateEnum(enum)
+	}
+	for _, desc := range g.file.desc {
+		// Don't generate virtual messages for maps.
+		if desc.GetOptions().GetMapEntry() {
+			continue
+		}
+		g.generateMessage(desc)
+	}
+	for _, ext := range g.file.ext {
+		g.generateExtension(ext)
+	}
+	g.generateInitFunction()
+
+	// Run the plugins before the imports so we know which imports are necessary.
+	g.runPlugins(file)
+
+	g.generateFileDescriptor(file)
+
+	// Generate header and imports last, though they appear first in the output.
+	rem := g.Buffer
+	g.Buffer = new(bytes.Buffer)
+	g.generateHeader()
+	g.generateImports()
+	if !g.writeOutput {
+		return
+	}
+	g.Write(rem.Bytes())
+
+	// Reformat generated code.
+	fset := token.NewFileSet()
+	raw := g.Bytes()
+	ast, err := parser.ParseFile(fset, "", g, parser.ParseComments)
+	if err != nil {
+		// Print out the bad code with line numbers.
+		// This should never happen in practice, but it can while changing generated code,
+		// so consider this a debugging aid.
+		var src bytes.Buffer
+		s := bufio.NewScanner(bytes.NewReader(raw))
+		for line := 1; s.Scan(); line++ {
+			fmt.Fprintf(&src, "%5d\t%s\n", line, s.Bytes())
+		}
+		g.Fail("bad Go source code was generated:", err.Error(), "\n"+src.String())
+	}
+	g.Reset()
+	err = (&printer.Config{Mode: printer.TabIndent | printer.UseSpaces, Tabwidth: 8}).Fprint(g, fset, ast)
+	if err != nil {
+		g.Fail("generated Go source code could not be reformatted:", err.Error())
+	}
+}
+
+// Generate the header, including package definition
+func (g *Generator) generateHeader() {
+	g.P("// Code generated by protoc-gen-go.")
+	g.P("// source: ", g.file.Name)
+	g.P("// DO NOT EDIT!")
+	g.P()
+
+	name := g.file.PackageName()
+
+	if g.file.index == 0 {
+		// Generate package docs for the first file in the package.
+		g.P("/*")
+		g.P("Package ", name, " is a generated protocol buffer package.")
+		g.P()
+		if loc, ok := g.file.comments[strconv.Itoa(packagePath)]; ok {
+			// not using g.PrintComments because this is a /* */ comment block.
+			text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
+			for _, line := range strings.Split(text, "\n") {
+				line = strings.TrimPrefix(line, " ")
+				// ensure we don't escape from the block comment
+				line = strings.Replace(line, "*/", "* /", -1)
+				g.P(line)
+			}
+			g.P()
+		}
+		var topMsgs []string
+		g.P("It is generated from these files:")
+		for _, f := range g.genFiles {
+			g.P("\t", f.Name)
+			for _, msg := range f.desc {
+				if msg.parent != nil {
+					continue
+				}
+				topMsgs = append(topMsgs, CamelCaseSlice(msg.TypeName()))
+			}
+		}
+		g.P()
+		g.P("It has these top-level messages:")
+		for _, msg := range topMsgs {
+			g.P("\t", msg)
+		}
+		g.P("*/")
+	}
+
+	g.P("package ", name)
+	g.P()
+}
+
+// PrintComments prints any comments from the source .proto file.
+// The path is a comma-separated list of integers.
+// It returns an indication of whether any comments were printed.
+// See descriptor.proto for its format.
+func (g *Generator) PrintComments(path string) bool {
+	if !g.writeOutput {
+		return false
+	}
+	if loc, ok := g.file.comments[path]; ok {
+		text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
+		for _, line := range strings.Split(text, "\n") {
+			g.P("// ", strings.TrimPrefix(line, " "))
+		}
+		return true
+	}
+	return false
+}
+
+func (g *Generator) fileByName(filename string) *FileDescriptor {
+	return g.allFilesByName[filename]
+}
+
+// weak returns whether the ith import of the current file is a weak import.
+func (g *Generator) weak(i int32) bool {
+	for _, j := range g.file.WeakDependency {
+		if j == i {
+			return true
+		}
+	}
+	return false
+}
+
+// Generate the imports
+func (g *Generator) generateImports() {
+	// We almost always need a proto import.  Rather than computing when we
+	// do, which is tricky when there's a plugin, just import it and
+	// reference it later. The same argument applies to the fmt and math packages.
+	g.P("import " + g.Pkg["proto"] + " " + strconv.Quote(g.ImportPrefix+"github.com/golang/protobuf/proto"))
+	g.P("import " + g.Pkg["fmt"] + ` "fmt"`)
+	g.P("import " + g.Pkg["math"] + ` "math"`)
+	for i, s := range g.file.Dependency {
+		fd := g.fileByName(s)
+		// Do not import our own package.
+		if fd.PackageName() == g.packageName {
+			continue
+		}
+		filename := goFileName(s)
+		// By default, import path is the dirname of the Go filename.
+		importPath := path.Dir(filename)
+		if substitution, ok := g.ImportMap[s]; ok {
+			importPath = substitution
+		}
+		importPath = g.ImportPrefix + importPath
+		// Skip weak imports.
+		if g.weak(int32(i)) {
+			g.P("// skipping weak import ", fd.PackageName(), " ", strconv.Quote(importPath))
+			continue
+		}
+		// We need to import all the dependencies, even if we don't reference them,
+		// because other code and tools depend on having the full transitive closure
+		// of protocol buffer types in the binary.
+		pname := fd.PackageName()
+		if _, ok := g.usedPackages[pname]; !ok {
+			pname = "_"
+		}
+		g.P("import ", pname, " ", strconv.Quote(importPath))
+	}
+	g.P()
+	// TODO: may need to worry about uniqueness across plugins
+	for _, p := range plugins {
+		p.GenerateImports(g.file)
+		g.P()
+	}
+	g.P("// Reference imports to suppress errors if they are not otherwise used.")
+	g.P("var _ = ", g.Pkg["proto"], ".Marshal")
+	g.P("var _ = ", g.Pkg["fmt"], ".Errorf")
+	g.P("var _ = ", g.Pkg["math"], ".Inf")
+	g.P()
+}
+
+func (g *Generator) generateImported(id *ImportedDescriptor) {
+	// Don't generate public import symbols for files that we are generating
+	// code for, since those symbols will already be in this package.
+	// We can't simply avoid creating the ImportedDescriptor objects,
+	// because g.genFiles isn't populated at that stage.
+	tn := id.TypeName()
+	sn := tn[len(tn)-1]
+	df := g.FileOf(id.o.File())
+	filename := *df.Name
+	for _, fd := range g.genFiles {
+		if *fd.Name == filename {
+			g.P("// Ignoring public import of ", sn, " from ", filename)
+			g.P()
+			return
+		}
+	}
+	g.P("// ", sn, " from public import ", filename)
+	g.usedPackages[df.PackageName()] = true
+
+	for _, sym := range df.exported[id.o] {
+		sym.GenerateAlias(g, df.PackageName())
+	}
+
+	g.P()
+}
+
+// Generate the enum definitions for this EnumDescriptor.
+func (g *Generator) generateEnum(enum *EnumDescriptor) {
+	// The full type name
+	typeName := enum.TypeName()
+	// The full type name, CamelCased.
+	ccTypeName := CamelCaseSlice(typeName)
+	ccPrefix := enum.prefix()
+
+	g.PrintComments(enum.path)
+	g.P("type ", ccTypeName, " int32")
+	g.file.addExport(enum, enumSymbol{ccTypeName, enum.proto3()})
+	g.P("const (")
+	g.In()
+	for i, e := range enum.Value {
+		g.PrintComments(fmt.Sprintf("%s,%d,%d", enum.path, enumValuePath, i))
+
+		name := ccPrefix + *e.Name
+		g.P(name, " ", ccTypeName, " = ", e.Number)
+		g.file.addExport(enum, constOrVarSymbol{name, "const", ccTypeName})
+	}
+	g.Out()
+	g.P(")")
+	g.P("var ", ccTypeName, "_name = map[int32]string{")
+	g.In()
+	generated := make(map[int32]bool) // avoid duplicate values
+	for _, e := range enum.Value {
+		duplicate := ""
+		if _, present := generated[*e.Number]; present {
+			duplicate = "// Duplicate value: "
+		}
+		g.P(duplicate, e.Number, ": ", strconv.Quote(*e.Name), ",")
+		generated[*e.Number] = true
+	}
+	g.Out()
+	g.P("}")
+	g.P("var ", ccTypeName, "_value = map[string]int32{")
+	g.In()
+	for _, e := range enum.Value {
+		g.P(strconv.Quote(*e.Name), ": ", e.Number, ",")
+	}
+	g.Out()
+	g.P("}")
+
+	if !enum.proto3() {
+		g.P("func (x ", ccTypeName, ") Enum() *", ccTypeName, " {")
+		g.In()
+		g.P("p := new(", ccTypeName, ")")
+		g.P("*p = x")
+		g.P("return p")
+		g.Out()
+		g.P("}")
+	}
+
+	g.P("func (x ", ccTypeName, ") String() string {")
+	g.In()
+	g.P("return ", g.Pkg["proto"], ".EnumName(", ccTypeName, "_name, int32(x))")
+	g.Out()
+	g.P("}")
+
+	if !enum.proto3() {
+		g.P("func (x *", ccTypeName, ") UnmarshalJSON(data []byte) error {")
+		g.In()
+		g.P("value, err := ", g.Pkg["proto"], ".UnmarshalJSONEnum(", ccTypeName, `_value, data, "`, ccTypeName, `")`)
+		g.P("if err != nil {")
+		g.In()
+		g.P("return err")
+		g.Out()
+		g.P("}")
+		g.P("*x = ", ccTypeName, "(value)")
+		g.P("return nil")
+		g.Out()
+		g.P("}")
+	}
+
+	var indexes []string
+	for m := enum.parent; m != nil; m = m.parent {
+		// XXX: skip groups?
+		indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
+	}
+	indexes = append(indexes, strconv.Itoa(enum.index))
+	g.P("func (", ccTypeName, ") EnumDescriptor() ([]byte, []int) { return fileDescriptor", g.file.index, ", []int{", strings.Join(indexes, ", "), "} }")
+
+	g.P()
+}
+
+// The tag is a string like "varint,2,opt,name=fieldname,def=7" that
+// identifies details of the field for the protocol buffer marshaling and unmarshaling
+// code.  The fields are:
+//	wire encoding
+//	protocol tag number
+//	opt,req,rep for optional, required, or repeated
+//	packed whether the encoding is "packed" (optional; repeated primitives only)
+//	name= the original declared name
+//	enum= the name of the enum type if it is an enum-typed field.
+//	proto3 if this field is in a proto3 message
+//	def= string representation of the default value, if any.
+// The default value must be in a representation that can be used at run-time
+// to generate the default value. Thus bools become 0 and 1, for instance.
+func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptorProto, wiretype string) string {
+	optrepreq := ""
+	switch {
+	case isOptional(field):
+		optrepreq = "opt"
+	case isRequired(field):
+		optrepreq = "req"
+	case isRepeated(field):
+		optrepreq = "rep"
+	}
+	var defaultValue string
+	if dv := field.DefaultValue; dv != nil { // set means an explicit default
+		defaultValue = *dv
+		// Some types need tweaking.
+		switch *field.Type {
+		case descriptor.FieldDescriptorProto_TYPE_BOOL:
+			if defaultValue == "true" {
+				defaultValue = "1"
+			} else {
+				defaultValue = "0"
+			}
+		case descriptor.FieldDescriptorProto_TYPE_STRING,
+			descriptor.FieldDescriptorProto_TYPE_BYTES:
+			// Nothing to do. Quoting is done for the whole tag.
+		case descriptor.FieldDescriptorProto_TYPE_ENUM:
+			// For enums we need to provide the integer constant.
+			obj := g.ObjectNamed(field.GetTypeName())
+			if id, ok := obj.(*ImportedDescriptor); ok {
+				// It is an enum that was publicly imported.
+				// We need the underlying type.
+				obj = id.o
+			}
+			enum, ok := obj.(*EnumDescriptor)
+			if !ok {
+				log.Printf("obj is a %T", obj)
+				if id, ok := obj.(*ImportedDescriptor); ok {
+					log.Printf("id.o is a %T", id.o)
+				}
+				g.Fail("unknown enum type", CamelCaseSlice(obj.TypeName()))
+			}
+			defaultValue = enum.integerValueAsString(defaultValue)
+		}
+		defaultValue = ",def=" + defaultValue
+	}
+	enum := ""
+	if *field.Type == descriptor.FieldDescriptorProto_TYPE_ENUM {
+		// We avoid using obj.PackageName(), because we want to use the
+		// original (proto-world) package name.
+		obj := g.ObjectNamed(field.GetTypeName())
+		if id, ok := obj.(*ImportedDescriptor); ok {
+			obj = id.o
+		}
+		enum = ",enum="
+		if pkg := obj.File().GetPackage(); pkg != "" {
+			enum += pkg + "."
+		}
+		enum += CamelCaseSlice(obj.TypeName())
+	}
+	packed := ""
+	if field.Options != nil && field.Options.GetPacked() {
+		packed = ",packed"
+	}
+	fieldName := field.GetName()
+	name := fieldName
+	if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
+		// We must use the type name for groups instead of
+		// the field name to preserve capitalization.
+		// type_name in FieldDescriptorProto is fully-qualified,
+		// but we only want the local part.
+		name = *field.TypeName
+		if i := strings.LastIndex(name, "."); i >= 0 {
+			name = name[i+1:]
+		}
+	}
+	name = ",name=" + name
+	if message.proto3() {
+		// We only need the extra tag for []byte fields;
+		// no need to add noise for the others.
+		if *field.Type == descriptor.FieldDescriptorProto_TYPE_BYTES {
+			name += ",proto3"
+		}
+
+	}
+	oneof := ""
+	if field.OneofIndex != nil {
+		oneof = ",oneof"
+	}
+	return strconv.Quote(fmt.Sprintf("%s,%d,%s%s%s%s%s%s",
+		wiretype,
+		field.GetNumber(),
+		optrepreq,
+		packed,
+		name,
+		enum,
+		oneof,
+		defaultValue))
+}
+
+func needsStar(typ descriptor.FieldDescriptorProto_Type) bool {
+	switch typ {
+	case descriptor.FieldDescriptorProto_TYPE_GROUP:
+		return false
+	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+		return false
+	case descriptor.FieldDescriptorProto_TYPE_BYTES:
+		return false
+	}
+	return true
+}
+
+// TypeName is the printed name appropriate for an item. If the object is in the current file,
+// TypeName drops the package name and underscores the rest.
+// Otherwise the object is from another package; and the result is the underscored
+// package name followed by the item name.
+// The result always has an initial capital.
+func (g *Generator) TypeName(obj Object) string {
+	return g.DefaultPackageName(obj) + CamelCaseSlice(obj.TypeName())
+}
+
+// TypeNameWithPackage is like TypeName, but always includes the package
+// name even if the object is in our own package.
+func (g *Generator) TypeNameWithPackage(obj Object) string {
+	return obj.PackageName() + CamelCaseSlice(obj.TypeName())
+}
+
+// GoType returns a string representing the type name, and the wire type
+func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescriptorProto) (typ string, wire string) {
+	// TODO: Options.
+	switch *field.Type {
+	case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
+		typ, wire = "float64", "fixed64"
+	case descriptor.FieldDescriptorProto_TYPE_FLOAT:
+		typ, wire = "float32", "fixed32"
+	case descriptor.FieldDescriptorProto_TYPE_INT64:
+		typ, wire = "int64", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_UINT64:
+		typ, wire = "uint64", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_INT32:
+		typ, wire = "int32", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_UINT32:
+		typ, wire = "uint32", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_FIXED64:
+		typ, wire = "uint64", "fixed64"
+	case descriptor.FieldDescriptorProto_TYPE_FIXED32:
+		typ, wire = "uint32", "fixed32"
+	case descriptor.FieldDescriptorProto_TYPE_BOOL:
+		typ, wire = "bool", "varint"
+	case descriptor.FieldDescriptorProto_TYPE_STRING:
+		typ, wire = "string", "bytes"
+	case descriptor.FieldDescriptorProto_TYPE_GROUP:
+		desc := g.ObjectNamed(field.GetTypeName())
+		typ, wire = "*"+g.TypeName(desc), "group"
+	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+		desc := g.ObjectNamed(field.GetTypeName())
+		typ, wire = "*"+g.TypeName(desc), "bytes"
+	case descriptor.FieldDescriptorProto_TYPE_BYTES:
+		typ, wire = "[]byte", "bytes"
+	case descriptor.FieldDescriptorProto_TYPE_ENUM:
+		desc := g.ObjectNamed(field.GetTypeName())
+		typ, wire = g.TypeName(desc), "varint"
+	case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
+		typ, wire = "int32", "fixed32"
+	case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
+		typ, wire = "int64", "fixed64"
+	case descriptor.FieldDescriptorProto_TYPE_SINT32:
+		typ, wire = "int32", "zigzag32"
+	case descriptor.FieldDescriptorProto_TYPE_SINT64:
+		typ, wire = "int64", "zigzag64"
+	default:
+		g.Fail("unknown type for", field.GetName())
+	}
+	if isRepeated(field) {
+		typ = "[]" + typ
+	} else if message != nil && message.proto3() {
+		return
+	} else if field.OneofIndex != nil && message != nil {
+		return
+	} else if needsStar(*field.Type) {
+		typ = "*" + typ
+	}
+	return
+}
+
+func (g *Generator) RecordTypeUse(t string) {
+	if obj, ok := g.typeNameToObject[t]; ok {
+		// Call ObjectNamed to get the true object to record the use.
+		obj = g.ObjectNamed(t)
+		g.usedPackages[obj.PackageName()] = true
+	}
+}
+
+// Method names that may be generated.  Fields with these names get an
+// underscore appended.
+var methodNames = [...]string{
+	"Reset",
+	"String",
+	"ProtoMessage",
+	"Marshal",
+	"Unmarshal",
+	"ExtensionRangeArray",
+	"ExtensionMap",
+	"Descriptor",
+}
+
+// Generate the type and default constant definitions for this Descriptor.
+func (g *Generator) generateMessage(message *Descriptor) {
+	// The full type name
+	typeName := message.TypeName()
+	// The full type name, CamelCased.
+	ccTypeName := CamelCaseSlice(typeName)
+
+	usedNames := make(map[string]bool)
+	for _, n := range methodNames {
+		usedNames[n] = true
+	}
+	fieldNames := make(map[*descriptor.FieldDescriptorProto]string)
+	fieldGetterNames := make(map[*descriptor.FieldDescriptorProto]string)
+	fieldTypes := make(map[*descriptor.FieldDescriptorProto]string)
+	mapFieldTypes := make(map[*descriptor.FieldDescriptorProto]string)
+
+	oneofFieldName := make(map[int32]string)                           // indexed by oneof_index field of FieldDescriptorProto
+	oneofDisc := make(map[int32]string)                                // name of discriminator method
+	oneofTypeName := make(map[*descriptor.FieldDescriptorProto]string) // without star
+	oneofInsertPoints := make(map[int32]int)                           // oneof_index => offset of g.Buffer
+
+	g.PrintComments(message.path)
+	g.P("type ", ccTypeName, " struct {")
+	g.In()
+
+	// allocNames finds a conflict-free variation of the given strings,
+	// consistently mutating their suffixes.
+	// It returns the same number of strings.
+	allocNames := func(ns ...string) []string {
+	Loop:
+		for {
+			for _, n := range ns {
+				if usedNames[n] {
+					for i := range ns {
+						ns[i] += "_"
+					}
+					continue Loop
+				}
+			}
+			for _, n := range ns {
+				usedNames[n] = true
+			}
+			return ns
+		}
+	}
+
+	for i, field := range message.Field {
+		// Allocate the getter and the field at the same time so name
+		// collisions create field/method consistent names.
+		// TODO: This allocation occurs based on the order of the fields
+		// in the proto file, meaning that a change in the field
+		// ordering can change generated Method/Field names.
+		base := CamelCase(*field.Name)
+		ns := allocNames(base, "Get"+base)
+		fieldName, fieldGetterName := ns[0], ns[1]
+		typename, wiretype := g.GoType(message, field)
+		jsonName := *field.Name
+		tag := fmt.Sprintf("protobuf:%s json:%q", g.goTag(message, field, wiretype), jsonName+",omitempty")
+
+		fieldNames[field] = fieldName
+		fieldGetterNames[field] = fieldGetterName
+
+		oneof := field.OneofIndex != nil
+		if oneof && oneofFieldName[*field.OneofIndex] == "" {
+			odp := message.OneofDecl[int(*field.OneofIndex)]
+			fname := allocNames(CamelCase(odp.GetName()))[0]
+
+			// This is the first field of a oneof we haven't seen before.
+			// Generate the union field.
+			com := g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageOneofPath, *field.OneofIndex))
+			if com {
+				g.P("//")
+			}
+			g.P("// Types that are valid to be assigned to ", fname, ":")
+			// Generate the rest of this comment later,
+			// when we've computed any disambiguation.
+			oneofInsertPoints[*field.OneofIndex] = g.Buffer.Len()
+
+			dname := "is" + ccTypeName + "_" + fname
+			oneofFieldName[*field.OneofIndex] = fname
+			oneofDisc[*field.OneofIndex] = dname
+			tag := `protobuf_oneof:"` + odp.GetName() + `"`
+			g.P(fname, " ", dname, " `", tag, "`")
+		}
+
+		if *field.Type == descriptor.FieldDescriptorProto_TYPE_MESSAGE {
+			desc := g.ObjectNamed(field.GetTypeName())
+			if d, ok := desc.(*Descriptor); ok && d.GetOptions().GetMapEntry() {
+				// Figure out the Go types and tags for the key and value types.
+				keyField, valField := d.Field[0], d.Field[1]
+				keyType, keyWire := g.GoType(d, keyField)
+				valType, valWire := g.GoType(d, valField)
+				keyTag, valTag := g.goTag(d, keyField, keyWire), g.goTag(d, valField, valWire)
+
+				// We don't use stars, except for message-typed values.
+				// Message and enum types are the only two possibly foreign types used in maps,
+				// so record their use. They are not permitted as map keys.
+				keyType = strings.TrimPrefix(keyType, "*")
+				switch *valField.Type {
+				case descriptor.FieldDescriptorProto_TYPE_ENUM:
+					valType = strings.TrimPrefix(valType, "*")
+					g.RecordTypeUse(valField.GetTypeName())
+				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+					g.RecordTypeUse(valField.GetTypeName())
+				default:
+					valType = strings.TrimPrefix(valType, "*")
+				}
+
+				typename = fmt.Sprintf("map[%s]%s", keyType, valType)
+				mapFieldTypes[field] = typename // record for the getter generation
+
+				tag += fmt.Sprintf(" protobuf_key:%s protobuf_val:%s", keyTag, valTag)
+			}
+		}
+
+		fieldTypes[field] = typename
+
+		if oneof {
+			tname := ccTypeName + "_" + fieldName
+			// It is possible for this to collide with a message or enum
+			// nested in this message. Check for collisions.
+			for {
+				ok := true
+				for _, desc := range message.nested {
+					if CamelCaseSlice(desc.TypeName()) == tname {
+						ok = false
+						break
+					}
+				}
+				for _, enum := range message.enums {
+					if CamelCaseSlice(enum.TypeName()) == tname {
+						ok = false
+						break
+					}
+				}
+				if !ok {
+					tname += "_"
+					continue
+				}
+				break
+			}
+
+			oneofTypeName[field] = tname
+			continue
+		}
+
+		g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageFieldPath, i))
+		g.P(fieldName, "\t", typename, "\t`", tag, "`")
+		g.RecordTypeUse(field.GetTypeName())
+	}
+	if len(message.ExtensionRange) > 0 {
+		g.P("XXX_extensions\t\tmap[int32]", g.Pkg["proto"], ".Extension `json:\"-\"`")
+	}
+	if !message.proto3() {
+		g.P("XXX_unrecognized\t[]byte `json:\"-\"`")
+	}
+	g.Out()
+	g.P("}")
+
+	// Update g.Buffer to list valid oneof types.
+	// We do this down here, after we've disambiguated the oneof type names.
+	// We go in reverse order of insertion point to avoid invalidating offsets.
+	for oi := int32(len(message.OneofDecl)); oi >= 0; oi-- {
+		ip := oneofInsertPoints[oi]
+		all := g.Buffer.Bytes()
+		rem := all[ip:]
+		g.Buffer = bytes.NewBuffer(all[:ip:ip]) // set cap so we don't scribble on rem
+		for _, field := range message.Field {
+			if field.OneofIndex == nil || *field.OneofIndex != oi {
+				continue
+			}
+			g.P("//\t*", oneofTypeName[field])
+		}
+		g.Buffer.Write(rem)
+	}
+
+	// Reset, String and ProtoMessage methods.
+	g.P("func (m *", ccTypeName, ") Reset() { *m = ", ccTypeName, "{} }")
+	g.P("func (m *", ccTypeName, ") String() string { return ", g.Pkg["proto"], ".CompactTextString(m) }")
+	g.P("func (*", ccTypeName, ") ProtoMessage() {}")
+	if !message.group {
+		var indexes []string
+		for m := message; m != nil; m = m.parent {
+			// XXX: skip groups?
+			indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
+		}
+		g.P("func (*", ccTypeName, ") Descriptor() ([]byte, []int) { return fileDescriptor", g.file.index, ", []int{", strings.Join(indexes, ", "), "} }")
+	}
+
+	// Extension support methods
+	var hasExtensions, isMessageSet bool
+	if len(message.ExtensionRange) > 0 {
+		hasExtensions = true
+		// message_set_wire_format only makes sense when extensions are defined.
+		if opts := message.Options; opts != nil && opts.GetMessageSetWireFormat() {
+			isMessageSet = true
+			g.P()
+			g.P("func (m *", ccTypeName, ") Marshal() ([]byte, error) {")
+			g.In()
+			g.P("return ", g.Pkg["proto"], ".MarshalMessageSet(m.ExtensionMap())")
+			g.Out()
+			g.P("}")
+			g.P("func (m *", ccTypeName, ") Unmarshal(buf []byte) error {")
+			g.In()
+			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSet(buf, m.ExtensionMap())")
+			g.Out()
+			g.P("}")
+			g.P("func (m *", ccTypeName, ") MarshalJSON() ([]byte, error) {")
+			g.In()
+			g.P("return ", g.Pkg["proto"], ".MarshalMessageSetJSON(m.XXX_extensions)")
+			g.Out()
+			g.P("}")
+			g.P("func (m *", ccTypeName, ") UnmarshalJSON(buf []byte) error {")
+			g.In()
+			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSetJSON(buf, m.XXX_extensions)")
+			g.Out()
+			g.P("}")
+			g.P("// ensure ", ccTypeName, " satisfies proto.Marshaler and proto.Unmarshaler")
+			g.P("var _ ", g.Pkg["proto"], ".Marshaler = (*", ccTypeName, ")(nil)")
+			g.P("var _ ", g.Pkg["proto"], ".Unmarshaler = (*", ccTypeName, ")(nil)")
+		}
+
+		g.P()
+		g.P("var extRange_", ccTypeName, " = []", g.Pkg["proto"], ".ExtensionRange{")
+		g.In()
+		for _, r := range message.ExtensionRange {
+			end := fmt.Sprint(*r.End - 1) // make range inclusive on both ends
+			g.P("{", r.Start, ", ", end, "},")
+		}
+		g.Out()
+		g.P("}")
+		g.P("func (*", ccTypeName, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange {")
+		g.In()
+		g.P("return extRange_", ccTypeName)
+		g.Out()
+		g.P("}")
+		g.P("func (m *", ccTypeName, ") ExtensionMap() map[int32]", g.Pkg["proto"], ".Extension {")
+		g.In()
+		g.P("if m.XXX_extensions == nil {")
+		g.In()
+		g.P("m.XXX_extensions = make(map[int32]", g.Pkg["proto"], ".Extension)")
+		g.Out()
+		g.P("}")
+		g.P("return m.XXX_extensions")
+		g.Out()
+		g.P("}")
+	}
+
+	// Default constants
+	defNames := make(map[*descriptor.FieldDescriptorProto]string)
+	for _, field := range message.Field {
+		def := field.GetDefaultValue()
+		if def == "" {
+			continue
+		}
+		fieldname := "Default_" + ccTypeName + "_" + CamelCase(*field.Name)
+		defNames[field] = fieldname
+		typename, _ := g.GoType(message, field)
+		if typename[0] == '*' {
+			typename = typename[1:]
+		}
+		kind := "const "
+		switch {
+		case typename == "bool":
+		case typename == "string":
+			def = strconv.Quote(def)
+		case typename == "[]byte":
+			def = "[]byte(" + strconv.Quote(def) + ")"
+			kind = "var "
+		case def == "inf", def == "-inf", def == "nan":
+			// These names are known to, and defined by, the protocol language.
+			switch def {
+			case "inf":
+				def = "math.Inf(1)"
+			case "-inf":
+				def = "math.Inf(-1)"
+			case "nan":
+				def = "math.NaN()"
+			}
+			if *field.Type == descriptor.FieldDescriptorProto_TYPE_FLOAT {
+				def = "float32(" + def + ")"
+			}
+			kind = "var "
+		case *field.Type == descriptor.FieldDescriptorProto_TYPE_ENUM:
+			// Must be an enum.  Need to construct the prefixed name.
+			obj := g.ObjectNamed(field.GetTypeName())
+			var enum *EnumDescriptor
+			if id, ok := obj.(*ImportedDescriptor); ok {
+				// The enum type has been publicly imported.
+				enum, _ = id.o.(*EnumDescriptor)
+			} else {
+				enum, _ = obj.(*EnumDescriptor)
+			}
+			if enum == nil {
+				log.Printf("don't know how to generate constant for %s", fieldname)
+				continue
+			}
+			def = g.DefaultPackageName(obj) + enum.prefix() + def
+		}
+		g.P(kind, fieldname, " ", typename, " = ", def)
+		g.file.addExport(message, constOrVarSymbol{fieldname, kind, ""})
+	}
+	g.P()
+
+	// Oneof per-field types, discriminants and getters.
+	//
+	// Generate unexported named types for the discriminant interfaces.
+	// We shouldn't have to do this, but there was (~19 Aug 2015) a compiler/linker bug
+	// that was triggered by using anonymous interfaces here.
+	// TODO: Revisit this and consider reverting back to anonymous interfaces.
+	for oi := range message.OneofDecl {
+		dname := oneofDisc[int32(oi)]
+		g.P("type ", dname, " interface { ", dname, "() }")
+	}
+	g.P()
+	for _, field := range message.Field {
+		if field.OneofIndex == nil {
+			continue
+		}
+		_, wiretype := g.GoType(message, field)
+		tag := "protobuf:" + g.goTag(message, field, wiretype)
+		g.P("type ", oneofTypeName[field], " struct{ ", fieldNames[field], " ", fieldTypes[field], " `", tag, "` }")
+		g.RecordTypeUse(field.GetTypeName())
+	}
+	g.P()
+	for _, field := range message.Field {
+		if field.OneofIndex == nil {
+			continue
+		}
+		g.P("func (*", oneofTypeName[field], ") ", oneofDisc[*field.OneofIndex], "() {}")
+	}
+	g.P()
+	for oi := range message.OneofDecl {
+		fname := oneofFieldName[int32(oi)]
+		g.P("func (m *", ccTypeName, ") Get", fname, "() ", oneofDisc[int32(oi)], " {")
+		g.P("if m != nil { return m.", fname, " }")
+		g.P("return nil")
+		g.P("}")
+	}
+	g.P()
+
+	// Field getters
+	var getters []getterSymbol
+	for _, field := range message.Field {
+		oneof := field.OneofIndex != nil
+
+		fname := fieldNames[field]
+		typename, _ := g.GoType(message, field)
+		if t, ok := mapFieldTypes[field]; ok {
+			typename = t
+		}
+		mname := fieldGetterNames[field]
+		star := ""
+		if needsStar(*field.Type) && typename[0] == '*' {
+			typename = typename[1:]
+			star = "*"
+		}
+
+		// In proto3, only generate getters for message fields and oneof fields.
+		if message.proto3() && *field.Type != descriptor.FieldDescriptorProto_TYPE_MESSAGE && !oneof {
+			continue
+		}
+
+		// Only export getter symbols for basic types,
+		// and for messages and enums in the same package.
+		// Groups are not exported.
+		// Foreign types can't be hoisted through a public import because
+		// the importer may not already be importing the defining .proto.
+		// As an example, imagine we have an import tree like this:
+		//   A.proto -> B.proto -> C.proto
+		// If A publicly imports B, we need to generate the getters from B in A's output,
+		// but if one such getter returns something from C then we cannot do that
+		// because A is not importing C already.
+		var getter, genType bool
+		switch *field.Type {
+		case descriptor.FieldDescriptorProto_TYPE_GROUP:
+			getter = false
+		case descriptor.FieldDescriptorProto_TYPE_MESSAGE, descriptor.FieldDescriptorProto_TYPE_ENUM:
+			// Only export getter if its return type is in this package.
+			getter = g.ObjectNamed(field.GetTypeName()).PackageName() == message.PackageName()
+			genType = true
+		default:
+			getter = true
+		}
+		if getter {
+			getters = append(getters, getterSymbol{
+				name:     mname,
+				typ:      typename,
+				typeName: field.GetTypeName(),
+				genType:  genType,
+			})
+		}
+
+		g.P("func (m *", ccTypeName, ") "+mname+"() "+typename+" {")
+		g.In()
+		def, hasDef := defNames[field]
+		typeDefaultIsNil := false // whether this field type's default value is a literal nil unless specified
+		switch *field.Type {
+		case descriptor.FieldDescriptorProto_TYPE_BYTES:
+			typeDefaultIsNil = !hasDef
+		case descriptor.FieldDescriptorProto_TYPE_GROUP, descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+			typeDefaultIsNil = true
+		}
+		if isRepeated(field) {
+			typeDefaultIsNil = true
+		}
+		if typeDefaultIsNil && !oneof {
+			// A bytes field with no explicit default needs less generated code,
+			// as does a message or group field, or a repeated field.
+			g.P("if m != nil {")
+			g.In()
+			g.P("return m." + fname)
+			g.Out()
+			g.P("}")
+			g.P("return nil")
+			g.Out()
+			g.P("}")
+			g.P()
+			continue
+		}
+		if !oneof {
+			g.P("if m != nil && m." + fname + " != nil {")
+			g.In()
+			g.P("return " + star + "m." + fname)
+			g.Out()
+			g.P("}")
+		} else {
+			uname := oneofFieldName[*field.OneofIndex]
+			tname := oneofTypeName[field]
+			g.P("if x, ok := m.Get", uname, "().(*", tname, "); ok {")
+			g.P("return x.", fname)
+			g.P("}")
+		}
+		if hasDef {
+			if *field.Type != descriptor.FieldDescriptorProto_TYPE_BYTES {
+				g.P("return " + def)
+			} else {
+				// The default is a []byte var.
+				// Make a copy when returning it to be safe.
+				g.P("return append([]byte(nil), ", def, "...)")
+			}
+		} else {
+			switch *field.Type {
+			case descriptor.FieldDescriptorProto_TYPE_BOOL:
+				g.P("return false")
+			case descriptor.FieldDescriptorProto_TYPE_STRING:
+				g.P(`return ""`)
+			case descriptor.FieldDescriptorProto_TYPE_GROUP,
+				descriptor.FieldDescriptorProto_TYPE_MESSAGE,
+				descriptor.FieldDescriptorProto_TYPE_BYTES:
+				// This is only possible for oneof fields.
+				g.P("return nil")
+			case descriptor.FieldDescriptorProto_TYPE_ENUM:
+				// The default default for an enum is the first value in the enum,
+				// not zero.
+				obj := g.ObjectNamed(field.GetTypeName())
+				var enum *EnumDescriptor
+				if id, ok := obj.(*ImportedDescriptor); ok {
+					// The enum type has been publicly imported.
+					enum, _ = id.o.(*EnumDescriptor)
+				} else {
+					enum, _ = obj.(*EnumDescriptor)
+				}
+				if enum == nil {
+					log.Printf("don't know how to generate getter for %s", field.GetName())
+					continue
+				}
+				if len(enum.Value) == 0 {
+					g.P("return 0 // empty enum")
+				} else {
+					first := enum.Value[0].GetName()
+					g.P("return ", g.DefaultPackageName(obj)+enum.prefix()+first)
+				}
+			default:
+				g.P("return 0")
+			}
+		}
+		g.Out()
+		g.P("}")
+		g.P()
+	}
+
+	if !message.group {
+		ms := &messageSymbol{
+			sym:           ccTypeName,
+			hasExtensions: hasExtensions,
+			isMessageSet:  isMessageSet,
+			hasOneof:      len(message.OneofDecl) > 0,
+			getters:       getters,
+		}
+		g.file.addExport(message, ms)
+	}
+
+	// Oneof functions
+	if len(message.OneofDecl) > 0 {
+		fieldWire := make(map[*descriptor.FieldDescriptorProto]string)
+
+		// method
+		enc := "_" + ccTypeName + "_OneofMarshaler"
+		dec := "_" + ccTypeName + "_OneofUnmarshaler"
+		size := "_" + ccTypeName + "_OneofSizer"
+		encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error"
+		decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)"
+		sizeSig := "(msg " + g.Pkg["proto"] + ".Message) (n int)"
+
+		g.P("// XXX_OneofFuncs is for the internal use of the proto package.")
+		g.P("func (*", ccTypeName, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {")
+		g.P("return ", enc, ", ", dec, ", ", size, ", []interface{}{")
+		for _, field := range message.Field {
+			if field.OneofIndex == nil {
+				continue
+			}
+			g.P("(*", oneofTypeName[field], ")(nil),")
+		}
+		g.P("}")
+		g.P("}")
+		g.P()
+
+		// marshaler
+		g.P("func ", enc, encSig, " {")
+		g.P("m := msg.(*", ccTypeName, ")")
+		for oi, odp := range message.OneofDecl {
+			g.P("// ", odp.GetName())
+			fname := oneofFieldName[int32(oi)]
+			g.P("switch x := m.", fname, ".(type) {")
+			for _, field := range message.Field {
+				if field.OneofIndex == nil || int(*field.OneofIndex) != oi {
+					continue
+				}
+				g.P("case *", oneofTypeName[field], ":")
+				var wire, pre, post string
+				val := "x." + fieldNames[field] // overridden for TYPE_BOOL
+				canFail := false                // only TYPE_MESSAGE and TYPE_GROUP can fail
+				switch *field.Type {
+				case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
+					wire = "WireFixed64"
+					pre = "b.EncodeFixed64(" + g.Pkg["math"] + ".Float64bits("
+					post = "))"
+				case descriptor.FieldDescriptorProto_TYPE_FLOAT:
+					wire = "WireFixed32"
+					pre = "b.EncodeFixed32(uint64(" + g.Pkg["math"] + ".Float32bits("
+					post = ")))"
+				case descriptor.FieldDescriptorProto_TYPE_INT64,
+					descriptor.FieldDescriptorProto_TYPE_UINT64:
+					wire = "WireVarint"
+					pre, post = "b.EncodeVarint(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_INT32,
+					descriptor.FieldDescriptorProto_TYPE_UINT32,
+					descriptor.FieldDescriptorProto_TYPE_ENUM:
+					wire = "WireVarint"
+					pre, post = "b.EncodeVarint(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_FIXED64,
+					descriptor.FieldDescriptorProto_TYPE_SFIXED64:
+					wire = "WireFixed64"
+					pre, post = "b.EncodeFixed64(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_FIXED32,
+					descriptor.FieldDescriptorProto_TYPE_SFIXED32:
+					wire = "WireFixed32"
+					pre, post = "b.EncodeFixed32(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_BOOL:
+					// bool needs special handling.
+					g.P("t := uint64(0)")
+					g.P("if ", val, " { t = 1 }")
+					val = "t"
+					wire = "WireVarint"
+					pre, post = "b.EncodeVarint(", ")"
+				case descriptor.FieldDescriptorProto_TYPE_STRING:
+					wire = "WireBytes"
+					pre, post = "b.EncodeStringBytes(", ")"
+				case descriptor.FieldDescriptorProto_TYPE_GROUP:
+					wire = "WireStartGroup"
+					pre, post = "b.Marshal(", ")"
+					canFail = true
+				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+					wire = "WireBytes"
+					pre, post = "b.EncodeMessage(", ")"
+					canFail = true
+				case descriptor.FieldDescriptorProto_TYPE_BYTES:
+					wire = "WireBytes"
+					pre, post = "b.EncodeRawBytes(", ")"
+				case descriptor.FieldDescriptorProto_TYPE_SINT32:
+					wire = "WireVarint"
+					pre, post = "b.EncodeZigzag32(uint64(", "))"
+				case descriptor.FieldDescriptorProto_TYPE_SINT64:
+					wire = "WireVarint"
+					pre, post = "b.EncodeZigzag64(uint64(", "))"
+				default:
+					g.Fail("unhandled oneof field type ", field.Type.String())
+				}
+				fieldWire[field] = wire
+				g.P("b.EncodeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".", wire, ")")
+				if !canFail {
+					g.P(pre, val, post)
+				} else {
+					g.P("if err := ", pre, val, post, "; err != nil {")
+					g.P("return err")
+					g.P("}")
+				}
+				if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
+					g.P("b.EncodeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".WireEndGroup)")
+				}
+			}
+			g.P("case nil:")
+			g.P("default: return ", g.Pkg["fmt"], `.Errorf("`, ccTypeName, ".", fname, ` has unexpected type %T", x)`)
+			g.P("}")
+		}
+		g.P("return nil")
+		g.P("}")
+		g.P()
+
+		// unmarshaler
+		g.P("func ", dec, decSig, " {")
+		g.P("m := msg.(*", ccTypeName, ")")
+		g.P("switch tag {")
+		for _, field := range message.Field {
+			if field.OneofIndex == nil {
+				continue
+			}
+			odp := message.OneofDecl[int(*field.OneofIndex)]
+			g.P("case ", field.Number, ": // ", odp.GetName(), ".", *field.Name)
+			g.P("if wire != ", g.Pkg["proto"], ".", fieldWire[field], " {")
+			g.P("return true, ", g.Pkg["proto"], ".ErrInternalBadWireType")
+			g.P("}")
+			lhs := "x, err" // overridden for TYPE_MESSAGE and TYPE_GROUP
+			var dec, cast, cast2 string
+			switch *field.Type {
+			case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
+				dec, cast = "b.DecodeFixed64()", g.Pkg["math"]+".Float64frombits"
+			case descriptor.FieldDescriptorProto_TYPE_FLOAT:
+				dec, cast, cast2 = "b.DecodeFixed32()", "uint32", g.Pkg["math"]+".Float32frombits"
+			case descriptor.FieldDescriptorProto_TYPE_INT64:
+				dec, cast = "b.DecodeVarint()", "int64"
+			case descriptor.FieldDescriptorProto_TYPE_UINT64:
+				dec = "b.DecodeVarint()"
+			case descriptor.FieldDescriptorProto_TYPE_INT32:
+				dec, cast = "b.DecodeVarint()", "int32"
+			case descriptor.FieldDescriptorProto_TYPE_FIXED64:
+				dec = "b.DecodeFixed64()"
+			case descriptor.FieldDescriptorProto_TYPE_FIXED32:
+				dec, cast = "b.DecodeFixed32()", "uint32"
+			case descriptor.FieldDescriptorProto_TYPE_BOOL:
+				dec = "b.DecodeVarint()"
+				// handled specially below
+			case descriptor.FieldDescriptorProto_TYPE_STRING:
+				dec = "b.DecodeStringBytes()"
+			case descriptor.FieldDescriptorProto_TYPE_GROUP:
+				g.P("msg := new(", fieldTypes[field][1:], ")") // drop star
+				lhs = "err"
+				dec = "b.DecodeGroup(msg)"
+				// handled specially below
+			case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+				g.P("msg := new(", fieldTypes[field][1:], ")") // drop star
+				lhs = "err"
+				dec = "b.DecodeMessage(msg)"
+				// handled specially below
+			case descriptor.FieldDescriptorProto_TYPE_BYTES:
+				dec = "b.DecodeRawBytes(true)"
+			case descriptor.FieldDescriptorProto_TYPE_UINT32:
+				dec, cast = "b.DecodeVarint()", "uint32"
+			case descriptor.FieldDescriptorProto_TYPE_ENUM:
+				dec, cast = "b.DecodeVarint()", fieldTypes[field]
+			case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
+				dec, cast = "b.DecodeFixed32()", "int32"
+			case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
+				dec, cast = "b.DecodeFixed64()", "int64"
+			case descriptor.FieldDescriptorProto_TYPE_SINT32:
+				dec, cast = "b.DecodeZigzag32()", "int32"
+			case descriptor.FieldDescriptorProto_TYPE_SINT64:
+				dec, cast = "b.DecodeZigzag64()", "int64"
+			default:
+				g.Fail("unhandled oneof field type ", field.Type.String())
+			}
+			g.P(lhs, " := ", dec)
+			val := "x"
+			if cast != "" {
+				val = cast + "(" + val + ")"
+			}
+			if cast2 != "" {
+				val = cast2 + "(" + val + ")"
+			}
+			switch *field.Type {
+			case descriptor.FieldDescriptorProto_TYPE_BOOL:
+				val += " != 0"
+			case descriptor.FieldDescriptorProto_TYPE_GROUP,
+				descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+				val = "msg"
+			}
+			g.P("m.", oneofFieldName[*field.OneofIndex], " = &", oneofTypeName[field], "{", val, "}")
+			g.P("return true, err")
+		}
+		g.P("default: return false, nil")
+		g.P("}")
+		g.P("}")
+		g.P()
+
+		// sizer
+		g.P("func ", size, sizeSig, " {")
+		g.P("m := msg.(*", ccTypeName, ")")
+		for oi, odp := range message.OneofDecl {
+			g.P("// ", odp.GetName())
+			fname := oneofFieldName[int32(oi)]
+			g.P("switch x := m.", fname, ".(type) {")
+			for _, field := range message.Field {
+				if field.OneofIndex == nil || int(*field.OneofIndex) != oi {
+					continue
+				}
+				g.P("case *", oneofTypeName[field], ":")
+				val := "x." + fieldNames[field]
+				var wire, varint, fixed string
+				switch *field.Type {
+				case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
+					wire = "WireFixed64"
+					fixed = "8"
+				case descriptor.FieldDescriptorProto_TYPE_FLOAT:
+					wire = "WireFixed32"
+					fixed = "4"
+				case descriptor.FieldDescriptorProto_TYPE_INT64,
+					descriptor.FieldDescriptorProto_TYPE_UINT64,
+					descriptor.FieldDescriptorProto_TYPE_INT32,
+					descriptor.FieldDescriptorProto_TYPE_UINT32,
+					descriptor.FieldDescriptorProto_TYPE_ENUM:
+					wire = "WireVarint"
+					varint = val
+				case descriptor.FieldDescriptorProto_TYPE_FIXED64,
+					descriptor.FieldDescriptorProto_TYPE_SFIXED64:
+					wire = "WireFixed64"
+					fixed = "8"
+				case descriptor.FieldDescriptorProto_TYPE_FIXED32,
+					descriptor.FieldDescriptorProto_TYPE_SFIXED32:
+					wire = "WireFixed32"
+					fixed = "4"
+				case descriptor.FieldDescriptorProto_TYPE_BOOL:
+					wire = "WireVarint"
+					fixed = "1"
+				case descriptor.FieldDescriptorProto_TYPE_STRING:
+					wire = "WireBytes"
+					fixed = "len(" + val + ")"
+					varint = fixed
+				case descriptor.FieldDescriptorProto_TYPE_GROUP:
+					wire = "WireStartGroup"
+					fixed = g.Pkg["proto"] + ".Size(" + val + ")"
+				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
+					wire = "WireBytes"
+					g.P("s := ", g.Pkg["proto"], ".Size(", val, ")")
+					fixed = "s"
+					varint = fixed
+				case descriptor.FieldDescriptorProto_TYPE_BYTES:
+					wire = "WireBytes"
+					fixed = "len(" + val + ")"
+					varint = fixed
+				case descriptor.FieldDescriptorProto_TYPE_SINT32:
+					wire = "WireVarint"
+					varint = "(uint32(" + val + ") << 1) ^ uint32((int32(" + val + ") >> 31))"
+				case descriptor.FieldDescriptorProto_TYPE_SINT64:
+					wire = "WireVarint"
+					varint = "uint64(" + val + " << 1) ^ uint64((int64(" + val + ") >> 63))"
+				default:
+					g.Fail("unhandled oneof field type ", field.Type.String())
+				}
+				g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".", wire, ")")
+				if varint != "" {
+					g.P("n += ", g.Pkg["proto"], ".SizeVarint(uint64(", varint, "))")
+				}
+				if fixed != "" {
+					g.P("n += ", fixed)
+				}
+				if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
+					g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".WireEndGroup)")
+				}
+			}
+			g.P("case nil:")
+			g.P("default:")
+			g.P("panic(", g.Pkg["fmt"], ".Sprintf(\"proto: unexpected type %T in oneof\", x))")
+			g.P("}")
+		}
+		g.P("return n")
+		g.P("}")
+		g.P()
+	}
+
+	for _, ext := range message.ext {
+		g.generateExtension(ext)
+	}
+
+	fullName := strings.Join(message.TypeName(), ".")
+	if g.file.Package != nil {
+		fullName = *g.file.Package + "." + fullName
+	}
+
+	g.addInitf("%s.RegisterType((*%s)(nil), %q)", g.Pkg["proto"], ccTypeName, fullName)
+}
+
+func (g *Generator) generateExtension(ext *ExtensionDescriptor) {
+	ccTypeName := ext.DescName()
+
+	extObj := g.ObjectNamed(*ext.Extendee)
+	var extDesc *Descriptor
+	if id, ok := extObj.(*ImportedDescriptor); ok {
+		// This is extending a publicly imported message.
+		// We need the underlying type for goTag.
+		extDesc = id.o.(*Descriptor)
+	} else {
+		extDesc = extObj.(*Descriptor)
+	}
+	extendedType := "*" + g.TypeName(extObj) // always use the original
+	field := ext.FieldDescriptorProto
+	fieldType, wireType := g.GoType(ext.parent, field)
+	tag := g.goTag(extDesc, field, wireType)
+	g.RecordTypeUse(*ext.Extendee)
+	if n := ext.FieldDescriptorProto.TypeName; n != nil {
+		// foreign extension type
+		g.RecordTypeUse(*n)
+	}
+
+	typeName := ext.TypeName()
+
+	// Special case for proto2 message sets: If this extension is extending
+	// proto2_bridge.MessageSet, and its final name component is "message_set_extension",
+	// then drop that last component.
+	mset := false
+	if extendedType == "*proto2_bridge.MessageSet" && typeName[len(typeName)-1] == "message_set_extension" {
+		typeName = typeName[:len(typeName)-1]
+		mset = true
+	}
+
+	// For text formatting, the package must be exactly what the .proto file declares,
+	// ignoring overrides such as the go_package option, and with no dot/underscore mapping.
+	extName := strings.Join(typeName, ".")
+	if g.file.Package != nil {
+		extName = *g.file.Package + "." + extName
+	}
+
+	g.P("var ", ccTypeName, " = &", g.Pkg["proto"], ".ExtensionDesc{")
+	g.In()
+	g.P("ExtendedType: (", extendedType, ")(nil),")
+	g.P("ExtensionType: (", fieldType, ")(nil),")
+	g.P("Field: ", field.Number, ",")
+	g.P(`Name: "`, extName, `",`)
+	g.P("Tag: ", tag, ",")
+
+	g.Out()
+	g.P("}")
+	g.P()
+
+	if mset {
+		// Generate a bit more code to register with message_set.go.
+		g.addInitf("%s.RegisterMessageSetType((%s)(nil), %d, %q)", g.Pkg["proto"], fieldType, *field.Number, extName)
+	}
+
+	g.file.addExport(ext, constOrVarSymbol{ccTypeName, "var", ""})
+}
+
+func (g *Generator) generateInitFunction() {
+	for _, enum := range g.file.enum {
+		g.generateEnumRegistration(enum)
+	}
+	for _, d := range g.file.desc {
+		for _, ext := range d.ext {
+			g.generateExtensionRegistration(ext)
+		}
+	}
+	for _, ext := range g.file.ext {
+		g.generateExtensionRegistration(ext)
+	}
+	if len(g.init) == 0 {
+		return
+	}
+	g.P("func init() {")
+	g.In()
+	for _, l := range g.init {
+		g.P(l)
+	}
+	g.Out()
+	g.P("}")
+	g.init = nil
+}
+
+func (g *Generator) generateFileDescriptor(file *FileDescriptor) {
+	// Make a copy and trim source_code_info data.
+	// TODO: Trim this more when we know exactly what we need.
+	pb := proto.Clone(file.FileDescriptorProto).(*descriptor.FileDescriptorProto)
+	pb.SourceCodeInfo = nil
+
+	b, err := proto.Marshal(pb)
+	if err != nil {
+		g.Fail(err.Error())
+	}
+
+	var buf bytes.Buffer
+	w, _ := gzip.NewWriterLevel(&buf, gzip.BestCompression)
+	w.Write(b)
+	w.Close()
+	b = buf.Bytes()
+
+	g.P("var fileDescriptor", file.index, " = []byte{")
+	g.In()
+	g.P("// ", len(b), " bytes of a gzipped FileDescriptorProto")
+	for len(b) > 0 {
+		n := 16
+		if n > len(b) {
+			n = len(b)
+		}
+
+		s := ""
+		for _, c := range b[:n] {
+			s += fmt.Sprintf("0x%02x,", c)
+		}
+		g.P(s)
+
+		b = b[n:]
+	}
+	g.Out()
+	g.P("}")
+}
+
+func (g *Generator) generateEnumRegistration(enum *EnumDescriptor) {
+	// // We always print the full (proto-world) package name here.
+	pkg := enum.File().GetPackage()
+	if pkg != "" {
+		pkg += "."
+	}
+	// The full type name
+	typeName := enum.TypeName()
+	// The full type name, CamelCased.
+	ccTypeName := CamelCaseSlice(typeName)
+	g.addInitf("%s.RegisterEnum(%q, %[3]s_name, %[3]s_value)", g.Pkg["proto"], pkg+ccTypeName, ccTypeName)
+}
+
+func (g *Generator) generateExtensionRegistration(ext *ExtensionDescriptor) {
+	g.addInitf("%s.RegisterExtension(%s)", g.Pkg["proto"], ext.DescName())
+}
+
+// And now lots of helper functions.
+
+// Is c an ASCII lower-case letter?
+func isASCIILower(c byte) bool {
+	return 'a' <= c && c <= 'z'
+}
+
+// Is c an ASCII digit?
+func isASCIIDigit(c byte) bool {
+	return '0' <= c && c <= '9'
+}
+
+// CamelCase returns the CamelCased name.
+// If there is an interior underscore followed by a lower case letter,
+// drop the underscore and convert the letter to upper case.
+// There is a remote possibility of this rewrite causing a name collision,
+// but it's so remote we're prepared to pretend it's nonexistent - since the
+// C++ generator lowercases names, it's extremely unlikely to have two fields
+// with different capitalizations.
+// In short, _my_field_name_2 becomes XMyFieldName_2.
+func CamelCase(s string) string {
+	if s == "" {
+		return ""
+	}
+	t := make([]byte, 0, 32)
+	i := 0
+	if s[0] == '_' {
+		// Need a capital letter; drop the '_'.
+		t = append(t, 'X')
+		i++
+	}
+	// Invariant: if the next letter is lower case, it must be converted
+	// to upper case.
+	// That is, we process a word at a time, where words are marked by _ or
+	// upper case letter. Digits are treated as words.
+	for ; i < len(s); i++ {
+		c := s[i]
+		if c == '_' && i+1 < len(s) && isASCIILower(s[i+1]) {
+			continue // Skip the underscore in s.
+		}
+		if isASCIIDigit(c) {
+			t = append(t, c)
+			continue
+		}
+		// Assume we have a letter now - if not, it's a bogus identifier.
+		// The next word is a sequence of characters that must start upper case.
+		if isASCIILower(c) {
+			c ^= ' ' // Make it a capital letter.
+		}
+		t = append(t, c) // Guaranteed not lower case.
+		// Accept lower case sequence that follows.
+		for i+1 < len(s) && isASCIILower(s[i+1]) {
+			i++
+			t = append(t, s[i])
+		}
+	}
+	return string(t)
+}
+
+// CamelCaseSlice is like CamelCase, but the argument is a slice of strings to
+// be joined with "_".
+func CamelCaseSlice(elem []string) string { return CamelCase(strings.Join(elem, "_")) }
+
+// dottedSlice turns a sliced name into a dotted name.
+func dottedSlice(elem []string) string { return strings.Join(elem, ".") }
+
+// Given a .proto file name, return the output name for the generated Go program.
+func goFileName(name string) string {
+	ext := path.Ext(name)
+	if ext == ".proto" || ext == ".protodevel" {
+		name = name[0 : len(name)-len(ext)]
+	}
+	return name + ".pb.go"
+}
+
+// Is this field optional?
+func isOptional(field *descriptor.FieldDescriptorProto) bool {
+	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_OPTIONAL
+}
+
+// Is this field required?
+func isRequired(field *descriptor.FieldDescriptorProto) bool {
+	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_REQUIRED
+}
+
+// Is this field repeated?
+func isRepeated(field *descriptor.FieldDescriptorProto) bool {
+	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_REPEATED
+}
+
+// badToUnderscore is the mapping function used to generate Go names from package names,
+// which can be dotted in the input .proto file.  It replaces non-identifier characters such as
+// dot or dash with underscore.
+func badToUnderscore(r rune) rune {
+	if unicode.IsLetter(r) || unicode.IsDigit(r) || r == '_' {
+		return r
+	}
+	return '_'
+}
+
+// baseName returns the last path element of the name, with the last dotted suffix removed.
+func baseName(name string) string {
+	// First, find the last element
+	if i := strings.LastIndex(name, "/"); i >= 0 {
+		name = name[i+1:]
+	}
+	// Now drop the suffix
+	if i := strings.LastIndex(name, "."); i >= 0 {
+		name = name[0:i]
+	}
+	return name
+}
+
+// The SourceCodeInfo message describes the location of elements of a parsed
+// .proto file by way of a "path", which is a sequence of integers that
+// describe the route from a FileDescriptorProto to the relevant submessage.
+// The path alternates between a field number of a repeated field, and an index
+// into that repeated field. The constants below define the field numbers that
+// are used.
+//
+// See descriptor.proto for more information about this.
+const (
+	// tag numbers in FileDescriptorProto
+	packagePath = 2 // package
+	messagePath = 4 // message_type
+	enumPath    = 5 // enum_type
+	// tag numbers in DescriptorProto
+	messageFieldPath   = 2 // field
+	messageMessagePath = 3 // nested_type
+	messageEnumPath    = 4 // enum_type
+	messageOneofPath   = 8 // oneof_decl
+	// tag numbers in EnumDescriptorProto
+	enumValuePath = 2 // value
+)
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
new file mode 100644
index 0000000000..f33f7011bf
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
@@ -0,0 +1,442 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2015 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Package grpc outputs gRPC service descriptions in Go code.
+// It runs as a plugin for the Go protocol buffer compiler plugin.
+// It is linked in to protoc-gen-go.
+package grpc
+
+import (
+	"fmt"
+	"path"
+	"strconv"
+	"strings"
+
+	pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
+	"github.com/golang/protobuf/protoc-gen-go/generator"
+)
+
+// Paths for packages used by code generated in this file,
+// relative to the import_prefix of the generator.Generator.
+const (
+	contextPkgPath = "golang.org/x/net/context"
+	grpcPkgPath    = "google.golang.org/grpc"
+)
+
+func init() {
+	generator.RegisterPlugin(new(grpc))
+}
+
+// grpc is an implementation of the Go protocol buffer compiler's
+// plugin architecture.  It generates bindings for gRPC support.
+type grpc struct {
+	gen *generator.Generator
+}
+
+// Name returns the name of this plugin, "grpc".
+func (g *grpc) Name() string {
+	return "grpc"
+}
+
+// The names for packages imported in the generated code.
+// They may vary from the final path component of the import path
+// if the name is used by other packages.
+var (
+	contextPkg string
+	grpcPkg    string
+)
+
+// Init initializes the plugin.
+func (g *grpc) Init(gen *generator.Generator) {
+	g.gen = gen
+	contextPkg = generator.RegisterUniquePackageName("context", nil)
+	grpcPkg = generator.RegisterUniquePackageName("grpc", nil)
+}
+
+// Given a type name defined in a .proto, return its object.
+// Also record that we're using it, to guarantee the associated import.
+func (g *grpc) objectNamed(name string) generator.Object {
+	g.gen.RecordTypeUse(name)
+	return g.gen.ObjectNamed(name)
+}
+
+// Given a type name defined in a .proto, return its name as we will print it.
+func (g *grpc) typeName(str string) string {
+	return g.gen.TypeName(g.objectNamed(str))
+}
+
+// P forwards to g.gen.P.
+func (g *grpc) P(args ...interface{}) { g.gen.P(args...) }
+
+// Generate generates code for the services in the given file.
+func (g *grpc) Generate(file *generator.FileDescriptor) {
+	if len(file.FileDescriptorProto.Service) == 0 {
+		return
+	}
+	g.P("// Reference imports to suppress errors if they are not otherwise used.")
+	g.P("var _ ", contextPkg, ".Context")
+	g.P("var _ ", grpcPkg, ".ClientConn")
+	g.P()
+	for i, service := range file.FileDescriptorProto.Service {
+		g.generateService(file, service, i)
+	}
+}
+
+// GenerateImports generates the import declaration for this file.
+func (g *grpc) GenerateImports(file *generator.FileDescriptor) {
+	if len(file.FileDescriptorProto.Service) == 0 {
+		return
+	}
+	g.P("import (")
+	g.P(contextPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, contextPkgPath)))
+	g.P(grpcPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, grpcPkgPath)))
+	g.P(")")
+	g.P()
+}
+
+// reservedClientName records whether a client name is reserved on the client side.
+var reservedClientName = map[string]bool{
+// TODO: do we need any in gRPC?
+}
+
+func unexport(s string) string { return strings.ToLower(s[:1]) + s[1:] }
+
+// generateService generates all the code for the named service.
+func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.ServiceDescriptorProto, index int) {
+	path := fmt.Sprintf("6,%d", index) // 6 means service.
+
+	origServName := service.GetName()
+	fullServName := origServName
+	if pkg := file.GetPackage(); pkg != "" {
+		fullServName = pkg + "." + fullServName
+	}
+	servName := generator.CamelCase(origServName)
+
+	g.P()
+	g.P("// Client API for ", servName, " service")
+	g.P()
+
+	// Client interface.
+	g.P("type ", servName, "Client interface {")
+	for i, method := range service.Method {
+		g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service.
+		g.P(g.generateClientSignature(servName, method))
+	}
+	g.P("}")
+	g.P()
+
+	// Client structure.
+	g.P("type ", unexport(servName), "Client struct {")
+	g.P("cc *", grpcPkg, ".ClientConn")
+	g.P("}")
+	g.P()
+
+	// NewClient factory.
+	g.P("func New", servName, "Client (cc *", grpcPkg, ".ClientConn) ", servName, "Client {")
+	g.P("return &", unexport(servName), "Client{cc}")
+	g.P("}")
+	g.P()
+
+	var methodIndex, streamIndex int
+	serviceDescVar := "_" + servName + "_serviceDesc"
+	// Client method implementations.
+	for _, method := range service.Method {
+		var descExpr string
+		if !method.GetServerStreaming() && !method.GetClientStreaming() {
+			// Unary RPC method
+			descExpr = fmt.Sprintf("&%s.Methods[%d]", serviceDescVar, methodIndex)
+			methodIndex++
+		} else {
+			// Streaming RPC method
+			descExpr = fmt.Sprintf("&%s.Streams[%d]", serviceDescVar, streamIndex)
+			streamIndex++
+		}
+		g.generateClientMethod(servName, fullServName, serviceDescVar, method, descExpr)
+	}
+
+	g.P("// Server API for ", servName, " service")
+	g.P()
+
+	// Server interface.
+	serverType := servName + "Server"
+	g.P("type ", serverType, " interface {")
+	for i, method := range service.Method {
+		g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service.
+		g.P(g.generateServerSignature(servName, method))
+	}
+	g.P("}")
+	g.P()
+
+	// Server registration.
+	g.P("func Register", servName, "Server(s *", grpcPkg, ".Server, srv ", serverType, ") {")
+	g.P("s.RegisterService(&", serviceDescVar, `, srv)`)
+	g.P("}")
+	g.P()
+
+	// Server handler implementations.
+	var handlerNames []string
+	for _, method := range service.Method {
+		hname := g.generateServerMethod(servName, method)
+		handlerNames = append(handlerNames, hname)
+	}
+
+	// Service descriptor.
+	g.P("var ", serviceDescVar, " = ", grpcPkg, ".ServiceDesc {")
+	g.P("ServiceName: ", strconv.Quote(fullServName), ",")
+	g.P("HandlerType: (*", serverType, ")(nil),")
+	g.P("Methods: []", grpcPkg, ".MethodDesc{")
+	for i, method := range service.Method {
+		if method.GetServerStreaming() || method.GetClientStreaming() {
+			continue
+		}
+		g.P("{")
+		g.P("MethodName: ", strconv.Quote(method.GetName()), ",")
+		g.P("Handler: ", handlerNames[i], ",")
+		g.P("},")
+	}
+	g.P("},")
+	g.P("Streams: []", grpcPkg, ".StreamDesc{")
+	for i, method := range service.Method {
+		if !method.GetServerStreaming() && !method.GetClientStreaming() {
+			continue
+		}
+		g.P("{")
+		g.P("StreamName: ", strconv.Quote(method.GetName()), ",")
+		g.P("Handler: ", handlerNames[i], ",")
+		if method.GetServerStreaming() {
+			g.P("ServerStreams: true,")
+		}
+		if method.GetClientStreaming() {
+			g.P("ClientStreams: true,")
+		}
+		g.P("},")
+	}
+	g.P("},")
+	g.P("}")
+	g.P()
+}
+
+// generateClientSignature returns the client-side signature for a method.
+func (g *grpc) generateClientSignature(servName string, method *pb.MethodDescriptorProto) string {
+	origMethName := method.GetName()
+	methName := generator.CamelCase(origMethName)
+	if reservedClientName[methName] {
+		methName += "_"
+	}
+	reqArg := ", in *" + g.typeName(method.GetInputType())
+	if method.GetClientStreaming() {
+		reqArg = ""
+	}
+	respName := "*" + g.typeName(method.GetOutputType())
+	if method.GetServerStreaming() || method.GetClientStreaming() {
+		respName = servName + "_" + generator.CamelCase(origMethName) + "Client"
+	}
+	return fmt.Sprintf("%s(ctx %s.Context%s, opts ...%s.CallOption) (%s, error)", methName, contextPkg, reqArg, grpcPkg, respName)
+}
+
+func (g *grpc) generateClientMethod(servName, fullServName, serviceDescVar string, method *pb.MethodDescriptorProto, descExpr string) {
+	sname := fmt.Sprintf("/%s/%s", fullServName, method.GetName())
+	methName := generator.CamelCase(method.GetName())
+	inType := g.typeName(method.GetInputType())
+	outType := g.typeName(method.GetOutputType())
+
+	g.P("func (c *", unexport(servName), "Client) ", g.generateClientSignature(servName, method), "{")
+	if !method.GetServerStreaming() && !method.GetClientStreaming() {
+		g.P("out := new(", outType, ")")
+		// TODO: Pass descExpr to Invoke.
+		g.P("err := ", grpcPkg, `.Invoke(ctx, "`, sname, `", in, out, c.cc, opts...)`)
+		g.P("if err != nil { return nil, err }")
+		g.P("return out, nil")
+		g.P("}")
+		g.P()
+		return
+	}
+	streamType := unexport(servName) + methName + "Client"
+	g.P("stream, err := ", grpcPkg, ".NewClientStream(ctx, ", descExpr, `, c.cc, "`, sname, `", opts...)`)
+	g.P("if err != nil { return nil, err }")
+	g.P("x := &", streamType, "{stream}")
+	if !method.GetClientStreaming() {
+		g.P("if err := x.ClientStream.SendMsg(in); err != nil { return nil, err }")
+		g.P("if err := x.ClientStream.CloseSend(); err != nil { return nil, err }")
+	}
+	g.P("return x, nil")
+	g.P("}")
+	g.P()
+
+	genSend := method.GetClientStreaming()
+	genRecv := method.GetServerStreaming()
+	genCloseAndRecv := !method.GetServerStreaming()
+
+	// Stream auxiliary types and methods.
+	g.P("type ", servName, "_", methName, "Client interface {")
+	if genSend {
+		g.P("Send(*", inType, ") error")
+	}
+	if genRecv {
+		g.P("Recv() (*", outType, ", error)")
+	}
+	if genCloseAndRecv {
+		g.P("CloseAndRecv() (*", outType, ", error)")
+	}
+	g.P(grpcPkg, ".ClientStream")
+	g.P("}")
+	g.P()
+
+	g.P("type ", streamType, " struct {")
+	g.P(grpcPkg, ".ClientStream")
+	g.P("}")
+	g.P()
+
+	if genSend {
+		g.P("func (x *", streamType, ") Send(m *", inType, ") error {")
+		g.P("return x.ClientStream.SendMsg(m)")
+		g.P("}")
+		g.P()
+	}
+	if genRecv {
+		g.P("func (x *", streamType, ") Recv() (*", outType, ", error) {")
+		g.P("m := new(", outType, ")")
+		g.P("if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err }")
+		g.P("return m, nil")
+		g.P("}")
+		g.P()
+	}
+	if genCloseAndRecv {
+		g.P("func (x *", streamType, ") CloseAndRecv() (*", outType, ", error) {")
+		g.P("if err := x.ClientStream.CloseSend(); err != nil { return nil, err }")
+		g.P("m := new(", outType, ")")
+		g.P("if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err }")
+		g.P("return m, nil")
+		g.P("}")
+		g.P()
+	}
+}
+
+// generateServerSignature returns the server-side signature for a method.
+func (g *grpc) generateServerSignature(servName string, method *pb.MethodDescriptorProto) string {
+	origMethName := method.GetName()
+	methName := generator.CamelCase(origMethName)
+	if reservedClientName[methName] {
+		methName += "_"
+	}
+
+	var reqArgs []string
+	ret := "error"
+	if !method.GetServerStreaming() && !method.GetClientStreaming() {
+		reqArgs = append(reqArgs, contextPkg+".Context")
+		ret = "(*" + g.typeName(method.GetOutputType()) + ", error)"
+	}
+	if !method.GetClientStreaming() {
+		reqArgs = append(reqArgs, "*"+g.typeName(method.GetInputType()))
+	}
+	if method.GetServerStreaming() || method.GetClientStreaming() {
+		reqArgs = append(reqArgs, servName+"_"+generator.CamelCase(origMethName)+"Server")
+	}
+
+	return methName + "(" + strings.Join(reqArgs, ", ") + ") " + ret
+}
+
+func (g *grpc) generateServerMethod(servName string, method *pb.MethodDescriptorProto) string {
+	methName := generator.CamelCase(method.GetName())
+	hname := fmt.Sprintf("_%s_%s_Handler", servName, methName)
+	inType := g.typeName(method.GetInputType())
+	outType := g.typeName(method.GetOutputType())
+
+	if !method.GetServerStreaming() && !method.GetClientStreaming() {
+		g.P("func ", hname, "(srv interface{}, ctx ", contextPkg, ".Context, dec func(interface{}) error) (interface{}, error) {")
+		g.P("in := new(", inType, ")")
+		g.P("if err := dec(in); err != nil { return nil, err }")
+		g.P("out, err := srv.(", servName, "Server).", methName, "(ctx, in)")
+		g.P("if err != nil { return nil, err }")
+		g.P("return out, nil")
+		g.P("}")
+		g.P()
+		return hname
+	}
+	streamType := unexport(servName) + methName + "Server"
+	g.P("func ", hname, "(srv interface{}, stream ", grpcPkg, ".ServerStream) error {")
+	if !method.GetClientStreaming() {
+		g.P("m := new(", inType, ")")
+		g.P("if err := stream.RecvMsg(m); err != nil { return err }")
+		g.P("return srv.(", servName, "Server).", methName, "(m, &", streamType, "{stream})")
+	} else {
+		g.P("return srv.(", servName, "Server).", methName, "(&", streamType, "{stream})")
+	}
+	g.P("}")
+	g.P()
+
+	genSend := method.GetServerStreaming()
+	genSendAndClose := !method.GetServerStreaming()
+	genRecv := method.GetClientStreaming()
+
+	// Stream auxiliary types and methods.
+	g.P("type ", servName, "_", methName, "Server interface {")
+	if genSend {
+		g.P("Send(*", outType, ") error")
+	}
+	if genSendAndClose {
+		g.P("SendAndClose(*", outType, ") error")
+	}
+	if genRecv {
+		g.P("Recv() (*", inType, ", error)")
+	}
+	g.P(grpcPkg, ".ServerStream")
+	g.P("}")
+	g.P()
+
+	g.P("type ", streamType, " struct {")
+	g.P(grpcPkg, ".ServerStream")
+	g.P("}")
+	g.P()
+
+	if genSend {
+		g.P("func (x *", streamType, ") Send(m *", outType, ") error {")
+		g.P("return x.ServerStream.SendMsg(m)")
+		g.P("}")
+		g.P()
+	}
+	if genSendAndClose {
+		g.P("func (x *", streamType, ") SendAndClose(m *", outType, ") error {")
+		g.P("return x.ServerStream.SendMsg(m)")
+		g.P("}")
+		g.P()
+	}
+	if genRecv {
+		g.P("func (x *", streamType, ") Recv() (*", inType, ", error) {")
+		g.P("m := new(", inType, ")")
+		g.P("if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err }")
+		g.P("return m, nil")
+		g.P("}")
+		g.P()
+	}
+
+	return hname
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
new file mode 100644
index 0000000000..24e490ec4b
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
@@ -0,0 +1,34 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2015 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import _ "github.com/golang/protobuf/protoc-gen-go/internal/grpc"
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/main.go b/vendor/github.com/golang/protobuf/protoc-gen-go/main.go
new file mode 100644
index 0000000000..8e2486de0b
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/main.go
@@ -0,0 +1,98 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2010 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// protoc-gen-go is a plugin for the Google protocol buffer compiler to generate
+// Go code.  Run it by building this program and putting it in your path with
+// the name
+// 	protoc-gen-go
+// That word 'go' at the end becomes part of the option string set for the
+// protocol compiler, so once the protocol compiler (protoc) is installed
+// you can run
+// 	protoc --go_out=output_directory input_directory/file.proto
+// to generate Go bindings for the protocol defined by file.proto.
+// With that input, the output will be written to
+// 	output_directory/file.pb.go
+//
+// The generated code is documented in the package comment for
+// the library.
+//
+// See the README and documentation for protocol buffers to learn more:
+// 	https://developers.google.com/protocol-buffers/
+package main
+
+import (
+	"io/ioutil"
+	"os"
+
+	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/protoc-gen-go/generator"
+)
+
+func main() {
+	// Begin by allocating a generator. The request and response structures are stored there
+	// so we can do error handling easily - the response structure contains the field to
+	// report failure.
+	g := generator.New()
+
+	data, err := ioutil.ReadAll(os.Stdin)
+	if err != nil {
+		g.Error(err, "reading input")
+	}
+
+	if err := proto.Unmarshal(data, g.Request); err != nil {
+		g.Error(err, "parsing input proto")
+	}
+
+	if len(g.Request.FileToGenerate) == 0 {
+		g.Fail("no files to generate")
+	}
+
+	g.CommandLineParameters(g.Request.GetParameter())
+
+	// Create a wrapped version of the Descriptors and EnumDescriptors that
+	// point to the file that defines them.
+	g.WrapTypes()
+
+	g.SetPackageNames()
+	g.BuildTypeNameMap()
+
+	g.GenerateAllFiles()
+
+	// Send back the results.
+	data, err = proto.Marshal(g.Response)
+	if err != nil {
+		g.Error(err, "failed to marshal output proto")
+	}
+	_, err = os.Stdout.Write(data)
+	if err != nil {
+		g.Error(err, "failed to write output proto")
+	}
+}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
new file mode 100644
index 0000000000..af31f733e9
--- /dev/null
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
@@ -0,0 +1,222 @@
+// Code generated by protoc-gen-go.
+// source: google/protobuf/compiler/plugin.proto
+// DO NOT EDIT!
+
+/*
+Package google_protobuf_compiler is a generated protocol buffer package.
+
+It is generated from these files:
+	google/protobuf/compiler/plugin.proto
+
+It has these top-level messages:
+	CodeGeneratorRequest
+	CodeGeneratorResponse
+*/
+package google_protobuf_compiler
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import google_protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+const _ = proto.ProtoPackageIsVersion1
+
+// An encoded CodeGeneratorRequest is written to the plugin's stdin.
+type CodeGeneratorRequest struct {
+	// The .proto files that were explicitly listed on the command-line.  The
+	// code generator should generate code only for these files.  Each file's
+	// descriptor will be included in proto_file, below.
+	FileToGenerate []string `protobuf:"bytes,1,rep,name=file_to_generate" json:"file_to_generate,omitempty"`
+	// The generator parameter passed on the command-line.
+	Parameter *string `protobuf:"bytes,2,opt,name=parameter" json:"parameter,omitempty"`
+	// FileDescriptorProtos for all files in files_to_generate and everything
+	// they import.  The files will appear in topological order, so each file
+	// appears before any file that imports it.
+	//
+	// protoc guarantees that all proto_files will be written after
+	// the fields above, even though this is not technically guaranteed by the
+	// protobuf wire format.  This theoretically could allow a plugin to stream
+	// in the FileDescriptorProtos and handle them one by one rather than read
+	// the entire set into memory at once.  However, as of this writing, this
+	// is not similarly optimized on protoc's end -- it will store all fields in
+	// memory at once before sending them to the plugin.
+	ProtoFile        []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file" json:"proto_file,omitempty"`
+	XXX_unrecognized []byte                                 `json:"-"`
+}
+
+func (m *CodeGeneratorRequest) Reset()                    { *m = CodeGeneratorRequest{} }
+func (m *CodeGeneratorRequest) String() string            { return proto.CompactTextString(m) }
+func (*CodeGeneratorRequest) ProtoMessage()               {}
+func (*CodeGeneratorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *CodeGeneratorRequest) GetFileToGenerate() []string {
+	if m != nil {
+		return m.FileToGenerate
+	}
+	return nil
+}
+
+func (m *CodeGeneratorRequest) GetParameter() string {
+	if m != nil && m.Parameter != nil {
+		return *m.Parameter
+	}
+	return ""
+}
+
+func (m *CodeGeneratorRequest) GetProtoFile() []*google_protobuf.FileDescriptorProto {
+	if m != nil {
+		return m.ProtoFile
+	}
+	return nil
+}
+
+// The plugin writes an encoded CodeGeneratorResponse to stdout.
+type CodeGeneratorResponse struct {
+	// Error message.  If non-empty, code generation failed.  The plugin process
+	// should exit with status code zero even if it reports an error in this way.
+	//
+	// This should be used to indicate errors in .proto files which prevent the
+	// code generator from generating correct code.  Errors which indicate a
+	// problem in protoc itself -- such as the input CodeGeneratorRequest being
+	// unparseable -- should be reported by writing a message to stderr and
+	// exiting with a non-zero status code.
+	Error            *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	File             []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
+	XXX_unrecognized []byte                        `json:"-"`
+}
+
+func (m *CodeGeneratorResponse) Reset()                    { *m = CodeGeneratorResponse{} }
+func (m *CodeGeneratorResponse) String() string            { return proto.CompactTextString(m) }
+func (*CodeGeneratorResponse) ProtoMessage()               {}
+func (*CodeGeneratorResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *CodeGeneratorResponse) GetError() string {
+	if m != nil && m.Error != nil {
+		return *m.Error
+	}
+	return ""
+}
+
+func (m *CodeGeneratorResponse) GetFile() []*CodeGeneratorResponse_File {
+	if m != nil {
+		return m.File
+	}
+	return nil
+}
+
+// Represents a single generated file.
+type CodeGeneratorResponse_File struct {
+	// The file name, relative to the output directory.  The name must not
+	// contain "." or ".." components and must be relative, not be absolute (so,
+	// the file cannot lie outside the output directory).  "/" must be used as
+	// the path separator, not "\".
+	//
+	// If the name is omitted, the content will be appended to the previous
+	// file.  This allows the generator to break large files into small chunks,
+	// and allows the generated text to be streamed back to protoc so that large
+	// files need not reside completely in memory at one time.  Note that as of
+	// this writing protoc does not optimize for this -- it will read the entire
+	// CodeGeneratorResponse before writing files to disk.
+	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// If non-empty, indicates that the named file should already exist, and the
+	// content here is to be inserted into that file at a defined insertion
+	// point.  This feature allows a code generator to extend the output
+	// produced by another code generator.  The original generator may provide
+	// insertion points by placing special annotations in the file that look
+	// like:
+	//   @@protoc_insertion_point(NAME)
+	// The annotation can have arbitrary text before and after it on the line,
+	// which allows it to be placed in a comment.  NAME should be replaced with
+	// an identifier naming the point -- this is what other generators will use
+	// as the insertion_point.  Code inserted at this point will be placed
+	// immediately above the line containing the insertion point (thus multiple
+	// insertions to the same point will come out in the order they were added).
+	// The double-@ is intended to make it unlikely that the generated code
+	// could contain things that look like insertion points by accident.
+	//
+	// For example, the C++ code generator places the following line in the
+	// .pb.h files that it generates:
+	//   // @@protoc_insertion_point(namespace_scope)
+	// This line appears within the scope of the file's package namespace, but
+	// outside of any particular class.  Another plugin can then specify the
+	// insertion_point "namespace_scope" to generate additional classes or
+	// other declarations that should be placed in this scope.
+	//
+	// Note that if the line containing the insertion point begins with
+	// whitespace, the same whitespace will be added to every line of the
+	// inserted text.  This is useful for languages like Python, where
+	// indentation matters.  In these languages, the insertion point comment
+	// should be indented the same amount as any inserted code will need to be
+	// in order to work correctly in that context.
+	//
+	// The code generator that generates the initial file and the one which
+	// inserts into it must both run as part of a single invocation of protoc.
+	// Code generators are executed in the order in which they appear on the
+	// command line.
+	//
+	// If |insertion_point| is present, |name| must also be present.
+	InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point" json:"insertion_point,omitempty"`
+	// The file contents.
+	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *CodeGeneratorResponse_File) Reset()                    { *m = CodeGeneratorResponse_File{} }
+func (m *CodeGeneratorResponse_File) String() string            { return proto.CompactTextString(m) }
+func (*CodeGeneratorResponse_File) ProtoMessage()               {}
+func (*CodeGeneratorResponse_File) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+
+func (m *CodeGeneratorResponse_File) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *CodeGeneratorResponse_File) GetInsertionPoint() string {
+	if m != nil && m.InsertionPoint != nil {
+		return *m.InsertionPoint
+	}
+	return ""
+}
+
+func (m *CodeGeneratorResponse_File) GetContent() string {
+	if m != nil && m.Content != nil {
+		return *m.Content
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*CodeGeneratorRequest)(nil), "google.protobuf.compiler.CodeGeneratorRequest")
+	proto.RegisterType((*CodeGeneratorResponse)(nil), "google.protobuf.compiler.CodeGeneratorResponse")
+	proto.RegisterType((*CodeGeneratorResponse_File)(nil), "google.protobuf.compiler.CodeGeneratorResponse.File")
+}
+
+var fileDescriptor0 = []byte{
+	// 269 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4a, 0xc3, 0x40,
+	0x10, 0x86, 0xa9, 0x46, 0xa4, 0x63, 0x25, 0x1a, 0x14, 0x43, 0xf1, 0x10, 0x44, 0xc1, 0x83, 0x6c,
+	0x40, 0x3c, 0x78, 0xf2, 0x10, 0x45, 0xaf, 0xc5, 0x17, 0x08, 0x31, 0x9d, 0x86, 0x85, 0x74, 0x67,
+	0x9d, 0xdd, 0x1c, 0x7d, 0x21, 0x9f, 0xd2, 0xc9, 0xa6, 0x15, 0x09, 0xf6, 0x14, 0xf8, 0xe7, 0xcf,
+	0xf7, 0xcd, 0xb0, 0x70, 0xd3, 0x10, 0x35, 0x2d, 0xe6, 0x96, 0xc9, 0xd3, 0x47, 0xb7, 0xca, 0x6b,
+	0x5a, 0x5b, 0xdd, 0x22, 0xe7, 0xb6, 0xed, 0x1a, 0x6d, 0x54, 0x18, 0x24, 0xe9, 0x50, 0x53, 0xdb,
+	0x9a, 0xda, 0xd6, 0xe6, 0xd9, 0x18, 0xb0, 0x44, 0x57, 0xb3, 0xb6, 0x9e, 0x78, 0x68, 0x5f, 0x7d,
+	0xc1, 0xd9, 0x33, 0x2d, 0xf1, 0x0d, 0x0d, 0x72, 0x25, 0xf1, 0x3b, 0x7e, 0x76, 0xe8, 0x7c, 0x92,
+	0xc2, 0xc9, 0x4a, 0x10, 0xa5, 0xa7, 0xb2, 0x19, 0x66, 0x98, 0x4e, 0xb2, 0xfd, 0xdb, 0x69, 0x72,
+	0x0a, 0x53, 0x5b, 0x71, 0xb5, 0x46, 0x8f, 0x9c, 0xee, 0x65, 0x13, 0x89, 0x1e, 0x01, 0x02, 0xad,
+	0xec, 0x7f, 0x49, 0x63, 0xa9, 0x1d, 0xdd, 0x5f, 0xab, 0xf1, 0x56, 0xaf, 0x32, 0x7c, 0xf9, 0xf5,
+	0x2f, 0x82, 0xfe, 0x7b, 0x02, 0xe7, 0x23, 0xbf, 0xb3, 0x64, 0x1c, 0x26, 0xc7, 0x70, 0x80, 0xcc,
+	0xc4, 0x62, 0xed, 0x15, 0x05, 0x44, 0x7f, 0xe0, 0x0f, 0x6a, 0xd7, 0xc9, 0xea, 0x5f, 0x5a, 0x70,
+	0xcf, 0x9f, 0x20, 0xea, 0xbf, 0xc9, 0x0c, 0x22, 0x23, 0xfb, 0x6f, 0xc8, 0x17, 0x10, 0x6b, 0xa9,
+	0xb0, 0xd7, 0x64, 0x4a, 0x4b, 0xda, 0xf8, 0xcd, 0x55, 0x31, 0x1c, 0xd6, 0x64, 0x3c, 0x4a, 0x10,
+	0xf7, 0x41, 0x71, 0x07, 0x97, 0xa2, 0xd9, 0xa9, 0x2e, 0x66, 0x8b, 0xf0, 0x2a, 0xe1, 0x32, 0xf7,
+	0x13, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x18, 0x2a, 0x2a, 0xbd, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/github.com/google/btree/LICENSE b/vendor/github.com/google/btree/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/vendor/github.com/google/btree/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/google/btree/btree.go b/vendor/github.com/google/btree/btree.go
new file mode 100644
index 0000000000..eb1f75cda6
--- /dev/null
+++ b/vendor/github.com/google/btree/btree.go
@@ -0,0 +1,571 @@
+// Copyright 2014 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package btree implements in-memory B-Trees of arbitrary degree.
+//
+// btree implements an in-memory B-Tree for use as an ordered data structure.
+// It is not meant for persistent storage solutions.
+//
+// It has a flatter structure than an equivalent red-black or other binary tree,
+// which in some cases yields better memory usage and/or performance.
+// See some discussion on the matter here:
+//   http://google-opensource.blogspot.com/2013/01/c-containers-that-save-memory-and-time.html
+// Note, though, that this project is in no way related to the C++ B-Tree
+// implmentation written about there.
+//
+// Within this tree, each node contains a slice of items and a (possibly nil)
+// slice of children.  For basic numeric values or raw structs, this can cause
+// efficiency differences when compared to equivalent C++ template code that
+// stores values in arrays within the node:
+//   * Due to the overhead of storing values as interfaces (each
+//     value needs to be stored as the value itself, then 2 words for the
+//     interface pointing to that value and its type), resulting in higher
+//     memory use.
+//   * Since interfaces can point to values anywhere in memory, values are
+//     most likely not stored in contiguous blocks, resulting in a higher
+//     number of cache misses.
+// These issues don't tend to matter, though, when working with strings or other
+// heap-allocated structures, since C++-equivalent structures also must store
+// pointers and also distribute their values across the heap.
+//
+// This implementation is designed to be a drop-in replacement to gollrb.LLRB
+// trees, (http://github.com/petar/gollrb), an excellent and probably the most
+// widely used ordered tree implementation in the Go ecosystem currently.
+// Its functions, therefore, exactly mirror those of
+// llrb.LLRB where possible.  Unlike gollrb, though, we currently don't
+// support storing multiple equivalent values or backwards iteration.
+package btree
+
+import (
+	"fmt"
+	"io"
+	"sort"
+	"strings"
+)
+
+// Item represents a single object in the tree.
+type Item interface {
+	// Less tests whether the current item is less than the given argument.
+	//
+	// This must provide a strict weak ordering.
+	// If !a.Less(b) && !b.Less(a), we treat this to mean a == b (i.e. we can only
+	// hold one of either a or b in the tree).
+	Less(than Item) bool
+}
+
+// ItemIterator allows callers of Ascend* to iterate in-order over portions of
+// the tree.  When this function returns false, iteration will stop and the
+// associated Ascend* function will immediately return.
+type ItemIterator func(i Item) bool
+
+// New creates a new B-Tree with the given degree.
+//
+// New(2), for example, will create a 2-3-4 tree (each node contains 1-3 items
+// and 2-4 children).
+func New(degree int) *BTree {
+	if degree <= 1 {
+		panic("bad degree")
+	}
+	return &BTree{
+		degree:   degree,
+		freelist: make([]*node, 0, 32),
+	}
+}
+
+// items stores items in a node.
+type items []Item
+
+// insertAt inserts a value into the given index, pushing all subsequent values
+// forward.
+func (s *items) insertAt(index int, item Item) {
+	*s = append(*s, nil)
+	if index < len(*s) {
+		copy((*s)[index+1:], (*s)[index:])
+	}
+	(*s)[index] = item
+}
+
+// removeAt removes a value at a given index, pulling all subsequent values
+// back.
+func (s *items) removeAt(index int) Item {
+	item := (*s)[index]
+	copy((*s)[index:], (*s)[index+1:])
+	*s = (*s)[:len(*s)-1]
+	return item
+}
+
+// pop removes and returns the last element in the list.
+func (s *items) pop() (out Item) {
+	index := len(*s) - 1
+	out, *s = (*s)[index], (*s)[:index]
+	return
+}
+
+// find returns the index where the given item should be inserted into this
+// list.  'found' is true if the item already exists in the list at the given
+// index.
+func (s items) find(item Item) (index int, found bool) {
+	i := sort.Search(len(s), func(i int) bool {
+		return item.Less(s[i])
+	})
+	if i > 0 && !s[i-1].Less(item) {
+		return i - 1, true
+	}
+	return i, false
+}
+
+// children stores child nodes in a node.
+type children []*node
+
+// insertAt inserts a value into the given index, pushing all subsequent values
+// forward.
+func (s *children) insertAt(index int, n *node) {
+	*s = append(*s, nil)
+	if index < len(*s) {
+		copy((*s)[index+1:], (*s)[index:])
+	}
+	(*s)[index] = n
+}
+
+// removeAt removes a value at a given index, pulling all subsequent values
+// back.
+func (s *children) removeAt(index int) *node {
+	n := (*s)[index]
+	copy((*s)[index:], (*s)[index+1:])
+	*s = (*s)[:len(*s)-1]
+	return n
+}
+
+// pop removes and returns the last element in the list.
+func (s *children) pop() (out *node) {
+	index := len(*s) - 1
+	out, *s = (*s)[index], (*s)[:index]
+	return
+}
+
+// node is an internal node in a tree.
+//
+// It must at all times maintain the invariant that either
+//   * len(children) == 0, len(items) unconstrained
+//   * len(children) == len(items) + 1
+type node struct {
+	items    items
+	children children
+	t        *BTree
+}
+
+// split splits the given node at the given index.  The current node shrinks,
+// and this function returns the item that existed at that index and a new node
+// containing all items/children after it.
+func (n *node) split(i int) (Item, *node) {
+	item := n.items[i]
+	next := n.t.newNode()
+	next.items = append(next.items, n.items[i+1:]...)
+	n.items = n.items[:i]
+	if len(n.children) > 0 {
+		next.children = append(next.children, n.children[i+1:]...)
+		n.children = n.children[:i+1]
+	}
+	return item, next
+}
+
+// maybeSplitChild checks if a child should be split, and if so splits it.
+// Returns whether or not a split occurred.
+func (n *node) maybeSplitChild(i, maxItems int) bool {
+	if len(n.children[i].items) < maxItems {
+		return false
+	}
+	first := n.children[i]
+	item, second := first.split(maxItems / 2)
+	n.items.insertAt(i, item)
+	n.children.insertAt(i+1, second)
+	return true
+}
+
+// insert inserts an item into the subtree rooted at this node, making sure
+// no nodes in the subtree exceed maxItems items.  Should an equivalent item be
+// be found/replaced by insert, it will be returned.
+func (n *node) insert(item Item, maxItems int) Item {
+	i, found := n.items.find(item)
+	if found {
+		out := n.items[i]
+		n.items[i] = item
+		return out
+	}
+	if len(n.children) == 0 {
+		n.items.insertAt(i, item)
+		return nil
+	}
+	if n.maybeSplitChild(i, maxItems) {
+		inTree := n.items[i]
+		switch {
+		case item.Less(inTree):
+			// no change, we want first split node
+		case inTree.Less(item):
+			i++ // we want second split node
+		default:
+			out := n.items[i]
+			n.items[i] = item
+			return out
+		}
+	}
+	return n.children[i].insert(item, maxItems)
+}
+
+// get finds the given key in the subtree and returns it.
+func (n *node) get(key Item) Item {
+	i, found := n.items.find(key)
+	if found {
+		return n.items[i]
+	} else if len(n.children) > 0 {
+		return n.children[i].get(key)
+	}
+	return nil
+}
+
+// toRemove details what item to remove in a node.remove call.
+type toRemove int
+
+const (
+	removeItem toRemove = iota // removes the given item
+	removeMin                  // removes smallest item in the subtree
+	removeMax                  // removes largest item in the subtree
+)
+
+// remove removes an item from the subtree rooted at this node.
+func (n *node) remove(item Item, minItems int, typ toRemove) Item {
+	var i int
+	var found bool
+	switch typ {
+	case removeMax:
+		if len(n.children) == 0 {
+			return n.items.pop()
+		}
+		i = len(n.items)
+	case removeMin:
+		if len(n.children) == 0 {
+			return n.items.removeAt(0)
+		}
+		i = 0
+	case removeItem:
+		i, found = n.items.find(item)
+		if len(n.children) == 0 {
+			if found {
+				return n.items.removeAt(i)
+			}
+			return nil
+		}
+	default:
+		panic("invalid type")
+	}
+	// If we get to here, we have children.
+	child := n.children[i]
+	if len(child.items) <= minItems {
+		return n.growChildAndRemove(i, item, minItems, typ)
+	}
+	// Either we had enough items to begin with, or we've done some
+	// merging/stealing, because we've got enough now and we're ready to return
+	// stuff.
+	if found {
+		// The item exists at index 'i', and the child we've selected can give us a
+		// predecessor, since if we've gotten here it's got > minItems items in it.
+		out := n.items[i]
+		// We use our special-case 'remove' call with typ=maxItem to pull the
+		// predecessor of item i (the rightmost leaf of our immediate left child)
+		// and set it into where we pulled the item from.
+		n.items[i] = child.remove(nil, minItems, removeMax)
+		return out
+	}
+	// Final recursive call.  Once we're here, we know that the item isn't in this
+	// node and that the child is big enough to remove from.
+	return child.remove(item, minItems, typ)
+}
+
+// growChildAndRemove grows child 'i' to make sure it's possible to remove an
+// item from it while keeping it at minItems, then calls remove to actually
+// remove it.
+//
+// Most documentation says we have to do two sets of special casing:
+//   1) item is in this node
+//   2) item is in child
+// In both cases, we need to handle the two subcases:
+//   A) node has enough values that it can spare one
+//   B) node doesn't have enough values
+// For the latter, we have to check:
+//   a) left sibling has node to spare
+//   b) right sibling has node to spare
+//   c) we must merge
+// To simplify our code here, we handle cases #1 and #2 the same:
+// If a node doesn't have enough items, we make sure it does (using a,b,c).
+// We then simply redo our remove call, and the second time (regardless of
+// whether we're in case 1 or 2), we'll have enough items and can guarantee
+// that we hit case A.
+func (n *node) growChildAndRemove(i int, item Item, minItems int, typ toRemove) Item {
+	child := n.children[i]
+	if i > 0 && len(n.children[i-1].items) > minItems {
+		// Steal from left child
+		stealFrom := n.children[i-1]
+		stolenItem := stealFrom.items.pop()
+		child.items.insertAt(0, n.items[i-1])
+		n.items[i-1] = stolenItem
+		if len(stealFrom.children) > 0 {
+			child.children.insertAt(0, stealFrom.children.pop())
+		}
+	} else if i < len(n.items) && len(n.children[i+1].items) > minItems {
+		// steal from right child
+		stealFrom := n.children[i+1]
+		stolenItem := stealFrom.items.removeAt(0)
+		child.items = append(child.items, n.items[i])
+		n.items[i] = stolenItem
+		if len(stealFrom.children) > 0 {
+			child.children = append(child.children, stealFrom.children.removeAt(0))
+		}
+	} else {
+		if i >= len(n.items) {
+			i--
+			child = n.children[i]
+		}
+		// merge with right child
+		mergeItem := n.items.removeAt(i)
+		mergeChild := n.children.removeAt(i + 1)
+		child.items = append(child.items, mergeItem)
+		child.items = append(child.items, mergeChild.items...)
+		child.children = append(child.children, mergeChild.children...)
+		n.t.freeNode(mergeChild)
+	}
+	return n.remove(item, minItems, typ)
+}
+
+// iterate provides a simple method for iterating over elements in the tree.
+// It could probably use some work to be extra-efficient (it calls from() a
+// little more than it should), but it works pretty well for now.
+//
+// It requires that 'from' and 'to' both return true for values we should hit
+// with the iterator.  It should also be the case that 'from' returns true for
+// values less than or equal to values 'to' returns true for, and 'to'
+// returns true for values greater than or equal to those that 'from'
+// does.
+func (n *node) iterate(from, to func(Item) bool, iter ItemIterator) bool {
+	for i, item := range n.items {
+		if !from(item) {
+			continue
+		}
+		if len(n.children) > 0 && !n.children[i].iterate(from, to, iter) {
+			return false
+		}
+		if !to(item) {
+			return false
+		}
+		if !iter(item) {
+			return false
+		}
+	}
+	if len(n.children) > 0 {
+		return n.children[len(n.children)-1].iterate(from, to, iter)
+	}
+	return true
+}
+
+// Used for testing/debugging purposes.
+func (n *node) print(w io.Writer, level int) {
+	fmt.Fprintf(w, "%sNODE:%v\n", strings.Repeat("  ", level), n.items)
+	for _, c := range n.children {
+		c.print(w, level+1)
+	}
+}
+
+// BTree is an implementation of a B-Tree.
+//
+// BTree stores Item instances in an ordered structure, allowing easy insertion,
+// removal, and iteration.
+//
+// Write operations are not safe for concurrent mutation by multiple
+// goroutines, but Read operations are.
+type BTree struct {
+	degree   int
+	length   int
+	root     *node
+	freelist []*node
+}
+
+// maxItems returns the max number of items to allow per node.
+func (t *BTree) maxItems() int {
+	return t.degree*2 - 1
+}
+
+// minItems returns the min number of items to allow per node (ignored for the
+// root node).
+func (t *BTree) minItems() int {
+	return t.degree - 1
+}
+
+func (t *BTree) newNode() (n *node) {
+	index := len(t.freelist) - 1
+	if index < 0 {
+		return &node{t: t}
+	}
+	t.freelist, n = t.freelist[:index], t.freelist[index]
+	return
+}
+
+func (t *BTree) freeNode(n *node) {
+	if len(t.freelist) < cap(t.freelist) {
+    for i := range n.items {
+      n.items[i] = nil  // clear to allow GC
+    }
+		n.items = n.items[:0]
+    for i := range n.children {
+      n.children[i] = nil  // clear to allow GC
+    }
+		n.children = n.children[:0]
+		t.freelist = append(t.freelist, n)
+	}
+}
+
+// ReplaceOrInsert adds the given item to the tree.  If an item in the tree
+// already equals the given one, it is removed from the tree and returned.
+// Otherwise, nil is returned.
+//
+// nil cannot be added to the tree (will panic).
+func (t *BTree) ReplaceOrInsert(item Item) Item {
+	if item == nil {
+		panic("nil item being added to BTree")
+	}
+	if t.root == nil {
+		t.root = t.newNode()
+		t.root.items = append(t.root.items, item)
+		t.length++
+		return nil
+	} else if len(t.root.items) >= t.maxItems() {
+		item2, second := t.root.split(t.maxItems() / 2)
+		oldroot := t.root
+		t.root = t.newNode()
+		t.root.items = append(t.root.items, item2)
+		t.root.children = append(t.root.children, oldroot, second)
+	}
+	out := t.root.insert(item, t.maxItems())
+	if out == nil {
+		t.length++
+	}
+	return out
+}
+
+// Delete removes an item equal to the passed in item from the tree, returning
+// it.  If no such item exists, returns nil.
+func (t *BTree) Delete(item Item) Item {
+	return t.deleteItem(item, removeItem)
+}
+
+// DeleteMin removes the smallest item in the tree and returns it.
+// If no such item exists, returns nil.
+func (t *BTree) DeleteMin() Item {
+	return t.deleteItem(nil, removeMin)
+}
+
+// DeleteMax removes the largest item in the tree and returns it.
+// If no such item exists, returns nil.
+func (t *BTree) DeleteMax() Item {
+	return t.deleteItem(nil, removeMax)
+}
+
+func (t *BTree) deleteItem(item Item, typ toRemove) Item {
+	if t.root == nil || len(t.root.items) == 0 {
+		return nil
+	}
+	out := t.root.remove(item, t.minItems(), typ)
+	if len(t.root.items) == 0 && len(t.root.children) > 0 {
+		oldroot := t.root
+		t.root = t.root.children[0]
+		t.freeNode(oldroot)
+	}
+	if out != nil {
+		t.length--
+	}
+	return out
+}
+
+// AscendRange calls the iterator for every value in the tree within the range
+// [greaterOrEqual, lessThan), until iterator returns false.
+func (t *BTree) AscendRange(greaterOrEqual, lessThan Item, iterator ItemIterator) {
+	if t.root == nil {
+		return
+	}
+	t.root.iterate(
+		func(a Item) bool { return !a.Less(greaterOrEqual) },
+		func(a Item) bool { return a.Less(lessThan) },
+		iterator)
+}
+
+// AscendLessThan calls the iterator for every value in the tree within the range
+// [first, pivot), until iterator returns false.
+func (t *BTree) AscendLessThan(pivot Item, iterator ItemIterator) {
+	if t.root == nil {
+		return
+	}
+	t.root.iterate(
+		func(a Item) bool { return true },
+		func(a Item) bool { return a.Less(pivot) },
+		iterator)
+}
+
+// AscendGreaterOrEqual calls the iterator for every value in the tree within
+// the range [pivot, last], until iterator returns false.
+func (t *BTree) AscendGreaterOrEqual(pivot Item, iterator ItemIterator) {
+	if t.root == nil {
+		return
+	}
+	t.root.iterate(
+		func(a Item) bool { return !a.Less(pivot) },
+		func(a Item) bool { return true },
+		iterator)
+}
+
+// Ascend calls the iterator for every value in the tree within the range
+// [first, last], until iterator returns false.
+func (t *BTree) Ascend(iterator ItemIterator) {
+	if t.root == nil {
+		return
+	}
+	t.root.iterate(
+		func(a Item) bool { return true },
+		func(a Item) bool { return true },
+		iterator)
+}
+
+// Get looks for the key item in the tree, returning it.  It returns nil if
+// unable to find that item.
+func (t *BTree) Get(key Item) Item {
+	if t.root == nil {
+		return nil
+	}
+	return t.root.get(key)
+}
+
+// Has returns true if the given key is in the tree.
+func (t *BTree) Has(key Item) bool {
+	return t.Get(key) != nil
+}
+
+// Len returns the number of items currently in the tree.
+func (t *BTree) Len() int {
+	return t.length
+}
+
+// Int implements the Item interface for integers.
+type Int int
+
+// Less returns true if int(a) < int(b).
+func (a Int) Less(b Item) bool {
+	return a < b.(Int)
+}
diff --git a/vendor/github.com/google/btree/btree_mem.go b/vendor/github.com/google/btree/btree_mem.go
new file mode 100644
index 0000000000..cb95b7fa1b
--- /dev/null
+++ b/vendor/github.com/google/btree/btree_mem.go
@@ -0,0 +1,76 @@
+// Copyright 2014 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build ignore
+
+// This binary compares memory usage between btree and gollrb.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"math/rand"
+	"runtime"
+	"time"
+
+	"github.com/google/btree"
+	"github.com/petar/GoLLRB/llrb"
+)
+
+var (
+	size   = flag.Int("size", 1000000, "size of the tree to build")
+	degree = flag.Int("degree", 8, "degree of btree")
+	gollrb = flag.Bool("llrb", false, "use llrb instead of btree")
+)
+
+func main() {
+	flag.Parse()
+	vals := rand.Perm(*size)
+	var t, v interface{}
+	v = vals
+	var stats runtime.MemStats
+	for i := 0; i < 10; i++ {
+		runtime.GC()
+	}
+	fmt.Println("-------- BEFORE ----------")
+	runtime.ReadMemStats(&stats)
+	fmt.Printf("%+v\n", stats)
+	start := time.Now()
+	if *gollrb {
+		tr := llrb.New()
+		for _, v := range vals {
+			tr.ReplaceOrInsert(llrb.Int(v))
+		}
+		t = tr // keep it around
+	} else {
+		tr := btree.New(*degree)
+		for _, v := range vals {
+			tr.ReplaceOrInsert(btree.Int(v))
+		}
+		t = tr // keep it around
+	}
+	fmt.Printf("%v inserts in %v\n", *size, time.Since(start))
+	fmt.Println("-------- AFTER ----------")
+	runtime.ReadMemStats(&stats)
+	fmt.Printf("%+v\n", stats)
+	for i := 0; i < 10; i++ {
+		runtime.GC()
+	}
+	fmt.Println("-------- AFTER GC ----------")
+	runtime.ReadMemStats(&stats)
+	fmt.Printf("%+v\n", stats)
+	if t == v {
+		fmt.Println("to make sure vals and tree aren't GC'd")
+	}
+}
diff --git a/vendor/github.com/gorilla/context/LICENSE b/vendor/github.com/gorilla/context/LICENSE
new file mode 100644
index 0000000000..0e5fb87280
--- /dev/null
+++ b/vendor/github.com/gorilla/context/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+	 * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+	 * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+	 * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gorilla/context/context.go b/vendor/github.com/gorilla/context/context.go
new file mode 100644
index 0000000000..81cb128b19
--- /dev/null
+++ b/vendor/github.com/gorilla/context/context.go
@@ -0,0 +1,143 @@
+// Copyright 2012 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package context
+
+import (
+	"net/http"
+	"sync"
+	"time"
+)
+
+var (
+	mutex sync.RWMutex
+	data  = make(map[*http.Request]map[interface{}]interface{})
+	datat = make(map[*http.Request]int64)
+)
+
+// Set stores a value for a given key in a given request.
+func Set(r *http.Request, key, val interface{}) {
+	mutex.Lock()
+	if data[r] == nil {
+		data[r] = make(map[interface{}]interface{})
+		datat[r] = time.Now().Unix()
+	}
+	data[r][key] = val
+	mutex.Unlock()
+}
+
+// Get returns a value stored for a given key in a given request.
+func Get(r *http.Request, key interface{}) interface{} {
+	mutex.RLock()
+	if ctx := data[r]; ctx != nil {
+		value := ctx[key]
+		mutex.RUnlock()
+		return value
+	}
+	mutex.RUnlock()
+	return nil
+}
+
+// GetOk returns stored value and presence state like multi-value return of map access.
+func GetOk(r *http.Request, key interface{}) (interface{}, bool) {
+	mutex.RLock()
+	if _, ok := data[r]; ok {
+		value, ok := data[r][key]
+		mutex.RUnlock()
+		return value, ok
+	}
+	mutex.RUnlock()
+	return nil, false
+}
+
+// GetAll returns all stored values for the request as a map. Nil is returned for invalid requests.
+func GetAll(r *http.Request) map[interface{}]interface{} {
+	mutex.RLock()
+	if context, ok := data[r]; ok {
+		result := make(map[interface{}]interface{}, len(context))
+		for k, v := range context {
+			result[k] = v
+		}
+		mutex.RUnlock()
+		return result
+	}
+	mutex.RUnlock()
+	return nil
+}
+
+// GetAllOk returns all stored values for the request as a map and a boolean value that indicates if
+// the request was registered.
+func GetAllOk(r *http.Request) (map[interface{}]interface{}, bool) {
+	mutex.RLock()
+	context, ok := data[r]
+	result := make(map[interface{}]interface{}, len(context))
+	for k, v := range context {
+		result[k] = v
+	}
+	mutex.RUnlock()
+	return result, ok
+}
+
+// Delete removes a value stored for a given key in a given request.
+func Delete(r *http.Request, key interface{}) {
+	mutex.Lock()
+	if data[r] != nil {
+		delete(data[r], key)
+	}
+	mutex.Unlock()
+}
+
+// Clear removes all values stored for a given request.
+//
+// This is usually called by a handler wrapper to clean up request
+// variables at the end of a request lifetime. See ClearHandler().
+func Clear(r *http.Request) {
+	mutex.Lock()
+	clear(r)
+	mutex.Unlock()
+}
+
+// clear is Clear without the lock.
+func clear(r *http.Request) {
+	delete(data, r)
+	delete(datat, r)
+}
+
+// Purge removes request data stored for longer than maxAge, in seconds.
+// It returns the amount of requests removed.
+//
+// If maxAge <= 0, all request data is removed.
+//
+// This is only used for sanity check: in case context cleaning was not
+// properly set some request data can be kept forever, consuming an increasing
+// amount of memory. In case this is detected, Purge() must be called
+// periodically until the problem is fixed.
+func Purge(maxAge int) int {
+	mutex.Lock()
+	count := 0
+	if maxAge <= 0 {
+		count = len(data)
+		data = make(map[*http.Request]map[interface{}]interface{})
+		datat = make(map[*http.Request]int64)
+	} else {
+		min := time.Now().Unix() - int64(maxAge)
+		for r := range data {
+			if datat[r] < min {
+				clear(r)
+				count++
+			}
+		}
+	}
+	mutex.Unlock()
+	return count
+}
+
+// ClearHandler wraps an http.Handler and clears request values at the end
+// of a request lifetime.
+func ClearHandler(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		defer Clear(r)
+		h.ServeHTTP(w, r)
+	})
+}
diff --git a/vendor/github.com/gorilla/context/doc.go b/vendor/github.com/gorilla/context/doc.go
new file mode 100644
index 0000000000..73c7400311
--- /dev/null
+++ b/vendor/github.com/gorilla/context/doc.go
@@ -0,0 +1,82 @@
+// Copyright 2012 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+Package context stores values shared during a request lifetime.
+
+For example, a router can set variables extracted from the URL and later
+application handlers can access those values, or it can be used to store
+sessions values to be saved at the end of a request. There are several
+others common uses.
+
+The idea was posted by Brad Fitzpatrick to the go-nuts mailing list:
+
+	http://groups.google.com/group/golang-nuts/msg/e2d679d303aa5d53
+
+Here's the basic usage: first define the keys that you will need. The key
+type is interface{} so a key can be of any type that supports equality.
+Here we define a key using a custom int type to avoid name collisions:
+
+	package foo
+
+	import (
+		"github.com/gorilla/context"
+	)
+
+	type key int
+
+	const MyKey key = 0
+
+Then set a variable. Variables are bound to an http.Request object, so you
+need a request instance to set a value:
+
+	context.Set(r, MyKey, "bar")
+
+The application can later access the variable using the same key you provided:
+
+	func MyHandler(w http.ResponseWriter, r *http.Request) {
+		// val is "bar".
+		val := context.Get(r, foo.MyKey)
+
+		// returns ("bar", true)
+		val, ok := context.GetOk(r, foo.MyKey)
+		// ...
+	}
+
+And that's all about the basic usage. We discuss some other ideas below.
+
+Any type can be stored in the context. To enforce a given type, make the key
+private and wrap Get() and Set() to accept and return values of a specific
+type:
+
+	type key int
+
+	const mykey key = 0
+
+	// GetMyKey returns a value for this package from the request values.
+	func GetMyKey(r *http.Request) SomeType {
+		if rv := context.Get(r, mykey); rv != nil {
+			return rv.(SomeType)
+		}
+		return nil
+	}
+
+	// SetMyKey sets a value for this package in the request values.
+	func SetMyKey(r *http.Request, val SomeType) {
+		context.Set(r, mykey, val)
+	}
+
+Variables must be cleared at the end of a request, to remove all values
+that were stored. This can be done in an http.Handler, after a request was
+served. Just call Clear() passing the request:
+
+	context.Clear(r)
+
+...or use ClearHandler(), which conveniently wraps an http.Handler to clear
+variables at the end of a request lifetime.
+
+The Routers from the packages gorilla/mux and gorilla/pat call Clear()
+so if you are using either of them you don't need to clear the context manually.
+*/
+package context
diff --git a/vendor/github.com/gorilla/mux/LICENSE b/vendor/github.com/gorilla/mux/LICENSE
new file mode 100644
index 0000000000..0e5fb87280
--- /dev/null
+++ b/vendor/github.com/gorilla/mux/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+	 * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+	 * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+	 * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gorilla/mux/doc.go b/vendor/github.com/gorilla/mux/doc.go
new file mode 100644
index 0000000000..b2deed34c4
--- /dev/null
+++ b/vendor/github.com/gorilla/mux/doc.go
@@ -0,0 +1,199 @@
+// Copyright 2012 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+Package gorilla/mux implements a request router and dispatcher.
+
+The name mux stands for "HTTP request multiplexer". Like the standard
+http.ServeMux, mux.Router matches incoming requests against a list of
+registered routes and calls a handler for the route that matches the URL
+or other conditions. The main features are:
+
+	* Requests can be matched based on URL host, path, path prefix, schemes,
+	  header and query values, HTTP methods or using custom matchers.
+	* URL hosts and paths can have variables with an optional regular
+	  expression.
+	* Registered URLs can be built, or "reversed", which helps maintaining
+	  references to resources.
+	* Routes can be used as subrouters: nested routes are only tested if the
+	  parent route matches. This is useful to define groups of routes that
+	  share common conditions like a host, a path prefix or other repeated
+	  attributes. As a bonus, this optimizes request matching.
+	* It implements the http.Handler interface so it is compatible with the
+	  standard http.ServeMux.
+
+Let's start registering a couple of URL paths and handlers:
+
+	func main() {
+		r := mux.NewRouter()
+		r.HandleFunc("/", HomeHandler)
+		r.HandleFunc("/products", ProductsHandler)
+		r.HandleFunc("/articles", ArticlesHandler)
+		http.Handle("/", r)
+	}
+
+Here we register three routes mapping URL paths to handlers. This is
+equivalent to how http.HandleFunc() works: if an incoming request URL matches
+one of the paths, the corresponding handler is called passing
+(http.ResponseWriter, *http.Request) as parameters.
+
+Paths can have variables. They are defined using the format {name} or
+{name:pattern}. If a regular expression pattern is not defined, the matched
+variable will be anything until the next slash. For example:
+
+	r := mux.NewRouter()
+	r.HandleFunc("/products/{key}", ProductHandler)
+	r.HandleFunc("/articles/{category}/", ArticlesCategoryHandler)
+	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler)
+
+The names are used to create a map of route variables which can be retrieved
+calling mux.Vars():
+
+	vars := mux.Vars(request)
+	category := vars["category"]
+
+And this is all you need to know about the basic usage. More advanced options
+are explained below.
+
+Routes can also be restricted to a domain or subdomain. Just define a host
+pattern to be matched. They can also have variables:
+
+	r := mux.NewRouter()
+	// Only matches if domain is "www.domain.com".
+	r.Host("www.domain.com")
+	// Matches a dynamic subdomain.
+	r.Host("{subdomain:[a-z]+}.domain.com")
+
+There are several other matchers that can be added. To match path prefixes:
+
+	r.PathPrefix("/products/")
+
+...or HTTP methods:
+
+	r.Methods("GET", "POST")
+
+...or URL schemes:
+
+	r.Schemes("https")
+
+...or header values:
+
+	r.Headers("X-Requested-With", "XMLHttpRequest")
+
+...or query values:
+
+	r.Queries("key", "value")
+
+...or to use a custom matcher function:
+
+	r.MatcherFunc(func(r *http.Request, rm *RouteMatch) bool {
+		return r.ProtoMajor == 0
+    })
+
+...and finally, it is possible to combine several matchers in a single route:
+
+	r.HandleFunc("/products", ProductsHandler).
+	  Host("www.domain.com").
+	  Methods("GET").
+	  Schemes("http")
+
+Setting the same matching conditions again and again can be boring, so we have
+a way to group several routes that share the same requirements.
+We call it "subrouting".
+
+For example, let's say we have several URLs that should only match when the
+host is "www.domain.com". Create a route for that host and get a "subrouter"
+from it:
+
+	r := mux.NewRouter()
+	s := r.Host("www.domain.com").Subrouter()
+
+Then register routes in the subrouter:
+
+	s.HandleFunc("/products/", ProductsHandler)
+	s.HandleFunc("/products/{key}", ProductHandler)
+	s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
+
+The three URL paths we registered above will only be tested if the domain is
+"www.domain.com", because the subrouter is tested first. This is not
+only convenient, but also optimizes request matching. You can create
+subrouters combining any attribute matchers accepted by a route.
+
+Subrouters can be used to create domain or path "namespaces": you define
+subrouters in a central place and then parts of the app can register its
+paths relatively to a given subrouter.
+
+There's one more thing about subroutes. When a subrouter has a path prefix,
+the inner routes use it as base for their paths:
+
+	r := mux.NewRouter()
+	s := r.PathPrefix("/products").Subrouter()
+	// "/products/"
+	s.HandleFunc("/", ProductsHandler)
+	// "/products/{key}/"
+	s.HandleFunc("/{key}/", ProductHandler)
+	// "/products/{key}/details"
+	s.HandleFunc("/{key}/details", ProductDetailsHandler)
+
+Now let's see how to build registered URLs.
+
+Routes can be named. All routes that define a name can have their URLs built,
+or "reversed". We define a name calling Name() on a route. For example:
+
+	r := mux.NewRouter()
+	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
+	  Name("article")
+
+To build a URL, get the route and call the URL() method, passing a sequence of
+key/value pairs for the route variables. For the previous route, we would do:
+
+	url, err := r.Get("article").URL("category", "technology", "id", "42")
+
+...and the result will be a url.URL with the following path:
+
+	"/articles/technology/42"
+
+This also works for host variables:
+
+	r := mux.NewRouter()
+	r.Host("{subdomain}.domain.com").
+	  Path("/articles/{category}/{id:[0-9]+}").
+	  HandlerFunc(ArticleHandler).
+	  Name("article")
+
+	// url.String() will be "http://news.domain.com/articles/technology/42"
+	url, err := r.Get("article").URL("subdomain", "news",
+									 "category", "technology",
+									 "id", "42")
+
+All variables defined in the route are required, and their values must
+conform to the corresponding patterns. These requirements guarantee that a
+generated URL will always match a registered route -- the only exception is
+for explicitly defined "build-only" routes which never match.
+
+There's also a way to build only the URL host or path for a route:
+use the methods URLHost() or URLPath() instead. For the previous route,
+we would do:
+
+	// "http://news.domain.com/"
+	host, err := r.Get("article").URLHost("subdomain", "news")
+
+	// "/articles/technology/42"
+	path, err := r.Get("article").URLPath("category", "technology", "id", "42")
+
+And if you use subrouters, host and path defined separately can be built
+as well:
+
+	r := mux.NewRouter()
+	s := r.Host("{subdomain}.domain.com").Subrouter()
+	s.Path("/articles/{category}/{id:[0-9]+}").
+	  HandlerFunc(ArticleHandler).
+	  Name("article")
+
+	// "http://news.domain.com/articles/technology/42"
+	url, err := r.Get("article").URL("subdomain", "news",
+									 "category", "technology",
+									 "id", "42")
+*/
+package mux
diff --git a/vendor/github.com/gorilla/mux/mux.go b/vendor/github.com/gorilla/mux/mux.go
new file mode 100644
index 0000000000..5b5f8e7db5
--- /dev/null
+++ b/vendor/github.com/gorilla/mux/mux.go
@@ -0,0 +1,353 @@
+// Copyright 2012 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mux
+
+import (
+	"fmt"
+	"net/http"
+	"path"
+
+	"github.com/gorilla/context"
+)
+
+// NewRouter returns a new router instance.
+func NewRouter() *Router {
+	return &Router{namedRoutes: make(map[string]*Route), KeepContext: false}
+}
+
+// Router registers routes to be matched and dispatches a handler.
+//
+// It implements the http.Handler interface, so it can be registered to serve
+// requests:
+//
+//     var router = mux.NewRouter()
+//
+//     func main() {
+//         http.Handle("/", router)
+//     }
+//
+// Or, for Google App Engine, register it in a init() function:
+//
+//     func init() {
+//         http.Handle("/", router)
+//     }
+//
+// This will send all incoming requests to the router.
+type Router struct {
+	// Configurable Handler to be used when no route matches.
+	NotFoundHandler http.Handler
+	// Parent route, if this is a subrouter.
+	parent parentRoute
+	// Routes to be matched, in order.
+	routes []*Route
+	// Routes by name for URL building.
+	namedRoutes map[string]*Route
+	// See Router.StrictSlash(). This defines the flag for new routes.
+	strictSlash bool
+	// If true, do not clear the request context after handling the request
+	KeepContext bool
+}
+
+// Match matches registered routes against the request.
+func (r *Router) Match(req *http.Request, match *RouteMatch) bool {
+	for _, route := range r.routes {
+		if route.Match(req, match) {
+			return true
+		}
+	}
+	return false
+}
+
+// ServeHTTP dispatches the handler registered in the matched route.
+//
+// When there is a match, the route variables can be retrieved calling
+// mux.Vars(request).
+func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	// Clean path to canonical form and redirect.
+	if p := cleanPath(req.URL.Path); p != req.URL.Path {
+
+		// Added 3 lines (Philip Schlump) - It was droping the query string and #whatever from query.
+		// This matches with fix in go 1.2 r.c. 4 for same problem.  Go Issue:
+		// http://code.google.com/p/go/issues/detail?id=5252
+		url := *req.URL
+		url.Path = p
+		p = url.String()
+
+		w.Header().Set("Location", p)
+		w.WriteHeader(http.StatusMovedPermanently)
+		return
+	}
+	var match RouteMatch
+	var handler http.Handler
+	if r.Match(req, &match) {
+		handler = match.Handler
+		setVars(req, match.Vars)
+		setCurrentRoute(req, match.Route)
+	}
+	if handler == nil {
+		handler = r.NotFoundHandler
+		if handler == nil {
+			handler = http.NotFoundHandler()
+		}
+	}
+	if !r.KeepContext {
+		defer context.Clear(req)
+	}
+	handler.ServeHTTP(w, req)
+}
+
+// Get returns a route registered with the given name.
+func (r *Router) Get(name string) *Route {
+	return r.getNamedRoutes()[name]
+}
+
+// GetRoute returns a route registered with the given name. This method
+// was renamed to Get() and remains here for backwards compatibility.
+func (r *Router) GetRoute(name string) *Route {
+	return r.getNamedRoutes()[name]
+}
+
+// StrictSlash defines the trailing slash behavior for new routes. The initial
+// value is false.
+//
+// When true, if the route path is "/path/", accessing "/path" will redirect
+// to the former and vice versa. In other words, your application will always
+// see the path as specified in the route.
+//
+// When false, if the route path is "/path", accessing "/path/" will not match
+// this route and vice versa.
+//
+// Special case: when a route sets a path prefix using the PathPrefix() method,
+// strict slash is ignored for that route because the redirect behavior can't
+// be determined from a prefix alone. However, any subrouters created from that
+// route inherit the original StrictSlash setting.
+func (r *Router) StrictSlash(value bool) *Router {
+	r.strictSlash = value
+	return r
+}
+
+// ----------------------------------------------------------------------------
+// parentRoute
+// ----------------------------------------------------------------------------
+
+// getNamedRoutes returns the map where named routes are registered.
+func (r *Router) getNamedRoutes() map[string]*Route {
+	if r.namedRoutes == nil {
+		if r.parent != nil {
+			r.namedRoutes = r.parent.getNamedRoutes()
+		} else {
+			r.namedRoutes = make(map[string]*Route)
+		}
+	}
+	return r.namedRoutes
+}
+
+// getRegexpGroup returns regexp definitions from the parent route, if any.
+func (r *Router) getRegexpGroup() *routeRegexpGroup {
+	if r.parent != nil {
+		return r.parent.getRegexpGroup()
+	}
+	return nil
+}
+
+// ----------------------------------------------------------------------------
+// Route factories
+// ----------------------------------------------------------------------------
+
+// NewRoute registers an empty route.
+func (r *Router) NewRoute() *Route {
+	route := &Route{parent: r, strictSlash: r.strictSlash}
+	r.routes = append(r.routes, route)
+	return route
+}
+
+// Handle registers a new route with a matcher for the URL path.
+// See Route.Path() and Route.Handler().
+func (r *Router) Handle(path string, handler http.Handler) *Route {
+	return r.NewRoute().Path(path).Handler(handler)
+}
+
+// HandleFunc registers a new route with a matcher for the URL path.
+// See Route.Path() and Route.HandlerFunc().
+func (r *Router) HandleFunc(path string, f func(http.ResponseWriter,
+	*http.Request)) *Route {
+	return r.NewRoute().Path(path).HandlerFunc(f)
+}
+
+// Headers registers a new route with a matcher for request header values.
+// See Route.Headers().
+func (r *Router) Headers(pairs ...string) *Route {
+	return r.NewRoute().Headers(pairs...)
+}
+
+// Host registers a new route with a matcher for the URL host.
+// See Route.Host().
+func (r *Router) Host(tpl string) *Route {
+	return r.NewRoute().Host(tpl)
+}
+
+// MatcherFunc registers a new route with a custom matcher function.
+// See Route.MatcherFunc().
+func (r *Router) MatcherFunc(f MatcherFunc) *Route {
+	return r.NewRoute().MatcherFunc(f)
+}
+
+// Methods registers a new route with a matcher for HTTP methods.
+// See Route.Methods().
+func (r *Router) Methods(methods ...string) *Route {
+	return r.NewRoute().Methods(methods...)
+}
+
+// Path registers a new route with a matcher for the URL path.
+// See Route.Path().
+func (r *Router) Path(tpl string) *Route {
+	return r.NewRoute().Path(tpl)
+}
+
+// PathPrefix registers a new route with a matcher for the URL path prefix.
+// See Route.PathPrefix().
+func (r *Router) PathPrefix(tpl string) *Route {
+	return r.NewRoute().PathPrefix(tpl)
+}
+
+// Queries registers a new route with a matcher for URL query values.
+// See Route.Queries().
+func (r *Router) Queries(pairs ...string) *Route {
+	return r.NewRoute().Queries(pairs...)
+}
+
+// Schemes registers a new route with a matcher for URL schemes.
+// See Route.Schemes().
+func (r *Router) Schemes(schemes ...string) *Route {
+	return r.NewRoute().Schemes(schemes...)
+}
+
+// ----------------------------------------------------------------------------
+// Context
+// ----------------------------------------------------------------------------
+
+// RouteMatch stores information about a matched route.
+type RouteMatch struct {
+	Route   *Route
+	Handler http.Handler
+	Vars    map[string]string
+}
+
+type contextKey int
+
+const (
+	varsKey contextKey = iota
+	routeKey
+)
+
+// Vars returns the route variables for the current request, if any.
+func Vars(r *http.Request) map[string]string {
+	if rv := context.Get(r, varsKey); rv != nil {
+		return rv.(map[string]string)
+	}
+	return nil
+}
+
+// CurrentRoute returns the matched route for the current request, if any.
+func CurrentRoute(r *http.Request) *Route {
+	if rv := context.Get(r, routeKey); rv != nil {
+		return rv.(*Route)
+	}
+	return nil
+}
+
+func setVars(r *http.Request, val interface{}) {
+	context.Set(r, varsKey, val)
+}
+
+func setCurrentRoute(r *http.Request, val interface{}) {
+	context.Set(r, routeKey, val)
+}
+
+// ----------------------------------------------------------------------------
+// Helpers
+// ----------------------------------------------------------------------------
+
+// cleanPath returns the canonical path for p, eliminating . and .. elements.
+// Borrowed from the net/http package.
+func cleanPath(p string) string {
+	if p == "" {
+		return "/"
+	}
+	if p[0] != '/' {
+		p = "/" + p
+	}
+	np := path.Clean(p)
+	// path.Clean removes trailing slash except for root;
+	// put the trailing slash back if necessary.
+	if p[len(p)-1] == '/' && np != "/" {
+		np += "/"
+	}
+	return np
+}
+
+// uniqueVars returns an error if two slices contain duplicated strings.
+func uniqueVars(s1, s2 []string) error {
+	for _, v1 := range s1 {
+		for _, v2 := range s2 {
+			if v1 == v2 {
+				return fmt.Errorf("mux: duplicated route variable %q", v2)
+			}
+		}
+	}
+	return nil
+}
+
+// mapFromPairs converts variadic string parameters to a string map.
+func mapFromPairs(pairs ...string) (map[string]string, error) {
+	length := len(pairs)
+	if length%2 != 0 {
+		return nil, fmt.Errorf(
+			"mux: number of parameters must be multiple of 2, got %v", pairs)
+	}
+	m := make(map[string]string, length/2)
+	for i := 0; i < length; i += 2 {
+		m[pairs[i]] = pairs[i+1]
+	}
+	return m, nil
+}
+
+// matchInArray returns true if the given string value is in the array.
+func matchInArray(arr []string, value string) bool {
+	for _, v := range arr {
+		if v == value {
+			return true
+		}
+	}
+	return false
+}
+
+// matchMap returns true if the given key/value pairs exist in a given map.
+func matchMap(toCheck map[string]string, toMatch map[string][]string,
+	canonicalKey bool) bool {
+	for k, v := range toCheck {
+		// Check if key exists.
+		if canonicalKey {
+			k = http.CanonicalHeaderKey(k)
+		}
+		if values := toMatch[k]; values == nil {
+			return false
+		} else if v != "" {
+			// If value was defined as an empty string we only check that the
+			// key exists. Otherwise we also check for equality.
+			valueExists := false
+			for _, value := range values {
+				if v == value {
+					valueExists = true
+					break
+				}
+			}
+			if !valueExists {
+				return false
+			}
+		}
+	}
+	return true
+}
diff --git a/vendor/github.com/gorilla/mux/regexp.go b/vendor/github.com/gorilla/mux/regexp.go
new file mode 100644
index 0000000000..a6305483d5
--- /dev/null
+++ b/vendor/github.com/gorilla/mux/regexp.go
@@ -0,0 +1,276 @@
+// Copyright 2012 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mux
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+	"net/url"
+	"regexp"
+	"strings"
+)
+
+// newRouteRegexp parses a route template and returns a routeRegexp,
+// used to match a host, a path or a query string.
+//
+// It will extract named variables, assemble a regexp to be matched, create
+// a "reverse" template to build URLs and compile regexps to validate variable
+// values used in URL building.
+//
+// Previously we accepted only Python-like identifiers for variable
+// names ([a-zA-Z_][a-zA-Z0-9_]*), but currently the only restriction is that
+// name and pattern can't be empty, and names can't contain a colon.
+func newRouteRegexp(tpl string, matchHost, matchPrefix, matchQuery, strictSlash bool) (*routeRegexp, error) {
+	// Check if it is well-formed.
+	idxs, errBraces := braceIndices(tpl)
+	if errBraces != nil {
+		return nil, errBraces
+	}
+	// Backup the original.
+	template := tpl
+	// Now let's parse it.
+	defaultPattern := "[^/]+"
+	if matchQuery {
+		defaultPattern = "[^?&]+"
+		matchPrefix = true
+	} else if matchHost {
+		defaultPattern = "[^.]+"
+		matchPrefix = false
+	}
+	// Only match strict slash if not matching
+	if matchPrefix || matchHost || matchQuery {
+		strictSlash = false
+	}
+	// Set a flag for strictSlash.
+	endSlash := false
+	if strictSlash && strings.HasSuffix(tpl, "/") {
+		tpl = tpl[:len(tpl)-1]
+		endSlash = true
+	}
+	varsN := make([]string, len(idxs)/2)
+	varsR := make([]*regexp.Regexp, len(idxs)/2)
+	pattern := bytes.NewBufferString("")
+	if !matchQuery {
+		pattern.WriteByte('^')
+	}
+	reverse := bytes.NewBufferString("")
+	var end int
+	var err error
+	for i := 0; i < len(idxs); i += 2 {
+		// Set all values we are interested in.
+		raw := tpl[end:idxs[i]]
+		end = idxs[i+1]
+		parts := strings.SplitN(tpl[idxs[i]+1:end-1], ":", 2)
+		name := parts[0]
+		patt := defaultPattern
+		if len(parts) == 2 {
+			patt = parts[1]
+		}
+		// Name or pattern can't be empty.
+		if name == "" || patt == "" {
+			return nil, fmt.Errorf("mux: missing name or pattern in %q",
+				tpl[idxs[i]:end])
+		}
+		// Build the regexp pattern.
+		fmt.Fprintf(pattern, "%s(%s)", regexp.QuoteMeta(raw), patt)
+		// Build the reverse template.
+		fmt.Fprintf(reverse, "%s%%s", raw)
+		// Append variable name and compiled pattern.
+		varsN[i/2] = name
+		varsR[i/2], err = regexp.Compile(fmt.Sprintf("^%s$", patt))
+		if err != nil {
+			return nil, err
+		}
+	}
+	// Add the remaining.
+	raw := tpl[end:]
+	pattern.WriteString(regexp.QuoteMeta(raw))
+	if strictSlash {
+		pattern.WriteString("[/]?")
+	}
+	if !matchPrefix {
+		pattern.WriteByte('$')
+	}
+	reverse.WriteString(raw)
+	if endSlash {
+		reverse.WriteByte('/')
+	}
+	// Compile full regexp.
+	reg, errCompile := regexp.Compile(pattern.String())
+	if errCompile != nil {
+		return nil, errCompile
+	}
+	// Done!
+	return &routeRegexp{
+		template:    template,
+		matchHost:   matchHost,
+		matchQuery:  matchQuery,
+		strictSlash: strictSlash,
+		regexp:      reg,
+		reverse:     reverse.String(),
+		varsN:       varsN,
+		varsR:       varsR,
+	}, nil
+}
+
+// routeRegexp stores a regexp to match a host or path and information to
+// collect and validate route variables.
+type routeRegexp struct {
+	// The unmodified template.
+	template string
+	// True for host match, false for path or query string match.
+	matchHost bool
+	// True for query string match, false for path and host match.
+	matchQuery bool
+	// The strictSlash value defined on the route, but disabled if PathPrefix was used.
+	strictSlash bool
+	// Expanded regexp.
+	regexp *regexp.Regexp
+	// Reverse template.
+	reverse string
+	// Variable names.
+	varsN []string
+	// Variable regexps (validators).
+	varsR []*regexp.Regexp
+}
+
+// Match matches the regexp against the URL host or path.
+func (r *routeRegexp) Match(req *http.Request, match *RouteMatch) bool {
+	if !r.matchHost {
+		if r.matchQuery {
+			return r.regexp.MatchString(req.URL.RawQuery)
+		} else {
+			return r.regexp.MatchString(req.URL.Path)
+		}
+	}
+	return r.regexp.MatchString(getHost(req))
+}
+
+// url builds a URL part using the given values.
+func (r *routeRegexp) url(pairs ...string) (string, error) {
+	values, err := mapFromPairs(pairs...)
+	if err != nil {
+		return "", err
+	}
+	urlValues := make([]interface{}, len(r.varsN))
+	for k, v := range r.varsN {
+		value, ok := values[v]
+		if !ok {
+			return "", fmt.Errorf("mux: missing route variable %q", v)
+		}
+		urlValues[k] = value
+	}
+	rv := fmt.Sprintf(r.reverse, urlValues...)
+	if !r.regexp.MatchString(rv) {
+		// The URL is checked against the full regexp, instead of checking
+		// individual variables. This is faster but to provide a good error
+		// message, we check individual regexps if the URL doesn't match.
+		for k, v := range r.varsN {
+			if !r.varsR[k].MatchString(values[v]) {
+				return "", fmt.Errorf(
+					"mux: variable %q doesn't match, expected %q", values[v],
+					r.varsR[k].String())
+			}
+		}
+	}
+	return rv, nil
+}
+
+// braceIndices returns the first level curly brace indices from a string.
+// It returns an error in case of unbalanced braces.
+func braceIndices(s string) ([]int, error) {
+	var level, idx int
+	idxs := make([]int, 0)
+	for i := 0; i < len(s); i++ {
+		switch s[i] {
+		case '{':
+			if level++; level == 1 {
+				idx = i
+			}
+		case '}':
+			if level--; level == 0 {
+				idxs = append(idxs, idx, i+1)
+			} else if level < 0 {
+				return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
+			}
+		}
+	}
+	if level != 0 {
+		return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
+	}
+	return idxs, nil
+}
+
+// ----------------------------------------------------------------------------
+// routeRegexpGroup
+// ----------------------------------------------------------------------------
+
+// routeRegexpGroup groups the route matchers that carry variables.
+type routeRegexpGroup struct {
+	host    *routeRegexp
+	path    *routeRegexp
+	queries []*routeRegexp
+}
+
+// setMatch extracts the variables from the URL once a route matches.
+func (v *routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route) {
+	// Store host variables.
+	if v.host != nil {
+		hostVars := v.host.regexp.FindStringSubmatch(getHost(req))
+		if hostVars != nil {
+			for k, v := range v.host.varsN {
+				m.Vars[v] = hostVars[k+1]
+			}
+		}
+	}
+	// Store path variables.
+	if v.path != nil {
+		pathVars := v.path.regexp.FindStringSubmatch(req.URL.Path)
+		if pathVars != nil {
+			for k, v := range v.path.varsN {
+				m.Vars[v] = pathVars[k+1]
+			}
+			// Check if we should redirect.
+			if v.path.strictSlash {
+				p1 := strings.HasSuffix(req.URL.Path, "/")
+				p2 := strings.HasSuffix(v.path.template, "/")
+				if p1 != p2 {
+					u, _ := url.Parse(req.URL.String())
+					if p1 {
+						u.Path = u.Path[:len(u.Path)-1]
+					} else {
+						u.Path += "/"
+					}
+					m.Handler = http.RedirectHandler(u.String(), 301)
+				}
+			}
+		}
+	}
+	// Store query string variables.
+	rawQuery := req.URL.RawQuery
+	for _, q := range v.queries {
+		queryVars := q.regexp.FindStringSubmatch(rawQuery)
+		if queryVars != nil {
+			for k, v := range q.varsN {
+				m.Vars[v] = queryVars[k+1]
+			}
+		}
+	}
+}
+
+// getHost tries its best to return the request host.
+func getHost(r *http.Request) string {
+	if r.URL.IsAbs() {
+		return r.URL.Host
+	}
+	host := r.Host
+	// Slice off any port information.
+	if i := strings.Index(host, ":"); i != -1 {
+		host = host[:i]
+	}
+	return host
+
+}
diff --git a/vendor/github.com/gorilla/mux/route.go b/vendor/github.com/gorilla/mux/route.go
new file mode 100644
index 0000000000..c310e66bc7
--- /dev/null
+++ b/vendor/github.com/gorilla/mux/route.go
@@ -0,0 +1,524 @@
+// Copyright 2012 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mux
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"net/url"
+	"strings"
+)
+
+// Route stores information to match a request and build URLs.
+type Route struct {
+	// Parent where the route was registered (a Router).
+	parent parentRoute
+	// Request handler for the route.
+	handler http.Handler
+	// List of matchers.
+	matchers []matcher
+	// Manager for the variables from host and path.
+	regexp *routeRegexpGroup
+	// If true, when the path pattern is "/path/", accessing "/path" will
+	// redirect to the former and vice versa.
+	strictSlash bool
+	// If true, this route never matches: it is only used to build URLs.
+	buildOnly bool
+	// The name used to build URLs.
+	name string
+	// Error resulted from building a route.
+	err error
+}
+
+// Match matches the route against the request.
+func (r *Route) Match(req *http.Request, match *RouteMatch) bool {
+	if r.buildOnly || r.err != nil {
+		return false
+	}
+	// Match everything.
+	for _, m := range r.matchers {
+		if matched := m.Match(req, match); !matched {
+			return false
+		}
+	}
+	// Yay, we have a match. Let's collect some info about it.
+	if match.Route == nil {
+		match.Route = r
+	}
+	if match.Handler == nil {
+		match.Handler = r.handler
+	}
+	if match.Vars == nil {
+		match.Vars = make(map[string]string)
+	}
+	// Set variables.
+	if r.regexp != nil {
+		r.regexp.setMatch(req, match, r)
+	}
+	return true
+}
+
+// ----------------------------------------------------------------------------
+// Route attributes
+// ----------------------------------------------------------------------------
+
+// GetError returns an error resulted from building the route, if any.
+func (r *Route) GetError() error {
+	return r.err
+}
+
+// BuildOnly sets the route to never match: it is only used to build URLs.
+func (r *Route) BuildOnly() *Route {
+	r.buildOnly = true
+	return r
+}
+
+// Handler --------------------------------------------------------------------
+
+// Handler sets a handler for the route.
+func (r *Route) Handler(handler http.Handler) *Route {
+	if r.err == nil {
+		r.handler = handler
+	}
+	return r
+}
+
+// HandlerFunc sets a handler function for the route.
+func (r *Route) HandlerFunc(f func(http.ResponseWriter, *http.Request)) *Route {
+	return r.Handler(http.HandlerFunc(f))
+}
+
+// GetHandler returns the handler for the route, if any.
+func (r *Route) GetHandler() http.Handler {
+	return r.handler
+}
+
+// Name -----------------------------------------------------------------------
+
+// Name sets the name for the route, used to build URLs.
+// If the name was registered already it will be overwritten.
+func (r *Route) Name(name string) *Route {
+	if r.name != "" {
+		r.err = fmt.Errorf("mux: route already has name %q, can't set %q",
+			r.name, name)
+	}
+	if r.err == nil {
+		r.name = name
+		r.getNamedRoutes()[name] = r
+	}
+	return r
+}
+
+// GetName returns the name for the route, if any.
+func (r *Route) GetName() string {
+	return r.name
+}
+
+// ----------------------------------------------------------------------------
+// Matchers
+// ----------------------------------------------------------------------------
+
+// matcher types try to match a request.
+type matcher interface {
+	Match(*http.Request, *RouteMatch) bool
+}
+
+// addMatcher adds a matcher to the route.
+func (r *Route) addMatcher(m matcher) *Route {
+	if r.err == nil {
+		r.matchers = append(r.matchers, m)
+	}
+	return r
+}
+
+// addRegexpMatcher adds a host or path matcher and builder to a route.
+func (r *Route) addRegexpMatcher(tpl string, matchHost, matchPrefix, matchQuery bool) error {
+	if r.err != nil {
+		return r.err
+	}
+	r.regexp = r.getRegexpGroup()
+	if !matchHost && !matchQuery {
+		if len(tpl) == 0 || tpl[0] != '/' {
+			return fmt.Errorf("mux: path must start with a slash, got %q", tpl)
+		}
+		if r.regexp.path != nil {
+			tpl = strings.TrimRight(r.regexp.path.template, "/") + tpl
+		}
+	}
+	rr, err := newRouteRegexp(tpl, matchHost, matchPrefix, matchQuery, r.strictSlash)
+	if err != nil {
+		return err
+	}
+	for _, q := range r.regexp.queries {
+		if err = uniqueVars(rr.varsN, q.varsN); err != nil {
+			return err
+		}
+	}
+	if matchHost {
+		if r.regexp.path != nil {
+			if err = uniqueVars(rr.varsN, r.regexp.path.varsN); err != nil {
+				return err
+			}
+		}
+		r.regexp.host = rr
+	} else {
+		if r.regexp.host != nil {
+			if err = uniqueVars(rr.varsN, r.regexp.host.varsN); err != nil {
+				return err
+			}
+		}
+		if matchQuery {
+			r.regexp.queries = append(r.regexp.queries, rr)
+		} else {
+			r.regexp.path = rr
+		}
+	}
+	r.addMatcher(rr)
+	return nil
+}
+
+// Headers --------------------------------------------------------------------
+
+// headerMatcher matches the request against header values.
+type headerMatcher map[string]string
+
+func (m headerMatcher) Match(r *http.Request, match *RouteMatch) bool {
+	return matchMap(m, r.Header, true)
+}
+
+// Headers adds a matcher for request header values.
+// It accepts a sequence of key/value pairs to be matched. For example:
+//
+//     r := mux.NewRouter()
+//     r.Headers("Content-Type", "application/json",
+//               "X-Requested-With", "XMLHttpRequest")
+//
+// The above route will only match if both request header values match.
+//
+// It the value is an empty string, it will match any value if the key is set.
+func (r *Route) Headers(pairs ...string) *Route {
+	if r.err == nil {
+		var headers map[string]string
+		headers, r.err = mapFromPairs(pairs...)
+		return r.addMatcher(headerMatcher(headers))
+	}
+	return r
+}
+
+// Host -----------------------------------------------------------------------
+
+// Host adds a matcher for the URL host.
+// It accepts a template with zero or more URL variables enclosed by {}.
+// Variables can define an optional regexp pattern to me matched:
+//
+// - {name} matches anything until the next dot.
+//
+// - {name:pattern} matches the given regexp pattern.
+//
+// For example:
+//
+//     r := mux.NewRouter()
+//     r.Host("www.domain.com")
+//     r.Host("{subdomain}.domain.com")
+//     r.Host("{subdomain:[a-z]+}.domain.com")
+//
+// Variable names must be unique in a given route. They can be retrieved
+// calling mux.Vars(request).
+func (r *Route) Host(tpl string) *Route {
+	r.err = r.addRegexpMatcher(tpl, true, false, false)
+	return r
+}
+
+// MatcherFunc ----------------------------------------------------------------
+
+// MatcherFunc is the function signature used by custom matchers.
+type MatcherFunc func(*http.Request, *RouteMatch) bool
+
+func (m MatcherFunc) Match(r *http.Request, match *RouteMatch) bool {
+	return m(r, match)
+}
+
+// MatcherFunc adds a custom function to be used as request matcher.
+func (r *Route) MatcherFunc(f MatcherFunc) *Route {
+	return r.addMatcher(f)
+}
+
+// Methods --------------------------------------------------------------------
+
+// methodMatcher matches the request against HTTP methods.
+type methodMatcher []string
+
+func (m methodMatcher) Match(r *http.Request, match *RouteMatch) bool {
+	return matchInArray(m, r.Method)
+}
+
+// Methods adds a matcher for HTTP methods.
+// It accepts a sequence of one or more methods to be matched, e.g.:
+// "GET", "POST", "PUT".
+func (r *Route) Methods(methods ...string) *Route {
+	for k, v := range methods {
+		methods[k] = strings.ToUpper(v)
+	}
+	return r.addMatcher(methodMatcher(methods))
+}
+
+// Path -----------------------------------------------------------------------
+
+// Path adds a matcher for the URL path.
+// It accepts a template with zero or more URL variables enclosed by {}. The
+// template must start with a "/".
+// Variables can define an optional regexp pattern to me matched:
+//
+// - {name} matches anything until the next slash.
+//
+// - {name:pattern} matches the given regexp pattern.
+//
+// For example:
+//
+//     r := mux.NewRouter()
+//     r.Path("/products/").Handler(ProductsHandler)
+//     r.Path("/products/{key}").Handler(ProductsHandler)
+//     r.Path("/articles/{category}/{id:[0-9]+}").
+//       Handler(ArticleHandler)
+//
+// Variable names must be unique in a given route. They can be retrieved
+// calling mux.Vars(request).
+func (r *Route) Path(tpl string) *Route {
+	r.err = r.addRegexpMatcher(tpl, false, false, false)
+	return r
+}
+
+// PathPrefix -----------------------------------------------------------------
+
+// PathPrefix adds a matcher for the URL path prefix. This matches if the given
+// template is a prefix of the full URL path. See Route.Path() for details on
+// the tpl argument.
+//
+// Note that it does not treat slashes specially ("/foobar/" will be matched by
+// the prefix "/foo") so you may want to use a trailing slash here.
+//
+// Also note that the setting of Router.StrictSlash() has no effect on routes
+// with a PathPrefix matcher.
+func (r *Route) PathPrefix(tpl string) *Route {
+	r.err = r.addRegexpMatcher(tpl, false, true, false)
+	return r
+}
+
+// Query ----------------------------------------------------------------------
+
+// Queries adds a matcher for URL query values.
+// It accepts a sequence of key/value pairs. Values may define variables.
+// For example:
+//
+//     r := mux.NewRouter()
+//     r.Queries("foo", "bar", "id", "{id:[0-9]+}")
+//
+// The above route will only match if the URL contains the defined queries
+// values, e.g.: ?foo=bar&id=42.
+//
+// It the value is an empty string, it will match any value if the key is set.
+//
+// Variables can define an optional regexp pattern to me matched:
+//
+// - {name} matches anything until the next slash.
+//
+// - {name:pattern} matches the given regexp pattern.
+func (r *Route) Queries(pairs ...string) *Route {
+	length := len(pairs)
+	if length%2 != 0 {
+		r.err = fmt.Errorf(
+			"mux: number of parameters must be multiple of 2, got %v", pairs)
+		return nil
+	}
+	for i := 0; i < length; i += 2 {
+		if r.err = r.addRegexpMatcher(pairs[i]+"="+pairs[i+1], false, true, true); r.err != nil {
+			return r
+		}
+	}
+
+	return r
+}
+
+// Schemes --------------------------------------------------------------------
+
+// schemeMatcher matches the request against URL schemes.
+type schemeMatcher []string
+
+func (m schemeMatcher) Match(r *http.Request, match *RouteMatch) bool {
+	return matchInArray(m, r.URL.Scheme)
+}
+
+// Schemes adds a matcher for URL schemes.
+// It accepts a sequence of schemes to be matched, e.g.: "http", "https".
+func (r *Route) Schemes(schemes ...string) *Route {
+	for k, v := range schemes {
+		schemes[k] = strings.ToLower(v)
+	}
+	return r.addMatcher(schemeMatcher(schemes))
+}
+
+// Subrouter ------------------------------------------------------------------
+
+// Subrouter creates a subrouter for the route.
+//
+// It will test the inner routes only if the parent route matched. For example:
+//
+//     r := mux.NewRouter()
+//     s := r.Host("www.domain.com").Subrouter()
+//     s.HandleFunc("/products/", ProductsHandler)
+//     s.HandleFunc("/products/{key}", ProductHandler)
+//     s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
+//
+// Here, the routes registered in the subrouter won't be tested if the host
+// doesn't match.
+func (r *Route) Subrouter() *Router {
+	router := &Router{parent: r, strictSlash: r.strictSlash}
+	r.addMatcher(router)
+	return router
+}
+
+// ----------------------------------------------------------------------------
+// URL building
+// ----------------------------------------------------------------------------
+
+// URL builds a URL for the route.
+//
+// It accepts a sequence of key/value pairs for the route variables. For
+// example, given this route:
+//
+//     r := mux.NewRouter()
+//     r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
+//       Name("article")
+//
+// ...a URL for it can be built using:
+//
+//     url, err := r.Get("article").URL("category", "technology", "id", "42")
+//
+// ...which will return an url.URL with the following path:
+//
+//     "/articles/technology/42"
+//
+// This also works for host variables:
+//
+//     r := mux.NewRouter()
+//     r.Host("{subdomain}.domain.com").
+//       HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
+//       Name("article")
+//
+//     // url.String() will be "http://news.domain.com/articles/technology/42"
+//     url, err := r.Get("article").URL("subdomain", "news",
+//                                      "category", "technology",
+//                                      "id", "42")
+//
+// All variables defined in the route are required, and their values must
+// conform to the corresponding patterns.
+func (r *Route) URL(pairs ...string) (*url.URL, error) {
+	if r.err != nil {
+		return nil, r.err
+	}
+	if r.regexp == nil {
+		return nil, errors.New("mux: route doesn't have a host or path")
+	}
+	var scheme, host, path string
+	var err error
+	if r.regexp.host != nil {
+		// Set a default scheme.
+		scheme = "http"
+		if host, err = r.regexp.host.url(pairs...); err != nil {
+			return nil, err
+		}
+	}
+	if r.regexp.path != nil {
+		if path, err = r.regexp.path.url(pairs...); err != nil {
+			return nil, err
+		}
+	}
+	return &url.URL{
+		Scheme: scheme,
+		Host:   host,
+		Path:   path,
+	}, nil
+}
+
+// URLHost builds the host part of the URL for a route. See Route.URL().
+//
+// The route must have a host defined.
+func (r *Route) URLHost(pairs ...string) (*url.URL, error) {
+	if r.err != nil {
+		return nil, r.err
+	}
+	if r.regexp == nil || r.regexp.host == nil {
+		return nil, errors.New("mux: route doesn't have a host")
+	}
+	host, err := r.regexp.host.url(pairs...)
+	if err != nil {
+		return nil, err
+	}
+	return &url.URL{
+		Scheme: "http",
+		Host:   host,
+	}, nil
+}
+
+// URLPath builds the path part of the URL for a route. See Route.URL().
+//
+// The route must have a path defined.
+func (r *Route) URLPath(pairs ...string) (*url.URL, error) {
+	if r.err != nil {
+		return nil, r.err
+	}
+	if r.regexp == nil || r.regexp.path == nil {
+		return nil, errors.New("mux: route doesn't have a path")
+	}
+	path, err := r.regexp.path.url(pairs...)
+	if err != nil {
+		return nil, err
+	}
+	return &url.URL{
+		Path: path,
+	}, nil
+}
+
+// ----------------------------------------------------------------------------
+// parentRoute
+// ----------------------------------------------------------------------------
+
+// parentRoute allows routes to know about parent host and path definitions.
+type parentRoute interface {
+	getNamedRoutes() map[string]*Route
+	getRegexpGroup() *routeRegexpGroup
+}
+
+// getNamedRoutes returns the map where named routes are registered.
+func (r *Route) getNamedRoutes() map[string]*Route {
+	if r.parent == nil {
+		// During tests router is not always set.
+		r.parent = NewRouter()
+	}
+	return r.parent.getNamedRoutes()
+}
+
+// getRegexpGroup returns regexp definitions from this route.
+func (r *Route) getRegexpGroup() *routeRegexpGroup {
+	if r.regexp == nil {
+		if r.parent == nil {
+			// During tests router is not always set.
+			r.parent = NewRouter()
+		}
+		regexp := r.parent.getRegexpGroup()
+		if regexp == nil {
+			r.regexp = new(routeRegexpGroup)
+		} else {
+			// Copy.
+			r.regexp = &routeRegexpGroup{
+				host:    regexp.host,
+				path:    regexp.path,
+				queries: regexp.queries,
+			}
+		}
+	}
+	return r.regexp
+}
diff --git a/vendor/github.com/hashicorp/errwrap/LICENSE b/vendor/github.com/hashicorp/errwrap/LICENSE
new file mode 100644
index 0000000000..c33dcc7c92
--- /dev/null
+++ b/vendor/github.com/hashicorp/errwrap/LICENSE
@@ -0,0 +1,354 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. “Contributor”
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. “Contributor Version”
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. “Contribution”
+
+     means Covered Software of a particular Contributor.
+
+1.4. “Covered Software”
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. “Incompatible With Secondary Licenses”
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. “Executable Form”
+
+     means any form of the work other than Source Code Form.
+
+1.7. “Larger Work”
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. “License”
+
+     means this document.
+
+1.9. “Licensable”
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. “Modifications”
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. “Patent Claims” of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. “Secondary License”
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. “Source Code Form”
+
+      means the form of the work preferred for making modifications.
+
+1.14. “You” (or “Your”)
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, “You” includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, “control” means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an “as is” basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - “Incompatible With Secondary Licenses” Notice
+
+      This Source Code Form is “Incompatible
+      With Secondary Licenses”, as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/vendor/github.com/hashicorp/errwrap/errwrap.go b/vendor/github.com/hashicorp/errwrap/errwrap.go
new file mode 100644
index 0000000000..a733bef18c
--- /dev/null
+++ b/vendor/github.com/hashicorp/errwrap/errwrap.go
@@ -0,0 +1,169 @@
+// Package errwrap implements methods to formalize error wrapping in Go.
+//
+// All of the top-level functions that take an `error` are built to be able
+// to take any error, not just wrapped errors. This allows you to use errwrap
+// without having to type-check and type-cast everywhere.
+package errwrap
+
+import (
+	"errors"
+	"reflect"
+	"strings"
+)
+
+// WalkFunc is the callback called for Walk.
+type WalkFunc func(error)
+
+// Wrapper is an interface that can be implemented by custom types to
+// have all the Contains, Get, etc. functions in errwrap work.
+//
+// When Walk reaches a Wrapper, it will call the callback for every
+// wrapped error in addition to the wrapper itself. Since all the top-level
+// functions in errwrap use Walk, this means that all those functions work
+// with your custom type.
+type Wrapper interface {
+	WrappedErrors() []error
+}
+
+// Wrap defines that outer wraps inner, returning an error type that
+// can be cleanly used with the other methods in this package, such as
+// Contains, GetAll, etc.
+//
+// This function won't modify the error message at all (the outer message
+// will be used).
+func Wrap(outer, inner error) error {
+	return &wrappedError{
+		Outer: outer,
+		Inner: inner,
+	}
+}
+
+// Wrapf wraps an error with a formatting message. This is similar to using
+// `fmt.Errorf` to wrap an error. If you're using `fmt.Errorf` to wrap
+// errors, you should replace it with this.
+//
+// format is the format of the error message. The string '{{err}}' will
+// be replaced with the original error message.
+func Wrapf(format string, err error) error {
+	outerMsg := "<nil>"
+	if err != nil {
+		outerMsg = err.Error()
+	}
+
+	outer := errors.New(strings.Replace(
+		format, "{{err}}", outerMsg, -1))
+
+	return Wrap(outer, err)
+}
+
+// Contains checks if the given error contains an error with the
+// message msg. If err is not a wrapped error, this will always return
+// false unless the error itself happens to match this msg.
+func Contains(err error, msg string) bool {
+	return len(GetAll(err, msg)) > 0
+}
+
+// ContainsType checks if the given error contains an error with
+// the same concrete type as v. If err is not a wrapped error, this will
+// check the err itself.
+func ContainsType(err error, v interface{}) bool {
+	return len(GetAllType(err, v)) > 0
+}
+
+// Get is the same as GetAll but returns the deepest matching error.
+func Get(err error, msg string) error {
+	es := GetAll(err, msg)
+	if len(es) > 0 {
+		return es[len(es)-1]
+	}
+
+	return nil
+}
+
+// GetType is the same as GetAllType but returns the deepest matching error.
+func GetType(err error, v interface{}) error {
+	es := GetAllType(err, v)
+	if len(es) > 0 {
+		return es[len(es)-1]
+	}
+
+	return nil
+}
+
+// GetAll gets all the errors that might be wrapped in err with the
+// given message. The order of the errors is such that the outermost
+// matching error (the most recent wrap) is index zero, and so on.
+func GetAll(err error, msg string) []error {
+	var result []error
+
+	Walk(err, func(err error) {
+		if err.Error() == msg {
+			result = append(result, err)
+		}
+	})
+
+	return result
+}
+
+// GetAllType gets all the errors that are the same type as v.
+//
+// The order of the return value is the same as described in GetAll.
+func GetAllType(err error, v interface{}) []error {
+	var result []error
+
+	var search string
+	if v != nil {
+		search = reflect.TypeOf(v).String()
+	}
+	Walk(err, func(err error) {
+		var needle string
+		if err != nil {
+			needle = reflect.TypeOf(err).String()
+		}
+
+		if needle == search {
+			result = append(result, err)
+		}
+	})
+
+	return result
+}
+
+// Walk walks all the wrapped errors in err and calls the callback. If
+// err isn't a wrapped error, this will be called once for err. If err
+// is a wrapped error, the callback will be called for both the wrapper
+// that implements error as well as the wrapped error itself.
+func Walk(err error, cb WalkFunc) {
+	if err == nil {
+		return
+	}
+
+	switch e := err.(type) {
+	case *wrappedError:
+		cb(e.Outer)
+		Walk(e.Inner, cb)
+	case Wrapper:
+		cb(err)
+
+		for _, err := range e.WrappedErrors() {
+			Walk(err, cb)
+		}
+	default:
+		cb(err)
+	}
+}
+
+// wrappedError is an implementation of error that has both the
+// outer and inner errors.
+type wrappedError struct {
+	Outer error
+	Inner error
+}
+
+func (w *wrappedError) Error() string {
+	return w.Outer.Error()
+}
+
+func (w *wrappedError) WrappedErrors() []error {
+	return []error{w.Outer, w.Inner}
+}
diff --git a/vendor/github.com/hydrogen18/stoppableListener/LICENSE b/vendor/github.com/hydrogen18/stoppableListener/LICENSE
new file mode 100644
index 0000000000..efcb2414a3
--- /dev/null
+++ b/vendor/github.com/hydrogen18/stoppableListener/LICENSE
@@ -0,0 +1,10 @@
+Copyright (c) 2014, Eric Urban
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/vendor/github.com/hydrogen18/stoppableListener/listener.go b/vendor/github.com/hydrogen18/stoppableListener/listener.go
new file mode 100644
index 0000000000..69a9f33cc3
--- /dev/null
+++ b/vendor/github.com/hydrogen18/stoppableListener/listener.go
@@ -0,0 +1,62 @@
+package stoppableListener
+
+import (
+	"errors"
+	"net"
+	"time"
+)
+
+type StoppableListener struct {
+	*net.TCPListener          //Wrapped listener
+	stop             chan int //Channel used only to indicate listener should shutdown
+}
+
+func New(l net.Listener) (*StoppableListener, error) {
+	tcpL, ok := l.(*net.TCPListener)
+
+	if !ok {
+		return nil, errors.New("Cannot wrap listener")
+	}
+
+	retval := &StoppableListener{}
+	retval.TCPListener = tcpL
+	retval.stop = make(chan int)
+
+	return retval, nil
+}
+
+var StoppedError = errors.New("Listener stopped")
+
+func (sl *StoppableListener) Accept() (net.Conn, error) {
+
+	for {
+		//Wait up to one second for a new connection
+		sl.SetDeadline(time.Now().Add(time.Second))
+
+		newConn, err := sl.TCPListener.Accept()
+
+		//Check for the channel being closed
+		select {
+		case <-sl.stop:
+			return nil, StoppedError
+		default:
+			//If the channel is still open, continue as normal
+		}
+
+		if err != nil {
+			netErr, ok := err.(net.Error)
+
+			//If this is a timeout, then continue to wait for
+			//new connections
+			if ok && netErr.Timeout() && netErr.Temporary() {
+				continue
+			}
+		}
+
+		return newConn, err
+	}
+}
+
+func (sl *StoppableListener) Stop() {
+	close(sl.stop)
+}
diff --git a/vendor/github.com/inconshreveable/mousetrap/LICENSE b/vendor/github.com/inconshreveable/mousetrap/LICENSE
new file mode 100644
index 0000000000..5f0d1fb6a7
--- /dev/null
+++ b/vendor/github.com/inconshreveable/mousetrap/LICENSE
@@ -0,0 +1,13 @@
+Copyright 2014 Alan Shreve
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/github.com/inconshreveable/mousetrap/trap_others.go b/vendor/github.com/inconshreveable/mousetrap/trap_others.go
new file mode 100644
index 0000000000..9d2d8a4bab
--- /dev/null
+++ b/vendor/github.com/inconshreveable/mousetrap/trap_others.go
@@ -0,0 +1,15 @@
+// +build !windows
+
+package mousetrap
+
+// StartedByExplorer returns true if the program was invoked by the user
+// double-clicking on the executable from explorer.exe
+//
+// It is conservative and returns false if any of the internal calls fail.
+// It does not guarantee that the program was run from a terminal. It only can tell you
+// whether it was launched from explorer.exe
+//
+// On non-Windows platforms, it always returns false.
+func StartedByExplorer() bool {
+	return false
+}
diff --git a/vendor/github.com/inconshreveable/mousetrap/trap_windows.go b/vendor/github.com/inconshreveable/mousetrap/trap_windows.go
new file mode 100644
index 0000000000..336142a5e3
--- /dev/null
+++ b/vendor/github.com/inconshreveable/mousetrap/trap_windows.go
@@ -0,0 +1,98 @@
+// +build windows
+// +build !go1.4
+
+package mousetrap
+
+import (
+	"fmt"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+const (
+	// defined by the Win32 API
+	th32cs_snapprocess uintptr = 0x2
+)
+
+var (
+	kernel                   = syscall.MustLoadDLL("kernel32.dll")
+	CreateToolhelp32Snapshot = kernel.MustFindProc("CreateToolhelp32Snapshot")
+	Process32First           = kernel.MustFindProc("Process32FirstW")
+	Process32Next            = kernel.MustFindProc("Process32NextW")
+)
+
+// ProcessEntry32 structure defined by the Win32 API
+type processEntry32 struct {
+	dwSize              uint32
+	cntUsage            uint32
+	th32ProcessID       uint32
+	th32DefaultHeapID   int
+	th32ModuleID        uint32
+	cntThreads          uint32
+	th32ParentProcessID uint32
+	pcPriClassBase      int32
+	dwFlags             uint32
+	szExeFile           [syscall.MAX_PATH]uint16
+}
+
+func getProcessEntry(pid int) (pe *processEntry32, err error) {
+	snapshot, _, e1 := CreateToolhelp32Snapshot.Call(th32cs_snapprocess, uintptr(0))
+	if snapshot == uintptr(syscall.InvalidHandle) {
+		err = fmt.Errorf("CreateToolhelp32Snapshot: %v", e1)
+		return
+	}
+	defer syscall.CloseHandle(syscall.Handle(snapshot))
+
+	var processEntry processEntry32
+	processEntry.dwSize = uint32(unsafe.Sizeof(processEntry))
+	ok, _, e1 := Process32First.Call(snapshot, uintptr(unsafe.Pointer(&processEntry)))
+	if ok == 0 {
+		err = fmt.Errorf("Process32First: %v", e1)
+		return
+	}
+
+	for {
+		if processEntry.th32ProcessID == uint32(pid) {
+			pe = &processEntry
+			return
+		}
+
+		ok, _, e1 = Process32Next.Call(snapshot, uintptr(unsafe.Pointer(&processEntry)))
+		if ok == 0 {
+			err = fmt.Errorf("Process32Next: %v", e1)
+			return
+		}
+	}
+}
+
+func getppid() (pid int, err error) {
+	pe, err := getProcessEntry(os.Getpid())
+	if err != nil {
+		return
+	}
+
+	pid = int(pe.th32ParentProcessID)
+	return
+}
+
+// StartedByExplorer returns true if the program was invoked by the user double-clicking
+// on the executable from explorer.exe
+//
+// It is conservative and returns false if any of the internal calls fail.
+// It does not guarantee that the program was run from a terminal. It only can tell you
+// whether it was launched from explorer.exe
+func StartedByExplorer() bool {
+	ppid, err := getppid()
+	if err != nil {
+		return false
+	}
+
+	pe, err := getProcessEntry(ppid)
+	if err != nil {
+		return false
+	}
+
+	name := syscall.UTF16ToString(pe.szExeFile[:])
+	return name == "explorer.exe"
+}
diff --git a/vendor/github.com/inconshreveable/mousetrap/trap_windows_1.4.go b/vendor/github.com/inconshreveable/mousetrap/trap_windows_1.4.go
new file mode 100644
index 0000000000..9a28e57c3c
--- /dev/null
+++ b/vendor/github.com/inconshreveable/mousetrap/trap_windows_1.4.go
@@ -0,0 +1,46 @@
+// +build windows
+// +build go1.4
+
+package mousetrap
+
+import (
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+func getProcessEntry(pid int) (*syscall.ProcessEntry32, error) {
+	snapshot, err := syscall.CreateToolhelp32Snapshot(syscall.TH32CS_SNAPPROCESS, 0)
+	if err != nil {
+		return nil, err
+	}
+	defer syscall.CloseHandle(snapshot)
+	var procEntry syscall.ProcessEntry32
+	procEntry.Size = uint32(unsafe.Sizeof(procEntry))
+	if err = syscall.Process32First(snapshot, &procEntry); err != nil {
+		return nil, err
+	}
+	for {
+		if procEntry.ProcessID == uint32(pid) {
+			return &procEntry, nil
+		}
+		err = syscall.Process32Next(snapshot, &procEntry)
+		if err != nil {
+			return nil, err
+		}
+	}
+}
+
+// StartedByExplorer returns true if the program was invoked by the user double-clicking
+// on the executable from explorer.exe
+//
+// It is conservative and returns false if any of the internal calls fail.
+// It does not guarantee that the program was run from a terminal. It only can tell you
+// whether it was launched from explorer.exe
+func StartedByExplorer() bool {
+	pe, err := getProcessEntry(os.Getppid())
+	if err != nil {
+		return false
+	}
+	return "explorer.exe" == syscall.UTF16ToString(pe.ExeFile[:])
+}
diff --git a/vendor/github.com/jmespath/go-jmespath/LICENSE b/vendor/github.com/jmespath/go-jmespath/LICENSE
new file mode 100644
index 0000000000..b03310a91f
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath/LICENSE
@@ -0,0 +1,13 @@
+Copyright 2015 James Saryerwinnie
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/github.com/jmespath/go-jmespath/api.go b/vendor/github.com/jmespath/go-jmespath/api.go
new file mode 100644
index 0000000000..9cfa988bc5
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath/api.go
@@ -0,0 +1,49 @@
+package jmespath
+
+import "strconv"
+
+// JmesPath is the epresentation of a compiled JMES path query. A JmesPath is
+// safe for concurrent use by multiple goroutines.
+type JMESPath struct {
+	ast  ASTNode
+	intr *treeInterpreter
+}
+
+// Compile parses a JMESPath expression and returns, if successful, a JMESPath
+// object that can be used to match against data.
+func Compile(expression string) (*JMESPath, error) {
+	parser := NewParser()
+	ast, err := parser.Parse(expression)
+	if err != nil {
+		return nil, err
+	}
+	jmespath := &JMESPath{ast: ast, intr: newInterpreter()}
+	return jmespath, nil
+}
+
+// MustCompile is like Compile but panics if the expression cannot be parsed.
+// It simplifies safe initialization of global variables holding compiled
+// JMESPaths.
+func MustCompile(expression string) *JMESPath {
+	jmespath, err := Compile(expression)
+	if err != nil {
+		panic(`jmespath: Compile(` + strconv.Quote(expression) + `): ` + err.Error())
+	}
+	return jmespath
+}
+
+// Search evaluates a JMESPath expression against input data and returns the result.
+func (jp *JMESPath) Search(data interface{}) (interface{}, error) {
+	return jp.intr.Execute(jp.ast, data)
+}
+
+// Search evaluates a JMESPath expression against input data and returns the result.
+func Search(expression string, data interface{}) (interface{}, error) {
+	intr := newInterpreter()
+	parser := NewParser()
+	ast, err := parser.Parse(expression)
+	if err != nil {
+		return nil, err
+	}
+	return intr.Execute(ast, data)
+}
diff --git a/vendor/github.com/jmespath/go-jmespath/astnodetype_string.go b/vendor/github.com/jmespath/go-jmespath/astnodetype_string.go
new file mode 100644
index 0000000000..1cd2d239c9
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath/astnodetype_string.go
@@ -0,0 +1,16 @@
+// generated by stringer -type astNodeType; DO NOT EDIT
+
+package jmespath
+
+import "fmt"
+
+const _astNodeType_name = "ASTEmptyASTComparatorASTCurrentNodeASTExpRefASTFunctionExpressionASTFieldASTFilterProjectionASTFlattenASTIdentityASTIndexASTIndexExpressionASTKeyValPairASTLiteralASTMultiSelectHashASTMultiSelectListASTOrExpressionASTAndExpressionASTNotExpressionASTPipeASTProjectionASTSubexpressionASTSliceASTValueProjection"
+
+var _astNodeType_index = [...]uint16{0, 8, 21, 35, 44, 65, 73, 92, 102, 113, 121, 139, 152, 162, 180, 198, 213, 229, 245, 252, 265, 281, 289, 307}
+
+func (i astNodeType) String() string {
+	if i < 0 || i >= astNodeType(len(_astNodeType_index)-1) {
+		return fmt.Sprintf("astNodeType(%d)", i)
+	}
+	return _astNodeType_name[_astNodeType_index[i]:_astNodeType_index[i+1]]
+}
diff --git a/vendor/github.com/jmespath/go-jmespath/functions.go b/vendor/github.com/jmespath/go-jmespath/functions.go
new file mode 100644
index 0000000000..9b7cd89b4b
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath/functions.go
@@ -0,0 +1,842 @@
+package jmespath
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"math"
+	"reflect"
+	"sort"
+	"strconv"
+	"strings"
+	"unicode/utf8"
+)
+
+type jpFunction func(arguments []interface{}) (interface{}, error)
+
+type jpType string
+
+const (
+	jpUnknown     jpType = "unknown"
+	jpNumber      jpType = "number"
+	jpString      jpType = "string"
+	jpArray       jpType = "array"
+	jpObject      jpType = "object"
+	jpArrayNumber jpType = "array[number]"
+	jpArrayString jpType = "array[string]"
+	jpExpref      jpType = "expref"
+	jpAny         jpType = "any"
+)
+
+type functionEntry struct {
+	name      string
+	arguments []argSpec
+	handler   jpFunction
+	hasExpRef bool
+}
+
+type argSpec struct {
+	types    []jpType
+	variadic bool
+}
+
+type byExprString struct {
+	intr     *treeInterpreter
+	node     ASTNode
+	items    []interface{}
+	hasError bool
+}
+
+func (a *byExprString) Len() int {
+	return len(a.items)
+}
+func (a *byExprString) Swap(i, j int) {
+	a.items[i], a.items[j] = a.items[j], a.items[i]
+}
+func (a *byExprString) Less(i, j int) bool {
+	first, err := a.intr.Execute(a.node, a.items[i])
+	if err != nil {
+		a.hasError = true
+		// Return a dummy value.
+		return true
+	}
+	ith, ok := first.(string)
+	if !ok {
+		a.hasError = true
+		return true
+	}
+	second, err := a.intr.Execute(a.node, a.items[j])
+	if err != nil {
+		a.hasError = true
+		// Return a dummy value.
+		return true
+	}
+	jth, ok := second.(string)
+	if !ok {
+		a.hasError = true
+		return true
+	}
+	return ith < jth
+}
+
+type byExprFloat struct {
+	intr     *treeInterpreter
+	node     ASTNode
+	items    []interface{}
+	hasError bool
+}
+
+func (a *byExprFloat) Len() int {
+	return len(a.items)
+}
+func (a *byExprFloat) Swap(i, j int) {
+	a.items[i], a.items[j] = a.items[j], a.items[i]
+}
+func (a *byExprFloat) Less(i, j int) bool {
+	first, err := a.intr.Execute(a.node, a.items[i])
+	if err != nil {
+		a.hasError = true
+		// Return a dummy value.
+		return true
+	}
+	ith, ok := first.(float64)
+	if !ok {
+		a.hasError = true
+		return true
+	}
+	second, err := a.intr.Execute(a.node, a.items[j])
+	if err != nil {
+		a.hasError = true
+		// Return a dummy value.
+		return true
+	}
+	jth, ok := second.(float64)
+	if !ok {
+		a.hasError = true
+		return true
+	}
+	return ith < jth
+}
+
+type functionCaller struct {
+	functionTable map[string]functionEntry
+}
+
+func newFunctionCaller() *functionCaller {
+	caller := &functionCaller{}
+	caller.functionTable = map[string]functionEntry{
+		"length": {
+			name: "length",
+			arguments: []argSpec{
+				{types: []jpType{jpString, jpArray, jpObject}},
+			},
+			handler: jpfLength,
+		},
+		"starts_with": {
+			name: "starts_with",
+			arguments: []argSpec{
+				{types: []jpType{jpString}},
+				{types: []jpType{jpString}},
+			},
+			handler: jpfStartsWith,
+		},
+		"abs": {
+			name: "abs",
+			arguments: []argSpec{
+				{types: []jpType{jpNumber}},
+			},
+			handler: jpfAbs,
+		},
+		"avg": {
+			name: "avg",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayNumber}},
+			},
+			handler: jpfAvg,
+		},
+		"ceil": {
+			name: "ceil",
+			arguments: []argSpec{
+				{types: []jpType{jpNumber}},
+			},
+			handler: jpfCeil,
+		},
+		"contains": {
+			name: "contains",
+			arguments: []argSpec{
+				{types: []jpType{jpArray, jpString}},
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfContains,
+		},
+		"ends_with": {
+			name: "ends_with",
+			arguments: []argSpec{
+				{types: []jpType{jpString}},
+				{types: []jpType{jpString}},
+			},
+			handler: jpfEndsWith,
+		},
+		"floor": {
+			name: "floor",
+			arguments: []argSpec{
+				{types: []jpType{jpNumber}},
+			},
+			handler: jpfFloor,
+		},
+		"map": {
+			name: "amp",
+			arguments: []argSpec{
+				{types: []jpType{jpExpref}},
+				{types: []jpType{jpArray}},
+			},
+			handler:   jpfMap,
+			hasExpRef: true,
+		},
+		"max": {
+			name: "max",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayNumber, jpArrayString}},
+			},
+			handler: jpfMax,
+		},
+		"merge": {
+			name: "merge",
+			arguments: []argSpec{
+				{types: []jpType{jpObject}, variadic: true},
+			},
+			handler: jpfMerge,
+		},
+		"max_by": {
+			name: "max_by",
+			arguments: []argSpec{
+				{types: []jpType{jpArray}},
+				{types: []jpType{jpExpref}},
+			},
+			handler:   jpfMaxBy,
+			hasExpRef: true,
+		},
+		"sum": {
+			name: "sum",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayNumber}},
+			},
+			handler: jpfSum,
+		},
+		"min": {
+			name: "min",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayNumber, jpArrayString}},
+			},
+			handler: jpfMin,
+		},
+		"min_by": {
+			name: "min_by",
+			arguments: []argSpec{
+				{types: []jpType{jpArray}},
+				{types: []jpType{jpExpref}},
+			},
+			handler:   jpfMinBy,
+			hasExpRef: true,
+		},
+		"type": {
+			name: "type",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfType,
+		},
+		"keys": {
+			name: "keys",
+			arguments: []argSpec{
+				{types: []jpType{jpObject}},
+			},
+			handler: jpfKeys,
+		},
+		"values": {
+			name: "values",
+			arguments: []argSpec{
+				{types: []jpType{jpObject}},
+			},
+			handler: jpfValues,
+		},
+		"sort": {
+			name: "sort",
+			arguments: []argSpec{
+				{types: []jpType{jpArrayString, jpArrayNumber}},
+			},
+			handler: jpfSort,
+		},
+		"sort_by": {
+			name: "sort_by",
+			arguments: []argSpec{
+				{types: []jpType{jpArray}},
+				{types: []jpType{jpExpref}},
+			},
+			handler:   jpfSortBy,
+			hasExpRef: true,
+		},
+		"join": {
+			name: "join",
+			arguments: []argSpec{
+				{types: []jpType{jpString}},
+				{types: []jpType{jpArrayString}},
+			},
+			handler: jpfJoin,
+		},
+		"reverse": {
+			name: "reverse",
+			arguments: []argSpec{
+				{types: []jpType{jpArray, jpString}},
+			},
+			handler: jpfReverse,
+		},
+		"to_array": {
+			name: "to_array",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfToArray,
+		},
+		"to_string": {
+			name: "to_string",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfToString,
+		},
+		"to_number": {
+			name: "to_number",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}},
+			},
+			handler: jpfToNumber,
+		},
+		"not_null": {
+			name: "not_null",
+			arguments: []argSpec{
+				{types: []jpType{jpAny}, variadic: true},
+			},
+			handler: jpfNotNull,
+		},
+	}
+	return caller
+}
+
+func (e *functionEntry) resolveArgs(arguments []interface{}) ([]interface{}, error) {
+	if len(e.arguments) == 0 {
+		return arguments, nil
+	}
+	if !e.arguments[len(e.arguments)-1].variadic {
+		if len(e.arguments) != len(arguments) {
+			return nil, errors.New("incorrect number of args")
+		}
+		for i, spec := range e.arguments {
+			userArg := arguments[i]
+			err := spec.typeCheck(userArg)
+			if err != nil {
+				return nil, err
+			}
+		}
+		return arguments, nil
+	}
+	if len(arguments) < len(e.arguments) {
+		return nil, errors.New("Invalid arity.")
+	}
+	return arguments, nil
+}
+
+func (a *argSpec) typeCheck(arg interface{}) error {
+	for _, t := range a.types {
+		switch t {
+		case jpNumber:
+			if _, ok := arg.(float64); ok {
+				return nil
+			}
+		case jpString:
+			if _, ok := arg.(string); ok {
+				return nil
+			}
+		case jpArray:
+			if isSliceType(arg) {
+				return nil
+			}
+		case jpObject:
+			if _, ok := arg.(map[string]interface{}); ok {
+				return nil
+			}
+		case jpArrayNumber:
+			if _, ok := toArrayNum(arg); ok {
+				return nil
+			}
+		case jpArrayString:
+			if _, ok := toArrayStr(arg); ok {
+				return nil
+			}
+		case jpAny:
+			return nil
+		case jpExpref:
+			if _, ok := arg.(expRef); ok {
+				return nil
+			}
+		}
+	}
+	return fmt.Errorf("Invalid type for: %v, expected: %#v", arg, a.types)
+}
+
+func (f *functionCaller) CallFunction(name string, arguments []interface{}, intr *treeInterpreter) (interface{}, error) {
+	entry, ok := f.functionTable[name]
+	if !ok {
+		return nil, errors.New("unknown function: " + name)
+	}
+	resolvedArgs, err := entry.resolveArgs(arguments)
+	if err != nil {
+		return nil, err
+	}
+	if entry.hasExpRef {
+		var extra []interface{}
+		extra = append(extra, intr)
+		resolvedArgs = append(extra, resolvedArgs...)
+	}
+	return entry.handler(resolvedArgs)
+}
+
+func jpfAbs(arguments []interface{}) (interface{}, error) {
+	num := arguments[0].(float64)
+	return math.Abs(num), nil
+}
+
+func jpfLength(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0]
+	if c, ok := arg.(string); ok {
+		return float64(utf8.RuneCountInString(c)), nil
+	} else if isSliceType(arg) {
+		v := reflect.ValueOf(arg)
+		return float64(v.Len()), nil
+	} else if c, ok := arg.(map[string]interface{}); ok {
+		return float64(len(c)), nil
+	}
+	return nil, errors.New("could not compute length()")
+}
+
+func jpfStartsWith(arguments []interface{}) (interface{}, error) {
+	search := arguments[0].(string)
+	prefix := arguments[1].(string)
+	return strings.HasPrefix(search, prefix), nil
+}
+
+func jpfAvg(arguments []interface{}) (interface{}, error) {
+	// We've already type checked the value so we can safely use
+	// type assertions.
+	args := arguments[0].([]interface{})
+	length := float64(len(args))
+	numerator := 0.0
+	for _, n := range args {
+		numerator += n.(float64)
+	}
+	return numerator / length, nil
+}
+func jpfCeil(arguments []interface{}) (interface{}, error) {
+	val := arguments[0].(float64)
+	return math.Ceil(val), nil
+}
+func jpfContains(arguments []interface{}) (interface{}, error) {
+	search := arguments[0]
+	el := arguments[1]
+	if searchStr, ok := search.(string); ok {
+		if elStr, ok := el.(string); ok {
+			return strings.Index(searchStr, elStr) != -1, nil
+		}
+		return false, nil
+	}
+	// Otherwise this is a generic contains for []interface{}
+	general := search.([]interface{})
+	for _, item := range general {
+		if item == el {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+func jpfEndsWith(arguments []interface{}) (interface{}, error) {
+	search := arguments[0].(string)
+	suffix := arguments[1].(string)
+	return strings.HasSuffix(search, suffix), nil
+}
+func jpfFloor(arguments []interface{}) (interface{}, error) {
+	val := arguments[0].(float64)
+	return math.Floor(val), nil
+}
+func jpfMap(arguments []interface{}) (interface{}, error) {
+	intr := arguments[0].(*treeInterpreter)
+	exp := arguments[1].(expRef)
+	node := exp.ref
+	arr := arguments[2].([]interface{})
+	mapped := make([]interface{}, 0, len(arr))
+	for _, value := range arr {
+		current, err := intr.Execute(node, value)
+		if err != nil {
+			return nil, err
+		}
+		mapped = append(mapped, current)
+	}
+	return mapped, nil
+}
+func jpfMax(arguments []interface{}) (interface{}, error) {
+	if items, ok := toArrayNum(arguments[0]); ok {
+		if len(items) == 0 {
+			return nil, nil
+		}
+		if len(items) == 1 {
+			return items[0], nil
+		}
+		best := items[0]
+		for _, item := range items[1:] {
+			if item > best {
+				best = item
+			}
+		}
+		return best, nil
+	}
+	// Otherwise we're dealing with a max() of strings.
+	items, _ := toArrayStr(arguments[0])
+	if len(items) == 0 {
+		return nil, nil
+	}
+	if len(items) == 1 {
+		return items[0], nil
+	}
+	best := items[0]
+	for _, item := range items[1:] {
+		if item > best {
+			best = item
+		}
+	}
+	return best, nil
+}
+func jpfMerge(arguments []interface{}) (interface{}, error) {
+	final := make(map[string]interface{})
+	for _, m := range arguments {
+		mapped := m.(map[string]interface{})
+		for key, value := range mapped {
+			final[key] = value
+		}
+	}
+	return final, nil
+}
+func jpfMaxBy(arguments []interface{}) (interface{}, error) {
+	intr := arguments[0].(*treeInterpreter)
+	arr := arguments[1].([]interface{})
+	exp := arguments[2].(expRef)
+	node := exp.ref
+	if len(arr) == 0 {
+		return nil, nil
+	} else if len(arr) == 1 {
+		return arr[0], nil
+	}
+	start, err := intr.Execute(node, arr[0])
+	if err != nil {
+		return nil, err
+	}
+	switch t := start.(type) {
+	case float64:
+		bestVal := t
+		bestItem := arr[0]
+		for _, item := range arr[1:] {
+			result, err := intr.Execute(node, item)
+			if err != nil {
+				return nil, err
+			}
+			current, ok := result.(float64)
+			if !ok {
+				return nil, errors.New("invalid type, must be number")
+			}
+			if current > bestVal {
+				bestVal = current
+				bestItem = item
+			}
+		}
+		return bestItem, nil
+	case string:
+		bestVal := t
+		bestItem := arr[0]
+		for _, item := range arr[1:] {
+			result, err := intr.Execute(node, item)
+			if err != nil {
+				return nil, err
+			}
+			current, ok := result.(string)
+			if !ok {
+				return nil, errors.New("invalid type, must be string")
+			}
+			if current > bestVal {
+				bestVal = current
+				bestItem = item
+			}
+		}
+		return bestItem, nil
+	default:
+		return nil, errors.New("invalid type, must be number of string")
+	}
+}
+func jpfSum(arguments []interface{}) (interface{}, error) {
+	items, _ := toArrayNum(arguments[0])
+	sum := 0.0
+	for _, item := range items {
+		sum += item
+	}
+	return sum, nil
+}
+
+func jpfMin(arguments []interface{}) (interface{}, error) {
+	if items, ok := toArrayNum(arguments[0]); ok {
+		if len(items) == 0 {
+			return nil, nil
+		}
+		if len(items) == 1 {
+			return items[0], nil
+		}
+		best := items[0]
+		for _, item := range items[1:] {
+			if item < best {
+				best = item
+			}
+		}
+		return best, nil
+	}
+	items, _ := toArrayStr(arguments[0])
+	if len(items) == 0 {
+		return nil, nil
+	}
+	if len(items) == 1 {
+		return items[0], nil
+	}
+	best := items[0]
+	for _, item := range items[1:] {
+		if item < best {
+			best = item
+		}
+	}
+	return best, nil
+}
+
+func jpfMinBy(arguments []interface{}) (interface{}, error) {
+	intr := arguments[0].(*treeInterpreter)
+	arr := arguments[1].([]interface{})
+	exp := arguments[2].(expRef)
+	node := exp.ref
+	if len(arr) == 0 {
+		return nil, nil
+	} else if len(arr) == 1 {
+		return arr[0], nil
+	}
+	start, err := intr.Execute(node, arr[0])
+	if err != nil {
+		return nil, err
+	}
+	if t, ok := start.(float64); ok {
+		bestVal := t
+		bestItem := arr[0]
+		for _, item := range arr[1:] {
+			result, err := intr.Execute(node, item)
+			if err != nil {
+				return nil, err
+			}
+			current, ok := result.(float64)
+			if !ok {
+				return nil, errors.New("invalid type, must be number")
+			}
+			if current < bestVal {
+				bestVal = current
+				bestItem = item
+			}
+		}
+		return bestItem, nil
+	} else if t, ok := start.(string); ok {
+		bestVal := t
+		bestItem := arr[0]
+		for _, item := range arr[1:] {
+			result, err := intr.Execute(node, item)
+			if err != nil {
+				return nil, err
+			}
+			current, ok := result.(string)
+			if !ok {
+				return nil, errors.New("invalid type, must be string")
+			}
+			if current < bestVal {
+				bestVal = current
+				bestItem = item
+			}
+		}
+		return bestItem, nil
+	} else {
+		return nil, errors.New("invalid type, must be number of string")
+	}
+}
+func jpfType(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0]
+	if _, ok := arg.(float64); ok {
+		return "number", nil
+	}
+	if _, ok := arg.(string); ok {
+		return "string", nil
+	}
+	if _, ok := arg.([]interface{}); ok {
+		return "array", nil
+	}
+	if _, ok := arg.(map[string]interface{}); ok {
+		return "object", nil
+	}
+	if arg == nil {
+		return "null", nil
+	}
+	if arg == true || arg == false {
+		return "boolean", nil
+	}
+	return nil, errors.New("unknown type")
+}
+func jpfKeys(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0].(map[string]interface{})
+	collected := make([]interface{}, 0, len(arg))
+	for key := range arg {
+		collected = append(collected, key)
+	}
+	return collected, nil
+}
+func jpfValues(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0].(map[string]interface{})
+	collected := make([]interface{}, 0, len(arg))
+	for _, value := range arg {
+		collected = append(collected, value)
+	}
+	return collected, nil
+}
+func jpfSort(arguments []interface{}) (interface{}, error) {
+	if items, ok := toArrayNum(arguments[0]); ok {
+		d := sort.Float64Slice(items)
+		sort.Stable(d)
+		final := make([]interface{}, len(d))
+		for i, val := range d {
+			final[i] = val
+		}
+		return final, nil
+	}
+	// Otherwise we're dealing with sort()'ing strings.
+	items, _ := toArrayStr(arguments[0])
+	d := sort.StringSlice(items)
+	sort.Stable(d)
+	final := make([]interface{}, len(d))
+	for i, val := range d {
+		final[i] = val
+	}
+	return final, nil
+}
+func jpfSortBy(arguments []interface{}) (interface{}, error) {
+	intr := arguments[0].(*treeInterpreter)
+	arr := arguments[1].([]interface{})
+	exp := arguments[2].(expRef)
+	node := exp.ref
+	if len(arr) == 0 {
+		return arr, nil
+	} else if len(arr) == 1 {
+		return arr, nil
+	}
+	start, err := intr.Execute(node, arr[0])
+	if err != nil {
+		return nil, err
+	}
+	if _, ok := start.(float64); ok {
+		sortable := &byExprFloat{intr, node, arr, false}
+		sort.Stable(sortable)
+		if sortable.hasError {
+			return nil, errors.New("error in sort_by comparison")
+		}
+		return arr, nil
+	} else if _, ok := start.(string); ok {
+		sortable := &byExprString{intr, node, arr, false}
+		sort.Stable(sortable)
+		if sortable.hasError {
+			return nil, errors.New("error in sort_by comparison")
+		}
+		return arr, nil
+	} else {
+		return nil, errors.New("invalid type, must be number of string")
+	}
+}
+func jpfJoin(arguments []interface{}) (interface{}, error) {
+	sep := arguments[0].(string)
+	// We can't just do arguments[1].([]string), we have to
+	// manually convert each item to a string.
+	arrayStr := []string{}
+	for _, item := range arguments[1].([]interface{}) {
+		arrayStr = append(arrayStr, item.(string))
+	}
+	return strings.Join(arrayStr, sep), nil
+}
+func jpfReverse(arguments []interface{}) (interface{}, error) {
+	if s, ok := arguments[0].(string); ok {
+		r := []rune(s)
+		for i, j := 0, len(r)-1; i < len(r)/2; i, j = i+1, j-1 {
+			r[i], r[j] = r[j], r[i]
+		}
+		return string(r), nil
+	}
+	items := arguments[0].([]interface{})
+	length := len(items)
+	reversed := make([]interface{}, length)
+	for i, item := range items {
+		reversed[length-(i+1)] = item
+	}
+	return reversed, nil
+}
+func jpfToArray(arguments []interface{}) (interface{}, error) {
+	if _, ok := arguments[0].([]interface{}); ok {
+		return arguments[0], nil
+	}
+	return arguments[:1:1], nil
+}
+func jpfToString(arguments []interface{}) (interface{}, error) {
+	if v, ok := arguments[0].(string); ok {
+		return v, nil
+	}
+	result, err := json.Marshal(arguments[0])
+	if err != nil {
+		return nil, err
+	}
+	return string(result), nil
+}
+func jpfToNumber(arguments []interface{}) (interface{}, error) {
+	arg := arguments[0]
+	if v, ok := arg.(float64); ok {
+		return v, nil
+	}
+	if v, ok := arg.(string); ok {
+		conv, err := strconv.ParseFloat(v, 64)
+		if err != nil {
+			return nil, nil
+		}
+		return conv, nil
+	}
+	if _, ok := arg.([]interface{}); ok {
+		return nil, nil
+	}
+	if _, ok := arg.(map[string]interface{}); ok {
+		return nil, nil
+	}
+	if arg == nil {
+		return nil, nil
+	}
+	if arg == true || arg == false {
+		return nil, nil
+	}
+	return nil, errors.New("unknown type")
+}
+func jpfNotNull(arguments []interface{}) (interface{}, error) {
+	for _, arg := range arguments {
+		if arg != nil {
+			return arg, nil
+		}
+	}
+	return nil, nil
+}
diff --git a/vendor/github.com/jmespath/go-jmespath/interpreter.go b/vendor/github.com/jmespath/go-jmespath/interpreter.go
new file mode 100644
index 0000000000..13c74604c2
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath/interpreter.go
@@ -0,0 +1,418 @@
+package jmespath
+
+import (
+	"errors"
+	"reflect"
+	"unicode"
+	"unicode/utf8"
+)
+
+/* This is a tree based interpreter.  It walks the AST and directly
+   interprets the AST to search through a JSON document.
+*/
+
+type treeInterpreter struct {
+	fCall *functionCaller
+}
+
+func newInterpreter() *treeInterpreter {
+	interpreter := treeInterpreter{}
+	interpreter.fCall = newFunctionCaller()
+	return &interpreter
+}
+
+type expRef struct {
+	ref ASTNode
+}
+
+// Execute takes an ASTNode and input data and interprets the AST directly.
+// It will produce the result of applying the JMESPath expression associated
+// with the ASTNode to the input data "value".
+func (intr *treeInterpreter) Execute(node ASTNode, value interface{}) (interface{}, error) {
+	switch node.nodeType {
+	case ASTComparator:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		right, err := intr.Execute(node.children[1], value)
+		if err != nil {
+			return nil, err
+		}
+		switch node.value {
+		case tEQ:
+			return objsEqual(left, right), nil
+		case tNE:
+			return !objsEqual(left, right), nil
+		}
+		leftNum, ok := left.(float64)
+		if !ok {
+			return nil, nil
+		}
+		rightNum, ok := right.(float64)
+		if !ok {
+			return nil, nil
+		}
+		switch node.value {
+		case tGT:
+			return leftNum > rightNum, nil
+		case tGTE:
+			return leftNum >= rightNum, nil
+		case tLT:
+			return leftNum < rightNum, nil
+		case tLTE:
+			return leftNum <= rightNum, nil
+		}
+	case ASTExpRef:
+		return expRef{ref: node.children[0]}, nil
+	case ASTFunctionExpression:
+		resolvedArgs := []interface{}{}
+		for _, arg := range node.children {
+			current, err := intr.Execute(arg, value)
+			if err != nil {
+				return nil, err
+			}
+			resolvedArgs = append(resolvedArgs, current)
+		}
+		return intr.fCall.CallFunction(node.value.(string), resolvedArgs, intr)
+	case ASTField:
+		if m, ok := value.(map[string]interface{}); ok {
+			key := node.value.(string)
+			return m[key], nil
+		}
+		return intr.fieldFromStruct(node.value.(string), value)
+	case ASTFilterProjection:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, nil
+		}
+		sliceType, ok := left.([]interface{})
+		if !ok {
+			if isSliceType(left) {
+				return intr.filterProjectionWithReflection(node, left)
+			}
+			return nil, nil
+		}
+		compareNode := node.children[2]
+		collected := []interface{}{}
+		for _, element := range sliceType {
+			result, err := intr.Execute(compareNode, element)
+			if err != nil {
+				return nil, err
+			}
+			if !isFalse(result) {
+				current, err := intr.Execute(node.children[1], element)
+				if err != nil {
+					return nil, err
+				}
+				if current != nil {
+					collected = append(collected, current)
+				}
+			}
+		}
+		return collected, nil
+	case ASTFlatten:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, nil
+		}
+		sliceType, ok := left.([]interface{})
+		if !ok {
+			// If we can't type convert to []interface{}, there's
+			// a chance this could still work via reflection if we're
+			// dealing with user provided types.
+			if isSliceType(left) {
+				return intr.flattenWithReflection(left)
+			}
+			return nil, nil
+		}
+		flattened := []interface{}{}
+		for _, element := range sliceType {
+			if elementSlice, ok := element.([]interface{}); ok {
+				flattened = append(flattened, elementSlice...)
+			} else if isSliceType(element) {
+				reflectFlat := []interface{}{}
+				v := reflect.ValueOf(element)
+				for i := 0; i < v.Len(); i++ {
+					reflectFlat = append(reflectFlat, v.Index(i).Interface())
+				}
+				flattened = append(flattened, reflectFlat...)
+			} else {
+				flattened = append(flattened, element)
+			}
+		}
+		return flattened, nil
+	case ASTIdentity, ASTCurrentNode:
+		return value, nil
+	case ASTIndex:
+		if sliceType, ok := value.([]interface{}); ok {
+			index := node.value.(int)
+			if index < 0 {
+				index += len(sliceType)
+			}
+			if index < len(sliceType) && index >= 0 {
+				return sliceType[index], nil
+			}
+			return nil, nil
+		}
+		// Otherwise try via reflection.
+		rv := reflect.ValueOf(value)
+		if rv.Kind() == reflect.Slice {
+			index := node.value.(int)
+			if index < 0 {
+				index += rv.Len()
+			}
+			if index < rv.Len() && index >= 0 {
+				v := rv.Index(index)
+				return v.Interface(), nil
+			}
+		}
+		return nil, nil
+	case ASTKeyValPair:
+		return intr.Execute(node.children[0], value)
+	case ASTLiteral:
+		return node.value, nil
+	case ASTMultiSelectHash:
+		if value == nil {
+			return nil, nil
+		}
+		collected := make(map[string]interface{})
+		for _, child := range node.children {
+			current, err := intr.Execute(child, value)
+			if err != nil {
+				return nil, err
+			}
+			key := child.value.(string)
+			collected[key] = current
+		}
+		return collected, nil
+	case ASTMultiSelectList:
+		if value == nil {
+			return nil, nil
+		}
+		collected := []interface{}{}
+		for _, child := range node.children {
+			current, err := intr.Execute(child, value)
+			if err != nil {
+				return nil, err
+			}
+			collected = append(collected, current)
+		}
+		return collected, nil
+	case ASTOrExpression:
+		matched, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		if isFalse(matched) {
+			matched, err = intr.Execute(node.children[1], value)
+			if err != nil {
+				return nil, err
+			}
+		}
+		return matched, nil
+	case ASTAndExpression:
+		matched, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		if isFalse(matched) {
+			return matched, nil
+		}
+		return intr.Execute(node.children[1], value)
+	case ASTNotExpression:
+		matched, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		if isFalse(matched) {
+			return true, nil
+		}
+		return false, nil
+	case ASTPipe:
+		result := value
+		var err error
+		for _, child := range node.children {
+			result, err = intr.Execute(child, result)
+			if err != nil {
+				return nil, err
+			}
+		}
+		return result, nil
+	case ASTProjection:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		sliceType, ok := left.([]interface{})
+		if !ok {
+			if isSliceType(left) {
+				return intr.projectWithReflection(node, left)
+			}
+			return nil, nil
+		}
+		collected := []interface{}{}
+		var current interface{}
+		for _, element := range sliceType {
+			current, err = intr.Execute(node.children[1], element)
+			if err != nil {
+				return nil, err
+			}
+			if current != nil {
+				collected = append(collected, current)
+			}
+		}
+		return collected, nil
+	case ASTSubexpression, ASTIndexExpression:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, err
+		}
+		return intr.Execute(node.children[1], left)
+	case ASTSlice:
+		sliceType, ok := value.([]interface{})
+		if !ok {
+			if isSliceType(value) {
+				return intr.sliceWithReflection(node, value)
+			}
+			return nil, nil
+		}
+		parts := node.value.([]*int)
+		sliceParams := make([]sliceParam, 3)
+		for i, part := range parts {
+			if part != nil {
+				sliceParams[i].Specified = true
+				sliceParams[i].N = *part
+			}
+		}
+		return slice(sliceType, sliceParams)
+	case ASTValueProjection:
+		left, err := intr.Execute(node.children[0], value)
+		if err != nil {
+			return nil, nil
+		}
+		mapType, ok := left.(map[string]interface{})
+		if !ok {
+			return nil, nil
+		}
+		values := make([]interface{}, len(mapType))
+		for _, value := range mapType {
+			values = append(values, value)
+		}
+		collected := []interface{}{}
+		for _, element := range values {
+			current, err := intr.Execute(node.children[1], element)
+			if err != nil {
+				return nil, err
+			}
+			if current != nil {
+				collected = append(collected, current)
+			}
+		}
+		return collected, nil
+	}
+	return nil, errors.New("Unknown AST node: " + node.nodeType.String())
+}
+
+func (intr *treeInterpreter) fieldFromStruct(key string, value interface{}) (interface{}, error) {
+	rv := reflect.ValueOf(value)
+	first, n := utf8.DecodeRuneInString(key)
+	fieldName := string(unicode.ToUpper(first)) + key[n:]
+	if rv.Kind() == reflect.Struct {
+		v := rv.FieldByName(fieldName)
+		if !v.IsValid() {
+			return nil, nil
+		}
+		return v.Interface(), nil
+	} else if rv.Kind() == reflect.Ptr {
+		// Handle multiple levels of indirection?
+		if rv.IsNil() {
+			return nil, nil
+		}
+		rv = rv.Elem()
+		v := rv.FieldByName(fieldName)
+		if !v.IsValid() {
+			return nil, nil
+		}
+		return v.Interface(), nil
+	}
+	return nil, nil
+}
+
+func (intr *treeInterpreter) flattenWithReflection(value interface{}) (interface{}, error) {
+	v := reflect.ValueOf(value)
+	flattened := []interface{}{}
+	for i := 0; i < v.Len(); i++ {
+		element := v.Index(i).Interface()
+		if reflect.TypeOf(element).Kind() == reflect.Slice {
+			// Then insert the contents of the element
+			// slice into the flattened slice,
+			// i.e flattened = append(flattened, mySlice...)
+			elementV := reflect.ValueOf(element)
+			for j := 0; j < elementV.Len(); j++ {
+				flattened = append(
+					flattened, elementV.Index(j).Interface())
+			}
+		} else {
+			flattened = append(flattened, element)
+		}
+	}
+	return flattened, nil
+}
+
+func (intr *treeInterpreter) sliceWithReflection(node ASTNode, value interface{}) (interface{}, error) {
+	v := reflect.ValueOf(value)
+	parts := node.value.([]*int)
+	sliceParams := make([]sliceParam, 3)
+	for i, part := range parts {
+		if part != nil {
+			sliceParams[i].Specified = true
+			sliceParams[i].N = *part
+		}
+	}
+	final := []interface{}{}
+	for i := 0; i < v.Len(); i++ {
+		element := v.Index(i).Interface()
+		final = append(final, element)
+	}
+	return slice(final, sliceParams)
+}
+
+func (intr *treeInterpreter) filterProjectionWithReflection(node ASTNode, value interface{}) (interface{}, error) {
+	compareNode := node.children[2]
+	collected := []interface{}{}
+	v := reflect.ValueOf(value)
+	for i := 0; i < v.Len(); i++ {
+		element := v.Index(i).Interface()
+		result, err := intr.Execute(compareNode, element)
+		if err != nil {
+			return nil, err
+		}
+		if !isFalse(result) {
+			current, err := intr.Execute(node.children[1], element)
+			if err != nil {
+				return nil, err
+			}
+			if current != nil {
+				collected = append(collected, current)
+			}
+		}
+	}
+	return collected, nil
+}
+
+func (intr *treeInterpreter) projectWithReflection(node ASTNode, value interface{}) (interface{}, error) {
+	collected := []interface{}{}
+	v := reflect.ValueOf(value)
+	for i := 0; i < v.Len(); i++ {
+		element := v.Index(i).Interface()
+		result, err := intr.Execute(node.children[1], element)
+		if err != nil {
+			return nil, err
+		}
+		if result != nil {
+			collected = append(collected, result)
+		}
+	}
+	return collected, nil
+}
diff --git a/vendor/github.com/jmespath/go-jmespath/lexer.go b/vendor/github.com/jmespath/go-jmespath/lexer.go
new file mode 100644
index 0000000000..817900c8f5
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath/lexer.go
@@ -0,0 +1,420 @@
+package jmespath
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+	"unicode/utf8"
+)
+
+type token struct {
+	tokenType tokType
+	value     string
+	position  int
+	length    int
+}
+
+type tokType int
+
+const eof = -1
+
+// Lexer contains information about the expression being tokenized.
+type Lexer struct {
+	expression string       // The expression provided by the user.
+	currentPos int          // The current position in the string.
+	lastWidth  int          // The width of the current rune.  This
+	buf        bytes.Buffer // Internal buffer used for building up values.
+}
+
+// SyntaxError is the main error used whenever a lexing or parsing error occurs.
+type SyntaxError struct {
+	msg        string // Error message displayed to user
+	Expression string // Expression that generated a SyntaxError
+	Offset     int    // The location in the string where the error occurred
+}
+
+func (e SyntaxError) Error() string {
+	// In the future, it would be good to underline the specific
+	// location where the error occurred.
+	return "SyntaxError: " + e.msg
+}
+
+// HighlightLocation will show where the syntax error occurred.
+// It will place a "^" character on a line below the expression
+// at the point where the syntax error occurred.
+func (e SyntaxError) HighlightLocation() string {
+	return e.Expression + "\n" + strings.Repeat(" ", e.Offset) + "^"
+}
+
+//go:generate stringer -type=tokType
+const (
+	tUnknown tokType = iota
+	tStar
+	tDot
+	tFilter
+	tFlatten
+	tLparen
+	tRparen
+	tLbracket
+	tRbracket
+	tLbrace
+	tRbrace
+	tOr
+	tPipe
+	tNumber
+	tUnquotedIdentifier
+	tQuotedIdentifier
+	tComma
+	tColon
+	tLT
+	tLTE
+	tGT
+	tGTE
+	tEQ
+	tNE
+	tJSONLiteral
+	tStringLiteral
+	tCurrent
+	tExpref
+	tAnd
+	tNot
+	tEOF
+)
+
+var basicTokens = map[rune]tokType{
+	'.': tDot,
+	'*': tStar,
+	',': tComma,
+	':': tColon,
+	'{': tLbrace,
+	'}': tRbrace,
+	']': tRbracket, // tLbracket not included because it could be "[]"
+	'(': tLparen,
+	')': tRparen,
+	'@': tCurrent,
+}
+
+// Bit mask for [a-zA-Z_] shifted down 64 bits to fit in a single uint64.
+// When using this bitmask just be sure to shift the rune down 64 bits
+// before checking against identifierStartBits.
+const identifierStartBits uint64 = 576460745995190270
+
+// Bit mask for [a-zA-Z0-9], 128 bits -> 2 uint64s.
+var identifierTrailingBits = [2]uint64{287948901175001088, 576460745995190270}
+
+var whiteSpace = map[rune]bool{
+	' ': true, '\t': true, '\n': true, '\r': true,
+}
+
+func (t token) String() string {
+	return fmt.Sprintf("Token{%+v, %s, %d, %d}",
+		t.tokenType, t.value, t.position, t.length)
+}
+
+// NewLexer creates a new JMESPath lexer.
+func NewLexer() *Lexer {
+	lexer := Lexer{}
+	return &lexer
+}
+
+func (lexer *Lexer) next() rune {
+	if lexer.currentPos >= len(lexer.expression) {
+		lexer.lastWidth = 0
+		return eof
+	}
+	r, w := utf8.DecodeRuneInString(lexer.expression[lexer.currentPos:])
+	lexer.lastWidth = w
+	lexer.currentPos += w
+	return r
+}
+
+func (lexer *Lexer) back() {
+	lexer.currentPos -= lexer.lastWidth
+}
+
+func (lexer *Lexer) peek() rune {
+	t := lexer.next()
+	lexer.back()
+	return t
+}
+
+// tokenize takes an expression and returns corresponding tokens.
+func (lexer *Lexer) tokenize(expression string) ([]token, error) {
+	var tokens []token
+	lexer.expression = expression
+	lexer.currentPos = 0
+	lexer.lastWidth = 0
+loop:
+	for {
+		r := lexer.next()
+		if identifierStartBits&(1<<(uint64(r)-64)) > 0 {
+			t := lexer.consumeUnquotedIdentifier()
+			tokens = append(tokens, t)
+		} else if val, ok := basicTokens[r]; ok {
+			// Basic single char token.
+			t := token{
+				tokenType: val,
+				value:     string(r),
+				position:  lexer.currentPos - lexer.lastWidth,
+				length:    1,
+			}
+			tokens = append(tokens, t)
+		} else if r == '-' || (r >= '0' && r <= '9') {
+			t := lexer.consumeNumber()
+			tokens = append(tokens, t)
+		} else if r == '[' {
+			t := lexer.consumeLBracket()
+			tokens = append(tokens, t)
+		} else if r == '"' {
+			t, err := lexer.consumeQuotedIdentifier()
+			if err != nil {
+				return tokens, err
+			}
+			tokens = append(tokens, t)
+		} else if r == '\'' {
+			t, err := lexer.consumeRawStringLiteral()
+			if err != nil {
+				return tokens, err
+			}
+			tokens = append(tokens, t)
+		} else if r == '`' {
+			t, err := lexer.consumeLiteral()
+			if err != nil {
+				return tokens, err
+			}
+			tokens = append(tokens, t)
+		} else if r == '|' {
+			t := lexer.matchOrElse(r, '|', tOr, tPipe)
+			tokens = append(tokens, t)
+		} else if r == '<' {
+			t := lexer.matchOrElse(r, '=', tLTE, tLT)
+			tokens = append(tokens, t)
+		} else if r == '>' {
+			t := lexer.matchOrElse(r, '=', tGTE, tGT)
+			tokens = append(tokens, t)
+		} else if r == '!' {
+			t := lexer.matchOrElse(r, '=', tNE, tNot)
+			tokens = append(tokens, t)
+		} else if r == '=' {
+			t := lexer.matchOrElse(r, '=', tEQ, tUnknown)
+			tokens = append(tokens, t)
+		} else if r == '&' {
+			t := lexer.matchOrElse(r, '&', tAnd, tExpref)
+			tokens = append(tokens, t)
+		} else if r == eof {
+			break loop
+		} else if _, ok := whiteSpace[r]; ok {
+			// Ignore whitespace
+		} else {
+			return tokens, lexer.syntaxError(fmt.Sprintf("Unknown char: %s", strconv.QuoteRuneToASCII(r)))
+		}
+	}
+	tokens = append(tokens, token{tEOF, "", len(lexer.expression), 0})
+	return tokens, nil
+}
+
+// Consume characters until the ending rune "r" is reached.
+// If the end of the expression is reached before seeing the
+// terminating rune "r", then an error is returned.
+// If no error occurs then the matching substring is returned.
+// The returned string will not include the ending rune.
+func (lexer *Lexer) consumeUntil(end rune) (string, error) {
+	start := lexer.currentPos
+	current := lexer.next()
+	for current != end && current != eof {
+		if current == '\\' && lexer.peek() != eof {
+			lexer.next()
+		}
+		current = lexer.next()
+	}
+	if lexer.lastWidth == 0 {
+		// Then we hit an EOF so we never reached the closing
+		// delimiter.
+		return "", SyntaxError{
+			msg:        "Unclosed delimiter: " + string(end),
+			Expression: lexer.expression,
+			Offset:     len(lexer.expression),
+		}
+	}
+	return lexer.expression[start : lexer.currentPos-lexer.lastWidth], nil
+}
+
+func (lexer *Lexer) consumeLiteral() (token, error) {
+	start := lexer.currentPos
+	value, err := lexer.consumeUntil('`')
+	if err != nil {
+		return token{}, err
+	}
+	value = strings.Replace(value, "\\`", "`", -1)
+	return token{
+		tokenType: tJSONLiteral,
+		value:     value,
+		position:  start,
+		length:    len(value),
+	}, nil
+}
+
+func (lexer *Lexer) consumeRawStringLiteral() (token, error) {
+	start := lexer.currentPos
+	currentIndex := start
+	current := lexer.next()
+	for current != '\'' && lexer.peek() != eof {
+		if current == '\\' && lexer.peek() == '\'' {
+			chunk := lexer.expression[currentIndex : lexer.currentPos-1]
+			lexer.buf.WriteString(chunk)
+			lexer.buf.WriteString("'")
+			lexer.next()
+			currentIndex = lexer.currentPos
+		}
+		current = lexer.next()
+	}
+	if lexer.lastWidth == 0 {
+		// Then we hit an EOF so we never reached the closing
+		// delimiter.
+		return token{}, SyntaxError{
+			msg:        "Unclosed delimiter: '",
+			Expression: lexer.expression,
+			Offset:     len(lexer.expression),
+		}
+	}
+	if currentIndex < lexer.currentPos {
+		lexer.buf.WriteString(lexer.expression[currentIndex : lexer.currentPos-1])
+	}
+	value := lexer.buf.String()
+	// Reset the buffer so it can reused again.
+	lexer.buf.Reset()
+	return token{
+		tokenType: tStringLiteral,
+		value:     value,
+		position:  start,
+		length:    len(value),
+	}, nil
+}
+
+func (lexer *Lexer) syntaxError(msg string) SyntaxError {
+	return SyntaxError{
+		msg:        msg,
+		Expression: lexer.expression,
+		Offset:     lexer.currentPos - 1,
+	}
+}
+
+// Checks for a two char token, otherwise matches a single character
+// token. This is used whenever a two char token overlaps a single
+// char token, e.g. "||" -> tPipe, "|" -> tOr.
+func (lexer *Lexer) matchOrElse(first rune, second rune, matchedType tokType, singleCharType tokType) token {
+	start := lexer.currentPos - lexer.lastWidth
+	nextRune := lexer.next()
+	var t token
+	if nextRune == second {
+		t = token{
+			tokenType: matchedType,
+			value:     string(first) + string(second),
+			position:  start,
+			length:    2,
+		}
+	} else {
+		lexer.back()
+		t = token{
+			tokenType: singleCharType,
+			value:     string(first),
+			position:  start,
+			length:    1,
+		}
+	}
+	return t
+}
+
+func (lexer *Lexer) consumeLBracket() token {
+	// There's three options here:
+	// 1. A filter expression "[?"
+	// 2. A flatten operator "[]"
+	// 3. A bare rbracket "["
+	start := lexer.currentPos - lexer.lastWidth
+	nextRune := lexer.next()
+	var t token
+	if nextRune == '?' {
+		t = token{
+			tokenType: tFilter,
+			value:     "[?",
+			position:  start,
+			length:    2,
+		}
+	} else if nextRune == ']' {
+		t = token{
+			tokenType: tFlatten,
+			value:     "[]",
+			position:  start,
+			length:    2,
+		}
+	} else {
+		t = token{
+			tokenType: tLbracket,
+			value:     "[",
+			position:  start,
+			length:    1,
+		}
+		lexer.back()
+	}
+	return t
+}
+
+func (lexer *Lexer) consumeQuotedIdentifier() (token, error) {
+	start := lexer.currentPos
+	value, err := lexer.consumeUntil('"')
+	if err != nil {
+		return token{}, err
+	}
+	var decoded string
+	asJSON := []byte("\"" + value + "\"")
+	if err := json.Unmarshal([]byte(asJSON), &decoded); err != nil {
+		return token{}, err
+	}
+	return token{
+		tokenType: tQuotedIdentifier,
+		value:     decoded,
+		position:  start - 1,
+		length:    len(decoded),
+	}, nil
+}
+
+func (lexer *Lexer) consumeUnquotedIdentifier() token {
+	// Consume runes until we reach the end of an unquoted
+	// identifier.
+	start := lexer.currentPos - lexer.lastWidth
+	for {
+		r := lexer.next()
+		if r < 0 || r > 128 || identifierTrailingBits[uint64(r)/64]&(1<<(uint64(r)%64)) == 0 {
+			lexer.back()
+			break
+		}
+	}
+	value := lexer.expression[start:lexer.currentPos]
+	return token{
+		tokenType: tUnquotedIdentifier,
+		value:     value,
+		position:  start,
+		length:    lexer.currentPos - start,
+	}
+}
+
+func (lexer *Lexer) consumeNumber() token {
+	// Consume runes until we reach something that's not a number.
+	start := lexer.currentPos - lexer.lastWidth
+	for {
+		r := lexer.next()
+		if r < '0' || r > '9' {
+			lexer.back()
+			break
+		}
+	}
+	value := lexer.expression[start:lexer.currentPos]
+	return token{
+		tokenType: tNumber,
+		value:     value,
+		position:  start,
+		length:    lexer.currentPos - start,
+	}
+}
diff --git a/vendor/github.com/jmespath/go-jmespath/parser.go b/vendor/github.com/jmespath/go-jmespath/parser.go
new file mode 100644
index 0000000000..1240a17552
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath/parser.go
@@ -0,0 +1,603 @@
+package jmespath
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+type astNodeType int
+
+//go:generate stringer -type astNodeType
+const (
+	ASTEmpty astNodeType = iota
+	ASTComparator
+	ASTCurrentNode
+	ASTExpRef
+	ASTFunctionExpression
+	ASTField
+	ASTFilterProjection
+	ASTFlatten
+	ASTIdentity
+	ASTIndex
+	ASTIndexExpression
+	ASTKeyValPair
+	ASTLiteral
+	ASTMultiSelectHash
+	ASTMultiSelectList
+	ASTOrExpression
+	ASTAndExpression
+	ASTNotExpression
+	ASTPipe
+	ASTProjection
+	ASTSubexpression
+	ASTSlice
+	ASTValueProjection
+)
+
+// ASTNode represents the abstract syntax tree of a JMESPath expression.
+type ASTNode struct {
+	nodeType astNodeType
+	value    interface{}
+	children []ASTNode
+}
+
+func (node ASTNode) String() string {
+	return node.PrettyPrint(0)
+}
+
+// PrettyPrint will pretty print the parsed AST.
+// The AST is an implementation detail and this pretty print
+// function is provided as a convenience method to help with
+// debugging.  You should not rely on its output as the internal
+// structure of the AST may change at any time.
+func (node ASTNode) PrettyPrint(indent int) string {
+	spaces := strings.Repeat(" ", indent)
+	output := fmt.Sprintf("%s%s {\n", spaces, node.nodeType)
+	nextIndent := indent + 2
+	if node.value != nil {
+		if converted, ok := node.value.(fmt.Stringer); ok {
+			// Account for things like comparator nodes
+			// that are enums with a String() method.
+			output += fmt.Sprintf("%svalue: %s\n", strings.Repeat(" ", nextIndent), converted.String())
+		} else {
+			output += fmt.Sprintf("%svalue: %#v\n", strings.Repeat(" ", nextIndent), node.value)
+		}
+	}
+	lastIndex := len(node.children)
+	if lastIndex > 0 {
+		output += fmt.Sprintf("%schildren: {\n", strings.Repeat(" ", nextIndent))
+		childIndent := nextIndent + 2
+		for _, elem := range node.children {
+			output += elem.PrettyPrint(childIndent)
+		}
+	}
+	output += fmt.Sprintf("%s}\n", spaces)
+	return output
+}
+
+var bindingPowers = map[tokType]int{
+	tEOF:                0,
+	tUnquotedIdentifier: 0,
+	tQuotedIdentifier:   0,
+	tRbracket:           0,
+	tRparen:             0,
+	tComma:              0,
+	tRbrace:             0,
+	tNumber:             0,
+	tCurrent:            0,
+	tExpref:             0,
+	tColon:              0,
+	tPipe:               1,
+	tOr:                 2,
+	tAnd:                3,
+	tEQ:                 5,
+	tLT:                 5,
+	tLTE:                5,
+	tGT:                 5,
+	tGTE:                5,
+	tNE:                 5,
+	tFlatten:            9,
+	tStar:               20,
+	tFilter:             21,
+	tDot:                40,
+	tNot:                45,
+	tLbrace:             50,
+	tLbracket:           55,
+	tLparen:             60,
+}
+
+// Parser holds state about the current expression being parsed.
+type Parser struct {
+	expression string
+	tokens     []token
+	index      int
+}
+
+// NewParser creates a new JMESPath parser.
+func NewParser() *Parser {
+	p := Parser{}
+	return &p
+}
+
+// Parse will compile a JMESPath expression.
+func (p *Parser) Parse(expression string) (ASTNode, error) {
+	lexer := NewLexer()
+	p.expression = expression
+	p.index = 0
+	tokens, err := lexer.tokenize(expression)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	p.tokens = tokens
+	parsed, err := p.parseExpression(0)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	if p.current() != tEOF {
+		return ASTNode{}, p.syntaxError(fmt.Sprintf(
+			"Unexpected token at the end of the expresssion: %s", p.current()))
+	}
+	return parsed, nil
+}
+
+func (p *Parser) parseExpression(bindingPower int) (ASTNode, error) {
+	var err error
+	leftToken := p.lookaheadToken(0)
+	p.advance()
+	leftNode, err := p.nud(leftToken)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	currentToken := p.current()
+	for bindingPower < bindingPowers[currentToken] {
+		p.advance()
+		leftNode, err = p.led(currentToken, leftNode)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		currentToken = p.current()
+	}
+	return leftNode, nil
+}
+
+func (p *Parser) parseIndexExpression() (ASTNode, error) {
+	if p.lookahead(0) == tColon || p.lookahead(1) == tColon {
+		return p.parseSliceExpression()
+	}
+	indexStr := p.lookaheadToken(0).value
+	parsedInt, err := strconv.Atoi(indexStr)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	indexNode := ASTNode{nodeType: ASTIndex, value: parsedInt}
+	p.advance()
+	if err := p.match(tRbracket); err != nil {
+		return ASTNode{}, err
+	}
+	return indexNode, nil
+}
+
+func (p *Parser) parseSliceExpression() (ASTNode, error) {
+	parts := []*int{nil, nil, nil}
+	index := 0
+	current := p.current()
+	for current != tRbracket && index < 3 {
+		if current == tColon {
+			index++
+			p.advance()
+		} else if current == tNumber {
+			parsedInt, err := strconv.Atoi(p.lookaheadToken(0).value)
+			if err != nil {
+				return ASTNode{}, err
+			}
+			parts[index] = &parsedInt
+			p.advance()
+		} else {
+			return ASTNode{}, p.syntaxError(
+				"Expected tColon or tNumber" + ", received: " + p.current().String())
+		}
+		current = p.current()
+	}
+	if err := p.match(tRbracket); err != nil {
+		return ASTNode{}, err
+	}
+	return ASTNode{
+		nodeType: ASTSlice,
+		value:    parts,
+	}, nil
+}
+
+func (p *Parser) match(tokenType tokType) error {
+	if p.current() == tokenType {
+		p.advance()
+		return nil
+	}
+	return p.syntaxError("Expected " + tokenType.String() + ", received: " + p.current().String())
+}
+
+func (p *Parser) led(tokenType tokType, node ASTNode) (ASTNode, error) {
+	switch tokenType {
+	case tDot:
+		if p.current() != tStar {
+			right, err := p.parseDotRHS(bindingPowers[tDot])
+			return ASTNode{
+				nodeType: ASTSubexpression,
+				children: []ASTNode{node, right},
+			}, err
+		}
+		p.advance()
+		right, err := p.parseProjectionRHS(bindingPowers[tDot])
+		return ASTNode{
+			nodeType: ASTValueProjection,
+			children: []ASTNode{node, right},
+		}, err
+	case tPipe:
+		right, err := p.parseExpression(bindingPowers[tPipe])
+		return ASTNode{nodeType: ASTPipe, children: []ASTNode{node, right}}, err
+	case tOr:
+		right, err := p.parseExpression(bindingPowers[tOr])
+		return ASTNode{nodeType: ASTOrExpression, children: []ASTNode{node, right}}, err
+	case tAnd:
+		right, err := p.parseExpression(bindingPowers[tAnd])
+		return ASTNode{nodeType: ASTAndExpression, children: []ASTNode{node, right}}, err
+	case tLparen:
+		name := node.value
+		var args []ASTNode
+		for p.current() != tRparen {
+			expression, err := p.parseExpression(0)
+			if err != nil {
+				return ASTNode{}, err
+			}
+			if p.current() == tComma {
+				if err := p.match(tComma); err != nil {
+					return ASTNode{}, err
+				}
+			}
+			args = append(args, expression)
+		}
+		if err := p.match(tRparen); err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{
+			nodeType: ASTFunctionExpression,
+			value:    name,
+			children: args,
+		}, nil
+	case tFilter:
+		return p.parseFilter(node)
+	case tFlatten:
+		left := ASTNode{nodeType: ASTFlatten, children: []ASTNode{node}}
+		right, err := p.parseProjectionRHS(bindingPowers[tFlatten])
+		return ASTNode{
+			nodeType: ASTProjection,
+			children: []ASTNode{left, right},
+		}, err
+	case tEQ, tNE, tGT, tGTE, tLT, tLTE:
+		right, err := p.parseExpression(bindingPowers[tokenType])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{
+			nodeType: ASTComparator,
+			value:    tokenType,
+			children: []ASTNode{node, right},
+		}, nil
+	case tLbracket:
+		tokenType := p.current()
+		var right ASTNode
+		var err error
+		if tokenType == tNumber || tokenType == tColon {
+			right, err = p.parseIndexExpression()
+			if err != nil {
+				return ASTNode{}, err
+			}
+			return p.projectIfSlice(node, right)
+		}
+		// Otherwise this is a projection.
+		if err := p.match(tStar); err != nil {
+			return ASTNode{}, err
+		}
+		if err := p.match(tRbracket); err != nil {
+			return ASTNode{}, err
+		}
+		right, err = p.parseProjectionRHS(bindingPowers[tStar])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{
+			nodeType: ASTProjection,
+			children: []ASTNode{node, right},
+		}, nil
+	}
+	return ASTNode{}, p.syntaxError("Unexpected token: " + tokenType.String())
+}
+
+func (p *Parser) nud(token token) (ASTNode, error) {
+	switch token.tokenType {
+	case tJSONLiteral:
+		var parsed interface{}
+		err := json.Unmarshal([]byte(token.value), &parsed)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{nodeType: ASTLiteral, value: parsed}, nil
+	case tStringLiteral:
+		return ASTNode{nodeType: ASTLiteral, value: token.value}, nil
+	case tUnquotedIdentifier:
+		return ASTNode{
+			nodeType: ASTField,
+			value:    token.value,
+		}, nil
+	case tQuotedIdentifier:
+		node := ASTNode{nodeType: ASTField, value: token.value}
+		if p.current() == tLparen {
+			return ASTNode{}, p.syntaxErrorToken("Can't have quoted identifier as function name.", token)
+		}
+		return node, nil
+	case tStar:
+		left := ASTNode{nodeType: ASTIdentity}
+		var right ASTNode
+		var err error
+		if p.current() == tRbracket {
+			right = ASTNode{nodeType: ASTIdentity}
+		} else {
+			right, err = p.parseProjectionRHS(bindingPowers[tStar])
+		}
+		return ASTNode{nodeType: ASTValueProjection, children: []ASTNode{left, right}}, err
+	case tFilter:
+		return p.parseFilter(ASTNode{nodeType: ASTIdentity})
+	case tLbrace:
+		return p.parseMultiSelectHash()
+	case tFlatten:
+		left := ASTNode{
+			nodeType: ASTFlatten,
+			children: []ASTNode{{nodeType: ASTIdentity}},
+		}
+		right, err := p.parseProjectionRHS(bindingPowers[tFlatten])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{nodeType: ASTProjection, children: []ASTNode{left, right}}, nil
+	case tLbracket:
+		tokenType := p.current()
+		//var right ASTNode
+		if tokenType == tNumber || tokenType == tColon {
+			right, err := p.parseIndexExpression()
+			if err != nil {
+				return ASTNode{}, nil
+			}
+			return p.projectIfSlice(ASTNode{nodeType: ASTIdentity}, right)
+		} else if tokenType == tStar && p.lookahead(1) == tRbracket {
+			p.advance()
+			p.advance()
+			right, err := p.parseProjectionRHS(bindingPowers[tStar])
+			if err != nil {
+				return ASTNode{}, err
+			}
+			return ASTNode{
+				nodeType: ASTProjection,
+				children: []ASTNode{{nodeType: ASTIdentity}, right},
+			}, nil
+		} else {
+			return p.parseMultiSelectList()
+		}
+	case tCurrent:
+		return ASTNode{nodeType: ASTCurrentNode}, nil
+	case tExpref:
+		expression, err := p.parseExpression(bindingPowers[tExpref])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{nodeType: ASTExpRef, children: []ASTNode{expression}}, nil
+	case tNot:
+		expression, err := p.parseExpression(bindingPowers[tNot])
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return ASTNode{nodeType: ASTNotExpression, children: []ASTNode{expression}}, nil
+	case tLparen:
+		expression, err := p.parseExpression(0)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		if err := p.match(tRparen); err != nil {
+			return ASTNode{}, err
+		}
+		return expression, nil
+	case tEOF:
+		return ASTNode{}, p.syntaxErrorToken("Incomplete expression", token)
+	}
+
+	return ASTNode{}, p.syntaxErrorToken("Invalid token: "+token.tokenType.String(), token)
+}
+
+func (p *Parser) parseMultiSelectList() (ASTNode, error) {
+	var expressions []ASTNode
+	for {
+		expression, err := p.parseExpression(0)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		expressions = append(expressions, expression)
+		if p.current() == tRbracket {
+			break
+		}
+		err = p.match(tComma)
+		if err != nil {
+			return ASTNode{}, err
+		}
+	}
+	err := p.match(tRbracket)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	return ASTNode{
+		nodeType: ASTMultiSelectList,
+		children: expressions,
+	}, nil
+}
+
+func (p *Parser) parseMultiSelectHash() (ASTNode, error) {
+	var children []ASTNode
+	for {
+		keyToken := p.lookaheadToken(0)
+		if err := p.match(tUnquotedIdentifier); err != nil {
+			if err := p.match(tQuotedIdentifier); err != nil {
+				return ASTNode{}, p.syntaxError("Expected tQuotedIdentifier or tUnquotedIdentifier")
+			}
+		}
+		keyName := keyToken.value
+		err := p.match(tColon)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		value, err := p.parseExpression(0)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		node := ASTNode{
+			nodeType: ASTKeyValPair,
+			value:    keyName,
+			children: []ASTNode{value},
+		}
+		children = append(children, node)
+		if p.current() == tComma {
+			err := p.match(tComma)
+			if err != nil {
+				return ASTNode{}, nil
+			}
+		} else if p.current() == tRbrace {
+			err := p.match(tRbrace)
+			if err != nil {
+				return ASTNode{}, nil
+			}
+			break
+		}
+	}
+	return ASTNode{
+		nodeType: ASTMultiSelectHash,
+		children: children,
+	}, nil
+}
+
+func (p *Parser) projectIfSlice(left ASTNode, right ASTNode) (ASTNode, error) {
+	indexExpr := ASTNode{
+		nodeType: ASTIndexExpression,
+		children: []ASTNode{left, right},
+	}
+	if right.nodeType == ASTSlice {
+		right, err := p.parseProjectionRHS(bindingPowers[tStar])
+		return ASTNode{
+			nodeType: ASTProjection,
+			children: []ASTNode{indexExpr, right},
+		}, err
+	}
+	return indexExpr, nil
+}
+func (p *Parser) parseFilter(node ASTNode) (ASTNode, error) {
+	var right, condition ASTNode
+	var err error
+	condition, err = p.parseExpression(0)
+	if err != nil {
+		return ASTNode{}, err
+	}
+	if err := p.match(tRbracket); err != nil {
+		return ASTNode{}, err
+	}
+	if p.current() == tFlatten {
+		right = ASTNode{nodeType: ASTIdentity}
+	} else {
+		right, err = p.parseProjectionRHS(bindingPowers[tFilter])
+		if err != nil {
+			return ASTNode{}, err
+		}
+	}
+
+	return ASTNode{
+		nodeType: ASTFilterProjection,
+		children: []ASTNode{node, right, condition},
+	}, nil
+}
+
+func (p *Parser) parseDotRHS(bindingPower int) (ASTNode, error) {
+	lookahead := p.current()
+	if tokensOneOf([]tokType{tQuotedIdentifier, tUnquotedIdentifier, tStar}, lookahead) {
+		return p.parseExpression(bindingPower)
+	} else if lookahead == tLbracket {
+		if err := p.match(tLbracket); err != nil {
+			return ASTNode{}, err
+		}
+		return p.parseMultiSelectList()
+	} else if lookahead == tLbrace {
+		if err := p.match(tLbrace); err != nil {
+			return ASTNode{}, err
+		}
+		return p.parseMultiSelectHash()
+	}
+	return ASTNode{}, p.syntaxError("Expected identifier, lbracket, or lbrace")
+}
+
+func (p *Parser) parseProjectionRHS(bindingPower int) (ASTNode, error) {
+	current := p.current()
+	if bindingPowers[current] < 10 {
+		return ASTNode{nodeType: ASTIdentity}, nil
+	} else if current == tLbracket {
+		return p.parseExpression(bindingPower)
+	} else if current == tFilter {
+		return p.parseExpression(bindingPower)
+	} else if current == tDot {
+		err := p.match(tDot)
+		if err != nil {
+			return ASTNode{}, err
+		}
+		return p.parseDotRHS(bindingPower)
+	} else {
+		return ASTNode{}, p.syntaxError("Error")
+	}
+}
+
+func (p *Parser) lookahead(number int) tokType {
+	return p.lookaheadToken(number).tokenType
+}
+
+func (p *Parser) current() tokType {
+	return p.lookahead(0)
+}
+
+func (p *Parser) lookaheadToken(number int) token {
+	return p.tokens[p.index+number]
+}
+
+func (p *Parser) advance() {
+	p.index++
+}
+
+func tokensOneOf(elements []tokType, token tokType) bool {
+	for _, elem := range elements {
+		if elem == token {
+			return true
+		}
+	}
+	return false
+}
+
+func (p *Parser) syntaxError(msg string) SyntaxError {
+	return SyntaxError{
+		msg:        msg,
+		Expression: p.expression,
+		Offset:     p.lookaheadToken(0).position,
+	}
+}
+
+// Create a SyntaxError based on the provided token.
+// This differs from syntaxError() which creates a SyntaxError
+// based on the current lookahead token.
+func (p *Parser) syntaxErrorToken(msg string, t token) SyntaxError {
+	return SyntaxError{
+		msg:        msg,
+		Expression: p.expression,
+		Offset:     t.position,
+	}
+}
diff --git a/vendor/github.com/jmespath/go-jmespath/toktype_string.go b/vendor/github.com/jmespath/go-jmespath/toktype_string.go
new file mode 100644
index 0000000000..dae79cbdf3
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath/toktype_string.go
@@ -0,0 +1,16 @@
+// generated by stringer -type=tokType; DO NOT EDIT
+
+package jmespath
+
+import "fmt"
+
+const _tokType_name = "tUnknowntStartDottFiltertFlattentLparentRparentLbrackettRbrackettLbracetRbracetOrtPipetNumbertUnquotedIdentifiertQuotedIdentifiertCommatColontLTtLTEtGTtGTEtEQtNEtJSONLiteraltStringLiteraltCurrenttExpreftAndtNottEOF"
+
+var _tokType_index = [...]uint8{0, 8, 13, 17, 24, 32, 39, 46, 55, 64, 71, 78, 81, 86, 93, 112, 129, 135, 141, 144, 148, 151, 155, 158, 161, 173, 187, 195, 202, 206, 210, 214}
+
+func (i tokType) String() string {
+	if i < 0 || i >= tokType(len(_tokType_index)-1) {
+		return fmt.Sprintf("tokType(%d)", i)
+	}
+	return _tokType_name[_tokType_index[i]:_tokType_index[i+1]]
+}
diff --git a/vendor/github.com/jmespath/go-jmespath/util.go b/vendor/github.com/jmespath/go-jmespath/util.go
new file mode 100644
index 0000000000..ddc1b7d7d4
--- /dev/null
+++ b/vendor/github.com/jmespath/go-jmespath/util.go
@@ -0,0 +1,185 @@
+package jmespath
+
+import (
+	"errors"
+	"reflect"
+)
+
+// IsFalse determines if an object is false based on the JMESPath spec.
+// JMESPath defines false values to be any of:
+// - An empty string array, or hash.
+// - The boolean value false.
+// - nil
+func isFalse(value interface{}) bool {
+	switch v := value.(type) {
+	case bool:
+		return !v
+	case []interface{}:
+		return len(v) == 0
+	case map[string]interface{}:
+		return len(v) == 0
+	case string:
+		return len(v) == 0
+	case nil:
+		return true
+	}
+	// Try the reflection cases before returning false.
+	rv := reflect.ValueOf(value)
+	switch rv.Kind() {
+	case reflect.Struct:
+		// A struct type will never be false, even if
+		// all of its values are the zero type.
+		return false
+	case reflect.Slice, reflect.Map:
+		return rv.Len() == 0
+	case reflect.Ptr:
+		if rv.IsNil() {
+			return true
+		}
+		// If it's a pointer type, we'll try to deref the pointer
+		// and evaluate the pointer value for isFalse.
+		element := rv.Elem()
+		return isFalse(element.Interface())
+	}
+	return false
+}
+
+// ObjsEqual is a generic object equality check.
+// It will take two arbitrary objects and recursively determine
+// if they are equal.
+func objsEqual(left interface{}, right interface{}) bool {
+	return reflect.DeepEqual(left, right)
+}
+
+// SliceParam refers to a single part of a slice.
+// A slice consists of a start, a stop, and a step, similar to
+// python slices.
+type sliceParam struct {
+	N         int
+	Specified bool
+}
+
+// Slice supports [start:stop:step] style slicing that's supported in JMESPath.
+func slice(slice []interface{}, parts []sliceParam) ([]interface{}, error) {
+	computed, err := computeSliceParams(len(slice), parts)
+	if err != nil {
+		return nil, err
+	}
+	start, stop, step := computed[0], computed[1], computed[2]
+	result := []interface{}{}
+	if step > 0 {
+		for i := start; i < stop; i += step {
+			result = append(result, slice[i])
+		}
+	} else {
+		for i := start; i > stop; i += step {
+			result = append(result, slice[i])
+		}
+	}
+	return result, nil
+}
+
+func computeSliceParams(length int, parts []sliceParam) ([]int, error) {
+	var start, stop, step int
+	if !parts[2].Specified {
+		step = 1
+	} else if parts[2].N == 0 {
+		return nil, errors.New("Invalid slice, step cannot be 0")
+	} else {
+		step = parts[2].N
+	}
+	var stepValueNegative bool
+	if step < 0 {
+		stepValueNegative = true
+	} else {
+		stepValueNegative = false
+	}
+
+	if !parts[0].Specified {
+		if stepValueNegative {
+			start = length - 1
+		} else {
+			start = 0
+		}
+	} else {
+		start = capSlice(length, parts[0].N, step)
+	}
+
+	if !parts[1].Specified {
+		if stepValueNegative {
+			stop = -1
+		} else {
+			stop = length
+		}
+	} else {
+		stop = capSlice(length, parts[1].N, step)
+	}
+	return []int{start, stop, step}, nil
+}
+
+func capSlice(length int, actual int, step int) int {
+	if actual < 0 {
+		actual += length
+		if actual < 0 {
+			if step < 0 {
+				actual = -1
+			} else {
+				actual = 0
+			}
+		}
+	} else if actual >= length {
+		if step < 0 {
+			actual = length - 1
+		} else {
+			actual = length
+		}
+	}
+	return actual
+}
+
+// ToArrayNum converts an empty interface type to a slice of float64.
+// If any element in the array cannot be converted, then nil is returned
+// along with a second value of false.
+func toArrayNum(data interface{}) ([]float64, bool) {
+	// Is there a better way to do this with reflect?
+	if d, ok := data.([]interface{}); ok {
+		result := make([]float64, len(d))
+		for i, el := range d {
+			item, ok := el.(float64)
+			if !ok {
+				return nil, false
+			}
+			result[i] = item
+		}
+		return result, true
+	}
+	return nil, false
+}
+
+// ToArrayStr converts an empty interface type to a slice of strings.
+// If any element in the array cannot be converted, then nil is returned
+// along with a second value of false.  If the input data could be entirely
+// converted, then the converted data, along with a second value of true,
+// will be returned.
+func toArrayStr(data interface{}) ([]string, bool) {
+	// Is there a better way to do this with reflect?
+	if d, ok := data.([]interface{}); ok {
+		result := make([]string, len(d))
+		for i, el := range d {
+			item, ok := el.(string)
+			if !ok {
+				return nil, false
+			}
+			result[i] = item
+		}
+		return result, true
+	}
+	return nil, false
+}
+
+func isSliceType(v interface{}) bool {
+	if v == nil {
+		return false
+	}
+	return reflect.TypeOf(v).Kind() == reflect.Slice
+}
diff --git a/vendor/github.com/kballard/go-shellquote/LICENSE b/vendor/github.com/kballard/go-shellquote/LICENSE
new file mode 100644
index 0000000000..a6d77312e1
--- /dev/null
+++ b/vendor/github.com/kballard/go-shellquote/LICENSE
@@ -0,0 +1,19 @@
+Copyright (C) 2014 Kevin Ballard
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/kballard/go-shellquote/doc.go b/vendor/github.com/kballard/go-shellquote/doc.go
new file mode 100644
index 0000000000..9445fa4ad9
--- /dev/null
+++ b/vendor/github.com/kballard/go-shellquote/doc.go
@@ -0,0 +1,3 @@
+// Shellquote provides utilities for joining/splitting strings using sh's
+// word-splitting rules.
+package shellquote
diff --git a/vendor/github.com/kballard/go-shellquote/quote.go b/vendor/github.com/kballard/go-shellquote/quote.go
new file mode 100644
index 0000000000..f6cacee0f9
--- /dev/null
+++ b/vendor/github.com/kballard/go-shellquote/quote.go
@@ -0,0 +1,102 @@
+package shellquote
+
+import (
+	"bytes"
+	"strings"
+	"unicode/utf8"
+)
+
+// Join quotes each argument and joins them with a space.
+// If passed to /bin/sh, the resulting string will be split back into the
+// original arguments.
+func Join(args ...string) string {
+	var buf bytes.Buffer
+	for i, arg := range args {
+		if i != 0 {
+			buf.WriteByte(' ')
+		}
+		quote(arg, &buf)
+	}
+	return buf.String()
+}
+
+const (
+	specialChars      = "\\'\"`${[|&;<>()*?!"
+	extraSpecialChars = " \t\n"
+	prefixChars       = "~"
+)
+
+func quote(word string, buf *bytes.Buffer) {
+	// We want to try to produce a "nice" output. As such, we will
+	// backslash-escape most characters, but if we encounter a space, or if we
+	// encounter an extra-special char (which doesn't work with
+	// backslash-escaping) we switch over to quoting the whole word. We do this
+	// with a space because it's typically easier for people to read multi-word
+	// arguments when quoted with a space rather than with ugly backslashes
+	// everywhere.
+	origLen := buf.Len()
+
+	if len(word) == 0 {
+		// oops, no content
+		buf.WriteString("''")
+		return
+	}
+
+	cur, prev := word, word
+	atStart := true
+	for len(cur) > 0 {
+		c, l := utf8.DecodeRuneInString(cur)
+		cur = cur[l:]
+		if strings.ContainsRune(specialChars, c) || (atStart && strings.ContainsRune(prefixChars, c)) {
+			// copy the non-special chars up to this point
+			if len(cur) < len(prev) {
+				buf.WriteString(word[0 : len(prev)-len(cur)-l])
+			}
+			buf.WriteByte('\\')
+			buf.WriteRune(c)
+			prev = cur
+		} else if strings.ContainsRune(extraSpecialChars, c) {
+			// start over in quote mode
+			buf.Truncate(origLen)
+			goto quote
+		}
+		atStart = false
+	}
+	if len(prev) > 0 {
+		buf.WriteString(prev)
+	}
+	return
+
+quote:
+	// quote mode
+	// Use single-quotes, but if we find a single-quote in the word, we need
+	// to terminate the string, emit an escaped quote, and start the string up
+	// again
+	inQuote := false
+	for len(word) > 0 {
+		i := strings.IndexRune(word, '\'')
+		if i == -1 {
+			break
+		}
+		if i > 0 {
+			if !inQuote {
+				buf.WriteByte('\'')
+				inQuote = true
+			}
+			buf.WriteString(word[0:i])
+			word = word[i+1:]
+		}
+		if inQuote {
+			buf.WriteByte('\'')
+			inQuote = false
+		}
+		buf.WriteString("\\'")
+	}
+	if len(word) > 0 {
+		if !inQuote {
+			buf.WriteByte('\'')
+		}
+		buf.WriteString(word)
+		buf.WriteByte('\'')
+	}
+}
diff --git a/vendor/github.com/kballard/go-shellquote/unquote.go b/vendor/github.com/kballard/go-shellquote/unquote.go
new file mode 100644
index 0000000000..ba3a0f2271
--- /dev/null
+++ b/vendor/github.com/kballard/go-shellquote/unquote.go
@@ -0,0 +1,144 @@
+package shellquote
+
+import (
+	"bytes"
+	"errors"
+	"strings"
+	"unicode/utf8"
+)
+
+var (
+	UnterminatedSingleQuoteError = errors.New("Unterminated single-quoted string")
+	UnterminatedDoubleQuoteError = errors.New("Unterminated double-quoted string")
+	UnterminatedEscapeError      = errors.New("Unterminated backslash-escape")
+)
+
+var (
+	splitChars        = " \n\t"
+	singleChar        = '\''
+	doubleChar        = '"'
+	escapeChar        = '\\'
+	doubleEscapeChars = "$`\"\n\\"
+)
+
+// Split splits a string according to /bin/sh's word-splitting rules. It
+// supports backslash-escapes, single-quotes, and double-quotes. Notably it does
+// not support the $'' style of quoting. It also doesn't attempt to perform any
+// other sort of expansion, including brace expansion, shell expansion, or
+// pathname expansion.
+//
+// If the given input has an unterminated quoted string or ends in a
+// backslash-escape, one of UnterminatedSingleQuoteError,
+// UnterminatedDoubleQuoteError, or UnterminatedEscapeError is returned.
+func Split(input string) (words []string, err error) {
+	var buf bytes.Buffer
+	words = make([]string, 0)
+
+	for len(input) > 0 {
+		// skip any splitChars at the start
+		c, l := utf8.DecodeRuneInString(input)
+		if strings.ContainsRune(splitChars, c) {
+			input = input[l:]
+			continue
+		}
+
+		var word string
+		word, input, err = splitWord(input, &buf)
+		if err != nil {
+			return
+		}
+		words = append(words, word)
+	}
+	return
+}
+
+func splitWord(input string, buf *bytes.Buffer) (word string, remainder string, err error) {
+	buf.Reset()
+
+raw:
+	{
+		cur := input
+		for len(cur) > 0 {
+			c, l := utf8.DecodeRuneInString(cur)
+			cur = cur[l:]
+			if c == singleChar {
+				buf.WriteString(input[0 : len(input)-len(cur)-l])
+				input = cur
+				goto single
+			} else if c == doubleChar {
+				buf.WriteString(input[0 : len(input)-len(cur)-l])
+				input = cur
+				goto double
+			} else if c == escapeChar {
+				buf.WriteString(input[0 : len(input)-len(cur)-l])
+				input = cur
+				goto escape
+			} else if strings.ContainsRune(splitChars, c) {
+				buf.WriteString(input[0 : len(input)-len(cur)-l])
+				return buf.String(), cur, nil
+			}
+		}
+		if len(input) > 0 {
+			buf.WriteString(input)
+			input = ""
+		}
+		goto done
+	}
+
+escape:
+	{
+		if len(input) == 0 {
+			return "", "", UnterminatedEscapeError
+		}
+		c, l := utf8.DecodeRuneInString(input)
+		if c == '\n' {
+			// a backslash-escaped newline is elided from the output entirely
+		} else {
+			buf.WriteString(input[:l])
+		}
+		input = input[l:]
+	}
+	goto raw
+
+single:
+	{
+		i := strings.IndexRune(input, singleChar)
+		if i == -1 {
+			return "", "", UnterminatedSingleQuoteError
+		}
+		buf.WriteString(input[0:i])
+		input = input[i+1:]
+		goto raw
+	}
+
+double:
+	{
+		cur := input
+		for len(cur) > 0 {
+			c, l := utf8.DecodeRuneInString(cur)
+			cur = cur[l:]
+			if c == doubleChar {
+				buf.WriteString(input[0 : len(input)-len(cur)-l])
+				input = cur
+				goto raw
+			} else if c == escapeChar {
+				// bash only supports certain escapes in double-quoted strings
+				c2, l2 := utf8.DecodeRuneInString(cur)
+				cur = cur[l2:]
+				if strings.ContainsRune(doubleEscapeChars, c2) {
+					buf.WriteString(input[0 : len(input)-len(cur)-l-l2])
+					if c2 == '\n' {
+						// newline is special, skip the backslash entirely
+					} else {
+						buf.WriteRune(c2)
+					}
+					input = cur
+				}
+			}
+		}
+		return "", "", UnterminatedDoubleQuoteError
+	}
+
+done:
+	return buf.String(), input, nil
+}
diff --git a/vendor/github.com/klauspost/compress/LICENSE b/vendor/github.com/klauspost/compress/LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/klauspost/compress/flate/copy.go b/vendor/github.com/klauspost/compress/flate/copy.go
new file mode 100644
index 0000000000..a3200a8f49
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/copy.go
@@ -0,0 +1,32 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+// forwardCopy is like the built-in copy function except that it always goes
+// forward from the start, even if the dst and src overlap.
+// It is equivalent to:
+//   for i := 0; i < n; i++ {
+//     mem[dst+i] = mem[src+i]
+//   }
+func forwardCopy(mem []byte, dst, src, n int) {
+	if dst <= src {
+		copy(mem[dst:dst+n], mem[src:src+n])
+		return
+	}
+	for {
+		if dst >= src+n {
+			copy(mem[dst:dst+n], mem[src:src+n])
+			return
+		}
+		// There is some forward overlap.  The destination
+		// will be filled with a repeated pattern of mem[src:src+k].
+		// We copy one instance of the pattern here, then repeat.
+		// Each time around this loop k will double.
+		k := dst - src
+		copy(mem[dst:dst+k], mem[src:src+k])
+		n -= k
+		dst += k
+	}
+}
diff --git a/vendor/github.com/klauspost/compress/flate/crc32_amd64.go b/vendor/github.com/klauspost/compress/flate/crc32_amd64.go
new file mode 100644
index 0000000000..45d52f629c
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/crc32_amd64.go
@@ -0,0 +1,39 @@
+//+build !noasm
+//+build !appengine
+
+// Copyright 2015, Klaus Post, see LICENSE for details.
+
+package flate
+
+import (
+	"github.com/klauspost/cpuid"
+)
+
+// crc32sse returns a hash for the first 4 bytes of the slice
+// len(a) must be >= 4.
+//go:noescape
+func crc32sse(a []byte) hash
+
+// crc32sseAll calculates hashes for each 4-byte set in a.
+// dst must be east len(a) - 4 in size.
+// The size is not checked by the assembly.
+//go:noescape
+func crc32sseAll(a []byte, dst []hash)
+
+// matchLenSSE4 returns the number of matching bytes in a and b
+// up to length 'max'. Both slices must be at least 'max'
+// bytes in size.
+// It uses the PCMPESTRI SSE 4.2 instruction.
+//go:noescape
+func matchLenSSE4(a, b []byte, max int) int
+
+// histogram accumulates a histogram of b in h.
+// h must be at least 256 entries in length,
+// and must be cleared before calling this function.
+//go:noescape
+func histogram(b []byte, h []int32)
+
+// Detect SSE 4.2 feature.
+func init() {
+	useSSE42 = cpuid.CPU.SSE42()
+}
diff --git a/vendor/github.com/klauspost/compress/flate/crc32_amd64.s b/vendor/github.com/klauspost/compress/flate/crc32_amd64.s
new file mode 100644
index 0000000000..0212360d66
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/crc32_amd64.s
@@ -0,0 +1,218 @@
+//+build !noasm !appengine
+
+// Copyright 2015, Klaus Post, see LICENSE for details.
+
+// func crc32sse(a []byte) hash
+TEXT ·crc32sse(SB), 7, $0
+	MOVQ a+0(FP), R10
+	XORQ BX, BX
+
+	// CRC32   dword (R10), EBX
+	BYTE $0xF2; BYTE $0x41; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0x1a
+
+	MOVL BX, ret+24(FP)
+	RET
+
+// func crc32sseAll(a []byte, dst []hash)
+TEXT ·crc32sseAll(SB), 7, $0
+	MOVQ  a+0(FP), R8      // R8: src
+	MOVQ  a_len+8(FP), R10 // input length
+	MOVQ  dst+24(FP), R9   // R9: dst
+	SUBQ  $4, R10
+	JS    end
+	JZ    one_crc
+	MOVQ  R10, R13
+	SHRQ  $2, R10          // len/4
+	ANDQ  $3, R13          // len&3
+	XORQ  BX, BX
+	ADDQ  $1, R13
+	TESTQ R10, R10
+	JZ    rem_loop
+
+crc_loop:
+	MOVQ (R8), R11
+	XORQ BX, BX
+	XORQ DX, DX
+	XORQ DI, DI
+	MOVQ R11, R12
+	SHRQ $8, R11
+	MOVQ R12, AX
+	MOVQ R11, CX
+	SHRQ $16, R12
+	SHRQ $16, R11
+	MOVQ R12, SI
+
+	// CRC32   EAX, EBX
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xd8
+
+	// CRC32   ECX, EDX
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xd1
+
+	// CRC32   ESI, EDI
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xfe
+	MOVL BX, (R9)
+	MOVL DX, 4(R9)
+	MOVL DI, 8(R9)
+
+	XORQ BX, BX
+	MOVL R11, AX
+
+	// CRC32   EAX, EBX
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xd8
+	MOVL BX, 12(R9)
+
+	ADDQ $16, R9
+	ADDQ $4, R8
+	XORQ BX, BX
+	SUBQ $1, R10
+	JNZ  crc_loop
+
+rem_loop:
+	MOVL (R8), AX
+
+	// CRC32   EAX, EBX
+	BYTE $0xF2; BYTE $0x0f
+	BYTE $0x38; BYTE $0xf1; BYTE $0xd8
+
+	MOVL BX, (R9)
+	ADDQ $4, R9
+	ADDQ $1, R8
+	XORQ BX, BX
+	SUBQ $1, R13
+	JNZ  rem_loop
+
+end:
+	RET
+
+one_crc:
+	MOVQ $1, R13
+	XORQ BX, BX
+	JMP  rem_loop
+
+// func matchLenSSE4(a, b []byte, max int) int
+TEXT ·matchLenSSE4(SB), 7, $0
+	MOVQ  a+0(FP), SI        // RSI: &a
+	MOVQ  b+24(FP), DI       // RDI: &b
+	MOVQ  max+48(FP), R10    // R10: max
+	XORQ  R11, R11           // R11: match length
+	MOVQ  R10, R12           // R12: Remainder
+	SHRQ  $4, R10            // max / 16
+	MOVQ  $16, AX            // Set length for PCMPESTRI
+	MOVQ  $16, DX            // Set length for PCMPESTRI
+	ANDQ  $15, R12           // max & 15
+	TESTQ R10, R10
+	JZ    matchlen_verysmall
+
+loopback_matchlen:
+	MOVOU (SI), X0 // a[x]
+	MOVOU (DI), X1 // b[x]
+
+	// PCMPESTRI $0x18, X1, X0
+	// 0x18 = _SIDD_UBYTE_OPS (0x0) | _SIDD_CMP_EQUAL_EACH (0x8) | _SIDD_NEGATIVE_POLARITY (0x10)
+	BYTE $0x66; BYTE $0x0f; BYTE $0x3a
+	BYTE $0x61; BYTE $0xc1; BYTE $0x18
+
+	JC match_ended
+
+	ADDQ $16, SI
+	ADDQ $16, DI
+	ADDQ $16, R11
+
+	SUBQ $1, R10
+	JNZ  loopback_matchlen
+
+	// Check the remainder using REP CMPSB
+matchlen_verysmall:
+	TESTQ R12, R12
+	JZ    done_matchlen
+	MOVQ  R12, CX
+	ADDQ  R12, R11
+
+	// Compare CX bytes at [SI] [DI]
+	// Subtract one from CX for every match.
+	// Terminates when CX is zero (checked pre-compare)
+	CLD
+	REP; CMPSB
+
+	// Check if last was a match.
+	JZ done_matchlen
+
+	// Subtract remanding bytes.
+	SUBQ CX, R11
+	SUBQ $1, R11
+	MOVQ R11, ret+56(FP)
+	RET
+
+match_ended:
+	ADDQ CX, R11
+
+done_matchlen:
+	MOVQ R11, ret+56(FP)
+	RET
+
+// func histogram(b []byte, h []int32)
+TEXT ·histogram(SB), 7, $0
+	MOVQ b+0(FP), SI     // SI: &b
+	MOVQ b_len+8(FP), R9 // R9: len(b)
+	MOVQ h+24(FP), DI    // DI: Histogram
+	MOVQ R9, R8
+	SHRQ $3, R8
+	JZ   hist1
+	XORQ R11, R11
+
+loop_hist8:
+	MOVQ (SI), R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	MOVB R10, R11
+	INCL (DI)(R11*4)
+	SHRQ $8, R10
+
+	INCL (DI)(R10*4)
+
+	ADDQ $8, SI
+	DECQ R8
+	JNZ  loop_hist8
+
+hist1:
+	ANDQ $7, R9
+	JZ   end_hist
+	XORQ R10, R10
+
+loop_hist1:
+	MOVB (SI), R10
+	INCL (DI)(R10*4)
+	INCQ SI
+	DECQ R9
+	JNZ  loop_hist1
+
+end_hist:
+	RET
diff --git a/vendor/github.com/klauspost/compress/flate/crc32_noasm.go b/vendor/github.com/klauspost/compress/flate/crc32_noasm.go
new file mode 100644
index 0000000000..1c6d23eed6
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/crc32_noasm.go
@@ -0,0 +1,34 @@
+//+build !amd64 noasm appengine
+
+// Copyright 2015, Klaus Post, see LICENSE for details.
+
+package flate
+
+func init() {
+	useSSE42 = false
+}
+
+// crc32sse should never be called.
+func crc32sse(a []byte) hash {
+	panic("no assembler")
+}
+
+// crc32sseAll should never be called.
+func crc32sseAll(a []byte, dst []hash) {
+	panic("no assembler")
+}
+
+// matchLenSSE4 should never be called.
+func matchLenSSE4(a, b []byte, max int) int {
+	panic("no assembler")
+	return 0
+}
+
+// histogram accumulates a histogram of b in h.
+// h must be at least 256 entries in length,
+// and must be cleared before calling this function.
+func histogram(b []byte, h []int32) {
+	for _, t := range b {
+		h[t]++
+	}
+}
diff --git a/vendor/github.com/klauspost/compress/flate/deflate.go b/vendor/github.com/klauspost/compress/flate/deflate.go
new file mode 100644
index 0000000000..b1efa677a5
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/deflate.go
@@ -0,0 +1,1358 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Copyright (c) 2015 Klaus Post
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+import (
+	"fmt"
+	"io"
+	"math"
+)
+
+const (
+	NoCompression       = 0
+	BestSpeed           = 1
+	BestCompression     = 9
+	DefaultCompression  = -1
+	ConstantCompression = -2 // Does only Huffman encoding
+	logWindowSize       = 15
+	windowSize          = 1 << logWindowSize
+	windowMask          = windowSize - 1
+	logMaxOffsetSize    = 15  // Standard DEFLATE
+	minMatchLength      = 4   // The smallest match that the compressor looks for
+	maxMatchLength      = 258 // The longest match for the compressor
+	minOffsetSize       = 1   // The shortest offset that makes any sense
+
+	// The maximum number of tokens we put into a single flat block, just too
+	// stop things from getting too large.
+	maxFlateBlockTokens = 1 << 14
+	maxStoreBlockSize   = 65535
+	hashBits            = 17 // After 17 performance degrades
+	hashSize            = 1 << hashBits
+	hashMask            = (1 << hashBits) - 1
+	hashShift           = (hashBits + minMatchLength - 1) / minMatchLength
+	maxHashOffset       = 1 << 24
+
+	skipNever = math.MaxInt32
+)
+
+var useSSE42 bool
+
+type compressionLevel struct {
+	good, lazy, nice, chain, fastSkipHashing, level int
+}
+
+// Compression levels have been rebalanced from zlib deflate defaults
+// to give a bigger spread in speed and compression.
+// See https://blog.klauspost.com/rebalancing-deflate-compression-levels/
+var levels = []compressionLevel{
+	{}, // 0
+	// Level 1+2 uses snappy algorithm - values not used
+	{0, 0, 0, 0, 0, 1},
+	{0, 0, 0, 0, 0, 2},
+	// For levels 3-6 we don't bother trying with lazy matches.
+	// Lazy matching is at least 30% slower, with 1.5% increase.
+	{4, 0, 8, 4, 4, 3},
+	{4, 0, 12, 6, 5, 4},
+	{6, 0, 24, 16, 6, 5},
+	{8, 0, 32, 32, 7, 6},
+	// Levels 7-9 use increasingly more lazy matching
+	// and increasingly stringent conditions for "good enough".
+	{4, 8, 16, 16, skipNever, 7},
+	{6, 16, 32, 64, skipNever, 8},
+	{32, 258, 258, 4096, skipNever, 9},
+}
+
+type hashid uint32
+
+type compressor struct {
+	compressionLevel
+
+	w          *huffmanBitWriter
+	bulkHasher func([]byte, []hash)
+
+	// compression algorithm
+	fill func(*compressor, []byte) int // copy data to window
+	step func(*compressor)             // process window
+	sync bool                          // requesting flush
+
+	// Input hash chains
+	// hashHead[hashValue] contains the largest inputIndex with the specified hash value
+	// If hashHead[hashValue] is within the current window, then
+	// hashPrev[hashHead[hashValue] & windowMask] contains the previous index
+	// with the same hash value.
+	chainHead  int
+	hashHead   []hashid
+	hashPrev   []hashid
+	hashOffset int
+
+	// input window: unprocessed data is window[index:windowEnd]
+	index         int
+	window        []byte
+	windowEnd     int
+	blockStart    int  // window index where current tokens start
+	byteAvailable bool // if true, still need to process window[index-1].
+
+	// queued output tokens
+	tokens tokens
+
+	// deflate state
+	length         int
+	offset         int
+	hash           hash
+	maxInsertIndex int
+	err            error
+	ii             uint16 // position of last match, intended to overflow to reset.
+
+	snap      snappyEnc
+	hashMatch [maxMatchLength + minMatchLength]hash
+}
+
+type hash int32
+
+func (d *compressor) fillDeflate(b []byte) int {
+	if d.index >= 2*windowSize-(minMatchLength+maxMatchLength) {
+		// shift the window by windowSize
+		copy(d.window, d.window[windowSize:2*windowSize])
+		d.index -= windowSize
+		d.windowEnd -= windowSize
+		if d.blockStart >= windowSize {
+			d.blockStart -= windowSize
+		} else {
+			d.blockStart = math.MaxInt32
+		}
+		d.hashOffset += windowSize
+		if d.hashOffset > maxHashOffset {
+			delta := d.hashOffset - 1
+			d.hashOffset -= delta
+			d.chainHead -= delta
+			for i, v := range d.hashPrev {
+				if int(v) > delta {
+					d.hashPrev[i] = hashid(int(v) - delta)
+				} else {
+					d.hashPrev[i] = 0
+				}
+			}
+			for i, v := range d.hashHead {
+				if int(v) > delta {
+					d.hashHead[i] = hashid(int(v) - delta)
+				} else {
+					d.hashHead[i] = 0
+				}
+			}
+		}
+	}
+	n := copy(d.window[d.windowEnd:], b)
+	d.windowEnd += n
+	return n
+}
+
+func (d *compressor) writeBlock(tok tokens, index int, eof bool) error {
+	if index > 0 || eof {
+		var window []byte
+		if d.blockStart <= index {
+			window = d.window[d.blockStart:index]
+		}
+		d.blockStart = index
+		d.w.writeBlock(tok, eof, window)
+		return d.w.err
+	}
+	return nil
+}
+
+// writeBlockSkip writes the current block and uses the number of tokens
+// to determine if the block should be stored on no matches, or
+// only huffman encoded.
+func (d *compressor) writeBlockSkip(tok tokens, index int, eof bool) error {
+	if index > 0 || eof {
+		if d.blockStart <= index {
+			window := d.window[d.blockStart:index]
+			if tok.n == len(window) && !eof {
+				d.writeStoredBlock(window)
+				// If we removed less than 10 literals, huffman compress the block.
+			} else if tok.n > len(window)-10 {
+				d.w.writeBlockHuff(eof, window)
+			} else {
+				// Write a dynamic huffman block.
+				d.w.writeBlockDynamic(tok, eof, window)
+			}
+		} else {
+			d.w.writeBlock(tok, eof, nil)
+		}
+		d.blockStart = index
+		return d.w.err
+	}
+	return nil
+}
+
+// fillWindow will fill the current window with the supplied
+// dictionary and calculate all hashes.
+// This is much faster than doing a full encode.
+// Should only be used after a start/reset.
+func (d *compressor) fillWindow(b []byte) {
+	// Do not fill window if we are in store-only mode,
+	// use constant or Snappy compression.
+	switch d.compressionLevel.level {
+	case 0, 1, 2:
+		return
+	}
+	// If we are given too much, cut it.
+	if len(b) > windowSize {
+		b = b[len(b)-windowSize:]
+	}
+	// Add all to window.
+	n := copy(d.window[d.windowEnd:], b)
+
+	// Calculate 256 hashes at the time (more L1 cache hits)
+	loops := (n + 256 - minMatchLength) / 256
+	for j := 0; j < loops; j++ {
+		startindex := j * 256
+		end := startindex + 256 + minMatchLength - 1
+		if end > n {
+			end = n
+		}
+		tocheck := d.window[startindex:end]
+		dstSize := len(tocheck) - minMatchLength + 1
+
+		if dstSize <= 0 {
+			continue
+		}
+
+		dst := d.hashMatch[:dstSize]
+		d.bulkHasher(tocheck, dst)
+		var newH hash
+		for i, val := range dst {
+			di := i + startindex
+			newH = val & hashMask
+			// Get previous value with the same hash.
+			// Our chain should point to the previous value.
+			d.hashPrev[di&windowMask] = d.hashHead[newH]
+			// Set the head of the hash chain to us.
+			d.hashHead[newH] = hashid(di + d.hashOffset)
+		}
+		d.hash = newH
+	}
+	// Update window information.
+	d.windowEnd += n
+	d.index = n
+}
+
+// Try to find a match starting at index whose length is greater than prevSize.
+// We only look at chainCount possibilities before giving up.
+// pos = d.index, prevHead = d.chainHead-d.hashOffset, prevLength=minMatchLength-1, lookahead
+func (d *compressor) findMatch(pos int, prevHead int, prevLength int, lookahead int) (length, offset int, ok bool) {
+	minMatchLook := maxMatchLength
+	if lookahead < minMatchLook {
+		minMatchLook = lookahead
+	}
+
+	win := d.window[0 : pos+minMatchLook]
+
+	// We quit when we get a match that's at least nice long
+	nice := len(win) - pos
+	if d.nice < nice {
+		nice = d.nice
+	}
+
+	// If we've got a match that's good enough, only look in 1/4 the chain.
+	tries := d.chain
+	length = prevLength
+	if length >= d.good {
+		tries >>= 2
+	}
+
+	wEnd := win[pos+length]
+	wPos := win[pos:]
+	minIndex := pos - windowSize
+
+	for i := prevHead; tries > 0; tries-- {
+		if wEnd == win[i+length] {
+			n := matchLen(win[i:], wPos, minMatchLook)
+
+			if n > length && (n > minMatchLength || pos-i <= 4096) {
+				length = n
+				offset = pos - i
+				ok = true
+				if n >= nice {
+					// The match is good enough that we don't try to find a better one.
+					break
+				}
+				wEnd = win[pos+n]
+			}
+		}
+		if i == minIndex {
+			// hashPrev[i & windowMask] has already been overwritten, so stop now.
+			break
+		}
+		i = int(d.hashPrev[i&windowMask]) - d.hashOffset
+		if i < minIndex || i < 0 {
+			break
+		}
+	}
+	return
+}
+
+// Try to find a match starting at index whose length is greater than prevSize.
+// We only look at chainCount possibilities before giving up.
+// pos = d.index, prevHead = d.chainHead-d.hashOffset, prevLength=minMatchLength-1, lookahead
+func (d *compressor) findMatchSSE(pos int, prevHead int, prevLength int, lookahead int) (length, offset int, ok bool) {
+	minMatchLook := maxMatchLength
+	if lookahead < minMatchLook {
+		minMatchLook = lookahead
+	}
+
+	win := d.window[0 : pos+minMatchLook]
+
+	// We quit when we get a match that's at least nice long
+	nice := len(win) - pos
+	if d.nice < nice {
+		nice = d.nice
+	}
+
+	// If we've got a match that's good enough, only look in 1/4 the chain.
+	tries := d.chain
+	length = prevLength
+	if length >= d.good {
+		tries >>= 2
+	}
+
+	wEnd := win[pos+length]
+	wPos := win[pos:]
+	minIndex := pos - windowSize
+
+	for i := prevHead; tries > 0; tries-- {
+		if wEnd == win[i+length] {
+			n := matchLenSSE4(win[i:], wPos, minMatchLook)
+
+			if n > length && (n > minMatchLength || pos-i <= 4096) {
+				length = n
+				offset = pos - i
+				ok = true
+				if n >= nice {
+					// The match is good enough that we don't try to find a better one.
+					break
+				}
+				wEnd = win[pos+n]
+			}
+		}
+		if i == minIndex {
+			// hashPrev[i & windowMask] has already been overwritten, so stop now.
+			break
+		}
+		i = int(d.hashPrev[i&windowMask]) - d.hashOffset
+		if i < minIndex || i < 0 {
+			break
+		}
+	}
+	return
+}
+
+func (d *compressor) writeStoredBlock(buf []byte) error {
+	if d.w.writeStoredHeader(len(buf), false); d.w.err != nil {
+		return d.w.err
+	}
+	d.w.writeBytes(buf)
+	return d.w.err
+}
+
+// oldHash is the hash function used when no native crc32 calculation
+// or similar is present.
+func oldHash(b []byte) hash {
+	return hash(b[0])<<(hashShift*3) + hash(b[1])<<(hashShift*2) + hash(b[2])<<hashShift + hash(b[3])
+}
+
+// oldBulkHash will compute hashes using the same
+// algorithm as oldHash
+func oldBulkHash(b []byte, dst []hash) {
+	if len(b) < minMatchLength {
+		return
+	}
+	h := oldHash(b)
+	dst[0] = h
+	i := 1
+	end := len(b) - minMatchLength + 1
+	for ; i < end; i++ {
+		h = (h << hashShift) + hash(b[i+3])
+		dst[i] = h
+	}
+}
+
+// matchLen returns the number of matching bytes in a and b
+// up to length 'max'. Both slices must be at least 'max'
+// bytes in size.
+func matchLen(a, b []byte, max int) int {
+	a = a[:max]
+	for i, av := range a {
+		if b[i] != av {
+			return i
+		}
+	}
+	return max
+}
+
+func (d *compressor) initDeflate() {
+	d.hashHead = make([]hashid, hashSize)
+	d.hashPrev = make([]hashid, windowSize)
+	d.window = make([]byte, 2*windowSize)
+	d.hashOffset = 1
+	d.tokens.tokens = make([]token, maxFlateBlockTokens+1)
+	d.length = minMatchLength - 1
+	d.offset = 0
+	d.byteAvailable = false
+	d.index = 0
+	d.hash = 0
+	d.chainHead = -1
+	d.bulkHasher = oldBulkHash
+	if useSSE42 {
+		d.bulkHasher = crc32sseAll
+	}
+}
+
+// Assumes that d.fastSkipHashing != skipNever,
+// otherwise use deflateLazy
+func (d *compressor) deflate() {
+
+	// Sanity enables additional runtime tests.
+	// It's intended to be used during development
+	// to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
+		return
+	}
+
+	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
+	if d.index < d.maxInsertIndex {
+		d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+	}
+
+	for {
+		if sanity && d.index > d.windowEnd {
+			panic("index > windowEnd")
+		}
+		lookahead := d.windowEnd - d.index
+		if lookahead < minMatchLength+maxMatchLength {
+			if !d.sync {
+				return
+			}
+			if sanity && d.index > d.windowEnd {
+				panic("index > windowEnd")
+			}
+			if lookahead == 0 {
+				if d.tokens.n > 0 {
+					if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				return
+			}
+		}
+		if d.index < d.maxInsertIndex {
+			// Update the hash
+			d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+			ch := d.hashHead[d.hash]
+			d.chainHead = int(ch)
+			d.hashPrev[d.index&windowMask] = ch
+			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
+		}
+		d.length = minMatchLength - 1
+		d.offset = 0
+		minIndex := d.index - windowSize
+		if minIndex < 0 {
+			minIndex = 0
+		}
+
+		if d.chainHead-d.hashOffset >= minIndex && lookahead > minMatchLength-1 {
+			if newLength, newOffset, ok := d.findMatch(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
+				d.length = newLength
+				d.offset = newOffset
+			}
+		}
+		if d.length >= minMatchLength {
+			d.ii = 0
+			// There was a match at the previous step, and the current match is
+			// not better. Output the previous match.
+			// "d.length-3" should NOT be "d.length-minMatchLength", since the format always assume 3
+			d.tokens.tokens[d.tokens.n] = matchToken(uint32(d.length-3), uint32(d.offset-minOffsetSize))
+			d.tokens.n++
+			// Insert in the hash table all strings up to the end of the match.
+			// index and index-1 are already inserted. If there is not enough
+			// lookahead, the last two strings are not inserted into the hash
+			// table.
+			if d.length <= d.fastSkipHashing {
+				var newIndex int
+				newIndex = d.index + d.length
+				// Calculate missing hashes
+				end := newIndex
+				if end > d.maxInsertIndex {
+					end = d.maxInsertIndex
+				}
+				end += minMatchLength - 1
+				startindex := d.index + 1
+				if startindex > d.maxInsertIndex {
+					startindex = d.maxInsertIndex
+				}
+				tocheck := d.window[startindex:end]
+				dstSize := len(tocheck) - minMatchLength + 1
+				if dstSize > 0 {
+					dst := d.hashMatch[:dstSize]
+					oldBulkHash(tocheck, dst)
+					var newH hash
+					for i, val := range dst {
+						di := i + startindex
+						newH = val & hashMask
+						// Get previous value with the same hash.
+						// Our chain should point to the previous value.
+						d.hashPrev[di&windowMask] = d.hashHead[newH]
+						// Set the head of the hash chain to us.
+						d.hashHead[newH] = hashid(di + d.hashOffset)
+					}
+					d.hash = newH
+				}
+				d.index = newIndex
+			} else {
+				// For matches this long, we don't bother inserting each individual
+				// item into the table.
+				d.index += d.length
+				if d.index < d.maxInsertIndex {
+					d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+				}
+			}
+			if d.tokens.n == maxFlateBlockTokens {
+				// The block includes the current character
+				if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
+					return
+				}
+				d.tokens.n = 0
+			}
+		} else {
+			d.ii++
+			end := d.index + int(d.ii>>uint(d.fastSkipHashing)) + 1
+			if end > d.windowEnd {
+				end = d.windowEnd
+			}
+			for i := d.index; i < end; i++ {
+				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[i]))
+				d.tokens.n++
+				if d.tokens.n == maxFlateBlockTokens {
+					if d.err = d.writeBlockSkip(d.tokens, i+1, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+			}
+			d.index = end
+		}
+	}
+}
+
+// deflateLazy is the same as deflate, but with d.fastSkipHashing == skipNever,
+// meaning it always has lazy matching on.
+func (d *compressor) deflateLazy() {
+	// Sanity enables additional runtime tests.
+	// It's intended to be used during development
+	// to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
+		return
+	}
+
+	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
+	if d.index < d.maxInsertIndex {
+		d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+	}
+
+	for {
+		if sanity && d.index > d.windowEnd {
+			panic("index > windowEnd")
+		}
+		lookahead := d.windowEnd - d.index
+		if lookahead < minMatchLength+maxMatchLength {
+			if !d.sync {
+				return
+			}
+			if sanity && d.index > d.windowEnd {
+				panic("index > windowEnd")
+			}
+			if lookahead == 0 {
+				// Flush current output block if any.
+				if d.byteAvailable {
+					// There is still one pending token that needs to be flushed
+					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+					d.tokens.n++
+					d.byteAvailable = false
+				}
+				if d.tokens.n > 0 {
+					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				return
+			}
+		}
+		if d.index < d.maxInsertIndex {
+			// Update the hash
+			d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+			ch := d.hashHead[d.hash]
+			d.chainHead = int(ch)
+			d.hashPrev[d.index&windowMask] = ch
+			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
+		}
+		prevLength := d.length
+		prevOffset := d.offset
+		d.length = minMatchLength - 1
+		d.offset = 0
+		minIndex := d.index - windowSize
+		if minIndex < 0 {
+			minIndex = 0
+		}
+
+		if d.chainHead-d.hashOffset >= minIndex && lookahead > prevLength && prevLength < d.lazy {
+			if newLength, newOffset, ok := d.findMatch(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
+				d.length = newLength
+				d.offset = newOffset
+			}
+		}
+		if prevLength >= minMatchLength && d.length <= prevLength {
+			// There was a match at the previous step, and the current match is
+			// not better. Output the previous match.
+			d.tokens.tokens[d.tokens.n] = matchToken(uint32(prevLength-3), uint32(prevOffset-minOffsetSize))
+			d.tokens.n++
+
+			// Insert in the hash table all strings up to the end of the match.
+			// index and index-1 are already inserted. If there is not enough
+			// lookahead, the last two strings are not inserted into the hash
+			// table.
+			var newIndex int
+			newIndex = d.index + prevLength - 1
+			// Calculate missing hashes
+			end := newIndex
+			if end > d.maxInsertIndex {
+				end = d.maxInsertIndex
+			}
+			end += minMatchLength - 1
+			startindex := d.index + 1
+			if startindex > d.maxInsertIndex {
+				startindex = d.maxInsertIndex
+			}
+			tocheck := d.window[startindex:end]
+			dstSize := len(tocheck) - minMatchLength + 1
+			if dstSize > 0 {
+				dst := d.hashMatch[:dstSize]
+				oldBulkHash(tocheck, dst)
+				var newH hash
+				for i, val := range dst {
+					di := i + startindex
+					newH = val & hashMask
+					// Get previous value with the same hash.
+					// Our chain should point to the previous value.
+					d.hashPrev[di&windowMask] = d.hashHead[newH]
+					// Set the head of the hash chain to us.
+					d.hashHead[newH] = hashid(di + d.hashOffset)
+				}
+				d.hash = newH
+			}
+
+			d.index = newIndex
+			d.byteAvailable = false
+			d.length = minMatchLength - 1
+			if d.tokens.n == maxFlateBlockTokens {
+				// The block includes the current character
+				if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+					return
+				}
+				d.tokens.n = 0
+			}
+		} else {
+			// Reset, if we got a match this run.
+			if d.length >= minMatchLength {
+				d.ii = 0
+			}
+			// We have a byte waiting. Emit it.
+			if d.byteAvailable {
+				d.ii++
+				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+				d.tokens.n++
+				if d.tokens.n == maxFlateBlockTokens {
+					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				d.index++
+
+				// If we have a long run of no matches, skip additional bytes
+				// Resets when d.ii overflows after 64KB.
+				if d.ii > 31 {
+					n := int(d.ii >> 6)
+					for j := 0; j < n; j++ {
+						if d.index >= d.windowEnd-1 {
+							break
+						}
+
+						d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+						d.tokens.n++
+						if d.tokens.n == maxFlateBlockTokens {
+							if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+								return
+							}
+							d.tokens.n = 0
+						}
+						d.index++
+					}
+					// Flush last byte
+					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+					d.tokens.n++
+					d.byteAvailable = false
+					// d.length = minMatchLength - 1 // not needed, since d.ii is reset above, so it should never be > minMatchLength
+					if d.tokens.n == maxFlateBlockTokens {
+						if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+							return
+						}
+						d.tokens.n = 0
+					}
+				}
+			} else {
+				d.index++
+				d.byteAvailable = true
+			}
+		}
+	}
+}
+
+// Assumes that d.fastSkipHashing != skipNever,
+// otherwise use deflateLazySSE
+func (d *compressor) deflateSSE() {
+
+	// Sanity enables additional runtime tests.
+	// It's intended to be used during development
+	// to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
+		return
+	}
+
+	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
+	if d.index < d.maxInsertIndex {
+		d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
+	}
+
+	for {
+		if sanity && d.index > d.windowEnd {
+			panic("index > windowEnd")
+		}
+		lookahead := d.windowEnd - d.index
+		if lookahead < minMatchLength+maxMatchLength {
+			if !d.sync {
+				return
+			}
+			if sanity && d.index > d.windowEnd {
+				panic("index > windowEnd")
+			}
+			if lookahead == 0 {
+				if d.tokens.n > 0 {
+					if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				return
+			}
+		}
+		if d.index < d.maxInsertIndex {
+			// Update the hash
+			d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
+			ch := d.hashHead[d.hash]
+			d.chainHead = int(ch)
+			d.hashPrev[d.index&windowMask] = ch
+			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
+		}
+		d.length = minMatchLength - 1
+		d.offset = 0
+		minIndex := d.index - windowSize
+		if minIndex < 0 {
+			minIndex = 0
+		}
+
+		if d.chainHead-d.hashOffset >= minIndex && lookahead > minMatchLength-1 {
+			if newLength, newOffset, ok := d.findMatchSSE(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
+				d.length = newLength
+				d.offset = newOffset
+			}
+		}
+		if d.length >= minMatchLength {
+			d.ii = 0
+			// There was a match at the previous step, and the current match is
+			// not better. Output the previous match.
+			// "d.length-3" should NOT be "d.length-minMatchLength", since the format always assume 3
+			d.tokens.tokens[d.tokens.n] = matchToken(uint32(d.length-3), uint32(d.offset-minOffsetSize))
+			d.tokens.n++
+			// Insert in the hash table all strings up to the end of the match.
+			// index and index-1 are already inserted. If there is not enough
+			// lookahead, the last two strings are not inserted into the hash
+			// table.
+			if d.length <= d.fastSkipHashing {
+				var newIndex int
+				newIndex = d.index + d.length
+				// Calculate missing hashes
+				end := newIndex
+				if end > d.maxInsertIndex {
+					end = d.maxInsertIndex
+				}
+				end += minMatchLength - 1
+				startindex := d.index + 1
+				if startindex > d.maxInsertIndex {
+					startindex = d.maxInsertIndex
+				}
+				tocheck := d.window[startindex:end]
+				dstSize := len(tocheck) - minMatchLength + 1
+				if dstSize > 0 {
+					dst := d.hashMatch[:dstSize]
+
+					crc32sseAll(tocheck, dst)
+					var newH hash
+					for i, val := range dst {
+						di := i + startindex
+						newH = val & hashMask
+						// Get previous value with the same hash.
+						// Our chain should point to the previous value.
+						d.hashPrev[di&windowMask] = d.hashHead[newH]
+						// Set the head of the hash chain to us.
+						d.hashHead[newH] = hashid(di + d.hashOffset)
+					}
+					d.hash = newH
+				}
+				d.index = newIndex
+			} else {
+				// For matches this long, we don't bother inserting each individual
+				// item into the table.
+				d.index += d.length
+				if d.index < d.maxInsertIndex {
+					d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
+				}
+			}
+			if d.tokens.n == maxFlateBlockTokens {
+				// The block includes the current character
+				if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
+					return
+				}
+				d.tokens.n = 0
+			}
+		} else {
+			d.ii++
+			end := d.index + int(d.ii>>uint(d.fastSkipHashing)) + 1
+			if end > d.windowEnd {
+				end = d.windowEnd
+			}
+			for i := d.index; i < end; i++ {
+				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[i]))
+				d.tokens.n++
+				if d.tokens.n == maxFlateBlockTokens {
+					if d.err = d.writeBlockSkip(d.tokens, i+1, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+			}
+			d.index = end
+		}
+	}
+}
+
+// deflateLazy is the same as deflate, but with d.fastSkipHashing == skipNever,
+// meaning it always has lazy matching on.
+func (d *compressor) deflateLazySSE() {
+	// Sanity enables additional runtime tests.
+	// It's intended to be used during development
+	// to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
+		return
+	}
+
+	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
+	if d.index < d.maxInsertIndex {
+		d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
+	}
+
+	for {
+		if sanity && d.index > d.windowEnd {
+			panic("index > windowEnd")
+		}
+		lookahead := d.windowEnd - d.index
+		if lookahead < minMatchLength+maxMatchLength {
+			if !d.sync {
+				return
+			}
+			if sanity && d.index > d.windowEnd {
+				panic("index > windowEnd")
+			}
+			if lookahead == 0 {
+				// Flush current output block if any.
+				if d.byteAvailable {
+					// There is still one pending token that needs to be flushed
+					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+					d.tokens.n++
+					d.byteAvailable = false
+				}
+				if d.tokens.n > 0 {
+					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				return
+			}
+		}
+		if d.index < d.maxInsertIndex {
+			// Update the hash
+			d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
+			ch := d.hashHead[d.hash]
+			d.chainHead = int(ch)
+			d.hashPrev[d.index&windowMask] = ch
+			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
+		}
+		prevLength := d.length
+		prevOffset := d.offset
+		d.length = minMatchLength - 1
+		d.offset = 0
+		minIndex := d.index - windowSize
+		if minIndex < 0 {
+			minIndex = 0
+		}
+
+		if d.chainHead-d.hashOffset >= minIndex && lookahead > prevLength && prevLength < d.lazy {
+			if newLength, newOffset, ok := d.findMatchSSE(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
+				d.length = newLength
+				d.offset = newOffset
+			}
+		}
+		if prevLength >= minMatchLength && d.length <= prevLength {
+			// There was a match at the previous step, and the current match is
+			// not better. Output the previous match.
+			d.tokens.tokens[d.tokens.n] = matchToken(uint32(prevLength-3), uint32(prevOffset-minOffsetSize))
+			d.tokens.n++
+
+			// Insert in the hash table all strings up to the end of the match.
+			// index and index-1 are already inserted. If there is not enough
+			// lookahead, the last two strings are not inserted into the hash
+			// table.
+			var newIndex int
+			newIndex = d.index + prevLength - 1
+			// Calculate missing hashes
+			end := newIndex
+			if end > d.maxInsertIndex {
+				end = d.maxInsertIndex
+			}
+			end += minMatchLength - 1
+			startindex := d.index + 1
+			if startindex > d.maxInsertIndex {
+				startindex = d.maxInsertIndex
+			}
+			tocheck := d.window[startindex:end]
+			dstSize := len(tocheck) - minMatchLength + 1
+			if dstSize > 0 {
+				dst := d.hashMatch[:dstSize]
+				crc32sseAll(tocheck, dst)
+				var newH hash
+				for i, val := range dst {
+					di := i + startindex
+					newH = val & hashMask
+					// Get previous value with the same hash.
+					// Our chain should point to the previous value.
+					d.hashPrev[di&windowMask] = d.hashHead[newH]
+					// Set the head of the hash chain to us.
+					d.hashHead[newH] = hashid(di + d.hashOffset)
+				}
+				d.hash = newH
+			}
+
+			d.index = newIndex
+			d.byteAvailable = false
+			d.length = minMatchLength - 1
+			if d.tokens.n == maxFlateBlockTokens {
+				// The block includes the current character
+				if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+					return
+				}
+				d.tokens.n = 0
+			}
+		} else {
+			// Reset, if we got a match this run.
+			if d.length >= minMatchLength {
+				d.ii = 0
+			}
+			// We have a byte waiting. Emit it.
+			if d.byteAvailable {
+				d.ii++
+				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+				d.tokens.n++
+				if d.tokens.n == maxFlateBlockTokens {
+					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+						return
+					}
+					d.tokens.n = 0
+				}
+				d.index++
+
+				// If we have a long run of no matches, skip additional bytes
+				// Resets when d.ii overflows after 64KB.
+				if d.ii > 31 {
+					n := int(d.ii >> 6)
+					for j := 0; j < n; j++ {
+						if d.index >= d.windowEnd-1 {
+							break
+						}
+
+						d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+						d.tokens.n++
+						if d.tokens.n == maxFlateBlockTokens {
+							if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+								return
+							}
+							d.tokens.n = 0
+						}
+						d.index++
+					}
+					// Flush last byte
+					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
+					d.tokens.n++
+					d.byteAvailable = false
+					// d.length = minMatchLength - 1 // not needed, since d.ii is reset above, so it should never be > minMatchLength
+					if d.tokens.n == maxFlateBlockTokens {
+						if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
+							return
+						}
+						d.tokens.n = 0
+					}
+				}
+			} else {
+				d.index++
+				d.byteAvailable = true
+			}
+		}
+	}
+}
+
+func (d *compressor) fillStore(b []byte) int {
+	n := copy(d.window[d.windowEnd:], b)
+	d.windowEnd += n
+	return n
+}
+
+func (d *compressor) store() {
+	if d.windowEnd > 0 {
+		d.err = d.writeStoredBlock(d.window[:d.windowEnd])
+	}
+	d.windowEnd = 0
+}
+
+// fillHuff will fill the buffer with data for huffman-only compression.
+// The number of bytes copied is returned.
+func (d *compressor) fillHuff(b []byte) int {
+	n := copy(d.window[d.windowEnd:], b)
+	d.windowEnd += n
+	return n
+}
+
+// storeHuff will compress and store the currently added data,
+// if enough has been accumulated or we at the end of the stream.
+// Any error that occurred will be in d.err
+func (d *compressor) storeHuff() {
+	// We only compress if we have maxStoreBlockSize or we are at end-of-stream
+	if d.windowEnd < maxStoreBlockSize && !d.sync {
+		return
+	}
+	if d.windowEnd == 0 {
+		return
+	}
+	d.w.writeBlockHuff(false, d.window[:d.windowEnd])
+	d.err = d.w.err
+	d.windowEnd = 0
+}
+
+// storeHuff will compress and store the currently added data,
+// if enough has been accumulated or we at the end of the stream.
+// Any error that occurred will be in d.err
+func (d *compressor) storeSnappy() {
+	// We only compress if we have maxStoreBlockSize.
+	if d.windowEnd < maxStoreBlockSize {
+		if !d.sync {
+			return
+		}
+		// Handle extremely small sizes.
+		if d.windowEnd < 128 {
+			if d.windowEnd == 0 {
+				return
+			}
+			if d.windowEnd <= 32 {
+				d.err = d.writeStoredBlock(d.window[:d.windowEnd])
+				d.tokens.n = 0
+				d.windowEnd = 0
+			} else {
+				d.w.writeBlockHuff(false, d.window[:d.windowEnd])
+				d.err = d.w.err
+			}
+			d.tokens.n = 0
+			d.windowEnd = 0
+			return
+		}
+	}
+
+	d.snap.Encode(&d.tokens, d.window[:d.windowEnd])
+	// If we made zero matches, store the block as is.
+	if d.tokens.n == d.windowEnd {
+		d.err = d.writeStoredBlock(d.window[:d.windowEnd])
+		// If we removed less than 1/16th, huffman compress the block.
+	} else if d.tokens.n > d.windowEnd-(d.windowEnd>>4) {
+		d.w.writeBlockHuff(false, d.window[:d.windowEnd])
+		d.err = d.w.err
+	} else {
+		d.w.writeBlockDynamic(d.tokens, false, d.window[:d.windowEnd])
+		d.err = d.w.err
+	}
+	d.tokens.n = 0
+	d.windowEnd = 0
+}
+
+// write will add input byte to the stream.
+// Unless an error occurs all bytes will be consumed.
+func (d *compressor) write(b []byte) (n int, err error) {
+	if d.err != nil {
+		return 0, d.err
+	}
+	n = len(b)
+	for len(b) > 0 {
+		d.step(d)
+		b = b[d.fill(d, b):]
+		if d.err != nil {
+			return 0, d.err
+		}
+	}
+	return n, d.err
+}
+
+func (d *compressor) syncFlush() error {
+	d.sync = true
+	if d.err != nil {
+		return d.err
+	}
+	d.step(d)
+	if d.err == nil {
+		d.w.writeStoredHeader(0, false)
+		d.w.flush()
+		d.err = d.w.err
+	}
+	d.sync = false
+	return d.err
+}
+
+func (d *compressor) init(w io.Writer, level int) (err error) {
+	d.w = newHuffmanBitWriter(w)
+
+	switch {
+	case level == NoCompression:
+		d.window = make([]byte, maxStoreBlockSize)
+		d.fill = (*compressor).fillStore
+		d.step = (*compressor).store
+	case level == ConstantCompression:
+		d.window = make([]byte, maxStoreBlockSize)
+		d.fill = (*compressor).fillHuff
+		d.step = (*compressor).storeHuff
+	case level >= 1 && level <= 3:
+		d.snap = newSnappy(level)
+		d.window = make([]byte, maxStoreBlockSize)
+		d.fill = (*compressor).fillHuff
+		d.step = (*compressor).storeSnappy
+		d.tokens.tokens = make([]token, maxStoreBlockSize+1)
+	case level == DefaultCompression:
+		level = 5
+		fallthrough
+	case 4 <= level && level <= 9:
+		d.compressionLevel = levels[level]
+		d.initDeflate()
+		d.fill = (*compressor).fillDeflate
+		if d.fastSkipHashing == skipNever {
+			if useSSE42 {
+				d.step = (*compressor).deflateLazySSE
+			} else {
+				d.step = (*compressor).deflateLazy
+			}
+		} else {
+			if useSSE42 {
+				d.step = (*compressor).deflateSSE
+			} else {
+				d.step = (*compressor).deflate
+
+			}
+		}
+	default:
+		return fmt.Errorf("flate: invalid compression level %d: want value in range [-2, 9]", level)
+	}
+	return nil
+}
+
+// Used for zeroing the hash slice
+var hzeroes [256]hashid
+
+// reset the state of the compressor.
+func (d *compressor) reset(w io.Writer) {
+	d.w.reset(w)
+	d.sync = false
+	d.err = nil
+	// We only need to reset a few things for Snappy.
+	if d.snap != nil {
+		d.snap.Reset()
+		d.windowEnd = 0
+		d.tokens.n = 0
+		return
+	}
+	switch d.compressionLevel.chain {
+	case 0:
+		// level was NoCompression or ConstantCompresssion.
+		d.windowEnd = 0
+	default:
+		d.chainHead = -1
+		for s := d.hashHead; len(s) > 0; {
+			n := copy(s, hzeroes[:])
+			s = s[n:]
+		}
+		for s := d.hashPrev; len(s) > 0; s = s[len(hzeroes):] {
+			copy(s, hzeroes[:])
+		}
+		d.hashOffset = 1
+
+		d.index, d.windowEnd = 0, 0
+		d.blockStart, d.byteAvailable = 0, false
+
+		d.tokens.n = 0
+		d.length = minMatchLength - 1
+		d.offset = 0
+		d.hash = 0
+		d.ii = 0
+		d.maxInsertIndex = 0
+	}
+}
+
+func (d *compressor) close() error {
+	if d.err != nil {
+		return d.err
+	}
+	d.sync = true
+	d.step(d)
+	if d.err != nil {
+		return d.err
+	}
+	if d.w.writeStoredHeader(0, true); d.w.err != nil {
+		return d.w.err
+	}
+	d.w.flush()
+	return d.w.err
+}
+
+// NewWriter returns a new Writer compressing data at the given level.
+// Following zlib, levels range from 1 (BestSpeed) to 9 (BestCompression);
+// higher levels typically run slower but compress more.
+// Level 0 (NoCompression) does not attempt any compression; it only adds the
+// necessary DEFLATE framing.
+// Level -1 (DefaultCompression) uses the default compression level.
+// Level -2 (ConstantCompression) will use Huffman compression only, giving
+// a very fast compression for all types of input, but sacrificing considerable
+// compression efficiency.
+//
+// If level is in the range [-2, 9] then the error returned will be nil.
+// Otherwise the error returned will be non-nil.
+func NewWriter(w io.Writer, level int) (*Writer, error) {
+	var dw Writer
+	if err := dw.d.init(w, level); err != nil {
+		return nil, err
+	}
+	return &dw, nil
+}
+
+// NewWriterDict is like NewWriter but initializes the new
+// Writer with a preset dictionary.  The returned Writer behaves
+// as if the dictionary had been written to it without producing
+// any compressed output.  The compressed data written to w
+// can only be decompressed by a Reader initialized with the
+// same dictionary.
+func NewWriterDict(w io.Writer, level int, dict []byte) (*Writer, error) {
+	dw := &dictWriter{w}
+	zw, err := NewWriter(dw, level)
+	if err != nil {
+		return nil, err
+	}
+	zw.d.fillWindow(dict)
+	zw.dict = append(zw.dict, dict...) // duplicate dictionary for Reset method.
+	return zw, err
+}
+
+type dictWriter struct {
+	w io.Writer
+}
+
+func (w *dictWriter) Write(b []byte) (n int, err error) {
+	return w.w.Write(b)
+}
+
+// A Writer takes data written to it and writes the compressed
+// form of that data to an underlying writer (see NewWriter).
+type Writer struct {
+	d    compressor
+	dict []byte
+}
+
+// Write writes data to w, which will eventually write the
+// compressed form of data to its underlying writer.
+func (w *Writer) Write(data []byte) (n int, err error) {
+	return w.d.write(data)
+}
+
+// Flush flushes any pending compressed data to the underlying writer.
+// It is useful mainly in compressed network protocols, to ensure that
+// a remote reader has enough data to reconstruct a packet.
+// Flush does not return until the data has been written.
+// If the underlying writer returns an error, Flush returns that error.
+//
+// In the terminology of the zlib library, Flush is equivalent to Z_SYNC_FLUSH.
+func (w *Writer) Flush() error {
+	// For more about flushing:
+	// http://www.bolet.org/~pornin/deflate-flush.html
+	return w.d.syncFlush()
+}
+
+// Close flushes and closes the writer.
+func (w *Writer) Close() error {
+	return w.d.close()
+}
+
+// Reset discards the writer's state and makes it equivalent to
+// the result of NewWriter or NewWriterDict called with dst
+// and w's level and dictionary.
+func (w *Writer) Reset(dst io.Writer) {
+	if dw, ok := w.d.w.w.(*dictWriter); ok {
+		// w was created with NewWriterDict
+		dw.w = dst
+		w.d.reset(dw)
+		w.d.fillWindow(w.dict)
+	} else {
+		// w was created with NewWriter
+		w.d.reset(dst)
+	}
+}
+
+// ResetDict discards the writer's state and makes it equivalent to
+// the result of NewWriter or NewWriterDict called with dst
+// and w's level, but sets a specific dictionary.
+func (w *Writer) ResetDict(dst io.Writer, dict []byte) {
+	w.dict = dict
+	w.d.reset(dst)
+	w.d.fillWindow(w.dict)
+}
diff --git a/vendor/github.com/klauspost/compress/flate/fixedhuff.go b/vendor/github.com/klauspost/compress/flate/fixedhuff.go
new file mode 100644
index 0000000000..7df8b9a293
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/fixedhuff.go
@@ -0,0 +1,78 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+// autogenerated by go run gen.go -output fixedhuff.go, DO NOT EDIT
+
+var fixedHuffmanDecoder = huffmanDecoder{
+	7,
+	[huffmanNumChunks]uint32{
+		0x1007, 0x0508, 0x0108, 0x1188, 0x1107, 0x0708, 0x0308, 0x0c09,
+		0x1087, 0x0608, 0x0208, 0x0a09, 0x0008, 0x0808, 0x0408, 0x0e09,
+		0x1047, 0x0588, 0x0188, 0x0909, 0x1147, 0x0788, 0x0388, 0x0d09,
+		0x10c7, 0x0688, 0x0288, 0x0b09, 0x0088, 0x0888, 0x0488, 0x0f09,
+		0x1027, 0x0548, 0x0148, 0x11c8, 0x1127, 0x0748, 0x0348, 0x0c89,
+		0x10a7, 0x0648, 0x0248, 0x0a89, 0x0048, 0x0848, 0x0448, 0x0e89,
+		0x1067, 0x05c8, 0x01c8, 0x0989, 0x1167, 0x07c8, 0x03c8, 0x0d89,
+		0x10e7, 0x06c8, 0x02c8, 0x0b89, 0x00c8, 0x08c8, 0x04c8, 0x0f89,
+		0x1017, 0x0528, 0x0128, 0x11a8, 0x1117, 0x0728, 0x0328, 0x0c49,
+		0x1097, 0x0628, 0x0228, 0x0a49, 0x0028, 0x0828, 0x0428, 0x0e49,
+		0x1057, 0x05a8, 0x01a8, 0x0949, 0x1157, 0x07a8, 0x03a8, 0x0d49,
+		0x10d7, 0x06a8, 0x02a8, 0x0b49, 0x00a8, 0x08a8, 0x04a8, 0x0f49,
+		0x1037, 0x0568, 0x0168, 0x11e8, 0x1137, 0x0768, 0x0368, 0x0cc9,
+		0x10b7, 0x0668, 0x0268, 0x0ac9, 0x0068, 0x0868, 0x0468, 0x0ec9,
+		0x1077, 0x05e8, 0x01e8, 0x09c9, 0x1177, 0x07e8, 0x03e8, 0x0dc9,
+		0x10f7, 0x06e8, 0x02e8, 0x0bc9, 0x00e8, 0x08e8, 0x04e8, 0x0fc9,
+		0x1007, 0x0518, 0x0118, 0x1198, 0x1107, 0x0718, 0x0318, 0x0c29,
+		0x1087, 0x0618, 0x0218, 0x0a29, 0x0018, 0x0818, 0x0418, 0x0e29,
+		0x1047, 0x0598, 0x0198, 0x0929, 0x1147, 0x0798, 0x0398, 0x0d29,
+		0x10c7, 0x0698, 0x0298, 0x0b29, 0x0098, 0x0898, 0x0498, 0x0f29,
+		0x1027, 0x0558, 0x0158, 0x11d8, 0x1127, 0x0758, 0x0358, 0x0ca9,
+		0x10a7, 0x0658, 0x0258, 0x0aa9, 0x0058, 0x0858, 0x0458, 0x0ea9,
+		0x1067, 0x05d8, 0x01d8, 0x09a9, 0x1167, 0x07d8, 0x03d8, 0x0da9,
+		0x10e7, 0x06d8, 0x02d8, 0x0ba9, 0x00d8, 0x08d8, 0x04d8, 0x0fa9,
+		0x1017, 0x0538, 0x0138, 0x11b8, 0x1117, 0x0738, 0x0338, 0x0c69,
+		0x1097, 0x0638, 0x0238, 0x0a69, 0x0038, 0x0838, 0x0438, 0x0e69,
+		0x1057, 0x05b8, 0x01b8, 0x0969, 0x1157, 0x07b8, 0x03b8, 0x0d69,
+		0x10d7, 0x06b8, 0x02b8, 0x0b69, 0x00b8, 0x08b8, 0x04b8, 0x0f69,
+		0x1037, 0x0578, 0x0178, 0x11f8, 0x1137, 0x0778, 0x0378, 0x0ce9,
+		0x10b7, 0x0678, 0x0278, 0x0ae9, 0x0078, 0x0878, 0x0478, 0x0ee9,
+		0x1077, 0x05f8, 0x01f8, 0x09e9, 0x1177, 0x07f8, 0x03f8, 0x0de9,
+		0x10f7, 0x06f8, 0x02f8, 0x0be9, 0x00f8, 0x08f8, 0x04f8, 0x0fe9,
+		0x1007, 0x0508, 0x0108, 0x1188, 0x1107, 0x0708, 0x0308, 0x0c19,
+		0x1087, 0x0608, 0x0208, 0x0a19, 0x0008, 0x0808, 0x0408, 0x0e19,
+		0x1047, 0x0588, 0x0188, 0x0919, 0x1147, 0x0788, 0x0388, 0x0d19,
+		0x10c7, 0x0688, 0x0288, 0x0b19, 0x0088, 0x0888, 0x0488, 0x0f19,
+		0x1027, 0x0548, 0x0148, 0x11c8, 0x1127, 0x0748, 0x0348, 0x0c99,
+		0x10a7, 0x0648, 0x0248, 0x0a99, 0x0048, 0x0848, 0x0448, 0x0e99,
+		0x1067, 0x05c8, 0x01c8, 0x0999, 0x1167, 0x07c8, 0x03c8, 0x0d99,
+		0x10e7, 0x06c8, 0x02c8, 0x0b99, 0x00c8, 0x08c8, 0x04c8, 0x0f99,
+		0x1017, 0x0528, 0x0128, 0x11a8, 0x1117, 0x0728, 0x0328, 0x0c59,
+		0x1097, 0x0628, 0x0228, 0x0a59, 0x0028, 0x0828, 0x0428, 0x0e59,
+		0x1057, 0x05a8, 0x01a8, 0x0959, 0x1157, 0x07a8, 0x03a8, 0x0d59,
+		0x10d7, 0x06a8, 0x02a8, 0x0b59, 0x00a8, 0x08a8, 0x04a8, 0x0f59,
+		0x1037, 0x0568, 0x0168, 0x11e8, 0x1137, 0x0768, 0x0368, 0x0cd9,
+		0x10b7, 0x0668, 0x0268, 0x0ad9, 0x0068, 0x0868, 0x0468, 0x0ed9,
+		0x1077, 0x05e8, 0x01e8, 0x09d9, 0x1177, 0x07e8, 0x03e8, 0x0dd9,
+		0x10f7, 0x06e8, 0x02e8, 0x0bd9, 0x00e8, 0x08e8, 0x04e8, 0x0fd9,
+		0x1007, 0x0518, 0x0118, 0x1198, 0x1107, 0x0718, 0x0318, 0x0c39,
+		0x1087, 0x0618, 0x0218, 0x0a39, 0x0018, 0x0818, 0x0418, 0x0e39,
+		0x1047, 0x0598, 0x0198, 0x0939, 0x1147, 0x0798, 0x0398, 0x0d39,
+		0x10c7, 0x0698, 0x0298, 0x0b39, 0x0098, 0x0898, 0x0498, 0x0f39,
+		0x1027, 0x0558, 0x0158, 0x11d8, 0x1127, 0x0758, 0x0358, 0x0cb9,
+		0x10a7, 0x0658, 0x0258, 0x0ab9, 0x0058, 0x0858, 0x0458, 0x0eb9,
+		0x1067, 0x05d8, 0x01d8, 0x09b9, 0x1167, 0x07d8, 0x03d8, 0x0db9,
+		0x10e7, 0x06d8, 0x02d8, 0x0bb9, 0x00d8, 0x08d8, 0x04d8, 0x0fb9,
+		0x1017, 0x0538, 0x0138, 0x11b8, 0x1117, 0x0738, 0x0338, 0x0c79,
+		0x1097, 0x0638, 0x0238, 0x0a79, 0x0038, 0x0838, 0x0438, 0x0e79,
+		0x1057, 0x05b8, 0x01b8, 0x0979, 0x1157, 0x07b8, 0x03b8, 0x0d79,
+		0x10d7, 0x06b8, 0x02b8, 0x0b79, 0x00b8, 0x08b8, 0x04b8, 0x0f79,
+		0x1037, 0x0578, 0x0178, 0x11f8, 0x1137, 0x0778, 0x0378, 0x0cf9,
+		0x10b7, 0x0678, 0x0278, 0x0af9, 0x0078, 0x0878, 0x0478, 0x0ef9,
+		0x1077, 0x05f8, 0x01f8, 0x09f9, 0x1177, 0x07f8, 0x03f8, 0x0df9,
+		0x10f7, 0x06f8, 0x02f8, 0x0bf9, 0x00f8, 0x08f8, 0x04f8, 0x0ff9,
+	},
+	nil, 0,
+}
diff --git a/vendor/github.com/klauspost/compress/flate/gen.go b/vendor/github.com/klauspost/compress/flate/gen.go
new file mode 100644
index 0000000000..154c89a488
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/gen.go
@@ -0,0 +1,265 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+// This program generates fixedhuff.go
+// Invoke as
+//
+//	go run gen.go -output fixedhuff.go
+
+package main
+
+import (
+	"bytes"
+	"flag"
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"log"
+)
+
+var filename = flag.String("output", "fixedhuff.go", "output file name")
+
+const maxCodeLen = 16
+
+// Note: the definition of the huffmanDecoder struct is copied from
+// inflate.go, as it is private to the implementation.
+
+// chunk & 15 is number of bits
+// chunk >> 4 is value, including table link
+
+const (
+	huffmanChunkBits  = 9
+	huffmanNumChunks  = 1 << huffmanChunkBits
+	huffmanCountMask  = 15
+	huffmanValueShift = 4
+)
+
+type huffmanDecoder struct {
+	min      int                      // the minimum code length
+	chunks   [huffmanNumChunks]uint32 // chunks as described above
+	links    [][]uint32               // overflow links
+	linkMask uint32                   // mask the width of the link table
+}
+
+// Initialize Huffman decoding tables from array of code lengths.
+// Following this function, h is guaranteed to be initialized into a complete
+// tree (i.e., neither over-subscribed nor under-subscribed). The exception is a
+// degenerate case where the tree has only a single symbol with length 1. Empty
+// trees are permitted.
+func (h *huffmanDecoder) init(bits []int) bool {
+	// Sanity enables additional runtime tests during Huffman
+	// table construction.  It's intended to be used during
+	// development to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if h.min != 0 {
+		*h = huffmanDecoder{}
+	}
+
+	// Count number of codes of each length,
+	// compute min and max length.
+	var count [maxCodeLen]int
+	var min, max int
+	for _, n := range bits {
+		if n == 0 {
+			continue
+		}
+		if min == 0 || n < min {
+			min = n
+		}
+		if n > max {
+			max = n
+		}
+		count[n]++
+	}
+
+	// Empty tree. The decompressor.huffSym function will fail later if the tree
+	// is used. Technically, an empty tree is only valid for the HDIST tree and
+	// not the HCLEN and HLIT tree. However, a stream with an empty HCLEN tree
+	// is guaranteed to fail since it will attempt to use the tree to decode the
+	// codes for the HLIT and HDIST trees. Similarly, an empty HLIT tree is
+	// guaranteed to fail later since the compressed data section must be
+	// composed of at least one symbol (the end-of-block marker).
+	if max == 0 {
+		return true
+	}
+
+	code := 0
+	var nextcode [maxCodeLen]int
+	for i := min; i <= max; i++ {
+		code <<= 1
+		nextcode[i] = code
+		code += count[i]
+	}
+
+	// Check that the coding is complete (i.e., that we've
+	// assigned all 2-to-the-max possible bit sequences).
+	// Exception: To be compatible with zlib, we also need to
+	// accept degenerate single-code codings.  See also
+	// TestDegenerateHuffmanCoding.
+	if code != 1<<uint(max) && !(code == 1 && max == 1) {
+		return false
+	}
+
+	h.min = min
+	if max > huffmanChunkBits {
+		numLinks := 1 << (uint(max) - huffmanChunkBits)
+		h.linkMask = uint32(numLinks - 1)
+
+		// create link tables
+		link := nextcode[huffmanChunkBits+1] >> 1
+		h.links = make([][]uint32, huffmanNumChunks-link)
+		for j := uint(link); j < huffmanNumChunks; j++ {
+			reverse := int(reverseByte[j>>8]) | int(reverseByte[j&0xff])<<8
+			reverse >>= uint(16 - huffmanChunkBits)
+			off := j - uint(link)
+			if sanity && h.chunks[reverse] != 0 {
+				panic("impossible: overwriting existing chunk")
+			}
+			h.chunks[reverse] = uint32(off<<huffmanValueShift | (huffmanChunkBits + 1))
+			h.links[off] = make([]uint32, numLinks)
+		}
+	}
+
+	for i, n := range bits {
+		if n == 0 {
+			continue
+		}
+		code := nextcode[n]
+		nextcode[n]++
+		chunk := uint32(i<<huffmanValueShift | n)
+		reverse := int(reverseByte[code>>8]) | int(reverseByte[code&0xff])<<8
+		reverse >>= uint(16 - n)
+		if n <= huffmanChunkBits {
+			for off := reverse; off < len(h.chunks); off += 1 << uint(n) {
+				// We should never need to overwrite
+				// an existing chunk.  Also, 0 is
+				// never a valid chunk, because the
+				// lower 4 "count" bits should be
+				// between 1 and 15.
+				if sanity && h.chunks[off] != 0 {
+					panic("impossible: overwriting existing chunk")
+				}
+				h.chunks[off] = chunk
+			}
+		} else {
+			j := reverse & (huffmanNumChunks - 1)
+			if sanity && h.chunks[j]&huffmanCountMask != huffmanChunkBits+1 {
+				// Longer codes should have been
+				// associated with a link table above.
+				panic("impossible: not an indirect chunk")
+			}
+			value := h.chunks[j] >> huffmanValueShift
+			linktab := h.links[value]
+			reverse >>= huffmanChunkBits
+			for off := reverse; off < len(linktab); off += 1 << uint(n-huffmanChunkBits) {
+				if sanity && linktab[off] != 0 {
+					panic("impossible: overwriting existing chunk")
+				}
+				linktab[off] = chunk
+			}
+		}
+	}
+
+	if sanity {
+		// Above we've sanity checked that we never overwrote
+		// an existing entry.  Here we additionally check that
+		// we filled the tables completely.
+		for i, chunk := range h.chunks {
+			if chunk == 0 {
+				// As an exception, in the degenerate
+				// single-code case, we allow odd
+				// chunks to be missing.
+				if code == 1 && i%2 == 1 {
+					continue
+				}
+				panic("impossible: missing chunk")
+			}
+		}
+		for _, linktab := range h.links {
+			for _, chunk := range linktab {
+				if chunk == 0 {
+					panic("impossible: missing chunk")
+				}
+			}
+		}
+	}
+
+	return true
+}
+
+func main() {
+	flag.Parse()
+
+	var h huffmanDecoder
+	var bits [288]int
+	initReverseByte()
+	for i := 0; i < 144; i++ {
+		bits[i] = 8
+	}
+	for i := 144; i < 256; i++ {
+		bits[i] = 9
+	}
+	for i := 256; i < 280; i++ {
+		bits[i] = 7
+	}
+	for i := 280; i < 288; i++ {
+		bits[i] = 8
+	}
+	h.init(bits[:])
+	if h.links != nil {
+		log.Fatal("Unexpected links table in fixed Huffman decoder")
+	}
+
+	var buf bytes.Buffer
+
+	fmt.Fprintf(&buf, `// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.`+"\n\n")
+
+	fmt.Fprintln(&buf, "package flate")
+	fmt.Fprintln(&buf)
+	fmt.Fprintln(&buf, "// autogenerated by go run gen.go -output fixedhuff.go, DO NOT EDIT")
+	fmt.Fprintln(&buf)
+	fmt.Fprintln(&buf, "var fixedHuffmanDecoder = huffmanDecoder{")
+	fmt.Fprintf(&buf, "\t%d,\n", h.min)
+	fmt.Fprintln(&buf, "\t[huffmanNumChunks]uint32{")
+	for i := 0; i < huffmanNumChunks; i++ {
+		if i&7 == 0 {
+			fmt.Fprintf(&buf, "\t\t")
+		} else {
+			fmt.Fprintf(&buf, " ")
+		}
+		fmt.Fprintf(&buf, "0x%04x,", h.chunks[i])
+		if i&7 == 7 {
+			fmt.Fprintln(&buf)
+		}
+	}
+	fmt.Fprintln(&buf, "\t},")
+	fmt.Fprintln(&buf, "\tnil, 0,")
+	fmt.Fprintln(&buf, "}")
+
+	data, err := format.Source(buf.Bytes())
+	if err != nil {
+		log.Fatal(err)
+	}
+	err = ioutil.WriteFile(*filename, data, 0644)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+var reverseByte [256]byte
+
+func initReverseByte() {
+	for x := 0; x < 256; x++ {
+		var result byte
+		for i := uint(0); i < 8; i++ {
+			result |= byte(((x >> i) & 1) << (7 - i))
+		}
+		reverseByte[x] = result
+	}
+}
diff --git a/vendor/github.com/klauspost/compress/flate/huffman_bit_writer.go b/vendor/github.com/klauspost/compress/flate/huffman_bit_writer.go
new file mode 100644
index 0000000000..5f7ffdd2e6
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/huffman_bit_writer.go
@@ -0,0 +1,717 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+import (
+	"io"
+	"math"
+)
+
+const (
+	// The largest offset code.
+	offsetCodeCount = 30
+
+	// The special code used to mark the end of a block.
+	endBlockMarker = 256
+
+	// The first length code.
+	lengthCodesStart = 257
+
+	// The number of codegen codes.
+	codegenCodeCount = 19
+	badCode          = 255
+
+	// Output byte buffer size
+	// Must be multiple of 6 (48 bits) + 8
+	bufferSize = 240 + 8
+)
+
+// The number of extra bits needed by length code X - LENGTH_CODES_START.
+var lengthExtraBits = []int8{
+	/* 257 */ 0, 0, 0,
+	/* 260 */ 0, 0, 0, 0, 0, 1, 1, 1, 1, 2,
+	/* 270 */ 2, 2, 2, 3, 3, 3, 3, 4, 4, 4,
+	/* 280 */ 4, 5, 5, 5, 5, 0,
+}
+
+// The length indicated by length code X - LENGTH_CODES_START.
+var lengthBase = []uint32{
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 10,
+	12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+	64, 80, 96, 112, 128, 160, 192, 224, 255,
+}
+
+// offset code word extra bits.
+var offsetExtraBits = []int8{
+	0, 0, 0, 0, 1, 1, 2, 2, 3, 3,
+	4, 4, 5, 5, 6, 6, 7, 7, 8, 8,
+	9, 9, 10, 10, 11, 11, 12, 12, 13, 13,
+	/* extended window */
+	14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20,
+}
+
+var offsetBase = []uint32{
+	/* normal deflate */
+	0x000000, 0x000001, 0x000002, 0x000003, 0x000004,
+	0x000006, 0x000008, 0x00000c, 0x000010, 0x000018,
+	0x000020, 0x000030, 0x000040, 0x000060, 0x000080,
+	0x0000c0, 0x000100, 0x000180, 0x000200, 0x000300,
+	0x000400, 0x000600, 0x000800, 0x000c00, 0x001000,
+	0x001800, 0x002000, 0x003000, 0x004000, 0x006000,
+
+	/* extended window */
+	0x008000, 0x00c000, 0x010000, 0x018000, 0x020000,
+	0x030000, 0x040000, 0x060000, 0x080000, 0x0c0000,
+	0x100000, 0x180000, 0x200000, 0x300000,
+}
+
+// The odd order in which the codegen code sizes are written.
+var codegenOrder = []uint32{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}
+
+type huffmanBitWriter struct {
+	w io.Writer
+	// Data waiting to be written is bytes[0:nbytes]
+	// and then the low nbits of bits.
+	bits            uint64
+	nbits           uint
+	bytes           [bufferSize]byte
+	nbytes          int
+	literalFreq     []int32
+	offsetFreq      []int32
+	codegen         []uint8
+	codegenFreq     []int32
+	literalEncoding *huffmanEncoder
+	offsetEncoding  *huffmanEncoder
+	codegenEncoding *huffmanEncoder
+	err             error
+}
+
+func newHuffmanBitWriter(w io.Writer) *huffmanBitWriter {
+	return &huffmanBitWriter{
+		w:               w,
+		literalFreq:     make([]int32, maxNumLit),
+		offsetFreq:      make([]int32, offsetCodeCount),
+		codegen:         make([]uint8, maxNumLit+offsetCodeCount+1),
+		codegenFreq:     make([]int32, codegenCodeCount),
+		literalEncoding: newHuffmanEncoder(maxNumLit),
+		codegenEncoding: newHuffmanEncoder(codegenCodeCount),
+		offsetEncoding:  newHuffmanEncoder(offsetCodeCount),
+	}
+}
+
+func (w *huffmanBitWriter) reset(writer io.Writer) {
+	w.w = writer
+	w.bits, w.nbits, w.nbytes, w.err = 0, 0, 0, nil
+	w.bytes = [bufferSize]byte{}
+}
+
+func (w *huffmanBitWriter) flush() {
+	if w.err != nil {
+		w.nbits = 0
+		return
+	}
+	n := w.nbytes
+	for w.nbits != 0 {
+		w.bytes[n] = byte(w.bits)
+		w.bits >>= 8
+		if w.nbits > 8 { // Avoid underflow
+			w.nbits -= 8
+		} else {
+			w.nbits = 0
+		}
+		n++
+	}
+	w.bits = 0
+	_, w.err = w.w.Write(w.bytes[0:n])
+	w.nbytes = 0
+}
+
+func (w *huffmanBitWriter) writeBits(b int32, nb uint) {
+	w.bits |= uint64(b) << w.nbits
+	w.nbits += nb
+	if w.nbits >= 48 {
+		bits := w.bits
+		w.bits >>= 48
+		w.nbits -= 48
+		n := w.nbytes
+		w.bytes[n] = byte(bits)
+		w.bytes[n+1] = byte(bits >> 8)
+		w.bytes[n+2] = byte(bits >> 16)
+		w.bytes[n+3] = byte(bits >> 24)
+		w.bytes[n+4] = byte(bits >> 32)
+		w.bytes[n+5] = byte(bits >> 40)
+		n += 6
+		if n >= bufferSize-8 {
+			_, w.err = w.w.Write(w.bytes[:bufferSize-8])
+			n = 0
+		}
+		w.nbytes = n
+	}
+}
+
+func (w *huffmanBitWriter) writeBytes(bytes []byte) {
+	if w.err != nil {
+		return
+	}
+	n := w.nbytes
+	for w.nbits != 0 {
+		w.bytes[n] = byte(w.bits)
+		w.bits >>= 8
+		w.nbits -= 8
+		n++
+	}
+	if w.nbits != 0 {
+		w.err = InternalError("writeBytes with unfinished bits")
+		return
+	}
+	if n != 0 {
+		_, w.err = w.w.Write(w.bytes[0:n])
+		if w.err != nil {
+			return
+		}
+	}
+	w.nbytes = 0
+	_, w.err = w.w.Write(bytes)
+}
+
+// RFC 1951 3.2.7 specifies a special run-length encoding for specifying
+// the literal and offset lengths arrays (which are concatenated into a single
+// array).  This method generates that run-length encoding.
+//
+// The result is written into the codegen array, and the frequencies
+// of each code is written into the codegenFreq array.
+// Codes 0-15 are single byte codes. Codes 16-18 are followed by additional
+// information.  Code badCode is an end marker
+//
+//  numLiterals      The number of literals in literalEncoding
+//  numOffsets       The number of offsets in offsetEncoding
+func (w *huffmanBitWriter) generateCodegen(numLiterals int, numOffsets int, offenc *huffmanEncoder) {
+	for i := range w.codegenFreq {
+		w.codegenFreq[i] = 0
+	}
+	// Note that we are using codegen both as a temporary variable for holding
+	// a copy of the frequencies, and as the place where we put the result.
+	// This is fine because the output is always shorter than the input used
+	// so far.
+	codegen := w.codegen // cache
+	// Copy the concatenated code sizes to codegen.  Put a marker at the end.
+	cgnl := codegen[0:numLiterals]
+	for i := range cgnl {
+		cgnl[i] = uint8(w.literalEncoding.codes[i].bits())
+	}
+
+	cgnl = codegen[numLiterals : numLiterals+numOffsets]
+	for i := range cgnl {
+		cgnl[i] = uint8(offenc.codes[i].bits())
+	}
+	codegen[numLiterals+numOffsets] = badCode
+
+	size := codegen[0]
+	count := 1
+	outIndex := 0
+	for inIndex := 1; size != badCode; inIndex++ {
+		// INVARIANT: We have seen "count" copies of size that have not yet
+		// had output generated for them.
+		nextSize := codegen[inIndex]
+		if nextSize == size {
+			count++
+			continue
+		}
+		// We need to generate codegen indicating "count" of size.
+		if size != 0 {
+			codegen[outIndex] = size
+			outIndex++
+			w.codegenFreq[size]++
+			count--
+			for count >= 3 {
+				n := 6
+				if n > count {
+					n = count
+				}
+				codegen[outIndex] = 16
+				outIndex++
+				codegen[outIndex] = uint8(n - 3)
+				outIndex++
+				w.codegenFreq[16]++
+				count -= n
+			}
+		} else {
+			for count >= 11 {
+				n := 138
+				if n > count {
+					n = count
+				}
+				codegen[outIndex] = 18
+				outIndex++
+				codegen[outIndex] = uint8(n - 11)
+				outIndex++
+				w.codegenFreq[18]++
+				count -= n
+			}
+			if count >= 3 {
+				// count >= 3 && count <= 10
+				codegen[outIndex] = 17
+				outIndex++
+				codegen[outIndex] = uint8(count - 3)
+				outIndex++
+				w.codegenFreq[17]++
+				count = 0
+			}
+		}
+		count--
+		for ; count >= 0; count-- {
+			codegen[outIndex] = size
+			outIndex++
+			w.codegenFreq[size]++
+		}
+		// Set up invariant for next time through the loop.
+		size = nextSize
+		count = 1
+	}
+	// Marker indicating the end of the codegen.
+	codegen[outIndex] = badCode
+}
+
+func (w *huffmanBitWriter) writeCode(c hcode) {
+	if w.err != nil {
+		return
+	}
+	w.bits |= uint64(c.code()) << w.nbits
+	w.nbits += c.bits()
+	if w.nbits >= 48 {
+		bits := w.bits
+		w.bits >>= 48
+		w.nbits -= 48
+		n := w.nbytes
+		w.bytes[n] = byte(bits)
+		w.bytes[n+1] = byte(bits >> 8)
+		w.bytes[n+2] = byte(bits >> 16)
+		w.bytes[n+3] = byte(bits >> 24)
+		w.bytes[n+4] = byte(bits >> 32)
+		w.bytes[n+5] = byte(bits >> 40)
+		n += 6
+		if n >= bufferSize-8 {
+			_, w.err = w.w.Write(w.bytes[:bufferSize-8])
+			n = 0
+		}
+		w.nbytes = n
+	}
+
+}
+
+// Write the header of a dynamic Huffman block to the output stream.
+//
+//  numLiterals  The number of literals specified in codegen
+//  numOffsets   The number of offsets specified in codegen
+//  numCodegens  The number of codegens used in codegen
+func (w *huffmanBitWriter) writeDynamicHeader(numLiterals int, numOffsets int, numCodegens int, isEof bool) {
+	if w.err != nil {
+		return
+	}
+	var firstBits int32 = 4
+	if isEof {
+		firstBits = 5
+	}
+	w.writeBits(firstBits, 3)
+	w.writeBits(int32(numLiterals-257), 5)
+	w.writeBits(int32(numOffsets-1), 5)
+	w.writeBits(int32(numCodegens-4), 4)
+
+	for i := 0; i < numCodegens; i++ {
+		value := w.codegenEncoding.codes[codegenOrder[i]].bits()
+		w.writeBits(int32(value), 3)
+	}
+
+	i := 0
+	for {
+		var codeWord int = int(w.codegen[i])
+		i++
+		if codeWord == badCode {
+			break
+		}
+		// The low byte contains the actual code to generate.
+		w.writeCode(w.codegenEncoding.codes[uint32(codeWord)])
+
+		switch codeWord {
+		case 16:
+			w.writeBits(int32(w.codegen[i]), 2)
+			i++
+			break
+		case 17:
+			w.writeBits(int32(w.codegen[i]), 3)
+			i++
+			break
+		case 18:
+			w.writeBits(int32(w.codegen[i]), 7)
+			i++
+			break
+		}
+	}
+}
+
+func (w *huffmanBitWriter) writeStoredHeader(length int, isEof bool) {
+	if w.err != nil {
+		return
+	}
+	var flag int32
+	if isEof {
+		flag = 1
+	}
+	w.writeBits(flag, 3)
+	w.flush()
+	w.writeBits(int32(length), 16)
+	w.writeBits(int32(^uint16(length)), 16)
+}
+
+func (w *huffmanBitWriter) writeFixedHeader(isEof bool) {
+	if w.err != nil {
+		return
+	}
+	// Indicate that we are a fixed Huffman block
+	var value int32 = 2
+	if isEof {
+		value = 3
+	}
+	w.writeBits(value, 3)
+}
+
+func (w *huffmanBitWriter) writeBlock(tok tokens, eof bool, input []byte) {
+	if w.err != nil {
+		return
+	}
+	for i := range w.literalFreq {
+		w.literalFreq[i] = 0
+	}
+	for i := range w.offsetFreq {
+		w.offsetFreq[i] = 0
+	}
+
+	tok.tokens[tok.n] = endBlockMarker
+	tokens := tok.tokens[0 : tok.n+1]
+
+	for _, t := range tokens {
+		if t < matchType {
+			w.literalFreq[t.literal()]++
+		} else {
+			length := t.length()
+			offset := t.offset()
+			w.literalFreq[lengthCodesStart+lengthCode(length)]++
+			w.offsetFreq[offsetCode(offset)]++
+		}
+	}
+
+	// get the number of literals
+	numLiterals := len(w.literalFreq)
+	for w.literalFreq[numLiterals-1] == 0 {
+		numLiterals--
+	}
+	// get the number of offsets
+	numOffsets := len(w.offsetFreq)
+	for numOffsets > 0 && w.offsetFreq[numOffsets-1] == 0 {
+		numOffsets--
+	}
+	if numOffsets == 0 {
+		// We haven't found a single match. If we want to go with the dynamic encoding,
+		// we should count at least one offset to be sure that the offset huffman tree could be encoded.
+		w.offsetFreq[0] = 1
+		numOffsets = 1
+	}
+
+	w.literalEncoding.generate(w.literalFreq, 15)
+	w.offsetEncoding.generate(w.offsetFreq, 15)
+
+	storedBytes := 0
+	if input != nil {
+		storedBytes = len(input)
+	}
+	var extraBits int64
+	var storedSize int64 = math.MaxInt64
+	if storedBytes <= maxStoreBlockSize && input != nil {
+		storedSize = int64((storedBytes + 5) * 8)
+		// We only bother calculating the costs of the extra bits required by
+		// the length of offset fields (which will be the same for both fixed
+		// and dynamic encoding), if we need to compare those two encodings
+		// against stored encoding.
+		for lengthCode := lengthCodesStart + 8; lengthCode < numLiterals; lengthCode++ {
+			// First eight length codes have extra size = 0.
+			extraBits += int64(w.literalFreq[lengthCode]) * int64(lengthExtraBits[lengthCode-lengthCodesStart])
+		}
+		for offsetCode := 4; offsetCode < numOffsets; offsetCode++ {
+			// First four offset codes have extra size = 0.
+			extraBits += int64(w.offsetFreq[offsetCode]) * int64(offsetExtraBits[offsetCode])
+		}
+	}
+
+	// Figure out smallest code.
+	// Fixed Huffman baseline.
+	var size = int64(3) +
+		fixedLiteralEncoding.bitLength(w.literalFreq) +
+		fixedOffsetEncoding.bitLength(w.offsetFreq) +
+		extraBits
+	var literalEncoding = fixedLiteralEncoding
+	var offsetEncoding = fixedOffsetEncoding
+
+	// Dynamic Huffman?
+	var numCodegens int
+
+	// Generate codegen and codegenFrequencies, which indicates how to encode
+	// the literalEncoding and the offsetEncoding.
+	w.generateCodegen(numLiterals, numOffsets, w.offsetEncoding)
+	w.codegenEncoding.generate(w.codegenFreq, 7)
+	numCodegens = len(w.codegenFreq)
+	for numCodegens > 4 && w.codegenFreq[codegenOrder[numCodegens-1]] == 0 {
+		numCodegens--
+	}
+	dynamicHeader := int64(3+5+5+4+(3*numCodegens)) +
+		w.codegenEncoding.bitLength(w.codegenFreq) +
+		int64(extraBits) +
+		int64(w.codegenFreq[16]*2) +
+		int64(w.codegenFreq[17]*3) +
+		int64(w.codegenFreq[18]*7)
+	dynamicSize := dynamicHeader +
+		w.literalEncoding.bitLength(w.literalFreq) +
+		w.offsetEncoding.bitLength(w.offsetFreq)
+
+	if dynamicSize < size {
+		size = dynamicSize
+		literalEncoding = w.literalEncoding
+		offsetEncoding = w.offsetEncoding
+	}
+
+	// Stored bytes?
+	if storedSize < size {
+		w.writeStoredHeader(storedBytes, eof)
+		w.writeBytes(input[0:storedBytes])
+		return
+	}
+
+	// Huffman.
+	if literalEncoding == fixedLiteralEncoding {
+		w.writeFixedHeader(eof)
+	} else {
+		w.writeDynamicHeader(numLiterals, numOffsets, numCodegens, eof)
+	}
+
+	leCodes := literalEncoding.codes
+	oeCodes := offsetEncoding.codes
+	for _, t := range tokens {
+		if t < matchType {
+			w.writeCode(leCodes[t.literal()])
+		} else {
+			// Write the length
+			length := t.length()
+			lengthCode := lengthCode(length)
+			w.writeCode(leCodes[lengthCode+lengthCodesStart])
+			extraLengthBits := uint(lengthExtraBits[lengthCode])
+			if extraLengthBits > 0 {
+				extraLength := int32(length - lengthBase[lengthCode])
+				w.writeBits(extraLength, extraLengthBits)
+			}
+			// Write the offset
+			offset := t.offset()
+			offsetCode := offsetCode(offset)
+			w.writeCode(oeCodes[offsetCode])
+			extraOffsetBits := uint(offsetExtraBits[offsetCode])
+			if extraOffsetBits > 0 {
+				extraOffset := int32(offset - offsetBase[offsetCode])
+				w.writeBits(extraOffset, extraOffsetBits)
+			}
+		}
+	}
+}
+
+// writeBlockDynamic will write a block as dynamic Huffman table
+// compressed. This should be used, if the caller has a reasonable expectation
+// that this block contains compressible data.
+func (w *huffmanBitWriter) writeBlockDynamic(tok tokens, eof bool, input []byte) {
+	if w.err != nil {
+		return
+	}
+	for i := range w.literalFreq {
+		w.literalFreq[i] = 0
+	}
+	for i := range w.offsetFreq {
+		w.offsetFreq[i] = 0
+	}
+
+	tok.tokens[tok.n] = endBlockMarker
+	tokens := tok.tokens[0 : tok.n+1]
+
+	for _, t := range tokens {
+		if t < matchType {
+			w.literalFreq[t.literal()]++
+		} else {
+			length := t.length()
+			offset := t.offset()
+			w.literalFreq[lengthCodesStart+lengthCode(length)]++
+			w.offsetFreq[offsetCode(offset)]++
+		}
+	}
+
+	// get the number of literals
+	numLiterals := len(w.literalFreq)
+	for w.literalFreq[numLiterals-1] == 0 {
+		numLiterals--
+	}
+	// get the number of offsets
+	numOffsets := len(w.offsetFreq)
+	for numOffsets > 0 && w.offsetFreq[numOffsets-1] == 0 {
+		numOffsets--
+	}
+	if numOffsets == 0 {
+		// We haven't found a single match. If we want to go with the dynamic encoding,
+		// we should count at least one offset to be sure that the offset huffman tree could be encoded.
+		w.offsetFreq[0] = 1
+		numOffsets = 1
+	}
+
+	w.literalEncoding.generate(w.literalFreq, 15)
+	w.offsetEncoding.generate(w.offsetFreq, 15)
+
+	var numCodegens int
+
+	// Generate codegen and codegenFrequencies, which indicates how to encode
+	// the literalEncoding and the offsetEncoding.
+	w.generateCodegen(numLiterals, numOffsets, w.offsetEncoding)
+	w.codegenEncoding.generate(w.codegenFreq, 7)
+	numCodegens = len(w.codegenFreq)
+	for numCodegens > 4 && w.codegenFreq[codegenOrder[numCodegens-1]] == 0 {
+		numCodegens--
+	}
+	var literalEncoding = w.literalEncoding
+	var offsetEncoding = w.offsetEncoding
+
+	// Write Huffman table.
+	w.writeDynamicHeader(numLiterals, numOffsets, numCodegens, eof)
+	leCodes := literalEncoding.codes
+	oeCodes := offsetEncoding.codes
+
+	for _, t := range tokens {
+		if t < matchType {
+			w.writeCode(leCodes[t.literal()])
+		} else {
+			// Write the length
+			length := t.length()
+			lengthCode := lengthCode(length)
+			w.writeCode(leCodes[lengthCode+lengthCodesStart])
+			extraLengthBits := uint(lengthExtraBits[lengthCode])
+			if extraLengthBits > 0 {
+				extraLength := int32(length - lengthBase[lengthCode])
+				w.writeBits(extraLength, extraLengthBits)
+			}
+			// Write the offset
+			offset := t.offset()
+			offsetCode := offsetCode(offset)
+			w.writeCode(oeCodes[offsetCode])
+			extraOffsetBits := uint(offsetExtraBits[offsetCode])
+			if extraOffsetBits > 0 {
+				extraOffset := int32(offset - offsetBase[offsetCode])
+				w.writeBits(extraOffset, extraOffsetBits)
+			}
+		}
+	}
+}
+
+// static offset encoder used for huffman only encoding.
+var huffOffset *huffmanEncoder
+
+func init() {
+	var w = newHuffmanBitWriter(nil)
+	w.offsetFreq[0] = 1
+	huffOffset = newHuffmanEncoder(offsetCodeCount)
+	huffOffset.generate(w.offsetFreq, 15)
+}
+
+// writeBlockHuff will write a block of bytes as either
+// Huffman encoded literals or uncompressed bytes if the
+// results only gains very little from compression.
+func (w *huffmanBitWriter) writeBlockHuff(eof bool, input []byte) {
+	if w.err != nil {
+		return
+	}
+
+	// Clear histogram
+	for i := range w.literalFreq {
+		w.literalFreq[i] = 0
+	}
+
+	// Add everything as literals
+	histogram(input, w.literalFreq)
+
+	w.literalFreq[endBlockMarker] = 1
+
+	const numLiterals = endBlockMarker + 1
+	const numOffsets = 1
+
+	w.literalEncoding.generate(w.literalFreq, 15)
+
+	// Figure out smallest code.
+	// Always use dynamic Huffman or Store
+	var numCodegens int
+
+	// Generate codegen and codegenFrequencies, which indicates how to encode
+	// the literalEncoding and the offsetEncoding.
+	w.generateCodegen(numLiterals, numOffsets, huffOffset)
+	w.codegenEncoding.generate(w.codegenFreq, 7)
+	numCodegens = len(w.codegenFreq)
+	for numCodegens > 4 && w.codegenFreq[codegenOrder[numCodegens-1]] == 0 {
+		numCodegens--
+	}
+	headerSize := int64(3+5+5+4+(3*numCodegens)) +
+		w.codegenEncoding.bitLength(w.codegenFreq) +
+		int64(w.codegenFreq[16]*2) +
+		int64(w.codegenFreq[17]*3) +
+		int64(w.codegenFreq[18]*7)
+
+	// Includes EOB marker
+	size := headerSize + w.literalEncoding.bitLength(w.literalFreq)
+
+	// Calculate stored size
+	var storedSize int64 = math.MaxInt64
+	var storedBytes = len(input)
+	if storedBytes <= maxStoreBlockSize {
+		storedSize = int64(storedBytes+5) * 8
+	}
+
+	// Store bytes, if we don't get a reasonable improvement.
+	if storedSize < (size + size>>4) {
+		w.writeStoredHeader(storedBytes, eof)
+		w.writeBytes(input)
+		return
+	}
+
+	// Huffman.
+	w.writeDynamicHeader(numLiterals, numOffsets, numCodegens, eof)
+	encoding := w.literalEncoding.codes
+	for _, t := range input {
+		// Bitwriting inlined, ~30% speedup
+		c := encoding[t]
+		w.bits |= uint64(c.code()) << w.nbits
+		w.nbits += c.bits()
+		if w.nbits >= 48 {
+			bits := w.bits
+			w.bits >>= 48
+			w.nbits -= 48
+			n := w.nbytes
+			w.bytes[n] = byte(bits)
+			w.bytes[n+1] = byte(bits >> 8)
+			w.bytes[n+2] = byte(bits >> 16)
+			w.bytes[n+3] = byte(bits >> 24)
+			w.bytes[n+4] = byte(bits >> 32)
+			w.bytes[n+5] = byte(bits >> 40)
+			n += 6
+			if n >= bufferSize-8 {
+				_, w.err = w.w.Write(w.bytes[:bufferSize-8])
+				if w.err != nil {
+					return
+				}
+				w.nbytes = 0
+			} else {
+				w.nbytes = n
+			}
+		}
+	}
+	w.writeCode(encoding[endBlockMarker])
+}
diff --git a/vendor/github.com/klauspost/compress/flate/huffman_code.go b/vendor/github.com/klauspost/compress/flate/huffman_code.go
new file mode 100644
index 0000000000..9dba0faf33
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/huffman_code.go
@@ -0,0 +1,363 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+import (
+	"math"
+	"sort"
+)
+
+type hcode uint32
+
+type huffmanEncoder struct {
+	codes     []hcode
+	freqcache []literalNode
+	bitCount  [17]int32
+	lns       literalNodeSorter
+	lfs       literalFreqSorter
+}
+
+type literalNode struct {
+	literal uint16
+	freq    int32
+}
+
+// A levelInfo describes the state of the constructed tree for a given depth.
+type levelInfo struct {
+	// Our level.  for better printing
+	level int32
+
+	// The frequency of the last node at this level
+	lastFreq int32
+
+	// The frequency of the next character to add to this level
+	nextCharFreq int32
+
+	// The frequency of the next pair (from level below) to add to this level.
+	// Only valid if the "needed" value of the next lower level is 0.
+	nextPairFreq int32
+
+	// The number of chains remaining to generate for this level before moving
+	// up to the next level
+	needed int32
+}
+
+func (h hcode) codeBits() (code uint16, bits uint8) {
+	return uint16(h), uint8(h >> 16)
+}
+
+func (h *hcode) set(code uint16, bits uint8) {
+	*h = hcode(code) | hcode(uint32(bits)<<16)
+}
+
+func (h *hcode) setBits(bits uint8) {
+	*h = hcode(*h&0xffff) | hcode(uint32(bits)<<16)
+}
+
+func toCode(code uint16, bits uint8) hcode {
+	return hcode(code) | hcode(uint32(bits)<<16)
+}
+
+func (h hcode) code() (code uint16) {
+	return uint16(h)
+}
+
+func (h hcode) bits() (bits uint) {
+	return uint(h >> 16)
+}
+
+func maxNode() literalNode { return literalNode{math.MaxUint16, math.MaxInt32} }
+
+func newHuffmanEncoder(size int) *huffmanEncoder {
+	return &huffmanEncoder{codes: make([]hcode, size), freqcache: nil}
+}
+
+// Generates a HuffmanCode corresponding to the fixed literal table
+func generateFixedLiteralEncoding() *huffmanEncoder {
+	h := newHuffmanEncoder(maxNumLit)
+	codes := h.codes
+	var ch uint16
+	for ch = 0; ch < maxNumLit; ch++ {
+		var bits uint16
+		var size uint8
+		switch {
+		case ch < 144:
+			// size 8, 000110000  .. 10111111
+			bits = ch + 48
+			size = 8
+			break
+		case ch < 256:
+			// size 9, 110010000 .. 111111111
+			bits = ch + 400 - 144
+			size = 9
+			break
+		case ch < 280:
+			// size 7, 0000000 .. 0010111
+			bits = ch - 256
+			size = 7
+			break
+		default:
+			// size 8, 11000000 .. 11000111
+			bits = ch + 192 - 280
+			size = 8
+		}
+		codes[ch] = toCode(reverseBits(bits, size), size)
+	}
+	return h
+}
+
+func generateFixedOffsetEncoding() *huffmanEncoder {
+	h := newHuffmanEncoder(30)
+	codes := h.codes
+	for ch := uint16(0); ch < 30; ch++ {
+		codes[ch] = toCode(reverseBits(ch, 5), 5)
+	}
+	return h
+}
+
+var fixedLiteralEncoding *huffmanEncoder = generateFixedLiteralEncoding()
+var fixedOffsetEncoding *huffmanEncoder = generateFixedOffsetEncoding()
+
+func (h *huffmanEncoder) bitLength(freq []int32) int64 {
+	var total int64
+	for i, f := range freq {
+		if f != 0 {
+			total += int64(f) * int64(h.codes[i].bits())
+		}
+	}
+	return total
+}
+
+const maxBitsLimit = 16
+
+// Return the number of literals assigned to each bit size in the Huffman encoding
+//
+// This method is only called when list.length >= 3
+// The cases of 0, 1, and 2 literals are handled by special case code.
+//
+// list  An array of the literals with non-zero frequencies
+//             and their associated frequencies.  The array is in order of increasing
+//             frequency, and has as its last element a special element with frequency
+//             MaxInt32
+// maxBits     The maximum number of bits that should be used to encode any literal.
+//             Must be less than 16.
+// return      An integer array in which array[i] indicates the number of literals
+//             that should be encoded in i bits.
+func (h *huffmanEncoder) bitCounts(list []literalNode, maxBits int32) []int32 {
+	if maxBits >= maxBitsLimit {
+		panic("flate: maxBits too large")
+	}
+	n := int32(len(list))
+	list = list[0 : n+1]
+	list[n] = maxNode()
+
+	// The tree can't have greater depth than n - 1, no matter what.  This
+	// saves a little bit of work in some small cases
+	if maxBits > n-1 {
+		maxBits = n - 1
+	}
+
+	// Create information about each of the levels.
+	// A bogus "Level 0" whose sole purpose is so that
+	// level1.prev.needed==0.  This makes level1.nextPairFreq
+	// be a legitimate value that never gets chosen.
+	var levels [maxBitsLimit]levelInfo
+	// leafCounts[i] counts the number of literals at the left
+	// of ancestors of the rightmost node at level i.
+	// leafCounts[i][j] is the number of literals at the left
+	// of the level j ancestor.
+	var leafCounts [maxBitsLimit][maxBitsLimit]int32
+
+	for level := int32(1); level <= maxBits; level++ {
+		// For every level, the first two items are the first two characters.
+		// We initialize the levels as if we had already figured this out.
+		levels[level] = levelInfo{
+			level:        level,
+			lastFreq:     list[1].freq,
+			nextCharFreq: list[2].freq,
+			nextPairFreq: list[0].freq + list[1].freq,
+		}
+		leafCounts[level][level] = 2
+		if level == 1 {
+			levels[level].nextPairFreq = math.MaxInt32
+		}
+	}
+
+	// We need a total of 2*n - 2 items at top level and have already generated 2.
+	levels[maxBits].needed = 2*n - 4
+
+	level := maxBits
+	for {
+		l := &levels[level]
+		if l.nextPairFreq == math.MaxInt32 && l.nextCharFreq == math.MaxInt32 {
+			// We've run out of both leafs and pairs.
+			// End all calculations for this level.
+			// To make sure we never come back to this level or any lower level,
+			// set nextPairFreq impossibly large.
+			l.needed = 0
+			levels[level+1].nextPairFreq = math.MaxInt32
+			level++
+			continue
+		}
+
+		prevFreq := l.lastFreq
+		if l.nextCharFreq < l.nextPairFreq {
+			// The next item on this row is a leaf node.
+			n := leafCounts[level][level] + 1
+			l.lastFreq = l.nextCharFreq
+			// Lower leafCounts are the same of the previous node.
+			leafCounts[level][level] = n
+			l.nextCharFreq = list[n].freq
+		} else {
+			// The next item on this row is a pair from the previous row.
+			// nextPairFreq isn't valid until we generate two
+			// more values in the level below
+			l.lastFreq = l.nextPairFreq
+			// Take leaf counts from the lower level, except counts[level] remains the same.
+			copy(leafCounts[level][:level], leafCounts[level-1][:level])
+			levels[l.level-1].needed = 2
+		}
+
+		if l.needed--; l.needed == 0 {
+			// We've done everything we need to do for this level.
+			// Continue calculating one level up.  Fill in nextPairFreq
+			// of that level with the sum of the two nodes we've just calculated on
+			// this level.
+			if l.level == maxBits {
+				// All done!
+				break
+			}
+			levels[l.level+1].nextPairFreq = prevFreq + l.lastFreq
+			level++
+		} else {
+			// If we stole from below, move down temporarily to replenish it.
+			for levels[level-1].needed > 0 {
+				level--
+			}
+		}
+	}
+
+	// Somethings is wrong if at the end, the top level is null or hasn't used
+	// all of the leaves.
+	if leafCounts[maxBits][maxBits] != n {
+		panic("leafCounts[maxBits][maxBits] != n")
+	}
+
+	bitCount := h.bitCount[:maxBits+1]
+	//make([]int32, maxBits+1)
+	bits := 1
+	counts := &leafCounts[maxBits]
+	for level := maxBits; level > 0; level-- {
+		// chain.leafCount gives the number of literals requiring at least "bits"
+		// bits to encode.
+		bitCount[bits] = counts[level] - counts[level-1]
+		bits++
+	}
+	return bitCount
+}
+
+// Look at the leaves and assign them a bit count and an encoding as specified
+// in RFC 1951 3.2.2
+func (h *huffmanEncoder) assignEncodingAndSize(bitCount []int32, list []literalNode) {
+	code := uint16(0)
+	for n, bits := range bitCount {
+		code <<= 1
+		if n == 0 || bits == 0 {
+			continue
+		}
+		// The literals list[len(list)-bits] .. list[len(list)-bits]
+		// are encoded using "bits" bits, and get the values
+		// code, code + 1, ....  The code values are
+		// assigned in literal order (not frequency order).
+		chunk := list[len(list)-int(bits):]
+
+		h.lns.Sort(chunk)
+		for _, node := range chunk {
+			h.codes[node.literal] = toCode(reverseBits(code, uint8(n)), uint8(n))
+			code++
+		}
+		list = list[0 : len(list)-int(bits)]
+	}
+}
+
+// Update this Huffman Code object to be the minimum code for the specified frequency count.
+//
+// freq  An array of frequencies, in which frequency[i] gives the frequency of literal i.
+// maxBits  The maximum number of bits to use for any literal.
+func (h *huffmanEncoder) generate(freq []int32, maxBits int32) {
+	if h.freqcache == nil {
+		h.freqcache = make([]literalNode, 300)
+	}
+	list := h.freqcache[:len(freq)+1]
+	// Number of non-zero literals
+	count := 0
+	// Set list to be the set of all non-zero literals and their frequencies
+	for i, f := range freq {
+		if f != 0 {
+			list[count] = literalNode{uint16(i), f}
+			count++
+		} else {
+			list[count] = literalNode{}
+			//h.codeBits[i] = 0
+			h.codes[i].setBits(0)
+		}
+	}
+	list[len(freq)] = literalNode{}
+	// If freq[] is shorter than codeBits[], fill rest of codeBits[] with zeros
+	// FIXME: Doesn't do what it says on the tin (klauspost)
+	//h.codeBits = h.codeBits[0:len(freq)]
+
+	list = list[0:count]
+	if count <= 2 {
+		// Handle the small cases here, because they are awkward for the general case code.  With
+		// two or fewer literals, everything has bit length 1.
+		for i, node := range list {
+			// "list" is in order of increasing literal value.
+			h.codes[node.literal].set(uint16(i), 1)
+			//h.codeBits[node.literal] = 1
+			//h.code[node.literal] = uint16(i)
+		}
+		return
+	}
+	h.lfs.Sort(list)
+
+	// Get the number of literals for each bit count
+	bitCount := h.bitCounts(list, maxBits)
+	// And do the assignment
+	h.assignEncodingAndSize(bitCount, list)
+}
+
+type literalNodeSorter []literalNode
+
+func (s *literalNodeSorter) Sort(a []literalNode) {
+	*s = literalNodeSorter(a)
+	sort.Sort(s)
+}
+
+func (s literalNodeSorter) Len() int { return len(s) }
+
+func (s literalNodeSorter) Less(i, j int) bool {
+	return s[i].literal < s[j].literal
+}
+
+func (s literalNodeSorter) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+
+type literalFreqSorter []literalNode
+
+func (s *literalFreqSorter) Sort(a []literalNode) {
+	*s = literalFreqSorter(a)
+	sort.Sort(s)
+}
+
+func (s literalFreqSorter) Len() int { return len(s) }
+
+func (s literalFreqSorter) Less(i, j int) bool {
+	if s[i].freq == s[j].freq {
+		return s[i].literal < s[j].literal
+	}
+	return s[i].freq < s[j].freq
+}
+
+func (s literalFreqSorter) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
diff --git a/vendor/github.com/klauspost/compress/flate/inflate.go b/vendor/github.com/klauspost/compress/flate/inflate.go
new file mode 100644
index 0000000000..91e27e7e28
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/inflate.go
@@ -0,0 +1,846 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:generate go run gen.go -output fixedhuff.go
+
+// Package flate implements the DEFLATE compressed data format, described in
+// RFC 1951.  The gzip and zlib packages implement access to DEFLATE-based file
+// formats.
+package flate
+
+import (
+	"bufio"
+	"io"
+	"strconv"
+)
+
+const (
+	maxCodeLen = 16    // max length of Huffman code
+	maxHist    = 32768 // max history required
+	// The next three numbers come from the RFC section 3.2.7, with the
+	// additional proviso in section 3.2.5 which implies that distance codes
+	// 30 and 31 should never occur in compressed data.
+	maxNumLit  = 286
+	maxNumDist = 30
+	numCodes   = 19 // number of codes in Huffman meta-code
+)
+
+// A CorruptInputError reports the presence of corrupt input at a given offset.
+type CorruptInputError int64
+
+func (e CorruptInputError) Error() string {
+	return "flate: corrupt input before offset " + strconv.FormatInt(int64(e), 10)
+}
+
+// An InternalError reports an error in the flate code itself.
+type InternalError string
+
+func (e InternalError) Error() string { return "flate: internal error: " + string(e) }
+
+// A ReadError reports an error encountered while reading input.
+type ReadError struct {
+	Offset int64 // byte offset where error occurred
+	Err    error // error returned by underlying Read
+}
+
+func (e *ReadError) Error() string {
+	return "flate: read error at offset " + strconv.FormatInt(e.Offset, 10) + ": " + e.Err.Error()
+}
+
+// A WriteError reports an error encountered while writing output.
+type WriteError struct {
+	Offset int64 // byte offset where error occurred
+	Err    error // error returned by underlying Write
+}
+
+func (e *WriteError) Error() string {
+	return "flate: write error at offset " + strconv.FormatInt(e.Offset, 10) + ": " + e.Err.Error()
+}
+
+// Resetter resets a ReadCloser returned by NewReader or NewReaderDict to
+// to switch to a new underlying Reader. This permits reusing a ReadCloser
+// instead of allocating a new one.
+type Resetter interface {
+	// Reset discards any buffered data and resets the Resetter as if it was
+	// newly initialized with the given reader.
+	Reset(r io.Reader, dict []byte) error
+}
+
+// Note that much of the implementation of huffmanDecoder is also copied
+// into gen.go (in package main) for the purpose of precomputing the
+// fixed huffman tables so they can be included statically.
+
+// The data structure for decoding Huffman tables is based on that of
+// zlib. There is a lookup table of a fixed bit width (huffmanChunkBits),
+// For codes smaller than the table width, there are multiple entries
+// (each combination of trailing bits has the same value). For codes
+// larger than the table width, the table contains a link to an overflow
+// table. The width of each entry in the link table is the maximum code
+// size minus the chunk width.
+
+// Note that you can do a lookup in the table even without all bits
+// filled. Since the extra bits are zero, and the DEFLATE Huffman codes
+// have the property that shorter codes come before longer ones, the
+// bit length estimate in the result is a lower bound on the actual
+// number of bits.
+
+// chunk & 15 is number of bits
+// chunk >> 4 is value, including table link
+
+const (
+	huffmanChunkBits  = 9
+	huffmanNumChunks  = 1 << huffmanChunkBits
+	huffmanCountMask  = 15
+	huffmanValueShift = 4
+)
+
+type huffmanDecoder struct {
+	min      int                      // the minimum code length
+	chunks   [huffmanNumChunks]uint32 // chunks as described above
+	links    [][]uint32               // overflow links
+	linkMask uint32                   // mask the width of the link table
+}
+
+// Initialize Huffman decoding tables from array of code lengths.
+// Following this function, h is guaranteed to be initialized into a complete
+// tree (i.e., neither over-subscribed nor under-subscribed). The exception is a
+// degenerate case where the tree has only a single symbol with length 1. Empty
+// trees are permitted.
+func (h *huffmanDecoder) init(bits []int) bool {
+	// Sanity enables additional runtime tests during Huffman
+	// table construction.  It's intended to be used during
+	// development to supplement the currently ad-hoc unit tests.
+	const sanity = false
+
+	if h.min != 0 {
+		*h = huffmanDecoder{}
+	}
+
+	// Count number of codes of each length,
+	// compute min and max length.
+	var count [maxCodeLen]int
+	var min, max int
+	for _, n := range bits {
+		if n == 0 {
+			continue
+		}
+		if min == 0 || n < min {
+			min = n
+		}
+		if n > max {
+			max = n
+		}
+		count[n]++
+	}
+
+	// Empty tree. The decompressor.huffSym function will fail later if the tree
+	// is used. Technically, an empty tree is only valid for the HDIST tree and
+	// not the HCLEN and HLIT tree. However, a stream with an empty HCLEN tree
+	// is guaranteed to fail since it will attempt to use the tree to decode the
+	// codes for the HLIT and HDIST trees. Similarly, an empty HLIT tree is
+	// guaranteed to fail later since the compressed data section must be
+	// composed of at least one symbol (the end-of-block marker).
+	if max == 0 {
+		return true
+	}
+
+	code := 0
+	var nextcode [maxCodeLen]int
+	for i := min; i <= max; i++ {
+		code <<= 1
+		nextcode[i] = code
+		code += count[i]
+	}
+
+	// Check that the coding is complete (i.e., that we've
+	// assigned all 2-to-the-max possible bit sequences).
+	// Exception: To be compatible with zlib, we also need to
+	// accept degenerate single-code codings.  See also
+	// TestDegenerateHuffmanCoding.
+	if code != 1<<uint(max) && !(code == 1 && max == 1) {
+		return false
+	}
+
+	h.min = min
+	if max > huffmanChunkBits {
+		numLinks := 1 << (uint(max) - huffmanChunkBits)
+		h.linkMask = uint32(numLinks - 1)
+
+		// create link tables
+		link := nextcode[huffmanChunkBits+1] >> 1
+		h.links = make([][]uint32, huffmanNumChunks-link)
+		for j := uint(link); j < huffmanNumChunks; j++ {
+			reverse := int(reverseByte[j>>8]) | int(reverseByte[j&0xff])<<8
+			reverse >>= uint(16 - huffmanChunkBits)
+			off := j - uint(link)
+			if sanity && h.chunks[reverse] != 0 {
+				panic("impossible: overwriting existing chunk")
+			}
+			h.chunks[reverse] = uint32(off<<huffmanValueShift | (huffmanChunkBits + 1))
+			h.links[off] = make([]uint32, numLinks)
+		}
+	}
+
+	for i, n := range bits {
+		if n == 0 {
+			continue
+		}
+		code := nextcode[n]
+		nextcode[n]++
+		chunk := uint32(i<<huffmanValueShift | n)
+		reverse := int(reverseByte[code>>8]) | int(reverseByte[code&0xff])<<8
+		reverse >>= uint(16 - n)
+		if n <= huffmanChunkBits {
+			for off := reverse; off < len(h.chunks); off += 1 << uint(n) {
+				// We should never need to overwrite
+				// an existing chunk.  Also, 0 is
+				// never a valid chunk, because the
+				// lower 4 "count" bits should be
+				// between 1 and 15.
+				if sanity && h.chunks[off] != 0 {
+					panic("impossible: overwriting existing chunk")
+				}
+				h.chunks[off] = chunk
+			}
+		} else {
+			j := reverse & (huffmanNumChunks - 1)
+			if sanity && h.chunks[j]&huffmanCountMask != huffmanChunkBits+1 {
+				// Longer codes should have been
+				// associated with a link table above.
+				panic("impossible: not an indirect chunk")
+			}
+			value := h.chunks[j] >> huffmanValueShift
+			linktab := h.links[value]
+			reverse >>= huffmanChunkBits
+			for off := reverse; off < len(linktab); off += 1 << uint(n-huffmanChunkBits) {
+				if sanity && linktab[off] != 0 {
+					panic("impossible: overwriting existing chunk")
+				}
+				linktab[off] = chunk
+			}
+		}
+	}
+
+	if sanity {
+		// Above we've sanity checked that we never overwrote
+		// an existing entry.  Here we additionally check that
+		// we filled the tables completely.
+		for i, chunk := range h.chunks {
+			if chunk == 0 {
+				// As an exception, in the degenerate
+				// single-code case, we allow odd
+				// chunks to be missing.
+				if code == 1 && i%2 == 1 {
+					continue
+				}
+				panic("impossible: missing chunk")
+			}
+		}
+		for _, linktab := range h.links {
+			for _, chunk := range linktab {
+				if chunk == 0 {
+					panic("impossible: missing chunk")
+				}
+			}
+		}
+	}
+
+	return true
+}
+
+// The actual read interface needed by NewReader.
+// If the passed in io.Reader does not also have ReadByte,
+// the NewReader will introduce its own buffering.
+type Reader interface {
+	io.Reader
+	io.ByteReader
+}
+
+// Decompress state.
+type decompressor struct {
+	// Input source.
+	r       Reader
+	roffset int64
+	woffset int64
+
+	// Input bits, in top of b.
+	b  uint32
+	nb uint
+
+	// Huffman decoders for literal/length, distance.
+	h1, h2 huffmanDecoder
+
+	// Length arrays used to define Huffman codes.
+	bits     *[maxNumLit + maxNumDist]int
+	codebits *[numCodes]int
+
+	// Output history, buffer.
+	hist  *[maxHist]byte
+	hp    int  // current output position in buffer
+	hw    int  // have written hist[0:hw] already
+	hfull bool // buffer has filled at least once
+
+	// Temporary buffer (avoids repeated allocation).
+	buf [4]byte
+
+	// Next step in the decompression,
+	// and decompression state.
+	step     func(*decompressor)
+	final    bool
+	err      error
+	toRead   []byte
+	hl, hd   *huffmanDecoder
+	copyLen  int
+	copyDist int
+}
+
+func (f *decompressor) nextBlock() {
+	if f.final {
+		if f.hw != f.hp {
+			f.flush((*decompressor).nextBlock)
+			return
+		}
+		f.err = io.EOF
+		return
+	}
+	for f.nb < 1+2 {
+		if f.err = f.moreBits(); f.err != nil {
+			return
+		}
+	}
+	f.final = f.b&1 == 1
+	f.b >>= 1
+	typ := f.b & 3
+	f.b >>= 2
+	f.nb -= 1 + 2
+	switch typ {
+	case 0:
+		f.dataBlock()
+	case 1:
+		// compressed, fixed Huffman tables
+		f.hl = &fixedHuffmanDecoder
+		f.hd = nil
+		f.huffmanBlock()
+	case 2:
+		// compressed, dynamic Huffman tables
+		if f.err = f.readHuffman(); f.err != nil {
+			break
+		}
+		f.hl = &f.h1
+		f.hd = &f.h2
+		f.huffmanBlock()
+	default:
+		// 3 is reserved.
+		f.err = CorruptInputError(f.roffset)
+	}
+}
+
+func (f *decompressor) Read(b []byte) (int, error) {
+	for {
+		if len(f.toRead) > 0 {
+			n := copy(b, f.toRead)
+			f.toRead = f.toRead[n:]
+			return n, nil
+		}
+		if f.err != nil {
+			return 0, f.err
+		}
+		f.step(f)
+	}
+}
+
+// Support the io.WriteTo interface for io.Copy and friends.
+func (f *decompressor) WriteTo(w io.Writer) (int64, error) {
+	total := int64(0)
+	for {
+		if f.err != nil {
+			if f.err == io.EOF {
+				return total, nil
+			}
+			return total, f.err
+		}
+		if len(f.toRead) > 0 {
+			var n int
+			n, f.err = w.Write(f.toRead)
+			if f.err != nil {
+				return total, f.err
+			}
+			if n != len(f.toRead) {
+				return total, io.ErrShortWrite
+			}
+			f.toRead = f.toRead[:0]
+			total += int64(n)
+		}
+		f.step(f)
+	}
+}
+
+func (f *decompressor) Close() error {
+	if f.err == io.EOF {
+		return nil
+	}
+	return f.err
+}
+
+// RFC 1951 section 3.2.7.
+// Compression with dynamic Huffman codes
+
+var codeOrder = [...]int{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}
+
+func (f *decompressor) readHuffman() error {
+	// HLIT[5], HDIST[5], HCLEN[4].
+	for f.nb < 5+5+4 {
+		if err := f.moreBits(); err != nil {
+			return err
+		}
+	}
+	nlit := int(f.b&0x1F) + 257
+	if nlit > maxNumLit {
+		return CorruptInputError(f.roffset)
+	}
+	f.b >>= 5
+	ndist := int(f.b&0x1F) + 1
+	if ndist > maxNumDist {
+		return CorruptInputError(f.roffset)
+	}
+	f.b >>= 5
+	nclen := int(f.b&0xF) + 4
+	// numCodes is 19, so nclen is always valid.
+	f.b >>= 4
+	f.nb -= 5 + 5 + 4
+
+	// (HCLEN+4)*3 bits: code lengths in the magic codeOrder order.
+	for i := 0; i < nclen; i++ {
+		for f.nb < 3 {
+			if err := f.moreBits(); err != nil {
+				return err
+			}
+		}
+		f.codebits[codeOrder[i]] = int(f.b & 0x7)
+		f.b >>= 3
+		f.nb -= 3
+	}
+	for i := nclen; i < len(codeOrder); i++ {
+		f.codebits[codeOrder[i]] = 0
+	}
+	if !f.h1.init(f.codebits[0:]) {
+		return CorruptInputError(f.roffset)
+	}
+
+	// HLIT + 257 code lengths, HDIST + 1 code lengths,
+	// using the code length Huffman code.
+	for i, n := 0, nlit+ndist; i < n; {
+		x, err := f.huffSym(&f.h1)
+		if err != nil {
+			return err
+		}
+		if x < 16 {
+			// Actual length.
+			f.bits[i] = x
+			i++
+			continue
+		}
+		// Repeat previous length or zero.
+		var rep int
+		var nb uint
+		var b int
+		switch x {
+		default:
+			return InternalError("unexpected length code")
+		case 16:
+			rep = 3
+			nb = 2
+			if i == 0 {
+				return CorruptInputError(f.roffset)
+			}
+			b = f.bits[i-1]
+		case 17:
+			rep = 3
+			nb = 3
+			b = 0
+		case 18:
+			rep = 11
+			nb = 7
+			b = 0
+		}
+		for f.nb < nb {
+			if err := f.moreBits(); err != nil {
+				return err
+			}
+		}
+		rep += int(f.b & uint32(1<<nb-1))
+		f.b >>= nb
+		f.nb -= nb
+		if i+rep > n {
+			return CorruptInputError(f.roffset)
+		}
+		for j := 0; j < rep; j++ {
+			f.bits[i] = b
+			i++
+		}
+	}
+
+	if !f.h1.init(f.bits[0:nlit]) || !f.h2.init(f.bits[nlit:nlit+ndist]) {
+		return CorruptInputError(f.roffset)
+	}
+
+	// In order to preserve the property that we never read any extra bytes
+	// after the end of the DEFLATE stream, huffSym conservatively reads min
+	// bits at a time until it decodes the symbol. However, since every block
+	// must end with an EOB marker, we can use that as the minimum number of
+	// bits to read and guarantee we never read past the end of the stream.
+	if f.bits[endBlockMarker] > 0 {
+		f.h1.min = f.bits[endBlockMarker] // Length of EOB marker
+	}
+
+	return nil
+}
+
+// Decode a single Huffman block from f.
+// hl and hd are the Huffman states for the lit/length values
+// and the distance values, respectively.  If hd == nil, using the
+// fixed distance encoding associated with fixed Huffman blocks.
+func (f *decompressor) huffmanBlock() {
+	for {
+		v, err := f.huffSym(f.hl)
+		if err != nil {
+			f.err = err
+			return
+		}
+		var n uint // number of bits extra
+		var length int
+		switch {
+		case v < 256:
+			f.hist[f.hp] = byte(v)
+			f.hp++
+			if f.hp == len(f.hist) {
+				// After the flush, continue this loop.
+				f.flush((*decompressor).huffmanBlock)
+				return
+			}
+			continue
+		case v == 256:
+			// Done with huffman block; read next block.
+			f.step = (*decompressor).nextBlock
+			return
+		// otherwise, reference to older data
+		case v < 265:
+			length = v - (257 - 3)
+			n = 0
+		case v < 269:
+			length = v*2 - (265*2 - 11)
+			n = 1
+		case v < 273:
+			length = v*4 - (269*4 - 19)
+			n = 2
+		case v < 277:
+			length = v*8 - (273*8 - 35)
+			n = 3
+		case v < 281:
+			length = v*16 - (277*16 - 67)
+			n = 4
+		case v < 285:
+			length = v*32 - (281*32 - 131)
+			n = 5
+		case v < maxNumLit:
+			length = 258
+			n = 0
+		default:
+			f.err = CorruptInputError(f.roffset)
+			return
+		}
+		if n > 0 {
+			for f.nb < n {
+				if err = f.moreBits(); err != nil {
+					f.err = err
+					return
+				}
+			}
+			length += int(f.b & uint32(1<<n-1))
+			f.b >>= n
+			f.nb -= n
+		}
+
+		var dist int
+		if f.hd == nil {
+			for f.nb < 5 {
+				if err = f.moreBits(); err != nil {
+					f.err = err
+					return
+				}
+			}
+			dist = int(reverseByte[(f.b&0x1F)<<3])
+			f.b >>= 5
+			f.nb -= 5
+		} else {
+			if dist, err = f.huffSym(f.hd); err != nil {
+				f.err = err
+				return
+			}
+		}
+
+		switch {
+		case dist < 4:
+			dist++
+		case dist < maxNumDist:
+			nb := uint(dist-2) >> 1
+			// have 1 bit in bottom of dist, need nb more.
+			extra := (dist & 1) << nb
+			for f.nb < nb {
+				if err = f.moreBits(); err != nil {
+					f.err = err
+					return
+				}
+			}
+			extra |= int(f.b & uint32(1<<nb-1))
+			f.b >>= nb
+			f.nb -= nb
+			dist = 1<<(nb+1) + 1 + extra
+		default:
+			f.err = CorruptInputError(f.roffset)
+			return
+		}
+
+		// Copy history[-dist:-dist+length] into output.
+		if dist > len(f.hist) {
+			f.err = InternalError("bad history distance")
+			return
+		}
+
+		// No check on length; encoding can be prescient.
+		if !f.hfull && dist > f.hp {
+			f.err = CorruptInputError(f.roffset)
+			return
+		}
+
+		f.copyLen, f.copyDist = length, dist
+		if f.copyHist() {
+			return
+		}
+	}
+}
+
+// copyHist copies f.copyLen bytes from f.hist (f.copyDist bytes ago) to itself.
+// It reports whether the f.hist buffer is full.
+func (f *decompressor) copyHist() bool {
+	p := f.hp - f.copyDist
+	if p < 0 {
+		p += len(f.hist)
+	}
+	for f.copyLen > 0 {
+		n := f.copyLen
+		if x := len(f.hist) - f.hp; n > x {
+			n = x
+		}
+		if x := len(f.hist) - p; n > x {
+			n = x
+		}
+		forwardCopy(f.hist[:], f.hp, p, n)
+		p += n
+		f.hp += n
+		f.copyLen -= n
+		if f.hp == len(f.hist) {
+			// After flush continue copying out of history.
+			f.flush((*decompressor).copyHuff)
+			return true
+		}
+		if p == len(f.hist) {
+			p = 0
+		}
+	}
+	return false
+}
+
+func (f *decompressor) copyHuff() {
+	if f.copyHist() {
+		return
+	}
+	f.huffmanBlock()
+}
+
+// Copy a single uncompressed data block from input to output.
+func (f *decompressor) dataBlock() {
+	// Uncompressed.
+	// Discard current half-byte.
+	f.nb = 0
+	f.b = 0
+
+	// Length then ones-complement of length.
+	nr, err := io.ReadFull(f.r, f.buf[0:4])
+	f.roffset += int64(nr)
+	if err != nil {
+		f.err = &ReadError{f.roffset, err}
+		return
+	}
+	n := int(f.buf[0]) | int(f.buf[1])<<8
+	nn := int(f.buf[2]) | int(f.buf[3])<<8
+	if uint16(nn) != uint16(^n) {
+		f.err = CorruptInputError(f.roffset)
+		return
+	}
+
+	if n == 0 {
+		// 0-length block means sync
+		f.flush((*decompressor).nextBlock)
+		return
+	}
+
+	f.copyLen = n
+	f.copyData()
+}
+
+// copyData copies f.copyLen bytes from the underlying reader into f.hist.
+// It pauses for reads when f.hist is full.
+func (f *decompressor) copyData() {
+	n := f.copyLen
+	for n > 0 {
+		m := len(f.hist) - f.hp
+		if m > n {
+			m = n
+		}
+		m, err := io.ReadFull(f.r, f.hist[f.hp:f.hp+m])
+		f.roffset += int64(m)
+		if err != nil {
+			f.err = &ReadError{f.roffset, err}
+			return
+		}
+		n -= m
+		f.hp += m
+		if f.hp == len(f.hist) {
+			f.copyLen = n
+			f.flush((*decompressor).copyData)
+			return
+		}
+	}
+	f.step = (*decompressor).nextBlock
+}
+
+func (f *decompressor) setDict(dict []byte) {
+	if len(dict) > len(f.hist) {
+		// Will only remember the tail.
+		dict = dict[len(dict)-len(f.hist):]
+	}
+
+	f.hp = copy(f.hist[:], dict)
+	if f.hp == len(f.hist) {
+		f.hp = 0
+		f.hfull = true
+	}
+	f.hw = f.hp
+}
+
+func (f *decompressor) moreBits() error {
+	c, err := f.r.ReadByte()
+	if err != nil {
+		if err == io.EOF {
+			err = io.ErrUnexpectedEOF
+		}
+		return err
+	}
+	f.roffset++
+	f.b |= uint32(c) << f.nb
+	f.nb += 8
+	return nil
+}
+
+// Read the next Huffman-encoded symbol from f according to h.
+func (f *decompressor) huffSym(h *huffmanDecoder) (int, error) {
+	// Since a huffmanDecoder can be empty or be composed of a degenerate tree
+	// with single element, huffSym must error on these two edge cases. In both
+	// cases, the chunks slice will be 0 for the invalid sequence, leading it
+	// satisfy the n == 0 check below.
+	n := uint(h.min)
+	for {
+		for f.nb < n {
+			if err := f.moreBits(); err != nil {
+				return 0, err
+			}
+		}
+		chunk := h.chunks[f.b&(huffmanNumChunks-1)]
+		n = uint(chunk & huffmanCountMask)
+		if n > huffmanChunkBits {
+			chunk = h.links[chunk>>huffmanValueShift][(f.b>>huffmanChunkBits)&h.linkMask]
+			n = uint(chunk & huffmanCountMask)
+		}
+		if n <= f.nb {
+			if n == 0 {
+				f.err = CorruptInputError(f.roffset)
+				return 0, f.err
+			}
+			f.b >>= n
+			f.nb -= n
+			return int(chunk >> huffmanValueShift), nil
+		}
+	}
+}
+
+// Flush any buffered output to the underlying writer.
+func (f *decompressor) flush(step func(*decompressor)) {
+	f.toRead = f.hist[f.hw:f.hp]
+	f.woffset += int64(f.hp - f.hw)
+	f.hw = f.hp
+	if f.hp == len(f.hist) {
+		f.hp = 0
+		f.hw = 0
+		f.hfull = true
+	}
+	f.step = step
+}
+
+func makeReader(r io.Reader) Reader {
+	if rr, ok := r.(Reader); ok {
+		return rr
+	}
+	return bufio.NewReader(r)
+}
+
+func (f *decompressor) Reset(r io.Reader, dict []byte) error {
+	*f = decompressor{
+		r:        makeReader(r),
+		bits:     f.bits,
+		codebits: f.codebits,
+		hist:     f.hist,
+		step:     (*decompressor).nextBlock,
+	}
+	if dict != nil {
+		f.setDict(dict)
+	}
+	return nil
+}
+
+// NewReader returns a new ReadCloser that can be used
+// to read the uncompressed version of r.
+// If r does not also implement io.ByteReader,
+// the decompressor may read more data than necessary from r.
+// It is the caller's responsibility to call Close on the ReadCloser
+// when finished reading.
+//
+// The ReadCloser returned by NewReader also implements Resetter.
+func NewReader(r io.Reader) io.ReadCloser {
+	var f decompressor
+	f.bits = new([maxNumLit + maxNumDist]int)
+	f.codebits = new([numCodes]int)
+	f.r = makeReader(r)
+	f.hist = new([maxHist]byte)
+	f.step = (*decompressor).nextBlock
+	return &f
+}
+
+// NewReaderDict is like NewReader but initializes the reader
+// with a preset dictionary.  The returned Reader behaves as if
+// the uncompressed data stream started with the given dictionary,
+// which has already been read.  NewReaderDict is typically used
+// to read data compressed by NewWriterDict.
+//
+// The ReadCloser returned by NewReader also implements Resetter.
+func NewReaderDict(r io.Reader, dict []byte) io.ReadCloser {
+	var f decompressor
+	f.r = makeReader(r)
+	f.hist = new([maxHist]byte)
+	f.bits = new([maxNumLit + maxNumDist]int)
+	f.codebits = new([numCodes]int)
+	f.step = (*decompressor).nextBlock
+	f.setDict(dict)
+	return &f
+}
diff --git a/vendor/github.com/klauspost/compress/flate/reverse_bits.go b/vendor/github.com/klauspost/compress/flate/reverse_bits.go
new file mode 100644
index 0000000000..c1a02720d1
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/reverse_bits.go
@@ -0,0 +1,48 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+var reverseByte = [256]byte{
+	0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+	0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+	0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+	0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+	0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+	0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+	0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+	0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+	0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+	0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+	0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+	0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+	0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+	0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+	0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+	0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+	0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+	0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+	0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+	0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+	0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+	0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+	0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+	0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+	0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+	0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+	0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+	0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+	0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+	0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+	0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+	0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
+}
+
+func reverseUint16(v uint16) uint16 {
+	return uint16(reverseByte[v>>8]) | uint16(reverseByte[v&0xFF])<<8
+}
+
+func reverseBits(number uint16, bitLength byte) uint16 {
+	return reverseUint16(number << uint8(16-bitLength))
+}
diff --git a/vendor/github.com/klauspost/compress/flate/snappy.go b/vendor/github.com/klauspost/compress/flate/snappy.go
new file mode 100644
index 0000000000..a7cbf351d0
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/snappy.go
@@ -0,0 +1,768 @@
+// Copyright 2011 The Snappy-Go Authors. All rights reserved.
+// Modified for deflate by Klaus Post (c) 2015.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+// We limit how far copy back-references can go, the same as the C++ code.
+const maxOffset = 1 << 15
+
+// emitLiteral writes a literal chunk and returns the number of bytes written.
+func emitLiteral(dst *tokens, lit []byte) {
+	ol := dst.n
+	for i, v := range lit {
+		dst.tokens[i+ol] = token(v)
+	}
+	dst.n += len(lit)
+}
+
+// emitCopy writes a copy chunk and returns the number of bytes written.
+func emitCopy(dst *tokens, offset, length int) {
+	dst.tokens[dst.n] = matchToken(uint32(length-3), uint32(offset-minOffsetSize))
+	dst.n++
+}
+
+type snappyEnc interface {
+	Encode(dst *tokens, src []byte)
+	Reset()
+}
+
+func newSnappy(level int) snappyEnc {
+	if useSSE42 {
+		e := &snappySSE4{}
+		switch level {
+		case 3:
+			e.enc = e.encodeL3
+			return e
+		}
+	}
+	e := &snappyGen{}
+	switch level {
+	case 1:
+		e.enc = e.encodeL1
+	case 2:
+		e.enc = e.encodeL2
+	case 3:
+		e.enc = e.encodeL3
+	default:
+		panic("invalid level specified")
+	}
+	return e
+}
+
+const tableBits = 14             // Bits used in the table
+const tableSize = 1 << tableBits // Size of the table
+
+// snappyGen maintains the table for matches,
+// and the previous byte block for level 2.
+// This is the generic implementation.
+type snappyGen struct {
+	table [tableSize]int64
+	block [maxStoreBlockSize]byte
+	prev  []byte
+	cur   int
+	enc   func(dst *tokens, src []byte)
+}
+
+func (e *snappyGen) Encode(dst *tokens, src []byte) {
+	e.enc(dst, src)
+}
+
+// EncodeL1 uses Snappy-like compression, but stores as Huffman
+// blocks.
+func (e *snappyGen) encodeL1(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.cur += 4
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		t   int // The last position with the same hash as s.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
+		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
+
+		offset := uint(s - t - 1)
+
+		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+		if t < 0 || offset >= (maxOffset-1) || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
+			// Skip 1 byte for 16 consecutive missed.
+			s += 1 + ((s - lit) >> 4)
+			continue
+		}
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Extend the match to be as long as possible.
+		s0 := s
+		s1 := s + maxMatchLength
+		if s1 > len(src) {
+			s1 = len(src)
+		}
+		s, t = s+4, t+4
+		for s < s1 && src[s] == src[t] {
+			s++
+			t++
+		}
+		// Emit the copied bytes.
+		// inlined: emitCopy(dst, s-t, s-s0)
+
+		dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
+		dst.n++
+		lit = s
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+}
+
+// EncodeL2 uses a similar algorithm to level 1, but is capable
+// of matching across blocks giving better compression at a small slowdown.
+func (e *snappyGen) encodeL2(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.prev = nil
+		e.cur += len(src)
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		t   int // The last position with the same hash as s.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
+		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
+
+		// If t is positive, the match starts in the current block
+		if t >= 0 {
+
+			offset := uint(s - t - 1)
+			// Check that the offset is valid and that we match at least 4 bytes
+			if offset >= (maxOffset-1) || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
+				// Skip 1 byte for 32 consecutive missed.
+				s += 1 + ((s - lit) >> 5)
+				continue
+			}
+			// Otherwise, we have a match. First, emit any pending literal bytes.
+			if lit != s {
+				emitLiteral(dst, src[lit:s])
+			}
+			// Extend the match to be as long as possible.
+			s0 := s
+			s1 := s + maxMatchLength
+			if s1 > len(src) {
+				s1 = len(src)
+			}
+			s, t = s+4, t+4
+			for s < s1 && src[s] == src[t] {
+				s++
+				t++
+			}
+			// Emit the copied bytes.
+			// inlined: emitCopy(dst, s-t, s-s0)
+			dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
+			dst.n++
+			lit = s
+			continue
+		}
+		// We found a match in the previous block.
+		tp := len(e.prev) + t
+		if tp < 0 || t > -5 || s-t >= maxOffset || b0 != e.prev[tp] || b1 != e.prev[tp+1] || b2 != e.prev[tp+2] || b3 != e.prev[tp+3] {
+			// Skip 1 byte for 32 consecutive missed.
+			s += 1 + ((s - lit) >> 5)
+			continue
+		}
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Extend the match to be as long as possible.
+		s0 := s
+		s1 := s + maxMatchLength
+		if s1 > len(src) {
+			s1 = len(src)
+		}
+		s, tp = s+4, tp+4
+		for s < s1 && src[s] == e.prev[tp] {
+			s++
+			tp++
+			if tp == len(e.prev) {
+				t = 0
+				// continue in current buffer
+				for s < s1 && src[s] == src[t] {
+					s++
+					t++
+				}
+				goto l
+			}
+		}
+	l:
+		// Emit the copied bytes.
+		if t < 0 {
+			t = tp - len(e.prev)
+		}
+		dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
+		dst.n++
+		lit = s
+
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+	// Store this block, if it was full length.
+	if len(src) == maxStoreBlockSize {
+		copy(e.block[:], src)
+		e.prev = e.block[:len(src)]
+	} else {
+		e.prev = nil
+	}
+}
+
+// EncodeL3 uses a similar algorithm to level 2, but is capable
+// will keep two matches per hash.
+// Both hashes are checked if the first isn't ok, and the longest is selected.
+func (e *snappyGen) encodeL3(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.prev = nil
+		e.cur += len(src)
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		h := uint32(src[s]) | uint32(src[s+1])<<8 | uint32(src[s+2])<<16 | uint32(src[s+3])<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		tmp := *p
+		p1 := int(tmp & 0xffffffff) // Closest match position
+		p2 := int(tmp >> 32)        // Furthest match position
+
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t1 := p1 - 1 - e.cur
+
+		var l2 int
+		var t2 int
+		l1 := e.matchlen(s, t1, src)
+		// If fist match was ok, don't do the second.
+		if l1 < 16 {
+			t2 = p2 - 1 - e.cur
+			l2 = e.matchlen(s, t2, src)
+
+			// If both are short, continue
+			if l1 < 4 && l2 < 4 {
+				// Update hash table
+				*p = int64(s+1+e.cur) | (int64(p1) << 32)
+				// Skip 1 byte for 32 consecutive missed.
+				s += 1 + ((s - lit) >> 5)
+				continue
+			}
+		}
+
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Update hash table
+		*p = int64(s+1+e.cur) | (int64(p1) << 32)
+
+		// Store the longest match l1 will be closest, so we prefer that if equal length
+		if l1 >= l2 {
+			dst.tokens[dst.n] = matchToken(uint32(l1-3), uint32(s-t1-minOffsetSize))
+			s += l1
+		} else {
+			dst.tokens[dst.n] = matchToken(uint32(l2-3), uint32(s-t2-minOffsetSize))
+			s += l2
+		}
+		dst.n++
+		lit = s
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+	// Store this block, if it was full length.
+	if len(src) == maxStoreBlockSize {
+		copy(e.block[:], src)
+		e.prev = e.block[:len(src)]
+	} else {
+		e.prev = nil
+	}
+}
+
+func (e *snappyGen) matchlen(s, t int, src []byte) int {
+	// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+	offset := uint(s - t - 1)
+
+	// If we are inside the current block
+	if t >= 0 {
+		if offset >= (maxOffset-1) ||
+			src[s] != src[t] || src[s+1] != src[t+1] ||
+			src[s+2] != src[t+2] || src[s+3] != src[t+3] {
+			return 0
+		}
+		// Extend the match to be as long as possible.
+		s0 := s
+		s1 := s + maxMatchLength
+		if s1 > len(src) {
+			s1 = len(src)
+		}
+		s, t = s+4, t+4
+		for s < s1 && src[s] == src[t] {
+			s++
+			t++
+		}
+		return s - s0
+	}
+
+	// We found a match in the previous block.
+	tp := len(e.prev) + t
+	if tp < 0 || offset >= (maxOffset-1) || t > -5 ||
+		src[s] != e.prev[tp] || src[s+1] != e.prev[tp+1] ||
+		src[s+2] != e.prev[tp+2] || src[s+3] != e.prev[tp+3] {
+		return 0
+	}
+
+	// Extend the match to be as long as possible.
+	s0 := s
+	s1 := s + maxMatchLength
+	if s1 > len(src) {
+		s1 = len(src)
+	}
+	s, tp = s+4, tp+4
+	for s < s1 && src[s] == e.prev[tp] {
+		s++
+		tp++
+		if tp == len(e.prev) {
+			t = 0
+			// continue in current buffer
+			for s < s1 && src[s] == src[t] {
+				s++
+				t++
+			}
+			return s - s0
+		}
+	}
+	return s - s0
+}
+
+// Reset the encoding table.
+func (e *snappyGen) Reset() {
+	e.prev = nil
+}
+
+// snappySSE4 extends snappyGen.
+// This implementation can use SSE 4.2 for length matching.
+type snappySSE4 struct {
+	snappyGen
+}
+
+/*
+// EncodeL1 uses Snappy-like compression, but stores as Huffman
+// blocks.
+func (e *snappySSE4) encodeL1(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.cur += 4
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		t   int // The last position with the same hash as s.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		h := uint32(src[s]) | uint32(src[s+1])<<8 | uint32(src[s+2])<<16 | uint32(src[s+3])<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
+
+		offset := uint(s - t - 1)
+
+		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+		if t < 0 || offset >= (maxOffset-1) {
+			// Skip 1 byte for 16 consecutive missed.
+			s += 1 + ((s - lit) >> 4)
+			continue
+		}
+
+		length := len(src) - s
+		if length > maxMatchLength {
+			length = maxMatchLength
+		}
+		// Extend the match to be as long as possible.
+		match := matchLenSSE4(src[t:], src[s:], length)
+
+		// Return if short.
+		if match < 4 {
+			s += 1 + (s-lit)>>4
+			continue
+		}
+
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+
+		dst.tokens[dst.n] = matchToken(uint32(match-3), uint32(offset))
+		dst.n++
+		s += match
+		lit = s
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+}
+
+// EncodeL2 uses a similar algorithm to level 1, but is capable
+// of matching across blocks giving better compression at a small slowdown.
+func (e *snappySSE4) encodeL2(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.prev = nil
+		e.cur += len(src)
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		t   int // The last position with the same hash as s.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Update the hash table.
+		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
+		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
+
+		// If t is positive, the match starts in the current block
+		if t >= 0 {
+			offset := uint(s - t - 1)
+
+			// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+			if t < 0 || offset >= (maxOffset-1) {
+				// Skip 1 byte for 16 consecutive missed.
+				s += 1 + ((s - lit) >> 5)
+				continue
+			}
+
+			length := maxMatchLength
+			if length > len(src)-s {
+				length = len(src) - s
+			}
+			// Extend the match to be as long as possible.
+			match := matchLenSSE4(src[t:], src[s:], length)
+
+			// Return if short.
+			if match < 4 {
+				s += 1 + (s-lit)>>5
+				continue
+			}
+
+			// Otherwise, we have a match. First, emit any pending literal bytes.
+			if lit != s {
+				emitLiteral(dst, src[lit:s])
+			}
+
+			dst.tokens[dst.n] = matchToken(uint32(match-3), uint32(offset))
+			s += match
+			dst.n++
+			lit = s
+			continue
+		}
+
+		// We found a match in the previous block.
+		tp := len(e.prev) + t
+		if tp < 0 || t > -5 || s-t >= maxOffset || b0 != e.prev[tp] || b1 != e.prev[tp+1] || b2 != e.prev[tp+2] || b3 != e.prev[tp+3] {
+			// Skip 1 byte for 32 consecutive missed.
+			s += 1 + ((s - lit) >> 5)
+			continue
+		}
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Extend the match to be as long as possible.
+		s0 := s
+		s1 := s + maxMatchLength
+		if s1 > len(src) {
+			s1 = len(src)
+		}
+		s, tp = s+4, tp+4
+		for s < s1 && src[s] == e.prev[tp] {
+			s++
+			tp++
+			if tp == len(e.prev) {
+				t = 0
+				// continue in current buffer
+				for s < s1 && src[s] == src[t] {
+					s++
+					t++
+				}
+				goto l
+			}
+		}
+	l:
+		// Emit the copied bytes.
+		// inlined: emitCopy(dst, s-t, s-s0)
+		if t < 0 {
+			t = tp - len(e.prev)
+		}
+		dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
+		dst.n++
+		lit = s
+		continue
+
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+	// Store this block, if it was full length.
+	if len(src) == maxStoreBlockSize {
+		copy(e.block[:], src)
+		e.prev = e.block[:len(src)]
+	} else {
+		e.prev = nil
+	}
+}
+*/
+
+// EncodeL3 uses a similar algorithm to level 2,
+// but will keep two matches per hash.
+// Both hashes are checked if the first isn't ok, and the longest is selected.
+func (e *snappySSE4) encodeL3(dst *tokens, src []byte) {
+	// Return early if src is short.
+	if len(src) <= 4 {
+		if len(src) != 0 {
+			emitLiteral(dst, src)
+		}
+		e.prev = nil
+		e.cur += len(src)
+		return
+	}
+
+	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
+	if e.cur > 1<<30 {
+		e.cur = 0
+	}
+
+	// Iterate over the source bytes.
+	var (
+		s   int // The iterator position.
+		lit int // The start position of any pending literal bytes.
+	)
+
+	for s+3 < len(src) {
+		// Load potential matches from hash table.
+		h := uint32(src[s]) | uint32(src[s+1])<<8 | uint32(src[s+2])<<16 | uint32(src[s+3])<<24
+		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
+		tmp := *p
+		p1 := int(tmp & 0xffffffff) // Closest match position
+		p2 := int(tmp >> 32)        // Furthest match position
+
+		// We need to to store values in [-1, inf) in table. To save
+		// some initialization time, (re)use the table's zero value
+		// and shift the values against this zero: add 1 on writes,
+		// subtract 1 on reads.
+		t1 := int(p1) - 1 - e.cur
+
+		var l2 int
+		var t2 int
+		l1 := e.matchlen(s, t1, src)
+		// If fist match was ok, don't do the second.
+		if l1 < 16 {
+			t2 = int(p2) - 1 - e.cur
+			l2 = e.matchlen(s, t2, src)
+
+			// If both are short, continue
+			if l1 < 4 && l2 < 4 {
+				// Update hash table
+				*p = int64(s+1+e.cur) | (int64(p1) << 32)
+				// Skip 1 byte for 32 consecutive missed.
+				s += 1 + ((s - lit) >> 5)
+				continue
+			}
+		}
+
+		// Otherwise, we have a match. First, emit any pending literal bytes.
+		if lit != s {
+			emitLiteral(dst, src[lit:s])
+		}
+		// Update hash table
+		*p = int64(s+1+e.cur) | (int64(p1) << 32)
+
+		// Store the longest match l1 will be closest, so we prefer that if equal length
+		if l1 >= l2 {
+			dst.tokens[dst.n] = matchToken(uint32(l1-3), uint32(s-t1-minOffsetSize))
+			s += l1
+		} else {
+			dst.tokens[dst.n] = matchToken(uint32(l2-3), uint32(s-t2-minOffsetSize))
+			s += l2
+		}
+		dst.n++
+		lit = s
+	}
+
+	// Emit any final pending literal bytes and return.
+	if lit != len(src) {
+		emitLiteral(dst, src[lit:])
+	}
+	e.cur += len(src)
+	// Store this block, if it was full length.
+	if len(src) == maxStoreBlockSize {
+		copy(e.block[:], src)
+		e.prev = e.block[:len(src)]
+	} else {
+		e.prev = nil
+	}
+}
+
+func (e *snappySSE4) matchlen(s, t int, src []byte) int {
+	// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
+	offset := uint(s - t - 1)
+
+	// If we are inside the current block
+	if t >= 0 {
+		if offset >= (maxOffset - 1) {
+			return 0
+		}
+		length := len(src) - s
+		if length > maxMatchLength {
+			length = maxMatchLength
+		}
+		// Extend the match to be as long as possible.
+		return matchLenSSE4(src[t:], src[s:], length)
+	}
+
+	// We found a match in the previous block.
+	tp := len(e.prev) + t
+	if tp < 0 || offset >= (maxOffset-1) || t > -5 ||
+		src[s] != e.prev[tp] || src[s+1] != e.prev[tp+1] ||
+		src[s+2] != e.prev[tp+2] || src[s+3] != e.prev[tp+3] {
+		return 0
+	}
+
+	// Extend the match to be as long as possible.
+	s0 := s
+	s1 := s + maxMatchLength
+	if s1 > len(src) {
+		s1 = len(src)
+	}
+	s, tp = s+4, tp+4
+	for s < s1 && src[s] == e.prev[tp] {
+		s++
+		tp++
+		if tp == len(e.prev) {
+			t = 0
+			// continue in current buffer
+			for s < s1 && src[s] == src[t] {
+				s++
+				t++
+			}
+			return s - s0
+		}
+	}
+	return s - s0
+}
diff --git a/vendor/github.com/klauspost/compress/flate/token.go b/vendor/github.com/klauspost/compress/flate/token.go
new file mode 100644
index 0000000000..94fa5eb93a
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/flate/token.go
@@ -0,0 +1,105 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flate
+
+const (
+	// 2 bits:   type   0 = literal  1=EOF  2=Match   3=Unused
+	// 8 bits:   xlength = length - MIN_MATCH_LENGTH
+	// 22 bits   xoffset = offset - MIN_OFFSET_SIZE, or literal
+	lengthShift = 22
+	offsetMask  = 1<<lengthShift - 1
+	typeMask    = 3 << 30
+	literalType = 0 << 30
+	matchType   = 1 << 30
+)
+
+// The length code for length X (MIN_MATCH_LENGTH <= X <= MAX_MATCH_LENGTH)
+// is lengthCodes[length - MIN_MATCH_LENGTH]
+var lengthCodes = [...]uint32{
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 8,
+	9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
+	13, 13, 13, 13, 14, 14, 14, 14, 15, 15,
+	15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+	17, 17, 17, 17, 17, 17, 17, 17, 18, 18,
+	18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+	19, 19, 19, 19, 20, 20, 20, 20, 20, 20,
+	20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+	21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+	21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+	22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+	22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+	23, 23, 23, 23, 23, 23, 23, 23, 24, 24,
+	24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+	24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+	24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+	25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+	26, 26, 26, 26, 27, 27, 27, 27, 27, 27,
+	27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+	27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+	27, 27, 27, 27, 27, 28,
+}
+
+var offsetCodes = [...]uint32{
+	0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7,
+	8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
+	10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+	11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+	12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+	12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+	13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+	13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+}
+
+type token uint32
+
+type tokens struct {
+	tokens []token
+	n      int
+}
+
+// Convert a literal into a literal token.
+func literalToken(literal uint32) token { return token(literalType + literal) }
+
+// Convert a < xlength, xoffset > pair into a match token.
+func matchToken(xlength uint32, xoffset uint32) token {
+	return token(matchType + xlength<<lengthShift + xoffset)
+}
+
+// Returns the type of a token
+func (t token) typ() uint32 { return uint32(t) & typeMask }
+
+// Returns the literal of a literal token
+func (t token) literal() uint32 { return uint32(t - literalType) }
+
+// Returns the extra offset of a match token
+func (t token) offset() uint32 { return uint32(t) & offsetMask }
+
+func (t token) length() uint32 { return uint32((t - matchType) >> lengthShift) }
+
+func lengthCode(len uint32) uint32 { return lengthCodes[len] }
+
+// Returns the offset code corresponding to a specific offset
+func offsetCode(off uint32) uint32 {
+	if off < uint32(len(offsetCodes)) {
+		return offsetCodes[off]
+	} else if off>>7 < uint32(len(offsetCodes)) {
+		return offsetCodes[off>>7] + 14
+	} else {
+		return offsetCodes[off>>14] + 28
+	}
+}
diff --git a/vendor/github.com/klauspost/cpuid/LICENSE b/vendor/github.com/klauspost/cpuid/LICENSE
new file mode 100644
index 0000000000..5cec7ee949
--- /dev/null
+++ b/vendor/github.com/klauspost/cpuid/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Klaus Post
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/vendor/github.com/klauspost/cpuid/cpuid.go b/vendor/github.com/klauspost/cpuid/cpuid.go
new file mode 100644
index 0000000000..9230ca5628
--- /dev/null
+++ b/vendor/github.com/klauspost/cpuid/cpuid.go
@@ -0,0 +1,1022 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+// Package cpuid provides information about the CPU running the current program.
+//
+// CPU features are detected on startup, and kept for fast access through the life of the application.
+// Currently x86 / x64 (AMD64) is supported.
+//
+// You can access the CPU information by accessing the shared CPU variable of the cpuid library.
+//
+// Package home: https://github.com/klauspost/cpuid
+package cpuid
+
+import "strings"
+
+// Vendor is a representation of a CPU vendor.
+type Vendor int
+
+const (
+	Other Vendor = iota
+	Intel
+	AMD
+	VIA
+	Transmeta
+	NSC
+	KVM  // Kernel-based Virtual Machine
+	MSVM // Microsoft Hyper-V or Windows Virtual PC
+	VMware
+	XenHVM
+)
+
+const (
+	CMOV        = 1 << iota // i686 CMOV
+	NX                      // NX (No-Execute) bit
+	AMD3DNOW                // AMD 3DNOW
+	AMD3DNOWEXT             // AMD 3DNowExt
+	MMX                     // standard MMX
+	MMXEXT                  // SSE integer functions or AMD MMX ext
+	SSE                     // SSE functions
+	SSE2                    // P4 SSE functions
+	SSE3                    // Prescott SSE3 functions
+	SSSE3                   // Conroe SSSE3 functions
+	SSE4                    // Penryn SSE4.1 functions
+	SSE4A                   // AMD Barcelona microarchitecture SSE4a instructions
+	SSE42                   // Nehalem SSE4.2 functions
+	AVX                     // AVX functions
+	AVX2                    // AVX2 functions
+	FMA3                    // Intel FMA 3
+	FMA4                    // Bulldozer FMA4 functions
+	XOP                     // Bulldozer XOP functions
+	F16C                    // Half-precision floating-point conversion
+	BMI1                    // Bit Manipulation Instruction Set 1
+	BMI2                    // Bit Manipulation Instruction Set 2
+	TBM                     // AMD Trailing Bit Manipulation
+	LZCNT                   // LZCNT instruction
+	POPCNT                  // POPCNT instruction
+	AESNI                   // Advanced Encryption Standard New Instructions
+	CLMUL                   // Carry-less Multiplication
+	HTT                     // Hyperthreading (enabled)
+	HLE                     // Hardware Lock Elision
+	RTM                     // Restricted Transactional Memory
+	RDRAND                  // RDRAND instruction is available
+	RDSEED                  // RDSEED instruction is available
+	ADX                     // Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
+	SHA                     // Intel SHA Extensions
+	AVX512F                 // AVX-512 Foundation
+	AVX512DQ                // AVX-512 Doubleword and Quadword Instructions
+	AVX512IFMA              // AVX-512 Integer Fused Multiply-Add Instructions
+	AVX512PF                // AVX-512 Prefetch Instructions
+	AVX512ER                // AVX-512 Exponential and Reciprocal Instructions
+	AVX512CD                // AVX-512 Conflict Detection Instructions
+	AVX512BW                // AVX-512 Byte and Word Instructions
+	AVX512VL                // AVX-512 Vector Length Extensions
+	AVX512VBMI              // AVX-512 Vector Bit Manipulation Instructions
+	MPX                     // Intel MPX (Memory Protection Extensions)
+	ERMS                    // Enhanced REP MOVSB/STOSB
+	RDTSCP                  // RDTSCP Instruction
+	CX16                    // CMPXCHG16B Instruction
+	SGX                     // Software Guard Extensions
+
+	// Performance indicators
+	SSE2SLOW // SSE2 is supported, but usually not faster
+	SSE3SLOW // SSE3 is supported, but usually not faster
+	ATOM     // Atom processor, some SSSE3 instructions are slower
+)
+
+var flagNames = map[Flags]string{
+	CMOV:        "CMOV",        // i686 CMOV
+	NX:          "NX",          // NX (No-Execute) bit
+	AMD3DNOW:    "AMD3DNOW",    // AMD 3DNOW
+	AMD3DNOWEXT: "AMD3DNOWEXT", // AMD 3DNowExt
+	MMX:         "MMX",         // Standard MMX
+	MMXEXT:      "MMXEXT",      // SSE integer functions or AMD MMX ext
+	SSE:         "SSE",         // SSE functions
+	SSE2:        "SSE2",        // P4 SSE2 functions
+	SSE3:        "SSE3",        // Prescott SSE3 functions
+	SSSE3:       "SSSE3",       // Conroe SSSE3 functions
+	SSE4:        "SSE4.1",      // Penryn SSE4.1 functions
+	SSE4A:       "SSE4A",       // AMD Barcelona microarchitecture SSE4a instructions
+	SSE42:       "SSE4.2",      // Nehalem SSE4.2 functions
+	AVX:         "AVX",         // AVX functions
+	AVX2:        "AVX2",        // AVX functions
+	FMA3:        "FMA3",        // Intel FMA 3
+	FMA4:        "FMA4",        // Bulldozer FMA4 functions
+	XOP:         "XOP",         // Bulldozer XOP functions
+	F16C:        "F16C",        // Half-precision floating-point conversion
+	BMI1:        "BMI1",        // Bit Manipulation Instruction Set 1
+	BMI2:        "BMI2",        // Bit Manipulation Instruction Set 2
+	TBM:         "TBM",         // AMD Trailing Bit Manipulation
+	LZCNT:       "LZCNT",       // LZCNT instruction
+	POPCNT:      "POPCNT",      // POPCNT instruction
+	AESNI:       "AESNI",       // Advanced Encryption Standard New Instructions
+	CLMUL:       "CLMUL",       // Carry-less Multiplication
+	HTT:         "HTT",         // Hyperthreading (enabled)
+	HLE:         "HLE",         // Hardware Lock Elision
+	RTM:         "RTM",         // Restricted Transactional Memory
+	RDRAND:      "RDRAND",      // RDRAND instruction is available
+	RDSEED:      "RDSEED",      // RDSEED instruction is available
+	ADX:         "ADX",         // Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
+	SHA:         "SHA",         // Intel SHA Extensions
+	AVX512F:     "AVX512F",     // AVX-512 Foundation
+	AVX512DQ:    "AVX512DQ",    // AVX-512 Doubleword and Quadword Instructions
+	AVX512IFMA:  "AVX512IFMA",  // AVX-512 Integer Fused Multiply-Add Instructions
+	AVX512PF:    "AVX512PF",    // AVX-512 Prefetch Instructions
+	AVX512ER:    "AVX512ER",    // AVX-512 Exponential and Reciprocal Instructions
+	AVX512CD:    "AVX512CD",    // AVX-512 Conflict Detection Instructions
+	AVX512BW:    "AVX512BW",    // AVX-512 Byte and Word Instructions
+	AVX512VL:    "AVX512VL",    // AVX-512 Vector Length Extensions
+	AVX512VBMI:  "AVX512VBMI",  // AVX-512 Vector Bit Manipulation Instructions
+	MPX:         "MPX",         // Intel MPX (Memory Protection Extensions)
+	ERMS:        "ERMS",        // Enhanced REP MOVSB/STOSB
+	RDTSCP:      "RDTSCP",      // RDTSCP Instruction
+	CX16:        "CX16",        // CMPXCHG16B Instruction
+	SGX:         "SGX",         // Software Guard Extensions
+
+	// Performance indicators
+	SSE2SLOW: "SSE2SLOW", // SSE2 supported, but usually not faster
+	SSE3SLOW: "SSE3SLOW", // SSE3 supported, but usually not faster
+	ATOM:     "ATOM",     // Atom processor, some SSSE3 instructions are slower
+
+}
+
+// CPUInfo contains information about the detected system CPU.
+type CPUInfo struct {
+	BrandName      string // Brand name reported by the CPU
+	VendorID       Vendor // Comparable CPU vendor ID
+	Features       Flags  // Features of the CPU
+	PhysicalCores  int    // Number of physical processor cores in your CPU. Will be 0 if undetectable.
+	ThreadsPerCore int    // Number of threads per physical core. Will be 1 if undetectable.
+	LogicalCores   int    // Number of physical cores times threads that can run on each core through the use of hyperthreading. Will be 0 if undetectable.
+	Family         int    // CPU family number
+	Model          int    // CPU model number
+	CacheLine      int    // Cache line size in bytes. Will be 0 if undetectable.
+	Cache          struct {
+		L1I int // L1 Instruction Cache (per core or shared). Will be -1 if undetected
+		L1D int // L1 Data Cache (per core or shared). Will be -1 if undetected
+		L2  int // L2 Cache (per core or shared). Will be -1 if undetected
+		L3  int // L3 Instruction Cache (per core or shared). Will be -1 if undetected
+	}
+	SGX       SGXSupport
+	maxFunc   uint32
+	maxExFunc uint32
+}
+
+var cpuid func(op uint32) (eax, ebx, ecx, edx uint32)
+var cpuidex func(op, op2 uint32) (eax, ebx, ecx, edx uint32)
+var xgetbv func(index uint32) (eax, edx uint32)
+var rdtscpAsm func() (eax, ebx, ecx, edx uint32)
+
+// CPU contains information about the CPU as detected on startup,
+// or when Detect last was called.
+//
+// Use this as the primary entry point to you data,
+// this way queries are
+var CPU CPUInfo
+
+func init() {
+	initCPU()
+	Detect()
+}
+
+// Detect will re-detect current CPU info.
+// This will replace the content of the exported CPU variable.
+//
+// Unless you expect the CPU to change while you are running your program
+// you should not need to call this function.
+// If you call this, you must ensure that no other goroutine is accessing the
+// exported CPU variable.
+func Detect() {
+	CPU.maxFunc = maxFunctionID()
+	CPU.maxExFunc = maxExtendedFunction()
+	CPU.BrandName = brandName()
+	CPU.CacheLine = cacheLine()
+	CPU.Family, CPU.Model = familyModel()
+	CPU.Features = support()
+	CPU.SGX = sgx(CPU.Features&SGX != 0)
+	CPU.ThreadsPerCore = threadsPerCore()
+	CPU.LogicalCores = logicalCores()
+	CPU.PhysicalCores = physicalCores()
+	CPU.VendorID = vendorID()
+	CPU.cacheSize()
+}
+
+// Generated here: http://play.golang.org/p/BxFH2Gdc0G
+
+// Cmov indicates support of CMOV instructions
+func (c CPUInfo) Cmov() bool {
+	return c.Features&CMOV != 0
+}
+
+// Amd3dnow indicates support of AMD 3DNOW! instructions
+func (c CPUInfo) Amd3dnow() bool {
+	return c.Features&AMD3DNOW != 0
+}
+
+// Amd3dnowExt indicates support of AMD 3DNOW! Extended instructions
+func (c CPUInfo) Amd3dnowExt() bool {
+	return c.Features&AMD3DNOWEXT != 0
+}
+
+// MMX indicates support of MMX instructions
+func (c CPUInfo) MMX() bool {
+	return c.Features&MMX != 0
+}
+
+// MMXExt indicates support of MMXEXT instructions
+// (SSE integer functions or AMD MMX ext)
+func (c CPUInfo) MMXExt() bool {
+	return c.Features&MMXEXT != 0
+}
+
+// SSE indicates support of SSE instructions
+func (c CPUInfo) SSE() bool {
+	return c.Features&SSE != 0
+}
+
+// SSE2 indicates support of SSE 2 instructions
+func (c CPUInfo) SSE2() bool {
+	return c.Features&SSE2 != 0
+}
+
+// SSE3 indicates support of SSE 3 instructions
+func (c CPUInfo) SSE3() bool {
+	return c.Features&SSE3 != 0
+}
+
+// SSSE3 indicates support of SSSE 3 instructions
+func (c CPUInfo) SSSE3() bool {
+	return c.Features&SSSE3 != 0
+}
+
+// SSE4 indicates support of SSE 4 (also called SSE 4.1) instructions
+func (c CPUInfo) SSE4() bool {
+	return c.Features&SSE4 != 0
+}
+
+// SSE42 indicates support of SSE4.2 instructions
+func (c CPUInfo) SSE42() bool {
+	return c.Features&SSE42 != 0
+}
+
+// AVX indicates support of AVX instructions
+// and operating system support of AVX instructions
+func (c CPUInfo) AVX() bool {
+	return c.Features&AVX != 0
+}
+
+// AVX2 indicates support of AVX2 instructions
+func (c CPUInfo) AVX2() bool {
+	return c.Features&AVX2 != 0
+}
+
+// FMA3 indicates support of FMA3 instructions
+func (c CPUInfo) FMA3() bool {
+	return c.Features&FMA3 != 0
+}
+
+// FMA4 indicates support of FMA4 instructions
+func (c CPUInfo) FMA4() bool {
+	return c.Features&FMA4 != 0
+}
+
+// XOP indicates support of XOP instructions
+func (c CPUInfo) XOP() bool {
+	return c.Features&XOP != 0
+}
+
+// F16C indicates support of F16C instructions
+func (c CPUInfo) F16C() bool {
+	return c.Features&F16C != 0
+}
+
+// BMI1 indicates support of BMI1 instructions
+func (c CPUInfo) BMI1() bool {
+	return c.Features&BMI1 != 0
+}
+
+// BMI2 indicates support of BMI2 instructions
+func (c CPUInfo) BMI2() bool {
+	return c.Features&BMI2 != 0
+}
+
+// TBM indicates support of TBM instructions
+// (AMD Trailing Bit Manipulation)
+func (c CPUInfo) TBM() bool {
+	return c.Features&TBM != 0
+}
+
+// Lzcnt indicates support of LZCNT instruction
+func (c CPUInfo) Lzcnt() bool {
+	return c.Features&LZCNT != 0
+}
+
+// Popcnt indicates support of POPCNT instruction
+func (c CPUInfo) Popcnt() bool {
+	return c.Features&POPCNT != 0
+}
+
+// HTT indicates the processor has Hyperthreading enabled
+func (c CPUInfo) HTT() bool {
+	return c.Features&HTT != 0
+}
+
+// SSE2Slow indicates that SSE2 may be slow on this processor
+func (c CPUInfo) SSE2Slow() bool {
+	return c.Features&SSE2SLOW != 0
+}
+
+// SSE3Slow indicates that SSE3 may be slow on this processor
+func (c CPUInfo) SSE3Slow() bool {
+	return c.Features&SSE3SLOW != 0
+}
+
+// AesNi indicates support of AES-NI instructions
+// (Advanced Encryption Standard New Instructions)
+func (c CPUInfo) AesNi() bool {
+	return c.Features&AESNI != 0
+}
+
+// Clmul indicates support of CLMUL instructions
+// (Carry-less Multiplication)
+func (c CPUInfo) Clmul() bool {
+	return c.Features&CLMUL != 0
+}
+
+// NX indicates support of NX (No-Execute) bit
+func (c CPUInfo) NX() bool {
+	return c.Features&NX != 0
+}
+
+// SSE4A indicates support of AMD Barcelona microarchitecture SSE4a instructions
+func (c CPUInfo) SSE4A() bool {
+	return c.Features&SSE4A != 0
+}
+
+// HLE indicates support of Hardware Lock Elision
+func (c CPUInfo) HLE() bool {
+	return c.Features&HLE != 0
+}
+
+// RTM indicates support of Restricted Transactional Memory
+func (c CPUInfo) RTM() bool {
+	return c.Features&RTM != 0
+}
+
+// Rdrand indicates support of RDRAND instruction is available
+func (c CPUInfo) Rdrand() bool {
+	return c.Features&RDRAND != 0
+}
+
+// Rdseed indicates support of RDSEED instruction is available
+func (c CPUInfo) Rdseed() bool {
+	return c.Features&RDSEED != 0
+}
+
+// ADX indicates support of Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
+func (c CPUInfo) ADX() bool {
+	return c.Features&ADX != 0
+}
+
+// SHA indicates support of Intel SHA Extensions
+func (c CPUInfo) SHA() bool {
+	return c.Features&SHA != 0
+}
+
+// AVX512F indicates support of AVX-512 Foundation
+func (c CPUInfo) AVX512F() bool {
+	return c.Features&AVX512F != 0
+}
+
+// AVX512DQ indicates support of AVX-512 Doubleword and Quadword Instructions
+func (c CPUInfo) AVX512DQ() bool {
+	return c.Features&AVX512DQ != 0
+}
+
+// AVX512IFMA indicates support of AVX-512 Integer Fused Multiply-Add Instructions
+func (c CPUInfo) AVX512IFMA() bool {
+	return c.Features&AVX512IFMA != 0
+}
+
+// AVX512PF indicates support of AVX-512 Prefetch Instructions
+func (c CPUInfo) AVX512PF() bool {
+	return c.Features&AVX512PF != 0
+}
+
+// AVX512ER indicates support of AVX-512 Exponential and Reciprocal Instructions
+func (c CPUInfo) AVX512ER() bool {
+	return c.Features&AVX512ER != 0
+}
+
+// AVX512CD indicates support of AVX-512 Conflict Detection Instructions
+func (c CPUInfo) AVX512CD() bool {
+	return c.Features&AVX512CD != 0
+}
+
+// AVX512BW indicates support of AVX-512 Byte and Word Instructions
+func (c CPUInfo) AVX512BW() bool {
+	return c.Features&AVX512BW != 0
+}
+
+// AVX512VL indicates support of AVX-512 Vector Length Extensions
+func (c CPUInfo) AVX512VL() bool {
+	return c.Features&AVX512VL != 0
+}
+
+// AVX512VBMI indicates support of AVX-512 Vector Bit Manipulation Instructions
+func (c CPUInfo) AVX512VBMI() bool {
+	return c.Features&AVX512VBMI != 0
+}
+
+// MPX indicates support of Intel MPX (Memory Protection Extensions)
+func (c CPUInfo) MPX() bool {
+	return c.Features&MPX != 0
+}
+
+// ERMS indicates support of Enhanced REP MOVSB/STOSB
+func (c CPUInfo) ERMS() bool {
+	return c.Features&ERMS != 0
+}
+
+func (c CPUInfo) RDTSCP() bool {
+	return c.Features&RDTSCP != 0
+}
+
+func (c CPUInfo) CX16() bool {
+	return c.Features&CX16 != 0
+}
+
+// Atom indicates an Atom processor
+func (c CPUInfo) Atom() bool {
+	return c.Features&ATOM != 0
+}
+
+// Intel returns true if vendor is recognized as Intel
+func (c CPUInfo) Intel() bool {
+	return c.VendorID == Intel
+}
+
+// AMD returns true if vendor is recognized as AMD
+func (c CPUInfo) AMD() bool {
+	return c.VendorID == AMD
+}
+
+// Transmeta returns true if vendor is recognized as Transmeta
+func (c CPUInfo) Transmeta() bool {
+	return c.VendorID == Transmeta
+}
+
+// NSC returns true if vendor is recognized as National Semiconductor
+func (c CPUInfo) NSC() bool {
+	return c.VendorID == NSC
+}
+
+// VIA returns true if vendor is recognized as VIA
+func (c CPUInfo) VIA() bool {
+	return c.VendorID == VIA
+}
+
+// RTCounter returns the 64-bit time-stamp counter
+// Uses the RDTSCP instruction. The value 0 is returned
+// if the CPU does not support the instruction.
+func (c CPUInfo) RTCounter() uint64 {
+	if !c.RDTSCP() {
+		return 0
+	}
+	a, _, _, d := rdtscpAsm()
+	return uint64(a) | (uint64(d) << 32)
+}
+
+// Ia32TscAux returns the IA32_TSC_AUX part of the RDTSCP.
+// This variable is OS dependent, but on Linux contains information
+// about the current cpu/core the code is running on.
+// If the RDTSCP instruction isn't supported on the CPU, the value 0 is returned.
+func (c CPUInfo) Ia32TscAux() uint32 {
+	if !c.RDTSCP() {
+		return 0
+	}
+	_, _, ecx, _ := rdtscpAsm()
+	return ecx
+}
+
+// LogicalCPU will return the Logical CPU the code is currently executing on.
+// This is likely to change when the OS re-schedules the running thread
+// to another CPU.
+// If the current core cannot be detected, -1 will be returned.
+func (c CPUInfo) LogicalCPU() int {
+	if c.maxFunc < 1 {
+		return -1
+	}
+	_, ebx, _, _ := cpuid(1)
+	return int(ebx >> 24)
+}
+
+// VM Will return true if the cpu id indicates we are in
+// a virtual machine. This is only a hint, and will very likely
+// have many false negatives.
+func (c CPUInfo) VM() bool {
+	switch c.VendorID {
+	case MSVM, KVM, VMware, XenHVM:
+		return true
+	}
+	return false
+}
+
+// Flags contains detected cpu features and caracteristics
+type Flags uint64
+
+// String returns a string representation of the detected
+// CPU features.
+func (f Flags) String() string {
+	return strings.Join(f.Strings(), ",")
+}
+
+// Strings returns and array of the detected features.
+func (f Flags) Strings() []string {
+	s := support()
+	r := make([]string, 0, 20)
+	for i := uint(0); i < 64; i++ {
+		key := Flags(1 << i)
+		val := flagNames[key]
+		if s&key != 0 {
+			r = append(r, val)
+		}
+	}
+	return r
+}
+
+func maxExtendedFunction() uint32 {
+	eax, _, _, _ := cpuid(0x80000000)
+	return eax
+}
+
+func maxFunctionID() uint32 {
+	a, _, _, _ := cpuid(0)
+	return a
+}
+
+func brandName() string {
+	if maxExtendedFunction() >= 0x80000004 {
+		v := make([]uint32, 0, 48)
+		for i := uint32(0); i < 3; i++ {
+			a, b, c, d := cpuid(0x80000002 + i)
+			v = append(v, a, b, c, d)
+		}
+		return strings.Trim(string(valAsString(v...)), " ")
+	}
+	return "unknown"
+}
+
+func threadsPerCore() int {
+	mfi := maxFunctionID()
+	if mfi < 0x4 || vendorID() != Intel {
+		return 1
+	}
+
+	if mfi < 0xb {
+		_, b, _, d := cpuid(1)
+		if (d & (1 << 28)) != 0 {
+			// v will contain logical core count
+			v := (b >> 16) & 255
+			if v > 1 {
+				a4, _, _, _ := cpuid(4)
+				// physical cores
+				v2 := (a4 >> 26) + 1
+				if v2 > 0 {
+					return int(v) / int(v2)
+				}
+			}
+		}
+		return 1
+	}
+	_, b, _, _ := cpuidex(0xb, 0)
+	if b&0xffff == 0 {
+		return 1
+	}
+	return int(b & 0xffff)
+}
+
+func logicalCores() int {
+	mfi := maxFunctionID()
+	switch vendorID() {
+	case Intel:
+		// Use this on old Intel processors
+		if mfi < 0xb {
+			if mfi < 1 {
+				return 0
+			}
+			// CPUID.1:EBX[23:16] represents the maximum number of addressable IDs (initial APIC ID)
+			// that can be assigned to logical processors in a physical package.
+			// The value may not be the same as the number of logical processors that are present in the hardware of a physical package.
+			_, ebx, _, _ := cpuid(1)
+			logical := (ebx >> 16) & 0xff
+			return int(logical)
+		}
+		_, b, _, _ := cpuidex(0xb, 1)
+		return int(b & 0xffff)
+	case AMD:
+		_, b, _, _ := cpuid(1)
+		return int((b >> 16) & 0xff)
+	default:
+		return 0
+	}
+}
+
+func familyModel() (int, int) {
+	if maxFunctionID() < 0x1 {
+		return 0, 0
+	}
+	eax, _, _, _ := cpuid(1)
+	family := ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff)
+	model := ((eax >> 4) & 0xf) + ((eax >> 12) & 0xf0)
+	return int(family), int(model)
+}
+
+func physicalCores() int {
+	switch vendorID() {
+	case Intel:
+		return logicalCores() / threadsPerCore()
+	case AMD:
+		if maxExtendedFunction() >= 0x80000008 {
+			_, _, c, _ := cpuid(0x80000008)
+			return int(c&0xff) + 1
+		}
+	}
+	return 0
+}
+
+// Except from http://en.wikipedia.org/wiki/CPUID#EAX.3D0:_Get_vendor_ID
+var vendorMapping = map[string]Vendor{
+	"AMDisbetter!": AMD,
+	"AuthenticAMD": AMD,
+	"CentaurHauls": VIA,
+	"GenuineIntel": Intel,
+	"TransmetaCPU": Transmeta,
+	"GenuineTMx86": Transmeta,
+	"Geode by NSC": NSC,
+	"VIA VIA VIA ": VIA,
+	"KVMKVMKVMKVM": KVM,
+	"Microsoft Hv": MSVM,
+	"VMwareVMware": VMware,
+	"XenVMMXenVMM": XenHVM,
+}
+
+func vendorID() Vendor {
+	_, b, c, d := cpuid(0)
+	v := valAsString(b, d, c)
+	vend, ok := vendorMapping[string(v)]
+	if !ok {
+		return Other
+	}
+	return vend
+}
+
+func cacheLine() int {
+	if maxFunctionID() < 0x1 {
+		return 0
+	}
+
+	_, ebx, _, _ := cpuid(1)
+	cache := (ebx & 0xff00) >> 5 // cflush size
+	if cache == 0 && maxExtendedFunction() >= 0x80000006 {
+		_, _, ecx, _ := cpuid(0x80000006)
+		cache = ecx & 0xff // cacheline size
+	}
+	// TODO: Read from Cache and TLB Information
+	return int(cache)
+}
+
+func (c *CPUInfo) cacheSize() {
+	c.Cache.L1D = -1
+	c.Cache.L1I = -1
+	c.Cache.L2 = -1
+	c.Cache.L3 = -1
+	vendor := vendorID()
+	switch vendor {
+	case Intel:
+		if maxFunctionID() < 4 {
+			return
+		}
+		for i := uint32(0); ; i++ {
+			eax, ebx, ecx, _ := cpuidex(4, i)
+			cacheType := eax & 15
+			if cacheType == 0 {
+				break
+			}
+			cacheLevel := (eax >> 5) & 7
+			coherency := int(ebx&0xfff) + 1
+			partitions := int((ebx>>12)&0x3ff) + 1
+			associativity := int((ebx>>22)&0x3ff) + 1
+			sets := int(ecx) + 1
+			size := associativity * partitions * coherency * sets
+			switch cacheLevel {
+			case 1:
+				if cacheType == 1 {
+					// 1 = Data Cache
+					c.Cache.L1D = size
+				} else if cacheType == 2 {
+					// 2 = Instruction Cache
+					c.Cache.L1I = size
+				} else {
+					if c.Cache.L1D < 0 {
+						c.Cache.L1I = size
+					}
+					if c.Cache.L1I < 0 {
+						c.Cache.L1I = size
+					}
+				}
+			case 2:
+				c.Cache.L2 = size
+			case 3:
+				c.Cache.L3 = size
+			}
+		}
+	case AMD:
+		// Untested.
+		if maxExtendedFunction() < 0x80000005 {
+			return
+		}
+		_, _, ecx, edx := cpuid(0x80000005)
+		c.Cache.L1D = int(((ecx >> 24) & 0xFF) * 1024)
+		c.Cache.L1I = int(((edx >> 24) & 0xFF) * 1024)
+
+		if maxExtendedFunction() < 0x80000006 {
+			return
+		}
+		_, _, ecx, _ = cpuid(0x80000006)
+		c.Cache.L2 = int(((ecx >> 16) & 0xFFFF) * 1024)
+	}
+
+	return
+}
+
+type SGXSupport struct {
+	Available           bool
+	SGX1Supported       bool
+	SGX2Supported       bool
+	MaxEnclaveSizeNot64 int64
+	MaxEnclaveSize64    int64
+}
+
+func sgx(available bool) (rval SGXSupport) {
+	rval.Available = available
+
+	if !available {
+		return
+	}
+
+	a, _, _, d := cpuidex(0x12, 0)
+	rval.SGX1Supported = a&0x01 != 0
+	rval.SGX2Supported = a&0x02 != 0
+	rval.MaxEnclaveSizeNot64 = 1 << (d & 0xFF)     // pow 2
+	rval.MaxEnclaveSize64 = 1 << ((d >> 8) & 0xFF) // pow 2
+
+	return
+}
+
+func support() Flags {
+	mfi := maxFunctionID()
+	vend := vendorID()
+	if mfi < 0x1 {
+		return 0
+	}
+	rval := uint64(0)
+	_, _, c, d := cpuid(1)
+	if (d & (1 << 15)) != 0 {
+		rval |= CMOV
+	}
+	if (d & (1 << 23)) != 0 {
+		rval |= MMX
+	}
+	if (d & (1 << 25)) != 0 {
+		rval |= MMXEXT
+	}
+	if (d & (1 << 25)) != 0 {
+		rval |= SSE
+	}
+	if (d & (1 << 26)) != 0 {
+		rval |= SSE2
+	}
+	if (c & 1) != 0 {
+		rval |= SSE3
+	}
+	if (c & 0x00000200) != 0 {
+		rval |= SSSE3
+	}
+	if (c & 0x00080000) != 0 {
+		rval |= SSE4
+	}
+	if (c & 0x00100000) != 0 {
+		rval |= SSE42
+	}
+	if (c & (1 << 25)) != 0 {
+		rval |= AESNI
+	}
+	if (c & (1 << 1)) != 0 {
+		rval |= CLMUL
+	}
+	if c&(1<<23) != 0 {
+		rval |= POPCNT
+	}
+	if c&(1<<30) != 0 {
+		rval |= RDRAND
+	}
+	if c&(1<<29) != 0 {
+		rval |= F16C
+	}
+	if c&(1<<13) != 0 {
+		rval |= CX16
+	}
+	if vend == Intel && (d&(1<<28)) != 0 && mfi >= 4 {
+		if threadsPerCore() > 1 {
+			rval |= HTT
+		}
+	}
+
+	// Check XGETBV, OXSAVE and AVX bits
+	if c&(1<<26) != 0 && c&(1<<27) != 0 && c&(1<<28) != 0 {
+		// Check for OS support
+		eax, _ := xgetbv(0)
+		if (eax & 0x6) == 0x6 {
+			rval |= AVX
+			if (c & 0x00001000) != 0 {
+				rval |= FMA3
+			}
+		}
+	}
+
+	// Check AVX2, AVX2 requires OS support, but BMI1/2 don't.
+	if mfi >= 7 {
+		_, ebx, ecx, _ := cpuidex(7, 0)
+		if (rval&AVX) != 0 && (ebx&0x00000020) != 0 {
+			rval |= AVX2
+		}
+		if (ebx & 0x00000008) != 0 {
+			rval |= BMI1
+			if (ebx & 0x00000100) != 0 {
+				rval |= BMI2
+			}
+		}
+		if ebx&(1<<2) != 0 {
+			rval |= SGX
+		}
+		if ebx&(1<<4) != 0 {
+			rval |= HLE
+		}
+		if ebx&(1<<9) != 0 {
+			rval |= ERMS
+		}
+		if ebx&(1<<11) != 0 {
+			rval |= RTM
+		}
+		if ebx&(1<<14) != 0 {
+			rval |= MPX
+		}
+		if ebx&(1<<18) != 0 {
+			rval |= RDSEED
+		}
+		if ebx&(1<<19) != 0 {
+			rval |= ADX
+		}
+		if ebx&(1<<29) != 0 {
+			rval |= SHA
+		}
+
+		// Only detect AVX-512 features if XGETBV is supported
+		if c&((1<<26)|(1<<27)) == (1<<26)|(1<<27) {
+			// Check for OS support
+			eax, _ := xgetbv(0)
+
+			// Verify that XCR0[7:5] = ‘111b’ (OPMASK state, upper 256-bit of ZMM0-ZMM15 and
+			// ZMM16-ZMM31 state are enabled by OS)
+			/// and that XCR0[2:1] = ‘11b’ (XMM state and YMM state are enabled by OS).
+			if (eax>>5)&7 == 7 && (eax>>1)&3 == 3 {
+				if ebx&(1<<16) != 0 {
+					rval |= AVX512F
+				}
+				if ebx&(1<<17) != 0 {
+					rval |= AVX512DQ
+				}
+				if ebx&(1<<21) != 0 {
+					rval |= AVX512IFMA
+				}
+				if ebx&(1<<26) != 0 {
+					rval |= AVX512PF
+				}
+				if ebx&(1<<27) != 0 {
+					rval |= AVX512ER
+				}
+				if ebx&(1<<28) != 0 {
+					rval |= AVX512CD
+				}
+				if ebx&(1<<30) != 0 {
+					rval |= AVX512BW
+				}
+				if ebx&(1<<31) != 0 {
+					rval |= AVX512VL
+				}
+				// ecx
+				if ecx&(1<<1) != 0 {
+					rval |= AVX512VBMI
+				}
+			}
+		}
+	}
+
+	if maxExtendedFunction() >= 0x80000001 {
+		_, _, c, d := cpuid(0x80000001)
+		if (c & (1 << 5)) != 0 {
+			rval |= LZCNT
+			rval |= POPCNT
+		}
+		if (d & (1 << 31)) != 0 {
+			rval |= AMD3DNOW
+		}
+		if (d & (1 << 30)) != 0 {
+			rval |= AMD3DNOWEXT
+		}
+		if (d & (1 << 23)) != 0 {
+			rval |= MMX
+		}
+		if (d & (1 << 22)) != 0 {
+			rval |= MMXEXT
+		}
+		if (c & (1 << 6)) != 0 {
+			rval |= SSE4A
+		}
+		if d&(1<<20) != 0 {
+			rval |= NX
+		}
+		if d&(1<<27) != 0 {
+			rval |= RDTSCP
+		}
+
+		/* Allow for selectively disabling SSE2 functions on AMD processors
+		   with SSE2 support but not SSE4a. This includes Athlon64, some
+		   Opteron, and some Sempron processors. MMX, SSE, or 3DNow! are faster
+		   than SSE2 often enough to utilize this special-case flag.
+		   AV_CPU_FLAG_SSE2 and AV_CPU_FLAG_SSE2SLOW are both set in this case
+		   so that SSE2 is used unless explicitly disabled by checking
+		   AV_CPU_FLAG_SSE2SLOW. */
+		if vendorID() != Intel &&
+			rval&SSE2 != 0 && (c&0x00000040) == 0 {
+			rval |= SSE2SLOW
+		}
+
+		/* XOP and FMA4 use the AVX instruction coding scheme, so they can't be
+		 * used unless the OS has AVX support. */
+		if (rval & AVX) != 0 {
+			if (c & 0x00000800) != 0 {
+				rval |= XOP
+			}
+			if (c & 0x00010000) != 0 {
+				rval |= FMA4
+			}
+		}
+
+		if vendorID() == Intel {
+			family, model := familyModel()
+			if family == 6 && (model == 9 || model == 13 || model == 14) {
+				/* 6/9 (pentium-m "banias"), 6/13 (pentium-m "dothan"), and
+				 * 6/14 (core1 "yonah") theoretically support sse2, but it's
+				 * usually slower than mmx. */
+				if (rval & SSE2) != 0 {
+					rval |= SSE2SLOW
+				}
+				if (rval & SSE3) != 0 {
+					rval |= SSE3SLOW
+				}
+			}
+			/* The Atom processor has SSSE3 support, which is useful in many cases,
+			 * but sometimes the SSSE3 version is slower than the SSE2 equivalent
+			 * on the Atom, but is generally faster on other processors supporting
+			 * SSSE3. This flag allows for selectively disabling certain SSSE3
+			 * functions on the Atom. */
+			if family == 6 && model == 28 {
+				rval |= ATOM
+			}
+		}
+	}
+	return Flags(rval)
+}
+
+func valAsString(values ...uint32) []byte {
+	r := make([]byte, 4*len(values))
+	for i, v := range values {
+		dst := r[i*4:]
+		dst[0] = byte(v & 0xff)
+		dst[1] = byte((v >> 8) & 0xff)
+		dst[2] = byte((v >> 16) & 0xff)
+		dst[3] = byte((v >> 24) & 0xff)
+		switch {
+		case dst[0] == 0:
+			return r[:i*4]
+		case dst[1] == 0:
+			return r[:i*4+1]
+		case dst[2] == 0:
+			return r[:i*4+2]
+		case dst[3] == 0:
+			return r[:i*4+3]
+		}
+	}
+	return r
+}
diff --git a/vendor/github.com/klauspost/cpuid/cpuid_386.s b/vendor/github.com/klauspost/cpuid/cpuid_386.s
new file mode 100644
index 0000000000..4d731711e4
--- /dev/null
+++ b/vendor/github.com/klauspost/cpuid/cpuid_386.s
@@ -0,0 +1,42 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+// +build 386,!gccgo
+
+// func asmCpuid(op uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·asmCpuid(SB), 7, $0
+	XORL CX, CX
+	MOVL op+0(FP), AX
+	CPUID
+	MOVL AX, eax+4(FP)
+	MOVL BX, ebx+8(FP)
+	MOVL CX, ecx+12(FP)
+	MOVL DX, edx+16(FP)
+	RET
+
+// func asmCpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·asmCpuidex(SB), 7, $0
+	MOVL op+0(FP), AX
+	MOVL op2+4(FP), CX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
+
+// func xgetbv(index uint32) (eax, edx uint32)
+TEXT ·asmXgetbv(SB), 7, $0
+	MOVL index+0(FP), CX
+	BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
+	MOVL AX, eax+4(FP)
+	MOVL DX, edx+8(FP)
+	RET
+
+// func asmRdtscpAsm() (eax, ebx, ecx, edx uint32)
+TEXT ·asmRdtscpAsm(SB), 7, $0
+	BYTE $0x0F; BYTE $0x01; BYTE $0xF9 // RDTSCP
+	MOVL AX, eax+0(FP)
+	MOVL BX, ebx+4(FP)
+	MOVL CX, ecx+8(FP)
+	MOVL DX, edx+12(FP)
+	RET
diff --git a/vendor/github.com/klauspost/cpuid/cpuid_amd64.s b/vendor/github.com/klauspost/cpuid/cpuid_amd64.s
new file mode 100644
index 0000000000..3c1d60e422
--- /dev/null
+++ b/vendor/github.com/klauspost/cpuid/cpuid_amd64.s
@@ -0,0 +1,42 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+//+build amd64,!gccgo
+
+// func asmCpuid(op uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·asmCpuid(SB), 7, $0
+	XORQ CX, CX
+	MOVL op+0(FP), AX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
+
+// func asmCpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·asmCpuidex(SB), 7, $0
+	MOVL op+0(FP), AX
+	MOVL op2+4(FP), CX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
+
+// func asmXgetbv(index uint32) (eax, edx uint32)
+TEXT ·asmXgetbv(SB), 7, $0
+	MOVL index+0(FP), CX
+	BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
+	MOVL AX, eax+8(FP)
+	MOVL DX, edx+12(FP)
+	RET
+
+// func asmRdtscpAsm() (eax, ebx, ecx, edx uint32)
+TEXT ·asmRdtscpAsm(SB), 7, $0
+	BYTE $0x0F; BYTE $0x01; BYTE $0xF9 // RDTSCP
+	MOVL AX, eax+0(FP)
+	MOVL BX, ebx+4(FP)
+	MOVL CX, ecx+8(FP)
+	MOVL DX, edx+12(FP)
+	RET
diff --git a/vendor/github.com/klauspost/cpuid/detect_intel.go b/vendor/github.com/klauspost/cpuid/detect_intel.go
new file mode 100644
index 0000000000..a5f04dd6d0
--- /dev/null
+++ b/vendor/github.com/klauspost/cpuid/detect_intel.go
@@ -0,0 +1,17 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+// +build 386,!gccgo amd64,!gccgo
+
+package cpuid
+
+func asmCpuid(op uint32) (eax, ebx, ecx, edx uint32)
+func asmCpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
+func asmXgetbv(index uint32) (eax, edx uint32)
+func asmRdtscpAsm() (eax, ebx, ecx, edx uint32)
+
+func initCPU() {
+	cpuid = asmCpuid
+	cpuidex = asmCpuidex
+	xgetbv = asmXgetbv
+	rdtscpAsm = asmRdtscpAsm
+}
diff --git a/vendor/github.com/klauspost/cpuid/detect_ref.go b/vendor/github.com/klauspost/cpuid/detect_ref.go
new file mode 100644
index 0000000000..909c5d9a7a
--- /dev/null
+++ b/vendor/github.com/klauspost/cpuid/detect_ref.go
@@ -0,0 +1,23 @@
+// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
+
+// +build !amd64,!386 gccgo
+
+package cpuid
+
+func initCPU() {
+	cpuid = func(op uint32) (eax, ebx, ecx, edx uint32) {
+		return 0, 0, 0, 0
+	}
+
+	cpuidex = func(op, op2 uint32) (eax, ebx, ecx, edx uint32) {
+		return 0, 0, 0, 0
+	}
+
+	xgetbv = func(index uint32) (eax, edx uint32) {
+		return 0, 0
+	}
+
+	rdtscpAsm = func() (eax, ebx, ecx, edx uint32) {
+		return 0, 0, 0, 0
+	}
+}
diff --git a/vendor/github.com/klauspost/cpuid/generate.go b/vendor/github.com/klauspost/cpuid/generate.go
new file mode 100644
index 0000000000..c060b8165e
--- /dev/null
+++ b/vendor/github.com/klauspost/cpuid/generate.go
@@ -0,0 +1,3 @@
+package cpuid
+
+//go:generate go run private-gen.go
diff --git a/vendor/github.com/klauspost/cpuid/private-gen.go b/vendor/github.com/klauspost/cpuid/private-gen.go
new file mode 100644
index 0000000000..437333d292
--- /dev/null
+++ b/vendor/github.com/klauspost/cpuid/private-gen.go
@@ -0,0 +1,476 @@
+// +build ignore
+
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"go/ast"
+	"go/parser"
+	"go/printer"
+	"go/token"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+)
+
+var inFiles = []string{"cpuid.go", "cpuid_test.go"}
+var copyFiles = []string{"cpuid_amd64.s", "cpuid_386.s", "detect_ref.go", "detect_intel.go"}
+var fileSet = token.NewFileSet()
+var reWrites = []rewrite{
+	initRewrite("CPUInfo -> cpuInfo"),
+	initRewrite("Vendor -> vendor"),
+	initRewrite("Flags -> flags"),
+	initRewrite("Detect -> detect"),
+	initRewrite("CPU -> cpu"),
+}
+var excludeNames = map[string]bool{"string": true, "join": true, "trim": true,
+	// cpuid_test.go
+	"t": true, "println": true, "logf": true, "log": true, "fatalf": true, "fatal": true,
+}
+
+var excludePrefixes = []string{"test", "benchmark"}
+
+func main() {
+	Package := "private"
+	parserMode := parser.ParseComments
+	exported := make(map[string]rewrite)
+	for _, file := range inFiles {
+		in, err := os.Open(file)
+		if err != nil {
+			log.Fatalf("opening input", err)
+		}
+
+		src, err := ioutil.ReadAll(in)
+		if err != nil {
+			log.Fatalf("reading input", err)
+		}
+
+		astfile, err := parser.ParseFile(fileSet, file, src, parserMode)
+		if err != nil {
+			log.Fatalf("parsing input", err)
+		}
+
+		for _, rw := range reWrites {
+			astfile = rw(astfile)
+		}
+
+		// Inspect the AST and print all identifiers and literals.
+		var startDecl token.Pos
+		var endDecl token.Pos
+		ast.Inspect(astfile, func(n ast.Node) bool {
+			var s string
+			switch x := n.(type) {
+			case *ast.Ident:
+				if x.IsExported() {
+					t := strings.ToLower(x.Name)
+					for _, pre := range excludePrefixes {
+						if strings.HasPrefix(t, pre) {
+							return true
+						}
+					}
+					if excludeNames[t] != true {
+						//if x.Pos() > startDecl && x.Pos() < endDecl {
+						exported[x.Name] = initRewrite(x.Name + " -> " + t)
+					}
+				}
+
+			case *ast.GenDecl:
+				if x.Tok == token.CONST && x.Lparen > 0 {
+					startDecl = x.Lparen
+					endDecl = x.Rparen
+					// fmt.Printf("Decl:%s -> %s\n", fileSet.Position(startDecl), fileSet.Position(endDecl))
+				}
+			}
+			if s != "" {
+				fmt.Printf("%s:\t%s\n", fileSet.Position(n.Pos()), s)
+			}
+			return true
+		})
+
+		for _, rw := range exported {
+			astfile = rw(astfile)
+		}
+
+		var buf bytes.Buffer
+
+		printer.Fprint(&buf, fileSet, astfile)
+
+		// Remove package documentation and insert information
+		s := buf.String()
+		ind := strings.Index(buf.String(), "\npackage cpuid")
+		s = s[ind:]
+		s = "// Generated, DO NOT EDIT,\n" +
+			"// but copy it to your own project and rename the package.\n" +
+			"// See more at http://github.com/klauspost/cpuid\n" +
+			s
+
+		outputName := Package + string(os.PathSeparator) + file
+
+		err = ioutil.WriteFile(outputName, []byte(s), 0644)
+		if err != nil {
+			log.Fatalf("writing output: %s", err)
+		}
+		log.Println("Generated", outputName)
+	}
+
+	for _, file := range copyFiles {
+		dst := ""
+		if strings.HasPrefix(file, "cpuid") {
+			dst = Package + string(os.PathSeparator) + file
+		} else {
+			dst = Package + string(os.PathSeparator) + "cpuid_" + file
+		}
+		err := copyFile(file, dst)
+		if err != nil {
+			log.Fatalf("copying file: %s", err)
+		}
+		log.Println("Copied", dst)
+	}
+}
+
+// CopyFile copies a file from src to dst. If src and dst files exist, and are
+// the same, then return success. Copy the file contents from src to dst.
+func copyFile(src, dst string) (err error) {
+	sfi, err := os.Stat(src)
+	if err != nil {
+		return
+	}
+	if !sfi.Mode().IsRegular() {
+		// cannot copy non-regular files (e.g., directories,
+		// symlinks, devices, etc.)
+		return fmt.Errorf("CopyFile: non-regular source file %s (%q)", sfi.Name(), sfi.Mode().String())
+	}
+	dfi, err := os.Stat(dst)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return
+		}
+	} else {
+		if !(dfi.Mode().IsRegular()) {
+			return fmt.Errorf("CopyFile: non-regular destination file %s (%q)", dfi.Name(), dfi.Mode().String())
+		}
+		if os.SameFile(sfi, dfi) {
+			return
+		}
+	}
+	err = copyFileContents(src, dst)
+	return
+}
+
+// copyFileContents copies the contents of the file named src to the file named
+// by dst. The file will be created if it does not already exist. If the
+// destination file exists, all it's contents will be replaced by the contents
+// of the source file.
+func copyFileContents(src, dst string) (err error) {
+	in, err := os.Open(src)
+	if err != nil {
+		return
+	}
+	defer in.Close()
+	out, err := os.Create(dst)
+	if err != nil {
+		return
+	}
+	defer func() {
+		cerr := out.Close()
+		if err == nil {
+			err = cerr
+		}
+	}()
+	if _, err = io.Copy(out, in); err != nil {
+		return
+	}
+	err = out.Sync()
+	return
+}
+
+type rewrite func(*ast.File) *ast.File
+
+// Mostly copied from gofmt
+func initRewrite(rewriteRule string) rewrite {
+	f := strings.Split(rewriteRule, "->")
+	if len(f) != 2 {
+		fmt.Fprintf(os.Stderr, "rewrite rule must be of the form 'pattern -> replacement'\n")
+		os.Exit(2)
+	}
+	pattern := parseExpr(f[0], "pattern")
+	replace := parseExpr(f[1], "replacement")
+	return func(p *ast.File) *ast.File { return rewriteFile(pattern, replace, p) }
+}
+
+// parseExpr parses s as an expression.
+// It might make sense to expand this to allow statement patterns,
+// but there are problems with preserving formatting and also
+// with what a wildcard for a statement looks like.
+func parseExpr(s, what string) ast.Expr {
+	x, err := parser.ParseExpr(s)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "parsing %s %s at %s\n", what, s, err)
+		os.Exit(2)
+	}
+	return x
+}
+
+// Keep this function for debugging.
+/*
+func dump(msg string, val reflect.Value) {
+	fmt.Printf("%s:\n", msg)
+	ast.Print(fileSet, val.Interface())
+	fmt.Println()
+}
+*/
+
+// rewriteFile applies the rewrite rule 'pattern -> replace' to an entire file.
+func rewriteFile(pattern, replace ast.Expr, p *ast.File) *ast.File {
+	cmap := ast.NewCommentMap(fileSet, p, p.Comments)
+	m := make(map[string]reflect.Value)
+	pat := reflect.ValueOf(pattern)
+	repl := reflect.ValueOf(replace)
+
+	var rewriteVal func(val reflect.Value) reflect.Value
+	rewriteVal = func(val reflect.Value) reflect.Value {
+		// don't bother if val is invalid to start with
+		if !val.IsValid() {
+			return reflect.Value{}
+		}
+		for k := range m {
+			delete(m, k)
+		}
+		val = apply(rewriteVal, val)
+		if match(m, pat, val) {
+			val = subst(m, repl, reflect.ValueOf(val.Interface().(ast.Node).Pos()))
+		}
+		return val
+	}
+
+	r := apply(rewriteVal, reflect.ValueOf(p)).Interface().(*ast.File)
+	r.Comments = cmap.Filter(r).Comments() // recreate comments list
+	return r
+}
+
+// set is a wrapper for x.Set(y); it protects the caller from panics if x cannot be changed to y.
+func set(x, y reflect.Value) {
+	// don't bother if x cannot be set or y is invalid
+	if !x.CanSet() || !y.IsValid() {
+		return
+	}
+	defer func() {
+		if x := recover(); x != nil {
+			if s, ok := x.(string); ok &&
+				(strings.Contains(s, "type mismatch") || strings.Contains(s, "not assignable")) {
+				// x cannot be set to y - ignore this rewrite
+				return
+			}
+			panic(x)
+		}
+	}()
+	x.Set(y)
+}
+
+// Values/types for special cases.
+var (
+	objectPtrNil = reflect.ValueOf((*ast.Object)(nil))
+	scopePtrNil  = reflect.ValueOf((*ast.Scope)(nil))
+
+	identType     = reflect.TypeOf((*ast.Ident)(nil))
+	objectPtrType = reflect.TypeOf((*ast.Object)(nil))
+	positionType  = reflect.TypeOf(token.NoPos)
+	callExprType  = reflect.TypeOf((*ast.CallExpr)(nil))
+	scopePtrType  = reflect.TypeOf((*ast.Scope)(nil))
+)
+
+// apply replaces each AST field x in val with f(x), returning val.
+// To avoid extra conversions, f operates on the reflect.Value form.
+func apply(f func(reflect.Value) reflect.Value, val reflect.Value) reflect.Value {
+	if !val.IsValid() {
+		return reflect.Value{}
+	}
+
+	// *ast.Objects introduce cycles and are likely incorrect after
+	// rewrite; don't follow them but replace with nil instead
+	if val.Type() == objectPtrType {
+		return objectPtrNil
+	}
+
+	// similarly for scopes: they are likely incorrect after a rewrite;
+	// replace them with nil
+	if val.Type() == scopePtrType {
+		return scopePtrNil
+	}
+
+	switch v := reflect.Indirect(val); v.Kind() {
+	case reflect.Slice:
+		for i := 0; i < v.Len(); i++ {
+			e := v.Index(i)
+			set(e, f(e))
+		}
+	case reflect.Struct:
+		for i := 0; i < v.NumField(); i++ {
+			e := v.Field(i)
+			set(e, f(e))
+		}
+	case reflect.Interface:
+		e := v.Elem()
+		set(v, f(e))
+	}
+	return val
+}
+
+func isWildcard(s string) bool {
+	rune, size := utf8.DecodeRuneInString(s)
+	return size == len(s) && unicode.IsLower(rune)
+}
+
+// match returns true if pattern matches val,
+// recording wildcard submatches in m.
+// If m == nil, match checks whether pattern == val.
+func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
+	// Wildcard matches any expression.  If it appears multiple
+	// times in the pattern, it must match the same expression
+	// each time.
+	if m != nil && pattern.IsValid() && pattern.Type() == identType {
+		name := pattern.Interface().(*ast.Ident).Name
+		if isWildcard(name) && val.IsValid() {
+			// wildcards only match valid (non-nil) expressions.
+			if _, ok := val.Interface().(ast.Expr); ok && !val.IsNil() {
+				if old, ok := m[name]; ok {
+					return match(nil, old, val)
+				}
+				m[name] = val
+				return true
+			}
+		}
+	}
+
+	// Otherwise, pattern and val must match recursively.
+	if !pattern.IsValid() || !val.IsValid() {
+		return !pattern.IsValid() && !val.IsValid()
+	}
+	if pattern.Type() != val.Type() {
+		return false
+	}
+
+	// Special cases.
+	switch pattern.Type() {
+	case identType:
+		// For identifiers, only the names need to match
+		// (and none of the other *ast.Object information).
+		// This is a common case, handle it all here instead
+		// of recursing down any further via reflection.
+		p := pattern.Interface().(*ast.Ident)
+		v := val.Interface().(*ast.Ident)
+		return p == nil && v == nil || p != nil && v != nil && p.Name == v.Name
+	case objectPtrType, positionType:
+		// object pointers and token positions always match
+		return true
+	case callExprType:
+		// For calls, the Ellipsis fields (token.Position) must
+		// match since that is how f(x) and f(x...) are different.
+		// Check them here but fall through for the remaining fields.
+		p := pattern.Interface().(*ast.CallExpr)
+		v := val.Interface().(*ast.CallExpr)
+		if p.Ellipsis.IsValid() != v.Ellipsis.IsValid() {
+			return false
+		}
+	}
+
+	p := reflect.Indirect(pattern)
+	v := reflect.Indirect(val)
+	if !p.IsValid() || !v.IsValid() {
+		return !p.IsValid() && !v.IsValid()
+	}
+
+	switch p.Kind() {
+	case reflect.Slice:
+		if p.Len() != v.Len() {
+			return false
+		}
+		for i := 0; i < p.Len(); i++ {
+			if !match(m, p.Index(i), v.Index(i)) {
+				return false
+			}
+		}
+		return true
+
+	case reflect.Struct:
+		for i := 0; i < p.NumField(); i++ {
+			if !match(m, p.Field(i), v.Field(i)) {
+				return false
+			}
+		}
+		return true
+
+	case reflect.Interface:
+		return match(m, p.Elem(), v.Elem())
+	}
+
+	// Handle token integers, etc.
+	return p.Interface() == v.Interface()
+}
+
+// subst returns a copy of pattern with values from m substituted in place
+// of wildcards and pos used as the position of tokens from the pattern.
+// if m == nil, subst returns a copy of pattern and doesn't change the line
+// number information.
+func subst(m map[string]reflect.Value, pattern reflect.Value, pos reflect.Value) reflect.Value {
+	if !pattern.IsValid() {
+		return reflect.Value{}
+	}
+
+	// Wildcard gets replaced with map value.
+	if m != nil && pattern.Type() == identType {
+		name := pattern.Interface().(*ast.Ident).Name
+		if isWildcard(name) {
+			if old, ok := m[name]; ok {
+				return subst(nil, old, reflect.Value{})
+			}
+		}
+	}
+
+	if pos.IsValid() && pattern.Type() == positionType {
+		// use new position only if old position was valid in the first place
+		if old := pattern.Interface().(token.Pos); !old.IsValid() {
+			return pattern
+		}
+		return pos
+	}
+
+	// Otherwise copy.
+	switch p := pattern; p.Kind() {
+	case reflect.Slice:
+		v := reflect.MakeSlice(p.Type(), p.Len(), p.Len())
+		for i := 0; i < p.Len(); i++ {
+			v.Index(i).Set(subst(m, p.Index(i), pos))
+		}
+		return v
+
+	case reflect.Struct:
+		v := reflect.New(p.Type()).Elem()
+		for i := 0; i < p.NumField(); i++ {
+			v.Field(i).Set(subst(m, p.Field(i), pos))
+		}
+		return v
+
+	case reflect.Ptr:
+		v := reflect.New(p.Type()).Elem()
+		if elem := p.Elem(); elem.IsValid() {
+			v.Set(subst(m, elem, pos).Addr())
+		}
+		return v
+
+	case reflect.Interface:
+		v := reflect.New(p.Type()).Elem()
+		if elem := p.Elem(); elem.IsValid() {
+			v.Set(subst(m, elem, pos))
+		}
+		return v
+	}
+
+	return pattern
+}
diff --git a/vendor/github.com/klauspost/crc32/LICENSE b/vendor/github.com/klauspost/crc32/LICENSE
new file mode 100644
index 0000000000..4fd5963e39
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+Copyright (c) 2015 Klaus Post
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/klauspost/crc32/crc32.go b/vendor/github.com/klauspost/crc32/crc32.go
new file mode 100644
index 0000000000..8d6ba5d3dc
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/crc32.go
@@ -0,0 +1,186 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package crc32 implements the 32-bit cyclic redundancy check, or CRC-32,
+// checksum. See http://en.wikipedia.org/wiki/Cyclic_redundancy_check for
+// information.
+//
+// Polynomials are represented in LSB-first form also known as reversed representation.
+//
+// See http://en.wikipedia.org/wiki/Mathematics_of_cyclic_redundancy_checks#Reversed_representations_and_reciprocal_polynomials
+// for information.
+package crc32
+
+import (
+	"hash"
+	"sync"
+)
+
+// The size of a CRC-32 checksum in bytes.
+const Size = 4
+
+// Predefined polynomials.
+const (
+	// IEEE is by far and away the most common CRC-32 polynomial.
+	// Used by ethernet (IEEE 802.3), v.42, fddi, gzip, zip, png, ...
+	IEEE = 0xedb88320
+
+	// Castagnoli's polynomial, used in iSCSI.
+	// Has better error detection characteristics than IEEE.
+	// http://dx.doi.org/10.1109/26.231911
+	Castagnoli = 0x82f63b78
+
+	// Koopman's polynomial.
+	// Also has better error detection characteristics than IEEE.
+	// http://dx.doi.org/10.1109/DSN.2002.1028931
+	Koopman = 0xeb31d82e
+)
+
+// Table is a 256-word table representing the polynomial for efficient processing.
+type Table [256]uint32
+
+// castagnoliTable points to a lazily initialized Table for the Castagnoli
+// polynomial. MakeTable will always return this value when asked to make a
+// Castagnoli table so we can compare against it to find when the caller is
+// using this polynomial.
+var castagnoliTable *Table
+var castagnoliTable8 *slicing8Table
+var castagnoliOnce sync.Once
+
+func castagnoliInit() {
+	castagnoliTable = makeTable(Castagnoli)
+	castagnoliTable8 = makeTable8(Castagnoli)
+}
+
+// IEEETable is the table for the IEEE polynomial.
+var IEEETable = makeTable(IEEE)
+
+// slicing8Table is array of 8 Tables
+type slicing8Table [8]Table
+
+// ieeeTable8 is the slicing8Table for IEEE
+var ieeeTable8 *slicing8Table
+var ieeeTable8Once sync.Once
+
+// MakeTable returns a Table constructed from the specified polynomial.
+// The contents of this Table must not be modified.
+func MakeTable(poly uint32) *Table {
+	switch poly {
+	case IEEE:
+		return IEEETable
+	case Castagnoli:
+		castagnoliOnce.Do(castagnoliInit)
+		return castagnoliTable
+	}
+	return makeTable(poly)
+}
+
+// makeTable returns the Table constructed from the specified polynomial.
+func makeTable(poly uint32) *Table {
+	t := new(Table)
+	for i := 0; i < 256; i++ {
+		crc := uint32(i)
+		for j := 0; j < 8; j++ {
+			if crc&1 == 1 {
+				crc = (crc >> 1) ^ poly
+			} else {
+				crc >>= 1
+			}
+		}
+		t[i] = crc
+	}
+	return t
+}
+
+// makeTable8 returns slicing8Table constructed from the specified polynomial.
+func makeTable8(poly uint32) *slicing8Table {
+	t := new(slicing8Table)
+	t[0] = *makeTable(poly)
+	for i := 0; i < 256; i++ {
+		crc := t[0][i]
+		for j := 1; j < 8; j++ {
+			crc = t[0][crc&0xFF] ^ (crc >> 8)
+			t[j][i] = crc
+		}
+	}
+	return t
+}
+
+// digest represents the partial evaluation of a checksum.
+type digest struct {
+	crc uint32
+	tab *Table
+}
+
+// New creates a new hash.Hash32 computing the CRC-32 checksum
+// using the polynomial represented by the Table.
+// Its Sum method will lay the value out in big-endian byte order.
+func New(tab *Table) hash.Hash32 { return &digest{0, tab} }
+
+// NewIEEE creates a new hash.Hash32 computing the CRC-32 checksum
+// using the IEEE polynomial.
+// Its Sum method will lay the value out in big-endian byte order.
+func NewIEEE() hash.Hash32 { return New(IEEETable) }
+
+func (d *digest) Size() int { return Size }
+
+func (d *digest) BlockSize() int { return 1 }
+
+func (d *digest) Reset() { d.crc = 0 }
+
+func update(crc uint32, tab *Table, p []byte) uint32 {
+	crc = ^crc
+	for _, v := range p {
+		crc = tab[byte(crc)^v] ^ (crc >> 8)
+	}
+	return ^crc
+}
+
+// updateSlicingBy8 updates CRC using Slicing-by-8
+func updateSlicingBy8(crc uint32, tab *slicing8Table, p []byte) uint32 {
+	crc = ^crc
+	for len(p) > 8 {
+		crc ^= uint32(p[0]) | uint32(p[1])<<8 | uint32(p[2])<<16 | uint32(p[3])<<24
+		crc = tab[0][p[7]] ^ tab[1][p[6]] ^ tab[2][p[5]] ^ tab[3][p[4]] ^
+			tab[4][crc>>24] ^ tab[5][(crc>>16)&0xFF] ^
+			tab[6][(crc>>8)&0xFF] ^ tab[7][crc&0xFF]
+		p = p[8:]
+	}
+	crc = ^crc
+	if len(p) == 0 {
+		return crc
+	}
+	return update(crc, &tab[0], p)
+}
+
+// Update returns the result of adding the bytes in p to the crc.
+func Update(crc uint32, tab *Table, p []byte) uint32 {
+	if tab == castagnoliTable {
+		return updateCastagnoli(crc, p)
+	}
+	if tab == IEEETable {
+		return updateIEEE(crc, p)
+	}
+	return update(crc, tab, p)
+}
+
+func (d *digest) Write(p []byte) (n int, err error) {
+	d.crc = Update(d.crc, d.tab, p)
+	return len(p), nil
+}
+
+func (d *digest) Sum32() uint32 { return d.crc }
+
+func (d *digest) Sum(in []byte) []byte {
+	s := d.Sum32()
+	return append(in, byte(s>>24), byte(s>>16), byte(s>>8), byte(s))
+}
+
+// Checksum returns the CRC-32 checksum of data
+// using the polynomial represented by the Table.
+func Checksum(data []byte, tab *Table) uint32 { return Update(0, tab, data) }
+
+// ChecksumIEEE returns the CRC-32 checksum of data
+// using the IEEE polynomial.
+func ChecksumIEEE(data []byte) uint32 { return updateIEEE(0, data) }
diff --git a/vendor/github.com/klauspost/crc32/crc32_amd64.go b/vendor/github.com/klauspost/crc32/crc32_amd64.go
new file mode 100644
index 0000000000..4827128ea0
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/crc32_amd64.go
@@ -0,0 +1,62 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !appengine,!gccgo
+
+package crc32
+
+// This file contains the code to call the SSE 4.2 version of the Castagnoli
+// and IEEE CRC.
+
+// haveSSE41/haveSSE42/haveCLMUL are defined in crc_amd64.s and use
+// CPUID to test for SSE 4.1, 4.2 and CLMUL support.
+func haveSSE41() bool
+func haveSSE42() bool
+func haveCLMUL() bool
+
+// castagnoliSSE42 is defined in crc_amd64.s and uses the SSE4.2 CRC32
+// instruction.
+//go:noescape
+func castagnoliSSE42(crc uint32, p []byte) uint32
+
+// ieeeCLMUL is defined in crc_amd64.s and uses the PCLMULQDQ
+// instruction as well as SSE 4.1.
+//go:noescape
+func ieeeCLMUL(crc uint32, p []byte) uint32
+
+var sse42 = haveSSE42()
+var useFastIEEE = haveCLMUL() && haveSSE41()
+
+func updateCastagnoli(crc uint32, p []byte) uint32 {
+	if sse42 {
+		return castagnoliSSE42(crc, p)
+	}
+	// only use slicing-by-8 when input is >= 16 Bytes
+	if len(p) >= 16 {
+		return updateSlicingBy8(crc, castagnoliTable8, p)
+	}
+	return update(crc, castagnoliTable, p)
+}
+
+func updateIEEE(crc uint32, p []byte) uint32 {
+	if useFastIEEE && len(p) >= 64 {
+		left := len(p) & 15
+		do := len(p) - left
+		crc = ^ieeeCLMUL(^crc, p[:do])
+		if left > 0 {
+			crc = update(crc, IEEETable, p[do:])
+		}
+		return crc
+	}
+
+	// only use slicing-by-8 when input is >= 16 Bytes
+	if len(p) >= 16 {
+		ieeeTable8Once.Do(func() {
+			ieeeTable8 = makeTable8(IEEE)
+		})
+		return updateSlicingBy8(crc, ieeeTable8, p)
+	}
+
+	return update(crc, IEEETable, p)
+}
diff --git a/vendor/github.com/klauspost/crc32/crc32_amd64.s b/vendor/github.com/klauspost/crc32/crc32_amd64.s
new file mode 100644
index 0000000000..9bf05d89b8
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/crc32_amd64.s
@@ -0,0 +1,237 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gc
+
+#define NOSPLIT 4
+#define RODATA 8
+
+// func castagnoliSSE42(crc uint32, p []byte) uint32
+TEXT ·castagnoliSSE42(SB), NOSPLIT, $0
+	MOVL crc+0(FP), AX    // CRC value
+	MOVQ p+8(FP), SI      // data pointer
+	MOVQ p_len+16(FP), CX // len(p)
+
+	NOTL AX
+
+	// If there's less than 8 bytes to process, we do it byte-by-byte.
+	CMPQ CX, $8
+	JL   cleanup
+
+	// Process individual bytes until the input is 8-byte aligned.
+startup:
+	MOVQ SI, BX
+	ANDQ $7, BX
+	JZ   aligned
+
+	CRC32B (SI), AX
+	DECQ   CX
+	INCQ   SI
+	JMP    startup
+
+aligned:
+	// The input is now 8-byte aligned and we can process 8-byte chunks.
+	CMPQ CX, $8
+	JL   cleanup
+
+	CRC32Q (SI), AX
+	ADDQ   $8, SI
+	SUBQ   $8, CX
+	JMP    aligned
+
+cleanup:
+	// We may have some bytes left over that we process one at a time.
+	CMPQ CX, $0
+	JE   done
+
+	CRC32B (SI), AX
+	INCQ   SI
+	DECQ   CX
+	JMP    cleanup
+
+done:
+	NOTL AX
+	MOVL AX, ret+32(FP)
+	RET
+
+// func haveSSE42() bool
+TEXT ·haveSSE42(SB), NOSPLIT, $0
+	XORQ AX, AX
+	INCL AX
+	CPUID
+	SHRQ $20, CX
+	ANDQ $1, CX
+	MOVB CX, ret+0(FP)
+	RET
+
+// func haveCLMUL() bool
+TEXT ·haveCLMUL(SB), NOSPLIT, $0
+	XORQ AX, AX
+	INCL AX
+	CPUID
+	SHRQ $1, CX
+	ANDQ $1, CX
+	MOVB CX, ret+0(FP)
+	RET
+
+// func haveSSE41() bool
+TEXT ·haveSSE41(SB), NOSPLIT, $0
+	XORQ AX, AX
+	INCL AX
+	CPUID
+	SHRQ $19, CX
+	ANDQ $1, CX
+	MOVB CX, ret+0(FP)
+	RET
+
+// CRC32 polynomial data
+//
+// These constants are lifted from the
+// Linux kernel, since they avoid the costly
+// PSHUFB 16 byte reversal proposed in the
+// original Intel paper.
+DATA r2r1kp<>+0(SB)/8, $0x154442bd4
+DATA r2r1kp<>+8(SB)/8, $0x1c6e41596
+DATA r4r3kp<>+0(SB)/8, $0x1751997d0
+DATA r4r3kp<>+8(SB)/8, $0x0ccaa009e
+DATA rupolykp<>+0(SB)/8, $0x1db710641
+DATA rupolykp<>+8(SB)/8, $0x1f7011641
+DATA r5kp<>+0(SB)/8, $0x163cd6124
+
+GLOBL r2r1kp<>(SB), RODATA, $16
+GLOBL r4r3kp<>(SB), RODATA, $16
+GLOBL rupolykp<>(SB), RODATA, $16
+GLOBL r5kp<>(SB), RODATA, $8
+
+// Based on http://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
+// len(p) must be at least 64, and must be a multiple of 16.
+
+// func ieeeCLMUL(crc uint32, p []byte) uint32
+TEXT ·ieeeCLMUL(SB), NOSPLIT, $0
+	MOVL crc+0(FP), X0    // Initial CRC value
+	MOVQ p+8(FP), SI      // data pointer
+	MOVQ p_len+16(FP), CX // len(p)
+
+	MOVOU (SI), X1
+	MOVOU 16(SI), X2
+	MOVOU 32(SI), X3
+	MOVOU 48(SI), X4
+	PXOR  X0, X1
+	ADDQ  $64, SI    // buf+=64
+	SUBQ  $64, CX    // len-=64
+	CMPQ  CX, $64    // Less than 64 bytes left
+	JB    remain64
+
+	MOVOA r2r1kp<>+0(SB), X0
+
+loopback64:
+	MOVOA X1, X5
+	MOVOA X2, X6
+	MOVOA X3, X7
+	MOVOA X4, X8
+
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0, X0, X2
+	PCLMULQDQ $0, X0, X3
+	PCLMULQDQ $0, X0, X4
+
+	// Load next early
+	MOVOU (SI), X11
+	MOVOU 16(SI), X12
+	MOVOU 32(SI), X13
+	MOVOU 48(SI), X14
+
+	PCLMULQDQ $0x11, X0, X5
+	PCLMULQDQ $0x11, X0, X6
+	PCLMULQDQ $0x11, X0, X7
+	PCLMULQDQ $0x11, X0, X8
+
+	PXOR X5, X1
+	PXOR X6, X2
+	PXOR X7, X3
+	PXOR X8, X4
+
+	PXOR X11, X1
+	PXOR X12, X2
+	PXOR X13, X3
+	PXOR X14, X4
+
+	ADDQ $0x40, DI
+	ADDQ $64, SI    // buf+=64
+	SUBQ $64, CX    // len-=64
+	CMPQ CX, $64    // Less than 64 bytes left?
+	JGE  loopback64
+
+	// Fold result into a single register (X1)
+remain64:
+	MOVOA r4r3kp<>+0(SB), X0
+
+	MOVOA     X1, X5
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0x11, X0, X5
+	PXOR      X5, X1
+	PXOR      X2, X1
+
+	MOVOA     X1, X5
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0x11, X0, X5
+	PXOR      X5, X1
+	PXOR      X3, X1
+
+	MOVOA     X1, X5
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0x11, X0, X5
+	PXOR      X5, X1
+	PXOR      X4, X1
+
+	// More than 16 bytes left?
+	CMPQ CX, $16
+	JB   finish
+
+	// Encode 16 bytes
+remain16:
+	MOVOU     (SI), X10
+	MOVOA     X1, X5
+	PCLMULQDQ $0, X0, X1
+	PCLMULQDQ $0x11, X0, X5
+	PXOR      X5, X1
+	PXOR      X10, X1
+	SUBQ      $16, CX
+	ADDQ      $16, SI
+	CMPQ      CX, $16
+	JGE       remain16
+
+finish:
+	// Fold final result into 32 bits and return it
+	PCMPEQB   X3, X3
+	PCLMULQDQ $1, X1, X0
+	PSRLDQ    $8, X1
+	PXOR      X0, X1
+
+	MOVOA X1, X2
+	MOVQ  r5kp<>+0(SB), X0
+
+	// Creates 32 bit mask. Note that we don't care about upper half.
+	PSRLQ $32, X3
+
+	PSRLDQ    $4, X2
+	PAND      X3, X1
+	PCLMULQDQ $0, X0, X1
+	PXOR      X2, X1
+
+	MOVOA rupolykp<>+0(SB), X0
+
+	MOVOA     X1, X2
+	PAND      X3, X1
+	PCLMULQDQ $0x10, X0, X1
+	PAND      X3, X1
+	PCLMULQDQ $0, X0, X1
+	PXOR      X2, X1
+
+	// PEXTRD   $1, X1, AX  (SSE 4.1)
+	BYTE $0x66; BYTE $0x0f; BYTE $0x3a
+	BYTE $0x16; BYTE $0xc8; BYTE $0x01
+	MOVL AX, ret+32(FP)
+
+	RET
diff --git a/vendor/github.com/klauspost/crc32/crc32_amd64p32.go b/vendor/github.com/klauspost/crc32/crc32_amd64p32.go
new file mode 100644
index 0000000000..926473e7c0
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/crc32_amd64p32.go
@@ -0,0 +1,40 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !appengine,!gccgo
+
+package crc32
+
+// This file contains the code to call the SSE 4.2 version of the Castagnoli
+// CRC.
+
+// haveSSE42 is defined in crc_amd64p32.s and uses CPUID to test for SSE 4.2
+// support.
+func haveSSE42() bool
+
+// castagnoliSSE42 is defined in crc_amd64.s and uses the SSE4.2 CRC32
+// instruction.
+//go:noescape
+func castagnoliSSE42(crc uint32, p []byte) uint32
+
+var sse42 = haveSSE42()
+
+func updateCastagnoli(crc uint32, p []byte) uint32 {
+	if sse42 {
+		return castagnoliSSE42(crc, p)
+	}
+	return update(crc, castagnoliTable, p)
+}
+
+func updateIEEE(crc uint32, p []byte) uint32 {
+	// only use slicing-by-8 when input is >= 4KB
+	if len(p) >= 4096 {
+		ieeeTable8Once.Do(func() {
+			ieeeTable8 = makeTable8(IEEE)
+		})
+		return updateSlicingBy8(crc, ieeeTable8, p)
+	}
+
+	return update(crc, IEEETable, p)
+}
diff --git a/vendor/github.com/klauspost/crc32/crc32_amd64p32.s b/vendor/github.com/klauspost/crc32/crc32_amd64p32.s
new file mode 100644
index 0000000000..a578d685cc
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/crc32_amd64p32.s
@@ -0,0 +1,67 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gc
+
+#define NOSPLIT 4
+#define RODATA 8
+
+// func castagnoliSSE42(crc uint32, p []byte) uint32
+TEXT ·castagnoliSSE42(SB), NOSPLIT, $0
+	MOVL crc+0(FP), AX   // CRC value
+	MOVL p+4(FP), SI     // data pointer
+	MOVL p_len+8(FP), CX // len(p)
+
+	NOTL AX
+
+	// If there's less than 8 bytes to process, we do it byte-by-byte.
+	CMPQ CX, $8
+	JL   cleanup
+
+	// Process individual bytes until the input is 8-byte aligned.
+startup:
+	MOVQ SI, BX
+	ANDQ $7, BX
+	JZ   aligned
+
+	CRC32B (SI), AX
+	DECQ   CX
+	INCQ   SI
+	JMP    startup
+
+aligned:
+	// The input is now 8-byte aligned and we can process 8-byte chunks.
+	CMPQ CX, $8
+	JL   cleanup
+
+	CRC32Q (SI), AX
+	ADDQ   $8, SI
+	SUBQ   $8, CX
+	JMP    aligned
+
+cleanup:
+	// We may have some bytes left over that we process one at a time.
+	CMPQ CX, $0
+	JE   done
+
+	CRC32B (SI), AX
+	INCQ   SI
+	DECQ   CX
+	JMP    cleanup
+
+done:
+	NOTL AX
+	MOVL AX, ret+16(FP)
+	RET
+
+// func haveSSE42() bool
+TEXT ·haveSSE42(SB), NOSPLIT, $0
+	XORQ AX, AX
+	INCL AX
+	CPUID
+	SHRQ $20, CX
+	ANDQ $1, CX
+	MOVB CX, ret+0(FP)
+	RET
+
diff --git a/vendor/github.com/klauspost/crc32/crc32_generic.go b/vendor/github.com/klauspost/crc32/crc32_generic.go
new file mode 100644
index 0000000000..a53cf96a00
--- /dev/null
+++ b/vendor/github.com/klauspost/crc32/crc32_generic.go
@@ -0,0 +1,29 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !amd64,!amd64p32 appengine gccgo
+
+package crc32
+
+// This file contains the generic version of updateCastagnoli which does
+// slicing-by-8, or uses the fallback for very small sizes.
+
+func updateCastagnoli(crc uint32, p []byte) uint32 {
+	// only use slicing-by-8 when input is >= 16 Bytes
+	if len(p) >= 16 {
+		return updateSlicingBy8(crc, castagnoliTable8, p)
+	}
+	return update(crc, castagnoliTable, p)
+}
+
+func updateIEEE(crc uint32, p []byte) uint32 {
+	// only use slicing-by-8 when input is >= 16 Bytes
+	if len(p) >= 16 {
+		ieeeTable8Once.Do(func() {
+			ieeeTable8 = makeTable8(IEEE)
+		})
+		return updateSlicingBy8(crc, ieeeTable8, p)
+	}
+	return update(crc, IEEETable, p)
+}
diff --git a/vendor/github.com/klauspost/pgzip/LICENSE b/vendor/github.com/klauspost/pgzip/LICENSE
new file mode 100644
index 0000000000..2bdc0d7517
--- /dev/null
+++ b/vendor/github.com/klauspost/pgzip/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Klaus Post
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/vendor/github.com/klauspost/pgzip/gunzip.go b/vendor/github.com/klauspost/pgzip/gunzip.go
new file mode 100644
index 0000000000..45b846e020
--- /dev/null
+++ b/vendor/github.com/klauspost/pgzip/gunzip.go
@@ -0,0 +1,564 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package pgzip implements reading and writing of gzip format compressed files,
+// as specified in RFC 1952.
+//
+// This is a drop in replacement for "compress/gzip".
+// This will split compression into blocks that are compressed in parallel.
+// This can be useful for compressing big amounts of data.
+// The gzip decompression has not been modified, but remains in the package,
+// so you can use it as a complete replacement for "compress/gzip".
+//
+// See more at https://github.com/klauspost/pgzip
+package pgzip
+
+import (
+	"bufio"
+	"errors"
+	"hash"
+	"io"
+	"sync"
+	"time"
+
+	"github.com/klauspost/compress/flate"
+	"github.com/klauspost/crc32"
+)
+
+const (
+	gzipID1     = 0x1f
+	gzipID2     = 0x8b
+	gzipDeflate = 8
+	flagText    = 1 << 0
+	flagHdrCrc  = 1 << 1
+	flagExtra   = 1 << 2
+	flagName    = 1 << 3
+	flagComment = 1 << 4
+)
+
+func makeReader(r io.Reader) flate.Reader {
+	if rr, ok := r.(flate.Reader); ok {
+		return rr
+	}
+	return bufio.NewReader(r)
+}
+
+var (
+	// ErrChecksum is returned when reading GZIP data that has an invalid checksum.
+	ErrChecksum = errors.New("gzip: invalid checksum")
+	// ErrHeader is returned when reading GZIP data that has an invalid header.
+	ErrHeader = errors.New("gzip: invalid header")
+)
+
+// The gzip file stores a header giving metadata about the compressed file.
+// That header is exposed as the fields of the Writer and Reader structs.
+type Header struct {
+	Comment string    // comment
+	Extra   []byte    // "extra data"
+	ModTime time.Time // modification time
+	Name    string    // file name
+	OS      byte      // operating system type
+}
+
+// A Reader is an io.Reader that can be read to retrieve
+// uncompressed data from a gzip-format compressed file.
+//
+// In general, a gzip file can be a concatenation of gzip files,
+// each with its own header.  Reads from the Reader
+// return the concatenation of the uncompressed data of each.
+// Only the first header is recorded in the Reader fields.
+//
+// Gzip files store a length and checksum of the uncompressed data.
+// The Reader will return a ErrChecksum when Read
+// reaches the end of the uncompressed data if it does not
+// have the expected length or checksum.  Clients should treat data
+// returned by Read as tentative until they receive the io.EOF
+// marking the end of the data.
+type Reader struct {
+	Header
+	r            flate.Reader
+	decompressor io.ReadCloser
+	digest       hash.Hash32
+	size         uint32
+	flg          byte
+	buf          [512]byte
+	err          error
+	closeErr     chan error
+	multistream  bool
+
+	readAhead   chan read
+	roff        int // read offset
+	current     []byte
+	closeReader chan struct{}
+	lastBlock   bool
+	blockSize   int
+	blocks      int
+
+	activeRA bool       // Indication if readahead is active
+	mu       sync.Mutex // Lock for above
+
+	blockPool chan []byte
+}
+
+type read struct {
+	b   []byte
+	err error
+}
+
+// NewReader creates a new Reader reading the given reader.
+// The implementation buffers input and may read more data than necessary from r.
+// It is the caller's responsibility to call Close on the Reader when done.
+func NewReader(r io.Reader) (*Reader, error) {
+	z := new(Reader)
+	z.blocks = defaultBlocks
+	z.blockSize = defaultBlockSize
+	z.r = makeReader(r)
+	z.digest = crc32.NewIEEE()
+	z.multistream = true
+	z.blockPool = make(chan []byte, z.blocks)
+	for i := 0; i < z.blocks; i++ {
+		z.blockPool <- make([]byte, z.blockSize)
+	}
+	if err := z.readHeader(true); err != nil {
+		return nil, err
+	}
+	return z, nil
+}
+
+// NewReaderN creates a new Reader reading the given reader.
+// The implementation buffers input and may read more data than necessary from r.
+// It is the caller's responsibility to call Close on the Reader when done.
+//
+// With this you can control the approximate size of your blocks,
+// as well as how many blocks you want to have prefetched.
+//
+// Default values for this is blockSize = 250000, blocks = 16,
+// meaning up to 16 blocks of maximum 250000 bytes will be
+// prefetched.
+func NewReaderN(r io.Reader, blockSize, blocks int) (*Reader, error) {
+	z := new(Reader)
+	z.blocks = blocks
+	z.blockSize = blockSize
+	z.r = makeReader(r)
+	z.digest = crc32.NewIEEE()
+	z.multistream = true
+
+	// Account for too small values
+	if z.blocks <= 0 {
+		z.blocks = defaultBlocks
+	}
+	if z.blockSize <= 512 {
+		z.blockSize = defaultBlockSize
+	}
+	z.blockPool = make(chan []byte, z.blocks)
+	for i := 0; i < z.blocks; i++ {
+		z.blockPool <- make([]byte, z.blockSize)
+	}
+	if err := z.readHeader(true); err != nil {
+		return nil, err
+	}
+	return z, nil
+}
+
+// Reset discards the Reader z's state and makes it equivalent to the
+// result of its original state from NewReader, but reading from r instead.
+// This permits reusing a Reader rather than allocating a new one.
+func (z *Reader) Reset(r io.Reader) error {
+	z.killReadAhead()
+	z.r = makeReader(r)
+	z.digest = crc32.NewIEEE()
+	z.size = 0
+	z.err = nil
+	z.multistream = true
+
+	// Account for uninitialized values
+	if z.blocks <= 0 {
+		z.blocks = defaultBlocks
+	}
+	if z.blockSize <= 512 {
+		z.blockSize = defaultBlockSize
+	}
+
+	if z.blockPool == nil {
+		z.blockPool = make(chan []byte, z.blocks)
+		for i := 0; i < z.blocks; i++ {
+			z.blockPool <- make([]byte, z.blockSize)
+		}
+	}
+
+	return z.readHeader(true)
+}
+
+// Multistream controls whether the reader supports multistream files.
+//
+// If enabled (the default), the Reader expects the input to be a sequence
+// of individually gzipped data streams, each with its own header and
+// trailer, ending at EOF. The effect is that the concatenation of a sequence
+// of gzipped files is treated as equivalent to the gzip of the concatenation
+// of the sequence. This is standard behavior for gzip readers.
+//
+// Calling Multistream(false) disables this behavior; disabling the behavior
+// can be useful when reading file formats that distinguish individual gzip
+// data streams or mix gzip data streams with other data streams.
+// In this mode, when the Reader reaches the end of the data stream,
+// Read returns io.EOF. If the underlying reader implements io.ByteReader,
+// it will be left positioned just after the gzip stream.
+// To start the next stream, call z.Reset(r) followed by z.Multistream(false).
+// If there is no next stream, z.Reset(r) will return io.EOF.
+func (z *Reader) Multistream(ok bool) {
+	z.multistream = ok
+}
+
+// GZIP (RFC 1952) is little-endian, unlike ZLIB (RFC 1950).
+func get4(p []byte) uint32 {
+	return uint32(p[0]) | uint32(p[1])<<8 | uint32(p[2])<<16 | uint32(p[3])<<24
+}
+
+func (z *Reader) readString() (string, error) {
+	var err error
+	needconv := false
+	for i := 0; ; i++ {
+		if i >= len(z.buf) {
+			return "", ErrHeader
+		}
+		z.buf[i], err = z.r.ReadByte()
+		if err != nil {
+			return "", err
+		}
+		if z.buf[i] > 0x7f {
+			needconv = true
+		}
+		if z.buf[i] == 0 {
+			// GZIP (RFC 1952) specifies that strings are NUL-terminated ISO 8859-1 (Latin-1).
+			if needconv {
+				s := make([]rune, 0, i)
+				for _, v := range z.buf[0:i] {
+					s = append(s, rune(v))
+				}
+				return string(s), nil
+			}
+			return string(z.buf[0:i]), nil
+		}
+	}
+}
+
+func (z *Reader) read2() (uint32, error) {
+	_, err := io.ReadFull(z.r, z.buf[0:2])
+	if err != nil {
+		return 0, err
+	}
+	return uint32(z.buf[0]) | uint32(z.buf[1])<<8, nil
+}
+
+func (z *Reader) readHeader(save bool) error {
+	z.killReadAhead()
+
+	_, err := io.ReadFull(z.r, z.buf[0:10])
+	if err != nil {
+		return err
+	}
+	if z.buf[0] != gzipID1 || z.buf[1] != gzipID2 || z.buf[2] != gzipDeflate {
+		return ErrHeader
+	}
+	z.flg = z.buf[3]
+	if save {
+		z.ModTime = time.Unix(int64(get4(z.buf[4:8])), 0)
+		// z.buf[8] is xfl, ignored
+		z.OS = z.buf[9]
+	}
+	z.digest.Reset()
+	z.digest.Write(z.buf[0:10])
+
+	if z.flg&flagExtra != 0 {
+		n, err := z.read2()
+		if err != nil {
+			return err
+		}
+		data := make([]byte, n)
+		if _, err = io.ReadFull(z.r, data); err != nil {
+			return err
+		}
+		if save {
+			z.Extra = data
+		}
+	}
+
+	var s string
+	if z.flg&flagName != 0 {
+		if s, err = z.readString(); err != nil {
+			return err
+		}
+		if save {
+			z.Name = s
+		}
+	}
+
+	if z.flg&flagComment != 0 {
+		if s, err = z.readString(); err != nil {
+			return err
+		}
+		if save {
+			z.Comment = s
+		}
+	}
+
+	if z.flg&flagHdrCrc != 0 {
+		n, err := z.read2()
+		if err != nil {
+			return err
+		}
+		sum := z.digest.Sum32() & 0xFFFF
+		if n != sum {
+			return ErrHeader
+		}
+	}
+
+	z.digest.Reset()
+	z.decompressor = flate.NewReader(z.r)
+	z.doReadAhead()
+	return nil
+}
+
+func (z *Reader) killReadAhead() error {
+	z.mu.Lock()
+	defer z.mu.Unlock()
+	if z.activeRA {
+		if z.closeReader != nil {
+			close(z.closeReader)
+		}
+
+		// Wait for decompressor to be closed and return error, if any.
+		e, ok := <-z.closeErr
+		z.activeRA = false
+		if !ok {
+			// Channel is closed, so if there was any error it has already been returned.
+			return nil
+		}
+		return e
+	}
+	return nil
+}
+
+// Starts readahead.
+// Will return on error (including io.EOF)
+// or when z.closeReader is closed.
+func (z *Reader) doReadAhead() {
+	z.mu.Lock()
+	defer z.mu.Unlock()
+	z.activeRA = true
+
+	if z.blocks <= 0 {
+		z.blocks = defaultBlocks
+	}
+	if z.blockSize <= 512 {
+		z.blockSize = defaultBlockSize
+	}
+	ra := make(chan read, z.blocks)
+	z.readAhead = ra
+	closeReader := make(chan struct{}, 0)
+	z.closeReader = closeReader
+	z.lastBlock = false
+	closeErr := make(chan error, 1)
+	z.closeErr = closeErr
+	z.size = 0
+	z.roff = 0
+	z.current = nil
+	decomp := z.decompressor
+
+	go func() {
+		defer func() {
+			closeErr <- decomp.Close()
+			close(closeErr)
+			close(ra)
+		}()
+
+		// We hold a local reference to digest, since
+		// it way be changed by reset.
+		digest := z.digest
+		var wg sync.WaitGroup
+		for {
+			var buf []byte
+			select {
+			case buf = <-z.blockPool:
+			case <-closeReader:
+				return
+			}
+			buf = buf[0:z.blockSize]
+			// Try to fill the buffer
+			n, err := io.ReadFull(decomp, buf)
+			if err == io.ErrUnexpectedEOF {
+				err = nil
+			}
+			if n < len(buf) {
+				buf = buf[0:n]
+			}
+			wg.Wait()
+			wg.Add(1)
+			go func() {
+				digest.Write(buf)
+				wg.Done()
+			}()
+			z.size += uint32(n)
+
+			// If we return any error, out digest must be ready
+			if err != nil {
+				wg.Wait()
+			}
+			select {
+			case z.readAhead <- read{b: buf, err: err}:
+			case <-closeReader:
+				// Sent on close, we don't care about the next results
+				return
+			}
+			if err != nil {
+				return
+			}
+		}
+	}()
+}
+
+func (z *Reader) Read(p []byte) (n int, err error) {
+	if z.err != nil {
+		return 0, z.err
+	}
+	if len(p) == 0 {
+		return 0, nil
+	}
+
+	for {
+		if len(z.current) == 0 && !z.lastBlock {
+			read := <-z.readAhead
+
+			if read.err != nil {
+				// If not nil, the reader will have exited
+				z.closeReader = nil
+
+				if read.err != io.EOF {
+					z.err = read.err
+					return
+				}
+				if read.err == io.EOF {
+					z.lastBlock = true
+					err = nil
+				}
+			}
+			z.current = read.b
+			z.roff = 0
+		}
+		avail := z.current[z.roff:]
+		if len(p) >= len(avail) {
+			// If len(p) >= len(current), return all content of current
+			n = copy(p, avail)
+			z.blockPool <- z.current
+			z.current = nil
+			if z.lastBlock {
+				err = io.EOF
+				break
+			}
+		} else {
+			// We copy as much as there is space for
+			n = copy(p, avail)
+			z.roff += n
+		}
+		return
+	}
+
+	// Finished file; check checksum + size.
+	if _, err := io.ReadFull(z.r, z.buf[0:8]); err != nil {
+		z.err = err
+		return 0, err
+	}
+	crc32, isize := get4(z.buf[0:4]), get4(z.buf[4:8])
+	sum := z.digest.Sum32()
+	if sum != crc32 || isize != z.size {
+		z.err = ErrChecksum
+		return 0, z.err
+	}
+
+	// File is ok; should we attempt reading one more?
+	if !z.multistream {
+		return 0, io.EOF
+	}
+
+	// Is there another?
+	if err = z.readHeader(false); err != nil {
+		z.err = err
+		return
+	}
+
+	// Yes.  Reset and read from it.
+	return z.Read(p)
+}
+
+func (z *Reader) WriteTo(w io.Writer) (n int64, err error) {
+	total := int64(0)
+	for {
+		if z.err != nil {
+			return total, z.err
+		}
+		// We write both to output and digest.
+		for {
+			// Read from input
+			read := <-z.readAhead
+			if read.err != nil {
+				// If not nil, the reader will have exited
+				z.closeReader = nil
+
+				if read.err != io.EOF {
+					z.err = read.err
+					return total, z.err
+				}
+				if read.err == io.EOF {
+					z.lastBlock = true
+					err = nil
+				}
+			}
+			// Write what we got
+			n, err := w.Write(read.b)
+			if n != len(read.b) {
+				return total, io.ErrShortWrite
+			}
+			total += int64(n)
+			if err != nil {
+				return total, err
+			}
+			// Put block back
+			z.blockPool <- read.b
+			if z.lastBlock {
+				break
+			}
+		}
+
+		// Finished file; check checksum + size.
+		if _, err := io.ReadFull(z.r, z.buf[0:8]); err != nil {
+			z.err = err
+			return total, err
+		}
+		crc32, isize := get4(z.buf[0:4]), get4(z.buf[4:8])
+		sum := z.digest.Sum32()
+		if sum != crc32 || isize != z.size {
+			z.err = ErrChecksum
+			return total, z.err
+		}
+		// File is ok; should we attempt reading one more?
+		if !z.multistream {
+			return total, nil
+		}
+
+		// Is there another?
+		err = z.readHeader(false)
+		if err == io.EOF {
+			return total, nil
+		}
+		if err != nil {
+			z.err = err
+			return total, err
+		}
+	}
+}
+
+// Close closes the Reader. It does not close the underlying io.Reader.
+func (z *Reader) Close() error {
+	return z.killReadAhead()
+}
diff --git a/vendor/github.com/klauspost/pgzip/gzip.go b/vendor/github.com/klauspost/pgzip/gzip.go
new file mode 100644
index 0000000000..872afe7eb0
--- /dev/null
+++ b/vendor/github.com/klauspost/pgzip/gzip.go
@@ -0,0 +1,485 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package pgzip
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"hash"
+	"io"
+	"sync"
+
+	"github.com/klauspost/compress/flate"
+	"github.com/klauspost/crc32"
+)
+
+const (
+	defaultBlockSize = 250000
+	tailSize         = 16384
+	defaultBlocks    = 16
+)
+
+// These constants are copied from the flate package, so that code that imports
+// "compress/gzip" does not also have to import "compress/flate".
+const (
+	NoCompression       = flate.NoCompression
+	BestSpeed           = flate.BestSpeed
+	BestCompression     = flate.BestCompression
+	DefaultCompression  = flate.DefaultCompression
+	ConstantCompression = flate.ConstantCompression
+)
+
+// A Writer is an io.WriteCloser.
+// Writes to a Writer are compressed and written to w.
+type Writer struct {
+	Header
+	w             io.Writer
+	level         int
+	wroteHeader   bool
+	blockSize     int
+	blocks        int
+	currentBuffer []byte
+	prevTail      []byte
+	digest        hash.Hash32
+	size          int
+	closed        bool
+	buf           [10]byte
+	err           error
+	pushedErr     chan error
+	results       chan result
+	dictFlatePool *sync.Pool
+	dstPool       *sync.Pool
+}
+
+type result struct {
+	result        chan []byte
+	notifyWritten chan struct{}
+}
+
+// Use SetConcurrency to finetune the concurrency level if needed.
+//
+// With this you can control the approximate size of your blocks,
+// as well as how many you want to be processing in parallel.
+//
+// Default values for this is SetConcurrency(250000, 16),
+// meaning blocks are split at 250000 bytes and up to 16 blocks
+// can be processing at once before the writer blocks.
+func (z *Writer) SetConcurrency(blockSize, blocks int) error {
+	if blockSize <= tailSize {
+		return fmt.Errorf("gzip: block size cannot be less than or equal to %d", tailSize)
+	}
+	if blocks <= 0 {
+		return errors.New("gzip: blocks cannot be zero or less")
+	}
+	z.blockSize = blockSize
+	z.results = make(chan result, blocks)
+	z.blocks = blocks
+	return nil
+}
+
+// NewWriter returns a new Writer.
+// Writes to the returned writer are compressed and written to w.
+//
+// It is the caller's responsibility to call Close on the WriteCloser when done.
+// Writes may be buffered and not flushed until Close.
+//
+// Callers that wish to set the fields in Writer.Header must do so before
+// the first call to Write or Close. The Comment and Name header fields are
+// UTF-8 strings in Go, but the underlying format requires NUL-terminated ISO
+// 8859-1 (Latin-1). NUL or non-Latin-1 runes in those strings will lead to an
+// error on Write.
+func NewWriter(w io.Writer) *Writer {
+	z, _ := NewWriterLevel(w, DefaultCompression)
+	return z
+}
+
+// NewWriterLevel is like NewWriter but specifies the compression level instead
+// of assuming DefaultCompression.
+//
+// The compression level can be DefaultCompression, NoCompression, or any
+// integer value between BestSpeed and BestCompression inclusive. The error
+// returned will be nil if the level is valid.
+func NewWriterLevel(w io.Writer, level int) (*Writer, error) {
+	if level < ConstantCompression || level > BestCompression {
+		return nil, fmt.Errorf("gzip: invalid compression level: %d", level)
+	}
+	z := new(Writer)
+	z.SetConcurrency(defaultBlockSize, defaultBlocks)
+	z.init(w, level)
+	return z, nil
+}
+
+// This function must be used by goroutines to set an
+// error condition, since z.err access is restricted
+// to the callers goruotine.
+func (z *Writer) pushError(err error) {
+	z.pushedErr <- err
+	close(z.pushedErr)
+}
+
+func (z *Writer) init(w io.Writer, level int) {
+	digest := z.digest
+	if digest != nil {
+		digest.Reset()
+	} else {
+		digest = crc32.NewIEEE()
+	}
+
+	*z = Writer{
+		Header: Header{
+			OS: 255, // unknown
+		},
+		w:         w,
+		level:     level,
+		digest:    digest,
+		pushedErr: make(chan error, 1),
+		results:   make(chan result, z.blocks),
+		blockSize: z.blockSize,
+		blocks:    z.blocks,
+	}
+	z.dictFlatePool = &sync.Pool{
+		New: func() interface{} {
+			f, _ := flate.NewWriterDict(w, level, nil)
+			return f
+		},
+	}
+	z.dstPool = &sync.Pool{New: func() interface{} { return make([]byte, 0, z.blockSize) }}
+
+}
+
+// Reset discards the Writer z's state and makes it equivalent to the
+// result of its original state from NewWriter or NewWriterLevel, but
+// writing to w instead. This permits reusing a Writer rather than
+// allocating a new one.
+func (z *Writer) Reset(w io.Writer) {
+	if z.results != nil && !z.closed {
+		close(z.results)
+	}
+	z.SetConcurrency(defaultBlockSize, defaultBlocks)
+	z.init(w, z.level)
+}
+
+// GZIP (RFC 1952) is little-endian, unlike ZLIB (RFC 1950).
+func put2(p []byte, v uint16) {
+	p[0] = uint8(v >> 0)
+	p[1] = uint8(v >> 8)
+}
+
+func put4(p []byte, v uint32) {
+	p[0] = uint8(v >> 0)
+	p[1] = uint8(v >> 8)
+	p[2] = uint8(v >> 16)
+	p[3] = uint8(v >> 24)
+}
+
+// writeBytes writes a length-prefixed byte slice to z.w.
+func (z *Writer) writeBytes(b []byte) error {
+	if len(b) > 0xffff {
+		return errors.New("gzip.Write: Extra data is too large")
+	}
+	put2(z.buf[0:2], uint16(len(b)))
+	_, err := z.w.Write(z.buf[0:2])
+	if err != nil {
+		return err
+	}
+	_, err = z.w.Write(b)
+	return err
+}
+
+// writeString writes a UTF-8 string s in GZIP's format to z.w.
+// GZIP (RFC 1952) specifies that strings are NUL-terminated ISO 8859-1 (Latin-1).
+func (z *Writer) writeString(s string) (err error) {
+	// GZIP stores Latin-1 strings; error if non-Latin-1; convert if non-ASCII.
+	needconv := false
+	for _, v := range s {
+		if v == 0 || v > 0xff {
+			return errors.New("gzip.Write: non-Latin-1 header string")
+		}
+		if v > 0x7f {
+			needconv = true
+		}
+	}
+	if needconv {
+		b := make([]byte, 0, len(s))
+		for _, v := range s {
+			b = append(b, byte(v))
+		}
+		_, err = z.w.Write(b)
+	} else {
+		_, err = io.WriteString(z.w, s)
+	}
+	if err != nil {
+		return err
+	}
+	// GZIP strings are NUL-terminated.
+	z.buf[0] = 0
+	_, err = z.w.Write(z.buf[0:1])
+	return err
+}
+
+// compressCurrent will compress the data currently buffered
+// This should only be called from the main writer/flush/closer
+func (z *Writer) compressCurrent(flush bool) {
+	r := result{}
+	r.result = make(chan []byte, 1)
+	r.notifyWritten = make(chan struct{}, 0)
+	z.results <- r
+
+	// If block given is more than twice the block size, split it.
+	c := z.currentBuffer
+	if len(c) > z.blockSize*2 {
+		c = c[:z.blockSize]
+		go compressBlock(c, z.prevTail, *z, r)
+		z.prevTail = c[len(c)-tailSize:]
+		z.currentBuffer = z.currentBuffer[z.blockSize:]
+		z.compressCurrent(flush)
+		// Last one flushes if needed
+		return
+	}
+
+	go compressBlock(c, z.prevTail, *z, r)
+	if len(c) > tailSize {
+		z.prevTail = c[len(c)-tailSize:]
+	} else {
+		z.prevTail = nil
+	}
+	z.currentBuffer = make([]byte, 0, z.blockSize+(z.blockSize/4))
+
+	// Wait if flushing
+	if flush {
+		_ = <-r.notifyWritten
+	}
+}
+
+// Returns an error if it has been set.
+// Cannot be used by functions that are from internal goroutines.
+func (z *Writer) checkError() error {
+	if z.err != nil {
+		return z.err
+	}
+	select {
+	case err := <-z.pushedErr:
+		z.err = err
+	default:
+	}
+	return z.err
+}
+
+// Write writes a compressed form of p to the underlying io.Writer. The
+// compressed bytes are not necessarily flushed to output until
+// the Writer is closed or Flush() is called.
+//
+// The function will return quickly, if there are unused buffers.
+// The sent slice (p) is copied, and the caller is free to re-use the buffer
+// when the function returns.
+//
+// Errors that occur during compression will be reported later, and a nil error
+// does not signify that the compression succeeded (since it is most likely still running)
+// That means that the call that returns an error may not be the call that caused it.
+// Only Flush and Close functions are guaranteed to return any errors up to that point.
+func (z *Writer) Write(p []byte) (int, error) {
+	if z.checkError() != nil {
+		return 0, z.err
+	}
+	// Write the GZIP header lazily.
+	if !z.wroteHeader {
+		z.wroteHeader = true
+		z.buf[0] = gzipID1
+		z.buf[1] = gzipID2
+		z.buf[2] = gzipDeflate
+		z.buf[3] = 0
+		if z.Extra != nil {
+			z.buf[3] |= 0x04
+		}
+		if z.Name != "" {
+			z.buf[3] |= 0x08
+		}
+		if z.Comment != "" {
+			z.buf[3] |= 0x10
+		}
+		put4(z.buf[4:8], uint32(z.ModTime.Unix()))
+		if z.level == BestCompression {
+			z.buf[8] = 2
+		} else if z.level == BestSpeed {
+			z.buf[8] = 4
+		} else {
+			z.buf[8] = 0
+		}
+		z.buf[9] = z.OS
+		var n int
+		n, z.err = z.w.Write(z.buf[0:10])
+		if z.err != nil {
+			return n, z.err
+		}
+		if z.Extra != nil {
+			z.err = z.writeBytes(z.Extra)
+			if z.err != nil {
+				return n, z.err
+			}
+		}
+		if z.Name != "" {
+			z.err = z.writeString(z.Name)
+			if z.err != nil {
+				return n, z.err
+			}
+		}
+		if z.Comment != "" {
+			z.err = z.writeString(z.Comment)
+			if z.err != nil {
+				return n, z.err
+			}
+		}
+		// Start receiving data from compressors
+		go func() {
+			listen := z.results
+			for {
+				r, ok := <-listen
+				// If closed, we are finished.
+				if !ok {
+					return
+				}
+				buf := <-r.result
+				n, err := z.w.Write(buf)
+				if err != nil {
+					z.pushError(err)
+					close(r.notifyWritten)
+					return
+				}
+				if n != len(buf) {
+					z.pushError(fmt.Errorf("gzip: short write %d should be %d", n, len(buf)))
+					close(r.notifyWritten)
+					return
+				}
+				z.dstPool.Put(buf)
+				close(r.notifyWritten)
+			}
+		}()
+		z.currentBuffer = make([]byte, 0, z.blockSize+(z.blockSize/4))
+	}
+	// Handle very large writes in a loop
+	if len(p) > z.blockSize*z.blocks {
+		q := p
+		for len(q) > 0 {
+			length := len(q)
+			if length > z.blockSize {
+				length = z.blockSize
+			}
+			z.digest.Write(q[:length])
+			z.currentBuffer = append(z.currentBuffer, q[:length]...)
+			if len(z.currentBuffer) >= z.blockSize {
+				z.compressCurrent(false)
+				if z.err != nil {
+					return len(p) - len(q) - length, z.err
+				}
+			}
+			z.size += length
+			q = q[length:]
+		}
+		return len(p), z.err
+	} else {
+		z.size += len(p)
+		z.digest.Write(p)
+		z.currentBuffer = append(z.currentBuffer, p...)
+		if len(z.currentBuffer) >= z.blockSize {
+			z.compressCurrent(false)
+		}
+		return len(p), z.err
+	}
+}
+
+// Step 1: compresses buffer to buffer
+// Step 2: send writer to channel
+// Step 3: Close result channel to indicate we are done
+func compressBlock(p, prevTail []byte, z Writer, r result) {
+	defer close(r.result)
+	buf := z.dstPool.Get().([]byte)
+	dest := bytes.NewBuffer(buf[:0])
+
+	compressor := z.dictFlatePool.Get().(*flate.Writer)
+	compressor.ResetDict(dest, prevTail)
+	compressor.Write(p)
+
+	err := compressor.Flush()
+	if err != nil {
+		z.pushError(err)
+		return
+	}
+	if z.closed {
+		err = compressor.Close()
+		if err != nil {
+			z.pushError(err)
+			return
+		}
+	}
+	z.dictFlatePool.Put(compressor)
+	// Read back buffer
+	buf = dest.Bytes()
+	r.result <- buf
+}
+
+// Flush flushes any pending compressed data to the underlying writer.
+//
+// It is useful mainly in compressed network protocols, to ensure that
+// a remote reader has enough data to reconstruct a packet. Flush does
+// not return until the data has been written. If the underlying
+// writer returns an error, Flush returns that error.
+//
+// In the terminology of the zlib library, Flush is equivalent to Z_SYNC_FLUSH.
+func (z *Writer) Flush() error {
+	if z.checkError() != nil {
+		return z.err
+	}
+	if z.closed {
+		return nil
+	}
+	if !z.wroteHeader {
+		_, err := z.Write(nil)
+		if err != nil {
+			return err
+		}
+	}
+	// We send current block to compression
+	z.compressCurrent(true)
+	if z.checkError() != nil {
+		return z.err
+	}
+
+	return nil
+}
+
+// UncompressedSize will return the number of bytes written.
+// pgzip only, not a function in the official gzip package.
+func (z Writer) UncompressedSize() int {
+	return z.size
+}
+
+// Close closes the Writer, flushing any unwritten data to the underlying
+// io.Writer, but does not close the underlying io.Writer.
+func (z *Writer) Close() error {
+	if z.checkError() != nil {
+		return z.err
+	}
+	if z.closed {
+		return nil
+	}
+
+	z.closed = true
+	if !z.wroteHeader {
+		z.Write(nil)
+		if z.err != nil {
+			return z.err
+		}
+	}
+	z.compressCurrent(true)
+	if z.checkError() != nil {
+		return z.err
+	}
+	close(z.results)
+	put4(z.buf[0:4], z.digest.Sum32())
+	put4(z.buf[4:8], uint32(z.size))
+	_, z.err = z.w.Write(z.buf[0:8])
+	return z.err
+}
diff --git a/vendor/github.com/kr/pty/License b/vendor/github.com/kr/pty/License
new file mode 100644
index 0000000000..6b7558b6b4
--- /dev/null
+++ b/vendor/github.com/kr/pty/License
@@ -0,0 +1,23 @@
+Copyright (c) 2011 Keith Rarick
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall
+be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/kr/pty/doc.go b/vendor/github.com/kr/pty/doc.go
new file mode 100644
index 0000000000..190cfbea92
--- /dev/null
+++ b/vendor/github.com/kr/pty/doc.go
@@ -0,0 +1,16 @@
+// Package pty provides functions for working with Unix terminals.
+package pty
+
+import (
+	"errors"
+	"os"
+)
+
+// ErrUnsupported is returned if a function is not
+// available on the current platform.
+var ErrUnsupported = errors.New("unsupported")
+
+// Opens a pty and its corresponding tty.
+func Open() (pty, tty *os.File, err error) {
+	return open()
+}
diff --git a/vendor/github.com/kr/pty/ioctl.go b/vendor/github.com/kr/pty/ioctl.go
new file mode 100644
index 0000000000..5b856e8711
--- /dev/null
+++ b/vendor/github.com/kr/pty/ioctl.go
@@ -0,0 +1,11 @@
+package pty
+
+import "syscall"
+
+func ioctl(fd, cmd, ptr uintptr) error {
+	_, _, e := syscall.Syscall(syscall.SYS_IOCTL, fd, cmd, ptr)
+	if e != 0 {
+		return e
+	}
+	return nil
+}
diff --git a/vendor/github.com/kr/pty/ioctl_bsd.go b/vendor/github.com/kr/pty/ioctl_bsd.go
new file mode 100644
index 0000000000..73b12c53cf
--- /dev/null
+++ b/vendor/github.com/kr/pty/ioctl_bsd.go
@@ -0,0 +1,39 @@
+// +build darwin dragonfly freebsd netbsd openbsd
+
+package pty
+
+// from <sys/ioccom.h>
+const (
+	_IOC_VOID    uintptr = 0x20000000
+	_IOC_OUT     uintptr = 0x40000000
+	_IOC_IN      uintptr = 0x80000000
+	_IOC_IN_OUT  uintptr = _IOC_OUT | _IOC_IN
+	_IOC_DIRMASK         = _IOC_VOID | _IOC_OUT | _IOC_IN
+
+	_IOC_PARAM_SHIFT = 13
+	_IOC_PARAM_MASK  = (1 << _IOC_PARAM_SHIFT) - 1
+)
+
+func _IOC_PARM_LEN(ioctl uintptr) uintptr {
+	return (ioctl >> 16) & _IOC_PARAM_MASK
+}
+
+func _IOC(inout uintptr, group byte, ioctl_num uintptr, param_len uintptr) uintptr {
+	return inout | (param_len&_IOC_PARAM_MASK)<<16 | uintptr(group)<<8 | ioctl_num
+}
+
+func _IO(group byte, ioctl_num uintptr) uintptr {
+	return _IOC(_IOC_VOID, group, ioctl_num, 0)
+}
+
+func _IOR(group byte, ioctl_num uintptr, param_len uintptr) uintptr {
+	return _IOC(_IOC_OUT, group, ioctl_num, param_len)
+}
+
+func _IOW(group byte, ioctl_num uintptr, param_len uintptr) uintptr {
+	return _IOC(_IOC_IN, group, ioctl_num, param_len)
+}
+
+func _IOWR(group byte, ioctl_num uintptr, param_len uintptr) uintptr {
+	return _IOC(_IOC_IN_OUT, group, ioctl_num, param_len)
+}
diff --git a/vendor/github.com/kr/pty/pty_darwin.go b/vendor/github.com/kr/pty/pty_darwin.go
new file mode 100644
index 0000000000..4f4d5ca26e
--- /dev/null
+++ b/vendor/github.com/kr/pty/pty_darwin.go
@@ -0,0 +1,60 @@
+package pty
+
+import (
+	"errors"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+func open() (pty, tty *os.File, err error) {
+	p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	sname, err := ptsname(p)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	err = grantpt(p)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	err = unlockpt(p)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	t, err := os.OpenFile(sname, os.O_RDWR, 0)
+	if err != nil {
+		return nil, nil, err
+	}
+	return p, t, nil
+}
+
+func ptsname(f *os.File) (string, error) {
+	n := make([]byte, _IOC_PARM_LEN(syscall.TIOCPTYGNAME))
+
+	err := ioctl(f.Fd(), syscall.TIOCPTYGNAME, uintptr(unsafe.Pointer(&n[0])))
+	if err != nil {
+		return "", err
+	}
+
+	for i, c := range n {
+		if c == 0 {
+			return string(n[:i]), nil
+		}
+	}
+	return "", errors.New("TIOCPTYGNAME string not NUL-terminated")
+}
+
+func grantpt(f *os.File) error {
+	return ioctl(f.Fd(), syscall.TIOCPTYGRANT, 0)
+}
+
+func unlockpt(f *os.File) error {
+	return ioctl(f.Fd(), syscall.TIOCPTYUNLK, 0)
+}
diff --git a/vendor/github.com/kr/pty/pty_freebsd.go b/vendor/github.com/kr/pty/pty_freebsd.go
new file mode 100644
index 0000000000..b341babd05
--- /dev/null
+++ b/vendor/github.com/kr/pty/pty_freebsd.go
@@ -0,0 +1,73 @@
+package pty
+
+import (
+	"errors"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+func posix_openpt(oflag int) (fd int, err error) {
+	r0, _, e1 := syscall.Syscall(syscall.SYS_POSIX_OPENPT, uintptr(oflag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func open() (pty, tty *os.File, err error) {
+	fd, err := posix_openpt(syscall.O_RDWR | syscall.O_CLOEXEC)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	p := os.NewFile(uintptr(fd), "/dev/pts")
+	sname, err := ptsname(p)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	t, err := os.OpenFile("/dev/"+sname, os.O_RDWR, 0)
+	if err != nil {
+		return nil, nil, err
+	}
+	return p, t, nil
+}
+
+func isptmaster(fd uintptr) (bool, error) {
+	err := ioctl(fd, syscall.TIOCPTMASTER, 0)
+	return err == nil, err
+}
+
+var (
+	emptyFiodgnameArg fiodgnameArg
+	ioctl_FIODGNAME   = _IOW('f', 120, unsafe.Sizeof(emptyFiodgnameArg))
+)
+
+func ptsname(f *os.File) (string, error) {
+	master, err := isptmaster(f.Fd())
+	if err != nil {
+		return "", err
+	}
+	if !master {
+		return "", syscall.EINVAL
+	}
+
+	const n = _C_SPECNAMELEN + 1
+	var (
+		buf = make([]byte, n)
+		arg = fiodgnameArg{Len: n, Buf: (*byte)(unsafe.Pointer(&buf[0]))}
+	)
+	err = ioctl(f.Fd(), ioctl_FIODGNAME, uintptr(unsafe.Pointer(&arg)))
+	if err != nil {
+		return "", err
+	}
+
+	for i, c := range buf {
+		if c == 0 {
+			return string(buf[:i]), nil
+		}
+	}
+	return "", errors.New("FIODGNAME string not NUL-terminated")
+}
diff --git a/vendor/github.com/kr/pty/pty_linux.go b/vendor/github.com/kr/pty/pty_linux.go
new file mode 100644
index 0000000000..cb901a21e0
--- /dev/null
+++ b/vendor/github.com/kr/pty/pty_linux.go
@@ -0,0 +1,46 @@
+package pty
+
+import (
+	"os"
+	"strconv"
+	"syscall"
+	"unsafe"
+)
+
+func open() (pty, tty *os.File, err error) {
+	p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	sname, err := ptsname(p)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	err = unlockpt(p)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	t, err := os.OpenFile(sname, os.O_RDWR|syscall.O_NOCTTY, 0)
+	if err != nil {
+		return nil, nil, err
+	}
+	return p, t, nil
+}
+
+func ptsname(f *os.File) (string, error) {
+	var n _C_uint
+	err := ioctl(f.Fd(), syscall.TIOCGPTN, uintptr(unsafe.Pointer(&n)))
+	if err != nil {
+		return "", err
+	}
+	return "/dev/pts/" + strconv.Itoa(int(n)), nil
+}
+
+func unlockpt(f *os.File) error {
+	var u _C_int
+	// use TIOCSPTLCK with a zero valued arg to clear the slave pty lock
+	return ioctl(f.Fd(), syscall.TIOCSPTLCK, uintptr(unsafe.Pointer(&u)))
+}
diff --git a/vendor/github.com/kr/pty/pty_unsupported.go b/vendor/github.com/kr/pty/pty_unsupported.go
new file mode 100644
index 0000000000..898c7303c4
--- /dev/null
+++ b/vendor/github.com/kr/pty/pty_unsupported.go
@@ -0,0 +1,11 @@
+// +build !linux,!darwin,!freebsd
+
+package pty
+
+import (
+	"os"
+)
+
+func open() (pty, tty *os.File, err error) {
+	return nil, nil, ErrUnsupported
+}
diff --git a/vendor/github.com/kr/pty/run.go b/vendor/github.com/kr/pty/run.go
new file mode 100644
index 0000000000..c2bc48878c
--- /dev/null
+++ b/vendor/github.com/kr/pty/run.go
@@ -0,0 +1,32 @@
+package pty
+
+import (
+	"os"
+	"os/exec"
+	"syscall"
+)
+
+// Start assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout,
+// and c.Stderr, calls c.Start, and returns the File of the tty's
+// corresponding pty.
+func Start(c *exec.Cmd) (pty *os.File, err error) {
+	pty, tty, err := Open()
+	if err != nil {
+		return nil, err
+	}
+	defer tty.Close()
+	c.Stdout = tty
+	c.Stdin = tty
+	c.Stderr = tty
+	if c.SysProcAttr == nil {
+		c.SysProcAttr = &syscall.SysProcAttr{}
+	}
+	c.SysProcAttr.Setctty = true
+	c.SysProcAttr.Setsid = true
+	err = c.Start()
+	if err != nil {
+		pty.Close()
+		return nil, err
+	}
+	return pty, err
+}
diff --git a/vendor/github.com/kr/pty/types.go b/vendor/github.com/kr/pty/types.go
new file mode 100644
index 0000000000..5aecb6bcdc
--- /dev/null
+++ b/vendor/github.com/kr/pty/types.go
@@ -0,0 +1,10 @@
+// +build ignore
+
+package pty
+
+import "C"
+
+type (
+	_C_int  C.int
+	_C_uint C.uint
+)
diff --git a/vendor/github.com/kr/pty/types_freebsd.go b/vendor/github.com/kr/pty/types_freebsd.go
new file mode 100644
index 0000000000..ce3eb95181
--- /dev/null
+++ b/vendor/github.com/kr/pty/types_freebsd.go
@@ -0,0 +1,15 @@
+// +build ignore
+
+package pty
+
+/*
+#include <sys/param.h>
+#include <sys/filio.h>
+*/
+import "C"
+
+const (
+	_C_SPECNAMELEN = C.SPECNAMELEN /* max length of devicename */
+)
+
+type fiodgnameArg C.struct_fiodgname_arg
diff --git a/vendor/github.com/kr/pty/util.go b/vendor/github.com/kr/pty/util.go
new file mode 100644
index 0000000000..67c52d06cd
--- /dev/null
+++ b/vendor/github.com/kr/pty/util.go
@@ -0,0 +1,35 @@
+package pty
+
+import (
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+// Getsize returns the number of rows (lines) and cols (positions
+// in each line) in terminal t.
+func Getsize(t *os.File) (rows, cols int, err error) {
+	var ws winsize
+	err = windowrect(&ws, t.Fd())
+	return int(ws.ws_row), int(ws.ws_col), err
+}
+
+type winsize struct {
+	ws_row    uint16
+	ws_col    uint16
+	ws_xpixel uint16
+	ws_ypixel uint16
+}
+
+func windowrect(ws *winsize, fd uintptr) error {
+	_, _, errno := syscall.Syscall(
+		syscall.SYS_IOCTL,
+		fd,
+		syscall.TIOCGWINSZ,
+		uintptr(unsafe.Pointer(ws)),
+	)
+	if errno != 0 {
+		return syscall.Errno(errno)
+	}
+	return nil
+}
diff --git a/vendor/github.com/kr/pty/ztypes_386.go b/vendor/github.com/kr/pty/ztypes_386.go
new file mode 100644
index 0000000000..ff0b8fd838
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_386.go
@@ -0,0 +1,9 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types.go
+
+package pty
+
+type (
+	_C_int  int32
+	_C_uint uint32
+)
diff --git a/vendor/github.com/kr/pty/ztypes_amd64.go b/vendor/github.com/kr/pty/ztypes_amd64.go
new file mode 100644
index 0000000000..ff0b8fd838
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_amd64.go
@@ -0,0 +1,9 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types.go
+
+package pty
+
+type (
+	_C_int  int32
+	_C_uint uint32
+)
diff --git a/vendor/github.com/kr/pty/ztypes_arm.go b/vendor/github.com/kr/pty/ztypes_arm.go
new file mode 100644
index 0000000000..ff0b8fd838
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_arm.go
@@ -0,0 +1,9 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types.go
+
+package pty
+
+type (
+	_C_int  int32
+	_C_uint uint32
+)
diff --git a/vendor/github.com/kr/pty/ztypes_arm64.go b/vendor/github.com/kr/pty/ztypes_arm64.go
new file mode 100644
index 0000000000..6c29a4b918
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_arm64.go
@@ -0,0 +1,11 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types.go
+
+// +build arm64
+
+package pty
+
+type (
+	_C_int  int32
+	_C_uint uint32
+)
diff --git a/vendor/github.com/kr/pty/ztypes_freebsd_386.go b/vendor/github.com/kr/pty/ztypes_freebsd_386.go
new file mode 100644
index 0000000000..d9975374e3
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_freebsd_386.go
@@ -0,0 +1,13 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package pty
+
+const (
+	_C_SPECNAMELEN = 0x3f
+)
+
+type fiodgnameArg struct {
+	Len int32
+	Buf *byte
+}
diff --git a/vendor/github.com/kr/pty/ztypes_freebsd_amd64.go b/vendor/github.com/kr/pty/ztypes_freebsd_amd64.go
new file mode 100644
index 0000000000..5fa102fcdf
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_freebsd_amd64.go
@@ -0,0 +1,14 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package pty
+
+const (
+	_C_SPECNAMELEN = 0x3f
+)
+
+type fiodgnameArg struct {
+	Len       int32
+	Pad_cgo_0 [4]byte
+	Buf       *byte
+}
diff --git a/vendor/github.com/kr/pty/ztypes_freebsd_arm.go b/vendor/github.com/kr/pty/ztypes_freebsd_arm.go
new file mode 100644
index 0000000000..d9975374e3
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_freebsd_arm.go
@@ -0,0 +1,13 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package pty
+
+const (
+	_C_SPECNAMELEN = 0x3f
+)
+
+type fiodgnameArg struct {
+	Len int32
+	Buf *byte
+}
diff --git a/vendor/github.com/kr/pty/ztypes_ppc64.go b/vendor/github.com/kr/pty/ztypes_ppc64.go
new file mode 100644
index 0000000000..4e1af84312
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_ppc64.go
@@ -0,0 +1,11 @@
+// +build ppc64
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types.go
+
+package pty
+
+type (
+	_C_int  int32
+	_C_uint uint32
+)
diff --git a/vendor/github.com/kr/pty/ztypes_ppc64le.go b/vendor/github.com/kr/pty/ztypes_ppc64le.go
new file mode 100644
index 0000000000..e6780f4e23
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_ppc64le.go
@@ -0,0 +1,11 @@
+// +build ppc64le
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types.go
+
+package pty
+
+type (
+	_C_int  int32
+	_C_uint uint32
+)
diff --git a/vendor/github.com/kr/pty/ztypes_s390x.go b/vendor/github.com/kr/pty/ztypes_s390x.go
new file mode 100644
index 0000000000..a7452b61cb
--- /dev/null
+++ b/vendor/github.com/kr/pty/ztypes_s390x.go
@@ -0,0 +1,11 @@
+// +build s390x
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types.go
+
+package pty
+
+type (
+	_C_int  int32
+	_C_uint uint32
+)
diff --git a/vendor/github.com/pborman/uuid/LICENSE b/vendor/github.com/pborman/uuid/LICENSE
new file mode 100644
index 0000000000..5dc68268d9
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009,2014 Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/pborman/uuid/dce.go b/vendor/github.com/pborman/uuid/dce.go
new file mode 100755
index 0000000000..50a0f2d099
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/dce.go
@@ -0,0 +1,84 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"encoding/binary"
+	"fmt"
+	"os"
+)
+
+// A Domain represents a Version 2 domain
+type Domain byte
+
+// Domain constants for DCE Security (Version 2) UUIDs.
+const (
+	Person = Domain(0)
+	Group  = Domain(1)
+	Org    = Domain(2)
+)
+
+// NewDCESecurity returns a DCE Security (Version 2) UUID.
+//
+// The domain should be one of Person, Group or Org.
+// On a POSIX system the id should be the users UID for the Person
+// domain and the users GID for the Group.  The meaning of id for
+// the domain Org or on non-POSIX systems is site defined.
+//
+// For a given domain/id pair the same token may be returned for up to
+// 7 minutes and 10 seconds.
+func NewDCESecurity(domain Domain, id uint32) UUID {
+	uuid := NewUUID()
+	if uuid != nil {
+		uuid[6] = (uuid[6] & 0x0f) | 0x20 // Version 2
+		uuid[9] = byte(domain)
+		binary.BigEndian.PutUint32(uuid[0:], id)
+	}
+	return uuid
+}
+
+// NewDCEPerson returns a DCE Security (Version 2) UUID in the person
+// domain with the id returned by os.Getuid.
+//
+//  NewDCEPerson(Person, uint32(os.Getuid()))
+func NewDCEPerson() UUID {
+	return NewDCESecurity(Person, uint32(os.Getuid()))
+}
+
+// NewDCEGroup returns a DCE Security (Version 2) UUID in the group
+// domain with the id returned by os.Getgid.
+//
+//  NewDCEGroup(Group, uint32(os.Getgid()))
+func NewDCEGroup() UUID {
+	return NewDCESecurity(Group, uint32(os.Getgid()))
+}
+
+// Domain returns the domain for a Version 2 UUID or false.
+func (uuid UUID) Domain() (Domain, bool) {
+	if v, _ := uuid.Version(); v != 2 {
+		return 0, false
+	}
+	return Domain(uuid[9]), true
+}
+
+// Id returns the id for a Version 2 UUID or false.
+func (uuid UUID) Id() (uint32, bool) {
+	if v, _ := uuid.Version(); v != 2 {
+		return 0, false
+	}
+	return binary.BigEndian.Uint32(uuid[0:4]), true
+}
+
+func (d Domain) String() string {
+	switch d {
+	case Person:
+		return "Person"
+	case Group:
+		return "Group"
+	case Org:
+		return "Org"
+	}
+	return fmt.Sprintf("Domain%d", int(d))
+}
diff --git a/vendor/github.com/pborman/uuid/doc.go b/vendor/github.com/pborman/uuid/doc.go
new file mode 100755
index 0000000000..d8bd013e68
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/doc.go
@@ -0,0 +1,8 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// The uuid package generates and inspects UUIDs.
+//
+// UUIDs are based on RFC 4122 and DCE 1.1: Authentication and Security Services.
+package uuid
diff --git a/vendor/github.com/pborman/uuid/hash.go b/vendor/github.com/pborman/uuid/hash.go
new file mode 100644
index 0000000000..cdd4192fd9
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/hash.go
@@ -0,0 +1,53 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"crypto/md5"
+	"crypto/sha1"
+	"hash"
+)
+
+// Well known Name Space IDs and UUIDs
+var (
+	NameSpace_DNS  = Parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
+	NameSpace_URL  = Parse("6ba7b811-9dad-11d1-80b4-00c04fd430c8")
+	NameSpace_OID  = Parse("6ba7b812-9dad-11d1-80b4-00c04fd430c8")
+	NameSpace_X500 = Parse("6ba7b814-9dad-11d1-80b4-00c04fd430c8")
+	NIL            = Parse("00000000-0000-0000-0000-000000000000")
+)
+
+// NewHash returns a new UUID dervied from the hash of space concatenated with
+// data generated by h.  The hash should be at least 16 byte in length.  The
+// first 16 bytes of the hash are used to form the UUID.  The version of the
+// UUID will be the lower 4 bits of version.  NewHash is used to implement
+// NewMD5 and NewSHA1.
+func NewHash(h hash.Hash, space UUID, data []byte, version int) UUID {
+	h.Reset()
+	h.Write(space)
+	h.Write([]byte(data))
+	s := h.Sum(nil)
+	uuid := make([]byte, 16)
+	copy(uuid, s)
+	uuid[6] = (uuid[6] & 0x0f) | uint8((version&0xf)<<4)
+	uuid[8] = (uuid[8] & 0x3f) | 0x80 // RFC 4122 variant
+	return uuid
+}
+
+// NewMD5 returns a new MD5 (Version 3) UUID based on the
+// supplied name space and data.
+//
+//  NewHash(md5.New(), space, data, 3)
+func NewMD5(space UUID, data []byte) UUID {
+	return NewHash(md5.New(), space, data, 3)
+}
+
+// NewSHA1 returns a new SHA1 (Version 5) UUID based on the
+// supplied name space and data.
+//
+//  NewHash(sha1.New(), space, data, 5)
+func NewSHA1(space UUID, data []byte) UUID {
+	return NewHash(sha1.New(), space, data, 5)
+}
diff --git a/vendor/github.com/pborman/uuid/json.go b/vendor/github.com/pborman/uuid/json.go
new file mode 100644
index 0000000000..760580a504
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/json.go
@@ -0,0 +1,30 @@
+// Copyright 2014 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import "errors"
+
+func (u UUID) MarshalJSON() ([]byte, error) {
+	if len(u) == 0 {
+		return []byte(`""`), nil
+	}
+	return []byte(`"` + u.String() + `"`), nil
+}
+
+func (u *UUID) UnmarshalJSON(data []byte) error {
+	if len(data) == 0 || string(data) == `""` {
+		return nil
+	}
+	if len(data) < 2 || data[0] != '"' || data[len(data)-1] != '"' {
+		return errors.New("invalid UUID format")
+	}
+	data = data[1 : len(data)-1]
+	uu := Parse(string(data))
+	if uu == nil {
+		return errors.New("invalid UUID format")
+	}
+	*u = uu
+	return nil
+}
diff --git a/vendor/github.com/pborman/uuid/node.go b/vendor/github.com/pborman/uuid/node.go
new file mode 100755
index 0000000000..dd0a8ac189
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/node.go
@@ -0,0 +1,101 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import "net"
+
+var (
+	interfaces []net.Interface // cached list of interfaces
+	ifname     string          // name of interface being used
+	nodeID     []byte          // hardware for version 1 UUIDs
+)
+
+// NodeInterface returns the name of the interface from which the NodeID was
+// derived.  The interface "user" is returned if the NodeID was set by
+// SetNodeID.
+func NodeInterface() string {
+	return ifname
+}
+
+// SetNodeInterface selects the hardware address to be used for Version 1 UUIDs.
+// If name is "" then the first usable interface found will be used or a random
+// Node ID will be generated.  If a named interface cannot be found then false
+// is returned.
+//
+// SetNodeInterface never fails when name is "".
+func SetNodeInterface(name string) bool {
+	if interfaces == nil {
+		var err error
+		interfaces, err = net.Interfaces()
+		if err != nil && name != "" {
+			return false
+		}
+	}
+
+	for _, ifs := range interfaces {
+		if len(ifs.HardwareAddr) >= 6 && (name == "" || name == ifs.Name) {
+			if setNodeID(ifs.HardwareAddr) {
+				ifname = ifs.Name
+				return true
+			}
+		}
+	}
+
+	// We found no interfaces with a valid hardware address.  If name
+	// does not specify a specific interface generate a random Node ID
+	// (section 4.1.6)
+	if name == "" {
+		if nodeID == nil {
+			nodeID = make([]byte, 6)
+		}
+		randomBits(nodeID)
+		return true
+	}
+	return false
+}
+
+// NodeID returns a slice of a copy of the current Node ID, setting the Node ID
+// if not already set.
+func NodeID() []byte {
+	if nodeID == nil {
+		SetNodeInterface("")
+	}
+	nid := make([]byte, 6)
+	copy(nid, nodeID)
+	return nid
+}
+
+// SetNodeID sets the Node ID to be used for Version 1 UUIDs.  The first 6 bytes
+// of id are used.  If id is less than 6 bytes then false is returned and the
+// Node ID is not set.
+func SetNodeID(id []byte) bool {
+	if setNodeID(id) {
+		ifname = "user"
+		return true
+	}
+	return false
+}
+
+func setNodeID(id []byte) bool {
+	if len(id) < 6 {
+		return false
+	}
+	if nodeID == nil {
+		nodeID = make([]byte, 6)
+	}
+	copy(nodeID, id)
+	return true
+}
+
+// NodeID returns the 6 byte node id encoded in uuid.  It returns nil if uuid is
+// not valid.  The NodeID is only well defined for version 1 and 2 UUIDs.
+func (uuid UUID) NodeID() []byte {
+	if len(uuid) != 16 {
+		return nil
+	}
+	node := make([]byte, 6)
+	copy(node, uuid[10:])
+	return node
+}
diff --git a/vendor/github.com/pborman/uuid/sql.go b/vendor/github.com/pborman/uuid/sql.go
new file mode 100644
index 0000000000..2d7679e2af
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/sql.go
@@ -0,0 +1,40 @@
+// Copyright 2015 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"errors"
+	"fmt"
+)
+
+// Scan implements sql.Scanner so UUIDs can be read from databases transparently
+// Currently, database types that map to string and []byte are supported. Please
+// consult database-specific driver documentation for matching types.
+func (uuid *UUID) Scan(src interface{}) error {
+	switch src.(type) {
+	case string:
+		// see uuid.Parse for required string format
+		parsed := Parse(src.(string))
+
+		if parsed == nil {
+			return errors.New("Scan: invalid UUID format")
+		}
+
+		*uuid = parsed
+	case []byte:
+		// assumes a simple slice of bytes, just check validity and store
+		u := UUID(src.([]byte))
+
+		if u.Variant() == Invalid {
+			return errors.New("Scan: invalid UUID format")
+		}
+
+		*uuid = u
+	default:
+		return fmt.Errorf("Scan: unable to scan type %T into UUID", src)
+	}
+
+	return nil
+}
diff --git a/vendor/github.com/pborman/uuid/time.go b/vendor/github.com/pborman/uuid/time.go
new file mode 100755
index 0000000000..7ebc9bef10
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/time.go
@@ -0,0 +1,132 @@
+// Copyright 2014 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"encoding/binary"
+	"sync"
+	"time"
+)
+
+// A Time represents a time as the number of 100's of nanoseconds since 15 Oct
+// 1582.
+type Time int64
+
+const (
+	lillian    = 2299160          // Julian day of 15 Oct 1582
+	unix       = 2440587          // Julian day of 1 Jan 1970
+	epoch      = unix - lillian   // Days between epochs
+	g1582      = epoch * 86400    // seconds between epochs
+	g1582ns100 = g1582 * 10000000 // 100s of a nanoseconds between epochs
+)
+
+var (
+	mu        sync.Mutex
+	lasttime  uint64 // last time we returned
+	clock_seq uint16 // clock sequence for this run
+
+	timeNow = time.Now // for testing
+)
+
+// UnixTime converts t the number of seconds and nanoseconds using the Unix
+// epoch of 1 Jan 1970.
+func (t Time) UnixTime() (sec, nsec int64) {
+	sec = int64(t - g1582ns100)
+	nsec = (sec % 10000000) * 100
+	sec /= 10000000
+	return sec, nsec
+}
+
+// GetTime returns the current Time (100s of nanoseconds since 15 Oct 1582) and
+// clock sequence as well as adjusting the clock sequence as needed.  An error
+// is returned if the current time cannot be determined.
+func GetTime() (Time, uint16, error) {
+	defer mu.Unlock()
+	mu.Lock()
+	return getTime()
+}
+
+func getTime() (Time, uint16, error) {
+	t := timeNow()
+
+	// If we don't have a clock sequence already, set one.
+	if clock_seq == 0 {
+		setClockSequence(-1)
+	}
+	now := uint64(t.UnixNano()/100) + g1582ns100
+
+	// If time has gone backwards with this clock sequence then we
+	// increment the clock sequence
+	if now <= lasttime {
+		clock_seq = ((clock_seq + 1) & 0x3fff) | 0x8000
+	}
+	lasttime = now
+	return Time(now), clock_seq, nil
+}
+
+// ClockSequence returns the current clock sequence, generating one if not
+// already set.  The clock sequence is only used for Version 1 UUIDs.
+//
+// The uuid package does not use global static storage for the clock sequence or
+// the last time a UUID was generated.  Unless SetClockSequence a new random
+// clock sequence is generated the first time a clock sequence is requested by
+// ClockSequence, GetTime, or NewUUID.  (section 4.2.1.1) sequence is generated
+// for
+func ClockSequence() int {
+	defer mu.Unlock()
+	mu.Lock()
+	return clockSequence()
+}
+
+func clockSequence() int {
+	if clock_seq == 0 {
+		setClockSequence(-1)
+	}
+	return int(clock_seq & 0x3fff)
+}
+
+// SetClockSeq sets the clock sequence to the lower 14 bits of seq.  Setting to
+// -1 causes a new sequence to be generated.
+func SetClockSequence(seq int) {
+	defer mu.Unlock()
+	mu.Lock()
+	setClockSequence(seq)
+}
+
+func setClockSequence(seq int) {
+	if seq == -1 {
+		var b [2]byte
+		randomBits(b[:]) // clock sequence
+		seq = int(b[0])<<8 | int(b[1])
+	}
+	old_seq := clock_seq
+	clock_seq = uint16(seq&0x3fff) | 0x8000 // Set our variant
+	if old_seq != clock_seq {
+		lasttime = 0
+	}
+}
+
+// Time returns the time in 100s of nanoseconds since 15 Oct 1582 encoded in
+// uuid.  It returns false if uuid is not valid.  The time is only well defined
+// for version 1 and 2 UUIDs.
+func (uuid UUID) Time() (Time, bool) {
+	if len(uuid) != 16 {
+		return 0, false
+	}
+	time := int64(binary.BigEndian.Uint32(uuid[0:4]))
+	time |= int64(binary.BigEndian.Uint16(uuid[4:6])) << 32
+	time |= int64(binary.BigEndian.Uint16(uuid[6:8])&0xfff) << 48
+	return Time(time), true
+}
+
+// ClockSequence returns the clock sequence encoded in uuid.  It returns false
+// if uuid is not valid.  The clock sequence is only well defined for version 1
+// and 2 UUIDs.
+func (uuid UUID) ClockSequence() (int, bool) {
+	if len(uuid) != 16 {
+		return 0, false
+	}
+	return int(binary.BigEndian.Uint16(uuid[8:10])) & 0x3fff, true
+}
diff --git a/vendor/github.com/pborman/uuid/util.go b/vendor/github.com/pborman/uuid/util.go
new file mode 100644
index 0000000000..de40b102c4
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/util.go
@@ -0,0 +1,43 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"io"
+)
+
+// randomBits completely fills slice b with random data.
+func randomBits(b []byte) {
+	if _, err := io.ReadFull(rander, b); err != nil {
+		panic(err.Error()) // rand should never fail
+	}
+}
+
+// xvalues returns the value of a byte as a hexadecimal digit or 255.
+var xvalues = []byte{
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 255, 255, 255, 255, 255, 255,
+	255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+}
+
+// xtob converts the the first two hex bytes of x into a byte.
+func xtob(x string) (byte, bool) {
+	b1 := xvalues[x[0]]
+	b2 := xvalues[x[1]]
+	return (b1 << 4) | b2, b1 != 255 && b2 != 255
+}
diff --git a/vendor/github.com/pborman/uuid/uuid.go b/vendor/github.com/pborman/uuid/uuid.go
new file mode 100755
index 0000000000..2920fae632
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/uuid.go
@@ -0,0 +1,163 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"bytes"
+	"crypto/rand"
+	"fmt"
+	"io"
+	"strings"
+)
+
+// A UUID is a 128 bit (16 byte) Universal Unique IDentifier as defined in RFC
+// 4122.
+type UUID []byte
+
+// A Version represents a UUIDs version.
+type Version byte
+
+// A Variant represents a UUIDs variant.
+type Variant byte
+
+// Constants returned by Variant.
+const (
+	Invalid   = Variant(iota) // Invalid UUID
+	RFC4122                   // The variant specified in RFC4122
+	Reserved                  // Reserved, NCS backward compatibility.
+	Microsoft                 // Reserved, Microsoft Corporation backward compatibility.
+	Future                    // Reserved for future definition.
+)
+
+var rander = rand.Reader // random function
+
+// New returns a new random (version 4) UUID as a string.  It is a convenience
+// function for NewRandom().String().
+func New() string {
+	return NewRandom().String()
+}
+
+// Parse decodes s into a UUID or returns nil.  Both the UUID form of
+// xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx and
+// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx are decoded.
+func Parse(s string) UUID {
+	if len(s) == 36+9 {
+		if strings.ToLower(s[:9]) != "urn:uuid:" {
+			return nil
+		}
+		s = s[9:]
+	} else if len(s) != 36 {
+		return nil
+	}
+	if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' {
+		return nil
+	}
+	uuid := make([]byte, 16)
+	for i, x := range []int{
+		0, 2, 4, 6,
+		9, 11,
+		14, 16,
+		19, 21,
+		24, 26, 28, 30, 32, 34} {
+		if v, ok := xtob(s[x:]); !ok {
+			return nil
+		} else {
+			uuid[i] = v
+		}
+	}
+	return uuid
+}
+
+// Equal returns true if uuid1 and uuid2 are equal.
+func Equal(uuid1, uuid2 UUID) bool {
+	return bytes.Equal(uuid1, uuid2)
+}
+
+// String returns the string form of uuid, xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+// , or "" if uuid is invalid.
+func (uuid UUID) String() string {
+	if uuid == nil || len(uuid) != 16 {
+		return ""
+	}
+	b := []byte(uuid)
+	return fmt.Sprintf("%08x-%04x-%04x-%04x-%012x",
+		b[:4], b[4:6], b[6:8], b[8:10], b[10:])
+}
+
+// URN returns the RFC 2141 URN form of uuid,
+// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx,  or "" if uuid is invalid.
+func (uuid UUID) URN() string {
+	if uuid == nil || len(uuid) != 16 {
+		return ""
+	}
+	b := []byte(uuid)
+	return fmt.Sprintf("urn:uuid:%08x-%04x-%04x-%04x-%012x",
+		b[:4], b[4:6], b[6:8], b[8:10], b[10:])
+}
+
+// Variant returns the variant encoded in uuid.  It returns Invalid if
+// uuid is invalid.
+func (uuid UUID) Variant() Variant {
+	if len(uuid) != 16 {
+		return Invalid
+	}
+	switch {
+	case (uuid[8] & 0xc0) == 0x80:
+		return RFC4122
+	case (uuid[8] & 0xe0) == 0xc0:
+		return Microsoft
+	case (uuid[8] & 0xe0) == 0xe0:
+		return Future
+	default:
+		return Reserved
+	}
+	panic("unreachable")
+}
+
+// Version returns the verison of uuid.  It returns false if uuid is not
+// valid.
+func (uuid UUID) Version() (Version, bool) {
+	if len(uuid) != 16 {
+		return 0, false
+	}
+	return Version(uuid[6] >> 4), true
+}
+
+func (v Version) String() string {
+	if v > 15 {
+		return fmt.Sprintf("BAD_VERSION_%d", v)
+	}
+	return fmt.Sprintf("VERSION_%d", v)
+}
+
+func (v Variant) String() string {
+	switch v {
+	case RFC4122:
+		return "RFC4122"
+	case Reserved:
+		return "Reserved"
+	case Microsoft:
+		return "Microsoft"
+	case Future:
+		return "Future"
+	case Invalid:
+		return "Invalid"
+	}
+	return fmt.Sprintf("BadVariant%d", int(v))
+}
+
+// SetRand sets the random number generator to r, which implents io.Reader.
+// If r.Read returns an error when the package requests random data then
+// a panic will be issued.
+//
+// Calling SetRand with nil sets the random number generator to the default
+// generator.
+func SetRand(r io.Reader) {
+	if r == nil {
+		rander = rand.Reader
+		return
+	}
+	rander = r
+}
diff --git a/vendor/github.com/pborman/uuid/version1.go b/vendor/github.com/pborman/uuid/version1.go
new file mode 100644
index 0000000000..0127eacfab
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/version1.go
@@ -0,0 +1,41 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"encoding/binary"
+)
+
+// NewUUID returns a Version 1 UUID based on the current NodeID and clock
+// sequence, and the current time.  If the NodeID has not been set by SetNodeID
+// or SetNodeInterface then it will be set automatically.  If the NodeID cannot
+// be set NewUUID returns nil.  If clock sequence has not been set by
+// SetClockSequence then it will be set automatically.  If GetTime fails to
+// return the current NewUUID returns nil.
+func NewUUID() UUID {
+	if nodeID == nil {
+		SetNodeInterface("")
+	}
+
+	now, seq, err := GetTime()
+	if err != nil {
+		return nil
+	}
+
+	uuid := make([]byte, 16)
+
+	time_low := uint32(now & 0xffffffff)
+	time_mid := uint16((now >> 32) & 0xffff)
+	time_hi := uint16((now >> 48) & 0x0fff)
+	time_hi |= 0x1000 // Version 1
+
+	binary.BigEndian.PutUint32(uuid[0:], time_low)
+	binary.BigEndian.PutUint16(uuid[4:], time_mid)
+	binary.BigEndian.PutUint16(uuid[6:], time_hi)
+	binary.BigEndian.PutUint16(uuid[8:], seq)
+	copy(uuid[10:], nodeID)
+
+	return uuid
+}
diff --git a/vendor/github.com/pborman/uuid/version4.go b/vendor/github.com/pborman/uuid/version4.go
new file mode 100644
index 0000000000..b3d4a368dd
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/version4.go
@@ -0,0 +1,25 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+// Random returns a Random (Version 4) UUID or panics.
+//
+// The strength of the UUIDs is based on the strength of the crypto/rand
+// package.
+//
+// A note about uniqueness derived from from the UUID Wikipedia entry:
+//
+//  Randomly generated UUIDs have 122 random bits.  One's annual risk of being
+//  hit by a meteorite is estimated to be one chance in 17 billion, that
+//  means the probability is about 0.00000000006 (6 × 10−11),
+//  equivalent to the odds of creating a few tens of trillions of UUIDs in a
+//  year and having one duplicate.
+func NewRandom() UUID {
+	uuid := make([]byte, 16)
+	randomBits([]byte(uuid))
+	uuid[6] = (uuid[6] & 0x0f) | 0x40 // Version 4
+	uuid[8] = (uuid[8] & 0x3f) | 0x80 // Variant is 10
+	return uuid
+}
diff --git a/vendor/github.com/peterbourgon/diskv/LICENSE b/vendor/github.com/peterbourgon/diskv/LICENSE
new file mode 100644
index 0000000000..41ce7f16e1
--- /dev/null
+++ b/vendor/github.com/peterbourgon/diskv/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2011-2012 Peter Bourgon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/github.com/peterbourgon/diskv/compression.go b/vendor/github.com/peterbourgon/diskv/compression.go
new file mode 100644
index 0000000000..5192b02733
--- /dev/null
+++ b/vendor/github.com/peterbourgon/diskv/compression.go
@@ -0,0 +1,64 @@
+package diskv
+
+import (
+	"compress/flate"
+	"compress/gzip"
+	"compress/zlib"
+	"io"
+)
+
+// Compression is an interface that Diskv uses to implement compression of
+// data. Writer takes a destination io.Writer and returns a WriteCloser that
+// compresses all data written through it. Reader takes a source io.Reader and
+// returns a ReadCloser that decompresses all data read through it. You may
+// define these methods on your own type, or use one of the NewCompression
+// helpers.
+type Compression interface {
+	Writer(dst io.Writer) (io.WriteCloser, error)
+	Reader(src io.Reader) (io.ReadCloser, error)
+}
+
+// NewGzipCompression returns a Gzip-based Compression.
+func NewGzipCompression() Compression {
+	return NewGzipCompressionLevel(flate.DefaultCompression)
+}
+
+// NewGzipCompressionLevel returns a Gzip-based Compression with the given level.
+func NewGzipCompressionLevel(level int) Compression {
+	return &genericCompression{
+		wf: func(w io.Writer) (io.WriteCloser, error) { return gzip.NewWriterLevel(w, level) },
+		rf: func(r io.Reader) (io.ReadCloser, error) { return gzip.NewReader(r) },
+	}
+}
+
+// NewZlibCompression returns a Zlib-based Compression.
+func NewZlibCompression() Compression {
+	return NewZlibCompressionLevel(flate.DefaultCompression)
+}
+
+// NewZlibCompressionLevel returns a Zlib-based Compression with the given level.
+func NewZlibCompressionLevel(level int) Compression {
+	return NewZlibCompressionLevelDict(level, nil)
+}
+
+// NewZlibCompressionLevelDict returns a Zlib-based Compression with the given
+// level, based on the given dictionary.
+func NewZlibCompressionLevelDict(level int, dict []byte) Compression {
+	return &genericCompression{
+		func(w io.Writer) (io.WriteCloser, error) { return zlib.NewWriterLevelDict(w, level, dict) },
+		func(r io.Reader) (io.ReadCloser, error) { return zlib.NewReaderDict(r, dict) },
+	}
+}
+
+type genericCompression struct {
+	wf func(w io.Writer) (io.WriteCloser, error)
+	rf func(r io.Reader) (io.ReadCloser, error)
+}
+
+func (g *genericCompression) Writer(dst io.Writer) (io.WriteCloser, error) {
+	return g.wf(dst)
+}
+
+func (g *genericCompression) Reader(src io.Reader) (io.ReadCloser, error) {
+	return g.rf(src)
+}
diff --git a/vendor/github.com/peterbourgon/diskv/diskv.go b/vendor/github.com/peterbourgon/diskv/diskv.go
new file mode 100644
index 0000000000..ea05842cbd
--- /dev/null
+++ b/vendor/github.com/peterbourgon/diskv/diskv.go
@@ -0,0 +1,578 @@
+// Diskv (disk-vee) is a simple, persistent, key-value store.
+// It stores all data flatly on the filesystem.
+
+package diskv
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"syscall"
+)
+
+const (
+	defaultBasePath             = "diskv"
+	defaultFilePerm os.FileMode = 0666
+	defaultPathPerm os.FileMode = 0777
+)
+
+var (
+	defaultTransform   = func(s string) []string { return []string{} }
+	errCanceled        = errors.New("canceled")
+	errEmptyKey        = errors.New("empty key")
+	errBadKey          = errors.New("bad key")
+	errImportDirectory = errors.New("can't import a directory")
+)
+
+// TransformFunction transforms a key into a slice of strings, with each
+// element in the slice representing a directory in the file path where the
+// key's entry will eventually be stored.
+//
+// For example, if TransformFunc transforms "abcdef" to ["ab", "cde", "f"],
+// the final location of the data file will be <basedir>/ab/cde/f/abcdef
+type TransformFunction func(s string) []string
+
+// Options define a set of properties that dictate Diskv behavior.
+// All values are optional.
+type Options struct {
+	BasePath     string
+	Transform    TransformFunction
+	CacheSizeMax uint64 // bytes
+	PathPerm     os.FileMode
+	FilePerm     os.FileMode
+
+	Index     Index
+	IndexLess LessFunction
+
+	Compression Compression
+}
+
+// Diskv implements the Diskv interface. You shouldn't construct Diskv
+// structures directly; instead, use the New constructor.
+type Diskv struct {
+	Options
+	mu        sync.RWMutex
+	cache     map[string][]byte
+	cacheSize uint64
+}
+
+// New returns an initialized Diskv structure, ready to use.
+// If the path identified by baseDir already contains data,
+// it will be accessible, but not yet cached.
+func New(o Options) *Diskv {
+	if o.BasePath == "" {
+		o.BasePath = defaultBasePath
+	}
+	if o.Transform == nil {
+		o.Transform = defaultTransform
+	}
+	if o.PathPerm == 0 {
+		o.PathPerm = defaultPathPerm
+	}
+	if o.FilePerm == 0 {
+		o.FilePerm = defaultFilePerm
+	}
+
+	d := &Diskv{
+		Options:   o,
+		cache:     map[string][]byte{},
+		cacheSize: 0,
+	}
+
+	if d.Index != nil && d.IndexLess != nil {
+		d.Index.Initialize(d.IndexLess, d.Keys(nil))
+	}
+
+	return d
+}
+
+// Write synchronously writes the key-value pair to disk, making it immediately
+// available for reads. Write relies on the filesystem to perform an eventual
+// sync to physical media. If you need stronger guarantees, see WriteStream.
+func (d *Diskv) Write(key string, val []byte) error {
+	return d.WriteStream(key, bytes.NewBuffer(val), false)
+}
+
+// WriteStream writes the data represented by the io.Reader to the disk, under
+// the provided key. If sync is true, WriteStream performs an explicit sync on
+// the file as soon as it's written.
+//
+// bytes.Buffer provides io.Reader semantics for basic data types.
+func (d *Diskv) WriteStream(key string, r io.Reader, sync bool) error {
+	if len(key) <= 0 {
+		return errEmptyKey
+	}
+
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
+	return d.writeStreamWithLock(key, r, sync)
+}
+
+// writeStream does no input validation checking.
+// TODO: use atomic FS ops.
+func (d *Diskv) writeStreamWithLock(key string, r io.Reader, sync bool) error {
+	if err := d.ensurePathWithLock(key); err != nil {
+		return fmt.Errorf("ensure path: %s", err)
+	}
+
+	mode := os.O_WRONLY | os.O_CREATE | os.O_TRUNC // overwrite if exists
+	f, err := os.OpenFile(d.completeFilename(key), mode, d.FilePerm)
+	if err != nil {
+		return fmt.Errorf("open file: %s", err)
+	}
+
+	wc := io.WriteCloser(&nopWriteCloser{f})
+	if d.Compression != nil {
+		wc, err = d.Compression.Writer(f)
+		if err != nil {
+			f.Close() // error deliberately ignored
+			return fmt.Errorf("compression writer: %s", err)
+		}
+	}
+
+	if _, err := io.Copy(wc, r); err != nil {
+		f.Close() // error deliberately ignored
+		return fmt.Errorf("i/o copy: %s", err)
+	}
+
+	if err := wc.Close(); err != nil {
+		f.Close() // error deliberately ignored
+		return fmt.Errorf("compression close: %s", err)
+	}
+
+	if sync {
+		if err := f.Sync(); err != nil {
+			f.Close() // error deliberately ignored
+			return fmt.Errorf("file sync: %s", err)
+		}
+	}
+
+	if err := f.Close(); err != nil {
+		return fmt.Errorf("file close: %s", err)
+	}
+
+	if d.Index != nil {
+		d.Index.Insert(key)
+	}
+
+	d.bustCacheWithLock(key) // cache only on read
+
+	return nil
+}
+
+// Import imports the source file into diskv under the destination key. If the
+// destination key already exists, it's overwritten. If move is true, the
+// source file is removed after a successful import.
+func (d *Diskv) Import(srcFilename, dstKey string, move bool) (err error) {
+	if dstKey == "" {
+		return errEmptyKey
+	}
+
+	if fi, err := os.Stat(srcFilename); err != nil {
+		return err
+	} else if fi.IsDir() {
+		return errImportDirectory
+	}
+
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
+	if err := d.ensurePathWithLock(dstKey); err != nil {
+		return fmt.Errorf("ensure path: %s", err)
+	}
+
+	if move {
+		if err := syscall.Rename(srcFilename, d.completeFilename(dstKey)); err == nil {
+			d.bustCacheWithLock(dstKey)
+			return nil
+		} else if err != syscall.EXDEV {
+			// If it failed due to being on a different device, fall back to copying
+			return err
+		}
+	}
+
+	f, err := os.Open(srcFilename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	err = d.writeStreamWithLock(dstKey, f, false)
+	if err == nil && move {
+		err = os.Remove(srcFilename)
+	}
+	return err
+}
+
+// Read reads the key and returns the value.
+// If the key is available in the cache, Read won't touch the disk.
+// If the key is not in the cache, Read will have the side-effect of
+// lazily caching the value.
+func (d *Diskv) Read(key string) ([]byte, error) {
+	rc, err := d.ReadStream(key, false)
+	if err != nil {
+		return []byte{}, err
+	}
+	defer rc.Close()
+	return ioutil.ReadAll(rc)
+}
+
+// ReadStream reads the key and returns the value (data) as an io.ReadCloser.
+// If the value is cached from a previous read, and direct is false,
+// ReadStream will use the cached value. Otherwise, it will return a handle to
+// the file on disk, and cache the data on read.
+//
+// If direct is true, ReadStream will lazily delete any cached value for the
+// key, and return a direct handle to the file on disk.
+//
+// If compression is enabled, ReadStream taps into the io.Reader stream prior
+// to decompression, and caches the compressed data.
+func (d *Diskv) ReadStream(key string, direct bool) (io.ReadCloser, error) {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+
+	if val, ok := d.cache[key]; ok {
+		if !direct {
+			buf := bytes.NewBuffer(val)
+			if d.Compression != nil {
+				return d.Compression.Reader(buf)
+			}
+			return ioutil.NopCloser(buf), nil
+		}
+
+		go func() {
+			d.mu.Lock()
+			defer d.mu.Unlock()
+			d.uncacheWithLock(key, uint64(len(val)))
+		}()
+	}
+
+	return d.readWithRLock(key)
+}
+
+// read ignores the cache, and returns an io.ReadCloser representing the
+// decompressed data for the given key, streamed from the disk. Clients should
+// acquire a read lock on the Diskv and check the cache themselves before
+// calling read.
+func (d *Diskv) readWithRLock(key string) (io.ReadCloser, error) {
+	filename := d.completeFilename(key)
+
+	fi, err := os.Stat(filename)
+	if err != nil {
+		return nil, err
+	}
+	if fi.IsDir() {
+		return nil, os.ErrNotExist
+	}
+
+	f, err := os.Open(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	var r io.Reader
+	if d.CacheSizeMax > 0 {
+		r = newSiphon(f, d, key)
+	} else {
+		r = &closingReader{f}
+	}
+
+	var rc = io.ReadCloser(ioutil.NopCloser(r))
+	if d.Compression != nil {
+		rc, err = d.Compression.Reader(r)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return rc, nil
+}
+
+// closingReader provides a Reader that automatically closes the
+// embedded ReadCloser when it reaches EOF
+type closingReader struct {
+	rc io.ReadCloser
+}
+
+func (cr closingReader) Read(p []byte) (int, error) {
+	n, err := cr.rc.Read(p)
+	if err == io.EOF {
+		if closeErr := cr.rc.Close(); closeErr != nil {
+			return n, closeErr // close must succeed for Read to succeed
+		}
+	}
+	return n, err
+}
+
+// siphon is like a TeeReader: it copies all data read through it to an
+// internal buffer, and moves that buffer to the cache at EOF.
+type siphon struct {
+	f   *os.File
+	d   *Diskv
+	key string
+	buf *bytes.Buffer
+}
+
+// newSiphon constructs a siphoning reader that represents the passed file.
+// When a successful series of reads ends in an EOF, the siphon will write
+// the buffered data to Diskv's cache under the given key.
+func newSiphon(f *os.File, d *Diskv, key string) io.Reader {
+	return &siphon{
+		f:   f,
+		d:   d,
+		key: key,
+		buf: &bytes.Buffer{},
+	}
+}
+
+// Read implements the io.Reader interface for siphon.
+func (s *siphon) Read(p []byte) (int, error) {
+	n, err := s.f.Read(p)
+
+	if err == nil {
+		return s.buf.Write(p[0:n]) // Write must succeed for Read to succeed
+	}
+
+	if err == io.EOF {
+		s.d.cacheWithoutLock(s.key, s.buf.Bytes()) // cache may fail
+		if closeErr := s.f.Close(); closeErr != nil {
+			return n, closeErr // close must succeed for Read to succeed
+		}
+		return n, err
+	}
+
+	return n, err
+}
+
+// Erase synchronously erases the given key from the disk and the cache.
+func (d *Diskv) Erase(key string) error {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
+	d.bustCacheWithLock(key)
+
+	// erase from index
+	if d.Index != nil {
+		d.Index.Delete(key)
+	}
+
+	// erase from disk
+	filename := d.completeFilename(key)
+	if s, err := os.Stat(filename); err == nil {
+		if s.IsDir() {
+			return errBadKey
+		}
+		if err = os.Remove(filename); err != nil {
+			return err
+		}
+	} else {
+		// Return err as-is so caller can do os.IsNotExist(err).
+		return err
+	}
+
+	// clean up and return
+	d.pruneDirsWithLock(key)
+	return nil
+}
+
+// EraseAll will delete all of the data from the store, both in the cache and on
+// the disk. Note that EraseAll doesn't distinguish diskv-related data from non-
+// diskv-related data. Care should be taken to always specify a diskv base
+// directory that is exclusively for diskv data.
+func (d *Diskv) EraseAll() error {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+	d.cache = make(map[string][]byte)
+	d.cacheSize = 0
+	return os.RemoveAll(d.BasePath)
+}
+
+// Has returns true if the given key exists.
+func (d *Diskv) Has(key string) bool {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
+	if _, ok := d.cache[key]; ok {
+		return true
+	}
+
+	filename := d.completeFilename(key)
+	s, err := os.Stat(filename)
+	if err != nil {
+		return false
+	}
+	if s.IsDir() {
+		return false
+	}
+
+	return true
+}
+
+// Keys returns a channel that will yield every key accessible by the store,
+// in undefined order. If a cancel channel is provided, closing it will
+// terminate and close the keys channel.
+func (d *Diskv) Keys(cancel <-chan struct{}) <-chan string {
+	return d.KeysPrefix("", cancel)
+}
+
+// KeysPrefix returns a channel that will yield every key accessible by the
+// store with the given prefix, in undefined order. If a cancel channel is
+// provided, closing it will terminate and close the keys channel. If the
+// provided prefix is the empty string, all keys will be yielded.
+func (d *Diskv) KeysPrefix(prefix string, cancel <-chan struct{}) <-chan string {
+	var prepath string
+	if prefix == "" {
+		prepath = d.BasePath
+	} else {
+		prepath = d.pathFor(prefix)
+	}
+	c := make(chan string)
+	go func() {
+		filepath.Walk(prepath, walker(c, prefix, cancel))
+		close(c)
+	}()
+	return c
+}
+
+// walker returns a function which satisfies the filepath.WalkFunc interface.
+// It sends every non-directory file entry down the channel c.
+func walker(c chan<- string, prefix string, cancel <-chan struct{}) filepath.WalkFunc {
+	return func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if info.IsDir() || !strings.HasPrefix(info.Name(), prefix) {
+			return nil // "pass"
+		}
+
+		select {
+		case c <- info.Name():
+		case <-cancel:
+			return errCanceled
+		}
+
+		return nil
+	}
+}
+
+// pathFor returns the absolute path for location on the filesystem where the
+// data for the given key will be stored.
+func (d *Diskv) pathFor(key string) string {
+	return filepath.Join(d.BasePath, filepath.Join(d.Transform(key)...))
+}
+
+// ensurePathWithLock is a helper function that generates all necessary
+// directories on the filesystem for the given key.
+func (d *Diskv) ensurePathWithLock(key string) error {
+	return os.MkdirAll(d.pathFor(key), d.PathPerm)
+}
+
+// completeFilename returns the absolute path to the file for the given key.
+func (d *Diskv) completeFilename(key string) string {
+	return filepath.Join(d.pathFor(key), key)
+}
+
+// cacheWithLock attempts to cache the given key-value pair in the store's
+// cache. It can fail if the value is larger than the cache's maximum size.
+func (d *Diskv) cacheWithLock(key string, val []byte) error {
+	valueSize := uint64(len(val))
+	if err := d.ensureCacheSpaceWithLock(valueSize); err != nil {
+		return fmt.Errorf("%s; not caching", err)
+	}
+
+	// be very strict about memory guarantees
+	if (d.cacheSize + valueSize) > d.CacheSizeMax {
+		panic(fmt.Sprintf("failed to make room for value (%d/%d)", valueSize, d.CacheSizeMax))
+	}
+
+	d.cache[key] = val
+	d.cacheSize += valueSize
+	return nil
+}
+
+// cacheWithoutLock acquires the store's (write) mutex and calls cacheWithLock.
+func (d *Diskv) cacheWithoutLock(key string, val []byte) error {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+	return d.cacheWithLock(key, val)
+}
+
+func (d *Diskv) bustCacheWithLock(key string) {
+	if val, ok := d.cache[key]; ok {
+		d.uncacheWithLock(key, uint64(len(val)))
+	}
+}
+
+func (d *Diskv) uncacheWithLock(key string, sz uint64) {
+	d.cacheSize -= sz
+	delete(d.cache, key)
+}
+
+// pruneDirsWithLock deletes empty directories in the path walk leading to the
+// key k. Typically this function is called after an Erase is made.
+func (d *Diskv) pruneDirsWithLock(key string) error {
+	pathlist := d.Transform(key)
+	for i := range pathlist {
+		dir := filepath.Join(d.BasePath, filepath.Join(pathlist[:len(pathlist)-i]...))
+
+		// thanks to Steven Blenkinsop for this snippet
+		switch fi, err := os.Stat(dir); true {
+		case err != nil:
+			return err
+		case !fi.IsDir():
+			panic(fmt.Sprintf("corrupt dirstate at %s", dir))
+		}
+
+		nlinks, err := filepath.Glob(filepath.Join(dir, "*"))
+		if err != nil {
+			return err
+		} else if len(nlinks) > 0 {
+			return nil // has subdirs -- do not prune
+		}
+		if err = os.Remove(dir); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// ensureCacheSpaceWithLock deletes entries from the cache in arbitrary order
+// until the cache has at least valueSize bytes available.
+func (d *Diskv) ensureCacheSpaceWithLock(valueSize uint64) error {
+	if valueSize > d.CacheSizeMax {
+		return fmt.Errorf("value size (%d bytes) too large for cache (%d bytes)", valueSize, d.CacheSizeMax)
+	}
+
+	safe := func() bool { return (d.cacheSize + valueSize) <= d.CacheSizeMax }
+
+	for key, val := range d.cache {
+		if safe() {
+			break
+		}
+
+		d.uncacheWithLock(key, uint64(len(val)))
+	}
+
+	if !safe() {
+		panic(fmt.Sprintf("%d bytes still won't fit in the cache! (max %d bytes)", valueSize, d.CacheSizeMax))
+	}
+
+	return nil
+}
+
+// nopWriteCloser wraps an io.Writer and provides a no-op Close method to
+// satisfy the io.WriteCloser interface.
+type nopWriteCloser struct {
+	io.Writer
+}
+
+func (wc *nopWriteCloser) Write(p []byte) (int, error) { return wc.Writer.Write(p) }
+func (wc *nopWriteCloser) Close() error                { return nil }
diff --git a/vendor/github.com/peterbourgon/diskv/index.go b/vendor/github.com/peterbourgon/diskv/index.go
new file mode 100644
index 0000000000..96fee5152b
--- /dev/null
+++ b/vendor/github.com/peterbourgon/diskv/index.go
@@ -0,0 +1,115 @@
+package diskv
+
+import (
+	"sync"
+
+	"github.com/google/btree"
+)
+
+// Index is a generic interface for things that can
+// provide an ordered list of keys.
+type Index interface {
+	Initialize(less LessFunction, keys <-chan string)
+	Insert(key string)
+	Delete(key string)
+	Keys(from string, n int) []string
+}
+
+// LessFunction is used to initialize an Index of keys in a specific order.
+type LessFunction func(string, string) bool
+
+// btreeString is a custom data type that satisfies the BTree Less interface,
+// making the strings it wraps sortable by the BTree package.
+type btreeString struct {
+	s string
+	l LessFunction
+}
+
+// Less satisfies the BTree.Less interface using the btreeString's LessFunction.
+func (s btreeString) Less(i btree.Item) bool {
+	return s.l(s.s, i.(btreeString).s)
+}
+
+// BTreeIndex is an implementation of the Index interface using google/btree.
+type BTreeIndex struct {
+	sync.RWMutex
+	LessFunction
+	*btree.BTree
+}
+
+// Initialize populates the BTree tree with data from the keys channel,
+// according to the passed less function. It's destructive to the BTreeIndex.
+func (i *BTreeIndex) Initialize(less LessFunction, keys <-chan string) {
+	i.Lock()
+	defer i.Unlock()
+	i.LessFunction = less
+	i.BTree = rebuild(less, keys)
+}
+
+// Insert inserts the given key (only) into the BTree tree.
+func (i *BTreeIndex) Insert(key string) {
+	i.Lock()
+	defer i.Unlock()
+	if i.BTree == nil || i.LessFunction == nil {
+		panic("uninitialized index")
+	}
+	i.BTree.ReplaceOrInsert(btreeString{s: key, l: i.LessFunction})
+}
+
+// Delete removes the given key (only) from the BTree tree.
+func (i *BTreeIndex) Delete(key string) {
+	i.Lock()
+	defer i.Unlock()
+	if i.BTree == nil || i.LessFunction == nil {
+		panic("uninitialized index")
+	}
+	i.BTree.Delete(btreeString{s: key, l: i.LessFunction})
+}
+
+// Keys yields a maximum of n keys in order. If the passed 'from' key is empty,
+// Keys will return the first n keys. If the passed 'from' key is non-empty, the
+// first key in the returned slice will be the key that immediately follows the
+// passed key, in key order.
+func (i *BTreeIndex) Keys(from string, n int) []string {
+	i.RLock()
+	defer i.RUnlock()
+
+	if i.BTree == nil || i.LessFunction == nil {
+		panic("uninitialized index")
+	}
+
+	if i.BTree.Len() <= 0 {
+		return []string{}
+	}
+
+	btreeFrom := btreeString{s: from, l: i.LessFunction}
+	skipFirst := true
+	if len(from) <= 0 || !i.BTree.Has(btreeFrom) {
+		// no such key, so fabricate an always-smallest item
+		btreeFrom = btreeString{s: "", l: func(string, string) bool { return true }}
+		skipFirst = false
+	}
+
+	keys := []string{}
+	iterator := func(i btree.Item) bool {
+		keys = append(keys, i.(btreeString).s)
+		return len(keys) < n
+	}
+	i.BTree.AscendGreaterOrEqual(btreeFrom, iterator)
+
+	if skipFirst && len(keys) > 0 {
+		keys = keys[1:]
+	}
+
+	return keys
+}
+
+// rebuildIndex does the work of regenerating the index
+// with the given keys.
+func rebuild(less LessFunction, keys <-chan string) *btree.BTree {
+	tree := btree.New(2)
+	for key := range keys {
+		tree.ReplaceOrInsert(btreeString{s: key, l: less})
+	}
+	return tree
+}
diff --git a/vendor/github.com/russross/blackfriday/LICENSE.txt b/vendor/github.com/russross/blackfriday/LICENSE.txt
new file mode 100644
index 0000000000..2885af3602
--- /dev/null
+++ b/vendor/github.com/russross/blackfriday/LICENSE.txt
@@ -0,0 +1,29 @@
+Blackfriday is distributed under the Simplified BSD License:
+
+> Copyright © 2011 Russ Ross
+> All rights reserved.
+>
+> Redistribution and use in source and binary forms, with or without
+> modification, are permitted provided that the following conditions
+> are met:
+>
+> 1.  Redistributions of source code must retain the above copyright
+>     notice, this list of conditions and the following disclaimer.
+>
+> 2.  Redistributions in binary form must reproduce the above
+>     copyright notice, this list of conditions and the following
+>     disclaimer in the documentation and/or other materials provided with
+>     the distribution.
+>
+> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+> "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+> FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+> COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+> INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+> BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+> LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+> ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+> POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/russross/blackfriday/block.go b/vendor/github.com/russross/blackfriday/block.go
new file mode 100644
index 0000000000..b5b084117c
--- /dev/null
+++ b/vendor/github.com/russross/blackfriday/block.go
@@ -0,0 +1,1398 @@
+//
+// Blackfriday Markdown Processor
+// Available at http://github.com/russross/blackfriday
+//
+// Copyright © 2011 Russ Ross <russ@russross.com>.
+// Distributed under the Simplified BSD License.
+// See README.md for details.
+//
+
+//
+// Functions to parse block-level elements.
+//
+
+package blackfriday
+
+import (
+	"bytes"
+
+	"github.com/shurcooL/sanitized_anchor_name"
+)
+
+// Parse block-level data.
+// Note: this function and many that it calls assume that
+// the input buffer ends with a newline.
+func (p *parser) block(out *bytes.Buffer, data []byte) {
+	if len(data) == 0 || data[len(data)-1] != '\n' {
+		panic("block input is missing terminating newline")
+	}
+
+	// this is called recursively: enforce a maximum depth
+	if p.nesting >= p.maxNesting {
+		return
+	}
+	p.nesting++
+
+	// parse out one block-level construct at a time
+	for len(data) > 0 {
+		// prefixed header:
+		//
+		// # Header 1
+		// ## Header 2
+		// ...
+		// ###### Header 6
+		if p.isPrefixHeader(data) {
+			data = data[p.prefixHeader(out, data):]
+			continue
+		}
+
+		// block of preformatted HTML:
+		//
+		// <div>
+		//     ...
+		// </div>
+		if data[0] == '<' {
+			if i := p.html(out, data, true); i > 0 {
+				data = data[i:]
+				continue
+			}
+		}
+
+		// title block
+		//
+		// % stuff
+		// % more stuff
+		// % even more stuff
+		if p.flags&EXTENSION_TITLEBLOCK != 0 {
+			if data[0] == '%' {
+				if i := p.titleBlock(out, data, true); i > 0 {
+					data = data[i:]
+					continue
+				}
+			}
+		}
+
+		// blank lines.  note: returns the # of bytes to skip
+		if i := p.isEmpty(data); i > 0 {
+			data = data[i:]
+			continue
+		}
+
+		// indented code block:
+		//
+		//     func max(a, b int) int {
+		//         if a > b {
+		//             return a
+		//         }
+		//         return b
+		//      }
+		if p.codePrefix(data) > 0 {
+			data = data[p.code(out, data):]
+			continue
+		}
+
+		// fenced code block:
+		//
+		// ``` go
+		// func fact(n int) int {
+		//     if n <= 1 {
+		//         return n
+		//     }
+		//     return n * fact(n-1)
+		// }
+		// ```
+		if p.flags&EXTENSION_FENCED_CODE != 0 {
+			if i := p.fencedCode(out, data, true); i > 0 {
+				data = data[i:]
+				continue
+			}
+		}
+
+		// horizontal rule:
+		//
+		// ------
+		// or
+		// ******
+		// or
+		// ______
+		if p.isHRule(data) {
+			p.r.HRule(out)
+			var i int
+			for i = 0; data[i] != '\n'; i++ {
+			}
+			data = data[i:]
+			continue
+		}
+
+		// block quote:
+		//
+		// > A big quote I found somewhere
+		// > on the web
+		if p.quotePrefix(data) > 0 {
+			data = data[p.quote(out, data):]
+			continue
+		}
+
+		// table:
+		//
+		// Name  | Age | Phone
+		// ------|-----|---------
+		// Bob   | 31  | 555-1234
+		// Alice | 27  | 555-4321
+		if p.flags&EXTENSION_TABLES != 0 {
+			if i := p.table(out, data); i > 0 {
+				data = data[i:]
+				continue
+			}
+		}
+
+		// an itemized/unordered list:
+		//
+		// * Item 1
+		// * Item 2
+		//
+		// also works with + or -
+		if p.uliPrefix(data) > 0 {
+			data = data[p.list(out, data, 0):]
+			continue
+		}
+
+		// a numbered/ordered list:
+		//
+		// 1. Item 1
+		// 2. Item 2
+		if p.oliPrefix(data) > 0 {
+			data = data[p.list(out, data, LIST_TYPE_ORDERED):]
+			continue
+		}
+
+		// definition lists:
+		//
+		// Term 1
+		// :   Definition a
+		// :   Definition b
+		//
+		// Term 2
+		// :   Definition c
+		if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
+			if p.dliPrefix(data) > 0 {
+				data = data[p.list(out, data, LIST_TYPE_DEFINITION):]
+				continue
+			}
+		}
+
+		// anything else must look like a normal paragraph
+		// note: this finds underlined headers, too
+		data = data[p.paragraph(out, data):]
+	}
+
+	p.nesting--
+}
+
+func (p *parser) isPrefixHeader(data []byte) bool {
+	if data[0] != '#' {
+		return false
+	}
+
+	if p.flags&EXTENSION_SPACE_HEADERS != 0 {
+		level := 0
+		for level < 6 && data[level] == '#' {
+			level++
+		}
+		if data[level] != ' ' {
+			return false
+		}
+	}
+	return true
+}
+
+func (p *parser) prefixHeader(out *bytes.Buffer, data []byte) int {
+	level := 0
+	for level < 6 && data[level] == '#' {
+		level++
+	}
+	i := skipChar(data, level, ' ')
+	end := skipUntilChar(data, i, '\n')
+	skip := end
+	id := ""
+	if p.flags&EXTENSION_HEADER_IDS != 0 {
+		j, k := 0, 0
+		// find start/end of header id
+		for j = i; j < end-1 && (data[j] != '{' || data[j+1] != '#'); j++ {
+		}
+		for k = j + 1; k < end && data[k] != '}'; k++ {
+		}
+		// extract header id iff found
+		if j < end && k < end {
+			id = string(data[j+2 : k])
+			end = j
+			skip = k + 1
+			for end > 0 && data[end-1] == ' ' {
+				end--
+			}
+		}
+	}
+	for end > 0 && data[end-1] == '#' {
+		if isBackslashEscaped(data, end-1) {
+			break
+		}
+		end--
+	}
+	for end > 0 && data[end-1] == ' ' {
+		end--
+	}
+	if end > i {
+		if id == "" && p.flags&EXTENSION_AUTO_HEADER_IDS != 0 {
+			id = sanitized_anchor_name.Create(string(data[i:end]))
+		}
+		work := func() bool {
+			p.inline(out, data[i:end])
+			return true
+		}
+		p.r.Header(out, work, level, id)
+	}
+	return skip
+}
+
+func (p *parser) isUnderlinedHeader(data []byte) int {
+	// test of level 1 header
+	if data[0] == '=' {
+		i := skipChar(data, 1, '=')
+		i = skipChar(data, i, ' ')
+		if data[i] == '\n' {
+			return 1
+		} else {
+			return 0
+		}
+	}
+
+	// test of level 2 header
+	if data[0] == '-' {
+		i := skipChar(data, 1, '-')
+		i = skipChar(data, i, ' ')
+		if data[i] == '\n' {
+			return 2
+		} else {
+			return 0
+		}
+	}
+
+	return 0
+}
+
+func (p *parser) titleBlock(out *bytes.Buffer, data []byte, doRender bool) int {
+	if data[0] != '%' {
+		return 0
+	}
+	splitData := bytes.Split(data, []byte("\n"))
+	var i int
+	for idx, b := range splitData {
+		if !bytes.HasPrefix(b, []byte("%")) {
+			i = idx // - 1
+			break
+		}
+	}
+
+	data = bytes.Join(splitData[0:i], []byte("\n"))
+	p.r.TitleBlock(out, data)
+
+	return len(data)
+}
+
+func (p *parser) html(out *bytes.Buffer, data []byte, doRender bool) int {
+	var i, j int
+
+	// identify the opening tag
+	if data[0] != '<' {
+		return 0
+	}
+	curtag, tagfound := p.htmlFindTag(data[1:])
+
+	// handle special cases
+	if !tagfound {
+		// check for an HTML comment
+		if size := p.htmlComment(out, data, doRender); size > 0 {
+			return size
+		}
+
+		// check for an <hr> tag
+		if size := p.htmlHr(out, data, doRender); size > 0 {
+			return size
+		}
+
+		// no special case recognized
+		return 0
+	}
+
+	// look for an unindented matching closing tag
+	// followed by a blank line
+	found := false
+	/*
+		closetag := []byte("\n</" + curtag + ">")
+		j = len(curtag) + 1
+		for !found {
+			// scan for a closing tag at the beginning of a line
+			if skip := bytes.Index(data[j:], closetag); skip >= 0 {
+				j += skip + len(closetag)
+			} else {
+				break
+			}
+
+			// see if it is the only thing on the line
+			if skip := p.isEmpty(data[j:]); skip > 0 {
+				// see if it is followed by a blank line/eof
+				j += skip
+				if j >= len(data) {
+					found = true
+					i = j
+				} else {
+					if skip := p.isEmpty(data[j:]); skip > 0 {
+						j += skip
+						found = true
+						i = j
+					}
+				}
+			}
+		}
+	*/
+
+	// if not found, try a second pass looking for indented match
+	// but not if tag is "ins" or "del" (following original Markdown.pl)
+	if !found && curtag != "ins" && curtag != "del" {
+		i = 1
+		for i < len(data) {
+			i++
+			for i < len(data) && !(data[i-1] == '<' && data[i] == '/') {
+				i++
+			}
+
+			if i+2+len(curtag) >= len(data) {
+				break
+			}
+
+			j = p.htmlFindEnd(curtag, data[i-1:])
+
+			if j > 0 {
+				i += j - 1
+				found = true
+				break
+			}
+		}
+	}
+
+	if !found {
+		return 0
+	}
+
+	// the end of the block has been found
+	if doRender {
+		// trim newlines
+		end := i
+		for end > 0 && data[end-1] == '\n' {
+			end--
+		}
+		p.r.BlockHtml(out, data[:end])
+	}
+
+	return i
+}
+
+// HTML comment, lax form
+func (p *parser) htmlComment(out *bytes.Buffer, data []byte, doRender bool) int {
+	i := p.inlineHtmlComment(out, data)
+	// needs to end with a blank line
+	if j := p.isEmpty(data[i:]); j > 0 {
+		size := i + j
+		if doRender {
+			// trim trailing newlines
+			end := size
+			for end > 0 && data[end-1] == '\n' {
+				end--
+			}
+			p.r.BlockHtml(out, data[:end])
+		}
+		return size
+	}
+	return 0
+}
+
+// HR, which is the only self-closing block tag considered
+func (p *parser) htmlHr(out *bytes.Buffer, data []byte, doRender bool) int {
+	if data[0] != '<' || (data[1] != 'h' && data[1] != 'H') || (data[2] != 'r' && data[2] != 'R') {
+		return 0
+	}
+	if data[3] != ' ' && data[3] != '/' && data[3] != '>' {
+		// not an <hr> tag after all; at least not a valid one
+		return 0
+	}
+
+	i := 3
+	for data[i] != '>' && data[i] != '\n' {
+		i++
+	}
+
+	if data[i] == '>' {
+		i++
+		if j := p.isEmpty(data[i:]); j > 0 {
+			size := i + j
+			if doRender {
+				// trim newlines
+				end := size
+				for end > 0 && data[end-1] == '\n' {
+					end--
+				}
+				p.r.BlockHtml(out, data[:end])
+			}
+			return size
+		}
+	}
+
+	return 0
+}
+
+func (p *parser) htmlFindTag(data []byte) (string, bool) {
+	i := 0
+	for isalnum(data[i]) {
+		i++
+	}
+	key := string(data[:i])
+	if _, ok := blockTags[key]; ok {
+		return key, true
+	}
+	return "", false
+}
+
+func (p *parser) htmlFindEnd(tag string, data []byte) int {
+	// assume data[0] == '<' && data[1] == '/' already tested
+
+	// check if tag is a match
+	closetag := []byte("</" + tag + ">")
+	if !bytes.HasPrefix(data, closetag) {
+		return 0
+	}
+	i := len(closetag)
+
+	// check that the rest of the line is blank
+	skip := 0
+	if skip = p.isEmpty(data[i:]); skip == 0 {
+		return 0
+	}
+	i += skip
+	skip = 0
+
+	if i >= len(data) {
+		return i
+	}
+
+	if p.flags&EXTENSION_LAX_HTML_BLOCKS != 0 {
+		return i
+	}
+	if skip = p.isEmpty(data[i:]); skip == 0 {
+		// following line must be blank
+		return 0
+	}
+
+	return i + skip
+}
+
+func (p *parser) isEmpty(data []byte) int {
+	// it is okay to call isEmpty on an empty buffer
+	if len(data) == 0 {
+		return 0
+	}
+
+	var i int
+	for i = 0; i < len(data) && data[i] != '\n'; i++ {
+		if data[i] != ' ' && data[i] != '\t' {
+			return 0
+		}
+	}
+	return i + 1
+}
+
+func (p *parser) isHRule(data []byte) bool {
+	i := 0
+
+	// skip up to three spaces
+	for i < 3 && data[i] == ' ' {
+		i++
+	}
+
+	// look at the hrule char
+	if data[i] != '*' && data[i] != '-' && data[i] != '_' {
+		return false
+	}
+	c := data[i]
+
+	// the whole line must be the char or whitespace
+	n := 0
+	for data[i] != '\n' {
+		switch {
+		case data[i] == c:
+			n++
+		case data[i] != ' ':
+			return false
+		}
+		i++
+	}
+
+	return n >= 3
+}
+
+func (p *parser) isFencedCode(data []byte, syntax **string, oldmarker string) (skip int, marker string) {
+	i, size := 0, 0
+	skip = 0
+
+	// skip up to three spaces
+	for i < len(data) && i < 3 && data[i] == ' ' {
+		i++
+	}
+	if i >= len(data) {
+		return
+	}
+
+	// check for the marker characters: ~ or `
+	if data[i] != '~' && data[i] != '`' {
+		return
+	}
+
+	c := data[i]
+
+	// the whole line must be the same char or whitespace
+	for i < len(data) && data[i] == c {
+		size++
+		i++
+	}
+
+	if i >= len(data) {
+		return
+	}
+
+	// the marker char must occur at least 3 times
+	if size < 3 {
+		return
+	}
+	marker = string(data[i-size : i])
+
+	// if this is the end marker, it must match the beginning marker
+	if oldmarker != "" && marker != oldmarker {
+		return
+	}
+
+	if syntax != nil {
+		syn := 0
+		i = skipChar(data, i, ' ')
+
+		if i >= len(data) {
+			return
+		}
+
+		syntaxStart := i
+
+		if data[i] == '{' {
+			i++
+			syntaxStart++
+
+			for i < len(data) && data[i] != '}' && data[i] != '\n' {
+				syn++
+				i++
+			}
+
+			if i >= len(data) || data[i] != '}' {
+				return
+			}
+
+			// strip all whitespace at the beginning and the end
+			// of the {} block
+			for syn > 0 && isspace(data[syntaxStart]) {
+				syntaxStart++
+				syn--
+			}
+
+			for syn > 0 && isspace(data[syntaxStart+syn-1]) {
+				syn--
+			}
+
+			i++
+		} else {
+			for i < len(data) && !isspace(data[i]) {
+				syn++
+				i++
+			}
+		}
+
+		language := string(data[syntaxStart : syntaxStart+syn])
+		*syntax = &language
+	}
+
+	i = skipChar(data, i, ' ')
+	if i >= len(data) || data[i] != '\n' {
+		return
+	}
+
+	skip = i + 1
+	return
+}
+
+func (p *parser) fencedCode(out *bytes.Buffer, data []byte, doRender bool) int {
+	var lang *string
+	beg, marker := p.isFencedCode(data, &lang, "")
+	if beg == 0 || beg >= len(data) {
+		return 0
+	}
+
+	var work bytes.Buffer
+
+	for {
+		// safe to assume beg < len(data)
+
+		// check for the end of the code block
+		fenceEnd, _ := p.isFencedCode(data[beg:], nil, marker)
+		if fenceEnd != 0 {
+			beg += fenceEnd
+			break
+		}
+
+		// copy the current line
+		end := skipUntilChar(data, beg, '\n') + 1
+
+		// did we reach the end of the buffer without a closing marker?
+		if end >= len(data) {
+			return 0
+		}
+
+		// verbatim copy to the working buffer
+		if doRender {
+			work.Write(data[beg:end])
+		}
+		beg = end
+	}
+
+	syntax := ""
+	if lang != nil {
+		syntax = *lang
+	}
+
+	if doRender {
+		p.r.BlockCode(out, work.Bytes(), syntax)
+	}
+
+	return beg
+}
+
+func (p *parser) table(out *bytes.Buffer, data []byte) int {
+	var header bytes.Buffer
+	i, columns := p.tableHeader(&header, data)
+	if i == 0 {
+		return 0
+	}
+
+	var body bytes.Buffer
+
+	for i < len(data) {
+		pipes, rowStart := 0, i
+		for ; data[i] != '\n'; i++ {
+			if data[i] == '|' {
+				pipes++
+			}
+		}
+
+		if pipes == 0 {
+			i = rowStart
+			break
+		}
+
+		// include the newline in data sent to tableRow
+		i++
+		p.tableRow(&body, data[rowStart:i], columns, false)
+	}
+
+	p.r.Table(out, header.Bytes(), body.Bytes(), columns)
+
+	return i
+}
+
+// check if the specified position is preceded by an odd number of backslashes
+func isBackslashEscaped(data []byte, i int) bool {
+	backslashes := 0
+	for i-backslashes-1 >= 0 && data[i-backslashes-1] == '\\' {
+		backslashes++
+	}
+	return backslashes&1 == 1
+}
+
+func (p *parser) tableHeader(out *bytes.Buffer, data []byte) (size int, columns []int) {
+	i := 0
+	colCount := 1
+	for i = 0; data[i] != '\n'; i++ {
+		if data[i] == '|' && !isBackslashEscaped(data, i) {
+			colCount++
+		}
+	}
+
+	// doesn't look like a table header
+	if colCount == 1 {
+		return
+	}
+
+	// include the newline in the data sent to tableRow
+	header := data[:i+1]
+
+	// column count ignores pipes at beginning or end of line
+	if data[0] == '|' {
+		colCount--
+	}
+	if i > 2 && data[i-1] == '|' && !isBackslashEscaped(data, i-1) {
+		colCount--
+	}
+
+	columns = make([]int, colCount)
+
+	// move on to the header underline
+	i++
+	if i >= len(data) {
+		return
+	}
+
+	if data[i] == '|' && !isBackslashEscaped(data, i) {
+		i++
+	}
+	i = skipChar(data, i, ' ')
+
+	// each column header is of form: / *:?-+:? *|/ with # dashes + # colons >= 3
+	// and trailing | optional on last column
+	col := 0
+	for data[i] != '\n' {
+		dashes := 0
+
+		if data[i] == ':' {
+			i++
+			columns[col] |= TABLE_ALIGNMENT_LEFT
+			dashes++
+		}
+		for data[i] == '-' {
+			i++
+			dashes++
+		}
+		if data[i] == ':' {
+			i++
+			columns[col] |= TABLE_ALIGNMENT_RIGHT
+			dashes++
+		}
+		for data[i] == ' ' {
+			i++
+		}
+
+		// end of column test is messy
+		switch {
+		case dashes < 3:
+			// not a valid column
+			return
+
+		case data[i] == '|' && !isBackslashEscaped(data, i):
+			// marker found, now skip past trailing whitespace
+			col++
+			i++
+			for data[i] == ' ' {
+				i++
+			}
+
+			// trailing junk found after last column
+			if col >= colCount && data[i] != '\n' {
+				return
+			}
+
+		case (data[i] != '|' || isBackslashEscaped(data, i)) && col+1 < colCount:
+			// something else found where marker was required
+			return
+
+		case data[i] == '\n':
+			// marker is optional for the last column
+			col++
+
+		default:
+			// trailing junk found after last column
+			return
+		}
+	}
+	if col != colCount {
+		return
+	}
+
+	p.tableRow(out, header, columns, true)
+	size = i + 1
+	return
+}
+
+func (p *parser) tableRow(out *bytes.Buffer, data []byte, columns []int, header bool) {
+	i, col := 0, 0
+	var rowWork bytes.Buffer
+
+	if data[i] == '|' && !isBackslashEscaped(data, i) {
+		i++
+	}
+
+	for col = 0; col < len(columns) && i < len(data); col++ {
+		for data[i] == ' ' {
+			i++
+		}
+
+		cellStart := i
+
+		for (data[i] != '|' || isBackslashEscaped(data, i)) && data[i] != '\n' {
+			i++
+		}
+
+		cellEnd := i
+
+		// skip the end-of-cell marker, possibly taking us past end of buffer
+		i++
+
+		for cellEnd > cellStart && data[cellEnd-1] == ' ' {
+			cellEnd--
+		}
+
+		var cellWork bytes.Buffer
+		p.inline(&cellWork, data[cellStart:cellEnd])
+
+		if header {
+			p.r.TableHeaderCell(&rowWork, cellWork.Bytes(), columns[col])
+		} else {
+			p.r.TableCell(&rowWork, cellWork.Bytes(), columns[col])
+		}
+	}
+
+	// pad it out with empty columns to get the right number
+	for ; col < len(columns); col++ {
+		if header {
+			p.r.TableHeaderCell(&rowWork, nil, columns[col])
+		} else {
+			p.r.TableCell(&rowWork, nil, columns[col])
+		}
+	}
+
+	// silently ignore rows with too many cells
+
+	p.r.TableRow(out, rowWork.Bytes())
+}
+
+// returns blockquote prefix length
+func (p *parser) quotePrefix(data []byte) int {
+	i := 0
+	for i < 3 && data[i] == ' ' {
+		i++
+	}
+	if data[i] == '>' {
+		if data[i+1] == ' ' {
+			return i + 2
+		}
+		return i + 1
+	}
+	return 0
+}
+
+// blockquote ends with at least one blank line
+// followed by something without a blockquote prefix
+func (p *parser) terminateBlockquote(data []byte, beg, end int) bool {
+	if p.isEmpty(data[beg:]) <= 0 {
+		return false
+	}
+	if end >= len(data) {
+		return true
+	}
+	return p.quotePrefix(data[end:]) == 0 && p.isEmpty(data[end:]) == 0
+}
+
+// parse a blockquote fragment
+func (p *parser) quote(out *bytes.Buffer, data []byte) int {
+	var raw bytes.Buffer
+	beg, end := 0, 0
+	for beg < len(data) {
+		end = beg
+		// Step over whole lines, collecting them. While doing that, check for
+		// fenced code and if one's found, incorporate it altogether,
+		// irregardless of any contents inside it
+		for data[end] != '\n' {
+			if p.flags&EXTENSION_FENCED_CODE != 0 {
+				if i := p.fencedCode(out, data[end:], false); i > 0 {
+					// -1 to compensate for the extra end++ after the loop:
+					end += i - 1
+					break
+				}
+			}
+			end++
+		}
+		end++
+
+		if pre := p.quotePrefix(data[beg:]); pre > 0 {
+			// skip the prefix
+			beg += pre
+		} else if p.terminateBlockquote(data, beg, end) {
+			break
+		}
+
+		// this line is part of the blockquote
+		raw.Write(data[beg:end])
+		beg = end
+	}
+
+	var cooked bytes.Buffer
+	p.block(&cooked, raw.Bytes())
+	p.r.BlockQuote(out, cooked.Bytes())
+	return end
+}
+
+// returns prefix length for block code
+func (p *parser) codePrefix(data []byte) int {
+	if data[0] == ' ' && data[1] == ' ' && data[2] == ' ' && data[3] == ' ' {
+		return 4
+	}
+	return 0
+}
+
+func (p *parser) code(out *bytes.Buffer, data []byte) int {
+	var work bytes.Buffer
+
+	i := 0
+	for i < len(data) {
+		beg := i
+		for data[i] != '\n' {
+			i++
+		}
+		i++
+
+		blankline := p.isEmpty(data[beg:i]) > 0
+		if pre := p.codePrefix(data[beg:i]); pre > 0 {
+			beg += pre
+		} else if !blankline {
+			// non-empty, non-prefixed line breaks the pre
+			i = beg
+			break
+		}
+
+		// verbatim copy to the working buffeu
+		if blankline {
+			work.WriteByte('\n')
+		} else {
+			work.Write(data[beg:i])
+		}
+	}
+
+	// trim all the \n off the end of work
+	workbytes := work.Bytes()
+	eol := len(workbytes)
+	for eol > 0 && workbytes[eol-1] == '\n' {
+		eol--
+	}
+	if eol != len(workbytes) {
+		work.Truncate(eol)
+	}
+
+	work.WriteByte('\n')
+
+	p.r.BlockCode(out, work.Bytes(), "")
+
+	return i
+}
+
+// returns unordered list item prefix
+func (p *parser) uliPrefix(data []byte) int {
+	i := 0
+
+	// start with up to 3 spaces
+	for i < 3 && data[i] == ' ' {
+		i++
+	}
+
+	// need a *, +, or - followed by a space
+	if (data[i] != '*' && data[i] != '+' && data[i] != '-') ||
+		data[i+1] != ' ' {
+		return 0
+	}
+	return i + 2
+}
+
+// returns ordered list item prefix
+func (p *parser) oliPrefix(data []byte) int {
+	i := 0
+
+	// start with up to 3 spaces
+	for i < 3 && data[i] == ' ' {
+		i++
+	}
+
+	// count the digits
+	start := i
+	for data[i] >= '0' && data[i] <= '9' {
+		i++
+	}
+
+	// we need >= 1 digits followed by a dot and a space
+	if start == i || data[i] != '.' || data[i+1] != ' ' {
+		return 0
+	}
+	return i + 2
+}
+
+// returns definition list item prefix
+func (p *parser) dliPrefix(data []byte) int {
+	i := 0
+
+	// need a : followed by a spaces
+	if data[i] != ':' || data[i+1] != ' ' {
+		return 0
+	}
+	for data[i] == ' ' {
+		i++
+	}
+	return i + 2
+}
+
+// parse ordered or unordered list block
+func (p *parser) list(out *bytes.Buffer, data []byte, flags int) int {
+	i := 0
+	flags |= LIST_ITEM_BEGINNING_OF_LIST
+	work := func() bool {
+		for i < len(data) {
+			skip := p.listItem(out, data[i:], &flags)
+			i += skip
+
+			if skip == 0 || flags&LIST_ITEM_END_OF_LIST != 0 {
+				break
+			}
+			flags &= ^LIST_ITEM_BEGINNING_OF_LIST
+		}
+		return true
+	}
+
+	p.r.List(out, work, flags)
+	return i
+}
+
+// Parse a single list item.
+// Assumes initial prefix is already removed if this is a sublist.
+func (p *parser) listItem(out *bytes.Buffer, data []byte, flags *int) int {
+	// keep track of the indentation of the first line
+	itemIndent := 0
+	for itemIndent < 3 && data[itemIndent] == ' ' {
+		itemIndent++
+	}
+
+	i := p.uliPrefix(data)
+	if i == 0 {
+		i = p.oliPrefix(data)
+	}
+	if i == 0 {
+		i = p.dliPrefix(data)
+		// reset definition term flag
+		if i > 0 {
+			*flags &= ^LIST_TYPE_TERM
+		}
+	}
+	if i == 0 {
+		// if in defnition list, set term flag and continue
+		if *flags&LIST_TYPE_DEFINITION != 0 {
+			*flags |= LIST_TYPE_TERM
+		} else {
+			return 0
+		}
+	}
+
+	// skip leading whitespace on first line
+	for data[i] == ' ' {
+		i++
+	}
+
+	// find the end of the line
+	line := i
+	for i > 0 && data[i-1] != '\n' {
+		i++
+	}
+
+	// get working buffer
+	var raw bytes.Buffer
+
+	// put the first line into the working buffer
+	raw.Write(data[line:i])
+	line = i
+
+	// process the following lines
+	containsBlankLine := false
+	sublist := 0
+
+gatherlines:
+	for line < len(data) {
+		i++
+
+		// find the end of this line
+		for data[i-1] != '\n' {
+			i++
+		}
+
+		// if it is an empty line, guess that it is part of this item
+		// and move on to the next line
+		if p.isEmpty(data[line:i]) > 0 {
+			containsBlankLine = true
+			line = i
+			continue
+		}
+
+		// calculate the indentation
+		indent := 0
+		for indent < 4 && line+indent < i && data[line+indent] == ' ' {
+			indent++
+		}
+
+		chunk := data[line+indent : i]
+
+		// evaluate how this line fits in
+		switch {
+		// is this a nested list item?
+		case (p.uliPrefix(chunk) > 0 && !p.isHRule(chunk)) ||
+			p.oliPrefix(chunk) > 0 ||
+			p.dliPrefix(chunk) > 0:
+
+			if containsBlankLine {
+				*flags |= LIST_ITEM_CONTAINS_BLOCK
+			}
+
+			// to be a nested list, it must be indented more
+			// if not, it is the next item in the same list
+			if indent <= itemIndent {
+				break gatherlines
+			}
+
+			// is this the first item in the nested list?
+			if sublist == 0 {
+				sublist = raw.Len()
+			}
+
+		// is this a nested prefix header?
+		case p.isPrefixHeader(chunk):
+			// if the header is not indented, it is not nested in the list
+			// and thus ends the list
+			if containsBlankLine && indent < 4 {
+				*flags |= LIST_ITEM_END_OF_LIST
+				break gatherlines
+			}
+			*flags |= LIST_ITEM_CONTAINS_BLOCK
+
+		// anything following an empty line is only part
+		// of this item if it is indented 4 spaces
+		// (regardless of the indentation of the beginning of the item)
+		case containsBlankLine && indent < 4:
+			if *flags&LIST_TYPE_DEFINITION != 0 && i < len(data)-1 {
+				// is the next item still a part of this list?
+				next := i
+				for data[next] != '\n' {
+					next++
+				}
+				for next < len(data)-1 && data[next] == '\n' {
+					next++
+				}
+				if i < len(data)-1 && data[i] != ':' && data[next] != ':' {
+					*flags |= LIST_ITEM_END_OF_LIST
+				}
+			} else {
+				*flags |= LIST_ITEM_END_OF_LIST
+			}
+			break gatherlines
+
+		// a blank line means this should be parsed as a block
+		case containsBlankLine:
+			raw.WriteByte('\n')
+			*flags |= LIST_ITEM_CONTAINS_BLOCK
+		}
+
+		// if this line was preceeded by one or more blanks,
+		// re-introduce the blank into the buffer
+		if containsBlankLine {
+			containsBlankLine = false
+			raw.WriteByte('\n')
+
+		}
+
+		// add the line into the working buffer without prefix
+		raw.Write(data[line+indent : i])
+
+		line = i
+	}
+
+	rawBytes := raw.Bytes()
+
+	// render the contents of the list item
+	var cooked bytes.Buffer
+	if *flags&LIST_ITEM_CONTAINS_BLOCK != 0 && *flags&LIST_TYPE_TERM == 0 {
+		// intermediate render of block item, except for definition term
+		if sublist > 0 {
+			p.block(&cooked, rawBytes[:sublist])
+			p.block(&cooked, rawBytes[sublist:])
+		} else {
+			p.block(&cooked, rawBytes)
+		}
+	} else {
+		// intermediate render of inline item
+		if sublist > 0 {
+			p.inline(&cooked, rawBytes[:sublist])
+			p.block(&cooked, rawBytes[sublist:])
+		} else {
+			p.inline(&cooked, rawBytes)
+		}
+	}
+
+	// render the actual list item
+	cookedBytes := cooked.Bytes()
+	parsedEnd := len(cookedBytes)
+
+	// strip trailing newlines
+	for parsedEnd > 0 && cookedBytes[parsedEnd-1] == '\n' {
+		parsedEnd--
+	}
+	p.r.ListItem(out, cookedBytes[:parsedEnd], *flags)
+
+	return line
+}
+
+// render a single paragraph that has already been parsed out
+func (p *parser) renderParagraph(out *bytes.Buffer, data []byte) {
+	if len(data) == 0 {
+		return
+	}
+
+	// trim leading spaces
+	beg := 0
+	for data[beg] == ' ' {
+		beg++
+	}
+
+	// trim trailing newline
+	end := len(data) - 1
+
+	// trim trailing spaces
+	for end > beg && data[end-1] == ' ' {
+		end--
+	}
+
+	work := func() bool {
+		p.inline(out, data[beg:end])
+		return true
+	}
+	p.r.Paragraph(out, work)
+}
+
+func (p *parser) paragraph(out *bytes.Buffer, data []byte) int {
+	// prev: index of 1st char of previous line
+	// line: index of 1st char of current line
+	// i: index of cursor/end of current line
+	var prev, line, i int
+
+	// keep going until we find something to mark the end of the paragraph
+	for i < len(data) {
+		// mark the beginning of the current line
+		prev = line
+		current := data[i:]
+		line = i
+
+		// did we find a blank line marking the end of the paragraph?
+		if n := p.isEmpty(current); n > 0 {
+			// did this blank line followed by a definition list item?
+			if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
+				if i < len(data)-1 && data[i+1] == ':' {
+					return p.list(out, data[prev:], LIST_TYPE_DEFINITION)
+				}
+			}
+
+			p.renderParagraph(out, data[:i])
+			return i + n
+		}
+
+		// an underline under some text marks a header, so our paragraph ended on prev line
+		if i > 0 {
+			if level := p.isUnderlinedHeader(current); level > 0 {
+				// render the paragraph
+				p.renderParagraph(out, data[:prev])
+
+				// ignore leading and trailing whitespace
+				eol := i - 1
+				for prev < eol && data[prev] == ' ' {
+					prev++
+				}
+				for eol > prev && data[eol-1] == ' ' {
+					eol--
+				}
+
+				// render the header
+				// this ugly double closure avoids forcing variables onto the heap
+				work := func(o *bytes.Buffer, pp *parser, d []byte) func() bool {
+					return func() bool {
+						pp.inline(o, d)
+						return true
+					}
+				}(out, p, data[prev:eol])
+
+				id := ""
+				if p.flags&EXTENSION_AUTO_HEADER_IDS != 0 {
+					id = sanitized_anchor_name.Create(string(data[prev:eol]))
+				}
+
+				p.r.Header(out, work, level, id)
+
+				// find the end of the underline
+				for data[i] != '\n' {
+					i++
+				}
+				return i
+			}
+		}
+
+		// if the next line starts a block of HTML, then the paragraph ends here
+		if p.flags&EXTENSION_LAX_HTML_BLOCKS != 0 {
+			if data[i] == '<' && p.html(out, current, false) > 0 {
+				// rewind to before the HTML block
+				p.renderParagraph(out, data[:i])
+				return i
+			}
+		}
+
+		// if there's a prefixed header or a horizontal rule after this, paragraph is over
+		if p.isPrefixHeader(current) || p.isHRule(current) {
+			p.renderParagraph(out, data[:i])
+			return i
+		}
+
+		// if there's a fenced code block, paragraph is over
+		if p.flags&EXTENSION_FENCED_CODE != 0 {
+			if p.fencedCode(out, current, false) > 0 {
+				p.renderParagraph(out, data[:i])
+				return i
+			}
+		}
+
+		// if there's a definition list item, prev line is a definition term
+		if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
+			if p.dliPrefix(current) != 0 {
+				return p.list(out, data[prev:], LIST_TYPE_DEFINITION)
+			}
+		}
+
+		// if there's a list after this, paragraph is over
+		if p.flags&EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK != 0 {
+			if p.uliPrefix(current) != 0 ||
+				p.oliPrefix(current) != 0 ||
+				p.quotePrefix(current) != 0 ||
+				p.codePrefix(current) != 0 {
+				p.renderParagraph(out, data[:i])
+				return i
+			}
+		}
+
+		// otherwise, scan to the beginning of the next line
+		for data[i] != '\n' {
+			i++
+		}
+		i++
+	}
+
+	p.renderParagraph(out, data[:i])
+	return i
+}
diff --git a/vendor/github.com/russross/blackfriday/html.go b/vendor/github.com/russross/blackfriday/html.go
new file mode 100644
index 0000000000..74e67ee82b
--- /dev/null
+++ b/vendor/github.com/russross/blackfriday/html.go
@@ -0,0 +1,949 @@
+//
+// Blackfriday Markdown Processor
+// Available at http://github.com/russross/blackfriday
+//
+// Copyright © 2011 Russ Ross <russ@russross.com>.
+// Distributed under the Simplified BSD License.
+// See README.md for details.
+//
+
+//
+//
+// HTML rendering backend
+//
+//
+
+package blackfriday
+
+import (
+	"bytes"
+	"fmt"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+// Html renderer configuration options.
+const (
+	HTML_SKIP_HTML                 = 1 << iota // skip preformatted HTML blocks
+	HTML_SKIP_STYLE                            // skip embedded <style> elements
+	HTML_SKIP_IMAGES                           // skip embedded images
+	HTML_SKIP_LINKS                            // skip all links
+	HTML_SAFELINK                              // only link to trusted protocols
+	HTML_NOFOLLOW_LINKS                        // only link with rel="nofollow"
+	HTML_NOREFERRER_LINKS                      // only link with rel="noreferrer"
+	HTML_HREF_TARGET_BLANK                     // add a blank target
+	HTML_TOC                                   // generate a table of contents
+	HTML_OMIT_CONTENTS                         // skip the main contents (for a standalone table of contents)
+	HTML_COMPLETE_PAGE                         // generate a complete HTML page
+	HTML_USE_XHTML                             // generate XHTML output instead of HTML
+	HTML_USE_SMARTYPANTS                       // enable smart punctuation substitutions
+	HTML_SMARTYPANTS_FRACTIONS                 // enable smart fractions (with HTML_USE_SMARTYPANTS)
+	HTML_SMARTYPANTS_DASHES                    // enable smart dashes (with HTML_USE_SMARTYPANTS)
+	HTML_SMARTYPANTS_LATEX_DASHES              // enable LaTeX-style dashes (with HTML_USE_SMARTYPANTS and HTML_SMARTYPANTS_DASHES)
+	HTML_SMARTYPANTS_ANGLED_QUOTES             // enable angled double quotes (with HTML_USE_SMARTYPANTS) for double quotes rendering
+	HTML_FOOTNOTE_RETURN_LINKS                 // generate a link at the end of a footnote to return to the source
+)
+
+var (
+	alignments = []string{
+		"left",
+		"right",
+		"center",
+	}
+
+	// TODO: improve this regexp to catch all possible entities:
+	htmlEntity = regexp.MustCompile(`&[a-z]{2,5};`)
+)
+
+type HtmlRendererParameters struct {
+	// Prepend this text to each relative URL.
+	AbsolutePrefix string
+	// Add this text to each footnote anchor, to ensure uniqueness.
+	FootnoteAnchorPrefix string
+	// Show this text inside the <a> tag for a footnote return link, if the
+	// HTML_FOOTNOTE_RETURN_LINKS flag is enabled. If blank, the string
+	// <sup>[return]</sup> is used.
+	FootnoteReturnLinkContents string
+	// If set, add this text to the front of each Header ID, to ensure
+	// uniqueness.
+	HeaderIDPrefix string
+	// If set, add this text to the back of each Header ID, to ensure uniqueness.
+	HeaderIDSuffix string
+}
+
+// Html is a type that implements the Renderer interface for HTML output.
+//
+// Do not create this directly, instead use the HtmlRenderer function.
+type Html struct {
+	flags    int    // HTML_* options
+	closeTag string // how to end singleton tags: either " />" or ">"
+	title    string // document title
+	css      string // optional css file url (used with HTML_COMPLETE_PAGE)
+
+	parameters HtmlRendererParameters
+
+	// table of contents data
+	tocMarker    int
+	headerCount  int
+	currentLevel int
+	toc          *bytes.Buffer
+
+	// Track header IDs to prevent ID collision in a single generation.
+	headerIDs map[string]int
+
+	smartypants *smartypantsRenderer
+}
+
+const (
+	xhtmlClose = " />"
+	htmlClose  = ">"
+)
+
+// HtmlRenderer creates and configures an Html object, which
+// satisfies the Renderer interface.
+//
+// flags is a set of HTML_* options ORed together.
+// title is the title of the document, and css is a URL for the document's
+// stylesheet.
+// title and css are only used when HTML_COMPLETE_PAGE is selected.
+func HtmlRenderer(flags int, title string, css string) Renderer {
+	return HtmlRendererWithParameters(flags, title, css, HtmlRendererParameters{})
+}
+
+func HtmlRendererWithParameters(flags int, title string,
+	css string, renderParameters HtmlRendererParameters) Renderer {
+	// configure the rendering engine
+	closeTag := htmlClose
+	if flags&HTML_USE_XHTML != 0 {
+		closeTag = xhtmlClose
+	}
+
+	if renderParameters.FootnoteReturnLinkContents == "" {
+		renderParameters.FootnoteReturnLinkContents = `<sup>[return]</sup>`
+	}
+
+	return &Html{
+		flags:      flags,
+		closeTag:   closeTag,
+		title:      title,
+		css:        css,
+		parameters: renderParameters,
+
+		headerCount:  0,
+		currentLevel: 0,
+		toc:          new(bytes.Buffer),
+
+		headerIDs: make(map[string]int),
+
+		smartypants: smartypants(flags),
+	}
+}
+
+// Using if statements is a bit faster than a switch statement. As the compiler
+// improves, this should be unnecessary this is only worthwhile because
+// attrEscape is the single largest CPU user in normal use.
+// Also tried using map, but that gave a ~3x slowdown.
+func escapeSingleChar(char byte) (string, bool) {
+	if char == '"' {
+		return "&quot;", true
+	}
+	if char == '&' {
+		return "&amp;", true
+	}
+	if char == '<' {
+		return "&lt;", true
+	}
+	if char == '>' {
+		return "&gt;", true
+	}
+	return "", false
+}
+
+func attrEscape(out *bytes.Buffer, src []byte) {
+	org := 0
+	for i, ch := range src {
+		if entity, ok := escapeSingleChar(ch); ok {
+			if i > org {
+				// copy all the normal characters since the last escape
+				out.Write(src[org:i])
+			}
+			org = i + 1
+			out.WriteString(entity)
+		}
+	}
+	if org < len(src) {
+		out.Write(src[org:])
+	}
+}
+
+func entityEscapeWithSkip(out *bytes.Buffer, src []byte, skipRanges [][]int) {
+	end := 0
+	for _, rang := range skipRanges {
+		attrEscape(out, src[end:rang[0]])
+		out.Write(src[rang[0]:rang[1]])
+		end = rang[1]
+	}
+	attrEscape(out, src[end:])
+}
+
+func (options *Html) GetFlags() int {
+	return options.flags
+}
+
+func (options *Html) TitleBlock(out *bytes.Buffer, text []byte) {
+	text = bytes.TrimPrefix(text, []byte("% "))
+	text = bytes.Replace(text, []byte("\n% "), []byte("\n"), -1)
+	out.WriteString("<h1 class=\"title\">")
+	out.Write(text)
+	out.WriteString("\n</h1>")
+}
+
+func (options *Html) Header(out *bytes.Buffer, text func() bool, level int, id string) {
+	marker := out.Len()
+	doubleSpace(out)
+
+	if id == "" && options.flags&HTML_TOC != 0 {
+		id = fmt.Sprintf("toc_%d", options.headerCount)
+	}
+
+	if id != "" {
+		id = options.ensureUniqueHeaderID(id)
+
+		if options.parameters.HeaderIDPrefix != "" {
+			id = options.parameters.HeaderIDPrefix + id
+		}
+
+		if options.parameters.HeaderIDSuffix != "" {
+			id = id + options.parameters.HeaderIDSuffix
+		}
+
+		out.WriteString(fmt.Sprintf("<h%d id=\"%s\">", level, id))
+	} else {
+		out.WriteString(fmt.Sprintf("<h%d>", level))
+	}
+
+	tocMarker := out.Len()
+	if !text() {
+		out.Truncate(marker)
+		return
+	}
+
+	// are we building a table of contents?
+	if options.flags&HTML_TOC != 0 {
+		options.TocHeaderWithAnchor(out.Bytes()[tocMarker:], level, id)
+	}
+
+	out.WriteString(fmt.Sprintf("</h%d>\n", level))
+}
+
+func (options *Html) BlockHtml(out *bytes.Buffer, text []byte) {
+	if options.flags&HTML_SKIP_HTML != 0 {
+		return
+	}
+
+	doubleSpace(out)
+	out.Write(text)
+	out.WriteByte('\n')
+}
+
+func (options *Html) HRule(out *bytes.Buffer) {
+	doubleSpace(out)
+	out.WriteString("<hr")
+	out.WriteString(options.closeTag)
+	out.WriteByte('\n')
+}
+
+func (options *Html) BlockCode(out *bytes.Buffer, text []byte, lang string) {
+	doubleSpace(out)
+
+	// parse out the language names/classes
+	count := 0
+	for _, elt := range strings.Fields(lang) {
+		if elt[0] == '.' {
+			elt = elt[1:]
+		}
+		if len(elt) == 0 {
+			continue
+		}
+		if count == 0 {
+			out.WriteString("<pre><code class=\"language-")
+		} else {
+			out.WriteByte(' ')
+		}
+		attrEscape(out, []byte(elt))
+		count++
+	}
+
+	if count == 0 {
+		out.WriteString("<pre><code>")
+	} else {
+		out.WriteString("\">")
+	}
+
+	attrEscape(out, text)
+	out.WriteString("</code></pre>\n")
+}
+
+func (options *Html) BlockQuote(out *bytes.Buffer, text []byte) {
+	doubleSpace(out)
+	out.WriteString("<blockquote>\n")
+	out.Write(text)
+	out.WriteString("</blockquote>\n")
+}
+
+func (options *Html) Table(out *bytes.Buffer, header []byte, body []byte, columnData []int) {
+	doubleSpace(out)
+	out.WriteString("<table>\n<thead>\n")
+	out.Write(header)
+	out.WriteString("</thead>\n\n<tbody>\n")
+	out.Write(body)
+	out.WriteString("</tbody>\n</table>\n")
+}
+
+func (options *Html) TableRow(out *bytes.Buffer, text []byte) {
+	doubleSpace(out)
+	out.WriteString("<tr>\n")
+	out.Write(text)
+	out.WriteString("\n</tr>\n")
+}
+
+func (options *Html) TableHeaderCell(out *bytes.Buffer, text []byte, align int) {
+	doubleSpace(out)
+	switch align {
+	case TABLE_ALIGNMENT_LEFT:
+		out.WriteString("<th align=\"left\">")
+	case TABLE_ALIGNMENT_RIGHT:
+		out.WriteString("<th align=\"right\">")
+	case TABLE_ALIGNMENT_CENTER:
+		out.WriteString("<th align=\"center\">")
+	default:
+		out.WriteString("<th>")
+	}
+
+	out.Write(text)
+	out.WriteString("</th>")
+}
+
+func (options *Html) TableCell(out *bytes.Buffer, text []byte, align int) {
+	doubleSpace(out)
+	switch align {
+	case TABLE_ALIGNMENT_LEFT:
+		out.WriteString("<td align=\"left\">")
+	case TABLE_ALIGNMENT_RIGHT:
+		out.WriteString("<td align=\"right\">")
+	case TABLE_ALIGNMENT_CENTER:
+		out.WriteString("<td align=\"center\">")
+	default:
+		out.WriteString("<td>")
+	}
+
+	out.Write(text)
+	out.WriteString("</td>")
+}
+
+func (options *Html) Footnotes(out *bytes.Buffer, text func() bool) {
+	out.WriteString("<div class=\"footnotes\">\n")
+	options.HRule(out)
+	options.List(out, text, LIST_TYPE_ORDERED)
+	out.WriteString("</div>\n")
+}
+
+func (options *Html) FootnoteItem(out *bytes.Buffer, name, text []byte, flags int) {
+	if flags&LIST_ITEM_CONTAINS_BLOCK != 0 || flags&LIST_ITEM_BEGINNING_OF_LIST != 0 {
+		doubleSpace(out)
+	}
+	slug := slugify(name)
+	out.WriteString(`<li id="`)
+	out.WriteString(`fn:`)
+	out.WriteString(options.parameters.FootnoteAnchorPrefix)
+	out.Write(slug)
+	out.WriteString(`">`)
+	out.Write(text)
+	if options.flags&HTML_FOOTNOTE_RETURN_LINKS != 0 {
+		out.WriteString(` <a class="footnote-return" href="#`)
+		out.WriteString(`fnref:`)
+		out.WriteString(options.parameters.FootnoteAnchorPrefix)
+		out.Write(slug)
+		out.WriteString(`">`)
+		out.WriteString(options.parameters.FootnoteReturnLinkContents)
+		out.WriteString(`</a>`)
+	}
+	out.WriteString("</li>\n")
+}
+
+func (options *Html) List(out *bytes.Buffer, text func() bool, flags int) {
+	marker := out.Len()
+	doubleSpace(out)
+
+	if flags&LIST_TYPE_DEFINITION != 0 {
+		out.WriteString("<dl>")
+	} else if flags&LIST_TYPE_ORDERED != 0 {
+		out.WriteString("<ol>")
+	} else {
+		out.WriteString("<ul>")
+	}
+	if !text() {
+		out.Truncate(marker)
+		return
+	}
+	if flags&LIST_TYPE_DEFINITION != 0 {
+		out.WriteString("</dl>\n")
+	} else if flags&LIST_TYPE_ORDERED != 0 {
+		out.WriteString("</ol>\n")
+	} else {
+		out.WriteString("</ul>\n")
+	}
+}
+
+func (options *Html) ListItem(out *bytes.Buffer, text []byte, flags int) {
+	if (flags&LIST_ITEM_CONTAINS_BLOCK != 0 && flags&LIST_TYPE_DEFINITION == 0) ||
+		flags&LIST_ITEM_BEGINNING_OF_LIST != 0 {
+		doubleSpace(out)
+	}
+	if flags&LIST_TYPE_TERM != 0 {
+		out.WriteString("<dt>")
+	} else if flags&LIST_TYPE_DEFINITION != 0 {
+		out.WriteString("<dd>")
+	} else {
+		out.WriteString("<li>")
+	}
+	out.Write(text)
+	if flags&LIST_TYPE_TERM != 0 {
+		out.WriteString("</dt>\n")
+	} else if flags&LIST_TYPE_DEFINITION != 0 {
+		out.WriteString("</dd>\n")
+	} else {
+		out.WriteString("</li>\n")
+	}
+}
+
+func (options *Html) Paragraph(out *bytes.Buffer, text func() bool) {
+	marker := out.Len()
+	doubleSpace(out)
+
+	out.WriteString("<p>")
+	if !text() {
+		out.Truncate(marker)
+		return
+	}
+	out.WriteString("</p>\n")
+}
+
+func (options *Html) AutoLink(out *bytes.Buffer, link []byte, kind int) {
+	skipRanges := htmlEntity.FindAllIndex(link, -1)
+	if options.flags&HTML_SAFELINK != 0 && !isSafeLink(link) && kind != LINK_TYPE_EMAIL {
+		// mark it but don't link it if it is not a safe link: no smartypants
+		out.WriteString("<tt>")
+		entityEscapeWithSkip(out, link, skipRanges)
+		out.WriteString("</tt>")
+		return
+	}
+
+	out.WriteString("<a href=\"")
+	if kind == LINK_TYPE_EMAIL {
+		out.WriteString("mailto:")
+	} else {
+		options.maybeWriteAbsolutePrefix(out, link)
+	}
+
+	entityEscapeWithSkip(out, link, skipRanges)
+
+	var relAttrs []string
+	if options.flags&HTML_NOFOLLOW_LINKS != 0 && !isRelativeLink(link) {
+		relAttrs = append(relAttrs, "nofollow")
+	}
+	if options.flags&HTML_NOREFERRER_LINKS != 0 && !isRelativeLink(link) {
+		relAttrs = append(relAttrs, "noreferrer")
+	}
+	if len(relAttrs) > 0 {
+		out.WriteString(fmt.Sprintf("\" rel=\"%s", strings.Join(relAttrs, " ")))
+	}
+
+	// blank target only add to external link
+	if options.flags&HTML_HREF_TARGET_BLANK != 0 && !isRelativeLink(link) {
+		out.WriteString("\" target=\"_blank")
+	}
+
+	out.WriteString("\">")
+
+	// Pretty print: if we get an email address as
+	// an actual URI, e.g. `mailto:foo@bar.com`, we don't
+	// want to print the `mailto:` prefix
+	switch {
+	case bytes.HasPrefix(link, []byte("mailto://")):
+		attrEscape(out, link[len("mailto://"):])
+	case bytes.HasPrefix(link, []byte("mailto:")):
+		attrEscape(out, link[len("mailto:"):])
+	default:
+		entityEscapeWithSkip(out, link, skipRanges)
+	}
+
+	out.WriteString("</a>")
+}
+
+func (options *Html) CodeSpan(out *bytes.Buffer, text []byte) {
+	out.WriteString("<code>")
+	attrEscape(out, text)
+	out.WriteString("</code>")
+}
+
+func (options *Html) DoubleEmphasis(out *bytes.Buffer, text []byte) {
+	out.WriteString("<strong>")
+	out.Write(text)
+	out.WriteString("</strong>")
+}
+
+func (options *Html) Emphasis(out *bytes.Buffer, text []byte) {
+	if len(text) == 0 {
+		return
+	}
+	out.WriteString("<em>")
+	out.Write(text)
+	out.WriteString("</em>")
+}
+
+func (options *Html) maybeWriteAbsolutePrefix(out *bytes.Buffer, link []byte) {
+	if options.parameters.AbsolutePrefix != "" && isRelativeLink(link) && link[0] != '.' {
+		out.WriteString(options.parameters.AbsolutePrefix)
+		if link[0] != '/' {
+			out.WriteByte('/')
+		}
+	}
+}
+
+func (options *Html) Image(out *bytes.Buffer, link []byte, title []byte, alt []byte) {
+	if options.flags&HTML_SKIP_IMAGES != 0 {
+		return
+	}
+
+	out.WriteString("<img src=\"")
+	options.maybeWriteAbsolutePrefix(out, link)
+	attrEscape(out, link)
+	out.WriteString("\" alt=\"")
+	if len(alt) > 0 {
+		attrEscape(out, alt)
+	}
+	if len(title) > 0 {
+		out.WriteString("\" title=\"")
+		attrEscape(out, title)
+	}
+
+	out.WriteByte('"')
+	out.WriteString(options.closeTag)
+}
+
+func (options *Html) LineBreak(out *bytes.Buffer) {
+	out.WriteString("<br")
+	out.WriteString(options.closeTag)
+	out.WriteByte('\n')
+}
+
+func (options *Html) Link(out *bytes.Buffer, link []byte, title []byte, content []byte) {
+	if options.flags&HTML_SKIP_LINKS != 0 {
+		// write the link text out but don't link it, just mark it with typewriter font
+		out.WriteString("<tt>")
+		attrEscape(out, content)
+		out.WriteString("</tt>")
+		return
+	}
+
+	if options.flags&HTML_SAFELINK != 0 && !isSafeLink(link) {
+		// write the link text out but don't link it, just mark it with typewriter font
+		out.WriteString("<tt>")
+		attrEscape(out, content)
+		out.WriteString("</tt>")
+		return
+	}
+
+	out.WriteString("<a href=\"")
+	options.maybeWriteAbsolutePrefix(out, link)
+	attrEscape(out, link)
+	if len(title) > 0 {
+		out.WriteString("\" title=\"")
+		attrEscape(out, title)
+	}
+	var relAttrs []string
+	if options.flags&HTML_NOFOLLOW_LINKS != 0 && !isRelativeLink(link) {
+		relAttrs = append(relAttrs, "nofollow")
+	}
+	if options.flags&HTML_NOREFERRER_LINKS != 0 && !isRelativeLink(link) {
+		relAttrs = append(relAttrs, "noreferrer")
+	}
+	if len(relAttrs) > 0 {
+		out.WriteString(fmt.Sprintf("\" rel=\"%s", strings.Join(relAttrs, " ")))
+	}
+
+	// blank target only add to external link
+	if options.flags&HTML_HREF_TARGET_BLANK != 0 && !isRelativeLink(link) {
+		out.WriteString("\" target=\"_blank")
+	}
+
+	out.WriteString("\">")
+	out.Write(content)
+	out.WriteString("</a>")
+	return
+}
+
+func (options *Html) RawHtmlTag(out *bytes.Buffer, text []byte) {
+	if options.flags&HTML_SKIP_HTML != 0 {
+		return
+	}
+	if options.flags&HTML_SKIP_STYLE != 0 && isHtmlTag(text, "style") {
+		return
+	}
+	if options.flags&HTML_SKIP_LINKS != 0 && isHtmlTag(text, "a") {
+		return
+	}
+	if options.flags&HTML_SKIP_IMAGES != 0 && isHtmlTag(text, "img") {
+		return
+	}
+	out.Write(text)
+}
+
+func (options *Html) TripleEmphasis(out *bytes.Buffer, text []byte) {
+	out.WriteString("<strong><em>")
+	out.Write(text)
+	out.WriteString("</em></strong>")
+}
+
+func (options *Html) StrikeThrough(out *bytes.Buffer, text []byte) {
+	out.WriteString("<del>")
+	out.Write(text)
+	out.WriteString("</del>")
+}
+
+func (options *Html) FootnoteRef(out *bytes.Buffer, ref []byte, id int) {
+	slug := slugify(ref)
+	out.WriteString(`<sup class="footnote-ref" id="`)
+	out.WriteString(`fnref:`)
+	out.WriteString(options.parameters.FootnoteAnchorPrefix)
+	out.Write(slug)
+	out.WriteString(`"><a rel="footnote" href="#`)
+	out.WriteString(`fn:`)
+	out.WriteString(options.parameters.FootnoteAnchorPrefix)
+	out.Write(slug)
+	out.WriteString(`">`)
+	out.WriteString(strconv.Itoa(id))
+	out.WriteString(`</a></sup>`)
+}
+
+func (options *Html) Entity(out *bytes.Buffer, entity []byte) {
+	out.Write(entity)
+}
+
+func (options *Html) NormalText(out *bytes.Buffer, text []byte) {
+	if options.flags&HTML_USE_SMARTYPANTS != 0 {
+		options.Smartypants(out, text)
+	} else {
+		attrEscape(out, text)
+	}
+}
+
+func (options *Html) Smartypants(out *bytes.Buffer, text []byte) {
+	smrt := smartypantsData{false, false}
+
+	// first do normal entity escaping
+	var escaped bytes.Buffer
+	attrEscape(&escaped, text)
+	text = escaped.Bytes()
+
+	mark := 0
+	for i := 0; i < len(text); i++ {
+		if action := options.smartypants[text[i]]; action != nil {
+			if i > mark {
+				out.Write(text[mark:i])
+			}
+
+			previousChar := byte(0)
+			if i > 0 {
+				previousChar = text[i-1]
+			}
+			i += action(out, &smrt, previousChar, text[i:])
+			mark = i + 1
+		}
+	}
+
+	if mark < len(text) {
+		out.Write(text[mark:])
+	}
+}
+
+func (options *Html) DocumentHeader(out *bytes.Buffer) {
+	if options.flags&HTML_COMPLETE_PAGE == 0 {
+		return
+	}
+
+	ending := ""
+	if options.flags&HTML_USE_XHTML != 0 {
+		out.WriteString("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" ")
+		out.WriteString("\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n")
+		out.WriteString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n")
+		ending = " /"
+	} else {
+		out.WriteString("<!DOCTYPE html>\n")
+		out.WriteString("<html>\n")
+	}
+	out.WriteString("<head>\n")
+	out.WriteString("  <title>")
+	options.NormalText(out, []byte(options.title))
+	out.WriteString("</title>\n")
+	out.WriteString("  <meta name=\"GENERATOR\" content=\"Blackfriday Markdown Processor v")
+	out.WriteString(VERSION)
+	out.WriteString("\"")
+	out.WriteString(ending)
+	out.WriteString(">\n")
+	out.WriteString("  <meta charset=\"utf-8\"")
+	out.WriteString(ending)
+	out.WriteString(">\n")
+	if options.css != "" {
+		out.WriteString("  <link rel=\"stylesheet\" type=\"text/css\" href=\"")
+		attrEscape(out, []byte(options.css))
+		out.WriteString("\"")
+		out.WriteString(ending)
+		out.WriteString(">\n")
+	}
+	out.WriteString("</head>\n")
+	out.WriteString("<body>\n")
+
+	options.tocMarker = out.Len()
+}
+
+func (options *Html) DocumentFooter(out *bytes.Buffer) {
+	// finalize and insert the table of contents
+	if options.flags&HTML_TOC != 0 {
+		options.TocFinalize()
+
+		// now we have to insert the table of contents into the document
+		var temp bytes.Buffer
+
+		// start by making a copy of everything after the document header
+		temp.Write(out.Bytes()[options.tocMarker:])
+
+		// now clear the copied material from the main output buffer
+		out.Truncate(options.tocMarker)
+
+		// corner case spacing issue
+		if options.flags&HTML_COMPLETE_PAGE != 0 {
+			out.WriteByte('\n')
+		}
+
+		// insert the table of contents
+		out.WriteString("<nav>\n")
+		out.Write(options.toc.Bytes())
+		out.WriteString("</nav>\n")
+
+		// corner case spacing issue
+		if options.flags&HTML_COMPLETE_PAGE == 0 && options.flags&HTML_OMIT_CONTENTS == 0 {
+			out.WriteByte('\n')
+		}
+
+		// write out everything that came after it
+		if options.flags&HTML_OMIT_CONTENTS == 0 {
+			out.Write(temp.Bytes())
+		}
+	}
+
+	if options.flags&HTML_COMPLETE_PAGE != 0 {
+		out.WriteString("\n</body>\n")
+		out.WriteString("</html>\n")
+	}
+
+}
+
+func (options *Html) TocHeaderWithAnchor(text []byte, level int, anchor string) {
+	for level > options.currentLevel {
+		switch {
+		case bytes.HasSuffix(options.toc.Bytes(), []byte("</li>\n")):
+			// this sublist can nest underneath a header
+			size := options.toc.Len()
+			options.toc.Truncate(size - len("</li>\n"))
+
+		case options.currentLevel > 0:
+			options.toc.WriteString("<li>")
+		}
+		if options.toc.Len() > 0 {
+			options.toc.WriteByte('\n')
+		}
+		options.toc.WriteString("<ul>\n")
+		options.currentLevel++
+	}
+
+	for level < options.currentLevel {
+		options.toc.WriteString("</ul>")
+		if options.currentLevel > 1 {
+			options.toc.WriteString("</li>\n")
+		}
+		options.currentLevel--
+	}
+
+	options.toc.WriteString("<li><a href=\"#")
+	if anchor != "" {
+		options.toc.WriteString(anchor)
+	} else {
+		options.toc.WriteString("toc_")
+		options.toc.WriteString(strconv.Itoa(options.headerCount))
+	}
+	options.toc.WriteString("\">")
+	options.headerCount++
+
+	options.toc.Write(text)
+
+	options.toc.WriteString("</a></li>\n")
+}
+
+func (options *Html) TocHeader(text []byte, level int) {
+	options.TocHeaderWithAnchor(text, level, "")
+}
+
+func (options *Html) TocFinalize() {
+	for options.currentLevel > 1 {
+		options.toc.WriteString("</ul></li>\n")
+		options.currentLevel--
+	}
+
+	if options.currentLevel > 0 {
+		options.toc.WriteString("</ul>\n")
+	}
+}
+
+func isHtmlTag(tag []byte, tagname string) bool {
+	found, _ := findHtmlTagPos(tag, tagname)
+	return found
+}
+
+// Look for a character, but ignore it when it's in any kind of quotes, it
+// might be JavaScript
+func skipUntilCharIgnoreQuotes(html []byte, start int, char byte) int {
+	inSingleQuote := false
+	inDoubleQuote := false
+	inGraveQuote := false
+	i := start
+	for i < len(html) {
+		switch {
+		case html[i] == char && !inSingleQuote && !inDoubleQuote && !inGraveQuote:
+			return i
+		case html[i] == '\'':
+			inSingleQuote = !inSingleQuote
+		case html[i] == '"':
+			inDoubleQuote = !inDoubleQuote
+		case html[i] == '`':
+			inGraveQuote = !inGraveQuote
+		}
+		i++
+	}
+	return start
+}
+
+func findHtmlTagPos(tag []byte, tagname string) (bool, int) {
+	i := 0
+	if i < len(tag) && tag[0] != '<' {
+		return false, -1
+	}
+	i++
+	i = skipSpace(tag, i)
+
+	if i < len(tag) && tag[i] == '/' {
+		i++
+	}
+
+	i = skipSpace(tag, i)
+	j := 0
+	for ; i < len(tag); i, j = i+1, j+1 {
+		if j >= len(tagname) {
+			break
+		}
+
+		if strings.ToLower(string(tag[i]))[0] != tagname[j] {
+			return false, -1
+		}
+	}
+
+	if i == len(tag) {
+		return false, -1
+	}
+
+	rightAngle := skipUntilCharIgnoreQuotes(tag, i, '>')
+	if rightAngle > i {
+		return true, rightAngle
+	}
+
+	return false, -1
+}
+
+func skipUntilChar(text []byte, start int, char byte) int {
+	i := start
+	for i < len(text) && text[i] != char {
+		i++
+	}
+	return i
+}
+
+func skipSpace(tag []byte, i int) int {
+	for i < len(tag) && isspace(tag[i]) {
+		i++
+	}
+	return i
+}
+
+func skipChar(data []byte, start int, char byte) int {
+	i := start
+	for i < len(data) && data[i] == char {
+		i++
+	}
+	return i
+}
+
+func doubleSpace(out *bytes.Buffer) {
+	if out.Len() > 0 {
+		out.WriteByte('\n')
+	}
+}
+
+func isRelativeLink(link []byte) (yes bool) {
+	// a tag begin with '#'
+	if link[0] == '#' {
+		return true
+	}
+
+	// link begin with '/' but not '//', the second maybe a protocol relative link
+	if len(link) >= 2 && link[0] == '/' && link[1] != '/' {
+		return true
+	}
+
+	// only the root '/'
+	if len(link) == 1 && link[0] == '/' {
+		return true
+	}
+
+	// current directory : begin with "./"
+	if bytes.HasPrefix(link, []byte("./")) {
+		return true
+	}
+
+	// parent directory : begin with "../"
+	if bytes.HasPrefix(link, []byte("../")) {
+		return true
+	}
+
+	return false
+}
+
+func (options *Html) ensureUniqueHeaderID(id string) string {
+	for count, found := options.headerIDs[id]; found; count, found = options.headerIDs[id] {
+		tmp := fmt.Sprintf("%s-%d", id, count+1)
+
+		if _, tmpFound := options.headerIDs[tmp]; !tmpFound {
+			options.headerIDs[id] = count + 1
+			id = tmp
+		} else {
+			id = id + "-1"
+		}
+	}
+
+	if _, found := options.headerIDs[id]; !found {
+		options.headerIDs[id] = 0
+	}
+
+	return id
+}
diff --git a/vendor/github.com/russross/blackfriday/inline.go b/vendor/github.com/russross/blackfriday/inline.go
new file mode 100644
index 0000000000..a28bb660d4
--- /dev/null
+++ b/vendor/github.com/russross/blackfriday/inline.go
@@ -0,0 +1,1133 @@
+//
+// Blackfriday Markdown Processor
+// Available at http://github.com/russross/blackfriday
+//
+// Copyright © 2011 Russ Ross <russ@russross.com>.
+// Distributed under the Simplified BSD License.
+// See README.md for details.
+//
+
+//
+// Functions to parse inline elements.
+//
+
+package blackfriday
+
+import (
+	"bytes"
+	"regexp"
+	"strconv"
+)
+
+var (
+	urlRe    = `((https?|ftp):\/\/|\/)[-A-Za-z0-9+&@#\/%?=~_|!:,.;\(\)]+`
+	anchorRe = regexp.MustCompile(`^(<a\shref="` + urlRe + `"(\stitle="[^"<>]+")?\s?>` + urlRe + `<\/a>)`)
+)
+
+// Functions to parse text within a block
+// Each function returns the number of chars taken care of
+// data is the complete block being rendered
+// offset is the number of valid chars before the current cursor
+
+func (p *parser) inline(out *bytes.Buffer, data []byte) {
+	// this is called recursively: enforce a maximum depth
+	if p.nesting >= p.maxNesting {
+		return
+	}
+	p.nesting++
+
+	i, end := 0, 0
+	for i < len(data) {
+		// copy inactive chars into the output
+		for end < len(data) && p.inlineCallback[data[end]] == nil {
+			end++
+		}
+
+		p.r.NormalText(out, data[i:end])
+
+		if end >= len(data) {
+			break
+		}
+		i = end
+
+		// call the trigger
+		handler := p.inlineCallback[data[end]]
+		if consumed := handler(p, out, data, i); consumed == 0 {
+			// no action from the callback; buffer the byte for later
+			end = i + 1
+		} else {
+			// skip past whatever the callback used
+			i += consumed
+			end = i
+		}
+	}
+
+	p.nesting--
+}
+
+// single and double emphasis parsing
+func emphasis(p *parser, out *bytes.Buffer, data []byte, offset int) int {
+	data = data[offset:]
+	c := data[0]
+	ret := 0
+
+	if len(data) > 2 && data[1] != c {
+		// whitespace cannot follow an opening emphasis;
+		// strikethrough only takes two characters '~~'
+		if c == '~' || isspace(data[1]) {
+			return 0
+		}
+		if ret = helperEmphasis(p, out, data[1:], c); ret == 0 {
+			return 0
+		}
+
+		return ret + 1
+	}
+
+	if len(data) > 3 && data[1] == c && data[2] != c {
+		if isspace(data[2]) {
+			return 0
+		}
+		if ret = helperDoubleEmphasis(p, out, data[2:], c); ret == 0 {
+			return 0
+		}
+
+		return ret + 2
+	}
+
+	if len(data) > 4 && data[1] == c && data[2] == c && data[3] != c {
+		if c == '~' || isspace(data[3]) {
+			return 0
+		}
+		if ret = helperTripleEmphasis(p, out, data, 3, c); ret == 0 {
+			return 0
+		}
+
+		return ret + 3
+	}
+
+	return 0
+}
+
+func codeSpan(p *parser, out *bytes.Buffer, data []byte, offset int) int {
+	data = data[offset:]
+
+	nb := 0
+
+	// count the number of backticks in the delimiter
+	for nb < len(data) && data[nb] == '`' {
+		nb++
+	}
+
+	// find the next delimiter
+	i, end := 0, 0
+	for end = nb; end < len(data) && i < nb; end++ {
+		if data[end] == '`' {
+			i++
+		} else {
+			i = 0
+		}
+	}
+
+	// no matching delimiter?
+	if i < nb && end >= len(data) {
+		return 0
+	}
+
+	// trim outside whitespace
+	fBegin := nb
+	for fBegin < end && data[fBegin] == ' ' {
+		fBegin++
+	}
+
+	fEnd := end - nb
+	for fEnd > fBegin && data[fEnd-1] == ' ' {
+		fEnd--
+	}
+
+	// render the code span
+	if fBegin != fEnd {
+		p.r.CodeSpan(out, data[fBegin:fEnd])
+	}
+
+	return end
+
+}
+
+// newline preceded by two spaces becomes <br>
+// newline without two spaces works when EXTENSION_HARD_LINE_BREAK is enabled
+func lineBreak(p *parser, out *bytes.Buffer, data []byte, offset int) int {
+	// remove trailing spaces from out
+	outBytes := out.Bytes()
+	end := len(outBytes)
+	eol := end
+	for eol > 0 && outBytes[eol-1] == ' ' {
+		eol--
+	}
+	out.Truncate(eol)
+
+	precededByTwoSpaces := offset >= 2 && data[offset-2] == ' ' && data[offset-1] == ' '
+	precededByBackslash := offset >= 1 && data[offset-1] == '\\' // see http://spec.commonmark.org/0.18/#example-527
+	precededByBackslash = precededByBackslash && p.flags&EXTENSION_BACKSLASH_LINE_BREAK != 0
+
+	// should there be a hard line break here?
+	if p.flags&EXTENSION_HARD_LINE_BREAK == 0 && !precededByTwoSpaces && !precededByBackslash {
+		return 0
+	}
+
+	if precededByBackslash && eol > 0 {
+		out.Truncate(eol - 1)
+	}
+	p.r.LineBreak(out)
+	return 1
+}
+
+type linkType int
+
+const (
+	linkNormal linkType = iota
+	linkImg
+	linkDeferredFootnote
+	linkInlineFootnote
+)
+
+func isReferenceStyleLink(data []byte, pos int, t linkType) bool {
+	if t == linkDeferredFootnote {
+		return false
+	}
+	return pos < len(data)-1 && data[pos] == '[' && data[pos+1] != '^'
+}
+
+// '[': parse a link or an image or a footnote
+func link(p *parser, out *bytes.Buffer, data []byte, offset int) int {
+	// no links allowed inside regular links, footnote, and deferred footnotes
+	if p.insideLink && (offset > 0 && data[offset-1] == '[' || len(data)-1 > offset && data[offset+1] == '^') {
+		return 0
+	}
+
+	var t linkType
+	switch {
+	// special case: ![^text] == deferred footnote (that follows something with
+	// an exclamation point)
+	case p.flags&EXTENSION_FOOTNOTES != 0 && len(data)-1 > offset && data[offset+1] == '^':
+		t = linkDeferredFootnote
+	// ![alt] == image
+	case offset > 0 && data[offset-1] == '!':
+		t = linkImg
+	// ^[text] == inline footnote
+	// [^refId] == deferred footnote
+	case p.flags&EXTENSION_FOOTNOTES != 0:
+		if offset > 0 && data[offset-1] == '^' {
+			t = linkInlineFootnote
+		} else if len(data)-1 > offset && data[offset+1] == '^' {
+			t = linkDeferredFootnote
+		}
+	// [text] == regular link
+	default:
+		t = linkNormal
+	}
+
+	data = data[offset:]
+
+	var (
+		i                       = 1
+		noteId                  int
+		title, link, altContent []byte
+		textHasNl               = false
+	)
+
+	if t == linkDeferredFootnote {
+		i++
+	}
+
+	// look for the matching closing bracket
+	for level := 1; level > 0 && i < len(data); i++ {
+		switch {
+		case data[i] == '\n':
+			textHasNl = true
+
+		case data[i-1] == '\\':
+			continue
+
+		case data[i] == '[':
+			level++
+
+		case data[i] == ']':
+			level--
+			if level <= 0 {
+				i-- // compensate for extra i++ in for loop
+			}
+		}
+	}
+
+	if i >= len(data) {
+		return 0
+	}
+
+	txtE := i
+	i++
+
+	// skip any amount of whitespace or newline
+	// (this is much more lax than original markdown syntax)
+	for i < len(data) && isspace(data[i]) {
+		i++
+	}
+
+	// inline style link
+	switch {
+	case i < len(data) && data[i] == '(':
+		// skip initial whitespace
+		i++
+
+		for i < len(data) && isspace(data[i]) {
+			i++
+		}
+
+		linkB := i
+
+		// look for link end: ' " )
+	findlinkend:
+		for i < len(data) {
+			switch {
+			case data[i] == '\\':
+				i += 2
+
+			case data[i] == ')' || data[i] == '\'' || data[i] == '"':
+				break findlinkend
+
+			default:
+				i++
+			}
+		}
+
+		if i >= len(data) {
+			return 0
+		}
+		linkE := i
+
+		// look for title end if present
+		titleB, titleE := 0, 0
+		if data[i] == '\'' || data[i] == '"' {
+			i++
+			titleB = i
+
+		findtitleend:
+			for i < len(data) {
+				switch {
+				case data[i] == '\\':
+					i += 2
+
+				case data[i] == ')':
+					break findtitleend
+
+				default:
+					i++
+				}
+			}
+
+			if i >= len(data) {
+				return 0
+			}
+
+			// skip whitespace after title
+			titleE = i - 1
+			for titleE > titleB && isspace(data[titleE]) {
+				titleE--
+			}
+
+			// check for closing quote presence
+			if data[titleE] != '\'' && data[titleE] != '"' {
+				titleB, titleE = 0, 0
+				linkE = i
+			}
+		}
+
+		// remove whitespace at the end of the link
+		for linkE > linkB && isspace(data[linkE-1]) {
+			linkE--
+		}
+
+		// remove optional angle brackets around the link
+		if data[linkB] == '<' {
+			linkB++
+		}
+		if data[linkE-1] == '>' {
+			linkE--
+		}
+
+		// build escaped link and title
+		if linkE > linkB {
+			link = data[linkB:linkE]
+		}
+
+		if titleE > titleB {
+			title = data[titleB:titleE]
+		}
+
+		i++
+
+	// reference style link
+	case isReferenceStyleLink(data, i, t):
+		var id []byte
+		altContentConsidered := false
+
+		// look for the id
+		i++
+		linkB := i
+		for i < len(data) && data[i] != ']' {
+			i++
+		}
+		if i >= len(data) {
+			return 0
+		}
+		linkE := i
+
+		// find the reference
+		if linkB == linkE {
+			if textHasNl {
+				var b bytes.Buffer
+
+				for j := 1; j < txtE; j++ {
+					switch {
+					case data[j] != '\n':
+						b.WriteByte(data[j])
+					case data[j-1] != ' ':
+						b.WriteByte(' ')
+					}
+				}
+
+				id = b.Bytes()
+			} else {
+				id = data[1:txtE]
+				altContentConsidered = true
+			}
+		} else {
+			id = data[linkB:linkE]
+		}
+
+		// find the reference with matching id
+		lr, ok := p.getRef(string(id))
+		if !ok {
+			return 0
+		}
+
+		// keep link and title from reference
+		link = lr.link
+		title = lr.title
+		if altContentConsidered {
+			altContent = lr.text
+		}
+		i++
+
+	// shortcut reference style link or reference or inline footnote
+	default:
+		var id []byte
+
+		// craft the id
+		if textHasNl {
+			var b bytes.Buffer
+
+			for j := 1; j < txtE; j++ {
+				switch {
+				case data[j] != '\n':
+					b.WriteByte(data[j])
+				case data[j-1] != ' ':
+					b.WriteByte(' ')
+				}
+			}
+
+			id = b.Bytes()
+		} else {
+			if t == linkDeferredFootnote {
+				id = data[2:txtE] // get rid of the ^
+			} else {
+				id = data[1:txtE]
+			}
+		}
+
+		if t == linkInlineFootnote {
+			// create a new reference
+			noteId = len(p.notes) + 1
+
+			var fragment []byte
+			if len(id) > 0 {
+				if len(id) < 16 {
+					fragment = make([]byte, len(id))
+				} else {
+					fragment = make([]byte, 16)
+				}
+				copy(fragment, slugify(id))
+			} else {
+				fragment = append([]byte("footnote-"), []byte(strconv.Itoa(noteId))...)
+			}
+
+			ref := &reference{
+				noteId:   noteId,
+				hasBlock: false,
+				link:     fragment,
+				title:    id,
+			}
+
+			p.notes = append(p.notes, ref)
+
+			link = ref.link
+			title = ref.title
+		} else {
+			// find the reference with matching id
+			lr, ok := p.getRef(string(id))
+			if !ok {
+				return 0
+			}
+
+			if t == linkDeferredFootnote {
+				lr.noteId = len(p.notes) + 1
+				p.notes = append(p.notes, lr)
+			}
+
+			// keep link and title from reference
+			link = lr.link
+			// if inline footnote, title == footnote contents
+			title = lr.title
+			noteId = lr.noteId
+		}
+
+		// rewind the whitespace
+		i = txtE + 1
+	}
+
+	// build content: img alt is escaped, link content is parsed
+	var content bytes.Buffer
+	if txtE > 1 {
+		if t == linkImg {
+			content.Write(data[1:txtE])
+		} else {
+			// links cannot contain other links, so turn off link parsing temporarily
+			insideLink := p.insideLink
+			p.insideLink = true
+			p.inline(&content, data[1:txtE])
+			p.insideLink = insideLink
+		}
+	}
+
+	var uLink []byte
+	if t == linkNormal || t == linkImg {
+		if len(link) > 0 {
+			var uLinkBuf bytes.Buffer
+			unescapeText(&uLinkBuf, link)
+			uLink = uLinkBuf.Bytes()
+		}
+
+		// links need something to click on and somewhere to go
+		if len(uLink) == 0 || (t == linkNormal && content.Len() == 0) {
+			return 0
+		}
+	}
+
+	// call the relevant rendering function
+	switch t {
+	case linkNormal:
+		if len(altContent) > 0 {
+			p.r.Link(out, uLink, title, altContent)
+		} else {
+			p.r.Link(out, uLink, title, content.Bytes())
+		}
+
+	case linkImg:
+		outSize := out.Len()
+		outBytes := out.Bytes()
+		if outSize > 0 && outBytes[outSize-1] == '!' {
+			out.Truncate(outSize - 1)
+		}
+
+		p.r.Image(out, uLink, title, content.Bytes())
+
+	case linkInlineFootnote:
+		outSize := out.Len()
+		outBytes := out.Bytes()
+		if outSize > 0 && outBytes[outSize-1] == '^' {
+			out.Truncate(outSize - 1)
+		}
+
+		p.r.FootnoteRef(out, link, noteId)
+
+	case linkDeferredFootnote:
+		p.r.FootnoteRef(out, link, noteId)
+
+	default:
+		return 0
+	}
+
+	return i
+}
+
+func (p *parser) inlineHtmlComment(out *bytes.Buffer, data []byte) int {
+	if len(data) < 5 {
+		return 0
+	}
+	if data[0] != '<' || data[1] != '!' || data[2] != '-' || data[3] != '-' {
+		return 0
+	}
+	i := 5
+	// scan for an end-of-comment marker, across lines if necessary
+	for i < len(data) && !(data[i-2] == '-' && data[i-1] == '-' && data[i] == '>') {
+		i++
+	}
+	// no end-of-comment marker
+	if i >= len(data) {
+		return 0
+	}
+	return i + 1
+}
+
+// '<' when tags or autolinks are allowed
+func leftAngle(p *parser, out *bytes.Buffer, data []byte, offset int) int {
+	data = data[offset:]
+	altype := LINK_TYPE_NOT_AUTOLINK
+	end := tagLength(data, &altype)
+	if size := p.inlineHtmlComment(out, data); size > 0 {
+		end = size
+	}
+	if end > 2 {
+		if altype != LINK_TYPE_NOT_AUTOLINK {
+			var uLink bytes.Buffer
+			unescapeText(&uLink, data[1:end+1-2])
+			if uLink.Len() > 0 {
+				p.r.AutoLink(out, uLink.Bytes(), altype)
+			}
+		} else {
+			p.r.RawHtmlTag(out, data[:end])
+		}
+	}
+
+	return end
+}
+
+// '\\' backslash escape
+var escapeChars = []byte("\\`*_{}[]()#+-.!:|&<>~")
+
+func escape(p *parser, out *bytes.Buffer, data []byte, offset int) int {
+	data = data[offset:]
+
+	if len(data) > 1 {
+		if bytes.IndexByte(escapeChars, data[1]) < 0 {
+			return 0
+		}
+
+		p.r.NormalText(out, data[1:2])
+	}
+
+	return 2
+}
+
+func unescapeText(ob *bytes.Buffer, src []byte) {
+	i := 0
+	for i < len(src) {
+		org := i
+		for i < len(src) && src[i] != '\\' {
+			i++
+		}
+
+		if i > org {
+			ob.Write(src[org:i])
+		}
+
+		if i+1 >= len(src) {
+			break
+		}
+
+		ob.WriteByte(src[i+1])
+		i += 2
+	}
+}
+
+// '&' escaped when it doesn't belong to an entity
+// valid entities are assumed to be anything matching &#?[A-Za-z0-9]+;
+func entity(p *parser, out *bytes.Buffer, data []byte, offset int) int {
+	data = data[offset:]
+
+	end := 1
+
+	if end < len(data) && data[end] == '#' {
+		end++
+	}
+
+	for end < len(data) && isalnum(data[end]) {
+		end++
+	}
+
+	if end < len(data) && data[end] == ';' {
+		end++ // real entity
+	} else {
+		return 0 // lone '&'
+	}
+
+	p.r.Entity(out, data[:end])
+
+	return end
+}
+
+func linkEndsWithEntity(data []byte, linkEnd int) bool {
+	entityRanges := htmlEntity.FindAllIndex(data[:linkEnd], -1)
+	return entityRanges != nil && entityRanges[len(entityRanges)-1][1] == linkEnd
+}
+
+func autoLink(p *parser, out *bytes.Buffer, data []byte, offset int) int {
+	// quick check to rule out most false hits on ':'
+	if p.insideLink || len(data) < offset+3 || data[offset+1] != '/' || data[offset+2] != '/' {
+		return 0
+	}
+
+	// Now a more expensive check to see if we're not inside an anchor element
+	anchorStart := offset
+	offsetFromAnchor := 0
+	for anchorStart > 0 && data[anchorStart] != '<' {
+		anchorStart--
+		offsetFromAnchor++
+	}
+
+	anchorStr := anchorRe.Find(data[anchorStart:])
+	if anchorStr != nil {
+		out.Write(anchorStr[offsetFromAnchor:])
+		return len(anchorStr) - offsetFromAnchor
+	}
+
+	// scan backward for a word boundary
+	rewind := 0
+	for offset-rewind > 0 && rewind <= 7 && isletter(data[offset-rewind-1]) {
+		rewind++
+	}
+	if rewind > 6 { // longest supported protocol is "mailto" which has 6 letters
+		return 0
+	}
+
+	origData := data
+	data = data[offset-rewind:]
+
+	if !isSafeLink(data) {
+		return 0
+	}
+
+	linkEnd := 0
+	for linkEnd < len(data) && !isEndOfLink(data[linkEnd]) {
+		linkEnd++
+	}
+
+	// Skip punctuation at the end of the link
+	if (data[linkEnd-1] == '.' || data[linkEnd-1] == ',') && data[linkEnd-2] != '\\' {
+		linkEnd--
+	}
+
+	// But don't skip semicolon if it's a part of escaped entity:
+	if data[linkEnd-1] == ';' && data[linkEnd-2] != '\\' && !linkEndsWithEntity(data, linkEnd) {
+		linkEnd--
+	}
+
+	// See if the link finishes with a punctuation sign that can be closed.
+	var copen byte
+	switch data[linkEnd-1] {
+	case '"':
+		copen = '"'
+	case '\'':
+		copen = '\''
+	case ')':
+		copen = '('
+	case ']':
+		copen = '['
+	case '}':
+		copen = '{'
+	default:
+		copen = 0
+	}
+
+	if copen != 0 {
+		bufEnd := offset - rewind + linkEnd - 2
+
+		openDelim := 1
+
+		/* Try to close the final punctuation sign in this same line;
+		 * if we managed to close it outside of the URL, that means that it's
+		 * not part of the URL. If it closes inside the URL, that means it
+		 * is part of the URL.
+		 *
+		 * Examples:
+		 *
+		 *      foo http://www.pokemon.com/Pikachu_(Electric) bar
+		 *              => http://www.pokemon.com/Pikachu_(Electric)
+		 *
+		 *      foo (http://www.pokemon.com/Pikachu_(Electric)) bar
+		 *              => http://www.pokemon.com/Pikachu_(Electric)
+		 *
+		 *      foo http://www.pokemon.com/Pikachu_(Electric)) bar
+		 *              => http://www.pokemon.com/Pikachu_(Electric))
+		 *
+		 *      (foo http://www.pokemon.com/Pikachu_(Electric)) bar
+		 *              => foo http://www.pokemon.com/Pikachu_(Electric)
+		 */
+
+		for bufEnd >= 0 && origData[bufEnd] != '\n' && openDelim != 0 {
+			if origData[bufEnd] == data[linkEnd-1] {
+				openDelim++
+			}
+
+			if origData[bufEnd] == copen {
+				openDelim--
+			}
+
+			bufEnd--
+		}
+
+		if openDelim == 0 {
+			linkEnd--
+		}
+	}
+
+	// we were triggered on the ':', so we need to rewind the output a bit
+	if out.Len() >= rewind {
+		out.Truncate(len(out.Bytes()) - rewind)
+	}
+
+	var uLink bytes.Buffer
+	unescapeText(&uLink, data[:linkEnd])
+
+	if uLink.Len() > 0 {
+		p.r.AutoLink(out, uLink.Bytes(), LINK_TYPE_NORMAL)
+	}
+
+	return linkEnd - rewind
+}
+
+func isEndOfLink(char byte) bool {
+	return isspace(char) || char == '<'
+}
+
+var validUris = [][]byte{[]byte("http://"), []byte("https://"), []byte("ftp://"), []byte("mailto://")}
+var validPaths = [][]byte{[]byte("/"), []byte("./"), []byte("../")}
+
+func isSafeLink(link []byte) bool {
+	for _, path := range validPaths {
+		if len(link) >= len(path) && bytes.Equal(link[:len(path)], path) {
+			if len(link) == len(path) {
+				return true
+			} else if isalnum(link[len(path)]) {
+				return true
+			}
+		}
+	}
+
+	for _, prefix := range validUris {
+		// TODO: handle unicode here
+		// case-insensitive prefix test
+		if len(link) > len(prefix) && bytes.Equal(bytes.ToLower(link[:len(prefix)]), prefix) && isalnum(link[len(prefix)]) {
+			return true
+		}
+	}
+
+	return false
+}
+
+// return the length of the given tag, or 0 is it's not valid
+func tagLength(data []byte, autolink *int) int {
+	var i, j int
+
+	// a valid tag can't be shorter than 3 chars
+	if len(data) < 3 {
+		return 0
+	}
+
+	// begins with a '<' optionally followed by '/', followed by letter or number
+	if data[0] != '<' {
+		return 0
+	}
+	if data[1] == '/' {
+		i = 2
+	} else {
+		i = 1
+	}
+
+	if !isalnum(data[i]) {
+		return 0
+	}
+
+	// scheme test
+	*autolink = LINK_TYPE_NOT_AUTOLINK
+
+	// try to find the beginning of an URI
+	for i < len(data) && (isalnum(data[i]) || data[i] == '.' || data[i] == '+' || data[i] == '-') {
+		i++
+	}
+
+	if i > 1 && i < len(data) && data[i] == '@' {
+		if j = isMailtoAutoLink(data[i:]); j != 0 {
+			*autolink = LINK_TYPE_EMAIL
+			return i + j
+		}
+	}
+
+	if i > 2 && i < len(data) && data[i] == ':' {
+		*autolink = LINK_TYPE_NORMAL
+		i++
+	}
+
+	// complete autolink test: no whitespace or ' or "
+	switch {
+	case i >= len(data):
+		*autolink = LINK_TYPE_NOT_AUTOLINK
+	case *autolink != 0:
+		j = i
+
+		for i < len(data) {
+			if data[i] == '\\' {
+				i += 2
+			} else if data[i] == '>' || data[i] == '\'' || data[i] == '"' || isspace(data[i]) {
+				break
+			} else {
+				i++
+			}
+
+		}
+
+		if i >= len(data) {
+			return 0
+		}
+		if i > j && data[i] == '>' {
+			return i + 1
+		}
+
+		// one of the forbidden chars has been found
+		*autolink = LINK_TYPE_NOT_AUTOLINK
+	}
+
+	// look for something looking like a tag end
+	for i < len(data) && data[i] != '>' {
+		i++
+	}
+	if i >= len(data) {
+		return 0
+	}
+	return i + 1
+}
+
+// look for the address part of a mail autolink and '>'
+// this is less strict than the original markdown e-mail address matching
+func isMailtoAutoLink(data []byte) int {
+	nb := 0
+
+	// address is assumed to be: [-@._a-zA-Z0-9]+ with exactly one '@'
+	for i := 0; i < len(data); i++ {
+		if isalnum(data[i]) {
+			continue
+		}
+
+		switch data[i] {
+		case '@':
+			nb++
+
+		case '-', '.', '_':
+			break
+
+		case '>':
+			if nb == 1 {
+				return i + 1
+			} else {
+				return 0
+			}
+		default:
+			return 0
+		}
+	}
+
+	return 0
+}
+
+// look for the next emph char, skipping other constructs
+func helperFindEmphChar(data []byte, c byte) int {
+	i := 0
+
+	for i < len(data) {
+		for i < len(data) && data[i] != c && data[i] != '`' && data[i] != '[' {
+			i++
+		}
+		if i >= len(data) {
+			return 0
+		}
+		// do not count escaped chars
+		if i != 0 && data[i-1] == '\\' {
+			i++
+			continue
+		}
+		if data[i] == c {
+			return i
+		}
+
+		if data[i] == '`' {
+			// skip a code span
+			tmpI := 0
+			i++
+			for i < len(data) && data[i] != '`' {
+				if tmpI == 0 && data[i] == c {
+					tmpI = i
+				}
+				i++
+			}
+			if i >= len(data) {
+				return tmpI
+			}
+			i++
+		} else if data[i] == '[' {
+			// skip a link
+			tmpI := 0
+			i++
+			for i < len(data) && data[i] != ']' {
+				if tmpI == 0 && data[i] == c {
+					tmpI = i
+				}
+				i++
+			}
+			i++
+			for i < len(data) && (data[i] == ' ' || data[i] == '\n') {
+				i++
+			}
+			if i >= len(data) {
+				return tmpI
+			}
+			if data[i] != '[' && data[i] != '(' { // not a link
+				if tmpI > 0 {
+					return tmpI
+				} else {
+					continue
+				}
+			}
+			cc := data[i]
+			i++
+			for i < len(data) && data[i] != cc {
+				if tmpI == 0 && data[i] == c {
+					return i
+				}
+				i++
+			}
+			if i >= len(data) {
+				return tmpI
+			}
+			i++
+		}
+	}
+	return 0
+}
+
+func helperEmphasis(p *parser, out *bytes.Buffer, data []byte, c byte) int {
+	i := 0
+
+	// skip one symbol if coming from emph3
+	if len(data) > 1 && data[0] == c && data[1] == c {
+		i = 1
+	}
+
+	for i < len(data) {
+		length := helperFindEmphChar(data[i:], c)
+		if length == 0 {
+			return 0
+		}
+		i += length
+		if i >= len(data) {
+			return 0
+		}
+
+		if i+1 < len(data) && data[i+1] == c {
+			i++
+			continue
+		}
+
+		if data[i] == c && !isspace(data[i-1]) {
+
+			if p.flags&EXTENSION_NO_INTRA_EMPHASIS != 0 {
+				if !(i+1 == len(data) || isspace(data[i+1]) || ispunct(data[i+1])) {
+					continue
+				}
+			}
+
+			var work bytes.Buffer
+			p.inline(&work, data[:i])
+			p.r.Emphasis(out, work.Bytes())
+			return i + 1
+		}
+	}
+
+	return 0
+}
+
+func helperDoubleEmphasis(p *parser, out *bytes.Buffer, data []byte, c byte) int {
+	i := 0
+
+	for i < len(data) {
+		length := helperFindEmphChar(data[i:], c)
+		if length == 0 {
+			return 0
+		}
+		i += length
+
+		if i+1 < len(data) && data[i] == c && data[i+1] == c && i > 0 && !isspace(data[i-1]) {
+			var work bytes.Buffer
+			p.inline(&work, data[:i])
+
+			if work.Len() > 0 {
+				// pick the right renderer
+				if c == '~' {
+					p.r.StrikeThrough(out, work.Bytes())
+				} else {
+					p.r.DoubleEmphasis(out, work.Bytes())
+				}
+			}
+			return i + 2
+		}
+		i++
+	}
+	return 0
+}
+
+func helperTripleEmphasis(p *parser, out *bytes.Buffer, data []byte, offset int, c byte) int {
+	i := 0
+	origData := data
+	data = data[offset:]
+
+	for i < len(data) {
+		length := helperFindEmphChar(data[i:], c)
+		if length == 0 {
+			return 0
+		}
+		i += length
+
+		// skip whitespace preceded symbols
+		if data[i] != c || isspace(data[i-1]) {
+			continue
+		}
+
+		switch {
+		case i+2 < len(data) && data[i+1] == c && data[i+2] == c:
+			// triple symbol found
+			var work bytes.Buffer
+
+			p.inline(&work, data[:i])
+			if work.Len() > 0 {
+				p.r.TripleEmphasis(out, work.Bytes())
+			}
+			return i + 3
+		case (i+1 < len(data) && data[i+1] == c):
+			// double symbol found, hand over to emph1
+			length = helperEmphasis(p, out, origData[offset-2:], c)
+			if length == 0 {
+				return 0
+			} else {
+				return length - 2
+			}
+		default:
+			// single symbol found, hand over to emph2
+			length = helperDoubleEmphasis(p, out, origData[offset-1:], c)
+			if length == 0 {
+				return 0
+			} else {
+				return length - 1
+			}
+		}
+	}
+	return 0
+}
diff --git a/vendor/github.com/russross/blackfriday/latex.go b/vendor/github.com/russross/blackfriday/latex.go
new file mode 100644
index 0000000000..70705aa9c1
--- /dev/null
+++ b/vendor/github.com/russross/blackfriday/latex.go
@@ -0,0 +1,332 @@
+//
+// Blackfriday Markdown Processor
+// Available at http://github.com/russross/blackfriday
+//
+// Copyright © 2011 Russ Ross <russ@russross.com>.
+// Distributed under the Simplified BSD License.
+// See README.md for details.
+//
+
+//
+//
+// LaTeX rendering backend
+//
+//
+
+package blackfriday
+
+import (
+	"bytes"
+)
+
+// Latex is a type that implements the Renderer interface for LaTeX output.
+//
+// Do not create this directly, instead use the LatexRenderer function.
+type Latex struct {
+}
+
+// LatexRenderer creates and configures a Latex object, which
+// satisfies the Renderer interface.
+//
+// flags is a set of LATEX_* options ORed together (currently no such options
+// are defined).
+func LatexRenderer(flags int) Renderer {
+	return &Latex{}
+}
+
+func (options *Latex) GetFlags() int {
+	return 0
+}
+
+// render code chunks using verbatim, or listings if we have a language
+func (options *Latex) BlockCode(out *bytes.Buffer, text []byte, lang string) {
+	if lang == "" {
+		out.WriteString("\n\\begin{verbatim}\n")
+	} else {
+		out.WriteString("\n\\begin{lstlisting}[language=")
+		out.WriteString(lang)
+		out.WriteString("]\n")
+	}
+	out.Write(text)
+	if lang == "" {
+		out.WriteString("\n\\end{verbatim}\n")
+	} else {
+		out.WriteString("\n\\end{lstlisting}\n")
+	}
+}
+
+func (options *Latex) TitleBlock(out *bytes.Buffer, text []byte) {
+
+}
+
+func (options *Latex) BlockQuote(out *bytes.Buffer, text []byte) {
+	out.WriteString("\n\\begin{quotation}\n")
+	out.Write(text)
+	out.WriteString("\n\\end{quotation}\n")
+}
+
+func (options *Latex) BlockHtml(out *bytes.Buffer, text []byte) {
+	// a pretty lame thing to do...
+	out.WriteString("\n\\begin{verbatim}\n")
+	out.Write(text)
+	out.WriteString("\n\\end{verbatim}\n")
+}
+
+func (options *Latex) Header(out *bytes.Buffer, text func() bool, level int, id string) {
+	marker := out.Len()
+
+	switch level {
+	case 1:
+		out.WriteString("\n\\section{")
+	case 2:
+		out.WriteString("\n\\subsection{")
+	case 3:
+		out.WriteString("\n\\subsubsection{")
+	case 4:
+		out.WriteString("\n\\paragraph{")
+	case 5:
+		out.WriteString("\n\\subparagraph{")
+	case 6:
+		out.WriteString("\n\\textbf{")
+	}
+	if !text() {
+		out.Truncate(marker)
+		return
+	}
+	out.WriteString("}\n")
+}
+
+func (options *Latex) HRule(out *bytes.Buffer) {
+	out.WriteString("\n\\HRule\n")
+}
+
+func (options *Latex) List(out *bytes.Buffer, text func() bool, flags int) {
+	marker := out.Len()
+	if flags&LIST_TYPE_ORDERED != 0 {
+		out.WriteString("\n\\begin{enumerate}\n")
+	} else {
+		out.WriteString("\n\\begin{itemize}\n")
+	}
+	if !text() {
+		out.Truncate(marker)
+		return
+	}
+	if flags&LIST_TYPE_ORDERED != 0 {
+		out.WriteString("\n\\end{enumerate}\n")
+	} else {
+		out.WriteString("\n\\end{itemize}\n")
+	}
+}
+
+func (options *Latex) ListItem(out *bytes.Buffer, text []byte, flags int) {
+	out.WriteString("\n\\item ")
+	out.Write(text)
+}
+
+func (options *Latex) Paragraph(out *bytes.Buffer, text func() bool) {
+	marker := out.Len()
+	out.WriteString("\n")
+	if !text() {
+		out.Truncate(marker)
+		return
+	}
+	out.WriteString("\n")
+}
+
+func (options *Latex) Table(out *bytes.Buffer, header []byte, body []byte, columnData []int) {
+	out.WriteString("\n\\begin{tabular}{")
+	for _, elt := range columnData {
+		switch elt {
+		case TABLE_ALIGNMENT_LEFT:
+			out.WriteByte('l')
+		case TABLE_ALIGNMENT_RIGHT:
+			out.WriteByte('r')
+		default:
+			out.WriteByte('c')
+		}
+	}
+	out.WriteString("}\n")
+	out.Write(header)
+	out.WriteString(" \\\\\n\\hline\n")
+	out.Write(body)
+	out.WriteString("\n\\end{tabular}\n")
+}
+
+func (options *Latex) TableRow(out *bytes.Buffer, text []byte) {
+	if out.Len() > 0 {
+		out.WriteString(" \\\\\n")
+	}
+	out.Write(text)
+}
+
+func (options *Latex) TableHeaderCell(out *bytes.Buffer, text []byte, align int) {
+	if out.Len() > 0 {
+		out.WriteString(" & ")
+	}
+	out.Write(text)
+}
+
+func (options *Latex) TableCell(out *bytes.Buffer, text []byte, align int) {
+	if out.Len() > 0 {
+		out.WriteString(" & ")
+	}
+	out.Write(text)
+}
+
+// TODO: this
+func (options *Latex) Footnotes(out *bytes.Buffer, text func() bool) {
+
+}
+
+func (options *Latex) FootnoteItem(out *bytes.Buffer, name, text []byte, flags int) {
+
+}
+
+func (options *Latex) AutoLink(out *bytes.Buffer, link []byte, kind int) {
+	out.WriteString("\\href{")
+	if kind == LINK_TYPE_EMAIL {
+		out.WriteString("mailto:")
+	}
+	out.Write(link)
+	out.WriteString("}{")
+	out.Write(link)
+	out.WriteString("}")
+}
+
+func (options *Latex) CodeSpan(out *bytes.Buffer, text []byte) {
+	out.WriteString("\\texttt{")
+	escapeSpecialChars(out, text)
+	out.WriteString("}")
+}
+
+func (options *Latex) DoubleEmphasis(out *bytes.Buffer, text []byte) {
+	out.WriteString("\\textbf{")
+	out.Write(text)
+	out.WriteString("}")
+}
+
+func (options *Latex) Emphasis(out *bytes.Buffer, text []byte) {
+	out.WriteString("\\textit{")
+	out.Write(text)
+	out.WriteString("}")
+}
+
+func (options *Latex) Image(out *bytes.Buffer, link []byte, title []byte, alt []byte) {
+	if bytes.HasPrefix(link, []byte("http://")) || bytes.HasPrefix(link, []byte("https://")) {
+		// treat it like a link
+		out.WriteString("\\href{")
+		out.Write(link)
+		out.WriteString("}{")
+		out.Write(alt)
+		out.WriteString("}")
+	} else {
+		out.WriteString("\\includegraphics{")
+		out.Write(link)
+		out.WriteString("}")
+	}
+}
+
+func (options *Latex) LineBreak(out *bytes.Buffer) {
+	out.WriteString(" \\\\\n")
+}
+
+func (options *Latex) Link(out *bytes.Buffer, link []byte, title []byte, content []byte) {
+	out.WriteString("\\href{")
+	out.Write(link)
+	out.WriteString("}{")
+	out.Write(content)
+	out.WriteString("}")
+}
+
+func (options *Latex) RawHtmlTag(out *bytes.Buffer, tag []byte) {
+}
+
+func (options *Latex) TripleEmphasis(out *bytes.Buffer, text []byte) {
+	out.WriteString("\\textbf{\\textit{")
+	out.Write(text)
+	out.WriteString("}}")
+}
+
+func (options *Latex) StrikeThrough(out *bytes.Buffer, text []byte) {
+	out.WriteString("\\sout{")
+	out.Write(text)
+	out.WriteString("}")
+}
+
+// TODO: this
+func (options *Latex) FootnoteRef(out *bytes.Buffer, ref []byte, id int) {
+
+}
+
+func needsBackslash(c byte) bool {
+	for _, r := range []byte("_{}%$&\\~#") {
+		if c == r {
+			return true
+		}
+	}
+	return false
+}
+
+func escapeSpecialChars(out *bytes.Buffer, text []byte) {
+	for i := 0; i < len(text); i++ {
+		// directly copy normal characters
+		org := i
+
+		for i < len(text) && !needsBackslash(text[i]) {
+			i++
+		}
+		if i > org {
+			out.Write(text[org:i])
+		}
+
+		// escape a character
+		if i >= len(text) {
+			break
+		}
+		out.WriteByte('\\')
+		out.WriteByte(text[i])
+	}
+}
+
+func (options *Latex) Entity(out *bytes.Buffer, entity []byte) {
+	// TODO: convert this into a unicode character or something
+	out.Write(entity)
+}
+
+func (options *Latex) NormalText(out *bytes.Buffer, text []byte) {
+	escapeSpecialChars(out, text)
+}
+
+// header and footer
+func (options *Latex) DocumentHeader(out *bytes.Buffer) {
+	out.WriteString("\\documentclass{article}\n")
+	out.WriteString("\n")
+	out.WriteString("\\usepackage{graphicx}\n")
+	out.WriteString("\\usepackage{listings}\n")
+	out.WriteString("\\usepackage[margin=1in]{geometry}\n")
+	out.WriteString("\\usepackage[utf8]{inputenc}\n")
+	out.WriteString("\\usepackage{verbatim}\n")
+	out.WriteString("\\usepackage[normalem]{ulem}\n")
+	out.WriteString("\\usepackage{hyperref}\n")
+	out.WriteString("\n")
+	out.WriteString("\\hypersetup{colorlinks,%\n")
+	out.WriteString("  citecolor=black,%\n")
+	out.WriteString("  filecolor=black,%\n")
+	out.WriteString("  linkcolor=black,%\n")
+	out.WriteString("  urlcolor=black,%\n")
+	out.WriteString("  pdfstartview=FitH,%\n")
+	out.WriteString("  breaklinks=true,%\n")
+	out.WriteString("  pdfauthor={Blackfriday Markdown Processor v")
+	out.WriteString(VERSION)
+	out.WriteString("}}\n")
+	out.WriteString("\n")
+	out.WriteString("\\newcommand{\\HRule}{\\rule{\\linewidth}{0.5mm}}\n")
+	out.WriteString("\\addtolength{\\parskip}{0.5\\baselineskip}\n")
+	out.WriteString("\\parindent=0pt\n")
+	out.WriteString("\n")
+	out.WriteString("\\begin{document}\n")
+}
+
+func (options *Latex) DocumentFooter(out *bytes.Buffer) {
+	out.WriteString("\n\\end{document}\n")
+}
diff --git a/vendor/github.com/russross/blackfriday/markdown.go b/vendor/github.com/russross/blackfriday/markdown.go
new file mode 100644
index 0000000000..746905bf35
--- /dev/null
+++ b/vendor/github.com/russross/blackfriday/markdown.go
@@ -0,0 +1,926 @@
+//
+// Blackfriday Markdown Processor
+// Available at http://github.com/russross/blackfriday
+//
+// Copyright © 2011 Russ Ross <russ@russross.com>.
+// Distributed under the Simplified BSD License.
+// See README.md for details.
+//
+
+//
+//
+// Markdown parsing and processing
+//
+//
+
+// Blackfriday markdown processor.
+//
+// Translates plain text with simple formatting rules into HTML or LaTeX.
+package blackfriday
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+	"unicode/utf8"
+)
+
+const VERSION = "1.4"
+
+// These are the supported markdown parsing extensions.
+// OR these values together to select multiple extensions.
+const (
+	EXTENSION_NO_INTRA_EMPHASIS          = 1 << iota // ignore emphasis markers inside words
+	EXTENSION_TABLES                                 // render tables
+	EXTENSION_FENCED_CODE                            // render fenced code blocks
+	EXTENSION_AUTOLINK                               // detect embedded URLs that are not explicitly marked
+	EXTENSION_STRIKETHROUGH                          // strikethrough text using ~~test~~
+	EXTENSION_LAX_HTML_BLOCKS                        // loosen up HTML block parsing rules
+	EXTENSION_SPACE_HEADERS                          // be strict about prefix header rules
+	EXTENSION_HARD_LINE_BREAK                        // translate newlines into line breaks
+	EXTENSION_TAB_SIZE_EIGHT                         // expand tabs to eight spaces instead of four
+	EXTENSION_FOOTNOTES                              // Pandoc-style footnotes
+	EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK             // No need to insert an empty line to start a (code, quote, ordered list, unordered list) block
+	EXTENSION_HEADER_IDS                             // specify header IDs  with {#id}
+	EXTENSION_TITLEBLOCK                             // Titleblock ala pandoc
+	EXTENSION_AUTO_HEADER_IDS                        // Create the header ID from the text
+	EXTENSION_BACKSLASH_LINE_BREAK                   // translate trailing backslashes into line breaks
+	EXTENSION_DEFINITION_LISTS                       // render definition lists
+
+	commonHtmlFlags = 0 |
+		HTML_USE_XHTML |
+		HTML_USE_SMARTYPANTS |
+		HTML_SMARTYPANTS_FRACTIONS |
+		HTML_SMARTYPANTS_DASHES |
+		HTML_SMARTYPANTS_LATEX_DASHES
+
+	commonExtensions = 0 |
+		EXTENSION_NO_INTRA_EMPHASIS |
+		EXTENSION_TABLES |
+		EXTENSION_FENCED_CODE |
+		EXTENSION_AUTOLINK |
+		EXTENSION_STRIKETHROUGH |
+		EXTENSION_SPACE_HEADERS |
+		EXTENSION_HEADER_IDS |
+		EXTENSION_BACKSLASH_LINE_BREAK |
+		EXTENSION_DEFINITION_LISTS
+)
+
+// These are the possible flag values for the link renderer.
+// Only a single one of these values will be used; they are not ORed together.
+// These are mostly of interest if you are writing a new output format.
+const (
+	LINK_TYPE_NOT_AUTOLINK = iota
+	LINK_TYPE_NORMAL
+	LINK_TYPE_EMAIL
+)
+
+// These are the possible flag values for the ListItem renderer.
+// Multiple flag values may be ORed together.
+// These are mostly of interest if you are writing a new output format.
+const (
+	LIST_TYPE_ORDERED = 1 << iota
+	LIST_TYPE_DEFINITION
+	LIST_TYPE_TERM
+	LIST_ITEM_CONTAINS_BLOCK
+	LIST_ITEM_BEGINNING_OF_LIST
+	LIST_ITEM_END_OF_LIST
+)
+
+// These are the possible flag values for the table cell renderer.
+// Only a single one of these values will be used; they are not ORed together.
+// These are mostly of interest if you are writing a new output format.
+const (
+	TABLE_ALIGNMENT_LEFT = 1 << iota
+	TABLE_ALIGNMENT_RIGHT
+	TABLE_ALIGNMENT_CENTER = (TABLE_ALIGNMENT_LEFT | TABLE_ALIGNMENT_RIGHT)
+)
+
+// The size of a tab stop.
+const (
+	TAB_SIZE_DEFAULT = 4
+	TAB_SIZE_EIGHT   = 8
+)
+
+// blockTags is a set of tags that are recognized as HTML block tags.
+// Any of these can be included in markdown text without special escaping.
+var blockTags = map[string]struct{}{
+	"blockquote": struct{}{},
+	"del":        struct{}{},
+	"div":        struct{}{},
+	"dl":         struct{}{},
+	"fieldset":   struct{}{},
+	"form":       struct{}{},
+	"h1":         struct{}{},
+	"h2":         struct{}{},
+	"h3":         struct{}{},
+	"h4":         struct{}{},
+	"h5":         struct{}{},
+	"h6":         struct{}{},
+	"iframe":     struct{}{},
+	"ins":        struct{}{},
+	"math":       struct{}{},
+	"noscript":   struct{}{},
+	"ol":         struct{}{},
+	"pre":        struct{}{},
+	"p":          struct{}{},
+	"script":     struct{}{},
+	"style":      struct{}{},
+	"table":      struct{}{},
+	"ul":         struct{}{},
+
+	// HTML5
+	"address":    struct{}{},
+	"article":    struct{}{},
+	"aside":      struct{}{},
+	"canvas":     struct{}{},
+	"figcaption": struct{}{},
+	"figure":     struct{}{},
+	"footer":     struct{}{},
+	"header":     struct{}{},
+	"hgroup":     struct{}{},
+	"main":       struct{}{},
+	"nav":        struct{}{},
+	"output":     struct{}{},
+	"progress":   struct{}{},
+	"section":    struct{}{},
+	"video":      struct{}{},
+}
+
+// Renderer is the rendering interface.
+// This is mostly of interest if you are implementing a new rendering format.
+//
+// When a byte slice is provided, it contains the (rendered) contents of the
+// element.
+//
+// When a callback is provided instead, it will write the contents of the
+// respective element directly to the output buffer and return true on success.
+// If the callback returns false, the rendering function should reset the
+// output buffer as though it had never been called.
+//
+// Currently Html and Latex implementations are provided
+type Renderer interface {
+	// block-level callbacks
+	BlockCode(out *bytes.Buffer, text []byte, lang string)
+	BlockQuote(out *bytes.Buffer, text []byte)
+	BlockHtml(out *bytes.Buffer, text []byte)
+	Header(out *bytes.Buffer, text func() bool, level int, id string)
+	HRule(out *bytes.Buffer)
+	List(out *bytes.Buffer, text func() bool, flags int)
+	ListItem(out *bytes.Buffer, text []byte, flags int)
+	Paragraph(out *bytes.Buffer, text func() bool)
+	Table(out *bytes.Buffer, header []byte, body []byte, columnData []int)
+	TableRow(out *bytes.Buffer, text []byte)
+	TableHeaderCell(out *bytes.Buffer, text []byte, flags int)
+	TableCell(out *bytes.Buffer, text []byte, flags int)
+	Footnotes(out *bytes.Buffer, text func() bool)
+	FootnoteItem(out *bytes.Buffer, name, text []byte, flags int)
+	TitleBlock(out *bytes.Buffer, text []byte)
+
+	// Span-level callbacks
+	AutoLink(out *bytes.Buffer, link []byte, kind int)
+	CodeSpan(out *bytes.Buffer, text []byte)
+	DoubleEmphasis(out *bytes.Buffer, text []byte)
+	Emphasis(out *bytes.Buffer, text []byte)
+	Image(out *bytes.Buffer, link []byte, title []byte, alt []byte)
+	LineBreak(out *bytes.Buffer)
+	Link(out *bytes.Buffer, link []byte, title []byte, content []byte)
+	RawHtmlTag(out *bytes.Buffer, tag []byte)
+	TripleEmphasis(out *bytes.Buffer, text []byte)
+	StrikeThrough(out *bytes.Buffer, text []byte)
+	FootnoteRef(out *bytes.Buffer, ref []byte, id int)
+
+	// Low-level callbacks
+	Entity(out *bytes.Buffer, entity []byte)
+	NormalText(out *bytes.Buffer, text []byte)
+
+	// Header and footer
+	DocumentHeader(out *bytes.Buffer)
+	DocumentFooter(out *bytes.Buffer)
+
+	GetFlags() int
+}
+
+// Callback functions for inline parsing. One such function is defined
+// for each character that triggers a response when parsing inline data.
+type inlineParser func(p *parser, out *bytes.Buffer, data []byte, offset int) int
+
+// Parser holds runtime state used by the parser.
+// This is constructed by the Markdown function.
+type parser struct {
+	r              Renderer
+	refOverride    ReferenceOverrideFunc
+	refs           map[string]*reference
+	inlineCallback [256]inlineParser
+	flags          int
+	nesting        int
+	maxNesting     int
+	insideLink     bool
+
+	// Footnotes need to be ordered as well as available to quickly check for
+	// presence. If a ref is also a footnote, it's stored both in refs and here
+	// in notes. Slice is nil if footnotes not enabled.
+	notes []*reference
+}
+
+func (p *parser) getRef(refid string) (ref *reference, found bool) {
+	if p.refOverride != nil {
+		r, overridden := p.refOverride(refid)
+		if overridden {
+			if r == nil {
+				return nil, false
+			}
+			return &reference{
+				link:     []byte(r.Link),
+				title:    []byte(r.Title),
+				noteId:   0,
+				hasBlock: false,
+				text:     []byte(r.Text)}, true
+		}
+	}
+	// refs are case insensitive
+	ref, found = p.refs[strings.ToLower(refid)]
+	return ref, found
+}
+
+//
+//
+// Public interface
+//
+//
+
+// Reference represents the details of a link.
+// See the documentation in Options for more details on use-case.
+type Reference struct {
+	// Link is usually the URL the reference points to.
+	Link string
+	// Title is the alternate text describing the link in more detail.
+	Title string
+	// Text is the optional text to override the ref with if the syntax used was
+	// [refid][]
+	Text string
+}
+
+// ReferenceOverrideFunc is expected to be called with a reference string and
+// return either a valid Reference type that the reference string maps to or
+// nil. If overridden is false, the default reference logic will be executed.
+// See the documentation in Options for more details on use-case.
+type ReferenceOverrideFunc func(reference string) (ref *Reference, overridden bool)
+
+// Options represents configurable overrides and callbacks (in addition to the
+// extension flag set) for configuring a Markdown parse.
+type Options struct {
+	// Extensions is a flag set of bit-wise ORed extension bits. See the
+	// EXTENSION_* flags defined in this package.
+	Extensions int
+
+	// ReferenceOverride is an optional function callback that is called every
+	// time a reference is resolved.
+	//
+	// In Markdown, the link reference syntax can be made to resolve a link to
+	// a reference instead of an inline URL, in one of the following ways:
+	//
+	//  * [link text][refid]
+	//  * [refid][]
+	//
+	// Usually, the refid is defined at the bottom of the Markdown document. If
+	// this override function is provided, the refid is passed to the override
+	// function first, before consulting the defined refids at the bottom. If
+	// the override function indicates an override did not occur, the refids at
+	// the bottom will be used to fill in the link details.
+	ReferenceOverride ReferenceOverrideFunc
+}
+
+// MarkdownBasic is a convenience function for simple rendering.
+// It processes markdown input with no extensions enabled.
+func MarkdownBasic(input []byte) []byte {
+	// set up the HTML renderer
+	htmlFlags := HTML_USE_XHTML
+	renderer := HtmlRenderer(htmlFlags, "", "")
+
+	// set up the parser
+	return MarkdownOptions(input, renderer, Options{Extensions: 0})
+}
+
+// Call Markdown with most useful extensions enabled
+// MarkdownCommon is a convenience function for simple rendering.
+// It processes markdown input with common extensions enabled, including:
+//
+// * Smartypants processing with smart fractions and LaTeX dashes
+//
+// * Intra-word emphasis suppression
+//
+// * Tables
+//
+// * Fenced code blocks
+//
+// * Autolinking
+//
+// * Strikethrough support
+//
+// * Strict header parsing
+//
+// * Custom Header IDs
+func MarkdownCommon(input []byte) []byte {
+	// set up the HTML renderer
+	renderer := HtmlRenderer(commonHtmlFlags, "", "")
+	return MarkdownOptions(input, renderer, Options{
+		Extensions: commonExtensions})
+}
+
+// Markdown is the main rendering function.
+// It parses and renders a block of markdown-encoded text.
+// The supplied Renderer is used to format the output, and extensions dictates
+// which non-standard extensions are enabled.
+//
+// To use the supplied Html or LaTeX renderers, see HtmlRenderer and
+// LatexRenderer, respectively.
+func Markdown(input []byte, renderer Renderer, extensions int) []byte {
+	return MarkdownOptions(input, renderer, Options{
+		Extensions: extensions})
+}
+
+// MarkdownOptions is just like Markdown but takes additional options through
+// the Options struct.
+func MarkdownOptions(input []byte, renderer Renderer, opts Options) []byte {
+	// no point in parsing if we can't render
+	if renderer == nil {
+		return nil
+	}
+
+	extensions := opts.Extensions
+
+	// fill in the render structure
+	p := new(parser)
+	p.r = renderer
+	p.flags = extensions
+	p.refOverride = opts.ReferenceOverride
+	p.refs = make(map[string]*reference)
+	p.maxNesting = 16
+	p.insideLink = false
+
+	// register inline parsers
+	p.inlineCallback['*'] = emphasis
+	p.inlineCallback['_'] = emphasis
+	if extensions&EXTENSION_STRIKETHROUGH != 0 {
+		p.inlineCallback['~'] = emphasis
+	}
+	p.inlineCallback['`'] = codeSpan
+	p.inlineCallback['\n'] = lineBreak
+	p.inlineCallback['['] = link
+	p.inlineCallback['<'] = leftAngle
+	p.inlineCallback['\\'] = escape
+	p.inlineCallback['&'] = entity
+
+	if extensions&EXTENSION_AUTOLINK != 0 {
+		p.inlineCallback[':'] = autoLink
+	}
+
+	if extensions&EXTENSION_FOOTNOTES != 0 {
+		p.notes = make([]*reference, 0)
+	}
+
+	first := firstPass(p, input)
+	second := secondPass(p, first)
+	return second
+}
+
+// first pass:
+// - extract references
+// - expand tabs
+// - normalize newlines
+// - copy everything else
+func firstPass(p *parser, input []byte) []byte {
+	var out bytes.Buffer
+	tabSize := TAB_SIZE_DEFAULT
+	if p.flags&EXTENSION_TAB_SIZE_EIGHT != 0 {
+		tabSize = TAB_SIZE_EIGHT
+	}
+	beg, end := 0, 0
+	lastFencedCodeBlockEnd := 0
+	for beg < len(input) { // iterate over lines
+		if end = isReference(p, input[beg:], tabSize); end > 0 {
+			beg += end
+		} else { // skip to the next line
+			end = beg
+			for end < len(input) && input[end] != '\n' && input[end] != '\r' {
+				end++
+			}
+
+			if p.flags&EXTENSION_FENCED_CODE != 0 {
+				// track fenced code block boundaries to suppress tab expansion
+				// inside them:
+				if beg >= lastFencedCodeBlockEnd {
+					if i := p.fencedCode(&out, input[beg:], false); i > 0 {
+						lastFencedCodeBlockEnd = beg + i
+					}
+				}
+			}
+
+			// add the line body if present
+			if end > beg {
+				if end < lastFencedCodeBlockEnd { // Do not expand tabs while inside fenced code blocks.
+					out.Write(input[beg:end])
+				} else {
+					expandTabs(&out, input[beg:end], tabSize)
+				}
+			}
+			out.WriteByte('\n')
+
+			if end < len(input) && input[end] == '\r' {
+				end++
+			}
+			if end < len(input) && input[end] == '\n' {
+				end++
+			}
+
+			beg = end
+		}
+	}
+
+	// empty input?
+	if out.Len() == 0 {
+		out.WriteByte('\n')
+	}
+
+	return out.Bytes()
+}
+
+// second pass: actual rendering
+func secondPass(p *parser, input []byte) []byte {
+	var output bytes.Buffer
+
+	p.r.DocumentHeader(&output)
+	p.block(&output, input)
+
+	if p.flags&EXTENSION_FOOTNOTES != 0 && len(p.notes) > 0 {
+		p.r.Footnotes(&output, func() bool {
+			flags := LIST_ITEM_BEGINNING_OF_LIST
+			for i := 0; i < len(p.notes); i += 1 {
+				ref := p.notes[i]
+				var buf bytes.Buffer
+				if ref.hasBlock {
+					flags |= LIST_ITEM_CONTAINS_BLOCK
+					p.block(&buf, ref.title)
+				} else {
+					p.inline(&buf, ref.title)
+				}
+				p.r.FootnoteItem(&output, ref.link, buf.Bytes(), flags)
+				flags &^= LIST_ITEM_BEGINNING_OF_LIST | LIST_ITEM_CONTAINS_BLOCK
+			}
+
+			return true
+		})
+	}
+
+	p.r.DocumentFooter(&output)
+
+	if p.nesting != 0 {
+		panic("Nesting level did not end at zero")
+	}
+
+	return output.Bytes()
+}
+
+//
+// Link references
+//
+// This section implements support for references that (usually) appear
+// as footnotes in a document, and can be referenced anywhere in the document.
+// The basic format is:
+//
+//    [1]: http://www.google.com/ "Google"
+//    [2]: http://www.github.com/ "Github"
+//
+// Anywhere in the document, the reference can be linked by referring to its
+// label, i.e., 1 and 2 in this example, as in:
+//
+//    This library is hosted on [Github][2], a git hosting site.
+//
+// Actual footnotes as specified in Pandoc and supported by some other Markdown
+// libraries such as php-markdown are also taken care of. They look like this:
+//
+//    This sentence needs a bit of further explanation.[^note]
+//
+//    [^note]: This is the explanation.
+//
+// Footnotes should be placed at the end of the document in an ordered list.
+// Inline footnotes such as:
+//
+//    Inline footnotes^[Not supported.] also exist.
+//
+// are not yet supported.
+
+// References are parsed and stored in this struct.
+type reference struct {
+	link     []byte
+	title    []byte
+	noteId   int // 0 if not a footnote ref
+	hasBlock bool
+	text     []byte
+}
+
+func (r *reference) String() string {
+	return fmt.Sprintf("{link: %q, title: %q, text: %q, noteId: %d, hasBlock: %v}",
+		r.link, r.title, r.text, r.noteId, r.hasBlock)
+}
+
+// Check whether or not data starts with a reference link.
+// If so, it is parsed and stored in the list of references
+// (in the render struct).
+// Returns the number of bytes to skip to move past it,
+// or zero if the first line is not a reference.
+func isReference(p *parser, data []byte, tabSize int) int {
+	// up to 3 optional leading spaces
+	if len(data) < 4 {
+		return 0
+	}
+	i := 0
+	for i < 3 && data[i] == ' ' {
+		i++
+	}
+
+	noteId := 0
+
+	// id part: anything but a newline between brackets
+	if data[i] != '[' {
+		return 0
+	}
+	i++
+	if p.flags&EXTENSION_FOOTNOTES != 0 {
+		if i < len(data) && data[i] == '^' {
+			// we can set it to anything here because the proper noteIds will
+			// be assigned later during the second pass. It just has to be != 0
+			noteId = 1
+			i++
+		}
+	}
+	idOffset := i
+	for i < len(data) && data[i] != '\n' && data[i] != '\r' && data[i] != ']' {
+		i++
+	}
+	if i >= len(data) || data[i] != ']' {
+		return 0
+	}
+	idEnd := i
+
+	// spacer: colon (space | tab)* newline? (space | tab)*
+	i++
+	if i >= len(data) || data[i] != ':' {
+		return 0
+	}
+	i++
+	for i < len(data) && (data[i] == ' ' || data[i] == '\t') {
+		i++
+	}
+	if i < len(data) && (data[i] == '\n' || data[i] == '\r') {
+		i++
+		if i < len(data) && data[i] == '\n' && data[i-1] == '\r' {
+			i++
+		}
+	}
+	for i < len(data) && (data[i] == ' ' || data[i] == '\t') {
+		i++
+	}
+	if i >= len(data) {
+		return 0
+	}
+
+	var (
+		linkOffset, linkEnd   int
+		titleOffset, titleEnd int
+		lineEnd               int
+		raw                   []byte
+		hasBlock              bool
+	)
+
+	if p.flags&EXTENSION_FOOTNOTES != 0 && noteId != 0 {
+		linkOffset, linkEnd, raw, hasBlock = scanFootnote(p, data, i, tabSize)
+		lineEnd = linkEnd
+	} else {
+		linkOffset, linkEnd, titleOffset, titleEnd, lineEnd = scanLinkRef(p, data, i)
+	}
+	if lineEnd == 0 {
+		return 0
+	}
+
+	// a valid ref has been found
+
+	ref := &reference{
+		noteId:   noteId,
+		hasBlock: hasBlock,
+	}
+
+	if noteId > 0 {
+		// reusing the link field for the id since footnotes don't have links
+		ref.link = data[idOffset:idEnd]
+		// if footnote, it's not really a title, it's the contained text
+		ref.title = raw
+	} else {
+		ref.link = data[linkOffset:linkEnd]
+		ref.title = data[titleOffset:titleEnd]
+	}
+
+	// id matches are case-insensitive
+	id := string(bytes.ToLower(data[idOffset:idEnd]))
+
+	p.refs[id] = ref
+
+	return lineEnd
+}
+
+func scanLinkRef(p *parser, data []byte, i int) (linkOffset, linkEnd, titleOffset, titleEnd, lineEnd int) {
+	// link: whitespace-free sequence, optionally between angle brackets
+	if data[i] == '<' {
+		i++
+	}
+	linkOffset = i
+	for i < len(data) && data[i] != ' ' && data[i] != '\t' && data[i] != '\n' && data[i] != '\r' {
+		i++
+	}
+	if i == len(data) {
+		return
+	}
+	linkEnd = i
+	if data[linkOffset] == '<' && data[linkEnd-1] == '>' {
+		linkOffset++
+		linkEnd--
+	}
+
+	// optional spacer: (space | tab)* (newline | '\'' | '"' | '(' )
+	for i < len(data) && (data[i] == ' ' || data[i] == '\t') {
+		i++
+	}
+	if i < len(data) && data[i] != '\n' && data[i] != '\r' && data[i] != '\'' && data[i] != '"' && data[i] != '(' {
+		return
+	}
+
+	// compute end-of-line
+	if i >= len(data) || data[i] == '\r' || data[i] == '\n' {
+		lineEnd = i
+	}
+	if i+1 < len(data) && data[i] == '\r' && data[i+1] == '\n' {
+		lineEnd++
+	}
+
+	// optional (space|tab)* spacer after a newline
+	if lineEnd > 0 {
+		i = lineEnd + 1
+		for i < len(data) && (data[i] == ' ' || data[i] == '\t') {
+			i++
+		}
+	}
+
+	// optional title: any non-newline sequence enclosed in '"() alone on its line
+	if i+1 < len(data) && (data[i] == '\'' || data[i] == '"' || data[i] == '(') {
+		i++
+		titleOffset = i
+
+		// look for EOL
+		for i < len(data) && data[i] != '\n' && data[i] != '\r' {
+			i++
+		}
+		if i+1 < len(data) && data[i] == '\n' && data[i+1] == '\r' {
+			titleEnd = i + 1
+		} else {
+			titleEnd = i
+		}
+
+		// step back
+		i--
+		for i > titleOffset && (data[i] == ' ' || data[i] == '\t') {
+			i--
+		}
+		if i > titleOffset && (data[i] == '\'' || data[i] == '"' || data[i] == ')') {
+			lineEnd = titleEnd
+			titleEnd = i
+		}
+	}
+
+	return
+}
+
+// The first bit of this logic is the same as (*parser).listItem, but the rest
+// is much simpler. This function simply finds the entire block and shifts it
+// over by one tab if it is indeed a block (just returns the line if it's not).
+// blockEnd is the end of the section in the input buffer, and contents is the
+// extracted text that was shifted over one tab. It will need to be rendered at
+// the end of the document.
+func scanFootnote(p *parser, data []byte, i, indentSize int) (blockStart, blockEnd int, contents []byte, hasBlock bool) {
+	if i == 0 || len(data) == 0 {
+		return
+	}
+
+	// skip leading whitespace on first line
+	for i < len(data) && data[i] == ' ' {
+		i++
+	}
+
+	blockStart = i
+
+	// find the end of the line
+	blockEnd = i
+	for i < len(data) && data[i-1] != '\n' {
+		i++
+	}
+
+	// get working buffer
+	var raw bytes.Buffer
+
+	// put the first line into the working buffer
+	raw.Write(data[blockEnd:i])
+	blockEnd = i
+
+	// process the following lines
+	containsBlankLine := false
+
+gatherLines:
+	for blockEnd < len(data) {
+		i++
+
+		// find the end of this line
+		for i < len(data) && data[i-1] != '\n' {
+			i++
+		}
+
+		// if it is an empty line, guess that it is part of this item
+		// and move on to the next line
+		if p.isEmpty(data[blockEnd:i]) > 0 {
+			containsBlankLine = true
+			blockEnd = i
+			continue
+		}
+
+		n := 0
+		if n = isIndented(data[blockEnd:i], indentSize); n == 0 {
+			// this is the end of the block.
+			// we don't want to include this last line in the index.
+			break gatherLines
+		}
+
+		// if there were blank lines before this one, insert a new one now
+		if containsBlankLine {
+			raw.WriteByte('\n')
+			containsBlankLine = false
+		}
+
+		// get rid of that first tab, write to buffer
+		raw.Write(data[blockEnd+n : i])
+		hasBlock = true
+
+		blockEnd = i
+	}
+
+	if data[blockEnd-1] != '\n' {
+		raw.WriteByte('\n')
+	}
+
+	contents = raw.Bytes()
+
+	return
+}
+
+//
+//
+// Miscellaneous helper functions
+//
+//
+
+// Test if a character is a punctuation symbol.
+// Taken from a private function in regexp in the stdlib.
+func ispunct(c byte) bool {
+	for _, r := range []byte("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~") {
+		if c == r {
+			return true
+		}
+	}
+	return false
+}
+
+// Test if a character is a whitespace character.
+func isspace(c byte) bool {
+	return c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v'
+}
+
+// Test if a character is letter.
+func isletter(c byte) bool {
+	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
+}
+
+// Test if a character is a letter or a digit.
+// TODO: check when this is looking for ASCII alnum and when it should use unicode
+func isalnum(c byte) bool {
+	return (c >= '0' && c <= '9') || isletter(c)
+}
+
+// Replace tab characters with spaces, aligning to the next TAB_SIZE column.
+// always ends output with a newline
+func expandTabs(out *bytes.Buffer, line []byte, tabSize int) {
+	// first, check for common cases: no tabs, or only tabs at beginning of line
+	i, prefix := 0, 0
+	slowcase := false
+	for i = 0; i < len(line); i++ {
+		if line[i] == '\t' {
+			if prefix == i {
+				prefix++
+			} else {
+				slowcase = true
+				break
+			}
+		}
+	}
+
+	// no need to decode runes if all tabs are at the beginning of the line
+	if !slowcase {
+		for i = 0; i < prefix*tabSize; i++ {
+			out.WriteByte(' ')
+		}
+		out.Write(line[prefix:])
+		return
+	}
+
+	// the slow case: we need to count runes to figure out how
+	// many spaces to insert for each tab
+	column := 0
+	i = 0
+	for i < len(line) {
+		start := i
+		for i < len(line) && line[i] != '\t' {
+			_, size := utf8.DecodeRune(line[i:])
+			i += size
+			column++
+		}
+
+		if i > start {
+			out.Write(line[start:i])
+		}
+
+		if i >= len(line) {
+			break
+		}
+
+		for {
+			out.WriteByte(' ')
+			column++
+			if column%tabSize == 0 {
+				break
+			}
+		}
+
+		i++
+	}
+}
+
+// Find if a line counts as indented or not.
+// Returns number of characters the indent is (0 = not indented).
+func isIndented(data []byte, indentSize int) int {
+	if len(data) == 0 {
+		return 0
+	}
+	if data[0] == '\t' {
+		return 1
+	}
+	if len(data) < indentSize {
+		return 0
+	}
+	for i := 0; i < indentSize; i++ {
+		if data[i] != ' ' {
+			return 0
+		}
+	}
+	return indentSize
+}
+
+// Create a url-safe slug for fragments
+func slugify(in []byte) []byte {
+	if len(in) == 0 {
+		return in
+	}
+	out := make([]byte, 0, len(in))
+	sym := false
+
+	for _, ch := range in {
+		if isalnum(ch) {
+			sym = false
+			out = append(out, ch)
+		} else if sym {
+			continue
+		} else {
+			out = append(out, '-')
+			sym = true
+		}
+	}
+	var a, b int
+	var ch byte
+	for a, ch = range out {
+		if ch != '-' {
+			break
+		}
+	}
+	for b = len(out) - 1; b > 0; b-- {
+		if out[b] != '-' {
+			break
+		}
+	}
+	return out[a : b+1]
+}
diff --git a/vendor/github.com/russross/blackfriday/smartypants.go b/vendor/github.com/russross/blackfriday/smartypants.go
new file mode 100644
index 0000000000..eeffa5e1e1
--- /dev/null
+++ b/vendor/github.com/russross/blackfriday/smartypants.go
@@ -0,0 +1,400 @@
+//
+// Blackfriday Markdown Processor
+// Available at http://github.com/russross/blackfriday
+//
+// Copyright © 2011 Russ Ross <russ@russross.com>.
+// Distributed under the Simplified BSD License.
+// See README.md for details.
+//
+
+//
+//
+// SmartyPants rendering
+//
+//
+
+package blackfriday
+
+import (
+	"bytes"
+)
+
+type smartypantsData struct {
+	inSingleQuote bool
+	inDoubleQuote bool
+}
+
+func wordBoundary(c byte) bool {
+	return c == 0 || isspace(c) || ispunct(c)
+}
+
+func tolower(c byte) byte {
+	if c >= 'A' && c <= 'Z' {
+		return c - 'A' + 'a'
+	}
+	return c
+}
+
+func isdigit(c byte) bool {
+	return c >= '0' && c <= '9'
+}
+
+func smartQuoteHelper(out *bytes.Buffer, previousChar byte, nextChar byte, quote byte, isOpen *bool) bool {
+	// edge of the buffer is likely to be a tag that we don't get to see,
+	// so we treat it like text sometimes
+
+	// enumerate all sixteen possibilities for (previousChar, nextChar)
+	// each can be one of {0, space, punct, other}
+	switch {
+	case previousChar == 0 && nextChar == 0:
+		// context is not any help here, so toggle
+		*isOpen = !*isOpen
+	case isspace(previousChar) && nextChar == 0:
+		// [ "] might be [ "<code>foo...]
+		*isOpen = true
+	case ispunct(previousChar) && nextChar == 0:
+		// [!"] hmm... could be [Run!"] or [("<code>...]
+		*isOpen = false
+	case /* isnormal(previousChar) && */ nextChar == 0:
+		// [a"] is probably a close
+		*isOpen = false
+	case previousChar == 0 && isspace(nextChar):
+		// [" ] might be [...foo</code>" ]
+		*isOpen = false
+	case isspace(previousChar) && isspace(nextChar):
+		// [ " ] context is not any help here, so toggle
+		*isOpen = !*isOpen
+	case ispunct(previousChar) && isspace(nextChar):
+		// [!" ] is probably a close
+		*isOpen = false
+	case /* isnormal(previousChar) && */ isspace(nextChar):
+		// [a" ] this is one of the easy cases
+		*isOpen = false
+	case previousChar == 0 && ispunct(nextChar):
+		// ["!] hmm... could be ["$1.95] or [</code>"!...]
+		*isOpen = false
+	case isspace(previousChar) && ispunct(nextChar):
+		// [ "!] looks more like [ "$1.95]
+		*isOpen = true
+	case ispunct(previousChar) && ispunct(nextChar):
+		// [!"!] context is not any help here, so toggle
+		*isOpen = !*isOpen
+	case /* isnormal(previousChar) && */ ispunct(nextChar):
+		// [a"!] is probably a close
+		*isOpen = false
+	case previousChar == 0 /* && isnormal(nextChar) */ :
+		// ["a] is probably an open
+		*isOpen = true
+	case isspace(previousChar) /* && isnormal(nextChar) */ :
+		// [ "a] this is one of the easy cases
+		*isOpen = true
+	case ispunct(previousChar) /* && isnormal(nextChar) */ :
+		// [!"a] is probably an open
+		*isOpen = true
+	default:
+		// [a'b] maybe a contraction?
+		*isOpen = false
+	}
+
+	out.WriteByte('&')
+	if *isOpen {
+		out.WriteByte('l')
+	} else {
+		out.WriteByte('r')
+	}
+	out.WriteByte(quote)
+	out.WriteString("quo;")
+	return true
+}
+
+func smartSingleQuote(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	if len(text) >= 2 {
+		t1 := tolower(text[1])
+
+		if t1 == '\'' {
+			nextChar := byte(0)
+			if len(text) >= 3 {
+				nextChar = text[2]
+			}
+			if smartQuoteHelper(out, previousChar, nextChar, 'd', &smrt.inDoubleQuote) {
+				return 1
+			}
+		}
+
+		if (t1 == 's' || t1 == 't' || t1 == 'm' || t1 == 'd') && (len(text) < 3 || wordBoundary(text[2])) {
+			out.WriteString("&rsquo;")
+			return 0
+		}
+
+		if len(text) >= 3 {
+			t2 := tolower(text[2])
+
+			if ((t1 == 'r' && t2 == 'e') || (t1 == 'l' && t2 == 'l') || (t1 == 'v' && t2 == 'e')) &&
+				(len(text) < 4 || wordBoundary(text[3])) {
+				out.WriteString("&rsquo;")
+				return 0
+			}
+		}
+	}
+
+	nextChar := byte(0)
+	if len(text) > 1 {
+		nextChar = text[1]
+	}
+	if smartQuoteHelper(out, previousChar, nextChar, 's', &smrt.inSingleQuote) {
+		return 0
+	}
+
+	out.WriteByte(text[0])
+	return 0
+}
+
+func smartParens(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	if len(text) >= 3 {
+		t1 := tolower(text[1])
+		t2 := tolower(text[2])
+
+		if t1 == 'c' && t2 == ')' {
+			out.WriteString("&copy;")
+			return 2
+		}
+
+		if t1 == 'r' && t2 == ')' {
+			out.WriteString("&reg;")
+			return 2
+		}
+
+		if len(text) >= 4 && t1 == 't' && t2 == 'm' && text[3] == ')' {
+			out.WriteString("&trade;")
+			return 3
+		}
+	}
+
+	out.WriteByte(text[0])
+	return 0
+}
+
+func smartDash(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	if len(text) >= 2 {
+		if text[1] == '-' {
+			out.WriteString("&mdash;")
+			return 1
+		}
+
+		if wordBoundary(previousChar) && wordBoundary(text[1]) {
+			out.WriteString("&ndash;")
+			return 0
+		}
+	}
+
+	out.WriteByte(text[0])
+	return 0
+}
+
+func smartDashLatex(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	if len(text) >= 3 && text[1] == '-' && text[2] == '-' {
+		out.WriteString("&mdash;")
+		return 2
+	}
+	if len(text) >= 2 && text[1] == '-' {
+		out.WriteString("&ndash;")
+		return 1
+	}
+
+	out.WriteByte(text[0])
+	return 0
+}
+
+func smartAmpVariant(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte, quote byte) int {
+	if bytes.HasPrefix(text, []byte("&quot;")) {
+		nextChar := byte(0)
+		if len(text) >= 7 {
+			nextChar = text[6]
+		}
+		if smartQuoteHelper(out, previousChar, nextChar, quote, &smrt.inDoubleQuote) {
+			return 5
+		}
+	}
+
+	if bytes.HasPrefix(text, []byte("&#0;")) {
+		return 3
+	}
+
+	out.WriteByte('&')
+	return 0
+}
+
+func smartAmp(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	return smartAmpVariant(out, smrt, previousChar, text, 'd')
+}
+
+func smartAmpAngledQuote(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	return smartAmpVariant(out, smrt, previousChar, text, 'a')
+}
+
+func smartPeriod(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	if len(text) >= 3 && text[1] == '.' && text[2] == '.' {
+		out.WriteString("&hellip;")
+		return 2
+	}
+
+	if len(text) >= 5 && text[1] == ' ' && text[2] == '.' && text[3] == ' ' && text[4] == '.' {
+		out.WriteString("&hellip;")
+		return 4
+	}
+
+	out.WriteByte(text[0])
+	return 0
+}
+
+func smartBacktick(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	if len(text) >= 2 && text[1] == '`' {
+		nextChar := byte(0)
+		if len(text) >= 3 {
+			nextChar = text[2]
+		}
+		if smartQuoteHelper(out, previousChar, nextChar, 'd', &smrt.inDoubleQuote) {
+			return 1
+		}
+	}
+
+	out.WriteByte(text[0])
+	return 0
+}
+
+func smartNumberGeneric(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	if wordBoundary(previousChar) && previousChar != '/' && len(text) >= 3 {
+		// is it of the form digits/digits(word boundary)?, i.e., \d+/\d+\b
+		// note: check for regular slash (/) or fraction slash (⁄, 0x2044, or 0xe2 81 84 in utf-8)
+		//       and avoid changing dates like 1/23/2005 into fractions.
+		numEnd := 0
+		for len(text) > numEnd && isdigit(text[numEnd]) {
+			numEnd++
+		}
+		if numEnd == 0 {
+			out.WriteByte(text[0])
+			return 0
+		}
+		denStart := numEnd + 1
+		if len(text) > numEnd+3 && text[numEnd] == 0xe2 && text[numEnd+1] == 0x81 && text[numEnd+2] == 0x84 {
+			denStart = numEnd + 3
+		} else if len(text) < numEnd+2 || text[numEnd] != '/' {
+			out.WriteByte(text[0])
+			return 0
+		}
+		denEnd := denStart
+		for len(text) > denEnd && isdigit(text[denEnd]) {
+			denEnd++
+		}
+		if denEnd == denStart {
+			out.WriteByte(text[0])
+			return 0
+		}
+		if len(text) == denEnd || wordBoundary(text[denEnd]) && text[denEnd] != '/' {
+			out.WriteString("<sup>")
+			out.Write(text[:numEnd])
+			out.WriteString("</sup>&frasl;<sub>")
+			out.Write(text[denStart:denEnd])
+			out.WriteString("</sub>")
+			return denEnd - 1
+		}
+	}
+
+	out.WriteByte(text[0])
+	return 0
+}
+
+func smartNumber(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	if wordBoundary(previousChar) && previousChar != '/' && len(text) >= 3 {
+		if text[0] == '1' && text[1] == '/' && text[2] == '2' {
+			if len(text) < 4 || wordBoundary(text[3]) && text[3] != '/' {
+				out.WriteString("&frac12;")
+				return 2
+			}
+		}
+
+		if text[0] == '1' && text[1] == '/' && text[2] == '4' {
+			if len(text) < 4 || wordBoundary(text[3]) && text[3] != '/' || (len(text) >= 5 && tolower(text[3]) == 't' && tolower(text[4]) == 'h') {
+				out.WriteString("&frac14;")
+				return 2
+			}
+		}
+
+		if text[0] == '3' && text[1] == '/' && text[2] == '4' {
+			if len(text) < 4 || wordBoundary(text[3]) && text[3] != '/' || (len(text) >= 6 && tolower(text[3]) == 't' && tolower(text[4]) == 'h' && tolower(text[5]) == 's') {
+				out.WriteString("&frac34;")
+				return 2
+			}
+		}
+	}
+
+	out.WriteByte(text[0])
+	return 0
+}
+
+func smartDoubleQuoteVariant(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte, quote byte) int {
+	nextChar := byte(0)
+	if len(text) > 1 {
+		nextChar = text[1]
+	}
+	if !smartQuoteHelper(out, previousChar, nextChar, quote, &smrt.inDoubleQuote) {
+		out.WriteString("&quot;")
+	}
+
+	return 0
+}
+
+func smartDoubleQuote(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	return smartDoubleQuoteVariant(out, smrt, previousChar, text, 'd')
+}
+
+func smartAngledDoubleQuote(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	return smartDoubleQuoteVariant(out, smrt, previousChar, text, 'a')
+}
+
+func smartLeftAngle(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
+	i := 0
+
+	for i < len(text) && text[i] != '>' {
+		i++
+	}
+
+	out.Write(text[:i+1])
+	return i
+}
+
+type smartCallback func(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int
+
+type smartypantsRenderer [256]smartCallback
+
+func smartypants(flags int) *smartypantsRenderer {
+	r := new(smartypantsRenderer)
+	if flags&HTML_SMARTYPANTS_ANGLED_QUOTES == 0 {
+		r['"'] = smartDoubleQuote
+		r['&'] = smartAmp
+	} else {
+		r['"'] = smartAngledDoubleQuote
+		r['&'] = smartAmpAngledQuote
+	}
+	r['\''] = smartSingleQuote
+	r['('] = smartParens
+	if flags&HTML_SMARTYPANTS_DASHES != 0 {
+		if flags&HTML_SMARTYPANTS_LATEX_DASHES == 0 {
+			r['-'] = smartDash
+		} else {
+			r['-'] = smartDashLatex
+		}
+	}
+	r['.'] = smartPeriod
+	if flags&HTML_SMARTYPANTS_FRACTIONS == 0 {
+		r['1'] = smartNumber
+		r['3'] = smartNumber
+	} else {
+		for ch := '1'; ch <= '9'; ch++ {
+			r[ch] = smartNumberGeneric
+		}
+	}
+	r['<'] = smartLeftAngle
+	r['`'] = smartBacktick
+	return r
+}
diff --git a/vendor/github.com/shirou/gopsutil/LICENSE b/vendor/github.com/shirou/gopsutil/LICENSE
new file mode 100644
index 0000000000..602b2c098e
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/LICENSE
@@ -0,0 +1,27 @@
+gopsutil is distributed under BSD license reproduced below.
+
+Copyright (c) 2014, WAKAYAMA Shirou
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of the gopsutil authors nor the names of its contributors
+   may be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu.go b/vendor/github.com/shirou/gopsutil/cpu/cpu.go
new file mode 100644
index 0000000000..71535094d4
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu.go
@@ -0,0 +1,76 @@
+package cpu
+
+import (
+	"encoding/json"
+	"runtime"
+	"strconv"
+	"strings"
+)
+
+type TimesStat struct {
+	CPU       string  `json:"cpu"`
+	User      float64 `json:"user"`
+	System    float64 `json:"system"`
+	Idle      float64 `json:"idle"`
+	Nice      float64 `json:"nice"`
+	Iowait    float64 `json:"iowait"`
+	Irq       float64 `json:"irq"`
+	Softirq   float64 `json:"softirq"`
+	Steal     float64 `json:"steal"`
+	Guest     float64 `json:"guest"`
+	GuestNice float64 `json:"guestNice"`
+	Stolen    float64 `json:"stolen"`
+}
+
+type InfoStat struct {
+	CPU        int32    `json:"cpu"`
+	VendorID   string   `json:"vendorId"`
+	Family     string   `json:"family"`
+	Model      string   `json:"model"`
+	Stepping   int32    `json:"stepping"`
+	PhysicalID string   `json:"physicalId"`
+	CoreID     string   `json:"coreId"`
+	Cores      int32    `json:"cores"`
+	ModelName  string   `json:"modelName"`
+	Mhz        float64  `json:"mhz"`
+	CacheSize  int32    `json:"cacheSize"`
+	Flags      []string `json:"flags"`
+}
+
+var lastCPUTimes []TimesStat
+var lastPerCPUTimes []TimesStat
+
+func Counts(logical bool) (int, error) {
+	return runtime.NumCPU(), nil
+}
+
+func (c TimesStat) String() string {
+	v := []string{
+		`"cpu":"` + c.CPU + `"`,
+		`"user":` + strconv.FormatFloat(c.User, 'f', 1, 64),
+		`"system":` + strconv.FormatFloat(c.System, 'f', 1, 64),
+		`"idle":` + strconv.FormatFloat(c.Idle, 'f', 1, 64),
+		`"nice":` + strconv.FormatFloat(c.Nice, 'f', 1, 64),
+		`"iowait":` + strconv.FormatFloat(c.Iowait, 'f', 1, 64),
+		`"irq":` + strconv.FormatFloat(c.Irq, 'f', 1, 64),
+		`"softirq":` + strconv.FormatFloat(c.Softirq, 'f', 1, 64),
+		`"steal":` + strconv.FormatFloat(c.Steal, 'f', 1, 64),
+		`"guest":` + strconv.FormatFloat(c.Guest, 'f', 1, 64),
+		`"guestNice":` + strconv.FormatFloat(c.GuestNice, 'f', 1, 64),
+		`"stolen":` + strconv.FormatFloat(c.Stolen, 'f', 1, 64),
+	}
+
+	return `{` + strings.Join(v, ",") + `}`
+}
+
+// Total returns the total number of seconds in a CPUTimesStat
+func (c TimesStat) Total() float64 {
+	total := c.User + c.System + c.Nice + c.Iowait + c.Irq + c.Softirq + c.Steal +
+		c.Guest + c.GuestNice + c.Idle + c.Stolen
+	return total
+}
+
+func (c InfoStat) String() string {
+	s, _ := json.Marshal(c)
+	return string(s)
+}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
new file mode 100644
index 0000000000..fbb74a821f
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
@@ -0,0 +1,106 @@
+// +build darwin
+
+package cpu
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+)
+
+// sys/resource.h
+const (
+	CPUser    = 0
+	CPNice    = 1
+	CPSys     = 2
+	CPIntr    = 3
+	CPIdle    = 4
+	CPUStates = 5
+)
+
+// default value. from time.h
+var ClocksPerSec = float64(128)
+
+func Times(percpu bool) ([]TimesStat, error) {
+	if percpu {
+		return perCPUTimes()
+	}
+
+	return allCPUTimes()
+}
+
+// Returns only one CPUInfoStat on FreeBSD
+func Info() ([]InfoStat, error) {
+	var ret []InfoStat
+	sysctl, err := exec.LookPath("/usr/sbin/sysctl")
+	if err != nil {
+		return ret, err
+	}
+	out, err := exec.Command(sysctl, "machdep.cpu").Output()
+	if err != nil {
+		return ret, err
+	}
+
+	c := InfoStat{}
+	for _, line := range strings.Split(string(out), "\n") {
+		values := strings.Fields(line)
+		if len(values) < 1 {
+			continue
+		}
+
+		t, err := strconv.ParseInt(values[1], 10, 64)
+		// err is not checked here because some value is string.
+		if strings.HasPrefix(line, "machdep.cpu.brand_string") {
+			c.ModelName = strings.Join(values[1:], " ")
+		} else if strings.HasPrefix(line, "machdep.cpu.family") {
+			c.Family = values[1]
+		} else if strings.HasPrefix(line, "machdep.cpu.model") {
+			c.Model = values[1]
+		} else if strings.HasPrefix(line, "machdep.cpu.stepping") {
+			if err != nil {
+				return ret, err
+			}
+			c.Stepping = int32(t)
+		} else if strings.HasPrefix(line, "machdep.cpu.features") {
+			for _, v := range values[1:] {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if strings.HasPrefix(line, "machdep.cpu.leaf7_features") {
+			for _, v := range values[1:] {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if strings.HasPrefix(line, "machdep.cpu.extfeatures") {
+			for _, v := range values[1:] {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if strings.HasPrefix(line, "machdep.cpu.core_count") {
+			if err != nil {
+				return ret, err
+			}
+			c.Cores = int32(t)
+		} else if strings.HasPrefix(line, "machdep.cpu.cache.size") {
+			if err != nil {
+				return ret, err
+			}
+			c.CacheSize = int32(t)
+		} else if strings.HasPrefix(line, "machdep.cpu.vendor") {
+			c.VendorID = values[1]
+		}
+	}
+
+	// Use the rated frequency of the CPU. This is a static value and does not
+	// account for low power or Turbo Boost modes.
+	out, err = exec.Command(sysctl, "hw.cpufrequency").Output()
+	if err != nil {
+		return ret, err
+	}
+
+	values := strings.Fields(string(out))
+	mhz, err := strconv.ParseFloat(values[1], 64)
+	if err != nil {
+		return ret, err
+	}
+	c.Mhz = mhz / 1000000.0
+
+	return append(ret, c), nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
new file mode 100644
index 0000000000..ee59fefc06
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
@@ -0,0 +1,107 @@
+// +build darwin
+// +build cgo
+
+package cpu
+
+/*
+#include <stdlib.h>
+#include <sys/sysctl.h>
+#include <sys/mount.h>
+#include <mach/mach_init.h>
+#include <mach/mach_host.h>
+#include <mach/host_info.h>
+#include <libproc.h>
+#include <mach/processor_info.h>
+#include <mach/vm_map.h>
+*/
+import "C"
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"unsafe"
+)
+
+// these CPU times for darwin is borrowed from influxdb/telegraf.
+
+func perCPUTimes() ([]TimesStat, error) {
+	var (
+		count   C.mach_msg_type_number_t
+		cpuload *C.processor_cpu_load_info_data_t
+		ncpu    C.natural_t
+	)
+
+	status := C.host_processor_info(C.host_t(C.mach_host_self()),
+		C.PROCESSOR_CPU_LOAD_INFO,
+		&ncpu,
+		(*C.processor_info_array_t)(unsafe.Pointer(&cpuload)),
+		&count)
+
+	if status != C.KERN_SUCCESS {
+		return nil, fmt.Errorf("host_processor_info error=%d", status)
+	}
+
+	// jump through some cgo casting hoops and ensure we properly free
+	// the memory that cpuload points to
+	target := C.vm_map_t(C.mach_task_self_)
+	address := C.vm_address_t(uintptr(unsafe.Pointer(cpuload)))
+	defer C.vm_deallocate(target, address, C.vm_size_t(ncpu))
+
+	// the body of struct processor_cpu_load_info
+	// aka processor_cpu_load_info_data_t
+	var cpu_ticks [C.CPU_STATE_MAX]uint32
+
+	// copy the cpuload array to a []byte buffer
+	// where we can binary.Read the data
+	size := int(ncpu) * binary.Size(cpu_ticks)
+	buf := C.GoBytes(unsafe.Pointer(cpuload), C.int(size))
+
+	bbuf := bytes.NewBuffer(buf)
+
+	var ret []TimesStat
+
+	for i := 0; i < int(ncpu); i++ {
+		err := binary.Read(bbuf, binary.LittleEndian, &cpu_ticks)
+		if err != nil {
+			return nil, err
+		}
+
+		c := TimesStat{
+			CPU:    fmt.Sprintf("cpu%d", i),
+			User:   float64(cpu_ticks[C.CPU_STATE_USER]) / ClocksPerSec,
+			System: float64(cpu_ticks[C.CPU_STATE_SYSTEM]) / ClocksPerSec,
+			Nice:   float64(cpu_ticks[C.CPU_STATE_NICE]) / ClocksPerSec,
+			Idle:   float64(cpu_ticks[C.CPU_STATE_IDLE]) / ClocksPerSec,
+		}
+
+		ret = append(ret, c)
+	}
+
+	return ret, nil
+}
+
+func allCPUTimes() ([]TimesStat, error) {
+	var count C.mach_msg_type_number_t = C.HOST_CPU_LOAD_INFO_COUNT
+	var cpuload C.host_cpu_load_info_data_t
+
+	status := C.host_statistics(C.host_t(C.mach_host_self()),
+		C.HOST_CPU_LOAD_INFO,
+		C.host_info_t(unsafe.Pointer(&cpuload)),
+		&count)
+
+	if status != C.KERN_SUCCESS {
+		return nil, fmt.Errorf("host_statistics error=%d", status)
+	}
+
+	c := TimesStat{
+		CPU:    "cpu-total",
+		User:   float64(cpuload.cpu_ticks[C.CPU_STATE_USER]) / ClocksPerSec,
+		System: float64(cpuload.cpu_ticks[C.CPU_STATE_SYSTEM]) / ClocksPerSec,
+		Nice:   float64(cpuload.cpu_ticks[C.CPU_STATE_NICE]) / ClocksPerSec,
+		Idle:   float64(cpuload.cpu_ticks[C.CPU_STATE_IDLE]) / ClocksPerSec,
+	}
+
+	return []TimesStat{c}, nil
+
+}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
new file mode 100644
index 0000000000..242b4a8e79
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
@@ -0,0 +1,14 @@
+// +build darwin
+// +build !cgo
+
+package cpu
+
+import "github.com/shirou/gopsutil/internal/common"
+
+func perCPUTimes() ([]TimesStat, error) {
+	return []TimesStat{}, common.ErrNotImplementedError
+}
+
+func allCPUTimes() ([]TimesStat, error) {
+	return []TimesStat{}, common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
new file mode 100644
index 0000000000..ce1adf3c16
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
@@ -0,0 +1,147 @@
+// +build freebsd
+
+package cpu
+
+import (
+	"fmt"
+	"os/exec"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// sys/resource.h
+const (
+	CPUser    = 0
+	CPNice    = 1
+	CPSys     = 2
+	CPIntr    = 3
+	CPIdle    = 4
+	CPUStates = 5
+)
+
+var ClocksPerSec = float64(128)
+
+func init() {
+	getconf, err := exec.LookPath("/usr/bin/getconf")
+	if err != nil {
+		return
+	}
+	out, err := exec.Command(getconf, "CLK_TCK").Output()
+	// ignore errors
+	if err == nil {
+		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
+		if err == nil {
+			ClocksPerSec = float64(i)
+		}
+	}
+}
+
+func Times(percpu bool) ([]TimesStat, error) {
+	var ret []TimesStat
+
+	var sysctlCall string
+	var ncpu int
+	if percpu {
+		sysctlCall = "kern.cp_times"
+		ncpu, _ = Counts(true)
+	} else {
+		sysctlCall = "kern.cp_time"
+		ncpu = 1
+	}
+
+	cpuTimes, err := common.DoSysctrl(sysctlCall)
+	if err != nil {
+		return ret, err
+	}
+
+	for i := 0; i < ncpu; i++ {
+		offset := CPUStates * i
+		user, err := strconv.ParseFloat(cpuTimes[CPUser+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+		nice, err := strconv.ParseFloat(cpuTimes[CPNice+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+		sys, err := strconv.ParseFloat(cpuTimes[CPSys+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+		idle, err := strconv.ParseFloat(cpuTimes[CPIdle+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+		intr, err := strconv.ParseFloat(cpuTimes[CPIntr+offset], 64)
+		if err != nil {
+			return ret, err
+		}
+
+		c := TimesStat{
+			User:   float64(user / ClocksPerSec),
+			Nice:   float64(nice / ClocksPerSec),
+			System: float64(sys / ClocksPerSec),
+			Idle:   float64(idle / ClocksPerSec),
+			Irq:    float64(intr / ClocksPerSec),
+		}
+		if !percpu {
+			c.CPU = "cpu-total"
+		} else {
+			c.CPU = fmt.Sprintf("cpu%d", i)
+		}
+
+		ret = append(ret, c)
+	}
+
+	return ret, nil
+}
+
+// Returns only one CPUInfoStat on FreeBSD
+func Info() ([]InfoStat, error) {
+	filename := "/var/run/dmesg.boot"
+	lines, _ := common.ReadLines(filename)
+
+	var ret []InfoStat
+
+	c := InfoStat{}
+	for _, line := range lines {
+		if matches := regexp.MustCompile(`CPU:\s+(.+) \(([\d.]+).+\)`).FindStringSubmatch(line); matches != nil {
+			c.ModelName = matches[1]
+			t, err := strconv.ParseFloat(matches[2], 64)
+			if err != nil {
+				return ret, nil
+			}
+			c.Mhz = t
+		} else if matches := regexp.MustCompile(`Origin = "(.+)"  Id = (.+)  Family = (.+)  Model = (.+)  Stepping = (.+)`).FindStringSubmatch(line); matches != nil {
+			c.VendorID = matches[1]
+			c.Family = matches[3]
+			c.Model = matches[4]
+			t, err := strconv.ParseInt(matches[5], 10, 32)
+			if err != nil {
+				return ret, nil
+			}
+			c.Stepping = int32(t)
+		} else if matches := regexp.MustCompile(`Features=.+<(.+)>`).FindStringSubmatch(line); matches != nil {
+			for _, v := range strings.Split(matches[1], ",") {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if matches := regexp.MustCompile(`Features2=[a-f\dx]+<(.+)>`).FindStringSubmatch(line); matches != nil {
+			for _, v := range strings.Split(matches[1], ",") {
+				c.Flags = append(c.Flags, strings.ToLower(v))
+			}
+		} else if matches := regexp.MustCompile(`Logical CPUs per core: (\d+)`).FindStringSubmatch(line); matches != nil {
+			// FIXME: no this line?
+			t, err := strconv.ParseInt(matches[1], 10, 32)
+			if err != nil {
+				return ret, nil
+			}
+			c.Cores = int32(t)
+		}
+
+	}
+
+	return append(ret, c), nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
new file mode 100644
index 0000000000..f7cf4c3649
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
@@ -0,0 +1,244 @@
+// +build linux
+
+package cpu
+
+import (
+	"errors"
+	"fmt"
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var cpu_tick = float64(100)
+
+func init() {
+	getconf, err := exec.LookPath("/usr/bin/getconf")
+	if err != nil {
+		return
+	}
+	out, err := exec.Command(getconf, "CLK_TCK").Output()
+	// ignore errors
+	if err == nil {
+		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
+		if err == nil {
+			cpu_tick = float64(i)
+		}
+	}
+}
+
+func Times(percpu bool) ([]TimesStat, error) {
+	filename := common.HostProc("stat")
+	var lines = []string{}
+	if percpu {
+		var startIdx uint = 1
+		for {
+			linen, _ := common.ReadLinesOffsetN(filename, startIdx, 1)
+			line := linen[0]
+			if !strings.HasPrefix(line, "cpu") {
+				break
+			}
+			lines = append(lines, line)
+			startIdx++
+		}
+	} else {
+		lines, _ = common.ReadLinesOffsetN(filename, 0, 1)
+	}
+
+	ret := make([]TimesStat, 0, len(lines))
+
+	for _, line := range lines {
+		ct, err := parseStatLine(line)
+		if err != nil {
+			continue
+		}
+		ret = append(ret, *ct)
+
+	}
+	return ret, nil
+}
+
+func sysCPUPath(cpu int32, relPath string) string {
+	return common.HostSys(fmt.Sprintf("devices/system/cpu/cpu%d", cpu), relPath)
+}
+
+func finishCPUInfo(c *InfoStat) error {
+	if c.Mhz == 0 {
+		lines, err := common.ReadLines(sysCPUPath(c.CPU, "cpufreq/cpuinfo_max_freq"))
+		if err == nil {
+			value, err := strconv.ParseFloat(lines[0], 64)
+			if err != nil {
+				return err
+			}
+			c.Mhz = value
+		}
+	}
+	if len(c.CoreID) == 0 {
+		lines, err := common.ReadLines(sysCPUPath(c.CPU, "topology/coreId"))
+		if err == nil {
+			c.CoreID = lines[0]
+		}
+	}
+	return nil
+}
+
+// CPUInfo on linux will return 1 item per physical thread.
+//
+// CPUs have three levels of counting: sockets, cores, threads.
+// Cores with HyperThreading count as having 2 threads per core.
+// Sockets often come with many physical CPU cores.
+// For example a single socket board with two cores each with HT will
+// return 4 CPUInfoStat structs on Linux and the "Cores" field set to 1.
+func Info() ([]InfoStat, error) {
+	filename := common.HostProc("cpuinfo")
+	lines, _ := common.ReadLines(filename)
+
+	var ret []InfoStat
+
+	c := InfoStat{CPU: -1, Cores: 1}
+	for _, line := range lines {
+		fields := strings.Split(line, ":")
+		if len(fields) < 2 {
+			continue
+		}
+		key := strings.TrimSpace(fields[0])
+		value := strings.TrimSpace(fields[1])
+
+		switch key {
+		case "processor":
+			if c.CPU >= 0 {
+				err := finishCPUInfo(&c)
+				if err != nil {
+					return ret, err
+				}
+				ret = append(ret, c)
+			}
+			c = InfoStat{Cores: 1}
+			t, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return ret, err
+			}
+			c.CPU = int32(t)
+		case "vendorId":
+			c.VendorID = value
+		case "cpu family":
+			c.Family = value
+		case "model":
+			c.Model = value
+		case "model name":
+			c.ModelName = value
+		case "stepping":
+			t, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return ret, err
+			}
+			c.Stepping = int32(t)
+		case "cpu MHz":
+			t, err := strconv.ParseFloat(value, 64)
+			if err != nil {
+				return ret, err
+			}
+			c.Mhz = t
+		case "cache size":
+			t, err := strconv.ParseInt(strings.Replace(value, " KB", "", 1), 10, 64)
+			if err != nil {
+				return ret, err
+			}
+			c.CacheSize = int32(t)
+		case "physical id":
+			c.PhysicalID = value
+		case "core id":
+			c.CoreID = value
+		case "flags", "Features":
+			c.Flags = strings.FieldsFunc(value, func(r rune) bool {
+				return r == ',' || r == ' '
+			})
+		}
+	}
+	if c.CPU >= 0 {
+		err := finishCPUInfo(&c)
+		if err != nil {
+			return ret, err
+		}
+		ret = append(ret, c)
+	}
+	return ret, nil
+}
+
+func parseStatLine(line string) (*TimesStat, error) {
+	fields := strings.Fields(line)
+
+	if strings.HasPrefix(fields[0], "cpu") == false {
+		//		return CPUTimesStat{}, e
+		return nil, errors.New("not contain cpu")
+	}
+
+	cpu := fields[0]
+	if cpu == "cpu" {
+		cpu = "cpu-total"
+	}
+	user, err := strconv.ParseFloat(fields[1], 64)
+	if err != nil {
+		return nil, err
+	}
+	nice, err := strconv.ParseFloat(fields[2], 64)
+	if err != nil {
+		return nil, err
+	}
+	system, err := strconv.ParseFloat(fields[3], 64)
+	if err != nil {
+		return nil, err
+	}
+	idle, err := strconv.ParseFloat(fields[4], 64)
+	if err != nil {
+		return nil, err
+	}
+	iowait, err := strconv.ParseFloat(fields[5], 64)
+	if err != nil {
+		return nil, err
+	}
+	irq, err := strconv.ParseFloat(fields[6], 64)
+	if err != nil {
+		return nil, err
+	}
+	softirq, err := strconv.ParseFloat(fields[7], 64)
+	if err != nil {
+		return nil, err
+	}
+
+	ct := &TimesStat{
+		CPU:     cpu,
+		User:    float64(user) / cpu_tick,
+		Nice:    float64(nice) / cpu_tick,
+		System:  float64(system) / cpu_tick,
+		Idle:    float64(idle) / cpu_tick,
+		Iowait:  float64(iowait) / cpu_tick,
+		Irq:     float64(irq) / cpu_tick,
+		Softirq: float64(softirq) / cpu_tick,
+	}
+	if len(fields) > 8 { // Linux >= 2.6.11
+		steal, err := strconv.ParseFloat(fields[8], 64)
+		if err != nil {
+			return nil, err
+		}
+		ct.Steal = float64(steal) / cpu_tick
+	}
+	if len(fields) > 9 { // Linux >= 2.6.24
+		guest, err := strconv.ParseFloat(fields[9], 64)
+		if err != nil {
+			return nil, err
+		}
+		ct.Guest = float64(guest) / cpu_tick
+	}
+	if len(fields) > 10 { // Linux >= 3.2.0
+		guestNice, err := strconv.ParseFloat(fields[10], 64)
+		if err != nil {
+			return nil, err
+		}
+		ct.GuestNice = float64(guestNice) / cpu_tick
+	}
+
+	return ct, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go
new file mode 100644
index 0000000000..9f1ea4d772
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go
@@ -0,0 +1,59 @@
+// +build linux freebsd darwin
+
+package cpu
+
+import (
+	"fmt"
+	"time"
+)
+
+func Percent(interval time.Duration, percpu bool) ([]float64, error) {
+	getAllBusy := func(t TimesStat) (float64, float64) {
+		busy := t.User + t.System + t.Nice + t.Iowait + t.Irq +
+			t.Softirq + t.Steal + t.Guest + t.GuestNice + t.Stolen
+		return busy + t.Idle, busy
+	}
+
+	calculate := func(t1, t2 TimesStat) float64 {
+		t1All, t1Busy := getAllBusy(t1)
+		t2All, t2Busy := getAllBusy(t2)
+
+		if t2Busy <= t1Busy {
+			return 0
+		}
+		if t2All <= t1All {
+			return 1
+		}
+		return (t2Busy - t1Busy) / (t2All - t1All) * 100
+	}
+
+	// Get CPU usage at the start of the interval.
+	cpuTimes1, err := Times(percpu)
+	if err != nil {
+		return nil, err
+	}
+
+	if interval > 0 {
+		time.Sleep(interval)
+	}
+
+	// And at the end of the interval.
+	cpuTimes2, err := Times(percpu)
+	if err != nil {
+		return nil, err
+	}
+
+	// Make sure the CPU measurements have the same length.
+	if len(cpuTimes1) != len(cpuTimes2) {
+		return nil, fmt.Errorf(
+			"received two CPU counts: %d != %d",
+			len(cpuTimes1), len(cpuTimes2),
+		)
+	}
+
+	ret := make([]float64, len(cpuTimes1))
+	for i, t := range cpuTimes2 {
+		ret[i] = calculate(cpuTimes1[i], t)
+	}
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go
new file mode 100644
index 0000000000..fbd25e6057
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go
@@ -0,0 +1,105 @@
+// +build windows
+
+package cpu
+
+import (
+	"fmt"
+	"syscall"
+	"time"
+	"unsafe"
+
+	"github.com/StackExchange/wmi"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+type Win32_Processor struct {
+	LoadPercentage            *uint16
+	Family                    uint16
+	Manufacturer              string
+	Name                      string
+	NumberOfLogicalProcessors uint32
+	ProcessorID               *string
+	Stepping                  *string
+	MaxClockSpeed             uint32
+}
+
+// TODO: Get percpu
+func Times(percpu bool) ([]TimesStat, error) {
+	var ret []TimesStat
+
+	var lpIdleTime common.FILETIME
+	var lpKernelTime common.FILETIME
+	var lpUserTime common.FILETIME
+	r, _, _ := common.ProcGetSystemTimes.Call(
+		uintptr(unsafe.Pointer(&lpIdleTime)),
+		uintptr(unsafe.Pointer(&lpKernelTime)),
+		uintptr(unsafe.Pointer(&lpUserTime)))
+	if r == 0 {
+		return ret, syscall.GetLastError()
+	}
+
+	LOT := float64(0.0000001)
+	HIT := (LOT * 4294967296.0)
+	idle := ((HIT * float64(lpIdleTime.DwHighDateTime)) + (LOT * float64(lpIdleTime.DwLowDateTime)))
+	user := ((HIT * float64(lpUserTime.DwHighDateTime)) + (LOT * float64(lpUserTime.DwLowDateTime)))
+	kernel := ((HIT * float64(lpKernelTime.DwHighDateTime)) + (LOT * float64(lpKernelTime.DwLowDateTime)))
+	system := (kernel - idle)
+
+	ret = append(ret, TimesStat{
+		Idle:   float64(idle),
+		User:   float64(user),
+		System: float64(system),
+	})
+	return ret, nil
+}
+
+func Info() ([]InfoStat, error) {
+	var ret []InfoStat
+	var dst []Win32_Processor
+	q := wmi.CreateQuery(&dst, "")
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return ret, err
+	}
+
+	var procID string
+	for i, l := range dst {
+		procID = ""
+		if l.ProcessorID != nil {
+			procID = *l.ProcessorID
+		}
+
+		cpu := InfoStat{
+			CPU:        int32(i),
+			Family:     fmt.Sprintf("%d", l.Family),
+			VendorID:   l.Manufacturer,
+			ModelName:  l.Name,
+			Cores:      int32(l.NumberOfLogicalProcessors),
+			PhysicalID: procID,
+			Mhz:        float64(l.MaxClockSpeed),
+			Flags:      []string{},
+		}
+		ret = append(ret, cpu)
+	}
+
+	return ret, nil
+}
+
+func Percent(interval time.Duration, percpu bool) ([]float64, error) {
+	var ret []float64
+	var dst []Win32_Processor
+	q := wmi.CreateQuery(&dst, "")
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return ret, err
+	}
+	for _, l := range dst {
+		// use range but windows can only get one percent.
+		if l.LoadPercentage == nil {
+			continue
+		}
+		ret = append(ret, float64(*l.LoadPercentage))
+	}
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/doc.go b/vendor/github.com/shirou/gopsutil/doc.go
new file mode 100644
index 0000000000..6a65fe268a
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/doc.go
@@ -0,0 +1 @@
+package gopsutil
diff --git a/vendor/github.com/shirou/gopsutil/host/host.go b/vendor/github.com/shirou/gopsutil/host/host.go
new file mode 100644
index 0000000000..150eb60a7d
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host.go
@@ -0,0 +1,38 @@
+package host
+
+import (
+	"encoding/json"
+)
+
+// A HostInfoStat describes the host status.
+// This is not in the psutil but it useful.
+type InfoStat struct {
+	Hostname             string `json:"hostname"`
+	Uptime               uint64 `json:"uptime"`
+	BootTime             uint64 `json:"bootTime"`
+	Procs                uint64 `json:"procs"`           // number of processes
+	OS                   string `json:"os"`              // ex: freebsd, linux
+	Platform             string `json:"platform"`        // ex: ubuntu, linuxmint
+	PlatformFamily       string `json:"platformFamily"` // ex: debian, rhel
+	PlatformVersion      string `json:"platformVersion"`
+	VirtualizationSystem string `json:"virtualizationSystem"`
+	VirtualizationRole   string `json:"virtualizationRole"` // guest or host
+
+}
+
+type UserStat struct {
+	User     string `json:"user"`
+	Terminal string `json:"terminal"`
+	Host     string `json:"host"`
+	Started  int    `json:"started"`
+}
+
+func (h InfoStat) String() string {
+	s, _ := json.Marshal(h)
+	return string(s)
+}
+
+func (u UserStat) String() string {
+	s, _ := json.Marshal(u)
+	return string(s)
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_darwin.go b/vendor/github.com/shirou/gopsutil/host/host_darwin.go
new file mode 100644
index 0000000000..f4a8c36a26
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_darwin.go
@@ -0,0 +1,152 @@
+// +build darwin
+
+package host
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// from utmpx.h
+const USER_PROCESS = 7
+
+func Info() (*InfoStat, error) {
+	ret := &InfoStat{
+		OS:             runtime.GOOS,
+		PlatformFamily: "darwin",
+	}
+
+	hostname, err := os.Hostname()
+	if err == nil {
+		ret.Hostname = hostname
+	}
+
+	platform, family, version, err := PlatformInformation()
+	if err == nil {
+		ret.Platform = platform
+		ret.PlatformFamily = family
+		ret.PlatformVersion = version
+	}
+	system, role, err := Virtualization()
+	if err == nil {
+		ret.VirtualizationSystem = system
+		ret.VirtualizationRole = role
+	}
+
+	boot, err := BootTime()
+	if err == nil {
+		ret.BootTime = boot
+		ret.Uptime = uptime(boot)
+	}
+
+	return ret, nil
+}
+
+func BootTime() (uint64, error) {
+	values, err := common.DoSysctrl("kern.boottime")
+	if err != nil {
+		return 0, err
+	}
+	// ex: { sec = 1392261637, usec = 627534 } Thu Feb 13 12:20:37 2014
+	v := strings.Replace(values[2], ",", "", 1)
+	boottime, err := strconv.ParseInt(v, 10, 64)
+	if err != nil {
+		return 0, err
+	}
+
+	return uint64(boottime), nil
+}
+
+func uptime(boot uint64) uint64 {
+	return uint64(time.Now().Unix()) - boot
+}
+
+func Uptime() (uint64, error) {
+	boot, err := BootTime()
+	if err != nil {
+		return 0, err
+	}
+	return uptime(boot), nil
+}
+
+func Users() ([]UserStat, error) {
+	utmpfile := "/var/run/utmpx"
+	var ret []UserStat
+
+	file, err := os.Open(utmpfile)
+	if err != nil {
+		return ret, err
+	}
+
+	buf, err := ioutil.ReadAll(file)
+	if err != nil {
+		return ret, err
+	}
+
+	u := Utmpx{}
+	entrySize := int(unsafe.Sizeof(u))
+	count := len(buf) / entrySize
+
+	for i := 0; i < count; i++ {
+		b := buf[i*entrySize : i*entrySize+entrySize]
+
+		var u Utmpx
+		br := bytes.NewReader(b)
+		err := binary.Read(br, binary.LittleEndian, &u)
+		if err != nil {
+			continue
+		}
+		if u.Type != USER_PROCESS {
+			continue
+		}
+		user := UserStat{
+			User:     common.IntToString(u.User[:]),
+			Terminal: common.IntToString(u.Line[:]),
+			Host:     common.IntToString(u.Host[:]),
+			Started:  int(u.Tv.Sec),
+		}
+		ret = append(ret, user)
+	}
+
+	return ret, nil
+
+}
+
+func PlatformInformation() (string, string, string, error) {
+	platform := ""
+	family := ""
+	version := ""
+
+	uname, err := exec.LookPath("uname")
+	if err != nil {
+		return "", "", "", err
+	}
+	out, err := exec.Command(uname, "-s").Output()
+	if err == nil {
+		platform = strings.ToLower(strings.TrimSpace(string(out)))
+	}
+
+	out, err = exec.Command(uname, "-r").Output()
+	if err == nil {
+		version = strings.ToLower(strings.TrimSpace(string(out)))
+	}
+
+	return platform, family, version, nil
+}
+
+func Virtualization() (string, string, error) {
+	system := ""
+	role := ""
+
+	return system, role, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_darwin_amd64.go b/vendor/github.com/shirou/gopsutil/host/host_darwin_amd64.go
new file mode 100644
index 0000000000..c3596f9f5e
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_darwin_amd64.go
@@ -0,0 +1,19 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+package host
+
+type Utmpx struct {
+	User      [256]int8
+	ID        [4]int8
+	Line      [32]int8
+	Pid       int32
+	Type      int16
+	Pad_cgo_0 [6]byte
+	Tv        Timeval
+	Host      [256]int8
+	Pad       [16]uint32
+}
+type Timeval struct {
+	Sec int32
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_freebsd.go b/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
new file mode 100644
index 0000000000..06142e1c80
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
@@ -0,0 +1,196 @@
+// +build freebsd
+
+package host
+
+import (
+	"bytes"
+	"encoding/binary"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+const (
+	UTNameSize = 16 /* see MAXLOGNAME in <sys/param.h> */
+	UTLineSize = 8
+	UTHostSize = 16
+)
+
+func Info() (*InfoStat, error) {
+	ret := &InfoStat{
+		OS:             runtime.GOOS,
+		PlatformFamily: "freebsd",
+	}
+
+	hostname, err := os.Hostname()
+	if err == nil {
+		ret.Hostname = hostname
+	}
+
+	platform, family, version, err := PlatformInformation()
+	if err == nil {
+		ret.Platform = platform
+		ret.PlatformFamily = family
+		ret.PlatformVersion = version
+	}
+	system, role, err := Virtualization()
+	if err == nil {
+		ret.VirtualizationSystem = system
+		ret.VirtualizationRole = role
+	}
+
+	boot, err := BootTime()
+	if err == nil {
+		ret.BootTime = boot
+		ret.Uptime = uptime(boot)
+	}
+
+	return ret, nil
+}
+
+func BootTime() (uint64, error) {
+	values, err := common.DoSysctrl("kern.boottime")
+	if err != nil {
+		return 0, err
+	}
+	// ex: { sec = 1392261637, usec = 627534 } Thu Feb 13 12:20:37 2014
+	v := strings.Replace(values[2], ",", "", 1)
+
+	boottime, err := strconv.ParseUint(v, 10, 64)
+	if err != nil {
+		return 0, err
+	}
+
+	return boottime, nil
+}
+
+func uptime(boot uint64) uint64 {
+	return uint64(time.Now().Unix()) - boot
+}
+
+func Uptime() (uint64, error) {
+	boot, err := BootTime()
+	if err != nil {
+		return 0, err
+	}
+	return uptime(boot), nil
+}
+
+func Users() ([]UserStat, error) {
+	utmpfile := "/var/run/utx.active"
+	if !common.PathExists(utmpfile) {
+		utmpfile = "/var/run/utmp" // before 9.0
+		return getUsersFromUtmp(utmpfile)
+	}
+
+	var ret []UserStat
+	file, err := os.Open(utmpfile)
+	if err != nil {
+		return ret, err
+	}
+
+	buf, err := ioutil.ReadAll(file)
+	if err != nil {
+		return ret, err
+	}
+
+	u := Utmpx{}
+	entrySize := int(unsafe.Sizeof(u)) - 3
+	entrySize = 197 // TODO: why should 197
+	count := len(buf) / entrySize
+
+	for i := 0; i < count; i++ {
+		b := buf[i*entrySize : i*entrySize+entrySize]
+		var u Utmpx
+		br := bytes.NewReader(b)
+		err := binary.Read(br, binary.LittleEndian, &u)
+		if err != nil || u.Type != 4 {
+			continue
+		}
+		sec := (binary.LittleEndian.Uint32(u.Tv.Sec[:])) / 2 // TODO:
+		user := UserStat{
+			User:     common.IntToString(u.User[:]),
+			Terminal: common.IntToString(u.Line[:]),
+			Host:     common.IntToString(u.Host[:]),
+			Started:  int(sec),
+		}
+
+		ret = append(ret, user)
+	}
+
+	return ret, nil
+
+}
+
+func PlatformInformation() (string, string, string, error) {
+	platform := ""
+	family := ""
+	version := ""
+	uname, err := exec.LookPath("uname")
+	if err != nil {
+		return "", "", "", err
+	}
+
+	out, err := exec.Command(uname, "-s").Output()
+	if err == nil {
+		platform = strings.ToLower(strings.TrimSpace(string(out)))
+	}
+
+	out, err = exec.Command(uname, "-r").Output()
+	if err == nil {
+		version = strings.ToLower(strings.TrimSpace(string(out)))
+	}
+
+	return platform, family, version, nil
+}
+
+func Virtualization() (string, string, error) {
+	system := ""
+	role := ""
+
+	return system, role, nil
+}
+
+// before 9.0
+func getUsersFromUtmp(utmpfile string) ([]UserStat, error) {
+	var ret []UserStat
+	file, err := os.Open(utmpfile)
+	if err != nil {
+		return ret, err
+	}
+	buf, err := ioutil.ReadAll(file)
+	if err != nil {
+		return ret, err
+	}
+
+	u := Utmp{}
+	entrySize := int(unsafe.Sizeof(u))
+	count := len(buf) / entrySize
+
+	for i := 0; i < count; i++ {
+		b := buf[i*entrySize : i*entrySize+entrySize]
+		var u Utmp
+		br := bytes.NewReader(b)
+		err := binary.Read(br, binary.LittleEndian, &u)
+		if err != nil || u.Time == 0 {
+			continue
+		}
+		user := UserStat{
+			User:     common.IntToString(u.Name[:]),
+			Terminal: common.IntToString(u.Line[:]),
+			Host:     common.IntToString(u.Host[:]),
+			Started:  int(u.Time),
+		}
+
+		ret = append(ret, user)
+	}
+
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_freebsd_amd64.go b/vendor/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
new file mode 100644
index 0000000000..9a4c0a47ac
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
@@ -0,0 +1,41 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package host
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Utmp struct {
+	Line [8]int8
+	Name [16]int8
+	Host [16]int8
+	Time int32
+}
+type Utmpx struct {
+	Type int16
+	Tv   Timeval
+	ID   [8]int8
+	Pid  int32
+	User [32]int8
+	Line [16]int8
+	Host [125]int8
+	//	Host [128]int8
+	//	X__ut_spare [64]int8
+}
+type Timeval struct {
+	Sec  [4]byte
+	Usec [3]byte
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux.go b/vendor/github.com/shirou/gopsutil/host/host_linux.go
new file mode 100644
index 0000000000..f56906c28f
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux.go
@@ -0,0 +1,431 @@
+// +build linux
+
+package host
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"regexp"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+type LSB struct {
+	ID          string
+	Release     string
+	Codename    string
+	Description string
+}
+
+// from utmp.h
+const USER_PROCESS = 7
+
+func Info() (*InfoStat, error) {
+	ret := &InfoStat{
+		OS: runtime.GOOS,
+	}
+
+	hostname, err := os.Hostname()
+	if err == nil {
+		ret.Hostname = hostname
+	}
+
+	platform, family, version, err := PlatformInformation()
+	if err == nil {
+		ret.Platform = platform
+		ret.PlatformFamily = family
+		ret.PlatformVersion = version
+	}
+	system, role, err := Virtualization()
+	if err == nil {
+		ret.VirtualizationSystem = system
+		ret.VirtualizationRole = role
+	}
+	boot, err := BootTime()
+	if err == nil {
+		ret.BootTime = boot
+		ret.Uptime = uptime(boot)
+	}
+
+	return ret, nil
+}
+
+// BootTime returns the system boot time expressed in seconds since the epoch.
+func BootTime() (uint64, error) {
+	filename := common.HostProc("stat")
+	lines, err := common.ReadLines(filename)
+	if err != nil {
+		return 0, err
+	}
+	for _, line := range lines {
+		if strings.HasPrefix(line, "btime") {
+			f := strings.Fields(line)
+			if len(f) != 2 {
+				return 0, fmt.Errorf("wrong btime format")
+			}
+			b, err := strconv.ParseInt(f[1], 10, 64)
+			if err != nil {
+				return 0, err
+			}
+			return uint64(b), nil
+		}
+	}
+
+	return 0, fmt.Errorf("could not find btime")
+}
+
+func uptime(boot uint64) uint64 {
+	return uint64(time.Now().Unix()) - boot
+}
+
+func Uptime() (uint64, error) {
+	boot, err := BootTime()
+	if err != nil {
+		return 0, err
+	}
+	return uptime(boot), nil
+}
+
+func Users() ([]UserStat, error) {
+	utmpfile := "/var/run/utmp"
+
+	file, err := os.Open(utmpfile)
+	if err != nil {
+		return nil, err
+	}
+
+	buf, err := ioutil.ReadAll(file)
+	if err != nil {
+		return nil, err
+	}
+
+	u := utmp{}
+	entrySize := int(unsafe.Sizeof(u))
+	count := len(buf) / entrySize
+
+	ret := make([]UserStat, 0, count)
+
+	for i := 0; i < count; i++ {
+		b := buf[i*entrySize : i*entrySize+entrySize]
+
+		var u utmp
+		br := bytes.NewReader(b)
+		err := binary.Read(br, binary.LittleEndian, &u)
+		if err != nil {
+			continue
+		}
+		if u.Type != USER_PROCESS {
+			continue
+		}
+		user := UserStat{
+			User:     common.IntToString(u.User[:]),
+			Terminal: common.IntToString(u.Line[:]),
+			Host:     common.IntToString(u.Host[:]),
+			Started:  int(u.Tv.TvSec),
+		}
+		ret = append(ret, user)
+	}
+
+	return ret, nil
+
+}
+
+func getLSB() (*LSB, error) {
+	ret := &LSB{}
+	if common.PathExists(common.HostEtc("lsb-release")) {
+		contents, err := common.ReadLines(common.HostEtc("lsb-release"))
+		if err != nil {
+			return ret, err // return empty
+		}
+		for _, line := range contents {
+			field := strings.Split(line, "=")
+			if len(field) < 2 {
+				continue
+			}
+			switch field[0] {
+			case "DISTRIB_ID":
+				ret.ID = field[1]
+			case "DISTRIB_RELEASE":
+				ret.Release = field[1]
+			case "DISTRIB_CODENAME":
+				ret.Codename = field[1]
+			case "DISTRIB_DESCRIPTION":
+				ret.Description = field[1]
+			}
+		}
+	} else if common.PathExists("/usr/bin/lsb_release") {
+		lsb_release, err := exec.LookPath("/usr/bin/lsb_release")
+		if err != nil {
+			return ret, err
+		}
+		out, err := exec.Command(lsb_release).Output()
+		if err != nil {
+			return ret, err
+		}
+		for _, line := range strings.Split(string(out), "\n") {
+			field := strings.Split(line, ":")
+			if len(field) < 2 {
+				continue
+			}
+			switch field[0] {
+			case "Distributor ID":
+				ret.ID = field[1]
+			case "Release":
+				ret.Release = field[1]
+			case "Codename":
+				ret.Codename = field[1]
+			case "Description":
+				ret.Description = field[1]
+			}
+		}
+
+	}
+
+	return ret, nil
+}
+
+func PlatformInformation() (platform string, family string, version string, err error) {
+
+	lsb, err := getLSB()
+	if err != nil {
+		lsb = &LSB{}
+	}
+
+	if common.PathExists(common.HostEtc("oracle-release")) {
+		platform = "oracle"
+		contents, err := common.ReadLines(common.HostEtc("oracle-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+		}
+
+	} else if common.PathExists(common.HostEtc("enterprise-release")) {
+		platform = "oracle"
+		contents, err := common.ReadLines(common.HostEtc("enterprise-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+		}
+	} else if common.PathExists(common.HostEtc("debian_version")) {
+		if lsb.ID == "Ubuntu" {
+			platform = "ubuntu"
+			version = lsb.Release
+		} else if lsb.ID == "LinuxMint" {
+			platform = "linuxmint"
+			version = lsb.Release
+		} else {
+			if common.PathExists("/usr/bin/raspi-config") {
+				platform = "raspbian"
+			} else {
+				platform = "debian"
+			}
+			contents, err := common.ReadLines(common.HostEtc("debian_version"))
+			if err == nil {
+				version = contents[0]
+			}
+		}
+	} else if common.PathExists(common.HostEtc("redhat-release")) {
+		contents, err := common.ReadLines(common.HostEtc("redhat-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+			platform = getRedhatishPlatform(contents)
+		}
+	} else if common.PathExists(common.HostEtc("system-release")) {
+		contents, err := common.ReadLines(common.HostEtc("system-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+			platform = getRedhatishPlatform(contents)
+		}
+	} else if common.PathExists(common.HostEtc("gentoo-release")) {
+		platform = "gentoo"
+		contents, err := common.ReadLines(common.HostEtc("gentoo-release"))
+		if err == nil {
+			version = getRedhatishVersion(contents)
+		}
+	} else if common.PathExists(common.HostEtc("SuSE-release")) {
+		contents, err := common.ReadLines(common.HostEtc("SuSE-release"))
+		if err == nil {
+			version = getSuseVersion(contents)
+			platform = getSusePlatform(contents)
+		}
+		// TODO: slackware detecion
+	} else if common.PathExists(common.HostEtc("arch-release")) {
+		platform = "arch"
+		version = lsb.Release
+	} else if lsb.ID == "RedHat" {
+		platform = "redhat"
+		version = lsb.Release
+	} else if lsb.ID == "Amazon" {
+		platform = "amazon"
+		version = lsb.Release
+	} else if lsb.ID == "ScientificSL" {
+		platform = "scientific"
+		version = lsb.Release
+	} else if lsb.ID == "XenServer" {
+		platform = "xenserver"
+		version = lsb.Release
+	} else if lsb.ID != "" {
+		platform = strings.ToLower(lsb.ID)
+		version = lsb.Release
+	}
+
+	switch platform {
+	case "debian", "ubuntu", "linuxmint", "raspbian":
+		family = "debian"
+	case "fedora":
+		family = "fedora"
+	case "oracle", "centos", "redhat", "scientific", "enterpriseenterprise", "amazon", "xenserver", "cloudlinux", "ibm_powerkvm":
+		family = "rhel"
+	case "suse", "opensuse":
+		family = "suse"
+	case "gentoo":
+		family = "gentoo"
+	case "slackware":
+		family = "slackware"
+	case "arch":
+		family = "arch"
+	case "exherbo":
+		family = "exherbo"
+	}
+
+	return platform, family, version, nil
+
+}
+
+func getRedhatishVersion(contents []string) string {
+	c := strings.ToLower(strings.Join(contents, ""))
+
+	if strings.Contains(c, "rawhide") {
+		return "rawhide"
+	}
+	if matches := regexp.MustCompile(`release (\d[\d.]*)`).FindStringSubmatch(c); matches != nil {
+		return matches[1]
+	}
+	return ""
+}
+
+func getRedhatishPlatform(contents []string) string {
+	c := strings.ToLower(strings.Join(contents, ""))
+
+	if strings.Contains(c, "red hat") {
+		return "redhat"
+	}
+	f := strings.Split(c, " ")
+
+	return f[0]
+}
+
+func getSuseVersion(contents []string) string {
+	version := ""
+	for _, line := range contents {
+		if matches := regexp.MustCompile(`VERSION = ([\d.]+)`).FindStringSubmatch(line); matches != nil {
+			version = matches[1]
+		} else if matches := regexp.MustCompile(`PATCHLEVEL = ([\d]+)`).FindStringSubmatch(line); matches != nil {
+			version = version + "." + matches[1]
+		}
+	}
+	return version
+}
+
+func getSusePlatform(contents []string) string {
+	c := strings.ToLower(strings.Join(contents, ""))
+	if strings.Contains(c, "opensuse") {
+		return "opensuse"
+	}
+	return "suse"
+}
+
+func Virtualization() (string, string, error) {
+	var system string
+	var role string
+
+	filename := common.HostProc("xen")
+	if common.PathExists(filename) {
+		system = "xen"
+		role = "guest" // assume guest
+
+		if common.PathExists(filename + "/capabilities") {
+			contents, err := common.ReadLines(filename + "/capabilities")
+			if err == nil {
+				if common.StringsHas(contents, "control_d") {
+					role = "host"
+				}
+			}
+		}
+	}
+
+	filename = common.HostProc("modules")
+	if common.PathExists(filename) {
+		contents, err := common.ReadLines(filename)
+		if err == nil {
+			if common.StringsContains(contents, "kvm") {
+				system = "kvm"
+				role = "host"
+			} else if common.StringsContains(contents, "vboxdrv") {
+				system = "vbox"
+				role = "host"
+			} else if common.StringsContains(contents, "vboxguest") {
+				system = "vbox"
+				role = "guest"
+			}
+		}
+	}
+
+	filename = common.HostProc("cpuinfo")
+	if common.PathExists(filename) {
+		contents, err := common.ReadLines(filename)
+		if err == nil {
+			if common.StringsHas(contents, "QEMU Virtual CPU") ||
+				common.StringsHas(contents, "Common KVM processor") ||
+				common.StringsHas(contents, "Common 32-bit KVM processor") {
+				system = "kvm"
+				role = "guest"
+			}
+		}
+	}
+
+	filename = common.HostProc()
+	if common.PathExists(filename + "/bc/0") {
+		system = "openvz"
+		role = "host"
+	} else if common.PathExists(filename + "/vz") {
+		system = "openvz"
+		role = "guest"
+	}
+
+	// not use dmidecode because it requires root
+	if common.PathExists(filename + "/self/status") {
+		contents, err := common.ReadLines(filename + "/self/status")
+		if err == nil {
+
+			if common.StringsHas(contents, "s_context:") ||
+				common.StringsHas(contents, "VxID:") {
+				system = "linux-vserver"
+			}
+			// TODO: guest or host
+		}
+	}
+
+	if common.PathExists(filename + "/self/cgroup") {
+		contents, err := common.ReadLines(filename + "/self/cgroup")
+		if err == nil {
+			if common.StringsHas(contents, "lxc") ||
+				common.StringsHas(contents, "docker") {
+				system = "lxc"
+				role = "guest"
+			} else if common.PathExists("/usr/bin/lxc-version") { // TODO: which
+				system = "lxc"
+				role = "host"
+			}
+		}
+	}
+
+	return system, role, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux_386.go b/vendor/github.com/shirou/gopsutil/host/host_linux_386.go
new file mode 100644
index 0000000000..cab9feed41
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux_386.go
@@ -0,0 +1,44 @@
+// ATTENTION - FILE MANUAL FIXED AFTER CGO.
+// Fixed line: Tv		_Ctype_struct_timeval -> Tv		UtTv
+// Created by cgo -godefs, MANUAL FIXED
+// cgo -godefs types_linux.go
+
+package host
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type utmp struct {
+	Type      int16
+	Pad_cgo_0 [2]byte
+	Pid       int32
+	Line      [32]int8
+	ID        [4]int8
+	User      [32]int8
+	Host      [256]int8
+	Exit      exit_status
+	Session   int32
+	Tv        UtTv
+	Addr_v6   [4]int32
+	X__unused [20]int8
+}
+type exit_status struct {
+	Termination int16
+	Exit        int16
+}
+type UtTv struct {
+	TvSec  int32
+	TvUsec int32
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux_amd64.go b/vendor/github.com/shirou/gopsutil/host/host_linux_amd64.go
new file mode 100644
index 0000000000..180394bbf4
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux_amd64.go
@@ -0,0 +1,42 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package host
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type utmp struct {
+	Type              int16
+	Pad_cgo_0         [2]byte
+	Pid               int32
+	Line              [32]int8
+	ID                [4]int8
+	User              [32]int8
+	Host              [256]int8
+	Exit              exit_status
+	Session           int32
+	Tv                UtTv
+	Addr_v6           [4]int32
+	X__glibc_reserved [20]int8
+}
+type exit_status struct {
+	Termination int16
+	Exit        int16
+}
+type UtTv struct {
+	TvSec  int32
+	TvUsec int32
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux_arm.go b/vendor/github.com/shirou/gopsutil/host/host_linux_arm.go
new file mode 100644
index 0000000000..5f7e168b61
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux_arm.go
@@ -0,0 +1,42 @@
+// +build linux
+// +build arm
+
+package host
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type utmp struct {
+	Type              int16
+	Pad_cgo_0         [2]byte
+	Pid               int32
+	Line              [32]int8
+	ID                [4]int8
+	User              [32]int8
+	Host              [256]int8
+	Exit              exit_status
+	Session           int32
+	Tv                UtTv
+	Addr_v6           [4]int32
+	X__glibc_reserved [20]int8
+}
+type exit_status struct {
+	Termination int16
+	Exit        int16
+}
+type UtTv struct {
+	TvSec  int32
+	TvUsec int32
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_windows.go b/vendor/github.com/shirou/gopsutil/host/host_windows.go
new file mode 100644
index 0000000000..29f900c6e2
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_windows.go
@@ -0,0 +1,135 @@
+// +build windows
+
+package host
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"strings"
+	"time"
+
+	"github.com/StackExchange/wmi"
+
+	"github.com/shirou/gopsutil/internal/common"
+	process "github.com/shirou/gopsutil/process"
+)
+
+var (
+	procGetSystemTimeAsFileTime = common.Modkernel32.NewProc("GetSystemTimeAsFileTime")
+	osInfo                      *Win32_OperatingSystem
+)
+
+type Win32_OperatingSystem struct {
+	Version        string
+	Caption        string
+	ProductType    uint32
+	BuildNumber    string
+	LastBootUpTime time.Time
+}
+
+func Info() (*InfoStat, error) {
+	ret := &InfoStat{
+		OS: runtime.GOOS,
+	}
+
+	hostname, err := os.Hostname()
+	if err == nil {
+		ret.Hostname = hostname
+	}
+
+	platform, family, version, err := PlatformInformation()
+	if err == nil {
+		ret.Platform = platform
+		ret.PlatformFamily = family
+		ret.PlatformVersion = version
+	} else {
+		return ret, err
+	}
+
+	boot, err := BootTime()
+	if err == nil {
+		ret.BootTime = boot
+		ret.Uptime = uptime(boot)
+	}
+
+	procs, err := process.Pids()
+	if err != nil {
+		return ret, err
+	}
+
+	ret.Procs = uint64(len(procs))
+
+	return ret, nil
+}
+
+func GetOSInfo() (Win32_OperatingSystem, error) {
+	var dst []Win32_OperatingSystem
+	q := wmi.CreateQuery(&dst, "")
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return Win32_OperatingSystem{}, err
+	}
+
+	osInfo = &dst[0]
+
+	return dst[0], nil
+}
+
+func BootTime() (uint64, error) {
+	if osInfo == nil {
+		_, err := GetOSInfo()
+		if err != nil {
+			return 0, err
+		}
+	}
+	now := time.Now()
+	t := osInfo.LastBootUpTime.Local()
+	return uint64(now.Sub(t).Seconds()), nil
+}
+
+func uptime(boot uint64) uint64 {
+	return uint64(time.Now().Unix()) - boot
+}
+
+func Uptime() (uint64, error) {
+	boot, err := BootTime()
+	if err != nil {
+		return 0, err
+	}
+	return uptime(boot), nil
+}
+
+func PlatformInformation() (platform string, family string, version string, err error) {
+	if osInfo == nil {
+		_, err = GetOSInfo()
+		if err != nil {
+			return
+		}
+	}
+
+	// Platform
+	platform = strings.Trim(osInfo.Caption, " ")
+
+	// PlatformFamily
+	switch osInfo.ProductType {
+	case 1:
+		family = "Standalone Workstation"
+	case 2:
+		family = "Server (Domain Controller)"
+	case 3:
+		family = "Server"
+	}
+
+	// Platform Version
+	version = fmt.Sprintf("%s Build %s", osInfo.Version, osInfo.BuildNumber)
+
+	return
+}
+
+func Users() ([]UserStat, error) {
+
+	var ret []UserStat
+
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/types_darwin.go b/vendor/github.com/shirou/gopsutil/host/types_darwin.go
new file mode 100644
index 0000000000..b858227885
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/types_darwin.go
@@ -0,0 +1,17 @@
+// +build ignore
+// plus hand editing about timeval
+
+/*
+Input to cgo -godefs.
+*/
+
+package host
+
+/*
+#include <sys/time.h>
+#include <utmpx.h>
+*/
+import "C"
+
+type Utmpx C.struct_utmpx
+type Timeval C.struct_timeval
diff --git a/vendor/github.com/shirou/gopsutil/host/types_freebsd.go b/vendor/github.com/shirou/gopsutil/host/types_freebsd.go
new file mode 100644
index 0000000000..113b22eeaf
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/types_freebsd.go
@@ -0,0 +1,43 @@
+// +build ignore
+
+/*
+Input to cgo -godefs.
+*/
+
+package host
+
+/*
+#define KERNEL
+#include <sys/types.h>
+#include <sys/time.h>
+#include <utmpx.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+type Utmp C.struct_utmp
+type Utmpx C.struct_utmpx
+type Timeval C.struct_timeval
diff --git a/vendor/github.com/shirou/gopsutil/host/types_linux.go b/vendor/github.com/shirou/gopsutil/host/types_linux.go
new file mode 100644
index 0000000000..928545515c
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/types_linux.go
@@ -0,0 +1,45 @@
+// +build ignore
+
+/*
+Input to cgo -godefs.
+*/
+
+package host
+
+/*
+#define KERNEL
+#include <sys/types.h>
+#include <utmp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+type utmp C.struct_utmp
+type exit_status C.struct_exit_status
+type UtTv struct {
+	TvSec  int32
+	TvUsec int32
+}
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/binary.go b/vendor/github.com/shirou/gopsutil/internal/common/binary.go
new file mode 100644
index 0000000000..9b5dc55b49
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/internal/common/binary.go
@@ -0,0 +1,634 @@
+package common
+
+// Copyright 2009 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package binary implements simple translation between numbers and byte
+// sequences and encoding and decoding of varints.
+//
+// Numbers are translated by reading and writing fixed-size values.
+// A fixed-size value is either a fixed-size arithmetic
+// type (int8, uint8, int16, float32, complex64, ...)
+// or an array or struct containing only fixed-size values.
+//
+// The varint functions encode and decode single integer values using
+// a variable-length encoding; smaller values require fewer bytes.
+// For a specification, see
+// http://code.google.com/apis/protocolbuffers/docs/encoding.html.
+//
+// This package favors simplicity over efficiency. Clients that require
+// high-performance serialization, especially for large data structures,
+// should look at more advanced solutions such as the encoding/gob
+// package or protocol buffers.
+import (
+	"errors"
+	"io"
+	"math"
+	"reflect"
+)
+
+// A ByteOrder specifies how to convert byte sequences into
+// 16-, 32-, or 64-bit unsigned integers.
+type ByteOrder interface {
+	Uint16([]byte) uint16
+	Uint32([]byte) uint32
+	Uint64([]byte) uint64
+	PutUint16([]byte, uint16)
+	PutUint32([]byte, uint32)
+	PutUint64([]byte, uint64)
+	String() string
+}
+
+// LittleEndian is the little-endian implementation of ByteOrder.
+var LittleEndian littleEndian
+
+// BigEndian is the big-endian implementation of ByteOrder.
+var BigEndian bigEndian
+
+type littleEndian struct{}
+
+func (littleEndian) Uint16(b []byte) uint16 { return uint16(b[0]) | uint16(b[1])<<8 }
+
+func (littleEndian) PutUint16(b []byte, v uint16) {
+	b[0] = byte(v)
+	b[1] = byte(v >> 8)
+}
+
+func (littleEndian) Uint32(b []byte) uint32 {
+	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+}
+
+func (littleEndian) PutUint32(b []byte, v uint32) {
+	b[0] = byte(v)
+	b[1] = byte(v >> 8)
+	b[2] = byte(v >> 16)
+	b[3] = byte(v >> 24)
+}
+
+func (littleEndian) Uint64(b []byte) uint64 {
+	return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
+		uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+}
+
+func (littleEndian) PutUint64(b []byte, v uint64) {
+	b[0] = byte(v)
+	b[1] = byte(v >> 8)
+	b[2] = byte(v >> 16)
+	b[3] = byte(v >> 24)
+	b[4] = byte(v >> 32)
+	b[5] = byte(v >> 40)
+	b[6] = byte(v >> 48)
+	b[7] = byte(v >> 56)
+}
+
+func (littleEndian) String() string { return "LittleEndian" }
+
+func (littleEndian) GoString() string { return "binary.LittleEndian" }
+
+type bigEndian struct{}
+
+func (bigEndian) Uint16(b []byte) uint16 { return uint16(b[1]) | uint16(b[0])<<8 }
+
+func (bigEndian) PutUint16(b []byte, v uint16) {
+	b[0] = byte(v >> 8)
+	b[1] = byte(v)
+}
+
+func (bigEndian) Uint32(b []byte) uint32 {
+	return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
+}
+
+func (bigEndian) PutUint32(b []byte, v uint32) {
+	b[0] = byte(v >> 24)
+	b[1] = byte(v >> 16)
+	b[2] = byte(v >> 8)
+	b[3] = byte(v)
+}
+
+func (bigEndian) Uint64(b []byte) uint64 {
+	return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
+		uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
+}
+
+func (bigEndian) PutUint64(b []byte, v uint64) {
+	b[0] = byte(v >> 56)
+	b[1] = byte(v >> 48)
+	b[2] = byte(v >> 40)
+	b[3] = byte(v >> 32)
+	b[4] = byte(v >> 24)
+	b[5] = byte(v >> 16)
+	b[6] = byte(v >> 8)
+	b[7] = byte(v)
+}
+
+func (bigEndian) String() string { return "BigEndian" }
+
+func (bigEndian) GoString() string { return "binary.BigEndian" }
+
+// Read reads structured binary data from r into data.
+// Data must be a pointer to a fixed-size value or a slice
+// of fixed-size values.
+// Bytes read from r are decoded using the specified byte order
+// and written to successive fields of the data.
+// When reading into structs, the field data for fields with
+// blank (_) field names is skipped; i.e., blank field names
+// may be used for padding.
+// When reading into a struct, all non-blank fields must be exported.
+func Read(r io.Reader, order ByteOrder, data interface{}) error {
+	// Fast path for basic types and slices.
+	if n := intDataSize(data); n != 0 {
+		var b [8]byte
+		var bs []byte
+		if n > len(b) {
+			bs = make([]byte, n)
+		} else {
+			bs = b[:n]
+		}
+		if _, err := io.ReadFull(r, bs); err != nil {
+			return err
+		}
+		switch data := data.(type) {
+		case *int8:
+			*data = int8(b[0])
+		case *uint8:
+			*data = b[0]
+		case *int16:
+			*data = int16(order.Uint16(bs))
+		case *uint16:
+			*data = order.Uint16(bs)
+		case *int32:
+			*data = int32(order.Uint32(bs))
+		case *uint32:
+			*data = order.Uint32(bs)
+		case *int64:
+			*data = int64(order.Uint64(bs))
+		case *uint64:
+			*data = order.Uint64(bs)
+		case []int8:
+			for i, x := range bs { // Easier to loop over the input for 8-bit values.
+				data[i] = int8(x)
+			}
+		case []uint8:
+			copy(data, bs)
+		case []int16:
+			for i := range data {
+				data[i] = int16(order.Uint16(bs[2*i:]))
+			}
+		case []uint16:
+			for i := range data {
+				data[i] = order.Uint16(bs[2*i:])
+			}
+		case []int32:
+			for i := range data {
+				data[i] = int32(order.Uint32(bs[4*i:]))
+			}
+		case []uint32:
+			for i := range data {
+				data[i] = order.Uint32(bs[4*i:])
+			}
+		case []int64:
+			for i := range data {
+				data[i] = int64(order.Uint64(bs[8*i:]))
+			}
+		case []uint64:
+			for i := range data {
+				data[i] = order.Uint64(bs[8*i:])
+			}
+		}
+		return nil
+	}
+
+	// Fallback to reflect-based decoding.
+	v := reflect.ValueOf(data)
+	size := -1
+	switch v.Kind() {
+	case reflect.Ptr:
+		v = v.Elem()
+		size = dataSize(v)
+	case reflect.Slice:
+		size = dataSize(v)
+	}
+	if size < 0 {
+		return errors.New("binary.Read: invalid type " + reflect.TypeOf(data).String())
+	}
+	d := &decoder{order: order, buf: make([]byte, size)}
+	if _, err := io.ReadFull(r, d.buf); err != nil {
+		return err
+	}
+	d.value(v)
+	return nil
+}
+
+// Write writes the binary representation of data into w.
+// Data must be a fixed-size value or a slice of fixed-size
+// values, or a pointer to such data.
+// Bytes written to w are encoded using the specified byte order
+// and read from successive fields of the data.
+// When writing structs, zero values are written for fields
+// with blank (_) field names.
+func Write(w io.Writer, order ByteOrder, data interface{}) error {
+	// Fast path for basic types and slices.
+	if n := intDataSize(data); n != 0 {
+		var b [8]byte
+		var bs []byte
+		if n > len(b) {
+			bs = make([]byte, n)
+		} else {
+			bs = b[:n]
+		}
+		switch v := data.(type) {
+		case *int8:
+			bs = b[:1]
+			b[0] = byte(*v)
+		case int8:
+			bs = b[:1]
+			b[0] = byte(v)
+		case []int8:
+			for i, x := range v {
+				bs[i] = byte(x)
+			}
+		case *uint8:
+			bs = b[:1]
+			b[0] = *v
+		case uint8:
+			bs = b[:1]
+			b[0] = byte(v)
+		case []uint8:
+			bs = v
+		case *int16:
+			bs = b[:2]
+			order.PutUint16(bs, uint16(*v))
+		case int16:
+			bs = b[:2]
+			order.PutUint16(bs, uint16(v))
+		case []int16:
+			for i, x := range v {
+				order.PutUint16(bs[2*i:], uint16(x))
+			}
+		case *uint16:
+			bs = b[:2]
+			order.PutUint16(bs, *v)
+		case uint16:
+			bs = b[:2]
+			order.PutUint16(bs, v)
+		case []uint16:
+			for i, x := range v {
+				order.PutUint16(bs[2*i:], x)
+			}
+		case *int32:
+			bs = b[:4]
+			order.PutUint32(bs, uint32(*v))
+		case int32:
+			bs = b[:4]
+			order.PutUint32(bs, uint32(v))
+		case []int32:
+			for i, x := range v {
+				order.PutUint32(bs[4*i:], uint32(x))
+			}
+		case *uint32:
+			bs = b[:4]
+			order.PutUint32(bs, *v)
+		case uint32:
+			bs = b[:4]
+			order.PutUint32(bs, v)
+		case []uint32:
+			for i, x := range v {
+				order.PutUint32(bs[4*i:], x)
+			}
+		case *int64:
+			bs = b[:8]
+			order.PutUint64(bs, uint64(*v))
+		case int64:
+			bs = b[:8]
+			order.PutUint64(bs, uint64(v))
+		case []int64:
+			for i, x := range v {
+				order.PutUint64(bs[8*i:], uint64(x))
+			}
+		case *uint64:
+			bs = b[:8]
+			order.PutUint64(bs, *v)
+		case uint64:
+			bs = b[:8]
+			order.PutUint64(bs, v)
+		case []uint64:
+			for i, x := range v {
+				order.PutUint64(bs[8*i:], x)
+			}
+		}
+		_, err := w.Write(bs)
+		return err
+	}
+
+	// Fallback to reflect-based encoding.
+	v := reflect.Indirect(reflect.ValueOf(data))
+	size := dataSize(v)
+	if size < 0 {
+		return errors.New("binary.Write: invalid type " + reflect.TypeOf(data).String())
+	}
+	buf := make([]byte, size)
+	e := &encoder{order: order, buf: buf}
+	e.value(v)
+	_, err := w.Write(buf)
+	return err
+}
+
+// Size returns how many bytes Write would generate to encode the value v, which
+// must be a fixed-size value or a slice of fixed-size values, or a pointer to such data.
+// If v is neither of these, Size returns -1.
+func Size(v interface{}) int {
+	return dataSize(reflect.Indirect(reflect.ValueOf(v)))
+}
+
+// dataSize returns the number of bytes the actual data represented by v occupies in memory.
+// For compound structures, it sums the sizes of the elements. Thus, for instance, for a slice
+// it returns the length of the slice times the element size and does not count the memory
+// occupied by the header. If the type of v is not acceptable, dataSize returns -1.
+func dataSize(v reflect.Value) int {
+	if v.Kind() == reflect.Slice {
+		if s := sizeof(v.Type().Elem()); s >= 0 {
+			return s * v.Len()
+		}
+		return -1
+	}
+	return sizeof(v.Type())
+}
+
+// sizeof returns the size >= 0 of variables for the given type or -1 if the type is not acceptable.
+func sizeof(t reflect.Type) int {
+	switch t.Kind() {
+	case reflect.Array:
+		if s := sizeof(t.Elem()); s >= 0 {
+			return s * t.Len()
+		}
+
+	case reflect.Struct:
+		sum := 0
+		for i, n := 0, t.NumField(); i < n; i++ {
+			s := sizeof(t.Field(i).Type)
+			if s < 0 {
+				return -1
+			}
+			sum += s
+		}
+		return sum
+
+	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
+		reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
+		reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128, reflect.Ptr:
+		return int(t.Size())
+	}
+
+	return -1
+}
+
+type coder struct {
+	order ByteOrder
+	buf   []byte
+}
+
+type decoder coder
+type encoder coder
+
+func (d *decoder) uint8() uint8 {
+	x := d.buf[0]
+	d.buf = d.buf[1:]
+	return x
+}
+
+func (e *encoder) uint8(x uint8) {
+	e.buf[0] = x
+	e.buf = e.buf[1:]
+}
+
+func (d *decoder) uint16() uint16 {
+	x := d.order.Uint16(d.buf[0:2])
+	d.buf = d.buf[2:]
+	return x
+}
+
+func (e *encoder) uint16(x uint16) {
+	e.order.PutUint16(e.buf[0:2], x)
+	e.buf = e.buf[2:]
+}
+
+func (d *decoder) uint32() uint32 {
+	x := d.order.Uint32(d.buf[0:4])
+	d.buf = d.buf[4:]
+	return x
+}
+
+func (e *encoder) uint32(x uint32) {
+	e.order.PutUint32(e.buf[0:4], x)
+	e.buf = e.buf[4:]
+}
+
+func (d *decoder) uint64() uint64 {
+	x := d.order.Uint64(d.buf[0:8])
+	d.buf = d.buf[8:]
+	return x
+}
+
+func (e *encoder) uint64(x uint64) {
+	e.order.PutUint64(e.buf[0:8], x)
+	e.buf = e.buf[8:]
+}
+
+func (d *decoder) int8() int8 { return int8(d.uint8()) }
+
+func (e *encoder) int8(x int8) { e.uint8(uint8(x)) }
+
+func (d *decoder) int16() int16 { return int16(d.uint16()) }
+
+func (e *encoder) int16(x int16) { e.uint16(uint16(x)) }
+
+func (d *decoder) int32() int32 { return int32(d.uint32()) }
+
+func (e *encoder) int32(x int32) { e.uint32(uint32(x)) }
+
+func (d *decoder) int64() int64 { return int64(d.uint64()) }
+
+func (e *encoder) int64(x int64) { e.uint64(uint64(x)) }
+
+func (d *decoder) value(v reflect.Value) {
+	switch v.Kind() {
+	case reflect.Array:
+		l := v.Len()
+		for i := 0; i < l; i++ {
+			d.value(v.Index(i))
+		}
+
+	case reflect.Struct:
+		t := v.Type()
+		l := v.NumField()
+		for i := 0; i < l; i++ {
+			// Note: Calling v.CanSet() below is an optimization.
+			// It would be sufficient to check the field name,
+			// but creating the StructField info for each field is
+			// costly (run "go test -bench=ReadStruct" and compare
+			// results when making changes to this code).
+			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
+				d.value(v)
+			} else {
+				d.skip(v)
+			}
+		}
+
+	case reflect.Slice:
+		l := v.Len()
+		for i := 0; i < l; i++ {
+			d.value(v.Index(i))
+		}
+
+	case reflect.Int8:
+		v.SetInt(int64(d.int8()))
+	case reflect.Int16:
+		v.SetInt(int64(d.int16()))
+	case reflect.Int32:
+		v.SetInt(int64(d.int32()))
+	case reflect.Int64:
+		v.SetInt(d.int64())
+
+	case reflect.Uint8:
+		v.SetUint(uint64(d.uint8()))
+	case reflect.Uint16:
+		v.SetUint(uint64(d.uint16()))
+	case reflect.Uint32:
+		v.SetUint(uint64(d.uint32()))
+	case reflect.Uint64:
+		v.SetUint(d.uint64())
+
+	case reflect.Float32:
+		v.SetFloat(float64(math.Float32frombits(d.uint32())))
+	case reflect.Float64:
+		v.SetFloat(math.Float64frombits(d.uint64()))
+
+	case reflect.Complex64:
+		v.SetComplex(complex(
+			float64(math.Float32frombits(d.uint32())),
+			float64(math.Float32frombits(d.uint32())),
+		))
+	case reflect.Complex128:
+		v.SetComplex(complex(
+			math.Float64frombits(d.uint64()),
+			math.Float64frombits(d.uint64()),
+		))
+	}
+}
+
+func (e *encoder) value(v reflect.Value) {
+	switch v.Kind() {
+	case reflect.Array:
+		l := v.Len()
+		for i := 0; i < l; i++ {
+			e.value(v.Index(i))
+		}
+
+	case reflect.Struct:
+		t := v.Type()
+		l := v.NumField()
+		for i := 0; i < l; i++ {
+			// see comment for corresponding code in decoder.value()
+			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
+				e.value(v)
+			} else {
+				e.skip(v)
+			}
+		}
+
+	case reflect.Slice:
+		l := v.Len()
+		for i := 0; i < l; i++ {
+			e.value(v.Index(i))
+		}
+
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		switch v.Type().Kind() {
+		case reflect.Int8:
+			e.int8(int8(v.Int()))
+		case reflect.Int16:
+			e.int16(int16(v.Int()))
+		case reflect.Int32:
+			e.int32(int32(v.Int()))
+		case reflect.Int64:
+			e.int64(v.Int())
+		}
+
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		switch v.Type().Kind() {
+		case reflect.Uint8:
+			e.uint8(uint8(v.Uint()))
+		case reflect.Uint16:
+			e.uint16(uint16(v.Uint()))
+		case reflect.Uint32:
+			e.uint32(uint32(v.Uint()))
+		case reflect.Uint64:
+			e.uint64(v.Uint())
+		}
+
+	case reflect.Float32, reflect.Float64:
+		switch v.Type().Kind() {
+		case reflect.Float32:
+			e.uint32(math.Float32bits(float32(v.Float())))
+		case reflect.Float64:
+			e.uint64(math.Float64bits(v.Float()))
+		}
+
+	case reflect.Complex64, reflect.Complex128:
+		switch v.Type().Kind() {
+		case reflect.Complex64:
+			x := v.Complex()
+			e.uint32(math.Float32bits(float32(real(x))))
+			e.uint32(math.Float32bits(float32(imag(x))))
+		case reflect.Complex128:
+			x := v.Complex()
+			e.uint64(math.Float64bits(real(x)))
+			e.uint64(math.Float64bits(imag(x)))
+		}
+	}
+}
+
+func (d *decoder) skip(v reflect.Value) {
+	d.buf = d.buf[dataSize(v):]
+}
+
+func (e *encoder) skip(v reflect.Value) {
+	n := dataSize(v)
+	for i := range e.buf[0:n] {
+		e.buf[i] = 0
+	}
+	e.buf = e.buf[n:]
+}
+
+// intDataSize returns the size of the data required to represent the data when encoded.
+// It returns zero if the type cannot be implemented by the fast path in Read or Write.
+func intDataSize(data interface{}) int {
+	switch data := data.(type) {
+	case int8, *int8, *uint8:
+		return 1
+	case []int8:
+		return len(data)
+	case []uint8:
+		return len(data)
+	case int16, *int16, *uint16:
+		return 2
+	case []int16:
+		return 2 * len(data)
+	case []uint16:
+		return 2 * len(data)
+	case int32, *int32, *uint32:
+		return 4
+	case []int32:
+		return 4 * len(data)
+	case []uint32:
+		return 4 * len(data)
+	case int64, *int64, *uint64:
+		return 8
+	case []int64:
+		return 8 * len(data)
+	case []uint64:
+		return 8 * len(data)
+	}
+	return 0
+}
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common.go b/vendor/github.com/shirou/gopsutil/internal/common/common.go
new file mode 100644
index 0000000000..d9dce5cac3
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common.go
@@ -0,0 +1,279 @@
+package common
+
+//
+// gopsutil is a port of psutil(http://pythonhosted.org/psutil/).
+// This covers these architectures.
+//  - linux (amd64, arm)
+//  - freebsd (amd64)
+//  - windows (amd64)
+import (
+	"bufio"
+	"errors"
+	"io/ioutil"
+	"net/url"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"reflect"
+	"runtime"
+	"strconv"
+	"strings"
+)
+
+type Invoker interface {
+	Command(string, ...string) ([]byte, error)
+}
+
+type Invoke struct{}
+
+func (i Invoke) Command(name string, arg ...string) ([]byte, error) {
+	return exec.Command(name, arg...).Output()
+}
+
+type FakeInvoke struct {
+	CommandExpectedDir string // CommandExpectedDir specifies dir which includes expected outputs.
+	Suffix             string // Suffix species expected file name suffix such as "fail"
+	Error              error  // If Error specfied, return the error.
+}
+
+// Command in FakeInvoke returns from expected file if exists.
+func (i FakeInvoke) Command(name string, arg ...string) ([]byte, error) {
+	if i.Error != nil {
+		return []byte{}, i.Error
+	}
+
+	arch := runtime.GOOS
+
+	fname := strings.Join(append([]string{name}, arg...), "")
+	fname = url.QueryEscape(fname)
+	var dir string
+	if i.CommandExpectedDir == "" {
+		dir = "expected"
+	} else {
+		dir = i.CommandExpectedDir
+	}
+	fpath := path.Join(dir, arch, fname)
+	if i.Suffix != "" {
+		fpath += "_" + i.Suffix
+	}
+	if PathExists(fpath) {
+		return ioutil.ReadFile(fpath)
+	}
+	return exec.Command(name, arg...).Output()
+}
+
+var ErrNotImplementedError = errors.New("not implemented yet")
+
+// ReadLines reads contents from a file and splits them by new lines.
+// A convenience wrapper to ReadLinesOffsetN(filename, 0, -1).
+func ReadLines(filename string) ([]string, error) {
+	return ReadLinesOffsetN(filename, 0, -1)
+}
+
+// ReadLines reads contents from file and splits them by new line.
+// The offset tells at which line number to start.
+// The count determines the number of lines to read (starting from offset):
+//   n >= 0: at most n lines
+//   n < 0: whole file
+func ReadLinesOffsetN(filename string, offset uint, n int) ([]string, error) {
+	f, err := os.Open(filename)
+	if err != nil {
+		return []string{""}, err
+	}
+	defer f.Close()
+
+	var ret []string
+
+	r := bufio.NewReader(f)
+	for i := 0; i < n+int(offset) || n < 0; i++ {
+		line, err := r.ReadString('\n')
+		if err != nil {
+			break
+		}
+		if i < int(offset) {
+			continue
+		}
+		ret = append(ret, strings.Trim(line, "\n"))
+	}
+
+	return ret, nil
+}
+
+func IntToString(orig []int8) string {
+	ret := make([]byte, len(orig))
+	size := -1
+	for i, o := range orig {
+		if o == 0 {
+			size = i
+			break
+		}
+		ret[i] = byte(o)
+	}
+	if size == -1 {
+		size = len(orig)
+	}
+
+	return string(ret[0:size])
+}
+
+func ByteToString(orig []byte) string {
+	n := -1
+	l := -1
+	for i, b := range orig {
+		// skip left side null
+		if l == -1 && b == 0 {
+			continue
+		}
+		if l == -1 {
+			l = i
+		}
+
+		if b == 0 {
+			break
+		}
+		n = i + 1
+	}
+	if n == -1 {
+		return string(orig)
+	}
+	return string(orig[l:n])
+}
+
+// ReadInts reads contents from single line file and returns them as []int32.
+func ReadInts(filename string) ([]int64, error) {
+	f, err := os.Open(filename)
+	if err != nil {
+		return []int64{}, err
+	}
+	defer f.Close()
+
+	var ret []int64
+
+	r := bufio.NewReader(f)
+
+	// The int files that this is concerned with should only be one liners.
+	line, err := r.ReadString('\n')
+	if err != nil {
+		return []int64{}, err
+	}
+
+	i, err := strconv.ParseInt(strings.Trim(line, "\n"), 10, 32)
+	if err != nil {
+		return []int64{}, err
+	}
+	ret = append(ret, i)
+
+	return ret, nil
+}
+
+// Parse to int32 without error
+func mustParseInt32(val string) int32 {
+	vv, _ := strconv.ParseInt(val, 10, 32)
+	return int32(vv)
+}
+
+// Parse to uint64 without error
+func mustParseUint64(val string) uint64 {
+	vv, _ := strconv.ParseInt(val, 10, 64)
+	return uint64(vv)
+}
+
+// Parse to Float64 without error
+func mustParseFloat64(val string) float64 {
+	vv, _ := strconv.ParseFloat(val, 64)
+	return vv
+}
+
+// StringsHas checks the target string slice contains src or not
+func StringsHas(target []string, src string) bool {
+	for _, t := range target {
+		if strings.TrimSpace(t) == src {
+			return true
+		}
+	}
+	return false
+}
+
+// StringsContains checks the src in any string of the target string slice
+func StringsContains(target []string, src string) bool {
+	for _, t := range target {
+		if strings.Contains(t, src) {
+			return true
+		}
+	}
+	return false
+}
+
+// IntContains checks the src in any int of the target int slice.
+func IntContains(target []int, src int) bool {
+	for _, t := range target {
+		if src == t {
+			return true
+		}
+	}
+	return false
+}
+
+// get struct attributes.
+// This method is used only for debugging platform dependent code.
+func attributes(m interface{}) map[string]reflect.Type {
+	typ := reflect.TypeOf(m)
+	if typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+	}
+
+	attrs := make(map[string]reflect.Type)
+	if typ.Kind() != reflect.Struct {
+		return nil
+	}
+
+	for i := 0; i < typ.NumField(); i++ {
+		p := typ.Field(i)
+		if !p.Anonymous {
+			attrs[p.Name] = p.Type
+		}
+	}
+
+	return attrs
+}
+
+func PathExists(filename string) bool {
+	if _, err := os.Stat(filename); err == nil {
+		return true
+	}
+	return false
+}
+
+//GetEnv retrieves the environment variable key. If it does not exist it returns the default.
+func GetEnv(key string, dfault string, combineWith ...string) string {
+	value := os.Getenv(key)
+	if value == "" {
+		value = dfault
+	}
+
+	switch len(combineWith) {
+	case 0:
+		return value
+	case 1:
+		return filepath.Join(value, combineWith[0])
+	default:
+		all := make([]string, len(combineWith)+1)
+		all[0] = value
+		copy(all[1:], combineWith)
+		return filepath.Join(all...)
+	}
+	panic("invalid switch case")
+}
+
+func HostProc(combineWith ...string) string {
+	return GetEnv("HOST_PROC", "/proc", combineWith...)
+}
+
+func HostSys(combineWith ...string) string {
+	return GetEnv("HOST_SYS", "/sys", combineWith...)
+}
+
+func HostEtc(combineWith ...string) string {
+	return GetEnv("HOST_ETC", "/etc", combineWith...)
+}
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common_darwin.go b/vendor/github.com/shirou/gopsutil/internal/common/common_darwin.go
new file mode 100644
index 0000000000..2e1552aeee
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common_darwin.go
@@ -0,0 +1,70 @@
+// +build darwin
+
+package common
+
+import (
+	"os"
+	"os/exec"
+	"strings"
+	"syscall"
+	"unsafe"
+)
+
+func DoSysctrl(mib string) ([]string, error) {
+	err := os.Setenv("LC_ALL", "C")
+	if err != nil {
+		return []string{}, err
+	}
+
+	sysctl, err := exec.LookPath("/usr/sbin/sysctl")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := exec.Command(sysctl, "-n", mib).Output()
+	if err != nil {
+		return []string{}, err
+	}
+	v := strings.Replace(string(out), "{ ", "", 1)
+	v = strings.Replace(string(v), " }", "", 1)
+	values := strings.Fields(string(v))
+
+	return values, nil
+}
+
+func CallSyscall(mib []int32) ([]byte, uint64, error) {
+	miblen := uint64(len(mib))
+
+	// get required buffer size
+	length := uint64(0)
+	_, _, err := syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(unsafe.Pointer(&mib[0])),
+		uintptr(miblen),
+		0,
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if err != 0 {
+		var b []byte
+		return b, length, err
+	}
+	if length == 0 {
+		var b []byte
+		return b, length, err
+	}
+	// get proc info itself
+	buf := make([]byte, length)
+	_, _, err = syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(unsafe.Pointer(&mib[0])),
+		uintptr(miblen),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if err != 0 {
+		return buf, length, err
+	}
+
+	return buf, length, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common_freebsd.go b/vendor/github.com/shirou/gopsutil/internal/common/common_freebsd.go
new file mode 100644
index 0000000000..dfdcebd8d7
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common_freebsd.go
@@ -0,0 +1,70 @@
+// +build freebsd
+
+package common
+
+import (
+	"os"
+	"os/exec"
+	"strings"
+	"syscall"
+	"unsafe"
+)
+
+func DoSysctrl(mib string) ([]string, error) {
+	err := os.Setenv("LC_ALL", "C")
+	if err != nil {
+		return []string{}, err
+	}
+	sysctl, err := exec.LookPath("/sbin/sysctl")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := exec.Command(sysctl, "-n", mib).Output()
+	if err != nil {
+		return []string{}, err
+	}
+	v := strings.Replace(string(out), "{ ", "", 1)
+	v = strings.Replace(string(v), " }", "", 1)
+	values := strings.Fields(string(v))
+
+	return values, nil
+}
+
+func CallSyscall(mib []int32) ([]byte, uint64, error) {
+	mibptr := unsafe.Pointer(&mib[0])
+	miblen := uint64(len(mib))
+
+	// get required buffer size
+	length := uint64(0)
+	_, _, err := syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(mibptr),
+		uintptr(miblen),
+		0,
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if err != 0 {
+		var b []byte
+		return b, length, err
+	}
+	if length == 0 {
+		var b []byte
+		return b, length, err
+	}
+	// get proc info itself
+	buf := make([]byte, length)
+	_, _, err = syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(mibptr),
+		uintptr(miblen),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if err != 0 {
+		return buf, length, err
+	}
+
+	return buf, length, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common_linux.go b/vendor/github.com/shirou/gopsutil/internal/common/common_linux.go
new file mode 100644
index 0000000000..0a122e9d6a
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common_linux.go
@@ -0,0 +1,3 @@
+// +build linux
+
+package common
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common_unix.go b/vendor/github.com/shirou/gopsutil/internal/common/common_unix.go
new file mode 100644
index 0000000000..6622eecc2e
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common_unix.go
@@ -0,0 +1,66 @@
+// +build linux freebsd darwin
+
+package common
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+)
+
+func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
+	var cmd []string
+	if pid == 0 { // will get from all processes.
+		cmd = []string{"-a", "-n", "-P"}
+	} else {
+		cmd = []string{"-a", "-n", "-P", "-p", strconv.Itoa(int(pid))}
+	}
+	cmd = append(cmd, args...)
+	lsof, err := exec.LookPath("lsof")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := invoke.Command(lsof, cmd...)
+	if err != nil {
+		// if no pid found, lsof returnes code 1.
+		if err.Error() == "exit status 1" && len(out) == 0 {
+			return []string{}, nil
+		}
+	}
+	lines := strings.Split(string(out), "\n")
+
+	var ret []string
+	for _, l := range lines[1:] {
+		if len(l) == 0 {
+			continue
+		}
+		ret = append(ret, l)
+	}
+	return ret, nil
+}
+
+func CallPgrep(invoke Invoker, pid int32) ([]int32, error) {
+	var cmd []string
+	cmd = []string{"-P", strconv.Itoa(int(pid))}
+	pgrep, err := exec.LookPath("pgrep")
+	if err != nil {
+		return []int32{}, err
+	}
+	out, err := invoke.Command(pgrep, cmd...)
+	if err != nil {
+		return []int32{}, err
+	}
+	lines := strings.Split(string(out), "\n")
+	ret := make([]int32, 0, len(lines))
+	for _, l := range lines {
+		if len(l) == 0 {
+			continue
+		}
+		i, err := strconv.Atoi(l)
+		if err != nil {
+			continue
+		}
+		ret = append(ret, int32(i))
+	}
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common_windows.go b/vendor/github.com/shirou/gopsutil/internal/common/common_windows.go
new file mode 100644
index 0000000000..d727378cbe
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common_windows.go
@@ -0,0 +1,110 @@
+// +build windows
+
+package common
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// for double values
+type PDH_FMT_COUNTERVALUE_DOUBLE struct {
+	CStatus     uint32
+	DoubleValue float64
+}
+
+// for 64 bit integer values
+type PDH_FMT_COUNTERVALUE_LARGE struct {
+	CStatus    uint32
+	LargeValue int64
+}
+
+// for long values
+type PDH_FMT_COUNTERVALUE_LONG struct {
+	CStatus   uint32
+	LongValue int32
+	padding   [4]byte
+}
+
+// windows system const
+const (
+	ERROR_SUCCESS        = 0
+	ERROR_FILE_NOT_FOUND = 2
+	DRIVE_REMOVABLE      = 2
+	DRIVE_FIXED          = 3
+	HKEY_LOCAL_MACHINE   = 0x80000002
+	RRF_RT_REG_SZ        = 0x00000002
+	RRF_RT_REG_DWORD     = 0x00000010
+	PDH_FMT_LONG         = 0x00000100
+	PDH_FMT_DOUBLE       = 0x00000200
+	PDH_FMT_LARGE        = 0x00000400
+	PDH_INVALID_DATA     = 0xc0000bc6
+	PDH_INVALID_HANDLE   = 0xC0000bbc
+	PDH_NO_DATA          = 0x800007d5
+)
+
+var (
+	Modkernel32 = syscall.NewLazyDLL("kernel32.dll")
+	ModNt       = syscall.NewLazyDLL("ntdll.dll")
+	ModPdh      = syscall.NewLazyDLL("pdh.dll")
+
+	ProcGetSystemTimes           = Modkernel32.NewProc("GetSystemTimes")
+	ProcNtQuerySystemInformation = ModNt.NewProc("NtQuerySystemInformation")
+	PdhOpenQuery                 = ModPdh.NewProc("PdhOpenQuery")
+	PdhAddCounter                = ModPdh.NewProc("PdhAddCounterW")
+	PdhCollectQueryData          = ModPdh.NewProc("PdhCollectQueryData")
+	PdhGetFormattedCounterValue  = ModPdh.NewProc("PdhGetFormattedCounterValue")
+	PdhCloseQuery                = ModPdh.NewProc("PdhCloseQuery")
+)
+
+type FILETIME struct {
+	DwLowDateTime  uint32
+	DwHighDateTime uint32
+}
+
+// borrowed from net/interface_windows.go
+func BytePtrToString(p *uint8) string {
+	a := (*[10000]uint8)(unsafe.Pointer(p))
+	i := 0
+	for a[i] != 0 {
+		i++
+	}
+	return string(a[:i])
+}
+
+// CounterInfo
+// copied from https://github.com/mackerelio/mackerel-agent/
+type CounterInfo struct {
+	PostName    string
+	CounterName string
+	Counter     syscall.Handle
+}
+
+// CreateQuery XXX
+// copied from https://github.com/mackerelio/mackerel-agent/
+func CreateQuery() (syscall.Handle, error) {
+	var query syscall.Handle
+	r, _, err := PdhOpenQuery.Call(0, 0, uintptr(unsafe.Pointer(&query)))
+	if r != 0 {
+		return 0, err
+	}
+	return query, nil
+}
+
+// CreateCounter XXX
+func CreateCounter(query syscall.Handle, pname, cname string) (*CounterInfo, error) {
+	var counter syscall.Handle
+	r, _, err := PdhAddCounter.Call(
+		uintptr(query),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(cname))),
+		0,
+		uintptr(unsafe.Pointer(&counter)))
+	if r != 0 {
+		return nil, err
+	}
+	return &CounterInfo{
+		PostName:    pname,
+		CounterName: cname,
+		Counter:     counter,
+	}, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load.go b/vendor/github.com/shirou/gopsutil/load/load.go
new file mode 100644
index 0000000000..dfe32a1e81
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load.go
@@ -0,0 +1,35 @@
+package load
+
+import (
+	"encoding/json"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var invoke common.Invoker
+
+func init() {
+	invoke = common.Invoke{}
+}
+
+type AvgStat struct {
+	Load1  float64 `json:"load1"`
+	Load5  float64 `json:"load5"`
+	Load15 float64 `json:"load15"`
+}
+
+func (l AvgStat) String() string {
+	s, _ := json.Marshal(l)
+	return string(s)
+}
+
+type MiscStat struct {
+	ProcsRunning int `json:"procsRunning"`
+	ProcsBlocked int `json:"procsBlocked"`
+	Ctxt         int `json:"ctxt"`
+}
+
+func (m MiscStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_darwin.go b/vendor/github.com/shirou/gopsutil/load/load_darwin.go
new file mode 100644
index 0000000000..34e0653aed
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_darwin.go
@@ -0,0 +1,67 @@
+// +build darwin
+
+package load
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+	values, err := common.DoSysctrl("vm.loadavg")
+	if err != nil {
+		return nil, err
+	}
+
+	load1, err := strconv.ParseFloat(values[0], 64)
+	if err != nil {
+		return nil, err
+	}
+	load5, err := strconv.ParseFloat(values[1], 64)
+	if err != nil {
+		return nil, err
+	}
+	load15, err := strconv.ParseFloat(values[2], 64)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &AvgStat{
+		Load1:  float64(load1),
+		Load5:  float64(load5),
+		Load15: float64(load15),
+	}
+
+	return ret, nil
+}
+
+// Misc returnes miscellaneous host-wide statistics.
+// darwin use ps command to get process running/blocked count.
+// Almost same as FreeBSD implementation, but state is different.
+// U means 'Uninterruptible Sleep'.
+func Misc() (*MiscStat, error) {
+	bin, err := exec.LookPath("ps")
+	if err != nil {
+		return nil, err
+	}
+	out, err := invoke.Command(bin, "axo", "state")
+	if err != nil {
+		return nil, err
+	}
+	lines := strings.Split(string(out), "\n")
+
+	ret := MiscStat{}
+	for _, l := range lines {
+		if strings.Contains(l, "R") {
+			ret.ProcsRunning++
+		} else if strings.Contains(l, "U") {
+			// uninterruptible sleep == blocked
+			ret.ProcsBlocked++
+		}
+	}
+
+	return &ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_freebsd.go b/vendor/github.com/shirou/gopsutil/load/load_freebsd.go
new file mode 100644
index 0000000000..6d3a0bafab
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_freebsd.go
@@ -0,0 +1,65 @@
+// +build freebsd
+
+package load
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+	values, err := common.DoSysctrl("vm.loadavg")
+	if err != nil {
+		return nil, err
+	}
+
+	load1, err := strconv.ParseFloat(values[0], 64)
+	if err != nil {
+		return nil, err
+	}
+	load5, err := strconv.ParseFloat(values[1], 64)
+	if err != nil {
+		return nil, err
+	}
+	load15, err := strconv.ParseFloat(values[2], 64)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &AvgStat{
+		Load1:  float64(load1),
+		Load5:  float64(load5),
+		Load15: float64(load15),
+	}
+
+	return ret, nil
+}
+
+// Misc returnes miscellaneous host-wide statistics.
+// darwin use ps command to get process running/blocked count.
+// Almost same as Darwin implementation, but state is different.
+func Misc() (*MiscStat, error) {
+	bin, err := exec.LookPath("ps")
+	if err != nil {
+		return nil, err
+	}
+	out, err := invoke.Command(bin, "axo", "state")
+	if err != nil {
+		return nil, err
+	}
+	lines := strings.Split(string(out), "\n")
+
+	ret := MiscStat{}
+	for _, l := range lines {
+		if strings.Contains(l, "R") {
+			ret.ProcsRunning++
+		} else if strings.Contains(l, "D") {
+			ret.ProcsBlocked++
+		}
+	}
+
+	return &ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_linux.go b/vendor/github.com/shirou/gopsutil/load/load_linux.go
new file mode 100644
index 0000000000..c455397bf8
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_linux.go
@@ -0,0 +1,78 @@
+// +build linux
+
+package load
+
+import (
+	"io/ioutil"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+	filename := common.HostProc("loadavg")
+	line, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	values := strings.Fields(string(line))
+
+	load1, err := strconv.ParseFloat(values[0], 64)
+	if err != nil {
+		return nil, err
+	}
+	load5, err := strconv.ParseFloat(values[1], 64)
+	if err != nil {
+		return nil, err
+	}
+	load15, err := strconv.ParseFloat(values[2], 64)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &AvgStat{
+		Load1:  load1,
+		Load5:  load5,
+		Load15: load15,
+	}
+
+	return ret, nil
+}
+
+// Misc returnes miscellaneous host-wide statistics.
+// Note: the name should be changed near future.
+func Misc() (*MiscStat, error) {
+	filename := common.HostProc("stat")
+	out, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &MiscStat{}
+	lines := strings.Split(string(out), "\n")
+	for _, line := range lines {
+		fields := strings.Fields(line)
+		if len(fields) != 2 {
+			continue
+		}
+		v, err := strconv.ParseInt(fields[1], 10, 64)
+		if err != nil {
+			continue
+		}
+		switch fields[0] {
+		case "procs_running":
+			ret.ProcsRunning = int(v)
+		case "procs_blocked":
+			ret.ProcsBlocked = int(v)
+		case "ctxt":
+			ret.Ctxt = int(v)
+		default:
+			continue
+		}
+
+	}
+
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_windows.go b/vendor/github.com/shirou/gopsutil/load/load_windows.go
new file mode 100644
index 0000000000..c45c15442c
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_windows.go
@@ -0,0 +1,19 @@
+// +build windows
+
+package load
+
+import (
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+	ret := AvgStat{}
+
+	return &ret, common.ErrNotImplementedError
+}
+
+func Misc() (*MiscStat, error) {
+	ret := MiscStat{}
+
+	return &ret, common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem.go b/vendor/github.com/shirou/gopsutil/mem/mem.go
new file mode 100644
index 0000000000..5f122d11b1
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/mem/mem.go
@@ -0,0 +1,64 @@
+package mem
+
+import (
+	"encoding/json"
+)
+
+// Memory usage statistics. Total, Available and Used contain numbers of bytes
+// for human consumption.
+//
+// The other fields in this struct contain kernel specific values.
+type VirtualMemoryStat struct {
+	// Total amount of RAM on this system
+	Total uint64 `json:"total"`
+
+	// RAM available for programs to allocate
+	//
+	// This value is computed from the kernel specific values.
+	Available uint64 `json:"available"`
+
+	// RAM used by programs
+	//
+	// This value is computed from the kernel specific values.
+	Used uint64 `json:"used"`
+
+	// Percentage of RAM used by programs
+	//
+	// This value is computed from the kernel specific values.
+	UsedPercent float64 `json:"usedPercent"`
+
+	// This is the kernel's notion of free memory; RAM chips whose bits nobody
+	// cares about the value of right now. For a human consumable number,
+	// Available is what you really want.
+	Free uint64 `json:"free"`
+
+	// OS X / BSD specific numbers:
+	// http://www.macyourself.com/2010/02/17/what-is-free-wired-active-and-inactive-system-memory-ram/
+	Active   uint64 `json:"active"`
+	Inactive uint64 `json:"inactive"`
+	Wired    uint64 `json:"wired"`
+
+	// Linux specific numbers
+	// https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s2-proc-meminfo.html
+	Buffers uint64 `json:"buffers"`
+	Cached  uint64 `json:"cached"`
+}
+
+type SwapMemoryStat struct {
+	Total       uint64  `json:"total"`
+	Used        uint64  `json:"used"`
+	Free        uint64  `json:"free"`
+	UsedPercent float64 `json:"usedPercent"`
+	Sin         uint64  `json:"sin"`
+	Sout        uint64  `json:"sout"`
+}
+
+func (m VirtualMemoryStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
+
+func (m SwapMemoryStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_darwin.go b/vendor/github.com/shirou/gopsutil/mem/mem_darwin.go
new file mode 100644
index 0000000000..922b05cb4f
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_darwin.go
@@ -0,0 +1,69 @@
+// +build darwin
+
+package mem
+
+import (
+	"encoding/binary"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func getHwMemsize() (uint64, error) {
+	totalString, err := syscall.Sysctl("hw.memsize")
+	if err != nil {
+		return 0, err
+	}
+
+	// syscall.sysctl() helpfully assumes the result is a null-terminated string and
+	// removes the last byte of the result if it's 0 :/
+	totalString += "\x00"
+
+	total := uint64(binary.LittleEndian.Uint64([]byte(totalString)))
+
+	return total, nil
+}
+
+// SwapMemory returns swapinfo.
+func SwapMemory() (*SwapMemoryStat, error) {
+	var ret *SwapMemoryStat
+
+	swapUsage, err := common.DoSysctrl("vm.swapusage")
+	if err != nil {
+		return ret, err
+	}
+
+	total := strings.Replace(swapUsage[2], "M", "", 1)
+	used := strings.Replace(swapUsage[5], "M", "", 1)
+	free := strings.Replace(swapUsage[8], "M", "", 1)
+
+	total_v, err := strconv.ParseFloat(total, 64)
+	if err != nil {
+		return nil, err
+	}
+	used_v, err := strconv.ParseFloat(used, 64)
+	if err != nil {
+		return nil, err
+	}
+	free_v, err := strconv.ParseFloat(free, 64)
+	if err != nil {
+		return nil, err
+	}
+
+	u := float64(0)
+	if total_v != 0 {
+		u = ((total_v - free_v) / total_v) * 100.0
+	}
+
+	// vm.swapusage shows "M", multiply 1000
+	ret = &SwapMemoryStat{
+		Total:       uint64(total_v * 1000),
+		Used:        uint64(used_v * 1000),
+		Free:        uint64(free_v * 1000),
+		UsedPercent: u,
+	}
+
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go b/vendor/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go
new file mode 100644
index 0000000000..461631976e
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go
@@ -0,0 +1,53 @@
+// +build darwin
+// +build cgo
+
+package mem
+
+/*
+#include <mach/mach_host.h>
+*/
+import "C"
+
+import (
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+// VirtualMemory returns VirtualmemoryStat.
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	count := C.mach_msg_type_number_t(C.HOST_VM_INFO_COUNT)
+	var vmstat C.vm_statistics_data_t
+
+	status := C.host_statistics(C.host_t(C.mach_host_self()),
+		C.HOST_VM_INFO,
+		C.host_info_t(unsafe.Pointer(&vmstat)),
+		&count)
+
+	if status != C.KERN_SUCCESS {
+		return nil, fmt.Errorf("host_statistics error=%d", status)
+	}
+
+	pageSize := uint64(syscall.Getpagesize())
+	total, err := getHwMemsize()
+	if err != nil {
+		return nil, err
+	}
+	totalCount := C.natural_t(total / pageSize)
+
+	availableCount := vmstat.inactive_count + vmstat.free_count
+	usedPercent := 100 * float64(totalCount-availableCount) / float64(totalCount)
+
+	usedCount := totalCount - availableCount
+
+	return &VirtualMemoryStat{
+		Total:       total,
+		Available:   pageSize * uint64(availableCount),
+		Used:        pageSize * uint64(usedCount),
+		UsedPercent: usedPercent,
+		Free:        pageSize * uint64(vmstat.free_count),
+		Active:      pageSize * uint64(vmstat.active_count),
+		Inactive:    pageSize * uint64(vmstat.inactive_count),
+		Wired:       pageSize * uint64(vmstat.wire_count),
+	}, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go b/vendor/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
new file mode 100644
index 0000000000..7094802d9a
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
@@ -0,0 +1,88 @@
+// +build darwin
+// +build !cgo
+
+package mem
+
+import (
+	"os/exec"
+	"strconv"
+	"strings"
+	"syscall"
+)
+
+// Runs vm_stat and returns Free and inactive pages
+func getVMStat(vms *VirtualMemoryStat) error {
+	vm_stat, err := exec.LookPath("vm_stat")
+	if err != nil {
+		return err
+	}
+	out, err := exec.Command(vm_stat).Output()
+	if err != nil {
+		return err
+	}
+	return parseVMStat(string(out), vms)
+}
+
+func parseVMStat(out string, vms *VirtualMemoryStat) error {
+	var err error
+
+	lines := strings.Split(out, "\n")
+	pagesize := uint64(syscall.Getpagesize())
+	for _, line := range lines {
+		fields := strings.Split(line, ":")
+		if len(fields) < 2 {
+			continue
+		}
+		key := strings.TrimSpace(fields[0])
+		value := strings.Trim(fields[1], " .")
+		switch key {
+		case "Pages free":
+			free, e := strconv.ParseUint(value, 10, 64)
+			if e != nil {
+				err = e
+			}
+			vms.Free = free * pagesize
+		case "Pages inactive":
+			inactive, e := strconv.ParseUint(value, 10, 64)
+			if e != nil {
+				err = e
+			}
+			vms.Inactive = inactive * pagesize
+		case "Pages active":
+			active, e := strconv.ParseUint(value, 10, 64)
+			if e != nil {
+				err = e
+			}
+			vms.Active = active * pagesize
+		case "Pages wired down":
+			wired, e := strconv.ParseUint(value, 10, 64)
+			if e != nil {
+				err = e
+			}
+			vms.Wired = wired * pagesize
+		}
+	}
+	return err
+}
+
+// VirtualMemory returns VirtualmemoryStat.
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	ret := &VirtualMemoryStat{}
+
+	total, err := getHwMemsize()
+	if err != nil {
+		return nil, err
+	}
+	err = getVMStat(ret)
+	if err != nil {
+		return nil, err
+	}
+
+	ret.Available = ret.Free + ret.Inactive
+	ret.Total = total
+
+	ret.Used = ret.Total - ret.Available
+	ret.UsedPercent = 100 * float64(ret.Used) / float64(ret.Total)
+
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go b/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go
new file mode 100644
index 0000000000..7194057674
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go
@@ -0,0 +1,134 @@
+// +build freebsd
+
+package mem
+
+import (
+	"errors"
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	pageSize, err := common.DoSysctrl("vm.stats.vm.v_page_size")
+	if err != nil {
+		return nil, err
+	}
+	p, err := strconv.ParseUint(pageSize[0], 10, 64)
+	if err != nil {
+		return nil, err
+	}
+
+	pageCount, err := common.DoSysctrl("vm.stats.vm.v_page_count")
+	if err != nil {
+		return nil, err
+	}
+	free, err := common.DoSysctrl("vm.stats.vm.v_free_count")
+	if err != nil {
+		return nil, err
+	}
+	active, err := common.DoSysctrl("vm.stats.vm.v_active_count")
+	if err != nil {
+		return nil, err
+	}
+	inactive, err := common.DoSysctrl("vm.stats.vm.v_inactive_count")
+	if err != nil {
+		return nil, err
+	}
+	cache, err := common.DoSysctrl("vm.stats.vm.v_cache_count")
+	if err != nil {
+		return nil, err
+	}
+	buffer, err := common.DoSysctrl("vfs.bufspace")
+	if err != nil {
+		return nil, err
+	}
+	wired, err := common.DoSysctrl("vm.stats.vm.v_wire_count")
+	if err != nil {
+		return nil, err
+	}
+
+	parsed := make([]uint64, 0, 7)
+	vv := []string{
+		pageCount[0],
+		free[0],
+		active[0],
+		inactive[0],
+		cache[0],
+		buffer[0],
+		wired[0],
+	}
+	for _, target := range vv {
+		t, err := strconv.ParseUint(target, 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		parsed = append(parsed, t)
+	}
+
+	ret := &VirtualMemoryStat{
+		Total:    parsed[0] * p,
+		Free:     parsed[1] * p,
+		Active:   parsed[2] * p,
+		Inactive: parsed[3] * p,
+		Cached:   parsed[4] * p,
+		Buffers:  parsed[5],
+		Wired:    parsed[6] * p,
+	}
+
+	ret.Available = ret.Inactive + ret.Cached + ret.Free
+	ret.Used = ret.Total - ret.Available
+	ret.UsedPercent = float64(ret.Used) / float64(ret.Total) * 100.0
+
+	return ret, nil
+}
+
+// Return swapinfo
+// FreeBSD can have multiple swap devices. but use only first device
+func SwapMemory() (*SwapMemoryStat, error) {
+	swapinfo, err := exec.LookPath("swapinfo")
+	if err != nil {
+		return nil, err
+	}
+
+	out, err := exec.Command(swapinfo).Output()
+	if err != nil {
+		return nil, err
+	}
+	for _, line := range strings.Split(string(out), "\n") {
+		values := strings.Fields(line)
+		// skip title line
+		if len(values) == 0 || values[0] == "Device" {
+			continue
+		}
+
+		u := strings.Replace(values[4], "%", "", 1)
+		total_v, err := strconv.ParseUint(values[1], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		used_v, err := strconv.ParseUint(values[2], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		free_v, err := strconv.ParseUint(values[3], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		up_v, err := strconv.ParseFloat(u, 64)
+		if err != nil {
+			return nil, err
+		}
+
+		return &SwapMemoryStat{
+			Total:       total_v,
+			Used:        used_v,
+			Free:        free_v,
+			UsedPercent: up_v,
+		}, nil
+	}
+
+	return nil, errors.New("no swap devices found")
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_linux.go b/vendor/github.com/shirou/gopsutil/mem/mem_linux.go
new file mode 100644
index 0000000000..899da83dff
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_linux.go
@@ -0,0 +1,100 @@
+// +build linux
+
+package mem
+
+import (
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	filename := common.HostProc("meminfo")
+	lines, _ := common.ReadLines(filename)
+	// flag if MemAvailable is in /proc/meminfo (kernel 3.14+)
+	memavail := false
+
+	ret := &VirtualMemoryStat{}
+	for _, line := range lines {
+		fields := strings.Split(line, ":")
+		if len(fields) != 2 {
+			continue
+		}
+		key := strings.TrimSpace(fields[0])
+		value := strings.TrimSpace(fields[1])
+		value = strings.Replace(value, " kB", "", -1)
+
+		t, err := strconv.ParseUint(value, 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		switch key {
+		case "MemTotal":
+			ret.Total = t * 1024
+		case "MemFree":
+			ret.Free = t * 1024
+		case "MemAvailable":
+			memavail = true
+			ret.Available = t * 1024
+		case "Buffers":
+			ret.Buffers = t * 1024
+		case "Cached":
+			ret.Cached = t * 1024
+		case "Active":
+			ret.Active = t * 1024
+		case "Inactive":
+			ret.Inactive = t * 1024
+		}
+	}
+	if !memavail {
+		ret.Available = ret.Free + ret.Buffers + ret.Cached
+	}
+	ret.Used = ret.Total - ret.Available
+	ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0
+
+	return ret, nil
+}
+
+func SwapMemory() (*SwapMemoryStat, error) {
+	sysinfo := &syscall.Sysinfo_t{}
+
+	if err := syscall.Sysinfo(sysinfo); err != nil {
+		return nil, err
+	}
+	ret := &SwapMemoryStat{
+		Total: uint64(sysinfo.Totalswap),
+		Free:  uint64(sysinfo.Freeswap),
+	}
+	ret.Used = ret.Total - ret.Free
+	//check Infinity
+	if ret.Total != 0 {
+		ret.UsedPercent = float64(ret.Total-ret.Free) / float64(ret.Total) * 100.0
+	} else {
+		ret.UsedPercent = 0
+	}
+	filename := common.HostProc("vmstat")
+	lines, _ := common.ReadLines(filename)
+	for _, l := range lines {
+		fields := strings.Fields(l)
+		if len(fields) < 2 {
+			continue
+		}
+		switch fields[0] {
+		case "pswpin":
+			value, err := strconv.ParseUint(fields[1], 10, 64)
+			if err != nil {
+				continue
+			}
+			ret.Sin = value * 4 * 1024
+		case "pswpout":
+			value, err := strconv.ParseUint(fields[1], 10, 64)
+			if err != nil {
+				continue
+			}
+			ret.Sout = value * 4 * 1024
+		}
+	}
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_windows.go b/vendor/github.com/shirou/gopsutil/mem/mem_windows.go
new file mode 100644
index 0000000000..045af49e39
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_windows.go
@@ -0,0 +1,50 @@
+// +build windows
+
+package mem
+
+import (
+	"syscall"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var (
+	procGlobalMemoryStatusEx = common.Modkernel32.NewProc("GlobalMemoryStatusEx")
+)
+
+type memoryStatusEx struct {
+	cbSize                  uint32
+	dwMemoryLoad            uint32
+	ullTotalPhys            uint64 // in bytes
+	ullAvailPhys            uint64
+	ullTotalPageFile        uint64
+	ullAvailPageFile        uint64
+	ullTotalVirtual         uint64
+	ullAvailVirtual         uint64
+	ullAvailExtendedVirtual uint64
+}
+
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	var memInfo memoryStatusEx
+	memInfo.cbSize = uint32(unsafe.Sizeof(memInfo))
+	mem, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(&memInfo)))
+	if mem == 0 {
+		return nil, syscall.GetLastError()
+	}
+
+	ret := &VirtualMemoryStat{
+		Total:       memInfo.ullTotalPhys,
+		Available:   memInfo.ullAvailPhys,
+		UsedPercent: float64(memInfo.dwMemoryLoad),
+	}
+
+	ret.Used = ret.Total - ret.Available
+	return ret, nil
+}
+
+func SwapMemory() (*SwapMemoryStat, error) {
+	ret := &SwapMemoryStat{}
+
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/net/net.go b/vendor/github.com/shirou/gopsutil/net/net.go
new file mode 100644
index 0000000000..60f1069c85
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/net/net.go
@@ -0,0 +1,243 @@
+package net
+
+import (
+	"encoding/json"
+	"fmt"
+	"net"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var invoke common.Invoker
+
+func init() {
+	invoke = common.Invoke{}
+}
+
+type IOCountersStat struct {
+	Name        string `json:"name"`         // interface name
+	BytesSent   uint64 `json:"bytesSent"`   // number of bytes sent
+	BytesRecv   uint64 `json:"bytesRecv"`   // number of bytes received
+	PacketsSent uint64 `json:"packetsSent"` // number of packets sent
+	PacketsRecv uint64 `json:"packetsRecv"` // number of packets received
+	Errin       uint64 `json:"errin"`        // total number of errors while receiving
+	Errout      uint64 `json:"errout"`       // total number of errors while sending
+	Dropin      uint64 `json:"dropin"`       // total number of incoming packets which were dropped
+	Dropout     uint64 `json:"dropout"`      // total number of outgoing packets which were dropped (always 0 on OSX and BSD)
+}
+
+// Addr is implemented compatibility to psutil
+type Addr struct {
+	IP   string `json:"ip"`
+	Port uint32 `json:"port"`
+}
+
+type ConnectionStat struct {
+	Fd     uint32 `json:"fd"`
+	Family uint32 `json:"family"`
+	Type   uint32 `json:"type"`
+	Laddr  Addr   `json:"localaddr"`
+	Raddr  Addr   `json:"remoteaddr"`
+	Status string `json:"status"`
+	Pid    int32  `json:"pid"`
+}
+
+// System wide stats about different network protocols
+type ProtoCountersStat struct {
+	Protocol string           `json:"protocol"`
+	Stats    map[string]int64 `json:"stats"`
+}
+
+// NetInterfaceAddr is designed for represent interface addresses
+type InterfaceAddr struct {
+	Addr string `json:"addr"`
+}
+
+type InterfaceStat struct {
+	MTU          int             `json:"mtu"`          // maximum transmission unit
+	Name         string          `json:"name"`         // e.g., "en0", "lo0", "eth0.100"
+	HardwareAddr string          `json:"hardwareaddr"` // IEEE MAC-48, EUI-48 and EUI-64 form
+	Flags        []string        `json:"flags"`        // e.g., FlagUp, FlagLoopback, FlagMulticast
+	Addrs        []InterfaceAddr `json:"addrs"`
+}
+
+type FilterStat struct {
+	ConnTrackCount int64 `json:"conntrackCount"`
+	ConnTrackMax   int64 `json:"conntrackMax"`
+}
+
+var constMap = map[string]int{
+	"TCP":  syscall.SOCK_STREAM,
+	"UDP":  syscall.SOCK_DGRAM,
+	"IPv4": syscall.AF_INET,
+	"IPv6": syscall.AF_INET6,
+}
+
+func (n IOCountersStat) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func (n ConnectionStat) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func (n ProtoCountersStat) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func (a Addr) String() string {
+	s, _ := json.Marshal(a)
+	return string(s)
+}
+
+func (n InterfaceStat) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func (n InterfaceAddr) String() string {
+	s, _ := json.Marshal(n)
+	return string(s)
+}
+
+func Interfaces() ([]InterfaceStat, error) {
+	is, err := net.Interfaces()
+	if err != nil {
+		return nil, err
+	}
+	ret := make([]InterfaceStat, 0, len(is))
+	for _, ifi := range is {
+
+		var flags []string
+		if ifi.Flags&net.FlagUp != 0 {
+			flags = append(flags, "up")
+		}
+		if ifi.Flags&net.FlagBroadcast != 0 {
+			flags = append(flags, "broadcast")
+		}
+		if ifi.Flags&net.FlagLoopback != 0 {
+			flags = append(flags, "loopback")
+		}
+		if ifi.Flags&net.FlagPointToPoint != 0 {
+			flags = append(flags, "pointtopoint")
+		}
+		if ifi.Flags&net.FlagMulticast != 0 {
+			flags = append(flags, "multicast")
+		}
+
+		r := InterfaceStat{
+			Name:         ifi.Name,
+			MTU:          ifi.MTU,
+			HardwareAddr: ifi.HardwareAddr.String(),
+			Flags:        flags,
+		}
+		addrs, err := ifi.Addrs()
+		if err == nil {
+			r.Addrs = make([]InterfaceAddr, 0, len(addrs))
+			for _, addr := range addrs {
+				r.Addrs = append(r.Addrs, InterfaceAddr{
+					Addr: addr.String(),
+				})
+			}
+
+		}
+		ret = append(ret, r)
+	}
+
+	return ret, nil
+}
+
+func getIOCountersAll(n []IOCountersStat) ([]IOCountersStat, error) {
+	r := IOCountersStat{
+		Name: "all",
+	}
+	for _, nic := range n {
+		r.BytesRecv += nic.BytesRecv
+		r.PacketsRecv += nic.PacketsRecv
+		r.Errin += nic.Errin
+		r.Dropin += nic.Dropin
+		r.BytesSent += nic.BytesSent
+		r.PacketsSent += nic.PacketsSent
+		r.Errout += nic.Errout
+		r.Dropout += nic.Dropout
+	}
+
+	return []IOCountersStat{r}, nil
+}
+
+func parseNetLine(line string) (ConnectionStat, error) {
+	f := strings.Fields(line)
+	if len(f) < 9 {
+		return ConnectionStat{}, fmt.Errorf("wrong line,%s", line)
+	}
+
+	pid, err := strconv.Atoi(f[1])
+	if err != nil {
+		return ConnectionStat{}, err
+	}
+	fd, err := strconv.Atoi(strings.Trim(f[3], "u"))
+	if err != nil {
+		return ConnectionStat{}, fmt.Errorf("unknown fd, %s", f[3])
+	}
+	netFamily, ok := constMap[f[4]]
+	if !ok {
+		return ConnectionStat{}, fmt.Errorf("unknown family, %s", f[4])
+	}
+	netType, ok := constMap[f[7]]
+	if !ok {
+		return ConnectionStat{}, fmt.Errorf("unknown type, %s", f[7])
+	}
+
+	laddr, raddr, err := parseNetAddr(f[8])
+	if err != nil {
+		return ConnectionStat{}, fmt.Errorf("failed to parse netaddr, %s", f[8])
+	}
+
+	n := ConnectionStat{
+		Fd:     uint32(fd),
+		Family: uint32(netFamily),
+		Type:   uint32(netType),
+		Laddr:  laddr,
+		Raddr:  raddr,
+		Pid:    int32(pid),
+	}
+	if len(f) == 10 {
+		n.Status = strings.Trim(f[9], "()")
+	}
+
+	return n, nil
+}
+
+func parseNetAddr(line string) (laddr Addr, raddr Addr, err error) {
+	parse := func(l string) (Addr, error) {
+		host, port, err := net.SplitHostPort(l)
+		if err != nil {
+			return Addr{}, fmt.Errorf("wrong addr, %s", l)
+		}
+		lport, err := strconv.Atoi(port)
+		if err != nil {
+			return Addr{}, err
+		}
+		return Addr{IP: host, Port: uint32(lport)}, nil
+	}
+
+	addrs := strings.Split(line, "->")
+	if len(addrs) == 0 {
+		return laddr, raddr, fmt.Errorf("wrong netaddr, %s", line)
+	}
+	laddr, err = parse(addrs[0])
+	if len(addrs) == 2 { // remote addr exists
+		raddr, err = parse(addrs[1])
+		if err != nil {
+			return laddr, raddr, err
+		}
+	}
+
+	return laddr, raddr, err
+}
diff --git a/vendor/github.com/shirou/gopsutil/net/net_darwin.go b/vendor/github.com/shirou/gopsutil/net/net_darwin.go
new file mode 100644
index 0000000000..4fa358a38c
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/net/net_darwin.go
@@ -0,0 +1,114 @@
+// +build darwin
+
+package net
+
+import (
+	"errors"
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// example of netstat -idbn output on yosemite
+// Name  Mtu   Network       Address            Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
+// lo0   16384 <Link#1>                        869107     0  169411755   869107     0  169411755     0   0
+// lo0   16384 ::1/128     ::1                 869107     -  169411755   869107     -  169411755     -   -
+// lo0   16384 127           127.0.0.1         869107     -  169411755   869107     -  169411755     -   -
+func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	netstat, err := exec.LookPath("/usr/sbin/netstat")
+	if err != nil {
+		return nil, err
+	}
+	out, err := exec.Command(netstat, "-ibdnW").Output()
+	if err != nil {
+		return nil, err
+	}
+
+	lines := strings.Split(string(out), "\n")
+	ret := make([]IOCountersStat, 0, len(lines)-1)
+	exists := make([]string, 0, len(ret))
+
+	for _, line := range lines {
+		values := strings.Fields(line)
+		if len(values) < 1 || values[0] == "Name" {
+			// skip first line
+			continue
+		}
+		if common.StringsHas(exists, values[0]) {
+			// skip if already get
+			continue
+		}
+		exists = append(exists, values[0])
+
+		base := 1
+		// sometimes Address is ommitted
+		if len(values) < 11 {
+			base = 0
+		}
+
+		parsed := make([]uint64, 0, 7)
+		vv := []string{
+			values[base+3], // Ipkts == PacketsRecv
+			values[base+4], // Ierrs == Errin
+			values[base+5], // Ibytes == BytesRecv
+			values[base+6], // Opkts == PacketsSent
+			values[base+7], // Oerrs == Errout
+			values[base+8], // Obytes == BytesSent
+		}
+		if len(values) == 12 {
+			vv = append(vv, values[base+10])
+		}
+
+		for _, target := range vv {
+			if target == "-" {
+				parsed = append(parsed, 0)
+				continue
+			}
+
+			t, err := strconv.ParseUint(target, 10, 64)
+			if err != nil {
+				return nil, err
+			}
+			parsed = append(parsed, t)
+		}
+
+		n := IOCountersStat{
+			Name:        values[0],
+			PacketsRecv: parsed[0],
+			Errin:       parsed[1],
+			BytesRecv:   parsed[2],
+			PacketsSent: parsed[3],
+			Errout:      parsed[4],
+			BytesSent:   parsed[5],
+		}
+		if len(parsed) == 7 {
+			n.Dropout = parsed[6]
+		}
+		ret = append(ret, n)
+	}
+
+	if pernic == false {
+		return getIOCountersAll(ret)
+	}
+
+	return ret, nil
+}
+
+// NetIOCountersByFile is an method which is added just a compatibility for linux.
+func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
+	return IOCounters(pernic)
+}
+
+func FilterCounters() ([]FilterStat, error) {
+	return nil, errors.New("NetFilterCounters not implemented for darwin")
+}
+
+// NetProtoCounters returns network statistics for the entire system
+// If protocols is empty then all protocols are returned, otherwise
+// just the protocols in the list are returned.
+// Not Implemented for Darwin
+func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
+	return nil, errors.New("NetProtoCounters not implemented for darwin")
+}
diff --git a/vendor/github.com/shirou/gopsutil/net/net_freebsd.go b/vendor/github.com/shirou/gopsutil/net/net_freebsd.go
new file mode 100644
index 0000000000..3a67b4af4a
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/net/net_freebsd.go
@@ -0,0 +1,108 @@
+// +build freebsd
+
+package net
+
+import (
+	"errors"
+	"os/exec"
+	"strconv"
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	netstat, err := exec.LookPath("/usr/bin/netstat")
+	if err != nil {
+		return nil, err
+	}
+	out, err := exec.Command(netstat, "-ibdnW").Output()
+	if err != nil {
+		return nil, err
+	}
+
+	lines := strings.Split(string(out), "\n")
+	ret := make([]IOCountersStat, 0, len(lines)-1)
+	exists := make([]string, 0, len(ret))
+
+	for _, line := range lines {
+		values := strings.Fields(line)
+		if len(values) < 1 || values[0] == "Name" {
+			continue
+		}
+		if common.StringsHas(exists, values[0]) {
+			// skip if already get
+			continue
+		}
+		exists = append(exists, values[0])
+
+		if len(values) < 12 {
+			continue
+		}
+		base := 1
+		// sometimes Address is ommitted
+		if len(values) < 13 {
+			base = 0
+		}
+
+		parsed := make([]uint64, 0, 8)
+		vv := []string{
+			values[base+3],  // PacketsRecv
+			values[base+4],  // Errin
+			values[base+5],  // Dropin
+			values[base+6],  // BytesRecvn
+			values[base+7],  // PacketSent
+			values[base+8],  // Errout
+			values[base+9],  // BytesSent
+			values[base+11], // Dropout
+		}
+		for _, target := range vv {
+			if target == "-" {
+				parsed = append(parsed, 0)
+				continue
+			}
+
+			t, err := strconv.ParseUint(target, 10, 64)
+			if err != nil {
+				return nil, err
+			}
+			parsed = append(parsed, t)
+		}
+
+		n := IOCountersStat{
+			Name:        values[0],
+			PacketsRecv: parsed[0],
+			Errin:       parsed[1],
+			Dropin:      parsed[2],
+			BytesRecv:   parsed[3],
+			PacketsSent: parsed[4],
+			Errout:      parsed[5],
+			BytesSent:   parsed[6],
+			Dropout:     parsed[7],
+		}
+		ret = append(ret, n)
+	}
+
+	if pernic == false {
+		return getIOCountersAll(ret)
+	}
+
+	return ret, nil
+}
+
+// NetIOCountersByFile is an method which is added just a compatibility for linux.
+func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
+	return IOCounters(pernic)
+}
+
+func FilterCounters() ([]FilterStat, error) {
+	return nil, errors.New("NetFilterCounters not implemented for freebsd")
+}
+
+// NetProtoCounters returns network statistics for the entire system
+// If protocols is empty then all protocols are returned, otherwise
+// just the protocols in the list are returned.
+// Not Implemented for FreeBSD
+func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
+	return nil, errors.New("NetProtoCounters not implemented for freebsd")
+}
diff --git a/vendor/github.com/shirou/gopsutil/net/net_linux.go b/vendor/github.com/shirou/gopsutil/net/net_linux.go
new file mode 100644
index 0000000000..e0247714fe
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/net/net_linux.go
@@ -0,0 +1,620 @@
+// +build linux
+
+package net
+
+import (
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"os"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// NetIOCounters returnes network I/O statistics for every network
+// interface installed on the system.  If pernic argument is false,
+// return only sum of all information (which name is 'all'). If true,
+// every network interface installed on the system is returned
+// separately.
+func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	filename := common.HostProc("net/dev")
+	return IOCountersByFile(pernic, filename)
+}
+
+func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
+	lines, err := common.ReadLines(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	statlen := len(lines) - 1
+
+	ret := make([]IOCountersStat, 0, statlen)
+
+	for _, line := range lines[2:] {
+		parts := strings.SplitN(line, ":", 2)
+		if len(parts) != 2 {
+			continue
+		}
+		interfaceName := strings.TrimSpace(parts[0])
+		if interfaceName == "" {
+			continue
+		}
+
+		fields := strings.Fields(strings.TrimSpace(parts[1]))
+		bytesRecv, err := strconv.ParseUint(fields[0], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		packetsRecv, err := strconv.ParseUint(fields[1], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		errIn, err := strconv.ParseUint(fields[2], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		dropIn, err := strconv.ParseUint(fields[3], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		bytesSent, err := strconv.ParseUint(fields[8], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		packetsSent, err := strconv.ParseUint(fields[9], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		errOut, err := strconv.ParseUint(fields[10], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+		dropOut, err := strconv.ParseUint(fields[13], 10, 64)
+		if err != nil {
+			return ret, err
+		}
+
+		nic := IOCountersStat{
+			Name:        interfaceName,
+			BytesRecv:   bytesRecv,
+			PacketsRecv: packetsRecv,
+			Errin:       errIn,
+			Dropin:      dropIn,
+			BytesSent:   bytesSent,
+			PacketsSent: packetsSent,
+			Errout:      errOut,
+			Dropout:     dropOut,
+		}
+		ret = append(ret, nic)
+	}
+
+	if pernic == false {
+		return getIOCountersAll(ret)
+	}
+
+	return ret, nil
+}
+
+var netProtocols = []string{
+	"ip",
+	"icmp",
+	"icmpmsg",
+	"tcp",
+	"udp",
+	"udplite",
+}
+
+// NetProtoCounters returns network statistics for the entire system
+// If protocols is empty then all protocols are returned, otherwise
+// just the protocols in the list are returned.
+// Available protocols:
+//   ip,icmp,icmpmsg,tcp,udp,udplite
+func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
+	if len(protocols) == 0 {
+		protocols = netProtocols
+	}
+
+	stats := make([]ProtoCountersStat, 0, len(protocols))
+	protos := make(map[string]bool, len(protocols))
+	for _, p := range protocols {
+		protos[p] = true
+	}
+
+	filename := common.HostProc("net/snmp")
+	lines, err := common.ReadLines(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	linecount := len(lines)
+	for i := 0; i < linecount; i++ {
+		line := lines[i]
+		r := strings.IndexRune(line, ':')
+		if r == -1 {
+			return nil, errors.New(filename + " is not fomatted correctly, expected ':'.")
+		}
+		proto := strings.ToLower(line[:r])
+		if !protos[proto] {
+			// skip protocol and data line
+			i++
+			continue
+		}
+
+		// Read header line
+		statNames := strings.Split(line[r+2:], " ")
+
+		// Read data line
+		i++
+		statValues := strings.Split(lines[i][r+2:], " ")
+		if len(statNames) != len(statValues) {
+			return nil, errors.New(filename + " is not fomatted correctly, expected same number of columns.")
+		}
+		stat := ProtoCountersStat{
+			Protocol: proto,
+			Stats:    make(map[string]int64, len(statNames)),
+		}
+		for j := range statNames {
+			value, err := strconv.ParseInt(statValues[j], 10, 64)
+			if err != nil {
+				return nil, err
+			}
+			stat.Stats[statNames[j]] = value
+		}
+		stats = append(stats, stat)
+	}
+	return stats, nil
+}
+
+// NetFilterCounters returns iptables conntrack statistics
+// the currently in use conntrack count and the max.
+// If the file does not exist or is invalid it will return nil.
+func FilterCounters() ([]FilterStat, error) {
+	countfile := common.HostProc("sys/net/netfilter/nf_conntrackCount")
+	maxfile := common.HostProc("sys/net/netfilter/nf_conntrackMax")
+
+	count, err := common.ReadInts(countfile)
+
+	if err != nil {
+		return nil, err
+	}
+	stats := make([]FilterStat, 0, 1)
+
+	max, err := common.ReadInts(maxfile)
+	if err != nil {
+		return nil, err
+	}
+
+	payload := FilterStat{
+		ConnTrackCount: count[0],
+		ConnTrackMax:   max[0],
+	}
+
+	stats = append(stats, payload)
+	return stats, nil
+}
+
+// http://students.mimuw.edu.pl/lxr/source/include/net/tcp_states.h
+var TCPStatuses = map[string]string{
+	"01": "ESTABLISHED",
+	"02": "SYN_SENT",
+	"03": "SYN_RECV",
+	"04": "FIN_WAIT1",
+	"05": "FIN_WAIT2",
+	"06": "TIME_WAIT",
+	"07": "CLOSE",
+	"08": "CLOSE_WAIT",
+	"09": "LAST_ACK",
+	"0A": "LISTEN",
+	"0B": "CLOSING",
+}
+
+type netConnectionKindType struct {
+	family   uint32
+	sockType uint32
+	filename string
+}
+
+var kindTCP4 = netConnectionKindType{
+	family:   syscall.AF_INET,
+	sockType: syscall.SOCK_STREAM,
+	filename: "tcp",
+}
+var kindTCP6 = netConnectionKindType{
+	family:   syscall.AF_INET6,
+	sockType: syscall.SOCK_STREAM,
+	filename: "tcp6",
+}
+var kindUDP4 = netConnectionKindType{
+	family:   syscall.AF_INET,
+	sockType: syscall.SOCK_DGRAM,
+	filename: "udp",
+}
+var kindUDP6 = netConnectionKindType{
+	family:   syscall.AF_INET6,
+	sockType: syscall.SOCK_DGRAM,
+	filename: "udp6",
+}
+var kindUNIX = netConnectionKindType{
+	family:   syscall.AF_UNIX,
+	filename: "unix",
+}
+
+var netConnectionKindMap = map[string][]netConnectionKindType{
+	"all":   []netConnectionKindType{kindTCP4, kindTCP6, kindUDP4, kindUDP6, kindUNIX},
+	"tcp":   []netConnectionKindType{kindTCP4, kindTCP6},
+	"tcp4":  []netConnectionKindType{kindTCP4},
+	"tcp6":  []netConnectionKindType{kindTCP6},
+	"udp":   []netConnectionKindType{kindUDP4, kindUDP6},
+	"udp4":  []netConnectionKindType{kindUDP4},
+	"udp6":  []netConnectionKindType{kindUDP6},
+	"unix":  []netConnectionKindType{kindUNIX},
+	"inet":  []netConnectionKindType{kindTCP4, kindTCP6, kindUDP4, kindUDP6},
+	"inet4": []netConnectionKindType{kindTCP4, kindUDP4},
+	"inet6": []netConnectionKindType{kindTCP6, kindUDP6},
+}
+
+type inodeMap struct {
+	pid int32
+	fd  uint32
+}
+
+type connTmp struct {
+	fd       uint32
+	family   uint32
+	sockType uint32
+	laddr    Addr
+	raddr    Addr
+	status   string
+	pid      int32
+	boundPid int32
+	path     string
+}
+
+// Return a list of network connections opened.
+func Connections(kind string) ([]ConnectionStat, error) {
+	return ConnectionsPid(kind, 0)
+}
+
+// Return a list of network connections opened by a process.
+func ConnectionsPid(kind string, pid int32) ([]ConnectionStat, error) {
+	tmap, ok := netConnectionKindMap[kind]
+	if !ok {
+		return nil, fmt.Errorf("invalid kind, %s", kind)
+	}
+	root := common.HostProc()
+	var err error
+	var inodes map[string][]inodeMap
+	if pid == 0 {
+		inodes, err = getProcInodesAll(root)
+	} else {
+		inodes, err = getProcInodes(root, pid)
+		if len(inodes) == 0 {
+			// no connection for the pid
+			return []ConnectionStat{}, nil
+		}
+	}
+	if err != nil {
+		return nil, fmt.Errorf("cound not get pid(s), %d", pid)
+	}
+
+	dupCheckMap := make(map[string]bool)
+	var ret []ConnectionStat
+
+	for _, t := range tmap {
+		var path string
+		var ls []connTmp
+		path = fmt.Sprintf("%s/net/%s", root, t.filename)
+		switch t.family {
+		case syscall.AF_INET:
+			fallthrough
+		case syscall.AF_INET6:
+			ls, err = processInet(path, t, inodes, pid)
+		case syscall.AF_UNIX:
+			ls, err = processUnix(path, t, inodes, pid)
+		}
+		if err != nil {
+			return nil, err
+		}
+		for _, c := range ls {
+			conn := ConnectionStat{
+				Fd:     c.fd,
+				Family: c.family,
+				Type:   c.sockType,
+				Laddr:  c.laddr,
+				Raddr:  c.raddr,
+				Status: c.status,
+				Pid:    c.pid,
+			}
+			if c.pid == 0 {
+				conn.Pid = c.boundPid
+			} else {
+				conn.Pid = c.pid
+			}
+			// check duplicate using JSON format
+			json := conn.String()
+			_, exists := dupCheckMap[json]
+			if !exists {
+				ret = append(ret, conn)
+				dupCheckMap[json] = true
+			}
+		}
+
+	}
+
+	return ret, nil
+}
+
+// getProcInodes returnes fd of the pid.
+func getProcInodes(root string, pid int32) (map[string][]inodeMap, error) {
+	ret := make(map[string][]inodeMap)
+
+	dir := fmt.Sprintf("%s/%d/fd", root, pid)
+	files, err := ioutil.ReadDir(dir)
+	if err != nil {
+		return ret, nil
+	}
+	for _, fd := range files {
+		inodePath := fmt.Sprintf("%s/%d/fd/%s", root, pid, fd.Name())
+
+		inode, err := os.Readlink(inodePath)
+		if err != nil {
+			continue
+		}
+		if !strings.HasPrefix(inode, "socket:[") {
+			continue
+		}
+		// the process is using a socket
+		l := len(inode)
+		inode = inode[8 : l-1]
+		_, ok := ret[inode]
+		if !ok {
+			ret[inode] = make([]inodeMap, 0)
+		}
+		fd, err := strconv.Atoi(fd.Name())
+		if err != nil {
+			continue
+		}
+
+		i := inodeMap{
+			pid: pid,
+			fd:  uint32(fd),
+		}
+		ret[inode] = append(ret[inode], i)
+	}
+	return ret, nil
+}
+
+// Pids retunres all pids.
+// Note: this is a copy of process_linux.Pids()
+// FIXME: Import process occures import cycle.
+// move to common made other platform breaking. Need consider.
+func Pids() ([]int32, error) {
+	var ret []int32
+
+	d, err := os.Open(common.HostProc())
+	if err != nil {
+		return nil, err
+	}
+	defer d.Close()
+
+	fnames, err := d.Readdirnames(-1)
+	if err != nil {
+		return nil, err
+	}
+	for _, fname := range fnames {
+		pid, err := strconv.ParseInt(fname, 10, 32)
+		if err != nil {
+			// if not numeric name, just skip
+			continue
+		}
+		ret = append(ret, int32(pid))
+	}
+
+	return ret, nil
+}
+
+func getProcInodesAll(root string) (map[string][]inodeMap, error) {
+	pids, err := Pids()
+	if err != nil {
+		return nil, err
+	}
+	ret := make(map[string][]inodeMap)
+
+	for _, pid := range pids {
+		t, err := getProcInodes(root, pid)
+		if err != nil {
+			return ret, err
+		}
+		if len(t) == 0 {
+			continue
+		}
+		// TODO: update ret.
+		ret = updateMap(ret, t)
+	}
+	return ret, nil
+}
+
+// decodeAddress decode addresse represents addr in proc/net/*
+// ex:
+// "0500000A:0016" -> "10.0.0.5", 22
+// "0085002452100113070057A13F025401:0035" -> "2400:8500:1301:1052:a157:7:154:23f", 53
+func decodeAddress(family uint32, src string) (Addr, error) {
+	t := strings.Split(src, ":")
+	if len(t) != 2 {
+		return Addr{}, fmt.Errorf("does not contain port, %s", src)
+	}
+	addr := t[0]
+	port, err := strconv.ParseInt("0x"+t[1], 0, 64)
+	if err != nil {
+		return Addr{}, fmt.Errorf("invalid port, %s", src)
+	}
+	decoded, err := hex.DecodeString(addr)
+	if err != nil {
+		return Addr{}, fmt.Errorf("decode error, %s", err)
+	}
+	var ip net.IP
+	// Assumes this is little_endian
+	if family == syscall.AF_INET {
+		ip = net.IP(Reverse(decoded))
+	} else { // IPv6
+		ip, err = parseIPv6HexString(decoded)
+		if err != nil {
+			return Addr{}, err
+		}
+	}
+	return Addr{
+		IP:   ip.String(),
+		Port: uint32(port),
+	}, nil
+}
+
+// Reverse reverses array of bytes.
+func Reverse(s []byte) []byte {
+	for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 {
+		s[i], s[j] = s[j], s[i]
+	}
+	return s
+}
+
+// parseIPv6HexString parse array of bytes to IPv6 string
+func parseIPv6HexString(src []byte) (net.IP, error) {
+	if len(src) != 16 {
+		return nil, fmt.Errorf("invalid IPv6 string")
+	}
+
+	buf := make([]byte, 0, 16)
+	for i := 0; i < len(src); i += 4 {
+		r := Reverse(src[i : i+4])
+		buf = append(buf, r...)
+	}
+	return net.IP(buf), nil
+}
+
+func processInet(file string, kind netConnectionKindType, inodes map[string][]inodeMap, filterPid int32) ([]connTmp, error) {
+
+	if strings.HasSuffix(file, "6") && !common.PathExists(file) {
+		// IPv6 not supported, return empty.
+		return []connTmp{}, nil
+	}
+	lines, err := common.ReadLines(file)
+	if err != nil {
+		return nil, err
+	}
+	var ret []connTmp
+	// skip first line
+	for _, line := range lines[1:] {
+		l := strings.Fields(line)
+		if len(l) < 10 {
+			continue
+		}
+		laddr := l[1]
+		raddr := l[2]
+		status := l[3]
+		inode := l[9]
+		pid := int32(0)
+		fd := uint32(0)
+		i, exists := inodes[inode]
+		if exists {
+			pid = i[0].pid
+			fd = i[0].fd
+		}
+		if filterPid > 0 && filterPid != pid {
+			continue
+		}
+		if kind.sockType == syscall.SOCK_STREAM {
+			status = TCPStatuses[status]
+		} else {
+			status = "NONE"
+		}
+		la, err := decodeAddress(kind.family, laddr)
+		if err != nil {
+			continue
+		}
+		ra, err := decodeAddress(kind.family, raddr)
+		if err != nil {
+			continue
+		}
+
+		ret = append(ret, connTmp{
+			fd:       fd,
+			family:   kind.family,
+			sockType: kind.sockType,
+			laddr:    la,
+			raddr:    ra,
+			status:   status,
+			pid:      pid,
+		})
+	}
+
+	return ret, nil
+}
+
+func processUnix(file string, kind netConnectionKindType, inodes map[string][]inodeMap, filterPid int32) ([]connTmp, error) {
+	lines, err := common.ReadLines(file)
+	if err != nil {
+		return nil, err
+	}
+
+	var ret []connTmp
+	// skip first line
+	for _, line := range lines[1:] {
+		tokens := strings.Fields(line)
+		if len(tokens) < 6 {
+			continue
+		}
+		st, err := strconv.Atoi(tokens[4])
+		if err != nil {
+			return nil, err
+		}
+
+		inode := tokens[6]
+
+		var pairs []inodeMap
+		pairs, exists := inodes[inode]
+		if !exists {
+			pairs = []inodeMap{
+				inodeMap{},
+			}
+		}
+		for _, pair := range pairs {
+			if filterPid > 0 && filterPid != pair.pid {
+				continue
+			}
+			var path string
+			if len(tokens) == 8 {
+				path = tokens[len(tokens)-1]
+			}
+			ret = append(ret, connTmp{
+				fd:       pair.fd,
+				family:   kind.family,
+				sockType: uint32(st),
+				laddr: Addr{
+					IP: path,
+				},
+				pid:    pair.pid,
+				status: "NONE",
+				path:   path,
+			})
+		}
+	}
+
+	return ret, nil
+}
+
+func updateMap(src map[string][]inodeMap, add map[string][]inodeMap) map[string][]inodeMap {
+	for key, value := range add {
+		a, exists := src[key]
+		if !exists {
+			src[key] = value
+			continue
+		}
+		src[key] = append(a, value...)
+	}
+	return src
+}
diff --git a/vendor/github.com/shirou/gopsutil/net/net_unix.go b/vendor/github.com/shirou/gopsutil/net/net_unix.go
new file mode 100644
index 0000000000..45de6b17de
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/net/net_unix.go
@@ -0,0 +1,68 @@
+// +build freebsd darwin
+
+package net
+
+import (
+	"strings"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+// Return a list of network connections opened.
+func Connections(kind string) ([]ConnectionStat, error) {
+	return ConnectionsPid(kind, 0)
+}
+
+// Return a list of network connections opened by a process.
+func ConnectionsPid(kind string, pid int32) ([]ConnectionStat, error) {
+	var ret []ConnectionStat
+
+	args := []string{"-i"}
+	switch strings.ToLower(kind) {
+	default:
+		fallthrough
+	case "":
+		fallthrough
+	case "all":
+		fallthrough
+	case "inet":
+		args = append(args, "tcp", "-i", "udp")
+	case "inet4":
+		args = append(args, "4")
+	case "inet6":
+		args = append(args, "6")
+	case "tcp":
+		args = append(args, "tcp")
+	case "tcp4":
+		args = append(args, "4tcp")
+	case "tcp6":
+		args = append(args, "6tcp")
+	case "udp":
+		args = append(args, "udp")
+	case "udp4":
+		args = append(args, "6udp")
+	case "udp6":
+		args = append(args, "6udp")
+	case "unix":
+		return ret, common.ErrNotImplementedError
+	}
+
+	r, err := common.CallLsof(invoke, pid, args...)
+	if err != nil {
+		return nil, err
+	}
+	for _, rr := range r {
+		if strings.HasPrefix(rr, "COMMAND") {
+			continue
+		}
+		n, err := parseNetLine(rr)
+		if err != nil {
+
+			continue
+		}
+
+		ret = append(ret, n)
+	}
+
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/net/net_windows.go b/vendor/github.com/shirou/gopsutil/net/net_windows.go
new file mode 100644
index 0000000000..f125260c4d
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/net/net_windows.go
@@ -0,0 +1,116 @@
+// +build windows
+
+package net
+
+import (
+	"errors"
+	"net"
+	"os"
+	"syscall"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+var (
+	modiphlpapi             = syscall.NewLazyDLL("iphlpapi.dll")
+	procGetExtendedTCPTable = modiphlpapi.NewProc("GetExtendedTcpTable")
+	procGetExtendedUDPTable = modiphlpapi.NewProc("GetExtendedUdpTable")
+)
+
+const (
+	TCPTableBasicListener = iota
+	TCPTableBasicConnections
+	TCPTableBasicAll
+	TCPTableOwnerPIDListener
+	TCPTableOwnerPIDConnections
+	TCPTableOwnerPIDAll
+	TCPTableOwnerModuleListener
+	TCPTableOwnerModuleConnections
+	TCPTableOwnerModuleAll
+)
+
+func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	ifs, err := net.Interfaces()
+	if err != nil {
+		return nil, err
+	}
+
+	ai, err := getAdapterList()
+	if err != nil {
+		return nil, err
+	}
+	var ret []IOCountersStat
+
+	for _, ifi := range ifs {
+		name := ifi.Name
+		for ; ai != nil; ai = ai.Next {
+			name = common.BytePtrToString(&ai.Description[0])
+			c := IOCountersStat{
+				Name: name,
+			}
+
+			row := syscall.MibIfRow{Index: ai.Index}
+			e := syscall.GetIfEntry(&row)
+			if e != nil {
+				return nil, os.NewSyscallError("GetIfEntry", e)
+			}
+			c.BytesSent = uint64(row.OutOctets)
+			c.BytesRecv = uint64(row.InOctets)
+			c.PacketsSent = uint64(row.OutUcastPkts)
+			c.PacketsRecv = uint64(row.InUcastPkts)
+			c.Errin = uint64(row.InErrors)
+			c.Errout = uint64(row.OutErrors)
+			c.Dropin = uint64(row.InDiscards)
+			c.Dropout = uint64(row.OutDiscards)
+
+			ret = append(ret, c)
+		}
+	}
+
+	if pernic == false {
+		return getIOCountersAll(ret)
+	}
+	return ret, nil
+}
+
+// NetIOCountersByFile is an method which is added just a compatibility for linux.
+func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
+	return IOCounters(pernic)
+}
+
+// Return a list of network connections opened by a process
+func Connections(kind string) ([]ConnectionStat, error) {
+	var ret []ConnectionStat
+
+	return ret, common.ErrNotImplementedError
+}
+
+// borrowed from src/pkg/net/interface_windows.go
+func getAdapterList() (*syscall.IpAdapterInfo, error) {
+	b := make([]byte, 1000)
+	l := uint32(len(b))
+	a := (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
+	err := syscall.GetAdaptersInfo(a, &l)
+	if err == syscall.ERROR_BUFFER_OVERFLOW {
+		b = make([]byte, l)
+		a = (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
+		err = syscall.GetAdaptersInfo(a, &l)
+	}
+	if err != nil {
+		return nil, os.NewSyscallError("GetAdaptersInfo", err)
+	}
+	return a, nil
+}
+
+func FilterCounters() ([]FilterStat, error) {
+	return nil, errors.New("NetFilterCounters not implemented for windows")
+}
+
+// NetProtoCounters returns network statistics for the entire system
+// If protocols is empty then all protocols are returned, otherwise
+// just the protocols in the list are returned.
+// Not Implemented for Windows
+func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
+	return nil, errors.New("NetProtoCounters not implemented for windows")
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process.go b/vendor/github.com/shirou/gopsutil/process/process.go
new file mode 100644
index 0000000000..2b9d6854ee
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process.go
@@ -0,0 +1,166 @@
+package process
+
+import (
+	"encoding/json"
+	"runtime"
+	"time"
+
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/mem"
+)
+
+var invoke common.Invoker
+
+func init() {
+	invoke = common.Invoke{}
+}
+
+type Process struct {
+	Pid            int32 `json:"pid"`
+	name           string
+	status         string
+	numCtxSwitches *NumCtxSwitchesStat
+	uids           []int32
+	gids           []int32
+	numThreads     int32
+	memInfo        *MemoryInfoStat
+
+	lastCPUTimes *cpu.TimesStat
+	lastCPUTime  time.Time
+}
+
+type OpenFilesStat struct {
+	Path string `json:"path"`
+	Fd   uint64 `json:"fd"`
+}
+
+type MemoryInfoStat struct {
+	RSS  uint64 `json:"rss"`  // bytes
+	VMS  uint64 `json:"vms"`  // bytes
+	Swap uint64 `json:"swap"` // bytes
+}
+
+type RlimitStat struct {
+	Resource int32 `json:"resource"`
+	Soft     int32 `json:"soft"`
+	Hard     int32 `json:"hard"`
+}
+
+type IOCountersStat struct {
+	ReadCount  uint64 `json:"readCount"`
+	WriteCount uint64 `json:"writeCount"`
+	ReadBytes  uint64 `json:"readBytes"`
+	WriteBytes uint64 `json:"writeBytes"`
+}
+
+type NumCtxSwitchesStat struct {
+	Voluntary   int64 `json:"voluntary"`
+	Involuntary int64 `json:"involuntary"`
+}
+
+func (p Process) String() string {
+	s, _ := json.Marshal(p)
+	return string(s)
+}
+
+func (o OpenFilesStat) String() string {
+	s, _ := json.Marshal(o)
+	return string(s)
+}
+
+func (m MemoryInfoStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
+
+func (r RlimitStat) String() string {
+	s, _ := json.Marshal(r)
+	return string(s)
+}
+
+func (i IOCountersStat) String() string {
+	s, _ := json.Marshal(i)
+	return string(s)
+}
+
+func (p NumCtxSwitchesStat) String() string {
+	s, _ := json.Marshal(p)
+	return string(s)
+}
+
+func PidExists(pid int32) (bool, error) {
+	pids, err := Pids()
+	if err != nil {
+		return false, err
+	}
+
+	for _, i := range pids {
+		if i == pid {
+			return true, err
+		}
+	}
+
+	return false, err
+}
+
+// If interval is 0, return difference from last call(non-blocking).
+// If interval > 0, wait interval sec and return diffrence between start and end.
+func (p *Process) Percent(interval time.Duration) (float64, error) {
+	cpuTimes, err := p.Times()
+	if err != nil {
+		return 0, err
+	}
+	now := time.Now()
+
+	if interval > 0 {
+		p.lastCPUTimes = cpuTimes
+		p.lastCPUTime = now
+		time.Sleep(interval)
+		cpuTimes, err = p.Times()
+		now = time.Now()
+		if err != nil {
+			return 0, err
+		}
+	} else {
+		if p.lastCPUTimes == nil {
+			// invoked first time
+			p.lastCPUTimes = cpuTimes
+			p.lastCPUTime = now
+			return 0, nil
+		}
+	}
+
+	numcpu := runtime.NumCPU()
+	delta := (now.Sub(p.lastCPUTime).Seconds()) * float64(numcpu)
+	ret := calculatePercent(p.lastCPUTimes, cpuTimes, delta, numcpu)
+	p.lastCPUTimes = cpuTimes
+	p.lastCPUTime = now
+	return ret, nil
+}
+
+func calculatePercent(t1, t2 *cpu.TimesStat, delta float64, numcpu int) float64 {
+	if delta == 0 {
+		return 0
+	}
+	delta_proc := t2.Total() - t1.Total()
+	overall_percent := ((delta_proc / delta) * 100) * float64(numcpu)
+	return overall_percent
+}
+
+// MemoryPercent returns how many percent of the total RAM this process uses
+func (p *Process) MemoryPercent() (float32, error) {
+	machineMemory, err := mem.VirtualMemory()
+	if err != nil {
+		return 0, err
+	}
+	total := machineMemory.Total
+
+	processMemory, err := p.MemoryInfo()
+	if err != nil {
+		return 0, err
+	}
+	used := processMemory.RSS
+
+	return (100 * float32(used) / float32(total)), nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_darwin.go b/vendor/github.com/shirou/gopsutil/process/process_darwin.go
new file mode 100644
index 0000000000..cea0803e6d
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_darwin.go
@@ -0,0 +1,451 @@
+// +build darwin
+
+package process
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"os/exec"
+	"strconv"
+	"strings"
+	"syscall"
+	"unsafe"
+
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
+)
+
+// copied from sys/sysctl.h
+const (
+	CTLKern          = 1  // "high kernel": proc, limits
+	KernProc         = 14 // struct: process entries
+	KernProcPID      = 1  // by process id
+	KernProcProc     = 8  // only return procs
+	KernProcAll      = 0  // everything
+	KernProcPathname = 12 // path to executable
+)
+
+const (
+	ClockTicks = 100 // C.sysconf(C._SC_CLK_TCK)
+)
+
+type _Ctype_struct___0 struct {
+	Pad uint64
+}
+
+// MemoryInfoExStat is different between OSes
+type MemoryInfoExStat struct {
+}
+
+type MemoryMapsStat struct {
+}
+
+func Pids() ([]int32, error) {
+	var ret []int32
+
+	pids, err := callPs("pid", 0, false)
+	if err != nil {
+		return ret, err
+	}
+
+	for _, pid := range pids {
+		v, err := strconv.Atoi(pid[0])
+		if err != nil {
+			return ret, err
+		}
+		ret = append(ret, int32(v))
+	}
+
+	return ret, nil
+}
+
+func (p *Process) Ppid() (int32, error) {
+	r, err := callPs("ppid", p.Pid, false)
+	v, err := strconv.Atoi(r[0][0])
+	if err != nil {
+		return 0, err
+	}
+
+	return int32(v), err
+}
+func (p *Process) Name() (string, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return "", err
+	}
+
+	return common.IntToString(k.Proc.P_comm[:]), nil
+}
+func (p *Process) Exe() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+
+// Cmdline returns the command line arguments of the process as a string with
+// each argument separated by 0x20 ascii character.
+func (p *Process) Cmdline() (string, error) {
+	r, err := callPs("command", p.Pid, false)
+	if err != nil {
+		return "", err
+	}
+	return strings.Join(r[0], " "), err
+}
+
+// CmdlineSlice returns the command line arguments of the process as a slice with each
+// element being an argument. Because of current deficiencies in the way that the command
+// line arguments are found, single arguments that have spaces in the will actually be
+// reported as two separate items. In order to do something better CGO would be needed
+// to use the native darwin functions.
+func (p *Process) CmdlineSlice() ([]string, error) {
+	r, err := callPs("command", p.Pid, false)
+	if err != nil {
+		return nil, err
+	}
+	return r[0], err
+}
+func (p *Process) CreateTime() (int64, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Cwd() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Parent() (*Process, error) {
+	rr, err := common.CallLsof(invoke, p.Pid, "-FR")
+	if err != nil {
+		return nil, err
+	}
+	for _, r := range rr {
+		if strings.HasPrefix(r, "p") { // skip if process
+			continue
+		}
+		l := string(r)
+		v, err := strconv.Atoi(strings.Replace(l, "R", "", 1))
+		if err != nil {
+			return nil, err
+		}
+		return NewProcess(int32(v))
+	}
+	return nil, fmt.Errorf("could not find parent line")
+}
+func (p *Process) Status() (string, error) {
+	r, err := callPs("state", p.Pid, false)
+	if err != nil {
+		return "", err
+	}
+
+	return r[0][0], err
+}
+func (p *Process) Uids() ([]int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+
+	// See: http://unix.superglobalmegacorp.com/Net2/newsrc/sys/ucred.h.html
+	userEffectiveUID := int32(k.Eproc.Ucred.UID)
+
+	return []int32{userEffectiveUID}, nil
+}
+func (p *Process) Gids() ([]int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+
+	gids := make([]int32, 0, 3)
+	gids = append(gids, int32(k.Eproc.Pcred.P_rgid), int32(k.Eproc.Ucred.Ngroups), int32(k.Eproc.Pcred.P_svgid))
+
+	return gids, nil
+}
+func (p *Process) Terminal() (string, error) {
+	return "", common.ErrNotImplementedError
+	/*
+		k, err := p.getKProc()
+		if err != nil {
+			return "", err
+		}
+
+		ttyNr := uint64(k.Eproc.Tdev)
+		termmap, err := getTerminalMap()
+		if err != nil {
+			return "", err
+		}
+
+		return termmap[ttyNr], nil
+	*/
+}
+func (p *Process) Nice() (int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return 0, err
+	}
+	return int32(k.Proc.P_nice), nil
+}
+func (p *Process) IOnice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Rlimit() ([]RlimitStat, error) {
+	var rlimit []RlimitStat
+	return rlimit, common.ErrNotImplementedError
+}
+func (p *Process) IOCounters() (*IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumFDs() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) NumThreads() (int32, error) {
+	r, err := callPs("utime,stime", p.Pid, true)
+	if err != nil {
+		return 0, err
+	}
+	return int32(len(r)), nil
+}
+func (p *Process) Threads() (map[string]string, error) {
+	ret := make(map[string]string, 0)
+	return ret, common.ErrNotImplementedError
+}
+
+func convertCPUTimes(s string) (ret float64, err error) {
+	var t int
+	var _tmp string
+	if strings.Contains(s, ":") {
+		_t := strings.Split(s, ":")
+		hour, err := strconv.Atoi(_t[0])
+		if err != nil {
+			return ret, err
+		}
+		t += hour * 60 * 100
+		_tmp = _t[1]
+	} else {
+		_tmp = s
+	}
+
+	_t := strings.Split(_tmp, ".")
+	if err != nil {
+		return ret, err
+	}
+	h, err := strconv.Atoi(_t[0])
+	t += h * 100
+	h, err = strconv.Atoi(_t[1])
+	t += h
+	return float64(t) / ClockTicks, nil
+}
+func (p *Process) Times() (*cpu.TimesStat, error) {
+	r, err := callPs("utime,stime", p.Pid, false)
+
+	if err != nil {
+		return nil, err
+	}
+
+	utime, err := convertCPUTimes(r[0][0])
+	if err != nil {
+		return nil, err
+	}
+	stime, err := convertCPUTimes(r[0][1])
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &cpu.TimesStat{
+		CPU:    "cpu",
+		User:   utime,
+		System: stime,
+	}
+	return ret, nil
+}
+func (p *Process) CPUAffinity() ([]int32, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
+	r, err := callPs("rss,vsize,pagein", p.Pid, false)
+	if err != nil {
+		return nil, err
+	}
+	rss, err := strconv.Atoi(r[0][0])
+	if err != nil {
+		return nil, err
+	}
+	vms, err := strconv.Atoi(r[0][1])
+	if err != nil {
+		return nil, err
+	}
+	pagein, err := strconv.Atoi(r[0][2])
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &MemoryInfoStat{
+		RSS:  uint64(rss) * 1024,
+		VMS:  uint64(vms) * 1024,
+		Swap: uint64(pagein),
+	}
+
+	return ret, nil
+}
+func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Children() ([]*Process, error) {
+	pids, err := common.CallPgrep(invoke, p.Pid)
+	if err != nil {
+		return nil, err
+	}
+	ret := make([]*Process, 0, len(pids))
+	for _, pid := range pids {
+		np, err := NewProcess(pid)
+		if err != nil {
+			return nil, err
+		}
+		ret = append(ret, np)
+	}
+	return ret, nil
+}
+
+func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Connections() ([]net.ConnectionStat, error) {
+	return net.ConnectionsPid("all", p.Pid)
+}
+
+func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) IsRunning() (bool, error) {
+	return true, common.ErrNotImplementedError
+}
+func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
+	var ret []MemoryMapsStat
+	return &ret, common.ErrNotImplementedError
+}
+
+func processes() ([]Process, error) {
+	results := make([]Process, 0, 50)
+
+	mib := []int32{CTLKern, KernProc, KernProcAll, 0}
+	buf, length, err := common.CallSyscall(mib)
+	if err != nil {
+		return results, err
+	}
+
+	// get kinfo_proc size
+	k := KinfoProc{}
+	procinfoLen := int(unsafe.Sizeof(k))
+	count := int(length / uint64(procinfoLen))
+	/*
+		fmt.Println(length, procinfoLen, count)
+		b := buf[0*procinfoLen : 0*procinfoLen+procinfoLen]
+		fmt.Println(b)
+		kk, err := parseKinfoProc(b)
+		fmt.Printf("%#v", kk)
+	*/
+
+	// parse buf to procs
+	for i := 0; i < count; i++ {
+		b := buf[i*procinfoLen : i*procinfoLen+procinfoLen]
+		k, err := parseKinfoProc(b)
+		if err != nil {
+			continue
+		}
+		p, err := NewProcess(int32(k.Proc.P_pid))
+		if err != nil {
+			continue
+		}
+		results = append(results, *p)
+	}
+
+	return results, nil
+}
+
+func parseKinfoProc(buf []byte) (KinfoProc, error) {
+	var k KinfoProc
+	br := bytes.NewReader(buf)
+
+	err := common.Read(br, binary.LittleEndian, &k)
+	if err != nil {
+		return k, err
+	}
+
+	return k, nil
+}
+
+// Returns a proc as defined here:
+// http://unix.superglobalmegacorp.com/Net2/newsrc/sys/kinfo_proc.h.html
+func (p *Process) getKProc() (*KinfoProc, error) {
+	mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid}
+	procK := KinfoProc{}
+	length := uint64(unsafe.Sizeof(procK))
+	buf := make([]byte, length)
+	_, _, syserr := syscall.Syscall6(
+		syscall.SYS___SYSCTL,
+		uintptr(unsafe.Pointer(&mib[0])),
+		uintptr(len(mib)),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&length)),
+		0,
+		0)
+	if syserr != 0 {
+		return nil, syserr
+	}
+	k, err := parseKinfoProc(buf)
+	if err != nil {
+		return nil, err
+	}
+
+	return &k, nil
+}
+
+func NewProcess(pid int32) (*Process, error) {
+	p := &Process{Pid: pid}
+
+	return p, nil
+}
+
+// call ps command.
+// Return value deletes Header line(you must not input wrong arg).
+// And splited by Space. Caller have responsibility to manage.
+// If passed arg pid is 0, get information from all process.
+func callPs(arg string, pid int32, threadOption bool) ([][]string, error) {
+	bin, err := exec.LookPath("ps")
+	if err != nil {
+		return [][]string{}, err
+	}
+
+	var cmd []string
+	if pid == 0 { // will get from all processes.
+		cmd = []string{"-ax", "-o", arg}
+	} else if threadOption {
+		cmd = []string{"-x", "-o", arg, "-M", "-p", strconv.Itoa(int(pid))}
+	} else {
+		cmd = []string{"-x", "-o", arg, "-p", strconv.Itoa(int(pid))}
+	}
+	out, err := invoke.Command(bin, cmd...)
+	if err != nil {
+		return [][]string{}, err
+	}
+	lines := strings.Split(string(out), "\n")
+
+	var ret [][]string
+	for _, l := range lines[1:] {
+		var lr []string
+		for _, r := range strings.Split(l, " ") {
+			if r == "" {
+				continue
+			}
+			lr = append(lr, strings.TrimSpace(r))
+		}
+		if len(lr) != 0 {
+			ret = append(ret, lr)
+		}
+	}
+
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_darwin_amd64.go b/vendor/github.com/shirou/gopsutil/process/process_darwin_amd64.go
new file mode 100644
index 0000000000..f8e922385b
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_darwin_amd64.go
@@ -0,0 +1,234 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+package process
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type UGid_t uint32
+
+type KinfoProc struct {
+	Proc  ExternProc
+	Eproc Eproc
+}
+
+type Eproc struct {
+	Paddr     *uint64
+	Sess      *Session
+	Pcred     Upcred
+	Ucred     Uucred
+	Pad_cgo_0 [4]byte
+	Vm        Vmspace
+	Ppid      int32
+	Pgid      int32
+	Jobc      int16
+	Pad_cgo_1 [2]byte
+	Tdev      int32
+	Tpgid     int32
+	Pad_cgo_2 [4]byte
+	Tsess     *Session
+	Wmesg     [8]int8
+	Xsize     int32
+	Xrssize   int16
+	Xccount   int16
+	Xswrss    int16
+	Pad_cgo_3 [2]byte
+	Flag      int32
+	Login     [12]int8
+	Spare     [4]int32
+	Pad_cgo_4 [4]byte
+}
+
+type Proc struct{}
+
+type Session struct{}
+
+type ucred struct {
+	Link  _Ctype_struct___0
+	Ref   uint64
+	Posix Posix_cred
+	Label *Label
+	Audit Au_session
+}
+
+type Uucred struct {
+	Ref       int32
+	UID       uint32
+	Ngroups   int16
+	Pad_cgo_0 [2]byte
+	Groups    [16]uint32
+}
+
+type Upcred struct {
+	Pc_lock   [72]int8
+	Pc_ucred  *ucred
+	P_ruid    uint32
+	P_svuid   uint32
+	P_rgid    uint32
+	P_svgid   uint32
+	P_refcnt  int32
+	Pad_cgo_0 [4]byte
+}
+
+type Vmspace struct {
+	Dummy     int32
+	Pad_cgo_0 [4]byte
+	Dummy2    *int8
+	Dummy3    [5]int32
+	Pad_cgo_1 [4]byte
+	Dummy4    [3]*int8
+}
+
+type Sigacts struct{}
+
+type ExternProc struct {
+	P_un        [16]byte
+	P_vmspace   uint64
+	P_sigacts   uint64
+	Pad_cgo_0   [3]byte
+	P_flag      int32
+	P_stat      int8
+	P_pid       int32
+	P_oppid     int32
+	P_dupfd     int32
+	Pad_cgo_1   [4]byte
+	User_stack  uint64
+	Exit_thread uint64
+	P_debugger  int32
+	Sigwait     int32
+	P_estcpu    uint32
+	P_cpticks   int32
+	P_pctcpu    uint32
+	Pad_cgo_2   [4]byte
+	P_wchan     uint64
+	P_wmesg     uint64
+	P_swtime    uint32
+	P_slptime   uint32
+	P_realtimer Itimerval
+	P_rtime     Timeval
+	P_uticks    uint64
+	P_sticks    uint64
+	P_iticks    uint64
+	P_traceflag int32
+	Pad_cgo_3   [4]byte
+	P_tracep    uint64
+	P_siglist   int32
+	Pad_cgo_4   [4]byte
+	P_textvp    uint64
+	P_holdcnt   int32
+	P_sigmask   uint32
+	P_sigignore uint32
+	P_sigcatch  uint32
+	P_priority  uint8
+	P_usrpri    uint8
+	P_nice      int8
+	P_comm      [17]int8
+	Pad_cgo_5   [4]byte
+	P_pgrp      uint64
+	P_addr      uint64
+	P_xstat     uint16
+	P_acflag    uint16
+	Pad_cgo_6   [4]byte
+	P_ru        uint64
+}
+
+type Itimerval struct {
+	Interval Timeval
+	Value    Timeval
+}
+
+type Vnode struct{}
+
+type Pgrp struct{}
+
+type UserStruct struct{}
+
+type Au_session struct {
+	Aia_p *AuditinfoAddr
+	Mask  AuMask
+}
+
+type Posix_cred struct {
+	UID       uint32
+	Ruid      uint32
+	Svuid     uint32
+	Ngroups   int16
+	Pad_cgo_0 [2]byte
+	Groups    [16]uint32
+	Rgid      uint32
+	Svgid     uint32
+	Gmuid     uint32
+	Flags     int32
+}
+
+type Label struct{}
+
+type AuditinfoAddr struct {
+	Auid   uint32
+	Mask   AuMask
+	Termid AuTidAddr
+	Asid   int32
+	Flags  uint64
+}
+type AuMask struct {
+	Success uint32
+	Failure uint32
+}
+type AuTidAddr struct {
+	Port int32
+	Type uint32
+	Addr [4]uint32
+}
+
+type UcredQueue struct {
+	Next *ucred
+	Prev **ucred
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_freebsd.go b/vendor/github.com/shirou/gopsutil/process/process_freebsd.go
new file mode 100644
index 0000000000..5362128e6e
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_freebsd.go
@@ -0,0 +1,336 @@
+// +build freebsd
+
+package process
+
+import (
+	"bytes"
+	"encoding/binary"
+	"strings"
+	"syscall"
+
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	net "github.com/shirou/gopsutil/net"
+)
+
+// MemoryInfoExStat is different between OSes
+type MemoryInfoExStat struct {
+}
+
+type MemoryMapsStat struct {
+}
+
+func Pids() ([]int32, error) {
+	var ret []int32
+	procs, err := processes()
+	if err != nil {
+		return ret, nil
+	}
+
+	for _, p := range procs {
+		ret = append(ret, p.Pid)
+	}
+
+	return ret, nil
+}
+
+func (p *Process) Ppid() (int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return 0, err
+	}
+
+	return k.Ppid, nil
+}
+func (p *Process) Name() (string, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return "", err
+	}
+
+	return common.IntToString(k.Comm[:]), nil
+}
+func (p *Process) Exe() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+
+func (p *Process) Cmdline() (string, error) {
+	mib := []int32{CTLKern, KernProc, KernProcArgs, p.Pid}
+	buf, _, err := common.CallSyscall(mib)
+	if err != nil {
+		return "", err
+	}
+	ret := strings.FieldsFunc(string(buf), func(r rune) bool {
+		if r == '\u0000' {
+			return true
+		}
+		return false
+	})
+
+	return strings.Join(ret, " "), nil
+}
+
+func (p *Process) CmdlineSlice() ([]string, error) {
+	mib := []int32{CTLKern, KernProc, KernProcArgs, p.Pid}
+	buf, _, err := common.CallSyscall(mib)
+	if err != nil {
+		return nil, err
+	}
+	if len(buf) == 0 {
+		return nil, nil
+	}
+	if buf[len(buf)-1] == 0 {
+		buf = buf[:len(buf)-1]
+	}
+	parts := bytes.Split(buf, []byte{0})
+	var strParts []string
+	for _, p := range parts {
+		strParts = append(strParts, string(p))
+	}
+
+	return strParts, nil
+}
+func (p *Process) CreateTime() (int64, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Cwd() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Parent() (*Process, error) {
+	return p, common.ErrNotImplementedError
+}
+func (p *Process) Status() (string, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return "", err
+	}
+	var s string
+	switch k.Stat {
+	case SIDL:
+		s = "I"
+	case SRUN:
+		s = "R"
+	case SSLEEP:
+		s = "S"
+	case SSTOP:
+		s = "T"
+	case SZOMB:
+		s = "Z"
+	case SWAIT:
+		s = "W"
+	case SLOCK:
+		s = "L"
+	}
+
+	return s, nil
+}
+func (p *Process) Uids() ([]int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+
+	uids := make([]int32, 0, 3)
+
+	uids = append(uids, int32(k.Ruid), int32(k.Uid), int32(k.Svuid))
+
+	return uids, nil
+}
+func (p *Process) Gids() ([]int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+
+	gids := make([]int32, 0, 3)
+	gids = append(gids, int32(k.Rgid), int32(k.Ngroups), int32(k.Svgid))
+
+	return gids, nil
+}
+func (p *Process) Terminal() (string, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return "", err
+	}
+
+	ttyNr := uint64(k.Tdev)
+
+	termmap, err := getTerminalMap()
+	if err != nil {
+		return "", err
+	}
+
+	return termmap[ttyNr], nil
+}
+func (p *Process) Nice() (int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return 0, err
+	}
+	return int32(k.Nice), nil
+}
+func (p *Process) IOnice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Rlimit() ([]RlimitStat, error) {
+	var rlimit []RlimitStat
+	return rlimit, common.ErrNotImplementedError
+}
+func (p *Process) IOCounters() (*IOCountersStat, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+	return &IOCountersStat{
+		ReadCount:  uint64(k.Rusage.Inblock),
+		WriteCount: uint64(k.Rusage.Oublock),
+	}, nil
+}
+func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumFDs() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) NumThreads() (int32, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return 0, err
+	}
+
+	return k.Numthreads, nil
+}
+func (p *Process) Threads() (map[string]string, error) {
+	ret := make(map[string]string, 0)
+	return ret, common.ErrNotImplementedError
+}
+func (p *Process) Times() (*cpu.TimesStat, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+	return &cpu.TimesStat{
+		CPU:    "cpu",
+		User:   float64(k.Rusage.Utime.Sec) + float64(k.Rusage.Utime.Usec)/1000000,
+		System: float64(k.Rusage.Stime.Sec) + float64(k.Rusage.Stime.Usec)/1000000,
+	}, nil
+}
+func (p *Process) CPUAffinity() ([]int32, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+	v, err := syscall.Sysctl("vm.stats.vm.v_page_size")
+	if err != nil {
+		return nil, err
+	}
+	pageSize := common.LittleEndian.Uint16([]byte(v))
+
+	return &MemoryInfoStat{
+		RSS: uint64(k.Rssize) * uint64(pageSize),
+		VMS: uint64(k.Size),
+	}, nil
+}
+func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Children() ([]*Process, error) {
+	pids, err := common.CallPgrep(invoke, p.Pid)
+	if err != nil {
+		return nil, err
+	}
+	ret := make([]*Process, 0, len(pids))
+	for _, pid := range pids {
+		np, err := NewProcess(pid)
+		if err != nil {
+			return nil, err
+		}
+		ret = append(ret, np)
+	}
+	return ret, nil
+}
+
+func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Connections() ([]net.ConnectionStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) IsRunning() (bool, error) {
+	return true, common.ErrNotImplementedError
+}
+func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
+	var ret []MemoryMapsStat
+	return &ret, common.ErrNotImplementedError
+}
+
+func processes() ([]Process, error) {
+	results := make([]Process, 0, 50)
+
+	mib := []int32{CTLKern, KernProc, KernProcProc, 0}
+	buf, length, err := common.CallSyscall(mib)
+	if err != nil {
+		return results, err
+	}
+
+	// get kinfo_proc size
+	count := int(length / uint64(sizeOfKinfoProc))
+
+	// parse buf to procs
+	for i := 0; i < count; i++ {
+		b := buf[i*sizeOfKinfoProc : (i+1)*sizeOfKinfoProc]
+		k, err := parseKinfoProc(b)
+		if err != nil {
+			continue
+		}
+		p, err := NewProcess(int32(k.Pid))
+		if err != nil {
+			continue
+		}
+
+		results = append(results, *p)
+	}
+
+	return results, nil
+}
+
+func parseKinfoProc(buf []byte) (KinfoProc, error) {
+	var k KinfoProc
+	br := bytes.NewReader(buf)
+	err := common.Read(br, binary.LittleEndian, &k)
+	return k, err
+}
+
+func (p *Process) getKProc() (*KinfoProc, error) {
+	mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid}
+
+	buf, length, err := common.CallSyscall(mib)
+	if err != nil {
+		return nil, err
+	}
+	if length != sizeOfKinfoProc {
+		return nil, err
+	}
+
+	k, err := parseKinfoProc(buf)
+	if err != nil {
+		return nil, err
+	}
+	return &k, nil
+}
+
+func NewProcess(pid int32) (*Process, error) {
+	p := &Process{Pid: pid}
+
+	return p, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_freebsd_386.go b/vendor/github.com/shirou/gopsutil/process/process_freebsd_386.go
new file mode 100644
index 0000000000..201f714601
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_freebsd_386.go
@@ -0,0 +1,141 @@
+// +build freebsd
+// +build 386
+
+package process
+
+// copied from sys/sysctl.h
+const (
+	CTLKern          = 1  // "high kernel": proc, limits
+	KernProc         = 14 // struct: process entries
+	KernProcPID      = 1  // by process id
+	KernProcProc     = 8  // only return procs
+	KernProcPathname = 12 // path to executable
+	KernProcArgs     = 7  // get/set arguments/proctitle
+)
+
+const (
+	SIDL   = 1
+	SRUN   = 2
+	SSLEEP = 3
+	SSTOP  = 4
+	SZOMB  = 5
+	SWAIT  = 6
+	SLOCK  = 7
+)
+
+const (
+	sizeOfKinfoVmentry = 0x244 // TODO: really?
+	sizeOfKinfoProc    = 0x220
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+// copied from sys/user.h
+type KinfoProc struct {
+	Structsize   int32
+	Layout       int32
+	Args         int32
+	Paddr        int32
+	Addr         int32
+	Tracep       int32
+	Textvp       int32
+	Fd           int32
+	Vmspace      int32
+	Wchan        int32
+	Pid          int32
+	Ppid         int32
+	Pgid         int32
+	Tpgid        int32
+	Sid          int32
+	Tsid         int32
+	Jobc         [2]byte
+	SpareShort1  [2]byte
+	Tdev         int32
+	Siglist      [16]byte
+	Sigmask      [16]byte
+	Sigignore    [16]byte
+	Sigcatch     [16]byte
+	Uid          int32
+	Ruid         int32
+	Svuid        int32
+	Rgid         int32
+	Svgid        int32
+	Ngroups      int16
+	SpareShort2  [2]byte
+	Groups       [64]byte
+	Size         int32
+	Rssize       int32
+	Swrss        int32
+	Tsize        int32
+	Dsize        int32
+	Ssize        int32
+	Xstat        [2]byte
+	Acflag       [2]byte
+	Pctcpu       int32
+	Estcpu       int32
+	Slptime      int32
+	Swtime       int32
+	Cow          int32
+	Runtime      int64
+	Start        [8]byte
+	Childtime    [8]byte
+	Flag         int32
+	Kflag        int32
+	Traceflag    int32
+	Stat         int8
+	Nice         [1]byte
+	Lock         [1]byte
+	Rqindex      [1]byte
+	Oncpu        [1]byte
+	Lastcpu      [1]byte
+	Ocomm        [17]byte
+	Wmesg        [9]byte
+	Login        [18]byte
+	Lockname     [9]byte
+	Comm         [20]int8
+	Emul         [17]byte
+	Sparestrings [68]byte
+	Spareints    [36]byte
+	CrFlags      int32
+	Jid          int32
+	Numthreads   int32
+	Tid          int32
+	Pri          int32
+	Rusage       Rusage
+	RusageCh     [72]byte
+	Pcb          int32
+	Kstack       int32
+	Udata        int32
+	Tdaddr       int32
+	Spareptrs    [24]byte
+	Spareint64s  [48]byte
+	Sflag        int32
+	Tdflags      int32
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_freebsd_amd64.go b/vendor/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
new file mode 100644
index 0000000000..79e2ba8816
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
@@ -0,0 +1,192 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package process
+
+const (
+	CTLKern			= 1
+	KernProc		= 14
+	KernProcPID		= 1
+	KernProcProc		= 8
+	KernProcPathname	= 12
+	KernProcArgs		= 7
+)
+
+const (
+	sizeofPtr	= 0x8
+	sizeofShort	= 0x2
+	sizeofInt	= 0x4
+	sizeofLong	= 0x8
+	sizeofLongLong	= 0x8
+)
+
+const (
+	sizeOfKinfoVmentry	= 0x488
+	sizeOfKinfoProc		= 0x440
+)
+
+const (
+	SIDL	= 1
+	SRUN	= 2
+	SSLEEP	= 3
+	SSTOP	= 4
+	SZOMB	= 5
+	SWAIT	= 6
+	SLOCK	= 7
+)
+
+type (
+	_C_short	int16
+	_C_int		int32
+	_C_long		int64
+	_C_long_long	int64
+)
+
+type Timespec struct {
+	Sec	int64
+	Nsec	int64
+}
+
+type Timeval struct {
+	Sec	int64
+	Usec	int64
+}
+
+type Rusage struct {
+	Utime		Timeval
+	Stime		Timeval
+	Maxrss		int64
+	Ixrss		int64
+	Idrss		int64
+	Isrss		int64
+	Minflt		int64
+	Majflt		int64
+	Nswap		int64
+	Inblock		int64
+	Oublock		int64
+	Msgsnd		int64
+	Msgrcv		int64
+	Nsignals	int64
+	Nvcsw		int64
+	Nivcsw		int64
+}
+
+type Rlimit struct {
+	Cur	int64
+	Max	int64
+}
+
+type KinfoProc struct {
+	Structsize	int32
+	Layout		int32
+	Args		int64 /* pargs */
+	Paddr		int64 /* proc */
+	Addr		int64 /* user */
+	Tracep		int64 /* vnode */
+	Textvp		int64 /* vnode */
+	Fd		int64 /* filedesc */
+	Vmspace		int64 /* vmspace */
+	Wchan		int64
+	Pid		int32
+	Ppid		int32
+	Pgid		int32
+	Tpgid		int32
+	Sid		int32
+	Tsid		int32
+	Jobc		int16
+	Spare_short1	int16
+	Tdev		uint32
+	Siglist		[16]byte /* sigset */
+	Sigmask		[16]byte /* sigset */
+	Sigignore	[16]byte /* sigset */
+	Sigcatch	[16]byte /* sigset */
+	Uid		uint32
+	Ruid		uint32
+	Svuid		uint32
+	Rgid		uint32
+	Svgid		uint32
+	Ngroups		int16
+	Spare_short2	int16
+	Groups		[16]uint32
+	Size		uint64
+	Rssize		int64
+	Swrss		int64
+	Tsize		int64
+	Dsize		int64
+	Ssize		int64
+	Xstat		uint16
+	Acflag		uint16
+	Pctcpu		uint32
+	Estcpu		uint32
+	Slptime		uint32
+	Swtime		uint32
+	Cow		uint32
+	Runtime		uint64
+	Start		Timeval
+	Childtime	Timeval
+	Flag		int64
+	Kiflag		int64
+	Traceflag	int32
+	Stat		int8
+	Nice		int8
+	Lock		int8
+	Rqindex		int8
+	Oncpu		uint8
+	Lastcpu		uint8
+	Tdname		[17]int8
+	Wmesg		[9]int8
+	Login		[18]int8
+	Lockname	[9]int8
+	Comm		[20]int8
+	Emul		[17]int8
+	Loginclass	[18]int8
+	Sparestrings	[50]int8
+	Spareints	[7]int32
+	Flag2		int32
+	Fibnum		int32
+	Cr_flags	uint32
+	Jid		int32
+	Numthreads	int32
+	Tid		int32
+	Pri		Priority
+	Rusage		Rusage
+	Rusage_ch	Rusage
+	Pcb		int64 /* pcb */
+	Kstack		int64
+	Udata		int64
+	Tdaddr		int64 /* thread */
+	Spareptrs	[6]int64
+	Sparelongs	[12]int64
+	Sflag		int64
+	Tdflags		int64
+}
+
+type Priority struct {
+	Class	uint8
+	Level	uint8
+	Native	uint8
+	User	uint8
+}
+
+type KinfoVmentry struct {
+	Structsize		int32
+	Type			int32
+	Start			uint64
+	End			uint64
+	Offset			uint64
+	Vn_fileid		uint64
+	Vn_fsid			uint32
+	Flags			int32
+	Resident		int32
+	Private_resident	int32
+	Protection		int32
+	Ref_count		int32
+	Shadow_count		int32
+	Vn_type			int32
+	Vn_size			uint64
+	Vn_rdev			uint32
+	Vn_mode			uint16
+	Status			uint16
+	X_kve_ispare		[12]int32
+	Path			[1024]int8
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux.go b/vendor/github.com/shirou/gopsutil/process/process_linux.go
new file mode 100644
index 0000000000..e79ba36edd
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_linux.go
@@ -0,0 +1,733 @@
+// +build linux
+
+package process
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/host"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
+)
+
+var ErrorNoChildren = errors.New("process does not have children")
+
+const (
+	PrioProcess = 0 // linux/resource.h
+)
+
+// MemoryInfoExStat is different between OSes
+type MemoryInfoExStat struct {
+	RSS    uint64 `json:"rss"`    // bytes
+	VMS    uint64 `json:"vms"`    // bytes
+	Shared uint64 `json:"shared"` // bytes
+	Text   uint64 `json:"text"`   // bytes
+	Lib    uint64 `json:"lib"`    // bytes
+	Data   uint64 `json:"data"`   // bytes
+	Dirty  uint64 `json:"dirty"`  // bytes
+}
+
+func (m MemoryInfoExStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
+
+type MemoryMapsStat struct {
+	Path         string `json:"path"`
+	Rss          uint64 `json:"rss"`
+	Size         uint64 `json:"size"`
+	Pss          uint64 `json:"pss"`
+	SharedClean  uint64 `json:"sharedClean"`
+	SharedDirty  uint64 `json:"sharedDirty"`
+	PrivateClean uint64 `json:"privateClean"`
+	PrivateDirty uint64 `json:"privateDirty"`
+	Referenced   uint64 `json:"referenced"`
+	Anonymous    uint64 `json:"anonymous"`
+	Swap         uint64 `json:"swap"`
+}
+
+func (m MemoryMapsStat) String() string {
+	s, _ := json.Marshal(m)
+	return string(s)
+}
+
+// NewProcess creates a new Process instance, it only stores the pid and
+// checks that the process exists. Other method on Process can be used
+// to get more information about the process. An error will be returned
+// if the process does not exist.
+func NewProcess(pid int32) (*Process, error) {
+	p := &Process{
+		Pid: int32(pid),
+	}
+	file, err := os.Open(common.HostProc(strconv.Itoa(int(p.Pid))))
+	defer file.Close()
+	return p, err
+}
+
+func (p *Process) Ppid() (int32, error) {
+	_, ppid, _, _, _, err := p.fillFromStat()
+	if err != nil {
+		return -1, err
+	}
+	return ppid, nil
+}
+func (p *Process) Name() (string, error) {
+	if p.name == "" {
+		if err := p.fillFromStatus(); err != nil {
+			return "", err
+		}
+	}
+	return p.name, nil
+}
+func (p *Process) Exe() (string, error) {
+	return p.fillFromExe()
+}
+
+// Cmdline returns the command line arguments of the process as a string with
+// each argument separated by 0x20 ascii character.
+func (p *Process) Cmdline() (string, error) {
+	return p.fillFromCmdline()
+}
+
+// CmdlineSlice returns the command line arguments of the process as a slice with each
+// element being an argument.
+func (p *Process) CmdlineSlice() ([]string, error) {
+	return p.fillSliceFromCmdline()
+}
+
+func (p *Process) CreateTime() (int64, error) {
+	_, _, _, createTime, _, err := p.fillFromStat()
+	if err != nil {
+		return 0, err
+	}
+	return createTime, nil
+}
+
+func (p *Process) Cwd() (string, error) {
+	return p.fillFromCwd()
+}
+func (p *Process) Parent() (*Process, error) {
+	r, err := callLsof("R", p.Pid)
+	if err != nil {
+		return nil, err
+	}
+	if len(r) != 1 { // TODO: pid 1
+		return nil, fmt.Errorf("wrong number of parents")
+	}
+	v, err := strconv.Atoi(r[0])
+	if err != nil {
+		return nil, err
+	}
+	return NewProcess(int32(v))
+}
+func (p *Process) Status() (string, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return "", err
+	}
+	return p.status, nil
+}
+func (p *Process) Uids() ([]int32, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return []int32{}, err
+	}
+	return p.uids, nil
+}
+func (p *Process) Gids() ([]int32, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return []int32{}, err
+	}
+	return p.gids, nil
+}
+func (p *Process) Terminal() (string, error) {
+	terminal, _, _, _, _, err := p.fillFromStat()
+	if err != nil {
+		return "", err
+	}
+	return terminal, nil
+}
+func (p *Process) Nice() (int32, error) {
+	_, _, _, _, nice, err := p.fillFromStat()
+	if err != nil {
+		return 0, err
+	}
+	return nice, nil
+}
+func (p *Process) IOnice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Rlimit() ([]RlimitStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) IOCounters() (*IOCountersStat, error) {
+	return p.fillFromIO()
+}
+func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return nil, err
+	}
+	return p.numCtxSwitches, nil
+}
+func (p *Process) NumFDs() (int32, error) {
+	numFds, _, err := p.fillFromfd()
+	return numFds, err
+}
+func (p *Process) NumThreads() (int32, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return 0, err
+	}
+	return p.numThreads, nil
+}
+func (p *Process) Threads() (map[string]string, error) {
+	ret := make(map[string]string, 0)
+	return ret, nil
+}
+func (p *Process) Times() (*cpu.TimesStat, error) {
+	_, _, cpuTimes, _, _, err := p.fillFromStat()
+	if err != nil {
+		return nil, err
+	}
+	return cpuTimes, nil
+}
+func (p *Process) CPUAffinity() ([]int32, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
+	meminfo, _, err := p.fillFromStatm()
+	if err != nil {
+		return nil, err
+	}
+	return meminfo, nil
+}
+func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
+	_, memInfoEx, err := p.fillFromStatm()
+	if err != nil {
+		return nil, err
+	}
+	return memInfoEx, nil
+}
+
+func (p *Process) Children() ([]*Process, error) {
+	pids, err := common.CallPgrep(invoke, p.Pid)
+	if err != nil {
+		if pids == nil || len(pids) == 0 {
+			return nil, ErrorNoChildren
+		}
+		return nil, err
+	}
+	ret := make([]*Process, 0, len(pids))
+	for _, pid := range pids {
+		np, err := NewProcess(pid)
+		if err != nil {
+			return nil, err
+		}
+		ret = append(ret, np)
+	}
+	return ret, nil
+}
+
+func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
+	_, ofs, err := p.fillFromfd()
+	if err != nil {
+		return nil, err
+	}
+	ret := make([]OpenFilesStat, len(ofs))
+	for i, o := range ofs {
+		ret[i] = *o
+	}
+
+	return ret, nil
+}
+
+func (p *Process) Connections() ([]net.ConnectionStat, error) {
+	return net.ConnectionsPid("all", p.Pid)
+}
+
+func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
+	filename := common.HostProc(strconv.Itoa(int(p.Pid)), "net/dev")
+	return net.IOCountersByFile(pernic, filename)
+}
+
+func (p *Process) IsRunning() (bool, error) {
+	return true, common.ErrNotImplementedError
+}
+
+// MemoryMaps get memory maps from /proc/(pid)/smaps
+func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
+	pid := p.Pid
+	var ret []MemoryMapsStat
+	smapsPath := common.HostProc(strconv.Itoa(int(pid)), "smaps")
+	contents, err := ioutil.ReadFile(smapsPath)
+	if err != nil {
+		return nil, err
+	}
+	lines := strings.Split(string(contents), "\n")
+
+	// function of parsing a block
+	getBlock := func(first_line []string, block []string) (MemoryMapsStat, error) {
+		m := MemoryMapsStat{}
+		m.Path = first_line[len(first_line)-1]
+
+		for _, line := range block {
+			if strings.Contains(line, "VmFlags") {
+				continue
+			}
+			field := strings.Split(line, ":")
+			if len(field) < 2 {
+				continue
+			}
+			v := strings.Trim(field[1], " kB") // remove last "kB"
+			t, err := strconv.ParseUint(v, 10, 64)
+			if err != nil {
+				return m, err
+			}
+
+			switch field[0] {
+			case "Size":
+				m.Size = t
+			case "Rss":
+				m.Rss = t
+			case "Pss":
+				m.Pss = t
+			case "Shared_Clean":
+				m.SharedClean = t
+			case "Shared_Dirty":
+				m.SharedDirty = t
+			case "Private_Clean":
+				m.PrivateClean = t
+			case "Private_Dirty":
+				m.PrivateDirty = t
+			case "Referenced":
+				m.Referenced = t
+			case "Anonymous":
+				m.Anonymous = t
+			case "Swap":
+				m.Swap = t
+			}
+		}
+		return m, nil
+	}
+
+	blocks := make([]string, 16)
+	for _, line := range lines {
+		field := strings.Split(line, " ")
+		if strings.HasSuffix(field[0], ":") == false {
+			// new block section
+			if len(blocks) > 0 {
+				g, err := getBlock(field, blocks)
+				if err != nil {
+					return &ret, err
+				}
+				ret = append(ret, g)
+			}
+			// starts new block
+			blocks = make([]string, 16)
+		} else {
+			blocks = append(blocks, line)
+		}
+	}
+
+	return &ret, nil
+}
+
+/**
+** Internal functions
+**/
+
+// Get num_fds from /proc/(pid)/fd
+func (p *Process) fillFromfd() (int32, []*OpenFilesStat, error) {
+	pid := p.Pid
+	statPath := common.HostProc(strconv.Itoa(int(pid)), "fd")
+	d, err := os.Open(statPath)
+	if err != nil {
+		return 0, nil, err
+	}
+	defer d.Close()
+	fnames, err := d.Readdirnames(-1)
+	numFDs := int32(len(fnames))
+
+	var openfiles []*OpenFilesStat
+	for _, fd := range fnames {
+		fpath := filepath.Join(statPath, fd)
+		filepath, err := os.Readlink(fpath)
+		if err != nil {
+			continue
+		}
+		t, err := strconv.ParseUint(fd, 10, 64)
+		if err != nil {
+			return numFDs, openfiles, err
+		}
+		o := &OpenFilesStat{
+			Path: filepath,
+			Fd:   t,
+		}
+		openfiles = append(openfiles, o)
+	}
+
+	return numFDs, openfiles, nil
+}
+
+// Get cwd from /proc/(pid)/cwd
+func (p *Process) fillFromCwd() (string, error) {
+	pid := p.Pid
+	cwdPath := common.HostProc(strconv.Itoa(int(pid)), "cwd")
+	cwd, err := os.Readlink(cwdPath)
+	if err != nil {
+		return "", err
+	}
+	return string(cwd), nil
+}
+
+// Get exe from /proc/(pid)/exe
+func (p *Process) fillFromExe() (string, error) {
+	pid := p.Pid
+	exePath := common.HostProc(strconv.Itoa(int(pid)), "exe")
+	exe, err := os.Readlink(exePath)
+	if err != nil {
+		return "", err
+	}
+	return string(exe), nil
+}
+
+// Get cmdline from /proc/(pid)/cmdline
+func (p *Process) fillFromCmdline() (string, error) {
+	pid := p.Pid
+	cmdPath := common.HostProc(strconv.Itoa(int(pid)), "cmdline")
+	cmdline, err := ioutil.ReadFile(cmdPath)
+	if err != nil {
+		return "", err
+	}
+	ret := strings.FieldsFunc(string(cmdline), func(r rune) bool {
+		if r == '\u0000' {
+			return true
+		}
+		return false
+	})
+
+	return strings.Join(ret, " "), nil
+}
+
+func (p *Process) fillSliceFromCmdline() ([]string, error) {
+	pid := p.Pid
+	cmdPath := common.HostProc(strconv.Itoa(int(pid)), "cmdline")
+	cmdline, err := ioutil.ReadFile(cmdPath)
+	if err != nil {
+		return nil, err
+	}
+	if len(cmdline) == 0 {
+		return nil, nil
+	}
+	if cmdline[len(cmdline)-1] == 0 {
+		cmdline = cmdline[:len(cmdline)-1]
+	}
+	parts := bytes.Split(cmdline, []byte{0})
+	var strParts []string
+	for _, p := range parts {
+		strParts = append(strParts, string(p))
+	}
+
+	return strParts, nil
+}
+
+// Get IO status from /proc/(pid)/io
+func (p *Process) fillFromIO() (*IOCountersStat, error) {
+	pid := p.Pid
+	ioPath := common.HostProc(strconv.Itoa(int(pid)), "io")
+	ioline, err := ioutil.ReadFile(ioPath)
+	if err != nil {
+		return nil, err
+	}
+	lines := strings.Split(string(ioline), "\n")
+	ret := &IOCountersStat{}
+
+	for _, line := range lines {
+		field := strings.Fields(line)
+		if len(field) < 2 {
+			continue
+		}
+		t, err := strconv.ParseUint(field[1], 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		param := field[0]
+		if strings.HasSuffix(param, ":") {
+			param = param[:len(param)-1]
+		}
+		switch param {
+		case "syscr":
+			ret.ReadCount = t
+		case "syscw":
+			ret.WriteCount = t
+		case "readBytes":
+			ret.ReadBytes = t
+		case "writeBytes":
+			ret.WriteBytes = t
+		}
+	}
+
+	return ret, nil
+}
+
+// Get memory info from /proc/(pid)/statm
+func (p *Process) fillFromStatm() (*MemoryInfoStat, *MemoryInfoExStat, error) {
+	pid := p.Pid
+	memPath := common.HostProc(strconv.Itoa(int(pid)), "statm")
+	contents, err := ioutil.ReadFile(memPath)
+	if err != nil {
+		return nil, nil, err
+	}
+	fields := strings.Split(string(contents), " ")
+
+	vms, err := strconv.ParseUint(fields[0], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	rss, err := strconv.ParseUint(fields[1], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	memInfo := &MemoryInfoStat{
+		RSS: rss * PageSize,
+		VMS: vms * PageSize,
+	}
+
+	shared, err := strconv.ParseUint(fields[2], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	text, err := strconv.ParseUint(fields[3], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	lib, err := strconv.ParseUint(fields[4], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+	dirty, err := strconv.ParseUint(fields[5], 10, 64)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	memInfoEx := &MemoryInfoExStat{
+		RSS:    rss * PageSize,
+		VMS:    vms * PageSize,
+		Shared: shared * PageSize,
+		Text:   text * PageSize,
+		Lib:    lib * PageSize,
+		Dirty:  dirty * PageSize,
+	}
+
+	return memInfo, memInfoEx, nil
+}
+
+// Get various status from /proc/(pid)/status
+func (p *Process) fillFromStatus() error {
+	pid := p.Pid
+	statPath := common.HostProc(strconv.Itoa(int(pid)), "status")
+	contents, err := ioutil.ReadFile(statPath)
+	if err != nil {
+		return err
+	}
+	lines := strings.Split(string(contents), "\n")
+	p.numCtxSwitches = &NumCtxSwitchesStat{}
+	p.memInfo = &MemoryInfoStat{}
+	for _, line := range lines {
+		tabParts := strings.SplitN(line, "\t", 2)
+		if len(tabParts) < 2 {
+			continue
+		}
+		value := tabParts[1]
+		switch strings.TrimRight(tabParts[0], ":") {
+		case "Name":
+			p.name = strings.Trim(value, " \t")
+		case "State":
+			p.status = value[0:1]
+		case "Uid":
+			p.uids = make([]int32, 0, 4)
+			for _, i := range strings.Split(value, "\t") {
+				v, err := strconv.ParseInt(i, 10, 32)
+				if err != nil {
+					return err
+				}
+				p.uids = append(p.uids, int32(v))
+			}
+		case "Gid":
+			p.gids = make([]int32, 0, 4)
+			for _, i := range strings.Split(value, "\t") {
+				v, err := strconv.ParseInt(i, 10, 32)
+				if err != nil {
+					return err
+				}
+				p.gids = append(p.gids, int32(v))
+			}
+		case "Threads":
+			v, err := strconv.ParseInt(value, 10, 32)
+			if err != nil {
+				return err
+			}
+			p.numThreads = int32(v)
+		case "voluntary_ctxt_switches":
+			v, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.numCtxSwitches.Voluntary = v
+		case "nonvoluntary_ctxt_switches":
+			v, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.numCtxSwitches.Involuntary = v
+		case "VmRSS":
+			value := strings.Trim(value, " kB") // remove last "kB"
+			v, err := strconv.ParseUint(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.memInfo.RSS = v * 1024
+		case "VmSize":
+			value := strings.Trim(value, " kB") // remove last "kB"
+			v, err := strconv.ParseUint(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.memInfo.VMS = v * 1024
+		case "VmSwap":
+			value := strings.Trim(value, " kB") // remove last "kB"
+			v, err := strconv.ParseUint(value, 10, 64)
+			if err != nil {
+				return err
+			}
+			p.memInfo.Swap = v * 1024
+		}
+
+	}
+	return nil
+}
+
+func (p *Process) fillFromStat() (string, int32, *cpu.TimesStat, int64, int32, error) {
+	pid := p.Pid
+	statPath := common.HostProc(strconv.Itoa(int(pid)), "stat")
+	contents, err := ioutil.ReadFile(statPath)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+	fields := strings.Fields(string(contents))
+
+	i := 1
+	for !strings.HasSuffix(fields[i], ")") {
+		i++
+	}
+
+	termmap, err := getTerminalMap()
+	terminal := ""
+	if err == nil {
+		t, err := strconv.ParseUint(fields[i+5], 10, 64)
+		if err != nil {
+			return "", 0, nil, 0, 0, err
+		}
+		terminal = termmap[t]
+	}
+
+	ppid, err := strconv.ParseInt(fields[i+2], 10, 32)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+	utime, err := strconv.ParseFloat(fields[i+12], 64)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+
+	stime, err := strconv.ParseFloat(fields[i+13], 64)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+
+	cpuTimes := &cpu.TimesStat{
+		CPU:    "cpu",
+		User:   float64(utime / ClockTicks),
+		System: float64(stime / ClockTicks),
+	}
+
+	bootTime, _ := host.BootTime()
+	t, err := strconv.ParseUint(fields[i+20], 10, 64)
+	if err != nil {
+		return "", 0, nil, 0, 0, err
+	}
+	ctime := (t / uint64(ClockTicks)) + uint64(bootTime)
+	createTime := int64(ctime * 1000)
+
+	//	p.Nice = mustParseInt32(fields[18])
+	// use syscall instead of parse Stat file
+	snice, _ := syscall.Getpriority(PrioProcess, int(pid))
+	nice := int32(snice) // FIXME: is this true?
+
+	return terminal, int32(ppid), cpuTimes, createTime, nice, nil
+}
+
+func Pids() ([]int32, error) {
+	var ret []int32
+
+	d, err := os.Open(common.HostProc())
+	if err != nil {
+		return nil, err
+	}
+	defer d.Close()
+
+	fnames, err := d.Readdirnames(-1)
+	if err != nil {
+		return nil, err
+	}
+	for _, fname := range fnames {
+		pid, err := strconv.ParseInt(fname, 10, 32)
+		if err != nil {
+			// if not numeric name, just skip
+			continue
+		}
+		ret = append(ret, int32(pid))
+	}
+
+	return ret, nil
+}
+
+func callLsof(arg string, pid int32) ([]string, error) {
+	var cmd []string
+	if pid == 0 { // will get from all processes.
+		cmd = []string{"-F" + arg}
+	} else {
+		cmd = []string{"-a", "-F" + arg, "-p", strconv.Itoa(int(pid))}
+	}
+	lsof, err := exec.LookPath("lsof")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := invoke.Command(lsof, cmd...)
+	if err != nil {
+		return []string{}, err
+	}
+	lines := strings.Split(string(out), "\n")
+
+	var ret []string
+	for _, l := range lines[1:] {
+		if strings.HasPrefix(l, arg) {
+			ret = append(ret, l[1:]) // delete first char
+		}
+	}
+
+	return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux_386.go b/vendor/github.com/shirou/gopsutil/process/process_linux_386.go
new file mode 100644
index 0000000000..541b854c75
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_linux_386.go
@@ -0,0 +1,9 @@
+// +build linux
+// +build 386
+
+package process
+
+const (
+	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
+	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
+)
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux_amd64.go b/vendor/github.com/shirou/gopsutil/process/process_linux_amd64.go
new file mode 100644
index 0000000000..b4a4ce8b7c
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_linux_amd64.go
@@ -0,0 +1,9 @@
+// +build linux
+// +build amd64
+
+package process
+
+const (
+	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
+	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
+)
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux_arm.go b/vendor/github.com/shirou/gopsutil/process/process_linux_arm.go
new file mode 100644
index 0000000000..c6123a4891
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_linux_arm.go
@@ -0,0 +1,9 @@
+// +build linux
+// +build arm
+
+package process
+
+const (
+	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
+	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
+)
diff --git a/vendor/github.com/shirou/gopsutil/process/process_posix.go b/vendor/github.com/shirou/gopsutil/process/process_posix.go
new file mode 100644
index 0000000000..92353b8c5d
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_posix.go
@@ -0,0 +1,106 @@
+// +build linux freebsd darwin
+
+package process
+
+import (
+	"os"
+	"os/exec"
+	"os/user"
+	"strconv"
+	"strings"
+	"syscall"
+)
+
+// POSIX
+func getTerminalMap() (map[uint64]string, error) {
+	ret := make(map[uint64]string)
+	var termfiles []string
+
+	d, err := os.Open("/dev")
+	if err != nil {
+		return nil, err
+	}
+	defer d.Close()
+
+	devnames, err := d.Readdirnames(-1)
+	for _, devname := range devnames {
+		if strings.HasPrefix(devname, "/dev/tty") {
+			termfiles = append(termfiles, "/dev/tty/"+devname)
+		}
+	}
+
+	ptsd, err := os.Open("/dev/pts")
+	if err != nil {
+		return nil, err
+	}
+	defer ptsd.Close()
+
+	ptsnames, err := ptsd.Readdirnames(-1)
+	for _, ptsname := range ptsnames {
+		termfiles = append(termfiles, "/dev/pts/"+ptsname)
+	}
+
+	for _, name := range termfiles {
+		stat := syscall.Stat_t{}
+		if err = syscall.Stat(name, &stat); err != nil {
+			return nil, err
+		}
+		rdev := uint64(stat.Rdev)
+		ret[rdev] = strings.Replace(name, "/dev", "", -1)
+	}
+	return ret, nil
+}
+
+func (p *Process) SendSignal(sig syscall.Signal) error {
+	sigAsStr := "INT"
+	switch sig {
+	case syscall.SIGSTOP:
+		sigAsStr = "STOP"
+	case syscall.SIGCONT:
+		sigAsStr = "CONT"
+	case syscall.SIGTERM:
+		sigAsStr = "TERM"
+	case syscall.SIGKILL:
+		sigAsStr = "KILL"
+	}
+
+	kill, err := exec.LookPath("kill")
+	if err != nil {
+		return err
+	}
+	cmd := exec.Command(kill, "-s", sigAsStr, strconv.Itoa(int(p.Pid)))
+	cmd.Stderr = os.Stderr
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (p *Process) Suspend() error {
+	return p.SendSignal(syscall.SIGSTOP)
+}
+func (p *Process) Resume() error {
+	return p.SendSignal(syscall.SIGCONT)
+}
+func (p *Process) Terminate() error {
+	return p.SendSignal(syscall.SIGTERM)
+}
+func (p *Process) Kill() error {
+	return p.SendSignal(syscall.SIGKILL)
+}
+func (p *Process) Username() (string, error) {
+	uids, err := p.Uids()
+	if err != nil {
+		return "", err
+	}
+	if len(uids) > 0 {
+		u, err := user.LookupId(strconv.Itoa(int(uids[0])))
+		if err != nil {
+			return "", err
+		}
+		return u.Username, nil
+	}
+	return "", nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_windows.go b/vendor/github.com/shirou/gopsutil/process/process_windows.go
new file mode 100644
index 0000000000..3176cde05a
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_windows.go
@@ -0,0 +1,357 @@
+// +build windows
+
+package process
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+	"syscall"
+	"time"
+	"unsafe"
+
+	"github.com/StackExchange/wmi"
+	"github.com/shirou/w32"
+
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	net "github.com/shirou/gopsutil/net"
+)
+
+const (
+	NoMoreFiles   = 0x12
+	MaxPathLength = 260
+)
+
+type SystemProcessInformation struct {
+	NextEntryOffset   uint64
+	NumberOfThreads   uint64
+	Reserved1         [48]byte
+	Reserved2         [3]byte
+	UniqueProcessID   uintptr
+	Reserved3         uintptr
+	HandleCount       uint64
+	Reserved4         [4]byte
+	Reserved5         [11]byte
+	PeakPagefileUsage uint64
+	PrivatePageCount  uint64
+	Reserved6         [6]uint64
+}
+
+// Memory_info_ex is different between OSes
+type MemoryInfoExStat struct {
+}
+
+type MemoryMapsStat struct {
+}
+
+type Win32_Process struct {
+	Name           string
+	ExecutablePath *string
+	CommandLine    *string
+	Priority       uint32
+	CreationDate   *time.Time
+	ProcessID      uint32
+	ThreadCount    uint32
+
+	/*
+		CSCreationClassName   string
+		CSName                string
+		Caption               *string
+		CreationClassName     string
+		Description           *string
+		ExecutionState        *uint16
+		HandleCount           uint32
+		KernelModeTime        uint64
+		MaximumWorkingSetSize *uint32
+		MinimumWorkingSetSize *uint32
+		OSCreationClassName   string
+		OSName                string
+		OtherOperationCount   uint64
+		OtherTransferCount    uint64
+		PageFaults            uint32
+		PageFileUsage         uint32
+		ParentProcessID       uint32
+		PeakPageFileUsage     uint32
+		PeakVirtualSize       uint64
+		PeakWorkingSetSize    uint32
+		PrivatePageCount      uint64
+		ReadOperationCount    uint64
+		ReadTransferCount     uint64
+		Status                *string
+		TerminationDate       *time.Time
+		UserModeTime          uint64
+		WorkingSetSize        uint64
+		WriteOperationCount   uint64
+		WriteTransferCount    uint64
+	*/
+}
+
+func Pids() ([]int32, error) {
+	var ret []int32
+
+	procs, err := processes()
+	if err != nil {
+		return ret, nil
+	}
+
+	for _, proc := range procs {
+		ret = append(ret, proc.Pid)
+	}
+
+	return ret, nil
+}
+
+func (p *Process) Ppid() (int32, error) {
+	ret, _, _, err := p.getFromSnapProcess(p.Pid)
+	if err != nil {
+		return 0, err
+	}
+	return ret, nil
+}
+
+func GetWin32Proc(pid int32) ([]Win32_Process, error) {
+	var dst []Win32_Process
+	query := fmt.Sprintf("WHERE ProcessId = %d", pid)
+	q := wmi.CreateQuery(&dst, query)
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return []Win32_Process{}, fmt.Errorf("could not get win32Proc: %s", err)
+	}
+	if len(dst) != 1 {
+		return []Win32_Process{}, fmt.Errorf("could not get win32Proc: empty")
+	}
+	return dst, nil
+}
+
+func (p *Process) Name() (string, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return "", fmt.Errorf("could not get Name: %s", err)
+	}
+	return dst[0].Name, nil
+}
+func (p *Process) Exe() (string, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return "", fmt.Errorf("could not get ExecutablePath: %s", err)
+	}
+	return *dst[0].ExecutablePath, nil
+}
+func (p *Process) Cmdline() (string, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return "", fmt.Errorf("could not get CommandLine: %s", err)
+	}
+	return *dst[0].CommandLine, nil
+}
+
+// CmdlineSlice returns the command line arguments of the process as a slice with each
+// element being an argument. This merely returns the CommandLine informations passed
+// to the process split on the 0x20 ASCII character.
+func (p *Process) CmdlineSlice() ([]string, error) {
+	cmdline, err := p.Cmdline()
+	if err != nil {
+		return nil, err
+	}
+	return strings.Split(cmdline, " "), nil
+}
+
+func (p *Process) CreateTime() (int64, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return 0, fmt.Errorf("could not get CreationDate: %s", err)
+	}
+	date := *dst[0].CreationDate
+	return date.Unix(), nil
+}
+
+func (p *Process) Cwd() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Parent() (*Process, error) {
+	return p, common.ErrNotImplementedError
+}
+func (p *Process) Status() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Username() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Uids() ([]int32, error) {
+	var uids []int32
+
+	return uids, common.ErrNotImplementedError
+}
+func (p *Process) Gids() ([]int32, error) {
+	var gids []int32
+	return gids, common.ErrNotImplementedError
+}
+func (p *Process) Terminal() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+
+// Nice returnes priority in Windows
+func (p *Process) Nice() (int32, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return 0, fmt.Errorf("could not get Priority: %s", err)
+	}
+	return int32(dst[0].Priority), nil
+}
+func (p *Process) IOnice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Rlimit() ([]RlimitStat, error) {
+	var rlimit []RlimitStat
+
+	return rlimit, common.ErrNotImplementedError
+}
+func (p *Process) IOCounters() (*IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumFDs() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) NumThreads() (int32, error) {
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil {
+		return 0, fmt.Errorf("could not get ThreadCount: %s", err)
+	}
+	return int32(dst[0].ThreadCount), nil
+}
+func (p *Process) Threads() (map[string]string, error) {
+	ret := make(map[string]string, 0)
+	return ret, common.ErrNotImplementedError
+}
+func (p *Process) Times() (*cpu.TimesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) CPUAffinity() ([]int32, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Children() ([]*Process, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Connections() ([]net.ConnectionStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) IsRunning() (bool, error) {
+	return true, common.ErrNotImplementedError
+}
+
+func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
+	var ret []MemoryMapsStat
+	return &ret, common.ErrNotImplementedError
+}
+
+func NewProcess(pid int32) (*Process, error) {
+	p := &Process{Pid: pid}
+
+	return p, nil
+}
+
+func (p *Process) SendSignal(sig syscall.Signal) error {
+	return common.ErrNotImplementedError
+}
+
+func (p *Process) Suspend() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Resume() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Terminate() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Kill() error {
+	return common.ErrNotImplementedError
+}
+
+func (p *Process) getFromSnapProcess(pid int32) (int32, int32, string, error) {
+	snap := w32.CreateToolhelp32Snapshot(w32.TH32CS_SNAPPROCESS, uint32(pid))
+	if snap == 0 {
+		return 0, 0, "", syscall.GetLastError()
+	}
+	defer w32.CloseHandle(snap)
+	var pe32 w32.PROCESSENTRY32
+	pe32.DwSize = uint32(unsafe.Sizeof(pe32))
+	if w32.Process32First(snap, &pe32) == false {
+		return 0, 0, "", syscall.GetLastError()
+	}
+
+	if pe32.Th32ProcessID == uint32(pid) {
+		szexe := syscall.UTF16ToString(pe32.SzExeFile[:])
+		return int32(pe32.Th32ParentProcessID), int32(pe32.CntThreads), szexe, nil
+	}
+
+	for w32.Process32Next(snap, &pe32) {
+		if pe32.Th32ProcessID == uint32(pid) {
+			szexe := syscall.UTF16ToString(pe32.SzExeFile[:])
+			return int32(pe32.Th32ParentProcessID), int32(pe32.CntThreads), szexe, nil
+		}
+	}
+	return 0, 0, "", errors.New("Couldn't find pid:" + string(pid))
+}
+
+// Get processes
+func processes() ([]*Process, error) {
+
+	var dst []Win32_Process
+	q := wmi.CreateQuery(&dst, "")
+	err := wmi.Query(q, &dst)
+	if err != nil {
+		return []*Process{}, err
+	}
+	if len(dst) == 0 {
+		return []*Process{}, fmt.Errorf("could not get Process")
+	}
+	results := make([]*Process, 0, len(dst))
+	for _, proc := range dst {
+		p, err := NewProcess(int32(proc.ProcessID))
+		if err != nil {
+			continue
+		}
+		results = append(results, p)
+	}
+
+	return results, nil
+}
+
+func getProcInfo(pid int32) (*SystemProcessInformation, error) {
+	initialBufferSize := uint64(0x4000)
+	bufferSize := initialBufferSize
+	buffer := make([]byte, bufferSize)
+
+	var sysProcInfo SystemProcessInformation
+	ret, _, _ := common.ProcNtQuerySystemInformation.Call(
+		uintptr(unsafe.Pointer(&sysProcInfo)),
+		uintptr(unsafe.Pointer(&buffer[0])),
+		uintptr(unsafe.Pointer(&bufferSize)),
+		uintptr(unsafe.Pointer(&bufferSize)))
+	if ret != 0 {
+		return nil, syscall.GetLastError()
+	}
+
+	return &sysProcInfo, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/types_darwin.go b/vendor/github.com/shirou/gopsutil/process/types_darwin.go
new file mode 100644
index 0000000000..21216cd09a
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/types_darwin.go
@@ -0,0 +1,160 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Hand Writing
+// - all pointer in ExternProc to uint64
+
+// +build ignore
+
+/*
+Input to cgo -godefs.
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+// +godefs map struct_ [16]byte /* in6_addr */
+
+package process
+
+/*
+#define __DARWIN_UNIX03 0
+#define KERNEL
+#define _DARWIN_USE_64_BIT_INODE
+#include <dirent.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <termios.h>
+#include <unistd.h>
+#include <mach/mach.h>
+#include <mach/message.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <net/bpf.h>
+#include <net/if_dl.h>
+#include <net/if_var.h>
+#include <net/route.h>
+#include <netinet/in.h>
+
+#include <sys/sysctl.h>
+#include <sys/ucred.h>
+#include <sys/proc.h>
+#include <sys/time.h>
+#include <sys/_types/_timeval.h>
+#include <sys/appleapiopts.h>
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <bsm/audit.h>
+#include <sys/queue.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+struct ucred_queue {
+        struct ucred *tqe_next;
+        struct ucred **tqe_prev;
+        TRACEBUF
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type UGid_t C.gid_t
+
+type KinfoProc C.struct_kinfo_proc
+
+type Eproc C.struct_eproc
+
+type Proc C.struct_proc
+
+type Session C.struct_session
+
+type ucred C.struct_ucred
+
+type Uucred C.struct__ucred
+
+type Upcred C.struct__pcred
+
+type Vmspace C.struct_vmspace
+
+type Sigacts C.struct_sigacts
+
+type ExternProc C.struct_extern_proc
+
+type Itimerval C.struct_itimerval
+
+type Vnode C.struct_vnode
+
+type Pgrp C.struct_pgrp
+
+type UserStruct C.struct_user
+
+type Au_session C.struct_au_session
+
+type Posix_cred C.struct_posix_cred
+
+type Label C.struct_label
+
+type AuditinfoAddr C.struct_auditinfo_addr
+type AuMask C.struct_au_mask
+type AuTidAddr C.struct_au_tid_addr
+
+// TAILQ(ucred)
+type UcredQueue C.struct_ucred_queue
diff --git a/vendor/github.com/shirou/gopsutil/process/types_freebsd.go b/vendor/github.com/shirou/gopsutil/process/types_freebsd.go
new file mode 100644
index 0000000000..aa7b3462de
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/types_freebsd.go
@@ -0,0 +1,95 @@
+// +build ignore
+
+// We still need editing by hands.
+// go tool cgo -godefs types_freebsd.go | sed 's/\*int64/int64/' | sed 's/\*byte/int64/'  > process_freebsd_amd64.go
+
+/*
+Input to cgo -godefs.
+*/
+
+// +godefs map struct_pargs int64 /* pargs */
+// +godefs map struct_proc int64 /* proc */
+// +godefs map struct_user int64 /* user */
+// +godefs map struct_vnode int64 /* vnode */
+// +godefs map struct_vnode int64 /* vnode */
+// +godefs map struct_filedesc int64 /* filedesc */
+// +godefs map struct_vmspace int64 /* vmspace */
+// +godefs map struct_pcb int64 /* pcb */
+// +godefs map struct_thread int64 /* thread */
+// +godefs map struct___sigset [16]byte /* sigset */
+
+package process
+
+/*
+#include <sys/types.h>
+#include <sys/user.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	CTLKern          = 1  // "high kernel": proc, limits
+	KernProc         = 14 // struct: process entries
+	KernProcPID      = 1  // by process id
+	KernProcProc     = 8  // only return procs
+	KernProcPathname = 12 // path to executable
+	KernProcArgs     = 7  // get/set arguments/proctitle
+)
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+const (
+	sizeOfKinfoVmentry = C.sizeof_struct_kinfo_vmentry
+	sizeOfKinfoProc    = C.sizeof_struct_kinfo_proc
+)
+
+// from sys/proc.h
+const (
+	SIDL   = 1 /* Process being created by fork. */
+	SRUN   = 2 /* Currently runnable. */
+	SSLEEP = 3 /* Sleeping on an address. */
+	SSTOP  = 4 /* Process debugging or suspension. */
+	SZOMB  = 5 /* Awaiting collection by parent. */
+	SWAIT  = 6 /* Waiting for interrupt. */
+	SLOCK  = 7 /* Blocked on a lock. */
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type KinfoProc C.struct_kinfo_proc
+
+type Priority C.struct_priority
+
+type KinfoVmentry C.struct_kinfo_vmentry
diff --git a/vendor/github.com/shirou/w32/LICENSE b/vendor/github.com/shirou/w32/LICENSE
new file mode 100644
index 0000000000..9f36608c87
--- /dev/null
+++ b/vendor/github.com/shirou/w32/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2010-2012 The w32 Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/shirou/w32/advapi32.go b/vendor/github.com/shirou/w32/advapi32.go
new file mode 100644
index 0000000000..2f8a4fe010
--- /dev/null
+++ b/vendor/github.com/shirou/w32/advapi32.go
@@ -0,0 +1,299 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"errors"
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modadvapi32 = syscall.NewLazyDLL("advapi32.dll")
+
+	procRegCreateKeyEx = modadvapi32.NewProc("RegCreateKeyExW")
+	procRegOpenKeyEx   = modadvapi32.NewProc("RegOpenKeyExW")
+	procRegCloseKey    = modadvapi32.NewProc("RegCloseKey")
+	procRegGetValue    = modadvapi32.NewProc("RegGetValueW")
+	procRegEnumKeyEx   = modadvapi32.NewProc("RegEnumKeyExW")
+	//	procRegSetKeyValue     = modadvapi32.NewProc("RegSetKeyValueW")
+	procRegSetValueEx      = modadvapi32.NewProc("RegSetValueExW")
+	procOpenEventLog       = modadvapi32.NewProc("OpenEventLogW")
+	procReadEventLog       = modadvapi32.NewProc("ReadEventLogW")
+	procCloseEventLog      = modadvapi32.NewProc("CloseEventLog")
+	procOpenSCManager      = modadvapi32.NewProc("OpenSCManagerW")
+	procCloseServiceHandle = modadvapi32.NewProc("CloseServiceHandle")
+	procOpenService        = modadvapi32.NewProc("OpenServiceW")
+	procStartService       = modadvapi32.NewProc("StartServiceW")
+	procControlService     = modadvapi32.NewProc("ControlService")
+)
+
+func RegCreateKey(hKey HKEY, subKey string) HKEY {
+	var result HKEY
+	ret, _, _ := procRegCreateKeyEx.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(0),
+		uintptr(0),
+		uintptr(0),
+		uintptr(KEY_ALL_ACCESS),
+		uintptr(0),
+		uintptr(unsafe.Pointer(&result)),
+		uintptr(0))
+	_ = ret
+	return result
+}
+
+func RegOpenKeyEx(hKey HKEY, subKey string, samDesired uint32) HKEY {
+	var result HKEY
+	ret, _, _ := procRegOpenKeyEx.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(0),
+		uintptr(samDesired),
+		uintptr(unsafe.Pointer(&result)))
+
+	if ret != ERROR_SUCCESS {
+		panic(fmt.Sprintf("RegOpenKeyEx(%d, %s, %d) failed", hKey, subKey, samDesired))
+	}
+	return result
+}
+
+func RegCloseKey(hKey HKEY) error {
+	var err error
+	ret, _, _ := procRegCloseKey.Call(
+		uintptr(hKey))
+
+	if ret != ERROR_SUCCESS {
+		err = errors.New("RegCloseKey failed")
+	}
+	return err
+}
+
+func RegGetRaw(hKey HKEY, subKey string, value string) []byte {
+	var bufLen uint32
+	var valptr unsafe.Pointer
+	if len(value) > 0 {
+		valptr = unsafe.Pointer(syscall.StringToUTF16Ptr(value))
+	}
+	procRegGetValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(valptr),
+		uintptr(RRF_RT_ANY),
+		0,
+		0,
+		uintptr(unsafe.Pointer(&bufLen)))
+
+	if bufLen == 0 {
+		return nil
+	}
+
+	buf := make([]byte, bufLen)
+	ret, _, _ := procRegGetValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(valptr),
+		uintptr(RRF_RT_ANY),
+		0,
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&bufLen)))
+
+	if ret != ERROR_SUCCESS {
+		return nil
+	}
+
+	return buf
+}
+
+func RegSetBinary(hKey HKEY, subKey string, value []byte) (errno int) {
+	var lptr, vptr unsafe.Pointer
+	if len(subKey) > 0 {
+		lptr = unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))
+	}
+	if len(value) > 0 {
+		vptr = unsafe.Pointer(&value[0])
+	}
+	ret, _, _ := procRegSetValueEx.Call(
+		uintptr(hKey),
+		uintptr(lptr),
+		uintptr(0),
+		uintptr(REG_BINARY),
+		uintptr(vptr),
+		uintptr(len(value)))
+
+	return int(ret)
+}
+
+func RegGetString(hKey HKEY, subKey string, value string) string {
+	var bufLen uint32
+	procRegGetValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(value))),
+		uintptr(RRF_RT_REG_SZ),
+		0,
+		0,
+		uintptr(unsafe.Pointer(&bufLen)))
+
+	if bufLen == 0 {
+		return ""
+	}
+
+	buf := make([]uint16, bufLen)
+	ret, _, _ := procRegGetValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(value))),
+		uintptr(RRF_RT_REG_SZ),
+		0,
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&bufLen)))
+
+	if ret != ERROR_SUCCESS {
+		return ""
+	}
+
+	return syscall.UTF16ToString(buf)
+}
+
+/*
+func RegSetKeyValue(hKey HKEY, subKey string, valueName string, dwType uint32, data uintptr, cbData uint16) (errno int) {
+	ret, _, _ := procRegSetKeyValue.Call(
+		uintptr(hKey),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(valueName))),
+		uintptr(dwType),
+		data,
+		uintptr(cbData))
+
+	return int(ret)
+}
+*/
+
+func RegEnumKeyEx(hKey HKEY, index uint32) string {
+	var bufLen uint32 = 255
+	buf := make([]uint16, bufLen)
+	procRegEnumKeyEx.Call(
+		uintptr(hKey),
+		uintptr(index),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(&bufLen)),
+		0,
+		0,
+		0,
+		0)
+	return syscall.UTF16ToString(buf)
+}
+
+func OpenEventLog(servername string, sourcename string) HANDLE {
+	ret, _, _ := procOpenEventLog.Call(
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(servername))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(sourcename))))
+
+	return HANDLE(ret)
+}
+
+func ReadEventLog(eventlog HANDLE, readflags, recordoffset uint32, buffer []byte, numberofbytestoread uint32, bytesread, minnumberofbytesneeded *uint32) bool {
+	ret, _, _ := procReadEventLog.Call(
+		uintptr(eventlog),
+		uintptr(readflags),
+		uintptr(recordoffset),
+		uintptr(unsafe.Pointer(&buffer[0])),
+		uintptr(numberofbytestoread),
+		uintptr(unsafe.Pointer(bytesread)),
+		uintptr(unsafe.Pointer(minnumberofbytesneeded)))
+
+	return ret != 0
+}
+
+func CloseEventLog(eventlog HANDLE) bool {
+	ret, _, _ := procCloseEventLog.Call(
+		uintptr(eventlog))
+
+	return ret != 0
+}
+
+func OpenSCManager(lpMachineName, lpDatabaseName string, dwDesiredAccess uint32) (HANDLE, error) {
+	var p1, p2 uintptr
+	if len(lpMachineName) > 0 {
+		p1 = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpMachineName)))
+	}
+	if len(lpDatabaseName) > 0 {
+		p2 = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpDatabaseName)))
+	}
+	ret, _, _ := procOpenSCManager.Call(
+		p1,
+		p2,
+		uintptr(dwDesiredAccess))
+
+	if ret == 0 {
+		return 0, syscall.GetLastError()
+	}
+
+	return HANDLE(ret), nil
+}
+
+func CloseServiceHandle(hSCObject HANDLE) error {
+	ret, _, _ := procCloseServiceHandle.Call(uintptr(hSCObject))
+	if ret == 0 {
+		return syscall.GetLastError()
+	}
+	return nil
+}
+
+func OpenService(hSCManager HANDLE, lpServiceName string, dwDesiredAccess uint32) (HANDLE, error) {
+	ret, _, _ := procOpenService.Call(
+		uintptr(hSCManager),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpServiceName))),
+		uintptr(dwDesiredAccess))
+
+	if ret == 0 {
+		return 0, syscall.GetLastError()
+	}
+
+	return HANDLE(ret), nil
+}
+
+func StartService(hService HANDLE, lpServiceArgVectors []string) error {
+	l := len(lpServiceArgVectors)
+	var ret uintptr
+	if l == 0 {
+		ret, _, _ = procStartService.Call(
+			uintptr(hService),
+			0,
+			0)
+	} else {
+		lpArgs := make([]uintptr, l)
+		for i := 0; i < l; i++ {
+			lpArgs[i] = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpServiceArgVectors[i])))
+		}
+
+		ret, _, _ = procStartService.Call(
+			uintptr(hService),
+			uintptr(l),
+			uintptr(unsafe.Pointer(&lpArgs[0])))
+	}
+
+	if ret == 0 {
+		return syscall.GetLastError()
+	}
+
+	return nil
+}
+
+func ControlService(hService HANDLE, dwControl uint32, lpServiceStatus *SERVICE_STATUS) bool {
+	if lpServiceStatus == nil {
+		panic("ControlService:lpServiceStatus cannot be nil")
+	}
+
+	ret, _, _ := procControlService.Call(
+		uintptr(hService),
+		uintptr(dwControl),
+		uintptr(unsafe.Pointer(lpServiceStatus)))
+
+	return ret != 0
+}
diff --git a/vendor/github.com/shirou/w32/comctl32.go b/vendor/github.com/shirou/w32/comctl32.go
new file mode 100644
index 0000000000..4f4e6b53a5
--- /dev/null
+++ b/vendor/github.com/shirou/w32/comctl32.go
@@ -0,0 +1,109 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modcomctl32 = syscall.NewLazyDLL("comctl32.dll")
+
+	procInitCommonControlsEx    = modcomctl32.NewProc("InitCommonControlsEx")
+	procImageList_Create        = modcomctl32.NewProc("ImageList_Create")
+	procImageList_Destroy       = modcomctl32.NewProc("ImageList_Destroy")
+	procImageList_GetImageCount = modcomctl32.NewProc("ImageList_GetImageCount")
+	procImageList_SetImageCount = modcomctl32.NewProc("ImageList_SetImageCount")
+	procImageList_Add           = modcomctl32.NewProc("ImageList_Add")
+	procImageList_ReplaceIcon   = modcomctl32.NewProc("ImageList_ReplaceIcon")
+	procImageList_Remove        = modcomctl32.NewProc("ImageList_Remove")
+	procTrackMouseEvent         = modcomctl32.NewProc("_TrackMouseEvent")
+)
+
+func InitCommonControlsEx(lpInitCtrls *INITCOMMONCONTROLSEX) bool {
+	ret, _, _ := procInitCommonControlsEx.Call(
+		uintptr(unsafe.Pointer(lpInitCtrls)))
+
+	return ret != 0
+}
+
+func ImageList_Create(cx, cy int, flags uint, cInitial, cGrow int) HIMAGELIST {
+	ret, _, _ := procImageList_Create.Call(
+		uintptr(cx),
+		uintptr(cy),
+		uintptr(flags),
+		uintptr(cInitial),
+		uintptr(cGrow))
+
+	if ret == 0 {
+		panic("Create image list failed")
+	}
+
+	return HIMAGELIST(ret)
+}
+
+func ImageList_Destroy(himl HIMAGELIST) bool {
+	ret, _, _ := procImageList_Destroy.Call(
+		uintptr(himl))
+
+	return ret != 0
+}
+
+func ImageList_GetImageCount(himl HIMAGELIST) int {
+	ret, _, _ := procImageList_GetImageCount.Call(
+		uintptr(himl))
+
+	return int(ret)
+}
+
+func ImageList_SetImageCount(himl HIMAGELIST, uNewCount uint) bool {
+	ret, _, _ := procImageList_SetImageCount.Call(
+		uintptr(himl),
+		uintptr(uNewCount))
+
+	return ret != 0
+}
+
+func ImageList_Add(himl HIMAGELIST, hbmImage, hbmMask HBITMAP) int {
+	ret, _, _ := procImageList_Add.Call(
+		uintptr(himl),
+		uintptr(hbmImage),
+		uintptr(hbmMask))
+
+	return int(ret)
+}
+
+func ImageList_ReplaceIcon(himl HIMAGELIST, i int, hicon HICON) int {
+	ret, _, _ := procImageList_ReplaceIcon.Call(
+		uintptr(himl),
+		uintptr(i),
+		uintptr(hicon))
+
+	return int(ret)
+}
+
+func ImageList_AddIcon(himl HIMAGELIST, hicon HICON) int {
+	return ImageList_ReplaceIcon(himl, -1, hicon)
+}
+
+func ImageList_Remove(himl HIMAGELIST, i int) bool {
+	ret, _, _ := procImageList_Remove.Call(
+		uintptr(himl),
+		uintptr(i))
+
+	return ret != 0
+}
+
+func ImageList_RemoveAll(himl HIMAGELIST) bool {
+	return ImageList_Remove(himl, -1)
+}
+
+func TrackMouseEvent(tme *TRACKMOUSEEVENT) bool {
+	ret, _, _ := procTrackMouseEvent.Call(
+		uintptr(unsafe.Pointer(tme)))
+
+	return ret != 0
+}
diff --git a/vendor/github.com/shirou/w32/comdlg32.go b/vendor/github.com/shirou/w32/comdlg32.go
new file mode 100644
index 0000000000..37bc98581d
--- /dev/null
+++ b/vendor/github.com/shirou/w32/comdlg32.go
@@ -0,0 +1,38 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modcomdlg32 = syscall.NewLazyDLL("comdlg32.dll")
+
+	procGetSaveFileName      = modcomdlg32.NewProc("GetSaveFileNameW")
+	procGetOpenFileName      = modcomdlg32.NewProc("GetOpenFileNameW")
+	procCommDlgExtendedError = modcomdlg32.NewProc("CommDlgExtendedError")
+)
+
+func GetOpenFileName(ofn *OPENFILENAME) bool {
+	ret, _, _ := procGetOpenFileName.Call(
+		uintptr(unsafe.Pointer(ofn)))
+
+	return ret != 0
+}
+
+func GetSaveFileName(ofn *OPENFILENAME) bool {
+	ret, _, _ := procGetSaveFileName.Call(
+		uintptr(unsafe.Pointer(ofn)))
+
+	return ret != 0
+}
+
+func CommDlgExtendedError() uint {
+	ret, _, _ := procCommDlgExtendedError.Call()
+
+	return uint(ret)
+}
diff --git a/vendor/github.com/shirou/w32/constants.go b/vendor/github.com/shirou/w32/constants.go
new file mode 100644
index 0000000000..62d2d4b318
--- /dev/null
+++ b/vendor/github.com/shirou/w32/constants.go
@@ -0,0 +1,2661 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+const (
+	FALSE = 0
+	TRUE  = 1
+)
+
+const (
+	NO_ERROR                         = 0
+	ERROR_SUCCESS                    = 0
+	ERROR_FILE_NOT_FOUND             = 2
+	ERROR_PATH_NOT_FOUND             = 3
+	ERROR_ACCESS_DENIED              = 5
+	ERROR_INVALID_HANDLE             = 6
+	ERROR_BAD_FORMAT                 = 11
+	ERROR_INVALID_NAME               = 123
+	ERROR_MORE_DATA                  = 234
+	ERROR_NO_MORE_ITEMS              = 259
+	ERROR_INVALID_SERVICE_CONTROL    = 1052
+	ERROR_SERVICE_REQUEST_TIMEOUT    = 1053
+	ERROR_SERVICE_NO_THREAD          = 1054
+	ERROR_SERVICE_DATABASE_LOCKED    = 1055
+	ERROR_SERVICE_ALREADY_RUNNING    = 1056
+	ERROR_SERVICE_DISABLED           = 1058
+	ERROR_SERVICE_DOES_NOT_EXIST     = 1060
+	ERROR_SERVICE_CANNOT_ACCEPT_CTRL = 1061
+	ERROR_SERVICE_NOT_ACTIVE         = 1062
+	ERROR_DATABASE_DOES_NOT_EXIST    = 1065
+	ERROR_SERVICE_DEPENDENCY_FAIL    = 1068
+	ERROR_SERVICE_LOGON_FAILED       = 1069
+	ERROR_SERVICE_MARKED_FOR_DELETE  = 1072
+	ERROR_SERVICE_DEPENDENCY_DELETED = 1075
+)
+
+const (
+	SE_ERR_FNF             = 2
+	SE_ERR_PNF             = 3
+	SE_ERR_ACCESSDENIED    = 5
+	SE_ERR_OOM             = 8
+	SE_ERR_DLLNOTFOUND     = 32
+	SE_ERR_SHARE           = 26
+	SE_ERR_ASSOCINCOMPLETE = 27
+	SE_ERR_DDETIMEOUT      = 28
+	SE_ERR_DDEFAIL         = 29
+	SE_ERR_DDEBUSY         = 30
+	SE_ERR_NOASSOC         = 31
+)
+
+const (
+	CW_USEDEFAULT = ^0x7fffffff
+)
+
+// ShowWindow constants
+const (
+	SW_HIDE            = 0
+	SW_NORMAL          = 1
+	SW_SHOWNORMAL      = 1
+	SW_SHOWMINIMIZED   = 2
+	SW_MAXIMIZE        = 3
+	SW_SHOWMAXIMIZED   = 3
+	SW_SHOWNOACTIVATE  = 4
+	SW_SHOW            = 5
+	SW_MINIMIZE        = 6
+	SW_SHOWMINNOACTIVE = 7
+	SW_SHOWNA          = 8
+	SW_RESTORE         = 9
+	SW_SHOWDEFAULT     = 10
+	SW_FORCEMINIMIZE   = 11
+)
+
+// Window class styles
+const (
+	CS_VREDRAW         = 0x00000001
+	CS_HREDRAW         = 0x00000002
+	CS_KEYCVTWINDOW    = 0x00000004
+	CS_DBLCLKS         = 0x00000008
+	CS_OWNDC           = 0x00000020
+	CS_CLASSDC         = 0x00000040
+	CS_PARENTDC        = 0x00000080
+	CS_NOKEYCVT        = 0x00000100
+	CS_NOCLOSE         = 0x00000200
+	CS_SAVEBITS        = 0x00000800
+	CS_BYTEALIGNCLIENT = 0x00001000
+	CS_BYTEALIGNWINDOW = 0x00002000
+	CS_GLOBALCLASS     = 0x00004000
+	CS_IME             = 0x00010000
+	CS_DROPSHADOW      = 0x00020000
+)
+
+// Predefined cursor constants
+const (
+	IDC_ARROW       = 32512
+	IDC_IBEAM       = 32513
+	IDC_WAIT        = 32514
+	IDC_CROSS       = 32515
+	IDC_UPARROW     = 32516
+	IDC_SIZENWSE    = 32642
+	IDC_SIZENESW    = 32643
+	IDC_SIZEWE      = 32644
+	IDC_SIZENS      = 32645
+	IDC_SIZEALL     = 32646
+	IDC_NO          = 32648
+	IDC_HAND        = 32649
+	IDC_APPSTARTING = 32650
+	IDC_HELP        = 32651
+	IDC_ICON        = 32641
+	IDC_SIZE        = 32640
+)
+
+// Predefined icon constants
+const (
+	IDI_APPLICATION = 32512
+	IDI_HAND        = 32513
+	IDI_QUESTION    = 32514
+	IDI_EXCLAMATION = 32515
+	IDI_ASTERISK    = 32516
+	IDI_WINLOGO     = 32517
+	IDI_WARNING     = IDI_EXCLAMATION
+	IDI_ERROR       = IDI_HAND
+	IDI_INFORMATION = IDI_ASTERISK
+)
+
+// Button style constants
+const (
+	BS_3STATE          = 5
+	BS_AUTO3STATE      = 6
+	BS_AUTOCHECKBOX    = 3
+	BS_AUTORADIOBUTTON = 9
+	BS_BITMAP          = 128
+	BS_BOTTOM          = 0X800
+	BS_CENTER          = 0X300
+	BS_CHECKBOX        = 2
+	BS_DEFPUSHBUTTON   = 1
+	BS_GROUPBOX        = 7
+	BS_ICON            = 64
+	BS_LEFT            = 256
+	BS_LEFTTEXT        = 32
+	BS_MULTILINE       = 0X2000
+	BS_NOTIFY          = 0X4000
+	BS_OWNERDRAW       = 0XB
+	BS_PUSHBUTTON      = 0
+	BS_PUSHLIKE        = 4096
+	BS_RADIOBUTTON     = 4
+	BS_RIGHT           = 512
+	BS_RIGHTBUTTON     = 32
+	BS_TEXT            = 0
+	BS_TOP             = 0X400
+	BS_USERBUTTON      = 8
+	BS_VCENTER         = 0XC00
+	BS_FLAT            = 0X8000
+)
+
+// Button state constants
+const (
+	BST_CHECKED       = 1
+	BST_INDETERMINATE = 2
+	BST_UNCHECKED     = 0
+	BST_FOCUS         = 8
+	BST_PUSHED        = 4
+)
+
+// Predefined brushes constants
+const (
+	COLOR_3DDKSHADOW              = 21
+	COLOR_3DFACE                  = 15
+	COLOR_3DHILIGHT               = 20
+	COLOR_3DHIGHLIGHT             = 20
+	COLOR_3DLIGHT                 = 22
+	COLOR_BTNHILIGHT              = 20
+	COLOR_3DSHADOW                = 16
+	COLOR_ACTIVEBORDER            = 10
+	COLOR_ACTIVECAPTION           = 2
+	COLOR_APPWORKSPACE            = 12
+	COLOR_BACKGROUND              = 1
+	COLOR_DESKTOP                 = 1
+	COLOR_BTNFACE                 = 15
+	COLOR_BTNHIGHLIGHT            = 20
+	COLOR_BTNSHADOW               = 16
+	COLOR_BTNTEXT                 = 18
+	COLOR_CAPTIONTEXT             = 9
+	COLOR_GRAYTEXT                = 17
+	COLOR_HIGHLIGHT               = 13
+	COLOR_HIGHLIGHTTEXT           = 14
+	COLOR_INACTIVEBORDER          = 11
+	COLOR_INACTIVECAPTION         = 3
+	COLOR_INACTIVECAPTIONTEXT     = 19
+	COLOR_INFOBK                  = 24
+	COLOR_INFOTEXT                = 23
+	COLOR_MENU                    = 4
+	COLOR_MENUTEXT                = 7
+	COLOR_SCROLLBAR               = 0
+	COLOR_WINDOW                  = 5
+	COLOR_WINDOWFRAME             = 6
+	COLOR_WINDOWTEXT              = 8
+	COLOR_HOTLIGHT                = 26
+	COLOR_GRADIENTACTIVECAPTION   = 27
+	COLOR_GRADIENTINACTIVECAPTION = 28
+)
+
+// Button message constants
+const (
+	BM_CLICK    = 245
+	BM_GETCHECK = 240
+	BM_GETIMAGE = 246
+	BM_GETSTATE = 242
+	BM_SETCHECK = 241
+	BM_SETIMAGE = 247
+	BM_SETSTATE = 243
+	BM_SETSTYLE = 244
+)
+
+// Button notifications
+const (
+	BN_CLICKED       = 0
+	BN_PAINT         = 1
+	BN_HILITE        = 2
+	BN_PUSHED        = BN_HILITE
+	BN_UNHILITE      = 3
+	BN_UNPUSHED      = BN_UNHILITE
+	BN_DISABLE       = 4
+	BN_DOUBLECLICKED = 5
+	BN_DBLCLK        = BN_DOUBLECLICKED
+	BN_SETFOCUS      = 6
+	BN_KILLFOCUS     = 7
+)
+
+// GetWindowLong and GetWindowLongPtr constants
+const (
+	GWL_EXSTYLE     = -20
+	GWL_STYLE       = -16
+	GWL_WNDPROC     = -4
+	GWLP_WNDPROC    = -4
+	GWL_HINSTANCE   = -6
+	GWLP_HINSTANCE  = -6
+	GWL_HWNDPARENT  = -8
+	GWLP_HWNDPARENT = -8
+	GWL_ID          = -12
+	GWLP_ID         = -12
+	GWL_USERDATA    = -21
+	GWLP_USERDATA   = -21
+)
+
+// Window style constants
+const (
+	WS_OVERLAPPED       = 0X00000000
+	WS_POPUP            = 0X80000000
+	WS_CHILD            = 0X40000000
+	WS_MINIMIZE         = 0X20000000
+	WS_VISIBLE          = 0X10000000
+	WS_DISABLED         = 0X08000000
+	WS_CLIPSIBLINGS     = 0X04000000
+	WS_CLIPCHILDREN     = 0X02000000
+	WS_MAXIMIZE         = 0X01000000
+	WS_CAPTION          = 0X00C00000
+	WS_BORDER           = 0X00800000
+	WS_DLGFRAME         = 0X00400000
+	WS_VSCROLL          = 0X00200000
+	WS_HSCROLL          = 0X00100000
+	WS_SYSMENU          = 0X00080000
+	WS_THICKFRAME       = 0X00040000
+	WS_GROUP            = 0X00020000
+	WS_TABSTOP          = 0X00010000
+	WS_MINIMIZEBOX      = 0X00020000
+	WS_MAXIMIZEBOX      = 0X00010000
+	WS_TILED            = 0X00000000
+	WS_ICONIC           = 0X20000000
+	WS_SIZEBOX          = 0X00040000
+	WS_OVERLAPPEDWINDOW = 0X00000000 | 0X00C00000 | 0X00080000 | 0X00040000 | 0X00020000 | 0X00010000
+	WS_POPUPWINDOW      = 0X80000000 | 0X00800000 | 0X00080000
+	WS_CHILDWINDOW      = 0X40000000
+)
+
+// Extended window style constants
+const (
+	WS_EX_DLGMODALFRAME    = 0X00000001
+	WS_EX_NOPARENTNOTIFY   = 0X00000004
+	WS_EX_TOPMOST          = 0X00000008
+	WS_EX_ACCEPTFILES      = 0X00000010
+	WS_EX_TRANSPARENT      = 0X00000020
+	WS_EX_MDICHILD         = 0X00000040
+	WS_EX_TOOLWINDOW       = 0X00000080
+	WS_EX_WINDOWEDGE       = 0X00000100
+	WS_EX_CLIENTEDGE       = 0X00000200
+	WS_EX_CONTEXTHELP      = 0X00000400
+	WS_EX_RIGHT            = 0X00001000
+	WS_EX_LEFT             = 0X00000000
+	WS_EX_RTLREADING       = 0X00002000
+	WS_EX_LTRREADING       = 0X00000000
+	WS_EX_LEFTSCROLLBAR    = 0X00004000
+	WS_EX_RIGHTSCROLLBAR   = 0X00000000
+	WS_EX_CONTROLPARENT    = 0X00010000
+	WS_EX_STATICEDGE       = 0X00020000
+	WS_EX_APPWINDOW        = 0X00040000
+	WS_EX_OVERLAPPEDWINDOW = 0X00000100 | 0X00000200
+	WS_EX_PALETTEWINDOW    = 0X00000100 | 0X00000080 | 0X00000008
+	WS_EX_LAYERED          = 0X00080000
+	WS_EX_NOINHERITLAYOUT  = 0X00100000
+	WS_EX_LAYOUTRTL        = 0X00400000
+	WS_EX_NOACTIVATE       = 0X08000000
+)
+
+// Window message constants
+const (
+	WM_APP                    = 32768
+	WM_ACTIVATE               = 6
+	WM_ACTIVATEAPP            = 28
+	WM_AFXFIRST               = 864
+	WM_AFXLAST                = 895
+	WM_ASKCBFORMATNAME        = 780
+	WM_CANCELJOURNAL          = 75
+	WM_CANCELMODE             = 31
+	WM_CAPTURECHANGED         = 533
+	WM_CHANGECBCHAIN          = 781
+	WM_CHAR                   = 258
+	WM_CHARTOITEM             = 47
+	WM_CHILDACTIVATE          = 34
+	WM_CLEAR                  = 771
+	WM_CLOSE                  = 16
+	WM_COMMAND                = 273
+	WM_COMMNOTIFY             = 68 /* OBSOLETE */
+	WM_COMPACTING             = 65
+	WM_COMPAREITEM            = 57
+	WM_CONTEXTMENU            = 123
+	WM_COPY                   = 769
+	WM_COPYDATA               = 74
+	WM_CREATE                 = 1
+	WM_CTLCOLORBTN            = 309
+	WM_CTLCOLORDLG            = 310
+	WM_CTLCOLOREDIT           = 307
+	WM_CTLCOLORLISTBOX        = 308
+	WM_CTLCOLORMSGBOX         = 306
+	WM_CTLCOLORSCROLLBAR      = 311
+	WM_CTLCOLORSTATIC         = 312
+	WM_CUT                    = 768
+	WM_DEADCHAR               = 259
+	WM_DELETEITEM             = 45
+	WM_DESTROY                = 2
+	WM_DESTROYCLIPBOARD       = 775
+	WM_DEVICECHANGE           = 537
+	WM_DEVMODECHANGE          = 27
+	WM_DISPLAYCHANGE          = 126
+	WM_DRAWCLIPBOARD          = 776
+	WM_DRAWITEM               = 43
+	WM_DROPFILES              = 563
+	WM_ENABLE                 = 10
+	WM_ENDSESSION             = 22
+	WM_ENTERIDLE              = 289
+	WM_ENTERMENULOOP          = 529
+	WM_ENTERSIZEMOVE          = 561
+	WM_ERASEBKGND             = 20
+	WM_EXITMENULOOP           = 530
+	WM_EXITSIZEMOVE           = 562
+	WM_FONTCHANGE             = 29
+	WM_GETDLGCODE             = 135
+	WM_GETFONT                = 49
+	WM_GETHOTKEY              = 51
+	WM_GETICON                = 127
+	WM_GETMINMAXINFO          = 36
+	WM_GETTEXT                = 13
+	WM_GETTEXTLENGTH          = 14
+	WM_HANDHELDFIRST          = 856
+	WM_HANDHELDLAST           = 863
+	WM_HELP                   = 83
+	WM_HOTKEY                 = 786
+	WM_HSCROLL                = 276
+	WM_HSCROLLCLIPBOARD       = 782
+	WM_ICONERASEBKGND         = 39
+	WM_INITDIALOG             = 272
+	WM_INITMENU               = 278
+	WM_INITMENUPOPUP          = 279
+	WM_INPUT                  = 0X00FF
+	WM_INPUTLANGCHANGE        = 81
+	WM_INPUTLANGCHANGEREQUEST = 80
+	WM_KEYDOWN                = 256
+	WM_KEYUP                  = 257
+	WM_KILLFOCUS              = 8
+	WM_MDIACTIVATE            = 546
+	WM_MDICASCADE             = 551
+	WM_MDICREATE              = 544
+	WM_MDIDESTROY             = 545
+	WM_MDIGETACTIVE           = 553
+	WM_MDIICONARRANGE         = 552
+	WM_MDIMAXIMIZE            = 549
+	WM_MDINEXT                = 548
+	WM_MDIREFRESHMENU         = 564
+	WM_MDIRESTORE             = 547
+	WM_MDISETMENU             = 560
+	WM_MDITILE                = 550
+	WM_MEASUREITEM            = 44
+	WM_GETOBJECT              = 0X003D
+	WM_CHANGEUISTATE          = 0X0127
+	WM_UPDATEUISTATE          = 0X0128
+	WM_QUERYUISTATE           = 0X0129
+	WM_UNINITMENUPOPUP        = 0X0125
+	WM_MENURBUTTONUP          = 290
+	WM_MENUCOMMAND            = 0X0126
+	WM_MENUGETOBJECT          = 0X0124
+	WM_MENUDRAG               = 0X0123
+	WM_APPCOMMAND             = 0X0319
+	WM_MENUCHAR               = 288
+	WM_MENUSELECT             = 287
+	WM_MOVE                   = 3
+	WM_MOVING                 = 534
+	WM_NCACTIVATE             = 134
+	WM_NCCALCSIZE             = 131
+	WM_NCCREATE               = 129
+	WM_NCDESTROY              = 130
+	WM_NCHITTEST              = 132
+	WM_NCLBUTTONDBLCLK        = 163
+	WM_NCLBUTTONDOWN          = 161
+	WM_NCLBUTTONUP            = 162
+	WM_NCMBUTTONDBLCLK        = 169
+	WM_NCMBUTTONDOWN          = 167
+	WM_NCMBUTTONUP            = 168
+	WM_NCXBUTTONDOWN          = 171
+	WM_NCXBUTTONUP            = 172
+	WM_NCXBUTTONDBLCLK        = 173
+	WM_NCMOUSEHOVER           = 0X02A0
+	WM_NCMOUSELEAVE           = 0X02A2
+	WM_NCMOUSEMOVE            = 160
+	WM_NCPAINT                = 133
+	WM_NCRBUTTONDBLCLK        = 166
+	WM_NCRBUTTONDOWN          = 164
+	WM_NCRBUTTONUP            = 165
+	WM_NEXTDLGCTL             = 40
+	WM_NEXTMENU               = 531
+	WM_NOTIFY                 = 78
+	WM_NOTIFYFORMAT           = 85
+	WM_NULL                   = 0
+	WM_PAINT                  = 15
+	WM_PAINTCLIPBOARD         = 777
+	WM_PAINTICON              = 38
+	WM_PALETTECHANGED         = 785
+	WM_PALETTEISCHANGING      = 784
+	WM_PARENTNOTIFY           = 528
+	WM_PASTE                  = 770
+	WM_PENWINFIRST            = 896
+	WM_PENWINLAST             = 911
+	WM_POWER                  = 72
+	WM_POWERBROADCAST         = 536
+	WM_PRINT                  = 791
+	WM_PRINTCLIENT            = 792
+	WM_QUERYDRAGICON          = 55
+	WM_QUERYENDSESSION        = 17
+	WM_QUERYNEWPALETTE        = 783
+	WM_QUERYOPEN              = 19
+	WM_QUEUESYNC              = 35
+	WM_QUIT                   = 18
+	WM_RENDERALLFORMATS       = 774
+	WM_RENDERFORMAT           = 773
+	WM_SETCURSOR              = 32
+	WM_SETFOCUS               = 7
+	WM_SETFONT                = 48
+	WM_SETHOTKEY              = 50
+	WM_SETICON                = 128
+	WM_SETREDRAW              = 11
+	WM_SETTEXT                = 12
+	WM_SETTINGCHANGE          = 26
+	WM_SHOWWINDOW             = 24
+	WM_SIZE                   = 5
+	WM_SIZECLIPBOARD          = 779
+	WM_SIZING                 = 532
+	WM_SPOOLERSTATUS          = 42
+	WM_STYLECHANGED           = 125
+	WM_STYLECHANGING          = 124
+	WM_SYSCHAR                = 262
+	WM_SYSCOLORCHANGE         = 21
+	WM_SYSCOMMAND             = 274
+	WM_SYSDEADCHAR            = 263
+	WM_SYSKEYDOWN             = 260
+	WM_SYSKEYUP               = 261
+	WM_TCARD                  = 82
+	WM_THEMECHANGED           = 794
+	WM_TIMECHANGE             = 30
+	WM_TIMER                  = 275
+	WM_UNDO                   = 772
+	WM_USER                   = 1024
+	WM_USERCHANGED            = 84
+	WM_VKEYTOITEM             = 46
+	WM_VSCROLL                = 277
+	WM_VSCROLLCLIPBOARD       = 778
+	WM_WINDOWPOSCHANGED       = 71
+	WM_WINDOWPOSCHANGING      = 70
+	WM_WININICHANGE           = 26
+	WM_KEYFIRST               = 256
+	WM_KEYLAST                = 264
+	WM_SYNCPAINT              = 136
+	WM_MOUSEACTIVATE          = 33
+	WM_MOUSEMOVE              = 512
+	WM_LBUTTONDOWN            = 513
+	WM_LBUTTONUP              = 514
+	WM_LBUTTONDBLCLK          = 515
+	WM_RBUTTONDOWN            = 516
+	WM_RBUTTONUP              = 517
+	WM_RBUTTONDBLCLK          = 518
+	WM_MBUTTONDOWN            = 519
+	WM_MBUTTONUP              = 520
+	WM_MBUTTONDBLCLK          = 521
+	WM_MOUSEWHEEL             = 522
+	WM_MOUSEFIRST             = 512
+	WM_XBUTTONDOWN            = 523
+	WM_XBUTTONUP              = 524
+	WM_XBUTTONDBLCLK          = 525
+	WM_MOUSELAST              = 525
+	WM_MOUSEHOVER             = 0X2A1
+	WM_MOUSELEAVE             = 0X2A3
+	WM_CLIPBOARDUPDATE        = 0x031D
+)
+
+// WM_ACTIVATE
+const (
+	WA_INACTIVE    = 0
+	WA_ACTIVE      = 1
+	WA_CLICKACTIVE = 2
+)
+
+const LF_FACESIZE = 32
+
+// Font weight constants
+const (
+	FW_DONTCARE   = 0
+	FW_THIN       = 100
+	FW_EXTRALIGHT = 200
+	FW_ULTRALIGHT = FW_EXTRALIGHT
+	FW_LIGHT      = 300
+	FW_NORMAL     = 400
+	FW_REGULAR    = 400
+	FW_MEDIUM     = 500
+	FW_SEMIBOLD   = 600
+	FW_DEMIBOLD   = FW_SEMIBOLD
+	FW_BOLD       = 700
+	FW_EXTRABOLD  = 800
+	FW_ULTRABOLD  = FW_EXTRABOLD
+	FW_HEAVY      = 900
+	FW_BLACK      = FW_HEAVY
+)
+
+// Charset constants
+const (
+	ANSI_CHARSET        = 0
+	DEFAULT_CHARSET     = 1
+	SYMBOL_CHARSET      = 2
+	SHIFTJIS_CHARSET    = 128
+	HANGEUL_CHARSET     = 129
+	HANGUL_CHARSET      = 129
+	GB2312_CHARSET      = 134
+	CHINESEBIG5_CHARSET = 136
+	GREEK_CHARSET       = 161
+	TURKISH_CHARSET     = 162
+	HEBREW_CHARSET      = 177
+	ARABIC_CHARSET      = 178
+	BALTIC_CHARSET      = 186
+	RUSSIAN_CHARSET     = 204
+	THAI_CHARSET        = 222
+	EASTEUROPE_CHARSET  = 238
+	OEM_CHARSET         = 255
+	JOHAB_CHARSET       = 130
+	VIETNAMESE_CHARSET  = 163
+	MAC_CHARSET         = 77
+)
+
+// Font output precision constants
+const (
+	OUT_DEFAULT_PRECIS   = 0
+	OUT_STRING_PRECIS    = 1
+	OUT_CHARACTER_PRECIS = 2
+	OUT_STROKE_PRECIS    = 3
+	OUT_TT_PRECIS        = 4
+	OUT_DEVICE_PRECIS    = 5
+	OUT_RASTER_PRECIS    = 6
+	OUT_TT_ONLY_PRECIS   = 7
+	OUT_OUTLINE_PRECIS   = 8
+	OUT_PS_ONLY_PRECIS   = 10
+)
+
+// Font clipping precision constants
+const (
+	CLIP_DEFAULT_PRECIS   = 0
+	CLIP_CHARACTER_PRECIS = 1
+	CLIP_STROKE_PRECIS    = 2
+	CLIP_MASK             = 15
+	CLIP_LH_ANGLES        = 16
+	CLIP_TT_ALWAYS        = 32
+	CLIP_EMBEDDED         = 128
+)
+
+// Font output quality constants
+const (
+	DEFAULT_QUALITY        = 0
+	DRAFT_QUALITY          = 1
+	PROOF_QUALITY          = 2
+	NONANTIALIASED_QUALITY = 3
+	ANTIALIASED_QUALITY    = 4
+	CLEARTYPE_QUALITY      = 5
+)
+
+// Font pitch constants
+const (
+	DEFAULT_PITCH  = 0
+	FIXED_PITCH    = 1
+	VARIABLE_PITCH = 2
+)
+
+// Font family constants
+const (
+	FF_DECORATIVE = 80
+	FF_DONTCARE   = 0
+	FF_MODERN     = 48
+	FF_ROMAN      = 16
+	FF_SCRIPT     = 64
+	FF_SWISS      = 32
+)
+
+// DeviceCapabilities capabilities
+const (
+	DC_FIELDS            = 1
+	DC_PAPERS            = 2
+	DC_PAPERSIZE         = 3
+	DC_MINEXTENT         = 4
+	DC_MAXEXTENT         = 5
+	DC_BINS              = 6
+	DC_DUPLEX            = 7
+	DC_SIZE              = 8
+	DC_EXTRA             = 9
+	DC_VERSION           = 10
+	DC_DRIVER            = 11
+	DC_BINNAMES          = 12
+	DC_ENUMRESOLUTIONS   = 13
+	DC_FILEDEPENDENCIES  = 14
+	DC_TRUETYPE          = 15
+	DC_PAPERNAMES        = 16
+	DC_ORIENTATION       = 17
+	DC_COPIES            = 18
+	DC_BINADJUST         = 19
+	DC_EMF_COMPLIANT     = 20
+	DC_DATATYPE_PRODUCED = 21
+	DC_COLLATE           = 22
+	DC_MANUFACTURER      = 23
+	DC_MODEL             = 24
+	DC_PERSONALITY       = 25
+	DC_PRINTRATE         = 26
+	DC_PRINTRATEUNIT     = 27
+	DC_PRINTERMEM        = 28
+	DC_MEDIAREADY        = 29
+	DC_STAPLE            = 30
+	DC_PRINTRATEPPM      = 31
+	DC_COLORDEVICE       = 32
+	DC_NUP               = 33
+	DC_MEDIATYPENAMES    = 34
+	DC_MEDIATYPES        = 35
+)
+
+// GetDeviceCaps index constants
+const (
+	DRIVERVERSION   = 0
+	TECHNOLOGY      = 2
+	HORZSIZE        = 4
+	VERTSIZE        = 6
+	HORZRES         = 8
+	VERTRES         = 10
+	LOGPIXELSX      = 88
+	LOGPIXELSY      = 90
+	BITSPIXEL       = 12
+	PLANES          = 14
+	NUMBRUSHES      = 16
+	NUMPENS         = 18
+	NUMFONTS        = 22
+	NUMCOLORS       = 24
+	NUMMARKERS      = 20
+	ASPECTX         = 40
+	ASPECTY         = 42
+	ASPECTXY        = 44
+	PDEVICESIZE     = 26
+	CLIPCAPS        = 36
+	SIZEPALETTE     = 104
+	NUMRESERVED     = 106
+	COLORRES        = 108
+	PHYSICALWIDTH   = 110
+	PHYSICALHEIGHT  = 111
+	PHYSICALOFFSETX = 112
+	PHYSICALOFFSETY = 113
+	SCALINGFACTORX  = 114
+	SCALINGFACTORY  = 115
+	VREFRESH        = 116
+	DESKTOPHORZRES  = 118
+	DESKTOPVERTRES  = 117
+	BLTALIGNMENT    = 119
+	SHADEBLENDCAPS  = 120
+	COLORMGMTCAPS   = 121
+	RASTERCAPS      = 38
+	CURVECAPS       = 28
+	LINECAPS        = 30
+	POLYGONALCAPS   = 32
+	TEXTCAPS        = 34
+)
+
+// GetDeviceCaps TECHNOLOGY constants
+const (
+	DT_PLOTTER    = 0
+	DT_RASDISPLAY = 1
+	DT_RASPRINTER = 2
+	DT_RASCAMERA  = 3
+	DT_CHARSTREAM = 4
+	DT_METAFILE   = 5
+	DT_DISPFILE   = 6
+)
+
+// GetDeviceCaps SHADEBLENDCAPS constants
+const (
+	SB_NONE          = 0x00
+	SB_CONST_ALPHA   = 0x01
+	SB_PIXEL_ALPHA   = 0x02
+	SB_PREMULT_ALPHA = 0x04
+	SB_GRAD_RECT     = 0x10
+	SB_GRAD_TRI      = 0x20
+)
+
+// GetDeviceCaps COLORMGMTCAPS constants
+const (
+	CM_NONE       = 0x00
+	CM_DEVICE_ICM = 0x01
+	CM_GAMMA_RAMP = 0x02
+	CM_CMYK_COLOR = 0x04
+)
+
+// GetDeviceCaps RASTERCAPS constants
+const (
+	RC_BANDING      = 2
+	RC_BITBLT       = 1
+	RC_BITMAP64     = 8
+	RC_DI_BITMAP    = 128
+	RC_DIBTODEV     = 512
+	RC_FLOODFILL    = 4096
+	RC_GDI20_OUTPUT = 16
+	RC_PALETTE      = 256
+	RC_SCALING      = 4
+	RC_STRETCHBLT   = 2048
+	RC_STRETCHDIB   = 8192
+	RC_DEVBITS      = 0x8000
+	RC_OP_DX_OUTPUT = 0x4000
+)
+
+// GetDeviceCaps CURVECAPS constants
+const (
+	CC_NONE       = 0
+	CC_CIRCLES    = 1
+	CC_PIE        = 2
+	CC_CHORD      = 4
+	CC_ELLIPSES   = 8
+	CC_WIDE       = 16
+	CC_STYLED     = 32
+	CC_WIDESTYLED = 64
+	CC_INTERIORS  = 128
+	CC_ROUNDRECT  = 256
+)
+
+// GetDeviceCaps LINECAPS constants
+const (
+	LC_NONE       = 0
+	LC_POLYLINE   = 2
+	LC_MARKER     = 4
+	LC_POLYMARKER = 8
+	LC_WIDE       = 16
+	LC_STYLED     = 32
+	LC_WIDESTYLED = 64
+	LC_INTERIORS  = 128
+)
+
+// GetDeviceCaps POLYGONALCAPS constants
+const (
+	PC_NONE        = 0
+	PC_POLYGON     = 1
+	PC_POLYPOLYGON = 256
+	PC_PATHS       = 512
+	PC_RECTANGLE   = 2
+	PC_WINDPOLYGON = 4
+	PC_SCANLINE    = 8
+	PC_TRAPEZOID   = 4
+	PC_WIDE        = 16
+	PC_STYLED      = 32
+	PC_WIDESTYLED  = 64
+	PC_INTERIORS   = 128
+)
+
+// GetDeviceCaps TEXTCAPS constants
+const (
+	TC_OP_CHARACTER = 1
+	TC_OP_STROKE    = 2
+	TC_CP_STROKE    = 4
+	TC_CR_90        = 8
+	TC_CR_ANY       = 16
+	TC_SF_X_YINDEP  = 32
+	TC_SA_DOUBLE    = 64
+	TC_SA_INTEGER   = 128
+	TC_SA_CONTIN    = 256
+	TC_EA_DOUBLE    = 512
+	TC_IA_ABLE      = 1024
+	TC_UA_ABLE      = 2048
+	TC_SO_ABLE      = 4096
+	TC_RA_ABLE      = 8192
+	TC_VA_ABLE      = 16384
+	TC_RESERVED     = 32768
+	TC_SCROLLBLT    = 65536
+)
+
+// Static control styles
+const (
+	SS_BITMAP          = 14
+	SS_BLACKFRAME      = 7
+	SS_BLACKRECT       = 4
+	SS_CENTER          = 1
+	SS_CENTERIMAGE     = 512
+	SS_EDITCONTROL     = 0x2000
+	SS_ENHMETAFILE     = 15
+	SS_ETCHEDFRAME     = 18
+	SS_ETCHEDHORZ      = 16
+	SS_ETCHEDVERT      = 17
+	SS_GRAYFRAME       = 8
+	SS_GRAYRECT        = 5
+	SS_ICON            = 3
+	SS_LEFT            = 0
+	SS_LEFTNOWORDWRAP  = 0xc
+	SS_NOPREFIX        = 128
+	SS_NOTIFY          = 256
+	SS_OWNERDRAW       = 0xd
+	SS_REALSIZECONTROL = 0x040
+	SS_REALSIZEIMAGE   = 0x800
+	SS_RIGHT           = 2
+	SS_RIGHTJUST       = 0x400
+	SS_SIMPLE          = 11
+	SS_SUNKEN          = 4096
+	SS_WHITEFRAME      = 9
+	SS_WHITERECT       = 6
+	SS_USERITEM        = 10
+	SS_TYPEMASK        = 0x0000001F
+	SS_ENDELLIPSIS     = 0x00004000
+	SS_PATHELLIPSIS    = 0x00008000
+	SS_WORDELLIPSIS    = 0x0000C000
+	SS_ELLIPSISMASK    = 0x0000C000
+)
+
+// Edit styles
+const (
+	ES_LEFT        = 0x0000
+	ES_CENTER      = 0x0001
+	ES_RIGHT       = 0x0002
+	ES_MULTILINE   = 0x0004
+	ES_UPPERCASE   = 0x0008
+	ES_LOWERCASE   = 0x0010
+	ES_PASSWORD    = 0x0020
+	ES_AUTOVSCROLL = 0x0040
+	ES_AUTOHSCROLL = 0x0080
+	ES_NOHIDESEL   = 0x0100
+	ES_OEMCONVERT  = 0x0400
+	ES_READONLY    = 0x0800
+	ES_WANTRETURN  = 0x1000
+	ES_NUMBER      = 0x2000
+)
+
+// Edit notifications
+const (
+	EN_SETFOCUS     = 0x0100
+	EN_KILLFOCUS    = 0x0200
+	EN_CHANGE       = 0x0300
+	EN_UPDATE       = 0x0400
+	EN_ERRSPACE     = 0x0500
+	EN_MAXTEXT      = 0x0501
+	EN_HSCROLL      = 0x0601
+	EN_VSCROLL      = 0x0602
+	EN_ALIGN_LTR_EC = 0x0700
+	EN_ALIGN_RTL_EC = 0x0701
+)
+
+// Edit messages
+const (
+	EM_GETSEL              = 0x00B0
+	EM_SETSEL              = 0x00B1
+	EM_GETRECT             = 0x00B2
+	EM_SETRECT             = 0x00B3
+	EM_SETRECTNP           = 0x00B4
+	EM_SCROLL              = 0x00B5
+	EM_LINESCROLL          = 0x00B6
+	EM_SCROLLCARET         = 0x00B7
+	EM_GETMODIFY           = 0x00B8
+	EM_SETMODIFY           = 0x00B9
+	EM_GETLINECOUNT        = 0x00BA
+	EM_LINEINDEX           = 0x00BB
+	EM_SETHANDLE           = 0x00BC
+	EM_GETHANDLE           = 0x00BD
+	EM_GETTHUMB            = 0x00BE
+	EM_LINELENGTH          = 0x00C1
+	EM_REPLACESEL          = 0x00C2
+	EM_GETLINE             = 0x00C4
+	EM_LIMITTEXT           = 0x00C5
+	EM_CANUNDO             = 0x00C6
+	EM_UNDO                = 0x00C7
+	EM_FMTLINES            = 0x00C8
+	EM_LINEFROMCHAR        = 0x00C9
+	EM_SETTABSTOPS         = 0x00CB
+	EM_SETPASSWORDCHAR     = 0x00CC
+	EM_EMPTYUNDOBUFFER     = 0x00CD
+	EM_GETFIRSTVISIBLELINE = 0x00CE
+	EM_SETREADONLY         = 0x00CF
+	EM_SETWORDBREAKPROC    = 0x00D0
+	EM_GETWORDBREAKPROC    = 0x00D1
+	EM_GETPASSWORDCHAR     = 0x00D2
+	EM_SETMARGINS          = 0x00D3
+	EM_GETMARGINS          = 0x00D4
+	EM_SETLIMITTEXT        = EM_LIMITTEXT
+	EM_GETLIMITTEXT        = 0x00D5
+	EM_POSFROMCHAR         = 0x00D6
+	EM_CHARFROMPOS         = 0x00D7
+	EM_SETIMESTATUS        = 0x00D8
+	EM_GETIMESTATUS        = 0x00D9
+	EM_SETCUEBANNER        = 0x1501
+	EM_GETCUEBANNER        = 0x1502
+)
+
+const (
+	CCM_FIRST            = 0x2000
+	CCM_LAST             = CCM_FIRST + 0x200
+	CCM_SETBKCOLOR       = 8193
+	CCM_SETCOLORSCHEME   = 8194
+	CCM_GETCOLORSCHEME   = 8195
+	CCM_GETDROPTARGET    = 8196
+	CCM_SETUNICODEFORMAT = 8197
+	CCM_GETUNICODEFORMAT = 8198
+	CCM_SETVERSION       = 0x2007
+	CCM_GETVERSION       = 0x2008
+	CCM_SETNOTIFYWINDOW  = 0x2009
+	CCM_SETWINDOWTHEME   = 0x200b
+	CCM_DPISCALE         = 0x200c
+)
+
+// Common controls styles
+const (
+	CCS_TOP           = 1
+	CCS_NOMOVEY       = 2
+	CCS_BOTTOM        = 3
+	CCS_NORESIZE      = 4
+	CCS_NOPARENTALIGN = 8
+	CCS_ADJUSTABLE    = 32
+	CCS_NODIVIDER     = 64
+	CCS_VERT          = 128
+	CCS_LEFT          = 129
+	CCS_NOMOVEX       = 130
+	CCS_RIGHT         = 131
+)
+
+// ProgressBar messages
+const (
+	PROGRESS_CLASS  = "msctls_progress32"
+	PBM_SETPOS      = WM_USER + 2
+	PBM_DELTAPOS    = WM_USER + 3
+	PBM_SETSTEP     = WM_USER + 4
+	PBM_STEPIT      = WM_USER + 5
+	PBM_SETRANGE32  = 1030
+	PBM_GETRANGE    = 1031
+	PBM_GETPOS      = 1032
+	PBM_SETBARCOLOR = 1033
+	PBM_SETBKCOLOR  = CCM_SETBKCOLOR
+	PBS_SMOOTH      = 1
+	PBS_VERTICAL    = 4
+)
+
+// GetOpenFileName and GetSaveFileName extended flags
+const (
+	OFN_EX_NOPLACESBAR = 0x00000001
+)
+
+// GetOpenFileName and GetSaveFileName flags
+const (
+	OFN_ALLOWMULTISELECT     = 0x00000200
+	OFN_CREATEPROMPT         = 0x00002000
+	OFN_DONTADDTORECENT      = 0x02000000
+	OFN_ENABLEHOOK           = 0x00000020
+	OFN_ENABLEINCLUDENOTIFY  = 0x00400000
+	OFN_ENABLESIZING         = 0x00800000
+	OFN_ENABLETEMPLATE       = 0x00000040
+	OFN_ENABLETEMPLATEHANDLE = 0x00000080
+	OFN_EXPLORER             = 0x00080000
+	OFN_EXTENSIONDIFFERENT   = 0x00000400
+	OFN_FILEMUSTEXIST        = 0x00001000
+	OFN_FORCESHOWHIDDEN      = 0x10000000
+	OFN_HIDEREADONLY         = 0x00000004
+	OFN_LONGNAMES            = 0x00200000
+	OFN_NOCHANGEDIR          = 0x00000008
+	OFN_NODEREFERENCELINKS   = 0x00100000
+	OFN_NOLONGNAMES          = 0x00040000
+	OFN_NONETWORKBUTTON      = 0x00020000
+	OFN_NOREADONLYRETURN     = 0x00008000
+	OFN_NOTESTFILECREATE     = 0x00010000
+	OFN_NOVALIDATE           = 0x00000100
+	OFN_OVERWRITEPROMPT      = 0x00000002
+	OFN_PATHMUSTEXIST        = 0x00000800
+	OFN_READONLY             = 0x00000001
+	OFN_SHAREAWARE           = 0x00004000
+	OFN_SHOWHELP             = 0x00000010
+)
+
+//SHBrowseForFolder flags
+const (
+	BIF_RETURNONLYFSDIRS    = 0x00000001
+	BIF_DONTGOBELOWDOMAIN   = 0x00000002
+	BIF_STATUSTEXT          = 0x00000004
+	BIF_RETURNFSANCESTORS   = 0x00000008
+	BIF_EDITBOX             = 0x00000010
+	BIF_VALIDATE            = 0x00000020
+	BIF_NEWDIALOGSTYLE      = 0x00000040
+	BIF_BROWSEINCLUDEURLS   = 0x00000080
+	BIF_USENEWUI            = BIF_EDITBOX | BIF_NEWDIALOGSTYLE
+	BIF_UAHINT              = 0x00000100
+	BIF_NONEWFOLDERBUTTON   = 0x00000200
+	BIF_NOTRANSLATETARGETS  = 0x00000400
+	BIF_BROWSEFORCOMPUTER   = 0x00001000
+	BIF_BROWSEFORPRINTER    = 0x00002000
+	BIF_BROWSEINCLUDEFILES  = 0x00004000
+	BIF_SHAREABLE           = 0x00008000
+	BIF_BROWSEFILEJUNCTIONS = 0x00010000
+)
+
+//MessageBox flags
+const (
+	MB_OK                = 0x00000000
+	MB_OKCANCEL          = 0x00000001
+	MB_ABORTRETRYIGNORE  = 0x00000002
+	MB_YESNOCANCEL       = 0x00000003
+	MB_YESNO             = 0x00000004
+	MB_RETRYCANCEL       = 0x00000005
+	MB_CANCELTRYCONTINUE = 0x00000006
+	MB_ICONHAND          = 0x00000010
+	MB_ICONQUESTION      = 0x00000020
+	MB_ICONEXCLAMATION   = 0x00000030
+	MB_ICONASTERISK      = 0x00000040
+	MB_USERICON          = 0x00000080
+	MB_ICONWARNING       = MB_ICONEXCLAMATION
+	MB_ICONERROR         = MB_ICONHAND
+	MB_ICONINFORMATION   = MB_ICONASTERISK
+	MB_ICONSTOP          = MB_ICONHAND
+	MB_DEFBUTTON1        = 0x00000000
+	MB_DEFBUTTON2        = 0x00000100
+	MB_DEFBUTTON3        = 0x00000200
+	MB_DEFBUTTON4        = 0x00000300
+)
+
+//COM
+const (
+	E_INVALIDARG  = 0x80070057
+	E_OUTOFMEMORY = 0x8007000E
+	E_UNEXPECTED  = 0x8000FFFF
+)
+
+const (
+	S_OK               = 0
+	S_FALSE            = 0x0001
+	RPC_E_CHANGED_MODE = 0x80010106
+)
+
+// GetSystemMetrics constants
+const (
+	SM_CXSCREEN             = 0
+	SM_CYSCREEN             = 1
+	SM_CXVSCROLL            = 2
+	SM_CYHSCROLL            = 3
+	SM_CYCAPTION            = 4
+	SM_CXBORDER             = 5
+	SM_CYBORDER             = 6
+	SM_CXDLGFRAME           = 7
+	SM_CYDLGFRAME           = 8
+	SM_CYVTHUMB             = 9
+	SM_CXHTHUMB             = 10
+	SM_CXICON               = 11
+	SM_CYICON               = 12
+	SM_CXCURSOR             = 13
+	SM_CYCURSOR             = 14
+	SM_CYMENU               = 15
+	SM_CXFULLSCREEN         = 16
+	SM_CYFULLSCREEN         = 17
+	SM_CYKANJIWINDOW        = 18
+	SM_MOUSEPRESENT         = 19
+	SM_CYVSCROLL            = 20
+	SM_CXHSCROLL            = 21
+	SM_DEBUG                = 22
+	SM_SWAPBUTTON           = 23
+	SM_RESERVED1            = 24
+	SM_RESERVED2            = 25
+	SM_RESERVED3            = 26
+	SM_RESERVED4            = 27
+	SM_CXMIN                = 28
+	SM_CYMIN                = 29
+	SM_CXSIZE               = 30
+	SM_CYSIZE               = 31
+	SM_CXFRAME              = 32
+	SM_CYFRAME              = 33
+	SM_CXMINTRACK           = 34
+	SM_CYMINTRACK           = 35
+	SM_CXDOUBLECLK          = 36
+	SM_CYDOUBLECLK          = 37
+	SM_CXICONSPACING        = 38
+	SM_CYICONSPACING        = 39
+	SM_MENUDROPALIGNMENT    = 40
+	SM_PENWINDOWS           = 41
+	SM_DBCSENABLED          = 42
+	SM_CMOUSEBUTTONS        = 43
+	SM_CXFIXEDFRAME         = SM_CXDLGFRAME
+	SM_CYFIXEDFRAME         = SM_CYDLGFRAME
+	SM_CXSIZEFRAME          = SM_CXFRAME
+	SM_CYSIZEFRAME          = SM_CYFRAME
+	SM_SECURE               = 44
+	SM_CXEDGE               = 45
+	SM_CYEDGE               = 46
+	SM_CXMINSPACING         = 47
+	SM_CYMINSPACING         = 48
+	SM_CXSMICON             = 49
+	SM_CYSMICON             = 50
+	SM_CYSMCAPTION          = 51
+	SM_CXSMSIZE             = 52
+	SM_CYSMSIZE             = 53
+	SM_CXMENUSIZE           = 54
+	SM_CYMENUSIZE           = 55
+	SM_ARRANGE              = 56
+	SM_CXMINIMIZED          = 57
+	SM_CYMINIMIZED          = 58
+	SM_CXMAXTRACK           = 59
+	SM_CYMAXTRACK           = 60
+	SM_CXMAXIMIZED          = 61
+	SM_CYMAXIMIZED          = 62
+	SM_NETWORK              = 63
+	SM_CLEANBOOT            = 67
+	SM_CXDRAG               = 68
+	SM_CYDRAG               = 69
+	SM_SHOWSOUNDS           = 70
+	SM_CXMENUCHECK          = 71
+	SM_CYMENUCHECK          = 72
+	SM_SLOWMACHINE          = 73
+	SM_MIDEASTENABLED       = 74
+	SM_MOUSEWHEELPRESENT    = 75
+	SM_XVIRTUALSCREEN       = 76
+	SM_YVIRTUALSCREEN       = 77
+	SM_CXVIRTUALSCREEN      = 78
+	SM_CYVIRTUALSCREEN      = 79
+	SM_CMONITORS            = 80
+	SM_SAMEDISPLAYFORMAT    = 81
+	SM_IMMENABLED           = 82
+	SM_CXFOCUSBORDER        = 83
+	SM_CYFOCUSBORDER        = 84
+	SM_TABLETPC             = 86
+	SM_MEDIACENTER          = 87
+	SM_STARTER              = 88
+	SM_SERVERR2             = 89
+	SM_CMETRICS             = 91
+	SM_REMOTESESSION        = 0x1000
+	SM_SHUTTINGDOWN         = 0x2000
+	SM_REMOTECONTROL        = 0x2001
+	SM_CARETBLINKINGENABLED = 0x2002
+)
+
+const (
+	CLSCTX_INPROC_SERVER   = 1
+	CLSCTX_INPROC_HANDLER  = 2
+	CLSCTX_LOCAL_SERVER    = 4
+	CLSCTX_INPROC_SERVER16 = 8
+	CLSCTX_REMOTE_SERVER   = 16
+	CLSCTX_ALL             = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER
+	CLSCTX_INPROC          = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER
+	CLSCTX_SERVER          = CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER
+)
+
+const (
+	COINIT_APARTMENTTHREADED = 0x2
+	COINIT_MULTITHREADED     = 0x0
+	COINIT_DISABLE_OLE1DDE   = 0x4
+	COINIT_SPEED_OVER_MEMORY = 0x8
+)
+
+const (
+	DISPATCH_METHOD         = 1
+	DISPATCH_PROPERTYGET    = 2
+	DISPATCH_PROPERTYPUT    = 4
+	DISPATCH_PROPERTYPUTREF = 8
+)
+
+const (
+	CC_FASTCALL = iota
+	CC_CDECL
+	CC_MSCPASCAL
+	CC_PASCAL = CC_MSCPASCAL
+	CC_MACPASCAL
+	CC_STDCALL
+	CC_FPFASTCALL
+	CC_SYSCALL
+	CC_MPWCDECL
+	CC_MPWPASCAL
+	CC_MAX = CC_MPWPASCAL
+)
+
+const (
+	VT_EMPTY           = 0x0
+	VT_NULL            = 0x1
+	VT_I2              = 0x2
+	VT_I4              = 0x3
+	VT_R4              = 0x4
+	VT_R8              = 0x5
+	VT_CY              = 0x6
+	VT_DATE            = 0x7
+	VT_BSTR            = 0x8
+	VT_DISPATCH        = 0x9
+	VT_ERROR           = 0xa
+	VT_BOOL            = 0xb
+	VT_VARIANT         = 0xc
+	VT_UNKNOWN         = 0xd
+	VT_DECIMAL         = 0xe
+	VT_I1              = 0x10
+	VT_UI1             = 0x11
+	VT_UI2             = 0x12
+	VT_UI4             = 0x13
+	VT_I8              = 0x14
+	VT_UI8             = 0x15
+	VT_INT             = 0x16
+	VT_UINT            = 0x17
+	VT_VOID            = 0x18
+	VT_HRESULT         = 0x19
+	VT_PTR             = 0x1a
+	VT_SAFEARRAY       = 0x1b
+	VT_CARRAY          = 0x1c
+	VT_USERDEFINED     = 0x1d
+	VT_LPSTR           = 0x1e
+	VT_LPWSTR          = 0x1f
+	VT_RECORD          = 0x24
+	VT_INT_PTR         = 0x25
+	VT_UINT_PTR        = 0x26
+	VT_FILETIME        = 0x40
+	VT_BLOB            = 0x41
+	VT_STREAM          = 0x42
+	VT_STORAGE         = 0x43
+	VT_STREAMED_OBJECT = 0x44
+	VT_STORED_OBJECT   = 0x45
+	VT_BLOB_OBJECT     = 0x46
+	VT_CF              = 0x47
+	VT_CLSID           = 0x48
+	VT_BSTR_BLOB       = 0xfff
+	VT_VECTOR          = 0x1000
+	VT_ARRAY           = 0x2000
+	VT_BYREF           = 0x4000
+	VT_RESERVED        = 0x8000
+	VT_ILLEGAL         = 0xffff
+	VT_ILLEGALMASKED   = 0xfff
+	VT_TYPEMASK        = 0xfff
+)
+
+const (
+	DISPID_UNKNOWN     = -1
+	DISPID_VALUE       = 0
+	DISPID_PROPERTYPUT = -3
+	DISPID_NEWENUM     = -4
+	DISPID_EVALUATE    = -5
+	DISPID_CONSTRUCTOR = -6
+	DISPID_DESTRUCTOR  = -7
+	DISPID_COLLECT     = -8
+)
+
+const (
+	MONITOR_DEFAULTTONULL    = 0x00000000
+	MONITOR_DEFAULTTOPRIMARY = 0x00000001
+	MONITOR_DEFAULTTONEAREST = 0x00000002
+
+	MONITORINFOF_PRIMARY = 0x00000001
+)
+
+const (
+	CCHDEVICENAME = 32
+	CCHFORMNAME   = 32
+)
+
+const (
+	IDOK       = 1
+	IDCANCEL   = 2
+	IDABORT    = 3
+	IDRETRY    = 4
+	IDIGNORE   = 5
+	IDYES      = 6
+	IDNO       = 7
+	IDCLOSE    = 8
+	IDHELP     = 9
+	IDTRYAGAIN = 10
+	IDCONTINUE = 11
+	IDTIMEOUT  = 32000
+)
+
+// Generic WM_NOTIFY notification codes
+const (
+	NM_FIRST           = 0
+	NM_OUTOFMEMORY     = NM_FIRST - 1
+	NM_CLICK           = NM_FIRST - 2
+	NM_DBLCLK          = NM_FIRST - 3
+	NM_RETURN          = NM_FIRST - 4
+	NM_RCLICK          = NM_FIRST - 5
+	NM_RDBLCLK         = NM_FIRST - 6
+	NM_SETFOCUS        = NM_FIRST - 7
+	NM_KILLFOCUS       = NM_FIRST - 8
+	NM_CUSTOMDRAW      = NM_FIRST - 12
+	NM_HOVER           = NM_FIRST - 13
+	NM_NCHITTEST       = NM_FIRST - 14
+	NM_KEYDOWN         = NM_FIRST - 15
+	NM_RELEASEDCAPTURE = NM_FIRST - 16
+	NM_SETCURSOR       = NM_FIRST - 17
+	NM_CHAR            = NM_FIRST - 18
+	NM_TOOLTIPSCREATED = NM_FIRST - 19
+	NM_LAST            = NM_FIRST - 99
+)
+
+// ListView messages
+const (
+	LVM_FIRST                    = 0x1000
+	LVM_GETITEMCOUNT             = LVM_FIRST + 4
+	LVM_SETIMAGELIST             = LVM_FIRST + 3
+	LVM_GETIMAGELIST             = LVM_FIRST + 2
+	LVM_GETITEM                  = LVM_FIRST + 75
+	LVM_SETITEM                  = LVM_FIRST + 76
+	LVM_INSERTITEM               = LVM_FIRST + 77
+	LVM_DELETEITEM               = LVM_FIRST + 8
+	LVM_DELETEALLITEMS           = LVM_FIRST + 9
+	LVM_GETCALLBACKMASK          = LVM_FIRST + 10
+	LVM_SETCALLBACKMASK          = LVM_FIRST + 11
+	LVM_SETUNICODEFORMAT         = CCM_SETUNICODEFORMAT
+	LVM_GETNEXTITEM              = LVM_FIRST + 12
+	LVM_FINDITEM                 = LVM_FIRST + 83
+	LVM_GETITEMRECT              = LVM_FIRST + 14
+	LVM_GETSTRINGWIDTH           = LVM_FIRST + 87
+	LVM_HITTEST                  = LVM_FIRST + 18
+	LVM_ENSUREVISIBLE            = LVM_FIRST + 19
+	LVM_SCROLL                   = LVM_FIRST + 20
+	LVM_REDRAWITEMS              = LVM_FIRST + 21
+	LVM_ARRANGE                  = LVM_FIRST + 22
+	LVM_EDITLABEL                = LVM_FIRST + 118
+	LVM_GETEDITCONTROL           = LVM_FIRST + 24
+	LVM_GETCOLUMN                = LVM_FIRST + 95
+	LVM_SETCOLUMN                = LVM_FIRST + 96
+	LVM_INSERTCOLUMN             = LVM_FIRST + 97
+	LVM_DELETECOLUMN             = LVM_FIRST + 28
+	LVM_GETCOLUMNWIDTH           = LVM_FIRST + 29
+	LVM_SETCOLUMNWIDTH           = LVM_FIRST + 30
+	LVM_GETHEADER                = LVM_FIRST + 31
+	LVM_CREATEDRAGIMAGE          = LVM_FIRST + 33
+	LVM_GETVIEWRECT              = LVM_FIRST + 34
+	LVM_GETTEXTCOLOR             = LVM_FIRST + 35
+	LVM_SETTEXTCOLOR             = LVM_FIRST + 36
+	LVM_GETTEXTBKCOLOR           = LVM_FIRST + 37
+	LVM_SETTEXTBKCOLOR           = LVM_FIRST + 38
+	LVM_GETTOPINDEX              = LVM_FIRST + 39
+	LVM_GETCOUNTPERPAGE          = LVM_FIRST + 40
+	LVM_GETORIGIN                = LVM_FIRST + 41
+	LVM_UPDATE                   = LVM_FIRST + 42
+	LVM_SETITEMSTATE             = LVM_FIRST + 43
+	LVM_GETITEMSTATE             = LVM_FIRST + 44
+	LVM_GETITEMTEXT              = LVM_FIRST + 115
+	LVM_SETITEMTEXT              = LVM_FIRST + 116
+	LVM_SETITEMCOUNT             = LVM_FIRST + 47
+	LVM_SORTITEMS                = LVM_FIRST + 48
+	LVM_SETITEMPOSITION32        = LVM_FIRST + 49
+	LVM_GETSELECTEDCOUNT         = LVM_FIRST + 50
+	LVM_GETITEMSPACING           = LVM_FIRST + 51
+	LVM_GETISEARCHSTRING         = LVM_FIRST + 117
+	LVM_SETICONSPACING           = LVM_FIRST + 53
+	LVM_SETEXTENDEDLISTVIEWSTYLE = LVM_FIRST + 54
+	LVM_GETEXTENDEDLISTVIEWSTYLE = LVM_FIRST + 55
+	LVM_GETSUBITEMRECT           = LVM_FIRST + 56
+	LVM_SUBITEMHITTEST           = LVM_FIRST + 57
+	LVM_SETCOLUMNORDERARRAY      = LVM_FIRST + 58
+	LVM_GETCOLUMNORDERARRAY      = LVM_FIRST + 59
+	LVM_SETHOTITEM               = LVM_FIRST + 60
+	LVM_GETHOTITEM               = LVM_FIRST + 61
+	LVM_SETHOTCURSOR             = LVM_FIRST + 62
+	LVM_GETHOTCURSOR             = LVM_FIRST + 63
+	LVM_APPROXIMATEVIEWRECT      = LVM_FIRST + 64
+	LVM_SETWORKAREAS             = LVM_FIRST + 65
+	LVM_GETWORKAREAS             = LVM_FIRST + 70
+	LVM_GETNUMBEROFWORKAREAS     = LVM_FIRST + 73
+	LVM_GETSELECTIONMARK         = LVM_FIRST + 66
+	LVM_SETSELECTIONMARK         = LVM_FIRST + 67
+	LVM_SETHOVERTIME             = LVM_FIRST + 71
+	LVM_GETHOVERTIME             = LVM_FIRST + 72
+	LVM_SETTOOLTIPS              = LVM_FIRST + 74
+	LVM_GETTOOLTIPS              = LVM_FIRST + 78
+	LVM_SORTITEMSEX              = LVM_FIRST + 81
+	LVM_SETBKIMAGE               = LVM_FIRST + 138
+	LVM_GETBKIMAGE               = LVM_FIRST + 139
+	LVM_SETSELECTEDCOLUMN        = LVM_FIRST + 140
+	LVM_SETVIEW                  = LVM_FIRST + 142
+	LVM_GETVIEW                  = LVM_FIRST + 143
+	LVM_INSERTGROUP              = LVM_FIRST + 145
+	LVM_SETGROUPINFO             = LVM_FIRST + 147
+	LVM_GETGROUPINFO             = LVM_FIRST + 149
+	LVM_REMOVEGROUP              = LVM_FIRST + 150
+	LVM_MOVEGROUP                = LVM_FIRST + 151
+	LVM_GETGROUPCOUNT            = LVM_FIRST + 152
+	LVM_GETGROUPINFOBYINDEX      = LVM_FIRST + 153
+	LVM_MOVEITEMTOGROUP          = LVM_FIRST + 154
+	LVM_GETGROUPRECT             = LVM_FIRST + 98
+	LVM_SETGROUPMETRICS          = LVM_FIRST + 155
+	LVM_GETGROUPMETRICS          = LVM_FIRST + 156
+	LVM_ENABLEGROUPVIEW          = LVM_FIRST + 157
+	LVM_SORTGROUPS               = LVM_FIRST + 158
+	LVM_INSERTGROUPSORTED        = LVM_FIRST + 159
+	LVM_REMOVEALLGROUPS          = LVM_FIRST + 160
+	LVM_HASGROUP                 = LVM_FIRST + 161
+	LVM_GETGROUPSTATE            = LVM_FIRST + 92
+	LVM_GETFOCUSEDGROUP          = LVM_FIRST + 93
+	LVM_SETTILEVIEWINFO          = LVM_FIRST + 162
+	LVM_GETTILEVIEWINFO          = LVM_FIRST + 163
+	LVM_SETTILEINFO              = LVM_FIRST + 164
+	LVM_GETTILEINFO              = LVM_FIRST + 165
+	LVM_SETINSERTMARK            = LVM_FIRST + 166
+	LVM_GETINSERTMARK            = LVM_FIRST + 167
+	LVM_INSERTMARKHITTEST        = LVM_FIRST + 168
+	LVM_GETINSERTMARKRECT        = LVM_FIRST + 169
+	LVM_SETINSERTMARKCOLOR       = LVM_FIRST + 170
+	LVM_GETINSERTMARKCOLOR       = LVM_FIRST + 171
+	LVM_SETINFOTIP               = LVM_FIRST + 173
+	LVM_GETSELECTEDCOLUMN        = LVM_FIRST + 174
+	LVM_ISGROUPVIEWENABLED       = LVM_FIRST + 175
+	LVM_GETOUTLINECOLOR          = LVM_FIRST + 176
+	LVM_SETOUTLINECOLOR          = LVM_FIRST + 177
+	LVM_CANCELEDITLABEL          = LVM_FIRST + 179
+	LVM_MAPINDEXTOID             = LVM_FIRST + 180
+	LVM_MAPIDTOINDEX             = LVM_FIRST + 181
+	LVM_ISITEMVISIBLE            = LVM_FIRST + 182
+	LVM_GETNEXTITEMINDEX         = LVM_FIRST + 211
+)
+
+// ListView notifications
+const (
+	LVN_FIRST = -100
+
+	LVN_ITEMCHANGING      = LVN_FIRST - 0
+	LVN_ITEMCHANGED       = LVN_FIRST - 1
+	LVN_INSERTITEM        = LVN_FIRST - 2
+	LVN_DELETEITEM        = LVN_FIRST - 3
+	LVN_DELETEALLITEMS    = LVN_FIRST - 4
+	LVN_BEGINLABELEDITA   = LVN_FIRST - 5
+	LVN_BEGINLABELEDITW   = LVN_FIRST - 75
+	LVN_ENDLABELEDITA     = LVN_FIRST - 6
+	LVN_ENDLABELEDITW     = LVN_FIRST - 76
+	LVN_COLUMNCLICK       = LVN_FIRST - 8
+	LVN_BEGINDRAG         = LVN_FIRST - 9
+	LVN_BEGINRDRAG        = LVN_FIRST - 11
+	LVN_ODCACHEHINT       = LVN_FIRST - 13
+	LVN_ODFINDITEMA       = LVN_FIRST - 52
+	LVN_ODFINDITEMW       = LVN_FIRST - 79
+	LVN_ITEMACTIVATE      = LVN_FIRST - 14
+	LVN_ODSTATECHANGED    = LVN_FIRST - 15
+	LVN_HOTTRACK          = LVN_FIRST - 21
+	LVN_GETDISPINFO       = LVN_FIRST - 77
+	LVN_SETDISPINFO       = LVN_FIRST - 78
+	LVN_KEYDOWN           = LVN_FIRST - 55
+	LVN_MARQUEEBEGIN      = LVN_FIRST - 56
+	LVN_GETINFOTIP        = LVN_FIRST - 58
+	LVN_INCREMENTALSEARCH = LVN_FIRST - 63
+	LVN_BEGINSCROLL       = LVN_FIRST - 80
+	LVN_ENDSCROLL         = LVN_FIRST - 81
+)
+
+// ListView LVNI constants
+const (
+	LVNI_ALL         = 0
+	LVNI_FOCUSED     = 1
+	LVNI_SELECTED    = 2
+	LVNI_CUT         = 4
+	LVNI_DROPHILITED = 8
+	LVNI_ABOVE       = 256
+	LVNI_BELOW       = 512
+	LVNI_TOLEFT      = 1024
+	LVNI_TORIGHT     = 2048
+)
+
+// ListView styles
+const (
+	LVS_ICON            = 0x0000
+	LVS_REPORT          = 0x0001
+	LVS_SMALLICON       = 0x0002
+	LVS_LIST            = 0x0003
+	LVS_TYPEMASK        = 0x0003
+	LVS_SINGLESEL       = 0x0004
+	LVS_SHOWSELALWAYS   = 0x0008
+	LVS_SORTASCENDING   = 0x0010
+	LVS_SORTDESCENDING  = 0x0020
+	LVS_SHAREIMAGELISTS = 0x0040
+	LVS_NOLABELWRAP     = 0x0080
+	LVS_AUTOARRANGE     = 0x0100
+	LVS_EDITLABELS      = 0x0200
+	LVS_OWNERDATA       = 0x1000
+	LVS_NOSCROLL        = 0x2000
+	LVS_TYPESTYLEMASK   = 0xfc00
+	LVS_ALIGNTOP        = 0x0000
+	LVS_ALIGNLEFT       = 0x0800
+	LVS_ALIGNMASK       = 0x0c00
+	LVS_OWNERDRAWFIXED  = 0x0400
+	LVS_NOCOLUMNHEADER  = 0x4000
+	LVS_NOSORTHEADER    = 0x8000
+)
+
+// ListView extended styles
+const (
+	LVS_EX_GRIDLINES        = 0x00000001
+	LVS_EX_SUBITEMIMAGES    = 0x00000002
+	LVS_EX_CHECKBOXES       = 0x00000004
+	LVS_EX_TRACKSELECT      = 0x00000008
+	LVS_EX_HEADERDRAGDROP   = 0x00000010
+	LVS_EX_FULLROWSELECT    = 0x00000020
+	LVS_EX_ONECLICKACTIVATE = 0x00000040
+	LVS_EX_TWOCLICKACTIVATE = 0x00000080
+	LVS_EX_FLATSB           = 0x00000100
+	LVS_EX_REGIONAL         = 0x00000200
+	LVS_EX_INFOTIP          = 0x00000400
+	LVS_EX_UNDERLINEHOT     = 0x00000800
+	LVS_EX_UNDERLINECOLD    = 0x00001000
+	LVS_EX_MULTIWORKAREAS   = 0x00002000
+	LVS_EX_LABELTIP         = 0x00004000
+	LVS_EX_BORDERSELECT     = 0x00008000
+	LVS_EX_DOUBLEBUFFER     = 0x00010000
+	LVS_EX_HIDELABELS       = 0x00020000
+	LVS_EX_SINGLEROW        = 0x00040000
+	LVS_EX_SNAPTOGRID       = 0x00080000
+	LVS_EX_SIMPLESELECT     = 0x00100000
+)
+
+// ListView column flags
+const (
+	LVCF_FMT     = 0x0001
+	LVCF_WIDTH   = 0x0002
+	LVCF_TEXT    = 0x0004
+	LVCF_SUBITEM = 0x0008
+	LVCF_IMAGE   = 0x0010
+	LVCF_ORDER   = 0x0020
+)
+
+// ListView column format constants
+const (
+	LVCFMT_LEFT            = 0x0000
+	LVCFMT_RIGHT           = 0x0001
+	LVCFMT_CENTER          = 0x0002
+	LVCFMT_JUSTIFYMASK     = 0x0003
+	LVCFMT_IMAGE           = 0x0800
+	LVCFMT_BITMAP_ON_RIGHT = 0x1000
+	LVCFMT_COL_HAS_IMAGES  = 0x8000
+)
+
+// ListView item flags
+const (
+	LVIF_TEXT        = 0x00000001
+	LVIF_IMAGE       = 0x00000002
+	LVIF_PARAM       = 0x00000004
+	LVIF_STATE       = 0x00000008
+	LVIF_INDENT      = 0x00000010
+	LVIF_NORECOMPUTE = 0x00000800
+	LVIF_GROUPID     = 0x00000100
+	LVIF_COLUMNS     = 0x00000200
+)
+
+// ListView item states
+const (
+	LVIS_FOCUSED        = 1
+	LVIS_SELECTED       = 2
+	LVIS_CUT            = 4
+	LVIS_DROPHILITED    = 8
+	LVIS_OVERLAYMASK    = 0xF00
+	LVIS_STATEIMAGEMASK = 0xF000
+)
+
+// ListView hit test constants
+const (
+	LVHT_NOWHERE         = 0x00000001
+	LVHT_ONITEMICON      = 0x00000002
+	LVHT_ONITEMLABEL     = 0x00000004
+	LVHT_ONITEMSTATEICON = 0x00000008
+	LVHT_ONITEM          = LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON
+
+	LVHT_ABOVE   = 0x00000008
+	LVHT_BELOW   = 0x00000010
+	LVHT_TORIGHT = 0x00000020
+	LVHT_TOLEFT  = 0x00000040
+)
+
+// ListView image list types
+const (
+	LVSIL_NORMAL      = 0
+	LVSIL_SMALL       = 1
+	LVSIL_STATE       = 2
+	LVSIL_GROUPHEADER = 3
+)
+
+// InitCommonControlsEx flags
+const (
+	ICC_LISTVIEW_CLASSES   = 1
+	ICC_TREEVIEW_CLASSES   = 2
+	ICC_BAR_CLASSES        = 4
+	ICC_TAB_CLASSES        = 8
+	ICC_UPDOWN_CLASS       = 16
+	ICC_PROGRESS_CLASS     = 32
+	ICC_HOTKEY_CLASS       = 64
+	ICC_ANIMATE_CLASS      = 128
+	ICC_WIN95_CLASSES      = 255
+	ICC_DATE_CLASSES       = 256
+	ICC_USEREX_CLASSES     = 512
+	ICC_COOL_CLASSES       = 1024
+	ICC_INTERNET_CLASSES   = 2048
+	ICC_PAGESCROLLER_CLASS = 4096
+	ICC_NATIVEFNTCTL_CLASS = 8192
+	INFOTIPSIZE            = 1024
+	ICC_STANDARD_CLASSES   = 0x00004000
+	ICC_LINK_CLASS         = 0x00008000
+)
+
+// Dialog Codes
+const (
+	DLGC_WANTARROWS      = 0x0001
+	DLGC_WANTTAB         = 0x0002
+	DLGC_WANTALLKEYS     = 0x0004
+	DLGC_WANTMESSAGE     = 0x0004
+	DLGC_HASSETSEL       = 0x0008
+	DLGC_DEFPUSHBUTTON   = 0x0010
+	DLGC_UNDEFPUSHBUTTON = 0x0020
+	DLGC_RADIOBUTTON     = 0x0040
+	DLGC_WANTCHARS       = 0x0080
+	DLGC_STATIC          = 0x0100
+	DLGC_BUTTON          = 0x2000
+)
+
+// Get/SetWindowWord/Long offsets for use with WC_DIALOG windows
+const (
+	DWL_MSGRESULT = 0
+	DWL_DLGPROC   = 4
+	DWL_USER      = 8
+)
+
+// Registry predefined keys
+const (
+	HKEY_CLASSES_ROOT     HKEY = 0x80000000
+	HKEY_CURRENT_USER     HKEY = 0x80000001
+	HKEY_LOCAL_MACHINE    HKEY = 0x80000002
+	HKEY_USERS            HKEY = 0x80000003
+	HKEY_PERFORMANCE_DATA HKEY = 0x80000004
+	HKEY_CURRENT_CONFIG   HKEY = 0x80000005
+	HKEY_DYN_DATA         HKEY = 0x80000006
+)
+
+// Registry Key Security and Access Rights
+const (
+	KEY_ALL_ACCESS         = 0xF003F
+	KEY_CREATE_SUB_KEY     = 0x0004
+	KEY_ENUMERATE_SUB_KEYS = 0x0008
+	KEY_NOTIFY             = 0x0010
+	KEY_QUERY_VALUE        = 0x0001
+	KEY_SET_VALUE          = 0x0002
+	KEY_READ               = 0x20019
+	KEY_WRITE              = 0x20006
+)
+
+const (
+	NFR_ANSI    = 1
+	NFR_UNICODE = 2
+	NF_QUERY    = 3
+	NF_REQUERY  = 4
+)
+
+// Registry value types
+const (
+	RRF_RT_REG_NONE         = 0x00000001
+	RRF_RT_REG_SZ           = 0x00000002
+	RRF_RT_REG_EXPAND_SZ    = 0x00000004
+	RRF_RT_REG_BINARY       = 0x00000008
+	RRF_RT_REG_DWORD        = 0x00000010
+	RRF_RT_REG_MULTI_SZ     = 0x00000020
+	RRF_RT_REG_QWORD        = 0x00000040
+	RRF_RT_DWORD            = (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD)
+	RRF_RT_QWORD            = (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD)
+	RRF_RT_ANY              = 0x0000ffff
+	RRF_NOEXPAND            = 0x10000000
+	RRF_ZEROONFAILURE       = 0x20000000
+	REG_PROCESS_APPKEY      = 0x00000001
+	REG_MUI_STRING_TRUNCATE = 0x00000001
+)
+
+// PeekMessage wRemoveMsg value
+const (
+	PM_NOREMOVE = 0x000
+	PM_REMOVE   = 0x001
+	PM_NOYIELD  = 0x002
+)
+
+// ImageList flags
+const (
+	ILC_MASK             = 0x00000001
+	ILC_COLOR            = 0x00000000
+	ILC_COLORDDB         = 0x000000FE
+	ILC_COLOR4           = 0x00000004
+	ILC_COLOR8           = 0x00000008
+	ILC_COLOR16          = 0x00000010
+	ILC_COLOR24          = 0x00000018
+	ILC_COLOR32          = 0x00000020
+	ILC_PALETTE          = 0x00000800
+	ILC_MIRROR           = 0x00002000
+	ILC_PERITEMMIRROR    = 0x00008000
+	ILC_ORIGINALSIZE     = 0x00010000
+	ILC_HIGHQUALITYSCALE = 0x00020000
+)
+
+// Keystroke Message Flags
+const (
+	KF_EXTENDED = 0x0100
+	KF_DLGMODE  = 0x0800
+	KF_MENUMODE = 0x1000
+	KF_ALTDOWN  = 0x2000
+	KF_REPEAT   = 0x4000
+	KF_UP       = 0x8000
+)
+
+// Virtual-Key Codes
+const (
+	VK_LBUTTON             = 0x01
+	VK_RBUTTON             = 0x02
+	VK_CANCEL              = 0x03
+	VK_MBUTTON             = 0x04
+	VK_XBUTTON1            = 0x05
+	VK_XBUTTON2            = 0x06
+	VK_BACK                = 0x08
+	VK_TAB                 = 0x09
+	VK_CLEAR               = 0x0C
+	VK_RETURN              = 0x0D
+	VK_SHIFT               = 0x10
+	VK_CONTROL             = 0x11
+	VK_MENU                = 0x12
+	VK_PAUSE               = 0x13
+	VK_CAPITAL             = 0x14
+	VK_KANA                = 0x15
+	VK_HANGEUL             = 0x15
+	VK_HANGUL              = 0x15
+	VK_JUNJA               = 0x17
+	VK_FINAL               = 0x18
+	VK_HANJA               = 0x19
+	VK_KANJI               = 0x19
+	VK_ESCAPE              = 0x1B
+	VK_CONVERT             = 0x1C
+	VK_NONCONVERT          = 0x1D
+	VK_ACCEPT              = 0x1E
+	VK_MODECHANGE          = 0x1F
+	VK_SPACE               = 0x20
+	VK_PRIOR               = 0x21
+	VK_NEXT                = 0x22
+	VK_END                 = 0x23
+	VK_HOME                = 0x24
+	VK_LEFT                = 0x25
+	VK_UP                  = 0x26
+	VK_RIGHT               = 0x27
+	VK_DOWN                = 0x28
+	VK_SELECT              = 0x29
+	VK_PRINT               = 0x2A
+	VK_EXECUTE             = 0x2B
+	VK_SNAPSHOT            = 0x2C
+	VK_INSERT              = 0x2D
+	VK_DELETE              = 0x2E
+	VK_HELP                = 0x2F
+	VK_LWIN                = 0x5B
+	VK_RWIN                = 0x5C
+	VK_APPS                = 0x5D
+	VK_SLEEP               = 0x5F
+	VK_NUMPAD0             = 0x60
+	VK_NUMPAD1             = 0x61
+	VK_NUMPAD2             = 0x62
+	VK_NUMPAD3             = 0x63
+	VK_NUMPAD4             = 0x64
+	VK_NUMPAD5             = 0x65
+	VK_NUMPAD6             = 0x66
+	VK_NUMPAD7             = 0x67
+	VK_NUMPAD8             = 0x68
+	VK_NUMPAD9             = 0x69
+	VK_MULTIPLY            = 0x6A
+	VK_ADD                 = 0x6B
+	VK_SEPARATOR           = 0x6C
+	VK_SUBTRACT            = 0x6D
+	VK_DECIMAL             = 0x6E
+	VK_DIVIDE              = 0x6F
+	VK_F1                  = 0x70
+	VK_F2                  = 0x71
+	VK_F3                  = 0x72
+	VK_F4                  = 0x73
+	VK_F5                  = 0x74
+	VK_F6                  = 0x75
+	VK_F7                  = 0x76
+	VK_F8                  = 0x77
+	VK_F9                  = 0x78
+	VK_F10                 = 0x79
+	VK_F11                 = 0x7A
+	VK_F12                 = 0x7B
+	VK_F13                 = 0x7C
+	VK_F14                 = 0x7D
+	VK_F15                 = 0x7E
+	VK_F16                 = 0x7F
+	VK_F17                 = 0x80
+	VK_F18                 = 0x81
+	VK_F19                 = 0x82
+	VK_F20                 = 0x83
+	VK_F21                 = 0x84
+	VK_F22                 = 0x85
+	VK_F23                 = 0x86
+	VK_F24                 = 0x87
+	VK_NUMLOCK             = 0x90
+	VK_SCROLL              = 0x91
+	VK_OEM_NEC_EQUAL       = 0x92
+	VK_OEM_FJ_JISHO        = 0x92
+	VK_OEM_FJ_MASSHOU      = 0x93
+	VK_OEM_FJ_TOUROKU      = 0x94
+	VK_OEM_FJ_LOYA         = 0x95
+	VK_OEM_FJ_ROYA         = 0x96
+	VK_LSHIFT              = 0xA0
+	VK_RSHIFT              = 0xA1
+	VK_LCONTROL            = 0xA2
+	VK_RCONTROL            = 0xA3
+	VK_LMENU               = 0xA4
+	VK_RMENU               = 0xA5
+	VK_BROWSER_BACK        = 0xA6
+	VK_BROWSER_FORWARD     = 0xA7
+	VK_BROWSER_REFRESH     = 0xA8
+	VK_BROWSER_STOP        = 0xA9
+	VK_BROWSER_SEARCH      = 0xAA
+	VK_BROWSER_FAVORITES   = 0xAB
+	VK_BROWSER_HOME        = 0xAC
+	VK_VOLUME_MUTE         = 0xAD
+	VK_VOLUME_DOWN         = 0xAE
+	VK_VOLUME_UP           = 0xAF
+	VK_MEDIA_NEXT_TRACK    = 0xB0
+	VK_MEDIA_PREV_TRACK    = 0xB1
+	VK_MEDIA_STOP          = 0xB2
+	VK_MEDIA_PLAY_PAUSE    = 0xB3
+	VK_LAUNCH_MAIL         = 0xB4
+	VK_LAUNCH_MEDIA_SELECT = 0xB5
+	VK_LAUNCH_APP1         = 0xB6
+	VK_LAUNCH_APP2         = 0xB7
+	VK_OEM_1               = 0xBA
+	VK_OEM_PLUS            = 0xBB
+	VK_OEM_COMMA           = 0xBC
+	VK_OEM_MINUS           = 0xBD
+	VK_OEM_PERIOD          = 0xBE
+	VK_OEM_2               = 0xBF
+	VK_OEM_3               = 0xC0
+	VK_OEM_4               = 0xDB
+	VK_OEM_5               = 0xDC
+	VK_OEM_6               = 0xDD
+	VK_OEM_7               = 0xDE
+	VK_OEM_8               = 0xDF
+	VK_OEM_AX              = 0xE1
+	VK_OEM_102             = 0xE2
+	VK_ICO_HELP            = 0xE3
+	VK_ICO_00              = 0xE4
+	VK_PROCESSKEY          = 0xE5
+	VK_ICO_CLEAR           = 0xE6
+	VK_OEM_RESET           = 0xE9
+	VK_OEM_JUMP            = 0xEA
+	VK_OEM_PA1             = 0xEB
+	VK_OEM_PA2             = 0xEC
+	VK_OEM_PA3             = 0xED
+	VK_OEM_WSCTRL          = 0xEE
+	VK_OEM_CUSEL           = 0xEF
+	VK_OEM_ATTN            = 0xF0
+	VK_OEM_FINISH          = 0xF1
+	VK_OEM_COPY            = 0xF2
+	VK_OEM_AUTO            = 0xF3
+	VK_OEM_ENLW            = 0xF4
+	VK_OEM_BACKTAB         = 0xF5
+	VK_ATTN                = 0xF6
+	VK_CRSEL               = 0xF7
+	VK_EXSEL               = 0xF8
+	VK_EREOF               = 0xF9
+	VK_PLAY                = 0xFA
+	VK_ZOOM                = 0xFB
+	VK_NONAME              = 0xFC
+	VK_PA1                 = 0xFD
+	VK_OEM_CLEAR           = 0xFE
+)
+
+// Registry Value Types
+const (
+	REG_NONE                       = 0
+	REG_SZ                         = 1
+	REG_EXPAND_SZ                  = 2
+	REG_BINARY                     = 3
+	REG_DWORD                      = 4
+	REG_DWORD_LITTLE_ENDIAN        = 4
+	REG_DWORD_BIG_ENDIAN           = 5
+	REG_LINK                       = 6
+	REG_MULTI_SZ                   = 7
+	REG_RESOURCE_LIST              = 8
+	REG_FULL_RESOURCE_DESCRIPTOR   = 9
+	REG_RESOURCE_REQUIREMENTS_LIST = 10
+	REG_QWORD                      = 11
+	REG_QWORD_LITTLE_ENDIAN        = 11
+)
+
+// Tooltip styles
+const (
+	TTS_ALWAYSTIP      = 0x01
+	TTS_NOPREFIX       = 0x02
+	TTS_NOANIMATE      = 0x10
+	TTS_NOFADE         = 0x20
+	TTS_BALLOON        = 0x40
+	TTS_CLOSE          = 0x80
+	TTS_USEVISUALSTYLE = 0x100
+)
+
+// Tooltip messages
+const (
+	TTM_ACTIVATE        = (WM_USER + 1)
+	TTM_SETDELAYTIME    = (WM_USER + 3)
+	TTM_ADDTOOL         = (WM_USER + 50)
+	TTM_DELTOOL         = (WM_USER + 51)
+	TTM_NEWTOOLRECT     = (WM_USER + 52)
+	TTM_RELAYEVENT      = (WM_USER + 7)
+	TTM_GETTOOLINFO     = (WM_USER + 53)
+	TTM_SETTOOLINFO     = (WM_USER + 54)
+	TTM_HITTEST         = (WM_USER + 55)
+	TTM_GETTEXT         = (WM_USER + 56)
+	TTM_UPDATETIPTEXT   = (WM_USER + 57)
+	TTM_GETTOOLCOUNT    = (WM_USER + 13)
+	TTM_ENUMTOOLS       = (WM_USER + 58)
+	TTM_GETCURRENTTOOL  = (WM_USER + 59)
+	TTM_WINDOWFROMPOINT = (WM_USER + 16)
+	TTM_TRACKACTIVATE   = (WM_USER + 17)
+	TTM_TRACKPOSITION   = (WM_USER + 18)
+	TTM_SETTIPBKCOLOR   = (WM_USER + 19)
+	TTM_SETTIPTEXTCOLOR = (WM_USER + 20)
+	TTM_GETDELAYTIME    = (WM_USER + 21)
+	TTM_GETTIPBKCOLOR   = (WM_USER + 22)
+	TTM_GETTIPTEXTCOLOR = (WM_USER + 23)
+	TTM_SETMAXTIPWIDTH  = (WM_USER + 24)
+	TTM_GETMAXTIPWIDTH  = (WM_USER + 25)
+	TTM_SETMARGIN       = (WM_USER + 26)
+	TTM_GETMARGIN       = (WM_USER + 27)
+	TTM_POP             = (WM_USER + 28)
+	TTM_UPDATE          = (WM_USER + 29)
+	TTM_GETBUBBLESIZE   = (WM_USER + 30)
+	TTM_ADJUSTRECT      = (WM_USER + 31)
+	TTM_SETTITLE        = (WM_USER + 33)
+	TTM_POPUP           = (WM_USER + 34)
+	TTM_GETTITLE        = (WM_USER + 35)
+)
+
+// Tooltip icons
+const (
+	TTI_NONE          = 0
+	TTI_INFO          = 1
+	TTI_WARNING       = 2
+	TTI_ERROR         = 3
+	TTI_INFO_LARGE    = 4
+	TTI_WARNING_LARGE = 5
+	TTI_ERROR_LARGE   = 6
+)
+
+// Tooltip notifications
+const (
+	TTN_FIRST       = -520
+	TTN_LAST        = -549
+	TTN_GETDISPINFO = (TTN_FIRST - 10)
+	TTN_SHOW        = (TTN_FIRST - 1)
+	TTN_POP         = (TTN_FIRST - 2)
+	TTN_LINKCLICK   = (TTN_FIRST - 3)
+	TTN_NEEDTEXT    = TTN_GETDISPINFO
+)
+
+const (
+	TTF_IDISHWND    = 0x0001
+	TTF_CENTERTIP   = 0x0002
+	TTF_RTLREADING  = 0x0004
+	TTF_SUBCLASS    = 0x0010
+	TTF_TRACK       = 0x0020
+	TTF_ABSOLUTE    = 0x0080
+	TTF_TRANSPARENT = 0x0100
+	TTF_PARSELINKS  = 0x1000
+	TTF_DI_SETITEM  = 0x8000
+)
+
+const (
+	SWP_NOSIZE         = 0x0001
+	SWP_NOMOVE         = 0x0002
+	SWP_NOZORDER       = 0x0004
+	SWP_NOREDRAW       = 0x0008
+	SWP_NOACTIVATE     = 0x0010
+	SWP_FRAMECHANGED   = 0x0020
+	SWP_SHOWWINDOW     = 0x0040
+	SWP_HIDEWINDOW     = 0x0080
+	SWP_NOCOPYBITS     = 0x0100
+	SWP_NOOWNERZORDER  = 0x0200
+	SWP_NOSENDCHANGING = 0x0400
+	SWP_DRAWFRAME      = SWP_FRAMECHANGED
+	SWP_NOREPOSITION   = SWP_NOOWNERZORDER
+	SWP_DEFERERASE     = 0x2000
+	SWP_ASYNCWINDOWPOS = 0x4000
+)
+
+// Predefined window handles
+const (
+	HWND_BROADCAST = HWND(0xFFFF)
+	HWND_BOTTOM    = HWND(1)
+	HWND_NOTOPMOST = ^HWND(1) // -2
+	HWND_TOP       = HWND(0)
+	HWND_TOPMOST   = ^HWND(0) // -1
+	HWND_DESKTOP   = HWND(0)
+	HWND_MESSAGE   = ^HWND(2) // -3
+)
+
+// Pen types
+const (
+	PS_COSMETIC  = 0x00000000
+	PS_GEOMETRIC = 0x00010000
+	PS_TYPE_MASK = 0x000F0000
+)
+
+// Pen styles
+const (
+	PS_SOLID       = 0
+	PS_DASH        = 1
+	PS_DOT         = 2
+	PS_DASHDOT     = 3
+	PS_DASHDOTDOT  = 4
+	PS_NULL        = 5
+	PS_INSIDEFRAME = 6
+	PS_USERSTYLE   = 7
+	PS_ALTERNATE   = 8
+	PS_STYLE_MASK  = 0x0000000F
+)
+
+// Pen cap types
+const (
+	PS_ENDCAP_ROUND  = 0x00000000
+	PS_ENDCAP_SQUARE = 0x00000100
+	PS_ENDCAP_FLAT   = 0x00000200
+	PS_ENDCAP_MASK   = 0x00000F00
+)
+
+// Pen join types
+const (
+	PS_JOIN_ROUND = 0x00000000
+	PS_JOIN_BEVEL = 0x00001000
+	PS_JOIN_MITER = 0x00002000
+	PS_JOIN_MASK  = 0x0000F000
+)
+
+// Hatch styles
+const (
+	HS_HORIZONTAL = 0
+	HS_VERTICAL   = 1
+	HS_FDIAGONAL  = 2
+	HS_BDIAGONAL  = 3
+	HS_CROSS      = 4
+	HS_DIAGCROSS  = 5
+)
+
+// Stock Logical Objects
+const (
+	WHITE_BRUSH         = 0
+	LTGRAY_BRUSH        = 1
+	GRAY_BRUSH          = 2
+	DKGRAY_BRUSH        = 3
+	BLACK_BRUSH         = 4
+	NULL_BRUSH          = 5
+	HOLLOW_BRUSH        = NULL_BRUSH
+	WHITE_PEN           = 6
+	BLACK_PEN           = 7
+	NULL_PEN            = 8
+	OEM_FIXED_FONT      = 10
+	ANSI_FIXED_FONT     = 11
+	ANSI_VAR_FONT       = 12
+	SYSTEM_FONT         = 13
+	DEVICE_DEFAULT_FONT = 14
+	DEFAULT_PALETTE     = 15
+	SYSTEM_FIXED_FONT   = 16
+	DEFAULT_GUI_FONT    = 17
+	DC_BRUSH            = 18
+	DC_PEN              = 19
+)
+
+// Brush styles
+const (
+	BS_SOLID         = 0
+	BS_NULL          = 1
+	BS_HOLLOW        = BS_NULL
+	BS_HATCHED       = 2
+	BS_PATTERN       = 3
+	BS_INDEXED       = 4
+	BS_DIBPATTERN    = 5
+	BS_DIBPATTERNPT  = 6
+	BS_PATTERN8X8    = 7
+	BS_DIBPATTERN8X8 = 8
+	BS_MONOPATTERN   = 9
+)
+
+// TRACKMOUSEEVENT flags
+const (
+	TME_HOVER     = 0x00000001
+	TME_LEAVE     = 0x00000002
+	TME_NONCLIENT = 0x00000010
+	TME_QUERY     = 0x40000000
+	TME_CANCEL    = 0x80000000
+
+	HOVER_DEFAULT = 0xFFFFFFFF
+)
+
+// WM_NCHITTEST and MOUSEHOOKSTRUCT Mouse Position Codes
+const (
+	HTERROR       = (-2)
+	HTTRANSPARENT = (-1)
+	HTNOWHERE     = 0
+	HTCLIENT      = 1
+	HTCAPTION     = 2
+	HTSYSMENU     = 3
+	HTGROWBOX     = 4
+	HTSIZE        = HTGROWBOX
+	HTMENU        = 5
+	HTHSCROLL     = 6
+	HTVSCROLL     = 7
+	HTMINBUTTON   = 8
+	HTMAXBUTTON   = 9
+	HTLEFT        = 10
+	HTRIGHT       = 11
+	HTTOP         = 12
+	HTTOPLEFT     = 13
+	HTTOPRIGHT    = 14
+	HTBOTTOM      = 15
+	HTBOTTOMLEFT  = 16
+	HTBOTTOMRIGHT = 17
+	HTBORDER      = 18
+	HTREDUCE      = HTMINBUTTON
+	HTZOOM        = HTMAXBUTTON
+	HTSIZEFIRST   = HTLEFT
+	HTSIZELAST    = HTBOTTOMRIGHT
+	HTOBJECT      = 19
+	HTCLOSE       = 20
+	HTHELP        = 21
+)
+
+// DrawText[Ex] format flags
+const (
+	DT_TOP                  = 0x00000000
+	DT_LEFT                 = 0x00000000
+	DT_CENTER               = 0x00000001
+	DT_RIGHT                = 0x00000002
+	DT_VCENTER              = 0x00000004
+	DT_BOTTOM               = 0x00000008
+	DT_WORDBREAK            = 0x00000010
+	DT_SINGLELINE           = 0x00000020
+	DT_EXPANDTABS           = 0x00000040
+	DT_TABSTOP              = 0x00000080
+	DT_NOCLIP               = 0x00000100
+	DT_EXTERNALLEADING      = 0x00000200
+	DT_CALCRECT             = 0x00000400
+	DT_NOPREFIX             = 0x00000800
+	DT_INTERNAL             = 0x00001000
+	DT_EDITCONTROL          = 0x00002000
+	DT_PATH_ELLIPSIS        = 0x00004000
+	DT_END_ELLIPSIS         = 0x00008000
+	DT_MODIFYSTRING         = 0x00010000
+	DT_RTLREADING           = 0x00020000
+	DT_WORD_ELLIPSIS        = 0x00040000
+	DT_NOFULLWIDTHCHARBREAK = 0x00080000
+	DT_HIDEPREFIX           = 0x00100000
+	DT_PREFIXONLY           = 0x00200000
+)
+
+const CLR_INVALID = 0xFFFFFFFF
+
+// Background Modes
+const (
+	TRANSPARENT = 1
+	OPAQUE      = 2
+	BKMODE_LAST = 2
+)
+
+// Global Memory Flags
+const (
+	GMEM_FIXED          = 0x0000
+	GMEM_MOVEABLE       = 0x0002
+	GMEM_NOCOMPACT      = 0x0010
+	GMEM_NODISCARD      = 0x0020
+	GMEM_ZEROINIT       = 0x0040
+	GMEM_MODIFY         = 0x0080
+	GMEM_DISCARDABLE    = 0x0100
+	GMEM_NOT_BANKED     = 0x1000
+	GMEM_SHARE          = 0x2000
+	GMEM_DDESHARE       = 0x2000
+	GMEM_NOTIFY         = 0x4000
+	GMEM_LOWER          = GMEM_NOT_BANKED
+	GMEM_VALID_FLAGS    = 0x7F72
+	GMEM_INVALID_HANDLE = 0x8000
+	GHND                = (GMEM_MOVEABLE | GMEM_ZEROINIT)
+	GPTR                = (GMEM_FIXED | GMEM_ZEROINIT)
+)
+
+// Ternary raster operations
+const (
+	SRCCOPY        = 0x00CC0020
+	SRCPAINT       = 0x00EE0086
+	SRCAND         = 0x008800C6
+	SRCINVERT      = 0x00660046
+	SRCERASE       = 0x00440328
+	NOTSRCCOPY     = 0x00330008
+	NOTSRCERASE    = 0x001100A6
+	MERGECOPY      = 0x00C000CA
+	MERGEPAINT     = 0x00BB0226
+	PATCOPY        = 0x00F00021
+	PATPAINT       = 0x00FB0A09
+	PATINVERT      = 0x005A0049
+	DSTINVERT      = 0x00550009
+	BLACKNESS      = 0x00000042
+	WHITENESS      = 0x00FF0062
+	NOMIRRORBITMAP = 0x80000000
+	CAPTUREBLT     = 0x40000000
+)
+
+// Clipboard formats
+const (
+	CF_TEXT            = 1
+	CF_BITMAP          = 2
+	CF_METAFILEPICT    = 3
+	CF_SYLK            = 4
+	CF_DIF             = 5
+	CF_TIFF            = 6
+	CF_OEMTEXT         = 7
+	CF_DIB             = 8
+	CF_PALETTE         = 9
+	CF_PENDATA         = 10
+	CF_RIFF            = 11
+	CF_WAVE            = 12
+	CF_UNICODETEXT     = 13
+	CF_ENHMETAFILE     = 14
+	CF_HDROP           = 15
+	CF_LOCALE          = 16
+	CF_DIBV5           = 17
+	CF_MAX             = 18
+	CF_OWNERDISPLAY    = 0x0080
+	CF_DSPTEXT         = 0x0081
+	CF_DSPBITMAP       = 0x0082
+	CF_DSPMETAFILEPICT = 0x0083
+	CF_DSPENHMETAFILE  = 0x008E
+	CF_PRIVATEFIRST    = 0x0200
+	CF_PRIVATELAST     = 0x02FF
+	CF_GDIOBJFIRST     = 0x0300
+	CF_GDIOBJLAST      = 0x03FF
+)
+
+// Bitmap compression formats
+const (
+	BI_RGB       = 0
+	BI_RLE8      = 1
+	BI_RLE4      = 2
+	BI_BITFIELDS = 3
+	BI_JPEG      = 4
+	BI_PNG       = 5
+)
+
+// SetDIBitsToDevice fuColorUse
+const (
+	DIB_PAL_COLORS = 1
+	DIB_RGB_COLORS = 0
+)
+
+const (
+	STANDARD_RIGHTS_REQUIRED = 0x000F
+)
+
+// Service Control Manager object specific access types
+const (
+	SC_MANAGER_CONNECT            = 0x0001
+	SC_MANAGER_CREATE_SERVICE     = 0x0002
+	SC_MANAGER_ENUMERATE_SERVICE  = 0x0004
+	SC_MANAGER_LOCK               = 0x0008
+	SC_MANAGER_QUERY_LOCK_STATUS  = 0x0010
+	SC_MANAGER_MODIFY_BOOT_CONFIG = 0x0020
+	SC_MANAGER_ALL_ACCESS         = STANDARD_RIGHTS_REQUIRED | SC_MANAGER_CONNECT | SC_MANAGER_CREATE_SERVICE | SC_MANAGER_ENUMERATE_SERVICE | SC_MANAGER_LOCK | SC_MANAGER_QUERY_LOCK_STATUS | SC_MANAGER_MODIFY_BOOT_CONFIG
+)
+
+// Service Types (Bit Mask)
+const (
+	SERVICE_KERNEL_DRIVER       = 0x00000001
+	SERVICE_FILE_SYSTEM_DRIVER  = 0x00000002
+	SERVICE_ADAPTER             = 0x00000004
+	SERVICE_RECOGNIZER_DRIVER   = 0x00000008
+	SERVICE_DRIVER              = SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_RECOGNIZER_DRIVER
+	SERVICE_WIN32_OWN_PROCESS   = 0x00000010
+	SERVICE_WIN32_SHARE_PROCESS = 0x00000020
+	SERVICE_WIN32               = SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS
+	SERVICE_INTERACTIVE_PROCESS = 0x00000100
+	SERVICE_TYPE_ALL            = SERVICE_WIN32 | SERVICE_ADAPTER | SERVICE_DRIVER | SERVICE_INTERACTIVE_PROCESS
+)
+
+// Service State -- for CurrentState
+const (
+	SERVICE_STOPPED          = 0x00000001
+	SERVICE_START_PENDING    = 0x00000002
+	SERVICE_STOP_PENDING     = 0x00000003
+	SERVICE_RUNNING          = 0x00000004
+	SERVICE_CONTINUE_PENDING = 0x00000005
+	SERVICE_PAUSE_PENDING    = 0x00000006
+	SERVICE_PAUSED           = 0x00000007
+)
+
+// Controls Accepted  (Bit Mask)
+const (
+	SERVICE_ACCEPT_STOP                  = 0x00000001
+	SERVICE_ACCEPT_PAUSE_CONTINUE        = 0x00000002
+	SERVICE_ACCEPT_SHUTDOWN              = 0x00000004
+	SERVICE_ACCEPT_PARAMCHANGE           = 0x00000008
+	SERVICE_ACCEPT_NETBINDCHANGE         = 0x00000010
+	SERVICE_ACCEPT_HARDWAREPROFILECHANGE = 0x00000020
+	SERVICE_ACCEPT_POWEREVENT            = 0x00000040
+	SERVICE_ACCEPT_SESSIONCHANGE         = 0x00000080
+	SERVICE_ACCEPT_PRESHUTDOWN           = 0x00000100
+	SERVICE_ACCEPT_TIMECHANGE            = 0x00000200
+	SERVICE_ACCEPT_TRIGGEREVENT          = 0x00000400
+)
+
+// Service object specific access type
+const (
+	SERVICE_QUERY_CONFIG         = 0x0001
+	SERVICE_CHANGE_CONFIG        = 0x0002
+	SERVICE_QUERY_STATUS         = 0x0004
+	SERVICE_ENUMERATE_DEPENDENTS = 0x0008
+	SERVICE_START                = 0x0010
+	SERVICE_STOP                 = 0x0020
+	SERVICE_PAUSE_CONTINUE       = 0x0040
+	SERVICE_INTERROGATE          = 0x0080
+	SERVICE_USER_DEFINED_CONTROL = 0x0100
+
+	SERVICE_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED |
+		SERVICE_QUERY_CONFIG |
+		SERVICE_CHANGE_CONFIG |
+		SERVICE_QUERY_STATUS |
+		SERVICE_ENUMERATE_DEPENDENTS |
+		SERVICE_START |
+		SERVICE_STOP |
+		SERVICE_PAUSE_CONTINUE |
+		SERVICE_INTERROGATE |
+		SERVICE_USER_DEFINED_CONTROL
+)
+
+// MapVirtualKey maptypes
+const (
+	MAPVK_VK_TO_CHAR   = 2
+	MAPVK_VK_TO_VSC    = 0
+	MAPVK_VSC_TO_VK    = 1
+	MAPVK_VSC_TO_VK_EX = 3
+)
+
+// ReadEventLog Flags
+const (
+	EVENTLOG_SEEK_READ       = 0x0002
+	EVENTLOG_SEQUENTIAL_READ = 0x0001
+	EVENTLOG_FORWARDS_READ   = 0x0004
+	EVENTLOG_BACKWARDS_READ  = 0x0008
+)
+
+// CreateToolhelp32Snapshot flags
+const (
+	TH32CS_SNAPHEAPLIST = 0x00000001
+	TH32CS_SNAPPROCESS  = 0x00000002
+	TH32CS_SNAPTHREAD   = 0x00000004
+	TH32CS_SNAPMODULE   = 0x00000008
+	TH32CS_SNAPMODULE32 = 0x00000010
+	TH32CS_INHERIT      = 0x80000000
+	TH32CS_SNAPALL      = TH32CS_SNAPHEAPLIST | TH32CS_SNAPMODULE | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD
+)
+
+const (
+	MAX_MODULE_NAME32 = 255
+	MAX_PATH          = 260
+)
+
+const (
+	FOREGROUND_BLUE            = 0x0001
+	FOREGROUND_GREEN           = 0x0002
+	FOREGROUND_RED             = 0x0004
+	FOREGROUND_INTENSITY       = 0x0008
+	BACKGROUND_BLUE            = 0x0010
+	BACKGROUND_GREEN           = 0x0020
+	BACKGROUND_RED             = 0x0040
+	BACKGROUND_INTENSITY       = 0x0080
+	COMMON_LVB_LEADING_BYTE    = 0x0100
+	COMMON_LVB_TRAILING_BYTE   = 0x0200
+	COMMON_LVB_GRID_HORIZONTAL = 0x0400
+	COMMON_LVB_GRID_LVERTICAL  = 0x0800
+	COMMON_LVB_GRID_RVERTICAL  = 0x1000
+	COMMON_LVB_REVERSE_VIDEO   = 0x4000
+	COMMON_LVB_UNDERSCORE      = 0x8000
+)
+
+// Flags used by the DWM_BLURBEHIND structure to indicate
+// which of its members contain valid information.
+const (
+	DWM_BB_ENABLE                = 0x00000001 //     A value for the fEnable member has been specified.
+	DWM_BB_BLURREGION            = 0x00000002 //     A value for the hRgnBlur member has been specified.
+	DWM_BB_TRANSITIONONMAXIMIZED = 0x00000004 //     A value for the fTransitionOnMaximized member has been specified.
+)
+
+// Flags used by the DwmEnableComposition  function
+// to change the state of Desktop Window Manager (DWM) composition.
+const (
+	DWM_EC_DISABLECOMPOSITION = 0 //     Disable composition
+	DWM_EC_ENABLECOMPOSITION  = 1 //     Enable composition
+)
+
+// enum-lite implementation for the following constant structure
+type DWM_SHOWCONTACT int32
+
+const (
+	DWMSC_DOWN      = 0x00000001
+	DWMSC_UP        = 0x00000002
+	DWMSC_DRAG      = 0x00000004
+	DWMSC_HOLD      = 0x00000008
+	DWMSC_PENBARREL = 0x00000010
+	DWMSC_NONE      = 0x00000000
+	DWMSC_ALL       = 0xFFFFFFFF
+)
+
+// enum-lite implementation for the following constant structure
+type DWM_SOURCE_FRAME_SAMPLING int32
+
+// TODO: need to verify this construction
+// Flags used by the DwmSetPresentParameters function
+// to specify the frame sampling type
+const (
+	DWM_SOURCE_FRAME_SAMPLING_POINT = iota + 1
+	DWM_SOURCE_FRAME_SAMPLING_COVERAGE
+	DWM_SOURCE_FRAME_SAMPLING_LAST
+)
+
+// Flags used by the DWM_THUMBNAIL_PROPERTIES structure to
+// indicate which of its members contain valid information.
+const (
+	DWM_TNP_RECTDESTINATION      = 0x00000001 //    A value for the rcDestination member has been specified
+	DWM_TNP_RECTSOURCE           = 0x00000002 //    A value for the rcSource member has been specified
+	DWM_TNP_OPACITY              = 0x00000004 //    A value for the opacity member has been specified
+	DWM_TNP_VISIBLE              = 0x00000008 //    A value for the fVisible member has been specified
+	DWM_TNP_SOURCECLIENTAREAONLY = 0x00000010 //    A value for the fSourceClientAreaOnly member has been specified
+)
+
+// enum-lite implementation for the following constant structure
+type DWMFLIP3DWINDOWPOLICY int32
+
+// TODO: need to verify this construction
+// Flags used by the DwmSetWindowAttribute function
+// to specify the Flip3D window policy
+const (
+	DWMFLIP3D_DEFAULT = iota + 1
+	DWMFLIP3D_EXCLUDEBELOW
+	DWMFLIP3D_EXCLUDEABOVE
+	DWMFLIP3D_LAST
+)
+
+// enum-lite implementation for the following constant structure
+type DWMNCRENDERINGPOLICY int32
+
+// TODO: need to verify this construction
+// Flags used by the DwmSetWindowAttribute function
+// to specify the non-client area rendering policy
+const (
+	DWMNCRP_USEWINDOWSTYLE = iota + 1
+	DWMNCRP_DISABLED
+	DWMNCRP_ENABLED
+	DWMNCRP_LAST
+)
+
+// enum-lite implementation for the following constant structure
+type DWMTRANSITION_OWNEDWINDOW_TARGET int32
+
+const (
+	DWMTRANSITION_OWNEDWINDOW_NULL       = -1
+	DWMTRANSITION_OWNEDWINDOW_REPOSITION = 0
+)
+
+// enum-lite implementation for the following constant structure
+type DWMWINDOWATTRIBUTE int32
+
+// TODO: need to verify this construction
+// Flags used by the DwmGetWindowAttribute and DwmSetWindowAttribute functions
+// to specify window attributes for non-client rendering
+const (
+	DWMWA_NCRENDERING_ENABLED = iota + 1
+	DWMWA_NCRENDERING_POLICY
+	DWMWA_TRANSITIONS_FORCEDISABLED
+	DWMWA_ALLOW_NCPAINT
+	DWMWA_CAPTION_BUTTON_BOUNDS
+	DWMWA_NONCLIENT_RTL_LAYOUT
+	DWMWA_FORCE_ICONIC_REPRESENTATION
+	DWMWA_FLIP3D_POLICY
+	DWMWA_EXTENDED_FRAME_BOUNDS
+	DWMWA_HAS_ICONIC_BITMAP
+	DWMWA_DISALLOW_PEEK
+	DWMWA_EXCLUDED_FROM_PEEK
+	DWMWA_CLOAK
+	DWMWA_CLOAKED
+	DWMWA_FREEZE_REPRESENTATION
+	DWMWA_LAST
+)
+
+// enum-lite implementation for the following constant structure
+type GESTURE_TYPE int32
+
+// TODO: use iota?
+// Identifies the gesture type
+const (
+	GT_PEN_TAP                 = 0
+	GT_PEN_DOUBLETAP           = 1
+	GT_PEN_RIGHTTAP            = 2
+	GT_PEN_PRESSANDHOLD        = 3
+	GT_PEN_PRESSANDHOLDABORT   = 4
+	GT_TOUCH_TAP               = 5
+	GT_TOUCH_DOUBLETAP         = 6
+	GT_TOUCH_RIGHTTAP          = 7
+	GT_TOUCH_PRESSANDHOLD      = 8
+	GT_TOUCH_PRESSANDHOLDABORT = 9
+	GT_TOUCH_PRESSANDTAP       = 10
+)
+
+// Icons
+const (
+	ICON_SMALL  = 0
+	ICON_BIG    = 1
+	ICON_SMALL2 = 2
+)
+
+const (
+	SIZE_RESTORED  = 0
+	SIZE_MINIMIZED = 1
+	SIZE_MAXIMIZED = 2
+	SIZE_MAXSHOW   = 3
+	SIZE_MAXHIDE   = 4
+)
+
+// XButton values
+const (
+	XBUTTON1 = 1
+	XBUTTON2 = 2
+)
+
+// Devmode
+const (
+	DM_SPECVERSION = 0x0401
+
+	DM_ORIENTATION        = 0x00000001
+	DM_PAPERSIZE          = 0x00000002
+	DM_PAPERLENGTH        = 0x00000004
+	DM_PAPERWIDTH         = 0x00000008
+	DM_SCALE              = 0x00000010
+	DM_POSITION           = 0x00000020
+	DM_NUP                = 0x00000040
+	DM_DISPLAYORIENTATION = 0x00000080
+	DM_COPIES             = 0x00000100
+	DM_DEFAULTSOURCE      = 0x00000200
+	DM_PRINTQUALITY       = 0x00000400
+	DM_COLOR              = 0x00000800
+	DM_DUPLEX             = 0x00001000
+	DM_YRESOLUTION        = 0x00002000
+	DM_TTOPTION           = 0x00004000
+	DM_COLLATE            = 0x00008000
+	DM_FORMNAME           = 0x00010000
+	DM_LOGPIXELS          = 0x00020000
+	DM_BITSPERPEL         = 0x00040000
+	DM_PELSWIDTH          = 0x00080000
+	DM_PELSHEIGHT         = 0x00100000
+	DM_DISPLAYFLAGS       = 0x00200000
+	DM_DISPLAYFREQUENCY   = 0x00400000
+	DM_ICMMETHOD          = 0x00800000
+	DM_ICMINTENT          = 0x01000000
+	DM_MEDIATYPE          = 0x02000000
+	DM_DITHERTYPE         = 0x04000000
+	DM_PANNINGWIDTH       = 0x08000000
+	DM_PANNINGHEIGHT      = 0x10000000
+	DM_DISPLAYFIXEDOUTPUT = 0x20000000
+)
+
+// ChangeDisplaySettings
+const (
+	CDS_UPDATEREGISTRY  = 0x00000001
+	CDS_TEST            = 0x00000002
+	CDS_FULLSCREEN      = 0x00000004
+	CDS_GLOBAL          = 0x00000008
+	CDS_SET_PRIMARY     = 0x00000010
+	CDS_VIDEOPARAMETERS = 0x00000020
+	CDS_RESET           = 0x40000000
+	CDS_NORESET         = 0x10000000
+
+	DISP_CHANGE_SUCCESSFUL  = 0
+	DISP_CHANGE_RESTART     = 1
+	DISP_CHANGE_FAILED      = -1
+	DISP_CHANGE_BADMODE     = -2
+	DISP_CHANGE_NOTUPDATED  = -3
+	DISP_CHANGE_BADFLAGS    = -4
+	DISP_CHANGE_BADPARAM    = -5
+	DISP_CHANGE_BADDUALVIEW = -6
+)
+
+const (
+	ENUM_CURRENT_SETTINGS  = 0xFFFFFFFF
+	ENUM_REGISTRY_SETTINGS = 0xFFFFFFFE
+)
+
+// PIXELFORMATDESCRIPTOR
+const (
+	PFD_TYPE_RGBA       = 0
+	PFD_TYPE_COLORINDEX = 1
+
+	PFD_MAIN_PLANE     = 0
+	PFD_OVERLAY_PLANE  = 1
+	PFD_UNDERLAY_PLANE = -1
+
+	PFD_DOUBLEBUFFER         = 0x00000001
+	PFD_STEREO               = 0x00000002
+	PFD_DRAW_TO_WINDOW       = 0x00000004
+	PFD_DRAW_TO_BITMAP       = 0x00000008
+	PFD_SUPPORT_GDI          = 0x00000010
+	PFD_SUPPORT_OPENGL       = 0x00000020
+	PFD_GENERIC_FORMAT       = 0x00000040
+	PFD_NEED_PALETTE         = 0x00000080
+	PFD_NEED_SYSTEM_PALETTE  = 0x00000100
+	PFD_SWAP_EXCHANGE        = 0x00000200
+	PFD_SWAP_COPY            = 0x00000400
+	PFD_SWAP_LAYER_BUFFERS   = 0x00000800
+	PFD_GENERIC_ACCELERATED  = 0x00001000
+	PFD_SUPPORT_DIRECTDRAW   = 0x00002000
+	PFD_DIRECT3D_ACCELERATED = 0x00004000
+	PFD_SUPPORT_COMPOSITION  = 0x00008000
+
+	PFD_DEPTH_DONTCARE        = 0x20000000
+	PFD_DOUBLEBUFFER_DONTCARE = 0x40000000
+	PFD_STEREO_DONTCARE       = 0x80000000
+)
+
+const (
+	INPUT_MOUSE    = 0
+	INPUT_KEYBOARD = 1
+	INPUT_HARDWARE = 2
+)
+
+const (
+	MOUSEEVENTF_ABSOLUTE        = 0x8000
+	MOUSEEVENTF_HWHEEL          = 0x01000
+	MOUSEEVENTF_MOVE            = 0x0001
+	MOUSEEVENTF_MOVE_NOCOALESCE = 0x2000
+	MOUSEEVENTF_LEFTDOWN        = 0x0002
+	MOUSEEVENTF_LEFTUP          = 0x0004
+	MOUSEEVENTF_RIGHTDOWN       = 0x0008
+	MOUSEEVENTF_RIGHTUP         = 0x0010
+	MOUSEEVENTF_MIDDLEDOWN      = 0x0020
+	MOUSEEVENTF_MIDDLEUP        = 0x0040
+	MOUSEEVENTF_VIRTUALDESK     = 0x4000
+	MOUSEEVENTF_WHEEL           = 0x0800
+	MOUSEEVENTF_XDOWN           = 0x0080
+	MOUSEEVENTF_XUP             = 0x0100
+)
diff --git a/vendor/github.com/shirou/w32/dwmapi.go b/vendor/github.com/shirou/w32/dwmapi.go
new file mode 100644
index 0000000000..eb656d1874
--- /dev/null
+++ b/vendor/github.com/shirou/w32/dwmapi.go
@@ -0,0 +1,254 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+// DEFINED IN THE DWM API BUT NOT IMPLEMENTED BY MS:
+// DwmAttachMilContent
+// DwmDetachMilContent
+// DwmEnableComposition
+// DwmGetGraphicsStreamClient
+// DwmGetGraphicsStreamTransformHint
+
+var (
+	moddwmapi = syscall.NewLazyDLL("dwmapi.dll")
+
+	procDwmDefWindowProc                 = moddwmapi.NewProc("DwmDefWindowProc")
+	procDwmEnableBlurBehindWindow        = moddwmapi.NewProc("DwmEnableBlurBehindWindow")
+	procDwmEnableMMCSS                   = moddwmapi.NewProc("DwmEnableMMCSS")
+	procDwmExtendFrameIntoClientArea     = moddwmapi.NewProc("DwmExtendFrameIntoClientArea")
+	procDwmFlush                         = moddwmapi.NewProc("DwmFlush")
+	procDwmGetColorizationColor          = moddwmapi.NewProc("DwmGetColorizationColor")
+	procDwmGetCompositionTimingInfo      = moddwmapi.NewProc("DwmGetCompositionTimingInfo")
+	procDwmGetTransportAttributes        = moddwmapi.NewProc("DwmGetTransportAttributes")
+	procDwmGetWindowAttribute            = moddwmapi.NewProc("DwmGetWindowAttribute")
+	procDwmInvalidateIconicBitmaps       = moddwmapi.NewProc("DwmInvalidateIconicBitmaps")
+	procDwmIsCompositionEnabled          = moddwmapi.NewProc("DwmIsCompositionEnabled")
+	procDwmModifyPreviousDxFrameDuration = moddwmapi.NewProc("DwmModifyPreviousDxFrameDuration")
+	procDwmQueryThumbnailSourceSize      = moddwmapi.NewProc("DwmQueryThumbnailSourceSize")
+	procDwmRegisterThumbnail             = moddwmapi.NewProc("DwmRegisterThumbnail")
+	procDwmRenderGesture                 = moddwmapi.NewProc("DwmRenderGesture")
+	procDwmSetDxFrameDuration            = moddwmapi.NewProc("DwmSetDxFrameDuration")
+	procDwmSetIconicLivePreviewBitmap    = moddwmapi.NewProc("DwmSetIconicLivePreviewBitmap")
+	procDwmSetIconicThumbnail            = moddwmapi.NewProc("DwmSetIconicThumbnail")
+	procDwmSetPresentParameters          = moddwmapi.NewProc("DwmSetPresentParameters")
+	procDwmSetWindowAttribute            = moddwmapi.NewProc("DwmSetWindowAttribute")
+	procDwmShowContact                   = moddwmapi.NewProc("DwmShowContact")
+	procDwmTetherContact                 = moddwmapi.NewProc("DwmTetherContact")
+	procDwmTransitionOwnedWindow         = moddwmapi.NewProc("DwmTransitionOwnedWindow")
+	procDwmUnregisterThumbnail           = moddwmapi.NewProc("DwmUnregisterThumbnail")
+	procDwmUpdateThumbnailProperties     = moddwmapi.NewProc("DwmUpdateThumbnailProperties")
+)
+
+func DwmDefWindowProc(hWnd HWND, msg uint, wParam, lParam uintptr) (bool, uint) {
+	var result uint
+	ret, _, _ := procDwmDefWindowProc.Call(
+		uintptr(hWnd),
+		uintptr(msg),
+		wParam,
+		lParam,
+		uintptr(unsafe.Pointer(&result)))
+	return ret != 0, result
+}
+
+func DwmEnableBlurBehindWindow(hWnd HWND, pBlurBehind *DWM_BLURBEHIND) HRESULT {
+	ret, _, _ := procDwmEnableBlurBehindWindow.Call(
+		uintptr(hWnd),
+		uintptr(unsafe.Pointer(pBlurBehind)))
+	return HRESULT(ret)
+}
+
+func DwmEnableMMCSS(fEnableMMCSS bool) HRESULT {
+	ret, _, _ := procDwmEnableMMCSS.Call(
+		uintptr(BoolToBOOL(fEnableMMCSS)))
+	return HRESULT(ret)
+}
+
+func DwmExtendFrameIntoClientArea(hWnd HWND, pMarInset *MARGINS) HRESULT {
+	ret, _, _ := procDwmExtendFrameIntoClientArea.Call(
+		uintptr(hWnd),
+		uintptr(unsafe.Pointer(pMarInset)))
+	return HRESULT(ret)
+}
+
+func DwmFlush() HRESULT {
+	ret, _, _ := procDwmFlush.Call()
+	return HRESULT(ret)
+}
+
+func DwmGetColorizationColor(pcrColorization *uint32, pfOpaqueBlend *BOOL) HRESULT {
+	ret, _, _ := procDwmGetColorizationColor.Call(
+		uintptr(unsafe.Pointer(pcrColorization)),
+		uintptr(unsafe.Pointer(pfOpaqueBlend)))
+	return HRESULT(ret)
+}
+
+func DwmGetCompositionTimingInfo(hWnd HWND, pTimingInfo *DWM_TIMING_INFO) HRESULT {
+	ret, _, _ := procDwmGetCompositionTimingInfo.Call(
+		uintptr(hWnd),
+		uintptr(unsafe.Pointer(pTimingInfo)))
+	return HRESULT(ret)
+}
+
+func DwmGetTransportAttributes(pfIsRemoting *BOOL, pfIsConnected *BOOL, pDwGeneration *uint32) HRESULT {
+	ret, _, _ := procDwmGetTransportAttributes.Call(
+		uintptr(unsafe.Pointer(pfIsRemoting)),
+		uintptr(unsafe.Pointer(pfIsConnected)),
+		uintptr(unsafe.Pointer(pDwGeneration)))
+	return HRESULT(ret)
+}
+
+// TODO: verify handling of variable arguments
+func DwmGetWindowAttribute(hWnd HWND, dwAttribute uint32) (pAttribute interface{}, result HRESULT) {
+	var pvAttribute, pvAttrSize uintptr
+	switch dwAttribute {
+	case DWMWA_NCRENDERING_ENABLED:
+		v := new(BOOL)
+		pAttribute = v
+		pvAttribute = uintptr(unsafe.Pointer(v))
+		pvAttrSize = unsafe.Sizeof(*v)
+	case DWMWA_CAPTION_BUTTON_BOUNDS, DWMWA_EXTENDED_FRAME_BOUNDS:
+		v := new(RECT)
+		pAttribute = v
+		pvAttribute = uintptr(unsafe.Pointer(v))
+		pvAttrSize = unsafe.Sizeof(*v)
+	case DWMWA_CLOAKED:
+		panic(fmt.Sprintf("DwmGetWindowAttribute(%d) is not currently supported.", dwAttribute))
+	default:
+		panic(fmt.Sprintf("DwmGetWindowAttribute(%d) is not valid.", dwAttribute))
+	}
+
+	ret, _, _ := procDwmGetWindowAttribute.Call(
+		uintptr(hWnd),
+		uintptr(dwAttribute),
+		pvAttribute,
+		pvAttrSize)
+	result = HRESULT(ret)
+	return
+}
+
+func DwmInvalidateIconicBitmaps(hWnd HWND) HRESULT {
+	ret, _, _ := procDwmInvalidateIconicBitmaps.Call(
+		uintptr(hWnd))
+	return HRESULT(ret)
+}
+
+func DwmIsCompositionEnabled(pfEnabled *BOOL) HRESULT {
+	ret, _, _ := procDwmIsCompositionEnabled.Call(
+		uintptr(unsafe.Pointer(pfEnabled)))
+	return HRESULT(ret)
+}
+
+func DwmModifyPreviousDxFrameDuration(hWnd HWND, cRefreshes int, fRelative bool) HRESULT {
+	ret, _, _ := procDwmModifyPreviousDxFrameDuration.Call(
+		uintptr(hWnd),
+		uintptr(cRefreshes),
+		uintptr(BoolToBOOL(fRelative)))
+	return HRESULT(ret)
+}
+
+func DwmQueryThumbnailSourceSize(hThumbnail HTHUMBNAIL, pSize *SIZE) HRESULT {
+	ret, _, _ := procDwmQueryThumbnailSourceSize.Call(
+		uintptr(hThumbnail),
+		uintptr(unsafe.Pointer(pSize)))
+	return HRESULT(ret)
+}
+
+func DwmRegisterThumbnail(hWndDestination HWND, hWndSource HWND, phThumbnailId *HTHUMBNAIL) HRESULT {
+	ret, _, _ := procDwmRegisterThumbnail.Call(
+		uintptr(hWndDestination),
+		uintptr(hWndSource),
+		uintptr(unsafe.Pointer(phThumbnailId)))
+	return HRESULT(ret)
+}
+
+func DwmRenderGesture(gt GESTURE_TYPE, cContacts uint, pdwPointerID *uint32, pPoints *POINT) {
+	procDwmRenderGesture.Call(
+		uintptr(gt),
+		uintptr(cContacts),
+		uintptr(unsafe.Pointer(pdwPointerID)),
+		uintptr(unsafe.Pointer(pPoints)))
+	return
+}
+
+func DwmSetDxFrameDuration(hWnd HWND, cRefreshes int) HRESULT {
+	ret, _, _ := procDwmSetDxFrameDuration.Call(
+		uintptr(hWnd),
+		uintptr(cRefreshes))
+	return HRESULT(ret)
+}
+
+func DwmSetIconicLivePreviewBitmap(hWnd HWND, hbmp HBITMAP, pptClient *POINT, dwSITFlags uint32) HRESULT {
+	ret, _, _ := procDwmSetIconicLivePreviewBitmap.Call(
+		uintptr(hWnd),
+		uintptr(hbmp),
+		uintptr(unsafe.Pointer(pptClient)),
+		uintptr(dwSITFlags))
+	return HRESULT(ret)
+}
+
+func DwmSetIconicThumbnail(hWnd HWND, hbmp HBITMAP, dwSITFlags uint32) HRESULT {
+	ret, _, _ := procDwmSetIconicThumbnail.Call(
+		uintptr(hWnd),
+		uintptr(hbmp),
+		uintptr(dwSITFlags))
+	return HRESULT(ret)
+}
+
+func DwmSetPresentParameters(hWnd HWND, pPresentParams *DWM_PRESENT_PARAMETERS) HRESULT {
+	ret, _, _ := procDwmSetPresentParameters.Call(
+		uintptr(hWnd),
+		uintptr(unsafe.Pointer(pPresentParams)))
+	return HRESULT(ret)
+}
+
+func DwmSetWindowAttribute(hWnd HWND, dwAttribute uint32, pvAttribute LPCVOID, cbAttribute uint32) HRESULT {
+	ret, _, _ := procDwmSetWindowAttribute.Call(
+		uintptr(hWnd),
+		uintptr(dwAttribute),
+		uintptr(pvAttribute),
+		uintptr(cbAttribute))
+	return HRESULT(ret)
+}
+
+func DwmShowContact(dwPointerID uint32, eShowContact DWM_SHOWCONTACT) {
+	procDwmShowContact.Call(
+		uintptr(dwPointerID),
+		uintptr(eShowContact))
+	return
+}
+
+func DwmTetherContact(dwPointerID uint32, fEnable bool, ptTether POINT) {
+	procDwmTetherContact.Call(
+		uintptr(dwPointerID),
+		uintptr(BoolToBOOL(fEnable)),
+		uintptr(unsafe.Pointer(&ptTether)))
+	return
+}
+
+func DwmTransitionOwnedWindow(hWnd HWND, target DWMTRANSITION_OWNEDWINDOW_TARGET) {
+	procDwmTransitionOwnedWindow.Call(
+		uintptr(hWnd),
+		uintptr(target))
+	return
+}
+
+func DwmUnregisterThumbnail(hThumbnailId HTHUMBNAIL) HRESULT {
+	ret, _, _ := procDwmUnregisterThumbnail.Call(
+		uintptr(hThumbnailId))
+	return HRESULT(ret)
+}
+
+func DwmUpdateThumbnailProperties(hThumbnailId HTHUMBNAIL, ptnProperties *DWM_THUMBNAIL_PROPERTIES) HRESULT {
+	ret, _, _ := procDwmUpdateThumbnailProperties.Call(
+		uintptr(hThumbnailId),
+		uintptr(unsafe.Pointer(ptnProperties)))
+	return HRESULT(ret)
+}
diff --git a/vendor/github.com/shirou/w32/gdi32.go b/vendor/github.com/shirou/w32/gdi32.go
new file mode 100644
index 0000000000..6f377e8e4c
--- /dev/null
+++ b/vendor/github.com/shirou/w32/gdi32.go
@@ -0,0 +1,509 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modgdi32 = syscall.NewLazyDLL("gdi32.dll")
+
+	procGetDeviceCaps             = modgdi32.NewProc("GetDeviceCaps")
+	procDeleteObject              = modgdi32.NewProc("DeleteObject")
+	procCreateFontIndirect        = modgdi32.NewProc("CreateFontIndirectW")
+	procAbortDoc                  = modgdi32.NewProc("AbortDoc")
+	procBitBlt                    = modgdi32.NewProc("BitBlt")
+	procCloseEnhMetaFile          = modgdi32.NewProc("CloseEnhMetaFile")
+	procCopyEnhMetaFile           = modgdi32.NewProc("CopyEnhMetaFileW")
+	procCreateBrushIndirect       = modgdi32.NewProc("CreateBrushIndirect")
+	procCreateCompatibleDC        = modgdi32.NewProc("CreateCompatibleDC")
+	procCreateDC                  = modgdi32.NewProc("CreateDCW")
+	procCreateDIBSection          = modgdi32.NewProc("CreateDIBSection")
+	procCreateEnhMetaFile         = modgdi32.NewProc("CreateEnhMetaFileW")
+	procCreateIC                  = modgdi32.NewProc("CreateICW")
+	procDeleteDC                  = modgdi32.NewProc("DeleteDC")
+	procDeleteEnhMetaFile         = modgdi32.NewProc("DeleteEnhMetaFile")
+	procEllipse                   = modgdi32.NewProc("Ellipse")
+	procEndDoc                    = modgdi32.NewProc("EndDoc")
+	procEndPage                   = modgdi32.NewProc("EndPage")
+	procExtCreatePen              = modgdi32.NewProc("ExtCreatePen")
+	procGetEnhMetaFile            = modgdi32.NewProc("GetEnhMetaFileW")
+	procGetEnhMetaFileHeader      = modgdi32.NewProc("GetEnhMetaFileHeader")
+	procGetObject                 = modgdi32.NewProc("GetObjectW")
+	procGetStockObject            = modgdi32.NewProc("GetStockObject")
+	procGetTextExtentExPoint      = modgdi32.NewProc("GetTextExtentExPointW")
+	procGetTextExtentPoint32      = modgdi32.NewProc("GetTextExtentPoint32W")
+	procGetTextMetrics            = modgdi32.NewProc("GetTextMetricsW")
+	procLineTo                    = modgdi32.NewProc("LineTo")
+	procMoveToEx                  = modgdi32.NewProc("MoveToEx")
+	procPlayEnhMetaFile           = modgdi32.NewProc("PlayEnhMetaFile")
+	procRectangle                 = modgdi32.NewProc("Rectangle")
+	procResetDC                   = modgdi32.NewProc("ResetDCW")
+	procSelectObject              = modgdi32.NewProc("SelectObject")
+	procSetBkMode                 = modgdi32.NewProc("SetBkMode")
+	procSetBrushOrgEx             = modgdi32.NewProc("SetBrushOrgEx")
+	procSetStretchBltMode         = modgdi32.NewProc("SetStretchBltMode")
+	procSetTextColor              = modgdi32.NewProc("SetTextColor")
+	procSetBkColor                = modgdi32.NewProc("SetBkColor")
+	procStartDoc                  = modgdi32.NewProc("StartDocW")
+	procStartPage                 = modgdi32.NewProc("StartPage")
+	procStretchBlt                = modgdi32.NewProc("StretchBlt")
+	procSetDIBitsToDevice         = modgdi32.NewProc("SetDIBitsToDevice")
+	procChoosePixelFormat         = modgdi32.NewProc("ChoosePixelFormat")
+	procDescribePixelFormat       = modgdi32.NewProc("DescribePixelFormat")
+	procGetEnhMetaFilePixelFormat = modgdi32.NewProc("GetEnhMetaFilePixelFormat")
+	procGetPixelFormat            = modgdi32.NewProc("GetPixelFormat")
+	procSetPixelFormat            = modgdi32.NewProc("SetPixelFormat")
+	procSwapBuffers               = modgdi32.NewProc("SwapBuffers")
+)
+
+func GetDeviceCaps(hdc HDC, index int) int {
+	ret, _, _ := procGetDeviceCaps.Call(
+		uintptr(hdc),
+		uintptr(index))
+
+	return int(ret)
+}
+
+func DeleteObject(hObject HGDIOBJ) bool {
+	ret, _, _ := procDeleteObject.Call(
+		uintptr(hObject))
+
+	return ret != 0
+}
+
+func CreateFontIndirect(logFont *LOGFONT) HFONT {
+	ret, _, _ := procCreateFontIndirect.Call(
+		uintptr(unsafe.Pointer(logFont)))
+
+	return HFONT(ret)
+}
+
+func AbortDoc(hdc HDC) int {
+	ret, _, _ := procAbortDoc.Call(
+		uintptr(hdc))
+
+	return int(ret)
+}
+
+func BitBlt(hdcDest HDC, nXDest, nYDest, nWidth, nHeight int, hdcSrc HDC, nXSrc, nYSrc int, dwRop uint) {
+	ret, _, _ := procBitBlt.Call(
+		uintptr(hdcDest),
+		uintptr(nXDest),
+		uintptr(nYDest),
+		uintptr(nWidth),
+		uintptr(nHeight),
+		uintptr(hdcSrc),
+		uintptr(nXSrc),
+		uintptr(nYSrc),
+		uintptr(dwRop))
+
+	if ret == 0 {
+		panic("BitBlt failed")
+	}
+}
+
+func CloseEnhMetaFile(hdc HDC) HENHMETAFILE {
+	ret, _, _ := procCloseEnhMetaFile.Call(
+		uintptr(hdc))
+
+	return HENHMETAFILE(ret)
+}
+
+func CopyEnhMetaFile(hemfSrc HENHMETAFILE, lpszFile *uint16) HENHMETAFILE {
+	ret, _, _ := procCopyEnhMetaFile.Call(
+		uintptr(hemfSrc),
+		uintptr(unsafe.Pointer(lpszFile)))
+
+	return HENHMETAFILE(ret)
+}
+
+func CreateBrushIndirect(lplb *LOGBRUSH) HBRUSH {
+	ret, _, _ := procCreateBrushIndirect.Call(
+		uintptr(unsafe.Pointer(lplb)))
+
+	return HBRUSH(ret)
+}
+
+func CreateCompatibleDC(hdc HDC) HDC {
+	ret, _, _ := procCreateCompatibleDC.Call(
+		uintptr(hdc))
+
+	if ret == 0 {
+		panic("Create compatible DC failed")
+	}
+
+	return HDC(ret)
+}
+
+func CreateDC(lpszDriver, lpszDevice, lpszOutput *uint16, lpInitData *DEVMODE) HDC {
+	ret, _, _ := procCreateDC.Call(
+		uintptr(unsafe.Pointer(lpszDriver)),
+		uintptr(unsafe.Pointer(lpszDevice)),
+		uintptr(unsafe.Pointer(lpszOutput)),
+		uintptr(unsafe.Pointer(lpInitData)))
+
+	return HDC(ret)
+}
+
+func CreateDIBSection(hdc HDC, pbmi *BITMAPINFO, iUsage uint, ppvBits *unsafe.Pointer, hSection HANDLE, dwOffset uint) HBITMAP {
+	ret, _, _ := procCreateDIBSection.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(pbmi)),
+		uintptr(iUsage),
+		uintptr(unsafe.Pointer(ppvBits)),
+		uintptr(hSection),
+		uintptr(dwOffset))
+
+	return HBITMAP(ret)
+}
+
+func CreateEnhMetaFile(hdcRef HDC, lpFilename *uint16, lpRect *RECT, lpDescription *uint16) HDC {
+	ret, _, _ := procCreateEnhMetaFile.Call(
+		uintptr(hdcRef),
+		uintptr(unsafe.Pointer(lpFilename)),
+		uintptr(unsafe.Pointer(lpRect)),
+		uintptr(unsafe.Pointer(lpDescription)))
+
+	return HDC(ret)
+}
+
+func CreateIC(lpszDriver, lpszDevice, lpszOutput *uint16, lpdvmInit *DEVMODE) HDC {
+	ret, _, _ := procCreateIC.Call(
+		uintptr(unsafe.Pointer(lpszDriver)),
+		uintptr(unsafe.Pointer(lpszDevice)),
+		uintptr(unsafe.Pointer(lpszOutput)),
+		uintptr(unsafe.Pointer(lpdvmInit)))
+
+	return HDC(ret)
+}
+
+func DeleteDC(hdc HDC) bool {
+	ret, _, _ := procDeleteDC.Call(
+		uintptr(hdc))
+
+	return ret != 0
+}
+
+func DeleteEnhMetaFile(hemf HENHMETAFILE) bool {
+	ret, _, _ := procDeleteEnhMetaFile.Call(
+		uintptr(hemf))
+
+	return ret != 0
+}
+
+func Ellipse(hdc HDC, nLeftRect, nTopRect, nRightRect, nBottomRect int) bool {
+	ret, _, _ := procEllipse.Call(
+		uintptr(hdc),
+		uintptr(nLeftRect),
+		uintptr(nTopRect),
+		uintptr(nRightRect),
+		uintptr(nBottomRect))
+
+	return ret != 0
+}
+
+func EndDoc(hdc HDC) int {
+	ret, _, _ := procEndDoc.Call(
+		uintptr(hdc))
+
+	return int(ret)
+}
+
+func EndPage(hdc HDC) int {
+	ret, _, _ := procEndPage.Call(
+		uintptr(hdc))
+
+	return int(ret)
+}
+
+func ExtCreatePen(dwPenStyle, dwWidth uint, lplb *LOGBRUSH, dwStyleCount uint, lpStyle *uint) HPEN {
+	ret, _, _ := procExtCreatePen.Call(
+		uintptr(dwPenStyle),
+		uintptr(dwWidth),
+		uintptr(unsafe.Pointer(lplb)),
+		uintptr(dwStyleCount),
+		uintptr(unsafe.Pointer(lpStyle)))
+
+	return HPEN(ret)
+}
+
+func GetEnhMetaFile(lpszMetaFile *uint16) HENHMETAFILE {
+	ret, _, _ := procGetEnhMetaFile.Call(
+		uintptr(unsafe.Pointer(lpszMetaFile)))
+
+	return HENHMETAFILE(ret)
+}
+
+func GetEnhMetaFileHeader(hemf HENHMETAFILE, cbBuffer uint, lpemh *ENHMETAHEADER) uint {
+	ret, _, _ := procGetEnhMetaFileHeader.Call(
+		uintptr(hemf),
+		uintptr(cbBuffer),
+		uintptr(unsafe.Pointer(lpemh)))
+
+	return uint(ret)
+}
+
+func GetObject(hgdiobj HGDIOBJ, cbBuffer uintptr, lpvObject unsafe.Pointer) int {
+	ret, _, _ := procGetObject.Call(
+		uintptr(hgdiobj),
+		uintptr(cbBuffer),
+		uintptr(lpvObject))
+
+	return int(ret)
+}
+
+func GetStockObject(fnObject int) HGDIOBJ {
+	ret, _, _ := procGetDeviceCaps.Call(
+		uintptr(fnObject))
+
+	return HGDIOBJ(ret)
+}
+
+func GetTextExtentExPoint(hdc HDC, lpszStr *uint16, cchString, nMaxExtent int, lpnFit, alpDx *int, lpSize *SIZE) bool {
+	ret, _, _ := procGetTextExtentExPoint.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lpszStr)),
+		uintptr(cchString),
+		uintptr(nMaxExtent),
+		uintptr(unsafe.Pointer(lpnFit)),
+		uintptr(unsafe.Pointer(alpDx)),
+		uintptr(unsafe.Pointer(lpSize)))
+
+	return ret != 0
+}
+
+func GetTextExtentPoint32(hdc HDC, lpString *uint16, c int, lpSize *SIZE) bool {
+	ret, _, _ := procGetTextExtentPoint32.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lpString)),
+		uintptr(c),
+		uintptr(unsafe.Pointer(lpSize)))
+
+	return ret != 0
+}
+
+func GetTextMetrics(hdc HDC, lptm *TEXTMETRIC) bool {
+	ret, _, _ := procGetTextMetrics.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lptm)))
+
+	return ret != 0
+}
+
+func LineTo(hdc HDC, nXEnd, nYEnd int) bool {
+	ret, _, _ := procLineTo.Call(
+		uintptr(hdc),
+		uintptr(nXEnd),
+		uintptr(nYEnd))
+
+	return ret != 0
+}
+
+func MoveToEx(hdc HDC, x, y int, lpPoint *POINT) bool {
+	ret, _, _ := procMoveToEx.Call(
+		uintptr(hdc),
+		uintptr(x),
+		uintptr(y),
+		uintptr(unsafe.Pointer(lpPoint)))
+
+	return ret != 0
+}
+
+func PlayEnhMetaFile(hdc HDC, hemf HENHMETAFILE, lpRect *RECT) bool {
+	ret, _, _ := procPlayEnhMetaFile.Call(
+		uintptr(hdc),
+		uintptr(hemf),
+		uintptr(unsafe.Pointer(lpRect)))
+
+	return ret != 0
+}
+
+func Rectangle(hdc HDC, nLeftRect, nTopRect, nRightRect, nBottomRect int) bool {
+	ret, _, _ := procRectangle.Call(
+		uintptr(hdc),
+		uintptr(nLeftRect),
+		uintptr(nTopRect),
+		uintptr(nRightRect),
+		uintptr(nBottomRect))
+
+	return ret != 0
+}
+
+func ResetDC(hdc HDC, lpInitData *DEVMODE) HDC {
+	ret, _, _ := procResetDC.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lpInitData)))
+
+	return HDC(ret)
+}
+
+func SelectObject(hdc HDC, hgdiobj HGDIOBJ) HGDIOBJ {
+	ret, _, _ := procSelectObject.Call(
+		uintptr(hdc),
+		uintptr(hgdiobj))
+
+	if ret == 0 {
+		panic("SelectObject failed")
+	}
+
+	return HGDIOBJ(ret)
+}
+
+func SetBkMode(hdc HDC, iBkMode int) int {
+	ret, _, _ := procSetBkMode.Call(
+		uintptr(hdc),
+		uintptr(iBkMode))
+
+	if ret == 0 {
+		panic("SetBkMode failed")
+	}
+
+	return int(ret)
+}
+
+func SetBrushOrgEx(hdc HDC, nXOrg, nYOrg int, lppt *POINT) bool {
+	ret, _, _ := procSetBrushOrgEx.Call(
+		uintptr(hdc),
+		uintptr(nXOrg),
+		uintptr(nYOrg),
+		uintptr(unsafe.Pointer(lppt)))
+
+	return ret != 0
+}
+
+func SetStretchBltMode(hdc HDC, iStretchMode int) int {
+	ret, _, _ := procSetStretchBltMode.Call(
+		uintptr(hdc),
+		uintptr(iStretchMode))
+
+	return int(ret)
+}
+
+func SetTextColor(hdc HDC, crColor COLORREF) COLORREF {
+	ret, _, _ := procSetTextColor.Call(
+		uintptr(hdc),
+		uintptr(crColor))
+
+	if ret == CLR_INVALID {
+		panic("SetTextColor failed")
+	}
+
+	return COLORREF(ret)
+}
+
+func SetBkColor(hdc HDC, crColor COLORREF) COLORREF {
+	ret, _, _ := procSetBkColor.Call(
+		uintptr(hdc),
+		uintptr(crColor))
+
+	if ret == CLR_INVALID {
+		panic("SetBkColor failed")
+	}
+
+	return COLORREF(ret)
+}
+
+func StartDoc(hdc HDC, lpdi *DOCINFO) int {
+	ret, _, _ := procStartDoc.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(lpdi)))
+
+	return int(ret)
+}
+
+func StartPage(hdc HDC) int {
+	ret, _, _ := procStartPage.Call(
+		uintptr(hdc))
+
+	return int(ret)
+}
+
+func StretchBlt(hdcDest HDC, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest int, hdcSrc HDC, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc int, dwRop uint) {
+	ret, _, _ := procStretchBlt.Call(
+		uintptr(hdcDest),
+		uintptr(nXOriginDest),
+		uintptr(nYOriginDest),
+		uintptr(nWidthDest),
+		uintptr(nHeightDest),
+		uintptr(hdcSrc),
+		uintptr(nXOriginSrc),
+		uintptr(nYOriginSrc),
+		uintptr(nWidthSrc),
+		uintptr(nHeightSrc),
+		uintptr(dwRop))
+
+	if ret == 0 {
+		panic("StretchBlt failed")
+	}
+}
+
+func SetDIBitsToDevice(hdc HDC, xDest, yDest, dwWidth, dwHeight, xSrc, ySrc int, uStartScan, cScanLines uint, lpvBits []byte, lpbmi *BITMAPINFO, fuColorUse uint) int {
+	ret, _, _ := procSetDIBitsToDevice.Call(
+		uintptr(hdc),
+		uintptr(xDest),
+		uintptr(yDest),
+		uintptr(dwWidth),
+		uintptr(dwHeight),
+		uintptr(xSrc),
+		uintptr(ySrc),
+		uintptr(uStartScan),
+		uintptr(cScanLines),
+		uintptr(unsafe.Pointer(&lpvBits[0])),
+		uintptr(unsafe.Pointer(lpbmi)),
+		uintptr(fuColorUse))
+
+	return int(ret)
+}
+
+func ChoosePixelFormat(hdc HDC, pfd *PIXELFORMATDESCRIPTOR) int {
+	ret, _, _ := procChoosePixelFormat.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return int(ret)
+}
+
+func DescribePixelFormat(hdc HDC, iPixelFormat int, nBytes uint, pfd *PIXELFORMATDESCRIPTOR) int {
+	ret, _, _ := procDescribePixelFormat.Call(
+		uintptr(hdc),
+		uintptr(iPixelFormat),
+		uintptr(nBytes),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return int(ret)
+}
+
+func GetEnhMetaFilePixelFormat(hemf HENHMETAFILE, cbBuffer uint32, pfd *PIXELFORMATDESCRIPTOR) uint {
+	ret, _, _ := procGetEnhMetaFilePixelFormat.Call(
+		uintptr(hemf),
+		uintptr(cbBuffer),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return uint(ret)
+}
+
+func GetPixelFormat(hdc HDC) int {
+	ret, _, _ := procGetPixelFormat.Call(
+		uintptr(hdc),
+	)
+	return int(ret)
+}
+
+func SetPixelFormat(hdc HDC, iPixelFormat int, pfd *PIXELFORMATDESCRIPTOR) bool {
+	ret, _, _ := procSetPixelFormat.Call(
+		uintptr(hdc),
+		uintptr(iPixelFormat),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return ret == TRUE
+}
+
+func SwapBuffers(hdc HDC) bool {
+	ret, _, _ := procSwapBuffers.Call(uintptr(hdc))
+	return ret == TRUE
+}
diff --git a/vendor/github.com/shirou/w32/gdiplus.go b/vendor/github.com/shirou/w32/gdiplus.go
new file mode 100644
index 0000000000..f3a8fca4d1
--- /dev/null
+++ b/vendor/github.com/shirou/w32/gdiplus.go
@@ -0,0 +1,175 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"errors"
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+const (
+	Ok                        = 0
+	GenericError              = 1
+	InvalidParameter          = 2
+	OutOfMemory               = 3
+	ObjectBusy                = 4
+	InsufficientBuffer        = 5
+	NotImplemented            = 6
+	Win32Error                = 7
+	WrongState                = 8
+	Aborted                   = 9
+	FileNotFound              = 10
+	ValueOverflow             = 11
+	AccessDenied              = 12
+	UnknownImageFormat        = 13
+	FontFamilyNotFound        = 14
+	FontStyleNotFound         = 15
+	NotTrueTypeFont           = 16
+	UnsupportedGdiplusVersion = 17
+	GdiplusNotInitialized     = 18
+	PropertyNotFound          = 19
+	PropertyNotSupported      = 20
+	ProfileNotFound           = 21
+)
+
+func GetGpStatus(s int32) string {
+	switch s {
+	case Ok:
+		return "Ok"
+	case GenericError:
+		return "GenericError"
+	case InvalidParameter:
+		return "InvalidParameter"
+	case OutOfMemory:
+		return "OutOfMemory"
+	case ObjectBusy:
+		return "ObjectBusy"
+	case InsufficientBuffer:
+		return "InsufficientBuffer"
+	case NotImplemented:
+		return "NotImplemented"
+	case Win32Error:
+		return "Win32Error"
+	case WrongState:
+		return "WrongState"
+	case Aborted:
+		return "Aborted"
+	case FileNotFound:
+		return "FileNotFound"
+	case ValueOverflow:
+		return "ValueOverflow"
+	case AccessDenied:
+		return "AccessDenied"
+	case UnknownImageFormat:
+		return "UnknownImageFormat"
+	case FontFamilyNotFound:
+		return "FontFamilyNotFound"
+	case FontStyleNotFound:
+		return "FontStyleNotFound"
+	case NotTrueTypeFont:
+		return "NotTrueTypeFont"
+	case UnsupportedGdiplusVersion:
+		return "UnsupportedGdiplusVersion"
+	case GdiplusNotInitialized:
+		return "GdiplusNotInitialized"
+	case PropertyNotFound:
+		return "PropertyNotFound"
+	case PropertyNotSupported:
+		return "PropertyNotSupported"
+	case ProfileNotFound:
+		return "ProfileNotFound"
+	}
+	return "Unknown Status Value"
+}
+
+var (
+	token uintptr
+
+	modgdiplus = syscall.NewLazyDLL("gdiplus.dll")
+
+	procGdipCreateBitmapFromFile     = modgdiplus.NewProc("GdipCreateBitmapFromFile")
+	procGdipCreateBitmapFromHBITMAP  = modgdiplus.NewProc("GdipCreateBitmapFromHBITMAP")
+	procGdipCreateHBITMAPFromBitmap  = modgdiplus.NewProc("GdipCreateHBITMAPFromBitmap")
+	procGdipCreateBitmapFromResource = modgdiplus.NewProc("GdipCreateBitmapFromResource")
+	procGdipCreateBitmapFromStream   = modgdiplus.NewProc("GdipCreateBitmapFromStream")
+	procGdipDisposeImage             = modgdiplus.NewProc("GdipDisposeImage")
+	procGdiplusShutdown              = modgdiplus.NewProc("GdiplusShutdown")
+	procGdiplusStartup               = modgdiplus.NewProc("GdiplusStartup")
+)
+
+func GdipCreateBitmapFromFile(filename string) (*uintptr, error) {
+	var bitmap *uintptr
+	ret, _, _ := procGdipCreateBitmapFromFile.Call(
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(filename))),
+		uintptr(unsafe.Pointer(&bitmap)))
+
+	if ret != Ok {
+		return nil, errors.New(fmt.Sprintf("GdipCreateBitmapFromFile failed with status '%s' for file '%s'", GetGpStatus(int32(ret)), filename))
+	}
+
+	return bitmap, nil
+}
+
+func GdipCreateBitmapFromResource(instance HINSTANCE, resId *uint16) (*uintptr, error) {
+	var bitmap *uintptr
+	ret, _, _ := procGdipCreateBitmapFromResource.Call(
+		uintptr(instance),
+		uintptr(unsafe.Pointer(resId)),
+		uintptr(unsafe.Pointer(&bitmap)))
+
+	if ret != Ok {
+		return nil, errors.New(fmt.Sprintf("GdiCreateBitmapFromResource failed with status '%s'", GetGpStatus(int32(ret))))
+	}
+
+	return bitmap, nil
+}
+
+func GdipCreateBitmapFromStream(stream *IStream) (*uintptr, error) {
+	var bitmap *uintptr
+	ret, _, _ := procGdipCreateBitmapFromStream.Call(
+		uintptr(unsafe.Pointer(stream)),
+		uintptr(unsafe.Pointer(&bitmap)))
+
+	if ret != Ok {
+		return nil, errors.New(fmt.Sprintf("GdipCreateBitmapFromStream failed with status '%s'", GetGpStatus(int32(ret))))
+	}
+
+	return bitmap, nil
+}
+
+func GdipCreateHBITMAPFromBitmap(bitmap *uintptr, background uint32) (HBITMAP, error) {
+	var hbitmap HBITMAP
+	ret, _, _ := procGdipCreateHBITMAPFromBitmap.Call(
+		uintptr(unsafe.Pointer(bitmap)),
+		uintptr(unsafe.Pointer(&hbitmap)),
+		uintptr(background))
+
+	if ret != Ok {
+		return 0, errors.New(fmt.Sprintf("GdipCreateHBITMAPFromBitmap failed with status '%s'", GetGpStatus(int32(ret))))
+	}
+
+	return hbitmap, nil
+}
+
+func GdipDisposeImage(image *uintptr) {
+	procGdipDisposeImage.Call(uintptr(unsafe.Pointer(image)))
+}
+
+func GdiplusShutdown() {
+	procGdiplusShutdown.Call(token)
+}
+
+func GdiplusStartup(input *GdiplusStartupInput, output *GdiplusStartupOutput) {
+	ret, _, _ := procGdiplusStartup.Call(
+		uintptr(unsafe.Pointer(&token)),
+		uintptr(unsafe.Pointer(input)),
+		uintptr(unsafe.Pointer(output)))
+
+	if ret != Ok {
+		panic("GdiplusStartup failed with status " + GetGpStatus(int32(ret)))
+	}
+}
diff --git a/vendor/github.com/shirou/w32/idispatch.go b/vendor/github.com/shirou/w32/idispatch.go
new file mode 100644
index 0000000000..41634a6488
--- /dev/null
+++ b/vendor/github.com/shirou/w32/idispatch.go
@@ -0,0 +1,43 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"unsafe"
+)
+
+type pIDispatchVtbl struct {
+	pQueryInterface   uintptr
+	pAddRef           uintptr
+	pRelease          uintptr
+	pGetTypeInfoCount uintptr
+	pGetTypeInfo      uintptr
+	pGetIDsOfNames    uintptr
+	pInvoke           uintptr
+}
+
+type IDispatch struct {
+	lpVtbl *pIDispatchVtbl
+}
+
+func (this *IDispatch) QueryInterface(id *GUID) *IDispatch {
+	return ComQueryInterface((*IUnknown)(unsafe.Pointer(this)), id)
+}
+
+func (this *IDispatch) AddRef() int32 {
+	return ComAddRef((*IUnknown)(unsafe.Pointer(this)))
+}
+
+func (this *IDispatch) Release() int32 {
+	return ComRelease((*IUnknown)(unsafe.Pointer(this)))
+}
+
+func (this *IDispatch) GetIDsOfName(names []string) []int32 {
+	return ComGetIDsOfName(this, names)
+}
+
+func (this *IDispatch) Invoke(dispid int32, dispatch int16, params ...interface{}) *VARIANT {
+	return ComInvoke(this, dispid, dispatch, params...)
+}
diff --git a/vendor/github.com/shirou/w32/istream.go b/vendor/github.com/shirou/w32/istream.go
new file mode 100644
index 0000000000..2b840c3b09
--- /dev/null
+++ b/vendor/github.com/shirou/w32/istream.go
@@ -0,0 +1,31 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"unsafe"
+)
+
+type pIStreamVtbl struct {
+	pQueryInterface uintptr
+	pAddRef         uintptr
+	pRelease        uintptr
+}
+
+type IStream struct {
+	lpVtbl *pIStreamVtbl
+}
+
+func (this *IStream) QueryInterface(id *GUID) *IDispatch {
+	return ComQueryInterface((*IUnknown)(unsafe.Pointer(this)), id)
+}
+
+func (this *IStream) AddRef() int32 {
+	return ComAddRef((*IUnknown)(unsafe.Pointer(this)))
+}
+
+func (this *IStream) Release() int32 {
+	return ComRelease((*IUnknown)(unsafe.Pointer(this)))
+}
diff --git a/vendor/github.com/shirou/w32/iunknown.go b/vendor/github.com/shirou/w32/iunknown.go
new file mode 100644
index 0000000000..d63ff1bbca
--- /dev/null
+++ b/vendor/github.com/shirou/w32/iunknown.go
@@ -0,0 +1,27 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+type pIUnknownVtbl struct {
+	pQueryInterface uintptr
+	pAddRef         uintptr
+	pRelease        uintptr
+}
+
+type IUnknown struct {
+	lpVtbl *pIUnknownVtbl
+}
+
+func (this *IUnknown) QueryInterface(id *GUID) *IDispatch {
+	return ComQueryInterface(this, id)
+}
+
+func (this *IUnknown) AddRef() int32 {
+	return ComAddRef(this)
+}
+
+func (this *IUnknown) Release() int32 {
+	return ComRelease(this)
+}
diff --git a/vendor/github.com/shirou/w32/kernel32.go b/vendor/github.com/shirou/w32/kernel32.go
new file mode 100644
index 0000000000..891ec1578b
--- /dev/null
+++ b/vendor/github.com/shirou/w32/kernel32.go
@@ -0,0 +1,314 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modkernel32 = syscall.NewLazyDLL("kernel32.dll")
+
+	procGetModuleHandle            = modkernel32.NewProc("GetModuleHandleW")
+	procMulDiv                     = modkernel32.NewProc("MulDiv")
+	procGetConsoleWindow           = modkernel32.NewProc("GetConsoleWindow")
+	procGetCurrentThread           = modkernel32.NewProc("GetCurrentThread")
+	procGetLogicalDrives           = modkernel32.NewProc("GetLogicalDrives")
+	procGetUserDefaultLCID         = modkernel32.NewProc("GetUserDefaultLCID")
+	procLstrlen                    = modkernel32.NewProc("lstrlenW")
+	procLstrcpy                    = modkernel32.NewProc("lstrcpyW")
+	procGlobalAlloc                = modkernel32.NewProc("GlobalAlloc")
+	procGlobalFree                 = modkernel32.NewProc("GlobalFree")
+	procGlobalLock                 = modkernel32.NewProc("GlobalLock")
+	procGlobalUnlock               = modkernel32.NewProc("GlobalUnlock")
+	procMoveMemory                 = modkernel32.NewProc("RtlMoveMemory")
+	procFindResource               = modkernel32.NewProc("FindResourceW")
+	procSizeofResource             = modkernel32.NewProc("SizeofResource")
+	procLockResource               = modkernel32.NewProc("LockResource")
+	procLoadResource               = modkernel32.NewProc("LoadResource")
+	procGetLastError               = modkernel32.NewProc("GetLastError")
+	procOpenProcess                = modkernel32.NewProc("OpenProcess")
+	procTerminateProcess           = modkernel32.NewProc("TerminateProcess")
+	procCloseHandle                = modkernel32.NewProc("CloseHandle")
+	procCreateToolhelp32Snapshot   = modkernel32.NewProc("CreateToolhelp32Snapshot")
+	procModule32First              = modkernel32.NewProc("Module32FirstW")
+	procModule32Next               = modkernel32.NewProc("Module32NextW")
+	procProcess32First             = modkernel32.NewProc("Process32FirstW")
+	procProcess32Next              = modkernel32.NewProc("Process32NextW")
+	procGetSystemTimes             = modkernel32.NewProc("GetSystemTimes")
+	procGetConsoleScreenBufferInfo = modkernel32.NewProc("GetConsoleScreenBufferInfo")
+	procSetConsoleTextAttribute    = modkernel32.NewProc("SetConsoleTextAttribute")
+	procGetDiskFreeSpaceEx         = modkernel32.NewProc("GetDiskFreeSpaceExW")
+	procGetProcessTimes            = modkernel32.NewProc("GetProcessTimes")
+)
+
+func GetModuleHandle(modulename string) HINSTANCE {
+	var mn uintptr
+	if modulename == "" {
+		mn = 0
+	} else {
+		mn = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(modulename)))
+	}
+	ret, _, _ := procGetModuleHandle.Call(mn)
+	return HINSTANCE(ret)
+}
+
+func MulDiv(number, numerator, denominator int) int {
+	ret, _, _ := procMulDiv.Call(
+		uintptr(number),
+		uintptr(numerator),
+		uintptr(denominator))
+
+	return int(ret)
+}
+
+func GetConsoleWindow() HWND {
+	ret, _, _ := procGetConsoleWindow.Call()
+
+	return HWND(ret)
+}
+
+func GetCurrentThread() HANDLE {
+	ret, _, _ := procGetCurrentThread.Call()
+
+	return HANDLE(ret)
+}
+
+func GetLogicalDrives() uint32 {
+	ret, _, _ := procGetLogicalDrives.Call()
+
+	return uint32(ret)
+}
+
+func GetUserDefaultLCID() uint32 {
+	ret, _, _ := procGetUserDefaultLCID.Call()
+
+	return uint32(ret)
+}
+
+func Lstrlen(lpString *uint16) int {
+	ret, _, _ := procLstrlen.Call(uintptr(unsafe.Pointer(lpString)))
+
+	return int(ret)
+}
+
+func Lstrcpy(buf []uint16, lpString *uint16) {
+	procLstrcpy.Call(
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(unsafe.Pointer(lpString)))
+}
+
+func GlobalAlloc(uFlags uint, dwBytes uint32) HGLOBAL {
+	ret, _, _ := procGlobalAlloc.Call(
+		uintptr(uFlags),
+		uintptr(dwBytes))
+
+	if ret == 0 {
+		panic("GlobalAlloc failed")
+	}
+
+	return HGLOBAL(ret)
+}
+
+func GlobalFree(hMem HGLOBAL) {
+	ret, _, _ := procGlobalFree.Call(uintptr(hMem))
+
+	if ret != 0 {
+		panic("GlobalFree failed")
+	}
+}
+
+func GlobalLock(hMem HGLOBAL) unsafe.Pointer {
+	ret, _, _ := procGlobalLock.Call(uintptr(hMem))
+
+	if ret == 0 {
+		panic("GlobalLock failed")
+	}
+
+	return unsafe.Pointer(ret)
+}
+
+func GlobalUnlock(hMem HGLOBAL) bool {
+	ret, _, _ := procGlobalUnlock.Call(uintptr(hMem))
+
+	return ret != 0
+}
+
+func MoveMemory(destination, source unsafe.Pointer, length uint32) {
+	procMoveMemory.Call(
+		uintptr(unsafe.Pointer(destination)),
+		uintptr(source),
+		uintptr(length))
+}
+
+func FindResource(hModule HMODULE, lpName, lpType *uint16) (HRSRC, error) {
+	ret, _, _ := procFindResource.Call(
+		uintptr(hModule),
+		uintptr(unsafe.Pointer(lpName)),
+		uintptr(unsafe.Pointer(lpType)))
+
+	if ret == 0 {
+		return 0, syscall.GetLastError()
+	}
+
+	return HRSRC(ret), nil
+}
+
+func SizeofResource(hModule HMODULE, hResInfo HRSRC) uint32 {
+	ret, _, _ := procSizeofResource.Call(
+		uintptr(hModule),
+		uintptr(hResInfo))
+
+	if ret == 0 {
+		panic("SizeofResource failed")
+	}
+
+	return uint32(ret)
+}
+
+func LockResource(hResData HGLOBAL) unsafe.Pointer {
+	ret, _, _ := procLockResource.Call(uintptr(hResData))
+
+	if ret == 0 {
+		panic("LockResource failed")
+	}
+
+	return unsafe.Pointer(ret)
+}
+
+func LoadResource(hModule HMODULE, hResInfo HRSRC) HGLOBAL {
+	ret, _, _ := procLoadResource.Call(
+		uintptr(hModule),
+		uintptr(hResInfo))
+
+	if ret == 0 {
+		panic("LoadResource failed")
+	}
+
+	return HGLOBAL(ret)
+}
+
+func GetLastError() uint32 {
+	ret, _, _ := procGetLastError.Call()
+	return uint32(ret)
+}
+
+func OpenProcess(desiredAccess uint32, inheritHandle bool, processId uint32) HANDLE {
+	inherit := 0
+	if inheritHandle {
+		inherit = 1
+	}
+
+	ret, _, _ := procOpenProcess.Call(
+		uintptr(desiredAccess),
+		uintptr(inherit),
+		uintptr(processId))
+	return HANDLE(ret)
+}
+
+func TerminateProcess(hProcess HANDLE, uExitCode uint) bool {
+	ret, _, _ := procTerminateProcess.Call(
+		uintptr(hProcess),
+		uintptr(uExitCode))
+	return ret != 0
+}
+
+func CloseHandle(object HANDLE) bool {
+	ret, _, _ := procCloseHandle.Call(
+		uintptr(object))
+	return ret != 0
+}
+
+func CreateToolhelp32Snapshot(flags, processId uint32) HANDLE {
+	ret, _, _ := procCreateToolhelp32Snapshot.Call(
+		uintptr(flags),
+		uintptr(processId))
+
+	if ret <= 0 {
+		return HANDLE(0)
+	}
+
+	return HANDLE(ret)
+}
+
+func Module32First(snapshot HANDLE, me *MODULEENTRY32) bool {
+	ret, _, _ := procModule32First.Call(
+		uintptr(snapshot),
+		uintptr(unsafe.Pointer(me)))
+
+	return ret != 0
+}
+
+func Module32Next(snapshot HANDLE, me *MODULEENTRY32) bool {
+	ret, _, _ := procModule32Next.Call(
+		uintptr(snapshot),
+		uintptr(unsafe.Pointer(me)))
+
+	return ret != 0
+}
+func Process32First(snapshot HANDLE, pe *PROCESSENTRY32) bool {
+	ret, _, _ := procProcess32First.Call(
+		uintptr(snapshot),
+		uintptr(unsafe.Pointer(pe)))
+
+	return ret != 0
+}
+
+func Process32Next(snapshot HANDLE, pe *PROCESSENTRY32) bool {
+	ret, _, _ := procProcess32Next.Call(
+		uintptr(snapshot),
+		uintptr(unsafe.Pointer(pe)))
+
+	return ret != 0
+}
+func GetSystemTimes(lpIdleTime, lpKernelTime, lpUserTime *FILETIME) bool {
+	ret, _, _ := procGetSystemTimes.Call(
+		uintptr(unsafe.Pointer(lpIdleTime)),
+		uintptr(unsafe.Pointer(lpKernelTime)),
+		uintptr(unsafe.Pointer(lpUserTime)))
+
+	return ret != 0
+}
+
+func GetProcessTimes(hProcess HANDLE, lpCreationTime, lpExitTime, lpKernelTime, lpUserTime *FILETIME) bool {
+	ret, _, _ := procGetProcessTimes.Call(
+		uintptr(hProcess),
+		uintptr(unsafe.Pointer(lpCreationTime)),
+		uintptr(unsafe.Pointer(lpExitTime)),
+		uintptr(unsafe.Pointer(lpKernelTime)),
+		uintptr(unsafe.Pointer(lpUserTime)))
+
+	return ret != 0
+}
+
+func GetConsoleScreenBufferInfo(hConsoleOutput HANDLE) *CONSOLE_SCREEN_BUFFER_INFO {
+	var csbi CONSOLE_SCREEN_BUFFER_INFO
+	ret, _, _ := procGetConsoleScreenBufferInfo.Call(
+		uintptr(hConsoleOutput),
+		uintptr(unsafe.Pointer(&csbi)))
+	if ret == 0 {
+		return nil
+	}
+	return &csbi
+}
+
+func SetConsoleTextAttribute(hConsoleOutput HANDLE, wAttributes uint16) bool {
+	ret, _, _ := procSetConsoleTextAttribute.Call(
+		uintptr(hConsoleOutput),
+		uintptr(wAttributes))
+	return ret != 0
+}
+
+func GetDiskFreeSpaceEx(dirName string) (r bool,
+	freeBytesAvailable, totalNumberOfBytes, totalNumberOfFreeBytes uint64) {
+	ret, _, _ := procGetDiskFreeSpaceEx.Call(
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(dirName))),
+		uintptr(unsafe.Pointer(&freeBytesAvailable)),
+		uintptr(unsafe.Pointer(&totalNumberOfBytes)),
+		uintptr(unsafe.Pointer(&totalNumberOfFreeBytes)))
+	return ret != 0,
+		freeBytesAvailable, totalNumberOfBytes, totalNumberOfFreeBytes
+}
diff --git a/vendor/github.com/shirou/w32/ole32.go b/vendor/github.com/shirou/w32/ole32.go
new file mode 100644
index 0000000000..a7f79b550d
--- /dev/null
+++ b/vendor/github.com/shirou/w32/ole32.go
@@ -0,0 +1,63 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modole32 = syscall.NewLazyDLL("ole32.dll")
+
+	procCoInitializeEx        = modole32.NewProc("CoInitializeEx")
+	procCoInitialize          = modole32.NewProc("CoInitialize")
+	procCoUninitialize        = modole32.NewProc("CoUninitialize")
+	procCreateStreamOnHGlobal = modole32.NewProc("CreateStreamOnHGlobal")
+)
+
+func CoInitializeEx(coInit uintptr) HRESULT {
+	ret, _, _ := procCoInitializeEx.Call(
+		0,
+		coInit)
+
+	switch uint32(ret) {
+	case E_INVALIDARG:
+		panic("CoInitializeEx failed with E_INVALIDARG")
+	case E_OUTOFMEMORY:
+		panic("CoInitializeEx failed with E_OUTOFMEMORY")
+	case E_UNEXPECTED:
+		panic("CoInitializeEx failed with E_UNEXPECTED")
+	}
+
+	return HRESULT(ret)
+}
+
+func CoInitialize() {
+	procCoInitialize.Call(0)
+}
+
+func CoUninitialize() {
+	procCoUninitialize.Call()
+}
+
+func CreateStreamOnHGlobal(hGlobal HGLOBAL, fDeleteOnRelease bool) *IStream {
+	stream := new(IStream)
+	ret, _, _ := procCreateStreamOnHGlobal.Call(
+		uintptr(hGlobal),
+		uintptr(BoolToBOOL(fDeleteOnRelease)),
+		uintptr(unsafe.Pointer(&stream)))
+
+	switch uint32(ret) {
+	case E_INVALIDARG:
+		panic("CreateStreamOnHGlobal failed with E_INVALIDARG")
+	case E_OUTOFMEMORY:
+		panic("CreateStreamOnHGlobal failed with E_OUTOFMEMORY")
+	case E_UNEXPECTED:
+		panic("CreateStreamOnHGlobal failed with E_UNEXPECTED")
+	}
+
+	return stream
+}
diff --git a/vendor/github.com/shirou/w32/oleaut32.go b/vendor/github.com/shirou/w32/oleaut32.go
new file mode 100644
index 0000000000..0eeeab7246
--- /dev/null
+++ b/vendor/github.com/shirou/w32/oleaut32.go
@@ -0,0 +1,48 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modoleaut32 = syscall.NewLazyDLL("oleaut32")
+
+	procVariantInit        = modoleaut32.NewProc("VariantInit")
+	procSysAllocString     = modoleaut32.NewProc("SysAllocString")
+	procSysFreeString      = modoleaut32.NewProc("SysFreeString")
+	procSysStringLen       = modoleaut32.NewProc("SysStringLen")
+	procCreateDispTypeInfo = modoleaut32.NewProc("CreateDispTypeInfo")
+	procCreateStdDispatch  = modoleaut32.NewProc("CreateStdDispatch")
+)
+
+func VariantInit(v *VARIANT) {
+	hr, _, _ := procVariantInit.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		panic("Invoke VariantInit error.")
+	}
+	return
+}
+
+func SysAllocString(v string) (ss *int16) {
+	pss, _, _ := procSysAllocString.Call(uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(v))))
+	ss = (*int16)(unsafe.Pointer(pss))
+	return
+}
+
+func SysFreeString(v *int16) {
+	hr, _, _ := procSysFreeString.Call(uintptr(unsafe.Pointer(v)))
+	if hr != 0 {
+		panic("Invoke SysFreeString error.")
+	}
+	return
+}
+
+func SysStringLen(v *int16) uint {
+	l, _, _ := procSysStringLen.Call(uintptr(unsafe.Pointer(v)))
+	return uint(l)
+}
diff --git a/vendor/github.com/shirou/w32/opengl32.go b/vendor/github.com/shirou/w32/opengl32.go
new file mode 100644
index 0000000000..7363bb10ad
--- /dev/null
+++ b/vendor/github.com/shirou/w32/opengl32.go
@@ -0,0 +1,72 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modopengl32 = syscall.NewLazyDLL("opengl32.dll")
+
+	procwglCreateContext      = modopengl32.NewProc("wglCreateContext")
+	procwglCreateLayerContext = modopengl32.NewProc("wglCreateLayerContext")
+	procwglDeleteContext      = modopengl32.NewProc("wglDeleteContext")
+	procwglGetProcAddress     = modopengl32.NewProc("wglGetProcAddress")
+	procwglMakeCurrent        = modopengl32.NewProc("wglMakeCurrent")
+	procwglShareLists         = modopengl32.NewProc("wglShareLists")
+)
+
+func WglCreateContext(hdc HDC) HGLRC {
+	ret, _, _ := procwglCreateContext.Call(
+		uintptr(hdc),
+	)
+
+	return HGLRC(ret)
+}
+
+func WglCreateLayerContext(hdc HDC, iLayerPlane int) HGLRC {
+	ret, _, _ := procwglCreateLayerContext.Call(
+		uintptr(hdc),
+		uintptr(iLayerPlane),
+	)
+
+	return HGLRC(ret)
+}
+
+func WglDeleteContext(hglrc HGLRC) bool {
+	ret, _, _ := procwglDeleteContext.Call(
+		uintptr(hglrc),
+	)
+
+	return ret == TRUE
+}
+
+func WglGetProcAddress(szProc string) uintptr {
+	ret, _, _ := procwglGetProcAddress.Call(
+		uintptr(unsafe.Pointer(syscall.StringBytePtr(szProc))),
+	)
+
+	return ret
+}
+
+func WglMakeCurrent(hdc HDC, hglrc HGLRC) bool {
+	ret, _, _ := procwglMakeCurrent.Call(
+		uintptr(hdc),
+		uintptr(hglrc),
+	)
+
+	return ret == TRUE
+}
+
+func WglShareLists(hglrc1, hglrc2 HGLRC) bool {
+	ret, _, _ := procwglShareLists.Call(
+		uintptr(hglrc1),
+		uintptr(hglrc2),
+	)
+
+	return ret == TRUE
+}
diff --git a/vendor/github.com/shirou/w32/psapi.go b/vendor/github.com/shirou/w32/psapi.go
new file mode 100644
index 0000000000..bd1e12627c
--- /dev/null
+++ b/vendor/github.com/shirou/w32/psapi.go
@@ -0,0 +1,25 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modpsapi = syscall.NewLazyDLL("psapi.dll")
+
+	procEnumProcesses = modpsapi.NewProc("EnumProcesses")
+)
+
+func EnumProcesses(processIds []uint32, cb uint32, bytesReturned *uint32) bool {
+	ret, _, _ := procEnumProcesses.Call(
+		uintptr(unsafe.Pointer(&processIds[0])),
+		uintptr(cb),
+		uintptr(unsafe.Pointer(bytesReturned)))
+
+	return ret != 0
+}
diff --git a/vendor/github.com/shirou/w32/shell32.go b/vendor/github.com/shirou/w32/shell32.go
new file mode 100644
index 0000000000..0923b8b61d
--- /dev/null
+++ b/vendor/github.com/shirou/w32/shell32.go
@@ -0,0 +1,153 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"errors"
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modshell32 = syscall.NewLazyDLL("shell32.dll")
+
+	procSHBrowseForFolder   = modshell32.NewProc("SHBrowseForFolderW")
+	procSHGetPathFromIDList = modshell32.NewProc("SHGetPathFromIDListW")
+	procDragAcceptFiles     = modshell32.NewProc("DragAcceptFiles")
+	procDragQueryFile       = modshell32.NewProc("DragQueryFileW")
+	procDragQueryPoint      = modshell32.NewProc("DragQueryPoint")
+	procDragFinish          = modshell32.NewProc("DragFinish")
+	procShellExecute        = modshell32.NewProc("ShellExecuteW")
+	procExtractIcon         = modshell32.NewProc("ExtractIconW")
+)
+
+func SHBrowseForFolder(bi *BROWSEINFO) uintptr {
+	ret, _, _ := procSHBrowseForFolder.Call(uintptr(unsafe.Pointer(bi)))
+
+	return ret
+}
+
+func SHGetPathFromIDList(idl uintptr) string {
+	buf := make([]uint16, 1024)
+	procSHGetPathFromIDList.Call(
+		idl,
+		uintptr(unsafe.Pointer(&buf[0])))
+
+	return syscall.UTF16ToString(buf)
+}
+
+func DragAcceptFiles(hwnd HWND, accept bool) {
+	procDragAcceptFiles.Call(
+		uintptr(hwnd),
+		uintptr(BoolToBOOL(accept)))
+}
+
+func DragQueryFile(hDrop HDROP, iFile uint) (fileName string, fileCount uint) {
+	ret, _, _ := procDragQueryFile.Call(
+		uintptr(hDrop),
+		uintptr(iFile),
+		0,
+		0)
+
+	fileCount = uint(ret)
+
+	if iFile != 0xFFFFFFFF {
+		buf := make([]uint16, fileCount+1)
+
+		ret, _, _ := procDragQueryFile.Call(
+			uintptr(hDrop),
+			uintptr(iFile),
+			uintptr(unsafe.Pointer(&buf[0])),
+			uintptr(fileCount+1))
+
+		if ret == 0 {
+			panic("Invoke DragQueryFile error.")
+		}
+
+		fileName = syscall.UTF16ToString(buf)
+	}
+
+	return
+}
+
+func DragQueryPoint(hDrop HDROP) (x, y int, isClientArea bool) {
+	var pt POINT
+	ret, _, _ := procDragQueryPoint.Call(
+		uintptr(hDrop),
+		uintptr(unsafe.Pointer(&pt)))
+
+	return int(pt.X), int(pt.Y), (ret == 1)
+}
+
+func DragFinish(hDrop HDROP) {
+	procDragFinish.Call(uintptr(hDrop))
+}
+
+func ShellExecute(hwnd HWND, lpOperation, lpFile, lpParameters, lpDirectory string, nShowCmd int) error {
+	var op, param, directory uintptr
+	if len(lpOperation) != 0 {
+		op = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpOperation)))
+	}
+	if len(lpParameters) != 0 {
+		param = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpParameters)))
+	}
+	if len(lpDirectory) != 0 {
+		directory = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpDirectory)))
+	}
+
+	ret, _, _ := procShellExecute.Call(
+		uintptr(hwnd),
+		op,
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpFile))),
+		param,
+		directory,
+		uintptr(nShowCmd))
+
+	errorMsg := ""
+	if ret != 0 && ret <= 32 {
+		switch int(ret) {
+		case ERROR_FILE_NOT_FOUND:
+			errorMsg = "The specified file was not found."
+		case ERROR_PATH_NOT_FOUND:
+			errorMsg = "The specified path was not found."
+		case ERROR_BAD_FORMAT:
+			errorMsg = "The .exe file is invalid (non-Win32 .exe or error in .exe image)."
+		case SE_ERR_ACCESSDENIED:
+			errorMsg = "The operating system denied access to the specified file."
+		case SE_ERR_ASSOCINCOMPLETE:
+			errorMsg = "The file name association is incomplete or invalid."
+		case SE_ERR_DDEBUSY:
+			errorMsg = "The DDE transaction could not be completed because other DDE transactions were being processed."
+		case SE_ERR_DDEFAIL:
+			errorMsg = "The DDE transaction failed."
+		case SE_ERR_DDETIMEOUT:
+			errorMsg = "The DDE transaction could not be completed because the request timed out."
+		case SE_ERR_DLLNOTFOUND:
+			errorMsg = "The specified DLL was not found."
+		case SE_ERR_NOASSOC:
+			errorMsg = "There is no application associated with the given file name extension. This error will also be returned if you attempt to print a file that is not printable."
+		case SE_ERR_OOM:
+			errorMsg = "There was not enough memory to complete the operation."
+		case SE_ERR_SHARE:
+			errorMsg = "A sharing violation occurred."
+		default:
+			errorMsg = fmt.Sprintf("Unknown error occurred with error code %v", ret)
+		}
+	} else {
+		return nil
+	}
+
+	return errors.New(errorMsg)
+}
+
+func ExtractIcon(lpszExeFileName string, nIconIndex int) HICON {
+	ret, _, _ := procExtractIcon.Call(
+		0,
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpszExeFileName))),
+		uintptr(nIconIndex))
+
+	return HICON(ret)
+}
diff --git a/vendor/github.com/shirou/w32/typedef.go b/vendor/github.com/shirou/w32/typedef.go
new file mode 100644
index 0000000000..65f5111292
--- /dev/null
+++ b/vendor/github.com/shirou/w32/typedef.go
@@ -0,0 +1,901 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"unsafe"
+)
+
+// From MSDN: Windows Data Types
+// http://msdn.microsoft.com/en-us/library/s3f49ktz.aspx
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa383751.aspx
+// ATOM                  WORD
+// BOOL                  int32
+// BOOLEAN               byte
+// BYTE                  byte
+// CCHAR                 int8
+// CHAR                  int8
+// COLORREF              DWORD
+// DWORD                 uint32
+// DWORDLONG             ULONGLONG
+// DWORD_PTR             ULONG_PTR
+// DWORD32               uint32
+// DWORD64               uint64
+// FLOAT                 float32
+// HACCEL                HANDLE
+// HALF_PTR              struct{} // ???
+// HANDLE                PVOID
+// HBITMAP               HANDLE
+// HBRUSH                HANDLE
+// HCOLORSPACE           HANDLE
+// HCONV                 HANDLE
+// HCONVLIST             HANDLE
+// HCURSOR               HANDLE
+// HDC                   HANDLE
+// HDDEDATA              HANDLE
+// HDESK                 HANDLE
+// HDROP                 HANDLE
+// HDWP                  HANDLE
+// HENHMETAFILE          HANDLE
+// HFILE                 HANDLE
+// HFONT                 HANDLE
+// HGDIOBJ               HANDLE
+// HGLOBAL               HANDLE
+// HHOOK                 HANDLE
+// HICON                 HANDLE
+// HINSTANCE             HANDLE
+// HKEY                  HANDLE
+// HKL                   HANDLE
+// HLOCAL                HANDLE
+// HMENU                 HANDLE
+// HMETAFILE             HANDLE
+// HMODULE               HANDLE
+// HPALETTE              HANDLE
+// HPEN                  HANDLE
+// HRESULT               int32
+// HRGN                  HANDLE
+// HSZ                   HANDLE
+// HWINSTA               HANDLE
+// HWND                  HANDLE
+// INT                   int32
+// INT_PTR               uintptr
+// INT8                  int8
+// INT16                 int16
+// INT32                 int32
+// INT64                 int64
+// LANGID                WORD
+// LCID                  DWORD
+// LCTYPE                DWORD
+// LGRPID                DWORD
+// LONG                  int32
+// LONGLONG              int64
+// LONG_PTR              uintptr
+// LONG32                int32
+// LONG64                int64
+// LPARAM                LONG_PTR
+// LPBOOL                *BOOL
+// LPBYTE                *BYTE
+// LPCOLORREF            *COLORREF
+// LPCSTR                *int8
+// LPCTSTR               LPCWSTR
+// LPCVOID               unsafe.Pointer
+// LPCWSTR               *WCHAR
+// LPDWORD               *DWORD
+// LPHANDLE              *HANDLE
+// LPINT                 *INT
+// LPLONG                *LONG
+// LPSTR                 *CHAR
+// LPTSTR                LPWSTR
+// LPVOID                unsafe.Pointer
+// LPWORD                *WORD
+// LPWSTR                *WCHAR
+// LRESULT               LONG_PTR
+// PBOOL                 *BOOL
+// PBOOLEAN              *BOOLEAN
+// PBYTE                 *BYTE
+// PCHAR                 *CHAR
+// PCSTR                 *CHAR
+// PCTSTR                PCWSTR
+// PCWSTR                *WCHAR
+// PDWORD                *DWORD
+// PDWORDLONG            *DWORDLONG
+// PDWORD_PTR            *DWORD_PTR
+// PDWORD32              *DWORD32
+// PDWORD64              *DWORD64
+// PFLOAT                *FLOAT
+// PHALF_PTR             *HALF_PTR
+// PHANDLE               *HANDLE
+// PHKEY                 *HKEY
+// PINT_PTR              *INT_PTR
+// PINT8                 *INT8
+// PINT16                *INT16
+// PINT32                *INT32
+// PINT64                *INT64
+// PLCID                 *LCID
+// PLONG                 *LONG
+// PLONGLONG             *LONGLONG
+// PLONG_PTR             *LONG_PTR
+// PLONG32               *LONG32
+// PLONG64               *LONG64
+// POINTER_32            struct{} // ???
+// POINTER_64            struct{} // ???
+// POINTER_SIGNED        uintptr
+// POINTER_UNSIGNED      uintptr
+// PSHORT                *SHORT
+// PSIZE_T               *SIZE_T
+// PSSIZE_T              *SSIZE_T
+// PSTR                  *CHAR
+// PTBYTE                *TBYTE
+// PTCHAR                *TCHAR
+// PTSTR                 PWSTR
+// PUCHAR                *UCHAR
+// PUHALF_PTR            *UHALF_PTR
+// PUINT                 *UINT
+// PUINT_PTR             *UINT_PTR
+// PUINT8                *UINT8
+// PUINT16               *UINT16
+// PUINT32               *UINT32
+// PUINT64               *UINT64
+// PULONG                *ULONG
+// PULONGLONG            *ULONGLONG
+// PULONG_PTR            *ULONG_PTR
+// PULONG32              *ULONG32
+// PULONG64              *ULONG64
+// PUSHORT               *USHORT
+// PVOID                 unsafe.Pointer
+// PWCHAR                *WCHAR
+// PWORD                 *WORD
+// PWSTR                 *WCHAR
+// QWORD                 uint64
+// SC_HANDLE             HANDLE
+// SC_LOCK               LPVOID
+// SERVICE_STATUS_HANDLE HANDLE
+// SHORT                 int16
+// SIZE_T                ULONG_PTR
+// SSIZE_T               LONG_PTR
+// TBYTE                 WCHAR
+// TCHAR                 WCHAR
+// UCHAR                 uint8
+// UHALF_PTR             struct{} // ???
+// UINT                  uint32
+// UINT_PTR              uintptr
+// UINT8                 uint8
+// UINT16                uint16
+// UINT32                uint32
+// UINT64                uint64
+// ULONG                 uint32
+// ULONGLONG             uint64
+// ULONG_PTR             uintptr
+// ULONG32               uint32
+// ULONG64               uint64
+// USHORT                uint16
+// USN                   LONGLONG
+// WCHAR                 uint16
+// WORD                  uint16
+// WPARAM                UINT_PTR
+type (
+	ATOM            uint16
+	BOOL            int32
+	COLORREF        uint32
+	DWM_FRAME_COUNT uint64
+	HACCEL          HANDLE
+	HANDLE          uintptr
+	HBITMAP         HANDLE
+	HBRUSH          HANDLE
+	HCURSOR         HANDLE
+	HDC             HANDLE
+	HDROP           HANDLE
+	HDWP            HANDLE
+	HENHMETAFILE    HANDLE
+	HFONT           HANDLE
+	HGDIOBJ         HANDLE
+	HGLOBAL         HANDLE
+	HGLRC           HANDLE
+	HICON           HANDLE
+	HIMAGELIST      HANDLE
+	HINSTANCE       HANDLE
+	HKEY            HANDLE
+	HKL             HANDLE
+	HMENU           HANDLE
+	HMODULE         HANDLE
+	HMONITOR        HANDLE
+	HPEN            HANDLE
+	HRESULT         int32
+	HRGN            HANDLE
+	HRSRC           HANDLE
+	HTHUMBNAIL      HANDLE
+	HWND            HANDLE
+	LPCVOID         unsafe.Pointer
+	PVOID           unsafe.Pointer
+	QPC_TIME        uint64
+)
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162805.aspx
+type POINT struct {
+	X, Y int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162897.aspx
+type RECT struct {
+	Left, Top, Right, Bottom int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms633577.aspx
+type WNDCLASSEX struct {
+	Size       uint32
+	Style      uint32
+	WndProc    uintptr
+	ClsExtra   int32
+	WndExtra   int32
+	Instance   HINSTANCE
+	Icon       HICON
+	Cursor     HCURSOR
+	Background HBRUSH
+	MenuName   *uint16
+	ClassName  *uint16
+	IconSm     HICON
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms644958.aspx
+type MSG struct {
+	Hwnd    HWND
+	Message uint32
+	WParam  uintptr
+	LParam  uintptr
+	Time    uint32
+	Pt      POINT
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145037.aspx
+type LOGFONT struct {
+	Height         int32
+	Width          int32
+	Escapement     int32
+	Orientation    int32
+	Weight         int32
+	Italic         byte
+	Underline      byte
+	StrikeOut      byte
+	CharSet        byte
+	OutPrecision   byte
+	ClipPrecision  byte
+	Quality        byte
+	PitchAndFamily byte
+	FaceName       [LF_FACESIZE]uint16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646839.aspx
+type OPENFILENAME struct {
+	StructSize      uint32
+	Owner           HWND
+	Instance        HINSTANCE
+	Filter          *uint16
+	CustomFilter    *uint16
+	MaxCustomFilter uint32
+	FilterIndex     uint32
+	File            *uint16
+	MaxFile         uint32
+	FileTitle       *uint16
+	MaxFileTitle    uint32
+	InitialDir      *uint16
+	Title           *uint16
+	Flags           uint32
+	FileOffset      uint16
+	FileExtension   uint16
+	DefExt          *uint16
+	CustData        uintptr
+	FnHook          uintptr
+	TemplateName    *uint16
+	PvReserved      unsafe.Pointer
+	DwReserved      uint32
+	FlagsEx         uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773205.aspx
+type BROWSEINFO struct {
+	Owner        HWND
+	Root         *uint16
+	DisplayName  *uint16
+	Title        *uint16
+	Flags        uint32
+	CallbackFunc uintptr
+	LParam       uintptr
+	Image        int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa373931.aspx
+type GUID struct {
+	Data1 uint32
+	Data2 uint16
+	Data3 uint16
+	Data4 [8]byte
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms221627.aspx
+type VARIANT struct {
+	VT         uint16 //  2
+	WReserved1 uint16 //  4
+	WReserved2 uint16 //  6
+	WReserved3 uint16 //  8
+	Val        int64  // 16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms221416.aspx
+type DISPPARAMS struct {
+	Rgvarg            uintptr
+	RgdispidNamedArgs uintptr
+	CArgs             uint32
+	CNamedArgs        uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms221133.aspx
+type EXCEPINFO struct {
+	WCode             uint16
+	WReserved         uint16
+	BstrSource        *uint16
+	BstrDescription   *uint16
+	BstrHelpFile      *uint16
+	DwHelpContext     uint32
+	PvReserved        uintptr
+	PfnDeferredFillIn uintptr
+	Scode             int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145035.aspx
+type LOGBRUSH struct {
+	LbStyle uint32
+	LbColor COLORREF
+	LbHatch uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183565.aspx
+type DEVMODE struct {
+	DmDeviceName       [CCHDEVICENAME]uint16
+	DmSpecVersion      uint16
+	DmDriverVersion    uint16
+	DmSize             uint16
+	DmDriverExtra      uint16
+	DmFields           uint32
+	DmOrientation      int16
+	DmPaperSize        int16
+	DmPaperLength      int16
+	DmPaperWidth       int16
+	DmScale            int16
+	DmCopies           int16
+	DmDefaultSource    int16
+	DmPrintQuality     int16
+	DmColor            int16
+	DmDuplex           int16
+	DmYResolution      int16
+	DmTTOption         int16
+	DmCollate          int16
+	DmFormName         [CCHFORMNAME]uint16
+	DmLogPixels        uint16
+	DmBitsPerPel       uint32
+	DmPelsWidth        uint32
+	DmPelsHeight       uint32
+	DmDisplayFlags     uint32
+	DmDisplayFrequency uint32
+	DmICMMethod        uint32
+	DmICMIntent        uint32
+	DmMediaType        uint32
+	DmDitherType       uint32
+	DmReserved1        uint32
+	DmReserved2        uint32
+	DmPanningWidth     uint32
+	DmPanningHeight    uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183376.aspx
+type BITMAPINFOHEADER struct {
+	BiSize          uint32
+	BiWidth         int32
+	BiHeight        int32
+	BiPlanes        uint16
+	BiBitCount      uint16
+	BiCompression   uint32
+	BiSizeImage     uint32
+	BiXPelsPerMeter int32
+	BiYPelsPerMeter int32
+	BiClrUsed       uint32
+	BiClrImportant  uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162938.aspx
+type RGBQUAD struct {
+	RgbBlue     byte
+	RgbGreen    byte
+	RgbRed      byte
+	RgbReserved byte
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183375.aspx
+type BITMAPINFO struct {
+	BmiHeader BITMAPINFOHEADER
+	BmiColors *RGBQUAD
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183371.aspx
+type BITMAP struct {
+	BmType       int32
+	BmWidth      int32
+	BmHeight     int32
+	BmWidthBytes int32
+	BmPlanes     uint16
+	BmBitsPixel  uint16
+	BmBits       unsafe.Pointer
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183567.aspx
+type DIBSECTION struct {
+	DsBm        BITMAP
+	DsBmih      BITMAPINFOHEADER
+	DsBitfields [3]uint32
+	DshSection  HANDLE
+	DsOffset    uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162607.aspx
+type ENHMETAHEADER struct {
+	IType          uint32
+	NSize          uint32
+	RclBounds      RECT
+	RclFrame       RECT
+	DSignature     uint32
+	NVersion       uint32
+	NBytes         uint32
+	NRecords       uint32
+	NHandles       uint16
+	SReserved      uint16
+	NDescription   uint32
+	OffDescription uint32
+	NPalEntries    uint32
+	SzlDevice      SIZE
+	SzlMillimeters SIZE
+	CbPixelFormat  uint32
+	OffPixelFormat uint32
+	BOpenGL        uint32
+	SzlMicrometers SIZE
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145106.aspx
+type SIZE struct {
+	CX, CY int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145132.aspx
+type TEXTMETRIC struct {
+	TmHeight           int32
+	TmAscent           int32
+	TmDescent          int32
+	TmInternalLeading  int32
+	TmExternalLeading  int32
+	TmAveCharWidth     int32
+	TmMaxCharWidth     int32
+	TmWeight           int32
+	TmOverhang         int32
+	TmDigitizedAspectX int32
+	TmDigitizedAspectY int32
+	TmFirstChar        uint16
+	TmLastChar         uint16
+	TmDefaultChar      uint16
+	TmBreakChar        uint16
+	TmItalic           byte
+	TmUnderlined       byte
+	TmStruckOut        byte
+	TmPitchAndFamily   byte
+	TmCharSet          byte
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183574.aspx
+type DOCINFO struct {
+	CbSize       int32
+	LpszDocName  *uint16
+	LpszOutput   *uint16
+	LpszDatatype *uint16
+	FwType       uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb775514.aspx
+type NMHDR struct {
+	HwndFrom HWND
+	IdFrom   uintptr
+	Code     uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774743.aspx
+type LVCOLUMN struct {
+	Mask       uint32
+	Fmt        int32
+	Cx         int32
+	PszText    *uint16
+	CchTextMax int32
+	ISubItem   int32
+	IImage     int32
+	IOrder     int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774760.aspx
+type LVITEM struct {
+	Mask       uint32
+	IItem      int32
+	ISubItem   int32
+	State      uint32
+	StateMask  uint32
+	PszText    *uint16
+	CchTextMax int32
+	IImage     int32
+	LParam     uintptr
+	IIndent    int32
+	IGroupId   int32
+	CColumns   uint32
+	PuColumns  uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774754.aspx
+type LVHITTESTINFO struct {
+	Pt       POINT
+	Flags    uint32
+	IItem    int32
+	ISubItem int32
+	IGroup   int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774771.aspx
+type NMITEMACTIVATE struct {
+	Hdr       NMHDR
+	IItem     int32
+	ISubItem  int32
+	UNewState uint32
+	UOldState uint32
+	UChanged  uint32
+	PtAction  POINT
+	LParam    uintptr
+	UKeyFlags uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774773.aspx
+type NMLISTVIEW struct {
+	Hdr       NMHDR
+	IItem     int32
+	ISubItem  int32
+	UNewState uint32
+	UOldState uint32
+	UChanged  uint32
+	PtAction  POINT
+	LParam    uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774780.aspx
+type NMLVDISPINFO struct {
+	Hdr  NMHDR
+	Item LVITEM
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb775507.aspx
+type INITCOMMONCONTROLSEX struct {
+	DwSize uint32
+	DwICC  uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb760256.aspx
+type TOOLINFO struct {
+	CbSize     uint32
+	UFlags     uint32
+	Hwnd       HWND
+	UId        uintptr
+	Rect       RECT
+	Hinst      HINSTANCE
+	LpszText   *uint16
+	LParam     uintptr
+	LpReserved unsafe.Pointer
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms645604.aspx
+type TRACKMOUSEEVENT struct {
+	CbSize      uint32
+	DwFlags     uint32
+	HwndTrack   HWND
+	DwHoverTime uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms534067.aspx
+type GdiplusStartupInput struct {
+	GdiplusVersion           uint32
+	DebugEventCallback       uintptr
+	SuppressBackgroundThread BOOL
+	SuppressExternalCodecs   BOOL
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms534068.aspx
+type GdiplusStartupOutput struct {
+	NotificationHook   uintptr
+	NotificationUnhook uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162768.aspx
+type PAINTSTRUCT struct {
+	Hdc         HDC
+	FErase      BOOL
+	RcPaint     RECT
+	FRestore    BOOL
+	FIncUpdate  BOOL
+	RgbReserved [32]byte
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa363646.aspx
+type EVENTLOGRECORD struct {
+	Length              uint32
+	Reserved            uint32
+	RecordNumber        uint32
+	TimeGenerated       uint32
+	TimeWritten         uint32
+	EventID             uint32
+	EventType           uint16
+	NumStrings          uint16
+	EventCategory       uint16
+	ReservedFlags       uint16
+	ClosingRecordNumber uint32
+	StringOffset        uint32
+	UserSidLength       uint32
+	UserSidOffset       uint32
+	DataLength          uint32
+	DataOffset          uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms685996.aspx
+type SERVICE_STATUS struct {
+	DwServiceType             uint32
+	DwCurrentState            uint32
+	DwControlsAccepted        uint32
+	DwWin32ExitCode           uint32
+	DwServiceSpecificExitCode uint32
+	DwCheckPoint              uint32
+	DwWaitHint                uint32
+}
+type PROCESSENTRY32 struct {
+	DwSize              uint32
+	CntUsage            uint32
+	Th32ProcessID       uint32
+	Th32DefaultHeapID   uintptr
+	Th32ModuleID        uint32
+	CntThreads          uint32
+	Th32ParentProcessID uint32
+	PcPriClassBase      int32
+	DwFlags             uint32
+	SzExeFile           [MAX_PATH]uint16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms684225.aspx
+type MODULEENTRY32 struct {
+	Size         uint32
+	ModuleID     uint32
+	ProcessID    uint32
+	GlblcntUsage uint32
+	ProccntUsage uint32
+	ModBaseAddr  *uint8
+	ModBaseSize  uint32
+	HModule      HMODULE
+	SzModule     [MAX_MODULE_NAME32 + 1]uint16
+	SzExePath    [MAX_PATH]uint16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms724284.aspx
+type FILETIME struct {
+	DwLowDateTime  uint32
+	DwHighDateTime uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682119.aspx
+type COORD struct {
+	X, Y int16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms686311.aspx
+type SMALL_RECT struct {
+	Left, Top, Right, Bottom int16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682093.aspx
+type CONSOLE_SCREEN_BUFFER_INFO struct {
+	DwSize              COORD
+	DwCursorPosition    COORD
+	WAttributes         uint16
+	SrWindow            SMALL_RECT
+	DwMaximumWindowSize COORD
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773244.aspx
+type MARGINS struct {
+	CxLeftWidth, CxRightWidth, CyTopHeight, CyBottomHeight int32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969500.aspx
+type DWM_BLURBEHIND struct {
+	DwFlags                uint32
+	fEnable                BOOL
+	hRgnBlur               HRGN
+	fTransitionOnMaximized BOOL
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969501.aspx
+type DWM_PRESENT_PARAMETERS struct {
+	cbSize             uint32
+	fQueue             BOOL
+	cRefreshStart      DWM_FRAME_COUNT
+	cBuffer            uint32
+	fUseSourceRate     BOOL
+	rateSource         UNSIGNED_RATIO
+	cRefreshesPerFrame uint32
+	eSampling          DWM_SOURCE_FRAME_SAMPLING
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969502.aspx
+type DWM_THUMBNAIL_PROPERTIES struct {
+	dwFlags               uint32
+	rcDestination         RECT
+	rcSource              RECT
+	opacity               byte
+	fVisible              BOOL
+	fSourceClientAreaOnly BOOL
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969503.aspx
+type DWM_TIMING_INFO struct {
+	cbSize                 uint32
+	rateRefresh            UNSIGNED_RATIO
+	qpcRefreshPeriod       QPC_TIME
+	rateCompose            UNSIGNED_RATIO
+	qpcVBlank              QPC_TIME
+	cRefresh               DWM_FRAME_COUNT
+	cDXRefresh             uint32
+	qpcCompose             QPC_TIME
+	cFrame                 DWM_FRAME_COUNT
+	cDXPresent             uint32
+	cRefreshFrame          DWM_FRAME_COUNT
+	cFrameSubmitted        DWM_FRAME_COUNT
+	cDXPresentSubmitted    uint32
+	cFrameConfirmed        DWM_FRAME_COUNT
+	cDXPresentConfirmed    uint32
+	cRefreshConfirmed      DWM_FRAME_COUNT
+	cDXRefreshConfirmed    uint32
+	cFramesLate            DWM_FRAME_COUNT
+	cFramesOutstanding     uint32
+	cFrameDisplayed        DWM_FRAME_COUNT
+	qpcFrameDisplayed      QPC_TIME
+	cRefreshFrameDisplayed DWM_FRAME_COUNT
+	cFrameComplete         DWM_FRAME_COUNT
+	qpcFrameComplete       QPC_TIME
+	cFramePending          DWM_FRAME_COUNT
+	qpcFramePending        QPC_TIME
+	cFramesDisplayed       DWM_FRAME_COUNT
+	cFramesComplete        DWM_FRAME_COUNT
+	cFramesPending         DWM_FRAME_COUNT
+	cFramesAvailable       DWM_FRAME_COUNT
+	cFramesDropped         DWM_FRAME_COUNT
+	cFramesMissed          DWM_FRAME_COUNT
+	cRefreshNextDisplayed  DWM_FRAME_COUNT
+	cRefreshNextPresented  DWM_FRAME_COUNT
+	cRefreshesDisplayed    DWM_FRAME_COUNT
+	cRefreshesPresented    DWM_FRAME_COUNT
+	cRefreshStarted        DWM_FRAME_COUNT
+	cPixelsReceived        uint64
+	cPixelsDrawn           uint64
+	cBuffersEmpty          DWM_FRAME_COUNT
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd389402.aspx
+type MilMatrix3x2D struct {
+	S_11, S_12, S_21, S_22 float64
+	DX, DY                 float64
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969505.aspx
+type UNSIGNED_RATIO struct {
+	uiNumerator   uint32
+	uiDenominator uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms632603.aspx
+type CREATESTRUCT struct {
+	CreateParams uintptr
+	Instance     HINSTANCE
+	Menu         HMENU
+	Parent       HWND
+	Cy, Cx       int32
+	Y, X         int32
+	Style        int32
+	Name         *uint16
+	Class        *uint16
+	dwExStyle    uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145065.aspx
+type MONITORINFO struct {
+	CbSize    uint32
+	RcMonitor RECT
+	RcWork    RECT
+	DwFlags   uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145066.aspx
+type MONITORINFOEX struct {
+	MONITORINFO
+	SzDevice [CCHDEVICENAME]uint16
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/dd368826.aspx
+type PIXELFORMATDESCRIPTOR struct {
+	Size                   uint16
+	Version                uint16
+	DwFlags                uint32
+	IPixelType             byte
+	ColorBits              byte
+	RedBits, RedShift      byte
+	GreenBits, GreenShift  byte
+	BlueBits, BlueShift    byte
+	AlphaBits, AlphaShift  byte
+	AccumBits              byte
+	AccumRedBits           byte
+	AccumGreenBits         byte
+	AccumBlueBits          byte
+	AccumAlphaBits         byte
+	DepthBits, StencilBits byte
+	AuxBuffers             byte
+	ILayerType             byte
+	Reserved               byte
+	DwLayerMask            uint32
+	DwVisibleMask          uint32
+	DwDamageMask           uint32
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646270(v=vs.85).aspx
+type INPUT struct {
+	Type uint32
+	Mi   MOUSEINPUT
+	Ki   KEYBDINPUT
+	Hi   HARDWAREINPUT
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646273(v=vs.85).aspx
+type MOUSEINPUT struct {
+	Dx          int32
+	Dy          int32
+	MouseData   uint32
+	DwFlags     uint32
+	Time        uint32
+	DwExtraInfo uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646271(v=vs.85).aspx
+type KEYBDINPUT struct {
+	WVk         uint16
+	WScan       uint16
+	DwFlags     uint32
+	Time        uint32
+	DwExtraInfo uintptr
+}
+
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646269(v=vs.85).aspx
+type HARDWAREINPUT struct {
+	UMsg    uint32
+	WParamL uint16
+	WParamH uint16
+}
+
+type KbdInput struct {
+	typ uint32
+	ki  KEYBDINPUT
+}
+
+type MouseInput struct {
+	typ uint32
+	mi  MOUSEINPUT
+}
+
+type HardwareInput struct {
+	typ uint32
+	hi  HARDWAREINPUT
+}
diff --git a/vendor/github.com/shirou/w32/user32.go b/vendor/github.com/shirou/w32/user32.go
new file mode 100644
index 0000000000..44b87726d1
--- /dev/null
+++ b/vendor/github.com/shirou/w32/user32.go
@@ -0,0 +1,948 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"fmt"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	moduser32 = syscall.NewLazyDLL("user32.dll")
+
+	procRegisterClassEx               = moduser32.NewProc("RegisterClassExW")
+	procLoadIcon                      = moduser32.NewProc("LoadIconW")
+	procLoadCursor                    = moduser32.NewProc("LoadCursorW")
+	procShowWindow                    = moduser32.NewProc("ShowWindow")
+	procUpdateWindow                  = moduser32.NewProc("UpdateWindow")
+	procCreateWindowEx                = moduser32.NewProc("CreateWindowExW")
+	procAdjustWindowRect              = moduser32.NewProc("AdjustWindowRect")
+	procAdjustWindowRectEx            = moduser32.NewProc("AdjustWindowRectEx")
+	procDestroyWindow                 = moduser32.NewProc("DestroyWindow")
+	procDefWindowProc                 = moduser32.NewProc("DefWindowProcW")
+	procDefDlgProc                    = moduser32.NewProc("DefDlgProcW")
+	procPostQuitMessage               = moduser32.NewProc("PostQuitMessage")
+	procGetMessage                    = moduser32.NewProc("GetMessageW")
+	procTranslateMessage              = moduser32.NewProc("TranslateMessage")
+	procDispatchMessage               = moduser32.NewProc("DispatchMessageW")
+	procSendMessage                   = moduser32.NewProc("SendMessageW")
+	procPostMessage                   = moduser32.NewProc("PostMessageW")
+	procWaitMessage                   = moduser32.NewProc("WaitMessage")
+	procSetWindowText                 = moduser32.NewProc("SetWindowTextW")
+	procGetWindowTextLength           = moduser32.NewProc("GetWindowTextLengthW")
+	procGetWindowText                 = moduser32.NewProc("GetWindowTextW")
+	procGetWindowRect                 = moduser32.NewProc("GetWindowRect")
+	procMoveWindow                    = moduser32.NewProc("MoveWindow")
+	procScreenToClient                = moduser32.NewProc("ScreenToClient")
+	procCallWindowProc                = moduser32.NewProc("CallWindowProcW")
+	procSetWindowLong                 = moduser32.NewProc("SetWindowLongW")
+	procSetWindowLongPtr              = moduser32.NewProc("SetWindowLongW")
+	procGetWindowLong                 = moduser32.NewProc("GetWindowLongW")
+	procGetWindowLongPtr              = moduser32.NewProc("GetWindowLongW")
+	procEnableWindow                  = moduser32.NewProc("EnableWindow")
+	procIsWindowEnabled               = moduser32.NewProc("IsWindowEnabled")
+	procIsWindowVisible               = moduser32.NewProc("IsWindowVisible")
+	procSetFocus                      = moduser32.NewProc("SetFocus")
+	procInvalidateRect                = moduser32.NewProc("InvalidateRect")
+	procGetClientRect                 = moduser32.NewProc("GetClientRect")
+	procGetDC                         = moduser32.NewProc("GetDC")
+	procReleaseDC                     = moduser32.NewProc("ReleaseDC")
+	procSetCapture                    = moduser32.NewProc("SetCapture")
+	procReleaseCapture                = moduser32.NewProc("ReleaseCapture")
+	procGetWindowThreadProcessId      = moduser32.NewProc("GetWindowThreadProcessId")
+	procMessageBox                    = moduser32.NewProc("MessageBoxW")
+	procGetSystemMetrics              = moduser32.NewProc("GetSystemMetrics")
+	procCopyRect                      = moduser32.NewProc("CopyRect")
+	procEqualRect                     = moduser32.NewProc("EqualRect")
+	procInflateRect                   = moduser32.NewProc("InflateRect")
+	procIntersectRect                 = moduser32.NewProc("IntersectRect")
+	procIsRectEmpty                   = moduser32.NewProc("IsRectEmpty")
+	procOffsetRect                    = moduser32.NewProc("OffsetRect")
+	procPtInRect                      = moduser32.NewProc("PtInRect")
+	procSetRect                       = moduser32.NewProc("SetRect")
+	procSetRectEmpty                  = moduser32.NewProc("SetRectEmpty")
+	procSubtractRect                  = moduser32.NewProc("SubtractRect")
+	procUnionRect                     = moduser32.NewProc("UnionRect")
+	procCreateDialogParam             = moduser32.NewProc("CreateDialogParamW")
+	procDialogBoxParam                = moduser32.NewProc("DialogBoxParamW")
+	procGetDlgItem                    = moduser32.NewProc("GetDlgItem")
+	procDrawIcon                      = moduser32.NewProc("DrawIcon")
+	procClientToScreen                = moduser32.NewProc("ClientToScreen")
+	procIsDialogMessage               = moduser32.NewProc("IsDialogMessageW")
+	procIsWindow                      = moduser32.NewProc("IsWindow")
+	procEndDialog                     = moduser32.NewProc("EndDialog")
+	procPeekMessage                   = moduser32.NewProc("PeekMessageW")
+	procTranslateAccelerator          = moduser32.NewProc("TranslateAcceleratorW")
+	procSetWindowPos                  = moduser32.NewProc("SetWindowPos")
+	procFillRect                      = moduser32.NewProc("FillRect")
+	procDrawText                      = moduser32.NewProc("DrawTextW")
+	procAddClipboardFormatListener    = moduser32.NewProc("AddClipboardFormatListener")
+	procRemoveClipboardFormatListener = moduser32.NewProc("RemoveClipboardFormatListener")
+	procOpenClipboard                 = moduser32.NewProc("OpenClipboard")
+	procCloseClipboard                = moduser32.NewProc("CloseClipboard")
+	procEnumClipboardFormats          = moduser32.NewProc("EnumClipboardFormats")
+	procGetClipboardData              = moduser32.NewProc("GetClipboardData")
+	procSetClipboardData              = moduser32.NewProc("SetClipboardData")
+	procEmptyClipboard                = moduser32.NewProc("EmptyClipboard")
+	procGetClipboardFormatName        = moduser32.NewProc("GetClipboardFormatNameW")
+	procIsClipboardFormatAvailable    = moduser32.NewProc("IsClipboardFormatAvailable")
+	procBeginPaint                    = moduser32.NewProc("BeginPaint")
+	procEndPaint                      = moduser32.NewProc("EndPaint")
+	procGetKeyboardState              = moduser32.NewProc("GetKeyboardState")
+	procMapVirtualKey                 = moduser32.NewProc("MapVirtualKeyExW")
+	procGetAsyncKeyState              = moduser32.NewProc("GetAsyncKeyState")
+	procToAscii                       = moduser32.NewProc("ToAscii")
+	procSwapMouseButton               = moduser32.NewProc("SwapMouseButton")
+	procGetCursorPos                  = moduser32.NewProc("GetCursorPos")
+	procSetCursorPos                  = moduser32.NewProc("SetCursorPos")
+	procSetCursor                     = moduser32.NewProc("SetCursor")
+	procCreateIcon                    = moduser32.NewProc("CreateIcon")
+	procDestroyIcon                   = moduser32.NewProc("DestroyIcon")
+	procMonitorFromPoint              = moduser32.NewProc("MonitorFromPoint")
+	procMonitorFromRect               = moduser32.NewProc("MonitorFromRect")
+	procMonitorFromWindow             = moduser32.NewProc("MonitorFromWindow")
+	procGetMonitorInfo                = moduser32.NewProc("GetMonitorInfoW")
+	procEnumDisplayMonitors           = moduser32.NewProc("EnumDisplayMonitors")
+	procEnumDisplaySettingsEx         = moduser32.NewProc("EnumDisplaySettingsExW")
+	procChangeDisplaySettingsEx       = moduser32.NewProc("ChangeDisplaySettingsExW")
+	procSendInput                     = moduser32.NewProc("SendInput")
+)
+
+func RegisterClassEx(wndClassEx *WNDCLASSEX) ATOM {
+	ret, _, _ := procRegisterClassEx.Call(uintptr(unsafe.Pointer(wndClassEx)))
+	return ATOM(ret)
+}
+
+func LoadIcon(instance HINSTANCE, iconName *uint16) HICON {
+	ret, _, _ := procLoadIcon.Call(
+		uintptr(instance),
+		uintptr(unsafe.Pointer(iconName)))
+
+	return HICON(ret)
+
+}
+
+func LoadCursor(instance HINSTANCE, cursorName *uint16) HCURSOR {
+	ret, _, _ := procLoadCursor.Call(
+		uintptr(instance),
+		uintptr(unsafe.Pointer(cursorName)))
+
+	return HCURSOR(ret)
+
+}
+
+func ShowWindow(hwnd HWND, cmdshow int) bool {
+	ret, _, _ := procShowWindow.Call(
+		uintptr(hwnd),
+		uintptr(cmdshow))
+
+	return ret != 0
+
+}
+
+func UpdateWindow(hwnd HWND) bool {
+	ret, _, _ := procUpdateWindow.Call(
+		uintptr(hwnd))
+	return ret != 0
+}
+
+func CreateWindowEx(exStyle uint, className, windowName *uint16,
+	style uint, x, y, width, height int, parent HWND, menu HMENU,
+	instance HINSTANCE, param unsafe.Pointer) HWND {
+	ret, _, _ := procCreateWindowEx.Call(
+		uintptr(exStyle),
+		uintptr(unsafe.Pointer(className)),
+		uintptr(unsafe.Pointer(windowName)),
+		uintptr(style),
+		uintptr(x),
+		uintptr(y),
+		uintptr(width),
+		uintptr(height),
+		uintptr(parent),
+		uintptr(menu),
+		uintptr(instance),
+		uintptr(param))
+
+	return HWND(ret)
+}
+
+func AdjustWindowRectEx(rect *RECT, style uint, menu bool, exStyle uint) bool {
+	ret, _, _ := procAdjustWindowRectEx.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(style),
+		uintptr(BoolToBOOL(menu)),
+		uintptr(exStyle))
+
+	return ret != 0
+}
+
+func AdjustWindowRect(rect *RECT, style uint, menu bool) bool {
+	ret, _, _ := procAdjustWindowRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(style),
+		uintptr(BoolToBOOL(menu)))
+
+	return ret != 0
+}
+
+func DestroyWindow(hwnd HWND) bool {
+	ret, _, _ := procDestroyWindow.Call(
+		uintptr(hwnd))
+
+	return ret != 0
+}
+
+func DefWindowProc(hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
+	ret, _, _ := procDefWindowProc.Call(
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret
+}
+
+func DefDlgProc(hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
+	ret, _, _ := procDefDlgProc.Call(
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret
+}
+
+func PostQuitMessage(exitCode int) {
+	procPostQuitMessage.Call(
+		uintptr(exitCode))
+}
+
+func GetMessage(msg *MSG, hwnd HWND, msgFilterMin, msgFilterMax uint32) int {
+	ret, _, _ := procGetMessage.Call(
+		uintptr(unsafe.Pointer(msg)),
+		uintptr(hwnd),
+		uintptr(msgFilterMin),
+		uintptr(msgFilterMax))
+
+	return int(ret)
+}
+
+func TranslateMessage(msg *MSG) bool {
+	ret, _, _ := procTranslateMessage.Call(
+		uintptr(unsafe.Pointer(msg)))
+
+	return ret != 0
+
+}
+
+func DispatchMessage(msg *MSG) uintptr {
+	ret, _, _ := procDispatchMessage.Call(
+		uintptr(unsafe.Pointer(msg)))
+
+	return ret
+
+}
+
+func SendMessage(hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
+	ret, _, _ := procSendMessage.Call(
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret
+}
+
+func PostMessage(hwnd HWND, msg uint32, wParam, lParam uintptr) bool {
+	ret, _, _ := procPostMessage.Call(
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret != 0
+}
+
+func WaitMessage() bool {
+	ret, _, _ := procWaitMessage.Call()
+	return ret != 0
+}
+
+func SetWindowText(hwnd HWND, text string) {
+	procSetWindowText.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(text))))
+}
+
+func GetWindowTextLength(hwnd HWND) int {
+	ret, _, _ := procGetWindowTextLength.Call(
+		uintptr(hwnd))
+
+	return int(ret)
+}
+
+func GetWindowText(hwnd HWND) string {
+	textLen := GetWindowTextLength(hwnd) + 1
+
+	buf := make([]uint16, textLen)
+	procGetWindowText.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(textLen))
+
+	return syscall.UTF16ToString(buf)
+}
+
+func GetWindowRect(hwnd HWND) *RECT {
+	var rect RECT
+	procGetWindowRect.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&rect)))
+
+	return &rect
+}
+
+func MoveWindow(hwnd HWND, x, y, width, height int, repaint bool) bool {
+	ret, _, _ := procMoveWindow.Call(
+		uintptr(hwnd),
+		uintptr(x),
+		uintptr(y),
+		uintptr(width),
+		uintptr(height),
+		uintptr(BoolToBOOL(repaint)))
+
+	return ret != 0
+
+}
+
+func ScreenToClient(hwnd HWND, x, y int) (X, Y int, ok bool) {
+	pt := POINT{X: int32(x), Y: int32(y)}
+	ret, _, _ := procScreenToClient.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&pt)))
+
+	return int(pt.X), int(pt.Y), ret != 0
+}
+
+func CallWindowProc(preWndProc uintptr, hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
+	ret, _, _ := procCallWindowProc.Call(
+		preWndProc,
+		uintptr(hwnd),
+		uintptr(msg),
+		wParam,
+		lParam)
+
+	return ret
+}
+
+func SetWindowLong(hwnd HWND, index int, value uint32) uint32 {
+	ret, _, _ := procSetWindowLong.Call(
+		uintptr(hwnd),
+		uintptr(index),
+		uintptr(value))
+
+	return uint32(ret)
+}
+
+func SetWindowLongPtr(hwnd HWND, index int, value uintptr) uintptr {
+	ret, _, _ := procSetWindowLongPtr.Call(
+		uintptr(hwnd),
+		uintptr(index),
+		value)
+
+	return ret
+}
+
+func GetWindowLong(hwnd HWND, index int) int32 {
+	ret, _, _ := procGetWindowLong.Call(
+		uintptr(hwnd),
+		uintptr(index))
+
+	return int32(ret)
+}
+
+func GetWindowLongPtr(hwnd HWND, index int) uintptr {
+	ret, _, _ := procGetWindowLongPtr.Call(
+		uintptr(hwnd),
+		uintptr(index))
+
+	return ret
+}
+
+func EnableWindow(hwnd HWND, b bool) bool {
+	ret, _, _ := procEnableWindow.Call(
+		uintptr(hwnd),
+		uintptr(BoolToBOOL(b)))
+	return ret != 0
+}
+
+func IsWindowEnabled(hwnd HWND) bool {
+	ret, _, _ := procIsWindowEnabled.Call(
+		uintptr(hwnd))
+
+	return ret != 0
+}
+
+func IsWindowVisible(hwnd HWND) bool {
+	ret, _, _ := procIsWindowVisible.Call(
+		uintptr(hwnd))
+
+	return ret != 0
+}
+
+func SetFocus(hwnd HWND) HWND {
+	ret, _, _ := procSetFocus.Call(
+		uintptr(hwnd))
+
+	return HWND(ret)
+}
+
+func InvalidateRect(hwnd HWND, rect *RECT, erase bool) bool {
+	ret, _, _ := procInvalidateRect.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(BoolToBOOL(erase)))
+
+	return ret != 0
+}
+
+func GetClientRect(hwnd HWND) *RECT {
+	var rect RECT
+	ret, _, _ := procGetClientRect.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&rect)))
+
+	if ret == 0 {
+		panic(fmt.Sprintf("GetClientRect(%d) failed", hwnd))
+	}
+
+	return &rect
+}
+
+func GetDC(hwnd HWND) HDC {
+	ret, _, _ := procGetDC.Call(
+		uintptr(hwnd))
+
+	return HDC(ret)
+}
+
+func ReleaseDC(hwnd HWND, hDC HDC) bool {
+	ret, _, _ := procReleaseDC.Call(
+		uintptr(hwnd),
+		uintptr(hDC))
+
+	return ret != 0
+}
+
+func SetCapture(hwnd HWND) HWND {
+	ret, _, _ := procSetCapture.Call(
+		uintptr(hwnd))
+
+	return HWND(ret)
+}
+
+func ReleaseCapture() bool {
+	ret, _, _ := procReleaseCapture.Call()
+
+	return ret != 0
+}
+
+func GetWindowThreadProcessId(hwnd HWND) (HANDLE, int) {
+	var processId int
+	ret, _, _ := procGetWindowThreadProcessId.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&processId)))
+
+	return HANDLE(ret), processId
+}
+
+func MessageBox(hwnd HWND, title, caption string, flags uint) int {
+	ret, _, _ := procMessageBox.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(title))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(caption))),
+		uintptr(flags))
+
+	return int(ret)
+}
+
+func GetSystemMetrics(index int) int {
+	ret, _, _ := procGetSystemMetrics.Call(
+		uintptr(index))
+
+	return int(ret)
+}
+
+func CopyRect(dst, src *RECT) bool {
+	ret, _, _ := procCopyRect.Call(
+		uintptr(unsafe.Pointer(dst)),
+		uintptr(unsafe.Pointer(src)))
+
+	return ret != 0
+}
+
+func EqualRect(rect1, rect2 *RECT) bool {
+	ret, _, _ := procEqualRect.Call(
+		uintptr(unsafe.Pointer(rect1)),
+		uintptr(unsafe.Pointer(rect2)))
+
+	return ret != 0
+}
+
+func InflateRect(rect *RECT, dx, dy int) bool {
+	ret, _, _ := procInflateRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(dx),
+		uintptr(dy))
+
+	return ret != 0
+}
+
+func IntersectRect(dst, src1, src2 *RECT) bool {
+	ret, _, _ := procIntersectRect.Call(
+		uintptr(unsafe.Pointer(dst)),
+		uintptr(unsafe.Pointer(src1)),
+		uintptr(unsafe.Pointer(src2)))
+
+	return ret != 0
+}
+
+func IsRectEmpty(rect *RECT) bool {
+	ret, _, _ := procIsRectEmpty.Call(
+		uintptr(unsafe.Pointer(rect)))
+
+	return ret != 0
+}
+
+func OffsetRect(rect *RECT, dx, dy int) bool {
+	ret, _, _ := procOffsetRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(dx),
+		uintptr(dy))
+
+	return ret != 0
+}
+
+func PtInRect(rect *RECT, x, y int) bool {
+	pt := POINT{X: int32(x), Y: int32(y)}
+	ret, _, _ := procPtInRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(unsafe.Pointer(&pt)))
+
+	return ret != 0
+}
+
+func SetRect(rect *RECT, left, top, right, bottom int) bool {
+	ret, _, _ := procSetRect.Call(
+		uintptr(unsafe.Pointer(rect)),
+		uintptr(left),
+		uintptr(top),
+		uintptr(right),
+		uintptr(bottom))
+
+	return ret != 0
+}
+
+func SetRectEmpty(rect *RECT) bool {
+	ret, _, _ := procSetRectEmpty.Call(
+		uintptr(unsafe.Pointer(rect)))
+
+	return ret != 0
+}
+
+func SubtractRect(dst, src1, src2 *RECT) bool {
+	ret, _, _ := procSubtractRect.Call(
+		uintptr(unsafe.Pointer(dst)),
+		uintptr(unsafe.Pointer(src1)),
+		uintptr(unsafe.Pointer(src2)))
+
+	return ret != 0
+}
+
+func UnionRect(dst, src1, src2 *RECT) bool {
+	ret, _, _ := procUnionRect.Call(
+		uintptr(unsafe.Pointer(dst)),
+		uintptr(unsafe.Pointer(src1)),
+		uintptr(unsafe.Pointer(src2)))
+
+	return ret != 0
+}
+
+func CreateDialog(hInstance HINSTANCE, lpTemplate *uint16, hWndParent HWND, lpDialogProc uintptr) HWND {
+	ret, _, _ := procCreateDialogParam.Call(
+		uintptr(hInstance),
+		uintptr(unsafe.Pointer(lpTemplate)),
+		uintptr(hWndParent),
+		lpDialogProc,
+		0)
+
+	return HWND(ret)
+}
+
+func DialogBox(hInstance HINSTANCE, lpTemplateName *uint16, hWndParent HWND, lpDialogProc uintptr) int {
+	ret, _, _ := procDialogBoxParam.Call(
+		uintptr(hInstance),
+		uintptr(unsafe.Pointer(lpTemplateName)),
+		uintptr(hWndParent),
+		lpDialogProc,
+		0)
+
+	return int(ret)
+}
+
+func GetDlgItem(hDlg HWND, nIDDlgItem int) HWND {
+	ret, _, _ := procGetDlgItem.Call(
+		uintptr(unsafe.Pointer(hDlg)),
+		uintptr(nIDDlgItem))
+
+	return HWND(ret)
+}
+
+func DrawIcon(hDC HDC, x, y int, hIcon HICON) bool {
+	ret, _, _ := procDrawIcon.Call(
+		uintptr(unsafe.Pointer(hDC)),
+		uintptr(x),
+		uintptr(y),
+		uintptr(unsafe.Pointer(hIcon)))
+
+	return ret != 0
+}
+
+func ClientToScreen(hwnd HWND, x, y int) (int, int) {
+	pt := POINT{X: int32(x), Y: int32(y)}
+
+	procClientToScreen.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(&pt)))
+
+	return int(pt.X), int(pt.Y)
+}
+
+func IsDialogMessage(hwnd HWND, msg *MSG) bool {
+	ret, _, _ := procIsDialogMessage.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(msg)))
+
+	return ret != 0
+}
+
+func IsWindow(hwnd HWND) bool {
+	ret, _, _ := procIsWindow.Call(
+		uintptr(hwnd))
+
+	return ret != 0
+}
+
+func EndDialog(hwnd HWND, nResult uintptr) bool {
+	ret, _, _ := procEndDialog.Call(
+		uintptr(hwnd),
+		nResult)
+
+	return ret != 0
+}
+
+func PeekMessage(lpMsg *MSG, hwnd HWND, wMsgFilterMin, wMsgFilterMax, wRemoveMsg uint32) bool {
+	ret, _, _ := procPeekMessage.Call(
+		uintptr(unsafe.Pointer(lpMsg)),
+		uintptr(hwnd),
+		uintptr(wMsgFilterMin),
+		uintptr(wMsgFilterMax),
+		uintptr(wRemoveMsg))
+
+	return ret != 0
+}
+
+func TranslateAccelerator(hwnd HWND, hAccTable HACCEL, lpMsg *MSG) bool {
+	ret, _, _ := procTranslateMessage.Call(
+		uintptr(hwnd),
+		uintptr(hAccTable),
+		uintptr(unsafe.Pointer(lpMsg)))
+
+	return ret != 0
+}
+
+func SetWindowPos(hwnd, hWndInsertAfter HWND, x, y, cx, cy int, uFlags uint) bool {
+	ret, _, _ := procSetWindowPos.Call(
+		uintptr(hwnd),
+		uintptr(hWndInsertAfter),
+		uintptr(x),
+		uintptr(y),
+		uintptr(cx),
+		uintptr(cy),
+		uintptr(uFlags))
+
+	return ret != 0
+}
+
+func FillRect(hDC HDC, lprc *RECT, hbr HBRUSH) bool {
+	ret, _, _ := procFillRect.Call(
+		uintptr(hDC),
+		uintptr(unsafe.Pointer(lprc)),
+		uintptr(hbr))
+
+	return ret != 0
+}
+
+func DrawText(hDC HDC, text string, uCount int, lpRect *RECT, uFormat uint) int {
+	ret, _, _ := procDrawText.Call(
+		uintptr(hDC),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(text))),
+		uintptr(uCount),
+		uintptr(unsafe.Pointer(lpRect)),
+		uintptr(uFormat))
+
+	return int(ret)
+}
+
+func AddClipboardFormatListener(hwnd HWND) bool {
+	ret, _, _ := procAddClipboardFormatListener.Call(
+		uintptr(hwnd))
+	return ret != 0
+}
+
+func RemoveClipboardFormatListener(hwnd HWND) bool {
+	ret, _, _ := procRemoveClipboardFormatListener.Call(
+		uintptr(hwnd))
+	return ret != 0
+}
+
+func OpenClipboard(hWndNewOwner HWND) bool {
+	ret, _, _ := procOpenClipboard.Call(
+		uintptr(hWndNewOwner))
+	return ret != 0
+}
+
+func CloseClipboard() bool {
+	ret, _, _ := procCloseClipboard.Call()
+	return ret != 0
+}
+
+func EnumClipboardFormats(format uint) uint {
+	ret, _, _ := procEnumClipboardFormats.Call(
+		uintptr(format))
+	return uint(ret)
+}
+
+func GetClipboardData(uFormat uint) HANDLE {
+	ret, _, _ := procGetClipboardData.Call(
+		uintptr(uFormat))
+	return HANDLE(ret)
+}
+
+func SetClipboardData(uFormat uint, hMem HANDLE) HANDLE {
+	ret, _, _ := procSetClipboardData.Call(
+		uintptr(uFormat),
+		uintptr(hMem))
+	return HANDLE(ret)
+}
+
+func EmptyClipboard() bool {
+	ret, _, _ := procEmptyClipboard.Call()
+	return ret != 0
+}
+
+func GetClipboardFormatName(format uint) (string, bool) {
+	cchMaxCount := 255
+	buf := make([]uint16, cchMaxCount)
+	ret, _, _ := procGetClipboardFormatName.Call(
+		uintptr(format),
+		uintptr(unsafe.Pointer(&buf[0])),
+		uintptr(cchMaxCount))
+
+	if ret > 0 {
+		return syscall.UTF16ToString(buf), true
+	}
+
+	return "Requested format does not exist or is predefined", false
+}
+
+func IsClipboardFormatAvailable(format uint) bool {
+	ret, _, _ := procIsClipboardFormatAvailable.Call(uintptr(format))
+	return ret != 0
+}
+
+func BeginPaint(hwnd HWND, paint *PAINTSTRUCT) HDC {
+	ret, _, _ := procBeginPaint.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(paint)))
+	return HDC(ret)
+}
+
+func EndPaint(hwnd HWND, paint *PAINTSTRUCT) {
+	procBeginPaint.Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(paint)))
+}
+
+func GetKeyboardState(lpKeyState *[]byte) bool {
+	ret, _, _ := procGetKeyboardState.Call(
+		uintptr(unsafe.Pointer(&(*lpKeyState)[0])))
+	return ret != 0
+}
+
+func MapVirtualKeyEx(uCode, uMapType uint, dwhkl HKL) uint {
+	ret, _, _ := procMapVirtualKey.Call(
+		uintptr(uCode),
+		uintptr(uMapType),
+		uintptr(dwhkl))
+	return uint(ret)
+}
+
+func GetAsyncKeyState(vKey int) uint16 {
+	ret, _, _ := procGetAsyncKeyState.Call(uintptr(vKey))
+	return uint16(ret)
+}
+
+func ToAscii(uVirtKey, uScanCode uint, lpKeyState *byte, lpChar *uint16, uFlags uint) int {
+	ret, _, _ := procToAscii.Call(
+		uintptr(uVirtKey),
+		uintptr(uScanCode),
+		uintptr(unsafe.Pointer(lpKeyState)),
+		uintptr(unsafe.Pointer(lpChar)),
+		uintptr(uFlags))
+	return int(ret)
+}
+
+func SwapMouseButton(fSwap bool) bool {
+	ret, _, _ := procSwapMouseButton.Call(
+		uintptr(BoolToBOOL(fSwap)))
+	return ret != 0
+}
+
+func GetCursorPos() (x, y int, ok bool) {
+	pt := POINT{}
+	ret, _, _ := procGetCursorPos.Call(uintptr(unsafe.Pointer(&pt)))
+	return int(pt.X), int(pt.Y), ret != 0
+}
+
+func SetCursorPos(x, y int) bool {
+	ret, _, _ := procSetCursorPos.Call(
+		uintptr(x),
+		uintptr(y),
+	)
+	return ret != 0
+}
+
+func SetCursor(cursor HCURSOR) HCURSOR {
+	ret, _, _ := procSetCursor.Call(
+		uintptr(cursor),
+	)
+	return HCURSOR(ret)
+}
+
+func CreateIcon(instance HINSTANCE, nWidth, nHeight int, cPlanes, cBitsPerPixel byte, ANDbits, XORbits *byte) HICON {
+	ret, _, _ := procCreateIcon.Call(
+		uintptr(instance),
+		uintptr(nWidth),
+		uintptr(nHeight),
+		uintptr(cPlanes),
+		uintptr(cBitsPerPixel),
+		uintptr(unsafe.Pointer(ANDbits)),
+		uintptr(unsafe.Pointer(XORbits)),
+	)
+	return HICON(ret)
+}
+
+func DestroyIcon(icon HICON) bool {
+	ret, _, _ := procDestroyIcon.Call(
+		uintptr(icon),
+	)
+	return ret != 0
+}
+
+func MonitorFromPoint(x, y int, dwFlags uint32) HMONITOR {
+	ret, _, _ := procMonitorFromPoint.Call(
+		uintptr(x),
+		uintptr(y),
+		uintptr(dwFlags),
+	)
+	return HMONITOR(ret)
+}
+
+func MonitorFromRect(rc *RECT, dwFlags uint32) HMONITOR {
+	ret, _, _ := procMonitorFromRect.Call(
+		uintptr(unsafe.Pointer(rc)),
+		uintptr(dwFlags),
+	)
+	return HMONITOR(ret)
+}
+
+func MonitorFromWindow(hwnd HWND, dwFlags uint32) HMONITOR {
+	ret, _, _ := procMonitorFromWindow.Call(
+		uintptr(hwnd),
+		uintptr(dwFlags),
+	)
+	return HMONITOR(ret)
+}
+
+func GetMonitorInfo(hMonitor HMONITOR, lmpi *MONITORINFO) bool {
+	ret, _, _ := procGetMonitorInfo.Call(
+		uintptr(hMonitor),
+		uintptr(unsafe.Pointer(lmpi)),
+	)
+	return ret != 0
+}
+
+func EnumDisplayMonitors(hdc HDC, clip *RECT, fnEnum, dwData uintptr) bool {
+	ret, _, _ := procEnumDisplayMonitors.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(clip)),
+		fnEnum,
+		dwData,
+	)
+	return ret != 0
+}
+
+func EnumDisplaySettingsEx(szDeviceName *uint16, iModeNum uint32, devMode *DEVMODE, dwFlags uint32) bool {
+	ret, _, _ := procEnumDisplaySettingsEx.Call(
+		uintptr(unsafe.Pointer(szDeviceName)),
+		uintptr(iModeNum),
+		uintptr(unsafe.Pointer(devMode)),
+		uintptr(dwFlags),
+	)
+	return ret != 0
+}
+
+func ChangeDisplaySettingsEx(szDeviceName *uint16, devMode *DEVMODE, hwnd HWND, dwFlags uint32, lParam uintptr) int32 {
+	ret, _, _ := procChangeDisplaySettingsEx.Call(
+		uintptr(unsafe.Pointer(szDeviceName)),
+		uintptr(unsafe.Pointer(devMode)),
+		uintptr(hwnd),
+		uintptr(dwFlags),
+		lParam,
+	)
+	return int32(ret)
+}
+
+/* remove to build without cgo
+func SendInput(inputs []INPUT) uint32 {
+	var validInputs []C.INPUT
+
+	for _, oneInput := range inputs {
+		input := C.INPUT{_type: C.DWORD(oneInput.Type)}
+
+		switch oneInput.Type {
+		case INPUT_MOUSE:
+			(*MouseInput)(unsafe.Pointer(&input)).mi = oneInput.Mi
+		case INPUT_KEYBOARD:
+			(*KbdInput)(unsafe.Pointer(&input)).ki = oneInput.Ki
+		case INPUT_HARDWARE:
+			(*HardwareInput)(unsafe.Pointer(&input)).hi = oneInput.Hi
+		default:
+			panic("unkown type")
+		}
+
+		validInputs = append(validInputs, input)
+	}
+
+	ret, _, _ := procSendInput.Call(
+		uintptr(len(validInputs)),
+		uintptr(unsafe.Pointer(&validInputs[0])),
+		uintptr(unsafe.Sizeof(C.INPUT{})),
+	)
+	return uint32(ret)
+}
+*/
diff --git a/vendor/github.com/shirou/w32/utils.go b/vendor/github.com/shirou/w32/utils.go
new file mode 100644
index 0000000000..4fb5b6c2c1
--- /dev/null
+++ b/vendor/github.com/shirou/w32/utils.go
@@ -0,0 +1,201 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unicode/utf16"
+	"unsafe"
+)
+
+func MakeIntResource(id uint16) *uint16 {
+	return (*uint16)(unsafe.Pointer(uintptr(id)))
+}
+
+func LOWORD(dw uint32) uint16 {
+	return uint16(dw)
+}
+
+func HIWORD(dw uint32) uint16 {
+	return uint16(dw >> 16 & 0xffff)
+}
+
+func BoolToBOOL(value bool) BOOL {
+	if value {
+		return 1
+	}
+
+	return 0
+}
+
+func UTF16PtrToString(cstr *uint16) string {
+	if cstr != nil {
+		us := make([]uint16, 0, 256)
+		for p := uintptr(unsafe.Pointer(cstr)); ; p += 2 {
+			u := *(*uint16)(unsafe.Pointer(p))
+			if u == 0 {
+				return string(utf16.Decode(us))
+			}
+			us = append(us, u)
+		}
+	}
+
+	return ""
+}
+
+func ComAddRef(unknown *IUnknown) int32 {
+	ret, _, _ := syscall.Syscall(unknown.lpVtbl.pAddRef, 1,
+		uintptr(unsafe.Pointer(unknown)),
+		0,
+		0)
+	return int32(ret)
+}
+
+func ComRelease(unknown *IUnknown) int32 {
+	ret, _, _ := syscall.Syscall(unknown.lpVtbl.pRelease, 1,
+		uintptr(unsafe.Pointer(unknown)),
+		0,
+		0)
+	return int32(ret)
+}
+
+func ComQueryInterface(unknown *IUnknown, id *GUID) *IDispatch {
+	var disp *IDispatch
+	hr, _, _ := syscall.Syscall(unknown.lpVtbl.pQueryInterface, 3,
+		uintptr(unsafe.Pointer(unknown)),
+		uintptr(unsafe.Pointer(id)),
+		uintptr(unsafe.Pointer(&disp)))
+	if hr != 0 {
+		panic("Invoke QieryInterface error.")
+	}
+	return disp
+}
+
+func ComGetIDsOfName(disp *IDispatch, names []string) []int32 {
+	wnames := make([]*uint16, len(names))
+	dispid := make([]int32, len(names))
+	for i := 0; i < len(names); i++ {
+		wnames[i] = syscall.StringToUTF16Ptr(names[i])
+	}
+	hr, _, _ := syscall.Syscall6(disp.lpVtbl.pGetIDsOfNames, 6,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(unsafe.Pointer(IID_NULL)),
+		uintptr(unsafe.Pointer(&wnames[0])),
+		uintptr(len(names)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(unsafe.Pointer(&dispid[0])))
+	if hr != 0 {
+		panic("Invoke GetIDsOfName error.")
+	}
+	return dispid
+}
+
+func ComInvoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{}) (result *VARIANT) {
+	var dispparams DISPPARAMS
+
+	if dispatch&DISPATCH_PROPERTYPUT != 0 {
+		dispnames := [1]int32{DISPID_PROPERTYPUT}
+		dispparams.RgdispidNamedArgs = uintptr(unsafe.Pointer(&dispnames[0]))
+		dispparams.CNamedArgs = 1
+	}
+	var vargs []VARIANT
+	if len(params) > 0 {
+		vargs = make([]VARIANT, len(params))
+		for i, v := range params {
+			//n := len(params)-i-1
+			n := len(params) - i - 1
+			VariantInit(&vargs[n])
+			switch v.(type) {
+			case bool:
+				if v.(bool) {
+					vargs[n] = VARIANT{VT_BOOL, 0, 0, 0, 0xffff}
+				} else {
+					vargs[n] = VARIANT{VT_BOOL, 0, 0, 0, 0}
+				}
+			case *bool:
+				vargs[n] = VARIANT{VT_BOOL | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*bool))))}
+			case byte:
+				vargs[n] = VARIANT{VT_I1, 0, 0, 0, int64(v.(byte))}
+			case *byte:
+				vargs[n] = VARIANT{VT_I1 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*byte))))}
+			case int16:
+				vargs[n] = VARIANT{VT_I2, 0, 0, 0, int64(v.(int16))}
+			case *int16:
+				vargs[n] = VARIANT{VT_I2 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*int16))))}
+			case uint16:
+				vargs[n] = VARIANT{VT_UI2, 0, 0, 0, int64(v.(int16))}
+			case *uint16:
+				vargs[n] = VARIANT{VT_UI2 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*uint16))))}
+			case int, int32:
+				vargs[n] = VARIANT{VT_UI4, 0, 0, 0, int64(v.(int))}
+			case *int, *int32:
+				vargs[n] = VARIANT{VT_I4 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*int))))}
+			case uint, uint32:
+				vargs[n] = VARIANT{VT_UI4, 0, 0, 0, int64(v.(uint))}
+			case *uint, *uint32:
+				vargs[n] = VARIANT{VT_UI4 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*uint))))}
+			case int64:
+				vargs[n] = VARIANT{VT_I8, 0, 0, 0, v.(int64)}
+			case *int64:
+				vargs[n] = VARIANT{VT_I8 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*int64))))}
+			case uint64:
+				vargs[n] = VARIANT{VT_UI8, 0, 0, 0, int64(v.(uint64))}
+			case *uint64:
+				vargs[n] = VARIANT{VT_UI8 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*uint64))))}
+			case float32:
+				vargs[n] = VARIANT{VT_R4, 0, 0, 0, int64(v.(float32))}
+			case *float32:
+				vargs[n] = VARIANT{VT_R4 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*float32))))}
+			case float64:
+				vargs[n] = VARIANT{VT_R8, 0, 0, 0, int64(v.(float64))}
+			case *float64:
+				vargs[n] = VARIANT{VT_R8 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*float64))))}
+			case string:
+				vargs[n] = VARIANT{VT_BSTR, 0, 0, 0, int64(uintptr(unsafe.Pointer(SysAllocString(v.(string)))))}
+			case *string:
+				vargs[n] = VARIANT{VT_BSTR | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*string))))}
+			case *IDispatch:
+				vargs[n] = VARIANT{VT_DISPATCH, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*IDispatch))))}
+			case **IDispatch:
+				vargs[n] = VARIANT{VT_DISPATCH | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(**IDispatch))))}
+			case nil:
+				vargs[n] = VARIANT{VT_NULL, 0, 0, 0, 0}
+			case *VARIANT:
+				vargs[n] = VARIANT{VT_VARIANT | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*VARIANT))))}
+			default:
+				panic("unknown type")
+			}
+		}
+		dispparams.Rgvarg = uintptr(unsafe.Pointer(&vargs[0]))
+		dispparams.CArgs = uint32(len(params))
+	}
+
+	var ret VARIANT
+	var excepInfo EXCEPINFO
+	VariantInit(&ret)
+	hr, _, _ := syscall.Syscall9(disp.lpVtbl.pInvoke, 8,
+		uintptr(unsafe.Pointer(disp)),
+		uintptr(dispid),
+		uintptr(unsafe.Pointer(IID_NULL)),
+		uintptr(GetUserDefaultLCID()),
+		uintptr(dispatch),
+		uintptr(unsafe.Pointer(&dispparams)),
+		uintptr(unsafe.Pointer(&ret)),
+		uintptr(unsafe.Pointer(&excepInfo)),
+		0)
+	if hr != 0 {
+		if excepInfo.BstrDescription != nil {
+			bs := UTF16PtrToString(excepInfo.BstrDescription)
+			panic(bs)
+		}
+	}
+	for _, varg := range vargs {
+		if varg.VT == VT_BSTR && varg.Val != 0 {
+			SysFreeString(((*int16)(unsafe.Pointer(uintptr(varg.Val)))))
+		}
+	}
+	result = &ret
+	return
+}
diff --git a/vendor/github.com/shirou/w32/vars.go b/vendor/github.com/shirou/w32/vars.go
new file mode 100644
index 0000000000..2dab2e3963
--- /dev/null
+++ b/vendor/github.com/shirou/w32/vars.go
@@ -0,0 +1,13 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+var (
+	IID_NULL                      = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
+	IID_IUnknown                  = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+	IID_IDispatch                 = &GUID{0x00020400, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+	IID_IConnectionPointContainer = &GUID{0xB196B284, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+	IID_IConnectionPoint          = &GUID{0xB196B286, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
+)
diff --git a/vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE b/vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE
new file mode 100644
index 0000000000..5f4e3ed57a
--- /dev/null
+++ b/vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015 Dmitri Shuralyov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/github.com/shurcooL/sanitized_anchor_name/main.go b/vendor/github.com/shurcooL/sanitized_anchor_name/main.go
new file mode 100644
index 0000000000..72a8753509
--- /dev/null
+++ b/vendor/github.com/shurcooL/sanitized_anchor_name/main.go
@@ -0,0 +1,29 @@
+// Package sanitized_anchor_name provides a func to create sanitized anchor names.
+//
+// Its logic can be reused by multiple packages to create interoperable anchor names
+// and links to those anchors.
+//
+// At this time, it does not try to ensure that generated anchor names
+// are unique, that responsibility falls on the caller.
+package sanitized_anchor_name // import "github.com/shurcooL/sanitized_anchor_name"
+
+import "unicode"
+
+// Create returns a sanitized anchor name for the given text.
+func Create(text string) string {
+	var anchorName []rune
+	var futureDash = false
+	for _, r := range []rune(text) {
+		switch {
+		case unicode.IsLetter(r) || unicode.IsNumber(r):
+			if futureDash && len(anchorName) > 0 {
+				anchorName = append(anchorName, '-')
+			}
+			futureDash = false
+			anchorName = append(anchorName, unicode.ToLower(r))
+		default:
+			futureDash = true
+		}
+	}
+	return string(anchorName)
+}
diff --git a/vendor/github.com/spf13/cobra/LICENSE.txt b/vendor/github.com/spf13/cobra/LICENSE.txt
new file mode 100644
index 0000000000..298f0e2665
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/LICENSE.txt
@@ -0,0 +1,174 @@
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
diff --git a/vendor/github.com/spf13/cobra/bash_completions.go b/vendor/github.com/spf13/cobra/bash_completions.go
new file mode 100644
index 0000000000..3f33bb0ec8
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/bash_completions.go
@@ -0,0 +1,602 @@
+package cobra
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"sort"
+	"strings"
+
+	"github.com/spf13/pflag"
+)
+
+const (
+	BashCompFilenameExt     = "cobra_annotation_bash_completion_filename_extentions"
+	BashCompCustom          = "cobra_annotation_bash_completion_custom"
+	BashCompOneRequiredFlag = "cobra_annotation_bash_completion_one_required_flag"
+	BashCompSubdirsInDir    = "cobra_annotation_bash_completion_subdirs_in_dir"
+)
+
+func preamble(out io.Writer, name string) error {
+	_, err := fmt.Fprintf(out, "# bash completion for %-36s -*- shell-script -*-\n", name)
+	if err != nil {
+		return err
+	}
+	_, err = fmt.Fprint(out, `
+__debug()
+{
+    if [[ -n ${BASH_COMP_DEBUG_FILE} ]]; then
+        echo "$*" >> "${BASH_COMP_DEBUG_FILE}"
+    fi
+}
+
+# Homebrew on Macs have version 1.3 of bash-completion which doesn't include
+# _init_completion. This is a very minimal version of that function.
+__my_init_completion()
+{
+    COMPREPLY=()
+    _get_comp_words_by_ref "$@" cur prev words cword
+}
+
+__index_of_word()
+{
+    local w word=$1
+    shift
+    index=0
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+        index=$((index+1))
+    done
+    index=-1
+}
+
+__contains_word()
+{
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+    return 1
+}
+
+__handle_reply()
+{
+    __debug "${FUNCNAME[0]}"
+    case $cur in
+        -*)
+            if [[ $(type -t compopt) = "builtin" ]]; then
+                compopt -o nospace
+            fi
+            local allflags
+            if [ ${#must_have_one_flag[@]} -ne 0 ]; then
+                allflags=("${must_have_one_flag[@]}")
+            else
+                allflags=("${flags[*]} ${two_word_flags[*]}")
+            fi
+            COMPREPLY=( $(compgen -W "${allflags[*]}" -- "$cur") )
+            if [[ $(type -t compopt) = "builtin" ]]; then
+                [[ "${COMPREPLY[0]}" == *= ]] || compopt +o nospace
+            fi
+
+            # complete after --flag=abc
+            if [[ $cur == *=* ]]; then
+                if [[ $(type -t compopt) = "builtin" ]]; then
+                    compopt +o nospace
+                fi
+
+                local index flag
+                flag="${cur%%=*}"
+                __index_of_word "${flag}" "${flags_with_completion[@]}"
+                if [[ ${index} -ge 0 ]]; then
+                    COMPREPLY=()
+                    PREFIX=""
+                    cur="${cur#*=}"
+                    ${flags_completion[${index}]}
+                    if [ -n "${ZSH_VERSION}" ]; then
+                        # zfs completion needs --flag= prefix
+                        eval "COMPREPLY=( \"\${COMPREPLY[@]/#/${flag}=}\" )"
+                    fi
+                fi
+            fi
+            return 0;
+            ;;
+    esac
+
+    # check if we are handling a flag with special work handling
+    local index
+    __index_of_word "${prev}" "${flags_with_completion[@]}"
+    if [[ ${index} -ge 0 ]]; then
+        ${flags_completion[${index}]}
+        return
+    fi
+
+    # we are parsing a flag and don't have a special handler, no completion
+    if [[ ${cur} != "${words[cword]}" ]]; then
+        return
+    fi
+
+    local completions
+    if [[ ${#must_have_one_flag[@]} -ne 0 ]]; then
+        completions=("${must_have_one_flag[@]}")
+    elif [[ ${#must_have_one_noun[@]} -ne 0 ]]; then
+        completions=("${must_have_one_noun[@]}")
+    else
+        completions=("${commands[@]}")
+    fi
+    COMPREPLY=( $(compgen -W "${completions[*]}" -- "$cur") )
+
+    if [[ ${#COMPREPLY[@]} -eq 0 && ${#noun_aliases[@]} -gt 0 && ${#must_have_one_noun[@]} -ne 0 ]]; then
+        COMPREPLY=( $(compgen -W "${noun_aliases[*]}" -- "$cur") )
+    fi
+
+    if [[ ${#COMPREPLY[@]} -eq 0 ]]; then
+        declare -F __custom_func >/dev/null && __custom_func
+    fi
+
+    __ltrim_colon_completions "$cur"
+}
+
+# The arguments should be in the form "ext1|ext2|extn"
+__handle_filename_extension_flag()
+{
+    local ext="$1"
+    _filedir "@(${ext})"
+}
+
+__handle_subdirs_in_dir_flag()
+{
+    local dir="$1"
+    pushd "${dir}" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1
+}
+
+__handle_flag()
+{
+    __debug "${FUNCNAME[0]}: c is $c words[c] is ${words[c]}"
+
+    # if a command required a flag, and we found it, unset must_have_one_flag()
+    local flagname=${words[c]}
+    local flagvalue
+    # if the word contained an =
+    if [[ ${words[c]} == *"="* ]]; then
+        flagvalue=${flagname#*=} # take in as flagvalue after the =
+        flagname=${flagname%%=*} # strip everything after the =
+        flagname="${flagname}=" # but put the = back
+    fi
+    __debug "${FUNCNAME[0]}: looking for ${flagname}"
+    if __contains_word "${flagname}" "${must_have_one_flag[@]}"; then
+        must_have_one_flag=()
+    fi
+
+    # keep flag value with flagname as flaghash
+    if [ -n "${flagvalue}" ] ; then
+        flaghash[${flagname}]=${flagvalue}
+    elif [ -n "${words[ $((c+1)) ]}" ] ; then
+        flaghash[${flagname}]=${words[ $((c+1)) ]}
+    else
+        flaghash[${flagname}]="true" # pad "true" for bool flag
+    fi
+
+    # skip the argument to a two word flag
+    if __contains_word "${words[c]}" "${two_word_flags[@]}"; then
+        c=$((c+1))
+        # if we are looking for a flags value, don't show commands
+        if [[ $c -eq $cword ]]; then
+            commands=()
+        fi
+    fi
+
+    c=$((c+1))
+
+}
+
+__handle_noun()
+{
+    __debug "${FUNCNAME[0]}: c is $c words[c] is ${words[c]}"
+
+    if __contains_word "${words[c]}" "${must_have_one_noun[@]}"; then
+        must_have_one_noun=()
+    elif __contains_word "${words[c]}" "${noun_aliases[@]}"; then
+        must_have_one_noun=()
+    fi
+
+    nouns+=("${words[c]}")
+    c=$((c+1))
+}
+
+__handle_command()
+{
+    __debug "${FUNCNAME[0]}: c is $c words[c] is ${words[c]}"
+
+    local next_command
+    if [[ -n ${last_command} ]]; then
+        next_command="_${last_command}_${words[c]//:/__}"
+    else
+        if [[ $c -eq 0 ]]; then
+            next_command="_$(basename "${words[c]//:/__}")"
+        else
+            next_command="_${words[c]//:/__}"
+        fi
+    fi
+    c=$((c+1))
+    __debug "${FUNCNAME[0]}: looking for ${next_command}"
+    declare -F $next_command >/dev/null && $next_command
+}
+
+__handle_word()
+{
+    if [[ $c -ge $cword ]]; then
+        __handle_reply
+        return
+    fi
+    __debug "${FUNCNAME[0]}: c is $c words[c] is ${words[c]}"
+    if [[ "${words[c]}" == -* ]]; then
+        __handle_flag
+    elif __contains_word "${words[c]}" "${commands[@]}"; then
+        __handle_command
+    elif [[ $c -eq 0 ]] && __contains_word "$(basename "${words[c]}")" "${commands[@]}"; then
+        __handle_command
+    else
+        __handle_noun
+    fi
+    __handle_word
+}
+
+`)
+	return err
+}
+
+func postscript(w io.Writer, name string) error {
+	name = strings.Replace(name, ":", "__", -1)
+	_, err := fmt.Fprintf(w, "__start_%s()\n", name)
+	if err != nil {
+		return err
+	}
+	_, err = fmt.Fprintf(w, `{
+    local cur prev words cword
+    declare -A flaghash 2>/dev/null || :
+    if declare -F _init_completion >/dev/null 2>&1; then
+        _init_completion -s || return
+    else
+        __my_init_completion -n "=" || return
+    fi
+
+    local c=0
+    local flags=()
+    local two_word_flags=()
+    local flags_with_completion=()
+    local flags_completion=()
+    local commands=("%s")
+    local must_have_one_flag=()
+    local must_have_one_noun=()
+    local last_command
+    local nouns=()
+
+    __handle_word
+}
+
+`, name)
+	if err != nil {
+		return err
+	}
+	_, err = fmt.Fprintf(w, `if [[ $(type -t compopt) = "builtin" ]]; then
+    complete -o default -F __start_%s %s
+else
+    complete -o default -o nospace -F __start_%s %s
+fi
+
+`, name, name, name, name)
+	if err != nil {
+		return err
+	}
+	_, err = fmt.Fprintf(w, "# ex: ts=4 sw=4 et filetype=sh\n")
+	return err
+}
+
+func writeCommands(cmd *Command, w io.Writer) error {
+	if _, err := fmt.Fprintf(w, "    commands=()\n"); err != nil {
+		return err
+	}
+	for _, c := range cmd.Commands() {
+		if !c.IsAvailableCommand() || c == cmd.helpCommand {
+			continue
+		}
+		if _, err := fmt.Fprintf(w, "    commands+=(%q)\n", c.Name()); err != nil {
+			return err
+		}
+	}
+	_, err := fmt.Fprintf(w, "\n")
+	return err
+}
+
+func writeFlagHandler(name string, annotations map[string][]string, w io.Writer) error {
+	for key, value := range annotations {
+		switch key {
+		case BashCompFilenameExt:
+			_, err := fmt.Fprintf(w, "    flags_with_completion+=(%q)\n", name)
+			if err != nil {
+				return err
+			}
+
+			if len(value) > 0 {
+				ext := "__handle_filename_extension_flag " + strings.Join(value, "|")
+				_, err = fmt.Fprintf(w, "    flags_completion+=(%q)\n", ext)
+			} else {
+				ext := "_filedir"
+				_, err = fmt.Fprintf(w, "    flags_completion+=(%q)\n", ext)
+			}
+			if err != nil {
+				return err
+			}
+		case BashCompCustom:
+			_, err := fmt.Fprintf(w, "    flags_with_completion+=(%q)\n", name)
+			if err != nil {
+				return err
+			}
+			if len(value) > 0 {
+				handlers := strings.Join(value, "; ")
+				_, err = fmt.Fprintf(w, "    flags_completion+=(%q)\n", handlers)
+			} else {
+				_, err = fmt.Fprintf(w, "    flags_completion+=(:)\n")
+			}
+			if err != nil {
+				return err
+			}
+		case BashCompSubdirsInDir:
+			_, err := fmt.Fprintf(w, "    flags_with_completion+=(%q)\n", name)
+
+			if len(value) == 1 {
+				ext := "__handle_subdirs_in_dir_flag " + value[0]
+				_, err = fmt.Fprintf(w, "    flags_completion+=(%q)\n", ext)
+			} else {
+				ext := "_filedir -d"
+				_, err = fmt.Fprintf(w, "    flags_completion+=(%q)\n", ext)
+			}
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func writeShortFlag(flag *pflag.Flag, w io.Writer) error {
+	b := (flag.Value.Type() == "bool")
+	name := flag.Shorthand
+	format := "    "
+	if !b {
+		format += "two_word_"
+	}
+	format += "flags+=(\"-%s\")\n"
+	if _, err := fmt.Fprintf(w, format, name); err != nil {
+		return err
+	}
+	return writeFlagHandler("-"+name, flag.Annotations, w)
+}
+
+func writeFlag(flag *pflag.Flag, w io.Writer) error {
+	b := (flag.Value.Type() == "bool")
+	name := flag.Name
+	format := "    flags+=(\"--%s"
+	if !b {
+		format += "="
+	}
+	format += "\")\n"
+	if _, err := fmt.Fprintf(w, format, name); err != nil {
+		return err
+	}
+	return writeFlagHandler("--"+name, flag.Annotations, w)
+}
+
+func writeFlags(cmd *Command, w io.Writer) error {
+	_, err := fmt.Fprintf(w, `    flags=()
+    two_word_flags=()
+    flags_with_completion=()
+    flags_completion=()
+
+`)
+	if err != nil {
+		return err
+	}
+	var visitErr error
+	cmd.NonInheritedFlags().VisitAll(func(flag *pflag.Flag) {
+		if err := writeFlag(flag, w); err != nil {
+			visitErr = err
+			return
+		}
+		if len(flag.Shorthand) > 0 {
+			if err := writeShortFlag(flag, w); err != nil {
+				visitErr = err
+				return
+			}
+		}
+	})
+	if visitErr != nil {
+		return visitErr
+	}
+	cmd.InheritedFlags().VisitAll(func(flag *pflag.Flag) {
+		if err := writeFlag(flag, w); err != nil {
+			visitErr = err
+			return
+		}
+		if len(flag.Shorthand) > 0 {
+			if err := writeShortFlag(flag, w); err != nil {
+				visitErr = err
+				return
+			}
+		}
+	})
+	if visitErr != nil {
+		return visitErr
+	}
+
+	_, err = fmt.Fprintf(w, "\n")
+	return err
+}
+
+func writeRequiredFlag(cmd *Command, w io.Writer) error {
+	if _, err := fmt.Fprintf(w, "    must_have_one_flag=()\n"); err != nil {
+		return err
+	}
+	flags := cmd.NonInheritedFlags()
+	var visitErr error
+	flags.VisitAll(func(flag *pflag.Flag) {
+		for key := range flag.Annotations {
+			switch key {
+			case BashCompOneRequiredFlag:
+				format := "    must_have_one_flag+=(\"--%s"
+				b := (flag.Value.Type() == "bool")
+				if !b {
+					format += "="
+				}
+				format += "\")\n"
+				if _, err := fmt.Fprintf(w, format, flag.Name); err != nil {
+					visitErr = err
+					return
+				}
+
+				if len(flag.Shorthand) > 0 {
+					if _, err := fmt.Fprintf(w, "    must_have_one_flag+=(\"-%s\")\n", flag.Shorthand); err != nil {
+						visitErr = err
+						return
+					}
+				}
+			}
+		}
+	})
+	return visitErr
+}
+
+func writeRequiredNouns(cmd *Command, w io.Writer) error {
+	if _, err := fmt.Fprintf(w, "    must_have_one_noun=()\n"); err != nil {
+		return err
+	}
+	sort.Sort(sort.StringSlice(cmd.ValidArgs))
+	for _, value := range cmd.ValidArgs {
+		if _, err := fmt.Fprintf(w, "    must_have_one_noun+=(%q)\n", value); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func writeArgAliases(cmd *Command, w io.Writer) error {
+	if _, err := fmt.Fprintf(w, "    noun_aliases=()\n"); err != nil {
+		return err
+	}
+	sort.Sort(sort.StringSlice(cmd.ArgAliases))
+	for _, value := range cmd.ArgAliases {
+		if _, err := fmt.Fprintf(w, "    noun_aliases+=(%q)\n", value); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func gen(cmd *Command, w io.Writer) error {
+	for _, c := range cmd.Commands() {
+		if !c.IsAvailableCommand() || c == cmd.helpCommand {
+			continue
+		}
+		if err := gen(c, w); err != nil {
+			return err
+		}
+	}
+	commandName := cmd.CommandPath()
+	commandName = strings.Replace(commandName, " ", "_", -1)
+	commandName = strings.Replace(commandName, ":", "__", -1)
+	if _, err := fmt.Fprintf(w, "_%s()\n{\n", commandName); err != nil {
+		return err
+	}
+	if _, err := fmt.Fprintf(w, "    last_command=%q\n", commandName); err != nil {
+		return err
+	}
+	if err := writeCommands(cmd, w); err != nil {
+		return err
+	}
+	if err := writeFlags(cmd, w); err != nil {
+		return err
+	}
+	if err := writeRequiredFlag(cmd, w); err != nil {
+		return err
+	}
+	if err := writeRequiredNouns(cmd, w); err != nil {
+		return err
+	}
+	if err := writeArgAliases(cmd, w); err != nil {
+		return err
+	}
+	if _, err := fmt.Fprintf(w, "}\n\n"); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (cmd *Command) GenBashCompletion(w io.Writer) error {
+	if err := preamble(w, cmd.Name()); err != nil {
+		return err
+	}
+	if len(cmd.BashCompletionFunction) > 0 {
+		if _, err := fmt.Fprintf(w, "%s\n", cmd.BashCompletionFunction); err != nil {
+			return err
+		}
+	}
+	if err := gen(cmd, w); err != nil {
+		return err
+	}
+	return postscript(w, cmd.Name())
+}
+
+func (cmd *Command) GenBashCompletionFile(filename string) error {
+	outFile, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer outFile.Close()
+
+	return cmd.GenBashCompletion(outFile)
+}
+
+// MarkFlagRequired adds the BashCompOneRequiredFlag annotation to the named flag, if it exists.
+func (cmd *Command) MarkFlagRequired(name string) error {
+	return MarkFlagRequired(cmd.Flags(), name)
+}
+
+// MarkPersistentFlagRequired adds the BashCompOneRequiredFlag annotation to the named persistent flag, if it exists.
+func (cmd *Command) MarkPersistentFlagRequired(name string) error {
+	return MarkFlagRequired(cmd.PersistentFlags(), name)
+}
+
+// MarkFlagRequired adds the BashCompOneRequiredFlag annotation to the named flag in the flag set, if it exists.
+func MarkFlagRequired(flags *pflag.FlagSet, name string) error {
+	return flags.SetAnnotation(name, BashCompOneRequiredFlag, []string{"true"})
+}
+
+// MarkFlagFilename adds the BashCompFilenameExt annotation to the named flag, if it exists.
+// Generated bash autocompletion will select filenames for the flag, limiting to named extensions if provided.
+func (cmd *Command) MarkFlagFilename(name string, extensions ...string) error {
+	return MarkFlagFilename(cmd.Flags(), name, extensions...)
+}
+
+// MarkFlagCustom adds the BashCompCustom annotation to the named flag, if it exists.
+// Generated bash autocompletion will call the bash function f for the flag.
+func (cmd *Command) MarkFlagCustom(name string, f string) error {
+	return MarkFlagCustom(cmd.Flags(), name, f)
+}
+
+// MarkPersistentFlagFilename adds the BashCompFilenameExt annotation to the named persistent flag, if it exists.
+// Generated bash autocompletion will select filenames for the flag, limiting to named extensions if provided.
+func (cmd *Command) MarkPersistentFlagFilename(name string, extensions ...string) error {
+	return MarkFlagFilename(cmd.PersistentFlags(), name, extensions...)
+}
+
+// MarkFlagFilename adds the BashCompFilenameExt annotation to the named flag in the flag set, if it exists.
+// Generated bash autocompletion will select filenames for the flag, limiting to named extensions if provided.
+func MarkFlagFilename(flags *pflag.FlagSet, name string, extensions ...string) error {
+	return flags.SetAnnotation(name, BashCompFilenameExt, extensions)
+}
+
+// MarkFlagCustom adds the BashCompCustom annotation to the named flag in the flag set, if it exists.
+// Generated bash autocompletion will call the bash function f for the flag.
+func MarkFlagCustom(flags *pflag.FlagSet, name string, f string) error {
+	return flags.SetAnnotation(name, BashCompCustom, []string{f})
+}
diff --git a/vendor/github.com/spf13/cobra/cobra.go b/vendor/github.com/spf13/cobra/cobra.go
new file mode 100644
index 0000000000..0c4e2e5de1
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/cobra.go
@@ -0,0 +1,171 @@
+// Copyright © 2013 Steve Francia <spf@spf13.com>.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Commands similar to git, go tools and other modern CLI tools
+// inspired by go, go-Commander, gh and subcommand
+
+package cobra
+
+import (
+	"fmt"
+	"io"
+	"reflect"
+	"strconv"
+	"strings"
+	"text/template"
+	"unicode"
+)
+
+var templateFuncs = template.FuncMap{
+	"trim":               strings.TrimSpace,
+	"trimRightSpace":     trimRightSpace,
+	"appendIfNotPresent": appendIfNotPresent,
+	"rpad":               rpad,
+	"gt":                 Gt,
+	"eq":                 Eq,
+}
+
+var initializers []func()
+
+// automatic prefix matching can be a dangerous thing to automatically enable in CLI tools.
+// Set this to true to enable it
+var EnablePrefixMatching = false
+
+//AddTemplateFunc adds a template function that's available to Usage and Help
+//template generation.
+func AddTemplateFunc(name string, tmplFunc interface{}) {
+	templateFuncs[name] = tmplFunc
+}
+
+//AddTemplateFuncs adds multiple template functions availalble to Usage and
+//Help template generation.
+func AddTemplateFuncs(tmplFuncs template.FuncMap) {
+	for k, v := range tmplFuncs {
+		templateFuncs[k] = v
+	}
+}
+
+//OnInitialize takes a series of func() arguments and appends them to a slice of func().
+func OnInitialize(y ...func()) {
+	for _, x := range y {
+		initializers = append(initializers, x)
+	}
+}
+
+//Gt takes two types and checks whether the first type is greater than the second. In case of types Arrays, Chans,
+//Maps and Slices, Gt will compare their lengths. Ints are compared directly while strings are first parsed as
+//ints and then compared.
+func Gt(a interface{}, b interface{}) bool {
+	var left, right int64
+	av := reflect.ValueOf(a)
+
+	switch av.Kind() {
+	case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
+		left = int64(av.Len())
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		left = av.Int()
+	case reflect.String:
+		left, _ = strconv.ParseInt(av.String(), 10, 64)
+	}
+
+	bv := reflect.ValueOf(b)
+
+	switch bv.Kind() {
+	case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
+		right = int64(bv.Len())
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		right = bv.Int()
+	case reflect.String:
+		right, _ = strconv.ParseInt(bv.String(), 10, 64)
+	}
+
+	return left > right
+}
+
+//Eq takes two types and checks whether they are equal. Supported types are int and string. Unsupported types will panic.
+func Eq(a interface{}, b interface{}) bool {
+	av := reflect.ValueOf(a)
+	bv := reflect.ValueOf(b)
+
+	switch av.Kind() {
+	case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
+		panic("Eq called on unsupported type")
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return av.Int() == bv.Int()
+	case reflect.String:
+		return av.String() == bv.String()
+	}
+	return false
+}
+
+func trimRightSpace(s string) string {
+	return strings.TrimRightFunc(s, unicode.IsSpace)
+}
+
+// appendIfNotPresent will append stringToAppend to the end of s, but only if it's not yet present in s
+func appendIfNotPresent(s, stringToAppend string) string {
+	if strings.Contains(s, stringToAppend) {
+		return s
+	}
+	return s + " " + stringToAppend
+}
+
+//rpad adds padding to the right of a string
+func rpad(s string, padding int) string {
+	template := fmt.Sprintf("%%-%ds", padding)
+	return fmt.Sprintf(template, s)
+}
+
+// tmpl executes the given template text on data, writing the result to w.
+func tmpl(w io.Writer, text string, data interface{}) error {
+	t := template.New("top")
+	t.Funcs(templateFuncs)
+	template.Must(t.Parse(text))
+	return t.Execute(w, data)
+}
+
+// ld compares two strings and returns the levenshtein distance between them
+func ld(s, t string, ignoreCase bool) int {
+	if ignoreCase {
+		s = strings.ToLower(s)
+		t = strings.ToLower(t)
+	}
+	d := make([][]int, len(s)+1)
+	for i := range d {
+		d[i] = make([]int, len(t)+1)
+	}
+	for i := range d {
+		d[i][0] = i
+	}
+	for j := range d[0] {
+		d[0][j] = j
+	}
+	for j := 1; j <= len(t); j++ {
+		for i := 1; i <= len(s); i++ {
+			if s[i-1] == t[j-1] {
+				d[i][j] = d[i-1][j-1]
+			} else {
+				min := d[i-1][j]
+				if d[i][j-1] < min {
+					min = d[i][j-1]
+				}
+				if d[i-1][j-1] < min {
+					min = d[i-1][j-1]
+				}
+				d[i][j] = min + 1
+			}
+		}
+
+	}
+	return d[len(s)][len(t)]
+}
diff --git a/vendor/github.com/spf13/cobra/command.go b/vendor/github.com/spf13/cobra/command.go
new file mode 100644
index 0000000000..0efeeb1957
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/command.go
@@ -0,0 +1,1193 @@
+// Copyright © 2013 Steve Francia <spf@spf13.com>.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//Package cobra is a commander providing a simple interface to create powerful modern CLI interfaces.
+//In addition to providing an interface, Cobra simultaneously provides a controller to organize your application code.
+package cobra
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+
+	flag "github.com/spf13/pflag"
+)
+
+// Command is just that, a command for your application.
+// eg.  'go run' ... 'run' is the command. Cobra requires
+// you to define the usage and description as part of your command
+// definition to ensure usability.
+type Command struct {
+	// Name is the command name, usually the executable's name.
+	name string
+	// The one-line usage message.
+	Use string
+	// An array of aliases that can be used instead of the first word in Use.
+	Aliases []string
+	// An array of command names for which this command will be suggested - similar to aliases but only suggests.
+	SuggestFor []string
+	// The short description shown in the 'help' output.
+	Short string
+	// The long message shown in the 'help <this-command>' output.
+	Long string
+	// Examples of how to use the command
+	Example string
+	// List of all valid non-flag arguments that are accepted in bash completions
+	ValidArgs []string
+	// List of aliases for ValidArgs. These are not suggested to the user in the bash
+	// completion, but accepted if entered manually.
+	ArgAliases []string
+	// Custom functions used by the bash autocompletion generator
+	BashCompletionFunction string
+	// Is this command deprecated and should print this string when used?
+	Deprecated string
+	// Is this command hidden and should NOT show up in the list of available commands?
+	Hidden bool
+	// Full set of flags
+	flags *flag.FlagSet
+	// Set of flags childrens of this command will inherit
+	pflags *flag.FlagSet
+	// Flags that are declared specifically by this command (not inherited).
+	lflags *flag.FlagSet
+	// SilenceErrors is an option to quiet errors down stream
+	SilenceErrors bool
+	// Silence Usage is an option to silence usage when an error occurs.
+	SilenceUsage bool
+	// The *Run functions are executed in the following order:
+	//   * PersistentPreRun()
+	//   * PreRun()
+	//   * Run()
+	//   * PostRun()
+	//   * PersistentPostRun()
+	// All functions get the same args, the arguments after the command name
+	// PersistentPreRun: children of this command will inherit and execute
+	PersistentPreRun func(cmd *Command, args []string)
+	// PersistentPreRunE: PersistentPreRun but returns an error
+	PersistentPreRunE func(cmd *Command, args []string) error
+	// PreRun: children of this command will not inherit.
+	PreRun func(cmd *Command, args []string)
+	// PreRunE: PreRun but returns an error
+	PreRunE func(cmd *Command, args []string) error
+	// Run: Typically the actual work function. Most commands will only implement this
+	Run func(cmd *Command, args []string)
+	// RunE: Run but returns an error
+	RunE func(cmd *Command, args []string) error
+	// PostRun: run after the Run command.
+	PostRun func(cmd *Command, args []string)
+	// PostRunE: PostRun but returns an error
+	PostRunE func(cmd *Command, args []string) error
+	// PersistentPostRun: children of this command will inherit and execute after PostRun
+	PersistentPostRun func(cmd *Command, args []string)
+	// PersistentPostRunE: PersistentPostRun but returns an error
+	PersistentPostRunE func(cmd *Command, args []string) error
+	// DisableAutoGenTag remove
+	DisableAutoGenTag bool
+	// Commands is the list of commands supported by this program.
+	commands []*Command
+	// Parent Command for this command
+	parent *Command
+	// max lengths of commands' string lengths for use in padding
+	commandsMaxUseLen         int
+	commandsMaxCommandPathLen int
+	commandsMaxNameLen        int
+
+	flagErrorBuf *bytes.Buffer
+
+	args          []string                 // actual args parsed from flags
+	output        *io.Writer               // nil means stderr; use Out() method instead
+	usageFunc     func(*Command) error     // Usage can be defined by application
+	usageTemplate string                   // Can be defined by Application
+	helpTemplate  string                   // Can be defined by Application
+	helpFunc      func(*Command, []string) // Help can be defined by application
+	helpCommand   *Command                 // The help command
+	// The global normalization function that we can use on every pFlag set and children commands
+	globNormFunc func(f *flag.FlagSet, name string) flag.NormalizedName
+
+	// Disable the suggestions based on Levenshtein distance that go along with 'unknown command' messages
+	DisableSuggestions bool
+	// If displaying suggestions, allows to set the minimum levenshtein distance to display, must be > 0
+	SuggestionsMinimumDistance int
+}
+
+// os.Args[1:] by default, if desired, can be overridden
+// particularly useful when testing.
+func (c *Command) SetArgs(a []string) {
+	c.args = a
+}
+
+func (c *Command) getOut(def io.Writer) io.Writer {
+	if c.output != nil {
+		return *c.output
+	}
+
+	if c.HasParent() {
+		return c.parent.Out()
+	}
+	return def
+}
+
+func (c *Command) Out() io.Writer {
+	return c.getOut(os.Stderr)
+}
+
+func (c *Command) getOutOrStdout() io.Writer {
+	return c.getOut(os.Stdout)
+}
+
+// SetOutput sets the destination for usage and error messages.
+// If output is nil, os.Stderr is used.
+func (c *Command) SetOutput(output io.Writer) {
+	c.output = &output
+}
+
+// Usage can be defined by application
+func (c *Command) SetUsageFunc(f func(*Command) error) {
+	c.usageFunc = f
+}
+
+// Can be defined by Application
+func (c *Command) SetUsageTemplate(s string) {
+	c.usageTemplate = s
+}
+
+// Can be defined by Application
+func (c *Command) SetHelpFunc(f func(*Command, []string)) {
+	c.helpFunc = f
+}
+
+func (c *Command) SetHelpCommand(cmd *Command) {
+	c.helpCommand = cmd
+}
+
+// Can be defined by Application
+func (c *Command) SetHelpTemplate(s string) {
+	c.helpTemplate = s
+}
+
+// SetGlobalNormalizationFunc sets a normalization function to all flag sets and also to child commands.
+// The user should not have a cyclic dependency on commands.
+func (c *Command) SetGlobalNormalizationFunc(n func(f *flag.FlagSet, name string) flag.NormalizedName) {
+	c.Flags().SetNormalizeFunc(n)
+	c.PersistentFlags().SetNormalizeFunc(n)
+	c.globNormFunc = n
+
+	for _, command := range c.commands {
+		command.SetGlobalNormalizationFunc(n)
+	}
+}
+
+func (c *Command) UsageFunc() (f func(*Command) error) {
+	if c.usageFunc != nil {
+		return c.usageFunc
+	}
+
+	if c.HasParent() {
+		return c.parent.UsageFunc()
+	}
+	return func(c *Command) error {
+		err := tmpl(c.Out(), c.UsageTemplate(), c)
+		if err != nil {
+			fmt.Print(err)
+		}
+		return err
+	}
+}
+
+// HelpFunc returns either the function set by SetHelpFunc for this command
+// or a parent, or it returns a function which calls c.Help()
+func (c *Command) HelpFunc() func(*Command, []string) {
+	cmd := c
+	for cmd != nil {
+		if cmd.helpFunc != nil {
+			return cmd.helpFunc
+		}
+		cmd = cmd.parent
+	}
+	return func(*Command, []string) {
+		err := c.Help()
+		if err != nil {
+			c.Println(err)
+		}
+	}
+}
+
+var minUsagePadding = 25
+
+func (c *Command) UsagePadding() int {
+	if c.parent == nil || minUsagePadding > c.parent.commandsMaxUseLen {
+		return minUsagePadding
+	}
+	return c.parent.commandsMaxUseLen
+}
+
+var minCommandPathPadding = 11
+
+//
+func (c *Command) CommandPathPadding() int {
+	if c.parent == nil || minCommandPathPadding > c.parent.commandsMaxCommandPathLen {
+		return minCommandPathPadding
+	}
+	return c.parent.commandsMaxCommandPathLen
+}
+
+var minNamePadding = 11
+
+func (c *Command) NamePadding() int {
+	if c.parent == nil || minNamePadding > c.parent.commandsMaxNameLen {
+		return minNamePadding
+	}
+	return c.parent.commandsMaxNameLen
+}
+
+func (c *Command) UsageTemplate() string {
+	if c.usageTemplate != "" {
+		return c.usageTemplate
+	}
+
+	if c.HasParent() {
+		return c.parent.UsageTemplate()
+	}
+	return `Usage:{{if .Runnable}}
+  {{if .HasFlags}}{{appendIfNotPresent .UseLine "[flags]"}}{{else}}{{.UseLine}}{{end}}{{end}}{{if .HasSubCommands}}
+  {{ .CommandPath}} [command]{{end}}{{if gt .Aliases 0}}
+
+Aliases:
+  {{.NameAndAliases}}
+{{end}}{{if .HasExample}}
+
+Examples:
+{{ .Example }}{{end}}{{ if .HasAvailableSubCommands}}
+
+Available Commands:{{range .Commands}}{{if .IsAvailableCommand}}
+  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{ if .HasLocalFlags}}
+
+Flags:
+{{.LocalFlags.FlagUsages | trimRightSpace}}{{end}}{{ if .HasInheritedFlags}}
+
+Global Flags:
+{{.InheritedFlags.FlagUsages | trimRightSpace}}{{end}}{{if .HasHelpSubCommands}}
+
+Additional help topics:{{range .Commands}}{{if .IsHelpCommand}}
+  {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{ if .HasSubCommands }}
+
+Use "{{.CommandPath}} [command] --help" for more information about a command.{{end}}
+`
+}
+
+func (c *Command) HelpTemplate() string {
+	if c.helpTemplate != "" {
+		return c.helpTemplate
+	}
+
+	if c.HasParent() {
+		return c.parent.HelpTemplate()
+	}
+	return `{{with or .Long .Short }}{{. | trim}}
+
+{{end}}{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
+}
+
+// Really only used when casting a command to a commander
+func (c *Command) resetChildrensParents() {
+	for _, x := range c.commands {
+		x.parent = c
+	}
+}
+
+// Test if the named flag is a boolean flag.
+func isBooleanFlag(name string, f *flag.FlagSet) bool {
+	flag := f.Lookup(name)
+	if flag == nil {
+		return false
+	}
+	return flag.Value.Type() == "bool"
+}
+
+// Test if the named flag is a boolean flag.
+func isBooleanShortFlag(name string, f *flag.FlagSet) bool {
+	result := false
+	f.VisitAll(func(f *flag.Flag) {
+		if f.Shorthand == name && f.Value.Type() == "bool" {
+			result = true
+		}
+	})
+	return result
+}
+
+func stripFlags(args []string, c *Command) []string {
+	if len(args) < 1 {
+		return args
+	}
+	c.mergePersistentFlags()
+
+	commands := []string{}
+
+	inQuote := false
+	inFlag := false
+	for _, y := range args {
+		if !inQuote {
+			switch {
+			case strings.HasPrefix(y, "\""):
+				inQuote = true
+			case strings.Contains(y, "=\""):
+				inQuote = true
+			case strings.HasPrefix(y, "--") && !strings.Contains(y, "="):
+				// TODO: this isn't quite right, we should really check ahead for 'true' or 'false'
+				inFlag = !isBooleanFlag(y[2:], c.Flags())
+			case strings.HasPrefix(y, "-") && !strings.Contains(y, "=") && len(y) == 2 && !isBooleanShortFlag(y[1:], c.Flags()):
+				inFlag = true
+			case inFlag:
+				inFlag = false
+			case y == "":
+				// strip empty commands, as the go tests expect this to be ok....
+			case !strings.HasPrefix(y, "-"):
+				commands = append(commands, y)
+				inFlag = false
+			}
+		}
+
+		if strings.HasSuffix(y, "\"") && !strings.HasSuffix(y, "\\\"") {
+			inQuote = false
+		}
+	}
+
+	return commands
+}
+
+// argsMinusFirstX removes only the first x from args.  Otherwise, commands that look like
+// openshift admin policy add-role-to-user admin my-user, lose the admin argument (arg[4]).
+func argsMinusFirstX(args []string, x string) []string {
+	for i, y := range args {
+		if x == y {
+			ret := []string{}
+			ret = append(ret, args[:i]...)
+			ret = append(ret, args[i+1:]...)
+			return ret
+		}
+	}
+	return args
+}
+
+// find the target command given the args and command tree
+// Meant to be run on the highest node. Only searches down.
+func (c *Command) Find(args []string) (*Command, []string, error) {
+	if c == nil {
+		return nil, nil, fmt.Errorf("Called find() on a nil Command")
+	}
+
+	var innerfind func(*Command, []string) (*Command, []string)
+
+	innerfind = func(c *Command, innerArgs []string) (*Command, []string) {
+		argsWOflags := stripFlags(innerArgs, c)
+		if len(argsWOflags) == 0 {
+			return c, innerArgs
+		}
+		nextSubCmd := argsWOflags[0]
+		matches := make([]*Command, 0)
+		for _, cmd := range c.commands {
+			if cmd.Name() == nextSubCmd || cmd.HasAlias(nextSubCmd) { // exact name or alias match
+				return innerfind(cmd, argsMinusFirstX(innerArgs, nextSubCmd))
+			}
+			if EnablePrefixMatching {
+				if strings.HasPrefix(cmd.Name(), nextSubCmd) { // prefix match
+					matches = append(matches, cmd)
+				}
+				for _, x := range cmd.Aliases {
+					if strings.HasPrefix(x, nextSubCmd) {
+						matches = append(matches, cmd)
+					}
+				}
+			}
+		}
+
+		// only accept a single prefix match - multiple matches would be ambiguous
+		if len(matches) == 1 {
+			return innerfind(matches[0], argsMinusFirstX(innerArgs, argsWOflags[0]))
+		}
+
+		return c, innerArgs
+	}
+
+	commandFound, a := innerfind(c, args)
+	argsWOflags := stripFlags(a, commandFound)
+
+	// no subcommand, always take args
+	if !commandFound.HasSubCommands() {
+		return commandFound, a, nil
+	}
+
+	// root command with subcommands, do subcommand checking
+	if commandFound == c && len(argsWOflags) > 0 {
+		suggestionsString := ""
+		if !c.DisableSuggestions {
+			if c.SuggestionsMinimumDistance <= 0 {
+				c.SuggestionsMinimumDistance = 2
+			}
+			if suggestions := c.SuggestionsFor(argsWOflags[0]); len(suggestions) > 0 {
+				suggestionsString += "\n\nDid you mean this?\n"
+				for _, s := range suggestions {
+					suggestionsString += fmt.Sprintf("\t%v\n", s)
+				}
+			}
+		}
+		return commandFound, a, fmt.Errorf("unknown command %q for %q%s", argsWOflags[0], commandFound.CommandPath(), suggestionsString)
+	}
+
+	return commandFound, a, nil
+}
+
+func (c *Command) SuggestionsFor(typedName string) []string {
+	suggestions := []string{}
+	for _, cmd := range c.commands {
+		if cmd.IsAvailableCommand() {
+			levenshteinDistance := ld(typedName, cmd.Name(), true)
+			suggestByLevenshtein := levenshteinDistance <= c.SuggestionsMinimumDistance
+			suggestByPrefix := strings.HasPrefix(strings.ToLower(cmd.Name()), strings.ToLower(typedName))
+			if suggestByLevenshtein || suggestByPrefix {
+				suggestions = append(suggestions, cmd.Name())
+			}
+			for _, explicitSuggestion := range cmd.SuggestFor {
+				if strings.EqualFold(typedName, explicitSuggestion) {
+					suggestions = append(suggestions, cmd.Name())
+				}
+			}
+		}
+	}
+	return suggestions
+}
+
+func (c *Command) VisitParents(fn func(*Command)) {
+	var traverse func(*Command) *Command
+
+	traverse = func(x *Command) *Command {
+		if x != c {
+			fn(x)
+		}
+		if x.HasParent() {
+			return traverse(x.parent)
+		}
+		return x
+	}
+	traverse(c)
+}
+
+func (c *Command) Root() *Command {
+	var findRoot func(*Command) *Command
+
+	findRoot = func(x *Command) *Command {
+		if x.HasParent() {
+			return findRoot(x.parent)
+		}
+		return x
+	}
+
+	return findRoot(c)
+}
+
+// ArgsLenAtDash will return the length of f.Args at the moment when a -- was
+// found during arg parsing. This allows your program to know which args were
+// before the -- and which came after. (Description from
+// https://godoc.org/github.com/spf13/pflag#FlagSet.ArgsLenAtDash).
+func (c *Command) ArgsLenAtDash() int {
+	return c.Flags().ArgsLenAtDash()
+}
+
+func (c *Command) execute(a []string) (err error) {
+	if c == nil {
+		return fmt.Errorf("Called Execute() on a nil Command")
+	}
+
+	if len(c.Deprecated) > 0 {
+		c.Printf("Command %q is deprecated, %s\n", c.Name(), c.Deprecated)
+	}
+
+	// initialize help flag as the last point possible to allow for user
+	// overriding
+	c.initHelpFlag()
+
+	err = c.ParseFlags(a)
+	if err != nil {
+		return err
+	}
+	// If help is called, regardless of other flags, return we want help
+	// Also say we need help if the command isn't runnable.
+	helpVal, err := c.Flags().GetBool("help")
+	if err != nil {
+		// should be impossible to get here as we always declare a help
+		// flag in initHelpFlag()
+		c.Println("\"help\" flag declared as non-bool. Please correct your code")
+		return err
+	}
+	if helpVal || !c.Runnable() {
+		return flag.ErrHelp
+	}
+
+	c.preRun()
+	argWoFlags := c.Flags().Args()
+
+	for p := c; p != nil; p = p.Parent() {
+		if p.PersistentPreRunE != nil {
+			if err := p.PersistentPreRunE(c, argWoFlags); err != nil {
+				return err
+			}
+			break
+		} else if p.PersistentPreRun != nil {
+			p.PersistentPreRun(c, argWoFlags)
+			break
+		}
+	}
+	if c.PreRunE != nil {
+		if err := c.PreRunE(c, argWoFlags); err != nil {
+			return err
+		}
+	} else if c.PreRun != nil {
+		c.PreRun(c, argWoFlags)
+	}
+
+	if c.RunE != nil {
+		if err := c.RunE(c, argWoFlags); err != nil {
+			return err
+		}
+	} else {
+		c.Run(c, argWoFlags)
+	}
+	if c.PostRunE != nil {
+		if err := c.PostRunE(c, argWoFlags); err != nil {
+			return err
+		}
+	} else if c.PostRun != nil {
+		c.PostRun(c, argWoFlags)
+	}
+	for p := c; p != nil; p = p.Parent() {
+		if p.PersistentPostRunE != nil {
+			if err := p.PersistentPostRunE(c, argWoFlags); err != nil {
+				return err
+			}
+			break
+		} else if p.PersistentPostRun != nil {
+			p.PersistentPostRun(c, argWoFlags)
+			break
+		}
+	}
+
+	return nil
+}
+
+func (c *Command) preRun() {
+	for _, x := range initializers {
+		x()
+	}
+}
+
+func (c *Command) errorMsgFromParse() string {
+	s := c.flagErrorBuf.String()
+
+	x := strings.Split(s, "\n")
+
+	if len(x) > 0 {
+		return x[0]
+	}
+	return ""
+}
+
+// Call execute to use the args (os.Args[1:] by default)
+// and run through the command tree finding appropriate matches
+// for commands and then corresponding flags.
+func (c *Command) Execute() error {
+	_, err := c.ExecuteC()
+	return err
+}
+
+func (c *Command) ExecuteC() (cmd *Command, err error) {
+
+	// Regardless of what command execute is called on, run on Root only
+	if c.HasParent() {
+		return c.Root().ExecuteC()
+	}
+
+	// windows hook
+	if preExecHookFn != nil {
+		preExecHookFn(c)
+	}
+
+	// initialize help as the last point possible to allow for user
+	// overriding
+	c.initHelpCmd()
+
+	var args []string
+
+	// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
+	if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
+		args = os.Args[1:]
+	} else {
+		args = c.args
+	}
+
+	cmd, flags, err := c.Find(args)
+	if err != nil {
+		// If found parse to a subcommand and then failed, talk about the subcommand
+		if cmd != nil {
+			c = cmd
+		}
+		if !c.SilenceErrors {
+			c.Println("Error:", err.Error())
+			c.Printf("Run '%v --help' for usage.\n", c.CommandPath())
+		}
+		return c, err
+	}
+	err = cmd.execute(flags)
+	if err != nil {
+		// Always show help if requested, even if SilenceErrors is in
+		// effect
+		if err == flag.ErrHelp {
+			cmd.HelpFunc()(cmd, args)
+			return cmd, nil
+		}
+
+		// If root command has SilentErrors flagged,
+		// all subcommands should respect it
+		if !cmd.SilenceErrors && !c.SilenceErrors {
+			c.Println("Error:", err.Error())
+		}
+
+		// If root command has SilentUsage flagged,
+		// all subcommands should respect it
+		if !cmd.SilenceUsage && !c.SilenceUsage {
+			c.Println(cmd.UsageString())
+		}
+		return cmd, err
+	}
+	return cmd, nil
+}
+
+func (c *Command) initHelpFlag() {
+	if c.Flags().Lookup("help") == nil {
+		c.Flags().BoolP("help", "h", false, "help for "+c.Name())
+	}
+}
+
+func (c *Command) initHelpCmd() {
+	if c.helpCommand == nil {
+		if !c.HasSubCommands() {
+			return
+		}
+
+		c.helpCommand = &Command{
+			Use:   "help [command]",
+			Short: "Help about any command",
+			Long: `Help provides help for any command in the application.
+    Simply type ` + c.Name() + ` help [path to command] for full details.`,
+			PersistentPreRun:  func(cmd *Command, args []string) {},
+			PersistentPostRun: func(cmd *Command, args []string) {},
+
+			Run: func(c *Command, args []string) {
+				cmd, _, e := c.Root().Find(args)
+				if cmd == nil || e != nil {
+					c.Printf("Unknown help topic %#q.", args)
+					c.Root().Usage()
+				} else {
+					helpFunc := cmd.HelpFunc()
+					helpFunc(cmd, args)
+				}
+			},
+		}
+	}
+	c.AddCommand(c.helpCommand)
+}
+
+// Used for testing
+func (c *Command) ResetCommands() {
+	c.commands = nil
+	c.helpCommand = nil
+}
+
+//Commands returns a slice of child commands.
+func (c *Command) Commands() []*Command {
+	return c.commands
+}
+
+// AddCommand adds one or more commands to this parent command.
+func (c *Command) AddCommand(cmds ...*Command) {
+	for i, x := range cmds {
+		if cmds[i] == c {
+			panic("Command can't be a child of itself")
+		}
+		cmds[i].parent = c
+		// update max lengths
+		usageLen := len(x.Use)
+		if usageLen > c.commandsMaxUseLen {
+			c.commandsMaxUseLen = usageLen
+		}
+		commandPathLen := len(x.CommandPath())
+		if commandPathLen > c.commandsMaxCommandPathLen {
+			c.commandsMaxCommandPathLen = commandPathLen
+		}
+		nameLen := len(x.Name())
+		if nameLen > c.commandsMaxNameLen {
+			c.commandsMaxNameLen = nameLen
+		}
+		// If global normalization function exists, update all children
+		if c.globNormFunc != nil {
+			x.SetGlobalNormalizationFunc(c.globNormFunc)
+		}
+		c.commands = append(c.commands, x)
+	}
+}
+
+// AddCommand removes one or more commands from a parent command.
+func (c *Command) RemoveCommand(cmds ...*Command) {
+	commands := []*Command{}
+main:
+	for _, command := range c.commands {
+		for _, cmd := range cmds {
+			if command == cmd {
+				command.parent = nil
+				continue main
+			}
+		}
+		commands = append(commands, command)
+	}
+	c.commands = commands
+	// recompute all lengths
+	c.commandsMaxUseLen = 0
+	c.commandsMaxCommandPathLen = 0
+	c.commandsMaxNameLen = 0
+	for _, command := range c.commands {
+		usageLen := len(command.Use)
+		if usageLen > c.commandsMaxUseLen {
+			c.commandsMaxUseLen = usageLen
+		}
+		commandPathLen := len(command.CommandPath())
+		if commandPathLen > c.commandsMaxCommandPathLen {
+			c.commandsMaxCommandPathLen = commandPathLen
+		}
+		nameLen := len(command.Name())
+		if nameLen > c.commandsMaxNameLen {
+			c.commandsMaxNameLen = nameLen
+		}
+	}
+}
+
+// Print is a convenience method to Print to the defined output
+func (c *Command) Print(i ...interface{}) {
+	fmt.Fprint(c.Out(), i...)
+}
+
+// Println is a convenience method to Println to the defined output
+func (c *Command) Println(i ...interface{}) {
+	str := fmt.Sprintln(i...)
+	c.Print(str)
+}
+
+// Printf is a convenience method to Printf to the defined output
+func (c *Command) Printf(format string, i ...interface{}) {
+	str := fmt.Sprintf(format, i...)
+	c.Print(str)
+}
+
+// Output the usage for the command
+// Used when a user provides invalid input
+// Can be defined by user by overriding UsageFunc
+func (c *Command) Usage() error {
+	c.mergePersistentFlags()
+	err := c.UsageFunc()(c)
+	return err
+}
+
+// Output the help for the command
+// Used when a user calls help [command]
+// by the default HelpFunc in the commander
+func (c *Command) Help() error {
+	c.mergePersistentFlags()
+	err := tmpl(c.getOutOrStdout(), c.HelpTemplate(), c)
+	return err
+}
+
+func (c *Command) UsageString() string {
+	tmpOutput := c.output
+	bb := new(bytes.Buffer)
+	c.SetOutput(bb)
+	c.Usage()
+	c.output = tmpOutput
+	return bb.String()
+}
+
+// CommandPath returns the full path to this command.
+func (c *Command) CommandPath() string {
+	str := c.Name()
+	x := c
+	for x.HasParent() {
+		str = x.parent.Name() + " " + str
+		x = x.parent
+	}
+	return str
+}
+
+//The full usage for a given command (including parents)
+func (c *Command) UseLine() string {
+	str := ""
+	if c.HasParent() {
+		str = c.parent.CommandPath() + " "
+	}
+	return str + c.Use
+}
+
+// For use in determining which flags have been assigned to which commands
+// and which persist
+func (c *Command) DebugFlags() {
+	c.Println("DebugFlags called on", c.Name())
+	var debugflags func(*Command)
+
+	debugflags = func(x *Command) {
+		if x.HasFlags() || x.HasPersistentFlags() {
+			c.Println(x.Name())
+		}
+		if x.HasFlags() {
+			x.flags.VisitAll(func(f *flag.Flag) {
+				if x.HasPersistentFlags() {
+					if x.persistentFlag(f.Name) == nil {
+						c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [L]")
+					} else {
+						c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [LP]")
+					}
+				} else {
+					c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [L]")
+				}
+			})
+		}
+		if x.HasPersistentFlags() {
+			x.pflags.VisitAll(func(f *flag.Flag) {
+				if x.HasFlags() {
+					if x.flags.Lookup(f.Name) == nil {
+						c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [P]")
+					}
+				} else {
+					c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [P]")
+				}
+			})
+		}
+		c.Println(x.flagErrorBuf)
+		if x.HasSubCommands() {
+			for _, y := range x.commands {
+				debugflags(y)
+			}
+		}
+	}
+
+	debugflags(c)
+}
+
+// Name returns the command's name: the first word in the use line.
+func (c *Command) Name() string {
+	if c.name != "" {
+		return c.name
+	}
+	name := c.Use
+	i := strings.Index(name, " ")
+	if i >= 0 {
+		name = name[:i]
+	}
+	return name
+}
+
+// HasAlias determines if a given string is an alias of the command.
+func (c *Command) HasAlias(s string) bool {
+	for _, a := range c.Aliases {
+		if a == s {
+			return true
+		}
+	}
+	return false
+}
+
+func (c *Command) NameAndAliases() string {
+	return strings.Join(append([]string{c.Name()}, c.Aliases...), ", ")
+}
+
+func (c *Command) HasExample() bool {
+	return len(c.Example) > 0
+}
+
+// Runnable determines if the command is itself runnable
+func (c *Command) Runnable() bool {
+	return c.Run != nil || c.RunE != nil
+}
+
+// HasSubCommands determines if the command has children commands
+func (c *Command) HasSubCommands() bool {
+	return len(c.commands) > 0
+}
+
+// IsAvailableCommand determines if a command is available as a non-help command
+// (this includes all non deprecated/hidden commands)
+func (c *Command) IsAvailableCommand() bool {
+	if len(c.Deprecated) != 0 || c.Hidden {
+		return false
+	}
+
+	if c.HasParent() && c.Parent().helpCommand == c {
+		return false
+	}
+
+	if c.Runnable() || c.HasAvailableSubCommands() {
+		return true
+	}
+
+	return false
+}
+
+// IsHelpCommand determines if a command is a 'help' command; a help command is
+// determined by the fact that it is NOT runnable/hidden/deprecated, and has no
+// sub commands that are runnable/hidden/deprecated
+func (c *Command) IsHelpCommand() bool {
+
+	// if a command is runnable, deprecated, or hidden it is not a 'help' command
+	if c.Runnable() || len(c.Deprecated) != 0 || c.Hidden {
+		return false
+	}
+
+	// if any non-help sub commands are found, the command is not a 'help' command
+	for _, sub := range c.commands {
+		if !sub.IsHelpCommand() {
+			return false
+		}
+	}
+
+	// the command either has no sub commands, or no non-help sub commands
+	return true
+}
+
+// HasHelpSubCommands determines if a command has any avilable 'help' sub commands
+// that need to be shown in the usage/help default template under 'additional help
+// topics'
+func (c *Command) HasHelpSubCommands() bool {
+
+	// return true on the first found available 'help' sub command
+	for _, sub := range c.commands {
+		if sub.IsHelpCommand() {
+			return true
+		}
+	}
+
+	// the command either has no sub commands, or no available 'help' sub commands
+	return false
+}
+
+// HasAvailableSubCommands determines if a command has available sub commands that
+// need to be shown in the usage/help default template under 'available commands'
+func (c *Command) HasAvailableSubCommands() bool {
+
+	// return true on the first found available (non deprecated/help/hidden)
+	// sub command
+	for _, sub := range c.commands {
+		if sub.IsAvailableCommand() {
+			return true
+		}
+	}
+
+	// the command either has no sub comamnds, or no available (non deprecated/help/hidden)
+	// sub commands
+	return false
+}
+
+// Determine if the command is a child command
+func (c *Command) HasParent() bool {
+	return c.parent != nil
+}
+
+// GlobalNormalizationFunc returns the global normalization function or nil if doesn't exists
+func (c *Command) GlobalNormalizationFunc() func(f *flag.FlagSet, name string) flag.NormalizedName {
+	return c.globNormFunc
+}
+
+// Get the complete FlagSet that applies to this command (local and persistent declared here and by all parents)
+func (c *Command) Flags() *flag.FlagSet {
+	if c.flags == nil {
+		c.flags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+		if c.flagErrorBuf == nil {
+			c.flagErrorBuf = new(bytes.Buffer)
+		}
+		c.flags.SetOutput(c.flagErrorBuf)
+	}
+	return c.flags
+}
+
+// Get the local FlagSet specifically set in the current command
+func (c *Command) LocalFlags() *flag.FlagSet {
+	c.mergePersistentFlags()
+
+	local := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+	c.lflags.VisitAll(func(f *flag.Flag) {
+		local.AddFlag(f)
+	})
+	if !c.HasParent() {
+		flag.CommandLine.VisitAll(func(f *flag.Flag) {
+			if local.Lookup(f.Name) == nil {
+				local.AddFlag(f)
+			}
+		})
+	}
+	return local
+}
+
+// All Flags which were inherited from parents commands
+func (c *Command) InheritedFlags() *flag.FlagSet {
+	c.mergePersistentFlags()
+
+	inherited := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+	local := c.LocalFlags()
+
+	var rmerge func(x *Command)
+
+	rmerge = func(x *Command) {
+		if x.HasPersistentFlags() {
+			x.PersistentFlags().VisitAll(func(f *flag.Flag) {
+				if inherited.Lookup(f.Name) == nil && local.Lookup(f.Name) == nil {
+					inherited.AddFlag(f)
+				}
+			})
+		}
+		if x.HasParent() {
+			rmerge(x.parent)
+		}
+	}
+
+	if c.HasParent() {
+		rmerge(c.parent)
+	}
+
+	return inherited
+}
+
+// All Flags which were not inherited from parent commands
+func (c *Command) NonInheritedFlags() *flag.FlagSet {
+	return c.LocalFlags()
+}
+
+// Get the Persistent FlagSet specifically set in the current command
+func (c *Command) PersistentFlags() *flag.FlagSet {
+	if c.pflags == nil {
+		c.pflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+		if c.flagErrorBuf == nil {
+			c.flagErrorBuf = new(bytes.Buffer)
+		}
+		c.pflags.SetOutput(c.flagErrorBuf)
+	}
+	return c.pflags
+}
+
+// For use in testing
+func (c *Command) ResetFlags() {
+	c.flagErrorBuf = new(bytes.Buffer)
+	c.flagErrorBuf.Reset()
+	c.flags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+	c.flags.SetOutput(c.flagErrorBuf)
+	c.pflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+	c.pflags.SetOutput(c.flagErrorBuf)
+}
+
+// Does the command contain any flags (local plus persistent from the entire structure)
+func (c *Command) HasFlags() bool {
+	return c.Flags().HasFlags()
+}
+
+// Does the command contain persistent flags
+func (c *Command) HasPersistentFlags() bool {
+	return c.PersistentFlags().HasFlags()
+}
+
+// Does the command has flags specifically declared locally
+func (c *Command) HasLocalFlags() bool {
+	return c.LocalFlags().HasFlags()
+}
+
+func (c *Command) HasInheritedFlags() bool {
+	return c.InheritedFlags().HasFlags()
+}
+
+// Flag climbs up the command tree looking for matching flag
+func (c *Command) Flag(name string) (flag *flag.Flag) {
+	flag = c.Flags().Lookup(name)
+
+	if flag == nil {
+		flag = c.persistentFlag(name)
+	}
+
+	return
+}
+
+// recursively find matching persistent flag
+func (c *Command) persistentFlag(name string) (flag *flag.Flag) {
+	if c.HasPersistentFlags() {
+		flag = c.PersistentFlags().Lookup(name)
+	}
+
+	if flag == nil && c.HasParent() {
+		flag = c.parent.persistentFlag(name)
+	}
+	return
+}
+
+// ParseFlags parses persistent flag tree & local flags
+func (c *Command) ParseFlags(args []string) (err error) {
+	c.mergePersistentFlags()
+	err = c.Flags().Parse(args)
+	return
+}
+
+// Parent returns a commands parent command
+func (c *Command) Parent() *Command {
+	return c.parent
+}
+
+func (c *Command) mergePersistentFlags() {
+	var rmerge func(x *Command)
+
+	// Save the set of local flags
+	if c.lflags == nil {
+		c.lflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+		if c.flagErrorBuf == nil {
+			c.flagErrorBuf = new(bytes.Buffer)
+		}
+		c.lflags.SetOutput(c.flagErrorBuf)
+		addtolocal := func(f *flag.Flag) {
+			c.lflags.AddFlag(f)
+		}
+		c.Flags().VisitAll(addtolocal)
+		c.PersistentFlags().VisitAll(addtolocal)
+	}
+	rmerge = func(x *Command) {
+		if !x.HasParent() {
+			flag.CommandLine.VisitAll(func(f *flag.Flag) {
+				if x.PersistentFlags().Lookup(f.Name) == nil {
+					x.PersistentFlags().AddFlag(f)
+				}
+			})
+		}
+		if x.HasPersistentFlags() {
+			x.PersistentFlags().VisitAll(func(f *flag.Flag) {
+				if c.Flags().Lookup(f.Name) == nil {
+					c.Flags().AddFlag(f)
+				}
+			})
+		}
+		if x.HasParent() {
+			rmerge(x.parent)
+		}
+	}
+
+	rmerge(c)
+}
diff --git a/vendor/github.com/spf13/cobra/command_notwin.go b/vendor/github.com/spf13/cobra/command_notwin.go
new file mode 100644
index 0000000000..6159c1cc19
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/command_notwin.go
@@ -0,0 +1,5 @@
+// +build !windows
+
+package cobra
+
+var preExecHookFn func(*Command)
diff --git a/vendor/github.com/spf13/cobra/command_win.go b/vendor/github.com/spf13/cobra/command_win.go
new file mode 100644
index 0000000000..4b0eaa1b6b
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/command_win.go
@@ -0,0 +1,26 @@
+// +build windows
+
+package cobra
+
+import (
+	"os"
+	"time"
+
+	"github.com/inconshreveable/mousetrap"
+)
+
+var preExecHookFn = preExecHook
+
+// enables an information splash screen on Windows if the CLI is started from explorer.exe.
+var MousetrapHelpText string = `This is a command line tool
+
+You need to open cmd.exe and run it from there.
+`
+
+func preExecHook(c *Command) {
+	if mousetrap.StartedByExplorer() {
+		c.Print(MousetrapHelpText)
+		time.Sleep(5 * time.Second)
+		os.Exit(1)
+	}
+}
diff --git a/vendor/github.com/spf13/cobra/doc/man_docs.go b/vendor/github.com/spf13/cobra/doc/man_docs.go
new file mode 100644
index 0000000000..a98674bf3a
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/doc/man_docs.go
@@ -0,0 +1,218 @@
+// Copyright 2015 Red Hat Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package doc
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+
+	mangen "github.com/cpuguy83/go-md2man/md2man"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+)
+
+// GenManTree will generate a man page for this command and all decendants
+// in the directory given. The header may be nil. This function may not work
+// correctly if your command names have - in them. If you have `cmd` with two
+// subcmds, `sub` and `sub-third`. And `sub` has a subcommand called `third`
+// it is undefined which help output will be in the file `cmd-sub-third.1`.
+func GenManTree(cmd *cobra.Command, header *GenManHeader, dir string) error {
+	if header == nil {
+		header = &GenManHeader{}
+	}
+	for _, c := range cmd.Commands() {
+		if !c.IsAvailableCommand() || c.IsHelpCommand() {
+			continue
+		}
+		if err := GenManTree(c, header, dir); err != nil {
+			return err
+		}
+	}
+	needToResetTitle := header.Title == ""
+
+	basename := strings.Replace(cmd.CommandPath(), " ", "_", -1) + ".1"
+	filename := filepath.Join(dir, basename)
+	f, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if err := GenMan(cmd, header, f); err != nil {
+		return err
+	}
+
+	if needToResetTitle {
+		header.Title = ""
+	}
+	return nil
+}
+
+// GenManHeader is a lot like the .TH header at the start of man pages. These
+// include the title, section, date, source, and manual. We will use the
+// current time if Date if unset and will use "Auto generated by spf13/cobra"
+// if the Source is unset.
+type GenManHeader struct {
+	Title   string
+	Section string
+	Date    *time.Time
+	date    string
+	Source  string
+	Manual  string
+}
+
+// GenMan will generate a man page for the given command and write it to
+// w. The header argument may be nil, however obviously w may not.
+func GenMan(cmd *cobra.Command, header *GenManHeader, w io.Writer) error {
+	if header == nil {
+		header = &GenManHeader{}
+	}
+	b := genMan(cmd, header)
+	final := mangen.Render(b)
+	_, err := w.Write(final)
+	return err
+}
+
+func fillHeader(header *GenManHeader, name string) {
+	if header.Title == "" {
+		header.Title = strings.ToUpper(strings.Replace(name, " ", "\\-", -1))
+	}
+	if header.Section == "" {
+		header.Section = "1"
+	}
+	if header.Date == nil {
+		now := time.Now()
+		header.Date = &now
+	}
+	header.date = (*header.Date).Format("Jan 2006")
+	if header.Source == "" {
+		header.Source = "Auto generated by spf13/cobra"
+	}
+}
+
+func manPreamble(out io.Writer, header *GenManHeader, name, short, long string) {
+	dashName := strings.Replace(name, " ", "-", -1)
+	fmt.Fprintf(out, `%% %s(%s)%s
+%% %s
+%% %s
+# NAME
+`, header.Title, header.Section, header.date, header.Source, header.Manual)
+	fmt.Fprintf(out, "%s \\- %s\n\n", dashName, short)
+	fmt.Fprintf(out, "# SYNOPSIS\n")
+	fmt.Fprintf(out, "**%s** [OPTIONS]\n\n", name)
+	fmt.Fprintf(out, "# DESCRIPTION\n")
+	fmt.Fprintf(out, "%s\n\n", long)
+}
+
+func manPrintFlags(out io.Writer, flags *pflag.FlagSet) {
+	flags.VisitAll(func(flag *pflag.Flag) {
+		if len(flag.Deprecated) > 0 || flag.Hidden {
+			return
+		}
+		format := ""
+		if len(flag.Shorthand) > 0 {
+			format = "**-%s**, **--%s**"
+		} else {
+			format = "%s**--%s**"
+		}
+		if len(flag.NoOptDefVal) > 0 {
+			format = format + "["
+		}
+		if flag.Value.Type() == "string" {
+			// put quotes on the value
+			format = format + "=%q"
+		} else {
+			format = format + "=%s"
+		}
+		if len(flag.NoOptDefVal) > 0 {
+			format = format + "]"
+		}
+		format = format + "\n\t%s\n\n"
+		fmt.Fprintf(out, format, flag.Shorthand, flag.Name, flag.DefValue, flag.Usage)
+	})
+}
+
+func manPrintOptions(out io.Writer, command *cobra.Command) {
+	flags := command.NonInheritedFlags()
+	if flags.HasFlags() {
+		fmt.Fprintf(out, "# OPTIONS\n")
+		manPrintFlags(out, flags)
+		fmt.Fprintf(out, "\n")
+	}
+	flags = command.InheritedFlags()
+	if flags.HasFlags() {
+		fmt.Fprintf(out, "# OPTIONS INHERITED FROM PARENT COMMANDS\n")
+		manPrintFlags(out, flags)
+		fmt.Fprintf(out, "\n")
+	}
+}
+
+func genMan(cmd *cobra.Command, header *GenManHeader) []byte {
+	// something like `rootcmd subcmd1 subcmd2`
+	commandName := cmd.CommandPath()
+	// something like `rootcmd-subcmd1-subcmd2`
+	dashCommandName := strings.Replace(commandName, " ", "-", -1)
+
+	fillHeader(header, commandName)
+
+	buf := new(bytes.Buffer)
+
+	short := cmd.Short
+	long := cmd.Long
+	if len(long) == 0 {
+		long = short
+	}
+
+	manPreamble(buf, header, commandName, short, long)
+	manPrintOptions(buf, cmd)
+	if len(cmd.Example) > 0 {
+		fmt.Fprintf(buf, "# EXAMPLE\n")
+		fmt.Fprintf(buf, "```\n%s\n```\n", cmd.Example)
+	}
+	if hasSeeAlso(cmd) {
+		fmt.Fprintf(buf, "# SEE ALSO\n")
+		seealsos := make([]string, 0)
+		if cmd.HasParent() {
+			parentPath := cmd.Parent().CommandPath()
+			dashParentPath := strings.Replace(parentPath, " ", "-", -1)
+			seealso := fmt.Sprintf("**%s(%s)**", dashParentPath, header.Section)
+			seealsos = append(seealsos, seealso)
+			cmd.VisitParents(func(c *cobra.Command) {
+				if c.DisableAutoGenTag {
+					cmd.DisableAutoGenTag = c.DisableAutoGenTag
+				}
+			})
+		}
+		children := cmd.Commands()
+		sort.Sort(byName(children))
+		for _, c := range children {
+			if !c.IsAvailableCommand() || c.IsHelpCommand() {
+				continue
+			}
+			seealso := fmt.Sprintf("**%s-%s(%s)**", dashCommandName, c.Name(), header.Section)
+			seealsos = append(seealsos, seealso)
+		}
+		fmt.Fprintf(buf, "%s\n", strings.Join(seealsos, ", "))
+	}
+	if !cmd.DisableAutoGenTag {
+		fmt.Fprintf(buf, "# HISTORY\n%s Auto generated by spf13/cobra\n", header.Date.Format("2-Jan-2006"))
+	}
+	return buf.Bytes()
+}
diff --git a/vendor/github.com/spf13/cobra/doc/md_docs.go b/vendor/github.com/spf13/cobra/doc/md_docs.go
new file mode 100644
index 0000000000..fa13631804
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/doc/md_docs.go
@@ -0,0 +1,175 @@
+//Copyright 2015 Red Hat Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package doc
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+
+	"github.com/spf13/cobra"
+)
+
+func printOptions(w io.Writer, cmd *cobra.Command, name string) error {
+	flags := cmd.NonInheritedFlags()
+	flags.SetOutput(w)
+	if flags.HasFlags() {
+		if _, err := fmt.Fprintf(w, "### Options\n\n```\n"); err != nil {
+			return err
+		}
+		flags.PrintDefaults()
+		if _, err := fmt.Fprintf(w, "```\n\n"); err != nil {
+			return err
+		}
+	}
+
+	parentFlags := cmd.InheritedFlags()
+	parentFlags.SetOutput(w)
+	if parentFlags.HasFlags() {
+		if _, err := fmt.Fprintf(w, "### Options inherited from parent commands\n\n```\n"); err != nil {
+			return err
+		}
+		parentFlags.PrintDefaults()
+		if _, err := fmt.Fprintf(w, "```\n\n"); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func GenMarkdown(cmd *cobra.Command, w io.Writer) error {
+	return GenMarkdownCustom(cmd, w, func(s string) string { return s })
+}
+
+func GenMarkdownCustom(cmd *cobra.Command, w io.Writer, linkHandler func(string) string) error {
+	name := cmd.CommandPath()
+
+	short := cmd.Short
+	long := cmd.Long
+	if len(long) == 0 {
+		long = short
+	}
+
+	if _, err := fmt.Fprintf(w, "## %s\n\n", name); err != nil {
+		return err
+	}
+	if _, err := fmt.Fprintf(w, "%s\n\n", short); err != nil {
+		return err
+	}
+	if _, err := fmt.Fprintf(w, "### Synopsis\n\n"); err != nil {
+		return err
+	}
+	if _, err := fmt.Fprintf(w, "\n%s\n\n", long); err != nil {
+		return err
+	}
+
+	if cmd.Runnable() {
+		if _, err := fmt.Fprintf(w, "```\n%s\n```\n\n", cmd.UseLine()); err != nil {
+			return err
+		}
+	}
+
+	if len(cmd.Example) > 0 {
+		if _, err := fmt.Fprintf(w, "### Examples\n\n"); err != nil {
+			return err
+		}
+		if _, err := fmt.Fprintf(w, "```\n%s\n```\n\n", cmd.Example); err != nil {
+			return err
+		}
+	}
+
+	if err := printOptions(w, cmd, name); err != nil {
+		return err
+	}
+	if hasSeeAlso(cmd) {
+		if _, err := fmt.Fprintf(w, "### SEE ALSO\n"); err != nil {
+			return err
+		}
+		if cmd.HasParent() {
+			parent := cmd.Parent()
+			pname := parent.CommandPath()
+			link := pname + ".md"
+			link = strings.Replace(link, " ", "_", -1)
+			if _, err := fmt.Fprintf(w, "* [%s](%s)\t - %s\n", pname, linkHandler(link), parent.Short); err != nil {
+				return err
+			}
+			cmd.VisitParents(func(c *cobra.Command) {
+				if c.DisableAutoGenTag {
+					cmd.DisableAutoGenTag = c.DisableAutoGenTag
+				}
+			})
+		}
+
+		children := cmd.Commands()
+		sort.Sort(byName(children))
+
+		for _, child := range children {
+			if !child.IsAvailableCommand() || child.IsHelpCommand() {
+				continue
+			}
+			cname := name + " " + child.Name()
+			link := cname + ".md"
+			link = strings.Replace(link, " ", "_", -1)
+			if _, err := fmt.Fprintf(w, "* [%s](%s)\t - %s\n", cname, linkHandler(link), child.Short); err != nil {
+				return err
+			}
+		}
+		if _, err := fmt.Fprintf(w, "\n"); err != nil {
+			return err
+		}
+	}
+	if !cmd.DisableAutoGenTag {
+		if _, err := fmt.Fprintf(w, "###### Auto generated by spf13/cobra on %s\n", time.Now().Format("2-Jan-2006")); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func GenMarkdownTree(cmd *cobra.Command, dir string) error {
+	identity := func(s string) string { return s }
+	emptyStr := func(s string) string { return "" }
+	return GenMarkdownTreeCustom(cmd, dir, emptyStr, identity)
+}
+
+func GenMarkdownTreeCustom(cmd *cobra.Command, dir string, filePrepender, linkHandler func(string) string) error {
+	for _, c := range cmd.Commands() {
+		if !c.IsAvailableCommand() || c.IsHelpCommand() {
+			continue
+		}
+		if err := GenMarkdownTreeCustom(c, dir, filePrepender, linkHandler); err != nil {
+			return err
+		}
+	}
+
+	basename := strings.Replace(cmd.CommandPath(), " ", "_", -1) + ".md"
+	filename := filepath.Join(dir, basename)
+	f, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if _, err := io.WriteString(f, filePrepender(filename)); err != nil {
+		return err
+	}
+	if err := GenMarkdownCustom(cmd, f, linkHandler); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/vendor/github.com/spf13/cobra/doc/util.go b/vendor/github.com/spf13/cobra/doc/util.go
new file mode 100644
index 0000000000..a1c6b89ba6
--- /dev/null
+++ b/vendor/github.com/spf13/cobra/doc/util.go
@@ -0,0 +1,38 @@
+// Copyright 2015 Red Hat Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package doc
+
+import "github.com/spf13/cobra"
+
+// Test to see if we have a reason to print See Also information in docs
+// Basically this is a test for a parent commend or a subcommand which is
+// both not deprecated and not the autogenerated help command.
+func hasSeeAlso(cmd *cobra.Command) bool {
+	if cmd.HasParent() {
+		return true
+	}
+	for _, c := range cmd.Commands() {
+		if !c.IsAvailableCommand() || c.IsHelpCommand() {
+			continue
+		}
+		return true
+	}
+	return false
+}
+
+type byName []*cobra.Command
+
+func (s byName) Len() int           { return len(s) }
+func (s byName) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s byName) Less(i, j int) bool { return s[i].Name() < s[j].Name() }
diff --git a/vendor/github.com/spf13/pflag/LICENSE b/vendor/github.com/spf13/pflag/LICENSE
new file mode 100644
index 0000000000..63ed1cfea1
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2012 Alex Ogier. All rights reserved.
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/spf13/pflag/bool.go b/vendor/github.com/spf13/pflag/bool.go
new file mode 100644
index 0000000000..d272e40bdd
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/bool.go
@@ -0,0 +1,97 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// optional interface to indicate boolean flags that can be
+// supplied without "=value" text
+type boolFlag interface {
+	Value
+	IsBoolFlag() bool
+}
+
+// -- bool Value
+type boolValue bool
+
+func newBoolValue(val bool, p *bool) *boolValue {
+	*p = val
+	return (*boolValue)(p)
+}
+
+func (b *boolValue) Set(s string) error {
+	v, err := strconv.ParseBool(s)
+	*b = boolValue(v)
+	return err
+}
+
+func (b *boolValue) Type() string {
+	return "bool"
+}
+
+func (b *boolValue) String() string { return fmt.Sprintf("%v", *b) }
+
+func (b *boolValue) IsBoolFlag() bool { return true }
+
+func boolConv(sval string) (interface{}, error) {
+	return strconv.ParseBool(sval)
+}
+
+// GetBool return the bool value of a flag with the given name
+func (f *FlagSet) GetBool(name string) (bool, error) {
+	val, err := f.getFlagType(name, "bool", boolConv)
+	if err != nil {
+		return false, err
+	}
+	return val.(bool), nil
+}
+
+// BoolVar defines a bool flag with specified name, default value, and usage string.
+// The argument p points to a bool variable in which to store the value of the flag.
+func (f *FlagSet) BoolVar(p *bool, name string, value bool, usage string) {
+	f.BoolVarP(p, name, "", value, usage)
+}
+
+// BoolVarP is like BoolVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) BoolVarP(p *bool, name, shorthand string, value bool, usage string) {
+	flag := f.VarPF(newBoolValue(value, p), name, shorthand, usage)
+	flag.NoOptDefVal = "true"
+}
+
+// BoolVar defines a bool flag with specified name, default value, and usage string.
+// The argument p points to a bool variable in which to store the value of the flag.
+func BoolVar(p *bool, name string, value bool, usage string) {
+	BoolVarP(p, name, "", value, usage)
+}
+
+// BoolVarP is like BoolVar, but accepts a shorthand letter that can be used after a single dash.
+func BoolVarP(p *bool, name, shorthand string, value bool, usage string) {
+	flag := CommandLine.VarPF(newBoolValue(value, p), name, shorthand, usage)
+	flag.NoOptDefVal = "true"
+}
+
+// Bool defines a bool flag with specified name, default value, and usage string.
+// The return value is the address of a bool variable that stores the value of the flag.
+func (f *FlagSet) Bool(name string, value bool, usage string) *bool {
+	return f.BoolP(name, "", value, usage)
+}
+
+// BoolP is like Bool, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) BoolP(name, shorthand string, value bool, usage string) *bool {
+	p := new(bool)
+	f.BoolVarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Bool defines a bool flag with specified name, default value, and usage string.
+// The return value is the address of a bool variable that stores the value of the flag.
+func Bool(name string, value bool, usage string) *bool {
+	return BoolP(name, "", value, usage)
+}
+
+// BoolP is like Bool, but accepts a shorthand letter that can be used after a single dash.
+func BoolP(name, shorthand string, value bool, usage string) *bool {
+	b := CommandLine.BoolP(name, shorthand, value, usage)
+	return b
+}
diff --git a/vendor/github.com/spf13/pflag/count.go b/vendor/github.com/spf13/pflag/count.go
new file mode 100644
index 0000000000..7b1f142e78
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/count.go
@@ -0,0 +1,97 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- count Value
+type countValue int
+
+func newCountValue(val int, p *int) *countValue {
+	*p = val
+	return (*countValue)(p)
+}
+
+func (i *countValue) Set(s string) error {
+	v, err := strconv.ParseInt(s, 0, 64)
+	// -1 means that no specific value was passed, so increment
+	if v == -1 {
+		*i = countValue(*i + 1)
+	} else {
+		*i = countValue(v)
+	}
+	return err
+}
+
+func (i *countValue) Type() string {
+	return "count"
+}
+
+func (i *countValue) String() string { return fmt.Sprintf("%v", *i) }
+
+func countConv(sval string) (interface{}, error) {
+	i, err := strconv.Atoi(sval)
+	if err != nil {
+		return nil, err
+	}
+	return i, nil
+}
+
+// GetCount return the int value of a flag with the given name
+func (f *FlagSet) GetCount(name string) (int, error) {
+	val, err := f.getFlagType(name, "count", countConv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(int), nil
+}
+
+// CountVar defines a count flag with specified name, default value, and usage string.
+// The argument p points to an int variable in which to store the value of the flag.
+// A count flag will add 1 to its value evey time it is found on the command line
+func (f *FlagSet) CountVar(p *int, name string, usage string) {
+	f.CountVarP(p, name, "", usage)
+}
+
+// CountVarP is like CountVar only take a shorthand for the flag name.
+func (f *FlagSet) CountVarP(p *int, name, shorthand string, usage string) {
+	flag := f.VarPF(newCountValue(0, p), name, shorthand, usage)
+	flag.NoOptDefVal = "-1"
+}
+
+// CountVar like CountVar only the flag is placed on the CommandLine instead of a given flag set
+func CountVar(p *int, name string, usage string) {
+	CommandLine.CountVar(p, name, usage)
+}
+
+// CountVarP is like CountVar only take a shorthand for the flag name.
+func CountVarP(p *int, name, shorthand string, usage string) {
+	CommandLine.CountVarP(p, name, shorthand, usage)
+}
+
+// Count defines a count flag with specified name, default value, and usage string.
+// The return value is the address of an int variable that stores the value of the flag.
+// A count flag will add 1 to its value evey time it is found on the command line
+func (f *FlagSet) Count(name string, usage string) *int {
+	p := new(int)
+	f.CountVarP(p, name, "", usage)
+	return p
+}
+
+// CountP is like Count only takes a shorthand for the flag name.
+func (f *FlagSet) CountP(name, shorthand string, usage string) *int {
+	p := new(int)
+	f.CountVarP(p, name, shorthand, usage)
+	return p
+}
+
+// Count like Count only the flag is placed on the CommandLine isntead of a given flag set
+func Count(name string, usage string) *int {
+	return CommandLine.CountP(name, "", usage)
+}
+
+// CountP is like Count only takes a shorthand for the flag name.
+func CountP(name, shorthand string, usage string) *int {
+	return CommandLine.CountP(name, shorthand, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/duration.go b/vendor/github.com/spf13/pflag/duration.go
new file mode 100644
index 0000000000..e9debef88e
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/duration.go
@@ -0,0 +1,86 @@
+package pflag
+
+import (
+	"time"
+)
+
+// -- time.Duration Value
+type durationValue time.Duration
+
+func newDurationValue(val time.Duration, p *time.Duration) *durationValue {
+	*p = val
+	return (*durationValue)(p)
+}
+
+func (d *durationValue) Set(s string) error {
+	v, err := time.ParseDuration(s)
+	*d = durationValue(v)
+	return err
+}
+
+func (d *durationValue) Type() string {
+	return "duration"
+}
+
+func (d *durationValue) String() string { return (*time.Duration)(d).String() }
+
+func durationConv(sval string) (interface{}, error) {
+	return time.ParseDuration(sval)
+}
+
+// GetDuration return the duration value of a flag with the given name
+func (f *FlagSet) GetDuration(name string) (time.Duration, error) {
+	val, err := f.getFlagType(name, "duration", durationConv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(time.Duration), nil
+}
+
+// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
+// The argument p points to a time.Duration variable in which to store the value of the flag.
+func (f *FlagSet) DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
+	f.VarP(newDurationValue(value, p), name, "", usage)
+}
+
+// DurationVarP is like DurationVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) DurationVarP(p *time.Duration, name, shorthand string, value time.Duration, usage string) {
+	f.VarP(newDurationValue(value, p), name, shorthand, usage)
+}
+
+// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
+// The argument p points to a time.Duration variable in which to store the value of the flag.
+func DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
+	CommandLine.VarP(newDurationValue(value, p), name, "", usage)
+}
+
+// DurationVarP is like DurationVar, but accepts a shorthand letter that can be used after a single dash.
+func DurationVarP(p *time.Duration, name, shorthand string, value time.Duration, usage string) {
+	CommandLine.VarP(newDurationValue(value, p), name, shorthand, usage)
+}
+
+// Duration defines a time.Duration flag with specified name, default value, and usage string.
+// The return value is the address of a time.Duration variable that stores the value of the flag.
+func (f *FlagSet) Duration(name string, value time.Duration, usage string) *time.Duration {
+	p := new(time.Duration)
+	f.DurationVarP(p, name, "", value, usage)
+	return p
+}
+
+// DurationP is like Duration, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) DurationP(name, shorthand string, value time.Duration, usage string) *time.Duration {
+	p := new(time.Duration)
+	f.DurationVarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Duration defines a time.Duration flag with specified name, default value, and usage string.
+// The return value is the address of a time.Duration variable that stores the value of the flag.
+func Duration(name string, value time.Duration, usage string) *time.Duration {
+	return CommandLine.DurationP(name, "", value, usage)
+}
+
+// DurationP is like Duration, but accepts a shorthand letter that can be used after a single dash.
+func DurationP(name, shorthand string, value time.Duration, usage string) *time.Duration {
+	return CommandLine.DurationP(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/flag.go b/vendor/github.com/spf13/pflag/flag.go
new file mode 100644
index 0000000000..fd91440341
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/flag.go
@@ -0,0 +1,836 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+Package pflag is a drop-in replacement for Go's flag package, implementing
+POSIX/GNU-style --flags.
+
+pflag is compatible with the GNU extensions to the POSIX recommendations
+for command-line options. See
+http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
+
+Usage:
+
+pflag is a drop-in replacement of Go's native flag package. If you import
+pflag under the name "flag" then all code should continue to function
+with no changes.
+
+	import flag "github.com/ogier/pflag"
+
+	There is one exception to this: if you directly instantiate the Flag struct
+there is one more field "Shorthand" that you will need to set.
+Most code never instantiates this struct directly, and instead uses
+functions such as String(), BoolVar(), and Var(), and is therefore
+unaffected.
+
+Define flags using flag.String(), Bool(), Int(), etc.
+
+This declares an integer flag, -flagname, stored in the pointer ip, with type *int.
+	var ip = flag.Int("flagname", 1234, "help message for flagname")
+If you like, you can bind the flag to a variable using the Var() functions.
+	var flagvar int
+	func init() {
+		flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname")
+	}
+Or you can create custom flags that satisfy the Value interface (with
+pointer receivers) and couple them to flag parsing by
+	flag.Var(&flagVal, "name", "help message for flagname")
+For such flags, the default value is just the initial value of the variable.
+
+After all flags are defined, call
+	flag.Parse()
+to parse the command line into the defined flags.
+
+Flags may then be used directly. If you're using the flags themselves,
+they are all pointers; if you bind to variables, they're values.
+	fmt.Println("ip has value ", *ip)
+	fmt.Println("flagvar has value ", flagvar)
+
+After parsing, the arguments after the flag are available as the
+slice flag.Args() or individually as flag.Arg(i).
+The arguments are indexed from 0 through flag.NArg()-1.
+
+The pflag package also defines some new functions that are not in flag,
+that give one-letter shorthands for flags. You can use these by appending
+'P' to the name of any function that defines a flag.
+	var ip = flag.IntP("flagname", "f", 1234, "help message")
+	var flagvar bool
+	func init() {
+		flag.BoolVarP("boolname", "b", true, "help message")
+	}
+	flag.VarP(&flagVar, "varname", "v", 1234, "help message")
+Shorthand letters can be used with single dashes on the command line.
+Boolean shorthand flags can be combined with other shorthand flags.
+
+Command line flag syntax:
+	--flag    // boolean flags only
+	--flag=x
+
+Unlike the flag package, a single dash before an option means something
+different than a double dash. Single dashes signify a series of shorthand
+letters for flags. All but the last shorthand letter must be boolean flags.
+	// boolean flags
+	-f
+	-abc
+	// non-boolean flags
+	-n 1234
+	-Ifile
+	// mixed
+	-abcs "hello"
+	-abcn1234
+
+Flag parsing stops after the terminator "--". Unlike the flag package,
+flags can be interspersed with arguments anywhere on the command line
+before this terminator.
+
+Integer flags accept 1234, 0664, 0x1234 and may be negative.
+Boolean flags (in their long form) accept 1, 0, t, f, true, false,
+TRUE, FALSE, True, False.
+Duration flags accept any input valid for time.ParseDuration.
+
+The default set of command-line flags is controlled by
+top-level functions.  The FlagSet type allows one to define
+independent sets of flags, such as to implement subcommands
+in a command-line interface. The methods of FlagSet are
+analogous to the top-level functions for the command-line
+flag set.
+*/
+package pflag
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"sort"
+	"strings"
+)
+
+// ErrHelp is the error returned if the flag -help is invoked but no such flag is defined.
+var ErrHelp = errors.New("pflag: help requested")
+
+// ErrorHandling defines how to handle flag parsing errors.
+type ErrorHandling int
+
+const (
+	// ContinueOnError will return an err from Parse() if an error is found
+	ContinueOnError ErrorHandling = iota
+	// ExitOnError will call os.Exit(2) if an error is found when parsing
+	ExitOnError
+	// PanicOnError will panic() if an error is found when parsing flags
+	PanicOnError
+)
+
+// NormalizedName is a flag name that has been normalized according to rules
+// for the FlagSet (e.g. making '-' and '_' equivalent).
+type NormalizedName string
+
+// A FlagSet represents a set of defined flags.
+type FlagSet struct {
+	// Usage is the function called when an error occurs while parsing flags.
+	// The field is a function (not a method) that may be changed to point to
+	// a custom error handler.
+	Usage func()
+
+	name              string
+	parsed            bool
+	actual            map[NormalizedName]*Flag
+	formal            map[NormalizedName]*Flag
+	shorthands        map[byte]*Flag
+	args              []string // arguments after flags
+	argsLenAtDash     int      // len(args) when a '--' was located when parsing, or -1 if no --
+	exitOnError       bool     // does the program exit if there's an error?
+	errorHandling     ErrorHandling
+	output            io.Writer // nil means stderr; use out() accessor
+	interspersed      bool      // allow interspersed option/non-option args
+	normalizeNameFunc func(f *FlagSet, name string) NormalizedName
+}
+
+// A Flag represents the state of a flag.
+type Flag struct {
+	Name                string              // name as it appears on command line
+	Shorthand           string              // one-letter abbreviated flag
+	Usage               string              // help message
+	Value               Value               // value as set
+	DefValue            string              // default value (as text); for usage message
+	Changed             bool                // If the user set the value (or if left to default)
+	NoOptDefVal         string              //default value (as text); if the flag is on the command line without any options
+	Deprecated          string              // If this flag is deprecated, this string is the new or now thing to use
+	Hidden              bool                // used by cobra.Command to allow flags to be hidden from help/usage text
+	ShorthandDeprecated string              // If the shorthand of this flag is deprecated, this string is the new or now thing to use
+	Annotations         map[string][]string // used by cobra.Command bash autocomple code
+}
+
+// Value is the interface to the dynamic value stored in a flag.
+// (The default value is represented as a string.)
+type Value interface {
+	String() string
+	Set(string) error
+	Type() string
+}
+
+// sortFlags returns the flags as a slice in lexicographical sorted order.
+func sortFlags(flags map[NormalizedName]*Flag) []*Flag {
+	list := make(sort.StringSlice, len(flags))
+	i := 0
+	for k := range flags {
+		list[i] = string(k)
+		i++
+	}
+	list.Sort()
+	result := make([]*Flag, len(list))
+	for i, name := range list {
+		result[i] = flags[NormalizedName(name)]
+	}
+	return result
+}
+
+// SetNormalizeFunc allows you to add a function which can translate flag names.
+// Flags added to the FlagSet will be translated and then when anything tries to
+// look up the flag that will also be translated. So it would be possible to create
+// a flag named "getURL" and have it translated to "geturl".  A user could then pass
+// "--getUrl" which may also be translated to "geturl" and everything will work.
+func (f *FlagSet) SetNormalizeFunc(n func(f *FlagSet, name string) NormalizedName) {
+	f.normalizeNameFunc = n
+	for k, v := range f.formal {
+		delete(f.formal, k)
+		nname := f.normalizeFlagName(string(k))
+		f.formal[nname] = v
+		v.Name = string(nname)
+	}
+}
+
+// GetNormalizeFunc returns the previously set NormalizeFunc of a function which
+// does no translation, if not set previously.
+func (f *FlagSet) GetNormalizeFunc() func(f *FlagSet, name string) NormalizedName {
+	if f.normalizeNameFunc != nil {
+		return f.normalizeNameFunc
+	}
+	return func(f *FlagSet, name string) NormalizedName { return NormalizedName(name) }
+}
+
+func (f *FlagSet) normalizeFlagName(name string) NormalizedName {
+	n := f.GetNormalizeFunc()
+	return n(f, name)
+}
+
+func (f *FlagSet) out() io.Writer {
+	if f.output == nil {
+		return os.Stderr
+	}
+	return f.output
+}
+
+// SetOutput sets the destination for usage and error messages.
+// If output is nil, os.Stderr is used.
+func (f *FlagSet) SetOutput(output io.Writer) {
+	f.output = output
+}
+
+// VisitAll visits the flags in lexicographical order, calling fn for each.
+// It visits all flags, even those not set.
+func (f *FlagSet) VisitAll(fn func(*Flag)) {
+	for _, flag := range sortFlags(f.formal) {
+		fn(flag)
+	}
+}
+
+// HasFlags returns a bool to indicate if the FlagSet has any flags definied.
+func (f *FlagSet) HasFlags() bool {
+	return len(f.formal) > 0
+}
+
+// VisitAll visits the command-line flags in lexicographical order, calling
+// fn for each.  It visits all flags, even those not set.
+func VisitAll(fn func(*Flag)) {
+	CommandLine.VisitAll(fn)
+}
+
+// Visit visits the flags in lexicographical order, calling fn for each.
+// It visits only those flags that have been set.
+func (f *FlagSet) Visit(fn func(*Flag)) {
+	for _, flag := range sortFlags(f.actual) {
+		fn(flag)
+	}
+}
+
+// Visit visits the command-line flags in lexicographical order, calling fn
+// for each.  It visits only those flags that have been set.
+func Visit(fn func(*Flag)) {
+	CommandLine.Visit(fn)
+}
+
+// Lookup returns the Flag structure of the named flag, returning nil if none exists.
+func (f *FlagSet) Lookup(name string) *Flag {
+	return f.lookup(f.normalizeFlagName(name))
+}
+
+// lookup returns the Flag structure of the named flag, returning nil if none exists.
+func (f *FlagSet) lookup(name NormalizedName) *Flag {
+	return f.formal[name]
+}
+
+// func to return a given type for a given flag name
+func (f *FlagSet) getFlagType(name string, ftype string, convFunc func(sval string) (interface{}, error)) (interface{}, error) {
+	flag := f.Lookup(name)
+	if flag == nil {
+		err := fmt.Errorf("flag accessed but not defined: %s", name)
+		return nil, err
+	}
+
+	if flag.Value.Type() != ftype {
+		err := fmt.Errorf("trying to get %s value of flag of type %s", ftype, flag.Value.Type())
+		return nil, err
+	}
+
+	sval := flag.Value.String()
+	result, err := convFunc(sval)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// ArgsLenAtDash will return the length of f.Args at the moment when a -- was
+// found during arg parsing. This allows your program to know which args were
+// before the -- and which came after.
+func (f *FlagSet) ArgsLenAtDash() int {
+	return f.argsLenAtDash
+}
+
+// MarkDeprecated indicated that a flag is deprecated in your program. It will
+// continue to function but will not show up in help or usage messages. Using
+// this flag will also print the given usageMessage.
+func (f *FlagSet) MarkDeprecated(name string, usageMessage string) error {
+	flag := f.Lookup(name)
+	if flag == nil {
+		return fmt.Errorf("flag %q does not exist", name)
+	}
+	if len(usageMessage) == 0 {
+		return fmt.Errorf("deprecated message for flag %q must be set", name)
+	}
+	flag.Deprecated = usageMessage
+	return nil
+}
+
+// MarkShorthandDeprecated will mark the shorthand of a flag deprecated in your
+// program. It will continue to function but will not show up in help or usage
+// messages. Using this flag will also print the given usageMessage.
+func (f *FlagSet) MarkShorthandDeprecated(name string, usageMessage string) error {
+	flag := f.Lookup(name)
+	if flag == nil {
+		return fmt.Errorf("flag %q does not exist", name)
+	}
+	if len(usageMessage) == 0 {
+		return fmt.Errorf("deprecated message for flag %q must be set", name)
+	}
+	flag.ShorthandDeprecated = usageMessage
+	return nil
+}
+
+// MarkHidden sets a flag to 'hidden' in your program. It will continue to
+// function but will not show up in help or usage messages.
+func (f *FlagSet) MarkHidden(name string) error {
+	flag := f.Lookup(name)
+	if flag == nil {
+		return fmt.Errorf("flag %q does not exist", name)
+	}
+	flag.Hidden = true
+	return nil
+}
+
+// Lookup returns the Flag structure of the named command-line flag,
+// returning nil if none exists.
+func Lookup(name string) *Flag {
+	return CommandLine.Lookup(name)
+}
+
+// Set sets the value of the named flag.
+func (f *FlagSet) Set(name, value string) error {
+	normalName := f.normalizeFlagName(name)
+	flag, ok := f.formal[normalName]
+	if !ok {
+		return fmt.Errorf("no such flag -%v", name)
+	}
+	err := flag.Value.Set(value)
+	if err != nil {
+		return err
+	}
+	if f.actual == nil {
+		f.actual = make(map[NormalizedName]*Flag)
+	}
+	f.actual[normalName] = flag
+	flag.Changed = true
+	if len(flag.Deprecated) > 0 {
+		fmt.Fprintf(os.Stderr, "Flag --%s has been deprecated, %s\n", flag.Name, flag.Deprecated)
+	}
+	return nil
+}
+
+// SetAnnotation allows one to set arbitrary annotations on a flag in the FlagSet.
+// This is sometimes used by spf13/cobra programs which want to generate additional
+// bash completion information.
+func (f *FlagSet) SetAnnotation(name, key string, values []string) error {
+	normalName := f.normalizeFlagName(name)
+	flag, ok := f.formal[normalName]
+	if !ok {
+		return fmt.Errorf("no such flag -%v", name)
+	}
+	if flag.Annotations == nil {
+		flag.Annotations = map[string][]string{}
+	}
+	flag.Annotations[key] = values
+	return nil
+}
+
+// Changed returns true if the flag was explicitly set during Parse() and false
+// otherwise
+func (f *FlagSet) Changed(name string) bool {
+	flag := f.Lookup(name)
+	// If a flag doesn't exist, it wasn't changed....
+	if flag == nil {
+		return false
+	}
+	return flag.Changed
+}
+
+// Set sets the value of the named command-line flag.
+func Set(name, value string) error {
+	return CommandLine.Set(name, value)
+}
+
+// PrintDefaults prints, to standard error unless configured
+// otherwise, the default values of all defined flags in the set.
+func (f *FlagSet) PrintDefaults() {
+	usages := f.FlagUsages()
+	fmt.Fprintf(f.out(), "%s", usages)
+}
+
+// FlagUsages Returns a string containing the usage information for all flags in
+// the FlagSet
+func (f *FlagSet) FlagUsages() string {
+	x := new(bytes.Buffer)
+
+	f.VisitAll(func(flag *Flag) {
+		if len(flag.Deprecated) > 0 || flag.Hidden {
+			return
+		}
+		format := ""
+		if len(flag.Shorthand) > 0 && len(flag.ShorthandDeprecated) == 0 {
+			format = "  -%s, --%s"
+		} else {
+			format = "   %s   --%s"
+		}
+		if len(flag.NoOptDefVal) > 0 {
+			format = format + "["
+		}
+		if flag.Value.Type() == "string" {
+			// put quotes on the value
+			format = format + "=%q"
+		} else {
+			format = format + "=%s"
+		}
+		if len(flag.NoOptDefVal) > 0 {
+			format = format + "]"
+		}
+		format = format + ": %s\n"
+		shorthand := flag.Shorthand
+		if len(flag.ShorthandDeprecated) > 0 {
+			shorthand = ""
+		}
+		fmt.Fprintf(x, format, shorthand, flag.Name, flag.DefValue, flag.Usage)
+	})
+
+	return x.String()
+}
+
+// PrintDefaults prints to standard error the default values of all defined command-line flags.
+func PrintDefaults() {
+	CommandLine.PrintDefaults()
+}
+
+// defaultUsage is the default function to print a usage message.
+func defaultUsage(f *FlagSet) {
+	fmt.Fprintf(f.out(), "Usage of %s:\n", f.name)
+	f.PrintDefaults()
+}
+
+// NOTE: Usage is not just defaultUsage(CommandLine)
+// because it serves (via godoc flag Usage) as the example
+// for how to write your own usage function.
+
+// Usage prints to standard error a usage message documenting all defined command-line flags.
+// The function is a variable that may be changed to point to a custom function.
+var Usage = func() {
+	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+	PrintDefaults()
+}
+
+// NFlag returns the number of flags that have been set.
+func (f *FlagSet) NFlag() int { return len(f.actual) }
+
+// NFlag returns the number of command-line flags that have been set.
+func NFlag() int { return len(CommandLine.actual) }
+
+// Arg returns the i'th argument.  Arg(0) is the first remaining argument
+// after flags have been processed.
+func (f *FlagSet) Arg(i int) string {
+	if i < 0 || i >= len(f.args) {
+		return ""
+	}
+	return f.args[i]
+}
+
+// Arg returns the i'th command-line argument.  Arg(0) is the first remaining argument
+// after flags have been processed.
+func Arg(i int) string {
+	return CommandLine.Arg(i)
+}
+
+// NArg is the number of arguments remaining after flags have been processed.
+func (f *FlagSet) NArg() int { return len(f.args) }
+
+// NArg is the number of arguments remaining after flags have been processed.
+func NArg() int { return len(CommandLine.args) }
+
+// Args returns the non-flag arguments.
+func (f *FlagSet) Args() []string { return f.args }
+
+// Args returns the non-flag command-line arguments.
+func Args() []string { return CommandLine.args }
+
+// Var defines a flag with the specified name and usage string. The type and
+// value of the flag are represented by the first argument, of type Value, which
+// typically holds a user-defined implementation of Value. For instance, the
+// caller could create a flag that turns a comma-separated string into a slice
+// of strings by giving the slice the methods of Value; in particular, Set would
+// decompose the comma-separated string into the slice.
+func (f *FlagSet) Var(value Value, name string, usage string) {
+	f.VarP(value, name, "", usage)
+}
+
+// VarPF is like VarP, but returns the flag created
+func (f *FlagSet) VarPF(value Value, name, shorthand, usage string) *Flag {
+	// Remember the default value as a string; it won't change.
+	flag := &Flag{
+		Name:      name,
+		Shorthand: shorthand,
+		Usage:     usage,
+		Value:     value,
+		DefValue:  value.String(),
+	}
+	f.AddFlag(flag)
+	return flag
+}
+
+// VarP is like Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) VarP(value Value, name, shorthand, usage string) {
+	_ = f.VarPF(value, name, shorthand, usage)
+}
+
+// AddFlag will add the flag to the FlagSet
+func (f *FlagSet) AddFlag(flag *Flag) {
+	// Call normalizeFlagName function only once
+	normalizedFlagName := f.normalizeFlagName(flag.Name)
+
+	_, alreadythere := f.formal[normalizedFlagName]
+	if alreadythere {
+		msg := fmt.Sprintf("%s flag redefined: %s", f.name, flag.Name)
+		fmt.Fprintln(f.out(), msg)
+		panic(msg) // Happens only if flags are declared with identical names
+	}
+	if f.formal == nil {
+		f.formal = make(map[NormalizedName]*Flag)
+	}
+
+	flag.Name = string(normalizedFlagName)
+	f.formal[normalizedFlagName] = flag
+
+	if len(flag.Shorthand) == 0 {
+		return
+	}
+	if len(flag.Shorthand) > 1 {
+		fmt.Fprintf(f.out(), "%s shorthand more than ASCII character: %s\n", f.name, flag.Shorthand)
+		panic("shorthand is more than one character")
+	}
+	if f.shorthands == nil {
+		f.shorthands = make(map[byte]*Flag)
+	}
+	c := flag.Shorthand[0]
+	old, alreadythere := f.shorthands[c]
+	if alreadythere {
+		fmt.Fprintf(f.out(), "%s shorthand reused: %q for %s already used for %s\n", f.name, c, flag.Name, old.Name)
+		panic("shorthand redefinition")
+	}
+	f.shorthands[c] = flag
+}
+
+// AddFlagSet adds one FlagSet to another. If a flag is already present in f
+// the flag from newSet will be ignored
+func (f *FlagSet) AddFlagSet(newSet *FlagSet) {
+	if newSet == nil {
+		return
+	}
+	newSet.VisitAll(func(flag *Flag) {
+		if f.Lookup(flag.Name) == nil {
+			f.AddFlag(flag)
+		}
+	})
+}
+
+// Var defines a flag with the specified name and usage string. The type and
+// value of the flag are represented by the first argument, of type Value, which
+// typically holds a user-defined implementation of Value. For instance, the
+// caller could create a flag that turns a comma-separated string into a slice
+// of strings by giving the slice the methods of Value; in particular, Set would
+// decompose the comma-separated string into the slice.
+func Var(value Value, name string, usage string) {
+	CommandLine.VarP(value, name, "", usage)
+}
+
+// VarP is like Var, but accepts a shorthand letter that can be used after a single dash.
+func VarP(value Value, name, shorthand, usage string) {
+	CommandLine.VarP(value, name, shorthand, usage)
+}
+
+// failf prints to standard error a formatted error and usage message and
+// returns the error.
+func (f *FlagSet) failf(format string, a ...interface{}) error {
+	err := fmt.Errorf(format, a...)
+	fmt.Fprintln(f.out(), err)
+	f.usage()
+	return err
+}
+
+// usage calls the Usage method for the flag set, or the usage function if
+// the flag set is CommandLine.
+func (f *FlagSet) usage() {
+	if f == CommandLine {
+		Usage()
+	} else if f.Usage == nil {
+		defaultUsage(f)
+	} else {
+		f.Usage()
+	}
+}
+
+func (f *FlagSet) setFlag(flag *Flag, value string, origArg string) error {
+	if err := flag.Value.Set(value); err != nil {
+		return f.failf("invalid argument %q for %s: %v", value, origArg, err)
+	}
+	// mark as visited for Visit()
+	if f.actual == nil {
+		f.actual = make(map[NormalizedName]*Flag)
+	}
+	f.actual[f.normalizeFlagName(flag.Name)] = flag
+	flag.Changed = true
+	if len(flag.Deprecated) > 0 {
+		fmt.Fprintf(os.Stderr, "Flag --%s has been deprecated, %s\n", flag.Name, flag.Deprecated)
+	}
+	if len(flag.ShorthandDeprecated) > 0 && containsShorthand(origArg, flag.Shorthand) {
+		fmt.Fprintf(os.Stderr, "Flag shorthand -%s has been deprecated, %s\n", flag.Shorthand, flag.ShorthandDeprecated)
+	}
+	return nil
+}
+
+func containsShorthand(arg, shorthand string) bool {
+	// filter out flags --<flag_name>
+	if strings.HasPrefix(arg, "-") {
+		return false
+	}
+	arg = strings.SplitN(arg, "=", 2)[0]
+	return strings.Contains(arg, shorthand)
+}
+
+func (f *FlagSet) parseLongArg(s string, args []string) (a []string, err error) {
+	a = args
+	name := s[2:]
+	if len(name) == 0 || name[0] == '-' || name[0] == '=' {
+		err = f.failf("bad flag syntax: %s", s)
+		return
+	}
+	split := strings.SplitN(name, "=", 2)
+	name = split[0]
+	flag, alreadythere := f.formal[f.normalizeFlagName(name)]
+	if !alreadythere {
+		if name == "help" { // special case for nice help message.
+			f.usage()
+			return a, ErrHelp
+		}
+		err = f.failf("unknown flag: --%s", name)
+		return
+	}
+	var value string
+	if len(split) == 2 {
+		// '--flag=arg'
+		value = split[1]
+	} else if len(flag.NoOptDefVal) > 0 {
+		// '--flag' (arg was optional)
+		value = flag.NoOptDefVal
+	} else if len(a) > 0 {
+		// '--flag arg'
+		value = a[0]
+		a = a[1:]
+	} else {
+		// '--flag' (arg was required)
+		err = f.failf("flag needs an argument: %s", s)
+		return
+	}
+	err = f.setFlag(flag, value, s)
+	return
+}
+
+func (f *FlagSet) parseSingleShortArg(shorthands string, args []string) (outShorts string, outArgs []string, err error) {
+	outArgs = args
+	outShorts = shorthands[1:]
+	c := shorthands[0]
+
+	flag, alreadythere := f.shorthands[c]
+	if !alreadythere {
+		if c == 'h' { // special case for nice help message.
+			f.usage()
+			err = ErrHelp
+			return
+		}
+		//TODO continue on error
+		err = f.failf("unknown shorthand flag: %q in -%s", c, shorthands)
+		return
+	}
+	var value string
+	if len(shorthands) > 2 && shorthands[1] == '=' {
+		value = shorthands[2:]
+		outShorts = ""
+	} else if len(flag.NoOptDefVal) > 0 {
+		value = flag.NoOptDefVal
+	} else if len(shorthands) > 1 {
+		value = shorthands[1:]
+		outShorts = ""
+	} else if len(args) > 0 {
+		value = args[0]
+		outArgs = args[1:]
+	} else {
+		err = f.failf("flag needs an argument: %q in -%s", c, shorthands)
+		return
+	}
+	err = f.setFlag(flag, value, shorthands)
+	return
+}
+
+func (f *FlagSet) parseShortArg(s string, args []string) (a []string, err error) {
+	a = args
+	shorthands := s[1:]
+
+	for len(shorthands) > 0 {
+		shorthands, a, err = f.parseSingleShortArg(shorthands, args)
+		if err != nil {
+			return
+		}
+	}
+
+	return
+}
+
+func (f *FlagSet) parseArgs(args []string) (err error) {
+	for len(args) > 0 {
+		s := args[0]
+		args = args[1:]
+		if len(s) == 0 || s[0] != '-' || len(s) == 1 {
+			if !f.interspersed {
+				f.args = append(f.args, s)
+				f.args = append(f.args, args...)
+				return nil
+			}
+			f.args = append(f.args, s)
+			continue
+		}
+
+		if s[1] == '-' {
+			if len(s) == 2 { // "--" terminates the flags
+				f.argsLenAtDash = len(f.args)
+				f.args = append(f.args, args...)
+				break
+			}
+			args, err = f.parseLongArg(s, args)
+		} else {
+			args, err = f.parseShortArg(s, args)
+		}
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+// Parse parses flag definitions from the argument list, which should not
+// include the command name.  Must be called after all flags in the FlagSet
+// are defined and before flags are accessed by the program.
+// The return value will be ErrHelp if -help was set but not defined.
+func (f *FlagSet) Parse(arguments []string) error {
+	f.parsed = true
+	f.args = make([]string, 0, len(arguments))
+	err := f.parseArgs(arguments)
+	if err != nil {
+		switch f.errorHandling {
+		case ContinueOnError:
+			return err
+		case ExitOnError:
+			os.Exit(2)
+		case PanicOnError:
+			panic(err)
+		}
+	}
+	return nil
+}
+
+// Parsed reports whether f.Parse has been called.
+func (f *FlagSet) Parsed() bool {
+	return f.parsed
+}
+
+// Parse parses the command-line flags from os.Args[1:].  Must be called
+// after all flags are defined and before flags are accessed by the program.
+func Parse() {
+	// Ignore errors; CommandLine is set for ExitOnError.
+	CommandLine.Parse(os.Args[1:])
+}
+
+// SetInterspersed sets whether to support interspersed option/non-option arguments.
+func SetInterspersed(interspersed bool) {
+	CommandLine.SetInterspersed(interspersed)
+}
+
+// Parsed returns true if the command-line flags have been parsed.
+func Parsed() bool {
+	return CommandLine.Parsed()
+}
+
+// The default set of command-line flags, parsed from os.Args.
+var CommandLine = NewFlagSet(os.Args[0], ExitOnError)
+
+// NewFlagSet returns a new, empty flag set with the specified name and
+// error handling property.
+func NewFlagSet(name string, errorHandling ErrorHandling) *FlagSet {
+	f := &FlagSet{
+		name:          name,
+		errorHandling: errorHandling,
+		argsLenAtDash: -1,
+		interspersed:  true,
+	}
+	return f
+}
+
+// SetInterspersed sets whether to support interspersed option/non-option arguments.
+func (f *FlagSet) SetInterspersed(interspersed bool) {
+	f.interspersed = interspersed
+}
+
+// Init sets the name and error handling property for a flag set.
+// By default, the zero FlagSet uses an empty name and the
+// ContinueOnError error handling policy.
+func (f *FlagSet) Init(name string, errorHandling ErrorHandling) {
+	f.name = name
+	f.errorHandling = errorHandling
+	f.argsLenAtDash = -1
+}
diff --git a/vendor/github.com/spf13/pflag/float32.go b/vendor/github.com/spf13/pflag/float32.go
new file mode 100644
index 0000000000..7683fae1b1
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/float32.go
@@ -0,0 +1,91 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- float32 Value
+type float32Value float32
+
+func newFloat32Value(val float32, p *float32) *float32Value {
+	*p = val
+	return (*float32Value)(p)
+}
+
+func (f *float32Value) Set(s string) error {
+	v, err := strconv.ParseFloat(s, 32)
+	*f = float32Value(v)
+	return err
+}
+
+func (f *float32Value) Type() string {
+	return "float32"
+}
+
+func (f *float32Value) String() string { return fmt.Sprintf("%v", *f) }
+
+func float32Conv(sval string) (interface{}, error) {
+	v, err := strconv.ParseFloat(sval, 32)
+	if err != nil {
+		return 0, err
+	}
+	return float32(v), nil
+}
+
+// GetFloat32 return the float32 value of a flag with the given name
+func (f *FlagSet) GetFloat32(name string) (float32, error) {
+	val, err := f.getFlagType(name, "float32", float32Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(float32), nil
+}
+
+// Float32Var defines a float32 flag with specified name, default value, and usage string.
+// The argument p points to a float32 variable in which to store the value of the flag.
+func (f *FlagSet) Float32Var(p *float32, name string, value float32, usage string) {
+	f.VarP(newFloat32Value(value, p), name, "", usage)
+}
+
+// Float32VarP is like Float32Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Float32VarP(p *float32, name, shorthand string, value float32, usage string) {
+	f.VarP(newFloat32Value(value, p), name, shorthand, usage)
+}
+
+// Float32Var defines a float32 flag with specified name, default value, and usage string.
+// The argument p points to a float32 variable in which to store the value of the flag.
+func Float32Var(p *float32, name string, value float32, usage string) {
+	CommandLine.VarP(newFloat32Value(value, p), name, "", usage)
+}
+
+// Float32VarP is like Float32Var, but accepts a shorthand letter that can be used after a single dash.
+func Float32VarP(p *float32, name, shorthand string, value float32, usage string) {
+	CommandLine.VarP(newFloat32Value(value, p), name, shorthand, usage)
+}
+
+// Float32 defines a float32 flag with specified name, default value, and usage string.
+// The return value is the address of a float32 variable that stores the value of the flag.
+func (f *FlagSet) Float32(name string, value float32, usage string) *float32 {
+	p := new(float32)
+	f.Float32VarP(p, name, "", value, usage)
+	return p
+}
+
+// Float32P is like Float32, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Float32P(name, shorthand string, value float32, usage string) *float32 {
+	p := new(float32)
+	f.Float32VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Float32 defines a float32 flag with specified name, default value, and usage string.
+// The return value is the address of a float32 variable that stores the value of the flag.
+func Float32(name string, value float32, usage string) *float32 {
+	return CommandLine.Float32P(name, "", value, usage)
+}
+
+// Float32P is like Float32, but accepts a shorthand letter that can be used after a single dash.
+func Float32P(name, shorthand string, value float32, usage string) *float32 {
+	return CommandLine.Float32P(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/float64.go b/vendor/github.com/spf13/pflag/float64.go
new file mode 100644
index 0000000000..50fbf8cc1a
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/float64.go
@@ -0,0 +1,87 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- float64 Value
+type float64Value float64
+
+func newFloat64Value(val float64, p *float64) *float64Value {
+	*p = val
+	return (*float64Value)(p)
+}
+
+func (f *float64Value) Set(s string) error {
+	v, err := strconv.ParseFloat(s, 64)
+	*f = float64Value(v)
+	return err
+}
+
+func (f *float64Value) Type() string {
+	return "float64"
+}
+
+func (f *float64Value) String() string { return fmt.Sprintf("%v", *f) }
+
+func float64Conv(sval string) (interface{}, error) {
+	return strconv.ParseFloat(sval, 64)
+}
+
+// GetFloat64 return the float64 value of a flag with the given name
+func (f *FlagSet) GetFloat64(name string) (float64, error) {
+	val, err := f.getFlagType(name, "float64", float64Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(float64), nil
+}
+
+// Float64Var defines a float64 flag with specified name, default value, and usage string.
+// The argument p points to a float64 variable in which to store the value of the flag.
+func (f *FlagSet) Float64Var(p *float64, name string, value float64, usage string) {
+	f.VarP(newFloat64Value(value, p), name, "", usage)
+}
+
+// Float64VarP is like Float64Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Float64VarP(p *float64, name, shorthand string, value float64, usage string) {
+	f.VarP(newFloat64Value(value, p), name, shorthand, usage)
+}
+
+// Float64Var defines a float64 flag with specified name, default value, and usage string.
+// The argument p points to a float64 variable in which to store the value of the flag.
+func Float64Var(p *float64, name string, value float64, usage string) {
+	CommandLine.VarP(newFloat64Value(value, p), name, "", usage)
+}
+
+// Float64VarP is like Float64Var, but accepts a shorthand letter that can be used after a single dash.
+func Float64VarP(p *float64, name, shorthand string, value float64, usage string) {
+	CommandLine.VarP(newFloat64Value(value, p), name, shorthand, usage)
+}
+
+// Float64 defines a float64 flag with specified name, default value, and usage string.
+// The return value is the address of a float64 variable that stores the value of the flag.
+func (f *FlagSet) Float64(name string, value float64, usage string) *float64 {
+	p := new(float64)
+	f.Float64VarP(p, name, "", value, usage)
+	return p
+}
+
+// Float64P is like Float64, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Float64P(name, shorthand string, value float64, usage string) *float64 {
+	p := new(float64)
+	f.Float64VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Float64 defines a float64 flag with specified name, default value, and usage string.
+// The return value is the address of a float64 variable that stores the value of the flag.
+func Float64(name string, value float64, usage string) *float64 {
+	return CommandLine.Float64P(name, "", value, usage)
+}
+
+// Float64P is like Float64, but accepts a shorthand letter that can be used after a single dash.
+func Float64P(name, shorthand string, value float64, usage string) *float64 {
+	return CommandLine.Float64P(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/golangflag.go b/vendor/github.com/spf13/pflag/golangflag.go
new file mode 100644
index 0000000000..a8c24efb64
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/golangflag.go
@@ -0,0 +1,97 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package pflag
+
+import (
+	goflag "flag"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+var _ = fmt.Print
+
+// flagValueWrapper implements pflag.Value around a flag.Value.  The main
+// difference here is the addition of the Type method that returns a string
+// name of the type.  As this is generally unknown, we approximate that with
+// reflection.
+type flagValueWrapper struct {
+	inner    goflag.Value
+	flagType string
+}
+
+// We are just copying the boolFlag interface out of goflag as that is what
+// they use to decide if a flag should get "true" when no arg is given.
+type goBoolFlag interface {
+	goflag.Value
+	IsBoolFlag() bool
+}
+
+func wrapFlagValue(v goflag.Value) Value {
+	// If the flag.Value happens to also be a pflag.Value, just use it directly.
+	if pv, ok := v.(Value); ok {
+		return pv
+	}
+
+	pv := &flagValueWrapper{
+		inner: v,
+	}
+
+	t := reflect.TypeOf(v)
+	if t.Kind() == reflect.Interface || t.Kind() == reflect.Ptr {
+		t = t.Elem()
+	}
+
+	pv.flagType = strings.TrimSuffix(t.Name(), "Value")
+	return pv
+}
+
+func (v *flagValueWrapper) String() string {
+	return v.inner.String()
+}
+
+func (v *flagValueWrapper) Set(s string) error {
+	return v.inner.Set(s)
+}
+
+func (v *flagValueWrapper) Type() string {
+	return v.flagType
+}
+
+// PFlagFromGoFlag will return a *pflag.Flag given a *flag.Flag
+func PFlagFromGoFlag(goflag *goflag.Flag) *Flag {
+	// Remember the default value as a string; it won't change.
+	flag := &Flag{
+		Name:  goflag.Name,
+		Usage: goflag.Usage,
+		Value: wrapFlagValue(goflag.Value),
+		// Looks like golang flags don't set DefValue correctly  :-(
+		//DefValue: goflag.DefValue,
+		DefValue: goflag.Value.String(),
+	}
+	if fv, ok := goflag.Value.(goBoolFlag); ok && fv.IsBoolFlag() {
+		flag.NoOptDefVal = "true"
+	}
+	return flag
+}
+
+// AddGoFlag will add the given *flag.Flag to the pflag.FlagSet
+func (f *FlagSet) AddGoFlag(goflag *goflag.Flag) {
+	if f.Lookup(goflag.Name) != nil {
+		return
+	}
+	newflag := PFlagFromGoFlag(goflag)
+	f.AddFlag(newflag)
+}
+
+// AddGoFlagSet will add the given *flag.FlagSet to the pflag.FlagSet
+func (f *FlagSet) AddGoFlagSet(newSet *goflag.FlagSet) {
+	if newSet == nil {
+		return
+	}
+	newSet.VisitAll(func(goflag *goflag.Flag) {
+		f.AddGoFlag(goflag)
+	})
+}
diff --git a/vendor/github.com/spf13/pflag/int.go b/vendor/github.com/spf13/pflag/int.go
new file mode 100644
index 0000000000..b6560368a9
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/int.go
@@ -0,0 +1,87 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- int Value
+type intValue int
+
+func newIntValue(val int, p *int) *intValue {
+	*p = val
+	return (*intValue)(p)
+}
+
+func (i *intValue) Set(s string) error {
+	v, err := strconv.ParseInt(s, 0, 64)
+	*i = intValue(v)
+	return err
+}
+
+func (i *intValue) Type() string {
+	return "int"
+}
+
+func (i *intValue) String() string { return fmt.Sprintf("%v", *i) }
+
+func intConv(sval string) (interface{}, error) {
+	return strconv.Atoi(sval)
+}
+
+// GetInt return the int value of a flag with the given name
+func (f *FlagSet) GetInt(name string) (int, error) {
+	val, err := f.getFlagType(name, "int", intConv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(int), nil
+}
+
+// IntVar defines an int flag with specified name, default value, and usage string.
+// The argument p points to an int variable in which to store the value of the flag.
+func (f *FlagSet) IntVar(p *int, name string, value int, usage string) {
+	f.VarP(newIntValue(value, p), name, "", usage)
+}
+
+// IntVarP is like IntVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IntVarP(p *int, name, shorthand string, value int, usage string) {
+	f.VarP(newIntValue(value, p), name, shorthand, usage)
+}
+
+// IntVar defines an int flag with specified name, default value, and usage string.
+// The argument p points to an int variable in which to store the value of the flag.
+func IntVar(p *int, name string, value int, usage string) {
+	CommandLine.VarP(newIntValue(value, p), name, "", usage)
+}
+
+// IntVarP is like IntVar, but accepts a shorthand letter that can be used after a single dash.
+func IntVarP(p *int, name, shorthand string, value int, usage string) {
+	CommandLine.VarP(newIntValue(value, p), name, shorthand, usage)
+}
+
+// Int defines an int flag with specified name, default value, and usage string.
+// The return value is the address of an int variable that stores the value of the flag.
+func (f *FlagSet) Int(name string, value int, usage string) *int {
+	p := new(int)
+	f.IntVarP(p, name, "", value, usage)
+	return p
+}
+
+// IntP is like Int, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IntP(name, shorthand string, value int, usage string) *int {
+	p := new(int)
+	f.IntVarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Int defines an int flag with specified name, default value, and usage string.
+// The return value is the address of an int variable that stores the value of the flag.
+func Int(name string, value int, usage string) *int {
+	return CommandLine.IntP(name, "", value, usage)
+}
+
+// IntP is like Int, but accepts a shorthand letter that can be used after a single dash.
+func IntP(name, shorthand string, value int, usage string) *int {
+	return CommandLine.IntP(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/int32.go b/vendor/github.com/spf13/pflag/int32.go
new file mode 100644
index 0000000000..41659a9aff
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/int32.go
@@ -0,0 +1,91 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- int32 Value
+type int32Value int32
+
+func newInt32Value(val int32, p *int32) *int32Value {
+	*p = val
+	return (*int32Value)(p)
+}
+
+func (i *int32Value) Set(s string) error {
+	v, err := strconv.ParseInt(s, 0, 32)
+	*i = int32Value(v)
+	return err
+}
+
+func (i *int32Value) Type() string {
+	return "int32"
+}
+
+func (i *int32Value) String() string { return fmt.Sprintf("%v", *i) }
+
+func int32Conv(sval string) (interface{}, error) {
+	v, err := strconv.ParseInt(sval, 0, 32)
+	if err != nil {
+		return 0, err
+	}
+	return int32(v), nil
+}
+
+// GetInt32 return the int32 value of a flag with the given name
+func (f *FlagSet) GetInt32(name string) (int32, error) {
+	val, err := f.getFlagType(name, "int32", int32Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(int32), nil
+}
+
+// Int32Var defines an int32 flag with specified name, default value, and usage string.
+// The argument p points to an int32 variable in which to store the value of the flag.
+func (f *FlagSet) Int32Var(p *int32, name string, value int32, usage string) {
+	f.VarP(newInt32Value(value, p), name, "", usage)
+}
+
+// Int32VarP is like Int32Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Int32VarP(p *int32, name, shorthand string, value int32, usage string) {
+	f.VarP(newInt32Value(value, p), name, shorthand, usage)
+}
+
+// Int32Var defines an int32 flag with specified name, default value, and usage string.
+// The argument p points to an int32 variable in which to store the value of the flag.
+func Int32Var(p *int32, name string, value int32, usage string) {
+	CommandLine.VarP(newInt32Value(value, p), name, "", usage)
+}
+
+// Int32VarP is like Int32Var, but accepts a shorthand letter that can be used after a single dash.
+func Int32VarP(p *int32, name, shorthand string, value int32, usage string) {
+	CommandLine.VarP(newInt32Value(value, p), name, shorthand, usage)
+}
+
+// Int32 defines an int32 flag with specified name, default value, and usage string.
+// The return value is the address of an int32 variable that stores the value of the flag.
+func (f *FlagSet) Int32(name string, value int32, usage string) *int32 {
+	p := new(int32)
+	f.Int32VarP(p, name, "", value, usage)
+	return p
+}
+
+// Int32P is like Int32, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Int32P(name, shorthand string, value int32, usage string) *int32 {
+	p := new(int32)
+	f.Int32VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Int32 defines an int32 flag with specified name, default value, and usage string.
+// The return value is the address of an int32 variable that stores the value of the flag.
+func Int32(name string, value int32, usage string) *int32 {
+	return CommandLine.Int32P(name, "", value, usage)
+}
+
+// Int32P is like Int32, but accepts a shorthand letter that can be used after a single dash.
+func Int32P(name, shorthand string, value int32, usage string) *int32 {
+	return CommandLine.Int32P(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/int64.go b/vendor/github.com/spf13/pflag/int64.go
new file mode 100644
index 0000000000..6e67e380f4
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/int64.go
@@ -0,0 +1,87 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- int64 Value
+type int64Value int64
+
+func newInt64Value(val int64, p *int64) *int64Value {
+	*p = val
+	return (*int64Value)(p)
+}
+
+func (i *int64Value) Set(s string) error {
+	v, err := strconv.ParseInt(s, 0, 64)
+	*i = int64Value(v)
+	return err
+}
+
+func (i *int64Value) Type() string {
+	return "int64"
+}
+
+func (i *int64Value) String() string { return fmt.Sprintf("%v", *i) }
+
+func int64Conv(sval string) (interface{}, error) {
+	return strconv.ParseInt(sval, 0, 64)
+}
+
+// GetInt64 return the int64 value of a flag with the given name
+func (f *FlagSet) GetInt64(name string) (int64, error) {
+	val, err := f.getFlagType(name, "int64", int64Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(int64), nil
+}
+
+// Int64Var defines an int64 flag with specified name, default value, and usage string.
+// The argument p points to an int64 variable in which to store the value of the flag.
+func (f *FlagSet) Int64Var(p *int64, name string, value int64, usage string) {
+	f.VarP(newInt64Value(value, p), name, "", usage)
+}
+
+// Int64VarP is like Int64Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Int64VarP(p *int64, name, shorthand string, value int64, usage string) {
+	f.VarP(newInt64Value(value, p), name, shorthand, usage)
+}
+
+// Int64Var defines an int64 flag with specified name, default value, and usage string.
+// The argument p points to an int64 variable in which to store the value of the flag.
+func Int64Var(p *int64, name string, value int64, usage string) {
+	CommandLine.VarP(newInt64Value(value, p), name, "", usage)
+}
+
+// Int64VarP is like Int64Var, but accepts a shorthand letter that can be used after a single dash.
+func Int64VarP(p *int64, name, shorthand string, value int64, usage string) {
+	CommandLine.VarP(newInt64Value(value, p), name, shorthand, usage)
+}
+
+// Int64 defines an int64 flag with specified name, default value, and usage string.
+// The return value is the address of an int64 variable that stores the value of the flag.
+func (f *FlagSet) Int64(name string, value int64, usage string) *int64 {
+	p := new(int64)
+	f.Int64VarP(p, name, "", value, usage)
+	return p
+}
+
+// Int64P is like Int64, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Int64P(name, shorthand string, value int64, usage string) *int64 {
+	p := new(int64)
+	f.Int64VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Int64 defines an int64 flag with specified name, default value, and usage string.
+// The return value is the address of an int64 variable that stores the value of the flag.
+func Int64(name string, value int64, usage string) *int64 {
+	return CommandLine.Int64P(name, "", value, usage)
+}
+
+// Int64P is like Int64, but accepts a shorthand letter that can be used after a single dash.
+func Int64P(name, shorthand string, value int64, usage string) *int64 {
+	return CommandLine.Int64P(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/int8.go b/vendor/github.com/spf13/pflag/int8.go
new file mode 100644
index 0000000000..400db21f5e
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/int8.go
@@ -0,0 +1,91 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- int8 Value
+type int8Value int8
+
+func newInt8Value(val int8, p *int8) *int8Value {
+	*p = val
+	return (*int8Value)(p)
+}
+
+func (i *int8Value) Set(s string) error {
+	v, err := strconv.ParseInt(s, 0, 8)
+	*i = int8Value(v)
+	return err
+}
+
+func (i *int8Value) Type() string {
+	return "int8"
+}
+
+func (i *int8Value) String() string { return fmt.Sprintf("%v", *i) }
+
+func int8Conv(sval string) (interface{}, error) {
+	v, err := strconv.ParseInt(sval, 0, 8)
+	if err != nil {
+		return 0, err
+	}
+	return int8(v), nil
+}
+
+// GetInt8 return the int8 value of a flag with the given name
+func (f *FlagSet) GetInt8(name string) (int8, error) {
+	val, err := f.getFlagType(name, "int8", int8Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(int8), nil
+}
+
+// Int8Var defines an int8 flag with specified name, default value, and usage string.
+// The argument p points to an int8 variable in which to store the value of the flag.
+func (f *FlagSet) Int8Var(p *int8, name string, value int8, usage string) {
+	f.VarP(newInt8Value(value, p), name, "", usage)
+}
+
+// Int8VarP is like Int8Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Int8VarP(p *int8, name, shorthand string, value int8, usage string) {
+	f.VarP(newInt8Value(value, p), name, shorthand, usage)
+}
+
+// Int8Var defines an int8 flag with specified name, default value, and usage string.
+// The argument p points to an int8 variable in which to store the value of the flag.
+func Int8Var(p *int8, name string, value int8, usage string) {
+	CommandLine.VarP(newInt8Value(value, p), name, "", usage)
+}
+
+// Int8VarP is like Int8Var, but accepts a shorthand letter that can be used after a single dash.
+func Int8VarP(p *int8, name, shorthand string, value int8, usage string) {
+	CommandLine.VarP(newInt8Value(value, p), name, shorthand, usage)
+}
+
+// Int8 defines an int8 flag with specified name, default value, and usage string.
+// The return value is the address of an int8 variable that stores the value of the flag.
+func (f *FlagSet) Int8(name string, value int8, usage string) *int8 {
+	p := new(int8)
+	f.Int8VarP(p, name, "", value, usage)
+	return p
+}
+
+// Int8P is like Int8, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Int8P(name, shorthand string, value int8, usage string) *int8 {
+	p := new(int8)
+	f.Int8VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Int8 defines an int8 flag with specified name, default value, and usage string.
+// The return value is the address of an int8 variable that stores the value of the flag.
+func Int8(name string, value int8, usage string) *int8 {
+	return CommandLine.Int8P(name, "", value, usage)
+}
+
+// Int8P is like Int8, but accepts a shorthand letter that can be used after a single dash.
+func Int8P(name, shorthand string, value int8, usage string) *int8 {
+	return CommandLine.Int8P(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/int_slice.go b/vendor/github.com/spf13/pflag/int_slice.go
new file mode 100644
index 0000000000..1e7c9edde9
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/int_slice.go
@@ -0,0 +1,128 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+// -- intSlice Value
+type intSliceValue struct {
+	value   *[]int
+	changed bool
+}
+
+func newIntSliceValue(val []int, p *[]int) *intSliceValue {
+	isv := new(intSliceValue)
+	isv.value = p
+	*isv.value = val
+	return isv
+}
+
+func (s *intSliceValue) Set(val string) error {
+	ss := strings.Split(val, ",")
+	out := make([]int, len(ss))
+	for i, d := range ss {
+		var err error
+		out[i], err = strconv.Atoi(d)
+		if err != nil {
+			return err
+		}
+
+	}
+	if !s.changed {
+		*s.value = out
+	} else {
+		*s.value = append(*s.value, out...)
+	}
+	s.changed = true
+	return nil
+}
+
+func (s *intSliceValue) Type() string {
+	return "intSlice"
+}
+
+func (s *intSliceValue) String() string {
+	out := make([]string, len(*s.value))
+	for i, d := range *s.value {
+		out[i] = fmt.Sprintf("%d", d)
+	}
+	return "[" + strings.Join(out, ",") + "]"
+}
+
+func intSliceConv(val string) (interface{}, error) {
+	val = strings.Trim(val, "[]")
+	// Empty string would cause a slice with one (empty) entry
+	if len(val) == 0 {
+		return []int{}, nil
+	}
+	ss := strings.Split(val, ",")
+	out := make([]int, len(ss))
+	for i, d := range ss {
+		var err error
+		out[i], err = strconv.Atoi(d)
+		if err != nil {
+			return nil, err
+		}
+
+	}
+	return out, nil
+}
+
+// GetIntSlice return the []int value of a flag with the given name
+func (f *FlagSet) GetIntSlice(name string) ([]int, error) {
+	val, err := f.getFlagType(name, "intSlice", intSliceConv)
+	if err != nil {
+		return []int{}, err
+	}
+	return val.([]int), nil
+}
+
+// IntSliceVar defines a intSlice flag with specified name, default value, and usage string.
+// The argument p points to a []int variable in which to store the value of the flag.
+func (f *FlagSet) IntSliceVar(p *[]int, name string, value []int, usage string) {
+	f.VarP(newIntSliceValue(value, p), name, "", usage)
+}
+
+// IntSliceVarP is like IntSliceVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IntSliceVarP(p *[]int, name, shorthand string, value []int, usage string) {
+	f.VarP(newIntSliceValue(value, p), name, shorthand, usage)
+}
+
+// IntSliceVar defines a int[] flag with specified name, default value, and usage string.
+// The argument p points to a int[] variable in which to store the value of the flag.
+func IntSliceVar(p *[]int, name string, value []int, usage string) {
+	CommandLine.VarP(newIntSliceValue(value, p), name, "", usage)
+}
+
+// IntSliceVarP is like IntSliceVar, but accepts a shorthand letter that can be used after a single dash.
+func IntSliceVarP(p *[]int, name, shorthand string, value []int, usage string) {
+	CommandLine.VarP(newIntSliceValue(value, p), name, shorthand, usage)
+}
+
+// IntSlice defines a []int flag with specified name, default value, and usage string.
+// The return value is the address of a []int variable that stores the value of the flag.
+func (f *FlagSet) IntSlice(name string, value []int, usage string) *[]int {
+	p := []int{}
+	f.IntSliceVarP(&p, name, "", value, usage)
+	return &p
+}
+
+// IntSliceP is like IntSlice, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IntSliceP(name, shorthand string, value []int, usage string) *[]int {
+	p := []int{}
+	f.IntSliceVarP(&p, name, shorthand, value, usage)
+	return &p
+}
+
+// IntSlice defines a []int flag with specified name, default value, and usage string.
+// The return value is the address of a []int variable that stores the value of the flag.
+func IntSlice(name string, value []int, usage string) *[]int {
+	return CommandLine.IntSliceP(name, "", value, usage)
+}
+
+// IntSliceP is like IntSlice, but accepts a shorthand letter that can be used after a single dash.
+func IntSliceP(name, shorthand string, value []int, usage string) *[]int {
+	return CommandLine.IntSliceP(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/ip.go b/vendor/github.com/spf13/pflag/ip.go
new file mode 100644
index 0000000000..88a17430a0
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/ip.go
@@ -0,0 +1,96 @@
+package pflag
+
+import (
+	"fmt"
+	"net"
+	"strings"
+)
+
+var _ = strings.TrimSpace
+
+// -- net.IP value
+type ipValue net.IP
+
+func newIPValue(val net.IP, p *net.IP) *ipValue {
+	*p = val
+	return (*ipValue)(p)
+}
+
+func (i *ipValue) String() string { return net.IP(*i).String() }
+func (i *ipValue) Set(s string) error {
+	ip := net.ParseIP(strings.TrimSpace(s))
+	if ip == nil {
+		return fmt.Errorf("failed to parse IP: %q", s)
+	}
+	*i = ipValue(ip)
+	return nil
+}
+
+func (i *ipValue) Type() string {
+	return "ip"
+}
+
+func ipConv(sval string) (interface{}, error) {
+	ip := net.ParseIP(sval)
+	if ip != nil {
+		return ip, nil
+	}
+	return nil, fmt.Errorf("invalid string being converted to IP address: %s", sval)
+}
+
+// GetIP return the net.IP value of a flag with the given name
+func (f *FlagSet) GetIP(name string) (net.IP, error) {
+	val, err := f.getFlagType(name, "ip", ipConv)
+	if err != nil {
+		return nil, err
+	}
+	return val.(net.IP), nil
+}
+
+// IPVar defines an net.IP flag with specified name, default value, and usage string.
+// The argument p points to an net.IP variable in which to store the value of the flag.
+func (f *FlagSet) IPVar(p *net.IP, name string, value net.IP, usage string) {
+	f.VarP(newIPValue(value, p), name, "", usage)
+}
+
+// IPVarP is like IPVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IPVarP(p *net.IP, name, shorthand string, value net.IP, usage string) {
+	f.VarP(newIPValue(value, p), name, shorthand, usage)
+}
+
+// IPVar defines an net.IP flag with specified name, default value, and usage string.
+// The argument p points to an net.IP variable in which to store the value of the flag.
+func IPVar(p *net.IP, name string, value net.IP, usage string) {
+	CommandLine.VarP(newIPValue(value, p), name, "", usage)
+}
+
+// IPVarP is like IPVar, but accepts a shorthand letter that can be used after a single dash.
+func IPVarP(p *net.IP, name, shorthand string, value net.IP, usage string) {
+	CommandLine.VarP(newIPValue(value, p), name, shorthand, usage)
+}
+
+// IP defines an net.IP flag with specified name, default value, and usage string.
+// The return value is the address of an net.IP variable that stores the value of the flag.
+func (f *FlagSet) IP(name string, value net.IP, usage string) *net.IP {
+	p := new(net.IP)
+	f.IPVarP(p, name, "", value, usage)
+	return p
+}
+
+// IPP is like IP, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IPP(name, shorthand string, value net.IP, usage string) *net.IP {
+	p := new(net.IP)
+	f.IPVarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// IP defines an net.IP flag with specified name, default value, and usage string.
+// The return value is the address of an net.IP variable that stores the value of the flag.
+func IP(name string, value net.IP, usage string) *net.IP {
+	return CommandLine.IPP(name, "", value, usage)
+}
+
+// IPP is like IP, but accepts a shorthand letter that can be used after a single dash.
+func IPP(name, shorthand string, value net.IP, usage string) *net.IP {
+	return CommandLine.IPP(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/ipmask.go b/vendor/github.com/spf13/pflag/ipmask.go
new file mode 100644
index 0000000000..5bd44bd21d
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/ipmask.go
@@ -0,0 +1,122 @@
+package pflag
+
+import (
+	"fmt"
+	"net"
+	"strconv"
+)
+
+// -- net.IPMask value
+type ipMaskValue net.IPMask
+
+func newIPMaskValue(val net.IPMask, p *net.IPMask) *ipMaskValue {
+	*p = val
+	return (*ipMaskValue)(p)
+}
+
+func (i *ipMaskValue) String() string { return net.IPMask(*i).String() }
+func (i *ipMaskValue) Set(s string) error {
+	ip := ParseIPv4Mask(s)
+	if ip == nil {
+		return fmt.Errorf("failed to parse IP mask: %q", s)
+	}
+	*i = ipMaskValue(ip)
+	return nil
+}
+
+func (i *ipMaskValue) Type() string {
+	return "ipMask"
+}
+
+// ParseIPv4Mask written in IP form (e.g. 255.255.255.0).
+// This function should really belong to the net package.
+func ParseIPv4Mask(s string) net.IPMask {
+	mask := net.ParseIP(s)
+	if mask == nil {
+		if len(s) != 8 {
+			return nil
+		}
+		// net.IPMask.String() actually outputs things like ffffff00
+		// so write a horrible parser for that as well  :-(
+		m := []int{}
+		for i := 0; i < 4; i++ {
+			b := "0x" + s[2*i:2*i+2]
+			d, err := strconv.ParseInt(b, 0, 0)
+			if err != nil {
+				return nil
+			}
+			m = append(m, int(d))
+		}
+		s := fmt.Sprintf("%d.%d.%d.%d", m[0], m[1], m[2], m[3])
+		mask = net.ParseIP(s)
+		if mask == nil {
+			return nil
+		}
+	}
+	return net.IPv4Mask(mask[12], mask[13], mask[14], mask[15])
+}
+
+func parseIPv4Mask(sval string) (interface{}, error) {
+	mask := ParseIPv4Mask(sval)
+	if mask == nil {
+		return nil, fmt.Errorf("unable to parse %s as net.IPMask", sval)
+	}
+	return mask, nil
+}
+
+// GetIPv4Mask return the net.IPv4Mask value of a flag with the given name
+func (f *FlagSet) GetIPv4Mask(name string) (net.IPMask, error) {
+	val, err := f.getFlagType(name, "ipMask", parseIPv4Mask)
+	if err != nil {
+		return nil, err
+	}
+	return val.(net.IPMask), nil
+}
+
+// IPMaskVar defines an net.IPMask flag with specified name, default value, and usage string.
+// The argument p points to an net.IPMask variable in which to store the value of the flag.
+func (f *FlagSet) IPMaskVar(p *net.IPMask, name string, value net.IPMask, usage string) {
+	f.VarP(newIPMaskValue(value, p), name, "", usage)
+}
+
+// IPMaskVarP is like IPMaskVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IPMaskVarP(p *net.IPMask, name, shorthand string, value net.IPMask, usage string) {
+	f.VarP(newIPMaskValue(value, p), name, shorthand, usage)
+}
+
+// IPMaskVar defines an net.IPMask flag with specified name, default value, and usage string.
+// The argument p points to an net.IPMask variable in which to store the value of the flag.
+func IPMaskVar(p *net.IPMask, name string, value net.IPMask, usage string) {
+	CommandLine.VarP(newIPMaskValue(value, p), name, "", usage)
+}
+
+// IPMaskVarP is like IPMaskVar, but accepts a shorthand letter that can be used after a single dash.
+func IPMaskVarP(p *net.IPMask, name, shorthand string, value net.IPMask, usage string) {
+	CommandLine.VarP(newIPMaskValue(value, p), name, shorthand, usage)
+}
+
+// IPMask defines an net.IPMask flag with specified name, default value, and usage string.
+// The return value is the address of an net.IPMask variable that stores the value of the flag.
+func (f *FlagSet) IPMask(name string, value net.IPMask, usage string) *net.IPMask {
+	p := new(net.IPMask)
+	f.IPMaskVarP(p, name, "", value, usage)
+	return p
+}
+
+// IPMaskP is like IPMask, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IPMaskP(name, shorthand string, value net.IPMask, usage string) *net.IPMask {
+	p := new(net.IPMask)
+	f.IPMaskVarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// IPMask defines an net.IPMask flag with specified name, default value, and usage string.
+// The return value is the address of an net.IPMask variable that stores the value of the flag.
+func IPMask(name string, value net.IPMask, usage string) *net.IPMask {
+	return CommandLine.IPMaskP(name, "", value, usage)
+}
+
+// IPMaskP is like IP, but accepts a shorthand letter that can be used after a single dash.
+func IPMaskP(name, shorthand string, value net.IPMask, usage string) *net.IPMask {
+	return CommandLine.IPMaskP(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/ipnet.go b/vendor/github.com/spf13/pflag/ipnet.go
new file mode 100644
index 0000000000..149b764b1e
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/ipnet.go
@@ -0,0 +1,100 @@
+package pflag
+
+import (
+	"fmt"
+	"net"
+	"strings"
+)
+
+// IPNet adapts net.IPNet for use as a flag.
+type ipNetValue net.IPNet
+
+func (ipnet ipNetValue) String() string {
+	n := net.IPNet(ipnet)
+	return n.String()
+}
+
+func (ipnet *ipNetValue) Set(value string) error {
+	_, n, err := net.ParseCIDR(strings.TrimSpace(value))
+	if err != nil {
+		return err
+	}
+	*ipnet = ipNetValue(*n)
+	return nil
+}
+
+func (*ipNetValue) Type() string {
+	return "ipNet"
+}
+
+var _ = strings.TrimSpace
+
+func newIPNetValue(val net.IPNet, p *net.IPNet) *ipNetValue {
+	*p = val
+	return (*ipNetValue)(p)
+}
+
+func ipNetConv(sval string) (interface{}, error) {
+	_, n, err := net.ParseCIDR(strings.TrimSpace(sval))
+	if err == nil {
+		return *n, nil
+	}
+	return nil, fmt.Errorf("invalid string being converted to IPNet: %s", sval)
+}
+
+// GetIPNet return the net.IPNet value of a flag with the given name
+func (f *FlagSet) GetIPNet(name string) (net.IPNet, error) {
+	val, err := f.getFlagType(name, "ipNet", ipNetConv)
+	if err != nil {
+		return net.IPNet{}, err
+	}
+	return val.(net.IPNet), nil
+}
+
+// IPNetVar defines an net.IPNet flag with specified name, default value, and usage string.
+// The argument p points to an net.IPNet variable in which to store the value of the flag.
+func (f *FlagSet) IPNetVar(p *net.IPNet, name string, value net.IPNet, usage string) {
+	f.VarP(newIPNetValue(value, p), name, "", usage)
+}
+
+// IPNetVarP is like IPNetVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IPNetVarP(p *net.IPNet, name, shorthand string, value net.IPNet, usage string) {
+	f.VarP(newIPNetValue(value, p), name, shorthand, usage)
+}
+
+// IPNetVar defines an net.IPNet flag with specified name, default value, and usage string.
+// The argument p points to an net.IPNet variable in which to store the value of the flag.
+func IPNetVar(p *net.IPNet, name string, value net.IPNet, usage string) {
+	CommandLine.VarP(newIPNetValue(value, p), name, "", usage)
+}
+
+// IPNetVarP is like IPNetVar, but accepts a shorthand letter that can be used after a single dash.
+func IPNetVarP(p *net.IPNet, name, shorthand string, value net.IPNet, usage string) {
+	CommandLine.VarP(newIPNetValue(value, p), name, shorthand, usage)
+}
+
+// IPNet defines an net.IPNet flag with specified name, default value, and usage string.
+// The return value is the address of an net.IPNet variable that stores the value of the flag.
+func (f *FlagSet) IPNet(name string, value net.IPNet, usage string) *net.IPNet {
+	p := new(net.IPNet)
+	f.IPNetVarP(p, name, "", value, usage)
+	return p
+}
+
+// IPNetP is like IPNet, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) IPNetP(name, shorthand string, value net.IPNet, usage string) *net.IPNet {
+	p := new(net.IPNet)
+	f.IPNetVarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// IPNet defines an net.IPNet flag with specified name, default value, and usage string.
+// The return value is the address of an net.IPNet variable that stores the value of the flag.
+func IPNet(name string, value net.IPNet, usage string) *net.IPNet {
+	return CommandLine.IPNetP(name, "", value, usage)
+}
+
+// IPNetP is like IPNet, but accepts a shorthand letter that can be used after a single dash.
+func IPNetP(name, shorthand string, value net.IPNet, usage string) *net.IPNet {
+	return CommandLine.IPNetP(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/string.go b/vendor/github.com/spf13/pflag/string.go
new file mode 100644
index 0000000000..e296136e5b
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/string.go
@@ -0,0 +1,82 @@
+package pflag
+
+import "fmt"
+
+// -- string Value
+type stringValue string
+
+func newStringValue(val string, p *string) *stringValue {
+	*p = val
+	return (*stringValue)(p)
+}
+
+func (s *stringValue) Set(val string) error {
+	*s = stringValue(val)
+	return nil
+}
+func (s *stringValue) Type() string {
+	return "string"
+}
+
+func (s *stringValue) String() string { return fmt.Sprintf("%s", *s) }
+
+func stringConv(sval string) (interface{}, error) {
+	return sval, nil
+}
+
+// GetString return the string value of a flag with the given name
+func (f *FlagSet) GetString(name string) (string, error) {
+	val, err := f.getFlagType(name, "string", stringConv)
+	if err != nil {
+		return "", err
+	}
+	return val.(string), nil
+}
+
+// StringVar defines a string flag with specified name, default value, and usage string.
+// The argument p points to a string variable in which to store the value of the flag.
+func (f *FlagSet) StringVar(p *string, name string, value string, usage string) {
+	f.VarP(newStringValue(value, p), name, "", usage)
+}
+
+// StringVarP is like StringVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) StringVarP(p *string, name, shorthand string, value string, usage string) {
+	f.VarP(newStringValue(value, p), name, shorthand, usage)
+}
+
+// StringVar defines a string flag with specified name, default value, and usage string.
+// The argument p points to a string variable in which to store the value of the flag.
+func StringVar(p *string, name string, value string, usage string) {
+	CommandLine.VarP(newStringValue(value, p), name, "", usage)
+}
+
+// StringVarP is like StringVar, but accepts a shorthand letter that can be used after a single dash.
+func StringVarP(p *string, name, shorthand string, value string, usage string) {
+	CommandLine.VarP(newStringValue(value, p), name, shorthand, usage)
+}
+
+// String defines a string flag with specified name, default value, and usage string.
+// The return value is the address of a string variable that stores the value of the flag.
+func (f *FlagSet) String(name string, value string, usage string) *string {
+	p := new(string)
+	f.StringVarP(p, name, "", value, usage)
+	return p
+}
+
+// StringP is like String, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) StringP(name, shorthand string, value string, usage string) *string {
+	p := new(string)
+	f.StringVarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// String defines a string flag with specified name, default value, and usage string.
+// The return value is the address of a string variable that stores the value of the flag.
+func String(name string, value string, usage string) *string {
+	return CommandLine.StringP(name, "", value, usage)
+}
+
+// StringP is like String, but accepts a shorthand letter that can be used after a single dash.
+func StringP(name, shorthand string, value string, usage string) *string {
+	return CommandLine.StringP(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/string_slice.go b/vendor/github.com/spf13/pflag/string_slice.go
new file mode 100644
index 0000000000..b53648b2e5
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/string_slice.go
@@ -0,0 +1,111 @@
+package pflag
+
+import (
+	"encoding/csv"
+	"fmt"
+	"strings"
+)
+
+var _ = fmt.Fprint
+
+// -- stringSlice Value
+type stringSliceValue struct {
+	value   *[]string
+	changed bool
+}
+
+func newStringSliceValue(val []string, p *[]string) *stringSliceValue {
+	ssv := new(stringSliceValue)
+	ssv.value = p
+	*ssv.value = val
+	return ssv
+}
+
+func (s *stringSliceValue) Set(val string) error {
+	stringReader := strings.NewReader(val)
+	csvReader := csv.NewReader(stringReader)
+	v, err := csvReader.Read()
+	if err != nil {
+		return err
+	}
+	if !s.changed {
+		*s.value = v
+	} else {
+		*s.value = append(*s.value, v...)
+	}
+	s.changed = true
+	return nil
+}
+
+func (s *stringSliceValue) Type() string {
+	return "stringSlice"
+}
+
+func (s *stringSliceValue) String() string { return "[" + strings.Join(*s.value, ",") + "]" }
+
+func stringSliceConv(sval string) (interface{}, error) {
+	sval = strings.Trim(sval, "[]")
+	// An empty string would cause a slice with one (empty) string
+	if len(sval) == 0 {
+		return []string{}, nil
+	}
+	v := strings.Split(sval, ",")
+	return v, nil
+}
+
+// GetStringSlice return the []string value of a flag with the given name
+func (f *FlagSet) GetStringSlice(name string) ([]string, error) {
+	val, err := f.getFlagType(name, "stringSlice", stringSliceConv)
+	if err != nil {
+		return []string{}, err
+	}
+	return val.([]string), nil
+}
+
+// StringSliceVar defines a string flag with specified name, default value, and usage string.
+// The argument p points to a []string variable in which to store the value of the flag.
+func (f *FlagSet) StringSliceVar(p *[]string, name string, value []string, usage string) {
+	f.VarP(newStringSliceValue(value, p), name, "", usage)
+}
+
+// StringSliceVarP is like StringSliceVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) StringSliceVarP(p *[]string, name, shorthand string, value []string, usage string) {
+	f.VarP(newStringSliceValue(value, p), name, shorthand, usage)
+}
+
+// StringSliceVar defines a string flag with specified name, default value, and usage string.
+// The argument p points to a []string variable in which to store the value of the flag.
+func StringSliceVar(p *[]string, name string, value []string, usage string) {
+	CommandLine.VarP(newStringSliceValue(value, p), name, "", usage)
+}
+
+// StringSliceVarP is like StringSliceVar, but accepts a shorthand letter that can be used after a single dash.
+func StringSliceVarP(p *[]string, name, shorthand string, value []string, usage string) {
+	CommandLine.VarP(newStringSliceValue(value, p), name, shorthand, usage)
+}
+
+// StringSlice defines a string flag with specified name, default value, and usage string.
+// The return value is the address of a []string variable that stores the value of the flag.
+func (f *FlagSet) StringSlice(name string, value []string, usage string) *[]string {
+	p := []string{}
+	f.StringSliceVarP(&p, name, "", value, usage)
+	return &p
+}
+
+// StringSliceP is like StringSlice, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) StringSliceP(name, shorthand string, value []string, usage string) *[]string {
+	p := []string{}
+	f.StringSliceVarP(&p, name, shorthand, value, usage)
+	return &p
+}
+
+// StringSlice defines a string flag with specified name, default value, and usage string.
+// The return value is the address of a []string variable that stores the value of the flag.
+func StringSlice(name string, value []string, usage string) *[]string {
+	return CommandLine.StringSliceP(name, "", value, usage)
+}
+
+// StringSliceP is like StringSlice, but accepts a shorthand letter that can be used after a single dash.
+func StringSliceP(name, shorthand string, value []string, usage string) *[]string {
+	return CommandLine.StringSliceP(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/uint.go b/vendor/github.com/spf13/pflag/uint.go
new file mode 100644
index 0000000000..e142b49964
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/uint.go
@@ -0,0 +1,91 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- uint Value
+type uintValue uint
+
+func newUintValue(val uint, p *uint) *uintValue {
+	*p = val
+	return (*uintValue)(p)
+}
+
+func (i *uintValue) Set(s string) error {
+	v, err := strconv.ParseUint(s, 0, 64)
+	*i = uintValue(v)
+	return err
+}
+
+func (i *uintValue) Type() string {
+	return "uint"
+}
+
+func (i *uintValue) String() string { return fmt.Sprintf("%v", *i) }
+
+func uintConv(sval string) (interface{}, error) {
+	v, err := strconv.ParseUint(sval, 0, 0)
+	if err != nil {
+		return 0, err
+	}
+	return uint(v), nil
+}
+
+// GetUint return the uint value of a flag with the given name
+func (f *FlagSet) GetUint(name string) (uint, error) {
+	val, err := f.getFlagType(name, "uint", uintConv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(uint), nil
+}
+
+// UintVar defines a uint flag with specified name, default value, and usage string.
+// The argument p points to a uint variable in which to store the value of the flag.
+func (f *FlagSet) UintVar(p *uint, name string, value uint, usage string) {
+	f.VarP(newUintValue(value, p), name, "", usage)
+}
+
+// UintVarP is like UintVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) UintVarP(p *uint, name, shorthand string, value uint, usage string) {
+	f.VarP(newUintValue(value, p), name, shorthand, usage)
+}
+
+// UintVar defines a uint flag with specified name, default value, and usage string.
+// The argument p points to a uint  variable in which to store the value of the flag.
+func UintVar(p *uint, name string, value uint, usage string) {
+	CommandLine.VarP(newUintValue(value, p), name, "", usage)
+}
+
+// UintVarP is like UintVar, but accepts a shorthand letter that can be used after a single dash.
+func UintVarP(p *uint, name, shorthand string, value uint, usage string) {
+	CommandLine.VarP(newUintValue(value, p), name, shorthand, usage)
+}
+
+// Uint defines a uint flag with specified name, default value, and usage string.
+// The return value is the address of a uint  variable that stores the value of the flag.
+func (f *FlagSet) Uint(name string, value uint, usage string) *uint {
+	p := new(uint)
+	f.UintVarP(p, name, "", value, usage)
+	return p
+}
+
+// UintP is like Uint, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) UintP(name, shorthand string, value uint, usage string) *uint {
+	p := new(uint)
+	f.UintVarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Uint defines a uint flag with specified name, default value, and usage string.
+// The return value is the address of a uint  variable that stores the value of the flag.
+func Uint(name string, value uint, usage string) *uint {
+	return CommandLine.UintP(name, "", value, usage)
+}
+
+// UintP is like Uint, but accepts a shorthand letter that can be used after a single dash.
+func UintP(name, shorthand string, value uint, usage string) *uint {
+	return CommandLine.UintP(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/uint16.go b/vendor/github.com/spf13/pflag/uint16.go
new file mode 100644
index 0000000000..5c96c19dcf
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/uint16.go
@@ -0,0 +1,89 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- uint16 value
+type uint16Value uint16
+
+func newUint16Value(val uint16, p *uint16) *uint16Value {
+	*p = val
+	return (*uint16Value)(p)
+}
+func (i *uint16Value) String() string { return fmt.Sprintf("%d", *i) }
+func (i *uint16Value) Set(s string) error {
+	v, err := strconv.ParseUint(s, 0, 16)
+	*i = uint16Value(v)
+	return err
+}
+
+func (i *uint16Value) Type() string {
+	return "uint16"
+}
+
+func uint16Conv(sval string) (interface{}, error) {
+	v, err := strconv.ParseUint(sval, 0, 16)
+	if err != nil {
+		return 0, err
+	}
+	return uint16(v), nil
+}
+
+// GetUint16 return the uint16 value of a flag with the given name
+func (f *FlagSet) GetUint16(name string) (uint16, error) {
+	val, err := f.getFlagType(name, "uint16", uint16Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(uint16), nil
+}
+
+// Uint16Var defines a uint flag with specified name, default value, and usage string.
+// The argument p points to a uint variable in which to store the value of the flag.
+func (f *FlagSet) Uint16Var(p *uint16, name string, value uint16, usage string) {
+	f.VarP(newUint16Value(value, p), name, "", usage)
+}
+
+// Uint16VarP is like Uint16Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Uint16VarP(p *uint16, name, shorthand string, value uint16, usage string) {
+	f.VarP(newUint16Value(value, p), name, shorthand, usage)
+}
+
+// Uint16Var defines a uint flag with specified name, default value, and usage string.
+// The argument p points to a uint  variable in which to store the value of the flag.
+func Uint16Var(p *uint16, name string, value uint16, usage string) {
+	CommandLine.VarP(newUint16Value(value, p), name, "", usage)
+}
+
+// Uint16VarP is like Uint16Var, but accepts a shorthand letter that can be used after a single dash.
+func Uint16VarP(p *uint16, name, shorthand string, value uint16, usage string) {
+	CommandLine.VarP(newUint16Value(value, p), name, shorthand, usage)
+}
+
+// Uint16 defines a uint flag with specified name, default value, and usage string.
+// The return value is the address of a uint  variable that stores the value of the flag.
+func (f *FlagSet) Uint16(name string, value uint16, usage string) *uint16 {
+	p := new(uint16)
+	f.Uint16VarP(p, name, "", value, usage)
+	return p
+}
+
+// Uint16P is like Uint16, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Uint16P(name, shorthand string, value uint16, usage string) *uint16 {
+	p := new(uint16)
+	f.Uint16VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Uint16 defines a uint flag with specified name, default value, and usage string.
+// The return value is the address of a uint  variable that stores the value of the flag.
+func Uint16(name string, value uint16, usage string) *uint16 {
+	return CommandLine.Uint16P(name, "", value, usage)
+}
+
+// Uint16P is like Uint16, but accepts a shorthand letter that can be used after a single dash.
+func Uint16P(name, shorthand string, value uint16, usage string) *uint16 {
+	return CommandLine.Uint16P(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/uint32.go b/vendor/github.com/spf13/pflag/uint32.go
new file mode 100644
index 0000000000..294fcaa32d
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/uint32.go
@@ -0,0 +1,89 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- uint16 value
+type uint32Value uint32
+
+func newUint32Value(val uint32, p *uint32) *uint32Value {
+	*p = val
+	return (*uint32Value)(p)
+}
+func (i *uint32Value) String() string { return fmt.Sprintf("%d", *i) }
+func (i *uint32Value) Set(s string) error {
+	v, err := strconv.ParseUint(s, 0, 32)
+	*i = uint32Value(v)
+	return err
+}
+
+func (i *uint32Value) Type() string {
+	return "uint32"
+}
+
+func uint32Conv(sval string) (interface{}, error) {
+	v, err := strconv.ParseUint(sval, 0, 32)
+	if err != nil {
+		return 0, err
+	}
+	return uint32(v), nil
+}
+
+// GetUint32 return the uint32 value of a flag with the given name
+func (f *FlagSet) GetUint32(name string) (uint32, error) {
+	val, err := f.getFlagType(name, "uint32", uint32Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(uint32), nil
+}
+
+// Uint32Var defines a uint32 flag with specified name, default value, and usage string.
+// The argument p points to a uint32 variable in which to store the value of the flag.
+func (f *FlagSet) Uint32Var(p *uint32, name string, value uint32, usage string) {
+	f.VarP(newUint32Value(value, p), name, "", usage)
+}
+
+// Uint32VarP is like Uint32Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Uint32VarP(p *uint32, name, shorthand string, value uint32, usage string) {
+	f.VarP(newUint32Value(value, p), name, shorthand, usage)
+}
+
+// Uint32Var defines a uint32 flag with specified name, default value, and usage string.
+// The argument p points to a uint32  variable in which to store the value of the flag.
+func Uint32Var(p *uint32, name string, value uint32, usage string) {
+	CommandLine.VarP(newUint32Value(value, p), name, "", usage)
+}
+
+// Uint32VarP is like Uint32Var, but accepts a shorthand letter that can be used after a single dash.
+func Uint32VarP(p *uint32, name, shorthand string, value uint32, usage string) {
+	CommandLine.VarP(newUint32Value(value, p), name, shorthand, usage)
+}
+
+// Uint32 defines a uint32 flag with specified name, default value, and usage string.
+// The return value is the address of a uint32  variable that stores the value of the flag.
+func (f *FlagSet) Uint32(name string, value uint32, usage string) *uint32 {
+	p := new(uint32)
+	f.Uint32VarP(p, name, "", value, usage)
+	return p
+}
+
+// Uint32P is like Uint32, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Uint32P(name, shorthand string, value uint32, usage string) *uint32 {
+	p := new(uint32)
+	f.Uint32VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Uint32 defines a uint32 flag with specified name, default value, and usage string.
+// The return value is the address of a uint32  variable that stores the value of the flag.
+func Uint32(name string, value uint32, usage string) *uint32 {
+	return CommandLine.Uint32P(name, "", value, usage)
+}
+
+// Uint32P is like Uint32, but accepts a shorthand letter that can be used after a single dash.
+func Uint32P(name, shorthand string, value uint32, usage string) *uint32 {
+	return CommandLine.Uint32P(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/uint64.go b/vendor/github.com/spf13/pflag/uint64.go
new file mode 100644
index 0000000000..c68188505a
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/uint64.go
@@ -0,0 +1,91 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- uint64 Value
+type uint64Value uint64
+
+func newUint64Value(val uint64, p *uint64) *uint64Value {
+	*p = val
+	return (*uint64Value)(p)
+}
+
+func (i *uint64Value) Set(s string) error {
+	v, err := strconv.ParseUint(s, 0, 64)
+	*i = uint64Value(v)
+	return err
+}
+
+func (i *uint64Value) Type() string {
+	return "uint64"
+}
+
+func (i *uint64Value) String() string { return fmt.Sprintf("%v", *i) }
+
+func uint64Conv(sval string) (interface{}, error) {
+	v, err := strconv.ParseUint(sval, 0, 64)
+	if err != nil {
+		return 0, err
+	}
+	return uint64(v), nil
+}
+
+// GetUint64 return the uint64 value of a flag with the given name
+func (f *FlagSet) GetUint64(name string) (uint64, error) {
+	val, err := f.getFlagType(name, "uint64", uint64Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(uint64), nil
+}
+
+// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
+// The argument p points to a uint64 variable in which to store the value of the flag.
+func (f *FlagSet) Uint64Var(p *uint64, name string, value uint64, usage string) {
+	f.VarP(newUint64Value(value, p), name, "", usage)
+}
+
+// Uint64VarP is like Uint64Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Uint64VarP(p *uint64, name, shorthand string, value uint64, usage string) {
+	f.VarP(newUint64Value(value, p), name, shorthand, usage)
+}
+
+// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
+// The argument p points to a uint64 variable in which to store the value of the flag.
+func Uint64Var(p *uint64, name string, value uint64, usage string) {
+	CommandLine.VarP(newUint64Value(value, p), name, "", usage)
+}
+
+// Uint64VarP is like Uint64Var, but accepts a shorthand letter that can be used after a single dash.
+func Uint64VarP(p *uint64, name, shorthand string, value uint64, usage string) {
+	CommandLine.VarP(newUint64Value(value, p), name, shorthand, usage)
+}
+
+// Uint64 defines a uint64 flag with specified name, default value, and usage string.
+// The return value is the address of a uint64 variable that stores the value of the flag.
+func (f *FlagSet) Uint64(name string, value uint64, usage string) *uint64 {
+	p := new(uint64)
+	f.Uint64VarP(p, name, "", value, usage)
+	return p
+}
+
+// Uint64P is like Uint64, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Uint64P(name, shorthand string, value uint64, usage string) *uint64 {
+	p := new(uint64)
+	f.Uint64VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Uint64 defines a uint64 flag with specified name, default value, and usage string.
+// The return value is the address of a uint64 variable that stores the value of the flag.
+func Uint64(name string, value uint64, usage string) *uint64 {
+	return CommandLine.Uint64P(name, "", value, usage)
+}
+
+// Uint64P is like Uint64, but accepts a shorthand letter that can be used after a single dash.
+func Uint64P(name, shorthand string, value uint64, usage string) *uint64 {
+	return CommandLine.Uint64P(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/spf13/pflag/uint8.go b/vendor/github.com/spf13/pflag/uint8.go
new file mode 100644
index 0000000000..26db418adf
--- /dev/null
+++ b/vendor/github.com/spf13/pflag/uint8.go
@@ -0,0 +1,91 @@
+package pflag
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// -- uint8 Value
+type uint8Value uint8
+
+func newUint8Value(val uint8, p *uint8) *uint8Value {
+	*p = val
+	return (*uint8Value)(p)
+}
+
+func (i *uint8Value) Set(s string) error {
+	v, err := strconv.ParseUint(s, 0, 8)
+	*i = uint8Value(v)
+	return err
+}
+
+func (i *uint8Value) Type() string {
+	return "uint8"
+}
+
+func (i *uint8Value) String() string { return fmt.Sprintf("%v", *i) }
+
+func uint8Conv(sval string) (interface{}, error) {
+	v, err := strconv.ParseUint(sval, 0, 8)
+	if err != nil {
+		return 0, err
+	}
+	return uint8(v), nil
+}
+
+// GetUint8 return the uint8 value of a flag with the given name
+func (f *FlagSet) GetUint8(name string) (uint8, error) {
+	val, err := f.getFlagType(name, "uint8", uint8Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(uint8), nil
+}
+
+// Uint8Var defines a uint8 flag with specified name, default value, and usage string.
+// The argument p points to a uint8 variable in which to store the value of the flag.
+func (f *FlagSet) Uint8Var(p *uint8, name string, value uint8, usage string) {
+	f.VarP(newUint8Value(value, p), name, "", usage)
+}
+
+// Uint8VarP is like Uint8Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Uint8VarP(p *uint8, name, shorthand string, value uint8, usage string) {
+	f.VarP(newUint8Value(value, p), name, shorthand, usage)
+}
+
+// Uint8Var defines a uint8 flag with specified name, default value, and usage string.
+// The argument p points to a uint8 variable in which to store the value of the flag.
+func Uint8Var(p *uint8, name string, value uint8, usage string) {
+	CommandLine.VarP(newUint8Value(value, p), name, "", usage)
+}
+
+// Uint8VarP is like Uint8Var, but accepts a shorthand letter that can be used after a single dash.
+func Uint8VarP(p *uint8, name, shorthand string, value uint8, usage string) {
+	CommandLine.VarP(newUint8Value(value, p), name, shorthand, usage)
+}
+
+// Uint8 defines a uint8 flag with specified name, default value, and usage string.
+// The return value is the address of a uint8 variable that stores the value of the flag.
+func (f *FlagSet) Uint8(name string, value uint8, usage string) *uint8 {
+	p := new(uint8)
+	f.Uint8VarP(p, name, "", value, usage)
+	return p
+}
+
+// Uint8P is like Uint8, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Uint8P(name, shorthand string, value uint8, usage string) *uint8 {
+	p := new(uint8)
+	f.Uint8VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Uint8 defines a uint8 flag with specified name, default value, and usage string.
+// The return value is the address of a uint8 variable that stores the value of the flag.
+func Uint8(name string, value uint8, usage string) *uint8 {
+	return CommandLine.Uint8P(name, "", value, usage)
+}
+
+// Uint8P is like Uint8, but accepts a shorthand letter that can be used after a single dash.
+func Uint8P(name, shorthand string, value uint8, usage string) *uint8 {
+	return CommandLine.Uint8P(name, shorthand, value, usage)
+}
diff --git a/vendor/github.com/syndtr/gocapability/LICENSE b/vendor/github.com/syndtr/gocapability/LICENSE
new file mode 100644
index 0000000000..80dd96de77
--- /dev/null
+++ b/vendor/github.com/syndtr/gocapability/LICENSE
@@ -0,0 +1,24 @@
+Copyright 2013 Suryandaru Triandana <syndtr@gmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/syndtr/gocapability/capability/capability.go b/vendor/github.com/syndtr/gocapability/capability/capability.go
new file mode 100644
index 0000000000..c13f4e52a9
--- /dev/null
+++ b/vendor/github.com/syndtr/gocapability/capability/capability.go
@@ -0,0 +1,72 @@
+// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
+// All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Package capability provides utilities for manipulating POSIX capabilities.
+package capability
+
+type Capabilities interface {
+	// Get check whether a capability present in the given
+	// capabilities set. The 'which' value should be one of EFFECTIVE,
+	// PERMITTED, INHERITABLE or BOUNDING.
+	Get(which CapType, what Cap) bool
+
+	// Empty check whether all capability bits of the given capabilities
+	// set are zero. The 'which' value should be one of EFFECTIVE,
+	// PERMITTED, INHERITABLE or BOUNDING.
+	Empty(which CapType) bool
+
+	// Full check whether all capability bits of the given capabilities
+	// set are one. The 'which' value should be one of EFFECTIVE,
+	// PERMITTED, INHERITABLE or BOUNDING.
+	Full(which CapType) bool
+
+	// Set sets capabilities of the given capabilities sets. The
+	// 'which' value should be one or combination (OR'ed) of EFFECTIVE,
+	// PERMITTED, INHERITABLE or BOUNDING.
+	Set(which CapType, caps ...Cap)
+
+	// Unset unsets capabilities of the given capabilities sets. The
+	// 'which' value should be one or combination (OR'ed) of EFFECTIVE,
+	// PERMITTED, INHERITABLE or BOUNDING.
+	Unset(which CapType, caps ...Cap)
+
+	// Fill sets all bits of the given capabilities kind to one. The
+	// 'kind' value should be one or combination (OR'ed) of CAPS or
+	// BOUNDS.
+	Fill(kind CapType)
+
+	// Clear sets all bits of the given capabilities kind to zero. The
+	// 'kind' value should be one or combination (OR'ed) of CAPS or
+	// BOUNDS.
+	Clear(kind CapType)
+
+	// String return current capabilities state of the given capabilities
+	// set as string. The 'which' value should be one of EFFECTIVE,
+	// PERMITTED, INHERITABLE or BOUNDING.
+	StringCap(which CapType) string
+
+	// String return current capabilities state as string.
+	String() string
+
+	// Load load actual capabilities value. This will overwrite all
+	// outstanding changes.
+	Load() error
+
+	// Apply apply the capabilities settings, so all changes will take
+	// effect.
+	Apply(kind CapType) error
+}
+
+// NewPid create new initialized Capabilities object for given pid when it
+// is nonzero, or for the current pid if pid is 0
+func NewPid(pid int) (Capabilities, error) {
+	return newPid(pid)
+}
+
+// NewFile create new initialized Capabilities object for given named file.
+func NewFile(name string) (Capabilities, error) {
+	return newFile(name)
+}
diff --git a/vendor/github.com/syndtr/gocapability/capability/capability_linux.go b/vendor/github.com/syndtr/gocapability/capability/capability_linux.go
new file mode 100644
index 0000000000..3dfcd398dc
--- /dev/null
+++ b/vendor/github.com/syndtr/gocapability/capability/capability_linux.go
@@ -0,0 +1,608 @@
+// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
+// All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package capability
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+	"syscall"
+)
+
+var errUnknownVers = errors.New("unknown capability version")
+
+const (
+	linuxCapVer1 = 0x19980330
+	linuxCapVer2 = 0x20071026
+	linuxCapVer3 = 0x20080522
+)
+
+var (
+	capVers    uint32
+	capLastCap Cap
+)
+
+func init() {
+	var hdr capHeader
+	capget(&hdr, nil)
+	capVers = hdr.version
+
+	if initLastCap() == nil {
+		CAP_LAST_CAP = capLastCap
+		if capLastCap > 31 {
+			capUpperMask = (uint32(1) << (uint(capLastCap) - 31)) - 1
+		} else {
+			capUpperMask = 0
+		}
+	}
+}
+
+func initLastCap() error {
+	if capLastCap != 0 {
+		return nil
+	}
+
+	f, err := os.Open("/proc/sys/kernel/cap_last_cap")
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	var b []byte = make([]byte, 11)
+	_, err = f.Read(b)
+	if err != nil {
+		return err
+	}
+
+	fmt.Sscanf(string(b), "%d", &capLastCap)
+
+	return nil
+}
+
+func mkStringCap(c Capabilities, which CapType) (ret string) {
+	for i, first := Cap(0), true; i <= CAP_LAST_CAP; i++ {
+		if !c.Get(which, i) {
+			continue
+		}
+		if first {
+			first = false
+		} else {
+			ret += ", "
+		}
+		ret += i.String()
+	}
+	return
+}
+
+func mkString(c Capabilities, max CapType) (ret string) {
+	ret = "{"
+	for i := CapType(1); i <= max; i <<= 1 {
+		ret += " " + i.String() + "=\""
+		if c.Empty(i) {
+			ret += "empty"
+		} else if c.Full(i) {
+			ret += "full"
+		} else {
+			ret += c.StringCap(i)
+		}
+		ret += "\""
+	}
+	ret += " }"
+	return
+}
+
+func newPid(pid int) (c Capabilities, err error) {
+	switch capVers {
+	case linuxCapVer1:
+		p := new(capsV1)
+		p.hdr.version = capVers
+		p.hdr.pid = pid
+		c = p
+	case linuxCapVer2, linuxCapVer3:
+		p := new(capsV3)
+		p.hdr.version = capVers
+		p.hdr.pid = pid
+		c = p
+	default:
+		err = errUnknownVers
+		return
+	}
+	err = c.Load()
+	if err != nil {
+		c = nil
+	}
+	return
+}
+
+type capsV1 struct {
+	hdr  capHeader
+	data capData
+}
+
+func (c *capsV1) Get(which CapType, what Cap) bool {
+	if what > 32 {
+		return false
+	}
+
+	switch which {
+	case EFFECTIVE:
+		return (1<<uint(what))&c.data.effective != 0
+	case PERMITTED:
+		return (1<<uint(what))&c.data.permitted != 0
+	case INHERITABLE:
+		return (1<<uint(what))&c.data.inheritable != 0
+	}
+
+	return false
+}
+
+func (c *capsV1) getData(which CapType) (ret uint32) {
+	switch which {
+	case EFFECTIVE:
+		ret = c.data.effective
+	case PERMITTED:
+		ret = c.data.permitted
+	case INHERITABLE:
+		ret = c.data.inheritable
+	}
+	return
+}
+
+func (c *capsV1) Empty(which CapType) bool {
+	return c.getData(which) == 0
+}
+
+func (c *capsV1) Full(which CapType) bool {
+	return (c.getData(which) & 0x7fffffff) == 0x7fffffff
+}
+
+func (c *capsV1) Set(which CapType, caps ...Cap) {
+	for _, what := range caps {
+		if what > 32 {
+			continue
+		}
+
+		if which&EFFECTIVE != 0 {
+			c.data.effective |= 1 << uint(what)
+		}
+		if which&PERMITTED != 0 {
+			c.data.permitted |= 1 << uint(what)
+		}
+		if which&INHERITABLE != 0 {
+			c.data.inheritable |= 1 << uint(what)
+		}
+	}
+}
+
+func (c *capsV1) Unset(which CapType, caps ...Cap) {
+	for _, what := range caps {
+		if what > 32 {
+			continue
+		}
+
+		if which&EFFECTIVE != 0 {
+			c.data.effective &= ^(1 << uint(what))
+		}
+		if which&PERMITTED != 0 {
+			c.data.permitted &= ^(1 << uint(what))
+		}
+		if which&INHERITABLE != 0 {
+			c.data.inheritable &= ^(1 << uint(what))
+		}
+	}
+}
+
+func (c *capsV1) Fill(kind CapType) {
+	if kind&CAPS == CAPS {
+		c.data.effective = 0x7fffffff
+		c.data.permitted = 0x7fffffff
+		c.data.inheritable = 0
+	}
+}
+
+func (c *capsV1) Clear(kind CapType) {
+	if kind&CAPS == CAPS {
+		c.data.effective = 0
+		c.data.permitted = 0
+		c.data.inheritable = 0
+	}
+}
+
+func (c *capsV1) StringCap(which CapType) (ret string) {
+	return mkStringCap(c, which)
+}
+
+func (c *capsV1) String() (ret string) {
+	return mkString(c, BOUNDING)
+}
+
+func (c *capsV1) Load() (err error) {
+	return capget(&c.hdr, &c.data)
+}
+
+func (c *capsV1) Apply(kind CapType) error {
+	if kind&CAPS == CAPS {
+		return capset(&c.hdr, &c.data)
+	}
+	return nil
+}
+
+type capsV3 struct {
+	hdr    capHeader
+	data   [2]capData
+	bounds [2]uint32
+}
+
+func (c *capsV3) Get(which CapType, what Cap) bool {
+	var i uint
+	if what > 31 {
+		i = uint(what) >> 5
+		what %= 32
+	}
+
+	switch which {
+	case EFFECTIVE:
+		return (1<<uint(what))&c.data[i].effective != 0
+	case PERMITTED:
+		return (1<<uint(what))&c.data[i].permitted != 0
+	case INHERITABLE:
+		return (1<<uint(what))&c.data[i].inheritable != 0
+	case BOUNDING:
+		return (1<<uint(what))&c.bounds[i] != 0
+	}
+
+	return false
+}
+
+func (c *capsV3) getData(which CapType, dest []uint32) {
+	switch which {
+	case EFFECTIVE:
+		dest[0] = c.data[0].effective
+		dest[1] = c.data[1].effective
+	case PERMITTED:
+		dest[0] = c.data[0].permitted
+		dest[1] = c.data[1].permitted
+	case INHERITABLE:
+		dest[0] = c.data[0].inheritable
+		dest[1] = c.data[1].inheritable
+	case BOUNDING:
+		dest[0] = c.bounds[0]
+		dest[1] = c.bounds[1]
+	}
+}
+
+func (c *capsV3) Empty(which CapType) bool {
+	var data [2]uint32
+	c.getData(which, data[:])
+	return data[0] == 0 && data[1] == 0
+}
+
+func (c *capsV3) Full(which CapType) bool {
+	var data [2]uint32
+	c.getData(which, data[:])
+	if (data[0] & 0xffffffff) != 0xffffffff {
+		return false
+	}
+	return (data[1] & capUpperMask) == capUpperMask
+}
+
+func (c *capsV3) Set(which CapType, caps ...Cap) {
+	for _, what := range caps {
+		var i uint
+		if what > 31 {
+			i = uint(what) >> 5
+			what %= 32
+		}
+
+		if which&EFFECTIVE != 0 {
+			c.data[i].effective |= 1 << uint(what)
+		}
+		if which&PERMITTED != 0 {
+			c.data[i].permitted |= 1 << uint(what)
+		}
+		if which&INHERITABLE != 0 {
+			c.data[i].inheritable |= 1 << uint(what)
+		}
+		if which&BOUNDING != 0 {
+			c.bounds[i] |= 1 << uint(what)
+		}
+	}
+}
+
+func (c *capsV3) Unset(which CapType, caps ...Cap) {
+	for _, what := range caps {
+		var i uint
+		if what > 31 {
+			i = uint(what) >> 5
+			what %= 32
+		}
+
+		if which&EFFECTIVE != 0 {
+			c.data[i].effective &= ^(1 << uint(what))
+		}
+		if which&PERMITTED != 0 {
+			c.data[i].permitted &= ^(1 << uint(what))
+		}
+		if which&INHERITABLE != 0 {
+			c.data[i].inheritable &= ^(1 << uint(what))
+		}
+		if which&BOUNDING != 0 {
+			c.bounds[i] &= ^(1 << uint(what))
+		}
+	}
+}
+
+func (c *capsV3) Fill(kind CapType) {
+	if kind&CAPS == CAPS {
+		c.data[0].effective = 0xffffffff
+		c.data[0].permitted = 0xffffffff
+		c.data[0].inheritable = 0
+		c.data[1].effective = 0xffffffff
+		c.data[1].permitted = 0xffffffff
+		c.data[1].inheritable = 0
+	}
+
+	if kind&BOUNDS == BOUNDS {
+		c.bounds[0] = 0xffffffff
+		c.bounds[1] = 0xffffffff
+	}
+}
+
+func (c *capsV3) Clear(kind CapType) {
+	if kind&CAPS == CAPS {
+		c.data[0].effective = 0
+		c.data[0].permitted = 0
+		c.data[0].inheritable = 0
+		c.data[1].effective = 0
+		c.data[1].permitted = 0
+		c.data[1].inheritable = 0
+	}
+
+	if kind&BOUNDS == BOUNDS {
+		c.bounds[0] = 0
+		c.bounds[1] = 0
+	}
+}
+
+func (c *capsV3) StringCap(which CapType) (ret string) {
+	return mkStringCap(c, which)
+}
+
+func (c *capsV3) String() (ret string) {
+	return mkString(c, BOUNDING)
+}
+
+func (c *capsV3) Load() (err error) {
+	err = capget(&c.hdr, &c.data[0])
+	if err != nil {
+		return
+	}
+
+	var status_path string
+
+	if c.hdr.pid == 0 {
+		status_path = fmt.Sprintf("/proc/self/status")
+	} else {
+		status_path = fmt.Sprintf("/proc/%d/status", c.hdr.pid)
+	}
+
+	f, err := os.Open(status_path)
+	if err != nil {
+		return
+	}
+	b := bufio.NewReader(f)
+	for {
+		line, e := b.ReadString('\n')
+		if e != nil {
+			if e != io.EOF {
+				err = e
+			}
+			break
+		}
+		if strings.HasPrefix(line, "CapB") {
+			fmt.Sscanf(line[4:], "nd:  %08x%08x", &c.bounds[1], &c.bounds[0])
+			break
+		}
+	}
+	f.Close()
+
+	return
+}
+
+func (c *capsV3) Apply(kind CapType) (err error) {
+	if kind&BOUNDS == BOUNDS {
+		var data [2]capData
+		err = capget(&c.hdr, &data[0])
+		if err != nil {
+			return
+		}
+		if (1<<uint(CAP_SETPCAP))&data[0].effective != 0 {
+			for i := Cap(0); i <= CAP_LAST_CAP; i++ {
+				if c.Get(BOUNDING, i) {
+					continue
+				}
+				err = prctl(syscall.PR_CAPBSET_DROP, uintptr(i), 0, 0, 0)
+				if err != nil {
+					// Ignore EINVAL since the capability may not be supported in this system.
+					if errno, ok := err.(syscall.Errno); ok && errno == syscall.EINVAL {
+						err = nil
+						continue
+					}
+					return
+				}
+			}
+		}
+	}
+
+	if kind&CAPS == CAPS {
+		return capset(&c.hdr, &c.data[0])
+	}
+
+	return
+}
+
+func newFile(path string) (c Capabilities, err error) {
+	c = &capsFile{path: path}
+	err = c.Load()
+	if err != nil {
+		c = nil
+	}
+	return
+}
+
+type capsFile struct {
+	path string
+	data vfscapData
+}
+
+func (c *capsFile) Get(which CapType, what Cap) bool {
+	var i uint
+	if what > 31 {
+		if c.data.version == 1 {
+			return false
+		}
+		i = uint(what) >> 5
+		what %= 32
+	}
+
+	switch which {
+	case EFFECTIVE:
+		return (1<<uint(what))&c.data.effective[i] != 0
+	case PERMITTED:
+		return (1<<uint(what))&c.data.data[i].permitted != 0
+	case INHERITABLE:
+		return (1<<uint(what))&c.data.data[i].inheritable != 0
+	}
+
+	return false
+}
+
+func (c *capsFile) getData(which CapType, dest []uint32) {
+	switch which {
+	case EFFECTIVE:
+		dest[0] = c.data.effective[0]
+		dest[1] = c.data.effective[1]
+	case PERMITTED:
+		dest[0] = c.data.data[0].permitted
+		dest[1] = c.data.data[1].permitted
+	case INHERITABLE:
+		dest[0] = c.data.data[0].inheritable
+		dest[1] = c.data.data[1].inheritable
+	}
+}
+
+func (c *capsFile) Empty(which CapType) bool {
+	var data [2]uint32
+	c.getData(which, data[:])
+	return data[0] == 0 && data[1] == 0
+}
+
+func (c *capsFile) Full(which CapType) bool {
+	var data [2]uint32
+	c.getData(which, data[:])
+	if c.data.version == 0 {
+		return (data[0] & 0x7fffffff) == 0x7fffffff
+	}
+	if (data[0] & 0xffffffff) != 0xffffffff {
+		return false
+	}
+	return (data[1] & capUpperMask) == capUpperMask
+}
+
+func (c *capsFile) Set(which CapType, caps ...Cap) {
+	for _, what := range caps {
+		var i uint
+		if what > 31 {
+			if c.data.version == 1 {
+				continue
+			}
+			i = uint(what) >> 5
+			what %= 32
+		}
+
+		if which&EFFECTIVE != 0 {
+			c.data.effective[i] |= 1 << uint(what)
+		}
+		if which&PERMITTED != 0 {
+			c.data.data[i].permitted |= 1 << uint(what)
+		}
+		if which&INHERITABLE != 0 {
+			c.data.data[i].inheritable |= 1 << uint(what)
+		}
+	}
+}
+
+func (c *capsFile) Unset(which CapType, caps ...Cap) {
+	for _, what := range caps {
+		var i uint
+		if what > 31 {
+			if c.data.version == 1 {
+				continue
+			}
+			i = uint(what) >> 5
+			what %= 32
+		}
+
+		if which&EFFECTIVE != 0 {
+			c.data.effective[i] &= ^(1 << uint(what))
+		}
+		if which&PERMITTED != 0 {
+			c.data.data[i].permitted &= ^(1 << uint(what))
+		}
+		if which&INHERITABLE != 0 {
+			c.data.data[i].inheritable &= ^(1 << uint(what))
+		}
+	}
+}
+
+func (c *capsFile) Fill(kind CapType) {
+	if kind&CAPS == CAPS {
+		c.data.effective[0] = 0xffffffff
+		c.data.data[0].permitted = 0xffffffff
+		c.data.data[0].inheritable = 0
+		if c.data.version == 2 {
+			c.data.effective[1] = 0xffffffff
+			c.data.data[1].permitted = 0xffffffff
+			c.data.data[1].inheritable = 0
+		}
+	}
+}
+
+func (c *capsFile) Clear(kind CapType) {
+	if kind&CAPS == CAPS {
+		c.data.effective[0] = 0
+		c.data.data[0].permitted = 0
+		c.data.data[0].inheritable = 0
+		if c.data.version == 2 {
+			c.data.effective[1] = 0
+			c.data.data[1].permitted = 0
+			c.data.data[1].inheritable = 0
+		}
+	}
+}
+
+func (c *capsFile) StringCap(which CapType) (ret string) {
+	return mkStringCap(c, which)
+}
+
+func (c *capsFile) String() (ret string) {
+	return mkString(c, INHERITABLE)
+}
+
+func (c *capsFile) Load() (err error) {
+	return getVfsCap(c.path, &c.data)
+}
+
+func (c *capsFile) Apply(kind CapType) (err error) {
+	if kind&CAPS == CAPS {
+		return setVfsCap(c.path, &c.data)
+	}
+	return
+}
diff --git a/vendor/github.com/syndtr/gocapability/capability/capability_noop.go b/vendor/github.com/syndtr/gocapability/capability/capability_noop.go
new file mode 100644
index 0000000000..9bb3070c5e
--- /dev/null
+++ b/vendor/github.com/syndtr/gocapability/capability/capability_noop.go
@@ -0,0 +1,19 @@
+// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
+// All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// +build !linux
+
+package capability
+
+import "errors"
+
+func newPid(pid int) (Capabilities, error) {
+	return nil, errors.New("not supported")
+}
+
+func newFile(path string) (Capabilities, error) {
+	return nil, errors.New("not supported")
+}
diff --git a/vendor/github.com/syndtr/gocapability/capability/enum.go b/vendor/github.com/syndtr/gocapability/capability/enum.go
new file mode 100644
index 0000000000..bff756a5ce
--- /dev/null
+++ b/vendor/github.com/syndtr/gocapability/capability/enum.go
@@ -0,0 +1,345 @@
+// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
+// All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package capability
+
+type CapType uint
+
+func (c CapType) String() string {
+	switch c {
+	case EFFECTIVE:
+		return "effective"
+	case PERMITTED:
+		return "permitted"
+	case INHERITABLE:
+		return "inheritable"
+	case BOUNDING:
+		return "bounding"
+	case CAPS:
+		return "caps"
+	}
+	return "unknown"
+}
+
+const (
+	EFFECTIVE CapType = 1 << iota
+	PERMITTED
+	INHERITABLE
+	BOUNDING
+
+	CAPS   = EFFECTIVE | PERMITTED | INHERITABLE
+	BOUNDS = BOUNDING
+)
+
+type Cap int
+
+func (c Cap) String() string {
+	switch c {
+	case CAP_CHOWN:
+		return "chown"
+	case CAP_DAC_OVERRIDE:
+		return "dac_override"
+	case CAP_DAC_READ_SEARCH:
+		return "dac_read_search"
+	case CAP_FOWNER:
+		return "fowner"
+	case CAP_FSETID:
+		return "fsetid"
+	case CAP_KILL:
+		return "kill"
+	case CAP_SETGID:
+		return "setgid"
+	case CAP_SETUID:
+		return "setuid"
+	case CAP_SETPCAP:
+		return "setpcap"
+	case CAP_LINUX_IMMUTABLE:
+		return "linux_immutable"
+	case CAP_NET_BIND_SERVICE:
+		return "net_bind_service"
+	case CAP_NET_BROADCAST:
+		return "net_broadcast"
+	case CAP_NET_ADMIN:
+		return "net_admin"
+	case CAP_NET_RAW:
+		return "net_raw"
+	case CAP_IPC_LOCK:
+		return "ipc_lock"
+	case CAP_IPC_OWNER:
+		return "ipc_owner"
+	case CAP_SYS_MODULE:
+		return "sys_module"
+	case CAP_SYS_RAWIO:
+		return "sys_rawio"
+	case CAP_SYS_CHROOT:
+		return "sys_chroot"
+	case CAP_SYS_PTRACE:
+		return "sys_ptrace"
+	case CAP_SYS_PACCT:
+		return "sys_psacct"
+	case CAP_SYS_ADMIN:
+		return "sys_admin"
+	case CAP_SYS_BOOT:
+		return "sys_boot"
+	case CAP_SYS_NICE:
+		return "sys_nice"
+	case CAP_SYS_RESOURCE:
+		return "sys_resource"
+	case CAP_SYS_TIME:
+		return "sys_time"
+	case CAP_SYS_TTY_CONFIG:
+		return "sys_tty_config"
+	case CAP_MKNOD:
+		return "mknod"
+	case CAP_LEASE:
+		return "lease"
+	case CAP_AUDIT_WRITE:
+		return "audit_write"
+	case CAP_AUDIT_CONTROL:
+		return "audit_control"
+	case CAP_SETFCAP:
+		return "setfcap"
+	case CAP_MAC_OVERRIDE:
+		return "mac_override"
+	case CAP_MAC_ADMIN:
+		return "mac_admin"
+	case CAP_SYSLOG:
+		return "syslog"
+	case CAP_WAKE_ALARM:
+		return "wake_alarm"
+	case CAP_BLOCK_SUSPEND:
+		return "block_suspend"
+	case CAP_AUDIT_READ:
+		return "audit_read"
+	}
+	return "unknown"
+}
+
+// POSIX-draft defined capabilities.
+const (
+	// In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, this
+	// overrides the restriction of changing file ownership and group
+	// ownership.
+	CAP_CHOWN = Cap(0)
+
+	// Override all DAC access, including ACL execute access if
+	// [_POSIX_ACL] is defined. Excluding DAC access covered by
+	// CAP_LINUX_IMMUTABLE.
+	CAP_DAC_OVERRIDE = Cap(1)
+
+	// Overrides all DAC restrictions regarding read and search on files
+	// and directories, including ACL restrictions if [_POSIX_ACL] is
+	// defined. Excluding DAC access covered by CAP_LINUX_IMMUTABLE.
+	CAP_DAC_READ_SEARCH = Cap(2)
+
+	// Overrides all restrictions about allowed operations on files, where
+	// file owner ID must be equal to the user ID, except where CAP_FSETID
+	// is applicable. It doesn't override MAC and DAC restrictions.
+	CAP_FOWNER = Cap(3)
+
+	// Overrides the following restrictions that the effective user ID
+	// shall match the file owner ID when setting the S_ISUID and S_ISGID
+	// bits on that file; that the effective group ID (or one of the
+	// supplementary group IDs) shall match the file owner ID when setting
+	// the S_ISGID bit on that file; that the S_ISUID and S_ISGID bits are
+	// cleared on successful return from chown(2) (not implemented).
+	CAP_FSETID = Cap(4)
+
+	// Overrides the restriction that the real or effective user ID of a
+	// process sending a signal must match the real or effective user ID
+	// of the process receiving the signal.
+	CAP_KILL = Cap(5)
+
+	// Allows setgid(2) manipulation
+	// Allows setgroups(2)
+	// Allows forged gids on socket credentials passing.
+	CAP_SETGID = Cap(6)
+
+	// Allows set*uid(2) manipulation (including fsuid).
+	// Allows forged pids on socket credentials passing.
+	CAP_SETUID = Cap(7)
+
+	// Linux-specific capabilities
+
+	// Without VFS support for capabilities:
+	//   Transfer any capability in your permitted set to any pid,
+	//   remove any capability in your permitted set from any pid
+	// With VFS support for capabilities (neither of above, but)
+	//   Add any capability from current's capability bounding set
+	//     to the current process' inheritable set
+	//   Allow taking bits out of capability bounding set
+	//   Allow modification of the securebits for a process
+	CAP_SETPCAP = Cap(8)
+
+	// Allow modification of S_IMMUTABLE and S_APPEND file attributes
+	CAP_LINUX_IMMUTABLE = Cap(9)
+
+	// Allows binding to TCP/UDP sockets below 1024
+	// Allows binding to ATM VCIs below 32
+	CAP_NET_BIND_SERVICE = Cap(10)
+
+	// Allow broadcasting, listen to multicast
+	CAP_NET_BROADCAST = Cap(11)
+
+	// Allow interface configuration
+	// Allow administration of IP firewall, masquerading and accounting
+	// Allow setting debug option on sockets
+	// Allow modification of routing tables
+	// Allow setting arbitrary process / process group ownership on
+	// sockets
+	// Allow binding to any address for transparent proxying (also via NET_RAW)
+	// Allow setting TOS (type of service)
+	// Allow setting promiscuous mode
+	// Allow clearing driver statistics
+	// Allow multicasting
+	// Allow read/write of device-specific registers
+	// Allow activation of ATM control sockets
+	CAP_NET_ADMIN = Cap(12)
+
+	// Allow use of RAW sockets
+	// Allow use of PACKET sockets
+	// Allow binding to any address for transparent proxying (also via NET_ADMIN)
+	CAP_NET_RAW = Cap(13)
+
+	// Allow locking of shared memory segments
+	// Allow mlock and mlockall (which doesn't really have anything to do
+	// with IPC)
+	CAP_IPC_LOCK = Cap(14)
+
+	// Override IPC ownership checks
+	CAP_IPC_OWNER = Cap(15)
+
+	// Insert and remove kernel modules - modify kernel without limit
+	CAP_SYS_MODULE = Cap(16)
+
+	// Allow ioperm/iopl access
+	// Allow sending USB messages to any device via /proc/bus/usb
+	CAP_SYS_RAWIO = Cap(17)
+
+	// Allow use of chroot()
+	CAP_SYS_CHROOT = Cap(18)
+
+	// Allow ptrace() of any process
+	CAP_SYS_PTRACE = Cap(19)
+
+	// Allow configuration of process accounting
+	CAP_SYS_PACCT = Cap(20)
+
+	// Allow configuration of the secure attention key
+	// Allow administration of the random device
+	// Allow examination and configuration of disk quotas
+	// Allow setting the domainname
+	// Allow setting the hostname
+	// Allow calling bdflush()
+	// Allow mount() and umount(), setting up new smb connection
+	// Allow some autofs root ioctls
+	// Allow nfsservctl
+	// Allow VM86_REQUEST_IRQ
+	// Allow to read/write pci config on alpha
+	// Allow irix_prctl on mips (setstacksize)
+	// Allow flushing all cache on m68k (sys_cacheflush)
+	// Allow removing semaphores
+	// Used instead of CAP_CHOWN to "chown" IPC message queues, semaphores
+	// and shared memory
+	// Allow locking/unlocking of shared memory segment
+	// Allow turning swap on/off
+	// Allow forged pids on socket credentials passing
+	// Allow setting readahead and flushing buffers on block devices
+	// Allow setting geometry in floppy driver
+	// Allow turning DMA on/off in xd driver
+	// Allow administration of md devices (mostly the above, but some
+	// extra ioctls)
+	// Allow tuning the ide driver
+	// Allow access to the nvram device
+	// Allow administration of apm_bios, serial and bttv (TV) device
+	// Allow manufacturer commands in isdn CAPI support driver
+	// Allow reading non-standardized portions of pci configuration space
+	// Allow DDI debug ioctl on sbpcd driver
+	// Allow setting up serial ports
+	// Allow sending raw qic-117 commands
+	// Allow enabling/disabling tagged queuing on SCSI controllers and sending
+	// arbitrary SCSI commands
+	// Allow setting encryption key on loopback filesystem
+	// Allow setting zone reclaim policy
+	CAP_SYS_ADMIN = Cap(21)
+
+	// Allow use of reboot()
+	CAP_SYS_BOOT = Cap(22)
+
+	// Allow raising priority and setting priority on other (different
+	// UID) processes
+	// Allow use of FIFO and round-robin (realtime) scheduling on own
+	// processes and setting the scheduling algorithm used by another
+	// process.
+	// Allow setting cpu affinity on other processes
+	CAP_SYS_NICE = Cap(23)
+
+	// Override resource limits. Set resource limits.
+	// Override quota limits.
+	// Override reserved space on ext2 filesystem
+	// Modify data journaling mode on ext3 filesystem (uses journaling
+	// resources)
+	// NOTE: ext2 honors fsuid when checking for resource overrides, so
+	// you can override using fsuid too
+	// Override size restrictions on IPC message queues
+	// Allow more than 64hz interrupts from the real-time clock
+	// Override max number of consoles on console allocation
+	// Override max number of keymaps
+	CAP_SYS_RESOURCE = Cap(24)
+
+	// Allow manipulation of system clock
+	// Allow irix_stime on mips
+	// Allow setting the real-time clock
+	CAP_SYS_TIME = Cap(25)
+
+	// Allow configuration of tty devices
+	// Allow vhangup() of tty
+	CAP_SYS_TTY_CONFIG = Cap(26)
+
+	// Allow the privileged aspects of mknod()
+	CAP_MKNOD = Cap(27)
+
+	// Allow taking of leases on files
+	CAP_LEASE = Cap(28)
+
+	CAP_AUDIT_WRITE   = Cap(29)
+	CAP_AUDIT_CONTROL = Cap(30)
+	CAP_SETFCAP       = Cap(31)
+
+	// Override MAC access.
+	// The base kernel enforces no MAC policy.
+	// An LSM may enforce a MAC policy, and if it does and it chooses
+	// to implement capability based overrides of that policy, this is
+	// the capability it should use to do so.
+	CAP_MAC_OVERRIDE = Cap(32)
+
+	// Allow MAC configuration or state changes.
+	// The base kernel requires no MAC configuration.
+	// An LSM may enforce a MAC policy, and if it does and it chooses
+	// to implement capability based checks on modifications to that
+	// policy or the data required to maintain it, this is the
+	// capability it should use to do so.
+	CAP_MAC_ADMIN = Cap(33)
+
+	// Allow configuring the kernel's syslog (printk behaviour)
+	CAP_SYSLOG = Cap(34)
+
+	// Allow triggering something that will wake the system
+	CAP_WAKE_ALARM = Cap(35)
+
+	// Allow preventing system suspends
+	CAP_BLOCK_SUSPEND = Cap(36)
+
+	// Allow reading audit messages from the kernel
+	CAP_AUDIT_READ = Cap(37)
+)
+
+var (
+	// Highest valid capability of the running kernel.
+	CAP_LAST_CAP = Cap(63)
+
+	capUpperMask = ^uint32(0)
+)
diff --git a/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go b/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go
new file mode 100644
index 0000000000..c18e6f6918
--- /dev/null
+++ b/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go
@@ -0,0 +1,143 @@
+// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
+// All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package capability
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+type capHeader struct {
+	version uint32
+	pid     int
+}
+
+type capData struct {
+	effective   uint32
+	permitted   uint32
+	inheritable uint32
+}
+
+func capget(hdr *capHeader, data *capData) (err error) {
+	_, _, e1 := syscall.Syscall(syscall.SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func capset(hdr *capHeader, data *capData) (err error) {
+	_, _, e1 := syscall.Syscall(syscall.SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func prctl(option int, arg2, arg3, arg4, arg5 uintptr) (err error) {
+	_, _, e1 := syscall.Syscall6(syscall.SYS_PRCTL, uintptr(option), arg2, arg3, arg4, arg5, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+const (
+	vfsXattrName = "security.capability"
+
+	vfsCapVerMask = 0xff000000
+	vfsCapVer1    = 0x01000000
+	vfsCapVer2    = 0x02000000
+
+	vfsCapFlagMask      = ^vfsCapVerMask
+	vfsCapFlageffective = 0x000001
+
+	vfscapDataSizeV1 = 4 * (1 + 2*1)
+	vfscapDataSizeV2 = 4 * (1 + 2*2)
+)
+
+type vfscapData struct {
+	magic uint32
+	data  [2]struct {
+		permitted   uint32
+		inheritable uint32
+	}
+	effective [2]uint32
+	version   int8
+}
+
+var (
+	_vfsXattrName *byte
+)
+
+func init() {
+	_vfsXattrName, _ = syscall.BytePtrFromString(vfsXattrName)
+}
+
+func getVfsCap(path string, dest *vfscapData) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(dest)), vfscapDataSizeV2, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	switch dest.magic & vfsCapVerMask {
+	case vfsCapVer1:
+		dest.version = 1
+		if r0 != vfscapDataSizeV1 {
+			return syscall.EINVAL
+		}
+		dest.data[1].permitted = 0
+		dest.data[1].inheritable = 0
+	case vfsCapVer2:
+		dest.version = 2
+		if r0 != vfscapDataSizeV2 {
+			return syscall.EINVAL
+		}
+	default:
+		return syscall.EINVAL
+	}
+	if dest.magic&vfsCapFlageffective != 0 {
+		dest.effective[0] = dest.data[0].permitted | dest.data[0].inheritable
+		dest.effective[1] = dest.data[1].permitted | dest.data[1].inheritable
+	} else {
+		dest.effective[0] = 0
+		dest.effective[1] = 0
+	}
+	return
+}
+
+func setVfsCap(path string, data *vfscapData) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var size uintptr
+	if data.version == 1 {
+		data.magic = vfsCapVer1
+		size = vfscapDataSizeV1
+	} else if data.version == 2 {
+		data.magic = vfsCapVer2
+		if data.effective[0] != 0 || data.effective[1] != 0 {
+			data.magic |= vfsCapFlageffective
+			data.data[0].permitted |= data.effective[0]
+			data.data[1].permitted |= data.effective[1]
+		}
+		size = vfscapDataSizeV2
+	} else {
+		return syscall.EINVAL
+	}
+	_, _, e1 := syscall.Syscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(data)), size, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
diff --git a/vendor/github.com/vishvananda/netlink/LICENSE b/vendor/github.com/vishvananda/netlink/LICENSE
new file mode 100644
index 0000000000..9f64db8582
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/LICENSE
@@ -0,0 +1,192 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2014 Vishvananda Ishaya.
+   Copyright 2014 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/vishvananda/netlink/addr.go b/vendor/github.com/vishvananda/netlink/addr.go
new file mode 100644
index 0000000000..9bbaf508e0
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/addr.go
@@ -0,0 +1,43 @@
+package netlink
+
+import (
+	"fmt"
+	"net"
+	"strings"
+)
+
+// Addr represents an IP address from netlink. Netlink ip addresses
+// include a mask, so it stores the address as a net.IPNet.
+type Addr struct {
+	*net.IPNet
+	Label string
+}
+
+// String returns $ip/$netmask $label
+func (a Addr) String() string {
+	return fmt.Sprintf("%s %s", a.IPNet, a.Label)
+}
+
+// ParseAddr parses the string representation of an address in the
+// form $ip/$netmask $label. The label portion is optional
+func ParseAddr(s string) (*Addr, error) {
+	label := ""
+	parts := strings.Split(s, " ")
+	if len(parts) > 1 {
+		s = parts[0]
+		label = parts[1]
+	}
+	m, err := ParseIPNet(s)
+	if err != nil {
+		return nil, err
+	}
+	return &Addr{IPNet: m, Label: label}, nil
+}
+
+// Equal returns true if both Addrs have the same net.IPNet value.
+func (a Addr) Equal(x Addr) bool {
+	sizea, _ := a.Mask.Size()
+	sizeb, _ := x.Mask.Size()
+	// ignore label for comparison
+	return a.IP.Equal(x.IP) && sizea == sizeb
+}
diff --git a/vendor/github.com/vishvananda/netlink/addr_linux.go b/vendor/github.com/vishvananda/netlink/addr_linux.go
new file mode 100644
index 0000000000..19aac0fb97
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/addr_linux.go
@@ -0,0 +1,128 @@
+package netlink
+
+import (
+	"fmt"
+	"net"
+	"strings"
+	"syscall"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+// AddrAdd will add an IP address to a link device.
+// Equivalent to: `ip addr add $addr dev $link`
+func AddrAdd(link Link, addr *Addr) error {
+
+	req := nl.NewNetlinkRequest(syscall.RTM_NEWADDR, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
+	return addrHandle(link, addr, req)
+}
+
+// AddrDel will delete an IP address from a link device.
+// Equivalent to: `ip addr del $addr dev $link`
+func AddrDel(link Link, addr *Addr) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_DELADDR, syscall.NLM_F_ACK)
+	return addrHandle(link, addr, req)
+}
+
+func addrHandle(link Link, addr *Addr, req *nl.NetlinkRequest) error {
+	base := link.Attrs()
+	if addr.Label != "" && !strings.HasPrefix(addr.Label, base.Name) {
+		return fmt.Errorf("label must begin with interface name")
+	}
+	ensureIndex(base)
+
+	family := nl.GetIPFamily(addr.IP)
+
+	msg := nl.NewIfAddrmsg(family)
+	msg.Index = uint32(base.Index)
+	prefixlen, _ := addr.Mask.Size()
+	msg.Prefixlen = uint8(prefixlen)
+	req.AddData(msg)
+
+	var addrData []byte
+	if family == FAMILY_V4 {
+		addrData = addr.IP.To4()
+	} else {
+		addrData = addr.IP.To16()
+	}
+
+	localData := nl.NewRtAttr(syscall.IFA_LOCAL, addrData)
+	req.AddData(localData)
+
+	addressData := nl.NewRtAttr(syscall.IFA_ADDRESS, addrData)
+	req.AddData(addressData)
+
+	if addr.Label != "" {
+		labelData := nl.NewRtAttr(syscall.IFA_LABEL, nl.ZeroTerminated(addr.Label))
+		req.AddData(labelData)
+	}
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// AddrList gets a list of IP addresses in the system.
+// Equivalent to: `ip addr show`.
+// The list can be filtered by link and ip family.
+func AddrList(link Link, family int) ([]Addr, error) {
+	req := nl.NewNetlinkRequest(syscall.RTM_GETADDR, syscall.NLM_F_DUMP)
+	msg := nl.NewIfInfomsg(family)
+	req.AddData(msg)
+
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWADDR)
+	if err != nil {
+		return nil, err
+	}
+
+	index := 0
+	if link != nil {
+		base := link.Attrs()
+		ensureIndex(base)
+		index = base.Index
+	}
+
+	var res []Addr
+	for _, m := range msgs {
+		msg := nl.DeserializeIfAddrmsg(m)
+
+		if link != nil && msg.Index != uint32(index) {
+			// Ignore messages from other interfaces
+			continue
+		}
+
+		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
+		if err != nil {
+			return nil, err
+		}
+
+		var local, dst *net.IPNet
+		var addr Addr
+		for _, attr := range attrs {
+			switch attr.Attr.Type {
+			case syscall.IFA_ADDRESS:
+				dst = &net.IPNet{
+					IP:   attr.Value,
+					Mask: net.CIDRMask(int(msg.Prefixlen), 8*len(attr.Value)),
+				}
+			case syscall.IFA_LOCAL:
+				local = &net.IPNet{
+					IP:   attr.Value,
+					Mask: net.CIDRMask(int(msg.Prefixlen), 8*len(attr.Value)),
+				}
+			case syscall.IFA_LABEL:
+				addr.Label = string(attr.Value[:len(attr.Value)-1])
+			}
+		}
+
+		// IFA_LOCAL should be there but if not, fall back to IFA_ADDRESS
+		if local != nil {
+			addr.IPNet = local
+		} else {
+			addr.IPNet = dst
+		}
+
+		res = append(res, addr)
+	}
+
+	return res, nil
+}
diff --git a/vendor/github.com/vishvananda/netlink/class.go b/vendor/github.com/vishvananda/netlink/class.go
new file mode 100644
index 0000000000..35bdb33100
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/class.go
@@ -0,0 +1,110 @@
+package netlink
+
+import (
+	"fmt"
+)
+
+type Class interface {
+	Attrs() *ClassAttrs
+	Type() string
+}
+
+// Class represents a netlink class. A filter is associated with a link,
+// has a handle and a parent. The root filter of a device should have a
+// parent == HANDLE_ROOT.
+type ClassAttrs struct {
+	LinkIndex int
+	Handle    uint32
+	Parent    uint32
+	Leaf      uint32
+}
+
+func (q ClassAttrs) String() string {
+	return fmt.Sprintf("{LinkIndex: %d, Handle: %s, Parent: %s, Leaf: %s}", q.LinkIndex, HandleStr(q.Handle), HandleStr(q.Parent), q.Leaf)
+}
+
+type HtbClassAttrs struct {
+	// TODO handle all attributes
+	Rate    uint64
+	Ceil    uint64
+	Buffer  uint32
+	Cbuffer uint32
+	Quantum uint32
+	Level   uint32
+	Prio    uint32
+}
+
+func (q HtbClassAttrs) String() string {
+	return fmt.Sprintf("{Rate: %d, Ceil: %d, Buffer: %d, Cbuffer: %d}", q.Rate, q.Ceil, q.Buffer, q.Cbuffer)
+}
+
+// Htb class
+type HtbClass struct {
+	ClassAttrs
+	Rate    uint64
+	Ceil    uint64
+	Buffer  uint32
+	Cbuffer uint32
+	Quantum uint32
+	Level   uint32
+	Prio    uint32
+}
+
+func NewHtbClass(attrs ClassAttrs, cattrs HtbClassAttrs) *HtbClass {
+	mtu := 1600
+	rate := cattrs.Rate / 8
+	ceil := cattrs.Ceil / 8
+	buffer := cattrs.Buffer
+	cbuffer := cattrs.Cbuffer
+	if ceil == 0 {
+		ceil = rate
+	}
+
+	if buffer == 0 {
+		buffer = uint32(float64(rate)/Hz() + float64(mtu))
+	}
+	buffer = uint32(Xmittime(rate, buffer))
+
+	if cbuffer == 0 {
+		cbuffer = uint32(float64(ceil)/Hz() + float64(mtu))
+	}
+	cbuffer = uint32(Xmittime(ceil, cbuffer))
+
+	return &HtbClass{
+		ClassAttrs: attrs,
+		Rate:       rate,
+		Ceil:       ceil,
+		Buffer:     buffer,
+		Cbuffer:    cbuffer,
+		Quantum:    10,
+		Level:      0,
+		Prio:       0,
+	}
+}
+
+func (q HtbClass) String() string {
+	return fmt.Sprintf("{Rate: %d, Ceil: %d, Buffer: %d, Cbuffer: %d}", q.Rate, q.Ceil, q.Buffer, q.Cbuffer)
+}
+
+func (class *HtbClass) Attrs() *ClassAttrs {
+	return &class.ClassAttrs
+}
+
+func (class *HtbClass) Type() string {
+	return "htb"
+}
+
+// GenericClass classes represent types that are not currently understood
+// by this netlink library.
+type GenericClass struct {
+	ClassAttrs
+	ClassType string
+}
+
+func (class *GenericClass) Attrs() *ClassAttrs {
+	return &class.ClassAttrs
+}
+
+func (class *GenericClass) Type() string {
+	return class.ClassType
+}
diff --git a/vendor/github.com/vishvananda/netlink/class_linux.go b/vendor/github.com/vishvananda/netlink/class_linux.go
new file mode 100644
index 0000000000..3dcc542bfe
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/class_linux.go
@@ -0,0 +1,144 @@
+package netlink
+
+import (
+	"syscall"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+// ClassDel will delete a class from the system.
+// Equivalent to: `tc class del $class`
+func ClassDel(class Class) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_DELTCLASS, syscall.NLM_F_ACK)
+	base := class.Attrs()
+	msg := &nl.TcMsg{
+		Family:  nl.FAMILY_ALL,
+		Ifindex: int32(base.LinkIndex),
+		Handle:  base.Handle,
+		Parent:  base.Parent,
+	}
+	req.AddData(msg)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// ClassAdd will add a class to the system.
+// Equivalent to: `tc class add $class`
+func ClassAdd(class Class) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_NEWTCLASS, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
+	base := class.Attrs()
+	msg := &nl.TcMsg{
+		Family:  nl.FAMILY_ALL,
+		Ifindex: int32(base.LinkIndex),
+		Handle:  base.Handle,
+		Parent:  base.Parent,
+	}
+	req.AddData(msg)
+	req.AddData(nl.NewRtAttr(nl.TCA_KIND, nl.ZeroTerminated(class.Type())))
+
+	options := nl.NewRtAttr(nl.TCA_OPTIONS, nil)
+	if htb, ok := class.(*HtbClass); ok {
+		opt := nl.TcHtbCopt{}
+		opt.Rate.Rate = uint32(htb.Rate)
+		opt.Ceil.Rate = uint32(htb.Ceil)
+		opt.Buffer = htb.Buffer
+		opt.Cbuffer = htb.Cbuffer
+		opt.Quantum = htb.Quantum
+		opt.Level = htb.Level
+		opt.Prio = htb.Prio
+		// TODO: Handle Debug properly. For now default to 0
+		nl.NewRtAttrChild(options, nl.TCA_HTB_PARMS, opt.Serialize())
+	}
+	req.AddData(options)
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// ClassList gets a list of classes in the system.
+// Equivalent to: `tc class show`.
+// Generally retunrs nothing if link and parent are not specified.
+func ClassList(link Link, parent uint32) ([]Class, error) {
+	req := nl.NewNetlinkRequest(syscall.RTM_GETTCLASS, syscall.NLM_F_DUMP)
+	msg := &nl.TcMsg{
+		Family: nl.FAMILY_ALL,
+		Parent: parent,
+	}
+	if link != nil {
+		base := link.Attrs()
+		ensureIndex(base)
+		msg.Ifindex = int32(base.Index)
+	}
+	req.AddData(msg)
+
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWTCLASS)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []Class
+	for _, m := range msgs {
+		msg := nl.DeserializeTcMsg(m)
+
+		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
+		if err != nil {
+			return nil, err
+		}
+
+		base := ClassAttrs{
+			LinkIndex: int(msg.Ifindex),
+			Handle:    msg.Handle,
+			Parent:    msg.Parent,
+		}
+
+		var class Class
+		classType := ""
+		for _, attr := range attrs {
+			switch attr.Attr.Type {
+			case nl.TCA_KIND:
+				classType = string(attr.Value[:len(attr.Value)-1])
+				switch classType {
+				case "htb":
+					class = &HtbClass{}
+				default:
+					class = &GenericClass{ClassType: classType}
+				}
+			case nl.TCA_OPTIONS:
+				switch classType {
+				case "htb":
+					data, err := nl.ParseRouteAttr(attr.Value)
+					if err != nil {
+						return nil, err
+					}
+					_, err = parseHtbClassData(class, data)
+					if err != nil {
+						return nil, err
+					}
+				}
+			}
+		}
+		*class.Attrs() = base
+		res = append(res, class)
+	}
+
+	return res, nil
+}
+
+func parseHtbClassData(class Class, data []syscall.NetlinkRouteAttr) (bool, error) {
+	htb := class.(*HtbClass)
+	detailed := false
+	for _, datum := range data {
+		switch datum.Attr.Type {
+		case nl.TCA_HTB_PARMS:
+			opt := nl.DeserializeTcHtbCopt(datum.Value)
+			htb.Rate = uint64(opt.Rate.Rate)
+			htb.Ceil = uint64(opt.Ceil.Rate)
+			htb.Buffer = opt.Buffer
+			htb.Cbuffer = opt.Cbuffer
+			htb.Quantum = opt.Quantum
+			htb.Level = opt.Level
+			htb.Prio = opt.Prio
+		}
+	}
+	return detailed, nil
+}
diff --git a/vendor/github.com/vishvananda/netlink/filter.go b/vendor/github.com/vishvananda/netlink/filter.go
new file mode 100644
index 0000000000..83ad7007b9
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/filter.go
@@ -0,0 +1,55 @@
+package netlink
+
+import (
+	"fmt"
+)
+
+type Filter interface {
+	Attrs() *FilterAttrs
+	Type() string
+}
+
+// Filter represents a netlink filter. A filter is associated with a link,
+// has a handle and a parent. The root filter of a device should have a
+// parent == HANDLE_ROOT.
+type FilterAttrs struct {
+	LinkIndex int
+	Handle    uint32
+	Parent    uint32
+	Priority  uint16 // lower is higher priority
+	Protocol  uint16 // syscall.ETH_P_*
+}
+
+func (q FilterAttrs) String() string {
+	return fmt.Sprintf("{LinkIndex: %d, Handle: %s, Parent: %s, Priority: %d, Protocol: %d}", q.LinkIndex, HandleStr(q.Handle), HandleStr(q.Parent), q.Priority, q.Protocol)
+}
+
+// U32 filters on many packet related properties
+type U32 struct {
+	FilterAttrs
+	// Currently only supports redirecting to another interface
+	RedirIndex int
+}
+
+func (filter *U32) Attrs() *FilterAttrs {
+	return &filter.FilterAttrs
+}
+
+func (filter *U32) Type() string {
+	return "u32"
+}
+
+// GenericFilter filters represent types that are not currently understood
+// by this netlink library.
+type GenericFilter struct {
+	FilterAttrs
+	FilterType string
+}
+
+func (filter *GenericFilter) Attrs() *FilterAttrs {
+	return &filter.FilterAttrs
+}
+
+func (filter *GenericFilter) Type() string {
+	return filter.FilterType
+}
diff --git a/vendor/github.com/vishvananda/netlink/filter_linux.go b/vendor/github.com/vishvananda/netlink/filter_linux.go
new file mode 100644
index 0000000000..1ec6987028
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/filter_linux.go
@@ -0,0 +1,191 @@
+package netlink
+
+import (
+	"fmt"
+	"syscall"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+// FilterDel will delete a filter from the system.
+// Equivalent to: `tc filter del $filter`
+func FilterDel(filter Filter) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_DELTFILTER, syscall.NLM_F_ACK)
+	base := filter.Attrs()
+	msg := &nl.TcMsg{
+		Family:  nl.FAMILY_ALL,
+		Ifindex: int32(base.LinkIndex),
+		Handle:  base.Handle,
+		Parent:  base.Parent,
+		Info:    MakeHandle(base.Priority, nl.Swap16(base.Protocol)),
+	}
+	req.AddData(msg)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// FilterAdd will add a filter to the system.
+// Equivalent to: `tc filter add $filter`
+func FilterAdd(filter Filter) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_NEWTFILTER, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
+	base := filter.Attrs()
+	msg := &nl.TcMsg{
+		Family:  nl.FAMILY_ALL,
+		Ifindex: int32(base.LinkIndex),
+		Handle:  base.Handle,
+		Parent:  base.Parent,
+		Info:    MakeHandle(base.Priority, nl.Swap16(base.Protocol)),
+	}
+	req.AddData(msg)
+	req.AddData(nl.NewRtAttr(nl.TCA_KIND, nl.ZeroTerminated(filter.Type())))
+
+	options := nl.NewRtAttr(nl.TCA_OPTIONS, nil)
+	if u32, ok := filter.(*U32); ok {
+		// match all
+		sel := nl.TcU32Sel{
+			Nkeys: 1,
+			Flags: nl.TC_U32_TERMINAL,
+		}
+		sel.Keys = append(sel.Keys, nl.TcU32Key{})
+		nl.NewRtAttrChild(options, nl.TCA_U32_SEL, sel.Serialize())
+		actions := nl.NewRtAttrChild(options, nl.TCA_U32_ACT, nil)
+		table := nl.NewRtAttrChild(actions, nl.TCA_ACT_TAB, nil)
+		nl.NewRtAttrChild(table, nl.TCA_KIND, nl.ZeroTerminated("mirred"))
+		// redirect to other interface
+		mir := nl.TcMirred{
+			Action:  nl.TC_ACT_STOLEN,
+			Eaction: nl.TCA_EGRESS_REDIR,
+			Ifindex: uint32(u32.RedirIndex),
+		}
+		aopts := nl.NewRtAttrChild(table, nl.TCA_OPTIONS, nil)
+		nl.NewRtAttrChild(aopts, nl.TCA_MIRRED_PARMS, mir.Serialize())
+	}
+	req.AddData(options)
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// FilterList gets a list of filters in the system.
+// Equivalent to: `tc filter show`.
+// Generally retunrs nothing if link and parent are not specified.
+func FilterList(link Link, parent uint32) ([]Filter, error) {
+	req := nl.NewNetlinkRequest(syscall.RTM_GETTFILTER, syscall.NLM_F_DUMP)
+	msg := &nl.TcMsg{
+		Family: nl.FAMILY_ALL,
+		Parent: parent,
+	}
+	if link != nil {
+		base := link.Attrs()
+		ensureIndex(base)
+		msg.Ifindex = int32(base.Index)
+	}
+	req.AddData(msg)
+
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWTFILTER)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []Filter
+	for _, m := range msgs {
+		msg := nl.DeserializeTcMsg(m)
+
+		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
+		if err != nil {
+			return nil, err
+		}
+
+		base := FilterAttrs{
+			LinkIndex: int(msg.Ifindex),
+			Handle:    msg.Handle,
+			Parent:    msg.Parent,
+		}
+		base.Priority, base.Protocol = MajorMinor(msg.Info)
+		base.Protocol = nl.Swap16(base.Protocol)
+
+		var filter Filter
+		filterType := ""
+		detailed := false
+		for _, attr := range attrs {
+			switch attr.Attr.Type {
+			case nl.TCA_KIND:
+				filterType = string(attr.Value[:len(attr.Value)-1])
+				switch filterType {
+				case "u32":
+					filter = &U32{}
+				default:
+					filter = &GenericFilter{FilterType: filterType}
+				}
+			case nl.TCA_OPTIONS:
+				switch filterType {
+				case "u32":
+					data, err := nl.ParseRouteAttr(attr.Value)
+					if err != nil {
+						return nil, err
+					}
+					detailed, err = parseU32Data(filter, data)
+					if err != nil {
+						return nil, err
+					}
+				}
+			}
+		}
+		// only return the detailed version of the filter
+		if detailed {
+			*filter.Attrs() = base
+			res = append(res, filter)
+		}
+	}
+
+	return res, nil
+}
+
+func parseU32Data(filter Filter, data []syscall.NetlinkRouteAttr) (bool, error) {
+	native = nl.NativeEndian()
+	u32 := filter.(*U32)
+	detailed := false
+	for _, datum := range data {
+		switch datum.Attr.Type {
+		case nl.TCA_U32_SEL:
+			detailed = true
+			sel := nl.DeserializeTcU32Sel(datum.Value)
+			// only parse if we have a very basic redirect
+			if sel.Flags&nl.TC_U32_TERMINAL == 0 || sel.Nkeys != 1 {
+				return detailed, nil
+			}
+		case nl.TCA_U32_ACT:
+			table, err := nl.ParseRouteAttr(datum.Value)
+			if err != nil {
+				return detailed, err
+			}
+			if len(table) != 1 || table[0].Attr.Type != nl.TCA_ACT_TAB {
+				return detailed, fmt.Errorf("Action table not formed properly")
+			}
+			aattrs, err := nl.ParseRouteAttr(table[0].Value)
+			for _, aattr := range aattrs {
+				switch aattr.Attr.Type {
+				case nl.TCA_KIND:
+					actionType := string(aattr.Value[:len(aattr.Value)-1])
+					// only parse if the action is mirred
+					if actionType != "mirred" {
+						return detailed, nil
+					}
+				case nl.TCA_OPTIONS:
+					adata, err := nl.ParseRouteAttr(aattr.Value)
+					if err != nil {
+						return detailed, err
+					}
+					for _, adatum := range adata {
+						switch adatum.Attr.Type {
+						case nl.TCA_MIRRED_PARMS:
+							mir := nl.DeserializeTcMirred(adatum.Value)
+							u32.RedirIndex = int(mir.Ifindex)
+						}
+					}
+				}
+			}
+		}
+	}
+	return detailed, nil
+}
diff --git a/vendor/github.com/vishvananda/netlink/link.go b/vendor/github.com/vishvananda/netlink/link.go
new file mode 100644
index 0000000000..18fd1759ad
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/link.go
@@ -0,0 +1,223 @@
+package netlink
+
+import "net"
+
+// Link represents a link device from netlink. Shared link attributes
+// like name may be retrieved using the Attrs() method. Unique data
+// can be retrieved by casting the object to the proper type.
+type Link interface {
+	Attrs() *LinkAttrs
+	Type() string
+}
+
+type (
+	NsPid int
+	NsFd  int
+)
+
+// LinkAttrs represents data shared by most link types
+type LinkAttrs struct {
+	Index        int
+	MTU          int
+	TxQLen       int // Transmit Queue Length
+	Name         string
+	HardwareAddr net.HardwareAddr
+	Flags        net.Flags
+	ParentIndex  int         // index of the parent link device
+	MasterIndex  int         // must be the index of a bridge
+	Namespace    interface{} // nil | NsPid | NsFd
+}
+
+// NewLinkAttrs returns LinkAttrs structure filled with default values
+func NewLinkAttrs() LinkAttrs {
+	return LinkAttrs{
+		TxQLen: -1,
+	}
+}
+
+// Device links cannot be created via netlink. These links
+// are links created by udev like 'lo' and 'etho0'
+type Device struct {
+	LinkAttrs
+}
+
+func (device *Device) Attrs() *LinkAttrs {
+	return &device.LinkAttrs
+}
+
+func (device *Device) Type() string {
+	return "device"
+}
+
+// Dummy links are dummy ethernet devices
+type Dummy struct {
+	LinkAttrs
+}
+
+func (dummy *Dummy) Attrs() *LinkAttrs {
+	return &dummy.LinkAttrs
+}
+
+func (dummy *Dummy) Type() string {
+	return "dummy"
+}
+
+// Ifb links are advanced dummy devices for packet filtering
+type Ifb struct {
+	LinkAttrs
+}
+
+func (ifb *Ifb) Attrs() *LinkAttrs {
+	return &ifb.LinkAttrs
+}
+
+func (ifb *Ifb) Type() string {
+	return "ifb"
+}
+
+// Bridge links are simple linux bridges
+type Bridge struct {
+	LinkAttrs
+}
+
+func (bridge *Bridge) Attrs() *LinkAttrs {
+	return &bridge.LinkAttrs
+}
+
+func (bridge *Bridge) Type() string {
+	return "bridge"
+}
+
+// Vlan links have ParentIndex set in their Attrs()
+type Vlan struct {
+	LinkAttrs
+	VlanId int
+}
+
+func (vlan *Vlan) Attrs() *LinkAttrs {
+	return &vlan.LinkAttrs
+}
+
+func (vlan *Vlan) Type() string {
+	return "vlan"
+}
+
+type MacvlanMode uint16
+
+const (
+	MACVLAN_MODE_DEFAULT MacvlanMode = iota
+	MACVLAN_MODE_PRIVATE
+	MACVLAN_MODE_VEPA
+	MACVLAN_MODE_BRIDGE
+	MACVLAN_MODE_PASSTHRU
+	MACVLAN_MODE_SOURCE
+)
+
+// Macvlan links have ParentIndex set in their Attrs()
+type Macvlan struct {
+	LinkAttrs
+	Mode MacvlanMode
+}
+
+func (macvlan *Macvlan) Attrs() *LinkAttrs {
+	return &macvlan.LinkAttrs
+}
+
+func (macvlan *Macvlan) Type() string {
+	return "macvlan"
+}
+
+// Macvtap - macvtap is a virtual interfaces based on macvlan
+type Macvtap struct {
+	Macvlan
+}
+
+func (macvtap Macvtap) Type() string {
+	return "macvtap"
+}
+
+// Veth devices must specify PeerName on create
+type Veth struct {
+	LinkAttrs
+	PeerName string // veth on create only
+}
+
+func (veth *Veth) Attrs() *LinkAttrs {
+	return &veth.LinkAttrs
+}
+
+func (veth *Veth) Type() string {
+	return "veth"
+}
+
+// GenericLink links represent types that are not currently understood
+// by this netlink library.
+type GenericLink struct {
+	LinkAttrs
+	LinkType string
+}
+
+func (generic *GenericLink) Attrs() *LinkAttrs {
+	return &generic.LinkAttrs
+}
+
+func (generic *GenericLink) Type() string {
+	return generic.LinkType
+}
+
+type Vxlan struct {
+	LinkAttrs
+	VxlanId      int
+	VtepDevIndex int
+	SrcAddr      net.IP
+	Group        net.IP
+	TTL          int
+	TOS          int
+	Learning     bool
+	Proxy        bool
+	RSC          bool
+	L2miss       bool
+	L3miss       bool
+	NoAge        bool
+	GBP          bool
+	Age          int
+	Limit        int
+	Port         int
+	PortLow      int
+	PortHigh     int
+}
+
+func (vxlan *Vxlan) Attrs() *LinkAttrs {
+	return &vxlan.LinkAttrs
+}
+
+func (vxlan *Vxlan) Type() string {
+	return "vxlan"
+}
+
+type IPVlanMode uint16
+
+const (
+	IPVLAN_MODE_L2 IPVlanMode = iota
+	IPVLAN_MODE_L3
+	IPVLAN_MODE_MAX
+)
+
+type IPVlan struct {
+	LinkAttrs
+	Mode IPVlanMode
+}
+
+func (ipvlan *IPVlan) Attrs() *LinkAttrs {
+	return &ipvlan.LinkAttrs
+}
+
+func (ipvlan *IPVlan) Type() string {
+	return "ipvlan"
+}
+
+// iproute2 supported devices;
+// vlan | veth | vcan | dummy | ifb | macvlan | macvtap |
+// bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |
+// gre | gretap | ip6gre | ip6gretap | vti | nlmon |
+// bond_slave | ipvlan
diff --git a/vendor/github.com/vishvananda/netlink/link_linux.go b/vendor/github.com/vishvananda/netlink/link_linux.go
new file mode 100644
index 0000000000..842a21f3d2
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/link_linux.go
@@ -0,0 +1,790 @@
+package netlink
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"net"
+	"syscall"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+var native = nl.NativeEndian()
+var lookupByDump = false
+
+var macvlanModes = [...]uint32{
+	0,
+	nl.MACVLAN_MODE_PRIVATE,
+	nl.MACVLAN_MODE_VEPA,
+	nl.MACVLAN_MODE_BRIDGE,
+	nl.MACVLAN_MODE_PASSTHRU,
+	nl.MACVLAN_MODE_SOURCE,
+}
+
+func ensureIndex(link *LinkAttrs) {
+	if link != nil && link.Index == 0 {
+		newlink, _ := LinkByName(link.Name)
+		if newlink != nil {
+			link.Index = newlink.Attrs().Index
+		}
+	}
+}
+
+// LinkSetUp enables the link device.
+// Equivalent to: `ip link set $link up`
+func LinkSetUp(link Link) error {
+	base := link.Attrs()
+	ensureIndex(base)
+	req := nl.NewNetlinkRequest(syscall.RTM_NEWLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Change = syscall.IFF_UP
+	msg.Flags = syscall.IFF_UP
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// LinkSetDown disables link device.
+// Equivalent to: `ip link set $link down`
+func LinkSetDown(link Link) error {
+	base := link.Attrs()
+	ensureIndex(base)
+	req := nl.NewNetlinkRequest(syscall.RTM_NEWLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Change = syscall.IFF_UP
+	msg.Flags = 0 & ^syscall.IFF_UP
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// LinkSetMTU sets the mtu of the link device.
+// Equivalent to: `ip link set $link mtu $mtu`
+func LinkSetMTU(link Link, mtu int) error {
+	base := link.Attrs()
+	ensureIndex(base)
+	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	b := make([]byte, 4)
+	native.PutUint32(b, uint32(mtu))
+
+	data := nl.NewRtAttr(syscall.IFLA_MTU, b)
+	req.AddData(data)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// LinkSetName sets the name of the link device.
+// Equivalent to: `ip link set $link name $name`
+func LinkSetName(link Link, name string) error {
+	base := link.Attrs()
+	ensureIndex(base)
+	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	data := nl.NewRtAttr(syscall.IFLA_IFNAME, []byte(name))
+	req.AddData(data)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// LinkSetHardwareAddr sets the hardware address of the link device.
+// Equivalent to: `ip link set $link address $hwaddr`
+func LinkSetHardwareAddr(link Link, hwaddr net.HardwareAddr) error {
+	base := link.Attrs()
+	ensureIndex(base)
+	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	data := nl.NewRtAttr(syscall.IFLA_ADDRESS, []byte(hwaddr))
+	req.AddData(data)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// LinkSetMaster sets the master of the link device.
+// Equivalent to: `ip link set $link master $master`
+func LinkSetMaster(link Link, master *Bridge) error {
+	index := 0
+	if master != nil {
+		masterBase := master.Attrs()
+		ensureIndex(masterBase)
+		index = masterBase.Index
+	}
+	return LinkSetMasterByIndex(link, index)
+}
+
+// LinkSetMasterByIndex sets the master of the link device.
+// Equivalent to: `ip link set $link master $master`
+func LinkSetMasterByIndex(link Link, masterIndex int) error {
+	base := link.Attrs()
+	ensureIndex(base)
+	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	b := make([]byte, 4)
+	native.PutUint32(b, uint32(masterIndex))
+
+	data := nl.NewRtAttr(syscall.IFLA_MASTER, b)
+	req.AddData(data)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// LinkSetNsPid puts the device into a new network namespace. The
+// pid must be a pid of a running process.
+// Equivalent to: `ip link set $link netns $pid`
+func LinkSetNsPid(link Link, nspid int) error {
+	base := link.Attrs()
+	ensureIndex(base)
+	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	b := make([]byte, 4)
+	native.PutUint32(b, uint32(nspid))
+
+	data := nl.NewRtAttr(syscall.IFLA_NET_NS_PID, b)
+	req.AddData(data)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// LinkSetNsFd puts the device into a new network namespace. The
+// fd must be an open file descriptor to a network namespace.
+// Similar to: `ip link set $link netns $ns`
+func LinkSetNsFd(link Link, fd int) error {
+	base := link.Attrs()
+	ensureIndex(base)
+	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	b := make([]byte, 4)
+	native.PutUint32(b, uint32(fd))
+
+	data := nl.NewRtAttr(nl.IFLA_NET_NS_FD, b)
+	req.AddData(data)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+func boolAttr(val bool) []byte {
+	var v uint8
+	if val {
+		v = 1
+	}
+	return nl.Uint8Attr(v)
+}
+
+type vxlanPortRange struct {
+	Lo, Hi uint16
+}
+
+func addVxlanAttrs(vxlan *Vxlan, linkInfo *nl.RtAttr) {
+	data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
+	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_ID, nl.Uint32Attr(uint32(vxlan.VxlanId)))
+	if vxlan.VtepDevIndex != 0 {
+		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LINK, nl.Uint32Attr(uint32(vxlan.VtepDevIndex)))
+	}
+	if vxlan.SrcAddr != nil {
+		ip := vxlan.SrcAddr.To4()
+		if ip != nil {
+			nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LOCAL, []byte(ip))
+		} else {
+			ip = vxlan.SrcAddr.To16()
+			if ip != nil {
+				nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LOCAL6, []byte(ip))
+			}
+		}
+	}
+	if vxlan.Group != nil {
+		group := vxlan.Group.To4()
+		if group != nil {
+			nl.NewRtAttrChild(data, nl.IFLA_VXLAN_GROUP, []byte(group))
+		} else {
+			group = vxlan.Group.To16()
+			if group != nil {
+				nl.NewRtAttrChild(data, nl.IFLA_VXLAN_GROUP6, []byte(group))
+			}
+		}
+	}
+
+	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_TTL, nl.Uint8Attr(uint8(vxlan.TTL)))
+	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_TOS, nl.Uint8Attr(uint8(vxlan.TOS)))
+	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LEARNING, boolAttr(vxlan.Learning))
+	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_PROXY, boolAttr(vxlan.Proxy))
+	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_RSC, boolAttr(vxlan.RSC))
+	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_L2MISS, boolAttr(vxlan.L2miss))
+	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_L3MISS, boolAttr(vxlan.L3miss))
+
+	if vxlan.GBP {
+		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_GBP, boolAttr(vxlan.GBP))
+	}
+
+	if vxlan.NoAge {
+		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_AGEING, nl.Uint32Attr(0))
+	} else if vxlan.Age > 0 {
+		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_AGEING, nl.Uint32Attr(uint32(vxlan.Age)))
+	}
+	if vxlan.Limit > 0 {
+		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LIMIT, nl.Uint32Attr(uint32(vxlan.Limit)))
+	}
+	if vxlan.Port > 0 {
+		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_PORT, nl.Uint16Attr(uint16(vxlan.Port)))
+	}
+	if vxlan.PortLow > 0 || vxlan.PortHigh > 0 {
+		pr := vxlanPortRange{uint16(vxlan.PortLow), uint16(vxlan.PortHigh)}
+
+		buf := new(bytes.Buffer)
+		binary.Write(buf, binary.BigEndian, &pr)
+
+		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_PORT_RANGE, buf.Bytes())
+	}
+}
+
+// LinkAdd adds a new link device. The type and features of the device
+// are taken fromt the parameters in the link object.
+// Equivalent to: `ip link add $link`
+func LinkAdd(link Link) error {
+	// TODO: set mtu and hardware address
+	// TODO: support extra data for macvlan
+	base := link.Attrs()
+
+	if base.Name == "" {
+		return fmt.Errorf("LinkAttrs.Name cannot be empty!")
+	}
+
+	req := nl.NewNetlinkRequest(syscall.RTM_NEWLINK, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	req.AddData(msg)
+
+	if base.ParentIndex != 0 {
+		b := make([]byte, 4)
+		native.PutUint32(b, uint32(base.ParentIndex))
+		data := nl.NewRtAttr(syscall.IFLA_LINK, b)
+		req.AddData(data)
+	} else if link.Type() == "ipvlan" {
+		return fmt.Errorf("Can't create ipvlan link without ParentIndex")
+	}
+
+	nameData := nl.NewRtAttr(syscall.IFLA_IFNAME, nl.ZeroTerminated(base.Name))
+	req.AddData(nameData)
+
+	if base.MTU > 0 {
+		mtu := nl.NewRtAttr(syscall.IFLA_MTU, nl.Uint32Attr(uint32(base.MTU)))
+		req.AddData(mtu)
+	}
+
+	if base.TxQLen >= 0 {
+		qlen := nl.NewRtAttr(syscall.IFLA_TXQLEN, nl.Uint32Attr(uint32(base.TxQLen)))
+		req.AddData(qlen)
+	}
+
+	if base.Namespace != nil {
+		var attr *nl.RtAttr
+		switch base.Namespace.(type) {
+		case NsPid:
+			val := nl.Uint32Attr(uint32(base.Namespace.(NsPid)))
+			attr = nl.NewRtAttr(syscall.IFLA_NET_NS_PID, val)
+		case NsFd:
+			val := nl.Uint32Attr(uint32(base.Namespace.(NsFd)))
+			attr = nl.NewRtAttr(nl.IFLA_NET_NS_FD, val)
+		}
+
+		req.AddData(attr)
+	}
+
+	linkInfo := nl.NewRtAttr(syscall.IFLA_LINKINFO, nil)
+	nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_KIND, nl.NonZeroTerminated(link.Type()))
+
+	if vlan, ok := link.(*Vlan); ok {
+		b := make([]byte, 2)
+		native.PutUint16(b, uint16(vlan.VlanId))
+		data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
+		nl.NewRtAttrChild(data, nl.IFLA_VLAN_ID, b)
+	} else if veth, ok := link.(*Veth); ok {
+		data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
+		peer := nl.NewRtAttrChild(data, nl.VETH_INFO_PEER, nil)
+		nl.NewIfInfomsgChild(peer, syscall.AF_UNSPEC)
+		nl.NewRtAttrChild(peer, syscall.IFLA_IFNAME, nl.ZeroTerminated(veth.PeerName))
+		if base.TxQLen >= 0 {
+			nl.NewRtAttrChild(peer, syscall.IFLA_TXQLEN, nl.Uint32Attr(uint32(base.TxQLen)))
+		}
+		if base.MTU > 0 {
+			nl.NewRtAttrChild(peer, syscall.IFLA_MTU, nl.Uint32Attr(uint32(base.MTU)))
+		}
+
+	} else if vxlan, ok := link.(*Vxlan); ok {
+		addVxlanAttrs(vxlan, linkInfo)
+	} else if ipv, ok := link.(*IPVlan); ok {
+		data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
+		nl.NewRtAttrChild(data, nl.IFLA_IPVLAN_MODE, nl.Uint16Attr(uint16(ipv.Mode)))
+	} else if macv, ok := link.(*Macvlan); ok {
+		if macv.Mode != MACVLAN_MODE_DEFAULT {
+			data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
+			nl.NewRtAttrChild(data, nl.IFLA_MACVLAN_MODE, nl.Uint32Attr(macvlanModes[macv.Mode]))
+		}
+	}
+
+	req.AddData(linkInfo)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	if err != nil {
+		return err
+	}
+
+	ensureIndex(base)
+
+	// can't set master during create, so set it afterwards
+	if base.MasterIndex != 0 {
+		// TODO: verify MasterIndex is actually a bridge?
+		return LinkSetMasterByIndex(link, base.MasterIndex)
+	}
+	return nil
+}
+
+// LinkDel deletes link device. Either Index or Name must be set in
+// the link object for it to be deleted. The other values are ignored.
+// Equivalent to: `ip link del $link`
+func LinkDel(link Link) error {
+	base := link.Attrs()
+
+	ensureIndex(base)
+
+	req := nl.NewNetlinkRequest(syscall.RTM_DELLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+func linkByNameDump(name string) (Link, error) {
+	links, err := LinkList()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, link := range links {
+		if link.Attrs().Name == name {
+			return link, nil
+		}
+	}
+	return nil, fmt.Errorf("Link %s not found", name)
+}
+
+// LinkByName finds a link by name and returns a pointer to the object.
+func LinkByName(name string) (Link, error) {
+	if lookupByDump {
+		return linkByNameDump(name)
+	}
+
+	req := nl.NewNetlinkRequest(syscall.RTM_GETLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	req.AddData(msg)
+
+	nameData := nl.NewRtAttr(syscall.IFLA_IFNAME, nl.ZeroTerminated(name))
+	req.AddData(nameData)
+
+	link, err := execGetLink(req)
+	if err == syscall.EINVAL {
+		// older kernels don't support looking up via IFLA_IFNAME
+		// so fall back to dumping all links
+		lookupByDump = true
+		return linkByNameDump(name)
+	}
+
+	return link, err
+}
+
+// LinkByIndex finds a link by index and returns a pointer to the object.
+func LinkByIndex(index int) (Link, error) {
+	req := nl.NewNetlinkRequest(syscall.RTM_GETLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	msg.Index = int32(index)
+	req.AddData(msg)
+
+	return execGetLink(req)
+}
+
+func execGetLink(req *nl.NetlinkRequest) (Link, error) {
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	if err != nil {
+		if errno, ok := err.(syscall.Errno); ok {
+			if errno == syscall.ENODEV {
+				return nil, fmt.Errorf("Link not found")
+			}
+		}
+		return nil, err
+	}
+
+	switch {
+	case len(msgs) == 0:
+		return nil, fmt.Errorf("Link not found")
+
+	case len(msgs) == 1:
+		return linkDeserialize(msgs[0])
+
+	default:
+		return nil, fmt.Errorf("More than one link found")
+	}
+}
+
+// linkDeserialize deserializes a raw message received from netlink into
+// a link object.
+func linkDeserialize(m []byte) (Link, error) {
+	msg := nl.DeserializeIfInfomsg(m)
+
+	attrs, err := nl.ParseRouteAttr(m[msg.Len():])
+	if err != nil {
+		return nil, err
+	}
+
+	base := LinkAttrs{Index: int(msg.Index), Flags: linkFlags(msg.Flags)}
+	var link Link
+	linkType := ""
+	for _, attr := range attrs {
+		switch attr.Attr.Type {
+		case syscall.IFLA_LINKINFO:
+			infos, err := nl.ParseRouteAttr(attr.Value)
+			if err != nil {
+				return nil, err
+			}
+			for _, info := range infos {
+				switch info.Attr.Type {
+				case nl.IFLA_INFO_KIND:
+					linkType = string(info.Value[:len(info.Value)-1])
+					switch linkType {
+					case "dummy":
+						link = &Dummy{}
+					case "ifb":
+						link = &Ifb{}
+					case "bridge":
+						link = &Bridge{}
+					case "vlan":
+						link = &Vlan{}
+					case "veth":
+						link = &Veth{}
+					case "vxlan":
+						link = &Vxlan{}
+					case "ipvlan":
+						link = &IPVlan{}
+					case "macvlan":
+						link = &Macvlan{}
+					case "macvtap":
+						link = &Macvtap{}
+					default:
+						link = &GenericLink{LinkType: linkType}
+					}
+				case nl.IFLA_INFO_DATA:
+					data, err := nl.ParseRouteAttr(info.Value)
+					if err != nil {
+						return nil, err
+					}
+					switch linkType {
+					case "vlan":
+						parseVlanData(link, data)
+					case "vxlan":
+						parseVxlanData(link, data)
+					case "ipvlan":
+						parseIPVlanData(link, data)
+					case "macvlan":
+						parseMacvlanData(link, data)
+					case "macvtap":
+						parseMacvtapData(link, data)
+					}
+				}
+			}
+		case syscall.IFLA_ADDRESS:
+			var nonzero bool
+			for _, b := range attr.Value {
+				if b != 0 {
+					nonzero = true
+				}
+			}
+			if nonzero {
+				base.HardwareAddr = attr.Value[:]
+			}
+		case syscall.IFLA_IFNAME:
+			base.Name = string(attr.Value[:len(attr.Value)-1])
+		case syscall.IFLA_MTU:
+			base.MTU = int(native.Uint32(attr.Value[0:4]))
+		case syscall.IFLA_LINK:
+			base.ParentIndex = int(native.Uint32(attr.Value[0:4]))
+		case syscall.IFLA_MASTER:
+			base.MasterIndex = int(native.Uint32(attr.Value[0:4]))
+		case syscall.IFLA_TXQLEN:
+			base.TxQLen = int(native.Uint32(attr.Value[0:4]))
+		}
+	}
+	// Links that don't have IFLA_INFO_KIND are hardware devices
+	if link == nil {
+		link = &Device{}
+	}
+	*link.Attrs() = base
+
+	return link, nil
+}
+
+// LinkList gets a list of link devices.
+// Equivalent to: `ip link show`
+func LinkList() ([]Link, error) {
+	// NOTE(vish): This duplicates functionality in net/iface_linux.go, but we need
+	//             to get the message ourselves to parse link type.
+	req := nl.NewNetlinkRequest(syscall.RTM_GETLINK, syscall.NLM_F_DUMP)
+
+	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
+	req.AddData(msg)
+
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWLINK)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []Link
+	for _, m := range msgs {
+		link, err := linkDeserialize(m)
+		if err != nil {
+			return nil, err
+		}
+		res = append(res, link)
+	}
+
+	return res, nil
+}
+
+// LinkUpdate is used to pass information back from LinkSubscribe()
+type LinkUpdate struct {
+	nl.IfInfomsg
+	Link
+}
+
+// LinkSubscribe takes a chan down which notifications will be sent
+// when links change.  Close the 'done' chan to stop subscription.
+func LinkSubscribe(ch chan<- LinkUpdate, done <-chan struct{}) error {
+	s, err := nl.Subscribe(syscall.NETLINK_ROUTE, syscall.RTNLGRP_LINK)
+	if err != nil {
+		return err
+	}
+	if done != nil {
+		go func() {
+			<-done
+			s.Close()
+		}()
+	}
+	go func() {
+		defer close(ch)
+		for {
+			msgs, err := s.Receive()
+			if err != nil {
+				return
+			}
+			for _, m := range msgs {
+				ifmsg := nl.DeserializeIfInfomsg(m.Data)
+				link, err := linkDeserialize(m.Data)
+				if err != nil {
+					return
+				}
+				ch <- LinkUpdate{IfInfomsg: *ifmsg, Link: link}
+			}
+		}
+	}()
+
+	return nil
+}
+
+func LinkSetHairpin(link Link, mode bool) error {
+	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_MODE)
+}
+
+func LinkSetGuard(link Link, mode bool) error {
+	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_GUARD)
+}
+
+func LinkSetFastLeave(link Link, mode bool) error {
+	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_FAST_LEAVE)
+}
+
+func LinkSetLearning(link Link, mode bool) error {
+	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_LEARNING)
+}
+
+func LinkSetRootBlock(link Link, mode bool) error {
+	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_PROTECT)
+}
+
+func LinkSetFlood(link Link, mode bool) error {
+	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_UNICAST_FLOOD)
+}
+
+func setProtinfoAttr(link Link, mode bool, attr int) error {
+	base := link.Attrs()
+	ensureIndex(base)
+	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
+
+	msg := nl.NewIfInfomsg(syscall.AF_BRIDGE)
+	msg.Index = int32(base.Index)
+	req.AddData(msg)
+
+	br := nl.NewRtAttr(syscall.IFLA_PROTINFO|syscall.NLA_F_NESTED, nil)
+	nl.NewRtAttrChild(br, attr, boolToByte(mode))
+	req.AddData(br)
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func parseVlanData(link Link, data []syscall.NetlinkRouteAttr) {
+	vlan := link.(*Vlan)
+	for _, datum := range data {
+		switch datum.Attr.Type {
+		case nl.IFLA_VLAN_ID:
+			vlan.VlanId = int(native.Uint16(datum.Value[0:2]))
+		}
+	}
+}
+
+func parseVxlanData(link Link, data []syscall.NetlinkRouteAttr) {
+	vxlan := link.(*Vxlan)
+	for _, datum := range data {
+		switch datum.Attr.Type {
+		case nl.IFLA_VXLAN_ID:
+			vxlan.VxlanId = int(native.Uint32(datum.Value[0:4]))
+		case nl.IFLA_VXLAN_LINK:
+			vxlan.VtepDevIndex = int(native.Uint32(datum.Value[0:4]))
+		case nl.IFLA_VXLAN_LOCAL:
+			vxlan.SrcAddr = net.IP(datum.Value[0:4])
+		case nl.IFLA_VXLAN_LOCAL6:
+			vxlan.SrcAddr = net.IP(datum.Value[0:16])
+		case nl.IFLA_VXLAN_GROUP:
+			vxlan.Group = net.IP(datum.Value[0:4])
+		case nl.IFLA_VXLAN_GROUP6:
+			vxlan.Group = net.IP(datum.Value[0:16])
+		case nl.IFLA_VXLAN_TTL:
+			vxlan.TTL = int(datum.Value[0])
+		case nl.IFLA_VXLAN_TOS:
+			vxlan.TOS = int(datum.Value[0])
+		case nl.IFLA_VXLAN_LEARNING:
+			vxlan.Learning = int8(datum.Value[0]) != 0
+		case nl.IFLA_VXLAN_PROXY:
+			vxlan.Proxy = int8(datum.Value[0]) != 0
+		case nl.IFLA_VXLAN_RSC:
+			vxlan.RSC = int8(datum.Value[0]) != 0
+		case nl.IFLA_VXLAN_L2MISS:
+			vxlan.L2miss = int8(datum.Value[0]) != 0
+		case nl.IFLA_VXLAN_L3MISS:
+			vxlan.L3miss = int8(datum.Value[0]) != 0
+		case nl.IFLA_VXLAN_GBP:
+			vxlan.GBP = int8(datum.Value[0]) != 0
+		case nl.IFLA_VXLAN_AGEING:
+			vxlan.Age = int(native.Uint32(datum.Value[0:4]))
+			vxlan.NoAge = vxlan.Age == 0
+		case nl.IFLA_VXLAN_LIMIT:
+			vxlan.Limit = int(native.Uint32(datum.Value[0:4]))
+		case nl.IFLA_VXLAN_PORT:
+			vxlan.Port = int(native.Uint16(datum.Value[0:2]))
+		case nl.IFLA_VXLAN_PORT_RANGE:
+			buf := bytes.NewBuffer(datum.Value[0:4])
+			var pr vxlanPortRange
+			if binary.Read(buf, binary.BigEndian, &pr) != nil {
+				vxlan.PortLow = int(pr.Lo)
+				vxlan.PortHigh = int(pr.Hi)
+			}
+		}
+	}
+}
+
+func parseIPVlanData(link Link, data []syscall.NetlinkRouteAttr) {
+	ipv := link.(*IPVlan)
+	for _, datum := range data {
+		if datum.Attr.Type == nl.IFLA_IPVLAN_MODE {
+			ipv.Mode = IPVlanMode(native.Uint32(datum.Value[0:4]))
+			return
+		}
+	}
+}
+
+func parseMacvtapData(link Link, data []syscall.NetlinkRouteAttr) {
+	macv := link.(*Macvtap)
+	parseMacvlanData(&macv.Macvlan, data)
+}
+
+func parseMacvlanData(link Link, data []syscall.NetlinkRouteAttr) {
+	macv := link.(*Macvlan)
+	for _, datum := range data {
+		if datum.Attr.Type == nl.IFLA_MACVLAN_MODE {
+			switch native.Uint32(datum.Value[0:4]) {
+			case nl.MACVLAN_MODE_PRIVATE:
+				macv.Mode = MACVLAN_MODE_PRIVATE
+			case nl.MACVLAN_MODE_VEPA:
+				macv.Mode = MACVLAN_MODE_VEPA
+			case nl.MACVLAN_MODE_BRIDGE:
+				macv.Mode = MACVLAN_MODE_BRIDGE
+			case nl.MACVLAN_MODE_PASSTHRU:
+				macv.Mode = MACVLAN_MODE_PASSTHRU
+			case nl.MACVLAN_MODE_SOURCE:
+				macv.Mode = MACVLAN_MODE_SOURCE
+			}
+			return
+		}
+	}
+}
+
+// copied from pkg/net_linux.go
+func linkFlags(rawFlags uint32) net.Flags {
+	var f net.Flags
+	if rawFlags&syscall.IFF_UP != 0 {
+		f |= net.FlagUp
+	}
+	if rawFlags&syscall.IFF_BROADCAST != 0 {
+		f |= net.FlagBroadcast
+	}
+	if rawFlags&syscall.IFF_LOOPBACK != 0 {
+		f |= net.FlagLoopback
+	}
+	if rawFlags&syscall.IFF_POINTOPOINT != 0 {
+		f |= net.FlagPointToPoint
+	}
+	if rawFlags&syscall.IFF_MULTICAST != 0 {
+		f |= net.FlagMulticast
+	}
+	return f
+}
diff --git a/vendor/github.com/vishvananda/netlink/neigh.go b/vendor/github.com/vishvananda/netlink/neigh.go
new file mode 100644
index 0000000000..0e5eb90c9e
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/neigh.go
@@ -0,0 +1,22 @@
+package netlink
+
+import (
+	"fmt"
+	"net"
+)
+
+// Neigh represents a link layer neighbor from netlink.
+type Neigh struct {
+	LinkIndex    int
+	Family       int
+	State        int
+	Type         int
+	Flags        int
+	IP           net.IP
+	HardwareAddr net.HardwareAddr
+}
+
+// String returns $ip/$hwaddr $label
+func (neigh *Neigh) String() string {
+	return fmt.Sprintf("%s %s", neigh.IP, neigh.HardwareAddr)
+}
diff --git a/vendor/github.com/vishvananda/netlink/neigh_linux.go b/vendor/github.com/vishvananda/netlink/neigh_linux.go
new file mode 100644
index 0000000000..620a0ee708
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/neigh_linux.go
@@ -0,0 +1,189 @@
+package netlink
+
+import (
+	"net"
+	"syscall"
+	"unsafe"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+const (
+	NDA_UNSPEC = iota
+	NDA_DST
+	NDA_LLADDR
+	NDA_CACHEINFO
+	NDA_PROBES
+	NDA_VLAN
+	NDA_PORT
+	NDA_VNI
+	NDA_IFINDEX
+	NDA_MAX = NDA_IFINDEX
+)
+
+// Neighbor Cache Entry States.
+const (
+	NUD_NONE       = 0x00
+	NUD_INCOMPLETE = 0x01
+	NUD_REACHABLE  = 0x02
+	NUD_STALE      = 0x04
+	NUD_DELAY      = 0x08
+	NUD_PROBE      = 0x10
+	NUD_FAILED     = 0x20
+	NUD_NOARP      = 0x40
+	NUD_PERMANENT  = 0x80
+)
+
+// Neighbor Flags
+const (
+	NTF_USE    = 0x01
+	NTF_SELF   = 0x02
+	NTF_MASTER = 0x04
+	NTF_PROXY  = 0x08
+	NTF_ROUTER = 0x80
+)
+
+type Ndmsg struct {
+	Family uint8
+	Index  uint32
+	State  uint16
+	Flags  uint8
+	Type   uint8
+}
+
+func deserializeNdmsg(b []byte) *Ndmsg {
+	var dummy Ndmsg
+	return (*Ndmsg)(unsafe.Pointer(&b[0:unsafe.Sizeof(dummy)][0]))
+}
+
+func (msg *Ndmsg) Serialize() []byte {
+	return (*(*[unsafe.Sizeof(*msg)]byte)(unsafe.Pointer(msg)))[:]
+}
+
+func (msg *Ndmsg) Len() int {
+	return int(unsafe.Sizeof(*msg))
+}
+
+// NeighAdd will add an IP to MAC mapping to the ARP table
+// Equivalent to: `ip neigh add ....`
+func NeighAdd(neigh *Neigh) error {
+	return neighAdd(neigh, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL)
+}
+
+// NeighAdd will add or replace an IP to MAC mapping to the ARP table
+// Equivalent to: `ip neigh replace....`
+func NeighSet(neigh *Neigh) error {
+	return neighAdd(neigh, syscall.NLM_F_CREATE)
+}
+
+// NeighAppend will append an entry to FDB
+// Equivalent to: `bridge fdb append...`
+func NeighAppend(neigh *Neigh) error {
+	return neighAdd(neigh, syscall.NLM_F_CREATE|syscall.NLM_F_APPEND)
+}
+
+func neighAdd(neigh *Neigh, mode int) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_NEWNEIGH, mode|syscall.NLM_F_ACK)
+	return neighHandle(neigh, req)
+}
+
+// NeighDel will delete an IP address from a link device.
+// Equivalent to: `ip addr del $addr dev $link`
+func NeighDel(neigh *Neigh) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_DELNEIGH, syscall.NLM_F_ACK)
+	return neighHandle(neigh, req)
+}
+
+func neighHandle(neigh *Neigh, req *nl.NetlinkRequest) error {
+	var family int
+	if neigh.Family > 0 {
+		family = neigh.Family
+	} else {
+		family = nl.GetIPFamily(neigh.IP)
+	}
+
+	msg := Ndmsg{
+		Family: uint8(family),
+		Index:  uint32(neigh.LinkIndex),
+		State:  uint16(neigh.State),
+		Type:   uint8(neigh.Type),
+		Flags:  uint8(neigh.Flags),
+	}
+	req.AddData(&msg)
+
+	ipData := neigh.IP.To4()
+	if ipData == nil {
+		ipData = neigh.IP.To16()
+	}
+
+	dstData := nl.NewRtAttr(NDA_DST, ipData)
+	req.AddData(dstData)
+
+	hwData := nl.NewRtAttr(NDA_LLADDR, []byte(neigh.HardwareAddr))
+	req.AddData(hwData)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// NeighList gets a list of IP-MAC mappings in the system (ARP table).
+// Equivalent to: `ip neighbor show`.
+// The list can be filtered by link and ip family.
+func NeighList(linkIndex, family int) ([]Neigh, error) {
+	req := nl.NewNetlinkRequest(syscall.RTM_GETNEIGH, syscall.NLM_F_DUMP)
+	msg := Ndmsg{
+		Family: uint8(family),
+	}
+	req.AddData(&msg)
+
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWNEIGH)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []Neigh
+	for _, m := range msgs {
+		ndm := deserializeNdmsg(m)
+		if linkIndex != 0 && int(ndm.Index) != linkIndex {
+			// Ignore messages from other interfaces
+			continue
+		}
+
+		neigh, err := NeighDeserialize(m)
+		if err != nil {
+			continue
+		}
+
+		res = append(res, *neigh)
+	}
+
+	return res, nil
+}
+
+func NeighDeserialize(m []byte) (*Neigh, error) {
+	msg := deserializeNdmsg(m)
+
+	neigh := Neigh{
+		LinkIndex: int(msg.Index),
+		Family:    int(msg.Family),
+		State:     int(msg.State),
+		Type:      int(msg.Type),
+		Flags:     int(msg.Flags),
+	}
+
+	attrs, err := nl.ParseRouteAttr(m[msg.Len():])
+	if err != nil {
+		return nil, err
+	}
+
+	for _, attr := range attrs {
+		switch attr.Attr.Type {
+		case NDA_DST:
+			neigh.IP = net.IP(attr.Value)
+		case NDA_LLADDR:
+			neigh.HardwareAddr = net.HardwareAddr(attr.Value)
+		}
+	}
+
+	return &neigh, nil
+}
diff --git a/vendor/github.com/vishvananda/netlink/netlink.go b/vendor/github.com/vishvananda/netlink/netlink.go
new file mode 100644
index 0000000000..41ebdb11f1
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/netlink.go
@@ -0,0 +1,39 @@
+// Package netlink provides a simple library for netlink. Netlink is
+// the interface a user-space program in linux uses to communicate with
+// the kernel. It can be used to add and remove interfaces, set up ip
+// addresses and routes, and confiugre ipsec. Netlink communication
+// requires elevated privileges, so in most cases this code needs to
+// be run as root. The low level primitives for netlink are contained
+// in the nl subpackage. This package attempts to provide a high-level
+// interface that is loosly modeled on the iproute2 cli.
+package netlink
+
+import (
+	"net"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+const (
+	// Family type definitions
+	FAMILY_ALL = nl.FAMILY_ALL
+	FAMILY_V4  = nl.FAMILY_V4
+	FAMILY_V6  = nl.FAMILY_V6
+)
+
+// ParseIPNet parses a string in ip/net format and returns a net.IPNet.
+// This is valuable because addresses in netlink are often IPNets and
+// ParseCIDR returns an IPNet with the IP part set to the base IP of the
+// range.
+func ParseIPNet(s string) (*net.IPNet, error) {
+	ip, ipNet, err := net.ParseCIDR(s)
+	if err != nil {
+		return nil, err
+	}
+	return &net.IPNet{IP: ip, Mask: ipNet.Mask}, nil
+}
+
+// NewIPNet generates an IPNet from an ip address using a netmask of 32.
+func NewIPNet(ip net.IP) *net.IPNet {
+	return &net.IPNet{IP: ip, Mask: net.CIDRMask(32, 32)}
+}
diff --git a/vendor/github.com/vishvananda/netlink/netlink_unspecified.go b/vendor/github.com/vishvananda/netlink/netlink_unspecified.go
new file mode 100644
index 0000000000..10c49c1bfc
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/netlink_unspecified.go
@@ -0,0 +1,143 @@
+// +build !linux
+
+package netlink
+
+import (
+	"errors"
+)
+
+var (
+	ErrNotImplemented = errors.New("not implemented")
+)
+
+func LinkSetUp(link *Link) error {
+	return ErrNotImplemented
+}
+
+func LinkSetDown(link *Link) error {
+	return ErrNotImplemented
+}
+
+func LinkSetMTU(link *Link, mtu int) error {
+	return ErrNotImplemented
+}
+
+func LinkSetMaster(link *Link, master *Link) error {
+	return ErrNotImplemented
+}
+
+func LinkSetNsPid(link *Link, nspid int) error {
+	return ErrNotImplemented
+}
+
+func LinkSetNsFd(link *Link, fd int) error {
+	return ErrNotImplemented
+}
+
+func LinkAdd(link *Link) error {
+	return ErrNotImplemented
+}
+
+func LinkDel(link *Link) error {
+	return ErrNotImplemented
+}
+
+func SetHairpin(link Link, mode bool) error {
+	return ErrNotImplemented
+}
+
+func SetGuard(link Link, mode bool) error {
+	return ErrNotImplemented
+}
+
+func SetFastLeave(link Link, mode bool) error {
+	return ErrNotImplemented
+}
+
+func SetLearning(link Link, mode bool) error {
+	return ErrNotImplemented
+}
+
+func SetRootBlock(link Link, mode bool) error {
+	return ErrNotImplemented
+}
+
+func SetFlood(link Link, mode bool) error {
+	return ErrNotImplemented
+}
+
+func LinkList() ([]Link, error) {
+	return nil, ErrNotImplemented
+}
+
+func AddrAdd(link *Link, addr *Addr) error {
+	return ErrNotImplemented
+}
+
+func AddrDel(link *Link, addr *Addr) error {
+	return ErrNotImplemented
+}
+
+func AddrList(link *Link, family int) ([]Addr, error) {
+	return nil, ErrNotImplemented
+}
+
+func RouteAdd(route *Route) error {
+	return ErrNotImplemented
+}
+
+func RouteDel(route *Route) error {
+	return ErrNotImplemented
+}
+
+func RouteList(link *Link, family int) ([]Route, error) {
+	return nil, ErrNotImplemented
+}
+
+func XfrmPolicyAdd(policy *XfrmPolicy) error {
+	return ErrNotImplemented
+}
+
+func XfrmPolicyDel(policy *XfrmPolicy) error {
+	return ErrNotImplemented
+}
+
+func XfrmPolicyList(family int) ([]XfrmPolicy, error) {
+	return nil, ErrNotImplemented
+}
+
+func XfrmStateAdd(policy *XfrmState) error {
+	return ErrNotImplemented
+}
+
+func XfrmStateDel(policy *XfrmState) error {
+	return ErrNotImplemented
+}
+
+func XfrmStateList(family int) ([]XfrmState, error) {
+	return nil, ErrNotImplemented
+}
+
+func NeighAdd(neigh *Neigh) error {
+	return ErrNotImplemented
+}
+
+func NeighSet(neigh *Neigh) error {
+	return ErrNotImplemented
+}
+
+func NeighAppend(neigh *Neigh) error {
+	return ErrNotImplemented
+}
+
+func NeighDel(neigh *Neigh) error {
+	return ErrNotImplemented
+}
+
+func NeighList(linkIndex, family int) ([]Neigh, error) {
+	return nil, ErrNotImplemented
+}
+
+func NeighDeserialize(m []byte) (*Ndmsg, *Neigh, error) {
+	return nil, nil, ErrNotImplemented
+}
diff --git a/vendor/github.com/vishvananda/netlink/nl/addr_linux.go b/vendor/github.com/vishvananda/netlink/nl/addr_linux.go
new file mode 100644
index 0000000000..17088fa0c0
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/nl/addr_linux.go
@@ -0,0 +1,47 @@
+package nl
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+type IfAddrmsg struct {
+	syscall.IfAddrmsg
+}
+
+func NewIfAddrmsg(family int) *IfAddrmsg {
+	return &IfAddrmsg{
+		IfAddrmsg: syscall.IfAddrmsg{
+			Family: uint8(family),
+		},
+	}
+}
+
+// struct ifaddrmsg {
+//   __u8    ifa_family;
+//   __u8    ifa_prefixlen;  /* The prefix length    */
+//   __u8    ifa_flags;  /* Flags      */
+//   __u8    ifa_scope;  /* Address scope    */
+//   __u32   ifa_index;  /* Link index     */
+// };
+
+// type IfAddrmsg struct {
+// 	Family    uint8
+// 	Prefixlen uint8
+// 	Flags     uint8
+// 	Scope     uint8
+// 	Index     uint32
+// }
+// SizeofIfAddrmsg     = 0x8
+
+func DeserializeIfAddrmsg(b []byte) *IfAddrmsg {
+	return (*IfAddrmsg)(unsafe.Pointer(&b[0:syscall.SizeofIfAddrmsg][0]))
+}
+
+func (msg *IfAddrmsg) Serialize() []byte {
+	return (*(*[syscall.SizeofIfAddrmsg]byte)(unsafe.Pointer(msg)))[:]
+}
+
+func (msg *IfAddrmsg) Len() int {
+	return syscall.SizeofIfAddrmsg
+}
diff --git a/vendor/github.com/vishvananda/netlink/nl/link_linux.go b/vendor/github.com/vishvananda/netlink/nl/link_linux.go
new file mode 100644
index 0000000000..1f9ab088f0
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/nl/link_linux.go
@@ -0,0 +1,104 @@
+package nl
+
+const (
+	DEFAULT_CHANGE = 0xFFFFFFFF
+)
+
+const (
+	IFLA_INFO_UNSPEC = iota
+	IFLA_INFO_KIND
+	IFLA_INFO_DATA
+	IFLA_INFO_XSTATS
+	IFLA_INFO_MAX = IFLA_INFO_XSTATS
+)
+
+const (
+	IFLA_VLAN_UNSPEC = iota
+	IFLA_VLAN_ID
+	IFLA_VLAN_FLAGS
+	IFLA_VLAN_EGRESS_QOS
+	IFLA_VLAN_INGRESS_QOS
+	IFLA_VLAN_PROTOCOL
+	IFLA_VLAN_MAX = IFLA_VLAN_PROTOCOL
+)
+
+const (
+	VETH_INFO_UNSPEC = iota
+	VETH_INFO_PEER
+	VETH_INFO_MAX = VETH_INFO_PEER
+)
+
+const (
+	IFLA_VXLAN_UNSPEC = iota
+	IFLA_VXLAN_ID
+	IFLA_VXLAN_GROUP
+	IFLA_VXLAN_LINK
+	IFLA_VXLAN_LOCAL
+	IFLA_VXLAN_TTL
+	IFLA_VXLAN_TOS
+	IFLA_VXLAN_LEARNING
+	IFLA_VXLAN_AGEING
+	IFLA_VXLAN_LIMIT
+	IFLA_VXLAN_PORT_RANGE
+	IFLA_VXLAN_PROXY
+	IFLA_VXLAN_RSC
+	IFLA_VXLAN_L2MISS
+	IFLA_VXLAN_L3MISS
+	IFLA_VXLAN_PORT
+	IFLA_VXLAN_GROUP6
+	IFLA_VXLAN_LOCAL6
+	IFLA_VXLAN_UDP_CSUM
+	IFLA_VXLAN_UDP_ZERO_CSUM6_TX
+	IFLA_VXLAN_UDP_ZERO_CSUM6_RX
+	IFLA_VXLAN_REMCSUM_TX
+	IFLA_VXLAN_REMCSUM_RX
+	IFLA_VXLAN_GBP
+	IFLA_VXLAN_REMCSUM_NOPARTIAL
+	IFLA_VXLAN_FLOWBASED
+	IFLA_VXLAN_MAX = IFLA_VXLAN_FLOWBASED
+)
+
+const (
+	BRIDGE_MODE_UNSPEC = iota
+	BRIDGE_MODE_HAIRPIN
+)
+
+const (
+	IFLA_BRPORT_UNSPEC = iota
+	IFLA_BRPORT_STATE
+	IFLA_BRPORT_PRIORITY
+	IFLA_BRPORT_COST
+	IFLA_BRPORT_MODE
+	IFLA_BRPORT_GUARD
+	IFLA_BRPORT_PROTECT
+	IFLA_BRPORT_FAST_LEAVE
+	IFLA_BRPORT_LEARNING
+	IFLA_BRPORT_UNICAST_FLOOD
+	IFLA_BRPORT_MAX = IFLA_BRPORT_UNICAST_FLOOD
+)
+
+const (
+	IFLA_IPVLAN_UNSPEC = iota
+	IFLA_IPVLAN_MODE
+	IFLA_IPVLAN_MAX = IFLA_IPVLAN_MODE
+)
+
+const (
+	// not defined in syscall
+	IFLA_NET_NS_FD = 28
+)
+
+const (
+	IFLA_MACVLAN_UNSPEC = iota
+	IFLA_MACVLAN_MODE
+	IFLA_MACVLAN_FLAGS
+	IFLA_MACVLAN_MAX = IFLA_MACVLAN_FLAGS
+)
+
+const (
+	MACVLAN_MODE_PRIVATE  = 1
+	MACVLAN_MODE_VEPA     = 2
+	MACVLAN_MODE_BRIDGE   = 4
+	MACVLAN_MODE_PASSTHRU = 8
+	MACVLAN_MODE_SOURCE   = 16
+)
diff --git a/vendor/github.com/vishvananda/netlink/nl/nl_linux.go b/vendor/github.com/vishvananda/netlink/nl/nl_linux.go
new file mode 100644
index 0000000000..8dbd92b819
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/nl/nl_linux.go
@@ -0,0 +1,418 @@
+// Package nl has low level primitives for making Netlink calls.
+package nl
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"net"
+	"sync/atomic"
+	"syscall"
+	"unsafe"
+)
+
+const (
+	// Family type definitions
+	FAMILY_ALL = syscall.AF_UNSPEC
+	FAMILY_V4  = syscall.AF_INET
+	FAMILY_V6  = syscall.AF_INET6
+)
+
+var nextSeqNr uint32
+
+// GetIPFamily returns the family type of a net.IP.
+func GetIPFamily(ip net.IP) int {
+	if len(ip) <= net.IPv4len {
+		return FAMILY_V4
+	}
+	if ip.To4() != nil {
+		return FAMILY_V4
+	}
+	return FAMILY_V6
+}
+
+var nativeEndian binary.ByteOrder
+
+// Get native endianness for the system
+func NativeEndian() binary.ByteOrder {
+	if nativeEndian == nil {
+		var x uint32 = 0x01020304
+		if *(*byte)(unsafe.Pointer(&x)) == 0x01 {
+			nativeEndian = binary.BigEndian
+		} else {
+			nativeEndian = binary.LittleEndian
+		}
+	}
+	return nativeEndian
+}
+
+// Byte swap a 16 bit value if we aren't big endian
+func Swap16(i uint16) uint16 {
+	if NativeEndian() == binary.BigEndian {
+		return i
+	}
+	return (i&0xff00)>>8 | (i&0xff)<<8
+}
+
+// Byte swap a 32 bit value if aren't big endian
+func Swap32(i uint32) uint32 {
+	if NativeEndian() == binary.BigEndian {
+		return i
+	}
+	return (i&0xff000000)>>24 | (i&0xff0000)>>8 | (i&0xff00)<<8 | (i&0xff)<<24
+}
+
+type NetlinkRequestData interface {
+	Len() int
+	Serialize() []byte
+}
+
+// IfInfomsg is related to links, but it is used for list requests as well
+type IfInfomsg struct {
+	syscall.IfInfomsg
+}
+
+// Create an IfInfomsg with family specified
+func NewIfInfomsg(family int) *IfInfomsg {
+	return &IfInfomsg{
+		IfInfomsg: syscall.IfInfomsg{
+			Family: uint8(family),
+		},
+	}
+}
+
+func DeserializeIfInfomsg(b []byte) *IfInfomsg {
+	return (*IfInfomsg)(unsafe.Pointer(&b[0:syscall.SizeofIfInfomsg][0]))
+}
+
+func (msg *IfInfomsg) Serialize() []byte {
+	return (*(*[syscall.SizeofIfInfomsg]byte)(unsafe.Pointer(msg)))[:]
+}
+
+func (msg *IfInfomsg) Len() int {
+	return syscall.SizeofIfInfomsg
+}
+
+func rtaAlignOf(attrlen int) int {
+	return (attrlen + syscall.RTA_ALIGNTO - 1) & ^(syscall.RTA_ALIGNTO - 1)
+}
+
+func NewIfInfomsgChild(parent *RtAttr, family int) *IfInfomsg {
+	msg := NewIfInfomsg(family)
+	parent.children = append(parent.children, msg)
+	return msg
+}
+
+// Extend RtAttr to handle data and children
+type RtAttr struct {
+	syscall.RtAttr
+	Data     []byte
+	children []NetlinkRequestData
+}
+
+// Create a new Extended RtAttr object
+func NewRtAttr(attrType int, data []byte) *RtAttr {
+	return &RtAttr{
+		RtAttr: syscall.RtAttr{
+			Type: uint16(attrType),
+		},
+		children: []NetlinkRequestData{},
+		Data:     data,
+	}
+}
+
+// Create a new RtAttr obj anc add it as a child of an existing object
+func NewRtAttrChild(parent *RtAttr, attrType int, data []byte) *RtAttr {
+	attr := NewRtAttr(attrType, data)
+	parent.children = append(parent.children, attr)
+	return attr
+}
+
+func (a *RtAttr) Len() int {
+	if len(a.children) == 0 {
+		return (syscall.SizeofRtAttr + len(a.Data))
+	}
+
+	l := 0
+	for _, child := range a.children {
+		l += rtaAlignOf(child.Len())
+	}
+	l += syscall.SizeofRtAttr
+	return rtaAlignOf(l + len(a.Data))
+}
+
+// Serialize the RtAttr into a byte array
+// This can't just unsafe.cast because it must iterate through children.
+func (a *RtAttr) Serialize() []byte {
+	native := NativeEndian()
+
+	length := a.Len()
+	buf := make([]byte, rtaAlignOf(length))
+
+	if a.Data != nil {
+		copy(buf[4:], a.Data)
+	} else {
+		next := 4
+		for _, child := range a.children {
+			childBuf := child.Serialize()
+			copy(buf[next:], childBuf)
+			next += rtaAlignOf(len(childBuf))
+		}
+	}
+
+	if l := uint16(length); l != 0 {
+		native.PutUint16(buf[0:2], l)
+	}
+	native.PutUint16(buf[2:4], a.Type)
+	return buf
+}
+
+type NetlinkRequest struct {
+	syscall.NlMsghdr
+	Data []NetlinkRequestData
+}
+
+// Serialize the Netlink Request into a byte array
+func (req *NetlinkRequest) Serialize() []byte {
+	length := syscall.SizeofNlMsghdr
+	dataBytes := make([][]byte, len(req.Data))
+	for i, data := range req.Data {
+		dataBytes[i] = data.Serialize()
+		length = length + len(dataBytes[i])
+	}
+	req.Len = uint32(length)
+	b := make([]byte, length)
+	hdr := (*(*[syscall.SizeofNlMsghdr]byte)(unsafe.Pointer(req)))[:]
+	next := syscall.SizeofNlMsghdr
+	copy(b[0:next], hdr)
+	for _, data := range dataBytes {
+		for _, dataByte := range data {
+			b[next] = dataByte
+			next = next + 1
+		}
+	}
+	return b
+}
+
+func (req *NetlinkRequest) AddData(data NetlinkRequestData) {
+	if data != nil {
+		req.Data = append(req.Data, data)
+	}
+}
+
+// Execute the request against a the given sockType.
+// Returns a list of netlink messages in seriaized format, optionally filtered
+// by resType.
+func (req *NetlinkRequest) Execute(sockType int, resType uint16) ([][]byte, error) {
+	s, err := getNetlinkSocket(sockType)
+	if err != nil {
+		return nil, err
+	}
+	defer s.Close()
+
+	if err := s.Send(req); err != nil {
+		return nil, err
+	}
+
+	pid, err := s.GetPid()
+	if err != nil {
+		return nil, err
+	}
+
+	var res [][]byte
+
+done:
+	for {
+		msgs, err := s.Receive()
+		if err != nil {
+			return nil, err
+		}
+		for _, m := range msgs {
+			if m.Header.Seq != req.Seq {
+				return nil, fmt.Errorf("Wrong Seq nr %d, expected 1", m.Header.Seq)
+			}
+			if m.Header.Pid != pid {
+				return nil, fmt.Errorf("Wrong pid %d, expected %d", m.Header.Pid, pid)
+			}
+			if m.Header.Type == syscall.NLMSG_DONE {
+				break done
+			}
+			if m.Header.Type == syscall.NLMSG_ERROR {
+				native := NativeEndian()
+				error := int32(native.Uint32(m.Data[0:4]))
+				if error == 0 {
+					break done
+				}
+				return nil, syscall.Errno(-error)
+			}
+			if resType != 0 && m.Header.Type != resType {
+				continue
+			}
+			res = append(res, m.Data)
+			if m.Header.Flags&syscall.NLM_F_MULTI == 0 {
+				break done
+			}
+		}
+	}
+	return res, nil
+}
+
+// Create a new netlink request from proto and flags
+// Note the Len value will be inaccurate once data is added until
+// the message is serialized
+func NewNetlinkRequest(proto, flags int) *NetlinkRequest {
+	return &NetlinkRequest{
+		NlMsghdr: syscall.NlMsghdr{
+			Len:   uint32(syscall.SizeofNlMsghdr),
+			Type:  uint16(proto),
+			Flags: syscall.NLM_F_REQUEST | uint16(flags),
+			Seq:   atomic.AddUint32(&nextSeqNr, 1),
+		},
+	}
+}
+
+type NetlinkSocket struct {
+	fd  int
+	lsa syscall.SockaddrNetlink
+}
+
+func getNetlinkSocket(protocol int) (*NetlinkSocket, error) {
+	fd, err := syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, protocol)
+	if err != nil {
+		return nil, err
+	}
+	s := &NetlinkSocket{
+		fd: fd,
+	}
+	s.lsa.Family = syscall.AF_NETLINK
+	if err := syscall.Bind(fd, &s.lsa); err != nil {
+		syscall.Close(fd)
+		return nil, err
+	}
+
+	return s, nil
+}
+
+// Create a netlink socket with a given protocol (e.g. NETLINK_ROUTE)
+// and subscribe it to multicast groups passed in variable argument list.
+// Returns the netlink socket on which Receive() method can be called
+// to retrieve the messages from the kernel.
+func Subscribe(protocol int, groups ...uint) (*NetlinkSocket, error) {
+	fd, err := syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, protocol)
+	if err != nil {
+		return nil, err
+	}
+	s := &NetlinkSocket{
+		fd: fd,
+	}
+	s.lsa.Family = syscall.AF_NETLINK
+
+	for _, g := range groups {
+		s.lsa.Groups |= (1 << (g - 1))
+	}
+
+	if err := syscall.Bind(fd, &s.lsa); err != nil {
+		syscall.Close(fd)
+		return nil, err
+	}
+
+	return s, nil
+}
+
+func (s *NetlinkSocket) Close() {
+	syscall.Close(s.fd)
+}
+
+func (s *NetlinkSocket) Send(request *NetlinkRequest) error {
+	if err := syscall.Sendto(s.fd, request.Serialize(), 0, &s.lsa); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s *NetlinkSocket) Receive() ([]syscall.NetlinkMessage, error) {
+	rb := make([]byte, syscall.Getpagesize())
+	nr, _, err := syscall.Recvfrom(s.fd, rb, 0)
+	if err != nil {
+		return nil, err
+	}
+	if nr < syscall.NLMSG_HDRLEN {
+		return nil, fmt.Errorf("Got short response from netlink")
+	}
+	rb = rb[:nr]
+	return syscall.ParseNetlinkMessage(rb)
+}
+
+func (s *NetlinkSocket) GetPid() (uint32, error) {
+	lsa, err := syscall.Getsockname(s.fd)
+	if err != nil {
+		return 0, err
+	}
+	switch v := lsa.(type) {
+	case *syscall.SockaddrNetlink:
+		return v.Pid, nil
+	}
+	return 0, fmt.Errorf("Wrong socket type")
+}
+
+func ZeroTerminated(s string) []byte {
+	bytes := make([]byte, len(s)+1)
+	for i := 0; i < len(s); i++ {
+		bytes[i] = s[i]
+	}
+	bytes[len(s)] = 0
+	return bytes
+}
+
+func NonZeroTerminated(s string) []byte {
+	bytes := make([]byte, len(s))
+	for i := 0; i < len(s); i++ {
+		bytes[i] = s[i]
+	}
+	return bytes
+}
+
+func BytesToString(b []byte) string {
+	n := bytes.Index(b, []byte{0})
+	return string(b[:n])
+}
+
+func Uint8Attr(v uint8) []byte {
+	return []byte{byte(v)}
+}
+
+func Uint16Attr(v uint16) []byte {
+	native := NativeEndian()
+	bytes := make([]byte, 2)
+	native.PutUint16(bytes, v)
+	return bytes
+}
+
+func Uint32Attr(v uint32) []byte {
+	native := NativeEndian()
+	bytes := make([]byte, 4)
+	native.PutUint32(bytes, v)
+	return bytes
+}
+
+func ParseRouteAttr(b []byte) ([]syscall.NetlinkRouteAttr, error) {
+	var attrs []syscall.NetlinkRouteAttr
+	for len(b) >= syscall.SizeofRtAttr {
+		a, vbuf, alen, err := netlinkRouteAttrAndValue(b)
+		if err != nil {
+			return nil, err
+		}
+		ra := syscall.NetlinkRouteAttr{Attr: *a, Value: vbuf[:int(a.Len)-syscall.SizeofRtAttr]}
+		attrs = append(attrs, ra)
+		b = b[alen:]
+	}
+	return attrs, nil
+}
+
+func netlinkRouteAttrAndValue(b []byte) (*syscall.RtAttr, []byte, int, error) {
+	a := (*syscall.RtAttr)(unsafe.Pointer(&b[0]))
+	if int(a.Len) < syscall.SizeofRtAttr || int(a.Len) > len(b) {
+		return nil, nil, 0, syscall.EINVAL
+	}
+	return a, b[syscall.SizeofRtAttr:], rtaAlignOf(int(a.Len)), nil
+}
diff --git a/vendor/github.com/vishvananda/netlink/nl/route_linux.go b/vendor/github.com/vishvananda/netlink/nl/route_linux.go
new file mode 100644
index 0000000000..447e83e5ae
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/nl/route_linux.go
@@ -0,0 +1,42 @@
+package nl
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+type RtMsg struct {
+	syscall.RtMsg
+}
+
+func NewRtMsg() *RtMsg {
+	return &RtMsg{
+		RtMsg: syscall.RtMsg{
+			Table:    syscall.RT_TABLE_MAIN,
+			Scope:    syscall.RT_SCOPE_UNIVERSE,
+			Protocol: syscall.RTPROT_BOOT,
+			Type:     syscall.RTN_UNICAST,
+		},
+	}
+}
+
+func NewRtDelMsg() *RtMsg {
+	return &RtMsg{
+		RtMsg: syscall.RtMsg{
+			Table: syscall.RT_TABLE_MAIN,
+			Scope: syscall.RT_SCOPE_NOWHERE,
+		},
+	}
+}
+
+func (msg *RtMsg) Len() int {
+	return syscall.SizeofRtMsg
+}
+
+func DeserializeRtMsg(b []byte) *RtMsg {
+	return (*RtMsg)(unsafe.Pointer(&b[0:syscall.SizeofRtMsg][0]))
+}
+
+func (msg *RtMsg) Serialize() []byte {
+	return (*(*[syscall.SizeofRtMsg]byte)(unsafe.Pointer(msg)))[:]
+}
diff --git a/vendor/github.com/vishvananda/netlink/nl/tc_linux.go b/vendor/github.com/vishvananda/netlink/nl/tc_linux.go
new file mode 100644
index 0000000000..890979e037
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/nl/tc_linux.go
@@ -0,0 +1,425 @@
+package nl
+
+import (
+	"unsafe"
+)
+
+// Message types
+const (
+	TCA_UNSPEC = iota
+	TCA_KIND
+	TCA_OPTIONS
+	TCA_STATS
+	TCA_XSTATS
+	TCA_RATE
+	TCA_FCNT
+	TCA_STATS2
+	TCA_STAB
+	TCA_MAX = TCA_STAB
+)
+
+const (
+	TCA_ACT_TAB = 1
+	TCAA_MAX    = 1
+)
+
+const (
+	TCA_PRIO_UNSPEC = iota
+	TCA_PRIO_MQ
+	TCA_PRIO_MAX = TCA_PRIO_MQ
+)
+
+const (
+	SizeofTcMsg       = 0x14
+	SizeofTcActionMsg = 0x04
+	SizeofTcPrioMap   = 0x14
+	SizeofTcRateSpec  = 0x0c
+	SizeofTcTbfQopt   = 2*SizeofTcRateSpec + 0x0c
+	SizeofTcHtbCopt   = 2*SizeofTcRateSpec + 0x14
+	SizeofTcHtbGlob   = 0x14
+	SizeofTcU32Key    = 0x10
+	SizeofTcU32Sel    = 0x10 // without keys
+	SizeofTcMirred    = 0x1c
+)
+
+// struct tcmsg {
+//   unsigned char tcm_family;
+//   unsigned char tcm__pad1;
+//   unsigned short  tcm__pad2;
+//   int   tcm_ifindex;
+//   __u32   tcm_handle;
+//   __u32   tcm_parent;
+//   __u32   tcm_info;
+// };
+
+type TcMsg struct {
+	Family  uint8
+	Pad     [3]byte
+	Ifindex int32
+	Handle  uint32
+	Parent  uint32
+	Info    uint32
+}
+
+func (msg *TcMsg) Len() int {
+	return SizeofTcMsg
+}
+
+func DeserializeTcMsg(b []byte) *TcMsg {
+	return (*TcMsg)(unsafe.Pointer(&b[0:SizeofTcMsg][0]))
+}
+
+func (x *TcMsg) Serialize() []byte {
+	return (*(*[SizeofTcMsg]byte)(unsafe.Pointer(x)))[:]
+}
+
+// struct tcamsg {
+//   unsigned char tca_family;
+//   unsigned char tca__pad1;
+//   unsigned short  tca__pad2;
+// };
+
+type TcActionMsg struct {
+	Family uint8
+	Pad    [3]byte
+}
+
+func (msg *TcActionMsg) Len() int {
+	return SizeofTcActionMsg
+}
+
+func DeserializeTcActionMsg(b []byte) *TcActionMsg {
+	return (*TcActionMsg)(unsafe.Pointer(&b[0:SizeofTcActionMsg][0]))
+}
+
+func (x *TcActionMsg) Serialize() []byte {
+	return (*(*[SizeofTcActionMsg]byte)(unsafe.Pointer(x)))[:]
+}
+
+const (
+	TC_PRIO_MAX = 15
+)
+
+// struct tc_prio_qopt {
+// 	int bands;      /* Number of bands */
+// 	__u8  priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */
+// };
+
+type TcPrioMap struct {
+	Bands   int32
+	Priomap [TC_PRIO_MAX + 1]uint8
+}
+
+func (msg *TcPrioMap) Len() int {
+	return SizeofTcPrioMap
+}
+
+func DeserializeTcPrioMap(b []byte) *TcPrioMap {
+	return (*TcPrioMap)(unsafe.Pointer(&b[0:SizeofTcPrioMap][0]))
+}
+
+func (x *TcPrioMap) Serialize() []byte {
+	return (*(*[SizeofTcPrioMap]byte)(unsafe.Pointer(x)))[:]
+}
+
+const (
+	TCA_TBF_UNSPEC = iota
+	TCA_TBF_PARMS
+	TCA_TBF_RTAB
+	TCA_TBF_PTAB
+	TCA_TBF_RATE64
+	TCA_TBF_PRATE64
+	TCA_TBF_BURST
+	TCA_TBF_PBURST
+	TCA_TBF_MAX = TCA_TBF_PBURST
+)
+
+// struct tc_ratespec {
+//   unsigned char cell_log;
+//   __u8    linklayer; /* lower 4 bits */
+//   unsigned short  overhead;
+//   short   cell_align;
+//   unsigned short  mpu;
+//   __u32   rate;
+// };
+
+type TcRateSpec struct {
+	CellLog   uint8
+	Linklayer uint8
+	Overhead  uint16
+	CellAlign int16
+	Mpu       uint16
+	Rate      uint32
+}
+
+func (msg *TcRateSpec) Len() int {
+	return SizeofTcRateSpec
+}
+
+func DeserializeTcRateSpec(b []byte) *TcRateSpec {
+	return (*TcRateSpec)(unsafe.Pointer(&b[0:SizeofTcRateSpec][0]))
+}
+
+func (x *TcRateSpec) Serialize() []byte {
+	return (*(*[SizeofTcRateSpec]byte)(unsafe.Pointer(x)))[:]
+}
+
+// struct tc_tbf_qopt {
+//   struct tc_ratespec rate;
+//   struct tc_ratespec peakrate;
+//   __u32   limit;
+//   __u32   buffer;
+//   __u32   mtu;
+// };
+
+type TcTbfQopt struct {
+	Rate     TcRateSpec
+	Peakrate TcRateSpec
+	Limit    uint32
+	Buffer   uint32
+	Mtu      uint32
+}
+
+func (msg *TcTbfQopt) Len() int {
+	return SizeofTcTbfQopt
+}
+
+func DeserializeTcTbfQopt(b []byte) *TcTbfQopt {
+	return (*TcTbfQopt)(unsafe.Pointer(&b[0:SizeofTcTbfQopt][0]))
+}
+
+func (x *TcTbfQopt) Serialize() []byte {
+	return (*(*[SizeofTcTbfQopt]byte)(unsafe.Pointer(x)))[:]
+}
+
+const (
+	TCA_HTB_UNSPEC = iota
+	TCA_HTB_PARMS
+	TCA_HTB_INIT
+	TCA_HTB_CTAB
+	TCA_HTB_RTAB
+	TCA_HTB_DIRECT_QLEN
+	TCA_HTB_RATE64
+	TCA_HTB_CEIL64
+	TCA_HTB_MAX = TCA_HTB_CEIL64
+)
+
+//struct tc_htb_opt {
+//	struct tc_ratespec	rate;
+//	struct tc_ratespec	ceil;
+//	__u32	buffer;
+//	__u32	cbuffer;
+//	__u32	quantum;
+//	__u32	level;		/* out only */
+//	__u32	prio;
+//};
+
+type TcHtbCopt struct {
+	Rate    TcRateSpec
+	Ceil    TcRateSpec
+	Buffer  uint32
+	Cbuffer uint32
+	Quantum uint32
+	Level   uint32
+	Prio    uint32
+}
+
+func (msg *TcHtbCopt) Len() int {
+	return SizeofTcHtbCopt
+}
+
+func DeserializeTcHtbCopt(b []byte) *TcHtbCopt {
+	return (*TcHtbCopt)(unsafe.Pointer(&b[0:SizeofTcHtbCopt][0]))
+}
+
+func (x *TcHtbCopt) Serialize() []byte {
+	return (*(*[SizeofTcHtbCopt]byte)(unsafe.Pointer(x)))[:]
+}
+
+type TcHtbGlob struct {
+	Version      uint32
+	Rate2Quantum uint32
+	Defcls       uint32
+	Debug        uint32
+	DirectPkts   uint32
+}
+
+func (msg *TcHtbGlob) Len() int {
+	return SizeofTcHtbGlob
+}
+
+func DeserializeTcHtbGlob(b []byte) *TcHtbGlob {
+	return (*TcHtbGlob)(unsafe.Pointer(&b[0:SizeofTcHtbGlob][0]))
+}
+
+func (x *TcHtbGlob) Serialize() []byte {
+	return (*(*[SizeofTcHtbGlob]byte)(unsafe.Pointer(x)))[:]
+}
+
+const (
+	TCA_U32_UNSPEC = iota
+	TCA_U32_CLASSID
+	TCA_U32_HASH
+	TCA_U32_LINK
+	TCA_U32_DIVISOR
+	TCA_U32_SEL
+	TCA_U32_POLICE
+	TCA_U32_ACT
+	TCA_U32_INDEV
+	TCA_U32_PCNT
+	TCA_U32_MARK
+	TCA_U32_MAX = TCA_U32_MARK
+)
+
+// struct tc_u32_key {
+//   __be32    mask;
+//   __be32    val;
+//   int   off;
+//   int   offmask;
+// };
+
+type TcU32Key struct {
+	Mask    uint32 // big endian
+	Val     uint32 // big endian
+	Off     int32
+	OffMask int32
+}
+
+func (msg *TcU32Key) Len() int {
+	return SizeofTcU32Key
+}
+
+func DeserializeTcU32Key(b []byte) *TcU32Key {
+	return (*TcU32Key)(unsafe.Pointer(&b[0:SizeofTcU32Key][0]))
+}
+
+func (x *TcU32Key) Serialize() []byte {
+	return (*(*[SizeofTcU32Key]byte)(unsafe.Pointer(x)))[:]
+}
+
+// struct tc_u32_sel {
+//   unsigned char   flags;
+//   unsigned char   offshift;
+//   unsigned char   nkeys;
+//
+//   __be16      offmask;
+//   __u16     off;
+//   short     offoff;
+//
+//   short     hoff;
+//   __be32      hmask;
+//   struct tc_u32_key keys[0];
+// };
+
+const (
+	TC_U32_TERMINAL  = 1 << iota
+	TC_U32_OFFSET    = 1 << iota
+	TC_U32_VAROFFSET = 1 << iota
+	TC_U32_EAT       = 1 << iota
+)
+
+type TcU32Sel struct {
+	Flags    uint8
+	Offshift uint8
+	Nkeys    uint8
+	Pad      uint8
+	Offmask  uint16 // big endian
+	Off      uint16
+	Offoff   int16
+	Hoff     int16
+	Hmask    uint32 // big endian
+	Keys     []TcU32Key
+}
+
+func (msg *TcU32Sel) Len() int {
+	return SizeofTcU32Sel + int(msg.Nkeys)*SizeofTcU32Key
+}
+
+func DeserializeTcU32Sel(b []byte) *TcU32Sel {
+	x := &TcU32Sel{}
+	copy((*(*[SizeofTcU32Sel]byte)(unsafe.Pointer(x)))[:], b)
+	next := SizeofTcU32Sel
+	var i uint8
+	for i = 0; i < x.Nkeys; i++ {
+		x.Keys = append(x.Keys, *DeserializeTcU32Key(b[next:]))
+		next += SizeofTcU32Key
+	}
+	return x
+}
+
+func (x *TcU32Sel) Serialize() []byte {
+	// This can't just unsafe.cast because it must iterate through keys.
+	buf := make([]byte, x.Len())
+	copy(buf, (*(*[SizeofTcU32Sel]byte)(unsafe.Pointer(x)))[:])
+	next := SizeofTcU32Sel
+	for _, key := range x.Keys {
+		keyBuf := key.Serialize()
+		copy(buf[next:], keyBuf)
+		next += SizeofTcU32Key
+	}
+	return buf
+}
+
+const (
+	TCA_ACT_MIRRED = 8
+)
+
+const (
+	TCA_MIRRED_UNSPEC = iota
+	TCA_MIRRED_TM
+	TCA_MIRRED_PARMS
+	TCA_MIRRED_MAX = TCA_MIRRED_PARMS
+)
+
+const (
+	TCA_EGRESS_REDIR   = 1 /* packet redirect to EGRESS*/
+	TCA_EGRESS_MIRROR  = 2 /* mirror packet to EGRESS */
+	TCA_INGRESS_REDIR  = 3 /* packet redirect to INGRESS*/
+	TCA_INGRESS_MIRROR = 4 /* mirror packet to INGRESS */
+)
+
+const (
+	TC_ACT_UNSPEC     = int32(-1)
+	TC_ACT_OK         = 0
+	TC_ACT_RECLASSIFY = 1
+	TC_ACT_SHOT       = 2
+	TC_ACT_PIPE       = 3
+	TC_ACT_STOLEN     = 4
+	TC_ACT_QUEUED     = 5
+	TC_ACT_REPEAT     = 6
+	TC_ACT_JUMP       = 0x10000000
+)
+
+// #define tc_gen \
+//   __u32                 index; \
+//   __u32                 capab; \
+//   int                   action; \
+//   int                   refcnt; \
+//   int                   bindcnt
+// struct tc_mirred {
+// 	tc_gen;
+// 	int                     eaction;   /* one of IN/EGRESS_MIRROR/REDIR */
+// 	__u32                   ifindex;  /* ifindex of egress port */
+// };
+
+type TcMirred struct {
+	Index   uint32
+	Capab   uint32
+	Action  int32
+	Refcnt  int32
+	Bindcnt int32
+	Eaction int32
+	Ifindex uint32
+}
+
+func (msg *TcMirred) Len() int {
+	return SizeofTcMirred
+}
+
+func DeserializeTcMirred(b []byte) *TcMirred {
+	return (*TcMirred)(unsafe.Pointer(&b[0:SizeofTcMirred][0]))
+}
+
+func (x *TcMirred) Serialize() []byte {
+	return (*(*[SizeofTcMirred]byte)(unsafe.Pointer(x)))[:]
+}
diff --git a/vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go
new file mode 100644
index 0000000000..d24637d278
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/nl/xfrm_linux.go
@@ -0,0 +1,258 @@
+package nl
+
+import (
+	"bytes"
+	"net"
+	"unsafe"
+)
+
+// Infinity for packet and byte counts
+const (
+	XFRM_INF = ^uint64(0)
+)
+
+// Message Types
+const (
+	XFRM_MSG_BASE        = 0x10
+	XFRM_MSG_NEWSA       = 0x10
+	XFRM_MSG_DELSA       = 0x11
+	XFRM_MSG_GETSA       = 0x12
+	XFRM_MSG_NEWPOLICY   = 0x13
+	XFRM_MSG_DELPOLICY   = 0x14
+	XFRM_MSG_GETPOLICY   = 0x15
+	XFRM_MSG_ALLOCSPI    = 0x16
+	XFRM_MSG_ACQUIRE     = 0x17
+	XFRM_MSG_EXPIRE      = 0x18
+	XFRM_MSG_UPDPOLICY   = 0x19
+	XFRM_MSG_UPDSA       = 0x1a
+	XFRM_MSG_POLEXPIRE   = 0x1b
+	XFRM_MSG_FLUSHSA     = 0x1c
+	XFRM_MSG_FLUSHPOLICY = 0x1d
+	XFRM_MSG_NEWAE       = 0x1e
+	XFRM_MSG_GETAE       = 0x1f
+	XFRM_MSG_REPORT      = 0x20
+	XFRM_MSG_MIGRATE     = 0x21
+	XFRM_MSG_NEWSADINFO  = 0x22
+	XFRM_MSG_GETSADINFO  = 0x23
+	XFRM_MSG_NEWSPDINFO  = 0x24
+	XFRM_MSG_GETSPDINFO  = 0x25
+	XFRM_MSG_MAPPING     = 0x26
+	XFRM_MSG_MAX         = 0x26
+	XFRM_NR_MSGTYPES     = 0x17
+)
+
+// Attribute types
+const (
+	/* Netlink message attributes.  */
+	XFRMA_UNSPEC         = 0x00
+	XFRMA_ALG_AUTH       = 0x01 /* struct xfrm_algo */
+	XFRMA_ALG_CRYPT      = 0x02 /* struct xfrm_algo */
+	XFRMA_ALG_COMP       = 0x03 /* struct xfrm_algo */
+	XFRMA_ENCAP          = 0x04 /* struct xfrm_algo + struct xfrm_encap_tmpl */
+	XFRMA_TMPL           = 0x05 /* 1 or more struct xfrm_user_tmpl */
+	XFRMA_SA             = 0x06 /* struct xfrm_usersa_info  */
+	XFRMA_POLICY         = 0x07 /* struct xfrm_userpolicy_info */
+	XFRMA_SEC_CTX        = 0x08 /* struct xfrm_sec_ctx */
+	XFRMA_LTIME_VAL      = 0x09
+	XFRMA_REPLAY_VAL     = 0x0a
+	XFRMA_REPLAY_THRESH  = 0x0b
+	XFRMA_ETIMER_THRESH  = 0x0c
+	XFRMA_SRCADDR        = 0x0d /* xfrm_address_t */
+	XFRMA_COADDR         = 0x0e /* xfrm_address_t */
+	XFRMA_LASTUSED       = 0x0f /* unsigned long  */
+	XFRMA_POLICY_TYPE    = 0x10 /* struct xfrm_userpolicy_type */
+	XFRMA_MIGRATE        = 0x11
+	XFRMA_ALG_AEAD       = 0x12 /* struct xfrm_algo_aead */
+	XFRMA_KMADDRESS      = 0x13 /* struct xfrm_user_kmaddress */
+	XFRMA_ALG_AUTH_TRUNC = 0x14 /* struct xfrm_algo_auth */
+	XFRMA_MARK           = 0x15 /* struct xfrm_mark */
+	XFRMA_TFCPAD         = 0x16 /* __u32 */
+	XFRMA_REPLAY_ESN_VAL = 0x17 /* struct xfrm_replay_esn */
+	XFRMA_SA_EXTRA_FLAGS = 0x18 /* __u32 */
+	XFRMA_MAX            = 0x18
+)
+
+const (
+	SizeofXfrmAddress     = 0x10
+	SizeofXfrmSelector    = 0x38
+	SizeofXfrmLifetimeCfg = 0x40
+	SizeofXfrmLifetimeCur = 0x20
+	SizeofXfrmId          = 0x18
+)
+
+// typedef union {
+//   __be32    a4;
+//   __be32    a6[4];
+// } xfrm_address_t;
+
+type XfrmAddress [SizeofXfrmAddress]byte
+
+func (x *XfrmAddress) ToIP() net.IP {
+	var empty = [12]byte{}
+	ip := make(net.IP, net.IPv6len)
+	if bytes.Equal(x[4:16], empty[:]) {
+		ip[10] = 0xff
+		ip[11] = 0xff
+		copy(ip[12:16], x[0:4])
+	} else {
+		copy(ip[:], x[:])
+	}
+	return ip
+}
+
+func (x *XfrmAddress) ToIPNet(prefixlen uint8) *net.IPNet {
+	ip := x.ToIP()
+	if GetIPFamily(ip) == FAMILY_V4 {
+		return &net.IPNet{IP: ip, Mask: net.CIDRMask(int(prefixlen), 32)}
+	}
+	return &net.IPNet{IP: ip, Mask: net.CIDRMask(int(prefixlen), 128)}
+}
+
+func (x *XfrmAddress) FromIP(ip net.IP) {
+	var empty = [16]byte{}
+	if len(ip) < net.IPv4len {
+		copy(x[4:16], empty[:])
+	} else if GetIPFamily(ip) == FAMILY_V4 {
+		copy(x[0:4], ip.To4()[0:4])
+		copy(x[4:16], empty[:12])
+	} else {
+		copy(x[0:16], ip.To16()[0:16])
+	}
+}
+
+func DeserializeXfrmAddress(b []byte) *XfrmAddress {
+	return (*XfrmAddress)(unsafe.Pointer(&b[0:SizeofXfrmAddress][0]))
+}
+
+func (x *XfrmAddress) Serialize() []byte {
+	return (*(*[SizeofXfrmAddress]byte)(unsafe.Pointer(x)))[:]
+}
+
+// struct xfrm_selector {
+//   xfrm_address_t  daddr;
+//   xfrm_address_t  saddr;
+//   __be16  dport;
+//   __be16  dport_mask;
+//   __be16  sport;
+//   __be16  sport_mask;
+//   __u16 family;
+//   __u8  prefixlen_d;
+//   __u8  prefixlen_s;
+//   __u8  proto;
+//   int ifindex;
+//   __kernel_uid32_t  user;
+// };
+
+type XfrmSelector struct {
+	Daddr      XfrmAddress
+	Saddr      XfrmAddress
+	Dport      uint16 // big endian
+	DportMask  uint16 // big endian
+	Sport      uint16 // big endian
+	SportMask  uint16 // big endian
+	Family     uint16
+	PrefixlenD uint8
+	PrefixlenS uint8
+	Proto      uint8
+	Pad        [3]byte
+	Ifindex    int32
+	User       uint32
+}
+
+func (msg *XfrmSelector) Len() int {
+	return SizeofXfrmSelector
+}
+
+func DeserializeXfrmSelector(b []byte) *XfrmSelector {
+	return (*XfrmSelector)(unsafe.Pointer(&b[0:SizeofXfrmSelector][0]))
+}
+
+func (msg *XfrmSelector) Serialize() []byte {
+	return (*(*[SizeofXfrmSelector]byte)(unsafe.Pointer(msg)))[:]
+}
+
+// struct xfrm_lifetime_cfg {
+//   __u64 soft_byte_limit;
+//   __u64 hard_byte_limit;
+//   __u64 soft_packet_limit;
+//   __u64 hard_packet_limit;
+//   __u64 soft_add_expires_seconds;
+//   __u64 hard_add_expires_seconds;
+//   __u64 soft_use_expires_seconds;
+//   __u64 hard_use_expires_seconds;
+// };
+//
+
+type XfrmLifetimeCfg struct {
+	SoftByteLimit         uint64
+	HardByteLimit         uint64
+	SoftPacketLimit       uint64
+	HardPacketLimit       uint64
+	SoftAddExpiresSeconds uint64
+	HardAddExpiresSeconds uint64
+	SoftUseExpiresSeconds uint64
+	HardUseExpiresSeconds uint64
+}
+
+func (msg *XfrmLifetimeCfg) Len() int {
+	return SizeofXfrmLifetimeCfg
+}
+
+func DeserializeXfrmLifetimeCfg(b []byte) *XfrmLifetimeCfg {
+	return (*XfrmLifetimeCfg)(unsafe.Pointer(&b[0:SizeofXfrmLifetimeCfg][0]))
+}
+
+func (msg *XfrmLifetimeCfg) Serialize() []byte {
+	return (*(*[SizeofXfrmLifetimeCfg]byte)(unsafe.Pointer(msg)))[:]
+}
+
+// struct xfrm_lifetime_cur {
+//   __u64 bytes;
+//   __u64 packets;
+//   __u64 add_time;
+//   __u64 use_time;
+// };
+
+type XfrmLifetimeCur struct {
+	Bytes   uint64
+	Packets uint64
+	AddTime uint64
+	UseTime uint64
+}
+
+func (msg *XfrmLifetimeCur) Len() int {
+	return SizeofXfrmLifetimeCur
+}
+
+func DeserializeXfrmLifetimeCur(b []byte) *XfrmLifetimeCur {
+	return (*XfrmLifetimeCur)(unsafe.Pointer(&b[0:SizeofXfrmLifetimeCur][0]))
+}
+
+func (msg *XfrmLifetimeCur) Serialize() []byte {
+	return (*(*[SizeofXfrmLifetimeCur]byte)(unsafe.Pointer(msg)))[:]
+}
+
+// struct xfrm_id {
+//   xfrm_address_t  daddr;
+//   __be32    spi;
+//   __u8    proto;
+// };
+
+type XfrmId struct {
+	Daddr XfrmAddress
+	Spi   uint32 // big endian
+	Proto uint8
+	Pad   [3]byte
+}
+
+func (msg *XfrmId) Len() int {
+	return SizeofXfrmId
+}
+
+func DeserializeXfrmId(b []byte) *XfrmId {
+	return (*XfrmId)(unsafe.Pointer(&b[0:SizeofXfrmId][0]))
+}
+
+func (msg *XfrmId) Serialize() []byte {
+	return (*(*[SizeofXfrmId]byte)(unsafe.Pointer(msg)))[:]
+}
diff --git a/vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
new file mode 100644
index 0000000000..66f7e03d2d
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
@@ -0,0 +1,119 @@
+package nl
+
+import (
+	"unsafe"
+)
+
+const (
+	SizeofXfrmUserpolicyId   = 0x40
+	SizeofXfrmUserpolicyInfo = 0xa8
+	SizeofXfrmUserTmpl       = 0x40
+)
+
+// struct xfrm_userpolicy_id {
+//   struct xfrm_selector    sel;
+//   __u32       index;
+//   __u8        dir;
+// };
+//
+
+type XfrmUserpolicyId struct {
+	Sel   XfrmSelector
+	Index uint32
+	Dir   uint8
+	Pad   [3]byte
+}
+
+func (msg *XfrmUserpolicyId) Len() int {
+	return SizeofXfrmUserpolicyId
+}
+
+func DeserializeXfrmUserpolicyId(b []byte) *XfrmUserpolicyId {
+	return (*XfrmUserpolicyId)(unsafe.Pointer(&b[0:SizeofXfrmUserpolicyId][0]))
+}
+
+func (msg *XfrmUserpolicyId) Serialize() []byte {
+	return (*(*[SizeofXfrmUserpolicyId]byte)(unsafe.Pointer(msg)))[:]
+}
+
+// struct xfrm_userpolicy_info {
+//   struct xfrm_selector    sel;
+//   struct xfrm_lifetime_cfg  lft;
+//   struct xfrm_lifetime_cur  curlft;
+//   __u32       priority;
+//   __u32       index;
+//   __u8        dir;
+//   __u8        action;
+// #define XFRM_POLICY_ALLOW 0
+// #define XFRM_POLICY_BLOCK 1
+//   __u8        flags;
+// #define XFRM_POLICY_LOCALOK 1 /* Allow user to override global policy */
+//   /* Automatically expand selector to include matching ICMP payloads. */
+// #define XFRM_POLICY_ICMP  2
+//   __u8        share;
+// };
+
+type XfrmUserpolicyInfo struct {
+	Sel      XfrmSelector
+	Lft      XfrmLifetimeCfg
+	Curlft   XfrmLifetimeCur
+	Priority uint32
+	Index    uint32
+	Dir      uint8
+	Action   uint8
+	Flags    uint8
+	Share    uint8
+	Pad      [4]byte
+}
+
+func (msg *XfrmUserpolicyInfo) Len() int {
+	return SizeofXfrmUserpolicyInfo
+}
+
+func DeserializeXfrmUserpolicyInfo(b []byte) *XfrmUserpolicyInfo {
+	return (*XfrmUserpolicyInfo)(unsafe.Pointer(&b[0:SizeofXfrmUserpolicyInfo][0]))
+}
+
+func (msg *XfrmUserpolicyInfo) Serialize() []byte {
+	return (*(*[SizeofXfrmUserpolicyInfo]byte)(unsafe.Pointer(msg)))[:]
+}
+
+// struct xfrm_user_tmpl {
+//   struct xfrm_id    id;
+//   __u16     family;
+//   xfrm_address_t    saddr;
+//   __u32     reqid;
+//   __u8      mode;
+//   __u8      share;
+//   __u8      optional;
+//   __u32     aalgos;
+//   __u32     ealgos;
+//   __u32     calgos;
+// }
+
+type XfrmUserTmpl struct {
+	XfrmId   XfrmId
+	Family   uint16
+	Pad1     [2]byte
+	Saddr    XfrmAddress
+	Reqid    uint32
+	Mode     uint8
+	Share    uint8
+	Optional uint8
+	Pad2     byte
+	Aalgos   uint32
+	Ealgos   uint32
+	Calgos   uint32
+}
+
+func (msg *XfrmUserTmpl) Len() int {
+	return SizeofXfrmUserTmpl
+}
+
+func DeserializeXfrmUserTmpl(b []byte) *XfrmUserTmpl {
+	return (*XfrmUserTmpl)(unsafe.Pointer(&b[0:SizeofXfrmUserTmpl][0]))
+}
+
+func (msg *XfrmUserTmpl) Serialize() []byte {
+	return (*(*[SizeofXfrmUserTmpl]byte)(unsafe.Pointer(msg)))[:]
+}
diff --git a/vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go b/vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
new file mode 100644
index 0000000000..4876ce4583
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
@@ -0,0 +1,221 @@
+package nl
+
+import (
+	"unsafe"
+)
+
+const (
+	SizeofXfrmUsersaId   = 0x18
+	SizeofXfrmStats      = 0x0c
+	SizeofXfrmUsersaInfo = 0xe0
+	SizeofXfrmAlgo       = 0x44
+	SizeofXfrmAlgoAuth   = 0x48
+	SizeofXfrmEncapTmpl  = 0x18
+)
+
+// struct xfrm_usersa_id {
+//   xfrm_address_t      daddr;
+//   __be32        spi;
+//   __u16       family;
+//   __u8        proto;
+// };
+
+type XfrmUsersaId struct {
+	Daddr  XfrmAddress
+	Spi    uint32 // big endian
+	Family uint16
+	Proto  uint8
+	Pad    byte
+}
+
+func (msg *XfrmUsersaId) Len() int {
+	return SizeofXfrmUsersaId
+}
+
+func DeserializeXfrmUsersaId(b []byte) *XfrmUsersaId {
+	return (*XfrmUsersaId)(unsafe.Pointer(&b[0:SizeofXfrmUsersaId][0]))
+}
+
+func (msg *XfrmUsersaId) Serialize() []byte {
+	return (*(*[SizeofXfrmUsersaId]byte)(unsafe.Pointer(msg)))[:]
+}
+
+// struct xfrm_stats {
+//   __u32 replay_window;
+//   __u32 replay;
+//   __u32 integrity_failed;
+// };
+
+type XfrmStats struct {
+	ReplayWindow    uint32
+	Replay          uint32
+	IntegrityFailed uint32
+}
+
+func (msg *XfrmStats) Len() int {
+	return SizeofXfrmStats
+}
+
+func DeserializeXfrmStats(b []byte) *XfrmStats {
+	return (*XfrmStats)(unsafe.Pointer(&b[0:SizeofXfrmStats][0]))
+}
+
+func (msg *XfrmStats) Serialize() []byte {
+	return (*(*[SizeofXfrmStats]byte)(unsafe.Pointer(msg)))[:]
+}
+
+// struct xfrm_usersa_info {
+//   struct xfrm_selector    sel;
+//   struct xfrm_id      id;
+//   xfrm_address_t      saddr;
+//   struct xfrm_lifetime_cfg  lft;
+//   struct xfrm_lifetime_cur  curlft;
+//   struct xfrm_stats   stats;
+//   __u32       seq;
+//   __u32       reqid;
+//   __u16       family;
+//   __u8        mode;   /* XFRM_MODE_xxx */
+//   __u8        replay_window;
+//   __u8        flags;
+// #define XFRM_STATE_NOECN  1
+// #define XFRM_STATE_DECAP_DSCP 2
+// #define XFRM_STATE_NOPMTUDISC 4
+// #define XFRM_STATE_WILDRECV 8
+// #define XFRM_STATE_ICMP   16
+// #define XFRM_STATE_AF_UNSPEC  32
+// #define XFRM_STATE_ALIGN4 64
+// #define XFRM_STATE_ESN    128
+// };
+//
+// #define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1
+//
+
+type XfrmUsersaInfo struct {
+	Sel          XfrmSelector
+	Id           XfrmId
+	Saddr        XfrmAddress
+	Lft          XfrmLifetimeCfg
+	Curlft       XfrmLifetimeCur
+	Stats        XfrmStats
+	Seq          uint32
+	Reqid        uint32
+	Family       uint16
+	Mode         uint8
+	ReplayWindow uint8
+	Flags        uint8
+	Pad          [7]byte
+}
+
+func (msg *XfrmUsersaInfo) Len() int {
+	return SizeofXfrmUsersaInfo
+}
+
+func DeserializeXfrmUsersaInfo(b []byte) *XfrmUsersaInfo {
+	return (*XfrmUsersaInfo)(unsafe.Pointer(&b[0:SizeofXfrmUsersaInfo][0]))
+}
+
+func (msg *XfrmUsersaInfo) Serialize() []byte {
+	return (*(*[SizeofXfrmUsersaInfo]byte)(unsafe.Pointer(msg)))[:]
+}
+
+// struct xfrm_algo {
+//   char    alg_name[64];
+//   unsigned int  alg_key_len;    /* in bits */
+//   char    alg_key[0];
+// };
+
+type XfrmAlgo struct {
+	AlgName   [64]byte
+	AlgKeyLen uint32
+	AlgKey    []byte
+}
+
+func (msg *XfrmAlgo) Len() int {
+	return SizeofXfrmAlgo + int(msg.AlgKeyLen/8)
+}
+
+func DeserializeXfrmAlgo(b []byte) *XfrmAlgo {
+	ret := XfrmAlgo{}
+	copy(ret.AlgName[:], b[0:64])
+	ret.AlgKeyLen = *(*uint32)(unsafe.Pointer(&b[64]))
+	ret.AlgKey = b[68:ret.Len()]
+	return &ret
+}
+
+func (msg *XfrmAlgo) Serialize() []byte {
+	b := make([]byte, msg.Len())
+	copy(b[0:64], msg.AlgName[:])
+	copy(b[64:68], (*(*[4]byte)(unsafe.Pointer(&msg.AlgKeyLen)))[:])
+	copy(b[68:msg.Len()], msg.AlgKey[:])
+	return b
+}
+
+// struct xfrm_algo_auth {
+//   char    alg_name[64];
+//   unsigned int  alg_key_len;    /* in bits */
+//   unsigned int  alg_trunc_len;  /* in bits */
+//   char    alg_key[0];
+// };
+
+type XfrmAlgoAuth struct {
+	AlgName     [64]byte
+	AlgKeyLen   uint32
+	AlgTruncLen uint32
+	AlgKey      []byte
+}
+
+func (msg *XfrmAlgoAuth) Len() int {
+	return SizeofXfrmAlgoAuth + int(msg.AlgKeyLen/8)
+}
+
+func DeserializeXfrmAlgoAuth(b []byte) *XfrmAlgoAuth {
+	ret := XfrmAlgoAuth{}
+	copy(ret.AlgName[:], b[0:64])
+	ret.AlgKeyLen = *(*uint32)(unsafe.Pointer(&b[64]))
+	ret.AlgTruncLen = *(*uint32)(unsafe.Pointer(&b[68]))
+	ret.AlgKey = b[72:ret.Len()]
+	return &ret
+}
+
+func (msg *XfrmAlgoAuth) Serialize() []byte {
+	b := make([]byte, msg.Len())
+	copy(b[0:64], msg.AlgName[:])
+	copy(b[64:68], (*(*[4]byte)(unsafe.Pointer(&msg.AlgKeyLen)))[:])
+	copy(b[68:72], (*(*[4]byte)(unsafe.Pointer(&msg.AlgTruncLen)))[:])
+	copy(b[72:msg.Len()], msg.AlgKey[:])
+	return b
+}
+
+// struct xfrm_algo_aead {
+//   char    alg_name[64];
+//   unsigned int  alg_key_len;  /* in bits */
+//   unsigned int  alg_icv_len;  /* in bits */
+//   char    alg_key[0];
+// }
+
+// struct xfrm_encap_tmpl {
+//   __u16   encap_type;
+//   __be16    encap_sport;
+//   __be16    encap_dport;
+//   xfrm_address_t  encap_oa;
+// };
+
+type XfrmEncapTmpl struct {
+	EncapType  uint16
+	EncapSport uint16 // big endian
+	EncapDport uint16 // big endian
+	Pad        [2]byte
+	EncapOa    XfrmAddress
+}
+
+func (msg *XfrmEncapTmpl) Len() int {
+	return SizeofXfrmEncapTmpl
+}
+
+func DeserializeXfrmEncapTmpl(b []byte) *XfrmEncapTmpl {
+	return (*XfrmEncapTmpl)(unsafe.Pointer(&b[0:SizeofXfrmEncapTmpl][0]))
+}
+
+func (msg *XfrmEncapTmpl) Serialize() []byte {
+	return (*(*[SizeofXfrmEncapTmpl]byte)(unsafe.Pointer(msg)))[:]
+}
diff --git a/vendor/github.com/vishvananda/netlink/protinfo.go b/vendor/github.com/vishvananda/netlink/protinfo.go
new file mode 100644
index 0000000000..f39ab8f4e8
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/protinfo.go
@@ -0,0 +1,53 @@
+package netlink
+
+import (
+	"strings"
+)
+
+// Protinfo represents bridge flags from netlink.
+type Protinfo struct {
+	Hairpin   bool
+	Guard     bool
+	FastLeave bool
+	RootBlock bool
+	Learning  bool
+	Flood     bool
+}
+
+// String returns a list of enabled flags
+func (prot *Protinfo) String() string {
+	var boolStrings []string
+	if prot.Hairpin {
+		boolStrings = append(boolStrings, "Hairpin")
+	}
+	if prot.Guard {
+		boolStrings = append(boolStrings, "Guard")
+	}
+	if prot.FastLeave {
+		boolStrings = append(boolStrings, "FastLeave")
+	}
+	if prot.RootBlock {
+		boolStrings = append(boolStrings, "RootBlock")
+	}
+	if prot.Learning {
+		boolStrings = append(boolStrings, "Learning")
+	}
+	if prot.Flood {
+		boolStrings = append(boolStrings, "Flood")
+	}
+	return strings.Join(boolStrings, " ")
+}
+
+func boolToByte(x bool) []byte {
+	if x {
+		return []byte{1}
+	}
+	return []byte{0}
+}
+
+func byteToBool(x byte) bool {
+	if uint8(x) != 0 {
+		return true
+	}
+	return false
+}
diff --git a/vendor/github.com/vishvananda/netlink/protinfo_linux.go b/vendor/github.com/vishvananda/netlink/protinfo_linux.go
new file mode 100644
index 0000000000..7181eba100
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/protinfo_linux.go
@@ -0,0 +1,60 @@
+package netlink
+
+import (
+	"fmt"
+	"syscall"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+func LinkGetProtinfo(link Link) (Protinfo, error) {
+	base := link.Attrs()
+	ensureIndex(base)
+	var pi Protinfo
+	req := nl.NewNetlinkRequest(syscall.RTM_GETLINK, syscall.NLM_F_DUMP)
+	msg := nl.NewIfInfomsg(syscall.AF_BRIDGE)
+	req.AddData(msg)
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	if err != nil {
+		return pi, err
+	}
+
+	for _, m := range msgs {
+		ans := nl.DeserializeIfInfomsg(m)
+		if int(ans.Index) != base.Index {
+			continue
+		}
+		attrs, err := nl.ParseRouteAttr(m[ans.Len():])
+		if err != nil {
+			return pi, err
+		}
+		for _, attr := range attrs {
+			if attr.Attr.Type != syscall.IFLA_PROTINFO|syscall.NLA_F_NESTED {
+				continue
+			}
+			infos, err := nl.ParseRouteAttr(attr.Value)
+			if err != nil {
+				return pi, err
+			}
+			var pi Protinfo
+			for _, info := range infos {
+				switch info.Attr.Type {
+				case nl.IFLA_BRPORT_MODE:
+					pi.Hairpin = byteToBool(info.Value[0])
+				case nl.IFLA_BRPORT_GUARD:
+					pi.Guard = byteToBool(info.Value[0])
+				case nl.IFLA_BRPORT_FAST_LEAVE:
+					pi.FastLeave = byteToBool(info.Value[0])
+				case nl.IFLA_BRPORT_PROTECT:
+					pi.RootBlock = byteToBool(info.Value[0])
+				case nl.IFLA_BRPORT_LEARNING:
+					pi.Learning = byteToBool(info.Value[0])
+				case nl.IFLA_BRPORT_UNICAST_FLOOD:
+					pi.Flood = byteToBool(info.Value[0])
+				}
+			}
+			return pi, nil
+		}
+	}
+	return pi, fmt.Errorf("Device with index %d not found", base.Index)
+}
diff --git a/vendor/github.com/vishvananda/netlink/qdisc.go b/vendor/github.com/vishvananda/netlink/qdisc.go
new file mode 100644
index 0000000000..41a4aa8e3e
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/qdisc.go
@@ -0,0 +1,167 @@
+package netlink
+
+import (
+	"fmt"
+)
+
+const (
+	HANDLE_NONE      = 0
+	HANDLE_INGRESS   = 0xFFFFFFF1
+	HANDLE_ROOT      = 0xFFFFFFFF
+	PRIORITY_MAP_LEN = 16
+)
+
+type Qdisc interface {
+	Attrs() *QdiscAttrs
+	Type() string
+}
+
+// Qdisc represents a netlink qdisc. A qdisc is associated with a link,
+// has a handle, a parent and a refcnt. The root qdisc of a device should
+// have parent == HANDLE_ROOT.
+type QdiscAttrs struct {
+	LinkIndex int
+	Handle    uint32
+	Parent    uint32
+	Refcnt    uint32 // read only
+}
+
+func (q QdiscAttrs) String() string {
+	return fmt.Sprintf("{LinkIndex: %d, Handle: %s, Parent: %s, Refcnt: %s}", q.LinkIndex, HandleStr(q.Handle), HandleStr(q.Parent), q.Refcnt)
+}
+
+func MakeHandle(major, minor uint16) uint32 {
+	return (uint32(major) << 16) | uint32(minor)
+}
+
+func MajorMinor(handle uint32) (uint16, uint16) {
+	return uint16((handle & 0xFFFF0000) >> 16), uint16(handle & 0x0000FFFFF)
+}
+
+func HandleStr(handle uint32) string {
+	switch handle {
+	case HANDLE_NONE:
+		return "none"
+	case HANDLE_INGRESS:
+		return "ingress"
+	case HANDLE_ROOT:
+		return "root"
+	default:
+		major, minor := MajorMinor(handle)
+		return fmt.Sprintf("%x:%x", major, minor)
+	}
+}
+
+// PfifoFast is the default qdisc created by the kernel if one has not
+// been defined for the interface
+type PfifoFast struct {
+	QdiscAttrs
+	Bands       uint8
+	PriorityMap [PRIORITY_MAP_LEN]uint8
+}
+
+func (qdisc *PfifoFast) Attrs() *QdiscAttrs {
+	return &qdisc.QdiscAttrs
+}
+
+func (qdisc *PfifoFast) Type() string {
+	return "pfifo_fast"
+}
+
+// Prio is a basic qdisc that works just like PfifoFast
+type Prio struct {
+	QdiscAttrs
+	Bands       uint8
+	PriorityMap [PRIORITY_MAP_LEN]uint8
+}
+
+func NewPrio(attrs QdiscAttrs) *Prio {
+	return &Prio{
+		QdiscAttrs:  attrs,
+		Bands:       3,
+		PriorityMap: [PRIORITY_MAP_LEN]uint8{1, 2, 2, 2, 1, 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1},
+	}
+}
+
+func (qdisc *Prio) Attrs() *QdiscAttrs {
+	return &qdisc.QdiscAttrs
+}
+
+func (qdisc *Prio) Type() string {
+	return "prio"
+}
+
+// Htb is a classful qdisc that rate limits based on tokens
+type Htb struct {
+	QdiscAttrs
+	Version      uint32
+	Rate2Quantum uint32
+	Defcls       uint32
+	Debug        uint32
+	DirectPkts   uint32
+}
+
+func NewHtb(attrs QdiscAttrs) *Htb {
+	return &Htb{
+		QdiscAttrs:   attrs,
+		Version:      3,
+		Defcls:       0,
+		Rate2Quantum: 10,
+		Debug:        0,
+		DirectPkts:   0,
+	}
+}
+
+func (qdisc *Htb) Attrs() *QdiscAttrs {
+	return &qdisc.QdiscAttrs
+}
+
+func (qdisc *Htb) Type() string {
+	return "htb"
+}
+
+// Tbf is a classless qdisc that rate limits based on tokens
+type Tbf struct {
+	QdiscAttrs
+	// TODO: handle 64bit rate properly
+	Rate   uint64
+	Limit  uint32
+	Buffer uint32
+	// TODO: handle other settings
+}
+
+func (qdisc *Tbf) Attrs() *QdiscAttrs {
+	return &qdisc.QdiscAttrs
+}
+
+func (qdisc *Tbf) Type() string {
+	return "tbf"
+}
+
+// Ingress is a qdisc for adding ingress filters
+type Ingress struct {
+	QdiscAttrs
+}
+
+func (qdisc *Ingress) Attrs() *QdiscAttrs {
+	return &qdisc.QdiscAttrs
+}
+
+func (qdisc *Ingress) Type() string {
+	return "ingress"
+}
+
+// GenericQdisc qdiscs represent types that are not currently understood
+// by this netlink library.
+type GenericQdisc struct {
+	QdiscAttrs
+	QdiscType string
+}
+
+func (qdisc *GenericQdisc) Attrs() *QdiscAttrs {
+	return &qdisc.QdiscAttrs
+}
+
+func (qdisc *GenericQdisc) Type() string {
+	return qdisc.QdiscType
+}
diff --git a/vendor/github.com/vishvananda/netlink/qdisc_linux.go b/vendor/github.com/vishvananda/netlink/qdisc_linux.go
new file mode 100644
index 0000000000..a16eb99b34
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/qdisc_linux.go
@@ -0,0 +1,316 @@
+package netlink
+
+import (
+	"fmt"
+	"io/ioutil"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+// QdiscDel will delete a qdisc from the system.
+// Equivalent to: `tc qdisc del $qdisc`
+func QdiscDel(qdisc Qdisc) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_DELQDISC, syscall.NLM_F_ACK)
+	base := qdisc.Attrs()
+	msg := &nl.TcMsg{
+		Family:  nl.FAMILY_ALL,
+		Ifindex: int32(base.LinkIndex),
+		Handle:  base.Handle,
+		Parent:  base.Parent,
+	}
+	req.AddData(msg)
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// QdiscAdd will add a qdisc to the system.
+// Equivalent to: `tc qdisc add $qdisc`
+func QdiscAdd(qdisc Qdisc) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_NEWQDISC, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
+	base := qdisc.Attrs()
+	msg := &nl.TcMsg{
+		Family:  nl.FAMILY_ALL,
+		Ifindex: int32(base.LinkIndex),
+		Handle:  base.Handle,
+		Parent:  base.Parent,
+	}
+	req.AddData(msg)
+	req.AddData(nl.NewRtAttr(nl.TCA_KIND, nl.ZeroTerminated(qdisc.Type())))
+
+	options := nl.NewRtAttr(nl.TCA_OPTIONS, nil)
+	if prio, ok := qdisc.(*Prio); ok {
+		tcmap := nl.TcPrioMap{
+			Bands:   int32(prio.Bands),
+			Priomap: prio.PriorityMap,
+		}
+		options = nl.NewRtAttr(nl.TCA_OPTIONS, tcmap.Serialize())
+	} else if tbf, ok := qdisc.(*Tbf); ok {
+		opt := nl.TcTbfQopt{}
+		// TODO: handle rate > uint32
+		opt.Rate.Rate = uint32(tbf.Rate)
+		opt.Limit = tbf.Limit
+		opt.Buffer = tbf.Buffer
+		nl.NewRtAttrChild(options, nl.TCA_TBF_PARMS, opt.Serialize())
+	} else if htb, ok := qdisc.(*Htb); ok {
+		opt := nl.TcHtbGlob{}
+		opt.Version = htb.Version
+		opt.Rate2Quantum = htb.Rate2Quantum
+		opt.Defcls = htb.Defcls
+		// TODO: Handle Debug properly. For now default to 0
+		opt.Debug = htb.Debug
+		opt.DirectPkts = htb.DirectPkts
+		nl.NewRtAttrChild(options, nl.TCA_HTB_INIT, opt.Serialize())
+		// nl.NewRtAttrChild(options, nl.TCA_HTB_DIRECT_QLEN, opt.Serialize())
+	} else if _, ok := qdisc.(*Ingress); ok {
+		// ingress filters must use the proper handle
+		if msg.Parent != HANDLE_INGRESS {
+			return fmt.Errorf("Ingress filters must set Parent to HANDLE_INGRESS")
+		}
+	}
+	req.AddData(options)
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// QdiscList gets a list of qdiscs in the system.
+// Equivalent to: `tc qdisc show`.
+// The list can be filtered by link.
+func QdiscList(link Link) ([]Qdisc, error) {
+	req := nl.NewNetlinkRequest(syscall.RTM_GETQDISC, syscall.NLM_F_DUMP)
+	index := int32(0)
+	if link != nil {
+		base := link.Attrs()
+		ensureIndex(base)
+		index = int32(base.Index)
+	}
+	msg := &nl.TcMsg{
+		Family:  nl.FAMILY_ALL,
+		Ifindex: index,
+	}
+	req.AddData(msg)
+
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWQDISC)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []Qdisc
+	for _, m := range msgs {
+		msg := nl.DeserializeTcMsg(m)
+
+		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
+		if err != nil {
+			return nil, err
+		}
+
+		// skip qdiscs from other interfaces
+		if link != nil && msg.Ifindex != index {
+			continue
+		}
+
+		base := QdiscAttrs{
+			LinkIndex: int(msg.Ifindex),
+			Handle:    msg.Handle,
+			Parent:    msg.Parent,
+			Refcnt:    msg.Info,
+		}
+		var qdisc Qdisc
+		qdiscType := ""
+		for _, attr := range attrs {
+			switch attr.Attr.Type {
+			case nl.TCA_KIND:
+				qdiscType = string(attr.Value[:len(attr.Value)-1])
+				switch qdiscType {
+				case "pfifo_fast":
+					qdisc = &PfifoFast{}
+				case "prio":
+					qdisc = &Prio{}
+				case "tbf":
+					qdisc = &Tbf{}
+				case "ingress":
+					qdisc = &Ingress{}
+				case "htb":
+					qdisc = &Htb{}
+				default:
+					qdisc = &GenericQdisc{QdiscType: qdiscType}
+				}
+			case nl.TCA_OPTIONS:
+				switch qdiscType {
+				case "pfifo_fast":
+					// pfifo returns TcPrioMap directly without wrapping it in rtattr
+					if err := parsePfifoFastData(qdisc, attr.Value); err != nil {
+						return nil, err
+					}
+				case "prio":
+					// prio returns TcPrioMap directly without wrapping it in rtattr
+					if err := parsePrioData(qdisc, attr.Value); err != nil {
+						return nil, err
+					}
+				case "tbf":
+					data, err := nl.ParseRouteAttr(attr.Value)
+					if err != nil {
+						return nil, err
+					}
+					if err := parseTbfData(qdisc, data); err != nil {
+						return nil, err
+					}
+				case "htb":
+					data, err := nl.ParseRouteAttr(attr.Value)
+					if err != nil {
+						return nil, err
+					}
+					if err := parseHtbData(qdisc, data); err != nil {
+						return nil, err
+					}
+
+					// no options for ingress
+				}
+			}
+		}
+		*qdisc.Attrs() = base
+		res = append(res, qdisc)
+	}
+
+	return res, nil
+}
+
+func parsePfifoFastData(qdisc Qdisc, value []byte) error {
+	pfifo := qdisc.(*PfifoFast)
+	tcmap := nl.DeserializeTcPrioMap(value)
+	pfifo.PriorityMap = tcmap.Priomap
+	pfifo.Bands = uint8(tcmap.Bands)
+	return nil
+}
+
+func parsePrioData(qdisc Qdisc, value []byte) error {
+	prio := qdisc.(*Prio)
+	tcmap := nl.DeserializeTcPrioMap(value)
+	prio.PriorityMap = tcmap.Priomap
+	prio.Bands = uint8(tcmap.Bands)
+	return nil
+}
+
+func parseHtbData(qdisc Qdisc, data []syscall.NetlinkRouteAttr) error {
+	native = nl.NativeEndian()
+	htb := qdisc.(*Htb)
+	for _, datum := range data {
+		switch datum.Attr.Type {
+		case nl.TCA_HTB_INIT:
+			opt := nl.DeserializeTcHtbGlob(datum.Value)
+			htb.Version = opt.Version
+			htb.Rate2Quantum = opt.Rate2Quantum
+			htb.Defcls = opt.Defcls
+			htb.Debug = opt.Debug
+			htb.DirectPkts = opt.DirectPkts
+		case nl.TCA_HTB_DIRECT_QLEN:
+			// TODO
+			//htb.DirectQlen = native.uint32(datum.Value)
+		}
+	}
+	return nil
+}
+func parseTbfData(qdisc Qdisc, data []syscall.NetlinkRouteAttr) error {
+	native = nl.NativeEndian()
+	tbf := qdisc.(*Tbf)
+	for _, datum := range data {
+		switch datum.Attr.Type {
+		case nl.TCA_TBF_PARMS:
+			opt := nl.DeserializeTcTbfQopt(datum.Value)
+			tbf.Rate = uint64(opt.Rate.Rate)
+			tbf.Limit = opt.Limit
+			tbf.Buffer = opt.Buffer
+		case nl.TCA_TBF_RATE64:
+			tbf.Rate = native.Uint64(datum.Value[0:4])
+		}
+	}
+	return nil
+}
+
+const (
+	TIME_UNITS_PER_SEC = 1000000
+)
+
+var (
+	tickInUsec  float64 = 0.0
+	clockFactor float64 = 0.0
+	hz          float64 = 0.0
+)
+
+func initClock() {
+	data, err := ioutil.ReadFile("/proc/net/psched")
+	if err != nil {
+		return
+	}
+	parts := strings.Split(strings.TrimSpace(string(data)), " ")
+	if len(parts) < 3 {
+		return
+	}
+	var vals [3]uint64
+	for i := range vals {
+		val, err := strconv.ParseUint(parts[i], 16, 32)
+		if err != nil {
+			return
+		}
+		vals[i] = val
+	}
+	// compatibility
+	if vals[2] == 1000000000 {
+		vals[0] = vals[1]
+	}
+	clockFactor = float64(vals[2]) / TIME_UNITS_PER_SEC
+	tickInUsec = float64(vals[0]) / float64(vals[1]) * clockFactor
+	hz = float64(vals[0])
+}
+
+func TickInUsec() float64 {
+	if tickInUsec == 0.0 {
+		initClock()
+	}
+	return tickInUsec
+}
+
+func ClockFactor() float64 {
+	if clockFactor == 0.0 {
+		initClock()
+	}
+	return clockFactor
+}
+
+func Hz() float64 {
+	if hz == 0.0 {
+		initClock()
+	}
+	return hz
+}
+
+func time2Tick(time uint32) uint32 {
+	return uint32(float64(time) * TickInUsec())
+}
+
+func tick2Time(tick uint32) uint32 {
+	return uint32(float64(tick) / TickInUsec())
+}
+
+func time2Ktime(time uint32) uint32 {
+	return uint32(float64(time) * ClockFactor())
+}
+
+func ktime2Time(ktime uint32) uint32 {
+	return uint32(float64(ktime) / ClockFactor())
+}
+
+func burst(rate uint64, buffer uint32) uint32 {
+	return uint32(float64(rate) * float64(tick2Time(buffer)) / TIME_UNITS_PER_SEC)
+}
+
+func latency(rate uint64, limit, buffer uint32) float64 {
+	return TIME_UNITS_PER_SEC*(float64(limit)/float64(rate)) - float64(tick2Time(buffer))
+}
+
+func Xmittime(rate uint64, size uint32) float64 {
+	return TickInUsec() * TIME_UNITS_PER_SEC * (float64(size) / float64(rate))
+}
diff --git a/vendor/github.com/vishvananda/netlink/route.go b/vendor/github.com/vishvananda/netlink/route.go
new file mode 100644
index 0000000000..578270fb98
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/route.go
@@ -0,0 +1,41 @@
+package netlink
+
+import (
+	"fmt"
+	"net"
+	"syscall"
+)
+
+// Scope is an enum representing a route scope.
+type Scope uint8
+
+const (
+	SCOPE_UNIVERSE Scope = syscall.RT_SCOPE_UNIVERSE
+	SCOPE_SITE     Scope = syscall.RT_SCOPE_SITE
+	SCOPE_LINK     Scope = syscall.RT_SCOPE_LINK
+	SCOPE_HOST     Scope = syscall.RT_SCOPE_HOST
+	SCOPE_NOWHERE  Scope = syscall.RT_SCOPE_NOWHERE
+)
+
+// Route represents a netlink route. A route is associated with a link,
+// has a destination network, an optional source ip, and optional
+// gateway. Advanced route parameters and non-main routing tables are
+// currently not supported.
+type Route struct {
+	LinkIndex int
+	Scope     Scope
+	Dst       *net.IPNet
+	Src       net.IP
+	Gw        net.IP
+}
+
+func (r Route) String() string {
+	return fmt.Sprintf("{Ifindex: %d Dst: %s Src: %s Gw: %s}", r.LinkIndex, r.Dst,
+		r.Src, r.Gw)
+}
+
+// RouteUpdate is sent when a route changes - type is RTM_NEWROUTE or RTM_DELROUTE
+type RouteUpdate struct {
+	Type uint16
+	Route
+}
diff --git a/vendor/github.com/vishvananda/netlink/route_linux.go b/vendor/github.com/vishvananda/netlink/route_linux.go
new file mode 100644
index 0000000000..693e6cbc95
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/route_linux.go
@@ -0,0 +1,249 @@
+package netlink
+
+import (
+	"fmt"
+	"net"
+	"syscall"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+// RtAttr is shared so it is in netlink_linux.go
+
+// RouteAdd will add a route to the system.
+// Equivalent to: `ip route add $route`
+func RouteAdd(route *Route) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_NEWROUTE, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
+	return routeHandle(route, req, nl.NewRtMsg())
+}
+
+// RouteDel will delete a route from the system.
+// Equivalent to: `ip route del $route`
+func RouteDel(route *Route) error {
+	req := nl.NewNetlinkRequest(syscall.RTM_DELROUTE, syscall.NLM_F_ACK)
+	return routeHandle(route, req, nl.NewRtDelMsg())
+}
+
+func routeHandle(route *Route, req *nl.NetlinkRequest, msg *nl.RtMsg) error {
+	if (route.Dst == nil || route.Dst.IP == nil) && route.Src == nil && route.Gw == nil {
+		return fmt.Errorf("one of Dst.IP, Src, or Gw must not be nil")
+	}
+
+	msg.Scope = uint8(route.Scope)
+	family := -1
+	var rtAttrs []*nl.RtAttr
+
+	if route.Dst != nil && route.Dst.IP != nil {
+		dstLen, _ := route.Dst.Mask.Size()
+		msg.Dst_len = uint8(dstLen)
+		dstFamily := nl.GetIPFamily(route.Dst.IP)
+		family = dstFamily
+		var dstData []byte
+		if dstFamily == FAMILY_V4 {
+			dstData = route.Dst.IP.To4()
+		} else {
+			dstData = route.Dst.IP.To16()
+		}
+		rtAttrs = append(rtAttrs, nl.NewRtAttr(syscall.RTA_DST, dstData))
+	}
+
+	if route.Src != nil {
+		srcFamily := nl.GetIPFamily(route.Src)
+		if family != -1 && family != srcFamily {
+			return fmt.Errorf("source and destination ip are not the same IP family")
+		}
+		family = srcFamily
+		var srcData []byte
+		if srcFamily == FAMILY_V4 {
+			srcData = route.Src.To4()
+		} else {
+			srcData = route.Src.To16()
+		}
+		// The commonly used src ip for routes is actually PREFSRC
+		rtAttrs = append(rtAttrs, nl.NewRtAttr(syscall.RTA_PREFSRC, srcData))
+	}
+
+	if route.Gw != nil {
+		gwFamily := nl.GetIPFamily(route.Gw)
+		if family != -1 && family != gwFamily {
+			return fmt.Errorf("gateway, source, and destination ip are not the same IP family")
+		}
+		family = gwFamily
+		var gwData []byte
+		if gwFamily == FAMILY_V4 {
+			gwData = route.Gw.To4()
+		} else {
+			gwData = route.Gw.To16()
+		}
+		rtAttrs = append(rtAttrs, nl.NewRtAttr(syscall.RTA_GATEWAY, gwData))
+	}
+
+	msg.Family = uint8(family)
+
+	req.AddData(msg)
+	for _, attr := range rtAttrs {
+		req.AddData(attr)
+	}
+
+	var (
+		b      = make([]byte, 4)
+		native = nl.NativeEndian()
+	)
+	native.PutUint32(b, uint32(route.LinkIndex))
+
+	req.AddData(nl.NewRtAttr(syscall.RTA_OIF, b))
+
+	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
+	return err
+}
+
+// RouteList gets a list of routes in the system.
+// Equivalent to: `ip route show`.
+// The list can be filtered by link and ip family.
+func RouteList(link Link, family int) ([]Route, error) {
+	req := nl.NewNetlinkRequest(syscall.RTM_GETROUTE, syscall.NLM_F_DUMP)
+	msg := nl.NewIfInfomsg(family)
+	req.AddData(msg)
+
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWROUTE)
+	if err != nil {
+		return nil, err
+	}
+
+	index := 0
+	if link != nil {
+		base := link.Attrs()
+		ensureIndex(base)
+		index = base.Index
+	}
+
+	var res []Route
+	for _, m := range msgs {
+		msg := nl.DeserializeRtMsg(m)
+
+		if msg.Flags&syscall.RTM_F_CLONED != 0 {
+			// Ignore cloned routes
+			continue
+		}
+
+		if msg.Table != syscall.RT_TABLE_MAIN {
+			// Ignore non-main tables
+			continue
+		}
+
+		route, err := deserializeRoute(m)
+		if err != nil {
+			return nil, err
+		}
+
+		if link != nil && route.LinkIndex != index {
+			// Ignore routes from other interfaces
+			continue
+		}
+		res = append(res, route)
+	}
+
+	return res, nil
+}
+
+// deserializeRoute decodes a binary netlink message into a Route struct
+func deserializeRoute(m []byte) (Route, error) {
+	route := Route{}
+	msg := nl.DeserializeRtMsg(m)
+	attrs, err := nl.ParseRouteAttr(m[msg.Len():])
+	if err != nil {
+		return route, err
+	}
+	route.Scope = Scope(msg.Scope)
+
+	native := nl.NativeEndian()
+	for _, attr := range attrs {
+		switch attr.Attr.Type {
+		case syscall.RTA_GATEWAY:
+			route.Gw = net.IP(attr.Value)
+		case syscall.RTA_PREFSRC:
+			route.Src = net.IP(attr.Value)
+		case syscall.RTA_DST:
+			route.Dst = &net.IPNet{
+				IP:   attr.Value,
+				Mask: net.CIDRMask(int(msg.Dst_len), 8*len(attr.Value)),
+			}
+		case syscall.RTA_OIF:
+			routeIndex := int(native.Uint32(attr.Value[0:4]))
+			route.LinkIndex = routeIndex
+		}
+	}
+	return route, nil
+}
+
+// RouteGet gets a route to a specific destination from the host system.
+// Equivalent to: 'ip route get'.
+func RouteGet(destination net.IP) ([]Route, error) {
+	req := nl.NewNetlinkRequest(syscall.RTM_GETROUTE, syscall.NLM_F_REQUEST)
+	family := nl.GetIPFamily(destination)
+	var destinationData []byte
+	var bitlen uint8
+	if family == FAMILY_V4 {
+		destinationData = destination.To4()
+		bitlen = 32
+	} else {
+		destinationData = destination.To16()
+		bitlen = 128
+	}
+	msg := &nl.RtMsg{}
+	msg.Family = uint8(family)
+	msg.Dst_len = bitlen
+	req.AddData(msg)
+
+	rtaDst := nl.NewRtAttr(syscall.RTA_DST, destinationData)
+	req.AddData(rtaDst)
+
+	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWROUTE)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []Route
+	for _, m := range msgs {
+		route, err := deserializeRoute(m)
+		if err != nil {
+			return nil, err
+		}
+		res = append(res, route)
+	}
+	return res, nil
+
+}
+
+// RouteSubscribe takes a chan down which notifications will be sent
+// when routes are added or deleted. Close the 'done' chan to stop subscription.
+func RouteSubscribe(ch chan<- RouteUpdate, done <-chan struct{}) error {
+	s, err := nl.Subscribe(syscall.NETLINK_ROUTE, syscall.RTNLGRP_IPV4_ROUTE, syscall.RTNLGRP_IPV6_ROUTE)
+	if err != nil {
+		return err
+	}
+	if done != nil {
+		go func() {
+			<-done
+			s.Close()
+		}()
+	}
+	go func() {
+		defer close(ch)
+		for {
+			msgs, err := s.Receive()
+			if err != nil {
+				return
+			}
+			for _, m := range msgs {
+				route, err := deserializeRoute(m.Data)
+				if err != nil {
+					return
+				}
+				ch <- RouteUpdate{Type: m.Header.Type, Route: route}
+			}
+		}
+	}()
+
+	return nil
+}
diff --git a/vendor/github.com/vishvananda/netlink/xfrm.go b/vendor/github.com/vishvananda/netlink/xfrm.go
new file mode 100644
index 0000000000..621ffb6c68
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/xfrm.go
@@ -0,0 +1,64 @@
+package netlink
+
+import (
+	"fmt"
+	"syscall"
+)
+
+// Proto is an enum representing an ipsec protocol.
+type Proto uint8
+
+const (
+	XFRM_PROTO_ROUTE2    Proto = syscall.IPPROTO_ROUTING
+	XFRM_PROTO_ESP       Proto = syscall.IPPROTO_ESP
+	XFRM_PROTO_AH        Proto = syscall.IPPROTO_AH
+	XFRM_PROTO_HAO       Proto = syscall.IPPROTO_DSTOPTS
+	XFRM_PROTO_COMP      Proto = syscall.IPPROTO_COMP
+	XFRM_PROTO_IPSEC_ANY Proto = syscall.IPPROTO_RAW
+)
+
+func (p Proto) String() string {
+	switch p {
+	case XFRM_PROTO_ROUTE2:
+		return "route2"
+	case XFRM_PROTO_ESP:
+		return "esp"
+	case XFRM_PROTO_AH:
+		return "ah"
+	case XFRM_PROTO_HAO:
+		return "hao"
+	case XFRM_PROTO_COMP:
+		return "comp"
+	case XFRM_PROTO_IPSEC_ANY:
+		return "ipsec-any"
+	}
+	return fmt.Sprintf("%d", p)
+}
+
+// Mode is an enum representing an ipsec transport.
+type Mode uint8
+
+const (
+	XFRM_MODE_TRANSPORT Mode = iota
+	XFRM_MODE_TUNNEL
+	XFRM_MODE_ROUTEOPTIMIZATION
+	XFRM_MODE_IN_TRIGGER
+	XFRM_MODE_BEET
+	XFRM_MODE_MAX
+)
+
+func (m Mode) String() string {
+	switch m {
+	case XFRM_MODE_TRANSPORT:
+		return "transport"
+	case XFRM_MODE_TUNNEL:
+		return "tunnel"
+	case XFRM_MODE_ROUTEOPTIMIZATION:
+		return "ro"
+	case XFRM_MODE_IN_TRIGGER:
+		return "in_trigger"
+	case XFRM_MODE_BEET:
+		return "beet"
+	}
+	return fmt.Sprintf("%d", m)
+}
diff --git a/vendor/github.com/vishvananda/netlink/xfrm_policy.go b/vendor/github.com/vishvananda/netlink/xfrm_policy.go
new file mode 100644
index 0000000000..d85c65d2d2
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/xfrm_policy.go
@@ -0,0 +1,59 @@
+package netlink
+
+import (
+	"fmt"
+	"net"
+)
+
+// Dir is an enum representing an ipsec template direction.
+type Dir uint8
+
+const (
+	XFRM_DIR_IN Dir = iota
+	XFRM_DIR_OUT
+	XFRM_DIR_FWD
+	XFRM_SOCKET_IN
+	XFRM_SOCKET_OUT
+	XFRM_SOCKET_FWD
+)
+
+func (d Dir) String() string {
+	switch d {
+	case XFRM_DIR_IN:
+		return "dir in"
+	case XFRM_DIR_OUT:
+		return "dir out"
+	case XFRM_DIR_FWD:
+		return "dir fwd"
+	case XFRM_SOCKET_IN:
+		return "socket in"
+	case XFRM_SOCKET_OUT:
+		return "socket out"
+	case XFRM_SOCKET_FWD:
+		return "socket fwd"
+	}
+	return fmt.Sprintf("socket %d", d-XFRM_SOCKET_IN)
+}
+
+// XfrmPolicyTmpl encapsulates a rule for the base addresses of an ipsec
+// policy. These rules are matched with XfrmState to determine encryption
+// and authentication algorithms.
+type XfrmPolicyTmpl struct {
+	Dst   net.IP
+	Src   net.IP
+	Proto Proto
+	Mode  Mode
+	Reqid int
+}
+
+// XfrmPolicy represents an ipsec policy. It represents the overlay network
+// and has a list of XfrmPolicyTmpls representing the base addresses of
+// the policy.
+type XfrmPolicy struct {
+	Dst      *net.IPNet
+	Src      *net.IPNet
+	Dir      Dir
+	Priority int
+	Index    int
+	Tmpls    []XfrmPolicyTmpl
+}
diff --git a/vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go b/vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go
new file mode 100644
index 0000000000..2daf6dc8b3
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/xfrm_policy_linux.go
@@ -0,0 +1,127 @@
+package netlink
+
+import (
+	"syscall"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+func selFromPolicy(sel *nl.XfrmSelector, policy *XfrmPolicy) {
+	sel.Family = uint16(nl.GetIPFamily(policy.Dst.IP))
+	sel.Daddr.FromIP(policy.Dst.IP)
+	sel.Saddr.FromIP(policy.Src.IP)
+	prefixlenD, _ := policy.Dst.Mask.Size()
+	sel.PrefixlenD = uint8(prefixlenD)
+	prefixlenS, _ := policy.Src.Mask.Size()
+	sel.PrefixlenS = uint8(prefixlenS)
+}
+
+// XfrmPolicyAdd will add an xfrm policy to the system.
+// Equivalent to: `ip xfrm policy add $policy`
+func XfrmPolicyAdd(policy *XfrmPolicy) error {
+	req := nl.NewNetlinkRequest(nl.XFRM_MSG_NEWPOLICY, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
+
+	msg := &nl.XfrmUserpolicyInfo{}
+	selFromPolicy(&msg.Sel, policy)
+	msg.Priority = uint32(policy.Priority)
+	msg.Index = uint32(policy.Index)
+	msg.Dir = uint8(policy.Dir)
+	msg.Lft.SoftByteLimit = nl.XFRM_INF
+	msg.Lft.HardByteLimit = nl.XFRM_INF
+	msg.Lft.SoftPacketLimit = nl.XFRM_INF
+	msg.Lft.HardPacketLimit = nl.XFRM_INF
+	req.AddData(msg)
+
+	tmplData := make([]byte, nl.SizeofXfrmUserTmpl*len(policy.Tmpls))
+	for i, tmpl := range policy.Tmpls {
+		start := i * nl.SizeofXfrmUserTmpl
+		userTmpl := nl.DeserializeXfrmUserTmpl(tmplData[start : start+nl.SizeofXfrmUserTmpl])
+		userTmpl.XfrmId.Daddr.FromIP(tmpl.Dst)
+		userTmpl.Saddr.FromIP(tmpl.Src)
+		userTmpl.XfrmId.Proto = uint8(tmpl.Proto)
+		userTmpl.Mode = uint8(tmpl.Mode)
+		userTmpl.Reqid = uint32(tmpl.Reqid)
+		userTmpl.Aalgos = ^uint32(0)
+		userTmpl.Ealgos = ^uint32(0)
+		userTmpl.Calgos = ^uint32(0)
+	}
+	if len(tmplData) > 0 {
+		tmpls := nl.NewRtAttr(nl.XFRMA_TMPL, tmplData)
+		req.AddData(tmpls)
+	}
+
+	_, err := req.Execute(syscall.NETLINK_XFRM, 0)
+	return err
+}
+
+// XfrmPolicyDel will delete an xfrm policy from the system. Note that
+// the Tmpls are ignored when matching the policy to delete.
+// Equivalent to: `ip xfrm policy del $policy`
+func XfrmPolicyDel(policy *XfrmPolicy) error {
+	req := nl.NewNetlinkRequest(nl.XFRM_MSG_DELPOLICY, syscall.NLM_F_ACK)
+
+	msg := &nl.XfrmUserpolicyId{}
+	selFromPolicy(&msg.Sel, policy)
+	msg.Index = uint32(policy.Index)
+	msg.Dir = uint8(policy.Dir)
+	req.AddData(msg)
+
+	_, err := req.Execute(syscall.NETLINK_XFRM, 0)
+	return err
+}
+
+// XfrmPolicyList gets a list of xfrm policies in the system.
+// Equivalent to: `ip xfrm policy show`.
+// The list can be filtered by ip family.
+func XfrmPolicyList(family int) ([]XfrmPolicy, error) {
+	req := nl.NewNetlinkRequest(nl.XFRM_MSG_GETPOLICY, syscall.NLM_F_DUMP)
+
+	msg := nl.NewIfInfomsg(family)
+	req.AddData(msg)
+
+	msgs, err := req.Execute(syscall.NETLINK_XFRM, nl.XFRM_MSG_NEWPOLICY)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []XfrmPolicy
+	for _, m := range msgs {
+		msg := nl.DeserializeXfrmUserpolicyInfo(m)
+
+		if family != FAMILY_ALL && family != int(msg.Sel.Family) {
+			continue
+		}
+
+		var policy XfrmPolicy
+
+		policy.Dst = msg.Sel.Daddr.ToIPNet(msg.Sel.PrefixlenD)
+		policy.Src = msg.Sel.Saddr.ToIPNet(msg.Sel.PrefixlenS)
+		policy.Priority = int(msg.Priority)
+		policy.Index = int(msg.Index)
+		policy.Dir = Dir(msg.Dir)
+
+		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
+		if err != nil {
+			return nil, err
+		}
+
+		for _, attr := range attrs {
+			switch attr.Attr.Type {
+			case nl.XFRMA_TMPL:
+				max := len(attr.Value)
+				for i := 0; i < max; i += nl.SizeofXfrmUserTmpl {
+					var resTmpl XfrmPolicyTmpl
+					tmpl := nl.DeserializeXfrmUserTmpl(attr.Value[i : i+nl.SizeofXfrmUserTmpl])
+					resTmpl.Dst = tmpl.XfrmId.Daddr.ToIP()
+					resTmpl.Src = tmpl.Saddr.ToIP()
+					resTmpl.Proto = Proto(tmpl.XfrmId.Proto)
+					resTmpl.Mode = Mode(tmpl.Mode)
+					resTmpl.Reqid = int(tmpl.Reqid)
+					policy.Tmpls = append(policy.Tmpls, resTmpl)
+				}
+			}
+		}
+		res = append(res, policy)
+	}
+	return res, nil
+}
diff --git a/vendor/github.com/vishvananda/netlink/xfrm_state.go b/vendor/github.com/vishvananda/netlink/xfrm_state.go
new file mode 100644
index 0000000000..5b8f2df708
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/xfrm_state.go
@@ -0,0 +1,53 @@
+package netlink
+
+import (
+	"net"
+)
+
+// XfrmStateAlgo represents the algorithm to use for the ipsec encryption.
+type XfrmStateAlgo struct {
+	Name        string
+	Key         []byte
+	TruncateLen int // Auth only
+}
+
+// EncapType is an enum representing an ipsec template direction.
+type EncapType uint8
+
+const (
+	XFRM_ENCAP_ESPINUDP_NONIKE EncapType = iota + 1
+	XFRM_ENCAP_ESPINUDP
+)
+
+func (e EncapType) String() string {
+	switch e {
+	case XFRM_ENCAP_ESPINUDP_NONIKE:
+		return "espinudp-nonike"
+	case XFRM_ENCAP_ESPINUDP:
+		return "espinudp"
+	}
+	return "unknown"
+}
+
+// XfrmEncap represents the encapsulation to use for the ipsec encryption.
+type XfrmStateEncap struct {
+	Type            EncapType
+	SrcPort         int
+	DstPort         int
+	OriginalAddress net.IP
+}
+
+// XfrmState represents the state of an ipsec policy. It optionally
+// contains an XfrmStateAlgo for encryption and one for authentication.
+type XfrmState struct {
+	Dst          net.IP
+	Src          net.IP
+	Proto        Proto
+	Mode         Mode
+	Spi          int
+	Reqid        int
+	ReplayWindow int
+	Auth         *XfrmStateAlgo
+	Crypt        *XfrmStateAlgo
+	Encap        *XfrmStateEncap
+}
diff --git a/vendor/github.com/vishvananda/netlink/xfrm_state_linux.go b/vendor/github.com/vishvananda/netlink/xfrm_state_linux.go
new file mode 100644
index 0000000000..5f44ec8525
--- /dev/null
+++ b/vendor/github.com/vishvananda/netlink/xfrm_state_linux.go
@@ -0,0 +1,181 @@
+package netlink
+
+import (
+	"fmt"
+	"syscall"
+
+	"github.com/vishvananda/netlink/nl"
+)
+
+func writeStateAlgo(a *XfrmStateAlgo) []byte {
+	algo := nl.XfrmAlgo{
+		AlgKeyLen: uint32(len(a.Key) * 8),
+		AlgKey:    a.Key,
+	}
+	end := len(a.Name)
+	if end > 64 {
+		end = 64
+	}
+	copy(algo.AlgName[:end], a.Name)
+	return algo.Serialize()
+}
+
+func writeStateAlgoAuth(a *XfrmStateAlgo) []byte {
+	algo := nl.XfrmAlgoAuth{
+		AlgKeyLen:   uint32(len(a.Key) * 8),
+		AlgTruncLen: uint32(a.TruncateLen),
+		AlgKey:      a.Key,
+	}
+	end := len(a.Name)
+	if end > 64 {
+		end = 64
+	}
+	copy(algo.AlgName[:end], a.Name)
+	return algo.Serialize()
+}
+
+// XfrmStateAdd will add an xfrm state to the system.
+// Equivalent to: `ip xfrm state add $state`
+func XfrmStateAdd(state *XfrmState) error {
+	// A state with spi 0 can't be deleted so don't allow it to be set
+	if state.Spi == 0 {
+		return fmt.Errorf("Spi must be set when adding xfrm state.")
+	}
+	req := nl.NewNetlinkRequest(nl.XFRM_MSG_NEWSA, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
+
+	msg := &nl.XfrmUsersaInfo{}
+	msg.Family = uint16(nl.GetIPFamily(state.Dst))
+	msg.Id.Daddr.FromIP(state.Dst)
+	msg.Saddr.FromIP(state.Src)
+	msg.Id.Proto = uint8(state.Proto)
+	msg.Mode = uint8(state.Mode)
+	msg.Id.Spi = nl.Swap32(uint32(state.Spi))
+	msg.Reqid = uint32(state.Reqid)
+	msg.ReplayWindow = uint8(state.ReplayWindow)
+	msg.Lft.SoftByteLimit = nl.XFRM_INF
+	msg.Lft.HardByteLimit = nl.XFRM_INF
+	msg.Lft.SoftPacketLimit = nl.XFRM_INF
+	msg.Lft.HardPacketLimit = nl.XFRM_INF
+	req.AddData(msg)
+
+	if state.Auth != nil {
+		out := nl.NewRtAttr(nl.XFRMA_ALG_AUTH_TRUNC, writeStateAlgoAuth(state.Auth))
+		req.AddData(out)
+	}
+	if state.Crypt != nil {
+		out := nl.NewRtAttr(nl.XFRMA_ALG_CRYPT, writeStateAlgo(state.Crypt))
+		req.AddData(out)
+	}
+	if state.Encap != nil {
+		encapData := make([]byte, nl.SizeofXfrmEncapTmpl)
+		encap := nl.DeserializeXfrmEncapTmpl(encapData)
+		encap.EncapType = uint16(state.Encap.Type)
+		encap.EncapSport = nl.Swap16(uint16(state.Encap.SrcPort))
+		encap.EncapDport = nl.Swap16(uint16(state.Encap.DstPort))
+		encap.EncapOa.FromIP(state.Encap.OriginalAddress)
+		out := nl.NewRtAttr(nl.XFRMA_ENCAP, encapData)
+		req.AddData(out)
+	}
+
+	_, err := req.Execute(syscall.NETLINK_XFRM, 0)
+	return err
+}
+
+// XfrmStateDel will delete an xfrm state from the system. Note that
+// the Algos are ignored when matching the state to delete.
+// Equivalent to: `ip xfrm state del $state`
+func XfrmStateDel(state *XfrmState) error {
+	req := nl.NewNetlinkRequest(nl.XFRM_MSG_DELSA, syscall.NLM_F_ACK)
+
+	msg := &nl.XfrmUsersaId{}
+	msg.Daddr.FromIP(state.Dst)
+	msg.Family = uint16(nl.GetIPFamily(state.Dst))
+	msg.Proto = uint8(state.Proto)
+	msg.Spi = nl.Swap32(uint32(state.Spi))
+	req.AddData(msg)
+
+	saddr := nl.XfrmAddress{}
+	saddr.FromIP(state.Src)
+	srcdata := nl.NewRtAttr(nl.XFRMA_SRCADDR, saddr.Serialize())
+
+	req.AddData(srcdata)
+
+	_, err := req.Execute(syscall.NETLINK_XFRM, 0)
+	return err
+}
+
+// XfrmStateList gets a list of xfrm states in the system.
+// Equivalent to: `ip xfrm state show`.
+// The list can be filtered by ip family.
+func XfrmStateList(family int) ([]XfrmState, error) {
+	req := nl.NewNetlinkRequest(nl.XFRM_MSG_GETSA, syscall.NLM_F_DUMP)
+
+	msg := nl.NewIfInfomsg(family)
+	req.AddData(msg)
+
+	msgs, err := req.Execute(syscall.NETLINK_XFRM, nl.XFRM_MSG_NEWSA)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []XfrmState
+	for _, m := range msgs {
+		msg := nl.DeserializeXfrmUsersaInfo(m)
+
+		if family != FAMILY_ALL && family != int(msg.Family) {
+			continue
+		}
+
+		var state XfrmState
+
+		state.Dst = msg.Id.Daddr.ToIP()
+		state.Src = msg.Saddr.ToIP()
+		state.Proto = Proto(msg.Id.Proto)
+		state.Mode = Mode(msg.Mode)
+		state.Spi = int(nl.Swap32(msg.Id.Spi))
+		state.Reqid = int(msg.Reqid)
+		state.ReplayWindow = int(msg.ReplayWindow)
+
+		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
+		if err != nil {
+			return nil, err
+		}
+
+		for _, attr := range attrs {
+			switch attr.Attr.Type {
+			case nl.XFRMA_ALG_AUTH, nl.XFRMA_ALG_CRYPT:
+				var resAlgo *XfrmStateAlgo
+				if attr.Attr.Type == nl.XFRMA_ALG_AUTH {
+					if state.Auth == nil {
+						state.Auth = new(XfrmStateAlgo)
+					}
+					resAlgo = state.Auth
+				} else {
+					state.Crypt = new(XfrmStateAlgo)
+					resAlgo = state.Crypt
+				}
+				algo := nl.DeserializeXfrmAlgo(attr.Value[:])
+				(*resAlgo).Name = nl.BytesToString(algo.AlgName[:])
+				(*resAlgo).Key = algo.AlgKey
+			case nl.XFRMA_ALG_AUTH_TRUNC:
+				if state.Auth == nil {
+					state.Auth = new(XfrmStateAlgo)
+				}
+				algo := nl.DeserializeXfrmAlgoAuth(attr.Value[:])
+				state.Auth.Name = nl.BytesToString(algo.AlgName[:])
+				state.Auth.Key = algo.AlgKey
+				state.Auth.TruncateLen = int(algo.AlgTruncLen)
+			case nl.XFRMA_ENCAP:
+				encap := nl.DeserializeXfrmEncapTmpl(attr.Value[:])
+				state.Encap = new(XfrmStateEncap)
+				state.Encap.Type = EncapType(encap.EncapType)
+				state.Encap.SrcPort = int(nl.Swap16(encap.EncapSport))
+				state.Encap.DstPort = int(nl.Swap16(encap.EncapDport))
+				state.Encap.OriginalAddress = encap.EncapOa.ToIP()
+			}
+
+		}
+		res = append(res, state)
+	}
+	return res, nil
+}
diff --git a/vendor/go4.org/LICENSE b/vendor/go4.org/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/go4.org/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/go4.org/errorutil/highlight.go b/vendor/go4.org/errorutil/highlight.go
new file mode 100644
index 0000000000..1b1efb0f68
--- /dev/null
+++ b/vendor/go4.org/errorutil/highlight.go
@@ -0,0 +1,58 @@
+/*
+Copyright 2011 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package errorutil helps make better error messages.
+package errorutil // import "go4.org/errorutil"
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"io"
+	"strings"
+)
+
+// HighlightBytePosition takes a reader and the location in bytes of a parse
+// error (for instance, from json.SyntaxError.Offset) and returns the line, column,
+// and pretty-printed context around the error with an arrow indicating the exact
+// position of the syntax error.
+func HighlightBytePosition(f io.Reader, pos int64) (line, col int, highlight string) {
+	line = 1
+	br := bufio.NewReader(f)
+	lastLine := ""
+	thisLine := new(bytes.Buffer)
+	for n := int64(0); n < pos; n++ {
+		b, err := br.ReadByte()
+		if err != nil {
+			break
+		}
+		if b == '\n' {
+			lastLine = thisLine.String()
+			thisLine.Reset()
+			line++
+			col = 1
+		} else {
+			col++
+			thisLine.WriteByte(b)
+		}
+	}
+	if line > 1 {
+		highlight += fmt.Sprintf("%5d: %s\n", line-1, lastLine)
+	}
+	highlight += fmt.Sprintf("%5d: %s\n", line, thisLine.String())
+	highlight += fmt.Sprintf("%s^\n", strings.Repeat(" ", col+5))
+	return
+}
diff --git a/vendor/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/crypto/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/golang.org/x/crypto/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/crypto/PATENTS b/vendor/golang.org/x/crypto/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/golang.org/x/crypto/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/crypto/cast5/cast5.go b/vendor/golang.org/x/crypto/cast5/cast5.go
new file mode 100644
index 0000000000..0b4af37bdc
--- /dev/null
+++ b/vendor/golang.org/x/crypto/cast5/cast5.go
@@ -0,0 +1,526 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package cast5 implements CAST5, as defined in RFC 2144. CAST5 is a common
+// OpenPGP cipher.
+package cast5 // import "golang.org/x/crypto/cast5"
+
+import "errors"
+
+const BlockSize = 8
+const KeySize = 16
+
+type Cipher struct {
+	masking [16]uint32
+	rotate  [16]uint8
+}
+
+func NewCipher(key []byte) (c *Cipher, err error) {
+	if len(key) != KeySize {
+		return nil, errors.New("CAST5: keys must be 16 bytes")
+	}
+
+	c = new(Cipher)
+	c.keySchedule(key)
+	return
+}
+
+func (c *Cipher) BlockSize() int {
+	return BlockSize
+}
+
+func (c *Cipher) Encrypt(dst, src []byte) {
+	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
+	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
+
+	l, r = r, l^f1(r, c.masking[0], c.rotate[0])
+	l, r = r, l^f2(r, c.masking[1], c.rotate[1])
+	l, r = r, l^f3(r, c.masking[2], c.rotate[2])
+	l, r = r, l^f1(r, c.masking[3], c.rotate[3])
+
+	l, r = r, l^f2(r, c.masking[4], c.rotate[4])
+	l, r = r, l^f3(r, c.masking[5], c.rotate[5])
+	l, r = r, l^f1(r, c.masking[6], c.rotate[6])
+	l, r = r, l^f2(r, c.masking[7], c.rotate[7])
+
+	l, r = r, l^f3(r, c.masking[8], c.rotate[8])
+	l, r = r, l^f1(r, c.masking[9], c.rotate[9])
+	l, r = r, l^f2(r, c.masking[10], c.rotate[10])
+	l, r = r, l^f3(r, c.masking[11], c.rotate[11])
+
+	l, r = r, l^f1(r, c.masking[12], c.rotate[12])
+	l, r = r, l^f2(r, c.masking[13], c.rotate[13])
+	l, r = r, l^f3(r, c.masking[14], c.rotate[14])
+	l, r = r, l^f1(r, c.masking[15], c.rotate[15])
+
+	dst[0] = uint8(r >> 24)
+	dst[1] = uint8(r >> 16)
+	dst[2] = uint8(r >> 8)
+	dst[3] = uint8(r)
+	dst[4] = uint8(l >> 24)
+	dst[5] = uint8(l >> 16)
+	dst[6] = uint8(l >> 8)
+	dst[7] = uint8(l)
+}
+
+func (c *Cipher) Decrypt(dst, src []byte) {
+	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
+	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
+
+	l, r = r, l^f1(r, c.masking[15], c.rotate[15])
+	l, r = r, l^f3(r, c.masking[14], c.rotate[14])
+	l, r = r, l^f2(r, c.masking[13], c.rotate[13])
+	l, r = r, l^f1(r, c.masking[12], c.rotate[12])
+
+	l, r = r, l^f3(r, c.masking[11], c.rotate[11])
+	l, r = r, l^f2(r, c.masking[10], c.rotate[10])
+	l, r = r, l^f1(r, c.masking[9], c.rotate[9])
+	l, r = r, l^f3(r, c.masking[8], c.rotate[8])
+
+	l, r = r, l^f2(r, c.masking[7], c.rotate[7])
+	l, r = r, l^f1(r, c.masking[6], c.rotate[6])
+	l, r = r, l^f3(r, c.masking[5], c.rotate[5])
+	l, r = r, l^f2(r, c.masking[4], c.rotate[4])
+
+	l, r = r, l^f1(r, c.masking[3], c.rotate[3])
+	l, r = r, l^f3(r, c.masking[2], c.rotate[2])
+	l, r = r, l^f2(r, c.masking[1], c.rotate[1])
+	l, r = r, l^f1(r, c.masking[0], c.rotate[0])
+
+	dst[0] = uint8(r >> 24)
+	dst[1] = uint8(r >> 16)
+	dst[2] = uint8(r >> 8)
+	dst[3] = uint8(r)
+	dst[4] = uint8(l >> 24)
+	dst[5] = uint8(l >> 16)
+	dst[6] = uint8(l >> 8)
+	dst[7] = uint8(l)
+}
+
+type keyScheduleA [4][7]uint8
+type keyScheduleB [4][5]uint8
+
+// keyScheduleRound contains the magic values for a round of the key schedule.
+// The keyScheduleA deals with the lines like:
+//   z0z1z2z3 = x0x1x2x3 ^ S5[xD] ^ S6[xF] ^ S7[xC] ^ S8[xE] ^ S7[x8]
+// Conceptually, both x and z are in the same array, x first. The first
+// element describes which word of this array gets written to and the
+// second, which word gets read. So, for the line above, it's "4, 0", because
+// it's writing to the first word of z, which, being after x, is word 4, and
+// reading from the first word of x: word 0.
+//
+// Next are the indexes into the S-boxes. Now the array is treated as bytes. So
+// "xD" is 0xd. The first byte of z is written as "16 + 0", just to be clear
+// that it's z that we're indexing.
+//
+// keyScheduleB deals with lines like:
+//   K1 = S5[z8] ^ S6[z9] ^ S7[z7] ^ S8[z6] ^ S5[z2]
+// "K1" is ignored because key words are always written in order. So the five
+// elements are the S-box indexes. They use the same form as in keyScheduleA,
+// above.
+
+type keyScheduleRound struct{}
+type keySchedule []keyScheduleRound
+
+var schedule = []struct {
+	a keyScheduleA
+	b keyScheduleB
+}{
+	{
+		keyScheduleA{
+			{4, 0, 0xd, 0xf, 0xc, 0xe, 0x8},
+			{5, 2, 16 + 0, 16 + 2, 16 + 1, 16 + 3, 0xa},
+			{6, 3, 16 + 7, 16 + 6, 16 + 5, 16 + 4, 9},
+			{7, 1, 16 + 0xa, 16 + 9, 16 + 0xb, 16 + 8, 0xb},
+		},
+		keyScheduleB{
+			{16 + 8, 16 + 9, 16 + 7, 16 + 6, 16 + 2},
+			{16 + 0xa, 16 + 0xb, 16 + 5, 16 + 4, 16 + 6},
+			{16 + 0xc, 16 + 0xd, 16 + 3, 16 + 2, 16 + 9},
+			{16 + 0xe, 16 + 0xf, 16 + 1, 16 + 0, 16 + 0xc},
+		},
+	},
+	{
+		keyScheduleA{
+			{0, 6, 16 + 5, 16 + 7, 16 + 4, 16 + 6, 16 + 0},
+			{1, 4, 0, 2, 1, 3, 16 + 2},
+			{2, 5, 7, 6, 5, 4, 16 + 1},
+			{3, 7, 0xa, 9, 0xb, 8, 16 + 3},
+		},
+		keyScheduleB{
+			{3, 2, 0xc, 0xd, 8},
+			{1, 0, 0xe, 0xf, 0xd},
+			{7, 6, 8, 9, 3},
+			{5, 4, 0xa, 0xb, 7},
+		},
+	},
+	{
+		keyScheduleA{
+			{4, 0, 0xd, 0xf, 0xc, 0xe, 8},
+			{5, 2, 16 + 0, 16 + 2, 16 + 1, 16 + 3, 0xa},
+			{6, 3, 16 + 7, 16 + 6, 16 + 5, 16 + 4, 9},
+			{7, 1, 16 + 0xa, 16 + 9, 16 + 0xb, 16 + 8, 0xb},
+		},
+		keyScheduleB{
+			{16 + 3, 16 + 2, 16 + 0xc, 16 + 0xd, 16 + 9},
+			{16 + 1, 16 + 0, 16 + 0xe, 16 + 0xf, 16 + 0xc},
+			{16 + 7, 16 + 6, 16 + 8, 16 + 9, 16 + 2},
+			{16 + 5, 16 + 4, 16 + 0xa, 16 + 0xb, 16 + 6},
+		},
+	},
+	{
+		keyScheduleA{
+			{0, 6, 16 + 5, 16 + 7, 16 + 4, 16 + 6, 16 + 0},
+			{1, 4, 0, 2, 1, 3, 16 + 2},
+			{2, 5, 7, 6, 5, 4, 16 + 1},
+			{3, 7, 0xa, 9, 0xb, 8, 16 + 3},
+		},
+		keyScheduleB{
+			{8, 9, 7, 6, 3},
+			{0xa, 0xb, 5, 4, 7},
+			{0xc, 0xd, 3, 2, 8},
+			{0xe, 0xf, 1, 0, 0xd},
+		},
+	},
+}
+
+func (c *Cipher) keySchedule(in []byte) {
+	var t [8]uint32
+	var k [32]uint32
+
+	for i := 0; i < 4; i++ {
+		j := i * 4
+		t[i] = uint32(in[j])<<24 | uint32(in[j+1])<<16 | uint32(in[j+2])<<8 | uint32(in[j+3])
+	}
+
+	x := []byte{6, 7, 4, 5}
+	ki := 0
+
+	for half := 0; half < 2; half++ {
+		for _, round := range schedule {
+			for j := 0; j < 4; j++ {
+				var a [7]uint8
+				copy(a[:], round.a[j][:])
+				w := t[a[1]]
+				w ^= sBox[4][(t[a[2]>>2]>>(24-8*(a[2]&3)))&0xff]
+				w ^= sBox[5][(t[a[3]>>2]>>(24-8*(a[3]&3)))&0xff]
+				w ^= sBox[6][(t[a[4]>>2]>>(24-8*(a[4]&3)))&0xff]
+				w ^= sBox[7][(t[a[5]>>2]>>(24-8*(a[5]&3)))&0xff]
+				w ^= sBox[x[j]][(t[a[6]>>2]>>(24-8*(a[6]&3)))&0xff]
+				t[a[0]] = w
+			}
+
+			for j := 0; j < 4; j++ {
+				var b [5]uint8
+				copy(b[:], round.b[j][:])
+				w := sBox[4][(t[b[0]>>2]>>(24-8*(b[0]&3)))&0xff]
+				w ^= sBox[5][(t[b[1]>>2]>>(24-8*(b[1]&3)))&0xff]
+				w ^= sBox[6][(t[b[2]>>2]>>(24-8*(b[2]&3)))&0xff]
+				w ^= sBox[7][(t[b[3]>>2]>>(24-8*(b[3]&3)))&0xff]
+				w ^= sBox[4+j][(t[b[4]>>2]>>(24-8*(b[4]&3)))&0xff]
+				k[ki] = w
+				ki++
+			}
+		}
+	}
+
+	for i := 0; i < 16; i++ {
+		c.masking[i] = k[i]
+		c.rotate[i] = uint8(k[16+i] & 0x1f)
+	}
+}
+
+// These are the three 'f' functions. See RFC 2144, section 2.2.
+func f1(d, m uint32, r uint8) uint32 {
+	t := m + d
+	I := (t << r) | (t >> (32 - r))
+	return ((sBox[0][I>>24] ^ sBox[1][(I>>16)&0xff]) - sBox[2][(I>>8)&0xff]) + sBox[3][I&0xff]
+}
+
+func f2(d, m uint32, r uint8) uint32 {
+	t := m ^ d
+	I := (t << r) | (t >> (32 - r))
+	return ((sBox[0][I>>24] - sBox[1][(I>>16)&0xff]) + sBox[2][(I>>8)&0xff]) ^ sBox[3][I&0xff]
+}
+
+func f3(d, m uint32, r uint8) uint32 {
+	t := m - d
+	I := (t << r) | (t >> (32 - r))
+	return ((sBox[0][I>>24] + sBox[1][(I>>16)&0xff]) ^ sBox[2][(I>>8)&0xff]) - sBox[3][I&0xff]
+}
+
+var sBox = [8][256]uint32{
+	{
+		0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949,
+		0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e,
+		0x28683b6f, 0xc07fd059, 0xff2379c8, 0x775f50e2, 0x43c340d3, 0xdf2f8656, 0x887ca41a, 0xa2d2bd2d,
+		0xa1c9e0d6, 0x346c4819, 0x61b76d87, 0x22540f2f, 0x2abe32e1, 0xaa54166b, 0x22568e3a, 0xa2d341d0,
+		0x66db40c8, 0xa784392f, 0x004dff2f, 0x2db9d2de, 0x97943fac, 0x4a97c1d8, 0x527644b7, 0xb5f437a7,
+		0xb82cbaef, 0xd751d159, 0x6ff7f0ed, 0x5a097a1f, 0x827b68d0, 0x90ecf52e, 0x22b0c054, 0xbc8e5935,
+		0x4b6d2f7f, 0x50bb64a2, 0xd2664910, 0xbee5812d, 0xb7332290, 0xe93b159f, 0xb48ee411, 0x4bff345d,
+		0xfd45c240, 0xad31973f, 0xc4f6d02e, 0x55fc8165, 0xd5b1caad, 0xa1ac2dae, 0xa2d4b76d, 0xc19b0c50,
+		0x882240f2, 0x0c6e4f38, 0xa4e4bfd7, 0x4f5ba272, 0x564c1d2f, 0xc59c5319, 0xb949e354, 0xb04669fe,
+		0xb1b6ab8a, 0xc71358dd, 0x6385c545, 0x110f935d, 0x57538ad5, 0x6a390493, 0xe63d37e0, 0x2a54f6b3,
+		0x3a787d5f, 0x6276a0b5, 0x19a6fcdf, 0x7a42206a, 0x29f9d4d5, 0xf61b1891, 0xbb72275e, 0xaa508167,
+		0x38901091, 0xc6b505eb, 0x84c7cb8c, 0x2ad75a0f, 0x874a1427, 0xa2d1936b, 0x2ad286af, 0xaa56d291,
+		0xd7894360, 0x425c750d, 0x93b39e26, 0x187184c9, 0x6c00b32d, 0x73e2bb14, 0xa0bebc3c, 0x54623779,
+		0x64459eab, 0x3f328b82, 0x7718cf82, 0x59a2cea6, 0x04ee002e, 0x89fe78e6, 0x3fab0950, 0x325ff6c2,
+		0x81383f05, 0x6963c5c8, 0x76cb5ad6, 0xd49974c9, 0xca180dcf, 0x380782d5, 0xc7fa5cf6, 0x8ac31511,
+		0x35e79e13, 0x47da91d0, 0xf40f9086, 0xa7e2419e, 0x31366241, 0x051ef495, 0xaa573b04, 0x4a805d8d,
+		0x548300d0, 0x00322a3c, 0xbf64cddf, 0xba57a68e, 0x75c6372b, 0x50afd341, 0xa7c13275, 0x915a0bf5,
+		0x6b54bfab, 0x2b0b1426, 0xab4cc9d7, 0x449ccd82, 0xf7fbf265, 0xab85c5f3, 0x1b55db94, 0xaad4e324,
+		0xcfa4bd3f, 0x2deaa3e2, 0x9e204d02, 0xc8bd25ac, 0xeadf55b3, 0xd5bd9e98, 0xe31231b2, 0x2ad5ad6c,
+		0x954329de, 0xadbe4528, 0xd8710f69, 0xaa51c90f, 0xaa786bf6, 0x22513f1e, 0xaa51a79b, 0x2ad344cc,
+		0x7b5a41f0, 0xd37cfbad, 0x1b069505, 0x41ece491, 0xb4c332e6, 0x032268d4, 0xc9600acc, 0xce387e6d,
+		0xbf6bb16c, 0x6a70fb78, 0x0d03d9c9, 0xd4df39de, 0xe01063da, 0x4736f464, 0x5ad328d8, 0xb347cc96,
+		0x75bb0fc3, 0x98511bfb, 0x4ffbcc35, 0xb58bcf6a, 0xe11f0abc, 0xbfc5fe4a, 0xa70aec10, 0xac39570a,
+		0x3f04442f, 0x6188b153, 0xe0397a2e, 0x5727cb79, 0x9ceb418f, 0x1cacd68d, 0x2ad37c96, 0x0175cb9d,
+		0xc69dff09, 0xc75b65f0, 0xd9db40d8, 0xec0e7779, 0x4744ead4, 0xb11c3274, 0xdd24cb9e, 0x7e1c54bd,
+		0xf01144f9, 0xd2240eb1, 0x9675b3fd, 0xa3ac3755, 0xd47c27af, 0x51c85f4d, 0x56907596, 0xa5bb15e6,
+		0x580304f0, 0xca042cf1, 0x011a37ea, 0x8dbfaadb, 0x35ba3e4a, 0x3526ffa0, 0xc37b4d09, 0xbc306ed9,
+		0x98a52666, 0x5648f725, 0xff5e569d, 0x0ced63d0, 0x7c63b2cf, 0x700b45e1, 0xd5ea50f1, 0x85a92872,
+		0xaf1fbda7, 0xd4234870, 0xa7870bf3, 0x2d3b4d79, 0x42e04198, 0x0cd0ede7, 0x26470db8, 0xf881814c,
+		0x474d6ad7, 0x7c0c5e5c, 0xd1231959, 0x381b7298, 0xf5d2f4db, 0xab838653, 0x6e2f1e23, 0x83719c9e,
+		0xbd91e046, 0x9a56456e, 0xdc39200c, 0x20c8c571, 0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9,
+		0x1a69e783, 0x02cc4843, 0xa2f7c579, 0x429ef47d, 0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf,
+	},
+	{
+		0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651,
+		0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3,
+		0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909, 0xdc440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb,
+		0xd1da4181, 0x3b092ab1, 0xf997f1c1, 0xa5e6cf7b, 0x01420ddb, 0xe4e7ef5b, 0x25a1ff41, 0xe180f806,
+		0x1fc41080, 0x179bee7a, 0xd37ac6a9, 0xfe5830a4, 0x98de8b7f, 0x77e83f4e, 0x79929269, 0x24fa9f7b,
+		0xe113c85b, 0xacc40083, 0xd7503525, 0xf7ea615f, 0x62143154, 0x0d554b63, 0x5d681121, 0xc866c359,
+		0x3d63cf73, 0xcee234c0, 0xd4d87e87, 0x5c672b21, 0x071f6181, 0x39f7627f, 0x361e3084, 0xe4eb573b,
+		0x602f64a4, 0xd63acd9c, 0x1bbc4635, 0x9e81032d, 0x2701f50c, 0x99847ab4, 0xa0e3df79, 0xba6cf38c,
+		0x10843094, 0x2537a95e, 0xf46f6ffe, 0xa1ff3b1f, 0x208cfb6a, 0x8f458c74, 0xd9e0a227, 0x4ec73a34,
+		0xfc884f69, 0x3e4de8df, 0xef0e0088, 0x3559648d, 0x8a45388c, 0x1d804366, 0x721d9bfd, 0xa58684bb,
+		0xe8256333, 0x844e8212, 0x128d8098, 0xfed33fb4, 0xce280ae1, 0x27e19ba5, 0xd5a6c252, 0xe49754bd,
+		0xc5d655dd, 0xeb667064, 0x77840b4d, 0xa1b6a801, 0x84db26a9, 0xe0b56714, 0x21f043b7, 0xe5d05860,
+		0x54f03084, 0x066ff472, 0xa31aa153, 0xdadc4755, 0xb5625dbf, 0x68561be6, 0x83ca6b94, 0x2d6ed23b,
+		0xeccf01db, 0xa6d3d0ba, 0xb6803d5c, 0xaf77a709, 0x33b4a34c, 0x397bc8d6, 0x5ee22b95, 0x5f0e5304,
+		0x81ed6f61, 0x20e74364, 0xb45e1378, 0xde18639b, 0x881ca122, 0xb96726d1, 0x8049a7e8, 0x22b7da7b,
+		0x5e552d25, 0x5272d237, 0x79d2951c, 0xc60d894c, 0x488cb402, 0x1ba4fe5b, 0xa4b09f6b, 0x1ca815cf,
+		0xa20c3005, 0x8871df63, 0xb9de2fcb, 0x0cc6c9e9, 0x0beeff53, 0xe3214517, 0xb4542835, 0x9f63293c,
+		0xee41e729, 0x6e1d2d7c, 0x50045286, 0x1e6685f3, 0xf33401c6, 0x30a22c95, 0x31a70850, 0x60930f13,
+		0x73f98417, 0xa1269859, 0xec645c44, 0x52c877a9, 0xcdff33a6, 0xa02b1741, 0x7cbad9a2, 0x2180036f,
+		0x50d99c08, 0xcb3f4861, 0xc26bd765, 0x64a3f6ab, 0x80342676, 0x25a75e7b, 0xe4e6d1fc, 0x20c710e6,
+		0xcdf0b680, 0x17844d3b, 0x31eef84d, 0x7e0824e4, 0x2ccb49eb, 0x846a3bae, 0x8ff77888, 0xee5d60f6,
+		0x7af75673, 0x2fdd5cdb, 0xa11631c1, 0x30f66f43, 0xb3faec54, 0x157fd7fa, 0xef8579cc, 0xd152de58,
+		0xdb2ffd5e, 0x8f32ce19, 0x306af97a, 0x02f03ef8, 0x99319ad5, 0xc242fa0f, 0xa7e3ebb0, 0xc68e4906,
+		0xb8da230c, 0x80823028, 0xdcdef3c8, 0xd35fb171, 0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d,
+		0xc72feffa, 0x22822e99, 0x82c570b4, 0xd8d94e89, 0x8b1c34bc, 0x301e16e6, 0x273be979, 0xb0ffeaa6,
+		0x61d9b8c6, 0x00b24869, 0xb7ffce3f, 0x08dc283b, 0x43daf65a, 0xf7e19798, 0x7619b72f, 0x8f1c9ba4,
+		0xdc8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb, 0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6,
+		0x2d6a77ab, 0x3527ed4b, 0x821fd216, 0x095c6e2e, 0xdb92f2fb, 0x5eea29cb, 0x145892f5, 0x91584f7f,
+		0x5483697b, 0x2667a8cc, 0x85196048, 0x8c4bacea, 0x833860d4, 0x0d23e0f9, 0x6c387e8a, 0x0ae6d249,
+		0xb284600c, 0xd835731d, 0xdcb1c647, 0xac4c56ea, 0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa,
+		0x8f5ea2b3, 0xfc184642, 0x0a036b7a, 0x4fb089bd, 0x649da589, 0xa345415e, 0x5c038323, 0x3e5d3bb9,
+		0x43d79572, 0x7e6dd07c, 0x06dfdf1e, 0x6c6cc4ef, 0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1,
+	},
+	{
+		0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907, 0x47607fff, 0x369fe44b, 0x8c1fc644, 0xaececa90,
+		0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae, 0x920e8806, 0xf0ad0548, 0xe13c8d83, 0x927010d5,
+		0x11107d9f, 0x07647db9, 0xb2e3e4d4, 0x3d4f285e, 0xb9afa820, 0xfade82e0, 0xa067268b, 0x8272792e,
+		0x553fb2c0, 0x489ae22b, 0xd4ef9794, 0x125e3fbc, 0x21fffcee, 0x825b1bfd, 0x9255c5ed, 0x1257a240,
+		0x4e1a8302, 0xbae07fff, 0x528246e7, 0x8e57140e, 0x3373f7bf, 0x8c9f8188, 0xa6fc4ee8, 0xc982b5a5,
+		0xa8c01db7, 0x579fc264, 0x67094f31, 0xf2bd3f5f, 0x40fff7c1, 0x1fb78dfc, 0x8e6bd2c1, 0x437be59b,
+		0x99b03dbf, 0xb5dbc64b, 0x638dc0e6, 0x55819d99, 0xa197c81c, 0x4a012d6e, 0xc5884a28, 0xccc36f71,
+		0xb843c213, 0x6c0743f1, 0x8309893c, 0x0feddd5f, 0x2f7fe850, 0xd7c07f7e, 0x02507fbf, 0x5afb9a04,
+		0xa747d2d0, 0x1651192e, 0xaf70bf3e, 0x58c31380, 0x5f98302e, 0x727cc3c4, 0x0a0fb402, 0x0f7fef82,
+		0x8c96fdad, 0x5d2c2aae, 0x8ee99a49, 0x50da88b8, 0x8427f4a0, 0x1eac5790, 0x796fb449, 0x8252dc15,
+		0xefbd7d9b, 0xa672597d, 0xada840d8, 0x45f54504, 0xfa5d7403, 0xe83ec305, 0x4f91751a, 0x925669c2,
+		0x23efe941, 0xa903f12e, 0x60270df2, 0x0276e4b6, 0x94fd6574, 0x927985b2, 0x8276dbcb, 0x02778176,
+		0xf8af918d, 0x4e48f79e, 0x8f616ddf, 0xe29d840e, 0x842f7d83, 0x340ce5c8, 0x96bbb682, 0x93b4b148,
+		0xef303cab, 0x984faf28, 0x779faf9b, 0x92dc560d, 0x224d1e20, 0x8437aa88, 0x7d29dc96, 0x2756d3dc,
+		0x8b907cee, 0xb51fd240, 0xe7c07ce3, 0xe566b4a1, 0xc3e9615e, 0x3cf8209d, 0x6094d1e3, 0xcd9ca341,
+		0x5c76460e, 0x00ea983b, 0xd4d67881, 0xfd47572c, 0xf76cedd9, 0xbda8229c, 0x127dadaa, 0x438a074e,
+		0x1f97c090, 0x081bdb8a, 0x93a07ebe, 0xb938ca15, 0x97b03cff, 0x3dc2c0f8, 0x8d1ab2ec, 0x64380e51,
+		0x68cc7bfb, 0xd90f2788, 0x12490181, 0x5de5ffd4, 0xdd7ef86a, 0x76a2e214, 0xb9a40368, 0x925d958f,
+		0x4b39fffa, 0xba39aee9, 0xa4ffd30b, 0xfaf7933b, 0x6d498623, 0x193cbcfa, 0x27627545, 0x825cf47a,
+		0x61bd8ba0, 0xd11e42d1, 0xcead04f4, 0x127ea392, 0x10428db7, 0x8272a972, 0x9270c4a8, 0x127de50b,
+		0x285ba1c8, 0x3c62f44f, 0x35c0eaa5, 0xe805d231, 0x428929fb, 0xb4fcdf82, 0x4fb66a53, 0x0e7dc15b,
+		0x1f081fab, 0x108618ae, 0xfcfd086d, 0xf9ff2889, 0x694bcc11, 0x236a5cae, 0x12deca4d, 0x2c3f8cc5,
+		0xd2d02dfe, 0xf8ef5896, 0xe4cf52da, 0x95155b67, 0x494a488c, 0xb9b6a80c, 0x5c8f82bc, 0x89d36b45,
+		0x3a609437, 0xec00c9a9, 0x44715253, 0x0a874b49, 0xd773bc40, 0x7c34671c, 0x02717ef6, 0x4feb5536,
+		0xa2d02fff, 0xd2bf60c4, 0xd43f03c0, 0x50b4ef6d, 0x07478cd1, 0x006e1888, 0xa2e53f55, 0xb9e6d4bc,
+		0xa2048016, 0x97573833, 0xd7207d67, 0xde0f8f3d, 0x72f87b33, 0xabcc4f33, 0x7688c55d, 0x7b00a6b0,
+		0x947b0001, 0x570075d2, 0xf9bb88f8, 0x8942019e, 0x4264a5ff, 0x856302e0, 0x72dbd92b, 0xee971b69,
+		0x6ea22fde, 0x5f08ae2b, 0xaf7a616d, 0xe5c98767, 0xcf1febd2, 0x61efc8c2, 0xf1ac2571, 0xcc8239c2,
+		0x67214cb8, 0xb1e583d1, 0xb7dc3e62, 0x7f10bdce, 0xf90a5c38, 0x0ff0443d, 0x606e6dc6, 0x60543a49,
+		0x5727c148, 0x2be98a1d, 0x8ab41738, 0x20e1be24, 0xaf96da0f, 0x68458425, 0x99833be5, 0x600d457d,
+		0x282f9350, 0x8334b362, 0xd91d1120, 0x2b6d8da0, 0x642b1e31, 0x9c305a00, 0x52bce688, 0x1b03588a,
+		0xf7baefd5, 0x4142ed9c, 0xa4315c11, 0x83323ec5, 0xdfef4636, 0xa133c501, 0xe9d3531c, 0xee353783,
+	},
+	{
+		0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298, 0x4a4f7bdb, 0x64ad8c57, 0x85510443, 0xfa020ed1,
+		0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120, 0xfd059d43, 0x6497b7b1, 0xf3641f63, 0x241e4adf,
+		0x28147f5f, 0x4fa2b8cd, 0xc9430040, 0x0cc32220, 0xfdd30b30, 0xc0a5374f, 0x1d2d00d9, 0x24147b15,
+		0xee4d111a, 0x0fca5167, 0x71ff904c, 0x2d195ffe, 0x1a05645f, 0x0c13fefe, 0x081b08ca, 0x05170121,
+		0x80530100, 0xe83e5efe, 0xac9af4f8, 0x7fe72701, 0xd2b8ee5f, 0x06df4261, 0xbb9e9b8a, 0x7293ea25,
+		0xce84ffdf, 0xf5718801, 0x3dd64b04, 0xa26f263b, 0x7ed48400, 0x547eebe6, 0x446d4ca0, 0x6cf3d6f5,
+		0x2649abdf, 0xaea0c7f5, 0x36338cc1, 0x503f7e93, 0xd3772061, 0x11b638e1, 0x72500e03, 0xf80eb2bb,
+		0xabe0502e, 0xec8d77de, 0x57971e81, 0xe14f6746, 0xc9335400, 0x6920318f, 0x081dbb99, 0xffc304a5,
+		0x4d351805, 0x7f3d5ce3, 0xa6c866c6, 0x5d5bcca9, 0xdaec6fea, 0x9f926f91, 0x9f46222f, 0x3991467d,
+		0xa5bf6d8e, 0x1143c44f, 0x43958302, 0xd0214eeb, 0x022083b8, 0x3fb6180c, 0x18f8931e, 0x281658e6,
+		0x26486e3e, 0x8bd78a70, 0x7477e4c1, 0xb506e07c, 0xf32d0a25, 0x79098b02, 0xe4eabb81, 0x28123b23,
+		0x69dead38, 0x1574ca16, 0xdf871b62, 0x211c40b7, 0xa51a9ef9, 0x0014377b, 0x041e8ac8, 0x09114003,
+		0xbd59e4d2, 0xe3d156d5, 0x4fe876d5, 0x2f91a340, 0x557be8de, 0x00eae4a7, 0x0ce5c2ec, 0x4db4bba6,
+		0xe756bdff, 0xdd3369ac, 0xec17b035, 0x06572327, 0x99afc8b0, 0x56c8c391, 0x6b65811c, 0x5e146119,
+		0x6e85cb75, 0xbe07c002, 0xc2325577, 0x893ff4ec, 0x5bbfc92d, 0xd0ec3b25, 0xb7801ab7, 0x8d6d3b24,
+		0x20c763ef, 0xc366a5fc, 0x9c382880, 0x0ace3205, 0xaac9548a, 0xeca1d7c7, 0x041afa32, 0x1d16625a,
+		0x6701902c, 0x9b757a54, 0x31d477f7, 0x9126b031, 0x36cc6fdb, 0xc70b8b46, 0xd9e66a48, 0x56e55a79,
+		0x026a4ceb, 0x52437eff, 0x2f8f76b4, 0x0df980a5, 0x8674cde3, 0xedda04eb, 0x17a9be04, 0x2c18f4df,
+		0xb7747f9d, 0xab2af7b4, 0xefc34d20, 0x2e096b7c, 0x1741a254, 0xe5b6a035, 0x213d42f6, 0x2c1c7c26,
+		0x61c2f50f, 0x6552daf9, 0xd2c231f8, 0x25130f69, 0xd8167fa2, 0x0418f2c8, 0x001a96a6, 0x0d1526ab,
+		0x63315c21, 0x5e0a72ec, 0x49bafefd, 0x187908d9, 0x8d0dbd86, 0x311170a7, 0x3e9b640c, 0xcc3e10d7,
+		0xd5cad3b6, 0x0caec388, 0xf73001e1, 0x6c728aff, 0x71eae2a1, 0x1f9af36e, 0xcfcbd12f, 0xc1de8417,
+		0xac07be6b, 0xcb44a1d8, 0x8b9b0f56, 0x013988c3, 0xb1c52fca, 0xb4be31cd, 0xd8782806, 0x12a3a4e2,
+		0x6f7de532, 0x58fd7eb6, 0xd01ee900, 0x24adffc2, 0xf4990fc5, 0x9711aac5, 0x001d7b95, 0x82e5e7d2,
+		0x109873f6, 0x00613096, 0xc32d9521, 0xada121ff, 0x29908415, 0x7fbb977f, 0xaf9eb3db, 0x29c9ed2a,
+		0x5ce2a465, 0xa730f32c, 0xd0aa3fe8, 0x8a5cc091, 0xd49e2ce7, 0x0ce454a9, 0xd60acd86, 0x015f1919,
+		0x77079103, 0xdea03af6, 0x78a8565e, 0xdee356df, 0x21f05cbe, 0x8b75e387, 0xb3c50651, 0xb8a5c3ef,
+		0xd8eeb6d2, 0xe523be77, 0xc2154529, 0x2f69efdf, 0xafe67afb, 0xf470c4b2, 0xf3e0eb5b, 0xd6cc9876,
+		0x39e4460c, 0x1fda8538, 0x1987832f, 0xca007367, 0xa99144f8, 0x296b299e, 0x492fc295, 0x9266beab,
+		0xb5676e69, 0x9bd3ddda, 0xdf7e052f, 0xdb25701c, 0x1b5e51ee, 0xf65324e6, 0x6afce36c, 0x0316cc04,
+		0x8644213e, 0xb7dc59d0, 0x7965291f, 0xccd6fd43, 0x41823979, 0x932bcdf6, 0xb657c34d, 0x4edfd282,
+		0x7ae5290c, 0x3cb9536b, 0x851e20fe, 0x9833557e, 0x13ecf0b0, 0xd3ffb372, 0x3f85c5c1, 0x0aef7ed2,
+	},
+	{
+		0x7ec90c04, 0x2c6e74b9, 0x9b0e66df, 0xa6337911, 0xb86a7fff, 0x1dd358f5, 0x44dd9d44, 0x1731167f,
+		0x08fbf1fa, 0xe7f511cc, 0xd2051b00, 0x735aba00, 0x2ab722d8, 0x386381cb, 0xacf6243a, 0x69befd7a,
+		0xe6a2e77f, 0xf0c720cd, 0xc4494816, 0xccf5c180, 0x38851640, 0x15b0a848, 0xe68b18cb, 0x4caadeff,
+		0x5f480a01, 0x0412b2aa, 0x259814fc, 0x41d0efe2, 0x4e40b48d, 0x248eb6fb, 0x8dba1cfe, 0x41a99b02,
+		0x1a550a04, 0xba8f65cb, 0x7251f4e7, 0x95a51725, 0xc106ecd7, 0x97a5980a, 0xc539b9aa, 0x4d79fe6a,
+		0xf2f3f763, 0x68af8040, 0xed0c9e56, 0x11b4958b, 0xe1eb5a88, 0x8709e6b0, 0xd7e07156, 0x4e29fea7,
+		0x6366e52d, 0x02d1c000, 0xc4ac8e05, 0x9377f571, 0x0c05372a, 0x578535f2, 0x2261be02, 0xd642a0c9,
+		0xdf13a280, 0x74b55bd2, 0x682199c0, 0xd421e5ec, 0x53fb3ce8, 0xc8adedb3, 0x28a87fc9, 0x3d959981,
+		0x5c1ff900, 0xfe38d399, 0x0c4eff0b, 0x062407ea, 0xaa2f4fb1, 0x4fb96976, 0x90c79505, 0xb0a8a774,
+		0xef55a1ff, 0xe59ca2c2, 0xa6b62d27, 0xe66a4263, 0xdf65001f, 0x0ec50966, 0xdfdd55bc, 0x29de0655,
+		0x911e739a, 0x17af8975, 0x32c7911c, 0x89f89468, 0x0d01e980, 0x524755f4, 0x03b63cc9, 0x0cc844b2,
+		0xbcf3f0aa, 0x87ac36e9, 0xe53a7426, 0x01b3d82b, 0x1a9e7449, 0x64ee2d7e, 0xcddbb1da, 0x01c94910,
+		0xb868bf80, 0x0d26f3fd, 0x9342ede7, 0x04a5c284, 0x636737b6, 0x50f5b616, 0xf24766e3, 0x8eca36c1,
+		0x136e05db, 0xfef18391, 0xfb887a37, 0xd6e7f7d4, 0xc7fb7dc9, 0x3063fcdf, 0xb6f589de, 0xec2941da,
+		0x26e46695, 0xb7566419, 0xf654efc5, 0xd08d58b7, 0x48925401, 0xc1bacb7f, 0xe5ff550f, 0xb6083049,
+		0x5bb5d0e8, 0x87d72e5a, 0xab6a6ee1, 0x223a66ce, 0xc62bf3cd, 0x9e0885f9, 0x68cb3e47, 0x086c010f,
+		0xa21de820, 0xd18b69de, 0xf3f65777, 0xfa02c3f6, 0x407edac3, 0xcbb3d550, 0x1793084d, 0xb0d70eba,
+		0x0ab378d5, 0xd951fb0c, 0xded7da56, 0x4124bbe4, 0x94ca0b56, 0x0f5755d1, 0xe0e1e56e, 0x6184b5be,
+		0x580a249f, 0x94f74bc0, 0xe327888e, 0x9f7b5561, 0xc3dc0280, 0x05687715, 0x646c6bd7, 0x44904db3,
+		0x66b4f0a3, 0xc0f1648a, 0x697ed5af, 0x49e92ff6, 0x309e374f, 0x2cb6356a, 0x85808573, 0x4991f840,
+		0x76f0ae02, 0x083be84d, 0x28421c9a, 0x44489406, 0x736e4cb8, 0xc1092910, 0x8bc95fc6, 0x7d869cf4,
+		0x134f616f, 0x2e77118d, 0xb31b2be1, 0xaa90b472, 0x3ca5d717, 0x7d161bba, 0x9cad9010, 0xaf462ba2,
+		0x9fe459d2, 0x45d34559, 0xd9f2da13, 0xdbc65487, 0xf3e4f94e, 0x176d486f, 0x097c13ea, 0x631da5c7,
+		0x445f7382, 0x175683f4, 0xcdc66a97, 0x70be0288, 0xb3cdcf72, 0x6e5dd2f3, 0x20936079, 0x459b80a5,
+		0xbe60e2db, 0xa9c23101, 0xeba5315c, 0x224e42f2, 0x1c5c1572, 0xf6721b2c, 0x1ad2fff3, 0x8c25404e,
+		0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78, 0xdc0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e,
+		0x44094f85, 0x3f481d87, 0xfcfeae7b, 0x77b5ff76, 0x8c2302bf, 0xaaf47556, 0x5f46b02a, 0x2b092801,
+		0x3d38f5f7, 0x0ca81f36, 0x52af4a8a, 0x66d5e7c0, 0xdf3b0874, 0x95055110, 0x1b5ad7a8, 0xf61ed5ad,
+		0x6cf6e479, 0x20758184, 0xd0cefa65, 0x88f7be58, 0x4a046826, 0x0ff6f8f3, 0xa09c7f70, 0x5346aba0,
+		0x5ce96c28, 0xe176eda3, 0x6bac307f, 0x376829d2, 0x85360fa9, 0x17e3fe2a, 0x24b79767, 0xf5a96b20,
+		0xd6cd2595, 0x68ff1ebf, 0x7555442c, 0xf19f06be, 0xf9e0659a, 0xeeb9491d, 0x34010718, 0xbb30cab8,
+		0xe822fe15, 0x88570983, 0x750e6249, 0xda627e55, 0x5e76ffa8, 0xb1534546, 0x6d47de08, 0xefe9e7d4,
+	},
+	{
+		0xf6fa8f9d, 0x2cac6ce1, 0x4ca34867, 0xe2337f7c, 0x95db08e7, 0x016843b4, 0xeced5cbc, 0x325553ac,
+		0xbf9f0960, 0xdfa1e2ed, 0x83f0579d, 0x63ed86b9, 0x1ab6a6b8, 0xde5ebe39, 0xf38ff732, 0x8989b138,
+		0x33f14961, 0xc01937bd, 0xf506c6da, 0xe4625e7e, 0xa308ea99, 0x4e23e33c, 0x79cbd7cc, 0x48a14367,
+		0xa3149619, 0xfec94bd5, 0xa114174a, 0xeaa01866, 0xa084db2d, 0x09a8486f, 0xa888614a, 0x2900af98,
+		0x01665991, 0xe1992863, 0xc8f30c60, 0x2e78ef3c, 0xd0d51932, 0xcf0fec14, 0xf7ca07d2, 0xd0a82072,
+		0xfd41197e, 0x9305a6b0, 0xe86be3da, 0x74bed3cd, 0x372da53c, 0x4c7f4448, 0xdab5d440, 0x6dba0ec3,
+		0x083919a7, 0x9fbaeed9, 0x49dbcfb0, 0x4e670c53, 0x5c3d9c01, 0x64bdb941, 0x2c0e636a, 0xba7dd9cd,
+		0xea6f7388, 0xe70bc762, 0x35f29adb, 0x5c4cdd8d, 0xf0d48d8c, 0xb88153e2, 0x08a19866, 0x1ae2eac8,
+		0x284caf89, 0xaa928223, 0x9334be53, 0x3b3a21bf, 0x16434be3, 0x9aea3906, 0xefe8c36e, 0xf890cdd9,
+		0x80226dae, 0xc340a4a3, 0xdf7e9c09, 0xa694a807, 0x5b7c5ecc, 0x221db3a6, 0x9a69a02f, 0x68818a54,
+		0xceb2296f, 0x53c0843a, 0xfe893655, 0x25bfe68a, 0xb4628abc, 0xcf222ebf, 0x25ac6f48, 0xa9a99387,
+		0x53bddb65, 0xe76ffbe7, 0xe967fd78, 0x0ba93563, 0x8e342bc1, 0xe8a11be9, 0x4980740d, 0xc8087dfc,
+		0x8de4bf99, 0xa11101a0, 0x7fd37975, 0xda5a26c0, 0xe81f994f, 0x9528cd89, 0xfd339fed, 0xb87834bf,
+		0x5f04456d, 0x22258698, 0xc9c4c83b, 0x2dc156be, 0x4f628daa, 0x57f55ec5, 0xe2220abe, 0xd2916ebf,
+		0x4ec75b95, 0x24f2c3c0, 0x42d15d99, 0xcd0d7fa0, 0x7b6e27ff, 0xa8dc8af0, 0x7345c106, 0xf41e232f,
+		0x35162386, 0xe6ea8926, 0x3333b094, 0x157ec6f2, 0x372b74af, 0x692573e4, 0xe9a9d848, 0xf3160289,
+		0x3a62ef1d, 0xa787e238, 0xf3a5f676, 0x74364853, 0x20951063, 0x4576698d, 0xb6fad407, 0x592af950,
+		0x36f73523, 0x4cfb6e87, 0x7da4cec0, 0x6c152daa, 0xcb0396a8, 0xc50dfe5d, 0xfcd707ab, 0x0921c42f,
+		0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9, 0x2b05d08d, 0x48b9d585, 0xdc049441, 0xc8098f9b,
+		0x7dede786, 0xc39a3373, 0x42410005, 0x6a091751, 0x0ef3c8a6, 0x890072d6, 0x28207682, 0xa9a9f7be,
+		0xbf32679d, 0xd45b5b75, 0xb353fd00, 0xcbb0e358, 0x830f220a, 0x1f8fb214, 0xd372cf08, 0xcc3c4a13,
+		0x8cf63166, 0x061c87be, 0x88c98f88, 0x6062e397, 0x47cf8e7a, 0xb6c85283, 0x3cc2acfb, 0x3fc06976,
+		0x4e8f0252, 0x64d8314d, 0xda3870e3, 0x1e665459, 0xc10908f0, 0x513021a5, 0x6c5b68b7, 0x822f8aa0,
+		0x3007cd3e, 0x74719eef, 0xdc872681, 0x073340d4, 0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891,
+		0x08a930f6, 0x957ef305, 0xb7fbffbd, 0xc266e96f, 0x6fe4ac98, 0xb173ecc0, 0xbc60b42a, 0x953498da,
+		0xfba1ae12, 0x2d4bd736, 0x0f25faab, 0xa4f3fceb, 0xe2969123, 0x257f0c3d, 0x9348af49, 0x361400bc,
+		0xe8816f4a, 0x3814f200, 0xa3f94043, 0x9c7a54c2, 0xbc704f57, 0xda41e7f9, 0xc25ad33a, 0x54f4a084,
+		0xb17f5505, 0x59357cbe, 0xedbd15c8, 0x7f97c5ab, 0xba5ac7b5, 0xb6f6deaf, 0x3a479c3a, 0x5302da25,
+		0x653d7e6a, 0x54268d49, 0x51a477ea, 0x5017d55b, 0xd7d25d88, 0x44136c76, 0x0404a8c8, 0xb8e5a121,
+		0xb81a928a, 0x60ed5869, 0x97c55b96, 0xeaec991b, 0x29935913, 0x01fdb7f1, 0x088e8dfa, 0x9ab6f6f5,
+		0x3b4cbf9f, 0x4a5de3ab, 0xe6051d35, 0xa0e1d855, 0xd36b4cf1, 0xf544edeb, 0xb0e93524, 0xbebb8fbd,
+		0xa2d762cf, 0x49c92f54, 0x38b5f331, 0x7128a454, 0x48392905, 0xa65b1db8, 0x851c97bd, 0xd675cf2f,
+	},
+	{
+		0x85e04019, 0x332bf567, 0x662dbfff, 0xcfc65693, 0x2a8d7f6f, 0xab9bc912, 0xde6008a1, 0x2028da1f,
+		0x0227bce7, 0x4d642916, 0x18fac300, 0x50f18b82, 0x2cb2cb11, 0xb232e75c, 0x4b3695f2, 0xb28707de,
+		0xa05fbcf6, 0xcd4181e9, 0xe150210c, 0xe24ef1bd, 0xb168c381, 0xfde4e789, 0x5c79b0d8, 0x1e8bfd43,
+		0x4d495001, 0x38be4341, 0x913cee1d, 0x92a79c3f, 0x089766be, 0xbaeeadf4, 0x1286becf, 0xb6eacb19,
+		0x2660c200, 0x7565bde4, 0x64241f7a, 0x8248dca9, 0xc3b3ad66, 0x28136086, 0x0bd8dfa8, 0x356d1cf2,
+		0x107789be, 0xb3b2e9ce, 0x0502aa8f, 0x0bc0351e, 0x166bf52a, 0xeb12ff82, 0xe3486911, 0xd34d7516,
+		0x4e7b3aff, 0x5f43671b, 0x9cf6e037, 0x4981ac83, 0x334266ce, 0x8c9341b7, 0xd0d854c0, 0xcb3a6c88,
+		0x47bc2829, 0x4725ba37, 0xa66ad22b, 0x7ad61f1e, 0x0c5cbafa, 0x4437f107, 0xb6e79962, 0x42d2d816,
+		0x0a961288, 0xe1a5c06e, 0x13749e67, 0x72fc081a, 0xb1d139f7, 0xf9583745, 0xcf19df58, 0xbec3f756,
+		0xc06eba30, 0x07211b24, 0x45c28829, 0xc95e317f, 0xbc8ec511, 0x38bc46e9, 0xc6e6fa14, 0xbae8584a,
+		0xad4ebc46, 0x468f508b, 0x7829435f, 0xf124183b, 0x821dba9f, 0xaff60ff4, 0xea2c4e6d, 0x16e39264,
+		0x92544a8b, 0x009b4fc3, 0xaba68ced, 0x9ac96f78, 0x06a5b79a, 0xb2856e6e, 0x1aec3ca9, 0xbe838688,
+		0x0e0804e9, 0x55f1be56, 0xe7e5363b, 0xb3a1f25d, 0xf7debb85, 0x61fe033c, 0x16746233, 0x3c034c28,
+		0xda6d0c74, 0x79aac56c, 0x3ce4e1ad, 0x51f0c802, 0x98f8f35a, 0x1626a49f, 0xeed82b29, 0x1d382fe3,
+		0x0c4fb99a, 0xbb325778, 0x3ec6d97b, 0x6e77a6a9, 0xcb658b5c, 0xd45230c7, 0x2bd1408b, 0x60c03eb7,
+		0xb9068d78, 0xa33754f4, 0xf430c87d, 0xc8a71302, 0xb96d8c32, 0xebd4e7be, 0xbe8b9d2d, 0x7979fb06,
+		0xe7225308, 0x8b75cf77, 0x11ef8da4, 0xe083c858, 0x8d6b786f, 0x5a6317a6, 0xfa5cf7a0, 0x5dda0033,
+		0xf28ebfb0, 0xf5b9c310, 0xa0eac280, 0x08b9767a, 0xa3d9d2b0, 0x79d34217, 0x021a718d, 0x9ac6336a,
+		0x2711fd60, 0x438050e3, 0x069908a8, 0x3d7fedc4, 0x826d2bef, 0x4eeb8476, 0x488dcf25, 0x36c9d566,
+		0x28e74e41, 0xc2610aca, 0x3d49a9cf, 0xbae3b9df, 0xb65f8de6, 0x92aeaf64, 0x3ac7d5e6, 0x9ea80509,
+		0xf22b017d, 0xa4173f70, 0xdd1e16c3, 0x15e0d7f9, 0x50b1b887, 0x2b9f4fd5, 0x625aba82, 0x6a017962,
+		0x2ec01b9c, 0x15488aa9, 0xd716e740, 0x40055a2c, 0x93d29a22, 0xe32dbf9a, 0x058745b9, 0x3453dc1e,
+		0xd699296e, 0x496cff6f, 0x1c9f4986, 0xdfe2ed07, 0xb87242d1, 0x19de7eae, 0x053e561a, 0x15ad6f8c,
+		0x66626c1c, 0x7154c24c, 0xea082b2a, 0x93eb2939, 0x17dcb0f0, 0x58d4f2ae, 0x9ea294fb, 0x52cf564c,
+		0x9883fe66, 0x2ec40581, 0x763953c3, 0x01d6692e, 0xd3a0c108, 0xa1e7160e, 0xe4f2dfa6, 0x693ed285,
+		0x74904698, 0x4c2b0edd, 0x4f757656, 0x5d393378, 0xa132234f, 0x3d321c5d, 0xc3f5e194, 0x4b269301,
+		0xc79f022f, 0x3c997e7e, 0x5e4f9504, 0x3ffafbbd, 0x76f7ad0e, 0x296693f4, 0x3d1fce6f, 0xc61e45be,
+		0xd3b5ab34, 0xf72bf9b7, 0x1b0434c0, 0x4e72b567, 0x5592a33d, 0xb5229301, 0xcfd2a87f, 0x60aeb767,
+		0x1814386b, 0x30bcc33d, 0x38a0c07d, 0xfd1606f2, 0xc363519b, 0x589dd390, 0x5479f8e6, 0x1cb8d647,
+		0x97fd61a9, 0xea7759f4, 0x2d57539d, 0x569a58cf, 0xe84e63ad, 0x462e1b78, 0x6580f87e, 0xf3817914,
+		0x91da55f4, 0x40a230f3, 0xd1988f35, 0xb6e318d2, 0x3ffa50bc, 0x3d40f021, 0xc3c0bdae, 0x4958c24c,
+		0x518f36b2, 0x84b1d370, 0x0fedce83, 0x878ddada, 0xf2a279c7, 0x94e01be8, 0x90716f4b, 0x954b8aa3,
+	},
+	{
+		0xe216300d, 0xbbddfffc, 0xa7ebdabd, 0x35648095, 0x7789f8b7, 0xe6c1121b, 0x0e241600, 0x052ce8b5,
+		0x11a9cfb0, 0xe5952f11, 0xece7990a, 0x9386d174, 0x2a42931c, 0x76e38111, 0xb12def3a, 0x37ddddfc,
+		0xde9adeb1, 0x0a0cc32c, 0xbe197029, 0x84a00940, 0xbb243a0f, 0xb4d137cf, 0xb44e79f0, 0x049eedfd,
+		0x0b15a15d, 0x480d3168, 0x8bbbde5a, 0x669ded42, 0xc7ece831, 0x3f8f95e7, 0x72df191b, 0x7580330d,
+		0x94074251, 0x5c7dcdfa, 0xabbe6d63, 0xaa402164, 0xb301d40a, 0x02e7d1ca, 0x53571dae, 0x7a3182a2,
+		0x12a8ddec, 0xfdaa335d, 0x176f43e8, 0x71fb46d4, 0x38129022, 0xce949ad4, 0xb84769ad, 0x965bd862,
+		0x82f3d055, 0x66fb9767, 0x15b80b4e, 0x1d5b47a0, 0x4cfde06f, 0xc28ec4b8, 0x57e8726e, 0x647a78fc,
+		0x99865d44, 0x608bd593, 0x6c200e03, 0x39dc5ff6, 0x5d0b00a3, 0xae63aff2, 0x7e8bd632, 0x70108c0c,
+		0xbbd35049, 0x2998df04, 0x980cf42a, 0x9b6df491, 0x9e7edd53, 0x06918548, 0x58cb7e07, 0x3b74ef2e,
+		0x522fffb1, 0xd24708cc, 0x1c7e27cd, 0xa4eb215b, 0x3cf1d2e2, 0x19b47a38, 0x424f7618, 0x35856039,
+		0x9d17dee7, 0x27eb35e6, 0xc9aff67b, 0x36baf5b8, 0x09c467cd, 0xc18910b1, 0xe11dbf7b, 0x06cd1af8,
+		0x7170c608, 0x2d5e3354, 0xd4de495a, 0x64c6d006, 0xbcc0c62c, 0x3dd00db3, 0x708f8f34, 0x77d51b42,
+		0x264f620f, 0x24b8d2bf, 0x15c1b79e, 0x46a52564, 0xf8d7e54e, 0x3e378160, 0x7895cda5, 0x859c15a5,
+		0xe6459788, 0xc37bc75f, 0xdb07ba0c, 0x0676a3ab, 0x7f229b1e, 0x31842e7b, 0x24259fd7, 0xf8bef472,
+		0x835ffcb8, 0x6df4c1f2, 0x96f5b195, 0xfd0af0fc, 0xb0fe134c, 0xe2506d3d, 0x4f9b12ea, 0xf215f225,
+		0xa223736f, 0x9fb4c428, 0x25d04979, 0x34c713f8, 0xc4618187, 0xea7a6e98, 0x7cd16efc, 0x1436876c,
+		0xf1544107, 0xbedeee14, 0x56e9af27, 0xa04aa441, 0x3cf7c899, 0x92ecbae6, 0xdd67016d, 0x151682eb,
+		0xa842eedf, 0xfdba60b4, 0xf1907b75, 0x20e3030f, 0x24d8c29e, 0xe139673b, 0xefa63fb8, 0x71873054,
+		0xb6f2cf3b, 0x9f326442, 0xcb15a4cc, 0xb01a4504, 0xf1e47d8d, 0x844a1be5, 0xbae7dfdc, 0x42cbda70,
+		0xcd7dae0a, 0x57e85b7a, 0xd53f5af6, 0x20cf4d8c, 0xcea4d428, 0x79d130a4, 0x3486ebfb, 0x33d3cddc,
+		0x77853b53, 0x37effcb5, 0xc5068778, 0xe580b3e6, 0x4e68b8f4, 0xc5c8b37e, 0x0d809ea2, 0x398feb7c,
+		0x132a4f94, 0x43b7950e, 0x2fee7d1c, 0x223613bd, 0xdd06caa2, 0x37df932b, 0xc4248289, 0xacf3ebc3,
+		0x5715f6b7, 0xef3478dd, 0xf267616f, 0xc148cbe4, 0x9052815e, 0x5e410fab, 0xb48a2465, 0x2eda7fa4,
+		0xe87b40e4, 0xe98ea084, 0x5889e9e1, 0xefd390fc, 0xdd07d35b, 0xdb485694, 0x38d7e5b2, 0x57720101,
+		0x730edebc, 0x5b643113, 0x94917e4f, 0x503c2fba, 0x646f1282, 0x7523d24a, 0xe0779695, 0xf9c17a8f,
+		0x7a5b2121, 0xd187b896, 0x29263a4d, 0xba510cdf, 0x81f47c9f, 0xad1163ed, 0xea7b5965, 0x1a00726e,
+		0x11403092, 0x00da6d77, 0x4a0cdd61, 0xad1f4603, 0x605bdfb0, 0x9eedc364, 0x22ebe6a8, 0xcee7d28a,
+		0xa0e736a0, 0x5564a6b9, 0x10853209, 0xc7eb8f37, 0x2de705ca, 0x8951570f, 0xdf09822b, 0xbd691a6c,
+		0xaa12e4f2, 0x87451c0f, 0xe0f6a27a, 0x3ada4819, 0x4cf1764f, 0x0d771c2b, 0x67cdb156, 0x350d8384,
+		0x5938fa0f, 0x42399ef3, 0x36997b07, 0x0e84093d, 0x4aa93e61, 0x8360d87b, 0x1fa98b0c, 0x1149382c,
+		0xe97625a5, 0x0614d1b7, 0x0e25244b, 0x0c768347, 0x589e8d82, 0x0d2059d1, 0xa466bb1e, 0xf8da0a82,
+		0x04f19130, 0xba6e4ec0, 0x99265164, 0x1ee7230d, 0x50b2ad80, 0xeaee6801, 0x8db2a283, 0xea8bf59e,
+	},
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/armor/armor.go b/vendor/golang.org/x/crypto/openpgp/armor/armor.go
new file mode 100644
index 0000000000..592d186436
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/armor/armor.go
@@ -0,0 +1,219 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package armor implements OpenPGP ASCII Armor, see RFC 4880. OpenPGP Armor is
+// very similar to PEM except that it has an additional CRC checksum.
+package armor // import "golang.org/x/crypto/openpgp/armor"
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/base64"
+	"golang.org/x/crypto/openpgp/errors"
+	"io"
+)
+
+// A Block represents an OpenPGP armored structure.
+//
+// The encoded form is:
+//    -----BEGIN Type-----
+//    Headers
+//
+//    base64-encoded Bytes
+//    '=' base64 encoded checksum
+//    -----END Type-----
+// where Headers is a possibly empty sequence of Key: Value lines.
+//
+// Since the armored data can be very large, this package presents a streaming
+// interface.
+type Block struct {
+	Type    string            // The type, taken from the preamble (i.e. "PGP SIGNATURE").
+	Header  map[string]string // Optional headers.
+	Body    io.Reader         // A Reader from which the contents can be read
+	lReader lineReader
+	oReader openpgpReader
+}
+
+var ArmorCorrupt error = errors.StructuralError("armor invalid")
+
+const crc24Init = 0xb704ce
+const crc24Poly = 0x1864cfb
+const crc24Mask = 0xffffff
+
+// crc24 calculates the OpenPGP checksum as specified in RFC 4880, section 6.1
+func crc24(crc uint32, d []byte) uint32 {
+	for _, b := range d {
+		crc ^= uint32(b) << 16
+		for i := 0; i < 8; i++ {
+			crc <<= 1
+			if crc&0x1000000 != 0 {
+				crc ^= crc24Poly
+			}
+		}
+	}
+	return crc
+}
+
+var armorStart = []byte("-----BEGIN ")
+var armorEnd = []byte("-----END ")
+var armorEndOfLine = []byte("-----")
+
+// lineReader wraps a line based reader. It watches for the end of an armor
+// block and records the expected CRC value.
+type lineReader struct {
+	in  *bufio.Reader
+	buf []byte
+	eof bool
+	crc uint32
+}
+
+func (l *lineReader) Read(p []byte) (n int, err error) {
+	if l.eof {
+		return 0, io.EOF
+	}
+
+	if len(l.buf) > 0 {
+		n = copy(p, l.buf)
+		l.buf = l.buf[n:]
+		return
+	}
+
+	line, isPrefix, err := l.in.ReadLine()
+	if err != nil {
+		return
+	}
+	if isPrefix {
+		return 0, ArmorCorrupt
+	}
+
+	if len(line) == 5 && line[0] == '=' {
+		// This is the checksum line
+		var expectedBytes [3]byte
+		var m int
+		m, err = base64.StdEncoding.Decode(expectedBytes[0:], line[1:])
+		if m != 3 || err != nil {
+			return
+		}
+		l.crc = uint32(expectedBytes[0])<<16 |
+			uint32(expectedBytes[1])<<8 |
+			uint32(expectedBytes[2])
+
+		line, _, err = l.in.ReadLine()
+		if err != nil && err != io.EOF {
+			return
+		}
+		if !bytes.HasPrefix(line, armorEnd) {
+			return 0, ArmorCorrupt
+		}
+
+		l.eof = true
+		return 0, io.EOF
+	}
+
+	if len(line) > 96 {
+		return 0, ArmorCorrupt
+	}
+
+	n = copy(p, line)
+	bytesToSave := len(line) - n
+	if bytesToSave > 0 {
+		if cap(l.buf) < bytesToSave {
+			l.buf = make([]byte, 0, bytesToSave)
+		}
+		l.buf = l.buf[0:bytesToSave]
+		copy(l.buf, line[n:])
+	}
+
+	return
+}
+
+// openpgpReader passes Read calls to the underlying base64 decoder, but keeps
+// a running CRC of the resulting data and checks the CRC against the value
+// found by the lineReader at EOF.
+type openpgpReader struct {
+	lReader    *lineReader
+	b64Reader  io.Reader
+	currentCRC uint32
+}
+
+func (r *openpgpReader) Read(p []byte) (n int, err error) {
+	n, err = r.b64Reader.Read(p)
+	r.currentCRC = crc24(r.currentCRC, p[:n])
+
+	if err == io.EOF {
+		if r.lReader.crc != uint32(r.currentCRC&crc24Mask) {
+			return 0, ArmorCorrupt
+		}
+	}
+
+	return
+}
+
+// Decode reads a PGP armored block from the given Reader. It will ignore
+// leading garbage. If it doesn't find a block, it will return nil, io.EOF. The
+// given Reader is not usable after calling this function: an arbitrary amount
+// of data may have been read past the end of the block.
+func Decode(in io.Reader) (p *Block, err error) {
+	r := bufio.NewReaderSize(in, 100)
+	var line []byte
+	ignoreNext := false
+
+TryNextBlock:
+	p = nil
+
+	// Skip leading garbage
+	for {
+		ignoreThis := ignoreNext
+		line, ignoreNext, err = r.ReadLine()
+		if err != nil {
+			return
+		}
+		if ignoreNext || ignoreThis {
+			continue
+		}
+		line = bytes.TrimSpace(line)
+		if len(line) > len(armorStart)+len(armorEndOfLine) && bytes.HasPrefix(line, armorStart) {
+			break
+		}
+	}
+
+	p = new(Block)
+	p.Type = string(line[len(armorStart) : len(line)-len(armorEndOfLine)])
+	p.Header = make(map[string]string)
+	nextIsContinuation := false
+	var lastKey string
+
+	// Read headers
+	for {
+		isContinuation := nextIsContinuation
+		line, nextIsContinuation, err = r.ReadLine()
+		if err != nil {
+			p = nil
+			return
+		}
+		if isContinuation {
+			p.Header[lastKey] += string(line)
+			continue
+		}
+		line = bytes.TrimSpace(line)
+		if len(line) == 0 {
+			break
+		}
+
+		i := bytes.Index(line, []byte(": "))
+		if i == -1 {
+			goto TryNextBlock
+		}
+		lastKey = string(line[:i])
+		p.Header[lastKey] = string(line[i+2:])
+	}
+
+	p.lReader.in = r
+	p.oReader.currentCRC = crc24Init
+	p.oReader.lReader = &p.lReader
+	p.oReader.b64Reader = base64.NewDecoder(base64.StdEncoding, &p.lReader)
+	p.Body = &p.oReader
+
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/armor/encode.go b/vendor/golang.org/x/crypto/openpgp/armor/encode.go
new file mode 100644
index 0000000000..6f07582c37
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/armor/encode.go
@@ -0,0 +1,160 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package armor
+
+import (
+	"encoding/base64"
+	"io"
+)
+
+var armorHeaderSep = []byte(": ")
+var blockEnd = []byte("\n=")
+var newline = []byte("\n")
+var armorEndOfLineOut = []byte("-----\n")
+
+// writeSlices writes its arguments to the given Writer.
+func writeSlices(out io.Writer, slices ...[]byte) (err error) {
+	for _, s := range slices {
+		_, err = out.Write(s)
+		if err != nil {
+			return err
+		}
+	}
+	return
+}
+
+// lineBreaker breaks data across several lines, all of the same byte length
+// (except possibly the last). Lines are broken with a single '\n'.
+type lineBreaker struct {
+	lineLength  int
+	line        []byte
+	used        int
+	out         io.Writer
+	haveWritten bool
+}
+
+func newLineBreaker(out io.Writer, lineLength int) *lineBreaker {
+	return &lineBreaker{
+		lineLength: lineLength,
+		line:       make([]byte, lineLength),
+		used:       0,
+		out:        out,
+	}
+}
+
+func (l *lineBreaker) Write(b []byte) (n int, err error) {
+	n = len(b)
+
+	if n == 0 {
+		return
+	}
+
+	if l.used == 0 && l.haveWritten {
+		_, err = l.out.Write([]byte{'\n'})
+		if err != nil {
+			return
+		}
+	}
+
+	if l.used+len(b) < l.lineLength {
+		l.used += copy(l.line[l.used:], b)
+		return
+	}
+
+	l.haveWritten = true
+	_, err = l.out.Write(l.line[0:l.used])
+	if err != nil {
+		return
+	}
+	excess := l.lineLength - l.used
+	l.used = 0
+
+	_, err = l.out.Write(b[0:excess])
+	if err != nil {
+		return
+	}
+
+	_, err = l.Write(b[excess:])
+	return
+}
+
+func (l *lineBreaker) Close() (err error) {
+	if l.used > 0 {
+		_, err = l.out.Write(l.line[0:l.used])
+		if err != nil {
+			return
+		}
+	}
+
+	return
+}
+
+// encoding keeps track of a running CRC24 over the data which has been written
+// to it and outputs a OpenPGP checksum when closed, followed by an armor
+// trailer.
+//
+// It's built into a stack of io.Writers:
+//    encoding -> base64 encoder -> lineBreaker -> out
+type encoding struct {
+	out       io.Writer
+	breaker   *lineBreaker
+	b64       io.WriteCloser
+	crc       uint32
+	blockType []byte
+}
+
+func (e *encoding) Write(data []byte) (n int, err error) {
+	e.crc = crc24(e.crc, data)
+	return e.b64.Write(data)
+}
+
+func (e *encoding) Close() (err error) {
+	err = e.b64.Close()
+	if err != nil {
+		return
+	}
+	e.breaker.Close()
+
+	var checksumBytes [3]byte
+	checksumBytes[0] = byte(e.crc >> 16)
+	checksumBytes[1] = byte(e.crc >> 8)
+	checksumBytes[2] = byte(e.crc)
+
+	var b64ChecksumBytes [4]byte
+	base64.StdEncoding.Encode(b64ChecksumBytes[:], checksumBytes[:])
+
+	return writeSlices(e.out, blockEnd, b64ChecksumBytes[:], newline, armorEnd, e.blockType, armorEndOfLine)
+}
+
+// Encode returns a WriteCloser which will encode the data written to it in
+// OpenPGP armor.
+func Encode(out io.Writer, blockType string, headers map[string]string) (w io.WriteCloser, err error) {
+	bType := []byte(blockType)
+	err = writeSlices(out, armorStart, bType, armorEndOfLineOut)
+	if err != nil {
+		return
+	}
+
+	for k, v := range headers {
+		err = writeSlices(out, []byte(k), armorHeaderSep, []byte(v), newline)
+		if err != nil {
+			return
+		}
+	}
+
+	_, err = out.Write(newline)
+	if err != nil {
+		return
+	}
+
+	e := &encoding{
+		out:       out,
+		breaker:   newLineBreaker(out, 64),
+		crc:       crc24Init,
+		blockType: bType,
+	}
+	e.b64 = base64.NewEncoder(base64.StdEncoding, e.breaker)
+	return e, nil
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/canonical_text.go b/vendor/golang.org/x/crypto/openpgp/canonical_text.go
new file mode 100644
index 0000000000..e601e389f1
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/canonical_text.go
@@ -0,0 +1,59 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package openpgp
+
+import "hash"
+
+// NewCanonicalTextHash reformats text written to it into the canonical
+// form and then applies the hash h.  See RFC 4880, section 5.2.1.
+func NewCanonicalTextHash(h hash.Hash) hash.Hash {
+	return &canonicalTextHash{h, 0}
+}
+
+type canonicalTextHash struct {
+	h hash.Hash
+	s int
+}
+
+var newline = []byte{'\r', '\n'}
+
+func (cth *canonicalTextHash) Write(buf []byte) (int, error) {
+	start := 0
+
+	for i, c := range buf {
+		switch cth.s {
+		case 0:
+			if c == '\r' {
+				cth.s = 1
+			} else if c == '\n' {
+				cth.h.Write(buf[start:i])
+				cth.h.Write(newline)
+				start = i + 1
+			}
+		case 1:
+			cth.s = 0
+		}
+	}
+
+	cth.h.Write(buf[start:])
+	return len(buf), nil
+}
+
+func (cth *canonicalTextHash) Sum(in []byte) []byte {
+	return cth.h.Sum(in)
+}
+
+func (cth *canonicalTextHash) Reset() {
+	cth.h.Reset()
+	cth.s = 0
+}
+
+func (cth *canonicalTextHash) Size() int {
+	return cth.h.Size()
+}
+
+func (cth *canonicalTextHash) BlockSize() int {
+	return cth.h.BlockSize()
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go b/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go
new file mode 100644
index 0000000000..73f4fe3785
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go
@@ -0,0 +1,122 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package elgamal implements ElGamal encryption, suitable for OpenPGP,
+// as specified in "A Public-Key Cryptosystem and a Signature Scheme Based on
+// Discrete Logarithms," IEEE Transactions on Information Theory, v. IT-31,
+// n. 4, 1985, pp. 469-472.
+//
+// This form of ElGamal embeds PKCS#1 v1.5 padding, which may make it
+// unsuitable for other protocols. RSA should be used in preference in any
+// case.
+package elgamal // import "golang.org/x/crypto/openpgp/elgamal"
+
+import (
+	"crypto/rand"
+	"crypto/subtle"
+	"errors"
+	"io"
+	"math/big"
+)
+
+// PublicKey represents an ElGamal public key.
+type PublicKey struct {
+	G, P, Y *big.Int
+}
+
+// PrivateKey represents an ElGamal private key.
+type PrivateKey struct {
+	PublicKey
+	X *big.Int
+}
+
+// Encrypt encrypts the given message to the given public key. The result is a
+// pair of integers. Errors can result from reading random, or because msg is
+// too large to be encrypted to the public key.
+func Encrypt(random io.Reader, pub *PublicKey, msg []byte) (c1, c2 *big.Int, err error) {
+	pLen := (pub.P.BitLen() + 7) / 8
+	if len(msg) > pLen-11 {
+		err = errors.New("elgamal: message too long")
+		return
+	}
+
+	// EM = 0x02 || PS || 0x00 || M
+	em := make([]byte, pLen-1)
+	em[0] = 2
+	ps, mm := em[1:len(em)-len(msg)-1], em[len(em)-len(msg):]
+	err = nonZeroRandomBytes(ps, random)
+	if err != nil {
+		return
+	}
+	em[len(em)-len(msg)-1] = 0
+	copy(mm, msg)
+
+	m := new(big.Int).SetBytes(em)
+
+	k, err := rand.Int(random, pub.P)
+	if err != nil {
+		return
+	}
+
+	c1 = new(big.Int).Exp(pub.G, k, pub.P)
+	s := new(big.Int).Exp(pub.Y, k, pub.P)
+	c2 = s.Mul(s, m)
+	c2.Mod(c2, pub.P)
+
+	return
+}
+
+// Decrypt takes two integers, resulting from an ElGamal encryption, and
+// returns the plaintext of the message. An error can result only if the
+// ciphertext is invalid. Users should keep in mind that this is a padding
+// oracle and thus, if exposed to an adaptive chosen ciphertext attack, can
+// be used to break the cryptosystem.  See ``Chosen Ciphertext Attacks
+// Against Protocols Based on the RSA Encryption Standard PKCS #1'', Daniel
+// Bleichenbacher, Advances in Cryptology (Crypto '98),
+func Decrypt(priv *PrivateKey, c1, c2 *big.Int) (msg []byte, err error) {
+	s := new(big.Int).Exp(c1, priv.X, priv.P)
+	s.ModInverse(s, priv.P)
+	s.Mul(s, c2)
+	s.Mod(s, priv.P)
+	em := s.Bytes()
+
+	firstByteIsTwo := subtle.ConstantTimeByteEq(em[0], 2)
+
+	// The remainder of the plaintext must be a string of non-zero random
+	// octets, followed by a 0, followed by the message.
+	//   lookingForIndex: 1 iff we are still looking for the zero.
+	//   index: the offset of the first zero byte.
+	var lookingForIndex, index int
+	lookingForIndex = 1
+
+	for i := 1; i < len(em); i++ {
+		equals0 := subtle.ConstantTimeByteEq(em[i], 0)
+		index = subtle.ConstantTimeSelect(lookingForIndex&equals0, i, index)
+		lookingForIndex = subtle.ConstantTimeSelect(equals0, 0, lookingForIndex)
+	}
+
+	if firstByteIsTwo != 1 || lookingForIndex != 0 || index < 9 {
+		return nil, errors.New("elgamal: decryption error")
+	}
+	return em[index+1:], nil
+}
+
+// nonZeroRandomBytes fills the given slice with non-zero random octets.
+func nonZeroRandomBytes(s []byte, rand io.Reader) (err error) {
+	_, err = io.ReadFull(rand, s)
+	if err != nil {
+		return
+	}
+
+	for i := 0; i < len(s); i++ {
+		for s[i] == 0 {
+			_, err = io.ReadFull(rand, s[i:i+1])
+			if err != nil {
+				return
+			}
+		}
+	}
+
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/errors/errors.go b/vendor/golang.org/x/crypto/openpgp/errors/errors.go
new file mode 100644
index 0000000000..eb0550b2d0
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/errors/errors.go
@@ -0,0 +1,72 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package errors contains common error types for the OpenPGP packages.
+package errors // import "golang.org/x/crypto/openpgp/errors"
+
+import (
+	"strconv"
+)
+
+// A StructuralError is returned when OpenPGP data is found to be syntactically
+// invalid.
+type StructuralError string
+
+func (s StructuralError) Error() string {
+	return "openpgp: invalid data: " + string(s)
+}
+
+// UnsupportedError indicates that, although the OpenPGP data is valid, it
+// makes use of currently unimplemented features.
+type UnsupportedError string
+
+func (s UnsupportedError) Error() string {
+	return "openpgp: unsupported feature: " + string(s)
+}
+
+// InvalidArgumentError indicates that the caller is in error and passed an
+// incorrect value.
+type InvalidArgumentError string
+
+func (i InvalidArgumentError) Error() string {
+	return "openpgp: invalid argument: " + string(i)
+}
+
+// SignatureError indicates that a syntactically valid signature failed to
+// validate.
+type SignatureError string
+
+func (b SignatureError) Error() string {
+	return "openpgp: invalid signature: " + string(b)
+}
+
+type keyIncorrectError int
+
+func (ki keyIncorrectError) Error() string {
+	return "openpgp: incorrect key"
+}
+
+var ErrKeyIncorrect error = keyIncorrectError(0)
+
+type unknownIssuerError int
+
+func (unknownIssuerError) Error() string {
+	return "openpgp: signature made by unknown entity"
+}
+
+var ErrUnknownIssuer error = unknownIssuerError(0)
+
+type keyRevokedError int
+
+func (keyRevokedError) Error() string {
+	return "openpgp: signature made by revoked key"
+}
+
+var ErrKeyRevoked error = keyRevokedError(0)
+
+type UnknownPacketTypeError uint8
+
+func (upte UnknownPacketTypeError) Error() string {
+	return "openpgp: unknown packet type: " + strconv.Itoa(int(upte))
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/keys.go b/vendor/golang.org/x/crypto/openpgp/keys.go
new file mode 100644
index 0000000000..c4a6640fb8
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/keys.go
@@ -0,0 +1,624 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package openpgp
+
+import (
+	"crypto/rsa"
+	"golang.org/x/crypto/openpgp/armor"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/packet"
+	"io"
+	"time"
+)
+
+// PublicKeyType is the armor type for a PGP public key.
+var PublicKeyType = "PGP PUBLIC KEY BLOCK"
+
+// PrivateKeyType is the armor type for a PGP private key.
+var PrivateKeyType = "PGP PRIVATE KEY BLOCK"
+
+// An Entity represents the components of an OpenPGP key: a primary public key
+// (which must be a signing key), one or more identities claimed by that key,
+// and zero or more subkeys, which may be encryption keys.
+type Entity struct {
+	PrimaryKey  *packet.PublicKey
+	PrivateKey  *packet.PrivateKey
+	Identities  map[string]*Identity // indexed by Identity.Name
+	Revocations []*packet.Signature
+	Subkeys     []Subkey
+}
+
+// An Identity represents an identity claimed by an Entity and zero or more
+// assertions by other entities about that claim.
+type Identity struct {
+	Name          string // by convention, has the form "Full Name (comment) <email@example.com>"
+	UserId        *packet.UserId
+	SelfSignature *packet.Signature
+	Signatures    []*packet.Signature
+}
+
+// A Subkey is an additional public key in an Entity. Subkeys can be used for
+// encryption.
+type Subkey struct {
+	PublicKey  *packet.PublicKey
+	PrivateKey *packet.PrivateKey
+	Sig        *packet.Signature
+}
+
+// A Key identifies a specific public key in an Entity. This is either the
+// Entity's primary key or a subkey.
+type Key struct {
+	Entity        *Entity
+	PublicKey     *packet.PublicKey
+	PrivateKey    *packet.PrivateKey
+	SelfSignature *packet.Signature
+}
+
+// A KeyRing provides access to public and private keys.
+type KeyRing interface {
+	// KeysById returns the set of keys that have the given key id.
+	KeysById(id uint64) []Key
+	// KeysByIdAndUsage returns the set of keys with the given id
+	// that also meet the key usage given by requiredUsage.
+	// The requiredUsage is expressed as the bitwise-OR of
+	// packet.KeyFlag* values.
+	KeysByIdUsage(id uint64, requiredUsage byte) []Key
+	// DecryptionKeys returns all private keys that are valid for
+	// decryption.
+	DecryptionKeys() []Key
+}
+
+// primaryIdentity returns the Identity marked as primary or the first identity
+// if none are so marked.
+func (e *Entity) primaryIdentity() *Identity {
+	var firstIdentity *Identity
+	for _, ident := range e.Identities {
+		if firstIdentity == nil {
+			firstIdentity = ident
+		}
+		if ident.SelfSignature.IsPrimaryId != nil && *ident.SelfSignature.IsPrimaryId {
+			return ident
+		}
+	}
+	return firstIdentity
+}
+
+// encryptionKey returns the best candidate Key for encrypting a message to the
+// given Entity.
+func (e *Entity) encryptionKey(now time.Time) (Key, bool) {
+	candidateSubkey := -1
+
+	for i, subkey := range e.Subkeys {
+		if subkey.Sig.FlagsValid &&
+			subkey.Sig.FlagEncryptCommunications &&
+			subkey.PublicKey.PubKeyAlgo.CanEncrypt() &&
+			!subkey.Sig.KeyExpired(now) {
+			candidateSubkey = i
+			break
+		}
+	}
+
+	if candidateSubkey != -1 {
+		subkey := e.Subkeys[candidateSubkey]
+		return Key{e, subkey.PublicKey, subkey.PrivateKey, subkey.Sig}, true
+	}
+
+	// If we don't have any candidate subkeys for encryption and
+	// the primary key doesn't have any usage metadata then we
+	// assume that the primary key is ok. Or, if the primary key is
+	// marked as ok to encrypt to, then we can obviously use it.
+	i := e.primaryIdentity()
+	if !i.SelfSignature.FlagsValid || i.SelfSignature.FlagEncryptCommunications &&
+		e.PrimaryKey.PubKeyAlgo.CanEncrypt() &&
+		!i.SelfSignature.KeyExpired(now) {
+		return Key{e, e.PrimaryKey, e.PrivateKey, i.SelfSignature}, true
+	}
+
+	// This Entity appears to be signing only.
+	return Key{}, false
+}
+
+// signingKey return the best candidate Key for signing a message with this
+// Entity.
+func (e *Entity) signingKey(now time.Time) (Key, bool) {
+	candidateSubkey := -1
+
+	for i, subkey := range e.Subkeys {
+		if subkey.Sig.FlagsValid &&
+			subkey.Sig.FlagSign &&
+			subkey.PublicKey.PubKeyAlgo.CanSign() &&
+			!subkey.Sig.KeyExpired(now) {
+			candidateSubkey = i
+			break
+		}
+	}
+
+	if candidateSubkey != -1 {
+		subkey := e.Subkeys[candidateSubkey]
+		return Key{e, subkey.PublicKey, subkey.PrivateKey, subkey.Sig}, true
+	}
+
+	// If we have no candidate subkey then we assume that it's ok to sign
+	// with the primary key.
+	i := e.primaryIdentity()
+	if !i.SelfSignature.FlagsValid || i.SelfSignature.FlagSign &&
+		!i.SelfSignature.KeyExpired(now) {
+		return Key{e, e.PrimaryKey, e.PrivateKey, i.SelfSignature}, true
+	}
+
+	return Key{}, false
+}
+
+// An EntityList contains one or more Entities.
+type EntityList []*Entity
+
+// KeysById returns the set of keys that have the given key id.
+func (el EntityList) KeysById(id uint64) (keys []Key) {
+	for _, e := range el {
+		if e.PrimaryKey.KeyId == id {
+			var selfSig *packet.Signature
+			for _, ident := range e.Identities {
+				if selfSig == nil {
+					selfSig = ident.SelfSignature
+				} else if ident.SelfSignature.IsPrimaryId != nil && *ident.SelfSignature.IsPrimaryId {
+					selfSig = ident.SelfSignature
+					break
+				}
+			}
+			keys = append(keys, Key{e, e.PrimaryKey, e.PrivateKey, selfSig})
+		}
+
+		for _, subKey := range e.Subkeys {
+			if subKey.PublicKey.KeyId == id {
+				keys = append(keys, Key{e, subKey.PublicKey, subKey.PrivateKey, subKey.Sig})
+			}
+		}
+	}
+	return
+}
+
+// KeysByIdAndUsage returns the set of keys with the given id that also meet
+// the key usage given by requiredUsage.  The requiredUsage is expressed as
+// the bitwise-OR of packet.KeyFlag* values.
+func (el EntityList) KeysByIdUsage(id uint64, requiredUsage byte) (keys []Key) {
+	for _, key := range el.KeysById(id) {
+		if len(key.Entity.Revocations) > 0 {
+			continue
+		}
+
+		if key.SelfSignature.RevocationReason != nil {
+			continue
+		}
+
+		if key.SelfSignature.FlagsValid && requiredUsage != 0 {
+			var usage byte
+			if key.SelfSignature.FlagCertify {
+				usage |= packet.KeyFlagCertify
+			}
+			if key.SelfSignature.FlagSign {
+				usage |= packet.KeyFlagSign
+			}
+			if key.SelfSignature.FlagEncryptCommunications {
+				usage |= packet.KeyFlagEncryptCommunications
+			}
+			if key.SelfSignature.FlagEncryptStorage {
+				usage |= packet.KeyFlagEncryptStorage
+			}
+			if usage&requiredUsage != requiredUsage {
+				continue
+			}
+		}
+
+		keys = append(keys, key)
+	}
+	return
+}
+
+// DecryptionKeys returns all private keys that are valid for decryption.
+func (el EntityList) DecryptionKeys() (keys []Key) {
+	for _, e := range el {
+		for _, subKey := range e.Subkeys {
+			if subKey.PrivateKey != nil && (!subKey.Sig.FlagsValid || subKey.Sig.FlagEncryptStorage || subKey.Sig.FlagEncryptCommunications) {
+				keys = append(keys, Key{e, subKey.PublicKey, subKey.PrivateKey, subKey.Sig})
+			}
+		}
+	}
+	return
+}
+
+// ReadArmoredKeyRing reads one or more public/private keys from an armor keyring file.
+func ReadArmoredKeyRing(r io.Reader) (EntityList, error) {
+	block, err := armor.Decode(r)
+	if err == io.EOF {
+		return nil, errors.InvalidArgumentError("no armored data found")
+	}
+	if err != nil {
+		return nil, err
+	}
+	if block.Type != PublicKeyType && block.Type != PrivateKeyType {
+		return nil, errors.InvalidArgumentError("expected public or private key block, got: " + block.Type)
+	}
+
+	return ReadKeyRing(block.Body)
+}
+
+// ReadKeyRing reads one or more public/private keys. Unsupported keys are
+// ignored as long as at least a single valid key is found.
+func ReadKeyRing(r io.Reader) (el EntityList, err error) {
+	packets := packet.NewReader(r)
+	var lastUnsupportedError error
+
+	for {
+		var e *Entity
+		e, err = ReadEntity(packets)
+		if err != nil {
+			// TODO: warn about skipped unsupported/unreadable keys
+			if _, ok := err.(errors.UnsupportedError); ok {
+				lastUnsupportedError = err
+				err = readToNextPublicKey(packets)
+			} else if _, ok := err.(errors.StructuralError); ok {
+				// Skip unreadable, badly-formatted keys
+				lastUnsupportedError = err
+				err = readToNextPublicKey(packets)
+			}
+			if err == io.EOF {
+				err = nil
+				break
+			}
+			if err != nil {
+				el = nil
+				break
+			}
+		} else {
+			el = append(el, e)
+		}
+	}
+
+	if len(el) == 0 && err == nil {
+		err = lastUnsupportedError
+	}
+	return
+}
+
+// readToNextPublicKey reads packets until the start of the entity and leaves
+// the first packet of the new entity in the Reader.
+func readToNextPublicKey(packets *packet.Reader) (err error) {
+	var p packet.Packet
+	for {
+		p, err = packets.Next()
+		if err == io.EOF {
+			return
+		} else if err != nil {
+			if _, ok := err.(errors.UnsupportedError); ok {
+				err = nil
+				continue
+			}
+			return
+		}
+
+		if pk, ok := p.(*packet.PublicKey); ok && !pk.IsSubkey {
+			packets.Unread(p)
+			return
+		}
+	}
+
+	panic("unreachable")
+}
+
+// ReadEntity reads an entity (public key, identities, subkeys etc) from the
+// given Reader.
+func ReadEntity(packets *packet.Reader) (*Entity, error) {
+	e := new(Entity)
+	e.Identities = make(map[string]*Identity)
+
+	p, err := packets.Next()
+	if err != nil {
+		return nil, err
+	}
+
+	var ok bool
+	if e.PrimaryKey, ok = p.(*packet.PublicKey); !ok {
+		if e.PrivateKey, ok = p.(*packet.PrivateKey); !ok {
+			packets.Unread(p)
+			return nil, errors.StructuralError("first packet was not a public/private key")
+		} else {
+			e.PrimaryKey = &e.PrivateKey.PublicKey
+		}
+	}
+
+	if !e.PrimaryKey.PubKeyAlgo.CanSign() {
+		return nil, errors.StructuralError("primary key cannot be used for signatures")
+	}
+
+	var current *Identity
+	var revocations []*packet.Signature
+EachPacket:
+	for {
+		p, err := packets.Next()
+		if err == io.EOF {
+			break
+		} else if err != nil {
+			return nil, err
+		}
+
+		switch pkt := p.(type) {
+		case *packet.UserId:
+			current = new(Identity)
+			current.Name = pkt.Id
+			current.UserId = pkt
+			e.Identities[pkt.Id] = current
+
+			for {
+				p, err = packets.Next()
+				if err == io.EOF {
+					return nil, io.ErrUnexpectedEOF
+				} else if err != nil {
+					return nil, err
+				}
+
+				sig, ok := p.(*packet.Signature)
+				if !ok {
+					return nil, errors.StructuralError("user ID packet not followed by self-signature")
+				}
+
+				if (sig.SigType == packet.SigTypePositiveCert || sig.SigType == packet.SigTypeGenericCert) && sig.IssuerKeyId != nil && *sig.IssuerKeyId == e.PrimaryKey.KeyId {
+					if err = e.PrimaryKey.VerifyUserIdSignature(pkt.Id, e.PrimaryKey, sig); err != nil {
+						return nil, errors.StructuralError("user ID self-signature invalid: " + err.Error())
+					}
+					current.SelfSignature = sig
+					break
+				}
+				current.Signatures = append(current.Signatures, sig)
+			}
+		case *packet.Signature:
+			if pkt.SigType == packet.SigTypeKeyRevocation {
+				revocations = append(revocations, pkt)
+			} else if pkt.SigType == packet.SigTypeDirectSignature {
+				// TODO: RFC4880 5.2.1 permits signatures
+				// directly on keys (eg. to bind additional
+				// revocation keys).
+			} else if current == nil {
+				return nil, errors.StructuralError("signature packet found before user id packet")
+			} else {
+				current.Signatures = append(current.Signatures, pkt)
+			}
+		case *packet.PrivateKey:
+			if pkt.IsSubkey == false {
+				packets.Unread(p)
+				break EachPacket
+			}
+			err = addSubkey(e, packets, &pkt.PublicKey, pkt)
+			if err != nil {
+				return nil, err
+			}
+		case *packet.PublicKey:
+			if pkt.IsSubkey == false {
+				packets.Unread(p)
+				break EachPacket
+			}
+			err = addSubkey(e, packets, pkt, nil)
+			if err != nil {
+				return nil, err
+			}
+		default:
+			// we ignore unknown packets
+		}
+	}
+
+	if len(e.Identities) == 0 {
+		return nil, errors.StructuralError("entity without any identities")
+	}
+
+	for _, revocation := range revocations {
+		err = e.PrimaryKey.VerifyRevocationSignature(revocation)
+		if err == nil {
+			e.Revocations = append(e.Revocations, revocation)
+		} else {
+			// TODO: RFC 4880 5.2.3.15 defines revocation keys.
+			return nil, errors.StructuralError("revocation signature signed by alternate key")
+		}
+	}
+
+	return e, nil
+}
+
+func addSubkey(e *Entity, packets *packet.Reader, pub *packet.PublicKey, priv *packet.PrivateKey) error {
+	var subKey Subkey
+	subKey.PublicKey = pub
+	subKey.PrivateKey = priv
+	p, err := packets.Next()
+	if err == io.EOF {
+		return io.ErrUnexpectedEOF
+	}
+	if err != nil {
+		return errors.StructuralError("subkey signature invalid: " + err.Error())
+	}
+	var ok bool
+	subKey.Sig, ok = p.(*packet.Signature)
+	if !ok {
+		return errors.StructuralError("subkey packet not followed by signature")
+	}
+	if subKey.Sig.SigType != packet.SigTypeSubkeyBinding && subKey.Sig.SigType != packet.SigTypeSubkeyRevocation {
+		return errors.StructuralError("subkey signature with wrong type")
+	}
+	err = e.PrimaryKey.VerifyKeySignature(subKey.PublicKey, subKey.Sig)
+	if err != nil {
+		return errors.StructuralError("subkey signature invalid: " + err.Error())
+	}
+	e.Subkeys = append(e.Subkeys, subKey)
+	return nil
+}
+
+const defaultRSAKeyBits = 2048
+
+// NewEntity returns an Entity that contains a fresh RSA/RSA keypair with a
+// single identity composed of the given full name, comment and email, any of
+// which may be empty but must not contain any of "()<>\x00".
+// If config is nil, sensible defaults will be used.
+func NewEntity(name, comment, email string, config *packet.Config) (*Entity, error) {
+	currentTime := config.Now()
+
+	uid := packet.NewUserId(name, comment, email)
+	if uid == nil {
+		return nil, errors.InvalidArgumentError("user id field contained invalid characters")
+	}
+	signingPriv, err := rsa.GenerateKey(config.Random(), defaultRSAKeyBits)
+	if err != nil {
+		return nil, err
+	}
+	encryptingPriv, err := rsa.GenerateKey(config.Random(), defaultRSAKeyBits)
+	if err != nil {
+		return nil, err
+	}
+
+	e := &Entity{
+		PrimaryKey: packet.NewRSAPublicKey(currentTime, &signingPriv.PublicKey),
+		PrivateKey: packet.NewRSAPrivateKey(currentTime, signingPriv),
+		Identities: make(map[string]*Identity),
+	}
+	isPrimaryId := true
+	e.Identities[uid.Id] = &Identity{
+		Name:   uid.Name,
+		UserId: uid,
+		SelfSignature: &packet.Signature{
+			CreationTime: currentTime,
+			SigType:      packet.SigTypePositiveCert,
+			PubKeyAlgo:   packet.PubKeyAlgoRSA,
+			Hash:         config.Hash(),
+			IsPrimaryId:  &isPrimaryId,
+			FlagsValid:   true,
+			FlagSign:     true,
+			FlagCertify:  true,
+			IssuerKeyId:  &e.PrimaryKey.KeyId,
+		},
+	}
+
+	e.Subkeys = make([]Subkey, 1)
+	e.Subkeys[0] = Subkey{
+		PublicKey:  packet.NewRSAPublicKey(currentTime, &encryptingPriv.PublicKey),
+		PrivateKey: packet.NewRSAPrivateKey(currentTime, encryptingPriv),
+		Sig: &packet.Signature{
+			CreationTime:              currentTime,
+			SigType:                   packet.SigTypeSubkeyBinding,
+			PubKeyAlgo:                packet.PubKeyAlgoRSA,
+			Hash:                      config.Hash(),
+			FlagsValid:                true,
+			FlagEncryptStorage:        true,
+			FlagEncryptCommunications: true,
+			IssuerKeyId:               &e.PrimaryKey.KeyId,
+		},
+	}
+	e.Subkeys[0].PublicKey.IsSubkey = true
+	e.Subkeys[0].PrivateKey.IsSubkey = true
+
+	return e, nil
+}
+
+// SerializePrivate serializes an Entity, including private key material, to
+// the given Writer. For now, it must only be used on an Entity returned from
+// NewEntity.
+// If config is nil, sensible defaults will be used.
+func (e *Entity) SerializePrivate(w io.Writer, config *packet.Config) (err error) {
+	err = e.PrivateKey.Serialize(w)
+	if err != nil {
+		return
+	}
+	for _, ident := range e.Identities {
+		err = ident.UserId.Serialize(w)
+		if err != nil {
+			return
+		}
+		err = ident.SelfSignature.SignUserId(ident.UserId.Id, e.PrimaryKey, e.PrivateKey, config)
+		if err != nil {
+			return
+		}
+		err = ident.SelfSignature.Serialize(w)
+		if err != nil {
+			return
+		}
+	}
+	for _, subkey := range e.Subkeys {
+		err = subkey.PrivateKey.Serialize(w)
+		if err != nil {
+			return
+		}
+		err = subkey.Sig.SignKey(subkey.PublicKey, e.PrivateKey, config)
+		if err != nil {
+			return
+		}
+		err = subkey.Sig.Serialize(w)
+		if err != nil {
+			return
+		}
+	}
+	return nil
+}
+
+// Serialize writes the public part of the given Entity to w. (No private
+// key material will be output).
+func (e *Entity) Serialize(w io.Writer) error {
+	err := e.PrimaryKey.Serialize(w)
+	if err != nil {
+		return err
+	}
+	for _, ident := range e.Identities {
+		err = ident.UserId.Serialize(w)
+		if err != nil {
+			return err
+		}
+		err = ident.SelfSignature.Serialize(w)
+		if err != nil {
+			return err
+		}
+		for _, sig := range ident.Signatures {
+			err = sig.Serialize(w)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	for _, subkey := range e.Subkeys {
+		err = subkey.PublicKey.Serialize(w)
+		if err != nil {
+			return err
+		}
+		err = subkey.Sig.Serialize(w)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// SignIdentity adds a signature to e, from signer, attesting that identity is
+// associated with e. The provided identity must already be an element of
+// e.Identities and the private key of signer must have been decrypted if
+// necessary.
+// If config is nil, sensible defaults will be used.
+func (e *Entity) SignIdentity(identity string, signer *Entity, config *packet.Config) error {
+	if signer.PrivateKey == nil {
+		return errors.InvalidArgumentError("signing Entity must have a private key")
+	}
+	if signer.PrivateKey.Encrypted {
+		return errors.InvalidArgumentError("signing Entity's private key must be decrypted")
+	}
+	ident, ok := e.Identities[identity]
+	if !ok {
+		return errors.InvalidArgumentError("given identity string not found in Entity")
+	}
+
+	sig := &packet.Signature{
+		SigType:      packet.SigTypeGenericCert,
+		PubKeyAlgo:   signer.PrivateKey.PubKeyAlgo,
+		Hash:         config.Hash(),
+		CreationTime: config.Now(),
+		IssuerKeyId:  &signer.PrivateKey.KeyId,
+	}
+	if err := sig.SignUserId(identity, e.PrimaryKey, signer.PrivateKey, config); err != nil {
+		return err
+	}
+	ident.Signatures = append(ident.Signatures, sig)
+	return nil
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/compressed.go b/vendor/golang.org/x/crypto/openpgp/packet/compressed.go
new file mode 100644
index 0000000000..e8f0b5caa7
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/compressed.go
@@ -0,0 +1,123 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"compress/bzip2"
+	"compress/flate"
+	"compress/zlib"
+	"golang.org/x/crypto/openpgp/errors"
+	"io"
+	"strconv"
+)
+
+// Compressed represents a compressed OpenPGP packet. The decompressed contents
+// will contain more OpenPGP packets. See RFC 4880, section 5.6.
+type Compressed struct {
+	Body io.Reader
+}
+
+const (
+	NoCompression      = flate.NoCompression
+	BestSpeed          = flate.BestSpeed
+	BestCompression    = flate.BestCompression
+	DefaultCompression = flate.DefaultCompression
+)
+
+// CompressionConfig contains compressor configuration settings.
+type CompressionConfig struct {
+	// Level is the compression level to use. It must be set to
+	// between -1 and 9, with -1 causing the compressor to use the
+	// default compression level, 0 causing the compressor to use
+	// no compression and 1 to 9 representing increasing (better,
+	// slower) compression levels. If Level is less than -1 or
+	// more then 9, a non-nil error will be returned during
+	// encryption. See the constants above for convenient common
+	// settings for Level.
+	Level int
+}
+
+func (c *Compressed) parse(r io.Reader) error {
+	var buf [1]byte
+	_, err := readFull(r, buf[:])
+	if err != nil {
+		return err
+	}
+
+	switch buf[0] {
+	case 1:
+		c.Body = flate.NewReader(r)
+	case 2:
+		c.Body, err = zlib.NewReader(r)
+	case 3:
+		c.Body = bzip2.NewReader(r)
+	default:
+		err = errors.UnsupportedError("unknown compression algorithm: " + strconv.Itoa(int(buf[0])))
+	}
+
+	return err
+}
+
+// compressedWriterCloser represents the serialized compression stream
+// header and the compressor. Its Close() method ensures that both the
+// compressor and serialized stream header are closed. Its Write()
+// method writes to the compressor.
+type compressedWriteCloser struct {
+	sh io.Closer      // Stream Header
+	c  io.WriteCloser // Compressor
+}
+
+func (cwc compressedWriteCloser) Write(p []byte) (int, error) {
+	return cwc.c.Write(p)
+}
+
+func (cwc compressedWriteCloser) Close() (err error) {
+	err = cwc.c.Close()
+	if err != nil {
+		return err
+	}
+
+	return cwc.sh.Close()
+}
+
+// SerializeCompressed serializes a compressed data packet to w and
+// returns a WriteCloser to which the literal data packets themselves
+// can be written and which MUST be closed on completion. If cc is
+// nil, sensible defaults will be used to configure the compression
+// algorithm.
+func SerializeCompressed(w io.WriteCloser, algo CompressionAlgo, cc *CompressionConfig) (literaldata io.WriteCloser, err error) {
+	compressed, err := serializeStreamHeader(w, packetTypeCompressed)
+	if err != nil {
+		return
+	}
+
+	_, err = compressed.Write([]byte{uint8(algo)})
+	if err != nil {
+		return
+	}
+
+	level := DefaultCompression
+	if cc != nil {
+		level = cc.Level
+	}
+
+	var compressor io.WriteCloser
+	switch algo {
+	case CompressionZIP:
+		compressor, err = flate.NewWriter(compressed, level)
+	case CompressionZLIB:
+		compressor, err = zlib.NewWriterLevel(compressed, level)
+	default:
+		s := strconv.Itoa(int(algo))
+		err = errors.UnsupportedError("Unsupported compression algorithm: " + s)
+	}
+	if err != nil {
+		return
+	}
+
+	literaldata = compressedWriteCloser{compressed, compressor}
+
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/config.go b/vendor/golang.org/x/crypto/openpgp/packet/config.go
new file mode 100644
index 0000000000..d977cde63f
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/config.go
@@ -0,0 +1,88 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"crypto"
+	"crypto/rand"
+	"io"
+	"time"
+)
+
+// Config collects a number of parameters along with sensible defaults.
+// A nil *Config is valid and results in all default values.
+type Config struct {
+	// Rand provides the source of entropy.
+	// If nil, the crypto/rand Reader is used.
+	Rand io.Reader
+	// DefaultHash is the default hash function to be used.
+	// If zero, SHA-256 is used.
+	DefaultHash crypto.Hash
+	// DefaultCipher is the cipher to be used.
+	// If zero, AES-128 is used.
+	DefaultCipher CipherFunction
+	// Time returns the current time as the number of seconds since the
+	// epoch. If Time is nil, time.Now is used.
+	Time func() time.Time
+	// DefaultCompressionAlgo is the compression algorithm to be
+	// applied to the plaintext before encryption. If zero, no
+	// compression is done.
+	DefaultCompressionAlgo CompressionAlgo
+	// CompressionConfig configures the compression settings.
+	CompressionConfig *CompressionConfig
+	// S2KCount is only used for symmetric encryption. It
+	// determines the strength of the passphrase stretching when
+	// the said passphrase is hashed to produce a key. S2KCount
+	// should be between 1024 and 65011712, inclusive. If Config
+	// is nil or S2KCount is 0, the value 65536 used. Not all
+	// values in the above range can be represented. S2KCount will
+	// be rounded up to the next representable value if it cannot
+	// be encoded exactly. When set, it is strongly encrouraged to
+	// use a value that is at least 65536. See RFC 4880 Section
+	// 3.7.1.3.
+	S2KCount int
+}
+
+func (c *Config) Random() io.Reader {
+	if c == nil || c.Rand == nil {
+		return rand.Reader
+	}
+	return c.Rand
+}
+
+func (c *Config) Hash() crypto.Hash {
+	if c == nil || uint(c.DefaultHash) == 0 {
+		return crypto.SHA256
+	}
+	return c.DefaultHash
+}
+
+func (c *Config) Cipher() CipherFunction {
+	if c == nil || uint8(c.DefaultCipher) == 0 {
+		return CipherAES128
+	}
+	return c.DefaultCipher
+}
+
+func (c *Config) Now() time.Time {
+	if c == nil || c.Time == nil {
+		return time.Now()
+	}
+	return c.Time()
+}
+
+func (c *Config) Compression() CompressionAlgo {
+	if c == nil {
+		return CompressionNone
+	}
+	return c.DefaultCompressionAlgo
+}
+
+func (c *Config) PasswordHashIterations() int {
+	if c == nil || c.S2KCount == 0 {
+		return 0
+	}
+	return c.S2KCount
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/encrypted_key.go b/vendor/golang.org/x/crypto/openpgp/packet/encrypted_key.go
new file mode 100644
index 0000000000..b43522cd50
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/encrypted_key.go
@@ -0,0 +1,168 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"crypto/rsa"
+	"encoding/binary"
+	"golang.org/x/crypto/openpgp/elgamal"
+	"golang.org/x/crypto/openpgp/errors"
+	"io"
+	"math/big"
+	"strconv"
+)
+
+const encryptedKeyVersion = 3
+
+// EncryptedKey represents a public-key encrypted session key. See RFC 4880,
+// section 5.1.
+type EncryptedKey struct {
+	KeyId      uint64
+	Algo       PublicKeyAlgorithm
+	CipherFunc CipherFunction // only valid after a successful Decrypt
+	Key        []byte         // only valid after a successful Decrypt
+
+	encryptedMPI1, encryptedMPI2 []byte
+}
+
+func (e *EncryptedKey) parse(r io.Reader) (err error) {
+	var buf [10]byte
+	_, err = readFull(r, buf[:])
+	if err != nil {
+		return
+	}
+	if buf[0] != encryptedKeyVersion {
+		return errors.UnsupportedError("unknown EncryptedKey version " + strconv.Itoa(int(buf[0])))
+	}
+	e.KeyId = binary.BigEndian.Uint64(buf[1:9])
+	e.Algo = PublicKeyAlgorithm(buf[9])
+	switch e.Algo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
+		e.encryptedMPI1, _, err = readMPI(r)
+	case PubKeyAlgoElGamal:
+		e.encryptedMPI1, _, err = readMPI(r)
+		if err != nil {
+			return
+		}
+		e.encryptedMPI2, _, err = readMPI(r)
+	}
+	_, err = consumeAll(r)
+	return
+}
+
+func checksumKeyMaterial(key []byte) uint16 {
+	var checksum uint16
+	for _, v := range key {
+		checksum += uint16(v)
+	}
+	return checksum
+}
+
+// Decrypt decrypts an encrypted session key with the given private key. The
+// private key must have been decrypted first.
+// If config is nil, sensible defaults will be used.
+func (e *EncryptedKey) Decrypt(priv *PrivateKey, config *Config) error {
+	var err error
+	var b []byte
+
+	// TODO(agl): use session key decryption routines here to avoid
+	// padding oracle attacks.
+	switch priv.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
+		b, err = rsa.DecryptPKCS1v15(config.Random(), priv.PrivateKey.(*rsa.PrivateKey), e.encryptedMPI1)
+	case PubKeyAlgoElGamal:
+		c1 := new(big.Int).SetBytes(e.encryptedMPI1)
+		c2 := new(big.Int).SetBytes(e.encryptedMPI2)
+		b, err = elgamal.Decrypt(priv.PrivateKey.(*elgamal.PrivateKey), c1, c2)
+	default:
+		err = errors.InvalidArgumentError("cannot decrypted encrypted session key with private key of type " + strconv.Itoa(int(priv.PubKeyAlgo)))
+	}
+
+	if err != nil {
+		return err
+	}
+
+	e.CipherFunc = CipherFunction(b[0])
+	e.Key = b[1 : len(b)-2]
+	expectedChecksum := uint16(b[len(b)-2])<<8 | uint16(b[len(b)-1])
+	checksum := checksumKeyMaterial(e.Key)
+	if checksum != expectedChecksum {
+		return errors.StructuralError("EncryptedKey checksum incorrect")
+	}
+
+	return nil
+}
+
+// SerializeEncryptedKey serializes an encrypted key packet to w that contains
+// key, encrypted to pub.
+// If config is nil, sensible defaults will be used.
+func SerializeEncryptedKey(w io.Writer, pub *PublicKey, cipherFunc CipherFunction, key []byte, config *Config) error {
+	var buf [10]byte
+	buf[0] = encryptedKeyVersion
+	binary.BigEndian.PutUint64(buf[1:9], pub.KeyId)
+	buf[9] = byte(pub.PubKeyAlgo)
+
+	keyBlock := make([]byte, 1 /* cipher type */ +len(key)+2 /* checksum */)
+	keyBlock[0] = byte(cipherFunc)
+	copy(keyBlock[1:], key)
+	checksum := checksumKeyMaterial(key)
+	keyBlock[1+len(key)] = byte(checksum >> 8)
+	keyBlock[1+len(key)+1] = byte(checksum)
+
+	switch pub.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
+		return serializeEncryptedKeyRSA(w, config.Random(), buf, pub.PublicKey.(*rsa.PublicKey), keyBlock)
+	case PubKeyAlgoElGamal:
+		return serializeEncryptedKeyElGamal(w, config.Random(), buf, pub.PublicKey.(*elgamal.PublicKey), keyBlock)
+	case PubKeyAlgoDSA, PubKeyAlgoRSASignOnly:
+		return errors.InvalidArgumentError("cannot encrypt to public key of type " + strconv.Itoa(int(pub.PubKeyAlgo)))
+	}
+
+	return errors.UnsupportedError("encrypting a key to public key of type " + strconv.Itoa(int(pub.PubKeyAlgo)))
+}
+
+func serializeEncryptedKeyRSA(w io.Writer, rand io.Reader, header [10]byte, pub *rsa.PublicKey, keyBlock []byte) error {
+	cipherText, err := rsa.EncryptPKCS1v15(rand, pub, keyBlock)
+	if err != nil {
+		return errors.InvalidArgumentError("RSA encryption failed: " + err.Error())
+	}
+
+	packetLen := 10 /* header length */ + 2 /* mpi size */ + len(cipherText)
+
+	err = serializeHeader(w, packetTypeEncryptedKey, packetLen)
+	if err != nil {
+		return err
+	}
+	_, err = w.Write(header[:])
+	if err != nil {
+		return err
+	}
+	return writeMPI(w, 8*uint16(len(cipherText)), cipherText)
+}
+
+func serializeEncryptedKeyElGamal(w io.Writer, rand io.Reader, header [10]byte, pub *elgamal.PublicKey, keyBlock []byte) error {
+	c1, c2, err := elgamal.Encrypt(rand, pub, keyBlock)
+	if err != nil {
+		return errors.InvalidArgumentError("ElGamal encryption failed: " + err.Error())
+	}
+
+	packetLen := 10 /* header length */
+	packetLen += 2 /* mpi size */ + (c1.BitLen()+7)/8
+	packetLen += 2 /* mpi size */ + (c2.BitLen()+7)/8
+
+	err = serializeHeader(w, packetTypeEncryptedKey, packetLen)
+	if err != nil {
+		return err
+	}
+	_, err = w.Write(header[:])
+	if err != nil {
+		return err
+	}
+	err = writeBig(w, c1)
+	if err != nil {
+		return err
+	}
+	return writeBig(w, c2)
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/literal.go b/vendor/golang.org/x/crypto/openpgp/packet/literal.go
new file mode 100644
index 0000000000..1a9ec6e51e
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/literal.go
@@ -0,0 +1,89 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"encoding/binary"
+	"io"
+)
+
+// LiteralData represents an encrypted file. See RFC 4880, section 5.9.
+type LiteralData struct {
+	IsBinary bool
+	FileName string
+	Time     uint32 // Unix epoch time. Either creation time or modification time. 0 means undefined.
+	Body     io.Reader
+}
+
+// ForEyesOnly returns whether the contents of the LiteralData have been marked
+// as especially sensitive.
+func (l *LiteralData) ForEyesOnly() bool {
+	return l.FileName == "_CONSOLE"
+}
+
+func (l *LiteralData) parse(r io.Reader) (err error) {
+	var buf [256]byte
+
+	_, err = readFull(r, buf[:2])
+	if err != nil {
+		return
+	}
+
+	l.IsBinary = buf[0] == 'b'
+	fileNameLen := int(buf[1])
+
+	_, err = readFull(r, buf[:fileNameLen])
+	if err != nil {
+		return
+	}
+
+	l.FileName = string(buf[:fileNameLen])
+
+	_, err = readFull(r, buf[:4])
+	if err != nil {
+		return
+	}
+
+	l.Time = binary.BigEndian.Uint32(buf[:4])
+	l.Body = r
+	return
+}
+
+// SerializeLiteral serializes a literal data packet to w and returns a
+// WriteCloser to which the data itself can be written and which MUST be closed
+// on completion. The fileName is truncated to 255 bytes.
+func SerializeLiteral(w io.WriteCloser, isBinary bool, fileName string, time uint32) (plaintext io.WriteCloser, err error) {
+	var buf [4]byte
+	buf[0] = 't'
+	if isBinary {
+		buf[0] = 'b'
+	}
+	if len(fileName) > 255 {
+		fileName = fileName[:255]
+	}
+	buf[1] = byte(len(fileName))
+
+	inner, err := serializeStreamHeader(w, packetTypeLiteralData)
+	if err != nil {
+		return
+	}
+
+	_, err = inner.Write(buf[:2])
+	if err != nil {
+		return
+	}
+	_, err = inner.Write([]byte(fileName))
+	if err != nil {
+		return
+	}
+	binary.BigEndian.PutUint32(buf[:], time)
+	_, err = inner.Write(buf[:])
+	if err != nil {
+		return
+	}
+
+	plaintext = inner
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go b/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go
new file mode 100644
index 0000000000..ce2a33a547
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go
@@ -0,0 +1,143 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// OpenPGP CFB Mode. http://tools.ietf.org/html/rfc4880#section-13.9
+
+package packet
+
+import (
+	"crypto/cipher"
+)
+
+type ocfbEncrypter struct {
+	b       cipher.Block
+	fre     []byte
+	outUsed int
+}
+
+// An OCFBResyncOption determines if the "resynchronization step" of OCFB is
+// performed.
+type OCFBResyncOption bool
+
+const (
+	OCFBResync   OCFBResyncOption = true
+	OCFBNoResync OCFBResyncOption = false
+)
+
+// NewOCFBEncrypter returns a cipher.Stream which encrypts data with OpenPGP's
+// cipher feedback mode using the given cipher.Block, and an initial amount of
+// ciphertext.  randData must be random bytes and be the same length as the
+// cipher.Block's block size. Resync determines if the "resynchronization step"
+// from RFC 4880, 13.9 step 7 is performed. Different parts of OpenPGP vary on
+// this point.
+func NewOCFBEncrypter(block cipher.Block, randData []byte, resync OCFBResyncOption) (cipher.Stream, []byte) {
+	blockSize := block.BlockSize()
+	if len(randData) != blockSize {
+		return nil, nil
+	}
+
+	x := &ocfbEncrypter{
+		b:       block,
+		fre:     make([]byte, blockSize),
+		outUsed: 0,
+	}
+	prefix := make([]byte, blockSize+2)
+
+	block.Encrypt(x.fre, x.fre)
+	for i := 0; i < blockSize; i++ {
+		prefix[i] = randData[i] ^ x.fre[i]
+	}
+
+	block.Encrypt(x.fre, prefix[:blockSize])
+	prefix[blockSize] = x.fre[0] ^ randData[blockSize-2]
+	prefix[blockSize+1] = x.fre[1] ^ randData[blockSize-1]
+
+	if resync {
+		block.Encrypt(x.fre, prefix[2:])
+	} else {
+		x.fre[0] = prefix[blockSize]
+		x.fre[1] = prefix[blockSize+1]
+		x.outUsed = 2
+	}
+	return x, prefix
+}
+
+func (x *ocfbEncrypter) XORKeyStream(dst, src []byte) {
+	for i := 0; i < len(src); i++ {
+		if x.outUsed == len(x.fre) {
+			x.b.Encrypt(x.fre, x.fre)
+			x.outUsed = 0
+		}
+
+		x.fre[x.outUsed] ^= src[i]
+		dst[i] = x.fre[x.outUsed]
+		x.outUsed++
+	}
+}
+
+type ocfbDecrypter struct {
+	b       cipher.Block
+	fre     []byte
+	outUsed int
+}
+
+// NewOCFBDecrypter returns a cipher.Stream which decrypts data with OpenPGP's
+// cipher feedback mode using the given cipher.Block. Prefix must be the first
+// blockSize + 2 bytes of the ciphertext, where blockSize is the cipher.Block's
+// block size. If an incorrect key is detected then nil is returned. On
+// successful exit, blockSize+2 bytes of decrypted data are written into
+// prefix. Resync determines if the "resynchronization step" from RFC 4880,
+// 13.9 step 7 is performed. Different parts of OpenPGP vary on this point.
+func NewOCFBDecrypter(block cipher.Block, prefix []byte, resync OCFBResyncOption) cipher.Stream {
+	blockSize := block.BlockSize()
+	if len(prefix) != blockSize+2 {
+		return nil
+	}
+
+	x := &ocfbDecrypter{
+		b:       block,
+		fre:     make([]byte, blockSize),
+		outUsed: 0,
+	}
+	prefixCopy := make([]byte, len(prefix))
+	copy(prefixCopy, prefix)
+
+	block.Encrypt(x.fre, x.fre)
+	for i := 0; i < blockSize; i++ {
+		prefixCopy[i] ^= x.fre[i]
+	}
+
+	block.Encrypt(x.fre, prefix[:blockSize])
+	prefixCopy[blockSize] ^= x.fre[0]
+	prefixCopy[blockSize+1] ^= x.fre[1]
+
+	if prefixCopy[blockSize-2] != prefixCopy[blockSize] ||
+		prefixCopy[blockSize-1] != prefixCopy[blockSize+1] {
+		return nil
+	}
+
+	if resync {
+		block.Encrypt(x.fre, prefix[2:])
+	} else {
+		x.fre[0] = prefix[blockSize]
+		x.fre[1] = prefix[blockSize+1]
+		x.outUsed = 2
+	}
+	copy(prefix, prefixCopy)
+	return x
+}
+
+func (x *ocfbDecrypter) XORKeyStream(dst, src []byte) {
+	for i := 0; i < len(src); i++ {
+		if x.outUsed == len(x.fre) {
+			x.b.Encrypt(x.fre, x.fre)
+			x.outUsed = 0
+		}
+
+		c := src[i]
+		dst[i] = x.fre[x.outUsed] ^ src[i]
+		x.fre[x.outUsed] = c
+		x.outUsed++
+	}
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/one_pass_signature.go b/vendor/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
new file mode 100644
index 0000000000..1713503395
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
@@ -0,0 +1,73 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"crypto"
+	"encoding/binary"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
+	"io"
+	"strconv"
+)
+
+// OnePassSignature represents a one-pass signature packet. See RFC 4880,
+// section 5.4.
+type OnePassSignature struct {
+	SigType    SignatureType
+	Hash       crypto.Hash
+	PubKeyAlgo PublicKeyAlgorithm
+	KeyId      uint64
+	IsLast     bool
+}
+
+const onePassSignatureVersion = 3
+
+func (ops *OnePassSignature) parse(r io.Reader) (err error) {
+	var buf [13]byte
+
+	_, err = readFull(r, buf[:])
+	if err != nil {
+		return
+	}
+	if buf[0] != onePassSignatureVersion {
+		err = errors.UnsupportedError("one-pass-signature packet version " + strconv.Itoa(int(buf[0])))
+	}
+
+	var ok bool
+	ops.Hash, ok = s2k.HashIdToHash(buf[2])
+	if !ok {
+		return errors.UnsupportedError("hash function: " + strconv.Itoa(int(buf[2])))
+	}
+
+	ops.SigType = SignatureType(buf[1])
+	ops.PubKeyAlgo = PublicKeyAlgorithm(buf[3])
+	ops.KeyId = binary.BigEndian.Uint64(buf[4:12])
+	ops.IsLast = buf[12] != 0
+	return
+}
+
+// Serialize marshals the given OnePassSignature to w.
+func (ops *OnePassSignature) Serialize(w io.Writer) error {
+	var buf [13]byte
+	buf[0] = onePassSignatureVersion
+	buf[1] = uint8(ops.SigType)
+	var ok bool
+	buf[2], ok = s2k.HashToHashId(ops.Hash)
+	if !ok {
+		return errors.UnsupportedError("hash type: " + strconv.Itoa(int(ops.Hash)))
+	}
+	buf[3] = uint8(ops.PubKeyAlgo)
+	binary.BigEndian.PutUint64(buf[4:12], ops.KeyId)
+	if ops.IsLast {
+		buf[12] = 1
+	}
+
+	if err := serializeHeader(w, packetTypeOnePassSignature, len(buf)); err != nil {
+		return err
+	}
+	_, err := w.Write(buf[:])
+	return err
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/opaque.go b/vendor/golang.org/x/crypto/openpgp/packet/opaque.go
new file mode 100644
index 0000000000..f2e00b9827
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/opaque.go
@@ -0,0 +1,161 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"bytes"
+	"golang.org/x/crypto/openpgp/errors"
+	"io"
+	"io/ioutil"
+)
+
+// OpaquePacket represents an OpenPGP packet as raw, unparsed data. This is
+// useful for splitting and storing the original packet contents separately,
+// handling unsupported packet types or accessing parts of the packet not yet
+// implemented by this package.
+type OpaquePacket struct {
+	// Packet type
+	Tag uint8
+	// Reason why the packet was parsed opaquely
+	Reason error
+	// Binary contents of the packet data
+	Contents []byte
+}
+
+func (op *OpaquePacket) parse(r io.Reader) (err error) {
+	op.Contents, err = ioutil.ReadAll(r)
+	return
+}
+
+// Serialize marshals the packet to a writer in its original form, including
+// the packet header.
+func (op *OpaquePacket) Serialize(w io.Writer) (err error) {
+	err = serializeHeader(w, packetType(op.Tag), len(op.Contents))
+	if err == nil {
+		_, err = w.Write(op.Contents)
+	}
+	return
+}
+
+// Parse attempts to parse the opaque contents into a structure supported by
+// this package. If the packet is not known then the result will be another
+// OpaquePacket.
+func (op *OpaquePacket) Parse() (p Packet, err error) {
+	hdr := bytes.NewBuffer(nil)
+	err = serializeHeader(hdr, packetType(op.Tag), len(op.Contents))
+	if err != nil {
+		op.Reason = err
+		return op, err
+	}
+	p, err = Read(io.MultiReader(hdr, bytes.NewBuffer(op.Contents)))
+	if err != nil {
+		op.Reason = err
+		p = op
+	}
+	return
+}
+
+// OpaqueReader reads OpaquePackets from an io.Reader.
+type OpaqueReader struct {
+	r io.Reader
+}
+
+func NewOpaqueReader(r io.Reader) *OpaqueReader {
+	return &OpaqueReader{r: r}
+}
+
+// Read the next OpaquePacket.
+func (or *OpaqueReader) Next() (op *OpaquePacket, err error) {
+	tag, _, contents, err := readHeader(or.r)
+	if err != nil {
+		return
+	}
+	op = &OpaquePacket{Tag: uint8(tag), Reason: err}
+	err = op.parse(contents)
+	if err != nil {
+		consumeAll(contents)
+	}
+	return
+}
+
+// OpaqueSubpacket represents an unparsed OpenPGP subpacket,
+// as found in signature and user attribute packets.
+type OpaqueSubpacket struct {
+	SubType  uint8
+	Contents []byte
+}
+
+// OpaqueSubpackets extracts opaque, unparsed OpenPGP subpackets from
+// their byte representation.
+func OpaqueSubpackets(contents []byte) (result []*OpaqueSubpacket, err error) {
+	var (
+		subHeaderLen int
+		subPacket    *OpaqueSubpacket
+	)
+	for len(contents) > 0 {
+		subHeaderLen, subPacket, err = nextSubpacket(contents)
+		if err != nil {
+			break
+		}
+		result = append(result, subPacket)
+		contents = contents[subHeaderLen+len(subPacket.Contents):]
+	}
+	return
+}
+
+func nextSubpacket(contents []byte) (subHeaderLen int, subPacket *OpaqueSubpacket, err error) {
+	// RFC 4880, section 5.2.3.1
+	var subLen uint32
+	if len(contents) < 1 {
+		goto Truncated
+	}
+	subPacket = &OpaqueSubpacket{}
+	switch {
+	case contents[0] < 192:
+		subHeaderLen = 2 // 1 length byte, 1 subtype byte
+		if len(contents) < subHeaderLen {
+			goto Truncated
+		}
+		subLen = uint32(contents[0])
+		contents = contents[1:]
+	case contents[0] < 255:
+		subHeaderLen = 3 // 2 length bytes, 1 subtype
+		if len(contents) < subHeaderLen {
+			goto Truncated
+		}
+		subLen = uint32(contents[0]-192)<<8 + uint32(contents[1]) + 192
+		contents = contents[2:]
+	default:
+		subHeaderLen = 6 // 5 length bytes, 1 subtype
+		if len(contents) < subHeaderLen {
+			goto Truncated
+		}
+		subLen = uint32(contents[1])<<24 |
+			uint32(contents[2])<<16 |
+			uint32(contents[3])<<8 |
+			uint32(contents[4])
+		contents = contents[5:]
+	}
+	if subLen > uint32(len(contents)) {
+		goto Truncated
+	}
+	subPacket.SubType = contents[0]
+	subPacket.Contents = contents[1:subLen]
+	return
+Truncated:
+	err = errors.StructuralError("subpacket truncated")
+	return
+}
+
+func (osp *OpaqueSubpacket) Serialize(w io.Writer) (err error) {
+	buf := make([]byte, 6)
+	n := serializeSubpacketLength(buf, len(osp.Contents)+1)
+	buf[n] = osp.SubType
+	if _, err = w.Write(buf[:n+1]); err != nil {
+		return
+	}
+	_, err = w.Write(osp.Contents)
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/packet.go b/vendor/golang.org/x/crypto/openpgp/packet/packet.go
new file mode 100644
index 0000000000..2e6b3498c0
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/packet.go
@@ -0,0 +1,538 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package packet implements parsing and serialization of OpenPGP packets, as
+// specified in RFC 4880.
+package packet // import "golang.org/x/crypto/openpgp/packet"
+
+import (
+	"bufio"
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/des"
+	"golang.org/x/crypto/cast5"
+	"golang.org/x/crypto/openpgp/errors"
+	"io"
+	"math/big"
+)
+
+// readFull is the same as io.ReadFull except that reading zero bytes returns
+// ErrUnexpectedEOF rather than EOF.
+func readFull(r io.Reader, buf []byte) (n int, err error) {
+	n, err = io.ReadFull(r, buf)
+	if err == io.EOF {
+		err = io.ErrUnexpectedEOF
+	}
+	return
+}
+
+// readLength reads an OpenPGP length from r. See RFC 4880, section 4.2.2.
+func readLength(r io.Reader) (length int64, isPartial bool, err error) {
+	var buf [4]byte
+	_, err = readFull(r, buf[:1])
+	if err != nil {
+		return
+	}
+	switch {
+	case buf[0] < 192:
+		length = int64(buf[0])
+	case buf[0] < 224:
+		length = int64(buf[0]-192) << 8
+		_, err = readFull(r, buf[0:1])
+		if err != nil {
+			return
+		}
+		length += int64(buf[0]) + 192
+	case buf[0] < 255:
+		length = int64(1) << (buf[0] & 0x1f)
+		isPartial = true
+	default:
+		_, err = readFull(r, buf[0:4])
+		if err != nil {
+			return
+		}
+		length = int64(buf[0])<<24 |
+			int64(buf[1])<<16 |
+			int64(buf[2])<<8 |
+			int64(buf[3])
+	}
+	return
+}
+
+// partialLengthReader wraps an io.Reader and handles OpenPGP partial lengths.
+// The continuation lengths are parsed and removed from the stream and EOF is
+// returned at the end of the packet. See RFC 4880, section 4.2.2.4.
+type partialLengthReader struct {
+	r         io.Reader
+	remaining int64
+	isPartial bool
+}
+
+func (r *partialLengthReader) Read(p []byte) (n int, err error) {
+	for r.remaining == 0 {
+		if !r.isPartial {
+			return 0, io.EOF
+		}
+		r.remaining, r.isPartial, err = readLength(r.r)
+		if err != nil {
+			return 0, err
+		}
+	}
+
+	toRead := int64(len(p))
+	if toRead > r.remaining {
+		toRead = r.remaining
+	}
+
+	n, err = r.r.Read(p[:int(toRead)])
+	r.remaining -= int64(n)
+	if n < int(toRead) && err == io.EOF {
+		err = io.ErrUnexpectedEOF
+	}
+	return
+}
+
+// partialLengthWriter writes a stream of data using OpenPGP partial lengths.
+// See RFC 4880, section 4.2.2.4.
+type partialLengthWriter struct {
+	w          io.WriteCloser
+	lengthByte [1]byte
+}
+
+func (w *partialLengthWriter) Write(p []byte) (n int, err error) {
+	for len(p) > 0 {
+		for power := uint(14); power < 32; power-- {
+			l := 1 << power
+			if len(p) >= l {
+				w.lengthByte[0] = 224 + uint8(power)
+				_, err = w.w.Write(w.lengthByte[:])
+				if err != nil {
+					return
+				}
+				var m int
+				m, err = w.w.Write(p[:l])
+				n += m
+				if err != nil {
+					return
+				}
+				p = p[l:]
+				break
+			}
+		}
+	}
+	return
+}
+
+func (w *partialLengthWriter) Close() error {
+	w.lengthByte[0] = 0
+	_, err := w.w.Write(w.lengthByte[:])
+	if err != nil {
+		return err
+	}
+	return w.w.Close()
+}
+
+// A spanReader is an io.LimitReader, but it returns ErrUnexpectedEOF if the
+// underlying Reader returns EOF before the limit has been reached.
+type spanReader struct {
+	r io.Reader
+	n int64
+}
+
+func (l *spanReader) Read(p []byte) (n int, err error) {
+	if l.n <= 0 {
+		return 0, io.EOF
+	}
+	if int64(len(p)) > l.n {
+		p = p[0:l.n]
+	}
+	n, err = l.r.Read(p)
+	l.n -= int64(n)
+	if l.n > 0 && err == io.EOF {
+		err = io.ErrUnexpectedEOF
+	}
+	return
+}
+
+// readHeader parses a packet header and returns an io.Reader which will return
+// the contents of the packet. See RFC 4880, section 4.2.
+func readHeader(r io.Reader) (tag packetType, length int64, contents io.Reader, err error) {
+	var buf [4]byte
+	_, err = io.ReadFull(r, buf[:1])
+	if err != nil {
+		return
+	}
+	if buf[0]&0x80 == 0 {
+		err = errors.StructuralError("tag byte does not have MSB set")
+		return
+	}
+	if buf[0]&0x40 == 0 {
+		// Old format packet
+		tag = packetType((buf[0] & 0x3f) >> 2)
+		lengthType := buf[0] & 3
+		if lengthType == 3 {
+			length = -1
+			contents = r
+			return
+		}
+		lengthBytes := 1 << lengthType
+		_, err = readFull(r, buf[0:lengthBytes])
+		if err != nil {
+			return
+		}
+		for i := 0; i < lengthBytes; i++ {
+			length <<= 8
+			length |= int64(buf[i])
+		}
+		contents = &spanReader{r, length}
+		return
+	}
+
+	// New format packet
+	tag = packetType(buf[0] & 0x3f)
+	length, isPartial, err := readLength(r)
+	if err != nil {
+		return
+	}
+	if isPartial {
+		contents = &partialLengthReader{
+			remaining: length,
+			isPartial: true,
+			r:         r,
+		}
+		length = -1
+	} else {
+		contents = &spanReader{r, length}
+	}
+	return
+}
+
+// serializeHeader writes an OpenPGP packet header to w. See RFC 4880, section
+// 4.2.
+func serializeHeader(w io.Writer, ptype packetType, length int) (err error) {
+	var buf [6]byte
+	var n int
+
+	buf[0] = 0x80 | 0x40 | byte(ptype)
+	if length < 192 {
+		buf[1] = byte(length)
+		n = 2
+	} else if length < 8384 {
+		length -= 192
+		buf[1] = 192 + byte(length>>8)
+		buf[2] = byte(length)
+		n = 3
+	} else {
+		buf[1] = 255
+		buf[2] = byte(length >> 24)
+		buf[3] = byte(length >> 16)
+		buf[4] = byte(length >> 8)
+		buf[5] = byte(length)
+		n = 6
+	}
+
+	_, err = w.Write(buf[:n])
+	return
+}
+
+// serializeStreamHeader writes an OpenPGP packet header to w where the
+// length of the packet is unknown. It returns a io.WriteCloser which can be
+// used to write the contents of the packet. See RFC 4880, section 4.2.
+func serializeStreamHeader(w io.WriteCloser, ptype packetType) (out io.WriteCloser, err error) {
+	var buf [1]byte
+	buf[0] = 0x80 | 0x40 | byte(ptype)
+	_, err = w.Write(buf[:])
+	if err != nil {
+		return
+	}
+	out = &partialLengthWriter{w: w}
+	return
+}
+
+// Packet represents an OpenPGP packet. Users are expected to try casting
+// instances of this interface to specific packet types.
+type Packet interface {
+	parse(io.Reader) error
+}
+
+// consumeAll reads from the given Reader until error, returning the number of
+// bytes read.
+func consumeAll(r io.Reader) (n int64, err error) {
+	var m int
+	var buf [1024]byte
+
+	for {
+		m, err = r.Read(buf[:])
+		n += int64(m)
+		if err == io.EOF {
+			err = nil
+			return
+		}
+		if err != nil {
+			return
+		}
+	}
+
+	panic("unreachable")
+}
+
+// packetType represents the numeric ids of the different OpenPGP packet types. See
+// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-2
+type packetType uint8
+
+const (
+	packetTypeEncryptedKey              packetType = 1
+	packetTypeSignature                 packetType = 2
+	packetTypeSymmetricKeyEncrypted     packetType = 3
+	packetTypeOnePassSignature          packetType = 4
+	packetTypePrivateKey                packetType = 5
+	packetTypePublicKey                 packetType = 6
+	packetTypePrivateSubkey             packetType = 7
+	packetTypeCompressed                packetType = 8
+	packetTypeSymmetricallyEncrypted    packetType = 9
+	packetTypeLiteralData               packetType = 11
+	packetTypeUserId                    packetType = 13
+	packetTypePublicSubkey              packetType = 14
+	packetTypeUserAttribute             packetType = 17
+	packetTypeSymmetricallyEncryptedMDC packetType = 18
+)
+
+// peekVersion detects the version of a public key packet about to
+// be read. A bufio.Reader at the original position of the io.Reader
+// is returned.
+func peekVersion(r io.Reader) (bufr *bufio.Reader, ver byte, err error) {
+	bufr = bufio.NewReader(r)
+	var verBuf []byte
+	if verBuf, err = bufr.Peek(1); err != nil {
+		return
+	}
+	ver = verBuf[0]
+	return
+}
+
+// Read reads a single OpenPGP packet from the given io.Reader. If there is an
+// error parsing a packet, the whole packet is consumed from the input.
+func Read(r io.Reader) (p Packet, err error) {
+	tag, _, contents, err := readHeader(r)
+	if err != nil {
+		return
+	}
+
+	switch tag {
+	case packetTypeEncryptedKey:
+		p = new(EncryptedKey)
+	case packetTypeSignature:
+		var version byte
+		// Detect signature version
+		if contents, version, err = peekVersion(contents); err != nil {
+			return
+		}
+		if version < 4 {
+			p = new(SignatureV3)
+		} else {
+			p = new(Signature)
+		}
+	case packetTypeSymmetricKeyEncrypted:
+		p = new(SymmetricKeyEncrypted)
+	case packetTypeOnePassSignature:
+		p = new(OnePassSignature)
+	case packetTypePrivateKey, packetTypePrivateSubkey:
+		pk := new(PrivateKey)
+		if tag == packetTypePrivateSubkey {
+			pk.IsSubkey = true
+		}
+		p = pk
+	case packetTypePublicKey, packetTypePublicSubkey:
+		var version byte
+		if contents, version, err = peekVersion(contents); err != nil {
+			return
+		}
+		isSubkey := tag == packetTypePublicSubkey
+		if version < 4 {
+			p = &PublicKeyV3{IsSubkey: isSubkey}
+		} else {
+			p = &PublicKey{IsSubkey: isSubkey}
+		}
+	case packetTypeCompressed:
+		p = new(Compressed)
+	case packetTypeSymmetricallyEncrypted:
+		p = new(SymmetricallyEncrypted)
+	case packetTypeLiteralData:
+		p = new(LiteralData)
+	case packetTypeUserId:
+		p = new(UserId)
+	case packetTypeUserAttribute:
+		p = new(UserAttribute)
+	case packetTypeSymmetricallyEncryptedMDC:
+		se := new(SymmetricallyEncrypted)
+		se.MDC = true
+		p = se
+	default:
+		err = errors.UnknownPacketTypeError(tag)
+	}
+	if p != nil {
+		err = p.parse(contents)
+	}
+	if err != nil {
+		consumeAll(contents)
+	}
+	return
+}
+
+// SignatureType represents the different semantic meanings of an OpenPGP
+// signature. See RFC 4880, section 5.2.1.
+type SignatureType uint8
+
+const (
+	SigTypeBinary           SignatureType = 0
+	SigTypeText                           = 1
+	SigTypeGenericCert                    = 0x10
+	SigTypePersonaCert                    = 0x11
+	SigTypeCasualCert                     = 0x12
+	SigTypePositiveCert                   = 0x13
+	SigTypeSubkeyBinding                  = 0x18
+	SigTypeDirectSignature                = 0x1F
+	SigTypeKeyRevocation                  = 0x20
+	SigTypeSubkeyRevocation               = 0x28
+)
+
+// PublicKeyAlgorithm represents the different public key system specified for
+// OpenPGP. See
+// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-12
+type PublicKeyAlgorithm uint8
+
+const (
+	PubKeyAlgoRSA            PublicKeyAlgorithm = 1
+	PubKeyAlgoRSAEncryptOnly PublicKeyAlgorithm = 2
+	PubKeyAlgoRSASignOnly    PublicKeyAlgorithm = 3
+	PubKeyAlgoElGamal        PublicKeyAlgorithm = 16
+	PubKeyAlgoDSA            PublicKeyAlgorithm = 17
+	// RFC 6637, Section 5.
+	PubKeyAlgoECDH  PublicKeyAlgorithm = 18
+	PubKeyAlgoECDSA PublicKeyAlgorithm = 19
+)
+
+// CanEncrypt returns true if it's possible to encrypt a message to a public
+// key of the given type.
+func (pka PublicKeyAlgorithm) CanEncrypt() bool {
+	switch pka {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoElGamal:
+		return true
+	}
+	return false
+}
+
+// CanSign returns true if it's possible for a public key of the given type to
+// sign a message.
+func (pka PublicKeyAlgorithm) CanSign() bool {
+	switch pka {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA:
+		return true
+	}
+	return false
+}
+
+// CipherFunction represents the different block ciphers specified for OpenPGP. See
+// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-13
+type CipherFunction uint8
+
+const (
+	Cipher3DES   CipherFunction = 2
+	CipherCAST5  CipherFunction = 3
+	CipherAES128 CipherFunction = 7
+	CipherAES192 CipherFunction = 8
+	CipherAES256 CipherFunction = 9
+)
+
+// KeySize returns the key size, in bytes, of cipher.
+func (cipher CipherFunction) KeySize() int {
+	switch cipher {
+	case Cipher3DES:
+		return 24
+	case CipherCAST5:
+		return cast5.KeySize
+	case CipherAES128:
+		return 16
+	case CipherAES192:
+		return 24
+	case CipherAES256:
+		return 32
+	}
+	return 0
+}
+
+// blockSize returns the block size, in bytes, of cipher.
+func (cipher CipherFunction) blockSize() int {
+	switch cipher {
+	case Cipher3DES:
+		return des.BlockSize
+	case CipherCAST5:
+		return 8
+	case CipherAES128, CipherAES192, CipherAES256:
+		return 16
+	}
+	return 0
+}
+
+// new returns a fresh instance of the given cipher.
+func (cipher CipherFunction) new(key []byte) (block cipher.Block) {
+	switch cipher {
+	case Cipher3DES:
+		block, _ = des.NewTripleDESCipher(key)
+	case CipherCAST5:
+		block, _ = cast5.NewCipher(key)
+	case CipherAES128, CipherAES192, CipherAES256:
+		block, _ = aes.NewCipher(key)
+	}
+	return
+}
+
+// readMPI reads a big integer from r. The bit length returned is the bit
+// length that was specified in r. This is preserved so that the integer can be
+// reserialized exactly.
+func readMPI(r io.Reader) (mpi []byte, bitLength uint16, err error) {
+	var buf [2]byte
+	_, err = readFull(r, buf[0:])
+	if err != nil {
+		return
+	}
+	bitLength = uint16(buf[0])<<8 | uint16(buf[1])
+	numBytes := (int(bitLength) + 7) / 8
+	mpi = make([]byte, numBytes)
+	_, err = readFull(r, mpi)
+	return
+}
+
+// mpiLength returns the length of the given *big.Int when serialized as an
+// MPI.
+func mpiLength(n *big.Int) (mpiLengthInBytes int) {
+	mpiLengthInBytes = 2 /* MPI length */
+	mpiLengthInBytes += (n.BitLen() + 7) / 8
+	return
+}
+
+// writeMPI serializes a big integer to w.
+func writeMPI(w io.Writer, bitLength uint16, mpiBytes []byte) (err error) {
+	_, err = w.Write([]byte{byte(bitLength >> 8), byte(bitLength)})
+	if err == nil {
+		_, err = w.Write(mpiBytes)
+	}
+	return
+}
+
+// writeBig serializes a *big.Int to w.
+func writeBig(w io.Writer, i *big.Int) error {
+	return writeMPI(w, uint16(i.BitLen()), i.Bytes())
+}
+
+// CompressionAlgo Represents the different compression algorithms
+// supported by OpenPGP (except for BZIP2, which is not currently
+// supported). See Section 9.3 of RFC 4880.
+type CompressionAlgo uint8
+
+const (
+	CompressionNone CompressionAlgo = 0
+	CompressionZIP  CompressionAlgo = 1
+	CompressionZLIB CompressionAlgo = 2
+)
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/private_key.go b/vendor/golang.org/x/crypto/openpgp/packet/private_key.go
new file mode 100644
index 0000000000..9685a342c4
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/private_key.go
@@ -0,0 +1,310 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"bytes"
+	"crypto/cipher"
+	"crypto/dsa"
+	"crypto/rsa"
+	"crypto/sha1"
+	"golang.org/x/crypto/openpgp/elgamal"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
+	"io"
+	"io/ioutil"
+	"math/big"
+	"strconv"
+	"time"
+)
+
+// PrivateKey represents a possibly encrypted private key. See RFC 4880,
+// section 5.5.3.
+type PrivateKey struct {
+	PublicKey
+	Encrypted     bool // if true then the private key is unavailable until Decrypt has been called.
+	encryptedData []byte
+	cipher        CipherFunction
+	s2k           func(out, in []byte)
+	PrivateKey    interface{} // An *rsa.PrivateKey or *dsa.PrivateKey.
+	sha1Checksum  bool
+	iv            []byte
+}
+
+func NewRSAPrivateKey(currentTime time.Time, priv *rsa.PrivateKey) *PrivateKey {
+	pk := new(PrivateKey)
+	pk.PublicKey = *NewRSAPublicKey(currentTime, &priv.PublicKey)
+	pk.PrivateKey = priv
+	return pk
+}
+
+func NewDSAPrivateKey(currentTime time.Time, priv *dsa.PrivateKey) *PrivateKey {
+	pk := new(PrivateKey)
+	pk.PublicKey = *NewDSAPublicKey(currentTime, &priv.PublicKey)
+	pk.PrivateKey = priv
+	return pk
+}
+
+func (pk *PrivateKey) parse(r io.Reader) (err error) {
+	err = (&pk.PublicKey).parse(r)
+	if err != nil {
+		return
+	}
+	var buf [1]byte
+	_, err = readFull(r, buf[:])
+	if err != nil {
+		return
+	}
+
+	s2kType := buf[0]
+
+	switch s2kType {
+	case 0:
+		pk.s2k = nil
+		pk.Encrypted = false
+	case 254, 255:
+		_, err = readFull(r, buf[:])
+		if err != nil {
+			return
+		}
+		pk.cipher = CipherFunction(buf[0])
+		pk.Encrypted = true
+		pk.s2k, err = s2k.Parse(r)
+		if err != nil {
+			return
+		}
+		if s2kType == 254 {
+			pk.sha1Checksum = true
+		}
+	default:
+		return errors.UnsupportedError("deprecated s2k function in private key")
+	}
+
+	if pk.Encrypted {
+		blockSize := pk.cipher.blockSize()
+		if blockSize == 0 {
+			return errors.UnsupportedError("unsupported cipher in private key: " + strconv.Itoa(int(pk.cipher)))
+		}
+		pk.iv = make([]byte, blockSize)
+		_, err = readFull(r, pk.iv)
+		if err != nil {
+			return
+		}
+	}
+
+	pk.encryptedData, err = ioutil.ReadAll(r)
+	if err != nil {
+		return
+	}
+
+	if !pk.Encrypted {
+		return pk.parsePrivateKey(pk.encryptedData)
+	}
+
+	return
+}
+
+func mod64kHash(d []byte) uint16 {
+	var h uint16
+	for _, b := range d {
+		h += uint16(b)
+	}
+	return h
+}
+
+func (pk *PrivateKey) Serialize(w io.Writer) (err error) {
+	// TODO(agl): support encrypted private keys
+	buf := bytes.NewBuffer(nil)
+	err = pk.PublicKey.serializeWithoutHeaders(buf)
+	if err != nil {
+		return
+	}
+	buf.WriteByte(0 /* no encryption */)
+
+	privateKeyBuf := bytes.NewBuffer(nil)
+
+	switch priv := pk.PrivateKey.(type) {
+	case *rsa.PrivateKey:
+		err = serializeRSAPrivateKey(privateKeyBuf, priv)
+	case *dsa.PrivateKey:
+		err = serializeDSAPrivateKey(privateKeyBuf, priv)
+	default:
+		err = errors.InvalidArgumentError("unknown private key type")
+	}
+	if err != nil {
+		return
+	}
+
+	ptype := packetTypePrivateKey
+	contents := buf.Bytes()
+	privateKeyBytes := privateKeyBuf.Bytes()
+	if pk.IsSubkey {
+		ptype = packetTypePrivateSubkey
+	}
+	err = serializeHeader(w, ptype, len(contents)+len(privateKeyBytes)+2)
+	if err != nil {
+		return
+	}
+	_, err = w.Write(contents)
+	if err != nil {
+		return
+	}
+	_, err = w.Write(privateKeyBytes)
+	if err != nil {
+		return
+	}
+
+	checksum := mod64kHash(privateKeyBytes)
+	var checksumBytes [2]byte
+	checksumBytes[0] = byte(checksum >> 8)
+	checksumBytes[1] = byte(checksum)
+	_, err = w.Write(checksumBytes[:])
+
+	return
+}
+
+func serializeRSAPrivateKey(w io.Writer, priv *rsa.PrivateKey) error {
+	err := writeBig(w, priv.D)
+	if err != nil {
+		return err
+	}
+	err = writeBig(w, priv.Primes[1])
+	if err != nil {
+		return err
+	}
+	err = writeBig(w, priv.Primes[0])
+	if err != nil {
+		return err
+	}
+	return writeBig(w, priv.Precomputed.Qinv)
+}
+
+func serializeDSAPrivateKey(w io.Writer, priv *dsa.PrivateKey) error {
+	return writeBig(w, priv.X)
+}
+
+// Decrypt decrypts an encrypted private key using a passphrase.
+func (pk *PrivateKey) Decrypt(passphrase []byte) error {
+	if !pk.Encrypted {
+		return nil
+	}
+
+	key := make([]byte, pk.cipher.KeySize())
+	pk.s2k(key, passphrase)
+	block := pk.cipher.new(key)
+	cfb := cipher.NewCFBDecrypter(block, pk.iv)
+
+	data := make([]byte, len(pk.encryptedData))
+	cfb.XORKeyStream(data, pk.encryptedData)
+
+	if pk.sha1Checksum {
+		if len(data) < sha1.Size {
+			return errors.StructuralError("truncated private key data")
+		}
+		h := sha1.New()
+		h.Write(data[:len(data)-sha1.Size])
+		sum := h.Sum(nil)
+		if !bytes.Equal(sum, data[len(data)-sha1.Size:]) {
+			return errors.StructuralError("private key checksum failure")
+		}
+		data = data[:len(data)-sha1.Size]
+	} else {
+		if len(data) < 2 {
+			return errors.StructuralError("truncated private key data")
+		}
+		var sum uint16
+		for i := 0; i < len(data)-2; i++ {
+			sum += uint16(data[i])
+		}
+		if data[len(data)-2] != uint8(sum>>8) ||
+			data[len(data)-1] != uint8(sum) {
+			return errors.StructuralError("private key checksum failure")
+		}
+		data = data[:len(data)-2]
+	}
+
+	return pk.parsePrivateKey(data)
+}
+
+func (pk *PrivateKey) parsePrivateKey(data []byte) (err error) {
+	switch pk.PublicKey.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoRSAEncryptOnly:
+		return pk.parseRSAPrivateKey(data)
+	case PubKeyAlgoDSA:
+		return pk.parseDSAPrivateKey(data)
+	case PubKeyAlgoElGamal:
+		return pk.parseElGamalPrivateKey(data)
+	}
+	panic("impossible")
+}
+
+func (pk *PrivateKey) parseRSAPrivateKey(data []byte) (err error) {
+	rsaPub := pk.PublicKey.PublicKey.(*rsa.PublicKey)
+	rsaPriv := new(rsa.PrivateKey)
+	rsaPriv.PublicKey = *rsaPub
+
+	buf := bytes.NewBuffer(data)
+	d, _, err := readMPI(buf)
+	if err != nil {
+		return
+	}
+	p, _, err := readMPI(buf)
+	if err != nil {
+		return
+	}
+	q, _, err := readMPI(buf)
+	if err != nil {
+		return
+	}
+
+	rsaPriv.D = new(big.Int).SetBytes(d)
+	rsaPriv.Primes = make([]*big.Int, 2)
+	rsaPriv.Primes[0] = new(big.Int).SetBytes(p)
+	rsaPriv.Primes[1] = new(big.Int).SetBytes(q)
+	rsaPriv.Precompute()
+	pk.PrivateKey = rsaPriv
+	pk.Encrypted = false
+	pk.encryptedData = nil
+
+	return nil
+}
+
+func (pk *PrivateKey) parseDSAPrivateKey(data []byte) (err error) {
+	dsaPub := pk.PublicKey.PublicKey.(*dsa.PublicKey)
+	dsaPriv := new(dsa.PrivateKey)
+	dsaPriv.PublicKey = *dsaPub
+
+	buf := bytes.NewBuffer(data)
+	x, _, err := readMPI(buf)
+	if err != nil {
+		return
+	}
+
+	dsaPriv.X = new(big.Int).SetBytes(x)
+	pk.PrivateKey = dsaPriv
+	pk.Encrypted = false
+	pk.encryptedData = nil
+
+	return nil
+}
+
+func (pk *PrivateKey) parseElGamalPrivateKey(data []byte) (err error) {
+	pub := pk.PublicKey.PublicKey.(*elgamal.PublicKey)
+	priv := new(elgamal.PrivateKey)
+	priv.PublicKey = *pub
+
+	buf := bytes.NewBuffer(data)
+	x, _, err := readMPI(buf)
+	if err != nil {
+		return
+	}
+
+	priv.X = new(big.Int).SetBytes(x)
+	pk.PrivateKey = priv
+	pk.Encrypted = false
+	pk.encryptedData = nil
+
+	return nil
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/public_key.go b/vendor/golang.org/x/crypto/openpgp/packet/public_key.go
new file mode 100644
index 0000000000..26bd9ccdd2
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/public_key.go
@@ -0,0 +1,687 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"bytes"
+	"crypto"
+	"crypto/dsa"
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	"crypto/rsa"
+	"crypto/sha1"
+	_ "crypto/sha256"
+	_ "crypto/sha512"
+	"encoding/binary"
+	"fmt"
+	"golang.org/x/crypto/openpgp/elgamal"
+	"golang.org/x/crypto/openpgp/errors"
+	"hash"
+	"io"
+	"math/big"
+	"strconv"
+	"time"
+)
+
+var (
+	// NIST curve P-256
+	oidCurveP256 []byte = []byte{0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07}
+	// NIST curve P-384
+	oidCurveP384 []byte = []byte{0x2B, 0x81, 0x04, 0x00, 0x22}
+	// NIST curve P-521
+	oidCurveP521 []byte = []byte{0x2B, 0x81, 0x04, 0x00, 0x23}
+)
+
+const maxOIDLength = 8
+
+// ecdsaKey stores the algorithm-specific fields for ECDSA keys.
+// as defined in RFC 6637, Section 9.
+type ecdsaKey struct {
+	// oid contains the OID byte sequence identifying the elliptic curve used
+	oid []byte
+	// p contains the elliptic curve point that represents the public key
+	p parsedMPI
+}
+
+// parseOID reads the OID for the curve as defined in RFC 6637, Section 9.
+func parseOID(r io.Reader) (oid []byte, err error) {
+	buf := make([]byte, maxOIDLength)
+	if _, err = readFull(r, buf[:1]); err != nil {
+		return
+	}
+	oidLen := buf[0]
+	if int(oidLen) > len(buf) {
+		err = errors.UnsupportedError("invalid oid length: " + strconv.Itoa(int(oidLen)))
+		return
+	}
+	oid = buf[:oidLen]
+	_, err = readFull(r, oid)
+	return
+}
+
+func (f *ecdsaKey) parse(r io.Reader) (err error) {
+	if f.oid, err = parseOID(r); err != nil {
+		return err
+	}
+	f.p.bytes, f.p.bitLength, err = readMPI(r)
+	return
+}
+
+func (f *ecdsaKey) serialize(w io.Writer) (err error) {
+	buf := make([]byte, maxOIDLength+1)
+	buf[0] = byte(len(f.oid))
+	copy(buf[1:], f.oid)
+	if _, err = w.Write(buf[:len(f.oid)+1]); err != nil {
+		return
+	}
+	return writeMPIs(w, f.p)
+}
+
+func (f *ecdsaKey) newECDSA() (*ecdsa.PublicKey, error) {
+	var c elliptic.Curve
+	if bytes.Equal(f.oid, oidCurveP256) {
+		c = elliptic.P256()
+	} else if bytes.Equal(f.oid, oidCurveP384) {
+		c = elliptic.P384()
+	} else if bytes.Equal(f.oid, oidCurveP521) {
+		c = elliptic.P521()
+	} else {
+		return nil, errors.UnsupportedError(fmt.Sprintf("unsupported oid: %x", f.oid))
+	}
+	x, y := elliptic.Unmarshal(c, f.p.bytes)
+	if x == nil {
+		return nil, errors.UnsupportedError("failed to parse EC point")
+	}
+	return &ecdsa.PublicKey{Curve: c, X: x, Y: y}, nil
+}
+
+func (f *ecdsaKey) byteLen() int {
+	return 1 + len(f.oid) + 2 + len(f.p.bytes)
+}
+
+type kdfHashFunction byte
+type kdfAlgorithm byte
+
+// ecdhKdf stores key derivation function parameters
+// used for ECDH encryption. See RFC 6637, Section 9.
+type ecdhKdf struct {
+	KdfHash kdfHashFunction
+	KdfAlgo kdfAlgorithm
+}
+
+func (f *ecdhKdf) parse(r io.Reader) (err error) {
+	buf := make([]byte, 1)
+	if _, err = readFull(r, buf); err != nil {
+		return
+	}
+	kdfLen := int(buf[0])
+	if kdfLen < 3 {
+		return errors.UnsupportedError("Unsupported ECDH KDF length: " + strconv.Itoa(kdfLen))
+	}
+	buf = make([]byte, kdfLen)
+	if _, err = readFull(r, buf); err != nil {
+		return
+	}
+	reserved := int(buf[0])
+	f.KdfHash = kdfHashFunction(buf[1])
+	f.KdfAlgo = kdfAlgorithm(buf[2])
+	if reserved != 0x01 {
+		return errors.UnsupportedError("Unsupported KDF reserved field: " + strconv.Itoa(reserved))
+	}
+	return
+}
+
+func (f *ecdhKdf) serialize(w io.Writer) (err error) {
+	buf := make([]byte, 4)
+	// See RFC 6637, Section 9, Algorithm-Specific Fields for ECDH keys.
+	buf[0] = byte(0x03) // Length of the following fields
+	buf[1] = byte(0x01) // Reserved for future extensions, must be 1 for now
+	buf[2] = byte(f.KdfHash)
+	buf[3] = byte(f.KdfAlgo)
+	_, err = w.Write(buf[:])
+	return
+}
+
+func (f *ecdhKdf) byteLen() int {
+	return 4
+}
+
+// PublicKey represents an OpenPGP public key. See RFC 4880, section 5.5.2.
+type PublicKey struct {
+	CreationTime time.Time
+	PubKeyAlgo   PublicKeyAlgorithm
+	PublicKey    interface{} // *rsa.PublicKey, *dsa.PublicKey or *ecdsa.PublicKey
+	Fingerprint  [20]byte
+	KeyId        uint64
+	IsSubkey     bool
+
+	n, e, p, q, g, y parsedMPI
+
+	// RFC 6637 fields
+	ec   *ecdsaKey
+	ecdh *ecdhKdf
+}
+
+// signingKey provides a convenient abstraction over signature verification
+// for v3 and v4 public keys.
+type signingKey interface {
+	SerializeSignaturePrefix(io.Writer)
+	serializeWithoutHeaders(io.Writer) error
+}
+
+func fromBig(n *big.Int) parsedMPI {
+	return parsedMPI{
+		bytes:     n.Bytes(),
+		bitLength: uint16(n.BitLen()),
+	}
+}
+
+// NewRSAPublicKey returns a PublicKey that wraps the given rsa.PublicKey.
+func NewRSAPublicKey(creationTime time.Time, pub *rsa.PublicKey) *PublicKey {
+	pk := &PublicKey{
+		CreationTime: creationTime,
+		PubKeyAlgo:   PubKeyAlgoRSA,
+		PublicKey:    pub,
+		n:            fromBig(pub.N),
+		e:            fromBig(big.NewInt(int64(pub.E))),
+	}
+
+	pk.setFingerPrintAndKeyId()
+	return pk
+}
+
+// NewDSAPublicKey returns a PublicKey that wraps the given rsa.PublicKey.
+func NewDSAPublicKey(creationTime time.Time, pub *dsa.PublicKey) *PublicKey {
+	pk := &PublicKey{
+		CreationTime: creationTime,
+		PubKeyAlgo:   PubKeyAlgoDSA,
+		PublicKey:    pub,
+		p:            fromBig(pub.P),
+		q:            fromBig(pub.Q),
+		g:            fromBig(pub.G),
+		y:            fromBig(pub.Y),
+	}
+
+	pk.setFingerPrintAndKeyId()
+	return pk
+}
+
+func (pk *PublicKey) parse(r io.Reader) (err error) {
+	// RFC 4880, section 5.5.2
+	var buf [6]byte
+	_, err = readFull(r, buf[:])
+	if err != nil {
+		return
+	}
+	if buf[0] != 4 {
+		return errors.UnsupportedError("public key version")
+	}
+	pk.CreationTime = time.Unix(int64(uint32(buf[1])<<24|uint32(buf[2])<<16|uint32(buf[3])<<8|uint32(buf[4])), 0)
+	pk.PubKeyAlgo = PublicKeyAlgorithm(buf[5])
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		err = pk.parseRSA(r)
+	case PubKeyAlgoDSA:
+		err = pk.parseDSA(r)
+	case PubKeyAlgoElGamal:
+		err = pk.parseElGamal(r)
+	case PubKeyAlgoECDSA:
+		pk.ec = new(ecdsaKey)
+		if err = pk.ec.parse(r); err != nil {
+			return err
+		}
+		pk.PublicKey, err = pk.ec.newECDSA()
+	case PubKeyAlgoECDH:
+		pk.ec = new(ecdsaKey)
+		if err = pk.ec.parse(r); err != nil {
+			return
+		}
+		pk.ecdh = new(ecdhKdf)
+		if err = pk.ecdh.parse(r); err != nil {
+			return
+		}
+		// The ECDH key is stored in an ecdsa.PublicKey for convenience.
+		pk.PublicKey, err = pk.ec.newECDSA()
+	default:
+		err = errors.UnsupportedError("public key type: " + strconv.Itoa(int(pk.PubKeyAlgo)))
+	}
+	if err != nil {
+		return
+	}
+
+	pk.setFingerPrintAndKeyId()
+	return
+}
+
+func (pk *PublicKey) setFingerPrintAndKeyId() {
+	// RFC 4880, section 12.2
+	fingerPrint := sha1.New()
+	pk.SerializeSignaturePrefix(fingerPrint)
+	pk.serializeWithoutHeaders(fingerPrint)
+	copy(pk.Fingerprint[:], fingerPrint.Sum(nil))
+	pk.KeyId = binary.BigEndian.Uint64(pk.Fingerprint[12:20])
+}
+
+// parseRSA parses RSA public key material from the given Reader. See RFC 4880,
+// section 5.5.2.
+func (pk *PublicKey) parseRSA(r io.Reader) (err error) {
+	pk.n.bytes, pk.n.bitLength, err = readMPI(r)
+	if err != nil {
+		return
+	}
+	pk.e.bytes, pk.e.bitLength, err = readMPI(r)
+	if err != nil {
+		return
+	}
+
+	if len(pk.e.bytes) > 3 {
+		err = errors.UnsupportedError("large public exponent")
+		return
+	}
+	rsa := &rsa.PublicKey{
+		N: new(big.Int).SetBytes(pk.n.bytes),
+		E: 0,
+	}
+	for i := 0; i < len(pk.e.bytes); i++ {
+		rsa.E <<= 8
+		rsa.E |= int(pk.e.bytes[i])
+	}
+	pk.PublicKey = rsa
+	return
+}
+
+// parseDSA parses DSA public key material from the given Reader. See RFC 4880,
+// section 5.5.2.
+func (pk *PublicKey) parseDSA(r io.Reader) (err error) {
+	pk.p.bytes, pk.p.bitLength, err = readMPI(r)
+	if err != nil {
+		return
+	}
+	pk.q.bytes, pk.q.bitLength, err = readMPI(r)
+	if err != nil {
+		return
+	}
+	pk.g.bytes, pk.g.bitLength, err = readMPI(r)
+	if err != nil {
+		return
+	}
+	pk.y.bytes, pk.y.bitLength, err = readMPI(r)
+	if err != nil {
+		return
+	}
+
+	dsa := new(dsa.PublicKey)
+	dsa.P = new(big.Int).SetBytes(pk.p.bytes)
+	dsa.Q = new(big.Int).SetBytes(pk.q.bytes)
+	dsa.G = new(big.Int).SetBytes(pk.g.bytes)
+	dsa.Y = new(big.Int).SetBytes(pk.y.bytes)
+	pk.PublicKey = dsa
+	return
+}
+
+// parseElGamal parses ElGamal public key material from the given Reader. See
+// RFC 4880, section 5.5.2.
+func (pk *PublicKey) parseElGamal(r io.Reader) (err error) {
+	pk.p.bytes, pk.p.bitLength, err = readMPI(r)
+	if err != nil {
+		return
+	}
+	pk.g.bytes, pk.g.bitLength, err = readMPI(r)
+	if err != nil {
+		return
+	}
+	pk.y.bytes, pk.y.bitLength, err = readMPI(r)
+	if err != nil {
+		return
+	}
+
+	elgamal := new(elgamal.PublicKey)
+	elgamal.P = new(big.Int).SetBytes(pk.p.bytes)
+	elgamal.G = new(big.Int).SetBytes(pk.g.bytes)
+	elgamal.Y = new(big.Int).SetBytes(pk.y.bytes)
+	pk.PublicKey = elgamal
+	return
+}
+
+// SerializeSignaturePrefix writes the prefix for this public key to the given Writer.
+// The prefix is used when calculating a signature over this public key. See
+// RFC 4880, section 5.2.4.
+func (pk *PublicKey) SerializeSignaturePrefix(h io.Writer) {
+	var pLength uint16
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		pLength += 2 + uint16(len(pk.n.bytes))
+		pLength += 2 + uint16(len(pk.e.bytes))
+	case PubKeyAlgoDSA:
+		pLength += 2 + uint16(len(pk.p.bytes))
+		pLength += 2 + uint16(len(pk.q.bytes))
+		pLength += 2 + uint16(len(pk.g.bytes))
+		pLength += 2 + uint16(len(pk.y.bytes))
+	case PubKeyAlgoElGamal:
+		pLength += 2 + uint16(len(pk.p.bytes))
+		pLength += 2 + uint16(len(pk.g.bytes))
+		pLength += 2 + uint16(len(pk.y.bytes))
+	case PubKeyAlgoECDSA:
+		pLength += uint16(pk.ec.byteLen())
+	case PubKeyAlgoECDH:
+		pLength += uint16(pk.ec.byteLen())
+		pLength += uint16(pk.ecdh.byteLen())
+	default:
+		panic("unknown public key algorithm")
+	}
+	pLength += 6
+	h.Write([]byte{0x99, byte(pLength >> 8), byte(pLength)})
+	return
+}
+
+func (pk *PublicKey) Serialize(w io.Writer) (err error) {
+	length := 6 // 6 byte header
+
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		length += 2 + len(pk.n.bytes)
+		length += 2 + len(pk.e.bytes)
+	case PubKeyAlgoDSA:
+		length += 2 + len(pk.p.bytes)
+		length += 2 + len(pk.q.bytes)
+		length += 2 + len(pk.g.bytes)
+		length += 2 + len(pk.y.bytes)
+	case PubKeyAlgoElGamal:
+		length += 2 + len(pk.p.bytes)
+		length += 2 + len(pk.g.bytes)
+		length += 2 + len(pk.y.bytes)
+	case PubKeyAlgoECDSA:
+		length += pk.ec.byteLen()
+	case PubKeyAlgoECDH:
+		length += pk.ec.byteLen()
+		length += pk.ecdh.byteLen()
+	default:
+		panic("unknown public key algorithm")
+	}
+
+	packetType := packetTypePublicKey
+	if pk.IsSubkey {
+		packetType = packetTypePublicSubkey
+	}
+	err = serializeHeader(w, packetType, length)
+	if err != nil {
+		return
+	}
+	return pk.serializeWithoutHeaders(w)
+}
+
+// serializeWithoutHeaders marshals the PublicKey to w in the form of an
+// OpenPGP public key packet, not including the packet header.
+func (pk *PublicKey) serializeWithoutHeaders(w io.Writer) (err error) {
+	var buf [6]byte
+	buf[0] = 4
+	t := uint32(pk.CreationTime.Unix())
+	buf[1] = byte(t >> 24)
+	buf[2] = byte(t >> 16)
+	buf[3] = byte(t >> 8)
+	buf[4] = byte(t)
+	buf[5] = byte(pk.PubKeyAlgo)
+
+	_, err = w.Write(buf[:])
+	if err != nil {
+		return
+	}
+
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		return writeMPIs(w, pk.n, pk.e)
+	case PubKeyAlgoDSA:
+		return writeMPIs(w, pk.p, pk.q, pk.g, pk.y)
+	case PubKeyAlgoElGamal:
+		return writeMPIs(w, pk.p, pk.g, pk.y)
+	case PubKeyAlgoECDSA:
+		return pk.ec.serialize(w)
+	case PubKeyAlgoECDH:
+		if err = pk.ec.serialize(w); err != nil {
+			return
+		}
+		return pk.ecdh.serialize(w)
+	}
+	return errors.InvalidArgumentError("bad public-key algorithm")
+}
+
+// CanSign returns true iff this public key can generate signatures
+func (pk *PublicKey) CanSign() bool {
+	return pk.PubKeyAlgo != PubKeyAlgoRSAEncryptOnly && pk.PubKeyAlgo != PubKeyAlgoElGamal
+}
+
+// VerifySignature returns nil iff sig is a valid signature, made by this
+// public key, of the data hashed into signed. signed is mutated by this call.
+func (pk *PublicKey) VerifySignature(signed hash.Hash, sig *Signature) (err error) {
+	if !pk.CanSign() {
+		return errors.InvalidArgumentError("public key cannot generate signatures")
+	}
+
+	signed.Write(sig.HashSuffix)
+	hashBytes := signed.Sum(nil)
+
+	if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] {
+		return errors.SignatureError("hash tag doesn't match")
+	}
+
+	if pk.PubKeyAlgo != sig.PubKeyAlgo {
+		return errors.InvalidArgumentError("public key and signature use different algorithms")
+	}
+
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
+		rsaPublicKey, _ := pk.PublicKey.(*rsa.PublicKey)
+		err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes)
+		if err != nil {
+			return errors.SignatureError("RSA verification failure")
+		}
+		return nil
+	case PubKeyAlgoDSA:
+		dsaPublicKey, _ := pk.PublicKey.(*dsa.PublicKey)
+		// Need to truncate hashBytes to match FIPS 186-3 section 4.6.
+		subgroupSize := (dsaPublicKey.Q.BitLen() + 7) / 8
+		if len(hashBytes) > subgroupSize {
+			hashBytes = hashBytes[:subgroupSize]
+		}
+		if !dsa.Verify(dsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.DSASigR.bytes), new(big.Int).SetBytes(sig.DSASigS.bytes)) {
+			return errors.SignatureError("DSA verification failure")
+		}
+		return nil
+	case PubKeyAlgoECDSA:
+		ecdsaPublicKey := pk.PublicKey.(*ecdsa.PublicKey)
+		if !ecdsa.Verify(ecdsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.ECDSASigR.bytes), new(big.Int).SetBytes(sig.ECDSASigS.bytes)) {
+			return errors.SignatureError("ECDSA verification failure")
+		}
+		return nil
+	default:
+		return errors.SignatureError("Unsupported public key algorithm used in signature")
+	}
+	panic("unreachable")
+}
+
+// VerifySignatureV3 returns nil iff sig is a valid signature, made by this
+// public key, of the data hashed into signed. signed is mutated by this call.
+func (pk *PublicKey) VerifySignatureV3(signed hash.Hash, sig *SignatureV3) (err error) {
+	if !pk.CanSign() {
+		return errors.InvalidArgumentError("public key cannot generate signatures")
+	}
+
+	suffix := make([]byte, 5)
+	suffix[0] = byte(sig.SigType)
+	binary.BigEndian.PutUint32(suffix[1:], uint32(sig.CreationTime.Unix()))
+	signed.Write(suffix)
+	hashBytes := signed.Sum(nil)
+
+	if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] {
+		return errors.SignatureError("hash tag doesn't match")
+	}
+
+	if pk.PubKeyAlgo != sig.PubKeyAlgo {
+		return errors.InvalidArgumentError("public key and signature use different algorithms")
+	}
+
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
+		rsaPublicKey := pk.PublicKey.(*rsa.PublicKey)
+		if err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes); err != nil {
+			return errors.SignatureError("RSA verification failure")
+		}
+		return
+	case PubKeyAlgoDSA:
+		dsaPublicKey := pk.PublicKey.(*dsa.PublicKey)
+		// Need to truncate hashBytes to match FIPS 186-3 section 4.6.
+		subgroupSize := (dsaPublicKey.Q.BitLen() + 7) / 8
+		if len(hashBytes) > subgroupSize {
+			hashBytes = hashBytes[:subgroupSize]
+		}
+		if !dsa.Verify(dsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.DSASigR.bytes), new(big.Int).SetBytes(sig.DSASigS.bytes)) {
+			return errors.SignatureError("DSA verification failure")
+		}
+		return nil
+	default:
+		panic("shouldn't happen")
+	}
+	panic("unreachable")
+}
+
+// keySignatureHash returns a Hash of the message that needs to be signed for
+// pk to assert a subkey relationship to signed.
+func keySignatureHash(pk, signed signingKey, hashFunc crypto.Hash) (h hash.Hash, err error) {
+	if !hashFunc.Available() {
+		return nil, errors.UnsupportedError("hash function")
+	}
+	h = hashFunc.New()
+
+	// RFC 4880, section 5.2.4
+	pk.SerializeSignaturePrefix(h)
+	pk.serializeWithoutHeaders(h)
+	signed.SerializeSignaturePrefix(h)
+	signed.serializeWithoutHeaders(h)
+	return
+}
+
+// VerifyKeySignature returns nil iff sig is a valid signature, made by this
+// public key, of signed.
+func (pk *PublicKey) VerifyKeySignature(signed *PublicKey, sig *Signature) (err error) {
+	h, err := keySignatureHash(pk, signed, sig.Hash)
+	if err != nil {
+		return err
+	}
+	return pk.VerifySignature(h, sig)
+}
+
+func keyRevocationHash(pk signingKey, hashFunc crypto.Hash) (h hash.Hash, err error) {
+	if !hashFunc.Available() {
+		return nil, errors.UnsupportedError("hash function")
+	}
+	h = hashFunc.New()
+
+	// RFC 4880, section 5.2.4
+	pk.SerializeSignaturePrefix(h)
+	pk.serializeWithoutHeaders(h)
+
+	return
+}
+
+// VerifyRevocationSignature returns nil iff sig is a valid signature, made by this
+// public key.
+func (pk *PublicKey) VerifyRevocationSignature(sig *Signature) (err error) {
+	h, err := keyRevocationHash(pk, sig.Hash)
+	if err != nil {
+		return err
+	}
+	return pk.VerifySignature(h, sig)
+}
+
+// userIdSignatureHash returns a Hash of the message that needs to be signed
+// to assert that pk is a valid key for id.
+func userIdSignatureHash(id string, pk *PublicKey, hashFunc crypto.Hash) (h hash.Hash, err error) {
+	if !hashFunc.Available() {
+		return nil, errors.UnsupportedError("hash function")
+	}
+	h = hashFunc.New()
+
+	// RFC 4880, section 5.2.4
+	pk.SerializeSignaturePrefix(h)
+	pk.serializeWithoutHeaders(h)
+
+	var buf [5]byte
+	buf[0] = 0xb4
+	buf[1] = byte(len(id) >> 24)
+	buf[2] = byte(len(id) >> 16)
+	buf[3] = byte(len(id) >> 8)
+	buf[4] = byte(len(id))
+	h.Write(buf[:])
+	h.Write([]byte(id))
+
+	return
+}
+
+// VerifyUserIdSignature returns nil iff sig is a valid signature, made by this
+// public key, that id is the identity of pub.
+func (pk *PublicKey) VerifyUserIdSignature(id string, pub *PublicKey, sig *Signature) (err error) {
+	h, err := userIdSignatureHash(id, pub, sig.Hash)
+	if err != nil {
+		return err
+	}
+	return pk.VerifySignature(h, sig)
+}
+
+// VerifyUserIdSignatureV3 returns nil iff sig is a valid signature, made by this
+// public key, that id is the identity of pub.
+func (pk *PublicKey) VerifyUserIdSignatureV3(id string, pub *PublicKey, sig *SignatureV3) (err error) {
+	h, err := userIdSignatureV3Hash(id, pub, sig.Hash)
+	if err != nil {
+		return err
+	}
+	return pk.VerifySignatureV3(h, sig)
+}
+
+// KeyIdString returns the public key's fingerprint in capital hex
+// (e.g. "6C7EE1B8621CC013").
+func (pk *PublicKey) KeyIdString() string {
+	return fmt.Sprintf("%X", pk.Fingerprint[12:20])
+}
+
+// KeyIdShortString returns the short form of public key's fingerprint
+// in capital hex, as shown by gpg --list-keys (e.g. "621CC013").
+func (pk *PublicKey) KeyIdShortString() string {
+	return fmt.Sprintf("%X", pk.Fingerprint[16:20])
+}
+
+// A parsedMPI is used to store the contents of a big integer, along with the
+// bit length that was specified in the original input. This allows the MPI to
+// be reserialized exactly.
+type parsedMPI struct {
+	bytes     []byte
+	bitLength uint16
+}
+
+// writeMPIs is a utility function for serializing several big integers to the
+// given Writer.
+func writeMPIs(w io.Writer, mpis ...parsedMPI) (err error) {
+	for _, mpi := range mpis {
+		err = writeMPI(w, mpi.bitLength, mpi.bytes)
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+// BitLength returns the bit length for the given public key.
+func (pk *PublicKey) BitLength() (bitLength uint16, err error) {
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		bitLength = pk.n.bitLength
+	case PubKeyAlgoDSA:
+		bitLength = pk.p.bitLength
+	case PubKeyAlgoElGamal:
+		bitLength = pk.p.bitLength
+	default:
+		err = errors.InvalidArgumentError("bad public-key algorithm")
+	}
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/public_key_v3.go b/vendor/golang.org/x/crypto/openpgp/packet/public_key_v3.go
new file mode 100644
index 0000000000..164124807b
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/public_key_v3.go
@@ -0,0 +1,275 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"crypto"
+	"crypto/md5"
+	"crypto/rsa"
+	"encoding/binary"
+	"fmt"
+	"hash"
+	"io"
+	"math/big"
+	"strconv"
+	"time"
+
+	"golang.org/x/crypto/openpgp/errors"
+)
+
+// PublicKeyV3 represents older, version 3 public keys. These keys are less secure and
+// should not be used for signing or encrypting. They are supported here only for
+// parsing version 3 key material and validating signatures.
+// See RFC 4880, section 5.5.2.
+type PublicKeyV3 struct {
+	CreationTime time.Time
+	DaysToExpire uint16
+	PubKeyAlgo   PublicKeyAlgorithm
+	PublicKey    *rsa.PublicKey
+	Fingerprint  [16]byte
+	KeyId        uint64
+	IsSubkey     bool
+
+	n, e parsedMPI
+}
+
+// newRSAPublicKeyV3 returns a PublicKey that wraps the given rsa.PublicKey.
+// Included here for testing purposes only. RFC 4880, section 5.5.2:
+// "an implementation MUST NOT generate a V3 key, but MAY accept it."
+func newRSAPublicKeyV3(creationTime time.Time, pub *rsa.PublicKey) *PublicKeyV3 {
+	pk := &PublicKeyV3{
+		CreationTime: creationTime,
+		PublicKey:    pub,
+		n:            fromBig(pub.N),
+		e:            fromBig(big.NewInt(int64(pub.E))),
+	}
+
+	pk.setFingerPrintAndKeyId()
+	return pk
+}
+
+func (pk *PublicKeyV3) parse(r io.Reader) (err error) {
+	// RFC 4880, section 5.5.2
+	var buf [8]byte
+	if _, err = readFull(r, buf[:]); err != nil {
+		return
+	}
+	if buf[0] < 2 || buf[0] > 3 {
+		return errors.UnsupportedError("public key version")
+	}
+	pk.CreationTime = time.Unix(int64(uint32(buf[1])<<24|uint32(buf[2])<<16|uint32(buf[3])<<8|uint32(buf[4])), 0)
+	pk.DaysToExpire = binary.BigEndian.Uint16(buf[5:7])
+	pk.PubKeyAlgo = PublicKeyAlgorithm(buf[7])
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		err = pk.parseRSA(r)
+	default:
+		err = errors.UnsupportedError("public key type: " + strconv.Itoa(int(pk.PubKeyAlgo)))
+	}
+	if err != nil {
+		return
+	}
+
+	pk.setFingerPrintAndKeyId()
+	return
+}
+
+func (pk *PublicKeyV3) setFingerPrintAndKeyId() {
+	// RFC 4880, section 12.2
+	fingerPrint := md5.New()
+	fingerPrint.Write(pk.n.bytes)
+	fingerPrint.Write(pk.e.bytes)
+	fingerPrint.Sum(pk.Fingerprint[:0])
+	pk.KeyId = binary.BigEndian.Uint64(pk.n.bytes[len(pk.n.bytes)-8:])
+}
+
+// parseRSA parses RSA public key material from the given Reader. See RFC 4880,
+// section 5.5.2.
+func (pk *PublicKeyV3) parseRSA(r io.Reader) (err error) {
+	if pk.n.bytes, pk.n.bitLength, err = readMPI(r); err != nil {
+		return
+	}
+	if pk.e.bytes, pk.e.bitLength, err = readMPI(r); err != nil {
+		return
+	}
+
+	if len(pk.e.bytes) > 3 {
+		err = errors.UnsupportedError("large public exponent")
+		return
+	}
+	rsa := &rsa.PublicKey{N: new(big.Int).SetBytes(pk.n.bytes)}
+	for i := 0; i < len(pk.e.bytes); i++ {
+		rsa.E <<= 8
+		rsa.E |= int(pk.e.bytes[i])
+	}
+	pk.PublicKey = rsa
+	return
+}
+
+// SerializeSignaturePrefix writes the prefix for this public key to the given Writer.
+// The prefix is used when calculating a signature over this public key. See
+// RFC 4880, section 5.2.4.
+func (pk *PublicKeyV3) SerializeSignaturePrefix(w io.Writer) {
+	var pLength uint16
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		pLength += 2 + uint16(len(pk.n.bytes))
+		pLength += 2 + uint16(len(pk.e.bytes))
+	default:
+		panic("unknown public key algorithm")
+	}
+	pLength += 6
+	w.Write([]byte{0x99, byte(pLength >> 8), byte(pLength)})
+	return
+}
+
+func (pk *PublicKeyV3) Serialize(w io.Writer) (err error) {
+	length := 8 // 8 byte header
+
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		length += 2 + len(pk.n.bytes)
+		length += 2 + len(pk.e.bytes)
+	default:
+		panic("unknown public key algorithm")
+	}
+
+	packetType := packetTypePublicKey
+	if pk.IsSubkey {
+		packetType = packetTypePublicSubkey
+	}
+	if err = serializeHeader(w, packetType, length); err != nil {
+		return
+	}
+	return pk.serializeWithoutHeaders(w)
+}
+
+// serializeWithoutHeaders marshals the PublicKey to w in the form of an
+// OpenPGP public key packet, not including the packet header.
+func (pk *PublicKeyV3) serializeWithoutHeaders(w io.Writer) (err error) {
+	var buf [8]byte
+	// Version 3
+	buf[0] = 3
+	// Creation time
+	t := uint32(pk.CreationTime.Unix())
+	buf[1] = byte(t >> 24)
+	buf[2] = byte(t >> 16)
+	buf[3] = byte(t >> 8)
+	buf[4] = byte(t)
+	// Days to expire
+	buf[5] = byte(pk.DaysToExpire >> 8)
+	buf[6] = byte(pk.DaysToExpire)
+	// Public key algorithm
+	buf[7] = byte(pk.PubKeyAlgo)
+
+	if _, err = w.Write(buf[:]); err != nil {
+		return
+	}
+
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		return writeMPIs(w, pk.n, pk.e)
+	}
+	return errors.InvalidArgumentError("bad public-key algorithm")
+}
+
+// CanSign returns true iff this public key can generate signatures
+func (pk *PublicKeyV3) CanSign() bool {
+	return pk.PubKeyAlgo != PubKeyAlgoRSAEncryptOnly
+}
+
+// VerifySignatureV3 returns nil iff sig is a valid signature, made by this
+// public key, of the data hashed into signed. signed is mutated by this call.
+func (pk *PublicKeyV3) VerifySignatureV3(signed hash.Hash, sig *SignatureV3) (err error) {
+	if !pk.CanSign() {
+		return errors.InvalidArgumentError("public key cannot generate signatures")
+	}
+
+	suffix := make([]byte, 5)
+	suffix[0] = byte(sig.SigType)
+	binary.BigEndian.PutUint32(suffix[1:], uint32(sig.CreationTime.Unix()))
+	signed.Write(suffix)
+	hashBytes := signed.Sum(nil)
+
+	if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] {
+		return errors.SignatureError("hash tag doesn't match")
+	}
+
+	if pk.PubKeyAlgo != sig.PubKeyAlgo {
+		return errors.InvalidArgumentError("public key and signature use different algorithms")
+	}
+
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
+		if err = rsa.VerifyPKCS1v15(pk.PublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes); err != nil {
+			return errors.SignatureError("RSA verification failure")
+		}
+		return
+	default:
+		// V3 public keys only support RSA.
+		panic("shouldn't happen")
+	}
+	panic("unreachable")
+}
+
+// VerifyUserIdSignatureV3 returns nil iff sig is a valid signature, made by this
+// public key, that id is the identity of pub.
+func (pk *PublicKeyV3) VerifyUserIdSignatureV3(id string, pub *PublicKeyV3, sig *SignatureV3) (err error) {
+	h, err := userIdSignatureV3Hash(id, pk, sig.Hash)
+	if err != nil {
+		return err
+	}
+	return pk.VerifySignatureV3(h, sig)
+}
+
+// VerifyKeySignatureV3 returns nil iff sig is a valid signature, made by this
+// public key, of signed.
+func (pk *PublicKeyV3) VerifyKeySignatureV3(signed *PublicKeyV3, sig *SignatureV3) (err error) {
+	h, err := keySignatureHash(pk, signed, sig.Hash)
+	if err != nil {
+		return err
+	}
+	return pk.VerifySignatureV3(h, sig)
+}
+
+// userIdSignatureV3Hash returns a Hash of the message that needs to be signed
+// to assert that pk is a valid key for id.
+func userIdSignatureV3Hash(id string, pk signingKey, hfn crypto.Hash) (h hash.Hash, err error) {
+	if !hfn.Available() {
+		return nil, errors.UnsupportedError("hash function")
+	}
+	h = hfn.New()
+
+	// RFC 4880, section 5.2.4
+	pk.SerializeSignaturePrefix(h)
+	pk.serializeWithoutHeaders(h)
+
+	h.Write([]byte(id))
+
+	return
+}
+
+// KeyIdString returns the public key's fingerprint in capital hex
+// (e.g. "6C7EE1B8621CC013").
+func (pk *PublicKeyV3) KeyIdString() string {
+	return fmt.Sprintf("%X", pk.KeyId)
+}
+
+// KeyIdShortString returns the short form of public key's fingerprint
+// in capital hex, as shown by gpg --list-keys (e.g. "621CC013").
+func (pk *PublicKeyV3) KeyIdShortString() string {
+	return fmt.Sprintf("%X", pk.KeyId&0xFFFFFFFF)
+}
+
+// BitLength returns the bit length for the given public key.
+func (pk *PublicKeyV3) BitLength() (bitLength uint16, err error) {
+	switch pk.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
+		bitLength = pk.n.bitLength
+	default:
+		err = errors.InvalidArgumentError("bad public-key algorithm")
+	}
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/reader.go b/vendor/golang.org/x/crypto/openpgp/packet/reader.go
new file mode 100644
index 0000000000..753bf8f660
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/reader.go
@@ -0,0 +1,62 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"golang.org/x/crypto/openpgp/errors"
+	"io"
+)
+
+// Reader reads packets from an io.Reader and allows packets to be 'unread' so
+// that they result from the next call to Next.
+type Reader struct {
+	q       []Packet
+	readers []io.Reader
+}
+
+// Next returns the most recently unread Packet, or reads another packet from
+// the top-most io.Reader. Unknown packet types are skipped.
+func (r *Reader) Next() (p Packet, err error) {
+	if len(r.q) > 0 {
+		p = r.q[len(r.q)-1]
+		r.q = r.q[:len(r.q)-1]
+		return
+	}
+
+	for len(r.readers) > 0 {
+		p, err = Read(r.readers[len(r.readers)-1])
+		if err == nil {
+			return
+		}
+		if err == io.EOF {
+			r.readers = r.readers[:len(r.readers)-1]
+			continue
+		}
+		if _, ok := err.(errors.UnknownPacketTypeError); !ok {
+			return nil, err
+		}
+	}
+
+	return nil, io.EOF
+}
+
+// Push causes the Reader to start reading from a new io.Reader. When an EOF
+// error is seen from the new io.Reader, it is popped and the Reader continues
+// to read from the next most recent io.Reader.
+func (r *Reader) Push(reader io.Reader) {
+	r.readers = append(r.readers, reader)
+}
+
+// Unread causes the given Packet to be returned from the next call to Next.
+func (r *Reader) Unread(p Packet) {
+	r.q = append(r.q, p)
+}
+
+func NewReader(r io.Reader) *Reader {
+	return &Reader{
+		q:       nil,
+		readers: []io.Reader{r},
+	}
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/signature.go b/vendor/golang.org/x/crypto/openpgp/packet/signature.go
new file mode 100644
index 0000000000..79cf993f57
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/signature.go
@@ -0,0 +1,663 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"crypto"
+	"crypto/dsa"
+	"crypto/rsa"
+	"encoding/binary"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
+	"hash"
+	"io"
+	"strconv"
+	"time"
+)
+
+const (
+	// See RFC 4880, section 5.2.3.21 for details.
+	KeyFlagCertify = 1 << iota
+	KeyFlagSign
+	KeyFlagEncryptCommunications
+	KeyFlagEncryptStorage
+)
+
+// Signature represents a signature. See RFC 4880, section 5.2.
+type Signature struct {
+	SigType    SignatureType
+	PubKeyAlgo PublicKeyAlgorithm
+	Hash       crypto.Hash
+
+	// HashSuffix is extra data that is hashed in after the signed data.
+	HashSuffix []byte
+	// HashTag contains the first two bytes of the hash for fast rejection
+	// of bad signed data.
+	HashTag      [2]byte
+	CreationTime time.Time
+
+	RSASignature         parsedMPI
+	DSASigR, DSASigS     parsedMPI
+	ECDSASigR, ECDSASigS parsedMPI
+
+	// rawSubpackets contains the unparsed subpackets, in order.
+	rawSubpackets []outputSubpacket
+
+	// The following are optional so are nil when not included in the
+	// signature.
+
+	SigLifetimeSecs, KeyLifetimeSecs                        *uint32
+	PreferredSymmetric, PreferredHash, PreferredCompression []uint8
+	IssuerKeyId                                             *uint64
+	IsPrimaryId                                             *bool
+
+	// FlagsValid is set if any flags were given. See RFC 4880, section
+	// 5.2.3.21 for details.
+	FlagsValid                                                           bool
+	FlagCertify, FlagSign, FlagEncryptCommunications, FlagEncryptStorage bool
+
+	// RevocationReason is set if this signature has been revoked.
+	// See RFC 4880, section 5.2.3.23 for details.
+	RevocationReason     *uint8
+	RevocationReasonText string
+
+	outSubpackets []outputSubpacket
+}
+
+func (sig *Signature) parse(r io.Reader) (err error) {
+	// RFC 4880, section 5.2.3
+	var buf [5]byte
+	_, err = readFull(r, buf[:1])
+	if err != nil {
+		return
+	}
+	if buf[0] != 4 {
+		err = errors.UnsupportedError("signature packet version " + strconv.Itoa(int(buf[0])))
+		return
+	}
+
+	_, err = readFull(r, buf[:5])
+	if err != nil {
+		return
+	}
+	sig.SigType = SignatureType(buf[0])
+	sig.PubKeyAlgo = PublicKeyAlgorithm(buf[1])
+	switch sig.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA, PubKeyAlgoECDSA:
+	default:
+		err = errors.UnsupportedError("public key algorithm " + strconv.Itoa(int(sig.PubKeyAlgo)))
+		return
+	}
+
+	var ok bool
+	sig.Hash, ok = s2k.HashIdToHash(buf[2])
+	if !ok {
+		return errors.UnsupportedError("hash function " + strconv.Itoa(int(buf[2])))
+	}
+
+	hashedSubpacketsLength := int(buf[3])<<8 | int(buf[4])
+	l := 6 + hashedSubpacketsLength
+	sig.HashSuffix = make([]byte, l+6)
+	sig.HashSuffix[0] = 4
+	copy(sig.HashSuffix[1:], buf[:5])
+	hashedSubpackets := sig.HashSuffix[6:l]
+	_, err = readFull(r, hashedSubpackets)
+	if err != nil {
+		return
+	}
+	// See RFC 4880, section 5.2.4
+	trailer := sig.HashSuffix[l:]
+	trailer[0] = 4
+	trailer[1] = 0xff
+	trailer[2] = uint8(l >> 24)
+	trailer[3] = uint8(l >> 16)
+	trailer[4] = uint8(l >> 8)
+	trailer[5] = uint8(l)
+
+	err = parseSignatureSubpackets(sig, hashedSubpackets, true)
+	if err != nil {
+		return
+	}
+
+	_, err = readFull(r, buf[:2])
+	if err != nil {
+		return
+	}
+	unhashedSubpacketsLength := int(buf[0])<<8 | int(buf[1])
+	unhashedSubpackets := make([]byte, unhashedSubpacketsLength)
+	_, err = readFull(r, unhashedSubpackets)
+	if err != nil {
+		return
+	}
+	err = parseSignatureSubpackets(sig, unhashedSubpackets, false)
+	if err != nil {
+		return
+	}
+
+	_, err = readFull(r, sig.HashTag[:2])
+	if err != nil {
+		return
+	}
+
+	switch sig.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
+		sig.RSASignature.bytes, sig.RSASignature.bitLength, err = readMPI(r)
+	case PubKeyAlgoDSA:
+		sig.DSASigR.bytes, sig.DSASigR.bitLength, err = readMPI(r)
+		if err == nil {
+			sig.DSASigS.bytes, sig.DSASigS.bitLength, err = readMPI(r)
+		}
+	case PubKeyAlgoECDSA:
+		sig.ECDSASigR.bytes, sig.ECDSASigR.bitLength, err = readMPI(r)
+		if err == nil {
+			sig.ECDSASigS.bytes, sig.ECDSASigS.bitLength, err = readMPI(r)
+		}
+	default:
+		panic("unreachable")
+	}
+	return
+}
+
+// parseSignatureSubpackets parses subpackets of the main signature packet. See
+// RFC 4880, section 5.2.3.1.
+func parseSignatureSubpackets(sig *Signature, subpackets []byte, isHashed bool) (err error) {
+	for len(subpackets) > 0 {
+		subpackets, err = parseSignatureSubpacket(sig, subpackets, isHashed)
+		if err != nil {
+			return
+		}
+	}
+
+	if sig.CreationTime.IsZero() {
+		err = errors.StructuralError("no creation time in signature")
+	}
+
+	return
+}
+
+type signatureSubpacketType uint8
+
+const (
+	creationTimeSubpacket        signatureSubpacketType = 2
+	signatureExpirationSubpacket signatureSubpacketType = 3
+	keyExpirationSubpacket       signatureSubpacketType = 9
+	prefSymmetricAlgosSubpacket  signatureSubpacketType = 11
+	issuerSubpacket              signatureSubpacketType = 16
+	prefHashAlgosSubpacket       signatureSubpacketType = 21
+	prefCompressionSubpacket     signatureSubpacketType = 22
+	primaryUserIdSubpacket       signatureSubpacketType = 25
+	keyFlagsSubpacket            signatureSubpacketType = 27
+	reasonForRevocationSubpacket signatureSubpacketType = 29
+)
+
+// parseSignatureSubpacket parses a single subpacket. len(subpacket) is >= 1.
+func parseSignatureSubpacket(sig *Signature, subpacket []byte, isHashed bool) (rest []byte, err error) {
+	// RFC 4880, section 5.2.3.1
+	var (
+		length     uint32
+		packetType signatureSubpacketType
+		isCritical bool
+	)
+	switch {
+	case subpacket[0] < 192:
+		length = uint32(subpacket[0])
+		subpacket = subpacket[1:]
+	case subpacket[0] < 255:
+		if len(subpacket) < 2 {
+			goto Truncated
+		}
+		length = uint32(subpacket[0]-192)<<8 + uint32(subpacket[1]) + 192
+		subpacket = subpacket[2:]
+	default:
+		if len(subpacket) < 5 {
+			goto Truncated
+		}
+		length = uint32(subpacket[1])<<24 |
+			uint32(subpacket[2])<<16 |
+			uint32(subpacket[3])<<8 |
+			uint32(subpacket[4])
+		subpacket = subpacket[5:]
+	}
+	if length > uint32(len(subpacket)) {
+		goto Truncated
+	}
+	rest = subpacket[length:]
+	subpacket = subpacket[:length]
+	if len(subpacket) == 0 {
+		err = errors.StructuralError("zero length signature subpacket")
+		return
+	}
+	packetType = signatureSubpacketType(subpacket[0] & 0x7f)
+	isCritical = subpacket[0]&0x80 == 0x80
+	subpacket = subpacket[1:]
+	sig.rawSubpackets = append(sig.rawSubpackets, outputSubpacket{isHashed, packetType, isCritical, subpacket})
+	switch packetType {
+	case creationTimeSubpacket:
+		if !isHashed {
+			err = errors.StructuralError("signature creation time in non-hashed area")
+			return
+		}
+		if len(subpacket) != 4 {
+			err = errors.StructuralError("signature creation time not four bytes")
+			return
+		}
+		t := binary.BigEndian.Uint32(subpacket)
+		sig.CreationTime = time.Unix(int64(t), 0)
+	case signatureExpirationSubpacket:
+		// Signature expiration time, section 5.2.3.10
+		if !isHashed {
+			return
+		}
+		if len(subpacket) != 4 {
+			err = errors.StructuralError("expiration subpacket with bad length")
+			return
+		}
+		sig.SigLifetimeSecs = new(uint32)
+		*sig.SigLifetimeSecs = binary.BigEndian.Uint32(subpacket)
+	case keyExpirationSubpacket:
+		// Key expiration time, section 5.2.3.6
+		if !isHashed {
+			return
+		}
+		if len(subpacket) != 4 {
+			err = errors.StructuralError("key expiration subpacket with bad length")
+			return
+		}
+		sig.KeyLifetimeSecs = new(uint32)
+		*sig.KeyLifetimeSecs = binary.BigEndian.Uint32(subpacket)
+	case prefSymmetricAlgosSubpacket:
+		// Preferred symmetric algorithms, section 5.2.3.7
+		if !isHashed {
+			return
+		}
+		sig.PreferredSymmetric = make([]byte, len(subpacket))
+		copy(sig.PreferredSymmetric, subpacket)
+	case issuerSubpacket:
+		// Issuer, section 5.2.3.5
+		if len(subpacket) != 8 {
+			err = errors.StructuralError("issuer subpacket with bad length")
+			return
+		}
+		sig.IssuerKeyId = new(uint64)
+		*sig.IssuerKeyId = binary.BigEndian.Uint64(subpacket)
+	case prefHashAlgosSubpacket:
+		// Preferred hash algorithms, section 5.2.3.8
+		if !isHashed {
+			return
+		}
+		sig.PreferredHash = make([]byte, len(subpacket))
+		copy(sig.PreferredHash, subpacket)
+	case prefCompressionSubpacket:
+		// Preferred compression algorithms, section 5.2.3.9
+		if !isHashed {
+			return
+		}
+		sig.PreferredCompression = make([]byte, len(subpacket))
+		copy(sig.PreferredCompression, subpacket)
+	case primaryUserIdSubpacket:
+		// Primary User ID, section 5.2.3.19
+		if !isHashed {
+			return
+		}
+		if len(subpacket) != 1 {
+			err = errors.StructuralError("primary user id subpacket with bad length")
+			return
+		}
+		sig.IsPrimaryId = new(bool)
+		if subpacket[0] > 0 {
+			*sig.IsPrimaryId = true
+		}
+	case keyFlagsSubpacket:
+		// Key flags, section 5.2.3.21
+		if !isHashed {
+			return
+		}
+		if len(subpacket) == 0 {
+			err = errors.StructuralError("empty key flags subpacket")
+			return
+		}
+		sig.FlagsValid = true
+		if subpacket[0]&KeyFlagCertify != 0 {
+			sig.FlagCertify = true
+		}
+		if subpacket[0]&KeyFlagSign != 0 {
+			sig.FlagSign = true
+		}
+		if subpacket[0]&KeyFlagEncryptCommunications != 0 {
+			sig.FlagEncryptCommunications = true
+		}
+		if subpacket[0]&KeyFlagEncryptStorage != 0 {
+			sig.FlagEncryptStorage = true
+		}
+	case reasonForRevocationSubpacket:
+		// Reason For Revocation, section 5.2.3.23
+		if !isHashed {
+			return
+		}
+		if len(subpacket) == 0 {
+			err = errors.StructuralError("empty revocation reason subpacket")
+			return
+		}
+		sig.RevocationReason = new(uint8)
+		*sig.RevocationReason = subpacket[0]
+		sig.RevocationReasonText = string(subpacket[1:])
+
+	default:
+		if isCritical {
+			err = errors.UnsupportedError("unknown critical signature subpacket type " + strconv.Itoa(int(packetType)))
+			return
+		}
+	}
+	return
+
+Truncated:
+	err = errors.StructuralError("signature subpacket truncated")
+	return
+}
+
+// subpacketLengthLength returns the length, in bytes, of an encoded length value.
+func subpacketLengthLength(length int) int {
+	if length < 192 {
+		return 1
+	}
+	if length < 16320 {
+		return 2
+	}
+	return 5
+}
+
+// serializeSubpacketLength marshals the given length into to.
+func serializeSubpacketLength(to []byte, length int) int {
+	// RFC 4880, Section 4.2.2.
+	if length < 192 {
+		to[0] = byte(length)
+		return 1
+	}
+	if length < 16320 {
+		length -= 192
+		to[0] = byte((length >> 8) + 192)
+		to[1] = byte(length)
+		return 2
+	}
+	to[0] = 255
+	to[1] = byte(length >> 24)
+	to[2] = byte(length >> 16)
+	to[3] = byte(length >> 8)
+	to[4] = byte(length)
+	return 5
+}
+
+// subpacketsLength returns the serialized length, in bytes, of the given
+// subpackets.
+func subpacketsLength(subpackets []outputSubpacket, hashed bool) (length int) {
+	for _, subpacket := range subpackets {
+		if subpacket.hashed == hashed {
+			length += subpacketLengthLength(len(subpacket.contents) + 1)
+			length += 1 // type byte
+			length += len(subpacket.contents)
+		}
+	}
+	return
+}
+
+// serializeSubpackets marshals the given subpackets into to.
+func serializeSubpackets(to []byte, subpackets []outputSubpacket, hashed bool) {
+	for _, subpacket := range subpackets {
+		if subpacket.hashed == hashed {
+			n := serializeSubpacketLength(to, len(subpacket.contents)+1)
+			to[n] = byte(subpacket.subpacketType)
+			to = to[1+n:]
+			n = copy(to, subpacket.contents)
+			to = to[n:]
+		}
+	}
+	return
+}
+
+// KeyExpired returns whether sig is a self-signature of a key that has
+// expired.
+func (sig *Signature) KeyExpired(currentTime time.Time) bool {
+	if sig.KeyLifetimeSecs == nil {
+		return false
+	}
+	expiry := sig.CreationTime.Add(time.Duration(*sig.KeyLifetimeSecs) * time.Second)
+	return currentTime.After(expiry)
+}
+
+// buildHashSuffix constructs the HashSuffix member of sig in preparation for signing.
+func (sig *Signature) buildHashSuffix() (err error) {
+	hashedSubpacketsLen := subpacketsLength(sig.outSubpackets, true)
+
+	var ok bool
+	l := 6 + hashedSubpacketsLen
+	sig.HashSuffix = make([]byte, l+6)
+	sig.HashSuffix[0] = 4
+	sig.HashSuffix[1] = uint8(sig.SigType)
+	sig.HashSuffix[2] = uint8(sig.PubKeyAlgo)
+	sig.HashSuffix[3], ok = s2k.HashToHashId(sig.Hash)
+	if !ok {
+		sig.HashSuffix = nil
+		return errors.InvalidArgumentError("hash cannot be represented in OpenPGP: " + strconv.Itoa(int(sig.Hash)))
+	}
+	sig.HashSuffix[4] = byte(hashedSubpacketsLen >> 8)
+	sig.HashSuffix[5] = byte(hashedSubpacketsLen)
+	serializeSubpackets(sig.HashSuffix[6:l], sig.outSubpackets, true)
+	trailer := sig.HashSuffix[l:]
+	trailer[0] = 4
+	trailer[1] = 0xff
+	trailer[2] = byte(l >> 24)
+	trailer[3] = byte(l >> 16)
+	trailer[4] = byte(l >> 8)
+	trailer[5] = byte(l)
+	return
+}
+
+func (sig *Signature) signPrepareHash(h hash.Hash) (digest []byte, err error) {
+	err = sig.buildHashSuffix()
+	if err != nil {
+		return
+	}
+
+	h.Write(sig.HashSuffix)
+	digest = h.Sum(nil)
+	copy(sig.HashTag[:], digest)
+	return
+}
+
+// Sign signs a message with a private key. The hash, h, must contain
+// the hash of the message to be signed and will be mutated by this function.
+// On success, the signature is stored in sig. Call Serialize to write it out.
+// If config is nil, sensible defaults will be used.
+func (sig *Signature) Sign(h hash.Hash, priv *PrivateKey, config *Config) (err error) {
+	sig.outSubpackets = sig.buildSubpackets()
+	digest, err := sig.signPrepareHash(h)
+	if err != nil {
+		return
+	}
+
+	switch priv.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
+		sig.RSASignature.bytes, err = rsa.SignPKCS1v15(config.Random(), priv.PrivateKey.(*rsa.PrivateKey), sig.Hash, digest)
+		sig.RSASignature.bitLength = uint16(8 * len(sig.RSASignature.bytes))
+	case PubKeyAlgoDSA:
+		dsaPriv := priv.PrivateKey.(*dsa.PrivateKey)
+
+		// Need to truncate hashBytes to match FIPS 186-3 section 4.6.
+		subgroupSize := (dsaPriv.Q.BitLen() + 7) / 8
+		if len(digest) > subgroupSize {
+			digest = digest[:subgroupSize]
+		}
+		r, s, err := dsa.Sign(config.Random(), dsaPriv, digest)
+		if err == nil {
+			sig.DSASigR.bytes = r.Bytes()
+			sig.DSASigR.bitLength = uint16(8 * len(sig.DSASigR.bytes))
+			sig.DSASigS.bytes = s.Bytes()
+			sig.DSASigS.bitLength = uint16(8 * len(sig.DSASigS.bytes))
+		}
+	default:
+		err = errors.UnsupportedError("public key algorithm: " + strconv.Itoa(int(sig.PubKeyAlgo)))
+	}
+
+	return
+}
+
+// SignUserId computes a signature from priv, asserting that pub is a valid
+// key for the identity id.  On success, the signature is stored in sig. Call
+// Serialize to write it out.
+// If config is nil, sensible defaults will be used.
+func (sig *Signature) SignUserId(id string, pub *PublicKey, priv *PrivateKey, config *Config) error {
+	h, err := userIdSignatureHash(id, pub, sig.Hash)
+	if err != nil {
+		return nil
+	}
+	return sig.Sign(h, priv, config)
+}
+
+// SignKey computes a signature from priv, asserting that pub is a subkey. On
+// success, the signature is stored in sig. Call Serialize to write it out.
+// If config is nil, sensible defaults will be used.
+func (sig *Signature) SignKey(pub *PublicKey, priv *PrivateKey, config *Config) error {
+	h, err := keySignatureHash(&priv.PublicKey, pub, sig.Hash)
+	if err != nil {
+		return err
+	}
+	return sig.Sign(h, priv, config)
+}
+
+// Serialize marshals sig to w. Sign, SignUserId or SignKey must have been
+// called first.
+func (sig *Signature) Serialize(w io.Writer) (err error) {
+	if len(sig.outSubpackets) == 0 {
+		sig.outSubpackets = sig.rawSubpackets
+	}
+	if sig.RSASignature.bytes == nil && sig.DSASigR.bytes == nil && sig.ECDSASigR.bytes == nil {
+		return errors.InvalidArgumentError("Signature: need to call Sign, SignUserId or SignKey before Serialize")
+	}
+
+	sigLength := 0
+	switch sig.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
+		sigLength = 2 + len(sig.RSASignature.bytes)
+	case PubKeyAlgoDSA:
+		sigLength = 2 + len(sig.DSASigR.bytes)
+		sigLength += 2 + len(sig.DSASigS.bytes)
+	case PubKeyAlgoECDSA:
+		sigLength = 2 + len(sig.ECDSASigR.bytes)
+		sigLength += 2 + len(sig.ECDSASigS.bytes)
+	default:
+		panic("impossible")
+	}
+
+	unhashedSubpacketsLen := subpacketsLength(sig.outSubpackets, false)
+	length := len(sig.HashSuffix) - 6 /* trailer not included */ +
+		2 /* length of unhashed subpackets */ + unhashedSubpacketsLen +
+		2 /* hash tag */ + sigLength
+	err = serializeHeader(w, packetTypeSignature, length)
+	if err != nil {
+		return
+	}
+
+	_, err = w.Write(sig.HashSuffix[:len(sig.HashSuffix)-6])
+	if err != nil {
+		return
+	}
+
+	unhashedSubpackets := make([]byte, 2+unhashedSubpacketsLen)
+	unhashedSubpackets[0] = byte(unhashedSubpacketsLen >> 8)
+	unhashedSubpackets[1] = byte(unhashedSubpacketsLen)
+	serializeSubpackets(unhashedSubpackets[2:], sig.outSubpackets, false)
+
+	_, err = w.Write(unhashedSubpackets)
+	if err != nil {
+		return
+	}
+	_, err = w.Write(sig.HashTag[:])
+	if err != nil {
+		return
+	}
+
+	switch sig.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
+		err = writeMPIs(w, sig.RSASignature)
+	case PubKeyAlgoDSA:
+		err = writeMPIs(w, sig.DSASigR, sig.DSASigS)
+	case PubKeyAlgoECDSA:
+		err = writeMPIs(w, sig.ECDSASigR, sig.ECDSASigS)
+	default:
+		panic("impossible")
+	}
+	return
+}
+
+// outputSubpacket represents a subpacket to be marshaled.
+type outputSubpacket struct {
+	hashed        bool // true if this subpacket is in the hashed area.
+	subpacketType signatureSubpacketType
+	isCritical    bool
+	contents      []byte
+}
+
+func (sig *Signature) buildSubpackets() (subpackets []outputSubpacket) {
+	creationTime := make([]byte, 4)
+	binary.BigEndian.PutUint32(creationTime, uint32(sig.CreationTime.Unix()))
+	subpackets = append(subpackets, outputSubpacket{true, creationTimeSubpacket, false, creationTime})
+
+	if sig.IssuerKeyId != nil {
+		keyId := make([]byte, 8)
+		binary.BigEndian.PutUint64(keyId, *sig.IssuerKeyId)
+		subpackets = append(subpackets, outputSubpacket{true, issuerSubpacket, false, keyId})
+	}
+
+	if sig.SigLifetimeSecs != nil && *sig.SigLifetimeSecs != 0 {
+		sigLifetime := make([]byte, 4)
+		binary.BigEndian.PutUint32(sigLifetime, *sig.SigLifetimeSecs)
+		subpackets = append(subpackets, outputSubpacket{true, signatureExpirationSubpacket, true, sigLifetime})
+	}
+
+	// Key flags may only appear in self-signatures or certification signatures.
+
+	if sig.FlagsValid {
+		var flags byte
+		if sig.FlagCertify {
+			flags |= KeyFlagCertify
+		}
+		if sig.FlagSign {
+			flags |= KeyFlagSign
+		}
+		if sig.FlagEncryptCommunications {
+			flags |= KeyFlagEncryptCommunications
+		}
+		if sig.FlagEncryptStorage {
+			flags |= KeyFlagEncryptStorage
+		}
+		subpackets = append(subpackets, outputSubpacket{true, keyFlagsSubpacket, false, []byte{flags}})
+	}
+
+	// The following subpackets may only appear in self-signatures
+
+	if sig.KeyLifetimeSecs != nil && *sig.KeyLifetimeSecs != 0 {
+		keyLifetime := make([]byte, 4)
+		binary.BigEndian.PutUint32(keyLifetime, *sig.KeyLifetimeSecs)
+		subpackets = append(subpackets, outputSubpacket{true, keyExpirationSubpacket, true, keyLifetime})
+	}
+
+	if sig.IsPrimaryId != nil && *sig.IsPrimaryId {
+		subpackets = append(subpackets, outputSubpacket{true, primaryUserIdSubpacket, false, []byte{1}})
+	}
+
+	if len(sig.PreferredSymmetric) > 0 {
+		subpackets = append(subpackets, outputSubpacket{true, prefSymmetricAlgosSubpacket, false, sig.PreferredSymmetric})
+	}
+
+	if len(sig.PreferredHash) > 0 {
+		subpackets = append(subpackets, outputSubpacket{true, prefHashAlgosSubpacket, false, sig.PreferredHash})
+	}
+
+	if len(sig.PreferredCompression) > 0 {
+		subpackets = append(subpackets, outputSubpacket{true, prefCompressionSubpacket, false, sig.PreferredCompression})
+	}
+
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/signature_v3.go b/vendor/golang.org/x/crypto/openpgp/packet/signature_v3.go
new file mode 100644
index 0000000000..6edff88934
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/signature_v3.go
@@ -0,0 +1,146 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"crypto"
+	"encoding/binary"
+	"fmt"
+	"io"
+	"strconv"
+	"time"
+
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
+)
+
+// SignatureV3 represents older version 3 signatures. These signatures are less secure
+// than version 4 and should not be used to create new signatures. They are included
+// here for backwards compatibility to read and validate with older key material.
+// See RFC 4880, section 5.2.2.
+type SignatureV3 struct {
+	SigType      SignatureType
+	CreationTime time.Time
+	IssuerKeyId  uint64
+	PubKeyAlgo   PublicKeyAlgorithm
+	Hash         crypto.Hash
+	HashTag      [2]byte
+
+	RSASignature     parsedMPI
+	DSASigR, DSASigS parsedMPI
+}
+
+func (sig *SignatureV3) parse(r io.Reader) (err error) {
+	// RFC 4880, section 5.2.2
+	var buf [8]byte
+	if _, err = readFull(r, buf[:1]); err != nil {
+		return
+	}
+	if buf[0] < 2 || buf[0] > 3 {
+		err = errors.UnsupportedError("signature packet version " + strconv.Itoa(int(buf[0])))
+		return
+	}
+	if _, err = readFull(r, buf[:1]); err != nil {
+		return
+	}
+	if buf[0] != 5 {
+		err = errors.UnsupportedError(
+			"invalid hashed material length " + strconv.Itoa(int(buf[0])))
+		return
+	}
+
+	// Read hashed material: signature type + creation time
+	if _, err = readFull(r, buf[:5]); err != nil {
+		return
+	}
+	sig.SigType = SignatureType(buf[0])
+	t := binary.BigEndian.Uint32(buf[1:5])
+	sig.CreationTime = time.Unix(int64(t), 0)
+
+	// Eight-octet Key ID of signer.
+	if _, err = readFull(r, buf[:8]); err != nil {
+		return
+	}
+	sig.IssuerKeyId = binary.BigEndian.Uint64(buf[:])
+
+	// Public-key and hash algorithm
+	if _, err = readFull(r, buf[:2]); err != nil {
+		return
+	}
+	sig.PubKeyAlgo = PublicKeyAlgorithm(buf[0])
+	switch sig.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA:
+	default:
+		err = errors.UnsupportedError("public key algorithm " + strconv.Itoa(int(sig.PubKeyAlgo)))
+		return
+	}
+	var ok bool
+	if sig.Hash, ok = s2k.HashIdToHash(buf[1]); !ok {
+		return errors.UnsupportedError("hash function " + strconv.Itoa(int(buf[2])))
+	}
+
+	// Two-octet field holding left 16 bits of signed hash value.
+	if _, err = readFull(r, sig.HashTag[:2]); err != nil {
+		return
+	}
+
+	switch sig.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
+		sig.RSASignature.bytes, sig.RSASignature.bitLength, err = readMPI(r)
+	case PubKeyAlgoDSA:
+		if sig.DSASigR.bytes, sig.DSASigR.bitLength, err = readMPI(r); err != nil {
+			return
+		}
+		sig.DSASigS.bytes, sig.DSASigS.bitLength, err = readMPI(r)
+	default:
+		panic("unreachable")
+	}
+	return
+}
+
+// Serialize marshals sig to w. Sign, SignUserId or SignKey must have been
+// called first.
+func (sig *SignatureV3) Serialize(w io.Writer) (err error) {
+	buf := make([]byte, 8)
+
+	// Write the sig type and creation time
+	buf[0] = byte(sig.SigType)
+	binary.BigEndian.PutUint32(buf[1:5], uint32(sig.CreationTime.Unix()))
+	if _, err = w.Write(buf[:5]); err != nil {
+		return
+	}
+
+	// Write the issuer long key ID
+	binary.BigEndian.PutUint64(buf[:8], sig.IssuerKeyId)
+	if _, err = w.Write(buf[:8]); err != nil {
+		return
+	}
+
+	// Write public key algorithm, hash ID, and hash value
+	buf[0] = byte(sig.PubKeyAlgo)
+	hashId, ok := s2k.HashToHashId(sig.Hash)
+	if !ok {
+		return errors.UnsupportedError(fmt.Sprintf("hash function %v", sig.Hash))
+	}
+	buf[1] = hashId
+	copy(buf[2:4], sig.HashTag[:])
+	if _, err = w.Write(buf[:4]); err != nil {
+		return
+	}
+
+	if sig.RSASignature.bytes == nil && sig.DSASigR.bytes == nil {
+		return errors.InvalidArgumentError("Signature: need to call Sign, SignUserId or SignKey before Serialize")
+	}
+
+	switch sig.PubKeyAlgo {
+	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
+		err = writeMPIs(w, sig.RSASignature)
+	case PubKeyAlgoDSA:
+		err = writeMPIs(w, sig.DSASigR, sig.DSASigS)
+	default:
+		panic("impossible")
+	}
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go b/vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
new file mode 100644
index 0000000000..7dff655221
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
@@ -0,0 +1,164 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"bytes"
+	"crypto/cipher"
+	"io"
+	"strconv"
+
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/s2k"
+)
+
+// This is the largest session key that we'll support. Since no 512-bit cipher
+// has even been seriously used, this is comfortably large.
+const maxSessionKeySizeInBytes = 64
+
+// SymmetricKeyEncrypted represents a passphrase protected session key. See RFC
+// 4880, section 5.3.
+type SymmetricKeyEncrypted struct {
+	CipherFunc   CipherFunction
+	Encrypted    bool
+	Key          []byte // Empty unless Encrypted is false.
+	s2k          func(out, in []byte)
+	encryptedKey []byte
+}
+
+const symmetricKeyEncryptedVersion = 4
+
+func (ske *SymmetricKeyEncrypted) parse(r io.Reader) (err error) {
+	// RFC 4880, section 5.3.
+	var buf [2]byte
+	_, err = readFull(r, buf[:])
+	if err != nil {
+		return
+	}
+	if buf[0] != symmetricKeyEncryptedVersion {
+		return errors.UnsupportedError("SymmetricKeyEncrypted version")
+	}
+	ske.CipherFunc = CipherFunction(buf[1])
+
+	if ske.CipherFunc.KeySize() == 0 {
+		return errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(buf[1])))
+	}
+
+	ske.s2k, err = s2k.Parse(r)
+	if err != nil {
+		return
+	}
+
+	encryptedKey := make([]byte, maxSessionKeySizeInBytes)
+	// The session key may follow. We just have to try and read to find
+	// out. If it exists then we limit it to maxSessionKeySizeInBytes.
+	n, err := readFull(r, encryptedKey)
+	if err != nil && err != io.ErrUnexpectedEOF {
+		return
+	}
+	err = nil
+	if n != 0 {
+		if n == maxSessionKeySizeInBytes {
+			return errors.UnsupportedError("oversized encrypted session key")
+		}
+		ske.encryptedKey = encryptedKey[:n]
+	}
+
+	ske.Encrypted = true
+
+	return
+}
+
+// Decrypt attempts to decrypt an encrypted session key. If it returns nil,
+// ske.Key will contain the session key.
+func (ske *SymmetricKeyEncrypted) Decrypt(passphrase []byte) error {
+	if !ske.Encrypted {
+		return nil
+	}
+
+	key := make([]byte, ske.CipherFunc.KeySize())
+	ske.s2k(key, passphrase)
+
+	if len(ske.encryptedKey) == 0 {
+		ske.Key = key
+	} else {
+		// the IV is all zeros
+		iv := make([]byte, ske.CipherFunc.blockSize())
+		c := cipher.NewCFBDecrypter(ske.CipherFunc.new(key), iv)
+		c.XORKeyStream(ske.encryptedKey, ske.encryptedKey)
+		ske.CipherFunc = CipherFunction(ske.encryptedKey[0])
+		if ske.CipherFunc.blockSize() == 0 {
+			return errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(ske.CipherFunc)))
+		}
+		ske.CipherFunc = CipherFunction(ske.encryptedKey[0])
+		ske.Key = ske.encryptedKey[1:]
+		if len(ske.Key)%ske.CipherFunc.blockSize() != 0 {
+			ske.Key = nil
+			return errors.StructuralError("length of decrypted key not a multiple of block size")
+		}
+	}
+
+	ske.Encrypted = false
+	return nil
+}
+
+// SerializeSymmetricKeyEncrypted serializes a symmetric key packet to w. The
+// packet contains a random session key, encrypted by a key derived from the
+// given passphrase. The session key is returned and must be passed to
+// SerializeSymmetricallyEncrypted.
+// If config is nil, sensible defaults will be used.
+func SerializeSymmetricKeyEncrypted(w io.Writer, passphrase []byte, config *Config) (key []byte, err error) {
+	cipherFunc := config.Cipher()
+	keySize := cipherFunc.KeySize()
+	if keySize == 0 {
+		return nil, errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(cipherFunc)))
+	}
+
+	s2kBuf := new(bytes.Buffer)
+	keyEncryptingKey := make([]byte, keySize)
+	// s2k.Serialize salts and stretches the passphrase, and writes the
+	// resulting key to keyEncryptingKey and the s2k descriptor to s2kBuf.
+	err = s2k.Serialize(s2kBuf, keyEncryptingKey, config.Random(), passphrase, &s2k.Config{Hash: config.Hash(), S2KCount: config.PasswordHashIterations()})
+	if err != nil {
+		return
+	}
+	s2kBytes := s2kBuf.Bytes()
+
+	packetLength := 2 /* header */ + len(s2kBytes) + 1 /* cipher type */ + keySize
+	err = serializeHeader(w, packetTypeSymmetricKeyEncrypted, packetLength)
+	if err != nil {
+		return
+	}
+
+	var buf [2]byte
+	buf[0] = symmetricKeyEncryptedVersion
+	buf[1] = byte(cipherFunc)
+	_, err = w.Write(buf[:])
+	if err != nil {
+		return
+	}
+	_, err = w.Write(s2kBytes)
+	if err != nil {
+		return
+	}
+
+	sessionKey := make([]byte, keySize)
+	_, err = io.ReadFull(config.Random(), sessionKey)
+	if err != nil {
+		return
+	}
+	iv := make([]byte, cipherFunc.blockSize())
+	c := cipher.NewCFBEncrypter(cipherFunc.new(keyEncryptingKey), iv)
+	encryptedCipherAndKey := make([]byte, keySize+1)
+	c.XORKeyStream(encryptedCipherAndKey, buf[1:])
+	c.XORKeyStream(encryptedCipherAndKey[1:], sessionKey)
+	_, err = w.Write(encryptedCipherAndKey)
+	if err != nil {
+		return
+	}
+
+	key = sessionKey
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go b/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
new file mode 100644
index 0000000000..6126030eb9
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
@@ -0,0 +1,290 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"crypto/cipher"
+	"crypto/sha1"
+	"crypto/subtle"
+	"golang.org/x/crypto/openpgp/errors"
+	"hash"
+	"io"
+	"strconv"
+)
+
+// SymmetricallyEncrypted represents a symmetrically encrypted byte string. The
+// encrypted contents will consist of more OpenPGP packets. See RFC 4880,
+// sections 5.7 and 5.13.
+type SymmetricallyEncrypted struct {
+	MDC      bool // true iff this is a type 18 packet and thus has an embedded MAC.
+	contents io.Reader
+	prefix   []byte
+}
+
+const symmetricallyEncryptedVersion = 1
+
+func (se *SymmetricallyEncrypted) parse(r io.Reader) error {
+	if se.MDC {
+		// See RFC 4880, section 5.13.
+		var buf [1]byte
+		_, err := readFull(r, buf[:])
+		if err != nil {
+			return err
+		}
+		if buf[0] != symmetricallyEncryptedVersion {
+			return errors.UnsupportedError("unknown SymmetricallyEncrypted version")
+		}
+	}
+	se.contents = r
+	return nil
+}
+
+// Decrypt returns a ReadCloser, from which the decrypted contents of the
+// packet can be read. An incorrect key can, with high probability, be detected
+// immediately and this will result in a KeyIncorrect error being returned.
+func (se *SymmetricallyEncrypted) Decrypt(c CipherFunction, key []byte) (io.ReadCloser, error) {
+	keySize := c.KeySize()
+	if keySize == 0 {
+		return nil, errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(c)))
+	}
+	if len(key) != keySize {
+		return nil, errors.InvalidArgumentError("SymmetricallyEncrypted: incorrect key length")
+	}
+
+	if se.prefix == nil {
+		se.prefix = make([]byte, c.blockSize()+2)
+		_, err := readFull(se.contents, se.prefix)
+		if err != nil {
+			return nil, err
+		}
+	} else if len(se.prefix) != c.blockSize()+2 {
+		return nil, errors.InvalidArgumentError("can't try ciphers with different block lengths")
+	}
+
+	ocfbResync := OCFBResync
+	if se.MDC {
+		// MDC packets use a different form of OCFB mode.
+		ocfbResync = OCFBNoResync
+	}
+
+	s := NewOCFBDecrypter(c.new(key), se.prefix, ocfbResync)
+	if s == nil {
+		return nil, errors.ErrKeyIncorrect
+	}
+
+	plaintext := cipher.StreamReader{S: s, R: se.contents}
+
+	if se.MDC {
+		// MDC packets have an embedded hash that we need to check.
+		h := sha1.New()
+		h.Write(se.prefix)
+		return &seMDCReader{in: plaintext, h: h}, nil
+	}
+
+	// Otherwise, we just need to wrap plaintext so that it's a valid ReadCloser.
+	return seReader{plaintext}, nil
+}
+
+// seReader wraps an io.Reader with a no-op Close method.
+type seReader struct {
+	in io.Reader
+}
+
+func (ser seReader) Read(buf []byte) (int, error) {
+	return ser.in.Read(buf)
+}
+
+func (ser seReader) Close() error {
+	return nil
+}
+
+const mdcTrailerSize = 1 /* tag byte */ + 1 /* length byte */ + sha1.Size
+
+// An seMDCReader wraps an io.Reader, maintains a running hash and keeps hold
+// of the most recent 22 bytes (mdcTrailerSize). Upon EOF, those bytes form an
+// MDC packet containing a hash of the previous contents which is checked
+// against the running hash. See RFC 4880, section 5.13.
+type seMDCReader struct {
+	in          io.Reader
+	h           hash.Hash
+	trailer     [mdcTrailerSize]byte
+	scratch     [mdcTrailerSize]byte
+	trailerUsed int
+	error       bool
+	eof         bool
+}
+
+func (ser *seMDCReader) Read(buf []byte) (n int, err error) {
+	if ser.error {
+		err = io.ErrUnexpectedEOF
+		return
+	}
+	if ser.eof {
+		err = io.EOF
+		return
+	}
+
+	// If we haven't yet filled the trailer buffer then we must do that
+	// first.
+	for ser.trailerUsed < mdcTrailerSize {
+		n, err = ser.in.Read(ser.trailer[ser.trailerUsed:])
+		ser.trailerUsed += n
+		if err == io.EOF {
+			if ser.trailerUsed != mdcTrailerSize {
+				n = 0
+				err = io.ErrUnexpectedEOF
+				ser.error = true
+				return
+			}
+			ser.eof = true
+			n = 0
+			return
+		}
+
+		if err != nil {
+			n = 0
+			return
+		}
+	}
+
+	// If it's a short read then we read into a temporary buffer and shift
+	// the data into the caller's buffer.
+	if len(buf) <= mdcTrailerSize {
+		n, err = readFull(ser.in, ser.scratch[:len(buf)])
+		copy(buf, ser.trailer[:n])
+		ser.h.Write(buf[:n])
+		copy(ser.trailer[:], ser.trailer[n:])
+		copy(ser.trailer[mdcTrailerSize-n:], ser.scratch[:])
+		if n < len(buf) {
+			ser.eof = true
+			err = io.EOF
+		}
+		return
+	}
+
+	n, err = ser.in.Read(buf[mdcTrailerSize:])
+	copy(buf, ser.trailer[:])
+	ser.h.Write(buf[:n])
+	copy(ser.trailer[:], buf[n:])
+
+	if err == io.EOF {
+		ser.eof = true
+	}
+	return
+}
+
+// This is a new-format packet tag byte for a type 19 (MDC) packet.
+const mdcPacketTagByte = byte(0x80) | 0x40 | 19
+
+func (ser *seMDCReader) Close() error {
+	if ser.error {
+		return errors.SignatureError("error during reading")
+	}
+
+	for !ser.eof {
+		// We haven't seen EOF so we need to read to the end
+		var buf [1024]byte
+		_, err := ser.Read(buf[:])
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return errors.SignatureError("error during reading")
+		}
+	}
+
+	if ser.trailer[0] != mdcPacketTagByte || ser.trailer[1] != sha1.Size {
+		return errors.SignatureError("MDC packet not found")
+	}
+	ser.h.Write(ser.trailer[:2])
+
+	final := ser.h.Sum(nil)
+	if subtle.ConstantTimeCompare(final, ser.trailer[2:]) != 1 {
+		return errors.SignatureError("hash mismatch")
+	}
+	return nil
+}
+
+// An seMDCWriter writes through to an io.WriteCloser while maintains a running
+// hash of the data written. On close, it emits an MDC packet containing the
+// running hash.
+type seMDCWriter struct {
+	w io.WriteCloser
+	h hash.Hash
+}
+
+func (w *seMDCWriter) Write(buf []byte) (n int, err error) {
+	w.h.Write(buf)
+	return w.w.Write(buf)
+}
+
+func (w *seMDCWriter) Close() (err error) {
+	var buf [mdcTrailerSize]byte
+
+	buf[0] = mdcPacketTagByte
+	buf[1] = sha1.Size
+	w.h.Write(buf[:2])
+	digest := w.h.Sum(nil)
+	copy(buf[2:], digest)
+
+	_, err = w.w.Write(buf[:])
+	if err != nil {
+		return
+	}
+	return w.w.Close()
+}
+
+// noOpCloser is like an ioutil.NopCloser, but for an io.Writer.
+type noOpCloser struct {
+	w io.Writer
+}
+
+func (c noOpCloser) Write(data []byte) (n int, err error) {
+	return c.w.Write(data)
+}
+
+func (c noOpCloser) Close() error {
+	return nil
+}
+
+// SerializeSymmetricallyEncrypted serializes a symmetrically encrypted packet
+// to w and returns a WriteCloser to which the to-be-encrypted packets can be
+// written.
+// If config is nil, sensible defaults will be used.
+func SerializeSymmetricallyEncrypted(w io.Writer, c CipherFunction, key []byte, config *Config) (contents io.WriteCloser, err error) {
+	if c.KeySize() != len(key) {
+		return nil, errors.InvalidArgumentError("SymmetricallyEncrypted.Serialize: bad key length")
+	}
+	writeCloser := noOpCloser{w}
+	ciphertext, err := serializeStreamHeader(writeCloser, packetTypeSymmetricallyEncryptedMDC)
+	if err != nil {
+		return
+	}
+
+	_, err = ciphertext.Write([]byte{symmetricallyEncryptedVersion})
+	if err != nil {
+		return
+	}
+
+	block := c.new(key)
+	blockSize := block.BlockSize()
+	iv := make([]byte, blockSize)
+	_, err = config.Random().Read(iv)
+	if err != nil {
+		return
+	}
+	s, prefix := NewOCFBEncrypter(block, iv, OCFBNoResync)
+	_, err = ciphertext.Write(prefix)
+	if err != nil {
+		return
+	}
+	plaintext := cipher.StreamWriter{S: s, W: ciphertext}
+
+	h := sha1.New()
+	h.Write(iv)
+	h.Write(iv[blockSize-2:])
+	contents = &seMDCWriter{w: plaintext, h: h}
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/userattribute.go b/vendor/golang.org/x/crypto/openpgp/packet/userattribute.go
new file mode 100644
index 0000000000..96a2b382a1
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/userattribute.go
@@ -0,0 +1,91 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"bytes"
+	"image"
+	"image/jpeg"
+	"io"
+	"io/ioutil"
+)
+
+const UserAttrImageSubpacket = 1
+
+// UserAttribute is capable of storing other types of data about a user
+// beyond name, email and a text comment. In practice, user attributes are typically used
+// to store a signed thumbnail photo JPEG image of the user.
+// See RFC 4880, section 5.12.
+type UserAttribute struct {
+	Contents []*OpaqueSubpacket
+}
+
+// NewUserAttributePhoto creates a user attribute packet
+// containing the given images.
+func NewUserAttributePhoto(photos ...image.Image) (uat *UserAttribute, err error) {
+	uat = new(UserAttribute)
+	for _, photo := range photos {
+		var buf bytes.Buffer
+		// RFC 4880, Section 5.12.1.
+		data := []byte{
+			0x10, 0x00, // Little-endian image header length (16 bytes)
+			0x01,       // Image header version 1
+			0x01,       // JPEG
+			0, 0, 0, 0, // 12 reserved octets, must be all zero.
+			0, 0, 0, 0,
+			0, 0, 0, 0}
+		if _, err = buf.Write(data); err != nil {
+			return
+		}
+		if err = jpeg.Encode(&buf, photo, nil); err != nil {
+			return
+		}
+		uat.Contents = append(uat.Contents, &OpaqueSubpacket{
+			SubType:  UserAttrImageSubpacket,
+			Contents: buf.Bytes()})
+	}
+	return
+}
+
+// NewUserAttribute creates a new user attribute packet containing the given subpackets.
+func NewUserAttribute(contents ...*OpaqueSubpacket) *UserAttribute {
+	return &UserAttribute{Contents: contents}
+}
+
+func (uat *UserAttribute) parse(r io.Reader) (err error) {
+	// RFC 4880, section 5.13
+	b, err := ioutil.ReadAll(r)
+	if err != nil {
+		return
+	}
+	uat.Contents, err = OpaqueSubpackets(b)
+	return
+}
+
+// Serialize marshals the user attribute to w in the form of an OpenPGP packet, including
+// header.
+func (uat *UserAttribute) Serialize(w io.Writer) (err error) {
+	var buf bytes.Buffer
+	for _, sp := range uat.Contents {
+		sp.Serialize(&buf)
+	}
+	if err = serializeHeader(w, packetTypeUserAttribute, buf.Len()); err != nil {
+		return err
+	}
+	_, err = w.Write(buf.Bytes())
+	return
+}
+
+// ImageData returns zero or more byte slices, each containing
+// JPEG File Interchange Format (JFIF), for each photo in the
+// the user attribute packet.
+func (uat *UserAttribute) ImageData() (imageData [][]byte) {
+	for _, sp := range uat.Contents {
+		if sp.SubType == UserAttrImageSubpacket && len(sp.Contents) > 16 {
+			imageData = append(imageData, sp.Contents[16:])
+		}
+	}
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/userid.go b/vendor/golang.org/x/crypto/openpgp/packet/userid.go
new file mode 100644
index 0000000000..d6bea7d4ac
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/packet/userid.go
@@ -0,0 +1,160 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package packet
+
+import (
+	"io"
+	"io/ioutil"
+	"strings"
+)
+
+// UserId contains text that is intended to represent the name and email
+// address of the key holder. See RFC 4880, section 5.11. By convention, this
+// takes the form "Full Name (Comment) <email@example.com>"
+type UserId struct {
+	Id string // By convention, this takes the form "Full Name (Comment) <email@example.com>" which is split out in the fields below.
+
+	Name, Comment, Email string
+}
+
+func hasInvalidCharacters(s string) bool {
+	for _, c := range s {
+		switch c {
+		case '(', ')', '<', '>', 0:
+			return true
+		}
+	}
+	return false
+}
+
+// NewUserId returns a UserId or nil if any of the arguments contain invalid
+// characters. The invalid characters are '\x00', '(', ')', '<' and '>'
+func NewUserId(name, comment, email string) *UserId {
+	// RFC 4880 doesn't deal with the structure of userid strings; the
+	// name, comment and email form is just a convention. However, there's
+	// no convention about escaping the metacharacters and GPG just refuses
+	// to create user ids where, say, the name contains a '('. We mirror
+	// this behaviour.
+
+	if hasInvalidCharacters(name) || hasInvalidCharacters(comment) || hasInvalidCharacters(email) {
+		return nil
+	}
+
+	uid := new(UserId)
+	uid.Name, uid.Comment, uid.Email = name, comment, email
+	uid.Id = name
+	if len(comment) > 0 {
+		if len(uid.Id) > 0 {
+			uid.Id += " "
+		}
+		uid.Id += "("
+		uid.Id += comment
+		uid.Id += ")"
+	}
+	if len(email) > 0 {
+		if len(uid.Id) > 0 {
+			uid.Id += " "
+		}
+		uid.Id += "<"
+		uid.Id += email
+		uid.Id += ">"
+	}
+	return uid
+}
+
+func (uid *UserId) parse(r io.Reader) (err error) {
+	// RFC 4880, section 5.11
+	b, err := ioutil.ReadAll(r)
+	if err != nil {
+		return
+	}
+	uid.Id = string(b)
+	uid.Name, uid.Comment, uid.Email = parseUserId(uid.Id)
+	return
+}
+
+// Serialize marshals uid to w in the form of an OpenPGP packet, including
+// header.
+func (uid *UserId) Serialize(w io.Writer) error {
+	err := serializeHeader(w, packetTypeUserId, len(uid.Id))
+	if err != nil {
+		return err
+	}
+	_, err = w.Write([]byte(uid.Id))
+	return err
+}
+
+// parseUserId extracts the name, comment and email from a user id string that
+// is formatted as "Full Name (Comment) <email@example.com>".
+func parseUserId(id string) (name, comment, email string) {
+	var n, c, e struct {
+		start, end int
+	}
+	var state int
+
+	for offset, rune := range id {
+		switch state {
+		case 0:
+			// Entering name
+			n.start = offset
+			state = 1
+			fallthrough
+		case 1:
+			// In name
+			if rune == '(' {
+				state = 2
+				n.end = offset
+			} else if rune == '<' {
+				state = 5
+				n.end = offset
+			}
+		case 2:
+			// Entering comment
+			c.start = offset
+			state = 3
+			fallthrough
+		case 3:
+			// In comment
+			if rune == ')' {
+				state = 4
+				c.end = offset
+			}
+		case 4:
+			// Between comment and email
+			if rune == '<' {
+				state = 5
+			}
+		case 5:
+			// Entering email
+			e.start = offset
+			state = 6
+			fallthrough
+		case 6:
+			// In email
+			if rune == '>' {
+				state = 7
+				e.end = offset
+			}
+		default:
+			// After email
+		}
+	}
+	switch state {
+	case 1:
+		// ended in the name
+		n.end = len(id)
+	case 3:
+		// ended in comment
+		c.end = len(id)
+	case 6:
+		// ended in email
+		e.end = len(id)
+	}
+
+	name = strings.TrimSpace(id[n.start:n.end])
+	comment = strings.TrimSpace(id[c.start:c.end])
+	email = strings.TrimSpace(id[e.start:e.end])
+	return
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/read.go b/vendor/golang.org/x/crypto/openpgp/read.go
new file mode 100644
index 0000000000..c50a509a3a
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/read.go
@@ -0,0 +1,423 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package openpgp implements high level operations on OpenPGP messages.
+package openpgp // import "golang.org/x/crypto/openpgp"
+
+import (
+	"crypto"
+	_ "crypto/sha256"
+	"golang.org/x/crypto/openpgp/armor"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/packet"
+	"hash"
+	"io"
+	"strconv"
+)
+
+// SignatureType is the armor type for a PGP signature.
+var SignatureType = "PGP SIGNATURE"
+
+// readArmored reads an armored block with the given type.
+func readArmored(r io.Reader, expectedType string) (body io.Reader, err error) {
+	block, err := armor.Decode(r)
+	if err != nil {
+		return
+	}
+
+	if block.Type != expectedType {
+		return nil, errors.InvalidArgumentError("expected '" + expectedType + "', got: " + block.Type)
+	}
+
+	return block.Body, nil
+}
+
+// MessageDetails contains the result of parsing an OpenPGP encrypted and/or
+// signed message.
+type MessageDetails struct {
+	IsEncrypted              bool                // true if the message was encrypted.
+	EncryptedToKeyIds        []uint64            // the list of recipient key ids.
+	IsSymmetricallyEncrypted bool                // true if a passphrase could have decrypted the message.
+	DecryptedWith            Key                 // the private key used to decrypt the message, if any.
+	IsSigned                 bool                // true if the message is signed.
+	SignedByKeyId            uint64              // the key id of the signer, if any.
+	SignedBy                 *Key                // the key of the signer, if available.
+	LiteralData              *packet.LiteralData // the metadata of the contents
+	UnverifiedBody           io.Reader           // the contents of the message.
+
+	// If IsSigned is true and SignedBy is non-zero then the signature will
+	// be verified as UnverifiedBody is read. The signature cannot be
+	// checked until the whole of UnverifiedBody is read so UnverifiedBody
+	// must be consumed until EOF before the data can trusted. Even if a
+	// message isn't signed (or the signer is unknown) the data may contain
+	// an authentication code that is only checked once UnverifiedBody has
+	// been consumed. Once EOF has been seen, the following fields are
+	// valid. (An authentication code failure is reported as a
+	// SignatureError error when reading from UnverifiedBody.)
+	SignatureError error             // nil if the signature is good.
+	Signature      *packet.Signature // the signature packet itself.
+
+	decrypted io.ReadCloser
+}
+
+// A PromptFunction is used as a callback by functions that may need to decrypt
+// a private key, or prompt for a passphrase. It is called with a list of
+// acceptable, encrypted private keys and a boolean that indicates whether a
+// passphrase is usable. It should either decrypt a private key or return a
+// passphrase to try. If the decrypted private key or given passphrase isn't
+// correct, the function will be called again, forever. Any error returned will
+// be passed up.
+type PromptFunction func(keys []Key, symmetric bool) ([]byte, error)
+
+// A keyEnvelopePair is used to store a private key with the envelope that
+// contains a symmetric key, encrypted with that key.
+type keyEnvelopePair struct {
+	key          Key
+	encryptedKey *packet.EncryptedKey
+}
+
+// ReadMessage parses an OpenPGP message that may be signed and/or encrypted.
+// The given KeyRing should contain both public keys (for signature
+// verification) and, possibly encrypted, private keys for decrypting.
+// If config is nil, sensible defaults will be used.
+func ReadMessage(r io.Reader, keyring KeyRing, prompt PromptFunction, config *packet.Config) (md *MessageDetails, err error) {
+	var p packet.Packet
+
+	var symKeys []*packet.SymmetricKeyEncrypted
+	var pubKeys []keyEnvelopePair
+	var se *packet.SymmetricallyEncrypted
+
+	packets := packet.NewReader(r)
+	md = new(MessageDetails)
+	md.IsEncrypted = true
+
+	// The message, if encrypted, starts with a number of packets
+	// containing an encrypted decryption key. The decryption key is either
+	// encrypted to a public key, or with a passphrase. This loop
+	// collects these packets.
+ParsePackets:
+	for {
+		p, err = packets.Next()
+		if err != nil {
+			return nil, err
+		}
+		switch p := p.(type) {
+		case *packet.SymmetricKeyEncrypted:
+			// This packet contains the decryption key encrypted with a passphrase.
+			md.IsSymmetricallyEncrypted = true
+			symKeys = append(symKeys, p)
+		case *packet.EncryptedKey:
+			// This packet contains the decryption key encrypted to a public key.
+			md.EncryptedToKeyIds = append(md.EncryptedToKeyIds, p.KeyId)
+			switch p.Algo {
+			case packet.PubKeyAlgoRSA, packet.PubKeyAlgoRSAEncryptOnly, packet.PubKeyAlgoElGamal:
+				break
+			default:
+				continue
+			}
+			var keys []Key
+			if p.KeyId == 0 {
+				keys = keyring.DecryptionKeys()
+			} else {
+				keys = keyring.KeysById(p.KeyId)
+			}
+			for _, k := range keys {
+				pubKeys = append(pubKeys, keyEnvelopePair{k, p})
+			}
+		case *packet.SymmetricallyEncrypted:
+			se = p
+			break ParsePackets
+		case *packet.Compressed, *packet.LiteralData, *packet.OnePassSignature:
+			// This message isn't encrypted.
+			if len(symKeys) != 0 || len(pubKeys) != 0 {
+				return nil, errors.StructuralError("key material not followed by encrypted message")
+			}
+			packets.Unread(p)
+			return readSignedMessage(packets, nil, keyring)
+		}
+	}
+
+	var candidates []Key
+	var decrypted io.ReadCloser
+
+	// Now that we have the list of encrypted keys we need to decrypt at
+	// least one of them or, if we cannot, we need to call the prompt
+	// function so that it can decrypt a key or give us a passphrase.
+FindKey:
+	for {
+		// See if any of the keys already have a private key available
+		candidates = candidates[:0]
+		candidateFingerprints := make(map[string]bool)
+
+		for _, pk := range pubKeys {
+			if pk.key.PrivateKey == nil {
+				continue
+			}
+			if !pk.key.PrivateKey.Encrypted {
+				if len(pk.encryptedKey.Key) == 0 {
+					pk.encryptedKey.Decrypt(pk.key.PrivateKey, config)
+				}
+				if len(pk.encryptedKey.Key) == 0 {
+					continue
+				}
+				decrypted, err = se.Decrypt(pk.encryptedKey.CipherFunc, pk.encryptedKey.Key)
+				if err != nil && err != errors.ErrKeyIncorrect {
+					return nil, err
+				}
+				if decrypted != nil {
+					md.DecryptedWith = pk.key
+					break FindKey
+				}
+			} else {
+				fpr := string(pk.key.PublicKey.Fingerprint[:])
+				if v := candidateFingerprints[fpr]; v {
+					continue
+				}
+				candidates = append(candidates, pk.key)
+				candidateFingerprints[fpr] = true
+			}
+		}
+
+		if len(candidates) == 0 && len(symKeys) == 0 {
+			return nil, errors.ErrKeyIncorrect
+		}
+
+		if prompt == nil {
+			return nil, errors.ErrKeyIncorrect
+		}
+
+		passphrase, err := prompt(candidates, len(symKeys) != 0)
+		if err != nil {
+			return nil, err
+		}
+
+		// Try the symmetric passphrase first
+		if len(symKeys) != 0 && passphrase != nil {
+			for _, s := range symKeys {
+				err = s.Decrypt(passphrase)
+				if err == nil && !s.Encrypted {
+					decrypted, err = se.Decrypt(s.CipherFunc, s.Key)
+					if err != nil && err != errors.ErrKeyIncorrect {
+						return nil, err
+					}
+					if decrypted != nil {
+						break FindKey
+					}
+				}
+
+			}
+		}
+	}
+
+	md.decrypted = decrypted
+	packets.Push(decrypted)
+	return readSignedMessage(packets, md, keyring)
+}
+
+// readSignedMessage reads a possibly signed message if mdin is non-zero then
+// that structure is updated and returned. Otherwise a fresh MessageDetails is
+// used.
+func readSignedMessage(packets *packet.Reader, mdin *MessageDetails, keyring KeyRing) (md *MessageDetails, err error) {
+	if mdin == nil {
+		mdin = new(MessageDetails)
+	}
+	md = mdin
+
+	var p packet.Packet
+	var h hash.Hash
+	var wrappedHash hash.Hash
+FindLiteralData:
+	for {
+		p, err = packets.Next()
+		if err != nil {
+			return nil, err
+		}
+		switch p := p.(type) {
+		case *packet.Compressed:
+			packets.Push(p.Body)
+		case *packet.OnePassSignature:
+			if !p.IsLast {
+				return nil, errors.UnsupportedError("nested signatures")
+			}
+
+			h, wrappedHash, err = hashForSignature(p.Hash, p.SigType)
+			if err != nil {
+				md = nil
+				return
+			}
+
+			md.IsSigned = true
+			md.SignedByKeyId = p.KeyId
+			keys := keyring.KeysByIdUsage(p.KeyId, packet.KeyFlagSign)
+			if len(keys) > 0 {
+				md.SignedBy = &keys[0]
+			}
+		case *packet.LiteralData:
+			md.LiteralData = p
+			break FindLiteralData
+		}
+	}
+
+	if md.SignedBy != nil {
+		md.UnverifiedBody = &signatureCheckReader{packets, h, wrappedHash, md}
+	} else if md.decrypted != nil {
+		md.UnverifiedBody = checkReader{md}
+	} else {
+		md.UnverifiedBody = md.LiteralData.Body
+	}
+
+	return md, nil
+}
+
+// hashForSignature returns a pair of hashes that can be used to verify a
+// signature. The signature may specify that the contents of the signed message
+// should be preprocessed (i.e. to normalize line endings). Thus this function
+// returns two hashes. The second should be used to hash the message itself and
+// performs any needed preprocessing.
+func hashForSignature(hashId crypto.Hash, sigType packet.SignatureType) (hash.Hash, hash.Hash, error) {
+	if !hashId.Available() {
+		return nil, nil, errors.UnsupportedError("hash not available: " + strconv.Itoa(int(hashId)))
+	}
+	h := hashId.New()
+
+	switch sigType {
+	case packet.SigTypeBinary:
+		return h, h, nil
+	case packet.SigTypeText:
+		return h, NewCanonicalTextHash(h), nil
+	}
+
+	return nil, nil, errors.UnsupportedError("unsupported signature type: " + strconv.Itoa(int(sigType)))
+}
+
+// checkReader wraps an io.Reader from a LiteralData packet. When it sees EOF
+// it closes the ReadCloser from any SymmetricallyEncrypted packet to trigger
+// MDC checks.
+type checkReader struct {
+	md *MessageDetails
+}
+
+func (cr checkReader) Read(buf []byte) (n int, err error) {
+	n, err = cr.md.LiteralData.Body.Read(buf)
+	if err == io.EOF {
+		mdcErr := cr.md.decrypted.Close()
+		if mdcErr != nil {
+			err = mdcErr
+		}
+	}
+	return
+}
+
+// signatureCheckReader wraps an io.Reader from a LiteralData packet and hashes
+// the data as it is read. When it sees an EOF from the underlying io.Reader
+// it parses and checks a trailing Signature packet and triggers any MDC checks.
+type signatureCheckReader struct {
+	packets        *packet.Reader
+	h, wrappedHash hash.Hash
+	md             *MessageDetails
+}
+
+func (scr *signatureCheckReader) Read(buf []byte) (n int, err error) {
+	n, err = scr.md.LiteralData.Body.Read(buf)
+	scr.wrappedHash.Write(buf[:n])
+	if err == io.EOF {
+		var p packet.Packet
+		p, scr.md.SignatureError = scr.packets.Next()
+		if scr.md.SignatureError != nil {
+			return
+		}
+
+		var ok bool
+		if scr.md.Signature, ok = p.(*packet.Signature); !ok {
+			scr.md.SignatureError = errors.StructuralError("LiteralData not followed by Signature")
+			return
+		}
+
+		scr.md.SignatureError = scr.md.SignedBy.PublicKey.VerifySignature(scr.h, scr.md.Signature)
+
+		// The SymmetricallyEncrypted packet, if any, might have an
+		// unsigned hash of its own. In order to check this we need to
+		// close that Reader.
+		if scr.md.decrypted != nil {
+			mdcErr := scr.md.decrypted.Close()
+			if mdcErr != nil {
+				err = mdcErr
+			}
+		}
+	}
+	return
+}
+
+// CheckDetachedSignature takes a signed file and a detached signature and
+// returns the signer if the signature is valid. If the signer isn't known,
+// ErrUnknownIssuer is returned.
+func CheckDetachedSignature(keyring KeyRing, signed, signature io.Reader) (signer *Entity, err error) {
+	p, err := packet.Read(signature)
+	if err != nil {
+		return
+	}
+
+	var issuerKeyId uint64
+	var hashFunc crypto.Hash
+	var sigType packet.SignatureType
+
+	switch sig := p.(type) {
+	case *packet.Signature:
+		if sig.IssuerKeyId == nil {
+			return nil, errors.StructuralError("signature doesn't have an issuer")
+		}
+		issuerKeyId = *sig.IssuerKeyId
+		hashFunc = sig.Hash
+		sigType = sig.SigType
+	case *packet.SignatureV3:
+		issuerKeyId = sig.IssuerKeyId
+		hashFunc = sig.Hash
+		sigType = sig.SigType
+	default:
+		return nil, errors.StructuralError("non signature packet found")
+	}
+
+	h, wrappedHash, err := hashForSignature(hashFunc, sigType)
+	if err != nil {
+		return
+	}
+
+	_, err = io.Copy(wrappedHash, signed)
+	if err != nil && err != io.EOF {
+		return
+	}
+
+	keys := keyring.KeysByIdUsage(issuerKeyId, packet.KeyFlagSign)
+	if len(keys) == 0 {
+		return nil, errors.ErrUnknownIssuer
+	}
+
+	for _, key := range keys {
+		switch sig := p.(type) {
+		case *packet.Signature:
+			err = key.PublicKey.VerifySignature(h, sig)
+		case *packet.SignatureV3:
+			err = key.PublicKey.VerifySignatureV3(h, sig)
+		}
+		if err == nil {
+			return key.Entity, nil
+		}
+	}
+
+	if err == nil {
+		err = errors.ErrUnknownIssuer
+	}
+	return nil, err
+}
+
+// CheckArmoredDetachedSignature performs the same actions as
+// CheckDetachedSignature but expects the signature to be armored.
+func CheckArmoredDetachedSignature(keyring KeyRing, signed, signature io.Reader) (signer *Entity, err error) {
+	body, err := readArmored(signature, SignatureType)
+	if err != nil {
+		return
+	}
+
+	return CheckDetachedSignature(keyring, signed, body)
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/s2k/s2k.go b/vendor/golang.org/x/crypto/openpgp/s2k/s2k.go
new file mode 100644
index 0000000000..0e8641ed1b
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/s2k/s2k.go
@@ -0,0 +1,273 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package s2k implements the various OpenPGP string-to-key transforms as
+// specified in RFC 4800 section 3.7.1.
+package s2k // import "golang.org/x/crypto/openpgp/s2k"
+
+import (
+	"crypto"
+	"hash"
+	"io"
+	"strconv"
+
+	"golang.org/x/crypto/openpgp/errors"
+)
+
+// Config collects configuration parameters for s2k key-stretching
+// transformatioms. A nil *Config is valid and results in all default
+// values. Currently, Config is used only by the Serialize function in
+// this package.
+type Config struct {
+	// Hash is the default hash function to be used. If
+	// nil, SHA1 is used.
+	Hash crypto.Hash
+	// S2KCount is only used for symmetric encryption. It
+	// determines the strength of the passphrase stretching when
+	// the said passphrase is hashed to produce a key. S2KCount
+	// should be between 1024 and 65011712, inclusive. If Config
+	// is nil or S2KCount is 0, the value 65536 used. Not all
+	// values in the above range can be represented. S2KCount will
+	// be rounded up to the next representable value if it cannot
+	// be encoded exactly. When set, it is strongly encrouraged to
+	// use a value that is at least 65536. See RFC 4880 Section
+	// 3.7.1.3.
+	S2KCount int
+}
+
+func (c *Config) hash() crypto.Hash {
+	if c == nil || uint(c.Hash) == 0 {
+		// SHA1 is the historical default in this package.
+		return crypto.SHA1
+	}
+
+	return c.Hash
+}
+
+func (c *Config) encodedCount() uint8 {
+	if c == nil || c.S2KCount == 0 {
+		return 96 // The common case. Correspoding to 65536
+	}
+
+	i := c.S2KCount
+	switch {
+	// Behave like GPG. Should we make 65536 the lowest value used?
+	case i < 1024:
+		i = 1024
+	case i > 65011712:
+		i = 65011712
+	}
+
+	return encodeCount(i)
+}
+
+// encodeCount converts an iterative "count" in the range 1024 to
+// 65011712, inclusive, to an encoded count. The return value is the
+// octet that is actually stored in the GPG file. encodeCount panics
+// if i is not in the above range (encodedCount above takes care to
+// pass i in the correct range). See RFC 4880 Section 3.7.7.1.
+func encodeCount(i int) uint8 {
+	if i < 1024 || i > 65011712 {
+		panic("count arg i outside the required range")
+	}
+
+	for encoded := 0; encoded < 256; encoded++ {
+		count := decodeCount(uint8(encoded))
+		if count >= i {
+			return uint8(encoded)
+		}
+	}
+
+	return 255
+}
+
+// decodeCount returns the s2k mode 3 iterative "count" corresponding to
+// the encoded octet c.
+func decodeCount(c uint8) int {
+	return (16 + int(c&15)) << (uint32(c>>4) + 6)
+}
+
+// Simple writes to out the result of computing the Simple S2K function (RFC
+// 4880, section 3.7.1.1) using the given hash and input passphrase.
+func Simple(out []byte, h hash.Hash, in []byte) {
+	Salted(out, h, in, nil)
+}
+
+var zero [1]byte
+
+// Salted writes to out the result of computing the Salted S2K function (RFC
+// 4880, section 3.7.1.2) using the given hash, input passphrase and salt.
+func Salted(out []byte, h hash.Hash, in []byte, salt []byte) {
+	done := 0
+	var digest []byte
+
+	for i := 0; done < len(out); i++ {
+		h.Reset()
+		for j := 0; j < i; j++ {
+			h.Write(zero[:])
+		}
+		h.Write(salt)
+		h.Write(in)
+		digest = h.Sum(digest[:0])
+		n := copy(out[done:], digest)
+		done += n
+	}
+}
+
+// Iterated writes to out the result of computing the Iterated and Salted S2K
+// function (RFC 4880, section 3.7.1.3) using the given hash, input passphrase,
+// salt and iteration count.
+func Iterated(out []byte, h hash.Hash, in []byte, salt []byte, count int) {
+	combined := make([]byte, len(in)+len(salt))
+	copy(combined, salt)
+	copy(combined[len(salt):], in)
+
+	if count < len(combined) {
+		count = len(combined)
+	}
+
+	done := 0
+	var digest []byte
+	for i := 0; done < len(out); i++ {
+		h.Reset()
+		for j := 0; j < i; j++ {
+			h.Write(zero[:])
+		}
+		written := 0
+		for written < count {
+			if written+len(combined) > count {
+				todo := count - written
+				h.Write(combined[:todo])
+				written = count
+			} else {
+				h.Write(combined)
+				written += len(combined)
+			}
+		}
+		digest = h.Sum(digest[:0])
+		n := copy(out[done:], digest)
+		done += n
+	}
+}
+
+// Parse reads a binary specification for a string-to-key transformation from r
+// and returns a function which performs that transform.
+func Parse(r io.Reader) (f func(out, in []byte), err error) {
+	var buf [9]byte
+
+	_, err = io.ReadFull(r, buf[:2])
+	if err != nil {
+		return
+	}
+
+	hash, ok := HashIdToHash(buf[1])
+	if !ok {
+		return nil, errors.UnsupportedError("hash for S2K function: " + strconv.Itoa(int(buf[1])))
+	}
+	if !hash.Available() {
+		return nil, errors.UnsupportedError("hash not available: " + strconv.Itoa(int(hash)))
+	}
+	h := hash.New()
+
+	switch buf[0] {
+	case 0:
+		f := func(out, in []byte) {
+			Simple(out, h, in)
+		}
+		return f, nil
+	case 1:
+		_, err = io.ReadFull(r, buf[:8])
+		if err != nil {
+			return
+		}
+		f := func(out, in []byte) {
+			Salted(out, h, in, buf[:8])
+		}
+		return f, nil
+	case 3:
+		_, err = io.ReadFull(r, buf[:9])
+		if err != nil {
+			return
+		}
+		count := decodeCount(buf[8])
+		f := func(out, in []byte) {
+			Iterated(out, h, in, buf[:8], count)
+		}
+		return f, nil
+	}
+
+	return nil, errors.UnsupportedError("S2K function")
+}
+
+// Serialize salts and stretches the given passphrase and writes the
+// resulting key into key. It also serializes an S2K descriptor to
+// w. The key stretching can be configured with c, which may be
+// nil. In that case, sensible defaults will be used.
+func Serialize(w io.Writer, key []byte, rand io.Reader, passphrase []byte, c *Config) error {
+	var buf [11]byte
+	buf[0] = 3 /* iterated and salted */
+	buf[1], _ = HashToHashId(c.hash())
+	salt := buf[2:10]
+	if _, err := io.ReadFull(rand, salt); err != nil {
+		return err
+	}
+	encodedCount := c.encodedCount()
+	count := decodeCount(encodedCount)
+	buf[10] = encodedCount
+	if _, err := w.Write(buf[:]); err != nil {
+		return err
+	}
+
+	Iterated(key, c.hash().New(), passphrase, salt, count)
+	return nil
+}
+
+// hashToHashIdMapping contains pairs relating OpenPGP's hash identifier with
+// Go's crypto.Hash type. See RFC 4880, section 9.4.
+var hashToHashIdMapping = []struct {
+	id   byte
+	hash crypto.Hash
+	name string
+}{
+	{1, crypto.MD5, "MD5"},
+	{2, crypto.SHA1, "SHA1"},
+	{3, crypto.RIPEMD160, "RIPEMD160"},
+	{8, crypto.SHA256, "SHA256"},
+	{9, crypto.SHA384, "SHA384"},
+	{10, crypto.SHA512, "SHA512"},
+	{11, crypto.SHA224, "SHA224"},
+}
+
+// HashIdToHash returns a crypto.Hash which corresponds to the given OpenPGP
+// hash id.
+func HashIdToHash(id byte) (h crypto.Hash, ok bool) {
+	for _, m := range hashToHashIdMapping {
+		if m.id == id {
+			return m.hash, true
+		}
+	}
+	return 0, false
+}
+
+// HashIdToString returns the name of the hash function corresponding to the
+// given OpenPGP hash id, or panics if id is unknown.
+func HashIdToString(id byte) (name string, ok bool) {
+	for _, m := range hashToHashIdMapping {
+		if m.id == id {
+			return m.name, true
+		}
+	}
+
+	return "", false
+}
+
+// HashIdToHash returns an OpenPGP hash id which corresponds the given Hash.
+func HashToHashId(h crypto.Hash) (id byte, ok bool) {
+	for _, m := range hashToHashIdMapping {
+		if m.hash == h {
+			return m.id, true
+		}
+	}
+	return 0, false
+}
diff --git a/vendor/golang.org/x/crypto/openpgp/write.go b/vendor/golang.org/x/crypto/openpgp/write.go
new file mode 100644
index 0000000000..e471174684
--- /dev/null
+++ b/vendor/golang.org/x/crypto/openpgp/write.go
@@ -0,0 +1,374 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package openpgp
+
+import (
+	"crypto"
+	"golang.org/x/crypto/openpgp/armor"
+	"golang.org/x/crypto/openpgp/errors"
+	"golang.org/x/crypto/openpgp/packet"
+	"golang.org/x/crypto/openpgp/s2k"
+	"hash"
+	"io"
+	"strconv"
+	"time"
+)
+
+// DetachSign signs message with the private key from signer (which must
+// already have been decrypted) and writes the signature to w.
+// If config is nil, sensible defaults will be used.
+func DetachSign(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error {
+	return detachSign(w, signer, message, packet.SigTypeBinary, config)
+}
+
+// ArmoredDetachSign signs message with the private key from signer (which
+// must already have been decrypted) and writes an armored signature to w.
+// If config is nil, sensible defaults will be used.
+func ArmoredDetachSign(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) (err error) {
+	return armoredDetachSign(w, signer, message, packet.SigTypeBinary, config)
+}
+
+// DetachSignText signs message (after canonicalising the line endings) with
+// the private key from signer (which must already have been decrypted) and
+// writes the signature to w.
+// If config is nil, sensible defaults will be used.
+func DetachSignText(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error {
+	return detachSign(w, signer, message, packet.SigTypeText, config)
+}
+
+// ArmoredDetachSignText signs message (after canonicalising the line endings)
+// with the private key from signer (which must already have been decrypted)
+// and writes an armored signature to w.
+// If config is nil, sensible defaults will be used.
+func ArmoredDetachSignText(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error {
+	return armoredDetachSign(w, signer, message, packet.SigTypeText, config)
+}
+
+func armoredDetachSign(w io.Writer, signer *Entity, message io.Reader, sigType packet.SignatureType, config *packet.Config) (err error) {
+	out, err := armor.Encode(w, SignatureType, nil)
+	if err != nil {
+		return
+	}
+	err = detachSign(out, signer, message, sigType, config)
+	if err != nil {
+		return
+	}
+	return out.Close()
+}
+
+func detachSign(w io.Writer, signer *Entity, message io.Reader, sigType packet.SignatureType, config *packet.Config) (err error) {
+	if signer.PrivateKey == nil {
+		return errors.InvalidArgumentError("signing key doesn't have a private key")
+	}
+	if signer.PrivateKey.Encrypted {
+		return errors.InvalidArgumentError("signing key is encrypted")
+	}
+
+	sig := new(packet.Signature)
+	sig.SigType = sigType
+	sig.PubKeyAlgo = signer.PrivateKey.PubKeyAlgo
+	sig.Hash = config.Hash()
+	sig.CreationTime = config.Now()
+	sig.IssuerKeyId = &signer.PrivateKey.KeyId
+
+	h, wrappedHash, err := hashForSignature(sig.Hash, sig.SigType)
+	if err != nil {
+		return
+	}
+	io.Copy(wrappedHash, message)
+
+	err = sig.Sign(h, signer.PrivateKey, config)
+	if err != nil {
+		return
+	}
+
+	return sig.Serialize(w)
+}
+
+// FileHints contains metadata about encrypted files. This metadata is, itself,
+// encrypted.
+type FileHints struct {
+	// IsBinary can be set to hint that the contents are binary data.
+	IsBinary bool
+	// FileName hints at the name of the file that should be written. It's
+	// truncated to 255 bytes if longer. It may be empty to suggest that the
+	// file should not be written to disk. It may be equal to "_CONSOLE" to
+	// suggest the data should not be written to disk.
+	FileName string
+	// ModTime contains the modification time of the file, or the zero time if not applicable.
+	ModTime time.Time
+}
+
+// SymmetricallyEncrypt acts like gpg -c: it encrypts a file with a passphrase.
+// The resulting WriteCloser must be closed after the contents of the file have
+// been written.
+// If config is nil, sensible defaults will be used.
+func SymmetricallyEncrypt(ciphertext io.Writer, passphrase []byte, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) {
+	if hints == nil {
+		hints = &FileHints{}
+	}
+
+	key, err := packet.SerializeSymmetricKeyEncrypted(ciphertext, passphrase, config)
+	if err != nil {
+		return
+	}
+	w, err := packet.SerializeSymmetricallyEncrypted(ciphertext, config.Cipher(), key, config)
+	if err != nil {
+		return
+	}
+
+	literaldata := w
+	if algo := config.Compression(); algo != packet.CompressionNone {
+		var compConfig *packet.CompressionConfig
+		if config != nil {
+			compConfig = config.CompressionConfig
+		}
+		literaldata, err = packet.SerializeCompressed(w, algo, compConfig)
+		if err != nil {
+			return
+		}
+	}
+
+	var epochSeconds uint32
+	if !hints.ModTime.IsZero() {
+		epochSeconds = uint32(hints.ModTime.Unix())
+	}
+	return packet.SerializeLiteral(literaldata, hints.IsBinary, hints.FileName, epochSeconds)
+}
+
+// intersectPreferences mutates and returns a prefix of a that contains only
+// the values in the intersection of a and b. The order of a is preserved.
+func intersectPreferences(a []uint8, b []uint8) (intersection []uint8) {
+	var j int
+	for _, v := range a {
+		for _, v2 := range b {
+			if v == v2 {
+				a[j] = v
+				j++
+				break
+			}
+		}
+	}
+
+	return a[:j]
+}
+
+func hashToHashId(h crypto.Hash) uint8 {
+	v, ok := s2k.HashToHashId(h)
+	if !ok {
+		panic("tried to convert unknown hash")
+	}
+	return v
+}
+
+// Encrypt encrypts a message to a number of recipients and, optionally, signs
+// it. hints contains optional information, that is also encrypted, that aids
+// the recipients in processing the message. The resulting WriteCloser must
+// be closed after the contents of the file have been written.
+// If config is nil, sensible defaults will be used.
+func Encrypt(ciphertext io.Writer, to []*Entity, signed *Entity, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) {
+	var signer *packet.PrivateKey
+	if signed != nil {
+		signKey, ok := signed.signingKey(config.Now())
+		if !ok {
+			return nil, errors.InvalidArgumentError("no valid signing keys")
+		}
+		signer = signKey.PrivateKey
+		if signer.Encrypted {
+			return nil, errors.InvalidArgumentError("signing key must be decrypted")
+		}
+	}
+
+	// These are the possible ciphers that we'll use for the message.
+	candidateCiphers := []uint8{
+		uint8(packet.CipherAES128),
+		uint8(packet.CipherAES256),
+		uint8(packet.CipherCAST5),
+	}
+	// These are the possible hash functions that we'll use for the signature.
+	candidateHashes := []uint8{
+		hashToHashId(crypto.SHA256),
+		hashToHashId(crypto.SHA512),
+		hashToHashId(crypto.SHA1),
+		hashToHashId(crypto.RIPEMD160),
+	}
+	// In the event that a recipient doesn't specify any supported ciphers
+	// or hash functions, these are the ones that we assume that every
+	// implementation supports.
+	defaultCiphers := candidateCiphers[len(candidateCiphers)-1:]
+	defaultHashes := candidateHashes[len(candidateHashes)-1:]
+
+	encryptKeys := make([]Key, len(to))
+	for i := range to {
+		var ok bool
+		encryptKeys[i], ok = to[i].encryptionKey(config.Now())
+		if !ok {
+			return nil, errors.InvalidArgumentError("cannot encrypt a message to key id " + strconv.FormatUint(to[i].PrimaryKey.KeyId, 16) + " because it has no encryption keys")
+		}
+
+		sig := to[i].primaryIdentity().SelfSignature
+
+		preferredSymmetric := sig.PreferredSymmetric
+		if len(preferredSymmetric) == 0 {
+			preferredSymmetric = defaultCiphers
+		}
+		preferredHashes := sig.PreferredHash
+		if len(preferredHashes) == 0 {
+			preferredHashes = defaultHashes
+		}
+		candidateCiphers = intersectPreferences(candidateCiphers, preferredSymmetric)
+		candidateHashes = intersectPreferences(candidateHashes, preferredHashes)
+	}
+
+	if len(candidateCiphers) == 0 || len(candidateHashes) == 0 {
+		return nil, errors.InvalidArgumentError("cannot encrypt because recipient set shares no common algorithms")
+	}
+
+	cipher := packet.CipherFunction(candidateCiphers[0])
+	// If the cipher specifed by config is a candidate, we'll use that.
+	configuredCipher := config.Cipher()
+	for _, c := range candidateCiphers {
+		cipherFunc := packet.CipherFunction(c)
+		if cipherFunc == configuredCipher {
+			cipher = cipherFunc
+			break
+		}
+	}
+
+	var hash crypto.Hash
+	for _, hashId := range candidateHashes {
+		if h, ok := s2k.HashIdToHash(hashId); ok && h.Available() {
+			hash = h
+			break
+		}
+	}
+
+	// If the hash specified by config is a candidate, we'll use that.
+	if configuredHash := config.Hash(); configuredHash.Available() {
+		for _, hashId := range candidateHashes {
+			if h, ok := s2k.HashIdToHash(hashId); ok && h == configuredHash {
+				hash = h
+				break
+			}
+		}
+	}
+
+	if hash == 0 {
+		hashId := candidateHashes[0]
+		name, ok := s2k.HashIdToString(hashId)
+		if !ok {
+			name = "#" + strconv.Itoa(int(hashId))
+		}
+		return nil, errors.InvalidArgumentError("cannot encrypt because no candidate hash functions are compiled in. (Wanted " + name + " in this case.)")
+	}
+
+	symKey := make([]byte, cipher.KeySize())
+	if _, err := io.ReadFull(config.Random(), symKey); err != nil {
+		return nil, err
+	}
+
+	for _, key := range encryptKeys {
+		if err := packet.SerializeEncryptedKey(ciphertext, key.PublicKey, cipher, symKey, config); err != nil {
+			return nil, err
+		}
+	}
+
+	encryptedData, err := packet.SerializeSymmetricallyEncrypted(ciphertext, cipher, symKey, config)
+	if err != nil {
+		return
+	}
+
+	if signer != nil {
+		ops := &packet.OnePassSignature{
+			SigType:    packet.SigTypeBinary,
+			Hash:       hash,
+			PubKeyAlgo: signer.PubKeyAlgo,
+			KeyId:      signer.KeyId,
+			IsLast:     true,
+		}
+		if err := ops.Serialize(encryptedData); err != nil {
+			return nil, err
+		}
+	}
+
+	if hints == nil {
+		hints = &FileHints{}
+	}
+
+	w := encryptedData
+	if signer != nil {
+		// If we need to write a signature packet after the literal
+		// data then we need to stop literalData from closing
+		// encryptedData.
+		w = noOpCloser{encryptedData}
+
+	}
+	var epochSeconds uint32
+	if !hints.ModTime.IsZero() {
+		epochSeconds = uint32(hints.ModTime.Unix())
+	}
+	literalData, err := packet.SerializeLiteral(w, hints.IsBinary, hints.FileName, epochSeconds)
+	if err != nil {
+		return nil, err
+	}
+
+	if signer != nil {
+		return signatureWriter{encryptedData, literalData, hash, hash.New(), signer, config}, nil
+	}
+	return literalData, nil
+}
+
+// signatureWriter hashes the contents of a message while passing it along to
+// literalData. When closed, it closes literalData, writes a signature packet
+// to encryptedData and then also closes encryptedData.
+type signatureWriter struct {
+	encryptedData io.WriteCloser
+	literalData   io.WriteCloser
+	hashType      crypto.Hash
+	h             hash.Hash
+	signer        *packet.PrivateKey
+	config        *packet.Config
+}
+
+func (s signatureWriter) Write(data []byte) (int, error) {
+	s.h.Write(data)
+	return s.literalData.Write(data)
+}
+
+func (s signatureWriter) Close() error {
+	sig := &packet.Signature{
+		SigType:      packet.SigTypeBinary,
+		PubKeyAlgo:   s.signer.PubKeyAlgo,
+		Hash:         s.hashType,
+		CreationTime: s.config.Now(),
+		IssuerKeyId:  &s.signer.KeyId,
+	}
+
+	if err := sig.Sign(s.h, s.signer, s.config); err != nil {
+		return err
+	}
+	if err := s.literalData.Close(); err != nil {
+		return err
+	}
+	if err := sig.Serialize(s.encryptedData); err != nil {
+		return err
+	}
+	return s.encryptedData.Close()
+}
+
+// noOpCloser is like an ioutil.NopCloser, but for an io.Writer.
+// TODO: we have two of these in OpenPGP packages alone. This probably needs
+// to be promoted somewhere more common.
+type noOpCloser struct {
+	w io.Writer
+}
+
+func (c noOpCloser) Write(data []byte) (n int, err error) {
+	return c.w.Write(data)
+}
+
+func (c noOpCloser) Close() error {
+	return nil
+}
diff --git a/vendor/golang.org/x/crypto/ssh/terminal/terminal.go b/vendor/golang.org/x/crypto/ssh/terminal/terminal.go
new file mode 100644
index 0000000000..741eeb13f0
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ssh/terminal/terminal.go
@@ -0,0 +1,892 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package terminal
+
+import (
+	"bytes"
+	"io"
+	"sync"
+	"unicode/utf8"
+)
+
+// EscapeCodes contains escape sequences that can be written to the terminal in
+// order to achieve different styles of text.
+type EscapeCodes struct {
+	// Foreground colors
+	Black, Red, Green, Yellow, Blue, Magenta, Cyan, White []byte
+
+	// Reset all attributes
+	Reset []byte
+}
+
+var vt100EscapeCodes = EscapeCodes{
+	Black:   []byte{keyEscape, '[', '3', '0', 'm'},
+	Red:     []byte{keyEscape, '[', '3', '1', 'm'},
+	Green:   []byte{keyEscape, '[', '3', '2', 'm'},
+	Yellow:  []byte{keyEscape, '[', '3', '3', 'm'},
+	Blue:    []byte{keyEscape, '[', '3', '4', 'm'},
+	Magenta: []byte{keyEscape, '[', '3', '5', 'm'},
+	Cyan:    []byte{keyEscape, '[', '3', '6', 'm'},
+	White:   []byte{keyEscape, '[', '3', '7', 'm'},
+
+	Reset: []byte{keyEscape, '[', '0', 'm'},
+}
+
+// Terminal contains the state for running a VT100 terminal that is capable of
+// reading lines of input.
+type Terminal struct {
+	// AutoCompleteCallback, if non-null, is called for each keypress with
+	// the full input line and the current position of the cursor (in
+	// bytes, as an index into |line|). If it returns ok=false, the key
+	// press is processed normally. Otherwise it returns a replacement line
+	// and the new cursor position.
+	AutoCompleteCallback func(line string, pos int, key rune) (newLine string, newPos int, ok bool)
+
+	// Escape contains a pointer to the escape codes for this terminal.
+	// It's always a valid pointer, although the escape codes themselves
+	// may be empty if the terminal doesn't support them.
+	Escape *EscapeCodes
+
+	// lock protects the terminal and the state in this object from
+	// concurrent processing of a key press and a Write() call.
+	lock sync.Mutex
+
+	c      io.ReadWriter
+	prompt []rune
+
+	// line is the current line being entered.
+	line []rune
+	// pos is the logical position of the cursor in line
+	pos int
+	// echo is true if local echo is enabled
+	echo bool
+	// pasteActive is true iff there is a bracketed paste operation in
+	// progress.
+	pasteActive bool
+
+	// cursorX contains the current X value of the cursor where the left
+	// edge is 0. cursorY contains the row number where the first row of
+	// the current line is 0.
+	cursorX, cursorY int
+	// maxLine is the greatest value of cursorY so far.
+	maxLine int
+
+	termWidth, termHeight int
+
+	// outBuf contains the terminal data to be sent.
+	outBuf []byte
+	// remainder contains the remainder of any partial key sequences after
+	// a read. It aliases into inBuf.
+	remainder []byte
+	inBuf     [256]byte
+
+	// history contains previously entered commands so that they can be
+	// accessed with the up and down keys.
+	history stRingBuffer
+	// historyIndex stores the currently accessed history entry, where zero
+	// means the immediately previous entry.
+	historyIndex int
+	// When navigating up and down the history it's possible to return to
+	// the incomplete, initial line. That value is stored in
+	// historyPending.
+	historyPending string
+}
+
+// NewTerminal runs a VT100 terminal on the given ReadWriter. If the ReadWriter is
+// a local terminal, that terminal must first have been put into raw mode.
+// prompt is a string that is written at the start of each input line (i.e.
+// "> ").
+func NewTerminal(c io.ReadWriter, prompt string) *Terminal {
+	return &Terminal{
+		Escape:       &vt100EscapeCodes,
+		c:            c,
+		prompt:       []rune(prompt),
+		termWidth:    80,
+		termHeight:   24,
+		echo:         true,
+		historyIndex: -1,
+	}
+}
+
+const (
+	keyCtrlD     = 4
+	keyCtrlU     = 21
+	keyEnter     = '\r'
+	keyEscape    = 27
+	keyBackspace = 127
+	keyUnknown   = 0xd800 /* UTF-16 surrogate area */ + iota
+	keyUp
+	keyDown
+	keyLeft
+	keyRight
+	keyAltLeft
+	keyAltRight
+	keyHome
+	keyEnd
+	keyDeleteWord
+	keyDeleteLine
+	keyClearScreen
+	keyPasteStart
+	keyPasteEnd
+)
+
+var pasteStart = []byte{keyEscape, '[', '2', '0', '0', '~'}
+var pasteEnd = []byte{keyEscape, '[', '2', '0', '1', '~'}
+
+// bytesToKey tries to parse a key sequence from b. If successful, it returns
+// the key and the remainder of the input. Otherwise it returns utf8.RuneError.
+func bytesToKey(b []byte, pasteActive bool) (rune, []byte) {
+	if len(b) == 0 {
+		return utf8.RuneError, nil
+	}
+
+	if !pasteActive {
+		switch b[0] {
+		case 1: // ^A
+			return keyHome, b[1:]
+		case 5: // ^E
+			return keyEnd, b[1:]
+		case 8: // ^H
+			return keyBackspace, b[1:]
+		case 11: // ^K
+			return keyDeleteLine, b[1:]
+		case 12: // ^L
+			return keyClearScreen, b[1:]
+		case 23: // ^W
+			return keyDeleteWord, b[1:]
+		}
+	}
+
+	if b[0] != keyEscape {
+		if !utf8.FullRune(b) {
+			return utf8.RuneError, b
+		}
+		r, l := utf8.DecodeRune(b)
+		return r, b[l:]
+	}
+
+	if !pasteActive && len(b) >= 3 && b[0] == keyEscape && b[1] == '[' {
+		switch b[2] {
+		case 'A':
+			return keyUp, b[3:]
+		case 'B':
+			return keyDown, b[3:]
+		case 'C':
+			return keyRight, b[3:]
+		case 'D':
+			return keyLeft, b[3:]
+		case 'H':
+			return keyHome, b[3:]
+		case 'F':
+			return keyEnd, b[3:]
+		}
+	}
+
+	if !pasteActive && len(b) >= 6 && b[0] == keyEscape && b[1] == '[' && b[2] == '1' && b[3] == ';' && b[4] == '3' {
+		switch b[5] {
+		case 'C':
+			return keyAltRight, b[6:]
+		case 'D':
+			return keyAltLeft, b[6:]
+		}
+	}
+
+	if !pasteActive && len(b) >= 6 && bytes.Equal(b[:6], pasteStart) {
+		return keyPasteStart, b[6:]
+	}
+
+	if pasteActive && len(b) >= 6 && bytes.Equal(b[:6], pasteEnd) {
+		return keyPasteEnd, b[6:]
+	}
+
+	// If we get here then we have a key that we don't recognise, or a
+	// partial sequence. It's not clear how one should find the end of a
+	// sequence without knowing them all, but it seems that [a-zA-Z~] only
+	// appears at the end of a sequence.
+	for i, c := range b[0:] {
+		if c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c == '~' {
+			return keyUnknown, b[i+1:]
+		}
+	}
+
+	return utf8.RuneError, b
+}
+
+// queue appends data to the end of t.outBuf
+func (t *Terminal) queue(data []rune) {
+	t.outBuf = append(t.outBuf, []byte(string(data))...)
+}
+
+var eraseUnderCursor = []rune{' ', keyEscape, '[', 'D'}
+var space = []rune{' '}
+
+func isPrintable(key rune) bool {
+	isInSurrogateArea := key >= 0xd800 && key <= 0xdbff
+	return key >= 32 && !isInSurrogateArea
+}
+
+// moveCursorToPos appends data to t.outBuf which will move the cursor to the
+// given, logical position in the text.
+func (t *Terminal) moveCursorToPos(pos int) {
+	if !t.echo {
+		return
+	}
+
+	x := visualLength(t.prompt) + pos
+	y := x / t.termWidth
+	x = x % t.termWidth
+
+	up := 0
+	if y < t.cursorY {
+		up = t.cursorY - y
+	}
+
+	down := 0
+	if y > t.cursorY {
+		down = y - t.cursorY
+	}
+
+	left := 0
+	if x < t.cursorX {
+		left = t.cursorX - x
+	}
+
+	right := 0
+	if x > t.cursorX {
+		right = x - t.cursorX
+	}
+
+	t.cursorX = x
+	t.cursorY = y
+	t.move(up, down, left, right)
+}
+
+func (t *Terminal) move(up, down, left, right int) {
+	movement := make([]rune, 3*(up+down+left+right))
+	m := movement
+	for i := 0; i < up; i++ {
+		m[0] = keyEscape
+		m[1] = '['
+		m[2] = 'A'
+		m = m[3:]
+	}
+	for i := 0; i < down; i++ {
+		m[0] = keyEscape
+		m[1] = '['
+		m[2] = 'B'
+		m = m[3:]
+	}
+	for i := 0; i < left; i++ {
+		m[0] = keyEscape
+		m[1] = '['
+		m[2] = 'D'
+		m = m[3:]
+	}
+	for i := 0; i < right; i++ {
+		m[0] = keyEscape
+		m[1] = '['
+		m[2] = 'C'
+		m = m[3:]
+	}
+
+	t.queue(movement)
+}
+
+func (t *Terminal) clearLineToRight() {
+	op := []rune{keyEscape, '[', 'K'}
+	t.queue(op)
+}
+
+const maxLineLength = 4096
+
+func (t *Terminal) setLine(newLine []rune, newPos int) {
+	if t.echo {
+		t.moveCursorToPos(0)
+		t.writeLine(newLine)
+		for i := len(newLine); i < len(t.line); i++ {
+			t.writeLine(space)
+		}
+		t.moveCursorToPos(newPos)
+	}
+	t.line = newLine
+	t.pos = newPos
+}
+
+func (t *Terminal) advanceCursor(places int) {
+	t.cursorX += places
+	t.cursorY += t.cursorX / t.termWidth
+	if t.cursorY > t.maxLine {
+		t.maxLine = t.cursorY
+	}
+	t.cursorX = t.cursorX % t.termWidth
+
+	if places > 0 && t.cursorX == 0 {
+		// Normally terminals will advance the current position
+		// when writing a character. But that doesn't happen
+		// for the last character in a line. However, when
+		// writing a character (except a new line) that causes
+		// a line wrap, the position will be advanced two
+		// places.
+		//
+		// So, if we are stopping at the end of a line, we
+		// need to write a newline so that our cursor can be
+		// advanced to the next line.
+		t.outBuf = append(t.outBuf, '\n')
+	}
+}
+
+func (t *Terminal) eraseNPreviousChars(n int) {
+	if n == 0 {
+		return
+	}
+
+	if t.pos < n {
+		n = t.pos
+	}
+	t.pos -= n
+	t.moveCursorToPos(t.pos)
+
+	copy(t.line[t.pos:], t.line[n+t.pos:])
+	t.line = t.line[:len(t.line)-n]
+	if t.echo {
+		t.writeLine(t.line[t.pos:])
+		for i := 0; i < n; i++ {
+			t.queue(space)
+		}
+		t.advanceCursor(n)
+		t.moveCursorToPos(t.pos)
+	}
+}
+
+// countToLeftWord returns then number of characters from the cursor to the
+// start of the previous word.
+func (t *Terminal) countToLeftWord() int {
+	if t.pos == 0 {
+		return 0
+	}
+
+	pos := t.pos - 1
+	for pos > 0 {
+		if t.line[pos] != ' ' {
+			break
+		}
+		pos--
+	}
+	for pos > 0 {
+		if t.line[pos] == ' ' {
+			pos++
+			break
+		}
+		pos--
+	}
+
+	return t.pos - pos
+}
+
+// countToRightWord returns then number of characters from the cursor to the
+// start of the next word.
+func (t *Terminal) countToRightWord() int {
+	pos := t.pos
+	for pos < len(t.line) {
+		if t.line[pos] == ' ' {
+			break
+		}
+		pos++
+	}
+	for pos < len(t.line) {
+		if t.line[pos] != ' ' {
+			break
+		}
+		pos++
+	}
+	return pos - t.pos
+}
+
+// visualLength returns the number of visible glyphs in s.
+func visualLength(runes []rune) int {
+	inEscapeSeq := false
+	length := 0
+
+	for _, r := range runes {
+		switch {
+		case inEscapeSeq:
+			if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') {
+				inEscapeSeq = false
+			}
+		case r == '\x1b':
+			inEscapeSeq = true
+		default:
+			length++
+		}
+	}
+
+	return length
+}
+
+// handleKey processes the given key and, optionally, returns a line of text
+// that the user has entered.
+func (t *Terminal) handleKey(key rune) (line string, ok bool) {
+	if t.pasteActive && key != keyEnter {
+		t.addKeyToLine(key)
+		return
+	}
+
+	switch key {
+	case keyBackspace:
+		if t.pos == 0 {
+			return
+		}
+		t.eraseNPreviousChars(1)
+	case keyAltLeft:
+		// move left by a word.
+		t.pos -= t.countToLeftWord()
+		t.moveCursorToPos(t.pos)
+	case keyAltRight:
+		// move right by a word.
+		t.pos += t.countToRightWord()
+		t.moveCursorToPos(t.pos)
+	case keyLeft:
+		if t.pos == 0 {
+			return
+		}
+		t.pos--
+		t.moveCursorToPos(t.pos)
+	case keyRight:
+		if t.pos == len(t.line) {
+			return
+		}
+		t.pos++
+		t.moveCursorToPos(t.pos)
+	case keyHome:
+		if t.pos == 0 {
+			return
+		}
+		t.pos = 0
+		t.moveCursorToPos(t.pos)
+	case keyEnd:
+		if t.pos == len(t.line) {
+			return
+		}
+		t.pos = len(t.line)
+		t.moveCursorToPos(t.pos)
+	case keyUp:
+		entry, ok := t.history.NthPreviousEntry(t.historyIndex + 1)
+		if !ok {
+			return "", false
+		}
+		if t.historyIndex == -1 {
+			t.historyPending = string(t.line)
+		}
+		t.historyIndex++
+		runes := []rune(entry)
+		t.setLine(runes, len(runes))
+	case keyDown:
+		switch t.historyIndex {
+		case -1:
+			return
+		case 0:
+			runes := []rune(t.historyPending)
+			t.setLine(runes, len(runes))
+			t.historyIndex--
+		default:
+			entry, ok := t.history.NthPreviousEntry(t.historyIndex - 1)
+			if ok {
+				t.historyIndex--
+				runes := []rune(entry)
+				t.setLine(runes, len(runes))
+			}
+		}
+	case keyEnter:
+		t.moveCursorToPos(len(t.line))
+		t.queue([]rune("\r\n"))
+		line = string(t.line)
+		ok = true
+		t.line = t.line[:0]
+		t.pos = 0
+		t.cursorX = 0
+		t.cursorY = 0
+		t.maxLine = 0
+	case keyDeleteWord:
+		// Delete zero or more spaces and then one or more characters.
+		t.eraseNPreviousChars(t.countToLeftWord())
+	case keyDeleteLine:
+		// Delete everything from the current cursor position to the
+		// end of line.
+		for i := t.pos; i < len(t.line); i++ {
+			t.queue(space)
+			t.advanceCursor(1)
+		}
+		t.line = t.line[:t.pos]
+		t.moveCursorToPos(t.pos)
+	case keyCtrlD:
+		// Erase the character under the current position.
+		// The EOF case when the line is empty is handled in
+		// readLine().
+		if t.pos < len(t.line) {
+			t.pos++
+			t.eraseNPreviousChars(1)
+		}
+	case keyCtrlU:
+		t.eraseNPreviousChars(t.pos)
+	case keyClearScreen:
+		// Erases the screen and moves the cursor to the home position.
+		t.queue([]rune("\x1b[2J\x1b[H"))
+		t.queue(t.prompt)
+		t.cursorX, t.cursorY = 0, 0
+		t.advanceCursor(visualLength(t.prompt))
+		t.setLine(t.line, t.pos)
+	default:
+		if t.AutoCompleteCallback != nil {
+			prefix := string(t.line[:t.pos])
+			suffix := string(t.line[t.pos:])
+
+			t.lock.Unlock()
+			newLine, newPos, completeOk := t.AutoCompleteCallback(prefix+suffix, len(prefix), key)
+			t.lock.Lock()
+
+			if completeOk {
+				t.setLine([]rune(newLine), utf8.RuneCount([]byte(newLine)[:newPos]))
+				return
+			}
+		}
+		if !isPrintable(key) {
+			return
+		}
+		if len(t.line) == maxLineLength {
+			return
+		}
+		t.addKeyToLine(key)
+	}
+	return
+}
+
+// addKeyToLine inserts the given key at the current position in the current
+// line.
+func (t *Terminal) addKeyToLine(key rune) {
+	if len(t.line) == cap(t.line) {
+		newLine := make([]rune, len(t.line), 2*(1+len(t.line)))
+		copy(newLine, t.line)
+		t.line = newLine
+	}
+	t.line = t.line[:len(t.line)+1]
+	copy(t.line[t.pos+1:], t.line[t.pos:])
+	t.line[t.pos] = key
+	if t.echo {
+		t.writeLine(t.line[t.pos:])
+	}
+	t.pos++
+	t.moveCursorToPos(t.pos)
+}
+
+func (t *Terminal) writeLine(line []rune) {
+	for len(line) != 0 {
+		remainingOnLine := t.termWidth - t.cursorX
+		todo := len(line)
+		if todo > remainingOnLine {
+			todo = remainingOnLine
+		}
+		t.queue(line[:todo])
+		t.advanceCursor(visualLength(line[:todo]))
+		line = line[todo:]
+	}
+}
+
+func (t *Terminal) Write(buf []byte) (n int, err error) {
+	t.lock.Lock()
+	defer t.lock.Unlock()
+
+	if t.cursorX == 0 && t.cursorY == 0 {
+		// This is the easy case: there's nothing on the screen that we
+		// have to move out of the way.
+		return t.c.Write(buf)
+	}
+
+	// We have a prompt and possibly user input on the screen. We
+	// have to clear it first.
+	t.move(0 /* up */, 0 /* down */, t.cursorX /* left */, 0 /* right */)
+	t.cursorX = 0
+	t.clearLineToRight()
+
+	for t.cursorY > 0 {
+		t.move(1 /* up */, 0, 0, 0)
+		t.cursorY--
+		t.clearLineToRight()
+	}
+
+	if _, err = t.c.Write(t.outBuf); err != nil {
+		return
+	}
+	t.outBuf = t.outBuf[:0]
+
+	if n, err = t.c.Write(buf); err != nil {
+		return
+	}
+
+	t.writeLine(t.prompt)
+	if t.echo {
+		t.writeLine(t.line)
+	}
+
+	t.moveCursorToPos(t.pos)
+
+	if _, err = t.c.Write(t.outBuf); err != nil {
+		return
+	}
+	t.outBuf = t.outBuf[:0]
+	return
+}
+
+// ReadPassword temporarily changes the prompt and reads a password, without
+// echo, from the terminal.
+func (t *Terminal) ReadPassword(prompt string) (line string, err error) {
+	t.lock.Lock()
+	defer t.lock.Unlock()
+
+	oldPrompt := t.prompt
+	t.prompt = []rune(prompt)
+	t.echo = false
+
+	line, err = t.readLine()
+
+	t.prompt = oldPrompt
+	t.echo = true
+
+	return
+}
+
+// ReadLine returns a line of input from the terminal.
+func (t *Terminal) ReadLine() (line string, err error) {
+	t.lock.Lock()
+	defer t.lock.Unlock()
+
+	return t.readLine()
+}
+
+func (t *Terminal) readLine() (line string, err error) {
+	// t.lock must be held at this point
+
+	if t.cursorX == 0 && t.cursorY == 0 {
+		t.writeLine(t.prompt)
+		t.c.Write(t.outBuf)
+		t.outBuf = t.outBuf[:0]
+	}
+
+	lineIsPasted := t.pasteActive
+
+	for {
+		rest := t.remainder
+		lineOk := false
+		for !lineOk {
+			var key rune
+			key, rest = bytesToKey(rest, t.pasteActive)
+			if key == utf8.RuneError {
+				break
+			}
+			if !t.pasteActive {
+				if key == keyCtrlD {
+					if len(t.line) == 0 {
+						return "", io.EOF
+					}
+				}
+				if key == keyPasteStart {
+					t.pasteActive = true
+					if len(t.line) == 0 {
+						lineIsPasted = true
+					}
+					continue
+				}
+			} else if key == keyPasteEnd {
+				t.pasteActive = false
+				continue
+			}
+			if !t.pasteActive {
+				lineIsPasted = false
+			}
+			line, lineOk = t.handleKey(key)
+		}
+		if len(rest) > 0 {
+			n := copy(t.inBuf[:], rest)
+			t.remainder = t.inBuf[:n]
+		} else {
+			t.remainder = nil
+		}
+		t.c.Write(t.outBuf)
+		t.outBuf = t.outBuf[:0]
+		if lineOk {
+			if t.echo {
+				t.historyIndex = -1
+				t.history.Add(line)
+			}
+			if lineIsPasted {
+				err = ErrPasteIndicator
+			}
+			return
+		}
+
+		// t.remainder is a slice at the beginning of t.inBuf
+		// containing a partial key sequence
+		readBuf := t.inBuf[len(t.remainder):]
+		var n int
+
+		t.lock.Unlock()
+		n, err = t.c.Read(readBuf)
+		t.lock.Lock()
+
+		if err != nil {
+			return
+		}
+
+		t.remainder = t.inBuf[:n+len(t.remainder)]
+	}
+
+	panic("unreachable") // for Go 1.0.
+}
+
+// SetPrompt sets the prompt to be used when reading subsequent lines.
+func (t *Terminal) SetPrompt(prompt string) {
+	t.lock.Lock()
+	defer t.lock.Unlock()
+
+	t.prompt = []rune(prompt)
+}
+
+func (t *Terminal) clearAndRepaintLinePlusNPrevious(numPrevLines int) {
+	// Move cursor to column zero at the start of the line.
+	t.move(t.cursorY, 0, t.cursorX, 0)
+	t.cursorX, t.cursorY = 0, 0
+	t.clearLineToRight()
+	for t.cursorY < numPrevLines {
+		// Move down a line
+		t.move(0, 1, 0, 0)
+		t.cursorY++
+		t.clearLineToRight()
+	}
+	// Move back to beginning.
+	t.move(t.cursorY, 0, 0, 0)
+	t.cursorX, t.cursorY = 0, 0
+
+	t.queue(t.prompt)
+	t.advanceCursor(visualLength(t.prompt))
+	t.writeLine(t.line)
+	t.moveCursorToPos(t.pos)
+}
+
+func (t *Terminal) SetSize(width, height int) error {
+	t.lock.Lock()
+	defer t.lock.Unlock()
+
+	if width == 0 {
+		width = 1
+	}
+
+	oldWidth := t.termWidth
+	t.termWidth, t.termHeight = width, height
+
+	switch {
+	case width == oldWidth:
+		// If the width didn't change then nothing else needs to be
+		// done.
+		return nil
+	case len(t.line) == 0 && t.cursorX == 0 && t.cursorY == 0:
+		// If there is nothing on current line and no prompt printed,
+		// just do nothing
+		return nil
+	case width < oldWidth:
+		// Some terminals (e.g. xterm) will truncate lines that were
+		// too long when shinking. Others, (e.g. gnome-terminal) will
+		// attempt to wrap them. For the former, repainting t.maxLine
+		// works great, but that behaviour goes badly wrong in the case
+		// of the latter because they have doubled every full line.
+
+		// We assume that we are working on a terminal that wraps lines
+		// and adjust the cursor position based on every previous line
+		// wrapping and turning into two. This causes the prompt on
+		// xterms to move upwards, which isn't great, but it avoids a
+		// huge mess with gnome-terminal.
+		if t.cursorX >= t.termWidth {
+			t.cursorX = t.termWidth - 1
+		}
+		t.cursorY *= 2
+		t.clearAndRepaintLinePlusNPrevious(t.maxLine * 2)
+	case width > oldWidth:
+		// If the terminal expands then our position calculations will
+		// be wrong in the future because we think the cursor is
+		// |t.pos| chars into the string, but there will be a gap at
+		// the end of any wrapped line.
+		//
+		// But the position will actually be correct until we move, so
+		// we can move back to the beginning and repaint everything.
+		t.clearAndRepaintLinePlusNPrevious(t.maxLine)
+	}
+
+	_, err := t.c.Write(t.outBuf)
+	t.outBuf = t.outBuf[:0]
+	return err
+}
+
+type pasteIndicatorError struct{}
+
+func (pasteIndicatorError) Error() string {
+	return "terminal: ErrPasteIndicator not correctly handled"
+}
+
+// ErrPasteIndicator may be returned from ReadLine as the error, in addition
+// to valid line data. It indicates that bracketed paste mode is enabled and
+// that the returned line consists only of pasted data. Programs may wish to
+// interpret pasted data more literally than typed data.
+var ErrPasteIndicator = pasteIndicatorError{}
+
+// SetBracketedPasteMode requests that the terminal bracket paste operations
+// with markers. Not all terminals support this but, if it is supported, then
+// enabling this mode will stop any autocomplete callback from running due to
+// pastes. Additionally, any lines that are completely pasted will be returned
+// from ReadLine with the error set to ErrPasteIndicator.
+func (t *Terminal) SetBracketedPasteMode(on bool) {
+	if on {
+		io.WriteString(t.c, "\x1b[?2004h")
+	} else {
+		io.WriteString(t.c, "\x1b[?2004l")
+	}
+}
+
+// stRingBuffer is a ring buffer of strings.
+type stRingBuffer struct {
+	// entries contains max elements.
+	entries []string
+	max     int
+	// head contains the index of the element most recently added to the ring.
+	head int
+	// size contains the number of elements in the ring.
+	size int
+}
+
+func (s *stRingBuffer) Add(a string) {
+	if s.entries == nil {
+		const defaultNumEntries = 100
+		s.entries = make([]string, defaultNumEntries)
+		s.max = defaultNumEntries
+	}
+
+	s.head = (s.head + 1) % s.max
+	s.entries[s.head] = a
+	if s.size < s.max {
+		s.size++
+	}
+}
+
+// NthPreviousEntry returns the value passed to the nth previous call to Add.
+// If n is zero then the immediately prior value is returned, if one, then the
+// next most recent, and so on. If such an element doesn't exist then ok is
+// false.
+func (s *stRingBuffer) NthPreviousEntry(n int) (value string, ok bool) {
+	if n >= s.size {
+		return "", false
+	}
+	index := s.head - n
+	if index < 0 {
+		index += s.max
+	}
+	return s.entries[index], true
+}
diff --git a/vendor/golang.org/x/crypto/ssh/terminal/util.go b/vendor/golang.org/x/crypto/ssh/terminal/util.go
new file mode 100644
index 0000000000..598e3df77e
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ssh/terminal/util.go
@@ -0,0 +1,128 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux,!appengine netbsd openbsd
+
+// Package terminal provides support functions for dealing with terminals, as
+// commonly found on UNIX systems.
+//
+// Putting a terminal into raw mode is the most common requirement:
+//
+// 	oldState, err := terminal.MakeRaw(0)
+// 	if err != nil {
+// 	        panic(err)
+// 	}
+// 	defer terminal.Restore(0, oldState)
+package terminal // import "golang.org/x/crypto/ssh/terminal"
+
+import (
+	"io"
+	"syscall"
+	"unsafe"
+)
+
+// State contains the state of a terminal.
+type State struct {
+	termios syscall.Termios
+}
+
+// IsTerminal returns true if the given file descriptor is a terminal.
+func IsTerminal(fd int) bool {
+	var termios syscall.Termios
+	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
+	return err == 0
+}
+
+// MakeRaw put the terminal connected to the given file descriptor into raw
+// mode and returns the previous state of the terminal so that it can be
+// restored.
+func MakeRaw(fd int) (*State, error) {
+	var oldState State
+	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
+		return nil, err
+	}
+
+	newState := oldState.termios
+	newState.Iflag &^= syscall.ISTRIP | syscall.INLCR | syscall.ICRNL | syscall.IGNCR | syscall.IXON | syscall.IXOFF
+	newState.Lflag &^= syscall.ECHO | syscall.ICANON | syscall.ISIG
+	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
+		return nil, err
+	}
+
+	return &oldState, nil
+}
+
+// GetState returns the current state of a terminal which may be useful to
+// restore the terminal after a signal.
+func GetState(fd int) (*State, error) {
+	var oldState State
+	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
+		return nil, err
+	}
+
+	return &oldState, nil
+}
+
+// Restore restores the terminal connected to the given file descriptor to a
+// previous state.
+func Restore(fd int, state *State) error {
+	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0)
+	return err
+}
+
+// GetSize returns the dimensions of the given terminal.
+func GetSize(fd int) (width, height int, err error) {
+	var dimensions [4]uint16
+
+	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(&dimensions)), 0, 0, 0); err != 0 {
+		return -1, -1, err
+	}
+	return int(dimensions[1]), int(dimensions[0]), nil
+}
+
+// ReadPassword reads a line of input from a terminal without local echo.  This
+// is commonly used for inputting passwords and other sensitive data. The slice
+// returned does not include the \n.
+func ReadPassword(fd int) ([]byte, error) {
+	var oldState syscall.Termios
+	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0); err != 0 {
+		return nil, err
+	}
+
+	newState := oldState
+	newState.Lflag &^= syscall.ECHO
+	newState.Lflag |= syscall.ICANON | syscall.ISIG
+	newState.Iflag |= syscall.ICRNL
+	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
+		return nil, err
+	}
+
+	defer func() {
+		syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0)
+	}()
+
+	var buf [16]byte
+	var ret []byte
+	for {
+		n, err := syscall.Read(fd, buf[:])
+		if err != nil {
+			return nil, err
+		}
+		if n == 0 {
+			if len(ret) == 0 {
+				return nil, io.EOF
+			}
+			break
+		}
+		if buf[n-1] == '\n' {
+			n--
+		}
+		ret = append(ret, buf[:n]...)
+		if n < len(buf) {
+			break
+		}
+	}
+
+	return ret, nil
+}
diff --git a/vendor/golang.org/x/crypto/ssh/terminal/util_bsd.go b/vendor/golang.org/x/crypto/ssh/terminal/util_bsd.go
new file mode 100644
index 0000000000..9c1ffd145a
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ssh/terminal/util_bsd.go
@@ -0,0 +1,12 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd netbsd openbsd
+
+package terminal
+
+import "syscall"
+
+const ioctlReadTermios = syscall.TIOCGETA
+const ioctlWriteTermios = syscall.TIOCSETA
diff --git a/vendor/golang.org/x/crypto/ssh/terminal/util_linux.go b/vendor/golang.org/x/crypto/ssh/terminal/util_linux.go
new file mode 100644
index 0000000000..5883b22d78
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ssh/terminal/util_linux.go
@@ -0,0 +1,11 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package terminal
+
+// These constants are declared here, rather than importing
+// them from the syscall package as some syscall packages, even
+// on linux, for example gccgo, do not declare them.
+const ioctlReadTermios = 0x5401  // syscall.TCGETS
+const ioctlWriteTermios = 0x5402 // syscall.TCSETS
diff --git a/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go b/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
new file mode 100644
index 0000000000..2dd6c3d978
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
@@ -0,0 +1,174 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+// Package terminal provides support functions for dealing with terminals, as
+// commonly found on UNIX systems.
+//
+// Putting a terminal into raw mode is the most common requirement:
+//
+// 	oldState, err := terminal.MakeRaw(0)
+// 	if err != nil {
+// 	        panic(err)
+// 	}
+// 	defer terminal.Restore(0, oldState)
+package terminal
+
+import (
+	"io"
+	"syscall"
+	"unsafe"
+)
+
+const (
+	enableLineInput       = 2
+	enableEchoInput       = 4
+	enableProcessedInput  = 1
+	enableWindowInput     = 8
+	enableMouseInput      = 16
+	enableInsertMode      = 32
+	enableQuickEditMode   = 64
+	enableExtendedFlags   = 128
+	enableAutoPosition    = 256
+	enableProcessedOutput = 1
+	enableWrapAtEolOutput = 2
+)
+
+var kernel32 = syscall.NewLazyDLL("kernel32.dll")
+
+var (
+	procGetConsoleMode             = kernel32.NewProc("GetConsoleMode")
+	procSetConsoleMode             = kernel32.NewProc("SetConsoleMode")
+	procGetConsoleScreenBufferInfo = kernel32.NewProc("GetConsoleScreenBufferInfo")
+)
+
+type (
+	short int16
+	word  uint16
+
+	coord struct {
+		x short
+		y short
+	}
+	smallRect struct {
+		left   short
+		top    short
+		right  short
+		bottom short
+	}
+	consoleScreenBufferInfo struct {
+		size              coord
+		cursorPosition    coord
+		attributes        word
+		window            smallRect
+		maximumWindowSize coord
+	}
+)
+
+type State struct {
+	mode uint32
+}
+
+// IsTerminal returns true if the given file descriptor is a terminal.
+func IsTerminal(fd int) bool {
+	var st uint32
+	r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
+	return r != 0 && e == 0
+}
+
+// MakeRaw put the terminal connected to the given file descriptor into raw
+// mode and returns the previous state of the terminal so that it can be
+// restored.
+func MakeRaw(fd int) (*State, error) {
+	var st uint32
+	_, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
+	if e != 0 {
+		return nil, error(e)
+	}
+	st &^= (enableEchoInput | enableProcessedInput | enableLineInput | enableProcessedOutput)
+	_, _, e = syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(st), 0)
+	if e != 0 {
+		return nil, error(e)
+	}
+	return &State{st}, nil
+}
+
+// GetState returns the current state of a terminal which may be useful to
+// restore the terminal after a signal.
+func GetState(fd int) (*State, error) {
+	var st uint32
+	_, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
+	if e != 0 {
+		return nil, error(e)
+	}
+	return &State{st}, nil
+}
+
+// Restore restores the terminal connected to the given file descriptor to a
+// previous state.
+func Restore(fd int, state *State) error {
+	_, _, err := syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(state.mode), 0)
+	return err
+}
+
+// GetSize returns the dimensions of the given terminal.
+func GetSize(fd int) (width, height int, err error) {
+	var info consoleScreenBufferInfo
+	_, _, e := syscall.Syscall(procGetConsoleScreenBufferInfo.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&info)), 0)
+	if e != 0 {
+		return 0, 0, error(e)
+	}
+	return int(info.size.x), int(info.size.y), nil
+}
+
+// ReadPassword reads a line of input from a terminal without local echo.  This
+// is commonly used for inputting passwords and other sensitive data. The slice
+// returned does not include the \n.
+func ReadPassword(fd int) ([]byte, error) {
+	var st uint32
+	_, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
+	if e != 0 {
+		return nil, error(e)
+	}
+	old := st
+
+	st &^= (enableEchoInput)
+	st |= (enableProcessedInput | enableLineInput | enableProcessedOutput)
+	_, _, e = syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(st), 0)
+	if e != 0 {
+		return nil, error(e)
+	}
+
+	defer func() {
+		syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(old), 0)
+	}()
+
+	var buf [16]byte
+	var ret []byte
+	for {
+		n, err := syscall.Read(syscall.Handle(fd), buf[:])
+		if err != nil {
+			return nil, err
+		}
+		if n == 0 {
+			if len(ret) == 0 {
+				return nil, io.EOF
+			}
+			break
+		}
+		if buf[n-1] == '\n' {
+			n--
+		}
+		if n > 0 && buf[n-1] == '\r' {
+			n--
+		}
+		ret = append(ret, buf[:n]...)
+		if n < len(buf) {
+			break
+		}
+	}
+
+	return ret, nil
+}
diff --git a/vendor/golang.org/x/net/LICENSE b/vendor/golang.org/x/net/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/golang.org/x/net/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/net/PATENTS b/vendor/golang.org/x/net/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/golang.org/x/net/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go
new file mode 100644
index 0000000000..77b64d0c67
--- /dev/null
+++ b/vendor/golang.org/x/net/context/context.go
@@ -0,0 +1,447 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package context defines the Context type, which carries deadlines,
+// cancelation signals, and other request-scoped values across API boundaries
+// and between processes.
+//
+// Incoming requests to a server should create a Context, and outgoing calls to
+// servers should accept a Context.  The chain of function calls between must
+// propagate the Context, optionally replacing it with a modified copy created
+// using WithDeadline, WithTimeout, WithCancel, or WithValue.
+//
+// Programs that use Contexts should follow these rules to keep interfaces
+// consistent across packages and enable static analysis tools to check context
+// propagation:
+//
+// Do not store Contexts inside a struct type; instead, pass a Context
+// explicitly to each function that needs it.  The Context should be the first
+// parameter, typically named ctx:
+//
+// 	func DoSomething(ctx context.Context, arg Arg) error {
+// 		// ... use ctx ...
+// 	}
+//
+// Do not pass a nil Context, even if a function permits it.  Pass context.TODO
+// if you are unsure about which Context to use.
+//
+// Use context Values only for request-scoped data that transits processes and
+// APIs, not for passing optional parameters to functions.
+//
+// The same Context may be passed to functions running in different goroutines;
+// Contexts are safe for simultaneous use by multiple goroutines.
+//
+// See http://blog.golang.org/context for example code for a server that uses
+// Contexts.
+package context // import "golang.org/x/net/context"
+
+import (
+	"errors"
+	"fmt"
+	"sync"
+	"time"
+)
+
+// A Context carries a deadline, a cancelation signal, and other values across
+// API boundaries.
+//
+// Context's methods may be called by multiple goroutines simultaneously.
+type Context interface {
+	// Deadline returns the time when work done on behalf of this context
+	// should be canceled.  Deadline returns ok==false when no deadline is
+	// set.  Successive calls to Deadline return the same results.
+	Deadline() (deadline time.Time, ok bool)
+
+	// Done returns a channel that's closed when work done on behalf of this
+	// context should be canceled.  Done may return nil if this context can
+	// never be canceled.  Successive calls to Done return the same value.
+	//
+	// WithCancel arranges for Done to be closed when cancel is called;
+	// WithDeadline arranges for Done to be closed when the deadline
+	// expires; WithTimeout arranges for Done to be closed when the timeout
+	// elapses.
+	//
+	// Done is provided for use in select statements:
+	//
+	//  // Stream generates values with DoSomething and sends them to out
+	//  // until DoSomething returns an error or ctx.Done is closed.
+	//  func Stream(ctx context.Context, out <-chan Value) error {
+	//  	for {
+	//  		v, err := DoSomething(ctx)
+	//  		if err != nil {
+	//  			return err
+	//  		}
+	//  		select {
+	//  		case <-ctx.Done():
+	//  			return ctx.Err()
+	//  		case out <- v:
+	//  		}
+	//  	}
+	//  }
+	//
+	// See http://blog.golang.org/pipelines for more examples of how to use
+	// a Done channel for cancelation.
+	Done() <-chan struct{}
+
+	// Err returns a non-nil error value after Done is closed.  Err returns
+	// Canceled if the context was canceled or DeadlineExceeded if the
+	// context's deadline passed.  No other values for Err are defined.
+	// After Done is closed, successive calls to Err return the same value.
+	Err() error
+
+	// Value returns the value associated with this context for key, or nil
+	// if no value is associated with key.  Successive calls to Value with
+	// the same key returns the same result.
+	//
+	// Use context values only for request-scoped data that transits
+	// processes and API boundaries, not for passing optional parameters to
+	// functions.
+	//
+	// A key identifies a specific value in a Context.  Functions that wish
+	// to store values in Context typically allocate a key in a global
+	// variable then use that key as the argument to context.WithValue and
+	// Context.Value.  A key can be any type that supports equality;
+	// packages should define keys as an unexported type to avoid
+	// collisions.
+	//
+	// Packages that define a Context key should provide type-safe accessors
+	// for the values stores using that key:
+	//
+	// 	// Package user defines a User type that's stored in Contexts.
+	// 	package user
+	//
+	// 	import "golang.org/x/net/context"
+	//
+	// 	// User is the type of value stored in the Contexts.
+	// 	type User struct {...}
+	//
+	// 	// key is an unexported type for keys defined in this package.
+	// 	// This prevents collisions with keys defined in other packages.
+	// 	type key int
+	//
+	// 	// userKey is the key for user.User values in Contexts.  It is
+	// 	// unexported; clients use user.NewContext and user.FromContext
+	// 	// instead of using this key directly.
+	// 	var userKey key = 0
+	//
+	// 	// NewContext returns a new Context that carries value u.
+	// 	func NewContext(ctx context.Context, u *User) context.Context {
+	// 		return context.WithValue(ctx, userKey, u)
+	// 	}
+	//
+	// 	// FromContext returns the User value stored in ctx, if any.
+	// 	func FromContext(ctx context.Context) (*User, bool) {
+	// 		u, ok := ctx.Value(userKey).(*User)
+	// 		return u, ok
+	// 	}
+	Value(key interface{}) interface{}
+}
+
+// Canceled is the error returned by Context.Err when the context is canceled.
+var Canceled = errors.New("context canceled")
+
+// DeadlineExceeded is the error returned by Context.Err when the context's
+// deadline passes.
+var DeadlineExceeded = errors.New("context deadline exceeded")
+
+// An emptyCtx is never canceled, has no values, and has no deadline.  It is not
+// struct{}, since vars of this type must have distinct addresses.
+type emptyCtx int
+
+func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
+	return
+}
+
+func (*emptyCtx) Done() <-chan struct{} {
+	return nil
+}
+
+func (*emptyCtx) Err() error {
+	return nil
+}
+
+func (*emptyCtx) Value(key interface{}) interface{} {
+	return nil
+}
+
+func (e *emptyCtx) String() string {
+	switch e {
+	case background:
+		return "context.Background"
+	case todo:
+		return "context.TODO"
+	}
+	return "unknown empty Context"
+}
+
+var (
+	background = new(emptyCtx)
+	todo       = new(emptyCtx)
+)
+
+// Background returns a non-nil, empty Context. It is never canceled, has no
+// values, and has no deadline.  It is typically used by the main function,
+// initialization, and tests, and as the top-level Context for incoming
+// requests.
+func Background() Context {
+	return background
+}
+
+// TODO returns a non-nil, empty Context.  Code should use context.TODO when
+// it's unclear which Context to use or it is not yet available (because the
+// surrounding function has not yet been extended to accept a Context
+// parameter).  TODO is recognized by static analysis tools that determine
+// whether Contexts are propagated correctly in a program.
+func TODO() Context {
+	return todo
+}
+
+// A CancelFunc tells an operation to abandon its work.
+// A CancelFunc does not wait for the work to stop.
+// After the first call, subsequent calls to a CancelFunc do nothing.
+type CancelFunc func()
+
+// WithCancel returns a copy of parent with a new Done channel. The returned
+// context's Done channel is closed when the returned cancel function is called
+// or when the parent context's Done channel is closed, whichever happens first.
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete.
+func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
+	c := newCancelCtx(parent)
+	propagateCancel(parent, &c)
+	return &c, func() { c.cancel(true, Canceled) }
+}
+
+// newCancelCtx returns an initialized cancelCtx.
+func newCancelCtx(parent Context) cancelCtx {
+	return cancelCtx{
+		Context: parent,
+		done:    make(chan struct{}),
+	}
+}
+
+// propagateCancel arranges for child to be canceled when parent is.
+func propagateCancel(parent Context, child canceler) {
+	if parent.Done() == nil {
+		return // parent is never canceled
+	}
+	if p, ok := parentCancelCtx(parent); ok {
+		p.mu.Lock()
+		if p.err != nil {
+			// parent has already been canceled
+			child.cancel(false, p.err)
+		} else {
+			if p.children == nil {
+				p.children = make(map[canceler]bool)
+			}
+			p.children[child] = true
+		}
+		p.mu.Unlock()
+	} else {
+		go func() {
+			select {
+			case <-parent.Done():
+				child.cancel(false, parent.Err())
+			case <-child.Done():
+			}
+		}()
+	}
+}
+
+// parentCancelCtx follows a chain of parent references until it finds a
+// *cancelCtx.  This function understands how each of the concrete types in this
+// package represents its parent.
+func parentCancelCtx(parent Context) (*cancelCtx, bool) {
+	for {
+		switch c := parent.(type) {
+		case *cancelCtx:
+			return c, true
+		case *timerCtx:
+			return &c.cancelCtx, true
+		case *valueCtx:
+			parent = c.Context
+		default:
+			return nil, false
+		}
+	}
+}
+
+// removeChild removes a context from its parent.
+func removeChild(parent Context, child canceler) {
+	p, ok := parentCancelCtx(parent)
+	if !ok {
+		return
+	}
+	p.mu.Lock()
+	if p.children != nil {
+		delete(p.children, child)
+	}
+	p.mu.Unlock()
+}
+
+// A canceler is a context type that can be canceled directly.  The
+// implementations are *cancelCtx and *timerCtx.
+type canceler interface {
+	cancel(removeFromParent bool, err error)
+	Done() <-chan struct{}
+}
+
+// A cancelCtx can be canceled.  When canceled, it also cancels any children
+// that implement canceler.
+type cancelCtx struct {
+	Context
+
+	done chan struct{} // closed by the first cancel call.
+
+	mu       sync.Mutex
+	children map[canceler]bool // set to nil by the first cancel call
+	err      error             // set to non-nil by the first cancel call
+}
+
+func (c *cancelCtx) Done() <-chan struct{} {
+	return c.done
+}
+
+func (c *cancelCtx) Err() error {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	return c.err
+}
+
+func (c *cancelCtx) String() string {
+	return fmt.Sprintf("%v.WithCancel", c.Context)
+}
+
+// cancel closes c.done, cancels each of c's children, and, if
+// removeFromParent is true, removes c from its parent's children.
+func (c *cancelCtx) cancel(removeFromParent bool, err error) {
+	if err == nil {
+		panic("context: internal error: missing cancel error")
+	}
+	c.mu.Lock()
+	if c.err != nil {
+		c.mu.Unlock()
+		return // already canceled
+	}
+	c.err = err
+	close(c.done)
+	for child := range c.children {
+		// NOTE: acquiring the child's lock while holding parent's lock.
+		child.cancel(false, err)
+	}
+	c.children = nil
+	c.mu.Unlock()
+
+	if removeFromParent {
+		removeChild(c.Context, c)
+	}
+}
+
+// WithDeadline returns a copy of the parent context with the deadline adjusted
+// to be no later than d.  If the parent's deadline is already earlier than d,
+// WithDeadline(parent, d) is semantically equivalent to parent.  The returned
+// context's Done channel is closed when the deadline expires, when the returned
+// cancel function is called, or when the parent context's Done channel is
+// closed, whichever happens first.
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete.
+func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
+	if cur, ok := parent.Deadline(); ok && cur.Before(deadline) {
+		// The current deadline is already sooner than the new one.
+		return WithCancel(parent)
+	}
+	c := &timerCtx{
+		cancelCtx: newCancelCtx(parent),
+		deadline:  deadline,
+	}
+	propagateCancel(parent, c)
+	d := deadline.Sub(time.Now())
+	if d <= 0 {
+		c.cancel(true, DeadlineExceeded) // deadline has already passed
+		return c, func() { c.cancel(true, Canceled) }
+	}
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	if c.err == nil {
+		c.timer = time.AfterFunc(d, func() {
+			c.cancel(true, DeadlineExceeded)
+		})
+	}
+	return c, func() { c.cancel(true, Canceled) }
+}
+
+// A timerCtx carries a timer and a deadline.  It embeds a cancelCtx to
+// implement Done and Err.  It implements cancel by stopping its timer then
+// delegating to cancelCtx.cancel.
+type timerCtx struct {
+	cancelCtx
+	timer *time.Timer // Under cancelCtx.mu.
+
+	deadline time.Time
+}
+
+func (c *timerCtx) Deadline() (deadline time.Time, ok bool) {
+	return c.deadline, true
+}
+
+func (c *timerCtx) String() string {
+	return fmt.Sprintf("%v.WithDeadline(%s [%s])", c.cancelCtx.Context, c.deadline, c.deadline.Sub(time.Now()))
+}
+
+func (c *timerCtx) cancel(removeFromParent bool, err error) {
+	c.cancelCtx.cancel(false, err)
+	if removeFromParent {
+		// Remove this timerCtx from its parent cancelCtx's children.
+		removeChild(c.cancelCtx.Context, c)
+	}
+	c.mu.Lock()
+	if c.timer != nil {
+		c.timer.Stop()
+		c.timer = nil
+	}
+	c.mu.Unlock()
+}
+
+// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete:
+//
+// 	func slowOperationWithTimeout(ctx context.Context) (Result, error) {
+// 		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
+// 		defer cancel()  // releases resources if slowOperation completes before timeout elapses
+// 		return slowOperation(ctx)
+// 	}
+func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
+	return WithDeadline(parent, time.Now().Add(timeout))
+}
+
+// WithValue returns a copy of parent in which the value associated with key is
+// val.
+//
+// Use context Values only for request-scoped data that transits processes and
+// APIs, not for passing optional parameters to functions.
+func WithValue(parent Context, key interface{}, val interface{}) Context {
+	return &valueCtx{parent, key, val}
+}
+
+// A valueCtx carries a key-value pair.  It implements Value for that key and
+// delegates all other calls to the embedded Context.
+type valueCtx struct {
+	Context
+	key, val interface{}
+}
+
+func (c *valueCtx) String() string {
+	return fmt.Sprintf("%v.WithValue(%#v, %#v)", c.Context, c.key, c.val)
+}
+
+func (c *valueCtx) Value(key interface{}) interface{} {
+	if c.key == key {
+		return c.val
+	}
+	return c.Context.Value(key)
+}
diff --git a/vendor/golang.org/x/net/html/atom/atom.go b/vendor/golang.org/x/net/html/atom/atom.go
new file mode 100644
index 0000000000..cd0a8ac154
--- /dev/null
+++ b/vendor/golang.org/x/net/html/atom/atom.go
@@ -0,0 +1,78 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package atom provides integer codes (also known as atoms) for a fixed set of
+// frequently occurring HTML strings: tag names and attribute keys such as "p"
+// and "id".
+//
+// Sharing an atom's name between all elements with the same tag can result in
+// fewer string allocations when tokenizing and parsing HTML. Integer
+// comparisons are also generally faster than string comparisons.
+//
+// The value of an atom's particular code is not guaranteed to stay the same
+// between versions of this package. Neither is any ordering guaranteed:
+// whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to
+// be dense. The only guarantees are that e.g. looking up "div" will yield
+// atom.Div, calling atom.Div.String will return "div", and atom.Div != 0.
+package atom // import "golang.org/x/net/html/atom"
+
+// Atom is an integer code for a string. The zero value maps to "".
+type Atom uint32
+
+// String returns the atom's name.
+func (a Atom) String() string {
+	start := uint32(a >> 8)
+	n := uint32(a & 0xff)
+	if start+n > uint32(len(atomText)) {
+		return ""
+	}
+	return atomText[start : start+n]
+}
+
+func (a Atom) string() string {
+	return atomText[a>>8 : a>>8+a&0xff]
+}
+
+// fnv computes the FNV hash with an arbitrary starting value h.
+func fnv(h uint32, s []byte) uint32 {
+	for i := range s {
+		h ^= uint32(s[i])
+		h *= 16777619
+	}
+	return h
+}
+
+func match(s string, t []byte) bool {
+	for i, c := range t {
+		if s[i] != c {
+			return false
+		}
+	}
+	return true
+}
+
+// Lookup returns the atom whose name is s. It returns zero if there is no
+// such atom. The lookup is case sensitive.
+func Lookup(s []byte) Atom {
+	if len(s) == 0 || len(s) > maxAtomLen {
+		return 0
+	}
+	h := fnv(hash0, s)
+	if a := table[h&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
+		return a
+	}
+	if a := table[(h>>16)&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
+		return a
+	}
+	return 0
+}
+
+// String returns a string whose contents are equal to s. In that sense, it is
+// equivalent to string(s) but may be more efficient.
+func String(s []byte) string {
+	if a := Lookup(s); a != 0 {
+		return a.String()
+	}
+	return string(s)
+}
diff --git a/vendor/golang.org/x/net/html/atom/gen.go b/vendor/golang.org/x/net/html/atom/gen.go
new file mode 100644
index 0000000000..6bfa866019
--- /dev/null
+++ b/vendor/golang.org/x/net/html/atom/gen.go
@@ -0,0 +1,648 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+package main
+
+// This program generates table.go and table_test.go.
+// Invoke as
+//
+//	go run gen.go |gofmt >table.go
+//	go run gen.go -test |gofmt >table_test.go
+
+import (
+	"flag"
+	"fmt"
+	"math/rand"
+	"os"
+	"sort"
+	"strings"
+)
+
+// identifier converts s to a Go exported identifier.
+// It converts "div" to "Div" and "accept-charset" to "AcceptCharset".
+func identifier(s string) string {
+	b := make([]byte, 0, len(s))
+	cap := true
+	for _, c := range s {
+		if c == '-' {
+			cap = true
+			continue
+		}
+		if cap && 'a' <= c && c <= 'z' {
+			c -= 'a' - 'A'
+		}
+		cap = false
+		b = append(b, byte(c))
+	}
+	return string(b)
+}
+
+var test = flag.Bool("test", false, "generate table_test.go")
+
+func main() {
+	flag.Parse()
+
+	var all []string
+	all = append(all, elements...)
+	all = append(all, attributes...)
+	all = append(all, eventHandlers...)
+	all = append(all, extra...)
+	sort.Strings(all)
+
+	if *test {
+		fmt.Printf("// generated by go run gen.go -test; DO NOT EDIT\n\n")
+		fmt.Printf("package atom\n\n")
+		fmt.Printf("var testAtomList = []string{\n")
+		for _, s := range all {
+			fmt.Printf("\t%q,\n", s)
+		}
+		fmt.Printf("}\n")
+		return
+	}
+
+	// uniq - lists have dups
+	// compute max len too
+	maxLen := 0
+	w := 0
+	for _, s := range all {
+		if w == 0 || all[w-1] != s {
+			if maxLen < len(s) {
+				maxLen = len(s)
+			}
+			all[w] = s
+			w++
+		}
+	}
+	all = all[:w]
+
+	// Find hash that minimizes table size.
+	var best *table
+	for i := 0; i < 1000000; i++ {
+		if best != nil && 1<<(best.k-1) < len(all) {
+			break
+		}
+		h := rand.Uint32()
+		for k := uint(0); k <= 16; k++ {
+			if best != nil && k >= best.k {
+				break
+			}
+			var t table
+			if t.init(h, k, all) {
+				best = &t
+				break
+			}
+		}
+	}
+	if best == nil {
+		fmt.Fprintf(os.Stderr, "failed to construct string table\n")
+		os.Exit(1)
+	}
+
+	// Lay out strings, using overlaps when possible.
+	layout := append([]string{}, all...)
+
+	// Remove strings that are substrings of other strings
+	for changed := true; changed; {
+		changed = false
+		for i, s := range layout {
+			if s == "" {
+				continue
+			}
+			for j, t := range layout {
+				if i != j && t != "" && strings.Contains(s, t) {
+					changed = true
+					layout[j] = ""
+				}
+			}
+		}
+	}
+
+	// Join strings where one suffix matches another prefix.
+	for {
+		// Find best i, j, k such that layout[i][len-k:] == layout[j][:k],
+		// maximizing overlap length k.
+		besti := -1
+		bestj := -1
+		bestk := 0
+		for i, s := range layout {
+			if s == "" {
+				continue
+			}
+			for j, t := range layout {
+				if i == j {
+					continue
+				}
+				for k := bestk + 1; k <= len(s) && k <= len(t); k++ {
+					if s[len(s)-k:] == t[:k] {
+						besti = i
+						bestj = j
+						bestk = k
+					}
+				}
+			}
+		}
+		if bestk > 0 {
+			layout[besti] += layout[bestj][bestk:]
+			layout[bestj] = ""
+			continue
+		}
+		break
+	}
+
+	text := strings.Join(layout, "")
+
+	atom := map[string]uint32{}
+	for _, s := range all {
+		off := strings.Index(text, s)
+		if off < 0 {
+			panic("lost string " + s)
+		}
+		atom[s] = uint32(off<<8 | len(s))
+	}
+
+	// Generate the Go code.
+	fmt.Printf("// generated by go run gen.go; DO NOT EDIT\n\n")
+	fmt.Printf("package atom\n\nconst (\n")
+	for _, s := range all {
+		fmt.Printf("\t%s Atom = %#x\n", identifier(s), atom[s])
+	}
+	fmt.Printf(")\n\n")
+
+	fmt.Printf("const hash0 = %#x\n\n", best.h0)
+	fmt.Printf("const maxAtomLen = %d\n\n", maxLen)
+
+	fmt.Printf("var table = [1<<%d]Atom{\n", best.k)
+	for i, s := range best.tab {
+		if s == "" {
+			continue
+		}
+		fmt.Printf("\t%#x: %#x, // %s\n", i, atom[s], s)
+	}
+	fmt.Printf("}\n")
+	datasize := (1 << best.k) * 4
+
+	fmt.Printf("const atomText =\n")
+	textsize := len(text)
+	for len(text) > 60 {
+		fmt.Printf("\t%q +\n", text[:60])
+		text = text[60:]
+	}
+	fmt.Printf("\t%q\n\n", text)
+
+	fmt.Fprintf(os.Stderr, "%d atoms; %d string bytes + %d tables = %d total data\n", len(all), textsize, datasize, textsize+datasize)
+}
+
+type byLen []string
+
+func (x byLen) Less(i, j int) bool { return len(x[i]) > len(x[j]) }
+func (x byLen) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
+func (x byLen) Len() int           { return len(x) }
+
+// fnv computes the FNV hash with an arbitrary starting value h.
+func fnv(h uint32, s string) uint32 {
+	for i := 0; i < len(s); i++ {
+		h ^= uint32(s[i])
+		h *= 16777619
+	}
+	return h
+}
+
+// A table represents an attempt at constructing the lookup table.
+// The lookup table uses cuckoo hashing, meaning that each string
+// can be found in one of two positions.
+type table struct {
+	h0   uint32
+	k    uint
+	mask uint32
+	tab  []string
+}
+
+// hash returns the two hashes for s.
+func (t *table) hash(s string) (h1, h2 uint32) {
+	h := fnv(t.h0, s)
+	h1 = h & t.mask
+	h2 = (h >> 16) & t.mask
+	return
+}
+
+// init initializes the table with the given parameters.
+// h0 is the initial hash value,
+// k is the number of bits of hash value to use, and
+// x is the list of strings to store in the table.
+// init returns false if the table cannot be constructed.
+func (t *table) init(h0 uint32, k uint, x []string) bool {
+	t.h0 = h0
+	t.k = k
+	t.tab = make([]string, 1<<k)
+	t.mask = 1<<k - 1
+	for _, s := range x {
+		if !t.insert(s) {
+			return false
+		}
+	}
+	return true
+}
+
+// insert inserts s in the table.
+func (t *table) insert(s string) bool {
+	h1, h2 := t.hash(s)
+	if t.tab[h1] == "" {
+		t.tab[h1] = s
+		return true
+	}
+	if t.tab[h2] == "" {
+		t.tab[h2] = s
+		return true
+	}
+	if t.push(h1, 0) {
+		t.tab[h1] = s
+		return true
+	}
+	if t.push(h2, 0) {
+		t.tab[h2] = s
+		return true
+	}
+	return false
+}
+
+// push attempts to push aside the entry in slot i.
+func (t *table) push(i uint32, depth int) bool {
+	if depth > len(t.tab) {
+		return false
+	}
+	s := t.tab[i]
+	h1, h2 := t.hash(s)
+	j := h1 + h2 - i
+	if t.tab[j] != "" && !t.push(j, depth+1) {
+		return false
+	}
+	t.tab[j] = s
+	return true
+}
+
+// The lists of element names and attribute keys were taken from
+// https://html.spec.whatwg.org/multipage/indices.html#index
+// as of the "HTML Living Standard - Last Updated 21 February 2015" version.
+
+var elements = []string{
+	"a",
+	"abbr",
+	"address",
+	"area",
+	"article",
+	"aside",
+	"audio",
+	"b",
+	"base",
+	"bdi",
+	"bdo",
+	"blockquote",
+	"body",
+	"br",
+	"button",
+	"canvas",
+	"caption",
+	"cite",
+	"code",
+	"col",
+	"colgroup",
+	"command",
+	"data",
+	"datalist",
+	"dd",
+	"del",
+	"details",
+	"dfn",
+	"dialog",
+	"div",
+	"dl",
+	"dt",
+	"em",
+	"embed",
+	"fieldset",
+	"figcaption",
+	"figure",
+	"footer",
+	"form",
+	"h1",
+	"h2",
+	"h3",
+	"h4",
+	"h5",
+	"h6",
+	"head",
+	"header",
+	"hgroup",
+	"hr",
+	"html",
+	"i",
+	"iframe",
+	"img",
+	"input",
+	"ins",
+	"kbd",
+	"keygen",
+	"label",
+	"legend",
+	"li",
+	"link",
+	"map",
+	"mark",
+	"menu",
+	"menuitem",
+	"meta",
+	"meter",
+	"nav",
+	"noscript",
+	"object",
+	"ol",
+	"optgroup",
+	"option",
+	"output",
+	"p",
+	"param",
+	"pre",
+	"progress",
+	"q",
+	"rp",
+	"rt",
+	"ruby",
+	"s",
+	"samp",
+	"script",
+	"section",
+	"select",
+	"small",
+	"source",
+	"span",
+	"strong",
+	"style",
+	"sub",
+	"summary",
+	"sup",
+	"table",
+	"tbody",
+	"td",
+	"template",
+	"textarea",
+	"tfoot",
+	"th",
+	"thead",
+	"time",
+	"title",
+	"tr",
+	"track",
+	"u",
+	"ul",
+	"var",
+	"video",
+	"wbr",
+}
+
+// https://html.spec.whatwg.org/multipage/indices.html#attributes-3
+
+var attributes = []string{
+	"abbr",
+	"accept",
+	"accept-charset",
+	"accesskey",
+	"action",
+	"alt",
+	"async",
+	"autocomplete",
+	"autofocus",
+	"autoplay",
+	"challenge",
+	"charset",
+	"checked",
+	"cite",
+	"class",
+	"cols",
+	"colspan",
+	"command",
+	"content",
+	"contenteditable",
+	"contextmenu",
+	"controls",
+	"coords",
+	"crossorigin",
+	"data",
+	"datetime",
+	"default",
+	"defer",
+	"dir",
+	"dirname",
+	"disabled",
+	"download",
+	"draggable",
+	"dropzone",
+	"enctype",
+	"for",
+	"form",
+	"formaction",
+	"formenctype",
+	"formmethod",
+	"formnovalidate",
+	"formtarget",
+	"headers",
+	"height",
+	"hidden",
+	"high",
+	"href",
+	"hreflang",
+	"http-equiv",
+	"icon",
+	"id",
+	"inputmode",
+	"ismap",
+	"itemid",
+	"itemprop",
+	"itemref",
+	"itemscope",
+	"itemtype",
+	"keytype",
+	"kind",
+	"label",
+	"lang",
+	"list",
+	"loop",
+	"low",
+	"manifest",
+	"max",
+	"maxlength",
+	"media",
+	"mediagroup",
+	"method",
+	"min",
+	"minlength",
+	"multiple",
+	"muted",
+	"name",
+	"novalidate",
+	"open",
+	"optimum",
+	"pattern",
+	"ping",
+	"placeholder",
+	"poster",
+	"preload",
+	"radiogroup",
+	"readonly",
+	"rel",
+	"required",
+	"reversed",
+	"rows",
+	"rowspan",
+	"sandbox",
+	"spellcheck",
+	"scope",
+	"scoped",
+	"seamless",
+	"selected",
+	"shape",
+	"size",
+	"sizes",
+	"sortable",
+	"sorted",
+	"span",
+	"src",
+	"srcdoc",
+	"srclang",
+	"start",
+	"step",
+	"style",
+	"tabindex",
+	"target",
+	"title",
+	"translate",
+	"type",
+	"typemustmatch",
+	"usemap",
+	"value",
+	"width",
+	"wrap",
+}
+
+var eventHandlers = []string{
+	"onabort",
+	"onautocomplete",
+	"onautocompleteerror",
+	"onafterprint",
+	"onbeforeprint",
+	"onbeforeunload",
+	"onblur",
+	"oncancel",
+	"oncanplay",
+	"oncanplaythrough",
+	"onchange",
+	"onclick",
+	"onclose",
+	"oncontextmenu",
+	"oncuechange",
+	"ondblclick",
+	"ondrag",
+	"ondragend",
+	"ondragenter",
+	"ondragleave",
+	"ondragover",
+	"ondragstart",
+	"ondrop",
+	"ondurationchange",
+	"onemptied",
+	"onended",
+	"onerror",
+	"onfocus",
+	"onhashchange",
+	"oninput",
+	"oninvalid",
+	"onkeydown",
+	"onkeypress",
+	"onkeyup",
+	"onlanguagechange",
+	"onload",
+	"onloadeddata",
+	"onloadedmetadata",
+	"onloadstart",
+	"onmessage",
+	"onmousedown",
+	"onmousemove",
+	"onmouseout",
+	"onmouseover",
+	"onmouseup",
+	"onmousewheel",
+	"onoffline",
+	"ononline",
+	"onpagehide",
+	"onpageshow",
+	"onpause",
+	"onplay",
+	"onplaying",
+	"onpopstate",
+	"onprogress",
+	"onratechange",
+	"onreset",
+	"onresize",
+	"onscroll",
+	"onseeked",
+	"onseeking",
+	"onselect",
+	"onshow",
+	"onsort",
+	"onstalled",
+	"onstorage",
+	"onsubmit",
+	"onsuspend",
+	"ontimeupdate",
+	"ontoggle",
+	"onunload",
+	"onvolumechange",
+	"onwaiting",
+}
+
+// extra are ad-hoc values not covered by any of the lists above.
+var extra = []string{
+	"align",
+	"annotation",
+	"annotation-xml",
+	"applet",
+	"basefont",
+	"bgsound",
+	"big",
+	"blink",
+	"center",
+	"color",
+	"desc",
+	"face",
+	"font",
+	"foreignObject", // HTML is case-insensitive, but SVG-embedded-in-HTML is case-sensitive.
+	"foreignobject",
+	"frame",
+	"frameset",
+	"image",
+	"isindex",
+	"listing",
+	"malignmark",
+	"marquee",
+	"math",
+	"mglyph",
+	"mi",
+	"mn",
+	"mo",
+	"ms",
+	"mtext",
+	"nobr",
+	"noembed",
+	"noframes",
+	"plaintext",
+	"prompt",
+	"public",
+	"spacer",
+	"strike",
+	"svg",
+	"system",
+	"tt",
+	"xmp",
+}
diff --git a/vendor/golang.org/x/net/html/atom/table.go b/vendor/golang.org/x/net/html/atom/table.go
new file mode 100644
index 0000000000..2605ba3102
--- /dev/null
+++ b/vendor/golang.org/x/net/html/atom/table.go
@@ -0,0 +1,713 @@
+// generated by go run gen.go; DO NOT EDIT
+
+package atom
+
+const (
+	A                   Atom = 0x1
+	Abbr                Atom = 0x4
+	Accept              Atom = 0x2106
+	AcceptCharset       Atom = 0x210e
+	Accesskey           Atom = 0x3309
+	Action              Atom = 0x1f606
+	Address             Atom = 0x4f307
+	Align               Atom = 0x1105
+	Alt                 Atom = 0x4503
+	Annotation          Atom = 0x1670a
+	AnnotationXml       Atom = 0x1670e
+	Applet              Atom = 0x2b306
+	Area                Atom = 0x2fa04
+	Article             Atom = 0x38807
+	Aside               Atom = 0x8305
+	Async               Atom = 0x7b05
+	Audio               Atom = 0xa605
+	Autocomplete        Atom = 0x1fc0c
+	Autofocus           Atom = 0xb309
+	Autoplay            Atom = 0xce08
+	B                   Atom = 0x101
+	Base                Atom = 0xd604
+	Basefont            Atom = 0xd608
+	Bdi                 Atom = 0x1a03
+	Bdo                 Atom = 0xe703
+	Bgsound             Atom = 0x11807
+	Big                 Atom = 0x12403
+	Blink               Atom = 0x12705
+	Blockquote          Atom = 0x12c0a
+	Body                Atom = 0x2f04
+	Br                  Atom = 0x202
+	Button              Atom = 0x13606
+	Canvas              Atom = 0x7f06
+	Caption             Atom = 0x1bb07
+	Center              Atom = 0x5b506
+	Challenge           Atom = 0x21f09
+	Charset             Atom = 0x2807
+	Checked             Atom = 0x32807
+	Cite                Atom = 0x3c804
+	Class               Atom = 0x4de05
+	Code                Atom = 0x14904
+	Col                 Atom = 0x15003
+	Colgroup            Atom = 0x15008
+	Color               Atom = 0x15d05
+	Cols                Atom = 0x16204
+	Colspan             Atom = 0x16207
+	Command             Atom = 0x17507
+	Content             Atom = 0x42307
+	Contenteditable     Atom = 0x4230f
+	Contextmenu         Atom = 0x3310b
+	Controls            Atom = 0x18808
+	Coords              Atom = 0x19406
+	Crossorigin         Atom = 0x19f0b
+	Data                Atom = 0x44a04
+	Datalist            Atom = 0x44a08
+	Datetime            Atom = 0x23c08
+	Dd                  Atom = 0x26702
+	Default             Atom = 0x8607
+	Defer               Atom = 0x14b05
+	Del                 Atom = 0x3ef03
+	Desc                Atom = 0x4db04
+	Details             Atom = 0x4807
+	Dfn                 Atom = 0x6103
+	Dialog              Atom = 0x1b06
+	Dir                 Atom = 0x6903
+	Dirname             Atom = 0x6907
+	Disabled            Atom = 0x10c08
+	Div                 Atom = 0x11303
+	Dl                  Atom = 0x11e02
+	Download            Atom = 0x40008
+	Draggable           Atom = 0x17b09
+	Dropzone            Atom = 0x39108
+	Dt                  Atom = 0x50902
+	Em                  Atom = 0x6502
+	Embed               Atom = 0x6505
+	Enctype             Atom = 0x21107
+	Face                Atom = 0x5b304
+	Fieldset            Atom = 0x1b008
+	Figcaption          Atom = 0x1b80a
+	Figure              Atom = 0x1cc06
+	Font                Atom = 0xda04
+	Footer              Atom = 0x8d06
+	For                 Atom = 0x1d803
+	ForeignObject       Atom = 0x1d80d
+	Foreignobject       Atom = 0x1e50d
+	Form                Atom = 0x1f204
+	Formaction          Atom = 0x1f20a
+	Formenctype         Atom = 0x20d0b
+	Formmethod          Atom = 0x2280a
+	Formnovalidate      Atom = 0x2320e
+	Formtarget          Atom = 0x2470a
+	Frame               Atom = 0x9a05
+	Frameset            Atom = 0x9a08
+	H1                  Atom = 0x26e02
+	H2                  Atom = 0x29402
+	H3                  Atom = 0x2a702
+	H4                  Atom = 0x2e902
+	H5                  Atom = 0x2f302
+	H6                  Atom = 0x50b02
+	Head                Atom = 0x2d504
+	Header              Atom = 0x2d506
+	Headers             Atom = 0x2d507
+	Height              Atom = 0x25106
+	Hgroup              Atom = 0x25906
+	Hidden              Atom = 0x26506
+	High                Atom = 0x26b04
+	Hr                  Atom = 0x27002
+	Href                Atom = 0x27004
+	Hreflang            Atom = 0x27008
+	Html                Atom = 0x25504
+	HttpEquiv           Atom = 0x2780a
+	I                   Atom = 0x601
+	Icon                Atom = 0x42204
+	Id                  Atom = 0x8502
+	Iframe              Atom = 0x29606
+	Image               Atom = 0x29c05
+	Img                 Atom = 0x2a103
+	Input               Atom = 0x3e805
+	Inputmode           Atom = 0x3e809
+	Ins                 Atom = 0x1a803
+	Isindex             Atom = 0x2a907
+	Ismap               Atom = 0x2b005
+	Itemid              Atom = 0x33c06
+	Itemprop            Atom = 0x3c908
+	Itemref             Atom = 0x5ad07
+	Itemscope           Atom = 0x2b909
+	Itemtype            Atom = 0x2c308
+	Kbd                 Atom = 0x1903
+	Keygen              Atom = 0x3906
+	Keytype             Atom = 0x53707
+	Kind                Atom = 0x10904
+	Label               Atom = 0xf005
+	Lang                Atom = 0x27404
+	Legend              Atom = 0x18206
+	Li                  Atom = 0x1202
+	Link                Atom = 0x12804
+	List                Atom = 0x44e04
+	Listing             Atom = 0x44e07
+	Loop                Atom = 0xf404
+	Low                 Atom = 0x11f03
+	Malignmark          Atom = 0x100a
+	Manifest            Atom = 0x5f108
+	Map                 Atom = 0x2b203
+	Mark                Atom = 0x1604
+	Marquee             Atom = 0x2cb07
+	Math                Atom = 0x2d204
+	Max                 Atom = 0x2e103
+	Maxlength           Atom = 0x2e109
+	Media               Atom = 0x6e05
+	Mediagroup          Atom = 0x6e0a
+	Menu                Atom = 0x33804
+	Menuitem            Atom = 0x33808
+	Meta                Atom = 0x45d04
+	Meter               Atom = 0x24205
+	Method              Atom = 0x22c06
+	Mglyph              Atom = 0x2a206
+	Mi                  Atom = 0x2eb02
+	Min                 Atom = 0x2eb03
+	Minlength           Atom = 0x2eb09
+	Mn                  Atom = 0x23502
+	Mo                  Atom = 0x3ed02
+	Ms                  Atom = 0x2bc02
+	Mtext               Atom = 0x2f505
+	Multiple            Atom = 0x30308
+	Muted               Atom = 0x30b05
+	Name                Atom = 0x6c04
+	Nav                 Atom = 0x3e03
+	Nobr                Atom = 0x5704
+	Noembed             Atom = 0x6307
+	Noframes            Atom = 0x9808
+	Noscript            Atom = 0x3d208
+	Novalidate          Atom = 0x2360a
+	Object              Atom = 0x1ec06
+	Ol                  Atom = 0xc902
+	Onabort             Atom = 0x13a07
+	Onafterprint        Atom = 0x1c00c
+	Onautocomplete      Atom = 0x1fa0e
+	Onautocompleteerror Atom = 0x1fa13
+	Onbeforeprint       Atom = 0x6040d
+	Onbeforeunload      Atom = 0x4e70e
+	Onblur              Atom = 0xaa06
+	Oncancel            Atom = 0xe908
+	Oncanplay           Atom = 0x28509
+	Oncanplaythrough    Atom = 0x28510
+	Onchange            Atom = 0x3a708
+	Onclick             Atom = 0x31007
+	Onclose             Atom = 0x31707
+	Oncontextmenu       Atom = 0x32f0d
+	Oncuechange         Atom = 0x3420b
+	Ondblclick          Atom = 0x34d0a
+	Ondrag              Atom = 0x35706
+	Ondragend           Atom = 0x35709
+	Ondragenter         Atom = 0x3600b
+	Ondragleave         Atom = 0x36b0b
+	Ondragover          Atom = 0x3760a
+	Ondragstart         Atom = 0x3800b
+	Ondrop              Atom = 0x38f06
+	Ondurationchange    Atom = 0x39f10
+	Onemptied           Atom = 0x39609
+	Onended             Atom = 0x3af07
+	Onerror             Atom = 0x3b607
+	Onfocus             Atom = 0x3bd07
+	Onhashchange        Atom = 0x3da0c
+	Oninput             Atom = 0x3e607
+	Oninvalid           Atom = 0x3f209
+	Onkeydown           Atom = 0x3fb09
+	Onkeypress          Atom = 0x4080a
+	Onkeyup             Atom = 0x41807
+	Onlanguagechange    Atom = 0x43210
+	Onload              Atom = 0x44206
+	Onloadeddata        Atom = 0x4420c
+	Onloadedmetadata    Atom = 0x45510
+	Onloadstart         Atom = 0x46b0b
+	Onmessage           Atom = 0x47609
+	Onmousedown         Atom = 0x47f0b
+	Onmousemove         Atom = 0x48a0b
+	Onmouseout          Atom = 0x4950a
+	Onmouseover         Atom = 0x4a20b
+	Onmouseup           Atom = 0x4ad09
+	Onmousewheel        Atom = 0x4b60c
+	Onoffline           Atom = 0x4c209
+	Ononline            Atom = 0x4cb08
+	Onpagehide          Atom = 0x4d30a
+	Onpageshow          Atom = 0x4fe0a
+	Onpause             Atom = 0x50d07
+	Onplay              Atom = 0x51706
+	Onplaying           Atom = 0x51709
+	Onpopstate          Atom = 0x5200a
+	Onprogress          Atom = 0x52a0a
+	Onratechange        Atom = 0x53e0c
+	Onreset             Atom = 0x54a07
+	Onresize            Atom = 0x55108
+	Onscroll            Atom = 0x55f08
+	Onseeked            Atom = 0x56708
+	Onseeking           Atom = 0x56f09
+	Onselect            Atom = 0x57808
+	Onshow              Atom = 0x58206
+	Onsort              Atom = 0x58b06
+	Onstalled           Atom = 0x59509
+	Onstorage           Atom = 0x59e09
+	Onsubmit            Atom = 0x5a708
+	Onsuspend           Atom = 0x5bb09
+	Ontimeupdate        Atom = 0xdb0c
+	Ontoggle            Atom = 0x5c408
+	Onunload            Atom = 0x5cc08
+	Onvolumechange      Atom = 0x5d40e
+	Onwaiting           Atom = 0x5e209
+	Open                Atom = 0x3cf04
+	Optgroup            Atom = 0xf608
+	Optimum             Atom = 0x5eb07
+	Option              Atom = 0x60006
+	Output              Atom = 0x49c06
+	P                   Atom = 0xc01
+	Param               Atom = 0xc05
+	Pattern             Atom = 0x5107
+	Ping                Atom = 0x7704
+	Placeholder         Atom = 0xc30b
+	Plaintext           Atom = 0xfd09
+	Poster              Atom = 0x15706
+	Pre                 Atom = 0x25e03
+	Preload             Atom = 0x25e07
+	Progress            Atom = 0x52c08
+	Prompt              Atom = 0x5fa06
+	Public              Atom = 0x41e06
+	Q                   Atom = 0x13101
+	Radiogroup          Atom = 0x30a
+	Readonly            Atom = 0x2fb08
+	Rel                 Atom = 0x25f03
+	Required            Atom = 0x1d008
+	Reversed            Atom = 0x5a08
+	Rows                Atom = 0x9204
+	Rowspan             Atom = 0x9207
+	Rp                  Atom = 0x1c602
+	Rt                  Atom = 0x13f02
+	Ruby                Atom = 0xaf04
+	S                   Atom = 0x2c01
+	Samp                Atom = 0x4e04
+	Sandbox             Atom = 0xbb07
+	Scope               Atom = 0x2bd05
+	Scoped              Atom = 0x2bd06
+	Script              Atom = 0x3d406
+	Seamless            Atom = 0x31c08
+	Section             Atom = 0x4e207
+	Select              Atom = 0x57a06
+	Selected            Atom = 0x57a08
+	Shape               Atom = 0x4f905
+	Size                Atom = 0x55504
+	Sizes               Atom = 0x55505
+	Small               Atom = 0x18f05
+	Sortable            Atom = 0x58d08
+	Sorted              Atom = 0x19906
+	Source              Atom = 0x1aa06
+	Spacer              Atom = 0x2db06
+	Span                Atom = 0x9504
+	Spellcheck          Atom = 0x3230a
+	Src                 Atom = 0x3c303
+	Srcdoc              Atom = 0x3c306
+	Srclang             Atom = 0x41107
+	Start               Atom = 0x38605
+	Step                Atom = 0x5f704
+	Strike              Atom = 0x53306
+	Strong              Atom = 0x55906
+	Style               Atom = 0x61105
+	Sub                 Atom = 0x5a903
+	Summary             Atom = 0x61607
+	Sup                 Atom = 0x61d03
+	Svg                 Atom = 0x62003
+	System              Atom = 0x62306
+	Tabindex            Atom = 0x46308
+	Table               Atom = 0x42d05
+	Target              Atom = 0x24b06
+	Tbody               Atom = 0x2e05
+	Td                  Atom = 0x4702
+	Template            Atom = 0x62608
+	Textarea            Atom = 0x2f608
+	Tfoot               Atom = 0x8c05
+	Th                  Atom = 0x22e02
+	Thead               Atom = 0x2d405
+	Time                Atom = 0xdd04
+	Title               Atom = 0xa105
+	Tr                  Atom = 0x10502
+	Track               Atom = 0x10505
+	Translate           Atom = 0x14009
+	Tt                  Atom = 0x5302
+	Type                Atom = 0x21404
+	Typemustmatch       Atom = 0x2140d
+	U                   Atom = 0xb01
+	Ul                  Atom = 0x8a02
+	Usemap              Atom = 0x51106
+	Value               Atom = 0x4005
+	Var                 Atom = 0x11503
+	Video               Atom = 0x28105
+	Wbr                 Atom = 0x12103
+	Width               Atom = 0x50705
+	Wrap                Atom = 0x58704
+	Xmp                 Atom = 0xc103
+)
+
+const hash0 = 0xc17da63e
+
+const maxAtomLen = 19
+
+var table = [1 << 9]Atom{
+	0x1:   0x48a0b, // onmousemove
+	0x2:   0x5e209, // onwaiting
+	0x3:   0x1fa13, // onautocompleteerror
+	0x4:   0x5fa06, // prompt
+	0x7:   0x5eb07, // optimum
+	0x8:   0x1604,  // mark
+	0xa:   0x5ad07, // itemref
+	0xb:   0x4fe0a, // onpageshow
+	0xc:   0x57a06, // select
+	0xd:   0x17b09, // draggable
+	0xe:   0x3e03,  // nav
+	0xf:   0x17507, // command
+	0x11:  0xb01,   // u
+	0x14:  0x2d507, // headers
+	0x15:  0x44a08, // datalist
+	0x17:  0x4e04,  // samp
+	0x1a:  0x3fb09, // onkeydown
+	0x1b:  0x55f08, // onscroll
+	0x1c:  0x15003, // col
+	0x20:  0x3c908, // itemprop
+	0x21:  0x2780a, // http-equiv
+	0x22:  0x61d03, // sup
+	0x24:  0x1d008, // required
+	0x2b:  0x25e07, // preload
+	0x2c:  0x6040d, // onbeforeprint
+	0x2d:  0x3600b, // ondragenter
+	0x2e:  0x50902, // dt
+	0x2f:  0x5a708, // onsubmit
+	0x30:  0x27002, // hr
+	0x31:  0x32f0d, // oncontextmenu
+	0x33:  0x29c05, // image
+	0x34:  0x50d07, // onpause
+	0x35:  0x25906, // hgroup
+	0x36:  0x7704,  // ping
+	0x37:  0x57808, // onselect
+	0x3a:  0x11303, // div
+	0x3b:  0x1fa0e, // onautocomplete
+	0x40:  0x2eb02, // mi
+	0x41:  0x31c08, // seamless
+	0x42:  0x2807,  // charset
+	0x43:  0x8502,  // id
+	0x44:  0x5200a, // onpopstate
+	0x45:  0x3ef03, // del
+	0x46:  0x2cb07, // marquee
+	0x47:  0x3309,  // accesskey
+	0x49:  0x8d06,  // footer
+	0x4a:  0x44e04, // list
+	0x4b:  0x2b005, // ismap
+	0x51:  0x33804, // menu
+	0x52:  0x2f04,  // body
+	0x55:  0x9a08,  // frameset
+	0x56:  0x54a07, // onreset
+	0x57:  0x12705, // blink
+	0x58:  0xa105,  // title
+	0x59:  0x38807, // article
+	0x5b:  0x22e02, // th
+	0x5d:  0x13101, // q
+	0x5e:  0x3cf04, // open
+	0x5f:  0x2fa04, // area
+	0x61:  0x44206, // onload
+	0x62:  0xda04,  // font
+	0x63:  0xd604,  // base
+	0x64:  0x16207, // colspan
+	0x65:  0x53707, // keytype
+	0x66:  0x11e02, // dl
+	0x68:  0x1b008, // fieldset
+	0x6a:  0x2eb03, // min
+	0x6b:  0x11503, // var
+	0x6f:  0x2d506, // header
+	0x70:  0x13f02, // rt
+	0x71:  0x15008, // colgroup
+	0x72:  0x23502, // mn
+	0x74:  0x13a07, // onabort
+	0x75:  0x3906,  // keygen
+	0x76:  0x4c209, // onoffline
+	0x77:  0x21f09, // challenge
+	0x78:  0x2b203, // map
+	0x7a:  0x2e902, // h4
+	0x7b:  0x3b607, // onerror
+	0x7c:  0x2e109, // maxlength
+	0x7d:  0x2f505, // mtext
+	0x7e:  0xbb07,  // sandbox
+	0x7f:  0x58b06, // onsort
+	0x80:  0x100a,  // malignmark
+	0x81:  0x45d04, // meta
+	0x82:  0x7b05,  // async
+	0x83:  0x2a702, // h3
+	0x84:  0x26702, // dd
+	0x85:  0x27004, // href
+	0x86:  0x6e0a,  // mediagroup
+	0x87:  0x19406, // coords
+	0x88:  0x41107, // srclang
+	0x89:  0x34d0a, // ondblclick
+	0x8a:  0x4005,  // value
+	0x8c:  0xe908,  // oncancel
+	0x8e:  0x3230a, // spellcheck
+	0x8f:  0x9a05,  // frame
+	0x91:  0x12403, // big
+	0x94:  0x1f606, // action
+	0x95:  0x6903,  // dir
+	0x97:  0x2fb08, // readonly
+	0x99:  0x42d05, // table
+	0x9a:  0x61607, // summary
+	0x9b:  0x12103, // wbr
+	0x9c:  0x30a,   // radiogroup
+	0x9d:  0x6c04,  // name
+	0x9f:  0x62306, // system
+	0xa1:  0x15d05, // color
+	0xa2:  0x7f06,  // canvas
+	0xa3:  0x25504, // html
+	0xa5:  0x56f09, // onseeking
+	0xac:  0x4f905, // shape
+	0xad:  0x25f03, // rel
+	0xae:  0x28510, // oncanplaythrough
+	0xaf:  0x3760a, // ondragover
+	0xb0:  0x62608, // template
+	0xb1:  0x1d80d, // foreignObject
+	0xb3:  0x9204,  // rows
+	0xb6:  0x44e07, // listing
+	0xb7:  0x49c06, // output
+	0xb9:  0x3310b, // contextmenu
+	0xbb:  0x11f03, // low
+	0xbc:  0x1c602, // rp
+	0xbd:  0x5bb09, // onsuspend
+	0xbe:  0x13606, // button
+	0xbf:  0x4db04, // desc
+	0xc1:  0x4e207, // section
+	0xc2:  0x52a0a, // onprogress
+	0xc3:  0x59e09, // onstorage
+	0xc4:  0x2d204, // math
+	0xc5:  0x4503,  // alt
+	0xc7:  0x8a02,  // ul
+	0xc8:  0x5107,  // pattern
+	0xc9:  0x4b60c, // onmousewheel
+	0xca:  0x35709, // ondragend
+	0xcb:  0xaf04,  // ruby
+	0xcc:  0xc01,   // p
+	0xcd:  0x31707, // onclose
+	0xce:  0x24205, // meter
+	0xcf:  0x11807, // bgsound
+	0xd2:  0x25106, // height
+	0xd4:  0x101,   // b
+	0xd5:  0x2c308, // itemtype
+	0xd8:  0x1bb07, // caption
+	0xd9:  0x10c08, // disabled
+	0xdb:  0x33808, // menuitem
+	0xdc:  0x62003, // svg
+	0xdd:  0x18f05, // small
+	0xde:  0x44a04, // data
+	0xe0:  0x4cb08, // ononline
+	0xe1:  0x2a206, // mglyph
+	0xe3:  0x6505,  // embed
+	0xe4:  0x10502, // tr
+	0xe5:  0x46b0b, // onloadstart
+	0xe7:  0x3c306, // srcdoc
+	0xeb:  0x5c408, // ontoggle
+	0xed:  0xe703,  // bdo
+	0xee:  0x4702,  // td
+	0xef:  0x8305,  // aside
+	0xf0:  0x29402, // h2
+	0xf1:  0x52c08, // progress
+	0xf2:  0x12c0a, // blockquote
+	0xf4:  0xf005,  // label
+	0xf5:  0x601,   // i
+	0xf7:  0x9207,  // rowspan
+	0xfb:  0x51709, // onplaying
+	0xfd:  0x2a103, // img
+	0xfe:  0xf608,  // optgroup
+	0xff:  0x42307, // content
+	0x101: 0x53e0c, // onratechange
+	0x103: 0x3da0c, // onhashchange
+	0x104: 0x4807,  // details
+	0x106: 0x40008, // download
+	0x109: 0x14009, // translate
+	0x10b: 0x4230f, // contenteditable
+	0x10d: 0x36b0b, // ondragleave
+	0x10e: 0x2106,  // accept
+	0x10f: 0x57a08, // selected
+	0x112: 0x1f20a, // formaction
+	0x113: 0x5b506, // center
+	0x115: 0x45510, // onloadedmetadata
+	0x116: 0x12804, // link
+	0x117: 0xdd04,  // time
+	0x118: 0x19f0b, // crossorigin
+	0x119: 0x3bd07, // onfocus
+	0x11a: 0x58704, // wrap
+	0x11b: 0x42204, // icon
+	0x11d: 0x28105, // video
+	0x11e: 0x4de05, // class
+	0x121: 0x5d40e, // onvolumechange
+	0x122: 0xaa06,  // onblur
+	0x123: 0x2b909, // itemscope
+	0x124: 0x61105, // style
+	0x127: 0x41e06, // public
+	0x129: 0x2320e, // formnovalidate
+	0x12a: 0x58206, // onshow
+	0x12c: 0x51706, // onplay
+	0x12d: 0x3c804, // cite
+	0x12e: 0x2bc02, // ms
+	0x12f: 0xdb0c,  // ontimeupdate
+	0x130: 0x10904, // kind
+	0x131: 0x2470a, // formtarget
+	0x135: 0x3af07, // onended
+	0x136: 0x26506, // hidden
+	0x137: 0x2c01,  // s
+	0x139: 0x2280a, // formmethod
+	0x13a: 0x3e805, // input
+	0x13c: 0x50b02, // h6
+	0x13d: 0xc902,  // ol
+	0x13e: 0x3420b, // oncuechange
+	0x13f: 0x1e50d, // foreignobject
+	0x143: 0x4e70e, // onbeforeunload
+	0x144: 0x2bd05, // scope
+	0x145: 0x39609, // onemptied
+	0x146: 0x14b05, // defer
+	0x147: 0xc103,  // xmp
+	0x148: 0x39f10, // ondurationchange
+	0x149: 0x1903,  // kbd
+	0x14c: 0x47609, // onmessage
+	0x14d: 0x60006, // option
+	0x14e: 0x2eb09, // minlength
+	0x14f: 0x32807, // checked
+	0x150: 0xce08,  // autoplay
+	0x152: 0x202,   // br
+	0x153: 0x2360a, // novalidate
+	0x156: 0x6307,  // noembed
+	0x159: 0x31007, // onclick
+	0x15a: 0x47f0b, // onmousedown
+	0x15b: 0x3a708, // onchange
+	0x15e: 0x3f209, // oninvalid
+	0x15f: 0x2bd06, // scoped
+	0x160: 0x18808, // controls
+	0x161: 0x30b05, // muted
+	0x162: 0x58d08, // sortable
+	0x163: 0x51106, // usemap
+	0x164: 0x1b80a, // figcaption
+	0x165: 0x35706, // ondrag
+	0x166: 0x26b04, // high
+	0x168: 0x3c303, // src
+	0x169: 0x15706, // poster
+	0x16b: 0x1670e, // annotation-xml
+	0x16c: 0x5f704, // step
+	0x16d: 0x4,     // abbr
+	0x16e: 0x1b06,  // dialog
+	0x170: 0x1202,  // li
+	0x172: 0x3ed02, // mo
+	0x175: 0x1d803, // for
+	0x176: 0x1a803, // ins
+	0x178: 0x55504, // size
+	0x179: 0x43210, // onlanguagechange
+	0x17a: 0x8607,  // default
+	0x17b: 0x1a03,  // bdi
+	0x17c: 0x4d30a, // onpagehide
+	0x17d: 0x6907,  // dirname
+	0x17e: 0x21404, // type
+	0x17f: 0x1f204, // form
+	0x181: 0x28509, // oncanplay
+	0x182: 0x6103,  // dfn
+	0x183: 0x46308, // tabindex
+	0x186: 0x6502,  // em
+	0x187: 0x27404, // lang
+	0x189: 0x39108, // dropzone
+	0x18a: 0x4080a, // onkeypress
+	0x18b: 0x23c08, // datetime
+	0x18c: 0x16204, // cols
+	0x18d: 0x1,     // a
+	0x18e: 0x4420c, // onloadeddata
+	0x190: 0xa605,  // audio
+	0x192: 0x2e05,  // tbody
+	0x193: 0x22c06, // method
+	0x195: 0xf404,  // loop
+	0x196: 0x29606, // iframe
+	0x198: 0x2d504, // head
+	0x19e: 0x5f108, // manifest
+	0x19f: 0xb309,  // autofocus
+	0x1a0: 0x14904, // code
+	0x1a1: 0x55906, // strong
+	0x1a2: 0x30308, // multiple
+	0x1a3: 0xc05,   // param
+	0x1a6: 0x21107, // enctype
+	0x1a7: 0x5b304, // face
+	0x1a8: 0xfd09,  // plaintext
+	0x1a9: 0x26e02, // h1
+	0x1aa: 0x59509, // onstalled
+	0x1ad: 0x3d406, // script
+	0x1ae: 0x2db06, // spacer
+	0x1af: 0x55108, // onresize
+	0x1b0: 0x4a20b, // onmouseover
+	0x1b1: 0x5cc08, // onunload
+	0x1b2: 0x56708, // onseeked
+	0x1b4: 0x2140d, // typemustmatch
+	0x1b5: 0x1cc06, // figure
+	0x1b6: 0x4950a, // onmouseout
+	0x1b7: 0x25e03, // pre
+	0x1b8: 0x50705, // width
+	0x1b9: 0x19906, // sorted
+	0x1bb: 0x5704,  // nobr
+	0x1be: 0x5302,  // tt
+	0x1bf: 0x1105,  // align
+	0x1c0: 0x3e607, // oninput
+	0x1c3: 0x41807, // onkeyup
+	0x1c6: 0x1c00c, // onafterprint
+	0x1c7: 0x210e,  // accept-charset
+	0x1c8: 0x33c06, // itemid
+	0x1c9: 0x3e809, // inputmode
+	0x1cb: 0x53306, // strike
+	0x1cc: 0x5a903, // sub
+	0x1cd: 0x10505, // track
+	0x1ce: 0x38605, // start
+	0x1d0: 0xd608,  // basefont
+	0x1d6: 0x1aa06, // source
+	0x1d7: 0x18206, // legend
+	0x1d8: 0x2d405, // thead
+	0x1da: 0x8c05,  // tfoot
+	0x1dd: 0x1ec06, // object
+	0x1de: 0x6e05,  // media
+	0x1df: 0x1670a, // annotation
+	0x1e0: 0x20d0b, // formenctype
+	0x1e2: 0x3d208, // noscript
+	0x1e4: 0x55505, // sizes
+	0x1e5: 0x1fc0c, // autocomplete
+	0x1e6: 0x9504,  // span
+	0x1e7: 0x9808,  // noframes
+	0x1e8: 0x24b06, // target
+	0x1e9: 0x38f06, // ondrop
+	0x1ea: 0x2b306, // applet
+	0x1ec: 0x5a08,  // reversed
+	0x1f0: 0x2a907, // isindex
+	0x1f3: 0x27008, // hreflang
+	0x1f5: 0x2f302, // h5
+	0x1f6: 0x4f307, // address
+	0x1fa: 0x2e103, // max
+	0x1fb: 0xc30b,  // placeholder
+	0x1fc: 0x2f608, // textarea
+	0x1fe: 0x4ad09, // onmouseup
+	0x1ff: 0x3800b, // ondragstart
+}
+
+const atomText = "abbradiogrouparamalignmarkbdialogaccept-charsetbodyaccesskey" +
+	"genavaluealtdetailsampatternobreversedfnoembedirnamediagroup" +
+	"ingasyncanvasidefaultfooterowspanoframesetitleaudionblurubya" +
+	"utofocusandboxmplaceholderautoplaybasefontimeupdatebdoncance" +
+	"labelooptgrouplaintextrackindisabledivarbgsoundlowbrbigblink" +
+	"blockquotebuttonabortranslatecodefercolgroupostercolorcolspa" +
+	"nnotation-xmlcommandraggablegendcontrolsmallcoordsortedcross" +
+	"originsourcefieldsetfigcaptionafterprintfigurequiredforeignO" +
+	"bjectforeignobjectformactionautocompleteerrorformenctypemust" +
+	"matchallengeformmethodformnovalidatetimeterformtargetheightm" +
+	"lhgroupreloadhiddenhigh1hreflanghttp-equivideoncanplaythroug" +
+	"h2iframeimageimglyph3isindexismappletitemscopeditemtypemarqu" +
+	"eematheaderspacermaxlength4minlength5mtextareadonlymultiplem" +
+	"utedonclickoncloseamlesspellcheckedoncontextmenuitemidoncuec" +
+	"hangeondblclickondragendondragenterondragleaveondragoverondr" +
+	"agstarticleondropzonemptiedondurationchangeonendedonerroronf" +
+	"ocusrcdocitempropenoscriptonhashchangeoninputmodeloninvalido" +
+	"nkeydownloadonkeypressrclangonkeyupublicontenteditableonlang" +
+	"uagechangeonloadeddatalistingonloadedmetadatabindexonloadsta" +
+	"rtonmessageonmousedownonmousemoveonmouseoutputonmouseoveronm" +
+	"ouseuponmousewheelonofflineononlineonpagehidesclassectionbef" +
+	"oreunloaddresshapeonpageshowidth6onpausemaponplayingonpopsta" +
+	"teonprogresstrikeytypeonratechangeonresetonresizestrongonscr" +
+	"ollonseekedonseekingonselectedonshowraponsortableonstalledon" +
+	"storageonsubmitemrefacenteronsuspendontoggleonunloadonvolume" +
+	"changeonwaitingoptimumanifestepromptoptionbeforeprintstylesu" +
+	"mmarysupsvgsystemplate"
diff --git a/vendor/golang.org/x/net/html/const.go b/vendor/golang.org/x/net/html/const.go
new file mode 100644
index 0000000000..52f651ff6d
--- /dev/null
+++ b/vendor/golang.org/x/net/html/const.go
@@ -0,0 +1,102 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+// Section 12.2.3.2 of the HTML5 specification says "The following elements
+// have varying levels of special parsing rules".
+// https://html.spec.whatwg.org/multipage/syntax.html#the-stack-of-open-elements
+var isSpecialElementMap = map[string]bool{
+	"address":    true,
+	"applet":     true,
+	"area":       true,
+	"article":    true,
+	"aside":      true,
+	"base":       true,
+	"basefont":   true,
+	"bgsound":    true,
+	"blockquote": true,
+	"body":       true,
+	"br":         true,
+	"button":     true,
+	"caption":    true,
+	"center":     true,
+	"col":        true,
+	"colgroup":   true,
+	"dd":         true,
+	"details":    true,
+	"dir":        true,
+	"div":        true,
+	"dl":         true,
+	"dt":         true,
+	"embed":      true,
+	"fieldset":   true,
+	"figcaption": true,
+	"figure":     true,
+	"footer":     true,
+	"form":       true,
+	"frame":      true,
+	"frameset":   true,
+	"h1":         true,
+	"h2":         true,
+	"h3":         true,
+	"h4":         true,
+	"h5":         true,
+	"h6":         true,
+	"head":       true,
+	"header":     true,
+	"hgroup":     true,
+	"hr":         true,
+	"html":       true,
+	"iframe":     true,
+	"img":        true,
+	"input":      true,
+	"isindex":    true,
+	"li":         true,
+	"link":       true,
+	"listing":    true,
+	"marquee":    true,
+	"menu":       true,
+	"meta":       true,
+	"nav":        true,
+	"noembed":    true,
+	"noframes":   true,
+	"noscript":   true,
+	"object":     true,
+	"ol":         true,
+	"p":          true,
+	"param":      true,
+	"plaintext":  true,
+	"pre":        true,
+	"script":     true,
+	"section":    true,
+	"select":     true,
+	"source":     true,
+	"style":      true,
+	"summary":    true,
+	"table":      true,
+	"tbody":      true,
+	"td":         true,
+	"template":   true,
+	"textarea":   true,
+	"tfoot":      true,
+	"th":         true,
+	"thead":      true,
+	"title":      true,
+	"tr":         true,
+	"track":      true,
+	"ul":         true,
+	"wbr":        true,
+	"xmp":        true,
+}
+
+func isSpecialElement(element *Node) bool {
+	switch element.Namespace {
+	case "", "html":
+		return isSpecialElementMap[element.Data]
+	case "svg":
+		return element.Data == "foreignObject"
+	}
+	return false
+}
diff --git a/vendor/golang.org/x/net/html/doc.go b/vendor/golang.org/x/net/html/doc.go
new file mode 100644
index 0000000000..94f496874a
--- /dev/null
+++ b/vendor/golang.org/x/net/html/doc.go
@@ -0,0 +1,106 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+Package html implements an HTML5-compliant tokenizer and parser.
+
+Tokenization is done by creating a Tokenizer for an io.Reader r. It is the
+caller's responsibility to ensure that r provides UTF-8 encoded HTML.
+
+	z := html.NewTokenizer(r)
+
+Given a Tokenizer z, the HTML is tokenized by repeatedly calling z.Next(),
+which parses the next token and returns its type, or an error:
+
+	for {
+		tt := z.Next()
+		if tt == html.ErrorToken {
+			// ...
+			return ...
+		}
+		// Process the current token.
+	}
+
+There are two APIs for retrieving the current token. The high-level API is to
+call Token; the low-level API is to call Text or TagName / TagAttr. Both APIs
+allow optionally calling Raw after Next but before Token, Text, TagName, or
+TagAttr. In EBNF notation, the valid call sequence per token is:
+
+	Next {Raw} [ Token | Text | TagName {TagAttr} ]
+
+Token returns an independent data structure that completely describes a token.
+Entities (such as "&lt;") are unescaped, tag names and attribute keys are
+lower-cased, and attributes are collected into a []Attribute. For example:
+
+	for {
+		if z.Next() == html.ErrorToken {
+			// Returning io.EOF indicates success.
+			return z.Err()
+		}
+		emitToken(z.Token())
+	}
+
+The low-level API performs fewer allocations and copies, but the contents of
+the []byte values returned by Text, TagName and TagAttr may change on the next
+call to Next. For example, to extract an HTML page's anchor text:
+
+	depth := 0
+	for {
+		tt := z.Next()
+		switch tt {
+		case ErrorToken:
+			return z.Err()
+		case TextToken:
+			if depth > 0 {
+				// emitBytes should copy the []byte it receives,
+				// if it doesn't process it immediately.
+				emitBytes(z.Text())
+			}
+		case StartTagToken, EndTagToken:
+			tn, _ := z.TagName()
+			if len(tn) == 1 && tn[0] == 'a' {
+				if tt == StartTagToken {
+					depth++
+				} else {
+					depth--
+				}
+			}
+		}
+	}
+
+Parsing is done by calling Parse with an io.Reader, which returns the root of
+the parse tree (the document element) as a *Node. It is the caller's
+responsibility to ensure that the Reader provides UTF-8 encoded HTML. For
+example, to process each anchor node in depth-first order:
+
+	doc, err := html.Parse(r)
+	if err != nil {
+		// ...
+	}
+	var f func(*html.Node)
+	f = func(n *html.Node) {
+		if n.Type == html.ElementNode && n.Data == "a" {
+			// Do something with n...
+		}
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			f(c)
+		}
+	}
+	f(doc)
+
+The relevant specifications include:
+https://html.spec.whatwg.org/multipage/syntax.html and
+https://html.spec.whatwg.org/multipage/syntax.html#tokenization
+*/
+package html // import "golang.org/x/net/html"
+
+// The tokenization algorithm implemented by this package is not a line-by-line
+// transliteration of the relatively verbose state-machine in the WHATWG
+// specification. A more direct approach is used instead, where the program
+// counter implies the state, such as whether it is tokenizing a tag or a text
+// node. Specification compliance is verified by checking expected and actual
+// outputs over a test suite rather than aiming for algorithmic fidelity.
+
+// TODO(nigeltao): Does a DOM API belong in this package or a separate one?
+// TODO(nigeltao): How does parsing interact with a JavaScript engine?
diff --git a/vendor/golang.org/x/net/html/doctype.go b/vendor/golang.org/x/net/html/doctype.go
new file mode 100644
index 0000000000..c484e5a94f
--- /dev/null
+++ b/vendor/golang.org/x/net/html/doctype.go
@@ -0,0 +1,156 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"strings"
+)
+
+// parseDoctype parses the data from a DoctypeToken into a name,
+// public identifier, and system identifier. It returns a Node whose Type
+// is DoctypeNode, whose Data is the name, and which has attributes
+// named "system" and "public" for the two identifiers if they were present.
+// quirks is whether the document should be parsed in "quirks mode".
+func parseDoctype(s string) (n *Node, quirks bool) {
+	n = &Node{Type: DoctypeNode}
+
+	// Find the name.
+	space := strings.IndexAny(s, whitespace)
+	if space == -1 {
+		space = len(s)
+	}
+	n.Data = s[:space]
+	// The comparison to "html" is case-sensitive.
+	if n.Data != "html" {
+		quirks = true
+	}
+	n.Data = strings.ToLower(n.Data)
+	s = strings.TrimLeft(s[space:], whitespace)
+
+	if len(s) < 6 {
+		// It can't start with "PUBLIC" or "SYSTEM".
+		// Ignore the rest of the string.
+		return n, quirks || s != ""
+	}
+
+	key := strings.ToLower(s[:6])
+	s = s[6:]
+	for key == "public" || key == "system" {
+		s = strings.TrimLeft(s, whitespace)
+		if s == "" {
+			break
+		}
+		quote := s[0]
+		if quote != '"' && quote != '\'' {
+			break
+		}
+		s = s[1:]
+		q := strings.IndexRune(s, rune(quote))
+		var id string
+		if q == -1 {
+			id = s
+			s = ""
+		} else {
+			id = s[:q]
+			s = s[q+1:]
+		}
+		n.Attr = append(n.Attr, Attribute{Key: key, Val: id})
+		if key == "public" {
+			key = "system"
+		} else {
+			key = ""
+		}
+	}
+
+	if key != "" || s != "" {
+		quirks = true
+	} else if len(n.Attr) > 0 {
+		if n.Attr[0].Key == "public" {
+			public := strings.ToLower(n.Attr[0].Val)
+			switch public {
+			case "-//w3o//dtd w3 html strict 3.0//en//", "-/w3d/dtd html 4.0 transitional/en", "html":
+				quirks = true
+			default:
+				for _, q := range quirkyIDs {
+					if strings.HasPrefix(public, q) {
+						quirks = true
+						break
+					}
+				}
+			}
+			// The following two public IDs only cause quirks mode if there is no system ID.
+			if len(n.Attr) == 1 && (strings.HasPrefix(public, "-//w3c//dtd html 4.01 frameset//") ||
+				strings.HasPrefix(public, "-//w3c//dtd html 4.01 transitional//")) {
+				quirks = true
+			}
+		}
+		if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" &&
+			strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" {
+			quirks = true
+		}
+	}
+
+	return n, quirks
+}
+
+// quirkyIDs is a list of public doctype identifiers that cause a document
+// to be interpreted in quirks mode. The identifiers should be in lower case.
+var quirkyIDs = []string{
+	"+//silmaril//dtd html pro v0r11 19970101//",
+	"-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
+	"-//as//dtd html 3.0 aswedit + extensions//",
+	"-//ietf//dtd html 2.0 level 1//",
+	"-//ietf//dtd html 2.0 level 2//",
+	"-//ietf//dtd html 2.0 strict level 1//",
+	"-//ietf//dtd html 2.0 strict level 2//",
+	"-//ietf//dtd html 2.0 strict//",
+	"-//ietf//dtd html 2.0//",
+	"-//ietf//dtd html 2.1e//",
+	"-//ietf//dtd html 3.0//",
+	"-//ietf//dtd html 3.2 final//",
+	"-//ietf//dtd html 3.2//",
+	"-//ietf//dtd html 3//",
+	"-//ietf//dtd html level 0//",
+	"-//ietf//dtd html level 1//",
+	"-//ietf//dtd html level 2//",
+	"-//ietf//dtd html level 3//",
+	"-//ietf//dtd html strict level 0//",
+	"-//ietf//dtd html strict level 1//",
+	"-//ietf//dtd html strict level 2//",
+	"-//ietf//dtd html strict level 3//",
+	"-//ietf//dtd html strict//",
+	"-//ietf//dtd html//",
+	"-//metrius//dtd metrius presentational//",
+	"-//microsoft//dtd internet explorer 2.0 html strict//",
+	"-//microsoft//dtd internet explorer 2.0 html//",
+	"-//microsoft//dtd internet explorer 2.0 tables//",
+	"-//microsoft//dtd internet explorer 3.0 html strict//",
+	"-//microsoft//dtd internet explorer 3.0 html//",
+	"-//microsoft//dtd internet explorer 3.0 tables//",
+	"-//netscape comm. corp.//dtd html//",
+	"-//netscape comm. corp.//dtd strict html//",
+	"-//o'reilly and associates//dtd html 2.0//",
+	"-//o'reilly and associates//dtd html extended 1.0//",
+	"-//o'reilly and associates//dtd html extended relaxed 1.0//",
+	"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
+	"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
+	"-//spyglass//dtd html 2.0 extended//",
+	"-//sq//dtd html 2.0 hotmetal + extensions//",
+	"-//sun microsystems corp.//dtd hotjava html//",
+	"-//sun microsystems corp.//dtd hotjava strict html//",
+	"-//w3c//dtd html 3 1995-03-24//",
+	"-//w3c//dtd html 3.2 draft//",
+	"-//w3c//dtd html 3.2 final//",
+	"-//w3c//dtd html 3.2//",
+	"-//w3c//dtd html 3.2s draft//",
+	"-//w3c//dtd html 4.0 frameset//",
+	"-//w3c//dtd html 4.0 transitional//",
+	"-//w3c//dtd html experimental 19960712//",
+	"-//w3c//dtd html experimental 970421//",
+	"-//w3c//dtd w3 html//",
+	"-//w3o//dtd w3 html 3.0//",
+	"-//webtechs//dtd mozilla html 2.0//",
+	"-//webtechs//dtd mozilla html//",
+}
diff --git a/vendor/golang.org/x/net/html/entity.go b/vendor/golang.org/x/net/html/entity.go
new file mode 100644
index 0000000000..a50c04c60e
--- /dev/null
+++ b/vendor/golang.org/x/net/html/entity.go
@@ -0,0 +1,2253 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+// All entities that do not end with ';' are 6 or fewer bytes long.
+const longestEntityWithoutSemicolon = 6
+
+// entity is a map from HTML entity names to their values. The semicolon matters:
+// https://html.spec.whatwg.org/multipage/syntax.html#named-character-references
+// lists both "amp" and "amp;" as two separate entries.
+//
+// Note that the HTML5 list is larger than the HTML4 list at
+// http://www.w3.org/TR/html4/sgml/entities.html
+var entity = map[string]rune{
+	"AElig;":                           '\U000000C6',
+	"AMP;":                             '\U00000026',
+	"Aacute;":                          '\U000000C1',
+	"Abreve;":                          '\U00000102',
+	"Acirc;":                           '\U000000C2',
+	"Acy;":                             '\U00000410',
+	"Afr;":                             '\U0001D504',
+	"Agrave;":                          '\U000000C0',
+	"Alpha;":                           '\U00000391',
+	"Amacr;":                           '\U00000100',
+	"And;":                             '\U00002A53',
+	"Aogon;":                           '\U00000104',
+	"Aopf;":                            '\U0001D538',
+	"ApplyFunction;":                   '\U00002061',
+	"Aring;":                           '\U000000C5',
+	"Ascr;":                            '\U0001D49C',
+	"Assign;":                          '\U00002254',
+	"Atilde;":                          '\U000000C3',
+	"Auml;":                            '\U000000C4',
+	"Backslash;":                       '\U00002216',
+	"Barv;":                            '\U00002AE7',
+	"Barwed;":                          '\U00002306',
+	"Bcy;":                             '\U00000411',
+	"Because;":                         '\U00002235',
+	"Bernoullis;":                      '\U0000212C',
+	"Beta;":                            '\U00000392',
+	"Bfr;":                             '\U0001D505',
+	"Bopf;":                            '\U0001D539',
+	"Breve;":                           '\U000002D8',
+	"Bscr;":                            '\U0000212C',
+	"Bumpeq;":                          '\U0000224E',
+	"CHcy;":                            '\U00000427',
+	"COPY;":                            '\U000000A9',
+	"Cacute;":                          '\U00000106',
+	"Cap;":                             '\U000022D2',
+	"CapitalDifferentialD;":            '\U00002145',
+	"Cayleys;":                         '\U0000212D',
+	"Ccaron;":                          '\U0000010C',
+	"Ccedil;":                          '\U000000C7',
+	"Ccirc;":                           '\U00000108',
+	"Cconint;":                         '\U00002230',
+	"Cdot;":                            '\U0000010A',
+	"Cedilla;":                         '\U000000B8',
+	"CenterDot;":                       '\U000000B7',
+	"Cfr;":                             '\U0000212D',
+	"Chi;":                             '\U000003A7',
+	"CircleDot;":                       '\U00002299',
+	"CircleMinus;":                     '\U00002296',
+	"CirclePlus;":                      '\U00002295',
+	"CircleTimes;":                     '\U00002297',
+	"ClockwiseContourIntegral;":        '\U00002232',
+	"CloseCurlyDoubleQuote;":           '\U0000201D',
+	"CloseCurlyQuote;":                 '\U00002019',
+	"Colon;":                           '\U00002237',
+	"Colone;":                          '\U00002A74',
+	"Congruent;":                       '\U00002261',
+	"Conint;":                          '\U0000222F',
+	"ContourIntegral;":                 '\U0000222E',
+	"Copf;":                            '\U00002102',
+	"Coproduct;":                       '\U00002210',
+	"CounterClockwiseContourIntegral;": '\U00002233',
+	"Cross;":                    '\U00002A2F',
+	"Cscr;":                     '\U0001D49E',
+	"Cup;":                      '\U000022D3',
+	"CupCap;":                   '\U0000224D',
+	"DD;":                       '\U00002145',
+	"DDotrahd;":                 '\U00002911',
+	"DJcy;":                     '\U00000402',
+	"DScy;":                     '\U00000405',
+	"DZcy;":                     '\U0000040F',
+	"Dagger;":                   '\U00002021',
+	"Darr;":                     '\U000021A1',
+	"Dashv;":                    '\U00002AE4',
+	"Dcaron;":                   '\U0000010E',
+	"Dcy;":                      '\U00000414',
+	"Del;":                      '\U00002207',
+	"Delta;":                    '\U00000394',
+	"Dfr;":                      '\U0001D507',
+	"DiacriticalAcute;":         '\U000000B4',
+	"DiacriticalDot;":           '\U000002D9',
+	"DiacriticalDoubleAcute;":   '\U000002DD',
+	"DiacriticalGrave;":         '\U00000060',
+	"DiacriticalTilde;":         '\U000002DC',
+	"Diamond;":                  '\U000022C4',
+	"DifferentialD;":            '\U00002146',
+	"Dopf;":                     '\U0001D53B',
+	"Dot;":                      '\U000000A8',
+	"DotDot;":                   '\U000020DC',
+	"DotEqual;":                 '\U00002250',
+	"DoubleContourIntegral;":    '\U0000222F',
+	"DoubleDot;":                '\U000000A8',
+	"DoubleDownArrow;":          '\U000021D3',
+	"DoubleLeftArrow;":          '\U000021D0',
+	"DoubleLeftRightArrow;":     '\U000021D4',
+	"DoubleLeftTee;":            '\U00002AE4',
+	"DoubleLongLeftArrow;":      '\U000027F8',
+	"DoubleLongLeftRightArrow;": '\U000027FA',
+	"DoubleLongRightArrow;":     '\U000027F9',
+	"DoubleRightArrow;":         '\U000021D2',
+	"DoubleRightTee;":           '\U000022A8',
+	"DoubleUpArrow;":            '\U000021D1',
+	"DoubleUpDownArrow;":        '\U000021D5',
+	"DoubleVerticalBar;":        '\U00002225',
+	"DownArrow;":                '\U00002193',
+	"DownArrowBar;":             '\U00002913',
+	"DownArrowUpArrow;":         '\U000021F5',
+	"DownBreve;":                '\U00000311',
+	"DownLeftRightVector;":      '\U00002950',
+	"DownLeftTeeVector;":        '\U0000295E',
+	"DownLeftVector;":           '\U000021BD',
+	"DownLeftVectorBar;":        '\U00002956',
+	"DownRightTeeVector;":       '\U0000295F',
+	"DownRightVector;":          '\U000021C1',
+	"DownRightVectorBar;":       '\U00002957',
+	"DownTee;":                  '\U000022A4',
+	"DownTeeArrow;":             '\U000021A7',
+	"Downarrow;":                '\U000021D3',
+	"Dscr;":                     '\U0001D49F',
+	"Dstrok;":                   '\U00000110',
+	"ENG;":                      '\U0000014A',
+	"ETH;":                      '\U000000D0',
+	"Eacute;":                   '\U000000C9',
+	"Ecaron;":                   '\U0000011A',
+	"Ecirc;":                    '\U000000CA',
+	"Ecy;":                      '\U0000042D',
+	"Edot;":                     '\U00000116',
+	"Efr;":                      '\U0001D508',
+	"Egrave;":                   '\U000000C8',
+	"Element;":                  '\U00002208',
+	"Emacr;":                    '\U00000112',
+	"EmptySmallSquare;":         '\U000025FB',
+	"EmptyVerySmallSquare;":     '\U000025AB',
+	"Eogon;":                    '\U00000118',
+	"Eopf;":                     '\U0001D53C',
+	"Epsilon;":                  '\U00000395',
+	"Equal;":                    '\U00002A75',
+	"EqualTilde;":               '\U00002242',
+	"Equilibrium;":              '\U000021CC',
+	"Escr;":                     '\U00002130',
+	"Esim;":                     '\U00002A73',
+	"Eta;":                      '\U00000397',
+	"Euml;":                     '\U000000CB',
+	"Exists;":                   '\U00002203',
+	"ExponentialE;":             '\U00002147',
+	"Fcy;":                      '\U00000424',
+	"Ffr;":                      '\U0001D509',
+	"FilledSmallSquare;":        '\U000025FC',
+	"FilledVerySmallSquare;":    '\U000025AA',
+	"Fopf;":                     '\U0001D53D',
+	"ForAll;":                   '\U00002200',
+	"Fouriertrf;":               '\U00002131',
+	"Fscr;":                     '\U00002131',
+	"GJcy;":                     '\U00000403',
+	"GT;":                       '\U0000003E',
+	"Gamma;":                    '\U00000393',
+	"Gammad;":                   '\U000003DC',
+	"Gbreve;":                   '\U0000011E',
+	"Gcedil;":                   '\U00000122',
+	"Gcirc;":                    '\U0000011C',
+	"Gcy;":                      '\U00000413',
+	"Gdot;":                     '\U00000120',
+	"Gfr;":                      '\U0001D50A',
+	"Gg;":                       '\U000022D9',
+	"Gopf;":                     '\U0001D53E',
+	"GreaterEqual;":             '\U00002265',
+	"GreaterEqualLess;":         '\U000022DB',
+	"GreaterFullEqual;":         '\U00002267',
+	"GreaterGreater;":           '\U00002AA2',
+	"GreaterLess;":              '\U00002277',
+	"GreaterSlantEqual;":        '\U00002A7E',
+	"GreaterTilde;":             '\U00002273',
+	"Gscr;":                     '\U0001D4A2',
+	"Gt;":                       '\U0000226B',
+	"HARDcy;":                   '\U0000042A',
+	"Hacek;":                    '\U000002C7',
+	"Hat;":                      '\U0000005E',
+	"Hcirc;":                    '\U00000124',
+	"Hfr;":                      '\U0000210C',
+	"HilbertSpace;":             '\U0000210B',
+	"Hopf;":                     '\U0000210D',
+	"HorizontalLine;":           '\U00002500',
+	"Hscr;":                     '\U0000210B',
+	"Hstrok;":                   '\U00000126',
+	"HumpDownHump;":             '\U0000224E',
+	"HumpEqual;":                '\U0000224F',
+	"IEcy;":                     '\U00000415',
+	"IJlig;":                    '\U00000132',
+	"IOcy;":                     '\U00000401',
+	"Iacute;":                   '\U000000CD',
+	"Icirc;":                    '\U000000CE',
+	"Icy;":                      '\U00000418',
+	"Idot;":                     '\U00000130',
+	"Ifr;":                      '\U00002111',
+	"Igrave;":                   '\U000000CC',
+	"Im;":                       '\U00002111',
+	"Imacr;":                    '\U0000012A',
+	"ImaginaryI;":               '\U00002148',
+	"Implies;":                  '\U000021D2',
+	"Int;":                      '\U0000222C',
+	"Integral;":                 '\U0000222B',
+	"Intersection;":             '\U000022C2',
+	"InvisibleComma;":           '\U00002063',
+	"InvisibleTimes;":           '\U00002062',
+	"Iogon;":                    '\U0000012E',
+	"Iopf;":                     '\U0001D540',
+	"Iota;":                     '\U00000399',
+	"Iscr;":                     '\U00002110',
+	"Itilde;":                   '\U00000128',
+	"Iukcy;":                    '\U00000406',
+	"Iuml;":                     '\U000000CF',
+	"Jcirc;":                    '\U00000134',
+	"Jcy;":                      '\U00000419',
+	"Jfr;":                      '\U0001D50D',
+	"Jopf;":                     '\U0001D541',
+	"Jscr;":                     '\U0001D4A5',
+	"Jsercy;":                   '\U00000408',
+	"Jukcy;":                    '\U00000404',
+	"KHcy;":                     '\U00000425',
+	"KJcy;":                     '\U0000040C',
+	"Kappa;":                    '\U0000039A',
+	"Kcedil;":                   '\U00000136',
+	"Kcy;":                      '\U0000041A',
+	"Kfr;":                      '\U0001D50E',
+	"Kopf;":                     '\U0001D542',
+	"Kscr;":                     '\U0001D4A6',
+	"LJcy;":                     '\U00000409',
+	"LT;":                       '\U0000003C',
+	"Lacute;":                   '\U00000139',
+	"Lambda;":                   '\U0000039B',
+	"Lang;":                     '\U000027EA',
+	"Laplacetrf;":               '\U00002112',
+	"Larr;":                     '\U0000219E',
+	"Lcaron;":                   '\U0000013D',
+	"Lcedil;":                   '\U0000013B',
+	"Lcy;":                      '\U0000041B',
+	"LeftAngleBracket;":         '\U000027E8',
+	"LeftArrow;":                '\U00002190',
+	"LeftArrowBar;":             '\U000021E4',
+	"LeftArrowRightArrow;":      '\U000021C6',
+	"LeftCeiling;":              '\U00002308',
+	"LeftDoubleBracket;":        '\U000027E6',
+	"LeftDownTeeVector;":        '\U00002961',
+	"LeftDownVector;":           '\U000021C3',
+	"LeftDownVectorBar;":        '\U00002959',
+	"LeftFloor;":                '\U0000230A',
+	"LeftRightArrow;":           '\U00002194',
+	"LeftRightVector;":          '\U0000294E',
+	"LeftTee;":                  '\U000022A3',
+	"LeftTeeArrow;":             '\U000021A4',
+	"LeftTeeVector;":            '\U0000295A',
+	"LeftTriangle;":             '\U000022B2',
+	"LeftTriangleBar;":          '\U000029CF',
+	"LeftTriangleEqual;":        '\U000022B4',
+	"LeftUpDownVector;":         '\U00002951',
+	"LeftUpTeeVector;":          '\U00002960',
+	"LeftUpVector;":             '\U000021BF',
+	"LeftUpVectorBar;":          '\U00002958',
+	"LeftVector;":               '\U000021BC',
+	"LeftVectorBar;":            '\U00002952',
+	"Leftarrow;":                '\U000021D0',
+	"Leftrightarrow;":           '\U000021D4',
+	"LessEqualGreater;":         '\U000022DA',
+	"LessFullEqual;":            '\U00002266',
+	"LessGreater;":              '\U00002276',
+	"LessLess;":                 '\U00002AA1',
+	"LessSlantEqual;":           '\U00002A7D',
+	"LessTilde;":                '\U00002272',
+	"Lfr;":                      '\U0001D50F',
+	"Ll;":                       '\U000022D8',
+	"Lleftarrow;":               '\U000021DA',
+	"Lmidot;":                   '\U0000013F',
+	"LongLeftArrow;":            '\U000027F5',
+	"LongLeftRightArrow;":       '\U000027F7',
+	"LongRightArrow;":           '\U000027F6',
+	"Longleftarrow;":            '\U000027F8',
+	"Longleftrightarrow;":       '\U000027FA',
+	"Longrightarrow;":           '\U000027F9',
+	"Lopf;":                     '\U0001D543',
+	"LowerLeftArrow;":           '\U00002199',
+	"LowerRightArrow;":          '\U00002198',
+	"Lscr;":                     '\U00002112',
+	"Lsh;":                      '\U000021B0',
+	"Lstrok;":                   '\U00000141',
+	"Lt;":                       '\U0000226A',
+	"Map;":                      '\U00002905',
+	"Mcy;":                      '\U0000041C',
+	"MediumSpace;":              '\U0000205F',
+	"Mellintrf;":                '\U00002133',
+	"Mfr;":                      '\U0001D510',
+	"MinusPlus;":                '\U00002213',
+	"Mopf;":                     '\U0001D544',
+	"Mscr;":                     '\U00002133',
+	"Mu;":                       '\U0000039C',
+	"NJcy;":                     '\U0000040A',
+	"Nacute;":                   '\U00000143',
+	"Ncaron;":                   '\U00000147',
+	"Ncedil;":                   '\U00000145',
+	"Ncy;":                      '\U0000041D',
+	"NegativeMediumSpace;":      '\U0000200B',
+	"NegativeThickSpace;":       '\U0000200B',
+	"NegativeThinSpace;":        '\U0000200B',
+	"NegativeVeryThinSpace;":    '\U0000200B',
+	"NestedGreaterGreater;":     '\U0000226B',
+	"NestedLessLess;":           '\U0000226A',
+	"NewLine;":                  '\U0000000A',
+	"Nfr;":                      '\U0001D511',
+	"NoBreak;":                  '\U00002060',
+	"NonBreakingSpace;":         '\U000000A0',
+	"Nopf;":                     '\U00002115',
+	"Not;":                      '\U00002AEC',
+	"NotCongruent;":             '\U00002262',
+	"NotCupCap;":                '\U0000226D',
+	"NotDoubleVerticalBar;":     '\U00002226',
+	"NotElement;":               '\U00002209',
+	"NotEqual;":                 '\U00002260',
+	"NotExists;":                '\U00002204',
+	"NotGreater;":               '\U0000226F',
+	"NotGreaterEqual;":          '\U00002271',
+	"NotGreaterLess;":           '\U00002279',
+	"NotGreaterTilde;":          '\U00002275',
+	"NotLeftTriangle;":          '\U000022EA',
+	"NotLeftTriangleEqual;":     '\U000022EC',
+	"NotLess;":                  '\U0000226E',
+	"NotLessEqual;":             '\U00002270',
+	"NotLessGreater;":           '\U00002278',
+	"NotLessTilde;":             '\U00002274',
+	"NotPrecedes;":              '\U00002280',
+	"NotPrecedesSlantEqual;":    '\U000022E0',
+	"NotReverseElement;":        '\U0000220C',
+	"NotRightTriangle;":         '\U000022EB',
+	"NotRightTriangleEqual;":    '\U000022ED',
+	"NotSquareSubsetEqual;":     '\U000022E2',
+	"NotSquareSupersetEqual;":   '\U000022E3',
+	"NotSubsetEqual;":           '\U00002288',
+	"NotSucceeds;":              '\U00002281',
+	"NotSucceedsSlantEqual;":    '\U000022E1',
+	"NotSupersetEqual;":         '\U00002289',
+	"NotTilde;":                 '\U00002241',
+	"NotTildeEqual;":            '\U00002244',
+	"NotTildeFullEqual;":        '\U00002247',
+	"NotTildeTilde;":            '\U00002249',
+	"NotVerticalBar;":           '\U00002224',
+	"Nscr;":                     '\U0001D4A9',
+	"Ntilde;":                   '\U000000D1',
+	"Nu;":                       '\U0000039D',
+	"OElig;":                    '\U00000152',
+	"Oacute;":                   '\U000000D3',
+	"Ocirc;":                    '\U000000D4',
+	"Ocy;":                      '\U0000041E',
+	"Odblac;":                   '\U00000150',
+	"Ofr;":                      '\U0001D512',
+	"Ograve;":                   '\U000000D2',
+	"Omacr;":                    '\U0000014C',
+	"Omega;":                    '\U000003A9',
+	"Omicron;":                  '\U0000039F',
+	"Oopf;":                     '\U0001D546',
+	"OpenCurlyDoubleQuote;":     '\U0000201C',
+	"OpenCurlyQuote;":           '\U00002018',
+	"Or;":                       '\U00002A54',
+	"Oscr;":                     '\U0001D4AA',
+	"Oslash;":                   '\U000000D8',
+	"Otilde;":                   '\U000000D5',
+	"Otimes;":                   '\U00002A37',
+	"Ouml;":                     '\U000000D6',
+	"OverBar;":                  '\U0000203E',
+	"OverBrace;":                '\U000023DE',
+	"OverBracket;":              '\U000023B4',
+	"OverParenthesis;":          '\U000023DC',
+	"PartialD;":                 '\U00002202',
+	"Pcy;":                      '\U0000041F',
+	"Pfr;":                      '\U0001D513',
+	"Phi;":                      '\U000003A6',
+	"Pi;":                       '\U000003A0',
+	"PlusMinus;":                '\U000000B1',
+	"Poincareplane;":            '\U0000210C',
+	"Popf;":                     '\U00002119',
+	"Pr;":                       '\U00002ABB',
+	"Precedes;":                 '\U0000227A',
+	"PrecedesEqual;":            '\U00002AAF',
+	"PrecedesSlantEqual;":       '\U0000227C',
+	"PrecedesTilde;":            '\U0000227E',
+	"Prime;":                    '\U00002033',
+	"Product;":                  '\U0000220F',
+	"Proportion;":               '\U00002237',
+	"Proportional;":             '\U0000221D',
+	"Pscr;":                     '\U0001D4AB',
+	"Psi;":                      '\U000003A8',
+	"QUOT;":                     '\U00000022',
+	"Qfr;":                      '\U0001D514',
+	"Qopf;":                     '\U0000211A',
+	"Qscr;":                     '\U0001D4AC',
+	"RBarr;":                    '\U00002910',
+	"REG;":                      '\U000000AE',
+	"Racute;":                   '\U00000154',
+	"Rang;":                     '\U000027EB',
+	"Rarr;":                     '\U000021A0',
+	"Rarrtl;":                   '\U00002916',
+	"Rcaron;":                   '\U00000158',
+	"Rcedil;":                   '\U00000156',
+	"Rcy;":                      '\U00000420',
+	"Re;":                       '\U0000211C',
+	"ReverseElement;":           '\U0000220B',
+	"ReverseEquilibrium;":       '\U000021CB',
+	"ReverseUpEquilibrium;":     '\U0000296F',
+	"Rfr;":                      '\U0000211C',
+	"Rho;":                      '\U000003A1',
+	"RightAngleBracket;":        '\U000027E9',
+	"RightArrow;":               '\U00002192',
+	"RightArrowBar;":            '\U000021E5',
+	"RightArrowLeftArrow;":      '\U000021C4',
+	"RightCeiling;":             '\U00002309',
+	"RightDoubleBracket;":       '\U000027E7',
+	"RightDownTeeVector;":       '\U0000295D',
+	"RightDownVector;":          '\U000021C2',
+	"RightDownVectorBar;":       '\U00002955',
+	"RightFloor;":               '\U0000230B',
+	"RightTee;":                 '\U000022A2',
+	"RightTeeArrow;":            '\U000021A6',
+	"RightTeeVector;":           '\U0000295B',
+	"RightTriangle;":            '\U000022B3',
+	"RightTriangleBar;":         '\U000029D0',
+	"RightTriangleEqual;":       '\U000022B5',
+	"RightUpDownVector;":        '\U0000294F',
+	"RightUpTeeVector;":         '\U0000295C',
+	"RightUpVector;":            '\U000021BE',
+	"RightUpVectorBar;":         '\U00002954',
+	"RightVector;":              '\U000021C0',
+	"RightVectorBar;":           '\U00002953',
+	"Rightarrow;":               '\U000021D2',
+	"Ropf;":                     '\U0000211D',
+	"RoundImplies;":             '\U00002970',
+	"Rrightarrow;":              '\U000021DB',
+	"Rscr;":                     '\U0000211B',
+	"Rsh;":                      '\U000021B1',
+	"RuleDelayed;":              '\U000029F4',
+	"SHCHcy;":                   '\U00000429',
+	"SHcy;":                     '\U00000428',
+	"SOFTcy;":                   '\U0000042C',
+	"Sacute;":                   '\U0000015A',
+	"Sc;":                       '\U00002ABC',
+	"Scaron;":                   '\U00000160',
+	"Scedil;":                   '\U0000015E',
+	"Scirc;":                    '\U0000015C',
+	"Scy;":                      '\U00000421',
+	"Sfr;":                      '\U0001D516',
+	"ShortDownArrow;":           '\U00002193',
+	"ShortLeftArrow;":           '\U00002190',
+	"ShortRightArrow;":          '\U00002192',
+	"ShortUpArrow;":             '\U00002191',
+	"Sigma;":                    '\U000003A3',
+	"SmallCircle;":              '\U00002218',
+	"Sopf;":                     '\U0001D54A',
+	"Sqrt;":                     '\U0000221A',
+	"Square;":                   '\U000025A1',
+	"SquareIntersection;":       '\U00002293',
+	"SquareSubset;":             '\U0000228F',
+	"SquareSubsetEqual;":        '\U00002291',
+	"SquareSuperset;":           '\U00002290',
+	"SquareSupersetEqual;":      '\U00002292',
+	"SquareUnion;":              '\U00002294',
+	"Sscr;":                     '\U0001D4AE',
+	"Star;":                     '\U000022C6',
+	"Sub;":                      '\U000022D0',
+	"Subset;":                   '\U000022D0',
+	"SubsetEqual;":              '\U00002286',
+	"Succeeds;":                 '\U0000227B',
+	"SucceedsEqual;":            '\U00002AB0',
+	"SucceedsSlantEqual;":       '\U0000227D',
+	"SucceedsTilde;":            '\U0000227F',
+	"SuchThat;":                 '\U0000220B',
+	"Sum;":                      '\U00002211',
+	"Sup;":                      '\U000022D1',
+	"Superset;":                 '\U00002283',
+	"SupersetEqual;":            '\U00002287',
+	"Supset;":                   '\U000022D1',
+	"THORN;":                    '\U000000DE',
+	"TRADE;":                    '\U00002122',
+	"TSHcy;":                    '\U0000040B',
+	"TScy;":                     '\U00000426',
+	"Tab;":                      '\U00000009',
+	"Tau;":                      '\U000003A4',
+	"Tcaron;":                   '\U00000164',
+	"Tcedil;":                   '\U00000162',
+	"Tcy;":                      '\U00000422',
+	"Tfr;":                      '\U0001D517',
+	"Therefore;":                '\U00002234',
+	"Theta;":                    '\U00000398',
+	"ThinSpace;":                '\U00002009',
+	"Tilde;":                    '\U0000223C',
+	"TildeEqual;":               '\U00002243',
+	"TildeFullEqual;":           '\U00002245',
+	"TildeTilde;":               '\U00002248',
+	"Topf;":                     '\U0001D54B',
+	"TripleDot;":                '\U000020DB',
+	"Tscr;":                     '\U0001D4AF',
+	"Tstrok;":                   '\U00000166',
+	"Uacute;":                   '\U000000DA',
+	"Uarr;":                     '\U0000219F',
+	"Uarrocir;":                 '\U00002949',
+	"Ubrcy;":                    '\U0000040E',
+	"Ubreve;":                   '\U0000016C',
+	"Ucirc;":                    '\U000000DB',
+	"Ucy;":                      '\U00000423',
+	"Udblac;":                   '\U00000170',
+	"Ufr;":                      '\U0001D518',
+	"Ugrave;":                   '\U000000D9',
+	"Umacr;":                    '\U0000016A',
+	"UnderBar;":                 '\U0000005F',
+	"UnderBrace;":               '\U000023DF',
+	"UnderBracket;":             '\U000023B5',
+	"UnderParenthesis;":         '\U000023DD',
+	"Union;":                    '\U000022C3',
+	"UnionPlus;":                '\U0000228E',
+	"Uogon;":                    '\U00000172',
+	"Uopf;":                     '\U0001D54C',
+	"UpArrow;":                  '\U00002191',
+	"UpArrowBar;":               '\U00002912',
+	"UpArrowDownArrow;":         '\U000021C5',
+	"UpDownArrow;":              '\U00002195',
+	"UpEquilibrium;":            '\U0000296E',
+	"UpTee;":                    '\U000022A5',
+	"UpTeeArrow;":               '\U000021A5',
+	"Uparrow;":                  '\U000021D1',
+	"Updownarrow;":              '\U000021D5',
+	"UpperLeftArrow;":           '\U00002196',
+	"UpperRightArrow;":          '\U00002197',
+	"Upsi;":                     '\U000003D2',
+	"Upsilon;":                  '\U000003A5',
+	"Uring;":                    '\U0000016E',
+	"Uscr;":                     '\U0001D4B0',
+	"Utilde;":                   '\U00000168',
+	"Uuml;":                     '\U000000DC',
+	"VDash;":                    '\U000022AB',
+	"Vbar;":                     '\U00002AEB',
+	"Vcy;":                      '\U00000412',
+	"Vdash;":                    '\U000022A9',
+	"Vdashl;":                   '\U00002AE6',
+	"Vee;":                      '\U000022C1',
+	"Verbar;":                   '\U00002016',
+	"Vert;":                     '\U00002016',
+	"VerticalBar;":              '\U00002223',
+	"VerticalLine;":             '\U0000007C',
+	"VerticalSeparator;":        '\U00002758',
+	"VerticalTilde;":            '\U00002240',
+	"VeryThinSpace;":            '\U0000200A',
+	"Vfr;":                      '\U0001D519',
+	"Vopf;":                     '\U0001D54D',
+	"Vscr;":                     '\U0001D4B1',
+	"Vvdash;":                   '\U000022AA',
+	"Wcirc;":                    '\U00000174',
+	"Wedge;":                    '\U000022C0',
+	"Wfr;":                      '\U0001D51A',
+	"Wopf;":                     '\U0001D54E',
+	"Wscr;":                     '\U0001D4B2',
+	"Xfr;":                      '\U0001D51B',
+	"Xi;":                       '\U0000039E',
+	"Xopf;":                     '\U0001D54F',
+	"Xscr;":                     '\U0001D4B3',
+	"YAcy;":                     '\U0000042F',
+	"YIcy;":                     '\U00000407',
+	"YUcy;":                     '\U0000042E',
+	"Yacute;":                   '\U000000DD',
+	"Ycirc;":                    '\U00000176',
+	"Ycy;":                      '\U0000042B',
+	"Yfr;":                      '\U0001D51C',
+	"Yopf;":                     '\U0001D550',
+	"Yscr;":                     '\U0001D4B4',
+	"Yuml;":                     '\U00000178',
+	"ZHcy;":                     '\U00000416',
+	"Zacute;":                   '\U00000179',
+	"Zcaron;":                   '\U0000017D',
+	"Zcy;":                      '\U00000417',
+	"Zdot;":                     '\U0000017B',
+	"ZeroWidthSpace;":           '\U0000200B',
+	"Zeta;":                     '\U00000396',
+	"Zfr;":                      '\U00002128',
+	"Zopf;":                     '\U00002124',
+	"Zscr;":                     '\U0001D4B5',
+	"aacute;":                   '\U000000E1',
+	"abreve;":                   '\U00000103',
+	"ac;":                       '\U0000223E',
+	"acd;":                      '\U0000223F',
+	"acirc;":                    '\U000000E2',
+	"acute;":                    '\U000000B4',
+	"acy;":                      '\U00000430',
+	"aelig;":                    '\U000000E6',
+	"af;":                       '\U00002061',
+	"afr;":                      '\U0001D51E',
+	"agrave;":                   '\U000000E0',
+	"alefsym;":                  '\U00002135',
+	"aleph;":                    '\U00002135',
+	"alpha;":                    '\U000003B1',
+	"amacr;":                    '\U00000101',
+	"amalg;":                    '\U00002A3F',
+	"amp;":                      '\U00000026',
+	"and;":                      '\U00002227',
+	"andand;":                   '\U00002A55',
+	"andd;":                     '\U00002A5C',
+	"andslope;":                 '\U00002A58',
+	"andv;":                     '\U00002A5A',
+	"ang;":                      '\U00002220',
+	"ange;":                     '\U000029A4',
+	"angle;":                    '\U00002220',
+	"angmsd;":                   '\U00002221',
+	"angmsdaa;":                 '\U000029A8',
+	"angmsdab;":                 '\U000029A9',
+	"angmsdac;":                 '\U000029AA',
+	"angmsdad;":                 '\U000029AB',
+	"angmsdae;":                 '\U000029AC',
+	"angmsdaf;":                 '\U000029AD',
+	"angmsdag;":                 '\U000029AE',
+	"angmsdah;":                 '\U000029AF',
+	"angrt;":                    '\U0000221F',
+	"angrtvb;":                  '\U000022BE',
+	"angrtvbd;":                 '\U0000299D',
+	"angsph;":                   '\U00002222',
+	"angst;":                    '\U000000C5',
+	"angzarr;":                  '\U0000237C',
+	"aogon;":                    '\U00000105',
+	"aopf;":                     '\U0001D552',
+	"ap;":                       '\U00002248',
+	"apE;":                      '\U00002A70',
+	"apacir;":                   '\U00002A6F',
+	"ape;":                      '\U0000224A',
+	"apid;":                     '\U0000224B',
+	"apos;":                     '\U00000027',
+	"approx;":                   '\U00002248',
+	"approxeq;":                 '\U0000224A',
+	"aring;":                    '\U000000E5',
+	"ascr;":                     '\U0001D4B6',
+	"ast;":                      '\U0000002A',
+	"asymp;":                    '\U00002248',
+	"asympeq;":                  '\U0000224D',
+	"atilde;":                   '\U000000E3',
+	"auml;":                     '\U000000E4',
+	"awconint;":                 '\U00002233',
+	"awint;":                    '\U00002A11',
+	"bNot;":                     '\U00002AED',
+	"backcong;":                 '\U0000224C',
+	"backepsilon;":              '\U000003F6',
+	"backprime;":                '\U00002035',
+	"backsim;":                  '\U0000223D',
+	"backsimeq;":                '\U000022CD',
+	"barvee;":                   '\U000022BD',
+	"barwed;":                   '\U00002305',
+	"barwedge;":                 '\U00002305',
+	"bbrk;":                     '\U000023B5',
+	"bbrktbrk;":                 '\U000023B6',
+	"bcong;":                    '\U0000224C',
+	"bcy;":                      '\U00000431',
+	"bdquo;":                    '\U0000201E',
+	"becaus;":                   '\U00002235',
+	"because;":                  '\U00002235',
+	"bemptyv;":                  '\U000029B0',
+	"bepsi;":                    '\U000003F6',
+	"bernou;":                   '\U0000212C',
+	"beta;":                     '\U000003B2',
+	"beth;":                     '\U00002136',
+	"between;":                  '\U0000226C',
+	"bfr;":                      '\U0001D51F',
+	"bigcap;":                   '\U000022C2',
+	"bigcirc;":                  '\U000025EF',
+	"bigcup;":                   '\U000022C3',
+	"bigodot;":                  '\U00002A00',
+	"bigoplus;":                 '\U00002A01',
+	"bigotimes;":                '\U00002A02',
+	"bigsqcup;":                 '\U00002A06',
+	"bigstar;":                  '\U00002605',
+	"bigtriangledown;":          '\U000025BD',
+	"bigtriangleup;":            '\U000025B3',
+	"biguplus;":                 '\U00002A04',
+	"bigvee;":                   '\U000022C1',
+	"bigwedge;":                 '\U000022C0',
+	"bkarow;":                   '\U0000290D',
+	"blacklozenge;":             '\U000029EB',
+	"blacksquare;":              '\U000025AA',
+	"blacktriangle;":            '\U000025B4',
+	"blacktriangledown;":        '\U000025BE',
+	"blacktriangleleft;":        '\U000025C2',
+	"blacktriangleright;":       '\U000025B8',
+	"blank;":                    '\U00002423',
+	"blk12;":                    '\U00002592',
+	"blk14;":                    '\U00002591',
+	"blk34;":                    '\U00002593',
+	"block;":                    '\U00002588',
+	"bnot;":                     '\U00002310',
+	"bopf;":                     '\U0001D553',
+	"bot;":                      '\U000022A5',
+	"bottom;":                   '\U000022A5',
+	"bowtie;":                   '\U000022C8',
+	"boxDL;":                    '\U00002557',
+	"boxDR;":                    '\U00002554',
+	"boxDl;":                    '\U00002556',
+	"boxDr;":                    '\U00002553',
+	"boxH;":                     '\U00002550',
+	"boxHD;":                    '\U00002566',
+	"boxHU;":                    '\U00002569',
+	"boxHd;":                    '\U00002564',
+	"boxHu;":                    '\U00002567',
+	"boxUL;":                    '\U0000255D',
+	"boxUR;":                    '\U0000255A',
+	"boxUl;":                    '\U0000255C',
+	"boxUr;":                    '\U00002559',
+	"boxV;":                     '\U00002551',
+	"boxVH;":                    '\U0000256C',
+	"boxVL;":                    '\U00002563',
+	"boxVR;":                    '\U00002560',
+	"boxVh;":                    '\U0000256B',
+	"boxVl;":                    '\U00002562',
+	"boxVr;":                    '\U0000255F',
+	"boxbox;":                   '\U000029C9',
+	"boxdL;":                    '\U00002555',
+	"boxdR;":                    '\U00002552',
+	"boxdl;":                    '\U00002510',
+	"boxdr;":                    '\U0000250C',
+	"boxh;":                     '\U00002500',
+	"boxhD;":                    '\U00002565',
+	"boxhU;":                    '\U00002568',
+	"boxhd;":                    '\U0000252C',
+	"boxhu;":                    '\U00002534',
+	"boxminus;":                 '\U0000229F',
+	"boxplus;":                  '\U0000229E',
+	"boxtimes;":                 '\U000022A0',
+	"boxuL;":                    '\U0000255B',
+	"boxuR;":                    '\U00002558',
+	"boxul;":                    '\U00002518',
+	"boxur;":                    '\U00002514',
+	"boxv;":                     '\U00002502',
+	"boxvH;":                    '\U0000256A',
+	"boxvL;":                    '\U00002561',
+	"boxvR;":                    '\U0000255E',
+	"boxvh;":                    '\U0000253C',
+	"boxvl;":                    '\U00002524',
+	"boxvr;":                    '\U0000251C',
+	"bprime;":                   '\U00002035',
+	"breve;":                    '\U000002D8',
+	"brvbar;":                   '\U000000A6',
+	"bscr;":                     '\U0001D4B7',
+	"bsemi;":                    '\U0000204F',
+	"bsim;":                     '\U0000223D',
+	"bsime;":                    '\U000022CD',
+	"bsol;":                     '\U0000005C',
+	"bsolb;":                    '\U000029C5',
+	"bsolhsub;":                 '\U000027C8',
+	"bull;":                     '\U00002022',
+	"bullet;":                   '\U00002022',
+	"bump;":                     '\U0000224E',
+	"bumpE;":                    '\U00002AAE',
+	"bumpe;":                    '\U0000224F',
+	"bumpeq;":                   '\U0000224F',
+	"cacute;":                   '\U00000107',
+	"cap;":                      '\U00002229',
+	"capand;":                   '\U00002A44',
+	"capbrcup;":                 '\U00002A49',
+	"capcap;":                   '\U00002A4B',
+	"capcup;":                   '\U00002A47',
+	"capdot;":                   '\U00002A40',
+	"caret;":                    '\U00002041',
+	"caron;":                    '\U000002C7',
+	"ccaps;":                    '\U00002A4D',
+	"ccaron;":                   '\U0000010D',
+	"ccedil;":                   '\U000000E7',
+	"ccirc;":                    '\U00000109',
+	"ccups;":                    '\U00002A4C',
+	"ccupssm;":                  '\U00002A50',
+	"cdot;":                     '\U0000010B',
+	"cedil;":                    '\U000000B8',
+	"cemptyv;":                  '\U000029B2',
+	"cent;":                     '\U000000A2',
+	"centerdot;":                '\U000000B7',
+	"cfr;":                      '\U0001D520',
+	"chcy;":                     '\U00000447',
+	"check;":                    '\U00002713',
+	"checkmark;":                '\U00002713',
+	"chi;":                      '\U000003C7',
+	"cir;":                      '\U000025CB',
+	"cirE;":                     '\U000029C3',
+	"circ;":                     '\U000002C6',
+	"circeq;":                   '\U00002257',
+	"circlearrowleft;":          '\U000021BA',
+	"circlearrowright;":         '\U000021BB',
+	"circledR;":                 '\U000000AE',
+	"circledS;":                 '\U000024C8',
+	"circledast;":               '\U0000229B',
+	"circledcirc;":              '\U0000229A',
+	"circleddash;":              '\U0000229D',
+	"cire;":                     '\U00002257',
+	"cirfnint;":                 '\U00002A10',
+	"cirmid;":                   '\U00002AEF',
+	"cirscir;":                  '\U000029C2',
+	"clubs;":                    '\U00002663',
+	"clubsuit;":                 '\U00002663',
+	"colon;":                    '\U0000003A',
+	"colone;":                   '\U00002254',
+	"coloneq;":                  '\U00002254',
+	"comma;":                    '\U0000002C',
+	"commat;":                   '\U00000040',
+	"comp;":                     '\U00002201',
+	"compfn;":                   '\U00002218',
+	"complement;":               '\U00002201',
+	"complexes;":                '\U00002102',
+	"cong;":                     '\U00002245',
+	"congdot;":                  '\U00002A6D',
+	"conint;":                   '\U0000222E',
+	"copf;":                     '\U0001D554',
+	"coprod;":                   '\U00002210',
+	"copy;":                     '\U000000A9',
+	"copysr;":                   '\U00002117',
+	"crarr;":                    '\U000021B5',
+	"cross;":                    '\U00002717',
+	"cscr;":                     '\U0001D4B8',
+	"csub;":                     '\U00002ACF',
+	"csube;":                    '\U00002AD1',
+	"csup;":                     '\U00002AD0',
+	"csupe;":                    '\U00002AD2',
+	"ctdot;":                    '\U000022EF',
+	"cudarrl;":                  '\U00002938',
+	"cudarrr;":                  '\U00002935',
+	"cuepr;":                    '\U000022DE',
+	"cuesc;":                    '\U000022DF',
+	"cularr;":                   '\U000021B6',
+	"cularrp;":                  '\U0000293D',
+	"cup;":                      '\U0000222A',
+	"cupbrcap;":                 '\U00002A48',
+	"cupcap;":                   '\U00002A46',
+	"cupcup;":                   '\U00002A4A',
+	"cupdot;":                   '\U0000228D',
+	"cupor;":                    '\U00002A45',
+	"curarr;":                   '\U000021B7',
+	"curarrm;":                  '\U0000293C',
+	"curlyeqprec;":              '\U000022DE',
+	"curlyeqsucc;":              '\U000022DF',
+	"curlyvee;":                 '\U000022CE',
+	"curlywedge;":               '\U000022CF',
+	"curren;":                   '\U000000A4',
+	"curvearrowleft;":           '\U000021B6',
+	"curvearrowright;":          '\U000021B7',
+	"cuvee;":                    '\U000022CE',
+	"cuwed;":                    '\U000022CF',
+	"cwconint;":                 '\U00002232',
+	"cwint;":                    '\U00002231',
+	"cylcty;":                   '\U0000232D',
+	"dArr;":                     '\U000021D3',
+	"dHar;":                     '\U00002965',
+	"dagger;":                   '\U00002020',
+	"daleth;":                   '\U00002138',
+	"darr;":                     '\U00002193',
+	"dash;":                     '\U00002010',
+	"dashv;":                    '\U000022A3',
+	"dbkarow;":                  '\U0000290F',
+	"dblac;":                    '\U000002DD',
+	"dcaron;":                   '\U0000010F',
+	"dcy;":                      '\U00000434',
+	"dd;":                       '\U00002146',
+	"ddagger;":                  '\U00002021',
+	"ddarr;":                    '\U000021CA',
+	"ddotseq;":                  '\U00002A77',
+	"deg;":                      '\U000000B0',
+	"delta;":                    '\U000003B4',
+	"demptyv;":                  '\U000029B1',
+	"dfisht;":                   '\U0000297F',
+	"dfr;":                      '\U0001D521',
+	"dharl;":                    '\U000021C3',
+	"dharr;":                    '\U000021C2',
+	"diam;":                     '\U000022C4',
+	"diamond;":                  '\U000022C4',
+	"diamondsuit;":              '\U00002666',
+	"diams;":                    '\U00002666',
+	"die;":                      '\U000000A8',
+	"digamma;":                  '\U000003DD',
+	"disin;":                    '\U000022F2',
+	"div;":                      '\U000000F7',
+	"divide;":                   '\U000000F7',
+	"divideontimes;":            '\U000022C7',
+	"divonx;":                   '\U000022C7',
+	"djcy;":                     '\U00000452',
+	"dlcorn;":                   '\U0000231E',
+	"dlcrop;":                   '\U0000230D',
+	"dollar;":                   '\U00000024',
+	"dopf;":                     '\U0001D555',
+	"dot;":                      '\U000002D9',
+	"doteq;":                    '\U00002250',
+	"doteqdot;":                 '\U00002251',
+	"dotminus;":                 '\U00002238',
+	"dotplus;":                  '\U00002214',
+	"dotsquare;":                '\U000022A1',
+	"doublebarwedge;":           '\U00002306',
+	"downarrow;":                '\U00002193',
+	"downdownarrows;":           '\U000021CA',
+	"downharpoonleft;":          '\U000021C3',
+	"downharpoonright;":         '\U000021C2',
+	"drbkarow;":                 '\U00002910',
+	"drcorn;":                   '\U0000231F',
+	"drcrop;":                   '\U0000230C',
+	"dscr;":                     '\U0001D4B9',
+	"dscy;":                     '\U00000455',
+	"dsol;":                     '\U000029F6',
+	"dstrok;":                   '\U00000111',
+	"dtdot;":                    '\U000022F1',
+	"dtri;":                     '\U000025BF',
+	"dtrif;":                    '\U000025BE',
+	"duarr;":                    '\U000021F5',
+	"duhar;":                    '\U0000296F',
+	"dwangle;":                  '\U000029A6',
+	"dzcy;":                     '\U0000045F',
+	"dzigrarr;":                 '\U000027FF',
+	"eDDot;":                    '\U00002A77',
+	"eDot;":                     '\U00002251',
+	"eacute;":                   '\U000000E9',
+	"easter;":                   '\U00002A6E',
+	"ecaron;":                   '\U0000011B',
+	"ecir;":                     '\U00002256',
+	"ecirc;":                    '\U000000EA',
+	"ecolon;":                   '\U00002255',
+	"ecy;":                      '\U0000044D',
+	"edot;":                     '\U00000117',
+	"ee;":                       '\U00002147',
+	"efDot;":                    '\U00002252',
+	"efr;":                      '\U0001D522',
+	"eg;":                       '\U00002A9A',
+	"egrave;":                   '\U000000E8',
+	"egs;":                      '\U00002A96',
+	"egsdot;":                   '\U00002A98',
+	"el;":                       '\U00002A99',
+	"elinters;":                 '\U000023E7',
+	"ell;":                      '\U00002113',
+	"els;":                      '\U00002A95',
+	"elsdot;":                   '\U00002A97',
+	"emacr;":                    '\U00000113',
+	"empty;":                    '\U00002205',
+	"emptyset;":                 '\U00002205',
+	"emptyv;":                   '\U00002205',
+	"emsp;":                     '\U00002003',
+	"emsp13;":                   '\U00002004',
+	"emsp14;":                   '\U00002005',
+	"eng;":                      '\U0000014B',
+	"ensp;":                     '\U00002002',
+	"eogon;":                    '\U00000119',
+	"eopf;":                     '\U0001D556',
+	"epar;":                     '\U000022D5',
+	"eparsl;":                   '\U000029E3',
+	"eplus;":                    '\U00002A71',
+	"epsi;":                     '\U000003B5',
+	"epsilon;":                  '\U000003B5',
+	"epsiv;":                    '\U000003F5',
+	"eqcirc;":                   '\U00002256',
+	"eqcolon;":                  '\U00002255',
+	"eqsim;":                    '\U00002242',
+	"eqslantgtr;":               '\U00002A96',
+	"eqslantless;":              '\U00002A95',
+	"equals;":                   '\U0000003D',
+	"equest;":                   '\U0000225F',
+	"equiv;":                    '\U00002261',
+	"equivDD;":                  '\U00002A78',
+	"eqvparsl;":                 '\U000029E5',
+	"erDot;":                    '\U00002253',
+	"erarr;":                    '\U00002971',
+	"escr;":                     '\U0000212F',
+	"esdot;":                    '\U00002250',
+	"esim;":                     '\U00002242',
+	"eta;":                      '\U000003B7',
+	"eth;":                      '\U000000F0',
+	"euml;":                     '\U000000EB',
+	"euro;":                     '\U000020AC',
+	"excl;":                     '\U00000021',
+	"exist;":                    '\U00002203',
+	"expectation;":              '\U00002130',
+	"exponentiale;":             '\U00002147',
+	"fallingdotseq;":            '\U00002252',
+	"fcy;":                      '\U00000444',
+	"female;":                   '\U00002640',
+	"ffilig;":                   '\U0000FB03',
+	"fflig;":                    '\U0000FB00',
+	"ffllig;":                   '\U0000FB04',
+	"ffr;":                      '\U0001D523',
+	"filig;":                    '\U0000FB01',
+	"flat;":                     '\U0000266D',
+	"fllig;":                    '\U0000FB02',
+	"fltns;":                    '\U000025B1',
+	"fnof;":                     '\U00000192',
+	"fopf;":                     '\U0001D557',
+	"forall;":                   '\U00002200',
+	"fork;":                     '\U000022D4',
+	"forkv;":                    '\U00002AD9',
+	"fpartint;":                 '\U00002A0D',
+	"frac12;":                   '\U000000BD',
+	"frac13;":                   '\U00002153',
+	"frac14;":                   '\U000000BC',
+	"frac15;":                   '\U00002155',
+	"frac16;":                   '\U00002159',
+	"frac18;":                   '\U0000215B',
+	"frac23;":                   '\U00002154',
+	"frac25;":                   '\U00002156',
+	"frac34;":                   '\U000000BE',
+	"frac35;":                   '\U00002157',
+	"frac38;":                   '\U0000215C',
+	"frac45;":                   '\U00002158',
+	"frac56;":                   '\U0000215A',
+	"frac58;":                   '\U0000215D',
+	"frac78;":                   '\U0000215E',
+	"frasl;":                    '\U00002044',
+	"frown;":                    '\U00002322',
+	"fscr;":                     '\U0001D4BB',
+	"gE;":                       '\U00002267',
+	"gEl;":                      '\U00002A8C',
+	"gacute;":                   '\U000001F5',
+	"gamma;":                    '\U000003B3',
+	"gammad;":                   '\U000003DD',
+	"gap;":                      '\U00002A86',
+	"gbreve;":                   '\U0000011F',
+	"gcirc;":                    '\U0000011D',
+	"gcy;":                      '\U00000433',
+	"gdot;":                     '\U00000121',
+	"ge;":                       '\U00002265',
+	"gel;":                      '\U000022DB',
+	"geq;":                      '\U00002265',
+	"geqq;":                     '\U00002267',
+	"geqslant;":                 '\U00002A7E',
+	"ges;":                      '\U00002A7E',
+	"gescc;":                    '\U00002AA9',
+	"gesdot;":                   '\U00002A80',
+	"gesdoto;":                  '\U00002A82',
+	"gesdotol;":                 '\U00002A84',
+	"gesles;":                   '\U00002A94',
+	"gfr;":                      '\U0001D524',
+	"gg;":                       '\U0000226B',
+	"ggg;":                      '\U000022D9',
+	"gimel;":                    '\U00002137',
+	"gjcy;":                     '\U00000453',
+	"gl;":                       '\U00002277',
+	"glE;":                      '\U00002A92',
+	"gla;":                      '\U00002AA5',
+	"glj;":                      '\U00002AA4',
+	"gnE;":                      '\U00002269',
+	"gnap;":                     '\U00002A8A',
+	"gnapprox;":                 '\U00002A8A',
+	"gne;":                      '\U00002A88',
+	"gneq;":                     '\U00002A88',
+	"gneqq;":                    '\U00002269',
+	"gnsim;":                    '\U000022E7',
+	"gopf;":                     '\U0001D558',
+	"grave;":                    '\U00000060',
+	"gscr;":                     '\U0000210A',
+	"gsim;":                     '\U00002273',
+	"gsime;":                    '\U00002A8E',
+	"gsiml;":                    '\U00002A90',
+	"gt;":                       '\U0000003E',
+	"gtcc;":                     '\U00002AA7',
+	"gtcir;":                    '\U00002A7A',
+	"gtdot;":                    '\U000022D7',
+	"gtlPar;":                   '\U00002995',
+	"gtquest;":                  '\U00002A7C',
+	"gtrapprox;":                '\U00002A86',
+	"gtrarr;":                   '\U00002978',
+	"gtrdot;":                   '\U000022D7',
+	"gtreqless;":                '\U000022DB',
+	"gtreqqless;":               '\U00002A8C',
+	"gtrless;":                  '\U00002277',
+	"gtrsim;":                   '\U00002273',
+	"hArr;":                     '\U000021D4',
+	"hairsp;":                   '\U0000200A',
+	"half;":                     '\U000000BD',
+	"hamilt;":                   '\U0000210B',
+	"hardcy;":                   '\U0000044A',
+	"harr;":                     '\U00002194',
+	"harrcir;":                  '\U00002948',
+	"harrw;":                    '\U000021AD',
+	"hbar;":                     '\U0000210F',
+	"hcirc;":                    '\U00000125',
+	"hearts;":                   '\U00002665',
+	"heartsuit;":                '\U00002665',
+	"hellip;":                   '\U00002026',
+	"hercon;":                   '\U000022B9',
+	"hfr;":                      '\U0001D525',
+	"hksearow;":                 '\U00002925',
+	"hkswarow;":                 '\U00002926',
+	"hoarr;":                    '\U000021FF',
+	"homtht;":                   '\U0000223B',
+	"hookleftarrow;":            '\U000021A9',
+	"hookrightarrow;":           '\U000021AA',
+	"hopf;":                     '\U0001D559',
+	"horbar;":                   '\U00002015',
+	"hscr;":                     '\U0001D4BD',
+	"hslash;":                   '\U0000210F',
+	"hstrok;":                   '\U00000127',
+	"hybull;":                   '\U00002043',
+	"hyphen;":                   '\U00002010',
+	"iacute;":                   '\U000000ED',
+	"ic;":                       '\U00002063',
+	"icirc;":                    '\U000000EE',
+	"icy;":                      '\U00000438',
+	"iecy;":                     '\U00000435',
+	"iexcl;":                    '\U000000A1',
+	"iff;":                      '\U000021D4',
+	"ifr;":                      '\U0001D526',
+	"igrave;":                   '\U000000EC',
+	"ii;":                       '\U00002148',
+	"iiiint;":                   '\U00002A0C',
+	"iiint;":                    '\U0000222D',
+	"iinfin;":                   '\U000029DC',
+	"iiota;":                    '\U00002129',
+	"ijlig;":                    '\U00000133',
+	"imacr;":                    '\U0000012B',
+	"image;":                    '\U00002111',
+	"imagline;":                 '\U00002110',
+	"imagpart;":                 '\U00002111',
+	"imath;":                    '\U00000131',
+	"imof;":                     '\U000022B7',
+	"imped;":                    '\U000001B5',
+	"in;":                       '\U00002208',
+	"incare;":                   '\U00002105',
+	"infin;":                    '\U0000221E',
+	"infintie;":                 '\U000029DD',
+	"inodot;":                   '\U00000131',
+	"int;":                      '\U0000222B',
+	"intcal;":                   '\U000022BA',
+	"integers;":                 '\U00002124',
+	"intercal;":                 '\U000022BA',
+	"intlarhk;":                 '\U00002A17',
+	"intprod;":                  '\U00002A3C',
+	"iocy;":                     '\U00000451',
+	"iogon;":                    '\U0000012F',
+	"iopf;":                     '\U0001D55A',
+	"iota;":                     '\U000003B9',
+	"iprod;":                    '\U00002A3C',
+	"iquest;":                   '\U000000BF',
+	"iscr;":                     '\U0001D4BE',
+	"isin;":                     '\U00002208',
+	"isinE;":                    '\U000022F9',
+	"isindot;":                  '\U000022F5',
+	"isins;":                    '\U000022F4',
+	"isinsv;":                   '\U000022F3',
+	"isinv;":                    '\U00002208',
+	"it;":                       '\U00002062',
+	"itilde;":                   '\U00000129',
+	"iukcy;":                    '\U00000456',
+	"iuml;":                     '\U000000EF',
+	"jcirc;":                    '\U00000135',
+	"jcy;":                      '\U00000439',
+	"jfr;":                      '\U0001D527',
+	"jmath;":                    '\U00000237',
+	"jopf;":                     '\U0001D55B',
+	"jscr;":                     '\U0001D4BF',
+	"jsercy;":                   '\U00000458',
+	"jukcy;":                    '\U00000454',
+	"kappa;":                    '\U000003BA',
+	"kappav;":                   '\U000003F0',
+	"kcedil;":                   '\U00000137',
+	"kcy;":                      '\U0000043A',
+	"kfr;":                      '\U0001D528',
+	"kgreen;":                   '\U00000138',
+	"khcy;":                     '\U00000445',
+	"kjcy;":                     '\U0000045C',
+	"kopf;":                     '\U0001D55C',
+	"kscr;":                     '\U0001D4C0',
+	"lAarr;":                    '\U000021DA',
+	"lArr;":                     '\U000021D0',
+	"lAtail;":                   '\U0000291B',
+	"lBarr;":                    '\U0000290E',
+	"lE;":                       '\U00002266',
+	"lEg;":                      '\U00002A8B',
+	"lHar;":                     '\U00002962',
+	"lacute;":                   '\U0000013A',
+	"laemptyv;":                 '\U000029B4',
+	"lagran;":                   '\U00002112',
+	"lambda;":                   '\U000003BB',
+	"lang;":                     '\U000027E8',
+	"langd;":                    '\U00002991',
+	"langle;":                   '\U000027E8',
+	"lap;":                      '\U00002A85',
+	"laquo;":                    '\U000000AB',
+	"larr;":                     '\U00002190',
+	"larrb;":                    '\U000021E4',
+	"larrbfs;":                  '\U0000291F',
+	"larrfs;":                   '\U0000291D',
+	"larrhk;":                   '\U000021A9',
+	"larrlp;":                   '\U000021AB',
+	"larrpl;":                   '\U00002939',
+	"larrsim;":                  '\U00002973',
+	"larrtl;":                   '\U000021A2',
+	"lat;":                      '\U00002AAB',
+	"latail;":                   '\U00002919',
+	"late;":                     '\U00002AAD',
+	"lbarr;":                    '\U0000290C',
+	"lbbrk;":                    '\U00002772',
+	"lbrace;":                   '\U0000007B',
+	"lbrack;":                   '\U0000005B',
+	"lbrke;":                    '\U0000298B',
+	"lbrksld;":                  '\U0000298F',
+	"lbrkslu;":                  '\U0000298D',
+	"lcaron;":                   '\U0000013E',
+	"lcedil;":                   '\U0000013C',
+	"lceil;":                    '\U00002308',
+	"lcub;":                     '\U0000007B',
+	"lcy;":                      '\U0000043B',
+	"ldca;":                     '\U00002936',
+	"ldquo;":                    '\U0000201C',
+	"ldquor;":                   '\U0000201E',
+	"ldrdhar;":                  '\U00002967',
+	"ldrushar;":                 '\U0000294B',
+	"ldsh;":                     '\U000021B2',
+	"le;":                       '\U00002264',
+	"leftarrow;":                '\U00002190',
+	"leftarrowtail;":            '\U000021A2',
+	"leftharpoondown;":          '\U000021BD',
+	"leftharpoonup;":            '\U000021BC',
+	"leftleftarrows;":           '\U000021C7',
+	"leftrightarrow;":           '\U00002194',
+	"leftrightarrows;":          '\U000021C6',
+	"leftrightharpoons;":        '\U000021CB',
+	"leftrightsquigarrow;":      '\U000021AD',
+	"leftthreetimes;":           '\U000022CB',
+	"leg;":                      '\U000022DA',
+	"leq;":                      '\U00002264',
+	"leqq;":                     '\U00002266',
+	"leqslant;":                 '\U00002A7D',
+	"les;":                      '\U00002A7D',
+	"lescc;":                    '\U00002AA8',
+	"lesdot;":                   '\U00002A7F',
+	"lesdoto;":                  '\U00002A81',
+	"lesdotor;":                 '\U00002A83',
+	"lesges;":                   '\U00002A93',
+	"lessapprox;":               '\U00002A85',
+	"lessdot;":                  '\U000022D6',
+	"lesseqgtr;":                '\U000022DA',
+	"lesseqqgtr;":               '\U00002A8B',
+	"lessgtr;":                  '\U00002276',
+	"lesssim;":                  '\U00002272',
+	"lfisht;":                   '\U0000297C',
+	"lfloor;":                   '\U0000230A',
+	"lfr;":                      '\U0001D529',
+	"lg;":                       '\U00002276',
+	"lgE;":                      '\U00002A91',
+	"lhard;":                    '\U000021BD',
+	"lharu;":                    '\U000021BC',
+	"lharul;":                   '\U0000296A',
+	"lhblk;":                    '\U00002584',
+	"ljcy;":                     '\U00000459',
+	"ll;":                       '\U0000226A',
+	"llarr;":                    '\U000021C7',
+	"llcorner;":                 '\U0000231E',
+	"llhard;":                   '\U0000296B',
+	"lltri;":                    '\U000025FA',
+	"lmidot;":                   '\U00000140',
+	"lmoust;":                   '\U000023B0',
+	"lmoustache;":               '\U000023B0',
+	"lnE;":                      '\U00002268',
+	"lnap;":                     '\U00002A89',
+	"lnapprox;":                 '\U00002A89',
+	"lne;":                      '\U00002A87',
+	"lneq;":                     '\U00002A87',
+	"lneqq;":                    '\U00002268',
+	"lnsim;":                    '\U000022E6',
+	"loang;":                    '\U000027EC',
+	"loarr;":                    '\U000021FD',
+	"lobrk;":                    '\U000027E6',
+	"longleftarrow;":            '\U000027F5',
+	"longleftrightarrow;":       '\U000027F7',
+	"longmapsto;":               '\U000027FC',
+	"longrightarrow;":           '\U000027F6',
+	"looparrowleft;":            '\U000021AB',
+	"looparrowright;":           '\U000021AC',
+	"lopar;":                    '\U00002985',
+	"lopf;":                     '\U0001D55D',
+	"loplus;":                   '\U00002A2D',
+	"lotimes;":                  '\U00002A34',
+	"lowast;":                   '\U00002217',
+	"lowbar;":                   '\U0000005F',
+	"loz;":                      '\U000025CA',
+	"lozenge;":                  '\U000025CA',
+	"lozf;":                     '\U000029EB',
+	"lpar;":                     '\U00000028',
+	"lparlt;":                   '\U00002993',
+	"lrarr;":                    '\U000021C6',
+	"lrcorner;":                 '\U0000231F',
+	"lrhar;":                    '\U000021CB',
+	"lrhard;":                   '\U0000296D',
+	"lrm;":                      '\U0000200E',
+	"lrtri;":                    '\U000022BF',
+	"lsaquo;":                   '\U00002039',
+	"lscr;":                     '\U0001D4C1',
+	"lsh;":                      '\U000021B0',
+	"lsim;":                     '\U00002272',
+	"lsime;":                    '\U00002A8D',
+	"lsimg;":                    '\U00002A8F',
+	"lsqb;":                     '\U0000005B',
+	"lsquo;":                    '\U00002018',
+	"lsquor;":                   '\U0000201A',
+	"lstrok;":                   '\U00000142',
+	"lt;":                       '\U0000003C',
+	"ltcc;":                     '\U00002AA6',
+	"ltcir;":                    '\U00002A79',
+	"ltdot;":                    '\U000022D6',
+	"lthree;":                   '\U000022CB',
+	"ltimes;":                   '\U000022C9',
+	"ltlarr;":                   '\U00002976',
+	"ltquest;":                  '\U00002A7B',
+	"ltrPar;":                   '\U00002996',
+	"ltri;":                     '\U000025C3',
+	"ltrie;":                    '\U000022B4',
+	"ltrif;":                    '\U000025C2',
+	"lurdshar;":                 '\U0000294A',
+	"luruhar;":                  '\U00002966',
+	"mDDot;":                    '\U0000223A',
+	"macr;":                     '\U000000AF',
+	"male;":                     '\U00002642',
+	"malt;":                     '\U00002720',
+	"maltese;":                  '\U00002720',
+	"map;":                      '\U000021A6',
+	"mapsto;":                   '\U000021A6',
+	"mapstodown;":               '\U000021A7',
+	"mapstoleft;":               '\U000021A4',
+	"mapstoup;":                 '\U000021A5',
+	"marker;":                   '\U000025AE',
+	"mcomma;":                   '\U00002A29',
+	"mcy;":                      '\U0000043C',
+	"mdash;":                    '\U00002014',
+	"measuredangle;":            '\U00002221',
+	"mfr;":                      '\U0001D52A',
+	"mho;":                      '\U00002127',
+	"micro;":                    '\U000000B5',
+	"mid;":                      '\U00002223',
+	"midast;":                   '\U0000002A',
+	"midcir;":                   '\U00002AF0',
+	"middot;":                   '\U000000B7',
+	"minus;":                    '\U00002212',
+	"minusb;":                   '\U0000229F',
+	"minusd;":                   '\U00002238',
+	"minusdu;":                  '\U00002A2A',
+	"mlcp;":                     '\U00002ADB',
+	"mldr;":                     '\U00002026',
+	"mnplus;":                   '\U00002213',
+	"models;":                   '\U000022A7',
+	"mopf;":                     '\U0001D55E',
+	"mp;":                       '\U00002213',
+	"mscr;":                     '\U0001D4C2',
+	"mstpos;":                   '\U0000223E',
+	"mu;":                       '\U000003BC',
+	"multimap;":                 '\U000022B8',
+	"mumap;":                    '\U000022B8',
+	"nLeftarrow;":               '\U000021CD',
+	"nLeftrightarrow;":          '\U000021CE',
+	"nRightarrow;":              '\U000021CF',
+	"nVDash;":                   '\U000022AF',
+	"nVdash;":                   '\U000022AE',
+	"nabla;":                    '\U00002207',
+	"nacute;":                   '\U00000144',
+	"nap;":                      '\U00002249',
+	"napos;":                    '\U00000149',
+	"napprox;":                  '\U00002249',
+	"natur;":                    '\U0000266E',
+	"natural;":                  '\U0000266E',
+	"naturals;":                 '\U00002115',
+	"nbsp;":                     '\U000000A0',
+	"ncap;":                     '\U00002A43',
+	"ncaron;":                   '\U00000148',
+	"ncedil;":                   '\U00000146',
+	"ncong;":                    '\U00002247',
+	"ncup;":                     '\U00002A42',
+	"ncy;":                      '\U0000043D',
+	"ndash;":                    '\U00002013',
+	"ne;":                       '\U00002260',
+	"neArr;":                    '\U000021D7',
+	"nearhk;":                   '\U00002924',
+	"nearr;":                    '\U00002197',
+	"nearrow;":                  '\U00002197',
+	"nequiv;":                   '\U00002262',
+	"nesear;":                   '\U00002928',
+	"nexist;":                   '\U00002204',
+	"nexists;":                  '\U00002204',
+	"nfr;":                      '\U0001D52B',
+	"nge;":                      '\U00002271',
+	"ngeq;":                     '\U00002271',
+	"ngsim;":                    '\U00002275',
+	"ngt;":                      '\U0000226F',
+	"ngtr;":                     '\U0000226F',
+	"nhArr;":                    '\U000021CE',
+	"nharr;":                    '\U000021AE',
+	"nhpar;":                    '\U00002AF2',
+	"ni;":                       '\U0000220B',
+	"nis;":                      '\U000022FC',
+	"nisd;":                     '\U000022FA',
+	"niv;":                      '\U0000220B',
+	"njcy;":                     '\U0000045A',
+	"nlArr;":                    '\U000021CD',
+	"nlarr;":                    '\U0000219A',
+	"nldr;":                     '\U00002025',
+	"nle;":                      '\U00002270',
+	"nleftarrow;":               '\U0000219A',
+	"nleftrightarrow;":          '\U000021AE',
+	"nleq;":                     '\U00002270',
+	"nless;":                    '\U0000226E',
+	"nlsim;":                    '\U00002274',
+	"nlt;":                      '\U0000226E',
+	"nltri;":                    '\U000022EA',
+	"nltrie;":                   '\U000022EC',
+	"nmid;":                     '\U00002224',
+	"nopf;":                     '\U0001D55F',
+	"not;":                      '\U000000AC',
+	"notin;":                    '\U00002209',
+	"notinva;":                  '\U00002209',
+	"notinvb;":                  '\U000022F7',
+	"notinvc;":                  '\U000022F6',
+	"notni;":                    '\U0000220C',
+	"notniva;":                  '\U0000220C',
+	"notnivb;":                  '\U000022FE',
+	"notnivc;":                  '\U000022FD',
+	"npar;":                     '\U00002226',
+	"nparallel;":                '\U00002226',
+	"npolint;":                  '\U00002A14',
+	"npr;":                      '\U00002280',
+	"nprcue;":                   '\U000022E0',
+	"nprec;":                    '\U00002280',
+	"nrArr;":                    '\U000021CF',
+	"nrarr;":                    '\U0000219B',
+	"nrightarrow;":              '\U0000219B',
+	"nrtri;":                    '\U000022EB',
+	"nrtrie;":                   '\U000022ED',
+	"nsc;":                      '\U00002281',
+	"nsccue;":                   '\U000022E1',
+	"nscr;":                     '\U0001D4C3',
+	"nshortmid;":                '\U00002224',
+	"nshortparallel;":           '\U00002226',
+	"nsim;":                     '\U00002241',
+	"nsime;":                    '\U00002244',
+	"nsimeq;":                   '\U00002244',
+	"nsmid;":                    '\U00002224',
+	"nspar;":                    '\U00002226',
+	"nsqsube;":                  '\U000022E2',
+	"nsqsupe;":                  '\U000022E3',
+	"nsub;":                     '\U00002284',
+	"nsube;":                    '\U00002288',
+	"nsubseteq;":                '\U00002288',
+	"nsucc;":                    '\U00002281',
+	"nsup;":                     '\U00002285',
+	"nsupe;":                    '\U00002289',
+	"nsupseteq;":                '\U00002289',
+	"ntgl;":                     '\U00002279',
+	"ntilde;":                   '\U000000F1',
+	"ntlg;":                     '\U00002278',
+	"ntriangleleft;":            '\U000022EA',
+	"ntrianglelefteq;":          '\U000022EC',
+	"ntriangleright;":           '\U000022EB',
+	"ntrianglerighteq;":         '\U000022ED',
+	"nu;":                       '\U000003BD',
+	"num;":                      '\U00000023',
+	"numero;":                   '\U00002116',
+	"numsp;":                    '\U00002007',
+	"nvDash;":                   '\U000022AD',
+	"nvHarr;":                   '\U00002904',
+	"nvdash;":                   '\U000022AC',
+	"nvinfin;":                  '\U000029DE',
+	"nvlArr;":                   '\U00002902',
+	"nvrArr;":                   '\U00002903',
+	"nwArr;":                    '\U000021D6',
+	"nwarhk;":                   '\U00002923',
+	"nwarr;":                    '\U00002196',
+	"nwarrow;":                  '\U00002196',
+	"nwnear;":                   '\U00002927',
+	"oS;":                       '\U000024C8',
+	"oacute;":                   '\U000000F3',
+	"oast;":                     '\U0000229B',
+	"ocir;":                     '\U0000229A',
+	"ocirc;":                    '\U000000F4',
+	"ocy;":                      '\U0000043E',
+	"odash;":                    '\U0000229D',
+	"odblac;":                   '\U00000151',
+	"odiv;":                     '\U00002A38',
+	"odot;":                     '\U00002299',
+	"odsold;":                   '\U000029BC',
+	"oelig;":                    '\U00000153',
+	"ofcir;":                    '\U000029BF',
+	"ofr;":                      '\U0001D52C',
+	"ogon;":                     '\U000002DB',
+	"ograve;":                   '\U000000F2',
+	"ogt;":                      '\U000029C1',
+	"ohbar;":                    '\U000029B5',
+	"ohm;":                      '\U000003A9',
+	"oint;":                     '\U0000222E',
+	"olarr;":                    '\U000021BA',
+	"olcir;":                    '\U000029BE',
+	"olcross;":                  '\U000029BB',
+	"oline;":                    '\U0000203E',
+	"olt;":                      '\U000029C0',
+	"omacr;":                    '\U0000014D',
+	"omega;":                    '\U000003C9',
+	"omicron;":                  '\U000003BF',
+	"omid;":                     '\U000029B6',
+	"ominus;":                   '\U00002296',
+	"oopf;":                     '\U0001D560',
+	"opar;":                     '\U000029B7',
+	"operp;":                    '\U000029B9',
+	"oplus;":                    '\U00002295',
+	"or;":                       '\U00002228',
+	"orarr;":                    '\U000021BB',
+	"ord;":                      '\U00002A5D',
+	"order;":                    '\U00002134',
+	"orderof;":                  '\U00002134',
+	"ordf;":                     '\U000000AA',
+	"ordm;":                     '\U000000BA',
+	"origof;":                   '\U000022B6',
+	"oror;":                     '\U00002A56',
+	"orslope;":                  '\U00002A57',
+	"orv;":                      '\U00002A5B',
+	"oscr;":                     '\U00002134',
+	"oslash;":                   '\U000000F8',
+	"osol;":                     '\U00002298',
+	"otilde;":                   '\U000000F5',
+	"otimes;":                   '\U00002297',
+	"otimesas;":                 '\U00002A36',
+	"ouml;":                     '\U000000F6',
+	"ovbar;":                    '\U0000233D',
+	"par;":                      '\U00002225',
+	"para;":                     '\U000000B6',
+	"parallel;":                 '\U00002225',
+	"parsim;":                   '\U00002AF3',
+	"parsl;":                    '\U00002AFD',
+	"part;":                     '\U00002202',
+	"pcy;":                      '\U0000043F',
+	"percnt;":                   '\U00000025',
+	"period;":                   '\U0000002E',
+	"permil;":                   '\U00002030',
+	"perp;":                     '\U000022A5',
+	"pertenk;":                  '\U00002031',
+	"pfr;":                      '\U0001D52D',
+	"phi;":                      '\U000003C6',
+	"phiv;":                     '\U000003D5',
+	"phmmat;":                   '\U00002133',
+	"phone;":                    '\U0000260E',
+	"pi;":                       '\U000003C0',
+	"pitchfork;":                '\U000022D4',
+	"piv;":                      '\U000003D6',
+	"planck;":                   '\U0000210F',
+	"planckh;":                  '\U0000210E',
+	"plankv;":                   '\U0000210F',
+	"plus;":                     '\U0000002B',
+	"plusacir;":                 '\U00002A23',
+	"plusb;":                    '\U0000229E',
+	"pluscir;":                  '\U00002A22',
+	"plusdo;":                   '\U00002214',
+	"plusdu;":                   '\U00002A25',
+	"pluse;":                    '\U00002A72',
+	"plusmn;":                   '\U000000B1',
+	"plussim;":                  '\U00002A26',
+	"plustwo;":                  '\U00002A27',
+	"pm;":                       '\U000000B1',
+	"pointint;":                 '\U00002A15',
+	"popf;":                     '\U0001D561',
+	"pound;":                    '\U000000A3',
+	"pr;":                       '\U0000227A',
+	"prE;":                      '\U00002AB3',
+	"prap;":                     '\U00002AB7',
+	"prcue;":                    '\U0000227C',
+	"pre;":                      '\U00002AAF',
+	"prec;":                     '\U0000227A',
+	"precapprox;":               '\U00002AB7',
+	"preccurlyeq;":              '\U0000227C',
+	"preceq;":                   '\U00002AAF',
+	"precnapprox;":              '\U00002AB9',
+	"precneqq;":                 '\U00002AB5',
+	"precnsim;":                 '\U000022E8',
+	"precsim;":                  '\U0000227E',
+	"prime;":                    '\U00002032',
+	"primes;":                   '\U00002119',
+	"prnE;":                     '\U00002AB5',
+	"prnap;":                    '\U00002AB9',
+	"prnsim;":                   '\U000022E8',
+	"prod;":                     '\U0000220F',
+	"profalar;":                 '\U0000232E',
+	"profline;":                 '\U00002312',
+	"profsurf;":                 '\U00002313',
+	"prop;":                     '\U0000221D',
+	"propto;":                   '\U0000221D',
+	"prsim;":                    '\U0000227E',
+	"prurel;":                   '\U000022B0',
+	"pscr;":                     '\U0001D4C5',
+	"psi;":                      '\U000003C8',
+	"puncsp;":                   '\U00002008',
+	"qfr;":                      '\U0001D52E',
+	"qint;":                     '\U00002A0C',
+	"qopf;":                     '\U0001D562',
+	"qprime;":                   '\U00002057',
+	"qscr;":                     '\U0001D4C6',
+	"quaternions;":              '\U0000210D',
+	"quatint;":                  '\U00002A16',
+	"quest;":                    '\U0000003F',
+	"questeq;":                  '\U0000225F',
+	"quot;":                     '\U00000022',
+	"rAarr;":                    '\U000021DB',
+	"rArr;":                     '\U000021D2',
+	"rAtail;":                   '\U0000291C',
+	"rBarr;":                    '\U0000290F',
+	"rHar;":                     '\U00002964',
+	"racute;":                   '\U00000155',
+	"radic;":                    '\U0000221A',
+	"raemptyv;":                 '\U000029B3',
+	"rang;":                     '\U000027E9',
+	"rangd;":                    '\U00002992',
+	"range;":                    '\U000029A5',
+	"rangle;":                   '\U000027E9',
+	"raquo;":                    '\U000000BB',
+	"rarr;":                     '\U00002192',
+	"rarrap;":                   '\U00002975',
+	"rarrb;":                    '\U000021E5',
+	"rarrbfs;":                  '\U00002920',
+	"rarrc;":                    '\U00002933',
+	"rarrfs;":                   '\U0000291E',
+	"rarrhk;":                   '\U000021AA',
+	"rarrlp;":                   '\U000021AC',
+	"rarrpl;":                   '\U00002945',
+	"rarrsim;":                  '\U00002974',
+	"rarrtl;":                   '\U000021A3',
+	"rarrw;":                    '\U0000219D',
+	"ratail;":                   '\U0000291A',
+	"ratio;":                    '\U00002236',
+	"rationals;":                '\U0000211A',
+	"rbarr;":                    '\U0000290D',
+	"rbbrk;":                    '\U00002773',
+	"rbrace;":                   '\U0000007D',
+	"rbrack;":                   '\U0000005D',
+	"rbrke;":                    '\U0000298C',
+	"rbrksld;":                  '\U0000298E',
+	"rbrkslu;":                  '\U00002990',
+	"rcaron;":                   '\U00000159',
+	"rcedil;":                   '\U00000157',
+	"rceil;":                    '\U00002309',
+	"rcub;":                     '\U0000007D',
+	"rcy;":                      '\U00000440',
+	"rdca;":                     '\U00002937',
+	"rdldhar;":                  '\U00002969',
+	"rdquo;":                    '\U0000201D',
+	"rdquor;":                   '\U0000201D',
+	"rdsh;":                     '\U000021B3',
+	"real;":                     '\U0000211C',
+	"realine;":                  '\U0000211B',
+	"realpart;":                 '\U0000211C',
+	"reals;":                    '\U0000211D',
+	"rect;":                     '\U000025AD',
+	"reg;":                      '\U000000AE',
+	"rfisht;":                   '\U0000297D',
+	"rfloor;":                   '\U0000230B',
+	"rfr;":                      '\U0001D52F',
+	"rhard;":                    '\U000021C1',
+	"rharu;":                    '\U000021C0',
+	"rharul;":                   '\U0000296C',
+	"rho;":                      '\U000003C1',
+	"rhov;":                     '\U000003F1',
+	"rightarrow;":               '\U00002192',
+	"rightarrowtail;":           '\U000021A3',
+	"rightharpoondown;":         '\U000021C1',
+	"rightharpoonup;":           '\U000021C0',
+	"rightleftarrows;":          '\U000021C4',
+	"rightleftharpoons;":        '\U000021CC',
+	"rightrightarrows;":         '\U000021C9',
+	"rightsquigarrow;":          '\U0000219D',
+	"rightthreetimes;":          '\U000022CC',
+	"ring;":                     '\U000002DA',
+	"risingdotseq;":             '\U00002253',
+	"rlarr;":                    '\U000021C4',
+	"rlhar;":                    '\U000021CC',
+	"rlm;":                      '\U0000200F',
+	"rmoust;":                   '\U000023B1',
+	"rmoustache;":               '\U000023B1',
+	"rnmid;":                    '\U00002AEE',
+	"roang;":                    '\U000027ED',
+	"roarr;":                    '\U000021FE',
+	"robrk;":                    '\U000027E7',
+	"ropar;":                    '\U00002986',
+	"ropf;":                     '\U0001D563',
+	"roplus;":                   '\U00002A2E',
+	"rotimes;":                  '\U00002A35',
+	"rpar;":                     '\U00000029',
+	"rpargt;":                   '\U00002994',
+	"rppolint;":                 '\U00002A12',
+	"rrarr;":                    '\U000021C9',
+	"rsaquo;":                   '\U0000203A',
+	"rscr;":                     '\U0001D4C7',
+	"rsh;":                      '\U000021B1',
+	"rsqb;":                     '\U0000005D',
+	"rsquo;":                    '\U00002019',
+	"rsquor;":                   '\U00002019',
+	"rthree;":                   '\U000022CC',
+	"rtimes;":                   '\U000022CA',
+	"rtri;":                     '\U000025B9',
+	"rtrie;":                    '\U000022B5',
+	"rtrif;":                    '\U000025B8',
+	"rtriltri;":                 '\U000029CE',
+	"ruluhar;":                  '\U00002968',
+	"rx;":                       '\U0000211E',
+	"sacute;":                   '\U0000015B',
+	"sbquo;":                    '\U0000201A',
+	"sc;":                       '\U0000227B',
+	"scE;":                      '\U00002AB4',
+	"scap;":                     '\U00002AB8',
+	"scaron;":                   '\U00000161',
+	"sccue;":                    '\U0000227D',
+	"sce;":                      '\U00002AB0',
+	"scedil;":                   '\U0000015F',
+	"scirc;":                    '\U0000015D',
+	"scnE;":                     '\U00002AB6',
+	"scnap;":                    '\U00002ABA',
+	"scnsim;":                   '\U000022E9',
+	"scpolint;":                 '\U00002A13',
+	"scsim;":                    '\U0000227F',
+	"scy;":                      '\U00000441',
+	"sdot;":                     '\U000022C5',
+	"sdotb;":                    '\U000022A1',
+	"sdote;":                    '\U00002A66',
+	"seArr;":                    '\U000021D8',
+	"searhk;":                   '\U00002925',
+	"searr;":                    '\U00002198',
+	"searrow;":                  '\U00002198',
+	"sect;":                     '\U000000A7',
+	"semi;":                     '\U0000003B',
+	"seswar;":                   '\U00002929',
+	"setminus;":                 '\U00002216',
+	"setmn;":                    '\U00002216',
+	"sext;":                     '\U00002736',
+	"sfr;":                      '\U0001D530',
+	"sfrown;":                   '\U00002322',
+	"sharp;":                    '\U0000266F',
+	"shchcy;":                   '\U00000449',
+	"shcy;":                     '\U00000448',
+	"shortmid;":                 '\U00002223',
+	"shortparallel;":            '\U00002225',
+	"shy;":                      '\U000000AD',
+	"sigma;":                    '\U000003C3',
+	"sigmaf;":                   '\U000003C2',
+	"sigmav;":                   '\U000003C2',
+	"sim;":                      '\U0000223C',
+	"simdot;":                   '\U00002A6A',
+	"sime;":                     '\U00002243',
+	"simeq;":                    '\U00002243',
+	"simg;":                     '\U00002A9E',
+	"simgE;":                    '\U00002AA0',
+	"siml;":                     '\U00002A9D',
+	"simlE;":                    '\U00002A9F',
+	"simne;":                    '\U00002246',
+	"simplus;":                  '\U00002A24',
+	"simrarr;":                  '\U00002972',
+	"slarr;":                    '\U00002190',
+	"smallsetminus;":            '\U00002216',
+	"smashp;":                   '\U00002A33',
+	"smeparsl;":                 '\U000029E4',
+	"smid;":                     '\U00002223',
+	"smile;":                    '\U00002323',
+	"smt;":                      '\U00002AAA',
+	"smte;":                     '\U00002AAC',
+	"softcy;":                   '\U0000044C',
+	"sol;":                      '\U0000002F',
+	"solb;":                     '\U000029C4',
+	"solbar;":                   '\U0000233F',
+	"sopf;":                     '\U0001D564',
+	"spades;":                   '\U00002660',
+	"spadesuit;":                '\U00002660',
+	"spar;":                     '\U00002225',
+	"sqcap;":                    '\U00002293',
+	"sqcup;":                    '\U00002294',
+	"sqsub;":                    '\U0000228F',
+	"sqsube;":                   '\U00002291',
+	"sqsubset;":                 '\U0000228F',
+	"sqsubseteq;":               '\U00002291',
+	"sqsup;":                    '\U00002290',
+	"sqsupe;":                   '\U00002292',
+	"sqsupset;":                 '\U00002290',
+	"sqsupseteq;":               '\U00002292',
+	"squ;":                      '\U000025A1',
+	"square;":                   '\U000025A1',
+	"squarf;":                   '\U000025AA',
+	"squf;":                     '\U000025AA',
+	"srarr;":                    '\U00002192',
+	"sscr;":                     '\U0001D4C8',
+	"ssetmn;":                   '\U00002216',
+	"ssmile;":                   '\U00002323',
+	"sstarf;":                   '\U000022C6',
+	"star;":                     '\U00002606',
+	"starf;":                    '\U00002605',
+	"straightepsilon;":          '\U000003F5',
+	"straightphi;":              '\U000003D5',
+	"strns;":                    '\U000000AF',
+	"sub;":                      '\U00002282',
+	"subE;":                     '\U00002AC5',
+	"subdot;":                   '\U00002ABD',
+	"sube;":                     '\U00002286',
+	"subedot;":                  '\U00002AC3',
+	"submult;":                  '\U00002AC1',
+	"subnE;":                    '\U00002ACB',
+	"subne;":                    '\U0000228A',
+	"subplus;":                  '\U00002ABF',
+	"subrarr;":                  '\U00002979',
+	"subset;":                   '\U00002282',
+	"subseteq;":                 '\U00002286',
+	"subseteqq;":                '\U00002AC5',
+	"subsetneq;":                '\U0000228A',
+	"subsetneqq;":               '\U00002ACB',
+	"subsim;":                   '\U00002AC7',
+	"subsub;":                   '\U00002AD5',
+	"subsup;":                   '\U00002AD3',
+	"succ;":                     '\U0000227B',
+	"succapprox;":               '\U00002AB8',
+	"succcurlyeq;":              '\U0000227D',
+	"succeq;":                   '\U00002AB0',
+	"succnapprox;":              '\U00002ABA',
+	"succneqq;":                 '\U00002AB6',
+	"succnsim;":                 '\U000022E9',
+	"succsim;":                  '\U0000227F',
+	"sum;":                      '\U00002211',
+	"sung;":                     '\U0000266A',
+	"sup;":                      '\U00002283',
+	"sup1;":                     '\U000000B9',
+	"sup2;":                     '\U000000B2',
+	"sup3;":                     '\U000000B3',
+	"supE;":                     '\U00002AC6',
+	"supdot;":                   '\U00002ABE',
+	"supdsub;":                  '\U00002AD8',
+	"supe;":                     '\U00002287',
+	"supedot;":                  '\U00002AC4',
+	"suphsol;":                  '\U000027C9',
+	"suphsub;":                  '\U00002AD7',
+	"suplarr;":                  '\U0000297B',
+	"supmult;":                  '\U00002AC2',
+	"supnE;":                    '\U00002ACC',
+	"supne;":                    '\U0000228B',
+	"supplus;":                  '\U00002AC0',
+	"supset;":                   '\U00002283',
+	"supseteq;":                 '\U00002287',
+	"supseteqq;":                '\U00002AC6',
+	"supsetneq;":                '\U0000228B',
+	"supsetneqq;":               '\U00002ACC',
+	"supsim;":                   '\U00002AC8',
+	"supsub;":                   '\U00002AD4',
+	"supsup;":                   '\U00002AD6',
+	"swArr;":                    '\U000021D9',
+	"swarhk;":                   '\U00002926',
+	"swarr;":                    '\U00002199',
+	"swarrow;":                  '\U00002199',
+	"swnwar;":                   '\U0000292A',
+	"szlig;":                    '\U000000DF',
+	"target;":                   '\U00002316',
+	"tau;":                      '\U000003C4',
+	"tbrk;":                     '\U000023B4',
+	"tcaron;":                   '\U00000165',
+	"tcedil;":                   '\U00000163',
+	"tcy;":                      '\U00000442',
+	"tdot;":                     '\U000020DB',
+	"telrec;":                   '\U00002315',
+	"tfr;":                      '\U0001D531',
+	"there4;":                   '\U00002234',
+	"therefore;":                '\U00002234',
+	"theta;":                    '\U000003B8',
+	"thetasym;":                 '\U000003D1',
+	"thetav;":                   '\U000003D1',
+	"thickapprox;":              '\U00002248',
+	"thicksim;":                 '\U0000223C',
+	"thinsp;":                   '\U00002009',
+	"thkap;":                    '\U00002248',
+	"thksim;":                   '\U0000223C',
+	"thorn;":                    '\U000000FE',
+	"tilde;":                    '\U000002DC',
+	"times;":                    '\U000000D7',
+	"timesb;":                   '\U000022A0',
+	"timesbar;":                 '\U00002A31',
+	"timesd;":                   '\U00002A30',
+	"tint;":                     '\U0000222D',
+	"toea;":                     '\U00002928',
+	"top;":                      '\U000022A4',
+	"topbot;":                   '\U00002336',
+	"topcir;":                   '\U00002AF1',
+	"topf;":                     '\U0001D565',
+	"topfork;":                  '\U00002ADA',
+	"tosa;":                     '\U00002929',
+	"tprime;":                   '\U00002034',
+	"trade;":                    '\U00002122',
+	"triangle;":                 '\U000025B5',
+	"triangledown;":             '\U000025BF',
+	"triangleleft;":             '\U000025C3',
+	"trianglelefteq;":           '\U000022B4',
+	"triangleq;":                '\U0000225C',
+	"triangleright;":            '\U000025B9',
+	"trianglerighteq;":          '\U000022B5',
+	"tridot;":                   '\U000025EC',
+	"trie;":                     '\U0000225C',
+	"triminus;":                 '\U00002A3A',
+	"triplus;":                  '\U00002A39',
+	"trisb;":                    '\U000029CD',
+	"tritime;":                  '\U00002A3B',
+	"trpezium;":                 '\U000023E2',
+	"tscr;":                     '\U0001D4C9',
+	"tscy;":                     '\U00000446',
+	"tshcy;":                    '\U0000045B',
+	"tstrok;":                   '\U00000167',
+	"twixt;":                    '\U0000226C',
+	"twoheadleftarrow;":         '\U0000219E',
+	"twoheadrightarrow;":        '\U000021A0',
+	"uArr;":                     '\U000021D1',
+	"uHar;":                     '\U00002963',
+	"uacute;":                   '\U000000FA',
+	"uarr;":                     '\U00002191',
+	"ubrcy;":                    '\U0000045E',
+	"ubreve;":                   '\U0000016D',
+	"ucirc;":                    '\U000000FB',
+	"ucy;":                      '\U00000443',
+	"udarr;":                    '\U000021C5',
+	"udblac;":                   '\U00000171',
+	"udhar;":                    '\U0000296E',
+	"ufisht;":                   '\U0000297E',
+	"ufr;":                      '\U0001D532',
+	"ugrave;":                   '\U000000F9',
+	"uharl;":                    '\U000021BF',
+	"uharr;":                    '\U000021BE',
+	"uhblk;":                    '\U00002580',
+	"ulcorn;":                   '\U0000231C',
+	"ulcorner;":                 '\U0000231C',
+	"ulcrop;":                   '\U0000230F',
+	"ultri;":                    '\U000025F8',
+	"umacr;":                    '\U0000016B',
+	"uml;":                      '\U000000A8',
+	"uogon;":                    '\U00000173',
+	"uopf;":                     '\U0001D566',
+	"uparrow;":                  '\U00002191',
+	"updownarrow;":              '\U00002195',
+	"upharpoonleft;":            '\U000021BF',
+	"upharpoonright;":           '\U000021BE',
+	"uplus;":                    '\U0000228E',
+	"upsi;":                     '\U000003C5',
+	"upsih;":                    '\U000003D2',
+	"upsilon;":                  '\U000003C5',
+	"upuparrows;":               '\U000021C8',
+	"urcorn;":                   '\U0000231D',
+	"urcorner;":                 '\U0000231D',
+	"urcrop;":                   '\U0000230E',
+	"uring;":                    '\U0000016F',
+	"urtri;":                    '\U000025F9',
+	"uscr;":                     '\U0001D4CA',
+	"utdot;":                    '\U000022F0',
+	"utilde;":                   '\U00000169',
+	"utri;":                     '\U000025B5',
+	"utrif;":                    '\U000025B4',
+	"uuarr;":                    '\U000021C8',
+	"uuml;":                     '\U000000FC',
+	"uwangle;":                  '\U000029A7',
+	"vArr;":                     '\U000021D5',
+	"vBar;":                     '\U00002AE8',
+	"vBarv;":                    '\U00002AE9',
+	"vDash;":                    '\U000022A8',
+	"vangrt;":                   '\U0000299C',
+	"varepsilon;":               '\U000003F5',
+	"varkappa;":                 '\U000003F0',
+	"varnothing;":               '\U00002205',
+	"varphi;":                   '\U000003D5',
+	"varpi;":                    '\U000003D6',
+	"varpropto;":                '\U0000221D',
+	"varr;":                     '\U00002195',
+	"varrho;":                   '\U000003F1',
+	"varsigma;":                 '\U000003C2',
+	"vartheta;":                 '\U000003D1',
+	"vartriangleleft;":          '\U000022B2',
+	"vartriangleright;":         '\U000022B3',
+	"vcy;":                      '\U00000432',
+	"vdash;":                    '\U000022A2',
+	"vee;":                      '\U00002228',
+	"veebar;":                   '\U000022BB',
+	"veeeq;":                    '\U0000225A',
+	"vellip;":                   '\U000022EE',
+	"verbar;":                   '\U0000007C',
+	"vert;":                     '\U0000007C',
+	"vfr;":                      '\U0001D533',
+	"vltri;":                    '\U000022B2',
+	"vopf;":                     '\U0001D567',
+	"vprop;":                    '\U0000221D',
+	"vrtri;":                    '\U000022B3',
+	"vscr;":                     '\U0001D4CB',
+	"vzigzag;":                  '\U0000299A',
+	"wcirc;":                    '\U00000175',
+	"wedbar;":                   '\U00002A5F',
+	"wedge;":                    '\U00002227',
+	"wedgeq;":                   '\U00002259',
+	"weierp;":                   '\U00002118',
+	"wfr;":                      '\U0001D534',
+	"wopf;":                     '\U0001D568',
+	"wp;":                       '\U00002118',
+	"wr;":                       '\U00002240',
+	"wreath;":                   '\U00002240',
+	"wscr;":                     '\U0001D4CC',
+	"xcap;":                     '\U000022C2',
+	"xcirc;":                    '\U000025EF',
+	"xcup;":                     '\U000022C3',
+	"xdtri;":                    '\U000025BD',
+	"xfr;":                      '\U0001D535',
+	"xhArr;":                    '\U000027FA',
+	"xharr;":                    '\U000027F7',
+	"xi;":                       '\U000003BE',
+	"xlArr;":                    '\U000027F8',
+	"xlarr;":                    '\U000027F5',
+	"xmap;":                     '\U000027FC',
+	"xnis;":                     '\U000022FB',
+	"xodot;":                    '\U00002A00',
+	"xopf;":                     '\U0001D569',
+	"xoplus;":                   '\U00002A01',
+	"xotime;":                   '\U00002A02',
+	"xrArr;":                    '\U000027F9',
+	"xrarr;":                    '\U000027F6',
+	"xscr;":                     '\U0001D4CD',
+	"xsqcup;":                   '\U00002A06',
+	"xuplus;":                   '\U00002A04',
+	"xutri;":                    '\U000025B3',
+	"xvee;":                     '\U000022C1',
+	"xwedge;":                   '\U000022C0',
+	"yacute;":                   '\U000000FD',
+	"yacy;":                     '\U0000044F',
+	"ycirc;":                    '\U00000177',
+	"ycy;":                      '\U0000044B',
+	"yen;":                      '\U000000A5',
+	"yfr;":                      '\U0001D536',
+	"yicy;":                     '\U00000457',
+	"yopf;":                     '\U0001D56A',
+	"yscr;":                     '\U0001D4CE',
+	"yucy;":                     '\U0000044E',
+	"yuml;":                     '\U000000FF',
+	"zacute;":                   '\U0000017A',
+	"zcaron;":                   '\U0000017E',
+	"zcy;":                      '\U00000437',
+	"zdot;":                     '\U0000017C',
+	"zeetrf;":                   '\U00002128',
+	"zeta;":                     '\U000003B6',
+	"zfr;":                      '\U0001D537',
+	"zhcy;":                     '\U00000436',
+	"zigrarr;":                  '\U000021DD',
+	"zopf;":                     '\U0001D56B',
+	"zscr;":                     '\U0001D4CF',
+	"zwj;":                      '\U0000200D',
+	"zwnj;":                     '\U0000200C',
+	"AElig":                     '\U000000C6',
+	"AMP":                       '\U00000026',
+	"Aacute":                    '\U000000C1',
+	"Acirc":                     '\U000000C2',
+	"Agrave":                    '\U000000C0',
+	"Aring":                     '\U000000C5',
+	"Atilde":                    '\U000000C3',
+	"Auml":                      '\U000000C4',
+	"COPY":                      '\U000000A9',
+	"Ccedil":                    '\U000000C7',
+	"ETH":                       '\U000000D0',
+	"Eacute":                    '\U000000C9',
+	"Ecirc":                     '\U000000CA',
+	"Egrave":                    '\U000000C8',
+	"Euml":                      '\U000000CB',
+	"GT":                        '\U0000003E',
+	"Iacute":                    '\U000000CD',
+	"Icirc":                     '\U000000CE',
+	"Igrave":                    '\U000000CC',
+	"Iuml":                      '\U000000CF',
+	"LT":                        '\U0000003C',
+	"Ntilde":                    '\U000000D1',
+	"Oacute":                    '\U000000D3',
+	"Ocirc":                     '\U000000D4',
+	"Ograve":                    '\U000000D2',
+	"Oslash":                    '\U000000D8',
+	"Otilde":                    '\U000000D5',
+	"Ouml":                      '\U000000D6',
+	"QUOT":                      '\U00000022',
+	"REG":                       '\U000000AE',
+	"THORN":                     '\U000000DE',
+	"Uacute":                    '\U000000DA',
+	"Ucirc":                     '\U000000DB',
+	"Ugrave":                    '\U000000D9',
+	"Uuml":                      '\U000000DC',
+	"Yacute":                    '\U000000DD',
+	"aacute":                    '\U000000E1',
+	"acirc":                     '\U000000E2',
+	"acute":                     '\U000000B4',
+	"aelig":                     '\U000000E6',
+	"agrave":                    '\U000000E0',
+	"amp":                       '\U00000026',
+	"aring":                     '\U000000E5',
+	"atilde":                    '\U000000E3',
+	"auml":                      '\U000000E4',
+	"brvbar":                    '\U000000A6',
+	"ccedil":                    '\U000000E7',
+	"cedil":                     '\U000000B8',
+	"cent":                      '\U000000A2',
+	"copy":                      '\U000000A9',
+	"curren":                    '\U000000A4',
+	"deg":                       '\U000000B0',
+	"divide":                    '\U000000F7',
+	"eacute":                    '\U000000E9',
+	"ecirc":                     '\U000000EA',
+	"egrave":                    '\U000000E8',
+	"eth":                       '\U000000F0',
+	"euml":                      '\U000000EB',
+	"frac12":                    '\U000000BD',
+	"frac14":                    '\U000000BC',
+	"frac34":                    '\U000000BE',
+	"gt":                        '\U0000003E',
+	"iacute":                    '\U000000ED',
+	"icirc":                     '\U000000EE',
+	"iexcl":                     '\U000000A1',
+	"igrave":                    '\U000000EC',
+	"iquest":                    '\U000000BF',
+	"iuml":                      '\U000000EF',
+	"laquo":                     '\U000000AB',
+	"lt":                        '\U0000003C',
+	"macr":                      '\U000000AF',
+	"micro":                     '\U000000B5',
+	"middot":                    '\U000000B7',
+	"nbsp":                      '\U000000A0',
+	"not":                       '\U000000AC',
+	"ntilde":                    '\U000000F1',
+	"oacute":                    '\U000000F3',
+	"ocirc":                     '\U000000F4',
+	"ograve":                    '\U000000F2',
+	"ordf":                      '\U000000AA',
+	"ordm":                      '\U000000BA',
+	"oslash":                    '\U000000F8',
+	"otilde":                    '\U000000F5',
+	"ouml":                      '\U000000F6',
+	"para":                      '\U000000B6',
+	"plusmn":                    '\U000000B1',
+	"pound":                     '\U000000A3',
+	"quot":                      '\U00000022',
+	"raquo":                     '\U000000BB',
+	"reg":                       '\U000000AE',
+	"sect":                      '\U000000A7',
+	"shy":                       '\U000000AD',
+	"sup1":                      '\U000000B9',
+	"sup2":                      '\U000000B2',
+	"sup3":                      '\U000000B3',
+	"szlig":                     '\U000000DF',
+	"thorn":                     '\U000000FE',
+	"times":                     '\U000000D7',
+	"uacute":                    '\U000000FA',
+	"ucirc":                     '\U000000FB',
+	"ugrave":                    '\U000000F9',
+	"uml":                       '\U000000A8',
+	"uuml":                      '\U000000FC',
+	"yacute":                    '\U000000FD',
+	"yen":                       '\U000000A5',
+	"yuml":                      '\U000000FF',
+}
+
+// HTML entities that are two unicode codepoints.
+var entity2 = map[string][2]rune{
+	// TODO(nigeltao): Handle replacements that are wider than their names.
+	// "nLt;":                     {'\u226A', '\u20D2'},
+	// "nGt;":                     {'\u226B', '\u20D2'},
+	"NotEqualTilde;":           {'\u2242', '\u0338'},
+	"NotGreaterFullEqual;":     {'\u2267', '\u0338'},
+	"NotGreaterGreater;":       {'\u226B', '\u0338'},
+	"NotGreaterSlantEqual;":    {'\u2A7E', '\u0338'},
+	"NotHumpDownHump;":         {'\u224E', '\u0338'},
+	"NotHumpEqual;":            {'\u224F', '\u0338'},
+	"NotLeftTriangleBar;":      {'\u29CF', '\u0338'},
+	"NotLessLess;":             {'\u226A', '\u0338'},
+	"NotLessSlantEqual;":       {'\u2A7D', '\u0338'},
+	"NotNestedGreaterGreater;": {'\u2AA2', '\u0338'},
+	"NotNestedLessLess;":       {'\u2AA1', '\u0338'},
+	"NotPrecedesEqual;":        {'\u2AAF', '\u0338'},
+	"NotRightTriangleBar;":     {'\u29D0', '\u0338'},
+	"NotSquareSubset;":         {'\u228F', '\u0338'},
+	"NotSquareSuperset;":       {'\u2290', '\u0338'},
+	"NotSubset;":               {'\u2282', '\u20D2'},
+	"NotSucceedsEqual;":        {'\u2AB0', '\u0338'},
+	"NotSucceedsTilde;":        {'\u227F', '\u0338'},
+	"NotSuperset;":             {'\u2283', '\u20D2'},
+	"ThickSpace;":              {'\u205F', '\u200A'},
+	"acE;":                     {'\u223E', '\u0333'},
+	"bne;":                     {'\u003D', '\u20E5'},
+	"bnequiv;":                 {'\u2261', '\u20E5'},
+	"caps;":                    {'\u2229', '\uFE00'},
+	"cups;":                    {'\u222A', '\uFE00'},
+	"fjlig;":                   {'\u0066', '\u006A'},
+	"gesl;":                    {'\u22DB', '\uFE00'},
+	"gvertneqq;":               {'\u2269', '\uFE00'},
+	"gvnE;":                    {'\u2269', '\uFE00'},
+	"lates;":                   {'\u2AAD', '\uFE00'},
+	"lesg;":                    {'\u22DA', '\uFE00'},
+	"lvertneqq;":               {'\u2268', '\uFE00'},
+	"lvnE;":                    {'\u2268', '\uFE00'},
+	"nGg;":                     {'\u22D9', '\u0338'},
+	"nGtv;":                    {'\u226B', '\u0338'},
+	"nLl;":                     {'\u22D8', '\u0338'},
+	"nLtv;":                    {'\u226A', '\u0338'},
+	"nang;":                    {'\u2220', '\u20D2'},
+	"napE;":                    {'\u2A70', '\u0338'},
+	"napid;":                   {'\u224B', '\u0338'},
+	"nbump;":                   {'\u224E', '\u0338'},
+	"nbumpe;":                  {'\u224F', '\u0338'},
+	"ncongdot;":                {'\u2A6D', '\u0338'},
+	"nedot;":                   {'\u2250', '\u0338'},
+	"nesim;":                   {'\u2242', '\u0338'},
+	"ngE;":                     {'\u2267', '\u0338'},
+	"ngeqq;":                   {'\u2267', '\u0338'},
+	"ngeqslant;":               {'\u2A7E', '\u0338'},
+	"nges;":                    {'\u2A7E', '\u0338'},
+	"nlE;":                     {'\u2266', '\u0338'},
+	"nleqq;":                   {'\u2266', '\u0338'},
+	"nleqslant;":               {'\u2A7D', '\u0338'},
+	"nles;":                    {'\u2A7D', '\u0338'},
+	"notinE;":                  {'\u22F9', '\u0338'},
+	"notindot;":                {'\u22F5', '\u0338'},
+	"nparsl;":                  {'\u2AFD', '\u20E5'},
+	"npart;":                   {'\u2202', '\u0338'},
+	"npre;":                    {'\u2AAF', '\u0338'},
+	"npreceq;":                 {'\u2AAF', '\u0338'},
+	"nrarrc;":                  {'\u2933', '\u0338'},
+	"nrarrw;":                  {'\u219D', '\u0338'},
+	"nsce;":                    {'\u2AB0', '\u0338'},
+	"nsubE;":                   {'\u2AC5', '\u0338'},
+	"nsubset;":                 {'\u2282', '\u20D2'},
+	"nsubseteqq;":              {'\u2AC5', '\u0338'},
+	"nsucceq;":                 {'\u2AB0', '\u0338'},
+	"nsupE;":                   {'\u2AC6', '\u0338'},
+	"nsupset;":                 {'\u2283', '\u20D2'},
+	"nsupseteqq;":              {'\u2AC6', '\u0338'},
+	"nvap;":                    {'\u224D', '\u20D2'},
+	"nvge;":                    {'\u2265', '\u20D2'},
+	"nvgt;":                    {'\u003E', '\u20D2'},
+	"nvle;":                    {'\u2264', '\u20D2'},
+	"nvlt;":                    {'\u003C', '\u20D2'},
+	"nvltrie;":                 {'\u22B4', '\u20D2'},
+	"nvrtrie;":                 {'\u22B5', '\u20D2'},
+	"nvsim;":                   {'\u223C', '\u20D2'},
+	"race;":                    {'\u223D', '\u0331'},
+	"smtes;":                   {'\u2AAC', '\uFE00'},
+	"sqcaps;":                  {'\u2293', '\uFE00'},
+	"sqcups;":                  {'\u2294', '\uFE00'},
+	"varsubsetneq;":            {'\u228A', '\uFE00'},
+	"varsubsetneqq;":           {'\u2ACB', '\uFE00'},
+	"varsupsetneq;":            {'\u228B', '\uFE00'},
+	"varsupsetneqq;":           {'\u2ACC', '\uFE00'},
+	"vnsub;":                   {'\u2282', '\u20D2'},
+	"vnsup;":                   {'\u2283', '\u20D2'},
+	"vsubnE;":                  {'\u2ACB', '\uFE00'},
+	"vsubne;":                  {'\u228A', '\uFE00'},
+	"vsupnE;":                  {'\u2ACC', '\uFE00'},
+	"vsupne;":                  {'\u228B', '\uFE00'},
+}
diff --git a/vendor/golang.org/x/net/html/escape.go b/vendor/golang.org/x/net/html/escape.go
new file mode 100644
index 0000000000..d856139620
--- /dev/null
+++ b/vendor/golang.org/x/net/html/escape.go
@@ -0,0 +1,258 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"bytes"
+	"strings"
+	"unicode/utf8"
+)
+
+// These replacements permit compatibility with old numeric entities that
+// assumed Windows-1252 encoding.
+// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
+var replacementTable = [...]rune{
+	'\u20AC', // First entry is what 0x80 should be replaced with.
+	'\u0081',
+	'\u201A',
+	'\u0192',
+	'\u201E',
+	'\u2026',
+	'\u2020',
+	'\u2021',
+	'\u02C6',
+	'\u2030',
+	'\u0160',
+	'\u2039',
+	'\u0152',
+	'\u008D',
+	'\u017D',
+	'\u008F',
+	'\u0090',
+	'\u2018',
+	'\u2019',
+	'\u201C',
+	'\u201D',
+	'\u2022',
+	'\u2013',
+	'\u2014',
+	'\u02DC',
+	'\u2122',
+	'\u0161',
+	'\u203A',
+	'\u0153',
+	'\u009D',
+	'\u017E',
+	'\u0178', // Last entry is 0x9F.
+	// 0x00->'\uFFFD' is handled programmatically.
+	// 0x0D->'\u000D' is a no-op.
+}
+
+// unescapeEntity reads an entity like "&lt;" from b[src:] and writes the
+// corresponding "<" to b[dst:], returning the incremented dst and src cursors.
+// Precondition: b[src] == '&' && dst <= src.
+// attribute should be true if parsing an attribute value.
+func unescapeEntity(b []byte, dst, src int, attribute bool) (dst1, src1 int) {
+	// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
+
+	// i starts at 1 because we already know that s[0] == '&'.
+	i, s := 1, b[src:]
+
+	if len(s) <= 1 {
+		b[dst] = b[src]
+		return dst + 1, src + 1
+	}
+
+	if s[i] == '#' {
+		if len(s) <= 3 { // We need to have at least "&#.".
+			b[dst] = b[src]
+			return dst + 1, src + 1
+		}
+		i++
+		c := s[i]
+		hex := false
+		if c == 'x' || c == 'X' {
+			hex = true
+			i++
+		}
+
+		x := '\x00'
+		for i < len(s) {
+			c = s[i]
+			i++
+			if hex {
+				if '0' <= c && c <= '9' {
+					x = 16*x + rune(c) - '0'
+					continue
+				} else if 'a' <= c && c <= 'f' {
+					x = 16*x + rune(c) - 'a' + 10
+					continue
+				} else if 'A' <= c && c <= 'F' {
+					x = 16*x + rune(c) - 'A' + 10
+					continue
+				}
+			} else if '0' <= c && c <= '9' {
+				x = 10*x + rune(c) - '0'
+				continue
+			}
+			if c != ';' {
+				i--
+			}
+			break
+		}
+
+		if i <= 3 { // No characters matched.
+			b[dst] = b[src]
+			return dst + 1, src + 1
+		}
+
+		if 0x80 <= x && x <= 0x9F {
+			// Replace characters from Windows-1252 with UTF-8 equivalents.
+			x = replacementTable[x-0x80]
+		} else if x == 0 || (0xD800 <= x && x <= 0xDFFF) || x > 0x10FFFF {
+			// Replace invalid characters with the replacement character.
+			x = '\uFFFD'
+		}
+
+		return dst + utf8.EncodeRune(b[dst:], x), src + i
+	}
+
+	// Consume the maximum number of characters possible, with the
+	// consumed characters matching one of the named references.
+
+	for i < len(s) {
+		c := s[i]
+		i++
+		// Lower-cased characters are more common in entities, so we check for them first.
+		if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' {
+			continue
+		}
+		if c != ';' {
+			i--
+		}
+		break
+	}
+
+	entityName := string(s[1:i])
+	if entityName == "" {
+		// No-op.
+	} else if attribute && entityName[len(entityName)-1] != ';' && len(s) > i && s[i] == '=' {
+		// No-op.
+	} else if x := entity[entityName]; x != 0 {
+		return dst + utf8.EncodeRune(b[dst:], x), src + i
+	} else if x := entity2[entityName]; x[0] != 0 {
+		dst1 := dst + utf8.EncodeRune(b[dst:], x[0])
+		return dst1 + utf8.EncodeRune(b[dst1:], x[1]), src + i
+	} else if !attribute {
+		maxLen := len(entityName) - 1
+		if maxLen > longestEntityWithoutSemicolon {
+			maxLen = longestEntityWithoutSemicolon
+		}
+		for j := maxLen; j > 1; j-- {
+			if x := entity[entityName[:j]]; x != 0 {
+				return dst + utf8.EncodeRune(b[dst:], x), src + j + 1
+			}
+		}
+	}
+
+	dst1, src1 = dst+i, src+i
+	copy(b[dst:dst1], b[src:src1])
+	return dst1, src1
+}
+
+// unescape unescapes b's entities in-place, so that "a&lt;b" becomes "a<b".
+// attribute should be true if parsing an attribute value.
+func unescape(b []byte, attribute bool) []byte {
+	for i, c := range b {
+		if c == '&' {
+			dst, src := unescapeEntity(b, i, i, attribute)
+			for src < len(b) {
+				c := b[src]
+				if c == '&' {
+					dst, src = unescapeEntity(b, dst, src, attribute)
+				} else {
+					b[dst] = c
+					dst, src = dst+1, src+1
+				}
+			}
+			return b[0:dst]
+		}
+	}
+	return b
+}
+
+// lower lower-cases the A-Z bytes in b in-place, so that "aBc" becomes "abc".
+func lower(b []byte) []byte {
+	for i, c := range b {
+		if 'A' <= c && c <= 'Z' {
+			b[i] = c + 'a' - 'A'
+		}
+	}
+	return b
+}
+
+const escapedChars = "&'<>\"\r"
+
+func escape(w writer, s string) error {
+	i := strings.IndexAny(s, escapedChars)
+	for i != -1 {
+		if _, err := w.WriteString(s[:i]); err != nil {
+			return err
+		}
+		var esc string
+		switch s[i] {
+		case '&':
+			esc = "&amp;"
+		case '\'':
+			// "&#39;" is shorter than "&apos;" and apos was not in HTML until HTML5.
+			esc = "&#39;"
+		case '<':
+			esc = "&lt;"
+		case '>':
+			esc = "&gt;"
+		case '"':
+			// "&#34;" is shorter than "&quot;".
+			esc = "&#34;"
+		case '\r':
+			esc = "&#13;"
+		default:
+			panic("unrecognized escape character")
+		}
+		s = s[i+1:]
+		if _, err := w.WriteString(esc); err != nil {
+			return err
+		}
+		i = strings.IndexAny(s, escapedChars)
+	}
+	_, err := w.WriteString(s)
+	return err
+}
+
+// EscapeString escapes special characters like "<" to become "&lt;". It
+// escapes only five such characters: <, >, &, ' and ".
+// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
+// always true.
+func EscapeString(s string) string {
+	if strings.IndexAny(s, escapedChars) == -1 {
+		return s
+	}
+	var buf bytes.Buffer
+	escape(&buf, s)
+	return buf.String()
+}
+
+// UnescapeString unescapes entities like "&lt;" to become "<". It unescapes a
+// larger range of entities than EscapeString escapes. For example, "&aacute;"
+// unescapes to "á", as does "&#225;" and "&xE1;".
+// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
+// always true.
+func UnescapeString(s string) string {
+	for _, c := range s {
+		if c == '&' {
+			return string(unescape([]byte(s), false))
+		}
+	}
+	return s
+}
diff --git a/vendor/golang.org/x/net/html/foreign.go b/vendor/golang.org/x/net/html/foreign.go
new file mode 100644
index 0000000000..d3b3844099
--- /dev/null
+++ b/vendor/golang.org/x/net/html/foreign.go
@@ -0,0 +1,226 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"strings"
+)
+
+func adjustAttributeNames(aa []Attribute, nameMap map[string]string) {
+	for i := range aa {
+		if newName, ok := nameMap[aa[i].Key]; ok {
+			aa[i].Key = newName
+		}
+	}
+}
+
+func adjustForeignAttributes(aa []Attribute) {
+	for i, a := range aa {
+		if a.Key == "" || a.Key[0] != 'x' {
+			continue
+		}
+		switch a.Key {
+		case "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show",
+			"xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "xmlns:xlink":
+			j := strings.Index(a.Key, ":")
+			aa[i].Namespace = a.Key[:j]
+			aa[i].Key = a.Key[j+1:]
+		}
+	}
+}
+
+func htmlIntegrationPoint(n *Node) bool {
+	if n.Type != ElementNode {
+		return false
+	}
+	switch n.Namespace {
+	case "math":
+		if n.Data == "annotation-xml" {
+			for _, a := range n.Attr {
+				if a.Key == "encoding" {
+					val := strings.ToLower(a.Val)
+					if val == "text/html" || val == "application/xhtml+xml" {
+						return true
+					}
+				}
+			}
+		}
+	case "svg":
+		switch n.Data {
+		case "desc", "foreignObject", "title":
+			return true
+		}
+	}
+	return false
+}
+
+func mathMLTextIntegrationPoint(n *Node) bool {
+	if n.Namespace != "math" {
+		return false
+	}
+	switch n.Data {
+	case "mi", "mo", "mn", "ms", "mtext":
+		return true
+	}
+	return false
+}
+
+// Section 12.2.5.5.
+var breakout = map[string]bool{
+	"b":          true,
+	"big":        true,
+	"blockquote": true,
+	"body":       true,
+	"br":         true,
+	"center":     true,
+	"code":       true,
+	"dd":         true,
+	"div":        true,
+	"dl":         true,
+	"dt":         true,
+	"em":         true,
+	"embed":      true,
+	"h1":         true,
+	"h2":         true,
+	"h3":         true,
+	"h4":         true,
+	"h5":         true,
+	"h6":         true,
+	"head":       true,
+	"hr":         true,
+	"i":          true,
+	"img":        true,
+	"li":         true,
+	"listing":    true,
+	"menu":       true,
+	"meta":       true,
+	"nobr":       true,
+	"ol":         true,
+	"p":          true,
+	"pre":        true,
+	"ruby":       true,
+	"s":          true,
+	"small":      true,
+	"span":       true,
+	"strong":     true,
+	"strike":     true,
+	"sub":        true,
+	"sup":        true,
+	"table":      true,
+	"tt":         true,
+	"u":          true,
+	"ul":         true,
+	"var":        true,
+}
+
+// Section 12.2.5.5.
+var svgTagNameAdjustments = map[string]string{
+	"altglyph":            "altGlyph",
+	"altglyphdef":         "altGlyphDef",
+	"altglyphitem":        "altGlyphItem",
+	"animatecolor":        "animateColor",
+	"animatemotion":       "animateMotion",
+	"animatetransform":    "animateTransform",
+	"clippath":            "clipPath",
+	"feblend":             "feBlend",
+	"fecolormatrix":       "feColorMatrix",
+	"fecomponenttransfer": "feComponentTransfer",
+	"fecomposite":         "feComposite",
+	"feconvolvematrix":    "feConvolveMatrix",
+	"fediffuselighting":   "feDiffuseLighting",
+	"fedisplacementmap":   "feDisplacementMap",
+	"fedistantlight":      "feDistantLight",
+	"feflood":             "feFlood",
+	"fefunca":             "feFuncA",
+	"fefuncb":             "feFuncB",
+	"fefuncg":             "feFuncG",
+	"fefuncr":             "feFuncR",
+	"fegaussianblur":      "feGaussianBlur",
+	"feimage":             "feImage",
+	"femerge":             "feMerge",
+	"femergenode":         "feMergeNode",
+	"femorphology":        "feMorphology",
+	"feoffset":            "feOffset",
+	"fepointlight":        "fePointLight",
+	"fespecularlighting":  "feSpecularLighting",
+	"fespotlight":         "feSpotLight",
+	"fetile":              "feTile",
+	"feturbulence":        "feTurbulence",
+	"foreignobject":       "foreignObject",
+	"glyphref":            "glyphRef",
+	"lineargradient":      "linearGradient",
+	"radialgradient":      "radialGradient",
+	"textpath":            "textPath",
+}
+
+// Section 12.2.5.1
+var mathMLAttributeAdjustments = map[string]string{
+	"definitionurl": "definitionURL",
+}
+
+var svgAttributeAdjustments = map[string]string{
+	"attributename":             "attributeName",
+	"attributetype":             "attributeType",
+	"basefrequency":             "baseFrequency",
+	"baseprofile":               "baseProfile",
+	"calcmode":                  "calcMode",
+	"clippathunits":             "clipPathUnits",
+	"contentscripttype":         "contentScriptType",
+	"contentstyletype":          "contentStyleType",
+	"diffuseconstant":           "diffuseConstant",
+	"edgemode":                  "edgeMode",
+	"externalresourcesrequired": "externalResourcesRequired",
+	"filterres":                 "filterRes",
+	"filterunits":               "filterUnits",
+	"glyphref":                  "glyphRef",
+	"gradienttransform":         "gradientTransform",
+	"gradientunits":             "gradientUnits",
+	"kernelmatrix":              "kernelMatrix",
+	"kernelunitlength":          "kernelUnitLength",
+	"keypoints":                 "keyPoints",
+	"keysplines":                "keySplines",
+	"keytimes":                  "keyTimes",
+	"lengthadjust":              "lengthAdjust",
+	"limitingconeangle":         "limitingConeAngle",
+	"markerheight":              "markerHeight",
+	"markerunits":               "markerUnits",
+	"markerwidth":               "markerWidth",
+	"maskcontentunits":          "maskContentUnits",
+	"maskunits":                 "maskUnits",
+	"numoctaves":                "numOctaves",
+	"pathlength":                "pathLength",
+	"patterncontentunits":       "patternContentUnits",
+	"patterntransform":          "patternTransform",
+	"patternunits":              "patternUnits",
+	"pointsatx":                 "pointsAtX",
+	"pointsaty":                 "pointsAtY",
+	"pointsatz":                 "pointsAtZ",
+	"preservealpha":             "preserveAlpha",
+	"preserveaspectratio":       "preserveAspectRatio",
+	"primitiveunits":            "primitiveUnits",
+	"refx":                      "refX",
+	"refy":                      "refY",
+	"repeatcount":               "repeatCount",
+	"repeatdur":                 "repeatDur",
+	"requiredextensions":        "requiredExtensions",
+	"requiredfeatures":          "requiredFeatures",
+	"specularconstant":          "specularConstant",
+	"specularexponent":          "specularExponent",
+	"spreadmethod":              "spreadMethod",
+	"startoffset":               "startOffset",
+	"stddeviation":              "stdDeviation",
+	"stitchtiles":               "stitchTiles",
+	"surfacescale":              "surfaceScale",
+	"systemlanguage":            "systemLanguage",
+	"tablevalues":               "tableValues",
+	"targetx":                   "targetX",
+	"targety":                   "targetY",
+	"textlength":                "textLength",
+	"viewbox":                   "viewBox",
+	"viewtarget":                "viewTarget",
+	"xchannelselector":          "xChannelSelector",
+	"ychannelselector":          "yChannelSelector",
+	"zoomandpan":                "zoomAndPan",
+}
diff --git a/vendor/golang.org/x/net/html/node.go b/vendor/golang.org/x/net/html/node.go
new file mode 100644
index 0000000000..26b657aec8
--- /dev/null
+++ b/vendor/golang.org/x/net/html/node.go
@@ -0,0 +1,193 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"golang.org/x/net/html/atom"
+)
+
+// A NodeType is the type of a Node.
+type NodeType uint32
+
+const (
+	ErrorNode NodeType = iota
+	TextNode
+	DocumentNode
+	ElementNode
+	CommentNode
+	DoctypeNode
+	scopeMarkerNode
+)
+
+// Section 12.2.3.3 says "scope markers are inserted when entering applet
+// elements, buttons, object elements, marquees, table cells, and table
+// captions, and are used to prevent formatting from 'leaking'".
+var scopeMarker = Node{Type: scopeMarkerNode}
+
+// A Node consists of a NodeType and some Data (tag name for element nodes,
+// content for text) and are part of a tree of Nodes. Element nodes may also
+// have a Namespace and contain a slice of Attributes. Data is unescaped, so
+// that it looks like "a<b" rather than "a&lt;b". For element nodes, DataAtom
+// is the atom for Data, or zero if Data is not a known tag name.
+//
+// An empty Namespace implies a "http://www.w3.org/1999/xhtml" namespace.
+// Similarly, "math" is short for "http://www.w3.org/1998/Math/MathML", and
+// "svg" is short for "http://www.w3.org/2000/svg".
+type Node struct {
+	Parent, FirstChild, LastChild, PrevSibling, NextSibling *Node
+
+	Type      NodeType
+	DataAtom  atom.Atom
+	Data      string
+	Namespace string
+	Attr      []Attribute
+}
+
+// InsertBefore inserts newChild as a child of n, immediately before oldChild
+// in the sequence of n's children. oldChild may be nil, in which case newChild
+// is appended to the end of n's children.
+//
+// It will panic if newChild already has a parent or siblings.
+func (n *Node) InsertBefore(newChild, oldChild *Node) {
+	if newChild.Parent != nil || newChild.PrevSibling != nil || newChild.NextSibling != nil {
+		panic("html: InsertBefore called for an attached child Node")
+	}
+	var prev, next *Node
+	if oldChild != nil {
+		prev, next = oldChild.PrevSibling, oldChild
+	} else {
+		prev = n.LastChild
+	}
+	if prev != nil {
+		prev.NextSibling = newChild
+	} else {
+		n.FirstChild = newChild
+	}
+	if next != nil {
+		next.PrevSibling = newChild
+	} else {
+		n.LastChild = newChild
+	}
+	newChild.Parent = n
+	newChild.PrevSibling = prev
+	newChild.NextSibling = next
+}
+
+// AppendChild adds a node c as a child of n.
+//
+// It will panic if c already has a parent or siblings.
+func (n *Node) AppendChild(c *Node) {
+	if c.Parent != nil || c.PrevSibling != nil || c.NextSibling != nil {
+		panic("html: AppendChild called for an attached child Node")
+	}
+	last := n.LastChild
+	if last != nil {
+		last.NextSibling = c
+	} else {
+		n.FirstChild = c
+	}
+	n.LastChild = c
+	c.Parent = n
+	c.PrevSibling = last
+}
+
+// RemoveChild removes a node c that is a child of n. Afterwards, c will have
+// no parent and no siblings.
+//
+// It will panic if c's parent is not n.
+func (n *Node) RemoveChild(c *Node) {
+	if c.Parent != n {
+		panic("html: RemoveChild called for a non-child Node")
+	}
+	if n.FirstChild == c {
+		n.FirstChild = c.NextSibling
+	}
+	if c.NextSibling != nil {
+		c.NextSibling.PrevSibling = c.PrevSibling
+	}
+	if n.LastChild == c {
+		n.LastChild = c.PrevSibling
+	}
+	if c.PrevSibling != nil {
+		c.PrevSibling.NextSibling = c.NextSibling
+	}
+	c.Parent = nil
+	c.PrevSibling = nil
+	c.NextSibling = nil
+}
+
+// reparentChildren reparents all of src's child nodes to dst.
+func reparentChildren(dst, src *Node) {
+	for {
+		child := src.FirstChild
+		if child == nil {
+			break
+		}
+		src.RemoveChild(child)
+		dst.AppendChild(child)
+	}
+}
+
+// clone returns a new node with the same type, data and attributes.
+// The clone has no parent, no siblings and no children.
+func (n *Node) clone() *Node {
+	m := &Node{
+		Type:     n.Type,
+		DataAtom: n.DataAtom,
+		Data:     n.Data,
+		Attr:     make([]Attribute, len(n.Attr)),
+	}
+	copy(m.Attr, n.Attr)
+	return m
+}
+
+// nodeStack is a stack of nodes.
+type nodeStack []*Node
+
+// pop pops the stack. It will panic if s is empty.
+func (s *nodeStack) pop() *Node {
+	i := len(*s)
+	n := (*s)[i-1]
+	*s = (*s)[:i-1]
+	return n
+}
+
+// top returns the most recently pushed node, or nil if s is empty.
+func (s *nodeStack) top() *Node {
+	if i := len(*s); i > 0 {
+		return (*s)[i-1]
+	}
+	return nil
+}
+
+// index returns the index of the top-most occurrence of n in the stack, or -1
+// if n is not present.
+func (s *nodeStack) index(n *Node) int {
+	for i := len(*s) - 1; i >= 0; i-- {
+		if (*s)[i] == n {
+			return i
+		}
+	}
+	return -1
+}
+
+// insert inserts a node at the given index.
+func (s *nodeStack) insert(i int, n *Node) {
+	(*s) = append(*s, nil)
+	copy((*s)[i+1:], (*s)[i:])
+	(*s)[i] = n
+}
+
+// remove removes a node from the stack. It is a no-op if n is not present.
+func (s *nodeStack) remove(n *Node) {
+	i := s.index(n)
+	if i == -1 {
+		return
+	}
+	copy((*s)[i:], (*s)[i+1:])
+	j := len(*s) - 1
+	(*s)[j] = nil
+	*s = (*s)[:j]
+}
diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go
new file mode 100644
index 0000000000..be4b2bf5aa
--- /dev/null
+++ b/vendor/golang.org/x/net/html/parse.go
@@ -0,0 +1,2094 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"strings"
+
+	a "golang.org/x/net/html/atom"
+)
+
+// A parser implements the HTML5 parsing algorithm:
+// https://html.spec.whatwg.org/multipage/syntax.html#tree-construction
+type parser struct {
+	// tokenizer provides the tokens for the parser.
+	tokenizer *Tokenizer
+	// tok is the most recently read token.
+	tok Token
+	// Self-closing tags like <hr/> are treated as start tags, except that
+	// hasSelfClosingToken is set while they are being processed.
+	hasSelfClosingToken bool
+	// doc is the document root element.
+	doc *Node
+	// The stack of open elements (section 12.2.3.2) and active formatting
+	// elements (section 12.2.3.3).
+	oe, afe nodeStack
+	// Element pointers (section 12.2.3.4).
+	head, form *Node
+	// Other parsing state flags (section 12.2.3.5).
+	scripting, framesetOK bool
+	// im is the current insertion mode.
+	im insertionMode
+	// originalIM is the insertion mode to go back to after completing a text
+	// or inTableText insertion mode.
+	originalIM insertionMode
+	// fosterParenting is whether new elements should be inserted according to
+	// the foster parenting rules (section 12.2.5.3).
+	fosterParenting bool
+	// quirks is whether the parser is operating in "quirks mode."
+	quirks bool
+	// fragment is whether the parser is parsing an HTML fragment.
+	fragment bool
+	// context is the context element when parsing an HTML fragment
+	// (section 12.4).
+	context *Node
+}
+
+func (p *parser) top() *Node {
+	if n := p.oe.top(); n != nil {
+		return n
+	}
+	return p.doc
+}
+
+// Stop tags for use in popUntil. These come from section 12.2.3.2.
+var (
+	defaultScopeStopTags = map[string][]a.Atom{
+		"":     {a.Applet, a.Caption, a.Html, a.Table, a.Td, a.Th, a.Marquee, a.Object, a.Template},
+		"math": {a.AnnotationXml, a.Mi, a.Mn, a.Mo, a.Ms, a.Mtext},
+		"svg":  {a.Desc, a.ForeignObject, a.Title},
+	}
+)
+
+type scope int
+
+const (
+	defaultScope scope = iota
+	listItemScope
+	buttonScope
+	tableScope
+	tableRowScope
+	tableBodyScope
+	selectScope
+)
+
+// popUntil pops the stack of open elements at the highest element whose tag
+// is in matchTags, provided there is no higher element in the scope's stop
+// tags (as defined in section 12.2.3.2). It returns whether or not there was
+// such an element. If there was not, popUntil leaves the stack unchanged.
+//
+// For example, the set of stop tags for table scope is: "html", "table". If
+// the stack was:
+// ["html", "body", "font", "table", "b", "i", "u"]
+// then popUntil(tableScope, "font") would return false, but
+// popUntil(tableScope, "i") would return true and the stack would become:
+// ["html", "body", "font", "table", "b"]
+//
+// If an element's tag is in both the stop tags and matchTags, then the stack
+// will be popped and the function returns true (provided, of course, there was
+// no higher element in the stack that was also in the stop tags). For example,
+// popUntil(tableScope, "table") returns true and leaves:
+// ["html", "body", "font"]
+func (p *parser) popUntil(s scope, matchTags ...a.Atom) bool {
+	if i := p.indexOfElementInScope(s, matchTags...); i != -1 {
+		p.oe = p.oe[:i]
+		return true
+	}
+	return false
+}
+
+// indexOfElementInScope returns the index in p.oe of the highest element whose
+// tag is in matchTags that is in scope. If no matching element is in scope, it
+// returns -1.
+func (p *parser) indexOfElementInScope(s scope, matchTags ...a.Atom) int {
+	for i := len(p.oe) - 1; i >= 0; i-- {
+		tagAtom := p.oe[i].DataAtom
+		if p.oe[i].Namespace == "" {
+			for _, t := range matchTags {
+				if t == tagAtom {
+					return i
+				}
+			}
+			switch s {
+			case defaultScope:
+				// No-op.
+			case listItemScope:
+				if tagAtom == a.Ol || tagAtom == a.Ul {
+					return -1
+				}
+			case buttonScope:
+				if tagAtom == a.Button {
+					return -1
+				}
+			case tableScope:
+				if tagAtom == a.Html || tagAtom == a.Table {
+					return -1
+				}
+			case selectScope:
+				if tagAtom != a.Optgroup && tagAtom != a.Option {
+					return -1
+				}
+			default:
+				panic("unreachable")
+			}
+		}
+		switch s {
+		case defaultScope, listItemScope, buttonScope:
+			for _, t := range defaultScopeStopTags[p.oe[i].Namespace] {
+				if t == tagAtom {
+					return -1
+				}
+			}
+		}
+	}
+	return -1
+}
+
+// elementInScope is like popUntil, except that it doesn't modify the stack of
+// open elements.
+func (p *parser) elementInScope(s scope, matchTags ...a.Atom) bool {
+	return p.indexOfElementInScope(s, matchTags...) != -1
+}
+
+// clearStackToContext pops elements off the stack of open elements until a
+// scope-defined element is found.
+func (p *parser) clearStackToContext(s scope) {
+	for i := len(p.oe) - 1; i >= 0; i-- {
+		tagAtom := p.oe[i].DataAtom
+		switch s {
+		case tableScope:
+			if tagAtom == a.Html || tagAtom == a.Table {
+				p.oe = p.oe[:i+1]
+				return
+			}
+		case tableRowScope:
+			if tagAtom == a.Html || tagAtom == a.Tr {
+				p.oe = p.oe[:i+1]
+				return
+			}
+		case tableBodyScope:
+			if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead {
+				p.oe = p.oe[:i+1]
+				return
+			}
+		default:
+			panic("unreachable")
+		}
+	}
+}
+
+// generateImpliedEndTags pops nodes off the stack of open elements as long as
+// the top node has a tag name of dd, dt, li, option, optgroup, p, rp, or rt.
+// If exceptions are specified, nodes with that name will not be popped off.
+func (p *parser) generateImpliedEndTags(exceptions ...string) {
+	var i int
+loop:
+	for i = len(p.oe) - 1; i >= 0; i-- {
+		n := p.oe[i]
+		if n.Type == ElementNode {
+			switch n.DataAtom {
+			case a.Dd, a.Dt, a.Li, a.Option, a.Optgroup, a.P, a.Rp, a.Rt:
+				for _, except := range exceptions {
+					if n.Data == except {
+						break loop
+					}
+				}
+				continue
+			}
+		}
+		break
+	}
+
+	p.oe = p.oe[:i+1]
+}
+
+// addChild adds a child node n to the top element, and pushes n onto the stack
+// of open elements if it is an element node.
+func (p *parser) addChild(n *Node) {
+	if p.shouldFosterParent() {
+		p.fosterParent(n)
+	} else {
+		p.top().AppendChild(n)
+	}
+
+	if n.Type == ElementNode {
+		p.oe = append(p.oe, n)
+	}
+}
+
+// shouldFosterParent returns whether the next node to be added should be
+// foster parented.
+func (p *parser) shouldFosterParent() bool {
+	if p.fosterParenting {
+		switch p.top().DataAtom {
+		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			return true
+		}
+	}
+	return false
+}
+
+// fosterParent adds a child node according to the foster parenting rules.
+// Section 12.2.5.3, "foster parenting".
+func (p *parser) fosterParent(n *Node) {
+	var table, parent, prev *Node
+	var i int
+	for i = len(p.oe) - 1; i >= 0; i-- {
+		if p.oe[i].DataAtom == a.Table {
+			table = p.oe[i]
+			break
+		}
+	}
+
+	if table == nil {
+		// The foster parent is the html element.
+		parent = p.oe[0]
+	} else {
+		parent = table.Parent
+	}
+	if parent == nil {
+		parent = p.oe[i-1]
+	}
+
+	if table != nil {
+		prev = table.PrevSibling
+	} else {
+		prev = parent.LastChild
+	}
+	if prev != nil && prev.Type == TextNode && n.Type == TextNode {
+		prev.Data += n.Data
+		return
+	}
+
+	parent.InsertBefore(n, table)
+}
+
+// addText adds text to the preceding node if it is a text node, or else it
+// calls addChild with a new text node.
+func (p *parser) addText(text string) {
+	if text == "" {
+		return
+	}
+
+	if p.shouldFosterParent() {
+		p.fosterParent(&Node{
+			Type: TextNode,
+			Data: text,
+		})
+		return
+	}
+
+	t := p.top()
+	if n := t.LastChild; n != nil && n.Type == TextNode {
+		n.Data += text
+		return
+	}
+	p.addChild(&Node{
+		Type: TextNode,
+		Data: text,
+	})
+}
+
+// addElement adds a child element based on the current token.
+func (p *parser) addElement() {
+	p.addChild(&Node{
+		Type:     ElementNode,
+		DataAtom: p.tok.DataAtom,
+		Data:     p.tok.Data,
+		Attr:     p.tok.Attr,
+	})
+}
+
+// Section 12.2.3.3.
+func (p *parser) addFormattingElement() {
+	tagAtom, attr := p.tok.DataAtom, p.tok.Attr
+	p.addElement()
+
+	// Implement the Noah's Ark clause, but with three per family instead of two.
+	identicalElements := 0
+findIdenticalElements:
+	for i := len(p.afe) - 1; i >= 0; i-- {
+		n := p.afe[i]
+		if n.Type == scopeMarkerNode {
+			break
+		}
+		if n.Type != ElementNode {
+			continue
+		}
+		if n.Namespace != "" {
+			continue
+		}
+		if n.DataAtom != tagAtom {
+			continue
+		}
+		if len(n.Attr) != len(attr) {
+			continue
+		}
+	compareAttributes:
+		for _, t0 := range n.Attr {
+			for _, t1 := range attr {
+				if t0.Key == t1.Key && t0.Namespace == t1.Namespace && t0.Val == t1.Val {
+					// Found a match for this attribute, continue with the next attribute.
+					continue compareAttributes
+				}
+			}
+			// If we get here, there is no attribute that matches a.
+			// Therefore the element is not identical to the new one.
+			continue findIdenticalElements
+		}
+
+		identicalElements++
+		if identicalElements >= 3 {
+			p.afe.remove(n)
+		}
+	}
+
+	p.afe = append(p.afe, p.top())
+}
+
+// Section 12.2.3.3.
+func (p *parser) clearActiveFormattingElements() {
+	for {
+		n := p.afe.pop()
+		if len(p.afe) == 0 || n.Type == scopeMarkerNode {
+			return
+		}
+	}
+}
+
+// Section 12.2.3.3.
+func (p *parser) reconstructActiveFormattingElements() {
+	n := p.afe.top()
+	if n == nil {
+		return
+	}
+	if n.Type == scopeMarkerNode || p.oe.index(n) != -1 {
+		return
+	}
+	i := len(p.afe) - 1
+	for n.Type != scopeMarkerNode && p.oe.index(n) == -1 {
+		if i == 0 {
+			i = -1
+			break
+		}
+		i--
+		n = p.afe[i]
+	}
+	for {
+		i++
+		clone := p.afe[i].clone()
+		p.addChild(clone)
+		p.afe[i] = clone
+		if i == len(p.afe)-1 {
+			break
+		}
+	}
+}
+
+// Section 12.2.4.
+func (p *parser) acknowledgeSelfClosingTag() {
+	p.hasSelfClosingToken = false
+}
+
+// An insertion mode (section 12.2.3.1) is the state transition function from
+// a particular state in the HTML5 parser's state machine. It updates the
+// parser's fields depending on parser.tok (where ErrorToken means EOF).
+// It returns whether the token was consumed.
+type insertionMode func(*parser) bool
+
+// setOriginalIM sets the insertion mode to return to after completing a text or
+// inTableText insertion mode.
+// Section 12.2.3.1, "using the rules for".
+func (p *parser) setOriginalIM() {
+	if p.originalIM != nil {
+		panic("html: bad parser state: originalIM was set twice")
+	}
+	p.originalIM = p.im
+}
+
+// Section 12.2.3.1, "reset the insertion mode".
+func (p *parser) resetInsertionMode() {
+	for i := len(p.oe) - 1; i >= 0; i-- {
+		n := p.oe[i]
+		if i == 0 && p.context != nil {
+			n = p.context
+		}
+
+		switch n.DataAtom {
+		case a.Select:
+			p.im = inSelectIM
+		case a.Td, a.Th:
+			p.im = inCellIM
+		case a.Tr:
+			p.im = inRowIM
+		case a.Tbody, a.Thead, a.Tfoot:
+			p.im = inTableBodyIM
+		case a.Caption:
+			p.im = inCaptionIM
+		case a.Colgroup:
+			p.im = inColumnGroupIM
+		case a.Table:
+			p.im = inTableIM
+		case a.Head:
+			p.im = inBodyIM
+		case a.Body:
+			p.im = inBodyIM
+		case a.Frameset:
+			p.im = inFramesetIM
+		case a.Html:
+			p.im = beforeHeadIM
+		default:
+			continue
+		}
+		return
+	}
+	p.im = inBodyIM
+}
+
+const whitespace = " \t\r\n\f"
+
+// Section 12.2.5.4.1.
+func initialIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
+		if len(p.tok.Data) == 0 {
+			// It was all whitespace, so ignore it.
+			return true
+		}
+	case CommentToken:
+		p.doc.AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		n, quirks := parseDoctype(p.tok.Data)
+		p.doc.AppendChild(n)
+		p.quirks = quirks
+		p.im = beforeHTMLIM
+		return true
+	}
+	p.quirks = true
+	p.im = beforeHTMLIM
+	return false
+}
+
+// Section 12.2.5.4.2.
+func beforeHTMLIM(p *parser) bool {
+	switch p.tok.Type {
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	case TextToken:
+		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
+		if len(p.tok.Data) == 0 {
+			// It was all whitespace, so ignore it.
+			return true
+		}
+	case StartTagToken:
+		if p.tok.DataAtom == a.Html {
+			p.addElement()
+			p.im = beforeHeadIM
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Head, a.Body, a.Html, a.Br:
+			p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
+			return false
+		default:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.doc.AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	}
+	p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
+	return false
+}
+
+// Section 12.2.5.4.3.
+func beforeHeadIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
+		if len(p.tok.Data) == 0 {
+			// It was all whitespace, so ignore it.
+			return true
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Head:
+			p.addElement()
+			p.head = p.top()
+			p.im = inHeadIM
+			return true
+		case a.Html:
+			return inBodyIM(p)
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Head, a.Body, a.Html, a.Br:
+			p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
+			return false
+		default:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
+	return false
+}
+
+// Section 12.2.5.4.4.
+func inHeadIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) < len(p.tok.Data) {
+			// Add the initial whitespace to the current node.
+			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
+			if s == "" {
+				return true
+			}
+			p.tok.Data = s
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta:
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+			return true
+		case a.Script, a.Title, a.Noscript, a.Noframes, a.Style:
+			p.addElement()
+			p.setOriginalIM()
+			p.im = textIM
+			return true
+		case a.Head:
+			// Ignore the token.
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Head:
+			n := p.oe.pop()
+			if n.DataAtom != a.Head {
+				panic("html: bad parser state: <head> element not found, in the in-head insertion mode")
+			}
+			p.im = afterHeadIM
+			return true
+		case a.Body, a.Html, a.Br:
+			p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
+			return false
+		default:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
+	return false
+}
+
+// Section 12.2.5.4.6.
+func afterHeadIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) < len(p.tok.Data) {
+			// Add the initial whitespace to the current node.
+			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
+			if s == "" {
+				return true
+			}
+			p.tok.Data = s
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Body:
+			p.addElement()
+			p.framesetOK = false
+			p.im = inBodyIM
+			return true
+		case a.Frameset:
+			p.addElement()
+			p.im = inFramesetIM
+			return true
+		case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
+			p.oe = append(p.oe, p.head)
+			defer p.oe.remove(p.head)
+			return inHeadIM(p)
+		case a.Head:
+			// Ignore the token.
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Body, a.Html, a.Br:
+			// Drop down to creating an implied <body> tag.
+		default:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	p.parseImpliedToken(StartTagToken, a.Body, a.Body.String())
+	p.framesetOK = true
+	return false
+}
+
+// copyAttributes copies attributes of src not found on dst to dst.
+func copyAttributes(dst *Node, src Token) {
+	if len(src.Attr) == 0 {
+		return
+	}
+	attr := map[string]string{}
+	for _, t := range dst.Attr {
+		attr[t.Key] = t.Val
+	}
+	for _, t := range src.Attr {
+		if _, ok := attr[t.Key]; !ok {
+			dst.Attr = append(dst.Attr, t)
+			attr[t.Key] = t.Val
+		}
+	}
+}
+
+// Section 12.2.5.4.7.
+func inBodyIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		d := p.tok.Data
+		switch n := p.oe.top(); n.DataAtom {
+		case a.Pre, a.Listing:
+			if n.FirstChild == nil {
+				// Ignore a newline at the start of a <pre> block.
+				if d != "" && d[0] == '\r' {
+					d = d[1:]
+				}
+				if d != "" && d[0] == '\n' {
+					d = d[1:]
+				}
+			}
+		}
+		d = strings.Replace(d, "\x00", "", -1)
+		if d == "" {
+			return true
+		}
+		p.reconstructActiveFormattingElements()
+		p.addText(d)
+		if p.framesetOK && strings.TrimLeft(d, whitespace) != "" {
+			// There were non-whitespace characters inserted.
+			p.framesetOK = false
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			copyAttributes(p.oe[0], p.tok)
+		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
+			return inHeadIM(p)
+		case a.Body:
+			if len(p.oe) >= 2 {
+				body := p.oe[1]
+				if body.Type == ElementNode && body.DataAtom == a.Body {
+					p.framesetOK = false
+					copyAttributes(body, p.tok)
+				}
+			}
+		case a.Frameset:
+			if !p.framesetOK || len(p.oe) < 2 || p.oe[1].DataAtom != a.Body {
+				// Ignore the token.
+				return true
+			}
+			body := p.oe[1]
+			if body.Parent != nil {
+				body.Parent.RemoveChild(body)
+			}
+			p.oe = p.oe[:1]
+			p.addElement()
+			p.im = inFramesetIM
+			return true
+		case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul:
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+			p.popUntil(buttonScope, a.P)
+			switch n := p.top(); n.DataAtom {
+			case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+				p.oe.pop()
+			}
+			p.addElement()
+		case a.Pre, a.Listing:
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+			// The newline, if any, will be dealt with by the TextToken case.
+			p.framesetOK = false
+		case a.Form:
+			if p.form == nil {
+				p.popUntil(buttonScope, a.P)
+				p.addElement()
+				p.form = p.top()
+			}
+		case a.Li:
+			p.framesetOK = false
+			for i := len(p.oe) - 1; i >= 0; i-- {
+				node := p.oe[i]
+				switch node.DataAtom {
+				case a.Li:
+					p.oe = p.oe[:i]
+				case a.Address, a.Div, a.P:
+					continue
+				default:
+					if !isSpecialElement(node) {
+						continue
+					}
+				}
+				break
+			}
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+		case a.Dd, a.Dt:
+			p.framesetOK = false
+			for i := len(p.oe) - 1; i >= 0; i-- {
+				node := p.oe[i]
+				switch node.DataAtom {
+				case a.Dd, a.Dt:
+					p.oe = p.oe[:i]
+				case a.Address, a.Div, a.P:
+					continue
+				default:
+					if !isSpecialElement(node) {
+						continue
+					}
+				}
+				break
+			}
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+		case a.Plaintext:
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+		case a.Button:
+			p.popUntil(defaultScope, a.Button)
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.framesetOK = false
+		case a.A:
+			for i := len(p.afe) - 1; i >= 0 && p.afe[i].Type != scopeMarkerNode; i-- {
+				if n := p.afe[i]; n.Type == ElementNode && n.DataAtom == a.A {
+					p.inBodyEndTagFormatting(a.A)
+					p.oe.remove(n)
+					p.afe.remove(n)
+					break
+				}
+			}
+			p.reconstructActiveFormattingElements()
+			p.addFormattingElement()
+		case a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
+			p.reconstructActiveFormattingElements()
+			p.addFormattingElement()
+		case a.Nobr:
+			p.reconstructActiveFormattingElements()
+			if p.elementInScope(defaultScope, a.Nobr) {
+				p.inBodyEndTagFormatting(a.Nobr)
+				p.reconstructActiveFormattingElements()
+			}
+			p.addFormattingElement()
+		case a.Applet, a.Marquee, a.Object:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.afe = append(p.afe, &scopeMarker)
+			p.framesetOK = false
+		case a.Table:
+			if !p.quirks {
+				p.popUntil(buttonScope, a.P)
+			}
+			p.addElement()
+			p.framesetOK = false
+			p.im = inTableIM
+			return true
+		case a.Area, a.Br, a.Embed, a.Img, a.Input, a.Keygen, a.Wbr:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+			if p.tok.DataAtom == a.Input {
+				for _, t := range p.tok.Attr {
+					if t.Key == "type" {
+						if strings.ToLower(t.Val) == "hidden" {
+							// Skip setting framesetOK = false
+							return true
+						}
+					}
+				}
+			}
+			p.framesetOK = false
+		case a.Param, a.Source, a.Track:
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+		case a.Hr:
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+			p.framesetOK = false
+		case a.Image:
+			p.tok.DataAtom = a.Img
+			p.tok.Data = a.Img.String()
+			return false
+		case a.Isindex:
+			if p.form != nil {
+				// Ignore the token.
+				return true
+			}
+			action := ""
+			prompt := "This is a searchable index. Enter search keywords: "
+			attr := []Attribute{{Key: "name", Val: "isindex"}}
+			for _, t := range p.tok.Attr {
+				switch t.Key {
+				case "action":
+					action = t.Val
+				case "name":
+					// Ignore the attribute.
+				case "prompt":
+					prompt = t.Val
+				default:
+					attr = append(attr, t)
+				}
+			}
+			p.acknowledgeSelfClosingTag()
+			p.popUntil(buttonScope, a.P)
+			p.parseImpliedToken(StartTagToken, a.Form, a.Form.String())
+			if action != "" {
+				p.form.Attr = []Attribute{{Key: "action", Val: action}}
+			}
+			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
+			p.parseImpliedToken(StartTagToken, a.Label, a.Label.String())
+			p.addText(prompt)
+			p.addChild(&Node{
+				Type:     ElementNode,
+				DataAtom: a.Input,
+				Data:     a.Input.String(),
+				Attr:     attr,
+			})
+			p.oe.pop()
+			p.parseImpliedToken(EndTagToken, a.Label, a.Label.String())
+			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
+			p.parseImpliedToken(EndTagToken, a.Form, a.Form.String())
+		case a.Textarea:
+			p.addElement()
+			p.setOriginalIM()
+			p.framesetOK = false
+			p.im = textIM
+		case a.Xmp:
+			p.popUntil(buttonScope, a.P)
+			p.reconstructActiveFormattingElements()
+			p.framesetOK = false
+			p.addElement()
+			p.setOriginalIM()
+			p.im = textIM
+		case a.Iframe:
+			p.framesetOK = false
+			p.addElement()
+			p.setOriginalIM()
+			p.im = textIM
+		case a.Noembed, a.Noscript:
+			p.addElement()
+			p.setOriginalIM()
+			p.im = textIM
+		case a.Select:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.framesetOK = false
+			p.im = inSelectIM
+			return true
+		case a.Optgroup, a.Option:
+			if p.top().DataAtom == a.Option {
+				p.oe.pop()
+			}
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+		case a.Rp, a.Rt:
+			if p.elementInScope(defaultScope, a.Ruby) {
+				p.generateImpliedEndTags()
+			}
+			p.addElement()
+		case a.Math, a.Svg:
+			p.reconstructActiveFormattingElements()
+			if p.tok.DataAtom == a.Math {
+				adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
+			} else {
+				adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
+			}
+			adjustForeignAttributes(p.tok.Attr)
+			p.addElement()
+			p.top().Namespace = p.tok.Data
+			if p.hasSelfClosingToken {
+				p.oe.pop()
+				p.acknowledgeSelfClosingTag()
+			}
+			return true
+		case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+			// Ignore the token.
+		default:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Body:
+			if p.elementInScope(defaultScope, a.Body) {
+				p.im = afterBodyIM
+			}
+		case a.Html:
+			if p.elementInScope(defaultScope, a.Body) {
+				p.parseImpliedToken(EndTagToken, a.Body, a.Body.String())
+				return false
+			}
+			return true
+		case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul:
+			p.popUntil(defaultScope, p.tok.DataAtom)
+		case a.Form:
+			node := p.form
+			p.form = nil
+			i := p.indexOfElementInScope(defaultScope, a.Form)
+			if node == nil || i == -1 || p.oe[i] != node {
+				// Ignore the token.
+				return true
+			}
+			p.generateImpliedEndTags()
+			p.oe.remove(node)
+		case a.P:
+			if !p.elementInScope(buttonScope, a.P) {
+				p.parseImpliedToken(StartTagToken, a.P, a.P.String())
+			}
+			p.popUntil(buttonScope, a.P)
+		case a.Li:
+			p.popUntil(listItemScope, a.Li)
+		case a.Dd, a.Dt:
+			p.popUntil(defaultScope, p.tok.DataAtom)
+		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+			p.popUntil(defaultScope, a.H1, a.H2, a.H3, a.H4, a.H5, a.H6)
+		case a.A, a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.Nobr, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
+			p.inBodyEndTagFormatting(p.tok.DataAtom)
+		case a.Applet, a.Marquee, a.Object:
+			if p.popUntil(defaultScope, p.tok.DataAtom) {
+				p.clearActiveFormattingElements()
+			}
+		case a.Br:
+			p.tok.Type = StartTagToken
+			return false
+		default:
+			p.inBodyEndTagOther(p.tok.DataAtom)
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	}
+
+	return true
+}
+
+func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) {
+	// This is the "adoption agency" algorithm, described at
+	// https://html.spec.whatwg.org/multipage/syntax.html#adoptionAgency
+
+	// TODO: this is a fairly literal line-by-line translation of that algorithm.
+	// Once the code successfully parses the comprehensive test suite, we should
+	// refactor this code to be more idiomatic.
+
+	// Steps 1-4. The outer loop.
+	for i := 0; i < 8; i++ {
+		// Step 5. Find the formatting element.
+		var formattingElement *Node
+		for j := len(p.afe) - 1; j >= 0; j-- {
+			if p.afe[j].Type == scopeMarkerNode {
+				break
+			}
+			if p.afe[j].DataAtom == tagAtom {
+				formattingElement = p.afe[j]
+				break
+			}
+		}
+		if formattingElement == nil {
+			p.inBodyEndTagOther(tagAtom)
+			return
+		}
+		feIndex := p.oe.index(formattingElement)
+		if feIndex == -1 {
+			p.afe.remove(formattingElement)
+			return
+		}
+		if !p.elementInScope(defaultScope, tagAtom) {
+			// Ignore the tag.
+			return
+		}
+
+		// Steps 9-10. Find the furthest block.
+		var furthestBlock *Node
+		for _, e := range p.oe[feIndex:] {
+			if isSpecialElement(e) {
+				furthestBlock = e
+				break
+			}
+		}
+		if furthestBlock == nil {
+			e := p.oe.pop()
+			for e != formattingElement {
+				e = p.oe.pop()
+			}
+			p.afe.remove(e)
+			return
+		}
+
+		// Steps 11-12. Find the common ancestor and bookmark node.
+		commonAncestor := p.oe[feIndex-1]
+		bookmark := p.afe.index(formattingElement)
+
+		// Step 13. The inner loop. Find the lastNode to reparent.
+		lastNode := furthestBlock
+		node := furthestBlock
+		x := p.oe.index(node)
+		// Steps 13.1-13.2
+		for j := 0; j < 3; j++ {
+			// Step 13.3.
+			x--
+			node = p.oe[x]
+			// Step 13.4 - 13.5.
+			if p.afe.index(node) == -1 {
+				p.oe.remove(node)
+				continue
+			}
+			// Step 13.6.
+			if node == formattingElement {
+				break
+			}
+			// Step 13.7.
+			clone := node.clone()
+			p.afe[p.afe.index(node)] = clone
+			p.oe[p.oe.index(node)] = clone
+			node = clone
+			// Step 13.8.
+			if lastNode == furthestBlock {
+				bookmark = p.afe.index(node) + 1
+			}
+			// Step 13.9.
+			if lastNode.Parent != nil {
+				lastNode.Parent.RemoveChild(lastNode)
+			}
+			node.AppendChild(lastNode)
+			// Step 13.10.
+			lastNode = node
+		}
+
+		// Step 14. Reparent lastNode to the common ancestor,
+		// or for misnested table nodes, to the foster parent.
+		if lastNode.Parent != nil {
+			lastNode.Parent.RemoveChild(lastNode)
+		}
+		switch commonAncestor.DataAtom {
+		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			p.fosterParent(lastNode)
+		default:
+			commonAncestor.AppendChild(lastNode)
+		}
+
+		// Steps 15-17. Reparent nodes from the furthest block's children
+		// to a clone of the formatting element.
+		clone := formattingElement.clone()
+		reparentChildren(clone, furthestBlock)
+		furthestBlock.AppendChild(clone)
+
+		// Step 18. Fix up the list of active formatting elements.
+		if oldLoc := p.afe.index(formattingElement); oldLoc != -1 && oldLoc < bookmark {
+			// Move the bookmark with the rest of the list.
+			bookmark--
+		}
+		p.afe.remove(formattingElement)
+		p.afe.insert(bookmark, clone)
+
+		// Step 19. Fix up the stack of open elements.
+		p.oe.remove(formattingElement)
+		p.oe.insert(p.oe.index(furthestBlock)+1, clone)
+	}
+}
+
+// inBodyEndTagOther performs the "any other end tag" algorithm for inBodyIM.
+// "Any other end tag" handling from 12.2.5.5 The rules for parsing tokens in foreign content
+// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inforeign
+func (p *parser) inBodyEndTagOther(tagAtom a.Atom) {
+	for i := len(p.oe) - 1; i >= 0; i-- {
+		if p.oe[i].DataAtom == tagAtom {
+			p.oe = p.oe[:i]
+			break
+		}
+		if isSpecialElement(p.oe[i]) {
+			break
+		}
+	}
+}
+
+// Section 12.2.5.4.8.
+func textIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		p.oe.pop()
+	case TextToken:
+		d := p.tok.Data
+		if n := p.oe.top(); n.DataAtom == a.Textarea && n.FirstChild == nil {
+			// Ignore a newline at the start of a <textarea> block.
+			if d != "" && d[0] == '\r' {
+				d = d[1:]
+			}
+			if d != "" && d[0] == '\n' {
+				d = d[1:]
+			}
+		}
+		if d == "" {
+			return true
+		}
+		p.addText(d)
+		return true
+	case EndTagToken:
+		p.oe.pop()
+	}
+	p.im = p.originalIM
+	p.originalIM = nil
+	return p.tok.Type == EndTagToken
+}
+
+// Section 12.2.5.4.9.
+func inTableIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		// Stop parsing.
+		return true
+	case TextToken:
+		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "", -1)
+		switch p.oe.top().DataAtom {
+		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			if strings.Trim(p.tok.Data, whitespace) == "" {
+				p.addText(p.tok.Data)
+				return true
+			}
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption:
+			p.clearStackToContext(tableScope)
+			p.afe = append(p.afe, &scopeMarker)
+			p.addElement()
+			p.im = inCaptionIM
+			return true
+		case a.Colgroup:
+			p.clearStackToContext(tableScope)
+			p.addElement()
+			p.im = inColumnGroupIM
+			return true
+		case a.Col:
+			p.parseImpliedToken(StartTagToken, a.Colgroup, a.Colgroup.String())
+			return false
+		case a.Tbody, a.Tfoot, a.Thead:
+			p.clearStackToContext(tableScope)
+			p.addElement()
+			p.im = inTableBodyIM
+			return true
+		case a.Td, a.Th, a.Tr:
+			p.parseImpliedToken(StartTagToken, a.Tbody, a.Tbody.String())
+			return false
+		case a.Table:
+			if p.popUntil(tableScope, a.Table) {
+				p.resetInsertionMode()
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Style, a.Script:
+			return inHeadIM(p)
+		case a.Input:
+			for _, t := range p.tok.Attr {
+				if t.Key == "type" && strings.ToLower(t.Val) == "hidden" {
+					p.addElement()
+					p.oe.pop()
+					return true
+				}
+			}
+			// Otherwise drop down to the default action.
+		case a.Form:
+			if p.form != nil {
+				// Ignore the token.
+				return true
+			}
+			p.addElement()
+			p.form = p.oe.pop()
+		case a.Select:
+			p.reconstructActiveFormattingElements()
+			switch p.top().DataAtom {
+			case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+				p.fosterParenting = true
+			}
+			p.addElement()
+			p.fosterParenting = false
+			p.framesetOK = false
+			p.im = inSelectInTableIM
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Table:
+			if p.popUntil(tableScope, a.Table) {
+				p.resetInsertionMode()
+				return true
+			}
+			// Ignore the token.
+			return true
+		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	p.fosterParenting = true
+	defer func() { p.fosterParenting = false }()
+
+	return inBodyIM(p)
+}
+
+// Section 12.2.5.4.11.
+func inCaptionIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Thead, a.Tr:
+			if p.popUntil(tableScope, a.Caption) {
+				p.clearActiveFormattingElements()
+				p.im = inTableIM
+				return false
+			} else {
+				// Ignore the token.
+				return true
+			}
+		case a.Select:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.framesetOK = false
+			p.im = inSelectInTableIM
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption:
+			if p.popUntil(tableScope, a.Caption) {
+				p.clearActiveFormattingElements()
+				p.im = inTableIM
+			}
+			return true
+		case a.Table:
+			if p.popUntil(tableScope, a.Caption) {
+				p.clearActiveFormattingElements()
+				p.im = inTableIM
+				return false
+			} else {
+				// Ignore the token.
+				return true
+			}
+		case a.Body, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+			// Ignore the token.
+			return true
+		}
+	}
+	return inBodyIM(p)
+}
+
+// Section 12.2.5.4.12.
+func inColumnGroupIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) < len(p.tok.Data) {
+			// Add the initial whitespace to the current node.
+			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
+			if s == "" {
+				return true
+			}
+			p.tok.Data = s
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Col:
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Colgroup:
+			if p.oe.top().DataAtom != a.Html {
+				p.oe.pop()
+				p.im = inTableIM
+			}
+			return true
+		case a.Col:
+			// Ignore the token.
+			return true
+		}
+	}
+	if p.oe.top().DataAtom != a.Html {
+		p.oe.pop()
+		p.im = inTableIM
+		return false
+	}
+	return true
+}
+
+// Section 12.2.5.4.13.
+func inTableBodyIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Tr:
+			p.clearStackToContext(tableBodyScope)
+			p.addElement()
+			p.im = inRowIM
+			return true
+		case a.Td, a.Th:
+			p.parseImpliedToken(StartTagToken, a.Tr, a.Tr.String())
+			return false
+		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead:
+			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
+				p.im = inTableIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Tbody, a.Tfoot, a.Thead:
+			if p.elementInScope(tableScope, p.tok.DataAtom) {
+				p.clearStackToContext(tableBodyScope)
+				p.oe.pop()
+				p.im = inTableIM
+			}
+			return true
+		case a.Table:
+			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
+				p.im = inTableIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th, a.Tr:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	}
+
+	return inTableIM(p)
+}
+
+// Section 12.2.5.4.14.
+func inRowIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Td, a.Th:
+			p.clearStackToContext(tableRowScope)
+			p.addElement()
+			p.afe = append(p.afe, &scopeMarker)
+			p.im = inCellIM
+			return true
+		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			if p.popUntil(tableScope, a.Tr) {
+				p.im = inTableBodyIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Tr:
+			if p.popUntil(tableScope, a.Tr) {
+				p.im = inTableBodyIM
+				return true
+			}
+			// Ignore the token.
+			return true
+		case a.Table:
+			if p.popUntil(tableScope, a.Tr) {
+				p.im = inTableBodyIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Tbody, a.Tfoot, a.Thead:
+			if p.elementInScope(tableScope, p.tok.DataAtom) {
+				p.parseImpliedToken(EndTagToken, a.Tr, a.Tr.String())
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th:
+			// Ignore the token.
+			return true
+		}
+	}
+
+	return inTableIM(p)
+}
+
+// Section 12.2.5.4.15.
+func inCellIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+			if p.popUntil(tableScope, a.Td, a.Th) {
+				// Close the cell and reprocess.
+				p.clearActiveFormattingElements()
+				p.im = inRowIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Select:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.framesetOK = false
+			p.im = inSelectInTableIM
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Td, a.Th:
+			if !p.popUntil(tableScope, p.tok.DataAtom) {
+				// Ignore the token.
+				return true
+			}
+			p.clearActiveFormattingElements()
+			p.im = inRowIM
+			return true
+		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html:
+			// Ignore the token.
+			return true
+		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			if !p.elementInScope(tableScope, p.tok.DataAtom) {
+				// Ignore the token.
+				return true
+			}
+			// Close the cell and reprocess.
+			p.popUntil(tableScope, a.Td, a.Th)
+			p.clearActiveFormattingElements()
+			p.im = inRowIM
+			return false
+		}
+	}
+	return inBodyIM(p)
+}
+
+// Section 12.2.5.4.16.
+func inSelectIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		// Stop parsing.
+		return true
+	case TextToken:
+		p.addText(strings.Replace(p.tok.Data, "\x00", "", -1))
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Option:
+			if p.top().DataAtom == a.Option {
+				p.oe.pop()
+			}
+			p.addElement()
+		case a.Optgroup:
+			if p.top().DataAtom == a.Option {
+				p.oe.pop()
+			}
+			if p.top().DataAtom == a.Optgroup {
+				p.oe.pop()
+			}
+			p.addElement()
+		case a.Select:
+			p.tok.Type = EndTagToken
+			return false
+		case a.Input, a.Keygen, a.Textarea:
+			if p.elementInScope(selectScope, a.Select) {
+				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
+				return false
+			}
+			// In order to properly ignore <textarea>, we need to change the tokenizer mode.
+			p.tokenizer.NextIsNotRawText()
+			// Ignore the token.
+			return true
+		case a.Script:
+			return inHeadIM(p)
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Option:
+			if p.top().DataAtom == a.Option {
+				p.oe.pop()
+			}
+		case a.Optgroup:
+			i := len(p.oe) - 1
+			if p.oe[i].DataAtom == a.Option {
+				i--
+			}
+			if p.oe[i].DataAtom == a.Optgroup {
+				p.oe = p.oe[:i]
+			}
+		case a.Select:
+			if p.popUntil(selectScope, a.Select) {
+				p.resetInsertionMode()
+			}
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	return true
+}
+
+// Section 12.2.5.4.17.
+func inSelectInTableIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken, EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption, a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr, a.Td, a.Th:
+			if p.tok.Type == StartTagToken || p.elementInScope(tableScope, p.tok.DataAtom) {
+				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
+				return false
+			} else {
+				// Ignore the token.
+				return true
+			}
+		}
+	}
+	return inSelectIM(p)
+}
+
+// Section 12.2.5.4.18.
+func afterBodyIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		// Stop parsing.
+		return true
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) == 0 {
+			// It was all whitespace.
+			return inBodyIM(p)
+		}
+	case StartTagToken:
+		if p.tok.DataAtom == a.Html {
+			return inBodyIM(p)
+		}
+	case EndTagToken:
+		if p.tok.DataAtom == a.Html {
+			if !p.fragment {
+				p.im = afterAfterBodyIM
+			}
+			return true
+		}
+	case CommentToken:
+		// The comment is attached to the <html> element.
+		if len(p.oe) < 1 || p.oe[0].DataAtom != a.Html {
+			panic("html: bad parser state: <html> element not found, in the after-body insertion mode")
+		}
+		p.oe[0].AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	}
+	p.im = inBodyIM
+	return false
+}
+
+// Section 12.2.5.4.19.
+func inFramesetIM(p *parser) bool {
+	switch p.tok.Type {
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case TextToken:
+		// Ignore all text but whitespace.
+		s := strings.Map(func(c rune) rune {
+			switch c {
+			case ' ', '\t', '\n', '\f', '\r':
+				return c
+			}
+			return -1
+		}, p.tok.Data)
+		if s != "" {
+			p.addText(s)
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Frameset:
+			p.addElement()
+		case a.Frame:
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+		case a.Noframes:
+			return inHeadIM(p)
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Frameset:
+			if p.oe.top().DataAtom != a.Html {
+				p.oe.pop()
+				if p.oe.top().DataAtom != a.Frameset {
+					p.im = afterFramesetIM
+					return true
+				}
+			}
+		}
+	default:
+		// Ignore the token.
+	}
+	return true
+}
+
+// Section 12.2.5.4.20.
+func afterFramesetIM(p *parser) bool {
+	switch p.tok.Type {
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case TextToken:
+		// Ignore all text but whitespace.
+		s := strings.Map(func(c rune) rune {
+			switch c {
+			case ' ', '\t', '\n', '\f', '\r':
+				return c
+			}
+			return -1
+		}, p.tok.Data)
+		if s != "" {
+			p.addText(s)
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Noframes:
+			return inHeadIM(p)
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			p.im = afterAfterFramesetIM
+			return true
+		}
+	default:
+		// Ignore the token.
+	}
+	return true
+}
+
+// Section 12.2.5.4.21.
+func afterAfterBodyIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		// Stop parsing.
+		return true
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) == 0 {
+			// It was all whitespace.
+			return inBodyIM(p)
+		}
+	case StartTagToken:
+		if p.tok.DataAtom == a.Html {
+			return inBodyIM(p)
+		}
+	case CommentToken:
+		p.doc.AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		return inBodyIM(p)
+	}
+	p.im = inBodyIM
+	return false
+}
+
+// Section 12.2.5.4.22.
+func afterAfterFramesetIM(p *parser) bool {
+	switch p.tok.Type {
+	case CommentToken:
+		p.doc.AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case TextToken:
+		// Ignore all text but whitespace.
+		s := strings.Map(func(c rune) rune {
+			switch c {
+			case ' ', '\t', '\n', '\f', '\r':
+				return c
+			}
+			return -1
+		}, p.tok.Data)
+		if s != "" {
+			p.tok.Data = s
+			return inBodyIM(p)
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Noframes:
+			return inHeadIM(p)
+		}
+	case DoctypeToken:
+		return inBodyIM(p)
+	default:
+		// Ignore the token.
+	}
+	return true
+}
+
+const whitespaceOrNUL = whitespace + "\x00"
+
+// Section 12.2.5.5.
+func parseForeignContent(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		if p.framesetOK {
+			p.framesetOK = strings.TrimLeft(p.tok.Data, whitespaceOrNUL) == ""
+		}
+		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "\ufffd", -1)
+		p.addText(p.tok.Data)
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case StartTagToken:
+		b := breakout[p.tok.Data]
+		if p.tok.DataAtom == a.Font {
+		loop:
+			for _, attr := range p.tok.Attr {
+				switch attr.Key {
+				case "color", "face", "size":
+					b = true
+					break loop
+				}
+			}
+		}
+		if b {
+			for i := len(p.oe) - 1; i >= 0; i-- {
+				n := p.oe[i]
+				if n.Namespace == "" || htmlIntegrationPoint(n) || mathMLTextIntegrationPoint(n) {
+					p.oe = p.oe[:i+1]
+					break
+				}
+			}
+			return false
+		}
+		switch p.top().Namespace {
+		case "math":
+			adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
+		case "svg":
+			// Adjust SVG tag names. The tokenizer lower-cases tag names, but
+			// SVG wants e.g. "foreignObject" with a capital second "O".
+			if x := svgTagNameAdjustments[p.tok.Data]; x != "" {
+				p.tok.DataAtom = a.Lookup([]byte(x))
+				p.tok.Data = x
+			}
+			adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
+		default:
+			panic("html: bad parser state: unexpected namespace")
+		}
+		adjustForeignAttributes(p.tok.Attr)
+		namespace := p.top().Namespace
+		p.addElement()
+		p.top().Namespace = namespace
+		if namespace != "" {
+			// Don't let the tokenizer go into raw text mode in foreign content
+			// (e.g. in an SVG <title> tag).
+			p.tokenizer.NextIsNotRawText()
+		}
+		if p.hasSelfClosingToken {
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+		}
+	case EndTagToken:
+		for i := len(p.oe) - 1; i >= 0; i-- {
+			if p.oe[i].Namespace == "" {
+				return p.im(p)
+			}
+			if strings.EqualFold(p.oe[i].Data, p.tok.Data) {
+				p.oe = p.oe[:i]
+				break
+			}
+		}
+		return true
+	default:
+		// Ignore the token.
+	}
+	return true
+}
+
+// Section 12.2.5.
+func (p *parser) inForeignContent() bool {
+	if len(p.oe) == 0 {
+		return false
+	}
+	n := p.oe[len(p.oe)-1]
+	if n.Namespace == "" {
+		return false
+	}
+	if mathMLTextIntegrationPoint(n) {
+		if p.tok.Type == StartTagToken && p.tok.DataAtom != a.Mglyph && p.tok.DataAtom != a.Malignmark {
+			return false
+		}
+		if p.tok.Type == TextToken {
+			return false
+		}
+	}
+	if n.Namespace == "math" && n.DataAtom == a.AnnotationXml && p.tok.Type == StartTagToken && p.tok.DataAtom == a.Svg {
+		return false
+	}
+	if htmlIntegrationPoint(n) && (p.tok.Type == StartTagToken || p.tok.Type == TextToken) {
+		return false
+	}
+	if p.tok.Type == ErrorToken {
+		return false
+	}
+	return true
+}
+
+// parseImpliedToken parses a token as though it had appeared in the parser's
+// input.
+func (p *parser) parseImpliedToken(t TokenType, dataAtom a.Atom, data string) {
+	realToken, selfClosing := p.tok, p.hasSelfClosingToken
+	p.tok = Token{
+		Type:     t,
+		DataAtom: dataAtom,
+		Data:     data,
+	}
+	p.hasSelfClosingToken = false
+	p.parseCurrentToken()
+	p.tok, p.hasSelfClosingToken = realToken, selfClosing
+}
+
+// parseCurrentToken runs the current token through the parsing routines
+// until it is consumed.
+func (p *parser) parseCurrentToken() {
+	if p.tok.Type == SelfClosingTagToken {
+		p.hasSelfClosingToken = true
+		p.tok.Type = StartTagToken
+	}
+
+	consumed := false
+	for !consumed {
+		if p.inForeignContent() {
+			consumed = parseForeignContent(p)
+		} else {
+			consumed = p.im(p)
+		}
+	}
+
+	if p.hasSelfClosingToken {
+		// This is a parse error, but ignore it.
+		p.hasSelfClosingToken = false
+	}
+}
+
+func (p *parser) parse() error {
+	// Iterate until EOF. Any other error will cause an early return.
+	var err error
+	for err != io.EOF {
+		// CDATA sections are allowed only in foreign content.
+		n := p.oe.top()
+		p.tokenizer.AllowCDATA(n != nil && n.Namespace != "")
+		// Read and parse the next token.
+		p.tokenizer.Next()
+		p.tok = p.tokenizer.Token()
+		if p.tok.Type == ErrorToken {
+			err = p.tokenizer.Err()
+			if err != nil && err != io.EOF {
+				return err
+			}
+		}
+		p.parseCurrentToken()
+	}
+	return nil
+}
+
+// Parse returns the parse tree for the HTML from the given Reader.
+// The input is assumed to be UTF-8 encoded.
+func Parse(r io.Reader) (*Node, error) {
+	p := &parser{
+		tokenizer: NewTokenizer(r),
+		doc: &Node{
+			Type: DocumentNode,
+		},
+		scripting:  true,
+		framesetOK: true,
+		im:         initialIM,
+	}
+	err := p.parse()
+	if err != nil {
+		return nil, err
+	}
+	return p.doc, nil
+}
+
+// ParseFragment parses a fragment of HTML and returns the nodes that were
+// found. If the fragment is the InnerHTML for an existing element, pass that
+// element in context.
+func ParseFragment(r io.Reader, context *Node) ([]*Node, error) {
+	contextTag := ""
+	if context != nil {
+		if context.Type != ElementNode {
+			return nil, errors.New("html: ParseFragment of non-element Node")
+		}
+		// The next check isn't just context.DataAtom.String() == context.Data because
+		// it is valid to pass an element whose tag isn't a known atom. For example,
+		// DataAtom == 0 and Data = "tagfromthefuture" is perfectly consistent.
+		if context.DataAtom != a.Lookup([]byte(context.Data)) {
+			return nil, fmt.Errorf("html: inconsistent Node: DataAtom=%q, Data=%q", context.DataAtom, context.Data)
+		}
+		contextTag = context.DataAtom.String()
+	}
+	p := &parser{
+		tokenizer: NewTokenizerFragment(r, contextTag),
+		doc: &Node{
+			Type: DocumentNode,
+		},
+		scripting: true,
+		fragment:  true,
+		context:   context,
+	}
+
+	root := &Node{
+		Type:     ElementNode,
+		DataAtom: a.Html,
+		Data:     a.Html.String(),
+	}
+	p.doc.AppendChild(root)
+	p.oe = nodeStack{root}
+	p.resetInsertionMode()
+
+	for n := context; n != nil; n = n.Parent {
+		if n.Type == ElementNode && n.DataAtom == a.Form {
+			p.form = n
+			break
+		}
+	}
+
+	err := p.parse()
+	if err != nil {
+		return nil, err
+	}
+
+	parent := p.doc
+	if context != nil {
+		parent = root
+	}
+
+	var result []*Node
+	for c := parent.FirstChild; c != nil; {
+		next := c.NextSibling
+		parent.RemoveChild(c)
+		result = append(result, c)
+		c = next
+	}
+	return result, nil
+}
diff --git a/vendor/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go
new file mode 100644
index 0000000000..d34564f49d
--- /dev/null
+++ b/vendor/golang.org/x/net/html/render.go
@@ -0,0 +1,271 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io"
+	"strings"
+)
+
+type writer interface {
+	io.Writer
+	io.ByteWriter
+	WriteString(string) (int, error)
+}
+
+// Render renders the parse tree n to the given writer.
+//
+// Rendering is done on a 'best effort' basis: calling Parse on the output of
+// Render will always result in something similar to the original tree, but it
+// is not necessarily an exact clone unless the original tree was 'well-formed'.
+// 'Well-formed' is not easily specified; the HTML5 specification is
+// complicated.
+//
+// Calling Parse on arbitrary input typically results in a 'well-formed' parse
+// tree. However, it is possible for Parse to yield a 'badly-formed' parse tree.
+// For example, in a 'well-formed' parse tree, no <a> element is a child of
+// another <a> element: parsing "<a><a>" results in two sibling elements.
+// Similarly, in a 'well-formed' parse tree, no <a> element is a child of a
+// <table> element: parsing "<p><table><a>" results in a <p> with two sibling
+// children; the <a> is reparented to the <table>'s parent. However, calling
+// Parse on "<a><table><a>" does not return an error, but the result has an <a>
+// element with an <a> child, and is therefore not 'well-formed'.
+//
+// Programmatically constructed trees are typically also 'well-formed', but it
+// is possible to construct a tree that looks innocuous but, when rendered and
+// re-parsed, results in a different tree. A simple example is that a solitary
+// text node would become a tree containing <html>, <head> and <body> elements.
+// Another example is that the programmatic equivalent of "a<head>b</head>c"
+// becomes "<html><head><head/><body>abc</body></html>".
+func Render(w io.Writer, n *Node) error {
+	if x, ok := w.(writer); ok {
+		return render(x, n)
+	}
+	buf := bufio.NewWriter(w)
+	if err := render(buf, n); err != nil {
+		return err
+	}
+	return buf.Flush()
+}
+
+// plaintextAbort is returned from render1 when a <plaintext> element
+// has been rendered. No more end tags should be rendered after that.
+var plaintextAbort = errors.New("html: internal error (plaintext abort)")
+
+func render(w writer, n *Node) error {
+	err := render1(w, n)
+	if err == plaintextAbort {
+		err = nil
+	}
+	return err
+}
+
+func render1(w writer, n *Node) error {
+	// Render non-element nodes; these are the easy cases.
+	switch n.Type {
+	case ErrorNode:
+		return errors.New("html: cannot render an ErrorNode node")
+	case TextNode:
+		return escape(w, n.Data)
+	case DocumentNode:
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			if err := render1(w, c); err != nil {
+				return err
+			}
+		}
+		return nil
+	case ElementNode:
+		// No-op.
+	case CommentNode:
+		if _, err := w.WriteString("<!--"); err != nil {
+			return err
+		}
+		if _, err := w.WriteString(n.Data); err != nil {
+			return err
+		}
+		if _, err := w.WriteString("-->"); err != nil {
+			return err
+		}
+		return nil
+	case DoctypeNode:
+		if _, err := w.WriteString("<!DOCTYPE "); err != nil {
+			return err
+		}
+		if _, err := w.WriteString(n.Data); err != nil {
+			return err
+		}
+		if n.Attr != nil {
+			var p, s string
+			for _, a := range n.Attr {
+				switch a.Key {
+				case "public":
+					p = a.Val
+				case "system":
+					s = a.Val
+				}
+			}
+			if p != "" {
+				if _, err := w.WriteString(" PUBLIC "); err != nil {
+					return err
+				}
+				if err := writeQuoted(w, p); err != nil {
+					return err
+				}
+				if s != "" {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+					if err := writeQuoted(w, s); err != nil {
+						return err
+					}
+				}
+			} else if s != "" {
+				if _, err := w.WriteString(" SYSTEM "); err != nil {
+					return err
+				}
+				if err := writeQuoted(w, s); err != nil {
+					return err
+				}
+			}
+		}
+		return w.WriteByte('>')
+	default:
+		return errors.New("html: unknown node type")
+	}
+
+	// Render the <xxx> opening tag.
+	if err := w.WriteByte('<'); err != nil {
+		return err
+	}
+	if _, err := w.WriteString(n.Data); err != nil {
+		return err
+	}
+	for _, a := range n.Attr {
+		if err := w.WriteByte(' '); err != nil {
+			return err
+		}
+		if a.Namespace != "" {
+			if _, err := w.WriteString(a.Namespace); err != nil {
+				return err
+			}
+			if err := w.WriteByte(':'); err != nil {
+				return err
+			}
+		}
+		if _, err := w.WriteString(a.Key); err != nil {
+			return err
+		}
+		if _, err := w.WriteString(`="`); err != nil {
+			return err
+		}
+		if err := escape(w, a.Val); err != nil {
+			return err
+		}
+		if err := w.WriteByte('"'); err != nil {
+			return err
+		}
+	}
+	if voidElements[n.Data] {
+		if n.FirstChild != nil {
+			return fmt.Errorf("html: void element <%s> has child nodes", n.Data)
+		}
+		_, err := w.WriteString("/>")
+		return err
+	}
+	if err := w.WriteByte('>'); err != nil {
+		return err
+	}
+
+	// Add initial newline where there is danger of a newline beging ignored.
+	if c := n.FirstChild; c != nil && c.Type == TextNode && strings.HasPrefix(c.Data, "\n") {
+		switch n.Data {
+		case "pre", "listing", "textarea":
+			if err := w.WriteByte('\n'); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Render any child nodes.
+	switch n.Data {
+	case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			if c.Type == TextNode {
+				if _, err := w.WriteString(c.Data); err != nil {
+					return err
+				}
+			} else {
+				if err := render1(w, c); err != nil {
+					return err
+				}
+			}
+		}
+		if n.Data == "plaintext" {
+			// Don't render anything else. <plaintext> must be the
+			// last element in the file, with no closing tag.
+			return plaintextAbort
+		}
+	default:
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			if err := render1(w, c); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Render the </xxx> closing tag.
+	if _, err := w.WriteString("</"); err != nil {
+		return err
+	}
+	if _, err := w.WriteString(n.Data); err != nil {
+		return err
+	}
+	return w.WriteByte('>')
+}
+
+// writeQuoted writes s to w surrounded by quotes. Normally it will use double
+// quotes, but if s contains a double quote, it will use single quotes.
+// It is used for writing the identifiers in a doctype declaration.
+// In valid HTML, they can't contain both types of quotes.
+func writeQuoted(w writer, s string) error {
+	var q byte = '"'
+	if strings.Contains(s, `"`) {
+		q = '\''
+	}
+	if err := w.WriteByte(q); err != nil {
+		return err
+	}
+	if _, err := w.WriteString(s); err != nil {
+		return err
+	}
+	if err := w.WriteByte(q); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Section 12.1.2, "Elements", gives this list of void elements. Void elements
+// are those that can't have any contents.
+var voidElements = map[string]bool{
+	"area":    true,
+	"base":    true,
+	"br":      true,
+	"col":     true,
+	"command": true,
+	"embed":   true,
+	"hr":      true,
+	"img":     true,
+	"input":   true,
+	"keygen":  true,
+	"link":    true,
+	"meta":    true,
+	"param":   true,
+	"source":  true,
+	"track":   true,
+	"wbr":     true,
+}
diff --git a/vendor/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go
new file mode 100644
index 0000000000..893e272a9e
--- /dev/null
+++ b/vendor/golang.org/x/net/html/token.go
@@ -0,0 +1,1219 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"strconv"
+	"strings"
+
+	"golang.org/x/net/html/atom"
+)
+
+// A TokenType is the type of a Token.
+type TokenType uint32
+
+const (
+	// ErrorToken means that an error occurred during tokenization.
+	ErrorToken TokenType = iota
+	// TextToken means a text node.
+	TextToken
+	// A StartTagToken looks like <a>.
+	StartTagToken
+	// An EndTagToken looks like </a>.
+	EndTagToken
+	// A SelfClosingTagToken tag looks like <br/>.
+	SelfClosingTagToken
+	// A CommentToken looks like <!--x-->.
+	CommentToken
+	// A DoctypeToken looks like <!DOCTYPE x>
+	DoctypeToken
+)
+
+// ErrBufferExceeded means that the buffering limit was exceeded.
+var ErrBufferExceeded = errors.New("max buffer exceeded")
+
+// String returns a string representation of the TokenType.
+func (t TokenType) String() string {
+	switch t {
+	case ErrorToken:
+		return "Error"
+	case TextToken:
+		return "Text"
+	case StartTagToken:
+		return "StartTag"
+	case EndTagToken:
+		return "EndTag"
+	case SelfClosingTagToken:
+		return "SelfClosingTag"
+	case CommentToken:
+		return "Comment"
+	case DoctypeToken:
+		return "Doctype"
+	}
+	return "Invalid(" + strconv.Itoa(int(t)) + ")"
+}
+
+// An Attribute is an attribute namespace-key-value triple. Namespace is
+// non-empty for foreign attributes like xlink, Key is alphabetic (and hence
+// does not contain escapable characters like '&', '<' or '>'), and Val is
+// unescaped (it looks like "a<b" rather than "a&lt;b").
+//
+// Namespace is only used by the parser, not the tokenizer.
+type Attribute struct {
+	Namespace, Key, Val string
+}
+
+// A Token consists of a TokenType and some Data (tag name for start and end
+// tags, content for text, comments and doctypes). A tag Token may also contain
+// a slice of Attributes. Data is unescaped for all Tokens (it looks like "a<b"
+// rather than "a&lt;b"). For tag Tokens, DataAtom is the atom for Data, or
+// zero if Data is not a known tag name.
+type Token struct {
+	Type     TokenType
+	DataAtom atom.Atom
+	Data     string
+	Attr     []Attribute
+}
+
+// tagString returns a string representation of a tag Token's Data and Attr.
+func (t Token) tagString() string {
+	if len(t.Attr) == 0 {
+		return t.Data
+	}
+	buf := bytes.NewBufferString(t.Data)
+	for _, a := range t.Attr {
+		buf.WriteByte(' ')
+		buf.WriteString(a.Key)
+		buf.WriteString(`="`)
+		escape(buf, a.Val)
+		buf.WriteByte('"')
+	}
+	return buf.String()
+}
+
+// String returns a string representation of the Token.
+func (t Token) String() string {
+	switch t.Type {
+	case ErrorToken:
+		return ""
+	case TextToken:
+		return EscapeString(t.Data)
+	case StartTagToken:
+		return "<" + t.tagString() + ">"
+	case EndTagToken:
+		return "</" + t.tagString() + ">"
+	case SelfClosingTagToken:
+		return "<" + t.tagString() + "/>"
+	case CommentToken:
+		return "<!--" + t.Data + "-->"
+	case DoctypeToken:
+		return "<!DOCTYPE " + t.Data + ">"
+	}
+	return "Invalid(" + strconv.Itoa(int(t.Type)) + ")"
+}
+
+// span is a range of bytes in a Tokenizer's buffer. The start is inclusive,
+// the end is exclusive.
+type span struct {
+	start, end int
+}
+
+// A Tokenizer returns a stream of HTML Tokens.
+type Tokenizer struct {
+	// r is the source of the HTML text.
+	r io.Reader
+	// tt is the TokenType of the current token.
+	tt TokenType
+	// err is the first error encountered during tokenization. It is possible
+	// for tt != Error && err != nil to hold: this means that Next returned a
+	// valid token but the subsequent Next call will return an error token.
+	// For example, if the HTML text input was just "plain", then the first
+	// Next call would set z.err to io.EOF but return a TextToken, and all
+	// subsequent Next calls would return an ErrorToken.
+	// err is never reset. Once it becomes non-nil, it stays non-nil.
+	err error
+	// readErr is the error returned by the io.Reader r. It is separate from
+	// err because it is valid for an io.Reader to return (n int, err1 error)
+	// such that n > 0 && err1 != nil, and callers should always process the
+	// n > 0 bytes before considering the error err1.
+	readErr error
+	// buf[raw.start:raw.end] holds the raw bytes of the current token.
+	// buf[raw.end:] is buffered input that will yield future tokens.
+	raw span
+	buf []byte
+	// maxBuf limits the data buffered in buf. A value of 0 means unlimited.
+	maxBuf int
+	// buf[data.start:data.end] holds the raw bytes of the current token's data:
+	// a text token's text, a tag token's tag name, etc.
+	data span
+	// pendingAttr is the attribute key and value currently being tokenized.
+	// When complete, pendingAttr is pushed onto attr. nAttrReturned is
+	// incremented on each call to TagAttr.
+	pendingAttr   [2]span
+	attr          [][2]span
+	nAttrReturned int
+	// rawTag is the "script" in "</script>" that closes the next token. If
+	// non-empty, the subsequent call to Next will return a raw or RCDATA text
+	// token: one that treats "<p>" as text instead of an element.
+	// rawTag's contents are lower-cased.
+	rawTag string
+	// textIsRaw is whether the current text token's data is not escaped.
+	textIsRaw bool
+	// convertNUL is whether NUL bytes in the current token's data should
+	// be converted into \ufffd replacement characters.
+	convertNUL bool
+	// allowCDATA is whether CDATA sections are allowed in the current context.
+	allowCDATA bool
+}
+
+// AllowCDATA sets whether or not the tokenizer recognizes <![CDATA[foo]]> as
+// the text "foo". The default value is false, which means to recognize it as
+// a bogus comment "<!-- [CDATA[foo]] -->" instead.
+//
+// Strictly speaking, an HTML5 compliant tokenizer should allow CDATA if and
+// only if tokenizing foreign content, such as MathML and SVG. However,
+// tracking foreign-contentness is difficult to do purely in the tokenizer,
+// as opposed to the parser, due to HTML integration points: an <svg> element
+// can contain a <foreignObject> that is foreign-to-SVG but not foreign-to-
+// HTML. For strict compliance with the HTML5 tokenization algorithm, it is the
+// responsibility of the user of a tokenizer to call AllowCDATA as appropriate.
+// In practice, if using the tokenizer without caring whether MathML or SVG
+// CDATA is text or comments, such as tokenizing HTML to find all the anchor
+// text, it is acceptable to ignore this responsibility.
+func (z *Tokenizer) AllowCDATA(allowCDATA bool) {
+	z.allowCDATA = allowCDATA
+}
+
+// NextIsNotRawText instructs the tokenizer that the next token should not be
+// considered as 'raw text'. Some elements, such as script and title elements,
+// normally require the next token after the opening tag to be 'raw text' that
+// has no child elements. For example, tokenizing "<title>a<b>c</b>d</title>"
+// yields a start tag token for "<title>", a text token for "a<b>c</b>d", and
+// an end tag token for "</title>". There are no distinct start tag or end tag
+// tokens for the "<b>" and "</b>".
+//
+// This tokenizer implementation will generally look for raw text at the right
+// times. Strictly speaking, an HTML5 compliant tokenizer should not look for
+// raw text if in foreign content: <title> generally needs raw text, but a
+// <title> inside an <svg> does not. Another example is that a <textarea>
+// generally needs raw text, but a <textarea> is not allowed as an immediate
+// child of a <select>; in normal parsing, a <textarea> implies </select>, but
+// one cannot close the implicit element when parsing a <select>'s InnerHTML.
+// Similarly to AllowCDATA, tracking the correct moment to override raw-text-
+// ness is difficult to do purely in the tokenizer, as opposed to the parser.
+// For strict compliance with the HTML5 tokenization algorithm, it is the
+// responsibility of the user of a tokenizer to call NextIsNotRawText as
+// appropriate. In practice, like AllowCDATA, it is acceptable to ignore this
+// responsibility for basic usage.
+//
+// Note that this 'raw text' concept is different from the one offered by the
+// Tokenizer.Raw method.
+func (z *Tokenizer) NextIsNotRawText() {
+	z.rawTag = ""
+}
+
+// Err returns the error associated with the most recent ErrorToken token.
+// This is typically io.EOF, meaning the end of tokenization.
+func (z *Tokenizer) Err() error {
+	if z.tt != ErrorToken {
+		return nil
+	}
+	return z.err
+}
+
+// readByte returns the next byte from the input stream, doing a buffered read
+// from z.r into z.buf if necessary. z.buf[z.raw.start:z.raw.end] remains a contiguous byte
+// slice that holds all the bytes read so far for the current token.
+// It sets z.err if the underlying reader returns an error.
+// Pre-condition: z.err == nil.
+func (z *Tokenizer) readByte() byte {
+	if z.raw.end >= len(z.buf) {
+		// Our buffer is exhausted and we have to read from z.r. Check if the
+		// previous read resulted in an error.
+		if z.readErr != nil {
+			z.err = z.readErr
+			return 0
+		}
+		// We copy z.buf[z.raw.start:z.raw.end] to the beginning of z.buf. If the length
+		// z.raw.end - z.raw.start is more than half the capacity of z.buf, then we
+		// allocate a new buffer before the copy.
+		c := cap(z.buf)
+		d := z.raw.end - z.raw.start
+		var buf1 []byte
+		if 2*d > c {
+			buf1 = make([]byte, d, 2*c)
+		} else {
+			buf1 = z.buf[:d]
+		}
+		copy(buf1, z.buf[z.raw.start:z.raw.end])
+		if x := z.raw.start; x != 0 {
+			// Adjust the data/attr spans to refer to the same contents after the copy.
+			z.data.start -= x
+			z.data.end -= x
+			z.pendingAttr[0].start -= x
+			z.pendingAttr[0].end -= x
+			z.pendingAttr[1].start -= x
+			z.pendingAttr[1].end -= x
+			for i := range z.attr {
+				z.attr[i][0].start -= x
+				z.attr[i][0].end -= x
+				z.attr[i][1].start -= x
+				z.attr[i][1].end -= x
+			}
+		}
+		z.raw.start, z.raw.end, z.buf = 0, d, buf1[:d]
+		// Now that we have copied the live bytes to the start of the buffer,
+		// we read from z.r into the remainder.
+		var n int
+		n, z.readErr = readAtLeastOneByte(z.r, buf1[d:cap(buf1)])
+		if n == 0 {
+			z.err = z.readErr
+			return 0
+		}
+		z.buf = buf1[:d+n]
+	}
+	x := z.buf[z.raw.end]
+	z.raw.end++
+	if z.maxBuf > 0 && z.raw.end-z.raw.start >= z.maxBuf {
+		z.err = ErrBufferExceeded
+		return 0
+	}
+	return x
+}
+
+// Buffered returns a slice containing data buffered but not yet tokenized.
+func (z *Tokenizer) Buffered() []byte {
+	return z.buf[z.raw.end:]
+}
+
+// readAtLeastOneByte wraps an io.Reader so that reading cannot return (0, nil).
+// It returns io.ErrNoProgress if the underlying r.Read method returns (0, nil)
+// too many times in succession.
+func readAtLeastOneByte(r io.Reader, b []byte) (int, error) {
+	for i := 0; i < 100; i++ {
+		n, err := r.Read(b)
+		if n != 0 || err != nil {
+			return n, err
+		}
+	}
+	return 0, io.ErrNoProgress
+}
+
+// skipWhiteSpace skips past any white space.
+func (z *Tokenizer) skipWhiteSpace() {
+	if z.err != nil {
+		return
+	}
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			return
+		}
+		switch c {
+		case ' ', '\n', '\r', '\t', '\f':
+			// No-op.
+		default:
+			z.raw.end--
+			return
+		}
+	}
+}
+
+// readRawOrRCDATA reads until the next "</foo>", where "foo" is z.rawTag and
+// is typically something like "script" or "textarea".
+func (z *Tokenizer) readRawOrRCDATA() {
+	if z.rawTag == "script" {
+		z.readScript()
+		z.textIsRaw = true
+		z.rawTag = ""
+		return
+	}
+loop:
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			break loop
+		}
+		if c != '<' {
+			continue loop
+		}
+		c = z.readByte()
+		if z.err != nil {
+			break loop
+		}
+		if c != '/' {
+			continue loop
+		}
+		if z.readRawEndTag() || z.err != nil {
+			break loop
+		}
+	}
+	z.data.end = z.raw.end
+	// A textarea's or title's RCDATA can contain escaped entities.
+	z.textIsRaw = z.rawTag != "textarea" && z.rawTag != "title"
+	z.rawTag = ""
+}
+
+// readRawEndTag attempts to read a tag like "</foo>", where "foo" is z.rawTag.
+// If it succeeds, it backs up the input position to reconsume the tag and
+// returns true. Otherwise it returns false. The opening "</" has already been
+// consumed.
+func (z *Tokenizer) readRawEndTag() bool {
+	for i := 0; i < len(z.rawTag); i++ {
+		c := z.readByte()
+		if z.err != nil {
+			return false
+		}
+		if c != z.rawTag[i] && c != z.rawTag[i]-('a'-'A') {
+			z.raw.end--
+			return false
+		}
+	}
+	c := z.readByte()
+	if z.err != nil {
+		return false
+	}
+	switch c {
+	case ' ', '\n', '\r', '\t', '\f', '/', '>':
+		// The 3 is 2 for the leading "</" plus 1 for the trailing character c.
+		z.raw.end -= 3 + len(z.rawTag)
+		return true
+	}
+	z.raw.end--
+	return false
+}
+
+// readScript reads until the next </script> tag, following the byzantine
+// rules for escaping/hiding the closing tag.
+func (z *Tokenizer) readScript() {
+	defer func() {
+		z.data.end = z.raw.end
+	}()
+	var c byte
+
+scriptData:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '<' {
+		goto scriptDataLessThanSign
+	}
+	goto scriptData
+
+scriptDataLessThanSign:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '/':
+		goto scriptDataEndTagOpen
+	case '!':
+		goto scriptDataEscapeStart
+	}
+	z.raw.end--
+	goto scriptData
+
+scriptDataEndTagOpen:
+	if z.readRawEndTag() || z.err != nil {
+		return
+	}
+	goto scriptData
+
+scriptDataEscapeStart:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '-' {
+		goto scriptDataEscapeStartDash
+	}
+	z.raw.end--
+	goto scriptData
+
+scriptDataEscapeStartDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '-' {
+		goto scriptDataEscapedDashDash
+	}
+	z.raw.end--
+	goto scriptData
+
+scriptDataEscaped:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataEscapedDash
+	case '<':
+		goto scriptDataEscapedLessThanSign
+	}
+	goto scriptDataEscaped
+
+scriptDataEscapedDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataEscapedDashDash
+	case '<':
+		goto scriptDataEscapedLessThanSign
+	}
+	goto scriptDataEscaped
+
+scriptDataEscapedDashDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataEscapedDashDash
+	case '<':
+		goto scriptDataEscapedLessThanSign
+	case '>':
+		goto scriptData
+	}
+	goto scriptDataEscaped
+
+scriptDataEscapedLessThanSign:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '/' {
+		goto scriptDataEscapedEndTagOpen
+	}
+	if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
+		goto scriptDataDoubleEscapeStart
+	}
+	z.raw.end--
+	goto scriptData
+
+scriptDataEscapedEndTagOpen:
+	if z.readRawEndTag() || z.err != nil {
+		return
+	}
+	goto scriptDataEscaped
+
+scriptDataDoubleEscapeStart:
+	z.raw.end--
+	for i := 0; i < len("script"); i++ {
+		c = z.readByte()
+		if z.err != nil {
+			return
+		}
+		if c != "script"[i] && c != "SCRIPT"[i] {
+			z.raw.end--
+			goto scriptDataEscaped
+		}
+	}
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case ' ', '\n', '\r', '\t', '\f', '/', '>':
+		goto scriptDataDoubleEscaped
+	}
+	z.raw.end--
+	goto scriptDataEscaped
+
+scriptDataDoubleEscaped:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataDoubleEscapedDash
+	case '<':
+		goto scriptDataDoubleEscapedLessThanSign
+	}
+	goto scriptDataDoubleEscaped
+
+scriptDataDoubleEscapedDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataDoubleEscapedDashDash
+	case '<':
+		goto scriptDataDoubleEscapedLessThanSign
+	}
+	goto scriptDataDoubleEscaped
+
+scriptDataDoubleEscapedDashDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataDoubleEscapedDashDash
+	case '<':
+		goto scriptDataDoubleEscapedLessThanSign
+	case '>':
+		goto scriptData
+	}
+	goto scriptDataDoubleEscaped
+
+scriptDataDoubleEscapedLessThanSign:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '/' {
+		goto scriptDataDoubleEscapeEnd
+	}
+	z.raw.end--
+	goto scriptDataDoubleEscaped
+
+scriptDataDoubleEscapeEnd:
+	if z.readRawEndTag() {
+		z.raw.end += len("</script>")
+		goto scriptDataEscaped
+	}
+	if z.err != nil {
+		return
+	}
+	goto scriptDataDoubleEscaped
+}
+
+// readComment reads the next comment token starting with "<!--". The opening
+// "<!--" has already been consumed.
+func (z *Tokenizer) readComment() {
+	z.data.start = z.raw.end
+	defer func() {
+		if z.data.end < z.data.start {
+			// It's a comment with no data, like <!-->.
+			z.data.end = z.data.start
+		}
+	}()
+	for dashCount := 2; ; {
+		c := z.readByte()
+		if z.err != nil {
+			// Ignore up to two dashes at EOF.
+			if dashCount > 2 {
+				dashCount = 2
+			}
+			z.data.end = z.raw.end - dashCount
+			return
+		}
+		switch c {
+		case '-':
+			dashCount++
+			continue
+		case '>':
+			if dashCount >= 2 {
+				z.data.end = z.raw.end - len("-->")
+				return
+			}
+		case '!':
+			if dashCount >= 2 {
+				c = z.readByte()
+				if z.err != nil {
+					z.data.end = z.raw.end
+					return
+				}
+				if c == '>' {
+					z.data.end = z.raw.end - len("--!>")
+					return
+				}
+			}
+		}
+		dashCount = 0
+	}
+}
+
+// readUntilCloseAngle reads until the next ">".
+func (z *Tokenizer) readUntilCloseAngle() {
+	z.data.start = z.raw.end
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return
+		}
+		if c == '>' {
+			z.data.end = z.raw.end - len(">")
+			return
+		}
+	}
+}
+
+// readMarkupDeclaration reads the next token starting with "<!". It might be
+// a "<!--comment-->", a "<!DOCTYPE foo>", a "<![CDATA[section]]>" or
+// "<!a bogus comment". The opening "<!" has already been consumed.
+func (z *Tokenizer) readMarkupDeclaration() TokenType {
+	z.data.start = z.raw.end
+	var c [2]byte
+	for i := 0; i < 2; i++ {
+		c[i] = z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return CommentToken
+		}
+	}
+	if c[0] == '-' && c[1] == '-' {
+		z.readComment()
+		return CommentToken
+	}
+	z.raw.end -= 2
+	if z.readDoctype() {
+		return DoctypeToken
+	}
+	if z.allowCDATA && z.readCDATA() {
+		z.convertNUL = true
+		return TextToken
+	}
+	// It's a bogus comment.
+	z.readUntilCloseAngle()
+	return CommentToken
+}
+
+// readDoctype attempts to read a doctype declaration and returns true if
+// successful. The opening "<!" has already been consumed.
+func (z *Tokenizer) readDoctype() bool {
+	const s = "DOCTYPE"
+	for i := 0; i < len(s); i++ {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return false
+		}
+		if c != s[i] && c != s[i]+('a'-'A') {
+			// Back up to read the fragment of "DOCTYPE" again.
+			z.raw.end = z.data.start
+			return false
+		}
+	}
+	if z.skipWhiteSpace(); z.err != nil {
+		z.data.start = z.raw.end
+		z.data.end = z.raw.end
+		return true
+	}
+	z.readUntilCloseAngle()
+	return true
+}
+
+// readCDATA attempts to read a CDATA section and returns true if
+// successful. The opening "<!" has already been consumed.
+func (z *Tokenizer) readCDATA() bool {
+	const s = "[CDATA["
+	for i := 0; i < len(s); i++ {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return false
+		}
+		if c != s[i] {
+			// Back up to read the fragment of "[CDATA[" again.
+			z.raw.end = z.data.start
+			return false
+		}
+	}
+	z.data.start = z.raw.end
+	brackets := 0
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return true
+		}
+		switch c {
+		case ']':
+			brackets++
+		case '>':
+			if brackets >= 2 {
+				z.data.end = z.raw.end - len("]]>")
+				return true
+			}
+			brackets = 0
+		default:
+			brackets = 0
+		}
+	}
+}
+
+// startTagIn returns whether the start tag in z.buf[z.data.start:z.data.end]
+// case-insensitively matches any element of ss.
+func (z *Tokenizer) startTagIn(ss ...string) bool {
+loop:
+	for _, s := range ss {
+		if z.data.end-z.data.start != len(s) {
+			continue loop
+		}
+		for i := 0; i < len(s); i++ {
+			c := z.buf[z.data.start+i]
+			if 'A' <= c && c <= 'Z' {
+				c += 'a' - 'A'
+			}
+			if c != s[i] {
+				continue loop
+			}
+		}
+		return true
+	}
+	return false
+}
+
+// readStartTag reads the next start tag token. The opening "<a" has already
+// been consumed, where 'a' means anything in [A-Za-z].
+func (z *Tokenizer) readStartTag() TokenType {
+	z.readTag(true)
+	if z.err != nil {
+		return ErrorToken
+	}
+	// Several tags flag the tokenizer's next token as raw.
+	c, raw := z.buf[z.data.start], false
+	if 'A' <= c && c <= 'Z' {
+		c += 'a' - 'A'
+	}
+	switch c {
+	case 'i':
+		raw = z.startTagIn("iframe")
+	case 'n':
+		raw = z.startTagIn("noembed", "noframes", "noscript")
+	case 'p':
+		raw = z.startTagIn("plaintext")
+	case 's':
+		raw = z.startTagIn("script", "style")
+	case 't':
+		raw = z.startTagIn("textarea", "title")
+	case 'x':
+		raw = z.startTagIn("xmp")
+	}
+	if raw {
+		z.rawTag = strings.ToLower(string(z.buf[z.data.start:z.data.end]))
+	}
+	// Look for a self-closing token like "<br/>".
+	if z.err == nil && z.buf[z.raw.end-2] == '/' {
+		return SelfClosingTagToken
+	}
+	return StartTagToken
+}
+
+// readTag reads the next tag token and its attributes. If saveAttr, those
+// attributes are saved in z.attr, otherwise z.attr is set to an empty slice.
+// The opening "<a" or "</a" has already been consumed, where 'a' means anything
+// in [A-Za-z].
+func (z *Tokenizer) readTag(saveAttr bool) {
+	z.attr = z.attr[:0]
+	z.nAttrReturned = 0
+	// Read the tag name and attribute key/value pairs.
+	z.readTagName()
+	if z.skipWhiteSpace(); z.err != nil {
+		return
+	}
+	for {
+		c := z.readByte()
+		if z.err != nil || c == '>' {
+			break
+		}
+		z.raw.end--
+		z.readTagAttrKey()
+		z.readTagAttrVal()
+		// Save pendingAttr if saveAttr and that attribute has a non-empty key.
+		if saveAttr && z.pendingAttr[0].start != z.pendingAttr[0].end {
+			z.attr = append(z.attr, z.pendingAttr)
+		}
+		if z.skipWhiteSpace(); z.err != nil {
+			break
+		}
+	}
+}
+
+// readTagName sets z.data to the "div" in "<div k=v>". The reader (z.raw.end)
+// is positioned such that the first byte of the tag name (the "d" in "<div")
+// has already been consumed.
+func (z *Tokenizer) readTagName() {
+	z.data.start = z.raw.end - 1
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return
+		}
+		switch c {
+		case ' ', '\n', '\r', '\t', '\f':
+			z.data.end = z.raw.end - 1
+			return
+		case '/', '>':
+			z.raw.end--
+			z.data.end = z.raw.end
+			return
+		}
+	}
+}
+
+// readTagAttrKey sets z.pendingAttr[0] to the "k" in "<div k=v>".
+// Precondition: z.err == nil.
+func (z *Tokenizer) readTagAttrKey() {
+	z.pendingAttr[0].start = z.raw.end
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			z.pendingAttr[0].end = z.raw.end
+			return
+		}
+		switch c {
+		case ' ', '\n', '\r', '\t', '\f', '/':
+			z.pendingAttr[0].end = z.raw.end - 1
+			return
+		case '=', '>':
+			z.raw.end--
+			z.pendingAttr[0].end = z.raw.end
+			return
+		}
+	}
+}
+
+// readTagAttrVal sets z.pendingAttr[1] to the "v" in "<div k=v>".
+func (z *Tokenizer) readTagAttrVal() {
+	z.pendingAttr[1].start = z.raw.end
+	z.pendingAttr[1].end = z.raw.end
+	if z.skipWhiteSpace(); z.err != nil {
+		return
+	}
+	c := z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c != '=' {
+		z.raw.end--
+		return
+	}
+	if z.skipWhiteSpace(); z.err != nil {
+		return
+	}
+	quote := z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch quote {
+	case '>':
+		z.raw.end--
+		return
+
+	case '\'', '"':
+		z.pendingAttr[1].start = z.raw.end
+		for {
+			c := z.readByte()
+			if z.err != nil {
+				z.pendingAttr[1].end = z.raw.end
+				return
+			}
+			if c == quote {
+				z.pendingAttr[1].end = z.raw.end - 1
+				return
+			}
+		}
+
+	default:
+		z.pendingAttr[1].start = z.raw.end - 1
+		for {
+			c := z.readByte()
+			if z.err != nil {
+				z.pendingAttr[1].end = z.raw.end
+				return
+			}
+			switch c {
+			case ' ', '\n', '\r', '\t', '\f':
+				z.pendingAttr[1].end = z.raw.end - 1
+				return
+			case '>':
+				z.raw.end--
+				z.pendingAttr[1].end = z.raw.end
+				return
+			}
+		}
+	}
+}
+
+// Next scans the next token and returns its type.
+func (z *Tokenizer) Next() TokenType {
+	z.raw.start = z.raw.end
+	z.data.start = z.raw.end
+	z.data.end = z.raw.end
+	if z.err != nil {
+		z.tt = ErrorToken
+		return z.tt
+	}
+	if z.rawTag != "" {
+		if z.rawTag == "plaintext" {
+			// Read everything up to EOF.
+			for z.err == nil {
+				z.readByte()
+			}
+			z.data.end = z.raw.end
+			z.textIsRaw = true
+		} else {
+			z.readRawOrRCDATA()
+		}
+		if z.data.end > z.data.start {
+			z.tt = TextToken
+			z.convertNUL = true
+			return z.tt
+		}
+	}
+	z.textIsRaw = false
+	z.convertNUL = false
+
+loop:
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			break loop
+		}
+		if c != '<' {
+			continue loop
+		}
+
+		// Check if the '<' we have just read is part of a tag, comment
+		// or doctype. If not, it's part of the accumulated text token.
+		c = z.readByte()
+		if z.err != nil {
+			break loop
+		}
+		var tokenType TokenType
+		switch {
+		case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z':
+			tokenType = StartTagToken
+		case c == '/':
+			tokenType = EndTagToken
+		case c == '!' || c == '?':
+			// We use CommentToken to mean any of "<!--actual comments-->",
+			// "<!DOCTYPE declarations>" and "<?xml processing instructions?>".
+			tokenType = CommentToken
+		default:
+			// Reconsume the current character.
+			z.raw.end--
+			continue
+		}
+
+		// We have a non-text token, but we might have accumulated some text
+		// before that. If so, we return the text first, and return the non-
+		// text token on the subsequent call to Next.
+		if x := z.raw.end - len("<a"); z.raw.start < x {
+			z.raw.end = x
+			z.data.end = x
+			z.tt = TextToken
+			return z.tt
+		}
+		switch tokenType {
+		case StartTagToken:
+			z.tt = z.readStartTag()
+			return z.tt
+		case EndTagToken:
+			c = z.readByte()
+			if z.err != nil {
+				break loop
+			}
+			if c == '>' {
+				// "</>" does not generate a token at all. Generate an empty comment
+				// to allow passthrough clients to pick up the data using Raw.
+				// Reset the tokenizer state and start again.
+				z.tt = CommentToken
+				return z.tt
+			}
+			if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
+				z.readTag(false)
+				if z.err != nil {
+					z.tt = ErrorToken
+				} else {
+					z.tt = EndTagToken
+				}
+				return z.tt
+			}
+			z.raw.end--
+			z.readUntilCloseAngle()
+			z.tt = CommentToken
+			return z.tt
+		case CommentToken:
+			if c == '!' {
+				z.tt = z.readMarkupDeclaration()
+				return z.tt
+			}
+			z.raw.end--
+			z.readUntilCloseAngle()
+			z.tt = CommentToken
+			return z.tt
+		}
+	}
+	if z.raw.start < z.raw.end {
+		z.data.end = z.raw.end
+		z.tt = TextToken
+		return z.tt
+	}
+	z.tt = ErrorToken
+	return z.tt
+}
+
+// Raw returns the unmodified text of the current token. Calling Next, Token,
+// Text, TagName or TagAttr may change the contents of the returned slice.
+func (z *Tokenizer) Raw() []byte {
+	return z.buf[z.raw.start:z.raw.end]
+}
+
+// convertNewlines converts "\r" and "\r\n" in s to "\n".
+// The conversion happens in place, but the resulting slice may be shorter.
+func convertNewlines(s []byte) []byte {
+	for i, c := range s {
+		if c != '\r' {
+			continue
+		}
+
+		src := i + 1
+		if src >= len(s) || s[src] != '\n' {
+			s[i] = '\n'
+			continue
+		}
+
+		dst := i
+		for src < len(s) {
+			if s[src] == '\r' {
+				if src+1 < len(s) && s[src+1] == '\n' {
+					src++
+				}
+				s[dst] = '\n'
+			} else {
+				s[dst] = s[src]
+			}
+			src++
+			dst++
+		}
+		return s[:dst]
+	}
+	return s
+}
+
+var (
+	nul         = []byte("\x00")
+	replacement = []byte("\ufffd")
+)
+
+// Text returns the unescaped text of a text, comment or doctype token. The
+// contents of the returned slice may change on the next call to Next.
+func (z *Tokenizer) Text() []byte {
+	switch z.tt {
+	case TextToken, CommentToken, DoctypeToken:
+		s := z.buf[z.data.start:z.data.end]
+		z.data.start = z.raw.end
+		z.data.end = z.raw.end
+		s = convertNewlines(s)
+		if (z.convertNUL || z.tt == CommentToken) && bytes.Contains(s, nul) {
+			s = bytes.Replace(s, nul, replacement, -1)
+		}
+		if !z.textIsRaw {
+			s = unescape(s, false)
+		}
+		return s
+	}
+	return nil
+}
+
+// TagName returns the lower-cased name of a tag token (the `img` out of
+// `<IMG SRC="foo">`) and whether the tag has attributes.
+// The contents of the returned slice may change on the next call to Next.
+func (z *Tokenizer) TagName() (name []byte, hasAttr bool) {
+	if z.data.start < z.data.end {
+		switch z.tt {
+		case StartTagToken, EndTagToken, SelfClosingTagToken:
+			s := z.buf[z.data.start:z.data.end]
+			z.data.start = z.raw.end
+			z.data.end = z.raw.end
+			return lower(s), z.nAttrReturned < len(z.attr)
+		}
+	}
+	return nil, false
+}
+
+// TagAttr returns the lower-cased key and unescaped value of the next unparsed
+// attribute for the current tag token and whether there are more attributes.
+// The contents of the returned slices may change on the next call to Next.
+func (z *Tokenizer) TagAttr() (key, val []byte, moreAttr bool) {
+	if z.nAttrReturned < len(z.attr) {
+		switch z.tt {
+		case StartTagToken, SelfClosingTagToken:
+			x := z.attr[z.nAttrReturned]
+			z.nAttrReturned++
+			key = z.buf[x[0].start:x[0].end]
+			val = z.buf[x[1].start:x[1].end]
+			return lower(key), unescape(convertNewlines(val), true), z.nAttrReturned < len(z.attr)
+		}
+	}
+	return nil, nil, false
+}
+
+// Token returns the next Token. The result's Data and Attr values remain valid
+// after subsequent Next calls.
+func (z *Tokenizer) Token() Token {
+	t := Token{Type: z.tt}
+	switch z.tt {
+	case TextToken, CommentToken, DoctypeToken:
+		t.Data = string(z.Text())
+	case StartTagToken, SelfClosingTagToken, EndTagToken:
+		name, moreAttr := z.TagName()
+		for moreAttr {
+			var key, val []byte
+			key, val, moreAttr = z.TagAttr()
+			t.Attr = append(t.Attr, Attribute{"", atom.String(key), string(val)})
+		}
+		if a := atom.Lookup(name); a != 0 {
+			t.DataAtom, t.Data = a, a.String()
+		} else {
+			t.DataAtom, t.Data = 0, string(name)
+		}
+	}
+	return t
+}
+
+// SetMaxBuf sets a limit on the amount of data buffered during tokenization.
+// A value of 0 means unlimited.
+func (z *Tokenizer) SetMaxBuf(n int) {
+	z.maxBuf = n
+}
+
+// NewTokenizer returns a new HTML Tokenizer for the given Reader.
+// The input is assumed to be UTF-8 encoded.
+func NewTokenizer(r io.Reader) *Tokenizer {
+	return NewTokenizerFragment(r, "")
+}
+
+// NewTokenizerFragment returns a new HTML Tokenizer for the given Reader, for
+// tokenizing an existing element's InnerHTML fragment. contextTag is that
+// element's tag, such as "div" or "iframe".
+//
+// For example, how the InnerHTML "a<b" is tokenized depends on whether it is
+// for a <p> tag or a <script> tag.
+//
+// The input is assumed to be UTF-8 encoded.
+func NewTokenizerFragment(r io.Reader, contextTag string) *Tokenizer {
+	z := &Tokenizer{
+		r:   r,
+		buf: make([]byte, 0, 4096),
+	}
+	if contextTag != "" {
+		switch s := strings.ToLower(contextTag); s {
+		case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "title", "textarea", "xmp":
+			z.rawTag = s
+		}
+	}
+	return z
+}
diff --git a/vendor/golang.org/x/net/http2/client_conn_pool.go b/vendor/golang.org/x/net/http2/client_conn_pool.go
new file mode 100644
index 0000000000..772ea5e924
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/client_conn_pool.go
@@ -0,0 +1,225 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Transport code's client connection pooling.
+
+package http2
+
+import (
+	"crypto/tls"
+	"net/http"
+	"sync"
+)
+
+// ClientConnPool manages a pool of HTTP/2 client connections.
+type ClientConnPool interface {
+	GetClientConn(req *http.Request, addr string) (*ClientConn, error)
+	MarkDead(*ClientConn)
+}
+
+// TODO: use singleflight for dialing and addConnCalls?
+type clientConnPool struct {
+	t *Transport
+
+	mu sync.Mutex // TODO: maybe switch to RWMutex
+	// TODO: add support for sharing conns based on cert names
+	// (e.g. share conn for googleapis.com and appspot.com)
+	conns        map[string][]*ClientConn // key is host:port
+	dialing      map[string]*dialCall     // currently in-flight dials
+	keys         map[*ClientConn][]string
+	addConnCalls map[string]*addConnCall // in-flight addConnIfNeede calls
+}
+
+func (p *clientConnPool) GetClientConn(req *http.Request, addr string) (*ClientConn, error) {
+	return p.getClientConn(req, addr, dialOnMiss)
+}
+
+const (
+	dialOnMiss   = true
+	noDialOnMiss = false
+)
+
+func (p *clientConnPool) getClientConn(_ *http.Request, addr string, dialOnMiss bool) (*ClientConn, error) {
+	p.mu.Lock()
+	for _, cc := range p.conns[addr] {
+		if cc.CanTakeNewRequest() {
+			p.mu.Unlock()
+			return cc, nil
+		}
+	}
+	if !dialOnMiss {
+		p.mu.Unlock()
+		return nil, ErrNoCachedConn
+	}
+	call := p.getStartDialLocked(addr)
+	p.mu.Unlock()
+	<-call.done
+	return call.res, call.err
+}
+
+// dialCall is an in-flight Transport dial call to a host.
+type dialCall struct {
+	p    *clientConnPool
+	done chan struct{} // closed when done
+	res  *ClientConn   // valid after done is closed
+	err  error         // valid after done is closed
+}
+
+// requires p.mu is held.
+func (p *clientConnPool) getStartDialLocked(addr string) *dialCall {
+	if call, ok := p.dialing[addr]; ok {
+		// A dial is already in-flight. Don't start another.
+		return call
+	}
+	call := &dialCall{p: p, done: make(chan struct{})}
+	if p.dialing == nil {
+		p.dialing = make(map[string]*dialCall)
+	}
+	p.dialing[addr] = call
+	go call.dial(addr)
+	return call
+}
+
+// run in its own goroutine.
+func (c *dialCall) dial(addr string) {
+	c.res, c.err = c.p.t.dialClientConn(addr)
+	close(c.done)
+
+	c.p.mu.Lock()
+	delete(c.p.dialing, addr)
+	if c.err == nil {
+		c.p.addConnLocked(addr, c.res)
+	}
+	c.p.mu.Unlock()
+}
+
+// addConnIfNeeded makes a NewClientConn out of c if a connection for key doesn't
+// already exist. It coalesces concurrent calls with the same key.
+// This is used by the http1 Transport code when it creates a new connection. Because
+// the http1 Transport doesn't de-dup TCP dials to outbound hosts (because it doesn't know
+// the protocol), it can get into a situation where it has multiple TLS connections.
+// This code decides which ones live or die.
+// The return value used is whether c was used.
+// c is never closed.
+func (p *clientConnPool) addConnIfNeeded(key string, t *Transport, c *tls.Conn) (used bool, err error) {
+	p.mu.Lock()
+	for _, cc := range p.conns[key] {
+		if cc.CanTakeNewRequest() {
+			p.mu.Unlock()
+			return false, nil
+		}
+	}
+	call, dup := p.addConnCalls[key]
+	if !dup {
+		if p.addConnCalls == nil {
+			p.addConnCalls = make(map[string]*addConnCall)
+		}
+		call = &addConnCall{
+			p:    p,
+			done: make(chan struct{}),
+		}
+		p.addConnCalls[key] = call
+		go call.run(t, key, c)
+	}
+	p.mu.Unlock()
+
+	<-call.done
+	if call.err != nil {
+		return false, call.err
+	}
+	return !dup, nil
+}
+
+type addConnCall struct {
+	p    *clientConnPool
+	done chan struct{} // closed when done
+	err  error
+}
+
+func (c *addConnCall) run(t *Transport, key string, tc *tls.Conn) {
+	cc, err := t.NewClientConn(tc)
+
+	p := c.p
+	p.mu.Lock()
+	if err != nil {
+		c.err = err
+	} else {
+		p.addConnLocked(key, cc)
+	}
+	delete(p.addConnCalls, key)
+	p.mu.Unlock()
+	close(c.done)
+}
+
+func (p *clientConnPool) addConn(key string, cc *ClientConn) {
+	p.mu.Lock()
+	p.addConnLocked(key, cc)
+	p.mu.Unlock()
+}
+
+// p.mu must be held
+func (p *clientConnPool) addConnLocked(key string, cc *ClientConn) {
+	for _, v := range p.conns[key] {
+		if v == cc {
+			return
+		}
+	}
+	if p.conns == nil {
+		p.conns = make(map[string][]*ClientConn)
+	}
+	if p.keys == nil {
+		p.keys = make(map[*ClientConn][]string)
+	}
+	p.conns[key] = append(p.conns[key], cc)
+	p.keys[cc] = append(p.keys[cc], key)
+}
+
+func (p *clientConnPool) MarkDead(cc *ClientConn) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	for _, key := range p.keys[cc] {
+		vv, ok := p.conns[key]
+		if !ok {
+			continue
+		}
+		newList := filterOutClientConn(vv, cc)
+		if len(newList) > 0 {
+			p.conns[key] = newList
+		} else {
+			delete(p.conns, key)
+		}
+	}
+	delete(p.keys, cc)
+}
+
+func (p *clientConnPool) closeIdleConnections() {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	// TODO: don't close a cc if it was just added to the pool
+	// milliseconds ago and has never been used. There's currently
+	// a small race window with the HTTP/1 Transport's integration
+	// where it can add an idle conn just before using it, and
+	// somebody else can concurrently call CloseIdleConns and
+	// break some caller's RoundTrip.
+	for _, vv := range p.conns {
+		for _, cc := range vv {
+			cc.closeIfIdle()
+		}
+	}
+}
+
+func filterOutClientConn(in []*ClientConn, exclude *ClientConn) []*ClientConn {
+	out := in[:0]
+	for _, v := range in {
+		if v != exclude {
+			out = append(out, v)
+		}
+	}
+	// If we filtered it out, zero out the last item to prevent
+	// the GC from seeing it.
+	if len(in) != len(out) {
+		in[len(in)-1] = nil
+	}
+	return out
+}
diff --git a/vendor/golang.org/x/net/http2/configure_transport.go b/vendor/golang.org/x/net/http2/configure_transport.go
new file mode 100644
index 0000000000..daa17f5d43
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/configure_transport.go
@@ -0,0 +1,89 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.6
+
+package http2
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net/http"
+)
+
+func configureTransport(t1 *http.Transport) (*Transport, error) {
+	connPool := new(clientConnPool)
+	t2 := &Transport{
+		ConnPool: noDialClientConnPool{connPool},
+		t1:       t1,
+	}
+	connPool.t = t2
+	if err := registerHTTPSProtocol(t1, noDialH2RoundTripper{t2}); err != nil {
+		return nil, err
+	}
+	if t1.TLSClientConfig == nil {
+		t1.TLSClientConfig = new(tls.Config)
+	}
+	if !strSliceContains(t1.TLSClientConfig.NextProtos, "h2") {
+		t1.TLSClientConfig.NextProtos = append([]string{"h2"}, t1.TLSClientConfig.NextProtos...)
+	}
+	if !strSliceContains(t1.TLSClientConfig.NextProtos, "http/1.1") {
+		t1.TLSClientConfig.NextProtos = append(t1.TLSClientConfig.NextProtos, "http/1.1")
+	}
+	upgradeFn := func(authority string, c *tls.Conn) http.RoundTripper {
+		addr := authorityAddr(authority)
+		if used, err := connPool.addConnIfNeeded(addr, t2, c); err != nil {
+			go c.Close()
+			return erringRoundTripper{err}
+		} else if !used {
+			// Turns out we don't need this c.
+			// For example, two goroutines made requests to the same host
+			// at the same time, both kicking off TCP dials. (since protocol
+			// was unknown)
+			go c.Close()
+		}
+		return t2
+	}
+	if m := t1.TLSNextProto; len(m) == 0 {
+		t1.TLSNextProto = map[string]func(string, *tls.Conn) http.RoundTripper{
+			"h2": upgradeFn,
+		}
+	} else {
+		m["h2"] = upgradeFn
+	}
+	return t2, nil
+}
+
+// registerHTTPSProtocol calls Transport.RegisterProtocol but
+// convering panics into errors.
+func registerHTTPSProtocol(t *http.Transport, rt http.RoundTripper) (err error) {
+	defer func() {
+		if e := recover(); e != nil {
+			err = fmt.Errorf("%v", e)
+		}
+	}()
+	t.RegisterProtocol("https", rt)
+	return nil
+}
+
+// noDialClientConnPool is an implementation of http2.ClientConnPool
+// which never dials.  We let the HTTP/1.1 client dial and use its TLS
+// connection instead.
+type noDialClientConnPool struct{ *clientConnPool }
+
+func (p noDialClientConnPool) GetClientConn(req *http.Request, addr string) (*ClientConn, error) {
+	return p.getClientConn(req, addr, noDialOnMiss)
+}
+
+// noDialH2RoundTripper is a RoundTripper which only tries to complete the request
+// if there's already has a cached connection to the host.
+type noDialH2RoundTripper struct{ t *Transport }
+
+func (rt noDialH2RoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	res, err := rt.t.RoundTrip(req)
+	if err == ErrNoCachedConn {
+		return nil, http.ErrSkipAltProtocol
+	}
+	return res, err
+}
diff --git a/vendor/golang.org/x/net/http2/errors.go b/vendor/golang.org/x/net/http2/errors.go
new file mode 100644
index 0000000000..f320b2c09e
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/errors.go
@@ -0,0 +1,90 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package http2
+
+import "fmt"
+
+// An ErrCode is an unsigned 32-bit error code as defined in the HTTP/2 spec.
+type ErrCode uint32
+
+const (
+	ErrCodeNo                 ErrCode = 0x0
+	ErrCodeProtocol           ErrCode = 0x1
+	ErrCodeInternal           ErrCode = 0x2
+	ErrCodeFlowControl        ErrCode = 0x3
+	ErrCodeSettingsTimeout    ErrCode = 0x4
+	ErrCodeStreamClosed       ErrCode = 0x5
+	ErrCodeFrameSize          ErrCode = 0x6
+	ErrCodeRefusedStream      ErrCode = 0x7
+	ErrCodeCancel             ErrCode = 0x8
+	ErrCodeCompression        ErrCode = 0x9
+	ErrCodeConnect            ErrCode = 0xa
+	ErrCodeEnhanceYourCalm    ErrCode = 0xb
+	ErrCodeInadequateSecurity ErrCode = 0xc
+	ErrCodeHTTP11Required     ErrCode = 0xd
+)
+
+var errCodeName = map[ErrCode]string{
+	ErrCodeNo:                 "NO_ERROR",
+	ErrCodeProtocol:           "PROTOCOL_ERROR",
+	ErrCodeInternal:           "INTERNAL_ERROR",
+	ErrCodeFlowControl:        "FLOW_CONTROL_ERROR",
+	ErrCodeSettingsTimeout:    "SETTINGS_TIMEOUT",
+	ErrCodeStreamClosed:       "STREAM_CLOSED",
+	ErrCodeFrameSize:          "FRAME_SIZE_ERROR",
+	ErrCodeRefusedStream:      "REFUSED_STREAM",
+	ErrCodeCancel:             "CANCEL",
+	ErrCodeCompression:        "COMPRESSION_ERROR",
+	ErrCodeConnect:            "CONNECT_ERROR",
+	ErrCodeEnhanceYourCalm:    "ENHANCE_YOUR_CALM",
+	ErrCodeInadequateSecurity: "INADEQUATE_SECURITY",
+	ErrCodeHTTP11Required:     "HTTP_1_1_REQUIRED",
+}
+
+func (e ErrCode) String() string {
+	if s, ok := errCodeName[e]; ok {
+		return s
+	}
+	return fmt.Sprintf("unknown error code 0x%x", uint32(e))
+}
+
+// ConnectionError is an error that results in the termination of the
+// entire connection.
+type ConnectionError ErrCode
+
+func (e ConnectionError) Error() string { return fmt.Sprintf("connection error: %s", ErrCode(e)) }
+
+// StreamError is an error that only affects one stream within an
+// HTTP/2 connection.
+type StreamError struct {
+	StreamID uint32
+	Code     ErrCode
+}
+
+func (e StreamError) Error() string {
+	return fmt.Sprintf("stream error: stream ID %d; %v", e.StreamID, e.Code)
+}
+
+// 6.9.1 The Flow Control Window
+// "If a sender receives a WINDOW_UPDATE that causes a flow control
+// window to exceed this maximum it MUST terminate either the stream
+// or the connection, as appropriate. For streams, [...]; for the
+// connection, a GOAWAY frame with a FLOW_CONTROL_ERROR code."
+type goAwayFlowError struct{}
+
+func (goAwayFlowError) Error() string { return "connection exceeded flow control window size" }
+
+// connErrorReason wraps a ConnectionError with an informative error about why it occurs.
+
+// Errors of this type are only returned by the frame parser functions
+// and converted into ConnectionError(ErrCodeProtocol).
+type connError struct {
+	Code   ErrCode
+	Reason string
+}
+
+func (e connError) Error() string {
+	return fmt.Sprintf("http2: connection error: %v: %v", e.Code, e.Reason)
+}
diff --git a/vendor/golang.org/x/net/http2/fixed_buffer.go b/vendor/golang.org/x/net/http2/fixed_buffer.go
new file mode 100644
index 0000000000..47da0f0bf7
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/fixed_buffer.go
@@ -0,0 +1,60 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package http2
+
+import (
+	"errors"
+)
+
+// fixedBuffer is an io.ReadWriter backed by a fixed size buffer.
+// It never allocates, but moves old data as new data is written.
+type fixedBuffer struct {
+	buf  []byte
+	r, w int
+}
+
+var (
+	errReadEmpty = errors.New("read from empty fixedBuffer")
+	errWriteFull = errors.New("write on full fixedBuffer")
+)
+
+// Read copies bytes from the buffer into p.
+// It is an error to read when no data is available.
+func (b *fixedBuffer) Read(p []byte) (n int, err error) {
+	if b.r == b.w {
+		return 0, errReadEmpty
+	}
+	n = copy(p, b.buf[b.r:b.w])
+	b.r += n
+	if b.r == b.w {
+		b.r = 0
+		b.w = 0
+	}
+	return n, nil
+}
+
+// Len returns the number of bytes of the unread portion of the buffer.
+func (b *fixedBuffer) Len() int {
+	return b.w - b.r
+}
+
+// Write copies bytes from p into the buffer.
+// It is an error to write more data than the buffer can hold.
+func (b *fixedBuffer) Write(p []byte) (n int, err error) {
+	// Slide existing data to beginning.
+	if b.r > 0 && len(p) > len(b.buf)-b.w {
+		copy(b.buf, b.buf[b.r:b.w])
+		b.w -= b.r
+		b.r = 0
+	}
+
+	// Write new data.
+	n = copy(b.buf[b.w:], p)
+	b.w += n
+	if n < len(p) {
+		err = errWriteFull
+	}
+	return n, err
+}
diff --git a/vendor/golang.org/x/net/http2/flow.go b/vendor/golang.org/x/net/http2/flow.go
new file mode 100644
index 0000000000..957de25420
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/flow.go
@@ -0,0 +1,50 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Flow control
+
+package http2
+
+// flow is the flow control window's size.
+type flow struct {
+	// n is the number of DATA bytes we're allowed to send.
+	// A flow is kept both on a conn and a per-stream.
+	n int32
+
+	// conn points to the shared connection-level flow that is
+	// shared by all streams on that conn. It is nil for the flow
+	// that's on the conn directly.
+	conn *flow
+}
+
+func (f *flow) setConnFlow(cf *flow) { f.conn = cf }
+
+func (f *flow) available() int32 {
+	n := f.n
+	if f.conn != nil && f.conn.n < n {
+		n = f.conn.n
+	}
+	return n
+}
+
+func (f *flow) take(n int32) {
+	if n > f.available() {
+		panic("internal error: took too much")
+	}
+	f.n -= n
+	if f.conn != nil {
+		f.conn.n -= n
+	}
+}
+
+// add adds n bytes (positive or negative) to the flow control window.
+// It returns false if the sum would exceed 2^31-1.
+func (f *flow) add(n int32) bool {
+	remain := (1<<31 - 1) - f.n
+	if n > remain {
+		return false
+	}
+	f.n += n
+	return true
+}
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
new file mode 100644
index 0000000000..e1e837cc8a
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/frame.go
@@ -0,0 +1,1269 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package http2
+
+import (
+	"bytes"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"sync"
+)
+
+const frameHeaderLen = 9
+
+var padZeros = make([]byte, 255) // zeros for padding
+
+// A FrameType is a registered frame type as defined in
+// http://http2.github.io/http2-spec/#rfc.section.11.2
+type FrameType uint8
+
+const (
+	FrameData         FrameType = 0x0
+	FrameHeaders      FrameType = 0x1
+	FramePriority     FrameType = 0x2
+	FrameRSTStream    FrameType = 0x3
+	FrameSettings     FrameType = 0x4
+	FramePushPromise  FrameType = 0x5
+	FramePing         FrameType = 0x6
+	FrameGoAway       FrameType = 0x7
+	FrameWindowUpdate FrameType = 0x8
+	FrameContinuation FrameType = 0x9
+)
+
+var frameName = map[FrameType]string{
+	FrameData:         "DATA",
+	FrameHeaders:      "HEADERS",
+	FramePriority:     "PRIORITY",
+	FrameRSTStream:    "RST_STREAM",
+	FrameSettings:     "SETTINGS",
+	FramePushPromise:  "PUSH_PROMISE",
+	FramePing:         "PING",
+	FrameGoAway:       "GOAWAY",
+	FrameWindowUpdate: "WINDOW_UPDATE",
+	FrameContinuation: "CONTINUATION",
+}
+
+func (t FrameType) String() string {
+	if s, ok := frameName[t]; ok {
+		return s
+	}
+	return fmt.Sprintf("UNKNOWN_FRAME_TYPE_%d", uint8(t))
+}
+
+// Flags is a bitmask of HTTP/2 flags.
+// The meaning of flags varies depending on the frame type.
+type Flags uint8
+
+// Has reports whether f contains all (0 or more) flags in v.
+func (f Flags) Has(v Flags) bool {
+	return (f & v) == v
+}
+
+// Frame-specific FrameHeader flag bits.
+const (
+	// Data Frame
+	FlagDataEndStream Flags = 0x1
+	FlagDataPadded    Flags = 0x8
+
+	// Headers Frame
+	FlagHeadersEndStream  Flags = 0x1
+	FlagHeadersEndHeaders Flags = 0x4
+	FlagHeadersPadded     Flags = 0x8
+	FlagHeadersPriority   Flags = 0x20
+
+	// Settings Frame
+	FlagSettingsAck Flags = 0x1
+
+	// Ping Frame
+	FlagPingAck Flags = 0x1
+
+	// Continuation Frame
+	FlagContinuationEndHeaders Flags = 0x4
+
+	FlagPushPromiseEndHeaders Flags = 0x4
+	FlagPushPromisePadded     Flags = 0x8
+)
+
+var flagName = map[FrameType]map[Flags]string{
+	FrameData: {
+		FlagDataEndStream: "END_STREAM",
+		FlagDataPadded:    "PADDED",
+	},
+	FrameHeaders: {
+		FlagHeadersEndStream:  "END_STREAM",
+		FlagHeadersEndHeaders: "END_HEADERS",
+		FlagHeadersPadded:     "PADDED",
+		FlagHeadersPriority:   "PRIORITY",
+	},
+	FrameSettings: {
+		FlagSettingsAck: "ACK",
+	},
+	FramePing: {
+		FlagPingAck: "ACK",
+	},
+	FrameContinuation: {
+		FlagContinuationEndHeaders: "END_HEADERS",
+	},
+	FramePushPromise: {
+		FlagPushPromiseEndHeaders: "END_HEADERS",
+		FlagPushPromisePadded:     "PADDED",
+	},
+}
+
+// a frameParser parses a frame given its FrameHeader and payload
+// bytes. The length of payload will always equal fh.Length (which
+// might be 0).
+type frameParser func(fh FrameHeader, payload []byte) (Frame, error)
+
+var frameParsers = map[FrameType]frameParser{
+	FrameData:         parseDataFrame,
+	FrameHeaders:      parseHeadersFrame,
+	FramePriority:     parsePriorityFrame,
+	FrameRSTStream:    parseRSTStreamFrame,
+	FrameSettings:     parseSettingsFrame,
+	FramePushPromise:  parsePushPromise,
+	FramePing:         parsePingFrame,
+	FrameGoAway:       parseGoAwayFrame,
+	FrameWindowUpdate: parseWindowUpdateFrame,
+	FrameContinuation: parseContinuationFrame,
+}
+
+func typeFrameParser(t FrameType) frameParser {
+	if f := frameParsers[t]; f != nil {
+		return f
+	}
+	return parseUnknownFrame
+}
+
+// A FrameHeader is the 9 byte header of all HTTP/2 frames.
+//
+// See http://http2.github.io/http2-spec/#FrameHeader
+type FrameHeader struct {
+	valid bool // caller can access []byte fields in the Frame
+
+	// Type is the 1 byte frame type. There are ten standard frame
+	// types, but extension frame types may be written by WriteRawFrame
+	// and will be returned by ReadFrame (as UnknownFrame).
+	Type FrameType
+
+	// Flags are the 1 byte of 8 potential bit flags per frame.
+	// They are specific to the frame type.
+	Flags Flags
+
+	// Length is the length of the frame, not including the 9 byte header.
+	// The maximum size is one byte less than 16MB (uint24), but only
+	// frames up to 16KB are allowed without peer agreement.
+	Length uint32
+
+	// StreamID is which stream this frame is for. Certain frames
+	// are not stream-specific, in which case this field is 0.
+	StreamID uint32
+}
+
+// Header returns h. It exists so FrameHeaders can be embedded in other
+// specific frame types and implement the Frame interface.
+func (h FrameHeader) Header() FrameHeader { return h }
+
+func (h FrameHeader) String() string {
+	var buf bytes.Buffer
+	buf.WriteString("[FrameHeader ")
+	h.writeDebug(&buf)
+	buf.WriteByte(']')
+	return buf.String()
+}
+
+func (h FrameHeader) writeDebug(buf *bytes.Buffer) {
+	buf.WriteString(h.Type.String())
+	if h.Flags != 0 {
+		buf.WriteString(" flags=")
+		set := 0
+		for i := uint8(0); i < 8; i++ {
+			if h.Flags&(1<<i) == 0 {
+				continue
+			}
+			set++
+			if set > 1 {
+				buf.WriteByte('|')
+			}
+			name := flagName[h.Type][Flags(1<<i)]
+			if name != "" {
+				buf.WriteString(name)
+			} else {
+				fmt.Fprintf(buf, "0x%x", 1<<i)
+			}
+		}
+	}
+	if h.StreamID != 0 {
+		fmt.Fprintf(buf, " stream=%d", h.StreamID)
+	}
+	fmt.Fprintf(buf, " len=%d", h.Length)
+}
+
+func (h *FrameHeader) checkValid() {
+	if !h.valid {
+		panic("Frame accessor called on non-owned Frame")
+	}
+}
+
+func (h *FrameHeader) invalidate() { h.valid = false }
+
+// frame header bytes.
+// Used only by ReadFrameHeader.
+var fhBytes = sync.Pool{
+	New: func() interface{} {
+		buf := make([]byte, frameHeaderLen)
+		return &buf
+	},
+}
+
+// ReadFrameHeader reads 9 bytes from r and returns a FrameHeader.
+// Most users should use Framer.ReadFrame instead.
+func ReadFrameHeader(r io.Reader) (FrameHeader, error) {
+	bufp := fhBytes.Get().(*[]byte)
+	defer fhBytes.Put(bufp)
+	return readFrameHeader(*bufp, r)
+}
+
+func readFrameHeader(buf []byte, r io.Reader) (FrameHeader, error) {
+	_, err := io.ReadFull(r, buf[:frameHeaderLen])
+	if err != nil {
+		return FrameHeader{}, err
+	}
+	return FrameHeader{
+		Length:   (uint32(buf[0])<<16 | uint32(buf[1])<<8 | uint32(buf[2])),
+		Type:     FrameType(buf[3]),
+		Flags:    Flags(buf[4]),
+		StreamID: binary.BigEndian.Uint32(buf[5:]) & (1<<31 - 1),
+		valid:    true,
+	}, nil
+}
+
+// A Frame is the base interface implemented by all frame types.
+// Callers will generally type-assert the specific frame type:
+// *HeadersFrame, *SettingsFrame, *WindowUpdateFrame, etc.
+//
+// Frames are only valid until the next call to Framer.ReadFrame.
+type Frame interface {
+	Header() FrameHeader
+
+	// invalidate is called by Framer.ReadFrame to make this
+	// frame's buffers as being invalid, since the subsequent
+	// frame will reuse them.
+	invalidate()
+}
+
+// A Framer reads and writes Frames.
+type Framer struct {
+	r         io.Reader
+	lastFrame Frame
+	errReason string
+
+	// lastHeaderStream is non-zero if the last frame was an
+	// unfinished HEADERS/CONTINUATION.
+	lastHeaderStream uint32
+
+	maxReadSize uint32
+	headerBuf   [frameHeaderLen]byte
+
+	// TODO: let getReadBuf be configurable, and use a less memory-pinning
+	// allocator in server.go to minimize memory pinned for many idle conns.
+	// Will probably also need to make frame invalidation have a hook too.
+	getReadBuf func(size uint32) []byte
+	readBuf    []byte // cache for default getReadBuf
+
+	maxWriteSize uint32 // zero means unlimited; TODO: implement
+
+	w    io.Writer
+	wbuf []byte
+
+	// AllowIllegalWrites permits the Framer's Write methods to
+	// write frames that do not conform to the HTTP/2 spec. This
+	// permits using the Framer to test other HTTP/2
+	// implementations' conformance to the spec.
+	// If false, the Write methods will prefer to return an error
+	// rather than comply.
+	AllowIllegalWrites bool
+
+	// AllowIllegalReads permits the Framer's ReadFrame method
+	// to return non-compliant frames or frame orders.
+	// This is for testing and permits using the Framer to test
+	// other HTTP/2 implementations' conformance to the spec.
+	AllowIllegalReads bool
+
+	// TODO: track which type of frame & with which flags was sent
+	// last.  Then return an error (unless AllowIllegalWrites) if
+	// we're in the middle of a header block and a
+	// non-Continuation or Continuation on a different stream is
+	// attempted to be written.
+
+	logReads bool
+
+	debugFramer    *Framer // only use for logging written writes
+	debugFramerBuf *bytes.Buffer
+}
+
+func (f *Framer) startWrite(ftype FrameType, flags Flags, streamID uint32) {
+	// Write the FrameHeader.
+	f.wbuf = append(f.wbuf[:0],
+		0, // 3 bytes of length, filled in in endWrite
+		0,
+		0,
+		byte(ftype),
+		byte(flags),
+		byte(streamID>>24),
+		byte(streamID>>16),
+		byte(streamID>>8),
+		byte(streamID))
+}
+
+func (f *Framer) endWrite() error {
+	// Now that we know the final size, fill in the FrameHeader in
+	// the space previously reserved for it. Abuse append.
+	length := len(f.wbuf) - frameHeaderLen
+	if length >= (1 << 24) {
+		return ErrFrameTooLarge
+	}
+	_ = append(f.wbuf[:0],
+		byte(length>>16),
+		byte(length>>8),
+		byte(length))
+	if logFrameWrites {
+		f.logWrite()
+	}
+
+	n, err := f.w.Write(f.wbuf)
+	if err == nil && n != len(f.wbuf) {
+		err = io.ErrShortWrite
+	}
+	return err
+}
+
+func (f *Framer) logWrite() {
+	if f.debugFramer == nil {
+		f.debugFramerBuf = new(bytes.Buffer)
+		f.debugFramer = NewFramer(nil, f.debugFramerBuf)
+		f.debugFramer.logReads = false // we log it ourselves, saying "wrote" below
+		// Let us read anything, even if we accidentally wrote it
+		// in the wrong order:
+		f.debugFramer.AllowIllegalReads = true
+	}
+	f.debugFramerBuf.Write(f.wbuf)
+	fr, err := f.debugFramer.ReadFrame()
+	if err != nil {
+		log.Printf("http2: Framer %p: failed to decode just-written frame", f)
+		return
+	}
+	log.Printf("http2: Framer %p: wrote %v", f, summarizeFrame(fr))
+}
+
+func (f *Framer) writeByte(v byte)     { f.wbuf = append(f.wbuf, v) }
+func (f *Framer) writeBytes(v []byte)  { f.wbuf = append(f.wbuf, v...) }
+func (f *Framer) writeUint16(v uint16) { f.wbuf = append(f.wbuf, byte(v>>8), byte(v)) }
+func (f *Framer) writeUint32(v uint32) {
+	f.wbuf = append(f.wbuf, byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
+}
+
+const (
+	minMaxFrameSize = 1 << 14
+	maxFrameSize    = 1<<24 - 1
+)
+
+// NewFramer returns a Framer that writes frames to w and reads them from r.
+func NewFramer(w io.Writer, r io.Reader) *Framer {
+	fr := &Framer{
+		w:        w,
+		r:        r,
+		logReads: logFrameReads,
+	}
+	fr.getReadBuf = func(size uint32) []byte {
+		if cap(fr.readBuf) >= int(size) {
+			return fr.readBuf[:size]
+		}
+		fr.readBuf = make([]byte, size)
+		return fr.readBuf
+	}
+	fr.SetMaxReadFrameSize(maxFrameSize)
+	return fr
+}
+
+// SetMaxReadFrameSize sets the maximum size of a frame
+// that will be read by a subsequent call to ReadFrame.
+// It is the caller's responsibility to advertise this
+// limit with a SETTINGS frame.
+func (fr *Framer) SetMaxReadFrameSize(v uint32) {
+	if v > maxFrameSize {
+		v = maxFrameSize
+	}
+	fr.maxReadSize = v
+}
+
+// ErrFrameTooLarge is returned from Framer.ReadFrame when the peer
+// sends a frame that is larger than declared with SetMaxReadFrameSize.
+var ErrFrameTooLarge = errors.New("http2: frame too large")
+
+// terminalReadFrameError reports whether err is an unrecoverable
+// error from ReadFrame and no other frames should be read.
+func terminalReadFrameError(err error) bool {
+	if _, ok := err.(StreamError); ok {
+		return false
+	}
+	return err != nil
+}
+
+// ReadFrame reads a single frame. The returned Frame is only valid
+// until the next call to ReadFrame.
+//
+// If the frame is larger than previously set with SetMaxReadFrameSize, the
+// returned error is ErrFrameTooLarge. Other errors may be of type
+// ConnectionError, StreamError, or anything else from from the underlying
+// reader.
+func (fr *Framer) ReadFrame() (Frame, error) {
+	if fr.lastFrame != nil {
+		fr.lastFrame.invalidate()
+	}
+	fh, err := readFrameHeader(fr.headerBuf[:], fr.r)
+	if err != nil {
+		return nil, err
+	}
+	if fh.Length > fr.maxReadSize {
+		return nil, ErrFrameTooLarge
+	}
+	payload := fr.getReadBuf(fh.Length)
+	if _, err := io.ReadFull(fr.r, payload); err != nil {
+		return nil, err
+	}
+	f, err := typeFrameParser(fh.Type)(fh, payload)
+	if err != nil {
+		if ce, ok := err.(connError); ok {
+			return nil, fr.connError(ce.Code, ce.Reason)
+		}
+		return nil, err
+	}
+	if err := fr.checkFrameOrder(f); err != nil {
+		return nil, err
+	}
+	if fr.logReads {
+		log.Printf("http2: Framer %p: read %v", fr, summarizeFrame(f))
+	}
+	return f, nil
+}
+
+// connError returns ConnectionError(code) but first
+// stashes away a public reason to the caller can optionally relay it
+// to the peer before hanging up on them. This might help others debug
+// their implementations.
+func (fr *Framer) connError(code ErrCode, reason string) error {
+	fr.errReason = reason
+	return ConnectionError(code)
+}
+
+// checkFrameOrder reports an error if f is an invalid frame to return
+// next from ReadFrame. Mostly it checks whether HEADERS and
+// CONTINUATION frames are contiguous.
+func (fr *Framer) checkFrameOrder(f Frame) error {
+	last := fr.lastFrame
+	fr.lastFrame = f
+	if fr.AllowIllegalReads {
+		return nil
+	}
+
+	fh := f.Header()
+	if fr.lastHeaderStream != 0 {
+		if fh.Type != FrameContinuation {
+			return fr.connError(ErrCodeProtocol,
+				fmt.Sprintf("got %s for stream %d; expected CONTINUATION following %s for stream %d",
+					fh.Type, fh.StreamID,
+					last.Header().Type, fr.lastHeaderStream))
+		}
+		if fh.StreamID != fr.lastHeaderStream {
+			return fr.connError(ErrCodeProtocol,
+				fmt.Sprintf("got CONTINUATION for stream %d; expected stream %d",
+					fh.StreamID, fr.lastHeaderStream))
+		}
+	} else if fh.Type == FrameContinuation {
+		return fr.connError(ErrCodeProtocol, fmt.Sprintf("unexpected CONTINUATION for stream %d", fh.StreamID))
+	}
+
+	switch fh.Type {
+	case FrameHeaders, FrameContinuation:
+		if fh.Flags.Has(FlagHeadersEndHeaders) {
+			fr.lastHeaderStream = 0
+		} else {
+			fr.lastHeaderStream = fh.StreamID
+		}
+	}
+
+	return nil
+}
+
+// A DataFrame conveys arbitrary, variable-length sequences of octets
+// associated with a stream.
+// See http://http2.github.io/http2-spec/#rfc.section.6.1
+type DataFrame struct {
+	FrameHeader
+	data []byte
+}
+
+func (f *DataFrame) StreamEnded() bool {
+	return f.FrameHeader.Flags.Has(FlagDataEndStream)
+}
+
+// Data returns the frame's data octets, not including any padding
+// size byte or padding suffix bytes.
+// The caller must not retain the returned memory past the next
+// call to ReadFrame.
+func (f *DataFrame) Data() []byte {
+	f.checkValid()
+	return f.data
+}
+
+func parseDataFrame(fh FrameHeader, payload []byte) (Frame, error) {
+	if fh.StreamID == 0 {
+		// DATA frames MUST be associated with a stream. If a
+		// DATA frame is received whose stream identifier
+		// field is 0x0, the recipient MUST respond with a
+		// connection error (Section 5.4.1) of type
+		// PROTOCOL_ERROR.
+		return nil, connError{ErrCodeProtocol, "DATA frame with stream ID 0"}
+	}
+	f := &DataFrame{
+		FrameHeader: fh,
+	}
+	var padSize byte
+	if fh.Flags.Has(FlagDataPadded) {
+		var err error
+		payload, padSize, err = readByte(payload)
+		if err != nil {
+			return nil, err
+		}
+	}
+	if int(padSize) > len(payload) {
+		// If the length of the padding is greater than the
+		// length of the frame payload, the recipient MUST
+		// treat this as a connection error.
+		// Filed: https://github.com/http2/http2-spec/issues/610
+		return nil, connError{ErrCodeProtocol, "pad size larger than data payload"}
+	}
+	f.data = payload[:len(payload)-int(padSize)]
+	return f, nil
+}
+
+var errStreamID = errors.New("invalid streamid")
+
+func validStreamID(streamID uint32) bool {
+	return streamID != 0 && streamID&(1<<31) == 0
+}
+
+// WriteData writes a DATA frame.
+//
+// It will perform exactly one Write to the underlying Writer.
+// It is the caller's responsibility to not call other Write methods concurrently.
+func (f *Framer) WriteData(streamID uint32, endStream bool, data []byte) error {
+	// TODO: ignoring padding for now. will add when somebody cares.
+	if !validStreamID(streamID) && !f.AllowIllegalWrites {
+		return errStreamID
+	}
+	var flags Flags
+	if endStream {
+		flags |= FlagDataEndStream
+	}
+	f.startWrite(FrameData, flags, streamID)
+	f.wbuf = append(f.wbuf, data...)
+	return f.endWrite()
+}
+
+// A SettingsFrame conveys configuration parameters that affect how
+// endpoints communicate, such as preferences and constraints on peer
+// behavior.
+//
+// See http://http2.github.io/http2-spec/#SETTINGS
+type SettingsFrame struct {
+	FrameHeader
+	p []byte
+}
+
+func parseSettingsFrame(fh FrameHeader, p []byte) (Frame, error) {
+	if fh.Flags.Has(FlagSettingsAck) && fh.Length > 0 {
+		// When this (ACK 0x1) bit is set, the payload of the
+		// SETTINGS frame MUST be empty.  Receipt of a
+		// SETTINGS frame with the ACK flag set and a length
+		// field value other than 0 MUST be treated as a
+		// connection error (Section 5.4.1) of type
+		// FRAME_SIZE_ERROR.
+		return nil, ConnectionError(ErrCodeFrameSize)
+	}
+	if fh.StreamID != 0 {
+		// SETTINGS frames always apply to a connection,
+		// never a single stream.  The stream identifier for a
+		// SETTINGS frame MUST be zero (0x0).  If an endpoint
+		// receives a SETTINGS frame whose stream identifier
+		// field is anything other than 0x0, the endpoint MUST
+		// respond with a connection error (Section 5.4.1) of
+		// type PROTOCOL_ERROR.
+		return nil, ConnectionError(ErrCodeProtocol)
+	}
+	if len(p)%6 != 0 {
+		// Expecting even number of 6 byte settings.
+		return nil, ConnectionError(ErrCodeFrameSize)
+	}
+	f := &SettingsFrame{FrameHeader: fh, p: p}
+	if v, ok := f.Value(SettingInitialWindowSize); ok && v > (1<<31)-1 {
+		// Values above the maximum flow control window size of 2^31 - 1 MUST
+		// be treated as a connection error (Section 5.4.1) of type
+		// FLOW_CONTROL_ERROR.
+		return nil, ConnectionError(ErrCodeFlowControl)
+	}
+	return f, nil
+}
+
+func (f *SettingsFrame) IsAck() bool {
+	return f.FrameHeader.Flags.Has(FlagSettingsAck)
+}
+
+func (f *SettingsFrame) Value(s SettingID) (v uint32, ok bool) {
+	f.checkValid()
+	buf := f.p
+	for len(buf) > 0 {
+		settingID := SettingID(binary.BigEndian.Uint16(buf[:2]))
+		if settingID == s {
+			return binary.BigEndian.Uint32(buf[2:6]), true
+		}
+		buf = buf[6:]
+	}
+	return 0, false
+}
+
+// ForeachSetting runs fn for each setting.
+// It stops and returns the first error.
+func (f *SettingsFrame) ForeachSetting(fn func(Setting) error) error {
+	f.checkValid()
+	buf := f.p
+	for len(buf) > 0 {
+		if err := fn(Setting{
+			SettingID(binary.BigEndian.Uint16(buf[:2])),
+			binary.BigEndian.Uint32(buf[2:6]),
+		}); err != nil {
+			return err
+		}
+		buf = buf[6:]
+	}
+	return nil
+}
+
+// WriteSettings writes a SETTINGS frame with zero or more settings
+// specified and the ACK bit not set.
+//
+// It will perform exactly one Write to the underlying Writer.
+// It is the caller's responsibility to not call other Write methods concurrently.
+func (f *Framer) WriteSettings(settings ...Setting) error {
+	f.startWrite(FrameSettings, 0, 0)
+	for _, s := range settings {
+		f.writeUint16(uint16(s.ID))
+		f.writeUint32(s.Val)
+	}
+	return f.endWrite()
+}
+
+// WriteSettings writes an empty SETTINGS frame with the ACK bit set.
+//
+// It will perform exactly one Write to the underlying Writer.
+// It is the caller's responsibility to not call other Write methods concurrently.
+func (f *Framer) WriteSettingsAck() error {
+	f.startWrite(FrameSettings, FlagSettingsAck, 0)
+	return f.endWrite()
+}
+
+// A PingFrame is a mechanism for measuring a minimal round trip time
+// from the sender, as well as determining whether an idle connection
+// is still functional.
+// See http://http2.github.io/http2-spec/#rfc.section.6.7
+type PingFrame struct {
+	FrameHeader
+	Data [8]byte
+}
+
+func (f *PingFrame) IsAck() bool { return f.Flags.Has(FlagPingAck) }
+
+func parsePingFrame(fh FrameHeader, payload []byte) (Frame, error) {
+	if len(payload) != 8 {
+		return nil, ConnectionError(ErrCodeFrameSize)
+	}
+	if fh.StreamID != 0 {
+		return nil, ConnectionError(ErrCodeProtocol)
+	}
+	f := &PingFrame{FrameHeader: fh}
+	copy(f.Data[:], payload)
+	return f, nil
+}
+
+func (f *Framer) WritePing(ack bool, data [8]byte) error {
+	var flags Flags
+	if ack {
+		flags = FlagPingAck
+	}
+	f.startWrite(FramePing, flags, 0)
+	f.writeBytes(data[:])
+	return f.endWrite()
+}
+
+// A GoAwayFrame informs the remote peer to stop creating streams on this connection.
+// See http://http2.github.io/http2-spec/#rfc.section.6.8
+type GoAwayFrame struct {
+	FrameHeader
+	LastStreamID uint32
+	ErrCode      ErrCode
+	debugData    []byte
+}
+
+// DebugData returns any debug data in the GOAWAY frame. Its contents
+// are not defined.
+// The caller must not retain the returned memory past the next
+// call to ReadFrame.
+func (f *GoAwayFrame) DebugData() []byte {
+	f.checkValid()
+	return f.debugData
+}
+
+func parseGoAwayFrame(fh FrameHeader, p []byte) (Frame, error) {
+	if fh.StreamID != 0 {
+		return nil, ConnectionError(ErrCodeProtocol)
+	}
+	if len(p) < 8 {
+		return nil, ConnectionError(ErrCodeFrameSize)
+	}
+	return &GoAwayFrame{
+		FrameHeader:  fh,
+		LastStreamID: binary.BigEndian.Uint32(p[:4]) & (1<<31 - 1),
+		ErrCode:      ErrCode(binary.BigEndian.Uint32(p[4:8])),
+		debugData:    p[8:],
+	}, nil
+}
+
+func (f *Framer) WriteGoAway(maxStreamID uint32, code ErrCode, debugData []byte) error {
+	f.startWrite(FrameGoAway, 0, 0)
+	f.writeUint32(maxStreamID & (1<<31 - 1))
+	f.writeUint32(uint32(code))
+	f.writeBytes(debugData)
+	return f.endWrite()
+}
+
+// An UnknownFrame is the frame type returned when the frame type is unknown
+// or no specific frame type parser exists.
+type UnknownFrame struct {
+	FrameHeader
+	p []byte
+}
+
+// Payload returns the frame's payload (after the header).  It is not
+// valid to call this method after a subsequent call to
+// Framer.ReadFrame, nor is it valid to retain the returned slice.
+// The memory is owned by the Framer and is invalidated when the next
+// frame is read.
+func (f *UnknownFrame) Payload() []byte {
+	f.checkValid()
+	return f.p
+}
+
+func parseUnknownFrame(fh FrameHeader, p []byte) (Frame, error) {
+	return &UnknownFrame{fh, p}, nil
+}
+
+// A WindowUpdateFrame is used to implement flow control.
+// See http://http2.github.io/http2-spec/#rfc.section.6.9
+type WindowUpdateFrame struct {
+	FrameHeader
+	Increment uint32 // never read with high bit set
+}
+
+func parseWindowUpdateFrame(fh FrameHeader, p []byte) (Frame, error) {
+	if len(p) != 4 {
+		return nil, ConnectionError(ErrCodeFrameSize)
+	}
+	inc := binary.BigEndian.Uint32(p[:4]) & 0x7fffffff // mask off high reserved bit
+	if inc == 0 {
+		// A receiver MUST treat the receipt of a
+		// WINDOW_UPDATE frame with an flow control window
+		// increment of 0 as a stream error (Section 5.4.2) of
+		// type PROTOCOL_ERROR; errors on the connection flow
+		// control window MUST be treated as a connection
+		// error (Section 5.4.1).
+		if fh.StreamID == 0 {
+			return nil, ConnectionError(ErrCodeProtocol)
+		}
+		return nil, StreamError{fh.StreamID, ErrCodeProtocol}
+	}
+	return &WindowUpdateFrame{
+		FrameHeader: fh,
+		Increment:   inc,
+	}, nil
+}
+
+// WriteWindowUpdate writes a WINDOW_UPDATE frame.
+// The increment value must be between 1 and 2,147,483,647, inclusive.
+// If the Stream ID is zero, the window update applies to the
+// connection as a whole.
+func (f *Framer) WriteWindowUpdate(streamID, incr uint32) error {
+	// "The legal range for the increment to the flow control window is 1 to 2^31-1 (2,147,483,647) octets."
+	if (incr < 1 || incr > 2147483647) && !f.AllowIllegalWrites {
+		return errors.New("illegal window increment value")
+	}
+	f.startWrite(FrameWindowUpdate, 0, streamID)
+	f.writeUint32(incr)
+	return f.endWrite()
+}
+
+// A HeadersFrame is used to open a stream and additionally carries a
+// header block fragment.
+type HeadersFrame struct {
+	FrameHeader
+
+	// Priority is set if FlagHeadersPriority is set in the FrameHeader.
+	Priority PriorityParam
+
+	headerFragBuf []byte // not owned
+}
+
+func (f *HeadersFrame) HeaderBlockFragment() []byte {
+	f.checkValid()
+	return f.headerFragBuf
+}
+
+func (f *HeadersFrame) HeadersEnded() bool {
+	return f.FrameHeader.Flags.Has(FlagHeadersEndHeaders)
+}
+
+func (f *HeadersFrame) StreamEnded() bool {
+	return f.FrameHeader.Flags.Has(FlagHeadersEndStream)
+}
+
+func (f *HeadersFrame) HasPriority() bool {
+	return f.FrameHeader.Flags.Has(FlagHeadersPriority)
+}
+
+func parseHeadersFrame(fh FrameHeader, p []byte) (_ Frame, err error) {
+	hf := &HeadersFrame{
+		FrameHeader: fh,
+	}
+	if fh.StreamID == 0 {
+		// HEADERS frames MUST be associated with a stream.  If a HEADERS frame
+		// is received whose stream identifier field is 0x0, the recipient MUST
+		// respond with a connection error (Section 5.4.1) of type
+		// PROTOCOL_ERROR.
+		return nil, connError{ErrCodeProtocol, "HEADERS frame with stream ID 0"}
+	}
+	var padLength uint8
+	if fh.Flags.Has(FlagHeadersPadded) {
+		if p, padLength, err = readByte(p); err != nil {
+			return
+		}
+	}
+	if fh.Flags.Has(FlagHeadersPriority) {
+		var v uint32
+		p, v, err = readUint32(p)
+		if err != nil {
+			return nil, err
+		}
+		hf.Priority.StreamDep = v & 0x7fffffff
+		hf.Priority.Exclusive = (v != hf.Priority.StreamDep) // high bit was set
+		p, hf.Priority.Weight, err = readByte(p)
+		if err != nil {
+			return nil, err
+		}
+	}
+	if len(p)-int(padLength) <= 0 {
+		return nil, StreamError{fh.StreamID, ErrCodeProtocol}
+	}
+	hf.headerFragBuf = p[:len(p)-int(padLength)]
+	return hf, nil
+}
+
+// HeadersFrameParam are the parameters for writing a HEADERS frame.
+type HeadersFrameParam struct {
+	// StreamID is the required Stream ID to initiate.
+	StreamID uint32
+	// BlockFragment is part (or all) of a Header Block.
+	BlockFragment []byte
+
+	// EndStream indicates that the header block is the last that
+	// the endpoint will send for the identified stream. Setting
+	// this flag causes the stream to enter one of "half closed"
+	// states.
+	EndStream bool
+
+	// EndHeaders indicates that this frame contains an entire
+	// header block and is not followed by any
+	// CONTINUATION frames.
+	EndHeaders bool
+
+	// PadLength is the optional number of bytes of zeros to add
+	// to this frame.
+	PadLength uint8
+
+	// Priority, if non-zero, includes stream priority information
+	// in the HEADER frame.
+	Priority PriorityParam
+}
+
+// WriteHeaders writes a single HEADERS frame.
+//
+// This is a low-level header writing method. Encoding headers and
+// splitting them into any necessary CONTINUATION frames is handled
+// elsewhere.
+//
+// It will perform exactly one Write to the underlying Writer.
+// It is the caller's responsibility to not call other Write methods concurrently.
+func (f *Framer) WriteHeaders(p HeadersFrameParam) error {
+	if !validStreamID(p.StreamID) && !f.AllowIllegalWrites {
+		return errStreamID
+	}
+	var flags Flags
+	if p.PadLength != 0 {
+		flags |= FlagHeadersPadded
+	}
+	if p.EndStream {
+		flags |= FlagHeadersEndStream
+	}
+	if p.EndHeaders {
+		flags |= FlagHeadersEndHeaders
+	}
+	if !p.Priority.IsZero() {
+		flags |= FlagHeadersPriority
+	}
+	f.startWrite(FrameHeaders, flags, p.StreamID)
+	if p.PadLength != 0 {
+		f.writeByte(p.PadLength)
+	}
+	if !p.Priority.IsZero() {
+		v := p.Priority.StreamDep
+		if !validStreamID(v) && !f.AllowIllegalWrites {
+			return errors.New("invalid dependent stream id")
+		}
+		if p.Priority.Exclusive {
+			v |= 1 << 31
+		}
+		f.writeUint32(v)
+		f.writeByte(p.Priority.Weight)
+	}
+	f.wbuf = append(f.wbuf, p.BlockFragment...)
+	f.wbuf = append(f.wbuf, padZeros[:p.PadLength]...)
+	return f.endWrite()
+}
+
+// A PriorityFrame specifies the sender-advised priority of a stream.
+// See http://http2.github.io/http2-spec/#rfc.section.6.3
+type PriorityFrame struct {
+	FrameHeader
+	PriorityParam
+}
+
+// PriorityParam are the stream prioritzation parameters.
+type PriorityParam struct {
+	// StreamDep is a 31-bit stream identifier for the
+	// stream that this stream depends on. Zero means no
+	// dependency.
+	StreamDep uint32
+
+	// Exclusive is whether the dependency is exclusive.
+	Exclusive bool
+
+	// Weight is the stream's zero-indexed weight. It should be
+	// set together with StreamDep, or neither should be set.  Per
+	// the spec, "Add one to the value to obtain a weight between
+	// 1 and 256."
+	Weight uint8
+}
+
+func (p PriorityParam) IsZero() bool {
+	return p == PriorityParam{}
+}
+
+func parsePriorityFrame(fh FrameHeader, payload []byte) (Frame, error) {
+	if fh.StreamID == 0 {
+		return nil, connError{ErrCodeProtocol, "PRIORITY frame with stream ID 0"}
+	}
+	if len(payload) != 5 {
+		return nil, connError{ErrCodeFrameSize, fmt.Sprintf("PRIORITY frame payload size was %d; want 5", len(payload))}
+	}
+	v := binary.BigEndian.Uint32(payload[:4])
+	streamID := v & 0x7fffffff // mask off high bit
+	return &PriorityFrame{
+		FrameHeader: fh,
+		PriorityParam: PriorityParam{
+			Weight:    payload[4],
+			StreamDep: streamID,
+			Exclusive: streamID != v, // was high bit set?
+		},
+	}, nil
+}
+
+// WritePriority writes a PRIORITY frame.
+//
+// It will perform exactly one Write to the underlying Writer.
+// It is the caller's responsibility to not call other Write methods concurrently.
+func (f *Framer) WritePriority(streamID uint32, p PriorityParam) error {
+	if !validStreamID(streamID) && !f.AllowIllegalWrites {
+		return errStreamID
+	}
+	f.startWrite(FramePriority, 0, streamID)
+	v := p.StreamDep
+	if p.Exclusive {
+		v |= 1 << 31
+	}
+	f.writeUint32(v)
+	f.writeByte(p.Weight)
+	return f.endWrite()
+}
+
+// A RSTStreamFrame allows for abnormal termination of a stream.
+// See http://http2.github.io/http2-spec/#rfc.section.6.4
+type RSTStreamFrame struct {
+	FrameHeader
+	ErrCode ErrCode
+}
+
+func parseRSTStreamFrame(fh FrameHeader, p []byte) (Frame, error) {
+	if len(p) != 4 {
+		return nil, ConnectionError(ErrCodeFrameSize)
+	}
+	if fh.StreamID == 0 {
+		return nil, ConnectionError(ErrCodeProtocol)
+	}
+	return &RSTStreamFrame{fh, ErrCode(binary.BigEndian.Uint32(p[:4]))}, nil
+}
+
+// WriteRSTStream writes a RST_STREAM frame.
+//
+// It will perform exactly one Write to the underlying Writer.
+// It is the caller's responsibility to not call other Write methods concurrently.
+func (f *Framer) WriteRSTStream(streamID uint32, code ErrCode) error {
+	if !validStreamID(streamID) && !f.AllowIllegalWrites {
+		return errStreamID
+	}
+	f.startWrite(FrameRSTStream, 0, streamID)
+	f.writeUint32(uint32(code))
+	return f.endWrite()
+}
+
+// A ContinuationFrame is used to continue a sequence of header block fragments.
+// See http://http2.github.io/http2-spec/#rfc.section.6.10
+type ContinuationFrame struct {
+	FrameHeader
+	headerFragBuf []byte
+}
+
+func parseContinuationFrame(fh FrameHeader, p []byte) (Frame, error) {
+	if fh.StreamID == 0 {
+		return nil, connError{ErrCodeProtocol, "CONTINUATION frame with stream ID 0"}
+	}
+	return &ContinuationFrame{fh, p}, nil
+}
+
+func (f *ContinuationFrame) HeaderBlockFragment() []byte {
+	f.checkValid()
+	return f.headerFragBuf
+}
+
+func (f *ContinuationFrame) HeadersEnded() bool {
+	return f.FrameHeader.Flags.Has(FlagContinuationEndHeaders)
+}
+
+// WriteContinuation writes a CONTINUATION frame.
+//
+// It will perform exactly one Write to the underlying Writer.
+// It is the caller's responsibility to not call other Write methods concurrently.
+func (f *Framer) WriteContinuation(streamID uint32, endHeaders bool, headerBlockFragment []byte) error {
+	if !validStreamID(streamID) && !f.AllowIllegalWrites {
+		return errStreamID
+	}
+	var flags Flags
+	if endHeaders {
+		flags |= FlagContinuationEndHeaders
+	}
+	f.startWrite(FrameContinuation, flags, streamID)
+	f.wbuf = append(f.wbuf, headerBlockFragment...)
+	return f.endWrite()
+}
+
+// A PushPromiseFrame is used to initiate a server stream.
+// See http://http2.github.io/http2-spec/#rfc.section.6.6
+type PushPromiseFrame struct {
+	FrameHeader
+	PromiseID     uint32
+	headerFragBuf []byte // not owned
+}
+
+func (f *PushPromiseFrame) HeaderBlockFragment() []byte {
+	f.checkValid()
+	return f.headerFragBuf
+}
+
+func (f *PushPromiseFrame) HeadersEnded() bool {
+	return f.FrameHeader.Flags.Has(FlagPushPromiseEndHeaders)
+}
+
+func parsePushPromise(fh FrameHeader, p []byte) (_ Frame, err error) {
+	pp := &PushPromiseFrame{
+		FrameHeader: fh,
+	}
+	if pp.StreamID == 0 {
+		// PUSH_PROMISE frames MUST be associated with an existing,
+		// peer-initiated stream. The stream identifier of a
+		// PUSH_PROMISE frame indicates the stream it is associated
+		// with. If the stream identifier field specifies the value
+		// 0x0, a recipient MUST respond with a connection error
+		// (Section 5.4.1) of type PROTOCOL_ERROR.
+		return nil, ConnectionError(ErrCodeProtocol)
+	}
+	// The PUSH_PROMISE frame includes optional padding.
+	// Padding fields and flags are identical to those defined for DATA frames
+	var padLength uint8
+	if fh.Flags.Has(FlagPushPromisePadded) {
+		if p, padLength, err = readByte(p); err != nil {
+			return
+		}
+	}
+
+	p, pp.PromiseID, err = readUint32(p)
+	if err != nil {
+		return
+	}
+	pp.PromiseID = pp.PromiseID & (1<<31 - 1)
+
+	if int(padLength) > len(p) {
+		// like the DATA frame, error out if padding is longer than the body.
+		return nil, ConnectionError(ErrCodeProtocol)
+	}
+	pp.headerFragBuf = p[:len(p)-int(padLength)]
+	return pp, nil
+}
+
+// PushPromiseParam are the parameters for writing a PUSH_PROMISE frame.
+type PushPromiseParam struct {
+	// StreamID is the required Stream ID to initiate.
+	StreamID uint32
+
+	// PromiseID is the required Stream ID which this
+	// Push Promises
+	PromiseID uint32
+
+	// BlockFragment is part (or all) of a Header Block.
+	BlockFragment []byte
+
+	// EndHeaders indicates that this frame contains an entire
+	// header block and is not followed by any
+	// CONTINUATION frames.
+	EndHeaders bool
+
+	// PadLength is the optional number of bytes of zeros to add
+	// to this frame.
+	PadLength uint8
+}
+
+// WritePushPromise writes a single PushPromise Frame.
+//
+// As with Header Frames, This is the low level call for writing
+// individual frames. Continuation frames are handled elsewhere.
+//
+// It will perform exactly one Write to the underlying Writer.
+// It is the caller's responsibility to not call other Write methods concurrently.
+func (f *Framer) WritePushPromise(p PushPromiseParam) error {
+	if !validStreamID(p.StreamID) && !f.AllowIllegalWrites {
+		return errStreamID
+	}
+	var flags Flags
+	if p.PadLength != 0 {
+		flags |= FlagPushPromisePadded
+	}
+	if p.EndHeaders {
+		flags |= FlagPushPromiseEndHeaders
+	}
+	f.startWrite(FramePushPromise, flags, p.StreamID)
+	if p.PadLength != 0 {
+		f.writeByte(p.PadLength)
+	}
+	if !validStreamID(p.PromiseID) && !f.AllowIllegalWrites {
+		return errStreamID
+	}
+	f.writeUint32(p.PromiseID)
+	f.wbuf = append(f.wbuf, p.BlockFragment...)
+	f.wbuf = append(f.wbuf, padZeros[:p.PadLength]...)
+	return f.endWrite()
+}
+
+// WriteRawFrame writes a raw frame. This can be used to write
+// extension frames unknown to this package.
+func (f *Framer) WriteRawFrame(t FrameType, flags Flags, streamID uint32, payload []byte) error {
+	f.startWrite(t, flags, streamID)
+	f.writeBytes(payload)
+	return f.endWrite()
+}
+
+func readByte(p []byte) (remain []byte, b byte, err error) {
+	if len(p) == 0 {
+		return nil, 0, io.ErrUnexpectedEOF
+	}
+	return p[1:], p[0], nil
+}
+
+func readUint32(p []byte) (remain []byte, v uint32, err error) {
+	if len(p) < 4 {
+		return nil, 0, io.ErrUnexpectedEOF
+	}
+	return p[4:], binary.BigEndian.Uint32(p[:4]), nil
+}
+
+type streamEnder interface {
+	StreamEnded() bool
+}
+
+type headersEnder interface {
+	HeadersEnded() bool
+}
+
+func summarizeFrame(f Frame) string {
+	var buf bytes.Buffer
+	f.Header().writeDebug(&buf)
+	switch f := f.(type) {
+	case *SettingsFrame:
+		n := 0
+		f.ForeachSetting(func(s Setting) error {
+			n++
+			if n == 1 {
+				buf.WriteString(", settings:")
+			}
+			fmt.Fprintf(&buf, " %v=%v,", s.ID, s.Val)
+			return nil
+		})
+		if n > 0 {
+			buf.Truncate(buf.Len() - 1) // remove trailing comma
+		}
+	case *DataFrame:
+		data := f.Data()
+		const max = 256
+		if len(data) > max {
+			data = data[:max]
+		}
+		fmt.Fprintf(&buf, " data=%q", data)
+		if len(f.Data()) > max {
+			fmt.Fprintf(&buf, " (%d bytes omitted)", len(f.Data())-max)
+		}
+	case *WindowUpdateFrame:
+		if f.StreamID == 0 {
+			buf.WriteString(" (conn)")
+		}
+		fmt.Fprintf(&buf, " incr=%v", f.Increment)
+	case *PingFrame:
+		fmt.Fprintf(&buf, " ping=%q", f.Data[:])
+	case *GoAwayFrame:
+		fmt.Fprintf(&buf, " LastStreamID=%v ErrCode=%v Debug=%q",
+			f.LastStreamID, f.ErrCode, f.debugData)
+	case *RSTStreamFrame:
+		fmt.Fprintf(&buf, " ErrCode=%v", f.ErrCode)
+	}
+	return buf.String()
+}
diff --git a/vendor/golang.org/x/net/http2/go15.go b/vendor/golang.org/x/net/http2/go15.go
new file mode 100644
index 0000000000..f0a5624141
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/go15.go
@@ -0,0 +1,11 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.5
+
+package http2
+
+import "net/http"
+
+func requestCancel(req *http.Request) <-chan struct{} { return req.Cancel }
diff --git a/vendor/golang.org/x/net/http2/gotrack.go b/vendor/golang.org/x/net/http2/gotrack.go
new file mode 100644
index 0000000000..9933c9f8c7
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/gotrack.go
@@ -0,0 +1,170 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Defensive debug-only utility to track that functions run on the
+// goroutine that they're supposed to.
+
+package http2
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"os"
+	"runtime"
+	"strconv"
+	"sync"
+)
+
+var DebugGoroutines = os.Getenv("DEBUG_HTTP2_GOROUTINES") == "1"
+
+type goroutineLock uint64
+
+func newGoroutineLock() goroutineLock {
+	if !DebugGoroutines {
+		return 0
+	}
+	return goroutineLock(curGoroutineID())
+}
+
+func (g goroutineLock) check() {
+	if !DebugGoroutines {
+		return
+	}
+	if curGoroutineID() != uint64(g) {
+		panic("running on the wrong goroutine")
+	}
+}
+
+func (g goroutineLock) checkNotOn() {
+	if !DebugGoroutines {
+		return
+	}
+	if curGoroutineID() == uint64(g) {
+		panic("running on the wrong goroutine")
+	}
+}
+
+var goroutineSpace = []byte("goroutine ")
+
+func curGoroutineID() uint64 {
+	bp := littleBuf.Get().(*[]byte)
+	defer littleBuf.Put(bp)
+	b := *bp
+	b = b[:runtime.Stack(b, false)]
+	// Parse the 4707 out of "goroutine 4707 ["
+	b = bytes.TrimPrefix(b, goroutineSpace)
+	i := bytes.IndexByte(b, ' ')
+	if i < 0 {
+		panic(fmt.Sprintf("No space found in %q", b))
+	}
+	b = b[:i]
+	n, err := parseUintBytes(b, 10, 64)
+	if err != nil {
+		panic(fmt.Sprintf("Failed to parse goroutine ID out of %q: %v", b, err))
+	}
+	return n
+}
+
+var littleBuf = sync.Pool{
+	New: func() interface{} {
+		buf := make([]byte, 64)
+		return &buf
+	},
+}
+
+// parseUintBytes is like strconv.ParseUint, but using a []byte.
+func parseUintBytes(s []byte, base int, bitSize int) (n uint64, err error) {
+	var cutoff, maxVal uint64
+
+	if bitSize == 0 {
+		bitSize = int(strconv.IntSize)
+	}
+
+	s0 := s
+	switch {
+	case len(s) < 1:
+		err = strconv.ErrSyntax
+		goto Error
+
+	case 2 <= base && base <= 36:
+		// valid base; nothing to do
+
+	case base == 0:
+		// Look for octal, hex prefix.
+		switch {
+		case s[0] == '0' && len(s) > 1 && (s[1] == 'x' || s[1] == 'X'):
+			base = 16
+			s = s[2:]
+			if len(s) < 1 {
+				err = strconv.ErrSyntax
+				goto Error
+			}
+		case s[0] == '0':
+			base = 8
+		default:
+			base = 10
+		}
+
+	default:
+		err = errors.New("invalid base " + strconv.Itoa(base))
+		goto Error
+	}
+
+	n = 0
+	cutoff = cutoff64(base)
+	maxVal = 1<<uint(bitSize) - 1
+
+	for i := 0; i < len(s); i++ {
+		var v byte
+		d := s[i]
+		switch {
+		case '0' <= d && d <= '9':
+			v = d - '0'
+		case 'a' <= d && d <= 'z':
+			v = d - 'a' + 10
+		case 'A' <= d && d <= 'Z':
+			v = d - 'A' + 10
+		default:
+			n = 0
+			err = strconv.ErrSyntax
+			goto Error
+		}
+		if int(v) >= base {
+			n = 0
+			err = strconv.ErrSyntax
+			goto Error
+		}
+
+		if n >= cutoff {
+			// n*base overflows
+			n = 1<<64 - 1
+			err = strconv.ErrRange
+			goto Error
+		}
+		n *= uint64(base)
+
+		n1 := n + uint64(v)
+		if n1 < n || n1 > maxVal {
+			// n+v overflows
+			n = 1<<64 - 1
+			err = strconv.ErrRange
+			goto Error
+		}
+		n = n1
+	}
+
+	return n, nil
+
+Error:
+	return n, &strconv.NumError{Func: "ParseUint", Num: string(s0), Err: err}
+}
+
+// Return the first number n such that n*base >= 1<<64.
+func cutoff64(base int) uint64 {
+	if base < 2 {
+		return 0
+	}
+	return (1<<64-1)/uint64(base) + 1
+}
diff --git a/vendor/golang.org/x/net/http2/headermap.go b/vendor/golang.org/x/net/http2/headermap.go
new file mode 100644
index 0000000000..c2805f6ac4
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/headermap.go
@@ -0,0 +1,78 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package http2
+
+import (
+	"net/http"
+	"strings"
+)
+
+var (
+	commonLowerHeader = map[string]string{} // Go-Canonical-Case -> lower-case
+	commonCanonHeader = map[string]string{} // lower-case -> Go-Canonical-Case
+)
+
+func init() {
+	for _, v := range []string{
+		"accept",
+		"accept-charset",
+		"accept-encoding",
+		"accept-language",
+		"accept-ranges",
+		"age",
+		"access-control-allow-origin",
+		"allow",
+		"authorization",
+		"cache-control",
+		"content-disposition",
+		"content-encoding",
+		"content-language",
+		"content-length",
+		"content-location",
+		"content-range",
+		"content-type",
+		"cookie",
+		"date",
+		"etag",
+		"expect",
+		"expires",
+		"from",
+		"host",
+		"if-match",
+		"if-modified-since",
+		"if-none-match",
+		"if-unmodified-since",
+		"last-modified",
+		"link",
+		"location",
+		"max-forwards",
+		"proxy-authenticate",
+		"proxy-authorization",
+		"range",
+		"referer",
+		"refresh",
+		"retry-after",
+		"server",
+		"set-cookie",
+		"strict-transport-security",
+		"trailer",
+		"transfer-encoding",
+		"user-agent",
+		"vary",
+		"via",
+		"www-authenticate",
+	} {
+		chk := http.CanonicalHeaderKey(v)
+		commonLowerHeader[chk] = v
+		commonCanonHeader[v] = chk
+	}
+}
+
+func lowerHeader(v string) string {
+	if s, ok := commonLowerHeader[v]; ok {
+		return s
+	}
+	return strings.ToLower(v)
+}
diff --git a/vendor/golang.org/x/net/http2/hpack/encode.go b/vendor/golang.org/x/net/http2/hpack/encode.go
new file mode 100644
index 0000000000..80d621cf35
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/hpack/encode.go
@@ -0,0 +1,251 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package hpack
+
+import (
+	"io"
+)
+
+const (
+	uint32Max              = ^uint32(0)
+	initialHeaderTableSize = 4096
+)
+
+type Encoder struct {
+	dynTab dynamicTable
+	// minSize is the minimum table size set by
+	// SetMaxDynamicTableSize after the previous Header Table Size
+	// Update.
+	minSize uint32
+	// maxSizeLimit is the maximum table size this encoder
+	// supports. This will protect the encoder from too large
+	// size.
+	maxSizeLimit uint32
+	// tableSizeUpdate indicates whether "Header Table Size
+	// Update" is required.
+	tableSizeUpdate bool
+	w               io.Writer
+	buf             []byte
+}
+
+// NewEncoder returns a new Encoder which performs HPACK encoding. An
+// encoded data is written to w.
+func NewEncoder(w io.Writer) *Encoder {
+	e := &Encoder{
+		minSize:         uint32Max,
+		maxSizeLimit:    initialHeaderTableSize,
+		tableSizeUpdate: false,
+		w:               w,
+	}
+	e.dynTab.setMaxSize(initialHeaderTableSize)
+	return e
+}
+
+// WriteField encodes f into a single Write to e's underlying Writer.
+// This function may also produce bytes for "Header Table Size Update"
+// if necessary.  If produced, it is done before encoding f.
+func (e *Encoder) WriteField(f HeaderField) error {
+	e.buf = e.buf[:0]
+
+	if e.tableSizeUpdate {
+		e.tableSizeUpdate = false
+		if e.minSize < e.dynTab.maxSize {
+			e.buf = appendTableSize(e.buf, e.minSize)
+		}
+		e.minSize = uint32Max
+		e.buf = appendTableSize(e.buf, e.dynTab.maxSize)
+	}
+
+	idx, nameValueMatch := e.searchTable(f)
+	if nameValueMatch {
+		e.buf = appendIndexed(e.buf, idx)
+	} else {
+		indexing := e.shouldIndex(f)
+		if indexing {
+			e.dynTab.add(f)
+		}
+
+		if idx == 0 {
+			e.buf = appendNewName(e.buf, f, indexing)
+		} else {
+			e.buf = appendIndexedName(e.buf, f, idx, indexing)
+		}
+	}
+	n, err := e.w.Write(e.buf)
+	if err == nil && n != len(e.buf) {
+		err = io.ErrShortWrite
+	}
+	return err
+}
+
+// searchTable searches f in both stable and dynamic header tables.
+// The static header table is searched first. Only when there is no
+// exact match for both name and value, the dynamic header table is
+// then searched. If there is no match, i is 0. If both name and value
+// match, i is the matched index and nameValueMatch becomes true. If
+// only name matches, i points to that index and nameValueMatch
+// becomes false.
+func (e *Encoder) searchTable(f HeaderField) (i uint64, nameValueMatch bool) {
+	for idx, hf := range staticTable {
+		if !constantTimeStringCompare(hf.Name, f.Name) {
+			continue
+		}
+		if i == 0 {
+			i = uint64(idx + 1)
+		}
+		if f.Sensitive {
+			continue
+		}
+		if !constantTimeStringCompare(hf.Value, f.Value) {
+			continue
+		}
+		i = uint64(idx + 1)
+		nameValueMatch = true
+		return
+	}
+
+	j, nameValueMatch := e.dynTab.search(f)
+	if nameValueMatch || (i == 0 && j != 0) {
+		i = j + uint64(len(staticTable))
+	}
+	return
+}
+
+// SetMaxDynamicTableSize changes the dynamic header table size to v.
+// The actual size is bounded by the value passed to
+// SetMaxDynamicTableSizeLimit.
+func (e *Encoder) SetMaxDynamicTableSize(v uint32) {
+	if v > e.maxSizeLimit {
+		v = e.maxSizeLimit
+	}
+	if v < e.minSize {
+		e.minSize = v
+	}
+	e.tableSizeUpdate = true
+	e.dynTab.setMaxSize(v)
+}
+
+// SetMaxDynamicTableSizeLimit changes the maximum value that can be
+// specified in SetMaxDynamicTableSize to v. By default, it is set to
+// 4096, which is the same size of the default dynamic header table
+// size described in HPACK specification. If the current maximum
+// dynamic header table size is strictly greater than v, "Header Table
+// Size Update" will be done in the next WriteField call and the
+// maximum dynamic header table size is truncated to v.
+func (e *Encoder) SetMaxDynamicTableSizeLimit(v uint32) {
+	e.maxSizeLimit = v
+	if e.dynTab.maxSize > v {
+		e.tableSizeUpdate = true
+		e.dynTab.setMaxSize(v)
+	}
+}
+
+// shouldIndex reports whether f should be indexed.
+func (e *Encoder) shouldIndex(f HeaderField) bool {
+	return !f.Sensitive && f.size() <= e.dynTab.maxSize
+}
+
+// appendIndexed appends index i, as encoded in "Indexed Header Field"
+// representation, to dst and returns the extended buffer.
+func appendIndexed(dst []byte, i uint64) []byte {
+	first := len(dst)
+	dst = appendVarInt(dst, 7, i)
+	dst[first] |= 0x80
+	return dst
+}
+
+// appendNewName appends f, as encoded in one of "Literal Header field
+// - New Name" representation variants, to dst and returns the
+// extended buffer.
+//
+// If f.Sensitive is true, "Never Indexed" representation is used. If
+// f.Sensitive is false and indexing is true, "Inremental Indexing"
+// representation is used.
+func appendNewName(dst []byte, f HeaderField, indexing bool) []byte {
+	dst = append(dst, encodeTypeByte(indexing, f.Sensitive))
+	dst = appendHpackString(dst, f.Name)
+	return appendHpackString(dst, f.Value)
+}
+
+// appendIndexedName appends f and index i referring indexed name
+// entry, as encoded in one of "Literal Header field - Indexed Name"
+// representation variants, to dst and returns the extended buffer.
+//
+// If f.Sensitive is true, "Never Indexed" representation is used. If
+// f.Sensitive is false and indexing is true, "Incremental Indexing"
+// representation is used.
+func appendIndexedName(dst []byte, f HeaderField, i uint64, indexing bool) []byte {
+	first := len(dst)
+	var n byte
+	if indexing {
+		n = 6
+	} else {
+		n = 4
+	}
+	dst = appendVarInt(dst, n, i)
+	dst[first] |= encodeTypeByte(indexing, f.Sensitive)
+	return appendHpackString(dst, f.Value)
+}
+
+// appendTableSize appends v, as encoded in "Header Table Size Update"
+// representation, to dst and returns the extended buffer.
+func appendTableSize(dst []byte, v uint32) []byte {
+	first := len(dst)
+	dst = appendVarInt(dst, 5, uint64(v))
+	dst[first] |= 0x20
+	return dst
+}
+
+// appendVarInt appends i, as encoded in variable integer form using n
+// bit prefix, to dst and returns the extended buffer.
+//
+// See
+// http://http2.github.io/http2-spec/compression.html#integer.representation
+func appendVarInt(dst []byte, n byte, i uint64) []byte {
+	k := uint64((1 << n) - 1)
+	if i < k {
+		return append(dst, byte(i))
+	}
+	dst = append(dst, byte(k))
+	i -= k
+	for ; i >= 128; i >>= 7 {
+		dst = append(dst, byte(0x80|(i&0x7f)))
+	}
+	return append(dst, byte(i))
+}
+
+// appendHpackString appends s, as encoded in "String Literal"
+// representation, to dst and returns the the extended buffer.
+//
+// s will be encoded in Huffman codes only when it produces strictly
+// shorter byte string.
+func appendHpackString(dst []byte, s string) []byte {
+	huffmanLength := HuffmanEncodeLength(s)
+	if huffmanLength < uint64(len(s)) {
+		first := len(dst)
+		dst = appendVarInt(dst, 7, huffmanLength)
+		dst = AppendHuffmanString(dst, s)
+		dst[first] |= 0x80
+	} else {
+		dst = appendVarInt(dst, 7, uint64(len(s)))
+		dst = append(dst, s...)
+	}
+	return dst
+}
+
+// encodeTypeByte returns type byte. If sensitive is true, type byte
+// for "Never Indexed" representation is returned. If sensitive is
+// false and indexing is true, type byte for "Incremental Indexing"
+// representation is returned. Otherwise, type byte for "Without
+// Indexing" is returned.
+func encodeTypeByte(indexing, sensitive bool) byte {
+	if sensitive {
+		return 0x10
+	}
+	if indexing {
+		return 0x40
+	}
+	return 0
+}
diff --git a/vendor/golang.org/x/net/http2/hpack/hpack.go b/vendor/golang.org/x/net/http2/hpack/hpack.go
new file mode 100644
index 0000000000..2ea4949ab0
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/hpack/hpack.go
@@ -0,0 +1,533 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package hpack implements HPACK, a compression format for
+// efficiently representing HTTP header fields in the context of HTTP/2.
+//
+// See http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-09
+package hpack
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+)
+
+// A DecodingError is something the spec defines as a decoding error.
+type DecodingError struct {
+	Err error
+}
+
+func (de DecodingError) Error() string {
+	return fmt.Sprintf("decoding error: %v", de.Err)
+}
+
+// An InvalidIndexError is returned when an encoder references a table
+// entry before the static table or after the end of the dynamic table.
+type InvalidIndexError int
+
+func (e InvalidIndexError) Error() string {
+	return fmt.Sprintf("invalid indexed representation index %d", int(e))
+}
+
+// A HeaderField is a name-value pair. Both the name and value are
+// treated as opaque sequences of octets.
+type HeaderField struct {
+	Name, Value string
+
+	// Sensitive means that this header field should never be
+	// indexed.
+	Sensitive bool
+}
+
+func (hf HeaderField) String() string {
+	var suffix string
+	if hf.Sensitive {
+		suffix = " (sensitive)"
+	}
+	return fmt.Sprintf("header field %q = %q%s", hf.Name, hf.Value, suffix)
+}
+
+func (hf *HeaderField) size() uint32 {
+	// http://http2.github.io/http2-spec/compression.html#rfc.section.4.1
+	// "The size of the dynamic table is the sum of the size of
+	// its entries.  The size of an entry is the sum of its name's
+	// length in octets (as defined in Section 5.2), its value's
+	// length in octets (see Section 5.2), plus 32.  The size of
+	// an entry is calculated using the length of the name and
+	// value without any Huffman encoding applied."
+
+	// This can overflow if somebody makes a large HeaderField
+	// Name and/or Value by hand, but we don't care, because that
+	// won't happen on the wire because the encoding doesn't allow
+	// it.
+	return uint32(len(hf.Name) + len(hf.Value) + 32)
+}
+
+// A Decoder is the decoding context for incremental processing of
+// header blocks.
+type Decoder struct {
+	dynTab dynamicTable
+	emit   func(f HeaderField)
+
+	emitEnabled bool // whether calls to emit are enabled
+	maxStrLen   int  // 0 means unlimited
+
+	// buf is the unparsed buffer. It's only written to
+	// saveBuf if it was truncated in the middle of a header
+	// block. Because it's usually not owned, we can only
+	// process it under Write.
+	buf []byte // not owned; only valid during Write
+
+	// saveBuf is previous data passed to Write which we weren't able
+	// to fully parse before. Unlike buf, we own this data.
+	saveBuf bytes.Buffer
+}
+
+// NewDecoder returns a new decoder with the provided maximum dynamic
+// table size. The emitFunc will be called for each valid field
+// parsed, in the same goroutine as calls to Write, before Write returns.
+func NewDecoder(maxDynamicTableSize uint32, emitFunc func(f HeaderField)) *Decoder {
+	d := &Decoder{
+		emit:        emitFunc,
+		emitEnabled: true,
+	}
+	d.dynTab.allowedMaxSize = maxDynamicTableSize
+	d.dynTab.setMaxSize(maxDynamicTableSize)
+	return d
+}
+
+// ErrStringLength is returned by Decoder.Write when the max string length
+// (as configured by Decoder.SetMaxStringLength) would be violated.
+var ErrStringLength = errors.New("hpack: string too long")
+
+// SetMaxStringLength sets the maximum size of a HeaderField name or
+// value string. If a string exceeds this length (even after any
+// decompression), Write will return ErrStringLength.
+// A value of 0 means unlimited and is the default from NewDecoder.
+func (d *Decoder) SetMaxStringLength(n int) {
+	d.maxStrLen = n
+}
+
+// SetEmitFunc changes the callback used when new header fields
+// are decoded.
+// It must be non-nil. It does not affect EmitEnabled.
+func (d *Decoder) SetEmitFunc(emitFunc func(f HeaderField)) {
+	d.emit = emitFunc
+}
+
+// SetEmitEnabled controls whether the emitFunc provided to NewDecoder
+// should be called. The default is true.
+//
+// This facility exists to let servers enforce MAX_HEADER_LIST_SIZE
+// while still decoding and keeping in-sync with decoder state, but
+// without doing unnecessary decompression or generating unnecessary
+// garbage for header fields past the limit.
+func (d *Decoder) SetEmitEnabled(v bool) { d.emitEnabled = v }
+
+// EmitEnabled reports whether calls to the emitFunc provided to NewDecoder
+// are currently enabled. The default is true.
+func (d *Decoder) EmitEnabled() bool { return d.emitEnabled }
+
+// TODO: add method *Decoder.Reset(maxSize, emitFunc) to let callers re-use Decoders and their
+// underlying buffers for garbage reasons.
+
+func (d *Decoder) SetMaxDynamicTableSize(v uint32) {
+	d.dynTab.setMaxSize(v)
+}
+
+// SetAllowedMaxDynamicTableSize sets the upper bound that the encoded
+// stream (via dynamic table size updates) may set the maximum size
+// to.
+func (d *Decoder) SetAllowedMaxDynamicTableSize(v uint32) {
+	d.dynTab.allowedMaxSize = v
+}
+
+type dynamicTable struct {
+	// ents is the FIFO described at
+	// http://http2.github.io/http2-spec/compression.html#rfc.section.2.3.2
+	// The newest (low index) is append at the end, and items are
+	// evicted from the front.
+	ents           []HeaderField
+	size           uint32
+	maxSize        uint32 // current maxSize
+	allowedMaxSize uint32 // maxSize may go up to this, inclusive
+}
+
+func (dt *dynamicTable) setMaxSize(v uint32) {
+	dt.maxSize = v
+	dt.evict()
+}
+
+// TODO: change dynamicTable to be a struct with a slice and a size int field,
+// per http://http2.github.io/http2-spec/compression.html#rfc.section.4.1:
+//
+//
+// Then make add increment the size. maybe the max size should move from Decoder to
+// dynamicTable and add should return an ok bool if there was enough space.
+//
+// Later we'll need a remove operation on dynamicTable.
+
+func (dt *dynamicTable) add(f HeaderField) {
+	dt.ents = append(dt.ents, f)
+	dt.size += f.size()
+	dt.evict()
+}
+
+// If we're too big, evict old stuff (front of the slice)
+func (dt *dynamicTable) evict() {
+	base := dt.ents // keep base pointer of slice
+	for dt.size > dt.maxSize {
+		dt.size -= dt.ents[0].size()
+		dt.ents = dt.ents[1:]
+	}
+
+	// Shift slice contents down if we evicted things.
+	if len(dt.ents) != len(base) {
+		copy(base, dt.ents)
+		dt.ents = base[:len(dt.ents)]
+	}
+}
+
+// constantTimeStringCompare compares string a and b in a constant
+// time manner.
+func constantTimeStringCompare(a, b string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+
+	c := byte(0)
+
+	for i := 0; i < len(a); i++ {
+		c |= a[i] ^ b[i]
+	}
+
+	return c == 0
+}
+
+// Search searches f in the table. The return value i is 0 if there is
+// no name match. If there is name match or name/value match, i is the
+// index of that entry (1-based). If both name and value match,
+// nameValueMatch becomes true.
+func (dt *dynamicTable) search(f HeaderField) (i uint64, nameValueMatch bool) {
+	l := len(dt.ents)
+	for j := l - 1; j >= 0; j-- {
+		ent := dt.ents[j]
+		if !constantTimeStringCompare(ent.Name, f.Name) {
+			continue
+		}
+		if i == 0 {
+			i = uint64(l - j)
+		}
+		if f.Sensitive {
+			continue
+		}
+		if !constantTimeStringCompare(ent.Value, f.Value) {
+			continue
+		}
+		i = uint64(l - j)
+		nameValueMatch = true
+		return
+	}
+	return
+}
+
+func (d *Decoder) maxTableIndex() int {
+	return len(d.dynTab.ents) + len(staticTable)
+}
+
+func (d *Decoder) at(i uint64) (hf HeaderField, ok bool) {
+	if i < 1 {
+		return
+	}
+	if i > uint64(d.maxTableIndex()) {
+		return
+	}
+	if i <= uint64(len(staticTable)) {
+		return staticTable[i-1], true
+	}
+	dents := d.dynTab.ents
+	return dents[len(dents)-(int(i)-len(staticTable))], true
+}
+
+// Decode decodes an entire block.
+//
+// TODO: remove this method and make it incremental later? This is
+// easier for debugging now.
+func (d *Decoder) DecodeFull(p []byte) ([]HeaderField, error) {
+	var hf []HeaderField
+	saveFunc := d.emit
+	defer func() { d.emit = saveFunc }()
+	d.emit = func(f HeaderField) { hf = append(hf, f) }
+	if _, err := d.Write(p); err != nil {
+		return nil, err
+	}
+	if err := d.Close(); err != nil {
+		return nil, err
+	}
+	return hf, nil
+}
+
+func (d *Decoder) Close() error {
+	if d.saveBuf.Len() > 0 {
+		d.saveBuf.Reset()
+		return DecodingError{errors.New("truncated headers")}
+	}
+	return nil
+}
+
+func (d *Decoder) Write(p []byte) (n int, err error) {
+	if len(p) == 0 {
+		// Prevent state machine CPU attacks (making us redo
+		// work up to the point of finding out we don't have
+		// enough data)
+		return
+	}
+	// Only copy the data if we have to. Optimistically assume
+	// that p will contain a complete header block.
+	if d.saveBuf.Len() == 0 {
+		d.buf = p
+	} else {
+		d.saveBuf.Write(p)
+		d.buf = d.saveBuf.Bytes()
+		d.saveBuf.Reset()
+	}
+
+	for len(d.buf) > 0 {
+		err = d.parseHeaderFieldRepr()
+		if err == errNeedMore {
+			// Extra paranoia, making sure saveBuf won't
+			// get too large.  All the varint and string
+			// reading code earlier should already catch
+			// overlong things and return ErrStringLength,
+			// but keep this as a last resort.
+			const varIntOverhead = 8 // conservative
+			if d.maxStrLen != 0 && int64(len(d.buf)) > 2*(int64(d.maxStrLen)+varIntOverhead) {
+				return 0, ErrStringLength
+			}
+			d.saveBuf.Write(d.buf)
+			return len(p), nil
+		}
+		if err != nil {
+			break
+		}
+	}
+	return len(p), err
+}
+
+// errNeedMore is an internal sentinel error value that means the
+// buffer is truncated and we need to read more data before we can
+// continue parsing.
+var errNeedMore = errors.New("need more data")
+
+type indexType int
+
+const (
+	indexedTrue indexType = iota
+	indexedFalse
+	indexedNever
+)
+
+func (v indexType) indexed() bool   { return v == indexedTrue }
+func (v indexType) sensitive() bool { return v == indexedNever }
+
+// returns errNeedMore if there isn't enough data available.
+// any other error is fatal.
+// consumes d.buf iff it returns nil.
+// precondition: must be called with len(d.buf) > 0
+func (d *Decoder) parseHeaderFieldRepr() error {
+	b := d.buf[0]
+	switch {
+	case b&128 != 0:
+		// Indexed representation.
+		// High bit set?
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.1
+		return d.parseFieldIndexed()
+	case b&192 == 64:
+		// 6.2.1 Literal Header Field with Incremental Indexing
+		// 0b10xxxxxx: top two bits are 10
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.1
+		return d.parseFieldLiteral(6, indexedTrue)
+	case b&240 == 0:
+		// 6.2.2 Literal Header Field without Indexing
+		// 0b0000xxxx: top four bits are 0000
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.2
+		return d.parseFieldLiteral(4, indexedFalse)
+	case b&240 == 16:
+		// 6.2.3 Literal Header Field never Indexed
+		// 0b0001xxxx: top four bits are 0001
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.3
+		return d.parseFieldLiteral(4, indexedNever)
+	case b&224 == 32:
+		// 6.3 Dynamic Table Size Update
+		// Top three bits are '001'.
+		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.3
+		return d.parseDynamicTableSizeUpdate()
+	}
+
+	return DecodingError{errors.New("invalid encoding")}
+}
+
+// (same invariants and behavior as parseHeaderFieldRepr)
+func (d *Decoder) parseFieldIndexed() error {
+	buf := d.buf
+	idx, buf, err := readVarInt(7, buf)
+	if err != nil {
+		return err
+	}
+	hf, ok := d.at(idx)
+	if !ok {
+		return DecodingError{InvalidIndexError(idx)}
+	}
+	d.buf = buf
+	return d.callEmit(HeaderField{Name: hf.Name, Value: hf.Value})
+}
+
+// (same invariants and behavior as parseHeaderFieldRepr)
+func (d *Decoder) parseFieldLiteral(n uint8, it indexType) error {
+	buf := d.buf
+	nameIdx, buf, err := readVarInt(n, buf)
+	if err != nil {
+		return err
+	}
+
+	var hf HeaderField
+	wantStr := d.emitEnabled || it.indexed()
+	if nameIdx > 0 {
+		ihf, ok := d.at(nameIdx)
+		if !ok {
+			return DecodingError{InvalidIndexError(nameIdx)}
+		}
+		hf.Name = ihf.Name
+	} else {
+		hf.Name, buf, err = d.readString(buf, wantStr)
+		if err != nil {
+			return err
+		}
+	}
+	hf.Value, buf, err = d.readString(buf, wantStr)
+	if err != nil {
+		return err
+	}
+	d.buf = buf
+	if it.indexed() {
+		d.dynTab.add(hf)
+	}
+	hf.Sensitive = it.sensitive()
+	return d.callEmit(hf)
+}
+
+func (d *Decoder) callEmit(hf HeaderField) error {
+	if d.maxStrLen != 0 {
+		if len(hf.Name) > d.maxStrLen || len(hf.Value) > d.maxStrLen {
+			return ErrStringLength
+		}
+	}
+	if d.emitEnabled {
+		d.emit(hf)
+	}
+	return nil
+}
+
+// (same invariants and behavior as parseHeaderFieldRepr)
+func (d *Decoder) parseDynamicTableSizeUpdate() error {
+	buf := d.buf
+	size, buf, err := readVarInt(5, buf)
+	if err != nil {
+		return err
+	}
+	if size > uint64(d.dynTab.allowedMaxSize) {
+		return DecodingError{errors.New("dynamic table size update too large")}
+	}
+	d.dynTab.setMaxSize(uint32(size))
+	d.buf = buf
+	return nil
+}
+
+var errVarintOverflow = DecodingError{errors.New("varint integer overflow")}
+
+// readVarInt reads an unsigned variable length integer off the
+// beginning of p. n is the parameter as described in
+// http://http2.github.io/http2-spec/compression.html#rfc.section.5.1.
+//
+// n must always be between 1 and 8.
+//
+// The returned remain buffer is either a smaller suffix of p, or err != nil.
+// The error is errNeedMore if p doesn't contain a complete integer.
+func readVarInt(n byte, p []byte) (i uint64, remain []byte, err error) {
+	if n < 1 || n > 8 {
+		panic("bad n")
+	}
+	if len(p) == 0 {
+		return 0, p, errNeedMore
+	}
+	i = uint64(p[0])
+	if n < 8 {
+		i &= (1 << uint64(n)) - 1
+	}
+	if i < (1<<uint64(n))-1 {
+		return i, p[1:], nil
+	}
+
+	origP := p
+	p = p[1:]
+	var m uint64
+	for len(p) > 0 {
+		b := p[0]
+		p = p[1:]
+		i += uint64(b&127) << m
+		if b&128 == 0 {
+			return i, p, nil
+		}
+		m += 7
+		if m >= 63 { // TODO: proper overflow check. making this up.
+			return 0, origP, errVarintOverflow
+		}
+	}
+	return 0, origP, errNeedMore
+}
+
+// readString decodes an hpack string from p.
+//
+// wantStr is whether s will be used. If false, decompression and
+// []byte->string garbage are skipped if s will be ignored
+// anyway. This does mean that huffman decoding errors for non-indexed
+// strings past the MAX_HEADER_LIST_SIZE are ignored, but the server
+// is returning an error anyway, and because they're not indexed, the error
+// won't affect the decoding state.
+func (d *Decoder) readString(p []byte, wantStr bool) (s string, remain []byte, err error) {
+	if len(p) == 0 {
+		return "", p, errNeedMore
+	}
+	isHuff := p[0]&128 != 0
+	strLen, p, err := readVarInt(7, p)
+	if err != nil {
+		return "", p, err
+	}
+	if d.maxStrLen != 0 && strLen > uint64(d.maxStrLen) {
+		return "", nil, ErrStringLength
+	}
+	if uint64(len(p)) < strLen {
+		return "", p, errNeedMore
+	}
+	if !isHuff {
+		if wantStr {
+			s = string(p[:strLen])
+		}
+		return s, p[strLen:], nil
+	}
+
+	if wantStr {
+		buf := bufPool.Get().(*bytes.Buffer)
+		buf.Reset() // don't trust others
+		defer bufPool.Put(buf)
+		if err := huffmanDecode(buf, d.maxStrLen, p[:strLen]); err != nil {
+			buf.Reset()
+			return "", nil, err
+		}
+		s = buf.String()
+		buf.Reset() // be nice to GC
+	}
+	return s, p[strLen:], nil
+}
diff --git a/vendor/golang.org/x/net/http2/hpack/huffman.go b/vendor/golang.org/x/net/http2/hpack/huffman.go
new file mode 100644
index 0000000000..eb4b1f05cd
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/hpack/huffman.go
@@ -0,0 +1,190 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package hpack
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"sync"
+)
+
+var bufPool = sync.Pool{
+	New: func() interface{} { return new(bytes.Buffer) },
+}
+
+// HuffmanDecode decodes the string in v and writes the expanded
+// result to w, returning the number of bytes written to w and the
+// Write call's return value. At most one Write call is made.
+func HuffmanDecode(w io.Writer, v []byte) (int, error) {
+	buf := bufPool.Get().(*bytes.Buffer)
+	buf.Reset()
+	defer bufPool.Put(buf)
+	if err := huffmanDecode(buf, 0, v); err != nil {
+		return 0, err
+	}
+	return w.Write(buf.Bytes())
+}
+
+// HuffmanDecodeToString decodes the string in v.
+func HuffmanDecodeToString(v []byte) (string, error) {
+	buf := bufPool.Get().(*bytes.Buffer)
+	buf.Reset()
+	defer bufPool.Put(buf)
+	if err := huffmanDecode(buf, 0, v); err != nil {
+		return "", err
+	}
+	return buf.String(), nil
+}
+
+// ErrInvalidHuffman is returned for errors found decoding
+// Huffman-encoded strings.
+var ErrInvalidHuffman = errors.New("hpack: invalid Huffman-encoded data")
+
+// huffmanDecode decodes v to buf.
+// If maxLen is greater than 0, attempts to write more to buf than
+// maxLen bytes will return ErrStringLength.
+func huffmanDecode(buf *bytes.Buffer, maxLen int, v []byte) error {
+	n := rootHuffmanNode
+	cur, nbits := uint(0), uint8(0)
+	for _, b := range v {
+		cur = cur<<8 | uint(b)
+		nbits += 8
+		for nbits >= 8 {
+			idx := byte(cur >> (nbits - 8))
+			n = n.children[idx]
+			if n == nil {
+				return ErrInvalidHuffman
+			}
+			if n.children == nil {
+				if maxLen != 0 && buf.Len() == maxLen {
+					return ErrStringLength
+				}
+				buf.WriteByte(n.sym)
+				nbits -= n.codeLen
+				n = rootHuffmanNode
+			} else {
+				nbits -= 8
+			}
+		}
+	}
+	for nbits > 0 {
+		n = n.children[byte(cur<<(8-nbits))]
+		if n.children != nil || n.codeLen > nbits {
+			break
+		}
+		buf.WriteByte(n.sym)
+		nbits -= n.codeLen
+		n = rootHuffmanNode
+	}
+	return nil
+}
+
+type node struct {
+	// children is non-nil for internal nodes
+	children []*node
+
+	// The following are only valid if children is nil:
+	codeLen uint8 // number of bits that led to the output of sym
+	sym     byte  // output symbol
+}
+
+func newInternalNode() *node {
+	return &node{children: make([]*node, 256)}
+}
+
+var rootHuffmanNode = newInternalNode()
+
+func init() {
+	if len(huffmanCodes) != 256 {
+		panic("unexpected size")
+	}
+	for i, code := range huffmanCodes {
+		addDecoderNode(byte(i), code, huffmanCodeLen[i])
+	}
+}
+
+func addDecoderNode(sym byte, code uint32, codeLen uint8) {
+	cur := rootHuffmanNode
+	for codeLen > 8 {
+		codeLen -= 8
+		i := uint8(code >> codeLen)
+		if cur.children[i] == nil {
+			cur.children[i] = newInternalNode()
+		}
+		cur = cur.children[i]
+	}
+	shift := 8 - codeLen
+	start, end := int(uint8(code<<shift)), int(1<<shift)
+	for i := start; i < start+end; i++ {
+		cur.children[i] = &node{sym: sym, codeLen: codeLen}
+	}
+}
+
+// AppendHuffmanString appends s, as encoded in Huffman codes, to dst
+// and returns the extended buffer.
+func AppendHuffmanString(dst []byte, s string) []byte {
+	rembits := uint8(8)
+
+	for i := 0; i < len(s); i++ {
+		if rembits == 8 {
+			dst = append(dst, 0)
+		}
+		dst, rembits = appendByteToHuffmanCode(dst, rembits, s[i])
+	}
+
+	if rembits < 8 {
+		// special EOS symbol
+		code := uint32(0x3fffffff)
+		nbits := uint8(30)
+
+		t := uint8(code >> (nbits - rembits))
+		dst[len(dst)-1] |= t
+	}
+
+	return dst
+}
+
+// HuffmanEncodeLength returns the number of bytes required to encode
+// s in Huffman codes. The result is round up to byte boundary.
+func HuffmanEncodeLength(s string) uint64 {
+	n := uint64(0)
+	for i := 0; i < len(s); i++ {
+		n += uint64(huffmanCodeLen[s[i]])
+	}
+	return (n + 7) / 8
+}
+
+// appendByteToHuffmanCode appends Huffman code for c to dst and
+// returns the extended buffer and the remaining bits in the last
+// element. The appending is not byte aligned and the remaining bits
+// in the last element of dst is given in rembits.
+func appendByteToHuffmanCode(dst []byte, rembits uint8, c byte) ([]byte, uint8) {
+	code := huffmanCodes[c]
+	nbits := huffmanCodeLen[c]
+
+	for {
+		if rembits > nbits {
+			t := uint8(code << (rembits - nbits))
+			dst[len(dst)-1] |= t
+			rembits -= nbits
+			break
+		}
+
+		t := uint8(code >> (nbits - rembits))
+		dst[len(dst)-1] |= t
+
+		nbits -= rembits
+		rembits = 8
+
+		if nbits == 0 {
+			break
+		}
+
+		dst = append(dst, 0)
+	}
+
+	return dst, rembits
+}
diff --git a/vendor/golang.org/x/net/http2/hpack/tables.go b/vendor/golang.org/x/net/http2/hpack/tables.go
new file mode 100644
index 0000000000..b9283a0233
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/hpack/tables.go
@@ -0,0 +1,352 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package hpack
+
+func pair(name, value string) HeaderField {
+	return HeaderField{Name: name, Value: value}
+}
+
+// http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-07#appendix-B
+var staticTable = [...]HeaderField{
+	pair(":authority", ""), // index 1 (1-based)
+	pair(":method", "GET"),
+	pair(":method", "POST"),
+	pair(":path", "/"),
+	pair(":path", "/index.html"),
+	pair(":scheme", "http"),
+	pair(":scheme", "https"),
+	pair(":status", "200"),
+	pair(":status", "204"),
+	pair(":status", "206"),
+	pair(":status", "304"),
+	pair(":status", "400"),
+	pair(":status", "404"),
+	pair(":status", "500"),
+	pair("accept-charset", ""),
+	pair("accept-encoding", "gzip, deflate"),
+	pair("accept-language", ""),
+	pair("accept-ranges", ""),
+	pair("accept", ""),
+	pair("access-control-allow-origin", ""),
+	pair("age", ""),
+	pair("allow", ""),
+	pair("authorization", ""),
+	pair("cache-control", ""),
+	pair("content-disposition", ""),
+	pair("content-encoding", ""),
+	pair("content-language", ""),
+	pair("content-length", ""),
+	pair("content-location", ""),
+	pair("content-range", ""),
+	pair("content-type", ""),
+	pair("cookie", ""),
+	pair("date", ""),
+	pair("etag", ""),
+	pair("expect", ""),
+	pair("expires", ""),
+	pair("from", ""),
+	pair("host", ""),
+	pair("if-match", ""),
+	pair("if-modified-since", ""),
+	pair("if-none-match", ""),
+	pair("if-range", ""),
+	pair("if-unmodified-since", ""),
+	pair("last-modified", ""),
+	pair("link", ""),
+	pair("location", ""),
+	pair("max-forwards", ""),
+	pair("proxy-authenticate", ""),
+	pair("proxy-authorization", ""),
+	pair("range", ""),
+	pair("referer", ""),
+	pair("refresh", ""),
+	pair("retry-after", ""),
+	pair("server", ""),
+	pair("set-cookie", ""),
+	pair("strict-transport-security", ""),
+	pair("transfer-encoding", ""),
+	pair("user-agent", ""),
+	pair("vary", ""),
+	pair("via", ""),
+	pair("www-authenticate", ""),
+}
+
+var huffmanCodes = [256]uint32{
+	0x1ff8,
+	0x7fffd8,
+	0xfffffe2,
+	0xfffffe3,
+	0xfffffe4,
+	0xfffffe5,
+	0xfffffe6,
+	0xfffffe7,
+	0xfffffe8,
+	0xffffea,
+	0x3ffffffc,
+	0xfffffe9,
+	0xfffffea,
+	0x3ffffffd,
+	0xfffffeb,
+	0xfffffec,
+	0xfffffed,
+	0xfffffee,
+	0xfffffef,
+	0xffffff0,
+	0xffffff1,
+	0xffffff2,
+	0x3ffffffe,
+	0xffffff3,
+	0xffffff4,
+	0xffffff5,
+	0xffffff6,
+	0xffffff7,
+	0xffffff8,
+	0xffffff9,
+	0xffffffa,
+	0xffffffb,
+	0x14,
+	0x3f8,
+	0x3f9,
+	0xffa,
+	0x1ff9,
+	0x15,
+	0xf8,
+	0x7fa,
+	0x3fa,
+	0x3fb,
+	0xf9,
+	0x7fb,
+	0xfa,
+	0x16,
+	0x17,
+	0x18,
+	0x0,
+	0x1,
+	0x2,
+	0x19,
+	0x1a,
+	0x1b,
+	0x1c,
+	0x1d,
+	0x1e,
+	0x1f,
+	0x5c,
+	0xfb,
+	0x7ffc,
+	0x20,
+	0xffb,
+	0x3fc,
+	0x1ffa,
+	0x21,
+	0x5d,
+	0x5e,
+	0x5f,
+	0x60,
+	0x61,
+	0x62,
+	0x63,
+	0x64,
+	0x65,
+	0x66,
+	0x67,
+	0x68,
+	0x69,
+	0x6a,
+	0x6b,
+	0x6c,
+	0x6d,
+	0x6e,
+	0x6f,
+	0x70,
+	0x71,
+	0x72,
+	0xfc,
+	0x73,
+	0xfd,
+	0x1ffb,
+	0x7fff0,
+	0x1ffc,
+	0x3ffc,
+	0x22,
+	0x7ffd,
+	0x3,
+	0x23,
+	0x4,
+	0x24,
+	0x5,
+	0x25,
+	0x26,
+	0x27,
+	0x6,
+	0x74,
+	0x75,
+	0x28,
+	0x29,
+	0x2a,
+	0x7,
+	0x2b,
+	0x76,
+	0x2c,
+	0x8,
+	0x9,
+	0x2d,
+	0x77,
+	0x78,
+	0x79,
+	0x7a,
+	0x7b,
+	0x7ffe,
+	0x7fc,
+	0x3ffd,
+	0x1ffd,
+	0xffffffc,
+	0xfffe6,
+	0x3fffd2,
+	0xfffe7,
+	0xfffe8,
+	0x3fffd3,
+	0x3fffd4,
+	0x3fffd5,
+	0x7fffd9,
+	0x3fffd6,
+	0x7fffda,
+	0x7fffdb,
+	0x7fffdc,
+	0x7fffdd,
+	0x7fffde,
+	0xffffeb,
+	0x7fffdf,
+	0xffffec,
+	0xffffed,
+	0x3fffd7,
+	0x7fffe0,
+	0xffffee,
+	0x7fffe1,
+	0x7fffe2,
+	0x7fffe3,
+	0x7fffe4,
+	0x1fffdc,
+	0x3fffd8,
+	0x7fffe5,
+	0x3fffd9,
+	0x7fffe6,
+	0x7fffe7,
+	0xffffef,
+	0x3fffda,
+	0x1fffdd,
+	0xfffe9,
+	0x3fffdb,
+	0x3fffdc,
+	0x7fffe8,
+	0x7fffe9,
+	0x1fffde,
+	0x7fffea,
+	0x3fffdd,
+	0x3fffde,
+	0xfffff0,
+	0x1fffdf,
+	0x3fffdf,
+	0x7fffeb,
+	0x7fffec,
+	0x1fffe0,
+	0x1fffe1,
+	0x3fffe0,
+	0x1fffe2,
+	0x7fffed,
+	0x3fffe1,
+	0x7fffee,
+	0x7fffef,
+	0xfffea,
+	0x3fffe2,
+	0x3fffe3,
+	0x3fffe4,
+	0x7ffff0,
+	0x3fffe5,
+	0x3fffe6,
+	0x7ffff1,
+	0x3ffffe0,
+	0x3ffffe1,
+	0xfffeb,
+	0x7fff1,
+	0x3fffe7,
+	0x7ffff2,
+	0x3fffe8,
+	0x1ffffec,
+	0x3ffffe2,
+	0x3ffffe3,
+	0x3ffffe4,
+	0x7ffffde,
+	0x7ffffdf,
+	0x3ffffe5,
+	0xfffff1,
+	0x1ffffed,
+	0x7fff2,
+	0x1fffe3,
+	0x3ffffe6,
+	0x7ffffe0,
+	0x7ffffe1,
+	0x3ffffe7,
+	0x7ffffe2,
+	0xfffff2,
+	0x1fffe4,
+	0x1fffe5,
+	0x3ffffe8,
+	0x3ffffe9,
+	0xffffffd,
+	0x7ffffe3,
+	0x7ffffe4,
+	0x7ffffe5,
+	0xfffec,
+	0xfffff3,
+	0xfffed,
+	0x1fffe6,
+	0x3fffe9,
+	0x1fffe7,
+	0x1fffe8,
+	0x7ffff3,
+	0x3fffea,
+	0x3fffeb,
+	0x1ffffee,
+	0x1ffffef,
+	0xfffff4,
+	0xfffff5,
+	0x3ffffea,
+	0x7ffff4,
+	0x3ffffeb,
+	0x7ffffe6,
+	0x3ffffec,
+	0x3ffffed,
+	0x7ffffe7,
+	0x7ffffe8,
+	0x7ffffe9,
+	0x7ffffea,
+	0x7ffffeb,
+	0xffffffe,
+	0x7ffffec,
+	0x7ffffed,
+	0x7ffffee,
+	0x7ffffef,
+	0x7fffff0,
+	0x3ffffee,
+}
+
+var huffmanCodeLen = [256]uint8{
+	13, 23, 28, 28, 28, 28, 28, 28, 28, 24, 30, 28, 28, 30, 28, 28,
+	28, 28, 28, 28, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+	6, 10, 10, 12, 13, 6, 8, 11, 10, 10, 8, 11, 8, 6, 6, 6,
+	5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 8, 15, 6, 12, 10,
+	13, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 13, 19, 13, 14, 6,
+	15, 5, 6, 5, 6, 5, 6, 6, 6, 5, 7, 7, 6, 6, 6, 5,
+	6, 7, 6, 5, 5, 6, 7, 7, 7, 7, 7, 15, 11, 14, 13, 28,
+	20, 22, 20, 20, 22, 22, 22, 23, 22, 23, 23, 23, 23, 23, 24, 23,
+	24, 24, 22, 23, 24, 23, 23, 23, 23, 21, 22, 23, 22, 23, 23, 24,
+	22, 21, 20, 22, 22, 23, 23, 21, 23, 22, 22, 24, 21, 22, 23, 23,
+	21, 21, 22, 21, 23, 22, 23, 23, 20, 22, 22, 22, 23, 22, 22, 23,
+	26, 26, 20, 19, 22, 23, 22, 25, 26, 26, 26, 27, 27, 26, 24, 25,
+	19, 21, 26, 27, 27, 26, 27, 24, 21, 21, 26, 26, 28, 27, 27, 27,
+	20, 24, 20, 21, 22, 21, 21, 23, 22, 22, 25, 25, 24, 24, 26, 23,
+	26, 27, 26, 26, 27, 27, 27, 27, 27, 28, 27, 27, 27, 27, 27, 26,
+}
diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go
new file mode 100644
index 0000000000..3ed51a44e8
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/http2.go
@@ -0,0 +1,424 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package http2 implements the HTTP/2 protocol.
+//
+// This package is low-level and intended to be used directly by very
+// few people. Most users will use it indirectly through the automatic
+// use by the net/http package (from Go 1.6 and later).
+// For use in earlier Go versions see ConfigureServer. (Transport support
+// requires Go 1.6 or later)
+//
+// See https://http2.github.io/ for more information on HTTP/2.
+//
+// See https://http2.golang.org/ for a test server running this code.
+package http2
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+var (
+	VerboseLogs    bool
+	logFrameWrites bool
+	logFrameReads  bool
+)
+
+func init() {
+	e := os.Getenv("GODEBUG")
+	if strings.Contains(e, "http2debug=1") {
+		VerboseLogs = true
+	}
+	if strings.Contains(e, "http2debug=2") {
+		VerboseLogs = true
+		logFrameWrites = true
+		logFrameReads = true
+	}
+}
+
+const (
+	// ClientPreface is the string that must be sent by new
+	// connections from clients.
+	ClientPreface = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
+
+	// SETTINGS_MAX_FRAME_SIZE default
+	// http://http2.github.io/http2-spec/#rfc.section.6.5.2
+	initialMaxFrameSize = 16384
+
+	// NextProtoTLS is the NPN/ALPN protocol negotiated during
+	// HTTP/2's TLS setup.
+	NextProtoTLS = "h2"
+
+	// http://http2.github.io/http2-spec/#SettingValues
+	initialHeaderTableSize = 4096
+
+	initialWindowSize = 65535 // 6.9.2 Initial Flow Control Window Size
+
+	defaultMaxReadFrameSize = 1 << 20
+)
+
+var (
+	clientPreface = []byte(ClientPreface)
+)
+
+type streamState int
+
+const (
+	stateIdle streamState = iota
+	stateOpen
+	stateHalfClosedLocal
+	stateHalfClosedRemote
+	stateResvLocal
+	stateResvRemote
+	stateClosed
+)
+
+var stateName = [...]string{
+	stateIdle:             "Idle",
+	stateOpen:             "Open",
+	stateHalfClosedLocal:  "HalfClosedLocal",
+	stateHalfClosedRemote: "HalfClosedRemote",
+	stateResvLocal:        "ResvLocal",
+	stateResvRemote:       "ResvRemote",
+	stateClosed:           "Closed",
+}
+
+func (st streamState) String() string {
+	return stateName[st]
+}
+
+// Setting is a setting parameter: which setting it is, and its value.
+type Setting struct {
+	// ID is which setting is being set.
+	// See http://http2.github.io/http2-spec/#SettingValues
+	ID SettingID
+
+	// Val is the value.
+	Val uint32
+}
+
+func (s Setting) String() string {
+	return fmt.Sprintf("[%v = %d]", s.ID, s.Val)
+}
+
+// Valid reports whether the setting is valid.
+func (s Setting) Valid() error {
+	// Limits and error codes from 6.5.2 Defined SETTINGS Parameters
+	switch s.ID {
+	case SettingEnablePush:
+		if s.Val != 1 && s.Val != 0 {
+			return ConnectionError(ErrCodeProtocol)
+		}
+	case SettingInitialWindowSize:
+		if s.Val > 1<<31-1 {
+			return ConnectionError(ErrCodeFlowControl)
+		}
+	case SettingMaxFrameSize:
+		if s.Val < 16384 || s.Val > 1<<24-1 {
+			return ConnectionError(ErrCodeProtocol)
+		}
+	}
+	return nil
+}
+
+// A SettingID is an HTTP/2 setting as defined in
+// http://http2.github.io/http2-spec/#iana-settings
+type SettingID uint16
+
+const (
+	SettingHeaderTableSize      SettingID = 0x1
+	SettingEnablePush           SettingID = 0x2
+	SettingMaxConcurrentStreams SettingID = 0x3
+	SettingInitialWindowSize    SettingID = 0x4
+	SettingMaxFrameSize         SettingID = 0x5
+	SettingMaxHeaderListSize    SettingID = 0x6
+)
+
+var settingName = map[SettingID]string{
+	SettingHeaderTableSize:      "HEADER_TABLE_SIZE",
+	SettingEnablePush:           "ENABLE_PUSH",
+	SettingMaxConcurrentStreams: "MAX_CONCURRENT_STREAMS",
+	SettingInitialWindowSize:    "INITIAL_WINDOW_SIZE",
+	SettingMaxFrameSize:         "MAX_FRAME_SIZE",
+	SettingMaxHeaderListSize:    "MAX_HEADER_LIST_SIZE",
+}
+
+func (s SettingID) String() string {
+	if v, ok := settingName[s]; ok {
+		return v
+	}
+	return fmt.Sprintf("UNKNOWN_SETTING_%d", uint16(s))
+}
+
+var (
+	errInvalidHeaderFieldName  = errors.New("http2: invalid header field name")
+	errInvalidHeaderFieldValue = errors.New("http2: invalid header field value")
+)
+
+// validHeaderFieldName reports whether v is a valid header field name (key).
+//  RFC 7230 says:
+//   header-field   = field-name ":" OWS field-value OWS
+//   field-name     = token
+//   tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." /
+//           "^" / "_" / "
+// Further, http2 says:
+//   "Just as in HTTP/1.x, header field names are strings of ASCII
+//   characters that are compared in a case-insensitive
+//   fashion. However, header field names MUST be converted to
+//   lowercase prior to their encoding in HTTP/2. "
+func validHeaderFieldName(v string) bool {
+	if len(v) == 0 {
+		return false
+	}
+	for _, r := range v {
+		if int(r) >= len(isTokenTable) || ('A' <= r && r <= 'Z') {
+			return false
+		}
+		if !isTokenTable[byte(r)] {
+			return false
+		}
+	}
+	return true
+}
+
+// validHeaderFieldValue reports whether v is a valid header field value.
+//
+// RFC 7230 says:
+//  field-value    = *( field-content / obs-fold )
+//  obj-fold       =  N/A to http2, and deprecated
+//  field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
+//  field-vchar    = VCHAR / obs-text
+//  obs-text       = %x80-FF
+//  VCHAR          = "any visible [USASCII] character"
+//
+// http2 further says: "Similarly, HTTP/2 allows header field values
+// that are not valid. While most of the values that can be encoded
+// will not alter header field parsing, carriage return (CR, ASCII
+// 0xd), line feed (LF, ASCII 0xa), and the zero character (NUL, ASCII
+// 0x0) might be exploited by an attacker if they are translated
+// verbatim. Any request or response that contains a character not
+// permitted in a header field value MUST be treated as malformed
+// (Section 8.1.2.6). Valid characters are defined by the
+// field-content ABNF rule in Section 3.2 of [RFC7230]."
+//
+// This function does not (yet?) properly handle the rejection of
+// strings that begin or end with SP or HTAB.
+func validHeaderFieldValue(v string) bool {
+	for i := 0; i < len(v); i++ {
+		if b := v[i]; b < ' ' && b != '\t' || b == 0x7f {
+			return false
+		}
+	}
+	return true
+}
+
+var httpCodeStringCommon = map[int]string{} // n -> strconv.Itoa(n)
+
+func init() {
+	for i := 100; i <= 999; i++ {
+		if v := http.StatusText(i); v != "" {
+			httpCodeStringCommon[i] = strconv.Itoa(i)
+		}
+	}
+}
+
+func httpCodeString(code int) string {
+	if s, ok := httpCodeStringCommon[code]; ok {
+		return s
+	}
+	return strconv.Itoa(code)
+}
+
+// from pkg io
+type stringWriter interface {
+	WriteString(s string) (n int, err error)
+}
+
+// A gate lets two goroutines coordinate their activities.
+type gate chan struct{}
+
+func (g gate) Done() { g <- struct{}{} }
+func (g gate) Wait() { <-g }
+
+// A closeWaiter is like a sync.WaitGroup but only goes 1 to 0 (open to closed).
+type closeWaiter chan struct{}
+
+// Init makes a closeWaiter usable.
+// It exists because so a closeWaiter value can be placed inside a
+// larger struct and have the Mutex and Cond's memory in the same
+// allocation.
+func (cw *closeWaiter) Init() {
+	*cw = make(chan struct{})
+}
+
+// Close marks the closeWaiter as closed and unblocks any waiters.
+func (cw closeWaiter) Close() {
+	close(cw)
+}
+
+// Wait waits for the closeWaiter to become closed.
+func (cw closeWaiter) Wait() {
+	<-cw
+}
+
+// bufferedWriter is a buffered writer that writes to w.
+// Its buffered writer is lazily allocated as needed, to minimize
+// idle memory usage with many connections.
+type bufferedWriter struct {
+	w  io.Writer     // immutable
+	bw *bufio.Writer // non-nil when data is buffered
+}
+
+func newBufferedWriter(w io.Writer) *bufferedWriter {
+	return &bufferedWriter{w: w}
+}
+
+var bufWriterPool = sync.Pool{
+	New: func() interface{} {
+		// TODO: pick something better? this is a bit under
+		// (3 x typical 1500 byte MTU) at least.
+		return bufio.NewWriterSize(nil, 4<<10)
+	},
+}
+
+func (w *bufferedWriter) Write(p []byte) (n int, err error) {
+	if w.bw == nil {
+		bw := bufWriterPool.Get().(*bufio.Writer)
+		bw.Reset(w.w)
+		w.bw = bw
+	}
+	return w.bw.Write(p)
+}
+
+func (w *bufferedWriter) Flush() error {
+	bw := w.bw
+	if bw == nil {
+		return nil
+	}
+	err := bw.Flush()
+	bw.Reset(nil)
+	bufWriterPool.Put(bw)
+	w.bw = nil
+	return err
+}
+
+func mustUint31(v int32) uint32 {
+	if v < 0 || v > 2147483647 {
+		panic("out of range")
+	}
+	return uint32(v)
+}
+
+// bodyAllowedForStatus reports whether a given response status code
+// permits a body. See RFC2616, section 4.4.
+func bodyAllowedForStatus(status int) bool {
+	switch {
+	case status >= 100 && status <= 199:
+		return false
+	case status == 204:
+		return false
+	case status == 304:
+		return false
+	}
+	return true
+}
+
+type httpError struct {
+	msg     string
+	timeout bool
+}
+
+func (e *httpError) Error() string   { return e.msg }
+func (e *httpError) Timeout() bool   { return e.timeout }
+func (e *httpError) Temporary() bool { return true }
+
+var errTimeout error = &httpError{msg: "http2: timeout awaiting response headers", timeout: true}
+
+var isTokenTable = [127]bool{
+	'!':  true,
+	'#':  true,
+	'$':  true,
+	'%':  true,
+	'&':  true,
+	'\'': true,
+	'*':  true,
+	'+':  true,
+	'-':  true,
+	'.':  true,
+	'0':  true,
+	'1':  true,
+	'2':  true,
+	'3':  true,
+	'4':  true,
+	'5':  true,
+	'6':  true,
+	'7':  true,
+	'8':  true,
+	'9':  true,
+	'A':  true,
+	'B':  true,
+	'C':  true,
+	'D':  true,
+	'E':  true,
+	'F':  true,
+	'G':  true,
+	'H':  true,
+	'I':  true,
+	'J':  true,
+	'K':  true,
+	'L':  true,
+	'M':  true,
+	'N':  true,
+	'O':  true,
+	'P':  true,
+	'Q':  true,
+	'R':  true,
+	'S':  true,
+	'T':  true,
+	'U':  true,
+	'W':  true,
+	'V':  true,
+	'X':  true,
+	'Y':  true,
+	'Z':  true,
+	'^':  true,
+	'_':  true,
+	'`':  true,
+	'a':  true,
+	'b':  true,
+	'c':  true,
+	'd':  true,
+	'e':  true,
+	'f':  true,
+	'g':  true,
+	'h':  true,
+	'i':  true,
+	'j':  true,
+	'k':  true,
+	'l':  true,
+	'm':  true,
+	'n':  true,
+	'o':  true,
+	'p':  true,
+	'q':  true,
+	'r':  true,
+	's':  true,
+	't':  true,
+	'u':  true,
+	'v':  true,
+	'w':  true,
+	'x':  true,
+	'y':  true,
+	'z':  true,
+	'|':  true,
+	'~':  true,
+}
diff --git a/vendor/golang.org/x/net/http2/not_go15.go b/vendor/golang.org/x/net/http2/not_go15.go
new file mode 100644
index 0000000000..d0fa5c8906
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/not_go15.go
@@ -0,0 +1,11 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !go1.5
+
+package http2
+
+import "net/http"
+
+func requestCancel(req *http.Request) <-chan struct{} { return nil }
diff --git a/vendor/golang.org/x/net/http2/not_go16.go b/vendor/golang.org/x/net/http2/not_go16.go
new file mode 100644
index 0000000000..db53c5b8cb
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/not_go16.go
@@ -0,0 +1,13 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !go1.6
+
+package http2
+
+import "net/http"
+
+func configureTransport(t1 *http.Transport) (*Transport, error) {
+	return nil, errTransportVersion
+}
diff --git a/vendor/golang.org/x/net/http2/pipe.go b/vendor/golang.org/x/net/http2/pipe.go
new file mode 100644
index 0000000000..69446e7a37
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/pipe.go
@@ -0,0 +1,147 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package http2
+
+import (
+	"errors"
+	"io"
+	"sync"
+)
+
+// pipe is a goroutine-safe io.Reader/io.Writer pair.  It's like
+// io.Pipe except there are no PipeReader/PipeWriter halves, and the
+// underlying buffer is an interface. (io.Pipe is always unbuffered)
+type pipe struct {
+	mu       sync.Mutex
+	c        sync.Cond // c.L lazily initialized to &p.mu
+	b        pipeBuffer
+	err      error         // read error once empty. non-nil means closed.
+	breakErr error         // immediate read error (caller doesn't see rest of b)
+	donec    chan struct{} // closed on error
+	readFn   func()        // optional code to run in Read before error
+}
+
+type pipeBuffer interface {
+	Len() int
+	io.Writer
+	io.Reader
+}
+
+// Read waits until data is available and copies bytes
+// from the buffer into p.
+func (p *pipe) Read(d []byte) (n int, err error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	if p.c.L == nil {
+		p.c.L = &p.mu
+	}
+	for {
+		if p.breakErr != nil {
+			return 0, p.breakErr
+		}
+		if p.b.Len() > 0 {
+			return p.b.Read(d)
+		}
+		if p.err != nil {
+			if p.readFn != nil {
+				p.readFn()     // e.g. copy trailers
+				p.readFn = nil // not sticky like p.err
+			}
+			return 0, p.err
+		}
+		p.c.Wait()
+	}
+}
+
+var errClosedPipeWrite = errors.New("write on closed buffer")
+
+// Write copies bytes from p into the buffer and wakes a reader.
+// It is an error to write more data than the buffer can hold.
+func (p *pipe) Write(d []byte) (n int, err error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	if p.c.L == nil {
+		p.c.L = &p.mu
+	}
+	defer p.c.Signal()
+	if p.err != nil {
+		return 0, errClosedPipeWrite
+	}
+	return p.b.Write(d)
+}
+
+// CloseWithError causes the next Read (waking up a current blocked
+// Read if needed) to return the provided err after all data has been
+// read.
+//
+// The error must be non-nil.
+func (p *pipe) CloseWithError(err error) { p.closeWithError(&p.err, err, nil) }
+
+// BreakWithError causes the next Read (waking up a current blocked
+// Read if needed) to return the provided err immediately, without
+// waiting for unread data.
+func (p *pipe) BreakWithError(err error) { p.closeWithError(&p.breakErr, err, nil) }
+
+// closeWithErrorAndCode is like CloseWithError but also sets some code to run
+// in the caller's goroutine before returning the error.
+func (p *pipe) closeWithErrorAndCode(err error, fn func()) { p.closeWithError(&p.err, err, fn) }
+
+func (p *pipe) closeWithError(dst *error, err error, fn func()) {
+	if err == nil {
+		panic("err must be non-nil")
+	}
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	if p.c.L == nil {
+		p.c.L = &p.mu
+	}
+	defer p.c.Signal()
+	if *dst != nil {
+		// Already been done.
+		return
+	}
+	p.readFn = fn
+	*dst = err
+	p.closeDoneLocked()
+}
+
+// requires p.mu be held.
+func (p *pipe) closeDoneLocked() {
+	if p.donec == nil {
+		return
+	}
+	// Close if unclosed. This isn't racy since we always
+	// hold p.mu while closing.
+	select {
+	case <-p.donec:
+	default:
+		close(p.donec)
+	}
+}
+
+// Err returns the error (if any) first set by BreakWithError or CloseWithError.
+func (p *pipe) Err() error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	if p.breakErr != nil {
+		return p.breakErr
+	}
+	return p.err
+}
+
+// Done returns a channel which is closed if and when this pipe is closed
+// with CloseWithError.
+func (p *pipe) Done() <-chan struct{} {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	if p.donec == nil {
+		p.donec = make(chan struct{})
+		if p.err != nil || p.breakErr != nil {
+			// Already hit an error.
+			p.closeDoneLocked()
+		}
+	}
+	return p.donec
+}
diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go
new file mode 100644
index 0000000000..f24a8e828c
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/server.go
@@ -0,0 +1,2260 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// TODO: replace all <-sc.doneServing with reads from the stream's cw
+// instead, and make sure that on close we close all open
+// streams. then remove doneServing?
+
+// TODO: re-audit GOAWAY support. Consider each incoming frame type and
+// whether it should be ignored during graceful shutdown.
+
+// TODO: disconnect idle clients. GFE seems to do 4 minutes. make
+// configurable?  or maximum number of idle clients and remove the
+// oldest?
+
+// TODO: turn off the serve goroutine when idle, so
+// an idle conn only has the readFrames goroutine active. (which could
+// also be optimized probably to pin less memory in crypto/tls). This
+// would involve tracking when the serve goroutine is active (atomic
+// int32 read/CAS probably?) and starting it up when frames arrive,
+// and shutting it down when all handlers exit. the occasional PING
+// packets could use time.AfterFunc to call sc.wakeStartServeLoop()
+// (which is a no-op if already running) and then queue the PING write
+// as normal. The serve loop would then exit in most cases (if no
+// Handlers running) and not be woken up again until the PING packet
+// returns.
+
+// TODO (maybe): add a mechanism for Handlers to going into
+// half-closed-local mode (rw.(io.Closer) test?) but not exit their
+// handler, and continue to be able to read from the
+// Request.Body. This would be a somewhat semantic change from HTTP/1
+// (or at least what we expose in net/http), so I'd probably want to
+// add it there too. For now, this package says that returning from
+// the Handler ServeHTTP function means you're both done reading and
+// done writing, without a way to stop just one or the other.
+
+package http2
+
+import (
+	"bufio"
+	"bytes"
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"net/http"
+	"net/textproto"
+	"net/url"
+	"os"
+	"reflect"
+	"runtime"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"golang.org/x/net/http2/hpack"
+)
+
+const (
+	prefaceTimeout        = 10 * time.Second
+	firstSettingsTimeout  = 2 * time.Second // should be in-flight with preface anyway
+	handlerChunkWriteSize = 4 << 10
+	defaultMaxStreams     = 250 // TODO: make this 100 as the GFE seems to?
+)
+
+var (
+	errClientDisconnected = errors.New("client disconnected")
+	errClosedBody         = errors.New("body closed by handler")
+	errHandlerComplete    = errors.New("http2: request body closed due to handler exiting")
+	errStreamClosed       = errors.New("http2: stream closed")
+)
+
+var responseWriterStatePool = sync.Pool{
+	New: func() interface{} {
+		rws := &responseWriterState{}
+		rws.bw = bufio.NewWriterSize(chunkWriter{rws}, handlerChunkWriteSize)
+		return rws
+	},
+}
+
+// Test hooks.
+var (
+	testHookOnConn        func()
+	testHookGetServerConn func(*serverConn)
+	testHookOnPanicMu     *sync.Mutex // nil except in tests
+	testHookOnPanic       func(sc *serverConn, panicVal interface{}) (rePanic bool)
+)
+
+// Server is an HTTP/2 server.
+type Server struct {
+	// MaxHandlers limits the number of http.Handler ServeHTTP goroutines
+	// which may run at a time over all connections.
+	// Negative or zero no limit.
+	// TODO: implement
+	MaxHandlers int
+
+	// MaxConcurrentStreams optionally specifies the number of
+	// concurrent streams that each client may have open at a
+	// time. This is unrelated to the number of http.Handler goroutines
+	// which may be active globally, which is MaxHandlers.
+	// If zero, MaxConcurrentStreams defaults to at least 100, per
+	// the HTTP/2 spec's recommendations.
+	MaxConcurrentStreams uint32
+
+	// MaxReadFrameSize optionally specifies the largest frame
+	// this server is willing to read. A valid value is between
+	// 16k and 16M, inclusive. If zero or otherwise invalid, a
+	// default value is used.
+	MaxReadFrameSize uint32
+
+	// PermitProhibitedCipherSuites, if true, permits the use of
+	// cipher suites prohibited by the HTTP/2 spec.
+	PermitProhibitedCipherSuites bool
+}
+
+func (s *Server) maxReadFrameSize() uint32 {
+	if v := s.MaxReadFrameSize; v >= minMaxFrameSize && v <= maxFrameSize {
+		return v
+	}
+	return defaultMaxReadFrameSize
+}
+
+func (s *Server) maxConcurrentStreams() uint32 {
+	if v := s.MaxConcurrentStreams; v > 0 {
+		return v
+	}
+	return defaultMaxStreams
+}
+
+// ConfigureServer adds HTTP/2 support to a net/http Server.
+//
+// The configuration conf may be nil.
+//
+// ConfigureServer must be called before s begins serving.
+func ConfigureServer(s *http.Server, conf *Server) error {
+	if conf == nil {
+		conf = new(Server)
+	}
+
+	if s.TLSConfig == nil {
+		s.TLSConfig = new(tls.Config)
+	} else if s.TLSConfig.CipherSuites != nil {
+		// If they already provided a CipherSuite list, return
+		// an error if it has a bad order or is missing
+		// ECDHE_RSA_WITH_AES_128_GCM_SHA256.
+		const requiredCipher = tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+		haveRequired := false
+		sawBad := false
+		for i, cs := range s.TLSConfig.CipherSuites {
+			if cs == requiredCipher {
+				haveRequired = true
+			}
+			if isBadCipher(cs) {
+				sawBad = true
+			} else if sawBad {
+				return fmt.Errorf("http2: TLSConfig.CipherSuites index %d contains an HTTP/2-approved cipher suite (%#04x), but it comes after unapproved cipher suites. With this configuration, clients that don't support previous, approved cipher suites may be given an unapproved one and reject the connection.", i, cs)
+			}
+		}
+		if !haveRequired {
+			return fmt.Errorf("http2: TLSConfig.CipherSuites is missing HTTP/2-required TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256")
+		}
+	}
+
+	// Note: not setting MinVersion to tls.VersionTLS12,
+	// as we don't want to interfere with HTTP/1.1 traffic
+	// on the user's server. We enforce TLS 1.2 later once
+	// we accept a connection. Ideally this should be done
+	// during next-proto selection, but using TLS <1.2 with
+	// HTTP/2 is still the client's bug.
+
+	s.TLSConfig.PreferServerCipherSuites = true
+
+	haveNPN := false
+	for _, p := range s.TLSConfig.NextProtos {
+		if p == NextProtoTLS {
+			haveNPN = true
+			break
+		}
+	}
+	if !haveNPN {
+		s.TLSConfig.NextProtos = append(s.TLSConfig.NextProtos, NextProtoTLS)
+	}
+	// h2-14 is temporary (as of 2015-03-05) while we wait for all browsers
+	// to switch to "h2".
+	s.TLSConfig.NextProtos = append(s.TLSConfig.NextProtos, "h2-14")
+
+	if s.TLSNextProto == nil {
+		s.TLSNextProto = map[string]func(*http.Server, *tls.Conn, http.Handler){}
+	}
+	protoHandler := func(hs *http.Server, c *tls.Conn, h http.Handler) {
+		if testHookOnConn != nil {
+			testHookOnConn()
+		}
+		conf.handleConn(hs, c, h)
+	}
+	s.TLSNextProto[NextProtoTLS] = protoHandler
+	s.TLSNextProto["h2-14"] = protoHandler // temporary; see above.
+	return nil
+}
+
+func (srv *Server) handleConn(hs *http.Server, c net.Conn, h http.Handler) {
+	sc := &serverConn{
+		srv:              srv,
+		hs:               hs,
+		conn:             c,
+		remoteAddrStr:    c.RemoteAddr().String(),
+		bw:               newBufferedWriter(c),
+		handler:          h,
+		streams:          make(map[uint32]*stream),
+		readFrameCh:      make(chan readFrameResult),
+		wantWriteFrameCh: make(chan frameWriteMsg, 8),
+		wroteFrameCh:     make(chan frameWriteResult, 1), // buffered; one send in writeFrameAsync
+		bodyReadCh:       make(chan bodyReadMsg),         // buffering doesn't matter either way
+		doneServing:      make(chan struct{}),
+		advMaxStreams:    srv.maxConcurrentStreams(),
+		writeSched: writeScheduler{
+			maxFrameSize: initialMaxFrameSize,
+		},
+		initialWindowSize: initialWindowSize,
+		headerTableSize:   initialHeaderTableSize,
+		serveG:            newGoroutineLock(),
+		pushEnabled:       true,
+	}
+	sc.flow.add(initialWindowSize)
+	sc.inflow.add(initialWindowSize)
+	sc.hpackEncoder = hpack.NewEncoder(&sc.headerWriteBuf)
+	sc.hpackDecoder = hpack.NewDecoder(initialHeaderTableSize, nil)
+	sc.hpackDecoder.SetMaxStringLength(sc.maxHeaderStringLen())
+
+	fr := NewFramer(sc.bw, c)
+	fr.SetMaxReadFrameSize(srv.maxReadFrameSize())
+	sc.framer = fr
+
+	if tc, ok := c.(*tls.Conn); ok {
+		sc.tlsState = new(tls.ConnectionState)
+		*sc.tlsState = tc.ConnectionState()
+		// 9.2 Use of TLS Features
+		// An implementation of HTTP/2 over TLS MUST use TLS
+		// 1.2 or higher with the restrictions on feature set
+		// and cipher suite described in this section. Due to
+		// implementation limitations, it might not be
+		// possible to fail TLS negotiation. An endpoint MUST
+		// immediately terminate an HTTP/2 connection that
+		// does not meet the TLS requirements described in
+		// this section with a connection error (Section
+		// 5.4.1) of type INADEQUATE_SECURITY.
+		if sc.tlsState.Version < tls.VersionTLS12 {
+			sc.rejectConn(ErrCodeInadequateSecurity, "TLS version too low")
+			return
+		}
+
+		if sc.tlsState.ServerName == "" {
+			// Client must use SNI, but we don't enforce that anymore,
+			// since it was causing problems when connecting to bare IP
+			// addresses during development.
+			//
+			// TODO: optionally enforce? Or enforce at the time we receive
+			// a new request, and verify the the ServerName matches the :authority?
+			// But that precludes proxy situations, perhaps.
+			//
+			// So for now, do nothing here again.
+		}
+
+		if !srv.PermitProhibitedCipherSuites && isBadCipher(sc.tlsState.CipherSuite) {
+			// "Endpoints MAY choose to generate a connection error
+			// (Section 5.4.1) of type INADEQUATE_SECURITY if one of
+			// the prohibited cipher suites are negotiated."
+			//
+			// We choose that. In my opinion, the spec is weak
+			// here. It also says both parties must support at least
+			// TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 so there's no
+			// excuses here. If we really must, we could allow an
+			// "AllowInsecureWeakCiphers" option on the server later.
+			// Let's see how it plays out first.
+			sc.rejectConn(ErrCodeInadequateSecurity, fmt.Sprintf("Prohibited TLS 1.2 Cipher Suite: %x", sc.tlsState.CipherSuite))
+			return
+		}
+	}
+
+	if hook := testHookGetServerConn; hook != nil {
+		hook(sc)
+	}
+	sc.serve()
+}
+
+// isBadCipher reports whether the cipher is blacklisted by the HTTP/2 spec.
+func isBadCipher(cipher uint16) bool {
+	switch cipher {
+	case tls.TLS_RSA_WITH_RC4_128_SHA,
+		tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+		tls.TLS_RSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+		tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
+		tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
+		tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
+		// Reject cipher suites from Appendix A.
+		// "This list includes those cipher suites that do not
+		// offer an ephemeral key exchange and those that are
+		// based on the TLS null, stream or block cipher type"
+		return true
+	default:
+		return false
+	}
+}
+
+func (sc *serverConn) rejectConn(err ErrCode, debug string) {
+	sc.vlogf("http2: server rejecting conn: %v, %s", err, debug)
+	// ignoring errors. hanging up anyway.
+	sc.framer.WriteGoAway(0, err, []byte(debug))
+	sc.bw.Flush()
+	sc.conn.Close()
+}
+
+type serverConn struct {
+	// Immutable:
+	srv              *Server
+	hs               *http.Server
+	conn             net.Conn
+	bw               *bufferedWriter // writing to conn
+	handler          http.Handler
+	framer           *Framer
+	hpackDecoder     *hpack.Decoder
+	doneServing      chan struct{}         // closed when serverConn.serve ends
+	readFrameCh      chan readFrameResult  // written by serverConn.readFrames
+	wantWriteFrameCh chan frameWriteMsg    // from handlers -> serve
+	wroteFrameCh     chan frameWriteResult // from writeFrameAsync -> serve, tickles more frame writes
+	bodyReadCh       chan bodyReadMsg      // from handlers -> serve
+	testHookCh       chan func(int)        // code to run on the serve loop
+	flow             flow                  // conn-wide (not stream-specific) outbound flow control
+	inflow           flow                  // conn-wide inbound flow control
+	tlsState         *tls.ConnectionState  // shared by all handlers, like net/http
+	remoteAddrStr    string
+
+	// Everything following is owned by the serve loop; use serveG.check():
+	serveG                goroutineLock // used to verify funcs are on serve()
+	pushEnabled           bool
+	sawFirstSettings      bool // got the initial SETTINGS frame after the preface
+	needToSendSettingsAck bool
+	unackedSettings       int    // how many SETTINGS have we sent without ACKs?
+	clientMaxStreams      uint32 // SETTINGS_MAX_CONCURRENT_STREAMS from client (our PUSH_PROMISE limit)
+	advMaxStreams         uint32 // our SETTINGS_MAX_CONCURRENT_STREAMS advertised the client
+	curOpenStreams        uint32 // client's number of open streams
+	maxStreamID           uint32 // max ever seen
+	streams               map[uint32]*stream
+	initialWindowSize     int32
+	headerTableSize       uint32
+	peerMaxHeaderListSize uint32            // zero means unknown (default)
+	canonHeader           map[string]string // http2-lower-case -> Go-Canonical-Case
+	req                   requestParam      // non-zero while reading request headers
+	writingFrame          bool              // started write goroutine but haven't heard back on wroteFrameCh
+	needsFrameFlush       bool              // last frame write wasn't a flush
+	writeSched            writeScheduler
+	inGoAway              bool // we've started to or sent GOAWAY
+	needToSendGoAway      bool // we need to schedule a GOAWAY frame write
+	goAwayCode            ErrCode
+	shutdownTimerCh       <-chan time.Time // nil until used
+	shutdownTimer         *time.Timer      // nil until used
+
+	// Owned by the writeFrameAsync goroutine:
+	headerWriteBuf bytes.Buffer
+	hpackEncoder   *hpack.Encoder
+}
+
+func (sc *serverConn) maxHeaderStringLen() int {
+	v := sc.maxHeaderListSize()
+	if uint32(int(v)) == v {
+		return int(v)
+	}
+	// They had a crazy big number for MaxHeaderBytes anyway,
+	// so give them unlimited header lengths:
+	return 0
+}
+
+func (sc *serverConn) maxHeaderListSize() uint32 {
+	n := sc.hs.MaxHeaderBytes
+	if n <= 0 {
+		n = http.DefaultMaxHeaderBytes
+	}
+	// http2's count is in a slightly different unit and includes 32 bytes per pair.
+	// So, take the net/http.Server value and pad it up a bit, assuming 10 headers.
+	const perFieldOverhead = 32 // per http2 spec
+	const typicalHeaders = 10   // conservative
+	return uint32(n + typicalHeaders*perFieldOverhead)
+}
+
+// requestParam is the state of the next request, initialized over
+// potentially several frames HEADERS + zero or more CONTINUATION
+// frames.
+type requestParam struct {
+	// stream is non-nil if we're reading (HEADER or CONTINUATION)
+	// frames for a request (but not DATA).
+	stream            *stream
+	header            http.Header
+	method, path      string
+	scheme, authority string
+	sawRegularHeader  bool  // saw a non-pseudo header already
+	invalidHeader     bool  // an invalid header was seen
+	headerListSize    int64 // actually uint32, but easier math this way
+}
+
+// stream represents a stream. This is the minimal metadata needed by
+// the serve goroutine. Most of the actual stream state is owned by
+// the http.Handler's goroutine in the responseWriter. Because the
+// responseWriter's responseWriterState is recycled at the end of a
+// handler, this struct intentionally has no pointer to the
+// *responseWriter{,State} itself, as the Handler ending nils out the
+// responseWriter's state field.
+type stream struct {
+	// immutable:
+	sc   *serverConn
+	id   uint32
+	body *pipe       // non-nil if expecting DATA frames
+	cw   closeWaiter // closed wait stream transitions to closed state
+
+	// owned by serverConn's serve loop:
+	bodyBytes        int64   // body bytes seen so far
+	declBodyBytes    int64   // or -1 if undeclared
+	flow             flow    // limits writing from Handler to client
+	inflow           flow    // what the client is allowed to POST/etc to us
+	parent           *stream // or nil
+	numTrailerValues int64
+	weight           uint8
+	state            streamState
+	sentReset        bool // only true once detached from streams map
+	gotReset         bool // only true once detacted from streams map
+	gotTrailerHeader bool // HEADER frame for trailers was seen
+
+	trailer    http.Header // accumulated trailers
+	reqTrailer http.Header // handler's Request.Trailer
+}
+
+func (sc *serverConn) Framer() *Framer  { return sc.framer }
+func (sc *serverConn) CloseConn() error { return sc.conn.Close() }
+func (sc *serverConn) Flush() error     { return sc.bw.Flush() }
+func (sc *serverConn) HeaderEncoder() (*hpack.Encoder, *bytes.Buffer) {
+	return sc.hpackEncoder, &sc.headerWriteBuf
+}
+
+func (sc *serverConn) state(streamID uint32) (streamState, *stream) {
+	sc.serveG.check()
+	// http://http2.github.io/http2-spec/#rfc.section.5.1
+	if st, ok := sc.streams[streamID]; ok {
+		return st.state, st
+	}
+	// "The first use of a new stream identifier implicitly closes all
+	// streams in the "idle" state that might have been initiated by
+	// that peer with a lower-valued stream identifier. For example, if
+	// a client sends a HEADERS frame on stream 7 without ever sending a
+	// frame on stream 5, then stream 5 transitions to the "closed"
+	// state when the first frame for stream 7 is sent or received."
+	if streamID <= sc.maxStreamID {
+		return stateClosed, nil
+	}
+	return stateIdle, nil
+}
+
+// setConnState calls the net/http ConnState hook for this connection, if configured.
+// Note that the net/http package does StateNew and StateClosed for us.
+// There is currently no plan for StateHijacked or hijacking HTTP/2 connections.
+func (sc *serverConn) setConnState(state http.ConnState) {
+	if sc.hs.ConnState != nil {
+		sc.hs.ConnState(sc.conn, state)
+	}
+}
+
+func (sc *serverConn) vlogf(format string, args ...interface{}) {
+	if VerboseLogs {
+		sc.logf(format, args...)
+	}
+}
+
+func (sc *serverConn) logf(format string, args ...interface{}) {
+	if lg := sc.hs.ErrorLog; lg != nil {
+		lg.Printf(format, args...)
+	} else {
+		log.Printf(format, args...)
+	}
+}
+
+// errno returns v's underlying uintptr, else 0.
+//
+// TODO: remove this helper function once http2 can use build
+// tags. See comment in isClosedConnError.
+func errno(v error) uintptr {
+	if rv := reflect.ValueOf(v); rv.Kind() == reflect.Uintptr {
+		return uintptr(rv.Uint())
+	}
+	return 0
+}
+
+// isClosedConnError reports whether err is an error from use of a closed
+// network connection.
+func isClosedConnError(err error) bool {
+	if err == nil {
+		return false
+	}
+
+	// TODO: remove this string search and be more like the Windows
+	// case below. That might involve modifying the standard library
+	// to return better error types.
+	str := err.Error()
+	if strings.Contains(str, "use of closed network connection") {
+		return true
+	}
+
+	// TODO(bradfitz): x/tools/cmd/bundle doesn't really support
+	// build tags, so I can't make an http2_windows.go file with
+	// Windows-specific stuff. Fix that and move this, once we
+	// have a way to bundle this into std's net/http somehow.
+	if runtime.GOOS == "windows" {
+		if oe, ok := err.(*net.OpError); ok && oe.Op == "read" {
+			if se, ok := oe.Err.(*os.SyscallError); ok && se.Syscall == "wsarecv" {
+				const WSAECONNABORTED = 10053
+				const WSAECONNRESET = 10054
+				if n := errno(se.Err); n == WSAECONNRESET || n == WSAECONNABORTED {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
+func (sc *serverConn) condlogf(err error, format string, args ...interface{}) {
+	if err == nil {
+		return
+	}
+	if err == io.EOF || err == io.ErrUnexpectedEOF || isClosedConnError(err) {
+		// Boring, expected errors.
+		sc.vlogf(format, args...)
+	} else {
+		sc.logf(format, args...)
+	}
+}
+
+func (sc *serverConn) onNewHeaderField(f hpack.HeaderField) {
+	sc.serveG.check()
+	if VerboseLogs {
+		sc.vlogf("http2: server decoded %v", f)
+	}
+	switch {
+	case !validHeaderFieldValue(f.Value): // f.Name checked _after_ pseudo check, since ':' is invalid
+		sc.req.invalidHeader = true
+	case strings.HasPrefix(f.Name, ":"):
+		if sc.req.sawRegularHeader {
+			sc.logf("pseudo-header after regular header")
+			sc.req.invalidHeader = true
+			return
+		}
+		var dst *string
+		switch f.Name {
+		case ":method":
+			dst = &sc.req.method
+		case ":path":
+			dst = &sc.req.path
+		case ":scheme":
+			dst = &sc.req.scheme
+		case ":authority":
+			dst = &sc.req.authority
+		default:
+			// 8.1.2.1 Pseudo-Header Fields
+			// "Endpoints MUST treat a request or response
+			// that contains undefined or invalid
+			// pseudo-header fields as malformed (Section
+			// 8.1.2.6)."
+			sc.logf("invalid pseudo-header %q", f.Name)
+			sc.req.invalidHeader = true
+			return
+		}
+		if *dst != "" {
+			sc.logf("duplicate pseudo-header %q sent", f.Name)
+			sc.req.invalidHeader = true
+			return
+		}
+		*dst = f.Value
+	case !validHeaderFieldName(f.Name):
+		sc.req.invalidHeader = true
+	default:
+		sc.req.sawRegularHeader = true
+		sc.req.header.Add(sc.canonicalHeader(f.Name), f.Value)
+		const headerFieldOverhead = 32 // per spec
+		sc.req.headerListSize += int64(len(f.Name)) + int64(len(f.Value)) + headerFieldOverhead
+		if sc.req.headerListSize > int64(sc.maxHeaderListSize()) {
+			sc.hpackDecoder.SetEmitEnabled(false)
+		}
+	}
+}
+
+func (st *stream) onNewTrailerField(f hpack.HeaderField) {
+	sc := st.sc
+	sc.serveG.check()
+	if VerboseLogs {
+		sc.vlogf("http2: server decoded trailer %v", f)
+	}
+	switch {
+	case strings.HasPrefix(f.Name, ":"):
+		sc.req.invalidHeader = true
+		return
+	case !validHeaderFieldName(f.Name) || !validHeaderFieldValue(f.Value):
+		sc.req.invalidHeader = true
+		return
+	default:
+		key := sc.canonicalHeader(f.Name)
+		if st.trailer != nil {
+			vv := append(st.trailer[key], f.Value)
+			st.trailer[key] = vv
+
+			// arbitrary; TODO: read spec about header list size limits wrt trailers
+			const tooBig = 1000
+			if len(vv) >= tooBig {
+				sc.hpackDecoder.SetEmitEnabled(false)
+			}
+		}
+	}
+}
+
+func (sc *serverConn) canonicalHeader(v string) string {
+	sc.serveG.check()
+	cv, ok := commonCanonHeader[v]
+	if ok {
+		return cv
+	}
+	cv, ok = sc.canonHeader[v]
+	if ok {
+		return cv
+	}
+	if sc.canonHeader == nil {
+		sc.canonHeader = make(map[string]string)
+	}
+	cv = http.CanonicalHeaderKey(v)
+	sc.canonHeader[v] = cv
+	return cv
+}
+
+type readFrameResult struct {
+	f   Frame // valid until readMore is called
+	err error
+
+	// readMore should be called once the consumer no longer needs or
+	// retains f. After readMore, f is invalid and more frames can be
+	// read.
+	readMore func()
+}
+
+// readFrames is the loop that reads incoming frames.
+// It takes care to only read one frame at a time, blocking until the
+// consumer is done with the frame.
+// It's run on its own goroutine.
+func (sc *serverConn) readFrames() {
+	gate := make(gate)
+	for {
+		f, err := sc.framer.ReadFrame()
+		select {
+		case sc.readFrameCh <- readFrameResult{f, err, gate.Done}:
+		case <-sc.doneServing:
+			return
+		}
+		select {
+		case <-gate:
+		case <-sc.doneServing:
+			return
+		}
+		if terminalReadFrameError(err) {
+			return
+		}
+	}
+}
+
+// frameWriteResult is the message passed from writeFrameAsync to the serve goroutine.
+type frameWriteResult struct {
+	wm  frameWriteMsg // what was written (or attempted)
+	err error         // result of the writeFrame call
+}
+
+// writeFrameAsync runs in its own goroutine and writes a single frame
+// and then reports when it's done.
+// At most one goroutine can be running writeFrameAsync at a time per
+// serverConn.
+func (sc *serverConn) writeFrameAsync(wm frameWriteMsg) {
+	err := wm.write.writeFrame(sc)
+	sc.wroteFrameCh <- frameWriteResult{wm, err}
+}
+
+func (sc *serverConn) closeAllStreamsOnConnClose() {
+	sc.serveG.check()
+	for _, st := range sc.streams {
+		sc.closeStream(st, errClientDisconnected)
+	}
+}
+
+func (sc *serverConn) stopShutdownTimer() {
+	sc.serveG.check()
+	if t := sc.shutdownTimer; t != nil {
+		t.Stop()
+	}
+}
+
+func (sc *serverConn) notePanic() {
+	// Note: this is for serverConn.serve panicking, not http.Handler code.
+	if testHookOnPanicMu != nil {
+		testHookOnPanicMu.Lock()
+		defer testHookOnPanicMu.Unlock()
+	}
+	if testHookOnPanic != nil {
+		if e := recover(); e != nil {
+			if testHookOnPanic(sc, e) {
+				panic(e)
+			}
+		}
+	}
+}
+
+func (sc *serverConn) serve() {
+	sc.serveG.check()
+	defer sc.notePanic()
+	defer sc.conn.Close()
+	defer sc.closeAllStreamsOnConnClose()
+	defer sc.stopShutdownTimer()
+	defer close(sc.doneServing) // unblocks handlers trying to send
+
+	if VerboseLogs {
+		sc.vlogf("http2: server connection from %v on %p", sc.conn.RemoteAddr(), sc.hs)
+	}
+
+	sc.writeFrame(frameWriteMsg{
+		write: writeSettings{
+			{SettingMaxFrameSize, sc.srv.maxReadFrameSize()},
+			{SettingMaxConcurrentStreams, sc.advMaxStreams},
+			{SettingMaxHeaderListSize, sc.maxHeaderListSize()},
+
+			// TODO: more actual settings, notably
+			// SettingInitialWindowSize, but then we also
+			// want to bump up the conn window size the
+			// same amount here right after the settings
+		},
+	})
+	sc.unackedSettings++
+
+	if err := sc.readPreface(); err != nil {
+		sc.condlogf(err, "http2: server: error reading preface from client %v: %v", sc.conn.RemoteAddr(), err)
+		return
+	}
+	// Now that we've got the preface, get us out of the
+	// "StateNew" state.  We can't go directly to idle, though.
+	// Active means we read some data and anticipate a request. We'll
+	// do another Active when we get a HEADERS frame.
+	sc.setConnState(http.StateActive)
+	sc.setConnState(http.StateIdle)
+
+	go sc.readFrames() // closed by defer sc.conn.Close above
+
+	settingsTimer := time.NewTimer(firstSettingsTimeout)
+	loopNum := 0
+	for {
+		loopNum++
+		select {
+		case wm := <-sc.wantWriteFrameCh:
+			sc.writeFrame(wm)
+		case res := <-sc.wroteFrameCh:
+			sc.wroteFrame(res)
+		case res := <-sc.readFrameCh:
+			if !sc.processFrameFromReader(res) {
+				return
+			}
+			res.readMore()
+			if settingsTimer.C != nil {
+				settingsTimer.Stop()
+				settingsTimer.C = nil
+			}
+		case m := <-sc.bodyReadCh:
+			sc.noteBodyRead(m.st, m.n)
+		case <-settingsTimer.C:
+			sc.logf("timeout waiting for SETTINGS frames from %v", sc.conn.RemoteAddr())
+			return
+		case <-sc.shutdownTimerCh:
+			sc.vlogf("GOAWAY close timer fired; closing conn from %v", sc.conn.RemoteAddr())
+			return
+		case fn := <-sc.testHookCh:
+			fn(loopNum)
+		}
+	}
+}
+
+// readPreface reads the ClientPreface greeting from the peer
+// or returns an error on timeout or an invalid greeting.
+func (sc *serverConn) readPreface() error {
+	errc := make(chan error, 1)
+	go func() {
+		// Read the client preface
+		buf := make([]byte, len(ClientPreface))
+		if _, err := io.ReadFull(sc.conn, buf); err != nil {
+			errc <- err
+		} else if !bytes.Equal(buf, clientPreface) {
+			errc <- fmt.Errorf("bogus greeting %q", buf)
+		} else {
+			errc <- nil
+		}
+	}()
+	timer := time.NewTimer(prefaceTimeout) // TODO: configurable on *Server?
+	defer timer.Stop()
+	select {
+	case <-timer.C:
+		return errors.New("timeout waiting for client preface")
+	case err := <-errc:
+		if err == nil {
+			if VerboseLogs {
+				sc.vlogf("http2: server: client %v said hello", sc.conn.RemoteAddr())
+			}
+		}
+		return err
+	}
+}
+
+var errChanPool = sync.Pool{
+	New: func() interface{} { return make(chan error, 1) },
+}
+
+var writeDataPool = sync.Pool{
+	New: func() interface{} { return new(writeData) },
+}
+
+// writeDataFromHandler writes DATA response frames from a handler on
+// the given stream.
+func (sc *serverConn) writeDataFromHandler(stream *stream, data []byte, endStream bool) error {
+	ch := errChanPool.Get().(chan error)
+	writeArg := writeDataPool.Get().(*writeData)
+	*writeArg = writeData{stream.id, data, endStream}
+	err := sc.writeFrameFromHandler(frameWriteMsg{
+		write:  writeArg,
+		stream: stream,
+		done:   ch,
+	})
+	if err != nil {
+		return err
+	}
+	var frameWriteDone bool // the frame write is done (successfully or not)
+	select {
+	case err = <-ch:
+		frameWriteDone = true
+	case <-sc.doneServing:
+		return errClientDisconnected
+	case <-stream.cw:
+		// If both ch and stream.cw were ready (as might
+		// happen on the final Write after an http.Handler
+		// ends), prefer the write result. Otherwise this
+		// might just be us successfully closing the stream.
+		// The writeFrameAsync and serve goroutines guarantee
+		// that the ch send will happen before the stream.cw
+		// close.
+		select {
+		case err = <-ch:
+			frameWriteDone = true
+		default:
+			return errStreamClosed
+		}
+	}
+	errChanPool.Put(ch)
+	if frameWriteDone {
+		writeDataPool.Put(writeArg)
+	}
+	return err
+}
+
+// writeFrameFromHandler sends wm to sc.wantWriteFrameCh, but aborts
+// if the connection has gone away.
+//
+// This must not be run from the serve goroutine itself, else it might
+// deadlock writing to sc.wantWriteFrameCh (which is only mildly
+// buffered and is read by serve itself). If you're on the serve
+// goroutine, call writeFrame instead.
+func (sc *serverConn) writeFrameFromHandler(wm frameWriteMsg) error {
+	sc.serveG.checkNotOn() // NOT
+	select {
+	case sc.wantWriteFrameCh <- wm:
+		return nil
+	case <-sc.doneServing:
+		// Serve loop is gone.
+		// Client has closed their connection to the server.
+		return errClientDisconnected
+	}
+}
+
+// writeFrame schedules a frame to write and sends it if there's nothing
+// already being written.
+//
+// There is no pushback here (the serve goroutine never blocks). It's
+// the http.Handlers that block, waiting for their previous frames to
+// make it onto the wire
+//
+// If you're not on the serve goroutine, use writeFrameFromHandler instead.
+func (sc *serverConn) writeFrame(wm frameWriteMsg) {
+	sc.serveG.check()
+	sc.writeSched.add(wm)
+	sc.scheduleFrameWrite()
+}
+
+// startFrameWrite starts a goroutine to write wm (in a separate
+// goroutine since that might block on the network), and updates the
+// serve goroutine's state about the world, updated from info in wm.
+func (sc *serverConn) startFrameWrite(wm frameWriteMsg) {
+	sc.serveG.check()
+	if sc.writingFrame {
+		panic("internal error: can only be writing one frame at a time")
+	}
+
+	st := wm.stream
+	if st != nil {
+		switch st.state {
+		case stateHalfClosedLocal:
+			panic("internal error: attempt to send frame on half-closed-local stream")
+		case stateClosed:
+			if st.sentReset || st.gotReset {
+				// Skip this frame.
+				sc.scheduleFrameWrite()
+				return
+			}
+			panic(fmt.Sprintf("internal error: attempt to send a write %v on a closed stream", wm))
+		}
+	}
+
+	sc.writingFrame = true
+	sc.needsFrameFlush = true
+	go sc.writeFrameAsync(wm)
+}
+
+// errHandlerPanicked is the error given to any callers blocked in a read from
+// Request.Body when the main goroutine panics. Since most handlers read in the
+// the main ServeHTTP goroutine, this will show up rarely.
+var errHandlerPanicked = errors.New("http2: handler panicked")
+
+// wroteFrame is called on the serve goroutine with the result of
+// whatever happened on writeFrameAsync.
+func (sc *serverConn) wroteFrame(res frameWriteResult) {
+	sc.serveG.check()
+	if !sc.writingFrame {
+		panic("internal error: expected to be already writing a frame")
+	}
+	sc.writingFrame = false
+
+	wm := res.wm
+	st := wm.stream
+
+	closeStream := endsStream(wm.write)
+
+	if _, ok := wm.write.(handlerPanicRST); ok {
+		sc.closeStream(st, errHandlerPanicked)
+	}
+
+	// Reply (if requested) to the blocked ServeHTTP goroutine.
+	if ch := wm.done; ch != nil {
+		select {
+		case ch <- res.err:
+		default:
+			panic(fmt.Sprintf("unbuffered done channel passed in for type %T", wm.write))
+		}
+	}
+	wm.write = nil // prevent use (assume it's tainted after wm.done send)
+
+	if closeStream {
+		if st == nil {
+			panic("internal error: expecting non-nil stream")
+		}
+		switch st.state {
+		case stateOpen:
+			// Here we would go to stateHalfClosedLocal in
+			// theory, but since our handler is done and
+			// the net/http package provides no mechanism
+			// for finishing writing to a ResponseWriter
+			// while still reading data (see possible TODO
+			// at top of this file), we go into closed
+			// state here anyway, after telling the peer
+			// we're hanging up on them.
+			st.state = stateHalfClosedLocal // won't last long, but necessary for closeStream via resetStream
+			errCancel := StreamError{st.id, ErrCodeCancel}
+			sc.resetStream(errCancel)
+		case stateHalfClosedRemote:
+			sc.closeStream(st, errHandlerComplete)
+		}
+	}
+
+	sc.scheduleFrameWrite()
+}
+
+// scheduleFrameWrite tickles the frame writing scheduler.
+//
+// If a frame is already being written, nothing happens. This will be called again
+// when the frame is done being written.
+//
+// If a frame isn't being written we need to send one, the best frame
+// to send is selected, preferring first things that aren't
+// stream-specific (e.g. ACKing settings), and then finding the
+// highest priority stream.
+//
+// If a frame isn't being written and there's nothing else to send, we
+// flush the write buffer.
+func (sc *serverConn) scheduleFrameWrite() {
+	sc.serveG.check()
+	if sc.writingFrame {
+		return
+	}
+	if sc.needToSendGoAway {
+		sc.needToSendGoAway = false
+		sc.startFrameWrite(frameWriteMsg{
+			write: &writeGoAway{
+				maxStreamID: sc.maxStreamID,
+				code:        sc.goAwayCode,
+			},
+		})
+		return
+	}
+	if sc.needToSendSettingsAck {
+		sc.needToSendSettingsAck = false
+		sc.startFrameWrite(frameWriteMsg{write: writeSettingsAck{}})
+		return
+	}
+	if !sc.inGoAway {
+		if wm, ok := sc.writeSched.take(); ok {
+			sc.startFrameWrite(wm)
+			return
+		}
+	}
+	if sc.needsFrameFlush {
+		sc.startFrameWrite(frameWriteMsg{write: flushFrameWriter{}})
+		sc.needsFrameFlush = false // after startFrameWrite, since it sets this true
+		return
+	}
+}
+
+func (sc *serverConn) goAway(code ErrCode) {
+	sc.serveG.check()
+	if sc.inGoAway {
+		return
+	}
+	if code != ErrCodeNo {
+		sc.shutDownIn(250 * time.Millisecond)
+	} else {
+		// TODO: configurable
+		sc.shutDownIn(1 * time.Second)
+	}
+	sc.inGoAway = true
+	sc.needToSendGoAway = true
+	sc.goAwayCode = code
+	sc.scheduleFrameWrite()
+}
+
+func (sc *serverConn) shutDownIn(d time.Duration) {
+	sc.serveG.check()
+	sc.shutdownTimer = time.NewTimer(d)
+	sc.shutdownTimerCh = sc.shutdownTimer.C
+}
+
+func (sc *serverConn) resetStream(se StreamError) {
+	sc.serveG.check()
+	sc.writeFrame(frameWriteMsg{write: se})
+	if st, ok := sc.streams[se.StreamID]; ok {
+		st.sentReset = true
+		sc.closeStream(st, se)
+	}
+}
+
+// processFrameFromReader processes the serve loop's read from readFrameCh from the
+// frame-reading goroutine.
+// processFrameFromReader returns whether the connection should be kept open.
+func (sc *serverConn) processFrameFromReader(res readFrameResult) bool {
+	sc.serveG.check()
+	err := res.err
+	if err != nil {
+		if err == ErrFrameTooLarge {
+			sc.goAway(ErrCodeFrameSize)
+			return true // goAway will close the loop
+		}
+		clientGone := err == io.EOF || err == io.ErrUnexpectedEOF || isClosedConnError(err)
+		if clientGone {
+			// TODO: could we also get into this state if
+			// the peer does a half close
+			// (e.g. CloseWrite) because they're done
+			// sending frames but they're still wanting
+			// our open replies?  Investigate.
+			// TODO: add CloseWrite to crypto/tls.Conn first
+			// so we have a way to test this? I suppose
+			// just for testing we could have a non-TLS mode.
+			return false
+		}
+	} else {
+		f := res.f
+		if VerboseLogs {
+			sc.vlogf("http2: server read frame %v", summarizeFrame(f))
+		}
+		err = sc.processFrame(f)
+		if err == nil {
+			return true
+		}
+	}
+
+	switch ev := err.(type) {
+	case StreamError:
+		sc.resetStream(ev)
+		return true
+	case goAwayFlowError:
+		sc.goAway(ErrCodeFlowControl)
+		return true
+	case ConnectionError:
+		sc.logf("http2: server connection error from %v: %v", sc.conn.RemoteAddr(), ev)
+		sc.goAway(ErrCode(ev))
+		return true // goAway will handle shutdown
+	default:
+		if res.err != nil {
+			sc.vlogf("http2: server closing client connection; error reading frame from client %s: %v", sc.conn.RemoteAddr(), err)
+		} else {
+			sc.logf("http2: server closing client connection: %v", err)
+		}
+		return false
+	}
+}
+
+func (sc *serverConn) processFrame(f Frame) error {
+	sc.serveG.check()
+
+	// First frame received must be SETTINGS.
+	if !sc.sawFirstSettings {
+		if _, ok := f.(*SettingsFrame); !ok {
+			return ConnectionError(ErrCodeProtocol)
+		}
+		sc.sawFirstSettings = true
+	}
+
+	switch f := f.(type) {
+	case *SettingsFrame:
+		return sc.processSettings(f)
+	case *HeadersFrame:
+		return sc.processHeaders(f)
+	case *ContinuationFrame:
+		return sc.processContinuation(f)
+	case *WindowUpdateFrame:
+		return sc.processWindowUpdate(f)
+	case *PingFrame:
+		return sc.processPing(f)
+	case *DataFrame:
+		return sc.processData(f)
+	case *RSTStreamFrame:
+		return sc.processResetStream(f)
+	case *PriorityFrame:
+		return sc.processPriority(f)
+	case *PushPromiseFrame:
+		// A client cannot push. Thus, servers MUST treat the receipt of a PUSH_PROMISE
+		// frame as a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
+		return ConnectionError(ErrCodeProtocol)
+	default:
+		sc.vlogf("http2: server ignoring frame: %v", f.Header())
+		return nil
+	}
+}
+
+func (sc *serverConn) processPing(f *PingFrame) error {
+	sc.serveG.check()
+	if f.IsAck() {
+		// 6.7 PING: " An endpoint MUST NOT respond to PING frames
+		// containing this flag."
+		return nil
+	}
+	if f.StreamID != 0 {
+		// "PING frames are not associated with any individual
+		// stream. If a PING frame is received with a stream
+		// identifier field value other than 0x0, the recipient MUST
+		// respond with a connection error (Section 5.4.1) of type
+		// PROTOCOL_ERROR."
+		return ConnectionError(ErrCodeProtocol)
+	}
+	sc.writeFrame(frameWriteMsg{write: writePingAck{f}})
+	return nil
+}
+
+func (sc *serverConn) processWindowUpdate(f *WindowUpdateFrame) error {
+	sc.serveG.check()
+	switch {
+	case f.StreamID != 0: // stream-level flow control
+		st := sc.streams[f.StreamID]
+		if st == nil {
+			// "WINDOW_UPDATE can be sent by a peer that has sent a
+			// frame bearing the END_STREAM flag. This means that a
+			// receiver could receive a WINDOW_UPDATE frame on a "half
+			// closed (remote)" or "closed" stream. A receiver MUST
+			// NOT treat this as an error, see Section 5.1."
+			return nil
+		}
+		if !st.flow.add(int32(f.Increment)) {
+			return StreamError{f.StreamID, ErrCodeFlowControl}
+		}
+	default: // connection-level flow control
+		if !sc.flow.add(int32(f.Increment)) {
+			return goAwayFlowError{}
+		}
+	}
+	sc.scheduleFrameWrite()
+	return nil
+}
+
+func (sc *serverConn) processResetStream(f *RSTStreamFrame) error {
+	sc.serveG.check()
+
+	state, st := sc.state(f.StreamID)
+	if state == stateIdle {
+		// 6.4 "RST_STREAM frames MUST NOT be sent for a
+		// stream in the "idle" state. If a RST_STREAM frame
+		// identifying an idle stream is received, the
+		// recipient MUST treat this as a connection error
+		// (Section 5.4.1) of type PROTOCOL_ERROR.
+		return ConnectionError(ErrCodeProtocol)
+	}
+	if st != nil {
+		st.gotReset = true
+		sc.closeStream(st, StreamError{f.StreamID, f.ErrCode})
+	}
+	return nil
+}
+
+func (sc *serverConn) closeStream(st *stream, err error) {
+	sc.serveG.check()
+	if st.state == stateIdle || st.state == stateClosed {
+		panic(fmt.Sprintf("invariant; can't close stream in state %v", st.state))
+	}
+	st.state = stateClosed
+	sc.curOpenStreams--
+	if sc.curOpenStreams == 0 {
+		sc.setConnState(http.StateIdle)
+	}
+	delete(sc.streams, st.id)
+	if p := st.body; p != nil {
+		p.CloseWithError(err)
+	}
+	st.cw.Close() // signals Handler's CloseNotifier, unblocks writes, etc
+	sc.writeSched.forgetStream(st.id)
+}
+
+func (sc *serverConn) processSettings(f *SettingsFrame) error {
+	sc.serveG.check()
+	if f.IsAck() {
+		sc.unackedSettings--
+		if sc.unackedSettings < 0 {
+			// Why is the peer ACKing settings we never sent?
+			// The spec doesn't mention this case, but
+			// hang up on them anyway.
+			return ConnectionError(ErrCodeProtocol)
+		}
+		return nil
+	}
+	if err := f.ForeachSetting(sc.processSetting); err != nil {
+		return err
+	}
+	sc.needToSendSettingsAck = true
+	sc.scheduleFrameWrite()
+	return nil
+}
+
+func (sc *serverConn) processSetting(s Setting) error {
+	sc.serveG.check()
+	if err := s.Valid(); err != nil {
+		return err
+	}
+	if VerboseLogs {
+		sc.vlogf("http2: server processing setting %v", s)
+	}
+	switch s.ID {
+	case SettingHeaderTableSize:
+		sc.headerTableSize = s.Val
+		sc.hpackEncoder.SetMaxDynamicTableSize(s.Val)
+	case SettingEnablePush:
+		sc.pushEnabled = s.Val != 0
+	case SettingMaxConcurrentStreams:
+		sc.clientMaxStreams = s.Val
+	case SettingInitialWindowSize:
+		return sc.processSettingInitialWindowSize(s.Val)
+	case SettingMaxFrameSize:
+		sc.writeSched.maxFrameSize = s.Val
+	case SettingMaxHeaderListSize:
+		sc.peerMaxHeaderListSize = s.Val
+	default:
+		// Unknown setting: "An endpoint that receives a SETTINGS
+		// frame with any unknown or unsupported identifier MUST
+		// ignore that setting."
+		if VerboseLogs {
+			sc.vlogf("http2: server ignoring unknown setting %v", s)
+		}
+	}
+	return nil
+}
+
+func (sc *serverConn) processSettingInitialWindowSize(val uint32) error {
+	sc.serveG.check()
+	// Note: val already validated to be within range by
+	// processSetting's Valid call.
+
+	// "A SETTINGS frame can alter the initial flow control window
+	// size for all current streams. When the value of
+	// SETTINGS_INITIAL_WINDOW_SIZE changes, a receiver MUST
+	// adjust the size of all stream flow control windows that it
+	// maintains by the difference between the new value and the
+	// old value."
+	old := sc.initialWindowSize
+	sc.initialWindowSize = int32(val)
+	growth := sc.initialWindowSize - old // may be negative
+	for _, st := range sc.streams {
+		if !st.flow.add(growth) {
+			// 6.9.2 Initial Flow Control Window Size
+			// "An endpoint MUST treat a change to
+			// SETTINGS_INITIAL_WINDOW_SIZE that causes any flow
+			// control window to exceed the maximum size as a
+			// connection error (Section 5.4.1) of type
+			// FLOW_CONTROL_ERROR."
+			return ConnectionError(ErrCodeFlowControl)
+		}
+	}
+	return nil
+}
+
+func (sc *serverConn) processData(f *DataFrame) error {
+	sc.serveG.check()
+	// "If a DATA frame is received whose stream is not in "open"
+	// or "half closed (local)" state, the recipient MUST respond
+	// with a stream error (Section 5.4.2) of type STREAM_CLOSED."
+	id := f.Header().StreamID
+	st, ok := sc.streams[id]
+	if !ok || st.state != stateOpen || st.gotTrailerHeader {
+		// This includes sending a RST_STREAM if the stream is
+		// in stateHalfClosedLocal (which currently means that
+		// the http.Handler returned, so it's done reading &
+		// done writing). Try to stop the client from sending
+		// more DATA.
+		return StreamError{id, ErrCodeStreamClosed}
+	}
+	if st.body == nil {
+		panic("internal error: should have a body in this state")
+	}
+	data := f.Data()
+
+	// Sender sending more than they'd declared?
+	if st.declBodyBytes != -1 && st.bodyBytes+int64(len(data)) > st.declBodyBytes {
+		st.body.CloseWithError(fmt.Errorf("sender tried to send more than declared Content-Length of %d bytes", st.declBodyBytes))
+		return StreamError{id, ErrCodeStreamClosed}
+	}
+	if len(data) > 0 {
+		// Check whether the client has flow control quota.
+		if int(st.inflow.available()) < len(data) {
+			return StreamError{id, ErrCodeFlowControl}
+		}
+		st.inflow.take(int32(len(data)))
+		wrote, err := st.body.Write(data)
+		if err != nil {
+			return StreamError{id, ErrCodeStreamClosed}
+		}
+		if wrote != len(data) {
+			panic("internal error: bad Writer")
+		}
+		st.bodyBytes += int64(len(data))
+	}
+	if f.StreamEnded() {
+		st.endStream()
+	}
+	return nil
+}
+
+// endStream closes a Request.Body's pipe. It is called when a DATA
+// frame says a request body is over (or after trailers).
+func (st *stream) endStream() {
+	sc := st.sc
+	sc.serveG.check()
+
+	if st.declBodyBytes != -1 && st.declBodyBytes != st.bodyBytes {
+		st.body.CloseWithError(fmt.Errorf("request declared a Content-Length of %d but only wrote %d bytes",
+			st.declBodyBytes, st.bodyBytes))
+	} else {
+		st.body.closeWithErrorAndCode(io.EOF, st.copyTrailersToHandlerRequest)
+		st.body.CloseWithError(io.EOF)
+	}
+	st.state = stateHalfClosedRemote
+}
+
+// copyTrailersToHandlerRequest is run in the Handler's goroutine in
+// its Request.Body.Read just before it gets io.EOF.
+func (st *stream) copyTrailersToHandlerRequest() {
+	for k, vv := range st.trailer {
+		if _, ok := st.reqTrailer[k]; ok {
+			// Only copy it over it was pre-declared.
+			st.reqTrailer[k] = vv
+		}
+	}
+}
+
+func (sc *serverConn) processHeaders(f *HeadersFrame) error {
+	sc.serveG.check()
+	id := f.Header().StreamID
+	if sc.inGoAway {
+		// Ignore.
+		return nil
+	}
+	// http://http2.github.io/http2-spec/#rfc.section.5.1.1
+	// Streams initiated by a client MUST use odd-numbered stream
+	// identifiers. [...] An endpoint that receives an unexpected
+	// stream identifier MUST respond with a connection error
+	// (Section 5.4.1) of type PROTOCOL_ERROR.
+	if id%2 != 1 {
+		return ConnectionError(ErrCodeProtocol)
+	}
+	// A HEADERS frame can be used to create a new stream or
+	// send a trailer for an open one. If we already have a stream
+	// open, let it process its own HEADERS frame (trailers at this
+	// point, if it's valid).
+	st := sc.streams[f.Header().StreamID]
+	if st != nil {
+		return st.processTrailerHeaders(f)
+	}
+
+	// [...] The identifier of a newly established stream MUST be
+	// numerically greater than all streams that the initiating
+	// endpoint has opened or reserved. [...]  An endpoint that
+	// receives an unexpected stream identifier MUST respond with
+	// a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
+	if id <= sc.maxStreamID || sc.req.stream != nil {
+		return ConnectionError(ErrCodeProtocol)
+	}
+
+	if id > sc.maxStreamID {
+		sc.maxStreamID = id
+	}
+	st = &stream{
+		sc:    sc,
+		id:    id,
+		state: stateOpen,
+	}
+	if f.StreamEnded() {
+		st.state = stateHalfClosedRemote
+	}
+	st.cw.Init()
+
+	st.flow.conn = &sc.flow // link to conn-level counter
+	st.flow.add(sc.initialWindowSize)
+	st.inflow.conn = &sc.inflow      // link to conn-level counter
+	st.inflow.add(initialWindowSize) // TODO: update this when we send a higher initial window size in the initial settings
+
+	sc.streams[id] = st
+	if f.HasPriority() {
+		adjustStreamPriority(sc.streams, st.id, f.Priority)
+	}
+	sc.curOpenStreams++
+	if sc.curOpenStreams == 1 {
+		sc.setConnState(http.StateActive)
+	}
+	sc.req = requestParam{
+		stream: st,
+		header: make(http.Header),
+	}
+	sc.hpackDecoder.SetEmitFunc(sc.onNewHeaderField)
+	sc.hpackDecoder.SetEmitEnabled(true)
+	return sc.processHeaderBlockFragment(st, f.HeaderBlockFragment(), f.HeadersEnded())
+}
+
+func (st *stream) processTrailerHeaders(f *HeadersFrame) error {
+	sc := st.sc
+	sc.serveG.check()
+	if st.gotTrailerHeader {
+		return ConnectionError(ErrCodeProtocol)
+	}
+	st.gotTrailerHeader = true
+	if !f.StreamEnded() {
+		return StreamError{st.id, ErrCodeProtocol}
+	}
+	sc.resetPendingRequest() // we use invalidHeader from it for trailers
+	return st.processTrailerHeaderBlockFragment(f.HeaderBlockFragment(), f.HeadersEnded())
+}
+
+func (sc *serverConn) processContinuation(f *ContinuationFrame) error {
+	sc.serveG.check()
+	st := sc.streams[f.Header().StreamID]
+	if st.gotTrailerHeader {
+		return st.processTrailerHeaderBlockFragment(f.HeaderBlockFragment(), f.HeadersEnded())
+	}
+	return sc.processHeaderBlockFragment(st, f.HeaderBlockFragment(), f.HeadersEnded())
+}
+
+func (sc *serverConn) processHeaderBlockFragment(st *stream, frag []byte, end bool) error {
+	sc.serveG.check()
+	if _, err := sc.hpackDecoder.Write(frag); err != nil {
+		return ConnectionError(ErrCodeCompression)
+	}
+	if !end {
+		return nil
+	}
+	if err := sc.hpackDecoder.Close(); err != nil {
+		return ConnectionError(ErrCodeCompression)
+	}
+	defer sc.resetPendingRequest()
+	if sc.curOpenStreams > sc.advMaxStreams {
+		// "Endpoints MUST NOT exceed the limit set by their
+		// peer. An endpoint that receives a HEADERS frame
+		// that causes their advertised concurrent stream
+		// limit to be exceeded MUST treat this as a stream
+		// error (Section 5.4.2) of type PROTOCOL_ERROR or
+		// REFUSED_STREAM."
+		if sc.unackedSettings == 0 {
+			// They should know better.
+			return StreamError{st.id, ErrCodeProtocol}
+		}
+		// Assume it's a network race, where they just haven't
+		// received our last SETTINGS update. But actually
+		// this can't happen yet, because we don't yet provide
+		// a way for users to adjust server parameters at
+		// runtime.
+		return StreamError{st.id, ErrCodeRefusedStream}
+	}
+
+	rw, req, err := sc.newWriterAndRequest()
+	if err != nil {
+		return err
+	}
+	st.reqTrailer = req.Trailer
+	if st.reqTrailer != nil {
+		st.trailer = make(http.Header)
+	}
+	st.body = req.Body.(*requestBody).pipe // may be nil
+	st.declBodyBytes = req.ContentLength
+
+	handler := sc.handler.ServeHTTP
+	if !sc.hpackDecoder.EmitEnabled() {
+		// Their header list was too long. Send a 431 error.
+		handler = handleHeaderListTooLong
+	}
+
+	go sc.runHandler(rw, req, handler)
+	return nil
+}
+
+func (st *stream) processTrailerHeaderBlockFragment(frag []byte, end bool) error {
+	sc := st.sc
+	sc.serveG.check()
+	sc.hpackDecoder.SetEmitFunc(st.onNewTrailerField)
+	if _, err := sc.hpackDecoder.Write(frag); err != nil {
+		return ConnectionError(ErrCodeCompression)
+	}
+	if !end {
+		return nil
+	}
+
+	rp := &sc.req
+	if rp.invalidHeader {
+		return StreamError{rp.stream.id, ErrCodeProtocol}
+	}
+
+	err := sc.hpackDecoder.Close()
+	st.endStream()
+	if err != nil {
+		return ConnectionError(ErrCodeCompression)
+	}
+	return nil
+}
+
+func (sc *serverConn) processPriority(f *PriorityFrame) error {
+	adjustStreamPriority(sc.streams, f.StreamID, f.PriorityParam)
+	return nil
+}
+
+func adjustStreamPriority(streams map[uint32]*stream, streamID uint32, priority PriorityParam) {
+	st, ok := streams[streamID]
+	if !ok {
+		// TODO: not quite correct (this streamID might
+		// already exist in the dep tree, but be closed), but
+		// close enough for now.
+		return
+	}
+	st.weight = priority.Weight
+	parent := streams[priority.StreamDep] // might be nil
+	if parent == st {
+		// if client tries to set this stream to be the parent of itself
+		// ignore and keep going
+		return
+	}
+
+	// section 5.3.3: If a stream is made dependent on one of its
+	// own dependencies, the formerly dependent stream is first
+	// moved to be dependent on the reprioritized stream's previous
+	// parent. The moved dependency retains its weight.
+	for piter := parent; piter != nil; piter = piter.parent {
+		if piter == st {
+			parent.parent = st.parent
+			break
+		}
+	}
+	st.parent = parent
+	if priority.Exclusive && (st.parent != nil || priority.StreamDep == 0) {
+		for _, openStream := range streams {
+			if openStream != st && openStream.parent == st.parent {
+				openStream.parent = st
+			}
+		}
+	}
+}
+
+// resetPendingRequest zeros out all state related to a HEADERS frame
+// and its zero or more CONTINUATION frames sent to start a new
+// request.
+func (sc *serverConn) resetPendingRequest() {
+	sc.serveG.check()
+	sc.req = requestParam{}
+}
+
+func (sc *serverConn) newWriterAndRequest() (*responseWriter, *http.Request, error) {
+	sc.serveG.check()
+	rp := &sc.req
+
+	if rp.invalidHeader {
+		return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
+	}
+
+	isConnect := rp.method == "CONNECT"
+	if isConnect {
+		if rp.path != "" || rp.scheme != "" || rp.authority == "" {
+			return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
+		}
+	} else if rp.method == "" || rp.path == "" ||
+		(rp.scheme != "https" && rp.scheme != "http") {
+		// See 8.1.2.6 Malformed Requests and Responses:
+		//
+		// Malformed requests or responses that are detected
+		// MUST be treated as a stream error (Section 5.4.2)
+		// of type PROTOCOL_ERROR."
+		//
+		// 8.1.2.3 Request Pseudo-Header Fields
+		// "All HTTP/2 requests MUST include exactly one valid
+		// value for the :method, :scheme, and :path
+		// pseudo-header fields"
+		return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
+	}
+
+	bodyOpen := rp.stream.state == stateOpen
+	if rp.method == "HEAD" && bodyOpen {
+		// HEAD requests can't have bodies
+		return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
+	}
+	var tlsState *tls.ConnectionState // nil if not scheme https
+
+	if rp.scheme == "https" {
+		tlsState = sc.tlsState
+	}
+	authority := rp.authority
+	if authority == "" {
+		authority = rp.header.Get("Host")
+	}
+	needsContinue := rp.header.Get("Expect") == "100-continue"
+	if needsContinue {
+		rp.header.Del("Expect")
+	}
+	// Merge Cookie headers into one "; "-delimited value.
+	if cookies := rp.header["Cookie"]; len(cookies) > 1 {
+		rp.header.Set("Cookie", strings.Join(cookies, "; "))
+	}
+
+	// Setup Trailers
+	var trailer http.Header
+	for _, v := range rp.header["Trailer"] {
+		for _, key := range strings.Split(v, ",") {
+			key = http.CanonicalHeaderKey(strings.TrimSpace(key))
+			switch key {
+			case "Transfer-Encoding", "Trailer", "Content-Length":
+				// Bogus. (copy of http1 rules)
+				// Ignore.
+			default:
+				if trailer == nil {
+					trailer = make(http.Header)
+				}
+				trailer[key] = nil
+			}
+		}
+	}
+	delete(rp.header, "Trailer")
+
+	body := &requestBody{
+		conn:          sc,
+		stream:        rp.stream,
+		needsContinue: needsContinue,
+	}
+	var url_ *url.URL
+	var requestURI string
+	if isConnect {
+		url_ = &url.URL{Host: rp.authority}
+		requestURI = rp.authority // mimic HTTP/1 server behavior
+	} else {
+		var err error
+		url_, err = url.ParseRequestURI(rp.path)
+		if err != nil {
+			return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
+		}
+		requestURI = rp.path
+	}
+	req := &http.Request{
+		Method:     rp.method,
+		URL:        url_,
+		RemoteAddr: sc.remoteAddrStr,
+		Header:     rp.header,
+		RequestURI: requestURI,
+		Proto:      "HTTP/2.0",
+		ProtoMajor: 2,
+		ProtoMinor: 0,
+		TLS:        tlsState,
+		Host:       authority,
+		Body:       body,
+		Trailer:    trailer,
+	}
+	if bodyOpen {
+		body.pipe = &pipe{
+			b: &fixedBuffer{buf: make([]byte, initialWindowSize)}, // TODO: garbage
+		}
+
+		if vv, ok := rp.header["Content-Length"]; ok {
+			req.ContentLength, _ = strconv.ParseInt(vv[0], 10, 64)
+		} else {
+			req.ContentLength = -1
+		}
+	}
+
+	rws := responseWriterStatePool.Get().(*responseWriterState)
+	bwSave := rws.bw
+	*rws = responseWriterState{} // zero all the fields
+	rws.conn = sc
+	rws.bw = bwSave
+	rws.bw.Reset(chunkWriter{rws})
+	rws.stream = rp.stream
+	rws.req = req
+	rws.body = body
+
+	rw := &responseWriter{rws: rws}
+	return rw, req, nil
+}
+
+// Run on its own goroutine.
+func (sc *serverConn) runHandler(rw *responseWriter, req *http.Request, handler func(http.ResponseWriter, *http.Request)) {
+	didPanic := true
+	defer func() {
+		if didPanic {
+			e := recover()
+			// Same as net/http:
+			const size = 64 << 10
+			buf := make([]byte, size)
+			buf = buf[:runtime.Stack(buf, false)]
+			sc.writeFrameFromHandler(frameWriteMsg{
+				write:  handlerPanicRST{rw.rws.stream.id},
+				stream: rw.rws.stream,
+			})
+			sc.logf("http2: panic serving %v: %v\n%s", sc.conn.RemoteAddr(), e, buf)
+			return
+		}
+		rw.handlerDone()
+	}()
+	handler(rw, req)
+	didPanic = false
+}
+
+func handleHeaderListTooLong(w http.ResponseWriter, r *http.Request) {
+	// 10.5.1 Limits on Header Block Size:
+	// .. "A server that receives a larger header block than it is
+	// willing to handle can send an HTTP 431 (Request Header Fields Too
+	// Large) status code"
+	const statusRequestHeaderFieldsTooLarge = 431 // only in Go 1.6+
+	w.WriteHeader(statusRequestHeaderFieldsTooLarge)
+	io.WriteString(w, "<h1>HTTP Error 431</h1><p>Request Header Field(s) Too Large</p>")
+}
+
+// called from handler goroutines.
+// h may be nil.
+func (sc *serverConn) writeHeaders(st *stream, headerData *writeResHeaders) error {
+	sc.serveG.checkNotOn() // NOT on
+	var errc chan error
+	if headerData.h != nil {
+		// If there's a header map (which we don't own), so we have to block on
+		// waiting for this frame to be written, so an http.Flush mid-handler
+		// writes out the correct value of keys, before a handler later potentially
+		// mutates it.
+		errc = errChanPool.Get().(chan error)
+	}
+	if err := sc.writeFrameFromHandler(frameWriteMsg{
+		write:  headerData,
+		stream: st,
+		done:   errc,
+	}); err != nil {
+		return err
+	}
+	if errc != nil {
+		select {
+		case err := <-errc:
+			errChanPool.Put(errc)
+			return err
+		case <-sc.doneServing:
+			return errClientDisconnected
+		case <-st.cw:
+			return errStreamClosed
+		}
+	}
+	return nil
+}
+
+// called from handler goroutines.
+func (sc *serverConn) write100ContinueHeaders(st *stream) {
+	sc.writeFrameFromHandler(frameWriteMsg{
+		write:  write100ContinueHeadersFrame{st.id},
+		stream: st,
+	})
+}
+
+// A bodyReadMsg tells the server loop that the http.Handler read n
+// bytes of the DATA from the client on the given stream.
+type bodyReadMsg struct {
+	st *stream
+	n  int
+}
+
+// called from handler goroutines.
+// Notes that the handler for the given stream ID read n bytes of its body
+// and schedules flow control tokens to be sent.
+func (sc *serverConn) noteBodyReadFromHandler(st *stream, n int) {
+	sc.serveG.checkNotOn() // NOT on
+	select {
+	case sc.bodyReadCh <- bodyReadMsg{st, n}:
+	case <-sc.doneServing:
+	}
+}
+
+func (sc *serverConn) noteBodyRead(st *stream, n int) {
+	sc.serveG.check()
+	sc.sendWindowUpdate(nil, n) // conn-level
+	if st.state != stateHalfClosedRemote && st.state != stateClosed {
+		// Don't send this WINDOW_UPDATE if the stream is closed
+		// remotely.
+		sc.sendWindowUpdate(st, n)
+	}
+}
+
+// st may be nil for conn-level
+func (sc *serverConn) sendWindowUpdate(st *stream, n int) {
+	sc.serveG.check()
+	// "The legal range for the increment to the flow control
+	// window is 1 to 2^31-1 (2,147,483,647) octets."
+	// A Go Read call on 64-bit machines could in theory read
+	// a larger Read than this. Very unlikely, but we handle it here
+	// rather than elsewhere for now.
+	const maxUint31 = 1<<31 - 1
+	for n >= maxUint31 {
+		sc.sendWindowUpdate32(st, maxUint31)
+		n -= maxUint31
+	}
+	sc.sendWindowUpdate32(st, int32(n))
+}
+
+// st may be nil for conn-level
+func (sc *serverConn) sendWindowUpdate32(st *stream, n int32) {
+	sc.serveG.check()
+	if n == 0 {
+		return
+	}
+	if n < 0 {
+		panic("negative update")
+	}
+	var streamID uint32
+	if st != nil {
+		streamID = st.id
+	}
+	sc.writeFrame(frameWriteMsg{
+		write:  writeWindowUpdate{streamID: streamID, n: uint32(n)},
+		stream: st,
+	})
+	var ok bool
+	if st == nil {
+		ok = sc.inflow.add(n)
+	} else {
+		ok = st.inflow.add(n)
+	}
+	if !ok {
+		panic("internal error; sent too many window updates without decrements?")
+	}
+}
+
+type requestBody struct {
+	stream        *stream
+	conn          *serverConn
+	closed        bool
+	pipe          *pipe // non-nil if we have a HTTP entity message body
+	needsContinue bool  // need to send a 100-continue
+}
+
+func (b *requestBody) Close() error {
+	if b.pipe != nil {
+		b.pipe.CloseWithError(errClosedBody)
+	}
+	b.closed = true
+	return nil
+}
+
+func (b *requestBody) Read(p []byte) (n int, err error) {
+	if b.needsContinue {
+		b.needsContinue = false
+		b.conn.write100ContinueHeaders(b.stream)
+	}
+	if b.pipe == nil {
+		return 0, io.EOF
+	}
+	n, err = b.pipe.Read(p)
+	if n > 0 {
+		b.conn.noteBodyReadFromHandler(b.stream, n)
+	}
+	return
+}
+
+// responseWriter is the http.ResponseWriter implementation.  It's
+// intentionally small (1 pointer wide) to minimize garbage.  The
+// responseWriterState pointer inside is zeroed at the end of a
+// request (in handlerDone) and calls on the responseWriter thereafter
+// simply crash (caller's mistake), but the much larger responseWriterState
+// and buffers are reused between multiple requests.
+type responseWriter struct {
+	rws *responseWriterState
+}
+
+// Optional http.ResponseWriter interfaces implemented.
+var (
+	_ http.CloseNotifier = (*responseWriter)(nil)
+	_ http.Flusher       = (*responseWriter)(nil)
+	_ stringWriter       = (*responseWriter)(nil)
+)
+
+type responseWriterState struct {
+	// immutable within a request:
+	stream *stream
+	req    *http.Request
+	body   *requestBody // to close at end of request, if DATA frames didn't
+	conn   *serverConn
+
+	// TODO: adjust buffer writing sizes based on server config, frame size updates from peer, etc
+	bw *bufio.Writer // writing to a chunkWriter{this *responseWriterState}
+
+	// mutated by http.Handler goroutine:
+	handlerHeader http.Header // nil until called
+	snapHeader    http.Header // snapshot of handlerHeader at WriteHeader time
+	trailers      []string    // set in writeChunk
+	status        int         // status code passed to WriteHeader
+	wroteHeader   bool        // WriteHeader called (explicitly or implicitly). Not necessarily sent to user yet.
+	sentHeader    bool        // have we sent the header frame?
+	handlerDone   bool        // handler has finished
+
+	sentContentLen int64 // non-zero if handler set a Content-Length header
+	wroteBytes     int64
+
+	closeNotifierMu sync.Mutex // guards closeNotifierCh
+	closeNotifierCh chan bool  // nil until first used
+}
+
+type chunkWriter struct{ rws *responseWriterState }
+
+func (cw chunkWriter) Write(p []byte) (n int, err error) { return cw.rws.writeChunk(p) }
+
+func (rws *responseWriterState) hasTrailers() bool { return len(rws.trailers) != 0 }
+
+// declareTrailer is called for each Trailer header when the
+// response header is written. It notes that a header will need to be
+// written in the trailers at the end of the response.
+func (rws *responseWriterState) declareTrailer(k string) {
+	k = http.CanonicalHeaderKey(k)
+	switch k {
+	case "Transfer-Encoding", "Content-Length", "Trailer":
+		// Forbidden by RFC 2616 14.40.
+		return
+	}
+	if !strSliceContains(rws.trailers, k) {
+		rws.trailers = append(rws.trailers, k)
+	}
+}
+
+// writeChunk writes chunks from the bufio.Writer. But because
+// bufio.Writer may bypass its chunking, sometimes p may be
+// arbitrarily large.
+//
+// writeChunk is also responsible (on the first chunk) for sending the
+// HEADER response.
+func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
+	if !rws.wroteHeader {
+		rws.writeHeader(200)
+	}
+
+	isHeadResp := rws.req.Method == "HEAD"
+	if !rws.sentHeader {
+		rws.sentHeader = true
+		var ctype, clen string
+		if clen = rws.snapHeader.Get("Content-Length"); clen != "" {
+			rws.snapHeader.Del("Content-Length")
+			clen64, err := strconv.ParseInt(clen, 10, 64)
+			if err == nil && clen64 >= 0 {
+				rws.sentContentLen = clen64
+			} else {
+				clen = ""
+			}
+		}
+		if clen == "" && rws.handlerDone && bodyAllowedForStatus(rws.status) && (len(p) > 0 || !isHeadResp) {
+			clen = strconv.Itoa(len(p))
+		}
+		_, hasContentType := rws.snapHeader["Content-Type"]
+		if !hasContentType && bodyAllowedForStatus(rws.status) {
+			ctype = http.DetectContentType(p)
+		}
+		var date string
+		if _, ok := rws.snapHeader["Date"]; !ok {
+			// TODO(bradfitz): be faster here, like net/http? measure.
+			date = time.Now().UTC().Format(http.TimeFormat)
+		}
+
+		for _, v := range rws.snapHeader["Trailer"] {
+			foreachHeaderElement(v, rws.declareTrailer)
+		}
+
+		endStream := (rws.handlerDone && !rws.hasTrailers() && len(p) == 0) || isHeadResp
+		err = rws.conn.writeHeaders(rws.stream, &writeResHeaders{
+			streamID:      rws.stream.id,
+			httpResCode:   rws.status,
+			h:             rws.snapHeader,
+			endStream:     endStream,
+			contentType:   ctype,
+			contentLength: clen,
+			date:          date,
+		})
+		if err != nil {
+			return 0, err
+		}
+		if endStream {
+			return 0, nil
+		}
+	}
+	if isHeadResp {
+		return len(p), nil
+	}
+	if len(p) == 0 && !rws.handlerDone {
+		return 0, nil
+	}
+
+	if rws.handlerDone {
+		rws.promoteUndeclaredTrailers()
+	}
+
+	endStream := rws.handlerDone && !rws.hasTrailers()
+	if len(p) > 0 || endStream {
+		// only send a 0 byte DATA frame if we're ending the stream.
+		if err := rws.conn.writeDataFromHandler(rws.stream, p, endStream); err != nil {
+			return 0, err
+		}
+	}
+
+	if rws.handlerDone && rws.hasTrailers() {
+		err = rws.conn.writeHeaders(rws.stream, &writeResHeaders{
+			streamID:  rws.stream.id,
+			h:         rws.handlerHeader,
+			trailers:  rws.trailers,
+			endStream: true,
+		})
+		return len(p), err
+	}
+	return len(p), nil
+}
+
+// TrailerPrefix is a magic prefix for ResponseWriter.Header map keys
+// that, if present, signals that the map entry is actually for
+// the response trailers, and not the response headers. The prefix
+// is stripped after the ServeHTTP call finishes and the values are
+// sent in the trailers.
+//
+// This mechanism is intended only for trailers that are not known
+// prior to the headers being written. If the set of trailers is fixed
+// or known before the header is written, the normal Go trailers mechanism
+// is preferred:
+//    https://golang.org/pkg/net/http/#ResponseWriter
+//    https://golang.org/pkg/net/http/#example_ResponseWriter_trailers
+const TrailerPrefix = "Trailer:"
+
+// promoteUndeclaredTrailers permits http.Handlers to set trailers
+// after the header has already been flushed. Because the Go
+// ResponseWriter interface has no way to set Trailers (only the
+// Header), and because we didn't want to expand the ResponseWriter
+// interface, and because nobody used trailers, and because RFC 2616
+// says you SHOULD (but not must) predeclare any trailers in the
+// header, the official ResponseWriter rules said trailers in Go must
+// be predeclared, and then we reuse the same ResponseWriter.Header()
+// map to mean both Headers and Trailers.  When it's time to write the
+// Trailers, we pick out the fields of Headers that were declared as
+// trailers. That worked for a while, until we found the first major
+// user of Trailers in the wild: gRPC (using them only over http2),
+// and gRPC libraries permit setting trailers mid-stream without
+// predeclarnig them. So: change of plans. We still permit the old
+// way, but we also permit this hack: if a Header() key begins with
+// "Trailer:", the suffix of that key is a Trailer. Because ':' is an
+// invalid token byte anyway, there is no ambiguity. (And it's already
+// filtered out) It's mildly hacky, but not terrible.
+//
+// This method runs after the Handler is done and promotes any Header
+// fields to be trailers.
+func (rws *responseWriterState) promoteUndeclaredTrailers() {
+	for k, vv := range rws.handlerHeader {
+		if !strings.HasPrefix(k, TrailerPrefix) {
+			continue
+		}
+		trailerKey := strings.TrimPrefix(k, TrailerPrefix)
+		rws.declareTrailer(trailerKey)
+		rws.handlerHeader[http.CanonicalHeaderKey(trailerKey)] = vv
+	}
+	sort.Strings(rws.trailers)
+}
+
+func (w *responseWriter) Flush() {
+	rws := w.rws
+	if rws == nil {
+		panic("Header called after Handler finished")
+	}
+	if rws.bw.Buffered() > 0 {
+		if err := rws.bw.Flush(); err != nil {
+			// Ignore the error. The frame writer already knows.
+			return
+		}
+	} else {
+		// The bufio.Writer won't call chunkWriter.Write
+		// (writeChunk with zero bytes, so we have to do it
+		// ourselves to force the HTTP response header and/or
+		// final DATA frame (with END_STREAM) to be sent.
+		rws.writeChunk(nil)
+	}
+}
+
+func (w *responseWriter) CloseNotify() <-chan bool {
+	rws := w.rws
+	if rws == nil {
+		panic("CloseNotify called after Handler finished")
+	}
+	rws.closeNotifierMu.Lock()
+	ch := rws.closeNotifierCh
+	if ch == nil {
+		ch = make(chan bool, 1)
+		rws.closeNotifierCh = ch
+		go func() {
+			rws.stream.cw.Wait() // wait for close
+			ch <- true
+		}()
+	}
+	rws.closeNotifierMu.Unlock()
+	return ch
+}
+
+func (w *responseWriter) Header() http.Header {
+	rws := w.rws
+	if rws == nil {
+		panic("Header called after Handler finished")
+	}
+	if rws.handlerHeader == nil {
+		rws.handlerHeader = make(http.Header)
+	}
+	return rws.handlerHeader
+}
+
+func (w *responseWriter) WriteHeader(code int) {
+	rws := w.rws
+	if rws == nil {
+		panic("WriteHeader called after Handler finished")
+	}
+	rws.writeHeader(code)
+}
+
+func (rws *responseWriterState) writeHeader(code int) {
+	if !rws.wroteHeader {
+		rws.wroteHeader = true
+		rws.status = code
+		if len(rws.handlerHeader) > 0 {
+			rws.snapHeader = cloneHeader(rws.handlerHeader)
+		}
+	}
+}
+
+func cloneHeader(h http.Header) http.Header {
+	h2 := make(http.Header, len(h))
+	for k, vv := range h {
+		vv2 := make([]string, len(vv))
+		copy(vv2, vv)
+		h2[k] = vv2
+	}
+	return h2
+}
+
+// The Life Of A Write is like this:
+//
+// * Handler calls w.Write or w.WriteString ->
+// * -> rws.bw (*bufio.Writer) ->
+// * (Handler migth call Flush)
+// * -> chunkWriter{rws}
+// * -> responseWriterState.writeChunk(p []byte)
+// * -> responseWriterState.writeChunk (most of the magic; see comment there)
+func (w *responseWriter) Write(p []byte) (n int, err error) {
+	return w.write(len(p), p, "")
+}
+
+func (w *responseWriter) WriteString(s string) (n int, err error) {
+	return w.write(len(s), nil, s)
+}
+
+// either dataB or dataS is non-zero.
+func (w *responseWriter) write(lenData int, dataB []byte, dataS string) (n int, err error) {
+	rws := w.rws
+	if rws == nil {
+		panic("Write called after Handler finished")
+	}
+	if !rws.wroteHeader {
+		w.WriteHeader(200)
+	}
+	if !bodyAllowedForStatus(rws.status) {
+		return 0, http.ErrBodyNotAllowed
+	}
+	rws.wroteBytes += int64(len(dataB)) + int64(len(dataS)) // only one can be set
+	if rws.sentContentLen != 0 && rws.wroteBytes > rws.sentContentLen {
+		// TODO: send a RST_STREAM
+		return 0, errors.New("http2: handler wrote more than declared Content-Length")
+	}
+
+	if dataB != nil {
+		return rws.bw.Write(dataB)
+	} else {
+		return rws.bw.WriteString(dataS)
+	}
+}
+
+func (w *responseWriter) handlerDone() {
+	rws := w.rws
+	rws.handlerDone = true
+	w.Flush()
+	w.rws = nil
+	responseWriterStatePool.Put(rws)
+}
+
+// foreachHeaderElement splits v according to the "#rule" construction
+// in RFC 2616 section 2.1 and calls fn for each non-empty element.
+func foreachHeaderElement(v string, fn func(string)) {
+	v = textproto.TrimString(v)
+	if v == "" {
+		return
+	}
+	if !strings.Contains(v, ",") {
+		fn(v)
+		return
+	}
+	for _, f := range strings.Split(v, ",") {
+		if f = textproto.TrimString(f); f != "" {
+			fn(f)
+		}
+	}
+}
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
new file mode 100644
index 0000000000..b3cbb9943d
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -0,0 +1,1713 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Transport code.
+
+package http2
+
+import (
+	"bufio"
+	"bytes"
+	"compress/gzip"
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"net"
+	"net/http"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"golang.org/x/net/http2/hpack"
+)
+
+const (
+	// transportDefaultConnFlow is how many connection-level flow control
+	// tokens we give the server at start-up, past the default 64k.
+	transportDefaultConnFlow = 1 << 30
+
+	// transportDefaultStreamFlow is how many stream-level flow
+	// control tokens we announce to the peer, and how many bytes
+	// we buffer per stream.
+	transportDefaultStreamFlow = 4 << 20
+
+	// transportDefaultStreamMinRefresh is the minimum number of bytes we'll send
+	// a stream-level WINDOW_UPDATE for at a time.
+	transportDefaultStreamMinRefresh = 4 << 10
+
+	defaultUserAgent = "Go-http-client/2.0"
+)
+
+// Transport is an HTTP/2 Transport.
+//
+// A Transport internally caches connections to servers. It is safe
+// for concurrent use by multiple goroutines.
+type Transport struct {
+	// DialTLS specifies an optional dial function for creating
+	// TLS connections for requests.
+	//
+	// If DialTLS is nil, tls.Dial is used.
+	//
+	// If the returned net.Conn has a ConnectionState method like tls.Conn,
+	// it will be used to set http.Response.TLS.
+	DialTLS func(network, addr string, cfg *tls.Config) (net.Conn, error)
+
+	// TLSClientConfig specifies the TLS configuration to use with
+	// tls.Client. If nil, the default configuration is used.
+	TLSClientConfig *tls.Config
+
+	// ConnPool optionally specifies an alternate connection pool to use.
+	// If nil, the default is used.
+	ConnPool ClientConnPool
+
+	// DisableCompression, if true, prevents the Transport from
+	// requesting compression with an "Accept-Encoding: gzip"
+	// request header when the Request contains no existing
+	// Accept-Encoding value. If the Transport requests gzip on
+	// its own and gets a gzipped response, it's transparently
+	// decoded in the Response.Body. However, if the user
+	// explicitly requested gzip it is not automatically
+	// uncompressed.
+	DisableCompression bool
+
+	// MaxHeaderListSize is the http2 SETTINGS_MAX_HEADER_LIST_SIZE to
+	// send in the initial settings frame. It is how many bytes
+	// of response headers are allow. Unlike the http2 spec, zero here
+	// means to use a default limit (currently 10MB). If you actually
+	// want to advertise an ulimited value to the peer, Transport
+	// interprets the highest possible value here (0xffffffff or 1<<32-1)
+	// to mean no limit.
+	MaxHeaderListSize uint32
+
+	// t1, if non-nil, is the standard library Transport using
+	// this transport. Its settings are used (but not its
+	// RoundTrip method, etc).
+	t1 *http.Transport
+
+	connPoolOnce  sync.Once
+	connPoolOrDef ClientConnPool // non-nil version of ConnPool
+}
+
+func (t *Transport) maxHeaderListSize() uint32 {
+	if t.MaxHeaderListSize == 0 {
+		return 10 << 20
+	}
+	if t.MaxHeaderListSize == 0xffffffff {
+		return 0
+	}
+	return t.MaxHeaderListSize
+}
+
+func (t *Transport) disableCompression() bool {
+	return t.DisableCompression || (t.t1 != nil && t.t1.DisableCompression)
+}
+
+var errTransportVersion = errors.New("http2: ConfigureTransport is only supported starting at Go 1.6")
+
+// ConfigureTransport configures a net/http HTTP/1 Transport to use HTTP/2.
+// It requires Go 1.6 or later and returns an error if the net/http package is too old
+// or if t1 has already been HTTP/2-enabled.
+func ConfigureTransport(t1 *http.Transport) error {
+	_, err := configureTransport(t1) // in configure_transport.go (go1.6) or not_go16.go
+	return err
+}
+
+func (t *Transport) connPool() ClientConnPool {
+	t.connPoolOnce.Do(t.initConnPool)
+	return t.connPoolOrDef
+}
+
+func (t *Transport) initConnPool() {
+	if t.ConnPool != nil {
+		t.connPoolOrDef = t.ConnPool
+	} else {
+		t.connPoolOrDef = &clientConnPool{t: t}
+	}
+}
+
+// ClientConn is the state of a single HTTP/2 client connection to an
+// HTTP/2 server.
+type ClientConn struct {
+	t        *Transport
+	tconn    net.Conn             // usually *tls.Conn, except specialized impls
+	tlsState *tls.ConnectionState // nil only for specialized impls
+
+	// readLoop goroutine fields:
+	readerDone chan struct{} // closed on error
+	readerErr  error         // set before readerDone is closed
+
+	mu           sync.Mutex // guards following
+	cond         *sync.Cond // hold mu; broadcast on flow/closed changes
+	flow         flow       // our conn-level flow control quota (cs.flow is per stream)
+	inflow       flow       // peer's conn-level flow control
+	closed       bool
+	goAway       *GoAwayFrame             // if non-nil, the GoAwayFrame we received
+	streams      map[uint32]*clientStream // client-initiated
+	nextStreamID uint32
+	bw           *bufio.Writer
+	br           *bufio.Reader
+	fr           *Framer
+	// Settings from peer:
+	maxFrameSize         uint32
+	maxConcurrentStreams uint32
+	initialWindowSize    uint32
+	hbuf                 bytes.Buffer // HPACK encoder writes into this
+	henc                 *hpack.Encoder
+	freeBuf              [][]byte
+
+	wmu  sync.Mutex // held while writing; acquire AFTER mu if holding both
+	werr error      // first write error that has occurred
+}
+
+// clientStream is the state for a single HTTP/2 stream. One of these
+// is created for each Transport.RoundTrip call.
+type clientStream struct {
+	cc            *ClientConn
+	req           *http.Request
+	ID            uint32
+	resc          chan resAndError
+	bufPipe       pipe // buffered pipe with the flow-controlled response payload
+	requestedGzip bool
+
+	flow        flow  // guarded by cc.mu
+	inflow      flow  // guarded by cc.mu
+	bytesRemain int64 // -1 means unknown; owned by transportResponseBody.Read
+	readErr     error // sticky read error; owned by transportResponseBody.Read
+	stopReqBody error // if non-nil, stop writing req body; guarded by cc.mu
+
+	peerReset chan struct{} // closed on peer reset
+	resetErr  error         // populated before peerReset is closed
+
+	done chan struct{} // closed when stream remove from cc.streams map; close calls guarded by cc.mu
+
+	// owned by clientConnReadLoop:
+	pastHeaders  bool // got HEADERS w/ END_HEADERS
+	pastTrailers bool // got second HEADERS frame w/ END_HEADERS
+
+	trailer    http.Header  // accumulated trailers
+	resTrailer *http.Header // client's Response.Trailer
+}
+
+// awaitRequestCancel runs in its own goroutine and waits for the user
+// to either cancel a RoundTrip request (using the provided
+// Request.Cancel channel), or for the request to be done (any way it
+// might be removed from the cc.streams map: peer reset, successful
+// completion, TCP connection breakage, etc)
+func (cs *clientStream) awaitRequestCancel(cancel <-chan struct{}) {
+	if cancel == nil {
+		return
+	}
+	select {
+	case <-cancel:
+		cs.bufPipe.CloseWithError(errRequestCanceled)
+		cs.cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+	case <-cs.done:
+	}
+}
+
+// checkReset reports any error sent in a RST_STREAM frame by the
+// server.
+func (cs *clientStream) checkReset() error {
+	select {
+	case <-cs.peerReset:
+		return cs.resetErr
+	default:
+		return nil
+	}
+}
+
+func (cs *clientStream) abortRequestBodyWrite(err error) {
+	if err == nil {
+		panic("nil error")
+	}
+	cc := cs.cc
+	cc.mu.Lock()
+	cs.stopReqBody = err
+	cc.cond.Broadcast()
+	cc.mu.Unlock()
+}
+
+type stickyErrWriter struct {
+	w   io.Writer
+	err *error
+}
+
+func (sew stickyErrWriter) Write(p []byte) (n int, err error) {
+	if *sew.err != nil {
+		return 0, *sew.err
+	}
+	n, err = sew.w.Write(p)
+	*sew.err = err
+	return
+}
+
+var ErrNoCachedConn = errors.New("http2: no cached connection was available")
+
+// RoundTripOpt are options for the Transport.RoundTripOpt method.
+type RoundTripOpt struct {
+	// OnlyCachedConn controls whether RoundTripOpt may
+	// create a new TCP connection. If set true and
+	// no cached connection is available, RoundTripOpt
+	// will return ErrNoCachedConn.
+	OnlyCachedConn bool
+}
+
+func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
+	return t.RoundTripOpt(req, RoundTripOpt{})
+}
+
+// authorityAddr returns a given authority (a host/IP, or host:port / ip:port)
+// and returns a host:port. The port 443 is added if needed.
+func authorityAddr(authority string) (addr string) {
+	if _, _, err := net.SplitHostPort(authority); err == nil {
+		return authority
+	}
+	return net.JoinHostPort(authority, "443")
+}
+
+// RoundTripOpt is like RoundTrip, but takes options.
+func (t *Transport) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.Response, error) {
+	if req.URL.Scheme != "https" {
+		return nil, errors.New("http2: unsupported scheme")
+	}
+
+	addr := authorityAddr(req.URL.Host)
+	for {
+		cc, err := t.connPool().GetClientConn(req, addr)
+		if err != nil {
+			t.vlogf("http2: Transport failed to get client conn for %s: %v", addr, err)
+			return nil, err
+		}
+		res, err := cc.RoundTrip(req)
+		if shouldRetryRequest(req, err) {
+			continue
+		}
+		if err != nil {
+			t.vlogf("RoundTrip failure: %v", err)
+			return nil, err
+		}
+		return res, nil
+	}
+}
+
+// CloseIdleConnections closes any connections which were previously
+// connected from previous requests but are now sitting idle.
+// It does not interrupt any connections currently in use.
+func (t *Transport) CloseIdleConnections() {
+	if cp, ok := t.connPool().(*clientConnPool); ok {
+		cp.closeIdleConnections()
+	}
+}
+
+var (
+	errClientConnClosed   = errors.New("http2: client conn is closed")
+	errClientConnUnusable = errors.New("http2: client conn not usable")
+)
+
+func shouldRetryRequest(req *http.Request, err error) bool {
+	// TODO: retry GET requests (no bodies) more aggressively, if shutdown
+	// before response.
+	return err == errClientConnUnusable
+}
+
+func (t *Transport) dialClientConn(addr string) (*ClientConn, error) {
+	host, _, err := net.SplitHostPort(addr)
+	if err != nil {
+		return nil, err
+	}
+	tconn, err := t.dialTLS()("tcp", addr, t.newTLSConfig(host))
+	if err != nil {
+		return nil, err
+	}
+	return t.NewClientConn(tconn)
+}
+
+func (t *Transport) newTLSConfig(host string) *tls.Config {
+	cfg := new(tls.Config)
+	if t.TLSClientConfig != nil {
+		*cfg = *t.TLSClientConfig
+	}
+	cfg.NextProtos = []string{NextProtoTLS} // TODO: don't override if already in list
+	cfg.ServerName = host
+	return cfg
+}
+
+func (t *Transport) dialTLS() func(string, string, *tls.Config) (net.Conn, error) {
+	if t.DialTLS != nil {
+		return t.DialTLS
+	}
+	return t.dialTLSDefault
+}
+
+func (t *Transport) dialTLSDefault(network, addr string, cfg *tls.Config) (net.Conn, error) {
+	cn, err := tls.Dial(network, addr, cfg)
+	if err != nil {
+		return nil, err
+	}
+	if err := cn.Handshake(); err != nil {
+		return nil, err
+	}
+	if !cfg.InsecureSkipVerify {
+		if err := cn.VerifyHostname(cfg.ServerName); err != nil {
+			return nil, err
+		}
+	}
+	state := cn.ConnectionState()
+	if p := state.NegotiatedProtocol; p != NextProtoTLS {
+		return nil, fmt.Errorf("http2: unexpected ALPN protocol %q; want %q", p, NextProtoTLS)
+	}
+	if !state.NegotiatedProtocolIsMutual {
+		return nil, errors.New("http2: could not negotiate protocol mutually")
+	}
+	return cn, nil
+}
+
+// disableKeepAlives reports whether connections should be closed as
+// soon as possible after handling the first request.
+func (t *Transport) disableKeepAlives() bool {
+	return t.t1 != nil && t.t1.DisableKeepAlives
+}
+
+func (t *Transport) NewClientConn(c net.Conn) (*ClientConn, error) {
+	if VerboseLogs {
+		t.vlogf("http2: Transport creating client conn to %v", c.RemoteAddr())
+	}
+	if _, err := c.Write(clientPreface); err != nil {
+		t.vlogf("client preface write error: %v", err)
+		return nil, err
+	}
+
+	cc := &ClientConn{
+		t:                    t,
+		tconn:                c,
+		readerDone:           make(chan struct{}),
+		nextStreamID:         1,
+		maxFrameSize:         16 << 10, // spec default
+		initialWindowSize:    65535,    // spec default
+		maxConcurrentStreams: 1000,     // "infinite", per spec. 1000 seems good enough.
+		streams:              make(map[uint32]*clientStream),
+	}
+	cc.cond = sync.NewCond(&cc.mu)
+	cc.flow.add(int32(initialWindowSize))
+
+	// TODO: adjust this writer size to account for frame size +
+	// MTU + crypto/tls record padding.
+	cc.bw = bufio.NewWriter(stickyErrWriter{c, &cc.werr})
+	cc.br = bufio.NewReader(c)
+	cc.fr = NewFramer(cc.bw, cc.br)
+
+	// TODO: SetMaxDynamicTableSize, SetMaxDynamicTableSizeLimit on
+	// henc in response to SETTINGS frames?
+	cc.henc = hpack.NewEncoder(&cc.hbuf)
+
+	type connectionStater interface {
+		ConnectionState() tls.ConnectionState
+	}
+	if cs, ok := c.(connectionStater); ok {
+		state := cs.ConnectionState()
+		cc.tlsState = &state
+	}
+
+	initialSettings := []Setting{
+		Setting{ID: SettingEnablePush, Val: 0},
+		Setting{ID: SettingInitialWindowSize, Val: transportDefaultStreamFlow},
+	}
+	if max := t.maxHeaderListSize(); max != 0 {
+		initialSettings = append(initialSettings, Setting{ID: SettingMaxHeaderListSize, Val: max})
+	}
+	cc.fr.WriteSettings(initialSettings...)
+	cc.fr.WriteWindowUpdate(0, transportDefaultConnFlow)
+	cc.inflow.add(transportDefaultConnFlow + initialWindowSize)
+	cc.bw.Flush()
+	if cc.werr != nil {
+		return nil, cc.werr
+	}
+
+	// Read the obligatory SETTINGS frame
+	f, err := cc.fr.ReadFrame()
+	if err != nil {
+		return nil, err
+	}
+	sf, ok := f.(*SettingsFrame)
+	if !ok {
+		return nil, fmt.Errorf("expected settings frame, got: %T", f)
+	}
+	cc.fr.WriteSettingsAck()
+	cc.bw.Flush()
+
+	sf.ForeachSetting(func(s Setting) error {
+		switch s.ID {
+		case SettingMaxFrameSize:
+			cc.maxFrameSize = s.Val
+		case SettingMaxConcurrentStreams:
+			cc.maxConcurrentStreams = s.Val
+		case SettingInitialWindowSize:
+			cc.initialWindowSize = s.Val
+		default:
+			// TODO(bradfitz): handle more; at least SETTINGS_HEADER_TABLE_SIZE?
+			t.vlogf("Unhandled Setting: %v", s)
+		}
+		return nil
+	})
+
+	go cc.readLoop()
+	return cc, nil
+}
+
+func (cc *ClientConn) setGoAway(f *GoAwayFrame) {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	cc.goAway = f
+}
+
+func (cc *ClientConn) CanTakeNewRequest() bool {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	return cc.canTakeNewRequestLocked()
+}
+
+func (cc *ClientConn) canTakeNewRequestLocked() bool {
+	return cc.goAway == nil && !cc.closed &&
+		int64(len(cc.streams)+1) < int64(cc.maxConcurrentStreams) &&
+		cc.nextStreamID < 2147483647
+}
+
+func (cc *ClientConn) closeIfIdle() {
+	cc.mu.Lock()
+	if len(cc.streams) > 0 {
+		cc.mu.Unlock()
+		return
+	}
+	cc.closed = true
+	// TODO: do clients send GOAWAY too? maybe? Just Close:
+	cc.mu.Unlock()
+
+	cc.tconn.Close()
+}
+
+const maxAllocFrameSize = 512 << 10
+
+// frameBuffer returns a scratch buffer suitable for writing DATA frames.
+// They're capped at the min of the peer's max frame size or 512KB
+// (kinda arbitrarily), but definitely capped so we don't allocate 4GB
+// bufers.
+func (cc *ClientConn) frameScratchBuffer() []byte {
+	cc.mu.Lock()
+	size := cc.maxFrameSize
+	if size > maxAllocFrameSize {
+		size = maxAllocFrameSize
+	}
+	for i, buf := range cc.freeBuf {
+		if len(buf) >= int(size) {
+			cc.freeBuf[i] = nil
+			cc.mu.Unlock()
+			return buf[:size]
+		}
+	}
+	cc.mu.Unlock()
+	return make([]byte, size)
+}
+
+func (cc *ClientConn) putFrameScratchBuffer(buf []byte) {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	const maxBufs = 4 // arbitrary; 4 concurrent requests per conn? investigate.
+	if len(cc.freeBuf) < maxBufs {
+		cc.freeBuf = append(cc.freeBuf, buf)
+		return
+	}
+	for i, old := range cc.freeBuf {
+		if old == nil {
+			cc.freeBuf[i] = buf
+			return
+		}
+	}
+	// forget about it.
+}
+
+// errRequestCanceled is a copy of net/http's errRequestCanceled because it's not
+// exported. At least they'll be DeepEqual for h1-vs-h2 comparisons tests.
+var errRequestCanceled = errors.New("net/http: request canceled")
+
+func commaSeparatedTrailers(req *http.Request) (string, error) {
+	keys := make([]string, 0, len(req.Trailer))
+	for k := range req.Trailer {
+		k = http.CanonicalHeaderKey(k)
+		switch k {
+		case "Transfer-Encoding", "Trailer", "Content-Length":
+			return "", &badStringError{"invalid Trailer key", k}
+		}
+		keys = append(keys, k)
+	}
+	if len(keys) > 0 {
+		sort.Strings(keys)
+		// TODO: could do better allocation-wise here, but trailers are rare,
+		// so being lazy for now.
+		return strings.Join(keys, ","), nil
+	}
+	return "", nil
+}
+
+func (cc *ClientConn) responseHeaderTimeout() time.Duration {
+	if cc.t.t1 != nil {
+		return cc.t.t1.ResponseHeaderTimeout
+	}
+	// No way to do this (yet?) with just an http2.Transport. Probably
+	// no need. Request.Cancel this is the new way. We only need to support
+	// this for compatibility with the old http.Transport fields when
+	// we're doing transparent http2.
+	return 0
+}
+
+func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
+	trailers, err := commaSeparatedTrailers(req)
+	if err != nil {
+		return nil, err
+	}
+	hasTrailers := trailers != ""
+
+	var body io.Reader = req.Body
+	contentLen := req.ContentLength
+	if req.Body != nil && contentLen == 0 {
+		// Test to see if it's actually zero or just unset.
+		var buf [1]byte
+		n, rerr := io.ReadFull(body, buf[:])
+		if rerr != nil && rerr != io.EOF {
+			contentLen = -1
+			body = errorReader{rerr}
+		} else if n == 1 {
+			// Oh, guess there is data in this Body Reader after all.
+			// The ContentLength field just wasn't set.
+			// Stich the Body back together again, re-attaching our
+			// consumed byte.
+			contentLen = -1
+			body = io.MultiReader(bytes.NewReader(buf[:]), body)
+		} else {
+			// Body is actually empty.
+			body = nil
+		}
+	}
+
+	cc.mu.Lock()
+	if cc.closed || !cc.canTakeNewRequestLocked() {
+		cc.mu.Unlock()
+		return nil, errClientConnUnusable
+	}
+
+	cs := cc.newStream()
+	cs.req = req
+	hasBody := body != nil
+
+	// TODO(bradfitz): this is a copy of the logic in net/http. Unify somewhere?
+	if !cc.t.disableCompression() &&
+		req.Header.Get("Accept-Encoding") == "" &&
+		req.Header.Get("Range") == "" &&
+		req.Method != "HEAD" {
+		// Request gzip only, not deflate. Deflate is ambiguous and
+		// not as universally supported anyway.
+		// See: http://www.gzip.org/zlib/zlib_faq.html#faq38
+		//
+		// Note that we don't request this for HEAD requests,
+		// due to a bug in nginx:
+		//   http://trac.nginx.org/nginx/ticket/358
+		//   https://golang.org/issue/5522
+		//
+		// We don't request gzip if the request is for a range, since
+		// auto-decoding a portion of a gzipped document will just fail
+		// anyway. See https://golang.org/issue/8923
+		cs.requestedGzip = true
+	}
+
+	// we send: HEADERS{1}, CONTINUATION{0,} + DATA{0,} (DATA is
+	// sent by writeRequestBody below, along with any Trailers,
+	// again in form HEADERS{1}, CONTINUATION{0,})
+	hdrs := cc.encodeHeaders(req, cs.requestedGzip, trailers, contentLen)
+	cc.wmu.Lock()
+	endStream := !hasBody && !hasTrailers
+	werr := cc.writeHeaders(cs.ID, endStream, hdrs)
+	cc.wmu.Unlock()
+	cc.mu.Unlock()
+
+	if werr != nil {
+		if hasBody {
+			req.Body.Close() // per RoundTripper contract
+		}
+		cc.forgetStreamID(cs.ID)
+		// Don't bother sending a RST_STREAM (our write already failed;
+		// no need to keep writing)
+		return nil, werr
+	}
+
+	var respHeaderTimer <-chan time.Time
+	var bodyCopyErrc chan error // result of body copy
+	if hasBody {
+		bodyCopyErrc = make(chan error, 1)
+		go func() {
+			bodyCopyErrc <- cs.writeRequestBody(body, req.Body)
+		}()
+	} else {
+		if d := cc.responseHeaderTimeout(); d != 0 {
+			timer := time.NewTimer(d)
+			defer timer.Stop()
+			respHeaderTimer = timer.C
+		}
+	}
+
+	readLoopResCh := cs.resc
+	requestCanceledCh := requestCancel(req)
+	bodyWritten := false
+
+	for {
+		select {
+		case re := <-readLoopResCh:
+			res := re.res
+			if re.err != nil || res.StatusCode > 299 {
+				// On error or status code 3xx, 4xx, 5xx, etc abort any
+				// ongoing write, assuming that the server doesn't care
+				// about our request body. If the server replied with 1xx or
+				// 2xx, however, then assume the server DOES potentially
+				// want our body (e.g. full-duplex streaming:
+				// golang.org/issue/13444). If it turns out the server
+				// doesn't, they'll RST_STREAM us soon enough.  This is a
+				// heuristic to avoid adding knobs to Transport.  Hopefully
+				// we can keep it.
+				cs.abortRequestBodyWrite(errStopReqBodyWrite)
+			}
+			if re.err != nil {
+				cc.forgetStreamID(cs.ID)
+				return nil, re.err
+			}
+			res.Request = req
+			res.TLS = cc.tlsState
+			return res, nil
+		case <-respHeaderTimer:
+			cc.forgetStreamID(cs.ID)
+			if !hasBody || bodyWritten {
+				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+			} else {
+				cs.abortRequestBodyWrite(errStopReqBodyWriteAndCancel)
+			}
+			return nil, errTimeout
+		case <-requestCanceledCh:
+			cc.forgetStreamID(cs.ID)
+			if !hasBody || bodyWritten {
+				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+			} else {
+				cs.abortRequestBodyWrite(errStopReqBodyWriteAndCancel)
+			}
+			return nil, errRequestCanceled
+		case <-cs.peerReset:
+			// processResetStream already removed the
+			// stream from the streams map; no need for
+			// forgetStreamID.
+			return nil, cs.resetErr
+		case err := <-bodyCopyErrc:
+			if err != nil {
+				return nil, err
+			}
+			bodyWritten = true
+			if d := cc.responseHeaderTimeout(); d != 0 {
+				timer := time.NewTimer(d)
+				defer timer.Stop()
+				respHeaderTimer = timer.C
+			}
+		}
+	}
+}
+
+// requires cc.wmu be held
+func (cc *ClientConn) writeHeaders(streamID uint32, endStream bool, hdrs []byte) error {
+	first := true // first frame written (HEADERS is first, then CONTINUATION)
+	frameSize := int(cc.maxFrameSize)
+	for len(hdrs) > 0 && cc.werr == nil {
+		chunk := hdrs
+		if len(chunk) > frameSize {
+			chunk = chunk[:frameSize]
+		}
+		hdrs = hdrs[len(chunk):]
+		endHeaders := len(hdrs) == 0
+		if first {
+			cc.fr.WriteHeaders(HeadersFrameParam{
+				StreamID:      streamID,
+				BlockFragment: chunk,
+				EndStream:     endStream,
+				EndHeaders:    endHeaders,
+			})
+			first = false
+		} else {
+			cc.fr.WriteContinuation(streamID, endHeaders, chunk)
+		}
+	}
+	// TODO(bradfitz): this Flush could potentially block (as
+	// could the WriteHeaders call(s) above), which means they
+	// wouldn't respond to Request.Cancel being readable. That's
+	// rare, but this should probably be in a goroutine.
+	cc.bw.Flush()
+	return cc.werr
+}
+
+// internal error values; they don't escape to callers
+var (
+	// abort request body write; don't send cancel
+	errStopReqBodyWrite = errors.New("http2: aborting request body write")
+
+	// abort request body write, but send stream reset of cancel.
+	errStopReqBodyWriteAndCancel = errors.New("http2: canceling request")
+)
+
+func (cs *clientStream) writeRequestBody(body io.Reader, bodyCloser io.Closer) (err error) {
+	cc := cs.cc
+	sentEnd := false // whether we sent the final DATA frame w/ END_STREAM
+	buf := cc.frameScratchBuffer()
+	defer cc.putFrameScratchBuffer(buf)
+
+	defer func() {
+		// TODO: write h12Compare test showing whether
+		// Request.Body is closed by the Transport,
+		// and in multiple cases: server replies <=299 and >299
+		// while still writing request body
+		cerr := bodyCloser.Close()
+		if err == nil {
+			err = cerr
+		}
+	}()
+
+	req := cs.req
+	hasTrailers := req.Trailer != nil
+
+	var sawEOF bool
+	for !sawEOF {
+		n, err := body.Read(buf)
+		if err == io.EOF {
+			sawEOF = true
+			err = nil
+		} else if err != nil {
+			return err
+		}
+
+		remain := buf[:n]
+		for len(remain) > 0 && err == nil {
+			var allowed int32
+			allowed, err = cs.awaitFlowControl(len(remain))
+			switch {
+			case err == errStopReqBodyWrite:
+				return err
+			case err == errStopReqBodyWriteAndCancel:
+				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+				return err
+			case err != nil:
+				return err
+			}
+			cc.wmu.Lock()
+			data := remain[:allowed]
+			remain = remain[allowed:]
+			sentEnd = sawEOF && len(remain) == 0 && !hasTrailers
+			err = cc.fr.WriteData(cs.ID, sentEnd, data)
+			if err == nil {
+				// TODO(bradfitz): this flush is for latency, not bandwidth.
+				// Most requests won't need this. Make this opt-in or opt-out?
+				// Use some heuristic on the body type? Nagel-like timers?
+				// Based on 'n'? Only last chunk of this for loop, unless flow control
+				// tokens are low? For now, always:
+				err = cc.bw.Flush()
+			}
+			cc.wmu.Unlock()
+		}
+		if err != nil {
+			return err
+		}
+	}
+
+	cc.wmu.Lock()
+	if !sentEnd {
+		var trls []byte
+		if hasTrailers {
+			cc.mu.Lock()
+			trls = cc.encodeTrailers(req)
+			cc.mu.Unlock()
+		}
+
+		// Avoid forgetting to send an END_STREAM if the encoded
+		// trailers are 0 bytes. Both results produce and END_STREAM.
+		if len(trls) > 0 {
+			err = cc.writeHeaders(cs.ID, true, trls)
+		} else {
+			err = cc.fr.WriteData(cs.ID, true, nil)
+		}
+	}
+	if ferr := cc.bw.Flush(); ferr != nil && err == nil {
+		err = ferr
+	}
+	cc.wmu.Unlock()
+
+	return err
+}
+
+// awaitFlowControl waits for [1, min(maxBytes, cc.cs.maxFrameSize)] flow
+// control tokens from the server.
+// It returns either the non-zero number of tokens taken or an error
+// if the stream is dead.
+func (cs *clientStream) awaitFlowControl(maxBytes int) (taken int32, err error) {
+	cc := cs.cc
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	for {
+		if cc.closed {
+			return 0, errClientConnClosed
+		}
+		if cs.stopReqBody != nil {
+			return 0, cs.stopReqBody
+		}
+		if err := cs.checkReset(); err != nil {
+			return 0, err
+		}
+		if a := cs.flow.available(); a > 0 {
+			take := a
+			if int(take) > maxBytes {
+
+				take = int32(maxBytes) // can't truncate int; take is int32
+			}
+			if take > int32(cc.maxFrameSize) {
+				take = int32(cc.maxFrameSize)
+			}
+			cs.flow.take(take)
+			return take, nil
+		}
+		cc.cond.Wait()
+	}
+}
+
+type badStringError struct {
+	what string
+	str  string
+}
+
+func (e *badStringError) Error() string { return fmt.Sprintf("%s %q", e.what, e.str) }
+
+// requires cc.mu be held.
+func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trailers string, contentLength int64) []byte {
+	cc.hbuf.Reset()
+
+	host := req.Host
+	if host == "" {
+		host = req.URL.Host
+	}
+
+	// 8.1.2.3 Request Pseudo-Header Fields
+	// The :path pseudo-header field includes the path and query parts of the
+	// target URI (the path-absolute production and optionally a '?' character
+	// followed by the query production (see Sections 3.3 and 3.4 of
+	// [RFC3986]).
+	cc.writeHeader(":authority", host)
+	cc.writeHeader(":method", req.Method)
+	if req.Method != "CONNECT" {
+		cc.writeHeader(":path", req.URL.RequestURI())
+		cc.writeHeader(":scheme", "https")
+	}
+	if trailers != "" {
+		cc.writeHeader("trailer", trailers)
+	}
+
+	var didUA bool
+	for k, vv := range req.Header {
+		lowKey := strings.ToLower(k)
+		if lowKey == "host" || lowKey == "content-length" {
+			continue
+		}
+		if lowKey == "user-agent" {
+			// Match Go's http1 behavior: at most one
+			// User-Agent.  If set to nil or empty string,
+			// then omit it.  Otherwise if not mentioned,
+			// include the default (below).
+			didUA = true
+			if len(vv) < 1 {
+				continue
+			}
+			vv = vv[:1]
+			if vv[0] == "" {
+				continue
+			}
+		}
+		for _, v := range vv {
+			cc.writeHeader(lowKey, v)
+		}
+	}
+	if shouldSendReqContentLength(req.Method, contentLength) {
+		cc.writeHeader("content-length", strconv.FormatInt(contentLength, 10))
+	}
+	if addGzipHeader {
+		cc.writeHeader("accept-encoding", "gzip")
+	}
+	if !didUA {
+		cc.writeHeader("user-agent", defaultUserAgent)
+	}
+	return cc.hbuf.Bytes()
+}
+
+// shouldSendReqContentLength reports whether the http2.Transport should send
+// a "content-length" request header. This logic is basically a copy of the net/http
+// transferWriter.shouldSendContentLength.
+// The contentLength is the corrected contentLength (so 0 means actually 0, not unknown).
+// -1 means unknown.
+func shouldSendReqContentLength(method string, contentLength int64) bool {
+	if contentLength > 0 {
+		return true
+	}
+	if contentLength < 0 {
+		return false
+	}
+	// For zero bodies, whether we send a content-length depends on the method.
+	// It also kinda doesn't matter for http2 either way, with END_STREAM.
+	switch method {
+	case "POST", "PUT", "PATCH":
+		return true
+	default:
+		return false
+	}
+}
+
+// requires cc.mu be held.
+func (cc *ClientConn) encodeTrailers(req *http.Request) []byte {
+	cc.hbuf.Reset()
+	for k, vv := range req.Trailer {
+		// Transfer-Encoding, etc.. have already been filter at the
+		// start of RoundTrip
+		lowKey := strings.ToLower(k)
+		for _, v := range vv {
+			cc.writeHeader(lowKey, v)
+		}
+	}
+	return cc.hbuf.Bytes()
+}
+
+func (cc *ClientConn) writeHeader(name, value string) {
+	if VerboseLogs {
+		log.Printf("http2: Transport encoding header %q = %q", name, value)
+	}
+	cc.henc.WriteField(hpack.HeaderField{Name: name, Value: value})
+}
+
+type resAndError struct {
+	res *http.Response
+	err error
+}
+
+// requires cc.mu be held.
+func (cc *ClientConn) newStream() *clientStream {
+	cs := &clientStream{
+		cc:        cc,
+		ID:        cc.nextStreamID,
+		resc:      make(chan resAndError, 1),
+		peerReset: make(chan struct{}),
+		done:      make(chan struct{}),
+	}
+	cs.flow.add(int32(cc.initialWindowSize))
+	cs.flow.setConnFlow(&cc.flow)
+	cs.inflow.add(transportDefaultStreamFlow)
+	cs.inflow.setConnFlow(&cc.inflow)
+	cc.nextStreamID += 2
+	cc.streams[cs.ID] = cs
+	return cs
+}
+
+func (cc *ClientConn) forgetStreamID(id uint32) {
+	cc.streamByID(id, true)
+}
+
+func (cc *ClientConn) streamByID(id uint32, andRemove bool) *clientStream {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	cs := cc.streams[id]
+	if andRemove && cs != nil && !cc.closed {
+		delete(cc.streams, id)
+		close(cs.done)
+	}
+	return cs
+}
+
+// clientConnReadLoop is the state owned by the clientConn's frame-reading readLoop.
+type clientConnReadLoop struct {
+	cc        *ClientConn
+	activeRes map[uint32]*clientStream // keyed by streamID
+
+	hdec *hpack.Decoder
+
+	// Fields reset on each HEADERS:
+	nextRes              *http.Response
+	sawRegHeader         bool  // saw non-pseudo header
+	reqMalformed         error // non-nil once known to be malformed
+	lastHeaderEndsStream bool
+	headerListSize       int64 // actually uint32, but easier math this way
+}
+
+// readLoop runs in its own goroutine and reads and dispatches frames.
+func (cc *ClientConn) readLoop() {
+	rl := &clientConnReadLoop{
+		cc:        cc,
+		activeRes: make(map[uint32]*clientStream),
+	}
+	rl.hdec = hpack.NewDecoder(initialHeaderTableSize, rl.onNewHeaderField)
+
+	defer rl.cleanup()
+	cc.readerErr = rl.run()
+	if ce, ok := cc.readerErr.(ConnectionError); ok {
+		cc.wmu.Lock()
+		cc.fr.WriteGoAway(0, ErrCode(ce), nil)
+		cc.wmu.Unlock()
+	}
+}
+
+func (rl *clientConnReadLoop) cleanup() {
+	cc := rl.cc
+	defer cc.tconn.Close()
+	defer cc.t.connPool().MarkDead(cc)
+	defer close(cc.readerDone)
+
+	// Close any response bodies if the server closes prematurely.
+	// TODO: also do this if we've written the headers but not
+	// gotten a response yet.
+	err := cc.readerErr
+	if err == io.EOF {
+		err = io.ErrUnexpectedEOF
+	}
+	cc.mu.Lock()
+	for _, cs := range rl.activeRes {
+		cs.bufPipe.CloseWithError(err)
+	}
+	for _, cs := range cc.streams {
+		select {
+		case cs.resc <- resAndError{err: err}:
+		default:
+		}
+		close(cs.done)
+	}
+	cc.closed = true
+	cc.cond.Broadcast()
+	cc.mu.Unlock()
+}
+
+func (rl *clientConnReadLoop) run() error {
+	cc := rl.cc
+	closeWhenIdle := cc.t.disableKeepAlives()
+	gotReply := false // ever saw a reply
+	for {
+		f, err := cc.fr.ReadFrame()
+		if err != nil {
+			cc.vlogf("Transport readFrame error: (%T) %v", err, err)
+		}
+		if se, ok := err.(StreamError); ok {
+			// TODO: deal with stream errors from the framer.
+			return se
+		} else if err != nil {
+			return err
+		}
+		if VerboseLogs {
+			cc.vlogf("http2: Transport received %s", summarizeFrame(f))
+		}
+		maybeIdle := false // whether frame might transition us to idle
+
+		switch f := f.(type) {
+		case *HeadersFrame:
+			err = rl.processHeaders(f)
+			maybeIdle = true
+			gotReply = true
+		case *ContinuationFrame:
+			err = rl.processContinuation(f)
+			maybeIdle = true
+		case *DataFrame:
+			err = rl.processData(f)
+			maybeIdle = true
+		case *GoAwayFrame:
+			err = rl.processGoAway(f)
+			maybeIdle = true
+		case *RSTStreamFrame:
+			err = rl.processResetStream(f)
+			maybeIdle = true
+		case *SettingsFrame:
+			err = rl.processSettings(f)
+		case *PushPromiseFrame:
+			err = rl.processPushPromise(f)
+		case *WindowUpdateFrame:
+			err = rl.processWindowUpdate(f)
+		case *PingFrame:
+			err = rl.processPing(f)
+		default:
+			cc.logf("Transport: unhandled response frame type %T", f)
+		}
+		if err != nil {
+			return err
+		}
+		if closeWhenIdle && gotReply && maybeIdle && len(rl.activeRes) == 0 {
+			cc.closeIfIdle()
+		}
+	}
+}
+
+func (rl *clientConnReadLoop) processHeaders(f *HeadersFrame) error {
+	rl.sawRegHeader = false
+	rl.reqMalformed = nil
+	rl.lastHeaderEndsStream = f.StreamEnded()
+	rl.headerListSize = 0
+	rl.nextRes = &http.Response{
+		Proto:      "HTTP/2.0",
+		ProtoMajor: 2,
+		Header:     make(http.Header),
+	}
+	rl.hdec.SetEmitEnabled(true)
+	return rl.processHeaderBlockFragment(f.HeaderBlockFragment(), f.StreamID, f.HeadersEnded())
+}
+
+func (rl *clientConnReadLoop) processContinuation(f *ContinuationFrame) error {
+	return rl.processHeaderBlockFragment(f.HeaderBlockFragment(), f.StreamID, f.HeadersEnded())
+}
+
+func (rl *clientConnReadLoop) processHeaderBlockFragment(frag []byte, streamID uint32, finalFrag bool) error {
+	cc := rl.cc
+	streamEnded := rl.lastHeaderEndsStream
+	cs := cc.streamByID(streamID, streamEnded && finalFrag)
+	if cs == nil {
+		// We'd get here if we canceled a request while the
+		// server was mid-way through replying with its
+		// headers. (The case of a CONTINUATION arriving
+		// without HEADERS would be rejected earlier by the
+		// Framer). So if this was just something we canceled,
+		// ignore it.
+		return nil
+	}
+	if cs.pastHeaders {
+		rl.hdec.SetEmitFunc(func(f hpack.HeaderField) { rl.onNewTrailerField(cs, f) })
+	} else {
+		rl.hdec.SetEmitFunc(rl.onNewHeaderField)
+	}
+	_, err := rl.hdec.Write(frag)
+	if err != nil {
+		return ConnectionError(ErrCodeCompression)
+	}
+	if finalFrag {
+		if err := rl.hdec.Close(); err != nil {
+			return ConnectionError(ErrCodeCompression)
+		}
+	}
+
+	if !finalFrag {
+		return nil
+	}
+
+	if !cs.pastHeaders {
+		cs.pastHeaders = true
+	} else {
+		// We're dealing with trailers. (and specifically the
+		// final frame of headers)
+		if cs.pastTrailers {
+			// Too many HEADERS frames for this stream.
+			return ConnectionError(ErrCodeProtocol)
+		}
+		cs.pastTrailers = true
+		if !streamEnded {
+			// We expect that any header block fragment
+			// frame for trailers with END_HEADERS also
+			// has END_STREAM.
+			return ConnectionError(ErrCodeProtocol)
+		}
+		rl.endStream(cs)
+		return nil
+	}
+
+	if rl.reqMalformed != nil {
+		cs.resc <- resAndError{err: rl.reqMalformed}
+		rl.cc.writeStreamReset(cs.ID, ErrCodeProtocol, rl.reqMalformed)
+		return nil
+	}
+
+	res := rl.nextRes
+
+	if res.StatusCode == 100 {
+		// Just skip 100-continue response headers for now.
+		// TODO: golang.org/issue/13851 for doing it properly.
+		cs.pastHeaders = false // do it all again
+		return nil
+	}
+
+	if !streamEnded || cs.req.Method == "HEAD" {
+		res.ContentLength = -1
+		if clens := res.Header["Content-Length"]; len(clens) == 1 {
+			if clen64, err := strconv.ParseInt(clens[0], 10, 64); err == nil {
+				res.ContentLength = clen64
+			} else {
+				// TODO: care? unlike http/1, it won't mess up our framing, so it's
+				// more safe smuggling-wise to ignore.
+			}
+		} else if len(clens) > 1 {
+			// TODO: care? unlike http/1, it won't mess up our framing, so it's
+			// more safe smuggling-wise to ignore.
+		}
+	}
+
+	if streamEnded {
+		res.Body = noBody
+	} else {
+		buf := new(bytes.Buffer) // TODO(bradfitz): recycle this garbage
+		cs.bufPipe = pipe{b: buf}
+		cs.bytesRemain = res.ContentLength
+		res.Body = transportResponseBody{cs}
+		go cs.awaitRequestCancel(requestCancel(cs.req))
+
+		if cs.requestedGzip && res.Header.Get("Content-Encoding") == "gzip" {
+			res.Header.Del("Content-Encoding")
+			res.Header.Del("Content-Length")
+			res.ContentLength = -1
+			res.Body = &gzipReader{body: res.Body}
+		}
+	}
+
+	cs.resTrailer = &res.Trailer
+	rl.activeRes[cs.ID] = cs
+	cs.resc <- resAndError{res: res}
+	rl.nextRes = nil // unused now; will be reset next HEADERS frame
+	return nil
+}
+
+// transportResponseBody is the concrete type of Transport.RoundTrip's
+// Response.Body. It is an io.ReadCloser. On Read, it reads from cs.body.
+// On Close it sends RST_STREAM if EOF wasn't already seen.
+type transportResponseBody struct {
+	cs *clientStream
+}
+
+func (b transportResponseBody) Read(p []byte) (n int, err error) {
+	cs := b.cs
+	cc := cs.cc
+
+	if cs.readErr != nil {
+		return 0, cs.readErr
+	}
+	n, err = b.cs.bufPipe.Read(p)
+	if cs.bytesRemain != -1 {
+		if int64(n) > cs.bytesRemain {
+			n = int(cs.bytesRemain)
+			if err == nil {
+				err = errors.New("net/http: server replied with more than declared Content-Length; truncated")
+				cc.writeStreamReset(cs.ID, ErrCodeProtocol, err)
+			}
+			cs.readErr = err
+			return int(cs.bytesRemain), err
+		}
+		cs.bytesRemain -= int64(n)
+		if err == io.EOF && cs.bytesRemain > 0 {
+			err = io.ErrUnexpectedEOF
+			cs.readErr = err
+			return n, err
+		}
+	}
+	if n == 0 {
+		// No flow control tokens to send back.
+		return
+	}
+
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+
+	var connAdd, streamAdd int32
+	// Check the conn-level first, before the stream-level.
+	if v := cc.inflow.available(); v < transportDefaultConnFlow/2 {
+		connAdd = transportDefaultConnFlow - v
+		cc.inflow.add(connAdd)
+	}
+	if err == nil { // No need to refresh if the stream is over or failed.
+		if v := cs.inflow.available(); v < transportDefaultStreamFlow-transportDefaultStreamMinRefresh {
+			streamAdd = transportDefaultStreamFlow - v
+			cs.inflow.add(streamAdd)
+		}
+	}
+	if connAdd != 0 || streamAdd != 0 {
+		cc.wmu.Lock()
+		defer cc.wmu.Unlock()
+		if connAdd != 0 {
+			cc.fr.WriteWindowUpdate(0, mustUint31(connAdd))
+		}
+		if streamAdd != 0 {
+			cc.fr.WriteWindowUpdate(cs.ID, mustUint31(streamAdd))
+		}
+		cc.bw.Flush()
+	}
+	return
+}
+
+var errClosedResponseBody = errors.New("http2: response body closed")
+
+func (b transportResponseBody) Close() error {
+	cs := b.cs
+	if cs.bufPipe.Err() != io.EOF {
+		// TODO: write test for this
+		cs.cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+	}
+	cs.bufPipe.BreakWithError(errClosedResponseBody)
+	return nil
+}
+
+func (rl *clientConnReadLoop) processData(f *DataFrame) error {
+	cc := rl.cc
+	cs := cc.streamByID(f.StreamID, f.StreamEnded())
+	if cs == nil {
+		cc.mu.Lock()
+		neverSent := cc.nextStreamID
+		cc.mu.Unlock()
+		if f.StreamID >= neverSent {
+			// We never asked for this.
+			cc.logf("http2: Transport received unsolicited DATA frame; closing connection")
+			return ConnectionError(ErrCodeProtocol)
+		}
+		// We probably did ask for this, but canceled. Just ignore it.
+		// TODO: be stricter here? only silently ignore things which
+		// we canceled, but not things which were closed normally
+		// by the peer? Tough without accumulating too much state.
+		return nil
+	}
+	if data := f.Data(); len(data) > 0 {
+		if cs.bufPipe.b == nil {
+			// Data frame after it's already closed?
+			cc.logf("http2: Transport received DATA frame for closed stream; closing connection")
+			return ConnectionError(ErrCodeProtocol)
+		}
+
+		// Check connection-level flow control.
+		cc.mu.Lock()
+		if cs.inflow.available() >= int32(len(data)) {
+			cs.inflow.take(int32(len(data)))
+		} else {
+			cc.mu.Unlock()
+			return ConnectionError(ErrCodeFlowControl)
+		}
+		cc.mu.Unlock()
+
+		if _, err := cs.bufPipe.Write(data); err != nil {
+			return err
+		}
+	}
+
+	if f.StreamEnded() {
+		rl.endStream(cs)
+	}
+	return nil
+}
+
+var errInvalidTrailers = errors.New("http2: invalid trailers")
+
+func (rl *clientConnReadLoop) endStream(cs *clientStream) {
+	// TODO: check that any declared content-length matches, like
+	// server.go's (*stream).endStream method.
+	err := io.EOF
+	code := cs.copyTrailers
+	if rl.reqMalformed != nil {
+		err = rl.reqMalformed
+		code = nil
+	}
+	cs.bufPipe.closeWithErrorAndCode(err, code)
+	delete(rl.activeRes, cs.ID)
+}
+
+func (cs *clientStream) copyTrailers() {
+	for k, vv := range cs.trailer {
+		t := cs.resTrailer
+		if *t == nil {
+			*t = make(http.Header)
+		}
+		(*t)[k] = vv
+	}
+}
+
+func (rl *clientConnReadLoop) processGoAway(f *GoAwayFrame) error {
+	cc := rl.cc
+	cc.t.connPool().MarkDead(cc)
+	if f.ErrCode != 0 {
+		// TODO: deal with GOAWAY more. particularly the error code
+		cc.vlogf("transport got GOAWAY with error code = %v", f.ErrCode)
+	}
+	cc.setGoAway(f)
+	return nil
+}
+
+func (rl *clientConnReadLoop) processSettings(f *SettingsFrame) error {
+	cc := rl.cc
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	return f.ForeachSetting(func(s Setting) error {
+		switch s.ID {
+		case SettingMaxFrameSize:
+			cc.maxFrameSize = s.Val
+		case SettingMaxConcurrentStreams:
+			cc.maxConcurrentStreams = s.Val
+		case SettingInitialWindowSize:
+			// TODO: error if this is too large.
+
+			// TODO: adjust flow control of still-open
+			// frames by the difference of the old initial
+			// window size and this one.
+			cc.initialWindowSize = s.Val
+		default:
+			// TODO(bradfitz): handle more settings? SETTINGS_HEADER_TABLE_SIZE probably.
+			cc.vlogf("Unhandled Setting: %v", s)
+		}
+		return nil
+	})
+}
+
+func (rl *clientConnReadLoop) processWindowUpdate(f *WindowUpdateFrame) error {
+	cc := rl.cc
+	cs := cc.streamByID(f.StreamID, false)
+	if f.StreamID != 0 && cs == nil {
+		return nil
+	}
+
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+
+	fl := &cc.flow
+	if cs != nil {
+		fl = &cs.flow
+	}
+	if !fl.add(int32(f.Increment)) {
+		return ConnectionError(ErrCodeFlowControl)
+	}
+	cc.cond.Broadcast()
+	return nil
+}
+
+func (rl *clientConnReadLoop) processResetStream(f *RSTStreamFrame) error {
+	cs := rl.cc.streamByID(f.StreamID, true)
+	if cs == nil {
+		// TODO: return error if server tries to RST_STEAM an idle stream
+		return nil
+	}
+	select {
+	case <-cs.peerReset:
+		// Already reset.
+		// This is the only goroutine
+		// which closes this, so there
+		// isn't a race.
+	default:
+		err := StreamError{cs.ID, f.ErrCode}
+		cs.resetErr = err
+		close(cs.peerReset)
+		cs.bufPipe.CloseWithError(err)
+		cs.cc.cond.Broadcast() // wake up checkReset via clientStream.awaitFlowControl
+	}
+	delete(rl.activeRes, cs.ID)
+	return nil
+}
+
+func (rl *clientConnReadLoop) processPing(f *PingFrame) error {
+	if f.IsAck() {
+		// 6.7 PING: " An endpoint MUST NOT respond to PING frames
+		// containing this flag."
+		return nil
+	}
+	cc := rl.cc
+	cc.wmu.Lock()
+	defer cc.wmu.Unlock()
+	if err := cc.fr.WritePing(true, f.Data); err != nil {
+		return err
+	}
+	return cc.bw.Flush()
+}
+
+func (rl *clientConnReadLoop) processPushPromise(f *PushPromiseFrame) error {
+	// We told the peer we don't want them.
+	// Spec says:
+	// "PUSH_PROMISE MUST NOT be sent if the SETTINGS_ENABLE_PUSH
+	// setting of the peer endpoint is set to 0. An endpoint that
+	// has set this setting and has received acknowledgement MUST
+	// treat the receipt of a PUSH_PROMISE frame as a connection
+	// error (Section 5.4.1) of type PROTOCOL_ERROR."
+	return ConnectionError(ErrCodeProtocol)
+}
+
+func (cc *ClientConn) writeStreamReset(streamID uint32, code ErrCode, err error) {
+	// TODO: do something with err? send it as a debug frame to the peer?
+	// But that's only in GOAWAY. Invent a new frame type? Is there one already?
+	cc.wmu.Lock()
+	cc.fr.WriteRSTStream(streamID, code)
+	cc.bw.Flush()
+	cc.wmu.Unlock()
+}
+
+var (
+	errResponseHeaderListSize = errors.New("http2: response header list larger than advertised limit")
+	errPseudoTrailers         = errors.New("http2: invalid pseudo header in trailers")
+)
+
+func (rl *clientConnReadLoop) checkHeaderField(f hpack.HeaderField) bool {
+	if rl.reqMalformed != nil {
+		return false
+	}
+
+	const headerFieldOverhead = 32 // per spec
+	rl.headerListSize += int64(len(f.Name)) + int64(len(f.Value)) + headerFieldOverhead
+	if max := rl.cc.t.maxHeaderListSize(); max != 0 && rl.headerListSize > int64(max) {
+		rl.hdec.SetEmitEnabled(false)
+		rl.reqMalformed = errResponseHeaderListSize
+		return false
+	}
+
+	if !validHeaderFieldValue(f.Value) {
+		rl.reqMalformed = errInvalidHeaderFieldValue
+		return false
+	}
+
+	isPseudo := strings.HasPrefix(f.Name, ":")
+	if isPseudo {
+		if rl.sawRegHeader {
+			rl.reqMalformed = errors.New("http2: invalid pseudo header after regular header")
+			return false
+		}
+	} else {
+		if !validHeaderFieldName(f.Name) {
+			rl.reqMalformed = errInvalidHeaderFieldName
+			return false
+		}
+		rl.sawRegHeader = true
+	}
+
+	return true
+}
+
+// onNewHeaderField runs on the readLoop goroutine whenever a new
+// hpack header field is decoded.
+func (rl *clientConnReadLoop) onNewHeaderField(f hpack.HeaderField) {
+	cc := rl.cc
+	if VerboseLogs {
+		cc.logf("http2: Transport decoded %v", f)
+	}
+
+	if !rl.checkHeaderField(f) {
+		return
+	}
+
+	isPseudo := strings.HasPrefix(f.Name, ":")
+	if isPseudo {
+		switch f.Name {
+		case ":status":
+			code, err := strconv.Atoi(f.Value)
+			if err != nil {
+				rl.reqMalformed = errors.New("http2: invalid :status")
+				return
+			}
+			rl.nextRes.Status = f.Value + " " + http.StatusText(code)
+			rl.nextRes.StatusCode = code
+		default:
+			// "Endpoints MUST NOT generate pseudo-header
+			// fields other than those defined in this
+			// document."
+			rl.reqMalformed = fmt.Errorf("http2: unknown response pseudo header %q", f.Name)
+		}
+		return
+	}
+
+	key := http.CanonicalHeaderKey(f.Name)
+	if key == "Trailer" {
+		t := rl.nextRes.Trailer
+		if t == nil {
+			t = make(http.Header)
+			rl.nextRes.Trailer = t
+		}
+		foreachHeaderElement(f.Value, func(v string) {
+			t[http.CanonicalHeaderKey(v)] = nil
+		})
+	} else {
+		rl.nextRes.Header.Add(key, f.Value)
+	}
+}
+
+func (rl *clientConnReadLoop) onNewTrailerField(cs *clientStream, f hpack.HeaderField) {
+	if VerboseLogs {
+		rl.cc.logf("http2: Transport decoded trailer %v", f)
+	}
+	if !rl.checkHeaderField(f) {
+		return
+	}
+	if strings.HasPrefix(f.Name, ":") {
+		// Pseudo-header fields MUST NOT appear in
+		// trailers. Endpoints MUST treat a request or
+		// response that contains undefined or invalid
+		// pseudo-header fields as malformed.
+		rl.reqMalformed = errPseudoTrailers
+		return
+	}
+
+	key := http.CanonicalHeaderKey(f.Name)
+
+	// The spec says one must predeclare their trailers but in practice
+	// popular users (which is to say the only user we found) do not so we
+	// violate the spec and accept all of them.
+	const acceptAllTrailers = true
+	if _, ok := (*cs.resTrailer)[key]; ok || acceptAllTrailers {
+		if cs.trailer == nil {
+			cs.trailer = make(http.Header)
+		}
+		cs.trailer[key] = append(cs.trailer[key], f.Value)
+	}
+}
+
+func (cc *ClientConn) logf(format string, args ...interface{}) {
+	cc.t.logf(format, args...)
+}
+
+func (cc *ClientConn) vlogf(format string, args ...interface{}) {
+	cc.t.vlogf(format, args...)
+}
+
+func (t *Transport) vlogf(format string, args ...interface{}) {
+	if VerboseLogs {
+		t.logf(format, args...)
+	}
+}
+
+func (t *Transport) logf(format string, args ...interface{}) {
+	log.Printf(format, args...)
+}
+
+var noBody io.ReadCloser = ioutil.NopCloser(bytes.NewReader(nil))
+
+func strSliceContains(ss []string, s string) bool {
+	for _, v := range ss {
+		if v == s {
+			return true
+		}
+	}
+	return false
+}
+
+type erringRoundTripper struct{ err error }
+
+func (rt erringRoundTripper) RoundTrip(*http.Request) (*http.Response, error) { return nil, rt.err }
+
+// gzipReader wraps a response body so it can lazily
+// call gzip.NewReader on the first call to Read
+type gzipReader struct {
+	body io.ReadCloser // underlying Response.Body
+	zr   io.Reader     // lazily-initialized gzip reader
+}
+
+func (gz *gzipReader) Read(p []byte) (n int, err error) {
+	if gz.zr == nil {
+		gz.zr, err = gzip.NewReader(gz.body)
+		if err != nil {
+			return 0, err
+		}
+	}
+	return gz.zr.Read(p)
+}
+
+func (gz *gzipReader) Close() error {
+	return gz.body.Close()
+}
+
+type errorReader struct{ err error }
+
+func (r errorReader) Read(p []byte) (int, error) { return 0, r.err }
diff --git a/vendor/golang.org/x/net/http2/write.go b/vendor/golang.org/x/net/http2/write.go
new file mode 100644
index 0000000000..5297a4bfe3
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/write.go
@@ -0,0 +1,263 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package http2
+
+import (
+	"bytes"
+	"fmt"
+	"log"
+	"net/http"
+	"sort"
+	"time"
+
+	"golang.org/x/net/http2/hpack"
+)
+
+// writeFramer is implemented by any type that is used to write frames.
+type writeFramer interface {
+	writeFrame(writeContext) error
+}
+
+// writeContext is the interface needed by the various frame writer
+// types below. All the writeFrame methods below are scheduled via the
+// frame writing scheduler (see writeScheduler in writesched.go).
+//
+// This interface is implemented by *serverConn.
+//
+// TODO: decide whether to a) use this in the client code (which didn't
+// end up using this yet, because it has a simpler design, not
+// currently implementing priorities), or b) delete this and
+// make the server code a bit more concrete.
+type writeContext interface {
+	Framer() *Framer
+	Flush() error
+	CloseConn() error
+	// HeaderEncoder returns an HPACK encoder that writes to the
+	// returned buffer.
+	HeaderEncoder() (*hpack.Encoder, *bytes.Buffer)
+}
+
+// endsStream reports whether the given frame writer w will locally
+// close the stream.
+func endsStream(w writeFramer) bool {
+	switch v := w.(type) {
+	case *writeData:
+		return v.endStream
+	case *writeResHeaders:
+		return v.endStream
+	case nil:
+		// This can only happen if the caller reuses w after it's
+		// been intentionally nil'ed out to prevent use. Keep this
+		// here to catch future refactoring breaking it.
+		panic("endsStream called on nil writeFramer")
+	}
+	return false
+}
+
+type flushFrameWriter struct{}
+
+func (flushFrameWriter) writeFrame(ctx writeContext) error {
+	return ctx.Flush()
+}
+
+type writeSettings []Setting
+
+func (s writeSettings) writeFrame(ctx writeContext) error {
+	return ctx.Framer().WriteSettings([]Setting(s)...)
+}
+
+type writeGoAway struct {
+	maxStreamID uint32
+	code        ErrCode
+}
+
+func (p *writeGoAway) writeFrame(ctx writeContext) error {
+	err := ctx.Framer().WriteGoAway(p.maxStreamID, p.code, nil)
+	if p.code != 0 {
+		ctx.Flush() // ignore error: we're hanging up on them anyway
+		time.Sleep(50 * time.Millisecond)
+		ctx.CloseConn()
+	}
+	return err
+}
+
+type writeData struct {
+	streamID  uint32
+	p         []byte
+	endStream bool
+}
+
+func (w *writeData) String() string {
+	return fmt.Sprintf("writeData(stream=%d, p=%d, endStream=%v)", w.streamID, len(w.p), w.endStream)
+}
+
+func (w *writeData) writeFrame(ctx writeContext) error {
+	return ctx.Framer().WriteData(w.streamID, w.endStream, w.p)
+}
+
+// handlerPanicRST is the message sent from handler goroutines when
+// the handler panics.
+type handlerPanicRST struct {
+	StreamID uint32
+}
+
+func (hp handlerPanicRST) writeFrame(ctx writeContext) error {
+	return ctx.Framer().WriteRSTStream(hp.StreamID, ErrCodeInternal)
+}
+
+func (se StreamError) writeFrame(ctx writeContext) error {
+	return ctx.Framer().WriteRSTStream(se.StreamID, se.Code)
+}
+
+type writePingAck struct{ pf *PingFrame }
+
+func (w writePingAck) writeFrame(ctx writeContext) error {
+	return ctx.Framer().WritePing(true, w.pf.Data)
+}
+
+type writeSettingsAck struct{}
+
+func (writeSettingsAck) writeFrame(ctx writeContext) error {
+	return ctx.Framer().WriteSettingsAck()
+}
+
+// writeResHeaders is a request to write a HEADERS and 0+ CONTINUATION frames
+// for HTTP response headers or trailers from a server handler.
+type writeResHeaders struct {
+	streamID    uint32
+	httpResCode int         // 0 means no ":status" line
+	h           http.Header // may be nil
+	trailers    []string    // if non-nil, which keys of h to write. nil means all.
+	endStream   bool
+
+	date          string
+	contentType   string
+	contentLength string
+}
+
+func encKV(enc *hpack.Encoder, k, v string) {
+	if VerboseLogs {
+		log.Printf("http2: server encoding header %q = %q", k, v)
+	}
+	enc.WriteField(hpack.HeaderField{Name: k, Value: v})
+}
+
+func (w *writeResHeaders) writeFrame(ctx writeContext) error {
+	enc, buf := ctx.HeaderEncoder()
+	buf.Reset()
+
+	if w.httpResCode != 0 {
+		encKV(enc, ":status", httpCodeString(w.httpResCode))
+	}
+
+	encodeHeaders(enc, w.h, w.trailers)
+
+	if w.contentType != "" {
+		encKV(enc, "content-type", w.contentType)
+	}
+	if w.contentLength != "" {
+		encKV(enc, "content-length", w.contentLength)
+	}
+	if w.date != "" {
+		encKV(enc, "date", w.date)
+	}
+
+	headerBlock := buf.Bytes()
+	if len(headerBlock) == 0 && w.trailers == nil {
+		panic("unexpected empty hpack")
+	}
+
+	// For now we're lazy and just pick the minimum MAX_FRAME_SIZE
+	// that all peers must support (16KB). Later we could care
+	// more and send larger frames if the peer advertised it, but
+	// there's little point. Most headers are small anyway (so we
+	// generally won't have CONTINUATION frames), and extra frames
+	// only waste 9 bytes anyway.
+	const maxFrameSize = 16384
+
+	first := true
+	for len(headerBlock) > 0 {
+		frag := headerBlock
+		if len(frag) > maxFrameSize {
+			frag = frag[:maxFrameSize]
+		}
+		headerBlock = headerBlock[len(frag):]
+		endHeaders := len(headerBlock) == 0
+		var err error
+		if first {
+			first = false
+			err = ctx.Framer().WriteHeaders(HeadersFrameParam{
+				StreamID:      w.streamID,
+				BlockFragment: frag,
+				EndStream:     w.endStream,
+				EndHeaders:    endHeaders,
+			})
+		} else {
+			err = ctx.Framer().WriteContinuation(w.streamID, endHeaders, frag)
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+type write100ContinueHeadersFrame struct {
+	streamID uint32
+}
+
+func (w write100ContinueHeadersFrame) writeFrame(ctx writeContext) error {
+	enc, buf := ctx.HeaderEncoder()
+	buf.Reset()
+	encKV(enc, ":status", "100")
+	return ctx.Framer().WriteHeaders(HeadersFrameParam{
+		StreamID:      w.streamID,
+		BlockFragment: buf.Bytes(),
+		EndStream:     false,
+		EndHeaders:    true,
+	})
+}
+
+type writeWindowUpdate struct {
+	streamID uint32 // or 0 for conn-level
+	n        uint32
+}
+
+func (wu writeWindowUpdate) writeFrame(ctx writeContext) error {
+	return ctx.Framer().WriteWindowUpdate(wu.streamID, wu.n)
+}
+
+func encodeHeaders(enc *hpack.Encoder, h http.Header, keys []string) {
+	// TODO: garbage. pool sorters like http1? hot path for 1 key?
+	if keys == nil {
+		keys = make([]string, 0, len(h))
+		for k := range h {
+			keys = append(keys, k)
+		}
+		sort.Strings(keys)
+	}
+	for _, k := range keys {
+		vv := h[k]
+		k = lowerHeader(k)
+		if !validHeaderFieldName(k) {
+			// TODO: return an error? golang.org/issue/14048
+			// For now just omit it.
+			continue
+		}
+		isTE := k == "transfer-encoding"
+		for _, v := range vv {
+			if !validHeaderFieldValue(v) {
+				// TODO: return an error? golang.org/issue/14048
+				// For now just omit it.
+				continue
+			}
+			// TODO: more of "8.1.2.2 Connection-Specific Header Fields"
+			if isTE && v != "trailers" {
+				continue
+			}
+			encKV(enc, k, v)
+		}
+	}
+}
diff --git a/vendor/golang.org/x/net/http2/writesched.go b/vendor/golang.org/x/net/http2/writesched.go
new file mode 100644
index 0000000000..c24316ce7b
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/writesched.go
@@ -0,0 +1,283 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package http2
+
+import "fmt"
+
+// frameWriteMsg is a request to write a frame.
+type frameWriteMsg struct {
+	// write is the interface value that does the writing, once the
+	// writeScheduler (below) has decided to select this frame
+	// to write. The write functions are all defined in write.go.
+	write writeFramer
+
+	stream *stream // used for prioritization. nil for non-stream frames.
+
+	// done, if non-nil, must be a buffered channel with space for
+	// 1 message and is sent the return value from write (or an
+	// earlier error) when the frame has been written.
+	done chan error
+}
+
+// for debugging only:
+func (wm frameWriteMsg) String() string {
+	var streamID uint32
+	if wm.stream != nil {
+		streamID = wm.stream.id
+	}
+	var des string
+	if s, ok := wm.write.(fmt.Stringer); ok {
+		des = s.String()
+	} else {
+		des = fmt.Sprintf("%T", wm.write)
+	}
+	return fmt.Sprintf("[frameWriteMsg stream=%d, ch=%v, type: %v]", streamID, wm.done != nil, des)
+}
+
+// writeScheduler tracks pending frames to write, priorities, and decides
+// the next one to use. It is not thread-safe.
+type writeScheduler struct {
+	// zero are frames not associated with a specific stream.
+	// They're sent before any stream-specific freams.
+	zero writeQueue
+
+	// maxFrameSize is the maximum size of a DATA frame
+	// we'll write. Must be non-zero and between 16K-16M.
+	maxFrameSize uint32
+
+	// sq contains the stream-specific queues, keyed by stream ID.
+	// when a stream is idle, it's deleted from the map.
+	sq map[uint32]*writeQueue
+
+	// canSend is a slice of memory that's reused between frame
+	// scheduling decisions to hold the list of writeQueues (from sq)
+	// which have enough flow control data to send. After canSend is
+	// built, the best is selected.
+	canSend []*writeQueue
+
+	// pool of empty queues for reuse.
+	queuePool []*writeQueue
+}
+
+func (ws *writeScheduler) putEmptyQueue(q *writeQueue) {
+	if len(q.s) != 0 {
+		panic("queue must be empty")
+	}
+	ws.queuePool = append(ws.queuePool, q)
+}
+
+func (ws *writeScheduler) getEmptyQueue() *writeQueue {
+	ln := len(ws.queuePool)
+	if ln == 0 {
+		return new(writeQueue)
+	}
+	q := ws.queuePool[ln-1]
+	ws.queuePool = ws.queuePool[:ln-1]
+	return q
+}
+
+func (ws *writeScheduler) empty() bool { return ws.zero.empty() && len(ws.sq) == 0 }
+
+func (ws *writeScheduler) add(wm frameWriteMsg) {
+	st := wm.stream
+	if st == nil {
+		ws.zero.push(wm)
+	} else {
+		ws.streamQueue(st.id).push(wm)
+	}
+}
+
+func (ws *writeScheduler) streamQueue(streamID uint32) *writeQueue {
+	if q, ok := ws.sq[streamID]; ok {
+		return q
+	}
+	if ws.sq == nil {
+		ws.sq = make(map[uint32]*writeQueue)
+	}
+	q := ws.getEmptyQueue()
+	ws.sq[streamID] = q
+	return q
+}
+
+// take returns the most important frame to write and removes it from the scheduler.
+// It is illegal to call this if the scheduler is empty or if there are no connection-level
+// flow control bytes available.
+func (ws *writeScheduler) take() (wm frameWriteMsg, ok bool) {
+	if ws.maxFrameSize == 0 {
+		panic("internal error: ws.maxFrameSize not initialized or invalid")
+	}
+
+	// If there any frames not associated with streams, prefer those first.
+	// These are usually SETTINGS, etc.
+	if !ws.zero.empty() {
+		return ws.zero.shift(), true
+	}
+	if len(ws.sq) == 0 {
+		return
+	}
+
+	// Next, prioritize frames on streams that aren't DATA frames (no cost).
+	for id, q := range ws.sq {
+		if q.firstIsNoCost() {
+			return ws.takeFrom(id, q)
+		}
+	}
+
+	// Now, all that remains are DATA frames with non-zero bytes to
+	// send. So pick the best one.
+	if len(ws.canSend) != 0 {
+		panic("should be empty")
+	}
+	for _, q := range ws.sq {
+		if n := ws.streamWritableBytes(q); n > 0 {
+			ws.canSend = append(ws.canSend, q)
+		}
+	}
+	if len(ws.canSend) == 0 {
+		return
+	}
+	defer ws.zeroCanSend()
+
+	// TODO: find the best queue
+	q := ws.canSend[0]
+
+	return ws.takeFrom(q.streamID(), q)
+}
+
+// zeroCanSend is defered from take.
+func (ws *writeScheduler) zeroCanSend() {
+	for i := range ws.canSend {
+		ws.canSend[i] = nil
+	}
+	ws.canSend = ws.canSend[:0]
+}
+
+// streamWritableBytes returns the number of DATA bytes we could write
+// from the given queue's stream, if this stream/queue were
+// selected. It is an error to call this if q's head isn't a
+// *writeData.
+func (ws *writeScheduler) streamWritableBytes(q *writeQueue) int32 {
+	wm := q.head()
+	ret := wm.stream.flow.available() // max we can write
+	if ret == 0 {
+		return 0
+	}
+	if int32(ws.maxFrameSize) < ret {
+		ret = int32(ws.maxFrameSize)
+	}
+	if ret == 0 {
+		panic("internal error: ws.maxFrameSize not initialized or invalid")
+	}
+	wd := wm.write.(*writeData)
+	if len(wd.p) < int(ret) {
+		ret = int32(len(wd.p))
+	}
+	return ret
+}
+
+func (ws *writeScheduler) takeFrom(id uint32, q *writeQueue) (wm frameWriteMsg, ok bool) {
+	wm = q.head()
+	// If the first item in this queue costs flow control tokens
+	// and we don't have enough, write as much as we can.
+	if wd, ok := wm.write.(*writeData); ok && len(wd.p) > 0 {
+		allowed := wm.stream.flow.available() // max we can write
+		if allowed == 0 {
+			// No quota available. Caller can try the next stream.
+			return frameWriteMsg{}, false
+		}
+		if int32(ws.maxFrameSize) < allowed {
+			allowed = int32(ws.maxFrameSize)
+		}
+		// TODO: further restrict the allowed size, because even if
+		// the peer says it's okay to write 16MB data frames, we might
+		// want to write smaller ones to properly weight competing
+		// streams' priorities.
+
+		if len(wd.p) > int(allowed) {
+			wm.stream.flow.take(allowed)
+			chunk := wd.p[:allowed]
+			wd.p = wd.p[allowed:]
+			// Make up a new write message of a valid size, rather
+			// than shifting one off the queue.
+			return frameWriteMsg{
+				stream: wm.stream,
+				write: &writeData{
+					streamID: wd.streamID,
+					p:        chunk,
+					// even if the original had endStream set, there
+					// arebytes remaining because len(wd.p) > allowed,
+					// so we know endStream is false:
+					endStream: false,
+				},
+				// our caller is blocking on the final DATA frame, not
+				// these intermediates, so no need to wait:
+				done: nil,
+			}, true
+		}
+		wm.stream.flow.take(int32(len(wd.p)))
+	}
+
+	q.shift()
+	if q.empty() {
+		ws.putEmptyQueue(q)
+		delete(ws.sq, id)
+	}
+	return wm, true
+}
+
+func (ws *writeScheduler) forgetStream(id uint32) {
+	q, ok := ws.sq[id]
+	if !ok {
+		return
+	}
+	delete(ws.sq, id)
+
+	// But keep it for others later.
+	for i := range q.s {
+		q.s[i] = frameWriteMsg{}
+	}
+	q.s = q.s[:0]
+	ws.putEmptyQueue(q)
+}
+
+type writeQueue struct {
+	s []frameWriteMsg
+}
+
+// streamID returns the stream ID for a non-empty stream-specific queue.
+func (q *writeQueue) streamID() uint32 { return q.s[0].stream.id }
+
+func (q *writeQueue) empty() bool { return len(q.s) == 0 }
+
+func (q *writeQueue) push(wm frameWriteMsg) {
+	q.s = append(q.s, wm)
+}
+
+// head returns the next item that would be removed by shift.
+func (q *writeQueue) head() frameWriteMsg {
+	if len(q.s) == 0 {
+		panic("invalid use of queue")
+	}
+	return q.s[0]
+}
+
+func (q *writeQueue) shift() frameWriteMsg {
+	if len(q.s) == 0 {
+		panic("invalid use of queue")
+	}
+	wm := q.s[0]
+	// TODO: less copy-happy queue.
+	copy(q.s, q.s[1:])
+	q.s[len(q.s)-1] = frameWriteMsg{}
+	q.s = q.s[:len(q.s)-1]
+	return wm
+}
+
+func (q *writeQueue) firstIsNoCost() bool {
+	if df, ok := q.s[0].write.(*writeData); ok {
+		return len(df.p) == 0
+	}
+	return true
+}
diff --git a/vendor/golang.org/x/net/internal/timeseries/timeseries.go b/vendor/golang.org/x/net/internal/timeseries/timeseries.go
new file mode 100644
index 0000000000..1119f34482
--- /dev/null
+++ b/vendor/golang.org/x/net/internal/timeseries/timeseries.go
@@ -0,0 +1,525 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package timeseries implements a time series structure for stats collection.
+package timeseries // import "golang.org/x/net/internal/timeseries"
+
+import (
+	"fmt"
+	"log"
+	"time"
+)
+
+const (
+	timeSeriesNumBuckets       = 64
+	minuteHourSeriesNumBuckets = 60
+)
+
+var timeSeriesResolutions = []time.Duration{
+	1 * time.Second,
+	10 * time.Second,
+	1 * time.Minute,
+	10 * time.Minute,
+	1 * time.Hour,
+	6 * time.Hour,
+	24 * time.Hour,          // 1 day
+	7 * 24 * time.Hour,      // 1 week
+	4 * 7 * 24 * time.Hour,  // 4 weeks
+	16 * 7 * 24 * time.Hour, // 16 weeks
+}
+
+var minuteHourSeriesResolutions = []time.Duration{
+	1 * time.Second,
+	1 * time.Minute,
+}
+
+// An Observable is a kind of data that can be aggregated in a time series.
+type Observable interface {
+	Multiply(ratio float64)    // Multiplies the data in self by a given ratio
+	Add(other Observable)      // Adds the data from a different observation to self
+	Clear()                    // Clears the observation so it can be reused.
+	CopyFrom(other Observable) // Copies the contents of a given observation to self
+}
+
+// Float attaches the methods of Observable to a float64.
+type Float float64
+
+// NewFloat returns a Float.
+func NewFloat() Observable {
+	f := Float(0)
+	return &f
+}
+
+// String returns the float as a string.
+func (f *Float) String() string { return fmt.Sprintf("%g", f.Value()) }
+
+// Value returns the float's value.
+func (f *Float) Value() float64 { return float64(*f) }
+
+func (f *Float) Multiply(ratio float64) { *f *= Float(ratio) }
+
+func (f *Float) Add(other Observable) {
+	o := other.(*Float)
+	*f += *o
+}
+
+func (f *Float) Clear() { *f = 0 }
+
+func (f *Float) CopyFrom(other Observable) {
+	o := other.(*Float)
+	*f = *o
+}
+
+// A Clock tells the current time.
+type Clock interface {
+	Time() time.Time
+}
+
+type defaultClock int
+
+var defaultClockInstance defaultClock
+
+func (defaultClock) Time() time.Time { return time.Now() }
+
+// Information kept per level. Each level consists of a circular list of
+// observations. The start of the level may be derived from end and the
+// len(buckets) * sizeInMillis.
+type tsLevel struct {
+	oldest   int               // index to oldest bucketed Observable
+	newest   int               // index to newest bucketed Observable
+	end      time.Time         // end timestamp for this level
+	size     time.Duration     // duration of the bucketed Observable
+	buckets  []Observable      // collections of observations
+	provider func() Observable // used for creating new Observable
+}
+
+func (l *tsLevel) Clear() {
+	l.oldest = 0
+	l.newest = len(l.buckets) - 1
+	l.end = time.Time{}
+	for i := range l.buckets {
+		if l.buckets[i] != nil {
+			l.buckets[i].Clear()
+			l.buckets[i] = nil
+		}
+	}
+}
+
+func (l *tsLevel) InitLevel(size time.Duration, numBuckets int, f func() Observable) {
+	l.size = size
+	l.provider = f
+	l.buckets = make([]Observable, numBuckets)
+}
+
+// Keeps a sequence of levels. Each level is responsible for storing data at
+// a given resolution. For example, the first level stores data at a one
+// minute resolution while the second level stores data at a one hour
+// resolution.
+
+// Each level is represented by a sequence of buckets. Each bucket spans an
+// interval equal to the resolution of the level. New observations are added
+// to the last bucket.
+type timeSeries struct {
+	provider    func() Observable // make more Observable
+	numBuckets  int               // number of buckets in each level
+	levels      []*tsLevel        // levels of bucketed Observable
+	lastAdd     time.Time         // time of last Observable tracked
+	total       Observable        // convenient aggregation of all Observable
+	clock       Clock             // Clock for getting current time
+	pending     Observable        // observations not yet bucketed
+	pendingTime time.Time         // what time are we keeping in pending
+	dirty       bool              // if there are pending observations
+}
+
+// init initializes a level according to the supplied criteria.
+func (ts *timeSeries) init(resolutions []time.Duration, f func() Observable, numBuckets int, clock Clock) {
+	ts.provider = f
+	ts.numBuckets = numBuckets
+	ts.clock = clock
+	ts.levels = make([]*tsLevel, len(resolutions))
+
+	for i := range resolutions {
+		if i > 0 && resolutions[i-1] >= resolutions[i] {
+			log.Print("timeseries: resolutions must be monotonically increasing")
+			break
+		}
+		newLevel := new(tsLevel)
+		newLevel.InitLevel(resolutions[i], ts.numBuckets, ts.provider)
+		ts.levels[i] = newLevel
+	}
+
+	ts.Clear()
+}
+
+// Clear removes all observations from the time series.
+func (ts *timeSeries) Clear() {
+	ts.lastAdd = time.Time{}
+	ts.total = ts.resetObservation(ts.total)
+	ts.pending = ts.resetObservation(ts.pending)
+	ts.pendingTime = time.Time{}
+	ts.dirty = false
+
+	for i := range ts.levels {
+		ts.levels[i].Clear()
+	}
+}
+
+// Add records an observation at the current time.
+func (ts *timeSeries) Add(observation Observable) {
+	ts.AddWithTime(observation, ts.clock.Time())
+}
+
+// AddWithTime records an observation at the specified time.
+func (ts *timeSeries) AddWithTime(observation Observable, t time.Time) {
+
+	smallBucketDuration := ts.levels[0].size
+
+	if t.After(ts.lastAdd) {
+		ts.lastAdd = t
+	}
+
+	if t.After(ts.pendingTime) {
+		ts.advance(t)
+		ts.mergePendingUpdates()
+		ts.pendingTime = ts.levels[0].end
+		ts.pending.CopyFrom(observation)
+		ts.dirty = true
+	} else if t.After(ts.pendingTime.Add(-1 * smallBucketDuration)) {
+		// The observation is close enough to go into the pending bucket.
+		// This compensates for clock skewing and small scheduling delays
+		// by letting the update stay in the fast path.
+		ts.pending.Add(observation)
+		ts.dirty = true
+	} else {
+		ts.mergeValue(observation, t)
+	}
+}
+
+// mergeValue inserts the observation at the specified time in the past into all levels.
+func (ts *timeSeries) mergeValue(observation Observable, t time.Time) {
+	for _, level := range ts.levels {
+		index := (ts.numBuckets - 1) - int(level.end.Sub(t)/level.size)
+		if 0 <= index && index < ts.numBuckets {
+			bucketNumber := (level.oldest + index) % ts.numBuckets
+			if level.buckets[bucketNumber] == nil {
+				level.buckets[bucketNumber] = level.provider()
+			}
+			level.buckets[bucketNumber].Add(observation)
+		}
+	}
+	ts.total.Add(observation)
+}
+
+// mergePendingUpdates applies the pending updates into all levels.
+func (ts *timeSeries) mergePendingUpdates() {
+	if ts.dirty {
+		ts.mergeValue(ts.pending, ts.pendingTime)
+		ts.pending = ts.resetObservation(ts.pending)
+		ts.dirty = false
+	}
+}
+
+// advance cycles the buckets at each level until the latest bucket in
+// each level can hold the time specified.
+func (ts *timeSeries) advance(t time.Time) {
+	if !t.After(ts.levels[0].end) {
+		return
+	}
+	for i := 0; i < len(ts.levels); i++ {
+		level := ts.levels[i]
+		if !level.end.Before(t) {
+			break
+		}
+
+		// If the time is sufficiently far, just clear the level and advance
+		// directly.
+		if !t.Before(level.end.Add(level.size * time.Duration(ts.numBuckets))) {
+			for _, b := range level.buckets {
+				ts.resetObservation(b)
+			}
+			level.end = time.Unix(0, (t.UnixNano()/level.size.Nanoseconds())*level.size.Nanoseconds())
+		}
+
+		for t.After(level.end) {
+			level.end = level.end.Add(level.size)
+			level.newest = level.oldest
+			level.oldest = (level.oldest + 1) % ts.numBuckets
+			ts.resetObservation(level.buckets[level.newest])
+		}
+
+		t = level.end
+	}
+}
+
+// Latest returns the sum of the num latest buckets from the level.
+func (ts *timeSeries) Latest(level, num int) Observable {
+	now := ts.clock.Time()
+	if ts.levels[0].end.Before(now) {
+		ts.advance(now)
+	}
+
+	ts.mergePendingUpdates()
+
+	result := ts.provider()
+	l := ts.levels[level]
+	index := l.newest
+
+	for i := 0; i < num; i++ {
+		if l.buckets[index] != nil {
+			result.Add(l.buckets[index])
+		}
+		if index == 0 {
+			index = ts.numBuckets
+		}
+		index--
+	}
+
+	return result
+}
+
+// LatestBuckets returns a copy of the num latest buckets from level.
+func (ts *timeSeries) LatestBuckets(level, num int) []Observable {
+	if level < 0 || level > len(ts.levels) {
+		log.Print("timeseries: bad level argument: ", level)
+		return nil
+	}
+	if num < 0 || num >= ts.numBuckets {
+		log.Print("timeseries: bad num argument: ", num)
+		return nil
+	}
+
+	results := make([]Observable, num)
+	now := ts.clock.Time()
+	if ts.levels[0].end.Before(now) {
+		ts.advance(now)
+	}
+
+	ts.mergePendingUpdates()
+
+	l := ts.levels[level]
+	index := l.newest
+
+	for i := 0; i < num; i++ {
+		result := ts.provider()
+		results[i] = result
+		if l.buckets[index] != nil {
+			result.CopyFrom(l.buckets[index])
+		}
+
+		if index == 0 {
+			index = ts.numBuckets
+		}
+		index -= 1
+	}
+	return results
+}
+
+// ScaleBy updates observations by scaling by factor.
+func (ts *timeSeries) ScaleBy(factor float64) {
+	for _, l := range ts.levels {
+		for i := 0; i < ts.numBuckets; i++ {
+			l.buckets[i].Multiply(factor)
+		}
+	}
+
+	ts.total.Multiply(factor)
+	ts.pending.Multiply(factor)
+}
+
+// Range returns the sum of observations added over the specified time range.
+// If start or finish times don't fall on bucket boundaries of the same
+// level, then return values are approximate answers.
+func (ts *timeSeries) Range(start, finish time.Time) Observable {
+	return ts.ComputeRange(start, finish, 1)[0]
+}
+
+// Recent returns the sum of observations from the last delta.
+func (ts *timeSeries) Recent(delta time.Duration) Observable {
+	now := ts.clock.Time()
+	return ts.Range(now.Add(-delta), now)
+}
+
+// Total returns the total of all observations.
+func (ts *timeSeries) Total() Observable {
+	ts.mergePendingUpdates()
+	return ts.total
+}
+
+// ComputeRange computes a specified number of values into a slice using
+// the observations recorded over the specified time period. The return
+// values are approximate if the start or finish times don't fall on the
+// bucket boundaries at the same level or if the number of buckets spanning
+// the range is not an integral multiple of num.
+func (ts *timeSeries) ComputeRange(start, finish time.Time, num int) []Observable {
+	if start.After(finish) {
+		log.Printf("timeseries: start > finish, %v>%v", start, finish)
+		return nil
+	}
+
+	if num < 0 {
+		log.Printf("timeseries: num < 0, %v", num)
+		return nil
+	}
+
+	results := make([]Observable, num)
+
+	for _, l := range ts.levels {
+		if !start.Before(l.end.Add(-l.size * time.Duration(ts.numBuckets))) {
+			ts.extract(l, start, finish, num, results)
+			return results
+		}
+	}
+
+	// Failed to find a level that covers the desired range.  So just
+	// extract from the last level, even if it doesn't cover the entire
+	// desired range.
+	ts.extract(ts.levels[len(ts.levels)-1], start, finish, num, results)
+
+	return results
+}
+
+// RecentList returns the specified number of values in slice over the most
+// recent time period of the specified range.
+func (ts *timeSeries) RecentList(delta time.Duration, num int) []Observable {
+	if delta < 0 {
+		return nil
+	}
+	now := ts.clock.Time()
+	return ts.ComputeRange(now.Add(-delta), now, num)
+}
+
+// extract returns a slice of specified number of observations from a given
+// level over a given range.
+func (ts *timeSeries) extract(l *tsLevel, start, finish time.Time, num int, results []Observable) {
+	ts.mergePendingUpdates()
+
+	srcInterval := l.size
+	dstInterval := finish.Sub(start) / time.Duration(num)
+	dstStart := start
+	srcStart := l.end.Add(-srcInterval * time.Duration(ts.numBuckets))
+
+	srcIndex := 0
+
+	// Where should scanning start?
+	if dstStart.After(srcStart) {
+		advance := dstStart.Sub(srcStart) / srcInterval
+		srcIndex += int(advance)
+		srcStart = srcStart.Add(advance * srcInterval)
+	}
+
+	// The i'th value is computed as show below.
+	// interval = (finish/start)/num
+	// i'th value = sum of observation in range
+	//   [ start + i       * interval,
+	//     start + (i + 1) * interval )
+	for i := 0; i < num; i++ {
+		results[i] = ts.resetObservation(results[i])
+		dstEnd := dstStart.Add(dstInterval)
+		for srcIndex < ts.numBuckets && srcStart.Before(dstEnd) {
+			srcEnd := srcStart.Add(srcInterval)
+			if srcEnd.After(ts.lastAdd) {
+				srcEnd = ts.lastAdd
+			}
+
+			if !srcEnd.Before(dstStart) {
+				srcValue := l.buckets[(srcIndex+l.oldest)%ts.numBuckets]
+				if !srcStart.Before(dstStart) && !srcEnd.After(dstEnd) {
+					// dst completely contains src.
+					if srcValue != nil {
+						results[i].Add(srcValue)
+					}
+				} else {
+					// dst partially overlaps src.
+					overlapStart := maxTime(srcStart, dstStart)
+					overlapEnd := minTime(srcEnd, dstEnd)
+					base := srcEnd.Sub(srcStart)
+					fraction := overlapEnd.Sub(overlapStart).Seconds() / base.Seconds()
+
+					used := ts.provider()
+					if srcValue != nil {
+						used.CopyFrom(srcValue)
+					}
+					used.Multiply(fraction)
+					results[i].Add(used)
+				}
+
+				if srcEnd.After(dstEnd) {
+					break
+				}
+			}
+			srcIndex++
+			srcStart = srcStart.Add(srcInterval)
+		}
+		dstStart = dstStart.Add(dstInterval)
+	}
+}
+
+// resetObservation clears the content so the struct may be reused.
+func (ts *timeSeries) resetObservation(observation Observable) Observable {
+	if observation == nil {
+		observation = ts.provider()
+	} else {
+		observation.Clear()
+	}
+	return observation
+}
+
+// TimeSeries tracks data at granularities from 1 second to 16 weeks.
+type TimeSeries struct {
+	timeSeries
+}
+
+// NewTimeSeries creates a new TimeSeries using the function provided for creating new Observable.
+func NewTimeSeries(f func() Observable) *TimeSeries {
+	return NewTimeSeriesWithClock(f, defaultClockInstance)
+}
+
+// NewTimeSeriesWithClock creates a new TimeSeries using the function provided for creating new Observable and the clock for
+// assigning timestamps.
+func NewTimeSeriesWithClock(f func() Observable, clock Clock) *TimeSeries {
+	ts := new(TimeSeries)
+	ts.timeSeries.init(timeSeriesResolutions, f, timeSeriesNumBuckets, clock)
+	return ts
+}
+
+// MinuteHourSeries tracks data at granularities of 1 minute and 1 hour.
+type MinuteHourSeries struct {
+	timeSeries
+}
+
+// NewMinuteHourSeries creates a new MinuteHourSeries using the function provided for creating new Observable.
+func NewMinuteHourSeries(f func() Observable) *MinuteHourSeries {
+	return NewMinuteHourSeriesWithClock(f, defaultClockInstance)
+}
+
+// NewMinuteHourSeriesWithClock creates a new MinuteHourSeries using the function provided for creating new Observable and the clock for
+// assigning timestamps.
+func NewMinuteHourSeriesWithClock(f func() Observable, clock Clock) *MinuteHourSeries {
+	ts := new(MinuteHourSeries)
+	ts.timeSeries.init(minuteHourSeriesResolutions, f,
+		minuteHourSeriesNumBuckets, clock)
+	return ts
+}
+
+func (ts *MinuteHourSeries) Minute() Observable {
+	return ts.timeSeries.Latest(0, 60)
+}
+
+func (ts *MinuteHourSeries) Hour() Observable {
+	return ts.timeSeries.Latest(1, 60)
+}
+
+func minTime(a, b time.Time) time.Time {
+	if a.Before(b) {
+		return a
+	}
+	return b
+}
+
+func maxTime(a, b time.Time) time.Time {
+	if a.After(b) {
+		return a
+	}
+	return b
+}
diff --git a/vendor/golang.org/x/net/trace/events.go b/vendor/golang.org/x/net/trace/events.go
new file mode 100644
index 0000000000..e66c7e3282
--- /dev/null
+++ b/vendor/golang.org/x/net/trace/events.go
@@ -0,0 +1,524 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package trace
+
+import (
+	"bytes"
+	"fmt"
+	"html/template"
+	"io"
+	"log"
+	"net/http"
+	"runtime"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"text/tabwriter"
+	"time"
+)
+
+var eventsTmpl = template.Must(template.New("events").Funcs(template.FuncMap{
+	"elapsed":   elapsed,
+	"trimSpace": strings.TrimSpace,
+}).Parse(eventsHTML))
+
+const maxEventsPerLog = 100
+
+type bucket struct {
+	MaxErrAge time.Duration
+	String    string
+}
+
+var buckets = []bucket{
+	{0, "total"},
+	{10 * time.Second, "errs<10s"},
+	{1 * time.Minute, "errs<1m"},
+	{10 * time.Minute, "errs<10m"},
+	{1 * time.Hour, "errs<1h"},
+	{10 * time.Hour, "errs<10h"},
+	{24000 * time.Hour, "errors"},
+}
+
+// RenderEvents renders the HTML page typically served at /debug/events.
+// It does not do any auth checking; see AuthRequest for the default auth check
+// used by the handler registered on http.DefaultServeMux.
+// req may be nil.
+func RenderEvents(w http.ResponseWriter, req *http.Request, sensitive bool) {
+	now := time.Now()
+	data := &struct {
+		Families []string // family names
+		Buckets  []bucket
+		Counts   [][]int // eventLog count per family/bucket
+
+		// Set when a bucket has been selected.
+		Family    string
+		Bucket    int
+		EventLogs eventLogs
+		Expanded  bool
+	}{
+		Buckets: buckets,
+	}
+
+	data.Families = make([]string, 0, len(families))
+	famMu.RLock()
+	for name := range families {
+		data.Families = append(data.Families, name)
+	}
+	famMu.RUnlock()
+	sort.Strings(data.Families)
+
+	// Count the number of eventLogs in each family for each error age.
+	data.Counts = make([][]int, len(data.Families))
+	for i, name := range data.Families {
+		// TODO(sameer): move this loop under the family lock.
+		f := getEventFamily(name)
+		data.Counts[i] = make([]int, len(data.Buckets))
+		for j, b := range data.Buckets {
+			data.Counts[i][j] = f.Count(now, b.MaxErrAge)
+		}
+	}
+
+	if req != nil {
+		var ok bool
+		data.Family, data.Bucket, ok = parseEventsArgs(req)
+		if !ok {
+			// No-op
+		} else {
+			data.EventLogs = getEventFamily(data.Family).Copy(now, buckets[data.Bucket].MaxErrAge)
+		}
+		if data.EventLogs != nil {
+			defer data.EventLogs.Free()
+			sort.Sort(data.EventLogs)
+		}
+		if exp, err := strconv.ParseBool(req.FormValue("exp")); err == nil {
+			data.Expanded = exp
+		}
+	}
+
+	famMu.RLock()
+	defer famMu.RUnlock()
+	if err := eventsTmpl.Execute(w, data); err != nil {
+		log.Printf("net/trace: Failed executing template: %v", err)
+	}
+}
+
+func parseEventsArgs(req *http.Request) (fam string, b int, ok bool) {
+	fam, bStr := req.FormValue("fam"), req.FormValue("b")
+	if fam == "" || bStr == "" {
+		return "", 0, false
+	}
+	b, err := strconv.Atoi(bStr)
+	if err != nil || b < 0 || b >= len(buckets) {
+		return "", 0, false
+	}
+	return fam, b, true
+}
+
+// An EventLog provides a log of events associated with a specific object.
+type EventLog interface {
+	// Printf formats its arguments with fmt.Sprintf and adds the
+	// result to the event log.
+	Printf(format string, a ...interface{})
+
+	// Errorf is like Printf, but it marks this event as an error.
+	Errorf(format string, a ...interface{})
+
+	// Finish declares that this event log is complete.
+	// The event log should not be used after calling this method.
+	Finish()
+}
+
+// NewEventLog returns a new EventLog with the specified family name
+// and title.
+func NewEventLog(family, title string) EventLog {
+	el := newEventLog()
+	el.ref()
+	el.Family, el.Title = family, title
+	el.Start = time.Now()
+	el.events = make([]logEntry, 0, maxEventsPerLog)
+	el.stack = make([]uintptr, 32)
+	n := runtime.Callers(2, el.stack)
+	el.stack = el.stack[:n]
+
+	getEventFamily(family).add(el)
+	return el
+}
+
+func (el *eventLog) Finish() {
+	getEventFamily(el.Family).remove(el)
+	el.unref() // matches ref in New
+}
+
+var (
+	famMu    sync.RWMutex
+	families = make(map[string]*eventFamily) // family name => family
+)
+
+func getEventFamily(fam string) *eventFamily {
+	famMu.Lock()
+	defer famMu.Unlock()
+	f := families[fam]
+	if f == nil {
+		f = &eventFamily{}
+		families[fam] = f
+	}
+	return f
+}
+
+type eventFamily struct {
+	mu        sync.RWMutex
+	eventLogs eventLogs
+}
+
+func (f *eventFamily) add(el *eventLog) {
+	f.mu.Lock()
+	f.eventLogs = append(f.eventLogs, el)
+	f.mu.Unlock()
+}
+
+func (f *eventFamily) remove(el *eventLog) {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	for i, el0 := range f.eventLogs {
+		if el == el0 {
+			copy(f.eventLogs[i:], f.eventLogs[i+1:])
+			f.eventLogs = f.eventLogs[:len(f.eventLogs)-1]
+			return
+		}
+	}
+}
+
+func (f *eventFamily) Count(now time.Time, maxErrAge time.Duration) (n int) {
+	f.mu.RLock()
+	defer f.mu.RUnlock()
+	for _, el := range f.eventLogs {
+		if el.hasRecentError(now, maxErrAge) {
+			n++
+		}
+	}
+	return
+}
+
+func (f *eventFamily) Copy(now time.Time, maxErrAge time.Duration) (els eventLogs) {
+	f.mu.RLock()
+	defer f.mu.RUnlock()
+	els = make(eventLogs, 0, len(f.eventLogs))
+	for _, el := range f.eventLogs {
+		if el.hasRecentError(now, maxErrAge) {
+			el.ref()
+			els = append(els, el)
+		}
+	}
+	return
+}
+
+type eventLogs []*eventLog
+
+// Free calls unref on each element of the list.
+func (els eventLogs) Free() {
+	for _, el := range els {
+		el.unref()
+	}
+}
+
+// eventLogs may be sorted in reverse chronological order.
+func (els eventLogs) Len() int           { return len(els) }
+func (els eventLogs) Less(i, j int) bool { return els[i].Start.After(els[j].Start) }
+func (els eventLogs) Swap(i, j int)      { els[i], els[j] = els[j], els[i] }
+
+// A logEntry is a timestamped log entry in an event log.
+type logEntry struct {
+	When    time.Time
+	Elapsed time.Duration // since previous event in log
+	NewDay  bool          // whether this event is on a different day to the previous event
+	What    string
+	IsErr   bool
+}
+
+// WhenString returns a string representation of the elapsed time of the event.
+// It will include the date if midnight was crossed.
+func (e logEntry) WhenString() string {
+	if e.NewDay {
+		return e.When.Format("2006/01/02 15:04:05.000000")
+	}
+	return e.When.Format("15:04:05.000000")
+}
+
+// An eventLog represents an active event log.
+type eventLog struct {
+	// Family is the top-level grouping of event logs to which this belongs.
+	Family string
+
+	// Title is the title of this event log.
+	Title string
+
+	// Timing information.
+	Start time.Time
+
+	// Call stack where this event log was created.
+	stack []uintptr
+
+	// Append-only sequence of events.
+	//
+	// TODO(sameer): change this to a ring buffer to avoid the array copy
+	// when we hit maxEventsPerLog.
+	mu            sync.RWMutex
+	events        []logEntry
+	LastErrorTime time.Time
+	discarded     int
+
+	refs int32 // how many buckets this is in
+}
+
+func (el *eventLog) reset() {
+	// Clear all but the mutex. Mutexes may not be copied, even when unlocked.
+	el.Family = ""
+	el.Title = ""
+	el.Start = time.Time{}
+	el.stack = nil
+	el.events = nil
+	el.LastErrorTime = time.Time{}
+	el.discarded = 0
+	el.refs = 0
+}
+
+func (el *eventLog) hasRecentError(now time.Time, maxErrAge time.Duration) bool {
+	if maxErrAge == 0 {
+		return true
+	}
+	el.mu.RLock()
+	defer el.mu.RUnlock()
+	return now.Sub(el.LastErrorTime) < maxErrAge
+}
+
+// delta returns the elapsed time since the last event or the log start,
+// and whether it spans midnight.
+// L >= el.mu
+func (el *eventLog) delta(t time.Time) (time.Duration, bool) {
+	if len(el.events) == 0 {
+		return t.Sub(el.Start), false
+	}
+	prev := el.events[len(el.events)-1].When
+	return t.Sub(prev), prev.Day() != t.Day()
+
+}
+
+func (el *eventLog) Printf(format string, a ...interface{}) {
+	el.printf(false, format, a...)
+}
+
+func (el *eventLog) Errorf(format string, a ...interface{}) {
+	el.printf(true, format, a...)
+}
+
+func (el *eventLog) printf(isErr bool, format string, a ...interface{}) {
+	e := logEntry{When: time.Now(), IsErr: isErr, What: fmt.Sprintf(format, a...)}
+	el.mu.Lock()
+	e.Elapsed, e.NewDay = el.delta(e.When)
+	if len(el.events) < maxEventsPerLog {
+		el.events = append(el.events, e)
+	} else {
+		// Discard the oldest event.
+		if el.discarded == 0 {
+			// el.discarded starts at two to count for the event it
+			// is replacing, plus the next one that we are about to
+			// drop.
+			el.discarded = 2
+		} else {
+			el.discarded++
+		}
+		// TODO(sameer): if this causes allocations on a critical path,
+		// change eventLog.What to be a fmt.Stringer, as in trace.go.
+		el.events[0].What = fmt.Sprintf("(%d events discarded)", el.discarded)
+		// The timestamp of the discarded meta-event should be
+		// the time of the last event it is representing.
+		el.events[0].When = el.events[1].When
+		copy(el.events[1:], el.events[2:])
+		el.events[maxEventsPerLog-1] = e
+	}
+	if e.IsErr {
+		el.LastErrorTime = e.When
+	}
+	el.mu.Unlock()
+}
+
+func (el *eventLog) ref() {
+	atomic.AddInt32(&el.refs, 1)
+}
+
+func (el *eventLog) unref() {
+	if atomic.AddInt32(&el.refs, -1) == 0 {
+		freeEventLog(el)
+	}
+}
+
+func (el *eventLog) When() string {
+	return el.Start.Format("2006/01/02 15:04:05.000000")
+}
+
+func (el *eventLog) ElapsedTime() string {
+	elapsed := time.Since(el.Start)
+	return fmt.Sprintf("%.6f", elapsed.Seconds())
+}
+
+func (el *eventLog) Stack() string {
+	buf := new(bytes.Buffer)
+	tw := tabwriter.NewWriter(buf, 1, 8, 1, '\t', 0)
+	printStackRecord(tw, el.stack)
+	tw.Flush()
+	return buf.String()
+}
+
+// printStackRecord prints the function + source line information
+// for a single stack trace.
+// Adapted from runtime/pprof/pprof.go.
+func printStackRecord(w io.Writer, stk []uintptr) {
+	for _, pc := range stk {
+		f := runtime.FuncForPC(pc)
+		if f == nil {
+			continue
+		}
+		file, line := f.FileLine(pc)
+		name := f.Name()
+		// Hide runtime.goexit and any runtime functions at the beginning.
+		if strings.HasPrefix(name, "runtime.") {
+			continue
+		}
+		fmt.Fprintf(w, "#   %s\t%s:%d\n", name, file, line)
+	}
+}
+
+func (el *eventLog) Events() []logEntry {
+	el.mu.RLock()
+	defer el.mu.RUnlock()
+	return el.events
+}
+
+// freeEventLogs is a freelist of *eventLog
+var freeEventLogs = make(chan *eventLog, 1000)
+
+// newEventLog returns a event log ready to use.
+func newEventLog() *eventLog {
+	select {
+	case el := <-freeEventLogs:
+		return el
+	default:
+		return new(eventLog)
+	}
+}
+
+// freeEventLog adds el to freeEventLogs if there's room.
+// This is non-blocking.
+func freeEventLog(el *eventLog) {
+	el.reset()
+	select {
+	case freeEventLogs <- el:
+	default:
+	}
+}
+
+const eventsHTML = `
+<html>
+	<head>
+		<title>events</title>
+	</head>
+	<style type="text/css">
+		body {
+			font-family: sans-serif;
+		}
+		table#req-status td.family {
+			padding-right: 2em;
+		}
+		table#req-status td.active {
+			padding-right: 1em;
+		}
+		table#req-status td.empty {
+			color: #aaa;
+		}
+		table#reqs {
+			margin-top: 1em;
+		}
+		table#reqs tr.first {
+			{{if $.Expanded}}font-weight: bold;{{end}}
+		}
+		table#reqs td {
+			font-family: monospace;
+		}
+		table#reqs td.when {
+			text-align: right;
+			white-space: nowrap;
+		}
+		table#reqs td.elapsed {
+			padding: 0 0.5em;
+			text-align: right;
+			white-space: pre;
+			width: 10em;
+		}
+		address {
+			font-size: smaller;
+			margin-top: 5em;
+		}
+	</style>
+	<body>
+
+<h1>/debug/events</h1>
+
+<table id="req-status">
+	{{range $i, $fam := .Families}}
+	<tr>
+		<td class="family">{{$fam}}</td>
+
+	        {{range $j, $bucket := $.Buckets}}
+	        {{$n := index $.Counts $i $j}}
+		<td class="{{if not $bucket.MaxErrAge}}active{{end}}{{if not $n}}empty{{end}}">
+	                {{if $n}}<a href="?fam={{$fam}}&b={{$j}}{{if $.Expanded}}&exp=1{{end}}">{{end}}
+		        [{{$n}} {{$bucket.String}}]
+			{{if $n}}</a>{{end}}
+		</td>
+                {{end}}
+
+	</tr>{{end}}
+</table>
+
+{{if $.EventLogs}}
+<hr />
+<h3>Family: {{$.Family}}</h3>
+
+{{if $.Expanded}}<a href="?fam={{$.Family}}&b={{$.Bucket}}">{{end}}
+[Summary]{{if $.Expanded}}</a>{{end}}
+
+{{if not $.Expanded}}<a href="?fam={{$.Family}}&b={{$.Bucket}}&exp=1">{{end}}
+[Expanded]{{if not $.Expanded}}</a>{{end}}
+
+<table id="reqs">
+	<tr><th>When</th><th>Elapsed</th></tr>
+	{{range $el := $.EventLogs}}
+	<tr class="first">
+		<td class="when">{{$el.When}}</td>
+		<td class="elapsed">{{$el.ElapsedTime}}</td>
+		<td>{{$el.Title}}
+	</tr>
+	{{if $.Expanded}}
+	<tr>
+		<td class="when"></td>
+		<td class="elapsed"></td>
+		<td><pre>{{$el.Stack|trimSpace}}</pre></td>
+	</tr>
+	{{range $el.Events}}
+	<tr>
+		<td class="when">{{.WhenString}}</td>
+		<td class="elapsed">{{elapsed .Elapsed}}</td>
+		<td>.{{if .IsErr}}E{{else}}.{{end}}. {{.What}}</td>
+	</tr>
+	{{end}}
+	{{end}}
+	{{end}}
+</table>
+{{end}}
+	</body>
+</html>
+`
diff --git a/vendor/golang.org/x/net/trace/histogram.go b/vendor/golang.org/x/net/trace/histogram.go
new file mode 100644
index 0000000000..bb42aa5320
--- /dev/null
+++ b/vendor/golang.org/x/net/trace/histogram.go
@@ -0,0 +1,356 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package trace
+
+// This file implements histogramming for RPC statistics collection.
+
+import (
+	"bytes"
+	"fmt"
+	"html/template"
+	"log"
+	"math"
+
+	"golang.org/x/net/internal/timeseries"
+)
+
+const (
+	bucketCount = 38
+)
+
+// histogram keeps counts of values in buckets that are spaced
+// out in powers of 2: 0-1, 2-3, 4-7...
+// histogram implements timeseries.Observable
+type histogram struct {
+	sum          int64   // running total of measurements
+	sumOfSquares float64 // square of running total
+	buckets      []int64 // bucketed values for histogram
+	value        int     // holds a single value as an optimization
+	valueCount   int64   // number of values recorded for single value
+}
+
+// AddMeasurement records a value measurement observation to the histogram.
+func (h *histogram) addMeasurement(value int64) {
+	// TODO: assert invariant
+	h.sum += value
+	h.sumOfSquares += float64(value) * float64(value)
+
+	bucketIndex := getBucket(value)
+
+	if h.valueCount == 0 || (h.valueCount > 0 && h.value == bucketIndex) {
+		h.value = bucketIndex
+		h.valueCount++
+	} else {
+		h.allocateBuckets()
+		h.buckets[bucketIndex]++
+	}
+}
+
+func (h *histogram) allocateBuckets() {
+	if h.buckets == nil {
+		h.buckets = make([]int64, bucketCount)
+		h.buckets[h.value] = h.valueCount
+		h.value = 0
+		h.valueCount = -1
+	}
+}
+
+func log2(i int64) int {
+	n := 0
+	for ; i >= 0x100; i >>= 8 {
+		n += 8
+	}
+	for ; i > 0; i >>= 1 {
+		n += 1
+	}
+	return n
+}
+
+func getBucket(i int64) (index int) {
+	index = log2(i) - 1
+	if index < 0 {
+		index = 0
+	}
+	if index >= bucketCount {
+		index = bucketCount - 1
+	}
+	return
+}
+
+// Total returns the number of recorded observations.
+func (h *histogram) total() (total int64) {
+	if h.valueCount >= 0 {
+		total = h.valueCount
+	}
+	for _, val := range h.buckets {
+		total += int64(val)
+	}
+	return
+}
+
+// Average returns the average value of recorded observations.
+func (h *histogram) average() float64 {
+	t := h.total()
+	if t == 0 {
+		return 0
+	}
+	return float64(h.sum) / float64(t)
+}
+
+// Variance returns the variance of recorded observations.
+func (h *histogram) variance() float64 {
+	t := float64(h.total())
+	if t == 0 {
+		return 0
+	}
+	s := float64(h.sum) / t
+	return h.sumOfSquares/t - s*s
+}
+
+// StandardDeviation returns the standard deviation of recorded observations.
+func (h *histogram) standardDeviation() float64 {
+	return math.Sqrt(h.variance())
+}
+
+// PercentileBoundary estimates the value that the given fraction of recorded
+// observations are less than.
+func (h *histogram) percentileBoundary(percentile float64) int64 {
+	total := h.total()
+
+	// Corner cases (make sure result is strictly less than Total())
+	if total == 0 {
+		return 0
+	} else if total == 1 {
+		return int64(h.average())
+	}
+
+	percentOfTotal := round(float64(total) * percentile)
+	var runningTotal int64
+
+	for i := range h.buckets {
+		value := h.buckets[i]
+		runningTotal += value
+		if runningTotal == percentOfTotal {
+			// We hit an exact bucket boundary. If the next bucket has data, it is a
+			// good estimate of the value. If the bucket is empty, we interpolate the
+			// midpoint between the next bucket's boundary and the next non-zero
+			// bucket. If the remaining buckets are all empty, then we use the
+			// boundary for the next bucket as the estimate.
+			j := uint8(i + 1)
+			min := bucketBoundary(j)
+			if runningTotal < total {
+				for h.buckets[j] == 0 {
+					j++
+				}
+			}
+			max := bucketBoundary(j)
+			return min + round(float64(max-min)/2)
+		} else if runningTotal > percentOfTotal {
+			// The value is in this bucket. Interpolate the value.
+			delta := runningTotal - percentOfTotal
+			percentBucket := float64(value-delta) / float64(value)
+			bucketMin := bucketBoundary(uint8(i))
+			nextBucketMin := bucketBoundary(uint8(i + 1))
+			bucketSize := nextBucketMin - bucketMin
+			return bucketMin + round(percentBucket*float64(bucketSize))
+		}
+	}
+	return bucketBoundary(bucketCount - 1)
+}
+
+// Median returns the estimated median of the observed values.
+func (h *histogram) median() int64 {
+	return h.percentileBoundary(0.5)
+}
+
+// Add adds other to h.
+func (h *histogram) Add(other timeseries.Observable) {
+	o := other.(*histogram)
+	if o.valueCount == 0 {
+		// Other histogram is empty
+	} else if h.valueCount >= 0 && o.valueCount > 0 && h.value == o.value {
+		// Both have a single bucketed value, aggregate them
+		h.valueCount += o.valueCount
+	} else {
+		// Two different values necessitate buckets in this histogram
+		h.allocateBuckets()
+		if o.valueCount >= 0 {
+			h.buckets[o.value] += o.valueCount
+		} else {
+			for i := range h.buckets {
+				h.buckets[i] += o.buckets[i]
+			}
+		}
+	}
+	h.sumOfSquares += o.sumOfSquares
+	h.sum += o.sum
+}
+
+// Clear resets the histogram to an empty state, removing all observed values.
+func (h *histogram) Clear() {
+	h.buckets = nil
+	h.value = 0
+	h.valueCount = 0
+	h.sum = 0
+	h.sumOfSquares = 0
+}
+
+// CopyFrom copies from other, which must be a *histogram, into h.
+func (h *histogram) CopyFrom(other timeseries.Observable) {
+	o := other.(*histogram)
+	if o.valueCount == -1 {
+		h.allocateBuckets()
+		copy(h.buckets, o.buckets)
+	}
+	h.sum = o.sum
+	h.sumOfSquares = o.sumOfSquares
+	h.value = o.value
+	h.valueCount = o.valueCount
+}
+
+// Multiply scales the histogram by the specified ratio.
+func (h *histogram) Multiply(ratio float64) {
+	if h.valueCount == -1 {
+		for i := range h.buckets {
+			h.buckets[i] = int64(float64(h.buckets[i]) * ratio)
+		}
+	} else {
+		h.valueCount = int64(float64(h.valueCount) * ratio)
+	}
+	h.sum = int64(float64(h.sum) * ratio)
+	h.sumOfSquares = h.sumOfSquares * ratio
+}
+
+// New creates a new histogram.
+func (h *histogram) New() timeseries.Observable {
+	r := new(histogram)
+	r.Clear()
+	return r
+}
+
+func (h *histogram) String() string {
+	return fmt.Sprintf("%d, %f, %d, %d, %v",
+		h.sum, h.sumOfSquares, h.value, h.valueCount, h.buckets)
+}
+
+// round returns the closest int64 to the argument
+func round(in float64) int64 {
+	return int64(math.Floor(in + 0.5))
+}
+
+// bucketBoundary returns the first value in the bucket.
+func bucketBoundary(bucket uint8) int64 {
+	if bucket == 0 {
+		return 0
+	}
+	return 1 << bucket
+}
+
+// bucketData holds data about a specific bucket for use in distTmpl.
+type bucketData struct {
+	Lower, Upper       int64
+	N                  int64
+	Pct, CumulativePct float64
+	GraphWidth         int
+}
+
+// data holds data about a Distribution for use in distTmpl.
+type data struct {
+	Buckets                 []*bucketData
+	Count, Median           int64
+	Mean, StandardDeviation float64
+}
+
+// maxHTMLBarWidth is the maximum width of the HTML bar for visualizing buckets.
+const maxHTMLBarWidth = 350.0
+
+// newData returns data representing h for use in distTmpl.
+func (h *histogram) newData() *data {
+	// Force the allocation of buckets to simplify the rendering implementation
+	h.allocateBuckets()
+	// We scale the bars on the right so that the largest bar is
+	// maxHTMLBarWidth pixels in width.
+	maxBucket := int64(0)
+	for _, n := range h.buckets {
+		if n > maxBucket {
+			maxBucket = n
+		}
+	}
+	total := h.total()
+	barsizeMult := maxHTMLBarWidth / float64(maxBucket)
+	var pctMult float64
+	if total == 0 {
+		pctMult = 1.0
+	} else {
+		pctMult = 100.0 / float64(total)
+	}
+
+	buckets := make([]*bucketData, len(h.buckets))
+	runningTotal := int64(0)
+	for i, n := range h.buckets {
+		if n == 0 {
+			continue
+		}
+		runningTotal += n
+		var upperBound int64
+		if i < bucketCount-1 {
+			upperBound = bucketBoundary(uint8(i + 1))
+		} else {
+			upperBound = math.MaxInt64
+		}
+		buckets[i] = &bucketData{
+			Lower:         bucketBoundary(uint8(i)),
+			Upper:         upperBound,
+			N:             n,
+			Pct:           float64(n) * pctMult,
+			CumulativePct: float64(runningTotal) * pctMult,
+			GraphWidth:    int(float64(n) * barsizeMult),
+		}
+	}
+	return &data{
+		Buckets:           buckets,
+		Count:             total,
+		Median:            h.median(),
+		Mean:              h.average(),
+		StandardDeviation: h.standardDeviation(),
+	}
+}
+
+func (h *histogram) html() template.HTML {
+	buf := new(bytes.Buffer)
+	if err := distTmpl.Execute(buf, h.newData()); err != nil {
+		buf.Reset()
+		log.Printf("net/trace: couldn't execute template: %v", err)
+	}
+	return template.HTML(buf.String())
+}
+
+// Input: data
+var distTmpl = template.Must(template.New("distTmpl").Parse(`
+<table>
+<tr>
+    <td style="padding:0.25em">Count: {{.Count}}</td>
+    <td style="padding:0.25em">Mean: {{printf "%.0f" .Mean}}</td>
+    <td style="padding:0.25em">StdDev: {{printf "%.0f" .StandardDeviation}}</td>
+    <td style="padding:0.25em">Median: {{.Median}}</td>
+</tr>
+</table>
+<hr>
+<table>
+{{range $b := .Buckets}}
+{{if $b}}
+  <tr>
+    <td style="padding:0 0 0 0.25em">[</td>
+    <td style="text-align:right;padding:0 0.25em">{{.Lower}},</td>
+    <td style="text-align:right;padding:0 0.25em">{{.Upper}})</td>
+    <td style="text-align:right;padding:0 0.25em">{{.N}}</td>
+    <td style="text-align:right;padding:0 0.25em">{{printf "%#.3f" .Pct}}%</td>
+    <td style="text-align:right;padding:0 0.25em">{{printf "%#.3f" .CumulativePct}}%</td>
+    <td><div style="background-color: blue; height: 1em; width: {{.GraphWidth}};"></div></td>
+  </tr>
+{{end}}
+{{end}}
+</table>
+`))
diff --git a/vendor/golang.org/x/net/trace/trace.go b/vendor/golang.org/x/net/trace/trace.go
new file mode 100644
index 0000000000..0767c8c69d
--- /dev/null
+++ b/vendor/golang.org/x/net/trace/trace.go
@@ -0,0 +1,1059 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+Package trace implements tracing of requests and long-lived objects.
+It exports HTTP interfaces on /debug/requests and /debug/events.
+
+A trace.Trace provides tracing for short-lived objects, usually requests.
+A request handler might be implemented like this:
+
+	func fooHandler(w http.ResponseWriter, req *http.Request) {
+		tr := trace.New("mypkg.Foo", req.URL.Path)
+		defer tr.Finish()
+		...
+		tr.LazyPrintf("some event %q happened", str)
+		...
+		if err := somethingImportant(); err != nil {
+			tr.LazyPrintf("somethingImportant failed: %v", err)
+			tr.SetError()
+		}
+	}
+
+The /debug/requests HTTP endpoint organizes the traces by family,
+errors, and duration.  It also provides histogram of request duration
+for each family.
+
+A trace.EventLog provides tracing for long-lived objects, such as RPC
+connections.
+
+	// A Fetcher fetches URL paths for a single domain.
+	type Fetcher struct {
+		domain string
+		events trace.EventLog
+	}
+
+	func NewFetcher(domain string) *Fetcher {
+		return &Fetcher{
+			domain,
+			trace.NewEventLog("mypkg.Fetcher", domain),
+		}
+	}
+
+	func (f *Fetcher) Fetch(path string) (string, error) {
+		resp, err := http.Get("http://" + f.domain + "/" + path)
+		if err != nil {
+			f.events.Errorf("Get(%q) = %v", path, err)
+			return "", err
+		}
+		f.events.Printf("Get(%q) = %s", path, resp.Status)
+		...
+	}
+
+	func (f *Fetcher) Close() error {
+		f.events.Finish()
+		return nil
+	}
+
+The /debug/events HTTP endpoint organizes the event logs by family and
+by time since the last error.  The expanded view displays recent log
+entries and the log's call stack.
+*/
+package trace // import "golang.org/x/net/trace"
+
+import (
+	"bytes"
+	"fmt"
+	"html/template"
+	"io"
+	"log"
+	"net"
+	"net/http"
+	"runtime"
+	"sort"
+	"strconv"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/internal/timeseries"
+)
+
+// DebugUseAfterFinish controls whether to debug uses of Trace values after finishing.
+// FOR DEBUGGING ONLY. This will slow down the program.
+var DebugUseAfterFinish = false
+
+// AuthRequest determines whether a specific request is permitted to load the
+// /debug/requests or /debug/events pages.
+//
+// It returns two bools; the first indicates whether the page may be viewed at all,
+// and the second indicates whether sensitive events will be shown.
+//
+// AuthRequest may be replaced by a program to customise its authorisation requirements.
+//
+// The default AuthRequest function returns (true, true) iff the request comes from localhost/127.0.0.1/[::1].
+var AuthRequest = func(req *http.Request) (any, sensitive bool) {
+	host, _, err := net.SplitHostPort(req.RemoteAddr)
+	switch {
+	case err != nil: // Badly formed address; fail closed.
+		return false, false
+	case host == "localhost" || host == "127.0.0.1" || host == "::1":
+		return true, true
+	default:
+		return false, false
+	}
+}
+
+func init() {
+	http.HandleFunc("/debug/requests", func(w http.ResponseWriter, req *http.Request) {
+		any, sensitive := AuthRequest(req)
+		if !any {
+			http.Error(w, "not allowed", http.StatusUnauthorized)
+			return
+		}
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		Render(w, req, sensitive)
+	})
+	http.HandleFunc("/debug/events", func(w http.ResponseWriter, req *http.Request) {
+		any, sensitive := AuthRequest(req)
+		if !any {
+			http.Error(w, "not allowed", http.StatusUnauthorized)
+			return
+		}
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		RenderEvents(w, req, sensitive)
+	})
+}
+
+// Render renders the HTML page typically served at /debug/requests.
+// It does not do any auth checking; see AuthRequest for the default auth check
+// used by the handler registered on http.DefaultServeMux.
+// req may be nil.
+func Render(w io.Writer, req *http.Request, sensitive bool) {
+	data := &struct {
+		Families         []string
+		ActiveTraceCount map[string]int
+		CompletedTraces  map[string]*family
+
+		// Set when a bucket has been selected.
+		Traces        traceList
+		Family        string
+		Bucket        int
+		Expanded      bool
+		Traced        bool
+		Active        bool
+		ShowSensitive bool // whether to show sensitive events
+
+		Histogram       template.HTML
+		HistogramWindow string // e.g. "last minute", "last hour", "all time"
+
+		// If non-zero, the set of traces is a partial set,
+		// and this is the total number.
+		Total int
+	}{
+		CompletedTraces: completedTraces,
+	}
+
+	data.ShowSensitive = sensitive
+	if req != nil {
+		// Allow show_sensitive=0 to force hiding of sensitive data for testing.
+		// This only goes one way; you can't use show_sensitive=1 to see things.
+		if req.FormValue("show_sensitive") == "0" {
+			data.ShowSensitive = false
+		}
+
+		if exp, err := strconv.ParseBool(req.FormValue("exp")); err == nil {
+			data.Expanded = exp
+		}
+		if exp, err := strconv.ParseBool(req.FormValue("rtraced")); err == nil {
+			data.Traced = exp
+		}
+	}
+
+	completedMu.RLock()
+	data.Families = make([]string, 0, len(completedTraces))
+	for fam := range completedTraces {
+		data.Families = append(data.Families, fam)
+	}
+	completedMu.RUnlock()
+	sort.Strings(data.Families)
+
+	// We are careful here to minimize the time spent locking activeMu,
+	// since that lock is required every time an RPC starts and finishes.
+	data.ActiveTraceCount = make(map[string]int, len(data.Families))
+	activeMu.RLock()
+	for fam, s := range activeTraces {
+		data.ActiveTraceCount[fam] = s.Len()
+	}
+	activeMu.RUnlock()
+
+	var ok bool
+	data.Family, data.Bucket, ok = parseArgs(req)
+	switch {
+	case !ok:
+		// No-op
+	case data.Bucket == -1:
+		data.Active = true
+		n := data.ActiveTraceCount[data.Family]
+		data.Traces = getActiveTraces(data.Family)
+		if len(data.Traces) < n {
+			data.Total = n
+		}
+	case data.Bucket < bucketsPerFamily:
+		if b := lookupBucket(data.Family, data.Bucket); b != nil {
+			data.Traces = b.Copy(data.Traced)
+		}
+	default:
+		if f := getFamily(data.Family, false); f != nil {
+			var obs timeseries.Observable
+			f.LatencyMu.RLock()
+			switch o := data.Bucket - bucketsPerFamily; o {
+			case 0:
+				obs = f.Latency.Minute()
+				data.HistogramWindow = "last minute"
+			case 1:
+				obs = f.Latency.Hour()
+				data.HistogramWindow = "last hour"
+			case 2:
+				obs = f.Latency.Total()
+				data.HistogramWindow = "all time"
+			}
+			f.LatencyMu.RUnlock()
+			if obs != nil {
+				data.Histogram = obs.(*histogram).html()
+			}
+		}
+	}
+
+	if data.Traces != nil {
+		defer data.Traces.Free()
+		sort.Sort(data.Traces)
+	}
+
+	completedMu.RLock()
+	defer completedMu.RUnlock()
+	if err := pageTmpl.ExecuteTemplate(w, "Page", data); err != nil {
+		log.Printf("net/trace: Failed executing template: %v", err)
+	}
+}
+
+func parseArgs(req *http.Request) (fam string, b int, ok bool) {
+	if req == nil {
+		return "", 0, false
+	}
+	fam, bStr := req.FormValue("fam"), req.FormValue("b")
+	if fam == "" || bStr == "" {
+		return "", 0, false
+	}
+	b, err := strconv.Atoi(bStr)
+	if err != nil || b < -1 {
+		return "", 0, false
+	}
+
+	return fam, b, true
+}
+
+func lookupBucket(fam string, b int) *traceBucket {
+	f := getFamily(fam, false)
+	if f == nil || b < 0 || b >= len(f.Buckets) {
+		return nil
+	}
+	return f.Buckets[b]
+}
+
+type contextKeyT string
+
+var contextKey = contextKeyT("golang.org/x/net/trace.Trace")
+
+// NewContext returns a copy of the parent context
+// and associates it with a Trace.
+func NewContext(ctx context.Context, tr Trace) context.Context {
+	return context.WithValue(ctx, contextKey, tr)
+}
+
+// FromContext returns the Trace bound to the context, if any.
+func FromContext(ctx context.Context) (tr Trace, ok bool) {
+	tr, ok = ctx.Value(contextKey).(Trace)
+	return
+}
+
+// Trace represents an active request.
+type Trace interface {
+	// LazyLog adds x to the event log. It will be evaluated each time the
+	// /debug/requests page is rendered. Any memory referenced by x will be
+	// pinned until the trace is finished and later discarded.
+	LazyLog(x fmt.Stringer, sensitive bool)
+
+	// LazyPrintf evaluates its arguments with fmt.Sprintf each time the
+	// /debug/requests page is rendered. Any memory referenced by a will be
+	// pinned until the trace is finished and later discarded.
+	LazyPrintf(format string, a ...interface{})
+
+	// SetError declares that this trace resulted in an error.
+	SetError()
+
+	// SetRecycler sets a recycler for the trace.
+	// f will be called for each event passed to LazyLog at a time when
+	// it is no longer required, whether while the trace is still active
+	// and the event is discarded, or when a completed trace is discarded.
+	SetRecycler(f func(interface{}))
+
+	// SetTraceInfo sets the trace info for the trace.
+	// This is currently unused.
+	SetTraceInfo(traceID, spanID uint64)
+
+	// SetMaxEvents sets the maximum number of events that will be stored
+	// in the trace. This has no effect if any events have already been
+	// added to the trace.
+	SetMaxEvents(m int)
+
+	// Finish declares that this trace is complete.
+	// The trace should not be used after calling this method.
+	Finish()
+}
+
+type lazySprintf struct {
+	format string
+	a      []interface{}
+}
+
+func (l *lazySprintf) String() string {
+	return fmt.Sprintf(l.format, l.a...)
+}
+
+// New returns a new Trace with the specified family and title.
+func New(family, title string) Trace {
+	tr := newTrace()
+	tr.ref()
+	tr.Family, tr.Title = family, title
+	tr.Start = time.Now()
+	tr.events = make([]event, 0, maxEventsPerTrace)
+
+	activeMu.RLock()
+	s := activeTraces[tr.Family]
+	activeMu.RUnlock()
+	if s == nil {
+		activeMu.Lock()
+		s = activeTraces[tr.Family] // check again
+		if s == nil {
+			s = new(traceSet)
+			activeTraces[tr.Family] = s
+		}
+		activeMu.Unlock()
+	}
+	s.Add(tr)
+
+	// Trigger allocation of the completed trace structure for this family.
+	// This will cause the family to be present in the request page during
+	// the first trace of this family. We don't care about the return value,
+	// nor is there any need for this to run inline, so we execute it in its
+	// own goroutine, but only if the family isn't allocated yet.
+	completedMu.RLock()
+	if _, ok := completedTraces[tr.Family]; !ok {
+		go allocFamily(tr.Family)
+	}
+	completedMu.RUnlock()
+
+	return tr
+}
+
+func (tr *trace) Finish() {
+	tr.Elapsed = time.Now().Sub(tr.Start)
+	if DebugUseAfterFinish {
+		buf := make([]byte, 4<<10) // 4 KB should be enough
+		n := runtime.Stack(buf, false)
+		tr.finishStack = buf[:n]
+	}
+
+	activeMu.RLock()
+	m := activeTraces[tr.Family]
+	activeMu.RUnlock()
+	m.Remove(tr)
+
+	f := getFamily(tr.Family, true)
+	for _, b := range f.Buckets {
+		if b.Cond.match(tr) {
+			b.Add(tr)
+		}
+	}
+	// Add a sample of elapsed time as microseconds to the family's timeseries
+	h := new(histogram)
+	h.addMeasurement(tr.Elapsed.Nanoseconds() / 1e3)
+	f.LatencyMu.Lock()
+	f.Latency.Add(h)
+	f.LatencyMu.Unlock()
+
+	tr.unref() // matches ref in New
+}
+
+const (
+	bucketsPerFamily    = 9
+	tracesPerBucket     = 10
+	maxActiveTraces     = 20 // Maximum number of active traces to show.
+	maxEventsPerTrace   = 10
+	numHistogramBuckets = 38
+)
+
+var (
+	// The active traces.
+	activeMu     sync.RWMutex
+	activeTraces = make(map[string]*traceSet) // family -> traces
+
+	// Families of completed traces.
+	completedMu     sync.RWMutex
+	completedTraces = make(map[string]*family) // family -> traces
+)
+
+type traceSet struct {
+	mu sync.RWMutex
+	m  map[*trace]bool
+
+	// We could avoid the entire map scan in FirstN by having a slice of all the traces
+	// ordered by start time, and an index into that from the trace struct, with a periodic
+	// repack of the slice after enough traces finish; we could also use a skip list or similar.
+	// However, that would shift some of the expense from /debug/requests time to RPC time,
+	// which is probably the wrong trade-off.
+}
+
+func (ts *traceSet) Len() int {
+	ts.mu.RLock()
+	defer ts.mu.RUnlock()
+	return len(ts.m)
+}
+
+func (ts *traceSet) Add(tr *trace) {
+	ts.mu.Lock()
+	if ts.m == nil {
+		ts.m = make(map[*trace]bool)
+	}
+	ts.m[tr] = true
+	ts.mu.Unlock()
+}
+
+func (ts *traceSet) Remove(tr *trace) {
+	ts.mu.Lock()
+	delete(ts.m, tr)
+	ts.mu.Unlock()
+}
+
+// FirstN returns the first n traces ordered by time.
+func (ts *traceSet) FirstN(n int) traceList {
+	ts.mu.RLock()
+	defer ts.mu.RUnlock()
+
+	if n > len(ts.m) {
+		n = len(ts.m)
+	}
+	trl := make(traceList, 0, n)
+
+	// Fast path for when no selectivity is needed.
+	if n == len(ts.m) {
+		for tr := range ts.m {
+			tr.ref()
+			trl = append(trl, tr)
+		}
+		sort.Sort(trl)
+		return trl
+	}
+
+	// Pick the oldest n traces.
+	// This is inefficient. See the comment in the traceSet struct.
+	for tr := range ts.m {
+		// Put the first n traces into trl in the order they occur.
+		// When we have n, sort trl, and thereafter maintain its order.
+		if len(trl) < n {
+			tr.ref()
+			trl = append(trl, tr)
+			if len(trl) == n {
+				// This is guaranteed to happen exactly once during this loop.
+				sort.Sort(trl)
+			}
+			continue
+		}
+		if tr.Start.After(trl[n-1].Start) {
+			continue
+		}
+
+		// Find where to insert this one.
+		tr.ref()
+		i := sort.Search(n, func(i int) bool { return trl[i].Start.After(tr.Start) })
+		trl[n-1].unref()
+		copy(trl[i+1:], trl[i:])
+		trl[i] = tr
+	}
+
+	return trl
+}
+
+func getActiveTraces(fam string) traceList {
+	activeMu.RLock()
+	s := activeTraces[fam]
+	activeMu.RUnlock()
+	if s == nil {
+		return nil
+	}
+	return s.FirstN(maxActiveTraces)
+}
+
+func getFamily(fam string, allocNew bool) *family {
+	completedMu.RLock()
+	f := completedTraces[fam]
+	completedMu.RUnlock()
+	if f == nil && allocNew {
+		f = allocFamily(fam)
+	}
+	return f
+}
+
+func allocFamily(fam string) *family {
+	completedMu.Lock()
+	defer completedMu.Unlock()
+	f := completedTraces[fam]
+	if f == nil {
+		f = newFamily()
+		completedTraces[fam] = f
+	}
+	return f
+}
+
+// family represents a set of trace buckets and associated latency information.
+type family struct {
+	// traces may occur in multiple buckets.
+	Buckets [bucketsPerFamily]*traceBucket
+
+	// latency time series
+	LatencyMu sync.RWMutex
+	Latency   *timeseries.MinuteHourSeries
+}
+
+func newFamily() *family {
+	return &family{
+		Buckets: [bucketsPerFamily]*traceBucket{
+			{Cond: minCond(0)},
+			{Cond: minCond(50 * time.Millisecond)},
+			{Cond: minCond(100 * time.Millisecond)},
+			{Cond: minCond(200 * time.Millisecond)},
+			{Cond: minCond(500 * time.Millisecond)},
+			{Cond: minCond(1 * time.Second)},
+			{Cond: minCond(10 * time.Second)},
+			{Cond: minCond(100 * time.Second)},
+			{Cond: errorCond{}},
+		},
+		Latency: timeseries.NewMinuteHourSeries(func() timeseries.Observable { return new(histogram) }),
+	}
+}
+
+// traceBucket represents a size-capped bucket of historic traces,
+// along with a condition for a trace to belong to the bucket.
+type traceBucket struct {
+	Cond cond
+
+	// Ring buffer implementation of a fixed-size FIFO queue.
+	mu     sync.RWMutex
+	buf    [tracesPerBucket]*trace
+	start  int // < tracesPerBucket
+	length int // <= tracesPerBucket
+}
+
+func (b *traceBucket) Add(tr *trace) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+
+	i := b.start + b.length
+	if i >= tracesPerBucket {
+		i -= tracesPerBucket
+	}
+	if b.length == tracesPerBucket {
+		// "Remove" an element from the bucket.
+		b.buf[i].unref()
+		b.start++
+		if b.start == tracesPerBucket {
+			b.start = 0
+		}
+	}
+	b.buf[i] = tr
+	if b.length < tracesPerBucket {
+		b.length++
+	}
+	tr.ref()
+}
+
+// Copy returns a copy of the traces in the bucket.
+// If tracedOnly is true, only the traces with trace information will be returned.
+// The logs will be ref'd before returning; the caller should call
+// the Free method when it is done with them.
+// TODO(dsymonds): keep track of traced requests in separate buckets.
+func (b *traceBucket) Copy(tracedOnly bool) traceList {
+	b.mu.RLock()
+	defer b.mu.RUnlock()
+
+	trl := make(traceList, 0, b.length)
+	for i, x := 0, b.start; i < b.length; i++ {
+		tr := b.buf[x]
+		if !tracedOnly || tr.spanID != 0 {
+			tr.ref()
+			trl = append(trl, tr)
+		}
+		x++
+		if x == b.length {
+			x = 0
+		}
+	}
+	return trl
+}
+
+func (b *traceBucket) Empty() bool {
+	b.mu.RLock()
+	defer b.mu.RUnlock()
+	return b.length == 0
+}
+
+// cond represents a condition on a trace.
+type cond interface {
+	match(t *trace) bool
+	String() string
+}
+
+type minCond time.Duration
+
+func (m minCond) match(t *trace) bool { return t.Elapsed >= time.Duration(m) }
+func (m minCond) String() string      { return fmt.Sprintf("≥%gs", time.Duration(m).Seconds()) }
+
+type errorCond struct{}
+
+func (e errorCond) match(t *trace) bool { return t.IsError }
+func (e errorCond) String() string      { return "errors" }
+
+type traceList []*trace
+
+// Free calls unref on each element of the list.
+func (trl traceList) Free() {
+	for _, t := range trl {
+		t.unref()
+	}
+}
+
+// traceList may be sorted in reverse chronological order.
+func (trl traceList) Len() int           { return len(trl) }
+func (trl traceList) Less(i, j int) bool { return trl[i].Start.After(trl[j].Start) }
+func (trl traceList) Swap(i, j int)      { trl[i], trl[j] = trl[j], trl[i] }
+
+// An event is a timestamped log entry in a trace.
+type event struct {
+	When       time.Time
+	Elapsed    time.Duration // since previous event in trace
+	NewDay     bool          // whether this event is on a different day to the previous event
+	Recyclable bool          // whether this event was passed via LazyLog
+	What       interface{}   // string or fmt.Stringer
+	Sensitive  bool          // whether this event contains sensitive information
+}
+
+// WhenString returns a string representation of the elapsed time of the event.
+// It will include the date if midnight was crossed.
+func (e event) WhenString() string {
+	if e.NewDay {
+		return e.When.Format("2006/01/02 15:04:05.000000")
+	}
+	return e.When.Format("15:04:05.000000")
+}
+
+// discarded represents a number of discarded events.
+// It is stored as *discarded to make it easier to update in-place.
+type discarded int
+
+func (d *discarded) String() string {
+	return fmt.Sprintf("(%d events discarded)", int(*d))
+}
+
+// trace represents an active or complete request,
+// either sent or received by this program.
+type trace struct {
+	// Family is the top-level grouping of traces to which this belongs.
+	Family string
+
+	// Title is the title of this trace.
+	Title string
+
+	// Timing information.
+	Start   time.Time
+	Elapsed time.Duration // zero while active
+
+	// Trace information if non-zero.
+	traceID uint64
+	spanID  uint64
+
+	// Whether this trace resulted in an error.
+	IsError bool
+
+	// Append-only sequence of events (modulo discards).
+	mu     sync.RWMutex
+	events []event
+
+	refs     int32 // how many buckets this is in
+	recycler func(interface{})
+	disc     discarded // scratch space to avoid allocation
+
+	finishStack []byte // where finish was called, if DebugUseAfterFinish is set
+}
+
+func (tr *trace) reset() {
+	// Clear all but the mutex. Mutexes may not be copied, even when unlocked.
+	tr.Family = ""
+	tr.Title = ""
+	tr.Start = time.Time{}
+	tr.Elapsed = 0
+	tr.traceID = 0
+	tr.spanID = 0
+	tr.IsError = false
+	tr.events = nil
+	tr.refs = 0
+	tr.recycler = nil
+	tr.disc = 0
+	tr.finishStack = nil
+}
+
+// delta returns the elapsed time since the last event or the trace start,
+// and whether it spans midnight.
+// L >= tr.mu
+func (tr *trace) delta(t time.Time) (time.Duration, bool) {
+	if len(tr.events) == 0 {
+		return t.Sub(tr.Start), false
+	}
+	prev := tr.events[len(tr.events)-1].When
+	return t.Sub(prev), prev.Day() != t.Day()
+}
+
+func (tr *trace) addEvent(x interface{}, recyclable, sensitive bool) {
+	if DebugUseAfterFinish && tr.finishStack != nil {
+		buf := make([]byte, 4<<10) // 4 KB should be enough
+		n := runtime.Stack(buf, false)
+		log.Printf("net/trace: trace used after finish:\nFinished at:\n%s\nUsed at:\n%s", tr.finishStack, buf[:n])
+	}
+
+	/*
+		NOTE TO DEBUGGERS
+
+		If you are here because your program panicked in this code,
+		it is almost definitely the fault of code using this package,
+		and very unlikely to be the fault of this code.
+
+		The most likely scenario is that some code elsewhere is using
+		a requestz.Trace after its Finish method is called.
+		You can temporarily set the DebugUseAfterFinish var
+		to help discover where that is; do not leave that var set,
+		since it makes this package much less efficient.
+	*/
+
+	e := event{When: time.Now(), What: x, Recyclable: recyclable, Sensitive: sensitive}
+	tr.mu.Lock()
+	e.Elapsed, e.NewDay = tr.delta(e.When)
+	if len(tr.events) < cap(tr.events) {
+		tr.events = append(tr.events, e)
+	} else {
+		// Discard the middle events.
+		di := int((cap(tr.events) - 1) / 2)
+		if d, ok := tr.events[di].What.(*discarded); ok {
+			(*d)++
+		} else {
+			// disc starts at two to count for the event it is replacing,
+			// plus the next one that we are about to drop.
+			tr.disc = 2
+			if tr.recycler != nil && tr.events[di].Recyclable {
+				go tr.recycler(tr.events[di].What)
+			}
+			tr.events[di].What = &tr.disc
+		}
+		// The timestamp of the discarded meta-event should be
+		// the time of the last event it is representing.
+		tr.events[di].When = tr.events[di+1].When
+
+		if tr.recycler != nil && tr.events[di+1].Recyclable {
+			go tr.recycler(tr.events[di+1].What)
+		}
+		copy(tr.events[di+1:], tr.events[di+2:])
+		tr.events[cap(tr.events)-1] = e
+	}
+	tr.mu.Unlock()
+}
+
+func (tr *trace) LazyLog(x fmt.Stringer, sensitive bool) {
+	tr.addEvent(x, true, sensitive)
+}
+
+func (tr *trace) LazyPrintf(format string, a ...interface{}) {
+	tr.addEvent(&lazySprintf{format, a}, false, false)
+}
+
+func (tr *trace) SetError() { tr.IsError = true }
+
+func (tr *trace) SetRecycler(f func(interface{})) {
+	tr.recycler = f
+}
+
+func (tr *trace) SetTraceInfo(traceID, spanID uint64) {
+	tr.traceID, tr.spanID = traceID, spanID
+}
+
+func (tr *trace) SetMaxEvents(m int) {
+	// Always keep at least three events: first, discarded count, last.
+	if len(tr.events) == 0 && m > 3 {
+		tr.events = make([]event, 0, m)
+	}
+}
+
+func (tr *trace) ref() {
+	atomic.AddInt32(&tr.refs, 1)
+}
+
+func (tr *trace) unref() {
+	if atomic.AddInt32(&tr.refs, -1) == 0 {
+		if tr.recycler != nil {
+			// freeTrace clears tr, so we hold tr.recycler and tr.events here.
+			go func(f func(interface{}), es []event) {
+				for _, e := range es {
+					if e.Recyclable {
+						f(e.What)
+					}
+				}
+			}(tr.recycler, tr.events)
+		}
+
+		freeTrace(tr)
+	}
+}
+
+func (tr *trace) When() string {
+	return tr.Start.Format("2006/01/02 15:04:05.000000")
+}
+
+func (tr *trace) ElapsedTime() string {
+	t := tr.Elapsed
+	if t == 0 {
+		// Active trace.
+		t = time.Since(tr.Start)
+	}
+	return fmt.Sprintf("%.6f", t.Seconds())
+}
+
+func (tr *trace) Events() []event {
+	tr.mu.RLock()
+	defer tr.mu.RUnlock()
+	return tr.events
+}
+
+var traceFreeList = make(chan *trace, 1000) // TODO(dsymonds): Use sync.Pool?
+
+// newTrace returns a trace ready to use.
+func newTrace() *trace {
+	select {
+	case tr := <-traceFreeList:
+		return tr
+	default:
+		return new(trace)
+	}
+}
+
+// freeTrace adds tr to traceFreeList if there's room.
+// This is non-blocking.
+func freeTrace(tr *trace) {
+	if DebugUseAfterFinish {
+		return // never reuse
+	}
+	tr.reset()
+	select {
+	case traceFreeList <- tr:
+	default:
+	}
+}
+
+func elapsed(d time.Duration) string {
+	b := []byte(fmt.Sprintf("%.6f", d.Seconds()))
+
+	// For subsecond durations, blank all zeros before decimal point,
+	// and all zeros between the decimal point and the first non-zero digit.
+	if d < time.Second {
+		dot := bytes.IndexByte(b, '.')
+		for i := 0; i < dot; i++ {
+			b[i] = ' '
+		}
+		for i := dot + 1; i < len(b); i++ {
+			if b[i] == '0' {
+				b[i] = ' '
+			} else {
+				break
+			}
+		}
+	}
+
+	return string(b)
+}
+
+var pageTmpl = template.Must(template.New("Page").Funcs(template.FuncMap{
+	"elapsed": elapsed,
+	"add":     func(a, b int) int { return a + b },
+}).Parse(pageHTML))
+
+const pageHTML = `
+{{template "Prolog" .}}
+{{template "StatusTable" .}}
+{{template "Epilog" .}}
+
+{{define "Prolog"}}
+<html>
+	<head>
+	<title>/debug/requests</title>
+	<style type="text/css">
+		body {
+			font-family: sans-serif;
+		}
+		table#tr-status td.family {
+			padding-right: 2em;
+		}
+		table#tr-status td.active {
+			padding-right: 1em;
+		}
+		table#tr-status td.latency-first {
+			padding-left: 1em;
+		}
+		table#tr-status td.empty {
+			color: #aaa;
+		}
+		table#reqs {
+			margin-top: 1em;
+		}
+		table#reqs tr.first {
+			{{if $.Expanded}}font-weight: bold;{{end}}
+		}
+		table#reqs td {
+			font-family: monospace;
+		}
+		table#reqs td.when {
+			text-align: right;
+			white-space: nowrap;
+		}
+		table#reqs td.elapsed {
+			padding: 0 0.5em;
+			text-align: right;
+			white-space: pre;
+			width: 10em;
+		}
+		address {
+			font-size: smaller;
+			margin-top: 5em;
+		}
+	</style>
+	</head>
+	<body>
+
+<h1>/debug/requests</h1>
+{{end}} {{/* end of Prolog */}}
+
+{{define "StatusTable"}}
+<table id="tr-status">
+	{{range $fam := .Families}}
+	<tr>
+		<td class="family">{{$fam}}</td>
+
+		{{$n := index $.ActiveTraceCount $fam}}
+		<td class="active {{if not $n}}empty{{end}}">
+			{{if $n}}<a href="?fam={{$fam}}&b=-1{{if $.Expanded}}&exp=1{{end}}">{{end}}
+			[{{$n}} active]
+			{{if $n}}</a>{{end}}
+		</td>
+
+		{{$f := index $.CompletedTraces $fam}}
+		{{range $i, $b := $f.Buckets}}
+		{{$empty := $b.Empty}}
+		<td {{if $empty}}class="empty"{{end}}>
+		{{if not $empty}}<a href="?fam={{$fam}}&b={{$i}}{{if $.Expanded}}&exp=1{{end}}">{{end}}
+		[{{.Cond}}]
+		{{if not $empty}}</a>{{end}}
+		</td>
+		{{end}}
+
+		{{$nb := len $f.Buckets}}
+		<td class="latency-first">
+		<a href="?fam={{$fam}}&b={{$nb}}">[minute]</a>
+		</td>
+		<td>
+		<a href="?fam={{$fam}}&b={{add $nb 1}}">[hour]</a>
+		</td>
+		<td>
+		<a href="?fam={{$fam}}&b={{add $nb 2}}">[total]</a>
+		</td>
+
+	</tr>
+	{{end}}
+</table>
+{{end}} {{/* end of StatusTable */}}
+
+{{define "Epilog"}}
+{{if $.Traces}}
+<hr />
+<h3>Family: {{$.Family}}</h3>
+
+{{if or $.Expanded $.Traced}}
+  <a href="?fam={{$.Family}}&b={{$.Bucket}}">[Normal/Summary]</a>
+{{else}}
+  [Normal/Summary]
+{{end}}
+
+{{if or (not $.Expanded) $.Traced}}
+  <a href="?fam={{$.Family}}&b={{$.Bucket}}&exp=1">[Normal/Expanded]</a>
+{{else}}
+  [Normal/Expanded]
+{{end}}
+
+{{if not $.Active}}
+	{{if or $.Expanded (not $.Traced)}}
+	<a href="?fam={{$.Family}}&b={{$.Bucket}}&rtraced=1">[Traced/Summary]</a>
+	{{else}}
+	[Traced/Summary]
+	{{end}}
+	{{if or (not $.Expanded) (not $.Traced)}}
+	<a href="?fam={{$.Family}}&b={{$.Bucket}}&exp=1&rtraced=1">[Traced/Expanded]</a>
+        {{else}}
+	[Traced/Expanded]
+	{{end}}
+{{end}}
+
+{{if $.Total}}
+<p><em>Showing <b>{{len $.Traces}}</b> of <b>{{$.Total}}</b> traces.</em></p>
+{{end}}
+
+<table id="reqs">
+	<caption>
+		{{if $.Active}}Active{{else}}Completed{{end}} Requests
+	</caption>
+	<tr><th>When</th><th>Elapsed&nbsp;(s)</th></tr>
+	{{range $tr := $.Traces}}
+	<tr class="first">
+		<td class="when">{{$tr.When}}</td>
+		<td class="elapsed">{{$tr.ElapsedTime}}</td>
+		<td>{{$tr.Title}}</td>
+		{{/* TODO: include traceID/spanID */}}
+	</tr>
+	{{if $.Expanded}}
+	{{range $tr.Events}}
+	<tr>
+		<td class="when">{{.WhenString}}</td>
+		<td class="elapsed">{{elapsed .Elapsed}}</td>
+		<td>{{if or $.ShowSensitive (not .Sensitive)}}... {{.What}}{{else}}<em>[redacted]</em>{{end}}</td>
+	</tr>
+	{{end}}
+	{{end}}
+	{{end}}
+</table>
+{{end}} {{/* if $.Traces */}}
+
+{{if $.Histogram}}
+<h4>Latency (&micro;s) of {{$.Family}} over {{$.HistogramWindow}}</h4>
+{{$.Histogram}}
+{{end}} {{/* if $.Histogram */}}
+
+	</body>
+</html>
+{{end}} {{/* end of Epilog */}}
+`
diff --git a/vendor/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/golang.org/x/sys/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/sys/PATENTS b/vendor/golang.org/x/sys/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/golang.org/x/sys/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/sys/unix/asm.s b/vendor/golang.org/x/sys/unix/asm.s
new file mode 100644
index 0000000000..8ed2fdb94b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm.s
@@ -0,0 +1,10 @@
+// Copyright 2014 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+TEXT ·use(SB),NOSPLIT,$0
+	RET
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_386.s b/vendor/golang.org/x/sys/unix/asm_darwin_386.s
new file mode 100644
index 0000000000..8a7278319e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_darwin_386.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for 386, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s b/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s
new file mode 100644
index 0000000000..6321421f27
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	JMP	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_arm.s b/vendor/golang.org/x/sys/unix/asm_darwin_arm.s
new file mode 100644
index 0000000000..333242d506
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_darwin_arm.s
@@ -0,0 +1,30 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+// +build arm,darwin
+
+#include "textflag.h"
+
+//
+// System call support for ARM, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s b/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s
new file mode 100644
index 0000000000..97e0174371
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s
@@ -0,0 +1,30 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+// +build arm64,darwin
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, Darwin
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
new file mode 100644
index 0000000000..d5ed6726cc
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, DragonFly
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-64
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-88
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-112
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-64
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-88
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_freebsd_386.s b/vendor/golang.org/x/sys/unix/asm_freebsd_386.s
new file mode 100644
index 0000000000..c9a0a26015
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_freebsd_386.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for 386, FreeBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s
new file mode 100644
index 0000000000..35172477c8
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, FreeBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s b/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s
new file mode 100644
index 0000000000..9227c875bf
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s
@@ -0,0 +1,29 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for ARM, FreeBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_386.s b/vendor/golang.org/x/sys/unix/asm_linux_386.s
new file mode 100644
index 0000000000..4db2909323
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_386.s
@@ -0,0 +1,35 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for 386, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
+
+TEXT ·socketcall(SB),NOSPLIT,$0-36
+	JMP	syscall·socketcall(SB)
+
+TEXT ·rawsocketcall(SB),NOSPLIT,$0-36
+	JMP	syscall·rawsocketcall(SB)
+
+TEXT ·seek(SB),NOSPLIT,$0-28
+	JMP	syscall·seek(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
new file mode 100644
index 0000000000..44e25c62f9
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for AMD64, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
+
+TEXT ·gettimeofday(SB),NOSPLIT,$0-16
+	JMP	syscall·gettimeofday(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm.s b/vendor/golang.org/x/sys/unix/asm_linux_arm.s
new file mode 100644
index 0000000000..cf0b574658
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_arm.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for arm, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
+
+TEXT ·seek(SB),NOSPLIT,$0-32
+	B	syscall·seek(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
new file mode 100644
index 0000000000..4be9bfedea
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
@@ -0,0 +1,24 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build arm64
+// +build !gccgo
+
+#include "textflag.h"
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	B	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	B	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	B	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
new file mode 100644
index 0000000000..724e580c4e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
@@ -0,0 +1,28 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build mips64 mips64le
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for mips64, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
new file mode 100644
index 0000000000..8d231feb4b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
@@ -0,0 +1,28 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build ppc64 ppc64le
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for ppc64, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	BR	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	BR	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	BR	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	BR	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
new file mode 100644
index 0000000000..11889859fb
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
@@ -0,0 +1,28 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x
+// +build linux
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for s390x, Linux
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT ·Syscall(SB),NOSPLIT,$0-56
+	BR	syscall·Syscall(SB)
+
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
+	BR	syscall·Syscall6(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+	BR	syscall·RawSyscall(SB)
+
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+	BR	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_netbsd_386.s b/vendor/golang.org/x/sys/unix/asm_netbsd_386.s
new file mode 100644
index 0000000000..48bdcd7632
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_netbsd_386.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for 386, NetBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s
new file mode 100644
index 0000000000..2ede05c72f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, NetBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	JMP	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s b/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s
new file mode 100644
index 0000000000..e8928571c4
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s
@@ -0,0 +1,29 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for ARM, NetBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_openbsd_386.s b/vendor/golang.org/x/sys/unix/asm_openbsd_386.s
new file mode 100644
index 0000000000..00576f3c83
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_openbsd_386.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for 386, OpenBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	JMP	syscall·Syscall9(SB)
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s
new file mode 100644
index 0000000000..790ef77f86
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s
@@ -0,0 +1,29 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for AMD64, OpenBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-56
+	JMP	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
+	JMP	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+	JMP	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s b/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
new file mode 100644
index 0000000000..43ed17a05f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
@@ -0,0 +1,17 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System calls for amd64, Solaris are implemented in runtime/syscall_solaris.go
+//
+
+TEXT ·sysvicall6(SB),NOSPLIT,$0-64
+	JMP	syscall·sysvicall6(SB)
+
+TEXT ·rawSysvicall6(SB),NOSPLIT,$0-64
+	JMP	syscall·rawSysvicall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/bluetooth_linux.go b/vendor/golang.org/x/sys/unix/bluetooth_linux.go
new file mode 100644
index 0000000000..6e32296970
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/bluetooth_linux.go
@@ -0,0 +1,35 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Bluetooth sockets and messages
+
+package unix
+
+// Bluetooth Protocols
+const (
+	BTPROTO_L2CAP  = 0
+	BTPROTO_HCI    = 1
+	BTPROTO_SCO    = 2
+	BTPROTO_RFCOMM = 3
+	BTPROTO_BNEP   = 4
+	BTPROTO_CMTP   = 5
+	BTPROTO_HIDP   = 6
+	BTPROTO_AVDTP  = 7
+)
+
+const (
+	HCI_CHANNEL_RAW     = 0
+	HCI_CHANNEL_USER    = 1
+	HCI_CHANNEL_MONITOR = 2
+	HCI_CHANNEL_CONTROL = 3
+)
+
+// Socketoption Level
+const (
+	SOL_BLUETOOTH = 0x112
+	SOL_HCI       = 0x0
+	SOL_L2CAP     = 0x6
+	SOL_RFCOMM    = 0x12
+	SOL_SCO       = 0x11
+)
diff --git a/vendor/golang.org/x/sys/unix/constants.go b/vendor/golang.org/x/sys/unix/constants.go
new file mode 100644
index 0000000000..a96f0ebc26
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/constants.go
@@ -0,0 +1,13 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+const (
+	R_OK = 0x4
+	W_OK = 0x2
+	X_OK = 0x1
+)
diff --git a/vendor/golang.org/x/sys/unix/env_unix.go b/vendor/golang.org/x/sys/unix/env_unix.go
new file mode 100644
index 0000000000..45e281a047
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/env_unix.go
@@ -0,0 +1,27 @@
+// Copyright 2010 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+// Unix environment variables.
+
+package unix
+
+import "syscall"
+
+func Getenv(key string) (value string, found bool) {
+	return syscall.Getenv(key)
+}
+
+func Setenv(key, value string) error {
+	return syscall.Setenv(key, value)
+}
+
+func Clearenv() {
+	syscall.Clearenv()
+}
+
+func Environ() []string {
+	return syscall.Environ()
+}
diff --git a/vendor/golang.org/x/sys/unix/env_unset.go b/vendor/golang.org/x/sys/unix/env_unset.go
new file mode 100644
index 0000000000..9222262559
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/env_unset.go
@@ -0,0 +1,14 @@
+// Copyright 2014 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.4
+
+package unix
+
+import "syscall"
+
+func Unsetenv(key string) error {
+	// This was added in Go 1.4.
+	return syscall.Unsetenv(key)
+}
diff --git a/vendor/golang.org/x/sys/unix/flock.go b/vendor/golang.org/x/sys/unix/flock.go
new file mode 100644
index 0000000000..ce67a59528
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/flock.go
@@ -0,0 +1,24 @@
+// +build linux darwin freebsd openbsd netbsd dragonfly
+
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
+package unix
+
+import "unsafe"
+
+// fcntl64Syscall is usually SYS_FCNTL, but is overridden on 32-bit Linux
+// systems by flock_linux_32bit.go to be SYS_FCNTL64.
+var fcntl64Syscall uintptr = SYS_FCNTL
+
+// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
+func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
+	_, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(unsafe.Pointer(lk)))
+	if errno == 0 {
+		return nil
+	}
+	return errno
+}
diff --git a/vendor/golang.org/x/sys/unix/flock_linux_32bit.go b/vendor/golang.org/x/sys/unix/flock_linux_32bit.go
new file mode 100644
index 0000000000..362831c3f7
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/flock_linux_32bit.go
@@ -0,0 +1,13 @@
+// +build linux,386 linux,arm
+
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+func init() {
+	// On 32-bit Linux systems, the fcntl syscall that matches Go's
+	// Flock_t type is SYS_FCNTL64, not SYS_FCNTL.
+	fcntl64Syscall = SYS_FCNTL64
+}
diff --git a/vendor/golang.org/x/sys/unix/gccgo.go b/vendor/golang.org/x/sys/unix/gccgo.go
new file mode 100644
index 0000000000..94c8232124
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/gccgo.go
@@ -0,0 +1,46 @@
+// Copyright 2015 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gccgo
+
+package unix
+
+import "syscall"
+
+// We can't use the gc-syntax .s files for gccgo.  On the plus side
+// much of the functionality can be written directly in Go.
+
+//extern gccgoRealSyscall
+func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr)
+
+func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	syscall.Entersyscall()
+	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+	syscall.Exitsyscall()
+	return r, 0, syscall.Errno(errno)
+}
+
+func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	syscall.Entersyscall()
+	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
+	syscall.Exitsyscall()
+	return r, 0, syscall.Errno(errno)
+}
+
+func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	syscall.Entersyscall()
+	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9)
+	syscall.Exitsyscall()
+	return r, 0, syscall.Errno(errno)
+}
+
+func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+	return r, 0, syscall.Errno(errno)
+}
+
+func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
+	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
+	return r, 0, syscall.Errno(errno)
+}
diff --git a/vendor/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c
new file mode 100644
index 0000000000..07f6be0392
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/gccgo_c.c
@@ -0,0 +1,41 @@
+// Copyright 2015 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gccgo
+
+#include <errno.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#define _STRINGIFY2_(x) #x
+#define _STRINGIFY_(x) _STRINGIFY2_(x)
+#define GOSYM_PREFIX _STRINGIFY_(__USER_LABEL_PREFIX__)
+
+// Call syscall from C code because the gccgo support for calling from
+// Go to C does not support varargs functions.
+
+struct ret {
+	uintptr_t r;
+	uintptr_t err;
+};
+
+struct ret
+gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
+{
+	struct ret r;
+
+	errno = 0;
+	r.r = syscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9);
+	r.err = errno;
+	return r;
+}
+
+// Define the use function in C so that it is not inlined.
+
+extern void use(void *) __asm__ (GOSYM_PREFIX GOPKGPATH ".use") __attribute__((noinline));
+
+void
+use(void *p __attribute__ ((unused)))
+{
+}
diff --git a/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
new file mode 100644
index 0000000000..bffe1a77db
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
@@ -0,0 +1,20 @@
+// Copyright 2015 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build gccgo,linux,amd64
+
+package unix
+
+import "syscall"
+
+//extern gettimeofday
+func realGettimeofday(*Timeval, *byte) int32
+
+func gettimeofday(tv *Timeval) (err syscall.Errno) {
+	r := realGettimeofday(tv, nil)
+	if r < 0 {
+		return syscall.GetErrno()
+	}
+	return 0
+}
diff --git a/vendor/golang.org/x/sys/unix/mkpost.go b/vendor/golang.org/x/sys/unix/mkpost.go
new file mode 100644
index 0000000000..ed50d902af
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/mkpost.go
@@ -0,0 +1,62 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+// mkpost processes the output of cgo -godefs to
+// modify the generated types. It is used to clean up
+// the sys API in an architecture specific manner.
+//
+// mkpost is run after cgo -godefs by mkall.sh.
+package main
+
+import (
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"log"
+	"os"
+	"regexp"
+)
+
+func main() {
+	b, err := ioutil.ReadAll(os.Stdin)
+	if err != nil {
+		log.Fatal(err)
+	}
+	s := string(b)
+
+	goarch := os.Getenv("GOARCH")
+	goos := os.Getenv("GOOS")
+	if goarch == "s390x" && goos == "linux" {
+		// Export the types of PtraceRegs fields.
+		re := regexp.MustCompile("ptrace(Psw|Fpregs|Per)")
+		s = re.ReplaceAllString(s, "Ptrace$1")
+
+		// Replace padding fields inserted by cgo with blank identifiers.
+		re = regexp.MustCompile("Pad_cgo[A-Za-z0-9_]*")
+		s = re.ReplaceAllString(s, "_")
+
+		// Replace other unwanted fields with blank identifiers.
+		re = regexp.MustCompile("X_[A-Za-z0-9_]*")
+		s = re.ReplaceAllString(s, "_")
+
+		// Replace the control_regs union with a blank identifier for now.
+		re = regexp.MustCompile("(Control_regs)\\s+\\[0\\]uint64")
+		s = re.ReplaceAllString(s, "_ [0]uint64")
+	}
+
+	// gofmt
+	b, err = format.Source([]byte(s))
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Append this command to the header to show where the new file
+	// came from.
+	re := regexp.MustCompile("(cgo -godefs [a-zA-Z0-9_]+\\.go.*)")
+	b = re.ReplaceAll(b, []byte("$1 | go run mkpost.go"))
+
+	fmt.Printf("%s", b)
+}
diff --git a/vendor/golang.org/x/sys/unix/race.go b/vendor/golang.org/x/sys/unix/race.go
new file mode 100644
index 0000000000..3c7627eb5c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/race.go
@@ -0,0 +1,30 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin,race linux,race freebsd,race
+
+package unix
+
+import (
+	"runtime"
+	"unsafe"
+)
+
+const raceenabled = true
+
+func raceAcquire(addr unsafe.Pointer) {
+	runtime.RaceAcquire(addr)
+}
+
+func raceReleaseMerge(addr unsafe.Pointer) {
+	runtime.RaceReleaseMerge(addr)
+}
+
+func raceReadRange(addr unsafe.Pointer, len int) {
+	runtime.RaceReadRange(addr, len)
+}
+
+func raceWriteRange(addr unsafe.Pointer, len int) {
+	runtime.RaceWriteRange(addr, len)
+}
diff --git a/vendor/golang.org/x/sys/unix/race0.go b/vendor/golang.org/x/sys/unix/race0.go
new file mode 100644
index 0000000000..f8678e0d21
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/race0.go
@@ -0,0 +1,25 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin,!race linux,!race freebsd,!race netbsd openbsd solaris dragonfly
+
+package unix
+
+import (
+	"unsafe"
+)
+
+const raceenabled = false
+
+func raceAcquire(addr unsafe.Pointer) {
+}
+
+func raceReleaseMerge(addr unsafe.Pointer) {
+}
+
+func raceReadRange(addr unsafe.Pointer, len int) {
+}
+
+func raceWriteRange(addr unsafe.Pointer, len int) {
+}
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_linux.go b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
new file mode 100644
index 0000000000..d9ff4731a2
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
@@ -0,0 +1,36 @@
+// Copyright 2011 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Socket control messages
+
+package unix
+
+import "unsafe"
+
+// UnixCredentials encodes credentials into a socket control message
+// for sending to another process. This can be used for
+// authentication.
+func UnixCredentials(ucred *Ucred) []byte {
+	b := make([]byte, CmsgSpace(SizeofUcred))
+	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
+	h.Level = SOL_SOCKET
+	h.Type = SCM_CREDENTIALS
+	h.SetLen(CmsgLen(SizeofUcred))
+	*((*Ucred)(cmsgData(h))) = *ucred
+	return b
+}
+
+// ParseUnixCredentials decodes a socket control message that contains
+// credentials in a Ucred structure. To receive such a message, the
+// SO_PASSCRED option must be enabled on the socket.
+func ParseUnixCredentials(m *SocketControlMessage) (*Ucred, error) {
+	if m.Header.Level != SOL_SOCKET {
+		return nil, EINVAL
+	}
+	if m.Header.Type != SCM_CREDENTIALS {
+		return nil, EINVAL
+	}
+	ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
+	return &ucred, nil
+}
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
new file mode 100644
index 0000000000..f1493a3e6f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
@@ -0,0 +1,103 @@
+// Copyright 2011 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+// Socket control messages
+
+package unix
+
+import "unsafe"
+
+// Round the length of a raw sockaddr up to align it properly.
+func cmsgAlignOf(salen int) int {
+	salign := sizeofPtr
+	// NOTE: It seems like 64-bit Darwin and DragonFly BSD kernels
+	// still require 32-bit aligned access to network subsystem.
+	if darwin64Bit || dragonfly64Bit {
+		salign = 4
+	}
+	return (salen + salign - 1) & ^(salign - 1)
+}
+
+// CmsgLen returns the value to store in the Len field of the Cmsghdr
+// structure, taking into account any necessary alignment.
+func CmsgLen(datalen int) int {
+	return cmsgAlignOf(SizeofCmsghdr) + datalen
+}
+
+// CmsgSpace returns the number of bytes an ancillary element with
+// payload of the passed data length occupies.
+func CmsgSpace(datalen int) int {
+	return cmsgAlignOf(SizeofCmsghdr) + cmsgAlignOf(datalen)
+}
+
+func cmsgData(h *Cmsghdr) unsafe.Pointer {
+	return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(SizeofCmsghdr)))
+}
+
+// SocketControlMessage represents a socket control message.
+type SocketControlMessage struct {
+	Header Cmsghdr
+	Data   []byte
+}
+
+// ParseSocketControlMessage parses b as an array of socket control
+// messages.
+func ParseSocketControlMessage(b []byte) ([]SocketControlMessage, error) {
+	var msgs []SocketControlMessage
+	i := 0
+	for i+CmsgLen(0) <= len(b) {
+		h, dbuf, err := socketControlMessageHeaderAndData(b[i:])
+		if err != nil {
+			return nil, err
+		}
+		m := SocketControlMessage{Header: *h, Data: dbuf}
+		msgs = append(msgs, m)
+		i += cmsgAlignOf(int(h.Len))
+	}
+	return msgs, nil
+}
+
+func socketControlMessageHeaderAndData(b []byte) (*Cmsghdr, []byte, error) {
+	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
+	if h.Len < SizeofCmsghdr || uint64(h.Len) > uint64(len(b)) {
+		return nil, nil, EINVAL
+	}
+	return h, b[cmsgAlignOf(SizeofCmsghdr):h.Len], nil
+}
+
+// UnixRights encodes a set of open file descriptors into a socket
+// control message for sending to another process.
+func UnixRights(fds ...int) []byte {
+	datalen := len(fds) * 4
+	b := make([]byte, CmsgSpace(datalen))
+	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
+	h.Level = SOL_SOCKET
+	h.Type = SCM_RIGHTS
+	h.SetLen(CmsgLen(datalen))
+	data := cmsgData(h)
+	for _, fd := range fds {
+		*(*int32)(data) = int32(fd)
+		data = unsafe.Pointer(uintptr(data) + 4)
+	}
+	return b
+}
+
+// ParseUnixRights decodes a socket control message that contains an
+// integer array of open file descriptors from another process.
+func ParseUnixRights(m *SocketControlMessage) ([]int, error) {
+	if m.Header.Level != SOL_SOCKET {
+		return nil, EINVAL
+	}
+	if m.Header.Type != SCM_RIGHTS {
+		return nil, EINVAL
+	}
+	fds := make([]int, len(m.Data)>>2)
+	for i, j := 0, 0; i < len(m.Data); i += 4 {
+		fds[j] = int(*(*int32)(unsafe.Pointer(&m.Data[i])))
+		j++
+	}
+	return fds, nil
+}
diff --git a/vendor/golang.org/x/sys/unix/str.go b/vendor/golang.org/x/sys/unix/str.go
new file mode 100644
index 0000000000..35ed664353
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/str.go
@@ -0,0 +1,26 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+func itoa(val int) string { // do it here rather than with fmt to avoid dependency
+	if val < 0 {
+		return "-" + uitoa(uint(-val))
+	}
+	return uitoa(uint(val))
+}
+
+func uitoa(val uint) string {
+	var buf [32]byte // big enough for int64
+	i := len(buf) - 1
+	for val >= 10 {
+		buf[i] = byte(val%10 + '0')
+		i--
+		val /= 10
+	}
+	buf[i] = byte(val + '0')
+	return string(buf[i:])
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall.go b/vendor/golang.org/x/sys/unix/syscall.go
new file mode 100644
index 0000000000..a0bcf842ca
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall.go
@@ -0,0 +1,76 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+// Package unix contains an interface to the low-level operating system
+// primitives.  OS details vary depending on the underlying system, and
+// by default, godoc will display OS-specific documentation for the current
+// system.  If you want godoc to display OS documentation for another
+// system, set $GOOS and $GOARCH to the desired system.  For example, if
+// you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
+// to freebsd and $GOARCH to arm.
+// The primary use of this package is inside other packages that provide a more
+// portable interface to the system, such as "os", "time" and "net".  Use
+// those packages rather than this one if you can.
+// For details of the functions and data types in this package consult
+// the manuals for the appropriate operating system.
+// These calls return err == nil to indicate success; otherwise
+// err represents an operating system error describing the failure and
+// holds a value of type syscall.Errno.
+package unix // import "golang.org/x/sys/unix"
+
+import "unsafe"
+
+// ByteSliceFromString returns a NUL-terminated slice of bytes
+// containing the text of s. If s contains a NUL byte at any
+// location, it returns (nil, EINVAL).
+func ByteSliceFromString(s string) ([]byte, error) {
+	for i := 0; i < len(s); i++ {
+		if s[i] == 0 {
+			return nil, EINVAL
+		}
+	}
+	a := make([]byte, len(s)+1)
+	copy(a, s)
+	return a, nil
+}
+
+// BytePtrFromString returns a pointer to a NUL-terminated array of
+// bytes containing the text of s. If s contains a NUL byte at any
+// location, it returns (nil, EINVAL).
+func BytePtrFromString(s string) (*byte, error) {
+	a, err := ByteSliceFromString(s)
+	if err != nil {
+		return nil, err
+	}
+	return &a[0], nil
+}
+
+// Single-word zero for use when we need a valid pointer to 0 bytes.
+// See mkunix.pl.
+var _zero uintptr
+
+func (ts *Timespec) Unix() (sec int64, nsec int64) {
+	return int64(ts.Sec), int64(ts.Nsec)
+}
+
+func (tv *Timeval) Unix() (sec int64, nsec int64) {
+	return int64(tv.Sec), int64(tv.Usec) * 1000
+}
+
+func (ts *Timespec) Nano() int64 {
+	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
+}
+
+func (tv *Timeval) Nano() int64 {
+	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
+}
+
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+
+// use is a no-op, but the compiler cannot see that it is.
+// Calling use(p) ensures that p is kept live until that point.
+//go:noescape
+func use(p unsafe.Pointer)
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go
new file mode 100644
index 0000000000..e9671764cc
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -0,0 +1,628 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd netbsd openbsd
+
+// BSD system call wrappers shared by *BSD based systems
+// including OS X (Darwin) and FreeBSD.  Like the other
+// syscall_*.go files it is compiled as Go code but also
+// used as input to mksyscall which parses the //sys
+// lines and generates system call stubs.
+
+package unix
+
+import (
+	"runtime"
+	"syscall"
+	"unsafe"
+)
+
+/*
+ * Wrapped
+ */
+
+//sysnb	getgroups(ngid int, gid *_Gid_t) (n int, err error)
+//sysnb	setgroups(ngid int, gid *_Gid_t) (err error)
+
+func Getgroups() (gids []int, err error) {
+	n, err := getgroups(0, nil)
+	if err != nil {
+		return nil, err
+	}
+	if n == 0 {
+		return nil, nil
+	}
+
+	// Sanity check group count.  Max is 16 on BSD.
+	if n < 0 || n > 1000 {
+		return nil, EINVAL
+	}
+
+	a := make([]_Gid_t, n)
+	n, err = getgroups(n, &a[0])
+	if err != nil {
+		return nil, err
+	}
+	gids = make([]int, n)
+	for i, v := range a[0:n] {
+		gids[i] = int(v)
+	}
+	return
+}
+
+func Setgroups(gids []int) (err error) {
+	if len(gids) == 0 {
+		return setgroups(0, nil)
+	}
+
+	a := make([]_Gid_t, len(gids))
+	for i, v := range gids {
+		a[i] = _Gid_t(v)
+	}
+	return setgroups(len(a), &a[0])
+}
+
+func ReadDirent(fd int, buf []byte) (n int, err error) {
+	// Final argument is (basep *uintptr) and the syscall doesn't take nil.
+	// 64 bits should be enough. (32 bits isn't even on 386). Since the
+	// actual system call is getdirentries64, 64 is a good guess.
+	// TODO(rsc): Can we use a single global basep for all calls?
+	var base = (*uintptr)(unsafe.Pointer(new(uint64)))
+	return Getdirentries(fd, buf, base)
+}
+
+// Wait status is 7 bits at bottom, either 0 (exited),
+// 0x7F (stopped), or a signal number that caused an exit.
+// The 0x80 bit is whether there was a core dump.
+// An extra number (exit code, signal causing a stop)
+// is in the high bits.
+
+type WaitStatus uint32
+
+const (
+	mask  = 0x7F
+	core  = 0x80
+	shift = 8
+
+	exited  = 0
+	stopped = 0x7F
+)
+
+func (w WaitStatus) Exited() bool { return w&mask == exited }
+
+func (w WaitStatus) ExitStatus() int {
+	if w&mask != exited {
+		return -1
+	}
+	return int(w >> shift)
+}
+
+func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
+
+func (w WaitStatus) Signal() syscall.Signal {
+	sig := syscall.Signal(w & mask)
+	if sig == stopped || sig == 0 {
+		return -1
+	}
+	return sig
+}
+
+func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
+
+func (w WaitStatus) Stopped() bool { return w&mask == stopped && syscall.Signal(w>>shift) != SIGSTOP }
+
+func (w WaitStatus) Continued() bool { return w&mask == stopped && syscall.Signal(w>>shift) == SIGSTOP }
+
+func (w WaitStatus) StopSignal() syscall.Signal {
+	if !w.Stopped() {
+		return -1
+	}
+	return syscall.Signal(w>>shift) & 0xFF
+}
+
+func (w WaitStatus) TrapCause() int { return -1 }
+
+//sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error)
+
+func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
+	var status _C_int
+	wpid, err = wait4(pid, &status, options, rusage)
+	if wstatus != nil {
+		*wstatus = WaitStatus(status)
+	}
+	return
+}
+
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	Shutdown(s int, how int) (err error)
+
+func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Len = SizeofSockaddrInet4
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
+}
+
+func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Len = SizeofSockaddrInet6
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	sa.raw.Scope_id = sa.ZoneId
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
+}
+
+func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	name := sa.Name
+	n := len(name)
+	if n >= len(sa.raw.Path) || n == 0 {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Len = byte(3 + n) // 2 for Family, Len; 1 for NUL
+	sa.raw.Family = AF_UNIX
+	for i := 0; i < n; i++ {
+		sa.raw.Path[i] = int8(name[i])
+	}
+	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
+}
+
+func (sa *SockaddrDatalink) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Index == 0 {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Len = sa.Len
+	sa.raw.Family = AF_LINK
+	sa.raw.Index = sa.Index
+	sa.raw.Type = sa.Type
+	sa.raw.Nlen = sa.Nlen
+	sa.raw.Alen = sa.Alen
+	sa.raw.Slen = sa.Slen
+	for i := 0; i < len(sa.raw.Data); i++ {
+		sa.raw.Data[i] = sa.Data[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrDatalink, nil
+}
+
+func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
+	switch rsa.Addr.Family {
+	case AF_LINK:
+		pp := (*RawSockaddrDatalink)(unsafe.Pointer(rsa))
+		sa := new(SockaddrDatalink)
+		sa.Len = pp.Len
+		sa.Family = pp.Family
+		sa.Index = pp.Index
+		sa.Type = pp.Type
+		sa.Nlen = pp.Nlen
+		sa.Alen = pp.Alen
+		sa.Slen = pp.Slen
+		for i := 0; i < len(sa.Data); i++ {
+			sa.Data[i] = pp.Data[i]
+		}
+		return sa, nil
+
+	case AF_UNIX:
+		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
+		if pp.Len < 2 || pp.Len > SizeofSockaddrUnix {
+			return nil, EINVAL
+		}
+		sa := new(SockaddrUnix)
+
+		// Some BSDs include the trailing NUL in the length, whereas
+		// others do not. Work around this by subtracting the leading
+		// family and len. The path is then scanned to see if a NUL
+		// terminator still exists within the length.
+		n := int(pp.Len) - 2 // subtract leading Family, Len
+		for i := 0; i < n; i++ {
+			if pp.Path[i] == 0 {
+				// found early NUL; assume Len included the NUL
+				// or was overestimating.
+				n = i
+				break
+			}
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
+		return sa, nil
+
+	case AF_INET:
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_INET6:
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		sa.ZoneId = pp.Scope_id
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+	}
+	return nil, EAFNOSUPPORT
+}
+
+func Accept(fd int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept(fd, &rsa, &len)
+	if err != nil {
+		return
+	}
+	if runtime.GOOS == "darwin" && len == 0 {
+		// Accepted socket has no address.
+		// This is likely due to a bug in xnu kernels,
+		// where instead of ECONNABORTED error socket
+		// is accepted, but has no address.
+		Close(nfd)
+		return 0, nil, ECONNABORTED
+	}
+	sa, err = anyToSockaddr(&rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+func Getsockname(fd int) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if err = getsockname(fd, &rsa, &len); err != nil {
+		return
+	}
+	// TODO(jsing): DragonFly has a "bug" (see issue 3349), which should be
+	// reported upstream.
+	if runtime.GOOS == "dragonfly" && rsa.Addr.Family == AF_UNSPEC && rsa.Addr.Len == 0 {
+		rsa.Addr.Family = AF_UNIX
+		rsa.Addr.Len = SizeofSockaddrUnix
+	}
+	return anyToSockaddr(&rsa)
+}
+
+//sysnb socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+
+func GetsockoptByte(fd, level, opt int) (value byte, err error) {
+	var n byte
+	vallen := _Socklen(1)
+	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
+	return n, err
+}
+
+func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
+	vallen := _Socklen(4)
+	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
+	return value, err
+}
+
+func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
+	var value IPMreq
+	vallen := _Socklen(SizeofIPMreq)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
+	var value IPv6Mreq
+	vallen := _Socklen(SizeofIPv6Mreq)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
+	var value IPv6MTUInfo
+	vallen := _Socklen(SizeofIPv6MTUInfo)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
+	var value ICMPv6Filter
+	vallen := _Socklen(SizeofICMPv6Filter)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+//sys   recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys   sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
+	var msg Msghdr
+	var rsa RawSockaddrAny
+	msg.Name = (*byte)(unsafe.Pointer(&rsa))
+	msg.Namelen = uint32(SizeofSockaddrAny)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy byte
+	if len(oob) > 0 {
+		// receive at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
+		msg.SetControllen(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = recvmsg(fd, &msg, flags); err != nil {
+		return
+	}
+	oobn = int(msg.Controllen)
+	recvflags = int(msg.Flags)
+	// source address is only specified if the socket is unconnected
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(&rsa)
+	}
+	return
+}
+
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
+	return
+}
+
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	var ptr unsafe.Pointer
+	var salen _Socklen
+	if to != nil {
+		ptr, salen, err = to.sockaddr()
+		if err != nil {
+			return 0, err
+		}
+	}
+	var msg Msghdr
+	msg.Name = (*byte)(unsafe.Pointer(ptr))
+	msg.Namelen = uint32(salen)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy byte
+	if len(oob) > 0 {
+		// send at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
+		msg.SetControllen(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = sendmsg(fd, &msg, flags); err != nil {
+		return 0, err
+	}
+	if len(oob) > 0 && len(p) == 0 {
+		n = 0
+	}
+	return n, nil
+}
+
+//sys	kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error)
+
+func Kevent(kq int, changes, events []Kevent_t, timeout *Timespec) (n int, err error) {
+	var change, event unsafe.Pointer
+	if len(changes) > 0 {
+		change = unsafe.Pointer(&changes[0])
+	}
+	if len(events) > 0 {
+		event = unsafe.Pointer(&events[0])
+	}
+	return kevent(kq, change, len(changes), event, len(events), timeout)
+}
+
+//sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
+
+// sysctlmib translates name to mib number and appends any additional args.
+func sysctlmib(name string, args ...int) ([]_C_int, error) {
+	// Translate name to mib number.
+	mib, err := nametomib(name)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, a := range args {
+		mib = append(mib, _C_int(a))
+	}
+
+	return mib, nil
+}
+
+func Sysctl(name string) (string, error) {
+	return SysctlArgs(name)
+}
+
+func SysctlArgs(name string, args ...int) (string, error) {
+	mib, err := sysctlmib(name, args...)
+	if err != nil {
+		return "", err
+	}
+
+	// Find size.
+	n := uintptr(0)
+	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
+		return "", err
+	}
+	if n == 0 {
+		return "", nil
+	}
+
+	// Read into buffer of that size.
+	buf := make([]byte, n)
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+		return "", err
+	}
+
+	// Throw away terminating NUL.
+	if n > 0 && buf[n-1] == '\x00' {
+		n--
+	}
+	return string(buf[0:n]), nil
+}
+
+func SysctlUint32(name string) (uint32, error) {
+	return SysctlUint32Args(name)
+}
+
+func SysctlUint32Args(name string, args ...int) (uint32, error) {
+	mib, err := sysctlmib(name, args...)
+	if err != nil {
+		return 0, err
+	}
+
+	n := uintptr(4)
+	buf := make([]byte, 4)
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+		return 0, err
+	}
+	if n != 4 {
+		return 0, EIO
+	}
+	return *(*uint32)(unsafe.Pointer(&buf[0])), nil
+}
+
+func SysctlUint64(name string, args ...int) (uint64, error) {
+	mib, err := sysctlmib(name, args...)
+	if err != nil {
+		return 0, err
+	}
+
+	n := uintptr(8)
+	buf := make([]byte, 8)
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+		return 0, err
+	}
+	if n != 8 {
+		return 0, EIO
+	}
+	return *(*uint64)(unsafe.Pointer(&buf[0])), nil
+}
+
+func SysctlRaw(name string, args ...int) ([]byte, error) {
+	mib, err := sysctlmib(name, args...)
+	if err != nil {
+		return nil, err
+	}
+
+	// Find size.
+	n := uintptr(0)
+	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
+		return nil, err
+	}
+	if n == 0 {
+		return nil, nil
+	}
+
+	// Read into buffer of that size.
+	buf := make([]byte, n)
+	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
+		return nil, err
+	}
+
+	// The actual call may return less than the original reported required
+	// size so ensure we deal with that.
+	return buf[:n], nil
+}
+
+//sys	utimes(path string, timeval *[2]Timeval) (err error)
+
+func Utimes(path string, tv []Timeval) error {
+	if tv == nil {
+		return utimes(path, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func UtimesNano(path string, ts []Timespec) error {
+	if ts == nil {
+		return utimes(path, nil)
+	}
+	// TODO: The BSDs can do utimensat with SYS_UTIMENSAT but it
+	// isn't supported by darwin so this uses utimes instead
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	// Not as efficient as it could be because Timespec and
+	// Timeval have different types in the different OSes
+	tv := [2]Timeval{
+		NsecToTimeval(TimespecToNsec(ts[0])),
+		NsecToTimeval(TimespecToNsec(ts[1])),
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+//sys	futimes(fd int, timeval *[2]Timeval) (err error)
+
+func Futimes(fd int, tv []Timeval) error {
+	if tv == nil {
+		return futimes(fd, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimes(fd, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
+
+// TODO: wrap
+//	Acct(name nil-string) (err error)
+//	Gethostuuid(uuid *byte, timeout *Timespec) (err error)
+//	Madvise(addr *byte, len int, behav int) (err error)
+//	Mprotect(addr *byte, len int, prot int) (err error)
+//	Msync(addr *byte, len int, flags int) (err error)
+//	Ptrace(req int, pid int, addr uintptr, data int) (ret uintptr, err error)
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
new file mode 100644
index 0000000000..0d1771c3fc
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -0,0 +1,509 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Darwin system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import (
+	errorspkg "errors"
+	"syscall"
+	"unsafe"
+)
+
+const ImplementsGetwd = true
+
+func Getwd() (string, error) {
+	buf := make([]byte, 2048)
+	attrs, err := getAttrList(".", attrList{CommonAttr: attrCmnFullpath}, buf, 0)
+	if err == nil && len(attrs) == 1 && len(attrs[0]) >= 2 {
+		wd := string(attrs[0])
+		// Sanity check that it's an absolute path and ends
+		// in a null byte, which we then strip.
+		if wd[0] == '/' && wd[len(wd)-1] == 0 {
+			return wd[:len(wd)-1], nil
+		}
+	}
+	// If pkg/os/getwd.go gets ENOTSUP, it will fall back to the
+	// slow algorithm.
+	return "", ENOTSUP
+}
+
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+	raw    RawSockaddrDatalink
+}
+
+// Translate "kern.hostname" to []_C_int{0,1,2,3}.
+func nametomib(name string) (mib []_C_int, err error) {
+	const siz = unsafe.Sizeof(mib[0])
+
+	// NOTE(rsc): It seems strange to set the buffer to have
+	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
+	// as the size.  I don't know why the +2 is here, but the
+	// kernel uses +2 for its own implementation of this function.
+	// I am scared that if we don't include the +2 here, the kernel
+	// will silently write 2 words farther than we specify
+	// and we'll get memory corruption.
+	var buf [CTL_MAXNAME + 2]_C_int
+	n := uintptr(CTL_MAXNAME) * siz
+
+	p := (*byte)(unsafe.Pointer(&buf[0]))
+	bytes, err := ByteSliceFromString(name)
+	if err != nil {
+		return nil, err
+	}
+
+	// Magic sysctl: "setting" 0.3 to a string name
+	// lets you read back the array of integers form.
+	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
+		return nil, err
+	}
+	return buf[0 : n/siz], nil
+}
+
+// ParseDirent parses up to max directory entries in buf,
+// appending the names to names.  It returns the number
+// bytes consumed from buf, the number of entries added
+// to names, and the new names slice.
+func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
+	origlen := len(buf)
+	for max != 0 && len(buf) > 0 {
+		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
+		if dirent.Reclen == 0 {
+			buf = nil
+			break
+		}
+		buf = buf[dirent.Reclen:]
+		if dirent.Ino == 0 { // File absent in directory.
+			continue
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
+		var name = string(bytes[0:dirent.Namlen])
+		if name == "." || name == ".." { // Useless names
+			continue
+		}
+		max--
+		count++
+		names = append(names, name)
+	}
+	return origlen - len(buf), count, names
+}
+
+//sys   ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
+func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
+func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
+
+const (
+	attrBitMapCount = 5
+	attrCmnFullpath = 0x08000000
+)
+
+type attrList struct {
+	bitmapCount uint16
+	_           uint16
+	CommonAttr  uint32
+	VolAttr     uint32
+	DirAttr     uint32
+	FileAttr    uint32
+	Forkattr    uint32
+}
+
+func getAttrList(path string, attrList attrList, attrBuf []byte, options uint) (attrs [][]byte, err error) {
+	if len(attrBuf) < 4 {
+		return nil, errorspkg.New("attrBuf too small")
+	}
+	attrList.bitmapCount = attrBitMapCount
+
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return nil, err
+	}
+
+	_, _, e1 := Syscall6(
+		SYS_GETATTRLIST,
+		uintptr(unsafe.Pointer(_p0)),
+		uintptr(unsafe.Pointer(&attrList)),
+		uintptr(unsafe.Pointer(&attrBuf[0])),
+		uintptr(len(attrBuf)),
+		uintptr(options),
+		0,
+	)
+	if e1 != 0 {
+		return nil, e1
+	}
+	size := *(*uint32)(unsafe.Pointer(&attrBuf[0]))
+
+	// dat is the section of attrBuf that contains valid data,
+	// without the 4 byte length header. All attribute offsets
+	// are relative to dat.
+	dat := attrBuf
+	if int(size) < len(attrBuf) {
+		dat = dat[:size]
+	}
+	dat = dat[4:] // remove length prefix
+
+	for i := uint32(0); int(i) < len(dat); {
+		header := dat[i:]
+		if len(header) < 8 {
+			return attrs, errorspkg.New("truncated attribute header")
+		}
+		datOff := *(*int32)(unsafe.Pointer(&header[0]))
+		attrLen := *(*uint32)(unsafe.Pointer(&header[4]))
+		if datOff < 0 || uint32(datOff)+attrLen > uint32(len(dat)) {
+			return attrs, errorspkg.New("truncated results; attrBuf too small")
+		}
+		end := uint32(datOff) + attrLen
+		attrs = append(attrs, dat[datOff:end])
+		i = end
+		if r := i % 4; r != 0 {
+			i += (4 - r)
+		}
+	}
+	return
+}
+
+//sysnb pipe() (r int, w int, err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
+func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	var bufsize uintptr
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+	}
+	r0, _, e1 := Syscall(SYS_GETFSSTAT64, uintptr(_p0), bufsize, uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+/*
+ * Wrapped
+ */
+
+//sys	kill(pid int, signum int, posix int) (err error)
+
+func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(signum), 1) }
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exchangedata(path1 string, path2 string, options int) (err error)
+//sys	Exit(code int)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Fstatfs(fd int, stat *Statfs_t) (err error) = SYS_FSTATFS64
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) = SYS_GETDIRENTRIES64
+//sys	Getdtablesize() (size int)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Getuid() (uid int)
+//sysnb	Issetugid() (tainted bool)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sys	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Setlogin(name string) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sys	Setprivexec(flag int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
+//sys	Statfs(path string, stat *Statfs_t) (err error) = SYS_STATFS64
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Undelete(path string) (err error)
+//sys	Unlink(path string) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys   munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+
+/*
+ * Unimplemented
+ */
+// Profil
+// Sigaction
+// Sigprocmask
+// Getlogin
+// Sigpending
+// Sigaltstack
+// Ioctl
+// Reboot
+// Execve
+// Vfork
+// Sbrk
+// Sstk
+// Ovadvise
+// Mincore
+// Setitimer
+// Swapon
+// Select
+// Sigsuspend
+// Readv
+// Writev
+// Nfssvc
+// Getfh
+// Quotactl
+// Mount
+// Csops
+// Waitid
+// Add_profil
+// Kdebug_trace
+// Sigreturn
+// Mmap
+// Mlock
+// Munlock
+// Atsocket
+// Kqueue_from_portset_np
+// Kqueue_portset
+// Getattrlist
+// Setattrlist
+// Getdirentriesattr
+// Searchfs
+// Delete
+// Copyfile
+// Poll
+// Watchevent
+// Waitevent
+// Modwatch
+// Getxattr
+// Fgetxattr
+// Setxattr
+// Fsetxattr
+// Removexattr
+// Fremovexattr
+// Listxattr
+// Flistxattr
+// Fsctl
+// Initgroups
+// Posix_spawn
+// Nfsclnt
+// Fhopen
+// Minherit
+// Semsys
+// Msgsys
+// Shmsys
+// Semctl
+// Semget
+// Semop
+// Msgctl
+// Msgget
+// Msgsnd
+// Msgrcv
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Shm_open
+// Shm_unlink
+// Sem_open
+// Sem_close
+// Sem_unlink
+// Sem_wait
+// Sem_trywait
+// Sem_post
+// Sem_getvalue
+// Sem_init
+// Sem_destroy
+// Open_extended
+// Umask_extended
+// Stat_extended
+// Lstat_extended
+// Fstat_extended
+// Chmod_extended
+// Fchmod_extended
+// Access_extended
+// Settid
+// Gettid
+// Setsgroups
+// Getsgroups
+// Setwgroups
+// Getwgroups
+// Mkfifo_extended
+// Mkdir_extended
+// Identitysvc
+// Shared_region_check_np
+// Shared_region_map_np
+// __pthread_mutex_destroy
+// __pthread_mutex_init
+// __pthread_mutex_lock
+// __pthread_mutex_trylock
+// __pthread_mutex_unlock
+// __pthread_cond_init
+// __pthread_cond_destroy
+// __pthread_cond_broadcast
+// __pthread_cond_signal
+// Setsid_with_pid
+// __pthread_cond_timedwait
+// Aio_fsync
+// Aio_return
+// Aio_suspend
+// Aio_cancel
+// Aio_error
+// Aio_read
+// Aio_write
+// Lio_listio
+// __pthread_cond_wait
+// Iopolicysys
+// Mlockall
+// Munlockall
+// __pthread_kill
+// __pthread_sigmask
+// __sigwait
+// __disable_threadsignal
+// __pthread_markcancel
+// __pthread_canceled
+// __semwait_signal
+// Proc_info
+// sendfile
+// Stat64_extended
+// Lstat64_extended
+// Fstat64_extended
+// __pthread_chdir
+// __pthread_fchdir
+// Audit
+// Auditon
+// Getauid
+// Setauid
+// Getaudit
+// Setaudit
+// Getaudit_addr
+// Setaudit_addr
+// Auditctl
+// Bsdthread_create
+// Bsdthread_terminate
+// Stack_snapshot
+// Bsdthread_register
+// Workq_open
+// Workq_ops
+// __mac_execve
+// __mac_syscall
+// __mac_get_file
+// __mac_set_file
+// __mac_get_link
+// __mac_set_link
+// __mac_get_proc
+// __mac_set_proc
+// __mac_get_fd
+// __mac_set_fd
+// __mac_get_pid
+// __mac_get_lcid
+// __mac_get_lctx
+// __mac_set_lctx
+// Setlcid
+// Read_nocancel
+// Write_nocancel
+// Open_nocancel
+// Close_nocancel
+// Wait4_nocancel
+// Recvmsg_nocancel
+// Sendmsg_nocancel
+// Recvfrom_nocancel
+// Accept_nocancel
+// Msync_nocancel
+// Fcntl_nocancel
+// Select_nocancel
+// Fsync_nocancel
+// Connect_nocancel
+// Sigsuspend_nocancel
+// Readv_nocancel
+// Writev_nocancel
+// Sendto_nocancel
+// Pread_nocancel
+// Pwrite_nocancel
+// Waitid_nocancel
+// Poll_nocancel
+// Msgsnd_nocancel
+// Msgrcv_nocancel
+// Sem_wait_nocancel
+// Aio_suspend_nocancel
+// __sigwait_nocancel
+// __semwait_signal_nocancel
+// __mac_mount
+// __mac_get_mount
+// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_386.go b/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
new file mode 100644
index 0000000000..c172a3da5a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
@@ -0,0 +1,77 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int32(nsec / 1e9)
+	return
+}
+
+//sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused.  The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = int32(sec)
+	tv.Usec = int32(usec)
+	return err
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var length = uint64(count)
+
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(*offset>>32), uintptr(unsafe.Pointer(&length)), 0, 0, 0, 0)
+
+	written = int(length)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/386 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
new file mode 100644
index 0000000000..fc1e5a4a82
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
@@ -0,0 +1,79 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+//sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused.  The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = sec
+	tv.Usec = usec
+	return err
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var length = uint64(count)
+
+	_, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(unsafe.Pointer(&length)), 0, 0)
+
+	written = int(length)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/amd64 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
new file mode 100644
index 0000000000..d286cf408d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
@@ -0,0 +1,71 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int32(nsec / 1e9)
+	return
+}
+
+//sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused.  The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = int32(sec)
+	tv.Usec = int32(usec)
+	return err
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var length = uint64(count)
+
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(*offset>>32), uintptr(unsafe.Pointer(&length)), 0, 0, 0, 0)
+
+	written = int(length)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
new file mode 100644
index 0000000000..c33905cdcd
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
@@ -0,0 +1,77 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm64,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 16384 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+//sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
+func Gettimeofday(tv *Timeval) (err error) {
+	// The tv passed to gettimeofday must be non-nil
+	// but is otherwise unused.  The answers come back
+	// in the two registers.
+	sec, usec, err := gettimeofday(tv)
+	tv.Sec = sec
+	tv.Usec = usec
+	return err
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var length = uint64(count)
+
+	_, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(unsafe.Pointer(&length)), 0, 0)
+
+	written = int(length)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/arm64 the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
new file mode 100644
index 0000000000..fbbe0dce25
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -0,0 +1,411 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// FreeBSD system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import "unsafe"
+
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+	Rcf    uint16
+	Route  [16]uint16
+	raw    RawSockaddrDatalink
+}
+
+// Translate "kern.hostname" to []_C_int{0,1,2,3}.
+func nametomib(name string) (mib []_C_int, err error) {
+	const siz = unsafe.Sizeof(mib[0])
+
+	// NOTE(rsc): It seems strange to set the buffer to have
+	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
+	// as the size.  I don't know why the +2 is here, but the
+	// kernel uses +2 for its own implementation of this function.
+	// I am scared that if we don't include the +2 here, the kernel
+	// will silently write 2 words farther than we specify
+	// and we'll get memory corruption.
+	var buf [CTL_MAXNAME + 2]_C_int
+	n := uintptr(CTL_MAXNAME) * siz
+
+	p := (*byte)(unsafe.Pointer(&buf[0]))
+	bytes, err := ByteSliceFromString(name)
+	if err != nil {
+		return nil, err
+	}
+
+	// Magic sysctl: "setting" 0.3 to a string name
+	// lets you read back the array of integers form.
+	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
+		return nil, err
+	}
+	return buf[0 : n/siz], nil
+}
+
+// ParseDirent parses up to max directory entries in buf,
+// appending the names to names.  It returns the number
+// bytes consumed from buf, the number of entries added
+// to names, and the new names slice.
+func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
+	origlen := len(buf)
+	for max != 0 && len(buf) > 0 {
+		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
+		reclen := int(16+dirent.Namlen+1+7) & ^7
+		buf = buf[reclen:]
+		if dirent.Fileno == 0 { // File absent in directory.
+			continue
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
+		var name = string(bytes[0:dirent.Namlen])
+		if name == "." || name == ".." { // Useless names
+			continue
+		}
+		max--
+		count++
+		names = append(names, name)
+	}
+	return origlen - len(buf), count, names
+}
+
+//sysnb pipe() (r int, w int, err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
+//sys	extpread(fd int, p []byte, flags int, offset int64) (n int, err error)
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	return extpread(fd, p, 0, offset)
+}
+
+//sys	extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error)
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	return extpwrite(fd, p, 0, offset)
+}
+
+func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	var bufsize uintptr
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+	}
+	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exit(code int)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
+//sys	Getdtablesize() (size int)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Issetugid() (tainted bool)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Setlogin(name string) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, stat *Statfs_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Undelete(path string) (err error)
+//sys	Unlink(path string) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys   munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+
+/*
+ * Unimplemented
+ * TODO(jsing): Update this list for DragonFly.
+ */
+// Profil
+// Sigaction
+// Sigprocmask
+// Getlogin
+// Sigpending
+// Sigaltstack
+// Ioctl
+// Reboot
+// Execve
+// Vfork
+// Sbrk
+// Sstk
+// Ovadvise
+// Mincore
+// Setitimer
+// Swapon
+// Select
+// Sigsuspend
+// Readv
+// Writev
+// Nfssvc
+// Getfh
+// Quotactl
+// Mount
+// Csops
+// Waitid
+// Add_profil
+// Kdebug_trace
+// Sigreturn
+// Mmap
+// Atsocket
+// Kqueue_from_portset_np
+// Kqueue_portset
+// Getattrlist
+// Setattrlist
+// Getdirentriesattr
+// Searchfs
+// Delete
+// Copyfile
+// Poll
+// Watchevent
+// Waitevent
+// Modwatch
+// Getxattr
+// Fgetxattr
+// Setxattr
+// Fsetxattr
+// Removexattr
+// Fremovexattr
+// Listxattr
+// Flistxattr
+// Fsctl
+// Initgroups
+// Posix_spawn
+// Nfsclnt
+// Fhopen
+// Minherit
+// Semsys
+// Msgsys
+// Shmsys
+// Semctl
+// Semget
+// Semop
+// Msgctl
+// Msgget
+// Msgsnd
+// Msgrcv
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Shm_open
+// Shm_unlink
+// Sem_open
+// Sem_close
+// Sem_unlink
+// Sem_wait
+// Sem_trywait
+// Sem_post
+// Sem_getvalue
+// Sem_init
+// Sem_destroy
+// Open_extended
+// Umask_extended
+// Stat_extended
+// Lstat_extended
+// Fstat_extended
+// Chmod_extended
+// Fchmod_extended
+// Access_extended
+// Settid
+// Gettid
+// Setsgroups
+// Getsgroups
+// Setwgroups
+// Getwgroups
+// Mkfifo_extended
+// Mkdir_extended
+// Identitysvc
+// Shared_region_check_np
+// Shared_region_map_np
+// __pthread_mutex_destroy
+// __pthread_mutex_init
+// __pthread_mutex_lock
+// __pthread_mutex_trylock
+// __pthread_mutex_unlock
+// __pthread_cond_init
+// __pthread_cond_destroy
+// __pthread_cond_broadcast
+// __pthread_cond_signal
+// Setsid_with_pid
+// __pthread_cond_timedwait
+// Aio_fsync
+// Aio_return
+// Aio_suspend
+// Aio_cancel
+// Aio_error
+// Aio_read
+// Aio_write
+// Lio_listio
+// __pthread_cond_wait
+// Iopolicysys
+// __pthread_kill
+// __pthread_sigmask
+// __sigwait
+// __disable_threadsignal
+// __pthread_markcancel
+// __pthread_canceled
+// __semwait_signal
+// Proc_info
+// Stat64_extended
+// Lstat64_extended
+// Fstat64_extended
+// __pthread_chdir
+// __pthread_fchdir
+// Audit
+// Auditon
+// Getauid
+// Setauid
+// Getaudit
+// Setaudit
+// Getaudit_addr
+// Setaudit_addr
+// Auditctl
+// Bsdthread_create
+// Bsdthread_terminate
+// Stack_snapshot
+// Bsdthread_register
+// Workq_open
+// Workq_ops
+// __mac_execve
+// __mac_syscall
+// __mac_get_file
+// __mac_set_file
+// __mac_get_link
+// __mac_set_link
+// __mac_get_proc
+// __mac_set_proc
+// __mac_get_fd
+// __mac_set_fd
+// __mac_get_pid
+// __mac_get_lcid
+// __mac_get_lctx
+// __mac_set_lctx
+// Setlcid
+// Read_nocancel
+// Write_nocancel
+// Open_nocancel
+// Close_nocancel
+// Wait4_nocancel
+// Recvmsg_nocancel
+// Sendmsg_nocancel
+// Recvfrom_nocancel
+// Accept_nocancel
+// Msync_nocancel
+// Fcntl_nocancel
+// Select_nocancel
+// Fsync_nocancel
+// Connect_nocancel
+// Sigsuspend_nocancel
+// Readv_nocancel
+// Writev_nocancel
+// Sendto_nocancel
+// Pread_nocancel
+// Pwrite_nocancel
+// Waitid_nocancel
+// Poll_nocancel
+// Msgsnd_nocancel
+// Msgrcv_nocancel
+// Sem_wait_nocancel
+// Aio_suspend_nocancel
+// __sigwait_nocancel
+// __semwait_signal_nocancel
+// __mac_mount
+// __mac_get_mount
+// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
new file mode 100644
index 0000000000..da7cb7982c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
@@ -0,0 +1,61 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,dragonfly
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = nsec % 1e9 / 1e3
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var writtenOut uint64 = 0
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
+
+	written = int(writtenOut)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
new file mode 100644
index 0000000000..ec56ed608a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
@@ -0,0 +1,682 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// FreeBSD system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import "unsafe"
+
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [46]int8
+	raw    RawSockaddrDatalink
+}
+
+// Translate "kern.hostname" to []_C_int{0,1,2,3}.
+func nametomib(name string) (mib []_C_int, err error) {
+	const siz = unsafe.Sizeof(mib[0])
+
+	// NOTE(rsc): It seems strange to set the buffer to have
+	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
+	// as the size.  I don't know why the +2 is here, but the
+	// kernel uses +2 for its own implementation of this function.
+	// I am scared that if we don't include the +2 here, the kernel
+	// will silently write 2 words farther than we specify
+	// and we'll get memory corruption.
+	var buf [CTL_MAXNAME + 2]_C_int
+	n := uintptr(CTL_MAXNAME) * siz
+
+	p := (*byte)(unsafe.Pointer(&buf[0]))
+	bytes, err := ByteSliceFromString(name)
+	if err != nil {
+		return nil, err
+	}
+
+	// Magic sysctl: "setting" 0.3 to a string name
+	// lets you read back the array of integers form.
+	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
+		return nil, err
+	}
+	return buf[0 : n/siz], nil
+}
+
+// ParseDirent parses up to max directory entries in buf,
+// appending the names to names.  It returns the number
+// bytes consumed from buf, the number of entries added
+// to names, and the new names slice.
+func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
+	origlen := len(buf)
+	for max != 0 && len(buf) > 0 {
+		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
+		if dirent.Reclen == 0 {
+			buf = nil
+			break
+		}
+		buf = buf[dirent.Reclen:]
+		if dirent.Fileno == 0 { // File absent in directory.
+			continue
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
+		var name = string(bytes[0:dirent.Namlen])
+		if name == "." || name == ".." { // Useless names
+			continue
+		}
+		max--
+		count++
+		names = append(names, name)
+	}
+	return origlen - len(buf), count, names
+}
+
+//sysnb pipe() (r int, w int, err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
+func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
+	var value IPMreqn
+	vallen := _Socklen(SizeofIPMreqn)
+	errno := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, errno
+}
+
+func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
+}
+
+func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept4(fd, &rsa, &len, flags)
+	if err != nil {
+		return
+	}
+	if len > SizeofSockaddrAny {
+		panic("RawSockaddrAny too small")
+	}
+	sa, err = anyToSockaddr(&rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	var bufsize uintptr
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+	}
+	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// Derive extattr namespace and attribute name
+
+func xattrnamespace(fullattr string) (ns int, attr string, err error) {
+	s := -1
+	for idx, val := range fullattr {
+		if val == '.' {
+			s = idx
+			break
+		}
+	}
+
+	if s == -1 {
+		return -1, "", ENOATTR
+	}
+
+	namespace := fullattr[0:s]
+	attr = fullattr[s+1:]
+
+	switch namespace {
+	case "user":
+		return EXTATTR_NAMESPACE_USER, attr, nil
+	case "system":
+		return EXTATTR_NAMESPACE_SYSTEM, attr, nil
+	default:
+		return -1, "", ENOATTR
+	}
+}
+
+func initxattrdest(dest []byte, idx int) (d unsafe.Pointer) {
+	if len(dest) > idx {
+		return unsafe.Pointer(&dest[idx])
+	} else {
+		return unsafe.Pointer(_zero)
+	}
+}
+
+// FreeBSD implements its own syscalls to handle extended attributes
+
+func Getxattr(file string, attr string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsize := len(dest)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return -1, err
+	}
+
+	return ExtattrGetFile(file, nsid, a, uintptr(d), destsize)
+}
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsize := len(dest)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return -1, err
+	}
+
+	return ExtattrGetFd(fd, nsid, a, uintptr(d), destsize)
+}
+
+func Lgetxattr(link string, attr string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsize := len(dest)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return -1, err
+	}
+
+	return ExtattrGetLink(link, nsid, a, uintptr(d), destsize)
+}
+
+// flags are unused on FreeBSD
+
+func Fsetxattr(fd int, attr string, data []byte, flags int) (err error) {
+	d := unsafe.Pointer(&data[0])
+	datasiz := len(data)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	_, err = ExtattrSetFd(fd, nsid, a, uintptr(d), datasiz)
+	return
+}
+
+func Setxattr(file string, attr string, data []byte, flags int) (err error) {
+	d := unsafe.Pointer(&data[0])
+	datasiz := len(data)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	_, err = ExtattrSetFile(file, nsid, a, uintptr(d), datasiz)
+	return
+}
+
+func Lsetxattr(link string, attr string, data []byte, flags int) (err error) {
+	d := unsafe.Pointer(&data[0])
+	datasiz := len(data)
+
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	_, err = ExtattrSetLink(link, nsid, a, uintptr(d), datasiz)
+	return
+}
+
+func Removexattr(file string, attr string) (err error) {
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	err = ExtattrDeleteFile(file, nsid, a)
+	return
+}
+
+func Fremovexattr(fd int, attr string) (err error) {
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	err = ExtattrDeleteFd(fd, nsid, a)
+	return
+}
+
+func Lremovexattr(link string, attr string) (err error) {
+	nsid, a, err := xattrnamespace(attr)
+	if err != nil {
+		return
+	}
+
+	err = ExtattrDeleteLink(link, nsid, a)
+	return
+}
+
+func Listxattr(file string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsiz := len(dest)
+
+	// FreeBSD won't allow you to list xattrs from multiple namespaces
+	s := 0
+	var e error
+	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
+		stmp, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
+
+		/* Errors accessing system attrs are ignored so that
+		 * we can implement the Linux-like behavior of omitting errors that
+		 * we don't have read permissions on
+		 *
+		 * Linux will still error if we ask for user attributes on a file that
+		 * we don't have read permissions on, so don't ignore those errors
+		 */
+		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+			e = nil
+			continue
+		} else if e != nil {
+			return s, e
+		}
+
+		s += stmp
+		destsiz -= s
+		if destsiz < 0 {
+			destsiz = 0
+		}
+		d = initxattrdest(dest, s)
+	}
+
+	return s, e
+}
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsiz := len(dest)
+
+	s := 0
+	var e error
+	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
+		stmp, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
+		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+			e = nil
+			continue
+		} else if e != nil {
+			return s, e
+		}
+
+		s += stmp
+		destsiz -= s
+		if destsiz < 0 {
+			destsiz = 0
+		}
+		d = initxattrdest(dest, s)
+	}
+
+	return s, e
+}
+
+func Llistxattr(link string, dest []byte) (sz int, err error) {
+	d := initxattrdest(dest, 0)
+	destsiz := len(dest)
+
+	s := 0
+	var e error
+	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
+		stmp, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
+		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+			e = nil
+			continue
+		} else if e != nil {
+			return s, e
+		}
+
+		s += stmp
+		destsiz -= s
+		if destsiz < 0 {
+			destsiz = 0
+		}
+		d = initxattrdest(dest, s)
+	}
+
+	return s, e
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exit(code int)
+//sys	ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error)
+//sys	ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error)
+//sys	ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
+//sys	ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error)
+//sys	ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_POSIX_FADVISE
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
+//sys	Getdtablesize() (size int)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Issetugid() (tainted bool)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Setlogin(name string) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, stat *Statfs_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Undelete(path string) (err error)
+//sys	Unlink(path string) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys   munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+//sys	accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
+
+/*
+ * Unimplemented
+ */
+// Profil
+// Sigaction
+// Sigprocmask
+// Getlogin
+// Sigpending
+// Sigaltstack
+// Ioctl
+// Reboot
+// Execve
+// Vfork
+// Sbrk
+// Sstk
+// Ovadvise
+// Mincore
+// Setitimer
+// Swapon
+// Select
+// Sigsuspend
+// Readv
+// Writev
+// Nfssvc
+// Getfh
+// Quotactl
+// Mount
+// Csops
+// Waitid
+// Add_profil
+// Kdebug_trace
+// Sigreturn
+// Mmap
+// Mlock
+// Munlock
+// Atsocket
+// Kqueue_from_portset_np
+// Kqueue_portset
+// Getattrlist
+// Setattrlist
+// Getdirentriesattr
+// Searchfs
+// Delete
+// Copyfile
+// Poll
+// Watchevent
+// Waitevent
+// Modwatch
+// Getxattr
+// Fgetxattr
+// Setxattr
+// Fsetxattr
+// Removexattr
+// Fremovexattr
+// Listxattr
+// Flistxattr
+// Fsctl
+// Initgroups
+// Posix_spawn
+// Nfsclnt
+// Fhopen
+// Minherit
+// Semsys
+// Msgsys
+// Shmsys
+// Semctl
+// Semget
+// Semop
+// Msgctl
+// Msgget
+// Msgsnd
+// Msgrcv
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Shm_open
+// Shm_unlink
+// Sem_open
+// Sem_close
+// Sem_unlink
+// Sem_wait
+// Sem_trywait
+// Sem_post
+// Sem_getvalue
+// Sem_init
+// Sem_destroy
+// Open_extended
+// Umask_extended
+// Stat_extended
+// Lstat_extended
+// Fstat_extended
+// Chmod_extended
+// Fchmod_extended
+// Access_extended
+// Settid
+// Gettid
+// Setsgroups
+// Getsgroups
+// Setwgroups
+// Getwgroups
+// Mkfifo_extended
+// Mkdir_extended
+// Identitysvc
+// Shared_region_check_np
+// Shared_region_map_np
+// __pthread_mutex_destroy
+// __pthread_mutex_init
+// __pthread_mutex_lock
+// __pthread_mutex_trylock
+// __pthread_mutex_unlock
+// __pthread_cond_init
+// __pthread_cond_destroy
+// __pthread_cond_broadcast
+// __pthread_cond_signal
+// Setsid_with_pid
+// __pthread_cond_timedwait
+// Aio_fsync
+// Aio_return
+// Aio_suspend
+// Aio_cancel
+// Aio_error
+// Aio_read
+// Aio_write
+// Lio_listio
+// __pthread_cond_wait
+// Iopolicysys
+// Mlockall
+// Munlockall
+// __pthread_kill
+// __pthread_sigmask
+// __sigwait
+// __disable_threadsignal
+// __pthread_markcancel
+// __pthread_canceled
+// __semwait_signal
+// Proc_info
+// Stat64_extended
+// Lstat64_extended
+// Fstat64_extended
+// __pthread_chdir
+// __pthread_fchdir
+// Audit
+// Auditon
+// Getauid
+// Setauid
+// Getaudit
+// Setaudit
+// Getaudit_addr
+// Setaudit_addr
+// Auditctl
+// Bsdthread_create
+// Bsdthread_terminate
+// Stack_snapshot
+// Bsdthread_register
+// Workq_open
+// Workq_ops
+// __mac_execve
+// __mac_syscall
+// __mac_get_file
+// __mac_set_file
+// __mac_get_link
+// __mac_set_link
+// __mac_get_proc
+// __mac_set_proc
+// __mac_get_fd
+// __mac_set_fd
+// __mac_get_pid
+// __mac_get_lcid
+// __mac_get_lctx
+// __mac_set_lctx
+// Setlcid
+// Read_nocancel
+// Write_nocancel
+// Open_nocancel
+// Close_nocancel
+// Wait4_nocancel
+// Recvmsg_nocancel
+// Sendmsg_nocancel
+// Recvfrom_nocancel
+// Accept_nocancel
+// Msync_nocancel
+// Fcntl_nocancel
+// Select_nocancel
+// Fsync_nocancel
+// Connect_nocancel
+// Sigsuspend_nocancel
+// Readv_nocancel
+// Writev_nocancel
+// Sendto_nocancel
+// Pread_nocancel
+// Pwrite_nocancel
+// Waitid_nocancel
+// Poll_nocancel
+// Msgsnd_nocancel
+// Msgrcv_nocancel
+// Sem_wait_nocancel
+// Aio_suspend_nocancel
+// __sigwait_nocancel
+// __semwait_signal_nocancel
+// __mac_mount
+// __mac_get_mount
+// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
new file mode 100644
index 0000000000..6a0cd804d8
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
@@ -0,0 +1,61 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386,freebsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int32(nsec / 1e9)
+	return
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var writtenOut uint64 = 0
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
+
+	written = int(writtenOut)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
new file mode 100644
index 0000000000..e142540efa
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
@@ -0,0 +1,61 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,freebsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = nsec % 1e9 / 1e3
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var writtenOut uint64 = 0
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
+
+	written = int(writtenOut)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
new file mode 100644
index 0000000000..5504cb1255
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
@@ -0,0 +1,61 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm,freebsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return ts.Sec*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = int32(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = nsec / 1e9
+	return
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	var writtenOut uint64 = 0
+	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
+
+	written = int(writtenOut)
+
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
new file mode 100644
index 0000000000..9ca104c957
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -0,0 +1,1108 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Linux system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and
+// wrap it in our own nicer implementation.
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+/*
+ * Wrapped
+ */
+
+func Access(path string, mode uint32) (err error) {
+	return Faccessat(AT_FDCWD, path, mode, 0)
+}
+
+func Chmod(path string, mode uint32) (err error) {
+	return Fchmodat(AT_FDCWD, path, mode, 0)
+}
+
+func Chown(path string, uid int, gid int) (err error) {
+	return Fchownat(AT_FDCWD, path, uid, gid, 0)
+}
+
+func Creat(path string, mode uint32) (fd int, err error) {
+	return Open(path, O_CREAT|O_WRONLY|O_TRUNC, mode)
+}
+
+//sys	Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error)
+
+func Link(oldpath string, newpath string) (err error) {
+	return Linkat(AT_FDCWD, oldpath, AT_FDCWD, newpath, 0)
+}
+
+func Mkdir(path string, mode uint32) (err error) {
+	return Mkdirat(AT_FDCWD, path, mode)
+}
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	return Mknodat(AT_FDCWD, path, mode, dev)
+}
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	return openat(AT_FDCWD, path, mode|O_LARGEFILE, perm)
+}
+
+//sys	openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
+
+func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	return openat(dirfd, path, flags|O_LARGEFILE, mode)
+}
+
+//sys	readlinkat(dirfd int, path string, buf []byte) (n int, err error)
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	return readlinkat(AT_FDCWD, path, buf)
+}
+
+func Rename(oldpath string, newpath string) (err error) {
+	return Renameat(AT_FDCWD, oldpath, AT_FDCWD, newpath)
+}
+
+func Rmdir(path string) error {
+	return unlinkat(AT_FDCWD, path, AT_REMOVEDIR)
+}
+
+//sys	symlinkat(oldpath string, newdirfd int, newpath string) (err error)
+
+func Symlink(oldpath string, newpath string) (err error) {
+	return symlinkat(oldpath, AT_FDCWD, newpath)
+}
+
+func Unlink(path string) error {
+	return unlinkat(AT_FDCWD, path, 0)
+}
+
+//sys	unlinkat(dirfd int, path string, flags int) (err error)
+
+func Unlinkat(dirfd int, path string, flags int) error {
+	return unlinkat(dirfd, path, flags)
+}
+
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+func Utimes(path string, tv []Timeval) error {
+	if tv == nil {
+		err := utimensat(AT_FDCWD, path, nil, 0)
+		if err != ENOSYS {
+			return err
+		}
+		return utimes(path, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	var ts [2]Timespec
+	ts[0] = NsecToTimespec(TimevalToNsec(tv[0]))
+	ts[1] = NsecToTimespec(TimevalToNsec(tv[1]))
+	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+	if err != ENOSYS {
+		return err
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
+
+func UtimesNano(path string, ts []Timespec) error {
+	if ts == nil {
+		err := utimensat(AT_FDCWD, path, nil, 0)
+		if err != ENOSYS {
+			return err
+		}
+		return utimes(path, nil)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+	if err != ENOSYS {
+		return err
+	}
+	// If the utimensat syscall isn't available (utimensat was added to Linux
+	// in 2.6.22, Released, 8 July 2007) then fall back to utimes
+	var tv [2]Timeval
+	for i := 0; i < 2; i++ {
+		tv[i].Sec = ts[i].Sec
+		tv[i].Usec = ts[i].Nsec / 1000
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
+	if ts == nil {
+		return utimensat(dirfd, path, nil, flags)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
+}
+
+//sys	futimesat(dirfd int, path *byte, times *[2]Timeval) (err error)
+
+func Futimesat(dirfd int, path string, tv []Timeval) error {
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	if tv == nil {
+		return futimesat(dirfd, pathp, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func Futimes(fd int, tv []Timeval) (err error) {
+	// Believe it or not, this is the best we can do on Linux
+	// (and is what glibc does).
+	return Utimes("/proc/self/fd/"+itoa(fd), tv)
+}
+
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error)
+
+func Getwd() (wd string, err error) {
+	var buf [PathMax]byte
+	n, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	// Getcwd returns the number of bytes written to buf, including the NUL.
+	if n < 1 || n > len(buf) || buf[n-1] != 0 {
+		return "", EINVAL
+	}
+	return string(buf[0 : n-1]), nil
+}
+
+func Getgroups() (gids []int, err error) {
+	n, err := getgroups(0, nil)
+	if err != nil {
+		return nil, err
+	}
+	if n == 0 {
+		return nil, nil
+	}
+
+	// Sanity check group count.  Max is 1<<16 on Linux.
+	if n < 0 || n > 1<<20 {
+		return nil, EINVAL
+	}
+
+	a := make([]_Gid_t, n)
+	n, err = getgroups(n, &a[0])
+	if err != nil {
+		return nil, err
+	}
+	gids = make([]int, n)
+	for i, v := range a[0:n] {
+		gids[i] = int(v)
+	}
+	return
+}
+
+func Setgroups(gids []int) (err error) {
+	if len(gids) == 0 {
+		return setgroups(0, nil)
+	}
+
+	a := make([]_Gid_t, len(gids))
+	for i, v := range gids {
+		a[i] = _Gid_t(v)
+	}
+	return setgroups(len(a), &a[0])
+}
+
+type WaitStatus uint32
+
+// Wait status is 7 bits at bottom, either 0 (exited),
+// 0x7F (stopped), or a signal number that caused an exit.
+// The 0x80 bit is whether there was a core dump.
+// An extra number (exit code, signal causing a stop)
+// is in the high bits.  At least that's the idea.
+// There are various irregularities.  For example, the
+// "continued" status is 0xFFFF, distinguishing itself
+// from stopped via the core dump bit.
+
+const (
+	mask    = 0x7F
+	core    = 0x80
+	exited  = 0x00
+	stopped = 0x7F
+	shift   = 8
+)
+
+func (w WaitStatus) Exited() bool { return w&mask == exited }
+
+func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != exited }
+
+func (w WaitStatus) Stopped() bool { return w&0xFF == stopped }
+
+func (w WaitStatus) Continued() bool { return w == 0xFFFF }
+
+func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
+
+func (w WaitStatus) ExitStatus() int {
+	if !w.Exited() {
+		return -1
+	}
+	return int(w>>shift) & 0xFF
+}
+
+func (w WaitStatus) Signal() syscall.Signal {
+	if !w.Signaled() {
+		return -1
+	}
+	return syscall.Signal(w & mask)
+}
+
+func (w WaitStatus) StopSignal() syscall.Signal {
+	if !w.Stopped() {
+		return -1
+	}
+	return syscall.Signal(w>>shift) & 0xFF
+}
+
+func (w WaitStatus) TrapCause() int {
+	if w.StopSignal() != SIGTRAP {
+		return -1
+	}
+	return int(w>>shift) >> 8
+}
+
+//sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error)
+
+func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
+	var status _C_int
+	wpid, err = wait4(pid, &status, options, rusage)
+	if wstatus != nil {
+		*wstatus = WaitStatus(status)
+	}
+	return
+}
+
+func Mkfifo(path string, mode uint32) (err error) {
+	return Mknod(path, mode|S_IFIFO, 0)
+}
+
+func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
+}
+
+func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	sa.raw.Scope_id = sa.ZoneId
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
+}
+
+func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	name := sa.Name
+	n := len(name)
+	if n >= len(sa.raw.Path) {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_UNIX
+	for i := 0; i < n; i++ {
+		sa.raw.Path[i] = int8(name[i])
+	}
+	// length is family (uint16), name, NUL.
+	sl := _Socklen(2)
+	if n > 0 {
+		sl += _Socklen(n) + 1
+	}
+	if sa.raw.Path[0] == '@' {
+		sa.raw.Path[0] = 0
+		// Don't count trailing NUL for abstract address.
+		sl--
+	}
+
+	return unsafe.Pointer(&sa.raw), sl, nil
+}
+
+type SockaddrLinklayer struct {
+	Protocol uint16
+	Ifindex  int
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]byte
+	raw      RawSockaddrLinklayer
+}
+
+func (sa *SockaddrLinklayer) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Ifindex < 0 || sa.Ifindex > 0x7fffffff {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_PACKET
+	sa.raw.Protocol = sa.Protocol
+	sa.raw.Ifindex = int32(sa.Ifindex)
+	sa.raw.Hatype = sa.Hatype
+	sa.raw.Pkttype = sa.Pkttype
+	sa.raw.Halen = sa.Halen
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrLinklayer, nil
+}
+
+type SockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+	raw    RawSockaddrNetlink
+}
+
+func (sa *SockaddrNetlink) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_NETLINK
+	sa.raw.Pad = sa.Pad
+	sa.raw.Pid = sa.Pid
+	sa.raw.Groups = sa.Groups
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrNetlink, nil
+}
+
+type SockaddrHCI struct {
+	Dev     uint16
+	Channel uint16
+	raw     RawSockaddrHCI
+}
+
+func (sa *SockaddrHCI) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_BLUETOOTH
+	sa.raw.Dev = sa.Dev
+	sa.raw.Channel = sa.Channel
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrHCI, nil
+}
+
+func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
+	switch rsa.Addr.Family {
+	case AF_NETLINK:
+		pp := (*RawSockaddrNetlink)(unsafe.Pointer(rsa))
+		sa := new(SockaddrNetlink)
+		sa.Family = pp.Family
+		sa.Pad = pp.Pad
+		sa.Pid = pp.Pid
+		sa.Groups = pp.Groups
+		return sa, nil
+
+	case AF_PACKET:
+		pp := (*RawSockaddrLinklayer)(unsafe.Pointer(rsa))
+		sa := new(SockaddrLinklayer)
+		sa.Protocol = pp.Protocol
+		sa.Ifindex = int(pp.Ifindex)
+		sa.Hatype = pp.Hatype
+		sa.Pkttype = pp.Pkttype
+		sa.Halen = pp.Halen
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_UNIX:
+		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
+		sa := new(SockaddrUnix)
+		if pp.Path[0] == 0 {
+			// "Abstract" Unix domain socket.
+			// Rewrite leading NUL as @ for textual display.
+			// (This is the standard convention.)
+			// Not friendly to overwrite in place,
+			// but the callers below don't care.
+			pp.Path[0] = '@'
+		}
+
+		// Assume path ends at NUL.
+		// This is not technically the Linux semantics for
+		// abstract Unix domain sockets--they are supposed
+		// to be uninterpreted fixed-size binary blobs--but
+		// everyone uses this convention.
+		n := 0
+		for n < len(pp.Path) && pp.Path[n] != 0 {
+			n++
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
+		return sa, nil
+
+	case AF_INET:
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_INET6:
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		sa.ZoneId = pp.Scope_id
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+	}
+	return nil, EAFNOSUPPORT
+}
+
+func Accept(fd int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept(fd, &rsa, &len)
+	if err != nil {
+		return
+	}
+	sa, err = anyToSockaddr(&rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept4(fd, &rsa, &len, flags)
+	if err != nil {
+		return
+	}
+	if len > SizeofSockaddrAny {
+		panic("RawSockaddrAny too small")
+	}
+	sa, err = anyToSockaddr(&rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+func Getsockname(fd int) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if err = getsockname(fd, &rsa, &len); err != nil {
+		return
+	}
+	return anyToSockaddr(&rsa)
+}
+
+func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
+	vallen := _Socklen(4)
+	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
+	return value, err
+}
+
+func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
+	var value IPMreq
+	vallen := _Socklen(SizeofIPMreq)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
+	var value IPMreqn
+	vallen := _Socklen(SizeofIPMreqn)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
+	var value IPv6Mreq
+	vallen := _Socklen(SizeofIPv6Mreq)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
+	var value IPv6MTUInfo
+	vallen := _Socklen(SizeofIPv6MTUInfo)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
+	var value ICMPv6Filter
+	vallen := _Socklen(SizeofICMPv6Filter)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptUcred(fd, level, opt int) (*Ucred, error) {
+	var value Ucred
+	vallen := _Socklen(SizeofUcred)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
+}
+
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
+	var msg Msghdr
+	var rsa RawSockaddrAny
+	msg.Name = (*byte)(unsafe.Pointer(&rsa))
+	msg.Namelen = uint32(SizeofSockaddrAny)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy byte
+	if len(oob) > 0 {
+		// receive at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
+		msg.SetControllen(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = recvmsg(fd, &msg, flags); err != nil {
+		return
+	}
+	oobn = int(msg.Controllen)
+	recvflags = int(msg.Flags)
+	// source address is only specified if the socket is unconnected
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(&rsa)
+	}
+	return
+}
+
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
+	return
+}
+
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	var ptr unsafe.Pointer
+	var salen _Socklen
+	if to != nil {
+		var err error
+		ptr, salen, err = to.sockaddr()
+		if err != nil {
+			return 0, err
+		}
+	}
+	var msg Msghdr
+	msg.Name = (*byte)(unsafe.Pointer(ptr))
+	msg.Namelen = uint32(salen)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy byte
+	if len(oob) > 0 {
+		// send at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
+		msg.SetControllen(len(oob))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = sendmsg(fd, &msg, flags); err != nil {
+		return 0, err
+	}
+	if len(oob) > 0 && len(p) == 0 {
+		n = 0
+	}
+	return n, nil
+}
+
+// BindToDevice binds the socket associated with fd to device.
+func BindToDevice(fd int, device string) (err error) {
+	return SetsockoptString(fd, SOL_SOCKET, SO_BINDTODEVICE, device)
+}
+
+//sys	ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
+
+func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err error) {
+	// The peek requests are machine-size oriented, so we wrap it
+	// to retrieve arbitrary-length data.
+
+	// The ptrace syscall differs from glibc's ptrace.
+	// Peeks returns the word in *data, not as the return value.
+
+	var buf [sizeofPtr]byte
+
+	// Leading edge.  PEEKTEXT/PEEKDATA don't require aligned
+	// access (PEEKUSER warns that it might), but if we don't
+	// align our reads, we might straddle an unmapped page
+	// boundary and not get the bytes leading up to the page
+	// boundary.
+	n := 0
+	if addr%sizeofPtr != 0 {
+		err = ptrace(req, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
+		if err != nil {
+			return 0, err
+		}
+		n += copy(out, buf[addr%sizeofPtr:])
+		out = out[n:]
+	}
+
+	// Remainder.
+	for len(out) > 0 {
+		// We use an internal buffer to guarantee alignment.
+		// It's not documented if this is necessary, but we're paranoid.
+		err = ptrace(req, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
+		if err != nil {
+			return n, err
+		}
+		copied := copy(out, buf[0:])
+		n += copied
+		out = out[copied:]
+	}
+
+	return n, nil
+}
+
+func PtracePeekText(pid int, addr uintptr, out []byte) (count int, err error) {
+	return ptracePeek(PTRACE_PEEKTEXT, pid, addr, out)
+}
+
+func PtracePeekData(pid int, addr uintptr, out []byte) (count int, err error) {
+	return ptracePeek(PTRACE_PEEKDATA, pid, addr, out)
+}
+
+func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (count int, err error) {
+	// As for ptracePeek, we need to align our accesses to deal
+	// with the possibility of straddling an invalid page.
+
+	// Leading edge.
+	n := 0
+	if addr%sizeofPtr != 0 {
+		var buf [sizeofPtr]byte
+		err = ptrace(peekReq, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
+		if err != nil {
+			return 0, err
+		}
+		n += copy(buf[addr%sizeofPtr:], data)
+		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
+		err = ptrace(pokeReq, pid, addr-addr%sizeofPtr, word)
+		if err != nil {
+			return 0, err
+		}
+		data = data[n:]
+	}
+
+	// Interior.
+	for len(data) > sizeofPtr {
+		word := *((*uintptr)(unsafe.Pointer(&data[0])))
+		err = ptrace(pokeReq, pid, addr+uintptr(n), word)
+		if err != nil {
+			return n, err
+		}
+		n += sizeofPtr
+		data = data[sizeofPtr:]
+	}
+
+	// Trailing edge.
+	if len(data) > 0 {
+		var buf [sizeofPtr]byte
+		err = ptrace(peekReq, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
+		if err != nil {
+			return n, err
+		}
+		copy(buf[0:], data)
+		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
+		err = ptrace(pokeReq, pid, addr+uintptr(n), word)
+		if err != nil {
+			return n, err
+		}
+		n += len(data)
+	}
+
+	return n, nil
+}
+
+func PtracePokeText(pid int, addr uintptr, data []byte) (count int, err error) {
+	return ptracePoke(PTRACE_POKETEXT, PTRACE_PEEKTEXT, pid, addr, data)
+}
+
+func PtracePokeData(pid int, addr uintptr, data []byte) (count int, err error) {
+	return ptracePoke(PTRACE_POKEDATA, PTRACE_PEEKDATA, pid, addr, data)
+}
+
+func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+func PtraceSetRegs(pid int, regs *PtraceRegs) (err error) {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+func PtraceSetOptions(pid int, options int) (err error) {
+	return ptrace(PTRACE_SETOPTIONS, pid, 0, uintptr(options))
+}
+
+func PtraceGetEventMsg(pid int) (msg uint, err error) {
+	var data _C_long
+	err = ptrace(PTRACE_GETEVENTMSG, pid, 0, uintptr(unsafe.Pointer(&data)))
+	msg = uint(data)
+	return
+}
+
+func PtraceCont(pid int, signal int) (err error) {
+	return ptrace(PTRACE_CONT, pid, 0, uintptr(signal))
+}
+
+func PtraceSyscall(pid int, signal int) (err error) {
+	return ptrace(PTRACE_SYSCALL, pid, 0, uintptr(signal))
+}
+
+func PtraceSingleStep(pid int) (err error) { return ptrace(PTRACE_SINGLESTEP, pid, 0, 0) }
+
+func PtraceAttach(pid int) (err error) { return ptrace(PTRACE_ATTACH, pid, 0, 0) }
+
+func PtraceDetach(pid int) (err error) { return ptrace(PTRACE_DETACH, pid, 0, 0) }
+
+//sys	reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error)
+
+func Reboot(cmd int) (err error) {
+	return reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, "")
+}
+
+func clen(n []byte) int {
+	for i := 0; i < len(n); i++ {
+		if n[i] == 0 {
+			return i
+		}
+	}
+	return len(n)
+}
+
+func ReadDirent(fd int, buf []byte) (n int, err error) {
+	return Getdents(fd, buf)
+}
+
+func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
+	origlen := len(buf)
+	count = 0
+	for max != 0 && len(buf) > 0 {
+		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
+		buf = buf[dirent.Reclen:]
+		if dirent.Ino == 0 { // File absent in directory.
+			continue
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
+		var name = string(bytes[0:clen(bytes[:])])
+		if name == "." || name == ".." { // Useless names
+			continue
+		}
+		max--
+		count++
+		names = append(names, name)
+	}
+	return origlen - len(buf), count, names
+}
+
+//sys	mount(source string, target string, fstype string, flags uintptr, data *byte) (err error)
+
+func Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
+	// Certain file systems get rather angry and EINVAL if you give
+	// them an empty string of data, rather than NULL.
+	if data == "" {
+		return mount(source, target, fstype, flags, nil)
+	}
+	datap, err := BytePtrFromString(data)
+	if err != nil {
+		return err
+	}
+	return mount(source, target, fstype, flags, datap)
+}
+
+// Sendto
+// Recvfrom
+// Socketpair
+
+/*
+ * Direct access
+ */
+//sys	Acct(path string) (err error)
+//sys	Adjtimex(buf *Timex) (state int, err error)
+//sys	Chdir(path string) (err error)
+//sys	Chroot(path string) (err error)
+//sys	ClockGettime(clockid int32, time *Timespec) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(oldfd int) (fd int, err error)
+//sys	Dup3(oldfd int, newfd int, flags int) (err error)
+//sysnb	EpollCreate(size int) (fd int, err error)
+//sysnb	EpollCreate1(flag int) (fd int, err error)
+//sysnb	EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error)
+//sys	Exit(code int) = SYS_EXIT_GROUP
+//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fallocate(fd int, mode uint32, off int64, len int64) (err error)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
+//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
+//sys	Fdatasync(fd int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Getdents(fd int, buf []byte) (n int, err error) = SYS_GETDENTS64
+//sysnb	Getpgid(pid int) (pgid int, err error)
+
+func Getpgrp() (pid int) {
+	pid, _ = Getpgid(0)
+	return
+}
+
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Gettid() (tid int)
+//sys	Getxattr(path string, attr string, dest []byte) (sz int, err error)
+//sys	InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error)
+//sysnb	InotifyInit1(flags int) (fd int, err error)
+//sysnb	InotifyRmWatch(fd int, watchdesc uint32) (success int, err error)
+//sysnb	Kill(pid int, sig syscall.Signal) (err error)
+//sys	Klogctl(typ int, buf []byte) (n int, err error) = SYS_SYSLOG
+//sys	Listxattr(path string, dest []byte) (sz int, err error)
+//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
+//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT
+//sysnb prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) = SYS_PRLIMIT64
+//sys   Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Removexattr(path string, attr string) (err error)
+//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
+//sys	Setdomainname(p []byte) (err error)
+//sys	Sethostname(p []byte) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tv *Timeval) (err error)
+//sys	Setns(fd int, nstype int) (err error)
+
+// issue 1435.
+// On linux Setuid and Setgid only affects the current thread, not the process.
+// This does not match what most callers expect so we must return an error
+// here rather than letting the caller think that the call succeeded.
+
+func Setuid(uid int) (err error) {
+	return EOPNOTSUPP
+}
+
+func Setgid(uid int) (err error) {
+	return EOPNOTSUPP
+}
+
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
+//sys	Sync()
+//sysnb	Sysinfo(info *Sysinfo_t) (err error)
+//sys	Tee(rfd int, wfd int, len int, flags int) (n int64, err error)
+//sysnb	Tgkill(tgid int, tid int, sig syscall.Signal) (err error)
+//sysnb	Times(tms *Tms) (ticks uintptr, err error)
+//sysnb	Umask(mask int) (oldmask int)
+//sysnb	Uname(buf *Utsname) (err error)
+//sys	Unmount(target string, flags int) (err error) = SYS_UMOUNT2
+//sys	Unshare(flags int) (err error)
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys	exitThread(code int) (err error) = SYS_EXIT
+//sys	readlen(fd int, p *byte, np int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, p *byte, np int) (n int, err error) = SYS_WRITE
+
+// mmap varies by architecture; see syscall_linux_*.go.
+//sys	munmap(addr uintptr, length uintptr) (err error)
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
+//sys	Madvise(b []byte, advice int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Munlockall() (err error)
+
+/*
+ * Unimplemented
+ */
+// AddKey
+// AfsSyscall
+// Alarm
+// ArchPrctl
+// Brk
+// Capget
+// Capset
+// ClockGetres
+// ClockNanosleep
+// ClockSettime
+// Clone
+// CreateModule
+// DeleteModule
+// EpollCtlOld
+// EpollPwait
+// EpollWaitOld
+// Eventfd
+// Execve
+// Fgetxattr
+// Flistxattr
+// Fork
+// Fremovexattr
+// Fsetxattr
+// Futex
+// GetKernelSyms
+// GetMempolicy
+// GetRobustList
+// GetThreadArea
+// Getitimer
+// Getpmsg
+// IoCancel
+// IoDestroy
+// IoGetevents
+// IoSetup
+// IoSubmit
+// Ioctl
+// IoprioGet
+// IoprioSet
+// KexecLoad
+// Keyctl
+// Lgetxattr
+// Llistxattr
+// LookupDcookie
+// Lremovexattr
+// Lsetxattr
+// Mbind
+// MigratePages
+// Mincore
+// ModifyLdt
+// Mount
+// MovePages
+// Mprotect
+// MqGetsetattr
+// MqNotify
+// MqOpen
+// MqTimedreceive
+// MqTimedsend
+// MqUnlink
+// Mremap
+// Msgctl
+// Msgget
+// Msgrcv
+// Msgsnd
+// Msync
+// Newfstatat
+// Nfsservctl
+// Personality
+// Poll
+// Ppoll
+// Pselect6
+// Ptrace
+// Putpmsg
+// QueryModule
+// Quotactl
+// Readahead
+// Readv
+// RemapFilePages
+// RequestKey
+// RestartSyscall
+// RtSigaction
+// RtSigpending
+// RtSigprocmask
+// RtSigqueueinfo
+// RtSigreturn
+// RtSigsuspend
+// RtSigtimedwait
+// SchedGetPriorityMax
+// SchedGetPriorityMin
+// SchedGetaffinity
+// SchedGetparam
+// SchedGetscheduler
+// SchedRrGetInterval
+// SchedSetaffinity
+// SchedSetparam
+// SchedYield
+// Security
+// Semctl
+// Semget
+// Semop
+// Semtimedop
+// SetMempolicy
+// SetRobustList
+// SetThreadArea
+// SetTidAddress
+// Shmat
+// Shmctl
+// Shmdt
+// Shmget
+// Sigaltstack
+// Signalfd
+// Swapoff
+// Swapon
+// Sysfs
+// TimerCreate
+// TimerDelete
+// TimerGetoverrun
+// TimerGettime
+// TimerSettime
+// Timerfd
+// Tkill (obsolete)
+// Tuxcall
+// Umount2
+// Uselib
+// Utimensat
+// Vfork
+// Vhangup
+// Vmsplice
+// Vserver
+// Waitid
+// _Sysctl
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
new file mode 100644
index 0000000000..bea01cb506
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
@@ -0,0 +1,390 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// TODO(rsc): Rewrite all nn(SP) references into name+(nn-8)(FP)
+// so that go vet can check that they are correct.
+
+// +build 386,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = int32(nsec / 1e9)
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	return
+}
+
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+// 64-bit file system and 32-bit uid calls
+// (386 default is 32-bit file system and 16-bit uid).
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64_64
+//sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
+//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
+//sysnb	Getegid() (egid int) = SYS_GETEGID32
+//sysnb	Geteuid() (euid int) = SYS_GETEUID32
+//sysnb	Getgid() (gid int) = SYS_GETGID32
+//sysnb	Getuid() (uid int) = SYS_GETUID32
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Ioperm(from int, num int, on int) (err error)
+//sys	Iopl(level int) (err error)
+//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
+//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
+//sys	Setfsgid(gid int) (err error) = SYS_SETFSGID32
+//sys	Setfsuid(uid int) (err error) = SYS_SETFSUID32
+//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
+//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
+//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error) = SYS_GETGROUPS32
+//sysnb	setgroups(n int, list *_Gid_t) (err error) = SYS_SETGROUPS32
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
+
+//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Pause() (err error)
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	page := uintptr(offset / 4096)
+	if offset != int64(page)*4096 {
+		return 0, EINVAL
+	}
+	return mmap2(addr, length, prot, flags, fd, page)
+}
+
+type rlimit32 struct {
+	Cur uint32
+	Max uint32
+}
+
+//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_GETRLIMIT
+
+const rlimInf32 = ^uint32(0)
+const rlimInf64 = ^uint64(0)
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, nil, rlim)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	err = getrlimit(resource, &rl)
+	if err != nil {
+		return
+	}
+
+	if rl.Cur == rlimInf32 {
+		rlim.Cur = rlimInf64
+	} else {
+		rlim.Cur = uint64(rl.Cur)
+	}
+
+	if rl.Max == rlimInf32 {
+		rlim.Max = rlimInf64
+	} else {
+		rlim.Max = uint64(rl.Max)
+	}
+	return
+}
+
+//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	if rlim.Cur == rlimInf64 {
+		rl.Cur = rlimInf32
+	} else if rlim.Cur < uint64(rlimInf32) {
+		rl.Cur = uint32(rlim.Cur)
+	} else {
+		return EINVAL
+	}
+	if rlim.Max == rlimInf64 {
+		rl.Max = rlimInf32
+	} else if rlim.Max < uint64(rlimInf32) {
+		rl.Max = uint32(rlim.Max)
+	} else {
+		return EINVAL
+	}
+
+	return setrlimit(resource, &rl)
+}
+
+// Underlying system call writes to newoffset via pointer.
+// Implemented in assembly to avoid allocation.
+func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	newoffset, errno := seek(fd, offset, whence)
+	if errno != 0 {
+		return 0, errno
+	}
+	return newoffset, nil
+}
+
+// Vsyscalls on amd64.
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Time(t *Time_t) (tt Time_t, err error)
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
+// On x86 Linux, all the socket calls go through an extra indirection,
+// I think because the 5-register system call interface can't handle
+// the 6-argument calls like sendto and recvfrom.  Instead the
+// arguments to the underlying system call are the number below
+// and a pointer to an array of uintptr.  We hide the pointer in the
+// socketcall assembly to avoid allocation on every system call.
+
+const (
+	// see linux/net.h
+	_SOCKET      = 1
+	_BIND        = 2
+	_CONNECT     = 3
+	_LISTEN      = 4
+	_ACCEPT      = 5
+	_GETSOCKNAME = 6
+	_GETPEERNAME = 7
+	_SOCKETPAIR  = 8
+	_SEND        = 9
+	_RECV        = 10
+	_SENDTO      = 11
+	_RECVFROM    = 12
+	_SHUTDOWN    = 13
+	_SETSOCKOPT  = 14
+	_GETSOCKOPT  = 15
+	_SENDMSG     = 16
+	_RECVMSG     = 17
+	_ACCEPT4     = 18
+	_RECVMMSG    = 19
+	_SENDMMSG    = 20
+)
+
+func socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, err syscall.Errno)
+func rawsocketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, err syscall.Errno)
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	fd, e := socketcall(_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	fd, e := socketcall(_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, e := rawsocketcall(_GETSOCKNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, e := rawsocketcall(_GETPEERNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func socketpair(domain int, typ int, flags int, fd *[2]int32) (err error) {
+	_, e := rawsocketcall(_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, e := socketcall(_BIND, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, e := socketcall(_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	fd, e := rawsocketcall(_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, e := socketcall(_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, e := socketcall(_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), vallen, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	n, e := socketcall(_RECVFROM, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func sendto(s int, p []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	_, e := socketcall(_SENDTO, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	n, e := socketcall(_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	n, e := socketcall(_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Listen(s int, n int) (err error) {
+	_, e := socketcall(_LISTEN, uintptr(s), uintptr(n), 0, 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Shutdown(s, how int) (err error) {
+	_, e := socketcall(_SHUTDOWN, uintptr(s), uintptr(how), 0, 0, 0, 0)
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(pathp)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func (r *PtraceRegs) PC() uint64 { return uint64(uint32(r.Eip)) }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Eip = int32(pc) }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
new file mode 100644
index 0000000000..721f24b68d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
@@ -0,0 +1,148 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,linux
+
+package unix
+
+import "syscall"
+
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Ioperm(from int, num int, on int) (err error)
+//sys	Iopl(level int) (err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+//go:noescape
+func gettimeofday(tv *Timeval) (err syscall.Errno)
+
+func Gettimeofday(tv *Timeval) (err error) {
+	errno := gettimeofday(tv)
+	if errno != 0 {
+		return errno
+	}
+	return nil
+}
+
+func Getpagesize() int { return 4096 }
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	var tv Timeval
+	errno := gettimeofday(&tv)
+	if errno != 0 {
+		return 0, errno
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
+}
+
+//sysnb	pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Rip }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Rip = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
new file mode 100644
index 0000000000..122df649af
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
@@ -0,0 +1,254 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = int32(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = int32(nsec / 1e9)
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	return
+}
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+// Underlying system call writes to newoffset via pointer.
+// Implemented in assembly to avoid allocation.
+func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	newoffset, errno := seek(fd, offset, whence)
+	if errno != 0 {
+		return 0, errno
+	}
+	return newoffset, nil
+}
+
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error) = SYS_GETGROUPS32
+//sysnb	setgroups(n int, list *_Gid_t) (err error) = SYS_SETGROUPS32
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	socketpair(domain int, typ int, flags int, fd *[2]int32) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+
+// 64-bit file system and 32-bit uid calls
+// (16-bit uid calls are not always supported in newer kernels)
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
+//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sysnb	Getegid() (egid int) = SYS_GETEGID32
+//sysnb	Geteuid() (euid int) = SYS_GETEUID32
+//sysnb	Getgid() (gid int) = SYS_GETGID32
+//sysnb	Getuid() (uid int) = SYS_GETUID32
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
+//sys	Listen(s int, n int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
+//sys	Setfsgid(gid int) (err error) = SYS_SETFSGID32
+//sys	Setfsuid(uid int) (err error) = SYS_SETFSUID32
+//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
+//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
+//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
+
+// Vsyscalls on amd64.
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Pause() (err error)
+
+func Time(t *Time_t) (Time_t, error) {
+	var tv Timeval
+	err := Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+func Utime(path string, buf *Utimbuf) error {
+	tv := []Timeval{
+		{Sec: buf.Actime},
+		{Sec: buf.Modtime},
+	}
+	return Utimes(path, tv)
+}
+
+//sys   Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys   Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
+//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_ARM_FADVISE64_64, uintptr(fd), uintptr(advice), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(pathp)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
+	if e != 0 {
+		err = e
+	}
+	return
+}
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	page := uintptr(offset / 4096)
+	if offset != int64(page)*4096 {
+		return 0, EINVAL
+	}
+	return mmap2(addr, length, prot, flags, fd, page)
+}
+
+type rlimit32 struct {
+	Cur uint32
+	Max uint32
+}
+
+//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_UGETRLIMIT
+
+const rlimInf32 = ^uint32(0)
+const rlimInf64 = ^uint64(0)
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, nil, rlim)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	err = getrlimit(resource, &rl)
+	if err != nil {
+		return
+	}
+
+	if rl.Cur == rlimInf32 {
+		rlim.Cur = rlimInf64
+	} else {
+		rlim.Cur = uint64(rl.Cur)
+	}
+
+	if rl.Max == rlimInf32 {
+		rlim.Max = rlimInf64
+	} else {
+		rlim.Max = uint64(rl.Max)
+	}
+	return
+}
+
+//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	err = prlimit(0, resource, rlim, nil)
+	if err != ENOSYS {
+		return err
+	}
+
+	rl := rlimit32{}
+	if rlim.Cur == rlimInf64 {
+		rl.Cur = rlimInf32
+	} else if rlim.Cur < uint64(rlimInf32) {
+		rl.Cur = uint32(rlim.Cur)
+	} else {
+		return EINVAL
+	}
+	if rlim.Max == rlimInf64 {
+		rl.Max = rlimInf32
+	} else if rlim.Max < uint64(rlimInf32) {
+		rl.Max = uint32(rlim.Max)
+	} else {
+		return EINVAL
+	}
+
+	return setrlimit(resource, &rl)
+}
+
+func (r *PtraceRegs) PC() uint64 { return uint64(r.Uregs[15]) }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Uregs[15] = uint32(pc) }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
new file mode 100644
index 0000000000..d105186803
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
@@ -0,0 +1,180 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm64,linux
+
+package unix
+
+const _SYS_dup = SYS_DUP3
+
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Listen(s int, n int) (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+
+func Stat(path string, stat *Stat_t) (err error) {
+	return Fstatat(AT_FDCWD, path, stat, 0)
+}
+
+func Lchown(path string, uid int, gid int) (err error) {
+	return Fchownat(AT_FDCWD, path, uid, gid, AT_SYMLINK_NOFOLLOW)
+}
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	return Fstatat(AT_FDCWD, path, stat, AT_SYMLINK_NOFOLLOW)
+}
+
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+func Getpagesize() int { return 65536 }
+
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
+}
+
+func Time(t *Time_t) (Time_t, error) {
+	var tv Timeval
+	err := Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+func Utime(path string, buf *Utimbuf) error {
+	tv := []Timeval{
+		{Sec: buf.Actime},
+		{Sec: buf.Modtime},
+	}
+	return Utimes(path, tv)
+}
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Pc }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Pc = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+func InotifyInit() (fd int, err error) {
+	return InotifyInit1(0)
+}
+
+func Dup2(oldfd int, newfd int) (err error) {
+	return Dup3(oldfd, newfd, 0)
+}
+
+func Pause() (err error) {
+	_, _, e1 := Syscall6(SYS_PPOLL, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// TODO(dfc): constants that should be in zsysnum_linux_arm64.go, remove
+// these when the deprecated syscalls that the syscall package relies on
+// are removed.
+const (
+	SYS_GETPGRP      = 1060
+	SYS_UTIMES       = 1037
+	SYS_FUTIMESAT    = 1066
+	SYS_PAUSE        = 1061
+	SYS_USTAT        = 1070
+	SYS_UTIME        = 1063
+	SYS_LCHOWN       = 1032
+	SYS_TIME         = 1062
+	SYS_EPOLL_CREATE = 1042
+	SYS_EPOLL_WAIT   = 1069
+)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
new file mode 100644
index 0000000000..bb15ba3e68
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
@@ -0,0 +1,206 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build mips64 mips64le
+
+package unix
+
+// Linux introduced getdents64 syscall for N64 ABI only in 3.10
+// (May 21 2013, rev dec33abaafc89bcbd78f85fad0513170415a26d5),
+// to support older kernels, we have to use getdents for mips64.
+// Also note that struct dirent is different for these two.
+// Lookup linux_dirent{,64} in kernel source code for details.
+const _SYS_getdents = SYS_GETDENTS
+
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+func Getpagesize() int { return 65536 }
+
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	var tv Timeval
+	err = Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
+}
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Ioperm(from int, num int, on int) (err error) {
+	return ENOSYS
+}
+
+func Iopl(level int) (err error) {
+	return ENOSYS
+}
+
+type stat_t struct {
+	Dev        uint32
+	Pad0       [3]int32
+	Ino        uint64
+	Mode       uint32
+	Nlink      uint32
+	Uid        uint32
+	Gid        uint32
+	Rdev       uint32
+	Pad1       [3]uint32
+	Size       int64
+	Atime      uint32
+	Atime_nsec uint32
+	Mtime      uint32
+	Mtime_nsec uint32
+	Ctime      uint32
+	Ctime_nsec uint32
+	Blksize    uint32
+	Pad2       uint32
+	Blocks     int64
+}
+
+//sys	fstat(fd int, st *stat_t) (err error)
+//sys	lstat(path string, st *stat_t) (err error)
+//sys	stat(path string, st *stat_t) (err error)
+
+func Fstat(fd int, s *Stat_t) (err error) {
+	st := &stat_t{}
+	err = fstat(fd, st)
+	fillStat_t(s, st)
+	return
+}
+
+func Lstat(path string, s *Stat_t) (err error) {
+	st := &stat_t{}
+	err = lstat(path, st)
+	fillStat_t(s, st)
+	return
+}
+
+func Stat(path string, s *Stat_t) (err error) {
+	st := &stat_t{}
+	err = stat(path, st)
+	fillStat_t(s, st)
+	return
+}
+
+func fillStat_t(s *Stat_t, st *stat_t) {
+	s.Dev = st.Dev
+	s.Ino = st.Ino
+	s.Mode = st.Mode
+	s.Nlink = st.Nlink
+	s.Uid = st.Uid
+	s.Gid = st.Gid
+	s.Rdev = st.Rdev
+	s.Size = st.Size
+	s.Atim = Timespec{int64(st.Atime), int64(st.Atime_nsec)}
+	s.Mtim = Timespec{int64(st.Mtime), int64(st.Mtime_nsec)}
+	s.Ctim = Timespec{int64(st.Ctime), int64(st.Ctime_nsec)}
+	s.Blksize = st.Blksize
+	s.Blocks = st.Blocks
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Regs[64] }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Regs[64] = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
new file mode 100644
index 0000000000..acd2e1c789
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
@@ -0,0 +1,126 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build ppc64 ppc64le
+
+package unix
+
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error) = SYS_UGETRLIMIT
+//sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Ioperm(from int, num int, on int) (err error)
+//sys	Iopl(level int) (err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Listen(s int, n int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Shutdown(fd int, how int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error) = SYS_SYNC_FILE_RANGE2
+//sys	Truncate(path string, length int64) (err error)
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
+//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+func Getpagesize() int { return 65536 }
+
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Time(t *Time_t) (tt Time_t, err error)
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Nip }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Nip = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+//sysnb pipe(p *[2]_C_int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
new file mode 100644
index 0000000000..3f98904e3c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
@@ -0,0 +1,320 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x,linux
+
+package unix
+
+import (
+	"unsafe"
+)
+
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (euid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Getuid() (uid int)
+//sysnb	InotifyInit() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
+//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
+//sys	Setfsgid(gid int) (err error)
+//sys	Setfsuid(uid int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, buf *Statfs_t) (err error)
+//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
+//sysnb	setgroups(n int, list *_Gid_t) (err error)
+
+func Getpagesize() int { return 4096 }
+
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	var tv Timeval
+	err = Gettimeofday(&tv)
+	if err != nil {
+		return 0, err
+	}
+	if t != nil {
+		*t = Time_t(tv.Sec)
+	}
+	return Time_t(tv.Sec), nil
+}
+
+//sys	Utime(path string, buf *Utimbuf) (err error)
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Sec = nsec / 1e9
+	tv.Usec = nsec % 1e9 / 1e3
+	return
+}
+
+//sysnb pipe2(p *[2]_C_int, flags int) (err error)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, 0) // pipe2 is the same as pipe when flags are set to 0.
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Pipe2(p []int, flags int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe2(&pp, flags)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+func Ioperm(from int, num int, on int) (err error) {
+	return ENOSYS
+}
+
+func Iopl(level int) (err error) {
+	return ENOSYS
+}
+
+func (r *PtraceRegs) PC() uint64 { return r.Psw.Addr }
+
+func (r *PtraceRegs) SetPC(pc uint64) { r.Psw.Addr = pc }
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint64(length)
+}
+
+// Linux on s390x uses the old mmap interface, which requires arguments to be passed in a struct.
+// mmap2 also requires arguments to be passed in a struct; it is currently not exposed in <asm/unistd.h>.
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	mmap_args := [6]uintptr{addr, length, uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset)}
+	r0, _, e1 := Syscall(SYS_MMAP, uintptr(unsafe.Pointer(&mmap_args[0])), 0, 0)
+	use(unsafe.Pointer(&mmap_args[0]))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// On s390x Linux, all the socket calls go through an extra indirection.
+// The arguments to the underlying system call (SYS_SOCKETCALL) are the
+// number below and a pointer to an array of uintptr.
+const (
+	// see linux/net.h
+	netSocket      = 1
+	netBind        = 2
+	netConnect     = 3
+	netListen      = 4
+	netAccept      = 5
+	netGetSockName = 6
+	netGetPeerName = 7
+	netSocketPair  = 8
+	netSend        = 9
+	netRecv        = 10
+	netSendTo      = 11
+	netRecvFrom    = 12
+	netShutdown    = 13
+	netSetSockOpt  = 14
+	netGetSockOpt  = 15
+	netSendMsg     = 16
+	netRecvMsg     = 17
+	netAccept4     = 18
+	netRecvMMsg    = 19
+	netSendMMsg    = 20
+)
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (int, error) {
+	args := [4]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags)}
+	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept4, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
+func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetSockName, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
+	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetPeerName, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func socketpair(domain int, typ int, flags int, fd *[2]int32) error {
+	args := [4]uintptr{uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd))}
+	_, _, err := RawSyscall(SYS_SOCKETCALL, netSocketPair, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netBind, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) error {
+	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netConnect, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func socket(domain int, typ int, proto int) (int, error) {
+	args := [3]uintptr{uintptr(domain), uintptr(typ), uintptr(proto)}
+	fd, _, err := RawSyscall(SYS_SOCKETCALL, netSocket, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(fd), nil
+}
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) error {
+	args := [5]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen))}
+	_, _, err := Syscall(SYS_SOCKETCALL, netGetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) error {
+	args := [4]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netSetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (int, error) {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen))}
+	n, _, err := Syscall(SYS_SOCKETCALL, netRecvFrom, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(n), nil
+}
+
+func sendto(s int, p []byte, flags int, to unsafe.Pointer, addrlen _Socklen) error {
+	var base uintptr
+	if len(p) > 0 {
+		base = uintptr(unsafe.Pointer(&p[0]))
+	}
+	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(to), uintptr(addrlen)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netSendTo, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func recvmsg(s int, msg *Msghdr, flags int) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
+	n, _, err := Syscall(SYS_SOCKETCALL, netRecvMsg, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(n), nil
+}
+
+func sendmsg(s int, msg *Msghdr, flags int) (int, error) {
+	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
+	n, _, err := Syscall(SYS_SOCKETCALL, netSendMsg, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return 0, err
+	}
+	return int(n), nil
+}
+
+func Listen(s int, n int) error {
+	args := [2]uintptr{uintptr(s), uintptr(n)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netListen, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
+
+func Shutdown(s, how int) error {
+	args := [2]uintptr{uintptr(s), uintptr(how)}
+	_, _, err := Syscall(SYS_SOCKETCALL, netShutdown, uintptr(unsafe.Pointer(&args)), 0)
+	if err != 0 {
+		return err
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
new file mode 100644
index 0000000000..c4e945cd69
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -0,0 +1,492 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// NetBSD system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+	raw    RawSockaddrDatalink
+}
+
+func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+func sysctlNodes(mib []_C_int) (nodes []Sysctlnode, err error) {
+	var olen uintptr
+
+	// Get a list of all sysctl nodes below the given MIB by performing
+	// a sysctl for the given MIB with CTL_QUERY appended.
+	mib = append(mib, CTL_QUERY)
+	qnode := Sysctlnode{Flags: SYSCTL_VERS_1}
+	qp := (*byte)(unsafe.Pointer(&qnode))
+	sz := unsafe.Sizeof(qnode)
+	if err = sysctl(mib, nil, &olen, qp, sz); err != nil {
+		return nil, err
+	}
+
+	// Now that we know the size, get the actual nodes.
+	nodes = make([]Sysctlnode, olen/sz)
+	np := (*byte)(unsafe.Pointer(&nodes[0]))
+	if err = sysctl(mib, np, &olen, qp, sz); err != nil {
+		return nil, err
+	}
+
+	return nodes, nil
+}
+
+func nametomib(name string) (mib []_C_int, err error) {
+
+	// Split name into components.
+	var parts []string
+	last := 0
+	for i := 0; i < len(name); i++ {
+		if name[i] == '.' {
+			parts = append(parts, name[last:i])
+			last = i + 1
+		}
+	}
+	parts = append(parts, name[last:])
+
+	// Discover the nodes and construct the MIB OID.
+	for partno, part := range parts {
+		nodes, err := sysctlNodes(mib)
+		if err != nil {
+			return nil, err
+		}
+		for _, node := range nodes {
+			n := make([]byte, 0)
+			for i := range node.Name {
+				if node.Name[i] != 0 {
+					n = append(n, byte(node.Name[i]))
+				}
+			}
+			if string(n) == part {
+				mib = append(mib, _C_int(node.Num))
+				break
+			}
+		}
+		if len(mib) != partno+1 {
+			return nil, EINVAL
+		}
+	}
+
+	return mib, nil
+}
+
+// ParseDirent parses up to max directory entries in buf,
+// appending the names to names. It returns the number
+// bytes consumed from buf, the number of entries added
+// to names, and the new names slice.
+func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
+	origlen := len(buf)
+	for max != 0 && len(buf) > 0 {
+		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
+		if dirent.Reclen == 0 {
+			buf = nil
+			break
+		}
+		buf = buf[dirent.Reclen:]
+		if dirent.Fileno == 0 { // File absent in directory.
+			continue
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
+		var name = string(bytes[0:dirent.Namlen])
+		if name == "." || name == ".." { // Useless names
+			continue
+		}
+		max--
+		count++
+		names = append(names, name)
+	}
+	return origlen - len(buf), count, names
+}
+
+//sysnb pipe() (fd1 int, fd2 int, err error)
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	p[0], p[1], err = pipe()
+	return
+}
+
+//sys getdents(fd int, buf []byte) (n int, err error)
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	return getdents(fd, buf)
+}
+
+// TODO
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	return -1, ENOSYS
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exit(code int)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Issetugid() (tainted bool)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Unlink(path string) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys	munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+
+/*
+ * Unimplemented
+ */
+// ____semctl13
+// __clone
+// __fhopen40
+// __fhstat40
+// __fhstatvfs140
+// __fstat30
+// __getcwd
+// __getfh30
+// __getlogin
+// __lstat30
+// __mount50
+// __msgctl13
+// __msync13
+// __ntp_gettime30
+// __posix_chown
+// __posix_fadvise50
+// __posix_fchown
+// __posix_lchown
+// __posix_rename
+// __setlogin
+// __shmctl13
+// __sigaction_sigtramp
+// __sigaltstack14
+// __sigpending14
+// __sigprocmask14
+// __sigsuspend14
+// __sigtimedwait
+// __stat30
+// __syscall
+// __vfork14
+// _ksem_close
+// _ksem_destroy
+// _ksem_getvalue
+// _ksem_init
+// _ksem_open
+// _ksem_post
+// _ksem_trywait
+// _ksem_unlink
+// _ksem_wait
+// _lwp_continue
+// _lwp_create
+// _lwp_ctl
+// _lwp_detach
+// _lwp_exit
+// _lwp_getname
+// _lwp_getprivate
+// _lwp_kill
+// _lwp_park
+// _lwp_self
+// _lwp_setname
+// _lwp_setprivate
+// _lwp_suspend
+// _lwp_unpark
+// _lwp_unpark_all
+// _lwp_wait
+// _lwp_wakeup
+// _pset_bind
+// _sched_getaffinity
+// _sched_getparam
+// _sched_setaffinity
+// _sched_setparam
+// acct
+// aio_cancel
+// aio_error
+// aio_fsync
+// aio_read
+// aio_return
+// aio_suspend
+// aio_write
+// break
+// clock_getres
+// clock_gettime
+// clock_settime
+// compat_09_ogetdomainname
+// compat_09_osetdomainname
+// compat_09_ouname
+// compat_10_omsgsys
+// compat_10_osemsys
+// compat_10_oshmsys
+// compat_12_fstat12
+// compat_12_getdirentries
+// compat_12_lstat12
+// compat_12_msync
+// compat_12_oreboot
+// compat_12_oswapon
+// compat_12_stat12
+// compat_13_sigaction13
+// compat_13_sigaltstack13
+// compat_13_sigpending13
+// compat_13_sigprocmask13
+// compat_13_sigreturn13
+// compat_13_sigsuspend13
+// compat_14___semctl
+// compat_14_msgctl
+// compat_14_shmctl
+// compat_16___sigaction14
+// compat_16___sigreturn14
+// compat_20_fhstatfs
+// compat_20_fstatfs
+// compat_20_getfsstat
+// compat_20_statfs
+// compat_30___fhstat30
+// compat_30___fstat13
+// compat_30___lstat13
+// compat_30___stat13
+// compat_30_fhopen
+// compat_30_fhstat
+// compat_30_fhstatvfs1
+// compat_30_getdents
+// compat_30_getfh
+// compat_30_ntp_gettime
+// compat_30_socket
+// compat_40_mount
+// compat_43_fstat43
+// compat_43_lstat43
+// compat_43_oaccept
+// compat_43_ocreat
+// compat_43_oftruncate
+// compat_43_ogetdirentries
+// compat_43_ogetdtablesize
+// compat_43_ogethostid
+// compat_43_ogethostname
+// compat_43_ogetkerninfo
+// compat_43_ogetpagesize
+// compat_43_ogetpeername
+// compat_43_ogetrlimit
+// compat_43_ogetsockname
+// compat_43_okillpg
+// compat_43_olseek
+// compat_43_ommap
+// compat_43_oquota
+// compat_43_orecv
+// compat_43_orecvfrom
+// compat_43_orecvmsg
+// compat_43_osend
+// compat_43_osendmsg
+// compat_43_osethostid
+// compat_43_osethostname
+// compat_43_osetrlimit
+// compat_43_osigblock
+// compat_43_osigsetmask
+// compat_43_osigstack
+// compat_43_osigvec
+// compat_43_otruncate
+// compat_43_owait
+// compat_43_stat43
+// execve
+// extattr_delete_fd
+// extattr_delete_file
+// extattr_delete_link
+// extattr_get_fd
+// extattr_get_file
+// extattr_get_link
+// extattr_list_fd
+// extattr_list_file
+// extattr_list_link
+// extattr_set_fd
+// extattr_set_file
+// extattr_set_link
+// extattrctl
+// fchroot
+// fdatasync
+// fgetxattr
+// fktrace
+// flistxattr
+// fork
+// fremovexattr
+// fsetxattr
+// fstatvfs1
+// fsync_range
+// getcontext
+// getitimer
+// getvfsstat
+// getxattr
+// ioctl
+// ktrace
+// lchflags
+// lchmod
+// lfs_bmapv
+// lfs_markv
+// lfs_segclean
+// lfs_segwait
+// lgetxattr
+// lio_listio
+// listxattr
+// llistxattr
+// lremovexattr
+// lseek
+// lsetxattr
+// lutimes
+// madvise
+// mincore
+// minherit
+// modctl
+// mq_close
+// mq_getattr
+// mq_notify
+// mq_open
+// mq_receive
+// mq_send
+// mq_setattr
+// mq_timedreceive
+// mq_timedsend
+// mq_unlink
+// mremap
+// msgget
+// msgrcv
+// msgsnd
+// nfssvc
+// ntp_adjtime
+// pmc_control
+// pmc_get_info
+// poll
+// pollts
+// preadv
+// profil
+// pselect
+// pset_assign
+// pset_create
+// pset_destroy
+// ptrace
+// pwritev
+// quotactl
+// rasctl
+// readv
+// reboot
+// removexattr
+// sa_enable
+// sa_preempt
+// sa_register
+// sa_setconcurrency
+// sa_stacks
+// sa_yield
+// sbrk
+// sched_yield
+// semconfig
+// semget
+// semop
+// setcontext
+// setitimer
+// setxattr
+// shmat
+// shmdt
+// shmget
+// sstk
+// statvfs1
+// swapctl
+// sysarch
+// syscall
+// timer_create
+// timer_delete
+// timer_getoverrun
+// timer_gettime
+// timer_settime
+// undelete
+// utrace
+// uuidgen
+// vadvise
+// vfork
+// writev
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
new file mode 100644
index 0000000000..afaca09838
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
@@ -0,0 +1,42 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386,netbsd
+
+package unix
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = int64(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = uint32(mode)
+	k.Flags = uint32(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
new file mode 100644
index 0000000000..a6ff04ce5b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
@@ -0,0 +1,42 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,netbsd
+
+package unix
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = int64(nsec / 1e9)
+	ts.Nsec = int64(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = uint32(mode)
+	k.Flags = uint32(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
new file mode 100644
index 0000000000..68a6969b28
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
@@ -0,0 +1,42 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm,netbsd
+
+package unix
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = int64(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = uint32(mode)
+	k.Flags = uint32(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_no_getwd.go b/vendor/golang.org/x/sys/unix/syscall_no_getwd.go
new file mode 100644
index 0000000000..530792ea93
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_no_getwd.go
@@ -0,0 +1,11 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build dragonfly freebsd netbsd openbsd
+
+package unix
+
+const ImplementsGetwd = false
+
+func Getwd() (string, error) { return "", ENOTSUP }
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
new file mode 100644
index 0000000000..246131d2af
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -0,0 +1,303 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// OpenBSD system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_bsd.go or syscall_unix.go.
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+type SockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [24]int8
+	raw    RawSockaddrDatalink
+}
+
+func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+func nametomib(name string) (mib []_C_int, err error) {
+
+	// Perform lookup via a binary search
+	left := 0
+	right := len(sysctlMib) - 1
+	for {
+		idx := left + (right-left)/2
+		switch {
+		case name == sysctlMib[idx].ctlname:
+			return sysctlMib[idx].ctloid, nil
+		case name > sysctlMib[idx].ctlname:
+			left = idx + 1
+		default:
+			right = idx - 1
+		}
+		if left > right {
+			break
+		}
+	}
+	return nil, EINVAL
+}
+
+// ParseDirent parses up to max directory entries in buf,
+// appending the names to names. It returns the number
+// bytes consumed from buf, the number of entries added
+// to names, and the new names slice.
+func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
+	origlen := len(buf)
+	for max != 0 && len(buf) > 0 {
+		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
+		if dirent.Reclen == 0 {
+			buf = nil
+			break
+		}
+		buf = buf[dirent.Reclen:]
+		if dirent.Fileno == 0 { // File absent in directory.
+			continue
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
+		var name = string(bytes[0:dirent.Namlen])
+		if name == "." || name == ".." { // Useless names
+			continue
+		}
+		max--
+		count++
+		names = append(names, name)
+	}
+	return origlen - len(buf), count, names
+}
+
+//sysnb pipe(p *[2]_C_int) (err error)
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	var pp [2]_C_int
+	err = pipe(&pp)
+	p[0] = int(pp[0])
+	p[1] = int(pp[1])
+	return
+}
+
+//sys getdents(fd int, buf []byte) (n int, err error)
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	return getdents(fd, buf)
+}
+
+// TODO
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	return -1, ENOSYS
+}
+
+func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	var bufsize uintptr
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+	}
+	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chflags(path string, flags int) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(from int, to int) (err error)
+//sys	Exit(code int)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchflags(fd int, flags int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Flock(fd int, how int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sysnb	Getegid() (egid int)
+//sysnb	Geteuid() (uid int)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgrp int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (prio int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Getsid(pid int) (sid int, err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Issetugid() (tainted bool)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Kqueue() (fd int, err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error)
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Revoke(path string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Setlogin(name string) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
+//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Settimeofday(tp *Timeval) (err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statfs(path string, stat *Statfs_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Umask(newmask int) (oldmask int)
+//sys	Unlink(path string) (err error)
+//sys	Unmount(path string, flags int) (err error)
+//sys	write(fd int, p []byte) (n int, err error)
+//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys	munmap(addr uintptr, length uintptr) (err error)
+//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
+//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+
+/*
+ * Unimplemented
+ */
+// __getcwd
+// __semctl
+// __syscall
+// __sysctl
+// adjfreq
+// break
+// clock_getres
+// clock_gettime
+// clock_settime
+// closefrom
+// execve
+// faccessat
+// fchmodat
+// fchownat
+// fcntl
+// fhopen
+// fhstat
+// fhstatfs
+// fork
+// fstatat
+// futimens
+// getfh
+// getgid
+// getitimer
+// getlogin
+// getresgid
+// getresuid
+// getrtable
+// getthrid
+// ioctl
+// ktrace
+// lfs_bmapv
+// lfs_markv
+// lfs_segclean
+// lfs_segwait
+// linkat
+// mincore
+// minherit
+// mkdirat
+// mkfifoat
+// mknodat
+// mount
+// mquery
+// msgctl
+// msgget
+// msgrcv
+// msgsnd
+// nfssvc
+// nnpfspioctl
+// openat
+// poll
+// preadv
+// profil
+// pwritev
+// quotactl
+// readlinkat
+// readv
+// reboot
+// renameat
+// rfork
+// sched_yield
+// semget
+// semop
+// setgroups
+// setitimer
+// setrtable
+// setsockopt
+// shmat
+// shmctl
+// shmdt
+// shmget
+// sigaction
+// sigaltstack
+// sigpending
+// sigprocmask
+// sigreturn
+// sigsuspend
+// symlinkat
+// sysarch
+// syscall
+// threxit
+// thrsigdivert
+// thrsleep
+// thrwakeup
+// unlinkat
+// utimensat
+// vfork
+// writev
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
new file mode 100644
index 0000000000..a66ddc59ce
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
@@ -0,0 +1,42 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build 386,openbsd
+
+package unix
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = int64(nsec / 1e9)
+	ts.Nsec = int32(nsec % 1e9)
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
new file mode 100644
index 0000000000..0776c1faf9
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
@@ -0,0 +1,42 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,openbsd
+
+package unix
+
+func Getpagesize() int { return 4096 }
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = nsec % 1e9 / 1e3
+	tv.Sec = nsec / 1e9
+	return
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint64(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go
new file mode 100644
index 0000000000..eb489b159f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go
@@ -0,0 +1,713 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Solaris system calls.
+// This file is compiled as ordinary Go code,
+// but it is also input to mksyscall,
+// which parses the //sys lines and generates system call stubs.
+// Note that sometimes we use a lowercase //sys name and wrap
+// it in our own nicer implementation, either here or in
+// syscall_solaris.go or syscall_unix.go.
+
+package unix
+
+import (
+	"sync/atomic"
+	"syscall"
+	"unsafe"
+)
+
+// Implemented in runtime/syscall_solaris.go.
+type syscallFunc uintptr
+
+func rawSysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+type SockaddrDatalink struct {
+	Family uint16
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [244]int8
+	raw    RawSockaddrDatalink
+}
+
+func clen(n []byte) int {
+	for i := 0; i < len(n); i++ {
+		if n[i] == 0 {
+			return i
+		}
+	}
+	return len(n)
+}
+
+// ParseDirent parses up to max directory entries in buf,
+// appending the names to names.  It returns the number
+// bytes consumed from buf, the number of entries added
+// to names, and the new names slice.
+func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
+	origlen := len(buf)
+	for max != 0 && len(buf) > 0 {
+		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
+		if dirent.Reclen == 0 {
+			buf = nil
+			break
+		}
+		buf = buf[dirent.Reclen:]
+		if dirent.Ino == 0 { // File absent in directory.
+			continue
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
+		var name = string(bytes[0:clen(bytes[:])])
+		if name == "." || name == ".." { // Useless names
+			continue
+		}
+		max--
+		count++
+		names = append(names, name)
+	}
+	return origlen - len(buf), count, names
+}
+
+func pipe() (r uintptr, w uintptr, err uintptr)
+
+func Pipe(p []int) (err error) {
+	if len(p) != 2 {
+		return EINVAL
+	}
+	r0, w0, e1 := pipe()
+	if e1 != 0 {
+		err = syscall.Errno(e1)
+	}
+	p[0], p[1] = int(r0), int(w0)
+	return
+}
+
+func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_INET
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
+}
+
+func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	if sa.Port < 0 || sa.Port > 0xFFFF {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_INET6
+	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
+	p[0] = byte(sa.Port >> 8)
+	p[1] = byte(sa.Port)
+	sa.raw.Scope_id = sa.ZoneId
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Addr[i] = sa.Addr[i]
+	}
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
+}
+
+func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	name := sa.Name
+	n := len(name)
+	if n >= len(sa.raw.Path) {
+		return nil, 0, EINVAL
+	}
+	sa.raw.Family = AF_UNIX
+	for i := 0; i < n; i++ {
+		sa.raw.Path[i] = int8(name[i])
+	}
+	// length is family (uint16), name, NUL.
+	sl := _Socklen(2)
+	if n > 0 {
+		sl += _Socklen(n) + 1
+	}
+	if sa.raw.Path[0] == '@' {
+		sa.raw.Path[0] = 0
+		// Don't count trailing NUL for abstract address.
+		sl--
+	}
+
+	return unsafe.Pointer(&sa.raw), sl, nil
+}
+
+//sys	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getsockname
+
+func Getsockname(fd int) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if err = getsockname(fd, &rsa, &len); err != nil {
+		return
+	}
+	return anyToSockaddr(&rsa)
+}
+
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error)
+
+func Getwd() (wd string, err error) {
+	var buf [PathMax]byte
+	// Getcwd will return an error if it failed for any reason.
+	_, err = Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
+/*
+ * Wrapped
+ */
+
+//sysnb	getgroups(ngid int, gid *_Gid_t) (n int, err error)
+//sysnb	setgroups(ngid int, gid *_Gid_t) (err error)
+
+func Getgroups() (gids []int, err error) {
+	n, err := getgroups(0, nil)
+	// Check for error and sanity check group count.  Newer versions of
+	// Solaris allow up to 1024 (NGROUPS_MAX).
+	if n < 0 || n > 1024 {
+		if err != nil {
+			return nil, err
+		}
+		return nil, EINVAL
+	} else if n == 0 {
+		return nil, nil
+	}
+
+	a := make([]_Gid_t, n)
+	n, err = getgroups(n, &a[0])
+	if n == -1 {
+		return nil, err
+	}
+	gids = make([]int, n)
+	for i, v := range a[0:n] {
+		gids[i] = int(v)
+	}
+	return
+}
+
+func Setgroups(gids []int) (err error) {
+	if len(gids) == 0 {
+		return setgroups(0, nil)
+	}
+
+	a := make([]_Gid_t, len(gids))
+	for i, v := range gids {
+		a[i] = _Gid_t(v)
+	}
+	return setgroups(len(a), &a[0])
+}
+
+func ReadDirent(fd int, buf []byte) (n int, err error) {
+	// Final argument is (basep *uintptr) and the syscall doesn't take nil.
+	// TODO(rsc): Can we use a single global basep for all calls?
+	return Getdents(fd, buf, new(uintptr))
+}
+
+// Wait status is 7 bits at bottom, either 0 (exited),
+// 0x7F (stopped), or a signal number that caused an exit.
+// The 0x80 bit is whether there was a core dump.
+// An extra number (exit code, signal causing a stop)
+// is in the high bits.
+
+type WaitStatus uint32
+
+const (
+	mask  = 0x7F
+	core  = 0x80
+	shift = 8
+
+	exited  = 0
+	stopped = 0x7F
+)
+
+func (w WaitStatus) Exited() bool { return w&mask == exited }
+
+func (w WaitStatus) ExitStatus() int {
+	if w&mask != exited {
+		return -1
+	}
+	return int(w >> shift)
+}
+
+func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
+
+func (w WaitStatus) Signal() syscall.Signal {
+	sig := syscall.Signal(w & mask)
+	if sig == stopped || sig == 0 {
+		return -1
+	}
+	return sig
+}
+
+func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
+
+func (w WaitStatus) Stopped() bool { return w&mask == stopped && syscall.Signal(w>>shift) != SIGSTOP }
+
+func (w WaitStatus) Continued() bool { return w&mask == stopped && syscall.Signal(w>>shift) == SIGSTOP }
+
+func (w WaitStatus) StopSignal() syscall.Signal {
+	if !w.Stopped() {
+		return -1
+	}
+	return syscall.Signal(w>>shift) & 0xFF
+}
+
+func (w WaitStatus) TrapCause() int { return -1 }
+
+func wait4(pid uintptr, wstatus *WaitStatus, options uintptr, rusage *Rusage) (wpid uintptr, err uintptr)
+
+func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
+	r0, e1 := wait4(uintptr(pid), wstatus, uintptr(options), rusage)
+	if e1 != 0 {
+		err = syscall.Errno(e1)
+	}
+	return int(r0), err
+}
+
+func gethostname() (name string, err uintptr)
+
+func Gethostname() (name string, err error) {
+	name, e1 := gethostname()
+	if e1 != 0 {
+		err = syscall.Errno(e1)
+	}
+	return name, err
+}
+
+//sys	utimes(path string, times *[2]Timeval) (err error)
+
+func Utimes(path string, tv []Timeval) (err error) {
+	if tv == nil {
+		return utimes(path, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+//sys	utimensat(fd int, path string, times *[2]Timespec, flag int) (err error)
+
+func UtimesNano(path string, ts []Timespec) error {
+	if ts == nil {
+		return utimensat(AT_FDCWD, path, nil, 0)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+}
+
+func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
+	if ts == nil {
+		return utimensat(dirfd, path, nil, flags)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
+}
+
+//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
+
+// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
+func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(unsafe.Pointer(lk)), 0, 0, 0)
+	if e1 != 0 {
+		return e1
+	}
+	return nil
+}
+
+//sys	futimesat(fildes int, path *byte, times *[2]Timeval) (err error)
+
+func Futimesat(dirfd int, path string, tv []Timeval) error {
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	if tv == nil {
+		return futimesat(dirfd, pathp, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+// Solaris doesn't have an futimes function because it allows NULL to be
+// specified as the path for futimesat.  However, Go doesn't like
+// NULL-style string interfaces, so this simple wrapper is provided.
+func Futimes(fd int, tv []Timeval) error {
+	if tv == nil {
+		return futimesat(fd, nil, nil)
+	}
+	if len(tv) != 2 {
+		return EINVAL
+	}
+	return futimesat(fd, nil, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
+}
+
+func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
+	switch rsa.Addr.Family {
+	case AF_UNIX:
+		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
+		sa := new(SockaddrUnix)
+		// Assume path ends at NUL.
+		// This is not technically the Solaris semantics for
+		// abstract Unix domain sockets -- they are supposed
+		// to be uninterpreted fixed-size binary blobs -- but
+		// everyone uses this convention.
+		n := 0
+		for n < len(pp.Path) && pp.Path[n] != 0 {
+			n++
+		}
+		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
+		sa.Name = string(bytes)
+		return sa, nil
+
+	case AF_INET:
+		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet4)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+
+	case AF_INET6:
+		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
+		sa := new(SockaddrInet6)
+		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
+		sa.Port = int(p[0])<<8 + int(p[1])
+		sa.ZoneId = pp.Scope_id
+		for i := 0; i < len(sa.Addr); i++ {
+			sa.Addr[i] = pp.Addr[i]
+		}
+		return sa, nil
+	}
+	return nil, EAFNOSUPPORT
+}
+
+//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) = libsocket.accept
+
+func Accept(fd int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept(fd, &rsa, &len)
+	if nfd == -1 {
+		return
+	}
+	sa, err = anyToSockaddr(&rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.recvmsg
+
+func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
+	var msg Msghdr
+	var rsa RawSockaddrAny
+	msg.Name = (*byte)(unsafe.Pointer(&rsa))
+	msg.Namelen = uint32(SizeofSockaddrAny)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy int8
+	if len(oob) > 0 {
+		// receive at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Accrights = (*int8)(unsafe.Pointer(&oob[0]))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = recvmsg(fd, &msg, flags); n == -1 {
+		return
+	}
+	oobn = int(msg.Accrightslen)
+	// source address is only specified if the socket is unconnected
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(&rsa)
+	}
+	return
+}
+
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+	_, err = SendmsgN(fd, p, oob, to, flags)
+	return
+}
+
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.sendmsg
+
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+	var ptr unsafe.Pointer
+	var salen _Socklen
+	if to != nil {
+		ptr, salen, err = to.sockaddr()
+		if err != nil {
+			return 0, err
+		}
+	}
+	var msg Msghdr
+	msg.Name = (*byte)(unsafe.Pointer(ptr))
+	msg.Namelen = uint32(salen)
+	var iov Iovec
+	if len(p) > 0 {
+		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
+		iov.SetLen(len(p))
+	}
+	var dummy int8
+	if len(oob) > 0 {
+		// send at least one normal byte
+		if len(p) == 0 {
+			iov.Base = &dummy
+			iov.SetLen(1)
+		}
+		msg.Accrights = (*int8)(unsafe.Pointer(&oob[0]))
+	}
+	msg.Iov = &iov
+	msg.Iovlen = 1
+	if n, err = sendmsg(fd, &msg, flags); err != nil {
+		return 0, err
+	}
+	if len(oob) > 0 && len(p) == 0 {
+		n = 0
+	}
+	return n, nil
+}
+
+//sys	acct(path *byte) (err error)
+
+func Acct(path string) (err error) {
+	if len(path) == 0 {
+		// Assume caller wants to disable accounting.
+		return acct(nil)
+	}
+
+	pathp, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	return acct(pathp)
+}
+
+/*
+ * Expose the ioctl function
+ */
+
+//sys	ioctl(fd int, req int, arg uintptr) (err error)
+
+func IoctlSetInt(fd int, req int, value int) (err error) {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req int, value *Winsize) (err error) {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req int, value *Termios) (err error) {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermio(fd int, req int, value *Termio) (err error) {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlGetInt(fd int, req int) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req int) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req int) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermio(fd int, req int) (*Termio, error) {
+	var value Termio
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+/*
+ * Exposed directly
+ */
+//sys	Access(path string, mode uint32) (err error)
+//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	Chdir(path string) (err error)
+//sys	Chmod(path string, mode uint32) (err error)
+//sys	Chown(path string, uid int, gid int) (err error)
+//sys	Chroot(path string) (err error)
+//sys	Close(fd int) (err error)
+//sys	Creat(path string, mode uint32) (fd int, err error)
+//sys	Dup(fd int) (nfd int, err error)
+//sys	Dup2(oldfd int, newfd int) (err error)
+//sys	Exit(code int)
+//sys	Fchdir(fd int) (err error)
+//sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
+//sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
+//sys	Fdatasync(fd int) (err error)
+//sys	Fpathconf(fd int, name int) (val int, err error)
+//sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Getdents(fd int, buf []byte, basep *uintptr) (n int, err error)
+//sysnb	Getgid() (gid int)
+//sysnb	Getpid() (pid int)
+//sysnb	Getpgid(pid int) (pgid int, err error)
+//sysnb	Getpgrp() (pgid int, err error)
+//sys	Geteuid() (euid int)
+//sys	Getegid() (egid int)
+//sys	Getppid() (ppid int)
+//sys	Getpriority(which int, who int) (n int, err error)
+//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrusage(who int, rusage *Rusage) (err error)
+//sysnb	Gettimeofday(tv *Timeval) (err error)
+//sysnb	Getuid() (uid int)
+//sys	Kill(pid int, signum syscall.Signal) (err error)
+//sys	Lchown(path string, uid int, gid int) (err error)
+//sys	Link(path string, link string) (err error)
+//sys	Listen(s int, backlog int) (err error) = libsocket.listen
+//sys	Lstat(path string, stat *Stat_t) (err error)
+//sys	Madvise(b []byte, advice int) (err error)
+//sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
+//sys	Mkfifo(path string, mode uint32) (err error)
+//sys	Mkfifoat(dirfd int, path string, mode uint32) (err error)
+//sys	Mknod(path string, mode uint32, dev int) (err error)
+//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
+//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
+//sys	Pathconf(path string, name int) (val int, err error)
+//sys	Pause() (err error)
+//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+//sys	read(fd int, p []byte) (n int, err error)
+//sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Rename(from string, to string) (err error)
+//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
+//sys	Rmdir(path string) (err error)
+//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = lseek
+//sysnb	Setegid(egid int) (err error)
+//sysnb	Seteuid(euid int) (err error)
+//sysnb	Setgid(gid int) (err error)
+//sys	Sethostname(p []byte) (err error)
+//sysnb	Setpgid(pid int, pgid int) (err error)
+//sys	Setpriority(which int, who int, prio int) (err error)
+//sysnb	Setregid(rgid int, egid int) (err error)
+//sysnb	Setreuid(ruid int, euid int) (err error)
+//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setsid() (pid int, err error)
+//sysnb	Setuid(uid int) (err error)
+//sys	Shutdown(s int, how int) (err error) = libsocket.shutdown
+//sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Symlink(path string, link string) (err error)
+//sys	Sync() (err error)
+//sysnb	Times(tms *Tms) (ticks uintptr, err error)
+//sys	Truncate(path string, length int64) (err error)
+//sys	Fsync(fd int) (err error)
+//sys	Ftruncate(fd int, length int64) (err error)
+//sys	Umask(mask int) (oldmask int)
+//sysnb	Uname(buf *Utsname) (err error)
+//sys	Unmount(target string, flags int) (err error) = libc.umount
+//sys	Unlink(path string) (err error)
+//sys	Unlinkat(dirfd int, path string, flags int) (err error)
+//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
+//sys	Utime(path string, buf *Utimbuf) (err error)
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.bind
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.connect
+//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
+//sys	munmap(addr uintptr, length uintptr) (err error)
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.sendto
+//sys	socket(domain int, typ int, proto int) (fd int, err error) = libsocket.socket
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) = libsocket.socketpair
+//sys	write(fd int, p []byte) (n int, err error)
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) = libsocket.getsockopt
+//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getpeername
+//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) = libsocket.setsockopt
+//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) = libsocket.recvfrom
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}
+
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+	return mapper.Munmap(b)
+}
+
+//sys	sysconf(name int) (n int64, err error)
+
+// pageSize caches the value of Getpagesize, since it can't change
+// once the system is booted.
+var pageSize int64 // accessed atomically
+
+func Getpagesize() int {
+	n := atomic.LoadInt64(&pageSize)
+	if n == 0 {
+		n, _ = sysconf(_SC_PAGESIZE)
+		atomic.StoreInt64(&pageSize, n)
+	}
+	return int(n)
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
new file mode 100644
index 0000000000..5aff62c3bb
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
@@ -0,0 +1,35 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,solaris
+
+package unix
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func NsecToTimespec(nsec int64) (ts Timespec) {
+	ts.Sec = nsec / 1e9
+	ts.Nsec = nsec % 1e9
+	return
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	nsec += 999 // round up to microsecond
+	tv.Usec = nsec % 1e9 / 1e3
+	tv.Sec = int64(nsec / 1e9)
+	return
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint64(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	// TODO(aram): implement this, see issue 5847.
+	panic("unimplemented")
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go
new file mode 100644
index 0000000000..b46b25028c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_unix.go
@@ -0,0 +1,297 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+import (
+	"runtime"
+	"sync"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	Stdin  = 0
+	Stdout = 1
+	Stderr = 2
+)
+
+const (
+	darwin64Bit    = runtime.GOOS == "darwin" && sizeofPtr == 8
+	dragonfly64Bit = runtime.GOOS == "dragonfly" && sizeofPtr == 8
+	netbsd32Bit    = runtime.GOOS == "netbsd" && sizeofPtr == 4
+)
+
+// Do the interface allocations only once for common
+// Errno values.
+var (
+	errEAGAIN error = syscall.EAGAIN
+	errEINVAL error = syscall.EINVAL
+	errENOENT error = syscall.ENOENT
+)
+
+// errnoErr returns common boxed Errno values, to prevent
+// allocations at runtime.
+func errnoErr(e syscall.Errno) error {
+	switch e {
+	case 0:
+		return nil
+	case EAGAIN:
+		return errEAGAIN
+	case EINVAL:
+		return errEINVAL
+	case ENOENT:
+		return errENOENT
+	}
+	return e
+}
+
+func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno)
+func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+// Mmap manager, for use by operating system-specific implementations.
+
+type mmapper struct {
+	sync.Mutex
+	active map[*byte][]byte // active mappings; key is last byte in mapping
+	mmap   func(addr, length uintptr, prot, flags, fd int, offset int64) (uintptr, error)
+	munmap func(addr uintptr, length uintptr) error
+}
+
+func (m *mmapper) Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
+	if length <= 0 {
+		return nil, EINVAL
+	}
+
+	// Map the requested memory.
+	addr, errno := m.mmap(0, uintptr(length), prot, flags, fd, offset)
+	if errno != nil {
+		return nil, errno
+	}
+
+	// Slice memory layout
+	var sl = struct {
+		addr uintptr
+		len  int
+		cap  int
+	}{addr, length, length}
+
+	// Use unsafe to turn sl into a []byte.
+	b := *(*[]byte)(unsafe.Pointer(&sl))
+
+	// Register mapping in m and return it.
+	p := &b[cap(b)-1]
+	m.Lock()
+	defer m.Unlock()
+	m.active[p] = b
+	return b, nil
+}
+
+func (m *mmapper) Munmap(data []byte) (err error) {
+	if len(data) == 0 || len(data) != cap(data) {
+		return EINVAL
+	}
+
+	// Find the base of the mapping.
+	p := &data[cap(data)-1]
+	m.Lock()
+	defer m.Unlock()
+	b := m.active[p]
+	if b == nil || &b[0] != &data[0] {
+		return EINVAL
+	}
+
+	// Unmap the memory and update m.
+	if errno := m.munmap(uintptr(unsafe.Pointer(&b[0])), uintptr(len(b))); errno != nil {
+		return errno
+	}
+	delete(m.active, p)
+	return nil
+}
+
+func Read(fd int, p []byte) (n int, err error) {
+	n, err = read(fd, p)
+	if raceenabled {
+		if n > 0 {
+			raceWriteRange(unsafe.Pointer(&p[0]), n)
+		}
+		if err == nil {
+			raceAcquire(unsafe.Pointer(&ioSync))
+		}
+	}
+	return
+}
+
+func Write(fd int, p []byte) (n int, err error) {
+	if raceenabled {
+		raceReleaseMerge(unsafe.Pointer(&ioSync))
+	}
+	n, err = write(fd, p)
+	if raceenabled && n > 0 {
+		raceReadRange(unsafe.Pointer(&p[0]), n)
+	}
+	return
+}
+
+// For testing: clients can set this flag to force
+// creation of IPv6 sockets to return EAFNOSUPPORT.
+var SocketDisableIPv6 bool
+
+type Sockaddr interface {
+	sockaddr() (ptr unsafe.Pointer, len _Socklen, err error) // lowercase; only we can define Sockaddrs
+}
+
+type SockaddrInet4 struct {
+	Port int
+	Addr [4]byte
+	raw  RawSockaddrInet4
+}
+
+type SockaddrInet6 struct {
+	Port   int
+	ZoneId uint32
+	Addr   [16]byte
+	raw    RawSockaddrInet6
+}
+
+type SockaddrUnix struct {
+	Name string
+	raw  RawSockaddrUnix
+}
+
+func Bind(fd int, sa Sockaddr) (err error) {
+	ptr, n, err := sa.sockaddr()
+	if err != nil {
+		return err
+	}
+	return bind(fd, ptr, n)
+}
+
+func Connect(fd int, sa Sockaddr) (err error) {
+	ptr, n, err := sa.sockaddr()
+	if err != nil {
+		return err
+	}
+	return connect(fd, ptr, n)
+}
+
+func Getpeername(fd int) (sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if err = getpeername(fd, &rsa, &len); err != nil {
+		return
+	}
+	return anyToSockaddr(&rsa)
+}
+
+func GetsockoptInt(fd, level, opt int) (value int, err error) {
+	var n int32
+	vallen := _Socklen(4)
+	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
+	return int(n), err
+}
+
+func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	if n, err = recvfrom(fd, p, flags, &rsa, &len); err != nil {
+		return
+	}
+	if rsa.Addr.Family != AF_UNSPEC {
+		from, err = anyToSockaddr(&rsa)
+	}
+	return
+}
+
+func Sendto(fd int, p []byte, flags int, to Sockaddr) (err error) {
+	ptr, n, err := to.sockaddr()
+	if err != nil {
+		return err
+	}
+	return sendto(fd, p, flags, ptr, n)
+}
+
+func SetsockoptByte(fd, level, opt int, value byte) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(&value), 1)
+}
+
+func SetsockoptInt(fd, level, opt int, value int) (err error) {
+	var n = int32(value)
+	return setsockopt(fd, level, opt, unsafe.Pointer(&n), 4)
+}
+
+func SetsockoptInet4Addr(fd, level, opt int, value [4]byte) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(&value[0]), 4)
+}
+
+func SetsockoptIPMreq(fd, level, opt int, mreq *IPMreq) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPMreq)
+}
+
+func SetsockoptIPv6Mreq(fd, level, opt int, mreq *IPv6Mreq) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPv6Mreq)
+}
+
+func SetsockoptICMPv6Filter(fd, level, opt int, filter *ICMPv6Filter) error {
+	return setsockopt(fd, level, opt, unsafe.Pointer(filter), SizeofICMPv6Filter)
+}
+
+func SetsockoptLinger(fd, level, opt int, l *Linger) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(l), SizeofLinger)
+}
+
+func SetsockoptString(fd, level, opt int, s string) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(&[]byte(s)[0]), uintptr(len(s)))
+}
+
+func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (err error) {
+	return setsockopt(fd, level, opt, unsafe.Pointer(tv), unsafe.Sizeof(*tv))
+}
+
+func Socket(domain, typ, proto int) (fd int, err error) {
+	if domain == AF_INET6 && SocketDisableIPv6 {
+		return -1, EAFNOSUPPORT
+	}
+	fd, err = socket(domain, typ, proto)
+	return
+}
+
+func Socketpair(domain, typ, proto int) (fd [2]int, err error) {
+	var fdx [2]int32
+	err = socketpair(domain, typ, proto, &fdx)
+	if err == nil {
+		fd[0] = int(fdx[0])
+		fd[1] = int(fdx[1])
+	}
+	return
+}
+
+func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	if raceenabled {
+		raceReleaseMerge(unsafe.Pointer(&ioSync))
+	}
+	return sendfile(outfd, infd, offset, count)
+}
+
+var ioSync int64
+
+func CloseOnExec(fd int) { fcntl(fd, F_SETFD, FD_CLOEXEC) }
+
+func SetNonblock(fd int, nonblocking bool) (err error) {
+	flag, err := fcntl(fd, F_GETFL, 0)
+	if err != nil {
+		return err
+	}
+	if nonblocking {
+		flag |= O_NONBLOCK
+	} else {
+		flag &= ^O_NONBLOCK
+	}
+	_, err = fcntl(fd, F_SETFL, flag)
+	return err
+}
diff --git a/vendor/golang.org/x/sys/unix/types_darwin.go b/vendor/golang.org/x/sys/unix/types_darwin.go
new file mode 100644
index 0000000000..1153261822
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_darwin.go
@@ -0,0 +1,250 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define __DARWIN_UNIX03 0
+#define KERNEL
+#define _DARWIN_USE_64_BIT_INODE
+#include <dirent.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <termios.h>
+#include <unistd.h>
+#include <mach/mach.h>
+#include <mach/message.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_var.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+type Timeval32 C.struct_timeval32
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+type Stat_t C.struct_stat64
+
+type Statfs_t C.struct_statfs64
+
+type Flock_t C.struct_flock
+
+type Fstore_t C.struct_fstore
+
+type Radvisory_t C.struct_radvisory
+
+type Fbootstraptransfer_t C.struct_fbootstraptransfer
+
+type Log2phys_t C.struct_log2phys
+
+type Fsid C.struct_fsid
+
+type Dirent C.struct_dirent
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet4Pktinfo C.struct_in_pktinfo
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet4Pktinfo     = C.sizeof_struct_in_pktinfo
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr    = C.sizeof_struct_if_msghdr
+	SizeofIfData      = C.sizeof_struct_if_data
+	SizeofIfaMsghdr   = C.sizeof_struct_ifa_msghdr
+	SizeofIfmaMsghdr  = C.sizeof_struct_ifma_msghdr
+	SizeofIfmaMsghdr2 = C.sizeof_struct_ifma_msghdr2
+	SizeofRtMsghdr    = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics   = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfmaMsghdr C.struct_ifma_msghdr
+
+type IfmaMsghdr2 C.struct_ifma_msghdr2
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+// Terminal handling
+
+type Termios C.struct_termios
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
diff --git a/vendor/golang.org/x/sys/unix/types_dragonfly.go b/vendor/golang.org/x/sys/unix/types_dragonfly.go
new file mode 100644
index 0000000000..f3c971dffd
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_dragonfly.go
@@ -0,0 +1,242 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+#include <dirent.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <termios.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+const ( // Directory mode bits
+	S_IFMT   = C.S_IFMT
+	S_IFIFO  = C.S_IFIFO
+	S_IFCHR  = C.S_IFCHR
+	S_IFDIR  = C.S_IFDIR
+	S_IFBLK  = C.S_IFBLK
+	S_IFREG  = C.S_IFREG
+	S_IFLNK  = C.S_IFLNK
+	S_IFSOCK = C.S_IFSOCK
+	S_ISUID  = C.S_ISUID
+	S_ISGID  = C.S_ISGID
+	S_ISVTX  = C.S_ISVTX
+	S_IRUSR  = C.S_IRUSR
+	S_IWUSR  = C.S_IWUSR
+	S_IXUSR  = C.S_IXUSR
+)
+
+type Stat_t C.struct_stat
+
+type Statfs_t C.struct_statfs
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+type Fsid C.struct_fsid
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
+	SizeofIfData           = C.sizeof_struct_if_data
+	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
+	SizeofIfmaMsghdr       = C.sizeof_struct_ifma_msghdr
+	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
+	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfmaMsghdr C.struct_ifma_msghdr
+
+type IfAnnounceMsghdr C.struct_if_announcemsghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+// Terminal handling
+
+type Termios C.struct_termios
diff --git a/vendor/golang.org/x/sys/unix/types_freebsd.go b/vendor/golang.org/x/sys/unix/types_freebsd.go
new file mode 100644
index 0000000000..ae24557ad1
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_freebsd.go
@@ -0,0 +1,353 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+#include <dirent.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <termios.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+// This structure is a duplicate of stat on FreeBSD 8-STABLE.
+// See /usr/include/sys/stat.h.
+struct stat8 {
+#undef st_atimespec	st_atim
+#undef st_mtimespec	st_mtim
+#undef st_ctimespec	st_ctim
+#undef st_birthtimespec	st_birthtim
+	__dev_t   st_dev;
+	ino_t     st_ino;
+	mode_t    st_mode;
+	nlink_t   st_nlink;
+	uid_t     st_uid;
+	gid_t     st_gid;
+	__dev_t   st_rdev;
+#if __BSD_VISIBLE
+	struct  timespec st_atimespec;
+	struct  timespec st_mtimespec;
+	struct  timespec st_ctimespec;
+#else
+	time_t    st_atime;
+	long      __st_atimensec;
+	time_t    st_mtime;
+	long      __st_mtimensec;
+	time_t    st_ctime;
+	long      __st_ctimensec;
+#endif
+	off_t     st_size;
+	blkcnt_t st_blocks;
+	blksize_t st_blksize;
+	fflags_t  st_flags;
+	__uint32_t st_gen;
+	__int32_t st_lspare;
+#if __BSD_VISIBLE
+	struct timespec st_birthtimespec;
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
+#else
+	time_t    st_birthtime;
+	long      st_birthtimensec;
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
+#endif
+};
+
+// This structure is a duplicate of if_data on FreeBSD 8-STABLE.
+// See /usr/include/net/if.h.
+struct if_data8 {
+	u_char  ifi_type;
+	u_char  ifi_physical;
+	u_char  ifi_addrlen;
+	u_char  ifi_hdrlen;
+	u_char  ifi_link_state;
+	u_char  ifi_spare_char1;
+	u_char  ifi_spare_char2;
+	u_char  ifi_datalen;
+	u_long  ifi_mtu;
+	u_long  ifi_metric;
+	u_long  ifi_baudrate;
+	u_long  ifi_ipackets;
+	u_long  ifi_ierrors;
+	u_long  ifi_opackets;
+	u_long  ifi_oerrors;
+	u_long  ifi_collisions;
+	u_long  ifi_ibytes;
+	u_long  ifi_obytes;
+	u_long  ifi_imcasts;
+	u_long  ifi_omcasts;
+	u_long  ifi_iqdrops;
+	u_long  ifi_noproto;
+	u_long  ifi_hwassist;
+	time_t  ifi_epoch;
+	struct  timeval ifi_lastchange;
+};
+
+// This structure is a duplicate of if_msghdr on FreeBSD 8-STABLE.
+// See /usr/include/net/if.h.
+struct if_msghdr8 {
+	u_short ifm_msglen;
+	u_char  ifm_version;
+	u_char  ifm_type;
+	int     ifm_addrs;
+	int     ifm_flags;
+	u_short ifm_index;
+	struct  if_data8 ifm_data;
+};
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+const ( // Directory mode bits
+	S_IFMT   = C.S_IFMT
+	S_IFIFO  = C.S_IFIFO
+	S_IFCHR  = C.S_IFCHR
+	S_IFDIR  = C.S_IFDIR
+	S_IFBLK  = C.S_IFBLK
+	S_IFREG  = C.S_IFREG
+	S_IFLNK  = C.S_IFLNK
+	S_IFSOCK = C.S_IFSOCK
+	S_ISUID  = C.S_ISUID
+	S_ISGID  = C.S_ISGID
+	S_ISVTX  = C.S_ISVTX
+	S_IRUSR  = C.S_IRUSR
+	S_IWUSR  = C.S_IWUSR
+	S_IXUSR  = C.S_IXUSR
+)
+
+type Stat_t C.struct_stat8
+
+type Statfs_t C.struct_statfs
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+type Fsid C.struct_fsid
+
+// Advice to Fadvise
+
+const (
+	FADV_NORMAL     = C.POSIX_FADV_NORMAL
+	FADV_RANDOM     = C.POSIX_FADV_RANDOM
+	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
+	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
+	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
+	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
+)
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPMreqn C.struct_ip_mreqn
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPMreqn          = C.sizeof_struct_ip_mreqn
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	sizeofIfMsghdr         = C.sizeof_struct_if_msghdr
+	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr8
+	sizeofIfData           = C.sizeof_struct_if_data
+	SizeofIfData           = C.sizeof_struct_if_data8
+	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
+	SizeofIfmaMsghdr       = C.sizeof_struct_ifma_msghdr
+	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
+	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
+)
+
+type ifMsghdr C.struct_if_msghdr
+
+type IfMsghdr C.struct_if_msghdr8
+
+type ifData C.struct_if_data
+
+type IfData C.struct_if_data8
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfmaMsghdr C.struct_ifma_msghdr
+
+type IfAnnounceMsghdr C.struct_if_announcemsghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion    = C.sizeof_struct_bpf_version
+	SizeofBpfStat       = C.sizeof_struct_bpf_stat
+	SizeofBpfZbuf       = C.sizeof_struct_bpf_zbuf
+	SizeofBpfProgram    = C.sizeof_struct_bpf_program
+	SizeofBpfInsn       = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr        = C.sizeof_struct_bpf_hdr
+	SizeofBpfZbufHeader = C.sizeof_struct_bpf_zbuf_header
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfZbuf C.struct_bpf_zbuf
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+type BpfZbufHeader C.struct_bpf_zbuf_header
+
+// Terminal handling
+
+type Termios C.struct_termios
diff --git a/vendor/golang.org/x/sys/unix/types_linux.go b/vendor/golang.org/x/sys/unix/types_linux.go
new file mode 100644
index 0000000000..d004b4a484
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_linux.go
@@ -0,0 +1,435 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define _LARGEFILE_SOURCE
+#define _LARGEFILE64_SOURCE
+#define _FILE_OFFSET_BITS 64
+#define _GNU_SOURCE
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netpacket/packet.h>
+#include <signal.h>
+#include <stdio.h>
+#include <sys/epoll.h>
+#include <sys/inotify.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/stat.h>
+#include <sys/statfs.h>
+#include <sys/sysinfo.h>
+#include <sys/time.h>
+#include <sys/times.h>
+#include <sys/timex.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <sys/user.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <linux/filter.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <linux/icmpv6.h>
+#include <asm/termbits.h>
+#include <time.h>
+#include <unistd.h>
+#include <ustat.h>
+#include <utime.h>
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+
+#ifdef TCSETS2
+// On systems that have "struct termios2" use this as type Termios.
+typedef struct termios2 termios_t;
+#else
+typedef struct termios termios_t;
+#endif
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_ll s5;
+	struct sockaddr_nl s6;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+// copied from /usr/include/linux/un.h
+struct my_sockaddr_un {
+	sa_family_t sun_family;
+#if defined(__ARM_EABI__) || defined(__powerpc64__)
+	// on ARM char is by default unsigned
+	signed char sun_path[108];
+#else
+	char sun_path[108];
+#endif
+};
+
+#ifdef __ARM_EABI__
+typedef struct user_regs PtraceRegs;
+#elif defined(__aarch64__)
+typedef struct user_pt_regs PtraceRegs;
+#elif defined(__powerpc64__)
+typedef struct pt_regs PtraceRegs;
+#elif defined(__mips__)
+typedef struct user PtraceRegs;
+#elif defined(__s390x__)
+typedef struct _user_regs_struct PtraceRegs;
+#else
+typedef struct user_regs_struct PtraceRegs;
+#endif
+
+#if defined(__s390x__)
+typedef struct _user_psw_struct ptracePsw;
+typedef struct _user_fpregs_struct ptraceFpregs;
+typedef struct _user_per_struct ptracePer;
+#else
+typedef struct {} ptracePsw;
+typedef struct {} ptraceFpregs;
+typedef struct {} ptracePer;
+#endif
+
+// The real epoll_event is a union, and godefs doesn't handle it well.
+struct my_epoll_event {
+	uint32_t events;
+#if defined(__ARM_EABI__) || defined(__aarch64__)
+	// padding is not specified in linux/eventpoll.h but added to conform to the
+	// alignment requirements of EABI
+	int32_t padFd;
+#elif defined(__powerpc64__) || defined(__s390x__)
+	int32_t _padFd;
+#endif
+	int32_t fd;
+	int32_t pad;
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+	PathMax        = C.PATH_MAX
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+type Timex C.struct_timex
+
+type Time_t C.time_t
+
+type Tms C.struct_tms
+
+type Utimbuf C.struct_utimbuf
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+type Stat_t C.struct_stat
+
+type Statfs_t C.struct_statfs
+
+type Dirent C.struct_dirent
+
+type Fsid C.fsid_t
+
+type Flock_t C.struct_flock
+
+// Advice to Fadvise
+
+const (
+	FADV_NORMAL     = C.POSIX_FADV_NORMAL
+	FADV_RANDOM     = C.POSIX_FADV_RANDOM
+	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
+	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
+	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
+	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
+)
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_my_sockaddr_un
+
+type RawSockaddrLinklayer C.struct_sockaddr_ll
+
+type RawSockaddrNetlink C.struct_sockaddr_nl
+
+type RawSockaddrHCI C.struct_sockaddr_hci
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPMreqn C.struct_ip_mreqn
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet4Pktinfo C.struct_in_pktinfo
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+type Ucred C.struct_ucred
+
+type TCPInfo C.struct_tcp_info
+
+const (
+	SizeofSockaddrInet4     = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6     = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny       = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix      = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrLinklayer = C.sizeof_struct_sockaddr_ll
+	SizeofSockaddrNetlink   = C.sizeof_struct_sockaddr_nl
+	SizeofSockaddrHCI       = C.sizeof_struct_sockaddr_hci
+	SizeofLinger            = C.sizeof_struct_linger
+	SizeofIPMreq            = C.sizeof_struct_ip_mreq
+	SizeofIPMreqn           = C.sizeof_struct_ip_mreqn
+	SizeofIPv6Mreq          = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr            = C.sizeof_struct_msghdr
+	SizeofCmsghdr           = C.sizeof_struct_cmsghdr
+	SizeofInet4Pktinfo      = C.sizeof_struct_in_pktinfo
+	SizeofInet6Pktinfo      = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo       = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter      = C.sizeof_struct_icmp6_filter
+	SizeofUcred             = C.sizeof_struct_ucred
+	SizeofTCPInfo           = C.sizeof_struct_tcp_info
+)
+
+// Netlink routing and interface messages
+
+const (
+	IFA_UNSPEC          = C.IFA_UNSPEC
+	IFA_ADDRESS         = C.IFA_ADDRESS
+	IFA_LOCAL           = C.IFA_LOCAL
+	IFA_LABEL           = C.IFA_LABEL
+	IFA_BROADCAST       = C.IFA_BROADCAST
+	IFA_ANYCAST         = C.IFA_ANYCAST
+	IFA_CACHEINFO       = C.IFA_CACHEINFO
+	IFA_MULTICAST       = C.IFA_MULTICAST
+	IFLA_UNSPEC         = C.IFLA_UNSPEC
+	IFLA_ADDRESS        = C.IFLA_ADDRESS
+	IFLA_BROADCAST      = C.IFLA_BROADCAST
+	IFLA_IFNAME         = C.IFLA_IFNAME
+	IFLA_MTU            = C.IFLA_MTU
+	IFLA_LINK           = C.IFLA_LINK
+	IFLA_QDISC          = C.IFLA_QDISC
+	IFLA_STATS          = C.IFLA_STATS
+	IFLA_COST           = C.IFLA_COST
+	IFLA_PRIORITY       = C.IFLA_PRIORITY
+	IFLA_MASTER         = C.IFLA_MASTER
+	IFLA_WIRELESS       = C.IFLA_WIRELESS
+	IFLA_PROTINFO       = C.IFLA_PROTINFO
+	IFLA_TXQLEN         = C.IFLA_TXQLEN
+	IFLA_MAP            = C.IFLA_MAP
+	IFLA_WEIGHT         = C.IFLA_WEIGHT
+	IFLA_OPERSTATE      = C.IFLA_OPERSTATE
+	IFLA_LINKMODE       = C.IFLA_LINKMODE
+	IFLA_LINKINFO       = C.IFLA_LINKINFO
+	IFLA_NET_NS_PID     = C.IFLA_NET_NS_PID
+	IFLA_IFALIAS        = C.IFLA_IFALIAS
+	IFLA_MAX            = C.IFLA_MAX
+	RT_SCOPE_UNIVERSE   = C.RT_SCOPE_UNIVERSE
+	RT_SCOPE_SITE       = C.RT_SCOPE_SITE
+	RT_SCOPE_LINK       = C.RT_SCOPE_LINK
+	RT_SCOPE_HOST       = C.RT_SCOPE_HOST
+	RT_SCOPE_NOWHERE    = C.RT_SCOPE_NOWHERE
+	RT_TABLE_UNSPEC     = C.RT_TABLE_UNSPEC
+	RT_TABLE_COMPAT     = C.RT_TABLE_COMPAT
+	RT_TABLE_DEFAULT    = C.RT_TABLE_DEFAULT
+	RT_TABLE_MAIN       = C.RT_TABLE_MAIN
+	RT_TABLE_LOCAL      = C.RT_TABLE_LOCAL
+	RT_TABLE_MAX        = C.RT_TABLE_MAX
+	RTA_UNSPEC          = C.RTA_UNSPEC
+	RTA_DST             = C.RTA_DST
+	RTA_SRC             = C.RTA_SRC
+	RTA_IIF             = C.RTA_IIF
+	RTA_OIF             = C.RTA_OIF
+	RTA_GATEWAY         = C.RTA_GATEWAY
+	RTA_PRIORITY        = C.RTA_PRIORITY
+	RTA_PREFSRC         = C.RTA_PREFSRC
+	RTA_METRICS         = C.RTA_METRICS
+	RTA_MULTIPATH       = C.RTA_MULTIPATH
+	RTA_FLOW            = C.RTA_FLOW
+	RTA_CACHEINFO       = C.RTA_CACHEINFO
+	RTA_TABLE           = C.RTA_TABLE
+	RTN_UNSPEC          = C.RTN_UNSPEC
+	RTN_UNICAST         = C.RTN_UNICAST
+	RTN_LOCAL           = C.RTN_LOCAL
+	RTN_BROADCAST       = C.RTN_BROADCAST
+	RTN_ANYCAST         = C.RTN_ANYCAST
+	RTN_MULTICAST       = C.RTN_MULTICAST
+	RTN_BLACKHOLE       = C.RTN_BLACKHOLE
+	RTN_UNREACHABLE     = C.RTN_UNREACHABLE
+	RTN_PROHIBIT        = C.RTN_PROHIBIT
+	RTN_THROW           = C.RTN_THROW
+	RTN_NAT             = C.RTN_NAT
+	RTN_XRESOLVE        = C.RTN_XRESOLVE
+	RTNLGRP_NONE        = C.RTNLGRP_NONE
+	RTNLGRP_LINK        = C.RTNLGRP_LINK
+	RTNLGRP_NOTIFY      = C.RTNLGRP_NOTIFY
+	RTNLGRP_NEIGH       = C.RTNLGRP_NEIGH
+	RTNLGRP_TC          = C.RTNLGRP_TC
+	RTNLGRP_IPV4_IFADDR = C.RTNLGRP_IPV4_IFADDR
+	RTNLGRP_IPV4_MROUTE = C.RTNLGRP_IPV4_MROUTE
+	RTNLGRP_IPV4_ROUTE  = C.RTNLGRP_IPV4_ROUTE
+	RTNLGRP_IPV4_RULE   = C.RTNLGRP_IPV4_RULE
+	RTNLGRP_IPV6_IFADDR = C.RTNLGRP_IPV6_IFADDR
+	RTNLGRP_IPV6_MROUTE = C.RTNLGRP_IPV6_MROUTE
+	RTNLGRP_IPV6_ROUTE  = C.RTNLGRP_IPV6_ROUTE
+	RTNLGRP_IPV6_IFINFO = C.RTNLGRP_IPV6_IFINFO
+	RTNLGRP_IPV6_PREFIX = C.RTNLGRP_IPV6_PREFIX
+	RTNLGRP_IPV6_RULE   = C.RTNLGRP_IPV6_RULE
+	RTNLGRP_ND_USEROPT  = C.RTNLGRP_ND_USEROPT
+	SizeofNlMsghdr      = C.sizeof_struct_nlmsghdr
+	SizeofNlMsgerr      = C.sizeof_struct_nlmsgerr
+	SizeofRtGenmsg      = C.sizeof_struct_rtgenmsg
+	SizeofNlAttr        = C.sizeof_struct_nlattr
+	SizeofRtAttr        = C.sizeof_struct_rtattr
+	SizeofIfInfomsg     = C.sizeof_struct_ifinfomsg
+	SizeofIfAddrmsg     = C.sizeof_struct_ifaddrmsg
+	SizeofRtMsg         = C.sizeof_struct_rtmsg
+	SizeofRtNexthop     = C.sizeof_struct_rtnexthop
+)
+
+type NlMsghdr C.struct_nlmsghdr
+
+type NlMsgerr C.struct_nlmsgerr
+
+type RtGenmsg C.struct_rtgenmsg
+
+type NlAttr C.struct_nlattr
+
+type RtAttr C.struct_rtattr
+
+type IfInfomsg C.struct_ifinfomsg
+
+type IfAddrmsg C.struct_ifaddrmsg
+
+type RtMsg C.struct_rtmsg
+
+type RtNexthop C.struct_rtnexthop
+
+// Linux socket filter
+
+const (
+	SizeofSockFilter = C.sizeof_struct_sock_filter
+	SizeofSockFprog  = C.sizeof_struct_sock_fprog
+)
+
+type SockFilter C.struct_sock_filter
+
+type SockFprog C.struct_sock_fprog
+
+// Inotify
+
+type InotifyEvent C.struct_inotify_event
+
+const SizeofInotifyEvent = C.sizeof_struct_inotify_event
+
+// Ptrace
+
+// Register structures
+type PtraceRegs C.PtraceRegs
+
+// Structures contained in PtraceRegs on s390x (exported by mkpost.go)
+type ptracePsw C.ptracePsw
+
+type ptraceFpregs C.ptraceFpregs
+
+type ptracePer C.ptracePer
+
+// Misc
+
+type FdSet C.fd_set
+
+type Sysinfo_t C.struct_sysinfo
+
+type Utsname C.struct_utsname
+
+type Ustat_t C.struct_ustat
+
+type EpollEvent C.struct_my_epoll_event
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_REMOVEDIR        = C.AT_REMOVEDIR
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// Terminal handling
+
+type Termios C.termios_t
diff --git a/vendor/golang.org/x/sys/unix/types_netbsd.go b/vendor/golang.org/x/sys/unix/types_netbsd.go
new file mode 100644
index 0000000000..d15f93d192
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_netbsd.go
@@ -0,0 +1,232 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+#include <dirent.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <termios.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+type Stat_t C.struct_stat
+
+type Statfs_t C.struct_statfs
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+type Fsid C.fsid_t
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
+	SizeofIfData           = C.sizeof_struct_if_data
+	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
+	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
+	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfAnnounceMsghdr C.struct_if_announcemsghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+type Mclpool C.struct_mclpool
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+type BpfTimeval C.struct_bpf_timeval
+
+// Terminal handling
+
+type Termios C.struct_termios
+
+// Sysctl
+
+type Sysctlnode C.struct_sysctlnode
diff --git a/vendor/golang.org/x/sys/unix/types_openbsd.go b/vendor/golang.org/x/sys/unix/types_openbsd.go
new file mode 100644
index 0000000000..b66fe25f73
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_openbsd.go
@@ -0,0 +1,244 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+#include <dirent.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <termios.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+const ( // Directory mode bits
+	S_IFMT   = C.S_IFMT
+	S_IFIFO  = C.S_IFIFO
+	S_IFCHR  = C.S_IFCHR
+	S_IFDIR  = C.S_IFDIR
+	S_IFBLK  = C.S_IFBLK
+	S_IFREG  = C.S_IFREG
+	S_IFLNK  = C.S_IFLNK
+	S_IFSOCK = C.S_IFSOCK
+	S_ISUID  = C.S_ISUID
+	S_ISGID  = C.S_ISGID
+	S_ISVTX  = C.S_ISVTX
+	S_IRUSR  = C.S_IRUSR
+	S_IWUSR  = C.S_IWUSR
+	S_IXUSR  = C.S_IXUSR
+)
+
+type Stat_t C.struct_stat
+
+type Statfs_t C.struct_statfs
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+type Fsid C.fsid_t
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Ptrace requests
+
+const (
+	PTRACE_TRACEME = C.PT_TRACE_ME
+	PTRACE_CONT    = C.PT_CONTINUE
+	PTRACE_KILL    = C.PT_KILL
+)
+
+// Events (kqueue, kevent)
+
+type Kevent_t C.struct_kevent
+
+// Select
+
+type FdSet C.fd_set
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
+	SizeofIfData           = C.sizeof_struct_if_data
+	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
+	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
+	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type IfAnnounceMsghdr C.struct_if_announcemsghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+type Mclpool C.struct_mclpool
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfHdr C.struct_bpf_hdr
+
+type BpfTimeval C.struct_bpf_timeval
+
+// Terminal handling
+
+type Termios C.struct_termios
diff --git a/vendor/golang.org/x/sys/unix/types_solaris.go b/vendor/golang.org/x/sys/unix/types_solaris.go
new file mode 100644
index 0000000000..6ad50eaba6
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/types_solaris.go
@@ -0,0 +1,260 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+/*
+Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+*/
+
+// +godefs map struct_in_addr [4]byte /* in_addr */
+// +godefs map struct_in6_addr [16]byte /* in6_addr */
+
+package unix
+
+/*
+#define KERNEL
+// These defines ensure that builds done on newer versions of Solaris are
+// backwards-compatible with older versions of Solaris and
+// OpenSolaris-based derivatives.
+#define __USE_SUNOS_SOCKETS__          // msghdr
+#define __USE_LEGACY_PROTOTYPES__      // iovec
+#include <dirent.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <signal.h>
+#include <termios.h>
+#include <termio.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/select.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/times.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <netinet/tcp.h>
+#include <ustat.h>
+#include <utime.h>
+
+enum {
+	sizeofPtr = sizeof(void*),
+};
+
+union sockaddr_all {
+	struct sockaddr s1;	// this one gets used for fields
+	struct sockaddr_in s2;	// these pad it out
+	struct sockaddr_in6 s3;
+	struct sockaddr_un s4;
+	struct sockaddr_dl s5;
+};
+
+struct sockaddr_any {
+	struct sockaddr addr;
+	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
+};
+
+*/
+import "C"
+
+// Machine characteristics; for internal use.
+
+const (
+	sizeofPtr      = C.sizeofPtr
+	sizeofShort    = C.sizeof_short
+	sizeofInt      = C.sizeof_int
+	sizeofLong     = C.sizeof_long
+	sizeofLongLong = C.sizeof_longlong
+	PathMax        = C.PATH_MAX
+)
+
+// Basic types
+
+type (
+	_C_short     C.short
+	_C_int       C.int
+	_C_long      C.long
+	_C_long_long C.longlong
+)
+
+// Time
+
+type Timespec C.struct_timespec
+
+type Timeval C.struct_timeval
+
+type Timeval32 C.struct_timeval32
+
+type Tms C.struct_tms
+
+type Utimbuf C.struct_utimbuf
+
+// Processes
+
+type Rusage C.struct_rusage
+
+type Rlimit C.struct_rlimit
+
+type _Gid_t C.gid_t
+
+// Files
+
+const ( // Directory mode bits
+	S_IFMT   = C.S_IFMT
+	S_IFIFO  = C.S_IFIFO
+	S_IFCHR  = C.S_IFCHR
+	S_IFDIR  = C.S_IFDIR
+	S_IFBLK  = C.S_IFBLK
+	S_IFREG  = C.S_IFREG
+	S_IFLNK  = C.S_IFLNK
+	S_IFSOCK = C.S_IFSOCK
+	S_ISUID  = C.S_ISUID
+	S_ISGID  = C.S_ISGID
+	S_ISVTX  = C.S_ISVTX
+	S_IRUSR  = C.S_IRUSR
+	S_IWUSR  = C.S_IWUSR
+	S_IXUSR  = C.S_IXUSR
+)
+
+type Stat_t C.struct_stat
+
+type Flock_t C.struct_flock
+
+type Dirent C.struct_dirent
+
+// Sockets
+
+type RawSockaddrInet4 C.struct_sockaddr_in
+
+type RawSockaddrInet6 C.struct_sockaddr_in6
+
+type RawSockaddrUnix C.struct_sockaddr_un
+
+type RawSockaddrDatalink C.struct_sockaddr_dl
+
+type RawSockaddr C.struct_sockaddr
+
+type RawSockaddrAny C.struct_sockaddr_any
+
+type _Socklen C.socklen_t
+
+type Linger C.struct_linger
+
+type Iovec C.struct_iovec
+
+type IPMreq C.struct_ip_mreq
+
+type IPv6Mreq C.struct_ipv6_mreq
+
+type Msghdr C.struct_msghdr
+
+type Cmsghdr C.struct_cmsghdr
+
+type Inet6Pktinfo C.struct_in6_pktinfo
+
+type IPv6MTUInfo C.struct_ip6_mtuinfo
+
+type ICMPv6Filter C.struct_icmp6_filter
+
+const (
+	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
+	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
+	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
+	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
+	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
+	SizeofLinger           = C.sizeof_struct_linger
+	SizeofIPMreq           = C.sizeof_struct_ip_mreq
+	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
+	SizeofMsghdr           = C.sizeof_struct_msghdr
+	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
+	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
+	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
+	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
+)
+
+// Select
+
+type FdSet C.fd_set
+
+// Misc
+
+type Utsname C.struct_utsname
+
+type Ustat_t C.struct_ustat
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
+	AT_REMOVEDIR        = C.AT_REMOVEDIR
+	AT_EACCESS          = C.AT_EACCESS
+)
+
+// Routing and interface messages
+
+const (
+	SizeofIfMsghdr  = C.sizeof_struct_if_msghdr
+	SizeofIfData    = C.sizeof_struct_if_data
+	SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr
+	SizeofRtMsghdr  = C.sizeof_struct_rt_msghdr
+	SizeofRtMetrics = C.sizeof_struct_rt_metrics
+)
+
+type IfMsghdr C.struct_if_msghdr
+
+type IfData C.struct_if_data
+
+type IfaMsghdr C.struct_ifa_msghdr
+
+type RtMsghdr C.struct_rt_msghdr
+
+type RtMetrics C.struct_rt_metrics
+
+// Berkeley packet filter
+
+const (
+	SizeofBpfVersion = C.sizeof_struct_bpf_version
+	SizeofBpfStat    = C.sizeof_struct_bpf_stat
+	SizeofBpfProgram = C.sizeof_struct_bpf_program
+	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
+	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
+)
+
+type BpfVersion C.struct_bpf_version
+
+type BpfStat C.struct_bpf_stat
+
+type BpfProgram C.struct_bpf_program
+
+type BpfInsn C.struct_bpf_insn
+
+type BpfTimeval C.struct_bpf_timeval
+
+type BpfHdr C.struct_bpf_hdr
+
+// sysconf information
+
+const _SC_PAGESIZE = C._SC_PAGESIZE
+
+// Terminal handling
+
+type Termios C.struct_termios
+
+type Termio C.struct_termio
+
+type Winsize C.struct_winsize
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
new file mode 100644
index 0000000000..8e63888351
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
@@ -0,0 +1,1576 @@
+// mkerrors.sh -m32
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,darwin
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4008426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80084267
+	BIOCSETFNR                        = 0x8008427e
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8008426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xe
+	EVFILT_THREADMARKER               = 0xe
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x3c
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_ANON                          = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_SHARED                        = 0x1
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc01c697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc0086924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc0286938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc00c6981
+	SIOCRSLVMULTI                     = 0xc008693b
+	SIOCSDRVSPEC                      = 0x801c697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40087458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40087459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x20
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
+	EBADF           = syscall.Errno(0x9)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x59)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x6a)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5f)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x61)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x66)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x64)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "device not configured",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource deadlock avoided",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "resource busy",
+	17:  "file exists",
+	18:  "cross-device link",
+	19:  "operation not supported by device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "result too large",
+	35:  "resource temporarily unavailable",
+	36:  "operation now in progress",
+	37:  "operation already in progress",
+	38:  "socket operation on non-socket",
+	39:  "destination address required",
+	40:  "message too long",
+	41:  "protocol wrong type for socket",
+	42:  "protocol not available",
+	43:  "protocol not supported",
+	44:  "socket type not supported",
+	45:  "operation not supported",
+	46:  "protocol family not supported",
+	47:  "address family not supported by protocol family",
+	48:  "address already in use",
+	49:  "can't assign requested address",
+	50:  "network is down",
+	51:  "network is unreachable",
+	52:  "network dropped connection on reset",
+	53:  "software caused connection abort",
+	54:  "connection reset by peer",
+	55:  "no buffer space available",
+	56:  "socket is already connected",
+	57:  "socket is not connected",
+	58:  "can't send after socket shutdown",
+	59:  "too many references: can't splice",
+	60:  "operation timed out",
+	61:  "connection refused",
+	62:  "too many levels of symbolic links",
+	63:  "file name too long",
+	64:  "host is down",
+	65:  "no route to host",
+	66:  "directory not empty",
+	67:  "too many processes",
+	68:  "too many users",
+	69:  "disc quota exceeded",
+	70:  "stale NFS file handle",
+	71:  "too many levels of remote in path",
+	72:  "RPC struct is bad",
+	73:  "RPC version wrong",
+	74:  "RPC prog. not avail",
+	75:  "program version wrong",
+	76:  "bad procedure for program",
+	77:  "no locks available",
+	78:  "function not implemented",
+	79:  "inappropriate file type or format",
+	80:  "authentication error",
+	81:  "need authenticator",
+	82:  "device power is off",
+	83:  "device error",
+	84:  "value too large to be stored in data type",
+	85:  "bad executable (or shared library)",
+	86:  "bad CPU type in executable",
+	87:  "shared library version mismatch",
+	88:  "malformed Mach-o file",
+	89:  "operation canceled",
+	90:  "identifier removed",
+	91:  "no message of desired type",
+	92:  "illegal byte sequence",
+	93:  "attribute not found",
+	94:  "bad message",
+	95:  "EMULTIHOP (Reserved)",
+	96:  "no message available on STREAM",
+	97:  "ENOLINK (Reserved)",
+	98:  "no STREAM resources",
+	99:  "not a STREAM",
+	100: "protocol error",
+	101: "STREAM ioctl timeout",
+	102: "operation not supported on socket",
+	103: "policy not found",
+	104: "state not recoverable",
+	105: "previous owner died",
+	106: "interface output queue is full",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "suspended (signal)",
+	18: "suspended",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
new file mode 100644
index 0000000000..9594f93817
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
@@ -0,0 +1,1576 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,darwin
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x8010427e
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xe
+	EVFILT_THREADMARKER               = 0xe
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x3c
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_ANON                          = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_SHARED                        = 0x1
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x40487413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
+	EBADF           = syscall.Errno(0x9)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x59)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x6a)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5f)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x61)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x66)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x64)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "device not configured",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource deadlock avoided",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "resource busy",
+	17:  "file exists",
+	18:  "cross-device link",
+	19:  "operation not supported by device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "result too large",
+	35:  "resource temporarily unavailable",
+	36:  "operation now in progress",
+	37:  "operation already in progress",
+	38:  "socket operation on non-socket",
+	39:  "destination address required",
+	40:  "message too long",
+	41:  "protocol wrong type for socket",
+	42:  "protocol not available",
+	43:  "protocol not supported",
+	44:  "socket type not supported",
+	45:  "operation not supported",
+	46:  "protocol family not supported",
+	47:  "address family not supported by protocol family",
+	48:  "address already in use",
+	49:  "can't assign requested address",
+	50:  "network is down",
+	51:  "network is unreachable",
+	52:  "network dropped connection on reset",
+	53:  "software caused connection abort",
+	54:  "connection reset by peer",
+	55:  "no buffer space available",
+	56:  "socket is already connected",
+	57:  "socket is not connected",
+	58:  "can't send after socket shutdown",
+	59:  "too many references: can't splice",
+	60:  "operation timed out",
+	61:  "connection refused",
+	62:  "too many levels of symbolic links",
+	63:  "file name too long",
+	64:  "host is down",
+	65:  "no route to host",
+	66:  "directory not empty",
+	67:  "too many processes",
+	68:  "too many users",
+	69:  "disc quota exceeded",
+	70:  "stale NFS file handle",
+	71:  "too many levels of remote in path",
+	72:  "RPC struct is bad",
+	73:  "RPC version wrong",
+	74:  "RPC prog. not avail",
+	75:  "program version wrong",
+	76:  "bad procedure for program",
+	77:  "no locks available",
+	78:  "function not implemented",
+	79:  "inappropriate file type or format",
+	80:  "authentication error",
+	81:  "need authenticator",
+	82:  "device power is off",
+	83:  "device error",
+	84:  "value too large to be stored in data type",
+	85:  "bad executable (or shared library)",
+	86:  "bad CPU type in executable",
+	87:  "shared library version mismatch",
+	88:  "malformed Mach-o file",
+	89:  "operation canceled",
+	90:  "identifier removed",
+	91:  "no message of desired type",
+	92:  "illegal byte sequence",
+	93:  "attribute not found",
+	94:  "bad message",
+	95:  "EMULTIHOP (Reserved)",
+	96:  "no message available on STREAM",
+	97:  "ENOLINK (Reserved)",
+	98:  "no STREAM resources",
+	99:  "not a STREAM",
+	100: "protocol error",
+	101: "STREAM ioctl timeout",
+	102: "operation not supported on socket",
+	103: "policy not found",
+	104: "state not recoverable",
+	105: "previous owner died",
+	106: "interface output queue is full",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "suspended (signal)",
+	18: "suspended",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
new file mode 100644
index 0000000000..a410e88edd
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
@@ -0,0 +1,1293 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+// +build arm,darwin
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AX25                          = 0x3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_C_HDLC                        = 0x68
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_FDDI                          = 0xa
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_NULL                          = 0x0
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PRONET                        = 0x4
+	DLT_RAW                           = 0xc
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xe
+	EVFILT_THREADMARKER               = 0xe
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_ANON                          = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_SHARED                        = 0x1
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x40487413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
+	EBADF           = syscall.Errno(0x9)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x59)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x6a)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5f)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x61)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x66)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x64)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
new file mode 100644
index 0000000000..3189c6b345
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
@@ -0,0 +1,1576 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm64,darwin
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1c
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1e
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1c
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x28
+	AF_NATM                           = 0x1f
+	AF_NDRV                           = 0x1b
+	AF_NETBIOS                        = 0x21
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PPP                            = 0x22
+	AF_PUP                            = 0x4
+	AF_RESERVED_36                    = 0x24
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_SYSTEM                         = 0x20
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_UTUN                           = 0x26
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc00c4279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x8010427e
+	BIOCSETIF                         = 0x8020426c
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_FS                         = -0x9
+	EVFILT_MACHPORT                   = -0x8
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xe
+	EVFILT_THREADMARKER               = 0xe
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xa
+	EVFILT_VM                         = -0xc
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG0                          = 0x1000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_OOBAND                         = 0x2000
+	EV_POLL                           = 0x1000
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_ADDFILESIGS                     = 0x3d
+	F_ADDSIGS                         = 0x3b
+	F_ALLOCATEALL                     = 0x4
+	F_ALLOCATECONTIG                  = 0x2
+	F_CHKCLEAN                        = 0x29
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x43
+	F_FINDSIGS                        = 0x4e
+	F_FLUSH_DATA                      = 0x28
+	F_FREEZE_FS                       = 0x35
+	F_FULLFSYNC                       = 0x33
+	F_GETCODEDIR                      = 0x48
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETLKPID                        = 0x42
+	F_GETNOSIGPIPE                    = 0x4a
+	F_GETOWN                          = 0x5
+	F_GETPATH                         = 0x32
+	F_GETPATH_MTMINFO                 = 0x47
+	F_GETPROTECTIONCLASS              = 0x3f
+	F_GETPROTECTIONLEVEL              = 0x4d
+	F_GLOBAL_NOCACHE                  = 0x37
+	F_LOG2PHYS                        = 0x31
+	F_LOG2PHYS_EXT                    = 0x41
+	F_NOCACHE                         = 0x30
+	F_NODIRECT                        = 0x3e
+	F_OK                              = 0x0
+	F_PATHPKG_CHECK                   = 0x34
+	F_PEOFPOSMODE                     = 0x3
+	F_PREALLOCATE                     = 0x2a
+	F_RDADVISE                        = 0x2c
+	F_RDAHEAD                         = 0x2d
+	F_RDLCK                           = 0x1
+	F_SETBACKINGSTORE                 = 0x46
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETLKWTIMEOUT                   = 0xa
+	F_SETNOSIGPIPE                    = 0x49
+	F_SETOWN                          = 0x6
+	F_SETPROTECTIONCLASS              = 0x40
+	F_SETSIZE                         = 0x2b
+	F_SINGLE_WRITER                   = 0x4c
+	F_THAW_FS                         = 0x36
+	F_TRANSCODEKEY                    = 0x4b
+	F_UNLCK                           = 0x2
+	F_VOLPOSMODE                      = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_AAL5                          = 0x31
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ATM                           = 0x25
+	IFT_BRIDGE                        = 0xd1
+	IFT_CARP                          = 0xf8
+	IFT_CELLULAR                      = 0xff
+	IFT_CEPT                          = 0x13
+	IFT_DS3                           = 0x1e
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0x38
+	IFT_FDDI                          = 0xf
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_GIF                           = 0x37
+	IFT_HDH1822                       = 0x3
+	IFT_HIPPI                         = 0x2f
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE8023ADLAG                 = 0x88
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88026                      = 0xa
+	IFT_L2VLAN                        = 0x87
+	IFT_LAPB                          = 0x10
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_NSIP                          = 0x1b
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PDP                           = 0xff
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
+	IFT_PPP                           = 0x17
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PTPSERIAL                     = 0x16
+	IFT_RS232                         = 0x21
+	IFT_SDLC                          = 0x11
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0x39
+	IFT_T1                            = 0x12
+	IFT_ULTRA                         = 0x1d
+	IFT_V35                           = 0x2d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LINKLOCALNETNUM                = 0xa9fe0000
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_2292DSTOPTS                  = 0x17
+	IPV6_2292HOPLIMIT                 = 0x14
+	IPV6_2292HOPOPTS                  = 0x16
+	IPV6_2292NEXTHOP                  = 0x15
+	IPV6_2292PKTINFO                  = 0x13
+	IPV6_2292PKTOPTIONS               = 0x19
+	IPV6_2292RTHDR                    = 0x18
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_BOUND_IF                     = 0x7d
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x3c
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVTCLASS                   = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x24
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_BOUND_IF                       = 0x19
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x28
+	IP_FW_DEL                         = 0x29
+	IP_FW_FLUSH                       = 0x2a
+	IP_FW_GET                         = 0x2c
+	IP_FW_RESETLOG                    = 0x2d
+	IP_FW_ZERO                        = 0x2b
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MF                             = 0x2000
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_IFINDEX              = 0x42
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_NAT__XXX                       = 0x37
+	IP_OFFMASK                        = 0x1fff
+	IP_OLD_FW_ADD                     = 0x32
+	IP_OLD_FW_DEL                     = 0x33
+	IP_OLD_FW_FLUSH                   = 0x34
+	IP_OLD_FW_GET                     = 0x36
+	IP_OLD_FW_RESETLOG                = 0x38
+	IP_OLD_FW_ZERO                    = 0x35
+	IP_OPTIONS                        = 0x1
+	IP_PKTINFO                        = 0x1a
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVPKTINFO                    = 0x1a
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x18
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_STRIPHDR                       = 0x17
+	IP_TOS                            = 0x3
+	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IUTF8                             = 0x4000
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_CAN_REUSE                    = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_FREE_REUSABLE                = 0x7
+	MADV_FREE_REUSE                   = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MADV_ZERO_WIRED_PAGES             = 0x6
+	MAP_ANON                          = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_JIT                           = 0x800
+	MAP_NOCACHE                       = 0x400
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_SHARED                        = 0x1
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FLUSH                         = 0x400
+	MSG_HAVEMORE                      = 0x2000
+	MSG_HOLD                          = 0x800
+	MSG_NEEDSA                        = 0x10000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_RCVMORE                       = 0x4000
+	MSG_SEND                          = 0x1000
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MSG_WAITSTREAM                    = 0x200
+	MS_ASYNC                          = 0x1
+	MS_DEACTIVATE                     = 0x8
+	MS_INVALIDATE                     = 0x2
+	MS_KILLPAGES                      = 0x4
+	MS_SYNC                           = 0x10
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_DUMP2                      = 0x7
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLIST2                    = 0x6
+	NET_RT_MAXID                      = 0xa
+	NET_RT_STAT                       = 0x4
+	NET_RT_TRASH                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ABSOLUTE                     = 0x8
+	NOTE_ATTRIB                       = 0x8
+	NOTE_BACKGROUND                   = 0x40
+	NOTE_CHILD                        = 0x4
+	NOTE_CRITICAL                     = 0x20
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXITSTATUS                   = 0x4000000
+	NOTE_EXIT_CSERROR                 = 0x40000
+	NOTE_EXIT_DECRYPTFAIL             = 0x10000
+	NOTE_EXIT_DETAIL                  = 0x2000000
+	NOTE_EXIT_DETAIL_MASK             = 0x70000
+	NOTE_EXIT_MEMORY                  = 0x20000
+	NOTE_EXIT_REPARENTED              = 0x80000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_LEEWAY                       = 0x10
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_NONE                         = 0x80
+	NOTE_NSECONDS                     = 0x4
+	NOTE_PCTRLMASK                    = -0x100000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_REAP                         = 0x10000000
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_SIGNAL                       = 0x8000000
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x2
+	NOTE_VM_ERROR                     = 0x10000000
+	NOTE_VM_PRESSURE                  = 0x80000000
+	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
+	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFDEL                             = 0x20000
+	OFILL                             = 0x80
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALERT                           = 0x20000000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x1000000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x100000
+	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DSYNC                           = 0x400000
+	O_EVTONLY                         = 0x8000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x20000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_POPUP                           = 0x80000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYMLINK                         = 0x200000
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_ATTACH                         = 0xa
+	PT_ATTACHEXC                      = 0xe
+	PT_CONTINUE                       = 0x7
+	PT_DENY_ATTACH                    = 0x1f
+	PT_DETACH                         = 0xb
+	PT_FIRSTMACH                      = 0x20
+	PT_FORCEQUOTA                     = 0x1e
+	PT_KILL                           = 0x8
+	PT_READ_D                         = 0x2
+	PT_READ_I                         = 0x1
+	PT_READ_U                         = 0x3
+	PT_SIGEXC                         = 0xc
+	PT_STEP                           = 0x9
+	PT_THUPDATE                       = 0xd
+	PT_TRACE_ME                       = 0x0
+	PT_WRITE_D                        = 0x5
+	PT_WRITE_I                        = 0x4
+	PT_WRITE_U                        = 0x6
+	RLIMIT_AS                         = 0x5
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_CPU_USAGE_MONITOR          = 0x2
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_CONDEMNED                     = 0x2000000
+	RTF_DELCLONE                      = 0x80
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_IFREF                         = 0x4000000
+	RTF_IFSCOPE                       = 0x1000000
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_PROXY                         = 0x8000000
+	RTF_REJECT                        = 0x8
+	RTF_ROUTER                        = 0x10000000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_GET2                          = 0x14
+	RTM_IFINFO                        = 0xe
+	RTM_IFINFO2                       = 0x12
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_NEWMADDR2                     = 0x13
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SCM_TIMESTAMP_MONOTONIC           = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCARPIPLL                       = 0xc0206928
+	SIOCATMARK                        = 0x40047307
+	SIOCAUTOADDR                      = 0xc0206926
+	SIOCAUTONETMASK                   = 0x80206927
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206941
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETVLAN                       = 0xc020697f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFALTMTU                     = 0xc0206948
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBOND                       = 0xc0206947
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020695b
+	SIOCGIFCONF                       = 0xc00c6924
+	SIOCGIFDEVMTU                     = 0xc0206944
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFKPI                        = 0xc0206987
+	SIOCGIFMAC                        = 0xc0206982
+	SIOCGIFMEDIA                      = 0xc02c6938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206940
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc020693f
+	SIOCGIFSTATUS                     = 0xc331693d
+	SIOCGIFVLAN                       = 0xc020697f
+	SIOCGIFWAKEFLAGS                  = 0xc0206988
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCIFCREATE                      = 0xc0206978
+	SIOCIFCREATE2                     = 0xc020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106981
+	SIOCRSLVMULTI                     = 0xc010693b
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETVLAN                       = 0x8020697e
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFALTMTU                     = 0x80206945
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBOND                       = 0x80206946
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020695a
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFKPI                        = 0x80206986
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206983
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x8040693e
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFVLAN                       = 0x8020697e
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_DONTTRUNC                      = 0x2000
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1010
+	SO_LINGER                         = 0x80
+	SO_LINGER_SEC                     = 0x1080
+	SO_NKE                            = 0x1021
+	SO_NOADDRERR                      = 0x1023
+	SO_NOSIGPIPE                      = 0x1022
+	SO_NOTIFYCONFLICT                 = 0x1026
+	SO_NP_EXTENSIONS                  = 0x1083
+	SO_NREAD                          = 0x1020
+	SO_NUMRCVPKT                      = 0x1112
+	SO_NWRITE                         = 0x1024
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1011
+	SO_RANDOMPORT                     = 0x1082
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_REUSESHAREUID                  = 0x1025
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TIMESTAMP_MONOTONIC            = 0x800
+	SO_TYPE                           = 0x1008
+	SO_UPCALLCLOSEWAIT                = 0x1027
+	SO_USELOOPBACK                    = 0x40
+	SO_WANTMORE                       = 0x4000
+	SO_WANTOOBFLAG                    = 0x8000
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_ENABLE_ECN                    = 0x104
+	TCP_KEEPALIVE                     = 0x10
+	TCP_KEEPCNT                       = 0x102
+	TCP_KEEPINTVL                     = 0x101
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_NOTSENT_LOWAT                 = 0x201
+	TCP_RXT_CONNDROPTIME              = 0x80
+	TCP_RXT_FINDROP                   = 0x100
+	TCP_SENDMOREACKS                  = 0x103
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCDSIMICROCODE                  = 0x20007455
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x40487413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGWINSZ                        = 0x40087468
+	TIOCIXOFF                         = 0x20007480
+	TIOCIXON                          = 0x20007481
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTYGNAME                      = 0x40807453
+	TIOCPTYGRANT                      = 0x20007454
+	TIOCPTYUNLK                       = 0x20007452
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCONS                         = 0x20007463
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x80487414
+	TIOCSETAF                         = 0x80487416
+	TIOCSETAW                         = 0x80487415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VT0                               = 0x0
+	VT1                               = 0x10000
+	VTDLY                             = 0x10000
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x10
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x4
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x20
+	WORDSIZE                          = 0x40
+	WSTOPPED                          = 0x8
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADARCH        = syscall.Errno(0x56)
+	EBADEXEC        = syscall.Errno(0x55)
+	EBADF           = syscall.Errno(0x9)
+	EBADMACHO       = syscall.Errno(0x58)
+	EBADMSG         = syscall.Errno(0x5e)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x59)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDEVERR         = syscall.Errno(0x53)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x5a)
+	EILSEQ          = syscall.Errno(0x5c)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x6a)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5f)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x60)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x61)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5b)
+	ENOPOLICY       = syscall.Errno(0x67)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x62)
+	ENOSTR          = syscall.Errno(0x63)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x68)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x66)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x69)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x64)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	EPWROFF         = syscall.Errno(0x52)
+	EQFULL          = syscall.Errno(0x6a)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHLIBVERS      = syscall.Errno(0x57)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x65)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "device not configured",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource deadlock avoided",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "resource busy",
+	17:  "file exists",
+	18:  "cross-device link",
+	19:  "operation not supported by device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "result too large",
+	35:  "resource temporarily unavailable",
+	36:  "operation now in progress",
+	37:  "operation already in progress",
+	38:  "socket operation on non-socket",
+	39:  "destination address required",
+	40:  "message too long",
+	41:  "protocol wrong type for socket",
+	42:  "protocol not available",
+	43:  "protocol not supported",
+	44:  "socket type not supported",
+	45:  "operation not supported",
+	46:  "protocol family not supported",
+	47:  "address family not supported by protocol family",
+	48:  "address already in use",
+	49:  "can't assign requested address",
+	50:  "network is down",
+	51:  "network is unreachable",
+	52:  "network dropped connection on reset",
+	53:  "software caused connection abort",
+	54:  "connection reset by peer",
+	55:  "no buffer space available",
+	56:  "socket is already connected",
+	57:  "socket is not connected",
+	58:  "can't send after socket shutdown",
+	59:  "too many references: can't splice",
+	60:  "operation timed out",
+	61:  "connection refused",
+	62:  "too many levels of symbolic links",
+	63:  "file name too long",
+	64:  "host is down",
+	65:  "no route to host",
+	66:  "directory not empty",
+	67:  "too many processes",
+	68:  "too many users",
+	69:  "disc quota exceeded",
+	70:  "stale NFS file handle",
+	71:  "too many levels of remote in path",
+	72:  "RPC struct is bad",
+	73:  "RPC version wrong",
+	74:  "RPC prog. not avail",
+	75:  "program version wrong",
+	76:  "bad procedure for program",
+	77:  "no locks available",
+	78:  "function not implemented",
+	79:  "inappropriate file type or format",
+	80:  "authentication error",
+	81:  "need authenticator",
+	82:  "device power is off",
+	83:  "device error",
+	84:  "value too large to be stored in data type",
+	85:  "bad executable (or shared library)",
+	86:  "bad CPU type in executable",
+	87:  "shared library version mismatch",
+	88:  "malformed Mach-o file",
+	89:  "operation canceled",
+	90:  "identifier removed",
+	91:  "no message of desired type",
+	92:  "illegal byte sequence",
+	93:  "attribute not found",
+	94:  "bad message",
+	95:  "EMULTIHOP (Reserved)",
+	96:  "no message available on STREAM",
+	97:  "ENOLINK (Reserved)",
+	98:  "no STREAM resources",
+	99:  "not a STREAM",
+	100: "protocol error",
+	101: "STREAM ioctl timeout",
+	102: "operation not supported on socket",
+	103: "policy not found",
+	104: "state not recoverable",
+	105: "previous owner died",
+	106: "interface output queue is full",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "suspended (signal)",
+	18: "suspended",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
new file mode 100644
index 0000000000..0feceee151
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
@@ -0,0 +1,1530 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,dragonfly
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ATM                            = 0x1e
+	AF_BLUETOOTH                      = 0x21
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x23
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1c
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x24
+	AF_MPLS                           = 0x22
+	AF_NATM                           = 0x1d
+	AF_NETGRAPH                       = 0x20
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x18
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0104279
+	BIOCGETIF                         = 0x4020426b
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x2000427a
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044278
+	BIOCSETF                          = 0x80104267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x8010427b
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x8
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DEFAULTBUFSIZE                = 0x1000
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MAX_CLONES                    = 0x80
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DOCSIS                        = 0x8f
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_REDBACK_SMARTEDGE             = 0x20
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DBF                            = 0xf
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0x8
+	EVFILT_MARKER                     = 0xf
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0x8
+	EVFILT_TIMER                      = -0x7
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_NODATA                         = 0x1000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTEXIT_LWP                       = 0x10000
+	EXTEXIT_PROC                      = 0x0
+	EXTEXIT_SETINT                    = 0x1
+	EXTEXIT_SIMPLE                    = 0x0
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_DUP2FD                          = 0xa
+	F_DUP2FD_CLOEXEC                  = 0x12
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x11
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETOWN                          = 0x5
+	F_OK                              = 0x0
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x118e72
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MONITOR                       = 0x40000
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NPOLLING                      = 0x100000
+	IFF_OACTIVE                       = 0x400
+	IFF_OACTIVE_COMPAT                = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_POLLING                       = 0x10000
+	IFF_POLLING_COMPAT                = 0x10000
+	IFF_PPROMISC                      = 0x20000
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_SMART                         = 0x20
+	IFF_STATICARP                     = 0x80000
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xf3
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0xfe
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SKIP                      = 0x39
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TLSP                      = 0x38
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_UNKNOWN                   = 0x102
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MSFILTER                     = 0x4a
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PKTOPTIONS                   = 0x34
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_PREFER_TEMPADDR              = 0x3f
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW_ADD                         = 0x32
+	IP_FW_DEL                         = 0x33
+	IP_FW_FLUSH                       = 0x34
+	IP_FW_GET                         = 0x36
+	IP_FW_RESETLOG                    = 0x37
+	IP_FW_ZERO                        = 0x35
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0x14
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x42
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x41
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_AUTOSYNC                     = 0x7
+	MADV_CONTROL_END                  = 0xb
+	MADV_CONTROL_START                = 0xa
+	MADV_CORE                         = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_INVAL                        = 0xa
+	MADV_NOCORE                       = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_NOSYNC                       = 0x6
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SETMAP                       = 0xb
+	MADV_WILLNEED                     = 0x3
+	MAP_ANON                          = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_NOCORE                        = 0x20000
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_NOSYNC                        = 0x800
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_SIZEALIGN                     = 0x40000
+	MAP_STACK                         = 0x400
+	MAP_TRYFIXED                      = 0x10000
+	MAP_VPAGETABLE                    = 0x2000
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_FBLOCKING                     = 0x10000
+	MSG_FMASK                         = 0xffff0000
+	MSG_FNONBLOCKING                  = 0x20000
+	MSG_NOSIGNAL                      = 0x400
+	MSG_NOTIFICATION                  = 0x200
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_SYNC                          = 0x800
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x0
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_MAXID                      = 0x4
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_OOB                          = 0x2
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x20000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x10000
+	O_DIRECTORY                       = 0x8000000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FAPPEND                         = 0x100000
+	O_FASYNCWRITE                     = 0x800000
+	O_FBLOCKING                       = 0x40000
+	O_FBUFFERED                       = 0x2000000
+	O_FMASK                           = 0x7fc0000
+	O_FNONBLOCKING                    = 0x80000
+	O_FOFFSET                         = 0x200000
+	O_FSYNC                           = 0x80
+	O_FSYNCWRITE                      = 0x400000
+	O_FUNBUFFERED                     = 0x1000000
+	O_MAPONREAD                       = 0x4000000
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0xb
+	RTAX_MPLS1                        = 0x8
+	RTAX_MPLS2                        = 0x9
+	RTAX_MPLS3                        = 0xa
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_MPLS1                         = 0x100
+	RTA_MPLS2                         = 0x200
+	RTA_MPLS3                         = 0x400
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MPLSOPS                       = 0x1000000
+	RTF_MULTICAST                     = 0x800000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_REJECT                        = 0x8
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_WASCLONED                     = 0x20000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x12
+	RTM_IFANNOUNCE                    = 0x11
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x6
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_IWCAPSEGS                     = 0x400
+	RTV_IWMAXSEGS                     = 0x200
+	RTV_MSL                           = 0x100
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCADDRT                         = 0x8040720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDELRT                         = 0x8040720b
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETSGCNT                      = 0xc0207210
+	SIOCGETVIFCNT                     = 0xc028720f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020691f
+	SIOCGIFCONF                       = 0xc0106924
+	SIOCGIFDATA                       = 0xc0206926
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc028698a
+	SIOCGIFINDEX                      = 0xc0206920
+	SIOCGIFMEDIA                      = 0xc0306938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPOLLCPU                    = 0xc020697e
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFSTATUS                     = 0xc331693b
+	SIOCGIFTSOLEN                     = 0xc0206980
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGPRIVATE_0                    = 0xc0206950
+	SIOCGPRIVATE_1                    = 0xc0206951
+	SIOCIFCREATE                      = 0xc020697a
+	SIOCIFCREATE2                     = 0xc020697c
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106978
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020691e
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNAME                       = 0x80206928
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFPOLLCPU                    = 0x8020697d
+	SIOCSIFTSOLEN                     = 0x8020697f
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NOSIGPIPE                      = 0x800
+	SO_OOBINLINE                      = 0x100
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDSPACE                       = 0x100a
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_FASTKEEP                      = 0x80
+	TCP_KEEPCNT                       = 0x400
+	TCP_KEEPIDLE                      = 0x100
+	TCP_KEEPINIT                      = 0x20
+	TCP_KEEPINTVL                     = 0x200
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MINMSS                        = 0x100
+	TCP_MIN_WINSHIFT                  = 0x5
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_SIGNATURE_ENABLE              = 0x10
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGSID                          = 0x40047463
+	TIOCGSIZE                         = 0x40087468
+	TIOCGWINSZ                        = 0x40087468
+	TIOCISPTMASTER                    = 0x20007455
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x40047403
+	TIOCMODS                          = 0x80047404
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2000745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSSIZE                         = 0x80087467
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VCHECKPT                          = 0x13
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VERASE2                           = 0x7
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x4
+	WCOREFLAG                         = 0x80
+	WLINUXCLONE                       = 0x80000000
+	WNOHANG                           = 0x1
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EASYNC          = syscall.Errno(0x63)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x59)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x55)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDOOFUS         = syscall.Errno(0x58)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x56)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x63)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5a)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x57)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5b)
+	ENOMEDIUM       = syscall.Errno(0x5d)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x5c)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUNUSED94       = syscall.Errno(0x5e)
+	EUNUSED95       = syscall.Errno(0x5f)
+	EUNUSED96       = syscall.Errno(0x60)
+	EUNUSED97       = syscall.Errno(0x61)
+	EUNUSED98       = syscall.Errno(0x62)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT     = syscall.Signal(0x6)
+	SIGALRM     = syscall.Signal(0xe)
+	SIGBUS      = syscall.Signal(0xa)
+	SIGCHLD     = syscall.Signal(0x14)
+	SIGCKPT     = syscall.Signal(0x21)
+	SIGCKPTEXIT = syscall.Signal(0x22)
+	SIGCONT     = syscall.Signal(0x13)
+	SIGEMT      = syscall.Signal(0x7)
+	SIGFPE      = syscall.Signal(0x8)
+	SIGHUP      = syscall.Signal(0x1)
+	SIGILL      = syscall.Signal(0x4)
+	SIGINFO     = syscall.Signal(0x1d)
+	SIGINT      = syscall.Signal(0x2)
+	SIGIO       = syscall.Signal(0x17)
+	SIGIOT      = syscall.Signal(0x6)
+	SIGKILL     = syscall.Signal(0x9)
+	SIGPIPE     = syscall.Signal(0xd)
+	SIGPROF     = syscall.Signal(0x1b)
+	SIGQUIT     = syscall.Signal(0x3)
+	SIGSEGV     = syscall.Signal(0xb)
+	SIGSTOP     = syscall.Signal(0x11)
+	SIGSYS      = syscall.Signal(0xc)
+	SIGTERM     = syscall.Signal(0xf)
+	SIGTHR      = syscall.Signal(0x20)
+	SIGTRAP     = syscall.Signal(0x5)
+	SIGTSTP     = syscall.Signal(0x12)
+	SIGTTIN     = syscall.Signal(0x15)
+	SIGTTOU     = syscall.Signal(0x16)
+	SIGURG      = syscall.Signal(0x10)
+	SIGUSR1     = syscall.Signal(0x1e)
+	SIGUSR2     = syscall.Signal(0x1f)
+	SIGVTALRM   = syscall.Signal(0x1a)
+	SIGWINCH    = syscall.Signal(0x1c)
+	SIGXCPU     = syscall.Signal(0x18)
+	SIGXFSZ     = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:  "operation not permitted",
+	2:  "no such file or directory",
+	3:  "no such process",
+	4:  "interrupted system call",
+	5:  "input/output error",
+	6:  "device not configured",
+	7:  "argument list too long",
+	8:  "exec format error",
+	9:  "bad file descriptor",
+	10: "no child processes",
+	11: "resource deadlock avoided",
+	12: "cannot allocate memory",
+	13: "permission denied",
+	14: "bad address",
+	15: "block device required",
+	16: "device busy",
+	17: "file exists",
+	18: "cross-device link",
+	19: "operation not supported by device",
+	20: "not a directory",
+	21: "is a directory",
+	22: "invalid argument",
+	23: "too many open files in system",
+	24: "too many open files",
+	25: "inappropriate ioctl for device",
+	26: "text file busy",
+	27: "file too large",
+	28: "no space left on device",
+	29: "illegal seek",
+	30: "read-only file system",
+	31: "too many links",
+	32: "broken pipe",
+	33: "numerical argument out of domain",
+	34: "result too large",
+	35: "resource temporarily unavailable",
+	36: "operation now in progress",
+	37: "operation already in progress",
+	38: "socket operation on non-socket",
+	39: "destination address required",
+	40: "message too long",
+	41: "protocol wrong type for socket",
+	42: "protocol not available",
+	43: "protocol not supported",
+	44: "socket type not supported",
+	45: "operation not supported",
+	46: "protocol family not supported",
+	47: "address family not supported by protocol family",
+	48: "address already in use",
+	49: "can't assign requested address",
+	50: "network is down",
+	51: "network is unreachable",
+	52: "network dropped connection on reset",
+	53: "software caused connection abort",
+	54: "connection reset by peer",
+	55: "no buffer space available",
+	56: "socket is already connected",
+	57: "socket is not connected",
+	58: "can't send after socket shutdown",
+	59: "too many references: can't splice",
+	60: "operation timed out",
+	61: "connection refused",
+	62: "too many levels of symbolic links",
+	63: "file name too long",
+	64: "host is down",
+	65: "no route to host",
+	66: "directory not empty",
+	67: "too many processes",
+	68: "too many users",
+	69: "disc quota exceeded",
+	70: "stale NFS file handle",
+	71: "too many levels of remote in path",
+	72: "RPC struct is bad",
+	73: "RPC version wrong",
+	74: "RPC prog. not avail",
+	75: "program version wrong",
+	76: "bad procedure for program",
+	77: "no locks available",
+	78: "function not implemented",
+	79: "inappropriate file type or format",
+	80: "authentication error",
+	81: "need authenticator",
+	82: "identifier removed",
+	83: "no message of desired type",
+	84: "value too large to be stored in data type",
+	85: "operation canceled",
+	86: "illegal byte sequence",
+	87: "attribute not found",
+	88: "programming error",
+	89: "bad message",
+	90: "multihop attempted",
+	91: "link has been severed",
+	92: "protocol error",
+	93: "no medium found",
+	94: "unknown error: 94",
+	95: "unknown error: 95",
+	96: "unknown error: 96",
+	97: "unknown error: 97",
+	98: "unknown error: 98",
+	99: "unknown error: 99",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "suspended (signal)",
+	18: "suspended",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+	32: "thread Scheduler",
+	33: "checkPoint",
+	34: "checkPointExit",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
new file mode 100644
index 0000000000..7b95751c3d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
@@ -0,0 +1,1743 @@
+// mkerrors.sh -m32
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,freebsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ARP                            = 0x23
+	AF_ATM                            = 0x1e
+	AF_BLUETOOTH                      = 0x24
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1c
+	AF_INET6_SDP                      = 0x2a
+	AF_INET_SDP                       = 0x28
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x2a
+	AF_NATM                           = 0x1d
+	AF_NETBIOS                        = 0x6
+	AF_NETGRAPH                       = 0x20
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SCLUSTER                       = 0x22
+	AF_SIP                            = 0x18
+	AF_SLOW                           = 0x21
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_VENDOR00                       = 0x27
+	AF_VENDOR01                       = 0x29
+	AF_VENDOR02                       = 0x2b
+	AF_VENDOR03                       = 0x2d
+	AF_VENDOR04                       = 0x2f
+	AF_VENDOR05                       = 0x31
+	AF_VENDOR06                       = 0x33
+	AF_VENDOR07                       = 0x35
+	AF_VENDOR08                       = 0x37
+	AF_VENDOR09                       = 0x39
+	AF_VENDOR10                       = 0x3b
+	AF_VENDOR11                       = 0x3d
+	AF_VENDOR12                       = 0x3f
+	AF_VENDOR13                       = 0x41
+	AF_VENDOR14                       = 0x43
+	AF_VENDOR15                       = 0x45
+	AF_VENDOR16                       = 0x47
+	AF_VENDOR17                       = 0x49
+	AF_VENDOR18                       = 0x4b
+	AF_VENDOR19                       = 0x4d
+	AF_VENDOR20                       = 0x4f
+	AF_VENDOR21                       = 0x51
+	AF_VENDOR22                       = 0x53
+	AF_VENDOR23                       = 0x55
+	AF_VENDOR24                       = 0x57
+	AF_VENDOR25                       = 0x59
+	AF_VENDOR26                       = 0x5b
+	AF_VENDOR27                       = 0x5d
+	AF_VENDOR28                       = 0x5f
+	AF_VENDOR29                       = 0x61
+	AF_VENDOR30                       = 0x63
+	AF_VENDOR31                       = 0x65
+	AF_VENDOR32                       = 0x67
+	AF_VENDOR33                       = 0x69
+	AF_VENDOR34                       = 0x6b
+	AF_VENDOR35                       = 0x6d
+	AF_VENDOR36                       = 0x6f
+	AF_VENDOR37                       = 0x71
+	AF_VENDOR38                       = 0x73
+	AF_VENDOR39                       = 0x75
+	AF_VENDOR40                       = 0x77
+	AF_VENDOR41                       = 0x79
+	AF_VENDOR42                       = 0x7b
+	AF_VENDOR43                       = 0x7d
+	AF_VENDOR44                       = 0x7f
+	AF_VENDOR45                       = 0x81
+	AF_VENDOR46                       = 0x83
+	AF_VENDOR47                       = 0x85
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B460800                           = 0x70800
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B921600                           = 0xe1000
+	B9600                             = 0x2580
+	BIOCFEEDBACK                      = 0x8004427c
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDIRECTION                    = 0x40044276
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0084279
+	BIOCGETBUFMODE                    = 0x4004427d
+	BIOCGETIF                         = 0x4020426b
+	BIOCGETZMAX                       = 0x4004427f
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4008426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCGTSTAMP                       = 0x40044283
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x2000427a
+	BIOCPROMISC                       = 0x20004269
+	BIOCROTZBUF                       = 0x400c4280
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDIRECTION                    = 0x80044277
+	BIOCSDLT                          = 0x80044278
+	BIOCSETBUFMODE                    = 0x8004427e
+	BIOCSETF                          = 0x80084267
+	BIOCSETFNR                        = 0x80084282
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x8008427b
+	BIOCSETZBUF                       = 0x800c4281
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8008426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCSTSTAMP                       = 0x80044284
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_BUFMODE_BUFFER                = 0x1
+	BPF_BUFMODE_ZBUF                  = 0x2
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_T_BINTIME                     = 0x2
+	BPF_T_BINTIME_FAST                = 0x102
+	BPF_T_BINTIME_MONOTONIC           = 0x202
+	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
+	BPF_T_FAST                        = 0x100
+	BPF_T_FLAG_MASK                   = 0x300
+	BPF_T_FORMAT_MASK                 = 0x3
+	BPF_T_MICROTIME                   = 0x0
+	BPF_T_MICROTIME_FAST              = 0x100
+	BPF_T_MICROTIME_MONOTONIC         = 0x200
+	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
+	BPF_T_MONOTONIC                   = 0x200
+	BPF_T_MONOTONIC_FAST              = 0x300
+	BPF_T_NANOTIME                    = 0x1
+	BPF_T_NANOTIME_FAST               = 0x101
+	BPF_T_NANOTIME_MONOTONIC          = 0x201
+	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
+	BPF_T_NONE                        = 0x3
+	BPF_T_NORMAL                      = 0x0
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x4
+	CLOCK_MONOTONIC_FAST              = 0xc
+	CLOCK_MONOTONIC_PRECISE           = 0xb
+	CLOCK_PROCESS_CPUTIME_ID          = 0xf
+	CLOCK_PROF                        = 0x2
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_REALTIME_FAST               = 0xa
+	CLOCK_REALTIME_PRECISE            = 0x9
+	CLOCK_SECOND                      = 0xd
+	CLOCK_THREAD_CPUTIME_ID           = 0xe
+	CLOCK_UPTIME                      = 0x5
+	CLOCK_UPTIME_FAST                 = 0x8
+	CLOCK_UPTIME_PRECISE              = 0x7
+	CLOCK_VIRTUAL                     = 0x1
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0x18
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf6
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x79
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_FS                         = -0x9
+	EVFILT_LIO                        = -0xa
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xb
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xb
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_DROP                           = 0x1000
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTATTR_NAMESPACE_EMPTY           = 0x0
+	EXTATTR_NAMESPACE_SYSTEM          = 0x2
+	EXTATTR_NAMESPACE_USER            = 0x1
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_CANCEL                          = 0x5
+	F_DUP2FD                          = 0xa
+	F_DUP2FD_CLOEXEC                  = 0x12
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x11
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0xb
+	F_GETOWN                          = 0x5
+	F_OGETLK                          = 0x7
+	F_OK                              = 0x0
+	F_OSETLK                          = 0x8
+	F_OSETLKW                         = 0x9
+	F_RDAHEAD                         = 0x10
+	F_RDLCK                           = 0x1
+	F_READAHEAD                       = 0xf
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0xc
+	F_SETLKW                          = 0xd
+	F_SETLK_REMOTE                    = 0xe
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_UNLCKSYS                        = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x218f72
+	IFF_CANTCONFIG                    = 0x10000
+	IFF_DEBUG                         = 0x4
+	IFF_DRV_OACTIVE                   = 0x400
+	IFF_DRV_RUNNING                   = 0x40
+	IFF_DYING                         = 0x200000
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MONITOR                       = 0x40000
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PPROMISC                      = 0x20000
+	IFF_PROMISC                       = 0x100
+	IFF_RENAMING                      = 0x400000
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_SMART                         = 0x20
+	IFF_STATICARP                     = 0x80000
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_IPXIP                         = 0xf9
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IN_RFC3021_MASK                   = 0xfffffffe
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HIP                       = 0x8b
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MH                        = 0x87
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MPLS                      = 0x89
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OLD_DIVERT                = 0xfe
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_RESERVED_253              = 0xfd
+	IPPROTO_RESERVED_254              = 0xfe
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEND                      = 0x103
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SHIM6                     = 0x8c
+	IPPROTO_SKIP                      = 0x39
+	IPPROTO_SPACER                    = 0x7fff
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TLSP                      = 0x38
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_UDPLITE                   = 0x88
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_BINDANY                      = 0x40
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MSFILTER                     = 0x4a
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_PREFER_TEMPADDR              = 0x3f
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BINDANY                        = 0x18
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DONTFRAG                       = 0x43
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET3                      = 0x31
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW3                            = 0x30
+	IP_FW_ADD                         = 0x32
+	IP_FW_DEL                         = 0x33
+	IP_FW_FLUSH                       = 0x34
+	IP_FW_GET                         = 0x36
+	IP_FW_NAT_CFG                     = 0x38
+	IP_FW_NAT_DEL                     = 0x39
+	IP_FW_NAT_GET_CONFIG              = 0x3a
+	IP_FW_NAT_GET_LOG                 = 0x3b
+	IP_FW_RESETLOG                    = 0x37
+	IP_FW_TABLE_ADD                   = 0x28
+	IP_FW_TABLE_DEL                   = 0x29
+	IP_FW_TABLE_FLUSH                 = 0x2a
+	IP_FW_TABLE_GETSIZE               = 0x2b
+	IP_FW_TABLE_LIST                  = 0x2c
+	IP_FW_ZERO                        = 0x35
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MAX_SOURCE_FILTER              = 0x400
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x42
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_OFFMASK                        = 0x1fff
+	IP_ONESBCAST                      = 0x17
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x44
+	IP_RECVTTL                        = 0x41
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_SENDSRCADDR                    = 0x7
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_AUTOSYNC                     = 0x7
+	MADV_CORE                         = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_NOCORE                       = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_NOSYNC                       = 0x6
+	MADV_PROTECT                      = 0xa
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MAP_ALIGNED_SUPER                 = 0x1000000
+	MAP_ALIGNMENT_MASK                = -0x1000000
+	MAP_ALIGNMENT_SHIFT               = 0x18
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_EXCL                          = 0x4000
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_NOCORE                        = 0x20000
+	MAP_NORESERVE                     = 0x40
+	MAP_NOSYNC                        = 0x800
+	MAP_PREFAULT_READ                 = 0x40000
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_RESERVED0100                  = 0x100
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x400
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CMSG_CLOEXEC                  = 0x40000
+	MSG_COMPAT                        = 0x8000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_NBIO                          = 0x4000
+	MSG_NOSIGNAL                      = 0x20000
+	MSG_NOTIFICATION                  = 0x2000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x0
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLISTL                    = 0x5
+	NET_RT_IFMALIST                   = 0x4
+	NET_RT_MAXID                      = 0x6
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x100000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x10000
+	O_DIRECTORY                       = 0x20000
+	O_EXCL                            = 0x800
+	O_EXEC                            = 0x40000
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_TTY_INIT                        = 0x80000
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_FMASK                         = 0x1004d808
+	RTF_GATEWAY                       = 0x2
+	RTF_GWFLAG_COMPAT                 = 0x80000000
+	RTF_HOST                          = 0x4
+	RTF_LLDATA                        = 0x400
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_REJECT                        = 0x8
+	RTF_RNH_LOCKED                    = 0x40000000
+	RTF_STATIC                        = 0x800
+	RTF_STICKY                        = 0x10000000
+	RTF_UP                            = 0x1
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x12
+	RTM_IFANNOUNCE                    = 0x11
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RTV_WEIGHT                        = 0x100
+	RT_ALL_FIBS                       = -0x1
+	RT_CACHING_CONTEXT                = 0x1
+	RT_DEFAULT_FIB                    = 0x0
+	RT_NORTREF                        = 0x2
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	RUSAGE_THREAD                     = 0x1
+	SCM_BINTIME                       = 0x4
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCADDRT                         = 0x8030720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCAIFGROUP                      = 0x80246987
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDELRT                         = 0x8030720b
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFGROUP                      = 0x80246989
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGDRVSPEC                      = 0xc01c697b
+	SIOCGETSGCNT                      = 0xc0147210
+	SIOCGETVIFCNT                     = 0xc014720f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020691f
+	SIOCGIFCONF                       = 0xc0086924
+	SIOCGIFDESCR                      = 0xc020692a
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFIB                        = 0xc020695c
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc024698a
+	SIOCGIFGROUP                      = 0xc0246988
+	SIOCGIFINDEX                      = 0xc0206920
+	SIOCGIFMAC                        = 0xc0206926
+	SIOCGIFMEDIA                      = 0xc0286938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFSTATUS                     = 0xc331693b
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGPRIVATE_0                    = 0xc0206950
+	SIOCGPRIVATE_1                    = 0xc0206951
+	SIOCIFCREATE                      = 0xc020697a
+	SIOCIFCREATE2                     = 0xc020697c
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCSDRVSPEC                      = 0x801c697b
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020691e
+	SIOCSIFDESCR                      = 0x80206929
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFIB                        = 0x8020695d
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206927
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNAME                       = 0x80206928
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFRVNET                      = 0xc020695b
+	SIOCSIFVNET                       = 0xc020695a
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BINTIME                        = 0x2000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1009
+	SO_LINGER                         = 0x80
+	SO_LISTENINCQLEN                  = 0x1013
+	SO_LISTENQLEN                     = 0x1012
+	SO_LISTENQLIMIT                   = 0x1011
+	SO_NOSIGPIPE                      = 0x800
+	SO_NO_DDP                         = 0x8000
+	SO_NO_OFFLOAD                     = 0x4000
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1010
+	SO_PROTOCOL                       = 0x1016
+	SO_PROTOTYPE                      = 0x1016
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SETFIB                         = 0x1014
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SO_USER_COOKIE                    = 0x1015
+	SO_VENDOR                         = 0x80000000
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CA_NAME_MAX                   = 0x10
+	TCP_CONGESTION                    = 0x40
+	TCP_INFO                          = 0x20
+	TCP_KEEPCNT                       = 0x400
+	TCP_KEEPIDLE                      = 0x100
+	TCP_KEEPINIT                      = 0x80
+	TCP_KEEPINTVL                     = 0x200
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x10
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x218
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_VENDOR                        = 0x80000000
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGPTN                          = 0x4004740f
+	TIOCGSID                          = 0x40047463
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DCD                         = 0x40
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTMASTER                      = 0x2000741c
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2004745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40087459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VERASE2                           = 0x7
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x4
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x10
+	WLINUXCLONE                       = 0x80000000
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x8
+	WSTOPPED                          = 0x2
+	WTRAPPED                          = 0x20
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x59)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x55)
+	ECAPMODE        = syscall.Errno(0x5e)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDOOFUS         = syscall.Errno(0x58)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x56)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5a)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x57)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCAPABLE     = syscall.Errno(0x5d)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x5f)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x60)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x5c)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGLIBRT  = syscall.Signal(0x21)
+	SIGLWP    = syscall.Signal(0x20)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:  "operation not permitted",
+	2:  "no such file or directory",
+	3:  "no such process",
+	4:  "interrupted system call",
+	5:  "input/output error",
+	6:  "device not configured",
+	7:  "argument list too long",
+	8:  "exec format error",
+	9:  "bad file descriptor",
+	10: "no child processes",
+	11: "resource deadlock avoided",
+	12: "cannot allocate memory",
+	13: "permission denied",
+	14: "bad address",
+	15: "block device required",
+	16: "device busy",
+	17: "file exists",
+	18: "cross-device link",
+	19: "operation not supported by device",
+	20: "not a directory",
+	21: "is a directory",
+	22: "invalid argument",
+	23: "too many open files in system",
+	24: "too many open files",
+	25: "inappropriate ioctl for device",
+	26: "text file busy",
+	27: "file too large",
+	28: "no space left on device",
+	29: "illegal seek",
+	30: "read-only file system",
+	31: "too many links",
+	32: "broken pipe",
+	33: "numerical argument out of domain",
+	34: "result too large",
+	35: "resource temporarily unavailable",
+	36: "operation now in progress",
+	37: "operation already in progress",
+	38: "socket operation on non-socket",
+	39: "destination address required",
+	40: "message too long",
+	41: "protocol wrong type for socket",
+	42: "protocol not available",
+	43: "protocol not supported",
+	44: "socket type not supported",
+	45: "operation not supported",
+	46: "protocol family not supported",
+	47: "address family not supported by protocol family",
+	48: "address already in use",
+	49: "can't assign requested address",
+	50: "network is down",
+	51: "network is unreachable",
+	52: "network dropped connection on reset",
+	53: "software caused connection abort",
+	54: "connection reset by peer",
+	55: "no buffer space available",
+	56: "socket is already connected",
+	57: "socket is not connected",
+	58: "can't send after socket shutdown",
+	59: "too many references: can't splice",
+	60: "operation timed out",
+	61: "connection refused",
+	62: "too many levels of symbolic links",
+	63: "file name too long",
+	64: "host is down",
+	65: "no route to host",
+	66: "directory not empty",
+	67: "too many processes",
+	68: "too many users",
+	69: "disc quota exceeded",
+	70: "stale NFS file handle",
+	71: "too many levels of remote in path",
+	72: "RPC struct is bad",
+	73: "RPC version wrong",
+	74: "RPC prog. not avail",
+	75: "program version wrong",
+	76: "bad procedure for program",
+	77: "no locks available",
+	78: "function not implemented",
+	79: "inappropriate file type or format",
+	80: "authentication error",
+	81: "need authenticator",
+	82: "identifier removed",
+	83: "no message of desired type",
+	84: "value too large to be stored in data type",
+	85: "operation canceled",
+	86: "illegal byte sequence",
+	87: "attribute not found",
+	88: "programming error",
+	89: "bad message",
+	90: "multihop attempted",
+	91: "link has been severed",
+	92: "protocol error",
+	93: "capabilities insufficient",
+	94: "not permitted in capability mode",
+	95: "state not recoverable",
+	96: "previous owner died",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "suspended (signal)",
+	18: "suspended",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+	32: "unknown signal",
+	33: "unknown signal",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
new file mode 100644
index 0000000000..e48e7799a1
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
@@ -0,0 +1,1748 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,freebsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ARP                            = 0x23
+	AF_ATM                            = 0x1e
+	AF_BLUETOOTH                      = 0x24
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1c
+	AF_INET6_SDP                      = 0x2a
+	AF_INET_SDP                       = 0x28
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x2a
+	AF_NATM                           = 0x1d
+	AF_NETBIOS                        = 0x6
+	AF_NETGRAPH                       = 0x20
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SCLUSTER                       = 0x22
+	AF_SIP                            = 0x18
+	AF_SLOW                           = 0x21
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_VENDOR00                       = 0x27
+	AF_VENDOR01                       = 0x29
+	AF_VENDOR02                       = 0x2b
+	AF_VENDOR03                       = 0x2d
+	AF_VENDOR04                       = 0x2f
+	AF_VENDOR05                       = 0x31
+	AF_VENDOR06                       = 0x33
+	AF_VENDOR07                       = 0x35
+	AF_VENDOR08                       = 0x37
+	AF_VENDOR09                       = 0x39
+	AF_VENDOR10                       = 0x3b
+	AF_VENDOR11                       = 0x3d
+	AF_VENDOR12                       = 0x3f
+	AF_VENDOR13                       = 0x41
+	AF_VENDOR14                       = 0x43
+	AF_VENDOR15                       = 0x45
+	AF_VENDOR16                       = 0x47
+	AF_VENDOR17                       = 0x49
+	AF_VENDOR18                       = 0x4b
+	AF_VENDOR19                       = 0x4d
+	AF_VENDOR20                       = 0x4f
+	AF_VENDOR21                       = 0x51
+	AF_VENDOR22                       = 0x53
+	AF_VENDOR23                       = 0x55
+	AF_VENDOR24                       = 0x57
+	AF_VENDOR25                       = 0x59
+	AF_VENDOR26                       = 0x5b
+	AF_VENDOR27                       = 0x5d
+	AF_VENDOR28                       = 0x5f
+	AF_VENDOR29                       = 0x61
+	AF_VENDOR30                       = 0x63
+	AF_VENDOR31                       = 0x65
+	AF_VENDOR32                       = 0x67
+	AF_VENDOR33                       = 0x69
+	AF_VENDOR34                       = 0x6b
+	AF_VENDOR35                       = 0x6d
+	AF_VENDOR36                       = 0x6f
+	AF_VENDOR37                       = 0x71
+	AF_VENDOR38                       = 0x73
+	AF_VENDOR39                       = 0x75
+	AF_VENDOR40                       = 0x77
+	AF_VENDOR41                       = 0x79
+	AF_VENDOR42                       = 0x7b
+	AF_VENDOR43                       = 0x7d
+	AF_VENDOR44                       = 0x7f
+	AF_VENDOR45                       = 0x81
+	AF_VENDOR46                       = 0x83
+	AF_VENDOR47                       = 0x85
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B460800                           = 0x70800
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B921600                           = 0xe1000
+	B9600                             = 0x2580
+	BIOCFEEDBACK                      = 0x8004427c
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDIRECTION                    = 0x40044276
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0104279
+	BIOCGETBUFMODE                    = 0x4004427d
+	BIOCGETIF                         = 0x4020426b
+	BIOCGETZMAX                       = 0x4008427f
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCGTSTAMP                       = 0x40044283
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x2000427a
+	BIOCPROMISC                       = 0x20004269
+	BIOCROTZBUF                       = 0x40184280
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDIRECTION                    = 0x80044277
+	BIOCSDLT                          = 0x80044278
+	BIOCSETBUFMODE                    = 0x8004427e
+	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x80104282
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x8010427b
+	BIOCSETZBUF                       = 0x80184281
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCSTSTAMP                       = 0x80044284
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x8
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_BUFMODE_BUFFER                = 0x1
+	BPF_BUFMODE_ZBUF                  = 0x2
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_T_BINTIME                     = 0x2
+	BPF_T_BINTIME_FAST                = 0x102
+	BPF_T_BINTIME_MONOTONIC           = 0x202
+	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
+	BPF_T_FAST                        = 0x100
+	BPF_T_FLAG_MASK                   = 0x300
+	BPF_T_FORMAT_MASK                 = 0x3
+	BPF_T_MICROTIME                   = 0x0
+	BPF_T_MICROTIME_FAST              = 0x100
+	BPF_T_MICROTIME_MONOTONIC         = 0x200
+	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
+	BPF_T_MONOTONIC                   = 0x200
+	BPF_T_MONOTONIC_FAST              = 0x300
+	BPF_T_NANOTIME                    = 0x1
+	BPF_T_NANOTIME_FAST               = 0x101
+	BPF_T_NANOTIME_MONOTONIC          = 0x201
+	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
+	BPF_T_NONE                        = 0x3
+	BPF_T_NORMAL                      = 0x0
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x4
+	CLOCK_MONOTONIC_FAST              = 0xc
+	CLOCK_MONOTONIC_PRECISE           = 0xb
+	CLOCK_PROCESS_CPUTIME_ID          = 0xf
+	CLOCK_PROF                        = 0x2
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_REALTIME_FAST               = 0xa
+	CLOCK_REALTIME_PRECISE            = 0x9
+	CLOCK_SECOND                      = 0xd
+	CLOCK_THREAD_CPUTIME_ID           = 0xe
+	CLOCK_UPTIME                      = 0x5
+	CLOCK_UPTIME_FAST                 = 0x8
+	CLOCK_UPTIME_PRECISE              = 0x7
+	CLOCK_VIRTUAL                     = 0x1
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0x18
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf6
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x79
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_FS                         = -0x9
+	EVFILT_LIO                        = -0xa
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xb
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xb
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_DROP                           = 0x1000
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTATTR_NAMESPACE_EMPTY           = 0x0
+	EXTATTR_NAMESPACE_SYSTEM          = 0x2
+	EXTATTR_NAMESPACE_USER            = 0x1
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_CANCEL                          = 0x5
+	F_DUP2FD                          = 0xa
+	F_DUP2FD_CLOEXEC                  = 0x12
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x11
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0xb
+	F_GETOWN                          = 0x5
+	F_OGETLK                          = 0x7
+	F_OK                              = 0x0
+	F_OSETLK                          = 0x8
+	F_OSETLKW                         = 0x9
+	F_RDAHEAD                         = 0x10
+	F_RDLCK                           = 0x1
+	F_READAHEAD                       = 0xf
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0xc
+	F_SETLKW                          = 0xd
+	F_SETLK_REMOTE                    = 0xe
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_UNLCKSYS                        = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x218f72
+	IFF_CANTCONFIG                    = 0x10000
+	IFF_DEBUG                         = 0x4
+	IFF_DRV_OACTIVE                   = 0x400
+	IFF_DRV_RUNNING                   = 0x40
+	IFF_DYING                         = 0x200000
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MONITOR                       = 0x40000
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PPROMISC                      = 0x20000
+	IFF_PROMISC                       = 0x100
+	IFF_RENAMING                      = 0x400000
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_SMART                         = 0x20
+	IFF_STATICARP                     = 0x80000
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_IPXIP                         = 0xf9
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IN_RFC3021_MASK                   = 0xfffffffe
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HIP                       = 0x8b
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MH                        = 0x87
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MPLS                      = 0x89
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OLD_DIVERT                = 0xfe
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_RESERVED_253              = 0xfd
+	IPPROTO_RESERVED_254              = 0xfe
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEND                      = 0x103
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SHIM6                     = 0x8c
+	IPPROTO_SKIP                      = 0x39
+	IPPROTO_SPACER                    = 0x7fff
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TLSP                      = 0x38
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_UDPLITE                   = 0x88
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_BINDANY                      = 0x40
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MSFILTER                     = 0x4a
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_PREFER_TEMPADDR              = 0x3f
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BINDANY                        = 0x18
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DONTFRAG                       = 0x43
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET3                      = 0x31
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW3                            = 0x30
+	IP_FW_ADD                         = 0x32
+	IP_FW_DEL                         = 0x33
+	IP_FW_FLUSH                       = 0x34
+	IP_FW_GET                         = 0x36
+	IP_FW_NAT_CFG                     = 0x38
+	IP_FW_NAT_DEL                     = 0x39
+	IP_FW_NAT_GET_CONFIG              = 0x3a
+	IP_FW_NAT_GET_LOG                 = 0x3b
+	IP_FW_RESETLOG                    = 0x37
+	IP_FW_TABLE_ADD                   = 0x28
+	IP_FW_TABLE_DEL                   = 0x29
+	IP_FW_TABLE_FLUSH                 = 0x2a
+	IP_FW_TABLE_GETSIZE               = 0x2b
+	IP_FW_TABLE_LIST                  = 0x2c
+	IP_FW_ZERO                        = 0x35
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MAX_SOURCE_FILTER              = 0x400
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x42
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_OFFMASK                        = 0x1fff
+	IP_ONESBCAST                      = 0x17
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x44
+	IP_RECVTTL                        = 0x41
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_SENDSRCADDR                    = 0x7
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_AUTOSYNC                     = 0x7
+	MADV_CORE                         = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_NOCORE                       = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_NOSYNC                       = 0x6
+	MADV_PROTECT                      = 0xa
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MAP_32BIT                         = 0x80000
+	MAP_ALIGNED_SUPER                 = 0x1000000
+	MAP_ALIGNMENT_MASK                = -0x1000000
+	MAP_ALIGNMENT_SHIFT               = 0x18
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_EXCL                          = 0x4000
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_NOCORE                        = 0x20000
+	MAP_NORESERVE                     = 0x40
+	MAP_NOSYNC                        = 0x800
+	MAP_PREFAULT_READ                 = 0x40000
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_RESERVED0100                  = 0x100
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x400
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CMSG_CLOEXEC                  = 0x40000
+	MSG_COMPAT                        = 0x8000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_NBIO                          = 0x4000
+	MSG_NOSIGNAL                      = 0x20000
+	MSG_NOTIFICATION                  = 0x2000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x0
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLISTL                    = 0x5
+	NET_RT_IFMALIST                   = 0x4
+	NET_RT_MAXID                      = 0x6
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_MSECONDS                     = 0x2
+	NOTE_NSECONDS                     = 0x8
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_SECONDS                      = 0x1
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_USECONDS                     = 0x4
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x100000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x10000
+	O_DIRECTORY                       = 0x20000
+	O_EXCL                            = 0x800
+	O_EXEC                            = 0x40000
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_TTY_INIT                        = 0x80000
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_FMASK                         = 0x1004d808
+	RTF_GATEWAY                       = 0x2
+	RTF_GWFLAG_COMPAT                 = 0x80000000
+	RTF_HOST                          = 0x4
+	RTF_LLDATA                        = 0x400
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_REJECT                        = 0x8
+	RTF_RNH_LOCKED                    = 0x40000000
+	RTF_STATIC                        = 0x800
+	RTF_STICKY                        = 0x10000000
+	RTF_UP                            = 0x1
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x12
+	RTM_IFANNOUNCE                    = 0x11
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RTV_WEIGHT                        = 0x100
+	RT_ALL_FIBS                       = -0x1
+	RT_CACHING_CONTEXT                = 0x1
+	RT_DEFAULT_FIB                    = 0x0
+	RT_NORTREF                        = 0x2
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	RUSAGE_THREAD                     = 0x1
+	SCM_BINTIME                       = 0x4
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCADDRT                         = 0x8040720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCAIFGROUP                      = 0x80286987
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDELRT                         = 0x8040720b
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFGROUP                      = 0x80286989
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETSGCNT                      = 0xc0207210
+	SIOCGETVIFCNT                     = 0xc028720f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020691f
+	SIOCGIFCONF                       = 0xc0106924
+	SIOCGIFDESCR                      = 0xc020692a
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFIB                        = 0xc020695c
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc028698a
+	SIOCGIFGROUP                      = 0xc0286988
+	SIOCGIFINDEX                      = 0xc0206920
+	SIOCGIFMAC                        = 0xc0206926
+	SIOCGIFMEDIA                      = 0xc0306938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFSTATUS                     = 0xc331693b
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGPRIVATE_0                    = 0xc0206950
+	SIOCGPRIVATE_1                    = 0xc0206951
+	SIOCIFCREATE                      = 0xc020697a
+	SIOCIFCREATE2                     = 0xc020697c
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106978
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020691e
+	SIOCSIFDESCR                      = 0x80206929
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFIB                        = 0x8020695d
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206927
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNAME                       = 0x80206928
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFRVNET                      = 0xc020695b
+	SIOCSIFVNET                       = 0xc020695a
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BINTIME                        = 0x2000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1009
+	SO_LINGER                         = 0x80
+	SO_LISTENINCQLEN                  = 0x1013
+	SO_LISTENQLEN                     = 0x1012
+	SO_LISTENQLIMIT                   = 0x1011
+	SO_NOSIGPIPE                      = 0x800
+	SO_NO_DDP                         = 0x8000
+	SO_NO_OFFLOAD                     = 0x4000
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1010
+	SO_PROTOCOL                       = 0x1016
+	SO_PROTOTYPE                      = 0x1016
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SETFIB                         = 0x1014
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SO_USER_COOKIE                    = 0x1015
+	SO_VENDOR                         = 0x80000000
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CA_NAME_MAX                   = 0x10
+	TCP_CONGESTION                    = 0x40
+	TCP_INFO                          = 0x20
+	TCP_KEEPCNT                       = 0x400
+	TCP_KEEPIDLE                      = 0x100
+	TCP_KEEPINIT                      = 0x80
+	TCP_KEEPINTVL                     = 0x200
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x10
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x218
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_VENDOR                        = 0x80000000
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGPTN                          = 0x4004740f
+	TIOCGSID                          = 0x40047463
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DCD                         = 0x40
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTMASTER                      = 0x2000741c
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2004745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40107459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VERASE2                           = 0x7
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x4
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x10
+	WLINUXCLONE                       = 0x80000000
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x8
+	WSTOPPED                          = 0x2
+	WTRAPPED                          = 0x20
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x59)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x55)
+	ECAPMODE        = syscall.Errno(0x5e)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDOOFUS         = syscall.Errno(0x58)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x56)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5a)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x57)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCAPABLE     = syscall.Errno(0x5d)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x5f)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x60)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x5c)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGLIBRT  = syscall.Signal(0x21)
+	SIGLWP    = syscall.Signal(0x20)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:  "operation not permitted",
+	2:  "no such file or directory",
+	3:  "no such process",
+	4:  "interrupted system call",
+	5:  "input/output error",
+	6:  "device not configured",
+	7:  "argument list too long",
+	8:  "exec format error",
+	9:  "bad file descriptor",
+	10: "no child processes",
+	11: "resource deadlock avoided",
+	12: "cannot allocate memory",
+	13: "permission denied",
+	14: "bad address",
+	15: "block device required",
+	16: "device busy",
+	17: "file exists",
+	18: "cross-device link",
+	19: "operation not supported by device",
+	20: "not a directory",
+	21: "is a directory",
+	22: "invalid argument",
+	23: "too many open files in system",
+	24: "too many open files",
+	25: "inappropriate ioctl for device",
+	26: "text file busy",
+	27: "file too large",
+	28: "no space left on device",
+	29: "illegal seek",
+	30: "read-only file system",
+	31: "too many links",
+	32: "broken pipe",
+	33: "numerical argument out of domain",
+	34: "result too large",
+	35: "resource temporarily unavailable",
+	36: "operation now in progress",
+	37: "operation already in progress",
+	38: "socket operation on non-socket",
+	39: "destination address required",
+	40: "message too long",
+	41: "protocol wrong type for socket",
+	42: "protocol not available",
+	43: "protocol not supported",
+	44: "socket type not supported",
+	45: "operation not supported",
+	46: "protocol family not supported",
+	47: "address family not supported by protocol family",
+	48: "address already in use",
+	49: "can't assign requested address",
+	50: "network is down",
+	51: "network is unreachable",
+	52: "network dropped connection on reset",
+	53: "software caused connection abort",
+	54: "connection reset by peer",
+	55: "no buffer space available",
+	56: "socket is already connected",
+	57: "socket is not connected",
+	58: "can't send after socket shutdown",
+	59: "too many references: can't splice",
+	60: "operation timed out",
+	61: "connection refused",
+	62: "too many levels of symbolic links",
+	63: "file name too long",
+	64: "host is down",
+	65: "no route to host",
+	66: "directory not empty",
+	67: "too many processes",
+	68: "too many users",
+	69: "disc quota exceeded",
+	70: "stale NFS file handle",
+	71: "too many levels of remote in path",
+	72: "RPC struct is bad",
+	73: "RPC version wrong",
+	74: "RPC prog. not avail",
+	75: "program version wrong",
+	76: "bad procedure for program",
+	77: "no locks available",
+	78: "function not implemented",
+	79: "inappropriate file type or format",
+	80: "authentication error",
+	81: "need authenticator",
+	82: "identifier removed",
+	83: "no message of desired type",
+	84: "value too large to be stored in data type",
+	85: "operation canceled",
+	86: "illegal byte sequence",
+	87: "attribute not found",
+	88: "programming error",
+	89: "bad message",
+	90: "multihop attempted",
+	91: "link has been severed",
+	92: "protocol error",
+	93: "capabilities insufficient",
+	94: "not permitted in capability mode",
+	95: "state not recoverable",
+	96: "previous owner died",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "suspended (signal)",
+	18: "suspended",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+	32: "unknown signal",
+	33: "unknown signal",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
new file mode 100644
index 0000000000..2afbe2d5ed
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
@@ -0,0 +1,1729 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm,freebsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ARP                            = 0x23
+	AF_ATM                            = 0x1e
+	AF_BLUETOOTH                      = 0x24
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x25
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x1c
+	AF_INET6_SDP                      = 0x2a
+	AF_INET_SDP                       = 0x28
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x2a
+	AF_NATM                           = 0x1d
+	AF_NETBIOS                        = 0x6
+	AF_NETGRAPH                       = 0x20
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SCLUSTER                       = 0x22
+	AF_SIP                            = 0x18
+	AF_SLOW                           = 0x21
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	AF_VENDOR00                       = 0x27
+	AF_VENDOR01                       = 0x29
+	AF_VENDOR02                       = 0x2b
+	AF_VENDOR03                       = 0x2d
+	AF_VENDOR04                       = 0x2f
+	AF_VENDOR05                       = 0x31
+	AF_VENDOR06                       = 0x33
+	AF_VENDOR07                       = 0x35
+	AF_VENDOR08                       = 0x37
+	AF_VENDOR09                       = 0x39
+	AF_VENDOR10                       = 0x3b
+	AF_VENDOR11                       = 0x3d
+	AF_VENDOR12                       = 0x3f
+	AF_VENDOR13                       = 0x41
+	AF_VENDOR14                       = 0x43
+	AF_VENDOR15                       = 0x45
+	AF_VENDOR16                       = 0x47
+	AF_VENDOR17                       = 0x49
+	AF_VENDOR18                       = 0x4b
+	AF_VENDOR19                       = 0x4d
+	AF_VENDOR20                       = 0x4f
+	AF_VENDOR21                       = 0x51
+	AF_VENDOR22                       = 0x53
+	AF_VENDOR23                       = 0x55
+	AF_VENDOR24                       = 0x57
+	AF_VENDOR25                       = 0x59
+	AF_VENDOR26                       = 0x5b
+	AF_VENDOR27                       = 0x5d
+	AF_VENDOR28                       = 0x5f
+	AF_VENDOR29                       = 0x61
+	AF_VENDOR30                       = 0x63
+	AF_VENDOR31                       = 0x65
+	AF_VENDOR32                       = 0x67
+	AF_VENDOR33                       = 0x69
+	AF_VENDOR34                       = 0x6b
+	AF_VENDOR35                       = 0x6d
+	AF_VENDOR36                       = 0x6f
+	AF_VENDOR37                       = 0x71
+	AF_VENDOR38                       = 0x73
+	AF_VENDOR39                       = 0x75
+	AF_VENDOR40                       = 0x77
+	AF_VENDOR41                       = 0x79
+	AF_VENDOR42                       = 0x7b
+	AF_VENDOR43                       = 0x7d
+	AF_VENDOR44                       = 0x7f
+	AF_VENDOR45                       = 0x81
+	AF_VENDOR46                       = 0x83
+	AF_VENDOR47                       = 0x85
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B460800                           = 0x70800
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B921600                           = 0xe1000
+	B9600                             = 0x2580
+	BIOCFEEDBACK                      = 0x8004427c
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDIRECTION                    = 0x40044276
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0084279
+	BIOCGETBUFMODE                    = 0x4004427d
+	BIOCGETIF                         = 0x4020426b
+	BIOCGETZMAX                       = 0x4004427f
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044272
+	BIOCGRTIMEOUT                     = 0x4008426e
+	BIOCGSEESENT                      = 0x40044276
+	BIOCGSTATS                        = 0x4008426f
+	BIOCGTSTAMP                       = 0x40044283
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x2000427a
+	BIOCPROMISC                       = 0x20004269
+	BIOCROTZBUF                       = 0x400c4280
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDIRECTION                    = 0x80044277
+	BIOCSDLT                          = 0x80044278
+	BIOCSETBUFMODE                    = 0x8004427e
+	BIOCSETF                          = 0x80084267
+	BIOCSETFNR                        = 0x80084282
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x8008427b
+	BIOCSETZBUF                       = 0x800c4281
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044273
+	BIOCSRTIMEOUT                     = 0x8008426d
+	BIOCSSEESENT                      = 0x80044277
+	BIOCSTSTAMP                       = 0x80044284
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_BUFMODE_BUFFER                = 0x1
+	BPF_BUFMODE_ZBUF                  = 0x2
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x80000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_T_BINTIME                     = 0x2
+	BPF_T_BINTIME_FAST                = 0x102
+	BPF_T_BINTIME_MONOTONIC           = 0x202
+	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
+	BPF_T_FAST                        = 0x100
+	BPF_T_FLAG_MASK                   = 0x300
+	BPF_T_FORMAT_MASK                 = 0x3
+	BPF_T_MICROTIME                   = 0x0
+	BPF_T_MICROTIME_FAST              = 0x100
+	BPF_T_MICROTIME_MONOTONIC         = 0x200
+	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
+	BPF_T_MONOTONIC                   = 0x200
+	BPF_T_MONOTONIC_FAST              = 0x300
+	BPF_T_NANOTIME                    = 0x1
+	BPF_T_NANOTIME_FAST               = 0x101
+	BPF_T_NANOTIME_MONOTONIC          = 0x201
+	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
+	BPF_T_NONE                        = 0x3
+	BPF_T_NORMAL                      = 0x0
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0x18
+	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf6
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x79
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EVFILT_AIO                        = -0x3
+	EVFILT_FS                         = -0x9
+	EVFILT_LIO                        = -0xa
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0xb
+	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0xb
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
+	EV_DROP                           = 0x1000
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_RECEIPT                        = 0x40
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTATTR_NAMESPACE_EMPTY           = 0x0
+	EXTATTR_NAMESPACE_SYSTEM          = 0x2
+	EXTATTR_NAMESPACE_USER            = 0x1
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_CANCEL                          = 0x5
+	F_DUP2FD                          = 0xa
+	F_DUP2FD_CLOEXEC                  = 0x12
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0x11
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0xb
+	F_GETOWN                          = 0x5
+	F_OGETLK                          = 0x7
+	F_OK                              = 0x0
+	F_OSETLK                          = 0x8
+	F_OSETLKW                         = 0x9
+	F_RDAHEAD                         = 0x10
+	F_RDLCK                           = 0x1
+	F_READAHEAD                       = 0xf
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0xc
+	F_SETLKW                          = 0xd
+	F_SETLK_REMOTE                    = 0xe
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_UNLCKSYS                        = 0x4
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_ALTPHYS                       = 0x4000
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x218f72
+	IFF_CANTCONFIG                    = 0x10000
+	IFF_DEBUG                         = 0x4
+	IFF_DRV_OACTIVE                   = 0x400
+	IFF_DRV_RUNNING                   = 0x40
+	IFF_DYING                         = 0x200000
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MONITOR                       = 0x40000
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PPROMISC                      = 0x20000
+	IFF_PROMISC                       = 0x100
+	IFF_RENAMING                      = 0x400000
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_SMART                         = 0x20
+	IFF_STATICARP                     = 0x80000
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_IPXIP                         = 0xf9
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IN_RFC3021_MASK                   = 0xfffffffe
+	IPPROTO_3PC                       = 0x22
+	IPPROTO_ADFS                      = 0x44
+	IPPROTO_AH                        = 0x33
+	IPPROTO_AHIP                      = 0x3d
+	IPPROTO_APES                      = 0x63
+	IPPROTO_ARGUS                     = 0xd
+	IPPROTO_AX25                      = 0x5d
+	IPPROTO_BHA                       = 0x31
+	IPPROTO_BLT                       = 0x1e
+	IPPROTO_BRSATMON                  = 0x4c
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_CFTP                      = 0x3e
+	IPPROTO_CHAOS                     = 0x10
+	IPPROTO_CMTP                      = 0x26
+	IPPROTO_CPHB                      = 0x49
+	IPPROTO_CPNX                      = 0x48
+	IPPROTO_DDP                       = 0x25
+	IPPROTO_DGP                       = 0x56
+	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_EMCON                     = 0xe
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GMTP                      = 0x64
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HELLO                     = 0x3f
+	IPPROTO_HIP                       = 0x8b
+	IPPROTO_HMP                       = 0x14
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IDPR                      = 0x23
+	IPPROTO_IDRP                      = 0x2d
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IGP                       = 0x55
+	IPPROTO_IGRP                      = 0x58
+	IPPROTO_IL                        = 0x28
+	IPPROTO_INLSP                     = 0x34
+	IPPROTO_INP                       = 0x20
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPCV                      = 0x47
+	IPPROTO_IPEIP                     = 0x5e
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPPC                      = 0x43
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IRTP                      = 0x1c
+	IPPROTO_KRYPTOLAN                 = 0x41
+	IPPROTO_LARP                      = 0x5b
+	IPPROTO_LEAF1                     = 0x19
+	IPPROTO_LEAF2                     = 0x1a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MEAS                      = 0x13
+	IPPROTO_MH                        = 0x87
+	IPPROTO_MHRP                      = 0x30
+	IPPROTO_MICP                      = 0x5f
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MPLS                      = 0x89
+	IPPROTO_MTP                       = 0x5c
+	IPPROTO_MUX                       = 0x12
+	IPPROTO_ND                        = 0x4d
+	IPPROTO_NHRP                      = 0x36
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_NSP                       = 0x1f
+	IPPROTO_NVPII                     = 0xb
+	IPPROTO_OLD_DIVERT                = 0xfe
+	IPPROTO_OSPFIGP                   = 0x59
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PGM                       = 0x71
+	IPPROTO_PIGP                      = 0x9
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PRM                       = 0x15
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_PVP                       = 0x4b
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_RCCMON                    = 0xa
+	IPPROTO_RDP                       = 0x1b
+	IPPROTO_RESERVED_253              = 0xfd
+	IPPROTO_RESERVED_254              = 0xfe
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_RVD                       = 0x42
+	IPPROTO_SATEXPAK                  = 0x40
+	IPPROTO_SATMON                    = 0x45
+	IPPROTO_SCCSP                     = 0x60
+	IPPROTO_SCTP                      = 0x84
+	IPPROTO_SDRP                      = 0x2a
+	IPPROTO_SEND                      = 0x103
+	IPPROTO_SEP                       = 0x21
+	IPPROTO_SHIM6                     = 0x8c
+	IPPROTO_SKIP                      = 0x39
+	IPPROTO_SPACER                    = 0x7fff
+	IPPROTO_SRPC                      = 0x5a
+	IPPROTO_ST                        = 0x7
+	IPPROTO_SVMTP                     = 0x52
+	IPPROTO_SWIPE                     = 0x35
+	IPPROTO_TCF                       = 0x57
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TLSP                      = 0x38
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_TPXX                      = 0x27
+	IPPROTO_TRUNK1                    = 0x17
+	IPPROTO_TRUNK2                    = 0x18
+	IPPROTO_TTP                       = 0x54
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_UDPLITE                   = 0x88
+	IPPROTO_VINES                     = 0x53
+	IPPROTO_VISA                      = 0x46
+	IPPROTO_VMTP                      = 0x51
+	IPPROTO_WBEXPAK                   = 0x4f
+	IPPROTO_WBMON                     = 0x4e
+	IPPROTO_WSN                       = 0x4a
+	IPPROTO_XNET                      = 0xf
+	IPPROTO_XTP                       = 0x24
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_BINDANY                      = 0x40
+	IPV6_BINDV6ONLY                   = 0x1b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_FW_ADD                       = 0x1e
+	IPV6_FW_DEL                       = 0x1f
+	IPV6_FW_FLUSH                     = 0x20
+	IPV6_FW_GET                       = 0x22
+	IPV6_FW_ZERO                      = 0x21
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXOPTHDR                    = 0x800
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
+	IPV6_MAX_MEMBERSHIPS              = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
+	IPV6_MIN_MEMBERSHIPS              = 0x1f
+	IPV6_MMTU                         = 0x500
+	IPV6_MSFILTER                     = 0x4a
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_PREFER_TEMPADDR              = 0x3f
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
+	IP_BINDANY                        = 0x18
+	IP_BLOCK_SOURCE                   = 0x48
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DONTFRAG                       = 0x43
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
+	IP_DUMMYNET3                      = 0x31
+	IP_DUMMYNET_CONFIGURE             = 0x3c
+	IP_DUMMYNET_DEL                   = 0x3d
+	IP_DUMMYNET_FLUSH                 = 0x3e
+	IP_DUMMYNET_GET                   = 0x40
+	IP_FAITH                          = 0x16
+	IP_FW3                            = 0x30
+	IP_FW_ADD                         = 0x32
+	IP_FW_DEL                         = 0x33
+	IP_FW_FLUSH                       = 0x34
+	IP_FW_GET                         = 0x36
+	IP_FW_NAT_CFG                     = 0x38
+	IP_FW_NAT_DEL                     = 0x39
+	IP_FW_NAT_GET_CONFIG              = 0x3a
+	IP_FW_NAT_GET_LOG                 = 0x3b
+	IP_FW_RESETLOG                    = 0x37
+	IP_FW_TABLE_ADD                   = 0x28
+	IP_FW_TABLE_DEL                   = 0x29
+	IP_FW_TABLE_FLUSH                 = 0x2a
+	IP_FW_TABLE_GETSIZE               = 0x2b
+	IP_FW_TABLE_LIST                  = 0x2c
+	IP_FW_ZERO                        = 0x35
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x15
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_GROUP_SRC_FILTER           = 0x200
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER           = 0x80
+	IP_MAX_SOCK_SRC_FILTER            = 0x80
+	IP_MAX_SOURCE_FILTER              = 0x400
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x42
+	IP_MIN_MEMBERSHIPS                = 0x1f
+	IP_MSFILTER                       = 0x4a
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_MULTICAST_VIF                  = 0xe
+	IP_OFFMASK                        = 0x1fff
+	IP_ONESBCAST                      = 0x17
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x44
+	IP_RECVTTL                        = 0x41
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RSVP_OFF                       = 0x10
+	IP_RSVP_ON                        = 0xf
+	IP_RSVP_VIF_OFF                   = 0x12
+	IP_RSVP_VIF_ON                    = 0x11
+	IP_SENDSRCADDR                    = 0x7
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	IP_UNBLOCK_SOURCE                 = 0x49
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_AUTOSYNC                     = 0x7
+	MADV_CORE                         = 0x9
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x5
+	MADV_NOCORE                       = 0x8
+	MADV_NORMAL                       = 0x0
+	MADV_NOSYNC                       = 0x6
+	MADV_PROTECT                      = 0xa
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_WILLNEED                     = 0x3
+	MAP_ALIGNED_SUPER                 = 0x1000000
+	MAP_ALIGNMENT_MASK                = -0x1000000
+	MAP_ALIGNMENT_SHIFT               = 0x18
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_EXCL                          = 0x4000
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_NOCORE                        = 0x20000
+	MAP_NORESERVE                     = 0x40
+	MAP_NOSYNC                        = 0x800
+	MAP_PREFAULT_READ                 = 0x40000
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_RESERVED0080                  = 0x80
+	MAP_RESERVED0100                  = 0x100
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x400
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_CMSG_CLOEXEC                  = 0x40000
+	MSG_COMPAT                        = 0x8000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOF                           = 0x100
+	MSG_EOR                           = 0x8
+	MSG_NBIO                          = 0x4000
+	MSG_NOSIGNAL                      = 0x20000
+	MSG_NOTIFICATION                  = 0x2000
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x0
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_IFLISTL                    = 0x5
+	NET_RT_IFMALIST                   = 0x4
+	NET_RT_MAXID                      = 0x6
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x100000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x10000
+	O_DIRECTORY                       = 0x20000
+	O_EXCL                            = 0x800
+	O_EXEC                            = 0x40000
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_TTY_INIT                        = 0x80000
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x8
+	RTAX_NETMASK                      = 0x2
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_FMASK                         = 0x1004d808
+	RTF_GATEWAY                       = 0x2
+	RTF_GWFLAG_COMPAT                 = 0x80000000
+	RTF_HOST                          = 0x4
+	RTF_LLDATA                        = 0x400
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MODIFIED                      = 0x20
+	RTF_MULTICAST                     = 0x800000
+	RTF_PINNED                        = 0x100000
+	RTF_PRCLONING                     = 0x10000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x40000
+	RTF_REJECT                        = 0x8
+	RTF_RNH_LOCKED                    = 0x40000000
+	RTF_STATIC                        = 0x800
+	RTF_STICKY                        = 0x10000000
+	RTF_UP                            = 0x1
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DELMADDR                      = 0x10
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x12
+	RTM_IFANNOUNCE                    = 0x11
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_NEWMADDR                      = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RTV_WEIGHT                        = 0x100
+	RT_ALL_FIBS                       = -0x1
+	RT_CACHING_CONTEXT                = 0x1
+	RT_DEFAULT_FIB                    = 0x0
+	RT_NORTREF                        = 0x2
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	RUSAGE_THREAD                     = 0x1
+	SCM_BINTIME                       = 0x4
+	SCM_CREDS                         = 0x3
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x2
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCADDRT                         = 0x8030720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCAIFGROUP                      = 0x80246987
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDELRT                         = 0x8030720b
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFGROUP                      = 0x80246989
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGDRVSPEC                      = 0xc01c697b
+	SIOCGETSGCNT                      = 0xc0147210
+	SIOCGETVIFCNT                     = 0xc014720f
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCAP                        = 0xc020691f
+	SIOCGIFCONF                       = 0xc0086924
+	SIOCGIFDESCR                      = 0xc020692a
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFIB                        = 0xc020695c
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc024698a
+	SIOCGIFGROUP                      = 0xc0246988
+	SIOCGIFINDEX                      = 0xc0206920
+	SIOCGIFMAC                        = 0xc0206926
+	SIOCGIFMEDIA                      = 0xc0286938
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc0206933
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPHYS                       = 0xc0206935
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFSTATUS                     = 0xc331693b
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGPRIVATE_0                    = 0xc0206950
+	SIOCGPRIVATE_1                    = 0xc0206951
+	SIOCIFCREATE                      = 0xc020697a
+	SIOCIFCREATE2                     = 0xc020697c
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCSDRVSPEC                      = 0x801c697b
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFCAP                        = 0x8020691e
+	SIOCSIFDESCR                      = 0x80206929
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFIB                        = 0x8020695d
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020693c
+	SIOCSIFMAC                        = 0x80206927
+	SIOCSIFMEDIA                      = 0xc0206937
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x80206934
+	SIOCSIFNAME                       = 0x80206928
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPHYS                       = 0x80206936
+	SIOCSIFRVNET                      = 0xc020695b
+	SIOCSIFVNET                       = 0xc020695a
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BINTIME                        = 0x2000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LABEL                          = 0x1009
+	SO_LINGER                         = 0x80
+	SO_LISTENINCQLEN                  = 0x1013
+	SO_LISTENQLEN                     = 0x1012
+	SO_LISTENQLIMIT                   = 0x1011
+	SO_NOSIGPIPE                      = 0x800
+	SO_NO_DDP                         = 0x8000
+	SO_NO_OFFLOAD                     = 0x4000
+	SO_OOBINLINE                      = 0x100
+	SO_PEERLABEL                      = 0x1010
+	SO_PROTOCOL                       = 0x1016
+	SO_PROTOTYPE                      = 0x1016
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SETFIB                         = 0x1014
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_TIMESTAMP                      = 0x400
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SO_USER_COOKIE                    = 0x1015
+	SO_VENDOR                         = 0x80000000
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CA_NAME_MAX                   = 0x10
+	TCP_CONGESTION                    = 0x40
+	TCP_INFO                          = 0x20
+	TCP_KEEPCNT                       = 0x400
+	TCP_KEEPIDLE                      = 0x100
+	TCP_KEEPINIT                      = 0x80
+	TCP_KEEPINTVL                     = 0x200
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXHLEN                       = 0x3c
+	TCP_MAXOLEN                       = 0x28
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x4
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x10
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x218
+	TCP_NODELAY                       = 0x1
+	TCP_NOOPT                         = 0x8
+	TCP_NOPUSH                        = 0x4
+	TCP_VENDOR                        = 0x80000000
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLUSH                         = 0x80047410
+	TIOCGDRAINWAIT                    = 0x40047456
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGPGRP                         = 0x40047477
+	TIOCGPTN                          = 0x4004740f
+	TIOCGSID                          = 0x40047463
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGDTRWAIT                     = 0x4004745a
+	TIOCMGET                          = 0x4004746a
+	TIOCMSDTRWAIT                     = 0x8004745b
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DCD                         = 0x40
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTMASTER                      = 0x2000741c
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDRAINWAIT                    = 0x80047457
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSIG                           = 0x2004745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x20007465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCTIMESTAMP                     = 0x40087459
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VERASE2                           = 0x7
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WCONTINUED                        = 0x4
+	WCOREFLAG                         = 0x80
+	WEXITED                           = 0x10
+	WLINUXCLONE                       = 0x80000000
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x8
+	WSTOPPED                          = 0x2
+	WTRAPPED                          = 0x20
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x59)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x55)
+	ECAPMODE        = syscall.Errno(0x5e)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDOOFUS         = syscall.Errno(0x58)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x56)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5a)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x57)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCAPABLE     = syscall.Errno(0x5d)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTRECOVERABLE = syscall.Errno(0x5f)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x2d)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EOWNERDEAD      = syscall.Errno(0x60)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x5c)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGLIBRT  = syscall.Signal(0x21)
+	SIGLWP    = syscall.Signal(0x20)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:  "operation not permitted",
+	2:  "no such file or directory",
+	3:  "no such process",
+	4:  "interrupted system call",
+	5:  "input/output error",
+	6:  "device not configured",
+	7:  "argument list too long",
+	8:  "exec format error",
+	9:  "bad file descriptor",
+	10: "no child processes",
+	11: "resource deadlock avoided",
+	12: "cannot allocate memory",
+	13: "permission denied",
+	14: "bad address",
+	15: "block device required",
+	16: "device busy",
+	17: "file exists",
+	18: "cross-device link",
+	19: "operation not supported by device",
+	20: "not a directory",
+	21: "is a directory",
+	22: "invalid argument",
+	23: "too many open files in system",
+	24: "too many open files",
+	25: "inappropriate ioctl for device",
+	26: "text file busy",
+	27: "file too large",
+	28: "no space left on device",
+	29: "illegal seek",
+	30: "read-only file system",
+	31: "too many links",
+	32: "broken pipe",
+	33: "numerical argument out of domain",
+	34: "result too large",
+	35: "resource temporarily unavailable",
+	36: "operation now in progress",
+	37: "operation already in progress",
+	38: "socket operation on non-socket",
+	39: "destination address required",
+	40: "message too long",
+	41: "protocol wrong type for socket",
+	42: "protocol not available",
+	43: "protocol not supported",
+	44: "socket type not supported",
+	45: "operation not supported",
+	46: "protocol family not supported",
+	47: "address family not supported by protocol family",
+	48: "address already in use",
+	49: "can't assign requested address",
+	50: "network is down",
+	51: "network is unreachable",
+	52: "network dropped connection on reset",
+	53: "software caused connection abort",
+	54: "connection reset by peer",
+	55: "no buffer space available",
+	56: "socket is already connected",
+	57: "socket is not connected",
+	58: "can't send after socket shutdown",
+	59: "too many references: can't splice",
+	60: "operation timed out",
+	61: "connection refused",
+	62: "too many levels of symbolic links",
+	63: "file name too long",
+	64: "host is down",
+	65: "no route to host",
+	66: "directory not empty",
+	67: "too many processes",
+	68: "too many users",
+	69: "disc quota exceeded",
+	70: "stale NFS file handle",
+	71: "too many levels of remote in path",
+	72: "RPC struct is bad",
+	73: "RPC version wrong",
+	74: "RPC prog. not avail",
+	75: "program version wrong",
+	76: "bad procedure for program",
+	77: "no locks available",
+	78: "function not implemented",
+	79: "inappropriate file type or format",
+	80: "authentication error",
+	81: "need authenticator",
+	82: "identifier removed",
+	83: "no message of desired type",
+	84: "value too large to be stored in data type",
+	85: "operation canceled",
+	86: "illegal byte sequence",
+	87: "attribute not found",
+	88: "programming error",
+	89: "bad message",
+	90: "multihop attempted",
+	91: "link has been severed",
+	92: "protocol error",
+	93: "capabilities insufficient",
+	94: "not permitted in capability mode",
+	95: "state not recoverable",
+	96: "previous owner died",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "suspended (signal)",
+	18: "suspended",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+	32: "unknown signal",
+	33: "unknown signal",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
new file mode 100644
index 0000000000..8f920124b8
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -0,0 +1,1819 @@
+// mkerrors.sh -m32
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x28
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BOTHER                           = 0x1000
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
+	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	EPOLL_NONBLOCK                   = 0x800
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
+	FLUSHO                           = 0x1000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0xc
+	F_GETLK64                        = 0xc
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0xd
+	F_SETLK64                        = 0xd
+	F_SETLKW                         = 0xe
+	F_SETLKW64                       = 0xe
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x8000
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_NODAD                      = 0x2
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x7
+	IFF_802_1Q_VLAN                  = 0x1
+	IFF_ALLMULTI                     = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BONDING                      = 0x20
+	IFF_BRIDGE_PORT                  = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DISABLE_NETPOLL              = 0x1000
+	IFF_DONT_BRIDGE                  = 0x800
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_EBRIDGE                      = 0x2
+	IFF_ECHO                         = 0x40000
+	IFF_ISATAP                       = 0x80
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MACVLAN_PORT                 = 0x2000
+	IFF_MASTER                       = 0x400
+	IFF_MASTER_8023AD                = 0x8
+	IFF_MASTER_ALB                   = 0x10
+	IFF_MASTER_ARPMON                = 0x100
+	IFF_MULTICAST                    = 0x1000
+	IFF_NOARP                        = 0x80
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_OVS_DATAPATH                 = 0x8000
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_SLAVE_INACTIVE               = 0x4
+	IFF_SLAVE_NEEDARP                = 0x40
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_TX_SKB_SHARING               = 0x10000
+	IFF_UNICAST_FLT                  = 0x20000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFF_WAN_HDLC                     = 0x200
+	IFF_XMIT_DST_RELEASE             = 0x400
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DOFORK                      = 0xb
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_32BIT                        = 0x40
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_LOCKED                       = 0x2000
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x4000
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x2
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x4000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x8000
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = 0xffffffff
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETFPXREGS                = 0x12
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GET_THREAD_AREA           = 0x19
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_MASK                    = 0xff
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SEIZE_DEVEL               = 0x80000000
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETFPXREGS                = 0x13
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SET_THREAD_AREA           = 0x1a
+	PTRACE_SINGLEBLOCK               = 0x21
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_SYSEMU                    = 0x1f
+	PTRACE_SYSEMU_SINGLESTEP         = 0x20
+	PTRACE_TRACEME                   = 0x0
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0xe
+	RTAX_MTU                         = 0x2
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x10
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x4f
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x10
+	RTM_NR_MSGTYPES                  = 0x40
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_MARK                          = 0x24
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x10
+	SO_PASSSEC                       = 0x22
+	SO_PEERCRED                      = 0x11
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x12
+	SO_RCVTIMEO                      = 0x14
+	SO_REUSEADDR                     = 0x2
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x13
+	SO_SNDTIMEO                      = 0x15
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
+	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_NODELAY                      = 0x1
+	TCP_QUICKACK                     = 0xc
+	TCP_SYNCNT                       = 0x7
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x80045432
+	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
+	TIOCGPTN                         = 0x80045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x5413
+	TIOCINQ                          = 0x541b
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x5411
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x5423
+	TIOCSIG                          = 0x40045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSPGRP                        = 0x5410
+	TIOCSPTLCK                       = 0x40045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTI                          = 0x5412
+	TIOCSWINSZ                       = 0x5414
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x100
+	TUNATTACHFILTER                  = 0x400854d5
+	TUNDETACHFILTER                  = 0x400854d6
+	TUNGETFEATURES                   = 0x800454cf
+	TUNGETIFF                        = 0x800454d2
+	TUNGETSNDBUF                     = 0x800454d3
+	TUNGETVNETHDRSZ                  = 0x800454d7
+	TUNSETDEBUG                      = 0x400454c9
+	TUNSETGROUP                      = 0x400454ce
+	TUNSETIFF                        = 0x400454ca
+	TUNSETLINK                       = 0x400454cd
+	TUNSETNOCSUM                     = 0x400454c8
+	TUNSETOFFLOAD                    = 0x400454d0
+	TUNSETOWNER                      = 0x400454cc
+	TUNSETPERSIST                    = 0x400454cb
+	TUNSETSNDBUF                     = 0x400454d4
+	TUNSETTXFILTER                   = 0x400454d1
+	TUNSETVNETHDRSZ                  = 0x400454d8
+	VDISCARD                         = 0xd
+	VEOF                             = 0x4
+	VEOL                             = 0xb
+	VEOL2                            = 0x10
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x6
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x20
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale NFS file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "unknown error 133",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
new file mode 100644
index 0000000000..49b6c35467
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -0,0 +1,1820 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x28
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BOTHER                           = 0x1000
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
+	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	EPOLL_NONBLOCK                   = 0x800
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
+	FLUSHO                           = 0x1000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0x5
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x8000
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_NODAD                      = 0x2
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x7
+	IFF_802_1Q_VLAN                  = 0x1
+	IFF_ALLMULTI                     = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BONDING                      = 0x20
+	IFF_BRIDGE_PORT                  = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DISABLE_NETPOLL              = 0x1000
+	IFF_DONT_BRIDGE                  = 0x800
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_EBRIDGE                      = 0x2
+	IFF_ECHO                         = 0x40000
+	IFF_ISATAP                       = 0x80
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MACVLAN_PORT                 = 0x2000
+	IFF_MASTER                       = 0x400
+	IFF_MASTER_8023AD                = 0x8
+	IFF_MASTER_ALB                   = 0x10
+	IFF_MASTER_ARPMON                = 0x100
+	IFF_MULTICAST                    = 0x1000
+	IFF_NOARP                        = 0x80
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_OVS_DATAPATH                 = 0x8000
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_SLAVE_INACTIVE               = 0x4
+	IFF_SLAVE_NEEDARP                = 0x40
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_TX_SKB_SHARING               = 0x10000
+	IFF_UNICAST_FLT                  = 0x20000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFF_WAN_HDLC                     = 0x200
+	IFF_XMIT_DST_RELEASE             = 0x400
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DOFORK                      = 0xb
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_32BIT                        = 0x40
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_LOCKED                       = 0x2000
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x4000
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x2
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x4000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ARCH_PRCTL                = 0x1e
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETFPXREGS                = 0x12
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GET_THREAD_AREA           = 0x19
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_MASK                    = 0xff
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SEIZE_DEVEL               = 0x80000000
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETFPXREGS                = 0x13
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SET_THREAD_AREA           = 0x1a
+	PTRACE_SINGLEBLOCK               = 0x21
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_SYSEMU                    = 0x1f
+	PTRACE_SYSEMU_SINGLESTEP         = 0x20
+	PTRACE_TRACEME                   = 0x0
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0xe
+	RTAX_MTU                         = 0x2
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x10
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x4f
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x10
+	RTM_NR_MSGTYPES                  = 0x40
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_MARK                          = 0x24
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x10
+	SO_PASSSEC                       = 0x22
+	SO_PEERCRED                      = 0x11
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x12
+	SO_RCVTIMEO                      = 0x14
+	SO_REUSEADDR                     = 0x2
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x13
+	SO_SNDTIMEO                      = 0x15
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
+	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_NODELAY                      = 0x1
+	TCP_QUICKACK                     = 0xc
+	TCP_SYNCNT                       = 0x7
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x80045432
+	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
+	TIOCGPTN                         = 0x80045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x5413
+	TIOCINQ                          = 0x541b
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x5411
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x5423
+	TIOCSIG                          = 0x40045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSPGRP                        = 0x5410
+	TIOCSPTLCK                       = 0x40045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTI                          = 0x5412
+	TIOCSWINSZ                       = 0x5414
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x100
+	TUNATTACHFILTER                  = 0x401054d5
+	TUNDETACHFILTER                  = 0x401054d6
+	TUNGETFEATURES                   = 0x800454cf
+	TUNGETIFF                        = 0x800454d2
+	TUNGETSNDBUF                     = 0x800454d3
+	TUNGETVNETHDRSZ                  = 0x800454d7
+	TUNSETDEBUG                      = 0x400454c9
+	TUNSETGROUP                      = 0x400454ce
+	TUNSETIFF                        = 0x400454ca
+	TUNSETLINK                       = 0x400454cd
+	TUNSETNOCSUM                     = 0x400454c8
+	TUNSETOFFLOAD                    = 0x400454d0
+	TUNSETOWNER                      = 0x400454cc
+	TUNSETPERSIST                    = 0x400454cb
+	TUNSETSNDBUF                     = 0x400454d4
+	TUNSETTXFILTER                   = 0x400454d1
+	TUNSETVNETHDRSZ                  = 0x400454d8
+	VDISCARD                         = 0xd
+	VEOF                             = 0x4
+	VEOL                             = 0xb
+	VEOL2                            = 0x10
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x6
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale NFS file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "unknown error 133",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
new file mode 100644
index 0000000000..f036758f92
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -0,0 +1,1743 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x27
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_PHY            = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BOTHER                           = 0x1000
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
+	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ELF_NGREG                        = 0x12
+	ELF_PRARGSZ                      = 0x50
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	EPOLLERR                         = 0x8
+	EPOLLET                          = -0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	EPOLL_NONBLOCK                   = 0x800
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
+	FLUSHO                           = 0x1000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0xc
+	F_GETLK64                        = 0xc
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0xd
+	F_SETLK64                        = 0xd
+	F_SETLKW                         = 0xe
+	F_SETLKW64                       = 0xe
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x8000
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_NODAD                      = 0x2
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x7
+	IFF_ALLMULTI                     = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DYNAMIC                      = 0x8000
+	IFF_LOOPBACK                     = 0x8
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_NOARP                        = 0x80
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DOFORK                      = 0xb
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_LOCKED                       = 0x2000
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x4000
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x2
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x10000
+	O_DIRECTORY                      = 0x4000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x1000
+	O_LARGEFILE                      = 0x20000
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x8000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x1000
+	O_SYNC                           = 0x1000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_BROADCAST                 = 0x1
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HOST                      = 0x0
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MULTICAST                 = 0x2
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PARENB                           = 0x100
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_CLEAR_SECCOMP_FILTER          = 0x25
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECCOMP_FILTER            = 0x23
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_SECCOMP_FILTER_EVENT          = 0x1
+	PR_SECCOMP_FILTER_SYSCALL        = 0x0
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_NAME                      = 0xf
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECCOMP_FILTER            = 0x24
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETCRUNCHREGS             = 0x19
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETHBPREGS                = 0x1d
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETVFPREGS                = 0x1b
+	PTRACE_GETWMMXREGS               = 0x12
+	PTRACE_GET_THREAD_AREA           = 0x16
+	PTRACE_KILL                      = 0x8
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_MASK                    = 0x7f
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SETCRUNCHREGS             = 0x1a
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETHBPREGS                = 0x1e
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETVFPREGS                = 0x1c
+	PTRACE_SETWMMXREGS               = 0x13
+	PTRACE_SET_SYSCALL               = 0x17
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	PT_DATA_ADDR                     = 0x10004
+	PT_TEXT_ADDR                     = 0x10000
+	PT_TEXT_END_ADDR                 = 0x10008
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0xe
+	RTAX_MTU                         = 0x2
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x10
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x4f
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x10
+	RTM_NR_MSGTYPES                  = 0x40
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_MARK                          = 0x24
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x10
+	SO_PASSSEC                       = 0x22
+	SO_PEERCRED                      = 0x11
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x12
+	SO_RCVTIMEO                      = 0x14
+	SO_REUSEADDR                     = 0x2
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x13
+	SO_SNDTIMEO                      = 0x15
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
+	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_NODELAY                      = 0x1
+	TCP_QUICKACK                     = 0xc
+	TCP_SYNCNT                       = 0x7
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x80045432
+	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
+	TIOCGPTN                         = 0x80045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x5413
+	TIOCINQ                          = 0x541b
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x5411
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x5423
+	TIOCSIG                          = 0x40045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSPGRP                        = 0x5410
+	TIOCSPTLCK                       = 0x40045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTI                          = 0x5412
+	TIOCSWINSZ                       = 0x5414
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x100
+	TUNATTACHFILTER                  = 0x400854d5
+	TUNDETACHFILTER                  = 0x400854d6
+	TUNGETFEATURES                   = 0x800454cf
+	TUNGETIFF                        = 0x800454d2
+	TUNGETSNDBUF                     = 0x800454d3
+	TUNGETVNETHDRSZ                  = 0x800454d7
+	TUNSETDEBUG                      = 0x400454c9
+	TUNSETGROUP                      = 0x400454ce
+	TUNSETIFF                        = 0x400454ca
+	TUNSETLINK                       = 0x400454cd
+	TUNSETNOCSUM                     = 0x400454c8
+	TUNSETOFFLOAD                    = 0x400454d0
+	TUNSETOWNER                      = 0x400454cc
+	TUNSETPERSIST                    = 0x400454cb
+	TUNSETSNDBUF                     = 0x400454d4
+	TUNSETTXFILTER                   = 0x400454d1
+	TUNSETVNETHDRSZ                  = 0x400454d8
+	VDISCARD                         = 0xd
+	VEOF                             = 0x4
+	VEOL                             = 0xb
+	VEOL2                            = 0x10
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x6
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x20
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale NFS file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "unknown error 133",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
new file mode 100644
index 0000000000..16dcbc9cb2
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -0,0 +1,1897 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm64,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BOTHER                           = 0x1000
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
+	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ELF_NGREG                        = 0x22
+	ELF_PRARGSZ                      = 0x50
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
+	FLUSHO                           = 0x1000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0x5
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x8000
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_NODAD                      = 0x2
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x7
+	IFF_802_1Q_VLAN                  = 0x1
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BONDING                      = 0x20
+	IFF_BRIDGE_PORT                  = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DISABLE_NETPOLL              = 0x1000
+	IFF_DONT_BRIDGE                  = 0x800
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_EBRIDGE                      = 0x2
+	IFF_ECHO                         = 0x40000
+	IFF_ISATAP                       = 0x80
+	IFF_LIVE_ADDR_CHANGE             = 0x100000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MACVLAN                      = 0x200000
+	IFF_MACVLAN_PORT                 = 0x2000
+	IFF_MASTER                       = 0x400
+	IFF_MASTER_8023AD                = 0x8
+	IFF_MASTER_ALB                   = 0x10
+	IFF_MASTER_ARPMON                = 0x100
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_OVS_DATAPATH                 = 0x8000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_SLAVE_INACTIVE               = 0x4
+	IFF_SLAVE_NEEDARP                = 0x40
+	IFF_SUPP_NOFCS                   = 0x80000
+	IFF_TAP                          = 0x2
+	IFF_TEAM_PORT                    = 0x40000
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_TX_SKB_SHARING               = 0x10000
+	IFF_UNICAST_FLT                  = 0x20000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFF_WAN_HDLC                     = 0x200
+	IFF_XMIT_DST_RELEASE             = 0x400
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x2000
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x4000
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x2
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x10000
+	O_DIRECTORY                      = 0x4000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x8000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x1000ff
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0xf
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x11
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x57
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x12
+	RTM_NR_MSGTYPES                  = 0x48
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_GET_FILTER                    = 0x1a
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x10
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x11
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x12
+	SO_RCVTIMEO                      = 0x14
+	SO_REUSEADDR                     = 0x2
+	SO_REUSEPORT                     = 0xf
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x13
+	SO_SNDTIMEO                      = 0x15
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
+	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x80045432
+	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
+	TIOCGPTN                         = 0x80045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x5413
+	TIOCINQ                          = 0x541b
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x5411
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x5423
+	TIOCSIG                          = 0x40045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSPGRP                        = 0x5410
+	TIOCSPTLCK                       = 0x40045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTI                          = 0x5412
+	TIOCSWINSZ                       = 0x5414
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x100
+	TUNATTACHFILTER                  = 0x401054d5
+	TUNDETACHFILTER                  = 0x401054d6
+	TUNGETFEATURES                   = 0x800454cf
+	TUNGETFILTER                     = 0x801054db
+	TUNGETIFF                        = 0x800454d2
+	TUNGETSNDBUF                     = 0x800454d3
+	TUNGETVNETHDRSZ                  = 0x800454d7
+	TUNSETDEBUG                      = 0x400454c9
+	TUNSETGROUP                      = 0x400454ce
+	TUNSETIFF                        = 0x400454ca
+	TUNSETIFINDEX                    = 0x400454da
+	TUNSETLINK                       = 0x400454cd
+	TUNSETNOCSUM                     = 0x400454c8
+	TUNSETOFFLOAD                    = 0x400454d0
+	TUNSETOWNER                      = 0x400454cc
+	TUNSETPERSIST                    = 0x400454cb
+	TUNSETQUEUE                      = 0x400454d9
+	TUNSETSNDBUF                     = 0x400454d4
+	TUNSETTXFILTER                   = 0x400454d1
+	TUNSETVNETHDRSZ                  = 0x400454d8
+	VDISCARD                         = 0xd
+	VEOF                             = 0x4
+	VEOL                             = 0xb
+	VEOL2                            = 0x10
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x6
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "memory page has hardware error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
new file mode 100644
index 0000000000..36535b242d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -0,0 +1,1917 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build mips64,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IB                            = 0x1b
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_MPLS                          = 0x1c
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_6LOWPAN                   = 0x339
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LL_OFF                       = -0x200000
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_NET_OFF                      = -0x100000
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	CFLUSH                           = 0xf
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_TAI                        = 0xb
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CREAD                            = 0x80
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_80221                      = 0x8917
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_LOOPBACK                   = 0x9000
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_TSN                        = 0x22f0
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	ETH_P_XDSA                       = 0xf8
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FLUSHO                           = 0x2000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0xe
+	F_GETLK64                        = 0xe
+	F_GETOWN                         = 0x17
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OFD_GETLK                      = 0x24
+	F_OFD_SETLK                      = 0x25
+	F_OFD_SETLKW                     = 0x26
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x18
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x100
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_MANAGETEMPADDR             = 0x100
+	IFA_F_MCAUTOJOIN                 = 0x400
+	IFA_F_NODAD                      = 0x2
+	IFA_F_NOPREFIXROUTE              = 0x200
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_STABLE_PRIVACY             = 0x800
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x8
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_ECHO                         = 0x40000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x80
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DONTFRAG                    = 0x3e
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PATHMTU                     = 0x3d
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_INTERFACE          = 0x4
+	IPV6_PMTUDISC_OMIT               = 0x5
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPATHMTU                 = 0x3c
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_CHECKSUM                      = 0x17
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_NODEFRAG                      = 0x16
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_INTERFACE            = 0x4
+	IP_PMTUDISC_OMIT                 = 0x5
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x800
+	MAP_ANONYMOUS                    = 0x800
+	MAP_DENYWRITE                    = 0x2000
+	MAP_EXECUTABLE                   = 0x4000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x1000
+	MAP_HUGETLB                      = 0x80000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x8000
+	MAP_NONBLOCK                     = 0x20000
+	MAP_NORESERVE                    = 0x400
+	MAP_POPULATE                     = 0x10000
+	MAP_PRIVATE                      = 0x2
+	MAP_RENAME                       = 0x800
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x40000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_LAZYTIME                      = 0x2000000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x2800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CAP_ACK                  = 0xa
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_LISTEN_ALL_NSID          = 0x8
+	NETLINK_LIST_MEMBERSHIPS         = 0x9
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x8
+	O_ASYNC                          = 0x1000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x100
+	O_DIRECT                         = 0x8000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x10
+	O_EXCL                           = 0x400
+	O_FSYNC                          = 0x4010
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x80
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x800
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x80
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x4010
+	O_SYNC                           = 0x4010
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CBPF               = 0x6
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_DATA               = 0x16
+	PACKET_FANOUT_EBPF               = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_QM                 = 0x5
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_KERNEL                    = 0x7
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_QDISC_BYPASS              = 0x14
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_ROLLOVER_STATS            = 0x15
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_USER                      = 0x6
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_CAP_AMBIENT                   = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
+	PR_CAP_AMBIENT_IS_SET            = 0x1
+	PR_CAP_AMBIENT_LOWER             = 0x3
+	PR_CAP_AMBIENT_RAISE             = 0x2
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_FP_MODE_FR                    = 0x1
+	PR_FP_MODE_FRE                   = 0x2
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_FP_MODE                   = 0x2e
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_THP_DISABLE               = 0x2a
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_FP_MODE                   = 0x2d
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_MAP                    = 0xe
+	PR_SET_MM_MAP_SIZE               = 0xf
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_THP_DISABLE               = 0x29
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GET_THREAD_AREA           = 0x19
+	PTRACE_GET_THREAD_AREA_3264      = 0xc4
+	PTRACE_GET_WATCH_REGS            = 0xd0
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKDATA_3264             = 0xc1
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKTEXT_3264             = 0xc0
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKEDATA_3264             = 0xc3
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKETEXT_3264             = 0xc2
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SET_THREAD_AREA           = 0x1a
+	PTRACE_SET_WATCH_REGS            = 0xd1
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	RLIMIT_AS                        = 0x6
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x5
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CC_ALGO                     = 0x10
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_MASK                = 0xf
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0x10
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x16
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELNSID                      = 0x59
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETNSID                      = 0x5a
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x5b
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWNSID                      = 0x58
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x13
+	RTM_NR_MSGTYPES                  = 0x4c
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_COMPARE_MASK                = 0x11
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_LINKDOWN                  = 0x10
+	RTNH_F_OFFLOAD                   = 0x8
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BABEL                     = 0x2a
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x40047307
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x40047309
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x80047308
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x1
+	SOCK_NONBLOCK                    = 0x80
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x2
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0xffff
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1009
+	SO_ATTACH_BPF                    = 0x32
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BPF_EXTENSIONS                = 0x30
+	SO_BROADCAST                     = 0x20
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_BPF                    = 0x1b
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x1029
+	SO_DONTROUTE                     = 0x10
+	SO_ERROR                         = 0x1007
+	SO_GET_FILTER                    = 0x1a
+	SO_INCOMING_CPU                  = 0x31
+	SO_KEEPALIVE                     = 0x8
+	SO_LINGER                        = 0x80
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0x100
+	SO_PASSCRED                      = 0x11
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x12
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1e
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x1028
+	SO_RCVBUF                        = 0x1002
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x1004
+	SO_RCVTIMEO                      = 0x1006
+	SO_REUSEADDR                     = 0x4
+	SO_REUSEPORT                     = 0x200
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x1001
+	SO_SNDBUFFORCE                   = 0x1f
+	SO_SNDLOWAT                      = 0x1003
+	SO_SNDTIMEO                      = 0x1005
+	SO_STYLE                         = 0x1008
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x1008
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TCFLSH                           = 0x5407
+	TCIFLUSH                         = 0x0
+	TCIOFLUSH                        = 0x2
+	TCOFLUSH                         = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x5410
+	TCSBRK                           = 0x5405
+	TCXONC                           = 0x5406
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x80047478
+	TIOCEXCL                         = 0x740d
+	TIOCGDEV                         = 0x40045432
+	TIOCGETD                         = 0x7400
+	TIOCGETP                         = 0x7408
+	TIOCGEXCL                        = 0x40045440
+	TIOCGICOUNT                      = 0x5492
+	TIOCGLCKTRMIOS                   = 0x548b
+	TIOCGLTC                         = 0x7474
+	TIOCGPGRP                        = 0x40047477
+	TIOCGPKT                         = 0x40045438
+	TIOCGPTLCK                       = 0x40045439
+	TIOCGPTN                         = 0x40045430
+	TIOCGRS485                       = 0x4020542e
+	TIOCGSERIAL                      = 0x5484
+	TIOCGSID                         = 0x7416
+	TIOCGSOFTCAR                     = 0x5481
+	TIOCGWINSZ                       = 0x40087468
+	TIOCINQ                          = 0x467f
+	TIOCLINUX                        = 0x5483
+	TIOCMBIC                         = 0x741c
+	TIOCMBIS                         = 0x741b
+	TIOCMGET                         = 0x741d
+	TIOCMIWAIT                       = 0x5491
+	TIOCMSET                         = 0x741a
+	TIOCM_CAR                        = 0x100
+	TIOCM_CD                         = 0x100
+	TIOCM_CTS                        = 0x40
+	TIOCM_DSR                        = 0x400
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x200
+	TIOCM_RNG                        = 0x200
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x20
+	TIOCM_ST                         = 0x10
+	TIOCNOTTY                        = 0x5471
+	TIOCNXCL                         = 0x740e
+	TIOCOUTQ                         = 0x7472
+	TIOCPKT                          = 0x5470
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x5480
+	TIOCSERCONFIG                    = 0x5488
+	TIOCSERGETLSR                    = 0x548e
+	TIOCSERGETMULTI                  = 0x548f
+	TIOCSERGSTRUCT                   = 0x548d
+	TIOCSERGWILD                     = 0x5489
+	TIOCSERSETMULTI                  = 0x5490
+	TIOCSERSWILD                     = 0x548a
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x7401
+	TIOCSETN                         = 0x740a
+	TIOCSETP                         = 0x7409
+	TIOCSIG                          = 0x80045436
+	TIOCSLCKTRMIOS                   = 0x548c
+	TIOCSLTC                         = 0x7475
+	TIOCSPGRP                        = 0x80047476
+	TIOCSPTLCK                       = 0x80045431
+	TIOCSRS485                       = 0xc020542f
+	TIOCSSERIAL                      = 0x5485
+	TIOCSSOFTCAR                     = 0x5482
+	TIOCSTI                          = 0x5472
+	TIOCSWINSZ                       = 0x80087467
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x8000
+	TUNATTACHFILTER                  = 0x801054d5
+	TUNDETACHFILTER                  = 0x801054d6
+	TUNGETFEATURES                   = 0x400454cf
+	TUNGETFILTER                     = 0x401054db
+	TUNGETIFF                        = 0x400454d2
+	TUNGETSNDBUF                     = 0x400454d3
+	TUNGETVNETBE                     = 0x400454df
+	TUNGETVNETHDRSZ                  = 0x400454d7
+	TUNGETVNETLE                     = 0x400454dd
+	TUNSETDEBUG                      = 0x800454c9
+	TUNSETGROUP                      = 0x800454ce
+	TUNSETIFF                        = 0x800454ca
+	TUNSETIFINDEX                    = 0x800454da
+	TUNSETLINK                       = 0x800454cd
+	TUNSETNOCSUM                     = 0x800454c8
+	TUNSETOFFLOAD                    = 0x800454d0
+	TUNSETOWNER                      = 0x800454cc
+	TUNSETPERSIST                    = 0x800454cb
+	TUNSETQUEUE                      = 0x800454d9
+	TUNSETSNDBUF                     = 0x800454d4
+	TUNSETTXFILTER                   = 0x800454d1
+	TUNSETVNETBE                     = 0x800454de
+	TUNSETVNETHDRSZ                  = 0x800454d8
+	TUNSETVNETLE                     = 0x800454dc
+	VDISCARD                         = 0xd
+	VEOF                             = 0x10
+	VEOL                             = 0x11
+	VEOL2                            = 0x6
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x4
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VSWTCH                           = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x9e)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x46d)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EHWPOISON       = syscall.Errno(0xa8)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINIT           = syscall.Errno(0x8d)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x8b)
+	EKEYEXPIRED     = syscall.Errno(0xa2)
+	EKEYREJECTED    = syscall.Errno(0xa4)
+	EKEYREVOKED     = syscall.Errno(0xa3)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOOP           = syscall.Errno(0x5a)
+	EMEDIUMTYPE     = syscall.Errno(0xa0)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENAVAIL         = syscall.Errno(0x8a)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0xa1)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x9f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTNAM         = syscall.Errno(0x89)
+	ENOTRECOVERABLE = syscall.Errno(0xa6)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x7a)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0xa5)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMDEV         = syscall.Errno(0x8e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x8c)
+	ERESTART        = syscall.Errno(0x5b)
+	ERFKILL         = syscall.Errno(0xa7)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x87)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x12)
+	SIGCLD    = syscall.Signal(0x12)
+	SIGCONT   = syscall.Signal(0x19)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x16)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x16)
+	SIGPROF   = syscall.Signal(0x1d)
+	SIGPWR    = syscall.Signal(0x13)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x17)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x18)
+	SIGTTIN   = syscall.Signal(0x1a)
+	SIGTTOU   = syscall.Signal(0x1b)
+	SIGURG    = syscall.Signal(0x15)
+	SIGUSR1   = syscall.Signal(0x10)
+	SIGUSR2   = syscall.Signal(0x11)
+	SIGVTALRM = syscall.Signal(0x1c)
+	SIGWINCH  = syscall.Signal(0x14)
+	SIGXCPU   = syscall.Signal(0x1e)
+	SIGXFSZ   = syscall.Signal(0x1f)
+)
+
+// Error table
+var errors = [...]string{
+	1:    "operation not permitted",
+	2:    "no such file or directory",
+	3:    "no such process",
+	4:    "interrupted system call",
+	5:    "input/output error",
+	6:    "no such device or address",
+	7:    "argument list too long",
+	8:    "exec format error",
+	9:    "bad file descriptor",
+	10:   "no child processes",
+	11:   "resource temporarily unavailable",
+	12:   "cannot allocate memory",
+	13:   "permission denied",
+	14:   "bad address",
+	15:   "block device required",
+	16:   "device or resource busy",
+	17:   "file exists",
+	18:   "invalid cross-device link",
+	19:   "no such device",
+	20:   "not a directory",
+	21:   "is a directory",
+	22:   "invalid argument",
+	23:   "too many open files in system",
+	24:   "too many open files",
+	25:   "inappropriate ioctl for device",
+	26:   "text file busy",
+	27:   "file too large",
+	28:   "no space left on device",
+	29:   "illegal seek",
+	30:   "read-only file system",
+	31:   "too many links",
+	32:   "broken pipe",
+	33:   "numerical argument out of domain",
+	34:   "numerical result out of range",
+	35:   "no message of desired type",
+	36:   "identifier removed",
+	37:   "channel number out of range",
+	38:   "level 2 not synchronized",
+	39:   "level 3 halted",
+	40:   "level 3 reset",
+	41:   "link number out of range",
+	42:   "protocol driver not attached",
+	43:   "no CSI structure available",
+	44:   "level 2 halted",
+	45:   "resource deadlock avoided",
+	46:   "no locks available",
+	50:   "invalid exchange",
+	51:   "invalid request descriptor",
+	52:   "exchange full",
+	53:   "no anode",
+	54:   "invalid request code",
+	55:   "invalid slot",
+	56:   "file locking deadlock error",
+	59:   "bad font file format",
+	60:   "device not a stream",
+	61:   "no data available",
+	62:   "timer expired",
+	63:   "out of streams resources",
+	64:   "machine is not on the network",
+	65:   "package not installed",
+	66:   "object is remote",
+	67:   "link has been severed",
+	68:   "advertise error",
+	69:   "srmount error",
+	70:   "communication error on send",
+	71:   "protocol error",
+	73:   "RFS specific error",
+	74:   "multihop attempted",
+	77:   "bad message",
+	78:   "file name too long",
+	79:   "value too large for defined data type",
+	80:   "name not unique on network",
+	81:   "file descriptor in bad state",
+	82:   "remote address changed",
+	83:   "can not access a needed shared library",
+	84:   "accessing a corrupted shared library",
+	85:   ".lib section in a.out corrupted",
+	86:   "attempting to link in too many shared libraries",
+	87:   "cannot exec a shared library directly",
+	88:   "invalid or incomplete multibyte or wide character",
+	89:   "function not implemented",
+	90:   "too many levels of symbolic links",
+	91:   "interrupted system call should be restarted",
+	92:   "streams pipe error",
+	93:   "directory not empty",
+	94:   "too many users",
+	95:   "socket operation on non-socket",
+	96:   "destination address required",
+	97:   "message too long",
+	98:   "protocol wrong type for socket",
+	99:   "protocol not available",
+	120:  "protocol not supported",
+	121:  "socket type not supported",
+	122:  "operation not supported",
+	123:  "protocol family not supported",
+	124:  "address family not supported by protocol",
+	125:  "address already in use",
+	126:  "cannot assign requested address",
+	127:  "network is down",
+	128:  "network is unreachable",
+	129:  "network dropped connection on reset",
+	130:  "software caused connection abort",
+	131:  "connection reset by peer",
+	132:  "no buffer space available",
+	133:  "transport endpoint is already connected",
+	134:  "transport endpoint is not connected",
+	135:  "structure needs cleaning",
+	137:  "not a XENIX named type file",
+	138:  "no XENIX semaphores available",
+	139:  "is a named type file",
+	140:  "remote I/O error",
+	141:  "unknown error 141",
+	142:  "unknown error 142",
+	143:  "cannot send after transport endpoint shutdown",
+	144:  "too many references: cannot splice",
+	145:  "connection timed out",
+	146:  "connection refused",
+	147:  "host is down",
+	148:  "no route to host",
+	149:  "operation already in progress",
+	150:  "operation now in progress",
+	151:  "stale file handle",
+	158:  "operation canceled",
+	159:  "no medium found",
+	160:  "wrong medium type",
+	161:  "required key not available",
+	162:  "key has expired",
+	163:  "key has been revoked",
+	164:  "key was rejected by service",
+	165:  "owner died",
+	166:  "state not recoverable",
+	167:  "operation not possible due to RF-kill",
+	168:  "memory page has hardware error",
+	1133: "disk quota exceeded",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "user defined signal 1",
+	17: "user defined signal 2",
+	18: "child exited",
+	19: "power failure",
+	20: "window changed",
+	21: "urgent I/O condition",
+	22: "I/O possible",
+	23: "stopped (signal)",
+	24: "stopped",
+	25: "continued",
+	26: "stopped (tty input)",
+	27: "stopped (tty output)",
+	28: "virtual timer expired",
+	29: "profiling timer expired",
+	30: "CPU time limit exceeded",
+	31: "file size limit exceeded",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
new file mode 100644
index 0000000000..112f05de56
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -0,0 +1,1917 @@
+// mkerrors.sh
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build mips64le,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IB                            = 0x1b
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_MPLS                          = 0x1c
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_6LOWPAN                   = 0x339
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LL_OFF                       = -0x200000
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_NET_OFF                      = -0x100000
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	CFLUSH                           = 0xf
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_TAI                        = 0xb
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CREAD                            = 0x80
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_80221                      = 0x8917
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_LOOPBACK                   = 0x9000
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_TSN                        = 0x22f0
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	ETH_P_XDSA                       = 0xf8
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FLUSHO                           = 0x2000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0xe
+	F_GETLK64                        = 0xe
+	F_GETOWN                         = 0x17
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OFD_GETLK                      = 0x24
+	F_OFD_SETLK                      = 0x25
+	F_OFD_SETLKW                     = 0x26
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x18
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x100
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_MANAGETEMPADDR             = 0x100
+	IFA_F_MCAUTOJOIN                 = 0x400
+	IFA_F_NODAD                      = 0x2
+	IFA_F_NOPREFIXROUTE              = 0x200
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_STABLE_PRIVACY             = 0x800
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x8
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_ECHO                         = 0x40000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x80
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DONTFRAG                    = 0x3e
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PATHMTU                     = 0x3d
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_INTERFACE          = 0x4
+	IPV6_PMTUDISC_OMIT               = 0x5
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPATHMTU                 = 0x3c
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_CHECKSUM                      = 0x17
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_NODEFRAG                      = 0x16
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_INTERFACE            = 0x4
+	IP_PMTUDISC_OMIT                 = 0x5
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x800
+	MAP_ANONYMOUS                    = 0x800
+	MAP_DENYWRITE                    = 0x2000
+	MAP_EXECUTABLE                   = 0x4000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x1000
+	MAP_HUGETLB                      = 0x80000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x8000
+	MAP_NONBLOCK                     = 0x20000
+	MAP_NORESERVE                    = 0x400
+	MAP_POPULATE                     = 0x10000
+	MAP_PRIVATE                      = 0x2
+	MAP_RENAME                       = 0x800
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x40000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_LAZYTIME                      = 0x2000000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x2800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CAP_ACK                  = 0xa
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_LISTEN_ALL_NSID          = 0x8
+	NETLINK_LIST_MEMBERSHIPS         = 0x9
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x8
+	O_ASYNC                          = 0x1000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x100
+	O_DIRECT                         = 0x8000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x10
+	O_EXCL                           = 0x400
+	O_FSYNC                          = 0x4010
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x80
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x800
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x80
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x4010
+	O_SYNC                           = 0x4010
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CBPF               = 0x6
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_DATA               = 0x16
+	PACKET_FANOUT_EBPF               = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_QM                 = 0x5
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_KERNEL                    = 0x7
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_QDISC_BYPASS              = 0x14
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_ROLLOVER_STATS            = 0x15
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_USER                      = 0x6
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_CAP_AMBIENT                   = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
+	PR_CAP_AMBIENT_IS_SET            = 0x1
+	PR_CAP_AMBIENT_LOWER             = 0x3
+	PR_CAP_AMBIENT_RAISE             = 0x2
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_FP_MODE_FR                    = 0x1
+	PR_FP_MODE_FRE                   = 0x2
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_FP_MODE                   = 0x2e
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_THP_DISABLE               = 0x2a
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_FP_MODE                   = 0x2d
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_MAP                    = 0xe
+	PR_SET_MM_MAP_SIZE               = 0xf
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_THP_DISABLE               = 0x29
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GET_THREAD_AREA           = 0x19
+	PTRACE_GET_THREAD_AREA_3264      = 0xc4
+	PTRACE_GET_WATCH_REGS            = 0xd0
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKDATA_3264             = 0xc1
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKTEXT_3264             = 0xc0
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKEDATA_3264             = 0xc3
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKETEXT_3264             = 0xc2
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SET_THREAD_AREA           = 0x1a
+	PTRACE_SET_WATCH_REGS            = 0xd1
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	RLIMIT_AS                        = 0x6
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x5
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CC_ALGO                     = 0x10
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_MASK                = 0xf
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0x10
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x16
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELNSID                      = 0x59
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETNSID                      = 0x5a
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x5b
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWNSID                      = 0x58
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x13
+	RTM_NR_MSGTYPES                  = 0x4c
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_COMPARE_MASK                = 0x11
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_LINKDOWN                  = 0x10
+	RTNH_F_OFFLOAD                   = 0x8
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BABEL                     = 0x2a
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x40047307
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x40047309
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x80047308
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x1
+	SOCK_NONBLOCK                    = 0x80
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x2
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0xffff
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1009
+	SO_ATTACH_BPF                    = 0x32
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BPF_EXTENSIONS                = 0x30
+	SO_BROADCAST                     = 0x20
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_BPF                    = 0x1b
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x1029
+	SO_DONTROUTE                     = 0x10
+	SO_ERROR                         = 0x1007
+	SO_GET_FILTER                    = 0x1a
+	SO_INCOMING_CPU                  = 0x31
+	SO_KEEPALIVE                     = 0x8
+	SO_LINGER                        = 0x80
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0x100
+	SO_PASSCRED                      = 0x11
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x12
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1e
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x1028
+	SO_RCVBUF                        = 0x1002
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x1004
+	SO_RCVTIMEO                      = 0x1006
+	SO_REUSEADDR                     = 0x4
+	SO_REUSEPORT                     = 0x200
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x1001
+	SO_SNDBUFFORCE                   = 0x1f
+	SO_SNDLOWAT                      = 0x1003
+	SO_SNDTIMEO                      = 0x1005
+	SO_STYLE                         = 0x1008
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x1008
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TCFLSH                           = 0x5407
+	TCIFLUSH                         = 0x0
+	TCIOFLUSH                        = 0x2
+	TCOFLUSH                         = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x5410
+	TCSBRK                           = 0x5405
+	TCXONC                           = 0x5406
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x80047478
+	TIOCEXCL                         = 0x740d
+	TIOCGDEV                         = 0x40045432
+	TIOCGETD                         = 0x7400
+	TIOCGETP                         = 0x7408
+	TIOCGEXCL                        = 0x40045440
+	TIOCGICOUNT                      = 0x5492
+	TIOCGLCKTRMIOS                   = 0x548b
+	TIOCGLTC                         = 0x7474
+	TIOCGPGRP                        = 0x40047477
+	TIOCGPKT                         = 0x40045438
+	TIOCGPTLCK                       = 0x40045439
+	TIOCGPTN                         = 0x40045430
+	TIOCGRS485                       = 0x4020542e
+	TIOCGSERIAL                      = 0x5484
+	TIOCGSID                         = 0x7416
+	TIOCGSOFTCAR                     = 0x5481
+	TIOCGWINSZ                       = 0x40087468
+	TIOCINQ                          = 0x467f
+	TIOCLINUX                        = 0x5483
+	TIOCMBIC                         = 0x741c
+	TIOCMBIS                         = 0x741b
+	TIOCMGET                         = 0x741d
+	TIOCMIWAIT                       = 0x5491
+	TIOCMSET                         = 0x741a
+	TIOCM_CAR                        = 0x100
+	TIOCM_CD                         = 0x100
+	TIOCM_CTS                        = 0x40
+	TIOCM_DSR                        = 0x400
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x200
+	TIOCM_RNG                        = 0x200
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x20
+	TIOCM_ST                         = 0x10
+	TIOCNOTTY                        = 0x5471
+	TIOCNXCL                         = 0x740e
+	TIOCOUTQ                         = 0x7472
+	TIOCPKT                          = 0x5470
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x5480
+	TIOCSERCONFIG                    = 0x5488
+	TIOCSERGETLSR                    = 0x548e
+	TIOCSERGETMULTI                  = 0x548f
+	TIOCSERGSTRUCT                   = 0x548d
+	TIOCSERGWILD                     = 0x5489
+	TIOCSERSETMULTI                  = 0x5490
+	TIOCSERSWILD                     = 0x548a
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x7401
+	TIOCSETN                         = 0x740a
+	TIOCSETP                         = 0x7409
+	TIOCSIG                          = 0x80045436
+	TIOCSLCKTRMIOS                   = 0x548c
+	TIOCSLTC                         = 0x7475
+	TIOCSPGRP                        = 0x80047476
+	TIOCSPTLCK                       = 0x80045431
+	TIOCSRS485                       = 0xc020542f
+	TIOCSSERIAL                      = 0x5485
+	TIOCSSOFTCAR                     = 0x5482
+	TIOCSTI                          = 0x5472
+	TIOCSWINSZ                       = 0x80087467
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x8000
+	TUNATTACHFILTER                  = 0x801054d5
+	TUNDETACHFILTER                  = 0x801054d6
+	TUNGETFEATURES                   = 0x400454cf
+	TUNGETFILTER                     = 0x401054db
+	TUNGETIFF                        = 0x400454d2
+	TUNGETSNDBUF                     = 0x400454d3
+	TUNGETVNETBE                     = 0x400454df
+	TUNGETVNETHDRSZ                  = 0x400454d7
+	TUNGETVNETLE                     = 0x400454dd
+	TUNSETDEBUG                      = 0x800454c9
+	TUNSETGROUP                      = 0x800454ce
+	TUNSETIFF                        = 0x800454ca
+	TUNSETIFINDEX                    = 0x800454da
+	TUNSETLINK                       = 0x800454cd
+	TUNSETNOCSUM                     = 0x800454c8
+	TUNSETOFFLOAD                    = 0x800454d0
+	TUNSETOWNER                      = 0x800454cc
+	TUNSETPERSIST                    = 0x800454cb
+	TUNSETQUEUE                      = 0x800454d9
+	TUNSETSNDBUF                     = 0x800454d4
+	TUNSETTXFILTER                   = 0x800454d1
+	TUNSETVNETBE                     = 0x800454de
+	TUNSETVNETHDRSZ                  = 0x800454d8
+	TUNSETVNETLE                     = 0x800454dc
+	VDISCARD                         = 0xd
+	VEOF                             = 0x10
+	VEOL                             = 0x11
+	VEOL2                            = 0x6
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x4
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VSWTCH                           = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x9e)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x46d)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EHWPOISON       = syscall.Errno(0xa8)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINIT           = syscall.Errno(0x8d)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x8b)
+	EKEYEXPIRED     = syscall.Errno(0xa2)
+	EKEYREJECTED    = syscall.Errno(0xa4)
+	EKEYREVOKED     = syscall.Errno(0xa3)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOOP           = syscall.Errno(0x5a)
+	EMEDIUMTYPE     = syscall.Errno(0xa0)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENAVAIL         = syscall.Errno(0x8a)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0xa1)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x9f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTNAM         = syscall.Errno(0x89)
+	ENOTRECOVERABLE = syscall.Errno(0xa6)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x7a)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0xa5)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMDEV         = syscall.Errno(0x8e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x8c)
+	ERESTART        = syscall.Errno(0x5b)
+	ERFKILL         = syscall.Errno(0xa7)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x87)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x12)
+	SIGCLD    = syscall.Signal(0x12)
+	SIGCONT   = syscall.Signal(0x19)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x16)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x16)
+	SIGPROF   = syscall.Signal(0x1d)
+	SIGPWR    = syscall.Signal(0x13)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x17)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x18)
+	SIGTTIN   = syscall.Signal(0x1a)
+	SIGTTOU   = syscall.Signal(0x1b)
+	SIGURG    = syscall.Signal(0x15)
+	SIGUSR1   = syscall.Signal(0x10)
+	SIGUSR2   = syscall.Signal(0x11)
+	SIGVTALRM = syscall.Signal(0x1c)
+	SIGWINCH  = syscall.Signal(0x14)
+	SIGXCPU   = syscall.Signal(0x1e)
+	SIGXFSZ   = syscall.Signal(0x1f)
+)
+
+// Error table
+var errors = [...]string{
+	1:    "operation not permitted",
+	2:    "no such file or directory",
+	3:    "no such process",
+	4:    "interrupted system call",
+	5:    "input/output error",
+	6:    "no such device or address",
+	7:    "argument list too long",
+	8:    "exec format error",
+	9:    "bad file descriptor",
+	10:   "no child processes",
+	11:   "resource temporarily unavailable",
+	12:   "cannot allocate memory",
+	13:   "permission denied",
+	14:   "bad address",
+	15:   "block device required",
+	16:   "device or resource busy",
+	17:   "file exists",
+	18:   "invalid cross-device link",
+	19:   "no such device",
+	20:   "not a directory",
+	21:   "is a directory",
+	22:   "invalid argument",
+	23:   "too many open files in system",
+	24:   "too many open files",
+	25:   "inappropriate ioctl for device",
+	26:   "text file busy",
+	27:   "file too large",
+	28:   "no space left on device",
+	29:   "illegal seek",
+	30:   "read-only file system",
+	31:   "too many links",
+	32:   "broken pipe",
+	33:   "numerical argument out of domain",
+	34:   "numerical result out of range",
+	35:   "no message of desired type",
+	36:   "identifier removed",
+	37:   "channel number out of range",
+	38:   "level 2 not synchronized",
+	39:   "level 3 halted",
+	40:   "level 3 reset",
+	41:   "link number out of range",
+	42:   "protocol driver not attached",
+	43:   "no CSI structure available",
+	44:   "level 2 halted",
+	45:   "resource deadlock avoided",
+	46:   "no locks available",
+	50:   "invalid exchange",
+	51:   "invalid request descriptor",
+	52:   "exchange full",
+	53:   "no anode",
+	54:   "invalid request code",
+	55:   "invalid slot",
+	56:   "file locking deadlock error",
+	59:   "bad font file format",
+	60:   "device not a stream",
+	61:   "no data available",
+	62:   "timer expired",
+	63:   "out of streams resources",
+	64:   "machine is not on the network",
+	65:   "package not installed",
+	66:   "object is remote",
+	67:   "link has been severed",
+	68:   "advertise error",
+	69:   "srmount error",
+	70:   "communication error on send",
+	71:   "protocol error",
+	73:   "RFS specific error",
+	74:   "multihop attempted",
+	77:   "bad message",
+	78:   "file name too long",
+	79:   "value too large for defined data type",
+	80:   "name not unique on network",
+	81:   "file descriptor in bad state",
+	82:   "remote address changed",
+	83:   "can not access a needed shared library",
+	84:   "accessing a corrupted shared library",
+	85:   ".lib section in a.out corrupted",
+	86:   "attempting to link in too many shared libraries",
+	87:   "cannot exec a shared library directly",
+	88:   "invalid or incomplete multibyte or wide character",
+	89:   "function not implemented",
+	90:   "too many levels of symbolic links",
+	91:   "interrupted system call should be restarted",
+	92:   "streams pipe error",
+	93:   "directory not empty",
+	94:   "too many users",
+	95:   "socket operation on non-socket",
+	96:   "destination address required",
+	97:   "message too long",
+	98:   "protocol wrong type for socket",
+	99:   "protocol not available",
+	120:  "protocol not supported",
+	121:  "socket type not supported",
+	122:  "operation not supported",
+	123:  "protocol family not supported",
+	124:  "address family not supported by protocol",
+	125:  "address already in use",
+	126:  "cannot assign requested address",
+	127:  "network is down",
+	128:  "network is unreachable",
+	129:  "network dropped connection on reset",
+	130:  "software caused connection abort",
+	131:  "connection reset by peer",
+	132:  "no buffer space available",
+	133:  "transport endpoint is already connected",
+	134:  "transport endpoint is not connected",
+	135:  "structure needs cleaning",
+	137:  "not a XENIX named type file",
+	138:  "no XENIX semaphores available",
+	139:  "is a named type file",
+	140:  "remote I/O error",
+	141:  "unknown error 141",
+	142:  "unknown error 142",
+	143:  "cannot send after transport endpoint shutdown",
+	144:  "too many references: cannot splice",
+	145:  "connection timed out",
+	146:  "connection refused",
+	147:  "host is down",
+	148:  "no route to host",
+	149:  "operation already in progress",
+	150:  "operation now in progress",
+	151:  "stale file handle",
+	158:  "operation canceled",
+	159:  "no medium found",
+	160:  "wrong medium type",
+	161:  "required key not available",
+	162:  "key has expired",
+	163:  "key has been revoked",
+	164:  "key was rejected by service",
+	165:  "owner died",
+	166:  "state not recoverable",
+	167:  "operation not possible due to RF-kill",
+	168:  "memory page has hardware error",
+	1133: "disk quota exceeded",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "user defined signal 1",
+	17: "user defined signal 2",
+	18: "child exited",
+	19: "power failure",
+	20: "window changed",
+	21: "urgent I/O condition",
+	22: "I/O possible",
+	23: "stopped (signal)",
+	24: "stopped",
+	25: "continued",
+	26: "stopped (tty input)",
+	27: "stopped (tty output)",
+	28: "virtual timer expired",
+	29: "profiling timer expired",
+	30: "CPU time limit exceeded",
+	31: "file size limit exceeded",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
new file mode 100644
index 0000000000..8b42ca2fe9
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -0,0 +1,1970 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build ppc64,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_6LOWPAN                   = 0x339
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x17
+	B110                             = 0x3
+	B115200                          = 0x11
+	B1152000                         = 0x18
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x19
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x1a
+	B230400                          = 0x12
+	B2400                            = 0xb
+	B2500000                         = 0x1b
+	B300                             = 0x7
+	B3000000                         = 0x1c
+	B3500000                         = 0x1d
+	B38400                           = 0xf
+	B4000000                         = 0x1e
+	B460800                          = 0x13
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x14
+	B57600                           = 0x10
+	B576000                          = 0x15
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x16
+	B9600                            = 0xd
+	BOTHER                           = 0x1f
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x8000
+	BSDLY                            = 0x8000
+	CBAUD                            = 0xff
+	CBAUDEX                          = 0x0
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0xff0000
+	CLOCAL                           = 0x8000
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x1000
+	CR2                              = 0x2000
+	CR3                              = 0x3000
+	CRDLY                            = 0x3000
+	CREAD                            = 0x800
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x100
+	CS7                              = 0x200
+	CS8                              = 0x300
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x300
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x400
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x40
+	ECHOE                            = 0x2
+	ECHOK                            = 0x4
+	ECHOKE                           = 0x1
+	ECHONL                           = 0x10
+	ECHOPRT                          = 0x20
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_80221                      = 0x8917
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_LOOPBACK                   = 0x9000
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	ETH_P_XDSA                       = 0xf8
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x4000
+	FFDLY                            = 0x4000
+	FLUSHO                           = 0x800000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0xc
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OFD_GETLK                      = 0x24
+	F_OFD_SETLK                      = 0x25
+	F_OFD_SETLKW                     = 0x26
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0xd
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0xe
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x4000
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x100
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x400
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_MANAGETEMPADDR             = 0x100
+	IFA_F_NODAD                      = 0x2
+	IFA_F_NOPREFIXROUTE              = 0x200
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x8
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_ECHO                         = 0x40000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_INTERFACE          = 0x4
+	IPV6_PMTUDISC_OMIT               = 0x5
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_NODEFRAG                      = 0x16
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_INTERFACE            = 0x4
+	IP_PMTUDISC_OMIT                 = 0x5
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x80
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x1000
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x400
+	IXON                             = 0x200
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x80
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x40
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x2000
+	MCL_FUTURE                       = 0x4000
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NL2                              = 0x200
+	NL3                              = 0x300
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x300
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80000000
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x4
+	ONLCR                            = 0x2
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x20000
+	O_DIRECTORY                      = 0x4000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x8000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_QM                 = 0x5
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_KERNEL                    = 0x7
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_QDISC_BYPASS              = 0x14
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_USER                      = 0x6
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x1000
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x2000
+	PENDIN                           = 0x20000000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_SAO                         = 0x10
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_THP_DISABLE               = 0x2a
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_MAP                    = 0xe
+	PR_SET_MM_MAP_SIZE               = 0xf
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_THP_DISABLE               = 0x29
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETEVRREGS                = 0x14
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGS64                 = 0x16
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GETVRREGS                 = 0x12
+	PTRACE_GETVSRREGS                = 0x1b
+	PTRACE_GET_DEBUGREG              = 0x19
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x1000ff
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETEVRREGS                = 0x15
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGS64                 = 0x17
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SETVRREGS                 = 0x13
+	PTRACE_SETVSRREGS                = 0x1c
+	PTRACE_SET_DEBUGREG              = 0x1a
+	PTRACE_SINGLEBLOCK               = 0x100
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	PT_CCR                           = 0x26
+	PT_CTR                           = 0x23
+	PT_DAR                           = 0x29
+	PT_DSCR                          = 0x2c
+	PT_DSISR                         = 0x2a
+	PT_FPR0                          = 0x30
+	PT_FPSCR                         = 0x50
+	PT_LNK                           = 0x24
+	PT_MSR                           = 0x21
+	PT_NIP                           = 0x20
+	PT_ORIG_R3                       = 0x22
+	PT_R0                            = 0x0
+	PT_R1                            = 0x1
+	PT_R10                           = 0xa
+	PT_R11                           = 0xb
+	PT_R12                           = 0xc
+	PT_R13                           = 0xd
+	PT_R14                           = 0xe
+	PT_R15                           = 0xf
+	PT_R16                           = 0x10
+	PT_R17                           = 0x11
+	PT_R18                           = 0x12
+	PT_R19                           = 0x13
+	PT_R2                            = 0x2
+	PT_R20                           = 0x14
+	PT_R21                           = 0x15
+	PT_R22                           = 0x16
+	PT_R23                           = 0x17
+	PT_R24                           = 0x18
+	PT_R25                           = 0x19
+	PT_R26                           = 0x1a
+	PT_R27                           = 0x1b
+	PT_R28                           = 0x1c
+	PT_R29                           = 0x1d
+	PT_R3                            = 0x3
+	PT_R30                           = 0x1e
+	PT_R31                           = 0x1f
+	PT_R4                            = 0x4
+	PT_R5                            = 0x5
+	PT_R6                            = 0x6
+	PT_R7                            = 0x7
+	PT_R8                            = 0x8
+	PT_R9                            = 0x9
+	PT_REGS_COUNT                    = 0x2c
+	PT_RESULT                        = 0x2b
+	PT_SOFTE                         = 0x27
+	PT_TRAP                          = 0x28
+	PT_VR0                           = 0x52
+	PT_VRSAVE                        = 0x94
+	PT_VSCR                          = 0x93
+	PT_VSR0                          = 0x96
+	PT_VSR31                         = 0xd4
+	PT_XER                           = 0x25
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0xf
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x11
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x57
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x12
+	RTM_NR_MSGTYPES                  = 0x48
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BPF_EXTENSIONS                = 0x30
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_GET_FILTER                    = 0x1a
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x14
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x15
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x10
+	SO_RCVTIMEO                      = 0x12
+	SO_REUSEADDR                     = 0x2
+	SO_REUSEPORT                     = 0xf
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x11
+	SO_SNDTIMEO                      = 0x13
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x400
+	TAB2                             = 0x800
+	TAB3                             = 0xc00
+	TABDLY                           = 0xc00
+	TCFLSH                           = 0x2000741f
+	TCGETA                           = 0x40147417
+	TCGETS                           = 0x402c7413
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x2000741d
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x80147418
+	TCSETAF                          = 0x8014741c
+	TCSETAW                          = 0x80147419
+	TCSETS                           = 0x802c7414
+	TCSETSF                          = 0x802c7416
+	TCSETSW                          = 0x802c7415
+	TCXONC                           = 0x2000741e
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x40045432
+	TIOCGETC                         = 0x40067412
+	TIOCGETD                         = 0x5424
+	TIOCGETP                         = 0x40067408
+	TIOCGEXCL                        = 0x40045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGLTC                         = 0x40067474
+	TIOCGPGRP                        = 0x40047477
+	TIOCGPKT                         = 0x40045438
+	TIOCGPTLCK                       = 0x40045439
+	TIOCGPTN                         = 0x40045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x40087468
+	TIOCINQ                          = 0x4004667f
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_LOOP                       = 0x8000
+	TIOCM_OUT1                       = 0x2000
+	TIOCM_OUT2                       = 0x4000
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x40047473
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETC                         = 0x80067411
+	TIOCSETD                         = 0x5423
+	TIOCSETN                         = 0x8006740a
+	TIOCSETP                         = 0x80067409
+	TIOCSIG                          = 0x80045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSLTC                         = 0x80067475
+	TIOCSPGRP                        = 0x80047476
+	TIOCSPTLCK                       = 0x80045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTART                        = 0x2000746e
+	TIOCSTI                          = 0x5412
+	TIOCSTOP                         = 0x2000746f
+	TIOCSWINSZ                       = 0x80087467
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x400000
+	TUNATTACHFILTER                  = 0x801054d5
+	TUNDETACHFILTER                  = 0x801054d6
+	TUNGETFEATURES                   = 0x400454cf
+	TUNGETFILTER                     = 0x401054db
+	TUNGETIFF                        = 0x400454d2
+	TUNGETSNDBUF                     = 0x400454d3
+	TUNGETVNETHDRSZ                  = 0x400454d7
+	TUNSETDEBUG                      = 0x800454c9
+	TUNSETGROUP                      = 0x800454ce
+	TUNSETIFF                        = 0x800454ca
+	TUNSETIFINDEX                    = 0x800454da
+	TUNSETLINK                       = 0x800454cd
+	TUNSETNOCSUM                     = 0x800454c8
+	TUNSETOFFLOAD                    = 0x800454d0
+	TUNSETOWNER                      = 0x800454cc
+	TUNSETPERSIST                    = 0x800454cb
+	TUNSETQUEUE                      = 0x800454d9
+	TUNSETSNDBUF                     = 0x800454d4
+	TUNSETTXFILTER                   = 0x800454d1
+	TUNSETVNETHDRSZ                  = 0x800454d8
+	VDISCARD                         = 0x10
+	VEOF                             = 0x4
+	VEOL                             = 0x6
+	VEOL2                            = 0x8
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x5
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xb
+	VSTART                           = 0xd
+	VSTOP                            = 0xe
+	VSUSP                            = 0xc
+	VSWTC                            = 0x9
+	VT0                              = 0x0
+	VT1                              = 0x10000
+	VTDLY                            = 0x10000
+	VTIME                            = 0x7
+	VWERASE                          = 0xa
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4000
+	XTABS                            = 0xc00
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x3a)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	58:  "file locking deadlock error",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "memory page has hardware error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
new file mode 100644
index 0000000000..e8d12b5d6d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -0,0 +1,1969 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build ppc64le,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x17
+	B110                             = 0x3
+	B115200                          = 0x11
+	B1152000                         = 0x18
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x19
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x1a
+	B230400                          = 0x12
+	B2400                            = 0xb
+	B2500000                         = 0x1b
+	B300                             = 0x7
+	B3000000                         = 0x1c
+	B3500000                         = 0x1d
+	B38400                           = 0xf
+	B4000000                         = 0x1e
+	B460800                          = 0x13
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x14
+	B57600                           = 0x10
+	B576000                          = 0x15
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x16
+	B9600                            = 0xd
+	BOTHER                           = 0x1f
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x8000
+	BSDLY                            = 0x8000
+	CBAUD                            = 0xff
+	CBAUDEX                          = 0x0
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0xff0000
+	CLOCAL                           = 0x8000
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x1000
+	CR2                              = 0x2000
+	CR3                              = 0x3000
+	CRDLY                            = 0x3000
+	CREAD                            = 0x800
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x100
+	CS7                              = 0x200
+	CS8                              = 0x300
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x300
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x400
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x40
+	ECHOE                            = 0x2
+	ECHOK                            = 0x4
+	ECHOKE                           = 0x1
+	ECHONL                           = 0x10
+	ECHOPRT                          = 0x20
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x4000
+	FFDLY                            = 0x4000
+	FLUSHO                           = 0x800000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0xc
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0xd
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0xe
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x4000
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x100
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x400
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_NODAD                      = 0x2
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x7
+	IFF_802_1Q_VLAN                  = 0x1
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BONDING                      = 0x20
+	IFF_BRIDGE_PORT                  = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DISABLE_NETPOLL              = 0x1000
+	IFF_DONT_BRIDGE                  = 0x800
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_EBRIDGE                      = 0x2
+	IFF_ECHO                         = 0x40000
+	IFF_ISATAP                       = 0x80
+	IFF_LIVE_ADDR_CHANGE             = 0x100000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MACVLAN                      = 0x200000
+	IFF_MACVLAN_PORT                 = 0x2000
+	IFF_MASTER                       = 0x400
+	IFF_MASTER_8023AD                = 0x8
+	IFF_MASTER_ALB                   = 0x10
+	IFF_MASTER_ARPMON                = 0x100
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_OVS_DATAPATH                 = 0x8000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_SLAVE_INACTIVE               = 0x4
+	IFF_SLAVE_NEEDARP                = 0x40
+	IFF_SUPP_NOFCS                   = 0x80000
+	IFF_TAP                          = 0x2
+	IFF_TEAM_PORT                    = 0x40000
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_TX_SKB_SHARING               = 0x10000
+	IFF_UNICAST_FLT                  = 0x20000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFF_WAN_HDLC                     = 0x200
+	IFF_XMIT_DST_RELEASE             = 0x400
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x80
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x1000
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x400
+	IXON                             = 0x200
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x80
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x40
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x2000
+	MCL_FUTURE                       = 0x4000
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NL2                              = 0x200
+	NL3                              = 0x300
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x300
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80000000
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x4
+	ONLCR                            = 0x2
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x20000
+	O_DIRECTORY                      = 0x4000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x8000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x1000
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x2000
+	PENDIN                           = 0x20000000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_SAO                         = 0x10
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETEVRREGS                = 0x14
+	PTRACE_GETFPREGS                 = 0xe
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGS64                 = 0x16
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GETVRREGS                 = 0x12
+	PTRACE_GETVSRREGS                = 0x1b
+	PTRACE_GET_DEBUGREG              = 0x19
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x1000ff
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETEVRREGS                = 0x15
+	PTRACE_SETFPREGS                 = 0xf
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGS64                 = 0x17
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SETVRREGS                 = 0x13
+	PTRACE_SETVSRREGS                = 0x1c
+	PTRACE_SET_DEBUGREG              = 0x1a
+	PTRACE_SINGLEBLOCK               = 0x100
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TRACEME                   = 0x0
+	PT_CCR                           = 0x26
+	PT_CTR                           = 0x23
+	PT_DAR                           = 0x29
+	PT_DSCR                          = 0x2c
+	PT_DSISR                         = 0x2a
+	PT_FPR0                          = 0x30
+	PT_FPSCR                         = 0x50
+	PT_LNK                           = 0x24
+	PT_MSR                           = 0x21
+	PT_NIP                           = 0x20
+	PT_ORIG_R3                       = 0x22
+	PT_R0                            = 0x0
+	PT_R1                            = 0x1
+	PT_R10                           = 0xa
+	PT_R11                           = 0xb
+	PT_R12                           = 0xc
+	PT_R13                           = 0xd
+	PT_R14                           = 0xe
+	PT_R15                           = 0xf
+	PT_R16                           = 0x10
+	PT_R17                           = 0x11
+	PT_R18                           = 0x12
+	PT_R19                           = 0x13
+	PT_R2                            = 0x2
+	PT_R20                           = 0x14
+	PT_R21                           = 0x15
+	PT_R22                           = 0x16
+	PT_R23                           = 0x17
+	PT_R24                           = 0x18
+	PT_R25                           = 0x19
+	PT_R26                           = 0x1a
+	PT_R27                           = 0x1b
+	PT_R28                           = 0x1c
+	PT_R29                           = 0x1d
+	PT_R3                            = 0x3
+	PT_R30                           = 0x1e
+	PT_R31                           = 0x1f
+	PT_R4                            = 0x4
+	PT_R5                            = 0x5
+	PT_R6                            = 0x6
+	PT_R7                            = 0x7
+	PT_R8                            = 0x8
+	PT_R9                            = 0x9
+	PT_REGS_COUNT                    = 0x2c
+	PT_RESULT                        = 0x2b
+	PT_SOFTE                         = 0x27
+	PT_TRAP                          = 0x28
+	PT_VR0                           = 0x52
+	PT_VRSAVE                        = 0x94
+	PT_VSCR                          = 0x93
+	PT_VSR0                          = 0x96
+	PT_VSR31                         = 0xd4
+	PT_XER                           = 0x25
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0xf
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x11
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x57
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x12
+	RTM_NR_MSGTYPES                  = 0x48
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_GET_FILTER                    = 0x1a
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x14
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x15
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x10
+	SO_RCVTIMEO                      = 0x12
+	SO_REUSEADDR                     = 0x2
+	SO_REUSEPORT                     = 0xf
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x11
+	SO_SNDTIMEO                      = 0x13
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x400
+	TAB2                             = 0x800
+	TAB3                             = 0xc00
+	TABDLY                           = 0xc00
+	TCFLSH                           = 0x2000741f
+	TCGETA                           = 0x40147417
+	TCGETS                           = 0x402c7413
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x2000741d
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x80147418
+	TCSETAF                          = 0x8014741c
+	TCSETAW                          = 0x80147419
+	TCSETS                           = 0x802c7414
+	TCSETSF                          = 0x802c7416
+	TCSETSW                          = 0x802c7415
+	TCXONC                           = 0x2000741e
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x40045432
+	TIOCGETC                         = 0x40067412
+	TIOCGETD                         = 0x5424
+	TIOCGETP                         = 0x40067408
+	TIOCGEXCL                        = 0x40045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGLTC                         = 0x40067474
+	TIOCGPGRP                        = 0x40047477
+	TIOCGPKT                         = 0x40045438
+	TIOCGPTLCK                       = 0x40045439
+	TIOCGPTN                         = 0x40045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x40087468
+	TIOCINQ                          = 0x4004667f
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_LOOP                       = 0x8000
+	TIOCM_OUT1                       = 0x2000
+	TIOCM_OUT2                       = 0x4000
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x40047473
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETC                         = 0x80067411
+	TIOCSETD                         = 0x5423
+	TIOCSETN                         = 0x8006740a
+	TIOCSETP                         = 0x80067409
+	TIOCSIG                          = 0x80045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSLTC                         = 0x80067475
+	TIOCSPGRP                        = 0x80047476
+	TIOCSPTLCK                       = 0x80045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTART                        = 0x2000746e
+	TIOCSTI                          = 0x5412
+	TIOCSTOP                         = 0x2000746f
+	TIOCSWINSZ                       = 0x80087467
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x400000
+	TUNATTACHFILTER                  = 0x801054d5
+	TUNDETACHFILTER                  = 0x801054d6
+	TUNGETFEATURES                   = 0x400454cf
+	TUNGETFILTER                     = 0x401054db
+	TUNGETIFF                        = 0x400454d2
+	TUNGETSNDBUF                     = 0x400454d3
+	TUNGETVNETHDRSZ                  = 0x400454d7
+	TUNSETDEBUG                      = 0x800454c9
+	TUNSETGROUP                      = 0x800454ce
+	TUNSETIFF                        = 0x800454ca
+	TUNSETIFINDEX                    = 0x800454da
+	TUNSETLINK                       = 0x800454cd
+	TUNSETNOCSUM                     = 0x800454c8
+	TUNSETOFFLOAD                    = 0x800454d0
+	TUNSETOWNER                      = 0x800454cc
+	TUNSETPERSIST                    = 0x800454cb
+	TUNSETQUEUE                      = 0x800454d9
+	TUNSETSNDBUF                     = 0x800454d4
+	TUNSETTXFILTER                   = 0x800454d1
+	TUNSETVNETHDRSZ                  = 0x800454d8
+	VDISCARD                         = 0x10
+	VEOF                             = 0x4
+	VEOL                             = 0x6
+	VEOL2                            = 0x8
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x5
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xb
+	VSTART                           = 0xd
+	VSTOP                            = 0xe
+	VSUSP                            = 0xc
+	VSWTC                            = 0x9
+	VT0                              = 0x0
+	VT1                              = 0x10000
+	VTDLY                            = 0x10000
+	VTIME                            = 0x7
+	VWERASE                          = 0xa
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4000
+	XTABS                            = 0xc00
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x3a)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	58:  "file locking deadlock error",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "memory page has hardware error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
new file mode 100644
index 0000000000..329f25e7cf
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -0,0 +1,2027 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build s390x,linux
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_ALG                           = 0x26
+	AF_APPLETALK                     = 0x5
+	AF_ASH                           = 0x12
+	AF_ATMPVC                        = 0x8
+	AF_ATMSVC                        = 0x14
+	AF_AX25                          = 0x3
+	AF_BLUETOOTH                     = 0x1f
+	AF_BRIDGE                        = 0x7
+	AF_CAIF                          = 0x25
+	AF_CAN                           = 0x1d
+	AF_DECnet                        = 0xc
+	AF_ECONET                        = 0x13
+	AF_FILE                          = 0x1
+	AF_IB                            = 0x1b
+	AF_IEEE802154                    = 0x24
+	AF_INET                          = 0x2
+	AF_INET6                         = 0xa
+	AF_IPX                           = 0x4
+	AF_IRDA                          = 0x17
+	AF_ISDN                          = 0x22
+	AF_IUCV                          = 0x20
+	AF_KEY                           = 0xf
+	AF_LLC                           = 0x1a
+	AF_LOCAL                         = 0x1
+	AF_MAX                           = 0x29
+	AF_MPLS                          = 0x1c
+	AF_NETBEUI                       = 0xd
+	AF_NETLINK                       = 0x10
+	AF_NETROM                        = 0x6
+	AF_NFC                           = 0x27
+	AF_PACKET                        = 0x11
+	AF_PHONET                        = 0x23
+	AF_PPPOX                         = 0x18
+	AF_RDS                           = 0x15
+	AF_ROSE                          = 0xb
+	AF_ROUTE                         = 0x10
+	AF_RXRPC                         = 0x21
+	AF_SECURITY                      = 0xe
+	AF_SNA                           = 0x16
+	AF_TIPC                          = 0x1e
+	AF_UNIX                          = 0x1
+	AF_UNSPEC                        = 0x0
+	AF_VSOCK                         = 0x28
+	AF_WANPIPE                       = 0x19
+	AF_X25                           = 0x9
+	ARPHRD_6LOWPAN                   = 0x339
+	ARPHRD_ADAPT                     = 0x108
+	ARPHRD_APPLETLK                  = 0x8
+	ARPHRD_ARCNET                    = 0x7
+	ARPHRD_ASH                       = 0x30d
+	ARPHRD_ATM                       = 0x13
+	ARPHRD_AX25                      = 0x3
+	ARPHRD_BIF                       = 0x307
+	ARPHRD_CAIF                      = 0x336
+	ARPHRD_CAN                       = 0x118
+	ARPHRD_CHAOS                     = 0x5
+	ARPHRD_CISCO                     = 0x201
+	ARPHRD_CSLIP                     = 0x101
+	ARPHRD_CSLIP6                    = 0x103
+	ARPHRD_DDCMP                     = 0x205
+	ARPHRD_DLCI                      = 0xf
+	ARPHRD_ECONET                    = 0x30e
+	ARPHRD_EETHER                    = 0x2
+	ARPHRD_ETHER                     = 0x1
+	ARPHRD_EUI64                     = 0x1b
+	ARPHRD_FCAL                      = 0x311
+	ARPHRD_FCFABRIC                  = 0x313
+	ARPHRD_FCPL                      = 0x312
+	ARPHRD_FCPP                      = 0x310
+	ARPHRD_FDDI                      = 0x306
+	ARPHRD_FRAD                      = 0x302
+	ARPHRD_HDLC                      = 0x201
+	ARPHRD_HIPPI                     = 0x30c
+	ARPHRD_HWX25                     = 0x110
+	ARPHRD_IEEE1394                  = 0x18
+	ARPHRD_IEEE802                   = 0x6
+	ARPHRD_IEEE80211                 = 0x321
+	ARPHRD_IEEE80211_PRISM           = 0x322
+	ARPHRD_IEEE80211_RADIOTAP        = 0x323
+	ARPHRD_IEEE802154                = 0x324
+	ARPHRD_IEEE802154_MONITOR        = 0x325
+	ARPHRD_IEEE802_TR                = 0x320
+	ARPHRD_INFINIBAND                = 0x20
+	ARPHRD_IP6GRE                    = 0x337
+	ARPHRD_IPDDP                     = 0x309
+	ARPHRD_IPGRE                     = 0x30a
+	ARPHRD_IRDA                      = 0x30f
+	ARPHRD_LAPB                      = 0x204
+	ARPHRD_LOCALTLK                  = 0x305
+	ARPHRD_LOOPBACK                  = 0x304
+	ARPHRD_METRICOM                  = 0x17
+	ARPHRD_NETLINK                   = 0x338
+	ARPHRD_NETROM                    = 0x0
+	ARPHRD_NONE                      = 0xfffe
+	ARPHRD_PHONET                    = 0x334
+	ARPHRD_PHONET_PIPE               = 0x335
+	ARPHRD_PIMREG                    = 0x30b
+	ARPHRD_PPP                       = 0x200
+	ARPHRD_PRONET                    = 0x4
+	ARPHRD_RAWHDLC                   = 0x206
+	ARPHRD_ROSE                      = 0x10e
+	ARPHRD_RSRVD                     = 0x104
+	ARPHRD_SIT                       = 0x308
+	ARPHRD_SKIP                      = 0x303
+	ARPHRD_SLIP                      = 0x100
+	ARPHRD_SLIP6                     = 0x102
+	ARPHRD_TUNNEL                    = 0x300
+	ARPHRD_TUNNEL6                   = 0x301
+	ARPHRD_VOID                      = 0xffff
+	ARPHRD_X25                       = 0x10f
+	B0                               = 0x0
+	B1000000                         = 0x1008
+	B110                             = 0x3
+	B115200                          = 0x1002
+	B1152000                         = 0x1009
+	B1200                            = 0x9
+	B134                             = 0x4
+	B150                             = 0x5
+	B1500000                         = 0x100a
+	B1800                            = 0xa
+	B19200                           = 0xe
+	B200                             = 0x6
+	B2000000                         = 0x100b
+	B230400                          = 0x1003
+	B2400                            = 0xb
+	B2500000                         = 0x100c
+	B300                             = 0x7
+	B3000000                         = 0x100d
+	B3500000                         = 0x100e
+	B38400                           = 0xf
+	B4000000                         = 0x100f
+	B460800                          = 0x1004
+	B4800                            = 0xc
+	B50                              = 0x1
+	B500000                          = 0x1005
+	B57600                           = 0x1001
+	B576000                          = 0x1006
+	B600                             = 0x8
+	B75                              = 0x2
+	B921600                          = 0x1007
+	B9600                            = 0xd
+	BOTHER                           = 0x1000
+	BPF_A                            = 0x10
+	BPF_ABS                          = 0x20
+	BPF_ADD                          = 0x0
+	BPF_ALU                          = 0x4
+	BPF_AND                          = 0x50
+	BPF_B                            = 0x10
+	BPF_DIV                          = 0x30
+	BPF_H                            = 0x8
+	BPF_IMM                          = 0x0
+	BPF_IND                          = 0x40
+	BPF_JA                           = 0x0
+	BPF_JEQ                          = 0x10
+	BPF_JGE                          = 0x30
+	BPF_JGT                          = 0x20
+	BPF_JMP                          = 0x5
+	BPF_JSET                         = 0x40
+	BPF_K                            = 0x0
+	BPF_LD                           = 0x0
+	BPF_LDX                          = 0x1
+	BPF_LEN                          = 0x80
+	BPF_LL_OFF                       = -0x200000
+	BPF_LSH                          = 0x60
+	BPF_MAJOR_VERSION                = 0x1
+	BPF_MAXINSNS                     = 0x1000
+	BPF_MEM                          = 0x60
+	BPF_MEMWORDS                     = 0x10
+	BPF_MINOR_VERSION                = 0x1
+	BPF_MISC                         = 0x7
+	BPF_MOD                          = 0x90
+	BPF_MSH                          = 0xa0
+	BPF_MUL                          = 0x20
+	BPF_NEG                          = 0x80
+	BPF_NET_OFF                      = -0x100000
+	BPF_OR                           = 0x40
+	BPF_RET                          = 0x6
+	BPF_RSH                          = 0x70
+	BPF_ST                           = 0x2
+	BPF_STX                          = 0x3
+	BPF_SUB                          = 0x10
+	BPF_TAX                          = 0x0
+	BPF_TXA                          = 0x80
+	BPF_W                            = 0x0
+	BPF_X                            = 0x8
+	BPF_XOR                          = 0xa0
+	BRKINT                           = 0x2
+	BS0                              = 0x0
+	BS1                              = 0x2000
+	BSDLY                            = 0x2000
+	CBAUD                            = 0x100f
+	CBAUDEX                          = 0x1000
+	CFLUSH                           = 0xf
+	CIBAUD                           = 0x100f0000
+	CLOCAL                           = 0x800
+	CLOCK_BOOTTIME                   = 0x7
+	CLOCK_BOOTTIME_ALARM             = 0x9
+	CLOCK_DEFAULT                    = 0x0
+	CLOCK_EXT                        = 0x1
+	CLOCK_INT                        = 0x2
+	CLOCK_MONOTONIC                  = 0x1
+	CLOCK_MONOTONIC_COARSE           = 0x6
+	CLOCK_MONOTONIC_RAW              = 0x4
+	CLOCK_PROCESS_CPUTIME_ID         = 0x2
+	CLOCK_REALTIME                   = 0x0
+	CLOCK_REALTIME_ALARM             = 0x8
+	CLOCK_REALTIME_COARSE            = 0x5
+	CLOCK_TAI                        = 0xb
+	CLOCK_THREAD_CPUTIME_ID          = 0x3
+	CLOCK_TXFROMRX                   = 0x4
+	CLOCK_TXINT                      = 0x3
+	CLONE_CHILD_CLEARTID             = 0x200000
+	CLONE_CHILD_SETTID               = 0x1000000
+	CLONE_DETACHED                   = 0x400000
+	CLONE_FILES                      = 0x400
+	CLONE_FS                         = 0x200
+	CLONE_IO                         = 0x80000000
+	CLONE_NEWCGROUP                  = 0x2000000
+	CLONE_NEWIPC                     = 0x8000000
+	CLONE_NEWNET                     = 0x40000000
+	CLONE_NEWNS                      = 0x20000
+	CLONE_NEWPID                     = 0x20000000
+	CLONE_NEWUSER                    = 0x10000000
+	CLONE_NEWUTS                     = 0x4000000
+	CLONE_PARENT                     = 0x8000
+	CLONE_PARENT_SETTID              = 0x100000
+	CLONE_PTRACE                     = 0x2000
+	CLONE_SETTLS                     = 0x80000
+	CLONE_SIGHAND                    = 0x800
+	CLONE_SYSVSEM                    = 0x40000
+	CLONE_THREAD                     = 0x10000
+	CLONE_UNTRACED                   = 0x800000
+	CLONE_VFORK                      = 0x4000
+	CLONE_VM                         = 0x100
+	CMSPAR                           = 0x40000000
+	CR0                              = 0x0
+	CR1                              = 0x200
+	CR2                              = 0x400
+	CR3                              = 0x600
+	CRDLY                            = 0x600
+	CREAD                            = 0x80
+	CRTSCTS                          = 0x80000000
+	CS5                              = 0x0
+	CS6                              = 0x10
+	CS7                              = 0x20
+	CS8                              = 0x30
+	CSIGNAL                          = 0xff
+	CSIZE                            = 0x30
+	CSTART                           = 0x11
+	CSTATUS                          = 0x0
+	CSTOP                            = 0x13
+	CSTOPB                           = 0x40
+	CSUSP                            = 0x1a
+	DT_BLK                           = 0x6
+	DT_CHR                           = 0x2
+	DT_DIR                           = 0x4
+	DT_FIFO                          = 0x1
+	DT_LNK                           = 0xa
+	DT_REG                           = 0x8
+	DT_SOCK                          = 0xc
+	DT_UNKNOWN                       = 0x0
+	DT_WHT                           = 0xe
+	ECHO                             = 0x8
+	ECHOCTL                          = 0x200
+	ECHOE                            = 0x10
+	ECHOK                            = 0x20
+	ECHOKE                           = 0x800
+	ECHONL                           = 0x40
+	ECHOPRT                          = 0x400
+	ENCODING_DEFAULT                 = 0x0
+	ENCODING_FM_MARK                 = 0x3
+	ENCODING_FM_SPACE                = 0x4
+	ENCODING_MANCHESTER              = 0x5
+	ENCODING_NRZ                     = 0x1
+	ENCODING_NRZI                    = 0x2
+	EPOLLERR                         = 0x8
+	EPOLLET                          = 0x80000000
+	EPOLLHUP                         = 0x10
+	EPOLLIN                          = 0x1
+	EPOLLMSG                         = 0x400
+	EPOLLONESHOT                     = 0x40000000
+	EPOLLOUT                         = 0x4
+	EPOLLPRI                         = 0x2
+	EPOLLRDBAND                      = 0x80
+	EPOLLRDHUP                       = 0x2000
+	EPOLLRDNORM                      = 0x40
+	EPOLLWAKEUP                      = 0x20000000
+	EPOLLWRBAND                      = 0x200
+	EPOLLWRNORM                      = 0x100
+	EPOLL_CLOEXEC                    = 0x80000
+	EPOLL_CTL_ADD                    = 0x1
+	EPOLL_CTL_DEL                    = 0x2
+	EPOLL_CTL_MOD                    = 0x3
+	ETH_P_1588                       = 0x88f7
+	ETH_P_8021AD                     = 0x88a8
+	ETH_P_8021AH                     = 0x88e7
+	ETH_P_8021Q                      = 0x8100
+	ETH_P_80221                      = 0x8917
+	ETH_P_802_2                      = 0x4
+	ETH_P_802_3                      = 0x1
+	ETH_P_802_3_MIN                  = 0x600
+	ETH_P_802_EX1                    = 0x88b5
+	ETH_P_AARP                       = 0x80f3
+	ETH_P_AF_IUCV                    = 0xfbfb
+	ETH_P_ALL                        = 0x3
+	ETH_P_AOE                        = 0x88a2
+	ETH_P_ARCNET                     = 0x1a
+	ETH_P_ARP                        = 0x806
+	ETH_P_ATALK                      = 0x809b
+	ETH_P_ATMFATE                    = 0x8884
+	ETH_P_ATMMPOA                    = 0x884c
+	ETH_P_AX25                       = 0x2
+	ETH_P_BATMAN                     = 0x4305
+	ETH_P_BPQ                        = 0x8ff
+	ETH_P_CAIF                       = 0xf7
+	ETH_P_CAN                        = 0xc
+	ETH_P_CANFD                      = 0xd
+	ETH_P_CONTROL                    = 0x16
+	ETH_P_CUST                       = 0x6006
+	ETH_P_DDCMP                      = 0x6
+	ETH_P_DEC                        = 0x6000
+	ETH_P_DIAG                       = 0x6005
+	ETH_P_DNA_DL                     = 0x6001
+	ETH_P_DNA_RC                     = 0x6002
+	ETH_P_DNA_RT                     = 0x6003
+	ETH_P_DSA                        = 0x1b
+	ETH_P_ECONET                     = 0x18
+	ETH_P_EDSA                       = 0xdada
+	ETH_P_FCOE                       = 0x8906
+	ETH_P_FIP                        = 0x8914
+	ETH_P_HDLC                       = 0x19
+	ETH_P_IEEE802154                 = 0xf6
+	ETH_P_IEEEPUP                    = 0xa00
+	ETH_P_IEEEPUPAT                  = 0xa01
+	ETH_P_IP                         = 0x800
+	ETH_P_IPV6                       = 0x86dd
+	ETH_P_IPX                        = 0x8137
+	ETH_P_IRDA                       = 0x17
+	ETH_P_LAT                        = 0x6004
+	ETH_P_LINK_CTL                   = 0x886c
+	ETH_P_LOCALTALK                  = 0x9
+	ETH_P_LOOP                       = 0x60
+	ETH_P_LOOPBACK                   = 0x9000
+	ETH_P_MOBITEX                    = 0x15
+	ETH_P_MPLS_MC                    = 0x8848
+	ETH_P_MPLS_UC                    = 0x8847
+	ETH_P_MVRP                       = 0x88f5
+	ETH_P_PAE                        = 0x888e
+	ETH_P_PAUSE                      = 0x8808
+	ETH_P_PHONET                     = 0xf5
+	ETH_P_PPPTALK                    = 0x10
+	ETH_P_PPP_DISC                   = 0x8863
+	ETH_P_PPP_MP                     = 0x8
+	ETH_P_PPP_SES                    = 0x8864
+	ETH_P_PRP                        = 0x88fb
+	ETH_P_PUP                        = 0x200
+	ETH_P_PUPAT                      = 0x201
+	ETH_P_QINQ1                      = 0x9100
+	ETH_P_QINQ2                      = 0x9200
+	ETH_P_QINQ3                      = 0x9300
+	ETH_P_RARP                       = 0x8035
+	ETH_P_SCA                        = 0x6007
+	ETH_P_SLOW                       = 0x8809
+	ETH_P_SNAP                       = 0x5
+	ETH_P_TDLS                       = 0x890d
+	ETH_P_TEB                        = 0x6558
+	ETH_P_TIPC                       = 0x88ca
+	ETH_P_TRAILER                    = 0x1c
+	ETH_P_TR_802_2                   = 0x11
+	ETH_P_TSN                        = 0x22f0
+	ETH_P_WAN_PPP                    = 0x7
+	ETH_P_WCCP                       = 0x883e
+	ETH_P_X25                        = 0x805
+	ETH_P_XDSA                       = 0xf8
+	EXTA                             = 0xe
+	EXTB                             = 0xf
+	EXTPROC                          = 0x10000
+	FD_CLOEXEC                       = 0x1
+	FD_SETSIZE                       = 0x400
+	FF0                              = 0x0
+	FF1                              = 0x8000
+	FFDLY                            = 0x8000
+	FLUSHO                           = 0x1000
+	F_DUPFD                          = 0x0
+	F_DUPFD_CLOEXEC                  = 0x406
+	F_EXLCK                          = 0x4
+	F_GETFD                          = 0x1
+	F_GETFL                          = 0x3
+	F_GETLEASE                       = 0x401
+	F_GETLK                          = 0x5
+	F_GETLK64                        = 0x5
+	F_GETOWN                         = 0x9
+	F_GETOWN_EX                      = 0x10
+	F_GETPIPE_SZ                     = 0x408
+	F_GETSIG                         = 0xb
+	F_LOCK                           = 0x1
+	F_NOTIFY                         = 0x402
+	F_OFD_GETLK                      = 0x24
+	F_OFD_SETLK                      = 0x25
+	F_OFD_SETLKW                     = 0x26
+	F_OK                             = 0x0
+	F_RDLCK                          = 0x0
+	F_SETFD                          = 0x2
+	F_SETFL                          = 0x4
+	F_SETLEASE                       = 0x400
+	F_SETLK                          = 0x6
+	F_SETLK64                        = 0x6
+	F_SETLKW                         = 0x7
+	F_SETLKW64                       = 0x7
+	F_SETOWN                         = 0x8
+	F_SETOWN_EX                      = 0xf
+	F_SETPIPE_SZ                     = 0x407
+	F_SETSIG                         = 0xa
+	F_SHLCK                          = 0x8
+	F_TEST                           = 0x3
+	F_TLOCK                          = 0x2
+	F_ULOCK                          = 0x0
+	F_UNLCK                          = 0x2
+	F_WRLCK                          = 0x1
+	HUPCL                            = 0x400
+	IBSHIFT                          = 0x10
+	ICANON                           = 0x2
+	ICMPV6_FILTER                    = 0x1
+	ICRNL                            = 0x100
+	IEXTEN                           = 0x8000
+	IFA_F_DADFAILED                  = 0x8
+	IFA_F_DEPRECATED                 = 0x20
+	IFA_F_HOMEADDRESS                = 0x10
+	IFA_F_MANAGETEMPADDR             = 0x100
+	IFA_F_MCAUTOJOIN                 = 0x400
+	IFA_F_NODAD                      = 0x2
+	IFA_F_NOPREFIXROUTE              = 0x200
+	IFA_F_OPTIMISTIC                 = 0x4
+	IFA_F_PERMANENT                  = 0x80
+	IFA_F_SECONDARY                  = 0x1
+	IFA_F_STABLE_PRIVACY             = 0x800
+	IFA_F_TEMPORARY                  = 0x1
+	IFA_F_TENTATIVE                  = 0x40
+	IFA_MAX                          = 0x8
+	IFF_ALLMULTI                     = 0x200
+	IFF_ATTACH_QUEUE                 = 0x200
+	IFF_AUTOMEDIA                    = 0x4000
+	IFF_BROADCAST                    = 0x2
+	IFF_DEBUG                        = 0x4
+	IFF_DETACH_QUEUE                 = 0x400
+	IFF_DORMANT                      = 0x20000
+	IFF_DYNAMIC                      = 0x8000
+	IFF_ECHO                         = 0x40000
+	IFF_LOOPBACK                     = 0x8
+	IFF_LOWER_UP                     = 0x10000
+	IFF_MASTER                       = 0x400
+	IFF_MULTICAST                    = 0x1000
+	IFF_MULTI_QUEUE                  = 0x100
+	IFF_NOARP                        = 0x80
+	IFF_NOFILTER                     = 0x1000
+	IFF_NOTRAILERS                   = 0x20
+	IFF_NO_PI                        = 0x1000
+	IFF_ONE_QUEUE                    = 0x2000
+	IFF_PERSIST                      = 0x800
+	IFF_POINTOPOINT                  = 0x10
+	IFF_PORTSEL                      = 0x2000
+	IFF_PROMISC                      = 0x100
+	IFF_RUNNING                      = 0x40
+	IFF_SLAVE                        = 0x800
+	IFF_TAP                          = 0x2
+	IFF_TUN                          = 0x1
+	IFF_TUN_EXCL                     = 0x8000
+	IFF_UP                           = 0x1
+	IFF_VNET_HDR                     = 0x4000
+	IFF_VOLATILE                     = 0x70c5a
+	IFNAMSIZ                         = 0x10
+	IGNBRK                           = 0x1
+	IGNCR                            = 0x80
+	IGNPAR                           = 0x4
+	IMAXBEL                          = 0x2000
+	INLCR                            = 0x40
+	INPCK                            = 0x10
+	IN_ACCESS                        = 0x1
+	IN_ALL_EVENTS                    = 0xfff
+	IN_ATTRIB                        = 0x4
+	IN_CLASSA_HOST                   = 0xffffff
+	IN_CLASSA_MAX                    = 0x80
+	IN_CLASSA_NET                    = 0xff000000
+	IN_CLASSA_NSHIFT                 = 0x18
+	IN_CLASSB_HOST                   = 0xffff
+	IN_CLASSB_MAX                    = 0x10000
+	IN_CLASSB_NET                    = 0xffff0000
+	IN_CLASSB_NSHIFT                 = 0x10
+	IN_CLASSC_HOST                   = 0xff
+	IN_CLASSC_NET                    = 0xffffff00
+	IN_CLASSC_NSHIFT                 = 0x8
+	IN_CLOEXEC                       = 0x80000
+	IN_CLOSE                         = 0x18
+	IN_CLOSE_NOWRITE                 = 0x10
+	IN_CLOSE_WRITE                   = 0x8
+	IN_CREATE                        = 0x100
+	IN_DELETE                        = 0x200
+	IN_DELETE_SELF                   = 0x400
+	IN_DONT_FOLLOW                   = 0x2000000
+	IN_EXCL_UNLINK                   = 0x4000000
+	IN_IGNORED                       = 0x8000
+	IN_ISDIR                         = 0x40000000
+	IN_LOOPBACKNET                   = 0x7f
+	IN_MASK_ADD                      = 0x20000000
+	IN_MODIFY                        = 0x2
+	IN_MOVE                          = 0xc0
+	IN_MOVED_FROM                    = 0x40
+	IN_MOVED_TO                      = 0x80
+	IN_MOVE_SELF                     = 0x800
+	IN_NONBLOCK                      = 0x800
+	IN_ONESHOT                       = 0x80000000
+	IN_ONLYDIR                       = 0x1000000
+	IN_OPEN                          = 0x20
+	IN_Q_OVERFLOW                    = 0x4000
+	IN_UNMOUNT                       = 0x2000
+	IPPROTO_AH                       = 0x33
+	IPPROTO_BEETPH                   = 0x5e
+	IPPROTO_COMP                     = 0x6c
+	IPPROTO_DCCP                     = 0x21
+	IPPROTO_DSTOPTS                  = 0x3c
+	IPPROTO_EGP                      = 0x8
+	IPPROTO_ENCAP                    = 0x62
+	IPPROTO_ESP                      = 0x32
+	IPPROTO_FRAGMENT                 = 0x2c
+	IPPROTO_GRE                      = 0x2f
+	IPPROTO_HOPOPTS                  = 0x0
+	IPPROTO_ICMP                     = 0x1
+	IPPROTO_ICMPV6                   = 0x3a
+	IPPROTO_IDP                      = 0x16
+	IPPROTO_IGMP                     = 0x2
+	IPPROTO_IP                       = 0x0
+	IPPROTO_IPIP                     = 0x4
+	IPPROTO_IPV6                     = 0x29
+	IPPROTO_MH                       = 0x87
+	IPPROTO_MPLS                     = 0x89
+	IPPROTO_MTP                      = 0x5c
+	IPPROTO_NONE                     = 0x3b
+	IPPROTO_PIM                      = 0x67
+	IPPROTO_PUP                      = 0xc
+	IPPROTO_RAW                      = 0xff
+	IPPROTO_ROUTING                  = 0x2b
+	IPPROTO_RSVP                     = 0x2e
+	IPPROTO_SCTP                     = 0x84
+	IPPROTO_TCP                      = 0x6
+	IPPROTO_TP                       = 0x1d
+	IPPROTO_UDP                      = 0x11
+	IPPROTO_UDPLITE                  = 0x88
+	IPV6_2292DSTOPTS                 = 0x4
+	IPV6_2292HOPLIMIT                = 0x8
+	IPV6_2292HOPOPTS                 = 0x3
+	IPV6_2292PKTINFO                 = 0x2
+	IPV6_2292PKTOPTIONS              = 0x6
+	IPV6_2292RTHDR                   = 0x5
+	IPV6_ADDRFORM                    = 0x1
+	IPV6_ADD_MEMBERSHIP              = 0x14
+	IPV6_AUTHHDR                     = 0xa
+	IPV6_CHECKSUM                    = 0x7
+	IPV6_DONTFRAG                    = 0x3e
+	IPV6_DROP_MEMBERSHIP             = 0x15
+	IPV6_DSTOPTS                     = 0x3b
+	IPV6_HOPLIMIT                    = 0x34
+	IPV6_HOPOPTS                     = 0x36
+	IPV6_IPSEC_POLICY                = 0x22
+	IPV6_JOIN_ANYCAST                = 0x1b
+	IPV6_JOIN_GROUP                  = 0x14
+	IPV6_LEAVE_ANYCAST               = 0x1c
+	IPV6_LEAVE_GROUP                 = 0x15
+	IPV6_MTU                         = 0x18
+	IPV6_MTU_DISCOVER                = 0x17
+	IPV6_MULTICAST_HOPS              = 0x12
+	IPV6_MULTICAST_IF                = 0x11
+	IPV6_MULTICAST_LOOP              = 0x13
+	IPV6_NEXTHOP                     = 0x9
+	IPV6_PATHMTU                     = 0x3d
+	IPV6_PKTINFO                     = 0x32
+	IPV6_PMTUDISC_DO                 = 0x2
+	IPV6_PMTUDISC_DONT               = 0x0
+	IPV6_PMTUDISC_INTERFACE          = 0x4
+	IPV6_PMTUDISC_OMIT               = 0x5
+	IPV6_PMTUDISC_PROBE              = 0x3
+	IPV6_PMTUDISC_WANT               = 0x1
+	IPV6_RECVDSTOPTS                 = 0x3a
+	IPV6_RECVERR                     = 0x19
+	IPV6_RECVHOPLIMIT                = 0x33
+	IPV6_RECVHOPOPTS                 = 0x35
+	IPV6_RECVPATHMTU                 = 0x3c
+	IPV6_RECVPKTINFO                 = 0x31
+	IPV6_RECVRTHDR                   = 0x38
+	IPV6_RECVTCLASS                  = 0x42
+	IPV6_ROUTER_ALERT                = 0x16
+	IPV6_RTHDR                       = 0x39
+	IPV6_RTHDRDSTOPTS                = 0x37
+	IPV6_RTHDR_LOOSE                 = 0x0
+	IPV6_RTHDR_STRICT                = 0x1
+	IPV6_RTHDR_TYPE_0                = 0x0
+	IPV6_RXDSTOPTS                   = 0x3b
+	IPV6_RXHOPOPTS                   = 0x36
+	IPV6_TCLASS                      = 0x43
+	IPV6_UNICAST_HOPS                = 0x10
+	IPV6_V6ONLY                      = 0x1a
+	IPV6_XFRM_POLICY                 = 0x23
+	IP_ADD_MEMBERSHIP                = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
+	IP_BIND_ADDRESS_NO_PORT          = 0x18
+	IP_BLOCK_SOURCE                  = 0x26
+	IP_CHECKSUM                      = 0x17
+	IP_DEFAULT_MULTICAST_LOOP        = 0x1
+	IP_DEFAULT_MULTICAST_TTL         = 0x1
+	IP_DF                            = 0x4000
+	IP_DROP_MEMBERSHIP               = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
+	IP_FREEBIND                      = 0xf
+	IP_HDRINCL                       = 0x3
+	IP_IPSEC_POLICY                  = 0x10
+	IP_MAXPACKET                     = 0xffff
+	IP_MAX_MEMBERSHIPS               = 0x14
+	IP_MF                            = 0x2000
+	IP_MINTTL                        = 0x15
+	IP_MSFILTER                      = 0x29
+	IP_MSS                           = 0x240
+	IP_MTU                           = 0xe
+	IP_MTU_DISCOVER                  = 0xa
+	IP_MULTICAST_ALL                 = 0x31
+	IP_MULTICAST_IF                  = 0x20
+	IP_MULTICAST_LOOP                = 0x22
+	IP_MULTICAST_TTL                 = 0x21
+	IP_NODEFRAG                      = 0x16
+	IP_OFFMASK                       = 0x1fff
+	IP_OPTIONS                       = 0x4
+	IP_ORIGDSTADDR                   = 0x14
+	IP_PASSSEC                       = 0x12
+	IP_PKTINFO                       = 0x8
+	IP_PKTOPTIONS                    = 0x9
+	IP_PMTUDISC                      = 0xa
+	IP_PMTUDISC_DO                   = 0x2
+	IP_PMTUDISC_DONT                 = 0x0
+	IP_PMTUDISC_INTERFACE            = 0x4
+	IP_PMTUDISC_OMIT                 = 0x5
+	IP_PMTUDISC_PROBE                = 0x3
+	IP_PMTUDISC_WANT                 = 0x1
+	IP_RECVERR                       = 0xb
+	IP_RECVOPTS                      = 0x6
+	IP_RECVORIGDSTADDR               = 0x14
+	IP_RECVRETOPTS                   = 0x7
+	IP_RECVTOS                       = 0xd
+	IP_RECVTTL                       = 0xc
+	IP_RETOPTS                       = 0x7
+	IP_RF                            = 0x8000
+	IP_ROUTER_ALERT                  = 0x5
+	IP_TOS                           = 0x1
+	IP_TRANSPARENT                   = 0x13
+	IP_TTL                           = 0x2
+	IP_UNBLOCK_SOURCE                = 0x25
+	IP_UNICAST_IF                    = 0x32
+	IP_XFRM_POLICY                   = 0x11
+	ISIG                             = 0x1
+	ISTRIP                           = 0x20
+	IUCLC                            = 0x200
+	IUTF8                            = 0x4000
+	IXANY                            = 0x800
+	IXOFF                            = 0x1000
+	IXON                             = 0x400
+	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
+	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART         = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
+	LINUX_REBOOT_MAGIC1              = 0xfee1dead
+	LINUX_REBOOT_MAGIC2              = 0x28121969
+	LOCK_EX                          = 0x2
+	LOCK_NB                          = 0x4
+	LOCK_SH                          = 0x1
+	LOCK_UN                          = 0x8
+	MADV_DODUMP                      = 0x11
+	MADV_DOFORK                      = 0xb
+	MADV_DONTDUMP                    = 0x10
+	MADV_DONTFORK                    = 0xa
+	MADV_DONTNEED                    = 0x4
+	MADV_HUGEPAGE                    = 0xe
+	MADV_HWPOISON                    = 0x64
+	MADV_MERGEABLE                   = 0xc
+	MADV_NOHUGEPAGE                  = 0xf
+	MADV_NORMAL                      = 0x0
+	MADV_RANDOM                      = 0x1
+	MADV_REMOVE                      = 0x9
+	MADV_SEQUENTIAL                  = 0x2
+	MADV_UNMERGEABLE                 = 0xd
+	MADV_WILLNEED                    = 0x3
+	MAP_ANON                         = 0x20
+	MAP_ANONYMOUS                    = 0x20
+	MAP_DENYWRITE                    = 0x800
+	MAP_EXECUTABLE                   = 0x1000
+	MAP_FILE                         = 0x0
+	MAP_FIXED                        = 0x10
+	MAP_GROWSDOWN                    = 0x100
+	MAP_HUGETLB                      = 0x40000
+	MAP_HUGE_MASK                    = 0x3f
+	MAP_HUGE_SHIFT                   = 0x1a
+	MAP_LOCKED                       = 0x2000
+	MAP_NONBLOCK                     = 0x10000
+	MAP_NORESERVE                    = 0x4000
+	MAP_POPULATE                     = 0x8000
+	MAP_PRIVATE                      = 0x2
+	MAP_SHARED                       = 0x1
+	MAP_STACK                        = 0x20000
+	MAP_TYPE                         = 0xf
+	MCL_CURRENT                      = 0x1
+	MCL_FUTURE                       = 0x2
+	MCL_ONFAULT                      = 0x4
+	MNT_DETACH                       = 0x2
+	MNT_EXPIRE                       = 0x4
+	MNT_FORCE                        = 0x1
+	MSG_CMSG_CLOEXEC                 = 0x40000000
+	MSG_CONFIRM                      = 0x800
+	MSG_CTRUNC                       = 0x8
+	MSG_DONTROUTE                    = 0x4
+	MSG_DONTWAIT                     = 0x40
+	MSG_EOR                          = 0x80
+	MSG_ERRQUEUE                     = 0x2000
+	MSG_FASTOPEN                     = 0x20000000
+	MSG_FIN                          = 0x200
+	MSG_MORE                         = 0x8000
+	MSG_NOSIGNAL                     = 0x4000
+	MSG_OOB                          = 0x1
+	MSG_PEEK                         = 0x2
+	MSG_PROXY                        = 0x10
+	MSG_RST                          = 0x1000
+	MSG_SYN                          = 0x400
+	MSG_TRUNC                        = 0x20
+	MSG_TRYHARD                      = 0x4
+	MSG_WAITALL                      = 0x100
+	MSG_WAITFORONE                   = 0x10000
+	MS_ACTIVE                        = 0x40000000
+	MS_ASYNC                         = 0x1
+	MS_BIND                          = 0x1000
+	MS_DIRSYNC                       = 0x80
+	MS_INVALIDATE                    = 0x2
+	MS_I_VERSION                     = 0x800000
+	MS_KERNMOUNT                     = 0x400000
+	MS_LAZYTIME                      = 0x2000000
+	MS_MANDLOCK                      = 0x40
+	MS_MGC_MSK                       = 0xffff0000
+	MS_MGC_VAL                       = 0xc0ed0000
+	MS_MOVE                          = 0x2000
+	MS_NOATIME                       = 0x400
+	MS_NODEV                         = 0x4
+	MS_NODIRATIME                    = 0x800
+	MS_NOEXEC                        = 0x8
+	MS_NOSUID                        = 0x2
+	MS_NOUSER                        = -0x80000000
+	MS_POSIXACL                      = 0x10000
+	MS_PRIVATE                       = 0x40000
+	MS_RDONLY                        = 0x1
+	MS_REC                           = 0x4000
+	MS_RELATIME                      = 0x200000
+	MS_REMOUNT                       = 0x20
+	MS_RMT_MASK                      = 0x2800051
+	MS_SHARED                        = 0x100000
+	MS_SILENT                        = 0x8000
+	MS_SLAVE                         = 0x80000
+	MS_STRICTATIME                   = 0x1000000
+	MS_SYNC                          = 0x4
+	MS_SYNCHRONOUS                   = 0x10
+	MS_UNBINDABLE                    = 0x20000
+	NAME_MAX                         = 0xff
+	NETLINK_ADD_MEMBERSHIP           = 0x1
+	NETLINK_AUDIT                    = 0x9
+	NETLINK_BROADCAST_ERROR          = 0x4
+	NETLINK_CAP_ACK                  = 0xa
+	NETLINK_CONNECTOR                = 0xb
+	NETLINK_CRYPTO                   = 0x15
+	NETLINK_DNRTMSG                  = 0xe
+	NETLINK_DROP_MEMBERSHIP          = 0x2
+	NETLINK_ECRYPTFS                 = 0x13
+	NETLINK_FIB_LOOKUP               = 0xa
+	NETLINK_FIREWALL                 = 0x3
+	NETLINK_GENERIC                  = 0x10
+	NETLINK_INET_DIAG                = 0x4
+	NETLINK_IP6_FW                   = 0xd
+	NETLINK_ISCSI                    = 0x8
+	NETLINK_KOBJECT_UEVENT           = 0xf
+	NETLINK_LISTEN_ALL_NSID          = 0x8
+	NETLINK_LIST_MEMBERSHIPS         = 0x9
+	NETLINK_NETFILTER                = 0xc
+	NETLINK_NFLOG                    = 0x5
+	NETLINK_NO_ENOBUFS               = 0x5
+	NETLINK_PKTINFO                  = 0x3
+	NETLINK_RDMA                     = 0x14
+	NETLINK_ROUTE                    = 0x0
+	NETLINK_RX_RING                  = 0x6
+	NETLINK_SCSITRANSPORT            = 0x12
+	NETLINK_SELINUX                  = 0x7
+	NETLINK_SOCK_DIAG                = 0x4
+	NETLINK_TX_RING                  = 0x7
+	NETLINK_UNUSED                   = 0x1
+	NETLINK_USERSOCK                 = 0x2
+	NETLINK_XFRM                     = 0x6
+	NL0                              = 0x0
+	NL1                              = 0x100
+	NLA_ALIGNTO                      = 0x4
+	NLA_F_NESTED                     = 0x8000
+	NLA_F_NET_BYTEORDER              = 0x4000
+	NLA_HDRLEN                       = 0x4
+	NLDLY                            = 0x100
+	NLMSG_ALIGNTO                    = 0x4
+	NLMSG_DONE                       = 0x3
+	NLMSG_ERROR                      = 0x2
+	NLMSG_HDRLEN                     = 0x10
+	NLMSG_MIN_TYPE                   = 0x10
+	NLMSG_NOOP                       = 0x1
+	NLMSG_OVERRUN                    = 0x4
+	NLM_F_ACK                        = 0x4
+	NLM_F_APPEND                     = 0x800
+	NLM_F_ATOMIC                     = 0x400
+	NLM_F_CREATE                     = 0x400
+	NLM_F_DUMP                       = 0x300
+	NLM_F_DUMP_FILTERED              = 0x20
+	NLM_F_DUMP_INTR                  = 0x10
+	NLM_F_ECHO                       = 0x8
+	NLM_F_EXCL                       = 0x200
+	NLM_F_MATCH                      = 0x200
+	NLM_F_MULTI                      = 0x2
+	NLM_F_REPLACE                    = 0x100
+	NLM_F_REQUEST                    = 0x1
+	NLM_F_ROOT                       = 0x100
+	NOFLSH                           = 0x80
+	OCRNL                            = 0x8
+	OFDEL                            = 0x80
+	OFILL                            = 0x40
+	OLCUC                            = 0x2
+	ONLCR                            = 0x4
+	ONLRET                           = 0x20
+	ONOCR                            = 0x10
+	OPOST                            = 0x1
+	O_ACCMODE                        = 0x3
+	O_APPEND                         = 0x400
+	O_ASYNC                          = 0x2000
+	O_CLOEXEC                        = 0x80000
+	O_CREAT                          = 0x40
+	O_DIRECT                         = 0x4000
+	O_DIRECTORY                      = 0x10000
+	O_DSYNC                          = 0x1000
+	O_EXCL                           = 0x80
+	O_FSYNC                          = 0x101000
+	O_LARGEFILE                      = 0x0
+	O_NDELAY                         = 0x800
+	O_NOATIME                        = 0x40000
+	O_NOCTTY                         = 0x100
+	O_NOFOLLOW                       = 0x20000
+	O_NONBLOCK                       = 0x800
+	O_PATH                           = 0x200000
+	O_RDONLY                         = 0x0
+	O_RDWR                           = 0x2
+	O_RSYNC                          = 0x101000
+	O_SYNC                           = 0x101000
+	O_TMPFILE                        = 0x410000
+	O_TRUNC                          = 0x200
+	O_WRONLY                         = 0x1
+	PACKET_ADD_MEMBERSHIP            = 0x1
+	PACKET_AUXDATA                   = 0x8
+	PACKET_BROADCAST                 = 0x1
+	PACKET_COPY_THRESH               = 0x7
+	PACKET_DROP_MEMBERSHIP           = 0x2
+	PACKET_FANOUT                    = 0x12
+	PACKET_FANOUT_CBPF               = 0x6
+	PACKET_FANOUT_CPU                = 0x2
+	PACKET_FANOUT_DATA               = 0x16
+	PACKET_FANOUT_EBPF               = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
+	PACKET_FANOUT_HASH               = 0x0
+	PACKET_FANOUT_LB                 = 0x1
+	PACKET_FANOUT_QM                 = 0x5
+	PACKET_FANOUT_RND                = 0x4
+	PACKET_FANOUT_ROLLOVER           = 0x3
+	PACKET_FASTROUTE                 = 0x6
+	PACKET_HDRLEN                    = 0xb
+	PACKET_HOST                      = 0x0
+	PACKET_KERNEL                    = 0x7
+	PACKET_LOOPBACK                  = 0x5
+	PACKET_LOSS                      = 0xe
+	PACKET_MR_ALLMULTI               = 0x2
+	PACKET_MR_MULTICAST              = 0x0
+	PACKET_MR_PROMISC                = 0x1
+	PACKET_MR_UNICAST                = 0x3
+	PACKET_MULTICAST                 = 0x2
+	PACKET_ORIGDEV                   = 0x9
+	PACKET_OTHERHOST                 = 0x3
+	PACKET_OUTGOING                  = 0x4
+	PACKET_QDISC_BYPASS              = 0x14
+	PACKET_RECV_OUTPUT               = 0x3
+	PACKET_RESERVE                   = 0xc
+	PACKET_ROLLOVER_STATS            = 0x15
+	PACKET_RX_RING                   = 0x5
+	PACKET_STATISTICS                = 0x6
+	PACKET_TIMESTAMP                 = 0x11
+	PACKET_TX_HAS_OFF                = 0x13
+	PACKET_TX_RING                   = 0xd
+	PACKET_TX_TIMESTAMP              = 0x10
+	PACKET_USER                      = 0x6
+	PACKET_VERSION                   = 0xa
+	PACKET_VNET_HDR                  = 0xf
+	PARENB                           = 0x100
+	PARITY_CRC16_PR0                 = 0x2
+	PARITY_CRC16_PR0_CCITT           = 0x4
+	PARITY_CRC16_PR1                 = 0x3
+	PARITY_CRC16_PR1_CCITT           = 0x5
+	PARITY_CRC32_PR0_CCITT           = 0x6
+	PARITY_CRC32_PR1_CCITT           = 0x7
+	PARITY_DEFAULT                   = 0x0
+	PARITY_NONE                      = 0x1
+	PARMRK                           = 0x8
+	PARODD                           = 0x200
+	PENDIN                           = 0x4000
+	PRIO_PGRP                        = 0x1
+	PRIO_PROCESS                     = 0x0
+	PRIO_USER                        = 0x2
+	PROT_EXEC                        = 0x4
+	PROT_GROWSDOWN                   = 0x1000000
+	PROT_GROWSUP                     = 0x2000000
+	PROT_NONE                        = 0x0
+	PROT_READ                        = 0x1
+	PROT_WRITE                       = 0x2
+	PR_CAPBSET_DROP                  = 0x18
+	PR_CAPBSET_READ                  = 0x17
+	PR_CAP_AMBIENT                   = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
+	PR_CAP_AMBIENT_IS_SET            = 0x1
+	PR_CAP_AMBIENT_LOWER             = 0x3
+	PR_CAP_AMBIENT_RAISE             = 0x2
+	PR_ENDIAN_BIG                    = 0x0
+	PR_ENDIAN_LITTLE                 = 0x1
+	PR_ENDIAN_PPC_LITTLE             = 0x2
+	PR_FPEMU_NOPRINT                 = 0x1
+	PR_FPEMU_SIGFPE                  = 0x2
+	PR_FP_EXC_ASYNC                  = 0x2
+	PR_FP_EXC_DISABLED               = 0x0
+	PR_FP_EXC_DIV                    = 0x10000
+	PR_FP_EXC_INV                    = 0x100000
+	PR_FP_EXC_NONRECOV               = 0x1
+	PR_FP_EXC_OVF                    = 0x20000
+	PR_FP_EXC_PRECISE                = 0x3
+	PR_FP_EXC_RES                    = 0x80000
+	PR_FP_EXC_SW_ENABLE              = 0x80
+	PR_FP_EXC_UND                    = 0x40000
+	PR_FP_MODE_FR                    = 0x1
+	PR_FP_MODE_FRE                   = 0x2
+	PR_GET_CHILD_SUBREAPER           = 0x25
+	PR_GET_DUMPABLE                  = 0x3
+	PR_GET_ENDIAN                    = 0x13
+	PR_GET_FPEMU                     = 0x9
+	PR_GET_FPEXC                     = 0xb
+	PR_GET_FP_MODE                   = 0x2e
+	PR_GET_KEEPCAPS                  = 0x7
+	PR_GET_NAME                      = 0x10
+	PR_GET_NO_NEW_PRIVS              = 0x27
+	PR_GET_PDEATHSIG                 = 0x2
+	PR_GET_SECCOMP                   = 0x15
+	PR_GET_SECUREBITS                = 0x1b
+	PR_GET_THP_DISABLE               = 0x2a
+	PR_GET_TID_ADDRESS               = 0x28
+	PR_GET_TIMERSLACK                = 0x1e
+	PR_GET_TIMING                    = 0xd
+	PR_GET_TSC                       = 0x19
+	PR_GET_UNALIGN                   = 0x5
+	PR_MCE_KILL                      = 0x21
+	PR_MCE_KILL_CLEAR                = 0x0
+	PR_MCE_KILL_DEFAULT              = 0x2
+	PR_MCE_KILL_EARLY                = 0x1
+	PR_MCE_KILL_GET                  = 0x22
+	PR_MCE_KILL_LATE                 = 0x0
+	PR_MCE_KILL_SET                  = 0x1
+	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
+	PR_SET_CHILD_SUBREAPER           = 0x24
+	PR_SET_DUMPABLE                  = 0x4
+	PR_SET_ENDIAN                    = 0x14
+	PR_SET_FPEMU                     = 0xa
+	PR_SET_FPEXC                     = 0xc
+	PR_SET_FP_MODE                   = 0x2d
+	PR_SET_KEEPCAPS                  = 0x8
+	PR_SET_MM                        = 0x23
+	PR_SET_MM_ARG_END                = 0x9
+	PR_SET_MM_ARG_START              = 0x8
+	PR_SET_MM_AUXV                   = 0xc
+	PR_SET_MM_BRK                    = 0x7
+	PR_SET_MM_END_CODE               = 0x2
+	PR_SET_MM_END_DATA               = 0x4
+	PR_SET_MM_ENV_END                = 0xb
+	PR_SET_MM_ENV_START              = 0xa
+	PR_SET_MM_EXE_FILE               = 0xd
+	PR_SET_MM_MAP                    = 0xe
+	PR_SET_MM_MAP_SIZE               = 0xf
+	PR_SET_MM_START_BRK              = 0x6
+	PR_SET_MM_START_CODE             = 0x1
+	PR_SET_MM_START_DATA             = 0x3
+	PR_SET_MM_START_STACK            = 0x5
+	PR_SET_NAME                      = 0xf
+	PR_SET_NO_NEW_PRIVS              = 0x26
+	PR_SET_PDEATHSIG                 = 0x1
+	PR_SET_PTRACER                   = 0x59616d61
+	PR_SET_PTRACER_ANY               = -0x1
+	PR_SET_SECCOMP                   = 0x16
+	PR_SET_SECUREBITS                = 0x1c
+	PR_SET_THP_DISABLE               = 0x29
+	PR_SET_TIMERSLACK                = 0x1d
+	PR_SET_TIMING                    = 0xe
+	PR_SET_TSC                       = 0x1a
+	PR_SET_UNALIGN                   = 0x6
+	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
+	PR_TIMING_STATISTICAL            = 0x0
+	PR_TIMING_TIMESTAMP              = 0x1
+	PR_TSC_ENABLE                    = 0x1
+	PR_TSC_SIGSEGV                   = 0x2
+	PR_UNALIGN_NOPRINT               = 0x1
+	PR_UNALIGN_SIGBUS                = 0x2
+	PTRACE_ATTACH                    = 0x10
+	PTRACE_CONT                      = 0x7
+	PTRACE_DETACH                    = 0x11
+	PTRACE_DISABLE_TE                = 0x5010
+	PTRACE_ENABLE_TE                 = 0x5009
+	PTRACE_EVENT_CLONE               = 0x3
+	PTRACE_EVENT_EXEC                = 0x4
+	PTRACE_EVENT_EXIT                = 0x6
+	PTRACE_EVENT_FORK                = 0x1
+	PTRACE_EVENT_SECCOMP             = 0x7
+	PTRACE_EVENT_STOP                = 0x80
+	PTRACE_EVENT_VFORK               = 0x2
+	PTRACE_EVENT_VFORK_DONE          = 0x5
+	PTRACE_GETEVENTMSG               = 0x4201
+	PTRACE_GETREGS                   = 0xc
+	PTRACE_GETREGSET                 = 0x4204
+	PTRACE_GETSIGINFO                = 0x4202
+	PTRACE_GETSIGMASK                = 0x420a
+	PTRACE_GET_LAST_BREAK            = 0x5006
+	PTRACE_INTERRUPT                 = 0x4207
+	PTRACE_KILL                      = 0x8
+	PTRACE_LISTEN                    = 0x4208
+	PTRACE_OLDSETOPTIONS             = 0x15
+	PTRACE_O_EXITKILL                = 0x100000
+	PTRACE_O_MASK                    = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
+	PTRACE_O_TRACECLONE              = 0x8
+	PTRACE_O_TRACEEXEC               = 0x10
+	PTRACE_O_TRACEEXIT               = 0x40
+	PTRACE_O_TRACEFORK               = 0x2
+	PTRACE_O_TRACESECCOMP            = 0x80
+	PTRACE_O_TRACESYSGOOD            = 0x1
+	PTRACE_O_TRACEVFORK              = 0x4
+	PTRACE_O_TRACEVFORKDONE          = 0x20
+	PTRACE_PEEKDATA                  = 0x2
+	PTRACE_PEEKDATA_AREA             = 0x5003
+	PTRACE_PEEKSIGINFO               = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED        = 0x1
+	PTRACE_PEEKTEXT                  = 0x1
+	PTRACE_PEEKTEXT_AREA             = 0x5002
+	PTRACE_PEEKUSR                   = 0x3
+	PTRACE_PEEKUSR_AREA              = 0x5000
+	PTRACE_PEEK_SYSTEM_CALL          = 0x5007
+	PTRACE_POKEDATA                  = 0x5
+	PTRACE_POKEDATA_AREA             = 0x5005
+	PTRACE_POKETEXT                  = 0x4
+	PTRACE_POKETEXT_AREA             = 0x5004
+	PTRACE_POKEUSR                   = 0x6
+	PTRACE_POKEUSR_AREA              = 0x5001
+	PTRACE_POKE_SYSTEM_CALL          = 0x5008
+	PTRACE_PROT                      = 0x15
+	PTRACE_SECCOMP_GET_FILTER        = 0x420c
+	PTRACE_SEIZE                     = 0x4206
+	PTRACE_SETOPTIONS                = 0x4200
+	PTRACE_SETREGS                   = 0xd
+	PTRACE_SETREGSET                 = 0x4205
+	PTRACE_SETSIGINFO                = 0x4203
+	PTRACE_SETSIGMASK                = 0x420b
+	PTRACE_SINGLEBLOCK               = 0xc
+	PTRACE_SINGLESTEP                = 0x9
+	PTRACE_SYSCALL                   = 0x18
+	PTRACE_TE_ABORT_RAND             = 0x5011
+	PTRACE_TRACEME                   = 0x0
+	PT_ACR0                          = 0x90
+	PT_ACR1                          = 0x94
+	PT_ACR10                         = 0xb8
+	PT_ACR11                         = 0xbc
+	PT_ACR12                         = 0xc0
+	PT_ACR13                         = 0xc4
+	PT_ACR14                         = 0xc8
+	PT_ACR15                         = 0xcc
+	PT_ACR2                          = 0x98
+	PT_ACR3                          = 0x9c
+	PT_ACR4                          = 0xa0
+	PT_ACR5                          = 0xa4
+	PT_ACR6                          = 0xa8
+	PT_ACR7                          = 0xac
+	PT_ACR8                          = 0xb0
+	PT_ACR9                          = 0xb4
+	PT_CR_10                         = 0x168
+	PT_CR_11                         = 0x170
+	PT_CR_9                          = 0x160
+	PT_ENDREGS                       = 0x1af
+	PT_FPC                           = 0xd8
+	PT_FPR0                          = 0xe0
+	PT_FPR1                          = 0xe8
+	PT_FPR10                         = 0x130
+	PT_FPR11                         = 0x138
+	PT_FPR12                         = 0x140
+	PT_FPR13                         = 0x148
+	PT_FPR14                         = 0x150
+	PT_FPR15                         = 0x158
+	PT_FPR2                          = 0xf0
+	PT_FPR3                          = 0xf8
+	PT_FPR4                          = 0x100
+	PT_FPR5                          = 0x108
+	PT_FPR6                          = 0x110
+	PT_FPR7                          = 0x118
+	PT_FPR8                          = 0x120
+	PT_FPR9                          = 0x128
+	PT_GPR0                          = 0x10
+	PT_GPR1                          = 0x18
+	PT_GPR10                         = 0x60
+	PT_GPR11                         = 0x68
+	PT_GPR12                         = 0x70
+	PT_GPR13                         = 0x78
+	PT_GPR14                         = 0x80
+	PT_GPR15                         = 0x88
+	PT_GPR2                          = 0x20
+	PT_GPR3                          = 0x28
+	PT_GPR4                          = 0x30
+	PT_GPR5                          = 0x38
+	PT_GPR6                          = 0x40
+	PT_GPR7                          = 0x48
+	PT_GPR8                          = 0x50
+	PT_GPR9                          = 0x58
+	PT_IEEE_IP                       = 0x1a8
+	PT_LASTOFF                       = 0x1a8
+	PT_ORIGGPR2                      = 0xd0
+	PT_PSWADDR                       = 0x8
+	PT_PSWMASK                       = 0x0
+	RLIMIT_AS                        = 0x9
+	RLIMIT_CORE                      = 0x4
+	RLIMIT_CPU                       = 0x0
+	RLIMIT_DATA                      = 0x2
+	RLIMIT_FSIZE                     = 0x1
+	RLIMIT_NOFILE                    = 0x7
+	RLIMIT_STACK                     = 0x3
+	RLIM_INFINITY                    = -0x1
+	RTAX_ADVMSS                      = 0x8
+	RTAX_CC_ALGO                     = 0x10
+	RTAX_CWND                        = 0x7
+	RTAX_FEATURES                    = 0xc
+	RTAX_FEATURE_ALLFRAG             = 0x8
+	RTAX_FEATURE_ECN                 = 0x1
+	RTAX_FEATURE_MASK                = 0xf
+	RTAX_FEATURE_SACK                = 0x2
+	RTAX_FEATURE_TIMESTAMP           = 0x4
+	RTAX_HOPLIMIT                    = 0xa
+	RTAX_INITCWND                    = 0xb
+	RTAX_INITRWND                    = 0xe
+	RTAX_LOCK                        = 0x1
+	RTAX_MAX                         = 0x10
+	RTAX_MTU                         = 0x2
+	RTAX_QUICKACK                    = 0xf
+	RTAX_REORDERING                  = 0x9
+	RTAX_RTO_MIN                     = 0xd
+	RTAX_RTT                         = 0x4
+	RTAX_RTTVAR                      = 0x5
+	RTAX_SSTHRESH                    = 0x6
+	RTAX_UNSPEC                      = 0x0
+	RTAX_WINDOW                      = 0x3
+	RTA_ALIGNTO                      = 0x4
+	RTA_MAX                          = 0x16
+	RTCF_DIRECTSRC                   = 0x4000000
+	RTCF_DOREDIRECT                  = 0x1000000
+	RTCF_LOG                         = 0x2000000
+	RTCF_MASQ                        = 0x400000
+	RTCF_NAT                         = 0x800000
+	RTCF_VALVE                       = 0x200000
+	RTF_ADDRCLASSMASK                = 0xf8000000
+	RTF_ADDRCONF                     = 0x40000
+	RTF_ALLONLINK                    = 0x20000
+	RTF_BROADCAST                    = 0x10000000
+	RTF_CACHE                        = 0x1000000
+	RTF_DEFAULT                      = 0x10000
+	RTF_DYNAMIC                      = 0x10
+	RTF_FLOW                         = 0x2000000
+	RTF_GATEWAY                      = 0x2
+	RTF_HOST                         = 0x4
+	RTF_INTERFACE                    = 0x40000000
+	RTF_IRTT                         = 0x100
+	RTF_LINKRT                       = 0x100000
+	RTF_LOCAL                        = 0x80000000
+	RTF_MODIFIED                     = 0x20
+	RTF_MSS                          = 0x40
+	RTF_MTU                          = 0x40
+	RTF_MULTICAST                    = 0x20000000
+	RTF_NAT                          = 0x8000000
+	RTF_NOFORWARD                    = 0x1000
+	RTF_NONEXTHOP                    = 0x200000
+	RTF_NOPMTUDISC                   = 0x4000
+	RTF_POLICY                       = 0x4000000
+	RTF_REINSTATE                    = 0x8
+	RTF_REJECT                       = 0x200
+	RTF_STATIC                       = 0x400
+	RTF_THROW                        = 0x2000
+	RTF_UP                           = 0x1
+	RTF_WINDOW                       = 0x80
+	RTF_XRESOLVE                     = 0x800
+	RTM_BASE                         = 0x10
+	RTM_DELACTION                    = 0x31
+	RTM_DELADDR                      = 0x15
+	RTM_DELADDRLABEL                 = 0x49
+	RTM_DELLINK                      = 0x11
+	RTM_DELMDB                       = 0x55
+	RTM_DELNEIGH                     = 0x1d
+	RTM_DELNSID                      = 0x59
+	RTM_DELQDISC                     = 0x25
+	RTM_DELROUTE                     = 0x19
+	RTM_DELRULE                      = 0x21
+	RTM_DELTCLASS                    = 0x29
+	RTM_DELTFILTER                   = 0x2d
+	RTM_F_CLONED                     = 0x200
+	RTM_F_EQUALIZE                   = 0x400
+	RTM_F_LOOKUP_TABLE               = 0x1000
+	RTM_F_NOTIFY                     = 0x100
+	RTM_F_PREFIX                     = 0x800
+	RTM_GETACTION                    = 0x32
+	RTM_GETADDR                      = 0x16
+	RTM_GETADDRLABEL                 = 0x4a
+	RTM_GETANYCAST                   = 0x3e
+	RTM_GETDCB                       = 0x4e
+	RTM_GETLINK                      = 0x12
+	RTM_GETMDB                       = 0x56
+	RTM_GETMULTICAST                 = 0x3a
+	RTM_GETNEIGH                     = 0x1e
+	RTM_GETNEIGHTBL                  = 0x42
+	RTM_GETNETCONF                   = 0x52
+	RTM_GETNSID                      = 0x5a
+	RTM_GETQDISC                     = 0x26
+	RTM_GETROUTE                     = 0x1a
+	RTM_GETRULE                      = 0x22
+	RTM_GETTCLASS                    = 0x2a
+	RTM_GETTFILTER                   = 0x2e
+	RTM_MAX                          = 0x5b
+	RTM_NEWACTION                    = 0x30
+	RTM_NEWADDR                      = 0x14
+	RTM_NEWADDRLABEL                 = 0x48
+	RTM_NEWLINK                      = 0x10
+	RTM_NEWMDB                       = 0x54
+	RTM_NEWNDUSEROPT                 = 0x44
+	RTM_NEWNEIGH                     = 0x1c
+	RTM_NEWNEIGHTBL                  = 0x40
+	RTM_NEWNETCONF                   = 0x50
+	RTM_NEWNSID                      = 0x58
+	RTM_NEWPREFIX                    = 0x34
+	RTM_NEWQDISC                     = 0x24
+	RTM_NEWROUTE                     = 0x18
+	RTM_NEWRULE                      = 0x20
+	RTM_NEWTCLASS                    = 0x28
+	RTM_NEWTFILTER                   = 0x2c
+	RTM_NR_FAMILIES                  = 0x13
+	RTM_NR_MSGTYPES                  = 0x4c
+	RTM_SETDCB                       = 0x4f
+	RTM_SETLINK                      = 0x13
+	RTM_SETNEIGHTBL                  = 0x43
+	RTNH_ALIGNTO                     = 0x4
+	RTNH_COMPARE_MASK                = 0x11
+	RTNH_F_DEAD                      = 0x1
+	RTNH_F_LINKDOWN                  = 0x10
+	RTNH_F_OFFLOAD                   = 0x8
+	RTNH_F_ONLINK                    = 0x4
+	RTNH_F_PERVASIVE                 = 0x2
+	RTN_MAX                          = 0xb
+	RTPROT_BABEL                     = 0x2a
+	RTPROT_BIRD                      = 0xc
+	RTPROT_BOOT                      = 0x3
+	RTPROT_DHCP                      = 0x10
+	RTPROT_DNROUTED                  = 0xd
+	RTPROT_GATED                     = 0x8
+	RTPROT_KERNEL                    = 0x2
+	RTPROT_MROUTED                   = 0x11
+	RTPROT_MRT                       = 0xa
+	RTPROT_NTK                       = 0xf
+	RTPROT_RA                        = 0x9
+	RTPROT_REDIRECT                  = 0x1
+	RTPROT_STATIC                    = 0x4
+	RTPROT_UNSPEC                    = 0x0
+	RTPROT_XORP                      = 0xe
+	RTPROT_ZEBRA                     = 0xb
+	RT_CLASS_DEFAULT                 = 0xfd
+	RT_CLASS_LOCAL                   = 0xff
+	RT_CLASS_MAIN                    = 0xfe
+	RT_CLASS_MAX                     = 0xff
+	RT_CLASS_UNSPEC                  = 0x0
+	RUSAGE_CHILDREN                  = -0x1
+	RUSAGE_SELF                      = 0x0
+	RUSAGE_THREAD                    = 0x1
+	SCM_CREDENTIALS                  = 0x2
+	SCM_RIGHTS                       = 0x1
+	SCM_TIMESTAMP                    = 0x1d
+	SCM_TIMESTAMPING                 = 0x25
+	SCM_TIMESTAMPNS                  = 0x23
+	SCM_WIFI_STATUS                  = 0x29
+	SHUT_RD                          = 0x0
+	SHUT_RDWR                        = 0x2
+	SHUT_WR                          = 0x1
+	SIOCADDDLCI                      = 0x8980
+	SIOCADDMULTI                     = 0x8931
+	SIOCADDRT                        = 0x890b
+	SIOCATMARK                       = 0x8905
+	SIOCDARP                         = 0x8953
+	SIOCDELDLCI                      = 0x8981
+	SIOCDELMULTI                     = 0x8932
+	SIOCDELRT                        = 0x890c
+	SIOCDEVPRIVATE                   = 0x89f0
+	SIOCDIFADDR                      = 0x8936
+	SIOCDRARP                        = 0x8960
+	SIOCGARP                         = 0x8954
+	SIOCGIFADDR                      = 0x8915
+	SIOCGIFBR                        = 0x8940
+	SIOCGIFBRDADDR                   = 0x8919
+	SIOCGIFCONF                      = 0x8912
+	SIOCGIFCOUNT                     = 0x8938
+	SIOCGIFDSTADDR                   = 0x8917
+	SIOCGIFENCAP                     = 0x8925
+	SIOCGIFFLAGS                     = 0x8913
+	SIOCGIFHWADDR                    = 0x8927
+	SIOCGIFINDEX                     = 0x8933
+	SIOCGIFMAP                       = 0x8970
+	SIOCGIFMEM                       = 0x891f
+	SIOCGIFMETRIC                    = 0x891d
+	SIOCGIFMTU                       = 0x8921
+	SIOCGIFNAME                      = 0x8910
+	SIOCGIFNETMASK                   = 0x891b
+	SIOCGIFPFLAGS                    = 0x8935
+	SIOCGIFSLAVE                     = 0x8929
+	SIOCGIFTXQLEN                    = 0x8942
+	SIOCGPGRP                        = 0x8904
+	SIOCGRARP                        = 0x8961
+	SIOCGSTAMP                       = 0x8906
+	SIOCGSTAMPNS                     = 0x8907
+	SIOCPROTOPRIVATE                 = 0x89e0
+	SIOCRTMSG                        = 0x890d
+	SIOCSARP                         = 0x8955
+	SIOCSIFADDR                      = 0x8916
+	SIOCSIFBR                        = 0x8941
+	SIOCSIFBRDADDR                   = 0x891a
+	SIOCSIFDSTADDR                   = 0x8918
+	SIOCSIFENCAP                     = 0x8926
+	SIOCSIFFLAGS                     = 0x8914
+	SIOCSIFHWADDR                    = 0x8924
+	SIOCSIFHWBROADCAST               = 0x8937
+	SIOCSIFLINK                      = 0x8911
+	SIOCSIFMAP                       = 0x8971
+	SIOCSIFMEM                       = 0x8920
+	SIOCSIFMETRIC                    = 0x891e
+	SIOCSIFMTU                       = 0x8922
+	SIOCSIFNAME                      = 0x8923
+	SIOCSIFNETMASK                   = 0x891c
+	SIOCSIFPFLAGS                    = 0x8934
+	SIOCSIFSLAVE                     = 0x8930
+	SIOCSIFTXQLEN                    = 0x8943
+	SIOCSPGRP                        = 0x8902
+	SIOCSRARP                        = 0x8962
+	SOCK_CLOEXEC                     = 0x80000
+	SOCK_DCCP                        = 0x6
+	SOCK_DGRAM                       = 0x2
+	SOCK_NONBLOCK                    = 0x800
+	SOCK_PACKET                      = 0xa
+	SOCK_RAW                         = 0x3
+	SOCK_RDM                         = 0x4
+	SOCK_SEQPACKET                   = 0x5
+	SOCK_STREAM                      = 0x1
+	SOL_AAL                          = 0x109
+	SOL_ATM                          = 0x108
+	SOL_DECNET                       = 0x105
+	SOL_ICMPV6                       = 0x3a
+	SOL_IP                           = 0x0
+	SOL_IPV6                         = 0x29
+	SOL_IRDA                         = 0x10a
+	SOL_PACKET                       = 0x107
+	SOL_RAW                          = 0xff
+	SOL_SOCKET                       = 0x1
+	SOL_TCP                          = 0x6
+	SOL_X25                          = 0x106
+	SOMAXCONN                        = 0x80
+	SO_ACCEPTCONN                    = 0x1e
+	SO_ATTACH_BPF                    = 0x32
+	SO_ATTACH_FILTER                 = 0x1a
+	SO_BINDTODEVICE                  = 0x19
+	SO_BPF_EXTENSIONS                = 0x30
+	SO_BROADCAST                     = 0x6
+	SO_BSDCOMPAT                     = 0xe
+	SO_BUSY_POLL                     = 0x2e
+	SO_DEBUG                         = 0x1
+	SO_DETACH_BPF                    = 0x1b
+	SO_DETACH_FILTER                 = 0x1b
+	SO_DOMAIN                        = 0x27
+	SO_DONTROUTE                     = 0x5
+	SO_ERROR                         = 0x4
+	SO_GET_FILTER                    = 0x1a
+	SO_INCOMING_CPU                  = 0x31
+	SO_KEEPALIVE                     = 0x9
+	SO_LINGER                        = 0xd
+	SO_LOCK_FILTER                   = 0x2c
+	SO_MARK                          = 0x24
+	SO_MAX_PACING_RATE               = 0x2f
+	SO_NOFCS                         = 0x2b
+	SO_NO_CHECK                      = 0xb
+	SO_OOBINLINE                     = 0xa
+	SO_PASSCRED                      = 0x10
+	SO_PASSSEC                       = 0x22
+	SO_PEEK_OFF                      = 0x2a
+	SO_PEERCRED                      = 0x11
+	SO_PEERNAME                      = 0x1c
+	SO_PEERSEC                       = 0x1f
+	SO_PRIORITY                      = 0xc
+	SO_PROTOCOL                      = 0x26
+	SO_RCVBUF                        = 0x8
+	SO_RCVBUFFORCE                   = 0x21
+	SO_RCVLOWAT                      = 0x12
+	SO_RCVTIMEO                      = 0x14
+	SO_REUSEADDR                     = 0x2
+	SO_REUSEPORT                     = 0xf
+	SO_RXQ_OVFL                      = 0x28
+	SO_SECURITY_AUTHENTICATION       = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
+	SO_SELECT_ERR_QUEUE              = 0x2d
+	SO_SNDBUF                        = 0x7
+	SO_SNDBUFFORCE                   = 0x20
+	SO_SNDLOWAT                      = 0x13
+	SO_SNDTIMEO                      = 0x15
+	SO_TIMESTAMP                     = 0x1d
+	SO_TIMESTAMPING                  = 0x25
+	SO_TIMESTAMPNS                   = 0x23
+	SO_TYPE                          = 0x3
+	SO_WIFI_STATUS                   = 0x29
+	S_BLKSIZE                        = 0x200
+	S_IEXEC                          = 0x40
+	S_IFBLK                          = 0x6000
+	S_IFCHR                          = 0x2000
+	S_IFDIR                          = 0x4000
+	S_IFIFO                          = 0x1000
+	S_IFLNK                          = 0xa000
+	S_IFMT                           = 0xf000
+	S_IFREG                          = 0x8000
+	S_IFSOCK                         = 0xc000
+	S_IREAD                          = 0x100
+	S_IRGRP                          = 0x20
+	S_IROTH                          = 0x4
+	S_IRUSR                          = 0x100
+	S_IRWXG                          = 0x38
+	S_IRWXO                          = 0x7
+	S_IRWXU                          = 0x1c0
+	S_ISGID                          = 0x400
+	S_ISUID                          = 0x800
+	S_ISVTX                          = 0x200
+	S_IWGRP                          = 0x10
+	S_IWOTH                          = 0x2
+	S_IWRITE                         = 0x80
+	S_IWUSR                          = 0x80
+	S_IXGRP                          = 0x8
+	S_IXOTH                          = 0x1
+	S_IXUSR                          = 0x40
+	TAB0                             = 0x0
+	TAB1                             = 0x800
+	TAB2                             = 0x1000
+	TAB3                             = 0x1800
+	TABDLY                           = 0x1800
+	TCFLSH                           = 0x540b
+	TCGETA                           = 0x5405
+	TCGETS                           = 0x5401
+	TCGETS2                          = 0x802c542a
+	TCGETX                           = 0x5432
+	TCIFLUSH                         = 0x0
+	TCIOFF                           = 0x2
+	TCIOFLUSH                        = 0x2
+	TCION                            = 0x3
+	TCOFLUSH                         = 0x1
+	TCOOFF                           = 0x0
+	TCOON                            = 0x1
+	TCP_CC_INFO                      = 0x1a
+	TCP_CONGESTION                   = 0xd
+	TCP_COOKIE_IN_ALWAYS             = 0x1
+	TCP_COOKIE_MAX                   = 0x10
+	TCP_COOKIE_MIN                   = 0x8
+	TCP_COOKIE_OUT_NEVER             = 0x2
+	TCP_COOKIE_PAIR_SIZE             = 0x20
+	TCP_COOKIE_TRANSACTIONS          = 0xf
+	TCP_CORK                         = 0x3
+	TCP_DEFER_ACCEPT                 = 0x9
+	TCP_FASTOPEN                     = 0x17
+	TCP_INFO                         = 0xb
+	TCP_KEEPCNT                      = 0x6
+	TCP_KEEPIDLE                     = 0x4
+	TCP_KEEPINTVL                    = 0x5
+	TCP_LINGER2                      = 0x8
+	TCP_MAXSEG                       = 0x2
+	TCP_MAXWIN                       = 0xffff
+	TCP_MAX_WINSHIFT                 = 0xe
+	TCP_MD5SIG                       = 0xe
+	TCP_MD5SIG_MAXKEYLEN             = 0x50
+	TCP_MSS                          = 0x200
+	TCP_MSS_DEFAULT                  = 0x218
+	TCP_MSS_DESIRED                  = 0x4c4
+	TCP_NODELAY                      = 0x1
+	TCP_NOTSENT_LOWAT                = 0x19
+	TCP_QUEUE_SEQ                    = 0x15
+	TCP_QUICKACK                     = 0xc
+	TCP_REPAIR                       = 0x13
+	TCP_REPAIR_OPTIONS               = 0x16
+	TCP_REPAIR_QUEUE                 = 0x14
+	TCP_SAVED_SYN                    = 0x1c
+	TCP_SAVE_SYN                     = 0x1b
+	TCP_SYNCNT                       = 0x7
+	TCP_S_DATA_IN                    = 0x4
+	TCP_S_DATA_OUT                   = 0x8
+	TCP_THIN_DUPACK                  = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
+	TCP_TIMESTAMP                    = 0x18
+	TCP_USER_TIMEOUT                 = 0x12
+	TCP_WINDOW_CLAMP                 = 0xa
+	TCSAFLUSH                        = 0x2
+	TCSBRK                           = 0x5409
+	TCSBRKP                          = 0x5425
+	TCSETA                           = 0x5406
+	TCSETAF                          = 0x5408
+	TCSETAW                          = 0x5407
+	TCSETS                           = 0x5402
+	TCSETS2                          = 0x402c542b
+	TCSETSF                          = 0x5404
+	TCSETSF2                         = 0x402c542d
+	TCSETSW                          = 0x5403
+	TCSETSW2                         = 0x402c542c
+	TCSETX                           = 0x5433
+	TCSETXF                          = 0x5434
+	TCSETXW                          = 0x5435
+	TCXONC                           = 0x540a
+	TIOCCBRK                         = 0x5428
+	TIOCCONS                         = 0x541d
+	TIOCEXCL                         = 0x540c
+	TIOCGDEV                         = 0x80045432
+	TIOCGETD                         = 0x5424
+	TIOCGEXCL                        = 0x80045440
+	TIOCGICOUNT                      = 0x545d
+	TIOCGLCKTRMIOS                   = 0x5456
+	TIOCGPGRP                        = 0x540f
+	TIOCGPKT                         = 0x80045438
+	TIOCGPTLCK                       = 0x80045439
+	TIOCGPTN                         = 0x80045430
+	TIOCGRS485                       = 0x542e
+	TIOCGSERIAL                      = 0x541e
+	TIOCGSID                         = 0x5429
+	TIOCGSOFTCAR                     = 0x5419
+	TIOCGWINSZ                       = 0x5413
+	TIOCINQ                          = 0x541b
+	TIOCLINUX                        = 0x541c
+	TIOCMBIC                         = 0x5417
+	TIOCMBIS                         = 0x5416
+	TIOCMGET                         = 0x5415
+	TIOCMIWAIT                       = 0x545c
+	TIOCMSET                         = 0x5418
+	TIOCM_CAR                        = 0x40
+	TIOCM_CD                         = 0x40
+	TIOCM_CTS                        = 0x20
+	TIOCM_DSR                        = 0x100
+	TIOCM_DTR                        = 0x2
+	TIOCM_LE                         = 0x1
+	TIOCM_RI                         = 0x80
+	TIOCM_RNG                        = 0x80
+	TIOCM_RTS                        = 0x4
+	TIOCM_SR                         = 0x10
+	TIOCM_ST                         = 0x8
+	TIOCNOTTY                        = 0x5422
+	TIOCNXCL                         = 0x540d
+	TIOCOUTQ                         = 0x5411
+	TIOCPKT                          = 0x5420
+	TIOCPKT_DATA                     = 0x0
+	TIOCPKT_DOSTOP                   = 0x20
+	TIOCPKT_FLUSHREAD                = 0x1
+	TIOCPKT_FLUSHWRITE               = 0x2
+	TIOCPKT_IOCTL                    = 0x40
+	TIOCPKT_NOSTOP                   = 0x10
+	TIOCPKT_START                    = 0x8
+	TIOCPKT_STOP                     = 0x4
+	TIOCSBRK                         = 0x5427
+	TIOCSCTTY                        = 0x540e
+	TIOCSERCONFIG                    = 0x5453
+	TIOCSERGETLSR                    = 0x5459
+	TIOCSERGETMULTI                  = 0x545a
+	TIOCSERGSTRUCT                   = 0x5458
+	TIOCSERGWILD                     = 0x5454
+	TIOCSERSETMULTI                  = 0x545b
+	TIOCSERSWILD                     = 0x5455
+	TIOCSER_TEMT                     = 0x1
+	TIOCSETD                         = 0x5423
+	TIOCSIG                          = 0x40045436
+	TIOCSLCKTRMIOS                   = 0x5457
+	TIOCSPGRP                        = 0x5410
+	TIOCSPTLCK                       = 0x40045431
+	TIOCSRS485                       = 0x542f
+	TIOCSSERIAL                      = 0x541f
+	TIOCSSOFTCAR                     = 0x541a
+	TIOCSTI                          = 0x5412
+	TIOCSWINSZ                       = 0x5414
+	TIOCVHANGUP                      = 0x5437
+	TOSTOP                           = 0x100
+	TUNATTACHFILTER                  = 0x401054d5
+	TUNDETACHFILTER                  = 0x401054d6
+	TUNGETFEATURES                   = 0x800454cf
+	TUNGETFILTER                     = 0x801054db
+	TUNGETIFF                        = 0x800454d2
+	TUNGETSNDBUF                     = 0x800454d3
+	TUNGETVNETBE                     = 0x800454df
+	TUNGETVNETHDRSZ                  = 0x800454d7
+	TUNGETVNETLE                     = 0x800454dd
+	TUNSETDEBUG                      = 0x400454c9
+	TUNSETGROUP                      = 0x400454ce
+	TUNSETIFF                        = 0x400454ca
+	TUNSETIFINDEX                    = 0x400454da
+	TUNSETLINK                       = 0x400454cd
+	TUNSETNOCSUM                     = 0x400454c8
+	TUNSETOFFLOAD                    = 0x400454d0
+	TUNSETOWNER                      = 0x400454cc
+	TUNSETPERSIST                    = 0x400454cb
+	TUNSETQUEUE                      = 0x400454d9
+	TUNSETSNDBUF                     = 0x400454d4
+	TUNSETTXFILTER                   = 0x400454d1
+	TUNSETVNETBE                     = 0x400454de
+	TUNSETVNETHDRSZ                  = 0x400454d8
+	TUNSETVNETLE                     = 0x400454dc
+	VDISCARD                         = 0xd
+	VEOF                             = 0x4
+	VEOL                             = 0xb
+	VEOL2                            = 0x10
+	VERASE                           = 0x2
+	VINTR                            = 0x0
+	VKILL                            = 0x3
+	VLNEXT                           = 0xf
+	VMIN                             = 0x6
+	VQUIT                            = 0x1
+	VREPRINT                         = 0xc
+	VSTART                           = 0x8
+	VSTOP                            = 0x9
+	VSUSP                            = 0xa
+	VSWTC                            = 0x7
+	VT0                              = 0x0
+	VT1                              = 0x4000
+	VTDLY                            = 0x4000
+	VTIME                            = 0x5
+	VWERASE                          = 0xe
+	WALL                             = 0x40000000
+	WCLONE                           = 0x80000000
+	WCONTINUED                       = 0x8
+	WEXITED                          = 0x4
+	WNOHANG                          = 0x1
+	WNOTHREAD                        = 0x20000000
+	WNOWAIT                          = 0x1000000
+	WORDSIZE                         = 0x40
+	WSTOPPED                         = 0x2
+	WUNTRACED                        = 0x2
+	XCASE                            = 0x4
+	XTABS                            = 0x1800
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x62)
+	EADDRNOTAVAIL   = syscall.Errno(0x63)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x61)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x72)
+	EBADE           = syscall.Errno(0x34)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x4d)
+	EBADMSG         = syscall.Errno(0x4a)
+	EBADR           = syscall.Errno(0x35)
+	EBADRQC         = syscall.Errno(0x38)
+	EBADSLT         = syscall.Errno(0x39)
+	EBFONT          = syscall.Errno(0x3b)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x7d)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x2c)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x67)
+	ECONNREFUSED    = syscall.Errno(0x6f)
+	ECONNRESET      = syscall.Errno(0x68)
+	EDEADLK         = syscall.Errno(0x23)
+	EDEADLOCK       = syscall.Errno(0x23)
+	EDESTADDRREQ    = syscall.Errno(0x59)
+	EDOM            = syscall.Errno(0x21)
+	EDOTDOT         = syscall.Errno(0x49)
+	EDQUOT          = syscall.Errno(0x7a)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x70)
+	EHOSTUNREACH    = syscall.Errno(0x71)
+	EHWPOISON       = syscall.Errno(0x85)
+	EIDRM           = syscall.Errno(0x2b)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x73)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x6a)
+	EISDIR          = syscall.Errno(0x15)
+	EISNAM          = syscall.Errno(0x78)
+	EKEYEXPIRED     = syscall.Errno(0x7f)
+	EKEYREJECTED    = syscall.Errno(0x81)
+	EKEYREVOKED     = syscall.Errno(0x80)
+	EL2HLT          = syscall.Errno(0x33)
+	EL2NSYNC        = syscall.Errno(0x2d)
+	EL3HLT          = syscall.Errno(0x2e)
+	EL3RST          = syscall.Errno(0x2f)
+	ELIBACC         = syscall.Errno(0x4f)
+	ELIBBAD         = syscall.Errno(0x50)
+	ELIBEXEC        = syscall.Errno(0x53)
+	ELIBMAX         = syscall.Errno(0x52)
+	ELIBSCN         = syscall.Errno(0x51)
+	ELNRNG          = syscall.Errno(0x30)
+	ELOOP           = syscall.Errno(0x28)
+	EMEDIUMTYPE     = syscall.Errno(0x7c)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x5a)
+	EMULTIHOP       = syscall.Errno(0x48)
+	ENAMETOOLONG    = syscall.Errno(0x24)
+	ENAVAIL         = syscall.Errno(0x77)
+	ENETDOWN        = syscall.Errno(0x64)
+	ENETRESET       = syscall.Errno(0x66)
+	ENETUNREACH     = syscall.Errno(0x65)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x37)
+	ENOBUFS         = syscall.Errno(0x69)
+	ENOCSI          = syscall.Errno(0x32)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOKEY          = syscall.Errno(0x7e)
+	ENOLCK          = syscall.Errno(0x25)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEDIUM       = syscall.Errno(0x7b)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x2a)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x5c)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x26)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x6b)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x27)
+	ENOTNAM         = syscall.Errno(0x76)
+	ENOTRECOVERABLE = syscall.Errno(0x83)
+	ENOTSOCK        = syscall.Errno(0x58)
+	ENOTSUP         = syscall.Errno(0x5f)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x4c)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x5f)
+	EOVERFLOW       = syscall.Errno(0x4b)
+	EOWNERDEAD      = syscall.Errno(0x82)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x60)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x5d)
+	EPROTOTYPE      = syscall.Errno(0x5b)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x4e)
+	EREMOTE         = syscall.Errno(0x42)
+	EREMOTEIO       = syscall.Errno(0x79)
+	ERESTART        = syscall.Errno(0x55)
+	ERFKILL         = syscall.Errno(0x84)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x6c)
+	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x74)
+	ESTRPIPE        = syscall.Errno(0x56)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x6e)
+	ETOOMANYREFS    = syscall.Errno(0x6d)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUCLEAN         = syscall.Errno(0x75)
+	EUNATCH         = syscall.Errno(0x31)
+	EUSERS          = syscall.Errno(0x57)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x36)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0x7)
+	SIGCHLD   = syscall.Signal(0x11)
+	SIGCLD    = syscall.Signal(0x11)
+	SIGCONT   = syscall.Signal(0x12)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x1d)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPOLL   = syscall.Signal(0x1d)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x1e)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTKFLT = syscall.Signal(0x10)
+	SIGSTOP   = syscall.Signal(0x13)
+	SIGSYS    = syscall.Signal(0x1f)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x14)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGUNUSED = syscall.Signal(0x1f)
+	SIGURG    = syscall.Signal(0x17)
+	SIGUSR1   = syscall.Signal(0xa)
+	SIGUSR2   = syscall.Signal(0xc)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "operation not permitted",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "input/output error",
+	6:   "no such device or address",
+	7:   "argument list too long",
+	8:   "exec format error",
+	9:   "bad file descriptor",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "cannot allocate memory",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device or resource busy",
+	17:  "file exists",
+	18:  "invalid cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "too many open files in system",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "numerical argument out of domain",
+	34:  "numerical result out of range",
+	35:  "resource deadlock avoided",
+	36:  "file name too long",
+	37:  "no locks available",
+	38:  "function not implemented",
+	39:  "directory not empty",
+	40:  "too many levels of symbolic links",
+	42:  "no message of desired type",
+	43:  "identifier removed",
+	44:  "channel number out of range",
+	45:  "level 2 not synchronized",
+	46:  "level 3 halted",
+	47:  "level 3 reset",
+	48:  "link number out of range",
+	49:  "protocol driver not attached",
+	50:  "no CSI structure available",
+	51:  "level 2 halted",
+	52:  "invalid exchange",
+	53:  "invalid request descriptor",
+	54:  "exchange full",
+	55:  "no anode",
+	56:  "invalid request code",
+	57:  "invalid slot",
+	59:  "bad font file format",
+	60:  "device not a stream",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of streams resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "multihop attempted",
+	73:  "RFS specific error",
+	74:  "bad message",
+	75:  "value too large for defined data type",
+	76:  "name not unique on network",
+	77:  "file descriptor in bad state",
+	78:  "remote address changed",
+	79:  "can not access a needed shared library",
+	80:  "accessing a corrupted shared library",
+	81:  ".lib section in a.out corrupted",
+	82:  "attempting to link in too many shared libraries",
+	83:  "cannot exec a shared library directly",
+	84:  "invalid or incomplete multibyte or wide character",
+	85:  "interrupted system call should be restarted",
+	86:  "streams pipe error",
+	87:  "too many users",
+	88:  "socket operation on non-socket",
+	89:  "destination address required",
+	90:  "message too long",
+	91:  "protocol wrong type for socket",
+	92:  "protocol not available",
+	93:  "protocol not supported",
+	94:  "socket type not supported",
+	95:  "operation not supported",
+	96:  "protocol family not supported",
+	97:  "address family not supported by protocol",
+	98:  "address already in use",
+	99:  "cannot assign requested address",
+	100: "network is down",
+	101: "network is unreachable",
+	102: "network dropped connection on reset",
+	103: "software caused connection abort",
+	104: "connection reset by peer",
+	105: "no buffer space available",
+	106: "transport endpoint is already connected",
+	107: "transport endpoint is not connected",
+	108: "cannot send after transport endpoint shutdown",
+	109: "too many references: cannot splice",
+	110: "connection timed out",
+	111: "connection refused",
+	112: "host is down",
+	113: "no route to host",
+	114: "operation already in progress",
+	115: "operation now in progress",
+	116: "stale file handle",
+	117: "structure needs cleaning",
+	118: "not a XENIX named type file",
+	119: "no XENIX semaphores available",
+	120: "is a named type file",
+	121: "remote I/O error",
+	122: "disk quota exceeded",
+	123: "no medium found",
+	124: "wrong medium type",
+	125: "operation canceled",
+	126: "required key not available",
+	127: "key has expired",
+	128: "key has been revoked",
+	129: "key was rejected by service",
+	130: "owner died",
+	131: "state not recoverable",
+	132: "operation not possible due to RF-kill",
+	133: "memory page has hardware error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "stack fault",
+	17: "child exited",
+	18: "continued",
+	19: "stopped (signal)",
+	20: "stopped",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "urgent I/O condition",
+	24: "CPU time limit exceeded",
+	25: "file size limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window changed",
+	29: "I/O possible",
+	30: "power failure",
+	31: "bad system call",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
new file mode 100644
index 0000000000..b4338d5f26
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
@@ -0,0 +1,1712 @@
+// mkerrors.sh -m32
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,netbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ARP                            = 0x1c
+	AF_BLUETOOTH                      = 0x1f
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x20
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x23
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OROUTE                         = 0x11
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x22
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ARCNET                     = 0x7
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	ARPHRD_STRIP                      = 0x17
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B460800                           = 0x70800
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B921600                           = 0xe1000
+	B9600                             = 0x2580
+	BIOCFEEDBACK                      = 0x8004427d
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0084277
+	BIOCGETIF                         = 0x4090426b
+	BIOCGFEEDBACK                     = 0x4004427c
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRTIMEOUT                     = 0x400c427b
+	BIOCGSEESENT                      = 0x40044278
+	BIOCGSTATS                        = 0x4080426f
+	BIOCGSTATSOLD                     = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044276
+	BIOCSETF                          = 0x80084267
+	BIOCSETIF                         = 0x8090426c
+	BIOCSFEEDBACK                     = 0x8004427d
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRTIMEOUT                     = 0x800c427a
+	BIOCSSEESENT                      = 0x80044279
+	BIOCSTCPF                         = 0x80084272
+	BIOCSUDPF                         = 0x80084273
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALIGNMENT32                   = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DFLTBUFSIZE                   = 0x100000
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x1000000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLONE_CSIGNAL                     = 0xff
+	CLONE_FILES                       = 0x400
+	CLONE_FS                          = 0x200
+	CLONE_PID                         = 0x1000
+	CLONE_PTRACE                      = 0x2000
+	CLONE_SIGHAND                     = 0x800
+	CLONE_VFORK                       = 0x4000
+	CLONE_VM                          = 0x100
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	CTL_QUERY                         = -0x2
+	DIOCBSFLUSH                       = 0x20006478
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HDLC                          = 0x10
+	DLT_HHDLC                         = 0x79
+	DLT_HIPPI                         = 0xf
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0xe
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RAWAF_MASK                    = 0x2240000
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xd
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMUL_LINUX                        = 0x1
+	EMUL_LINUX32                      = 0x5
+	EMUL_MAXID                        = 0x6
+	EN_SW_CTL_INF                     = 0x1000
+	EN_SW_CTL_PREC                    = 0x300
+	EN_SW_CTL_ROUND                   = 0xc00
+	EN_SW_DATACHAIN                   = 0x80
+	EN_SW_DENORM                      = 0x2
+	EN_SW_INVOP                       = 0x1
+	EN_SW_OVERFLOW                    = 0x8
+	EN_SW_PRECLOSS                    = 0x20
+	EN_SW_UNDERFLOW                   = 0x10
+	EN_SW_ZERODIV                     = 0x4
+	ETHERCAP_JUMBO_MTU                = 0x4
+	ETHERCAP_VLAN_HWTAGGING           = 0x2
+	ETHERCAP_VLAN_MTU                 = 0x1
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERMTU_JUMBO                    = 0x2328
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MAX_LEN_JUMBO               = 0x233a
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_PPPOE_ENCAP_LEN             = 0x8
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = 0x2
+	EVFILT_PROC                       = 0x4
+	EVFILT_READ                       = 0x0
+	EVFILT_SIGNAL                     = 0x5
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = 0x6
+	EVFILT_VNODE                      = 0x3
+	EVFILT_WRITE                      = 0x1
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x100
+	FLUSHO                            = 0x800000
+	F_CLOSEM                          = 0xa
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xc
+	F_FSCTL                           = -0x80000000
+	F_FSDIRMASK                       = 0x70000000
+	F_FSIN                            = 0x10000000
+	F_FSINOUT                         = 0x30000000
+	F_FSOUT                           = 0x20000000
+	F_FSPRIV                          = 0x8000
+	F_FSVOID                          = 0x40000000
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETNOSIGPIPE                    = 0xd
+	F_GETOWN                          = 0x5
+	F_MAXFD                           = 0xb
+	F_OK                              = 0x0
+	F_PARAM_MASK                      = 0xfff
+	F_PARAM_MAX                       = 0xfff
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETNOSIGPIPE                    = 0xe
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8f52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IPV6_ICMP                 = 0x3a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VRRP                      = 0x70
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_EF                             = 0x8000
+	IP_ERRORMTU                       = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x16
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0x14
+	IP_MF                             = 0x2000
+	IP_MINFRAGSIZE                    = 0x45
+	IP_MINTTL                         = 0x18
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x17
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ALIGNMENT_16MB                = 0x18000000
+	MAP_ALIGNMENT_1TB                 = 0x28000000
+	MAP_ALIGNMENT_256TB               = 0x30000000
+	MAP_ALIGNMENT_4GB                 = 0x20000000
+	MAP_ALIGNMENT_64KB                = 0x10000000
+	MAP_ALIGNMENT_64PB                = 0x38000000
+	MAP_ALIGNMENT_MASK                = -0x1000000
+	MAP_ALIGNMENT_SHIFT               = 0x18
+	MAP_ANON                          = 0x1000
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_DEFAULT               = 0x1
+	MAP_INHERIT_DONATE_COPY           = 0x3
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x2000
+	MAP_TRYFIXED                      = 0x400
+	MAP_WIRED                         = 0x800
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CMSG_CLOEXEC                  = 0x800
+	MSG_CONTROLMBUF                   = 0x2000000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_IOVUSRSPACE                   = 0x4000000
+	MSG_LENUSRSPACE                   = 0x8000000
+	MSG_MCAST                         = 0x200
+	MSG_NAMEMBUF                      = 0x1000000
+	MSG_NBIO                          = 0x1000
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_USERFLAGS                     = 0xffffff
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x4
+	NAME_MAX                          = 0x1ff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x5
+	NET_RT_MAXID                      = 0x6
+	NET_RT_OIFLIST                    = 0x4
+	NET_RT_OOIFLIST                   = 0x3
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFIOGETBMAP                       = 0xc004667a
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALT_IO                          = 0x40000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x400000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x80000
+	O_DIRECTORY                       = 0x200000
+	O_DSYNC                           = 0x10000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_NOSIGPIPE                       = 0x1000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x20000
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PRI_IOFLUSH                       = 0x7c
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x9
+	RTAX_NETMASK                      = 0x2
+	RTAX_TAG                          = 0x8
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTA_TAG                           = 0x100
+	RTF_ANNOUNCE                      = 0x20000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_CLONED                        = 0x2000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_REJECT                        = 0x8
+	RTF_SRC                           = 0x10000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_CHGADDR                       = 0x15
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x11
+	RTM_IFANNOUNCE                    = 0x10
+	RTM_IFINFO                        = 0x14
+	RTM_LLINFO_UPD                    = 0x13
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_OIFINFO                       = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_OOIFINFO                      = 0xe
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_SETGATE                       = 0x12
+	RTM_VERSION                       = 0x4
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x4
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x8
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80906931
+	SIOCADDRT                         = 0x8030720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCALIFADDR                      = 0x8118691c
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80906932
+	SIOCDELRT                         = 0x8030720b
+	SIOCDIFADDR                       = 0x80906919
+	SIOCDIFPHYADDR                    = 0x80906949
+	SIOCDLIFADDR                      = 0x8118691e
+	SIOCGDRVSPEC                      = 0xc01c697b
+	SIOCGETPFSYNC                     = 0xc09069f8
+	SIOCGETSGCNT                      = 0xc0147534
+	SIOCGETVIFCNT                     = 0xc0147533
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0906921
+	SIOCGIFADDRPREF                   = 0xc0946920
+	SIOCGIFALIAS                      = 0xc040691b
+	SIOCGIFBRDADDR                    = 0xc0906923
+	SIOCGIFCAP                        = 0xc0206976
+	SIOCGIFCONF                       = 0xc0086926
+	SIOCGIFDATA                       = 0xc0946985
+	SIOCGIFDLT                        = 0xc0906977
+	SIOCGIFDSTADDR                    = 0xc0906922
+	SIOCGIFFLAGS                      = 0xc0906911
+	SIOCGIFGENERIC                    = 0xc090693a
+	SIOCGIFMEDIA                      = 0xc0286936
+	SIOCGIFMETRIC                     = 0xc0906917
+	SIOCGIFMTU                        = 0xc090697e
+	SIOCGIFNETMASK                    = 0xc0906925
+	SIOCGIFPDSTADDR                   = 0xc0906948
+	SIOCGIFPSRCADDR                   = 0xc0906947
+	SIOCGLIFADDR                      = 0xc118691d
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLINKSTR                      = 0xc01c6987
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGVH                           = 0xc0906983
+	SIOCIFCREATE                      = 0x8090697a
+	SIOCIFDESTROY                     = 0x80906979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCINITIFADDR                    = 0xc0446984
+	SIOCSDRVSPEC                      = 0x801c697b
+	SIOCSETPFSYNC                     = 0x809069f7
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8090690c
+	SIOCSIFADDRPREF                   = 0x8094691f
+	SIOCSIFBRDADDR                    = 0x80906913
+	SIOCSIFCAP                        = 0x80206975
+	SIOCSIFDSTADDR                    = 0x8090690e
+	SIOCSIFFLAGS                      = 0x80906910
+	SIOCSIFGENERIC                    = 0x80906939
+	SIOCSIFMEDIA                      = 0xc0906935
+	SIOCSIFMETRIC                     = 0x80906918
+	SIOCSIFMTU                        = 0x8090697f
+	SIOCSIFNETMASK                    = 0x80906916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLINKSTR                      = 0x801c6988
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSVH                           = 0xc0906982
+	SIOCZIFDATA                       = 0xc0946986
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_FLAGS_MASK                   = 0xf0000000
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_NOSIGPIPE                    = 0x40000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NOHEADER                       = 0x100a
+	SO_NOSIGPIPE                      = 0x800
+	SO_OOBINLINE                      = 0x100
+	SO_OVERFLOWED                     = 0x1009
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x100c
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x100b
+	SO_TIMESTAMP                      = 0x2000
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SYSCTL_VERSION                    = 0x1000000
+	SYSCTL_VERS_0                     = 0x0
+	SYSCTL_VERS_1                     = 0x1000000
+	SYSCTL_VERS_MASK                  = 0xff000000
+	S_ARCH1                           = 0x10000
+	S_ARCH2                           = 0x20000
+	S_BLKSIZE                         = 0x200
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	S_LOGIN_SET                       = 0x1
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONGCTL                       = 0x20
+	TCP_KEEPCNT                       = 0x6
+	TCP_KEEPIDLE                      = 0x3
+	TCP_KEEPINIT                      = 0x7
+	TCP_KEEPINTVL                     = 0x5
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x10
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x218
+	TCP_NODELAY                       = 0x1
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x400c7458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CDTRCTS                  = 0x10
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGLINED                        = 0x40207442
+	TIOCGPGRP                         = 0x40047477
+	TIOCGQSIZE                        = 0x40047481
+	TIOCGRANTPT                       = 0x20007447
+	TIOCGSID                          = 0x40047463
+	TIOCGSIZE                         = 0x40087468
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTMGET                        = 0x40287446
+	TIOCPTSNAME                       = 0x40287448
+	TIOCRCVFRAME                      = 0x80047445
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x2000745f
+	TIOCSLINED                        = 0x80207443
+	TIOCSPGRP                         = 0x80047476
+	TIOCSQSIZE                        = 0x80047480
+	TIOCSSIZE                         = 0x80087467
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TIOCXMTFRAME                      = 0x80047444
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALL                              = 0x8
+	WALLSIG                           = 0x8
+	WALTSIG                           = 0x4
+	WCLONE                            = 0x4
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x10000
+	WNOZOMBIE                         = 0x20000
+	WOPTSCHECKED                      = 0x40000
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x58)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x57)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x55)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5e)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x59)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x5a)
+	ENOSTR          = syscall.Errno(0x5b)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x56)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x60)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x5c)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x20)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:  "operation not permitted",
+	2:  "no such file or directory",
+	3:  "no such process",
+	4:  "interrupted system call",
+	5:  "input/output error",
+	6:  "device not configured",
+	7:  "argument list too long",
+	8:  "exec format error",
+	9:  "bad file descriptor",
+	10: "no child processes",
+	11: "resource deadlock avoided",
+	12: "cannot allocate memory",
+	13: "permission denied",
+	14: "bad address",
+	15: "block device required",
+	16: "device busy",
+	17: "file exists",
+	18: "cross-device link",
+	19: "operation not supported by device",
+	20: "not a directory",
+	21: "is a directory",
+	22: "invalid argument",
+	23: "too many open files in system",
+	24: "too many open files",
+	25: "inappropriate ioctl for device",
+	26: "text file busy",
+	27: "file too large",
+	28: "no space left on device",
+	29: "illegal seek",
+	30: "read-only file system",
+	31: "too many links",
+	32: "broken pipe",
+	33: "numerical argument out of domain",
+	34: "result too large or too small",
+	35: "resource temporarily unavailable",
+	36: "operation now in progress",
+	37: "operation already in progress",
+	38: "socket operation on non-socket",
+	39: "destination address required",
+	40: "message too long",
+	41: "protocol wrong type for socket",
+	42: "protocol option not available",
+	43: "protocol not supported",
+	44: "socket type not supported",
+	45: "operation not supported",
+	46: "protocol family not supported",
+	47: "address family not supported by protocol family",
+	48: "address already in use",
+	49: "can't assign requested address",
+	50: "network is down",
+	51: "network is unreachable",
+	52: "network dropped connection on reset",
+	53: "software caused connection abort",
+	54: "connection reset by peer",
+	55: "no buffer space available",
+	56: "socket is already connected",
+	57: "socket is not connected",
+	58: "can't send after socket shutdown",
+	59: "too many references: can't splice",
+	60: "connection timed out",
+	61: "connection refused",
+	62: "too many levels of symbolic links",
+	63: "file name too long",
+	64: "host is down",
+	65: "no route to host",
+	66: "directory not empty",
+	67: "too many processes",
+	68: "too many users",
+	69: "disc quota exceeded",
+	70: "stale NFS file handle",
+	71: "too many levels of remote in path",
+	72: "RPC struct is bad",
+	73: "RPC version wrong",
+	74: "RPC prog. not avail",
+	75: "program version wrong",
+	76: "bad procedure for program",
+	77: "no locks available",
+	78: "function not implemented",
+	79: "inappropriate file type or format",
+	80: "authentication error",
+	81: "need authenticator",
+	82: "identifier removed",
+	83: "no message of desired type",
+	84: "value too large to be stored in data type",
+	85: "illegal byte sequence",
+	86: "not supported",
+	87: "operation Canceled",
+	88: "bad or Corrupt message",
+	89: "no message available",
+	90: "no STREAM resources",
+	91: "not a STREAM",
+	92: "STREAM ioctl timeout",
+	93: "attribute not found",
+	94: "multihop attempted",
+	95: "link has been severed",
+	96: "protocol error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "stopped (signal)",
+	18: "stopped",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+	32: "power fail/restart",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
new file mode 100644
index 0000000000..4994437b63
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
@@ -0,0 +1,1702 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,netbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ARP                            = 0x1c
+	AF_BLUETOOTH                      = 0x1f
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x20
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x23
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OROUTE                         = 0x11
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x22
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ARCNET                     = 0x7
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	ARPHRD_STRIP                      = 0x17
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B460800                           = 0x70800
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B921600                           = 0xe1000
+	B9600                             = 0x2580
+	BIOCFEEDBACK                      = 0x8004427d
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0104277
+	BIOCGETIF                         = 0x4090426b
+	BIOCGFEEDBACK                     = 0x4004427c
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRTIMEOUT                     = 0x4010427b
+	BIOCGSEESENT                      = 0x40044278
+	BIOCGSTATS                        = 0x4080426f
+	BIOCGSTATSOLD                     = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044276
+	BIOCSETF                          = 0x80104267
+	BIOCSETIF                         = 0x8090426c
+	BIOCSFEEDBACK                     = 0x8004427d
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRTIMEOUT                     = 0x8010427a
+	BIOCSSEESENT                      = 0x80044279
+	BIOCSTCPF                         = 0x80104272
+	BIOCSUDPF                         = 0x80104273
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x8
+	BPF_ALIGNMENT32                   = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DFLTBUFSIZE                   = 0x100000
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x1000000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CLONE_CSIGNAL                     = 0xff
+	CLONE_FILES                       = 0x400
+	CLONE_FS                          = 0x200
+	CLONE_PID                         = 0x1000
+	CLONE_PTRACE                      = 0x2000
+	CLONE_SIGHAND                     = 0x800
+	CLONE_VFORK                       = 0x4000
+	CLONE_VM                          = 0x100
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	CTL_QUERY                         = -0x2
+	DIOCBSFLUSH                       = 0x20006478
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HDLC                          = 0x10
+	DLT_HHDLC                         = 0x79
+	DLT_HIPPI                         = 0xf
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0xe
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RAWAF_MASK                    = 0x2240000
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xd
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMUL_LINUX                        = 0x1
+	EMUL_LINUX32                      = 0x5
+	EMUL_MAXID                        = 0x6
+	ETHERCAP_JUMBO_MTU                = 0x4
+	ETHERCAP_VLAN_HWTAGGING           = 0x2
+	ETHERCAP_VLAN_MTU                 = 0x1
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERMTU_JUMBO                    = 0x2328
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MAX_LEN_JUMBO               = 0x233a
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_PPPOE_ENCAP_LEN             = 0x8
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = 0x2
+	EVFILT_PROC                       = 0x4
+	EVFILT_READ                       = 0x0
+	EVFILT_SIGNAL                     = 0x5
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = 0x6
+	EVFILT_VNODE                      = 0x3
+	EVFILT_WRITE                      = 0x1
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x100
+	FLUSHO                            = 0x800000
+	F_CLOSEM                          = 0xa
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xc
+	F_FSCTL                           = -0x80000000
+	F_FSDIRMASK                       = 0x70000000
+	F_FSIN                            = 0x10000000
+	F_FSINOUT                         = 0x30000000
+	F_FSOUT                           = 0x20000000
+	F_FSPRIV                          = 0x8000
+	F_FSVOID                          = 0x40000000
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETNOSIGPIPE                    = 0xd
+	F_GETOWN                          = 0x5
+	F_MAXFD                           = 0xb
+	F_OK                              = 0x0
+	F_PARAM_MASK                      = 0xfff
+	F_PARAM_MAX                       = 0xfff
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETNOSIGPIPE                    = 0xe
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8f52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IPV6_ICMP                 = 0x3a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VRRP                      = 0x70
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_EF                             = 0x8000
+	IP_ERRORMTU                       = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x16
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0x14
+	IP_MF                             = 0x2000
+	IP_MINFRAGSIZE                    = 0x45
+	IP_MINTTL                         = 0x18
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x17
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ALIGNMENT_16MB                = 0x18000000
+	MAP_ALIGNMENT_1TB                 = 0x28000000
+	MAP_ALIGNMENT_256TB               = 0x30000000
+	MAP_ALIGNMENT_4GB                 = 0x20000000
+	MAP_ALIGNMENT_64KB                = 0x10000000
+	MAP_ALIGNMENT_64PB                = 0x38000000
+	MAP_ALIGNMENT_MASK                = -0x1000000
+	MAP_ALIGNMENT_SHIFT               = 0x18
+	MAP_ANON                          = 0x1000
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_DEFAULT               = 0x1
+	MAP_INHERIT_DONATE_COPY           = 0x3
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x2000
+	MAP_TRYFIXED                      = 0x400
+	MAP_WIRED                         = 0x800
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CMSG_CLOEXEC                  = 0x800
+	MSG_CONTROLMBUF                   = 0x2000000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_IOVUSRSPACE                   = 0x4000000
+	MSG_LENUSRSPACE                   = 0x8000000
+	MSG_MCAST                         = 0x200
+	MSG_NAMEMBUF                      = 0x1000000
+	MSG_NBIO                          = 0x1000
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_USERFLAGS                     = 0xffffff
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x4
+	NAME_MAX                          = 0x1ff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x5
+	NET_RT_MAXID                      = 0x6
+	NET_RT_OIFLIST                    = 0x4
+	NET_RT_OOIFLIST                   = 0x3
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFIOGETBMAP                       = 0xc004667a
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALT_IO                          = 0x40000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x400000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x80000
+	O_DIRECTORY                       = 0x200000
+	O_DSYNC                           = 0x10000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_NOSIGPIPE                       = 0x1000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x20000
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PRI_IOFLUSH                       = 0x7c
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x9
+	RTAX_NETMASK                      = 0x2
+	RTAX_TAG                          = 0x8
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTA_TAG                           = 0x100
+	RTF_ANNOUNCE                      = 0x20000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_CLONED                        = 0x2000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_REJECT                        = 0x8
+	RTF_SRC                           = 0x10000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_CHGADDR                       = 0x15
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x11
+	RTM_IFANNOUNCE                    = 0x10
+	RTM_IFINFO                        = 0x14
+	RTM_LLINFO_UPD                    = 0x13
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_OIFINFO                       = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_OOIFINFO                      = 0xe
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_SETGATE                       = 0x12
+	RTM_VERSION                       = 0x4
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x4
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x8
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80906931
+	SIOCADDRT                         = 0x8038720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCALIFADDR                      = 0x8118691c
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80906932
+	SIOCDELRT                         = 0x8038720b
+	SIOCDIFADDR                       = 0x80906919
+	SIOCDIFPHYADDR                    = 0x80906949
+	SIOCDLIFADDR                      = 0x8118691e
+	SIOCGDRVSPEC                      = 0xc028697b
+	SIOCGETPFSYNC                     = 0xc09069f8
+	SIOCGETSGCNT                      = 0xc0207534
+	SIOCGETVIFCNT                     = 0xc0287533
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0906921
+	SIOCGIFADDRPREF                   = 0xc0986920
+	SIOCGIFALIAS                      = 0xc040691b
+	SIOCGIFBRDADDR                    = 0xc0906923
+	SIOCGIFCAP                        = 0xc0206976
+	SIOCGIFCONF                       = 0xc0106926
+	SIOCGIFDATA                       = 0xc0986985
+	SIOCGIFDLT                        = 0xc0906977
+	SIOCGIFDSTADDR                    = 0xc0906922
+	SIOCGIFFLAGS                      = 0xc0906911
+	SIOCGIFGENERIC                    = 0xc090693a
+	SIOCGIFMEDIA                      = 0xc0306936
+	SIOCGIFMETRIC                     = 0xc0906917
+	SIOCGIFMTU                        = 0xc090697e
+	SIOCGIFNETMASK                    = 0xc0906925
+	SIOCGIFPDSTADDR                   = 0xc0906948
+	SIOCGIFPSRCADDR                   = 0xc0906947
+	SIOCGLIFADDR                      = 0xc118691d
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLINKSTR                      = 0xc0286987
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGVH                           = 0xc0906983
+	SIOCIFCREATE                      = 0x8090697a
+	SIOCIFDESTROY                     = 0x80906979
+	SIOCIFGCLONERS                    = 0xc0106978
+	SIOCINITIFADDR                    = 0xc0706984
+	SIOCSDRVSPEC                      = 0x8028697b
+	SIOCSETPFSYNC                     = 0x809069f7
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8090690c
+	SIOCSIFADDRPREF                   = 0x8098691f
+	SIOCSIFBRDADDR                    = 0x80906913
+	SIOCSIFCAP                        = 0x80206975
+	SIOCSIFDSTADDR                    = 0x8090690e
+	SIOCSIFFLAGS                      = 0x80906910
+	SIOCSIFGENERIC                    = 0x80906939
+	SIOCSIFMEDIA                      = 0xc0906935
+	SIOCSIFMETRIC                     = 0x80906918
+	SIOCSIFMTU                        = 0x8090697f
+	SIOCSIFNETMASK                    = 0x80906916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLINKSTR                      = 0x80286988
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSVH                           = 0xc0906982
+	SIOCZIFDATA                       = 0xc0986986
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_FLAGS_MASK                   = 0xf0000000
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_NOSIGPIPE                    = 0x40000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NOHEADER                       = 0x100a
+	SO_NOSIGPIPE                      = 0x800
+	SO_OOBINLINE                      = 0x100
+	SO_OVERFLOWED                     = 0x1009
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x100c
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x100b
+	SO_TIMESTAMP                      = 0x2000
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SYSCTL_VERSION                    = 0x1000000
+	SYSCTL_VERS_0                     = 0x0
+	SYSCTL_VERS_1                     = 0x1000000
+	SYSCTL_VERS_MASK                  = 0xff000000
+	S_ARCH1                           = 0x10000
+	S_ARCH2                           = 0x20000
+	S_BLKSIZE                         = 0x200
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	S_LOGIN_SET                       = 0x1
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONGCTL                       = 0x20
+	TCP_KEEPCNT                       = 0x6
+	TCP_KEEPIDLE                      = 0x3
+	TCP_KEEPINIT                      = 0x7
+	TCP_KEEPINTVL                     = 0x5
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x10
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x218
+	TCP_NODELAY                       = 0x1
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x40107458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CDTRCTS                  = 0x10
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGLINED                        = 0x40207442
+	TIOCGPGRP                         = 0x40047477
+	TIOCGQSIZE                        = 0x40047481
+	TIOCGRANTPT                       = 0x20007447
+	TIOCGSID                          = 0x40047463
+	TIOCGSIZE                         = 0x40087468
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTMGET                        = 0x40287446
+	TIOCPTSNAME                       = 0x40287448
+	TIOCRCVFRAME                      = 0x80087445
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x2000745f
+	TIOCSLINED                        = 0x80207443
+	TIOCSPGRP                         = 0x80047476
+	TIOCSQSIZE                        = 0x80047480
+	TIOCSSIZE                         = 0x80087467
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TIOCXMTFRAME                      = 0x80087444
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALL                              = 0x8
+	WALLSIG                           = 0x8
+	WALTSIG                           = 0x4
+	WCLONE                            = 0x4
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x10000
+	WNOZOMBIE                         = 0x20000
+	WOPTSCHECKED                      = 0x40000
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x58)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x57)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x55)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5e)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x59)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x5a)
+	ENOSTR          = syscall.Errno(0x5b)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x56)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x60)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x5c)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x20)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:  "operation not permitted",
+	2:  "no such file or directory",
+	3:  "no such process",
+	4:  "interrupted system call",
+	5:  "input/output error",
+	6:  "device not configured",
+	7:  "argument list too long",
+	8:  "exec format error",
+	9:  "bad file descriptor",
+	10: "no child processes",
+	11: "resource deadlock avoided",
+	12: "cannot allocate memory",
+	13: "permission denied",
+	14: "bad address",
+	15: "block device required",
+	16: "device busy",
+	17: "file exists",
+	18: "cross-device link",
+	19: "operation not supported by device",
+	20: "not a directory",
+	21: "is a directory",
+	22: "invalid argument",
+	23: "too many open files in system",
+	24: "too many open files",
+	25: "inappropriate ioctl for device",
+	26: "text file busy",
+	27: "file too large",
+	28: "no space left on device",
+	29: "illegal seek",
+	30: "read-only file system",
+	31: "too many links",
+	32: "broken pipe",
+	33: "numerical argument out of domain",
+	34: "result too large or too small",
+	35: "resource temporarily unavailable",
+	36: "operation now in progress",
+	37: "operation already in progress",
+	38: "socket operation on non-socket",
+	39: "destination address required",
+	40: "message too long",
+	41: "protocol wrong type for socket",
+	42: "protocol option not available",
+	43: "protocol not supported",
+	44: "socket type not supported",
+	45: "operation not supported",
+	46: "protocol family not supported",
+	47: "address family not supported by protocol family",
+	48: "address already in use",
+	49: "can't assign requested address",
+	50: "network is down",
+	51: "network is unreachable",
+	52: "network dropped connection on reset",
+	53: "software caused connection abort",
+	54: "connection reset by peer",
+	55: "no buffer space available",
+	56: "socket is already connected",
+	57: "socket is not connected",
+	58: "can't send after socket shutdown",
+	59: "too many references: can't splice",
+	60: "connection timed out",
+	61: "connection refused",
+	62: "too many levels of symbolic links",
+	63: "file name too long",
+	64: "host is down",
+	65: "no route to host",
+	66: "directory not empty",
+	67: "too many processes",
+	68: "too many users",
+	69: "disc quota exceeded",
+	70: "stale NFS file handle",
+	71: "too many levels of remote in path",
+	72: "RPC struct is bad",
+	73: "RPC version wrong",
+	74: "RPC prog. not avail",
+	75: "program version wrong",
+	76: "bad procedure for program",
+	77: "no locks available",
+	78: "function not implemented",
+	79: "inappropriate file type or format",
+	80: "authentication error",
+	81: "need authenticator",
+	82: "identifier removed",
+	83: "no message of desired type",
+	84: "value too large to be stored in data type",
+	85: "illegal byte sequence",
+	86: "not supported",
+	87: "operation Canceled",
+	88: "bad or Corrupt message",
+	89: "no message available",
+	90: "no STREAM resources",
+	91: "not a STREAM",
+	92: "STREAM ioctl timeout",
+	93: "attribute not found",
+	94: "multihop attempted",
+	95: "link has been severed",
+	96: "protocol error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "stopped (signal)",
+	18: "stopped",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+	32: "power fail/restart",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
new file mode 100644
index 0000000000..ac85ca6452
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
@@ -0,0 +1,1688 @@
+// mkerrors.sh -marm
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm,netbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -marm _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_ARP                            = 0x1c
+	AF_BLUETOOTH                      = 0x1f
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_HYLINK                         = 0xf
+	AF_IEEE80211                      = 0x20
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x23
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OROUTE                         = 0x11
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x22
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ARCNET                     = 0x7
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	ARPHRD_STRIP                      = 0x17
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B460800                           = 0x70800
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B921600                           = 0xe1000
+	B9600                             = 0x2580
+	BIOCFEEDBACK                      = 0x8004427d
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc0084277
+	BIOCGETIF                         = 0x4090426b
+	BIOCGFEEDBACK                     = 0x4004427c
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRTIMEOUT                     = 0x400c427b
+	BIOCGSEESENT                      = 0x40044278
+	BIOCGSTATS                        = 0x4080426f
+	BIOCGSTATSOLD                     = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDLT                          = 0x80044276
+	BIOCSETF                          = 0x80084267
+	BIOCSETIF                         = 0x8090426c
+	BIOCSFEEDBACK                     = 0x8004427d
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRTIMEOUT                     = 0x800c427a
+	BIOCSSEESENT                      = 0x80044279
+	BIOCSTCPF                         = 0x80084272
+	BIOCSUDPF                         = 0x80084273
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALIGNMENT32                   = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DFLTBUFSIZE                   = 0x100000
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x1000000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0x14
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	CTL_QUERY                         = -0x2
+	DIOCBSFLUSH                       = 0x20006478
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
+	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
+	DLT_ATM_CLIP                      = 0x13
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
+	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
+	DLT_CHAOS                         = 0x5
+	DLT_CISCO_IOS                     = 0x76
+	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_ECONET                        = 0x73
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
+	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HDLC                          = 0x10
+	DLT_HHDLC                         = 0x79
+	DLT_HIPPI                         = 0xf
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_SLL                     = 0x71
+	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0xe
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PRISM_HEADER                  = 0x77
+	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
+	DLT_RAW                           = 0xc
+	DLT_RAWAF_MASK                    = 0x2240000
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xd
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	DT_WHT                            = 0xe
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMUL_LINUX                        = 0x1
+	EMUL_LINUX32                      = 0x5
+	EMUL_MAXID                        = 0x6
+	ETHERCAP_JUMBO_MTU                = 0x4
+	ETHERCAP_VLAN_HWTAGGING           = 0x2
+	ETHERCAP_VLAN_MTU                 = 0x1
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERMTU_JUMBO                    = 0x2328
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MAX_LEN_JUMBO               = 0x233a
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_PPPOE_ENCAP_LEN             = 0x8
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = 0x2
+	EVFILT_PROC                       = 0x4
+	EVFILT_READ                       = 0x0
+	EVFILT_SIGNAL                     = 0x5
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = 0x6
+	EVFILT_VNODE                      = 0x3
+	EVFILT_WRITE                      = 0x1
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x100
+	FLUSHO                            = 0x800000
+	F_CLOSEM                          = 0xa
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xc
+	F_FSCTL                           = -0x80000000
+	F_FSDIRMASK                       = 0x70000000
+	F_FSIN                            = 0x10000000
+	F_FSINOUT                         = 0x30000000
+	F_FSOUT                           = 0x20000000
+	F_FSPRIV                          = 0x8000
+	F_FSVOID                          = 0x40000000
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETNOSIGPIPE                    = 0xd
+	F_GETOWN                          = 0x5
+	F_MAXFD                           = 0xb
+	F_OK                              = 0x0
+	F_PARAM_MASK                      = 0xfff
+	F_PARAM_MAX                       = 0xfff
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETNOSIGPIPE                    = 0xe
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8f52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf8
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_IPV6_ICMP                 = 0x3a
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x34
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPPROTO_VRRP                      = 0x70
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPSEC_POLICY                 = 0x1c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_EF                             = 0x8000
+	IP_ERRORMTU                       = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPSEC_POLICY                   = 0x16
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0x14
+	IP_MF                             = 0x2000
+	IP_MINFRAGSIZE                    = 0x45
+	IP_MINTTL                         = 0x18
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVIF                         = 0x14
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTTL                        = 0x17
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ALIGNMENT_16MB                = 0x18000000
+	MAP_ALIGNMENT_1TB                 = 0x28000000
+	MAP_ALIGNMENT_256TB               = 0x30000000
+	MAP_ALIGNMENT_4GB                 = 0x20000000
+	MAP_ALIGNMENT_64KB                = 0x10000000
+	MAP_ALIGNMENT_64PB                = 0x38000000
+	MAP_ALIGNMENT_MASK                = -0x1000000
+	MAP_ALIGNMENT_SHIFT               = 0x18
+	MAP_ANON                          = 0x1000
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_DEFAULT               = 0x1
+	MAP_INHERIT_DONATE_COPY           = 0x3
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_STACK                         = 0x2000
+	MAP_TRYFIXED                      = 0x400
+	MAP_WIRED                         = 0x800
+	MSG_BCAST                         = 0x100
+	MSG_CMSG_CLOEXEC                  = 0x800
+	MSG_CONTROLMBUF                   = 0x2000000
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_IOVUSRSPACE                   = 0x4000000
+	MSG_LENUSRSPACE                   = 0x8000000
+	MSG_MCAST                         = 0x200
+	MSG_NAMEMBUF                      = 0x1000000
+	MSG_NBIO                          = 0x1000
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_USERFLAGS                     = 0xffffff
+	MSG_WAITALL                       = 0x40
+	NAME_MAX                          = 0x1ff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x5
+	NET_RT_MAXID                      = 0x6
+	NET_RT_OIFLIST                    = 0x4
+	NET_RT_OOIFLIST                   = 0x3
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	OFIOGETBMAP                       = 0xc004667a
+	ONLCR                             = 0x2
+	ONLRET                            = 0x40
+	ONOCR                             = 0x20
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_ALT_IO                          = 0x40000
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x400000
+	O_CREAT                           = 0x200
+	O_DIRECT                          = 0x80000
+	O_DIRECTORY                       = 0x200000
+	O_DSYNC                           = 0x10000
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_NOSIGPIPE                       = 0x1000000
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x20000
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PRI_IOFLUSH                       = 0x7c
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	RLIMIT_AS                         = 0xa
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_MAX                          = 0x9
+	RTAX_NETMASK                      = 0x2
+	RTAX_TAG                          = 0x8
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_NETMASK                       = 0x4
+	RTA_TAG                           = 0x100
+	RTF_ANNOUNCE                      = 0x20000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_CLONED                        = 0x2000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_REJECT                        = 0x8
+	RTF_SRC                           = 0x10000
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_CHGADDR                       = 0x15
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_GET                           = 0x4
+	RTM_IEEE80211                     = 0x11
+	RTM_IFANNOUNCE                    = 0x10
+	RTM_IFINFO                        = 0x14
+	RTM_LLINFO_UPD                    = 0x13
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_OIFINFO                       = 0xf
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	RTM_OOIFINFO                      = 0xe
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_SETGATE                       = 0x12
+	RTM_VERSION                       = 0x4
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	SCM_CREDS                         = 0x4
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x8
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80906931
+	SIOCADDRT                         = 0x8030720a
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCALIFADDR                      = 0x8118691c
+	SIOCATMARK                        = 0x40047307
+	SIOCDELMULTI                      = 0x80906932
+	SIOCDELRT                         = 0x8030720b
+	SIOCDIFADDR                       = 0x80906919
+	SIOCDIFPHYADDR                    = 0x80906949
+	SIOCDLIFADDR                      = 0x8118691e
+	SIOCGDRVSPEC                      = 0xc01c697b
+	SIOCGETPFSYNC                     = 0xc09069f8
+	SIOCGETSGCNT                      = 0xc0147534
+	SIOCGETVIFCNT                     = 0xc0147533
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0906921
+	SIOCGIFADDRPREF                   = 0xc0946920
+	SIOCGIFALIAS                      = 0xc040691b
+	SIOCGIFBRDADDR                    = 0xc0906923
+	SIOCGIFCAP                        = 0xc0206976
+	SIOCGIFCONF                       = 0xc0086926
+	SIOCGIFDATA                       = 0xc0946985
+	SIOCGIFDLT                        = 0xc0906977
+	SIOCGIFDSTADDR                    = 0xc0906922
+	SIOCGIFFLAGS                      = 0xc0906911
+	SIOCGIFGENERIC                    = 0xc090693a
+	SIOCGIFMEDIA                      = 0xc0286936
+	SIOCGIFMETRIC                     = 0xc0906917
+	SIOCGIFMTU                        = 0xc090697e
+	SIOCGIFNETMASK                    = 0xc0906925
+	SIOCGIFPDSTADDR                   = 0xc0906948
+	SIOCGIFPSRCADDR                   = 0xc0906947
+	SIOCGLIFADDR                      = 0xc118691d
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCGLINKSTR                      = 0xc01c6987
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGVH                           = 0xc0906983
+	SIOCIFCREATE                      = 0x8090697a
+	SIOCIFDESTROY                     = 0x80906979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCINITIFADDR                    = 0xc0446984
+	SIOCSDRVSPEC                      = 0x801c697b
+	SIOCSETPFSYNC                     = 0x809069f7
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8090690c
+	SIOCSIFADDRPREF                   = 0x8094691f
+	SIOCSIFBRDADDR                    = 0x80906913
+	SIOCSIFCAP                        = 0x80206975
+	SIOCSIFDSTADDR                    = 0x8090690e
+	SIOCSIFFLAGS                      = 0x80906910
+	SIOCSIFGENERIC                    = 0x80906939
+	SIOCSIFMEDIA                      = 0xc0906935
+	SIOCSIFMETRIC                     = 0x80906918
+	SIOCSIFMTU                        = 0x8090697f
+	SIOCSIFNETMASK                    = 0x80906916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSLIFPHYADDR                   = 0x8118694a
+	SIOCSLINKSTR                      = 0x801c6988
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSVH                           = 0xc0906982
+	SIOCZIFDATA                       = 0xc0946986
+	SOCK_CLOEXEC                      = 0x10000000
+	SOCK_DGRAM                        = 0x2
+	SOCK_FLAGS_MASK                   = 0xf0000000
+	SOCK_NONBLOCK                     = 0x20000000
+	SOCK_NOSIGPIPE                    = 0x40000000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_ACCEPTFILTER                   = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NOHEADER                       = 0x100a
+	SO_NOSIGPIPE                      = 0x800
+	SO_OOBINLINE                      = 0x100
+	SO_OVERFLOWED                     = 0x1009
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x100c
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x100b
+	SO_TIMESTAMP                      = 0x2000
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	SYSCTL_VERSION                    = 0x1000000
+	SYSCTL_VERS_0                     = 0x0
+	SYSCTL_VERS_1                     = 0x1000000
+	SYSCTL_VERS_MASK                  = 0xff000000
+	S_ARCH1                           = 0x10000
+	S_ARCH2                           = 0x20000
+	S_BLKSIZE                         = 0x200
+	S_IEXEC                           = 0x40
+	S_IFBLK                           = 0x6000
+	S_IFCHR                           = 0x2000
+	S_IFDIR                           = 0x4000
+	S_IFIFO                           = 0x1000
+	S_IFLNK                           = 0xa000
+	S_IFMT                            = 0xf000
+	S_IFREG                           = 0x8000
+	S_IFSOCK                          = 0xc000
+	S_IFWHT                           = 0xe000
+	S_IREAD                           = 0x100
+	S_IRGRP                           = 0x20
+	S_IROTH                           = 0x4
+	S_IRUSR                           = 0x100
+	S_IRWXG                           = 0x38
+	S_IRWXO                           = 0x7
+	S_IRWXU                           = 0x1c0
+	S_ISGID                           = 0x400
+	S_ISTXT                           = 0x200
+	S_ISUID                           = 0x800
+	S_ISVTX                           = 0x200
+	S_IWGRP                           = 0x10
+	S_IWOTH                           = 0x2
+	S_IWRITE                          = 0x80
+	S_IWUSR                           = 0x80
+	S_IXGRP                           = 0x8
+	S_IXOTH                           = 0x1
+	S_IXUSR                           = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_CONGCTL                       = 0x20
+	TCP_KEEPCNT                       = 0x6
+	TCP_KEEPIDLE                      = 0x3
+	TCP_KEEPINIT                      = 0x7
+	TCP_KEEPINTVL                     = 0x5
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x10
+	TCP_MINMSS                        = 0xd8
+	TCP_MSS                           = 0x218
+	TCP_NODELAY                       = 0x1
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDCDTIMESTAMP                  = 0x400c7458
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CDTRCTS                  = 0x10
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGLINED                        = 0x40207442
+	TIOCGPGRP                         = 0x40047477
+	TIOCGQSIZE                        = 0x40047481
+	TIOCGRANTPT                       = 0x20007447
+	TIOCGSID                          = 0x40047463
+	TIOCGSIZE                         = 0x40087468
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCPTMGET                        = 0x48087446
+	TIOCPTSNAME                       = 0x48087448
+	TIOCRCVFRAME                      = 0x80047445
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x2000745f
+	TIOCSLINED                        = 0x80207443
+	TIOCSPGRP                         = 0x80047476
+	TIOCSQSIZE                        = 0x80047480
+	TIOCSSIZE                         = 0x80087467
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TIOCXMTFRAME                      = 0x80047444
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALL                              = 0x8
+	WALLSIG                           = 0x8
+	WALTSIG                           = 0x4
+	WCLONE                            = 0x4
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WNOWAIT                           = 0x10000
+	WNOZOMBIE                         = 0x20000
+	WOPTSCHECKED                      = 0x40000
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADMSG         = syscall.Errno(0x58)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x57)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x52)
+	EILSEQ          = syscall.Errno(0x55)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x60)
+	ELOOP           = syscall.Errno(0x3e)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	EMULTIHOP       = syscall.Errno(0x5e)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x5d)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODATA         = syscall.Errno(0x59)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOLINK         = syscall.Errno(0x5f)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x53)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x5a)
+	ENOSTR          = syscall.Errno(0x5b)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x56)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x54)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTO          = syscall.Errno(0x60)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIME           = syscall.Errno(0x5c)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGPWR    = syscall.Signal(0x20)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:  "operation not permitted",
+	2:  "no such file or directory",
+	3:  "no such process",
+	4:  "interrupted system call",
+	5:  "input/output error",
+	6:  "device not configured",
+	7:  "argument list too long",
+	8:  "exec format error",
+	9:  "bad file descriptor",
+	10: "no child processes",
+	11: "resource deadlock avoided",
+	12: "cannot allocate memory",
+	13: "permission denied",
+	14: "bad address",
+	15: "block device required",
+	16: "device busy",
+	17: "file exists",
+	18: "cross-device link",
+	19: "operation not supported by device",
+	20: "not a directory",
+	21: "is a directory",
+	22: "invalid argument",
+	23: "too many open files in system",
+	24: "too many open files",
+	25: "inappropriate ioctl for device",
+	26: "text file busy",
+	27: "file too large",
+	28: "no space left on device",
+	29: "illegal seek",
+	30: "read-only file system",
+	31: "too many links",
+	32: "broken pipe",
+	33: "numerical argument out of domain",
+	34: "result too large or too small",
+	35: "resource temporarily unavailable",
+	36: "operation now in progress",
+	37: "operation already in progress",
+	38: "socket operation on non-socket",
+	39: "destination address required",
+	40: "message too long",
+	41: "protocol wrong type for socket",
+	42: "protocol option not available",
+	43: "protocol not supported",
+	44: "socket type not supported",
+	45: "operation not supported",
+	46: "protocol family not supported",
+	47: "address family not supported by protocol family",
+	48: "address already in use",
+	49: "can't assign requested address",
+	50: "network is down",
+	51: "network is unreachable",
+	52: "network dropped connection on reset",
+	53: "software caused connection abort",
+	54: "connection reset by peer",
+	55: "no buffer space available",
+	56: "socket is already connected",
+	57: "socket is not connected",
+	58: "can't send after socket shutdown",
+	59: "too many references: can't splice",
+	60: "connection timed out",
+	61: "connection refused",
+	62: "too many levels of symbolic links",
+	63: "file name too long",
+	64: "host is down",
+	65: "no route to host",
+	66: "directory not empty",
+	67: "too many processes",
+	68: "too many users",
+	69: "disc quota exceeded",
+	70: "stale NFS file handle",
+	71: "too many levels of remote in path",
+	72: "RPC struct is bad",
+	73: "RPC version wrong",
+	74: "RPC prog. not avail",
+	75: "program version wrong",
+	76: "bad procedure for program",
+	77: "no locks available",
+	78: "function not implemented",
+	79: "inappropriate file type or format",
+	80: "authentication error",
+	81: "need authenticator",
+	82: "identifier removed",
+	83: "no message of desired type",
+	84: "value too large to be stored in data type",
+	85: "illegal byte sequence",
+	86: "not supported",
+	87: "operation Canceled",
+	88: "bad or Corrupt message",
+	89: "no message available",
+	90: "no STREAM resources",
+	91: "not a STREAM",
+	92: "STREAM ioctl timeout",
+	93: "attribute not found",
+	94: "multihop attempted",
+	95: "link has been severed",
+	96: "protocol error",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "stopped (signal)",
+	18: "stopped",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+	32: "power fail/restart",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
new file mode 100644
index 0000000000..3322e998d3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
@@ -0,0 +1,1584 @@
+// mkerrors.sh -m32
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,openbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m32 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_BLUETOOTH                      = 0x20
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_ENCAP                          = 0x1c
+	AF_HYLINK                         = 0xf
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_KEY                            = 0x1e
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x24
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x1d
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDIRFILT                      = 0x4004427c
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc008427b
+	BIOCGETIF                         = 0x4020426b
+	BIOCGFILDROP                      = 0x40044278
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044273
+	BIOCGRTIMEOUT                     = 0x400c426e
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x20004276
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDIRFILT                      = 0x8004427d
+	BIOCSDLT                          = 0x8004427a
+	BIOCSETF                          = 0x80084267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x80084277
+	BIOCSFILDROP                      = 0x80044279
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044272
+	BIOCSRTIMEOUT                     = 0x800c426d
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIRECTION_IN                  = 0x1
+	BPF_DIRECTION_OUT                 = 0x2
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x200000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0xff
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DIOCOSFPFLUSH                     = 0x2000444e
+	DLT_ARCNET                        = 0x7
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AX25                          = 0x3
+	DLT_CHAOS                         = 0x5
+	DLT_C_HDLC                        = 0x68
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0xd
+	DLT_FDDI                          = 0xa
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_LOOP                          = 0xc
+	DLT_MPLS                          = 0xdb
+	DLT_NULL                          = 0x0
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PRONET                        = 0x4
+	DLT_RAW                           = 0xe
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMT_TAGOVF                        = 0x1
+	EMUL_ENABLED                      = 0x1
+	EMUL_NATIVE                       = 0x2
+	ENDRUNDISC                        = 0x9
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_AOE                     = 0x88a2
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LLDP                    = 0x88cc
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_QINQ                    = 0x88a8
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOW                    = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_ALIGN                       = 0x2
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_DIX_LEN                 = 0x600
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = -0x3
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = -0x7
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xa
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETOWN                          = 0x5
+	F_OK                              = 0x0
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8e52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BLUETOOTH                     = 0xf8
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf7
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DUMMY                         = 0xf1
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf3
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFLOW                         = 0xf9
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf2
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IN_RFC3021_HOST                   = 0x1
+	IN_RFC3021_NET                    = 0xfffffffe
+	IN_RFC3021_NSHIFT                 = 0x1f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DIVERT_INIT               = 0x2
+	IPPROTO_DIVERT_RESP               = 0x1
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x103
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MPLS                      = 0x89
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPV6_AUTH_LEVEL                   = 0x35
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_ESP_NETWORK_LEVEL            = 0x37
+	IPV6_ESP_TRANS_LEVEL              = 0x36
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPCOMP_LEVEL                 = 0x3c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_OPTIONS                      = 0x1
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PIPEX                        = 0x3f
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVDSTPORT                  = 0x40
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTABLE                       = 0x1021
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_AUTH_LEVEL                     = 0x14
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DIVERTFL                       = 0x1022
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_ESP_NETWORK_LEVEL              = 0x16
+	IP_ESP_TRANS_LEVEL                = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPCOMP_LEVEL                   = 0x1d
+	IP_IPSECFLOWINFO                  = 0x24
+	IP_IPSEC_LOCAL_AUTH               = 0x1b
+	IP_IPSEC_LOCAL_CRED               = 0x19
+	IP_IPSEC_LOCAL_ID                 = 0x17
+	IP_IPSEC_REMOTE_AUTH              = 0x1c
+	IP_IPSEC_REMOTE_CRED              = 0x1a
+	IP_IPSEC_REMOTE_ID                = 0x18
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x20
+	IP_MIN_MEMBERSHIPS                = 0xf
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PIPEX                          = 0x22
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVDSTPORT                    = 0x21
+	IP_RECVIF                         = 0x1e
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVRTABLE                     = 0x23
+	IP_RECVTTL                        = 0x1f
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RTABLE                         = 0x1021
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LCNT_OVERLOAD_FLUSH               = 0x6
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ANON                          = 0x1000
+	MAP_COPY                          = 0x4
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_FLAGMASK                      = 0x1ff7
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_DONATE_COPY           = 0x3
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_TRYFIXED                      = 0x400
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_MCAST                         = 0x200
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x4
+	MS_SYNC                           = 0x2
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_MAXID                      = 0x6
+	NET_RT_STATS                      = 0x4
+	NET_RT_TABLE                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EOF                          = 0x2
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRUNCATE                     = 0x80
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x80
+	ONOCR                             = 0x40
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x10000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x20000
+	O_DSYNC                           = 0x80
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x80
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PF_FLUSH                          = 0x1
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	PT_MASK                           = 0x3ff000
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_LABEL                        = 0xa
+	RTAX_MAX                          = 0xb
+	RTAX_NETMASK                      = 0x2
+	RTAX_SRC                          = 0x8
+	RTAX_SRCMASK                      = 0x9
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_LABEL                         = 0x400
+	RTA_NETMASK                       = 0x4
+	RTA_SRC                           = 0x100
+	RTA_SRCMASK                       = 0x200
+	RTF_ANNOUNCE                      = 0x4000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_CLONED                        = 0x10000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_FMASK                         = 0x10f808
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_MPATH                         = 0x40000
+	RTF_MPLS                          = 0x100000
+	RTF_PERMANENT_ARP                 = 0x2000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x2000
+	RTF_REJECT                        = 0x8
+	RTF_SOURCE                        = 0x20000
+	RTF_STATIC                        = 0x800
+	RTF_TUNNEL                        = 0x100000
+	RTF_UP                            = 0x1
+	RTF_USETRAILERS                   = 0x8000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DESYNC                        = 0x10
+	RTM_GET                           = 0x4
+	RTM_IFANNOUNCE                    = 0xf
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MAXSIZE                       = 0x800
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RT_TABLEID_MAX                    = 0xff
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	RUSAGE_THREAD                     = 0x1
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCAIFGROUP                      = 0x80246987
+	SIOCALIFADDR                      = 0x8218691c
+	SIOCATMARK                        = 0x40047307
+	SIOCBRDGADD                       = 0x8054693c
+	SIOCBRDGADDS                      = 0x80546941
+	SIOCBRDGARL                       = 0x806e694d
+	SIOCBRDGDADDR                     = 0x81286947
+	SIOCBRDGDEL                       = 0x8054693d
+	SIOCBRDGDELS                      = 0x80546942
+	SIOCBRDGFLUSH                     = 0x80546948
+	SIOCBRDGFRL                       = 0x806e694e
+	SIOCBRDGGCACHE                    = 0xc0146941
+	SIOCBRDGGFD                       = 0xc0146952
+	SIOCBRDGGHT                       = 0xc0146951
+	SIOCBRDGGIFFLGS                   = 0xc054693e
+	SIOCBRDGGMA                       = 0xc0146953
+	SIOCBRDGGPARAM                    = 0xc03c6958
+	SIOCBRDGGPRI                      = 0xc0146950
+	SIOCBRDGGRL                       = 0xc028694f
+	SIOCBRDGGSIFS                     = 0xc054693c
+	SIOCBRDGGTO                       = 0xc0146946
+	SIOCBRDGIFS                       = 0xc0546942
+	SIOCBRDGRTS                       = 0xc0186943
+	SIOCBRDGSADDR                     = 0xc1286944
+	SIOCBRDGSCACHE                    = 0x80146940
+	SIOCBRDGSFD                       = 0x80146952
+	SIOCBRDGSHT                       = 0x80146951
+	SIOCBRDGSIFCOST                   = 0x80546955
+	SIOCBRDGSIFFLGS                   = 0x8054693f
+	SIOCBRDGSIFPRIO                   = 0x80546954
+	SIOCBRDGSMA                       = 0x80146953
+	SIOCBRDGSPRI                      = 0x80146950
+	SIOCBRDGSPROTO                    = 0x8014695a
+	SIOCBRDGSTO                       = 0x80146945
+	SIOCBRDGSTXHC                     = 0x80146959
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFGROUP                      = 0x80246989
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8218691e
+	SIOCGETKALIVE                     = 0xc01869a4
+	SIOCGETLABEL                      = 0x8020699a
+	SIOCGETPFLOW                      = 0xc02069fe
+	SIOCGETPFSYNC                     = 0xc02069f8
+	SIOCGETSGCNT                      = 0xc0147534
+	SIOCGETVIFCNT                     = 0xc0147533
+	SIOCGETVLAN                       = 0xc0206990
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCONF                       = 0xc0086924
+	SIOCGIFDATA                       = 0xc020691b
+	SIOCGIFDESCR                      = 0xc0206981
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGATTR                      = 0xc024698b
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc024698a
+	SIOCGIFGROUP                      = 0xc0246988
+	SIOCGIFHARDMTU                    = 0xc02069a5
+	SIOCGIFMEDIA                      = 0xc0286936
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc020697e
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPRIORITY                   = 0xc020699c
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFRDOMAIN                    = 0xc02069a0
+	SIOCGIFRTLABEL                    = 0xc0206983
+	SIOCGIFTIMESLOT                   = 0xc0206986
+	SIOCGIFXFLAGS                     = 0xc020699e
+	SIOCGLIFADDR                      = 0xc218691d
+	SIOCGLIFPHYADDR                   = 0xc218694b
+	SIOCGLIFPHYRTABLE                 = 0xc02069a2
+	SIOCGLIFPHYTTL                    = 0xc02069a9
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGSPPPPARAMS                   = 0xc0206994
+	SIOCGVH                           = 0xc02069f6
+	SIOCGVNETID                       = 0xc02069a7
+	SIOCIFCREATE                      = 0x8020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCSETKALIVE                     = 0x801869a3
+	SIOCSETLABEL                      = 0x80206999
+	SIOCSETPFLOW                      = 0x802069fd
+	SIOCSETPFSYNC                     = 0x802069f7
+	SIOCSETVLAN                       = 0x8020698f
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFDESCR                      = 0x80206980
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGATTR                      = 0x8024698c
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020691f
+	SIOCSIFMEDIA                      = 0xc0206935
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x8020697f
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPRIORITY                   = 0x8020699b
+	SIOCSIFRDOMAIN                    = 0x8020699f
+	SIOCSIFRTLABEL                    = 0x80206982
+	SIOCSIFTIMESLOT                   = 0x80206985
+	SIOCSIFXFLAGS                     = 0x8020699d
+	SIOCSLIFPHYADDR                   = 0x8218694a
+	SIOCSLIFPHYRTABLE                 = 0x802069a1
+	SIOCSLIFPHYTTL                    = 0x802069a8
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSSPPPPARAMS                   = 0x80206993
+	SIOCSVH                           = 0xc02069f5
+	SIOCSVNETID                       = 0x802069a6
+	SOCK_DGRAM                        = 0x2
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BINDANY                        = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NETPROC                        = 0x1020
+	SO_OOBINLINE                      = 0x100
+	SO_PEERCRED                       = 0x1022
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_RTABLE                         = 0x1021
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_SPLICE                         = 0x1023
+	SO_TIMESTAMP                      = 0x800
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x3
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x4
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOPUSH                        = 0x10
+	TCP_NSTATES                       = 0xb
+	TCP_SACK_ENABLE                   = 0x8
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_PPS                      = 0x10
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGPGRP                         = 0x40047477
+	TIOCGSID                          = 0x40047463
+	TIOCGTSTAMP                       = 0x400c745b
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x4004746a
+	TIOCMODS                          = 0x8004746d
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x8004745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSTSTAMP                       = 0x8008745a
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALTSIG                           = 0x4
+	WCONTINUED                        = 0x8
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x58)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x59)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EIPSEC          = syscall.Errno(0x52)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x5b)
+	ELOOP           = syscall.Errno(0x3e)
+	EMEDIUMTYPE     = syscall.Errno(0x56)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x53)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOMEDIUM       = syscall.Errno(0x55)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5a)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x5b)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x57)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:  "operation not permitted",
+	2:  "no such file or directory",
+	3:  "no such process",
+	4:  "interrupted system call",
+	5:  "input/output error",
+	6:  "device not configured",
+	7:  "argument list too long",
+	8:  "exec format error",
+	9:  "bad file descriptor",
+	10: "no child processes",
+	11: "resource deadlock avoided",
+	12: "cannot allocate memory",
+	13: "permission denied",
+	14: "bad address",
+	15: "block device required",
+	16: "device busy",
+	17: "file exists",
+	18: "cross-device link",
+	19: "operation not supported by device",
+	20: "not a directory",
+	21: "is a directory",
+	22: "invalid argument",
+	23: "too many open files in system",
+	24: "too many open files",
+	25: "inappropriate ioctl for device",
+	26: "text file busy",
+	27: "file too large",
+	28: "no space left on device",
+	29: "illegal seek",
+	30: "read-only file system",
+	31: "too many links",
+	32: "broken pipe",
+	33: "numerical argument out of domain",
+	34: "result too large",
+	35: "resource temporarily unavailable",
+	36: "operation now in progress",
+	37: "operation already in progress",
+	38: "socket operation on non-socket",
+	39: "destination address required",
+	40: "message too long",
+	41: "protocol wrong type for socket",
+	42: "protocol not available",
+	43: "protocol not supported",
+	44: "socket type not supported",
+	45: "operation not supported",
+	46: "protocol family not supported",
+	47: "address family not supported by protocol family",
+	48: "address already in use",
+	49: "can't assign requested address",
+	50: "network is down",
+	51: "network is unreachable",
+	52: "network dropped connection on reset",
+	53: "software caused connection abort",
+	54: "connection reset by peer",
+	55: "no buffer space available",
+	56: "socket is already connected",
+	57: "socket is not connected",
+	58: "can't send after socket shutdown",
+	59: "too many references: can't splice",
+	60: "connection timed out",
+	61: "connection refused",
+	62: "too many levels of symbolic links",
+	63: "file name too long",
+	64: "host is down",
+	65: "no route to host",
+	66: "directory not empty",
+	67: "too many processes",
+	68: "too many users",
+	69: "disc quota exceeded",
+	70: "stale NFS file handle",
+	71: "too many levels of remote in path",
+	72: "RPC struct is bad",
+	73: "RPC version wrong",
+	74: "RPC prog. not avail",
+	75: "program version wrong",
+	76: "bad procedure for program",
+	77: "no locks available",
+	78: "function not implemented",
+	79: "inappropriate file type or format",
+	80: "authentication error",
+	81: "need authenticator",
+	82: "IPsec processing failure",
+	83: "attribute not found",
+	84: "illegal byte sequence",
+	85: "no medium found",
+	86: "wrong medium type",
+	87: "value too large to be stored in data type",
+	88: "operation canceled",
+	89: "identifier removed",
+	90: "no message of desired type",
+	91: "not supported",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "stopped (signal)",
+	18: "stopped",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+	32: "thread AST",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
new file mode 100644
index 0000000000..1758ecca93
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
@@ -0,0 +1,1583 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,openbsd
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_BLUETOOTH                      = 0x20
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_ENCAP                          = 0x1c
+	AF_HYLINK                         = 0xf
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_KEY                            = 0x1e
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x24
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x1d
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDIRFILT                      = 0x4004427c
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc010427b
+	BIOCGETIF                         = 0x4020426b
+	BIOCGFILDROP                      = 0x40044278
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044273
+	BIOCGRTIMEOUT                     = 0x4010426e
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x20004276
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDIRFILT                      = 0x8004427d
+	BIOCSDLT                          = 0x8004427a
+	BIOCSETF                          = 0x80104267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x80104277
+	BIOCSFILDROP                      = 0x80044279
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044272
+	BIOCSRTIMEOUT                     = 0x8010426d
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIRECTION_IN                  = 0x1
+	BPF_DIRECTION_OUT                 = 0x2
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x200000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0xff
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DIOCOSFPFLUSH                     = 0x2000444e
+	DLT_ARCNET                        = 0x7
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AX25                          = 0x3
+	DLT_CHAOS                         = 0x5
+	DLT_C_HDLC                        = 0x68
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0xd
+	DLT_FDDI                          = 0xa
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_LOOP                          = 0xc
+	DLT_MPLS                          = 0xdb
+	DLT_NULL                          = 0x0
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PRONET                        = 0x4
+	DLT_RAW                           = 0xe
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMT_TAGOVF                        = 0x1
+	EMUL_ENABLED                      = 0x1
+	EMUL_NATIVE                       = 0x2
+	ENDRUNDISC                        = 0x9
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_AOE                     = 0x88a2
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LLDP                    = 0x88cc
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_QINQ                    = 0x88a8
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOW                    = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_ALIGN                       = 0x2
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_DIX_LEN                 = 0x600
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = -0x3
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = -0x7
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xa
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETOWN                          = 0x5
+	F_OK                              = 0x0
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8e52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BLUETOOTH                     = 0xf8
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf7
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DUMMY                         = 0xf1
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf3
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFLOW                         = 0xf9
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf2
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IN_RFC3021_HOST                   = 0x1
+	IN_RFC3021_NET                    = 0xfffffffe
+	IN_RFC3021_NSHIFT                 = 0x1f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DIVERT_INIT               = 0x2
+	IPPROTO_DIVERT_RESP               = 0x1
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x103
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MPLS                      = 0x89
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPV6_AUTH_LEVEL                   = 0x35
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_ESP_NETWORK_LEVEL            = 0x37
+	IPV6_ESP_TRANS_LEVEL              = 0x36
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPCOMP_LEVEL                 = 0x3c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_OPTIONS                      = 0x1
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PIPEX                        = 0x3f
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVDSTPORT                  = 0x40
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTABLE                       = 0x1021
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_AUTH_LEVEL                     = 0x14
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DIVERTFL                       = 0x1022
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_ESP_NETWORK_LEVEL              = 0x16
+	IP_ESP_TRANS_LEVEL                = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPCOMP_LEVEL                   = 0x1d
+	IP_IPSECFLOWINFO                  = 0x24
+	IP_IPSEC_LOCAL_AUTH               = 0x1b
+	IP_IPSEC_LOCAL_CRED               = 0x19
+	IP_IPSEC_LOCAL_ID                 = 0x17
+	IP_IPSEC_REMOTE_AUTH              = 0x1c
+	IP_IPSEC_REMOTE_CRED              = 0x1a
+	IP_IPSEC_REMOTE_ID                = 0x18
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x20
+	IP_MIN_MEMBERSHIPS                = 0xf
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PIPEX                          = 0x22
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVDSTPORT                    = 0x21
+	IP_RECVIF                         = 0x1e
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVRTABLE                     = 0x23
+	IP_RECVTTL                        = 0x1f
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RTABLE                         = 0x1021
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	LCNT_OVERLOAD_FLUSH               = 0x6
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ANON                          = 0x1000
+	MAP_COPY                          = 0x4
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_FLAGMASK                      = 0x1ff7
+	MAP_HASSEMAPHORE                  = 0x200
+	MAP_INHERIT                       = 0x80
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_DONATE_COPY           = 0x3
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_NOEXTEND                      = 0x100
+	MAP_NORESERVE                     = 0x40
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x20
+	MAP_SHARED                        = 0x1
+	MAP_TRYFIXED                      = 0x400
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_MCAST                         = 0x200
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x4
+	MS_SYNC                           = 0x2
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_MAXID                      = 0x6
+	NET_RT_STATS                      = 0x4
+	NET_RT_TABLE                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EOF                          = 0x2
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRUNCATE                     = 0x80
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x80
+	ONOCR                             = 0x40
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x10000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x20000
+	O_DSYNC                           = 0x80
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x80
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PF_FLUSH                          = 0x1
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_LABEL                        = 0xa
+	RTAX_MAX                          = 0xb
+	RTAX_NETMASK                      = 0x2
+	RTAX_SRC                          = 0x8
+	RTAX_SRCMASK                      = 0x9
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_LABEL                         = 0x400
+	RTA_NETMASK                       = 0x4
+	RTA_SRC                           = 0x100
+	RTA_SRCMASK                       = 0x200
+	RTF_ANNOUNCE                      = 0x4000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_CLONED                        = 0x10000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_FMASK                         = 0x10f808
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_MPATH                         = 0x40000
+	RTF_MPLS                          = 0x100000
+	RTF_PERMANENT_ARP                 = 0x2000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x2000
+	RTF_REJECT                        = 0x8
+	RTF_SOURCE                        = 0x20000
+	RTF_STATIC                        = 0x800
+	RTF_TUNNEL                        = 0x100000
+	RTF_UP                            = 0x1
+	RTF_USETRAILERS                   = 0x8000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DESYNC                        = 0x10
+	RTM_GET                           = 0x4
+	RTM_IFANNOUNCE                    = 0xf
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MAXSIZE                       = 0x800
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RT_TABLEID_MAX                    = 0xff
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	RUSAGE_THREAD                     = 0x1
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCAIFGROUP                      = 0x80286987
+	SIOCALIFADDR                      = 0x8218691c
+	SIOCATMARK                        = 0x40047307
+	SIOCBRDGADD                       = 0x8058693c
+	SIOCBRDGADDS                      = 0x80586941
+	SIOCBRDGARL                       = 0x806e694d
+	SIOCBRDGDADDR                     = 0x81286947
+	SIOCBRDGDEL                       = 0x8058693d
+	SIOCBRDGDELS                      = 0x80586942
+	SIOCBRDGFLUSH                     = 0x80586948
+	SIOCBRDGFRL                       = 0x806e694e
+	SIOCBRDGGCACHE                    = 0xc0146941
+	SIOCBRDGGFD                       = 0xc0146952
+	SIOCBRDGGHT                       = 0xc0146951
+	SIOCBRDGGIFFLGS                   = 0xc058693e
+	SIOCBRDGGMA                       = 0xc0146953
+	SIOCBRDGGPARAM                    = 0xc0406958
+	SIOCBRDGGPRI                      = 0xc0146950
+	SIOCBRDGGRL                       = 0xc030694f
+	SIOCBRDGGSIFS                     = 0xc058693c
+	SIOCBRDGGTO                       = 0xc0146946
+	SIOCBRDGIFS                       = 0xc0586942
+	SIOCBRDGRTS                       = 0xc0206943
+	SIOCBRDGSADDR                     = 0xc1286944
+	SIOCBRDGSCACHE                    = 0x80146940
+	SIOCBRDGSFD                       = 0x80146952
+	SIOCBRDGSHT                       = 0x80146951
+	SIOCBRDGSIFCOST                   = 0x80586955
+	SIOCBRDGSIFFLGS                   = 0x8058693f
+	SIOCBRDGSIFPRIO                   = 0x80586954
+	SIOCBRDGSMA                       = 0x80146953
+	SIOCBRDGSPRI                      = 0x80146950
+	SIOCBRDGSPROTO                    = 0x8014695a
+	SIOCBRDGSTO                       = 0x80146945
+	SIOCBRDGSTXHC                     = 0x80146959
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFGROUP                      = 0x80286989
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8218691e
+	SIOCGETKALIVE                     = 0xc01869a4
+	SIOCGETLABEL                      = 0x8020699a
+	SIOCGETPFLOW                      = 0xc02069fe
+	SIOCGETPFSYNC                     = 0xc02069f8
+	SIOCGETSGCNT                      = 0xc0207534
+	SIOCGETVIFCNT                     = 0xc0287533
+	SIOCGETVLAN                       = 0xc0206990
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCONF                       = 0xc0106924
+	SIOCGIFDATA                       = 0xc020691b
+	SIOCGIFDESCR                      = 0xc0206981
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGATTR                      = 0xc028698b
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc028698a
+	SIOCGIFGROUP                      = 0xc0286988
+	SIOCGIFHARDMTU                    = 0xc02069a5
+	SIOCGIFMEDIA                      = 0xc0306936
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc020697e
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPRIORITY                   = 0xc020699c
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFRDOMAIN                    = 0xc02069a0
+	SIOCGIFRTLABEL                    = 0xc0206983
+	SIOCGIFTIMESLOT                   = 0xc0206986
+	SIOCGIFXFLAGS                     = 0xc020699e
+	SIOCGLIFADDR                      = 0xc218691d
+	SIOCGLIFPHYADDR                   = 0xc218694b
+	SIOCGLIFPHYRTABLE                 = 0xc02069a2
+	SIOCGLIFPHYTTL                    = 0xc02069a9
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGSPPPPARAMS                   = 0xc0206994
+	SIOCGVH                           = 0xc02069f6
+	SIOCGVNETID                       = 0xc02069a7
+	SIOCIFCREATE                      = 0x8020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc0106978
+	SIOCSETKALIVE                     = 0x801869a3
+	SIOCSETLABEL                      = 0x80206999
+	SIOCSETPFLOW                      = 0x802069fd
+	SIOCSETPFSYNC                     = 0x802069f7
+	SIOCSETVLAN                       = 0x8020698f
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFDESCR                      = 0x80206980
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGATTR                      = 0x8028698c
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020691f
+	SIOCSIFMEDIA                      = 0xc0206935
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x8020697f
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPRIORITY                   = 0x8020699b
+	SIOCSIFRDOMAIN                    = 0x8020699f
+	SIOCSIFRTLABEL                    = 0x80206982
+	SIOCSIFTIMESLOT                   = 0x80206985
+	SIOCSIFXFLAGS                     = 0x8020699d
+	SIOCSLIFPHYADDR                   = 0x8218694a
+	SIOCSLIFPHYRTABLE                 = 0x802069a1
+	SIOCSLIFPHYTTL                    = 0x802069a8
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSSPPPPARAMS                   = 0x80206993
+	SIOCSVH                           = 0xc02069f5
+	SIOCSVNETID                       = 0x802069a6
+	SOCK_DGRAM                        = 0x2
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BINDANY                        = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NETPROC                        = 0x1020
+	SO_OOBINLINE                      = 0x100
+	SO_PEERCRED                       = 0x1022
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_RTABLE                         = 0x1021
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_SPLICE                         = 0x1023
+	SO_TIMESTAMP                      = 0x800
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x3
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x4
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOPUSH                        = 0x10
+	TCP_NSTATES                       = 0xb
+	TCP_SACK_ENABLE                   = 0x8
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_PPS                      = 0x10
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGPGRP                         = 0x40047477
+	TIOCGSID                          = 0x40047463
+	TIOCGTSTAMP                       = 0x4010745b
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x4004746a
+	TIOCMODS                          = 0x8004746d
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x8004745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSTSTAMP                       = 0x8008745a
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALTSIG                           = 0x4
+	WCONTINUED                        = 0x8
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WSTOPPED                          = 0x7f
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x58)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x59)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EIPSEC          = syscall.Errno(0x52)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x5b)
+	ELOOP           = syscall.Errno(0x3e)
+	EMEDIUMTYPE     = syscall.Errno(0x56)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x53)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOMEDIUM       = syscall.Errno(0x55)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5a)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x5b)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x57)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errors = [...]string{
+	1:  "operation not permitted",
+	2:  "no such file or directory",
+	3:  "no such process",
+	4:  "interrupted system call",
+	5:  "input/output error",
+	6:  "device not configured",
+	7:  "argument list too long",
+	8:  "exec format error",
+	9:  "bad file descriptor",
+	10: "no child processes",
+	11: "resource deadlock avoided",
+	12: "cannot allocate memory",
+	13: "permission denied",
+	14: "bad address",
+	15: "block device required",
+	16: "device busy",
+	17: "file exists",
+	18: "cross-device link",
+	19: "operation not supported by device",
+	20: "not a directory",
+	21: "is a directory",
+	22: "invalid argument",
+	23: "too many open files in system",
+	24: "too many open files",
+	25: "inappropriate ioctl for device",
+	26: "text file busy",
+	27: "file too large",
+	28: "no space left on device",
+	29: "illegal seek",
+	30: "read-only file system",
+	31: "too many links",
+	32: "broken pipe",
+	33: "numerical argument out of domain",
+	34: "result too large",
+	35: "resource temporarily unavailable",
+	36: "operation now in progress",
+	37: "operation already in progress",
+	38: "socket operation on non-socket",
+	39: "destination address required",
+	40: "message too long",
+	41: "protocol wrong type for socket",
+	42: "protocol not available",
+	43: "protocol not supported",
+	44: "socket type not supported",
+	45: "operation not supported",
+	46: "protocol family not supported",
+	47: "address family not supported by protocol family",
+	48: "address already in use",
+	49: "can't assign requested address",
+	50: "network is down",
+	51: "network is unreachable",
+	52: "network dropped connection on reset",
+	53: "software caused connection abort",
+	54: "connection reset by peer",
+	55: "no buffer space available",
+	56: "socket is already connected",
+	57: "socket is not connected",
+	58: "can't send after socket shutdown",
+	59: "too many references: can't splice",
+	60: "connection timed out",
+	61: "connection refused",
+	62: "too many levels of symbolic links",
+	63: "file name too long",
+	64: "host is down",
+	65: "no route to host",
+	66: "directory not empty",
+	67: "too many processes",
+	68: "too many users",
+	69: "disc quota exceeded",
+	70: "stale NFS file handle",
+	71: "too many levels of remote in path",
+	72: "RPC struct is bad",
+	73: "RPC version wrong",
+	74: "RPC prog. not avail",
+	75: "program version wrong",
+	76: "bad procedure for program",
+	77: "no locks available",
+	78: "function not implemented",
+	79: "inappropriate file type or format",
+	80: "authentication error",
+	81: "need authenticator",
+	82: "IPsec processing failure",
+	83: "attribute not found",
+	84: "illegal byte sequence",
+	85: "no medium found",
+	86: "wrong medium type",
+	87: "value too large to be stored in data type",
+	88: "operation canceled",
+	89: "identifier removed",
+	90: "no message of desired type",
+	91: "not supported",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/BPT trap",
+	6:  "abort trap",
+	7:  "EMT trap",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "bus error",
+	11: "segmentation fault",
+	12: "bad system call",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+	16: "urgent I/O condition",
+	17: "stopped (signal)",
+	18: "stopped",
+	19: "continued",
+	20: "child exited",
+	21: "stopped (tty input)",
+	22: "stopped (tty output)",
+	23: "I/O possible",
+	24: "cputime limit exceeded",
+	25: "filesize limit exceeded",
+	26: "virtual timer expired",
+	27: "profiling timer expired",
+	28: "window size changes",
+	29: "information request",
+	30: "user defined signal 1",
+	31: "user defined signal 2",
+	32: "thread AST",
+}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
new file mode 100644
index 0000000000..a08922b981
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
@@ -0,0 +1,1436 @@
+// mkerrors.sh -m64
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,solaris
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -m64 _const.go
+
+package unix
+
+import "syscall"
+
+const (
+	AF_802                        = 0x12
+	AF_APPLETALK                  = 0x10
+	AF_CCITT                      = 0xa
+	AF_CHAOS                      = 0x5
+	AF_DATAKIT                    = 0x9
+	AF_DECnet                     = 0xc
+	AF_DLI                        = 0xd
+	AF_ECMA                       = 0x8
+	AF_FILE                       = 0x1
+	AF_GOSIP                      = 0x16
+	AF_HYLINK                     = 0xf
+	AF_IMPLINK                    = 0x3
+	AF_INET                       = 0x2
+	AF_INET6                      = 0x1a
+	AF_INET_OFFLOAD               = 0x1e
+	AF_IPX                        = 0x17
+	AF_KEY                        = 0x1b
+	AF_LAT                        = 0xe
+	AF_LINK                       = 0x19
+	AF_LOCAL                      = 0x1
+	AF_MAX                        = 0x20
+	AF_NBS                        = 0x7
+	AF_NCA                        = 0x1c
+	AF_NIT                        = 0x11
+	AF_NS                         = 0x6
+	AF_OSI                        = 0x13
+	AF_OSINET                     = 0x15
+	AF_PACKET                     = 0x20
+	AF_POLICY                     = 0x1d
+	AF_PUP                        = 0x4
+	AF_ROUTE                      = 0x18
+	AF_SNA                        = 0xb
+	AF_TRILL                      = 0x1f
+	AF_UNIX                       = 0x1
+	AF_UNSPEC                     = 0x0
+	AF_X25                        = 0x14
+	ARPHRD_ARCNET                 = 0x7
+	ARPHRD_ATM                    = 0x10
+	ARPHRD_AX25                   = 0x3
+	ARPHRD_CHAOS                  = 0x5
+	ARPHRD_EETHER                 = 0x2
+	ARPHRD_ETHER                  = 0x1
+	ARPHRD_FC                     = 0x12
+	ARPHRD_FRAME                  = 0xf
+	ARPHRD_HDLC                   = 0x11
+	ARPHRD_IB                     = 0x20
+	ARPHRD_IEEE802                = 0x6
+	ARPHRD_IPATM                  = 0x13
+	ARPHRD_METRICOM               = 0x17
+	ARPHRD_TUNNEL                 = 0x1f
+	B0                            = 0x0
+	B110                          = 0x3
+	B115200                       = 0x12
+	B1200                         = 0x9
+	B134                          = 0x4
+	B150                          = 0x5
+	B153600                       = 0x13
+	B1800                         = 0xa
+	B19200                        = 0xe
+	B200                          = 0x6
+	B230400                       = 0x14
+	B2400                         = 0xb
+	B300                          = 0x7
+	B307200                       = 0x15
+	B38400                        = 0xf
+	B460800                       = 0x16
+	B4800                         = 0xc
+	B50                           = 0x1
+	B57600                        = 0x10
+	B600                          = 0x8
+	B75                           = 0x2
+	B76800                        = 0x11
+	B921600                       = 0x17
+	B9600                         = 0xd
+	BIOCFLUSH                     = 0x20004268
+	BIOCGBLEN                     = 0x40044266
+	BIOCGDLT                      = 0x4004426a
+	BIOCGDLTLIST                  = -0x3fefbd89
+	BIOCGDLTLIST32                = -0x3ff7bd89
+	BIOCGETIF                     = 0x4020426b
+	BIOCGETLIF                    = 0x4078426b
+	BIOCGHDRCMPLT                 = 0x40044274
+	BIOCGRTIMEOUT                 = 0x4010427b
+	BIOCGRTIMEOUT32               = 0x4008427b
+	BIOCGSEESENT                  = 0x40044278
+	BIOCGSTATS                    = 0x4080426f
+	BIOCGSTATSOLD                 = 0x4008426f
+	BIOCIMMEDIATE                 = -0x7ffbbd90
+	BIOCPROMISC                   = 0x20004269
+	BIOCSBLEN                     = -0x3ffbbd9a
+	BIOCSDLT                      = -0x7ffbbd8a
+	BIOCSETF                      = -0x7fefbd99
+	BIOCSETF32                    = -0x7ff7bd99
+	BIOCSETIF                     = -0x7fdfbd94
+	BIOCSETLIF                    = -0x7f87bd94
+	BIOCSHDRCMPLT                 = -0x7ffbbd8b
+	BIOCSRTIMEOUT                 = -0x7fefbd86
+	BIOCSRTIMEOUT32               = -0x7ff7bd86
+	BIOCSSEESENT                  = -0x7ffbbd87
+	BIOCSTCPF                     = -0x7fefbd8e
+	BIOCSUDPF                     = -0x7fefbd8d
+	BIOCVERSION                   = 0x40044271
+	BPF_A                         = 0x10
+	BPF_ABS                       = 0x20
+	BPF_ADD                       = 0x0
+	BPF_ALIGNMENT                 = 0x4
+	BPF_ALU                       = 0x4
+	BPF_AND                       = 0x50
+	BPF_B                         = 0x10
+	BPF_DFLTBUFSIZE               = 0x100000
+	BPF_DIV                       = 0x30
+	BPF_H                         = 0x8
+	BPF_IMM                       = 0x0
+	BPF_IND                       = 0x40
+	BPF_JA                        = 0x0
+	BPF_JEQ                       = 0x10
+	BPF_JGE                       = 0x30
+	BPF_JGT                       = 0x20
+	BPF_JMP                       = 0x5
+	BPF_JSET                      = 0x40
+	BPF_K                         = 0x0
+	BPF_LD                        = 0x0
+	BPF_LDX                       = 0x1
+	BPF_LEN                       = 0x80
+	BPF_LSH                       = 0x60
+	BPF_MAJOR_VERSION             = 0x1
+	BPF_MAXBUFSIZE                = 0x1000000
+	BPF_MAXINSNS                  = 0x200
+	BPF_MEM                       = 0x60
+	BPF_MEMWORDS                  = 0x10
+	BPF_MINBUFSIZE                = 0x20
+	BPF_MINOR_VERSION             = 0x1
+	BPF_MISC                      = 0x7
+	BPF_MSH                       = 0xa0
+	BPF_MUL                       = 0x20
+	BPF_NEG                       = 0x80
+	BPF_OR                        = 0x40
+	BPF_RELEASE                   = 0x30bb6
+	BPF_RET                       = 0x6
+	BPF_RSH                       = 0x70
+	BPF_ST                        = 0x2
+	BPF_STX                       = 0x3
+	BPF_SUB                       = 0x10
+	BPF_TAX                       = 0x0
+	BPF_TXA                       = 0x80
+	BPF_W                         = 0x0
+	BPF_X                         = 0x8
+	BRKINT                        = 0x2
+	CFLUSH                        = 0xf
+	CLOCAL                        = 0x800
+	CLOCK_HIGHRES                 = 0x4
+	CLOCK_LEVEL                   = 0xa
+	CLOCK_MONOTONIC               = 0x4
+	CLOCK_PROCESS_CPUTIME_ID      = 0x5
+	CLOCK_PROF                    = 0x2
+	CLOCK_REALTIME                = 0x3
+	CLOCK_THREAD_CPUTIME_ID       = 0x2
+	CLOCK_VIRTUAL                 = 0x1
+	CREAD                         = 0x80
+	CS5                           = 0x0
+	CS6                           = 0x10
+	CS7                           = 0x20
+	CS8                           = 0x30
+	CSIZE                         = 0x30
+	CSTART                        = 0x11
+	CSTATUS                       = 0x14
+	CSTOP                         = 0x13
+	CSTOPB                        = 0x40
+	CSUSP                         = 0x1a
+	CSWTCH                        = 0x1a
+	DLT_AIRONET_HEADER            = 0x78
+	DLT_APPLE_IP_OVER_IEEE1394    = 0x8a
+	DLT_ARCNET                    = 0x7
+	DLT_ARCNET_LINUX              = 0x81
+	DLT_ATM_CLIP                  = 0x13
+	DLT_ATM_RFC1483               = 0xb
+	DLT_AURORA                    = 0x7e
+	DLT_AX25                      = 0x3
+	DLT_BACNET_MS_TP              = 0xa5
+	DLT_CHAOS                     = 0x5
+	DLT_CISCO_IOS                 = 0x76
+	DLT_C_HDLC                    = 0x68
+	DLT_DOCSIS                    = 0x8f
+	DLT_ECONET                    = 0x73
+	DLT_EN10MB                    = 0x1
+	DLT_EN3MB                     = 0x2
+	DLT_ENC                       = 0x6d
+	DLT_ERF_ETH                   = 0xaf
+	DLT_ERF_POS                   = 0xb0
+	DLT_FDDI                      = 0xa
+	DLT_FRELAY                    = 0x6b
+	DLT_GCOM_SERIAL               = 0xad
+	DLT_GCOM_T1E1                 = 0xac
+	DLT_GPF_F                     = 0xab
+	DLT_GPF_T                     = 0xaa
+	DLT_GPRS_LLC                  = 0xa9
+	DLT_HDLC                      = 0x10
+	DLT_HHDLC                     = 0x79
+	DLT_HIPPI                     = 0xf
+	DLT_IBM_SN                    = 0x92
+	DLT_IBM_SP                    = 0x91
+	DLT_IEEE802                   = 0x6
+	DLT_IEEE802_11                = 0x69
+	DLT_IEEE802_11_RADIO          = 0x7f
+	DLT_IEEE802_11_RADIO_AVS      = 0xa3
+	DLT_IPNET                     = 0xe2
+	DLT_IPOIB                     = 0xa2
+	DLT_IP_OVER_FC                = 0x7a
+	DLT_JUNIPER_ATM1              = 0x89
+	DLT_JUNIPER_ATM2              = 0x87
+	DLT_JUNIPER_CHDLC             = 0xb5
+	DLT_JUNIPER_ES                = 0x84
+	DLT_JUNIPER_ETHER             = 0xb2
+	DLT_JUNIPER_FRELAY            = 0xb4
+	DLT_JUNIPER_GGSN              = 0x85
+	DLT_JUNIPER_MFR               = 0x86
+	DLT_JUNIPER_MLFR              = 0x83
+	DLT_JUNIPER_MLPPP             = 0x82
+	DLT_JUNIPER_MONITOR           = 0xa4
+	DLT_JUNIPER_PIC_PEER          = 0xae
+	DLT_JUNIPER_PPP               = 0xb3
+	DLT_JUNIPER_PPPOE             = 0xa7
+	DLT_JUNIPER_PPPOE_ATM         = 0xa8
+	DLT_JUNIPER_SERVICES          = 0x88
+	DLT_LINUX_IRDA                = 0x90
+	DLT_LINUX_LAPD                = 0xb1
+	DLT_LINUX_SLL                 = 0x71
+	DLT_LOOP                      = 0x6c
+	DLT_LTALK                     = 0x72
+	DLT_MTP2                      = 0x8c
+	DLT_MTP2_WITH_PHDR            = 0x8b
+	DLT_MTP3                      = 0x8d
+	DLT_NULL                      = 0x0
+	DLT_PCI_EXP                   = 0x7d
+	DLT_PFLOG                     = 0x75
+	DLT_PFSYNC                    = 0x12
+	DLT_PPP                       = 0x9
+	DLT_PPP_BSDOS                 = 0xe
+	DLT_PPP_PPPD                  = 0xa6
+	DLT_PRISM_HEADER              = 0x77
+	DLT_PRONET                    = 0x4
+	DLT_RAW                       = 0xc
+	DLT_RAWAF_MASK                = 0x2240000
+	DLT_RIO                       = 0x7c
+	DLT_SCCP                      = 0x8e
+	DLT_SLIP                      = 0x8
+	DLT_SLIP_BSDOS                = 0xd
+	DLT_SUNATM                    = 0x7b
+	DLT_SYMANTEC_FIREWALL         = 0x63
+	DLT_TZSP                      = 0x80
+	ECHO                          = 0x8
+	ECHOCTL                       = 0x200
+	ECHOE                         = 0x10
+	ECHOK                         = 0x20
+	ECHOKE                        = 0x800
+	ECHONL                        = 0x40
+	ECHOPRT                       = 0x400
+	EMPTY_SET                     = 0x0
+	EMT_CPCOVF                    = 0x1
+	EQUALITY_CHECK                = 0x0
+	EXTA                          = 0xe
+	EXTB                          = 0xf
+	FD_CLOEXEC                    = 0x1
+	FD_NFDBITS                    = 0x40
+	FD_SETSIZE                    = 0x10000
+	FLUSHALL                      = 0x1
+	FLUSHDATA                     = 0x0
+	FLUSHO                        = 0x2000
+	F_ALLOCSP                     = 0xa
+	F_ALLOCSP64                   = 0xa
+	F_BADFD                       = 0x2e
+	F_BLKSIZE                     = 0x13
+	F_BLOCKS                      = 0x12
+	F_CHKFL                       = 0x8
+	F_COMPAT                      = 0x8
+	F_DUP2FD                      = 0x9
+	F_DUP2FD_CLOEXEC              = 0x24
+	F_DUPFD                       = 0x0
+	F_DUPFD_CLOEXEC               = 0x25
+	F_FREESP                      = 0xb
+	F_FREESP64                    = 0xb
+	F_GETFD                       = 0x1
+	F_GETFL                       = 0x3
+	F_GETLK                       = 0xe
+	F_GETLK64                     = 0xe
+	F_GETOWN                      = 0x17
+	F_GETXFL                      = 0x2d
+	F_HASREMOTELOCKS              = 0x1a
+	F_ISSTREAM                    = 0xd
+	F_MANDDNY                     = 0x10
+	F_MDACC                       = 0x20
+	F_NODNY                       = 0x0
+	F_NPRIV                       = 0x10
+	F_PRIV                        = 0xf
+	F_QUOTACTL                    = 0x11
+	F_RDACC                       = 0x1
+	F_RDDNY                       = 0x1
+	F_RDLCK                       = 0x1
+	F_REVOKE                      = 0x19
+	F_RMACC                       = 0x4
+	F_RMDNY                       = 0x4
+	F_RWACC                       = 0x3
+	F_RWDNY                       = 0x3
+	F_SETFD                       = 0x2
+	F_SETFL                       = 0x4
+	F_SETLK                       = 0x6
+	F_SETLK64                     = 0x6
+	F_SETLK64_NBMAND              = 0x2a
+	F_SETLKW                      = 0x7
+	F_SETLKW64                    = 0x7
+	F_SETLK_NBMAND                = 0x2a
+	F_SETOWN                      = 0x18
+	F_SHARE                       = 0x28
+	F_SHARE_NBMAND                = 0x2b
+	F_UNLCK                       = 0x3
+	F_UNLKSYS                     = 0x4
+	F_UNSHARE                     = 0x29
+	F_WRACC                       = 0x2
+	F_WRDNY                       = 0x2
+	F_WRLCK                       = 0x2
+	HUPCL                         = 0x400
+	ICANON                        = 0x2
+	ICRNL                         = 0x100
+	IEXTEN                        = 0x8000
+	IFF_ADDRCONF                  = 0x80000
+	IFF_ALLMULTI                  = 0x200
+	IFF_ANYCAST                   = 0x400000
+	IFF_BROADCAST                 = 0x2
+	IFF_CANTCHANGE                = 0x7f203003b5a
+	IFF_COS_ENABLED               = 0x200000000
+	IFF_DEBUG                     = 0x4
+	IFF_DEPRECATED                = 0x40000
+	IFF_DHCPRUNNING               = 0x4000
+	IFF_DUPLICATE                 = 0x4000000000
+	IFF_FAILED                    = 0x10000000
+	IFF_FIXEDMTU                  = 0x1000000000
+	IFF_INACTIVE                  = 0x40000000
+	IFF_INTELLIGENT               = 0x400
+	IFF_IPMP                      = 0x8000000000
+	IFF_IPMP_CANTCHANGE           = 0x10000000
+	IFF_IPMP_INVALID              = 0x1ec200080
+	IFF_IPV4                      = 0x1000000
+	IFF_IPV6                      = 0x2000000
+	IFF_L3PROTECT                 = 0x40000000000
+	IFF_LOOPBACK                  = 0x8
+	IFF_MULTICAST                 = 0x800
+	IFF_MULTI_BCAST               = 0x1000
+	IFF_NOACCEPT                  = 0x4000000
+	IFF_NOARP                     = 0x80
+	IFF_NOFAILOVER                = 0x8000000
+	IFF_NOLINKLOCAL               = 0x20000000000
+	IFF_NOLOCAL                   = 0x20000
+	IFF_NONUD                     = 0x200000
+	IFF_NORTEXCH                  = 0x800000
+	IFF_NOTRAILERS                = 0x20
+	IFF_NOXMIT                    = 0x10000
+	IFF_OFFLINE                   = 0x80000000
+	IFF_POINTOPOINT               = 0x10
+	IFF_PREFERRED                 = 0x400000000
+	IFF_PRIVATE                   = 0x8000
+	IFF_PROMISC                   = 0x100
+	IFF_ROUTER                    = 0x100000
+	IFF_RUNNING                   = 0x40
+	IFF_STANDBY                   = 0x20000000
+	IFF_TEMPORARY                 = 0x800000000
+	IFF_UNNUMBERED                = 0x2000
+	IFF_UP                        = 0x1
+	IFF_VIRTUAL                   = 0x2000000000
+	IFF_VRRP                      = 0x10000000000
+	IFF_XRESOLV                   = 0x100000000
+	IFNAMSIZ                      = 0x10
+	IFT_1822                      = 0x2
+	IFT_6TO4                      = 0xca
+	IFT_AAL5                      = 0x31
+	IFT_ARCNET                    = 0x23
+	IFT_ARCNETPLUS                = 0x24
+	IFT_ATM                       = 0x25
+	IFT_CEPT                      = 0x13
+	IFT_DS3                       = 0x1e
+	IFT_EON                       = 0x19
+	IFT_ETHER                     = 0x6
+	IFT_FDDI                      = 0xf
+	IFT_FRELAY                    = 0x20
+	IFT_FRELAYDCE                 = 0x2c
+	IFT_HDH1822                   = 0x3
+	IFT_HIPPI                     = 0x2f
+	IFT_HSSI                      = 0x2e
+	IFT_HY                        = 0xe
+	IFT_IB                        = 0xc7
+	IFT_IPV4                      = 0xc8
+	IFT_IPV6                      = 0xc9
+	IFT_ISDNBASIC                 = 0x14
+	IFT_ISDNPRIMARY               = 0x15
+	IFT_ISO88022LLC               = 0x29
+	IFT_ISO88023                  = 0x7
+	IFT_ISO88024                  = 0x8
+	IFT_ISO88025                  = 0x9
+	IFT_ISO88026                  = 0xa
+	IFT_LAPB                      = 0x10
+	IFT_LOCALTALK                 = 0x2a
+	IFT_LOOP                      = 0x18
+	IFT_MIOX25                    = 0x26
+	IFT_MODEM                     = 0x30
+	IFT_NSIP                      = 0x1b
+	IFT_OTHER                     = 0x1
+	IFT_P10                       = 0xc
+	IFT_P80                       = 0xd
+	IFT_PARA                      = 0x22
+	IFT_PPP                       = 0x17
+	IFT_PROPMUX                   = 0x36
+	IFT_PROPVIRTUAL               = 0x35
+	IFT_PTPSERIAL                 = 0x16
+	IFT_RS232                     = 0x21
+	IFT_SDLC                      = 0x11
+	IFT_SIP                       = 0x1f
+	IFT_SLIP                      = 0x1c
+	IFT_SMDSDXI                   = 0x2b
+	IFT_SMDSICIP                  = 0x34
+	IFT_SONET                     = 0x27
+	IFT_SONETPATH                 = 0x32
+	IFT_SONETVT                   = 0x33
+	IFT_STARLAN                   = 0xb
+	IFT_T1                        = 0x12
+	IFT_ULTRA                     = 0x1d
+	IFT_V35                       = 0x2d
+	IFT_X25                       = 0x5
+	IFT_X25DDN                    = 0x4
+	IFT_X25PLE                    = 0x28
+	IFT_XETHER                    = 0x1a
+	IGNBRK                        = 0x1
+	IGNCR                         = 0x80
+	IGNPAR                        = 0x4
+	IMAXBEL                       = 0x2000
+	INLCR                         = 0x40
+	INPCK                         = 0x10
+	IN_AUTOCONF_MASK              = 0xffff0000
+	IN_AUTOCONF_NET               = 0xa9fe0000
+	IN_CLASSA_HOST                = 0xffffff
+	IN_CLASSA_MAX                 = 0x80
+	IN_CLASSA_NET                 = 0xff000000
+	IN_CLASSA_NSHIFT              = 0x18
+	IN_CLASSB_HOST                = 0xffff
+	IN_CLASSB_MAX                 = 0x10000
+	IN_CLASSB_NET                 = 0xffff0000
+	IN_CLASSB_NSHIFT              = 0x10
+	IN_CLASSC_HOST                = 0xff
+	IN_CLASSC_NET                 = 0xffffff00
+	IN_CLASSC_NSHIFT              = 0x8
+	IN_CLASSD_HOST                = 0xfffffff
+	IN_CLASSD_NET                 = 0xf0000000
+	IN_CLASSD_NSHIFT              = 0x1c
+	IN_CLASSE_NET                 = 0xffffffff
+	IN_LOOPBACKNET                = 0x7f
+	IN_PRIVATE12_MASK             = 0xfff00000
+	IN_PRIVATE12_NET              = 0xac100000
+	IN_PRIVATE16_MASK             = 0xffff0000
+	IN_PRIVATE16_NET              = 0xc0a80000
+	IN_PRIVATE8_MASK              = 0xff000000
+	IN_PRIVATE8_NET               = 0xa000000
+	IPPROTO_AH                    = 0x33
+	IPPROTO_DSTOPTS               = 0x3c
+	IPPROTO_EGP                   = 0x8
+	IPPROTO_ENCAP                 = 0x4
+	IPPROTO_EON                   = 0x50
+	IPPROTO_ESP                   = 0x32
+	IPPROTO_FRAGMENT              = 0x2c
+	IPPROTO_GGP                   = 0x3
+	IPPROTO_HELLO                 = 0x3f
+	IPPROTO_HOPOPTS               = 0x0
+	IPPROTO_ICMP                  = 0x1
+	IPPROTO_ICMPV6                = 0x3a
+	IPPROTO_IDP                   = 0x16
+	IPPROTO_IGMP                  = 0x2
+	IPPROTO_IP                    = 0x0
+	IPPROTO_IPV6                  = 0x29
+	IPPROTO_MAX                   = 0x100
+	IPPROTO_ND                    = 0x4d
+	IPPROTO_NONE                  = 0x3b
+	IPPROTO_OSPF                  = 0x59
+	IPPROTO_PIM                   = 0x67
+	IPPROTO_PUP                   = 0xc
+	IPPROTO_RAW                   = 0xff
+	IPPROTO_ROUTING               = 0x2b
+	IPPROTO_RSVP                  = 0x2e
+	IPPROTO_SCTP                  = 0x84
+	IPPROTO_TCP                   = 0x6
+	IPPROTO_UDP                   = 0x11
+	IPV6_ADD_MEMBERSHIP           = 0x9
+	IPV6_BOUND_IF                 = 0x41
+	IPV6_CHECKSUM                 = 0x18
+	IPV6_DONTFRAG                 = 0x21
+	IPV6_DROP_MEMBERSHIP          = 0xa
+	IPV6_DSTOPTS                  = 0xf
+	IPV6_FLOWINFO_FLOWLABEL       = 0xffff0f00
+	IPV6_FLOWINFO_TCLASS          = 0xf00f
+	IPV6_HOPLIMIT                 = 0xc
+	IPV6_HOPOPTS                  = 0xe
+	IPV6_JOIN_GROUP               = 0x9
+	IPV6_LEAVE_GROUP              = 0xa
+	IPV6_MULTICAST_HOPS           = 0x7
+	IPV6_MULTICAST_IF             = 0x6
+	IPV6_MULTICAST_LOOP           = 0x8
+	IPV6_NEXTHOP                  = 0xd
+	IPV6_PAD1_OPT                 = 0x0
+	IPV6_PATHMTU                  = 0x25
+	IPV6_PKTINFO                  = 0xb
+	IPV6_PREFER_SRC_CGA           = 0x20
+	IPV6_PREFER_SRC_CGADEFAULT    = 0x10
+	IPV6_PREFER_SRC_CGAMASK       = 0x30
+	IPV6_PREFER_SRC_COA           = 0x2
+	IPV6_PREFER_SRC_DEFAULT       = 0x15
+	IPV6_PREFER_SRC_HOME          = 0x1
+	IPV6_PREFER_SRC_MASK          = 0x3f
+	IPV6_PREFER_SRC_MIPDEFAULT    = 0x1
+	IPV6_PREFER_SRC_MIPMASK       = 0x3
+	IPV6_PREFER_SRC_NONCGA        = 0x10
+	IPV6_PREFER_SRC_PUBLIC        = 0x4
+	IPV6_PREFER_SRC_TMP           = 0x8
+	IPV6_PREFER_SRC_TMPDEFAULT    = 0x4
+	IPV6_PREFER_SRC_TMPMASK       = 0xc
+	IPV6_RECVDSTOPTS              = 0x28
+	IPV6_RECVHOPLIMIT             = 0x13
+	IPV6_RECVHOPOPTS              = 0x14
+	IPV6_RECVPATHMTU              = 0x24
+	IPV6_RECVPKTINFO              = 0x12
+	IPV6_RECVRTHDR                = 0x16
+	IPV6_RECVRTHDRDSTOPTS         = 0x17
+	IPV6_RECVTCLASS               = 0x19
+	IPV6_RTHDR                    = 0x10
+	IPV6_RTHDRDSTOPTS             = 0x11
+	IPV6_RTHDR_TYPE_0             = 0x0
+	IPV6_SEC_OPT                  = 0x22
+	IPV6_SRC_PREFERENCES          = 0x23
+	IPV6_TCLASS                   = 0x26
+	IPV6_UNICAST_HOPS             = 0x5
+	IPV6_UNSPEC_SRC               = 0x42
+	IPV6_USE_MIN_MTU              = 0x20
+	IPV6_V6ONLY                   = 0x27
+	IP_ADD_MEMBERSHIP             = 0x13
+	IP_ADD_SOURCE_MEMBERSHIP      = 0x17
+	IP_BLOCK_SOURCE               = 0x15
+	IP_BOUND_IF                   = 0x41
+	IP_BROADCAST                  = 0x106
+	IP_BROADCAST_TTL              = 0x43
+	IP_DEFAULT_MULTICAST_LOOP     = 0x1
+	IP_DEFAULT_MULTICAST_TTL      = 0x1
+	IP_DF                         = 0x4000
+	IP_DHCPINIT_IF                = 0x45
+	IP_DONTFRAG                   = 0x1b
+	IP_DONTROUTE                  = 0x105
+	IP_DROP_MEMBERSHIP            = 0x14
+	IP_DROP_SOURCE_MEMBERSHIP     = 0x18
+	IP_HDRINCL                    = 0x2
+	IP_MAXPACKET                  = 0xffff
+	IP_MF                         = 0x2000
+	IP_MSS                        = 0x240
+	IP_MULTICAST_IF               = 0x10
+	IP_MULTICAST_LOOP             = 0x12
+	IP_MULTICAST_TTL              = 0x11
+	IP_NEXTHOP                    = 0x19
+	IP_OPTIONS                    = 0x1
+	IP_PKTINFO                    = 0x1a
+	IP_RECVDSTADDR                = 0x7
+	IP_RECVIF                     = 0x9
+	IP_RECVOPTS                   = 0x5
+	IP_RECVPKTINFO                = 0x1a
+	IP_RECVRETOPTS                = 0x6
+	IP_RECVSLLA                   = 0xa
+	IP_RECVTTL                    = 0xb
+	IP_RETOPTS                    = 0x8
+	IP_REUSEADDR                  = 0x104
+	IP_SEC_OPT                    = 0x22
+	IP_TOS                        = 0x3
+	IP_TTL                        = 0x4
+	IP_UNBLOCK_SOURCE             = 0x16
+	IP_UNSPEC_SRC                 = 0x42
+	ISIG                          = 0x1
+	ISTRIP                        = 0x20
+	IXANY                         = 0x800
+	IXOFF                         = 0x1000
+	IXON                          = 0x400
+	MADV_ACCESS_DEFAULT           = 0x6
+	MADV_ACCESS_LWP               = 0x7
+	MADV_ACCESS_MANY              = 0x8
+	MADV_DONTNEED                 = 0x4
+	MADV_FREE                     = 0x5
+	MADV_NORMAL                   = 0x0
+	MADV_RANDOM                   = 0x1
+	MADV_SEQUENTIAL               = 0x2
+	MADV_WILLNEED                 = 0x3
+	MAP_32BIT                     = 0x80
+	MAP_ALIGN                     = 0x200
+	MAP_ANON                      = 0x100
+	MAP_ANONYMOUS                 = 0x100
+	MAP_FIXED                     = 0x10
+	MAP_INITDATA                  = 0x800
+	MAP_NORESERVE                 = 0x40
+	MAP_PRIVATE                   = 0x2
+	MAP_RENAME                    = 0x20
+	MAP_SHARED                    = 0x1
+	MAP_TEXT                      = 0x400
+	MAP_TYPE                      = 0xf
+	MCL_CURRENT                   = 0x1
+	MCL_FUTURE                    = 0x2
+	MSG_CTRUNC                    = 0x10
+	MSG_DONTROUTE                 = 0x4
+	MSG_DONTWAIT                  = 0x80
+	MSG_DUPCTRL                   = 0x800
+	MSG_EOR                       = 0x8
+	MSG_MAXIOVLEN                 = 0x10
+	MSG_NOTIFICATION              = 0x100
+	MSG_OOB                       = 0x1
+	MSG_PEEK                      = 0x2
+	MSG_TRUNC                     = 0x20
+	MSG_WAITALL                   = 0x40
+	MSG_XPG4_2                    = 0x8000
+	MS_ASYNC                      = 0x1
+	MS_INVALIDATE                 = 0x2
+	MS_OLDSYNC                    = 0x0
+	MS_SYNC                       = 0x4
+	M_FLUSH                       = 0x86
+	NOFLSH                        = 0x80
+	OCRNL                         = 0x8
+	OFDEL                         = 0x80
+	OFILL                         = 0x40
+	ONLCR                         = 0x4
+	ONLRET                        = 0x20
+	ONOCR                         = 0x10
+	OPENFAIL                      = -0x1
+	OPOST                         = 0x1
+	O_ACCMODE                     = 0x600003
+	O_APPEND                      = 0x8
+	O_CLOEXEC                     = 0x800000
+	O_CREAT                       = 0x100
+	O_DSYNC                       = 0x40
+	O_EXCL                        = 0x400
+	O_EXEC                        = 0x400000
+	O_LARGEFILE                   = 0x2000
+	O_NDELAY                      = 0x4
+	O_NOCTTY                      = 0x800
+	O_NOFOLLOW                    = 0x20000
+	O_NOLINKS                     = 0x40000
+	O_NONBLOCK                    = 0x80
+	O_RDONLY                      = 0x0
+	O_RDWR                        = 0x2
+	O_RSYNC                       = 0x8000
+	O_SEARCH                      = 0x200000
+	O_SIOCGIFCONF                 = -0x3ff796ec
+	O_SIOCGLIFCONF                = -0x3fef9688
+	O_SYNC                        = 0x10
+	O_TRUNC                       = 0x200
+	O_WRONLY                      = 0x1
+	O_XATTR                       = 0x4000
+	PARENB                        = 0x100
+	PAREXT                        = 0x100000
+	PARMRK                        = 0x8
+	PARODD                        = 0x200
+	PENDIN                        = 0x4000
+	PRIO_PGRP                     = 0x1
+	PRIO_PROCESS                  = 0x0
+	PRIO_USER                     = 0x2
+	PROT_EXEC                     = 0x4
+	PROT_NONE                     = 0x0
+	PROT_READ                     = 0x1
+	PROT_WRITE                    = 0x2
+	RLIMIT_AS                     = 0x6
+	RLIMIT_CORE                   = 0x4
+	RLIMIT_CPU                    = 0x0
+	RLIMIT_DATA                   = 0x2
+	RLIMIT_FSIZE                  = 0x1
+	RLIMIT_NOFILE                 = 0x5
+	RLIMIT_STACK                  = 0x3
+	RLIM_INFINITY                 = -0x3
+	RTAX_AUTHOR                   = 0x6
+	RTAX_BRD                      = 0x7
+	RTAX_DST                      = 0x0
+	RTAX_GATEWAY                  = 0x1
+	RTAX_GENMASK                  = 0x3
+	RTAX_IFA                      = 0x5
+	RTAX_IFP                      = 0x4
+	RTAX_MAX                      = 0x9
+	RTAX_NETMASK                  = 0x2
+	RTAX_SRC                      = 0x8
+	RTA_AUTHOR                    = 0x40
+	RTA_BRD                       = 0x80
+	RTA_DST                       = 0x1
+	RTA_GATEWAY                   = 0x2
+	RTA_GENMASK                   = 0x8
+	RTA_IFA                       = 0x20
+	RTA_IFP                       = 0x10
+	RTA_NETMASK                   = 0x4
+	RTA_NUMBITS                   = 0x9
+	RTA_SRC                       = 0x100
+	RTF_BLACKHOLE                 = 0x1000
+	RTF_CLONING                   = 0x100
+	RTF_DONE                      = 0x40
+	RTF_DYNAMIC                   = 0x10
+	RTF_GATEWAY                   = 0x2
+	RTF_HOST                      = 0x4
+	RTF_INDIRECT                  = 0x40000
+	RTF_KERNEL                    = 0x80000
+	RTF_LLINFO                    = 0x400
+	RTF_MASK                      = 0x80
+	RTF_MODIFIED                  = 0x20
+	RTF_MULTIRT                   = 0x10000
+	RTF_PRIVATE                   = 0x2000
+	RTF_PROTO1                    = 0x8000
+	RTF_PROTO2                    = 0x4000
+	RTF_REJECT                    = 0x8
+	RTF_SETSRC                    = 0x20000
+	RTF_STATIC                    = 0x800
+	RTF_UP                        = 0x1
+	RTF_XRESOLVE                  = 0x200
+	RTF_ZONE                      = 0x100000
+	RTM_ADD                       = 0x1
+	RTM_CHANGE                    = 0x3
+	RTM_CHGADDR                   = 0xf
+	RTM_DELADDR                   = 0xd
+	RTM_DELETE                    = 0x2
+	RTM_FREEADDR                  = 0x10
+	RTM_GET                       = 0x4
+	RTM_IFINFO                    = 0xe
+	RTM_LOCK                      = 0x8
+	RTM_LOSING                    = 0x5
+	RTM_MISS                      = 0x7
+	RTM_NEWADDR                   = 0xc
+	RTM_OLDADD                    = 0x9
+	RTM_OLDDEL                    = 0xa
+	RTM_REDIRECT                  = 0x6
+	RTM_RESOLVE                   = 0xb
+	RTM_VERSION                   = 0x3
+	RTV_EXPIRE                    = 0x4
+	RTV_HOPCOUNT                  = 0x2
+	RTV_MTU                       = 0x1
+	RTV_RPIPE                     = 0x8
+	RTV_RTT                       = 0x40
+	RTV_RTTVAR                    = 0x80
+	RTV_SPIPE                     = 0x10
+	RTV_SSTHRESH                  = 0x20
+	RT_AWARE                      = 0x1
+	RUSAGE_CHILDREN               = -0x1
+	RUSAGE_SELF                   = 0x0
+	SCM_RIGHTS                    = 0x1010
+	SCM_TIMESTAMP                 = 0x1013
+	SCM_UCRED                     = 0x1012
+	SHUT_RD                       = 0x0
+	SHUT_RDWR                     = 0x2
+	SHUT_WR                       = 0x1
+	SIG2STR_MAX                   = 0x20
+	SIOCADDMULTI                  = -0x7fdf96cf
+	SIOCADDRT                     = -0x7fcf8df6
+	SIOCATMARK                    = 0x40047307
+	SIOCDARP                      = -0x7fdb96e0
+	SIOCDELMULTI                  = -0x7fdf96ce
+	SIOCDELRT                     = -0x7fcf8df5
+	SIOCDXARP                     = -0x7fff9658
+	SIOCGARP                      = -0x3fdb96e1
+	SIOCGDSTINFO                  = -0x3fff965c
+	SIOCGENADDR                   = -0x3fdf96ab
+	SIOCGENPSTATS                 = -0x3fdf96c7
+	SIOCGETLSGCNT                 = -0x3fef8deb
+	SIOCGETNAME                   = 0x40107334
+	SIOCGETPEER                   = 0x40107335
+	SIOCGETPROP                   = -0x3fff8f44
+	SIOCGETSGCNT                  = -0x3feb8deb
+	SIOCGETSYNC                   = -0x3fdf96d3
+	SIOCGETVIFCNT                 = -0x3feb8dec
+	SIOCGHIWAT                    = 0x40047301
+	SIOCGIFADDR                   = -0x3fdf96f3
+	SIOCGIFBRDADDR                = -0x3fdf96e9
+	SIOCGIFCONF                   = -0x3ff796a4
+	SIOCGIFDSTADDR                = -0x3fdf96f1
+	SIOCGIFFLAGS                  = -0x3fdf96ef
+	SIOCGIFHWADDR                 = -0x3fdf9647
+	SIOCGIFINDEX                  = -0x3fdf96a6
+	SIOCGIFMEM                    = -0x3fdf96ed
+	SIOCGIFMETRIC                 = -0x3fdf96e5
+	SIOCGIFMTU                    = -0x3fdf96ea
+	SIOCGIFMUXID                  = -0x3fdf96a8
+	SIOCGIFNETMASK                = -0x3fdf96e7
+	SIOCGIFNUM                    = 0x40046957
+	SIOCGIP6ADDRPOLICY            = -0x3fff965e
+	SIOCGIPMSFILTER               = -0x3ffb964c
+	SIOCGLIFADDR                  = -0x3f87968f
+	SIOCGLIFBINDING               = -0x3f879666
+	SIOCGLIFBRDADDR               = -0x3f879685
+	SIOCGLIFCONF                  = -0x3fef965b
+	SIOCGLIFDADSTATE              = -0x3f879642
+	SIOCGLIFDSTADDR               = -0x3f87968d
+	SIOCGLIFFLAGS                 = -0x3f87968b
+	SIOCGLIFGROUPINFO             = -0x3f4b9663
+	SIOCGLIFGROUPNAME             = -0x3f879664
+	SIOCGLIFHWADDR                = -0x3f879640
+	SIOCGLIFINDEX                 = -0x3f87967b
+	SIOCGLIFLNKINFO               = -0x3f879674
+	SIOCGLIFMETRIC                = -0x3f879681
+	SIOCGLIFMTU                   = -0x3f879686
+	SIOCGLIFMUXID                 = -0x3f87967d
+	SIOCGLIFNETMASK               = -0x3f879683
+	SIOCGLIFNUM                   = -0x3ff3967e
+	SIOCGLIFSRCOF                 = -0x3fef964f
+	SIOCGLIFSUBNET                = -0x3f879676
+	SIOCGLIFTOKEN                 = -0x3f879678
+	SIOCGLIFUSESRC                = -0x3f879651
+	SIOCGLIFZONE                  = -0x3f879656
+	SIOCGLOWAT                    = 0x40047303
+	SIOCGMSFILTER                 = -0x3ffb964e
+	SIOCGPGRP                     = 0x40047309
+	SIOCGSTAMP                    = -0x3fef9646
+	SIOCGXARP                     = -0x3fff9659
+	SIOCIFDETACH                  = -0x7fdf96c8
+	SIOCILB                       = -0x3ffb9645
+	SIOCLIFADDIF                  = -0x3f879691
+	SIOCLIFDELND                  = -0x7f879673
+	SIOCLIFGETND                  = -0x3f879672
+	SIOCLIFREMOVEIF               = -0x7f879692
+	SIOCLIFSETND                  = -0x7f879671
+	SIOCLOWER                     = -0x7fdf96d7
+	SIOCSARP                      = -0x7fdb96e2
+	SIOCSCTPGOPT                  = -0x3fef9653
+	SIOCSCTPPEELOFF               = -0x3ffb9652
+	SIOCSCTPSOPT                  = -0x7fef9654
+	SIOCSENABLESDP                = -0x3ffb9649
+	SIOCSETPROP                   = -0x7ffb8f43
+	SIOCSETSYNC                   = -0x7fdf96d4
+	SIOCSHIWAT                    = -0x7ffb8d00
+	SIOCSIFADDR                   = -0x7fdf96f4
+	SIOCSIFBRDADDR                = -0x7fdf96e8
+	SIOCSIFDSTADDR                = -0x7fdf96f2
+	SIOCSIFFLAGS                  = -0x7fdf96f0
+	SIOCSIFINDEX                  = -0x7fdf96a5
+	SIOCSIFMEM                    = -0x7fdf96ee
+	SIOCSIFMETRIC                 = -0x7fdf96e4
+	SIOCSIFMTU                    = -0x7fdf96eb
+	SIOCSIFMUXID                  = -0x7fdf96a7
+	SIOCSIFNAME                   = -0x7fdf96b7
+	SIOCSIFNETMASK                = -0x7fdf96e6
+	SIOCSIP6ADDRPOLICY            = -0x7fff965d
+	SIOCSIPMSFILTER               = -0x7ffb964b
+	SIOCSLGETREQ                  = -0x3fdf96b9
+	SIOCSLIFADDR                  = -0x7f879690
+	SIOCSLIFBRDADDR               = -0x7f879684
+	SIOCSLIFDSTADDR               = -0x7f87968e
+	SIOCSLIFFLAGS                 = -0x7f87968c
+	SIOCSLIFGROUPNAME             = -0x7f879665
+	SIOCSLIFINDEX                 = -0x7f87967a
+	SIOCSLIFLNKINFO               = -0x7f879675
+	SIOCSLIFMETRIC                = -0x7f879680
+	SIOCSLIFMTU                   = -0x7f879687
+	SIOCSLIFMUXID                 = -0x7f87967c
+	SIOCSLIFNAME                  = -0x3f87967f
+	SIOCSLIFNETMASK               = -0x7f879682
+	SIOCSLIFPREFIX                = -0x3f879641
+	SIOCSLIFSUBNET                = -0x7f879677
+	SIOCSLIFTOKEN                 = -0x7f879679
+	SIOCSLIFUSESRC                = -0x7f879650
+	SIOCSLIFZONE                  = -0x7f879655
+	SIOCSLOWAT                    = -0x7ffb8cfe
+	SIOCSLSTAT                    = -0x7fdf96b8
+	SIOCSMSFILTER                 = -0x7ffb964d
+	SIOCSPGRP                     = -0x7ffb8cf8
+	SIOCSPROMISC                  = -0x7ffb96d0
+	SIOCSQPTR                     = -0x3ffb9648
+	SIOCSSDSTATS                  = -0x3fdf96d2
+	SIOCSSESTATS                  = -0x3fdf96d1
+	SIOCSXARP                     = -0x7fff965a
+	SIOCTMYADDR                   = -0x3ff79670
+	SIOCTMYSITE                   = -0x3ff7966e
+	SIOCTONLINK                   = -0x3ff7966f
+	SIOCUPPER                     = -0x7fdf96d8
+	SIOCX25RCV                    = -0x3fdf96c4
+	SIOCX25TBL                    = -0x3fdf96c3
+	SIOCX25XMT                    = -0x3fdf96c5
+	SIOCXPROTO                    = 0x20007337
+	SOCK_CLOEXEC                  = 0x80000
+	SOCK_DGRAM                    = 0x1
+	SOCK_NDELAY                   = 0x200000
+	SOCK_NONBLOCK                 = 0x100000
+	SOCK_RAW                      = 0x4
+	SOCK_RDM                      = 0x5
+	SOCK_SEQPACKET                = 0x6
+	SOCK_STREAM                   = 0x2
+	SOCK_TYPE_MASK                = 0xffff
+	SOL_FILTER                    = 0xfffc
+	SOL_PACKET                    = 0xfffd
+	SOL_ROUTE                     = 0xfffe
+	SOL_SOCKET                    = 0xffff
+	SOMAXCONN                     = 0x80
+	SO_ACCEPTCONN                 = 0x2
+	SO_ALL                        = 0x3f
+	SO_ALLZONES                   = 0x1014
+	SO_ANON_MLP                   = 0x100a
+	SO_ATTACH_FILTER              = 0x40000001
+	SO_BAND                       = 0x4000
+	SO_BROADCAST                  = 0x20
+	SO_COPYOPT                    = 0x80000
+	SO_DEBUG                      = 0x1
+	SO_DELIM                      = 0x8000
+	SO_DETACH_FILTER              = 0x40000002
+	SO_DGRAM_ERRIND               = 0x200
+	SO_DOMAIN                     = 0x100c
+	SO_DONTLINGER                 = -0x81
+	SO_DONTROUTE                  = 0x10
+	SO_ERROPT                     = 0x40000
+	SO_ERROR                      = 0x1007
+	SO_EXCLBIND                   = 0x1015
+	SO_HIWAT                      = 0x10
+	SO_ISNTTY                     = 0x800
+	SO_ISTTY                      = 0x400
+	SO_KEEPALIVE                  = 0x8
+	SO_LINGER                     = 0x80
+	SO_LOWAT                      = 0x20
+	SO_MAC_EXEMPT                 = 0x100b
+	SO_MAC_IMPLICIT               = 0x1016
+	SO_MAXBLK                     = 0x100000
+	SO_MAXPSZ                     = 0x8
+	SO_MINPSZ                     = 0x4
+	SO_MREADOFF                   = 0x80
+	SO_MREADON                    = 0x40
+	SO_NDELOFF                    = 0x200
+	SO_NDELON                     = 0x100
+	SO_NODELIM                    = 0x10000
+	SO_OOBINLINE                  = 0x100
+	SO_PROTOTYPE                  = 0x1009
+	SO_RCVBUF                     = 0x1002
+	SO_RCVLOWAT                   = 0x1004
+	SO_RCVPSH                     = 0x100d
+	SO_RCVTIMEO                   = 0x1006
+	SO_READOPT                    = 0x1
+	SO_RECVUCRED                  = 0x400
+	SO_REUSEADDR                  = 0x4
+	SO_SECATTR                    = 0x1011
+	SO_SNDBUF                     = 0x1001
+	SO_SNDLOWAT                   = 0x1003
+	SO_SNDTIMEO                   = 0x1005
+	SO_STRHOLD                    = 0x20000
+	SO_TAIL                       = 0x200000
+	SO_TIMESTAMP                  = 0x1013
+	SO_TONSTOP                    = 0x2000
+	SO_TOSTOP                     = 0x1000
+	SO_TYPE                       = 0x1008
+	SO_USELOOPBACK                = 0x40
+	SO_VRRP                       = 0x1017
+	SO_WROFF                      = 0x2
+	TCFLSH                        = 0x5407
+	TCGETA                        = 0x5401
+	TCGETS                        = 0x540d
+	TCIFLUSH                      = 0x0
+	TCIOFLUSH                     = 0x2
+	TCOFLUSH                      = 0x1
+	TCP_ABORT_THRESHOLD           = 0x11
+	TCP_ANONPRIVBIND              = 0x20
+	TCP_CONN_ABORT_THRESHOLD      = 0x13
+	TCP_CONN_NOTIFY_THRESHOLD     = 0x12
+	TCP_CORK                      = 0x18
+	TCP_EXCLBIND                  = 0x21
+	TCP_INIT_CWND                 = 0x15
+	TCP_KEEPALIVE                 = 0x8
+	TCP_KEEPALIVE_ABORT_THRESHOLD = 0x17
+	TCP_KEEPALIVE_THRESHOLD       = 0x16
+	TCP_KEEPCNT                   = 0x23
+	TCP_KEEPIDLE                  = 0x22
+	TCP_KEEPINTVL                 = 0x24
+	TCP_LINGER2                   = 0x1c
+	TCP_MAXSEG                    = 0x2
+	TCP_MSS                       = 0x218
+	TCP_NODELAY                   = 0x1
+	TCP_NOTIFY_THRESHOLD          = 0x10
+	TCP_RECVDSTADDR               = 0x14
+	TCP_RTO_INITIAL               = 0x19
+	TCP_RTO_MAX                   = 0x1b
+	TCP_RTO_MIN                   = 0x1a
+	TCSAFLUSH                     = 0x5410
+	TCSBRK                        = 0x5405
+	TCSETA                        = 0x5402
+	TCSETAF                       = 0x5404
+	TCSETAW                       = 0x5403
+	TCSETS                        = 0x540e
+	TCSETSF                       = 0x5410
+	TCSETSW                       = 0x540f
+	TCXONC                        = 0x5406
+	TIOC                          = 0x5400
+	TIOCCBRK                      = 0x747a
+	TIOCCDTR                      = 0x7478
+	TIOCCILOOP                    = 0x746c
+	TIOCEXCL                      = 0x740d
+	TIOCFLUSH                     = 0x7410
+	TIOCGETC                      = 0x7412
+	TIOCGETD                      = 0x7400
+	TIOCGETP                      = 0x7408
+	TIOCGLTC                      = 0x7474
+	TIOCGPGRP                     = 0x7414
+	TIOCGPPS                      = 0x547d
+	TIOCGPPSEV                    = 0x547f
+	TIOCGSID                      = 0x7416
+	TIOCGSOFTCAR                  = 0x5469
+	TIOCGWINSZ                    = 0x5468
+	TIOCHPCL                      = 0x7402
+	TIOCKBOF                      = 0x5409
+	TIOCKBON                      = 0x5408
+	TIOCLBIC                      = 0x747e
+	TIOCLBIS                      = 0x747f
+	TIOCLGET                      = 0x747c
+	TIOCLSET                      = 0x747d
+	TIOCMBIC                      = 0x741c
+	TIOCMBIS                      = 0x741b
+	TIOCMGET                      = 0x741d
+	TIOCMSET                      = 0x741a
+	TIOCM_CAR                     = 0x40
+	TIOCM_CD                      = 0x40
+	TIOCM_CTS                     = 0x20
+	TIOCM_DSR                     = 0x100
+	TIOCM_DTR                     = 0x2
+	TIOCM_LE                      = 0x1
+	TIOCM_RI                      = 0x80
+	TIOCM_RNG                     = 0x80
+	TIOCM_RTS                     = 0x4
+	TIOCM_SR                      = 0x10
+	TIOCM_ST                      = 0x8
+	TIOCNOTTY                     = 0x7471
+	TIOCNXCL                      = 0x740e
+	TIOCOUTQ                      = 0x7473
+	TIOCREMOTE                    = 0x741e
+	TIOCSBRK                      = 0x747b
+	TIOCSCTTY                     = 0x7484
+	TIOCSDTR                      = 0x7479
+	TIOCSETC                      = 0x7411
+	TIOCSETD                      = 0x7401
+	TIOCSETN                      = 0x740a
+	TIOCSETP                      = 0x7409
+	TIOCSIGNAL                    = 0x741f
+	TIOCSILOOP                    = 0x746d
+	TIOCSLTC                      = 0x7475
+	TIOCSPGRP                     = 0x7415
+	TIOCSPPS                      = 0x547e
+	TIOCSSOFTCAR                  = 0x546a
+	TIOCSTART                     = 0x746e
+	TIOCSTI                       = 0x7417
+	TIOCSTOP                      = 0x746f
+	TIOCSWINSZ                    = 0x5467
+	TOSTOP                        = 0x100
+	VCEOF                         = 0x8
+	VCEOL                         = 0x9
+	VDISCARD                      = 0xd
+	VDSUSP                        = 0xb
+	VEOF                          = 0x4
+	VEOL                          = 0x5
+	VEOL2                         = 0x6
+	VERASE                        = 0x2
+	VINTR                         = 0x0
+	VKILL                         = 0x3
+	VLNEXT                        = 0xf
+	VMIN                          = 0x4
+	VQUIT                         = 0x1
+	VREPRINT                      = 0xc
+	VSTART                        = 0x8
+	VSTATUS                       = 0x10
+	VSTOP                         = 0x9
+	VSUSP                         = 0xa
+	VSWTCH                        = 0x7
+	VT0                           = 0x0
+	VT1                           = 0x4000
+	VTDLY                         = 0x4000
+	VTIME                         = 0x5
+	VWERASE                       = 0xe
+	WCONTFLG                      = 0xffff
+	WCONTINUED                    = 0x8
+	WCOREFLG                      = 0x80
+	WEXITED                       = 0x1
+	WNOHANG                       = 0x40
+	WNOWAIT                       = 0x80
+	WOPTMASK                      = 0xcf
+	WRAP                          = 0x20000
+	WSIGMASK                      = 0x7f
+	WSTOPFLG                      = 0x7f
+	WSTOPPED                      = 0x4
+	WTRAPPED                      = 0x2
+	WUNTRACED                     = 0x4
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x7d)
+	EADDRNOTAVAIL   = syscall.Errno(0x7e)
+	EADV            = syscall.Errno(0x44)
+	EAFNOSUPPORT    = syscall.Errno(0x7c)
+	EAGAIN          = syscall.Errno(0xb)
+	EALREADY        = syscall.Errno(0x95)
+	EBADE           = syscall.Errno(0x32)
+	EBADF           = syscall.Errno(0x9)
+	EBADFD          = syscall.Errno(0x51)
+	EBADMSG         = syscall.Errno(0x4d)
+	EBADR           = syscall.Errno(0x33)
+	EBADRQC         = syscall.Errno(0x36)
+	EBADSLT         = syscall.Errno(0x37)
+	EBFONT          = syscall.Errno(0x39)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x2f)
+	ECHILD          = syscall.Errno(0xa)
+	ECHRNG          = syscall.Errno(0x25)
+	ECOMM           = syscall.Errno(0x46)
+	ECONNABORTED    = syscall.Errno(0x82)
+	ECONNREFUSED    = syscall.Errno(0x92)
+	ECONNRESET      = syscall.Errno(0x83)
+	EDEADLK         = syscall.Errno(0x2d)
+	EDEADLOCK       = syscall.Errno(0x38)
+	EDESTADDRREQ    = syscall.Errno(0x60)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x31)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EHOSTDOWN       = syscall.Errno(0x93)
+	EHOSTUNREACH    = syscall.Errno(0x94)
+	EIDRM           = syscall.Errno(0x24)
+	EILSEQ          = syscall.Errno(0x58)
+	EINPROGRESS     = syscall.Errno(0x96)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EISCONN         = syscall.Errno(0x85)
+	EISDIR          = syscall.Errno(0x15)
+	EL2HLT          = syscall.Errno(0x2c)
+	EL2NSYNC        = syscall.Errno(0x26)
+	EL3HLT          = syscall.Errno(0x27)
+	EL3RST          = syscall.Errno(0x28)
+	ELIBACC         = syscall.Errno(0x53)
+	ELIBBAD         = syscall.Errno(0x54)
+	ELIBEXEC        = syscall.Errno(0x57)
+	ELIBMAX         = syscall.Errno(0x56)
+	ELIBSCN         = syscall.Errno(0x55)
+	ELNRNG          = syscall.Errno(0x29)
+	ELOCKUNMAPPED   = syscall.Errno(0x48)
+	ELOOP           = syscall.Errno(0x5a)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x61)
+	EMULTIHOP       = syscall.Errno(0x4a)
+	ENAMETOOLONG    = syscall.Errno(0x4e)
+	ENETDOWN        = syscall.Errno(0x7f)
+	ENETRESET       = syscall.Errno(0x81)
+	ENETUNREACH     = syscall.Errno(0x80)
+	ENFILE          = syscall.Errno(0x17)
+	ENOANO          = syscall.Errno(0x35)
+	ENOBUFS         = syscall.Errno(0x84)
+	ENOCSI          = syscall.Errno(0x2b)
+	ENODATA         = syscall.Errno(0x3d)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x2e)
+	ENOLINK         = syscall.Errno(0x43)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x23)
+	ENONET          = syscall.Errno(0x40)
+	ENOPKG          = syscall.Errno(0x41)
+	ENOPROTOOPT     = syscall.Errno(0x63)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSR           = syscall.Errno(0x3f)
+	ENOSTR          = syscall.Errno(0x3c)
+	ENOSYS          = syscall.Errno(0x59)
+	ENOTACTIVE      = syscall.Errno(0x49)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x86)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x5d)
+	ENOTRECOVERABLE = syscall.Errno(0x3b)
+	ENOTSOCK        = syscall.Errno(0x5f)
+	ENOTSUP         = syscall.Errno(0x30)
+	ENOTTY          = syscall.Errno(0x19)
+	ENOTUNIQ        = syscall.Errno(0x50)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x7a)
+	EOVERFLOW       = syscall.Errno(0x4f)
+	EOWNERDEAD      = syscall.Errno(0x3a)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x7b)
+	EPIPE           = syscall.Errno(0x20)
+	EPROTO          = syscall.Errno(0x47)
+	EPROTONOSUPPORT = syscall.Errno(0x78)
+	EPROTOTYPE      = syscall.Errno(0x62)
+	ERANGE          = syscall.Errno(0x22)
+	EREMCHG         = syscall.Errno(0x52)
+	EREMOTE         = syscall.Errno(0x42)
+	ERESTART        = syscall.Errno(0x5b)
+	EROFS           = syscall.Errno(0x1e)
+	ESHUTDOWN       = syscall.Errno(0x8f)
+	ESOCKTNOSUPPORT = syscall.Errno(0x79)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESRMNT          = syscall.Errno(0x45)
+	ESTALE          = syscall.Errno(0x97)
+	ESTRPIPE        = syscall.Errno(0x5c)
+	ETIME           = syscall.Errno(0x3e)
+	ETIMEDOUT       = syscall.Errno(0x91)
+	ETOOMANYREFS    = syscall.Errno(0x90)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUNATCH         = syscall.Errno(0x2a)
+	EUSERS          = syscall.Errno(0x5e)
+	EWOULDBLOCK     = syscall.Errno(0xb)
+	EXDEV           = syscall.Errno(0x12)
+	EXFULL          = syscall.Errno(0x34)
+)
+
+// Signals
+const (
+	SIGABRT    = syscall.Signal(0x6)
+	SIGALRM    = syscall.Signal(0xe)
+	SIGBUS     = syscall.Signal(0xa)
+	SIGCANCEL  = syscall.Signal(0x24)
+	SIGCHLD    = syscall.Signal(0x12)
+	SIGCLD     = syscall.Signal(0x12)
+	SIGCONT    = syscall.Signal(0x19)
+	SIGEMT     = syscall.Signal(0x7)
+	SIGFPE     = syscall.Signal(0x8)
+	SIGFREEZE  = syscall.Signal(0x22)
+	SIGHUP     = syscall.Signal(0x1)
+	SIGILL     = syscall.Signal(0x4)
+	SIGINFO    = syscall.Signal(0x29)
+	SIGINT     = syscall.Signal(0x2)
+	SIGIO      = syscall.Signal(0x16)
+	SIGIOT     = syscall.Signal(0x6)
+	SIGJVM1    = syscall.Signal(0x27)
+	SIGJVM2    = syscall.Signal(0x28)
+	SIGKILL    = syscall.Signal(0x9)
+	SIGLOST    = syscall.Signal(0x25)
+	SIGLWP     = syscall.Signal(0x21)
+	SIGPIPE    = syscall.Signal(0xd)
+	SIGPOLL    = syscall.Signal(0x16)
+	SIGPROF    = syscall.Signal(0x1d)
+	SIGPWR     = syscall.Signal(0x13)
+	SIGQUIT    = syscall.Signal(0x3)
+	SIGSEGV    = syscall.Signal(0xb)
+	SIGSTOP    = syscall.Signal(0x17)
+	SIGSYS     = syscall.Signal(0xc)
+	SIGTERM    = syscall.Signal(0xf)
+	SIGTHAW    = syscall.Signal(0x23)
+	SIGTRAP    = syscall.Signal(0x5)
+	SIGTSTP    = syscall.Signal(0x18)
+	SIGTTIN    = syscall.Signal(0x1a)
+	SIGTTOU    = syscall.Signal(0x1b)
+	SIGURG     = syscall.Signal(0x15)
+	SIGUSR1    = syscall.Signal(0x10)
+	SIGUSR2    = syscall.Signal(0x11)
+	SIGVTALRM  = syscall.Signal(0x1c)
+	SIGWAITING = syscall.Signal(0x20)
+	SIGWINCH   = syscall.Signal(0x14)
+	SIGXCPU    = syscall.Signal(0x1e)
+	SIGXFSZ    = syscall.Signal(0x1f)
+	SIGXRES    = syscall.Signal(0x26)
+)
+
+// Error table
+var errors = [...]string{
+	1:   "not owner",
+	2:   "no such file or directory",
+	3:   "no such process",
+	4:   "interrupted system call",
+	5:   "I/O error",
+	6:   "no such device or address",
+	7:   "arg list too long",
+	8:   "exec format error",
+	9:   "bad file number",
+	10:  "no child processes",
+	11:  "resource temporarily unavailable",
+	12:  "not enough space",
+	13:  "permission denied",
+	14:  "bad address",
+	15:  "block device required",
+	16:  "device busy",
+	17:  "file exists",
+	18:  "cross-device link",
+	19:  "no such device",
+	20:  "not a directory",
+	21:  "is a directory",
+	22:  "invalid argument",
+	23:  "file table overflow",
+	24:  "too many open files",
+	25:  "inappropriate ioctl for device",
+	26:  "text file busy",
+	27:  "file too large",
+	28:  "no space left on device",
+	29:  "illegal seek",
+	30:  "read-only file system",
+	31:  "too many links",
+	32:  "broken pipe",
+	33:  "argument out of domain",
+	34:  "result too large",
+	35:  "no message of desired type",
+	36:  "identifier removed",
+	37:  "channel number out of range",
+	38:  "level 2 not synchronized",
+	39:  "level 3 halted",
+	40:  "level 3 reset",
+	41:  "link number out of range",
+	42:  "protocol driver not attached",
+	43:  "no CSI structure available",
+	44:  "level 2 halted",
+	45:  "deadlock situation detected/avoided",
+	46:  "no record locks available",
+	47:  "operation canceled",
+	48:  "operation not supported",
+	49:  "disc quota exceeded",
+	50:  "bad exchange descriptor",
+	51:  "bad request descriptor",
+	52:  "message tables full",
+	53:  "anode table overflow",
+	54:  "bad request code",
+	55:  "invalid slot",
+	56:  "file locking deadlock",
+	57:  "bad font file format",
+	58:  "owner of the lock died",
+	59:  "lock is not recoverable",
+	60:  "not a stream device",
+	61:  "no data available",
+	62:  "timer expired",
+	63:  "out of stream resources",
+	64:  "machine is not on the network",
+	65:  "package not installed",
+	66:  "object is remote",
+	67:  "link has been severed",
+	68:  "advertise error",
+	69:  "srmount error",
+	70:  "communication error on send",
+	71:  "protocol error",
+	72:  "locked lock was unmapped ",
+	73:  "facility is not active",
+	74:  "multihop attempted",
+	77:  "not a data message",
+	78:  "file name too long",
+	79:  "value too large for defined data type",
+	80:  "name not unique on network",
+	81:  "file descriptor in bad state",
+	82:  "remote address changed",
+	83:  "can not access a needed shared library",
+	84:  "accessing a corrupted shared library",
+	85:  ".lib section in a.out corrupted",
+	86:  "attempting to link in more shared libraries than system limit",
+	87:  "can not exec a shared library directly",
+	88:  "illegal byte sequence",
+	89:  "operation not applicable",
+	90:  "number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS",
+	91:  "error 91",
+	92:  "error 92",
+	93:  "directory not empty",
+	94:  "too many users",
+	95:  "socket operation on non-socket",
+	96:  "destination address required",
+	97:  "message too long",
+	98:  "protocol wrong type for socket",
+	99:  "option not supported by protocol",
+	120: "protocol not supported",
+	121: "socket type not supported",
+	122: "operation not supported on transport endpoint",
+	123: "protocol family not supported",
+	124: "address family not supported by protocol family",
+	125: "address already in use",
+	126: "cannot assign requested address",
+	127: "network is down",
+	128: "network is unreachable",
+	129: "network dropped connection because of reset",
+	130: "software caused connection abort",
+	131: "connection reset by peer",
+	132: "no buffer space available",
+	133: "transport endpoint is already connected",
+	134: "transport endpoint is not connected",
+	143: "cannot send after socket shutdown",
+	144: "too many references: cannot splice",
+	145: "connection timed out",
+	146: "connection refused",
+	147: "host is down",
+	148: "no route to host",
+	149: "operation already in progress",
+	150: "operation now in progress",
+	151: "stale NFS file handle",
+}
+
+// Signal table
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal Instruction",
+	5:  "trace/Breakpoint Trap",
+	6:  "abort",
+	7:  "emulation Trap",
+	8:  "arithmetic Exception",
+	9:  "killed",
+	10: "bus Error",
+	11: "segmentation Fault",
+	12: "bad System Call",
+	13: "broken Pipe",
+	14: "alarm Clock",
+	15: "terminated",
+	16: "user Signal 1",
+	17: "user Signal 2",
+	18: "child Status Changed",
+	19: "power-Fail/Restart",
+	20: "window Size Change",
+	21: "urgent Socket Condition",
+	22: "pollable Event",
+	23: "stopped (signal)",
+	24: "stopped (user)",
+	25: "continued",
+	26: "stopped (tty input)",
+	27: "stopped (tty output)",
+	28: "virtual Timer Expired",
+	29: "profiling Timer Expired",
+	30: "cpu Limit Exceeded",
+	31: "file Size Limit Exceeded",
+	32: "no runnable lwp",
+	33: "inter-lwp signal",
+	34: "checkpoint Freeze",
+	35: "checkpoint Thaw",
+	36: "thread Cancellation",
+	37: "resource Lost",
+	38: "resource Control Exceeded",
+	39: "reserved for JVM 1",
+	40: "reserved for JVM 2",
+	41: "information Request",
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
new file mode 100644
index 0000000000..031034a345
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
@@ -0,0 +1,1427 @@
+// mksyscall.pl -l32 syscall_bsd.go syscall_darwin.go syscall_darwin_386.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int32, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int32(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
new file mode 100644
index 0000000000..ee96f78bad
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -0,0 +1,1443 @@
+// mksyscall.pl syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int64(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
new file mode 100644
index 0000000000..e52cd0d54c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
@@ -0,0 +1,1427 @@
+// mksyscall.pl syscall_bsd.go syscall_darwin.go syscall_darwin_arm.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int32, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int32(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
new file mode 100644
index 0000000000..9863ef99e3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -0,0 +1,1427 @@
+// mksyscall.pl syscall_bsd.go syscall_darwin.go syscall_darwin_arm64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm64,darwin
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kill(pid int, signum int, posix int) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exchangedata(path1 string, path2 string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path1)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(path2)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setprivexec(flag int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
+	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	sec = int64(r0)
+	usec = int32(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
new file mode 100644
index 0000000000..78de48dcf3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
@@ -0,0 +1,1413 @@
+// mksyscall.pl -dragonfly syscall_bsd.go syscall_dragonfly.go syscall_dragonfly_amd64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,dragonfly
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func extpread(fd int, p []byte, flags int, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EXTPREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EXTPWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
new file mode 100644
index 0000000000..fade994dcf
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
@@ -0,0 +1,1665 @@
+// mksyscall.pl -l32 syscall_bsd.go syscall_freebsd.go syscall_freebsd_386.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,freebsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
new file mode 100644
index 0000000000..c28281e83e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
@@ -0,0 +1,1665 @@
+// mksyscall.pl syscall_bsd.go syscall_freebsd.go syscall_freebsd_amd64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,freebsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
new file mode 100644
index 0000000000..a18ba5c88b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
@@ -0,0 +1,1665 @@
+// mksyscall.pl -l32 -arm syscall_bsd.go syscall_freebsd.go syscall_freebsd_arm.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm,freebsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (r int, w int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	r = int(r0)
+	w = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(file)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attrname)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
+	use(unsafe.Pointer(_p0))
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdtablesize() (size int) {
+	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
+	size = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Undelete(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
new file mode 100644
index 0000000000..749f3e46e6
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -0,0 +1,1638 @@
+// mksyscall.pl -l32 syscall_linux.go syscall_linux_386.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64_64, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE64, uintptr(fd), uintptr(length), uintptr(length>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
new file mode 100644
index 0000000000..1096aa5443
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -0,0 +1,1832 @@
+// mksyscall.pl syscall_linux.go syscall_linux_amd64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
new file mode 100644
index 0000000000..9066e1cb77
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -0,0 +1,1739 @@
+// mksyscall.pl -l32 -arm syscall_linux.go syscall_linux_arm.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, flags int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE64, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setrlimit(resource int, rlim *rlimit32) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
new file mode 100644
index 0000000000..5b91612265
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -0,0 +1,1723 @@
+// mksyscall.pl syscall_linux.go syscall_linux_arm64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm64,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
new file mode 100644
index 0000000000..738c830914
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -0,0 +1,1781 @@
+// mksyscall.pl syscall_linux.go syscall_linux_mips64x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build mips64,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstat(fd int, st *stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func lstat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func stat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
new file mode 100644
index 0000000000..2a03578322
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -0,0 +1,1781 @@
+// mksyscall.pl syscall_linux.go syscall_linux_mips64x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build mips64le,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fstat(fd int, st *stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func lstat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func stat(path string, st *stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
new file mode 100644
index 0000000000..4bd18dcee6
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -0,0 +1,1843 @@
+// mksyscall.pl syscall_linux.go syscall_linux_ppc64x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build ppc64,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
new file mode 100644
index 0000000000..fbb43516cc
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -0,0 +1,1843 @@
+// mksyscall.pl syscall_linux.go syscall_linux_ppc64x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build ppc64le,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ioperm(from int, num int, on int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Iopl(level int) (err error) {
+	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, n int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
+	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
+	xaddr = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Time(t *Time_t) (tt Time_t, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
+	tt = Time_t(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
new file mode 100644
index 0000000000..f8aa91f149
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
@@ -0,0 +1,1623 @@
+// mksyscall.pl syscall_linux.go syscall_linux_s390x.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build s390x,linux
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(source)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(fstype)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	use(unsafe.Pointer(_p2))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Acct(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtimex(buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ClockGettime(clockid int32, time *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(oldfd int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup3(oldfd int, newfd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate(size int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCreate1(flag int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
+	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettid() (tid int) {
+	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	tid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(pathname)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
+	use(unsafe.Pointer(_p0))
+	watchdesc = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit1(flags int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
+	success = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Klogctl(typ int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	use(unsafe.Pointer(_p0))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func PivotRoot(newroot string, putold string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(newroot)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(putold)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
+	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Removexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setdomainname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sethostname(p []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setns(fd int, nstype int) (err error) {
+	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() {
+	Syscall(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sysinfo(info *Sysinfo_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
+	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unshare(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func exitThread(code int) (err error) {
+	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, p *byte, np int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(events) > 0 {
+		_p0 = unsafe.Pointer(&events[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, buf *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (euid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func InotifyInit() (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pause() (err error) {
+	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (off int64, err error) {
+	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
+	off = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsgid(gid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setfsuid(uid int) (err error) {
+	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(resource int, rlim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, buf *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
+	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(n int, list *_Gid_t) (nn int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	nn = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(n int, list *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe2(p *[2]_C_int, flags int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
new file mode 100644
index 0000000000..b16e1d0ee3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
@@ -0,0 +1,1327 @@
+// mksyscall.pl -l32 -netbsd syscall_bsd.go syscall_netbsd.go syscall_netbsd_386.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,netbsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
new file mode 100644
index 0000000000..b63667da9c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
@@ -0,0 +1,1327 @@
+// mksyscall.pl -netbsd syscall_bsd.go syscall_netbsd.go syscall_netbsd_amd64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,netbsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
new file mode 100644
index 0000000000..b0d19038d2
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
@@ -0,0 +1,1327 @@
+// mksyscall.pl -l32 -arm syscall_bsd.go syscall_netbsd.go syscall_netbsd_arm.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build arm,netbsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe() (fd1 int, fd2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	fd1 = int(r0)
+	fd2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
new file mode 100644
index 0000000000..f91a5b8564
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
@@ -0,0 +1,1387 @@
+// mksyscall.pl -l32 -openbsd syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build 386,openbsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
new file mode 100644
index 0000000000..2e8d59d724
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
@@ -0,0 +1,1387 @@
+// mksyscall.pl -openbsd syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,openbsd
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	use(_p0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
new file mode 100644
index 0000000000..4326427817
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
@@ -0,0 +1,1559 @@
+// mksyscall_solaris.pl syscall_solaris.go syscall_solaris_amd64.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+// +build amd64,solaris
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+//go:cgo_import_dynamic libc_getsockname getsockname "libsocket.so"
+//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
+//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
+//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
+//go:cgo_import_dynamic libc_utimes utimes "libc.so"
+//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+//go:cgo_import_dynamic libc_futimesat futimesat "libc.so"
+//go:cgo_import_dynamic libc_accept accept "libsocket.so"
+//go:cgo_import_dynamic libc_recvmsg recvmsg "libsocket.so"
+//go:cgo_import_dynamic libc_sendmsg sendmsg "libsocket.so"
+//go:cgo_import_dynamic libc_acct acct "libc.so"
+//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
+//go:cgo_import_dynamic libc_access access "libc.so"
+//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
+//go:cgo_import_dynamic libc_chdir chdir "libc.so"
+//go:cgo_import_dynamic libc_chmod chmod "libc.so"
+//go:cgo_import_dynamic libc_chown chown "libc.so"
+//go:cgo_import_dynamic libc_chroot chroot "libc.so"
+//go:cgo_import_dynamic libc_close close "libc.so"
+//go:cgo_import_dynamic libc_creat creat "libc.so"
+//go:cgo_import_dynamic libc_dup dup "libc.so"
+//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
+//go:cgo_import_dynamic libc_exit exit "libc.so"
+//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
+//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
+//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
+//go:cgo_import_dynamic libc_fchown fchown "libc.so"
+//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
+//go:cgo_import_dynamic libc_fdatasync fdatasync "libc.so"
+//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
+//go:cgo_import_dynamic libc_fstat fstat "libc.so"
+//go:cgo_import_dynamic libc_getdents getdents "libc.so"
+//go:cgo_import_dynamic libc_getgid getgid "libc.so"
+//go:cgo_import_dynamic libc_getpid getpid "libc.so"
+//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
+//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
+//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
+//go:cgo_import_dynamic libc_getegid getegid "libc.so"
+//go:cgo_import_dynamic libc_getppid getppid "libc.so"
+//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
+//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
+//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
+//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
+//go:cgo_import_dynamic libc_getuid getuid "libc.so"
+//go:cgo_import_dynamic libc_kill kill "libc.so"
+//go:cgo_import_dynamic libc_lchown lchown "libc.so"
+//go:cgo_import_dynamic libc_link link "libc.so"
+//go:cgo_import_dynamic libc_listen listen "libsocket.so"
+//go:cgo_import_dynamic libc_lstat lstat "libc.so"
+//go:cgo_import_dynamic libc_madvise madvise "libc.so"
+//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
+//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
+//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
+//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
+//go:cgo_import_dynamic libc_mknod mknod "libc.so"
+//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
+//go:cgo_import_dynamic libc_mlock mlock "libc.so"
+//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
+//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
+//go:cgo_import_dynamic libc_munlock munlock "libc.so"
+//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
+//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
+//go:cgo_import_dynamic libc_open open "libc.so"
+//go:cgo_import_dynamic libc_openat openat "libc.so"
+//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
+//go:cgo_import_dynamic libc_pause pause "libc.so"
+//go:cgo_import_dynamic libc_pread pread "libc.so"
+//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
+//go:cgo_import_dynamic libc_read read "libc.so"
+//go:cgo_import_dynamic libc_readlink readlink "libc.so"
+//go:cgo_import_dynamic libc_rename rename "libc.so"
+//go:cgo_import_dynamic libc_renameat renameat "libc.so"
+//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
+//go:cgo_import_dynamic libc_lseek lseek "libc.so"
+//go:cgo_import_dynamic libc_setegid setegid "libc.so"
+//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
+//go:cgo_import_dynamic libc_setgid setgid "libc.so"
+//go:cgo_import_dynamic libc_sethostname sethostname "libc.so"
+//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
+//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
+//go:cgo_import_dynamic libc_setregid setregid "libc.so"
+//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
+//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
+//go:cgo_import_dynamic libc_setsid setsid "libc.so"
+//go:cgo_import_dynamic libc_setuid setuid "libc.so"
+//go:cgo_import_dynamic libc_shutdown shutdown "libsocket.so"
+//go:cgo_import_dynamic libc_stat stat "libc.so"
+//go:cgo_import_dynamic libc_symlink symlink "libc.so"
+//go:cgo_import_dynamic libc_sync sync "libc.so"
+//go:cgo_import_dynamic libc_times times "libc.so"
+//go:cgo_import_dynamic libc_truncate truncate "libc.so"
+//go:cgo_import_dynamic libc_fsync fsync "libc.so"
+//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
+//go:cgo_import_dynamic libc_umask umask "libc.so"
+//go:cgo_import_dynamic libc_uname uname "libc.so"
+//go:cgo_import_dynamic libc_umount umount "libc.so"
+//go:cgo_import_dynamic libc_unlink unlink "libc.so"
+//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
+//go:cgo_import_dynamic libc_ustat ustat "libc.so"
+//go:cgo_import_dynamic libc_utime utime "libc.so"
+//go:cgo_import_dynamic libc_bind bind "libsocket.so"
+//go:cgo_import_dynamic libc_connect connect "libsocket.so"
+//go:cgo_import_dynamic libc_mmap mmap "libc.so"
+//go:cgo_import_dynamic libc_munmap munmap "libc.so"
+//go:cgo_import_dynamic libc_sendto sendto "libsocket.so"
+//go:cgo_import_dynamic libc_socket socket "libsocket.so"
+//go:cgo_import_dynamic libc_socketpair socketpair "libsocket.so"
+//go:cgo_import_dynamic libc_write write "libc.so"
+//go:cgo_import_dynamic libc_getsockopt getsockopt "libsocket.so"
+//go:cgo_import_dynamic libc_getpeername getpeername "libsocket.so"
+//go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
+//go:cgo_import_dynamic libc_recvfrom recvfrom "libsocket.so"
+//go:cgo_import_dynamic libc_sysconf sysconf "libc.so"
+
+//go:linkname procgetsockname libc_getsockname
+//go:linkname procGetcwd libc_getcwd
+//go:linkname procgetgroups libc_getgroups
+//go:linkname procsetgroups libc_setgroups
+//go:linkname procutimes libc_utimes
+//go:linkname procutimensat libc_utimensat
+//go:linkname procfcntl libc_fcntl
+//go:linkname procfutimesat libc_futimesat
+//go:linkname procaccept libc_accept
+//go:linkname procrecvmsg libc_recvmsg
+//go:linkname procsendmsg libc_sendmsg
+//go:linkname procacct libc_acct
+//go:linkname procioctl libc_ioctl
+//go:linkname procAccess libc_access
+//go:linkname procAdjtime libc_adjtime
+//go:linkname procChdir libc_chdir
+//go:linkname procChmod libc_chmod
+//go:linkname procChown libc_chown
+//go:linkname procChroot libc_chroot
+//go:linkname procClose libc_close
+//go:linkname procCreat libc_creat
+//go:linkname procDup libc_dup
+//go:linkname procDup2 libc_dup2
+//go:linkname procExit libc_exit
+//go:linkname procFchdir libc_fchdir
+//go:linkname procFchmod libc_fchmod
+//go:linkname procFchmodat libc_fchmodat
+//go:linkname procFchown libc_fchown
+//go:linkname procFchownat libc_fchownat
+//go:linkname procFdatasync libc_fdatasync
+//go:linkname procFpathconf libc_fpathconf
+//go:linkname procFstat libc_fstat
+//go:linkname procGetdents libc_getdents
+//go:linkname procGetgid libc_getgid
+//go:linkname procGetpid libc_getpid
+//go:linkname procGetpgid libc_getpgid
+//go:linkname procGetpgrp libc_getpgrp
+//go:linkname procGeteuid libc_geteuid
+//go:linkname procGetegid libc_getegid
+//go:linkname procGetppid libc_getppid
+//go:linkname procGetpriority libc_getpriority
+//go:linkname procGetrlimit libc_getrlimit
+//go:linkname procGetrusage libc_getrusage
+//go:linkname procGettimeofday libc_gettimeofday
+//go:linkname procGetuid libc_getuid
+//go:linkname procKill libc_kill
+//go:linkname procLchown libc_lchown
+//go:linkname procLink libc_link
+//go:linkname proclisten libc_listen
+//go:linkname procLstat libc_lstat
+//go:linkname procMadvise libc_madvise
+//go:linkname procMkdir libc_mkdir
+//go:linkname procMkdirat libc_mkdirat
+//go:linkname procMkfifo libc_mkfifo
+//go:linkname procMkfifoat libc_mkfifoat
+//go:linkname procMknod libc_mknod
+//go:linkname procMknodat libc_mknodat
+//go:linkname procMlock libc_mlock
+//go:linkname procMlockall libc_mlockall
+//go:linkname procMprotect libc_mprotect
+//go:linkname procMunlock libc_munlock
+//go:linkname procMunlockall libc_munlockall
+//go:linkname procNanosleep libc_nanosleep
+//go:linkname procOpen libc_open
+//go:linkname procOpenat libc_openat
+//go:linkname procPathconf libc_pathconf
+//go:linkname procPause libc_pause
+//go:linkname procPread libc_pread
+//go:linkname procPwrite libc_pwrite
+//go:linkname procread libc_read
+//go:linkname procReadlink libc_readlink
+//go:linkname procRename libc_rename
+//go:linkname procRenameat libc_renameat
+//go:linkname procRmdir libc_rmdir
+//go:linkname proclseek libc_lseek
+//go:linkname procSetegid libc_setegid
+//go:linkname procSeteuid libc_seteuid
+//go:linkname procSetgid libc_setgid
+//go:linkname procSethostname libc_sethostname
+//go:linkname procSetpgid libc_setpgid
+//go:linkname procSetpriority libc_setpriority
+//go:linkname procSetregid libc_setregid
+//go:linkname procSetreuid libc_setreuid
+//go:linkname procSetrlimit libc_setrlimit
+//go:linkname procSetsid libc_setsid
+//go:linkname procSetuid libc_setuid
+//go:linkname procshutdown libc_shutdown
+//go:linkname procStat libc_stat
+//go:linkname procSymlink libc_symlink
+//go:linkname procSync libc_sync
+//go:linkname procTimes libc_times
+//go:linkname procTruncate libc_truncate
+//go:linkname procFsync libc_fsync
+//go:linkname procFtruncate libc_ftruncate
+//go:linkname procUmask libc_umask
+//go:linkname procUname libc_uname
+//go:linkname procumount libc_umount
+//go:linkname procUnlink libc_unlink
+//go:linkname procUnlinkat libc_unlinkat
+//go:linkname procUstat libc_ustat
+//go:linkname procUtime libc_utime
+//go:linkname procbind libc_bind
+//go:linkname procconnect libc_connect
+//go:linkname procmmap libc_mmap
+//go:linkname procmunmap libc_munmap
+//go:linkname procsendto libc_sendto
+//go:linkname procsocket libc_socket
+//go:linkname procsocketpair libc_socketpair
+//go:linkname procwrite libc_write
+//go:linkname procgetsockopt libc_getsockopt
+//go:linkname procgetpeername libc_getpeername
+//go:linkname procsetsockopt libc_setsockopt
+//go:linkname procrecvfrom libc_recvfrom
+//go:linkname procsysconf libc_sysconf
+
+var (
+	procgetsockname,
+	procGetcwd,
+	procgetgroups,
+	procsetgroups,
+	procutimes,
+	procutimensat,
+	procfcntl,
+	procfutimesat,
+	procaccept,
+	procrecvmsg,
+	procsendmsg,
+	procacct,
+	procioctl,
+	procAccess,
+	procAdjtime,
+	procChdir,
+	procChmod,
+	procChown,
+	procChroot,
+	procClose,
+	procCreat,
+	procDup,
+	procDup2,
+	procExit,
+	procFchdir,
+	procFchmod,
+	procFchmodat,
+	procFchown,
+	procFchownat,
+	procFdatasync,
+	procFpathconf,
+	procFstat,
+	procGetdents,
+	procGetgid,
+	procGetpid,
+	procGetpgid,
+	procGetpgrp,
+	procGeteuid,
+	procGetegid,
+	procGetppid,
+	procGetpriority,
+	procGetrlimit,
+	procGetrusage,
+	procGettimeofday,
+	procGetuid,
+	procKill,
+	procLchown,
+	procLink,
+	proclisten,
+	procLstat,
+	procMadvise,
+	procMkdir,
+	procMkdirat,
+	procMkfifo,
+	procMkfifoat,
+	procMknod,
+	procMknodat,
+	procMlock,
+	procMlockall,
+	procMprotect,
+	procMunlock,
+	procMunlockall,
+	procNanosleep,
+	procOpen,
+	procOpenat,
+	procPathconf,
+	procPause,
+	procPread,
+	procPwrite,
+	procread,
+	procReadlink,
+	procRename,
+	procRenameat,
+	procRmdir,
+	proclseek,
+	procSetegid,
+	procSeteuid,
+	procSetgid,
+	procSethostname,
+	procSetpgid,
+	procSetpriority,
+	procSetregid,
+	procSetreuid,
+	procSetrlimit,
+	procSetsid,
+	procSetuid,
+	procshutdown,
+	procStat,
+	procSymlink,
+	procSync,
+	procTimes,
+	procTruncate,
+	procFsync,
+	procFtruncate,
+	procUmask,
+	procUname,
+	procumount,
+	procUnlink,
+	procUnlinkat,
+	procUstat,
+	procUtime,
+	procbind,
+	procconnect,
+	procmmap,
+	procmunmap,
+	procsendto,
+	procsocket,
+	procsocketpair,
+	procwrite,
+	procgetsockopt,
+	procgetpeername,
+	procsetsockopt,
+	procrecvfrom,
+	procsysconf syscallFunc
+)
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockname)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetcwd)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0, 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func utimes(path string, times *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimes)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func utimensat(fd int, path string, times *[2]Timespec, flag int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimensat)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flag), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(arg), 0, 0, 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func futimesat(fildes int, path *byte, times *[2]Timeval) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfutimesat)), 3, uintptr(fildes), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procaccept)), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func acct(path *byte) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procacct)), 1, uintptr(unsafe.Pointer(path)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func ioctl(fd int, req int, arg uintptr) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAccess)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAdjtime)), 2, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChmod)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChroot)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Close(fd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procClose)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Creat(path string, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procCreat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup2)), 2, uintptr(oldfd), uintptr(newfd), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Exit(code int) {
+	sysvicall6(uintptr(unsafe.Pointer(&procExit)), 1, uintptr(code), 0, 0, 0, 0, 0)
+	return
+}
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchdir)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmod)), 2, uintptr(fd), uintptr(mode), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchown)), 3, uintptr(fd), uintptr(uid), uintptr(gid), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchownat)), 5, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fdatasync(fd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFdatasync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFpathconf)), 2, uintptr(fd), uintptr(name), 0, 0, 0, 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstat)), 2, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getdents(fd int, buf []byte, basep *uintptr) (n int, err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetdents)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getgid() (gid int) {
+	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetgid)), 0, 0, 0, 0, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+func Getpid() (pid int) {
+	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpid)), 0, 0, 0, 0, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgid)), 1, uintptr(pid), 0, 0, 0, 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getpgrp() (pgid int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgrp)), 0, 0, 0, 0, 0, 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Geteuid() (euid int) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGeteuid)), 0, 0, 0, 0, 0, 0, 0)
+	euid = int(r0)
+	return
+}
+
+func Getegid() (egid int) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetegid)), 0, 0, 0, 0, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+func Getppid() (ppid int) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetppid)), 0, 0, 0, 0, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+func Getpriority(which int, who int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetpriority)), 2, uintptr(which), uintptr(who), 0, 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrusage)), 2, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGettimeofday)), 1, uintptr(unsafe.Pointer(tv)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Getuid() (uid int) {
+	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetuid)), 0, 0, 0, 0, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procKill)), 2, uintptr(pid), uintptr(signum), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLchown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclisten)), 2, uintptr(s), uintptr(backlog), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLstat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Madvise(b []byte, advice int) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMadvise)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(advice), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdir)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdirat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifo)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifoat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknod)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mlock(b []byte) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlockall)), 1, uintptr(flags), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMprotect)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(prot), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Munlock(b []byte) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Munlockall() (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlockall)), 0, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procNanosleep)), 2, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpen)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpenat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
+	use(unsafe.Pointer(_p0))
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPathconf)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	val = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Pause() (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPause)), 0, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPread)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPwrite)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	if len(buf) > 0 {
+		_p1 = &buf[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procReadlink)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(len(buf)), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRename)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRenameat)), 4, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRmdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclseek)), 3, uintptr(fd), uintptr(offset), uintptr(whence), 0, 0, 0)
+	newoffset = int64(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetegid)), 1, uintptr(egid), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSeteuid)), 1, uintptr(euid), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetgid)), 1, uintptr(gid), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Sethostname(p []byte) (err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSethostname)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetpgid)), 2, uintptr(pid), uintptr(pgid), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSetpriority)), 3, uintptr(which), uintptr(who), uintptr(prio), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetregid)), 2, uintptr(rgid), uintptr(egid), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetreuid)), 2, uintptr(ruid), uintptr(euid), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetsid)), 0, 0, 0, 0, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetuid)), 1, uintptr(uid), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procshutdown)), 2, uintptr(s), uintptr(how), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procStat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSymlink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	use(unsafe.Pointer(_p1))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Sync() (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSync)), 0, 0, 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Times(tms *Tms) (ticks uintptr, err error) {
+	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procTimes)), 1, uintptr(unsafe.Pointer(tms)), 0, 0, 0, 0, 0)
+	ticks = uintptr(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procTruncate)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFsync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFtruncate)), 2, uintptr(fd), uintptr(length), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Umask(mask int) (oldmask int) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procUmask)), 1, uintptr(mask), 0, 0, 0, 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+func Uname(buf *Utsname) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procUname)), 1, uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Unmount(target string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(target)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procumount)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlink)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlinkat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Ustat(dev int, ubuf *Ustat_t) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUstat)), 2, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Utime(path string, buf *Utimbuf) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUtime)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0)
+	use(unsafe.Pointer(_p0))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procbind)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procconnect)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmmap)), 6, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmunmap)), 2, uintptr(addr), uintptr(length), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 *byte
+	if len(buf) > 0 {
+		_p0 = &buf[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendto)), 6, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsocket)), 3, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsocketpair)), 4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetpeername)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 *byte
+	if len(p) > 0 {
+		_p0 = &p[0]
+	}
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvfrom)), 6, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func sysconf(name int) (n int64, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsysconf)), 1, uintptr(name), 0, 0, 0, 0, 0)
+	n = int64(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd.go
new file mode 100644
index 0000000000..83bb935b91
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysctl_openbsd.go
@@ -0,0 +1,270 @@
+// mksysctl_openbsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+package unix
+
+type mibentry struct {
+	ctlname string
+	ctloid  []_C_int
+}
+
+var sysctlMib = []mibentry{
+	{"ddb.console", []_C_int{9, 6}},
+	{"ddb.log", []_C_int{9, 7}},
+	{"ddb.max_line", []_C_int{9, 3}},
+	{"ddb.max_width", []_C_int{9, 2}},
+	{"ddb.panic", []_C_int{9, 5}},
+	{"ddb.radix", []_C_int{9, 1}},
+	{"ddb.tab_stop_width", []_C_int{9, 4}},
+	{"ddb.trigger", []_C_int{9, 8}},
+	{"fs.posix.setuid", []_C_int{3, 1, 1}},
+	{"hw.allowpowerdown", []_C_int{6, 22}},
+	{"hw.byteorder", []_C_int{6, 4}},
+	{"hw.cpuspeed", []_C_int{6, 12}},
+	{"hw.diskcount", []_C_int{6, 10}},
+	{"hw.disknames", []_C_int{6, 8}},
+	{"hw.diskstats", []_C_int{6, 9}},
+	{"hw.machine", []_C_int{6, 1}},
+	{"hw.model", []_C_int{6, 2}},
+	{"hw.ncpu", []_C_int{6, 3}},
+	{"hw.ncpufound", []_C_int{6, 21}},
+	{"hw.pagesize", []_C_int{6, 7}},
+	{"hw.physmem", []_C_int{6, 19}},
+	{"hw.product", []_C_int{6, 15}},
+	{"hw.serialno", []_C_int{6, 17}},
+	{"hw.setperf", []_C_int{6, 13}},
+	{"hw.usermem", []_C_int{6, 20}},
+	{"hw.uuid", []_C_int{6, 18}},
+	{"hw.vendor", []_C_int{6, 14}},
+	{"hw.version", []_C_int{6, 16}},
+	{"kern.arandom", []_C_int{1, 37}},
+	{"kern.argmax", []_C_int{1, 8}},
+	{"kern.boottime", []_C_int{1, 21}},
+	{"kern.bufcachepercent", []_C_int{1, 72}},
+	{"kern.ccpu", []_C_int{1, 45}},
+	{"kern.clockrate", []_C_int{1, 12}},
+	{"kern.consdev", []_C_int{1, 75}},
+	{"kern.cp_time", []_C_int{1, 40}},
+	{"kern.cp_time2", []_C_int{1, 71}},
+	{"kern.cryptodevallowsoft", []_C_int{1, 53}},
+	{"kern.domainname", []_C_int{1, 22}},
+	{"kern.file", []_C_int{1, 73}},
+	{"kern.forkstat", []_C_int{1, 42}},
+	{"kern.fscale", []_C_int{1, 46}},
+	{"kern.fsync", []_C_int{1, 33}},
+	{"kern.hostid", []_C_int{1, 11}},
+	{"kern.hostname", []_C_int{1, 10}},
+	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
+	{"kern.job_control", []_C_int{1, 19}},
+	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
+	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
+	{"kern.maxclusters", []_C_int{1, 67}},
+	{"kern.maxfiles", []_C_int{1, 7}},
+	{"kern.maxlocksperuid", []_C_int{1, 70}},
+	{"kern.maxpartitions", []_C_int{1, 23}},
+	{"kern.maxproc", []_C_int{1, 6}},
+	{"kern.maxthread", []_C_int{1, 25}},
+	{"kern.maxvnodes", []_C_int{1, 5}},
+	{"kern.mbstat", []_C_int{1, 59}},
+	{"kern.msgbuf", []_C_int{1, 48}},
+	{"kern.msgbufsize", []_C_int{1, 38}},
+	{"kern.nchstats", []_C_int{1, 41}},
+	{"kern.netlivelocks", []_C_int{1, 76}},
+	{"kern.nfiles", []_C_int{1, 56}},
+	{"kern.ngroups", []_C_int{1, 18}},
+	{"kern.nosuidcoredump", []_C_int{1, 32}},
+	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
+	{"kern.nthreads", []_C_int{1, 26}},
+	{"kern.numvnodes", []_C_int{1, 58}},
+	{"kern.osrelease", []_C_int{1, 2}},
+	{"kern.osrevision", []_C_int{1, 3}},
+	{"kern.ostype", []_C_int{1, 1}},
+	{"kern.osversion", []_C_int{1, 27}},
+	{"kern.pool_debug", []_C_int{1, 77}},
+	{"kern.posix1version", []_C_int{1, 17}},
+	{"kern.proc", []_C_int{1, 66}},
+	{"kern.random", []_C_int{1, 31}},
+	{"kern.rawpartition", []_C_int{1, 24}},
+	{"kern.saved_ids", []_C_int{1, 20}},
+	{"kern.securelevel", []_C_int{1, 9}},
+	{"kern.seminfo", []_C_int{1, 61}},
+	{"kern.shminfo", []_C_int{1, 62}},
+	{"kern.somaxconn", []_C_int{1, 28}},
+	{"kern.sominconn", []_C_int{1, 29}},
+	{"kern.splassert", []_C_int{1, 54}},
+	{"kern.stackgap_random", []_C_int{1, 50}},
+	{"kern.sysvipc_info", []_C_int{1, 51}},
+	{"kern.sysvmsg", []_C_int{1, 34}},
+	{"kern.sysvsem", []_C_int{1, 35}},
+	{"kern.sysvshm", []_C_int{1, 36}},
+	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
+	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
+	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
+	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
+	{"kern.tty.maxptys", []_C_int{1, 44, 6}},
+	{"kern.tty.nptys", []_C_int{1, 44, 7}},
+	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
+	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
+	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
+	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
+	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
+	{"kern.ttycount", []_C_int{1, 57}},
+	{"kern.userasymcrypto", []_C_int{1, 60}},
+	{"kern.usercrypto", []_C_int{1, 52}},
+	{"kern.usermount", []_C_int{1, 30}},
+	{"kern.version", []_C_int{1, 4}},
+	{"kern.vnode", []_C_int{1, 13}},
+	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
+	{"kern.watchdog.period", []_C_int{1, 64, 1}},
+	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
+	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
+	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
+	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
+	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
+	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
+	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
+	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
+	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
+	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
+	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
+	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
+	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
+	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
+	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
+	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
+	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
+	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
+	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
+	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
+	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
+	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
+	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
+	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
+	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
+	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
+	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
+	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
+	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
+	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
+	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
+	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
+	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
+	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
+	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
+	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
+	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
+	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
+	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
+	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
+	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
+	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
+	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
+	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
+	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
+	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
+	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
+	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
+	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
+	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
+	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
+	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
+	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
+	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
+	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
+	{"net.inet.pim.stats", []_C_int{4, 2, 103, 1}},
+	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
+	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
+	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
+	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
+	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
+	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
+	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
+	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
+	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
+	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
+	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
+	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
+	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
+	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
+	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
+	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
+	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
+	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
+	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
+	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
+	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
+	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
+	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
+	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
+	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
+	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
+	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
+	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
+	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
+	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
+	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
+	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
+	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
+	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
+	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
+	{"net.inet6.icmp6.nd6_prune", []_C_int{4, 24, 30, 6}},
+	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
+	{"net.inet6.icmp6.nd6_useloopback", []_C_int{4, 24, 30, 11}},
+	{"net.inet6.icmp6.nodeinfo", []_C_int{4, 24, 30, 13}},
+	{"net.inet6.icmp6.rediraccept", []_C_int{4, 24, 30, 2}},
+	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
+	{"net.inet6.ip6.accept_rtadv", []_C_int{4, 24, 17, 12}},
+	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
+	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
+	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
+	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
+	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
+	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
+	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
+	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
+	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
+	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
+	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
+	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
+	{"net.inet6.ip6.maxifdefrouters", []_C_int{4, 24, 17, 47}},
+	{"net.inet6.ip6.maxifprefixes", []_C_int{4, 24, 17, 46}},
+	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
+	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
+	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
+	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
+	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
+	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
+	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
+	{"net.inet6.ip6.rr_prune", []_C_int{4, 24, 17, 22}},
+	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
+	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
+	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
+	{"net.inet6.ip6.v6only", []_C_int{4, 24, 17, 24}},
+	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
+	{"net.key.spd_dump", []_C_int{4, 30, 2}},
+	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
+	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
+	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
+	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
+	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
+	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
+	{"net.mpls.ttl", []_C_int{4, 33, 2}},
+	{"net.pflow.stats", []_C_int{4, 34, 1}},
+	{"net.pipex.enable", []_C_int{4, 35, 1}},
+	{"vm.anonmin", []_C_int{2, 7}},
+	{"vm.loadavg", []_C_int{2, 2}},
+	{"vm.maxslp", []_C_int{2, 10}},
+	{"vm.nkmempages", []_C_int{2, 6}},
+	{"vm.psstrings", []_C_int{2, 3}},
+	{"vm.swapencrypt.enable", []_C_int{2, 5, 0}},
+	{"vm.swapencrypt.keyscreated", []_C_int{2, 5, 1}},
+	{"vm.swapencrypt.keysdeleted", []_C_int{2, 5, 2}},
+	{"vm.uspace", []_C_int{2, 11}},
+	{"vm.uvmexp", []_C_int{2, 4}},
+	{"vm.vmmeter", []_C_int{2, 1}},
+	{"vm.vnodemin", []_C_int{2, 9}},
+	{"vm.vtextmin", []_C_int{2, 8}},
+}
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
new file mode 100644
index 0000000000..2786773ba3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
@@ -0,0 +1,398 @@
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build 386,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TRACE64                 = 179
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_CHUD                           = 185
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS_SYSCTL                         = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SYSCTLBYNAME                   = 274
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_STACK_SNAPSHOT                 = 365
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS___MAC_GET_LCID                 = 391
+	SYS___MAC_GET_LCTX                 = 392
+	SYS___MAC_SET_LCTX                 = 393
+	SYS_SETLCID                        = 394
+	SYS_GETLCID                        = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAME_EXT                     = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_MAXSYSCALL                     = 490
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
new file mode 100644
index 0000000000..09de240c8f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
@@ -0,0 +1,398 @@
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build amd64,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TRACE64                 = 179
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_CHUD                           = 185
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS_SYSCTL                         = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SYSCTLBYNAME                   = 274
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_STACK_SNAPSHOT                 = 365
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS___MAC_GET_LCID                 = 391
+	SYS___MAC_GET_LCTX                 = 392
+	SYS___MAC_SET_LCTX                 = 393
+	SYS_SETLCID                        = 394
+	SYS_GETLCID                        = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAME_EXT                     = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_MAXSYSCALL                     = 490
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
new file mode 100644
index 0000000000..b8c9aea852
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
@@ -0,0 +1,358 @@
+// mksysnum_darwin.pl /usr/include/sys/syscall.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_CHUD                           = 185
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS___SYSCTL                       = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_ATSOCKET                       = 206
+	SYS_ATGETMSG                       = 207
+	SYS_ATPUTMSG                       = 208
+	SYS_ATPSNDREQ                      = 209
+	SYS_ATPSNDRSP                      = 210
+	SYS_ATPGETREQ                      = 211
+	SYS_ATPGETRSP                      = 212
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SEM_GETVALUE                   = 274
+	SYS_SEM_INIT                       = 275
+	SYS_SEM_DESTROY                    = 276
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_STACK_SNAPSHOT                 = 365
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS___MAC_GET_LCID                 = 391
+	SYS___MAC_GET_LCTX                 = 392
+	SYS___MAC_SET_LCTX                 = 393
+	SYS_SETLCID                        = 394
+	SYS_GETLCID                        = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MAXSYSCALL                     = 440
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
new file mode 100644
index 0000000000..26677ebbf5
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
@@ -0,0 +1,398 @@
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/usr/include/sys/syscall.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm64,darwin
+
+package unix
+
+const (
+	SYS_SYSCALL                        = 0
+	SYS_EXIT                           = 1
+	SYS_FORK                           = 2
+	SYS_READ                           = 3
+	SYS_WRITE                          = 4
+	SYS_OPEN                           = 5
+	SYS_CLOSE                          = 6
+	SYS_WAIT4                          = 7
+	SYS_LINK                           = 9
+	SYS_UNLINK                         = 10
+	SYS_CHDIR                          = 12
+	SYS_FCHDIR                         = 13
+	SYS_MKNOD                          = 14
+	SYS_CHMOD                          = 15
+	SYS_CHOWN                          = 16
+	SYS_GETFSSTAT                      = 18
+	SYS_GETPID                         = 20
+	SYS_SETUID                         = 23
+	SYS_GETUID                         = 24
+	SYS_GETEUID                        = 25
+	SYS_PTRACE                         = 26
+	SYS_RECVMSG                        = 27
+	SYS_SENDMSG                        = 28
+	SYS_RECVFROM                       = 29
+	SYS_ACCEPT                         = 30
+	SYS_GETPEERNAME                    = 31
+	SYS_GETSOCKNAME                    = 32
+	SYS_ACCESS                         = 33
+	SYS_CHFLAGS                        = 34
+	SYS_FCHFLAGS                       = 35
+	SYS_SYNC                           = 36
+	SYS_KILL                           = 37
+	SYS_GETPPID                        = 39
+	SYS_DUP                            = 41
+	SYS_PIPE                           = 42
+	SYS_GETEGID                        = 43
+	SYS_SIGACTION                      = 46
+	SYS_GETGID                         = 47
+	SYS_SIGPROCMASK                    = 48
+	SYS_GETLOGIN                       = 49
+	SYS_SETLOGIN                       = 50
+	SYS_ACCT                           = 51
+	SYS_SIGPENDING                     = 52
+	SYS_SIGALTSTACK                    = 53
+	SYS_IOCTL                          = 54
+	SYS_REBOOT                         = 55
+	SYS_REVOKE                         = 56
+	SYS_SYMLINK                        = 57
+	SYS_READLINK                       = 58
+	SYS_EXECVE                         = 59
+	SYS_UMASK                          = 60
+	SYS_CHROOT                         = 61
+	SYS_MSYNC                          = 65
+	SYS_VFORK                          = 66
+	SYS_MUNMAP                         = 73
+	SYS_MPROTECT                       = 74
+	SYS_MADVISE                        = 75
+	SYS_MINCORE                        = 78
+	SYS_GETGROUPS                      = 79
+	SYS_SETGROUPS                      = 80
+	SYS_GETPGRP                        = 81
+	SYS_SETPGID                        = 82
+	SYS_SETITIMER                      = 83
+	SYS_SWAPON                         = 85
+	SYS_GETITIMER                      = 86
+	SYS_GETDTABLESIZE                  = 89
+	SYS_DUP2                           = 90
+	SYS_FCNTL                          = 92
+	SYS_SELECT                         = 93
+	SYS_FSYNC                          = 95
+	SYS_SETPRIORITY                    = 96
+	SYS_SOCKET                         = 97
+	SYS_CONNECT                        = 98
+	SYS_GETPRIORITY                    = 100
+	SYS_BIND                           = 104
+	SYS_SETSOCKOPT                     = 105
+	SYS_LISTEN                         = 106
+	SYS_SIGSUSPEND                     = 111
+	SYS_GETTIMEOFDAY                   = 116
+	SYS_GETRUSAGE                      = 117
+	SYS_GETSOCKOPT                     = 118
+	SYS_READV                          = 120
+	SYS_WRITEV                         = 121
+	SYS_SETTIMEOFDAY                   = 122
+	SYS_FCHOWN                         = 123
+	SYS_FCHMOD                         = 124
+	SYS_SETREUID                       = 126
+	SYS_SETREGID                       = 127
+	SYS_RENAME                         = 128
+	SYS_FLOCK                          = 131
+	SYS_MKFIFO                         = 132
+	SYS_SENDTO                         = 133
+	SYS_SHUTDOWN                       = 134
+	SYS_SOCKETPAIR                     = 135
+	SYS_MKDIR                          = 136
+	SYS_RMDIR                          = 137
+	SYS_UTIMES                         = 138
+	SYS_FUTIMES                        = 139
+	SYS_ADJTIME                        = 140
+	SYS_GETHOSTUUID                    = 142
+	SYS_SETSID                         = 147
+	SYS_GETPGID                        = 151
+	SYS_SETPRIVEXEC                    = 152
+	SYS_PREAD                          = 153
+	SYS_PWRITE                         = 154
+	SYS_NFSSVC                         = 155
+	SYS_STATFS                         = 157
+	SYS_FSTATFS                        = 158
+	SYS_UNMOUNT                        = 159
+	SYS_GETFH                          = 161
+	SYS_QUOTACTL                       = 165
+	SYS_MOUNT                          = 167
+	SYS_CSOPS                          = 169
+	SYS_CSOPS_AUDITTOKEN               = 170
+	SYS_WAITID                         = 173
+	SYS_KDEBUG_TRACE64                 = 179
+	SYS_KDEBUG_TRACE                   = 180
+	SYS_SETGID                         = 181
+	SYS_SETEGID                        = 182
+	SYS_SETEUID                        = 183
+	SYS_SIGRETURN                      = 184
+	SYS_CHUD                           = 185
+	SYS_FDATASYNC                      = 187
+	SYS_STAT                           = 188
+	SYS_FSTAT                          = 189
+	SYS_LSTAT                          = 190
+	SYS_PATHCONF                       = 191
+	SYS_FPATHCONF                      = 192
+	SYS_GETRLIMIT                      = 194
+	SYS_SETRLIMIT                      = 195
+	SYS_GETDIRENTRIES                  = 196
+	SYS_MMAP                           = 197
+	SYS_LSEEK                          = 199
+	SYS_TRUNCATE                       = 200
+	SYS_FTRUNCATE                      = 201
+	SYS_SYSCTL                         = 202
+	SYS_MLOCK                          = 203
+	SYS_MUNLOCK                        = 204
+	SYS_UNDELETE                       = 205
+	SYS_OPEN_DPROTECTED_NP             = 216
+	SYS_GETATTRLIST                    = 220
+	SYS_SETATTRLIST                    = 221
+	SYS_GETDIRENTRIESATTR              = 222
+	SYS_EXCHANGEDATA                   = 223
+	SYS_SEARCHFS                       = 225
+	SYS_DELETE                         = 226
+	SYS_COPYFILE                       = 227
+	SYS_FGETATTRLIST                   = 228
+	SYS_FSETATTRLIST                   = 229
+	SYS_POLL                           = 230
+	SYS_WATCHEVENT                     = 231
+	SYS_WAITEVENT                      = 232
+	SYS_MODWATCH                       = 233
+	SYS_GETXATTR                       = 234
+	SYS_FGETXATTR                      = 235
+	SYS_SETXATTR                       = 236
+	SYS_FSETXATTR                      = 237
+	SYS_REMOVEXATTR                    = 238
+	SYS_FREMOVEXATTR                   = 239
+	SYS_LISTXATTR                      = 240
+	SYS_FLISTXATTR                     = 241
+	SYS_FSCTL                          = 242
+	SYS_INITGROUPS                     = 243
+	SYS_POSIX_SPAWN                    = 244
+	SYS_FFSCTL                         = 245
+	SYS_NFSCLNT                        = 247
+	SYS_FHOPEN                         = 248
+	SYS_MINHERIT                       = 250
+	SYS_SEMSYS                         = 251
+	SYS_MSGSYS                         = 252
+	SYS_SHMSYS                         = 253
+	SYS_SEMCTL                         = 254
+	SYS_SEMGET                         = 255
+	SYS_SEMOP                          = 256
+	SYS_MSGCTL                         = 258
+	SYS_MSGGET                         = 259
+	SYS_MSGSND                         = 260
+	SYS_MSGRCV                         = 261
+	SYS_SHMAT                          = 262
+	SYS_SHMCTL                         = 263
+	SYS_SHMDT                          = 264
+	SYS_SHMGET                         = 265
+	SYS_SHM_OPEN                       = 266
+	SYS_SHM_UNLINK                     = 267
+	SYS_SEM_OPEN                       = 268
+	SYS_SEM_CLOSE                      = 269
+	SYS_SEM_UNLINK                     = 270
+	SYS_SEM_WAIT                       = 271
+	SYS_SEM_TRYWAIT                    = 272
+	SYS_SEM_POST                       = 273
+	SYS_SYSCTLBYNAME                   = 274
+	SYS_OPEN_EXTENDED                  = 277
+	SYS_UMASK_EXTENDED                 = 278
+	SYS_STAT_EXTENDED                  = 279
+	SYS_LSTAT_EXTENDED                 = 280
+	SYS_FSTAT_EXTENDED                 = 281
+	SYS_CHMOD_EXTENDED                 = 282
+	SYS_FCHMOD_EXTENDED                = 283
+	SYS_ACCESS_EXTENDED                = 284
+	SYS_SETTID                         = 285
+	SYS_GETTID                         = 286
+	SYS_SETSGROUPS                     = 287
+	SYS_GETSGROUPS                     = 288
+	SYS_SETWGROUPS                     = 289
+	SYS_GETWGROUPS                     = 290
+	SYS_MKFIFO_EXTENDED                = 291
+	SYS_MKDIR_EXTENDED                 = 292
+	SYS_IDENTITYSVC                    = 293
+	SYS_SHARED_REGION_CHECK_NP         = 294
+	SYS_VM_PRESSURE_MONITOR            = 296
+	SYS_PSYNCH_RW_LONGRDLOCK           = 297
+	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
+	SYS_PSYNCH_RW_DOWNGRADE            = 299
+	SYS_PSYNCH_RW_UPGRADE              = 300
+	SYS_PSYNCH_MUTEXWAIT               = 301
+	SYS_PSYNCH_MUTEXDROP               = 302
+	SYS_PSYNCH_CVBROAD                 = 303
+	SYS_PSYNCH_CVSIGNAL                = 304
+	SYS_PSYNCH_CVWAIT                  = 305
+	SYS_PSYNCH_RW_RDLOCK               = 306
+	SYS_PSYNCH_RW_WRLOCK               = 307
+	SYS_PSYNCH_RW_UNLOCK               = 308
+	SYS_PSYNCH_RW_UNLOCK2              = 309
+	SYS_GETSID                         = 310
+	SYS_SETTID_WITH_PID                = 311
+	SYS_PSYNCH_CVCLRPREPOST            = 312
+	SYS_AIO_FSYNC                      = 313
+	SYS_AIO_RETURN                     = 314
+	SYS_AIO_SUSPEND                    = 315
+	SYS_AIO_CANCEL                     = 316
+	SYS_AIO_ERROR                      = 317
+	SYS_AIO_READ                       = 318
+	SYS_AIO_WRITE                      = 319
+	SYS_LIO_LISTIO                     = 320
+	SYS_IOPOLICYSYS                    = 322
+	SYS_PROCESS_POLICY                 = 323
+	SYS_MLOCKALL                       = 324
+	SYS_MUNLOCKALL                     = 325
+	SYS_ISSETUGID                      = 327
+	SYS___PTHREAD_KILL                 = 328
+	SYS___PTHREAD_SIGMASK              = 329
+	SYS___SIGWAIT                      = 330
+	SYS___DISABLE_THREADSIGNAL         = 331
+	SYS___PTHREAD_MARKCANCEL           = 332
+	SYS___PTHREAD_CANCELED             = 333
+	SYS___SEMWAIT_SIGNAL               = 334
+	SYS_PROC_INFO                      = 336
+	SYS_SENDFILE                       = 337
+	SYS_STAT64                         = 338
+	SYS_FSTAT64                        = 339
+	SYS_LSTAT64                        = 340
+	SYS_STAT64_EXTENDED                = 341
+	SYS_LSTAT64_EXTENDED               = 342
+	SYS_FSTAT64_EXTENDED               = 343
+	SYS_GETDIRENTRIES64                = 344
+	SYS_STATFS64                       = 345
+	SYS_FSTATFS64                      = 346
+	SYS_GETFSSTAT64                    = 347
+	SYS___PTHREAD_CHDIR                = 348
+	SYS___PTHREAD_FCHDIR               = 349
+	SYS_AUDIT                          = 350
+	SYS_AUDITON                        = 351
+	SYS_GETAUID                        = 353
+	SYS_SETAUID                        = 354
+	SYS_GETAUDIT_ADDR                  = 357
+	SYS_SETAUDIT_ADDR                  = 358
+	SYS_AUDITCTL                       = 359
+	SYS_BSDTHREAD_CREATE               = 360
+	SYS_BSDTHREAD_TERMINATE            = 361
+	SYS_KQUEUE                         = 362
+	SYS_KEVENT                         = 363
+	SYS_LCHOWN                         = 364
+	SYS_STACK_SNAPSHOT                 = 365
+	SYS_BSDTHREAD_REGISTER             = 366
+	SYS_WORKQ_OPEN                     = 367
+	SYS_WORKQ_KERNRETURN               = 368
+	SYS_KEVENT64                       = 369
+	SYS___OLD_SEMWAIT_SIGNAL           = 370
+	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
+	SYS_THREAD_SELFID                  = 372
+	SYS_LEDGER                         = 373
+	SYS___MAC_EXECVE                   = 380
+	SYS___MAC_SYSCALL                  = 381
+	SYS___MAC_GET_FILE                 = 382
+	SYS___MAC_SET_FILE                 = 383
+	SYS___MAC_GET_LINK                 = 384
+	SYS___MAC_SET_LINK                 = 385
+	SYS___MAC_GET_PROC                 = 386
+	SYS___MAC_SET_PROC                 = 387
+	SYS___MAC_GET_FD                   = 388
+	SYS___MAC_SET_FD                   = 389
+	SYS___MAC_GET_PID                  = 390
+	SYS___MAC_GET_LCID                 = 391
+	SYS___MAC_GET_LCTX                 = 392
+	SYS___MAC_SET_LCTX                 = 393
+	SYS_SETLCID                        = 394
+	SYS_GETLCID                        = 395
+	SYS_READ_NOCANCEL                  = 396
+	SYS_WRITE_NOCANCEL                 = 397
+	SYS_OPEN_NOCANCEL                  = 398
+	SYS_CLOSE_NOCANCEL                 = 399
+	SYS_WAIT4_NOCANCEL                 = 400
+	SYS_RECVMSG_NOCANCEL               = 401
+	SYS_SENDMSG_NOCANCEL               = 402
+	SYS_RECVFROM_NOCANCEL              = 403
+	SYS_ACCEPT_NOCANCEL                = 404
+	SYS_MSYNC_NOCANCEL                 = 405
+	SYS_FCNTL_NOCANCEL                 = 406
+	SYS_SELECT_NOCANCEL                = 407
+	SYS_FSYNC_NOCANCEL                 = 408
+	SYS_CONNECT_NOCANCEL               = 409
+	SYS_SIGSUSPEND_NOCANCEL            = 410
+	SYS_READV_NOCANCEL                 = 411
+	SYS_WRITEV_NOCANCEL                = 412
+	SYS_SENDTO_NOCANCEL                = 413
+	SYS_PREAD_NOCANCEL                 = 414
+	SYS_PWRITE_NOCANCEL                = 415
+	SYS_WAITID_NOCANCEL                = 416
+	SYS_POLL_NOCANCEL                  = 417
+	SYS_MSGSND_NOCANCEL                = 418
+	SYS_MSGRCV_NOCANCEL                = 419
+	SYS_SEM_WAIT_NOCANCEL              = 420
+	SYS_AIO_SUSPEND_NOCANCEL           = 421
+	SYS___SIGWAIT_NOCANCEL             = 422
+	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
+	SYS___MAC_MOUNT                    = 424
+	SYS___MAC_GET_MOUNT                = 425
+	SYS___MAC_GETFSSTAT                = 426
+	SYS_FSGETPATH                      = 427
+	SYS_AUDIT_SESSION_SELF             = 428
+	SYS_AUDIT_SESSION_JOIN             = 429
+	SYS_FILEPORT_MAKEPORT              = 430
+	SYS_FILEPORT_MAKEFD                = 431
+	SYS_AUDIT_SESSION_PORT             = 432
+	SYS_PID_SUSPEND                    = 433
+	SYS_PID_RESUME                     = 434
+	SYS_PID_HIBERNATE                  = 435
+	SYS_PID_SHUTDOWN_SOCKETS           = 436
+	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
+	SYS_KAS_INFO                       = 439
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAME_EXT                     = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_MAXSYSCALL                     = 490
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
new file mode 100644
index 0000000000..d6038fa9b0
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
@@ -0,0 +1,304 @@
+// mksysnum_dragonfly.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build amd64,dragonfly
+
+package unix
+
+const (
+	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
+	SYS_EXIT          = 1   // { void exit(int rval); }
+	SYS_FORK          = 2   // { int fork(void); }
+	SYS_READ          = 3   // { ssize_t read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE         = 4   // { ssize_t write(int fd, const void *buf, size_t nbyte); }
+	SYS_OPEN          = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE         = 6   // { int close(int fd); }
+	SYS_WAIT4         = 7   // { int wait4(int pid, int *status, int options, \
+	SYS_LINK          = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK        = 10  // { int unlink(char *path); }
+	SYS_CHDIR         = 12  // { int chdir(char *path); }
+	SYS_FCHDIR        = 13  // { int fchdir(int fd); }
+	SYS_MKNOD         = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD         = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN         = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK        = 17  // { int obreak(char *nsize); } break obreak_args int
+	SYS_GETFSSTAT     = 18  // { int getfsstat(struct statfs *buf, long bufsize, \
+	SYS_GETPID        = 20  // { pid_t getpid(void); }
+	SYS_MOUNT         = 21  // { int mount(char *type, char *path, int flags, \
+	SYS_UNMOUNT       = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID        = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID        = 24  // { uid_t getuid(void); }
+	SYS_GETEUID       = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE        = 26  // { int ptrace(int req, pid_t pid, caddr_t addr, \
+	SYS_RECVMSG       = 27  // { int recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG       = 28  // { int sendmsg(int s, caddr_t msg, int flags); }
+	SYS_RECVFROM      = 29  // { int recvfrom(int s, caddr_t buf, size_t len, \
+	SYS_ACCEPT        = 30  // { int accept(int s, caddr_t name, int *anamelen); }
+	SYS_GETPEERNAME   = 31  // { int getpeername(int fdes, caddr_t asa, int *alen); }
+	SYS_GETSOCKNAME   = 32  // { int getsockname(int fdes, caddr_t asa, int *alen); }
+	SYS_ACCESS        = 33  // { int access(char *path, int flags); }
+	SYS_CHFLAGS       = 34  // { int chflags(char *path, int flags); }
+	SYS_FCHFLAGS      = 35  // { int fchflags(int fd, int flags); }
+	SYS_SYNC          = 36  // { int sync(void); }
+	SYS_KILL          = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID       = 39  // { pid_t getppid(void); }
+	SYS_DUP           = 41  // { int dup(u_int fd); }
+	SYS_PIPE          = 42  // { int pipe(void); }
+	SYS_GETEGID       = 43  // { gid_t getegid(void); }
+	SYS_PROFIL        = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE        = 45  // { int ktrace(const char *fname, int ops, int facs, \
+	SYS_GETGID        = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN      = 49  // { int getlogin(char *namebuf, u_int namelen); }
+	SYS_SETLOGIN      = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT          = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK   = 53  // { int sigaltstack(stack_t *ss, stack_t *oss); }
+	SYS_IOCTL         = 54  // { int ioctl(int fd, u_long com, caddr_t data); }
+	SYS_REBOOT        = 55  // { int reboot(int opt); }
+	SYS_REVOKE        = 56  // { int revoke(char *path); }
+	SYS_SYMLINK       = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK      = 58  // { int readlink(char *path, char *buf, int count); }
+	SYS_EXECVE        = 59  // { int execve(char *fname, char **argv, char **envv); }
+	SYS_UMASK         = 60  // { int umask(int newmask); } umask umask_args int
+	SYS_CHROOT        = 61  // { int chroot(char *path); }
+	SYS_MSYNC         = 65  // { int msync(void *addr, size_t len, int flags); }
+	SYS_VFORK         = 66  // { pid_t vfork(void); }
+	SYS_SBRK          = 69  // { int sbrk(int incr); }
+	SYS_SSTK          = 70  // { int sstk(int incr); }
+	SYS_MUNMAP        = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT      = 74  // { int mprotect(void *addr, size_t len, int prot); }
+	SYS_MADVISE       = 75  // { int madvise(void *addr, size_t len, int behav); }
+	SYS_MINCORE       = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS     = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS     = 80  // { int setgroups(u_int gidsetsize, gid_t *gidset); }
+	SYS_GETPGRP       = 81  // { int getpgrp(void); }
+	SYS_SETPGID       = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER     = 83  // { int setitimer(u_int which, struct itimerval *itv, \
+	SYS_SWAPON        = 85  // { int swapon(char *name); }
+	SYS_GETITIMER     = 86  // { int getitimer(u_int which, struct itimerval *itv); }
+	SYS_GETDTABLESIZE = 89  // { int getdtablesize(void); }
+	SYS_DUP2          = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL         = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT        = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC         = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY   = 96  // { int setpriority(int which, int who, int prio); }
+	SYS_SOCKET        = 97  // { int socket(int domain, int type, int protocol); }
+	SYS_CONNECT       = 98  // { int connect(int s, caddr_t name, int namelen); }
+	SYS_GETPRIORITY   = 100 // { int getpriority(int which, int who); }
+	SYS_BIND          = 104 // { int bind(int s, caddr_t name, int namelen); }
+	SYS_SETSOCKOPT    = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN        = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY  = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE     = 117 // { int getrusage(int who, struct rusage *rusage); }
+	SYS_GETSOCKOPT    = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV         = 120 // { int readv(int fd, struct iovec *iovp, u_int iovcnt); }
+	SYS_WRITEV        = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY  = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN        = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD        = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID      = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID      = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME        = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK         = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO        = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO        = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN      = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR    = 135 // { int socketpair(int domain, int type, int protocol, \
+	SYS_MKDIR         = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR         = 137 // { int rmdir(char *path); }
+	SYS_UTIMES        = 138 // { int utimes(char *path, struct timeval *tptr); }
+	SYS_ADJTIME       = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID        = 147 // { int setsid(void); }
+	SYS_QUOTACTL      = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_STATFS        = 157 // { int statfs(char *path, struct statfs *buf); }
+	SYS_FSTATFS       = 158 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_GETFH         = 161 // { int getfh(char *fname, struct fhandle *fhp); }
+	SYS_GETDOMAINNAME = 162 // { int getdomainname(char *domainname, int len); }
+	SYS_SETDOMAINNAME = 163 // { int setdomainname(char *domainname, int len); }
+	SYS_UNAME         = 164 // { int uname(struct utsname *name); }
+	SYS_SYSARCH       = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO        = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_EXTPREAD      = 173 // { ssize_t extpread(int fd, void *buf, \
+	SYS_EXTPWRITE     = 174 // { ssize_t extpwrite(int fd, const void *buf, \
+	SYS_NTP_ADJTIME   = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID        = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID       = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID       = 183 // { int seteuid(uid_t euid); }
+	SYS_PATHCONF      = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF     = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT     = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT     = 195 // { int setrlimit(u_int which, \
+	SYS_MMAP          = 197 // { caddr_t mmap(caddr_t addr, size_t len, int prot, \
+	// SYS_NOSYS = 198;  // { int nosys(void); } __syscall __syscall_args int
+	SYS_LSEEK                  = 199 // { off_t lseek(int fd, int pad, off_t offset, \
+	SYS_TRUNCATE               = 200 // { int truncate(char *path, int pad, off_t length); }
+	SYS_FTRUNCATE              = 201 // { int ftruncate(int fd, int pad, off_t length); }
+	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, void *old, \
+	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE               = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS___SEMCTL               = 220 // { int __semctl(int semid, int semnum, int cmd, \
+	SYS_SEMGET                 = 221 // { int semget(key_t key, int nsems, int semflg); }
+	SYS_SEMOP                  = 222 // { int semop(int semid, struct sembuf *sops, \
+	SYS_MSGCTL                 = 224 // { int msgctl(int msqid, int cmd, \
+	SYS_MSGGET                 = 225 // { int msgget(key_t key, int msgflg); }
+	SYS_MSGSND                 = 226 // { int msgsnd(int msqid, void *msgp, size_t msgsz, \
+	SYS_MSGRCV                 = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, \
+	SYS_SHMAT                  = 228 // { caddr_t shmat(int shmid, const void *shmaddr, \
+	SYS_SHMCTL                 = 229 // { int shmctl(int shmid, int cmd, \
+	SYS_SHMDT                  = 230 // { int shmdt(const void *shmaddr); }
+	SYS_SHMGET                 = 231 // { int shmget(key_t key, size_t size, int shmflg); }
+	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME          = 233 // { int clock_settime(clockid_t clock_id, \
+	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, int inherit); }
+	SYS_RFORK                  = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, u_int nfds, \
+	SYS_ISSETUGID              = 253 // { int issetugid(void); }
+	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                = 276 // { int lutimes(char *path, struct timeval *tptr); }
+	SYS_EXTPREADV              = 289 // { ssize_t extpreadv(int fd, struct iovec *iovp, \
+	SYS_EXTPWRITEV             = 290 // { ssize_t extpwritev(int fd, struct iovec *iovp,\
+	SYS_FHSTATFS               = 297 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
+	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
+	SYS_MODNEXT                = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                = 301 // { int modstat(int modid, struct module_stat* stat); }
+	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct kld_file_stat* stat); }
+	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
+	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
+	SYS_AIO_RETURN             = 314 // { int aio_return(struct aiocb *aiocbp); }
+	SYS_AIO_SUSPEND            = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
+	SYS_AIO_CANCEL             = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
+	SYS_AIO_ERROR              = 317 // { int aio_error(struct aiocb *aiocbp); }
+	SYS_AIO_READ               = 318 // { int aio_read(struct aiocb *aiocbp); }
+	SYS_AIO_WRITE              = 319 // { int aio_write(struct aiocb *aiocbp); }
+	SYS_LIO_LISTIO             = 320 // { int lio_listio(int mode, struct aiocb * const *acb_list, int nent, struct sigevent *sig); }
+	SYS_YIELD                  = 321 // { int yield(void); }
+	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
+	SYS___GETCWD               = 326 // { int __getcwd(u_char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
+	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
+	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
+	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, struct timespec *interval); }
+	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, void *data); }
+	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, const sigset_t *set, \
+	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGACTION              = 342 // { int sigaction(int sig, const struct sigaction *act, \
+	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGRETURN              = 344 // { int sigreturn(ucontext_t *sigcntxp); }
+	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set,\
+	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set,\
+	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, acl_type_t type, \
+	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, acl_type_t type, \
+	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, acl_type_t type); }
+	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, \
+	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE       = 356 // { int extattr_set_file(const char *path, \
+	SYS_EXTATTR_GET_FILE       = 357 // { int extattr_get_file(const char *path, \
+	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
+	SYS_AIO_WAITCOMPLETE       = 359 // { int aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
+	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
+	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
+	SYS_KQUEUE                 = 362 // { int kqueue(void); }
+	SYS_KEVENT                 = 363 // { int kevent(int fd, \
+	SYS_SCTP_PEELOFF           = 364 // { int sctp_peeloff(int sd, caddr_t name ); }
+	SYS_LCHFLAGS               = 391 // { int lchflags(char *path, int flags); }
+	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, int count); }
+	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, \
+	SYS_VARSYM_SET             = 450 // { int varsym_set(int level, const char *name, const char *data); }
+	SYS_VARSYM_GET             = 451 // { int varsym_get(int mask, const char *wild, char *buf, int bufsize); }
+	SYS_VARSYM_LIST            = 452 // { int varsym_list(int level, char *buf, int maxsize, int *marker); }
+	SYS_EXEC_SYS_REGISTER      = 465 // { int exec_sys_register(void *entry); }
+	SYS_EXEC_SYS_UNREGISTER    = 466 // { int exec_sys_unregister(int id); }
+	SYS_SYS_CHECKPOINT         = 467 // { int sys_checkpoint(int type, int fd, pid_t pid, int retval); }
+	SYS_MOUNTCTL               = 468 // { int mountctl(const char *path, int op, int fd, const void *ctl, int ctllen, void *buf, int buflen); }
+	SYS_UMTX_SLEEP             = 469 // { int umtx_sleep(volatile const int *ptr, int value, int timeout); }
+	SYS_UMTX_WAKEUP            = 470 // { int umtx_wakeup(volatile const int *ptr, int count); }
+	SYS_JAIL_ATTACH            = 471 // { int jail_attach(int jid); }
+	SYS_SET_TLS_AREA           = 472 // { int set_tls_area(int which, struct tls_info *info, size_t infosize); }
+	SYS_GET_TLS_AREA           = 473 // { int get_tls_area(int which, struct tls_info *info, size_t infosize); }
+	SYS_CLOSEFROM              = 474 // { int closefrom(int fd); }
+	SYS_STAT                   = 475 // { int stat(const char *path, struct stat *ub); }
+	SYS_FSTAT                  = 476 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                  = 477 // { int lstat(const char *path, struct stat *ub); }
+	SYS_FHSTAT                 = 478 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
+	SYS_GETDIRENTRIES          = 479 // { int getdirentries(int fd, char *buf, u_int count, \
+	SYS_GETDENTS               = 480 // { int getdents(int fd, char *buf, size_t count); }
+	SYS_USCHED_SET             = 481 // { int usched_set(pid_t pid, int cmd, void *data, \
+	SYS_EXTACCEPT              = 482 // { int extaccept(int s, int flags, caddr_t name, int *anamelen); }
+	SYS_EXTCONNECT             = 483 // { int extconnect(int s, int flags, caddr_t name, int namelen); }
+	SYS_MCONTROL               = 485 // { int mcontrol(void *addr, size_t len, int behav, off_t value); }
+	SYS_VMSPACE_CREATE         = 486 // { int vmspace_create(void *id, int type, void *data); }
+	SYS_VMSPACE_DESTROY        = 487 // { int vmspace_destroy(void *id); }
+	SYS_VMSPACE_CTL            = 488 // { int vmspace_ctl(void *id, int cmd, 		\
+	SYS_VMSPACE_MMAP           = 489 // { int vmspace_mmap(void *id, void *addr, size_t len, \
+	SYS_VMSPACE_MUNMAP         = 490 // { int vmspace_munmap(void *id, void *addr,	\
+	SYS_VMSPACE_MCONTROL       = 491 // { int vmspace_mcontrol(void *id, void *addr, 	\
+	SYS_VMSPACE_PREAD          = 492 // { ssize_t vmspace_pread(void *id, void *buf, \
+	SYS_VMSPACE_PWRITE         = 493 // { ssize_t vmspace_pwrite(void *id, const void *buf, \
+	SYS_EXTEXIT                = 494 // { void extexit(int how, int status, void *addr); }
+	SYS_LWP_CREATE             = 495 // { int lwp_create(struct lwp_params *params); }
+	SYS_LWP_GETTID             = 496 // { lwpid_t lwp_gettid(void); }
+	SYS_LWP_KILL               = 497 // { int lwp_kill(pid_t pid, lwpid_t tid, int signum); }
+	SYS_LWP_RTPRIO             = 498 // { int lwp_rtprio(int function, pid_t pid, lwpid_t tid, struct rtprio *rtp); }
+	SYS_PSELECT                = 499 // { int pselect(int nd, fd_set *in, fd_set *ou, \
+	SYS_STATVFS                = 500 // { int statvfs(const char *path, struct statvfs *buf); }
+	SYS_FSTATVFS               = 501 // { int fstatvfs(int fd, struct statvfs *buf); }
+	SYS_FHSTATVFS              = 502 // { int fhstatvfs(const struct fhandle *u_fhp, struct statvfs *buf); }
+	SYS_GETVFSSTAT             = 503 // { int getvfsstat(struct statfs *buf,          \
+	SYS_OPENAT                 = 504 // { int openat(int fd, char *path, int flags, int mode); }
+	SYS_FSTATAT                = 505 // { int fstatat(int fd, char *path, 	\
+	SYS_FCHMODAT               = 506 // { int fchmodat(int fd, char *path, int mode, \
+	SYS_FCHOWNAT               = 507 // { int fchownat(int fd, char *path, int uid, int gid, \
+	SYS_UNLINKAT               = 508 // { int unlinkat(int fd, char *path, int flags); }
+	SYS_FACCESSAT              = 509 // { int faccessat(int fd, char *path, int amode, \
+	SYS_MQ_OPEN                = 510 // { mqd_t mq_open(const char * name, int oflag, \
+	SYS_MQ_CLOSE               = 511 // { int mq_close(mqd_t mqdes); }
+	SYS_MQ_UNLINK              = 512 // { int mq_unlink(const char *name); }
+	SYS_MQ_GETATTR             = 513 // { int mq_getattr(mqd_t mqdes, \
+	SYS_MQ_SETATTR             = 514 // { int mq_setattr(mqd_t mqdes, \
+	SYS_MQ_NOTIFY              = 515 // { int mq_notify(mqd_t mqdes, \
+	SYS_MQ_SEND                = 516 // { int mq_send(mqd_t mqdes, const char *msg_ptr, \
+	SYS_MQ_RECEIVE             = 517 // { ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, \
+	SYS_MQ_TIMEDSEND           = 518 // { int mq_timedsend(mqd_t mqdes, \
+	SYS_MQ_TIMEDRECEIVE        = 519 // { ssize_t mq_timedreceive(mqd_t mqdes, \
+	SYS_IOPRIO_SET             = 520 // { int ioprio_set(int which, int who, int prio); }
+	SYS_IOPRIO_GET             = 521 // { int ioprio_get(int which, int who); }
+	SYS_CHROOT_KERNEL          = 522 // { int chroot_kernel(char *path); }
+	SYS_RENAMEAT               = 523 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_MKDIRAT                = 524 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT               = 525 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                = 526 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_READLINKAT             = 527 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_SYMLINKAT              = 528 // { int symlinkat(char *path1, int fd, char *path2); }
+	SYS_SWAPOFF                = 529 // { int swapoff(char *name); }
+	SYS_VQUOTACTL              = 530 // { int vquotactl(const char *path, \
+	SYS_LINKAT                 = 531 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_EACCESS                = 532 // { int eaccess(char *path, int flags); }
+	SYS_LPATHCONF              = 533 // { int lpathconf(char *path, int name); }
+	SYS_VMM_GUEST_CTL          = 534 // { int vmm_guest_ctl(int op, struct vmm_guest_options *options); }
+	SYS_VMM_GUEST_SYNC_ADDR    = 535 // { int vmm_guest_sync_addr(long *dstaddr, long *srcaddr); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
new file mode 100644
index 0000000000..262a84536a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
@@ -0,0 +1,351 @@
+// mksysnum_freebsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build 386,freebsd
+
+package unix
+
+const (
+	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
+	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                     = 2   // { int fork(void); }
+	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                    = 6   // { int close(int fd); }
+	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                     = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                   = 10  // { int unlink(char *path); }
+	SYS_CHDIR                    = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                   = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                   = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                   = 30  // { int accept(int s, \
+	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
+	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
+	SYS_SYNC                     = 36  // { int sync(void); }
+	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
+	SYS_DUP                      = 41  // { int dup(u_int fd); }
+	SYS_PIPE                     = 42  // { int pipe(void); }
+	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                   = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                     = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                   = 55  // { int reboot(int opt); }
+	SYS_REVOKE                   = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                   = 61  // { int chroot(char *path); }
+	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                    = 66  // { int vfork(void); }
+	SYS_SBRK                     = 69  // { int sbrk(int incr); }
+	SYS_SSTK                     = 70  // { int sstk(int incr); }
+	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
+	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                   = 85  // { int swapon(char *name); }
+	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
+	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                    = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                   = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                   = 147 // { int setsid(void); }
+	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                    = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
+	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
+	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
+	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
+	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                    = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID                = 253 // { int issetugid(void); }
+	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                    = 321 // { int yield(void); }
+	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
+	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
+	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                   = 362 // { int kqueue(void); }
+	SYS_KEVENT                   = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID                = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
+	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
+	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                   = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
+	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN                = 417 // { int sigreturn( \
+	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT               = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
+	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                    = 445 // { int audit(const void *record, \
+	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
+	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
+	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
+	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
+	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
+	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
+	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
+	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
+	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
+	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
+	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
+	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
+	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
+	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
+	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
+	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
+	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
+	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
+	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
+	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
+	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
+	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
+	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
+	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
+	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
+	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
+	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
+	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
+	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
+	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
+	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
+	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
new file mode 100644
index 0000000000..57a60ea126
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
@@ -0,0 +1,351 @@
+// mksysnum_freebsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build amd64,freebsd
+
+package unix
+
+const (
+	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
+	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                     = 2   // { int fork(void); }
+	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                    = 6   // { int close(int fd); }
+	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                     = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                   = 10  // { int unlink(char *path); }
+	SYS_CHDIR                    = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                   = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                   = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                   = 30  // { int accept(int s, \
+	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
+	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
+	SYS_SYNC                     = 36  // { int sync(void); }
+	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
+	SYS_DUP                      = 41  // { int dup(u_int fd); }
+	SYS_PIPE                     = 42  // { int pipe(void); }
+	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                   = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                     = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                   = 55  // { int reboot(int opt); }
+	SYS_REVOKE                   = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                   = 61  // { int chroot(char *path); }
+	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                    = 66  // { int vfork(void); }
+	SYS_SBRK                     = 69  // { int sbrk(int incr); }
+	SYS_SSTK                     = 70  // { int sstk(int incr); }
+	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
+	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                   = 85  // { int swapon(char *name); }
+	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
+	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                    = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                   = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                   = 147 // { int setsid(void); }
+	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                    = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
+	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
+	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
+	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
+	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                    = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID                = 253 // { int issetugid(void); }
+	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                    = 321 // { int yield(void); }
+	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
+	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
+	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                   = 362 // { int kqueue(void); }
+	SYS_KEVENT                   = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID                = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
+	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
+	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                   = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
+	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN                = 417 // { int sigreturn( \
+	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT               = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
+	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                    = 445 // { int audit(const void *record, \
+	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
+	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
+	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
+	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
+	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
+	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
+	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
+	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
+	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
+	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
+	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
+	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
+	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
+	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
+	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
+	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
+	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
+	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
+	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
+	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
+	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
+	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
+	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
+	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
+	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
+	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
+	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
+	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
+	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
+	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
+	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
+	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
new file mode 100644
index 0000000000..206b9f612d
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
@@ -0,0 +1,351 @@
+// mksysnum_freebsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm,freebsd
+
+package unix
+
+const (
+	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
+	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                     = 2   // { int fork(void); }
+	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                    = 6   // { int close(int fd); }
+	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                     = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                   = 10  // { int unlink(char *path); }
+	SYS_CHDIR                    = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                   = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                   = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                   = 30  // { int accept(int s, \
+	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
+	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
+	SYS_SYNC                     = 36  // { int sync(void); }
+	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
+	SYS_DUP                      = 41  // { int dup(u_int fd); }
+	SYS_PIPE                     = 42  // { int pipe(void); }
+	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                   = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                     = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                   = 55  // { int reboot(int opt); }
+	SYS_REVOKE                   = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                   = 61  // { int chroot(char *path); }
+	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                    = 66  // { int vfork(void); }
+	SYS_SBRK                     = 69  // { int sbrk(int incr); }
+	SYS_SSTK                     = 70  // { int sstk(int incr); }
+	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
+	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                   = 85  // { int swapon(char *name); }
+	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
+	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                    = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                   = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                   = 147 // { int setsid(void); }
+	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                    = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
+	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
+	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
+	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
+	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                    = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID                = 253 // { int issetugid(void); }
+	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                    = 321 // { int yield(void); }
+	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
+	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
+	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                   = 362 // { int kqueue(void); }
+	SYS_KEVENT                   = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID                = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
+	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
+	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                   = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
+	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN                = 417 // { int sigreturn( \
+	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT               = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
+	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                    = 445 // { int audit(const void *record, \
+	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
+	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
+	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
+	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
+	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
+	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
+	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
+	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
+	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
+	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
+	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
+	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
+	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
+	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
+	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
+	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
+	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
+	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
+	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
+	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
+	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
+	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
+	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
+	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
+	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
+	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
+	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
+	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
+	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
+	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
+	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
+	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
new file mode 100644
index 0000000000..ba952c6754
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
@@ -0,0 +1,355 @@
+// mksysnum_linux.pl /usr/include/asm/unistd_32.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build 386,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAITPID                = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BREAK                  = 17
+	SYS_OLDSTAT                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_OLDFSTAT               = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_STTY                   = 31
+	SYS_GTTY                   = 32
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_FTIME                  = 35
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_PROF                   = 44
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_LOCK                   = 53
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_MPX                    = 56
+	SYS_SETPGID                = 57
+	SYS_ULIMIT                 = 58
+	SYS_OLDOLDUNAME            = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SGETMASK               = 68
+	SYS_SSETMASK               = 69
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_OLDLSTAT               = 84
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_PROFIL                 = 98
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_IOPERM                 = 101
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_OLDUNAME               = 109
+	SYS_IOPL                   = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_VM86OLD                = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_MODIFY_LDT             = 123
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_VM86                   = 166
+	SYS_QUERY_MODULE           = 167
+	SYS_POLL                   = 168
+	SYS_NFSSERVCTL             = 169
+	SYS_SETRESGID              = 170
+	SYS_GETRESGID              = 171
+	SYS_PRCTL                  = 172
+	SYS_RT_SIGRETURN           = 173
+	SYS_RT_SIGACTION           = 174
+	SYS_RT_SIGPROCMASK         = 175
+	SYS_RT_SIGPENDING          = 176
+	SYS_RT_SIGTIMEDWAIT        = 177
+	SYS_RT_SIGQUEUEINFO        = 178
+	SYS_RT_SIGSUSPEND          = 179
+	SYS_PREAD64                = 180
+	SYS_PWRITE64               = 181
+	SYS_CHOWN                  = 182
+	SYS_GETCWD                 = 183
+	SYS_CAPGET                 = 184
+	SYS_CAPSET                 = 185
+	SYS_SIGALTSTACK            = 186
+	SYS_SENDFILE               = 187
+	SYS_GETPMSG                = 188
+	SYS_PUTPMSG                = 189
+	SYS_VFORK                  = 190
+	SYS_UGETRLIMIT             = 191
+	SYS_MMAP2                  = 192
+	SYS_TRUNCATE64             = 193
+	SYS_FTRUNCATE64            = 194
+	SYS_STAT64                 = 195
+	SYS_LSTAT64                = 196
+	SYS_FSTAT64                = 197
+	SYS_LCHOWN32               = 198
+	SYS_GETUID32               = 199
+	SYS_GETGID32               = 200
+	SYS_GETEUID32              = 201
+	SYS_GETEGID32              = 202
+	SYS_SETREUID32             = 203
+	SYS_SETREGID32             = 204
+	SYS_GETGROUPS32            = 205
+	SYS_SETGROUPS32            = 206
+	SYS_FCHOWN32               = 207
+	SYS_SETRESUID32            = 208
+	SYS_GETRESUID32            = 209
+	SYS_SETRESGID32            = 210
+	SYS_GETRESGID32            = 211
+	SYS_CHOWN32                = 212
+	SYS_SETUID32               = 213
+	SYS_SETGID32               = 214
+	SYS_SETFSUID32             = 215
+	SYS_SETFSGID32             = 216
+	SYS_PIVOT_ROOT             = 217
+	SYS_MINCORE                = 218
+	SYS_MADVISE                = 219
+	SYS_MADVISE1               = 219
+	SYS_GETDENTS64             = 220
+	SYS_FCNTL64                = 221
+	SYS_GETTID                 = 224
+	SYS_READAHEAD              = 225
+	SYS_SETXATTR               = 226
+	SYS_LSETXATTR              = 227
+	SYS_FSETXATTR              = 228
+	SYS_GETXATTR               = 229
+	SYS_LGETXATTR              = 230
+	SYS_FGETXATTR              = 231
+	SYS_LISTXATTR              = 232
+	SYS_LLISTXATTR             = 233
+	SYS_FLISTXATTR             = 234
+	SYS_REMOVEXATTR            = 235
+	SYS_LREMOVEXATTR           = 236
+	SYS_FREMOVEXATTR           = 237
+	SYS_TKILL                  = 238
+	SYS_SENDFILE64             = 239
+	SYS_FUTEX                  = 240
+	SYS_SCHED_SETAFFINITY      = 241
+	SYS_SCHED_GETAFFINITY      = 242
+	SYS_SET_THREAD_AREA        = 243
+	SYS_GET_THREAD_AREA        = 244
+	SYS_IO_SETUP               = 245
+	SYS_IO_DESTROY             = 246
+	SYS_IO_GETEVENTS           = 247
+	SYS_IO_SUBMIT              = 248
+	SYS_IO_CANCEL              = 249
+	SYS_FADVISE64              = 250
+	SYS_EXIT_GROUP             = 252
+	SYS_LOOKUP_DCOOKIE         = 253
+	SYS_EPOLL_CREATE           = 254
+	SYS_EPOLL_CTL              = 255
+	SYS_EPOLL_WAIT             = 256
+	SYS_REMAP_FILE_PAGES       = 257
+	SYS_SET_TID_ADDRESS        = 258
+	SYS_TIMER_CREATE           = 259
+	SYS_TIMER_SETTIME          = 260
+	SYS_TIMER_GETTIME          = 261
+	SYS_TIMER_GETOVERRUN       = 262
+	SYS_TIMER_DELETE           = 263
+	SYS_CLOCK_SETTIME          = 264
+	SYS_CLOCK_GETTIME          = 265
+	SYS_CLOCK_GETRES           = 266
+	SYS_CLOCK_NANOSLEEP        = 267
+	SYS_STATFS64               = 268
+	SYS_FSTATFS64              = 269
+	SYS_TGKILL                 = 270
+	SYS_UTIMES                 = 271
+	SYS_FADVISE64_64           = 272
+	SYS_VSERVER                = 273
+	SYS_MBIND                  = 274
+	SYS_GET_MEMPOLICY          = 275
+	SYS_SET_MEMPOLICY          = 276
+	SYS_MQ_OPEN                = 277
+	SYS_MQ_UNLINK              = 278
+	SYS_MQ_TIMEDSEND           = 279
+	SYS_MQ_TIMEDRECEIVE        = 280
+	SYS_MQ_NOTIFY              = 281
+	SYS_MQ_GETSETATTR          = 282
+	SYS_KEXEC_LOAD             = 283
+	SYS_WAITID                 = 284
+	SYS_ADD_KEY                = 286
+	SYS_REQUEST_KEY            = 287
+	SYS_KEYCTL                 = 288
+	SYS_IOPRIO_SET             = 289
+	SYS_IOPRIO_GET             = 290
+	SYS_INOTIFY_INIT           = 291
+	SYS_INOTIFY_ADD_WATCH      = 292
+	SYS_INOTIFY_RM_WATCH       = 293
+	SYS_MIGRATE_PAGES          = 294
+	SYS_OPENAT                 = 295
+	SYS_MKDIRAT                = 296
+	SYS_MKNODAT                = 297
+	SYS_FCHOWNAT               = 298
+	SYS_FUTIMESAT              = 299
+	SYS_FSTATAT64              = 300
+	SYS_UNLINKAT               = 301
+	SYS_RENAMEAT               = 302
+	SYS_LINKAT                 = 303
+	SYS_SYMLINKAT              = 304
+	SYS_READLINKAT             = 305
+	SYS_FCHMODAT               = 306
+	SYS_FACCESSAT              = 307
+	SYS_PSELECT6               = 308
+	SYS_PPOLL                  = 309
+	SYS_UNSHARE                = 310
+	SYS_SET_ROBUST_LIST        = 311
+	SYS_GET_ROBUST_LIST        = 312
+	SYS_SPLICE                 = 313
+	SYS_SYNC_FILE_RANGE        = 314
+	SYS_TEE                    = 315
+	SYS_VMSPLICE               = 316
+	SYS_MOVE_PAGES             = 317
+	SYS_GETCPU                 = 318
+	SYS_EPOLL_PWAIT            = 319
+	SYS_UTIMENSAT              = 320
+	SYS_SIGNALFD               = 321
+	SYS_TIMERFD_CREATE         = 322
+	SYS_EVENTFD                = 323
+	SYS_FALLOCATE              = 324
+	SYS_TIMERFD_SETTIME        = 325
+	SYS_TIMERFD_GETTIME        = 326
+	SYS_SIGNALFD4              = 327
+	SYS_EVENTFD2               = 328
+	SYS_EPOLL_CREATE1          = 329
+	SYS_DUP3                   = 330
+	SYS_PIPE2                  = 331
+	SYS_INOTIFY_INIT1          = 332
+	SYS_PREADV                 = 333
+	SYS_PWRITEV                = 334
+	SYS_RT_TGSIGQUEUEINFO      = 335
+	SYS_PERF_EVENT_OPEN        = 336
+	SYS_RECVMMSG               = 337
+	SYS_FANOTIFY_INIT          = 338
+	SYS_FANOTIFY_MARK          = 339
+	SYS_PRLIMIT64              = 340
+	SYS_NAME_TO_HANDLE_AT      = 341
+	SYS_OPEN_BY_HANDLE_AT      = 342
+	SYS_CLOCK_ADJTIME          = 343
+	SYS_SYNCFS                 = 344
+	SYS_SENDMMSG               = 345
+	SYS_SETNS                  = 346
+	SYS_PROCESS_VM_READV       = 347
+	SYS_PROCESS_VM_WRITEV      = 348
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
new file mode 100644
index 0000000000..ddac31f58a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
@@ -0,0 +1,321 @@
+// mksysnum_linux.pl /usr/include/asm/unistd_64.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build amd64,linux
+
+package unix
+
+const (
+	SYS_READ                   = 0
+	SYS_WRITE                  = 1
+	SYS_OPEN                   = 2
+	SYS_CLOSE                  = 3
+	SYS_STAT                   = 4
+	SYS_FSTAT                  = 5
+	SYS_LSTAT                  = 6
+	SYS_POLL                   = 7
+	SYS_LSEEK                  = 8
+	SYS_MMAP                   = 9
+	SYS_MPROTECT               = 10
+	SYS_MUNMAP                 = 11
+	SYS_BRK                    = 12
+	SYS_RT_SIGACTION           = 13
+	SYS_RT_SIGPROCMASK         = 14
+	SYS_RT_SIGRETURN           = 15
+	SYS_IOCTL                  = 16
+	SYS_PREAD64                = 17
+	SYS_PWRITE64               = 18
+	SYS_READV                  = 19
+	SYS_WRITEV                 = 20
+	SYS_ACCESS                 = 21
+	SYS_PIPE                   = 22
+	SYS_SELECT                 = 23
+	SYS_SCHED_YIELD            = 24
+	SYS_MREMAP                 = 25
+	SYS_MSYNC                  = 26
+	SYS_MINCORE                = 27
+	SYS_MADVISE                = 28
+	SYS_SHMGET                 = 29
+	SYS_SHMAT                  = 30
+	SYS_SHMCTL                 = 31
+	SYS_DUP                    = 32
+	SYS_DUP2                   = 33
+	SYS_PAUSE                  = 34
+	SYS_NANOSLEEP              = 35
+	SYS_GETITIMER              = 36
+	SYS_ALARM                  = 37
+	SYS_SETITIMER              = 38
+	SYS_GETPID                 = 39
+	SYS_SENDFILE               = 40
+	SYS_SOCKET                 = 41
+	SYS_CONNECT                = 42
+	SYS_ACCEPT                 = 43
+	SYS_SENDTO                 = 44
+	SYS_RECVFROM               = 45
+	SYS_SENDMSG                = 46
+	SYS_RECVMSG                = 47
+	SYS_SHUTDOWN               = 48
+	SYS_BIND                   = 49
+	SYS_LISTEN                 = 50
+	SYS_GETSOCKNAME            = 51
+	SYS_GETPEERNAME            = 52
+	SYS_SOCKETPAIR             = 53
+	SYS_SETSOCKOPT             = 54
+	SYS_GETSOCKOPT             = 55
+	SYS_CLONE                  = 56
+	SYS_FORK                   = 57
+	SYS_VFORK                  = 58
+	SYS_EXECVE                 = 59
+	SYS_EXIT                   = 60
+	SYS_WAIT4                  = 61
+	SYS_KILL                   = 62
+	SYS_UNAME                  = 63
+	SYS_SEMGET                 = 64
+	SYS_SEMOP                  = 65
+	SYS_SEMCTL                 = 66
+	SYS_SHMDT                  = 67
+	SYS_MSGGET                 = 68
+	SYS_MSGSND                 = 69
+	SYS_MSGRCV                 = 70
+	SYS_MSGCTL                 = 71
+	SYS_FCNTL                  = 72
+	SYS_FLOCK                  = 73
+	SYS_FSYNC                  = 74
+	SYS_FDATASYNC              = 75
+	SYS_TRUNCATE               = 76
+	SYS_FTRUNCATE              = 77
+	SYS_GETDENTS               = 78
+	SYS_GETCWD                 = 79
+	SYS_CHDIR                  = 80
+	SYS_FCHDIR                 = 81
+	SYS_RENAME                 = 82
+	SYS_MKDIR                  = 83
+	SYS_RMDIR                  = 84
+	SYS_CREAT                  = 85
+	SYS_LINK                   = 86
+	SYS_UNLINK                 = 87
+	SYS_SYMLINK                = 88
+	SYS_READLINK               = 89
+	SYS_CHMOD                  = 90
+	SYS_FCHMOD                 = 91
+	SYS_CHOWN                  = 92
+	SYS_FCHOWN                 = 93
+	SYS_LCHOWN                 = 94
+	SYS_UMASK                  = 95
+	SYS_GETTIMEOFDAY           = 96
+	SYS_GETRLIMIT              = 97
+	SYS_GETRUSAGE              = 98
+	SYS_SYSINFO                = 99
+	SYS_TIMES                  = 100
+	SYS_PTRACE                 = 101
+	SYS_GETUID                 = 102
+	SYS_SYSLOG                 = 103
+	SYS_GETGID                 = 104
+	SYS_SETUID                 = 105
+	SYS_SETGID                 = 106
+	SYS_GETEUID                = 107
+	SYS_GETEGID                = 108
+	SYS_SETPGID                = 109
+	SYS_GETPPID                = 110
+	SYS_GETPGRP                = 111
+	SYS_SETSID                 = 112
+	SYS_SETREUID               = 113
+	SYS_SETREGID               = 114
+	SYS_GETGROUPS              = 115
+	SYS_SETGROUPS              = 116
+	SYS_SETRESUID              = 117
+	SYS_GETRESUID              = 118
+	SYS_SETRESGID              = 119
+	SYS_GETRESGID              = 120
+	SYS_GETPGID                = 121
+	SYS_SETFSUID               = 122
+	SYS_SETFSGID               = 123
+	SYS_GETSID                 = 124
+	SYS_CAPGET                 = 125
+	SYS_CAPSET                 = 126
+	SYS_RT_SIGPENDING          = 127
+	SYS_RT_SIGTIMEDWAIT        = 128
+	SYS_RT_SIGQUEUEINFO        = 129
+	SYS_RT_SIGSUSPEND          = 130
+	SYS_SIGALTSTACK            = 131
+	SYS_UTIME                  = 132
+	SYS_MKNOD                  = 133
+	SYS_USELIB                 = 134
+	SYS_PERSONALITY            = 135
+	SYS_USTAT                  = 136
+	SYS_STATFS                 = 137
+	SYS_FSTATFS                = 138
+	SYS_SYSFS                  = 139
+	SYS_GETPRIORITY            = 140
+	SYS_SETPRIORITY            = 141
+	SYS_SCHED_SETPARAM         = 142
+	SYS_SCHED_GETPARAM         = 143
+	SYS_SCHED_SETSCHEDULER     = 144
+	SYS_SCHED_GETSCHEDULER     = 145
+	SYS_SCHED_GET_PRIORITY_MAX = 146
+	SYS_SCHED_GET_PRIORITY_MIN = 147
+	SYS_SCHED_RR_GET_INTERVAL  = 148
+	SYS_MLOCK                  = 149
+	SYS_MUNLOCK                = 150
+	SYS_MLOCKALL               = 151
+	SYS_MUNLOCKALL             = 152
+	SYS_VHANGUP                = 153
+	SYS_MODIFY_LDT             = 154
+	SYS_PIVOT_ROOT             = 155
+	SYS__SYSCTL                = 156
+	SYS_PRCTL                  = 157
+	SYS_ARCH_PRCTL             = 158
+	SYS_ADJTIMEX               = 159
+	SYS_SETRLIMIT              = 160
+	SYS_CHROOT                 = 161
+	SYS_SYNC                   = 162
+	SYS_ACCT                   = 163
+	SYS_SETTIMEOFDAY           = 164
+	SYS_MOUNT                  = 165
+	SYS_UMOUNT2                = 166
+	SYS_SWAPON                 = 167
+	SYS_SWAPOFF                = 168
+	SYS_REBOOT                 = 169
+	SYS_SETHOSTNAME            = 170
+	SYS_SETDOMAINNAME          = 171
+	SYS_IOPL                   = 172
+	SYS_IOPERM                 = 173
+	SYS_CREATE_MODULE          = 174
+	SYS_INIT_MODULE            = 175
+	SYS_DELETE_MODULE          = 176
+	SYS_GET_KERNEL_SYMS        = 177
+	SYS_QUERY_MODULE           = 178
+	SYS_QUOTACTL               = 179
+	SYS_NFSSERVCTL             = 180
+	SYS_GETPMSG                = 181
+	SYS_PUTPMSG                = 182
+	SYS_AFS_SYSCALL            = 183
+	SYS_TUXCALL                = 184
+	SYS_SECURITY               = 185
+	SYS_GETTID                 = 186
+	SYS_READAHEAD              = 187
+	SYS_SETXATTR               = 188
+	SYS_LSETXATTR              = 189
+	SYS_FSETXATTR              = 190
+	SYS_GETXATTR               = 191
+	SYS_LGETXATTR              = 192
+	SYS_FGETXATTR              = 193
+	SYS_LISTXATTR              = 194
+	SYS_LLISTXATTR             = 195
+	SYS_FLISTXATTR             = 196
+	SYS_REMOVEXATTR            = 197
+	SYS_LREMOVEXATTR           = 198
+	SYS_FREMOVEXATTR           = 199
+	SYS_TKILL                  = 200
+	SYS_TIME                   = 201
+	SYS_FUTEX                  = 202
+	SYS_SCHED_SETAFFINITY      = 203
+	SYS_SCHED_GETAFFINITY      = 204
+	SYS_SET_THREAD_AREA        = 205
+	SYS_IO_SETUP               = 206
+	SYS_IO_DESTROY             = 207
+	SYS_IO_GETEVENTS           = 208
+	SYS_IO_SUBMIT              = 209
+	SYS_IO_CANCEL              = 210
+	SYS_GET_THREAD_AREA        = 211
+	SYS_LOOKUP_DCOOKIE         = 212
+	SYS_EPOLL_CREATE           = 213
+	SYS_EPOLL_CTL_OLD          = 214
+	SYS_EPOLL_WAIT_OLD         = 215
+	SYS_REMAP_FILE_PAGES       = 216
+	SYS_GETDENTS64             = 217
+	SYS_SET_TID_ADDRESS        = 218
+	SYS_RESTART_SYSCALL        = 219
+	SYS_SEMTIMEDOP             = 220
+	SYS_FADVISE64              = 221
+	SYS_TIMER_CREATE           = 222
+	SYS_TIMER_SETTIME          = 223
+	SYS_TIMER_GETTIME          = 224
+	SYS_TIMER_GETOVERRUN       = 225
+	SYS_TIMER_DELETE           = 226
+	SYS_CLOCK_SETTIME          = 227
+	SYS_CLOCK_GETTIME          = 228
+	SYS_CLOCK_GETRES           = 229
+	SYS_CLOCK_NANOSLEEP        = 230
+	SYS_EXIT_GROUP             = 231
+	SYS_EPOLL_WAIT             = 232
+	SYS_EPOLL_CTL              = 233
+	SYS_TGKILL                 = 234
+	SYS_UTIMES                 = 235
+	SYS_VSERVER                = 236
+	SYS_MBIND                  = 237
+	SYS_SET_MEMPOLICY          = 238
+	SYS_GET_MEMPOLICY          = 239
+	SYS_MQ_OPEN                = 240
+	SYS_MQ_UNLINK              = 241
+	SYS_MQ_TIMEDSEND           = 242
+	SYS_MQ_TIMEDRECEIVE        = 243
+	SYS_MQ_NOTIFY              = 244
+	SYS_MQ_GETSETATTR          = 245
+	SYS_KEXEC_LOAD             = 246
+	SYS_WAITID                 = 247
+	SYS_ADD_KEY                = 248
+	SYS_REQUEST_KEY            = 249
+	SYS_KEYCTL                 = 250
+	SYS_IOPRIO_SET             = 251
+	SYS_IOPRIO_GET             = 252
+	SYS_INOTIFY_INIT           = 253
+	SYS_INOTIFY_ADD_WATCH      = 254
+	SYS_INOTIFY_RM_WATCH       = 255
+	SYS_MIGRATE_PAGES          = 256
+	SYS_OPENAT                 = 257
+	SYS_MKDIRAT                = 258
+	SYS_MKNODAT                = 259
+	SYS_FCHOWNAT               = 260
+	SYS_FUTIMESAT              = 261
+	SYS_NEWFSTATAT             = 262
+	SYS_UNLINKAT               = 263
+	SYS_RENAMEAT               = 264
+	SYS_LINKAT                 = 265
+	SYS_SYMLINKAT              = 266
+	SYS_READLINKAT             = 267
+	SYS_FCHMODAT               = 268
+	SYS_FACCESSAT              = 269
+	SYS_PSELECT6               = 270
+	SYS_PPOLL                  = 271
+	SYS_UNSHARE                = 272
+	SYS_SET_ROBUST_LIST        = 273
+	SYS_GET_ROBUST_LIST        = 274
+	SYS_SPLICE                 = 275
+	SYS_TEE                    = 276
+	SYS_SYNC_FILE_RANGE        = 277
+	SYS_VMSPLICE               = 278
+	SYS_MOVE_PAGES             = 279
+	SYS_UTIMENSAT              = 280
+	SYS_EPOLL_PWAIT            = 281
+	SYS_SIGNALFD               = 282
+	SYS_TIMERFD_CREATE         = 283
+	SYS_EVENTFD                = 284
+	SYS_FALLOCATE              = 285
+	SYS_TIMERFD_SETTIME        = 286
+	SYS_TIMERFD_GETTIME        = 287
+	SYS_ACCEPT4                = 288
+	SYS_SIGNALFD4              = 289
+	SYS_EVENTFD2               = 290
+	SYS_EPOLL_CREATE1          = 291
+	SYS_DUP3                   = 292
+	SYS_PIPE2                  = 293
+	SYS_INOTIFY_INIT1          = 294
+	SYS_PREADV                 = 295
+	SYS_PWRITEV                = 296
+	SYS_RT_TGSIGQUEUEINFO      = 297
+	SYS_PERF_EVENT_OPEN        = 298
+	SYS_RECVMMSG               = 299
+	SYS_FANOTIFY_INIT          = 300
+	SYS_FANOTIFY_MARK          = 301
+	SYS_PRLIMIT64              = 302
+	SYS_NAME_TO_HANDLE_AT      = 303
+	SYS_OPEN_BY_HANDLE_AT      = 304
+	SYS_CLOCK_ADJTIME          = 305
+	SYS_SYNCFS                 = 306
+	SYS_SENDMMSG               = 307
+	SYS_SETNS                  = 308
+	SYS_GETCPU                 = 309
+	SYS_PROCESS_VM_READV       = 310
+	SYS_PROCESS_VM_WRITEV      = 311
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
new file mode 100644
index 0000000000..45ced17fc4
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
@@ -0,0 +1,356 @@
+// mksysnum_linux.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm,linux
+
+package unix
+
+const (
+	SYS_OABI_SYSCALL_BASE      = 0
+	SYS_SYSCALL_BASE           = 0
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_SETPGID                = 57
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_VHANGUP                = 111
+	SYS_SYSCALL                = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_POLL                   = 168
+	SYS_NFSSERVCTL             = 169
+	SYS_SETRESGID              = 170
+	SYS_GETRESGID              = 171
+	SYS_PRCTL                  = 172
+	SYS_RT_SIGRETURN           = 173
+	SYS_RT_SIGACTION           = 174
+	SYS_RT_SIGPROCMASK         = 175
+	SYS_RT_SIGPENDING          = 176
+	SYS_RT_SIGTIMEDWAIT        = 177
+	SYS_RT_SIGQUEUEINFO        = 178
+	SYS_RT_SIGSUSPEND          = 179
+	SYS_PREAD64                = 180
+	SYS_PWRITE64               = 181
+	SYS_CHOWN                  = 182
+	SYS_GETCWD                 = 183
+	SYS_CAPGET                 = 184
+	SYS_CAPSET                 = 185
+	SYS_SIGALTSTACK            = 186
+	SYS_SENDFILE               = 187
+	SYS_VFORK                  = 190
+	SYS_UGETRLIMIT             = 191
+	SYS_MMAP2                  = 192
+	SYS_TRUNCATE64             = 193
+	SYS_FTRUNCATE64            = 194
+	SYS_STAT64                 = 195
+	SYS_LSTAT64                = 196
+	SYS_FSTAT64                = 197
+	SYS_LCHOWN32               = 198
+	SYS_GETUID32               = 199
+	SYS_GETGID32               = 200
+	SYS_GETEUID32              = 201
+	SYS_GETEGID32              = 202
+	SYS_SETREUID32             = 203
+	SYS_SETREGID32             = 204
+	SYS_GETGROUPS32            = 205
+	SYS_SETGROUPS32            = 206
+	SYS_FCHOWN32               = 207
+	SYS_SETRESUID32            = 208
+	SYS_GETRESUID32            = 209
+	SYS_SETRESGID32            = 210
+	SYS_GETRESGID32            = 211
+	SYS_CHOWN32                = 212
+	SYS_SETUID32               = 213
+	SYS_SETGID32               = 214
+	SYS_SETFSUID32             = 215
+	SYS_SETFSGID32             = 216
+	SYS_GETDENTS64             = 217
+	SYS_PIVOT_ROOT             = 218
+	SYS_MINCORE                = 219
+	SYS_MADVISE                = 220
+	SYS_FCNTL64                = 221
+	SYS_GETTID                 = 224
+	SYS_READAHEAD              = 225
+	SYS_SETXATTR               = 226
+	SYS_LSETXATTR              = 227
+	SYS_FSETXATTR              = 228
+	SYS_GETXATTR               = 229
+	SYS_LGETXATTR              = 230
+	SYS_FGETXATTR              = 231
+	SYS_LISTXATTR              = 232
+	SYS_LLISTXATTR             = 233
+	SYS_FLISTXATTR             = 234
+	SYS_REMOVEXATTR            = 235
+	SYS_LREMOVEXATTR           = 236
+	SYS_FREMOVEXATTR           = 237
+	SYS_TKILL                  = 238
+	SYS_SENDFILE64             = 239
+	SYS_FUTEX                  = 240
+	SYS_SCHED_SETAFFINITY      = 241
+	SYS_SCHED_GETAFFINITY      = 242
+	SYS_IO_SETUP               = 243
+	SYS_IO_DESTROY             = 244
+	SYS_IO_GETEVENTS           = 245
+	SYS_IO_SUBMIT              = 246
+	SYS_IO_CANCEL              = 247
+	SYS_EXIT_GROUP             = 248
+	SYS_LOOKUP_DCOOKIE         = 249
+	SYS_EPOLL_CREATE           = 250
+	SYS_EPOLL_CTL              = 251
+	SYS_EPOLL_WAIT             = 252
+	SYS_REMAP_FILE_PAGES       = 253
+	SYS_SET_TID_ADDRESS        = 256
+	SYS_TIMER_CREATE           = 257
+	SYS_TIMER_SETTIME          = 258
+	SYS_TIMER_GETTIME          = 259
+	SYS_TIMER_GETOVERRUN       = 260
+	SYS_TIMER_DELETE           = 261
+	SYS_CLOCK_SETTIME          = 262
+	SYS_CLOCK_GETTIME          = 263
+	SYS_CLOCK_GETRES           = 264
+	SYS_CLOCK_NANOSLEEP        = 265
+	SYS_STATFS64               = 266
+	SYS_FSTATFS64              = 267
+	SYS_TGKILL                 = 268
+	SYS_UTIMES                 = 269
+	SYS_ARM_FADVISE64_64       = 270
+	SYS_PCICONFIG_IOBASE       = 271
+	SYS_PCICONFIG_READ         = 272
+	SYS_PCICONFIG_WRITE        = 273
+	SYS_MQ_OPEN                = 274
+	SYS_MQ_UNLINK              = 275
+	SYS_MQ_TIMEDSEND           = 276
+	SYS_MQ_TIMEDRECEIVE        = 277
+	SYS_MQ_NOTIFY              = 278
+	SYS_MQ_GETSETATTR          = 279
+	SYS_WAITID                 = 280
+	SYS_SOCKET                 = 281
+	SYS_BIND                   = 282
+	SYS_CONNECT                = 283
+	SYS_LISTEN                 = 284
+	SYS_ACCEPT                 = 285
+	SYS_GETSOCKNAME            = 286
+	SYS_GETPEERNAME            = 287
+	SYS_SOCKETPAIR             = 288
+	SYS_SEND                   = 289
+	SYS_SENDTO                 = 290
+	SYS_RECV                   = 291
+	SYS_RECVFROM               = 292
+	SYS_SHUTDOWN               = 293
+	SYS_SETSOCKOPT             = 294
+	SYS_GETSOCKOPT             = 295
+	SYS_SENDMSG                = 296
+	SYS_RECVMSG                = 297
+	SYS_SEMOP                  = 298
+	SYS_SEMGET                 = 299
+	SYS_SEMCTL                 = 300
+	SYS_MSGSND                 = 301
+	SYS_MSGRCV                 = 302
+	SYS_MSGGET                 = 303
+	SYS_MSGCTL                 = 304
+	SYS_SHMAT                  = 305
+	SYS_SHMDT                  = 306
+	SYS_SHMGET                 = 307
+	SYS_SHMCTL                 = 308
+	SYS_ADD_KEY                = 309
+	SYS_REQUEST_KEY            = 310
+	SYS_KEYCTL                 = 311
+	SYS_SEMTIMEDOP             = 312
+	SYS_VSERVER                = 313
+	SYS_IOPRIO_SET             = 314
+	SYS_IOPRIO_GET             = 315
+	SYS_INOTIFY_INIT           = 316
+	SYS_INOTIFY_ADD_WATCH      = 317
+	SYS_INOTIFY_RM_WATCH       = 318
+	SYS_MBIND                  = 319
+	SYS_GET_MEMPOLICY          = 320
+	SYS_SET_MEMPOLICY          = 321
+	SYS_OPENAT                 = 322
+	SYS_MKDIRAT                = 323
+	SYS_MKNODAT                = 324
+	SYS_FCHOWNAT               = 325
+	SYS_FUTIMESAT              = 326
+	SYS_FSTATAT64              = 327
+	SYS_UNLINKAT               = 328
+	SYS_RENAMEAT               = 329
+	SYS_LINKAT                 = 330
+	SYS_SYMLINKAT              = 331
+	SYS_READLINKAT             = 332
+	SYS_FCHMODAT               = 333
+	SYS_FACCESSAT              = 334
+	SYS_PSELECT6               = 335
+	SYS_PPOLL                  = 336
+	SYS_UNSHARE                = 337
+	SYS_SET_ROBUST_LIST        = 338
+	SYS_GET_ROBUST_LIST        = 339
+	SYS_SPLICE                 = 340
+	SYS_ARM_SYNC_FILE_RANGE    = 341
+	SYS_TEE                    = 342
+	SYS_VMSPLICE               = 343
+	SYS_MOVE_PAGES             = 344
+	SYS_GETCPU                 = 345
+	SYS_EPOLL_PWAIT            = 346
+	SYS_KEXEC_LOAD             = 347
+	SYS_UTIMENSAT              = 348
+	SYS_SIGNALFD               = 349
+	SYS_TIMERFD_CREATE         = 350
+	SYS_EVENTFD                = 351
+	SYS_FALLOCATE              = 352
+	SYS_TIMERFD_SETTIME        = 353
+	SYS_TIMERFD_GETTIME        = 354
+	SYS_SIGNALFD4              = 355
+	SYS_EVENTFD2               = 356
+	SYS_EPOLL_CREATE1          = 357
+	SYS_DUP3                   = 358
+	SYS_PIPE2                  = 359
+	SYS_INOTIFY_INIT1          = 360
+	SYS_PREADV                 = 361
+	SYS_PWRITEV                = 362
+	SYS_RT_TGSIGQUEUEINFO      = 363
+	SYS_PERF_EVENT_OPEN        = 364
+	SYS_RECVMMSG               = 365
+	SYS_ACCEPT4                = 366
+	SYS_FANOTIFY_INIT          = 367
+	SYS_FANOTIFY_MARK          = 368
+	SYS_PRLIMIT64              = 369
+	SYS_NAME_TO_HANDLE_AT      = 370
+	SYS_OPEN_BY_HANDLE_AT      = 371
+	SYS_CLOCK_ADJTIME          = 372
+	SYS_SYNCFS                 = 373
+	SYS_SENDMMSG               = 374
+	SYS_SETNS                  = 375
+	SYS_PROCESS_VM_READV       = 376
+	SYS_PROCESS_VM_WRITEV      = 377
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
new file mode 100644
index 0000000000..2e9514f280
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
@@ -0,0 +1,272 @@
+// mksysnum_linux.pl /usr/include/asm-generic/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm64,linux
+
+package unix
+
+const (
+	SYS_IO_SETUP               = 0
+	SYS_IO_DESTROY             = 1
+	SYS_IO_SUBMIT              = 2
+	SYS_IO_CANCEL              = 3
+	SYS_IO_GETEVENTS           = 4
+	SYS_SETXATTR               = 5
+	SYS_LSETXATTR              = 6
+	SYS_FSETXATTR              = 7
+	SYS_GETXATTR               = 8
+	SYS_LGETXATTR              = 9
+	SYS_FGETXATTR              = 10
+	SYS_LISTXATTR              = 11
+	SYS_LLISTXATTR             = 12
+	SYS_FLISTXATTR             = 13
+	SYS_REMOVEXATTR            = 14
+	SYS_LREMOVEXATTR           = 15
+	SYS_FREMOVEXATTR           = 16
+	SYS_GETCWD                 = 17
+	SYS_LOOKUP_DCOOKIE         = 18
+	SYS_EVENTFD2               = 19
+	SYS_EPOLL_CREATE1          = 20
+	SYS_EPOLL_CTL              = 21
+	SYS_EPOLL_PWAIT            = 22
+	SYS_DUP                    = 23
+	SYS_DUP3                   = 24
+	SYS_FCNTL                  = 25
+	SYS_INOTIFY_INIT1          = 26
+	SYS_INOTIFY_ADD_WATCH      = 27
+	SYS_INOTIFY_RM_WATCH       = 28
+	SYS_IOCTL                  = 29
+	SYS_IOPRIO_SET             = 30
+	SYS_IOPRIO_GET             = 31
+	SYS_FLOCK                  = 32
+	SYS_MKNODAT                = 33
+	SYS_MKDIRAT                = 34
+	SYS_UNLINKAT               = 35
+	SYS_SYMLINKAT              = 36
+	SYS_LINKAT                 = 37
+	SYS_RENAMEAT               = 38
+	SYS_UMOUNT2                = 39
+	SYS_MOUNT                  = 40
+	SYS_PIVOT_ROOT             = 41
+	SYS_NFSSERVCTL             = 42
+	SYS_STATFS                 = 43
+	SYS_FSTATFS                = 44
+	SYS_TRUNCATE               = 45
+	SYS_FTRUNCATE              = 46
+	SYS_FALLOCATE              = 47
+	SYS_FACCESSAT              = 48
+	SYS_CHDIR                  = 49
+	SYS_FCHDIR                 = 50
+	SYS_CHROOT                 = 51
+	SYS_FCHMOD                 = 52
+	SYS_FCHMODAT               = 53
+	SYS_FCHOWNAT               = 54
+	SYS_FCHOWN                 = 55
+	SYS_OPENAT                 = 56
+	SYS_CLOSE                  = 57
+	SYS_VHANGUP                = 58
+	SYS_PIPE2                  = 59
+	SYS_QUOTACTL               = 60
+	SYS_GETDENTS64             = 61
+	SYS_LSEEK                  = 62
+	SYS_READ                   = 63
+	SYS_WRITE                  = 64
+	SYS_READV                  = 65
+	SYS_WRITEV                 = 66
+	SYS_PREAD64                = 67
+	SYS_PWRITE64               = 68
+	SYS_PREADV                 = 69
+	SYS_PWRITEV                = 70
+	SYS_SENDFILE               = 71
+	SYS_PSELECT6               = 72
+	SYS_PPOLL                  = 73
+	SYS_SIGNALFD4              = 74
+	SYS_VMSPLICE               = 75
+	SYS_SPLICE                 = 76
+	SYS_TEE                    = 77
+	SYS_READLINKAT             = 78
+	SYS_FSTATAT                = 79
+	SYS_FSTAT                  = 80
+	SYS_SYNC                   = 81
+	SYS_FSYNC                  = 82
+	SYS_FDATASYNC              = 83
+	SYS_SYNC_FILE_RANGE        = 84
+	SYS_TIMERFD_CREATE         = 85
+	SYS_TIMERFD_SETTIME        = 86
+	SYS_TIMERFD_GETTIME        = 87
+	SYS_UTIMENSAT              = 88
+	SYS_ACCT                   = 89
+	SYS_CAPGET                 = 90
+	SYS_CAPSET                 = 91
+	SYS_PERSONALITY            = 92
+	SYS_EXIT                   = 93
+	SYS_EXIT_GROUP             = 94
+	SYS_WAITID                 = 95
+	SYS_SET_TID_ADDRESS        = 96
+	SYS_UNSHARE                = 97
+	SYS_FUTEX                  = 98
+	SYS_SET_ROBUST_LIST        = 99
+	SYS_GET_ROBUST_LIST        = 100
+	SYS_NANOSLEEP              = 101
+	SYS_GETITIMER              = 102
+	SYS_SETITIMER              = 103
+	SYS_KEXEC_LOAD             = 104
+	SYS_INIT_MODULE            = 105
+	SYS_DELETE_MODULE          = 106
+	SYS_TIMER_CREATE           = 107
+	SYS_TIMER_GETTIME          = 108
+	SYS_TIMER_GETOVERRUN       = 109
+	SYS_TIMER_SETTIME          = 110
+	SYS_TIMER_DELETE           = 111
+	SYS_CLOCK_SETTIME          = 112
+	SYS_CLOCK_GETTIME          = 113
+	SYS_CLOCK_GETRES           = 114
+	SYS_CLOCK_NANOSLEEP        = 115
+	SYS_SYSLOG                 = 116
+	SYS_PTRACE                 = 117
+	SYS_SCHED_SETPARAM         = 118
+	SYS_SCHED_SETSCHEDULER     = 119
+	SYS_SCHED_GETSCHEDULER     = 120
+	SYS_SCHED_GETPARAM         = 121
+	SYS_SCHED_SETAFFINITY      = 122
+	SYS_SCHED_GETAFFINITY      = 123
+	SYS_SCHED_YIELD            = 124
+	SYS_SCHED_GET_PRIORITY_MAX = 125
+	SYS_SCHED_GET_PRIORITY_MIN = 126
+	SYS_SCHED_RR_GET_INTERVAL  = 127
+	SYS_RESTART_SYSCALL        = 128
+	SYS_KILL                   = 129
+	SYS_TKILL                  = 130
+	SYS_TGKILL                 = 131
+	SYS_SIGALTSTACK            = 132
+	SYS_RT_SIGSUSPEND          = 133
+	SYS_RT_SIGACTION           = 134
+	SYS_RT_SIGPROCMASK         = 135
+	SYS_RT_SIGPENDING          = 136
+	SYS_RT_SIGTIMEDWAIT        = 137
+	SYS_RT_SIGQUEUEINFO        = 138
+	SYS_RT_SIGRETURN           = 139
+	SYS_SETPRIORITY            = 140
+	SYS_GETPRIORITY            = 141
+	SYS_REBOOT                 = 142
+	SYS_SETREGID               = 143
+	SYS_SETGID                 = 144
+	SYS_SETREUID               = 145
+	SYS_SETUID                 = 146
+	SYS_SETRESUID              = 147
+	SYS_GETRESUID              = 148
+	SYS_SETRESGID              = 149
+	SYS_GETRESGID              = 150
+	SYS_SETFSUID               = 151
+	SYS_SETFSGID               = 152
+	SYS_TIMES                  = 153
+	SYS_SETPGID                = 154
+	SYS_GETPGID                = 155
+	SYS_GETSID                 = 156
+	SYS_SETSID                 = 157
+	SYS_GETGROUPS              = 158
+	SYS_SETGROUPS              = 159
+	SYS_UNAME                  = 160
+	SYS_SETHOSTNAME            = 161
+	SYS_SETDOMAINNAME          = 162
+	SYS_GETRLIMIT              = 163
+	SYS_SETRLIMIT              = 164
+	SYS_GETRUSAGE              = 165
+	SYS_UMASK                  = 166
+	SYS_PRCTL                  = 167
+	SYS_GETCPU                 = 168
+	SYS_GETTIMEOFDAY           = 169
+	SYS_SETTIMEOFDAY           = 170
+	SYS_ADJTIMEX               = 171
+	SYS_GETPID                 = 172
+	SYS_GETPPID                = 173
+	SYS_GETUID                 = 174
+	SYS_GETEUID                = 175
+	SYS_GETGID                 = 176
+	SYS_GETEGID                = 177
+	SYS_GETTID                 = 178
+	SYS_SYSINFO                = 179
+	SYS_MQ_OPEN                = 180
+	SYS_MQ_UNLINK              = 181
+	SYS_MQ_TIMEDSEND           = 182
+	SYS_MQ_TIMEDRECEIVE        = 183
+	SYS_MQ_NOTIFY              = 184
+	SYS_MQ_GETSETATTR          = 185
+	SYS_MSGGET                 = 186
+	SYS_MSGCTL                 = 187
+	SYS_MSGRCV                 = 188
+	SYS_MSGSND                 = 189
+	SYS_SEMGET                 = 190
+	SYS_SEMCTL                 = 191
+	SYS_SEMTIMEDOP             = 192
+	SYS_SEMOP                  = 193
+	SYS_SHMGET                 = 194
+	SYS_SHMCTL                 = 195
+	SYS_SHMAT                  = 196
+	SYS_SHMDT                  = 197
+	SYS_SOCKET                 = 198
+	SYS_SOCKETPAIR             = 199
+	SYS_BIND                   = 200
+	SYS_LISTEN                 = 201
+	SYS_ACCEPT                 = 202
+	SYS_CONNECT                = 203
+	SYS_GETSOCKNAME            = 204
+	SYS_GETPEERNAME            = 205
+	SYS_SENDTO                 = 206
+	SYS_RECVFROM               = 207
+	SYS_SETSOCKOPT             = 208
+	SYS_GETSOCKOPT             = 209
+	SYS_SHUTDOWN               = 210
+	SYS_SENDMSG                = 211
+	SYS_RECVMSG                = 212
+	SYS_READAHEAD              = 213
+	SYS_BRK                    = 214
+	SYS_MUNMAP                 = 215
+	SYS_MREMAP                 = 216
+	SYS_ADD_KEY                = 217
+	SYS_REQUEST_KEY            = 218
+	SYS_KEYCTL                 = 219
+	SYS_CLONE                  = 220
+	SYS_EXECVE                 = 221
+	SYS_MMAP                   = 222
+	SYS_FADVISE64              = 223
+	SYS_SWAPON                 = 224
+	SYS_SWAPOFF                = 225
+	SYS_MPROTECT               = 226
+	SYS_MSYNC                  = 227
+	SYS_MLOCK                  = 228
+	SYS_MUNLOCK                = 229
+	SYS_MLOCKALL               = 230
+	SYS_MUNLOCKALL             = 231
+	SYS_MINCORE                = 232
+	SYS_MADVISE                = 233
+	SYS_REMAP_FILE_PAGES       = 234
+	SYS_MBIND                  = 235
+	SYS_GET_MEMPOLICY          = 236
+	SYS_SET_MEMPOLICY          = 237
+	SYS_MIGRATE_PAGES          = 238
+	SYS_MOVE_PAGES             = 239
+	SYS_RT_TGSIGQUEUEINFO      = 240
+	SYS_PERF_EVENT_OPEN        = 241
+	SYS_ACCEPT4                = 242
+	SYS_RECVMMSG               = 243
+	SYS_ARCH_SPECIFIC_SYSCALL  = 244
+	SYS_WAIT4                  = 260
+	SYS_PRLIMIT64              = 261
+	SYS_FANOTIFY_INIT          = 262
+	SYS_FANOTIFY_MARK          = 263
+	SYS_NAME_TO_HANDLE_AT      = 264
+	SYS_OPEN_BY_HANDLE_AT      = 265
+	SYS_CLOCK_ADJTIME          = 266
+	SYS_SYNCFS                 = 267
+	SYS_SETNS                  = 268
+	SYS_SENDMMSG               = 269
+	SYS_PROCESS_VM_READV       = 270
+	SYS_PROCESS_VM_WRITEV      = 271
+	SYS_KCMP                   = 272
+	SYS_FINIT_MODULE           = 273
+	SYS_SCHED_SETATTR          = 274
+	SYS_SCHED_GETATTR          = 275
+	SYS_RENAMEAT2              = 276
+	SYS_SECCOMP                = 277
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
new file mode 100644
index 0000000000..5ffe1c7191
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
@@ -0,0 +1,327 @@
+// mksysnum_linux.pl /usr/include/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build mips64,linux
+
+package unix
+
+const (
+	SYS_READ                   = 5000
+	SYS_WRITE                  = 5001
+	SYS_OPEN                   = 5002
+	SYS_CLOSE                  = 5003
+	SYS_STAT                   = 5004
+	SYS_FSTAT                  = 5005
+	SYS_LSTAT                  = 5006
+	SYS_POLL                   = 5007
+	SYS_LSEEK                  = 5008
+	SYS_MMAP                   = 5009
+	SYS_MPROTECT               = 5010
+	SYS_MUNMAP                 = 5011
+	SYS_BRK                    = 5012
+	SYS_RT_SIGACTION           = 5013
+	SYS_RT_SIGPROCMASK         = 5014
+	SYS_IOCTL                  = 5015
+	SYS_PREAD64                = 5016
+	SYS_PWRITE64               = 5017
+	SYS_READV                  = 5018
+	SYS_WRITEV                 = 5019
+	SYS_ACCESS                 = 5020
+	SYS_PIPE                   = 5021
+	SYS__NEWSELECT             = 5022
+	SYS_SCHED_YIELD            = 5023
+	SYS_MREMAP                 = 5024
+	SYS_MSYNC                  = 5025
+	SYS_MINCORE                = 5026
+	SYS_MADVISE                = 5027
+	SYS_SHMGET                 = 5028
+	SYS_SHMAT                  = 5029
+	SYS_SHMCTL                 = 5030
+	SYS_DUP                    = 5031
+	SYS_DUP2                   = 5032
+	SYS_PAUSE                  = 5033
+	SYS_NANOSLEEP              = 5034
+	SYS_GETITIMER              = 5035
+	SYS_SETITIMER              = 5036
+	SYS_ALARM                  = 5037
+	SYS_GETPID                 = 5038
+	SYS_SENDFILE               = 5039
+	SYS_SOCKET                 = 5040
+	SYS_CONNECT                = 5041
+	SYS_ACCEPT                 = 5042
+	SYS_SENDTO                 = 5043
+	SYS_RECVFROM               = 5044
+	SYS_SENDMSG                = 5045
+	SYS_RECVMSG                = 5046
+	SYS_SHUTDOWN               = 5047
+	SYS_BIND                   = 5048
+	SYS_LISTEN                 = 5049
+	SYS_GETSOCKNAME            = 5050
+	SYS_GETPEERNAME            = 5051
+	SYS_SOCKETPAIR             = 5052
+	SYS_SETSOCKOPT             = 5053
+	SYS_GETSOCKOPT             = 5054
+	SYS_CLONE                  = 5055
+	SYS_FORK                   = 5056
+	SYS_EXECVE                 = 5057
+	SYS_EXIT                   = 5058
+	SYS_WAIT4                  = 5059
+	SYS_KILL                   = 5060
+	SYS_UNAME                  = 5061
+	SYS_SEMGET                 = 5062
+	SYS_SEMOP                  = 5063
+	SYS_SEMCTL                 = 5064
+	SYS_SHMDT                  = 5065
+	SYS_MSGGET                 = 5066
+	SYS_MSGSND                 = 5067
+	SYS_MSGRCV                 = 5068
+	SYS_MSGCTL                 = 5069
+	SYS_FCNTL                  = 5070
+	SYS_FLOCK                  = 5071
+	SYS_FSYNC                  = 5072
+	SYS_FDATASYNC              = 5073
+	SYS_TRUNCATE               = 5074
+	SYS_FTRUNCATE              = 5075
+	SYS_GETDENTS               = 5076
+	SYS_GETCWD                 = 5077
+	SYS_CHDIR                  = 5078
+	SYS_FCHDIR                 = 5079
+	SYS_RENAME                 = 5080
+	SYS_MKDIR                  = 5081
+	SYS_RMDIR                  = 5082
+	SYS_CREAT                  = 5083
+	SYS_LINK                   = 5084
+	SYS_UNLINK                 = 5085
+	SYS_SYMLINK                = 5086
+	SYS_READLINK               = 5087
+	SYS_CHMOD                  = 5088
+	SYS_FCHMOD                 = 5089
+	SYS_CHOWN                  = 5090
+	SYS_FCHOWN                 = 5091
+	SYS_LCHOWN                 = 5092
+	SYS_UMASK                  = 5093
+	SYS_GETTIMEOFDAY           = 5094
+	SYS_GETRLIMIT              = 5095
+	SYS_GETRUSAGE              = 5096
+	SYS_SYSINFO                = 5097
+	SYS_TIMES                  = 5098
+	SYS_PTRACE                 = 5099
+	SYS_GETUID                 = 5100
+	SYS_SYSLOG                 = 5101
+	SYS_GETGID                 = 5102
+	SYS_SETUID                 = 5103
+	SYS_SETGID                 = 5104
+	SYS_GETEUID                = 5105
+	SYS_GETEGID                = 5106
+	SYS_SETPGID                = 5107
+	SYS_GETPPID                = 5108
+	SYS_GETPGRP                = 5109
+	SYS_SETSID                 = 5110
+	SYS_SETREUID               = 5111
+	SYS_SETREGID               = 5112
+	SYS_GETGROUPS              = 5113
+	SYS_SETGROUPS              = 5114
+	SYS_SETRESUID              = 5115
+	SYS_GETRESUID              = 5116
+	SYS_SETRESGID              = 5117
+	SYS_GETRESGID              = 5118
+	SYS_GETPGID                = 5119
+	SYS_SETFSUID               = 5120
+	SYS_SETFSGID               = 5121
+	SYS_GETSID                 = 5122
+	SYS_CAPGET                 = 5123
+	SYS_CAPSET                 = 5124
+	SYS_RT_SIGPENDING          = 5125
+	SYS_RT_SIGTIMEDWAIT        = 5126
+	SYS_RT_SIGQUEUEINFO        = 5127
+	SYS_RT_SIGSUSPEND          = 5128
+	SYS_SIGALTSTACK            = 5129
+	SYS_UTIME                  = 5130
+	SYS_MKNOD                  = 5131
+	SYS_PERSONALITY            = 5132
+	SYS_USTAT                  = 5133
+	SYS_STATFS                 = 5134
+	SYS_FSTATFS                = 5135
+	SYS_SYSFS                  = 5136
+	SYS_GETPRIORITY            = 5137
+	SYS_SETPRIORITY            = 5138
+	SYS_SCHED_SETPARAM         = 5139
+	SYS_SCHED_GETPARAM         = 5140
+	SYS_SCHED_SETSCHEDULER     = 5141
+	SYS_SCHED_GETSCHEDULER     = 5142
+	SYS_SCHED_GET_PRIORITY_MAX = 5143
+	SYS_SCHED_GET_PRIORITY_MIN = 5144
+	SYS_SCHED_RR_GET_INTERVAL  = 5145
+	SYS_MLOCK                  = 5146
+	SYS_MUNLOCK                = 5147
+	SYS_MLOCKALL               = 5148
+	SYS_MUNLOCKALL             = 5149
+	SYS_VHANGUP                = 5150
+	SYS_PIVOT_ROOT             = 5151
+	SYS__SYSCTL                = 5152
+	SYS_PRCTL                  = 5153
+	SYS_ADJTIMEX               = 5154
+	SYS_SETRLIMIT              = 5155
+	SYS_CHROOT                 = 5156
+	SYS_SYNC                   = 5157
+	SYS_ACCT                   = 5158
+	SYS_SETTIMEOFDAY           = 5159
+	SYS_MOUNT                  = 5160
+	SYS_UMOUNT2                = 5161
+	SYS_SWAPON                 = 5162
+	SYS_SWAPOFF                = 5163
+	SYS_REBOOT                 = 5164
+	SYS_SETHOSTNAME            = 5165
+	SYS_SETDOMAINNAME          = 5166
+	SYS_CREATE_MODULE          = 5167
+	SYS_INIT_MODULE            = 5168
+	SYS_DELETE_MODULE          = 5169
+	SYS_GET_KERNEL_SYMS        = 5170
+	SYS_QUERY_MODULE           = 5171
+	SYS_QUOTACTL               = 5172
+	SYS_NFSSERVCTL             = 5173
+	SYS_GETPMSG                = 5174
+	SYS_PUTPMSG                = 5175
+	SYS_AFS_SYSCALL            = 5176
+	SYS_RESERVED177            = 5177
+	SYS_GETTID                 = 5178
+	SYS_READAHEAD              = 5179
+	SYS_SETXATTR               = 5180
+	SYS_LSETXATTR              = 5181
+	SYS_FSETXATTR              = 5182
+	SYS_GETXATTR               = 5183
+	SYS_LGETXATTR              = 5184
+	SYS_FGETXATTR              = 5185
+	SYS_LISTXATTR              = 5186
+	SYS_LLISTXATTR             = 5187
+	SYS_FLISTXATTR             = 5188
+	SYS_REMOVEXATTR            = 5189
+	SYS_LREMOVEXATTR           = 5190
+	SYS_FREMOVEXATTR           = 5191
+	SYS_TKILL                  = 5192
+	SYS_RESERVED193            = 5193
+	SYS_FUTEX                  = 5194
+	SYS_SCHED_SETAFFINITY      = 5195
+	SYS_SCHED_GETAFFINITY      = 5196
+	SYS_CACHEFLUSH             = 5197
+	SYS_CACHECTL               = 5198
+	SYS_SYSMIPS                = 5199
+	SYS_IO_SETUP               = 5200
+	SYS_IO_DESTROY             = 5201
+	SYS_IO_GETEVENTS           = 5202
+	SYS_IO_SUBMIT              = 5203
+	SYS_IO_CANCEL              = 5204
+	SYS_EXIT_GROUP             = 5205
+	SYS_LOOKUP_DCOOKIE         = 5206
+	SYS_EPOLL_CREATE           = 5207
+	SYS_EPOLL_CTL              = 5208
+	SYS_EPOLL_WAIT             = 5209
+	SYS_REMAP_FILE_PAGES       = 5210
+	SYS_RT_SIGRETURN           = 5211
+	SYS_SET_TID_ADDRESS        = 5212
+	SYS_RESTART_SYSCALL        = 5213
+	SYS_SEMTIMEDOP             = 5214
+	SYS_FADVISE64              = 5215
+	SYS_TIMER_CREATE           = 5216
+	SYS_TIMER_SETTIME          = 5217
+	SYS_TIMER_GETTIME          = 5218
+	SYS_TIMER_GETOVERRUN       = 5219
+	SYS_TIMER_DELETE           = 5220
+	SYS_CLOCK_SETTIME          = 5221
+	SYS_CLOCK_GETTIME          = 5222
+	SYS_CLOCK_GETRES           = 5223
+	SYS_CLOCK_NANOSLEEP        = 5224
+	SYS_TGKILL                 = 5225
+	SYS_UTIMES                 = 5226
+	SYS_MBIND                  = 5227
+	SYS_GET_MEMPOLICY          = 5228
+	SYS_SET_MEMPOLICY          = 5229
+	SYS_MQ_OPEN                = 5230
+	SYS_MQ_UNLINK              = 5231
+	SYS_MQ_TIMEDSEND           = 5232
+	SYS_MQ_TIMEDRECEIVE        = 5233
+	SYS_MQ_NOTIFY              = 5234
+	SYS_MQ_GETSETATTR          = 5235
+	SYS_VSERVER                = 5236
+	SYS_WAITID                 = 5237
+	SYS_ADD_KEY                = 5239
+	SYS_REQUEST_KEY            = 5240
+	SYS_KEYCTL                 = 5241
+	SYS_SET_THREAD_AREA        = 5242
+	SYS_INOTIFY_INIT           = 5243
+	SYS_INOTIFY_ADD_WATCH      = 5244
+	SYS_INOTIFY_RM_WATCH       = 5245
+	SYS_MIGRATE_PAGES          = 5246
+	SYS_OPENAT                 = 5247
+	SYS_MKDIRAT                = 5248
+	SYS_MKNODAT                = 5249
+	SYS_FCHOWNAT               = 5250
+	SYS_FUTIMESAT              = 5251
+	SYS_NEWFSTATAT             = 5252
+	SYS_UNLINKAT               = 5253
+	SYS_RENAMEAT               = 5254
+	SYS_LINKAT                 = 5255
+	SYS_SYMLINKAT              = 5256
+	SYS_READLINKAT             = 5257
+	SYS_FCHMODAT               = 5258
+	SYS_FACCESSAT              = 5259
+	SYS_PSELECT6               = 5260
+	SYS_PPOLL                  = 5261
+	SYS_UNSHARE                = 5262
+	SYS_SPLICE                 = 5263
+	SYS_SYNC_FILE_RANGE        = 5264
+	SYS_TEE                    = 5265
+	SYS_VMSPLICE               = 5266
+	SYS_MOVE_PAGES             = 5267
+	SYS_SET_ROBUST_LIST        = 5268
+	SYS_GET_ROBUST_LIST        = 5269
+	SYS_KEXEC_LOAD             = 5270
+	SYS_GETCPU                 = 5271
+	SYS_EPOLL_PWAIT            = 5272
+	SYS_IOPRIO_SET             = 5273
+	SYS_IOPRIO_GET             = 5274
+	SYS_UTIMENSAT              = 5275
+	SYS_SIGNALFD               = 5276
+	SYS_TIMERFD                = 5277
+	SYS_EVENTFD                = 5278
+	SYS_FALLOCATE              = 5279
+	SYS_TIMERFD_CREATE         = 5280
+	SYS_TIMERFD_GETTIME        = 5281
+	SYS_TIMERFD_SETTIME        = 5282
+	SYS_SIGNALFD4              = 5283
+	SYS_EVENTFD2               = 5284
+	SYS_EPOLL_CREATE1          = 5285
+	SYS_DUP3                   = 5286
+	SYS_PIPE2                  = 5287
+	SYS_INOTIFY_INIT1          = 5288
+	SYS_PREADV                 = 5289
+	SYS_PWRITEV                = 5290
+	SYS_RT_TGSIGQUEUEINFO      = 5291
+	SYS_PERF_EVENT_OPEN        = 5292
+	SYS_ACCEPT4                = 5293
+	SYS_RECVMMSG               = 5294
+	SYS_FANOTIFY_INIT          = 5295
+	SYS_FANOTIFY_MARK          = 5296
+	SYS_PRLIMIT64              = 5297
+	SYS_NAME_TO_HANDLE_AT      = 5298
+	SYS_OPEN_BY_HANDLE_AT      = 5299
+	SYS_CLOCK_ADJTIME          = 5300
+	SYS_SYNCFS                 = 5301
+	SYS_SENDMMSG               = 5302
+	SYS_SETNS                  = 5303
+	SYS_PROCESS_VM_READV       = 5304
+	SYS_PROCESS_VM_WRITEV      = 5305
+	SYS_KCMP                   = 5306
+	SYS_FINIT_MODULE           = 5307
+	SYS_GETDENTS64             = 5308
+	SYS_SCHED_SETATTR          = 5309
+	SYS_SCHED_GETATTR          = 5310
+	SYS_RENAMEAT2              = 5311
+	SYS_SECCOMP                = 5312
+	SYS_GETRANDOM              = 5313
+	SYS_MEMFD_CREATE           = 5314
+	SYS_BPF                    = 5315
+	SYS_EXECVEAT               = 5316
+	SYS_USERFAULTFD            = 5317
+	SYS_MEMBARRIER             = 5318
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
new file mode 100644
index 0000000000..d192b940ce
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
@@ -0,0 +1,327 @@
+// mksysnum_linux.pl /usr/include/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build mips64le,linux
+
+package unix
+
+const (
+	SYS_READ                   = 5000
+	SYS_WRITE                  = 5001
+	SYS_OPEN                   = 5002
+	SYS_CLOSE                  = 5003
+	SYS_STAT                   = 5004
+	SYS_FSTAT                  = 5005
+	SYS_LSTAT                  = 5006
+	SYS_POLL                   = 5007
+	SYS_LSEEK                  = 5008
+	SYS_MMAP                   = 5009
+	SYS_MPROTECT               = 5010
+	SYS_MUNMAP                 = 5011
+	SYS_BRK                    = 5012
+	SYS_RT_SIGACTION           = 5013
+	SYS_RT_SIGPROCMASK         = 5014
+	SYS_IOCTL                  = 5015
+	SYS_PREAD64                = 5016
+	SYS_PWRITE64               = 5017
+	SYS_READV                  = 5018
+	SYS_WRITEV                 = 5019
+	SYS_ACCESS                 = 5020
+	SYS_PIPE                   = 5021
+	SYS__NEWSELECT             = 5022
+	SYS_SCHED_YIELD            = 5023
+	SYS_MREMAP                 = 5024
+	SYS_MSYNC                  = 5025
+	SYS_MINCORE                = 5026
+	SYS_MADVISE                = 5027
+	SYS_SHMGET                 = 5028
+	SYS_SHMAT                  = 5029
+	SYS_SHMCTL                 = 5030
+	SYS_DUP                    = 5031
+	SYS_DUP2                   = 5032
+	SYS_PAUSE                  = 5033
+	SYS_NANOSLEEP              = 5034
+	SYS_GETITIMER              = 5035
+	SYS_SETITIMER              = 5036
+	SYS_ALARM                  = 5037
+	SYS_GETPID                 = 5038
+	SYS_SENDFILE               = 5039
+	SYS_SOCKET                 = 5040
+	SYS_CONNECT                = 5041
+	SYS_ACCEPT                 = 5042
+	SYS_SENDTO                 = 5043
+	SYS_RECVFROM               = 5044
+	SYS_SENDMSG                = 5045
+	SYS_RECVMSG                = 5046
+	SYS_SHUTDOWN               = 5047
+	SYS_BIND                   = 5048
+	SYS_LISTEN                 = 5049
+	SYS_GETSOCKNAME            = 5050
+	SYS_GETPEERNAME            = 5051
+	SYS_SOCKETPAIR             = 5052
+	SYS_SETSOCKOPT             = 5053
+	SYS_GETSOCKOPT             = 5054
+	SYS_CLONE                  = 5055
+	SYS_FORK                   = 5056
+	SYS_EXECVE                 = 5057
+	SYS_EXIT                   = 5058
+	SYS_WAIT4                  = 5059
+	SYS_KILL                   = 5060
+	SYS_UNAME                  = 5061
+	SYS_SEMGET                 = 5062
+	SYS_SEMOP                  = 5063
+	SYS_SEMCTL                 = 5064
+	SYS_SHMDT                  = 5065
+	SYS_MSGGET                 = 5066
+	SYS_MSGSND                 = 5067
+	SYS_MSGRCV                 = 5068
+	SYS_MSGCTL                 = 5069
+	SYS_FCNTL                  = 5070
+	SYS_FLOCK                  = 5071
+	SYS_FSYNC                  = 5072
+	SYS_FDATASYNC              = 5073
+	SYS_TRUNCATE               = 5074
+	SYS_FTRUNCATE              = 5075
+	SYS_GETDENTS               = 5076
+	SYS_GETCWD                 = 5077
+	SYS_CHDIR                  = 5078
+	SYS_FCHDIR                 = 5079
+	SYS_RENAME                 = 5080
+	SYS_MKDIR                  = 5081
+	SYS_RMDIR                  = 5082
+	SYS_CREAT                  = 5083
+	SYS_LINK                   = 5084
+	SYS_UNLINK                 = 5085
+	SYS_SYMLINK                = 5086
+	SYS_READLINK               = 5087
+	SYS_CHMOD                  = 5088
+	SYS_FCHMOD                 = 5089
+	SYS_CHOWN                  = 5090
+	SYS_FCHOWN                 = 5091
+	SYS_LCHOWN                 = 5092
+	SYS_UMASK                  = 5093
+	SYS_GETTIMEOFDAY           = 5094
+	SYS_GETRLIMIT              = 5095
+	SYS_GETRUSAGE              = 5096
+	SYS_SYSINFO                = 5097
+	SYS_TIMES                  = 5098
+	SYS_PTRACE                 = 5099
+	SYS_GETUID                 = 5100
+	SYS_SYSLOG                 = 5101
+	SYS_GETGID                 = 5102
+	SYS_SETUID                 = 5103
+	SYS_SETGID                 = 5104
+	SYS_GETEUID                = 5105
+	SYS_GETEGID                = 5106
+	SYS_SETPGID                = 5107
+	SYS_GETPPID                = 5108
+	SYS_GETPGRP                = 5109
+	SYS_SETSID                 = 5110
+	SYS_SETREUID               = 5111
+	SYS_SETREGID               = 5112
+	SYS_GETGROUPS              = 5113
+	SYS_SETGROUPS              = 5114
+	SYS_SETRESUID              = 5115
+	SYS_GETRESUID              = 5116
+	SYS_SETRESGID              = 5117
+	SYS_GETRESGID              = 5118
+	SYS_GETPGID                = 5119
+	SYS_SETFSUID               = 5120
+	SYS_SETFSGID               = 5121
+	SYS_GETSID                 = 5122
+	SYS_CAPGET                 = 5123
+	SYS_CAPSET                 = 5124
+	SYS_RT_SIGPENDING          = 5125
+	SYS_RT_SIGTIMEDWAIT        = 5126
+	SYS_RT_SIGQUEUEINFO        = 5127
+	SYS_RT_SIGSUSPEND          = 5128
+	SYS_SIGALTSTACK            = 5129
+	SYS_UTIME                  = 5130
+	SYS_MKNOD                  = 5131
+	SYS_PERSONALITY            = 5132
+	SYS_USTAT                  = 5133
+	SYS_STATFS                 = 5134
+	SYS_FSTATFS                = 5135
+	SYS_SYSFS                  = 5136
+	SYS_GETPRIORITY            = 5137
+	SYS_SETPRIORITY            = 5138
+	SYS_SCHED_SETPARAM         = 5139
+	SYS_SCHED_GETPARAM         = 5140
+	SYS_SCHED_SETSCHEDULER     = 5141
+	SYS_SCHED_GETSCHEDULER     = 5142
+	SYS_SCHED_GET_PRIORITY_MAX = 5143
+	SYS_SCHED_GET_PRIORITY_MIN = 5144
+	SYS_SCHED_RR_GET_INTERVAL  = 5145
+	SYS_MLOCK                  = 5146
+	SYS_MUNLOCK                = 5147
+	SYS_MLOCKALL               = 5148
+	SYS_MUNLOCKALL             = 5149
+	SYS_VHANGUP                = 5150
+	SYS_PIVOT_ROOT             = 5151
+	SYS__SYSCTL                = 5152
+	SYS_PRCTL                  = 5153
+	SYS_ADJTIMEX               = 5154
+	SYS_SETRLIMIT              = 5155
+	SYS_CHROOT                 = 5156
+	SYS_SYNC                   = 5157
+	SYS_ACCT                   = 5158
+	SYS_SETTIMEOFDAY           = 5159
+	SYS_MOUNT                  = 5160
+	SYS_UMOUNT2                = 5161
+	SYS_SWAPON                 = 5162
+	SYS_SWAPOFF                = 5163
+	SYS_REBOOT                 = 5164
+	SYS_SETHOSTNAME            = 5165
+	SYS_SETDOMAINNAME          = 5166
+	SYS_CREATE_MODULE          = 5167
+	SYS_INIT_MODULE            = 5168
+	SYS_DELETE_MODULE          = 5169
+	SYS_GET_KERNEL_SYMS        = 5170
+	SYS_QUERY_MODULE           = 5171
+	SYS_QUOTACTL               = 5172
+	SYS_NFSSERVCTL             = 5173
+	SYS_GETPMSG                = 5174
+	SYS_PUTPMSG                = 5175
+	SYS_AFS_SYSCALL            = 5176
+	SYS_RESERVED177            = 5177
+	SYS_GETTID                 = 5178
+	SYS_READAHEAD              = 5179
+	SYS_SETXATTR               = 5180
+	SYS_LSETXATTR              = 5181
+	SYS_FSETXATTR              = 5182
+	SYS_GETXATTR               = 5183
+	SYS_LGETXATTR              = 5184
+	SYS_FGETXATTR              = 5185
+	SYS_LISTXATTR              = 5186
+	SYS_LLISTXATTR             = 5187
+	SYS_FLISTXATTR             = 5188
+	SYS_REMOVEXATTR            = 5189
+	SYS_LREMOVEXATTR           = 5190
+	SYS_FREMOVEXATTR           = 5191
+	SYS_TKILL                  = 5192
+	SYS_RESERVED193            = 5193
+	SYS_FUTEX                  = 5194
+	SYS_SCHED_SETAFFINITY      = 5195
+	SYS_SCHED_GETAFFINITY      = 5196
+	SYS_CACHEFLUSH             = 5197
+	SYS_CACHECTL               = 5198
+	SYS_SYSMIPS                = 5199
+	SYS_IO_SETUP               = 5200
+	SYS_IO_DESTROY             = 5201
+	SYS_IO_GETEVENTS           = 5202
+	SYS_IO_SUBMIT              = 5203
+	SYS_IO_CANCEL              = 5204
+	SYS_EXIT_GROUP             = 5205
+	SYS_LOOKUP_DCOOKIE         = 5206
+	SYS_EPOLL_CREATE           = 5207
+	SYS_EPOLL_CTL              = 5208
+	SYS_EPOLL_WAIT             = 5209
+	SYS_REMAP_FILE_PAGES       = 5210
+	SYS_RT_SIGRETURN           = 5211
+	SYS_SET_TID_ADDRESS        = 5212
+	SYS_RESTART_SYSCALL        = 5213
+	SYS_SEMTIMEDOP             = 5214
+	SYS_FADVISE64              = 5215
+	SYS_TIMER_CREATE           = 5216
+	SYS_TIMER_SETTIME          = 5217
+	SYS_TIMER_GETTIME          = 5218
+	SYS_TIMER_GETOVERRUN       = 5219
+	SYS_TIMER_DELETE           = 5220
+	SYS_CLOCK_SETTIME          = 5221
+	SYS_CLOCK_GETTIME          = 5222
+	SYS_CLOCK_GETRES           = 5223
+	SYS_CLOCK_NANOSLEEP        = 5224
+	SYS_TGKILL                 = 5225
+	SYS_UTIMES                 = 5226
+	SYS_MBIND                  = 5227
+	SYS_GET_MEMPOLICY          = 5228
+	SYS_SET_MEMPOLICY          = 5229
+	SYS_MQ_OPEN                = 5230
+	SYS_MQ_UNLINK              = 5231
+	SYS_MQ_TIMEDSEND           = 5232
+	SYS_MQ_TIMEDRECEIVE        = 5233
+	SYS_MQ_NOTIFY              = 5234
+	SYS_MQ_GETSETATTR          = 5235
+	SYS_VSERVER                = 5236
+	SYS_WAITID                 = 5237
+	SYS_ADD_KEY                = 5239
+	SYS_REQUEST_KEY            = 5240
+	SYS_KEYCTL                 = 5241
+	SYS_SET_THREAD_AREA        = 5242
+	SYS_INOTIFY_INIT           = 5243
+	SYS_INOTIFY_ADD_WATCH      = 5244
+	SYS_INOTIFY_RM_WATCH       = 5245
+	SYS_MIGRATE_PAGES          = 5246
+	SYS_OPENAT                 = 5247
+	SYS_MKDIRAT                = 5248
+	SYS_MKNODAT                = 5249
+	SYS_FCHOWNAT               = 5250
+	SYS_FUTIMESAT              = 5251
+	SYS_NEWFSTATAT             = 5252
+	SYS_UNLINKAT               = 5253
+	SYS_RENAMEAT               = 5254
+	SYS_LINKAT                 = 5255
+	SYS_SYMLINKAT              = 5256
+	SYS_READLINKAT             = 5257
+	SYS_FCHMODAT               = 5258
+	SYS_FACCESSAT              = 5259
+	SYS_PSELECT6               = 5260
+	SYS_PPOLL                  = 5261
+	SYS_UNSHARE                = 5262
+	SYS_SPLICE                 = 5263
+	SYS_SYNC_FILE_RANGE        = 5264
+	SYS_TEE                    = 5265
+	SYS_VMSPLICE               = 5266
+	SYS_MOVE_PAGES             = 5267
+	SYS_SET_ROBUST_LIST        = 5268
+	SYS_GET_ROBUST_LIST        = 5269
+	SYS_KEXEC_LOAD             = 5270
+	SYS_GETCPU                 = 5271
+	SYS_EPOLL_PWAIT            = 5272
+	SYS_IOPRIO_SET             = 5273
+	SYS_IOPRIO_GET             = 5274
+	SYS_UTIMENSAT              = 5275
+	SYS_SIGNALFD               = 5276
+	SYS_TIMERFD                = 5277
+	SYS_EVENTFD                = 5278
+	SYS_FALLOCATE              = 5279
+	SYS_TIMERFD_CREATE         = 5280
+	SYS_TIMERFD_GETTIME        = 5281
+	SYS_TIMERFD_SETTIME        = 5282
+	SYS_SIGNALFD4              = 5283
+	SYS_EVENTFD2               = 5284
+	SYS_EPOLL_CREATE1          = 5285
+	SYS_DUP3                   = 5286
+	SYS_PIPE2                  = 5287
+	SYS_INOTIFY_INIT1          = 5288
+	SYS_PREADV                 = 5289
+	SYS_PWRITEV                = 5290
+	SYS_RT_TGSIGQUEUEINFO      = 5291
+	SYS_PERF_EVENT_OPEN        = 5292
+	SYS_ACCEPT4                = 5293
+	SYS_RECVMMSG               = 5294
+	SYS_FANOTIFY_INIT          = 5295
+	SYS_FANOTIFY_MARK          = 5296
+	SYS_PRLIMIT64              = 5297
+	SYS_NAME_TO_HANDLE_AT      = 5298
+	SYS_OPEN_BY_HANDLE_AT      = 5299
+	SYS_CLOCK_ADJTIME          = 5300
+	SYS_SYNCFS                 = 5301
+	SYS_SENDMMSG               = 5302
+	SYS_SETNS                  = 5303
+	SYS_PROCESS_VM_READV       = 5304
+	SYS_PROCESS_VM_WRITEV      = 5305
+	SYS_KCMP                   = 5306
+	SYS_FINIT_MODULE           = 5307
+	SYS_GETDENTS64             = 5308
+	SYS_SCHED_SETATTR          = 5309
+	SYS_SCHED_GETATTR          = 5310
+	SYS_RENAMEAT2              = 5311
+	SYS_SECCOMP                = 5312
+	SYS_GETRANDOM              = 5313
+	SYS_MEMFD_CREATE           = 5314
+	SYS_BPF                    = 5315
+	SYS_EXECVEAT               = 5316
+	SYS_USERFAULTFD            = 5317
+	SYS_MEMBARRIER             = 5318
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
new file mode 100644
index 0000000000..e1b08f00d3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
@@ -0,0 +1,360 @@
+// mksysnum_linux.pl /usr/include/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build ppc64,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAITPID                = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BREAK                  = 17
+	SYS_OLDSTAT                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_OLDFSTAT               = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_STTY                   = 31
+	SYS_GTTY                   = 32
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_FTIME                  = 35
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_PROF                   = 44
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_LOCK                   = 53
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_MPX                    = 56
+	SYS_SETPGID                = 57
+	SYS_ULIMIT                 = 58
+	SYS_OLDOLDUNAME            = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SGETMASK               = 68
+	SYS_SSETMASK               = 69
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_OLDLSTAT               = 84
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_PROFIL                 = 98
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_IOPERM                 = 101
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_OLDUNAME               = 109
+	SYS_IOPL                   = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_VM86                   = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_MODIFY_LDT             = 123
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_QUERY_MODULE           = 166
+	SYS_POLL                   = 167
+	SYS_NFSSERVCTL             = 168
+	SYS_SETRESGID              = 169
+	SYS_GETRESGID              = 170
+	SYS_PRCTL                  = 171
+	SYS_RT_SIGRETURN           = 172
+	SYS_RT_SIGACTION           = 173
+	SYS_RT_SIGPROCMASK         = 174
+	SYS_RT_SIGPENDING          = 175
+	SYS_RT_SIGTIMEDWAIT        = 176
+	SYS_RT_SIGQUEUEINFO        = 177
+	SYS_RT_SIGSUSPEND          = 178
+	SYS_PREAD64                = 179
+	SYS_PWRITE64               = 180
+	SYS_CHOWN                  = 181
+	SYS_GETCWD                 = 182
+	SYS_CAPGET                 = 183
+	SYS_CAPSET                 = 184
+	SYS_SIGALTSTACK            = 185
+	SYS_SENDFILE               = 186
+	SYS_GETPMSG                = 187
+	SYS_PUTPMSG                = 188
+	SYS_VFORK                  = 189
+	SYS_UGETRLIMIT             = 190
+	SYS_READAHEAD              = 191
+	SYS_PCICONFIG_READ         = 198
+	SYS_PCICONFIG_WRITE        = 199
+	SYS_PCICONFIG_IOBASE       = 200
+	SYS_MULTIPLEXER            = 201
+	SYS_GETDENTS64             = 202
+	SYS_PIVOT_ROOT             = 203
+	SYS_MADVISE                = 205
+	SYS_MINCORE                = 206
+	SYS_GETTID                 = 207
+	SYS_TKILL                  = 208
+	SYS_SETXATTR               = 209
+	SYS_LSETXATTR              = 210
+	SYS_FSETXATTR              = 211
+	SYS_GETXATTR               = 212
+	SYS_LGETXATTR              = 213
+	SYS_FGETXATTR              = 214
+	SYS_LISTXATTR              = 215
+	SYS_LLISTXATTR             = 216
+	SYS_FLISTXATTR             = 217
+	SYS_REMOVEXATTR            = 218
+	SYS_LREMOVEXATTR           = 219
+	SYS_FREMOVEXATTR           = 220
+	SYS_FUTEX                  = 221
+	SYS_SCHED_SETAFFINITY      = 222
+	SYS_SCHED_GETAFFINITY      = 223
+	SYS_TUXCALL                = 225
+	SYS_IO_SETUP               = 227
+	SYS_IO_DESTROY             = 228
+	SYS_IO_GETEVENTS           = 229
+	SYS_IO_SUBMIT              = 230
+	SYS_IO_CANCEL              = 231
+	SYS_SET_TID_ADDRESS        = 232
+	SYS_FADVISE64              = 233
+	SYS_EXIT_GROUP             = 234
+	SYS_LOOKUP_DCOOKIE         = 235
+	SYS_EPOLL_CREATE           = 236
+	SYS_EPOLL_CTL              = 237
+	SYS_EPOLL_WAIT             = 238
+	SYS_REMAP_FILE_PAGES       = 239
+	SYS_TIMER_CREATE           = 240
+	SYS_TIMER_SETTIME          = 241
+	SYS_TIMER_GETTIME          = 242
+	SYS_TIMER_GETOVERRUN       = 243
+	SYS_TIMER_DELETE           = 244
+	SYS_CLOCK_SETTIME          = 245
+	SYS_CLOCK_GETTIME          = 246
+	SYS_CLOCK_GETRES           = 247
+	SYS_CLOCK_NANOSLEEP        = 248
+	SYS_SWAPCONTEXT            = 249
+	SYS_TGKILL                 = 250
+	SYS_UTIMES                 = 251
+	SYS_STATFS64               = 252
+	SYS_FSTATFS64              = 253
+	SYS_RTAS                   = 255
+	SYS_SYS_DEBUG_SETCONTEXT   = 256
+	SYS_MIGRATE_PAGES          = 258
+	SYS_MBIND                  = 259
+	SYS_GET_MEMPOLICY          = 260
+	SYS_SET_MEMPOLICY          = 261
+	SYS_MQ_OPEN                = 262
+	SYS_MQ_UNLINK              = 263
+	SYS_MQ_TIMEDSEND           = 264
+	SYS_MQ_TIMEDRECEIVE        = 265
+	SYS_MQ_NOTIFY              = 266
+	SYS_MQ_GETSETATTR          = 267
+	SYS_KEXEC_LOAD             = 268
+	SYS_ADD_KEY                = 269
+	SYS_REQUEST_KEY            = 270
+	SYS_KEYCTL                 = 271
+	SYS_WAITID                 = 272
+	SYS_IOPRIO_SET             = 273
+	SYS_IOPRIO_GET             = 274
+	SYS_INOTIFY_INIT           = 275
+	SYS_INOTIFY_ADD_WATCH      = 276
+	SYS_INOTIFY_RM_WATCH       = 277
+	SYS_SPU_RUN                = 278
+	SYS_SPU_CREATE             = 279
+	SYS_PSELECT6               = 280
+	SYS_PPOLL                  = 281
+	SYS_UNSHARE                = 282
+	SYS_SPLICE                 = 283
+	SYS_TEE                    = 284
+	SYS_VMSPLICE               = 285
+	SYS_OPENAT                 = 286
+	SYS_MKDIRAT                = 287
+	SYS_MKNODAT                = 288
+	SYS_FCHOWNAT               = 289
+	SYS_FUTIMESAT              = 290
+	SYS_NEWFSTATAT             = 291
+	SYS_UNLINKAT               = 292
+	SYS_RENAMEAT               = 293
+	SYS_LINKAT                 = 294
+	SYS_SYMLINKAT              = 295
+	SYS_READLINKAT             = 296
+	SYS_FCHMODAT               = 297
+	SYS_FACCESSAT              = 298
+	SYS_GET_ROBUST_LIST        = 299
+	SYS_SET_ROBUST_LIST        = 300
+	SYS_MOVE_PAGES             = 301
+	SYS_GETCPU                 = 302
+	SYS_EPOLL_PWAIT            = 303
+	SYS_UTIMENSAT              = 304
+	SYS_SIGNALFD               = 305
+	SYS_TIMERFD_CREATE         = 306
+	SYS_EVENTFD                = 307
+	SYS_SYNC_FILE_RANGE2       = 308
+	SYS_FALLOCATE              = 309
+	SYS_SUBPAGE_PROT           = 310
+	SYS_TIMERFD_SETTIME        = 311
+	SYS_TIMERFD_GETTIME        = 312
+	SYS_SIGNALFD4              = 313
+	SYS_EVENTFD2               = 314
+	SYS_EPOLL_CREATE1          = 315
+	SYS_DUP3                   = 316
+	SYS_PIPE2                  = 317
+	SYS_INOTIFY_INIT1          = 318
+	SYS_PERF_EVENT_OPEN        = 319
+	SYS_PREADV                 = 320
+	SYS_PWRITEV                = 321
+	SYS_RT_TGSIGQUEUEINFO      = 322
+	SYS_FANOTIFY_INIT          = 323
+	SYS_FANOTIFY_MARK          = 324
+	SYS_PRLIMIT64              = 325
+	SYS_SOCKET                 = 326
+	SYS_BIND                   = 327
+	SYS_CONNECT                = 328
+	SYS_LISTEN                 = 329
+	SYS_ACCEPT                 = 330
+	SYS_GETSOCKNAME            = 331
+	SYS_GETPEERNAME            = 332
+	SYS_SOCKETPAIR             = 333
+	SYS_SEND                   = 334
+	SYS_SENDTO                 = 335
+	SYS_RECV                   = 336
+	SYS_RECVFROM               = 337
+	SYS_SHUTDOWN               = 338
+	SYS_SETSOCKOPT             = 339
+	SYS_GETSOCKOPT             = 340
+	SYS_SENDMSG                = 341
+	SYS_RECVMSG                = 342
+	SYS_RECVMMSG               = 343
+	SYS_ACCEPT4                = 344
+	SYS_NAME_TO_HANDLE_AT      = 345
+	SYS_OPEN_BY_HANDLE_AT      = 346
+	SYS_CLOCK_ADJTIME          = 347
+	SYS_SYNCFS                 = 348
+	SYS_SENDMMSG               = 349
+	SYS_SETNS                  = 350
+	SYS_PROCESS_VM_READV       = 351
+	SYS_PROCESS_VM_WRITEV      = 352
+	SYS_FINIT_MODULE           = 353
+	SYS_KCMP                   = 354
+	SYS_SCHED_SETATTR          = 355
+	SYS_SCHED_GETATTR          = 356
+	SYS_RENAMEAT2              = 357
+	SYS_SECCOMP                = 358
+	SYS_GETRANDOM              = 359
+	SYS_MEMFD_CREATE           = 360
+	SYS_BPF                    = 361
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
new file mode 100644
index 0000000000..45e63f51a4
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
@@ -0,0 +1,353 @@
+// mksysnum_linux.pl /usr/include/powerpc64le-linux-gnu/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build ppc64le,linux
+
+package unix
+
+const (
+	SYS_RESTART_SYSCALL        = 0
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_WAITPID                = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_TIME                   = 13
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LCHOWN                 = 16
+	SYS_BREAK                  = 17
+	SYS_OLDSTAT                = 18
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_SETUID                 = 23
+	SYS_GETUID                 = 24
+	SYS_STIME                  = 25
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_OLDFSTAT               = 28
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_STTY                   = 31
+	SYS_GTTY                   = 32
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_FTIME                  = 35
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_PROF                   = 44
+	SYS_BRK                    = 45
+	SYS_SETGID                 = 46
+	SYS_GETGID                 = 47
+	SYS_SIGNAL                 = 48
+	SYS_GETEUID                = 49
+	SYS_GETEGID                = 50
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_LOCK                   = 53
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_MPX                    = 56
+	SYS_SETPGID                = 57
+	SYS_ULIMIT                 = 58
+	SYS_OLDOLDUNAME            = 59
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SGETMASK               = 68
+	SYS_SSETMASK               = 69
+	SYS_SETREUID               = 70
+	SYS_SETREGID               = 71
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRLIMIT              = 76
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_GETGROUPS              = 80
+	SYS_SETGROUPS              = 81
+	SYS_SELECT                 = 82
+	SYS_SYMLINK                = 83
+	SYS_OLDLSTAT               = 84
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_FCHOWN                 = 95
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_PROFIL                 = 98
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_IOPERM                 = 101
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_OLDUNAME               = 109
+	SYS_IOPL                   = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_VM86                   = 113
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_MODIFY_LDT             = 123
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_SETFSUID               = 138
+	SYS_SETFSGID               = 139
+	SYS__LLSEEK                = 140
+	SYS_GETDENTS               = 141
+	SYS__NEWSELECT             = 142
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_SETRESUID              = 164
+	SYS_GETRESUID              = 165
+	SYS_QUERY_MODULE           = 166
+	SYS_POLL                   = 167
+	SYS_NFSSERVCTL             = 168
+	SYS_SETRESGID              = 169
+	SYS_GETRESGID              = 170
+	SYS_PRCTL                  = 171
+	SYS_RT_SIGRETURN           = 172
+	SYS_RT_SIGACTION           = 173
+	SYS_RT_SIGPROCMASK         = 174
+	SYS_RT_SIGPENDING          = 175
+	SYS_RT_SIGTIMEDWAIT        = 176
+	SYS_RT_SIGQUEUEINFO        = 177
+	SYS_RT_SIGSUSPEND          = 178
+	SYS_PREAD64                = 179
+	SYS_PWRITE64               = 180
+	SYS_CHOWN                  = 181
+	SYS_GETCWD                 = 182
+	SYS_CAPGET                 = 183
+	SYS_CAPSET                 = 184
+	SYS_SIGALTSTACK            = 185
+	SYS_SENDFILE               = 186
+	SYS_GETPMSG                = 187
+	SYS_PUTPMSG                = 188
+	SYS_VFORK                  = 189
+	SYS_UGETRLIMIT             = 190
+	SYS_READAHEAD              = 191
+	SYS_PCICONFIG_READ         = 198
+	SYS_PCICONFIG_WRITE        = 199
+	SYS_PCICONFIG_IOBASE       = 200
+	SYS_MULTIPLEXER            = 201
+	SYS_GETDENTS64             = 202
+	SYS_PIVOT_ROOT             = 203
+	SYS_MADVISE                = 205
+	SYS_MINCORE                = 206
+	SYS_GETTID                 = 207
+	SYS_TKILL                  = 208
+	SYS_SETXATTR               = 209
+	SYS_LSETXATTR              = 210
+	SYS_FSETXATTR              = 211
+	SYS_GETXATTR               = 212
+	SYS_LGETXATTR              = 213
+	SYS_FGETXATTR              = 214
+	SYS_LISTXATTR              = 215
+	SYS_LLISTXATTR             = 216
+	SYS_FLISTXATTR             = 217
+	SYS_REMOVEXATTR            = 218
+	SYS_LREMOVEXATTR           = 219
+	SYS_FREMOVEXATTR           = 220
+	SYS_FUTEX                  = 221
+	SYS_SCHED_SETAFFINITY      = 222
+	SYS_SCHED_GETAFFINITY      = 223
+	SYS_TUXCALL                = 225
+	SYS_IO_SETUP               = 227
+	SYS_IO_DESTROY             = 228
+	SYS_IO_GETEVENTS           = 229
+	SYS_IO_SUBMIT              = 230
+	SYS_IO_CANCEL              = 231
+	SYS_SET_TID_ADDRESS        = 232
+	SYS_FADVISE64              = 233
+	SYS_EXIT_GROUP             = 234
+	SYS_LOOKUP_DCOOKIE         = 235
+	SYS_EPOLL_CREATE           = 236
+	SYS_EPOLL_CTL              = 237
+	SYS_EPOLL_WAIT             = 238
+	SYS_REMAP_FILE_PAGES       = 239
+	SYS_TIMER_CREATE           = 240
+	SYS_TIMER_SETTIME          = 241
+	SYS_TIMER_GETTIME          = 242
+	SYS_TIMER_GETOVERRUN       = 243
+	SYS_TIMER_DELETE           = 244
+	SYS_CLOCK_SETTIME          = 245
+	SYS_CLOCK_GETTIME          = 246
+	SYS_CLOCK_GETRES           = 247
+	SYS_CLOCK_NANOSLEEP        = 248
+	SYS_SWAPCONTEXT            = 249
+	SYS_TGKILL                 = 250
+	SYS_UTIMES                 = 251
+	SYS_STATFS64               = 252
+	SYS_FSTATFS64              = 253
+	SYS_RTAS                   = 255
+	SYS_SYS_DEBUG_SETCONTEXT   = 256
+	SYS_MIGRATE_PAGES          = 258
+	SYS_MBIND                  = 259
+	SYS_GET_MEMPOLICY          = 260
+	SYS_SET_MEMPOLICY          = 261
+	SYS_MQ_OPEN                = 262
+	SYS_MQ_UNLINK              = 263
+	SYS_MQ_TIMEDSEND           = 264
+	SYS_MQ_TIMEDRECEIVE        = 265
+	SYS_MQ_NOTIFY              = 266
+	SYS_MQ_GETSETATTR          = 267
+	SYS_KEXEC_LOAD             = 268
+	SYS_ADD_KEY                = 269
+	SYS_REQUEST_KEY            = 270
+	SYS_KEYCTL                 = 271
+	SYS_WAITID                 = 272
+	SYS_IOPRIO_SET             = 273
+	SYS_IOPRIO_GET             = 274
+	SYS_INOTIFY_INIT           = 275
+	SYS_INOTIFY_ADD_WATCH      = 276
+	SYS_INOTIFY_RM_WATCH       = 277
+	SYS_SPU_RUN                = 278
+	SYS_SPU_CREATE             = 279
+	SYS_PSELECT6               = 280
+	SYS_PPOLL                  = 281
+	SYS_UNSHARE                = 282
+	SYS_SPLICE                 = 283
+	SYS_TEE                    = 284
+	SYS_VMSPLICE               = 285
+	SYS_OPENAT                 = 286
+	SYS_MKDIRAT                = 287
+	SYS_MKNODAT                = 288
+	SYS_FCHOWNAT               = 289
+	SYS_FUTIMESAT              = 290
+	SYS_NEWFSTATAT             = 291
+	SYS_UNLINKAT               = 292
+	SYS_RENAMEAT               = 293
+	SYS_LINKAT                 = 294
+	SYS_SYMLINKAT              = 295
+	SYS_READLINKAT             = 296
+	SYS_FCHMODAT               = 297
+	SYS_FACCESSAT              = 298
+	SYS_GET_ROBUST_LIST        = 299
+	SYS_SET_ROBUST_LIST        = 300
+	SYS_MOVE_PAGES             = 301
+	SYS_GETCPU                 = 302
+	SYS_EPOLL_PWAIT            = 303
+	SYS_UTIMENSAT              = 304
+	SYS_SIGNALFD               = 305
+	SYS_TIMERFD_CREATE         = 306
+	SYS_EVENTFD                = 307
+	SYS_SYNC_FILE_RANGE2       = 308
+	SYS_FALLOCATE              = 309
+	SYS_SUBPAGE_PROT           = 310
+	SYS_TIMERFD_SETTIME        = 311
+	SYS_TIMERFD_GETTIME        = 312
+	SYS_SIGNALFD4              = 313
+	SYS_EVENTFD2               = 314
+	SYS_EPOLL_CREATE1          = 315
+	SYS_DUP3                   = 316
+	SYS_PIPE2                  = 317
+	SYS_INOTIFY_INIT1          = 318
+	SYS_PERF_EVENT_OPEN        = 319
+	SYS_PREADV                 = 320
+	SYS_PWRITEV                = 321
+	SYS_RT_TGSIGQUEUEINFO      = 322
+	SYS_FANOTIFY_INIT          = 323
+	SYS_FANOTIFY_MARK          = 324
+	SYS_PRLIMIT64              = 325
+	SYS_SOCKET                 = 326
+	SYS_BIND                   = 327
+	SYS_CONNECT                = 328
+	SYS_LISTEN                 = 329
+	SYS_ACCEPT                 = 330
+	SYS_GETSOCKNAME            = 331
+	SYS_GETPEERNAME            = 332
+	SYS_SOCKETPAIR             = 333
+	SYS_SEND                   = 334
+	SYS_SENDTO                 = 335
+	SYS_RECV                   = 336
+	SYS_RECVFROM               = 337
+	SYS_SHUTDOWN               = 338
+	SYS_SETSOCKOPT             = 339
+	SYS_GETSOCKOPT             = 340
+	SYS_SENDMSG                = 341
+	SYS_RECVMSG                = 342
+	SYS_RECVMMSG               = 343
+	SYS_ACCEPT4                = 344
+	SYS_NAME_TO_HANDLE_AT      = 345
+	SYS_OPEN_BY_HANDLE_AT      = 346
+	SYS_CLOCK_ADJTIME          = 347
+	SYS_SYNCFS                 = 348
+	SYS_SENDMMSG               = 349
+	SYS_SETNS                  = 350
+	SYS_PROCESS_VM_READV       = 351
+	SYS_PROCESS_VM_WRITEV      = 352
+	SYS_FINIT_MODULE           = 353
+	SYS_KCMP                   = 354
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
new file mode 100644
index 0000000000..42d4f5cda8
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
@@ -0,0 +1,328 @@
+// mksysnum_linux.pl /usr/include/asm/unistd.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build s390x,linux
+
+package unix
+
+const (
+	SYS_EXIT                   = 1
+	SYS_FORK                   = 2
+	SYS_READ                   = 3
+	SYS_WRITE                  = 4
+	SYS_OPEN                   = 5
+	SYS_CLOSE                  = 6
+	SYS_RESTART_SYSCALL        = 7
+	SYS_CREAT                  = 8
+	SYS_LINK                   = 9
+	SYS_UNLINK                 = 10
+	SYS_EXECVE                 = 11
+	SYS_CHDIR                  = 12
+	SYS_MKNOD                  = 14
+	SYS_CHMOD                  = 15
+	SYS_LSEEK                  = 19
+	SYS_GETPID                 = 20
+	SYS_MOUNT                  = 21
+	SYS_UMOUNT                 = 22
+	SYS_PTRACE                 = 26
+	SYS_ALARM                  = 27
+	SYS_PAUSE                  = 29
+	SYS_UTIME                  = 30
+	SYS_ACCESS                 = 33
+	SYS_NICE                   = 34
+	SYS_SYNC                   = 36
+	SYS_KILL                   = 37
+	SYS_RENAME                 = 38
+	SYS_MKDIR                  = 39
+	SYS_RMDIR                  = 40
+	SYS_DUP                    = 41
+	SYS_PIPE                   = 42
+	SYS_TIMES                  = 43
+	SYS_BRK                    = 45
+	SYS_SIGNAL                 = 48
+	SYS_ACCT                   = 51
+	SYS_UMOUNT2                = 52
+	SYS_IOCTL                  = 54
+	SYS_FCNTL                  = 55
+	SYS_SETPGID                = 57
+	SYS_UMASK                  = 60
+	SYS_CHROOT                 = 61
+	SYS_USTAT                  = 62
+	SYS_DUP2                   = 63
+	SYS_GETPPID                = 64
+	SYS_GETPGRP                = 65
+	SYS_SETSID                 = 66
+	SYS_SIGACTION              = 67
+	SYS_SIGSUSPEND             = 72
+	SYS_SIGPENDING             = 73
+	SYS_SETHOSTNAME            = 74
+	SYS_SETRLIMIT              = 75
+	SYS_GETRUSAGE              = 77
+	SYS_GETTIMEOFDAY           = 78
+	SYS_SETTIMEOFDAY           = 79
+	SYS_SYMLINK                = 83
+	SYS_READLINK               = 85
+	SYS_USELIB                 = 86
+	SYS_SWAPON                 = 87
+	SYS_REBOOT                 = 88
+	SYS_READDIR                = 89
+	SYS_MMAP                   = 90
+	SYS_MUNMAP                 = 91
+	SYS_TRUNCATE               = 92
+	SYS_FTRUNCATE              = 93
+	SYS_FCHMOD                 = 94
+	SYS_GETPRIORITY            = 96
+	SYS_SETPRIORITY            = 97
+	SYS_STATFS                 = 99
+	SYS_FSTATFS                = 100
+	SYS_SOCKETCALL             = 102
+	SYS_SYSLOG                 = 103
+	SYS_SETITIMER              = 104
+	SYS_GETITIMER              = 105
+	SYS_STAT                   = 106
+	SYS_LSTAT                  = 107
+	SYS_FSTAT                  = 108
+	SYS_LOOKUP_DCOOKIE         = 110
+	SYS_VHANGUP                = 111
+	SYS_IDLE                   = 112
+	SYS_WAIT4                  = 114
+	SYS_SWAPOFF                = 115
+	SYS_SYSINFO                = 116
+	SYS_IPC                    = 117
+	SYS_FSYNC                  = 118
+	SYS_SIGRETURN              = 119
+	SYS_CLONE                  = 120
+	SYS_SETDOMAINNAME          = 121
+	SYS_UNAME                  = 122
+	SYS_ADJTIMEX               = 124
+	SYS_MPROTECT               = 125
+	SYS_SIGPROCMASK            = 126
+	SYS_CREATE_MODULE          = 127
+	SYS_INIT_MODULE            = 128
+	SYS_DELETE_MODULE          = 129
+	SYS_GET_KERNEL_SYMS        = 130
+	SYS_QUOTACTL               = 131
+	SYS_GETPGID                = 132
+	SYS_FCHDIR                 = 133
+	SYS_BDFLUSH                = 134
+	SYS_SYSFS                  = 135
+	SYS_PERSONALITY            = 136
+	SYS_AFS_SYSCALL            = 137
+	SYS_GETDENTS               = 141
+	SYS_FLOCK                  = 143
+	SYS_MSYNC                  = 144
+	SYS_READV                  = 145
+	SYS_WRITEV                 = 146
+	SYS_GETSID                 = 147
+	SYS_FDATASYNC              = 148
+	SYS__SYSCTL                = 149
+	SYS_MLOCK                  = 150
+	SYS_MUNLOCK                = 151
+	SYS_MLOCKALL               = 152
+	SYS_MUNLOCKALL             = 153
+	SYS_SCHED_SETPARAM         = 154
+	SYS_SCHED_GETPARAM         = 155
+	SYS_SCHED_SETSCHEDULER     = 156
+	SYS_SCHED_GETSCHEDULER     = 157
+	SYS_SCHED_YIELD            = 158
+	SYS_SCHED_GET_PRIORITY_MAX = 159
+	SYS_SCHED_GET_PRIORITY_MIN = 160
+	SYS_SCHED_RR_GET_INTERVAL  = 161
+	SYS_NANOSLEEP              = 162
+	SYS_MREMAP                 = 163
+	SYS_QUERY_MODULE           = 167
+	SYS_POLL                   = 168
+	SYS_NFSSERVCTL             = 169
+	SYS_PRCTL                  = 172
+	SYS_RT_SIGRETURN           = 173
+	SYS_RT_SIGACTION           = 174
+	SYS_RT_SIGPROCMASK         = 175
+	SYS_RT_SIGPENDING          = 176
+	SYS_RT_SIGTIMEDWAIT        = 177
+	SYS_RT_SIGQUEUEINFO        = 178
+	SYS_RT_SIGSUSPEND          = 179
+	SYS_PREAD64                = 180
+	SYS_PWRITE64               = 181
+	SYS_GETCWD                 = 183
+	SYS_CAPGET                 = 184
+	SYS_CAPSET                 = 185
+	SYS_SIGALTSTACK            = 186
+	SYS_SENDFILE               = 187
+	SYS_GETPMSG                = 188
+	SYS_PUTPMSG                = 189
+	SYS_VFORK                  = 190
+	SYS_PIVOT_ROOT             = 217
+	SYS_MINCORE                = 218
+	SYS_MADVISE                = 219
+	SYS_GETDENTS64             = 220
+	SYS_READAHEAD              = 222
+	SYS_SETXATTR               = 224
+	SYS_LSETXATTR              = 225
+	SYS_FSETXATTR              = 226
+	SYS_GETXATTR               = 227
+	SYS_LGETXATTR              = 228
+	SYS_FGETXATTR              = 229
+	SYS_LISTXATTR              = 230
+	SYS_LLISTXATTR             = 231
+	SYS_FLISTXATTR             = 232
+	SYS_REMOVEXATTR            = 233
+	SYS_LREMOVEXATTR           = 234
+	SYS_FREMOVEXATTR           = 235
+	SYS_GETTID                 = 236
+	SYS_TKILL                  = 237
+	SYS_FUTEX                  = 238
+	SYS_SCHED_SETAFFINITY      = 239
+	SYS_SCHED_GETAFFINITY      = 240
+	SYS_TGKILL                 = 241
+	SYS_IO_SETUP               = 243
+	SYS_IO_DESTROY             = 244
+	SYS_IO_GETEVENTS           = 245
+	SYS_IO_SUBMIT              = 246
+	SYS_IO_CANCEL              = 247
+	SYS_EXIT_GROUP             = 248
+	SYS_EPOLL_CREATE           = 249
+	SYS_EPOLL_CTL              = 250
+	SYS_EPOLL_WAIT             = 251
+	SYS_SET_TID_ADDRESS        = 252
+	SYS_FADVISE64              = 253
+	SYS_TIMER_CREATE           = 254
+	SYS_TIMER_SETTIME          = 255
+	SYS_TIMER_GETTIME          = 256
+	SYS_TIMER_GETOVERRUN       = 257
+	SYS_TIMER_DELETE           = 258
+	SYS_CLOCK_SETTIME          = 259
+	SYS_CLOCK_GETTIME          = 260
+	SYS_CLOCK_GETRES           = 261
+	SYS_CLOCK_NANOSLEEP        = 262
+	SYS_STATFS64               = 265
+	SYS_FSTATFS64              = 266
+	SYS_REMAP_FILE_PAGES       = 267
+	SYS_MBIND                  = 268
+	SYS_GET_MEMPOLICY          = 269
+	SYS_SET_MEMPOLICY          = 270
+	SYS_MQ_OPEN                = 271
+	SYS_MQ_UNLINK              = 272
+	SYS_MQ_TIMEDSEND           = 273
+	SYS_MQ_TIMEDRECEIVE        = 274
+	SYS_MQ_NOTIFY              = 275
+	SYS_MQ_GETSETATTR          = 276
+	SYS_KEXEC_LOAD             = 277
+	SYS_ADD_KEY                = 278
+	SYS_REQUEST_KEY            = 279
+	SYS_KEYCTL                 = 280
+	SYS_WAITID                 = 281
+	SYS_IOPRIO_SET             = 282
+	SYS_IOPRIO_GET             = 283
+	SYS_INOTIFY_INIT           = 284
+	SYS_INOTIFY_ADD_WATCH      = 285
+	SYS_INOTIFY_RM_WATCH       = 286
+	SYS_MIGRATE_PAGES          = 287
+	SYS_OPENAT                 = 288
+	SYS_MKDIRAT                = 289
+	SYS_MKNODAT                = 290
+	SYS_FCHOWNAT               = 291
+	SYS_FUTIMESAT              = 292
+	SYS_UNLINKAT               = 294
+	SYS_RENAMEAT               = 295
+	SYS_LINKAT                 = 296
+	SYS_SYMLINKAT              = 297
+	SYS_READLINKAT             = 298
+	SYS_FCHMODAT               = 299
+	SYS_FACCESSAT              = 300
+	SYS_PSELECT6               = 301
+	SYS_PPOLL                  = 302
+	SYS_UNSHARE                = 303
+	SYS_SET_ROBUST_LIST        = 304
+	SYS_GET_ROBUST_LIST        = 305
+	SYS_SPLICE                 = 306
+	SYS_SYNC_FILE_RANGE        = 307
+	SYS_TEE                    = 308
+	SYS_VMSPLICE               = 309
+	SYS_MOVE_PAGES             = 310
+	SYS_GETCPU                 = 311
+	SYS_EPOLL_PWAIT            = 312
+	SYS_UTIMES                 = 313
+	SYS_FALLOCATE              = 314
+	SYS_UTIMENSAT              = 315
+	SYS_SIGNALFD               = 316
+	SYS_TIMERFD                = 317
+	SYS_EVENTFD                = 318
+	SYS_TIMERFD_CREATE         = 319
+	SYS_TIMERFD_SETTIME        = 320
+	SYS_TIMERFD_GETTIME        = 321
+	SYS_SIGNALFD4              = 322
+	SYS_EVENTFD2               = 323
+	SYS_INOTIFY_INIT1          = 324
+	SYS_PIPE2                  = 325
+	SYS_DUP3                   = 326
+	SYS_EPOLL_CREATE1          = 327
+	SYS_PREADV                 = 328
+	SYS_PWRITEV                = 329
+	SYS_RT_TGSIGQUEUEINFO      = 330
+	SYS_PERF_EVENT_OPEN        = 331
+	SYS_FANOTIFY_INIT          = 332
+	SYS_FANOTIFY_MARK          = 333
+	SYS_PRLIMIT64              = 334
+	SYS_NAME_TO_HANDLE_AT      = 335
+	SYS_OPEN_BY_HANDLE_AT      = 336
+	SYS_CLOCK_ADJTIME          = 337
+	SYS_SYNCFS                 = 338
+	SYS_SETNS                  = 339
+	SYS_PROCESS_VM_READV       = 340
+	SYS_PROCESS_VM_WRITEV      = 341
+	SYS_S390_RUNTIME_INSTR     = 342
+	SYS_KCMP                   = 343
+	SYS_FINIT_MODULE           = 344
+	SYS_SCHED_SETATTR          = 345
+	SYS_SCHED_GETATTR          = 346
+	SYS_RENAMEAT2              = 347
+	SYS_SECCOMP                = 348
+	SYS_GETRANDOM              = 349
+	SYS_MEMFD_CREATE           = 350
+	SYS_BPF                    = 351
+	SYS_S390_PCI_MMIO_WRITE    = 352
+	SYS_S390_PCI_MMIO_READ     = 353
+	SYS_EXECVEAT               = 354
+	SYS_USERFAULTFD            = 355
+	SYS_MEMBARRIER             = 356
+	SYS_RECVMMSG               = 357
+	SYS_SENDMMSG               = 358
+	SYS_SOCKET                 = 359
+	SYS_SOCKETPAIR             = 360
+	SYS_BIND                   = 361
+	SYS_CONNECT                = 362
+	SYS_LISTEN                 = 363
+	SYS_ACCEPT4                = 364
+	SYS_GETSOCKOPT             = 365
+	SYS_SETSOCKOPT             = 366
+	SYS_GETSOCKNAME            = 367
+	SYS_GETPEERNAME            = 368
+	SYS_SENDTO                 = 369
+	SYS_SENDMSG                = 370
+	SYS_RECVFROM               = 371
+	SYS_RECVMSG                = 372
+	SYS_SHUTDOWN               = 373
+	SYS_MLOCK2                 = 374
+	SYS_SELECT                 = 142
+	SYS_GETRLIMIT              = 191
+	SYS_LCHOWN                 = 198
+	SYS_GETUID                 = 199
+	SYS_GETGID                 = 200
+	SYS_GETEUID                = 201
+	SYS_GETEGID                = 202
+	SYS_SETREUID               = 203
+	SYS_SETREGID               = 204
+	SYS_GETGROUPS              = 205
+	SYS_SETGROUPS              = 206
+	SYS_FCHOWN                 = 207
+	SYS_SETRESUID              = 208
+	SYS_GETRESUID              = 209
+	SYS_SETRESGID              = 210
+	SYS_GETRESGID              = 211
+	SYS_CHOWN                  = 212
+	SYS_SETUID                 = 213
+	SYS_SETGID                 = 214
+	SYS_SETFSUID               = 215
+	SYS_SETFSGID               = 216
+	SYS_NEWFSTATAT             = 293
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
new file mode 100644
index 0000000000..f60d8f9882
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
@@ -0,0 +1,273 @@
+// mksysnum_netbsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build 386,netbsd
+
+package unix
+
+const (
+	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
+	SYS_FORK                 = 2   // { int|sys||fork(void); }
+	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
+	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
+	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
+	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
+	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
+	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
+	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
+	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
+	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
+	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
+	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
+	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
+	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
+	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
+	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
+	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
+	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
+	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
+	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
+	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
+	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
+	SYS_SYNC                 = 36  // { void|sys||sync(void); }
+	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
+	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
+	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
+	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
+	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
+	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
+	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
+	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
+	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
+	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
+	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
+	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
+	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
+	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
+	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
+	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
+	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
+	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
+	SYS_VFORK                = 66  // { int|sys||vfork(void); }
+	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
+	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
+	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
+	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
+	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
+	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
+	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
+	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
+	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
+	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
+	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
+	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
+	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
+	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
+	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
+	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
+	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
+	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
+	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
+	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
+	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
+	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
+	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
+	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
+	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
+	SYS_SETSID               = 147 // { int|sys||setsid(void); }
+	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
+	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
+	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
+	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
+	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
+	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
+	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
+	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
+	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
+	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
+	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
+	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
+	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
+	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
+	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
+	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
+	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
+	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
+	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
+	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
+	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
+	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
+	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
+	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
+	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
+	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
+	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
+	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
+	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
+	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
+	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
+	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
+	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
+	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
+	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
+	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
+	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
+	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
+	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
+	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
+	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
+	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
+	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
+	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
+	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
+	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
+	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
+	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
+	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
+	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
+	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
+	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
+	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
+	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
+	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
+	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
+	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
+	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
+	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
+	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
+	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
+	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
+	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
+	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
+	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
+	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
+	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
+	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
+	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
+	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
+	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
+	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
+	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
+	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
+	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
+	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
+	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
+	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
+	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
+	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
+	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
+	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
+	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
+	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
+	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
+	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
+	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
+	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
+	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
+	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
+	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
+	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
+	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
+	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
+	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
+	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
+	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
+	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
+	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
+	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
+	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
+	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
+	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
+	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
+	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
+	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
+	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
+	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
+	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
+	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
+	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
+	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
+	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
+	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
+	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
+	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
+	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
+	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
+	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
+	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
+	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
+	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
+	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
+	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
+	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
+	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
+	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
+	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
+	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
+	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
+	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
+	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
+	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
+	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
+	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
+	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
+	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
+	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
+	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
+	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
+	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
+	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
+	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
+	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
+	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
+	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
+	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
+	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
+	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
+	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
new file mode 100644
index 0000000000..48a91d4646
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
@@ -0,0 +1,273 @@
+// mksysnum_netbsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build amd64,netbsd
+
+package unix
+
+const (
+	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
+	SYS_FORK                 = 2   // { int|sys||fork(void); }
+	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
+	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
+	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
+	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
+	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
+	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
+	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
+	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
+	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
+	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
+	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
+	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
+	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
+	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
+	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
+	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
+	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
+	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
+	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
+	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
+	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
+	SYS_SYNC                 = 36  // { void|sys||sync(void); }
+	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
+	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
+	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
+	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
+	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
+	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
+	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
+	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
+	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
+	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
+	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
+	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
+	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
+	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
+	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
+	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
+	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
+	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
+	SYS_VFORK                = 66  // { int|sys||vfork(void); }
+	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
+	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
+	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
+	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
+	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
+	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
+	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
+	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
+	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
+	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
+	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
+	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
+	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
+	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
+	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
+	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
+	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
+	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
+	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
+	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
+	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
+	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
+	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
+	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
+	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
+	SYS_SETSID               = 147 // { int|sys||setsid(void); }
+	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
+	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
+	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
+	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
+	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
+	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
+	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
+	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
+	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
+	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
+	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
+	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
+	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
+	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
+	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
+	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
+	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
+	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
+	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
+	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
+	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
+	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
+	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
+	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
+	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
+	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
+	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
+	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
+	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
+	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
+	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
+	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
+	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
+	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
+	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
+	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
+	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
+	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
+	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
+	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
+	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
+	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
+	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
+	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
+	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
+	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
+	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
+	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
+	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
+	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
+	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
+	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
+	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
+	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
+	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
+	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
+	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
+	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
+	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
+	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
+	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
+	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
+	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
+	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
+	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
+	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
+	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
+	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
+	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
+	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
+	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
+	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
+	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
+	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
+	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
+	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
+	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
+	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
+	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
+	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
+	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
+	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
+	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
+	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
+	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
+	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
+	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
+	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
+	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
+	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
+	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
+	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
+	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
+	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
+	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
+	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
+	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
+	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
+	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
+	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
+	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
+	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
+	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
+	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
+	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
+	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
+	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
+	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
+	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
+	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
+	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
+	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
+	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
+	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
+	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
+	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
+	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
+	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
+	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
+	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
+	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
+	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
+	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
+	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
+	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
+	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
+	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
+	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
+	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
+	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
+	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
+	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
+	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
+	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
+	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
+	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
+	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
+	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
+	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
+	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
+	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
+	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
+	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
+	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
+	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
+	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
+	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
+	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
+	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
+	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
new file mode 100644
index 0000000000..612ba662cb
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
@@ -0,0 +1,273 @@
+// mksysnum_netbsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm,netbsd
+
+package unix
+
+const (
+	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
+	SYS_FORK                 = 2   // { int|sys||fork(void); }
+	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
+	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
+	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
+	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
+	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
+	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
+	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
+	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
+	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
+	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
+	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
+	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
+	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
+	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
+	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
+	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
+	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
+	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
+	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
+	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
+	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
+	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
+	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
+	SYS_SYNC                 = 36  // { void|sys||sync(void); }
+	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
+	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
+	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
+	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
+	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
+	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
+	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
+	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
+	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
+	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
+	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
+	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
+	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
+	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
+	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
+	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
+	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
+	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
+	SYS_VFORK                = 66  // { int|sys||vfork(void); }
+	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
+	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
+	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
+	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
+	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
+	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
+	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
+	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
+	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
+	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
+	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
+	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
+	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
+	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
+	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
+	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
+	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
+	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
+	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
+	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
+	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
+	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
+	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
+	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
+	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
+	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
+	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
+	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
+	SYS_SETSID               = 147 // { int|sys||setsid(void); }
+	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
+	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
+	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
+	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
+	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
+	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
+	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
+	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
+	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
+	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
+	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
+	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
+	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
+	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
+	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
+	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
+	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
+	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
+	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
+	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
+	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
+	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
+	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
+	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
+	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
+	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
+	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
+	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
+	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
+	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
+	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
+	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
+	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
+	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
+	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
+	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
+	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
+	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
+	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
+	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
+	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
+	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
+	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
+	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
+	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
+	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
+	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
+	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
+	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
+	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
+	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
+	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
+	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
+	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
+	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
+	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
+	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
+	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
+	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
+	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
+	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
+	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
+	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
+	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
+	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
+	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
+	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
+	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
+	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
+	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
+	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
+	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
+	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
+	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
+	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
+	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
+	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
+	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
+	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
+	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
+	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
+	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
+	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
+	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
+	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
+	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
+	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
+	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
+	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
+	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
+	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
+	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
+	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
+	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
+	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
+	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
+	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
+	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
+	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
+	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
+	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
+	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
+	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
+	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
+	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
+	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
+	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
+	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
+	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
+	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
+	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
+	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
+	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
+	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
+	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
+	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
+	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
+	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
+	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
+	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
+	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
+	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
+	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
+	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
+	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
+	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
+	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
+	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
+	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
+	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
+	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
+	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
+	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
+	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
+	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
+	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
+	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
+	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
+	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
+	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
+	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
+	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
+	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
+	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
+	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
+	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
+	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
+	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
+	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
+	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
+	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
+	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
+	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
+	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
+	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
+	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
+	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
+	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
+	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
+	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
new file mode 100644
index 0000000000..3e8ce2a1dd
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
@@ -0,0 +1,207 @@
+// mksysnum_openbsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build 386,openbsd
+
+package unix
+
+const (
+	SYS_EXIT           = 1   // { void sys_exit(int rval); }
+	SYS_FORK           = 2   // { int sys_fork(void); }
+	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
+	SYS_OPEN           = 5   // { int sys_open(const char *path, \
+	SYS_CLOSE          = 6   // { int sys_close(int fd); }
+	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
+	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
+	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
+	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
+	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
+	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
+	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
+	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
+	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
+	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
+	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
+	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
+	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
+	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
+	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
+	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
+	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
+	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
+	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
+	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
+	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
+	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
+	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
+	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
+	SYS_ACCESS         = 33  // { int sys_access(const char *path, int flags); }
+	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
+	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
+	SYS_SYNC           = 36  // { void sys_sync(void); }
+	SYS_KILL           = 37  // { int sys_kill(int pid, int signum); }
+	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
+	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
+	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
+	SYS_DUP            = 41  // { int sys_dup(int fd); }
+	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
+	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
+	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
+	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
+	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
+	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
+	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
+	SYS_GETLOGIN       = 49  // { int sys_getlogin(char *namebuf, u_int namelen); }
+	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
+	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
+	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
+	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
+	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
+	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
+	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
+	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
+	SYS_READLINK       = 58  // { int sys_readlink(const char *path, char *buf, \
+	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
+	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
+	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
+	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
+	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
+	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
+	SYS_VFORK          = 66  // { int sys_vfork(void); }
+	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
+	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
+	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
+	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
+	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
+	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
+	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
+	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
+	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
+	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
+	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
+	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
+	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
+	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
+	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
+	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, int pgid); }
+	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
+	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
+	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
+	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
+	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
+	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
+	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
+	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
+	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
+	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
+	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
+	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
+	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
+	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
+	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
+	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
+	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
+	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
+	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
+	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
+	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
+	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
+	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
+	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
+	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
+	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
+	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
+	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
+	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
+	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
+	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
+	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
+	SYS_SETSID         = 147 // { int sys_setsid(void); }
+	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
+	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
+	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
+	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
+	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
+	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
+	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
+	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
+	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
+	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
+	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
+	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
+	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
+	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
+	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
+	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
+	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
+	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
+	SYS___SYSCTL       = 202 // { int sys___sysctl(const int *name, u_int namelen, \
+	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
+	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
+	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
+	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
+	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
+	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
+	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
+	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
+	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
+	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
+	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
+	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
+	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
+	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
+	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
+	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
+	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
+	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
+	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
+	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
+	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
+	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
+	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
+	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
+	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
+	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
+	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
+	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
+	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
+	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
+	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
+	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
+	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
+	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
+	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
+	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
+	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
+	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
+	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
+	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
+	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
+	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
+	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
+	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
+	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
+	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
+	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
+	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
+	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
+	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
+	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
+	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
+	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
+	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
+	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
new file mode 100644
index 0000000000..bd28146ddd
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
@@ -0,0 +1,207 @@
+// mksysnum_openbsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build amd64,openbsd
+
+package unix
+
+const (
+	SYS_EXIT           = 1   // { void sys_exit(int rval); }
+	SYS_FORK           = 2   // { int sys_fork(void); }
+	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
+	SYS_OPEN           = 5   // { int sys_open(const char *path, \
+	SYS_CLOSE          = 6   // { int sys_close(int fd); }
+	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
+	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
+	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
+	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
+	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
+	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
+	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
+	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
+	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
+	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
+	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
+	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
+	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
+	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
+	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
+	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
+	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
+	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
+	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
+	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
+	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
+	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
+	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
+	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
+	SYS_ACCESS         = 33  // { int sys_access(const char *path, int flags); }
+	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
+	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
+	SYS_SYNC           = 36  // { void sys_sync(void); }
+	SYS_KILL           = 37  // { int sys_kill(int pid, int signum); }
+	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
+	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
+	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
+	SYS_DUP            = 41  // { int sys_dup(int fd); }
+	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
+	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
+	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
+	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
+	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
+	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
+	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
+	SYS_GETLOGIN       = 49  // { int sys_getlogin(char *namebuf, u_int namelen); }
+	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
+	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
+	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
+	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
+	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
+	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
+	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
+	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
+	SYS_READLINK       = 58  // { int sys_readlink(const char *path, char *buf, \
+	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
+	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
+	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
+	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
+	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
+	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
+	SYS_VFORK          = 66  // { int sys_vfork(void); }
+	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
+	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
+	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
+	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
+	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
+	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
+	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
+	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
+	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
+	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
+	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
+	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
+	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
+	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
+	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
+	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, int pgid); }
+	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
+	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
+	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
+	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
+	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
+	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
+	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
+	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
+	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
+	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
+	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
+	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
+	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
+	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
+	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
+	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
+	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
+	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
+	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
+	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
+	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
+	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
+	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
+	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
+	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
+	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
+	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
+	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
+	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
+	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
+	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
+	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
+	SYS_SETSID         = 147 // { int sys_setsid(void); }
+	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
+	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
+	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
+	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
+	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
+	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
+	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
+	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
+	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
+	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
+	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
+	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
+	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
+	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
+	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
+	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
+	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
+	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
+	SYS___SYSCTL       = 202 // { int sys___sysctl(const int *name, u_int namelen, \
+	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
+	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
+	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
+	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
+	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
+	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
+	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
+	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
+	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
+	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
+	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
+	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
+	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
+	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
+	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
+	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
+	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
+	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
+	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
+	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
+	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
+	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
+	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
+	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
+	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
+	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
+	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
+	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
+	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
+	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
+	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
+	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
+	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
+	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
+	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
+	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
+	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
+	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
+	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
+	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
+	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
+	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
+	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
+	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
+	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
+	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
+	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
+	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
+	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
+	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
+	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
+	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
+	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
+	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
+	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
+)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
new file mode 100644
index 0000000000..c708659859
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
@@ -0,0 +1,13 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build amd64,solaris
+
+package unix
+
+// TODO(aram): remove these before Go 1.3.
+const (
+	SYS_EXECVE = 59
+	SYS_FCNTL  = 62
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
new file mode 100644
index 0000000000..2de1d44e28
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
@@ -0,0 +1,447 @@
+// +build 386,darwin
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timeval32 struct{}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
+}
+
+type Statfs_t struct {
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        Fsid
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset int64
+	Count  int32
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint32
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags       uint32
+	Contigbytes int64
+	Devoffset   int64
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Dirent struct {
+	Ino       uint64
+	Seekoff   uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [1024]int8
+	Pad_cgo_0 [3]byte
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+const (
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Typelen    uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Unused1    uint8
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Recvtiming uint32
+	Xmittiming uint32
+	Lastchange Timeval
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfmaMsghdr2 struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Refcount  int32
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
new file mode 100644
index 0000000000..044657878c
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
@@ -0,0 +1,462 @@
+// +build amd64,darwin
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Timeval32 struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Pad_cgo_0     [4]byte
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
+}
+
+type Statfs_t struct {
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        Fsid
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset    int64
+	Count     int32
+	Pad_cgo_0 [4]byte
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint64
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags     uint32
+	Pad_cgo_0 [8]byte
+	Pad_cgo_1 [8]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Dirent struct {
+	Ino       uint64
+	Seekoff   uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [1024]int8
+	Pad_cgo_0 [3]byte
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad_cgo_1  [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+const (
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Typelen    uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Unused1    uint8
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Recvtiming uint32
+	Xmittiming uint32
+	Lastchange Timeval32
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfmaMsghdr2 struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Refcount  int32
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval32
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type Termios struct {
+	Iflag     uint64
+	Oflag     uint64
+	Cflag     uint64
+	Lflag     uint64
+	Cc        [20]uint8
+	Pad_cgo_0 [4]byte
+	Ispeed    uint64
+	Ospeed    uint64
+}
+
+const (
+	AT_FDCWD            = -0x2
+	AT_SYMLINK_NOFOLLOW = 0x20
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
new file mode 100644
index 0000000000..66df363ce5
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
@@ -0,0 +1,449 @@
+// NOTE: cgo can't generate struct Stat_t and struct Statfs_t yet
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+// +build arm,darwin
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timeval32 [0]byte
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
+}
+
+type Statfs_t struct {
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        Fsid
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset int64
+	Count  int32
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint32
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags       uint32
+	Contigbytes int64
+	Devoffset   int64
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Dirent struct {
+	Ino       uint64
+	Seekoff   uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [1024]int8
+	Pad_cgo_0 [3]byte
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+const (
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Typelen    uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Unused1    uint8
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Recvtiming uint32
+	Xmittiming uint32
+	Lastchange Timeval
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfmaMsghdr2 struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Refcount  int32
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
new file mode 100644
index 0000000000..85d56eabd3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
@@ -0,0 +1,457 @@
+// +build arm64,darwin
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_darwin.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Timeval32 struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           int32
+	Mode          uint16
+	Nlink         uint16
+	Ino           uint64
+	Uid           uint32
+	Gid           uint32
+	Rdev          int32
+	Pad_cgo_0     [4]byte
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       int32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Qspare        [2]int64
+}
+
+type Statfs_t struct {
+	Bsize       uint32
+	Iosize      int32
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      uint64
+	Files       uint64
+	Ffree       uint64
+	Fsid        Fsid
+	Owner       uint32
+	Type        uint32
+	Flags       uint32
+	Fssubtype   uint32
+	Fstypename  [16]int8
+	Mntonname   [1024]int8
+	Mntfromname [1024]int8
+	Reserved    [8]uint32
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Fstore_t struct {
+	Flags      uint32
+	Posmode    int32
+	Offset     int64
+	Length     int64
+	Bytesalloc int64
+}
+
+type Radvisory_t struct {
+	Offset    int64
+	Count     int32
+	Pad_cgo_0 [4]byte
+}
+
+type Fbootstraptransfer_t struct {
+	Offset int64
+	Length uint64
+	Buffer *byte
+}
+
+type Log2phys_t struct {
+	Flags     uint32
+	Pad_cgo_0 [8]byte
+	Pad_cgo_1 [8]byte
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type Dirent struct {
+	Ino       uint64
+	Seekoff   uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [1024]int8
+	Pad_cgo_0 [3]byte
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad_cgo_1  [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  uint32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet4Pktinfo     = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+const (
+	SizeofIfMsghdr    = 0x70
+	SizeofIfData      = 0x60
+	SizeofIfaMsghdr   = 0x14
+	SizeofIfmaMsghdr  = 0x10
+	SizeofIfmaMsghdr2 = 0x14
+	SizeofRtMsghdr    = 0x5c
+	SizeofRtMetrics   = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Typelen    uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Unused1    uint8
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Recvtiming uint32
+	Xmittiming uint32
+	Lastchange Timeval32
+	Unused2    uint32
+	Hwassist   uint32
+	Reserved1  uint32
+	Reserved2  uint32
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfmaMsghdr2 struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Refcount  int32
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   int32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Filler   [4]uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval32
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type Termios struct {
+	Iflag     uint64
+	Oflag     uint64
+	Cflag     uint64
+	Lflag     uint64
+	Cc        [20]uint8
+	Pad_cgo_0 [4]byte
+	Ispeed    uint64
+	Ospeed    uint64
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
new file mode 100644
index 0000000000..8a6f4e1ce3
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
@@ -0,0 +1,443 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_dragonfly.go
+
+// +build amd64,dragonfly
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur int64
+	Max int64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Ino      uint64
+	Nlink    uint32
+	Dev      uint32
+	Mode     uint16
+	Padding1 uint16
+	Uid      uint32
+	Gid      uint32
+	Rdev     uint32
+	Atim     Timespec
+	Mtim     Timespec
+	Ctim     Timespec
+	Size     int64
+	Blocks   int64
+	Blksize  uint32
+	Flags    uint32
+	Gen      uint32
+	Lspare   int32
+	Qspare1  int64
+	Qspare2  int64
+}
+
+type Statfs_t struct {
+	Spare2      int64
+	Bsize       int64
+	Iosize      int64
+	Blocks      int64
+	Bfree       int64
+	Bavail      int64
+	Files       int64
+	Ffree       int64
+	Fsid        Fsid
+	Owner       uint32
+	Type        int32
+	Flags       int32
+	Pad_cgo_0   [4]byte
+	Syncwrites  int64
+	Asyncwrites int64
+	Fstypename  [16]int8
+	Mntonname   [80]int8
+	Syncreads   int64
+	Asyncreads  int64
+	Spares1     int16
+	Mntfromname [80]int8
+	Spares2     int16
+	Pad_cgo_1   [4]byte
+	Spare       [2]int64
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno  uint64
+	Namlen  uint16
+	Type    uint8
+	Unused1 uint8
+	Unused2 uint32
+	Name    [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+	Rcf    uint16
+	Route  [16]uint16
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad_cgo_1  [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x36
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [16]uint64
+}
+
+const (
+	SizeofIfMsghdr         = 0xb0
+	SizeofIfData           = 0xa0
+	SizeofIfaMsghdr        = 0x14
+	SizeofIfmaMsghdr       = 0x10
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x98
+	SizeofRtMetrics        = 0x70
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Physical   uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Recvquota  uint8
+	Xmitquota  uint8
+	Pad_cgo_0  [2]byte
+	Mtu        uint64
+	Metric     uint64
+	Link_state uint64
+	Baudrate   uint64
+	Ipackets   uint64
+	Ierrors    uint64
+	Opackets   uint64
+	Oerrors    uint64
+	Collisions uint64
+	Ibytes     uint64
+	Obytes     uint64
+	Imcasts    uint64
+	Omcasts    uint64
+	Iqdrops    uint64
+	Noproto    uint64
+	Hwassist   uint64
+	Unused     uint64
+	Lastchange Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     uint64
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks     uint64
+	Mtu       uint64
+	Pksent    uint64
+	Expire    uint64
+	Sendpipe  uint64
+	Ssthresh  uint64
+	Rtt       uint64
+	Rttvar    uint64
+	Recvpipe  uint64
+	Hopcount  uint64
+	Mssopt    uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Msl       uint64
+	Iwmaxsegs uint64
+	Iwcapsegs uint64
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [6]byte
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
new file mode 100644
index 0000000000..8cf30947b4
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
@@ -0,0 +1,502 @@
+// +build 386,freebsd
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur int64
+	Max int64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Dev           uint32
+	Ino           uint32
+	Mode          uint16
+	Nlink         uint16
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Birthtimespec Timespec
+	Pad_cgo_0     [8]byte
+}
+
+type Statfs_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]int8
+	Mntfromname [88]int8
+	Mntonname   [88]int8
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+	Sysid  int32
+}
+
+type Dirent struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [46]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x36
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPMreqn          = 0xc
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
+}
+
+type FdSet struct {
+	X__fds_bits [32]uint32
+}
+
+const (
+	sizeofIfMsghdr         = 0x64
+	SizeofIfMsghdr         = 0x60
+	sizeofIfData           = 0x54
+	SizeofIfData           = 0x50
+	SizeofIfaMsghdr        = 0x14
+	SizeofIfmaMsghdr       = 0x10
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x5c
+	SizeofRtMetrics        = 0x38
+)
+
+type ifMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      ifData
+}
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type ifData struct {
+	Type        uint8
+	Physical    uint8
+	Addrlen     uint8
+	Hdrlen      uint8
+	Link_state  uint8
+	Vhid        uint8
+	Baudrate_pf uint8
+	Datalen     uint8
+	Mtu         uint32
+	Metric      uint32
+	Baudrate    uint32
+	Ipackets    uint32
+	Ierrors     uint32
+	Opackets    uint32
+	Oerrors     uint32
+	Collisions  uint32
+	Ibytes      uint32
+	Obytes      uint32
+	Imcasts     uint32
+	Omcasts     uint32
+	Iqdrops     uint32
+	Noproto     uint32
+	Hwassist    uint64
+	Epoch       int32
+	Lastchange  Timeval
+}
+
+type IfData struct {
+	Type        uint8
+	Physical    uint8
+	Addrlen     uint8
+	Hdrlen      uint8
+	Link_state  uint8
+	Spare_char1 uint8
+	Spare_char2 uint8
+	Datalen     uint8
+	Mtu         uint32
+	Metric      uint32
+	Baudrate    uint32
+	Ipackets    uint32
+	Ierrors     uint32
+	Opackets    uint32
+	Oerrors     uint32
+	Collisions  uint32
+	Ibytes      uint32
+	Obytes      uint32
+	Imcasts     uint32
+	Omcasts     uint32
+	Iqdrops     uint32
+	Noproto     uint32
+	Hwassist    uint32
+	Epoch       int32
+	Lastchange  Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Fmask     int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Weight   uint32
+	Filler   [3]uint32
+}
+
+const (
+	SizeofBpfVersion    = 0x4
+	SizeofBpfStat       = 0x8
+	SizeofBpfZbuf       = 0xc
+	SizeofBpfProgram    = 0x8
+	SizeofBpfInsn       = 0x8
+	SizeofBpfHdr        = 0x14
+	SizeofBpfZbufHeader = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfZbuf struct {
+	Bufa   *byte
+	Bufb   *byte
+	Buflen uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfZbufHeader struct {
+	Kernel_gen uint32
+	Kernel_len uint32
+	User_gen   uint32
+	X_bzh_pad  [5]uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
new file mode 100644
index 0000000000..e5feb207be
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
@@ -0,0 +1,505 @@
+// +build amd64,freebsd
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur int64
+	Max int64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Dev           uint32
+	Ino           uint32
+	Mode          uint16
+	Nlink         uint16
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Birthtimespec Timespec
+}
+
+type Statfs_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]int8
+	Mntfromname [88]int8
+	Mntonname   [88]int8
+}
+
+type Flock_t struct {
+	Start     int64
+	Len       int64
+	Pid       int32
+	Type      int16
+	Whence    int16
+	Sysid     int32
+	Pad_cgo_0 [4]byte
+}
+
+type Dirent struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [46]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad_cgo_1  [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x36
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPMreqn          = 0xc
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	X__fds_bits [16]uint64
+}
+
+const (
+	sizeofIfMsghdr         = 0xa8
+	SizeofIfMsghdr         = 0xa8
+	sizeofIfData           = 0x98
+	SizeofIfData           = 0x98
+	SizeofIfaMsghdr        = 0x14
+	SizeofIfmaMsghdr       = 0x10
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x98
+	SizeofRtMetrics        = 0x70
+)
+
+type ifMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      ifData
+}
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type ifData struct {
+	Type        uint8
+	Physical    uint8
+	Addrlen     uint8
+	Hdrlen      uint8
+	Link_state  uint8
+	Vhid        uint8
+	Baudrate_pf uint8
+	Datalen     uint8
+	Mtu         uint64
+	Metric      uint64
+	Baudrate    uint64
+	Ipackets    uint64
+	Ierrors     uint64
+	Opackets    uint64
+	Oerrors     uint64
+	Collisions  uint64
+	Ibytes      uint64
+	Obytes      uint64
+	Imcasts     uint64
+	Omcasts     uint64
+	Iqdrops     uint64
+	Noproto     uint64
+	Hwassist    uint64
+	Epoch       int64
+	Lastchange  Timeval
+}
+
+type IfData struct {
+	Type        uint8
+	Physical    uint8
+	Addrlen     uint8
+	Hdrlen      uint8
+	Link_state  uint8
+	Spare_char1 uint8
+	Spare_char2 uint8
+	Datalen     uint8
+	Mtu         uint64
+	Metric      uint64
+	Baudrate    uint64
+	Ipackets    uint64
+	Ierrors     uint64
+	Opackets    uint64
+	Oerrors     uint64
+	Collisions  uint64
+	Ibytes      uint64
+	Obytes      uint64
+	Imcasts     uint64
+	Omcasts     uint64
+	Iqdrops     uint64
+	Noproto     uint64
+	Hwassist    uint64
+	Epoch       int64
+	Lastchange  Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Fmask     int32
+	Inits     uint64
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint64
+	Mtu      uint64
+	Hopcount uint64
+	Expire   uint64
+	Recvpipe uint64
+	Sendpipe uint64
+	Ssthresh uint64
+	Rtt      uint64
+	Rttvar   uint64
+	Pksent   uint64
+	Weight   uint64
+	Filler   [3]uint64
+}
+
+const (
+	SizeofBpfVersion    = 0x4
+	SizeofBpfStat       = 0x8
+	SizeofBpfZbuf       = 0x18
+	SizeofBpfProgram    = 0x10
+	SizeofBpfInsn       = 0x8
+	SizeofBpfHdr        = 0x20
+	SizeofBpfZbufHeader = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfZbuf struct {
+	Bufa   *byte
+	Bufb   *byte
+	Buflen uint64
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [6]byte
+}
+
+type BpfZbufHeader struct {
+	Kernel_gen uint32
+	Kernel_len uint32
+	User_gen   uint32
+	X_bzh_pad  [5]uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
new file mode 100644
index 0000000000..5472b54284
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
@@ -0,0 +1,497 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -fsigned-char types_freebsd.go
+
+// +build arm,freebsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec       int64
+	Nsec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur int64
+	Max int64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Dev           uint32
+	Ino           uint32
+	Mode          uint16
+	Nlink         uint16
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint32
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Lspare        int32
+	Birthtimespec Timespec
+}
+
+type Statfs_t struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]int8
+	Mntfromname [88]int8
+	Mntonname   [88]int8
+}
+
+type Flock_t struct {
+	Start     int64
+	Len       int64
+	Pid       int32
+	Type      int16
+	Whence    int16
+	Sysid     int32
+	Pad_cgo_0 [4]byte
+}
+
+type Dirent struct {
+	Fileno uint32
+	Reclen uint16
+	Type   uint8
+	Namlen uint8
+	Name   [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [46]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x36
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPMreqn          = 0xc
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int32
+	Udata  *byte
+}
+
+type FdSet struct {
+	X__fds_bits [32]uint32
+}
+
+const (
+	sizeofIfMsghdr         = 0x70
+	SizeofIfMsghdr         = 0x70
+	sizeofIfData           = 0x60
+	SizeofIfData           = 0x60
+	SizeofIfaMsghdr        = 0x14
+	SizeofIfmaMsghdr       = 0x10
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x5c
+	SizeofRtMetrics        = 0x38
+)
+
+type ifMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      ifData
+}
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type ifData struct {
+	Type        uint8
+	Physical    uint8
+	Addrlen     uint8
+	Hdrlen      uint8
+	Link_state  uint8
+	Vhid        uint8
+	Baudrate_pf uint8
+	Datalen     uint8
+	Mtu         uint32
+	Metric      uint32
+	Baudrate    uint32
+	Ipackets    uint32
+	Ierrors     uint32
+	Opackets    uint32
+	Oerrors     uint32
+	Collisions  uint32
+	Ibytes      uint32
+	Obytes      uint32
+	Imcasts     uint32
+	Omcasts     uint32
+	Iqdrops     uint32
+	Noproto     uint32
+	Hwassist    uint64
+	Epoch       int64
+	Lastchange  Timeval
+}
+
+type IfData struct {
+	Type        uint8
+	Physical    uint8
+	Addrlen     uint8
+	Hdrlen      uint8
+	Link_state  uint8
+	Spare_char1 uint8
+	Spare_char2 uint8
+	Datalen     uint8
+	Mtu         uint32
+	Metric      uint32
+	Baudrate    uint32
+	Ipackets    uint32
+	Ierrors     uint32
+	Opackets    uint32
+	Oerrors     uint32
+	Collisions  uint32
+	Ibytes      uint32
+	Obytes      uint32
+	Imcasts     uint32
+	Omcasts     uint32
+	Iqdrops     uint32
+	Noproto     uint32
+	Hwassist    uint32
+	Pad_cgo_0   [4]byte
+	Epoch       int64
+	Lastchange  Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type IfmaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Fmask     int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+	Weight   uint32
+	Filler   [3]uint32
+}
+
+const (
+	SizeofBpfVersion    = 0x4
+	SizeofBpfStat       = 0x8
+	SizeofBpfZbuf       = 0xc
+	SizeofBpfProgram    = 0x8
+	SizeofBpfInsn       = 0x8
+	SizeofBpfHdr        = 0x20
+	SizeofBpfZbufHeader = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfZbuf struct {
+	Bufa   *byte
+	Bufb   *byte
+	Buflen uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    Timeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [6]byte
+}
+
+type BpfZbufHeader struct {
+	Kernel_gen uint32
+	Kernel_len uint32
+	User_gen   uint32
+	X_bzh_pad  [5]uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
new file mode 100644
index 0000000000..fb1257ae02
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -0,0 +1,607 @@
+// +build 386,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timex struct {
+	Modes     uint32
+	Offset    int32
+	Freq      int32
+	Maxerror  int32
+	Esterror  int32
+	Status    int32
+	Constant  int32
+	Precision int32
+	Tolerance int32
+	Time      Timeval
+	Tick      int32
+	Ppsfreq   int32
+	Jitter    int32
+	Shift     int32
+	Stabil    int32
+	Jitcnt    int32
+	Calcnt    int32
+	Errcnt    int32
+	Stbcnt    int32
+	Tai       int32
+	Pad_cgo_0 [44]byte
+}
+
+type Time_t int32
+
+type Tms struct {
+	Utime  int32
+	Stime  int32
+	Cutime int32
+	Cstime int32
+}
+
+type Utimbuf struct {
+	Actime  int32
+	Modtime int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev       uint64
+	X__pad1   uint16
+	Pad_cgo_0 [2]byte
+	X__st_ino uint32
+	Mode      uint32
+	Nlink     uint32
+	Uid       uint32
+	Gid       uint32
+	Rdev      uint64
+	X__pad2   uint16
+	Pad_cgo_1 [2]byte
+	Size      int64
+	Blksize   int32
+	Blocks    int64
+	Atim      Timespec
+	Mtim      Timespec
+	Ctim      Timespec
+	Ino       uint64
+}
+
+type Statfs_t struct {
+	Type    int32
+	Bsize   int32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int32
+	Frsize  int32
+	Flags   int32
+	Spare   [4]int32
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]int8
+	Pad_cgo_0 [1]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	Start  int64
+	Len    int64
+	Pid    int32
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len          uint32
+	Level        int32
+	Type         int32
+	X__cmsg_data [0]uint8
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x1c
+	SizeofCmsghdr           = 0xc
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x1d
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x8
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [2]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+	Name   [0]int8
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Ebx      int32
+	Ecx      int32
+	Edx      int32
+	Esi      int32
+	Edi      int32
+	Ebp      int32
+	Eax      int32
+	Xds      int32
+	Xes      int32
+	Xfs      int32
+	Xgs      int32
+	Orig_eax int32
+	Eip      int32
+	Xcs      int32
+	Eflags   int32
+	Esp      int32
+	Xss      int32
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+type Sysinfo_t struct {
+	Uptime    int32
+	Loads     [3]uint32
+	Totalram  uint32
+	Freeram   uint32
+	Sharedram uint32
+	Bufferram uint32
+	Totalswap uint32
+	Freeswap  uint32
+	Procs     uint16
+	Pad       uint16
+	Totalhigh uint32
+	Freehigh  uint32
+	Unit      uint32
+	X_f       [8]int8
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	Tinode uint32
+	Fname  [6]int8
+	Fpack  [6]int8
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
new file mode 100644
index 0000000000..34edb3685f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -0,0 +1,625 @@
+// +build amd64,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev       uint64
+	Ino       uint64
+	Nlink     uint64
+	Mode      uint32
+	Uid       uint32
+	Gid       uint32
+	X__pad0   int32
+	Rdev      uint64
+	Size      int64
+	Blksize   int64
+	Blocks    int64
+	Atim      Timespec
+	Mtim      Timespec
+	Ctim      Timespec
+	X__unused [3]int64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]int8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len          uint64
+	Level        int32
+	Type         int32
+	X__cmsg_data [0]uint8
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x1d
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+	Name   [0]int8
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	R15      uint64
+	R14      uint64
+	R13      uint64
+	R12      uint64
+	Rbp      uint64
+	Rbx      uint64
+	R11      uint64
+	R10      uint64
+	R9       uint64
+	R8       uint64
+	Rax      uint64
+	Rcx      uint64
+	Rdx      uint64
+	Rsi      uint64
+	Rdi      uint64
+	Orig_rax uint64
+	Rip      uint64
+	Cs       uint64
+	Eflags   uint64
+	Rsp      uint64
+	Ss       uint64
+	Fs_base  uint64
+	Gs_base  uint64
+	Ds       uint64
+	Es       uint64
+	Fs       uint64
+	Gs       uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]int8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
new file mode 100644
index 0000000000..0fef350b14
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -0,0 +1,587 @@
+// +build arm,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Timex struct {
+	Modes     uint32
+	Offset    int32
+	Freq      int32
+	Maxerror  int32
+	Esterror  int32
+	Status    int32
+	Constant  int32
+	Precision int32
+	Tolerance int32
+	Time      Timeval
+	Tick      int32
+	Ppsfreq   int32
+	Jitter    int32
+	Shift     int32
+	Stabil    int32
+	Jitcnt    int32
+	Calcnt    int32
+	Errcnt    int32
+	Stbcnt    int32
+	Tai       int32
+	Pad_cgo_0 [44]byte
+}
+
+type Time_t int32
+
+type Tms struct {
+	Utime  int32
+	Stime  int32
+	Cutime int32
+	Cstime int32
+}
+
+type Utimbuf struct {
+	Actime  int32
+	Modtime int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev       uint64
+	X__pad1   uint16
+	Pad_cgo_0 [2]byte
+	X__st_ino uint32
+	Mode      uint32
+	Nlink     uint32
+	Uid       uint32
+	Gid       uint32
+	Rdev      uint64
+	X__pad2   uint16
+	Pad_cgo_1 [6]byte
+	Size      int64
+	Blksize   int32
+	Pad_cgo_2 [4]byte
+	Blocks    int64
+	Atim      Timespec
+	Mtim      Timespec
+	Ctim      Timespec
+	Ino       uint64
+}
+
+type Statfs_t struct {
+	Type      int32
+	Bsize     int32
+	Blocks    uint64
+	Bfree     uint64
+	Bavail    uint64
+	Files     uint64
+	Ffree     uint64
+	Fsid      Fsid
+	Namelen   int32
+	Frsize    int32
+	Flags     int32
+	Spare     [4]int32
+	Pad_cgo_0 [4]byte
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]uint8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]uint8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]uint8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len          uint32
+	Level        int32
+	Type         int32
+	X__cmsg_data [0]uint8
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x1c
+	SizeofCmsghdr           = 0xc
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x1d
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x8
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [2]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+	Name   [0]uint8
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Uregs [18]uint32
+}
+
+type FdSet struct {
+	Bits [32]int32
+}
+
+type Sysinfo_t struct {
+	Uptime    int32
+	Loads     [3]uint32
+	Totalram  uint32
+	Freeram   uint32
+	Sharedram uint32
+	Bufferram uint32
+	Totalswap uint32
+	Freeswap  uint32
+	Procs     uint16
+	Pad       uint16
+	Totalhigh uint32
+	Freehigh  uint32
+	Unit      uint32
+	X_f       [8]uint8
+}
+
+type Utsname struct {
+	Sysname    [65]uint8
+	Nodename   [65]uint8
+	Release    [65]uint8
+	Version    [65]uint8
+	Machine    [65]uint8
+	Domainname [65]uint8
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	Tinode uint32
+	Fname  [6]uint8
+	Fpack  [6]uint8
+}
+
+type EpollEvent struct {
+	Events uint32
+	PadFd  int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
new file mode 100644
index 0000000000..28b7cd43ce
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -0,0 +1,604 @@
+// +build arm64,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -fsigned-char types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev               uint64
+	Ino               uint64
+	Mode              uint32
+	Nlink             uint32
+	Uid               uint32
+	Gid               uint32
+	Rdev              uint64
+	X__pad1           uint64
+	Size              int64
+	Blksize           int32
+	X__pad2           int32
+	Blocks            int64
+	Atim              Timespec
+	Mtim              Timespec
+	Ctim              Timespec
+	X__glibc_reserved [2]int32
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]int8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len          uint64
+	Level        int32
+	Type         int32
+	X__cmsg_data [0]uint8
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x22
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+	Name   [0]int8
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs   [31]uint64
+	Sp     uint64
+	Pc     uint64
+	Pstate uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]int8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	PadFd  int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
new file mode 100644
index 0000000000..8fe5af2628
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -0,0 +1,607 @@
+// +build mips64,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint32
+	Pad1    [3]int32
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Pad2    [3]uint32
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize uint32
+	Pad4    uint32
+	Blocks  int64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Frsize  int64
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int64
+	Flags   int64
+	Spare   [5]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]int8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x27
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs        [102]uint64
+	U_tsize     uint64
+	U_dsize     uint64
+	U_ssize     uint64
+	Start_code  uint64
+	Start_data  uint64
+	Start_stack uint64
+	Signal      int64
+	U_ar0       uint64
+	Magic       uint64
+	U_comm      [32]int8
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]int8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag     uint32
+	Oflag     uint32
+	Cflag     uint32
+	Lflag     uint32
+	Line      uint8
+	Cc        [32]uint8
+	Pad_cgo_0 [3]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
new file mode 100644
index 0000000000..df16e83c5b
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -0,0 +1,607 @@
+// +build mips64le,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint32
+	Pad1    [3]int32
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint32
+	Pad2    [3]uint32
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize uint32
+	Pad4    uint32
+	Blocks  int64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Frsize  int64
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int64
+	Flags   int64
+	Spare   [5]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]int8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x27
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Regs        [102]uint64
+	U_tsize     uint64
+	U_dsize     uint64
+	U_ssize     uint64
+	Start_code  uint64
+	Start_data  uint64
+	Start_stack uint64
+	Signal      int64
+	U_ar0       uint64
+	Magic       uint64
+	U_comm      [32]int8
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]int8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag     uint32
+	Oflag     uint32
+	Cflag     uint32
+	Lflag     uint32
+	Line      uint8
+	Cc        [32]uint8
+	Pad_cgo_0 [3]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
new file mode 100644
index 0000000000..d1105402ec
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -0,0 +1,614 @@
+// +build ppc64,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev                uint64
+	Ino                uint64
+	Nlink              uint64
+	Mode               uint32
+	Uid                uint32
+	Gid                uint32
+	X__pad2            int32
+	Rdev               uint64
+	Size               int64
+	Blksize            int64
+	Blocks             int64
+	Atim               Timespec
+	Mtim               Timespec
+	Ctim               Timespec
+	X__glibc_reserved4 uint64
+	X__glibc_reserved5 uint64
+	X__glibc_reserved6 uint64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]uint8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]uint8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]uint8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len          uint64
+	Level        int32
+	Type         int32
+	X__cmsg_data [0]uint8
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x23
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+	Name   [0]uint8
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Gpr       [32]uint64
+	Nip       uint64
+	Msr       uint64
+	Orig_gpr3 uint64
+	Ctr       uint64
+	Link      uint64
+	Xer       uint64
+	Ccr       uint64
+	Softe     uint64
+	Trap      uint64
+	Dar       uint64
+	Dsisr     uint64
+	Result    uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]uint8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]uint8
+	Nodename   [65]uint8
+	Release    [65]uint8
+	Version    [65]uint8
+	Machine    [65]uint8
+	Domainname [65]uint8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]uint8
+	Fpack     [6]uint8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events  uint32
+	X_padFd int32
+	Fd      int32
+	Pad     int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [19]uint8
+	Line   uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
new file mode 100644
index 0000000000..8e25c9fffc
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -0,0 +1,614 @@
+// +build ppc64le,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	Pad_cgo_0 [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	Pad_cgo_1 [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	Pad_cgo_2 [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	Pad_cgo_3 [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev                uint64
+	Ino                uint64
+	Nlink              uint64
+	Mode               uint32
+	Uid                uint32
+	Gid                uint32
+	X__pad2            int32
+	Rdev               uint64
+	Size               int64
+	Blksize            int64
+	Blocks             int64
+	Atim               Timespec
+	Mtim               Timespec
+	Ctim               Timespec
+	X__glibc_reserved4 uint64
+	X__glibc_reserved5 uint64
+	X__glibc_reserved6 uint64
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Type      uint8
+	Name      [256]uint8
+	Pad_cgo_0 [5]byte
+}
+
+type Fsid struct {
+	X__val [2]int32
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Pid       int32
+	Pad_cgo_1 [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]uint8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]uint8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	Pad_cgo_1  [4]byte
+}
+
+type Cmsghdr struct {
+	Len          uint64
+	Level        int32
+	Type         int32
+	X__cmsg_data [0]uint8
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	Pad_cgo_0      [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x22
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family     uint8
+	X__ifi_pad uint8
+	Type       uint16
+	Index      int32
+	Flags      uint32
+	Change     uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len       uint16
+	Pad_cgo_0 [6]byte
+	Filter    *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+	Name   [0]uint8
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Gpr       [32]uint64
+	Nip       uint64
+	Msr       uint64
+	Orig_gpr3 uint64
+	Ctr       uint64
+	Link      uint64
+	Xer       uint64
+	Ccr       uint64
+	Softe     uint64
+	Trap      uint64
+	Dar       uint64
+	Dsisr     uint64
+	Result    uint64
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	Pad_cgo_0 [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	X_f       [0]uint8
+	Pad_cgo_1 [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]uint8
+	Nodename   [65]uint8
+	Release    [65]uint8
+	Version    [65]uint8
+	Machine    [65]uint8
+	Domainname [65]uint8
+}
+
+type Ustat_t struct {
+	Tfree     int32
+	Pad_cgo_0 [4]byte
+	Tinode    uint64
+	Fname     [6]uint8
+	Fpack     [6]uint8
+	Pad_cgo_1 [4]byte
+}
+
+type EpollEvent struct {
+	Events  uint32
+	X_padFd int32
+	Fd      int32
+	Pad     int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [19]uint8
+	Line   uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
new file mode 100644
index 0000000000..268e373624
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -0,0 +1,629 @@
+// +build s390x,linux
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- -fsigned-char types_linux.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x1000
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timex struct {
+	Modes     uint32
+	_         [4]byte
+	Offset    int64
+	Freq      int64
+	Maxerror  int64
+	Esterror  int64
+	Status    int32
+	_         [4]byte
+	Constant  int64
+	Precision int64
+	Tolerance int64
+	Time      Timeval
+	Tick      int64
+	Ppsfreq   int64
+	Jitter    int64
+	Shift     int32
+	_         [4]byte
+	Stabil    int64
+	Jitcnt    int64
+	Calcnt    int64
+	Errcnt    int64
+	Stbcnt    int64
+	Tai       int32
+	_         [44]byte
+}
+
+type Time_t int64
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	Uid     uint32
+	Gid     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize int64
+	Blocks  int64
+	_       [3]int64
+}
+
+type Statfs_t struct {
+	Type    uint32
+	Bsize   uint32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen uint32
+	Frsize  uint32
+	Flags   uint32
+	Spare   [4]uint32
+	_       [4]byte
+}
+
+type Dirent struct {
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
+}
+
+type Fsid struct {
+	_ [2]int32
+}
+
+type Flock_t struct {
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x6
+	FADV_NOREUSE    = 0x7
+)
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]uint8
+}
+
+type RawSockaddrInet6 struct {
+	Family   uint16
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrLinklayer struct {
+	Family   uint16
+	Protocol uint16
+	Ifindex  int32
+	Hatype   uint16
+	Pkttype  uint8
+	Halen    uint8
+	Addr     [8]uint8
+}
+
+type RawSockaddrNetlink struct {
+	Family uint16
+	Pad    uint16
+	Pid    uint32
+	Groups uint32
+}
+
+type RawSockaddrHCI struct {
+	Family  uint16
+	Dev     uint16
+	Channel uint16
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [96]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPMreqn struct {
+	Multiaddr [4]byte /* in_addr */
+	Address   [4]byte /* in_addr */
+	Ifindex   int32
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	_          [4]byte
+	Iov        *Iovec
+	Iovlen     uint64
+	Control    *byte
+	Controllen uint64
+	Flags      int32
+	_          [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint64
+	Level int32
+	Type  int32
+}
+
+type Inet4Pktinfo struct {
+	Ifindex  int32
+	Spec_dst [4]byte /* in_addr */
+	Addr     [4]byte /* in_addr */
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Data [8]uint32
+}
+
+type Ucred struct {
+	Pid int32
+	Uid uint32
+	Gid uint32
+}
+
+type TCPInfo struct {
+	State          uint8
+	Ca_state       uint8
+	Retransmits    uint8
+	Probes         uint8
+	Backoff        uint8
+	Options        uint8
+	_              [2]byte
+	Rto            uint32
+	Ato            uint32
+	Snd_mss        uint32
+	Rcv_mss        uint32
+	Unacked        uint32
+	Sacked         uint32
+	Lost           uint32
+	Retrans        uint32
+	Fackets        uint32
+	Last_data_sent uint32
+	Last_ack_sent  uint32
+	Last_data_recv uint32
+	Last_ack_recv  uint32
+	Pmtu           uint32
+	Rcv_ssthresh   uint32
+	Rtt            uint32
+	Rttvar         uint32
+	Snd_ssthresh   uint32
+	Snd_cwnd       uint32
+	Advmss         uint32
+	Reordering     uint32
+	Rcv_rtt        uint32
+	Rcv_space      uint32
+	Total_retrans  uint32
+}
+
+const (
+	SizeofSockaddrInet4     = 0x10
+	SizeofSockaddrInet6     = 0x1c
+	SizeofSockaddrAny       = 0x70
+	SizeofSockaddrUnix      = 0x6e
+	SizeofSockaddrLinklayer = 0x14
+	SizeofSockaddrNetlink   = 0xc
+	SizeofSockaddrHCI       = 0x6
+	SizeofLinger            = 0x8
+	SizeofIPMreq            = 0x8
+	SizeofIPMreqn           = 0xc
+	SizeofIPv6Mreq          = 0x14
+	SizeofMsghdr            = 0x38
+	SizeofCmsghdr           = 0x10
+	SizeofInet4Pktinfo      = 0xc
+	SizeofInet6Pktinfo      = 0x14
+	SizeofIPv6MTUInfo       = 0x20
+	SizeofICMPv6Filter      = 0x20
+	SizeofUcred             = 0xc
+	SizeofTCPInfo           = 0x68
+)
+
+const (
+	IFA_UNSPEC          = 0x0
+	IFA_ADDRESS         = 0x1
+	IFA_LOCAL           = 0x2
+	IFA_LABEL           = 0x3
+	IFA_BROADCAST       = 0x4
+	IFA_ANYCAST         = 0x5
+	IFA_CACHEINFO       = 0x6
+	IFA_MULTICAST       = 0x7
+	IFLA_UNSPEC         = 0x0
+	IFLA_ADDRESS        = 0x1
+	IFLA_BROADCAST      = 0x2
+	IFLA_IFNAME         = 0x3
+	IFLA_MTU            = 0x4
+	IFLA_LINK           = 0x5
+	IFLA_QDISC          = 0x6
+	IFLA_STATS          = 0x7
+	IFLA_COST           = 0x8
+	IFLA_PRIORITY       = 0x9
+	IFLA_MASTER         = 0xa
+	IFLA_WIRELESS       = 0xb
+	IFLA_PROTINFO       = 0xc
+	IFLA_TXQLEN         = 0xd
+	IFLA_MAP            = 0xe
+	IFLA_WEIGHT         = 0xf
+	IFLA_OPERSTATE      = 0x10
+	IFLA_LINKMODE       = 0x11
+	IFLA_LINKINFO       = 0x12
+	IFLA_NET_NS_PID     = 0x13
+	IFLA_IFALIAS        = 0x14
+	IFLA_MAX            = 0x27
+	RT_SCOPE_UNIVERSE   = 0x0
+	RT_SCOPE_SITE       = 0xc8
+	RT_SCOPE_LINK       = 0xfd
+	RT_SCOPE_HOST       = 0xfe
+	RT_SCOPE_NOWHERE    = 0xff
+	RT_TABLE_UNSPEC     = 0x0
+	RT_TABLE_COMPAT     = 0xfc
+	RT_TABLE_DEFAULT    = 0xfd
+	RT_TABLE_MAIN       = 0xfe
+	RT_TABLE_LOCAL      = 0xff
+	RT_TABLE_MAX        = 0xffffffff
+	RTA_UNSPEC          = 0x0
+	RTA_DST             = 0x1
+	RTA_SRC             = 0x2
+	RTA_IIF             = 0x3
+	RTA_OIF             = 0x4
+	RTA_GATEWAY         = 0x5
+	RTA_PRIORITY        = 0x6
+	RTA_PREFSRC         = 0x7
+	RTA_METRICS         = 0x8
+	RTA_MULTIPATH       = 0x9
+	RTA_FLOW            = 0xb
+	RTA_CACHEINFO       = 0xc
+	RTA_TABLE           = 0xf
+	RTN_UNSPEC          = 0x0
+	RTN_UNICAST         = 0x1
+	RTN_LOCAL           = 0x2
+	RTN_BROADCAST       = 0x3
+	RTN_ANYCAST         = 0x4
+	RTN_MULTICAST       = 0x5
+	RTN_BLACKHOLE       = 0x6
+	RTN_UNREACHABLE     = 0x7
+	RTN_PROHIBIT        = 0x8
+	RTN_THROW           = 0x9
+	RTN_NAT             = 0xa
+	RTN_XRESOLVE        = 0xb
+	RTNLGRP_NONE        = 0x0
+	RTNLGRP_LINK        = 0x1
+	RTNLGRP_NOTIFY      = 0x2
+	RTNLGRP_NEIGH       = 0x3
+	RTNLGRP_TC          = 0x4
+	RTNLGRP_IPV4_IFADDR = 0x5
+	RTNLGRP_IPV4_MROUTE = 0x6
+	RTNLGRP_IPV4_ROUTE  = 0x7
+	RTNLGRP_IPV4_RULE   = 0x8
+	RTNLGRP_IPV6_IFADDR = 0x9
+	RTNLGRP_IPV6_MROUTE = 0xa
+	RTNLGRP_IPV6_ROUTE  = 0xb
+	RTNLGRP_IPV6_IFINFO = 0xc
+	RTNLGRP_IPV6_PREFIX = 0x12
+	RTNLGRP_IPV6_RULE   = 0x13
+	RTNLGRP_ND_USEROPT  = 0x14
+	SizeofNlMsghdr      = 0x10
+	SizeofNlMsgerr      = 0x14
+	SizeofRtGenmsg      = 0x1
+	SizeofNlAttr        = 0x4
+	SizeofRtAttr        = 0x4
+	SizeofIfInfomsg     = 0x10
+	SizeofIfAddrmsg     = 0x8
+	SizeofRtMsg         = 0xc
+	SizeofRtNexthop     = 0x8
+)
+
+type NlMsghdr struct {
+	Len   uint32
+	Type  uint16
+	Flags uint16
+	Seq   uint32
+	Pid   uint32
+}
+
+type NlMsgerr struct {
+	Error int32
+	Msg   NlMsghdr
+}
+
+type RtGenmsg struct {
+	Family uint8
+}
+
+type NlAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type RtAttr struct {
+	Len  uint16
+	Type uint16
+}
+
+type IfInfomsg struct {
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
+}
+
+type IfAddrmsg struct {
+	Family    uint8
+	Prefixlen uint8
+	Flags     uint8
+	Scope     uint8
+	Index     uint32
+}
+
+type RtMsg struct {
+	Family   uint8
+	Dst_len  uint8
+	Src_len  uint8
+	Tos      uint8
+	Table    uint8
+	Protocol uint8
+	Scope    uint8
+	Type     uint8
+	Flags    uint32
+}
+
+type RtNexthop struct {
+	Len     uint16
+	Flags   uint8
+	Hops    uint8
+	Ifindex int32
+}
+
+const (
+	SizeofSockFilter = 0x8
+	SizeofSockFprog  = 0x10
+)
+
+type SockFilter struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type SockFprog struct {
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
+}
+
+type InotifyEvent struct {
+	Wd     int32
+	Mask   uint32
+	Cookie uint32
+	Len    uint32
+}
+
+const SizeofInotifyEvent = 0x10
+
+type PtraceRegs struct {
+	Psw                      PtracePsw
+	Gprs                     [16]uint64
+	Acrs                     [16]uint32
+	Orig_gpr2                uint64
+	Fp_regs                  PtraceFpregs
+	Per_info                 PtracePer
+	Ieee_instruction_pointer uint64
+}
+
+type PtracePsw struct {
+	Mask uint64
+	Addr uint64
+}
+
+type PtraceFpregs struct {
+	Fpc  uint32
+	_    [4]byte
+	Fprs [16]float64
+}
+
+type PtracePer struct {
+	_             [0]uint64
+	_             [24]byte
+	_             [8]byte
+	Starting_addr uint64
+	Ending_addr   uint64
+	Perc_atmid    uint16
+	_             [6]byte
+	Address       uint64
+	Access_id     uint8
+	_             [7]byte
+}
+
+type FdSet struct {
+	Bits [16]int64
+}
+
+type Sysinfo_t struct {
+	Uptime    int64
+	Loads     [3]uint64
+	Totalram  uint64
+	Freeram   uint64
+	Sharedram uint64
+	Bufferram uint64
+	Totalswap uint64
+	Freeswap  uint64
+	Procs     uint16
+	Pad       uint16
+	_         [4]byte
+	Totalhigh uint64
+	Freehigh  uint64
+	Unit      uint32
+	_         [0]int8
+	_         [4]byte
+}
+
+type Utsname struct {
+	Sysname    [65]int8
+	Nodename   [65]int8
+	Release    [65]int8
+	Version    [65]int8
+	Machine    [65]int8
+	Domainname [65]int8
+}
+
+type Ustat_t struct {
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
+}
+
+type EpollEvent struct {
+	Events uint32
+	_      int32
+	Fd     int32
+	Pad    int32
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x200
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x100
+)
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [19]uint8
+	Ispeed uint32
+	Ospeed uint32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
new file mode 100644
index 0000000000..caf755fb86
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
@@ -0,0 +1,396 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_netbsd.go
+
+// +build 386,netbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           uint64
+	Mode          uint32
+	Ino           uint64
+	Nlink         uint32
+	Uid           uint32
+	Gid           uint32
+	Rdev          uint64
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Spare         [2]uint32
+}
+
+type Statfs_t [0]byte
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno    uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [512]int8
+	Pad_cgo_0 [3]byte
+}
+
+type Fsid struct {
+	X__fsid_val [2]int32
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter uint32
+	Flags  uint32
+	Fflags uint32
+	Data   int64
+	Udata  int32
+}
+
+type FdSet struct {
+	Bits [8]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0x98
+	SizeofIfData           = 0x84
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x78
+	SizeofRtMetrics        = 0x50
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+	Pad_cgo_1 [4]byte
+}
+
+type IfData struct {
+	Type       uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Pad_cgo_0  [1]byte
+	Link_state int32
+	Mtu        uint64
+	Metric     uint64
+	Baudrate   uint64
+	Ipackets   uint64
+	Ierrors    uint64
+	Opackets   uint64
+	Oerrors    uint64
+	Collisions uint64
+	Ibytes     uint64
+	Obytes     uint64
+	Imcasts    uint64
+	Omcasts    uint64
+	Iqdrops    uint64
+	Noproto    uint64
+	Lastchange Timespec
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Metric    int32
+	Index     uint16
+	Pad_cgo_0 [6]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     int32
+	Pad_cgo_1 [4]byte
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint64
+	Mtu      uint64
+	Hopcount uint64
+	Recvpipe uint64
+	Sendpipe uint64
+	Ssthresh uint64
+	Rtt      uint64
+	Rttvar   uint64
+	Expire   int64
+	Pksent   int64
+}
+
+type Mclpool [0]byte
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x80
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv    uint64
+	Drop    uint64
+	Capt    uint64
+	Padding [13]uint64
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Sysctlnode struct {
+	Flags           uint32
+	Num             int32
+	Name            [32]int8
+	Ver             uint32
+	X__rsvd         uint32
+	Un              [16]byte
+	X_sysctl_size   [8]byte
+	X_sysctl_func   [8]byte
+	X_sysctl_parent [8]byte
+	X_sysctl_desc   [8]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
new file mode 100644
index 0000000000..91b4a5305a
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
@@ -0,0 +1,403 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_netbsd.go
+
+// +build amd64,netbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           uint64
+	Mode          uint32
+	Pad_cgo_0     [4]byte
+	Ino           uint64
+	Nlink         uint32
+	Uid           uint32
+	Gid           uint32
+	Pad_cgo_1     [4]byte
+	Rdev          uint64
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Spare         [2]uint32
+	Pad_cgo_2     [4]byte
+}
+
+type Statfs_t [0]byte
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno    uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [512]int8
+	Pad_cgo_0 [3]byte
+}
+
+type Fsid struct {
+	X__fsid_val [2]int32
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     int32
+	Pad_cgo_1  [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident     uint64
+	Filter    uint32
+	Flags     uint32
+	Fflags    uint32
+	Pad_cgo_0 [4]byte
+	Data      int64
+	Udata     int64
+}
+
+type FdSet struct {
+	Bits [8]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0x98
+	SizeofIfData           = 0x88
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x78
+	SizeofRtMetrics        = 0x50
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Pad_cgo_0  [1]byte
+	Link_state int32
+	Mtu        uint64
+	Metric     uint64
+	Baudrate   uint64
+	Ipackets   uint64
+	Ierrors    uint64
+	Opackets   uint64
+	Oerrors    uint64
+	Collisions uint64
+	Ibytes     uint64
+	Obytes     uint64
+	Imcasts    uint64
+	Omcasts    uint64
+	Iqdrops    uint64
+	Noproto    uint64
+	Lastchange Timespec
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Metric    int32
+	Index     uint16
+	Pad_cgo_0 [6]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     int32
+	Pad_cgo_1 [4]byte
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint64
+	Mtu      uint64
+	Hopcount uint64
+	Recvpipe uint64
+	Sendpipe uint64
+	Ssthresh uint64
+	Rtt      uint64
+	Rttvar   uint64
+	Expire   int64
+	Pksent   int64
+}
+
+type Mclpool [0]byte
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x80
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x20
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv    uint64
+	Drop    uint64
+	Capt    uint64
+	Padding [13]uint64
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [6]byte
+}
+
+type BpfTimeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Sysctlnode struct {
+	Flags           uint32
+	Num             int32
+	Name            [32]int8
+	Ver             uint32
+	X__rsvd         uint32
+	Un              [16]byte
+	X_sysctl_size   [8]byte
+	X_sysctl_func   [8]byte
+	X_sysctl_parent [8]byte
+	X_sysctl_desc   [8]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
new file mode 100644
index 0000000000..c0758f9d3f
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
@@ -0,0 +1,401 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_netbsd.go
+
+// +build arm,netbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec       int64
+	Nsec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Timeval struct {
+	Sec       int64
+	Usec      int32
+	Pad_cgo_0 [4]byte
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+type Stat_t struct {
+	Dev           uint64
+	Mode          uint32
+	Pad_cgo_0     [4]byte
+	Ino           uint64
+	Nlink         uint32
+	Uid           uint32
+	Gid           uint32
+	Pad_cgo_1     [4]byte
+	Rdev          uint64
+	Atimespec     Timespec
+	Mtimespec     Timespec
+	Ctimespec     Timespec
+	Birthtimespec Timespec
+	Size          int64
+	Blocks        int64
+	Blksize       uint32
+	Flags         uint32
+	Gen           uint32
+	Spare         [2]uint32
+	Pad_cgo_2     [4]byte
+}
+
+type Statfs_t [0]byte
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno    uint64
+	Reclen    uint16
+	Namlen    uint16
+	Type      uint8
+	Name      [512]int8
+	Pad_cgo_0 [3]byte
+}
+
+type Fsid struct {
+	X__fsid_val [2]int32
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [12]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     int32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x14
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident     uint32
+	Filter    uint32
+	Flags     uint32
+	Fflags    uint32
+	Data      int64
+	Udata     int32
+	Pad_cgo_0 [4]byte
+}
+
+type FdSet struct {
+	Bits [8]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0x98
+	SizeofIfData           = 0x88
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x18
+	SizeofRtMsghdr         = 0x78
+	SizeofRtMetrics        = 0x50
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Pad_cgo_0  [1]byte
+	Link_state int32
+	Mtu        uint64
+	Metric     uint64
+	Baudrate   uint64
+	Ipackets   uint64
+	Ierrors    uint64
+	Opackets   uint64
+	Oerrors    uint64
+	Collisions uint64
+	Ibytes     uint64
+	Obytes     uint64
+	Imcasts    uint64
+	Omcasts    uint64
+	Iqdrops    uint64
+	Noproto    uint64
+	Lastchange Timespec
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Metric    int32
+	Index     uint16
+	Pad_cgo_0 [6]byte
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	Name    [16]int8
+	What    uint16
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     int32
+	Pad_cgo_1 [4]byte
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint64
+	Mtu      uint64
+	Hopcount uint64
+	Recvpipe uint64
+	Sendpipe uint64
+	Ssthresh uint64
+	Rtt      uint64
+	Rttvar   uint64
+	Expire   int64
+	Pksent   int64
+}
+
+type Mclpool [0]byte
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x80
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv    uint64
+	Drop    uint64
+	Capt    uint64
+	Padding [13]uint64
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Sysctlnode struct {
+	Flags           uint32
+	Num             int32
+	Name            [32]int8
+	Ver             uint32
+	X__rsvd         uint32
+	Un              [16]byte
+	X_sysctl_size   [8]byte
+	X_sysctl_func   [8]byte
+	X_sysctl_parent [8]byte
+	X_sysctl_desc   [8]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
new file mode 100644
index 0000000000..860a469796
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
@@ -0,0 +1,441 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_openbsd.go
+
+// +build 386,openbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Mode           uint32
+	Dev            int32
+	Ino            uint64
+	Nlink          uint32
+	Uid            uint32
+	Gid            uint32
+	Rdev           int32
+	Atim           Timespec
+	Mtim           Timespec
+	Ctim           Timespec
+	Size           int64
+	Blocks         int64
+	Blksize        uint32
+	Flags          uint32
+	Gen            uint32
+	X__st_birthtim Timespec
+}
+
+type Statfs_t struct {
+	F_flags       uint32
+	F_bsize       uint32
+	F_iosize      uint32
+	F_blocks      uint64
+	F_bfree       uint64
+	F_bavail      int64
+	F_files       uint64
+	F_ffree       uint64
+	F_favail      int64
+	F_syncwrites  uint64
+	F_syncreads   uint64
+	F_asyncwrites uint64
+	F_asyncreads  uint64
+	F_fsid        Fsid
+	F_namemax     uint32
+	F_owner       uint32
+	F_ctime       uint64
+	F_fstypename  [16]int8
+	F_mntonname   [90]int8
+	F_mntfromname [90]int8
+	F_mntfromspec [90]int8
+	Pad_cgo_0     [2]byte
+	Mount_info    [160]byte
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno       uint64
+	Off          int64
+	Reclen       uint16
+	Type         uint8
+	Namlen       uint8
+	X__d_padding [4]uint8
+	Name         [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [24]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x20
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0xec
+	SizeofIfData           = 0xd4
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x1a
+	SizeofRtMsghdr         = 0x60
+	SizeofRtMetrics        = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Xflags  int32
+	Data    IfData
+}
+
+type IfData struct {
+	Type         uint8
+	Addrlen      uint8
+	Hdrlen       uint8
+	Link_state   uint8
+	Mtu          uint32
+	Metric       uint32
+	Pad          uint32
+	Baudrate     uint64
+	Ipackets     uint64
+	Ierrors      uint64
+	Opackets     uint64
+	Oerrors      uint64
+	Collisions   uint64
+	Ibytes       uint64
+	Obytes       uint64
+	Imcasts      uint64
+	Omcasts      uint64
+	Iqdrops      uint64
+	Noproto      uint64
+	Capabilities uint32
+	Lastchange   Timeval
+	Mclpool      [7]Mclpool
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Metric  int32
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	What    uint16
+	Name    [16]int8
+}
+
+type RtMsghdr struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Hdrlen   uint16
+	Index    uint16
+	Tableid  uint16
+	Priority uint8
+	Mpls     uint8
+	Addrs    int32
+	Flags    int32
+	Fmask    int32
+	Pid      int32
+	Seq      int32
+	Errno    int32
+	Inits    uint32
+	Rmx      RtMetrics
+}
+
+type RtMetrics struct {
+	Pksent   uint64
+	Expire   int64
+	Locks    uint32
+	Mtu      uint32
+	Refcnt   uint32
+	Hopcount uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pad      uint32
+}
+
+type Mclpool struct {
+	Grown int32
+	Alive uint16
+	Hwm   uint16
+	Cwm   uint16
+	Lwm   uint16
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  uint32
+	Usec uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
new file mode 100644
index 0000000000..23c52727f7
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
@@ -0,0 +1,448 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_openbsd.go
+
+// +build amd64,openbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Mode           uint32
+	Dev            int32
+	Ino            uint64
+	Nlink          uint32
+	Uid            uint32
+	Gid            uint32
+	Rdev           int32
+	Atim           Timespec
+	Mtim           Timespec
+	Ctim           Timespec
+	Size           int64
+	Blocks         int64
+	Blksize        uint32
+	Flags          uint32
+	Gen            uint32
+	Pad_cgo_0      [4]byte
+	X__st_birthtim Timespec
+}
+
+type Statfs_t struct {
+	F_flags       uint32
+	F_bsize       uint32
+	F_iosize      uint32
+	Pad_cgo_0     [4]byte
+	F_blocks      uint64
+	F_bfree       uint64
+	F_bavail      int64
+	F_files       uint64
+	F_ffree       uint64
+	F_favail      int64
+	F_syncwrites  uint64
+	F_syncreads   uint64
+	F_asyncwrites uint64
+	F_asyncreads  uint64
+	F_fsid        Fsid
+	F_namemax     uint32
+	F_owner       uint32
+	F_ctime       uint64
+	F_fstypename  [16]int8
+	F_mntonname   [90]int8
+	F_mntfromname [90]int8
+	F_mntfromspec [90]int8
+	Pad_cgo_1     [2]byte
+	Mount_info    [160]byte
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno       uint64
+	Off          int64
+	Reclen       uint16
+	Type         uint8
+	Namlen       uint8
+	X__d_padding [4]uint8
+	Name         [256]int8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [24]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Pad_cgo_0  [4]byte
+	Iov        *Iovec
+	Iovlen     uint32
+	Pad_cgo_1  [4]byte
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x20
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint64
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0xf8
+	SizeofIfData           = 0xe0
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x1a
+	SizeofRtMsghdr         = 0x60
+	SizeofRtMetrics        = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Xflags  int32
+	Data    IfData
+}
+
+type IfData struct {
+	Type         uint8
+	Addrlen      uint8
+	Hdrlen       uint8
+	Link_state   uint8
+	Mtu          uint32
+	Metric       uint32
+	Pad          uint32
+	Baudrate     uint64
+	Ipackets     uint64
+	Ierrors      uint64
+	Opackets     uint64
+	Oerrors      uint64
+	Collisions   uint64
+	Ibytes       uint64
+	Obytes       uint64
+	Imcasts      uint64
+	Omcasts      uint64
+	Iqdrops      uint64
+	Noproto      uint64
+	Capabilities uint32
+	Pad_cgo_0    [4]byte
+	Lastchange   Timeval
+	Mclpool      [7]Mclpool
+	Pad_cgo_1    [4]byte
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Metric  int32
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	What    uint16
+	Name    [16]int8
+}
+
+type RtMsghdr struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Hdrlen   uint16
+	Index    uint16
+	Tableid  uint16
+	Priority uint8
+	Mpls     uint8
+	Addrs    int32
+	Flags    int32
+	Fmask    int32
+	Pid      int32
+	Seq      int32
+	Errno    int32
+	Inits    uint32
+	Rmx      RtMetrics
+}
+
+type RtMetrics struct {
+	Pksent   uint64
+	Expire   int64
+	Locks    uint32
+	Mtu      uint32
+	Refcnt   uint32
+	Hopcount uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pad      uint32
+}
+
+type Mclpool struct {
+	Grown int32
+	Alive uint16
+	Hwm   uint16
+	Cwm   uint16
+	Lwm   uint16
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  uint32
+	Usec uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
new file mode 100644
index 0000000000..b3b928a51e
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
@@ -0,0 +1,422 @@
+// +build amd64,solaris
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_solaris.go
+
+package unix
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	PathMax        = 0x400
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Timeval32 struct {
+	Sec  int32
+	Usec int32
+}
+
+type Tms struct {
+	Utime  int64
+	Stime  int64
+	Cutime int64
+	Cstime int64
+}
+
+type Utimbuf struct {
+	Actime  int64
+	Modtime int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Dev       uint64
+	Ino       uint64
+	Mode      uint32
+	Nlink     uint32
+	Uid       uint32
+	Gid       uint32
+	Rdev      uint64
+	Size      int64
+	Atim      Timespec
+	Mtim      Timespec
+	Ctim      Timespec
+	Blksize   int32
+	Pad_cgo_0 [4]byte
+	Blocks    int64
+	Fstype    [16]int8
+}
+
+type Flock_t struct {
+	Type      int16
+	Whence    int16
+	Pad_cgo_0 [4]byte
+	Start     int64
+	Len       int64
+	Sysid     int32
+	Pid       int32
+	Pad       [4]int64
+}
+
+type Dirent struct {
+	Ino       uint64
+	Off       int64
+	Reclen    uint16
+	Name      [1]int8
+	Pad_cgo_0 [5]byte
+}
+
+type RawSockaddrInet4 struct {
+	Family uint16
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Family         uint16
+	Port           uint16
+	Flowinfo       uint32
+	Addr           [16]byte /* in6_addr */
+	Scope_id       uint32
+	X__sin6_src_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Family uint16
+	Path   [108]int8
+}
+
+type RawSockaddrDatalink struct {
+	Family uint16
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [244]int8
+}
+
+type RawSockaddr struct {
+	Family uint16
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [236]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *int8
+	Len  uint64
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name         *byte
+	Namelen      uint32
+	Pad_cgo_0    [4]byte
+	Iov          *Iovec
+	Iovlen       int32
+	Pad_cgo_1    [4]byte
+	Accrights    *int8
+	Accrightslen int32
+	Pad_cgo_2    [4]byte
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	X__icmp6_filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x20
+	SizeofSockaddrAny      = 0xfc
+	SizeofSockaddrUnix     = 0x6e
+	SizeofSockaddrDatalink = 0xfc
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x30
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x24
+	SizeofICMPv6Filter     = 0x20
+)
+
+type FdSet struct {
+	Bits [1024]int64
+}
+
+type Utsname struct {
+	Sysname  [257]int8
+	Nodename [257]int8
+	Release  [257]int8
+	Version  [257]int8
+	Machine  [257]int8
+}
+
+type Ustat_t struct {
+	Tfree     int64
+	Tinode    uint64
+	Fname     [6]int8
+	Fpack     [6]int8
+	Pad_cgo_0 [4]byte
+}
+
+const (
+	AT_FDCWD            = 0xffd19553
+	AT_SYMLINK_NOFOLLOW = 0x1000
+	AT_SYMLINK_FOLLOW   = 0x2000
+	AT_REMOVEDIR        = 0x1
+	AT_EACCESS          = 0x4
+)
+
+const (
+	SizeofIfMsghdr  = 0x54
+	SizeofIfData    = 0x44
+	SizeofIfaMsghdr = 0x14
+	SizeofRtMsghdr  = 0x4c
+	SizeofRtMetrics = 0x28
+)
+
+type IfMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Data      IfData
+}
+
+type IfData struct {
+	Type       uint8
+	Addrlen    uint8
+	Hdrlen     uint8
+	Pad_cgo_0  [1]byte
+	Mtu        uint32
+	Metric     uint32
+	Baudrate   uint32
+	Ipackets   uint32
+	Ierrors    uint32
+	Opackets   uint32
+	Oerrors    uint32
+	Collisions uint32
+	Ibytes     uint32
+	Obytes     uint32
+	Imcasts    uint32
+	Omcasts    uint32
+	Iqdrops    uint32
+	Noproto    uint32
+	Lastchange Timeval32
+}
+
+type IfaMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Addrs     int32
+	Flags     int32
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Metric    int32
+}
+
+type RtMsghdr struct {
+	Msglen    uint16
+	Version   uint8
+	Type      uint8
+	Index     uint16
+	Pad_cgo_0 [2]byte
+	Flags     int32
+	Addrs     int32
+	Pid       int32
+	Seq       int32
+	Errno     int32
+	Use       int32
+	Inits     uint32
+	Rmx       RtMetrics
+}
+
+type RtMetrics struct {
+	Locks    uint32
+	Mtu      uint32
+	Hopcount uint32
+	Expire   uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pksent   uint32
+}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x80
+	SizeofBpfProgram = 0x10
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv    uint64
+	Drop    uint64
+	Capt    uint64
+	Padding [13]uint64
+}
+
+type BpfProgram struct {
+	Len       uint32
+	Pad_cgo_0 [4]byte
+	Insns     *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfTimeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+const _SC_PAGESIZE = 0xb
+
+type Termios struct {
+	Iflag     uint32
+	Oflag     uint32
+	Cflag     uint32
+	Lflag     uint32
+	Cc        [19]uint8
+	Pad_cgo_0 [1]byte
+}
+
+type Termio struct {
+	Iflag     uint16
+	Oflag     uint16
+	Cflag     uint16
+	Lflag     uint16
+	Line      int8
+	Cc        [8]uint8
+	Pad_cgo_0 [1]byte
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
diff --git a/vendor/golang.org/x/tools/LICENSE b/vendor/golang.org/x/tools/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/golang.org/x/tools/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/tools/PATENTS b/vendor/golang.org/x/tools/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/golang.org/x/tools/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/tools/go/vcs/discovery.go b/vendor/golang.org/x/tools/go/vcs/discovery.go
new file mode 100644
index 0000000000..c4b0e3d142
--- /dev/null
+++ b/vendor/golang.org/x/tools/go/vcs/discovery.go
@@ -0,0 +1,76 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package vcs
+
+import (
+	"encoding/xml"
+	"fmt"
+	"io"
+	"strings"
+)
+
+// charsetReader returns a reader for the given charset. Currently
+// it only supports UTF-8 and ASCII. Otherwise, it returns a meaningful
+// error which is printed by go get, so the user can find why the package
+// wasn't downloaded if the encoding is not supported. Note that, in
+// order to reduce potential errors, ASCII is treated as UTF-8 (i.e. characters
+// greater than 0x7f are not rejected).
+func charsetReader(charset string, input io.Reader) (io.Reader, error) {
+	switch strings.ToLower(charset) {
+	case "ascii":
+		return input, nil
+	default:
+		return nil, fmt.Errorf("can't decode XML document using charset %q", charset)
+	}
+}
+
+// parseMetaGoImports returns meta imports from the HTML in r.
+// Parsing ends at the end of the <head> section or the beginning of the <body>.
+func parseMetaGoImports(r io.Reader) (imports []metaImport, err error) {
+	d := xml.NewDecoder(r)
+	d.CharsetReader = charsetReader
+	d.Strict = false
+	var t xml.Token
+	for {
+		t, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				err = nil
+			}
+			return
+		}
+		if e, ok := t.(xml.StartElement); ok && strings.EqualFold(e.Name.Local, "body") {
+			return
+		}
+		if e, ok := t.(xml.EndElement); ok && strings.EqualFold(e.Name.Local, "head") {
+			return
+		}
+		e, ok := t.(xml.StartElement)
+		if !ok || !strings.EqualFold(e.Name.Local, "meta") {
+			continue
+		}
+		if attrValue(e.Attr, "name") != "go-import" {
+			continue
+		}
+		if f := strings.Fields(attrValue(e.Attr, "content")); len(f) == 3 {
+			imports = append(imports, metaImport{
+				Prefix:   f[0],
+				VCS:      f[1],
+				RepoRoot: f[2],
+			})
+		}
+	}
+}
+
+// attrValue returns the attribute value for the case-insensitive key
+// `name', or the empty string if nothing is found.
+func attrValue(attrs []xml.Attr, name string) string {
+	for _, a := range attrs {
+		if strings.EqualFold(a.Name.Local, name) {
+			return a.Value
+		}
+	}
+	return ""
+}
diff --git a/vendor/golang.org/x/tools/go/vcs/env.go b/vendor/golang.org/x/tools/go/vcs/env.go
new file mode 100644
index 0000000000..e846f5b3b8
--- /dev/null
+++ b/vendor/golang.org/x/tools/go/vcs/env.go
@@ -0,0 +1,39 @@
+// Copyright 2013 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package vcs
+
+import (
+	"os"
+	"strings"
+)
+
+// envForDir returns a copy of the environment
+// suitable for running in the given directory.
+// The environment is the current process's environment
+// but with an updated $PWD, so that an os.Getwd in the
+// child will be faster.
+func envForDir(dir string) []string {
+	env := os.Environ()
+	// Internally we only use rooted paths, so dir is rooted.
+	// Even if dir is not rooted, no harm done.
+	return mergeEnvLists([]string{"PWD=" + dir}, env)
+}
+
+// mergeEnvLists merges the two environment lists such that
+// variables with the same name in "in" replace those in "out".
+func mergeEnvLists(in, out []string) []string {
+NextVar:
+	for _, inkv := range in {
+		k := strings.SplitAfterN(inkv, "=", 2)[0]
+		for i, outkv := range out {
+			if strings.HasPrefix(outkv, k) {
+				out[i] = inkv
+				continue NextVar
+			}
+		}
+		out = append(out, inkv)
+	}
+	return out
+}
diff --git a/vendor/golang.org/x/tools/go/vcs/http.go b/vendor/golang.org/x/tools/go/vcs/http.go
new file mode 100644
index 0000000000..96188185cb
--- /dev/null
+++ b/vendor/golang.org/x/tools/go/vcs/http.go
@@ -0,0 +1,80 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package vcs
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/url"
+)
+
+// httpClient is the default HTTP client, but a variable so it can be
+// changed by tests, without modifying http.DefaultClient.
+var httpClient = http.DefaultClient
+
+// httpGET returns the data from an HTTP GET request for the given URL.
+func httpGET(url string) ([]byte, error) {
+	resp, err := httpClient.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("%s: %s", url, resp.Status)
+	}
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("%s: %v", url, err)
+	}
+	return b, nil
+}
+
+// httpsOrHTTP returns the body of either the importPath's
+// https resource or, if unavailable, the http resource.
+func httpsOrHTTP(importPath string) (urlStr string, body io.ReadCloser, err error) {
+	fetch := func(scheme string) (urlStr string, res *http.Response, err error) {
+		u, err := url.Parse(scheme + "://" + importPath)
+		if err != nil {
+			return "", nil, err
+		}
+		u.RawQuery = "go-get=1"
+		urlStr = u.String()
+		if Verbose {
+			log.Printf("Fetching %s", urlStr)
+		}
+		res, err = httpClient.Get(urlStr)
+		return
+	}
+	closeBody := func(res *http.Response) {
+		if res != nil {
+			res.Body.Close()
+		}
+	}
+	urlStr, res, err := fetch("https")
+	if err != nil || res.StatusCode != 200 {
+		if Verbose {
+			if err != nil {
+				log.Printf("https fetch failed.")
+			} else {
+				log.Printf("ignoring https fetch with status code %d", res.StatusCode)
+			}
+		}
+		closeBody(res)
+		urlStr, res, err = fetch("http")
+	}
+	if err != nil {
+		closeBody(res)
+		return "", nil, err
+	}
+	// Note: accepting a non-200 OK here, so people can serve a
+	// meta import in their http 404 page.
+	if Verbose {
+		log.Printf("Parsing meta tags from %s (status code %d)", urlStr, res.StatusCode)
+	}
+	return urlStr, res.Body, nil
+}
diff --git a/vendor/golang.org/x/tools/go/vcs/vcs.go b/vendor/golang.org/x/tools/go/vcs/vcs.go
new file mode 100644
index 0000000000..2d9b7de3b3
--- /dev/null
+++ b/vendor/golang.org/x/tools/go/vcs/vcs.go
@@ -0,0 +1,754 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package vcs // import "golang.org/x/tools/go/vcs"
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+// Verbose enables verbose operation logging.
+var Verbose bool
+
+// ShowCmd controls whether VCS commands are printed.
+var ShowCmd bool
+
+// A Cmd describes how to use a version control system
+// like Mercurial, Git, or Subversion.
+type Cmd struct {
+	Name string
+	Cmd  string // name of binary to invoke command
+
+	CreateCmd   string // command to download a fresh copy of a repository
+	DownloadCmd string // command to download updates into an existing repository
+
+	TagCmd         []TagCmd // commands to list tags
+	TagLookupCmd   []TagCmd // commands to lookup tags before running tagSyncCmd
+	TagSyncCmd     string   // command to sync to specific tag
+	TagSyncDefault string   // command to sync to default tag
+
+	LogCmd string // command to list repository changelogs in an XML format
+
+	Scheme  []string
+	PingCmd string
+}
+
+// A TagCmd describes a command to list available tags
+// that can be passed to Cmd.TagSyncCmd.
+type TagCmd struct {
+	Cmd     string // command to list tags
+	Pattern string // regexp to extract tags from list
+}
+
+// vcsList lists the known version control systems
+var vcsList = []*Cmd{
+	vcsHg,
+	vcsGit,
+	vcsSvn,
+	vcsBzr,
+}
+
+// ByCmd returns the version control system for the given
+// command name (hg, git, svn, bzr).
+func ByCmd(cmd string) *Cmd {
+	for _, vcs := range vcsList {
+		if vcs.Cmd == cmd {
+			return vcs
+		}
+	}
+	return nil
+}
+
+// vcsHg describes how to use Mercurial.
+var vcsHg = &Cmd{
+	Name: "Mercurial",
+	Cmd:  "hg",
+
+	CreateCmd:   "clone -U {repo} {dir}",
+	DownloadCmd: "pull",
+
+	// We allow both tag and branch names as 'tags'
+	// for selecting a version.  This lets people have
+	// a go.release.r60 branch and a go1 branch
+	// and make changes in both, without constantly
+	// editing .hgtags.
+	TagCmd: []TagCmd{
+		{"tags", `^(\S+)`},
+		{"branches", `^(\S+)`},
+	},
+	TagSyncCmd:     "update -r {tag}",
+	TagSyncDefault: "update default",
+
+	LogCmd: "log --encoding=utf-8 --limit={limit} --template={template}",
+
+	Scheme:  []string{"https", "http", "ssh"},
+	PingCmd: "identify {scheme}://{repo}",
+}
+
+// vcsGit describes how to use Git.
+var vcsGit = &Cmd{
+	Name: "Git",
+	Cmd:  "git",
+
+	CreateCmd:   "clone {repo} {dir}",
+	DownloadCmd: "pull --ff-only",
+
+	TagCmd: []TagCmd{
+		// tags/xxx matches a git tag named xxx
+		// origin/xxx matches a git branch named xxx on the default remote repository
+		{"show-ref", `(?:tags|origin)/(\S+)$`},
+	},
+	TagLookupCmd: []TagCmd{
+		{"show-ref tags/{tag} origin/{tag}", `((?:tags|origin)/\S+)$`},
+	},
+	TagSyncCmd:     "checkout {tag}",
+	TagSyncDefault: "checkout master",
+
+	Scheme:  []string{"git", "https", "http", "git+ssh"},
+	PingCmd: "ls-remote {scheme}://{repo}",
+}
+
+// vcsBzr describes how to use Bazaar.
+var vcsBzr = &Cmd{
+	Name: "Bazaar",
+	Cmd:  "bzr",
+
+	CreateCmd: "branch {repo} {dir}",
+
+	// Without --overwrite bzr will not pull tags that changed.
+	// Replace by --overwrite-tags after http://pad.lv/681792 goes in.
+	DownloadCmd: "pull --overwrite",
+
+	TagCmd:         []TagCmd{{"tags", `^(\S+)`}},
+	TagSyncCmd:     "update -r {tag}",
+	TagSyncDefault: "update -r revno:-1",
+
+	Scheme:  []string{"https", "http", "bzr", "bzr+ssh"},
+	PingCmd: "info {scheme}://{repo}",
+}
+
+// vcsSvn describes how to use Subversion.
+var vcsSvn = &Cmd{
+	Name: "Subversion",
+	Cmd:  "svn",
+
+	CreateCmd:   "checkout {repo} {dir}",
+	DownloadCmd: "update",
+
+	// There is no tag command in subversion.
+	// The branch information is all in the path names.
+
+	LogCmd: "log --xml --limit={limit}",
+
+	Scheme:  []string{"https", "http", "svn", "svn+ssh"},
+	PingCmd: "info {scheme}://{repo}",
+}
+
+func (v *Cmd) String() string {
+	return v.Name
+}
+
+// run runs the command line cmd in the given directory.
+// keyval is a list of key, value pairs.  run expands
+// instances of {key} in cmd into value, but only after
+// splitting cmd into individual arguments.
+// If an error occurs, run prints the command line and the
+// command's combined stdout+stderr to standard error.
+// Otherwise run discards the command's output.
+func (v *Cmd) run(dir string, cmd string, keyval ...string) error {
+	_, err := v.run1(dir, cmd, keyval, true)
+	return err
+}
+
+// runVerboseOnly is like run but only generates error output to standard error in verbose mode.
+func (v *Cmd) runVerboseOnly(dir string, cmd string, keyval ...string) error {
+	_, err := v.run1(dir, cmd, keyval, false)
+	return err
+}
+
+// runOutput is like run but returns the output of the command.
+func (v *Cmd) runOutput(dir string, cmd string, keyval ...string) ([]byte, error) {
+	return v.run1(dir, cmd, keyval, true)
+}
+
+// run1 is the generalized implementation of run and runOutput.
+func (v *Cmd) run1(dir string, cmdline string, keyval []string, verbose bool) ([]byte, error) {
+	m := make(map[string]string)
+	for i := 0; i < len(keyval); i += 2 {
+		m[keyval[i]] = keyval[i+1]
+	}
+	args := strings.Fields(cmdline)
+	for i, arg := range args {
+		args[i] = expand(m, arg)
+	}
+
+	_, err := exec.LookPath(v.Cmd)
+	if err != nil {
+		fmt.Fprintf(os.Stderr,
+			"go: missing %s command. See http://golang.org/s/gogetcmd\n",
+			v.Name)
+		return nil, err
+	}
+
+	cmd := exec.Command(v.Cmd, args...)
+	cmd.Dir = dir
+	cmd.Env = envForDir(cmd.Dir)
+	if ShowCmd {
+		fmt.Printf("cd %s\n", dir)
+		fmt.Printf("%s %s\n", v.Cmd, strings.Join(args, " "))
+	}
+	var buf bytes.Buffer
+	cmd.Stdout = &buf
+	cmd.Stderr = &buf
+	err = cmd.Run()
+	out := buf.Bytes()
+	if err != nil {
+		if verbose || Verbose {
+			fmt.Fprintf(os.Stderr, "# cd %s; %s %s\n", dir, v.Cmd, strings.Join(args, " "))
+			os.Stderr.Write(out)
+		}
+		return nil, err
+	}
+	return out, nil
+}
+
+// Ping pings the repo to determine if scheme used is valid.
+// This repo must be pingable with this scheme and VCS.
+func (v *Cmd) Ping(scheme, repo string) error {
+	return v.runVerboseOnly(".", v.PingCmd, "scheme", scheme, "repo", repo)
+}
+
+// Create creates a new copy of repo in dir.
+// The parent of dir must exist; dir must not.
+func (v *Cmd) Create(dir, repo string) error {
+	return v.run(".", v.CreateCmd, "dir", dir, "repo", repo)
+}
+
+// CreateAtRev creates a new copy of repo in dir at revision rev.
+// The parent of dir must exist; dir must not.
+// rev must be a valid revision in repo.
+func (v *Cmd) CreateAtRev(dir, repo, rev string) error {
+	if err := v.Create(dir, repo); err != nil {
+		return err
+	}
+	return v.run(dir, v.TagSyncCmd, "tag", rev)
+}
+
+// Download downloads any new changes for the repo in dir.
+// dir must be a valid VCS repo compatible with v.
+func (v *Cmd) Download(dir string) error {
+	return v.run(dir, v.DownloadCmd)
+}
+
+// Tags returns the list of available tags for the repo in dir.
+// dir must be a valid VCS repo compatible with v.
+func (v *Cmd) Tags(dir string) ([]string, error) {
+	var tags []string
+	for _, tc := range v.TagCmd {
+		out, err := v.runOutput(dir, tc.Cmd)
+		if err != nil {
+			return nil, err
+		}
+		re := regexp.MustCompile(`(?m-s)` + tc.Pattern)
+		for _, m := range re.FindAllStringSubmatch(string(out), -1) {
+			tags = append(tags, m[1])
+		}
+	}
+	return tags, nil
+}
+
+// TagSync syncs the repo in dir to the named tag,
+// which either is a tag returned by tags or is v.TagDefault.
+// dir must be a valid VCS repo compatible with v and the tag must exist.
+func (v *Cmd) TagSync(dir, tag string) error {
+	if v.TagSyncCmd == "" {
+		return nil
+	}
+	if tag != "" {
+		for _, tc := range v.TagLookupCmd {
+			out, err := v.runOutput(dir, tc.Cmd, "tag", tag)
+			if err != nil {
+				return err
+			}
+			re := regexp.MustCompile(`(?m-s)` + tc.Pattern)
+			m := re.FindStringSubmatch(string(out))
+			if len(m) > 1 {
+				tag = m[1]
+				break
+			}
+		}
+	}
+	if tag == "" && v.TagSyncDefault != "" {
+		return v.run(dir, v.TagSyncDefault)
+	}
+	return v.run(dir, v.TagSyncCmd, "tag", tag)
+}
+
+// Log logs the changes for the repo in dir.
+// dir must be a valid VCS repo compatible with v.
+func (v *Cmd) Log(dir, logTemplate string) ([]byte, error) {
+	if err := v.Download(dir); err != nil {
+		return []byte{}, err
+	}
+
+	const N = 50 // how many revisions to grab
+	return v.runOutput(dir, v.LogCmd, "limit", strconv.Itoa(N), "template", logTemplate)
+}
+
+// LogAtRev logs the change for repo in dir at the rev revision.
+// dir must be a valid VCS repo compatible with v.
+// rev must be a valid revision for the repo in dir.
+func (v *Cmd) LogAtRev(dir, rev, logTemplate string) ([]byte, error) {
+	if err := v.Download(dir); err != nil {
+		return []byte{}, err
+	}
+
+	// Append revision flag to LogCmd.
+	logAtRevCmd := v.LogCmd + " --rev=" + rev
+	return v.runOutput(dir, logAtRevCmd, "limit", strconv.Itoa(1), "template", logTemplate)
+}
+
+// A vcsPath describes how to convert an import path into a
+// version control system and repository name.
+type vcsPath struct {
+	prefix string                              // prefix this description applies to
+	re     string                              // pattern for import path
+	repo   string                              // repository to use (expand with match of re)
+	vcs    string                              // version control system to use (expand with match of re)
+	check  func(match map[string]string) error // additional checks
+	ping   bool                                // ping for scheme to use to download repo
+
+	regexp *regexp.Regexp // cached compiled form of re
+}
+
+// FromDir inspects dir and its parents to determine the
+// version control system and code repository to use.
+// On return, root is the import path
+// corresponding to the root of the repository
+// (thus root is a prefix of importPath).
+func FromDir(dir, srcRoot string) (vcs *Cmd, root string, err error) {
+	// Clean and double-check that dir is in (a subdirectory of) srcRoot.
+	dir = filepath.Clean(dir)
+	srcRoot = filepath.Clean(srcRoot)
+	if len(dir) <= len(srcRoot) || dir[len(srcRoot)] != filepath.Separator {
+		return nil, "", fmt.Errorf("directory %q is outside source root %q", dir, srcRoot)
+	}
+
+	for len(dir) > len(srcRoot) {
+		for _, vcs := range vcsList {
+			if fi, err := os.Stat(filepath.Join(dir, "."+vcs.Cmd)); err == nil && fi.IsDir() {
+				return vcs, dir[len(srcRoot)+1:], nil
+			}
+		}
+
+		// Move to parent.
+		ndir := filepath.Dir(dir)
+		if len(ndir) >= len(dir) {
+			// Shouldn't happen, but just in case, stop.
+			break
+		}
+		dir = ndir
+	}
+
+	return nil, "", fmt.Errorf("directory %q is not using a known version control system", dir)
+}
+
+// RepoRoot represents a version control system, a repo, and a root of
+// where to put it on disk.
+type RepoRoot struct {
+	VCS *Cmd
+
+	// repo is the repository URL, including scheme
+	Repo string
+
+	// root is the import path corresponding to the root of the
+	// repository
+	Root string
+}
+
+// RepoRootForImportPath analyzes importPath to determine the
+// version control system, and code repository to use.
+func RepoRootForImportPath(importPath string, verbose bool) (*RepoRoot, error) {
+	rr, err := RepoRootForImportPathStatic(importPath, "")
+	if err == errUnknownSite {
+		rr, err = RepoRootForImportDynamic(importPath, verbose)
+
+		// RepoRootForImportDynamic returns error detail
+		// that is irrelevant if the user didn't intend to use a
+		// dynamic import in the first place.
+		// Squelch it.
+		if err != nil {
+			if Verbose {
+				log.Printf("import %q: %v", importPath, err)
+			}
+			err = fmt.Errorf("unrecognized import path %q", importPath)
+		}
+	}
+
+	if err == nil && strings.Contains(importPath, "...") && strings.Contains(rr.Root, "...") {
+		// Do not allow wildcards in the repo root.
+		rr = nil
+		err = fmt.Errorf("cannot expand ... in %q", importPath)
+	}
+	return rr, err
+}
+
+var errUnknownSite = errors.New("dynamic lookup required to find mapping")
+
+// RepoRootForImportPathStatic attempts to map importPath to a
+// RepoRoot using the commonly-used VCS hosting sites in vcsPaths
+// (github.com/user/dir), or from a fully-qualified importPath already
+// containing its VCS type (foo.com/repo.git/dir)
+//
+// If scheme is non-empty, that scheme is forced.
+func RepoRootForImportPathStatic(importPath, scheme string) (*RepoRoot, error) {
+	if strings.Contains(importPath, "://") {
+		return nil, fmt.Errorf("invalid import path %q", importPath)
+	}
+	for _, srv := range vcsPaths {
+		if !strings.HasPrefix(importPath, srv.prefix) {
+			continue
+		}
+		m := srv.regexp.FindStringSubmatch(importPath)
+		if m == nil {
+			if srv.prefix != "" {
+				return nil, fmt.Errorf("invalid %s import path %q", srv.prefix, importPath)
+			}
+			continue
+		}
+
+		// Build map of named subexpression matches for expand.
+		match := map[string]string{
+			"prefix": srv.prefix,
+			"import": importPath,
+		}
+		for i, name := range srv.regexp.SubexpNames() {
+			if name != "" && match[name] == "" {
+				match[name] = m[i]
+			}
+		}
+		if srv.vcs != "" {
+			match["vcs"] = expand(match, srv.vcs)
+		}
+		if srv.repo != "" {
+			match["repo"] = expand(match, srv.repo)
+		}
+		if srv.check != nil {
+			if err := srv.check(match); err != nil {
+				return nil, err
+			}
+		}
+		vcs := ByCmd(match["vcs"])
+		if vcs == nil {
+			return nil, fmt.Errorf("unknown version control system %q", match["vcs"])
+		}
+		if srv.ping {
+			if scheme != "" {
+				match["repo"] = scheme + "://" + match["repo"]
+			} else {
+				for _, scheme := range vcs.Scheme {
+					if vcs.Ping(scheme, match["repo"]) == nil {
+						match["repo"] = scheme + "://" + match["repo"]
+						break
+					}
+				}
+			}
+		}
+		rr := &RepoRoot{
+			VCS:  vcs,
+			Repo: match["repo"],
+			Root: match["root"],
+		}
+		return rr, nil
+	}
+	return nil, errUnknownSite
+}
+
+// RepoRootForImportDynamic finds a *RepoRoot for a custom domain that's not
+// statically known by RepoRootForImportPathStatic.
+//
+// This handles "vanity import paths" like "name.tld/pkg/foo".
+func RepoRootForImportDynamic(importPath string, verbose bool) (*RepoRoot, error) {
+	slash := strings.Index(importPath, "/")
+	if slash < 0 {
+		return nil, errors.New("import path doesn't contain a slash")
+	}
+	host := importPath[:slash]
+	if !strings.Contains(host, ".") {
+		return nil, errors.New("import path doesn't contain a hostname")
+	}
+	urlStr, body, err := httpsOrHTTP(importPath)
+	if err != nil {
+		return nil, fmt.Errorf("http/https fetch: %v", err)
+	}
+	defer body.Close()
+	imports, err := parseMetaGoImports(body)
+	if err != nil {
+		return nil, fmt.Errorf("parsing %s: %v", importPath, err)
+	}
+	metaImport, err := matchGoImport(imports, importPath)
+	if err != nil {
+		if err != errNoMatch {
+			return nil, fmt.Errorf("parse %s: %v", urlStr, err)
+		}
+		return nil, fmt.Errorf("parse %s: no go-import meta tags", urlStr)
+	}
+	if verbose {
+		log.Printf("get %q: found meta tag %#v at %s", importPath, metaImport, urlStr)
+	}
+	// If the import was "uni.edu/bob/project", which said the
+	// prefix was "uni.edu" and the RepoRoot was "evilroot.com",
+	// make sure we don't trust Bob and check out evilroot.com to
+	// "uni.edu" yet (possibly overwriting/preempting another
+	// non-evil student).  Instead, first verify the root and see
+	// if it matches Bob's claim.
+	if metaImport.Prefix != importPath {
+		if verbose {
+			log.Printf("get %q: verifying non-authoritative meta tag", importPath)
+		}
+		urlStr0 := urlStr
+		urlStr, body, err = httpsOrHTTP(metaImport.Prefix)
+		if err != nil {
+			return nil, fmt.Errorf("fetch %s: %v", urlStr, err)
+		}
+		imports, err := parseMetaGoImports(body)
+		if err != nil {
+			return nil, fmt.Errorf("parsing %s: %v", importPath, err)
+		}
+		if len(imports) == 0 {
+			return nil, fmt.Errorf("fetch %s: no go-import meta tag", urlStr)
+		}
+		metaImport2, err := matchGoImport(imports, importPath)
+		if err != nil || metaImport != metaImport2 {
+			return nil, fmt.Errorf("%s and %s disagree about go-import for %s", urlStr0, urlStr, metaImport.Prefix)
+		}
+	}
+
+	if !strings.Contains(metaImport.RepoRoot, "://") {
+		return nil, fmt.Errorf("%s: invalid repo root %q; no scheme", urlStr, metaImport.RepoRoot)
+	}
+	rr := &RepoRoot{
+		VCS:  ByCmd(metaImport.VCS),
+		Repo: metaImport.RepoRoot,
+		Root: metaImport.Prefix,
+	}
+	if rr.VCS == nil {
+		return nil, fmt.Errorf("%s: unknown vcs %q", urlStr, metaImport.VCS)
+	}
+	return rr, nil
+}
+
+// metaImport represents the parsed <meta name="go-import"
+// content="prefix vcs reporoot" /> tags from HTML files.
+type metaImport struct {
+	Prefix, VCS, RepoRoot string
+}
+
+// errNoMatch is returned from matchGoImport when there's no applicable match.
+var errNoMatch = errors.New("no import match")
+
+// matchGoImport returns the metaImport from imports matching importPath.
+// An error is returned if there are multiple matches.
+// errNoMatch is returned if none match.
+func matchGoImport(imports []metaImport, importPath string) (_ metaImport, err error) {
+	match := -1
+	for i, im := range imports {
+		if !strings.HasPrefix(importPath, im.Prefix) {
+			continue
+		}
+		if match != -1 {
+			err = fmt.Errorf("multiple meta tags match import path %q", importPath)
+			return
+		}
+		match = i
+	}
+	if match == -1 {
+		err = errNoMatch
+		return
+	}
+	return imports[match], nil
+}
+
+// expand rewrites s to replace {k} with match[k] for each key k in match.
+func expand(match map[string]string, s string) string {
+	for k, v := range match {
+		s = strings.Replace(s, "{"+k+"}", v, -1)
+	}
+	return s
+}
+
+// vcsPaths lists the known vcs paths.
+var vcsPaths = []*vcsPath{
+	// go.googlesource.com
+	{
+		prefix: "go.googlesource.com",
+		re:     `^(?P<root>go\.googlesource\.com/[A-Za-z0-9_.\-]+/?)$`,
+		vcs:    "git",
+		repo:   "https://{root}",
+		check:  noVCSSuffix,
+	},
+
+	// Google Code - new syntax
+	{
+		prefix: "code.google.com/",
+		re:     `^(?P<root>code\.google\.com/[pr]/(?P<project>[a-z0-9\-]+)(\.(?P<subrepo>[a-z0-9\-]+))?)(/[A-Za-z0-9_.\-]+)*$`,
+		repo:   "https://{root}",
+		check:  googleCodeVCS,
+	},
+
+	// Google Code - old syntax
+	{
+		re:    `^(?P<project>[a-z0-9_\-.]+)\.googlecode\.com/(git|hg|svn)(?P<path>/.*)?$`,
+		check: oldGoogleCode,
+	},
+
+	// Github
+	{
+		prefix: "github.com/",
+		re:     `^(?P<root>github\.com/[A-Za-z0-9_.\-]+/[A-Za-z0-9_.\-]+)(/[A-Za-z0-9_.\-]+)*$`,
+		vcs:    "git",
+		repo:   "https://{root}",
+		check:  noVCSSuffix,
+	},
+
+	// Bitbucket
+	{
+		prefix: "bitbucket.org/",
+		re:     `^(?P<root>bitbucket\.org/(?P<bitname>[A-Za-z0-9_.\-]+/[A-Za-z0-9_.\-]+))(/[A-Za-z0-9_.\-]+)*$`,
+		repo:   "https://{root}",
+		check:  bitbucketVCS,
+	},
+
+	// Launchpad
+	{
+		prefix: "launchpad.net/",
+		re:     `^(?P<root>launchpad\.net/((?P<project>[A-Za-z0-9_.\-]+)(?P<series>/[A-Za-z0-9_.\-]+)?|~[A-Za-z0-9_.\-]+/(\+junk|[A-Za-z0-9_.\-]+)/[A-Za-z0-9_.\-]+))(/[A-Za-z0-9_.\-]+)*$`,
+		vcs:    "bzr",
+		repo:   "https://{root}",
+		check:  launchpadVCS,
+	},
+
+	// General syntax for any server.
+	{
+		re:   `^(?P<root>(?P<repo>([a-z0-9.\-]+\.)+[a-z0-9.\-]+(:[0-9]+)?/[A-Za-z0-9_.\-/]*?)\.(?P<vcs>bzr|git|hg|svn))(/[A-Za-z0-9_.\-]+)*$`,
+		ping: true,
+	},
+}
+
+func init() {
+	// fill in cached regexps.
+	// Doing this eagerly discovers invalid regexp syntax
+	// without having to run a command that needs that regexp.
+	for _, srv := range vcsPaths {
+		srv.regexp = regexp.MustCompile(srv.re)
+	}
+}
+
+// noVCSSuffix checks that the repository name does not
+// end in .foo for any version control system foo.
+// The usual culprit is ".git".
+func noVCSSuffix(match map[string]string) error {
+	repo := match["repo"]
+	for _, vcs := range vcsList {
+		if strings.HasSuffix(repo, "."+vcs.Cmd) {
+			return fmt.Errorf("invalid version control suffix in %s path", match["prefix"])
+		}
+	}
+	return nil
+}
+
+var googleCheckout = regexp.MustCompile(`id="checkoutcmd">(hg|git|svn)`)
+
+// googleCodeVCS determines the version control system for
+// a code.google.com repository, by scraping the project's
+// /source/checkout page.
+func googleCodeVCS(match map[string]string) error {
+	if err := noVCSSuffix(match); err != nil {
+		return err
+	}
+	data, err := httpGET(expand(match, "https://code.google.com/p/{project}/source/checkout?repo={subrepo}"))
+	if err != nil {
+		return err
+	}
+
+	if m := googleCheckout.FindSubmatch(data); m != nil {
+		if vcs := ByCmd(string(m[1])); vcs != nil {
+			// Subversion requires the old URLs.
+			// TODO: Test.
+			if vcs == vcsSvn {
+				if match["subrepo"] != "" {
+					return fmt.Errorf("sub-repositories not supported in Google Code Subversion projects")
+				}
+				match["repo"] = expand(match, "https://{project}.googlecode.com/svn")
+			}
+			match["vcs"] = vcs.Cmd
+			return nil
+		}
+	}
+
+	return fmt.Errorf("unable to detect version control system for code.google.com/ path")
+}
+
+// oldGoogleCode is invoked for old-style foo.googlecode.com paths.
+// It prints an error giving the equivalent new path.
+func oldGoogleCode(match map[string]string) error {
+	return fmt.Errorf("invalid Google Code import path: use %s instead",
+		expand(match, "code.google.com/p/{project}{path}"))
+}
+
+// bitbucketVCS determines the version control system for a
+// Bitbucket repository, by using the Bitbucket API.
+func bitbucketVCS(match map[string]string) error {
+	if err := noVCSSuffix(match); err != nil {
+		return err
+	}
+
+	var resp struct {
+		SCM string `json:"scm"`
+	}
+	url := expand(match, "https://api.bitbucket.org/1.0/repositories/{bitname}")
+	data, err := httpGET(url)
+	if err != nil {
+		return err
+	}
+	if err := json.Unmarshal(data, &resp); err != nil {
+		return fmt.Errorf("decoding %s: %v", url, err)
+	}
+
+	if ByCmd(resp.SCM) != nil {
+		match["vcs"] = resp.SCM
+		if resp.SCM == "git" {
+			match["repo"] += ".git"
+		}
+		return nil
+	}
+
+	return fmt.Errorf("unable to detect version control system for bitbucket.org/ path")
+}
+
+// launchpadVCS solves the ambiguity for "lp.net/project/foo". In this case,
+// "foo" could be a series name registered in Launchpad with its own branch,
+// and it could also be the name of a directory within the main project
+// branch one level up.
+func launchpadVCS(match map[string]string) error {
+	if match["project"] == "" || match["series"] == "" {
+		return nil
+	}
+	_, err := httpGET(expand(match, "https://code.launchpad.net/{project}{series}/.bzr/branch-format"))
+	if err != nil {
+		match["root"] = expand(match, "launchpad.net/{project}")
+		match["repo"] = expand(match, "https://{root}")
+	}
+	return nil
+}
diff --git a/vendor/google.golang.org/grpc/LICENSE b/vendor/google.golang.org/grpc/LICENSE
new file mode 100644
index 0000000000..f4988b4507
--- /dev/null
+++ b/vendor/google.golang.org/grpc/LICENSE
@@ -0,0 +1,28 @@
+Copyright 2014, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/google.golang.org/grpc/PATENTS b/vendor/google.golang.org/grpc/PATENTS
new file mode 100644
index 0000000000..619f9dbfe6
--- /dev/null
+++ b/vendor/google.golang.org/grpc/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the GRPC project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of GRPC, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of GRPC.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of GRPC or any code incorporated within this
+implementation of GRPC constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of GRPC
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go
new file mode 100644
index 0000000000..504a6e18a8
--- /dev/null
+++ b/vendor/google.golang.org/grpc/call.go
@@ -0,0 +1,190 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package grpc
+
+import (
+	"bytes"
+	"io"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/trace"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/transport"
+)
+
+// recvResponse receives and parses an RPC response.
+// On error, it returns the error and indicates whether the call should be retried.
+//
+// TODO(zhaoq): Check whether the received message sequence is valid.
+func recvResponse(dopts dialOptions, t transport.ClientTransport, c *callInfo, stream *transport.Stream, reply interface{}) error {
+	// Try to acquire header metadata from the server if there is any.
+	var err error
+	c.headerMD, err = stream.Header()
+	if err != nil {
+		return err
+	}
+	p := &parser{r: stream}
+	for {
+		if err = recv(p, dopts.codec, stream, dopts.dc, reply); err != nil {
+			if err == io.EOF {
+				break
+			}
+			return err
+		}
+	}
+	c.trailerMD = stream.Trailer()
+	return nil
+}
+
+// sendRequest writes out various information of an RPC such as Context and Message.
+func sendRequest(ctx context.Context, codec Codec, compressor Compressor, callHdr *transport.CallHdr, t transport.ClientTransport, args interface{}, opts *transport.Options) (_ *transport.Stream, err error) {
+	stream, err := t.NewStream(ctx, callHdr)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err != nil {
+			if _, ok := err.(transport.ConnectionError); !ok {
+				t.CloseStream(stream, err)
+			}
+		}
+	}()
+	var cbuf *bytes.Buffer
+	if compressor != nil {
+		cbuf = new(bytes.Buffer)
+	}
+	outBuf, err := encode(codec, args, compressor, cbuf)
+	if err != nil {
+		return nil, transport.StreamErrorf(codes.Internal, "grpc: %v", err)
+	}
+	err = t.Write(stream, outBuf, opts)
+	if err != nil {
+		return nil, err
+	}
+	// Sent successfully.
+	return stream, nil
+}
+
+// Invoke is called by the generated code. It sends the RPC request on the
+// wire and returns after response is received.
+func Invoke(ctx context.Context, method string, args, reply interface{}, cc *ClientConn, opts ...CallOption) (err error) {
+	var c callInfo
+	for _, o := range opts {
+		if err := o.before(&c); err != nil {
+			return toRPCErr(err)
+		}
+	}
+	defer func() {
+		for _, o := range opts {
+			o.after(&c)
+		}
+	}()
+	if EnableTracing {
+		c.traceInfo.tr = trace.New("grpc.Sent."+methodFamily(method), method)
+		defer c.traceInfo.tr.Finish()
+		c.traceInfo.firstLine.client = true
+		if deadline, ok := ctx.Deadline(); ok {
+			c.traceInfo.firstLine.deadline = deadline.Sub(time.Now())
+		}
+		c.traceInfo.tr.LazyLog(&c.traceInfo.firstLine, false)
+		// TODO(dsymonds): Arrange for c.traceInfo.firstLine.remoteAddr to be set.
+		defer func() {
+			if err != nil {
+				c.traceInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
+				c.traceInfo.tr.SetError()
+			}
+		}()
+	}
+	topts := &transport.Options{
+		Last:  true,
+		Delay: false,
+	}
+	var (
+		lastErr error // record the error that happened
+	)
+	for {
+		var (
+			err    error
+			t      transport.ClientTransport
+			stream *transport.Stream
+		)
+		// TODO(zhaoq): Need a formal spec of retry strategy for non-failfast rpcs.
+		if lastErr != nil && c.failFast {
+			return toRPCErr(lastErr)
+		}
+		callHdr := &transport.CallHdr{
+			Host:   cc.authority,
+			Method: method,
+		}
+		if cc.dopts.cp != nil {
+			callHdr.SendCompress = cc.dopts.cp.Type()
+		}
+		t, err = cc.dopts.picker.Pick(ctx)
+		if err != nil {
+			if lastErr != nil {
+				// This was a retry; return the error from the last attempt.
+				return toRPCErr(lastErr)
+			}
+			return toRPCErr(err)
+		}
+		if c.traceInfo.tr != nil {
+			c.traceInfo.tr.LazyLog(&payload{sent: true, msg: args}, true)
+		}
+		stream, err = sendRequest(ctx, cc.dopts.codec, cc.dopts.cp, callHdr, t, args, topts)
+		if err != nil {
+			if _, ok := err.(transport.ConnectionError); ok {
+				lastErr = err
+				continue
+			}
+			if lastErr != nil {
+				return toRPCErr(lastErr)
+			}
+			return toRPCErr(err)
+		}
+		// Receive the response
+		lastErr = recvResponse(cc.dopts, t, &c, stream, reply)
+		if _, ok := lastErr.(transport.ConnectionError); ok {
+			continue
+		}
+		if c.traceInfo.tr != nil {
+			c.traceInfo.tr.LazyLog(&payload{sent: false, msg: reply}, true)
+		}
+		t.CloseStream(stream, lastErr)
+		if lastErr != nil {
+			return toRPCErr(lastErr)
+		}
+		return Errorf(stream.StatusCode(), stream.StatusDesc())
+	}
+}
diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go
new file mode 100644
index 0000000000..15d7af6c1e
--- /dev/null
+++ b/vendor/google.golang.org/grpc/clientconn.go
@@ -0,0 +1,590 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package grpc
+
+import (
+	"errors"
+	"fmt"
+	"net"
+	"strings"
+	"sync"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/trace"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/transport"
+)
+
+var (
+	// ErrUnspecTarget indicates that the target address is unspecified.
+	ErrUnspecTarget = errors.New("grpc: target is unspecified")
+	// ErrNoTransportSecurity indicates that there is no transport security
+	// being set for ClientConn. Users should either set one or explicityly
+	// call WithInsecure DialOption to disable security.
+	ErrNoTransportSecurity = errors.New("grpc: no transport security set (use grpc.WithInsecure() explicitly or set credentials)")
+	// ErrCredentialsMisuse indicates that users want to transmit security infomation
+	// (e.g., oauth2 token) which requires secure connection on an insecure
+	// connection.
+	ErrCredentialsMisuse = errors.New("grpc: the credentials require transport level security (use grpc.WithTransportAuthenticator() to set)")
+	// ErrClientConnClosing indicates that the operation is illegal because
+	// the session is closing.
+	ErrClientConnClosing = errors.New("grpc: the client connection is closing")
+	// ErrClientConnTimeout indicates that the connection could not be
+	// established or re-established within the specified timeout.
+	ErrClientConnTimeout = errors.New("grpc: timed out trying to connect")
+	// minimum time to give a connection to complete
+	minConnectTimeout = 20 * time.Second
+)
+
+// dialOptions configure a Dial call. dialOptions are set by the DialOption
+// values passed to Dial.
+type dialOptions struct {
+	codec    Codec
+	cp       Compressor
+	dc       Decompressor
+	picker   Picker
+	block    bool
+	insecure bool
+	copts    transport.ConnectOptions
+}
+
+// DialOption configures how we set up the connection.
+type DialOption func(*dialOptions)
+
+// WithCodec returns a DialOption which sets a codec for message marshaling and unmarshaling.
+func WithCodec(c Codec) DialOption {
+	return func(o *dialOptions) {
+		o.codec = c
+	}
+}
+
+// WithCompressor returns a DialOption which sets a CompressorGenerator for generating message
+// compressor.
+func WithCompressor(cp Compressor) DialOption {
+	return func(o *dialOptions) {
+		o.cp = cp
+	}
+}
+
+// WithDecompressor returns a DialOption which sets a DecompressorGenerator for generating
+// message decompressor.
+func WithDecompressor(dc Decompressor) DialOption {
+	return func(o *dialOptions) {
+		o.dc = dc
+	}
+}
+
+// WithPicker returns a DialOption which sets a picker for connection selection.
+func WithPicker(p Picker) DialOption {
+	return func(o *dialOptions) {
+		o.picker = p
+	}
+}
+
+// WithBlock returns a DialOption which makes caller of Dial blocks until the underlying
+// connection is up. Without this, Dial returns immediately and connecting the server
+// happens in background.
+func WithBlock() DialOption {
+	return func(o *dialOptions) {
+		o.block = true
+	}
+}
+
+// WithInsecure returns a DialOption which disables transport security for this ClientConn.
+// Note that transport security is required unless WithInsecure is set.
+func WithInsecure() DialOption {
+	return func(o *dialOptions) {
+		o.insecure = true
+	}
+}
+
+// WithTransportCredentials returns a DialOption which configures a
+// connection level security credentials (e.g., TLS/SSL).
+func WithTransportCredentials(creds credentials.TransportAuthenticator) DialOption {
+	return func(o *dialOptions) {
+		o.copts.AuthOptions = append(o.copts.AuthOptions, creds)
+	}
+}
+
+// WithPerRPCCredentials returns a DialOption which sets
+// credentials which will place auth state on each outbound RPC.
+func WithPerRPCCredentials(creds credentials.Credentials) DialOption {
+	return func(o *dialOptions) {
+		o.copts.AuthOptions = append(o.copts.AuthOptions, creds)
+	}
+}
+
+// WithTimeout returns a DialOption that configures a timeout for dialing a client connection.
+func WithTimeout(d time.Duration) DialOption {
+	return func(o *dialOptions) {
+		o.copts.Timeout = d
+	}
+}
+
+// WithDialer returns a DialOption that specifies a function to use for dialing network addresses.
+func WithDialer(f func(addr string, timeout time.Duration) (net.Conn, error)) DialOption {
+	return func(o *dialOptions) {
+		o.copts.Dialer = f
+	}
+}
+
+// WithUserAgent returns a DialOption that specifies a user agent string for all the RPCs.
+func WithUserAgent(s string) DialOption {
+	return func(o *dialOptions) {
+		o.copts.UserAgent = s
+	}
+}
+
+// Dial creates a client connection the given target.
+func Dial(target string, opts ...DialOption) (*ClientConn, error) {
+	cc := &ClientConn{
+		target: target,
+	}
+	for _, opt := range opts {
+		opt(&cc.dopts)
+	}
+	if cc.dopts.codec == nil {
+		// Set the default codec.
+		cc.dopts.codec = protoCodec{}
+	}
+	if cc.dopts.picker == nil {
+		cc.dopts.picker = &unicastPicker{
+			target: target,
+		}
+	}
+	if err := cc.dopts.picker.Init(cc); err != nil {
+		return nil, err
+	}
+	colonPos := strings.LastIndex(target, ":")
+	if colonPos == -1 {
+		colonPos = len(target)
+	}
+	cc.authority = target[:colonPos]
+	return cc, nil
+}
+
+// ConnectivityState indicates the state of a client connection.
+type ConnectivityState int
+
+const (
+	// Idle indicates the ClientConn is idle.
+	Idle ConnectivityState = iota
+	// Connecting indicates the ClienConn is connecting.
+	Connecting
+	// Ready indicates the ClientConn is ready for work.
+	Ready
+	// TransientFailure indicates the ClientConn has seen a failure but expects to recover.
+	TransientFailure
+	// Shutdown indicates the ClientConn has started shutting down.
+	Shutdown
+)
+
+func (s ConnectivityState) String() string {
+	switch s {
+	case Idle:
+		return "IDLE"
+	case Connecting:
+		return "CONNECTING"
+	case Ready:
+		return "READY"
+	case TransientFailure:
+		return "TRANSIENT_FAILURE"
+	case Shutdown:
+		return "SHUTDOWN"
+	default:
+		panic(fmt.Sprintf("unknown connectivity state: %d", s))
+	}
+}
+
+// ClientConn represents a client connection to an RPC service.
+type ClientConn struct {
+	target    string
+	authority string
+	dopts     dialOptions
+}
+
+// State returns the connectivity state of cc.
+// This is EXPERIMENTAL API.
+func (cc *ClientConn) State() (ConnectivityState, error) {
+	return cc.dopts.picker.State()
+}
+
+// WaitForStateChange blocks until the state changes to something other than the sourceState.
+// It returns the new state or error.
+// This is EXPERIMENTAL API.
+func (cc *ClientConn) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
+	return cc.dopts.picker.WaitForStateChange(ctx, sourceState)
+}
+
+// Close starts to tear down the ClientConn.
+func (cc *ClientConn) Close() error {
+	return cc.dopts.picker.Close()
+}
+
+// Conn is a client connection to a single destination.
+type Conn struct {
+	target       string
+	dopts        dialOptions
+	resetChan    chan int
+	shutdownChan chan struct{}
+	events       trace.EventLog
+
+	mu      sync.Mutex
+	state   ConnectivityState
+	stateCV *sync.Cond
+	// ready is closed and becomes nil when a new transport is up or failed
+	// due to timeout.
+	ready     chan struct{}
+	transport transport.ClientTransport
+}
+
+// NewConn creates a Conn.
+func NewConn(cc *ClientConn) (*Conn, error) {
+	if cc.target == "" {
+		return nil, ErrUnspecTarget
+	}
+	c := &Conn{
+		target:       cc.target,
+		dopts:        cc.dopts,
+		resetChan:    make(chan int, 1),
+		shutdownChan: make(chan struct{}),
+	}
+	if EnableTracing {
+		c.events = trace.NewEventLog("grpc.ClientConn", c.target)
+	}
+	if !c.dopts.insecure {
+		var ok bool
+		for _, cd := range c.dopts.copts.AuthOptions {
+			if _, ok := cd.(credentials.TransportAuthenticator); !ok {
+				continue
+			}
+			ok = true
+		}
+		if !ok {
+			return nil, ErrNoTransportSecurity
+		}
+	} else {
+		for _, cd := range c.dopts.copts.AuthOptions {
+			if cd.RequireTransportSecurity() {
+				return nil, ErrCredentialsMisuse
+			}
+		}
+	}
+	c.stateCV = sync.NewCond(&c.mu)
+	if c.dopts.block {
+		if err := c.resetTransport(false); err != nil {
+			c.Close()
+			return nil, err
+		}
+		// Start to monitor the error status of transport.
+		go c.transportMonitor()
+	} else {
+		// Start a goroutine connecting to the server asynchronously.
+		go func() {
+			if err := c.resetTransport(false); err != nil {
+				grpclog.Printf("Failed to dial %s: %v; please retry.", c.target, err)
+				c.Close()
+				return
+			}
+			c.transportMonitor()
+		}()
+	}
+	return c, nil
+}
+
+// printf records an event in cc's event log, unless cc has been closed.
+// REQUIRES cc.mu is held.
+func (cc *Conn) printf(format string, a ...interface{}) {
+	if cc.events != nil {
+		cc.events.Printf(format, a...)
+	}
+}
+
+// errorf records an error in cc's event log, unless cc has been closed.
+// REQUIRES cc.mu is held.
+func (cc *Conn) errorf(format string, a ...interface{}) {
+	if cc.events != nil {
+		cc.events.Errorf(format, a...)
+	}
+}
+
+// State returns the connectivity state of the Conn
+func (cc *Conn) State() ConnectivityState {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	return cc.state
+}
+
+// WaitForStateChange blocks until the state changes to something other than the sourceState.
+func (cc *Conn) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	if sourceState != cc.state {
+		return cc.state, nil
+	}
+	done := make(chan struct{})
+	var err error
+	go func() {
+		select {
+		case <-ctx.Done():
+			cc.mu.Lock()
+			err = ctx.Err()
+			cc.stateCV.Broadcast()
+			cc.mu.Unlock()
+		case <-done:
+		}
+	}()
+	defer close(done)
+	for sourceState == cc.state {
+		cc.stateCV.Wait()
+		if err != nil {
+			return cc.state, err
+		}
+	}
+	return cc.state, nil
+}
+
+// NotifyReset tries to signal the underlying transport needs to be reset due to
+// for example a name resolution change in flight.
+func (cc *Conn) NotifyReset() {
+	select {
+	case cc.resetChan <- 0:
+	default:
+	}
+}
+
+func (cc *Conn) resetTransport(closeTransport bool) error {
+	var retries int
+	start := time.Now()
+	for {
+		cc.mu.Lock()
+		cc.printf("connecting")
+		if cc.state == Shutdown {
+			// cc.Close() has been invoked.
+			cc.mu.Unlock()
+			return ErrClientConnClosing
+		}
+		cc.state = Connecting
+		cc.stateCV.Broadcast()
+		cc.mu.Unlock()
+		if closeTransport {
+			cc.transport.Close()
+		}
+		// Adjust timeout for the current try.
+		copts := cc.dopts.copts
+		if copts.Timeout < 0 {
+			cc.Close()
+			return ErrClientConnTimeout
+		}
+		if copts.Timeout > 0 {
+			copts.Timeout -= time.Since(start)
+			if copts.Timeout <= 0 {
+				cc.Close()
+				return ErrClientConnTimeout
+			}
+		}
+		sleepTime := backoff(retries)
+		timeout := sleepTime
+		if timeout < minConnectTimeout {
+			timeout = minConnectTimeout
+		}
+		if copts.Timeout == 0 || copts.Timeout > timeout {
+			copts.Timeout = timeout
+		}
+		connectTime := time.Now()
+		addr, err := cc.dopts.picker.PickAddr()
+		var newTransport transport.ClientTransport
+		if err == nil {
+			newTransport, err = transport.NewClientTransport(addr, &copts)
+		}
+		if err != nil {
+			cc.mu.Lock()
+			if cc.state == Shutdown {
+				// cc.Close() has been invoked.
+				cc.mu.Unlock()
+				return ErrClientConnClosing
+			}
+			cc.errorf("transient failure: %v", err)
+			cc.state = TransientFailure
+			cc.stateCV.Broadcast()
+			if cc.ready != nil {
+				close(cc.ready)
+				cc.ready = nil
+			}
+			cc.mu.Unlock()
+			sleepTime -= time.Since(connectTime)
+			if sleepTime < 0 {
+				sleepTime = 0
+			}
+			// Fail early before falling into sleep.
+			if cc.dopts.copts.Timeout > 0 && cc.dopts.copts.Timeout < sleepTime+time.Since(start) {
+				cc.mu.Lock()
+				cc.errorf("connection timeout")
+				cc.mu.Unlock()
+				cc.Close()
+				return ErrClientConnTimeout
+			}
+			closeTransport = false
+			time.Sleep(sleepTime)
+			retries++
+			grpclog.Printf("grpc: Conn.resetTransport failed to create client transport: %v; Reconnecting to %q", err, cc.target)
+			continue
+		}
+		cc.mu.Lock()
+		cc.printf("ready")
+		if cc.state == Shutdown {
+			// cc.Close() has been invoked.
+			cc.mu.Unlock()
+			newTransport.Close()
+			return ErrClientConnClosing
+		}
+		cc.state = Ready
+		cc.stateCV.Broadcast()
+		cc.transport = newTransport
+		if cc.ready != nil {
+			close(cc.ready)
+			cc.ready = nil
+		}
+		cc.mu.Unlock()
+		return nil
+	}
+}
+
+func (cc *Conn) reconnect() bool {
+	cc.mu.Lock()
+	if cc.state == Shutdown {
+		// cc.Close() has been invoked.
+		cc.mu.Unlock()
+		return false
+	}
+	cc.state = TransientFailure
+	cc.stateCV.Broadcast()
+	cc.mu.Unlock()
+	if err := cc.resetTransport(true); err != nil {
+		// The ClientConn is closing.
+		cc.mu.Lock()
+		cc.printf("transport exiting: %v", err)
+		cc.mu.Unlock()
+		grpclog.Printf("grpc: Conn.transportMonitor exits due to: %v", err)
+		return false
+	}
+	return true
+}
+
+// Run in a goroutine to track the error in transport and create the
+// new transport if an error happens. It returns when the channel is closing.
+func (cc *Conn) transportMonitor() {
+	for {
+		select {
+		// shutdownChan is needed to detect the teardown when
+		// the ClientConn is idle (i.e., no RPC in flight).
+		case <-cc.shutdownChan:
+			return
+		case <-cc.resetChan:
+			if !cc.reconnect() {
+				return
+			}
+		case <-cc.transport.Error():
+			if !cc.reconnect() {
+				return
+			}
+			// Tries to drain reset signal if there is any since it is out-dated.
+			select {
+			case <-cc.resetChan:
+			default:
+			}
+		}
+	}
+}
+
+// Wait blocks until i) the new transport is up or ii) ctx is done or iii) cc is closed.
+func (cc *Conn) Wait(ctx context.Context) (transport.ClientTransport, error) {
+	for {
+		cc.mu.Lock()
+		switch {
+		case cc.state == Shutdown:
+			cc.mu.Unlock()
+			return nil, ErrClientConnClosing
+		case cc.state == Ready:
+			ct := cc.transport
+			cc.mu.Unlock()
+			return ct, nil
+		default:
+			ready := cc.ready
+			if ready == nil {
+				ready = make(chan struct{})
+				cc.ready = ready
+			}
+			cc.mu.Unlock()
+			select {
+			case <-ctx.Done():
+				return nil, transport.ContextErr(ctx.Err())
+			// Wait until the new transport is ready or failed.
+			case <-ready:
+			}
+		}
+	}
+}
+
+// Close starts to tear down the Conn. Returns ErrClientConnClosing if
+// it has been closed (mostly due to dial time-out).
+// TODO(zhaoq): Make this synchronous to avoid unbounded memory consumption in
+// some edge cases (e.g., the caller opens and closes many ClientConn's in a
+// tight loop.
+func (cc *Conn) Close() error {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	if cc.state == Shutdown {
+		return ErrClientConnClosing
+	}
+	cc.state = Shutdown
+	cc.stateCV.Broadcast()
+	if cc.events != nil {
+		cc.events.Finish()
+		cc.events = nil
+	}
+	if cc.ready != nil {
+		close(cc.ready)
+		cc.ready = nil
+	}
+	if cc.transport != nil {
+		cc.transport.Close()
+	}
+	if cc.shutdownChan != nil {
+		close(cc.shutdownChan)
+	}
+	return nil
+}
diff --git a/vendor/google.golang.org/grpc/codes/code_string.go b/vendor/google.golang.org/grpc/codes/code_string.go
new file mode 100644
index 0000000000..e6762d0845
--- /dev/null
+++ b/vendor/google.golang.org/grpc/codes/code_string.go
@@ -0,0 +1,16 @@
+// generated by stringer -type=Code; DO NOT EDIT
+
+package codes
+
+import "fmt"
+
+const _Code_name = "OKCanceledUnknownInvalidArgumentDeadlineExceededNotFoundAlreadyExistsPermissionDeniedResourceExhaustedFailedPreconditionAbortedOutOfRangeUnimplementedInternalUnavailableDataLossUnauthenticated"
+
+var _Code_index = [...]uint8{0, 2, 10, 17, 32, 48, 56, 69, 85, 102, 120, 127, 137, 150, 158, 169, 177, 192}
+
+func (i Code) String() string {
+	if i+1 >= Code(len(_Code_index)) {
+		return fmt.Sprintf("Code(%d)", i)
+	}
+	return _Code_name[_Code_index[i]:_Code_index[i+1]]
+}
diff --git a/vendor/google.golang.org/grpc/codes/codes.go b/vendor/google.golang.org/grpc/codes/codes.go
new file mode 100644
index 0000000000..e14b464acf
--- /dev/null
+++ b/vendor/google.golang.org/grpc/codes/codes.go
@@ -0,0 +1,159 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// Package codes defines the canonical error codes used by gRPC. It is
+// consistent across various languages.
+package codes // import "google.golang.org/grpc/codes"
+
+// A Code is an unsigned 32-bit error code as defined in the gRPC spec.
+type Code uint32
+
+//go:generate stringer -type=Code
+
+const (
+	// OK is returned on success.
+	OK Code = 0
+
+	// Canceled indicates the operation was cancelled (typically by the caller).
+	Canceled Code = 1
+
+	// Unknown error.  An example of where this error may be returned is
+	// if a Status value received from another address space belongs to
+	// an error-space that is not known in this address space.  Also
+	// errors raised by APIs that do not return enough error information
+	// may be converted to this error.
+	Unknown Code = 2
+
+	// InvalidArgument indicates client specified an invalid argument.
+	// Note that this differs from FailedPrecondition. It indicates arguments
+	// that are problematic regardless of the state of the system
+	// (e.g., a malformed file name).
+	InvalidArgument Code = 3
+
+	// DeadlineExceeded means operation expired before completion.
+	// For operations that change the state of the system, this error may be
+	// returned even if the operation has completed successfully. For
+	// example, a successful response from a server could have been delayed
+	// long enough for the deadline to expire.
+	DeadlineExceeded Code = 4
+
+	// NotFound means some requested entity (e.g., file or directory) was
+	// not found.
+	NotFound Code = 5
+
+	// AlreadyExists means an attempt to create an entity failed because one
+	// already exists.
+	AlreadyExists Code = 6
+
+	// PermissionDenied indicates the caller does not have permission to
+	// execute the specified operation. It must not be used for rejections
+	// caused by exhausting some resource (use ResourceExhausted
+	// instead for those errors).  It must not be
+	// used if the caller cannot be identified (use Unauthenticated
+	// instead for those errors).
+	PermissionDenied Code = 7
+
+	// Unauthenticated indicates the request does not have valid
+	// authentication credentials for the operation.
+	Unauthenticated Code = 16
+
+	// ResourceExhausted indicates some resource has been exhausted, perhaps
+	// a per-user quota, or perhaps the entire file system is out of space.
+	ResourceExhausted Code = 8
+
+	// FailedPrecondition indicates operation was rejected because the
+	// system is not in a state required for the operation's execution.
+	// For example, directory to be deleted may be non-empty, an rmdir
+	// operation is applied to a non-directory, etc.
+	//
+	// A litmus test that may help a service implementor in deciding
+	// between FailedPrecondition, Aborted, and Unavailable:
+	//  (a) Use Unavailable if the client can retry just the failing call.
+	//  (b) Use Aborted if the client should retry at a higher-level
+	//      (e.g., restarting a read-modify-write sequence).
+	//  (c) Use FailedPrecondition if the client should not retry until
+	//      the system state has been explicitly fixed.  E.g., if an "rmdir"
+	//      fails because the directory is non-empty, FailedPrecondition
+	//      should be returned since the client should not retry unless
+	//      they have first fixed up the directory by deleting files from it.
+	//  (d) Use FailedPrecondition if the client performs conditional
+	//      REST Get/Update/Delete on a resource and the resource on the
+	//      server does not match the condition. E.g., conflicting
+	//      read-modify-write on the same resource.
+	FailedPrecondition Code = 9
+
+	// Aborted indicates the operation was aborted, typically due to a
+	// concurrency issue like sequencer check failures, transaction aborts,
+	// etc.
+	//
+	// See litmus test above for deciding between FailedPrecondition,
+	// Aborted, and Unavailable.
+	Aborted Code = 10
+
+	// OutOfRange means operation was attempted past the valid range.
+	// E.g., seeking or reading past end of file.
+	//
+	// Unlike InvalidArgument, this error indicates a problem that may
+	// be fixed if the system state changes. For example, a 32-bit file
+	// system will generate InvalidArgument if asked to read at an
+	// offset that is not in the range [0,2^32-1], but it will generate
+	// OutOfRange if asked to read from an offset past the current
+	// file size.
+	//
+	// There is a fair bit of overlap between FailedPrecondition and
+	// OutOfRange.  We recommend using OutOfRange (the more specific
+	// error) when it applies so that callers who are iterating through
+	// a space can easily look for an OutOfRange error to detect when
+	// they are done.
+	OutOfRange Code = 11
+
+	// Unimplemented indicates operation is not implemented or not
+	// supported/enabled in this service.
+	Unimplemented Code = 12
+
+	// Internal errors.  Means some invariants expected by underlying
+	// system has been broken.  If you see one of these errors,
+	// something is very broken.
+	Internal Code = 13
+
+	// Unavailable indicates the service is currently unavailable.
+	// This is a most likely a transient condition and may be corrected
+	// by retrying with a backoff.
+	//
+	// See litmus test above for deciding between FailedPrecondition,
+	// Aborted, and Unavailable.
+	Unavailable Code = 14
+
+	// DataLoss indicates unrecoverable data loss or corruption.
+	DataLoss Code = 15
+)
diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go
new file mode 100644
index 0000000000..681f64e445
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/credentials.go
@@ -0,0 +1,226 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// Package credentials implements various credentials supported by gRPC library,
+// which encapsulate all the state needed by a client to authenticate with a
+// server and make various assertions, e.g., about the client's identity, role,
+// or whether it is authorized to make a particular call.
+package credentials // import "google.golang.org/grpc/credentials"
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"strings"
+	"time"
+
+	"golang.org/x/net/context"
+)
+
+var (
+	// alpnProtoStr are the specified application level protocols for gRPC.
+	alpnProtoStr = []string{"h2"}
+)
+
+// Credentials defines the common interface all supported credentials must
+// implement.
+type Credentials interface {
+	// GetRequestMetadata gets the current request metadata, refreshing
+	// tokens if required. This should be called by the transport layer on
+	// each request, and the data should be populated in headers or other
+	// context. uri is the URI of the entry point for the request. When
+	// supported by the underlying implementation, ctx can be used for
+	// timeout and cancellation.
+	// TODO(zhaoq): Define the set of the qualified keys instead of leaving
+	// it as an arbitrary string.
+	GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error)
+	// RequireTransportSecurity indicates whether the credentails requires
+	// transport security.
+	RequireTransportSecurity() bool
+}
+
+// ProtocolInfo provides information regarding the gRPC wire protocol version,
+// security protocol, security protocol version in use, etc.
+type ProtocolInfo struct {
+	// ProtocolVersion is the gRPC wire protocol version.
+	ProtocolVersion string
+	// SecurityProtocol is the security protocol in use.
+	SecurityProtocol string
+	// SecurityVersion is the security protocol version.
+	SecurityVersion string
+}
+
+// AuthInfo defines the common interface for the auth information the users are interested in.
+type AuthInfo interface {
+	AuthType() string
+}
+
+// TransportAuthenticator defines the common interface for all the live gRPC wire
+// protocols and supported transport security protocols (e.g., TLS, SSL).
+type TransportAuthenticator interface {
+	// ClientHandshake does the authentication handshake specified by the corresponding
+	// authentication protocol on rawConn for clients. It returns the authenticated
+	// connection and the corresponding auth information about the connection.
+	ClientHandshake(addr string, rawConn net.Conn, timeout time.Duration) (net.Conn, AuthInfo, error)
+	// ServerHandshake does the authentication handshake for servers. It returns
+	// the authenticated connection and the corresponding auth information about
+	// the connection.
+	ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error)
+	// Info provides the ProtocolInfo of this TransportAuthenticator.
+	Info() ProtocolInfo
+	Credentials
+}
+
+// TLSInfo contains the auth information for a TLS authenticated connection.
+// It implements the AuthInfo interface.
+type TLSInfo struct {
+	State tls.ConnectionState
+}
+
+func (t TLSInfo) AuthType() string {
+	return "tls"
+}
+
+// tlsCreds is the credentials required for authenticating a connection using TLS.
+type tlsCreds struct {
+	// TLS configuration
+	config tls.Config
+}
+
+func (c tlsCreds) Info() ProtocolInfo {
+	return ProtocolInfo{
+		SecurityProtocol: "tls",
+		SecurityVersion:  "1.2",
+	}
+}
+
+// GetRequestMetadata returns nil, nil since TLS credentials does not have
+// metadata.
+func (c *tlsCreds) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
+	return nil, nil
+}
+
+func (c *tlsCreds) RequireTransportSecurity() bool {
+	return true
+}
+
+type timeoutError struct{}
+
+func (timeoutError) Error() string   { return "credentials: Dial timed out" }
+func (timeoutError) Timeout() bool   { return true }
+func (timeoutError) Temporary() bool { return true }
+
+func (c *tlsCreds) ClientHandshake(addr string, rawConn net.Conn, timeout time.Duration) (_ net.Conn, _ AuthInfo, err error) {
+	// borrow some code from tls.DialWithDialer
+	var errChannel chan error
+	if timeout != 0 {
+		errChannel = make(chan error, 2)
+		time.AfterFunc(timeout, func() {
+			errChannel <- timeoutError{}
+		})
+	}
+	if c.config.ServerName == "" {
+		colonPos := strings.LastIndex(addr, ":")
+		if colonPos == -1 {
+			colonPos = len(addr)
+		}
+		c.config.ServerName = addr[:colonPos]
+	}
+	conn := tls.Client(rawConn, &c.config)
+	if timeout == 0 {
+		err = conn.Handshake()
+	} else {
+		go func() {
+			errChannel <- conn.Handshake()
+		}()
+		err = <-errChannel
+	}
+	if err != nil {
+		rawConn.Close()
+		return nil, nil, err
+	}
+	// TODO(zhaoq): Omit the auth info for client now. It is more for
+	// information than anything else.
+	return conn, nil, nil
+}
+
+func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error) {
+	conn := tls.Server(rawConn, &c.config)
+	if err := conn.Handshake(); err != nil {
+		rawConn.Close()
+		return nil, nil, err
+	}
+	return conn, TLSInfo{conn.ConnectionState()}, nil
+}
+
+// NewTLS uses c to construct a TransportAuthenticator based on TLS.
+func NewTLS(c *tls.Config) TransportAuthenticator {
+	tc := &tlsCreds{*c}
+	tc.config.NextProtos = alpnProtoStr
+	return tc
+}
+
+// NewClientTLSFromCert constructs a TLS from the input certificate for client.
+func NewClientTLSFromCert(cp *x509.CertPool, serverName string) TransportAuthenticator {
+	return NewTLS(&tls.Config{ServerName: serverName, RootCAs: cp})
+}
+
+// NewClientTLSFromFile constructs a TLS from the input certificate file for client.
+func NewClientTLSFromFile(certFile, serverName string) (TransportAuthenticator, error) {
+	b, err := ioutil.ReadFile(certFile)
+	if err != nil {
+		return nil, err
+	}
+	cp := x509.NewCertPool()
+	if !cp.AppendCertsFromPEM(b) {
+		return nil, fmt.Errorf("credentials: failed to append certificates")
+	}
+	return NewTLS(&tls.Config{ServerName: serverName, RootCAs: cp}), nil
+}
+
+// NewServerTLSFromCert constructs a TLS from the input certificate for server.
+func NewServerTLSFromCert(cert *tls.Certificate) TransportAuthenticator {
+	return NewTLS(&tls.Config{Certificates: []tls.Certificate{*cert}})
+}
+
+// NewServerTLSFromFile constructs a TLS from the input certificate file and key
+// file for server.
+func NewServerTLSFromFile(certFile, keyFile string) (TransportAuthenticator, error) {
+	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+	if err != nil {
+		return nil, err
+	}
+	return NewTLS(&tls.Config{Certificates: []tls.Certificate{cert}}), nil
+}
diff --git a/vendor/google.golang.org/grpc/doc.go b/vendor/google.golang.org/grpc/doc.go
new file mode 100644
index 0000000000..a35f218852
--- /dev/null
+++ b/vendor/google.golang.org/grpc/doc.go
@@ -0,0 +1,6 @@
+/*
+Package grpc implements an RPC system called gRPC.
+
+See www.grpc.io for more information about gRPC.
+*/
+package grpc // import "google.golang.org/grpc"
diff --git a/vendor/google.golang.org/grpc/grpclog/logger.go b/vendor/google.golang.org/grpc/grpclog/logger.go
new file mode 100644
index 0000000000..3b2933079e
--- /dev/null
+++ b/vendor/google.golang.org/grpc/grpclog/logger.go
@@ -0,0 +1,93 @@
+/*
+ *
+ * Copyright 2015, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+Package grpclog defines logging for grpc.
+*/
+package grpclog // import "google.golang.org/grpc/grpclog"
+
+import (
+	"log"
+	"os"
+)
+
+// Use golang's standard logger by default.
+// Access is not mutex-protected: do not modify except in init()
+// functions.
+var logger Logger = log.New(os.Stderr, "", log.LstdFlags)
+
+// Logger mimics golang's standard Logger as an interface.
+type Logger interface {
+	Fatal(args ...interface{})
+	Fatalf(format string, args ...interface{})
+	Fatalln(args ...interface{})
+	Print(args ...interface{})
+	Printf(format string, args ...interface{})
+	Println(args ...interface{})
+}
+
+// SetLogger sets the logger that is used in grpc. Call only from
+// init() functions.
+func SetLogger(l Logger) {
+	logger = l
+}
+
+// Fatal is equivalent to Print() followed by a call to os.Exit() with a non-zero exit code.
+func Fatal(args ...interface{}) {
+	logger.Fatal(args...)
+}
+
+// Fatalf is equivalent to Printf() followed by a call to os.Exit() with a non-zero exit code.
+func Fatalf(format string, args ...interface{}) {
+	logger.Fatalf(format, args...)
+}
+
+// Fatalln is equivalent to Println() followed by a call to os.Exit()) with a non-zero exit code.
+func Fatalln(args ...interface{}) {
+	logger.Fatalln(args...)
+}
+
+// Print prints to the logger. Arguments are handled in the manner of fmt.Print.
+func Print(args ...interface{}) {
+	logger.Print(args...)
+}
+
+// Printf prints to the logger. Arguments are handled in the manner of fmt.Printf.
+func Printf(format string, args ...interface{}) {
+	logger.Printf(format, args...)
+}
+
+// Println prints to the logger. Arguments are handled in the manner of fmt.Println.
+func Println(args ...interface{}) {
+	logger.Println(args...)
+}
diff --git a/vendor/google.golang.org/grpc/internal/internal.go b/vendor/google.golang.org/grpc/internal/internal.go
new file mode 100644
index 0000000000..5489143a85
--- /dev/null
+++ b/vendor/google.golang.org/grpc/internal/internal.go
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// Package internal contains gRPC-internal code for testing, to avoid polluting
+// the godoc of the top-level grpc package.
+package internal
+
+// TestingCloseConns closes all existing transports but keeps
+// grpcServer.lis accepting new connections.
+//
+// The provided grpcServer must be of type *grpc.Server. It is untyped
+// for circular dependency reasons.
+var TestingCloseConns func(grpcServer interface{})
+
+// TestingUseHandlerImpl enables the http.Handler-based server implementation.
+// It must be called before Serve and requires TLS credentials.
+//
+// The provided grpcServer must be of type *grpc.Server. It is untyped
+// for circular dependency reasons.
+var TestingUseHandlerImpl func(grpcServer interface{})
diff --git a/vendor/google.golang.org/grpc/metadata/metadata.go b/vendor/google.golang.org/grpc/metadata/metadata.go
new file mode 100644
index 0000000000..52070dbeca
--- /dev/null
+++ b/vendor/google.golang.org/grpc/metadata/metadata.go
@@ -0,0 +1,134 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// Package metadata define the structure of the metadata supported by gRPC library.
+package metadata // import "google.golang.org/grpc/metadata"
+
+import (
+	"encoding/base64"
+	"fmt"
+	"strings"
+
+	"golang.org/x/net/context"
+)
+
+const (
+	binHdrSuffix = "-bin"
+)
+
+// encodeKeyValue encodes key and value qualified for transmission via gRPC.
+// Transmitting binary headers violates HTTP/2 spec.
+// TODO(zhaoq): Maybe check if k is ASCII also.
+func encodeKeyValue(k, v string) (string, string) {
+	k = strings.ToLower(k)
+	if strings.HasSuffix(k, binHdrSuffix) {
+		val := base64.StdEncoding.EncodeToString([]byte(v))
+		v = string(val)
+	}
+	return k, v
+}
+
+// DecodeKeyValue returns the original key and value corresponding to the
+// encoded data in k, v.
+func DecodeKeyValue(k, v string) (string, string, error) {
+	if !strings.HasSuffix(k, binHdrSuffix) {
+		return k, v, nil
+	}
+	val, err := base64.StdEncoding.DecodeString(v)
+	if err != nil {
+		return "", "", err
+	}
+	return k, string(val), nil
+}
+
+// MD is a mapping from metadata keys to values. Users should use the following
+// two convenience functions New and Pairs to generate MD.
+type MD map[string][]string
+
+// New creates a MD from given key-value map.
+func New(m map[string]string) MD {
+	md := MD{}
+	for k, v := range m {
+		key, val := encodeKeyValue(k, v)
+		md[key] = append(md[key], val)
+	}
+	return md
+}
+
+// Pairs returns an MD formed by the mapping of key, value ...
+// Pairs panics if len(kv) is odd.
+func Pairs(kv ...string) MD {
+	if len(kv)%2 == 1 {
+		panic(fmt.Sprintf("metadata: Pairs got the odd number of input pairs for metadata: %d", len(kv)))
+	}
+	md := MD{}
+	var k string
+	for i, s := range kv {
+		if i%2 == 0 {
+			k = s
+			continue
+		}
+		key, val := encodeKeyValue(k, s)
+		md[key] = append(md[key], val)
+	}
+	return md
+}
+
+// Len returns the number of items in md.
+func (md MD) Len() int {
+	return len(md)
+}
+
+// Copy returns a copy of md.
+func (md MD) Copy() MD {
+	out := MD{}
+	for k, v := range md {
+		for _, i := range v {
+			out[k] = append(out[k], i)
+		}
+	}
+	return out
+}
+
+type mdKey struct{}
+
+// NewContext creates a new context with md attached.
+func NewContext(ctx context.Context, md MD) context.Context {
+	return context.WithValue(ctx, mdKey{}, md)
+}
+
+// FromContext returns the MD in ctx if it exists.
+func FromContext(ctx context.Context) (md MD, ok bool) {
+	md, ok = ctx.Value(mdKey{}).(MD)
+	return
+}
diff --git a/vendor/google.golang.org/grpc/naming/naming.go b/vendor/google.golang.org/grpc/naming/naming.go
new file mode 100644
index 0000000000..06605607c3
--- /dev/null
+++ b/vendor/google.golang.org/grpc/naming/naming.go
@@ -0,0 +1,73 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// Package naming defines the naming API and related data structures for gRPC.
+// The interface is EXPERIMENTAL and may be suject to change.
+package naming
+
+// Operation defines the corresponding operations for a name resolution change.
+type Operation uint8
+
+const (
+	// Add indicates a new address is added.
+	Add Operation = iota
+	// Delete indicates an exisiting address is deleted.
+	Delete
+)
+
+// Update defines a name resolution update. Notice that it is not valid having both
+// empty string Addr and nil Metadata in an Update.
+type Update struct {
+	// Op indicates the operation of the update.
+	Op Operation
+	// Addr is the updated address. It is empty string if there is no address update.
+	Addr string
+	// Metadata is the updated metadata. It is nil if there is no metadata update.
+	// Metadata is not required for a custom naming implementation.
+	Metadata interface{}
+}
+
+// Resolver creates a Watcher for a target to track its resolution changes.
+type Resolver interface {
+	// Resolve creates a Watcher for target.
+	Resolve(target string) (Watcher, error)
+}
+
+// Watcher watches for the updates on the specified target.
+type Watcher interface {
+	// Next blocks until an update or error happens. It may return one or more
+	// updates. The first call should get the full set of the results.
+	Next() ([]*Update, error)
+	// Close closes the Watcher.
+	Close()
+}
diff --git a/vendor/google.golang.org/grpc/peer/peer.go b/vendor/google.golang.org/grpc/peer/peer.go
new file mode 100644
index 0000000000..bfa6205ba9
--- /dev/null
+++ b/vendor/google.golang.org/grpc/peer/peer.go
@@ -0,0 +1,65 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// Package peer defines various peer information associated with RPCs and
+// corresponding utils.
+package peer
+
+import (
+	"net"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/credentials"
+)
+
+// Peer contains the information of the peer for an RPC.
+type Peer struct {
+	// Addr is the peer address.
+	Addr net.Addr
+	// AuthInfo is the authentication information of the transport.
+	// It is nil if there is no transport security being used.
+	AuthInfo credentials.AuthInfo
+}
+
+type peerKey struct{}
+
+// NewContext creates a new context with peer information attached.
+func NewContext(ctx context.Context, p *Peer) context.Context {
+	return context.WithValue(ctx, peerKey{}, p)
+}
+
+// FromContext returns the peer information in ctx if it exists.
+func FromContext(ctx context.Context) (p *Peer, ok bool) {
+	p, ok = ctx.Value(peerKey{}).(*Peer)
+	return
+}
diff --git a/vendor/google.golang.org/grpc/picker.go b/vendor/google.golang.org/grpc/picker.go
new file mode 100644
index 0000000000..50f315b44f
--- /dev/null
+++ b/vendor/google.golang.org/grpc/picker.go
@@ -0,0 +1,243 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package grpc
+
+import (
+	"container/list"
+	"fmt"
+	"sync"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/naming"
+	"google.golang.org/grpc/transport"
+)
+
+// Picker picks a Conn for RPC requests.
+// This is EXPERIMENTAL and please do not implement your own Picker for now.
+type Picker interface {
+	// Init does initial processing for the Picker, e.g., initiate some connections.
+	Init(cc *ClientConn) error
+	// Pick blocks until either a transport.ClientTransport is ready for the upcoming RPC
+	// or some error happens.
+	Pick(ctx context.Context) (transport.ClientTransport, error)
+	// PickAddr picks a peer address for connecting. This will be called repeated for
+	// connecting/reconnecting.
+	PickAddr() (string, error)
+	// State returns the connectivity state of the underlying connections.
+	State() (ConnectivityState, error)
+	// WaitForStateChange blocks until the state changes to something other than
+	// the sourceState. It returns the new state or error.
+	WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error)
+	// Close closes all the Conn's owned by this Picker.
+	Close() error
+}
+
+// unicastPicker is the default Picker which is used when there is no custom Picker
+// specified by users. It always picks the same Conn.
+type unicastPicker struct {
+	target string
+	conn   *Conn
+}
+
+func (p *unicastPicker) Init(cc *ClientConn) error {
+	c, err := NewConn(cc)
+	if err != nil {
+		return err
+	}
+	p.conn = c
+	return nil
+}
+
+func (p *unicastPicker) Pick(ctx context.Context) (transport.ClientTransport, error) {
+	return p.conn.Wait(ctx)
+}
+
+func (p *unicastPicker) PickAddr() (string, error) {
+	return p.target, nil
+}
+
+func (p *unicastPicker) State() (ConnectivityState, error) {
+	return p.conn.State(), nil
+}
+
+func (p *unicastPicker) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
+	return p.conn.WaitForStateChange(ctx, sourceState)
+}
+
+func (p *unicastPicker) Close() error {
+	if p.conn != nil {
+		return p.conn.Close()
+	}
+	return nil
+}
+
+// unicastNamingPicker picks an address from a name resolver to set up the connection.
+type unicastNamingPicker struct {
+	cc       *ClientConn
+	resolver naming.Resolver
+	watcher  naming.Watcher
+	mu       sync.Mutex
+	// The list of the addresses are obtained from watcher.
+	addrs *list.List
+	// It tracks the current picked addr by PickAddr(). The next PickAddr may
+	// push it forward on addrs.
+	pickedAddr *list.Element
+	conn       *Conn
+}
+
+// NewUnicastNamingPicker creates a Picker to pick addresses from a name resolver
+// to connect.
+func NewUnicastNamingPicker(r naming.Resolver) Picker {
+	return &unicastNamingPicker{
+		resolver: r,
+		addrs:    list.New(),
+	}
+}
+
+type addrInfo struct {
+	addr string
+	// Set to true if this addrInfo needs to be deleted in the next PickAddrr() call.
+	deleting bool
+}
+
+// processUpdates calls Watcher.Next() once and processes the obtained updates.
+func (p *unicastNamingPicker) processUpdates() error {
+	updates, err := p.watcher.Next()
+	if err != nil {
+		return err
+	}
+	for _, update := range updates {
+		switch update.Op {
+		case naming.Add:
+			p.mu.Lock()
+			p.addrs.PushBack(&addrInfo{
+				addr: update.Addr,
+			})
+			p.mu.Unlock()
+			// Initial connection setup
+			if p.conn == nil {
+				conn, err := NewConn(p.cc)
+				if err != nil {
+					return err
+				}
+				p.conn = conn
+			}
+		case naming.Delete:
+			p.mu.Lock()
+			for e := p.addrs.Front(); e != nil; e = e.Next() {
+				if update.Addr == e.Value.(*addrInfo).addr {
+					if e == p.pickedAddr {
+						// Do not remove the element now if it is the current picked
+						// one. We leave the deletion to the next PickAddr() call.
+						e.Value.(*addrInfo).deleting = true
+						// Notify Conn to close it. All the live RPCs on this connection
+						// will be aborted.
+						p.conn.NotifyReset()
+					} else {
+						p.addrs.Remove(e)
+					}
+				}
+			}
+			p.mu.Unlock()
+		default:
+			grpclog.Println("Unknown update.Op ", update.Op)
+		}
+	}
+	return nil
+}
+
+// monitor runs in a standalone goroutine to keep watching name resolution updates until the watcher
+// is closed.
+func (p *unicastNamingPicker) monitor() {
+	for {
+		if err := p.processUpdates(); err != nil {
+			return
+		}
+	}
+}
+
+func (p *unicastNamingPicker) Init(cc *ClientConn) error {
+	w, err := p.resolver.Resolve(cc.target)
+	if err != nil {
+		return err
+	}
+	p.watcher = w
+	p.cc = cc
+	// Get the initial name resolution.
+	if err := p.processUpdates(); err != nil {
+		return err
+	}
+	go p.monitor()
+	return nil
+}
+
+func (p *unicastNamingPicker) Pick(ctx context.Context) (transport.ClientTransport, error) {
+	return p.conn.Wait(ctx)
+}
+
+func (p *unicastNamingPicker) PickAddr() (string, error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	if p.pickedAddr == nil {
+		p.pickedAddr = p.addrs.Front()
+	} else {
+		pa := p.pickedAddr
+		p.pickedAddr = pa.Next()
+		if pa.Value.(*addrInfo).deleting {
+			p.addrs.Remove(pa)
+		}
+		if p.pickedAddr == nil {
+			p.pickedAddr = p.addrs.Front()
+		}
+	}
+	if p.pickedAddr == nil {
+		return "", fmt.Errorf("there is no address available to pick")
+	}
+	return p.pickedAddr.Value.(*addrInfo).addr, nil
+}
+
+func (p *unicastNamingPicker) State() (ConnectivityState, error) {
+	return 0, fmt.Errorf("State() is not supported for unicastNamingPicker")
+}
+
+func (p *unicastNamingPicker) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
+	return 0, fmt.Errorf("WaitForStateChange is not supported for unicastNamingPciker")
+}
+
+func (p *unicastNamingPicker) Close() error {
+	p.watcher.Close()
+	p.conn.Close()
+	return nil
+}
diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go
new file mode 100644
index 0000000000..66d34eb95a
--- /dev/null
+++ b/vendor/google.golang.org/grpc/rpc_util.go
@@ -0,0 +1,444 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package grpc
+
+import (
+	"bytes"
+	"compress/gzip"
+	"encoding/binary"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"math"
+	"math/rand"
+	"os"
+	"time"
+
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/transport"
+)
+
+// Codec defines the interface gRPC uses to encode and decode messages.
+type Codec interface {
+	// Marshal returns the wire format of v.
+	Marshal(v interface{}) ([]byte, error)
+	// Unmarshal parses the wire format into v.
+	Unmarshal(data []byte, v interface{}) error
+	// String returns the name of the Codec implementation. The returned
+	// string will be used as part of content type in transmission.
+	String() string
+}
+
+// protoCodec is a Codec implemetation with protobuf. It is the default codec for gRPC.
+type protoCodec struct{}
+
+func (protoCodec) Marshal(v interface{}) ([]byte, error) {
+	return proto.Marshal(v.(proto.Message))
+}
+
+func (protoCodec) Unmarshal(data []byte, v interface{}) error {
+	return proto.Unmarshal(data, v.(proto.Message))
+}
+
+func (protoCodec) String() string {
+	return "proto"
+}
+
+// Compressor defines the interface gRPC uses to compress a message.
+type Compressor interface {
+	// Do compresses p into w.
+	Do(w io.Writer, p []byte) error
+	// Type returns the compression algorithm the Compressor uses.
+	Type() string
+}
+
+// NewGZIPCompressor creates a Compressor based on GZIP.
+func NewGZIPCompressor() Compressor {
+	return &gzipCompressor{}
+}
+
+type gzipCompressor struct {
+}
+
+func (c *gzipCompressor) Do(w io.Writer, p []byte) error {
+	z := gzip.NewWriter(w)
+	if _, err := z.Write(p); err != nil {
+		return err
+	}
+	return z.Close()
+}
+
+func (c *gzipCompressor) Type() string {
+	return "gzip"
+}
+
+// Decompressor defines the interface gRPC uses to decompress a message.
+type Decompressor interface {
+	// Do reads the data from r and uncompress them.
+	Do(r io.Reader) ([]byte, error)
+	// Type returns the compression algorithm the Decompressor uses.
+	Type() string
+}
+
+type gzipDecompressor struct {
+}
+
+// NewGZIPDecompressor creates a Decompressor based on GZIP.
+func NewGZIPDecompressor() Decompressor {
+	return &gzipDecompressor{}
+}
+
+func (d *gzipDecompressor) Do(r io.Reader) ([]byte, error) {
+	z, err := gzip.NewReader(r)
+	if err != nil {
+		return nil, err
+	}
+	defer z.Close()
+	return ioutil.ReadAll(z)
+}
+
+func (d *gzipDecompressor) Type() string {
+	return "gzip"
+}
+
+// callInfo contains all related configuration and information about an RPC.
+type callInfo struct {
+	failFast  bool
+	headerMD  metadata.MD
+	trailerMD metadata.MD
+	traceInfo traceInfo // in trace.go
+}
+
+// CallOption configures a Call before it starts or extracts information from
+// a Call after it completes.
+type CallOption interface {
+	// before is called before the call is sent to any server.  If before
+	// returns a non-nil error, the RPC fails with that error.
+	before(*callInfo) error
+
+	// after is called after the call has completed.  after cannot return an
+	// error, so any failures should be reported via output parameters.
+	after(*callInfo)
+}
+
+type beforeCall func(c *callInfo) error
+
+func (o beforeCall) before(c *callInfo) error { return o(c) }
+func (o beforeCall) after(c *callInfo)        {}
+
+type afterCall func(c *callInfo)
+
+func (o afterCall) before(c *callInfo) error { return nil }
+func (o afterCall) after(c *callInfo)        { o(c) }
+
+// Header returns a CallOptions that retrieves the header metadata
+// for a unary RPC.
+func Header(md *metadata.MD) CallOption {
+	return afterCall(func(c *callInfo) {
+		*md = c.headerMD
+	})
+}
+
+// Trailer returns a CallOptions that retrieves the trailer metadata
+// for a unary RPC.
+func Trailer(md *metadata.MD) CallOption {
+	return afterCall(func(c *callInfo) {
+		*md = c.trailerMD
+	})
+}
+
+// The format of the payload: compressed or not?
+type payloadFormat uint8
+
+const (
+	compressionNone payloadFormat = iota // no compression
+	compressionMade
+)
+
+// parser reads complelete gRPC messages from the underlying reader.
+type parser struct {
+	// r is the underlying reader.
+	// See the comment on recvMsg for the permissible
+	// error types.
+	r io.Reader
+
+	// The header of a gRPC message. Find more detail
+	// at http://www.grpc.io/docs/guides/wire.html.
+	header [5]byte
+}
+
+// recvMsg reads a complete gRPC message from the stream.
+//
+// It returns the message and its payload (compression/encoding)
+// format. The caller owns the returned msg memory.
+//
+// If there is an error, possible values are:
+//   * io.EOF, when no messages remain
+//   * io.ErrUnexpectedEOF
+//   * of type transport.ConnectionError
+//   * of type transport.StreamError
+// No other error values or types must be returned, which also means
+// that the underlying io.Reader must not return an incompatible
+// error.
+func (p *parser) recvMsg() (pf payloadFormat, msg []byte, err error) {
+	if _, err := io.ReadFull(p.r, p.header[:]); err != nil {
+		return 0, nil, err
+	}
+
+	pf = payloadFormat(p.header[0])
+	length := binary.BigEndian.Uint32(p.header[1:])
+
+	if length == 0 {
+		return pf, nil, nil
+	}
+	// TODO(bradfitz,zhaoq): garbage. reuse buffer after proto decoding instead
+	// of making it for each message:
+	msg = make([]byte, int(length))
+	if _, err := io.ReadFull(p.r, msg); err != nil {
+		if err == io.EOF {
+			err = io.ErrUnexpectedEOF
+		}
+		return 0, nil, err
+	}
+	return pf, msg, nil
+}
+
+// encode serializes msg and prepends the message header. If msg is nil, it
+// generates the message header of 0 message length.
+func encode(c Codec, msg interface{}, cp Compressor, cbuf *bytes.Buffer) ([]byte, error) {
+	var b []byte
+	var length uint
+	if msg != nil {
+		var err error
+		// TODO(zhaoq): optimize to reduce memory alloc and copying.
+		b, err = c.Marshal(msg)
+		if err != nil {
+			return nil, err
+		}
+		if cp != nil {
+			if err := cp.Do(cbuf, b); err != nil {
+				return nil, err
+			}
+			b = cbuf.Bytes()
+		}
+		length = uint(len(b))
+	}
+	if length > math.MaxUint32 {
+		return nil, Errorf(codes.InvalidArgument, "grpc: message too large (%d bytes)", length)
+	}
+
+	const (
+		payloadLen = 1
+		sizeLen    = 4
+	)
+
+	var buf = make([]byte, payloadLen+sizeLen+len(b))
+
+	// Write payload format
+	if cp == nil {
+		buf[0] = byte(compressionNone)
+	} else {
+		buf[0] = byte(compressionMade)
+	}
+	// Write length of b into buf
+	binary.BigEndian.PutUint32(buf[1:], uint32(length))
+	// Copy encoded msg to buf
+	copy(buf[5:], b)
+
+	return buf, nil
+}
+
+func checkRecvPayload(pf payloadFormat, recvCompress string, dc Decompressor) error {
+	switch pf {
+	case compressionNone:
+	case compressionMade:
+		if recvCompress == "" {
+			return transport.StreamErrorf(codes.InvalidArgument, "grpc: invalid grpc-encoding %q with compression enabled", recvCompress)
+		}
+		if dc == nil || recvCompress != dc.Type() {
+			return transport.StreamErrorf(codes.InvalidArgument, "grpc: Decompressor is not installed for grpc-encoding %q", recvCompress)
+		}
+	default:
+		return transport.StreamErrorf(codes.InvalidArgument, "grpc: received unexpected payload format %d", pf)
+	}
+	return nil
+}
+
+func recv(p *parser, c Codec, s *transport.Stream, dc Decompressor, m interface{}) error {
+	pf, d, err := p.recvMsg()
+	if err != nil {
+		return err
+	}
+	if err := checkRecvPayload(pf, s.RecvCompress(), dc); err != nil {
+		return err
+	}
+	if pf == compressionMade {
+		d, err = dc.Do(bytes.NewReader(d))
+		if err != nil {
+			return transport.StreamErrorf(codes.Internal, "grpc: failed to decompress the received message %v", err)
+		}
+	}
+	if err := c.Unmarshal(d, m); err != nil {
+		return transport.StreamErrorf(codes.Internal, "grpc: failed to unmarshal the received message %v", err)
+	}
+	return nil
+}
+
+// rpcError defines the status from an RPC.
+type rpcError struct {
+	code codes.Code
+	desc string
+}
+
+func (e rpcError) Error() string {
+	return fmt.Sprintf("rpc error: code = %d desc = %q", e.code, e.desc)
+}
+
+// Code returns the error code for err if it was produced by the rpc system.
+// Otherwise, it returns codes.Unknown.
+func Code(err error) codes.Code {
+	if err == nil {
+		return codes.OK
+	}
+	if e, ok := err.(rpcError); ok {
+		return e.code
+	}
+	return codes.Unknown
+}
+
+// ErrorDesc returns the error description of err if it was produced by the rpc system.
+// Otherwise, it returns err.Error() or empty string when err is nil.
+func ErrorDesc(err error) string {
+	if err == nil {
+		return ""
+	}
+	if e, ok := err.(rpcError); ok {
+		return e.desc
+	}
+	return err.Error()
+}
+
+// Errorf returns an error containing an error code and a description;
+// Errorf returns nil if c is OK.
+func Errorf(c codes.Code, format string, a ...interface{}) error {
+	if c == codes.OK {
+		return nil
+	}
+	return rpcError{
+		code: c,
+		desc: fmt.Sprintf(format, a...),
+	}
+}
+
+// toRPCErr converts an error into a rpcError.
+func toRPCErr(err error) error {
+	switch e := err.(type) {
+	case rpcError:
+		return err
+	case transport.StreamError:
+		return rpcError{
+			code: e.Code,
+			desc: e.Desc,
+		}
+	case transport.ConnectionError:
+		return rpcError{
+			code: codes.Internal,
+			desc: e.Desc,
+		}
+	}
+	return Errorf(codes.Unknown, "%v", err)
+}
+
+// convertCode converts a standard Go error into its canonical code. Note that
+// this is only used to translate the error returned by the server applications.
+func convertCode(err error) codes.Code {
+	switch err {
+	case nil:
+		return codes.OK
+	case io.EOF:
+		return codes.OutOfRange
+	case io.ErrClosedPipe, io.ErrNoProgress, io.ErrShortBuffer, io.ErrShortWrite, io.ErrUnexpectedEOF:
+		return codes.FailedPrecondition
+	case os.ErrInvalid:
+		return codes.InvalidArgument
+	case context.Canceled:
+		return codes.Canceled
+	case context.DeadlineExceeded:
+		return codes.DeadlineExceeded
+	}
+	switch {
+	case os.IsExist(err):
+		return codes.AlreadyExists
+	case os.IsNotExist(err):
+		return codes.NotFound
+	case os.IsPermission(err):
+		return codes.PermissionDenied
+	}
+	return codes.Unknown
+}
+
+const (
+	// how long to wait after the first failure before retrying
+	baseDelay = 1.0 * time.Second
+	// upper bound of backoff delay
+	maxDelay = 120 * time.Second
+	// backoff increases by this factor on each retry
+	backoffFactor = 1.6
+	// backoff is randomized downwards by this factor
+	backoffJitter = 0.2
+)
+
+func backoff(retries int) (t time.Duration) {
+	if retries == 0 {
+		return baseDelay
+	}
+	backoff, max := float64(baseDelay), float64(maxDelay)
+	for backoff < max && retries > 0 {
+		backoff *= backoffFactor
+		retries--
+	}
+	if backoff > max {
+		backoff = max
+	}
+	// Randomize backoff delays so that if a cluster of requests start at
+	// the same time, they won't operate in lockstep.
+	backoff *= 1 + backoffJitter*(rand.Float64()*2-1)
+	if backoff < 0 {
+		return 0
+	}
+	return time.Duration(backoff)
+}
diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go
new file mode 100644
index 0000000000..927b1c5e1e
--- /dev/null
+++ b/vendor/google.golang.org/grpc/server.go
@@ -0,0 +1,785 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package grpc
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"reflect"
+	"runtime"
+	"strings"
+	"sync"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/trace"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/internal"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/transport"
+)
+
+type methodHandler func(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error)
+
+// MethodDesc represents an RPC service's method specification.
+type MethodDesc struct {
+	MethodName string
+	Handler    methodHandler
+}
+
+// ServiceDesc represents an RPC service's specification.
+type ServiceDesc struct {
+	ServiceName string
+	// The pointer to the service interface. Used to check whether the user
+	// provided implementation satisfies the interface requirements.
+	HandlerType interface{}
+	Methods     []MethodDesc
+	Streams     []StreamDesc
+}
+
+// service consists of the information of the server serving this service and
+// the methods in this service.
+type service struct {
+	server interface{} // the server for service methods
+	md     map[string]*MethodDesc
+	sd     map[string]*StreamDesc
+}
+
+// Server is a gRPC server to serve RPC requests.
+type Server struct {
+	opts options
+
+	mu     sync.Mutex // guards following
+	lis    map[net.Listener]bool
+	conns  map[io.Closer]bool
+	m      map[string]*service // service name -> service info
+	events trace.EventLog
+}
+
+type options struct {
+	creds                credentials.Credentials
+	codec                Codec
+	cp                   Compressor
+	dc                   Decompressor
+	maxConcurrentStreams uint32
+	useHandlerImpl       bool // use http.Handler-based server
+}
+
+// A ServerOption sets options.
+type ServerOption func(*options)
+
+// CustomCodec returns a ServerOption that sets a codec for message marshaling and unmarshaling.
+func CustomCodec(codec Codec) ServerOption {
+	return func(o *options) {
+		o.codec = codec
+	}
+}
+
+func RPCCompressor(cp Compressor) ServerOption {
+	return func(o *options) {
+		o.cp = cp
+	}
+}
+
+func RPCDecompressor(dc Decompressor) ServerOption {
+	return func(o *options) {
+		o.dc = dc
+	}
+}
+
+// MaxConcurrentStreams returns a ServerOption that will apply a limit on the number
+// of concurrent streams to each ServerTransport.
+func MaxConcurrentStreams(n uint32) ServerOption {
+	return func(o *options) {
+		o.maxConcurrentStreams = n
+	}
+}
+
+// Creds returns a ServerOption that sets credentials for server connections.
+func Creds(c credentials.Credentials) ServerOption {
+	return func(o *options) {
+		o.creds = c
+	}
+}
+
+// NewServer creates a gRPC server which has no service registered and has not
+// started to accept requests yet.
+func NewServer(opt ...ServerOption) *Server {
+	var opts options
+	for _, o := range opt {
+		o(&opts)
+	}
+	if opts.codec == nil {
+		// Set the default codec.
+		opts.codec = protoCodec{}
+	}
+	s := &Server{
+		lis:   make(map[net.Listener]bool),
+		opts:  opts,
+		conns: make(map[io.Closer]bool),
+		m:     make(map[string]*service),
+	}
+	if EnableTracing {
+		_, file, line, _ := runtime.Caller(1)
+		s.events = trace.NewEventLog("grpc.Server", fmt.Sprintf("%s:%d", file, line))
+	}
+	return s
+}
+
+// printf records an event in s's event log, unless s has been stopped.
+// REQUIRES s.mu is held.
+func (s *Server) printf(format string, a ...interface{}) {
+	if s.events != nil {
+		s.events.Printf(format, a...)
+	}
+}
+
+// errorf records an error in s's event log, unless s has been stopped.
+// REQUIRES s.mu is held.
+func (s *Server) errorf(format string, a ...interface{}) {
+	if s.events != nil {
+		s.events.Errorf(format, a...)
+	}
+}
+
+// RegisterService register a service and its implementation to the gRPC
+// server. Called from the IDL generated code. This must be called before
+// invoking Serve.
+func (s *Server) RegisterService(sd *ServiceDesc, ss interface{}) {
+	ht := reflect.TypeOf(sd.HandlerType).Elem()
+	st := reflect.TypeOf(ss)
+	if !st.Implements(ht) {
+		grpclog.Fatalf("grpc: Server.RegisterService found the handler of type %v that does not satisfy %v", st, ht)
+	}
+	s.register(sd, ss)
+}
+
+func (s *Server) register(sd *ServiceDesc, ss interface{}) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.printf("RegisterService(%q)", sd.ServiceName)
+	if _, ok := s.m[sd.ServiceName]; ok {
+		grpclog.Fatalf("grpc: Server.RegisterService found duplicate service registration for %q", sd.ServiceName)
+	}
+	srv := &service{
+		server: ss,
+		md:     make(map[string]*MethodDesc),
+		sd:     make(map[string]*StreamDesc),
+	}
+	for i := range sd.Methods {
+		d := &sd.Methods[i]
+		srv.md[d.MethodName] = d
+	}
+	for i := range sd.Streams {
+		d := &sd.Streams[i]
+		srv.sd[d.StreamName] = d
+	}
+	s.m[sd.ServiceName] = srv
+}
+
+var (
+	// ErrServerStopped indicates that the operation is now illegal because of
+	// the server being stopped.
+	ErrServerStopped = errors.New("grpc: the server has been stopped")
+)
+
+func (s *Server) useTransportAuthenticator(rawConn net.Conn) (net.Conn, credentials.AuthInfo, error) {
+	creds, ok := s.opts.creds.(credentials.TransportAuthenticator)
+	if !ok {
+		return rawConn, nil, nil
+	}
+	return creds.ServerHandshake(rawConn)
+}
+
+// Serve accepts incoming connections on the listener lis, creating a new
+// ServerTransport and service goroutine for each. The service goroutines
+// read gRPC requests and then call the registered handlers to reply to them.
+// Service returns when lis.Accept fails.
+func (s *Server) Serve(lis net.Listener) error {
+	s.mu.Lock()
+	s.printf("serving")
+	if s.lis == nil {
+		s.mu.Unlock()
+		return ErrServerStopped
+	}
+	s.lis[lis] = true
+	s.mu.Unlock()
+	defer func() {
+		lis.Close()
+		s.mu.Lock()
+		delete(s.lis, lis)
+		s.mu.Unlock()
+	}()
+	listenerAddr := lis.Addr()
+	for {
+		rawConn, err := lis.Accept()
+		if err != nil {
+			s.mu.Lock()
+			s.printf("done serving; Accept = %v", err)
+			s.mu.Unlock()
+			return err
+		}
+		// Start a new goroutine to deal with rawConn
+		// so we don't stall this Accept loop goroutine.
+		go s.handleRawConn(listenerAddr, rawConn)
+	}
+}
+
+// handleRawConn is run in its own goroutine and handles a just-accepted
+// connection that has not had any I/O performed on it yet.
+func (s *Server) handleRawConn(listenerAddr net.Addr, rawConn net.Conn) {
+	conn, authInfo, err := s.useTransportAuthenticator(rawConn)
+	if err != nil {
+		s.mu.Lock()
+		s.errorf("ServerHandshake(%q) failed: %v", rawConn.RemoteAddr(), err)
+		s.mu.Unlock()
+		grpclog.Printf("grpc: Server.Serve failed to complete security handshake from %q: %v", rawConn.RemoteAddr(), err)
+		rawConn.Close()
+		return
+	}
+
+	s.mu.Lock()
+	if s.conns == nil {
+		s.mu.Unlock()
+		conn.Close()
+		return
+	}
+	s.mu.Unlock()
+
+	if s.opts.useHandlerImpl {
+		s.serveUsingHandler(listenerAddr, conn)
+	} else {
+		s.serveNewHTTP2Transport(conn, authInfo)
+	}
+}
+
+// serveNewHTTP2Transport sets up a new http/2 transport (using the
+// gRPC http2 server transport in transport/http2_server.go) and
+// serves streams on it.
+// This is run in its own goroutine (it does network I/O in
+// transport.NewServerTransport).
+func (s *Server) serveNewHTTP2Transport(c net.Conn, authInfo credentials.AuthInfo) {
+	st, err := transport.NewServerTransport("http2", c, s.opts.maxConcurrentStreams, authInfo)
+	if err != nil {
+		s.mu.Lock()
+		s.errorf("NewServerTransport(%q) failed: %v", c.RemoteAddr(), err)
+		s.mu.Unlock()
+		c.Close()
+		grpclog.Println("grpc: Server.Serve failed to create ServerTransport: ", err)
+		return
+	}
+	if !s.addConn(st) {
+		st.Close()
+		return
+	}
+	s.serveStreams(st)
+}
+
+func (s *Server) serveStreams(st transport.ServerTransport) {
+	defer s.removeConn(st)
+	defer st.Close()
+	var wg sync.WaitGroup
+	st.HandleStreams(func(stream *transport.Stream) {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			s.handleStream(st, stream, s.traceInfo(st, stream))
+		}()
+	})
+	wg.Wait()
+}
+
+var _ http.Handler = (*Server)(nil)
+
+// serveUsingHandler is called from handleRawConn when s is configured
+// to handle requests via the http.Handler interface. It sets up a
+// net/http.Server to handle the just-accepted conn. The http.Server
+// is configured to route all incoming requests (all HTTP/2 streams)
+// to ServeHTTP, which creates a new ServerTransport for each stream.
+// serveUsingHandler blocks until conn closes.
+//
+// This codepath is only used when Server.TestingUseHandlerImpl has
+// been configured. This lets the end2end tests exercise the ServeHTTP
+// method as one of the environment types.
+//
+// conn is the *tls.Conn that's already been authenticated.
+func (s *Server) serveUsingHandler(listenerAddr net.Addr, conn net.Conn) {
+	if !s.addConn(conn) {
+		conn.Close()
+		return
+	}
+	defer s.removeConn(conn)
+	connDone := make(chan struct{})
+	hs := &http.Server{
+		Handler: s,
+		ConnState: func(c net.Conn, cs http.ConnState) {
+			if cs == http.StateClosed {
+				close(connDone)
+			}
+		},
+	}
+	if err := http2.ConfigureServer(hs, &http2.Server{
+		MaxConcurrentStreams: s.opts.maxConcurrentStreams,
+	}); err != nil {
+		grpclog.Fatalf("grpc: http2.ConfigureServer: %v", err)
+		return
+	}
+	hs.Serve(&singleConnListener{addr: listenerAddr, conn: conn})
+	<-connDone
+}
+
+func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	st, err := transport.NewServerHandlerTransport(w, r)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	if !s.addConn(st) {
+		st.Close()
+		return
+	}
+	defer s.removeConn(st)
+	s.serveStreams(st)
+}
+
+// traceInfo returns a traceInfo and associates it with stream, if tracing is enabled.
+// If tracing is not enabled, it returns nil.
+func (s *Server) traceInfo(st transport.ServerTransport, stream *transport.Stream) (trInfo *traceInfo) {
+	if !EnableTracing {
+		return nil
+	}
+	trInfo = &traceInfo{
+		tr: trace.New("grpc.Recv."+methodFamily(stream.Method()), stream.Method()),
+	}
+	trInfo.firstLine.client = false
+	trInfo.firstLine.remoteAddr = st.RemoteAddr()
+	stream.TraceContext(trInfo.tr)
+	if dl, ok := stream.Context().Deadline(); ok {
+		trInfo.firstLine.deadline = dl.Sub(time.Now())
+	}
+	return trInfo
+}
+
+func (s *Server) addConn(c io.Closer) bool {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	if s.conns == nil {
+		return false
+	}
+	s.conns[c] = true
+	return true
+}
+
+func (s *Server) removeConn(c io.Closer) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	if s.conns != nil {
+		delete(s.conns, c)
+	}
+}
+
+func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Stream, msg interface{}, cp Compressor, opts *transport.Options) error {
+	var cbuf *bytes.Buffer
+	if cp != nil {
+		cbuf = new(bytes.Buffer)
+	}
+	p, err := encode(s.opts.codec, msg, cp, cbuf)
+	if err != nil {
+		// This typically indicates a fatal issue (e.g., memory
+		// corruption or hardware faults) the application program
+		// cannot handle.
+		//
+		// TODO(zhaoq): There exist other options also such as only closing the
+		// faulty stream locally and remotely (Other streams can keep going). Find
+		// the optimal option.
+		grpclog.Fatalf("grpc: Server failed to encode response %v", err)
+	}
+	return t.Write(stream, p, opts)
+}
+
+func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, md *MethodDesc, trInfo *traceInfo) (err error) {
+	if trInfo != nil {
+		defer trInfo.tr.Finish()
+		trInfo.firstLine.client = false
+		trInfo.tr.LazyLog(&trInfo.firstLine, false)
+		defer func() {
+			if err != nil && err != io.EOF {
+				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
+				trInfo.tr.SetError()
+			}
+		}()
+	}
+	p := &parser{r: stream}
+	for {
+		pf, req, err := p.recvMsg()
+		if err == io.EOF {
+			// The entire stream is done (for unary RPC only).
+			return err
+		}
+		if err == io.ErrUnexpectedEOF {
+			err = transport.StreamError{Code: codes.Internal, Desc: "io.ErrUnexpectedEOF"}
+		}
+		if err != nil {
+			switch err := err.(type) {
+			case transport.ConnectionError:
+				// Nothing to do here.
+			case transport.StreamError:
+				if err := t.WriteStatus(stream, err.Code, err.Desc); err != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
+				}
+			default:
+				panic(fmt.Sprintf("grpc: Unexpected error (%T) from recvMsg: %v", err, err))
+			}
+			return err
+		}
+
+		if err := checkRecvPayload(pf, stream.RecvCompress(), s.opts.dc); err != nil {
+			switch err := err.(type) {
+			case transport.StreamError:
+				if err := t.WriteStatus(stream, err.Code, err.Desc); err != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
+				}
+			default:
+				if err := t.WriteStatus(stream, codes.Internal, err.Error()); err != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
+				}
+
+			}
+			return err
+		}
+		statusCode := codes.OK
+		statusDesc := ""
+		df := func(v interface{}) error {
+			if pf == compressionMade {
+				var err error
+				req, err = s.opts.dc.Do(bytes.NewReader(req))
+				if err != nil {
+					if err := t.WriteStatus(stream, codes.Internal, err.Error()); err != nil {
+						grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
+					}
+					return err
+				}
+			}
+			if err := s.opts.codec.Unmarshal(req, v); err != nil {
+				return err
+			}
+			if trInfo != nil {
+				trInfo.tr.LazyLog(&payload{sent: false, msg: v}, true)
+			}
+			return nil
+		}
+		reply, appErr := md.Handler(srv.server, stream.Context(), df)
+		if appErr != nil {
+			if err, ok := appErr.(rpcError); ok {
+				statusCode = err.code
+				statusDesc = err.desc
+			} else {
+				statusCode = convertCode(appErr)
+				statusDesc = appErr.Error()
+			}
+			if trInfo != nil && statusCode != codes.OK {
+				trInfo.tr.LazyLog(stringer(statusDesc), true)
+				trInfo.tr.SetError()
+			}
+			if err := t.WriteStatus(stream, statusCode, statusDesc); err != nil {
+				grpclog.Printf("grpc: Server.processUnaryRPC failed to write status: %v", err)
+				return err
+			}
+			return nil
+		}
+		if trInfo != nil {
+			trInfo.tr.LazyLog(stringer("OK"), false)
+		}
+		opts := &transport.Options{
+			Last:  true,
+			Delay: false,
+		}
+		if s.opts.cp != nil {
+			stream.SetSendCompress(s.opts.cp.Type())
+		}
+		if err := s.sendResponse(t, stream, reply, s.opts.cp, opts); err != nil {
+			switch err := err.(type) {
+			case transport.ConnectionError:
+				// Nothing to do here.
+			case transport.StreamError:
+				statusCode = err.Code
+				statusDesc = err.Desc
+			default:
+				statusCode = codes.Unknown
+				statusDesc = err.Error()
+			}
+			return err
+		}
+		if trInfo != nil {
+			trInfo.tr.LazyLog(&payload{sent: true, msg: reply}, true)
+		}
+		return t.WriteStatus(stream, statusCode, statusDesc)
+	}
+}
+
+func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, sd *StreamDesc, trInfo *traceInfo) (err error) {
+	if s.opts.cp != nil {
+		stream.SetSendCompress(s.opts.cp.Type())
+	}
+	ss := &serverStream{
+		t:      t,
+		s:      stream,
+		p:      &parser{r: stream},
+		codec:  s.opts.codec,
+		cp:     s.opts.cp,
+		dc:     s.opts.dc,
+		trInfo: trInfo,
+	}
+	if ss.cp != nil {
+		ss.cbuf = new(bytes.Buffer)
+	}
+	if trInfo != nil {
+		trInfo.tr.LazyLog(&trInfo.firstLine, false)
+		defer func() {
+			ss.mu.Lock()
+			if err != nil && err != io.EOF {
+				ss.trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
+				ss.trInfo.tr.SetError()
+			}
+			ss.trInfo.tr.Finish()
+			ss.trInfo.tr = nil
+			ss.mu.Unlock()
+		}()
+	}
+	if appErr := sd.Handler(srv.server, ss); appErr != nil {
+		if err, ok := appErr.(rpcError); ok {
+			ss.statusCode = err.code
+			ss.statusDesc = err.desc
+		} else if err, ok := appErr.(transport.StreamError); ok {
+			ss.statusCode = err.Code
+			ss.statusDesc = err.Desc
+		} else {
+			ss.statusCode = convertCode(appErr)
+			ss.statusDesc = appErr.Error()
+		}
+	}
+	if trInfo != nil {
+		ss.mu.Lock()
+		if ss.statusCode != codes.OK {
+			ss.trInfo.tr.LazyLog(stringer(ss.statusDesc), true)
+			ss.trInfo.tr.SetError()
+		} else {
+			ss.trInfo.tr.LazyLog(stringer("OK"), false)
+		}
+		ss.mu.Unlock()
+	}
+	return t.WriteStatus(ss.s, ss.statusCode, ss.statusDesc)
+
+}
+
+func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Stream, trInfo *traceInfo) {
+	sm := stream.Method()
+	if sm != "" && sm[0] == '/' {
+		sm = sm[1:]
+	}
+	pos := strings.LastIndex(sm, "/")
+	if pos == -1 {
+		if trInfo != nil {
+			trInfo.tr.LazyLog(&fmtStringer{"Malformed method name %q", []interface{}{sm}}, true)
+			trInfo.tr.SetError()
+		}
+		if err := t.WriteStatus(stream, codes.InvalidArgument, fmt.Sprintf("malformed method name: %q", stream.Method())); err != nil {
+			if trInfo != nil {
+				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
+				trInfo.tr.SetError()
+			}
+			grpclog.Printf("grpc: Server.handleStream failed to write status: %v", err)
+		}
+		if trInfo != nil {
+			trInfo.tr.Finish()
+		}
+		return
+	}
+	service := sm[:pos]
+	method := sm[pos+1:]
+	srv, ok := s.m[service]
+	if !ok {
+		if trInfo != nil {
+			trInfo.tr.LazyLog(&fmtStringer{"Unknown service %v", []interface{}{service}}, true)
+			trInfo.tr.SetError()
+		}
+		if err := t.WriteStatus(stream, codes.Unimplemented, fmt.Sprintf("unknown service %v", service)); err != nil {
+			if trInfo != nil {
+				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
+				trInfo.tr.SetError()
+			}
+			grpclog.Printf("grpc: Server.handleStream failed to write status: %v", err)
+		}
+		if trInfo != nil {
+			trInfo.tr.Finish()
+		}
+		return
+	}
+	// Unary RPC or Streaming RPC?
+	if md, ok := srv.md[method]; ok {
+		s.processUnaryRPC(t, stream, srv, md, trInfo)
+		return
+	}
+	if sd, ok := srv.sd[method]; ok {
+		s.processStreamingRPC(t, stream, srv, sd, trInfo)
+		return
+	}
+	if trInfo != nil {
+		trInfo.tr.LazyLog(&fmtStringer{"Unknown method %v", []interface{}{method}}, true)
+		trInfo.tr.SetError()
+	}
+	if err := t.WriteStatus(stream, codes.Unimplemented, fmt.Sprintf("unknown method %v", method)); err != nil {
+		if trInfo != nil {
+			trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
+			trInfo.tr.SetError()
+		}
+		grpclog.Printf("grpc: Server.handleStream failed to write status: %v", err)
+	}
+	if trInfo != nil {
+		trInfo.tr.Finish()
+	}
+}
+
+// Stop stops the gRPC server. It immediately closes all open
+// connections and listeners.
+// It cancels all active RPCs on the server side and the corresponding
+// pending RPCs on the client side will get notified by connection
+// errors.
+func (s *Server) Stop() {
+	s.mu.Lock()
+	listeners := s.lis
+	s.lis = nil
+	cs := s.conns
+	s.conns = nil
+	s.mu.Unlock()
+
+	for lis := range listeners {
+		lis.Close()
+	}
+	for c := range cs {
+		c.Close()
+	}
+
+	s.mu.Lock()
+	if s.events != nil {
+		s.events.Finish()
+		s.events = nil
+	}
+	s.mu.Unlock()
+}
+
+func init() {
+	internal.TestingCloseConns = func(arg interface{}) {
+		arg.(*Server).testingCloseConns()
+	}
+	internal.TestingUseHandlerImpl = func(arg interface{}) {
+		arg.(*Server).opts.useHandlerImpl = true
+	}
+}
+
+// testingCloseConns closes all existing transports but keeps s.lis
+// accepting new connections.
+func (s *Server) testingCloseConns() {
+	s.mu.Lock()
+	for c := range s.conns {
+		c.Close()
+		delete(s.conns, c)
+	}
+	s.mu.Unlock()
+}
+
+// SendHeader sends header metadata. It may be called at most once from a unary
+// RPC handler. The ctx is the RPC handler's Context or one derived from it.
+func SendHeader(ctx context.Context, md metadata.MD) error {
+	if md.Len() == 0 {
+		return nil
+	}
+	stream, ok := transport.StreamFromContext(ctx)
+	if !ok {
+		return fmt.Errorf("grpc: failed to fetch the stream from the context %v", ctx)
+	}
+	t := stream.ServerTransport()
+	if t == nil {
+		grpclog.Fatalf("grpc: SendHeader: %v has no ServerTransport to send header metadata.", stream)
+	}
+	return t.WriteHeader(stream, md)
+}
+
+// SetTrailer sets the trailer metadata that will be sent when an RPC returns.
+// It may be called at most once from a unary RPC handler. The ctx is the RPC
+// handler's Context or one derived from it.
+func SetTrailer(ctx context.Context, md metadata.MD) error {
+	if md.Len() == 0 {
+		return nil
+	}
+	stream, ok := transport.StreamFromContext(ctx)
+	if !ok {
+		return fmt.Errorf("grpc: failed to fetch the stream from the context %v", ctx)
+	}
+	return stream.SetTrailer(md)
+}
+
+// singleConnListener is a net.Listener that yields a single conn.
+type singleConnListener struct {
+	mu   sync.Mutex
+	addr net.Addr
+	conn net.Conn // nil if done
+}
+
+func (ln *singleConnListener) Addr() net.Addr { return ln.addr }
+
+func (ln *singleConnListener) Close() error {
+	ln.mu.Lock()
+	defer ln.mu.Unlock()
+	ln.conn = nil
+	return nil
+}
+
+func (ln *singleConnListener) Accept() (net.Conn, error) {
+	ln.mu.Lock()
+	defer ln.mu.Unlock()
+	c := ln.conn
+	if c == nil {
+		return nil, io.EOF
+	}
+	ln.conn = nil
+	return c, nil
+}
diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go
new file mode 100644
index 0000000000..dba7f6c420
--- /dev/null
+++ b/vendor/google.golang.org/grpc/stream.go
@@ -0,0 +1,411 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package grpc
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"sync"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/trace"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/transport"
+)
+
+type streamHandler func(srv interface{}, stream ServerStream) error
+
+// StreamDesc represents a streaming RPC service's method specification.
+type StreamDesc struct {
+	StreamName string
+	Handler    streamHandler
+
+	// At least one of these is true.
+	ServerStreams bool
+	ClientStreams bool
+}
+
+// Stream defines the common interface a client or server stream has to satisfy.
+type Stream interface {
+	// Context returns the context for this stream.
+	Context() context.Context
+	// SendMsg blocks until it sends m, the stream is done or the stream
+	// breaks.
+	// On error, it aborts the stream and returns an RPC status on client
+	// side. On server side, it simply returns the error to the caller.
+	// SendMsg is called by generated code.
+	SendMsg(m interface{}) error
+	// RecvMsg blocks until it receives a message or the stream is
+	// done. On client side, it returns io.EOF when the stream is done. On
+	// any other error, it aborts the stream and returns an RPC status. On
+	// server side, it simply returns the error to the caller.
+	RecvMsg(m interface{}) error
+}
+
+// ClientStream defines the interface a client stream has to satify.
+type ClientStream interface {
+	// Header returns the header metedata received from the server if there
+	// is any. It blocks if the metadata is not ready to read.
+	Header() (metadata.MD, error)
+	// Trailer returns the trailer metadata from the server. It must be called
+	// after stream.Recv() returns non-nil error (including io.EOF) for
+	// bi-directional streaming and server streaming or stream.CloseAndRecv()
+	// returns for client streaming in order to receive trailer metadata if
+	// present. Otherwise, it could returns an empty MD even though trailer
+	// is present.
+	Trailer() metadata.MD
+	// CloseSend closes the send direction of the stream. It closes the stream
+	// when non-nil error is met.
+	CloseSend() error
+	Stream
+}
+
+// NewClientStream creates a new Stream for the client side. This is called
+// by generated code.
+func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error) {
+	var (
+		t   transport.ClientTransport
+		err error
+	)
+	t, err = cc.dopts.picker.Pick(ctx)
+	if err != nil {
+		return nil, toRPCErr(err)
+	}
+	// TODO(zhaoq): CallOption is omitted. Add support when it is needed.
+	callHdr := &transport.CallHdr{
+		Host:   cc.authority,
+		Method: method,
+		Flush:  desc.ServerStreams && desc.ClientStreams,
+	}
+	if cc.dopts.cp != nil {
+		callHdr.SendCompress = cc.dopts.cp.Type()
+	}
+	cs := &clientStream{
+		desc:    desc,
+		codec:   cc.dopts.codec,
+		cp:      cc.dopts.cp,
+		dc:      cc.dopts.dc,
+		tracing: EnableTracing,
+	}
+	if cc.dopts.cp != nil {
+		callHdr.SendCompress = cc.dopts.cp.Type()
+		cs.cbuf = new(bytes.Buffer)
+	}
+	if cs.tracing {
+		cs.trInfo.tr = trace.New("grpc.Sent."+methodFamily(method), method)
+		cs.trInfo.firstLine.client = true
+		if deadline, ok := ctx.Deadline(); ok {
+			cs.trInfo.firstLine.deadline = deadline.Sub(time.Now())
+		}
+		cs.trInfo.tr.LazyLog(&cs.trInfo.firstLine, false)
+		ctx = trace.NewContext(ctx, cs.trInfo.tr)
+	}
+	s, err := t.NewStream(ctx, callHdr)
+	if err != nil {
+		cs.finish(err)
+		return nil, toRPCErr(err)
+	}
+	cs.t = t
+	cs.s = s
+	cs.p = &parser{r: s}
+	// Listen on ctx.Done() to detect cancellation when there is no pending
+	// I/O operations on this stream.
+	go func() {
+		select {
+		case <-t.Error():
+			// Incur transport error, simply exit.
+		case <-s.Context().Done():
+			err := s.Context().Err()
+			cs.finish(err)
+			cs.closeTransportStream(transport.ContextErr(err))
+		}
+	}()
+	return cs, nil
+}
+
+// clientStream implements a client side Stream.
+type clientStream struct {
+	t     transport.ClientTransport
+	s     *transport.Stream
+	p     *parser
+	desc  *StreamDesc
+	codec Codec
+	cp    Compressor
+	cbuf  *bytes.Buffer
+	dc    Decompressor
+
+	tracing bool // set to EnableTracing when the clientStream is created.
+
+	mu     sync.Mutex
+	closed bool
+	// trInfo.tr is set when the clientStream is created (if EnableTracing is true),
+	// and is set to nil when the clientStream's finish method is called.
+	trInfo traceInfo
+}
+
+func (cs *clientStream) Context() context.Context {
+	return cs.s.Context()
+}
+
+func (cs *clientStream) Header() (metadata.MD, error) {
+	m, err := cs.s.Header()
+	if err != nil {
+		if _, ok := err.(transport.ConnectionError); !ok {
+			cs.closeTransportStream(err)
+		}
+	}
+	return m, err
+}
+
+func (cs *clientStream) Trailer() metadata.MD {
+	return cs.s.Trailer()
+}
+
+func (cs *clientStream) SendMsg(m interface{}) (err error) {
+	if cs.tracing {
+		cs.mu.Lock()
+		if cs.trInfo.tr != nil {
+			cs.trInfo.tr.LazyLog(&payload{sent: true, msg: m}, true)
+		}
+		cs.mu.Unlock()
+	}
+	defer func() {
+		if err != nil {
+			cs.finish(err)
+		}
+		if err == nil || err == io.EOF {
+			return
+		}
+		if _, ok := err.(transport.ConnectionError); !ok {
+			cs.closeTransportStream(err)
+		}
+		err = toRPCErr(err)
+	}()
+	out, err := encode(cs.codec, m, cs.cp, cs.cbuf)
+	defer func() {
+		if cs.cbuf != nil {
+			cs.cbuf.Reset()
+		}
+	}()
+	if err != nil {
+		return transport.StreamErrorf(codes.Internal, "grpc: %v", err)
+	}
+	return cs.t.Write(cs.s, out, &transport.Options{Last: false})
+}
+
+func (cs *clientStream) RecvMsg(m interface{}) (err error) {
+	err = recv(cs.p, cs.codec, cs.s, cs.dc, m)
+	defer func() {
+		// err != nil indicates the termination of the stream.
+		if err != nil {
+			cs.finish(err)
+		}
+	}()
+	if err == nil {
+		if cs.tracing {
+			cs.mu.Lock()
+			if cs.trInfo.tr != nil {
+				cs.trInfo.tr.LazyLog(&payload{sent: false, msg: m}, true)
+			}
+			cs.mu.Unlock()
+		}
+		if !cs.desc.ClientStreams || cs.desc.ServerStreams {
+			return
+		}
+		// Special handling for client streaming rpc.
+		err = recv(cs.p, cs.codec, cs.s, cs.dc, m)
+		cs.closeTransportStream(err)
+		if err == nil {
+			return toRPCErr(errors.New("grpc: client streaming protocol violation: get <nil>, want <EOF>"))
+		}
+		if err == io.EOF {
+			if cs.s.StatusCode() == codes.OK {
+				cs.finish(err)
+				return nil
+			}
+			return Errorf(cs.s.StatusCode(), cs.s.StatusDesc())
+		}
+		return toRPCErr(err)
+	}
+	if _, ok := err.(transport.ConnectionError); !ok {
+		cs.closeTransportStream(err)
+	}
+	if err == io.EOF {
+		if cs.s.StatusCode() == codes.OK {
+			// Returns io.EOF to indicate the end of the stream.
+			return
+		}
+		return Errorf(cs.s.StatusCode(), cs.s.StatusDesc())
+	}
+	return toRPCErr(err)
+}
+
+func (cs *clientStream) CloseSend() (err error) {
+	err = cs.t.Write(cs.s, nil, &transport.Options{Last: true})
+	defer func() {
+		if err != nil {
+			cs.finish(err)
+		}
+	}()
+	if err == nil || err == io.EOF {
+		return
+	}
+	if _, ok := err.(transport.ConnectionError); !ok {
+		cs.closeTransportStream(err)
+	}
+	err = toRPCErr(err)
+	return
+}
+
+func (cs *clientStream) closeTransportStream(err error) {
+	cs.mu.Lock()
+	if cs.closed {
+		cs.mu.Unlock()
+		return
+	}
+	cs.closed = true
+	cs.mu.Unlock()
+	cs.t.CloseStream(cs.s, err)
+}
+
+func (cs *clientStream) finish(err error) {
+	if !cs.tracing {
+		return
+	}
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+	if cs.trInfo.tr != nil {
+		if err == nil || err == io.EOF {
+			cs.trInfo.tr.LazyPrintf("RPC: [OK]")
+		} else {
+			cs.trInfo.tr.LazyPrintf("RPC: [%v]", err)
+			cs.trInfo.tr.SetError()
+		}
+		cs.trInfo.tr.Finish()
+		cs.trInfo.tr = nil
+	}
+}
+
+// ServerStream defines the interface a server stream has to satisfy.
+type ServerStream interface {
+	// SendHeader sends the header metadata. It should not be called
+	// after SendProto. It fails if called multiple times or if
+	// called after SendProto.
+	SendHeader(metadata.MD) error
+	// SetTrailer sets the trailer metadata which will be sent with the
+	// RPC status.
+	SetTrailer(metadata.MD)
+	Stream
+}
+
+// serverStream implements a server side Stream.
+type serverStream struct {
+	t          transport.ServerTransport
+	s          *transport.Stream
+	p          *parser
+	codec      Codec
+	cp         Compressor
+	dc         Decompressor
+	cbuf       *bytes.Buffer
+	statusCode codes.Code
+	statusDesc string
+	trInfo     *traceInfo
+
+	mu sync.Mutex // protects trInfo.tr after the service handler runs.
+}
+
+func (ss *serverStream) Context() context.Context {
+	return ss.s.Context()
+}
+
+func (ss *serverStream) SendHeader(md metadata.MD) error {
+	return ss.t.WriteHeader(ss.s, md)
+}
+
+func (ss *serverStream) SetTrailer(md metadata.MD) {
+	if md.Len() == 0 {
+		return
+	}
+	ss.s.SetTrailer(md)
+	return
+}
+
+func (ss *serverStream) SendMsg(m interface{}) (err error) {
+	defer func() {
+		if ss.trInfo != nil {
+			ss.mu.Lock()
+			if ss.trInfo.tr != nil {
+				if err == nil {
+					ss.trInfo.tr.LazyLog(&payload{sent: true, msg: m}, true)
+				} else {
+					ss.trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
+					ss.trInfo.tr.SetError()
+				}
+			}
+			ss.mu.Unlock()
+		}
+	}()
+	out, err := encode(ss.codec, m, ss.cp, ss.cbuf)
+	defer func() {
+		if ss.cbuf != nil {
+			ss.cbuf.Reset()
+		}
+	}()
+	if err != nil {
+		err = transport.StreamErrorf(codes.Internal, "grpc: %v", err)
+		return err
+	}
+	return ss.t.Write(ss.s, out, &transport.Options{Last: false})
+}
+
+func (ss *serverStream) RecvMsg(m interface{}) (err error) {
+	defer func() {
+		if ss.trInfo != nil {
+			ss.mu.Lock()
+			if ss.trInfo.tr != nil {
+				if err == nil {
+					ss.trInfo.tr.LazyLog(&payload{sent: false, msg: m}, true)
+				} else if err != io.EOF {
+					ss.trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
+					ss.trInfo.tr.SetError()
+				}
+			}
+			ss.mu.Unlock()
+		}
+	}()
+	return recv(ss.p, ss.codec, ss.s, ss.dc, m)
+}
diff --git a/vendor/google.golang.org/grpc/trace.go b/vendor/google.golang.org/grpc/trace.go
new file mode 100644
index 0000000000..cde04fbfc9
--- /dev/null
+++ b/vendor/google.golang.org/grpc/trace.go
@@ -0,0 +1,120 @@
+/*
+ *
+ * Copyright 2015, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package grpc
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"net"
+	"strings"
+	"time"
+
+	"golang.org/x/net/trace"
+)
+
+// EnableTracing controls whether to trace RPCs using the golang.org/x/net/trace package.
+// This should only be set before any RPCs are sent or received by this program.
+var EnableTracing = true
+
+// methodFamily returns the trace family for the given method.
+// It turns "/pkg.Service/GetFoo" into "pkg.Service".
+func methodFamily(m string) string {
+	m = strings.TrimPrefix(m, "/") // remove leading slash
+	if i := strings.Index(m, "/"); i >= 0 {
+		m = m[:i] // remove everything from second slash
+	}
+	if i := strings.LastIndex(m, "."); i >= 0 {
+		m = m[i+1:] // cut down to last dotted component
+	}
+	return m
+}
+
+// traceInfo contains tracing information for an RPC.
+type traceInfo struct {
+	tr        trace.Trace
+	firstLine firstLine
+}
+
+// firstLine is the first line of an RPC trace.
+type firstLine struct {
+	client     bool // whether this is a client (outgoing) RPC
+	remoteAddr net.Addr
+	deadline   time.Duration // may be zero
+}
+
+func (f *firstLine) String() string {
+	var line bytes.Buffer
+	io.WriteString(&line, "RPC: ")
+	if f.client {
+		io.WriteString(&line, "to")
+	} else {
+		io.WriteString(&line, "from")
+	}
+	fmt.Fprintf(&line, " %v deadline:", f.remoteAddr)
+	if f.deadline != 0 {
+		fmt.Fprint(&line, f.deadline)
+	} else {
+		io.WriteString(&line, "none")
+	}
+	return line.String()
+}
+
+// payload represents an RPC request or response payload.
+type payload struct {
+	sent bool        // whether this is an outgoing payload
+	msg  interface{} // e.g. a proto.Message
+	// TODO(dsymonds): add stringifying info to codec, and limit how much we hold here?
+}
+
+func (p payload) String() string {
+	if p.sent {
+		return fmt.Sprintf("sent: %v", p.msg)
+	} else {
+		return fmt.Sprintf("recv: %v", p.msg)
+	}
+}
+
+type fmtStringer struct {
+	format string
+	a      []interface{}
+}
+
+func (f *fmtStringer) String() string {
+	return fmt.Sprintf(f.format, f.a...)
+}
+
+type stringer string
+
+func (s stringer) String() string { return string(s) }
diff --git a/vendor/google.golang.org/grpc/transport/control.go b/vendor/google.golang.org/grpc/transport/control.go
new file mode 100644
index 0000000000..f6b38a5a6d
--- /dev/null
+++ b/vendor/google.golang.org/grpc/transport/control.go
@@ -0,0 +1,260 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package transport
+
+import (
+	"fmt"
+	"sync"
+
+	"golang.org/x/net/http2"
+)
+
+const (
+	// The default value of flow control window size in HTTP2 spec.
+	defaultWindowSize = 65535
+	// The initial window size for flow control.
+	initialWindowSize     = defaultWindowSize      // for an RPC
+	initialConnWindowSize = defaultWindowSize * 16 // for a connection
+)
+
+// The following defines various control items which could flow through
+// the control buffer of transport. They represent different aspects of
+// control tasks, e.g., flow control, settings, streaming resetting, etc.
+type windowUpdate struct {
+	streamID  uint32
+	increment uint32
+}
+
+func (windowUpdate) isItem() bool {
+	return true
+}
+
+type settings struct {
+	ack bool
+	ss  []http2.Setting
+}
+
+func (settings) isItem() bool {
+	return true
+}
+
+type resetStream struct {
+	streamID uint32
+	code     http2.ErrCode
+}
+
+func (resetStream) isItem() bool {
+	return true
+}
+
+type flushIO struct {
+}
+
+func (flushIO) isItem() bool {
+	return true
+}
+
+type ping struct {
+	ack  bool
+	data [8]byte
+}
+
+func (ping) isItem() bool {
+	return true
+}
+
+// quotaPool is a pool which accumulates the quota and sends it to acquire()
+// when it is available.
+type quotaPool struct {
+	c chan int
+
+	mu    sync.Mutex
+	quota int
+}
+
+// newQuotaPool creates a quotaPool which has quota q available to consume.
+func newQuotaPool(q int) *quotaPool {
+	qb := &quotaPool{
+		c: make(chan int, 1),
+	}
+	if q > 0 {
+		qb.c <- q
+	} else {
+		qb.quota = q
+	}
+	return qb
+}
+
+// add adds n to the available quota and tries to send it on acquire.
+func (qb *quotaPool) add(n int) {
+	qb.mu.Lock()
+	defer qb.mu.Unlock()
+	qb.quota += n
+	if qb.quota <= 0 {
+		return
+	}
+	select {
+	case qb.c <- qb.quota:
+		qb.quota = 0
+	default:
+	}
+}
+
+// cancel cancels the pending quota sent on acquire, if any.
+func (qb *quotaPool) cancel() {
+	qb.mu.Lock()
+	defer qb.mu.Unlock()
+	select {
+	case n := <-qb.c:
+		qb.quota += n
+	default:
+	}
+}
+
+// reset cancels the pending quota sent on acquired, incremented by v and sends
+// it back on acquire.
+func (qb *quotaPool) reset(v int) {
+	qb.mu.Lock()
+	defer qb.mu.Unlock()
+	select {
+	case n := <-qb.c:
+		qb.quota += n
+	default:
+	}
+	qb.quota += v
+	if qb.quota <= 0 {
+		return
+	}
+	select {
+	case qb.c <- qb.quota:
+		qb.quota = 0
+	default:
+	}
+}
+
+// acquire returns the channel on which available quota amounts are sent.
+func (qb *quotaPool) acquire() <-chan int {
+	return qb.c
+}
+
+// inFlow deals with inbound flow control
+type inFlow struct {
+	// The inbound flow control limit for pending data.
+	limit uint32
+	// conn points to the shared connection-level inFlow that is shared
+	// by all streams on that conn. It is nil for the inFlow on the conn
+	// directly.
+	conn *inFlow
+
+	mu sync.Mutex
+	// pendingData is the overall data which have been received but not been
+	// consumed by applications.
+	pendingData uint32
+	// The amount of data the application has consumed but grpc has not sent
+	// window update for them. Used to reduce window update frequency.
+	pendingUpdate uint32
+}
+
+// onData is invoked when some data frame is received. It increments not only its
+// own pendingData but also that of the associated connection-level flow.
+func (f *inFlow) onData(n uint32) error {
+	if n == 0 {
+		return nil
+	}
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	if f.pendingData+f.pendingUpdate+n > f.limit {
+		return fmt.Errorf("recieved %d-bytes data exceeding the limit %d bytes", f.pendingData+f.pendingUpdate+n, f.limit)
+	}
+	if f.conn != nil {
+		if err := f.conn.onData(n); err != nil {
+			return ConnectionErrorf("%v", err)
+		}
+	}
+	f.pendingData += n
+	return nil
+}
+
+// connOnRead updates the connection level states when the application consumes data.
+func (f *inFlow) connOnRead(n uint32) uint32 {
+	if n == 0 || f.conn != nil {
+		return 0
+	}
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	f.pendingData -= n
+	f.pendingUpdate += n
+	if f.pendingUpdate >= f.limit/4 {
+		ret := f.pendingUpdate
+		f.pendingUpdate = 0
+		return ret
+	}
+	return 0
+}
+
+// onRead is invoked when the application reads the data. It returns the window updates
+// for both stream and connection level.
+func (f *inFlow) onRead(n uint32) (swu, cwu uint32) {
+	if n == 0 {
+		return
+	}
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	if f.pendingData == 0 {
+		// pendingData has been adjusted by restoreConn.
+		return
+	}
+	f.pendingData -= n
+	f.pendingUpdate += n
+	if f.pendingUpdate >= f.limit/4 {
+		swu = f.pendingUpdate
+		f.pendingUpdate = 0
+	}
+	cwu = f.conn.connOnRead(n)
+	return
+}
+
+// restoreConn is invoked when a stream is terminated. It removes its stake in
+// the connection-level flow and resets its own state.
+func (f *inFlow) restoreConn() uint32 {
+	if f.conn == nil {
+		return 0
+	}
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	n := f.pendingData
+	f.pendingData = 0
+	f.pendingUpdate = 0
+	return f.conn.connOnRead(n)
+}
diff --git a/vendor/google.golang.org/grpc/transport/handler_server.go b/vendor/google.golang.org/grpc/transport/handler_server.go
new file mode 100644
index 0000000000..63ba0537a1
--- /dev/null
+++ b/vendor/google.golang.org/grpc/transport/handler_server.go
@@ -0,0 +1,377 @@
+/*
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// This file is the implementation of a gRPC server using HTTP/2 which
+// uses the standard Go http2 Server implementation (via the
+// http.Handler interface), rather than speaking low-level HTTP/2
+// frames itself. It is the implementation of *grpc.Server.ServeHTTP.
+
+package transport
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/http2"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/peer"
+)
+
+// NewServerHandlerTransport returns a ServerTransport handling gRPC
+// from inside an http.Handler. It requires that the http Server
+// supports HTTP/2.
+func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request) (ServerTransport, error) {
+	if r.ProtoMajor != 2 {
+		return nil, errors.New("gRPC requires HTTP/2")
+	}
+	if r.Method != "POST" {
+		return nil, errors.New("invalid gRPC request method")
+	}
+	if !strings.Contains(r.Header.Get("Content-Type"), "application/grpc") {
+		return nil, errors.New("invalid gRPC request content-type")
+	}
+	if _, ok := w.(http.Flusher); !ok {
+		return nil, errors.New("gRPC requires a ResponseWriter supporting http.Flusher")
+	}
+	if _, ok := w.(http.CloseNotifier); !ok {
+		return nil, errors.New("gRPC requires a ResponseWriter supporting http.CloseNotifier")
+	}
+
+	st := &serverHandlerTransport{
+		rw:       w,
+		req:      r,
+		closedCh: make(chan struct{}),
+		writes:   make(chan func()),
+	}
+
+	if v := r.Header.Get("grpc-timeout"); v != "" {
+		to, err := timeoutDecode(v)
+		if err != nil {
+			return nil, StreamErrorf(codes.Internal, "malformed time-out: %v", err)
+		}
+		st.timeoutSet = true
+		st.timeout = to
+	}
+
+	var metakv []string
+	for k, vv := range r.Header {
+		k = strings.ToLower(k)
+		if isReservedHeader(k) {
+			continue
+		}
+		for _, v := range vv {
+			if k == "user-agent" {
+				// user-agent is special. Copying logic of http_util.go.
+				if i := strings.LastIndex(v, " "); i == -1 {
+					// There is no application user agent string being set
+					continue
+				} else {
+					v = v[:i]
+				}
+			}
+			metakv = append(metakv, k, v)
+
+		}
+	}
+	st.headerMD = metadata.Pairs(metakv...)
+
+	return st, nil
+}
+
+// serverHandlerTransport is an implementation of ServerTransport
+// which replies to exactly one gRPC request (exactly one HTTP request),
+// using the net/http.Handler interface. This http.Handler is guranteed
+// at this point to be speaking over HTTP/2, so it's able to speak valid
+// gRPC.
+type serverHandlerTransport struct {
+	rw               http.ResponseWriter
+	req              *http.Request
+	timeoutSet       bool
+	timeout          time.Duration
+	didCommonHeaders bool
+
+	headerMD metadata.MD
+
+	closeOnce sync.Once
+	closedCh  chan struct{} // closed on Close
+
+	// writes is a channel of code to run serialized in the
+	// ServeHTTP (HandleStreams) goroutine. The channel is closed
+	// when WriteStatus is called.
+	writes chan func()
+}
+
+func (ht *serverHandlerTransport) Close() error {
+	ht.closeOnce.Do(ht.closeCloseChanOnce)
+	return nil
+}
+
+func (ht *serverHandlerTransport) closeCloseChanOnce() { close(ht.closedCh) }
+
+func (ht *serverHandlerTransport) RemoteAddr() net.Addr { return strAddr(ht.req.RemoteAddr) }
+
+// strAddr is a net.Addr backed by either a TCP "ip:port" string, or
+// the empty string if unknown.
+type strAddr string
+
+func (a strAddr) Network() string {
+	if a != "" {
+		// Per the documentation on net/http.Request.RemoteAddr, if this is
+		// set, it's set to the IP:port of the peer (hence, TCP):
+		// https://golang.org/pkg/net/http/#Request
+		//
+		// If we want to support Unix sockets later, we can
+		// add our own grpc-specific convention within the
+		// grpc codebase to set RemoteAddr to a different
+		// format, or probably better: we can attach it to the
+		// context and use that from serverHandlerTransport.RemoteAddr.
+		return "tcp"
+	}
+	return ""
+}
+
+func (a strAddr) String() string { return string(a) }
+
+// do runs fn in the ServeHTTP goroutine.
+func (ht *serverHandlerTransport) do(fn func()) error {
+	select {
+	case ht.writes <- fn:
+		return nil
+	case <-ht.closedCh:
+		return ErrConnClosing
+	}
+}
+
+func (ht *serverHandlerTransport) WriteStatus(s *Stream, statusCode codes.Code, statusDesc string) error {
+	err := ht.do(func() {
+		ht.writeCommonHeaders(s)
+
+		// And flush, in case no header or body has been sent yet.
+		// This forces a separation of headers and trailers if this is the
+		// first call (for example, in end2end tests's TestNoService).
+		ht.rw.(http.Flusher).Flush()
+
+		h := ht.rw.Header()
+		h.Set("Grpc-Status", fmt.Sprintf("%d", statusCode))
+		if statusDesc != "" {
+			h.Set("Grpc-Message", statusDesc)
+		}
+		if md := s.Trailer(); len(md) > 0 {
+			for k, vv := range md {
+				for _, v := range vv {
+					// http2 ResponseWriter mechanism to
+					// send undeclared Trailers after the
+					// headers have possibly been written.
+					h.Add(http2.TrailerPrefix+k, v)
+				}
+			}
+		}
+	})
+	close(ht.writes)
+	return err
+}
+
+// writeCommonHeaders sets common headers on the first write
+// call (Write, WriteHeader, or WriteStatus).
+func (ht *serverHandlerTransport) writeCommonHeaders(s *Stream) {
+	if ht.didCommonHeaders {
+		return
+	}
+	ht.didCommonHeaders = true
+
+	h := ht.rw.Header()
+	h["Date"] = nil // suppress Date to make tests happy; TODO: restore
+	h.Set("Content-Type", "application/grpc")
+
+	// Predeclare trailers we'll set later in WriteStatus (after the body).
+	// This is a SHOULD in the HTTP RFC, and the way you add (known)
+	// Trailers per the net/http.ResponseWriter contract.
+	// See https://golang.org/pkg/net/http/#ResponseWriter
+	// and https://golang.org/pkg/net/http/#example_ResponseWriter_trailers
+	h.Add("Trailer", "Grpc-Status")
+	h.Add("Trailer", "Grpc-Message")
+
+	if s.sendCompress != "" {
+		h.Set("Grpc-Encoding", s.sendCompress)
+	}
+}
+
+func (ht *serverHandlerTransport) Write(s *Stream, data []byte, opts *Options) error {
+	return ht.do(func() {
+		ht.writeCommonHeaders(s)
+		ht.rw.Write(data)
+		if !opts.Delay {
+			ht.rw.(http.Flusher).Flush()
+		}
+	})
+}
+
+func (ht *serverHandlerTransport) WriteHeader(s *Stream, md metadata.MD) error {
+	return ht.do(func() {
+		ht.writeCommonHeaders(s)
+		h := ht.rw.Header()
+		for k, vv := range md {
+			for _, v := range vv {
+				h.Add(k, v)
+			}
+		}
+		ht.rw.WriteHeader(200)
+		ht.rw.(http.Flusher).Flush()
+	})
+}
+
+func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream)) {
+	// With this transport type there will be exactly 1 stream: this HTTP request.
+
+	var ctx context.Context
+	var cancel context.CancelFunc
+	if ht.timeoutSet {
+		ctx, cancel = context.WithTimeout(context.Background(), ht.timeout)
+	} else {
+		ctx, cancel = context.WithCancel(context.Background())
+	}
+
+	// requestOver is closed when either the request's context is done
+	// or the status has been written via WriteStatus.
+	requestOver := make(chan struct{})
+
+	// clientGone receives a single value if peer is gone, either
+	// because the underlying connection is dead or because the
+	// peer sends an http2 RST_STREAM.
+	clientGone := ht.rw.(http.CloseNotifier).CloseNotify()
+	go func() {
+		select {
+		case <-requestOver:
+			return
+		case <-ht.closedCh:
+		case <-clientGone:
+		}
+		cancel()
+	}()
+
+	req := ht.req
+
+	s := &Stream{
+		id:            0,            // irrelevant
+		windowHandler: func(int) {}, // nothing
+		cancel:        cancel,
+		buf:           newRecvBuffer(),
+		st:            ht,
+		method:        req.URL.Path,
+		recvCompress:  req.Header.Get("grpc-encoding"),
+	}
+	pr := &peer.Peer{
+		Addr: ht.RemoteAddr(),
+	}
+	if req.TLS != nil {
+		pr.AuthInfo = credentials.TLSInfo{*req.TLS}
+	}
+	ctx = metadata.NewContext(ctx, ht.headerMD)
+	ctx = peer.NewContext(ctx, pr)
+	s.ctx = newContextWithStream(ctx, s)
+	s.dec = &recvBufferReader{ctx: s.ctx, recv: s.buf}
+
+	// readerDone is closed when the Body.Read-ing goroutine exits.
+	readerDone := make(chan struct{})
+	go func() {
+		defer close(readerDone)
+		for {
+			buf := make([]byte, 1024) // TODO: minimize garbage, optimize recvBuffer code/ownership
+			n, err := req.Body.Read(buf)
+			if n > 0 {
+				s.buf.put(&recvMsg{data: buf[:n]})
+			}
+			if err != nil {
+				s.buf.put(&recvMsg{err: mapRecvMsgError(err)})
+				return
+			}
+		}
+	}()
+
+	// startStream is provided by the *grpc.Server's serveStreams.
+	// It starts a goroutine serving s and exits immediately.
+	// The goroutine that is started is the one that then calls
+	// into ht, calling WriteHeader, Write, WriteStatus, Close, etc.
+	startStream(s)
+
+	ht.runStream()
+	close(requestOver)
+
+	// Wait for reading goroutine to finish.
+	req.Body.Close()
+	<-readerDone
+}
+
+func (ht *serverHandlerTransport) runStream() {
+	for {
+		select {
+		case fn, ok := <-ht.writes:
+			if !ok {
+				return
+			}
+			fn()
+		case <-ht.closedCh:
+			return
+		}
+	}
+}
+
+// mapRecvMsgError returns the non-nil err into the appropriate
+// error value as expected by callers of *grpc.parser.recvMsg.
+// In particular, in can only be:
+//   * io.EOF
+//   * io.ErrUnexpectedEOF
+//   * of type transport.ConnectionError
+//   * of type transport.StreamError
+func mapRecvMsgError(err error) error {
+	if err == io.EOF || err == io.ErrUnexpectedEOF {
+		return err
+	}
+	if se, ok := err.(http2.StreamError); ok {
+		if code, ok := http2ErrConvTab[se.Code]; ok {
+			return StreamError{
+				Code: code,
+				Desc: se.Error(),
+			}
+		}
+	}
+	return ConnectionError{Desc: err.Error()}
+}
diff --git a/vendor/google.golang.org/grpc/transport/http2_client.go b/vendor/google.golang.org/grpc/transport/http2_client.go
new file mode 100644
index 0000000000..bb72fea3ff
--- /dev/null
+++ b/vendor/google.golang.org/grpc/transport/http2_client.go
@@ -0,0 +1,875 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package transport
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"math"
+	"net"
+	"strings"
+	"sync"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/peer"
+)
+
+// http2Client implements the ClientTransport interface with HTTP2.
+type http2Client struct {
+	target    string // server name/addr
+	userAgent string
+	conn      net.Conn             // underlying communication channel
+	authInfo  credentials.AuthInfo // auth info about the connection
+	nextID    uint32               // the next stream ID to be used
+
+	// writableChan synchronizes write access to the transport.
+	// A writer acquires the write lock by sending a value on writableChan
+	// and releases it by receiving from writableChan.
+	writableChan chan int
+	// shutdownChan is closed when Close is called.
+	// Blocking operations should select on shutdownChan to avoid
+	// blocking forever after Close.
+	// TODO(zhaoq): Maybe have a channel context?
+	shutdownChan chan struct{}
+	// errorChan is closed to notify the I/O error to the caller.
+	errorChan chan struct{}
+
+	framer *framer
+	hBuf   *bytes.Buffer  // the buffer for HPACK encoding
+	hEnc   *hpack.Encoder // HPACK encoder
+
+	// controlBuf delivers all the control related tasks (e.g., window
+	// updates, reset streams, and various settings) to the controller.
+	controlBuf *recvBuffer
+	fc         *inFlow
+	// sendQuotaPool provides flow control to outbound message.
+	sendQuotaPool *quotaPool
+	// streamsQuota limits the max number of concurrent streams.
+	streamsQuota *quotaPool
+
+	// The scheme used: https if TLS is on, http otherwise.
+	scheme string
+
+	authCreds []credentials.Credentials
+
+	mu            sync.Mutex     // guard the following variables
+	state         transportState // the state of underlying connection
+	activeStreams map[uint32]*Stream
+	// The max number of concurrent streams
+	maxStreams int
+	// the per-stream outbound flow control window size set by the peer.
+	streamSendQuota uint32
+}
+
+// newHTTP2Client constructs a connected ClientTransport to addr based on HTTP2
+// and starts to receive messages on it. Non-nil error returns if construction
+// fails.
+func newHTTP2Client(addr string, opts *ConnectOptions) (_ ClientTransport, err error) {
+	if opts.Dialer == nil {
+		// Set the default Dialer.
+		opts.Dialer = func(addr string, timeout time.Duration) (net.Conn, error) {
+			return net.DialTimeout("tcp", addr, timeout)
+		}
+	}
+	scheme := "http"
+	startT := time.Now()
+	timeout := opts.Timeout
+	conn, connErr := opts.Dialer(addr, timeout)
+	if connErr != nil {
+		return nil, ConnectionErrorf("transport: %v", connErr)
+	}
+	var authInfo credentials.AuthInfo
+	for _, c := range opts.AuthOptions {
+		if ccreds, ok := c.(credentials.TransportAuthenticator); ok {
+			scheme = "https"
+			// TODO(zhaoq): Now the first TransportAuthenticator is used if there are
+			// multiple ones provided. Revisit this if it is not appropriate. Probably
+			// place the ClientTransport construction into a separate function to make
+			// things clear.
+			if timeout > 0 {
+				timeout -= time.Since(startT)
+			}
+			conn, authInfo, connErr = ccreds.ClientHandshake(addr, conn, timeout)
+			break
+		}
+	}
+	if connErr != nil {
+		return nil, ConnectionErrorf("transport: %v", connErr)
+	}
+	defer func() {
+		if err != nil {
+			conn.Close()
+		}
+	}()
+	// Send connection preface to server.
+	n, err := conn.Write(clientPreface)
+	if err != nil {
+		return nil, ConnectionErrorf("transport: %v", err)
+	}
+	if n != len(clientPreface) {
+		return nil, ConnectionErrorf("transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface))
+	}
+	framer := newFramer(conn)
+	if initialWindowSize != defaultWindowSize {
+		err = framer.writeSettings(true, http2.Setting{http2.SettingInitialWindowSize, uint32(initialWindowSize)})
+	} else {
+		err = framer.writeSettings(true)
+	}
+	if err != nil {
+		return nil, ConnectionErrorf("transport: %v", err)
+	}
+	// Adjust the connection flow control window if needed.
+	if delta := uint32(initialConnWindowSize - defaultWindowSize); delta > 0 {
+		if err := framer.writeWindowUpdate(true, 0, delta); err != nil {
+			return nil, ConnectionErrorf("transport: %v", err)
+		}
+	}
+	ua := primaryUA
+	if opts.UserAgent != "" {
+		ua = opts.UserAgent + " " + ua
+	}
+	var buf bytes.Buffer
+	t := &http2Client{
+		target:    addr,
+		userAgent: ua,
+		conn:      conn,
+		authInfo:  authInfo,
+		// The client initiated stream id is odd starting from 1.
+		nextID:          1,
+		writableChan:    make(chan int, 1),
+		shutdownChan:    make(chan struct{}),
+		errorChan:       make(chan struct{}),
+		framer:          framer,
+		hBuf:            &buf,
+		hEnc:            hpack.NewEncoder(&buf),
+		controlBuf:      newRecvBuffer(),
+		fc:              &inFlow{limit: initialConnWindowSize},
+		sendQuotaPool:   newQuotaPool(defaultWindowSize),
+		scheme:          scheme,
+		state:           reachable,
+		activeStreams:   make(map[uint32]*Stream),
+		authCreds:       opts.AuthOptions,
+		maxStreams:      math.MaxInt32,
+		streamSendQuota: defaultWindowSize,
+	}
+	go t.controller()
+	t.writableChan <- 0
+	// Start the reader goroutine for incoming message. The threading model
+	// on receiving is that each transport has a dedicated goroutine which
+	// reads HTTP2 frame from network. Then it dispatches the frame to the
+	// corresponding stream entity.
+	go t.reader()
+	return t, nil
+}
+
+func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
+	fc := &inFlow{
+		limit: initialWindowSize,
+		conn:  t.fc,
+	}
+	// TODO(zhaoq): Handle uint32 overflow of Stream.id.
+	s := &Stream{
+		id:            t.nextID,
+		method:        callHdr.Method,
+		sendCompress:  callHdr.SendCompress,
+		buf:           newRecvBuffer(),
+		fc:            fc,
+		sendQuotaPool: newQuotaPool(int(t.streamSendQuota)),
+		headerChan:    make(chan struct{}),
+	}
+	t.nextID += 2
+	s.windowHandler = func(n int) {
+		t.updateWindow(s, uint32(n))
+	}
+	// Make a stream be able to cancel the pending operations by itself.
+	s.ctx, s.cancel = context.WithCancel(ctx)
+	s.dec = &recvBufferReader{
+		ctx:  s.ctx,
+		recv: s.buf,
+	}
+	return s
+}
+
+// NewStream creates a stream and register it into the transport as "active"
+// streams.
+func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Stream, err error) {
+	// Record the timeout value on the context.
+	var timeout time.Duration
+	if dl, ok := ctx.Deadline(); ok {
+		timeout = dl.Sub(time.Now())
+		if timeout <= 0 {
+			return nil, ContextErr(context.DeadlineExceeded)
+		}
+	}
+	pr := &peer.Peer{
+		Addr: t.conn.RemoteAddr(),
+	}
+	// Attach Auth info if there is any.
+	if t.authInfo != nil {
+		pr.AuthInfo = t.authInfo
+	}
+	ctx = peer.NewContext(ctx, pr)
+	authData := make(map[string]string)
+	for _, c := range t.authCreds {
+		// Construct URI required to get auth request metadata.
+		var port string
+		if pos := strings.LastIndex(t.target, ":"); pos != -1 {
+			// Omit port if it is the default one.
+			if t.target[pos+1:] != "443" {
+				port = ":" + t.target[pos+1:]
+			}
+		}
+		pos := strings.LastIndex(callHdr.Method, "/")
+		if pos == -1 {
+			return nil, StreamErrorf(codes.InvalidArgument, "transport: malformed method name: %q", callHdr.Method)
+		}
+		audience := "https://" + callHdr.Host + port + callHdr.Method[:pos]
+		data, err := c.GetRequestMetadata(ctx, audience)
+		if err != nil {
+			return nil, StreamErrorf(codes.InvalidArgument, "transport: %v", err)
+		}
+		for k, v := range data {
+			authData[k] = v
+		}
+	}
+	t.mu.Lock()
+	if t.state != reachable {
+		t.mu.Unlock()
+		return nil, ErrConnClosing
+	}
+	checkStreamsQuota := t.streamsQuota != nil
+	t.mu.Unlock()
+	if checkStreamsQuota {
+		sq, err := wait(ctx, t.shutdownChan, t.streamsQuota.acquire())
+		if err != nil {
+			return nil, err
+		}
+		// Returns the quota balance back.
+		if sq > 1 {
+			t.streamsQuota.add(sq - 1)
+		}
+	}
+	if _, err := wait(ctx, t.shutdownChan, t.writableChan); err != nil {
+		// t.streamsQuota will be updated when t.CloseStream is invoked.
+		return nil, err
+	}
+	t.mu.Lock()
+	if t.state != reachable {
+		t.mu.Unlock()
+		return nil, ErrConnClosing
+	}
+	s := t.newStream(ctx, callHdr)
+	t.activeStreams[s.id] = s
+
+	// This stream is not counted when applySetings(...) initialize t.streamsQuota.
+	// Reset t.streamsQuota to the right value.
+	var reset bool
+	if !checkStreamsQuota && t.streamsQuota != nil {
+		reset = true
+	}
+	t.mu.Unlock()
+	if reset {
+		t.streamsQuota.reset(-1)
+	}
+
+	// HPACK encodes various headers. Note that once WriteField(...) is
+	// called, the corresponding headers/continuation frame has to be sent
+	// because hpack.Encoder is stateful.
+	t.hBuf.Reset()
+	t.hEnc.WriteField(hpack.HeaderField{Name: ":method", Value: "POST"})
+	t.hEnc.WriteField(hpack.HeaderField{Name: ":scheme", Value: t.scheme})
+	t.hEnc.WriteField(hpack.HeaderField{Name: ":path", Value: callHdr.Method})
+	t.hEnc.WriteField(hpack.HeaderField{Name: ":authority", Value: callHdr.Host})
+	t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
+	t.hEnc.WriteField(hpack.HeaderField{Name: "user-agent", Value: t.userAgent})
+	t.hEnc.WriteField(hpack.HeaderField{Name: "te", Value: "trailers"})
+
+	if callHdr.SendCompress != "" {
+		t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-encoding", Value: callHdr.SendCompress})
+	}
+	if timeout > 0 {
+		t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-timeout", Value: timeoutEncode(timeout)})
+	}
+	for k, v := range authData {
+		t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: v})
+	}
+	var (
+		hasMD      bool
+		endHeaders bool
+	)
+	if md, ok := metadata.FromContext(ctx); ok {
+		hasMD = true
+		for k, v := range md {
+			for _, entry := range v {
+				t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+			}
+		}
+	}
+	first := true
+	// Sends the headers in a single batch even when they span multiple frames.
+	for !endHeaders {
+		size := t.hBuf.Len()
+		if size > http2MaxFrameLen {
+			size = http2MaxFrameLen
+		} else {
+			endHeaders = true
+		}
+		var flush bool
+		if endHeaders && (hasMD || callHdr.Flush) {
+			flush = true
+		}
+		if first {
+			// Sends a HeadersFrame to server to start a new stream.
+			p := http2.HeadersFrameParam{
+				StreamID:      s.id,
+				BlockFragment: t.hBuf.Next(size),
+				EndStream:     false,
+				EndHeaders:    endHeaders,
+			}
+			// Do a force flush for the buffered frames iff it is the last headers frame
+			// and there is header metadata to be sent. Otherwise, there is flushing until
+			// the corresponding data frame is written.
+			err = t.framer.writeHeaders(flush, p)
+			first = false
+		} else {
+			// Sends Continuation frames for the leftover headers.
+			err = t.framer.writeContinuation(flush, s.id, endHeaders, t.hBuf.Next(size))
+		}
+		if err != nil {
+			t.notifyError(err)
+			return nil, ConnectionErrorf("transport: %v", err)
+		}
+	}
+	t.writableChan <- 0
+	return s, nil
+}
+
+// CloseStream clears the footprint of a stream when the stream is not needed any more.
+// This must not be executed in reader's goroutine.
+func (t *http2Client) CloseStream(s *Stream, err error) {
+	var updateStreams bool
+	t.mu.Lock()
+	if t.streamsQuota != nil {
+		updateStreams = true
+	}
+	delete(t.activeStreams, s.id)
+	t.mu.Unlock()
+	if updateStreams {
+		t.streamsQuota.add(1)
+	}
+	// In case stream sending and receiving are invoked in separate
+	// goroutines (e.g., bi-directional streaming), the caller needs
+	// to call cancel on the stream to interrupt the blocking on
+	// other goroutines.
+	s.cancel()
+	s.mu.Lock()
+	if q := s.fc.restoreConn(); q > 0 {
+		t.controlBuf.put(&windowUpdate{0, q})
+	}
+	if s.state == streamDone {
+		s.mu.Unlock()
+		return
+	}
+	if !s.headerDone {
+		close(s.headerChan)
+		s.headerDone = true
+	}
+	s.state = streamDone
+	s.mu.Unlock()
+	if _, ok := err.(StreamError); ok {
+		t.controlBuf.put(&resetStream{s.id, http2.ErrCodeCancel})
+	}
+}
+
+// Close kicks off the shutdown process of the transport. This should be called
+// only once on a transport. Once it is called, the transport should not be
+// accessed any more.
+func (t *http2Client) Close() (err error) {
+	t.mu.Lock()
+	if t.state == closing {
+		t.mu.Unlock()
+		return errors.New("transport: Close() was already called")
+	}
+	t.state = closing
+	t.mu.Unlock()
+	close(t.shutdownChan)
+	err = t.conn.Close()
+	t.mu.Lock()
+	streams := t.activeStreams
+	t.activeStreams = nil
+	t.mu.Unlock()
+	// Notify all active streams.
+	for _, s := range streams {
+		s.mu.Lock()
+		if !s.headerDone {
+			close(s.headerChan)
+			s.headerDone = true
+		}
+		s.mu.Unlock()
+		s.write(recvMsg{err: ErrConnClosing})
+	}
+	return
+}
+
+// Write formats the data into HTTP2 data frame(s) and sends it out. The caller
+// should proceed only if Write returns nil.
+// TODO(zhaoq): opts.Delay is ignored in this implementation. Support it later
+// if it improves the performance.
+func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
+	r := bytes.NewBuffer(data)
+	for {
+		var p []byte
+		if r.Len() > 0 {
+			size := http2MaxFrameLen
+			s.sendQuotaPool.add(0)
+			// Wait until the stream has some quota to send the data.
+			sq, err := wait(s.ctx, t.shutdownChan, s.sendQuotaPool.acquire())
+			if err != nil {
+				return err
+			}
+			t.sendQuotaPool.add(0)
+			// Wait until the transport has some quota to send the data.
+			tq, err := wait(s.ctx, t.shutdownChan, t.sendQuotaPool.acquire())
+			if err != nil {
+				if _, ok := err.(StreamError); ok {
+					t.sendQuotaPool.cancel()
+				}
+				return err
+			}
+			if sq < size {
+				size = sq
+			}
+			if tq < size {
+				size = tq
+			}
+			p = r.Next(size)
+			ps := len(p)
+			if ps < sq {
+				// Overbooked stream quota. Return it back.
+				s.sendQuotaPool.add(sq - ps)
+			}
+			if ps < tq {
+				// Overbooked transport quota. Return it back.
+				t.sendQuotaPool.add(tq - ps)
+			}
+		}
+		var (
+			endStream  bool
+			forceFlush bool
+		)
+		if opts.Last && r.Len() == 0 {
+			endStream = true
+		}
+		// Indicate there is a writer who is about to write a data frame.
+		t.framer.adjustNumWriters(1)
+		// Got some quota. Try to acquire writing privilege on the transport.
+		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+			if t.framer.adjustNumWriters(-1) == 0 {
+				// This writer is the last one in this batch and has the
+				// responsibility to flush the buffered frames. It queues
+				// a flush request to controlBuf instead of flushing directly
+				// in order to avoid the race with other writing or flushing.
+				t.controlBuf.put(&flushIO{})
+			}
+			return err
+		}
+		if r.Len() == 0 && t.framer.adjustNumWriters(0) == 1 {
+			// Do a force flush iff this is last frame for the entire gRPC message
+			// and the caller is the only writer at this moment.
+			forceFlush = true
+		}
+		// If WriteData fails, all the pending streams will be handled
+		// by http2Client.Close(). No explicit CloseStream() needs to be
+		// invoked.
+		if err := t.framer.writeData(forceFlush, s.id, endStream, p); err != nil {
+			t.notifyError(err)
+			return ConnectionErrorf("transport: %v", err)
+		}
+		if t.framer.adjustNumWriters(-1) == 0 {
+			t.framer.flushWrite()
+		}
+		t.writableChan <- 0
+		if r.Len() == 0 {
+			break
+		}
+	}
+	if !opts.Last {
+		return nil
+	}
+	s.mu.Lock()
+	if s.state != streamDone {
+		if s.state == streamReadDone {
+			s.state = streamDone
+		} else {
+			s.state = streamWriteDone
+		}
+	}
+	s.mu.Unlock()
+	return nil
+}
+
+func (t *http2Client) getStream(f http2.Frame) (*Stream, bool) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	if t.activeStreams == nil {
+		// The transport is closing.
+		return nil, false
+	}
+	if s, ok := t.activeStreams[f.Header().StreamID]; ok {
+		return s, true
+	}
+	return nil, false
+}
+
+// updateWindow adjusts the inbound quota for the stream and the transport.
+// Window updates will deliver to the controller for sending when
+// the cumulative quota exceeds the corresponding threshold.
+func (t *http2Client) updateWindow(s *Stream, n uint32) {
+	swu, cwu := s.fc.onRead(n)
+	if swu > 0 {
+		t.controlBuf.put(&windowUpdate{s.id, swu})
+	}
+	if cwu > 0 {
+		t.controlBuf.put(&windowUpdate{0, cwu})
+	}
+}
+
+func (t *http2Client) handleData(f *http2.DataFrame) {
+	// Select the right stream to dispatch.
+	s, ok := t.getStream(f)
+	if !ok {
+		return
+	}
+	size := len(f.Data())
+	if size > 0 {
+		if err := s.fc.onData(uint32(size)); err != nil {
+			if _, ok := err.(ConnectionError); ok {
+				t.notifyError(err)
+				return
+			}
+			s.mu.Lock()
+			if s.state == streamDone {
+				s.mu.Unlock()
+				return
+			}
+			s.state = streamDone
+			s.statusCode = codes.Internal
+			s.statusDesc = err.Error()
+			s.mu.Unlock()
+			s.write(recvMsg{err: io.EOF})
+			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeFlowControl})
+			return
+		}
+		// TODO(bradfitz, zhaoq): A copy is required here because there is no
+		// guarantee f.Data() is consumed before the arrival of next frame.
+		// Can this copy be eliminated?
+		data := make([]byte, size)
+		copy(data, f.Data())
+		s.write(recvMsg{data: data})
+	}
+	// The server has closed the stream without sending trailers.  Record that
+	// the read direction is closed, and set the status appropriately.
+	if f.FrameHeader.Flags.Has(http2.FlagDataEndStream) {
+		s.mu.Lock()
+		if s.state == streamWriteDone {
+			s.state = streamDone
+		} else {
+			s.state = streamReadDone
+		}
+		s.statusCode = codes.Internal
+		s.statusDesc = "server closed the stream without sending trailers"
+		s.mu.Unlock()
+		s.write(recvMsg{err: io.EOF})
+	}
+}
+
+func (t *http2Client) handleRSTStream(f *http2.RSTStreamFrame) {
+	s, ok := t.getStream(f)
+	if !ok {
+		return
+	}
+	s.mu.Lock()
+	if s.state == streamDone {
+		s.mu.Unlock()
+		return
+	}
+	s.state = streamDone
+	if !s.headerDone {
+		close(s.headerChan)
+		s.headerDone = true
+	}
+	s.statusCode, ok = http2ErrConvTab[http2.ErrCode(f.ErrCode)]
+	if !ok {
+		grpclog.Println("transport: http2Client.handleRSTStream found no mapped gRPC status for the received http2 error ", f.ErrCode)
+	}
+	s.mu.Unlock()
+	s.write(recvMsg{err: io.EOF})
+}
+
+func (t *http2Client) handleSettings(f *http2.SettingsFrame) {
+	if f.IsAck() {
+		return
+	}
+	var ss []http2.Setting
+	f.ForeachSetting(func(s http2.Setting) error {
+		ss = append(ss, s)
+		return nil
+	})
+	// The settings will be applied once the ack is sent.
+	t.controlBuf.put(&settings{ack: true, ss: ss})
+}
+
+func (t *http2Client) handlePing(f *http2.PingFrame) {
+	pingAck := &ping{ack: true}
+	copy(pingAck.data[:], f.Data[:])
+	t.controlBuf.put(pingAck)
+}
+
+func (t *http2Client) handleGoAway(f *http2.GoAwayFrame) {
+	// TODO(zhaoq): GoAwayFrame handler to be implemented
+}
+
+func (t *http2Client) handleWindowUpdate(f *http2.WindowUpdateFrame) {
+	id := f.Header().StreamID
+	incr := f.Increment
+	if id == 0 {
+		t.sendQuotaPool.add(int(incr))
+		return
+	}
+	if s, ok := t.getStream(f); ok {
+		s.sendQuotaPool.add(int(incr))
+	}
+}
+
+// operateHeader takes action on the decoded headers. It returns the current
+// stream if there are remaining headers on the wire (in the following
+// Continuation frame).
+func (t *http2Client) operateHeaders(hDec *hpackDecoder, s *Stream, frame headerFrame, endStream bool) (pendingStream *Stream) {
+	defer func() {
+		if pendingStream == nil {
+			hDec.state = decodeState{}
+		}
+	}()
+	endHeaders, err := hDec.decodeClientHTTP2Headers(frame)
+	if s == nil {
+		// s has been closed.
+		return nil
+	}
+	if err != nil {
+		s.write(recvMsg{err: err})
+		// Something wrong. Stops reading even when there is remaining.
+		return nil
+	}
+	if !endHeaders {
+		return s
+	}
+	s.mu.Lock()
+	if !endStream {
+		s.recvCompress = hDec.state.encoding
+	}
+	if !s.headerDone {
+		if !endStream && len(hDec.state.mdata) > 0 {
+			s.header = hDec.state.mdata
+		}
+		close(s.headerChan)
+		s.headerDone = true
+	}
+	if !endStream || s.state == streamDone {
+		s.mu.Unlock()
+		return nil
+	}
+
+	if len(hDec.state.mdata) > 0 {
+		s.trailer = hDec.state.mdata
+	}
+	s.state = streamDone
+	s.statusCode = hDec.state.statusCode
+	s.statusDesc = hDec.state.statusDesc
+	s.mu.Unlock()
+
+	s.write(recvMsg{err: io.EOF})
+	return nil
+}
+
+// reader runs as a separate goroutine in charge of reading data from network
+// connection.
+//
+// TODO(zhaoq): currently one reader per transport. Investigate whether this is
+// optimal.
+// TODO(zhaoq): Check the validity of the incoming frame sequence.
+func (t *http2Client) reader() {
+	// Check the validity of server preface.
+	frame, err := t.framer.readFrame()
+	if err != nil {
+		t.notifyError(err)
+		return
+	}
+	sf, ok := frame.(*http2.SettingsFrame)
+	if !ok {
+		t.notifyError(err)
+		return
+	}
+	t.handleSettings(sf)
+
+	hDec := newHPACKDecoder()
+	var curStream *Stream
+	// loop to keep reading incoming messages on this transport.
+	for {
+		frame, err := t.framer.readFrame()
+		if err != nil {
+			t.notifyError(err)
+			return
+		}
+		switch frame := frame.(type) {
+		case *http2.HeadersFrame:
+			// operateHeaders has to be invoked regardless the value of curStream
+			// because the HPACK decoder needs to be updated using the received
+			// headers.
+			curStream, _ = t.getStream(frame)
+			endStream := frame.Header().Flags.Has(http2.FlagHeadersEndStream)
+			curStream = t.operateHeaders(hDec, curStream, frame, endStream)
+		case *http2.ContinuationFrame:
+			curStream = t.operateHeaders(hDec, curStream, frame, frame.HeadersEnded())
+		case *http2.DataFrame:
+			t.handleData(frame)
+		case *http2.RSTStreamFrame:
+			t.handleRSTStream(frame)
+		case *http2.SettingsFrame:
+			t.handleSettings(frame)
+		case *http2.PingFrame:
+			t.handlePing(frame)
+		case *http2.GoAwayFrame:
+			t.handleGoAway(frame)
+		case *http2.WindowUpdateFrame:
+			t.handleWindowUpdate(frame)
+		default:
+			grpclog.Printf("transport: http2Client.reader got unhandled frame type %v.", frame)
+		}
+	}
+}
+
+func (t *http2Client) applySettings(ss []http2.Setting) {
+	for _, s := range ss {
+		switch s.ID {
+		case http2.SettingMaxConcurrentStreams:
+			// TODO(zhaoq): This is a hack to avoid significant refactoring of the
+			// code to deal with the unrealistic int32 overflow. Probably will try
+			// to find a better way to handle this later.
+			if s.Val > math.MaxInt32 {
+				s.Val = math.MaxInt32
+			}
+			t.mu.Lock()
+			reset := t.streamsQuota != nil
+			if !reset {
+				t.streamsQuota = newQuotaPool(int(s.Val) - len(t.activeStreams))
+			}
+			ms := t.maxStreams
+			t.maxStreams = int(s.Val)
+			t.mu.Unlock()
+			if reset {
+				t.streamsQuota.reset(int(s.Val) - ms)
+			}
+		case http2.SettingInitialWindowSize:
+			t.mu.Lock()
+			for _, stream := range t.activeStreams {
+				// Adjust the sending quota for each stream.
+				stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
+			}
+			t.streamSendQuota = s.Val
+			t.mu.Unlock()
+		}
+	}
+}
+
+// controller running in a separate goroutine takes charge of sending control
+// frames (e.g., window update, reset stream, setting, etc.) to the server.
+func (t *http2Client) controller() {
+	for {
+		select {
+		case i := <-t.controlBuf.get():
+			t.controlBuf.load()
+			select {
+			case <-t.writableChan:
+				switch i := i.(type) {
+				case *windowUpdate:
+					t.framer.writeWindowUpdate(true, i.streamID, i.increment)
+				case *settings:
+					if i.ack {
+						t.framer.writeSettingsAck(true)
+						t.applySettings(i.ss)
+					} else {
+						t.framer.writeSettings(true, i.ss...)
+					}
+				case *resetStream:
+					t.framer.writeRSTStream(true, i.streamID, i.code)
+				case *flushIO:
+					t.framer.flushWrite()
+				case *ping:
+					t.framer.writePing(true, i.ack, i.data)
+				default:
+					grpclog.Printf("transport: http2Client.controller got unexpected item type %v\n", i)
+				}
+				t.writableChan <- 0
+				continue
+			case <-t.shutdownChan:
+				return
+			}
+		case <-t.shutdownChan:
+			return
+		}
+	}
+}
+
+func (t *http2Client) Error() <-chan struct{} {
+	return t.errorChan
+}
+
+func (t *http2Client) notifyError(err error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	// make sure t.errorChan is closed only once.
+	if t.state == reachable {
+		t.state = unreachable
+		close(t.errorChan)
+		grpclog.Printf("transport: http2Client.notifyError got notified that the client transport was broken %v.", err)
+	}
+}
diff --git a/vendor/google.golang.org/grpc/transport/http2_server.go b/vendor/google.golang.org/grpc/transport/http2_server.go
new file mode 100644
index 0000000000..b9d4959fea
--- /dev/null
+++ b/vendor/google.golang.org/grpc/transport/http2_server.go
@@ -0,0 +1,707 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package transport
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"math"
+	"net"
+	"strconv"
+	"sync"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/peer"
+)
+
+// ErrIllegalHeaderWrite indicates that setting header is illegal because of
+// the stream's state.
+var ErrIllegalHeaderWrite = errors.New("transport: the stream is done or WriteHeader was already called")
+
+// http2Server implements the ServerTransport interface with HTTP2.
+type http2Server struct {
+	conn        net.Conn
+	maxStreamID uint32               // max stream ID ever seen
+	authInfo    credentials.AuthInfo // auth info about the connection
+	// writableChan synchronizes write access to the transport.
+	// A writer acquires the write lock by receiving a value on writableChan
+	// and releases it by sending on writableChan.
+	writableChan chan int
+	// shutdownChan is closed when Close is called.
+	// Blocking operations should select on shutdownChan to avoid
+	// blocking forever after Close.
+	shutdownChan chan struct{}
+	framer       *framer
+	hBuf         *bytes.Buffer  // the buffer for HPACK encoding
+	hEnc         *hpack.Encoder // HPACK encoder
+
+	// The max number of concurrent streams.
+	maxStreams uint32
+	// controlBuf delivers all the control related tasks (e.g., window
+	// updates, reset streams, and various settings) to the controller.
+	controlBuf *recvBuffer
+	fc         *inFlow
+	// sendQuotaPool provides flow control to outbound message.
+	sendQuotaPool *quotaPool
+
+	mu            sync.Mutex // guard the following
+	state         transportState
+	activeStreams map[uint32]*Stream
+	// the per-stream outbound flow control window size set by the peer.
+	streamSendQuota uint32
+}
+
+// newHTTP2Server constructs a ServerTransport based on HTTP2. ConnectionError is
+// returned if something goes wrong.
+func newHTTP2Server(conn net.Conn, maxStreams uint32, authInfo credentials.AuthInfo) (_ ServerTransport, err error) {
+	framer := newFramer(conn)
+	// Send initial settings as connection preface to client.
+	var settings []http2.Setting
+	// TODO(zhaoq): Have a better way to signal "no limit" because 0 is
+	// permitted in the HTTP2 spec.
+	if maxStreams == 0 {
+		maxStreams = math.MaxUint32
+	} else {
+		settings = append(settings, http2.Setting{http2.SettingMaxConcurrentStreams, maxStreams})
+	}
+	if initialWindowSize != defaultWindowSize {
+		settings = append(settings, http2.Setting{http2.SettingInitialWindowSize, uint32(initialWindowSize)})
+	}
+	if err := framer.writeSettings(true, settings...); err != nil {
+		return nil, ConnectionErrorf("transport: %v", err)
+	}
+	// Adjust the connection flow control window if needed.
+	if delta := uint32(initialConnWindowSize - defaultWindowSize); delta > 0 {
+		if err := framer.writeWindowUpdate(true, 0, delta); err != nil {
+			return nil, ConnectionErrorf("transport: %v", err)
+		}
+	}
+	var buf bytes.Buffer
+	t := &http2Server{
+		conn:            conn,
+		authInfo:        authInfo,
+		framer:          framer,
+		hBuf:            &buf,
+		hEnc:            hpack.NewEncoder(&buf),
+		maxStreams:      maxStreams,
+		controlBuf:      newRecvBuffer(),
+		fc:              &inFlow{limit: initialConnWindowSize},
+		sendQuotaPool:   newQuotaPool(defaultWindowSize),
+		state:           reachable,
+		writableChan:    make(chan int, 1),
+		shutdownChan:    make(chan struct{}),
+		activeStreams:   make(map[uint32]*Stream),
+		streamSendQuota: defaultWindowSize,
+	}
+	go t.controller()
+	t.writableChan <- 0
+	return t, nil
+}
+
+// operateHeader takes action on the decoded headers. It returns the current
+// stream if there are remaining headers on the wire (in the following
+// Continuation frame).
+func (t *http2Server) operateHeaders(hDec *hpackDecoder, s *Stream, frame headerFrame, endStream bool, handle func(*Stream)) (pendingStream *Stream) {
+	defer func() {
+		if pendingStream == nil {
+			hDec.state = decodeState{}
+		}
+	}()
+	endHeaders, err := hDec.decodeServerHTTP2Headers(frame)
+	if s == nil {
+		// s has been closed.
+		return nil
+	}
+	if err != nil {
+		grpclog.Printf("transport: http2Server.operateHeader found %v", err)
+		if se, ok := err.(StreamError); ok {
+			t.controlBuf.put(&resetStream{s.id, statusCodeConvTab[se.Code]})
+		}
+		return nil
+	}
+	if endStream {
+		// s is just created by the caller. No lock needed.
+		s.state = streamReadDone
+	}
+	if !endHeaders {
+		return s
+	}
+	s.recvCompress = hDec.state.encoding
+	if hDec.state.timeoutSet {
+		s.ctx, s.cancel = context.WithTimeout(context.TODO(), hDec.state.timeout)
+	} else {
+		s.ctx, s.cancel = context.WithCancel(context.TODO())
+	}
+	pr := &peer.Peer{
+		Addr: t.conn.RemoteAddr(),
+	}
+	// Attach Auth info if there is any.
+	if t.authInfo != nil {
+		pr.AuthInfo = t.authInfo
+	}
+	s.ctx = peer.NewContext(s.ctx, pr)
+	// Cache the current stream to the context so that the server application
+	// can find out. Required when the server wants to send some metadata
+	// back to the client (unary call only).
+	s.ctx = newContextWithStream(s.ctx, s)
+	// Attach the received metadata to the context.
+	if len(hDec.state.mdata) > 0 {
+		s.ctx = metadata.NewContext(s.ctx, hDec.state.mdata)
+	}
+
+	s.dec = &recvBufferReader{
+		ctx:  s.ctx,
+		recv: s.buf,
+	}
+	s.recvCompress = hDec.state.encoding
+	s.method = hDec.state.method
+	t.mu.Lock()
+	if t.state != reachable {
+		t.mu.Unlock()
+		return nil
+	}
+	if uint32(len(t.activeStreams)) >= t.maxStreams {
+		t.mu.Unlock()
+		t.controlBuf.put(&resetStream{s.id, http2.ErrCodeRefusedStream})
+		return nil
+	}
+	s.sendQuotaPool = newQuotaPool(int(t.streamSendQuota))
+	t.activeStreams[s.id] = s
+	t.mu.Unlock()
+	s.windowHandler = func(n int) {
+		t.updateWindow(s, uint32(n))
+	}
+	handle(s)
+	return nil
+}
+
+// HandleStreams receives incoming streams using the given handler. This is
+// typically run in a separate goroutine.
+func (t *http2Server) HandleStreams(handle func(*Stream)) {
+	// Check the validity of client preface.
+	preface := make([]byte, len(clientPreface))
+	if _, err := io.ReadFull(t.conn, preface); err != nil {
+		grpclog.Printf("transport: http2Server.HandleStreams failed to receive the preface from client: %v", err)
+		t.Close()
+		return
+	}
+	if !bytes.Equal(preface, clientPreface) {
+		grpclog.Printf("transport: http2Server.HandleStreams received bogus greeting from client: %q", preface)
+		t.Close()
+		return
+	}
+
+	frame, err := t.framer.readFrame()
+	if err != nil {
+		grpclog.Printf("transport: http2Server.HandleStreams failed to read frame: %v", err)
+		t.Close()
+		return
+	}
+	sf, ok := frame.(*http2.SettingsFrame)
+	if !ok {
+		grpclog.Printf("transport: http2Server.HandleStreams saw invalid preface type %T from client", frame)
+		t.Close()
+		return
+	}
+	t.handleSettings(sf)
+
+	hDec := newHPACKDecoder()
+	var curStream *Stream
+	for {
+		frame, err := t.framer.readFrame()
+		if err != nil {
+			t.Close()
+			return
+		}
+		switch frame := frame.(type) {
+		case *http2.HeadersFrame:
+			id := frame.Header().StreamID
+			if id%2 != 1 || id <= t.maxStreamID {
+				// illegal gRPC stream id.
+				grpclog.Println("transport: http2Server.HandleStreams received an illegal stream id: ", id)
+				t.Close()
+				break
+			}
+			t.maxStreamID = id
+			buf := newRecvBuffer()
+			fc := &inFlow{
+				limit: initialWindowSize,
+				conn:  t.fc,
+			}
+			curStream = &Stream{
+				id:  frame.Header().StreamID,
+				st:  t,
+				buf: buf,
+				fc:  fc,
+			}
+			endStream := frame.Header().Flags.Has(http2.FlagHeadersEndStream)
+			curStream = t.operateHeaders(hDec, curStream, frame, endStream, handle)
+		case *http2.ContinuationFrame:
+			curStream = t.operateHeaders(hDec, curStream, frame, frame.HeadersEnded(), handle)
+		case *http2.DataFrame:
+			t.handleData(frame)
+		case *http2.RSTStreamFrame:
+			t.handleRSTStream(frame)
+		case *http2.SettingsFrame:
+			t.handleSettings(frame)
+		case *http2.PingFrame:
+			t.handlePing(frame)
+		case *http2.WindowUpdateFrame:
+			t.handleWindowUpdate(frame)
+		case *http2.GoAwayFrame:
+			break
+		default:
+			grpclog.Printf("transport: http2Server.HandleStreams found unhandled frame type %v.", frame)
+		}
+	}
+}
+
+func (t *http2Server) getStream(f http2.Frame) (*Stream, bool) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	if t.activeStreams == nil {
+		// The transport is closing.
+		return nil, false
+	}
+	s, ok := t.activeStreams[f.Header().StreamID]
+	if !ok {
+		// The stream is already done.
+		return nil, false
+	}
+	return s, true
+}
+
+// updateWindow adjusts the inbound quota for the stream and the transport.
+// Window updates will deliver to the controller for sending when
+// the cumulative quota exceeds the corresponding threshold.
+func (t *http2Server) updateWindow(s *Stream, n uint32) {
+	swu, cwu := s.fc.onRead(n)
+	if swu > 0 {
+		t.controlBuf.put(&windowUpdate{s.id, swu})
+	}
+	if cwu > 0 {
+		t.controlBuf.put(&windowUpdate{0, cwu})
+	}
+}
+
+func (t *http2Server) handleData(f *http2.DataFrame) {
+	// Select the right stream to dispatch.
+	s, ok := t.getStream(f)
+	if !ok {
+		return
+	}
+	size := len(f.Data())
+	if size > 0 {
+		if err := s.fc.onData(uint32(size)); err != nil {
+			if _, ok := err.(ConnectionError); ok {
+				grpclog.Printf("transport: http2Server %v", err)
+				t.Close()
+				return
+			}
+			t.closeStream(s)
+			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeFlowControl})
+			return
+		}
+		// TODO(bradfitz, zhaoq): A copy is required here because there is no
+		// guarantee f.Data() is consumed before the arrival of next frame.
+		// Can this copy be eliminated?
+		data := make([]byte, size)
+		copy(data, f.Data())
+		s.write(recvMsg{data: data})
+	}
+	if f.Header().Flags.Has(http2.FlagDataEndStream) {
+		// Received the end of stream from the client.
+		s.mu.Lock()
+		if s.state != streamDone {
+			if s.state == streamWriteDone {
+				s.state = streamDone
+			} else {
+				s.state = streamReadDone
+			}
+		}
+		s.mu.Unlock()
+		s.write(recvMsg{err: io.EOF})
+	}
+}
+
+func (t *http2Server) handleRSTStream(f *http2.RSTStreamFrame) {
+	s, ok := t.getStream(f)
+	if !ok {
+		return
+	}
+	t.closeStream(s)
+}
+
+func (t *http2Server) handleSettings(f *http2.SettingsFrame) {
+	if f.IsAck() {
+		return
+	}
+	var ss []http2.Setting
+	f.ForeachSetting(func(s http2.Setting) error {
+		ss = append(ss, s)
+		return nil
+	})
+	// The settings will be applied once the ack is sent.
+	t.controlBuf.put(&settings{ack: true, ss: ss})
+}
+
+func (t *http2Server) handlePing(f *http2.PingFrame) {
+	pingAck := &ping{ack: true}
+	copy(pingAck.data[:], f.Data[:])
+	t.controlBuf.put(pingAck)
+}
+
+func (t *http2Server) handleWindowUpdate(f *http2.WindowUpdateFrame) {
+	id := f.Header().StreamID
+	incr := f.Increment
+	if id == 0 {
+		t.sendQuotaPool.add(int(incr))
+		return
+	}
+	if s, ok := t.getStream(f); ok {
+		s.sendQuotaPool.add(int(incr))
+	}
+}
+
+func (t *http2Server) writeHeaders(s *Stream, b *bytes.Buffer, endStream bool) error {
+	first := true
+	endHeaders := false
+	var err error
+	// Sends the headers in a single batch.
+	for !endHeaders {
+		size := t.hBuf.Len()
+		if size > http2MaxFrameLen {
+			size = http2MaxFrameLen
+		} else {
+			endHeaders = true
+		}
+		if first {
+			p := http2.HeadersFrameParam{
+				StreamID:      s.id,
+				BlockFragment: b.Next(size),
+				EndStream:     endStream,
+				EndHeaders:    endHeaders,
+			}
+			err = t.framer.writeHeaders(endHeaders, p)
+			first = false
+		} else {
+			err = t.framer.writeContinuation(endHeaders, s.id, endHeaders, b.Next(size))
+		}
+		if err != nil {
+			t.Close()
+			return ConnectionErrorf("transport: %v", err)
+		}
+	}
+	return nil
+}
+
+// WriteHeader sends the header metedata md back to the client.
+func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
+	s.mu.Lock()
+	if s.headerOk || s.state == streamDone {
+		s.mu.Unlock()
+		return ErrIllegalHeaderWrite
+	}
+	s.headerOk = true
+	s.mu.Unlock()
+	if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+		return err
+	}
+	t.hBuf.Reset()
+	t.hEnc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
+	t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
+	if s.sendCompress != "" {
+		t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-encoding", Value: s.sendCompress})
+	}
+	for k, v := range md {
+		for _, entry := range v {
+			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+		}
+	}
+	if err := t.writeHeaders(s, t.hBuf, false); err != nil {
+		return err
+	}
+	t.writableChan <- 0
+	return nil
+}
+
+// WriteStatus sends stream status to the client and terminates the stream.
+// There is no further I/O operations being able to perform on this stream.
+// TODO(zhaoq): Now it indicates the end of entire stream. Revisit if early
+// OK is adopted.
+func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc string) error {
+	var headersSent bool
+	s.mu.Lock()
+	if s.state == streamDone {
+		s.mu.Unlock()
+		return nil
+	}
+	if s.headerOk {
+		headersSent = true
+	}
+	s.mu.Unlock()
+	if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+		return err
+	}
+	t.hBuf.Reset()
+	if !headersSent {
+		t.hEnc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
+		t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
+	}
+	t.hEnc.WriteField(
+		hpack.HeaderField{
+			Name:  "grpc-status",
+			Value: strconv.Itoa(int(statusCode)),
+		})
+	t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-message", Value: statusDesc})
+	// Attach the trailer metadata.
+	for k, v := range s.trailer {
+		for _, entry := range v {
+			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+		}
+	}
+	if err := t.writeHeaders(s, t.hBuf, true); err != nil {
+		t.Close()
+		return err
+	}
+	t.closeStream(s)
+	t.writableChan <- 0
+	return nil
+}
+
+// Write converts the data into HTTP2 data frame and sends it out. Non-nil error
+// is returns if it fails (e.g., framing error, transport error).
+func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
+	// TODO(zhaoq): Support multi-writers for a single stream.
+	var writeHeaderFrame bool
+	s.mu.Lock()
+	if !s.headerOk {
+		writeHeaderFrame = true
+		s.headerOk = true
+	}
+	s.mu.Unlock()
+	if writeHeaderFrame {
+		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+			return err
+		}
+		t.hBuf.Reset()
+		t.hEnc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
+		t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
+		if s.sendCompress != "" {
+			t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-encoding", Value: s.sendCompress})
+		}
+		p := http2.HeadersFrameParam{
+			StreamID:      s.id,
+			BlockFragment: t.hBuf.Bytes(),
+			EndHeaders:    true,
+		}
+		if err := t.framer.writeHeaders(false, p); err != nil {
+			t.Close()
+			return ConnectionErrorf("transport: %v", err)
+		}
+		t.writableChan <- 0
+	}
+	r := bytes.NewBuffer(data)
+	for {
+		if r.Len() == 0 {
+			return nil
+		}
+		size := http2MaxFrameLen
+		s.sendQuotaPool.add(0)
+		// Wait until the stream has some quota to send the data.
+		sq, err := wait(s.ctx, t.shutdownChan, s.sendQuotaPool.acquire())
+		if err != nil {
+			return err
+		}
+		t.sendQuotaPool.add(0)
+		// Wait until the transport has some quota to send the data.
+		tq, err := wait(s.ctx, t.shutdownChan, t.sendQuotaPool.acquire())
+		if err != nil {
+			if _, ok := err.(StreamError); ok {
+				t.sendQuotaPool.cancel()
+			}
+			return err
+		}
+		if sq < size {
+			size = sq
+		}
+		if tq < size {
+			size = tq
+		}
+		p := r.Next(size)
+		ps := len(p)
+		if ps < sq {
+			// Overbooked stream quota. Return it back.
+			s.sendQuotaPool.add(sq - ps)
+		}
+		if ps < tq {
+			// Overbooked transport quota. Return it back.
+			t.sendQuotaPool.add(tq - ps)
+		}
+		t.framer.adjustNumWriters(1)
+		// Got some quota. Try to acquire writing privilege on the
+		// transport.
+		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+			if t.framer.adjustNumWriters(-1) == 0 {
+				// This writer is the last one in this batch and has the
+				// responsibility to flush the buffered frames. It queues
+				// a flush request to controlBuf instead of flushing directly
+				// in order to avoid the race with other writing or flushing.
+				t.controlBuf.put(&flushIO{})
+			}
+			return err
+		}
+		var forceFlush bool
+		if r.Len() == 0 && t.framer.adjustNumWriters(0) == 1 && !opts.Last {
+			forceFlush = true
+		}
+		if err := t.framer.writeData(forceFlush, s.id, false, p); err != nil {
+			t.Close()
+			return ConnectionErrorf("transport: %v", err)
+		}
+		if t.framer.adjustNumWriters(-1) == 0 {
+			t.framer.flushWrite()
+		}
+		t.writableChan <- 0
+	}
+
+}
+
+func (t *http2Server) applySettings(ss []http2.Setting) {
+	for _, s := range ss {
+		if s.ID == http2.SettingInitialWindowSize {
+			t.mu.Lock()
+			defer t.mu.Unlock()
+			for _, stream := range t.activeStreams {
+				stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
+			}
+			t.streamSendQuota = s.Val
+		}
+
+	}
+}
+
+// controller running in a separate goroutine takes charge of sending control
+// frames (e.g., window update, reset stream, setting, etc.) to the server.
+func (t *http2Server) controller() {
+	for {
+		select {
+		case i := <-t.controlBuf.get():
+			t.controlBuf.load()
+			select {
+			case <-t.writableChan:
+				switch i := i.(type) {
+				case *windowUpdate:
+					t.framer.writeWindowUpdate(true, i.streamID, i.increment)
+				case *settings:
+					if i.ack {
+						t.framer.writeSettingsAck(true)
+						t.applySettings(i.ss)
+					} else {
+						t.framer.writeSettings(true, i.ss...)
+					}
+				case *resetStream:
+					t.framer.writeRSTStream(true, i.streamID, i.code)
+				case *flushIO:
+					t.framer.flushWrite()
+				case *ping:
+					t.framer.writePing(true, i.ack, i.data)
+				default:
+					grpclog.Printf("transport: http2Server.controller got unexpected item type %v\n", i)
+				}
+				t.writableChan <- 0
+				continue
+			case <-t.shutdownChan:
+				return
+			}
+		case <-t.shutdownChan:
+			return
+		}
+	}
+}
+
+// Close starts shutting down the http2Server transport.
+// TODO(zhaoq): Now the destruction is not blocked on any pending streams. This
+// could cause some resource issue. Revisit this later.
+func (t *http2Server) Close() (err error) {
+	t.mu.Lock()
+	if t.state == closing {
+		t.mu.Unlock()
+		return errors.New("transport: Close() was already called")
+	}
+	t.state = closing
+	streams := t.activeStreams
+	t.activeStreams = nil
+	t.mu.Unlock()
+	close(t.shutdownChan)
+	err = t.conn.Close()
+	// Cancel all active streams.
+	for _, s := range streams {
+		s.cancel()
+	}
+	return
+}
+
+// closeStream clears the footprint of a stream when the stream is not needed
+// any more.
+func (t *http2Server) closeStream(s *Stream) {
+	t.mu.Lock()
+	delete(t.activeStreams, s.id)
+	t.mu.Unlock()
+	if q := s.fc.restoreConn(); q > 0 {
+		t.controlBuf.put(&windowUpdate{0, q})
+	}
+	s.mu.Lock()
+	if s.state == streamDone {
+		s.mu.Unlock()
+		return
+	}
+	s.state = streamDone
+	s.mu.Unlock()
+	// In case stream sending and receiving are invoked in separate
+	// goroutines (e.g., bi-directional streaming), cancel needs to be
+	// called to interrupt the potential blocking on other goroutines.
+	s.cancel()
+}
+
+func (t *http2Server) RemoteAddr() net.Addr {
+	return t.conn.RemoteAddr()
+}
diff --git a/vendor/google.golang.org/grpc/transport/http_util.go b/vendor/google.golang.org/grpc/transport/http_util.go
new file mode 100644
index 0000000000..ea7b39bff9
--- /dev/null
+++ b/vendor/google.golang.org/grpc/transport/http_util.go
@@ -0,0 +1,455 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package transport
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"net"
+	"strconv"
+	"strings"
+	"sync/atomic"
+	"time"
+
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
+)
+
+const (
+	// The primary user agent
+	primaryUA = "grpc-go/0.11"
+	// http2MaxFrameLen specifies the max length of a HTTP2 frame.
+	http2MaxFrameLen = 16384 // 16KB frame
+	// http://http2.github.io/http2-spec/#SettingValues
+	http2InitHeaderTableSize = 4096
+	// http2IOBufSize specifies the buffer size for sending frames.
+	http2IOBufSize = 32 * 1024
+)
+
+var (
+	clientPreface   = []byte(http2.ClientPreface)
+	http2ErrConvTab = map[http2.ErrCode]codes.Code{
+		http2.ErrCodeNo:                 codes.Internal,
+		http2.ErrCodeProtocol:           codes.Internal,
+		http2.ErrCodeInternal:           codes.Internal,
+		http2.ErrCodeFlowControl:        codes.ResourceExhausted,
+		http2.ErrCodeSettingsTimeout:    codes.Internal,
+		http2.ErrCodeFrameSize:          codes.Internal,
+		http2.ErrCodeRefusedStream:      codes.Unavailable,
+		http2.ErrCodeCancel:             codes.Canceled,
+		http2.ErrCodeCompression:        codes.Internal,
+		http2.ErrCodeConnect:            codes.Internal,
+		http2.ErrCodeEnhanceYourCalm:    codes.ResourceExhausted,
+		http2.ErrCodeInadequateSecurity: codes.PermissionDenied,
+		http2.ErrCodeHTTP11Required:     codes.FailedPrecondition,
+	}
+	statusCodeConvTab = map[codes.Code]http2.ErrCode{
+		codes.Internal:          http2.ErrCodeInternal,
+		codes.Canceled:          http2.ErrCodeCancel,
+		codes.Unavailable:       http2.ErrCodeRefusedStream,
+		codes.ResourceExhausted: http2.ErrCodeEnhanceYourCalm,
+		codes.PermissionDenied:  http2.ErrCodeInadequateSecurity,
+	}
+)
+
+// Records the states during HPACK decoding. Must be reset once the
+// decoding of the entire headers are finished.
+type decodeState struct {
+	encoding string
+	// statusCode caches the stream status received from the trailer
+	// the server sent. Client side only.
+	statusCode codes.Code
+	statusDesc string
+	// Server side only fields.
+	timeoutSet bool
+	timeout    time.Duration
+	method     string
+	// key-value metadata map from the peer.
+	mdata map[string][]string
+}
+
+// An hpackDecoder decodes HTTP2 headers which may span multiple frames.
+type hpackDecoder struct {
+	h     *hpack.Decoder
+	state decodeState
+	err   error // The err when decoding
+}
+
+// A headerFrame is either a http2.HeaderFrame or http2.ContinuationFrame.
+type headerFrame interface {
+	Header() http2.FrameHeader
+	HeaderBlockFragment() []byte
+	HeadersEnded() bool
+}
+
+// isReservedHeader checks whether hdr belongs to HTTP2 headers
+// reserved by gRPC protocol. Any other headers are classified as the
+// user-specified metadata.
+func isReservedHeader(hdr string) bool {
+	if hdr != "" && hdr[0] == ':' {
+		return true
+	}
+	switch hdr {
+	case "content-type",
+		"grpc-message-type",
+		"grpc-encoding",
+		"grpc-message",
+		"grpc-status",
+		"grpc-timeout",
+		"te":
+		return true
+	default:
+		return false
+	}
+}
+
+func newHPACKDecoder() *hpackDecoder {
+	d := &hpackDecoder{}
+	d.h = hpack.NewDecoder(http2InitHeaderTableSize, func(f hpack.HeaderField) {
+		switch f.Name {
+		case "content-type":
+			if !strings.Contains(f.Value, "application/grpc") {
+				d.err = StreamErrorf(codes.FailedPrecondition, "transport: received the unexpected content-type %q", f.Value)
+				return
+			}
+		case "grpc-encoding":
+			d.state.encoding = f.Value
+		case "grpc-status":
+			code, err := strconv.Atoi(f.Value)
+			if err != nil {
+				d.err = StreamErrorf(codes.Internal, "transport: malformed grpc-status: %v", err)
+				return
+			}
+			d.state.statusCode = codes.Code(code)
+		case "grpc-message":
+			d.state.statusDesc = f.Value
+		case "grpc-timeout":
+			d.state.timeoutSet = true
+			var err error
+			d.state.timeout, err = timeoutDecode(f.Value)
+			if err != nil {
+				d.err = StreamErrorf(codes.Internal, "transport: malformed time-out: %v", err)
+				return
+			}
+		case ":path":
+			d.state.method = f.Value
+		default:
+			if !isReservedHeader(f.Name) {
+				if f.Name == "user-agent" {
+					i := strings.LastIndex(f.Value, " ")
+					if i == -1 {
+						// There is no application user agent string being set.
+						return
+					}
+					// Extract the application user agent string.
+					f.Value = f.Value[:i]
+				}
+				if d.state.mdata == nil {
+					d.state.mdata = make(map[string][]string)
+				}
+				k, v, err := metadata.DecodeKeyValue(f.Name, f.Value)
+				if err != nil {
+					grpclog.Printf("Failed to decode (%q, %q): %v", f.Name, f.Value, err)
+					return
+				}
+				d.state.mdata[k] = append(d.state.mdata[k], v)
+			}
+		}
+	})
+	return d
+}
+
+func (d *hpackDecoder) decodeClientHTTP2Headers(frame headerFrame) (endHeaders bool, err error) {
+	d.err = nil
+	_, err = d.h.Write(frame.HeaderBlockFragment())
+	if err != nil {
+		err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err)
+	}
+
+	if frame.HeadersEnded() {
+		if closeErr := d.h.Close(); closeErr != nil && err == nil {
+			err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr)
+		}
+		endHeaders = true
+	}
+
+	if err == nil && d.err != nil {
+		err = d.err
+	}
+	return
+}
+
+func (d *hpackDecoder) decodeServerHTTP2Headers(frame headerFrame) (endHeaders bool, err error) {
+	d.err = nil
+	_, err = d.h.Write(frame.HeaderBlockFragment())
+	if err != nil {
+		err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err)
+	}
+
+	if frame.HeadersEnded() {
+		if closeErr := d.h.Close(); closeErr != nil && err == nil {
+			err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr)
+		}
+		endHeaders = true
+	}
+
+	if err == nil && d.err != nil {
+		err = d.err
+	}
+	return
+}
+
+type timeoutUnit uint8
+
+const (
+	hour        timeoutUnit = 'H'
+	minute      timeoutUnit = 'M'
+	second      timeoutUnit = 'S'
+	millisecond timeoutUnit = 'm'
+	microsecond timeoutUnit = 'u'
+	nanosecond  timeoutUnit = 'n'
+)
+
+func timeoutUnitToDuration(u timeoutUnit) (d time.Duration, ok bool) {
+	switch u {
+	case hour:
+		return time.Hour, true
+	case minute:
+		return time.Minute, true
+	case second:
+		return time.Second, true
+	case millisecond:
+		return time.Millisecond, true
+	case microsecond:
+		return time.Microsecond, true
+	case nanosecond:
+		return time.Nanosecond, true
+	default:
+	}
+	return
+}
+
+const maxTimeoutValue int64 = 100000000 - 1
+
+// div does integer division and round-up the result. Note that this is
+// equivalent to (d+r-1)/r but has less chance to overflow.
+func div(d, r time.Duration) int64 {
+	if m := d % r; m > 0 {
+		return int64(d/r + 1)
+	}
+	return int64(d / r)
+}
+
+// TODO(zhaoq): It is the simplistic and not bandwidth efficient. Improve it.
+func timeoutEncode(t time.Duration) string {
+	if d := div(t, time.Nanosecond); d <= maxTimeoutValue {
+		return strconv.FormatInt(d, 10) + "n"
+	}
+	if d := div(t, time.Microsecond); d <= maxTimeoutValue {
+		return strconv.FormatInt(d, 10) + "u"
+	}
+	if d := div(t, time.Millisecond); d <= maxTimeoutValue {
+		return strconv.FormatInt(d, 10) + "m"
+	}
+	if d := div(t, time.Second); d <= maxTimeoutValue {
+		return strconv.FormatInt(d, 10) + "S"
+	}
+	if d := div(t, time.Minute); d <= maxTimeoutValue {
+		return strconv.FormatInt(d, 10) + "M"
+	}
+	// Note that maxTimeoutValue * time.Hour > MaxInt64.
+	return strconv.FormatInt(div(t, time.Hour), 10) + "H"
+}
+
+func timeoutDecode(s string) (time.Duration, error) {
+	size := len(s)
+	if size < 2 {
+		return 0, fmt.Errorf("transport: timeout string is too short: %q", s)
+	}
+	unit := timeoutUnit(s[size-1])
+	d, ok := timeoutUnitToDuration(unit)
+	if !ok {
+		return 0, fmt.Errorf("transport: timeout unit is not recognized: %q", s)
+	}
+	t, err := strconv.ParseInt(s[:size-1], 10, 64)
+	if err != nil {
+		return 0, err
+	}
+	return d * time.Duration(t), nil
+}
+
+type framer struct {
+	numWriters int32
+	reader     io.Reader
+	writer     *bufio.Writer
+	fr         *http2.Framer
+}
+
+func newFramer(conn net.Conn) *framer {
+	f := &framer{
+		reader: conn,
+		writer: bufio.NewWriterSize(conn, http2IOBufSize),
+	}
+	f.fr = http2.NewFramer(f.writer, f.reader)
+	return f
+}
+
+func (f *framer) adjustNumWriters(i int32) int32 {
+	return atomic.AddInt32(&f.numWriters, i)
+}
+
+// The following writeXXX functions can only be called when the caller gets
+// unblocked from writableChan channel (i.e., owns the privilege to write).
+
+func (f *framer) writeContinuation(forceFlush bool, streamID uint32, endHeaders bool, headerBlockFragment []byte) error {
+	if err := f.fr.WriteContinuation(streamID, endHeaders, headerBlockFragment); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writeData(forceFlush bool, streamID uint32, endStream bool, data []byte) error {
+	if err := f.fr.WriteData(streamID, endStream, data); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writeGoAway(forceFlush bool, maxStreamID uint32, code http2.ErrCode, debugData []byte) error {
+	if err := f.fr.WriteGoAway(maxStreamID, code, debugData); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writeHeaders(forceFlush bool, p http2.HeadersFrameParam) error {
+	if err := f.fr.WriteHeaders(p); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writePing(forceFlush, ack bool, data [8]byte) error {
+	if err := f.fr.WritePing(ack, data); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writePriority(forceFlush bool, streamID uint32, p http2.PriorityParam) error {
+	if err := f.fr.WritePriority(streamID, p); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writePushPromise(forceFlush bool, p http2.PushPromiseParam) error {
+	if err := f.fr.WritePushPromise(p); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writeRSTStream(forceFlush bool, streamID uint32, code http2.ErrCode) error {
+	if err := f.fr.WriteRSTStream(streamID, code); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writeSettings(forceFlush bool, settings ...http2.Setting) error {
+	if err := f.fr.WriteSettings(settings...); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writeSettingsAck(forceFlush bool) error {
+	if err := f.fr.WriteSettingsAck(); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) writeWindowUpdate(forceFlush bool, streamID, incr uint32) error {
+	if err := f.fr.WriteWindowUpdate(streamID, incr); err != nil {
+		return err
+	}
+	if forceFlush {
+		return f.writer.Flush()
+	}
+	return nil
+}
+
+func (f *framer) flushWrite() error {
+	return f.writer.Flush()
+}
+
+func (f *framer) readFrame() (http2.Frame, error) {
+	return f.fr.ReadFrame()
+}
diff --git a/vendor/google.golang.org/grpc/transport/transport.go b/vendor/google.golang.org/grpc/transport/transport.go
new file mode 100644
index 0000000000..3b934b4dc0
--- /dev/null
+++ b/vendor/google.golang.org/grpc/transport/transport.go
@@ -0,0 +1,510 @@
+/*
+ *
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+Package transport defines and implements message oriented communication channel
+to complete various transactions (e.g., an RPC).
+*/
+package transport // import "google.golang.org/grpc/transport"
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"sync"
+	"time"
+
+	"golang.org/x/net/context"
+	"golang.org/x/net/trace"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/metadata"
+)
+
+// recvMsg represents the received msg from the transport. All transport
+// protocol specific info has been removed.
+type recvMsg struct {
+	data []byte
+	// nil: received some data
+	// io.EOF: stream is completed. data is nil.
+	// other non-nil error: transport failure. data is nil.
+	err error
+}
+
+func (recvMsg) isItem() bool {
+	return true
+}
+
+// All items in an out of a recvBuffer should be the same type.
+type item interface {
+	isItem() bool
+}
+
+// recvBuffer is an unbounded channel of item.
+type recvBuffer struct {
+	c       chan item
+	mu      sync.Mutex
+	backlog []item
+}
+
+func newRecvBuffer() *recvBuffer {
+	b := &recvBuffer{
+		c: make(chan item, 1),
+	}
+	return b
+}
+
+func (b *recvBuffer) put(r item) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	b.backlog = append(b.backlog, r)
+	select {
+	case b.c <- b.backlog[0]:
+		b.backlog = b.backlog[1:]
+	default:
+	}
+}
+
+func (b *recvBuffer) load() {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	if len(b.backlog) > 0 {
+		select {
+		case b.c <- b.backlog[0]:
+			b.backlog = b.backlog[1:]
+		default:
+		}
+	}
+}
+
+// get returns the channel that receives an item in the buffer.
+//
+// Upon receipt of an item, the caller should call load to send another
+// item onto the channel if there is any.
+func (b *recvBuffer) get() <-chan item {
+	return b.c
+}
+
+// recvBufferReader implements io.Reader interface to read the data from
+// recvBuffer.
+type recvBufferReader struct {
+	ctx  context.Context
+	recv *recvBuffer
+	last *bytes.Reader // Stores the remaining data in the previous calls.
+	err  error
+}
+
+// Read reads the next len(p) bytes from last. If last is drained, it tries to
+// read additional data from recv. It blocks if there no additional data available
+// in recv. If Read returns any non-nil error, it will continue to return that error.
+func (r *recvBufferReader) Read(p []byte) (n int, err error) {
+	if r.err != nil {
+		return 0, r.err
+	}
+	defer func() { r.err = err }()
+	if r.last != nil && r.last.Len() > 0 {
+		// Read remaining data left in last call.
+		return r.last.Read(p)
+	}
+	select {
+	case <-r.ctx.Done():
+		return 0, ContextErr(r.ctx.Err())
+	case i := <-r.recv.get():
+		r.recv.load()
+		m := i.(*recvMsg)
+		if m.err != nil {
+			return 0, m.err
+		}
+		r.last = bytes.NewReader(m.data)
+		return r.last.Read(p)
+	}
+}
+
+type streamState uint8
+
+const (
+	streamActive    streamState = iota
+	streamWriteDone             // EndStream sent
+	streamReadDone              // EndStream received
+	streamDone                  // sendDone and recvDone or RSTStreamFrame is sent or received.
+)
+
+// Stream represents an RPC in the transport layer.
+type Stream struct {
+	id uint32
+	// nil for client side Stream.
+	st ServerTransport
+	// ctx is the associated context of the stream.
+	ctx    context.Context
+	cancel context.CancelFunc
+	// method records the associated RPC method of the stream.
+	method       string
+	recvCompress string
+	sendCompress string
+	buf          *recvBuffer
+	dec          io.Reader
+	fc           *inFlow
+	recvQuota    uint32
+	// The accumulated inbound quota pending for window update.
+	updateQuota uint32
+	// The handler to control the window update procedure for both this
+	// particular stream and the associated transport.
+	windowHandler func(int)
+
+	sendQuotaPool *quotaPool
+	// Close headerChan to indicate the end of reception of header metadata.
+	headerChan chan struct{}
+	// header caches the received header metadata.
+	header metadata.MD
+	// The key-value map of trailer metadata.
+	trailer metadata.MD
+
+	mu sync.RWMutex // guard the following
+	// headerOK becomes true from the first header is about to send.
+	headerOk bool
+	state    streamState
+	// true iff headerChan is closed. Used to avoid closing headerChan
+	// multiple times.
+	headerDone bool
+	// the status received from the server.
+	statusCode codes.Code
+	statusDesc string
+}
+
+// RecvCompress returns the compression algorithm applied to the inbound
+// message. It is empty string if there is no compression applied.
+func (s *Stream) RecvCompress() string {
+	return s.recvCompress
+}
+
+// SetSendCompress sets the compression algorithm to the stream.
+func (s *Stream) SetSendCompress(str string) {
+	s.sendCompress = str
+}
+
+// Header acquires the key-value pairs of header metadata once it
+// is available. It blocks until i) the metadata is ready or ii) there is no
+// header metadata or iii) the stream is cancelled/expired.
+func (s *Stream) Header() (metadata.MD, error) {
+	select {
+	case <-s.ctx.Done():
+		return nil, ContextErr(s.ctx.Err())
+	case <-s.headerChan:
+		return s.header.Copy(), nil
+	}
+}
+
+// Trailer returns the cached trailer metedata. Note that if it is not called
+// after the entire stream is done, it could return an empty MD. Client
+// side only.
+func (s *Stream) Trailer() metadata.MD {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	return s.trailer.Copy()
+}
+
+// ServerTransport returns the underlying ServerTransport for the stream.
+// The client side stream always returns nil.
+func (s *Stream) ServerTransport() ServerTransport {
+	return s.st
+}
+
+// Context returns the context of the stream.
+func (s *Stream) Context() context.Context {
+	return s.ctx
+}
+
+// TraceContext recreates the context of s with a trace.Trace.
+func (s *Stream) TraceContext(tr trace.Trace) {
+	s.ctx = trace.NewContext(s.ctx, tr)
+}
+
+// Method returns the method for the stream.
+func (s *Stream) Method() string {
+	return s.method
+}
+
+// StatusCode returns statusCode received from the server.
+func (s *Stream) StatusCode() codes.Code {
+	return s.statusCode
+}
+
+// StatusDesc returns statusDesc received from the server.
+func (s *Stream) StatusDesc() string {
+	return s.statusDesc
+}
+
+// ErrIllegalTrailerSet indicates that the trailer has already been set or it
+// is too late to do so.
+var ErrIllegalTrailerSet = errors.New("transport: trailer has been set")
+
+// SetTrailer sets the trailer metadata which will be sent with the RPC status
+// by the server. This can only be called at most once. Server side only.
+func (s *Stream) SetTrailer(md metadata.MD) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	if s.trailer != nil {
+		return ErrIllegalTrailerSet
+	}
+	s.trailer = md.Copy()
+	return nil
+}
+
+func (s *Stream) write(m recvMsg) {
+	s.buf.put(&m)
+}
+
+// Read reads all the data available for this Stream from the transport and
+// passes them into the decoder, which converts them into a gRPC message stream.
+// The error is io.EOF when the stream is done or another non-nil error if
+// the stream broke.
+func (s *Stream) Read(p []byte) (n int, err error) {
+	n, err = s.dec.Read(p)
+	if err != nil {
+		return
+	}
+	s.windowHandler(n)
+	return
+}
+
+type key int
+
+// The key to save transport.Stream in the context.
+const streamKey = key(0)
+
+// newContextWithStream creates a new context from ctx and attaches stream
+// to it.
+func newContextWithStream(ctx context.Context, stream *Stream) context.Context {
+	return context.WithValue(ctx, streamKey, stream)
+}
+
+// StreamFromContext returns the stream saved in ctx.
+func StreamFromContext(ctx context.Context) (s *Stream, ok bool) {
+	s, ok = ctx.Value(streamKey).(*Stream)
+	return
+}
+
+// state of transport
+type transportState int
+
+const (
+	reachable transportState = iota
+	unreachable
+	closing
+)
+
+// NewServerTransport creates a ServerTransport with conn or non-nil error
+// if it fails.
+func NewServerTransport(protocol string, conn net.Conn, maxStreams uint32, authInfo credentials.AuthInfo) (ServerTransport, error) {
+	return newHTTP2Server(conn, maxStreams, authInfo)
+}
+
+// ConnectOptions covers all relevant options for dialing a server.
+type ConnectOptions struct {
+	// UserAgent is the application user agent.
+	UserAgent string
+	// Dialer specifies how to dial a network address.
+	Dialer func(string, time.Duration) (net.Conn, error)
+	// AuthOptions stores the credentials required to setup a client connection and/or issue RPCs.
+	AuthOptions []credentials.Credentials
+	// Timeout specifies the timeout for dialing a client connection.
+	Timeout time.Duration
+}
+
+// NewClientTransport establishes the transport with the required ConnectOptions
+// and returns it to the caller.
+func NewClientTransport(target string, opts *ConnectOptions) (ClientTransport, error) {
+	return newHTTP2Client(target, opts)
+}
+
+// Options provides additional hints and information for message
+// transmission.
+type Options struct {
+	// Last indicates whether this write is the last piece for
+	// this stream.
+	Last bool
+
+	// Delay is a hint to the transport implementation for whether
+	// the data could be buffered for a batching write. The
+	// Transport implementation may ignore the hint.
+	Delay bool
+}
+
+// CallHdr carries the information of a particular RPC.
+type CallHdr struct {
+	// Host specifies the peer's host.
+	Host string
+
+	// Method specifies the operation to perform.
+	Method string
+
+	// RecvCompress specifies the compression algorithm applied on
+	// inbound messages.
+	RecvCompress string
+
+	// SendCompress specifies the compression algorithm applied on
+	// outbound message.
+	SendCompress string
+
+	// Flush indicates whether a new stream command should be sent
+	// to the peer without waiting for the first data. This is
+	// only a hint. The transport may modify the flush decision
+	// for performance purposes.
+	Flush bool
+}
+
+// ClientTransport is the common interface for all gRPC client-side transport
+// implementations.
+type ClientTransport interface {
+	// Close tears down this transport. Once it returns, the transport
+	// should not be accessed any more. The caller must make sure this
+	// is called only once.
+	Close() error
+
+	// Write sends the data for the given stream. A nil stream indicates
+	// the write is to be performed on the transport as a whole.
+	Write(s *Stream, data []byte, opts *Options) error
+
+	// NewStream creates a Stream for an RPC.
+	NewStream(ctx context.Context, callHdr *CallHdr) (*Stream, error)
+
+	// CloseStream clears the footprint of a stream when the stream is
+	// not needed any more. The err indicates the error incurred when
+	// CloseStream is called. Must be called when a stream is finished
+	// unless the associated transport is closing.
+	CloseStream(stream *Stream, err error)
+
+	// Error returns a channel that is closed when some I/O error
+	// happens. Typically the caller should have a goroutine to monitor
+	// this in order to take action (e.g., close the current transport
+	// and create a new one) in error case. It should not return nil
+	// once the transport is initiated.
+	Error() <-chan struct{}
+}
+
+// ServerTransport is the common interface for all gRPC server-side transport
+// implementations.
+//
+// Methods may be called concurrently from multiple goroutines, but
+// Write methods for a given Stream will be called serially.
+type ServerTransport interface {
+	// HandleStreams receives incoming streams using the given handler.
+	HandleStreams(func(*Stream))
+
+	// WriteHeader sends the header metadata for the given stream.
+	// WriteHeader may not be called on all streams.
+	WriteHeader(s *Stream, md metadata.MD) error
+
+	// Write sends the data for the given stream.
+	// Write may not be called on all streams.
+	Write(s *Stream, data []byte, opts *Options) error
+
+	// WriteStatus sends the status of a stream to the client.
+	// WriteStatus is the final call made on a stream and always
+	// occurs.
+	WriteStatus(s *Stream, statusCode codes.Code, statusDesc string) error
+
+	// Close tears down the transport. Once it is called, the transport
+	// should not be accessed any more. All the pending streams and their
+	// handlers will be terminated asynchronously.
+	Close() error
+
+	// RemoteAddr returns the remote network address.
+	RemoteAddr() net.Addr
+}
+
+// StreamErrorf creates an StreamError with the specified error code and description.
+func StreamErrorf(c codes.Code, format string, a ...interface{}) StreamError {
+	return StreamError{
+		Code: c,
+		Desc: fmt.Sprintf(format, a...),
+	}
+}
+
+// ConnectionErrorf creates an ConnectionError with the specified error description.
+func ConnectionErrorf(format string, a ...interface{}) ConnectionError {
+	return ConnectionError{
+		Desc: fmt.Sprintf(format, a...),
+	}
+}
+
+// ConnectionError is an error that results in the termination of the
+// entire connection and the retry of all the active streams.
+type ConnectionError struct {
+	Desc string
+}
+
+func (e ConnectionError) Error() string {
+	return fmt.Sprintf("connection error: desc = %q", e.Desc)
+}
+
+// Define some common ConnectionErrors.
+var ErrConnClosing = ConnectionError{Desc: "transport is closing"}
+
+// StreamError is an error that only affects one stream within a connection.
+type StreamError struct {
+	Code codes.Code
+	Desc string
+}
+
+func (e StreamError) Error() string {
+	return fmt.Sprintf("stream error: code = %d desc = %q", e.Code, e.Desc)
+}
+
+// ContextErr converts the error from context package into a StreamError.
+func ContextErr(err error) StreamError {
+	switch err {
+	case context.DeadlineExceeded:
+		return StreamErrorf(codes.DeadlineExceeded, "%v", err)
+	case context.Canceled:
+		return StreamErrorf(codes.Canceled, "%v", err)
+	}
+	panic(fmt.Sprintf("Unexpected error from context packet: %v", err))
+}
+
+// wait blocks until it can receive from ctx.Done, closing, or proceed.
+// If it receives from ctx.Done, it returns 0, the StreamError for ctx.Err.
+// If it receives from closing, it returns 0, ErrConnClosing.
+// If it receives from proceed, it returns the received integer, nil.
+func wait(ctx context.Context, closing <-chan struct{}, proceed <-chan int) (int, error) {
+	select {
+	case <-ctx.Done():
+		return 0, ContextErr(ctx.Err())
+	case <-closing:
+		return 0, ErrConnClosing
+	case i := <-proceed:
+		return i, nil
+	}
+}
diff --git a/vendor/gopkg.in/inf.v0/LICENSE b/vendor/gopkg.in/inf.v0/LICENSE
new file mode 100644
index 0000000000..87a5cede33
--- /dev/null
+++ b/vendor/gopkg.in/inf.v0/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2012 Péter Surányi. Portions Copyright (c) 2009 The Go
+Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/gopkg.in/inf.v0/dec.go b/vendor/gopkg.in/inf.v0/dec.go
new file mode 100644
index 0000000000..3b4afedf1a
--- /dev/null
+++ b/vendor/gopkg.in/inf.v0/dec.go
@@ -0,0 +1,615 @@
+// Package inf (type inf.Dec) implements "infinite-precision" decimal
+// arithmetic.
+// "Infinite precision" describes two characteristics: practically unlimited
+// precision for decimal number representation and no support for calculating
+// with any specific fixed precision.
+// (Although there is no practical limit on precision, inf.Dec can only
+// represent finite decimals.)
+//
+// This package is currently in experimental stage and the API may change.
+//
+// This package does NOT support:
+//  - rounding to specific precisions (as opposed to specific decimal positions)
+//  - the notion of context (each rounding must be explicit)
+//  - NaN and Inf values, and distinguishing between positive and negative zero
+//  - conversions to and from float32/64 types
+//
+// Features considered for possible addition:
+//  + formatting options
+//  + Exp method
+//  + combined operations such as AddRound/MulAdd etc
+//  + exchanging data in decimal32/64/128 formats
+//
+package inf // import "gopkg.in/inf.v0"
+
+// TODO:
+//  - avoid excessive deep copying (quo and rounders)
+
+import (
+	"fmt"
+	"io"
+	"math/big"
+	"strings"
+)
+
+// A Dec represents a signed arbitrary-precision decimal.
+// It is a combination of a sign, an arbitrary-precision integer coefficient
+// value, and a signed fixed-precision exponent value.
+// The sign and the coefficient value are handled together as a signed value
+// and referred to as the unscaled value.
+// (Positive and negative zero values are not distinguished.)
+// Since the exponent is most commonly non-positive, it is handled in negated
+// form and referred to as scale.
+//
+// The mathematical value of a Dec equals:
+//
+//  unscaled * 10**(-scale)
+//
+// Note that different Dec representations may have equal mathematical values.
+//
+//  unscaled  scale  String()
+//  -------------------------
+//         0      0    "0"
+//         0      2    "0.00"
+//         0     -2    "0"
+//         1      0    "1"
+//       100      2    "1.00"
+//        10      0   "10"
+//         1     -1   "10"
+//
+// The zero value for a Dec represents the value 0 with scale 0.
+//
+// Operations are typically performed through the *Dec type.
+// The semantics of the assignment operation "=" for "bare" Dec values is
+// undefined and should not be relied on.
+//
+// Methods are typically of the form:
+//
+//	func (z *Dec) Op(x, y *Dec) *Dec
+//
+// and implement operations z = x Op y with the result as receiver; if it
+// is one of the operands it may be overwritten (and its memory reused).
+// To enable chaining of operations, the result is also returned. Methods
+// returning a result other than *Dec take one of the operands as the receiver.
+//
+// A "bare" Quo method (quotient / division operation) is not provided, as the
+// result is not always a finite decimal and thus in general cannot be
+// represented as a Dec.
+// Instead, in the common case when rounding is (potentially) necessary,
+// QuoRound should be used with a Scale and a Rounder.
+// QuoExact or QuoRound with RoundExact can be used in the special cases when it
+// is known that the result is always a finite decimal.
+//
+type Dec struct {
+	unscaled big.Int
+	scale    Scale
+}
+
+// Scale represents the type used for the scale of a Dec.
+type Scale int32
+
+const scaleSize = 4 // bytes in a Scale value
+
+// Scaler represents a method for obtaining the scale to use for the result of
+// an operation on x and y.
+type scaler interface {
+	Scale(x *Dec, y *Dec) Scale
+}
+
+var bigInt = [...]*big.Int{
+	big.NewInt(0), big.NewInt(1), big.NewInt(2), big.NewInt(3), big.NewInt(4),
+	big.NewInt(5), big.NewInt(6), big.NewInt(7), big.NewInt(8), big.NewInt(9),
+	big.NewInt(10),
+}
+
+var exp10cache [64]big.Int = func() [64]big.Int {
+	e10, e10i := [64]big.Int{}, bigInt[1]
+	for i, _ := range e10 {
+		e10[i].Set(e10i)
+		e10i = new(big.Int).Mul(e10i, bigInt[10])
+	}
+	return e10
+}()
+
+// NewDec allocates and returns a new Dec set to the given int64 unscaled value
+// and scale.
+func NewDec(unscaled int64, scale Scale) *Dec {
+	return new(Dec).SetUnscaled(unscaled).SetScale(scale)
+}
+
+// NewDecBig allocates and returns a new Dec set to the given *big.Int unscaled
+// value and scale.
+func NewDecBig(unscaled *big.Int, scale Scale) *Dec {
+	return new(Dec).SetUnscaledBig(unscaled).SetScale(scale)
+}
+
+// Scale returns the scale of x.
+func (x *Dec) Scale() Scale {
+	return x.scale
+}
+
+// Unscaled returns the unscaled value of x for u and true for ok when the
+// unscaled value can be represented as int64; otherwise it returns an undefined
+// int64 value for u and false for ok. Use x.UnscaledBig().Int64() to avoid
+// checking the validity of the value when the check is known to be redundant.
+func (x *Dec) Unscaled() (u int64, ok bool) {
+	u = x.unscaled.Int64()
+	var i big.Int
+	ok = i.SetInt64(u).Cmp(&x.unscaled) == 0
+	return
+}
+
+// UnscaledBig returns the unscaled value of x as *big.Int.
+func (x *Dec) UnscaledBig() *big.Int {
+	return &x.unscaled
+}
+
+// SetScale sets the scale of z, with the unscaled value unchanged, and returns
+// z.
+// The mathematical value of the Dec changes as if it was multiplied by
+// 10**(oldscale-scale).
+func (z *Dec) SetScale(scale Scale) *Dec {
+	z.scale = scale
+	return z
+}
+
+// SetUnscaled sets the unscaled value of z, with the scale unchanged, and
+// returns z.
+func (z *Dec) SetUnscaled(unscaled int64) *Dec {
+	z.unscaled.SetInt64(unscaled)
+	return z
+}
+
+// SetUnscaledBig sets the unscaled value of z, with the scale unchanged, and
+// returns z.
+func (z *Dec) SetUnscaledBig(unscaled *big.Int) *Dec {
+	z.unscaled.Set(unscaled)
+	return z
+}
+
+// Set sets z to the value of x and returns z.
+// It does nothing if z == x.
+func (z *Dec) Set(x *Dec) *Dec {
+	if z != x {
+		z.SetUnscaledBig(x.UnscaledBig())
+		z.SetScale(x.Scale())
+	}
+	return z
+}
+
+// Sign returns:
+//
+//	-1 if x <  0
+//	 0 if x == 0
+//	+1 if x >  0
+//
+func (x *Dec) Sign() int {
+	return x.UnscaledBig().Sign()
+}
+
+// Neg sets z to -x and returns z.
+func (z *Dec) Neg(x *Dec) *Dec {
+	z.SetScale(x.Scale())
+	z.UnscaledBig().Neg(x.UnscaledBig())
+	return z
+}
+
+// Cmp compares x and y and returns:
+//
+//   -1 if x <  y
+//    0 if x == y
+//   +1 if x >  y
+//
+func (x *Dec) Cmp(y *Dec) int {
+	xx, yy := upscale(x, y)
+	return xx.UnscaledBig().Cmp(yy.UnscaledBig())
+}
+
+// Abs sets z to |x| (the absolute value of x) and returns z.
+func (z *Dec) Abs(x *Dec) *Dec {
+	z.SetScale(x.Scale())
+	z.UnscaledBig().Abs(x.UnscaledBig())
+	return z
+}
+
+// Add sets z to the sum x+y and returns z.
+// The scale of z is the greater of the scales of x and y.
+func (z *Dec) Add(x, y *Dec) *Dec {
+	xx, yy := upscale(x, y)
+	z.SetScale(xx.Scale())
+	z.UnscaledBig().Add(xx.UnscaledBig(), yy.UnscaledBig())
+	return z
+}
+
+// Sub sets z to the difference x-y and returns z.
+// The scale of z is the greater of the scales of x and y.
+func (z *Dec) Sub(x, y *Dec) *Dec {
+	xx, yy := upscale(x, y)
+	z.SetScale(xx.Scale())
+	z.UnscaledBig().Sub(xx.UnscaledBig(), yy.UnscaledBig())
+	return z
+}
+
+// Mul sets z to the product x*y and returns z.
+// The scale of z is the sum of the scales of x and y.
+func (z *Dec) Mul(x, y *Dec) *Dec {
+	z.SetScale(x.Scale() + y.Scale())
+	z.UnscaledBig().Mul(x.UnscaledBig(), y.UnscaledBig())
+	return z
+}
+
+// Round sets z to the value of x rounded to Scale s using Rounder r, and
+// returns z.
+func (z *Dec) Round(x *Dec, s Scale, r Rounder) *Dec {
+	return z.QuoRound(x, NewDec(1, 0), s, r)
+}
+
+// QuoRound sets z to the quotient x/y, rounded using the given Rounder to the
+// specified scale.
+//
+// If the rounder is RoundExact but the result can not be expressed exactly at
+// the specified scale, QuoRound returns nil, and the value of z is undefined.
+//
+// There is no corresponding Div method; the equivalent can be achieved through
+// the choice of Rounder used.
+//
+func (z *Dec) QuoRound(x, y *Dec, s Scale, r Rounder) *Dec {
+	return z.quo(x, y, sclr{s}, r)
+}
+
+func (z *Dec) quo(x, y *Dec, s scaler, r Rounder) *Dec {
+	scl := s.Scale(x, y)
+	var zzz *Dec
+	if r.UseRemainder() {
+		zz, rA, rB := new(Dec).quoRem(x, y, scl, true, new(big.Int), new(big.Int))
+		zzz = r.Round(new(Dec), zz, rA, rB)
+	} else {
+		zz, _, _ := new(Dec).quoRem(x, y, scl, false, nil, nil)
+		zzz = r.Round(new(Dec), zz, nil, nil)
+	}
+	if zzz == nil {
+		return nil
+	}
+	return z.Set(zzz)
+}
+
+// QuoExact sets z to the quotient x/y and returns z when x/y is a finite
+// decimal. Otherwise it returns nil and the value of z is undefined.
+//
+// The scale of a non-nil result is "x.Scale() - y.Scale()" or greater; it is
+// calculated so that the remainder will be zero whenever x/y is a finite
+// decimal.
+func (z *Dec) QuoExact(x, y *Dec) *Dec {
+	return z.quo(x, y, scaleQuoExact{}, RoundExact)
+}
+
+// quoRem sets z to the quotient x/y with the scale s, and if useRem is true,
+// it sets remNum and remDen to the numerator and denominator of the remainder.
+// It returns z, remNum and remDen.
+//
+// The remainder is normalized to the range -1 < r < 1 to simplify rounding;
+// that is, the results satisfy the following equation:
+//
+//  x / y = z + (remNum/remDen) * 10**(-z.Scale())
+//
+// See Rounder for more details about rounding.
+//
+func (z *Dec) quoRem(x, y *Dec, s Scale, useRem bool,
+	remNum, remDen *big.Int) (*Dec, *big.Int, *big.Int) {
+	// difference (required adjustment) compared to "canonical" result scale
+	shift := s - (x.Scale() - y.Scale())
+	// pointers to adjusted unscaled dividend and divisor
+	var ix, iy *big.Int
+	switch {
+	case shift > 0:
+		// increased scale: decimal-shift dividend left
+		ix = new(big.Int).Mul(x.UnscaledBig(), exp10(shift))
+		iy = y.UnscaledBig()
+	case shift < 0:
+		// decreased scale: decimal-shift divisor left
+		ix = x.UnscaledBig()
+		iy = new(big.Int).Mul(y.UnscaledBig(), exp10(-shift))
+	default:
+		ix = x.UnscaledBig()
+		iy = y.UnscaledBig()
+	}
+	// save a copy of iy in case it to be overwritten with the result
+	iy2 := iy
+	if iy == z.UnscaledBig() {
+		iy2 = new(big.Int).Set(iy)
+	}
+	// set scale
+	z.SetScale(s)
+	// set unscaled
+	if useRem {
+		// Int division
+		_, intr := z.UnscaledBig().QuoRem(ix, iy, new(big.Int))
+		// set remainder
+		remNum.Set(intr)
+		remDen.Set(iy2)
+	} else {
+		z.UnscaledBig().Quo(ix, iy)
+	}
+	return z, remNum, remDen
+}
+
+type sclr struct{ s Scale }
+
+func (s sclr) Scale(x, y *Dec) Scale {
+	return s.s
+}
+
+type scaleQuoExact struct{}
+
+func (sqe scaleQuoExact) Scale(x, y *Dec) Scale {
+	rem := new(big.Rat).SetFrac(x.UnscaledBig(), y.UnscaledBig())
+	f2, f5 := factor2(rem.Denom()), factor(rem.Denom(), bigInt[5])
+	var f10 Scale
+	if f2 > f5 {
+		f10 = Scale(f2)
+	} else {
+		f10 = Scale(f5)
+	}
+	return x.Scale() - y.Scale() + f10
+}
+
+func factor(n *big.Int, p *big.Int) int {
+	// could be improved for large factors
+	d, f := n, 0
+	for {
+		dd, dm := new(big.Int).DivMod(d, p, new(big.Int))
+		if dm.Sign() == 0 {
+			f++
+			d = dd
+		} else {
+			break
+		}
+	}
+	return f
+}
+
+func factor2(n *big.Int) int {
+	// could be improved for large factors
+	f := 0
+	for ; n.Bit(f) == 0; f++ {
+	}
+	return f
+}
+
+func upscale(a, b *Dec) (*Dec, *Dec) {
+	if a.Scale() == b.Scale() {
+		return a, b
+	}
+	if a.Scale() > b.Scale() {
+		bb := b.rescale(a.Scale())
+		return a, bb
+	}
+	aa := a.rescale(b.Scale())
+	return aa, b
+}
+
+func exp10(x Scale) *big.Int {
+	if int(x) < len(exp10cache) {
+		return &exp10cache[int(x)]
+	}
+	return new(big.Int).Exp(bigInt[10], big.NewInt(int64(x)), nil)
+}
+
+func (x *Dec) rescale(newScale Scale) *Dec {
+	shift := newScale - x.Scale()
+	switch {
+	case shift < 0:
+		e := exp10(-shift)
+		return NewDecBig(new(big.Int).Quo(x.UnscaledBig(), e), newScale)
+	case shift > 0:
+		e := exp10(shift)
+		return NewDecBig(new(big.Int).Mul(x.UnscaledBig(), e), newScale)
+	}
+	return x
+}
+
+var zeros = []byte("00000000000000000000000000000000" +
+	"00000000000000000000000000000000")
+var lzeros = Scale(len(zeros))
+
+func appendZeros(s []byte, n Scale) []byte {
+	for i := Scale(0); i < n; i += lzeros {
+		if n > i+lzeros {
+			s = append(s, zeros...)
+		} else {
+			s = append(s, zeros[0:n-i]...)
+		}
+	}
+	return s
+}
+
+func (x *Dec) String() string {
+	if x == nil {
+		return "<nil>"
+	}
+	scale := x.Scale()
+	s := []byte(x.UnscaledBig().String())
+	if scale <= 0 {
+		if scale != 0 && x.unscaled.Sign() != 0 {
+			s = appendZeros(s, -scale)
+		}
+		return string(s)
+	}
+	negbit := Scale(-((x.Sign() - 1) / 2))
+	// scale > 0
+	lens := Scale(len(s))
+	if lens-negbit <= scale {
+		ss := make([]byte, 0, scale+2)
+		if negbit == 1 {
+			ss = append(ss, '-')
+		}
+		ss = append(ss, '0', '.')
+		ss = appendZeros(ss, scale-lens+negbit)
+		ss = append(ss, s[negbit:]...)
+		return string(ss)
+	}
+	// lens > scale
+	ss := make([]byte, 0, lens+1)
+	ss = append(ss, s[:lens-scale]...)
+	ss = append(ss, '.')
+	ss = append(ss, s[lens-scale:]...)
+	return string(ss)
+}
+
+// Format is a support routine for fmt.Formatter. It accepts the decimal
+// formats 'd' and 'f', and handles both equivalently.
+// Width, precision, flags and bases 2, 8, 16 are not supported.
+func (x *Dec) Format(s fmt.State, ch rune) {
+	if ch != 'd' && ch != 'f' && ch != 'v' && ch != 's' {
+		fmt.Fprintf(s, "%%!%c(dec.Dec=%s)", ch, x.String())
+		return
+	}
+	fmt.Fprintf(s, x.String())
+}
+
+func (z *Dec) scan(r io.RuneScanner) (*Dec, error) {
+	unscaled := make([]byte, 0, 256) // collects chars of unscaled as bytes
+	dp, dg := -1, -1                 // indexes of decimal point, first digit
+loop:
+	for {
+		ch, _, err := r.ReadRune()
+		if err == io.EOF {
+			break loop
+		}
+		if err != nil {
+			return nil, err
+		}
+		switch {
+		case ch == '+' || ch == '-':
+			if len(unscaled) > 0 || dp >= 0 { // must be first character
+				r.UnreadRune()
+				break loop
+			}
+		case ch == '.':
+			if dp >= 0 {
+				r.UnreadRune()
+				break loop
+			}
+			dp = len(unscaled)
+			continue // don't add to unscaled
+		case ch >= '0' && ch <= '9':
+			if dg == -1 {
+				dg = len(unscaled)
+			}
+		default:
+			r.UnreadRune()
+			break loop
+		}
+		unscaled = append(unscaled, byte(ch))
+	}
+	if dg == -1 {
+		return nil, fmt.Errorf("no digits read")
+	}
+	if dp >= 0 {
+		z.SetScale(Scale(len(unscaled) - dp))
+	} else {
+		z.SetScale(0)
+	}
+	_, ok := z.UnscaledBig().SetString(string(unscaled), 10)
+	if !ok {
+		return nil, fmt.Errorf("invalid decimal: %s", string(unscaled))
+	}
+	return z, nil
+}
+
+// SetString sets z to the value of s, interpreted as a decimal (base 10),
+// and returns z and a boolean indicating success. The scale of z is the
+// number of digits after the decimal point (including any trailing 0s),
+// or 0 if there is no decimal point. If SetString fails, the value of z
+// is undefined but the returned value is nil.
+func (z *Dec) SetString(s string) (*Dec, bool) {
+	r := strings.NewReader(s)
+	_, err := z.scan(r)
+	if err != nil {
+		return nil, false
+	}
+	_, _, err = r.ReadRune()
+	if err != io.EOF {
+		return nil, false
+	}
+	// err == io.EOF => scan consumed all of s
+	return z, true
+}
+
+// Scan is a support routine for fmt.Scanner; it sets z to the value of
+// the scanned number. It accepts the decimal formats 'd' and 'f', and
+// handles both equivalently. Bases 2, 8, 16 are not supported.
+// The scale of z is the number of digits after the decimal point
+// (including any trailing 0s), or 0 if there is no decimal point.
+func (z *Dec) Scan(s fmt.ScanState, ch rune) error {
+	if ch != 'd' && ch != 'f' && ch != 's' && ch != 'v' {
+		return fmt.Errorf("Dec.Scan: invalid verb '%c'", ch)
+	}
+	s.SkipSpace()
+	_, err := z.scan(s)
+	return err
+}
+
+// Gob encoding version
+const decGobVersion byte = 1
+
+func scaleBytes(s Scale) []byte {
+	buf := make([]byte, scaleSize)
+	i := scaleSize
+	for j := 0; j < scaleSize; j++ {
+		i--
+		buf[i] = byte(s)
+		s >>= 8
+	}
+	return buf
+}
+
+func scale(b []byte) (s Scale) {
+	for j := 0; j < scaleSize; j++ {
+		s <<= 8
+		s |= Scale(b[j])
+	}
+	return
+}
+
+// GobEncode implements the gob.GobEncoder interface.
+func (x *Dec) GobEncode() ([]byte, error) {
+	buf, err := x.UnscaledBig().GobEncode()
+	if err != nil {
+		return nil, err
+	}
+	buf = append(append(buf, scaleBytes(x.Scale())...), decGobVersion)
+	return buf, nil
+}
+
+// GobDecode implements the gob.GobDecoder interface.
+func (z *Dec) GobDecode(buf []byte) error {
+	if len(buf) == 0 {
+		return fmt.Errorf("Dec.GobDecode: no data")
+	}
+	b := buf[len(buf)-1]
+	if b != decGobVersion {
+		return fmt.Errorf("Dec.GobDecode: encoding version %d not supported", b)
+	}
+	l := len(buf) - scaleSize - 1
+	err := z.UnscaledBig().GobDecode(buf[:l])
+	if err != nil {
+		return err
+	}
+	z.SetScale(scale(buf[l : l+scaleSize]))
+	return nil
+}
+
+// MarshalText implements the encoding.TextMarshaler interface.
+func (x *Dec) MarshalText() ([]byte, error) {
+	return []byte(x.String()), nil
+}
+
+// UnmarshalText implements the encoding.TextUnmarshaler interface.
+func (z *Dec) UnmarshalText(data []byte) error {
+	_, ok := z.SetString(string(data))
+	if !ok {
+		return fmt.Errorf("invalid inf.Dec")
+	}
+	return nil
+}
diff --git a/vendor/gopkg.in/inf.v0/rounder.go b/vendor/gopkg.in/inf.v0/rounder.go
new file mode 100644
index 0000000000..3a97ef529b
--- /dev/null
+++ b/vendor/gopkg.in/inf.v0/rounder.go
@@ -0,0 +1,145 @@
+package inf
+
+import (
+	"math/big"
+)
+
+// Rounder represents a method for rounding the (possibly infinite decimal)
+// result of a division to a finite Dec. It is used by Dec.Round() and
+// Dec.Quo().
+//
+// See the Example for results of using each Rounder with some sample values.
+//
+type Rounder rounder
+
+// See http://speleotrove.com/decimal/damodel.html#refround for more detailed
+// definitions of these rounding modes.
+var (
+	RoundDown     Rounder // towards 0
+	RoundUp       Rounder // away from 0
+	RoundFloor    Rounder // towards -infinity
+	RoundCeil     Rounder // towards +infinity
+	RoundHalfDown Rounder // to nearest; towards 0 if same distance
+	RoundHalfUp   Rounder // to nearest; away from 0 if same distance
+	RoundHalfEven Rounder // to nearest; even last digit if same distance
+)
+
+// RoundExact is to be used in the case when rounding is not necessary.
+// When used with Quo or Round, it returns the result verbatim when it can be
+// expressed exactly with the given precision, and it returns nil otherwise.
+// QuoExact is a shorthand for using Quo with RoundExact.
+var RoundExact Rounder
+
+type rounder interface {
+
+	// When UseRemainder() returns true, the Round() method is passed the
+	// remainder of the division, expressed as the numerator and denominator of
+	// a rational.
+	UseRemainder() bool
+
+	// Round sets the rounded value of a quotient to z, and returns z.
+	// quo is rounded down (truncated towards zero) to the scale obtained from
+	// the Scaler in Quo().
+	//
+	// When the remainder is not used, remNum and remDen are nil.
+	// When used, the remainder is normalized between -1 and 1; that is:
+	//
+	//  -|remDen| < remNum < |remDen|
+	//
+	// remDen has the same sign as y, and remNum is zero or has the same sign
+	// as x.
+	Round(z, quo *Dec, remNum, remDen *big.Int) *Dec
+}
+
+type rndr struct {
+	useRem bool
+	round  func(z, quo *Dec, remNum, remDen *big.Int) *Dec
+}
+
+func (r rndr) UseRemainder() bool {
+	return r.useRem
+}
+
+func (r rndr) Round(z, quo *Dec, remNum, remDen *big.Int) *Dec {
+	return r.round(z, quo, remNum, remDen)
+}
+
+var intSign = []*big.Int{big.NewInt(-1), big.NewInt(0), big.NewInt(1)}
+
+func roundHalf(f func(c int, odd uint) (roundUp bool)) func(z, q *Dec, rA, rB *big.Int) *Dec {
+	return func(z, q *Dec, rA, rB *big.Int) *Dec {
+		z.Set(q)
+		brA, brB := rA.BitLen(), rB.BitLen()
+		if brA < brB-1 {
+			// brA < brB-1 => |rA| < |rB/2|
+			return z
+		}
+		roundUp := false
+		srA, srB := rA.Sign(), rB.Sign()
+		s := srA * srB
+		if brA == brB-1 {
+			rA2 := new(big.Int).Lsh(rA, 1)
+			if s < 0 {
+				rA2.Neg(rA2)
+			}
+			roundUp = f(rA2.Cmp(rB)*srB, z.UnscaledBig().Bit(0))
+		} else {
+			// brA > brB-1 => |rA| > |rB/2|
+			roundUp = true
+		}
+		if roundUp {
+			z.UnscaledBig().Add(z.UnscaledBig(), intSign[s+1])
+		}
+		return z
+	}
+}
+
+func init() {
+	RoundExact = rndr{true,
+		func(z, q *Dec, rA, rB *big.Int) *Dec {
+			if rA.Sign() != 0 {
+				return nil
+			}
+			return z.Set(q)
+		}}
+	RoundDown = rndr{false,
+		func(z, q *Dec, rA, rB *big.Int) *Dec {
+			return z.Set(q)
+		}}
+	RoundUp = rndr{true,
+		func(z, q *Dec, rA, rB *big.Int) *Dec {
+			z.Set(q)
+			if rA.Sign() != 0 {
+				z.UnscaledBig().Add(z.UnscaledBig(), intSign[rA.Sign()*rB.Sign()+1])
+			}
+			return z
+		}}
+	RoundFloor = rndr{true,
+		func(z, q *Dec, rA, rB *big.Int) *Dec {
+			z.Set(q)
+			if rA.Sign()*rB.Sign() < 0 {
+				z.UnscaledBig().Add(z.UnscaledBig(), intSign[0])
+			}
+			return z
+		}}
+	RoundCeil = rndr{true,
+		func(z, q *Dec, rA, rB *big.Int) *Dec {
+			z.Set(q)
+			if rA.Sign()*rB.Sign() > 0 {
+				z.UnscaledBig().Add(z.UnscaledBig(), intSign[2])
+			}
+			return z
+		}}
+	RoundHalfDown = rndr{true, roundHalf(
+		func(c int, odd uint) bool {
+			return c > 0
+		})}
+	RoundHalfUp = rndr{true, roundHalf(
+		func(c int, odd uint) bool {
+			return c >= 0
+		})}
+	RoundHalfEven = rndr{true, roundHalf(
+		func(c int, odd uint) bool {
+			return c > 0 || c == 0 && odd == 1
+		})}
+}
diff --git a/vendor/k8s.io/kubernetes/LICENSE b/vendor/k8s.io/kubernetes/LICENSE
new file mode 100644
index 0000000000..6b4d837a44
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2014 The Kubernetes Authors All rights reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go b/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
new file mode 100644
index 0000000000..6a34e2d434
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
@@ -0,0 +1,55 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package resource
+
+import (
+	inf_v0 "gopkg.in/inf.v0"
+	conversion "k8s.io/kubernetes/pkg/conversion"
+)
+
+func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error {
+	if in.Amount != nil {
+		in, out := in.Amount, &out.Amount
+		*out = new(inf_v0.Dec)
+		if newVal, err := c.DeepCopy(*in); err != nil {
+			return err
+		} else {
+			**out = newVal.(inf_v0.Dec)
+		}
+	} else {
+		out.Amount = nil
+	}
+	out.Format = in.Format
+	return nil
+}
+
+func DeepCopy_resource_QuantityProto(in QuantityProto, out *QuantityProto, c *conversion.Cloner) error {
+	out.Format = in.Format
+	out.Scale = in.Scale
+	if in.Bigint != nil {
+		in, out := in.Bigint, &out.Bigint
+		*out = make([]byte, len(in))
+		copy(*out, in)
+	} else {
+		out.Bigint = nil
+	}
+	return nil
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go b/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
new file mode 100644
index 0000000000..7484f92761
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
@@ -0,0 +1,371 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by protoc-gen-gogo.
+// source: k8s.io/kubernetes/pkg/api/resource/generated.proto
+// DO NOT EDIT!
+
+/*
+	Package resource is a generated protocol buffer package.
+
+	It is generated from these files:
+		k8s.io/kubernetes/pkg/api/resource/generated.proto
+
+	It has these top-level messages:
+		Quantity
+		QuantityProto
+*/
+package resource
+
+import proto "github.com/gogo/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+import io "io"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+func (m *Quantity) Reset()      { *m = Quantity{} }
+func (*Quantity) ProtoMessage() {}
+
+func (m *QuantityProto) Reset()         { *m = QuantityProto{} }
+func (m *QuantityProto) String() string { return proto.CompactTextString(m) }
+func (*QuantityProto) ProtoMessage()    {}
+
+func init() {
+	proto.RegisterType((*Quantity)(nil), "k8s.io.kubernetes.pkg.api.resource.Quantity")
+	proto.RegisterType((*QuantityProto)(nil), "k8s.io.kubernetes.pkg.api.resource.QuantityProto")
+}
+func (m *QuantityProto) Marshal() (data []byte, err error) {
+	size := m.Size()
+	data = make([]byte, size)
+	n, err := m.MarshalTo(data)
+	if err != nil {
+		return nil, err
+	}
+	return data[:n], nil
+}
+
+func (m *QuantityProto) MarshalTo(data []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	data[i] = 0xa
+	i++
+	i = encodeVarintGenerated(data, i, uint64(len(m.Format)))
+	i += copy(data[i:], m.Format)
+	data[i] = 0x10
+	i++
+	i = encodeVarintGenerated(data, i, uint64(m.Scale))
+	if m.Bigint != nil {
+		data[i] = 0x1a
+		i++
+		i = encodeVarintGenerated(data, i, uint64(len(m.Bigint)))
+		i += copy(data[i:], m.Bigint)
+	}
+	return i, nil
+}
+
+func encodeFixed64Generated(data []byte, offset int, v uint64) int {
+	data[offset] = uint8(v)
+	data[offset+1] = uint8(v >> 8)
+	data[offset+2] = uint8(v >> 16)
+	data[offset+3] = uint8(v >> 24)
+	data[offset+4] = uint8(v >> 32)
+	data[offset+5] = uint8(v >> 40)
+	data[offset+6] = uint8(v >> 48)
+	data[offset+7] = uint8(v >> 56)
+	return offset + 8
+}
+func encodeFixed32Generated(data []byte, offset int, v uint32) int {
+	data[offset] = uint8(v)
+	data[offset+1] = uint8(v >> 8)
+	data[offset+2] = uint8(v >> 16)
+	data[offset+3] = uint8(v >> 24)
+	return offset + 4
+}
+func encodeVarintGenerated(data []byte, offset int, v uint64) int {
+	for v >= 1<<7 {
+		data[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	data[offset] = uint8(v)
+	return offset + 1
+}
+func (m *QuantityProto) Size() (n int) {
+	var l int
+	_ = l
+	l = len(m.Format)
+	n += 1 + l + sovGenerated(uint64(l))
+	n += 1 + sovGenerated(uint64(m.Scale))
+	if m.Bigint != nil {
+		l = len(m.Bigint)
+		n += 1 + l + sovGenerated(uint64(l))
+	}
+	return n
+}
+
+func sovGenerated(x uint64) (n int) {
+	for {
+		n++
+		x >>= 7
+		if x == 0 {
+			break
+		}
+	}
+	return n
+}
+func sozGenerated(x uint64) (n int) {
+	return sovGenerated(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+func (m *QuantityProto) Unmarshal(data []byte) error {
+	l := len(data)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowGenerated
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := data[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: QuantityProto: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: QuantityProto: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Format", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthGenerated
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Format = Format(data[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Scale", wireType)
+			}
+			m.Scale = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				m.Scale |= (int32(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Bigint", wireType)
+			}
+			var byteLen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				byteLen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if byteLen < 0 {
+				return ErrInvalidLengthGenerated
+			}
+			postIndex := iNdEx + byteLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Bigint = append(m.Bigint[:0], data[iNdEx:postIndex]...)
+			if m.Bigint == nil {
+				m.Bigint = []byte{}
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipGenerated(data[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthGenerated
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func skipGenerated(data []byte) (n int, err error) {
+	l := len(data)
+	iNdEx := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowGenerated
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := data[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if data[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+			return iNdEx, nil
+		case 1:
+			iNdEx += 8
+			return iNdEx, nil
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			iNdEx += length
+			if length < 0 {
+				return 0, ErrInvalidLengthGenerated
+			}
+			return iNdEx, nil
+		case 3:
+			for {
+				var innerWire uint64
+				var start int = iNdEx
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return 0, ErrIntOverflowGenerated
+					}
+					if iNdEx >= l {
+						return 0, io.ErrUnexpectedEOF
+					}
+					b := data[iNdEx]
+					iNdEx++
+					innerWire |= (uint64(b) & 0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				innerWireType := int(innerWire & 0x7)
+				if innerWireType == 4 {
+					break
+				}
+				next, err := skipGenerated(data[start:])
+				if err != nil {
+					return 0, err
+				}
+				iNdEx = start + next
+			}
+			return iNdEx, nil
+		case 4:
+			return iNdEx, nil
+		case 5:
+			iNdEx += 4
+			return iNdEx, nil
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+	}
+	panic("unreachable")
+}
+
+var (
+	ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowGenerated   = fmt.Errorf("proto: integer overflow")
+)
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
new file mode 100644
index 0000000000..e61c8800ec
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
@@ -0,0 +1,538 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resource
+
+import (
+	"errors"
+	"fmt"
+	"math/big"
+	"regexp"
+	"strings"
+
+	flag "github.com/spf13/pflag"
+
+	inf "gopkg.in/inf.v0"
+)
+
+// Quantity is a fixed-point representation of a number.
+// It provides convenient marshaling/unmarshaling in JSON and YAML,
+// in addition to String() and Int64() accessors.
+//
+// The serialization format is:
+//
+// <quantity>        ::= <signedNumber><suffix>
+//   (Note that <suffix> may be empty, from the "" case in <decimalSI>.)
+// <digit>           ::= 0 | 1 | ... | 9
+// <digits>          ::= <digit> | <digit><digits>
+// <number>          ::= <digits> | <digits>.<digits> | <digits>. | .<digits>
+// <sign>            ::= "+" | "-"
+// <signedNumber>    ::= <number> | <sign><number>
+// <suffix>          ::= <binarySI> | <decimalExponent> | <decimalSI>
+// <binarySI>        ::= Ki | Mi | Gi | Ti | Pi | Ei
+//   (International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)
+// <decimalSI>       ::= m | "" | k | M | G | T | P | E
+//   (Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)
+// <decimalExponent> ::= "e" <signedNumber> | "E" <signedNumber>
+//
+// No matter which of the three exponent forms is used, no quantity may represent
+// a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal
+// places. Numbers larger or more precise will be capped or rounded up.
+// (E.g.: 0.1m will rounded up to 1m.)
+// This may be extended in the future if we require larger or smaller quantities.
+//
+// When a Quantity is parsed from a string, it will remember the type of suffix
+// it had, and will use the same type again when it is serialized.
+//
+// Before serializing, Quantity will be put in "canonical form".
+// This means that Exponent/suffix will be adjusted up or down (with a
+// corresponding increase or decrease in Mantissa) such that:
+//   a. No precision is lost
+//   b. No fractional digits will be emitted
+//   c. The exponent (or suffix) is as large as possible.
+// The sign will be omitted unless the number is negative.
+//
+// Examples:
+//   1.5 will be serialized as "1500m"
+//   1.5Gi will be serialized as "1536Mi"
+//
+// NOTE: We reserve the right to amend this canonical format, perhaps to
+//   allow 1.5 to be canonical.
+// TODO: Remove above disclaimer after all bikeshedding about format is over,
+//   or after March 2015.
+//
+// Note that the quantity will NEVER be internally represented by a
+// floating point number. That is the whole point of this exercise.
+//
+// Non-canonical values will still parse as long as they are well formed,
+// but will be re-emitted in their canonical form. (So always use canonical
+// form, or don't diff.)
+//
+// This format is intended to make it difficult to use these numbers without
+// writing some sort of special handling code in the hopes that that will
+// cause implementors to also use a fixed point implementation.
+//
+// +protobuf=true
+// +protobuf.embed=QuantityProto
+// +protobuf.options.marshal=false
+// +protobuf.options.(gogoproto.goproto_stringer)=false
+type Quantity struct {
+	// Amount is public, so you can manipulate it if the accessor
+	// functions are not sufficient.
+	Amount *inf.Dec
+
+	// Change Format at will. See the comment for Canonicalize for
+	// more details.
+	Format
+}
+
+// Format lists the three possible formattings of a quantity.
+type Format string
+
+const (
+	DecimalExponent = Format("DecimalExponent") // e.g., 12e6
+	BinarySI        = Format("BinarySI")        // e.g., 12Mi (12 * 2^20)
+	DecimalSI       = Format("DecimalSI")       // e.g., 12M  (12 * 10^6)
+)
+
+// MustParse turns the given string into a quantity or panics; for tests
+// or others cases where you know the string is valid.
+func MustParse(str string) Quantity {
+	q, err := ParseQuantity(str)
+	if err != nil {
+		panic(fmt.Errorf("cannot parse '%v': %v", str, err))
+	}
+	return *q
+}
+
+// Scale is used for getting and setting the base-10 scaled value.
+// Base-2 scales are omitted for mathematical simplicity.
+// See Quantity.ScaledValue for more details.
+type Scale int
+
+const (
+	Nano  Scale = -9
+	Micro Scale = -6
+	Milli Scale = -3
+	Kilo  Scale = 3
+	Mega  Scale = 6
+	Giga  Scale = 9
+	Tera  Scale = 12
+	Peta  Scale = 15
+	Exa   Scale = 18
+)
+
+const (
+	// splitREString is used to separate a number from its suffix; as such,
+	// this is overly permissive, but that's OK-- it will be checked later.
+	splitREString = "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
+)
+
+var (
+	// splitRE is used to get the various parts of a number.
+	splitRE = regexp.MustCompile(splitREString)
+
+	// Errors that could happen while parsing a string.
+	ErrFormatWrong = errors.New("quantities must match the regular expression '" + splitREString + "'")
+	ErrNumeric     = errors.New("unable to parse numeric part of quantity")
+	ErrSuffix      = errors.New("unable to parse quantity's suffix")
+
+	// Commonly needed big.Int values-- treat as read only!
+	bigTen      = big.NewInt(10)
+	bigZero     = big.NewInt(0)
+	bigOne      = big.NewInt(1)
+	bigThousand = big.NewInt(1000)
+	big1024     = big.NewInt(1024)
+
+	// Commonly needed inf.Dec values-- treat as read only!
+	decZero      = inf.NewDec(0, 0)
+	decOne       = inf.NewDec(1, 0)
+	decMinusOne  = inf.NewDec(-1, 0)
+	decThousand  = inf.NewDec(1000, 0)
+	dec1024      = inf.NewDec(1024, 0)
+	decMinus1024 = inf.NewDec(-1024, 0)
+
+	// Largest (in magnitude) number allowed.
+	maxAllowed = inf.NewDec((1<<63)-1, 0) // == max int64
+
+	// The maximum value we can represent milli-units for.
+	// Compare with the return value of Quantity.Value() to
+	// see if it's safe to use Quantity.MilliValue().
+	MaxMilliValue = int64(((1 << 63) - 1) / 1000)
+)
+
+// ParseQuantity turns str into a Quantity, or returns an error.
+func ParseQuantity(str string) (*Quantity, error) {
+	parts := splitRE.FindStringSubmatch(strings.TrimSpace(str))
+	// regexp returns are entire match, followed by an entry for each () section.
+	if len(parts) != 3 {
+		return nil, ErrFormatWrong
+	}
+
+	amount := new(inf.Dec)
+	if _, ok := amount.SetString(parts[1]); !ok {
+		return nil, ErrNumeric
+	}
+
+	base, exponent, format, ok := quantitySuffixer.interpret(suffix(parts[2]))
+	if !ok {
+		return nil, ErrSuffix
+	}
+
+	// So that no one but us has to think about suffixes, remove it.
+	if base == 10 {
+		amount.SetScale(amount.Scale() + Scale(exponent).infScale())
+	} else if base == 2 {
+		// numericSuffix = 2 ** exponent
+		numericSuffix := big.NewInt(1).Lsh(bigOne, uint(exponent))
+		ub := amount.UnscaledBig()
+		amount.SetUnscaledBig(ub.Mul(ub, numericSuffix))
+	}
+
+	// Cap at min/max bounds.
+	sign := amount.Sign()
+	if sign == -1 {
+		amount.Neg(amount)
+	}
+
+	// This rounds non-zero values up to the minimum representable value, under the theory that
+	// if you want some resources, you should get some resources, even if you asked for way too small
+	// of an amount.  Arguably, this should be inf.RoundHalfUp (normal rounding), but that would have
+	// the side effect of rounding values < .5n to zero.
+	if v, ok := amount.Unscaled(); v != int64(0) || !ok {
+		amount.Round(amount, Nano.infScale(), inf.RoundUp)
+	}
+
+	// The max is just a simple cap.
+	if amount.Cmp(maxAllowed) > 0 {
+		amount.Set(maxAllowed)
+	}
+	if format == BinarySI && amount.Cmp(decOne) < 0 && amount.Cmp(decZero) > 0 {
+		// This avoids rounding and hopefully confusion, too.
+		format = DecimalSI
+	}
+	if sign == -1 {
+		amount.Neg(amount)
+	}
+
+	return &Quantity{amount, format}, nil
+}
+
+// removeFactors divides in a loop; the return values have the property that
+// d == result * factor ^ times
+// d may be modified in place.
+// If d == 0, then the return values will be (0, 0)
+func removeFactors(d, factor *big.Int) (result *big.Int, times int) {
+	q := big.NewInt(0)
+	m := big.NewInt(0)
+	for d.Cmp(bigZero) != 0 {
+		q.DivMod(d, factor, m)
+		if m.Cmp(bigZero) != 0 {
+			break
+		}
+		times++
+		d, q = q, d
+	}
+	return d, times
+}
+
+// Canonicalize returns the canonical form of q and its suffix (see comment on Quantity).
+//
+// Note about BinarySI:
+// * If q.Format is set to BinarySI and q.Amount represents a non-zero value between
+//   -1 and +1, it will be emitted as if q.Format were DecimalSI.
+// * Otherwise, if q.Format is set to BinarySI, frational parts of q.Amount will be
+//   rounded up. (1.1i becomes 2i.)
+func (q *Quantity) Canonicalize() (string, suffix) {
+	if q.Amount == nil {
+		return "0", ""
+	}
+
+	// zero is zero always
+	if q.Amount.Cmp(&inf.Dec{}) == 0 {
+		return "0", ""
+	}
+
+	format := q.Format
+	switch format {
+	case DecimalExponent, DecimalSI:
+	case BinarySI:
+		if q.Amount.Cmp(decMinus1024) > 0 && q.Amount.Cmp(dec1024) < 0 {
+			// This avoids rounding and hopefully confusion, too.
+			format = DecimalSI
+		} else {
+			tmp := &inf.Dec{}
+			tmp.Round(q.Amount, 0, inf.RoundUp)
+			if tmp.Cmp(q.Amount) != 0 {
+				// Don't lose precision-- show as DecimalSI
+				format = DecimalSI
+			}
+		}
+	default:
+		format = DecimalExponent
+	}
+
+	// TODO: If BinarySI formatting is requested but would cause rounding, upgrade to
+	// one of the other formats.
+	switch format {
+	case DecimalExponent, DecimalSI:
+		mantissa := q.Amount.UnscaledBig()
+		exponent := int(-q.Amount.Scale())
+		amount := big.NewInt(0).Set(mantissa)
+		// move all factors of 10 into the exponent for easy reasoning
+		amount, times := removeFactors(amount, bigTen)
+		exponent += times
+
+		// make sure exponent is a multiple of 3
+		for exponent%3 != 0 {
+			amount.Mul(amount, bigTen)
+			exponent--
+		}
+
+		suffix, _ := quantitySuffixer.construct(10, exponent, format)
+		number := amount.String()
+		return number, suffix
+	case BinarySI:
+		tmp := &inf.Dec{}
+		tmp.Round(q.Amount, 0, inf.RoundUp)
+
+		amount, exponent := removeFactors(tmp.UnscaledBig(), big1024)
+		suffix, _ := quantitySuffixer.construct(2, exponent*10, format)
+		number := amount.String()
+		return number, suffix
+	}
+	return "0", ""
+}
+
+// String formats the Quantity as a string.
+func (q *Quantity) String() string {
+	number, suffix := q.Canonicalize()
+	return number + string(suffix)
+}
+
+// Cmp compares q and y and returns:
+//
+//   -1 if q <  y
+//    0 if q == y
+//   +1 if q >  y
+//
+func (q *Quantity) Cmp(y Quantity) int {
+	if q.Amount == nil {
+		if y.Amount == nil {
+			return 0
+		}
+		return -y.Amount.Sign()
+	}
+	if y.Amount == nil {
+		return q.Amount.Sign()
+	}
+	return q.Amount.Cmp(y.Amount)
+}
+
+func (q *Quantity) Add(y Quantity) error {
+	switch {
+	case y.Amount == nil:
+		// Adding 0: do nothing.
+	case q.Amount == nil:
+		q.Amount = &inf.Dec{}
+		return q.Add(y)
+	default:
+		// we want to preserve the format of the non-zero value
+		zero := &inf.Dec{}
+		if q.Amount.Cmp(zero) == 0 && y.Amount.Cmp(zero) != 0 {
+			q.Format = y.Format
+		}
+		q.Amount.Add(q.Amount, y.Amount)
+	}
+	return nil
+}
+
+func (q *Quantity) Sub(y Quantity) error {
+	switch {
+	case y.Amount == nil:
+		// Subtracting 0: do nothing.
+	case q.Amount == nil:
+		q.Amount = &inf.Dec{}
+		return q.Sub(y)
+	default:
+		// we want to preserve the format of the non-zero value
+		zero := &inf.Dec{}
+		if q.Amount.Cmp(zero) == 0 && y.Amount.Cmp(zero) != 0 {
+			q.Format = y.Format
+		}
+		q.Amount.Sub(q.Amount, y.Amount)
+	}
+	return nil
+}
+
+// Neg sets q to the negative value of y.
+// It updates the format of q to match y.
+func (q *Quantity) Neg(y Quantity) error {
+	switch {
+	case y.Amount == nil:
+		*q = y
+	case q.Amount == nil:
+		q.Amount = &inf.Dec{}
+		fallthrough
+	default:
+		q.Amount.Neg(y.Amount)
+		q.Format = y.Format
+	}
+	return nil
+}
+
+// MarshalJSON implements the json.Marshaller interface.
+func (q Quantity) MarshalJSON() ([]byte, error) {
+	return []byte(`"` + q.String() + `"`), nil
+}
+
+// UnmarshalJSON implements the json.Unmarshaller interface.
+func (q *Quantity) UnmarshalJSON(value []byte) error {
+	str := string(value)
+	parsed, err := ParseQuantity(strings.Trim(str, `"`))
+	if err != nil {
+		return err
+	}
+	// This copy is safe because parsed will not be referred to again.
+	*q = *parsed
+	return nil
+}
+
+// NewQuantity returns a new Quantity representing the given
+// value in the given format.
+func NewQuantity(value int64, format Format) *Quantity {
+	return &Quantity{
+		Amount: inf.NewDec(value, 0),
+		Format: format,
+	}
+}
+
+// NewMilliQuantity returns a new Quantity representing the given
+// value * 1/1000 in the given format. Note that BinarySI formatting
+// will round fractional values, and will be changed to DecimalSI for
+// values x where (-1 < x < 1) && (x != 0).
+func NewMilliQuantity(value int64, format Format) *Quantity {
+	return &Quantity{
+		Amount: inf.NewDec(value, 3),
+		Format: format,
+	}
+}
+
+// NewScaledQuantity returns a new Quantity representing the given
+// value * 10^scale in DecimalSI format.
+func NewScaledQuantity(value int64, scale Scale) *Quantity {
+	return &Quantity{
+		Amount: inf.NewDec(value, scale.infScale()),
+		Format: DecimalSI,
+	}
+}
+
+// Value returns the value of q; any fractional part will be lost.
+func (q *Quantity) Value() int64 {
+	return q.ScaledValue(0)
+}
+
+// MilliValue returns the value of ceil(q * 1000); this could overflow an int64;
+// if that's a concern, call Value() first to verify the number is small enough.
+func (q *Quantity) MilliValue() int64 {
+	return q.ScaledValue(Milli)
+}
+
+// ScaledValue returns the value of ceil(q * 10^scale); this could overflow an int64.
+// To detect overflow, call Value() first and verify the expected magnitude.
+func (q *Quantity) ScaledValue(scale Scale) int64 {
+	if q.Amount == nil {
+		return 0
+	}
+	return scaledValue(q.Amount.UnscaledBig(), int(q.Amount.Scale()), int(scale.infScale()))
+}
+
+// Set sets q's value to be value.
+func (q *Quantity) Set(value int64) {
+	q.SetScaled(value, 0)
+}
+
+// SetMilli sets q's value to be value * 1/1000.
+func (q *Quantity) SetMilli(value int64) {
+	q.SetScaled(value, Milli)
+}
+
+// SetScaled sets q's value to be value * 10^scale
+func (q *Quantity) SetScaled(value int64, scale Scale) {
+	if q.Amount == nil {
+		q.Amount = &inf.Dec{}
+	}
+	q.Amount.SetUnscaled(value)
+	q.Amount.SetScale(scale.infScale())
+}
+
+// Copy is a convenience function that makes a deep copy for you. Non-deep
+// copies of quantities share pointers and you will regret that.
+func (q *Quantity) Copy() *Quantity {
+	if q.Amount == nil {
+		return NewQuantity(0, q.Format)
+	}
+	tmp := &inf.Dec{}
+	return &Quantity{
+		Amount: tmp.Set(q.Amount),
+		Format: q.Format,
+	}
+}
+
+// qFlag is a helper type for the Flag function
+type qFlag struct {
+	dest *Quantity
+}
+
+// Sets the value of the internal Quantity. (used by flag & pflag)
+func (qf qFlag) Set(val string) error {
+	q, err := ParseQuantity(val)
+	if err != nil {
+		return err
+	}
+	// This copy is OK because q will not be referenced again.
+	*qf.dest = *q
+	return nil
+}
+
+// Converts the value of the internal Quantity to a string. (used by flag & pflag)
+func (qf qFlag) String() string {
+	return qf.dest.String()
+}
+
+// States the type of flag this is (Quantity). (used by pflag)
+func (qf qFlag) Type() string {
+	return "quantity"
+}
+
+// QuantityFlag is a helper that makes a quantity flag (using standard flag package).
+// Will panic if defaultValue is not a valid quantity.
+func QuantityFlag(flagName, defaultValue, description string) *Quantity {
+	q := MustParse(defaultValue)
+	flag.Var(NewQuantityFlagValue(&q), flagName, description)
+	return &q
+}
+
+// NewQuantityFlagValue returns an object that can be used to back a flag,
+// pointing at the given Quantity variable.
+func NewQuantityFlagValue(q *Quantity) flag.Value {
+	return qFlag{q}
+}
+
+// infScale adapts a Scale value to an inf.Scale value.
+func (s Scale) infScale() inf.Scale {
+	return inf.Scale(-s) // inf.Scale is upside-down
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
new file mode 100644
index 0000000000..01d5c2997e
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
@@ -0,0 +1,78 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resource
+
+import (
+	"math/big"
+
+	inf "gopkg.in/inf.v0"
+)
+
+// QuantityProto is a struct that is equivalent to Quantity, but intended for
+// protobuf marshalling/unmarshalling. It is generated into a serialization
+// that matches Quantity. Do not use in Go structs.
+//
+// +protobuf=true
+type QuantityProto struct {
+	// The format of the quantity
+	Format Format `protobuf:"bytes,1,opt,name=format,casttype=Format"`
+	// The scale dimension of the value
+	Scale int32 `protobuf:"varint,2,opt,name=scale"`
+	// Bigint is serialized as a raw bytes array
+	Bigint []byte `protobuf:"bytes,3,opt,name=bigint"`
+}
+
+// ProtoTime returns the Time as a new ProtoTime value.
+func (q *Quantity) QuantityProto() *QuantityProto {
+	if q == nil {
+		return &QuantityProto{}
+	}
+	p := &QuantityProto{
+		Format: q.Format,
+	}
+	if q.Amount != nil {
+		p.Scale = int32(q.Amount.Scale())
+		p.Bigint = q.Amount.UnscaledBig().Bytes()
+	}
+	return p
+}
+
+// Size implements the protobuf marshalling interface.
+func (q *Quantity) Size() (n int) { return q.QuantityProto().Size() }
+
+// Reset implements the protobuf marshalling interface.
+func (q *Quantity) Unmarshal(data []byte) error {
+	p := QuantityProto{}
+	if err := p.Unmarshal(data); err != nil {
+		return err
+	}
+	q.Format = p.Format
+	b := big.NewInt(0)
+	b.SetBytes(p.Bigint)
+	q.Amount = inf.NewDecBig(b, inf.Scale(p.Scale))
+	return nil
+}
+
+// Marshal implements the protobuf marshalling interface.
+func (q *Quantity) Marshal() (data []byte, err error) {
+	return q.QuantityProto().Marshal()
+}
+
+// MarshalTo implements the protobuf marshalling interface.
+func (q *Quantity) MarshalTo(data []byte) (int, error) {
+	return q.QuantityProto().MarshalTo(data)
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go b/vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go
new file mode 100644
index 0000000000..173de1a217
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go
@@ -0,0 +1,95 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resource
+
+import (
+	"math"
+	"math/big"
+	"sync"
+)
+
+var (
+	// A sync pool to reduce allocation.
+	intPool  sync.Pool
+	maxInt64 = big.NewInt(math.MaxInt64)
+)
+
+func init() {
+	intPool.New = func() interface{} {
+		return &big.Int{}
+	}
+}
+
+// scaledValue scales given unscaled value from scale to new Scale and returns
+// an int64. It ALWAYS rounds up the result when scale down. The final result might
+// overflow.
+//
+// scale, newScale represents the scale of the unscaled decimal.
+// The mathematical value of the decimal is unscaled * 10**(-scale).
+func scaledValue(unscaled *big.Int, scale, newScale int) int64 {
+	dif := scale - newScale
+	if dif == 0 {
+		return unscaled.Int64()
+	}
+
+	// Handle scale up
+	// This is an easy case, we do not need to care about rounding and overflow.
+	// If any intermediate operation causes overflow, the result will overflow.
+	if dif < 0 {
+		return unscaled.Int64() * int64(math.Pow10(-dif))
+	}
+
+	// Handle scale down
+	// We have to be careful about the intermediate operations.
+
+	// fast path when unscaled < max.Int64 and exp(10,dif) < max.Int64
+	const log10MaxInt64 = 19
+	if unscaled.Cmp(maxInt64) < 0 && dif < log10MaxInt64 {
+		divide := int64(math.Pow10(dif))
+		result := unscaled.Int64() / divide
+		mod := unscaled.Int64() % divide
+		if mod != 0 {
+			return result + 1
+		}
+		return result
+	}
+
+	// We should only convert back to int64 when getting the result.
+	divisor := intPool.Get().(*big.Int)
+	exp := intPool.Get().(*big.Int)
+	result := intPool.Get().(*big.Int)
+	defer func() {
+		intPool.Put(divisor)
+		intPool.Put(exp)
+		intPool.Put(result)
+	}()
+
+	// divisor = 10^(dif)
+	// TODO: create loop up table if exp costs too much.
+	divisor.Exp(bigTen, exp.SetInt64(int64(dif)), nil)
+	// reuse exp
+	remainder := exp
+
+	// result = unscaled / divisor
+	// remainder = unscaled % divisor
+	result.DivMod(unscaled, divisor, remainder)
+	if remainder.Sign() != 0 {
+		return result.Int64() + 1
+	}
+
+	return result.Int64()
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go b/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
new file mode 100644
index 0000000000..529712365d
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
@@ -0,0 +1,136 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resource
+
+import (
+	"strconv"
+)
+
+type suffix string
+
+// suffixer can interpret and construct suffixes.
+type suffixer interface {
+	interpret(suffix) (base, exponent int, fmt Format, ok bool)
+	construct(base, exponent int, fmt Format) (s suffix, ok bool)
+}
+
+// quantitySuffixer handles suffixes for all three formats that quantity
+// can handle.
+var quantitySuffixer = newSuffixer()
+
+type bePair struct {
+	base, exponent int
+}
+
+type listSuffixer struct {
+	suffixToBE map[suffix]bePair
+	beToSuffix map[bePair]suffix
+}
+
+func (ls *listSuffixer) addSuffix(s suffix, pair bePair) {
+	if ls.suffixToBE == nil {
+		ls.suffixToBE = map[suffix]bePair{}
+	}
+	if ls.beToSuffix == nil {
+		ls.beToSuffix = map[bePair]suffix{}
+	}
+	ls.suffixToBE[s] = pair
+	ls.beToSuffix[pair] = s
+}
+
+func (ls *listSuffixer) lookup(s suffix) (base, exponent int, ok bool) {
+	pair, ok := ls.suffixToBE[s]
+	if !ok {
+		return 0, 0, false
+	}
+	return pair.base, pair.exponent, true
+}
+
+func (ls *listSuffixer) construct(base, exponent int) (s suffix, ok bool) {
+	s, ok = ls.beToSuffix[bePair{base, exponent}]
+	return
+}
+
+type suffixHandler struct {
+	decSuffixes listSuffixer
+	binSuffixes listSuffixer
+}
+
+func newSuffixer() suffixer {
+	sh := &suffixHandler{}
+
+	sh.binSuffixes.addSuffix("Ki", bePair{2, 10})
+	sh.binSuffixes.addSuffix("Mi", bePair{2, 20})
+	sh.binSuffixes.addSuffix("Gi", bePair{2, 30})
+	sh.binSuffixes.addSuffix("Ti", bePair{2, 40})
+	sh.binSuffixes.addSuffix("Pi", bePair{2, 50})
+	sh.binSuffixes.addSuffix("Ei", bePair{2, 60})
+	// Don't emit an error when trying to produce
+	// a suffix for 2^0.
+	sh.decSuffixes.addSuffix("", bePair{2, 0})
+
+	sh.decSuffixes.addSuffix("n", bePair{10, -9})
+	sh.decSuffixes.addSuffix("u", bePair{10, -6})
+	sh.decSuffixes.addSuffix("m", bePair{10, -3})
+	sh.decSuffixes.addSuffix("", bePair{10, 0})
+	sh.decSuffixes.addSuffix("k", bePair{10, 3})
+	sh.decSuffixes.addSuffix("M", bePair{10, 6})
+	sh.decSuffixes.addSuffix("G", bePair{10, 9})
+	sh.decSuffixes.addSuffix("T", bePair{10, 12})
+	sh.decSuffixes.addSuffix("P", bePair{10, 15})
+	sh.decSuffixes.addSuffix("E", bePair{10, 18})
+
+	return sh
+}
+
+func (sh *suffixHandler) construct(base, exponent int, fmt Format) (s suffix, ok bool) {
+	switch fmt {
+	case DecimalSI:
+		return sh.decSuffixes.construct(base, exponent)
+	case BinarySI:
+		return sh.binSuffixes.construct(base, exponent)
+	case DecimalExponent:
+		if base != 10 {
+			return "", false
+		}
+		if exponent == 0 {
+			return "", true
+		}
+		return suffix("e" + strconv.FormatInt(int64(exponent), 10)), true
+	}
+	return "", false
+}
+
+func (sh *suffixHandler) interpret(suffix suffix) (base, exponent int, fmt Format, ok bool) {
+	// Try lookup tables first
+	if b, e, ok := sh.decSuffixes.lookup(suffix); ok {
+		return b, e, DecimalSI, true
+	}
+	if b, e, ok := sh.binSuffixes.lookup(suffix); ok {
+		return b, e, BinarySI, true
+	}
+
+	if len(suffix) > 1 && (suffix[0] == 'E' || suffix[0] == 'e') {
+		parsed, err := strconv.ParseInt(string(suffix[1:]), 10, 64)
+		if err != nil {
+			return 0, 0, DecimalExponent, false
+		}
+		return 10, int(parsed), DecimalExponent, true
+	}
+
+	return 0, 0, DecimalExponent, false
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/cloner.go b/vendor/k8s.io/kubernetes/pkg/conversion/cloner.go
new file mode 100644
index 0000000000..a8c5747132
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/conversion/cloner.go
@@ -0,0 +1,237 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conversion
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// Cloner knows how to copy one type to another.
+type Cloner struct {
+	// Map from the type to a function which can do the deep copy.
+	deepCopyFuncs          map[reflect.Type]reflect.Value
+	generatedDeepCopyFuncs map[reflect.Type]reflect.Value
+}
+
+// NewCloner creates a new Cloner object.
+func NewCloner() *Cloner {
+	c := &Cloner{
+		deepCopyFuncs:          map[reflect.Type]reflect.Value{},
+		generatedDeepCopyFuncs: map[reflect.Type]reflect.Value{},
+	}
+	if err := c.RegisterDeepCopyFunc(byteSliceDeepCopy); err != nil {
+		// If one of the deep-copy functions is malformed, detect it immediately.
+		panic(err)
+	}
+	return c
+}
+
+// Prevent recursing into every byte...
+func byteSliceDeepCopy(in []byte, out *[]byte, c *Cloner) error {
+	if in != nil {
+		*out = make([]byte, len(in))
+		copy(*out, in)
+	} else {
+		*out = nil
+	}
+	return nil
+}
+
+// Verifies whether a deep-copy function has a correct signature.
+func verifyDeepCopyFunctionSignature(ft reflect.Type) error {
+	if ft.Kind() != reflect.Func {
+		return fmt.Errorf("expected func, got: %v", ft)
+	}
+	if ft.NumIn() != 3 {
+		return fmt.Errorf("expected three 'in' params, got %v", ft)
+	}
+	if ft.NumOut() != 1 {
+		return fmt.Errorf("expected one 'out' param, got %v", ft)
+	}
+	if ft.In(1).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'in' param 1, got: %v", ft)
+	}
+	if ft.In(1).Elem() != ft.In(0) {
+		return fmt.Errorf("expected 'in' param 0 the same as param 1, got: %v", ft)
+	}
+	var forClonerType Cloner
+	if expected := reflect.TypeOf(&forClonerType); ft.In(2) != expected {
+		return fmt.Errorf("expected '%v' arg for 'in' param 2, got: '%v'", expected, ft.In(2))
+	}
+	var forErrorType error
+	// This convolution is necessary, otherwise TypeOf picks up on the fact
+	// that forErrorType is nil
+	errorType := reflect.TypeOf(&forErrorType).Elem()
+	if ft.Out(0) != errorType {
+		return fmt.Errorf("expected error return, got: %v", ft)
+	}
+	return nil
+}
+
+// RegisterGeneratedDeepCopyFunc registers a copying func with the Cloner.
+// deepCopyFunc must take three parameters: a type input, a pointer to a
+// type output, and a pointer to Cloner. It should return an error.
+//
+// Example:
+// c.RegisterGeneratedDeepCopyFunc(
+//         func(in Pod, out *Pod, c *Cloner) error {
+//                 // deep copy logic...
+//                 return nil
+//          })
+func (c *Cloner) RegisterDeepCopyFunc(deepCopyFunc interface{}) error {
+	fv := reflect.ValueOf(deepCopyFunc)
+	ft := fv.Type()
+	if err := verifyDeepCopyFunctionSignature(ft); err != nil {
+		return err
+	}
+	c.deepCopyFuncs[ft.In(0)] = fv
+	return nil
+}
+
+// Similar to RegisterDeepCopyFunc, but registers deep copy function that were
+// automatically generated.
+func (c *Cloner) RegisterGeneratedDeepCopyFunc(deepCopyFunc interface{}) error {
+	fv := reflect.ValueOf(deepCopyFunc)
+	ft := fv.Type()
+	if err := verifyDeepCopyFunctionSignature(ft); err != nil {
+		return err
+	}
+	c.generatedDeepCopyFuncs[ft.In(0)] = fv
+	return nil
+}
+
+// DeepCopy will perform a deep copy of a given object.
+func (c *Cloner) DeepCopy(in interface{}) (interface{}, error) {
+	// Can be invalid if we run DeepCopy(X) where X is a nil interface type.
+	// For example, we get an invalid value when someone tries to deep-copy
+	// a nil labels.Selector.
+	// This does not occur if X is nil and is a pointer to a concrete type.
+	if in == nil {
+		return nil, nil
+	}
+	inValue := reflect.ValueOf(in)
+	outValue, err := c.deepCopy(inValue)
+	if err != nil {
+		return nil, err
+	}
+	return outValue.Interface(), nil
+}
+
+func (c *Cloner) deepCopy(src reflect.Value) (reflect.Value, error) {
+	inType := src.Type()
+
+	if fv, ok := c.deepCopyFuncs[inType]; ok {
+		return c.customDeepCopy(src, fv)
+	}
+	if fv, ok := c.generatedDeepCopyFuncs[inType]; ok {
+		return c.customDeepCopy(src, fv)
+	}
+	return c.defaultDeepCopy(src)
+}
+
+func (c *Cloner) customDeepCopy(src, fv reflect.Value) (reflect.Value, error) {
+	outValue := reflect.New(src.Type())
+	args := []reflect.Value{src, outValue, reflect.ValueOf(c)}
+	result := fv.Call(args)[0].Interface()
+	// This convolution is necessary because nil interfaces won't convert
+	// to error.
+	if result == nil {
+		return outValue.Elem(), nil
+	}
+	return outValue.Elem(), result.(error)
+}
+
+func (c *Cloner) defaultDeepCopy(src reflect.Value) (reflect.Value, error) {
+	switch src.Kind() {
+	case reflect.Chan, reflect.Func, reflect.UnsafePointer, reflect.Uintptr:
+		return src, fmt.Errorf("cannot deep copy kind: %s", src.Kind())
+	case reflect.Array:
+		dst := reflect.New(src.Type())
+		for i := 0; i < src.Len(); i++ {
+			copyVal, err := c.deepCopy(src.Index(i))
+			if err != nil {
+				return src, err
+			}
+			dst.Elem().Index(i).Set(copyVal)
+		}
+		return dst.Elem(), nil
+	case reflect.Interface:
+		if src.IsNil() {
+			return src, nil
+		}
+		return c.deepCopy(src.Elem())
+	case reflect.Map:
+		if src.IsNil() {
+			return src, nil
+		}
+		dst := reflect.MakeMap(src.Type())
+		for _, k := range src.MapKeys() {
+			copyVal, err := c.deepCopy(src.MapIndex(k))
+			if err != nil {
+				return src, err
+			}
+			dst.SetMapIndex(k, copyVal)
+		}
+		return dst, nil
+	case reflect.Ptr:
+		if src.IsNil() {
+			return src, nil
+		}
+		dst := reflect.New(src.Type().Elem())
+		copyVal, err := c.deepCopy(src.Elem())
+		if err != nil {
+			return src, err
+		}
+		dst.Elem().Set(copyVal)
+		return dst, nil
+	case reflect.Slice:
+		if src.IsNil() {
+			return src, nil
+		}
+		dst := reflect.MakeSlice(src.Type(), 0, src.Len())
+		for i := 0; i < src.Len(); i++ {
+			copyVal, err := c.deepCopy(src.Index(i))
+			if err != nil {
+				return src, err
+			}
+			dst = reflect.Append(dst, copyVal)
+		}
+		return dst, nil
+	case reflect.Struct:
+		dst := reflect.New(src.Type())
+		for i := 0; i < src.NumField(); i++ {
+			if !dst.Elem().Field(i).CanSet() {
+				// Can't set private fields. At this point, the
+				// best we can do is a shallow copy. For
+				// example, time.Time is a value type with
+				// private members that can be shallow copied.
+				return src, nil
+			}
+			copyVal, err := c.deepCopy(src.Field(i))
+			if err != nil {
+				return src, err
+			}
+			dst.Elem().Field(i).Set(copyVal)
+		}
+		return dst.Elem(), nil
+
+	default:
+		// Value types like numbers, booleans, and strings.
+		return src, nil
+	}
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/converter.go b/vendor/k8s.io/kubernetes/pkg/conversion/converter.go
new file mode 100644
index 0000000000..e045dcd2f7
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/conversion/converter.go
@@ -0,0 +1,951 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conversion
+
+import (
+	"fmt"
+	"reflect"
+)
+
+type typePair struct {
+	source reflect.Type
+	dest   reflect.Type
+}
+
+type typeNamePair struct {
+	fieldType reflect.Type
+	fieldName string
+}
+
+// DebugLogger allows you to get debugging messages if necessary.
+type DebugLogger interface {
+	Logf(format string, args ...interface{})
+}
+
+type NameFunc func(t reflect.Type) string
+
+var DefaultNameFunc = func(t reflect.Type) string { return t.Name() }
+
+type GenericConversionFunc func(a, b interface{}, scope Scope) (bool, error)
+
+// Converter knows how to convert one type to another.
+type Converter struct {
+	// Map from the conversion pair to a function which can
+	// do the conversion.
+	conversionFuncs          ConversionFuncs
+	generatedConversionFuncs ConversionFuncs
+
+	// genericConversions are called during normal conversion to offer a "fast-path"
+	// that avoids all reflection. These methods are not called outside of the .Convert()
+	// method.
+	genericConversions []GenericConversionFunc
+
+	// Set of conversions that should be treated as a no-op
+	ignoredConversions map[typePair]struct{}
+
+	// This is a map from a source field type and name, to a list of destination
+	// field type and name.
+	structFieldDests map[typeNamePair][]typeNamePair
+
+	// Allows for the opposite lookup of structFieldDests. So that SourceFromDest
+	// copy flag also works. So this is a map of destination field name, to potential
+	// source field name and type to look for.
+	structFieldSources map[typeNamePair][]typeNamePair
+
+	// Map from a type to a function which applies defaults.
+	defaultingFuncs map[reflect.Type]reflect.Value
+
+	// Similar to above, but function is stored as interface{}.
+	defaultingInterfaces map[reflect.Type]interface{}
+
+	// Map from an input type to a function which can apply a key name mapping
+	inputFieldMappingFuncs map[reflect.Type]FieldMappingFunc
+
+	// Map from an input type to a set of default conversion flags.
+	inputDefaultFlags map[reflect.Type]FieldMatchingFlags
+
+	// If non-nil, will be called to print helpful debugging info. Quite verbose.
+	Debug DebugLogger
+
+	// nameFunc is called to retrieve the name of a type; this name is used for the
+	// purpose of deciding whether two types match or not (i.e., will we attempt to
+	// do a conversion). The default returns the go type name.
+	nameFunc func(t reflect.Type) string
+}
+
+// NewConverter creates a new Converter object.
+func NewConverter(nameFn NameFunc) *Converter {
+	c := &Converter{
+		conversionFuncs:          NewConversionFuncs(),
+		generatedConversionFuncs: NewConversionFuncs(),
+		ignoredConversions:       make(map[typePair]struct{}),
+		defaultingFuncs:          make(map[reflect.Type]reflect.Value),
+		defaultingInterfaces:     make(map[reflect.Type]interface{}),
+		nameFunc:                 nameFn,
+		structFieldDests:         make(map[typeNamePair][]typeNamePair),
+		structFieldSources:       make(map[typeNamePair][]typeNamePair),
+
+		inputFieldMappingFuncs: make(map[reflect.Type]FieldMappingFunc),
+		inputDefaultFlags:      make(map[reflect.Type]FieldMatchingFlags),
+	}
+	c.RegisterConversionFunc(Convert_Slice_byte_To_Slice_byte)
+	return c
+}
+
+// AddGenericConversionFunc adds a function that accepts the ConversionFunc call pattern
+// (for two conversion types) to the converter. These functions are checked first during
+// a normal conversion, but are otherwise not called. Use AddConversionFuncs when registering
+// typed conversions.
+func (c *Converter) AddGenericConversionFunc(fn GenericConversionFunc) {
+	c.genericConversions = append(c.genericConversions, fn)
+}
+
+// WithConversions returns a Converter that is a copy of c but with the additional
+// fns merged on top.
+func (c *Converter) WithConversions(fns ConversionFuncs) *Converter {
+	copied := *c
+	copied.conversionFuncs = c.conversionFuncs.Merge(fns)
+	return &copied
+}
+
+// DefaultMeta returns the conversion FieldMappingFunc and meta for a given type.
+func (c *Converter) DefaultMeta(t reflect.Type) (FieldMatchingFlags, *Meta) {
+	return c.inputDefaultFlags[t], &Meta{
+		KeyNameMapping: c.inputFieldMappingFuncs[t],
+	}
+}
+
+// Convert_Slice_byte_To_Slice_byte prevents recursing into every byte
+func Convert_Slice_byte_To_Slice_byte(in *[]byte, out *[]byte, s Scope) error {
+	if *in == nil {
+		*out = nil
+		return nil
+	}
+	*out = make([]byte, len(*in))
+	copy(*out, *in)
+	return nil
+}
+
+// Scope is passed to conversion funcs to allow them to continue an ongoing conversion.
+// If multiple converters exist in the system, Scope will allow you to use the correct one
+// from a conversion function--that is, the one your conversion function was called by.
+type Scope interface {
+	// Call Convert to convert sub-objects. Note that if you call it with your own exact
+	// parameters, you'll run out of stack space before anything useful happens.
+	Convert(src, dest interface{}, flags FieldMatchingFlags) error
+
+	// DefaultConvert performs the default conversion, without calling a conversion func
+	// on the current stack frame. This makes it safe to call from a conversion func.
+	DefaultConvert(src, dest interface{}, flags FieldMatchingFlags) error
+
+	// If registered, returns a function applying defaults for objects of a given type.
+	// Used for automatically generating conversion functions.
+	DefaultingInterface(inType reflect.Type) (interface{}, bool)
+
+	// SrcTags and DestTags contain the struct tags that src and dest had, respectively.
+	// If the enclosing object was not a struct, then these will contain no tags, of course.
+	SrcTag() reflect.StructTag
+	DestTag() reflect.StructTag
+
+	// Flags returns the flags with which the conversion was started.
+	Flags() FieldMatchingFlags
+
+	// Meta returns any information originally passed to Convert.
+	Meta() *Meta
+}
+
+// FieldMappingFunc can convert an input field value into different values, depending on
+// the value of the source or destination struct tags.
+type FieldMappingFunc func(key string, sourceTag, destTag reflect.StructTag) (source string, dest string)
+
+func NewConversionFuncs() ConversionFuncs {
+	return ConversionFuncs{fns: make(map[typePair]reflect.Value)}
+}
+
+type ConversionFuncs struct {
+	fns map[typePair]reflect.Value
+}
+
+// Add adds the provided conversion functions to the lookup table - they must have the signature
+// `func(type1, type2, Scope) error`. Functions are added in the order passed and will override
+// previously registered pairs.
+func (c ConversionFuncs) Add(fns ...interface{}) error {
+	for _, fn := range fns {
+		fv := reflect.ValueOf(fn)
+		ft := fv.Type()
+		if err := verifyConversionFunctionSignature(ft); err != nil {
+			return err
+		}
+		c.fns[typePair{ft.In(0).Elem(), ft.In(1).Elem()}] = fv
+	}
+	return nil
+}
+
+// Merge returns a new ConversionFuncs that contains all conversions from
+// both other and c, with other conversions taking precedence.
+func (c ConversionFuncs) Merge(other ConversionFuncs) ConversionFuncs {
+	merged := NewConversionFuncs()
+	for k, v := range c.fns {
+		merged.fns[k] = v
+	}
+	for k, v := range other.fns {
+		merged.fns[k] = v
+	}
+	return merged
+}
+
+// Meta is supplied by Scheme, when it calls Convert.
+type Meta struct {
+	// KeyNameMapping is an optional function which may map the listed key (field name)
+	// into a source and destination value.
+	KeyNameMapping FieldMappingFunc
+}
+
+// scope contains information about an ongoing conversion.
+type scope struct {
+	converter *Converter
+	meta      *Meta
+	flags     FieldMatchingFlags
+
+	// srcStack & destStack are separate because they may not have a 1:1
+	// relationship.
+	srcStack  scopeStack
+	destStack scopeStack
+}
+
+type scopeStackElem struct {
+	tag   reflect.StructTag
+	value reflect.Value
+	key   string
+}
+
+type scopeStack []scopeStackElem
+
+func (s *scopeStack) pop() {
+	n := len(*s)
+	*s = (*s)[:n-1]
+}
+
+func (s *scopeStack) push(e scopeStackElem) {
+	*s = append(*s, e)
+}
+
+func (s *scopeStack) top() *scopeStackElem {
+	return &(*s)[len(*s)-1]
+}
+
+func (s scopeStack) describe() string {
+	desc := ""
+	if len(s) > 1 {
+		desc = "(" + s[1].value.Type().String() + ")"
+	}
+	for i, v := range s {
+		if i < 2 {
+			// First layer on stack is not real; second is handled specially above.
+			continue
+		}
+		if v.key == "" {
+			desc += fmt.Sprintf(".%v", v.value.Type())
+		} else {
+			desc += fmt.Sprintf(".%v", v.key)
+		}
+	}
+	return desc
+}
+
+func (s *scope) DefaultingInterface(inType reflect.Type) (interface{}, bool) {
+	value, found := s.converter.defaultingInterfaces[inType]
+	return value, found
+}
+
+// Formats src & dest as indices for printing.
+func (s *scope) setIndices(src, dest int) {
+	s.srcStack.top().key = fmt.Sprintf("[%v]", src)
+	s.destStack.top().key = fmt.Sprintf("[%v]", dest)
+}
+
+// Formats src & dest as map keys for printing.
+func (s *scope) setKeys(src, dest interface{}) {
+	s.srcStack.top().key = fmt.Sprintf(`["%v"]`, src)
+	s.destStack.top().key = fmt.Sprintf(`["%v"]`, dest)
+}
+
+// Convert continues a conversion.
+func (s *scope) Convert(src, dest interface{}, flags FieldMatchingFlags) error {
+	return s.converter.Convert(src, dest, flags, s.meta)
+}
+
+// DefaultConvert continues a conversion, performing a default conversion (no conversion func)
+// for the current stack frame.
+func (s *scope) DefaultConvert(src, dest interface{}, flags FieldMatchingFlags) error {
+	return s.converter.DefaultConvert(src, dest, flags, s.meta)
+}
+
+// SrcTag returns the tag of the struct containing the current source item, if any.
+func (s *scope) SrcTag() reflect.StructTag {
+	return s.srcStack.top().tag
+}
+
+// DestTag returns the tag of the struct containing the current dest item, if any.
+func (s *scope) DestTag() reflect.StructTag {
+	return s.destStack.top().tag
+}
+
+// Flags returns the flags with which the current conversion was started.
+func (s *scope) Flags() FieldMatchingFlags {
+	return s.flags
+}
+
+// Meta returns the meta object that was originally passed to Convert.
+func (s *scope) Meta() *Meta {
+	return s.meta
+}
+
+// describe prints the path to get to the current (source, dest) values.
+func (s *scope) describe() (src, dest string) {
+	return s.srcStack.describe(), s.destStack.describe()
+}
+
+// error makes an error that includes information about where we were in the objects
+// we were asked to convert.
+func (s *scope) errorf(message string, args ...interface{}) error {
+	srcPath, destPath := s.describe()
+	where := fmt.Sprintf("converting %v to %v: ", srcPath, destPath)
+	return fmt.Errorf(where+message, args...)
+}
+
+// Verifies whether a conversion function has a correct signature.
+func verifyConversionFunctionSignature(ft reflect.Type) error {
+	if ft.Kind() != reflect.Func {
+		return fmt.Errorf("expected func, got: %v", ft)
+	}
+	if ft.NumIn() != 3 {
+		return fmt.Errorf("expected three 'in' params, got: %v", ft)
+	}
+	if ft.NumOut() != 1 {
+		return fmt.Errorf("expected one 'out' param, got: %v", ft)
+	}
+	if ft.In(0).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'in' param 0, got: %v", ft)
+	}
+	if ft.In(1).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'in' param 1, got: %v", ft)
+	}
+	scopeType := Scope(nil)
+	if e, a := reflect.TypeOf(&scopeType).Elem(), ft.In(2); e != a {
+		return fmt.Errorf("expected '%v' arg for 'in' param 2, got '%v' (%v)", e, a, ft)
+	}
+	var forErrorType error
+	// This convolution is necessary, otherwise TypeOf picks up on the fact
+	// that forErrorType is nil.
+	errorType := reflect.TypeOf(&forErrorType).Elem()
+	if ft.Out(0) != errorType {
+		return fmt.Errorf("expected error return, got: %v", ft)
+	}
+	return nil
+}
+
+// RegisterConversionFunc registers a conversion func with the
+// Converter. conversionFunc must take three parameters: a pointer to the input
+// type, a pointer to the output type, and a conversion.Scope (which should be
+// used if recursive conversion calls are desired).  It must return an error.
+//
+// Example:
+// c.RegisterConversionFunc(
+//         func(in *Pod, out *v1.Pod, s Scope) error {
+//                 // conversion logic...
+//                 return nil
+//          })
+func (c *Converter) RegisterConversionFunc(conversionFunc interface{}) error {
+	return c.conversionFuncs.Add(conversionFunc)
+}
+
+// Similar to RegisterConversionFunc, but registers conversion function that were
+// automatically generated.
+func (c *Converter) RegisterGeneratedConversionFunc(conversionFunc interface{}) error {
+	return c.generatedConversionFuncs.Add(conversionFunc)
+}
+
+// RegisterIgnoredConversion registers a "no-op" for conversion, where any requested
+// conversion between from and to is ignored.
+func (c *Converter) RegisterIgnoredConversion(from, to interface{}) error {
+	typeFrom := reflect.TypeOf(from)
+	typeTo := reflect.TypeOf(to)
+	if reflect.TypeOf(from).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'from' param 0, got: %v", typeFrom)
+	}
+	if typeTo.Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'to' param 1, got: %v", typeTo)
+	}
+	c.ignoredConversions[typePair{typeFrom.Elem(), typeTo.Elem()}] = struct{}{}
+	return nil
+}
+
+// IsConversionIgnored returns true if the specified objects should be dropped during
+// conversion.
+func (c *Converter) IsConversionIgnored(inType, outType reflect.Type) bool {
+	_, found := c.ignoredConversions[typePair{inType, outType}]
+	return found
+}
+
+func (c *Converter) HasConversionFunc(inType, outType reflect.Type) bool {
+	_, found := c.conversionFuncs.fns[typePair{inType, outType}]
+	return found
+}
+
+func (c *Converter) ConversionFuncValue(inType, outType reflect.Type) (reflect.Value, bool) {
+	value, found := c.conversionFuncs.fns[typePair{inType, outType}]
+	return value, found
+}
+
+// SetStructFieldCopy registers a correspondence. Whenever a struct field is encountered
+// which has a type and name matching srcFieldType and srcFieldName, it wil be copied
+// into the field in the destination struct matching destFieldType & Name, if such a
+// field exists.
+// May be called multiple times, even for the same source field & type--all applicable
+// copies will be performed.
+func (c *Converter) SetStructFieldCopy(srcFieldType interface{}, srcFieldName string, destFieldType interface{}, destFieldName string) error {
+	st := reflect.TypeOf(srcFieldType)
+	dt := reflect.TypeOf(destFieldType)
+	srcKey := typeNamePair{st, srcFieldName}
+	destKey := typeNamePair{dt, destFieldName}
+	c.structFieldDests[srcKey] = append(c.structFieldDests[srcKey], destKey)
+	c.structFieldSources[destKey] = append(c.structFieldSources[destKey], srcKey)
+	return nil
+}
+
+// RegisterDefaultingFunc registers a value-defaulting func with the Converter.
+// defaultingFunc must take one parameters: a pointer to the input type.
+//
+// Example:
+// c.RegisteDefaultingFunc(
+//         func(in *v1.Pod) {
+//                 // defaulting logic...
+//          })
+func (c *Converter) RegisterDefaultingFunc(defaultingFunc interface{}) error {
+	fv := reflect.ValueOf(defaultingFunc)
+	ft := fv.Type()
+	if ft.Kind() != reflect.Func {
+		return fmt.Errorf("expected func, got: %v", ft)
+	}
+	if ft.NumIn() != 1 {
+		return fmt.Errorf("expected one 'in' param, got: %v", ft)
+	}
+	if ft.NumOut() != 0 {
+		return fmt.Errorf("expected zero 'out' params, got: %v", ft)
+	}
+	if ft.In(0).Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer arg for 'in' param 0, got: %v", ft)
+	}
+	inType := ft.In(0).Elem()
+	c.defaultingFuncs[inType] = fv
+	c.defaultingInterfaces[inType] = defaultingFunc
+	return nil
+}
+
+// RegisterInputDefaults registers a field name mapping function, used when converting
+// from maps to structs. Inputs to the conversion methods are checked for this type and a mapping
+// applied automatically if the input matches in. A set of default flags for the input conversion
+// may also be provided, which will be used when no explicit flags are requested.
+func (c *Converter) RegisterInputDefaults(in interface{}, fn FieldMappingFunc, defaultFlags FieldMatchingFlags) error {
+	fv := reflect.ValueOf(in)
+	ft := fv.Type()
+	if ft.Kind() != reflect.Ptr {
+		return fmt.Errorf("expected pointer 'in' argument, got: %v", ft)
+	}
+	c.inputFieldMappingFuncs[ft] = fn
+	c.inputDefaultFlags[ft] = defaultFlags
+	return nil
+}
+
+// FieldMatchingFlags contains a list of ways in which struct fields could be
+// copied. These constants may be | combined.
+type FieldMatchingFlags int
+
+const (
+	// Loop through destination fields, search for matching source
+	// field to copy it from. Source fields with no corresponding
+	// destination field will be ignored. If SourceToDest is
+	// specified, this flag is ignored. If neither is specified,
+	// or no flags are passed, this flag is the default.
+	DestFromSource FieldMatchingFlags = 0
+	// Loop through source fields, search for matching dest field
+	// to copy it into. Destination fields with no corresponding
+	// source field will be ignored.
+	SourceToDest FieldMatchingFlags = 1 << iota
+	// Don't treat it as an error if the corresponding source or
+	// dest field can't be found.
+	IgnoreMissingFields
+	// Don't require type names to match.
+	AllowDifferentFieldTypeNames
+)
+
+// IsSet returns true if the given flag or combination of flags is set.
+func (f FieldMatchingFlags) IsSet(flag FieldMatchingFlags) bool {
+	if flag == DestFromSource {
+		// The bit logic doesn't work on the default value.
+		return f&SourceToDest != SourceToDest
+	}
+	return f&flag == flag
+}
+
+// Convert will translate src to dest if it knows how. Both must be pointers.
+// If no conversion func is registered and the default copying mechanism
+// doesn't work on this type pair, an error will be returned.
+// Read the comments on the various FieldMatchingFlags constants to understand
+// what the 'flags' parameter does.
+// 'meta' is given to allow you to pass information to conversion functions,
+// it is not used by Convert() other than storing it in the scope.
+// Not safe for objects with cyclic references!
+func (c *Converter) Convert(src, dest interface{}, flags FieldMatchingFlags, meta *Meta) error {
+	if len(c.genericConversions) > 0 {
+		// TODO: avoid scope allocation
+		s := &scope{converter: c, flags: flags, meta: meta}
+		for _, fn := range c.genericConversions {
+			if ok, err := fn(src, dest, s); ok {
+				return err
+			}
+		}
+	}
+	return c.doConversion(src, dest, flags, meta, c.convert)
+}
+
+// DefaultConvert will translate src to dest if it knows how. Both must be pointers.
+// No conversion func is used. If the default copying mechanism
+// doesn't work on this type pair, an error will be returned.
+// Read the comments on the various FieldMatchingFlags constants to understand
+// what the 'flags' parameter does.
+// 'meta' is given to allow you to pass information to conversion functions,
+// it is not used by DefaultConvert() other than storing it in the scope.
+// Not safe for objects with cyclic references!
+func (c *Converter) DefaultConvert(src, dest interface{}, flags FieldMatchingFlags, meta *Meta) error {
+	return c.doConversion(src, dest, flags, meta, c.defaultConvert)
+}
+
+type conversionFunc func(sv, dv reflect.Value, scope *scope) error
+
+func (c *Converter) doConversion(src, dest interface{}, flags FieldMatchingFlags, meta *Meta, f conversionFunc) error {
+	dv, err := EnforcePtr(dest)
+	if err != nil {
+		return err
+	}
+	if !dv.CanAddr() && !dv.CanSet() {
+		return fmt.Errorf("can't write to dest")
+	}
+	sv, err := EnforcePtr(src)
+	if err != nil {
+		return err
+	}
+	s := &scope{
+		converter: c,
+		flags:     flags,
+		meta:      meta,
+	}
+	// Leave something on the stack, so that calls to struct tag getters never fail.
+	s.srcStack.push(scopeStackElem{})
+	s.destStack.push(scopeStackElem{})
+	return f(sv, dv, s)
+}
+
+// callCustom calls 'custom' with sv & dv. custom must be a conversion function.
+func (c *Converter) callCustom(sv, dv, custom reflect.Value, scope *scope) error {
+	if !sv.CanAddr() {
+		sv2 := reflect.New(sv.Type())
+		sv2.Elem().Set(sv)
+		sv = sv2
+	} else {
+		sv = sv.Addr()
+	}
+	if !dv.CanAddr() {
+		if !dv.CanSet() {
+			return scope.errorf("can't addr or set dest.")
+		}
+		dvOrig := dv
+		dv := reflect.New(dvOrig.Type())
+		defer func() { dvOrig.Set(dv) }()
+	} else {
+		dv = dv.Addr()
+	}
+	args := []reflect.Value{sv, dv, reflect.ValueOf(scope)}
+	ret := custom.Call(args)[0].Interface()
+	// This convolution is necessary because nil interfaces won't convert
+	// to errors.
+	if ret == nil {
+		return nil
+	}
+	return ret.(error)
+}
+
+// convert recursively copies sv into dv, calling an appropriate conversion function if
+// one is registered.
+func (c *Converter) convert(sv, dv reflect.Value, scope *scope) error {
+	dt, st := dv.Type(), sv.Type()
+	// Apply default values.
+	if fv, ok := c.defaultingFuncs[st]; ok {
+		if c.Debug != nil {
+			c.Debug.Logf("Applying defaults for '%v'", st)
+		}
+		args := []reflect.Value{sv.Addr()}
+		fv.Call(args)
+	}
+
+	pair := typePair{st, dt}
+
+	// ignore conversions of this type
+	if _, ok := c.ignoredConversions[pair]; ok {
+		if c.Debug != nil {
+			c.Debug.Logf("Ignoring conversion of '%v' to '%v'", st, dt)
+		}
+		return nil
+	}
+
+	// Convert sv to dv.
+	if fv, ok := c.conversionFuncs.fns[pair]; ok {
+		if c.Debug != nil {
+			c.Debug.Logf("Calling custom conversion of '%v' to '%v'", st, dt)
+		}
+		return c.callCustom(sv, dv, fv, scope)
+	}
+	if fv, ok := c.generatedConversionFuncs.fns[pair]; ok {
+		if c.Debug != nil {
+			c.Debug.Logf("Calling generated conversion of '%v' to '%v'", st, dt)
+		}
+		return c.callCustom(sv, dv, fv, scope)
+	}
+
+	return c.defaultConvert(sv, dv, scope)
+}
+
+// defaultConvert recursively copies sv into dv. no conversion function is called
+// for the current stack frame (but conversion functions may be called for nested objects)
+func (c *Converter) defaultConvert(sv, dv reflect.Value, scope *scope) error {
+	dt, st := dv.Type(), sv.Type()
+
+	if !dv.CanSet() {
+		return scope.errorf("Cannot set dest. (Tried to deep copy something with unexported fields?)")
+	}
+
+	if !scope.flags.IsSet(AllowDifferentFieldTypeNames) && c.nameFunc(dt) != c.nameFunc(st) {
+		return scope.errorf(
+			"type names don't match (%v, %v), and no conversion 'func (%v, %v) error' registered.",
+			c.nameFunc(st), c.nameFunc(dt), st, dt)
+	}
+
+	switch st.Kind() {
+	case reflect.Map, reflect.Ptr, reflect.Slice, reflect.Interface, reflect.Struct:
+		// Don't copy these via assignment/conversion!
+	default:
+		// This should handle all simple types.
+		if st.AssignableTo(dt) {
+			dv.Set(sv)
+			return nil
+		}
+		if st.ConvertibleTo(dt) {
+			dv.Set(sv.Convert(dt))
+			return nil
+		}
+	}
+
+	if c.Debug != nil {
+		c.Debug.Logf("Trying to convert '%v' to '%v'", st, dt)
+	}
+
+	scope.srcStack.push(scopeStackElem{value: sv})
+	scope.destStack.push(scopeStackElem{value: dv})
+	defer scope.srcStack.pop()
+	defer scope.destStack.pop()
+
+	switch dv.Kind() {
+	case reflect.Struct:
+		return c.convertKV(toKVValue(sv), toKVValue(dv), scope)
+	case reflect.Slice:
+		if sv.IsNil() {
+			// Don't make a zero-length slice.
+			dv.Set(reflect.Zero(dt))
+			return nil
+		}
+		dv.Set(reflect.MakeSlice(dt, sv.Len(), sv.Cap()))
+		for i := 0; i < sv.Len(); i++ {
+			scope.setIndices(i, i)
+			if err := c.convert(sv.Index(i), dv.Index(i), scope); err != nil {
+				return err
+			}
+		}
+	case reflect.Ptr:
+		if sv.IsNil() {
+			// Don't copy a nil ptr!
+			dv.Set(reflect.Zero(dt))
+			return nil
+		}
+		dv.Set(reflect.New(dt.Elem()))
+		switch st.Kind() {
+		case reflect.Ptr, reflect.Interface:
+			return c.convert(sv.Elem(), dv.Elem(), scope)
+		default:
+			return c.convert(sv, dv.Elem(), scope)
+		}
+	case reflect.Map:
+		if sv.IsNil() {
+			// Don't copy a nil ptr!
+			dv.Set(reflect.Zero(dt))
+			return nil
+		}
+		dv.Set(reflect.MakeMap(dt))
+		for _, sk := range sv.MapKeys() {
+			dk := reflect.New(dt.Key()).Elem()
+			if err := c.convert(sk, dk, scope); err != nil {
+				return err
+			}
+			dkv := reflect.New(dt.Elem()).Elem()
+			scope.setKeys(sk.Interface(), dk.Interface())
+			// TODO:  sv.MapIndex(sk) may return a value with CanAddr() == false,
+			// because a map[string]struct{} does not allow a pointer reference.
+			// Calling a custom conversion function defined for the map value
+			// will panic. Example is PodInfo map[string]ContainerStatus.
+			if err := c.convert(sv.MapIndex(sk), dkv, scope); err != nil {
+				return err
+			}
+			dv.SetMapIndex(dk, dkv)
+		}
+	case reflect.Interface:
+		if sv.IsNil() {
+			// Don't copy a nil interface!
+			dv.Set(reflect.Zero(dt))
+			return nil
+		}
+		tmpdv := reflect.New(sv.Elem().Type()).Elem()
+		if err := c.convert(sv.Elem(), tmpdv, scope); err != nil {
+			return err
+		}
+		dv.Set(reflect.ValueOf(tmpdv.Interface()))
+		return nil
+	default:
+		return scope.errorf("couldn't copy '%v' into '%v'; didn't understand types", st, dt)
+	}
+	return nil
+}
+
+var stringType = reflect.TypeOf("")
+
+func toKVValue(v reflect.Value) kvValue {
+	switch v.Kind() {
+	case reflect.Struct:
+		return structAdaptor(v)
+	case reflect.Map:
+		if v.Type().Key().AssignableTo(stringType) {
+			return stringMapAdaptor(v)
+		}
+	}
+
+	return nil
+}
+
+// kvValue lets us write the same conversion logic to work with both maps
+// and structs. Only maps with string keys make sense for this.
+type kvValue interface {
+	// returns all keys, as a []string.
+	keys() []string
+	// Will just return "" for maps.
+	tagOf(key string) reflect.StructTag
+	// Will return the zero Value if the key doesn't exist.
+	value(key string) reflect.Value
+	// Maps require explicit setting-- will do nothing for structs.
+	// Returns false on failure.
+	confirmSet(key string, v reflect.Value) bool
+}
+
+type stringMapAdaptor reflect.Value
+
+func (a stringMapAdaptor) len() int {
+	return reflect.Value(a).Len()
+}
+
+func (a stringMapAdaptor) keys() []string {
+	v := reflect.Value(a)
+	keys := make([]string, v.Len())
+	for i, v := range v.MapKeys() {
+		if v.IsNil() {
+			continue
+		}
+		switch t := v.Interface().(type) {
+		case string:
+			keys[i] = t
+		}
+	}
+	return keys
+}
+
+func (a stringMapAdaptor) tagOf(key string) reflect.StructTag {
+	return ""
+}
+
+func (a stringMapAdaptor) value(key string) reflect.Value {
+	return reflect.Value(a).MapIndex(reflect.ValueOf(key))
+}
+
+func (a stringMapAdaptor) confirmSet(key string, v reflect.Value) bool {
+	return true
+}
+
+type structAdaptor reflect.Value
+
+func (a structAdaptor) len() int {
+	v := reflect.Value(a)
+	return v.Type().NumField()
+}
+
+func (a structAdaptor) keys() []string {
+	v := reflect.Value(a)
+	t := v.Type()
+	keys := make([]string, t.NumField())
+	for i := range keys {
+		keys[i] = t.Field(i).Name
+	}
+	return keys
+}
+
+func (a structAdaptor) tagOf(key string) reflect.StructTag {
+	v := reflect.Value(a)
+	field, ok := v.Type().FieldByName(key)
+	if ok {
+		return field.Tag
+	}
+	return ""
+}
+
+func (a structAdaptor) value(key string) reflect.Value {
+	v := reflect.Value(a)
+	return v.FieldByName(key)
+}
+
+func (a structAdaptor) confirmSet(key string, v reflect.Value) bool {
+	return true
+}
+
+// convertKV can convert things that consist of key/value pairs, like structs
+// and some maps.
+func (c *Converter) convertKV(skv, dkv kvValue, scope *scope) error {
+	if skv == nil || dkv == nil {
+		// TODO: add keys to stack to support really understandable error messages.
+		return fmt.Errorf("Unable to convert %#v to %#v", skv, dkv)
+	}
+
+	lister := dkv
+	if scope.flags.IsSet(SourceToDest) {
+		lister = skv
+	}
+
+	var mapping FieldMappingFunc
+	if scope.meta != nil && scope.meta.KeyNameMapping != nil {
+		mapping = scope.meta.KeyNameMapping
+	}
+
+	for _, key := range lister.keys() {
+		if found, err := c.checkField(key, skv, dkv, scope); found {
+			if err != nil {
+				return err
+			}
+			continue
+		}
+		stag := skv.tagOf(key)
+		dtag := dkv.tagOf(key)
+		skey := key
+		dkey := key
+		if mapping != nil {
+			skey, dkey = scope.meta.KeyNameMapping(key, stag, dtag)
+		}
+
+		df := dkv.value(dkey)
+		sf := skv.value(skey)
+		if !df.IsValid() || !sf.IsValid() {
+			switch {
+			case scope.flags.IsSet(IgnoreMissingFields):
+				// No error.
+			case scope.flags.IsSet(SourceToDest):
+				return scope.errorf("%v not present in dest", dkey)
+			default:
+				return scope.errorf("%v not present in src", skey)
+			}
+			continue
+		}
+		scope.srcStack.top().key = skey
+		scope.srcStack.top().tag = stag
+		scope.destStack.top().key = dkey
+		scope.destStack.top().tag = dtag
+		if err := c.convert(sf, df, scope); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// checkField returns true if the field name matches any of the struct
+// field copying rules. The error should be ignored if it returns false.
+func (c *Converter) checkField(fieldName string, skv, dkv kvValue, scope *scope) (bool, error) {
+	replacementMade := false
+	if scope.flags.IsSet(DestFromSource) {
+		df := dkv.value(fieldName)
+		if !df.IsValid() {
+			return false, nil
+		}
+		destKey := typeNamePair{df.Type(), fieldName}
+		// Check each of the potential source (type, name) pairs to see if they're
+		// present in sv.
+		for _, potentialSourceKey := range c.structFieldSources[destKey] {
+			sf := skv.value(potentialSourceKey.fieldName)
+			if !sf.IsValid() {
+				continue
+			}
+			if sf.Type() == potentialSourceKey.fieldType {
+				// Both the source's name and type matched, so copy.
+				scope.srcStack.top().key = potentialSourceKey.fieldName
+				scope.destStack.top().key = fieldName
+				if err := c.convert(sf, df, scope); err != nil {
+					return true, err
+				}
+				dkv.confirmSet(fieldName, df)
+				replacementMade = true
+			}
+		}
+		return replacementMade, nil
+	}
+
+	sf := skv.value(fieldName)
+	if !sf.IsValid() {
+		return false, nil
+	}
+	srcKey := typeNamePair{sf.Type(), fieldName}
+	// Check each of the potential dest (type, name) pairs to see if they're
+	// present in dv.
+	for _, potentialDestKey := range c.structFieldDests[srcKey] {
+		df := dkv.value(potentialDestKey.fieldName)
+		if !df.IsValid() {
+			continue
+		}
+		if df.Type() == potentialDestKey.fieldType {
+			// Both the dest's name and type matched, so copy.
+			scope.srcStack.top().key = fieldName
+			scope.destStack.top().key = potentialDestKey.fieldName
+			if err := c.convert(sf, df, scope); err != nil {
+				return true, err
+			}
+			dkv.confirmSet(potentialDestKey.fieldName, df)
+			replacementMade = true
+		}
+	}
+	return replacementMade, nil
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go b/vendor/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
new file mode 100644
index 0000000000..717feaf18f
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
@@ -0,0 +1,185 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by deepcopy-gen. Do not edit it manually!
+
+package conversion
+
+import (
+	forked_reflect "k8s.io/kubernetes/third_party/forked/reflect"
+	reflect "reflect"
+)
+
+func DeepCopy_conversion_Cloner(in Cloner, out *Cloner, c *Cloner) error {
+	if in.deepCopyFuncs != nil {
+		in, out := in.deepCopyFuncs, &out.deepCopyFuncs
+		*out = make(map[reflect.Type]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.deepCopyFuncs = nil
+	}
+	if in.generatedDeepCopyFuncs != nil {
+		in, out := in.generatedDeepCopyFuncs, &out.generatedDeepCopyFuncs
+		*out = make(map[reflect.Type]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.generatedDeepCopyFuncs = nil
+	}
+	return nil
+}
+
+func DeepCopy_conversion_ConversionFuncs(in ConversionFuncs, out *ConversionFuncs, c *Cloner) error {
+	if in.fns != nil {
+		in, out := in.fns, &out.fns
+		*out = make(map[typePair]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typePair
+		}
+	} else {
+		out.fns = nil
+	}
+	return nil
+}
+
+func DeepCopy_conversion_Converter(in Converter, out *Converter, c *Cloner) error {
+	if err := DeepCopy_conversion_ConversionFuncs(in.conversionFuncs, &out.conversionFuncs, c); err != nil {
+		return err
+	}
+	if err := DeepCopy_conversion_ConversionFuncs(in.generatedConversionFuncs, &out.generatedConversionFuncs, c); err != nil {
+		return err
+	}
+	if in.genericConversions != nil {
+		in, out := in.genericConversions, &out.genericConversions
+		*out = make([]GenericConversionFunc, len(in))
+		for i := range in {
+			if newVal, err := c.DeepCopy(in[i]); err != nil {
+				return err
+			} else {
+				(*out)[i] = newVal.(GenericConversionFunc)
+			}
+		}
+	} else {
+		out.genericConversions = nil
+	}
+	if in.ignoredConversions != nil {
+		in, out := in.ignoredConversions, &out.ignoredConversions
+		*out = make(map[typePair]struct{})
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typePair
+		}
+	} else {
+		out.ignoredConversions = nil
+	}
+	if in.structFieldDests != nil {
+		in, out := in.structFieldDests, &out.structFieldDests
+		*out = make(map[typeNamePair][]typeNamePair)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typeNamePair
+		}
+	} else {
+		out.structFieldDests = nil
+	}
+	if in.structFieldSources != nil {
+		in, out := in.structFieldSources, &out.structFieldSources
+		*out = make(map[typeNamePair][]typeNamePair)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported typeNamePair
+		}
+	} else {
+		out.structFieldSources = nil
+	}
+	if in.defaultingFuncs != nil {
+		in, out := in.defaultingFuncs, &out.defaultingFuncs
+		*out = make(map[reflect.Type]reflect.Value)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.defaultingFuncs = nil
+	}
+	if in.defaultingInterfaces != nil {
+		in, out := in.defaultingInterfaces, &out.defaultingInterfaces
+		*out = make(map[reflect.Type]interface{})
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.defaultingInterfaces = nil
+	}
+	if in.inputFieldMappingFuncs != nil {
+		in, out := in.inputFieldMappingFuncs, &out.inputFieldMappingFuncs
+		*out = make(map[reflect.Type]FieldMappingFunc)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.inputFieldMappingFuncs = nil
+	}
+	if in.inputDefaultFlags != nil {
+		in, out := in.inputDefaultFlags, &out.inputDefaultFlags
+		*out = make(map[reflect.Type]FieldMatchingFlags)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.inputDefaultFlags = nil
+	}
+	if in.Debug == nil {
+		out.Debug = nil
+	} else if newVal, err := c.DeepCopy(in.Debug); err != nil {
+		return err
+	} else {
+		out.Debug = newVal.(DebugLogger)
+	}
+	if in.nameFunc == nil {
+		out.nameFunc = nil
+	} else if newVal, err := c.DeepCopy(in.nameFunc); err != nil {
+		return err
+	} else {
+		out.nameFunc = newVal.(func(reflect.Type) string)
+	}
+	return nil
+}
+
+func DeepCopy_conversion_Equalities(in Equalities, out *Equalities, c *Cloner) error {
+	if in.Equalities != nil {
+		in, out := in.Equalities, &out.Equalities
+		*out = make(forked_reflect.Equalities)
+		for range in {
+			// FIXME: Copying unassignable keys unsupported reflect.Type
+		}
+	} else {
+		out.Equalities = nil
+	}
+	return nil
+}
+
+func DeepCopy_conversion_Meta(in Meta, out *Meta, c *Cloner) error {
+	if in.KeyNameMapping == nil {
+		out.KeyNameMapping = nil
+	} else if newVal, err := c.DeepCopy(in.KeyNameMapping); err != nil {
+		return err
+	} else {
+		out.KeyNameMapping = newVal.(FieldMappingFunc)
+	}
+	return nil
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/deep_equal.go b/vendor/k8s.io/kubernetes/pkg/conversion/deep_equal.go
new file mode 100644
index 0000000000..7c3ed7cda1
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/conversion/deep_equal.go
@@ -0,0 +1,36 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conversion
+
+import (
+	"k8s.io/kubernetes/third_party/forked/reflect"
+)
+
+// The code for this type must be located in third_party, since it forks from
+// go std lib. But for convenience, we expose the type here, too.
+type Equalities struct {
+	reflect.Equalities
+}
+
+// For convenience, panics on errrors
+func EqualitiesOrDie(funcs ...interface{}) Equalities {
+	e := Equalities{reflect.Equalities{}}
+	if err := e.AddFuncs(funcs...); err != nil {
+		panic(err)
+	}
+	return e
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/doc.go b/vendor/k8s.io/kubernetes/pkg/conversion/doc.go
new file mode 100644
index 0000000000..3ef2eaba45
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/conversion/doc.go
@@ -0,0 +1,24 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package conversion provides go object versioning.
+//
+// Specifically, conversion provides a way for you to define multiple versions
+// of the same object. You may write functions which implement conversion logic,
+// but for the fields which did not change, copying is automated. This makes it
+// easy to modify the structures you use in memory without affecting the format
+// you store on disk or respond to in your external API calls.
+package conversion
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/helper.go b/vendor/k8s.io/kubernetes/pkg/conversion/helper.go
new file mode 100644
index 0000000000..39f7826595
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/conversion/helper.go
@@ -0,0 +1,39 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conversion
+
+import (
+	"fmt"
+	"reflect"
+)
+
+// EnforcePtr ensures that obj is a pointer of some sort. Returns a reflect.Value
+// of the dereferenced pointer, ensuring that it is settable/addressable.
+// Returns an error if this is not possible.
+func EnforcePtr(obj interface{}) (reflect.Value, error) {
+	v := reflect.ValueOf(obj)
+	if v.Kind() != reflect.Ptr {
+		if v.Kind() == reflect.Invalid {
+			return reflect.Value{}, fmt.Errorf("expected pointer, but got invalid kind")
+		}
+		return reflect.Value{}, fmt.Errorf("expected pointer, but got %v type", v.Type())
+	}
+	if v.IsNil() {
+		return reflect.Value{}, fmt.Errorf("expected pointer, but got nil")
+	}
+	return v.Elem(), nil
+}
diff --git a/vendor/k8s.io/kubernetes/third_party/forked/reflect/LICENSE b/vendor/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go b/vendor/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
new file mode 100644
index 0000000000..9e45dbe1d2
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
@@ -0,0 +1,388 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package reflect is a fork of go's standard library reflection package, which
+// allows for deep equal with equality functions defined.
+package reflect
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// Equalities is a map from type to a function comparing two values of
+// that type.
+type Equalities map[reflect.Type]reflect.Value
+
+// For convenience, panics on errrors
+func EqualitiesOrDie(funcs ...interface{}) Equalities {
+	e := Equalities{}
+	if err := e.AddFuncs(funcs...); err != nil {
+		panic(err)
+	}
+	return e
+}
+
+// AddFuncs is a shortcut for multiple calls to AddFunc.
+func (e Equalities) AddFuncs(funcs ...interface{}) error {
+	for _, f := range funcs {
+		if err := e.AddFunc(f); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// AddFunc uses func as an equality function: it must take
+// two parameters of the same type, and return a boolean.
+func (e Equalities) AddFunc(eqFunc interface{}) error {
+	fv := reflect.ValueOf(eqFunc)
+	ft := fv.Type()
+	if ft.Kind() != reflect.Func {
+		return fmt.Errorf("expected func, got: %v", ft)
+	}
+	if ft.NumIn() != 2 {
+		return fmt.Errorf("expected three 'in' params, got: %v", ft)
+	}
+	if ft.NumOut() != 1 {
+		return fmt.Errorf("expected one 'out' param, got: %v", ft)
+	}
+	if ft.In(0) != ft.In(1) {
+		return fmt.Errorf("expected arg 1 and 2 to have same type, but got %v", ft)
+	}
+	var forReturnType bool
+	boolType := reflect.TypeOf(forReturnType)
+	if ft.Out(0) != boolType {
+		return fmt.Errorf("expected bool return, got: %v", ft)
+	}
+	e[ft.In(0)] = fv
+	return nil
+}
+
+// Below here is forked from go's reflect/deepequal.go
+
+// During deepValueEqual, must keep track of checks that are
+// in progress.  The comparison algorithm assumes that all
+// checks in progress are true when it reencounters them.
+// Visited comparisons are stored in a map indexed by visit.
+type visit struct {
+	a1  uintptr
+	a2  uintptr
+	typ reflect.Type
+}
+
+// unexportedTypePanic is thrown when you use this DeepEqual on something that has an
+// unexported type. It indicates a programmer error, so should not occur at runtime,
+// which is why it's not public and thus impossible to catch.
+type unexportedTypePanic []reflect.Type
+
+func (u unexportedTypePanic) Error() string { return u.String() }
+func (u unexportedTypePanic) String() string {
+	strs := make([]string, len(u))
+	for i, t := range u {
+		strs[i] = fmt.Sprintf("%v", t)
+	}
+	return "an unexported field was encountered, nested like this: " + strings.Join(strs, " -> ")
+}
+
+func makeUsefulPanic(v reflect.Value) {
+	if x := recover(); x != nil {
+		if u, ok := x.(unexportedTypePanic); ok {
+			u = append(unexportedTypePanic{v.Type()}, u...)
+			x = u
+		}
+		panic(x)
+	}
+}
+
+// Tests for deep equality using reflected types. The map argument tracks
+// comparisons that have already been seen, which allows short circuiting on
+// recursive types.
+func (e Equalities) deepValueEqual(v1, v2 reflect.Value, visited map[visit]bool, depth int) bool {
+	defer makeUsefulPanic(v1)
+
+	if !v1.IsValid() || !v2.IsValid() {
+		return v1.IsValid() == v2.IsValid()
+	}
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	if fv, ok := e[v1.Type()]; ok {
+		return fv.Call([]reflect.Value{v1, v2})[0].Bool()
+	}
+
+	hard := func(k reflect.Kind) bool {
+		switch k {
+		case reflect.Array, reflect.Map, reflect.Slice, reflect.Struct:
+			return true
+		}
+		return false
+	}
+
+	if v1.CanAddr() && v2.CanAddr() && hard(v1.Kind()) {
+		addr1 := v1.UnsafeAddr()
+		addr2 := v2.UnsafeAddr()
+		if addr1 > addr2 {
+			// Canonicalize order to reduce number of entries in visited.
+			addr1, addr2 = addr2, addr1
+		}
+
+		// Short circuit if references are identical ...
+		if addr1 == addr2 {
+			return true
+		}
+
+		// ... or already seen
+		typ := v1.Type()
+		v := visit{addr1, addr2, typ}
+		if visited[v] {
+			return true
+		}
+
+		// Remember for later.
+		visited[v] = true
+	}
+
+	switch v1.Kind() {
+	case reflect.Array:
+		// We don't need to check length here because length is part of
+		// an array's type, which has already been filtered for.
+		for i := 0; i < v1.Len(); i++ {
+			if !e.deepValueEqual(v1.Index(i), v2.Index(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Slice:
+		if (v1.IsNil() || v1.Len() == 0) != (v2.IsNil() || v2.Len() == 0) {
+			return false
+		}
+		if v1.IsNil() || v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		if v1.Pointer() == v2.Pointer() {
+			return true
+		}
+		for i := 0; i < v1.Len(); i++ {
+			if !e.deepValueEqual(v1.Index(i), v2.Index(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Interface:
+		if v1.IsNil() || v2.IsNil() {
+			return v1.IsNil() == v2.IsNil()
+		}
+		return e.deepValueEqual(v1.Elem(), v2.Elem(), visited, depth+1)
+	case reflect.Ptr:
+		return e.deepValueEqual(v1.Elem(), v2.Elem(), visited, depth+1)
+	case reflect.Struct:
+		for i, n := 0, v1.NumField(); i < n; i++ {
+			if !e.deepValueEqual(v1.Field(i), v2.Field(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Map:
+		if (v1.IsNil() || v1.Len() == 0) != (v2.IsNil() || v2.Len() == 0) {
+			return false
+		}
+		if v1.IsNil() || v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() != v2.Len() {
+			return false
+		}
+		if v1.Pointer() == v2.Pointer() {
+			return true
+		}
+		for _, k := range v1.MapKeys() {
+			if !e.deepValueEqual(v1.MapIndex(k), v2.MapIndex(k), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Func:
+		if v1.IsNil() && v2.IsNil() {
+			return true
+		}
+		// Can't do better than this:
+		return false
+	default:
+		// Normal equality suffices
+		if !v1.CanInterface() || !v2.CanInterface() {
+			panic(unexportedTypePanic{})
+		}
+		return v1.Interface() == v2.Interface()
+	}
+}
+
+// DeepEqual is like reflect.DeepEqual, but focused on semantic equality
+// instead of memory equality.
+//
+// It will use e's equality functions if it finds types that match.
+//
+// An empty slice *is* equal to a nil slice for our purposes; same for maps.
+//
+// Unexported field members cannot be compared and will cause an imformative panic; you must add an Equality
+// function for these types.
+func (e Equalities) DeepEqual(a1, a2 interface{}) bool {
+	if a1 == nil || a2 == nil {
+		return a1 == a2
+	}
+	v1 := reflect.ValueOf(a1)
+	v2 := reflect.ValueOf(a2)
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	return e.deepValueEqual(v1, v2, make(map[visit]bool), 0)
+}
+
+func (e Equalities) deepValueDerive(v1, v2 reflect.Value, visited map[visit]bool, depth int) bool {
+	defer makeUsefulPanic(v1)
+
+	if !v1.IsValid() || !v2.IsValid() {
+		return v1.IsValid() == v2.IsValid()
+	}
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	if fv, ok := e[v1.Type()]; ok {
+		return fv.Call([]reflect.Value{v1, v2})[0].Bool()
+	}
+
+	hard := func(k reflect.Kind) bool {
+		switch k {
+		case reflect.Array, reflect.Map, reflect.Slice, reflect.Struct:
+			return true
+		}
+		return false
+	}
+
+	if v1.CanAddr() && v2.CanAddr() && hard(v1.Kind()) {
+		addr1 := v1.UnsafeAddr()
+		addr2 := v2.UnsafeAddr()
+		if addr1 > addr2 {
+			// Canonicalize order to reduce number of entries in visited.
+			addr1, addr2 = addr2, addr1
+		}
+
+		// Short circuit if references are identical ...
+		if addr1 == addr2 {
+			return true
+		}
+
+		// ... or already seen
+		typ := v1.Type()
+		v := visit{addr1, addr2, typ}
+		if visited[v] {
+			return true
+		}
+
+		// Remember for later.
+		visited[v] = true
+	}
+
+	switch v1.Kind() {
+	case reflect.Array:
+		// We don't need to check length here because length is part of
+		// an array's type, which has already been filtered for.
+		for i := 0; i < v1.Len(); i++ {
+			if !e.deepValueDerive(v1.Index(i), v2.Index(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Slice:
+		if v1.IsNil() || v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() > v2.Len() {
+			return false
+		}
+		if v1.Pointer() == v2.Pointer() {
+			return true
+		}
+		for i := 0; i < v1.Len(); i++ {
+			if !e.deepValueDerive(v1.Index(i), v2.Index(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.String:
+		if v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() > v2.Len() {
+			return false
+		}
+		return v1.String() == v2.String()
+	case reflect.Interface:
+		if v1.IsNil() {
+			return true
+		}
+		return e.deepValueDerive(v1.Elem(), v2.Elem(), visited, depth+1)
+	case reflect.Ptr:
+		if v1.IsNil() {
+			return true
+		}
+		return e.deepValueDerive(v1.Elem(), v2.Elem(), visited, depth+1)
+	case reflect.Struct:
+		for i, n := 0, v1.NumField(); i < n; i++ {
+			if !e.deepValueDerive(v1.Field(i), v2.Field(i), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Map:
+		if v1.IsNil() || v1.Len() == 0 {
+			return true
+		}
+		if v1.Len() > v2.Len() {
+			return false
+		}
+		if v1.Pointer() == v2.Pointer() {
+			return true
+		}
+		for _, k := range v1.MapKeys() {
+			if !e.deepValueDerive(v1.MapIndex(k), v2.MapIndex(k), visited, depth+1) {
+				return false
+			}
+		}
+		return true
+	case reflect.Func:
+		if v1.IsNil() && v2.IsNil() {
+			return true
+		}
+		// Can't do better than this:
+		return false
+	default:
+		// Normal equality suffices
+		if !v1.CanInterface() || !v2.CanInterface() {
+			panic(unexportedTypePanic{})
+		}
+		return v1.Interface() == v2.Interface()
+	}
+}
+
+// DeepDerivative is similar to DeepEqual except that unset fields in a1 are
+// ignored (not compared). This allows us to focus on the fields that matter to
+// the semantic comparison.
+//
+// The unset fields include a nil pointer and an empty string.
+func (e Equalities) DeepDerivative(a1, a2 interface{}) bool {
+	if a1 == nil {
+		return true
+	}
+	v1 := reflect.ValueOf(a1)
+	v2 := reflect.ValueOf(a2)
+	if v1.Type() != v2.Type() {
+		return false
+	}
+	return e.deepValueDerive(v1, v2, make(map[visit]bool), 0)
+}

From 930c0dc17d559ebd311b6e5101a9a91b4285dea8 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 10 Jun 2016 09:31:08 +0200
Subject: [PATCH 0459/1304] glide: introduce glide

---
 .gitignore                               |   1 +
 Documentation/hacking.md                 | 123 ++--------
 Documentation/packaging.md               |   4 +-
 Makefile.in                              |   2 +
 glide.yaml                               | 291 +++++++++++++++++++++++
 makelib/misc.mk                          |   1 +
 makelib/variables.mk                     |   3 +-
 makelib/verbosity.mk                     |   8 +-
 scripts/bump-release                     |   2 +-
 scripts/genproto.sh                      |   3 +-
 scripts/glide-update.sh                  |  23 ++
 scripts/godep-save                       |  34 ---
 stage1/net-plugins/net-plugins.mk        |   2 +-
 tests/functional.mk                      |   6 +-
 tests/rkt-monitor/README.md              |   4 +-
 tests/rkt-monitor/build                  |   9 -
 tests/rkt-monitor/build-cpu-stresser.sh  |  26 --
 tests/rkt-monitor/build-log-stresser.sh  |  26 --
 tests/rkt-monitor/build-mem-stresser.sh  |  26 --
 tests/rkt-monitor/build-stresser.sh      |  35 +++
 tests/rkt-monitor/build-too-many-apps.sh |  14 +-
 tests/tests.mk                           |   2 +-
 tools/actool.mk                          |   2 +-
 tools/cpu-stresser.mk                    |  22 ++
 tools/log-stresser.mk                    |  22 ++
 tools/mem-stresser.mk                    |  22 ++
 tools/rkt-monitor.mk                     |  20 ++
 tools/sleeper.mk                         |  22 ++
 tools/tools.mk                           |  10 +-
 vendoredApps                             |  18 --
 30 files changed, 518 insertions(+), 265 deletions(-)
 create mode 100644 glide.yaml
 create mode 100755 scripts/glide-update.sh
 delete mode 100755 scripts/godep-save
 delete mode 100755 tests/rkt-monitor/build
 delete mode 100755 tests/rkt-monitor/build-cpu-stresser.sh
 delete mode 100755 tests/rkt-monitor/build-log-stresser.sh
 delete mode 100755 tests/rkt-monitor/build-mem-stresser.sh
 create mode 100755 tests/rkt-monitor/build-stresser.sh
 create mode 100644 tools/cpu-stresser.mk
 create mode 100644 tools/log-stresser.mk
 create mode 100644 tools/mem-stresser.mk
 create mode 100644 tools/rkt-monitor.mk
 create mode 100644 tools/sleeper.mk
 delete mode 100644 vendoredApps

diff --git a/.gitignore b/.gitignore
index bda6043d3a..2dc183c6d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 
+.cache
 .vagrant
 /.config.args
 /Makefile
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 56180eed6a..d9f7358daa 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -96,13 +96,9 @@ Follow the instructions on [Update coreos flavor stage1](devel/update-coreos-sta
 
 ## Managing dependencies
 
-rkt uses [`godep`](https://github.com/tools/godep) to manage third-party dependencies.
-The build process is crafted to make this transparent to most users (i.e. if you're just building rkt from source, or modifying any of the codebase without changing dependencies, you should have no need to interact with godep).
+rkt uses [`glide`](https://github.com/Masterminds/glide) and [`glide-vc`](https://github.com/sgotti/glide-vc) to manage third-party dependencies.
+The build process is crafted to make this transparent to most users (i.e. if you're just building rkt from source, or modifying any of the codebase without changing dependencies, you should have no need to interact with glide).
 But occasionally the need arises to either a) add a new dependency or b) update/remove an existing dependency.
-There are two types of dependencies:
-
-- libraries - Go code imported by some Go source file in the repository
-- applications - Go code that we need to build to get some executable binary; this means that we want to "import" a "main" package.
 
 We might want to vendor an application for several reasons:
 
@@ -110,122 +106,49 @@ We might want to vendor an application for several reasons:
 - it will be a part of a stage1 image (like CNI plugins for networking)
 - it will be used in functional tests (like ACE validator)
 
-At this point, the ramblings below from an experienced Godep victim^Wenthusiast might prove of use...
-
-### Update godep
-
-Step zero is generally to ensure you have the **latest version** of `godep` available in your `PATH`.
-
-### Having the right directory layout (i.e. `GOPATH`)
-
-To work with `godep`, you'll need to have the repository (i.e. `github.com/coreos/rkt`) checked out in a valid `GOPATH`.
-If you use the [standard Go workflow](https://golang.org/doc/code.html#Organization), with every package in its proper place in a workspace, this should be no problem.
-As an example, if one was obtaining the repository for the first time, one would do the following:
-
-```
-$ export GOPATH=/tmp/foo               # or any directory you please
-$ go get -d github.com/coreos/rkt/...  # or 'git clone https://github.com/coreos/rkt $GOPATH/src/github.com/coreos/rkt'
-$ cd $GOPATH/src/github.com/coreos/rkt
-```
-
-If, however, you instead prefer to manage your source code in directories like `~/src/rkt`, there's a problem: `godep` doesn't like symbolic links (which is what the rkt build process uses by default to create a self-contained GOPATH).
-Hence, you'll need to work around this with bind mounts, with something like the following:
-
-```
-$ export GOPATH=/tmp/foo        # or any directory you please
-$ mkdir -p $GOPATH/src/github.com/coreos/rkt
-# mount --bind ~/src/rkt $GOPATH/src/github.com/coreos/rkt
-$ cd $GOPATH/src/github.com/coreos/rkt
-```
-
-One benefit of this approach over the single-workspace workflow is that checking out different versions of dependencies in the `GOPATH` (as we are about to do) is guaranteed to not affect any other packages in the `GOPATH`.
-(Using [gvm](https://github.com/moovweb/gvm) or other such tomfoolery to manage `GOPATH`s is an exercise left for the reader.)
-
-### Restoring the current state of dependencies
-
-Now that we have a functional `GOPATH`, use `godep` to restore the full set of vendored dependencies to their correct versions.
-(What this command does is essentially just loop over the set of dependencies codified in `Godeps/Godeps.json`, using `go get` to retrieve and then `git checkout` (or equivalent) to set each to their correct revision.)
-
-```
-$ godep restore # might take a while if it's the first time...
-```
+### Update glide/glide-vc
 
-At this stage, your path forks, depending on what exactly you want to do: add, update or remove a dependency, or add, update or remove an application.
-But in _all six cases_, the procedure finishes with the [same save command](#saving-the-set-of-dependencies).
+Ensure you have the **latest version** of `glide` and `glide-vc` available in your `PATH`.
 
 #### Add a new dependency
 
-In this case you'll first need to retrieve the dependency you're working with into `GOPATH`.
-As a simple example, assuming we're adding `github.com/fizz/buzz/tazz`:
-
+Use the glide tool to add a new dependency. In order to add a dependency to a package i.e. `github.com/fizz/buzz` for version `1.2.3`, execute:
 ```
-$ go get -d github.com/fizz/buzz
+$ glide get -u github.com/fizz/buzz#1.2.3
+$ ./scripts/glide-update.sh
 ```
 
-##### If it is a library
+Note that although glide does support [versions and ranges](https://github.com/Masterminds/glide/blob/master/docs/versions.md) currently it is preferred to pin to concrete versions as described above.
 
-Add the new dependency into `godep`'s purview by simply importing the standard package name in one of your sources:
+*Note*: Do *not* use `go get` and `glide update` to add new dependencies. It will cause both `glide.lock` and `glide.yaml` files to diverge.
 
-```
-$ vim $GOPATH/src/github.com/coreos/rkt/some/file.go
-...
-import "github.com/fizz/buzz/tazz"
-...
-```
+#### Update existing dependencies
 
-Now, GOTO [saving](#saving-the-set-of-dependencies)
+Once in a while new versions of dependencies are available. Entries in the `glide.yaml` file specify the target version. To update a dependency, edit the appropriate entry and specify the updated target version.
 
-##### If it is an application
+*Note*: Changing specific entries in `glide.yaml` does not imply that only those will be updated. Glide will pull potential updates for all dependencies.
 
-Add the new application to the `vendoredApps` file in the root of the repository:
+To update a vendored dependency to a newer version, first update its target version directly in `glade.yaml`. The glide update script will then take care of pulling all dependencies and refreshing any updated ones, according to version constraints specified in the YAML manifest.
 
-```
-$ vim vendoredApps
-...
-github.com/fizz/buzz/tazz
-...
-```
-
-Now, GOTO [saving](#saving-the-set-of-dependencies)
-
-#### Update an existing dependency
-
-The steps here are the same for both libraries and applications.
-In this case, assuming we're updating `github.com/foo/bar`:
+*Note*: Glide will pull all dependencies from all referenced repos potentially causing a lot of network traffic.
 
+Once done editing glide.yaml, execute the glide update script:
 ```
-$ cd $GOPATH/src/github.com/foo/bar
-$ git pull   # or 'go get -d -u github.com/foo/bar/...'
-$ git checkout $DESIRED_REVISION
-$ cd $GOPATH/src/github.com/coreos/rkt
-$ godep update github.com/foo/bar/...
+$ ./scripts/glide-update.sh
 ```
 
-Now, GOTO [saving](#saving-the-set-of-dependencies)
+#### Resolving transitive dependency conflicts
 
-#### Removing an existing dependency
+Glide currently has no deterministic mechanism to resolve transitive dependency conflicts. A transitive dependency conflict exists if package `A` depends on `B`, and a package `C` also depends on `B`, but on a different version.
 
-This is the simplest case of all.
+To resolve this conflict on package `C` specify the version directly in the `glide.yaml` file as described above.
 
-##### If it is a library
-
-Simply remove all references to a dependency from the source files.
-
-Now, GOTO [saving](#saving-the-set-of-dependencies)
-
-##### If it is an application
-
-Simply remove the relevant line from the `vendoredApps` file.
-
-Now, GOTO [saving](#saving-the-set-of-dependencies)
-
-### Saving the set of dependencies
-
-Finally, here we are, the magic command, the holy grail, the ultimate conclusion of all `godep` operations.
-Provided you have followed the preceding instructions, regardless of whether you are adding/removing/modifying dependencies, this innocuous script will cast the necessary spells to solve all of your dependency worries:
+#### Removing an existing dependency
 
+Execute:
 ```
-$ ./scripts/godep-save
+$ glide rm github.com/fizz/buzz
+$ ./scripts/glide-update.sh
 ```
 
 ## Errors & Output
diff --git a/Documentation/packaging.md b/Documentation/packaging.md
index 016a5cdde6..d59282b0f0 100644
--- a/Documentation/packaging.md
+++ b/Documentation/packaging.md
@@ -28,9 +28,9 @@ The `stage1-host.aci` archive generated by this build will not contain bash, sys
 
 For more details, see the [configure script parameters documentation][build-config].
 
-### Godep
+### Glide
 
-rkt uses [Godep](https://github.com/tools/godep) to maintain [a copy of dependencies in its source repository](https://github.com/coreos/rkt/tree/master/Godeps).
+rkt uses [Glide](https://github.com/Masterminds/glide) to maintain [a copy of dependencies in its source repository](https://github.com/coreos/rkt/tree/master/vendor).
 
 ## Run-time dependencies
 
diff --git a/Makefile.in b/Makefile.in
index 01c6cd5efc..db5636e386 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,6 +77,7 @@ TOPLEVEL_CHECK_STAMPS :=
 TOPLEVEL_UNIT_CHECK_STAMPS :=
 TOPLEVEL_FUNCTIONAL_CHECK_STAMPS :=
 TOPLEVEL_SUBDIRS := rkt tests stage1 stage1_fly
+RKT_MONITOR_STAMPS :=
 
 $(call inc-one,tools/tools.mk)
 $(call inc-many,$(foreach sd,$(TOPLEVEL_SUBDIRS),$(sd)/$(sd).mk))
@@ -92,6 +93,7 @@ $(TOPLEVEL_CHECK_STAMPS): $(TOPLEVEL_STAMPS)
 check: $(TOPLEVEL_CHECK_STAMPS)
 unit-check: $(TOPLEVEL_UNIT_CHECK_STAMPS)
 functional-check: $(TOPLEVEL_FUNCTIONAL_CHECK_STAMPS)
+rkt-monitor: $(RKT_MONITOR_STAMPS)
 
 include makelib/file-ops-epilog.mk
 
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 0000000000..78752a8295
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,291 @@
+package: github.com/coreos/rkt
+import:
+- package: github.com/StackExchange/wmi
+  version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
+- package: github.com/appc/docker2aci
+  version: v0.11.1
+  subpackages:
+  - lib
+  - lib/common
+  - lib/internal
+  - lib/internal/backend/file
+  - lib/internal/backend/repository
+  - lib/internal/docker
+  - lib/internal/tarball
+  - lib/internal/types
+  - lib/internal/util
+  - pkg/log
+- package: github.com/appc/goaci
+  version: v0.1.0
+  subpackages:
+  - proj2aci
+- package: github.com/appc/spec
+  version: v0.8.4
+  subpackages:
+  - ace
+  - aci
+  - actool
+  - discovery
+  - pkg/acirenderer
+  - pkg/device
+  - pkg/tarheader
+  - schema
+  - schema/common
+  - schema/lastditch
+  - schema/types
+- package: github.com/aws/aws-sdk-go
+  version: v1.1.7
+  subpackages:
+  - aws
+  - aws/awserr
+  - aws/awsutil
+  - aws/client/metadata
+  - aws/credentials
+  - aws/request
+  - private/protocol/rest
+  - private/signer/v4
+- package: github.com/camlistore/go4
+  version: 9ba773eba85ab9e258ff516630f7f6474bc4535b
+  subpackages:
+  - lock
+- package: github.com/containernetworking/cni
+  version: v0.3.0
+  subpackages:
+  - pkg/invoke
+  - pkg/ip
+  - pkg/ipam
+  - pkg/ipam
+  - pkg/ns
+  - pkg/skel
+  - pkg/testutils
+  - pkg/skel
+  - pkg/testutils
+  - pkg/types
+  - pkg/utils
+  - pkg/utils/sysctl
+  - plugins/ipam/dhcp
+  - plugins/ipam/host-local
+  - plugins/ipam/host-local/backend
+  - plugins/ipam/host-local/backend/disk
+  - plugins/main/bridge
+  - plugins/main/ipvlan
+  - plugins/main/macvlan
+  - plugins/main/ptp
+  - plugins/meta/flannel
+  - plugins/meta/tuning
+  - pkg/utils/sysctl
+  - plugins/ipam/dhcp
+  - plugins/ipam/host-local
+  - plugins/ipam/host-local/backend
+  - plugins/ipam/host-local/backend/disk
+  - plugins/main/bridge
+  - plugins/main/ipvlan
+  - plugins/main/macvlan
+  - plugins/main/ptp
+  - plugins/meta/flannel
+  - plugins/meta/tuning
+- package: github.com/coreos/gexpect
+  version: v0.1.0
+- package: github.com/coreos/go-iptables
+  version: v0.1.0
+  subpackages:
+  - iptables
+- package: github.com/coreos/go-semver
+  version: v0.1.0
+  subpackages:
+  - semver
+- package: github.com/coreos/go-systemd
+  version: v10
+  subpackages:
+  - activation
+  - dbus
+  - sdjournal
+  - unit
+  - util
+- package: github.com/coreos/go-tspi
+  version: v0.1.1
+  subpackages:
+  - tpmclient
+  - tspiconst
+  - verification
+- package: github.com/coreos/ioprogress
+  version: e7fc03058804de5488baed8df5b89f3924b9ec9a
+- package: github.com/coreos/pkg
+  version: v2
+  subpackages:
+  - dlopen
+  - progressutil
+- package: github.com/cpuguy83/go-md2man
+  version: v1.0.4
+  subpackages:
+  - md2man
+- package: github.com/cznic/b
+  version: e2e747ce049fb910cff6b1fd7ad8faf3900939d5
+- package: github.com/cznic/bufs
+  version: 3dcccbd7064a1689f9c093a988ea11ac00e21f51
+- package: github.com/cznic/exp
+  version: 36265f1914ea00990ff0b73f72350edf9b1850df
+  subpackages:
+  - lldb
+- package: github.com/cznic/fileutil
+  version: 21ae57c9dce724a15e88bd9cd46d5668f3e880a5
+- package: github.com/cznic/mathutil
+  version: 250d0b9d3304c5ea0c4cfc7d9efc7ee528b81f3b
+- package: github.com/cznic/ql
+  version: 77545ff365ff426dfab06c46d70fa77600cd55af
+  subpackages:
+  - driver
+- package: github.com/cznic/sortutil
+  version: d4401851b4c370f979b842fa1e45e0b3b718b391
+- package: github.com/cznic/strutil
+  version: 97bc31f80ac4c9fa9c5dc5fea74c383858988ea2
+- package: github.com/cznic/zappy
+  version: 47331054e4f96186e3ff772877c0443909368a45
+- package: github.com/d2g/dhcp4
+  version: f0e4d29ff0231dce36e250b2ed9ff08412584bca
+- package: github.com/d2g/dhcp4client
+  version: bed07e1bc5b85f69c6f0fd73393aa35ec68ed892
+- package: github.com/docker/distribution
+  version: v2.3.0
+  subpackages:
+  - digest
+  - reference
+- package: github.com/dustin/go-humanize
+  version: c20a8bde38c8f5ba06f6600edf473705c96829d1
+- package: github.com/go-ini/ini
+  version: v1.11.0
+- package: github.com/go-ole/go-ole
+  version: 572eabb84c424e76a0d39d31510dd7dfd62f70b2
+  subpackages:
+  - oleutil
+- package: github.com/godbus/dbus
+  version: a1b8ba5163b7f041b22761461eabd02b70d1f824
+  subpackages:
+  - introspect
+- package: github.com/gogo/protobuf
+  version: v0.2
+  subpackages:
+  - proto
+- package: github.com/golang/protobuf
+  version: 2402d76f3d41f928c7902a765dfc872356dd3aad
+  subpackages:
+  - proto
+  - protoc-gen-go
+  - protoc-gen-go/descriptor
+  - protoc-gen-go/generator
+  - protoc-gen-go/internal/grpc
+  - protoc-gen-go/plugin
+- package: github.com/google/btree
+  version: f06e229e679911bb31a04e07ac891115822e37c3
+- package: github.com/gorilla/context
+  version: 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
+- package: github.com/gorilla/mux
+  version: e444e69cbd2e2e3e0749a2f3c717cec491552bbf
+- package: github.com/hashicorp/errwrap
+  version: 7554cd9344cec97297fa6649b055a8c98c2a1e55
+- package: github.com/hydrogen18/stoppableListener
+  version: 2eebd04b47ff393f4bc50b7fcacf8f048994c6fd
+- package: github.com/inconshreveable/mousetrap
+  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
+- package: github.com/jmespath/go-jmespath
+  version: 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
+- package: github.com/kballard/go-shellquote
+  version: e5c918b80c17694cbc49aab32a759f9a40067f5d
+- package: github.com/kr/pty
+  version: f7ee69f31298ecbe5d2b349c711e2547a617d398
+- package: github.com/pborman/uuid
+  version: cccd189d45f7ac3368a0d127efb7f4d08ae0b655
+- package: github.com/peterbourgon/diskv
+  version: v2.0.0
+- package: github.com/russross/blackfriday
+  version: 300106c228d52c8941d4b3de6054a6062a86dda3
+- package: github.com/shirou/gopsutil
+  version: v2.0.0
+  subpackages:
+  - cpu
+  - host
+  - internal/common
+  - load
+  - mem
+  - net
+  - process
+- package: github.com/shirou/w32
+  version: 3c9377fc6748f222729a8270fe2775d149a249ad
+- package: github.com/shurcooL/sanitized_anchor_name
+  version: 10ef21a441db47d8b13ebcc5fd2310f636973c77
+- package: github.com/spf13/cobra
+  version: 4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f
+  subpackages:
+  - doc
+- package: github.com/spf13/pflag
+  version: 08b1a584251b5b62f458943640fc8ebd4d50aaa5
+- package: github.com/syndtr/gocapability
+  version: 8e4cdcb3c22b40d5e330ade0b68cb2e2a3cf6f98
+  subpackages:
+  - capability
+- package: github.com/vishvananda/netlink
+  version: ecf47fd5739b3d2c3daf7c89c4b9715a2605c21b
+  subpackages:
+  - nl
+- package: go4.org
+  version: 03efcb870d84809319ea509714dd6d19a1498483
+  subpackages:
+  - errorutil
+- package: golang.org/x/crypto
+  version: a7ead6ddf06233883deca151dffaef2effbf498f
+  subpackages:
+  - cast5
+  - openpgp
+  - openpgp/armor
+  - openpgp/elgamal
+  - openpgp/errors
+  - openpgp/packet
+  - openpgp/s2k
+  - ssh/terminal
+- package: golang.org/x/net
+  version: d513e58596cd55e6f47cd1dcbff6b46035baeccb
+  subpackages:
+  - context
+  - html
+  - html/atom
+  - http2
+  - http2/hpack
+  - internal/timeseries
+  - trace
+- package: golang.org/x/sys
+  version: b44883b474ffefa37335017174e397412b633a4f
+  subpackages:
+  - unix
+- package: golang.org/x/tools
+  version: 27e692e6ec36d8f48be794f32553e1400c70dbf2
+  subpackages:
+  - go/vcs
+- package: google.golang.org/grpc
+  version: 0f80f5b995e8332b1bdaac1bc37af0482c60147c
+  subpackages:
+  - codes
+  - credentials
+  - grpclog
+  - metadata
+  - naming
+  - peer
+  - transport
+  - internal
+- package: gopkg.in/inf.v0
+  version: v0.9.0
+- package: k8s.io/kubernetes
+  version: v1.3.0-alpha.4
+  subpackages:
+  - pkg/api/resource
+  - pkg/conversion
+  - third_party/forked/reflect
+- package: github.com/klauspost/pgzip
+  version: v1.0
+- package: github.com/klauspost/compress
+  version: v1.0
+  subpackages:
+  - flate
+- package: github.com/klauspost/crc32
+  version: v1.0
+- package: github.com/klauspost/cpuid
+  version: v1.0
diff --git a/makelib/misc.mk b/makelib/misc.mk
index fcd0dfc15f..0b95c23364 100644
--- a/makelib/misc.mk
+++ b/makelib/misc.mk
@@ -180,6 +180,7 @@ $(strip \
 	$(eval _MISC_GFD_GO_LIST_ITEMS_ := $(foreach i,$2,{{.$i}})) \
 	$(eval _MISC_GFD_FILES_ := $(shell $(GO_ENV) "$(GO)" list -f '{{.ImportPath}} $(_MISC_GFD_GO_LIST_ITEMS_)' $1 | \
 		grep '\[[^]]' | \
+		grep -v '/vendor' | \
 		sed -e 's/.*$(_MISC_GFD_ESCAPED_SRCDIR)\///' -e 's/[[:space:]]*\[.*\]$$//' \
 		$(if $3,| grep --invert-match '^\($(subst $(_MISC_GFD_SPACE_),\|,$3)\)'))) \
 	$(_MISC_GFD_FILES_) \
diff --git a/makelib/variables.mk b/makelib/variables.mk
index eabc804a02..8408c2ae10 100644
--- a/makelib/variables.mk
+++ b/makelib/variables.mk
@@ -10,7 +10,7 @@ TARGETDIR := $(BUILDDIR)/target
 TARGET_BINDIR := $(BUILDDIR)/target/bin
 TARGET_TOOLSDIR := $(BUILDDIR)/target/tools
 GOPATH_TO_CREATE := $(BUILDDIR)/gopath
-GOPATH := $(GOPATH_TO_CREATE)/src/github.com/coreos/rkt/Godeps/_workspace:$(GOPATH_TO_CREATE)
+GOPATH := $(GOPATH_TO_CREATE)
 DEPSDIR := $(BUILDDIR)/deps
 FILELISTDIR := $(BUILDDIR)/filelists
 MAINTEMPDIR := $(BUILDDIR)/tmp
@@ -27,6 +27,7 @@ GO_TEST_PACKAGES ?= ./...
 GO_TEST_FUNC_ARGS ?=
 
 GO_ENV := $(strip \
+	GO15VENDOREXPERIMENT=1 \
 	GOARCH="$(GOARCH)" \
 	CGO_ENABLED=1 \
 	CC="$(CC)" \
diff --git a/makelib/verbosity.mk b/makelib/verbosity.mk
index a288de8581..3e6f49f6e8 100644
--- a/makelib/verbosity.mk
+++ b/makelib/verbosity.mk
@@ -130,10 +130,10 @@ define vsp
 $(subst $(MK_TOPLEVEL_ABS_SRCDIR)/,,$1)
 endef
 
-# This shortens the paths by removing the Godeps workspace part. So it
+# This shortens the paths by removing the vendor part. So it
 # truncates
-# github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema
-# to <Godeps>/github.com/appc/spec/schema.
+# github.com/coreos/rkt/vendor/github.com/appc/spec/schema
+# to <VENDOR>/github.com/appc/spec/schema.
 define vsg
-$(subst $(REPO_PATH)/Godeps/_workspace/src,<Godeps>,$1)
+$(subst $(REPO_PATH)/vendor,<VENDOR>,$1)
 endef
diff --git a/scripts/bump-release b/scripts/bump-release
index ed51293b29..e9a114ed88 100755
--- a/scripts/bump-release
+++ b/scripts/bump-release
@@ -34,7 +34,7 @@ function replace_stuff() {
 }
 
 function replace_all() {
-	replace_stuff $1 $2 $(git ls-files | grep -Ev "(CHANGELOG.md|Godeps|manifest\.d)")
+	replace_stuff $1 $2 $(git ls-files | grep -Ev "(CHANGELOG.md|vendor|manifest\.d)")
 }
 
 function replace_version() {
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index e536b81851..35416a58a5 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -15,11 +15,10 @@ if ! [[ $(protoc --version) =~ "3.0.0" ]]; then
 	exit 255
 fi
 
-export GOPATH=$(godep path)
 export PATH=.:${PATH}
 
 echo "building protoc-gen-go"
-go build github.com/golang/protobuf/protoc-gen-go
+go build vendor/github.com/golang/protobuf/protoc-gen-go
 trap 'rm -f "protoc-gen-go"' EXIT
 
 echo "generating code"
diff --git a/scripts/glide-update.sh b/scripts/glide-update.sh
new file mode 100755
index 0000000000..d28a2d500f
--- /dev/null
+++ b/scripts/glide-update.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# Update vendored dedendencies.
+#
+set -e
+
+if ! [[ "$0" =~ "scripts/glide-update.sh" ]]; then
+	echo "must be run from repository root"
+	exit 255
+fi
+
+if [ ! $(command -v glide) ]; then
+	echo "glide: command not found"
+	exit 255
+fi
+
+if [ ! $(command -v glide-vc) ]; then
+	echo "glide-vc: command not found"
+	exit 255
+fi
+
+glide update --strip-vcs --strip-vendor --update-vendored --delete
+glide-vc --only-code --no-tests --keep="**/*.json.in"
diff --git a/scripts/godep-save b/scripts/godep-save
deleted file mode 100755
index f488d575a1..0000000000
--- a/scripts/godep-save
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# make sure we are running in a toplevel directory
-if ! [[ "$0" =~ "scripts/godep-save" ]]; then
-	echo "This script must be run in a toplevel rkt directory"
-	exit 255
-fi
-
-# make sure that we have the fixed version of godep, which vendors
-# external projects, but does not modify them.
-REQGV=41
-GV=$(godep version | sed -e 's/^godep v\([0-9]\+\).*/\1/')
-if [[ "${GV}" -lt "${REQGV}" ]]; then
-	echo "The godep tool is too old (${GV}), must be at least version ${REQGV}"
-	exit 255
-fi
-
-VA=vendoredApps
-APPS=''
-if [[ -r "${VA}" ]]; then
-	# grep filters all empty lines and all lines with comments
-	# only, sed removes the comments from the other lines
-	APPS=$(cat "${VA}" \
-		      | grep -v '^\([[:space:]]*#.*\)\?$' \
-		      | sed -e 's/[[:space:]]*#.*//g')
-else
-	echo "No file '${VA}' found"
-fi
-
-CMD="godep save ./... ${APPS}"
-
-echo Running ${CMD}
-exec ${CMD}
diff --git a/stage1/net-plugins/net-plugins.mk b/stage1/net-plugins/net-plugins.mk
index edff85c2d4..513bbc7d8c 100644
--- a/stage1/net-plugins/net-plugins.mk
+++ b/stage1/net-plugins/net-plugins.mk
@@ -38,7 +38,7 @@ $$(call setup-stamp-file,NPM_STAMP,$$(NPM_BASE))
 # variables for makelib/build_go_bin.mk
 BGB_STAMP := $$(NPM_STAMP)
 BGB_BINARY := $$(NPM_PLUGIN)
-BGB_PKG_IN_REPO := Godeps/_workspace/src/github.com/containernetworking/cni/plugins/$1
+BGB_PKG_IN_REPO := vendor/github.com/containernetworking/cni/plugins/$1
 include makelib/build_go_bin.mk
 
 $$(NPM_PLUGIN): $(TARGET_TOOLSDIR)
diff --git a/tests/functional.mk b/tests/functional.mk
index 7fb9ba7c4a..d22095ba3f 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -10,11 +10,11 @@ FTST_IMAGE_MANIFEST := $(FTST_IMAGE_DIR)/manifest
 FTST_IMAGE_TEST_DIRS := $(FTST_IMAGE_ROOTFSDIR)/dir1 $(FTST_IMAGE_ROOTFSDIR)/dir2 $(FTST_IMAGE_ROOTFSDIR)/bin $(FTST_IMAGE_ROOTFSDIR)/etc
 FTST_ACE_MAIN_IMAGE_DIR := $(FTST_TMPDIR)/ace-main
 FTST_ACE_MAIN_IMAGE := $(FTST_TMPDIR)/rkt-ace-validator-main.aci
-FTST_ACE_MAIN_IMAGE_MANIFEST_SRC := Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
+FTST_ACE_MAIN_IMAGE_MANIFEST_SRC := vendor/github.com/appc/spec/ace/image_manifest_main.json.in
 FTST_ACE_MAIN_IMAGE_MANIFEST := $(FTST_ACE_MAIN_IMAGE_DIR)/manifest
 FTST_ACE_SIDEKICK_IMAGE_DIR := $(FTST_TMPDIR)/ace-sidekick
 FTST_ACE_SIDEKICK_IMAGE := $(FTST_TMPDIR)/rkt-ace-validator-sidekick.aci
-FTST_ACE_SIDEKICK_IMAGE_MANIFEST_SRC := Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+FTST_ACE_SIDEKICK_IMAGE_MANIFEST_SRC := vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
 FTST_ACE_SIDEKICK_IMAGE_MANIFEST := $(FTST_ACE_SIDEKICK_IMAGE_DIR)/manifest
 FTST_INSPECT_BINARY := $(FTST_TMPDIR)/inspect
 FTST_ACI_INSPECT := $(FTST_IMAGE_ROOTFSDIR)/inspect
@@ -120,7 +120,7 @@ include makelib/build_go_bin.mk
 
 BGB_STAMP := $(FTST_FUNCTIONAL_TESTS_STAMP)
 BGB_BINARY := $(FTST_ACE_BINARY)
-BGB_PKG_IN_REPO := Godeps/_workspace/src/github.com/appc/spec/ace
+BGB_PKG_IN_REPO := vendor/github.com/appc/spec/ace
 BGB_GO_FLAGS := -a -installsuffix cgo
 BGB_ADDITIONAL_GO_ENV := CGO_ENABLED=0
 
diff --git a/tests/rkt-monitor/README.md b/tests/rkt-monitor/README.md
index 1beda661fb..94cbc51575 100644
--- a/tests/rkt-monitor/README.md
+++ b/tests/rkt-monitor/README.md
@@ -28,7 +28,7 @@ attempt to eat up resources in different ways.
 An example usage:
 
 ```
-derek@rokot ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> ./build-log-stresser.sh 
+derek@rokot ~/go/src/github.com/coreos/rkt> ./tests/rkt-monitor/build-stresser.sh log
 Building worker...
 Beginning build with an empty ACI
 Setting name of ACI to appc.io/rkt-log-stresser
@@ -36,7 +36,7 @@ Copying host:worker-binary to aci:/worker
 Setting exec command [/worker]
 Writing ACI to log-stresser.aci
 Ending the build
-derek@rokot ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor log-stresser.aci 
+derek@rokot ~/go/src/github.com/coreos/rkt> sudo ./build-rkt-1.8.0+git/bin/rkt-monitor log-stresser.aci 
 [sudo] password for derek: 
 rkt(13261): seconds alive: 10  avg CPU: 33.113897%  avg Mem: 4 kB  peak Mem: 4 kB
 systemd(13302): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
diff --git a/tests/rkt-monitor/build b/tests/rkt-monitor/build
deleted file mode 100755
index 5189fc5d44..0000000000
--- a/tests/rkt-monitor/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-export GOPATH=${PWD}/../../Godeps/_workspace
-
-eval $(go env)
-export GOOS GOARCH
-
-go build -o rkt-monitor
diff --git a/tests/rkt-monitor/build-cpu-stresser.sh b/tests/rkt-monitor/build-cpu-stresser.sh
deleted file mode 100755
index a39a3d2d1d..0000000000
--- a/tests/rkt-monitor/build-cpu-stresser.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-echo "Building worker..."
-CGO_ENABLED=0 GOOS=linux go build -o worker-binary -a -tags netgo -ldflags '-w' ./cpu-stresser/main.go
-
-rmWorker() { rm worker-binary; }
-acbuildEnd() {
-    rmWorker
-    export EXIT=$?
-    acbuild --debug end && exit $EXIT
-}
-
-trap rmWorker EXIT
-
-acbuild --debug begin
-
-trap acbuildEnd EXIT
-
-acbuild --debug set-name appc.io/rkt-cpu-stresser
-
-acbuild --debug copy worker-binary /worker
-
-acbuild --debug set-exec -- /worker
-
-acbuild --debug write --overwrite cpu-stresser.aci
diff --git a/tests/rkt-monitor/build-log-stresser.sh b/tests/rkt-monitor/build-log-stresser.sh
deleted file mode 100755
index 692d120052..0000000000
--- a/tests/rkt-monitor/build-log-stresser.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-echo "Building worker..."
-CGO_ENABLED=0 GOOS=linux go build -o worker-binary -a -tags netgo -ldflags '-w' ./log-stresser/main.go
-
-rmWorker() { rm worker-binary; }
-acbuildEnd() {
-    rmWorker
-    export EXIT=$?
-    acbuild --debug end && exit $EXIT
-}
-
-trap rmWorker EXIT
-
-acbuild --debug begin
-
-trap acbuildEnd EXIT
-
-acbuild --debug set-name appc.io/rkt-log-stresser
-
-acbuild --debug copy worker-binary /worker
-
-acbuild --debug set-exec -- /worker
-
-acbuild --debug write --overwrite log-stresser.aci
diff --git a/tests/rkt-monitor/build-mem-stresser.sh b/tests/rkt-monitor/build-mem-stresser.sh
deleted file mode 100755
index fa1cfd4048..0000000000
--- a/tests/rkt-monitor/build-mem-stresser.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-echo "Building worker..."
-CGO_ENABLED=0 GOOS=linux go build -o worker-binary -a -tags netgo -ldflags '-w' ./mem-stresser/main.go
-
-rmWorker() { rm worker-binary; }
-acbuildEnd() {
-    rmWorker
-    export EXIT=$?
-    acbuild --debug end && exit $EXIT
-}
-
-trap rmWorker EXIT
-
-acbuild --debug begin
-
-trap acbuildEnd EXIT
-
-acbuild --debug set-name appc.io/rkt-mem-stresser
-
-acbuild --debug copy worker-binary /worker
-
-acbuild --debug set-exec -- /worker
-
-acbuild --debug write --overwrite mem-stresser.aci
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
new file mode 100755
index 0000000000..1bc66ab2d6
--- /dev/null
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -e
+
+if ! [[ "$0" =~ "tests/rkt-monitor/build-stresser.sh" ]]; then
+	echo "must be run from repository root"
+	exit 255
+fi
+
+stressers=(cpu mem log)
+
+if [ -z "${1}" ]; then
+    echo Specify one of \""${stressers[@]}"\"
+    exit 1
+fi
+
+
+echo "Building worker..."
+make rkt-monitor
+
+acbuildEnd() {
+    export EXIT=$?
+    acbuild --debug end && exit $EXIT
+}
+
+acbuild --debug begin
+
+trap acbuildEnd EXIT
+
+acbuild --debug set-name appc.io/rkt-"${1}"-stresser
+
+acbuild --debug copy build-rkt-1.8.0+git/bin/"${1}"-stresser /worker
+
+acbuild --debug set-exec -- /worker
+
+acbuild --debug write --overwrite "${1}"-stresser.aci
diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
index 258d7ee51b..97e0a31152 100755
--- a/tests/rkt-monitor/build-too-many-apps.sh
+++ b/tests/rkt-monitor/build-too-many-apps.sh
@@ -1,19 +1,21 @@
 #!/usr/bin/env bash
-
 set -e
 
+if ! [[ "$0" =~ "tests/rkt-monitor/build-too-many-apps.sh" ]]; then
+	echo "must be run from repository root"
+	exit 255
+fi
+
 NUM_APPS=100
 
 # Build worker binary
 
 echo "Building worker binary"
-CGO_ENABLED=0 GOOS=linux go build -o worker-binary -a -tags netgo -ldflags '-w' ./sleeper/main.go
+make rkt-monitor
 
 # Generate worker images
 
-rmWorker() { rm worker-binary; }
 acbuildEnd() {
-    rmWorker
     export EXIT=$?
     acbuild --debug end && exit $EXIT
 }
@@ -28,15 +30,13 @@ do
     echo "Building image ${NAME}"
 
     acbuild begin
-    acbuild copy worker-binary /worker-binary
+    acbuild copy build-rkt-1.8.0+git/bin/sleeper /worker-binary
     acbuild set-exec /worker-binary
     acbuild set-name ${NAME}
     acbuild write --overwrite too-many-apps-images/${NAME}.aci
     acbuild end
 done
 
-trap rmWorker EXIT
-
 # Generate pod manifest
 
 echo "Generating pod manifest"
diff --git a/tests/tests.mk b/tests/tests.mk
index 2eaef12f4d..743da07b6a 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -20,7 +20,7 @@ $(TST_SHORT_TESTS_STAMP):
 	if [ -n "$${res}" ]; then echo -e "govet checking failed:\n$${res}"; exit 1; fi; \
 	$(call vb,vt,(C) CHECK) \
 	res=$$( \
-		for file in $$(find . -type f -iname '*.go' ! -path './Godeps/*'); do \
+		for file in $$(find . -type f -iname '*.go' ! -path './vendor/*'); do \
 			head -n1 "$${file}" | grep -Eq "(Copyright|generated)" || echo -e "  $${file}"; \
 		done; \
 	); \
diff --git a/tools/actool.mk b/tools/actool.mk
index 4d341b4d50..26f0bd2057 100644
--- a/tools/actool.mk
+++ b/tools/actool.mk
@@ -2,7 +2,7 @@ $(call setup-stamp-file,ACTOOL_STAMP)
 
 # variables for makelib/build_go_bin.mk
 BGB_STAMP := $(ACTOOL_STAMP)
-BGB_PKG_IN_REPO := Godeps/_workspace/src/github.com/appc/spec/actool
+BGB_PKG_IN_REPO := vendor/github.com/appc/spec/actool
 BGB_BINARY := $(ACTOOL)
 BGB_ADDITIONAL_GO_ENV := GOARCH=$(GOARCH_FOR_BUILD) CC=$(CC_FOR_BUILD)
 
diff --git a/tools/cpu-stresser.mk b/tools/cpu-stresser.mk
new file mode 100644
index 0000000000..f78fbebedd
--- /dev/null
+++ b/tools/cpu-stresser.mk
@@ -0,0 +1,22 @@
+$(call setup-stamp-file,CPU_STRESSER_STAMP)
+
+# variables for makelib/build_go_bin.mk
+CPU_STRESSER := $(BINDIR)/cpu-stresser
+BGB_STAMP := $(CPU_STRESSER_STAMP)
+BGB_PKG_IN_REPO := tests/rkt-monitor/cpu-stresser
+BGB_BINARY := $(CPU_STRESSER)
+BGB_ADDITIONAL_GO_ENV := GOARCH=$(GOARCH_FOR_BUILD)
+BGB_GO_FLAGS := -tags netgo -ldflags '-w'
+BGB_ADDITIONAL_GO_ENV := CGO_ENABLED=0 GOOS=linux
+
+CLEAN_FILES += $(CPU_STRESSER)
+
+$(call generate-stamp-rule,$(CPU_STRESSER_STAMP))
+
+$(CPU_STRESSER): $(MK_PATH) | $(BINDIR)
+
+include makelib/build_go_bin.mk
+
+# CPU_STRESSER_STAMP deliberately not cleared
+
+RKT_MONITOR_STAMPS += $(CPU_STRESSER_STAMP)
diff --git a/tools/log-stresser.mk b/tools/log-stresser.mk
new file mode 100644
index 0000000000..21c3b4fa5a
--- /dev/null
+++ b/tools/log-stresser.mk
@@ -0,0 +1,22 @@
+$(call setup-stamp-file,LOG_STRESSER_STAMP)
+
+# variables for makelib/build_go_bin.mk
+LOG_STRESSER := $(BINDIR)/log-stresser
+BGB_STAMP := $(LOG_STRESSER_STAMP)
+BGB_PKG_IN_REPO := tests/rkt-monitor/log-stresser
+BGB_BINARY := $(LOG_STRESSER)
+BGB_ADDITIONAL_GO_ENV := GOARCH=$(GOARCH_FOR_BUILD)
+BGB_GO_FLAGS := -tags netgo -ldflags '-w'
+BGB_ADDITIONAL_GO_ENV := CGO_ENABLED=0 GOOS=linux
+
+CLEAN_FILES += $(LOG_STRESSER)
+
+$(call generate-stamp-rule,$(LOG_STRESSER_STAMP))
+
+$(LOG_STRESSER): $(MK_PATH) | $(BINDIR)
+
+include makelib/build_go_bin.mk
+
+# LOG_STRESSER_STAMP deliberately not cleared
+
+RKT_MONITOR_STAMPS += $(LOG_STRESSER_STAMP)
diff --git a/tools/mem-stresser.mk b/tools/mem-stresser.mk
new file mode 100644
index 0000000000..c66331f3d7
--- /dev/null
+++ b/tools/mem-stresser.mk
@@ -0,0 +1,22 @@
+$(call setup-stamp-file,MEM_STRESSER_STAMP)
+
+# variables for makelib/build_go_bin.mk
+MEM_STRESSER := $(BINDIR)/mem-stresser
+BGB_STAMP := $(MEM_STRESSER_STAMP)
+BGB_PKG_IN_REPO := tests/rkt-monitor/mem-stresser
+BGB_BINARY := $(MEM_STRESSER)
+BGB_ADDITIONAL_GO_ENV := GOARCH=$(GOARCH_FOR_BUILD)
+BGB_GO_FLAGS := -tags netgo -ldflags '-w'
+BGB_ADDITIONAL_GO_ENV := CGO_ENABLED=0 GOOS=linux
+
+CLEAN_FILES += $(MEM_STRESSER)
+
+$(call generate-stamp-rule,$(MEM_STRESSER_STAMP))
+
+$(MEM_STRESSER): $(MK_PATH) | $(BINDIR)
+
+include makelib/build_go_bin.mk
+
+# MEM_STRESSER_STAMP deliberately not cleared
+
+RKT_MONITOR_STAMPS += $(MEM_STRESSER_STAMP)
diff --git a/tools/rkt-monitor.mk b/tools/rkt-monitor.mk
new file mode 100644
index 0000000000..d6fa0db1b7
--- /dev/null
+++ b/tools/rkt-monitor.mk
@@ -0,0 +1,20 @@
+$(call setup-stamp-file,RKT_MONITOR_STAMP)
+
+# variables for makelib/build_go_bin.mk
+RKT_MONITOR := $(BINDIR)/rkt-monitor
+BGB_STAMP := $(RKT_MONITOR_STAMP)
+BGB_PKG_IN_REPO := tests/rkt-monitor
+BGB_BINARY := $(RKT_MONITOR)
+BGB_ADDITIONAL_GO_ENV := GOARCH=$(GOARCH_FOR_BUILD)
+
+CLEAN_FILES += $(RKT_MONITOR)
+
+$(call generate-stamp-rule,$(RKT_MONITOR_STAMP))
+
+$(RKT_MONITOR): $(MK_PATH) | $(BINDIR)
+
+include makelib/build_go_bin.mk
+
+# RKT_MONITOR_STAMP deliberately not cleared
+
+RKT_MONITOR_STAMPS += $(RKT_MONITOR_STAMP)
diff --git a/tools/sleeper.mk b/tools/sleeper.mk
new file mode 100644
index 0000000000..ae028aaa2c
--- /dev/null
+++ b/tools/sleeper.mk
@@ -0,0 +1,22 @@
+$(call setup-stamp-file,SLEEPER_STAMP)
+
+# variables for makelib/build_go_bin.mk
+SLEEPER := $(BINDIR)/sleeper
+BGB_STAMP := $(SLEEPER_STAMP)
+BGB_PKG_IN_REPO := tests/rkt-monitor/sleeper
+BGB_BINARY := $(SLEEPER)
+BGB_ADDITIONAL_GO_ENV := GOARCH=$(GOARCH_FOR_BUILD)
+BGB_GO_FLAGS := -tags netgo -ldflags '-w'
+BGB_ADDITIONAL_GO_ENV := CGO_ENABLED=0 GOOS=linux
+
+CLEAN_FILES += $(SLEEPER)
+
+$(call generate-stamp-rule,$(SLEEPER_STAMP))
+
+$(SLEEPER): $(MK_PATH) | $(BINDIR)
+
+include makelib/build_go_bin.mk
+
+# SLEEPER_STAMP deliberately not cleared
+
+RKT_MONITOR_STAMPS += $(SLEEPER_STAMP)
diff --git a/tools/tools.mk b/tools/tools.mk
index 7e769b54f4..6bcbaa793f 100644
--- a/tools/tools.mk
+++ b/tools/tools.mk
@@ -1,4 +1,12 @@
 # depsgentool is special (building other tools require it), so it has
 # to be included first
 $(call inc-one,depsgentool.mk)
-$(call inc-many,actool.mk filelistgentool.mk cleangentool.mk quickrmtool.mk)
+$(call inc-many,actool.mk \
+	filelistgentool.mk \
+	cleangentool.mk \
+	quickrmtool.mk \
+	rkt-monitor.mk \
+	log-stresser.mk \
+	cpu-stresser.mk \
+	mem-stresser.mk \
+	sleeper.mk)
diff --git a/vendoredApps b/vendoredApps
deleted file mode 100644
index c65ebb2343..0000000000
--- a/vendoredApps
+++ /dev/null
@@ -1,18 +0,0 @@
-# Vendor in actool, which is used in building the stage1 ACI
-github.com/appc/spec/actool
-
-# Vendor in CNI plugins, which will become a part of the stage1 image
-github.com/containernetworking/cni/plugins/ipam/dhcp
-github.com/containernetworking/cni/plugins/ipam/host-local
-github.com/containernetworking/cni/plugins/main/bridge
-github.com/containernetworking/cni/plugins/main/ipvlan
-github.com/containernetworking/cni/plugins/main/macvlan
-github.com/containernetworking/cni/plugins/main/ptp
-github.com/containernetworking/cni/plugins/meta/flannel
-github.com/containernetworking/cni/plugins/meta/tuning
-
-# Vendor in ACE, which is used in functional tests
-github.com/appc/spec/ace
-
-# Vendor protobuf go generator
-github.com/golang/protobuf/protoc-gen-go

From 33232bbbde471a915958bf10b3b5e70e2e29fbd1 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 29 Jun 2016 10:41:41 +0200
Subject: [PATCH 0460/1304] glide: remove Godeps

---
 Godeps/Godeps.json                            |   796 -
 Godeps/Readme                                 |     5 -
 Godeps/_workspace/.gitignore                  |     2 -
 .../src/github.com/StackExchange/wmi/LICENSE  |    20 -
 .../github.com/StackExchange/wmi/README.md    |     4 -
 .../src/github.com/StackExchange/wmi/wmi.go   |   416 -
 .../src/github.com/appc/docker2aci/LICENSE    |   202 -
 .../appc/docker2aci/lib/common/common.go      |    62 -
 .../appc/docker2aci/lib/conversion_store.go   |   126 -
 .../appc/docker2aci/lib/docker2aci.go         |   417 -
 .../lib/internal/backend/file/file.go         |   332 -
 .../internal/backend/repository/repository.go |   164 -
 .../backend/repository/repository1.go         |   391 -
 .../backend/repository/repository2.go         |   466 -
 .../lib/internal/docker/docker_functions.go   |   161 -
 .../appc/docker2aci/lib/internal/internal.go  |   591 -
 .../lib/internal/tarball/tarfile.go           |    42 -
 .../docker2aci/lib/internal/tarball/walk.go   |    43 -
 .../lib/internal/types/docker_types.go        |    92 -
 .../docker2aci/lib/internal/types/types.go    |    27 -
 .../appc/docker2aci/lib/internal/util/util.go |    83 -
 .../github.com/appc/docker2aci/lib/version.go |    20 -
 .../github.com/appc/docker2aci/pkg/log/log.go |    46 -
 .../src/github.com/appc/goaci/LICENSE         |   202 -
 .../github.com/appc/goaci/proj2aci/asset.go   |   283 -
 .../github.com/appc/goaci/proj2aci/binary.go  |    44 -
 .../github.com/appc/goaci/proj2aci/builder.go |   365 -
 .../github.com/appc/goaci/proj2aci/cmake.go   |   234 -
 .../src/github.com/appc/goaci/proj2aci/go.go  |   195 -
 .../src/github.com/appc/goaci/proj2aci/run.go |    65 -
 .../github.com/appc/goaci/proj2aci/util.go    |    68 -
 .../src/github.com/appc/goaci/proj2aci/vcs.go |   118 -
 .../src/github.com/appc/spec/LICENSE          |   202 -
 .../src/github.com/appc/spec/ace/build_aci    |    48 -
 .../src/github.com/appc/spec/ace/doc.go       |    19 -
 .../appc/spec/ace/image_manifest_main.json.in |    80 -
 .../spec/ace/image_manifest_sidekick.json.in  |    24 -
 .../github.com/appc/spec/ace/os_default.go    |    26 -
 .../github.com/appc/spec/ace/os_freebsd.go    |    32 -
 .../src/github.com/appc/spec/ace/os_linux.go  |    45 -
 .../src/github.com/appc/spec/ace/os_shared.go |    35 -
 .../src/github.com/appc/spec/ace/validator.go |   578 -
 .../src/github.com/appc/spec/aci/build.go     |   110 -
 .../src/github.com/appc/spec/aci/doc.go       |    16 -
 .../src/github.com/appc/spec/aci/file.go      |   246 -
 .../src/github.com/appc/spec/aci/layout.go    |   187 -
 .../src/github.com/appc/spec/aci/writer.go    |    98 -
 .../src/github.com/appc/spec/actool/actool.go |   118 -
 .../src/github.com/appc/spec/actool/build.go  |   145 -
 .../github.com/appc/spec/actool/discover.go   |   106 -
 .../src/github.com/appc/spec/actool/doc.go    |    17 -
 .../src/github.com/appc/spec/actool/help.go   |   140 -
 .../github.com/appc/spec/actool/manifest.go   |   525 -
 .../github.com/appc/spec/actool/validate.go   |   177 -
 .../github.com/appc/spec/actool/version.go    |    33 -
 .../appc/spec/discovery/discovery.go          |   257 -
 .../src/github.com/appc/spec/discovery/doc.go |    17 -
 .../github.com/appc/spec/discovery/http.go    |   122 -
 .../github.com/appc/spec/discovery/parse.go   |   130 -
 .../appc/spec/pkg/acirenderer/acirenderer.go  |   253 -
 .../appc/spec/pkg/acirenderer/resolve.go      |    88 -
 .../appc/spec/pkg/device/device_linux.go      |    33 -
 .../appc/spec/pkg/device/device_posix.go      |    57 -
 .../github.com/appc/spec/pkg/tarheader/doc.go |    17 -
 .../appc/spec/pkg/tarheader/pop_darwin.go     |    39 -
 .../appc/spec/pkg/tarheader/pop_linux.go      |    39 -
 .../appc/spec/pkg/tarheader/pop_posix.go      |    50 -
 .../appc/spec/pkg/tarheader/tarheader.go      |    28 -
 .../appc/spec/schema/common/common.go         |    40 -
 .../src/github.com/appc/spec/schema/doc.go    |    25 -
 .../src/github.com/appc/spec/schema/image.go  |   103 -
 .../src/github.com/appc/spec/schema/kind.go   |    42 -
 .../appc/spec/schema/lastditch/doc.go         |    28 -
 .../appc/spec/schema/lastditch/image.go       |    45 -
 .../appc/spec/schema/lastditch/labels.go      |    38 -
 .../appc/spec/schema/lastditch/pod.go         |    57 -
 .../src/github.com/appc/spec/schema/pod.go    |   168 -
 .../appc/spec/schema/types/acidentifier.go    |   145 -
 .../appc/spec/schema/types/ackind.go          |    67 -
 .../appc/spec/schema/types/acname.go          |   145 -
 .../appc/spec/schema/types/annotations.go     |   106 -
 .../github.com/appc/spec/schema/types/app.go  |    90 -
 .../github.com/appc/spec/schema/types/date.go |    60 -
 .../appc/spec/schema/types/dependencies.go    |    58 -
 .../github.com/appc/spec/schema/types/doc.go  |    18 -
 .../appc/spec/schema/types/environment.go     |   110 -
 .../appc/spec/schema/types/errors.go          |    49 -
 .../appc/spec/schema/types/event_handler.go   |    61 -
 .../github.com/appc/spec/schema/types/exec.go |    46 -
 .../github.com/appc/spec/schema/types/hash.go |   118 -
 .../appc/spec/schema/types/isolator.go        |   129 -
 .../schema/types/isolator_linux_specific.go   |   163 -
 .../spec/schema/types/isolator_resources.go   |   236 -
 .../appc/spec/schema/types/labels.go          |   134 -
 .../appc/spec/schema/types/mountpoint.go      |    91 -
 .../github.com/appc/spec/schema/types/port.go |   139 -
 .../appc/spec/schema/types/semver.go          |    91 -
 .../github.com/appc/spec/schema/types/url.go  |    71 -
 .../github.com/appc/spec/schema/types/uuid.go |    92 -
 .../appc/spec/schema/types/volume.go          |   236 -
 .../github.com/appc/spec/schema/version.go    |    39 -
 .../src/github.com/aws/aws-sdk-go/LICENSE.txt |   202 -
 .../src/github.com/aws/aws-sdk-go/NOTICE.txt  |     3 -
 .../aws/aws-sdk-go/aws/awserr/error.go        |   124 -
 .../aws/aws-sdk-go/aws/awserr/types.go        |   197 -
 .../aws/aws-sdk-go/aws/awsutil/copy.go        |   100 -
 .../aws/aws-sdk-go/aws/awsutil/equal.go       |    27 -
 .../aws/aws-sdk-go/aws/awsutil/path_value.go  |   222 -
 .../aws/aws-sdk-go/aws/awsutil/prettify.go    |   103 -
 .../aws-sdk-go/aws/awsutil/string_value.go    |    89 -
 .../aws/client/metadata/client_info.go        |    12 -
 .../github.com/aws/aws-sdk-go/aws/config.go   |   311 -
 .../aws/aws-sdk-go/aws/convert_types.go       |   357 -
 .../aws/credentials/chain_provider.go         |   100 -
 .../aws-sdk-go/aws/credentials/credentials.go |   223 -
 .../aws/credentials/env_provider.go           |    77 -
 .../aws-sdk-go/aws/credentials/example.ini    |    12 -
 .../shared_credentials_provider.go            |   151 -
 .../aws/credentials/static_provider.go        |    48 -
 .../github.com/aws/aws-sdk-go/aws/errors.go   |    17 -
 .../github.com/aws/aws-sdk-go/aws/logger.go   |   112 -
 .../aws/aws-sdk-go/aws/request/handlers.go    |   187 -
 .../aws/aws-sdk-go/aws/request/request.go     |   302 -
 .../aws/request/request_pagination.go         |   104 -
 .../aws/aws-sdk-go/aws/request/retryer.go     |    82 -
 .../github.com/aws/aws-sdk-go/aws/types.go    |    88 -
 .../github.com/aws/aws-sdk-go/aws/version.go  |     8 -
 .../aws-sdk-go/private/protocol/rest/build.go |   257 -
 .../private/protocol/rest/payload.go          |    45 -
 .../private/protocol/rest/unmarshal.go        |   193 -
 .../private/signer/v4/header_rules.go         |    82 -
 .../aws/aws-sdk-go/private/signer/v4/v4.go    |   438 -
 .../github.com/camlistore/camlistore/COPYING  |   202 -
 .../clients/chrome/clip-it-good/LICENSE       |    13 -
 .../camlistore/camlistore/misc/copyrightifity |    68 -
 .../camlistore/camlistore/pkg/legal/legal.go  |    50 -
 .../pkg/legal/legalprint/legalprint.go        |    42 -
 .../third_party/bazil.org/fuse/LICENSE        |    93 -
 .../third_party/closure/lib/LICENSE           |   176 -
 .../code.google.com/p/goauth2/LICENSE         |    27 -
 .../code.google.com/p/goauth2/PATENTS         |    22 -
 .../code.google.com/p/leveldb-go/LICENSE      |    27 -
 .../code.google.com/p/snappy-go/LICENSE       |    27 -
 .../code.google.com/p/xsrftoken/COPYING       |   202 -
 .../third_party/fontawesome/LICENSE.txt       |     4 -
 .../github.com/camlistore/lock/COPYING        |   202 -
 .../github.com/cznic/exp/dbm/LICENSE          |    27 -
 .../github.com/cznic/exp/lldb/LICENSE         |    27 -
 .../github.com/cznic/fileutil/LICENSE         |    27 -
 .../github.com/cznic/fileutil/falloc/LICENSE  |    27 -
 .../github.com/cznic/fileutil/hdb/LICENSE     |    27 -
 .../github.com/cznic/fileutil/storage/LICENSE |    27 -
 .../third_party/github.com/cznic/kv/LICENSE   |    27 -
 .../github.com/cznic/mathutil/LICENSE         |    27 -
 .../cznic/mathutil/mersenne/LICENSE           |    27 -
 .../github.com/cznic/sortutil/LICENSE         |    27 -
 .../github.com/cznic/zappy/LICENSE            |    27 -
 .../github.com/davecgh/go-spew/LICENSE        |    13 -
 .../github.com/go-sql-driver/mysql/LICENSE    |   373 -
 .../github.com/golang/glog/LICENSE            |   191 -
 .../github.com/gorilla/websocket/LICENSE      |    23 -
 .../third_party/github.com/lib/pq/LICENSE.md  |     8 -
 .../russross/blackfriday/LICENSE.txt          |    29 -
 .../github.com/rwcarlsen/goexif/LICENSE       |    24 -
 .../camlistore/third_party/glitch/LICENSE     |    19 -
 .../third_party/golang.org/x/image/LICENSE    |    27 -
 .../third_party/golang.org/x/image/PATENTS    |    22 -
 .../third_party/labix.org/v2/mgo/LICENSE      |    25 -
 .../third_party/labix.org/v2/mgo/bson/LICENSE |    25 -
 .../camlistore/third_party/react/LICENSE.txt  |   201 -
 .../github.com/hjfreyer/taglib-go/LICENSE     |   191 -
 .../vendor/golang.org/x/oauth2/LICENSE        |    27 -
 .../googleapi/internal/uritemplates/LICENSE   |    18 -
 .../vendor/google.golang.org/cloud/LICENSE    |   202 -
 .../vendor/google.golang.org/grpc/LICENSE     |    28 -
 .../vendor/google.golang.org/grpc/PATENTS     |    22 -
 .../src/github.com/camlistore/go4/LICENSE     |   202 -
 .../github.com/camlistore/go4/legal/legal.go  |    32 -
 .../github.com/camlistore/go4/lock/.gitignore |     1 -
 .../github.com/camlistore/go4/lock/lock.go    |   186 -
 .../camlistore/go4/lock/lock_appengine.go     |    32 -
 .../camlistore/go4/lock/lock_darwin_amd64.go  |    67 -
 .../camlistore/go4/lock/lock_freebsd.go       |    66 -
 .../camlistore/go4/lock/lock_linux_amd64.go   |    67 -
 .../camlistore/go4/lock/lock_linux_arm.go     |    68 -
 .../camlistore/go4/lock/lock_plan9.go         |    41 -
 .../camlistore/go4/lock/lock_sigzero.go       |    26 -
 .../containernetworking/cni/LICENSE           |   202 -
 .../cni/pkg/invoke/args.go                    |    76 -
 .../cni/pkg/invoke/delegate.go                |    53 -
 .../cni/pkg/invoke/exec.go                    |    75 -
 .../cni/pkg/invoke/find.go                    |    47 -
 .../containernetworking/cni/pkg/ip/cidr.go    |    51 -
 .../cni/pkg/ip/ipforward.go                   |    31 -
 .../containernetworking/cni/pkg/ip/ipmasq.go  |    66 -
 .../containernetworking/cni/pkg/ip/link.go    |   153 -
 .../containernetworking/cni/pkg/ip/route.go   |    47 -
 .../containernetworking/cni/pkg/ipam/ipam.go  |    68 -
 .../containernetworking/cni/pkg/ns/README.md  |    31 -
 .../containernetworking/cni/pkg/ns/ns.go      |   315 -
 .../containernetworking/cni/pkg/skel/skel.go  |   161 -
 .../cni/pkg/testutils/cmd.go                  |    77 -
 .../containernetworking/cni/pkg/types/args.go |    91 -
 .../cni/pkg/types/types.go                    |   191 -
 .../cni/pkg/utils/sysctl/sysctl_linux.go      |    58 -
 .../cni/pkg/utils/utils.go                    |    41 -
 .../cni/plugins/ipam/dhcp/daemon.go           |   157 -
 .../cni/plugins/ipam/dhcp/lease.go            |   337 -
 .../cni/plugins/ipam/dhcp/main.go             |    73 -
 .../cni/plugins/ipam/dhcp/options.go          |   139 -
 .../cni/plugins/ipam/host-local/README.md     |    86 -
 .../cni/plugins/ipam/host-local/allocator.go  |   165 -
 .../ipam/host-local/backend/disk/backend.go   |    88 -
 .../ipam/host-local/backend/disk/lock.go      |    50 -
 .../plugins/ipam/host-local/backend/store.go  |    26 -
 .../cni/plugins/ipam/host-local/config.go     |    70 -
 .../cni/plugins/ipam/host-local/main.go       |    74 -
 .../cni/plugins/main/bridge/bridge.go         |   319 -
 .../cni/plugins/main/ipvlan/ipvlan.go         |   175 -
 .../cni/plugins/main/macvlan/macvlan.go       |   193 -
 .../cni/plugins/main/ptp/ptp.go               |   229 -
 .../cni/plugins/meta/flannel/flannel.go       |   253 -
 .../cni/plugins/meta/tuning/tuning.go         |    82 -
 .../src/github.com/coreos/gexpect/LICENCE     |     7 -
 .../src/github.com/coreos/gexpect/README.md   |    64 -
 .../src/github.com/coreos/gexpect/gexpect.go  |   449 -
 .../src/github.com/coreos/go-iptables/LICENSE |   191 -
 .../coreos/go-iptables/iptables/iptables.go   |   295 -
 .../coreos/go-iptables/iptables/lock.go       |    84 -
 .../src/github.com/coreos/go-semver/LICENSE   |   202 -
 .../coreos/go-semver/semver/semver.go         |   202 -
 .../coreos/go-semver/semver/sort.go           |    24 -
 .../src/github.com/coreos/go-systemd/LICENSE  |   191 -
 .../coreos/go-systemd/activation/files.go     |    52 -
 .../coreos/go-systemd/activation/listeners.go |    62 -
 .../go-systemd/activation/packetconns.go      |    37 -
 .../github.com/coreos/go-systemd/dbus/dbus.go |   203 -
 .../coreos/go-systemd/dbus/methods.go         |   484 -
 .../coreos/go-systemd/dbus/properties.go      |   218 -
 .../github.com/coreos/go-systemd/dbus/set.go  |    47 -
 .../coreos/go-systemd/dbus/subscription.go    |   250 -
 .../go-systemd/dbus/subscription_set.go       |    57 -
 .../coreos/go-systemd/sdjournal/journal.go    |   971 -
 .../coreos/go-systemd/sdjournal/read.go       |   252 -
 .../coreos/go-systemd/unit/deserialize.go     |   276 -
 .../coreos/go-systemd/unit/escape.go          |   116 -
 .../coreos/go-systemd/unit/option.go          |    54 -
 .../coreos/go-systemd/unit/serialize.go       |    75 -
 .../github.com/coreos/go-systemd/util/util.go |   227 -
 .../src/github.com/coreos/go-tspi/LICENSE     |   202 -
 .../coreos/go-tspi/tpmclient/tpmclient.go     |   310 -
 .../coreos/go-tspi/tspiconst/tspiconst.go     |   538 -
 .../go-tspi/verification/verification.go      |   654 -
 .../src/github.com/coreos/ioprogress/LICENSE  |    21 -
 .../github.com/coreos/ioprogress/README.md    |    42 -
 .../src/github.com/coreos/ioprogress/draw.go  |   132 -
 .../github.com/coreos/ioprogress/reader.go    |   107 -
 .../src/github.com/coreos/pkg/LICENSE         |   202 -
 .../src/github.com/coreos/pkg/NOTICE          |     5 -
 .../github.com/coreos/pkg/dlopen/dlopen.go    |    82 -
 .../coreos/pkg/dlopen/dlopen_example.go       |    56 -
 .../coreos/pkg/progressutil/iocopy.go         |   189 -
 .../coreos/pkg/progressutil/progressbar.go    |   256 -
 .../github.com/cpuguy83/go-md2man/LICENSE.md  |    21 -
 .../cpuguy83/go-md2man/md2man/md2man.go       |    19 -
 .../cpuguy83/go-md2man/md2man/roff.go         |   269 -
 .../_workspace/src/github.com/cznic/b/AUTHORS |    11 -
 .../src/github.com/cznic/b/CONTRIBUTORS       |    11 -
 .../_workspace/src/github.com/cznic/b/LICENSE |    27 -
 .../src/github.com/cznic/b/Makefile           |    53 -
 .../src/github.com/cznic/b/README.md          |    10 -
 .../src/github.com/cznic/b/btree.go           |   929 -
 .../_workspace/src/github.com/cznic/b/doc.go  |    53 -
 .../src/github.com/cznic/b/example/Makefile   |    35 -
 .../src/github.com/cznic/b/example/int.go     |   929 -
 .../src/github.com/cznic/bufs/AUTHORS         |    11 -
 .../src/github.com/cznic/bufs/CONTRIBUTORS    |     9 -
 .../src/github.com/cznic/bufs/LICENSE         |    27 -
 .../src/github.com/cznic/bufs/Makefile        |    31 -
 .../src/github.com/cznic/bufs/README.md       |     8 -
 .../src/github.com/cznic/bufs/bufs.go         |   391 -
 .../src/github.com/cznic/exp/dbm/LICENSE      |    27 -
 .../src/github.com/cznic/exp/lldb/2pc.go      |   324 -
 .../src/github.com/cznic/exp/lldb/2pc_docs.go |    44 -
 .../src/github.com/cznic/exp/lldb/AUTHORS     |    11 -
 .../github.com/cznic/exp/lldb/CONTRIBUTORS    |     9 -
 .../src/github.com/cznic/exp/lldb/LICENSE     |    27 -
 .../src/github.com/cznic/exp/lldb/Makefile    |    45 -
 .../src/github.com/cznic/exp/lldb/README.md   |     8 -
 .../src/github.com/cznic/exp/lldb/btree.go    |  2297 ---
 .../src/github.com/cznic/exp/lldb/errors.go   |   170 -
 .../src/github.com/cznic/exp/lldb/falloc.go   |  1981 --
 .../src/github.com/cznic/exp/lldb/filer.go    |   192 -
 .../src/github.com/cznic/exp/lldb/gb.go       |   812 -
 .../src/github.com/cznic/exp/lldb/lldb.go     |   155 -
 .../src/github.com/cznic/exp/lldb/memfiler.go |   344 -
 .../src/github.com/cznic/exp/lldb/osfiler.go  |   130 -
 .../cznic/exp/lldb/simplefilefiler.go         |   123 -
 .../src/github.com/cznic/exp/lldb/xact.go     |   629 -
 .../src/github.com/cznic/fileutil/AUTHORS     |    14 -
 .../github.com/cznic/fileutil/CONTRIBUTORS    |    14 -
 .../src/github.com/cznic/fileutil/LICENSE     |    27 -
 .../src/github.com/cznic/fileutil/Makefile    |    27 -
 .../src/github.com/cznic/fileutil/README      |    16 -
 .../github.com/cznic/fileutil/falloc/LICENSE  |    27 -
 .../github.com/cznic/fileutil/falloc/README   |     5 -
 .../github.com/cznic/fileutil/falloc/docs.go  |   251 -
 .../github.com/cznic/fileutil/falloc/error.go |   130 -
 .../cznic/fileutil/falloc/falloc.go           |   676 -
 .../cznic/fileutil/falloc/test_deps.go        |    15 -
 .../src/github.com/cznic/fileutil/fileutil.go |   223 -
 .../github.com/cznic/fileutil/fileutil_arm.go |    25 -
 .../cznic/fileutil/fileutil_darwin.go         |    25 -
 .../cznic/fileutil/fileutil_freebsd.go        |    25 -
 .../cznic/fileutil/fileutil_linux.go          |    96 -
 .../cznic/fileutil/fileutil_openbsd.go        |    25 -
 .../cznic/fileutil/fileutil_plan9.go          |    25 -
 .../cznic/fileutil/fileutil_solaris.go        |    27 -
 .../cznic/fileutil/fileutil_windows.go        |   183 -
 .../src/github.com/cznic/fileutil/hdb/LICENSE |    27 -
 .../src/github.com/cznic/fileutil/hdb/README  |     5 -
 .../src/github.com/cznic/fileutil/hdb/hdb.go  |   153 -
 .../cznic/fileutil/hdb/test_deps.go           |    13 -
 .../github.com/cznic/fileutil/storage/LICENSE |    27 -
 .../github.com/cznic/fileutil/storage/README  |     5 -
 .../cznic/fileutil/storage/cache.go           |   322 -
 .../github.com/cznic/fileutil/storage/file.go |    50 -
 .../github.com/cznic/fileutil/storage/mem.go  |   161 -
 .../cznic/fileutil/storage/probe.go           |    74 -
 .../cznic/fileutil/storage/storage.go         |   141 -
 .../cznic/fileutil/storage/test_deps.go       |    13 -
 .../github.com/cznic/fileutil/test_deps.go    |    13 -
 .../src/github.com/cznic/mathutil/AUTHORS     |    12 -
 .../github.com/cznic/mathutil/CONTRIBUTORS    |    10 -
 .../src/github.com/cznic/mathutil/LICENSE     |    27 -
 .../src/github.com/cznic/mathutil/Makefile    |    31 -
 .../src/github.com/cznic/mathutil/README      |    10 -
 .../src/github.com/cznic/mathutil/bits.go     |   207 -
 .../src/github.com/cznic/mathutil/envelope.go |    46 -
 .../cznic/mathutil/example/.gitignore         |     2 -
 .../cznic/mathutil/example/example.go         |    48 -
 .../cznic/mathutil/example2/.gitignore        |     2 -
 .../cznic/mathutil/example2/example2.go       |    66 -
 .../cznic/mathutil/example3/.gitignore        |     2 -
 .../cznic/mathutil/example3/example3.go       |    43 -
 .../cznic/mathutil/example4/main.go           |    90 -
 .../cznic/mathutil/example4/results           |    55 -
 .../src/github.com/cznic/mathutil/ff/main.go  |    83 -
 .../src/github.com/cznic/mathutil/mathutil.go |   829 -
 .../cznic/mathutil/mersenne/AUTHORS           |    11 -
 .../cznic/mathutil/mersenne/CONTRIBUTORS      |     9 -
 .../cznic/mathutil/mersenne/LICENSE           |    27 -
 .../cznic/mathutil/mersenne/Makefile          |    24 -
 .../github.com/cznic/mathutil/mersenne/README |     2 -
 .../cznic/mathutil/mersenne/mersenne.go       |   296 -
 .../cznic/mathutil/nist-sts-2-1-1-report      |   267 -
 .../src/github.com/cznic/mathutil/permute.go  |    39 -
 .../src/github.com/cznic/mathutil/primes.go   |   342 -
 .../src/github.com/cznic/mathutil/rat.go      |    27 -
 .../src/github.com/cznic/mathutil/rnd.go      |   383 -
 .../src/github.com/cznic/mathutil/tables.go   |  6995 -------
 .../github.com/cznic/mathutil/test_deps.go    |    11 -
 .../src/github.com/cznic/ql/AUTHORS           |    11 -
 .../src/github.com/cznic/ql/CONTRIBUTORS      |    12 -
 .../src/github.com/cznic/ql/LICENSE           |    27 -
 .../src/github.com/cznic/ql/Makefile          |    74 -
 .../src/github.com/cznic/ql/README.md         |    21 -
 .../src/github.com/cznic/ql/benchcmp          |     1 -
 .../src/github.com/cznic/ql/blob.go           |   155 -
 .../src/github.com/cznic/ql/btree.go          |   725 -
 .../src/github.com/cznic/ql/builtin.go        |   991 -
 .../src/github.com/cznic/ql/coerce.go         |   290 -
 .../src/github.com/cznic/ql/design/doc.go     |   298 -
 .../_workspace/src/github.com/cznic/ql/doc.go |  2606 ---
 .../src/github.com/cznic/ql/driver.go         |   523 -
 .../src/github.com/cznic/ql/driver/Makefile   |    40 -
 .../src/github.com/cznic/ql/driver/driver.go  |    61 -
 .../src/github.com/cznic/ql/errors.go         |    18 -
 .../_workspace/src/github.com/cznic/ql/etc.go |  2805 ---
 .../src/github.com/cznic/ql/expr.go           |  4023 ----
 .../src/github.com/cznic/ql/file.go           |  1279 --
 .../src/github.com/cznic/ql/helper/helper.go  |   338 -
 .../src/github.com/cznic/ql/httpfs.go         |   302 -
 .../src/github.com/cznic/ql/introspection.go  |   625 -
 .../_workspace/src/github.com/cznic/ql/mem.go |  1277 --
 .../src/github.com/cznic/ql/parser.go         |  2637 ---
 .../src/github.com/cznic/ql/parser.y          |  1337 --
 .../src/github.com/cznic/ql/plan.go           |  2800 ---
 .../src/github.com/cznic/ql/ql.ebnf           |   225 -
 .../_workspace/src/github.com/cznic/ql/ql.go  |  1729 --
 .../_workspace/src/github.com/cznic/ql/ql.y   |  1687 --
 .../src/github.com/cznic/ql/ql/Makefile       |    24 -
 .../src/github.com/cznic/ql/ql/README.md      |    10 -
 .../src/github.com/cznic/ql/ql/main.go        |   219 -
 .../src/github.com/cznic/ql/scanner.go        |  4129 ----
 .../src/github.com/cznic/ql/scanner.l         |   462 -
 .../src/github.com/cznic/ql/stmt.go           |  1268 --
 .../src/github.com/cznic/ql/storage.go        |   991 -
 .../src/github.com/cznic/ql/testdata.log      |  8382 ---------
 .../src/github.com/cznic/ql/testdata.ql       | 15633 ----------------
 .../src/github.com/cznic/sortutil/AUTHORS     |    11 -
 .../github.com/cznic/sortutil/CONTRIBUTORS    |    10 -
 .../src/github.com/cznic/sortutil/LICENSE     |    27 -
 .../src/github.com/cznic/sortutil/Makefile    |    35 -
 .../src/github.com/cznic/sortutil/README      |     4 -
 .../src/github.com/cznic/sortutil/sortutil.go |   227 -
 .../src/github.com/cznic/strutil/AUTHORS      |    12 -
 .../src/github.com/cznic/strutil/CONTRIBUTORS |     9 -
 .../src/github.com/cznic/strutil/LICENSE      |    27 -
 .../src/github.com/cznic/strutil/Makefile     |    37 -
 .../src/github.com/cznic/strutil/README       |     8 -
 .../src/github.com/cznic/strutil/strutil.go   |   428 -
 .../src/github.com/cznic/zappy/AUTHORS        |    12 -
 .../src/github.com/cznic/zappy/CONTRIBUTORS   |    10 -
 .../src/github.com/cznic/zappy/LICENSE        |    27 -
 .../src/github.com/cznic/zappy/Makefile       |    30 -
 .../src/github.com/cznic/zappy/README.md      |     9 -
 .../github.com/cznic/zappy/SNAPPY-GO-LICENSE  |    27 -
 .../src/github.com/cznic/zappy/decode.go      |    38 -
 .../src/github.com/cznic/zappy/decode_cgo.go  |   121 -
 .../github.com/cznic/zappy/decode_nocgo.go    |    89 -
 .../src/github.com/cznic/zappy/encode.go      |    37 -
 .../src/github.com/cznic/zappy/encode_cgo.go  |   140 -
 .../github.com/cznic/zappy/encode_nocgo.go    |    92 -
 .../src/github.com/cznic/zappy/purego.sh      |    11 -
 .../src/github.com/cznic/zappy/zappy.go       |   241 -
 .../src/github.com/d2g/dhcp4/LICENSE          |    27 -
 .../src/github.com/d2g/dhcp4/README.md        |     5 -
 .../src/github.com/d2g/dhcp4/constants.go     |   121 -
 .../src/github.com/d2g/dhcp4/helpers.go       |    58 -
 .../src/github.com/d2g/dhcp4/option.go        |    40 -
 .../src/github.com/d2g/dhcp4/packet.go        |   149 -
 .../src/github.com/d2g/dhcp4client/LICENSE    |   354 -
 .../src/github.com/d2g/dhcp4client/README.md  |     8 -
 .../src/github.com/d2g/dhcp4client/client.go  |   366 -
 .../github.com/d2g/dhcp4client/inetsock.go    |    75 -
 .../src/github.com/d2g/dhcp4client/init.go    |    10 -
 .../d2g/dhcp4client/pktsock_linux.go          |   147 -
 .../github.com/docker/distribution/LICENSE    |   202 -
 .../docker/distribution/digest/digest.go      |   139 -
 .../docker/distribution/digest/digester.go    |   155 -
 .../docker/distribution/digest/doc.go         |    42 -
 .../docker/distribution/digest/set.go         |   245 -
 .../docker/distribution/digest/verifiers.go   |    44 -
 .../distribution/reference/reference.go       |   334 -
 .../docker/distribution/reference/regexp.go   |   124 -
 .../github.com/dustin/go-humanize/.gitignore  |     6 -
 .../src/github.com/dustin/go-humanize/LICENSE |    21 -
 .../dustin/go-humanize/README.markdown        |    81 -
 .../src/github.com/dustin/go-humanize/big.go  |    31 -
 .../github.com/dustin/go-humanize/bigbytes.go |   164 -
 .../github.com/dustin/go-humanize/bytes.go    |   134 -
 .../github.com/dustin/go-humanize/comma.go    |   101 -
 .../src/github.com/dustin/go-humanize/ftoa.go |    23 -
 .../github.com/dustin/go-humanize/humanize.go |     8 -
 .../github.com/dustin/go-humanize/number.go   |   192 -
 .../github.com/dustin/go-humanize/ordinals.go |    25 -
 .../src/github.com/dustin/go-humanize/si.go   |   110 -
 .../github.com/dustin/go-humanize/times.go    |    91 -
 .../src/github.com/go-ini/ini/.gitignore      |     4 -
 .../src/github.com/go-ini/ini/LICENSE         |   191 -
 .../src/github.com/go-ini/ini/Makefile        |    12 -
 .../src/github.com/go-ini/ini/README.md       |   632 -
 .../src/github.com/go-ini/ini/README_ZH.md    |   619 -
 .../src/github.com/go-ini/ini/ini.go          |   465 -
 .../src/github.com/go-ini/ini/key.go          |   616 -
 .../src/github.com/go-ini/ini/parser.go       |   312 -
 .../src/github.com/go-ini/ini/section.go      |   177 -
 .../src/github.com/go-ini/ini/struct.go       |   351 -
 .../src/github.com/go-ole/go-ole/.travis.yml  |     9 -
 .../src/github.com/go-ole/go-ole/ChangeLog.md |    49 -
 .../src/github.com/go-ole/go-ole/README.md    |    46 -
 .../src/github.com/go-ole/go-ole/appveyor.yml |    63 -
 .../src/github.com/go-ole/go-ole/com.go       |   329 -
 .../src/github.com/go-ole/go-ole/com_func.go  |   174 -
 .../src/github.com/go-ole/go-ole/connect.go   |   192 -
 .../src/github.com/go-ole/go-ole/constants.go |   153 -
 .../src/github.com/go-ole/go-ole/error.go     |    51 -
 .../github.com/go-ole/go-ole/error_func.go    |     8 -
 .../github.com/go-ole/go-ole/error_windows.go |    24 -
 .../src/github.com/go-ole/go-ole/guid.go      |   118 -
 .../go-ole/go-ole/iconnectionpoint.go         |    20 -
 .../go-ole/go-ole/iconnectionpoint_func.go    |    21 -
 .../go-ole/go-ole/iconnectionpoint_windows.go |    43 -
 .../go-ole/iconnectionpointcontainer.go       |    17 -
 .../go-ole/iconnectionpointcontainer_func.go  |    11 -
 .../iconnectionpointcontainer_windows.go      |    25 -
 .../src/github.com/go-ole/go-ole/idispatch.go |    94 -
 .../go-ole/go-ole/idispatch_func.go           |    19 -
 .../go-ole/go-ole/idispatch_windows.go        |   193 -
 .../github.com/go-ole/go-ole/ienumvariant.go  |    19 -
 .../go-ole/go-ole/ienumvariant_func.go        |    19 -
 .../go-ole/go-ole/ienumvariant_windows.go     |    63 -
 .../github.com/go-ole/go-ole/iinspectable.go  |    18 -
 .../go-ole/go-ole/iinspectable_func.go        |    15 -
 .../go-ole/go-ole/iinspectable_windows.go     |    72 -
 .../go-ole/go-ole/iprovideclassinfo.go        |    21 -
 .../go-ole/go-ole/iprovideclassinfo_func.go   |     7 -
 .../go-ole/iprovideclassinfo_windows.go       |    21 -
 .../src/github.com/go-ole/go-ole/itypeinfo.go |    34 -
 .../go-ole/go-ole/itypeinfo_func.go           |     7 -
 .../go-ole/go-ole/itypeinfo_windows.go        |    21 -
 .../src/github.com/go-ole/go-ole/iunknown.go  |    57 -
 .../github.com/go-ole/go-ole/iunknown_func.go |    19 -
 .../go-ole/go-ole/iunknown_windows.go         |    58 -
 .../src/github.com/go-ole/go-ole/ole.go       |   147 -
 .../go-ole/go-ole/oleutil/connection.go       |   100 -
 .../go-ole/go-ole/oleutil/connection_func.go  |    10 -
 .../go-ole/oleutil/connection_windows.go      |    57 -
 .../go-ole/go-ole/oleutil/go-get.go           |     6 -
 .../go-ole/go-ole/oleutil/oleutil.go          |    89 -
 .../src/github.com/go-ole/go-ole/safearray.go |    27 -
 .../go-ole/go-ole/safearray_func.go           |   211 -
 .../go-ole/go-ole/safearray_windows.go        |   337 -
 .../go-ole/go-ole/safearrayconversion.go      |   140 -
 .../go-ole/go-ole/safearrayslices.go          |    33 -
 .../src/github.com/go-ole/go-ole/utility.go   |   101 -
 .../src/github.com/go-ole/go-ole/variables.go |    16 -
 .../src/github.com/go-ole/go-ole/variant.go   |   105 -
 .../github.com/go-ole/go-ole/variant_386.go   |    11 -
 .../github.com/go-ole/go-ole/variant_amd64.go |    12 -
 .../src/github.com/go-ole/go-ole/vt_string.go |    58 -
 .../src/github.com/go-ole/go-ole/winrt.go     |    99 -
 .../src/github.com/go-ole/go-ole/winrt_doc.go |    36 -
 .../github.com/godbus/dbus/CONTRIBUTING.md    |    50 -
 .../src/github.com/godbus/dbus/LICENSE        |    25 -
 .../src/github.com/godbus/dbus/MAINTAINERS    |     2 -
 .../github.com/godbus/dbus/README.markdown    |    41 -
 .../src/github.com/godbus/dbus/auth.go        |   253 -
 .../github.com/godbus/dbus/auth_external.go   |    26 -
 .../src/github.com/godbus/dbus/auth_sha1.go   |   102 -
 .../src/github.com/godbus/dbus/call.go        |    36 -
 .../src/github.com/godbus/dbus/conn.go        |   625 -
 .../src/github.com/godbus/dbus/conn_darwin.go |    21 -
 .../src/github.com/godbus/dbus/conn_other.go  |    27 -
 .../src/github.com/godbus/dbus/dbus.go        |   258 -
 .../src/github.com/godbus/dbus/decoder.go     |   228 -
 .../src/github.com/godbus/dbus/doc.go         |    63 -
 .../src/github.com/godbus/dbus/encoder.go     |   208 -
 .../src/github.com/godbus/dbus/export.go      |   411 -
 .../src/github.com/godbus/dbus/homedir.go     |    28 -
 .../github.com/godbus/dbus/homedir_dynamic.go |    15 -
 .../github.com/godbus/dbus/homedir_static.go  |    45 -
 .../github.com/godbus/dbus/introspect/call.go |    27 -
 .../godbus/dbus/introspect/introspect.go      |    86 -
 .../godbus/dbus/introspect/introspectable.go  |    76 -
 .../src/github.com/godbus/dbus/message.go     |   346 -
 .../src/github.com/godbus/dbus/object.go      |   136 -
 .../src/github.com/godbus/dbus/prop/prop.go   |   264 -
 .../src/github.com/godbus/dbus/sig.go         |   257 -
 .../godbus/dbus/transport_darwin.go           |     6 -
 .../godbus/dbus/transport_generic.go          |    35 -
 .../github.com/godbus/dbus/transport_unix.go  |   196 -
 .../dbus/transport_unixcred_dragonfly.go      |    95 -
 .../godbus/dbus/transport_unixcred_linux.go   |    25 -
 .../src/github.com/godbus/dbus/variant.go     |   139 -
 .../github.com/godbus/dbus/variant_lexer.go   |   284 -
 .../github.com/godbus/dbus/variant_parser.go  |   817 -
 .../src/github.com/gogo/protobuf/LICENSE      |    36 -
 .../github.com/gogo/protobuf/proto/Makefile   |    43 -
 .../github.com/gogo/protobuf/proto/clone.go   |   228 -
 .../github.com/gogo/protobuf/proto/decode.go  |   872 -
 .../gogo/protobuf/proto/decode_gogo.go        |   175 -
 .../github.com/gogo/protobuf/proto/encode.go  |  1325 --
 .../gogo/protobuf/proto/encode_gogo.go        |   354 -
 .../github.com/gogo/protobuf/proto/equal.go   |   276 -
 .../gogo/protobuf/proto/extensions.go         |   518 -
 .../gogo/protobuf/proto/extensions_gogo.go    |   221 -
 .../src/github.com/gogo/protobuf/proto/lib.go |   894 -
 .../gogo/protobuf/proto/lib_gogo.go           |    40 -
 .../gogo/protobuf/proto/message_set.go        |   280 -
 .../gogo/protobuf/proto/pointer_reflect.go    |   479 -
 .../gogo/protobuf/proto/pointer_unsafe.go     |   266 -
 .../protobuf/proto/pointer_unsafe_gogo.go     |   108 -
 .../gogo/protobuf/proto/properties.go         |   923 -
 .../gogo/protobuf/proto/properties_gogo.go    |    64 -
 .../gogo/protobuf/proto/skip_gogo.go          |   117 -
 .../github.com/gogo/protobuf/proto/text.go    |   793 -
 .../gogo/protobuf/proto/text_gogo.go          |    55 -
 .../gogo/protobuf/proto/text_parser.go        |   849 -
 .../src/github.com/golang/protobuf/LICENSE    |    31 -
 .../github.com/golang/protobuf/proto/Makefile |    43 -
 .../github.com/golang/protobuf/proto/clone.go |   223 -
 .../golang/protobuf/proto/decode.go           |   867 -
 .../golang/protobuf/proto/encode.go           |  1325 --
 .../github.com/golang/protobuf/proto/equal.go |   276 -
 .../golang/protobuf/proto/extensions.go       |   399 -
 .../github.com/golang/protobuf/proto/lib.go   |   893 -
 .../golang/protobuf/proto/message_set.go      |   280 -
 .../golang/protobuf/proto/pointer_reflect.go  |   479 -
 .../golang/protobuf/proto/pointer_unsafe.go   |   266 -
 .../golang/protobuf/proto/properties.go       |   842 -
 .../protobuf/proto/proto3_proto/proto3.pb.go  |   122 -
 .../protobuf/proto/proto3_proto/proto3.proto  |    68 -
 .../github.com/golang/protobuf/proto/text.go  |   751 -
 .../golang/protobuf/proto/text_parser.go      |   798 -
 .../golang/protobuf/protoc-gen-go/Makefile    |    33 -
 .../protoc-gen-go/descriptor/Makefile         |    39 -
 .../protoc-gen-go/descriptor/descriptor.pb.go |  1812 --
 .../golang/protobuf/protoc-gen-go/doc.go      |    51 -
 .../protobuf/protoc-gen-go/generator/Makefile |    40 -
 .../protoc-gen-go/generator/generator.go      |  2715 ---
 .../protoc-gen-go/internal/grpc/grpc.go       |   442 -
 .../protobuf/protoc-gen-go/link_grpc.go       |    34 -
 .../golang/protobuf/protoc-gen-go/main.go     |    98 -
 .../protobuf/protoc-gen-go/plugin/Makefile    |    45 -
 .../protoc-gen-go/plugin/plugin.pb.go         |   222 -
 .../protoc-gen-go/plugin/plugin.pb.golden     |    83 -
 .../src/github.com/google/btree/.travis.yml   |     1 -
 .../src/github.com/google/btree/LICENSE       |   202 -
 .../src/github.com/google/btree/README.md     |    12 -
 .../src/github.com/google/btree/btree.go      |   571 -
 .../src/github.com/google/btree/btree_mem.go  |    76 -
 .../src/github.com/gopherjs/gopherjs/LICENSE  |    24 -
 .../github.com/gorilla/context/.travis.yml    |     7 -
 .../src/github.com/gorilla/context/LICENSE    |    27 -
 .../src/github.com/gorilla/context/README.md  |     7 -
 .../src/github.com/gorilla/context/context.go |   143 -
 .../src/github.com/gorilla/context/doc.go     |    82 -
 .../src/github.com/gorilla/mux/.travis.yml    |     7 -
 .../src/github.com/gorilla/mux/LICENSE        |    27 -
 .../src/github.com/gorilla/mux/README.md      |     7 -
 .../src/github.com/gorilla/mux/doc.go         |   199 -
 .../src/github.com/gorilla/mux/mux.go         |   353 -
 .../src/github.com/gorilla/mux/regexp.go      |   276 -
 .../src/github.com/gorilla/mux/route.go       |   524 -
 .../src/github.com/hashicorp/errwrap/LICENSE  |   354 -
 .../github.com/hashicorp/errwrap/README.md    |    89 -
 .../github.com/hashicorp/errwrap/errwrap.go   |   169 -
 .../hydrogen18/stoppableListener/LICENSE      |    10 -
 .../hydrogen18/stoppableListener/README.md    |    18 -
 .../stoppableListener/example/example.go      |    52 -
 .../hydrogen18/stoppableListener/listener.go  |    62 -
 .../inconshreveable/mousetrap/LICENSE         |    13 -
 .../inconshreveable/mousetrap/README.md       |    23 -
 .../inconshreveable/mousetrap/trap_others.go  |    15 -
 .../inconshreveable/mousetrap/trap_windows.go |    98 -
 .../mousetrap/trap_windows_1.4.go             |    46 -
 .../jmespath/go-jmespath/.gitignore           |     4 -
 .../jmespath/go-jmespath/.travis.yml          |     9 -
 .../github.com/jmespath/go-jmespath/LICENSE   |    13 -
 .../github.com/jmespath/go-jmespath/Makefile  |    44 -
 .../github.com/jmespath/go-jmespath/README.md |     7 -
 .../github.com/jmespath/go-jmespath/api.go    |    49 -
 .../go-jmespath/astnodetype_string.go         |    16 -
 .../jmespath/go-jmespath/functions.go         |   842 -
 .../jmespath/go-jmespath/interpreter.go       |   418 -
 .../github.com/jmespath/go-jmespath/lexer.go  |   420 -
 .../github.com/jmespath/go-jmespath/parser.go |   603 -
 .../jmespath/go-jmespath/toktype_string.go    |    16 -
 .../github.com/jmespath/go-jmespath/util.go   |   185 -
 .../github.com/kballard/go-shellquote/LICENSE |    19 -
 .../github.com/kballard/go-shellquote/README  |    36 -
 .../github.com/kballard/go-shellquote/doc.go  |     3 -
 .../kballard/go-shellquote/quote.go           |   102 -
 .../kballard/go-shellquote/unquote.go         |   144 -
 .../src/github.com/klauspost/compress/LICENSE |    27 -
 .../klauspost/compress/flate/copy.go          |    32 -
 .../klauspost/compress/flate/crc32_amd64.go   |    39 -
 .../klauspost/compress/flate/crc32_amd64.s    |   218 -
 .../klauspost/compress/flate/crc32_noasm.go   |    34 -
 .../klauspost/compress/flate/deflate.go       |  1358 --
 .../klauspost/compress/flate/fixedhuff.go     |    78 -
 .../klauspost/compress/flate/gen.go           |   265 -
 .../compress/flate/huffman_bit_writer.go      |   717 -
 .../klauspost/compress/flate/huffman_code.go  |   363 -
 .../klauspost/compress/flate/inflate.go       |   846 -
 .../klauspost/compress/flate/reverse_bits.go  |    48 -
 .../klauspost/compress/flate/snappy.go        |   768 -
 .../klauspost/compress/flate/token.go         |   105 -
 .../src/github.com/klauspost/cpuid/.gitignore |    24 -
 .../github.com/klauspost/cpuid/.travis.yml    |     8 -
 .../src/github.com/klauspost/cpuid/LICENSE    |    22 -
 .../src/github.com/klauspost/cpuid/README.md  |   145 -
 .../src/github.com/klauspost/cpuid/cpuid.go   |  1022 -
 .../github.com/klauspost/cpuid/cpuid_386.s    |    42 -
 .../github.com/klauspost/cpuid/cpuid_amd64.s  |    42 -
 .../klauspost/cpuid/detect_intel.go           |    17 -
 .../github.com/klauspost/cpuid/detect_ref.go  |    23 -
 .../github.com/klauspost/cpuid/generate.go    |     3 -
 .../github.com/klauspost/cpuid/private-gen.go |   476 -
 .../src/github.com/klauspost/crc32/.gitignore |    24 -
 .../github.com/klauspost/crc32/.travis.yml    |    12 -
 .../src/github.com/klauspost/crc32/LICENSE    |    28 -
 .../src/github.com/klauspost/crc32/README.md  |    84 -
 .../src/github.com/klauspost/crc32/crc32.go   |   186 -
 .../github.com/klauspost/crc32/crc32_amd64.go |    62 -
 .../github.com/klauspost/crc32/crc32_amd64.s  |   237 -
 .../klauspost/crc32/crc32_amd64p32.go         |    40 -
 .../klauspost/crc32/crc32_amd64p32.s          |    67 -
 .../klauspost/crc32/crc32_generic.go          |    29 -
 .../src/github.com/klauspost/pgzip/.gitignore |    24 -
 .../github.com/klauspost/pgzip/.travis.yml    |    18 -
 .../src/github.com/klauspost/pgzip/GO_LICENSE |    27 -
 .../src/github.com/klauspost/pgzip/LICENSE    |    22 -
 .../src/github.com/klauspost/pgzip/README.md  |   115 -
 .../src/github.com/klauspost/pgzip/circle.yml |     7 -
 .../src/github.com/klauspost/pgzip/gunzip.go  |   564 -
 .../src/github.com/klauspost/pgzip/gzip.go    |   485 -
 .../src/github.com/kr/pty/.gitignore          |     4 -
 .../_workspace/src/github.com/kr/pty/License  |    23 -
 .../src/github.com/kr/pty/README.md           |    36 -
 .../_workspace/src/github.com/kr/pty/doc.go   |    16 -
 .../_workspace/src/github.com/kr/pty/ioctl.go |    11 -
 .../src/github.com/kr/pty/ioctl_bsd.go        |    39 -
 .../src/github.com/kr/pty/mktypes.bash        |    19 -
 .../src/github.com/kr/pty/pty_darwin.go       |    60 -
 .../src/github.com/kr/pty/pty_freebsd.go      |    73 -
 .../src/github.com/kr/pty/pty_linux.go        |    46 -
 .../src/github.com/kr/pty/pty_unsupported.go  |    11 -
 .../_workspace/src/github.com/kr/pty/run.go   |    32 -
 .../_workspace/src/github.com/kr/pty/types.go |    10 -
 .../src/github.com/kr/pty/types_freebsd.go    |    15 -
 .../_workspace/src/github.com/kr/pty/util.go  |    35 -
 .../src/github.com/kr/pty/ztypes_386.go       |     9 -
 .../src/github.com/kr/pty/ztypes_amd64.go     |     9 -
 .../src/github.com/kr/pty/ztypes_arm.go       |     9 -
 .../src/github.com/kr/pty/ztypes_arm64.go     |    11 -
 .../github.com/kr/pty/ztypes_freebsd_386.go   |    13 -
 .../github.com/kr/pty/ztypes_freebsd_amd64.go |    14 -
 .../github.com/kr/pty/ztypes_freebsd_arm.go   |    13 -
 .../src/github.com/kr/pty/ztypes_ppc64.go     |    11 -
 .../src/github.com/kr/pty/ztypes_ppc64le.go   |    11 -
 .../src/github.com/kr/pty/ztypes_s390x.go     |    11 -
 .../src/github.com/pborman/uuid/CONTRIBUTORS  |     1 -
 .../src/github.com/pborman/uuid/LICENSE       |    27 -
 .../src/github.com/pborman/uuid/dce.go        |    84 -
 .../src/github.com/pborman/uuid/doc.go        |     8 -
 .../src/github.com/pborman/uuid/hash.go       |    53 -
 .../src/github.com/pborman/uuid/json.go       |    30 -
 .../src/github.com/pborman/uuid/node.go       |   101 -
 .../src/github.com/pborman/uuid/sql.go        |    40 -
 .../src/github.com/pborman/uuid/time.go       |   132 -
 .../src/github.com/pborman/uuid/util.go       |    43 -
 .../src/github.com/pborman/uuid/uuid.go       |   163 -
 .../src/github.com/pborman/uuid/version1.go   |    41 -
 .../src/github.com/pborman/uuid/version4.go   |    25 -
 .../src/github.com/petar/GoLLRB/LICENSE       |    27 -
 .../src/github.com/peterbourgon/diskv/LICENSE |    19 -
 .../github.com/peterbourgon/diskv/README.md   |   141 -
 .../peterbourgon/diskv/compression.go         |    64 -
 .../github.com/peterbourgon/diskv/diskv.go    |   578 -
 .../github.com/peterbourgon/diskv/index.go    |   115 -
 .../russross/blackfriday/.gitignore           |     8 -
 .../russross/blackfriday/.travis.yml          |    18 -
 .../russross/blackfriday/LICENSE.txt          |    29 -
 .../github.com/russross/blackfriday/README.md |   267 -
 .../github.com/russross/blackfriday/block.go  |  1398 --
 .../github.com/russross/blackfriday/html.go   |   949 -
 .../github.com/russross/blackfriday/inline.go |  1133 --
 .../github.com/russross/blackfriday/latex.go  |   332 -
 .../russross/blackfriday/markdown.go          |   926 -
 .../russross/blackfriday/smartypants.go       |   400 -
 .../src/github.com/shirou/gopsutil/LICENSE    |    27 -
 .../src/github.com/shirou/gopsutil/cpu/cpu.go |    76 -
 .../shirou/gopsutil/cpu/cpu_darwin.go         |   106 -
 .../shirou/gopsutil/cpu/cpu_darwin_cgo.go     |   107 -
 .../shirou/gopsutil/cpu/cpu_darwin_nocgo.go   |    14 -
 .../shirou/gopsutil/cpu/cpu_freebsd.go        |   147 -
 .../shirou/gopsutil/cpu/cpu_linux.go          |   244 -
 .../shirou/gopsutil/cpu/cpu_unix.go           |    59 -
 .../shirou/gopsutil/cpu/cpu_windows.go        |   105 -
 .../github.com/shirou/gopsutil/host/host.go   |    38 -
 .../shirou/gopsutil/host/host_darwin.go       |   152 -
 .../shirou/gopsutil/host/host_darwin_amd64.go |    19 -
 .../shirou/gopsutil/host/host_freebsd.go      |   196 -
 .../gopsutil/host/host_freebsd_amd64.go       |    41 -
 .../shirou/gopsutil/host/host_linux.go        |   431 -
 .../shirou/gopsutil/host/host_linux_386.go    |    44 -
 .../shirou/gopsutil/host/host_linux_amd64.go  |    42 -
 .../shirou/gopsutil/host/host_linux_arm.go    |    42 -
 .../shirou/gopsutil/host/host_windows.go      |   135 -
 .../shirou/gopsutil/host/types_darwin.go      |    17 -
 .../shirou/gopsutil/host/types_freebsd.go     |    43 -
 .../shirou/gopsutil/host/types_linux.go       |    45 -
 .../shirou/gopsutil/internal/common/binary.go |   634 -
 .../shirou/gopsutil/internal/common/common.go |   279 -
 .../gopsutil/internal/common/common_darwin.go |    70 -
 .../internal/common/common_freebsd.go         |    70 -
 .../gopsutil/internal/common/common_linux.go  |     3 -
 .../gopsutil/internal/common/common_unix.go   |    66 -
 .../internal/common/common_windows.go         |   110 -
 .../github.com/shirou/gopsutil/load/load.go   |    35 -
 .../shirou/gopsutil/load/load_darwin.go       |    67 -
 .../shirou/gopsutil/load/load_freebsd.go      |    65 -
 .../shirou/gopsutil/load/load_linux.go        |    78 -
 .../shirou/gopsutil/load/load_windows.go      |    19 -
 .../src/github.com/shirou/gopsutil/mem/mem.go |    64 -
 .../shirou/gopsutil/mem/mem_darwin.go         |    69 -
 .../shirou/gopsutil/mem/mem_darwin_cgo.go     |    53 -
 .../shirou/gopsutil/mem/mem_darwin_nocgo.go   |    88 -
 .../shirou/gopsutil/mem/mem_freebsd.go        |   134 -
 .../shirou/gopsutil/mem/mem_linux.go          |   100 -
 .../shirou/gopsutil/mem/mem_windows.go        |    50 -
 .../src/github.com/shirou/gopsutil/net/net.go |   243 -
 .../shirou/gopsutil/net/net_darwin.go         |   114 -
 .../shirou/gopsutil/net/net_freebsd.go        |   108 -
 .../shirou/gopsutil/net/net_linux.go          |   620 -
 .../shirou/gopsutil/net/net_unix.go           |    68 -
 .../shirou/gopsutil/net/net_windows.go        |   116 -
 .../shirou/gopsutil/process/process.go        |   166 -
 .../shirou/gopsutil/process/process_darwin.go |   451 -
 .../gopsutil/process/process_darwin_amd64.go  |   234 -
 .../gopsutil/process/process_freebsd.go       |   336 -
 .../gopsutil/process/process_freebsd_386.go   |   141 -
 .../gopsutil/process/process_freebsd_amd64.go |   192 -
 .../shirou/gopsutil/process/process_linux.go  |   733 -
 .../gopsutil/process/process_linux_386.go     |     9 -
 .../gopsutil/process/process_linux_amd64.go   |     9 -
 .../gopsutil/process/process_linux_arm.go     |     9 -
 .../shirou/gopsutil/process/process_posix.go  |   106 -
 .../gopsutil/process/process_windows.go       |   357 -
 .../shirou/gopsutil/process/types_darwin.go   |   160 -
 .../shirou/gopsutil/process/types_freebsd.go  |    95 -
 .../src/github.com/shirou/w32/AUTHORS         |    16 -
 .../src/github.com/shirou/w32/LICENSE         |    23 -
 .../src/github.com/shirou/w32/README.md       |    33 -
 .../src/github.com/shirou/w32/advapi32.go     |   299 -
 .../src/github.com/shirou/w32/comctl32.go     |   109 -
 .../src/github.com/shirou/w32/comdlg32.go     |    38 -
 .../src/github.com/shirou/w32/constants.go    |  2661 ---
 .../src/github.com/shirou/w32/dwmapi.go       |   254 -
 .../src/github.com/shirou/w32/gdi32.go        |   509 -
 .../src/github.com/shirou/w32/gdiplus.go      |   175 -
 .../src/github.com/shirou/w32/idispatch.go    |    43 -
 .../src/github.com/shirou/w32/istream.go      |    31 -
 .../src/github.com/shirou/w32/iunknown.go     |    27 -
 .../src/github.com/shirou/w32/kernel32.go     |   314 -
 .../src/github.com/shirou/w32/ole32.go        |    63 -
 .../src/github.com/shirou/w32/oleaut32.go     |    48 -
 .../src/github.com/shirou/w32/opengl32.go     |    72 -
 .../src/github.com/shirou/w32/psapi.go        |    25 -
 .../src/github.com/shirou/w32/shell32.go      |   153 -
 .../src/github.com/shirou/w32/typedef.go      |   901 -
 .../src/github.com/shirou/w32/user32.go       |   948 -
 .../src/github.com/shirou/w32/utils.go        |   201 -
 .../src/github.com/shirou/w32/vars.go         |    13 -
 .../sanitized_anchor_name/.travis.yml         |    10 -
 .../shurcooL/sanitized_anchor_name/LICENSE    |    19 -
 .../shurcooL/sanitized_anchor_name/README.md  |    31 -
 .../shurcooL/sanitized_anchor_name/main.go    |    29 -
 .../src/github.com/spf13/cobra/.gitignore     |    24 -
 .../src/github.com/spf13/cobra/.mailmap       |     3 -
 .../src/github.com/spf13/cobra/.travis.yml    |     9 -
 .../src/github.com/spf13/cobra/LICENSE.txt    |   174 -
 .../src/github.com/spf13/cobra/README.md      |   869 -
 .../spf13/cobra/bash_completions.go           |   425 -
 .../spf13/cobra/bash_completions.md           |   149 -
 .../src/github.com/spf13/cobra/cobra.go       |   170 -
 .../github.com/spf13/cobra/cobra/cmd/add.go   |   128 -
 .../spf13/cobra/cobra/cmd/helpers.go          |   347 -
 .../github.com/spf13/cobra/cobra/cmd/init.go  |   226 -
 .../spf13/cobra/cobra/cmd/licenses.go         |  1133 --
 .../github.com/spf13/cobra/cobra/cmd/root.go  |    84 -
 .../src/github.com/spf13/cobra/cobra/main.go  |    20 -
 .../src/github.com/spf13/cobra/command.go     |  1200 --
 .../github.com/spf13/cobra/doc/man_docs.go    |   218 -
 .../github.com/spf13/cobra/doc/man_docs.md    |    26 -
 .../src/github.com/spf13/cobra/doc/md_docs.go |   175 -
 .../src/github.com/spf13/cobra/doc/md_docs.md |   104 -
 .../src/github.com/spf13/cobra/doc/util.go    |    38 -
 .../src/github.com/spf13/cobra/doc_util.go    |    34 -
 .../src/github.com/spf13/cobra/man_docs.go    |   227 -
 .../src/github.com/spf13/cobra/man_docs.md    |    25 -
 .../src/github.com/spf13/cobra/md_docs.go     |   162 -
 .../src/github.com/spf13/cobra/md_docs.md     |    81 -
 .../src/github.com/spf13/pflag/.travis.yml    |    18 -
 .../src/github.com/spf13/pflag/LICENSE        |    28 -
 .../src/github.com/spf13/pflag/README.md      |   256 -
 .../src/github.com/spf13/pflag/bool.go        |    97 -
 .../src/github.com/spf13/pflag/count.go       |    97 -
 .../src/github.com/spf13/pflag/duration.go    |    86 -
 .../src/github.com/spf13/pflag/flag.go        |   836 -
 .../src/github.com/spf13/pflag/float32.go     |    91 -
 .../src/github.com/spf13/pflag/float64.go     |    87 -
 .../src/github.com/spf13/pflag/golangflag.go  |    97 -
 .../src/github.com/spf13/pflag/int.go         |    87 -
 .../src/github.com/spf13/pflag/int32.go       |    91 -
 .../src/github.com/spf13/pflag/int64.go       |    87 -
 .../src/github.com/spf13/pflag/int8.go        |    91 -
 .../src/github.com/spf13/pflag/int_slice.go   |   128 -
 .../src/github.com/spf13/pflag/ip.go          |    96 -
 .../src/github.com/spf13/pflag/ipmask.go      |   122 -
 .../src/github.com/spf13/pflag/ipnet.go       |   100 -
 .../src/github.com/spf13/pflag/string.go      |    82 -
 .../github.com/spf13/pflag/string_slice.go    |   111 -
 .../src/github.com/spf13/pflag/uint.go        |    91 -
 .../src/github.com/spf13/pflag/uint16.go      |    89 -
 .../src/github.com/spf13/pflag/uint32.go      |    89 -
 .../src/github.com/spf13/pflag/uint64.go      |    91 -
 .../src/github.com/spf13/pflag/uint8.go       |    91 -
 .../src/github.com/spf13/pflag/verify/all.sh  |    69 -
 .../github.com/spf13/pflag/verify/gofmt.sh    |    19 -
 .../github.com/spf13/pflag/verify/golint.sh   |    15 -
 .../github.com/syndtr/gocapability/LICENSE    |    24 -
 .../gocapability/capability/capability.go     |    72 -
 .../capability/capability_linux.go            |   608 -
 .../capability/capability_noop.go             |    19 -
 .../syndtr/gocapability/capability/enum.go    |   345 -
 .../gocapability/capability/syscall_linux.go  |   143 -
 .../vishvananda/netlink/.travis.yml           |     3 -
 .../github.com/vishvananda/netlink/LICENSE    |   192 -
 .../github.com/vishvananda/netlink/Makefile   |    29 -
 .../github.com/vishvananda/netlink/README.md  |    89 -
 .../github.com/vishvananda/netlink/addr.go    |    43 -
 .../vishvananda/netlink/addr_linux.go         |   128 -
 .../github.com/vishvananda/netlink/class.go   |   110 -
 .../vishvananda/netlink/class_linux.go        |   144 -
 .../github.com/vishvananda/netlink/filter.go  |    55 -
 .../vishvananda/netlink/filter_linux.go       |   191 -
 .../github.com/vishvananda/netlink/link.go    |   223 -
 .../vishvananda/netlink/link_linux.go         |   790 -
 .../github.com/vishvananda/netlink/neigh.go   |    22 -
 .../vishvananda/netlink/neigh_linux.go        |   189 -
 .../github.com/vishvananda/netlink/netlink.go |    39 -
 .../netlink/netlink_unspecified.go            |   143 -
 .../vishvananda/netlink/nl/addr_linux.go      |    47 -
 .../vishvananda/netlink/nl/link_linux.go      |   104 -
 .../vishvananda/netlink/nl/nl_linux.go        |   418 -
 .../vishvananda/netlink/nl/route_linux.go     |    42 -
 .../vishvananda/netlink/nl/tc_linux.go        |   425 -
 .../vishvananda/netlink/nl/xfrm_linux.go      |   258 -
 .../netlink/nl/xfrm_policy_linux.go           |   119 -
 .../netlink/nl/xfrm_state_linux.go            |   221 -
 .../vishvananda/netlink/protinfo.go           |    53 -
 .../vishvananda/netlink/protinfo_linux.go     |    60 -
 .../github.com/vishvananda/netlink/qdisc.go   |   167 -
 .../vishvananda/netlink/qdisc_linux.go        |   316 -
 .../github.com/vishvananda/netlink/route.go   |    41 -
 .../vishvananda/netlink/route_linux.go        |   249 -
 .../github.com/vishvananda/netlink/xfrm.go    |    64 -
 .../vishvananda/netlink/xfrm_policy.go        |    59 -
 .../vishvananda/netlink/xfrm_policy_linux.go  |   127 -
 .../vishvananda/netlink/xfrm_state.go         |    53 -
 .../vishvananda/netlink/xfrm_state_linux.go   |   181 -
 Godeps/_workspace/src/go4.org/LICENSE         |   202 -
 .../src/go4.org/errorutil/highlight.go        |    58 -
 .../src/golang.org/x/crypto/LICENSE           |    27 -
 .../src/golang.org/x/crypto/PATENTS           |    22 -
 .../src/golang.org/x/crypto/cast5/cast5.go    |   526 -
 .../x/crypto/openpgp/armor/armor.go           |   219 -
 .../x/crypto/openpgp/armor/encode.go          |   160 -
 .../x/crypto/openpgp/canonical_text.go        |    59 -
 .../x/crypto/openpgp/clearsign/clearsign.go   |   366 -
 .../x/crypto/openpgp/elgamal/elgamal.go       |   122 -
 .../x/crypto/openpgp/errors/errors.go         |    72 -
 .../src/golang.org/x/crypto/openpgp/keys.go   |   624 -
 .../x/crypto/openpgp/packet/compressed.go     |   123 -
 .../x/crypto/openpgp/packet/config.go         |    88 -
 .../x/crypto/openpgp/packet/encrypted_key.go  |   168 -
 .../x/crypto/openpgp/packet/literal.go        |    89 -
 .../x/crypto/openpgp/packet/ocfb.go           |   143 -
 .../openpgp/packet/one_pass_signature.go      |    73 -
 .../x/crypto/openpgp/packet/opaque.go         |   161 -
 .../x/crypto/openpgp/packet/packet.go         |   538 -
 .../x/crypto/openpgp/packet/private_key.go    |   310 -
 .../x/crypto/openpgp/packet/public_key.go     |   687 -
 .../x/crypto/openpgp/packet/public_key_v3.go  |   275 -
 .../x/crypto/openpgp/packet/reader.go         |    62 -
 .../x/crypto/openpgp/packet/signature.go      |   663 -
 .../x/crypto/openpgp/packet/signature_v3.go   |   146 -
 .../openpgp/packet/symmetric_key_encrypted.go |   164 -
 .../openpgp/packet/symmetrically_encrypted.go |   290 -
 .../x/crypto/openpgp/packet/userattribute.go  |    91 -
 .../x/crypto/openpgp/packet/userid.go         |   160 -
 .../src/golang.org/x/crypto/openpgp/read.go   |   423 -
 .../golang.org/x/crypto/openpgp/s2k/s2k.go    |   273 -
 .../src/golang.org/x/crypto/openpgp/write.go  |   374 -
 .../x/crypto/ssh/terminal/terminal.go         |   892 -
 .../golang.org/x/crypto/ssh/terminal/util.go  |   128 -
 .../x/crypto/ssh/terminal/util_bsd.go         |    12 -
 .../x/crypto/ssh/terminal/util_linux.go       |    11 -
 .../x/crypto/ssh/terminal/util_windows.go     |   174 -
 .../_workspace/src/golang.org/x/net/LICENSE   |    27 -
 .../_workspace/src/golang.org/x/net/PATENTS   |    22 -
 .../src/golang.org/x/net/context/context.go   |   447 -
 .../x/net/context/ctxhttp/cancelreq.go        |    18 -
 .../x/net/context/ctxhttp/cancelreq_go14.go   |    23 -
 .../x/net/context/ctxhttp/ctxhttp.go          |    79 -
 .../src/golang.org/x/net/html/atom/atom.go    |    78 -
 .../src/golang.org/x/net/html/atom/gen.go     |   648 -
 .../src/golang.org/x/net/html/atom/table.go   |   713 -
 .../golang.org/x/net/html/charset/charset.go  |   244 -
 .../src/golang.org/x/net/html/charset/gen.go  |   111 -
 .../golang.org/x/net/html/charset/table.go    |   235 -
 .../src/golang.org/x/net/html/const.go        |   102 -
 .../src/golang.org/x/net/html/doc.go          |   106 -
 .../src/golang.org/x/net/html/doctype.go      |   156 -
 .../src/golang.org/x/net/html/entity.go       |  2253 ---
 .../src/golang.org/x/net/html/escape.go       |   258 -
 .../src/golang.org/x/net/html/foreign.go      |   226 -
 .../src/golang.org/x/net/html/node.go         |   193 -
 .../src/golang.org/x/net/html/parse.go        |  2094 ---
 .../src/golang.org/x/net/html/render.go       |   271 -
 .../src/golang.org/x/net/html/token.go        |  1219 --
 .../src/golang.org/x/net/http2/.gitignore     |     2 -
 .../src/golang.org/x/net/http2/Dockerfile     |    44 -
 .../src/golang.org/x/net/http2/Makefile       |     3 -
 .../src/golang.org/x/net/http2/README         |    20 -
 .../src/golang.org/x/net/http2/buffer.go      |    76 -
 .../src/golang.org/x/net/http2/errors.go      |    78 -
 .../src/golang.org/x/net/http2/flow.go        |    51 -
 .../src/golang.org/x/net/http2/frame.go       |  1113 --
 .../src/golang.org/x/net/http2/gotrack.go     |   173 -
 .../golang.org/x/net/http2/h2demo/.gitignore  |     5 -
 .../golang.org/x/net/http2/h2demo/Makefile    |     5 -
 .../src/golang.org/x/net/http2/h2demo/README  |    16 -
 .../golang.org/x/net/http2/h2demo/h2demo.go   |   435 -
 .../golang.org/x/net/http2/h2demo/launch.go   |   302 -
 .../golang.org/x/net/http2/h2demo/rootCA.key  |    27 -
 .../golang.org/x/net/http2/h2demo/rootCA.pem  |    26 -
 .../golang.org/x/net/http2/h2demo/rootCA.srl  |     1 -
 .../golang.org/x/net/http2/h2demo/server.crt  |    20 -
 .../golang.org/x/net/http2/h2demo/server.key  |    27 -
 .../src/golang.org/x/net/http2/h2i/README.md  |    97 -
 .../src/golang.org/x/net/http2/h2i/h2i.go     |   489 -
 .../src/golang.org/x/net/http2/headermap.go   |    80 -
 .../golang.org/x/net/http2/hpack/encode.go    |   252 -
 .../src/golang.org/x/net/http2/hpack/hpack.go |   445 -
 .../golang.org/x/net/http2/hpack/huffman.go   |   159 -
 .../golang.org/x/net/http2/hpack/tables.go    |   353 -
 .../src/golang.org/x/net/http2/http2.go       |   249 -
 .../src/golang.org/x/net/http2/pipe.go        |    43 -
 .../src/golang.org/x/net/http2/server.go      |  1780 --
 .../src/golang.org/x/net/http2/transport.go   |   553 -
 .../src/golang.org/x/net/http2/write.go       |   204 -
 .../src/golang.org/x/net/http2/writesched.go  |   286 -
 .../x/net/internal/timeseries/timeseries.go   |   525 -
 .../src/golang.org/x/net/trace/events.go      |   524 -
 .../src/golang.org/x/net/trace/histogram.go   |   356 -
 .../src/golang.org/x/net/trace/trace.go       |  1057 --
 .../_workspace/src/golang.org/x/sys/LICENSE   |    27 -
 .../_workspace/src/golang.org/x/sys/PATENTS   |    22 -
 .../src/golang.org/x/sys/unix/.gitignore      |     1 -
 .../src/golang.org/x/sys/unix/asm.s           |    10 -
 .../golang.org/x/sys/unix/asm_darwin_386.s    |    29 -
 .../golang.org/x/sys/unix/asm_darwin_amd64.s  |    29 -
 .../golang.org/x/sys/unix/asm_darwin_arm.s    |    30 -
 .../golang.org/x/sys/unix/asm_darwin_arm64.s  |    30 -
 .../x/sys/unix/asm_dragonfly_amd64.s          |    29 -
 .../golang.org/x/sys/unix/asm_freebsd_386.s   |    29 -
 .../golang.org/x/sys/unix/asm_freebsd_amd64.s |    29 -
 .../golang.org/x/sys/unix/asm_freebsd_arm.s   |    29 -
 .../src/golang.org/x/sys/unix/asm_linux_386.s |    35 -
 .../golang.org/x/sys/unix/asm_linux_amd64.s   |    29 -
 .../src/golang.org/x/sys/unix/asm_linux_arm.s |    29 -
 .../golang.org/x/sys/unix/asm_linux_arm64.s   |    24 -
 .../golang.org/x/sys/unix/asm_linux_mips64x.s |    28 -
 .../golang.org/x/sys/unix/asm_linux_ppc64x.s  |    28 -
 .../golang.org/x/sys/unix/asm_linux_s390x.s   |    28 -
 .../golang.org/x/sys/unix/asm_netbsd_386.s    |    29 -
 .../golang.org/x/sys/unix/asm_netbsd_amd64.s  |    29 -
 .../golang.org/x/sys/unix/asm_netbsd_arm.s    |    29 -
 .../golang.org/x/sys/unix/asm_openbsd_386.s   |    29 -
 .../golang.org/x/sys/unix/asm_openbsd_amd64.s |    29 -
 .../golang.org/x/sys/unix/asm_solaris_amd64.s |    17 -
 .../golang.org/x/sys/unix/bluetooth_linux.go  |    35 -
 .../src/golang.org/x/sys/unix/constants.go    |    13 -
 .../src/golang.org/x/sys/unix/env_unix.go     |    27 -
 .../src/golang.org/x/sys/unix/env_unset.go    |    14 -
 .../src/golang.org/x/sys/unix/flock.go        |    24 -
 .../x/sys/unix/flock_linux_32bit.go           |    13 -
 .../src/golang.org/x/sys/unix/gccgo.go        |    46 -
 .../src/golang.org/x/sys/unix/gccgo_c.c       |    41 -
 .../x/sys/unix/gccgo_linux_amd64.go           |    20 -
 .../src/golang.org/x/sys/unix/mkall.sh        |   285 -
 .../src/golang.org/x/sys/unix/mkerrors.sh     |   476 -
 .../src/golang.org/x/sys/unix/mkpost.go       |    62 -
 .../src/golang.org/x/sys/unix/mksyscall.pl    |   323 -
 .../x/sys/unix/mksyscall_solaris.pl           |   294 -
 .../golang.org/x/sys/unix/mksysctl_openbsd.pl |   264 -
 .../golang.org/x/sys/unix/mksysnum_darwin.pl  |    39 -
 .../x/sys/unix/mksysnum_dragonfly.pl          |    50 -
 .../golang.org/x/sys/unix/mksysnum_freebsd.pl |    63 -
 .../golang.org/x/sys/unix/mksysnum_linux.pl   |    58 -
 .../golang.org/x/sys/unix/mksysnum_netbsd.pl  |    58 -
 .../golang.org/x/sys/unix/mksysnum_openbsd.pl |    50 -
 .../src/golang.org/x/sys/unix/race.go         |    30 -
 .../src/golang.org/x/sys/unix/race0.go        |    25 -
 .../golang.org/x/sys/unix/sockcmsg_linux.go   |    36 -
 .../golang.org/x/sys/unix/sockcmsg_unix.go    |   103 -
 .../src/golang.org/x/sys/unix/str.go          |    26 -
 .../src/golang.org/x/sys/unix/syscall.go      |    76 -
 .../src/golang.org/x/sys/unix/syscall_bsd.go  |   628 -
 .../golang.org/x/sys/unix/syscall_darwin.go   |   509 -
 .../x/sys/unix/syscall_darwin_386.go          |    77 -
 .../x/sys/unix/syscall_darwin_amd64.go        |    79 -
 .../x/sys/unix/syscall_darwin_arm.go          |    71 -
 .../x/sys/unix/syscall_darwin_arm64.go        |    77 -
 .../x/sys/unix/syscall_dragonfly.go           |   411 -
 .../x/sys/unix/syscall_dragonfly_amd64.go     |    61 -
 .../golang.org/x/sys/unix/syscall_freebsd.go  |   682 -
 .../x/sys/unix/syscall_freebsd_386.go         |    61 -
 .../x/sys/unix/syscall_freebsd_amd64.go       |    61 -
 .../x/sys/unix/syscall_freebsd_arm.go         |    61 -
 .../golang.org/x/sys/unix/syscall_linux.go    |  1108 --
 .../x/sys/unix/syscall_linux_386.go           |   390 -
 .../x/sys/unix/syscall_linux_amd64.go         |   148 -
 .../x/sys/unix/syscall_linux_arm.go           |   254 -
 .../x/sys/unix/syscall_linux_arm64.go         |   180 -
 .../x/sys/unix/syscall_linux_mips64x.go       |   206 -
 .../x/sys/unix/syscall_linux_ppc64x.go        |   126 -
 .../x/sys/unix/syscall_linux_s390x.go         |   320 -
 .../golang.org/x/sys/unix/syscall_netbsd.go   |   492 -
 .../x/sys/unix/syscall_netbsd_386.go          |    42 -
 .../x/sys/unix/syscall_netbsd_amd64.go        |    42 -
 .../x/sys/unix/syscall_netbsd_arm.go          |    42 -
 .../golang.org/x/sys/unix/syscall_no_getwd.go |    11 -
 .../golang.org/x/sys/unix/syscall_openbsd.go  |   303 -
 .../x/sys/unix/syscall_openbsd_386.go         |    42 -
 .../x/sys/unix/syscall_openbsd_amd64.go       |    42 -
 .../golang.org/x/sys/unix/syscall_solaris.go  |   713 -
 .../x/sys/unix/syscall_solaris_amd64.go       |    35 -
 .../src/golang.org/x/sys/unix/syscall_unix.go |   297 -
 .../src/golang.org/x/sys/unix/types_darwin.go |   250 -
 .../golang.org/x/sys/unix/types_dragonfly.go  |   242 -
 .../golang.org/x/sys/unix/types_freebsd.go    |   353 -
 .../src/golang.org/x/sys/unix/types_linux.go  |   435 -
 .../src/golang.org/x/sys/unix/types_netbsd.go |   232 -
 .../golang.org/x/sys/unix/types_openbsd.go    |   244 -
 .../golang.org/x/sys/unix/types_solaris.go    |   260 -
 .../x/sys/unix/zerrors_darwin_386.go          |  1576 --
 .../x/sys/unix/zerrors_darwin_amd64.go        |  1576 --
 .../x/sys/unix/zerrors_darwin_arm.go          |  1293 --
 .../x/sys/unix/zerrors_darwin_arm64.go        |  1576 --
 .../x/sys/unix/zerrors_dragonfly_amd64.go     |  1530 --
 .../x/sys/unix/zerrors_freebsd_386.go         |  1743 --
 .../x/sys/unix/zerrors_freebsd_amd64.go       |  1748 --
 .../x/sys/unix/zerrors_freebsd_arm.go         |  1729 --
 .../x/sys/unix/zerrors_linux_386.go           |  1819 --
 .../x/sys/unix/zerrors_linux_amd64.go         |  1820 --
 .../x/sys/unix/zerrors_linux_arm.go           |  1743 --
 .../x/sys/unix/zerrors_linux_arm64.go         |  1897 --
 .../x/sys/unix/zerrors_linux_mips64.go        |  1917 --
 .../x/sys/unix/zerrors_linux_mips64le.go      |  1917 --
 .../x/sys/unix/zerrors_linux_ppc64.go         |  1970 --
 .../x/sys/unix/zerrors_linux_ppc64le.go       |  1969 --
 .../x/sys/unix/zerrors_linux_s390x.go         |  2027 --
 .../x/sys/unix/zerrors_netbsd_386.go          |  1712 --
 .../x/sys/unix/zerrors_netbsd_amd64.go        |  1702 --
 .../x/sys/unix/zerrors_netbsd_arm.go          |  1688 --
 .../x/sys/unix/zerrors_openbsd_386.go         |  1584 --
 .../x/sys/unix/zerrors_openbsd_amd64.go       |  1583 --
 .../x/sys/unix/zerrors_solaris_amd64.go       |  1436 --
 .../x/sys/unix/zsyscall_darwin_386.go         |  1427 --
 .../x/sys/unix/zsyscall_darwin_amd64.go       |  1443 --
 .../x/sys/unix/zsyscall_darwin_arm.go         |  1427 --
 .../x/sys/unix/zsyscall_darwin_arm64.go       |  1427 --
 .../x/sys/unix/zsyscall_dragonfly_amd64.go    |  1413 --
 .../x/sys/unix/zsyscall_freebsd_386.go        |  1665 --
 .../x/sys/unix/zsyscall_freebsd_amd64.go      |  1665 --
 .../x/sys/unix/zsyscall_freebsd_arm.go        |  1665 --
 .../x/sys/unix/zsyscall_linux_386.go          |  1638 --
 .../x/sys/unix/zsyscall_linux_amd64.go        |  1832 --
 .../x/sys/unix/zsyscall_linux_arm.go          |  1739 --
 .../x/sys/unix/zsyscall_linux_arm64.go        |  1723 --
 .../x/sys/unix/zsyscall_linux_mips64.go       |  1781 --
 .../x/sys/unix/zsyscall_linux_mips64le.go     |  1781 --
 .../x/sys/unix/zsyscall_linux_ppc64.go        |  1843 --
 .../x/sys/unix/zsyscall_linux_ppc64le.go      |  1843 --
 .../x/sys/unix/zsyscall_linux_s390x.go        |  1623 --
 .../x/sys/unix/zsyscall_netbsd_386.go         |  1327 --
 .../x/sys/unix/zsyscall_netbsd_amd64.go       |  1327 --
 .../x/sys/unix/zsyscall_netbsd_arm.go         |  1327 --
 .../x/sys/unix/zsyscall_openbsd_386.go        |  1387 --
 .../x/sys/unix/zsyscall_openbsd_amd64.go      |  1387 --
 .../x/sys/unix/zsyscall_solaris_amd64.go      |  1559 --
 .../golang.org/x/sys/unix/zsysctl_openbsd.go  |   270 -
 .../x/sys/unix/zsysnum_darwin_386.go          |   398 -
 .../x/sys/unix/zsysnum_darwin_amd64.go        |   398 -
 .../x/sys/unix/zsysnum_darwin_arm.go          |   358 -
 .../x/sys/unix/zsysnum_darwin_arm64.go        |   398 -
 .../x/sys/unix/zsysnum_dragonfly_amd64.go     |   304 -
 .../x/sys/unix/zsysnum_freebsd_386.go         |   351 -
 .../x/sys/unix/zsysnum_freebsd_amd64.go       |   351 -
 .../x/sys/unix/zsysnum_freebsd_arm.go         |   351 -
 .../x/sys/unix/zsysnum_linux_386.go           |   355 -
 .../x/sys/unix/zsysnum_linux_amd64.go         |   321 -
 .../x/sys/unix/zsysnum_linux_arm.go           |   356 -
 .../x/sys/unix/zsysnum_linux_arm64.go         |   272 -
 .../x/sys/unix/zsysnum_linux_mips64.go        |   327 -
 .../x/sys/unix/zsysnum_linux_mips64le.go      |   327 -
 .../x/sys/unix/zsysnum_linux_ppc64.go         |   360 -
 .../x/sys/unix/zsysnum_linux_ppc64le.go       |   353 -
 .../x/sys/unix/zsysnum_linux_s390x.go         |   328 -
 .../x/sys/unix/zsysnum_netbsd_386.go          |   273 -
 .../x/sys/unix/zsysnum_netbsd_amd64.go        |   273 -
 .../x/sys/unix/zsysnum_netbsd_arm.go          |   273 -
 .../x/sys/unix/zsysnum_openbsd_386.go         |   207 -
 .../x/sys/unix/zsysnum_openbsd_amd64.go       |   207 -
 .../x/sys/unix/zsysnum_solaris_amd64.go       |    13 -
 .../x/sys/unix/ztypes_darwin_386.go           |   447 -
 .../x/sys/unix/ztypes_darwin_amd64.go         |   462 -
 .../x/sys/unix/ztypes_darwin_arm.go           |   449 -
 .../x/sys/unix/ztypes_darwin_arm64.go         |   457 -
 .../x/sys/unix/ztypes_dragonfly_amd64.go      |   443 -
 .../x/sys/unix/ztypes_freebsd_386.go          |   502 -
 .../x/sys/unix/ztypes_freebsd_amd64.go        |   505 -
 .../x/sys/unix/ztypes_freebsd_arm.go          |   497 -
 .../golang.org/x/sys/unix/ztypes_linux_386.go |   607 -
 .../x/sys/unix/ztypes_linux_amd64.go          |   625 -
 .../golang.org/x/sys/unix/ztypes_linux_arm.go |   587 -
 .../x/sys/unix/ztypes_linux_arm64.go          |   604 -
 .../x/sys/unix/ztypes_linux_mips64.go         |   607 -
 .../x/sys/unix/ztypes_linux_mips64le.go       |   607 -
 .../x/sys/unix/ztypes_linux_ppc64.go          |   614 -
 .../x/sys/unix/ztypes_linux_ppc64le.go        |   614 -
 .../x/sys/unix/ztypes_linux_s390x.go          |   629 -
 .../x/sys/unix/ztypes_netbsd_386.go           |   396 -
 .../x/sys/unix/ztypes_netbsd_amd64.go         |   403 -
 .../x/sys/unix/ztypes_netbsd_arm.go           |   401 -
 .../x/sys/unix/ztypes_openbsd_386.go          |   441 -
 .../x/sys/unix/ztypes_openbsd_amd64.go        |   448 -
 .../x/sys/unix/ztypes_solaris_amd64.go        |   422 -
 .../_workspace/src/golang.org/x/tools/LICENSE |    27 -
 .../_workspace/src/golang.org/x/tools/PATENTS |    22 -
 .../golang.org/x/tools/go/vcs/discovery.go    |    76 -
 .../src/golang.org/x/tools/go/vcs/env.go      |    39 -
 .../src/golang.org/x/tools/go/vcs/http.go     |    80 -
 .../src/golang.org/x/tools/go/vcs/vcs.go      |   754 -
 .../src/google.golang.org/grpc/.travis.yml    |    14 -
 .../google.golang.org/grpc/CONTRIBUTING.md    |    23 -
 .../grpc/Documentation/grpc-auth-support.md   |    41 -
 .../src/google.golang.org/grpc/LICENSE        |    28 -
 .../src/google.golang.org/grpc/Makefile       |    50 -
 .../src/google.golang.org/grpc/PATENTS        |    22 -
 .../src/google.golang.org/grpc/README.md      |    32 -
 .../grpc/benchmark/benchmark.go               |   147 -
 .../grpc/benchmark/client/main.go             |   162 -
 .../grpc/benchmark/grpc_testing/test.pb.go    |   641 -
 .../grpc/benchmark/grpc_testing/test.proto    |   148 -
 .../grpc/benchmark/server/main.go             |    35 -
 .../grpc/benchmark/stats/counter.go           |   135 -
 .../grpc/benchmark/stats/histogram.go         |   255 -
 .../grpc/benchmark/stats/stats.go             |   116 -
 .../grpc/benchmark/stats/timeseries.go        |   154 -
 .../grpc/benchmark/stats/tracker.go           |   159 -
 .../grpc/benchmark/stats/util.go              |   191 -
 .../src/google.golang.org/grpc/call.go        |   183 -
 .../src/google.golang.org/grpc/clientconn.go  |   571 -
 .../src/google.golang.org/grpc/codegen.sh     |    17 -
 .../grpc/codes/code_string.go                 |    16 -
 .../src/google.golang.org/grpc/codes/codes.go |   159 -
 .../src/google.golang.org/grpc/coverage.sh    |    47 -
 .../grpc/credentials/credentials.go           |   226 -
 .../src/google.golang.org/grpc/doc.go         |     6 -
 .../google.golang.org/grpc/examples/README.md |    57 -
 .../grpc/examples/gotutorial.md               |   431 -
 .../helloworld/greeter_client/main.go         |    69 -
 .../helloworld/greeter_server/main.go         |    65 -
 .../helloworld/helloworld/helloworld.pb.go    |   109 -
 .../helloworld/helloworld/helloworld.proto    |    51 -
 .../grpc/examples/route_guide/README.md       |    35 -
 .../examples/route_guide/client/client.go     |   202 -
 .../route_guide/routeguide/route_guide.pb.go  |   426 -
 .../route_guide/routeguide/route_guide.proto  |   121 -
 .../examples/route_guide/server/server.go     |   239 -
 .../google.golang.org/grpc/grpclog/logger.go  |    90 -
 .../health/grpc_health_v1alpha/health.pb.go   |   133 -
 .../health/grpc_health_v1alpha/health.proto   |    20 -
 .../google.golang.org/grpc/health/health.go   |    49 -
 .../grpc/interop/client/client.go             |   172 -
 .../grpc/interop/grpc_testing/test.pb.go      |   702 -
 .../grpc/interop/grpc_testing/test.proto      |   140 -
 .../grpc/interop/server/server.go             |    73 -
 .../grpc/interop/test_utils.go                |   607 -
 .../grpc/metadata/metadata.go                 |   134 -
 .../google.golang.org/grpc/naming/naming.go   |    73 -
 .../src/google.golang.org/grpc/peer/peer.go   |    65 -
 .../src/google.golang.org/grpc/picker.go      |   243 -
 .../src/google.golang.org/grpc/rpc_util.go    |   345 -
 .../src/google.golang.org/grpc/server.go      |   575 -
 .../src/google.golang.org/grpc/stream.go      |   375 -
 .../grpc/test/codec_perf/perf.pb.go           |    42 -
 .../grpc/test/codec_perf/perf.proto           |    11 -
 .../grpc/test/grpc_testing/test.pb.go         |   702 -
 .../grpc/test/grpc_testing/test.proto         |   140 -
 .../src/google.golang.org/grpc/trace.go       |   120 -
 .../grpc/transport/control.go                 |   260 -
 .../grpc/transport/http2_client.go            |   865 -
 .../grpc/transport/http2_server.go            |   699 -
 .../grpc/transport/http_util.go               |   451 -
 .../grpc/transport/transport.go               |   465 -
 Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE |    28 -
 Godeps/_workspace/src/gopkg.in/inf.v0/dec.go  |   615 -
 .../_workspace/src/gopkg.in/inf.v0/rounder.go |   145 -
 .../_workspace/src/k8s.io/kubernetes/LICENSE  |   202 -
 .../update-demo/local/LICENSE.angular         |    21 -
 .../pkg/api/resource/deep_copy_generated.go   |    55 -
 .../pkg/api/resource/generated.pb.go          |   371 -
 .../pkg/api/resource/generated.proto          |   109 -
 .../kubernetes/pkg/api/resource/quantity.go   |   538 -
 .../pkg/api/resource/quantity_proto.go        |    78 -
 .../kubernetes/pkg/api/resource/scale_int.go  |    95 -
 .../kubernetes/pkg/api/resource/suffix.go     |   136 -
 .../k8s.io/kubernetes/pkg/conversion/OWNERS   |     5 -
 .../kubernetes/pkg/conversion/cloner.go       |   237 -
 .../kubernetes/pkg/conversion/converter.go    |   951 -
 .../pkg/conversion/deep_copy_generated.go     |   185 -
 .../kubernetes/pkg/conversion/deep_equal.go   |    36 -
 .../k8s.io/kubernetes/pkg/conversion/doc.go   |    24 -
 .../kubernetes/pkg/conversion/helper.go       |    39 -
 .../third_party/forked/reflect/LICENSE        |    27 -
 .../third_party/forked/reflect/deep_equal.go  |   388 -
 .../kubernetes/third_party/golang/LICENSE     |    27 -
 .../kubernetes/third_party/golang/PATENTS     |    22 -
 .../kubernetes/third_party/htpasswd/COPYING   |    28 -
 .../kubernetes/third_party/pause/LICENSE      |    19 -
 .../kubernetes/third_party/swagger-ui/LICENSE |    11 -
 1309 files changed, 363172 deletions(-)
 delete mode 100644 Godeps/Godeps.json
 delete mode 100644 Godeps/Readme
 delete mode 100644 Godeps/_workspace/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/StackExchange/wmi/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/StackExchange/wmi/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/StackExchange/wmi/wmi.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/conversion_store.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/file/file.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/internal.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/tarball/tarfile.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/tarball/walk.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/types/docker_types.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/types/types.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/util/util.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/docker2aci/pkg/log/log.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/goaci/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/appc/goaci/proj2aci/asset.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/goaci/proj2aci/binary.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/goaci/proj2aci/builder.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/goaci/proj2aci/cmake.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/goaci/proj2aci/go.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/goaci/proj2aci/run.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/goaci/proj2aci/util.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/goaci/proj2aci/vcs.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/ace/build_aci
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/ace/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/ace/os_default.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/ace/os_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/ace/os_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/ace/os_shared.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/ace/validator.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/aci/build.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/aci/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/aci/file.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/aci/layout.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/aci/writer.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/actool/actool.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/actool/build.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/actool/discover.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/actool/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/actool/help.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/actool/validate.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/actool/version.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/discovery/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/discovery/http.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/discovery/parse.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/resolve.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_posix.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_posix.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/tarheader.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/common/common.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/image.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/kind.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/image.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/labels.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/pod.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/acidentifier.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/ackind.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/acname.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/annotations.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/app.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/date.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/dependencies.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/environment.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/errors.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/event_handler.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/exec.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/hash.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/labels.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/mountpoint.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/port.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/url.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/uuid.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/types/volume.go
 delete mode 100644 Godeps/_workspace/src/github.com/appc/spec/schema/version.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go
 delete mode 100644 Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/COPYING
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/clients/chrome/clip-it-good/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/misc/copyrightifity
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legal.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legalprint/legalprint.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/bazil.org/fuse/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/closure/lib/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/PATENTS
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/leveldb-go/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/snappy-go/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/xsrftoken/COPYING
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/fontawesome/LICENSE.txt
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/camlistore/lock/COPYING
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/dbm/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/lldb/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/falloc/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/hdb/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/storage/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/kv/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/mersenne/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/sortutil/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/zappy/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/davecgh/go-spew/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/go-sql-driver/mysql/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/golang/glog/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/gorilla/websocket/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/lib/pq/LICENSE.md
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/russross/blackfriday/LICENSE.txt
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/rwcarlsen/goexif/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/glitch/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/PATENTS
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/bson/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/react/LICENSE.txt
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/github.com/hjfreyer/taglib-go/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/golang.org/x/oauth2/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/cloud/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/grpc/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/grpc/PATENTS
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/legal/legal.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/lock/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/lock/lock.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_appengine.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_darwin_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_linux_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_linux_arm.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_plan9.go
 delete mode 100644 Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_sigzero.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/args.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/delegate.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/exec.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/find.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/cidr.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipforward.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipmasq.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/link.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/route.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ipam/ipam.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/ns.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/skel/skel.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/testutils/cmd.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/args.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/types.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/utils.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/config.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/bridge/bridge.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ptp/ptp.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go
 delete mode 100644 Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/gexpect/LICENCE
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/gexpect/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/gexpect/gexpect.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-iptables/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/lock.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-semver/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-semver/semver/semver.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-semver/semver/sort.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/unit/deserialize.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/unit/escape.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/unit/option.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/unit/serialize.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/tpmclient/tpmclient.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/tspiconst/tspiconst.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/go-tspi/verification/verification.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/ioprogress/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/ioprogress/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/ioprogress/draw.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/ioprogress/reader.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/NOTICE
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen_example.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go
 delete mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go
 delete mode 100644 Godeps/_workspace/src/github.com/cpuguy83/go-md2man/LICENSE.md
 delete mode 100644 Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/md2man.go
 delete mode 100644 Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/roff.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/b/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/b/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/b/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/b/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/b/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/b/btree.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/b/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/b/example/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/b/example/int.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/bufs/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/bufs/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/bufs/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/bufs/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/bufs/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/bufs/bufs.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/dbm/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc_docs.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/btree.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/errors.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/filer.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/gb.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/lldb.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/memfiler.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/osfiler.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/simplefilefiler.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/exp/lldb/xact.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/README
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/falloc/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/falloc/README
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/falloc/docs.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/falloc/error.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/falloc/falloc.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/falloc/test_deps.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/fileutil.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_arm.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_openbsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_plan9.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_solaris.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/hdb/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/hdb/README
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/hdb/hdb.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/hdb/test_deps.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/storage/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/storage/README
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/storage/cache.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/storage/file.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/storage/mem.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/storage/probe.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/storage/storage.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/storage/test_deps.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/fileutil/test_deps.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/README
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/bits.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/envelope.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/example/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/example/example.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/example2/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/example2/example2.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/example3/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/example3/example3.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/example4/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/example4/results
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/ff/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/mathutil.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/README
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/mersenne.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/nist-sts-2-1-1-report
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/permute.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/primes.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/rat.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/rnd.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/tables.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/mathutil/test_deps.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/benchcmp
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/blob.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/btree.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/builtin.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/coerce.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/design/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/driver.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/driver/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/driver/driver.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/errors.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/etc.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/expr.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/file.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/helper/helper.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/httpfs.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/introspection.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/mem.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/parser.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/parser.y
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/plan.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/ql.ebnf
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/ql.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/ql.y
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/ql/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/ql/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/ql/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/scanner.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/scanner.l
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/stmt.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/storage.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/testdata.log
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/ql/testdata.ql
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/sortutil/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/sortutil/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/sortutil/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/sortutil/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/sortutil/README
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/sortutil/sortutil.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/strutil/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/strutil/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/strutil/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/strutil/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/strutil/README
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/strutil/strutil.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/SNAPPY-GO-LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/decode.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/decode_cgo.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/decode_nocgo.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/encode.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/encode_cgo.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/encode_nocgo.go
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/purego.sh
 delete mode 100644 Godeps/_workspace/src/github.com/cznic/zappy/zappy.go
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4/constants.go
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4/helpers.go
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4/option.go
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4/packet.go
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4client/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4client/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4client/inetsock.go
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4client/init.go
 delete mode 100644 Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/docker/distribution/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/docker/distribution/digest/digest.go
 delete mode 100644 Godeps/_workspace/src/github.com/docker/distribution/digest/digester.go
 delete mode 100644 Godeps/_workspace/src/github.com/docker/distribution/digest/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/docker/distribution/digest/set.go
 delete mode 100644 Godeps/_workspace/src/github.com/docker/distribution/digest/verifiers.go
 delete mode 100644 Godeps/_workspace/src/github.com/docker/distribution/reference/reference.go
 delete mode 100644 Godeps/_workspace/src/github.com/docker/distribution/reference/regexp.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/README.markdown
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/big.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/bigbytes.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/bytes.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/comma.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/ftoa.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/humanize.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/number.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/ordinals.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/si.go
 delete mode 100644 Godeps/_workspace/src/github.com/dustin/go-humanize/times.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/ini.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/key.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/parser.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/section.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ini/ini/struct.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ChangeLog.md
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/appveyor.yml
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/com.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/com_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/connect.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/constants.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/error.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/error_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/error_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/guid.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/ole.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/go-get.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/oleutil.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearray.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_func.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayconversion.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayslices.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/utility.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/variables.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/variant.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/variant_386.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/variant_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/vt_string.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/winrt.go
 delete mode 100644 Godeps/_workspace/src/github.com/go-ole/go-ole/winrt_doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/CONTRIBUTING.md
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/MAINTAINERS
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/README.markdown
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/auth.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/auth_external.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/auth_sha1.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/call.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/conn.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/conn_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/conn_other.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/dbus.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/decoder.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/encoder.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/export.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/homedir.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/homedir_dynamic.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/homedir_static.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/introspect/call.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspect.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspectable.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/message.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/object.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/prop/prop.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/sig.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/transport_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/transport_generic.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/transport_unix.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_dragonfly.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/variant.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/variant_lexer.go
 delete mode 100644 Godeps/_workspace/src/github.com/godbus/dbus/variant_parser.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go
 delete mode 100644 Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
 delete mode 100644 Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden
 delete mode 100644 Godeps/_workspace/src/github.com/google/btree/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/google/btree/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/google/btree/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/google/btree/btree.go
 delete mode 100644 Godeps/_workspace/src/github.com/google/btree/btree_mem.go
 delete mode 100644 Godeps/_workspace/src/github.com/gopherjs/gopherjs/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/context/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/context/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/context/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/context/context.go
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/context/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/mux/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/mux/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/mux/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/mux/mux.go
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/mux/regexp.go
 delete mode 100644 Godeps/_workspace/src/github.com/gorilla/mux/route.go
 delete mode 100644 Godeps/_workspace/src/github.com/hashicorp/errwrap/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/hashicorp/errwrap/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/hashicorp/errwrap/errwrap.go
 delete mode 100644 Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/example/example.go
 delete mode 100644 Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/listener.go
 delete mode 100644 Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/inconshreveable/mousetrap/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_others.go
 delete mode 100644 Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows_1.4.go
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go
 delete mode 100644 Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go
 delete mode 100644 Godeps/_workspace/src/github.com/kballard/go-shellquote/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/kballard/go-shellquote/README
 delete mode 100644 Godeps/_workspace/src/github.com/kballard/go-shellquote/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/kballard/go-shellquote/quote.go
 delete mode 100644 Godeps/_workspace/src/github.com/kballard/go-shellquote/unquote.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/copy.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.s
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_noasm.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/deflate.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/fixedhuff.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/gen.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_bit_writer.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_code.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/inflate.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/reverse_bits.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/snappy.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/compress/flate/token.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_386.s
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_amd64.s
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/detect_intel.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/detect_ref.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/generate.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/cpuid/private-gen.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/GO_LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/circle.yml
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/gunzip.go
 delete mode 100644 Godeps/_workspace/src/github.com/klauspost/pgzip/gzip.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/License
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ioctl.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ioctl_bsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/mktypes.bash
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/pty_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/pty_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/pty_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/pty_unsupported.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/run.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/types.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/types_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/util.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_386.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_arm.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_386.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_arm.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64le.go
 delete mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_s390x.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/dce.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/doc.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/hash.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/json.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/node.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/sql.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/time.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/util.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/uuid.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/version1.go
 delete mode 100644 Godeps/_workspace/src/github.com/pborman/uuid/version4.go
 delete mode 100644 Godeps/_workspace/src/github.com/petar/GoLLRB/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/peterbourgon/diskv/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/peterbourgon/diskv/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/peterbourgon/diskv/compression.go
 delete mode 100644 Godeps/_workspace/src/github.com/peterbourgon/diskv/diskv.go
 delete mode 100644 Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/LICENSE.txt
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/block.go
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/html.go
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/inline.go
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/latex.go
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/markdown.go
 delete mode 100644 Godeps/_workspace/src/github.com/russross/blackfriday/smartypants.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/binary.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_unix.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_freebsd.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/AUTHORS
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/advapi32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/comctl32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/comdlg32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/constants.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/dwmapi.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/gdi32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/gdiplus.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/idispatch.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/istream.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/iunknown.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/kernel32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/ole32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/oleaut32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/opengl32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/psapi.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/shell32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/typedef.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/user32.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/utils.go
 delete mode 100644 Godeps/_workspace/src/github.com/shirou/w32/vars.go
 delete mode 100644 Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/.gitignore
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/.mailmap
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.md
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/cobra.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/add.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/helpers.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/init.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/licenses.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/root.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/cobra/main.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/command.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/doc_util.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/man_docs.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/man_docs.md
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/md_docs.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/cobra/md_docs.md
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/bool.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/count.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/duration.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/flag.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/float32.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/float64.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/golangflag.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/int.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/int32.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/int64.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/int8.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/int_slice.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/ip.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/ipnet.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/string.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/uint.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/uint16.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/uint32.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/uint64.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/uint8.go
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/verify/all.sh
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/verify/gofmt.sh
 delete mode 100644 Godeps/_workspace/src/github.com/spf13/pflag/verify/golint.sh
 delete mode 100644 Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability.go
 delete mode 100644 Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_noop.go
 delete mode 100644 Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum.go
 delete mode 100644 Godeps/_workspace/src/github.com/syndtr/gocapability/capability/syscall_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/README.md
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/class.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/class_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/link.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/route.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go
 delete mode 100644 Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
 delete mode 100644 Godeps/_workspace/src/go4.org/LICENSE
 delete mode 100644 Godeps/_workspace/src/go4.org/errorutil/highlight.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/LICENSE
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/PATENTS
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/cast5/cast5.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/armor.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/encode.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/canonical_text.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal/elgamal.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors/errors.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/compressed.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/config.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/encrypted_key.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/literal.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/ocfb.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/opaque.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/private_key.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key_v3.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/reader.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/userattribute.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/userid.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/read.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k/s2k.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/openpgp/write.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/LICENSE
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/PATENTS
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/context/context.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/const.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/doc.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/doctype.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/entity.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/escape.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/foreign.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/node.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/parse.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/render.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/html/token.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/.gitignore
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/Dockerfile
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/Makefile
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/README
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/buffer.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/errors.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/flow.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/frame.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/gotrack.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/.gitignore
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/Makefile
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/README
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/h2demo.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/launch.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.key
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.pem
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.srl
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.crt
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.key
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2i/README.md
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/h2i/h2i.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/headermap.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/hpack/encode.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/hpack/hpack.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/hpack/huffman.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/hpack/tables.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/http2.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/pipe.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/server.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/transport.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/write.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/http2/writesched.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/trace/events.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/trace/histogram.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/net/trace/trace.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/LICENSE
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/PATENTS
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_386.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_amd64.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_amd64.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_386.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_amd64.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_arm.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_386.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_amd64.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_mips64x.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_s390x.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_386.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_amd64.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_arm.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_386.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_amd64.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/bluetooth_linux.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/constants.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/env_unix.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/env_unset.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/flock.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/flock_linux_32bit.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_linux_amd64.go
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/mkpost.go
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl
 delete mode 100755 Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/race.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/race0.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_linux.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/str.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_mips64x.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_s390x.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_no_getwd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/types_dragonfly.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/types_freebsd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/types_netbsd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/types_openbsd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64le.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_s390x.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_s390x.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysctl_openbsd.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_s390x.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64le.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_s390x.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/tools/LICENSE
 delete mode 100644 Godeps/_workspace/src/golang.org/x/tools/PATENTS
 delete mode 100644 Godeps/_workspace/src/golang.org/x/tools/go/vcs/discovery.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/tools/go/vcs/env.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/tools/go/vcs/http.go
 delete mode 100644 Godeps/_workspace/src/golang.org/x/tools/go/vcs/vcs.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/.travis.yml
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/Documentation/grpc-auth-support.md
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/LICENSE
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/Makefile
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/PATENTS
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/README.md
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/client/main.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.proto
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/server/main.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/counter.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/histogram.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/stats.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/timeseries.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/tracker.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/util.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/call.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/clientconn.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/codegen.sh
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/coverage.sh
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/doc.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/README.md
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/gotutorial.md
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_server/main.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.proto
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/README.md
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/client/client.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/server/server.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.pb.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.proto
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/health/health.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/interop/client/client.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.pb.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.proto
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/interop/server/server.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/interop/test_utils.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/naming/naming.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/peer/peer.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/picker.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/server.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/stream.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.pb.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.proto
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.pb.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.proto
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/trace.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/transport/control.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go
 delete mode 100644 Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go
 delete mode 100644 Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE
 delete mode 100644 Godeps/_workspace/src/gopkg.in/inf.v0/dec.go
 delete mode 100644 Godeps/_workspace/src/gopkg.in/inf.v0/rounder.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/examples/update-demo/local/LICENSE.angular
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.proto
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/scale_int.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/suffix.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/OWNERS
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/cloner.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/converter.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/doc.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/helper.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/LICENSE
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/PATENTS
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE
 delete mode 100644 Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
deleted file mode 100644
index f0fc34c1db..0000000000
--- a/Godeps/Godeps.json
+++ /dev/null
@@ -1,796 +0,0 @@
-{
-	"ImportPath": "github.com/coreos/rkt",
-	"GoVersion": "go1.5",
-	"GodepVersion": "v74",
-	"Packages": [
-		"./...",
-		"github.com/appc/spec/actool",
-		"github.com/containernetworking/cni/plugins/ipam/dhcp",
-		"github.com/containernetworking/cni/plugins/ipam/host-local",
-		"github.com/containernetworking/cni/plugins/main/bridge",
-		"github.com/containernetworking/cni/plugins/main/ipvlan",
-		"github.com/containernetworking/cni/plugins/main/macvlan",
-		"github.com/containernetworking/cni/plugins/main/ptp",
-		"github.com/containernetworking/cni/plugins/meta/flannel",
-		"github.com/containernetworking/cni/plugins/meta/tuning",
-		"github.com/appc/spec/ace",
-		"github.com/golang/protobuf/protoc-gen-go"
-	],
-	"Deps": [
-		{
-			"ImportPath": "github.com/StackExchange/wmi",
-			"Rev": "f3e2bae1e0cb5aef83e319133eabfee30013a4a5"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/lib",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/lib/common",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/lib/internal",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/lib/internal/backend/file",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/lib/internal/backend/repository",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/lib/internal/docker",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/lib/internal/tarball",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/lib/internal/types",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/lib/internal/util",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/docker2aci/pkg/log",
-			"Comment": "v0.11.1",
-			"Rev": "355af275fa8d48b4ecdd361a5feaf173abff81e7"
-		},
-		{
-			"ImportPath": "github.com/appc/goaci/proj2aci",
-			"Comment": "v0.1.0",
-			"Rev": "ba7b591f930783c0ab75f5bbfd6ff65c7bd011bf"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/ace",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/aci",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/actool",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/discovery",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/pkg/acirenderer",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/pkg/device",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/pkg/tarheader",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/schema",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/schema/common",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/schema/lastditch",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/appc/spec/schema/types",
-			"Comment": "v0.8.4",
-			"Rev": "f82c741e743001237821b5e0bb9a8ebd324d3117"
-		},
-		{
-			"ImportPath": "github.com/aws/aws-sdk-go/aws",
-			"Comment": "v1.1.7",
-			"Rev": "13a12060f716145019378a10e2806c174356b857"
-		},
-		{
-			"ImportPath": "github.com/aws/aws-sdk-go/aws/awserr",
-			"Comment": "v1.1.7",
-			"Rev": "13a12060f716145019378a10e2806c174356b857"
-		},
-		{
-			"ImportPath": "github.com/aws/aws-sdk-go/aws/awsutil",
-			"Comment": "v1.1.7",
-			"Rev": "13a12060f716145019378a10e2806c174356b857"
-		},
-		{
-			"ImportPath": "github.com/aws/aws-sdk-go/aws/client/metadata",
-			"Comment": "v1.1.7",
-			"Rev": "13a12060f716145019378a10e2806c174356b857"
-		},
-		{
-			"ImportPath": "github.com/aws/aws-sdk-go/aws/credentials",
-			"Comment": "v1.1.7",
-			"Rev": "13a12060f716145019378a10e2806c174356b857"
-		},
-		{
-			"ImportPath": "github.com/aws/aws-sdk-go/aws/request",
-			"Comment": "v1.1.7",
-			"Rev": "13a12060f716145019378a10e2806c174356b857"
-		},
-		{
-			"ImportPath": "github.com/aws/aws-sdk-go/private/protocol/rest",
-			"Comment": "v1.1.7",
-			"Rev": "13a12060f716145019378a10e2806c174356b857"
-		},
-		{
-			"ImportPath": "github.com/aws/aws-sdk-go/private/signer/v4",
-			"Comment": "v1.1.7",
-			"Rev": "13a12060f716145019378a10e2806c174356b857"
-		},
-		{
-			"ImportPath": "github.com/camlistore/go4/lock",
-			"Rev": "9ba773eba85ab9e258ff516630f7f6474bc4535b"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/invoke",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/ip",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/ipam",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/ipam",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/ns",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/skel",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/testutils",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/skel",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/testutils",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/types",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/utils",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/utils/sysctl",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/dhcp",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local/backend",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/main/bridge",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/main/ipvlan",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/main/macvlan",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/main/ptp",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/meta/flannel",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/meta/tuning",
-			"Comment": "v0.3.0-rc3",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/utils/sysctl",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/dhcp",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local/backend",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/main/bridge",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/main/ipvlan",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/main/macvlan",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/main/ptp",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/meta/flannel",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/plugins/meta/tuning",
-			"Comment": "v0.3.0-rc2-5-g35f3a09",
-			"Rev": "35f3a090b2f7ebe32daf0c6a73eb060c669e2128"
-		},
-		{
-			"ImportPath": "github.com/coreos/gexpect",
-			"Comment": "v0.1.0",
-			"Rev": "ca42424d18c76d0d51a4cccd830d11878e9e5c17"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-iptables/iptables",
-			"Comment": "v0.1.0",
-			"Rev": "fbb73372b87f6e89951c2b6b31470c2c9d5cfae3"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-semver/semver",
-			"Rev": "6fe83ccda8fb9b7549c9ab4ba47f47858bc950aa"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-systemd/activation",
-			"Comment": "v10",
-			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-systemd/dbus",
-			"Comment": "v10",
-			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-systemd/sdjournal",
-			"Comment": "v10",
-			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-systemd/unit",
-			"Comment": "v10",
-			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-systemd/util",
-			"Comment": "v10",
-			"Rev": "b32b8467dbea18858bfebf65c1a6a761090f2c31"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-tspi/tpmclient",
-			"Comment": "v0.1.1",
-			"Rev": "03955c59fff97f9e38e7e32c68ac4db21a2aea2b"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-tspi/tspiconst",
-			"Comment": "v0.1.1",
-			"Rev": "03955c59fff97f9e38e7e32c68ac4db21a2aea2b"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-tspi/verification",
-			"Comment": "v0.1.1",
-			"Rev": "03955c59fff97f9e38e7e32c68ac4db21a2aea2b"
-		},
-		{
-			"ImportPath": "github.com/coreos/ioprogress",
-			"Rev": "e7fc03058804de5488baed8df5b89f3924b9ec9a"
-		},
-		{
-			"ImportPath": "github.com/coreos/pkg/dlopen",
-			"Comment": "v2",
-			"Rev": "7f080b6c11ac2d2347c3cd7521e810207ea1a041"
-		},
-		{
-			"ImportPath": "github.com/cpuguy83/go-md2man/md2man",
-			"Comment": "v1.0.4",
-			"Rev": "71acacd42f85e5e82f70a55327789582a5200a90"
-		},
-		{
-			"ImportPath": "github.com/cznic/b",
-			"Rev": "e2e747ce049fb910cff6b1fd7ad8faf3900939d5"
-		},
-		{
-			"ImportPath": "github.com/cznic/bufs",
-			"Rev": "3dcccbd7064a1689f9c093a988ea11ac00e21f51"
-		},
-		{
-			"ImportPath": "github.com/cznic/exp/lldb",
-			"Rev": "36265f1914ea00990ff0b73f72350edf9b1850df"
-		},
-		{
-			"ImportPath": "github.com/cznic/fileutil",
-			"Rev": "21ae57c9dce724a15e88bd9cd46d5668f3e880a5"
-		},
-		{
-			"ImportPath": "github.com/cznic/mathutil",
-			"Rev": "250d0b9d3304c5ea0c4cfc7d9efc7ee528b81f3b"
-		},
-		{
-			"ImportPath": "github.com/cznic/ql",
-			"Rev": "77545ff365ff426dfab06c46d70fa77600cd55af"
-		},
-		{
-			"ImportPath": "github.com/cznic/ql/driver",
-			"Rev": "77545ff365ff426dfab06c46d70fa77600cd55af"
-		},
-		{
-			"ImportPath": "github.com/cznic/sortutil",
-			"Rev": "d4401851b4c370f979b842fa1e45e0b3b718b391"
-		},
-		{
-			"ImportPath": "github.com/cznic/strutil",
-			"Rev": "97bc31f80ac4c9fa9c5dc5fea74c383858988ea2"
-		},
-		{
-			"ImportPath": "github.com/cznic/zappy",
-			"Rev": "47331054e4f96186e3ff772877c0443909368a45"
-		},
-		{
-			"ImportPath": "github.com/d2g/dhcp4",
-			"Rev": "f0e4d29ff0231dce36e250b2ed9ff08412584bca"
-		},
-		{
-			"ImportPath": "github.com/d2g/dhcp4client",
-			"Rev": "bed07e1bc5b85f69c6f0fd73393aa35ec68ed892"
-		},
-		{
-			"ImportPath": "github.com/docker/distribution/digest",
-			"Comment": "v2.3.0",
-			"Rev": "099622876197e3b24d627a72053d1bcc8968076a"
-		},
-		{
-			"ImportPath": "github.com/docker/distribution/reference",
-			"Comment": "v2.3.0",
-			"Rev": "099622876197e3b24d627a72053d1bcc8968076a"
-		},
-		{
-			"ImportPath": "github.com/dustin/go-humanize",
-			"Rev": "c20a8bde38c8f5ba06f6600edf473705c96829d1"
-		},
-		{
-			"ImportPath": "github.com/go-ini/ini",
-			"Comment": "v1.11.0",
-			"Rev": "12f418cc7edc5a618a51407b7ac1f1f512139df3"
-		},
-		{
-			"ImportPath": "github.com/go-ole/go-ole",
-			"Comment": "v1.2.0-10-g572eabb",
-			"Rev": "572eabb84c424e76a0d39d31510dd7dfd62f70b2"
-		},
-		{
-			"ImportPath": "github.com/go-ole/go-ole/oleutil",
-			"Comment": "v1.2.0-10-g572eabb",
-			"Rev": "572eabb84c424e76a0d39d31510dd7dfd62f70b2"
-		},
-		{
-			"ImportPath": "github.com/godbus/dbus",
-			"Comment": "v3-6-ga1b8ba5",
-			"Rev": "a1b8ba5163b7f041b22761461eabd02b70d1f824"
-		},
-		{
-			"ImportPath": "github.com/godbus/dbus/introspect",
-			"Comment": "v3-6-ga1b8ba5163b7",
-			"Rev": "a1b8ba5163b7f041b22761461eabd02b70d1f824"
-		},
-		{
-			"ImportPath": "github.com/gogo/protobuf/proto",
-			"Comment": "v0.2",
-			"Rev": "4168943e65a2802828518e95310aeeed6d84c4e5"
-		},
-		{
-			"ImportPath": "github.com/golang/protobuf/proto",
-			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
-		},
-		{
-			"ImportPath": "github.com/golang/protobuf/protoc-gen-go",
-			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
-		},
-		{
-			"ImportPath": "github.com/golang/protobuf/protoc-gen-go/descriptor",
-			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
-		},
-		{
-			"ImportPath": "github.com/golang/protobuf/protoc-gen-go/generator",
-			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
-		},
-		{
-			"ImportPath": "github.com/golang/protobuf/protoc-gen-go/internal/grpc",
-			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
-		},
-		{
-			"ImportPath": "github.com/golang/protobuf/protoc-gen-go/plugin",
-			"Rev": "2402d76f3d41f928c7902a765dfc872356dd3aad"
-		},
-		{
-			"ImportPath": "github.com/google/btree",
-			"Rev": "f06e229e679911bb31a04e07ac891115822e37c3"
-		},
-		{
-			"ImportPath": "github.com/gorilla/context",
-			"Rev": "50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da"
-		},
-		{
-			"ImportPath": "github.com/gorilla/mux",
-			"Rev": "e444e69cbd2e2e3e0749a2f3c717cec491552bbf"
-		},
-		{
-			"ImportPath": "github.com/hashicorp/errwrap",
-			"Rev": "7554cd9344cec97297fa6649b055a8c98c2a1e55"
-		},
-		{
-			"ImportPath": "github.com/hydrogen18/stoppableListener",
-			"Rev": "2eebd04b47ff393f4bc50b7fcacf8f048994c6fd"
-		},
-		{
-			"ImportPath": "github.com/inconshreveable/mousetrap",
-			"Rev": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-		},
-		{
-			"ImportPath": "github.com/jmespath/go-jmespath",
-			"Comment": "0.2.2-12-g0b12d6b",
-			"Rev": "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"
-		},
-		{
-			"ImportPath": "github.com/kballard/go-shellquote",
-			"Rev": "e5c918b80c17694cbc49aab32a759f9a40067f5d"
-		},
-		{
-			"ImportPath": "github.com/kr/pty",
-			"Comment": "release.r56-29-gf7ee69f31298",
-			"Rev": "f7ee69f31298ecbe5d2b349c711e2547a617d398"
-		},
-		{
-			"ImportPath": "github.com/pborman/uuid",
-			"Rev": "cccd189d45f7ac3368a0d127efb7f4d08ae0b655"
-		},
-		{
-			"ImportPath": "github.com/peterbourgon/diskv",
-			"Comment": "v2.0.0",
-			"Rev": "937c5a91d7fb1477fa6d2bb71410b2ae7a0f2143"
-		},
-		{
-			"ImportPath": "github.com/russross/blackfriday",
-			"Comment": "v1.4-2-g300106c",
-			"Rev": "300106c228d52c8941d4b3de6054a6062a86dda3"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/cpu",
-			"Comment": "v2.0.0",
-			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/host",
-			"Comment": "v2.0.0",
-			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/internal/common",
-			"Comment": "v2.0.0",
-			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/load",
-			"Comment": "v2.0.0",
-			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/mem",
-			"Comment": "v2.0.0",
-			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/net",
-			"Comment": "v2.0.0",
-			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/process",
-			"Comment": "v2.0.0",
-			"Rev": "e8f7a95747d711f34ddfe9dd9b825a84bd059dec"
-		},
-		{
-			"ImportPath": "github.com/shirou/w32",
-			"Rev": "3c9377fc6748f222729a8270fe2775d149a249ad"
-		},
-		{
-			"ImportPath": "github.com/shurcooL/sanitized_anchor_name",
-			"Rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77"
-		},
-		{
-			"ImportPath": "github.com/spf13/cobra",
-			"Rev": "4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f"
-		},
-		{
-			"ImportPath": "github.com/spf13/cobra/doc",
-			"Rev": "4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f"
-		},
-		{
-			"ImportPath": "github.com/spf13/pflag",
-			"Rev": "08b1a584251b5b62f458943640fc8ebd4d50aaa5"
-		},
-		{
-			"ImportPath": "github.com/syndtr/gocapability/capability",
-			"Rev": "8e4cdcb3c22b40d5e330ade0b68cb2e2a3cf6f98"
-		},
-		{
-			"ImportPath": "github.com/vishvananda/netlink",
-			"Rev": "ecf47fd5739b3d2c3daf7c89c4b9715a2605c21b"
-		},
-		{
-			"ImportPath": "github.com/vishvananda/netlink/nl",
-			"Rev": "ecf47fd5739b3d2c3daf7c89c4b9715a2605c21b"
-		},
-		{
-			"ImportPath": "go4.org/errorutil",
-			"Rev": "03efcb870d84809319ea509714dd6d19a1498483"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/cast5",
-			"Rev": "a7ead6ddf06233883deca151dffaef2effbf498f"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/openpgp",
-			"Rev": "a7ead6ddf06233883deca151dffaef2effbf498f"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/openpgp/armor",
-			"Rev": "a7ead6ddf06233883deca151dffaef2effbf498f"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/openpgp/elgamal",
-			"Rev": "a7ead6ddf06233883deca151dffaef2effbf498f"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/openpgp/errors",
-			"Rev": "a7ead6ddf06233883deca151dffaef2effbf498f"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/openpgp/packet",
-			"Rev": "a7ead6ddf06233883deca151dffaef2effbf498f"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/openpgp/s2k",
-			"Rev": "a7ead6ddf06233883deca151dffaef2effbf498f"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/ssh/terminal",
-			"Rev": "a7ead6ddf06233883deca151dffaef2effbf498f"
-		},
-		{
-			"ImportPath": "golang.org/x/net/context",
-			"Rev": "c2528b2dd8352441850638a8bb678c2ad056fd3e"
-		},
-		{
-			"ImportPath": "golang.org/x/net/html",
-			"Rev": "c2528b2dd8352441850638a8bb678c2ad056fd3e"
-		},
-		{
-			"ImportPath": "golang.org/x/net/html/atom",
-			"Rev": "c2528b2dd8352441850638a8bb678c2ad056fd3e"
-		},
-		{
-			"ImportPath": "golang.org/x/net/http2",
-			"Rev": "c2528b2dd8352441850638a8bb678c2ad056fd3e"
-		},
-		{
-			"ImportPath": "golang.org/x/net/http2/hpack",
-			"Rev": "c2528b2dd8352441850638a8bb678c2ad056fd3e"
-		},
-		{
-			"ImportPath": "golang.org/x/net/internal/timeseries",
-			"Rev": "c2528b2dd8352441850638a8bb678c2ad056fd3e"
-		},
-		{
-			"ImportPath": "golang.org/x/net/trace",
-			"Rev": "c2528b2dd8352441850638a8bb678c2ad056fd3e"
-		},
-		{
-			"ImportPath": "golang.org/x/sys/unix",
-			"Rev": "b44883b474ffefa37335017174e397412b633a4f"
-		},
-		{
-			"ImportPath": "golang.org/x/tools/go/vcs",
-			"Rev": "27e692e6ec36d8f48be794f32553e1400c70dbf2"
-		},
-		{
-			"ImportPath": "google.golang.org/grpc",
-			"Rev": "5da22b92e9485c15a6b284d52cc54d6580864c99"
-		},
-		{
-			"ImportPath": "google.golang.org/grpc/codes",
-			"Rev": "5da22b92e9485c15a6b284d52cc54d6580864c99"
-		},
-		{
-			"ImportPath": "google.golang.org/grpc/credentials",
-			"Rev": "5da22b92e9485c15a6b284d52cc54d6580864c99"
-		},
-		{
-			"ImportPath": "google.golang.org/grpc/grpclog",
-			"Rev": "5da22b92e9485c15a6b284d52cc54d6580864c99"
-		},
-		{
-			"ImportPath": "google.golang.org/grpc/metadata",
-			"Rev": "5da22b92e9485c15a6b284d52cc54d6580864c99"
-		},
-		{
-			"ImportPath": "google.golang.org/grpc/naming",
-			"Rev": "5da22b92e9485c15a6b284d52cc54d6580864c99"
-		},
-		{
-			"ImportPath": "google.golang.org/grpc/peer",
-			"Rev": "5da22b92e9485c15a6b284d52cc54d6580864c99"
-		},
-		{
-			"ImportPath": "google.golang.org/grpc/transport",
-			"Rev": "5da22b92e9485c15a6b284d52cc54d6580864c99"
-		},
-		{
-			"ImportPath": "gopkg.in/inf.v0",
-			"Comment": "v0.9.0",
-			"Rev": "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"
-		},
-		{
-			"ImportPath": "k8s.io/kubernetes/pkg/api/resource",
-			"Comment": "v1.3.0-alpha.4",
-			"Rev": "9990f843cd62caa90445cf76b07d63ba7b5c86fd"
-		},
-		{
-			"ImportPath": "k8s.io/kubernetes/pkg/conversion",
-			"Comment": "v1.3.0-alpha.4",
-			"Rev": "9990f843cd62caa90445cf76b07d63ba7b5c86fd"
-		},
-		{
-			"ImportPath": "k8s.io/kubernetes/third_party/forked/reflect",
-			"Comment": "v1.3.0-alpha.4",
-			"Rev": "9990f843cd62caa90445cf76b07d63ba7b5c86fd"
-		},
-		{
-			"ImportPath": "github.com/klauspost/pgzip",
-			"Comment": "v1.0",
-			"Rev": "95e8170c5d4da28db9c64dfc9ec3138ea4466fd4"
-		},
-		{
-			"ImportPath": "github.com/coreos/pkg/progressutil",
-			"Comment": "v2",
-			"Rev": "7f080b6c11ac2d2347c3cd7521e810207ea1a041"
-		},
-		{
-			"ImportPath": "github.com/klauspost/compress/flate",
-			"Comment": "v1.0",
-			"Rev": "006acde2c5d283d2f8b8aa03d8f0cd2891c680cf"
-		},
-		{
-			"ImportPath": "github.com/klauspost/crc32",
-			"Comment": "v1.0",
-			"Rev": "19b0b332c9e4516a6370a0456e6182c3b5036720"
-		},
-		{
-			"ImportPath": "github.com/klauspost/cpuid",
-			"Comment": "v1.0",
-			"Rev": "09cded8978dc9e80714c4d85b0322337b0a1e5e0"
-		}
-	]
-}
diff --git a/Godeps/Readme b/Godeps/Readme
deleted file mode 100644
index 4cdaa53d56..0000000000
--- a/Godeps/Readme
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
deleted file mode 100644
index f037d684ef..0000000000
--- a/Godeps/_workspace/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pkg
-/bin
diff --git a/Godeps/_workspace/src/github.com/StackExchange/wmi/LICENSE b/Godeps/_workspace/src/github.com/StackExchange/wmi/LICENSE
deleted file mode 100644
index ae80b67209..0000000000
--- a/Godeps/_workspace/src/github.com/StackExchange/wmi/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Stack Exchange
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/StackExchange/wmi/README.md b/Godeps/_workspace/src/github.com/StackExchange/wmi/README.md
deleted file mode 100644
index 3d5f67e149..0000000000
--- a/Godeps/_workspace/src/github.com/StackExchange/wmi/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-wmi
-===
-
-Package wmi provides a WQL interface for WMI on Windows.
diff --git a/Godeps/_workspace/src/github.com/StackExchange/wmi/wmi.go b/Godeps/_workspace/src/github.com/StackExchange/wmi/wmi.go
deleted file mode 100644
index b931ca57af..0000000000
--- a/Godeps/_workspace/src/github.com/StackExchange/wmi/wmi.go
+++ /dev/null
@@ -1,416 +0,0 @@
-// +build windows
-
-/*
-Package wmi provides a WQL interface for WMI on Windows.
-
-Example code to print names of running processes:
-
-	type Win32_Process struct {
-		Name string
-	}
-
-	func main() {
-		var dst []Win32_Process
-		q := wmi.CreateQuery(&dst, "")
-		err := wmi.Query(q, &dst)
-		if err != nil {
-			log.Fatal(err)
-		}
-		for i, v := range dst {
-			println(i, v.Name)
-		}
-	}
-
-*/
-package wmi
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"log"
-	"os"
-	"reflect"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/go-ole/go-ole"
-	"github.com/go-ole/go-ole/oleutil"
-)
-
-var l = log.New(os.Stdout, "", log.LstdFlags)
-
-var (
-	ErrInvalidEntityType = errors.New("wmi: invalid entity type")
-	lock                 sync.Mutex
-)
-
-// QueryNamespace invokes Query with the given namespace on the local machine.
-func QueryNamespace(query string, dst interface{}, namespace string) error {
-	return Query(query, dst, nil, namespace)
-}
-
-// Query runs the WQL query and appends the values to dst.
-//
-// dst must have type *[]S or *[]*S, for some struct type S. Fields selected in
-// the query must have the same name in dst. Supported types are all signed and
-// unsigned integers, time.Time, string, bool, or a pointer to one of those.
-// Array types are not supported.
-//
-// By default, the local machine and default namespace are used. These can be
-// changed using connectServerArgs. See
-// http://msdn.microsoft.com/en-us/library/aa393720.aspx for details.
-//
-// Query is a wrapper around DefaultClient.Query.
-func Query(query string, dst interface{}, connectServerArgs ...interface{}) error {
-	return DefaultClient.Query(query, dst, connectServerArgs...)
-}
-
-// A Client is an WMI query client.
-//
-// Its zero value (DefaultClient) is a usable client.
-type Client struct {
-	// NonePtrZero specifies if nil values for fields which aren't pointers
-	// should be returned as the field types zero value.
-	//
-	// Setting this to true allows stucts without pointer fields to be used
-	// without the risk failure should a nil value returned from WMI.
-	NonePtrZero bool
-
-	// PtrNil specifies if nil values for pointer fields should be returned
-	// as nil.
-	//
-	// Setting this to true will set pointer fields to nil where WMI
-	// returned nil, otherwise the types zero value will be returned.
-	PtrNil bool
-
-	// AllowMissingFields specifies that struct fields not present in the
-	// query result should not result in an error.
-	//
-	// Setting this to true allows custom queries to be used with full
-	// struct definitions instead of having to define multiple structs.
-	AllowMissingFields bool
-}
-
-// DefaultClient is the default Client and is used by Query, QueryNamespace
-var DefaultClient = &Client{}
-
-// Query runs the WQL query and appends the values to dst.
-//
-// dst must have type *[]S or *[]*S, for some struct type S. Fields selected in
-// the query must have the same name in dst. Supported types are all signed and
-// unsigned integers, time.Time, string, bool, or a pointer to one of those.
-// Array types are not supported.
-//
-// By default, the local machine and default namespace are used. These can be
-// changed using connectServerArgs. See
-// http://msdn.microsoft.com/en-us/library/aa393720.aspx for details.
-func (c *Client) Query(query string, dst interface{}, connectServerArgs ...interface{}) error {
-	dv := reflect.ValueOf(dst)
-	if dv.Kind() != reflect.Ptr || dv.IsNil() {
-		return ErrInvalidEntityType
-	}
-	dv = dv.Elem()
-	mat, elemType := checkMultiArg(dv)
-	if mat == multiArgTypeInvalid {
-		return ErrInvalidEntityType
-	}
-
-	lock.Lock()
-	defer lock.Unlock()
-	runtime.LockOSThread()
-	defer runtime.UnlockOSThread()
-
-	err := ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
-	if err != nil {
-		oleerr := err.(*ole.OleError)
-		// S_FALSE           = 0x00000001 // CoInitializeEx was already called on this thread
-		if oleerr.Code() != ole.S_OK && oleerr.Code() != 0x00000001 {
-			return err
-		}
-	} else {
-		// Only invoke CoUninitialize if the thread was not initizlied before.
-		// This will allow other go packages based on go-ole play along
-		// with this library.
-		defer ole.CoUninitialize()
-	}
-
-	unknown, err := oleutil.CreateObject("WbemScripting.SWbemLocator")
-	if err != nil {
-		return err
-	}
-	defer unknown.Release()
-
-	wmi, err := unknown.QueryInterface(ole.IID_IDispatch)
-	if err != nil {
-		return err
-	}
-	defer wmi.Release()
-
-	// service is a SWbemServices
-	serviceRaw, err := oleutil.CallMethod(wmi, "ConnectServer", connectServerArgs...)
-	if err != nil {
-		return err
-	}
-	service := serviceRaw.ToIDispatch()
-	defer serviceRaw.Clear()
-
-	// result is a SWBemObjectSet
-	resultRaw, err := oleutil.CallMethod(service, "ExecQuery", query)
-	if err != nil {
-		return err
-	}
-	result := resultRaw.ToIDispatch()
-	defer resultRaw.Clear()
-
-	count, err := oleInt64(result, "Count")
-	if err != nil {
-		return err
-	}
-
-	// Initialize a slice with Count capacity
-	dv.Set(reflect.MakeSlice(dv.Type(), 0, int(count)))
-
-	var errFieldMismatch error
-	for i := int64(0); i < count; i++ {
-		err := func() error {
-			// item is a SWbemObject, but really a Win32_Process
-			itemRaw, err := oleutil.CallMethod(result, "ItemIndex", i)
-			if err != nil {
-				return err
-			}
-			item := itemRaw.ToIDispatch()
-			defer itemRaw.Clear()
-
-			ev := reflect.New(elemType)
-			if err = c.loadEntity(ev.Interface(), item); err != nil {
-				if _, ok := err.(*ErrFieldMismatch); ok {
-					// We continue loading entities even in the face of field mismatch errors.
-					// If we encounter any other error, that other error is returned. Otherwise,
-					// an ErrFieldMismatch is returned.
-					errFieldMismatch = err
-				} else {
-					return err
-				}
-			}
-			if mat != multiArgTypeStructPtr {
-				ev = ev.Elem()
-			}
-			dv.Set(reflect.Append(dv, ev))
-			return nil
-		}()
-		if err != nil {
-			return err
-		}
-	}
-	return errFieldMismatch
-}
-
-// ErrFieldMismatch is returned when a field is to be loaded into a different
-// type than the one it was stored from, or when a field is missing or
-// unexported in the destination struct.
-// StructType is the type of the struct pointed to by the destination argument.
-type ErrFieldMismatch struct {
-	StructType reflect.Type
-	FieldName  string
-	Reason     string
-}
-
-func (e *ErrFieldMismatch) Error() string {
-	return fmt.Sprintf("wmi: cannot load field %q into a %q: %s",
-		e.FieldName, e.StructType, e.Reason)
-}
-
-var timeType = reflect.TypeOf(time.Time{})
-
-// loadEntity loads a SWbemObject into a struct pointer.
-func (c *Client) loadEntity(dst interface{}, src *ole.IDispatch) (errFieldMismatch error) {
-	v := reflect.ValueOf(dst).Elem()
-	for i := 0; i < v.NumField(); i++ {
-		f := v.Field(i)
-		of := f
-		isPtr := f.Kind() == reflect.Ptr
-		if isPtr {
-			ptr := reflect.New(f.Type().Elem())
-			f.Set(ptr)
-			f = f.Elem()
-		}
-		n := v.Type().Field(i).Name
-		if !f.CanSet() {
-			return &ErrFieldMismatch{
-				StructType: of.Type(),
-				FieldName:  n,
-				Reason:     "CanSet() is false",
-			}
-		}
-		prop, err := oleutil.GetProperty(src, n)
-		if err != nil {
-			if !c.AllowMissingFields {
-				errFieldMismatch = &ErrFieldMismatch{
-					StructType: of.Type(),
-					FieldName:  n,
-					Reason:     "no such struct field",
-				}
-			}
-			continue
-		}
-		defer prop.Clear()
-
-		switch val := prop.Value().(type) {
-		case int8, int16, int32, int64, int:
-			v := reflect.ValueOf(val).Int()
-			switch f.Kind() {
-			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-				f.SetInt(v)
-			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-				f.SetUint(uint64(v))
-			default:
-				return &ErrFieldMismatch{
-					StructType: of.Type(),
-					FieldName:  n,
-					Reason:     "not an integer class",
-				}
-			}
-		case uint8, uint16, uint32, uint64:
-			v := reflect.ValueOf(val).Uint()
-			switch f.Kind() {
-			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-				f.SetInt(int64(v))
-			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-				f.SetUint(v)
-			default:
-				return &ErrFieldMismatch{
-					StructType: of.Type(),
-					FieldName:  n,
-					Reason:     "not an integer class",
-				}
-			}
-		case string:
-			switch f.Kind() {
-			case reflect.String:
-				f.SetString(val)
-			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-				iv, err := strconv.ParseInt(val, 10, 64)
-				if err != nil {
-					return err
-				}
-				f.SetInt(iv)
-			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-				uv, err := strconv.ParseUint(val, 10, 64)
-				if err != nil {
-					return err
-				}
-				f.SetUint(uv)
-			case reflect.Struct:
-				switch f.Type() {
-				case timeType:
-					if len(val) == 25 {
-						mins, err := strconv.Atoi(val[22:])
-						if err != nil {
-							return err
-						}
-						val = val[:22] + fmt.Sprintf("%02d%02d", mins/60, mins%60)
-					}
-					t, err := time.Parse("20060102150405.000000-0700", val)
-					if err != nil {
-						return err
-					}
-					f.Set(reflect.ValueOf(t))
-				}
-			}
-		case bool:
-			switch f.Kind() {
-			case reflect.Bool:
-				f.SetBool(val)
-			default:
-				return &ErrFieldMismatch{
-					StructType: of.Type(),
-					FieldName:  n,
-					Reason:     "not a bool",
-				}
-			}
-		default:
-			typeof := reflect.TypeOf(val)
-			if typeof == nil && (isPtr || c.NonePtrZero) {
-				if (isPtr && c.PtrNil) || (!isPtr && c.NonePtrZero) {
-					of.Set(reflect.Zero(of.Type()))
-				}
-				break
-			}
-			return &ErrFieldMismatch{
-				StructType: of.Type(),
-				FieldName:  n,
-				Reason:     fmt.Sprintf("unsupported type (%T)", val),
-			}
-		}
-	}
-	return errFieldMismatch
-}
-
-type multiArgType int
-
-const (
-	multiArgTypeInvalid multiArgType = iota
-	multiArgTypeStruct
-	multiArgTypeStructPtr
-)
-
-// checkMultiArg checks that v has type []S, []*S for some struct type S.
-//
-// It returns what category the slice's elements are, and the reflect.Type
-// that represents S.
-func checkMultiArg(v reflect.Value) (m multiArgType, elemType reflect.Type) {
-	if v.Kind() != reflect.Slice {
-		return multiArgTypeInvalid, nil
-	}
-	elemType = v.Type().Elem()
-	switch elemType.Kind() {
-	case reflect.Struct:
-		return multiArgTypeStruct, elemType
-	case reflect.Ptr:
-		elemType = elemType.Elem()
-		if elemType.Kind() == reflect.Struct {
-			return multiArgTypeStructPtr, elemType
-		}
-	}
-	return multiArgTypeInvalid, nil
-}
-
-func oleInt64(item *ole.IDispatch, prop string) (int64, error) {
-	v, err := oleutil.GetProperty(item, prop)
-	if err != nil {
-		return 0, err
-	}
-	defer v.Clear()
-
-	i := int64(v.Val)
-	return i, nil
-}
-
-// CreateQuery returns a WQL query string that queries all columns of src. where
-// is an optional string that is appended to the query, to be used with WHERE
-// clauses. In such a case, the "WHERE" string should appear at the beginning.
-func CreateQuery(src interface{}, where string) string {
-	var b bytes.Buffer
-	b.WriteString("SELECT ")
-	s := reflect.Indirect(reflect.ValueOf(src))
-	t := s.Type()
-	if s.Kind() == reflect.Slice {
-		t = t.Elem()
-	}
-	if t.Kind() != reflect.Struct {
-		return ""
-	}
-	var fields []string
-	for i := 0; i < t.NumField(); i++ {
-		fields = append(fields, t.Field(i).Name)
-	}
-	b.WriteString(strings.Join(fields, ", "))
-	b.WriteString(" FROM ")
-	b.WriteString(t.Name())
-	b.WriteString(" " + where)
-	return b.String()
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/LICENSE b/Godeps/_workspace/src/github.com/appc/docker2aci/LICENSE
deleted file mode 100644
index e06d208186..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go
deleted file mode 100644
index 5fd1d46050..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/common/common.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2016 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package common provides misc types and variables.
-package common
-
-import (
-	"github.com/appc/docker2aci/lib/internal/docker"
-	"github.com/appc/docker2aci/lib/internal/types"
-)
-
-type Compression int
-
-const (
-	NoCompression = iota
-	GzipCompression
-)
-
-type ParsedDockerURL types.ParsedDockerURL
-
-const (
-	AppcDockerRegistryURL   = "appc.io/docker/registryurl"
-	AppcDockerRepository    = "appc.io/docker/repository"
-	AppcDockerTag           = "appc.io/docker/tag"
-	AppcDockerImageID       = "appc.io/docker/imageid"
-	AppcDockerParentImageID = "appc.io/docker/parentimageid"
-	AppcDockerEntrypoint    = "appc.io/docker/entrypoint"
-	AppcDockerCmd           = "appc.io/docker/cmd"
-)
-
-type ErrSeveralImages struct {
-	Msg    string
-	Images []string
-}
-
-// InsecureConfig represents the different insecure options available
-type InsecureConfig struct {
-	SkipVerify bool
-	AllowHTTP  bool
-}
-
-func (e *ErrSeveralImages) Error() string {
-	return e.Msg
-}
-
-// ParseDockerURL takes a Docker URL and returns a ParsedDockerURL with its
-// index URL, image name, and tag.
-func ParseDockerURL(arg string) (*ParsedDockerURL, error) {
-	p, err := docker.ParseDockerURL(arg)
-	return (*ParsedDockerURL)(p), err
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/conversion_store.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/conversion_store.go
deleted file mode 100644
index 4944f1386a..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/conversion_store.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package docker2aci
-
-import (
-	"crypto/sha512"
-	"fmt"
-	"hash"
-	"io"
-	"io/ioutil"
-	"os"
-
-	"github.com/appc/spec/aci"
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-)
-
-const (
-	hashPrefix = "sha512-"
-)
-
-type aciInfo struct {
-	path          string
-	key           string
-	ImageManifest *schema.ImageManifest
-}
-
-// conversionStore is an simple implementation of the acirenderer.ACIRegistry
-// interface. It stores the Docker layers converted to ACI so we can take
-// advantage of acirenderer to generate a squashed ACI Image.
-type conversionStore struct {
-	acis map[string]*aciInfo
-}
-
-func newConversionStore() *conversionStore {
-	return &conversionStore{acis: make(map[string]*aciInfo)}
-}
-
-func (ms *conversionStore) WriteACI(path string) (string, error) {
-	f, err := os.Open(path)
-	if err != nil {
-		return "", err
-	}
-	defer f.Close()
-
-	cr, err := aci.NewCompressedReader(f)
-	if err != nil {
-		return "", err
-	}
-	defer cr.Close()
-
-	h := sha512.New()
-	r := io.TeeReader(cr, h)
-
-	// read the file so we can get the hash
-	if _, err := io.Copy(ioutil.Discard, r); err != nil {
-		return "", fmt.Errorf("error reading ACI: %v", err)
-	}
-
-	im, err := aci.ManifestFromImage(f)
-	if err != nil {
-		return "", err
-	}
-
-	key := ms.HashToKey(h)
-	ms.acis[key] = &aciInfo{path: path, key: key, ImageManifest: im}
-	return key, nil
-}
-
-func (ms *conversionStore) GetImageManifest(key string) (*schema.ImageManifest, error) {
-	aci, ok := ms.acis[key]
-	if !ok {
-		return nil, fmt.Errorf("aci with key: %s not found", key)
-	}
-	return aci.ImageManifest, nil
-}
-
-func (ms *conversionStore) GetACI(name types.ACIdentifier, labels types.Labels) (string, error) {
-	for _, aci := range ms.acis {
-		// we implement this function to comply with the interface so don't
-		// bother implementing a proper label check
-		if aci.ImageManifest.Name.String() == name.String() {
-			return aci.key, nil
-		}
-	}
-	return "", fmt.Errorf("aci not found")
-}
-
-func (ms *conversionStore) ReadStream(key string) (io.ReadCloser, error) {
-	img, ok := ms.acis[key]
-	if !ok {
-		return nil, fmt.Errorf("stream for key: %s not found", key)
-	}
-	f, err := os.Open(img.path)
-	if err != nil {
-		return nil, fmt.Errorf("error opening aci: %s", img.path)
-	}
-
-	tr, err := aci.NewCompressedReader(f)
-	if err != nil {
-		return nil, err
-	}
-
-	return tr, nil
-}
-
-func (ms *conversionStore) ResolveKey(key string) (string, error) {
-	return key, nil
-}
-
-func (ms *conversionStore) HashToKey(h hash.Hash) string {
-	s := h.Sum(nil)
-	return fmt.Sprintf("%s%x", hashPrefix, s)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go
deleted file mode 100644
index 4cb0ecc9aa..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go
+++ /dev/null
@@ -1,417 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package docker2aci implements a simple library for converting docker images to
-// App Container Images (ACIs).
-package docker2aci
-
-import (
-	"archive/tar"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/appc/docker2aci/lib/common"
-	"github.com/appc/docker2aci/lib/internal"
-	"github.com/appc/docker2aci/lib/internal/backend/file"
-	"github.com/appc/docker2aci/lib/internal/backend/repository"
-	"github.com/appc/docker2aci/lib/internal/docker"
-	"github.com/appc/docker2aci/lib/internal/tarball"
-	"github.com/appc/docker2aci/lib/internal/types"
-	"github.com/appc/docker2aci/lib/internal/util"
-	"github.com/appc/docker2aci/pkg/log"
-	"github.com/appc/spec/pkg/acirenderer"
-	"github.com/appc/spec/schema"
-	appctypes "github.com/appc/spec/schema/types"
-	gzip "github.com/klauspost/pgzip"
-)
-
-// CommonConfig represents the shared configuration options for converting
-// Docker images.
-type CommonConfig struct {
-	Squash      bool               // squash the layers in one file
-	OutputDir   string             // where to put the resulting ACI
-	TmpDir      string             // directory to use for temporary files
-	Compression common.Compression // which compression to use for the resulting file(s)
-}
-
-// RemoteConfig represents the remote repository specific configuration for
-// converting Docker images.
-type RemoteConfig struct {
-	CommonConfig
-	Username string                // username to use if the image to convert needs authentication
-	Password string                // password to use if the image to convert needs authentication
-	Insecure common.InsecureConfig // Insecure options
-}
-
-// FileConfig represents the saved file specific configuration for converting
-// Docker images.
-type FileConfig struct {
-	CommonConfig
-	DockerURL string // select an image if there are several images/tags in the file, Syntax: "{docker registry URL}/{image name}:{tag}"
-}
-
-// ConvertRemoteRepo generates ACI images from docker registry URLs.  It takes
-// as input a dockerURL of the form:
-//
-//     {registry URL}/{repository}:{reference[tag|digest]}
-//
-// It then gets all the layers of the requested image and converts each of
-// them to ACI.
-// It returns the list of generated ACI paths.
-func ConvertRemoteRepo(dockerURL string, config RemoteConfig) ([]string, error) {
-	repositoryBackend := repository.NewRepositoryBackend(config.Username, config.Password, config.Insecure)
-	return convertReal(repositoryBackend, dockerURL, config.Squash, config.OutputDir, config.TmpDir, config.Compression)
-}
-
-// ConvertSavedFile generates ACI images from a file generated with "docker
-// save".  If there are several images/tags in the file, a particular image can
-// be chosen via FileConfig.DockerURL.
-//
-// It returns the list of generated ACI paths.
-func ConvertSavedFile(dockerSavedFile string, config FileConfig) ([]string, error) {
-	f, err := os.Open(dockerSavedFile)
-	if err != nil {
-		return nil, fmt.Errorf("error opening file: %v", err)
-	}
-	defer f.Close()
-
-	fileBackend := file.NewFileBackend(f)
-	return convertReal(fileBackend, config.DockerURL, config.Squash, config.OutputDir, config.TmpDir, config.Compression)
-}
-
-// GetIndexName returns the docker index server from a docker URL.
-func GetIndexName(dockerURL string) string {
-	index, _ := docker.SplitReposName(dockerURL)
-	return index
-}
-
-// GetDockercfgAuth reads a ~/.dockercfg file and returns the username and password
-// of the given docker index server.
-func GetDockercfgAuth(indexServer string) (string, string, error) {
-	return docker.GetAuthInfo(indexServer)
-}
-
-func convertReal(backend internal.Docker2ACIBackend, dockerURL string, squash bool, outputDir string, tmpDir string, compression common.Compression) ([]string, error) {
-	log.Debug("Getting image info...")
-	ancestry, parsedDockerURL, err := backend.GetImageInfo(dockerURL)
-	if err != nil {
-		return nil, err
-	}
-
-	layersOutputDir := outputDir
-	if squash {
-		layersOutputDir, err = ioutil.TempDir(tmpDir, "docker2aci-")
-		if err != nil {
-			return nil, fmt.Errorf("error creating dir: %v", err)
-		}
-		defer os.RemoveAll(layersOutputDir)
-	}
-
-	conversionStore := newConversionStore()
-
-	// only compress individual layers if we're not squashing
-	layerCompression := compression
-	if squash {
-		layerCompression = common.NoCompression
-	}
-
-	aciLayerPaths, aciManifests, err := backend.BuildACI(ancestry, parsedDockerURL, layersOutputDir, tmpDir, layerCompression)
-	if err != nil {
-		return nil, err
-	}
-
-	var images acirenderer.Images
-	for i, aciLayerPath := range aciLayerPaths {
-		key, err := conversionStore.WriteACI(aciLayerPath)
-		if err != nil {
-			return nil, fmt.Errorf("error inserting in the conversion store: %v", err)
-		}
-
-		images = append(images, acirenderer.Image{Im: aciManifests[i], Key: key, Level: uint16(len(aciLayerPaths) - 1 - i)})
-	}
-
-	// acirenderer expects images in order from upper to base layer
-	images = util.ReverseImages(images)
-	if squash {
-		squashedImagePath, err := squashLayers(images, conversionStore, *parsedDockerURL, outputDir, compression)
-		if err != nil {
-			return nil, fmt.Errorf("error squashing image: %v", err)
-		}
-		aciLayerPaths = []string{squashedImagePath}
-	}
-
-	return aciLayerPaths, nil
-}
-
-// squashLayers receives a list of ACI layer file names ordered from base image
-// to application image and squashes them into one ACI
-func squashLayers(images []acirenderer.Image, aciRegistry acirenderer.ACIRegistry, parsedDockerURL types.ParsedDockerURL, outputDir string, compression common.Compression) (path string, err error) {
-	log.Debug("Squashing layers...")
-	log.Debug("Rendering ACI...")
-	renderedACI, err := acirenderer.GetRenderedACIFromList(images, aciRegistry)
-	if err != nil {
-		return "", fmt.Errorf("error rendering squashed image: %v", err)
-	}
-	manifests, err := getManifests(renderedACI, aciRegistry)
-	if err != nil {
-		return "", fmt.Errorf("error getting manifests: %v", err)
-	}
-
-	squashedFilename := getSquashedFilename(parsedDockerURL)
-	squashedImagePath := filepath.Join(outputDir, squashedFilename)
-
-	squashedTempFile, err := ioutil.TempFile(outputDir, "docker2aci-squashedFile-")
-	if err != nil {
-		return "", err
-	}
-	defer func() {
-		if err == nil {
-			err = squashedTempFile.Close()
-		} else {
-			// remove temp file on error
-			// we ignore its error to not mask the real error
-			os.Remove(squashedTempFile.Name())
-		}
-	}()
-
-	log.Debug("Writing squashed ACI...")
-	if err := writeSquashedImage(squashedTempFile, renderedACI, aciRegistry, manifests, compression); err != nil {
-		return "", fmt.Errorf("error writing squashed image: %v", err)
-	}
-
-	log.Debug("Validating squashed ACI...")
-	if err := internal.ValidateACI(squashedTempFile.Name()); err != nil {
-		return "", fmt.Errorf("error validating image: %v", err)
-	}
-
-	if err := os.Rename(squashedTempFile.Name(), squashedImagePath); err != nil {
-		return "", err
-	}
-
-	log.Debug("ACI squashed!")
-	return squashedImagePath, nil
-}
-
-func getSquashedFilename(parsedDockerURL types.ParsedDockerURL) string {
-	squashedFilename := strings.Replace(parsedDockerURL.ImageName, "/", "-", -1)
-	if parsedDockerURL.Tag != "" {
-		squashedFilename += "-" + parsedDockerURL.Tag
-	}
-	squashedFilename += ".aci"
-
-	return squashedFilename
-}
-
-func getManifests(renderedACI acirenderer.RenderedACI, aciRegistry acirenderer.ACIRegistry) ([]schema.ImageManifest, error) {
-	var manifests []schema.ImageManifest
-
-	for _, aci := range renderedACI {
-		im, err := aciRegistry.GetImageManifest(aci.Key)
-		if err != nil {
-			return nil, err
-		}
-		manifests = append(manifests, *im)
-	}
-
-	return manifests, nil
-}
-
-func writeSquashedImage(outputFile *os.File, renderedACI acirenderer.RenderedACI, aciProvider acirenderer.ACIProvider, manifests []schema.ImageManifest, compression common.Compression) error {
-	var tarWriterTarget io.WriteCloser = outputFile
-
-	switch compression {
-	case common.NoCompression:
-	case common.GzipCompression:
-		tarWriterTarget = gzip.NewWriter(outputFile)
-		defer tarWriterTarget.Close()
-	default:
-		return fmt.Errorf("unexpected compression enum value: %d", compression)
-	}
-
-	outputWriter := tar.NewWriter(tarWriterTarget)
-	defer outputWriter.Close()
-
-	finalManifest := mergeManifests(manifests)
-
-	if err := internal.WriteManifest(outputWriter, finalManifest); err != nil {
-		return err
-	}
-
-	if err := internal.WriteRootfsDir(outputWriter); err != nil {
-		return err
-	}
-
-	type hardLinkEntry struct {
-		firstLinkCleanName string
-		firstLinkHeader    tar.Header
-		keepOriginal       bool
-		walked             bool
-	}
-	// map aciFileKey -> cleanTarget -> hardLinkEntry
-	hardLinks := make(map[string]map[string]hardLinkEntry)
-
-	// first pass: read all the entries and build the hardLinks map in memory
-	// but don't write on disk
-	for _, aciFile := range renderedACI {
-		rs, err := aciProvider.ReadStream(aciFile.Key)
-		if err != nil {
-			return err
-		}
-		defer rs.Close()
-
-		hardLinks[aciFile.Key] = map[string]hardLinkEntry{}
-
-		squashWalker := func(t *tarball.TarFile) error {
-			cleanName := filepath.Clean(t.Name())
-			// the rootfs and the squashed manifest are added separately
-			if cleanName == "manifest" || cleanName == "rootfs" {
-				return nil
-			}
-			_, keep := aciFile.FileMap[cleanName]
-			if keep && t.Header.Typeflag == tar.TypeLink {
-				cleanTarget := filepath.Clean(t.Linkname())
-				if _, ok := hardLinks[aciFile.Key][cleanTarget]; !ok {
-					_, keepOriginal := aciFile.FileMap[cleanTarget]
-					hardLinks[aciFile.Key][cleanTarget] = hardLinkEntry{cleanName, *t.Header, keepOriginal, false}
-				}
-			}
-			return nil
-		}
-
-		tr := tar.NewReader(rs)
-		if err := tarball.Walk(*tr, squashWalker); err != nil {
-			return err
-		}
-	}
-
-	// second pass: write on disk
-	for _, aciFile := range renderedACI {
-		rs, err := aciProvider.ReadStream(aciFile.Key)
-		if err != nil {
-			return err
-		}
-		defer rs.Close()
-
-		squashWalker := func(t *tarball.TarFile) error {
-			cleanName := filepath.Clean(t.Name())
-			// the rootfs and the squashed manifest are added separately
-			if cleanName == "manifest" || cleanName == "rootfs" {
-				return nil
-			}
-			_, keep := aciFile.FileMap[cleanName]
-
-			if link, ok := hardLinks[aciFile.Key][cleanName]; ok {
-				if keep != link.keepOriginal {
-					return fmt.Errorf("logic error: should we keep file %q?", cleanName)
-				}
-				if keep {
-					if err := outputWriter.WriteHeader(t.Header); err != nil {
-						return fmt.Errorf("error writing header: %v", err)
-					}
-					if _, err := io.Copy(outputWriter, t.TarStream); err != nil {
-						return fmt.Errorf("error copying file into the tar out: %v", err)
-					}
-				} else {
-					// The current file does not remain but there is a hard link pointing to
-					// it. Write the current file but with the filename of the first hard link
-					// pointing to it. That first hard link will not be written later, see
-					// variable "alreadyWritten".
-					link.firstLinkHeader.Size = t.Header.Size
-					link.firstLinkHeader.Typeflag = t.Header.Typeflag
-					link.firstLinkHeader.Linkname = ""
-
-					if err := outputWriter.WriteHeader(&link.firstLinkHeader); err != nil {
-						return fmt.Errorf("error writing header: %v", err)
-					}
-					if _, err := io.Copy(outputWriter, t.TarStream); err != nil {
-						return fmt.Errorf("error copying file into the tar out: %v", err)
-					}
-				}
-			} else if keep {
-				alreadyWritten := false
-				if t.Header.Typeflag == tar.TypeLink {
-					cleanTarget := filepath.Clean(t.Linkname())
-					if link, ok := hardLinks[aciFile.Key][cleanTarget]; ok {
-						if !link.keepOriginal {
-							if link.walked {
-								t.Header.Linkname = link.firstLinkCleanName
-							} else {
-								alreadyWritten = true
-							}
-						}
-						link.walked = true
-						hardLinks[aciFile.Key][cleanTarget] = link
-					}
-				}
-
-				if !alreadyWritten {
-					if err := outputWriter.WriteHeader(t.Header); err != nil {
-						return fmt.Errorf("error writing header: %v", err)
-					}
-					if _, err := io.Copy(outputWriter, t.TarStream); err != nil {
-						return fmt.Errorf("error copying file into the tar out: %v", err)
-					}
-				}
-			}
-			return nil
-		}
-
-		tr := tar.NewReader(rs)
-		if err := tarball.Walk(*tr, squashWalker); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func mergeManifests(manifests []schema.ImageManifest) schema.ImageManifest {
-	// FIXME(iaguis) we take app layer's manifest as the final manifest for now
-	manifest := manifests[0]
-
-	manifest.Dependencies = nil
-
-	layerIndex := -1
-	for i, l := range manifest.Labels {
-		if l.Name.String() == "layer" {
-			layerIndex = i
-		}
-	}
-
-	if layerIndex != -1 {
-		manifest.Labels = append(manifest.Labels[:layerIndex], manifest.Labels[layerIndex+1:]...)
-	}
-
-	nameWithoutLayerID := appctypes.MustACIdentifier(stripLayerID(manifest.Name.String()))
-
-	manifest.Name = *nameWithoutLayerID
-
-	// once the image is squashed, we don't need a pathWhitelist
-	manifest.PathWhitelist = nil
-
-	return manifest
-}
-
-// striplayerID strips the layer ID from an app name:
-//
-// myregistry.com/organization/app-name-85738f8f9a7f1b04b5329c590ebcb9e425925c6d0984089c43a022de4f19c281
-// myregistry.com/organization/app-name
-func stripLayerID(layerName string) string {
-	n := strings.LastIndex(layerName, "-")
-	return layerName[:n]
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/file/file.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/file/file.go
deleted file mode 100644
index a83402dfcd..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/file/file.go
+++ /dev/null
@@ -1,332 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package file is an implementation of Docker2ACIBackend for files saved via
-// "docker save".
-//
-// Note: this package is an implementation detail and shouldn't be used outside
-// of docker2aci.
-package file
-
-import (
-	"archive/tar"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-
-	"github.com/appc/docker2aci/lib/common"
-	"github.com/appc/docker2aci/lib/internal"
-	"github.com/appc/docker2aci/lib/internal/docker"
-	"github.com/appc/docker2aci/lib/internal/tarball"
-	"github.com/appc/docker2aci/lib/internal/types"
-	"github.com/appc/docker2aci/pkg/log"
-	"github.com/appc/spec/schema"
-)
-
-type FileBackend struct {
-	file *os.File
-}
-
-func NewFileBackend(file *os.File) *FileBackend {
-	return &FileBackend{
-		file: file,
-	}
-}
-
-func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *types.ParsedDockerURL, error) {
-	parsedDockerURL, err := docker.ParseDockerURL(dockerURL)
-	if err != nil {
-		// a missing Docker URL could mean that the file only contains one
-		// image, so we ignore the error here, we'll handle it in getImageID
-	}
-
-	appImageID, parsedDockerURL, err := getImageID(lb.file, parsedDockerURL)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	ancestry, err := getAncestry(lb.file, appImageID)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error getting ancestry: %v", err)
-	}
-
-	return ancestry, parsedDockerURL, nil
-}
-
-func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
-	var aciLayerPaths []string
-	var aciManifests []*schema.ImageManifest
-	var curPwl []string
-	for i := len(layerIDs) - 1; i >= 0; i-- {
-		tmpDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
-		if err != nil {
-			return nil, nil, fmt.Errorf("error creating dir: %v", err)
-		}
-		defer os.RemoveAll(tmpDir)
-
-		j, err := getJson(lb.file, layerIDs[i])
-		if err != nil {
-			return nil, nil, fmt.Errorf("error getting image json: %v", err)
-		}
-
-		layerData := types.DockerImageData{}
-		if err := json.Unmarshal(j, &layerData); err != nil {
-			return nil, nil, fmt.Errorf("error unmarshaling layer data: %v", err)
-		}
-
-		tmpLayerPath := path.Join(tmpDir, layerIDs[i])
-		tmpLayerPath += ".tar"
-
-		layerFile, err := extractEmbeddedLayer(lb.file, layerIDs[i], tmpLayerPath)
-		if err != nil {
-			return nil, nil, fmt.Errorf("error getting layer from file: %v", err)
-		}
-		defer layerFile.Close()
-
-		log.Debug("Generating layer ACI...")
-		aciPath, manifest, err := internal.GenerateACI(i, layerData, dockerURL, outputDir, layerFile, curPwl, compression)
-		if err != nil {
-			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
-		}
-
-		aciLayerPaths = append(aciLayerPaths, aciPath)
-		aciManifests = append(aciManifests, manifest)
-		curPwl = manifest.PathWhitelist
-	}
-
-	return aciLayerPaths, aciManifests, nil
-}
-
-func getImageID(file *os.File, dockerURL *types.ParsedDockerURL) (string, *types.ParsedDockerURL, error) {
-	type tags map[string]string
-	type apps map[string]tags
-
-	_, err := file.Seek(0, 0)
-	if err != nil {
-		return "", nil, fmt.Errorf("error seeking file: %v", err)
-	}
-
-	var imageID string
-	var appName string
-	reposWalker := func(t *tarball.TarFile) error {
-		if filepath.Clean(t.Name()) == "repositories" {
-			repob, err := ioutil.ReadAll(t.TarStream)
-			if err != nil {
-				return fmt.Errorf("error reading repositories file: %v", err)
-			}
-
-			var repositories apps
-			if err := json.Unmarshal(repob, &repositories); err != nil {
-				return fmt.Errorf("error unmarshaling repositories file")
-			}
-
-			if dockerURL == nil {
-				n := len(repositories)
-				switch {
-				case n == 1:
-					for key, _ := range repositories {
-						appName = key
-					}
-				case n > 1:
-					var appNames []string
-					for key, _ := range repositories {
-						appNames = append(appNames, key)
-					}
-					return &common.ErrSeveralImages{
-						Msg:    "several images found",
-						Images: appNames,
-					}
-				default:
-					return fmt.Errorf("no images found")
-				}
-			} else {
-				appName = dockerURL.ImageName
-			}
-
-			tag := "latest"
-			if dockerURL != nil {
-				tag = dockerURL.Tag
-			}
-
-			app, ok := repositories[appName]
-			if !ok {
-				return fmt.Errorf("app %q not found", appName)
-			}
-
-			_, ok = app[tag]
-			if !ok {
-				if len(app) == 1 {
-					for key, _ := range app {
-						tag = key
-					}
-				} else {
-					return fmt.Errorf("tag %q not found", tag)
-				}
-			}
-
-			if dockerURL == nil {
-				dockerURL = &types.ParsedDockerURL{
-					IndexURL:  "",
-					Tag:       tag,
-					ImageName: appName,
-				}
-			}
-
-			imageID = string(app[tag])
-		}
-
-		return nil
-	}
-
-	tr := tar.NewReader(file)
-	if err := tarball.Walk(*tr, reposWalker); err != nil {
-		return "", nil, err
-	}
-
-	if imageID == "" {
-		return "", nil, fmt.Errorf("repositories file not found")
-	}
-
-	return imageID, dockerURL, nil
-}
-
-func getJson(file *os.File, layerID string) ([]byte, error) {
-	jsonPath := path.Join(layerID, "json")
-	return getTarFileBytes(file, jsonPath)
-}
-
-func getTarFileBytes(file *os.File, path string) ([]byte, error) {
-	_, err := file.Seek(0, 0)
-	if err != nil {
-		fmt.Errorf("error seeking file: %v", err)
-	}
-
-	var fileBytes []byte
-	fileWalker := func(t *tarball.TarFile) error {
-		if filepath.Clean(t.Name()) == path {
-			fileBytes, err = ioutil.ReadAll(t.TarStream)
-			if err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}
-
-	tr := tar.NewReader(file)
-	if err := tarball.Walk(*tr, fileWalker); err != nil {
-		return nil, err
-	}
-
-	if fileBytes == nil {
-		return nil, fmt.Errorf("file %q not found", path)
-	}
-
-	return fileBytes, nil
-}
-
-func extractEmbeddedLayer(file *os.File, layerID string, outputPath string) (*os.File, error) {
-	log.Info("Extracting ", layerID[:12], "\n")
-
-	_, err := file.Seek(0, 0)
-	if err != nil {
-		fmt.Errorf("error seeking file: %v", err)
-	}
-
-	layerTarPath := path.Join(layerID, "layer.tar")
-
-	var layerFile *os.File
-	fileWalker := func(t *tarball.TarFile) error {
-		if filepath.Clean(t.Name()) == layerTarPath {
-			layerFile, err = os.Create(outputPath)
-			if err != nil {
-				return fmt.Errorf("error creating layer: %v", err)
-			}
-
-			_, err = io.Copy(layerFile, t.TarStream)
-			if err != nil {
-				return fmt.Errorf("error getting layer: %v", err)
-			}
-		}
-
-		return nil
-	}
-
-	tr := tar.NewReader(file)
-	if err := tarball.Walk(*tr, fileWalker); err != nil {
-		return nil, err
-	}
-
-	if layerFile == nil {
-		return nil, fmt.Errorf("file %q not found", layerTarPath)
-	}
-
-	return layerFile, nil
-}
-
-func getAncestry(file *os.File, imgID string) ([]string, error) {
-	var ancestry []string
-
-	curImgID := imgID
-
-	var err error
-	for curImgID != "" {
-		ancestry = append(ancestry, curImgID)
-		curImgID, err = getParent(file, curImgID)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return ancestry, nil
-}
-
-func getParent(file *os.File, imgID string) (string, error) {
-	var parent string
-
-	_, err := file.Seek(0, 0)
-	if err != nil {
-		return "", fmt.Errorf("error seeking file: %v", err)
-	}
-
-	jsonPath := filepath.Join(imgID, "json")
-	parentWalker := func(t *tarball.TarFile) error {
-		if filepath.Clean(t.Name()) == jsonPath {
-			jsonb, err := ioutil.ReadAll(t.TarStream)
-			if err != nil {
-				return fmt.Errorf("error reading layer json: %v", err)
-			}
-
-			var dockerData types.DockerImageData
-			if err := json.Unmarshal(jsonb, &dockerData); err != nil {
-				return fmt.Errorf("error unmarshaling layer data: %v", err)
-			}
-
-			parent = dockerData.Parent
-		}
-
-		return nil
-	}
-
-	tr := tar.NewReader(file)
-	if err := tarball.Walk(*tr, parentWalker); err != nil {
-		return "", err
-	}
-
-	return parent, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
deleted file mode 100644
index 57533857a1..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package repository is an implementation of Docker2ACIBackend for Docker
-// remote registries.
-//
-// Note: this package is an implementation detail and shouldn't be used outside
-// of docker2aci.
-package repository
-
-import (
-	"fmt"
-	"net/http"
-	"path"
-
-	"github.com/appc/docker2aci/lib/common"
-	"github.com/appc/docker2aci/lib/internal/docker"
-	"github.com/appc/docker2aci/lib/internal/types"
-	"github.com/appc/docker2aci/lib/internal/util"
-	"github.com/appc/spec/schema"
-)
-
-type registryVersion int
-
-const (
-	registryV1 registryVersion = iota
-	registryV2
-)
-
-type RepositoryBackend struct {
-	repoData          *RepoData
-	username          string
-	password          string
-	insecure          common.InsecureConfig
-	hostsV2Support    map[string]bool
-	hostsV2AuthTokens map[string]map[string]string
-	schema            string
-	imageManifests    map[types.ParsedDockerURL]v2Manifest
-}
-
-func NewRepositoryBackend(username string, password string, insecure common.InsecureConfig) *RepositoryBackend {
-	return &RepositoryBackend{
-		username:          username,
-		password:          password,
-		insecure:          insecure,
-		hostsV2Support:    make(map[string]bool),
-		hostsV2AuthTokens: make(map[string]map[string]string),
-		imageManifests:    make(map[types.ParsedDockerURL]v2Manifest),
-	}
-}
-
-func (rb *RepositoryBackend) GetImageInfo(url string) ([]string, *types.ParsedDockerURL, error) {
-	dockerURL, err := docker.ParseDockerURL(url)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var supportsV2, ok bool
-	var URLSchema string
-	if supportsV2, ok = rb.hostsV2Support[dockerURL.IndexURL]; !ok {
-		var err error
-		URLSchema, supportsV2, err = rb.supportsRegistry(dockerURL.IndexURL, registryV2)
-		if err != nil {
-			return nil, nil, err
-		}
-		rb.schema = URLSchema + "://"
-		rb.hostsV2Support[dockerURL.IndexURL] = supportsV2
-	}
-
-	if supportsV2 {
-		return rb.getImageInfoV2(dockerURL)
-	} else {
-		URLSchema, supportsV1, err := rb.supportsRegistry(dockerURL.IndexURL, registryV1)
-		if err != nil {
-			return nil, nil, err
-		}
-		if !supportsV1 {
-			return nil, nil, fmt.Errorf("registry doesn't support API v2 nor v1")
-		}
-		rb.schema = URLSchema + "://"
-		return rb.getImageInfoV1(dockerURL)
-	}
-}
-
-func (rb *RepositoryBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
-	if rb.hostsV2Support[dockerURL.IndexURL] {
-		return rb.buildACIV2(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
-	} else {
-		return rb.buildACIV1(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
-	}
-}
-
-func checkRegistryStatus(statusCode int, hdr http.Header, version registryVersion) (bool, error) {
-	switch statusCode {
-	case http.StatusOK, http.StatusUnauthorized:
-		ok := true
-		if version == registryV2 {
-			// v2 API requires this check
-			ok = hdr.Get("Docker-Distribution-API-Version") == "registry/2.0"
-		}
-		return ok, nil
-	case http.StatusNotFound:
-		return false, nil
-	}
-
-	return false, fmt.Errorf("unexpected http code: %d", statusCode)
-}
-
-func (rb *RepositoryBackend) supportsRegistry(indexURL string, version registryVersion) (schema string, ok bool, err error) {
-	var URLPath string
-	switch version {
-	case registryV1:
-		// the v1 API defines this URL to check if the registry's status
-		URLPath = "v1/_ping"
-	case registryV2:
-		URLPath = "v2"
-	}
-	URLStr := path.Join(indexURL, URLPath)
-
-	fetch := func(schema string) (res *http.Response, err error) {
-		url := schema + "://" + URLStr
-		req, err := http.NewRequest("GET", url, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		rb.setBasicAuth(req)
-
-		client := util.GetTLSClient(rb.insecure.SkipVerify)
-		res, err = client.Do(req)
-		return
-	}
-
-	schema = "https"
-	res, err := fetch(schema)
-	if err == nil {
-		ok, err = checkRegistryStatus(res.StatusCode, res.Header, version)
-		defer res.Body.Close()
-	}
-	if err != nil || !ok {
-		if rb.insecure.AllowHTTP {
-			schema = "http"
-			res, err = fetch(schema)
-			if err == nil {
-				ok, err = checkRegistryStatus(res.StatusCode, res.Header, version)
-				defer res.Body.Close()
-			}
-		}
-		return schema, ok, err
-	}
-
-	return schema, ok, err
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
deleted file mode 100644
index bc54e47c7b..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
+++ /dev/null
@@ -1,391 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package repository
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/appc/docker2aci/lib/common"
-	"github.com/appc/docker2aci/lib/internal"
-	"github.com/appc/docker2aci/lib/internal/types"
-	"github.com/appc/docker2aci/lib/internal/util"
-	"github.com/appc/docker2aci/pkg/log"
-	"github.com/appc/spec/schema"
-	"github.com/coreos/ioprogress"
-)
-
-type RepoData struct {
-	Tokens    []string
-	Endpoints []string
-	Cookie    []string
-}
-
-func (rb *RepositoryBackend) getImageInfoV1(dockerURL *types.ParsedDockerURL) ([]string, *types.ParsedDockerURL, error) {
-	repoData, err := rb.getRepoDataV1(dockerURL.IndexURL, dockerURL.ImageName)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error getting repository data: %v", err)
-	}
-
-	// TODO(iaguis) check more endpoints
-	appImageID, err := rb.getImageIDFromTagV1(repoData.Endpoints[0], dockerURL.ImageName, dockerURL.Tag, repoData)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error getting ImageID from tag %s: %v", dockerURL.Tag, err)
-	}
-
-	ancestry, err := rb.getAncestryV1(appImageID, repoData.Endpoints[0], repoData)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	rb.repoData = repoData
-
-	return ancestry, dockerURL, nil
-}
-
-func (rb *RepositoryBackend) buildACIV1(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
-	layerFiles := make([]*os.File, len(layerIDs))
-	layerDatas := make([]types.DockerImageData, len(layerIDs))
-
-	tmpParentDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
-	if err != nil {
-		return nil, nil, err
-	}
-	defer os.RemoveAll(tmpParentDir)
-
-	var doneChannels []chan error
-	for i, layerID := range layerIDs {
-		doneChan := make(chan error)
-		doneChannels = append(doneChannels, doneChan)
-		// https://github.com/golang/go/wiki/CommonMistakes
-		i := i // golang--
-		layerID := layerID
-		go func() {
-			tmpDir, err := ioutil.TempDir(tmpParentDir, "")
-			if err != nil {
-				doneChan <- fmt.Errorf("error creating dir: %v", err)
-				return
-			}
-
-			j, size, err := rb.getJsonV1(layerID, rb.repoData.Endpoints[0], rb.repoData)
-			if err != nil {
-				doneChan <- fmt.Errorf("error getting image json: %v", err)
-				return
-			}
-
-			layerDatas[i] = types.DockerImageData{}
-			if err := json.Unmarshal(j, &layerDatas[i]); err != nil {
-				doneChan <- fmt.Errorf("error unmarshaling layer data: %v", err)
-				return
-			}
-
-			layerFiles[i], err = rb.getLayerV1(layerID, rb.repoData.Endpoints[0], rb.repoData, size, tmpDir)
-			if err != nil {
-				doneChan <- fmt.Errorf("error getting the remote layer: %v", err)
-				return
-			}
-			doneChan <- nil
-		}()
-	}
-	for _, doneChan := range doneChannels {
-		err := <-doneChan
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-	var aciLayerPaths []string
-	var aciManifests []*schema.ImageManifest
-	var curPwl []string
-
-	for i := len(layerIDs) - 1; i >= 0; i-- {
-		log.Debug("Generating layer ACI...")
-		aciPath, manifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression)
-		if err != nil {
-			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
-		}
-		aciLayerPaths = append(aciLayerPaths, aciPath)
-		aciManifests = append(aciManifests, manifest)
-		curPwl = manifest.PathWhitelist
-
-		layerFiles[i].Close()
-	}
-
-	return aciLayerPaths, aciManifests, nil
-}
-
-func (rb *RepositoryBackend) getRepoDataV1(indexURL string, remote string) (*RepoData, error) {
-	client := util.GetTLSClient(rb.insecure.SkipVerify)
-	repositoryURL := rb.schema + path.Join(indexURL, "v1", "repositories", remote, "images")
-
-	req, err := http.NewRequest("GET", repositoryURL, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	if rb.username != "" && rb.password != "" {
-		req.SetBasicAuth(rb.username, rb.password)
-	}
-
-	req.Header.Set("X-Docker-Token", "true")
-
-	res, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != 200 {
-		return nil, fmt.Errorf("HTTP code: %d, URL: %s", res.StatusCode, req.URL)
-	}
-
-	var tokens []string
-	if res.Header.Get("X-Docker-Token") != "" {
-		tokens = res.Header["X-Docker-Token"]
-	}
-
-	var cookies []string
-	if res.Header.Get("Set-Cookie") != "" {
-		cookies = res.Header["Set-Cookie"]
-	}
-
-	var endpoints []string
-	if res.Header.Get("X-Docker-Endpoints") != "" {
-		endpoints = makeEndpointsListV1(res.Header["X-Docker-Endpoints"])
-	} else {
-		// Assume same endpoint
-		endpoints = append(endpoints, indexURL)
-	}
-
-	return &RepoData{
-		Endpoints: endpoints,
-		Tokens:    tokens,
-		Cookie:    cookies,
-	}, nil
-}
-
-func (rb *RepositoryBackend) getImageIDFromTagV1(registry string, appName string, tag string, repoData *RepoData) (string, error) {
-	client := util.GetTLSClient(rb.insecure.SkipVerify)
-	// we get all the tags instead of directly getting the imageID of the
-	// requested one (.../tags/TAG) because even though it's specified in the
-	// Docker API, some registries (e.g. Google Container Registry) don't
-	// implement it.
-	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "repositories", appName, "tags"), nil)
-	if err != nil {
-		return "", fmt.Errorf("failed to get Image ID: %s, URL: %s", err, req.URL)
-	}
-
-	setAuthTokenV1(req, repoData.Tokens)
-	setCookieV1(req, repoData.Cookie)
-	res, err := client.Do(req)
-	if err != nil {
-		return "", fmt.Errorf("failed to get Image ID: %s, URL: %s", err, req.URL)
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != 200 {
-		return "", fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
-	}
-
-	j, err := ioutil.ReadAll(res.Body)
-
-	if err != nil {
-		return "", err
-	}
-
-	var tags map[string]string
-
-	if err := json.Unmarshal(j, &tags); err != nil {
-		return "", fmt.Errorf("error unmarshaling: %v", err)
-	}
-
-	imageID, ok := tags[tag]
-	if !ok {
-		return "", fmt.Errorf("tag %s not found", tag)
-	}
-
-	return imageID, nil
-}
-
-func (rb *RepositoryBackend) getAncestryV1(imgID, registry string, repoData *RepoData) ([]string, error) {
-	client := util.GetTLSClient(rb.insecure.SkipVerify)
-	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "images", imgID, "ancestry"), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	setAuthTokenV1(req, repoData.Tokens)
-	setCookieV1(req, repoData.Cookie)
-	res, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != 200 {
-		return nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
-	}
-
-	var ancestry []string
-
-	j, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to read downloaded json: %s (%s)", err, j)
-	}
-
-	if err := json.Unmarshal(j, &ancestry); err != nil {
-		return nil, fmt.Errorf("error unmarshaling: %v", err)
-	}
-
-	return ancestry, nil
-}
-
-func (rb *RepositoryBackend) getJsonV1(imgID, registry string, repoData *RepoData) ([]byte, int64, error) {
-	client := util.GetTLSClient(rb.insecure.SkipVerify)
-	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "images", imgID, "json"), nil)
-	if err != nil {
-		return nil, -1, err
-	}
-	setAuthTokenV1(req, repoData.Tokens)
-	setCookieV1(req, repoData.Cookie)
-	res, err := client.Do(req)
-	if err != nil {
-		return nil, -1, err
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != 200 {
-		return nil, -1, fmt.Errorf("HTTP code: %d, URL: %s", res.StatusCode, req.URL)
-	}
-
-	imageSize := int64(-1)
-
-	if hdr := res.Header.Get("X-Docker-Size"); hdr != "" {
-		imageSize, err = strconv.ParseInt(hdr, 10, 64)
-		if err != nil {
-			return nil, -1, err
-		}
-	}
-
-	b, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, -1, fmt.Errorf("failed to read downloaded json: %v (%s)", err, b)
-	}
-
-	return b, imageSize, nil
-}
-
-func (rb *RepositoryBackend) getLayerV1(imgID, registry string, repoData *RepoData, imgSize int64, tmpDir string) (*os.File, error) {
-	client := util.GetTLSClient(rb.insecure.SkipVerify)
-	req, err := http.NewRequest("GET", rb.schema+path.Join(registry, "images", imgID, "layer"), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	setAuthTokenV1(req, repoData.Tokens)
-	setCookieV1(req, repoData.Cookie)
-
-	res, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != 200 {
-		res.Body.Close()
-		return nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
-	}
-
-	// if we didn't receive the size via X-Docker-Size when we retrieved the
-	// layer's json, try Content-Length
-	if imgSize == -1 {
-		if hdr := res.Header.Get("Content-Length"); hdr != "" {
-			imgSize, err = strconv.ParseInt(hdr, 10, 64)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	prefix := "Downloading " + imgID[:12]
-	fmtBytesSize := 18
-	barSize := int64(80 - len(prefix) - fmtBytesSize)
-	bar := ioprogress.DrawTextFormatBarForW(barSize, os.Stderr)
-	fmtfunc := func(progress, total int64) string {
-		return fmt.Sprintf(
-			"%s: %s %s",
-			prefix,
-			bar(progress, total),
-			ioprogress.DrawTextFormatBytes(progress, total),
-		)
-	}
-
-	progressReader := &ioprogress.Reader{
-		Reader:       res.Body,
-		Size:         imgSize,
-		DrawFunc:     ioprogress.DrawTerminalf(os.Stderr, fmtfunc),
-		DrawInterval: 500 * time.Millisecond,
-	}
-
-	layerFile, err := ioutil.TempFile(tmpDir, "dockerlayer-")
-	if err != nil {
-		return nil, err
-	}
-
-	_, err = io.Copy(layerFile, progressReader)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := layerFile.Sync(); err != nil {
-		return nil, err
-	}
-
-	return layerFile, nil
-}
-
-func setAuthTokenV1(req *http.Request, token []string) {
-	if req.Header.Get("Authorization") == "" {
-		req.Header.Set("Authorization", "Token "+strings.Join(token, ","))
-	}
-}
-
-func setCookieV1(req *http.Request, cookie []string) {
-	if req.Header.Get("Cookie") == "" {
-		req.Header.Set("Cookie", strings.Join(cookie, ""))
-	}
-}
-
-func makeEndpointsListV1(headers []string) []string {
-	var endpoints []string
-
-	for _, ep := range headers {
-		endpointsList := strings.Split(ep, ",")
-		for _, endpointEl := range endpointsList {
-			endpoints = append(
-				endpoints,
-				path.Join(strings.TrimSpace(endpointEl), "v1"))
-		}
-	}
-
-	return endpoints
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
deleted file mode 100644
index 356d6f9bee..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ /dev/null
@@ -1,466 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package repository
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path"
-	"regexp"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/appc/docker2aci/lib/common"
-	"github.com/appc/docker2aci/lib/internal"
-	"github.com/appc/docker2aci/lib/internal/types"
-	"github.com/appc/docker2aci/lib/internal/util"
-	"github.com/appc/docker2aci/pkg/log"
-	"github.com/appc/spec/schema"
-	"github.com/coreos/pkg/progressutil"
-)
-
-const (
-	defaultIndexURL = "registry-1.docker.io"
-)
-
-var validHex = regexp.MustCompile(`^([a-f0-9]{64})$`)
-
-type v2Manifest struct {
-	Name     string `json:"name"`
-	Tag      string `json:"tag"`
-	FSLayers []struct {
-		BlobSum string `json:"blobSum"`
-	} `json:"fsLayers"`
-	History []struct {
-		V1Compatibility string `json:"v1Compatibility"`
-	} `json:"history"`
-	Signature []byte `json:"signature"`
-}
-
-func (rb *RepositoryBackend) getImageInfoV2(dockerURL *types.ParsedDockerURL) ([]string, *types.ParsedDockerURL, error) {
-	manifest, layers, err := rb.getManifestV2(dockerURL)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	rb.imageManifests[*dockerURL] = *manifest
-
-	return layers, dockerURL, nil
-}
-
-func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
-	layerFiles := make([]*os.File, len(layerIDs))
-	layerDatas := make([]types.DockerImageData, len(layerIDs))
-
-	tmpParentDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
-	if err != nil {
-		return nil, nil, err
-	}
-	defer os.RemoveAll(tmpParentDir)
-
-	copier := progressutil.NewCopyProgressPrinter()
-
-	var errChannels []chan error
-	closers := make([]io.ReadCloser, len(layerIDs))
-	var wg sync.WaitGroup
-	for i, layerID := range layerIDs {
-		wg.Add(1)
-		errChan := make(chan error, 1)
-		errChannels = append(errChannels, errChan)
-		// https://github.com/golang/go/wiki/CommonMistakes
-		i := i // golang--
-		layerID := layerID
-		go func() {
-			defer wg.Done()
-
-			manifest := rb.imageManifests[*dockerURL]
-
-			layerIndex, err := getLayerIndex(layerID, manifest)
-			if err != nil {
-				errChan <- err
-				return
-			}
-
-			if len(manifest.History) <= layerIndex {
-				errChan <- fmt.Errorf("history not found for layer %s", layerID)
-				return
-			}
-
-			layerDatas[i] = types.DockerImageData{}
-			if err := json.Unmarshal([]byte(manifest.History[layerIndex].V1Compatibility), &layerDatas[i]); err != nil {
-				errChan <- fmt.Errorf("error unmarshaling layer data: %v", err)
-				return
-			}
-
-			tmpDir, err := ioutil.TempDir(tmpParentDir, "")
-			if err != nil {
-				errChan <- fmt.Errorf("error creating dir: %v", err)
-				return
-			}
-
-			layerFiles[i], closers[i], err = rb.getLayerV2(layerID, dockerURL, tmpDir, copier)
-			if err != nil {
-				errChan <- fmt.Errorf("error getting the remote layer: %v", err)
-				return
-			}
-			errChan <- nil
-		}()
-	}
-	// Need to wait for all of the readers to be added to the copier (which happens during rb.getLayerV2)
-	wg.Wait()
-	err = copier.PrintAndWait(os.Stderr, 500*time.Millisecond, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	for _, closer := range closers {
-		if closer != nil {
-			closer.Close()
-		}
-	}
-	for _, errChan := range errChannels {
-		err := <-errChan
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-	for _, layerFile := range layerFiles {
-		err := layerFile.Sync()
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-	var aciLayerPaths []string
-	var aciManifests []*schema.ImageManifest
-	var curPwl []string
-	for i := len(layerIDs) - 1; i >= 0; i-- {
-		log.Debug("Generating layer ACI...")
-		aciPath, aciManifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression)
-		if err != nil {
-			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
-		}
-		aciLayerPaths = append(aciLayerPaths, aciPath)
-		aciManifests = append(aciManifests, aciManifest)
-		curPwl = aciManifest.PathWhitelist
-
-		layerFiles[i].Close()
-	}
-
-	return aciLayerPaths, aciManifests, nil
-}
-
-func (rb *RepositoryBackend) getManifestV2(dockerURL *types.ParsedDockerURL) (*v2Manifest, []string, error) {
-	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "manifests", dockerURL.Tag)
-
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	rb.setBasicAuth(req)
-
-	res, err := rb.makeRequest(req, dockerURL.ImageName)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != http.StatusOK {
-		return nil, nil, fmt.Errorf("unexpected http code: %d, URL: %s", res.StatusCode, req.URL)
-	}
-
-	manblob, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	manifest := &v2Manifest{}
-
-	err = json.Unmarshal(manblob, manifest)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if manifest.Name != dockerURL.ImageName {
-		return nil, nil, fmt.Errorf("name doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.ImageName, manifest.Name)
-	}
-
-	if manifest.Tag != dockerURL.Tag {
-		return nil, nil, fmt.Errorf("tag doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.Tag, manifest.Tag)
-	}
-
-	if err := fixManifestLayers(manifest); err != nil {
-		return nil, nil, err
-	}
-
-	//TODO: verify signature here
-
-	layers := make([]string, len(manifest.FSLayers))
-
-	for i, layer := range manifest.FSLayers {
-		layers[i] = layer.BlobSum
-	}
-
-	return manifest, layers, nil
-}
-
-func fixManifestLayers(manifest *v2Manifest) error {
-	type imageV1 struct {
-		ID     string
-		Parent string
-	}
-	imgs := make([]*imageV1, len(manifest.FSLayers))
-	for i := range manifest.FSLayers {
-		img := &imageV1{}
-
-		if err := json.Unmarshal([]byte(manifest.History[i].V1Compatibility), img); err != nil {
-			return err
-		}
-
-		imgs[i] = img
-		if err := validateV1ID(img.ID); err != nil {
-			return err
-		}
-	}
-
-	if imgs[len(imgs)-1].Parent != "" {
-		return errors.New("Invalid parent ID in the base layer of the image.")
-	}
-
-	// check general duplicates to error instead of a deadlock
-	idmap := make(map[string]struct{})
-
-	var lastID string
-	for _, img := range imgs {
-		// skip IDs that appear after each other, we handle those later
-		if _, exists := idmap[img.ID]; img.ID != lastID && exists {
-			return fmt.Errorf("ID %+v appears multiple times in manifest", img.ID)
-		}
-		lastID = img.ID
-		idmap[lastID] = struct{}{}
-	}
-
-	// backwards loop so that we keep the remaining indexes after removing items
-	for i := len(imgs) - 2; i >= 0; i-- {
-		if imgs[i].ID == imgs[i+1].ID { // repeated ID. remove and continue
-			manifest.FSLayers = append(manifest.FSLayers[:i], manifest.FSLayers[i+1:]...)
-			manifest.History = append(manifest.History[:i], manifest.History[i+1:]...)
-		} else if imgs[i].Parent != imgs[i+1].ID {
-			return fmt.Errorf("Invalid parent ID. Expected %v, got %v.", imgs[i+1].ID, imgs[i].Parent)
-		}
-	}
-
-	return nil
-}
-
-func validateV1ID(id string) error {
-	if ok := validHex.MatchString(id); !ok {
-		return fmt.Errorf("image ID %q is invalid", id)
-	}
-	return nil
-}
-
-func getLayerIndex(layerID string, manifest v2Manifest) (int, error) {
-	for i, layer := range manifest.FSLayers {
-		if layer.BlobSum == layerID {
-			return i, nil
-		}
-	}
-	return -1, fmt.Errorf("layer not found in manifest: %s", layerID)
-}
-
-func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedDockerURL, tmpDir string, copier *progressutil.CopyProgressPrinter) (*os.File, io.ReadCloser, error) {
-	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "blobs", layerID)
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	rb.setBasicAuth(req)
-
-	res, err := rb.makeRequest(req, dockerURL.ImageName)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if res.StatusCode == http.StatusTemporaryRedirect || res.StatusCode == http.StatusFound {
-		location := res.Header.Get("Location")
-		if location != "" {
-			req, err = http.NewRequest("GET", location, nil)
-			if err != nil {
-				return nil, nil, err
-			}
-			res, err = rb.makeRequest(req, dockerURL.ImageName)
-			if err != nil {
-				return nil, nil, err
-			}
-			defer res.Body.Close()
-		}
-	}
-
-	if res.StatusCode != http.StatusOK {
-		return nil, nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
-	}
-
-	var in io.Reader
-	in = res.Body
-
-	var size int64
-
-	if hdr := res.Header.Get("Content-Length"); hdr != "" {
-		size, err = strconv.ParseInt(hdr, 10, 64)
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	name := "Downloading " + layerID[:18]
-
-	layerFile, err := ioutil.TempFile(tmpDir, "dockerlayer-")
-	if err != nil {
-		return nil, nil, err
-	}
-
-	err = copier.AddCopy(in, name, size, layerFile)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return layerFile, res.Body, nil
-}
-
-func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string) (*http.Response, error) {
-	setBearerHeader := false
-	hostAuthTokens, ok := rb.hostsV2AuthTokens[req.URL.Host]
-	if ok {
-		authToken, ok := hostAuthTokens[repo]
-		if ok {
-			req.Header.Set("Authorization", "Bearer "+authToken)
-			setBearerHeader = true
-		}
-	}
-
-	client := util.GetTLSClient(rb.insecure.SkipVerify)
-	res, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-
-	if res.StatusCode == http.StatusUnauthorized && setBearerHeader {
-		return res, err
-	}
-
-	hdr := res.Header.Get("www-authenticate")
-	if res.StatusCode != http.StatusUnauthorized || hdr == "" {
-		return res, err
-	}
-
-	tokens := strings.Split(hdr, ",")
-	if len(tokens) != 3 ||
-		!strings.HasPrefix(strings.ToLower(tokens[0]), "bearer realm") {
-		return res, err
-	}
-	res.Body.Close()
-
-	var realm, service, scope string
-	for _, token := range tokens {
-		if strings.HasPrefix(strings.ToLower(token), "bearer realm") {
-			realm = strings.Trim(token[len("bearer realm="):], "\"")
-		}
-		if strings.HasPrefix(token, "service") {
-			service = strings.Trim(token[len("service="):], "\"")
-		}
-		if strings.HasPrefix(token, "scope") {
-			scope = strings.Trim(token[len("scope="):], "\"")
-		}
-	}
-
-	if realm == "" {
-		return nil, fmt.Errorf("missing realm in bearer auth challenge")
-	}
-	if service == "" {
-		return nil, fmt.Errorf("missing service in bearer auth challenge")
-	}
-	// The scope can be empty if we're not getting a token for a specific repo
-	if scope == "" && repo != "" {
-		// If the scope is empty and it shouldn't be, we can infer it based on the repo
-		scope = fmt.Sprintf("repository:%s:pull", repo)
-	}
-
-	authReq, err := http.NewRequest("GET", realm, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	getParams := authReq.URL.Query()
-	getParams.Add("service", service)
-	if scope != "" {
-		getParams.Add("scope", scope)
-	}
-	authReq.URL.RawQuery = getParams.Encode()
-
-	rb.setBasicAuth(authReq)
-
-	res, err = client.Do(authReq)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	switch res.StatusCode {
-	case http.StatusUnauthorized:
-		return nil, fmt.Errorf("unable to retrieve auth token: 401 unauthorized")
-	case http.StatusOK:
-		break
-	default:
-		return nil, fmt.Errorf("unexpected http code: %d, URL: %s", res.StatusCode, authReq.URL)
-	}
-
-	tokenBlob, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	tokenStruct := struct {
-		Token string `json:"token"`
-	}{}
-
-	err = json.Unmarshal(tokenBlob, &tokenStruct)
-	if err != nil {
-		return nil, err
-	}
-
-	hostAuthTokens, ok = rb.hostsV2AuthTokens[req.URL.Host]
-	if !ok {
-		hostAuthTokens = make(map[string]string)
-		rb.hostsV2AuthTokens[req.URL.Host] = hostAuthTokens
-	}
-
-	hostAuthTokens[repo] = tokenStruct.Token
-
-	return rb.makeRequest(req, repo)
-}
-
-func (rb *RepositoryBackend) setBasicAuth(req *http.Request) {
-	if rb.username != "" && rb.password != "" {
-		req.SetBasicAuth(rb.username, rb.password)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
deleted file mode 100644
index 70bca8e476..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package docker
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"runtime"
-	"strings"
-
-	"github.com/appc/docker2aci/lib/internal/types"
-
-	"github.com/docker/distribution/reference"
-)
-
-const (
-	dockercfgFileName    = "config.json"
-	dockercfgFileNameOld = ".dockercfg"
-	defaultIndexURL      = "registry-1.docker.io"
-	defaultIndexURLAuth  = "https://index.docker.io/v1/"
-	defaultTag           = "latest"
-	defaultRepoPrefix    = "library/"
-)
-
-// SplitReposName breaks a repo name into an index name and remote name.
-func SplitReposName(name string) (indexName, remoteName string) {
-	i := strings.IndexRune(name, '/')
-	if i == -1 || (!strings.ContainsAny(name[:i], ".:") && name[:i] != "localhost") {
-		indexName, remoteName = defaultIndexURL, name
-	} else {
-		indexName, remoteName = name[:i], name[i+1:]
-	}
-	if indexName == defaultIndexURL && !strings.ContainsRune(remoteName, '/') {
-		remoteName = defaultRepoPrefix + remoteName
-	}
-	return
-}
-
-// Get a repos name and returns the right reposName + tag
-// The tag can be confusing because of a port in a repository name.
-//     Ex: localhost.localdomain:5000/samalba/hipache:latest
-func parseRepositoryTag(repos string) (string, string) {
-	n := strings.LastIndex(repos, ":")
-	if n < 0 {
-		return repos, ""
-	}
-	if tag := repos[n+1:]; !strings.Contains(tag, "/") {
-		return repos[:n], tag
-	}
-	return repos, ""
-}
-
-func decodeDockerAuth(s string) (string, string, error) {
-	decoded, err := base64.StdEncoding.DecodeString(s)
-	if err != nil {
-		return "", "", err
-	}
-	parts := strings.SplitN(string(decoded), ":", 2)
-	if len(parts) != 2 {
-		return "", "", fmt.Errorf("invalid auth configuration file")
-	}
-	user := parts[0]
-	password := strings.Trim(parts[1], "\x00")
-	return user, password, nil
-}
-
-func getHomeDir() string {
-	if runtime.GOOS == "windows" {
-		return os.Getenv("USERPROFILE")
-	}
-	return os.Getenv("HOME")
-}
-
-// GetDockercfgAuth reads a ~/.dockercfg file and returns the username and password
-// of the given docker index server.
-func GetAuthInfo(indexServer string) (string, string, error) {
-	// official docker registry
-	if indexServer == defaultIndexURL {
-		indexServer = defaultIndexURLAuth
-	}
-	dockerCfgPath := path.Join(getHomeDir(), ".docker", dockercfgFileName)
-	if _, err := os.Stat(dockerCfgPath); err == nil {
-		j, err := ioutil.ReadFile(dockerCfgPath)
-		if err != nil {
-			return "", "", err
-		}
-		var dockerAuth types.DockerConfigFile
-		if err := json.Unmarshal(j, &dockerAuth); err != nil {
-			return "", "", err
-		}
-		// try the normal case
-		if c, ok := dockerAuth.AuthConfigs[indexServer]; ok {
-			return decodeDockerAuth(c.Auth)
-		}
-	} else if os.IsNotExist(err) {
-		oldDockerCfgPath := path.Join(getHomeDir(), dockercfgFileNameOld)
-		if _, err := os.Stat(oldDockerCfgPath); err != nil {
-			return "", "", nil //missing file is not an error
-		}
-		j, err := ioutil.ReadFile(oldDockerCfgPath)
-		if err != nil {
-			return "", "", err
-		}
-		var dockerAuthOld map[string]types.DockerAuthConfigOld
-		if err := json.Unmarshal(j, &dockerAuthOld); err != nil {
-			return "", "", err
-		}
-		if c, ok := dockerAuthOld[indexServer]; ok {
-			return decodeDockerAuth(c.Auth)
-		}
-	} else {
-		// if file is there but we can't stat it for any reason other
-		// than it doesn't exist then stop
-		return "", "", fmt.Errorf("%s - %v", dockerCfgPath, err)
-	}
-	return "", "", nil
-}
-
-// ParseDockerURL takes a Docker URL and returns a ParsedDockerURL with its
-// index URL, image name, and tag.
-func ParseDockerURL(arg string) (*types.ParsedDockerURL, error) {
-	r, err := reference.ParseNamed(arg)
-	if err != nil {
-		return nil, err
-	}
-
-	tag := defaultTag
-	var digest string
-	switch x := r.(type) {
-	case reference.Canonical:
-		digest = x.Digest().String()
-	case reference.NamedTagged:
-		tag = x.Tag()
-	}
-
-	indexURL, remoteName := SplitReposName(r.Name())
-
-	p := &types.ParsedDockerURL{
-		IndexURL:  indexURL,
-		ImageName: remoteName,
-		Tag:       tag,
-		Digest:    digest,
-	}
-	return p, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/internal.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/internal.go
deleted file mode 100644
index 29cd8c87e4..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/internal.go
+++ /dev/null
@@ -1,591 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package internal provides functions shared by different parts of docker2aci.
-//
-// Note: this package is an implementation detail and shouldn't be used outside
-// of docker2aci.
-package internal
-
-import (
-	"archive/tar"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/appc/docker2aci/lib/common"
-	"github.com/appc/docker2aci/lib/internal/tarball"
-	"github.com/appc/docker2aci/lib/internal/types"
-	"github.com/appc/docker2aci/lib/internal/util"
-	"github.com/appc/docker2aci/pkg/log"
-	"github.com/appc/spec/aci"
-	"github.com/appc/spec/schema"
-	appctypes "github.com/appc/spec/schema/types"
-	gzip "github.com/klauspost/pgzip"
-)
-
-// Docker2ACIBackend is the interface that abstracts converting Docker layers
-// to ACI from where they're stored (remote or file).
-//
-// GetImageInfo takes a Docker URL and returns a list of layers and the parsed
-// Docker URL.
-//
-// BuildACI takes a Docker layer, converts it to ACI and returns its output
-// path and its converted ImageManifest.
-type Docker2ACIBackend interface {
-	GetImageInfo(dockerUrl string) ([]string, *types.ParsedDockerURL, error)
-	BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error)
-}
-
-// GenerateACI takes a Docker layer and generates an ACI from it.
-func GenerateACI(layerNumber int, layerData types.DockerImageData, dockerURL *types.ParsedDockerURL, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
-	manifest, err := GenerateManifest(layerData, dockerURL)
-	if err != nil {
-		return "", nil, fmt.Errorf("error generating the manifest: %v", err)
-	}
-
-	imageName := strings.Replace(dockerURL.ImageName, "/", "-", -1)
-	aciPath := imageName + "-" + layerData.ID
-	if dockerURL.Tag != "" {
-		aciPath += "-" + dockerURL.Tag
-	}
-	if layerData.OS != "" {
-		aciPath += "-" + layerData.OS
-		if layerData.Architecture != "" {
-			aciPath += "-" + layerData.Architecture
-		}
-	}
-	aciPath += "-" + strconv.Itoa(layerNumber)
-	aciPath += ".aci"
-
-	aciPath = path.Join(outputDir, aciPath)
-	manifest, err = writeACI(layerFile, *manifest, curPwl, aciPath, compression)
-	if err != nil {
-		return "", nil, fmt.Errorf("error writing ACI: %v", err)
-	}
-
-	if err := ValidateACI(aciPath); err != nil {
-		return "", nil, fmt.Errorf("invalid ACI generated: %v", err)
-	}
-
-	return aciPath, manifest, nil
-}
-
-// ValidateACI checks whether the ACI in aciPath is valid.
-func ValidateACI(aciPath string) error {
-	aciFile, err := os.Open(aciPath)
-	if err != nil {
-		return err
-	}
-	defer aciFile.Close()
-
-	tr, err := aci.NewCompressedTarReader(aciFile)
-	if err != nil {
-		return err
-	}
-	defer tr.Close()
-
-	if err := aci.ValidateArchive(tr.Reader); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// GenerateManifest converts the docker manifest format to an appc
-// ImageManifest.
-func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDockerURL) (*schema.ImageManifest, error) {
-	dockerConfig := layerData.Config
-	genManifest := &schema.ImageManifest{}
-
-	appURL := ""
-	appURL = dockerURL.IndexURL + "/"
-	appURL += dockerURL.ImageName + "-" + layerData.ID
-	appURL, err := appctypes.SanitizeACIdentifier(appURL)
-	if err != nil {
-		return nil, err
-	}
-	name := appctypes.MustACIdentifier(appURL)
-	genManifest.Name = *name
-
-	acVersion, err := appctypes.NewSemVer(schema.AppContainerVersion.String())
-	if err != nil {
-		panic("invalid appc spec version")
-	}
-	genManifest.ACVersion = *acVersion
-
-	genManifest.ACKind = appctypes.ACKind(schema.ImageManifestKind)
-
-	var (
-		labels       appctypes.Labels
-		parentLabels appctypes.Labels
-		annotations  appctypes.Annotations
-	)
-
-	layer := appctypes.MustACIdentifier("layer")
-	labels = append(labels, appctypes.Label{Name: *layer, Value: layerData.ID})
-
-	tag := dockerURL.Tag
-	version := appctypes.MustACIdentifier("version")
-	labels = append(labels, appctypes.Label{Name: *version, Value: tag})
-
-	if layerData.OS != "" {
-		os := appctypes.MustACIdentifier("os")
-		labels = append(labels, appctypes.Label{Name: *os, Value: layerData.OS})
-		parentLabels = append(parentLabels, appctypes.Label{Name: *os, Value: layerData.OS})
-
-		if layerData.Architecture != "" {
-			arch := appctypes.MustACIdentifier("arch")
-			labels = append(labels, appctypes.Label{Name: *arch, Value: layerData.Architecture})
-			parentLabels = append(parentLabels, appctypes.Label{Name: *arch, Value: layerData.Architecture})
-		}
-	}
-
-	if layerData.Author != "" {
-		authorsKey := appctypes.MustACIdentifier("authors")
-		annotations = append(annotations, appctypes.Annotation{Name: *authorsKey, Value: layerData.Author})
-	}
-	epoch := time.Unix(0, 0)
-	if !layerData.Created.Equal(epoch) {
-		createdKey := appctypes.MustACIdentifier("created")
-		annotations = append(annotations, appctypes.Annotation{Name: *createdKey, Value: layerData.Created.Format(time.RFC3339)})
-	}
-	if layerData.Comment != "" {
-		commentKey := appctypes.MustACIdentifier("docker-comment")
-		annotations = append(annotations, appctypes.Annotation{Name: *commentKey, Value: layerData.Comment})
-	}
-
-	if dockerURL.IndexURL != "" {
-		annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerRegistryURL), Value: dockerURL.IndexURL})
-	}
-	annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerRepository), Value: dockerURL.ImageName})
-	annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerImageID), Value: layerData.ID})
-	annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerParentImageID), Value: layerData.Parent})
-
-	if dockerConfig != nil {
-		if len(dockerConfig.Entrypoint) > 0 {
-			entry, err := json.Marshal(dockerConfig.Entrypoint)
-			if err != nil {
-				return nil, err
-			}
-			annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerEntrypoint), Value: string(entry)})
-		}
-		if len(dockerConfig.Cmd) > 0 {
-			cmd, err := json.Marshal(dockerConfig.Cmd)
-			if err != nil {
-				return nil, err
-			}
-			annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerCmd), Value: string(cmd)})
-		}
-
-		exec := getExecCommand(dockerConfig.Entrypoint, dockerConfig.Cmd)
-		if exec != nil {
-			user, group := parseDockerUser(dockerConfig.User)
-			var env appctypes.Environment
-			for _, v := range dockerConfig.Env {
-				parts := strings.SplitN(v, "=", 2)
-				env.Set(parts[0], parts[1])
-			}
-			app := &appctypes.App{
-				Exec:             exec,
-				User:             user,
-				Group:            group,
-				Environment:      env,
-				WorkingDirectory: dockerConfig.WorkingDir,
-			}
-
-			app.MountPoints, err = convertVolumesToMPs(dockerConfig.Volumes)
-			if err != nil {
-				return nil, err
-			}
-
-			app.Ports, err = convertPorts(dockerConfig.ExposedPorts, dockerConfig.PortSpecs)
-			if err != nil {
-				return nil, err
-			}
-
-			genManifest.App = app
-		}
-	}
-
-	if layerData.Parent != "" {
-		indexPrefix := ""
-		// omit docker hub index URL in app name
-		indexPrefix = dockerURL.IndexURL + "/"
-		parentImageNameString := indexPrefix + dockerURL.ImageName + "-" + layerData.Parent
-		parentImageNameString, err := appctypes.SanitizeACIdentifier(parentImageNameString)
-		if err != nil {
-			return nil, err
-		}
-		parentImageName := appctypes.MustACIdentifier(parentImageNameString)
-
-		genManifest.Dependencies = append(genManifest.Dependencies, appctypes.Dependency{ImageName: *parentImageName, Labels: parentLabels})
-
-		annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerTag), Value: dockerURL.Tag})
-	}
-
-	genManifest.Labels = labels
-	genManifest.Annotations = annotations
-
-	return genManifest, nil
-}
-
-type appcPortSorter []appctypes.Port
-
-func (s appcPortSorter) Len() int {
-	return len(s)
-}
-
-func (s appcPortSorter) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s appcPortSorter) Less(i, j int) bool {
-	return s[i].Name.String() < s[j].Name.String()
-}
-
-func convertPorts(dockerExposedPorts map[string]struct{}, dockerPortSpecs []string) ([]appctypes.Port, error) {
-	ports := []appctypes.Port{}
-
-	for ep := range dockerExposedPorts {
-		appcPort, err := parseDockerPort(ep)
-		if err != nil {
-			return nil, err
-		}
-		ports = append(ports, *appcPort)
-	}
-
-	if dockerExposedPorts == nil && dockerPortSpecs != nil {
-		log.Debug("warning: docker image uses deprecated PortSpecs field")
-		for _, ep := range dockerPortSpecs {
-			appcPort, err := parseDockerPort(ep)
-			if err != nil {
-				return nil, err
-			}
-			ports = append(ports, *appcPort)
-		}
-	}
-
-	sort.Sort(appcPortSorter(ports))
-
-	return ports, nil
-}
-
-func parseDockerPort(dockerPort string) (*appctypes.Port, error) {
-	var portString string
-	proto := "tcp"
-	sp := strings.Split(dockerPort, "/")
-	if len(sp) < 2 {
-		portString = dockerPort
-	} else {
-		proto = sp[1]
-		portString = sp[0]
-	}
-
-	port, err := strconv.ParseUint(portString, 10, 0)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing port %q: %v", portString, err)
-	}
-
-	sn, err := appctypes.SanitizeACName(dockerPort)
-	if err != nil {
-		return nil, err
-	}
-
-	appcPort := &appctypes.Port{
-		Name:     *appctypes.MustACName(sn),
-		Protocol: proto,
-		Port:     uint(port),
-	}
-
-	return appcPort, nil
-}
-
-type appcVolSorter []appctypes.MountPoint
-
-func (s appcVolSorter) Len() int {
-	return len(s)
-}
-
-func (s appcVolSorter) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s appcVolSorter) Less(i, j int) bool {
-	return s[i].Name.String() < s[j].Name.String()
-}
-
-func convertVolumesToMPs(dockerVolumes map[string]struct{}) ([]appctypes.MountPoint, error) {
-	mps := []appctypes.MountPoint{}
-	dup := make(map[string]int)
-
-	for p := range dockerVolumes {
-		n := filepath.Join("volume", p)
-		sn, err := appctypes.SanitizeACName(n)
-		if err != nil {
-			return nil, err
-		}
-
-		// check for duplicate names
-		if i, ok := dup[sn]; ok {
-			dup[sn] = i + 1
-			sn = fmt.Sprintf("%s-%d", sn, i)
-		} else {
-			dup[sn] = 1
-		}
-
-		mp := appctypes.MountPoint{
-			Name: *appctypes.MustACName(sn),
-			Path: p,
-		}
-
-		mps = append(mps, mp)
-	}
-
-	sort.Sort(appcVolSorter(mps))
-
-	return mps, nil
-}
-
-func writeACI(layer io.ReadSeeker, manifest schema.ImageManifest, curPwl []string, output string, compression common.Compression) (*schema.ImageManifest, error) {
-	aciFile, err := os.Create(output)
-	if err != nil {
-		return nil, fmt.Errorf("error creating ACI file: %v", err)
-	}
-	defer aciFile.Close()
-
-	var w io.WriteCloser = aciFile
-	if compression == common.GzipCompression {
-		w = gzip.NewWriter(aciFile)
-		defer w.Close()
-	}
-	trw := tar.NewWriter(w)
-	defer trw.Close()
-
-	if err := WriteRootfsDir(trw); err != nil {
-		return nil, fmt.Errorf("error writing rootfs entry: %v", err)
-	}
-
-	fileMap := make(map[string]struct{})
-	var whiteouts []string
-	convWalker := func(t *tarball.TarFile) error {
-		name := t.Name()
-		if name == "./" {
-			return nil
-		}
-		t.Header.Name = path.Join("rootfs", name)
-		absolutePath := strings.TrimPrefix(t.Header.Name, "rootfs")
-
-		if filepath.Clean(absolutePath) == "/dev" && t.Header.Typeflag != tar.TypeDir {
-			return fmt.Errorf(`invalid layer: "/dev" is not a directory`)
-		}
-
-		fileMap[absolutePath] = struct{}{}
-		if strings.Contains(t.Header.Name, "/.wh.") {
-			whiteouts = append(whiteouts, strings.Replace(absolutePath, ".wh.", "", 1))
-			return nil
-		}
-		if t.Header.Typeflag == tar.TypeLink {
-			t.Header.Linkname = path.Join("rootfs", t.Linkname())
-		}
-
-		if err := trw.WriteHeader(t.Header); err != nil {
-			return err
-		}
-		if _, err := io.Copy(trw, t.TarStream); err != nil {
-			return err
-		}
-
-		if !util.In(curPwl, absolutePath) {
-			curPwl = append(curPwl, absolutePath)
-		}
-
-		return nil
-	}
-	tr, err := aci.NewCompressedTarReader(layer)
-	if err == nil {
-		defer tr.Close()
-		// write files in rootfs/
-		if err := tarball.Walk(*tr.Reader, convWalker); err != nil {
-			return nil, err
-		}
-	} else {
-		// ignore errors: empty layers in tars generated by docker save are not
-		// valid tar files so we ignore errors trying to open them. Converted
-		// ACIs will have the manifest and an empty rootfs directory in any
-		// case.
-	}
-	newPwl := subtractWhiteouts(curPwl, whiteouts)
-
-	newPwl, err = writeStdioSymlinks(trw, fileMap, newPwl)
-	if err != nil {
-		return nil, err
-	}
-	// Let's copy the newly generated PathWhitelist to avoid unintended
-	// side-effects
-	manifest.PathWhitelist = make([]string, len(newPwl))
-	copy(manifest.PathWhitelist, newPwl)
-
-	if err := WriteManifest(trw, manifest); err != nil {
-		return nil, fmt.Errorf("error writing manifest: %v", err)
-	}
-
-	return &manifest, nil
-}
-
-func getExecCommand(entrypoint []string, cmd []string) appctypes.Exec {
-	return append(entrypoint, cmd...)
-}
-
-func parseDockerUser(dockerUser string) (string, string) {
-	// if the docker user is empty assume root user and group
-	if dockerUser == "" {
-		return "0", "0"
-	}
-
-	dockerUserParts := strings.Split(dockerUser, ":")
-
-	// when only the user is given, the docker spec says that the default and
-	// supplementary groups of the user in /etc/passwd should be applied.
-	// Assume root group for now in this case.
-	if len(dockerUserParts) < 2 {
-		return dockerUserParts[0], "0"
-	}
-
-	return dockerUserParts[0], dockerUserParts[1]
-}
-
-func subtractWhiteouts(pathWhitelist []string, whiteouts []string) []string {
-	matchPaths := []string{}
-	for _, path := range pathWhitelist {
-		// If one of the parent dirs of the current path matches the
-		// whiteout then also this path should be removed
-		curPath := path
-		for curPath != "/" {
-			for _, whiteout := range whiteouts {
-				if curPath == whiteout {
-					matchPaths = append(matchPaths, path)
-				}
-			}
-			curPath = filepath.Dir(curPath)
-		}
-	}
-	for _, matchPath := range matchPaths {
-		idx := util.IndexOf(pathWhitelist, matchPath)
-		if idx != -1 {
-			pathWhitelist = append(pathWhitelist[:idx], pathWhitelist[idx+1:]...)
-		}
-	}
-
-	sort.Sort(sort.StringSlice(pathWhitelist))
-
-	return pathWhitelist
-}
-
-// WriteManifest writes a schema.ImageManifest entry on a tar.Writer.
-func WriteManifest(outputWriter *tar.Writer, manifest schema.ImageManifest) error {
-	b, err := json.Marshal(manifest)
-	if err != nil {
-		return err
-	}
-
-	hdr := getGenericTarHeader()
-	hdr.Name = "manifest"
-	hdr.Mode = 0644
-	hdr.Size = int64(len(b))
-	hdr.Typeflag = tar.TypeReg
-
-	if err := outputWriter.WriteHeader(hdr); err != nil {
-		return err
-	}
-	if _, err := outputWriter.Write(b); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// WriteRootfsDir writes a "rootfs" dir entry on a tar.Writer.
-func WriteRootfsDir(tarWriter *tar.Writer) error {
-	hdr := getGenericTarHeader()
-	hdr.Name = "rootfs"
-	hdr.Mode = 0755
-	hdr.Size = int64(0)
-	hdr.Typeflag = tar.TypeDir
-
-	return tarWriter.WriteHeader(hdr)
-}
-
-type symlink struct {
-	linkname string
-	target   string
-}
-
-// writeStdioSymlinks adds the /dev/stdin, /dev/stdout, /dev/stderr, and
-// /dev/fd symlinks expected by Docker to the converted ACIs so apps can find
-// them as expected
-func writeStdioSymlinks(tarWriter *tar.Writer, fileMap map[string]struct{}, pwl []string) ([]string, error) {
-	stdioSymlinks := []symlink{
-		{"/dev/stdin", "/proc/self/fd/0"},
-		// Docker makes /dev/{stdout,stderr} point to /proc/self/fd/{1,2} but
-		// we point to /dev/console instead in order to support the case when
-		// stdout/stderr is a Unix socket (e.g. for the journal).
-		{"/dev/stdout", "/dev/console"},
-		{"/dev/stderr", "/dev/console"},
-		{"/dev/fd", "/proc/self/fd"},
-	}
-
-	for _, s := range stdioSymlinks {
-		name := s.linkname
-		target := s.target
-		if _, exists := fileMap[name]; exists {
-			continue
-		}
-		hdr := &tar.Header{
-			Name:     filepath.Join("rootfs", name),
-			Mode:     0777,
-			Typeflag: tar.TypeSymlink,
-			Linkname: target,
-		}
-		if err := tarWriter.WriteHeader(hdr); err != nil {
-			return nil, err
-		}
-		if !util.In(pwl, name) {
-			pwl = append(pwl, name)
-		}
-	}
-
-	return pwl, nil
-}
-
-func getGenericTarHeader() *tar.Header {
-	// FIXME(iaguis) Use docker image time instead of the Unix Epoch?
-	hdr := &tar.Header{
-		Uid:        0,
-		Gid:        0,
-		ModTime:    time.Unix(0, 0),
-		Uname:      "0",
-		Gname:      "0",
-		ChangeTime: time.Unix(0, 0),
-	}
-
-	return hdr
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/tarball/tarfile.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/tarball/tarfile.go
deleted file mode 100644
index c72d18d9d9..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/tarball/tarfile.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package tarball provides functions to manipulate tar files.
-//
-// Note: this package is an implementation detail and shouldn't be used outside
-// of docker2aci.
-package tarball
-
-import (
-	"archive/tar"
-	"io"
-)
-
-// TarFile is a representation of a file in a tarball. It consists of two parts,
-// the Header and the Stream. The Header is a regular tar header, the Stream
-// is a byte stream that can be used to read the file's contents.
-type TarFile struct {
-	Header    *tar.Header
-	TarStream io.Reader
-}
-
-// Name returns the name of the file as reported by the header.
-func (t *TarFile) Name() string {
-	return t.Header.Name
-}
-
-// Linkname returns the Linkname of the file as reported by the header.
-func (t *TarFile) Linkname() string {
-	return t.Header.Linkname
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/tarball/walk.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/tarball/walk.go
deleted file mode 100644
index c12d2e34fb..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/tarball/walk.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tarball
-
-import (
-	"archive/tar"
-	"fmt"
-	"io"
-)
-
-// WalkFunc is a func for handling each file (header and byte stream) in a tarball
-type WalkFunc func(t *TarFile) error
-
-// Walk walks through the files in the tarball represented by tarstream and
-// passes each of them to the WalkFunc provided as an argument
-func Walk(tarReader tar.Reader, walkFunc func(t *TarFile) error) error {
-	for {
-		hdr, err := tarReader.Next()
-		if err == io.EOF {
-			// end of tar archive
-			break
-		}
-		if err != nil {
-			return fmt.Errorf("Error reading tar entry: %v", err)
-		}
-		if err := walkFunc(&TarFile{Header: hdr, TarStream: &tarReader}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/types/docker_types.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/types/docker_types.go
deleted file mode 100644
index 7af1e17e7a..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/types/docker_types.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import "time"
-
-// DockerImageData stores the JSON structure of a Docker image.
-// Taken and adapted from upstream Docker.
-type DockerImageData struct {
-	ID              string             `json:"id"`
-	Parent          string             `json:"parent,omitempty"`
-	Comment         string             `json:"comment,omitempty"`
-	Created         time.Time          `json:"created"`
-	Container       string             `json:"container,omitempty"`
-	ContainerConfig DockerImageConfig  `json:"container_config,omitempty"`
-	DockerVersion   string             `json:"docker_version,omitempty"`
-	Author          string             `json:"author,omitempty"`
-	Config          *DockerImageConfig `json:"config,omitempty"`
-	Architecture    string             `json:"architecture,omitempty"`
-	OS              string             `json:"os,omitempty"`
-	Checksum        string             `json:"checksum"`
-}
-
-// Note: the Config structure should hold only portable information about the container.
-// Here, "portable" means "independent from the host we are running on".
-// Non-portable information *should* appear in HostConfig.
-// Taken and adapted from upstream Docker.
-type DockerImageConfig struct {
-	Hostname        string
-	Domainname      string
-	User            string
-	Memory          int64  // Memory limit (in bytes)
-	MemorySwap      int64  // Total memory usage (memory + swap); set `-1' to disable swap
-	CpuShares       int64  // CPU shares (relative weight vs. other containers)
-	Cpuset          string // Cpuset 0-2, 0,1
-	AttachStdin     bool
-	AttachStdout    bool
-	AttachStderr    bool
-	PortSpecs       []string // Deprecated - Can be in the format of 8080/tcp
-	ExposedPorts    map[string]struct{}
-	Tty             bool // Attach standard streams to a tty, including stdin if it is not closed.
-	OpenStdin       bool // Open stdin
-	StdinOnce       bool // If true, close stdin after the 1 attached client disconnects.
-	Env             []string
-	Cmd             []string
-	Image           string // Name of the image as it was passed by the operator (eg. could be symbolic)
-	Volumes         map[string]struct{}
-	WorkingDir      string
-	Entrypoint      []string
-	NetworkDisabled bool
-	MacAddress      string
-	OnBuild         []string
-}
-
-// DockerAuthConfigOld represents the deprecated ~/.dockercfg auth
-// configuration.
-// Taken from upstream Docker.
-type DockerAuthConfigOld struct {
-	Username      string `json:"username,omitempty"`
-	Password      string `json:"password,omitempty"`
-	Auth          string `json:"auth"`
-	Email         string `json:"email"`
-	ServerAddress string `json:"serveraddress,omitempty"`
-}
-
-// DockerAuthConfig represents a config.json auth entry.
-// Taken from upstream Docker.
-type DockerAuthConfig struct {
-	Username      string `json:"username,omitempty"`
-	Password      string `json:"password,omitempty"`
-	Auth          string `json:"auth,omitempty"`
-	ServerAddress string `json:"serveraddress,omitempty"`
-	RegistryToken string `json:"registrytoken,omitempty"`
-}
-
-// DockerConfigFile represents a config.json auth file.
-// Taken from upstream docker.
-type DockerConfigFile struct {
-	AuthConfigs map[string]DockerAuthConfig `json:"auths"`
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/types/types.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/types/types.go
deleted file mode 100644
index cc4fc12ac8..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/types/types.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package types defines Docker image, URL and configuration types.
-//
-// Note: this package is an implementation detail and shouldn't be used outside
-// of docker2aci.
-package types
-
-// ParsedDockerURL represents a parsed Docker URL.
-type ParsedDockerURL struct {
-	IndexURL  string
-	ImageName string
-	Tag       string
-	Digest    string
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/util/util.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/util/util.go
deleted file mode 100644
index ebaafca62c..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/internal/util/util.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package util defines convenience functions for handling slices and debugging.
-//
-// Note: this package is an implementation detail and shouldn't be used outside
-// of docker2aci.
-package util
-
-import (
-	"crypto/tls"
-	"fmt"
-	"net/http"
-
-	"github.com/appc/spec/pkg/acirenderer"
-)
-
-// Quote takes a slice of strings and returns another slice with them quoted.
-func Quote(l []string) []string {
-	var quoted []string
-
-	for _, s := range l {
-		quoted = append(quoted, fmt.Sprintf("%q", s))
-	}
-
-	return quoted
-}
-
-// ReverseImages takes an acirenderer.Images and reverses it.
-func ReverseImages(s acirenderer.Images) acirenderer.Images {
-	var o acirenderer.Images
-	for i := len(s) - 1; i >= 0; i-- {
-		o = append(o, s[i])
-	}
-
-	return o
-}
-
-// In checks whether el is in list.
-func In(list []string, el string) bool {
-	return IndexOf(list, el) != -1
-}
-
-// IndexOf returns the index of el in list, or -1 if it's not found.
-func IndexOf(list []string, el string) int {
-	for i, x := range list {
-		if el == x {
-			return i
-		}
-	}
-	return -1
-}
-
-// GetTLSClient gets an HTTP client that behaves like the default HTTP
-// client, but optionally skips the TLS certificate verification.
-func GetTLSClient(skipTLSCheck bool) *http.Client {
-	if !skipTLSCheck {
-		return http.DefaultClient
-	}
-	client := *http.DefaultClient
-	// Default transport is hidden behind the RoundTripper
-	// interface, so we can't easily make a copy of it. If this
-	// ever panics, we will have to adapt.
-	realTransport := http.DefaultTransport.(*http.Transport)
-	tr := *realTransport
-	if tr.TLSClientConfig == nil {
-		tr.TLSClientConfig = &tls.Config{}
-	}
-	tr.TLSClientConfig.InsecureSkipVerify = true
-	client.Transport = &tr
-	return &client
-}
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
deleted file mode 100644
index 487c4bc50e..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/version.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package docker2aci
-
-import "github.com/appc/spec/schema"
-
-var Version = "0.11.1"
-var AppcVersion = schema.AppContainerVersion
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/pkg/log/log.go b/Godeps/_workspace/src/github.com/appc/docker2aci/pkg/log/log.go
deleted file mode 100644
index 2a02c47414..0000000000
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/pkg/log/log.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2016 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package log
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-)
-
-var debugEnabled bool
-
-func printTo(w io.Writer, i ...interface{}) {
-	s := fmt.Sprint(i...)
-	fmt.Fprintln(w, strings.TrimSuffix(s, "\n"))
-}
-
-// Info prints a message to stderr.
-func Info(i ...interface{}) {
-	printTo(os.Stderr, i...)
-}
-
-// Debug prints a message to stderr if debug is enabled.
-func Debug(i ...interface{}) {
-	if debugEnabled {
-		printTo(os.Stderr, i...)
-	}
-}
-
-// InitDebug enables debug output.
-func InitDebug() {
-	debugEnabled = true
-}
diff --git a/Godeps/_workspace/src/github.com/appc/goaci/LICENSE b/Godeps/_workspace/src/github.com/appc/goaci/LICENSE
deleted file mode 100644
index e06d208186..0000000000
--- a/Godeps/_workspace/src/github.com/appc/goaci/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/asset.go b/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/asset.go
deleted file mode 100644
index d90ee5fc8e..0000000000
--- a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/asset.go
+++ /dev/null
@@ -1,283 +0,0 @@
-package proj2aci
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-)
-
-// GetAssetString returns a properly formatted asset string.
-func GetAssetString(aciAsset, localAsset string) string {
-	return getAssetString(aciAsset, localAsset)
-}
-
-// PrepareAssets copies given assets to ACI rootfs directory. It also
-// tries to copy required shared libraries if an asset is a
-// dynamically linked executable or library. placeholderMapping maps
-// placeholders (like "<INSTALLDIR>") to actual paths (usually
-// something inside temporary directory).
-func PrepareAssets(assets []string, rootfs string, placeholderMapping map[string]string) error {
-	newAssets := assets
-	processedAssets := make(map[string]struct{})
-	for len(newAssets) > 0 {
-		assetsToProcess := newAssets
-		newAssets = nil
-		for _, asset := range assetsToProcess {
-			splitAsset := filepath.SplitList(asset)
-			if len(splitAsset) != 2 {
-				return fmt.Errorf("Malformed asset option: '%v' - expected two absolute paths separated with %v", asset, listSeparator())
-			}
-			evalSrc, srcErr := evalPath(splitAsset[0])
-			if srcErr != nil {
-				return fmt.Errorf("Could not evaluate symlinks in source asset %q: %v", evalSrc, srcErr)
-			}
-			evalDest, destErr := evalPath(splitAsset[1])
-			asset = getAssetString(evalSrc, evalDest)
-			Debug("Processing asset:", asset)
-			if _, ok := processedAssets[asset]; ok {
-				Debug("  skipped")
-				continue
-			}
-			additionalAssets, err := processAsset(asset, rootfs, placeholderMapping)
-			if destErr != nil {
-				evalDest, destErr = evalPath(evalDest)
-				if destErr != nil {
-					return fmt.Errorf("Could not evaluate symlinks in destination asset %q, even after it was copied to: %v", evalDest, destErr)
-				}
-				asset = getAssetString(evalSrc, evalDest)
-			}
-			if err != nil {
-				return err
-			}
-			processedAssets[asset] = struct{}{}
-			newAssets = append(newAssets, additionalAssets...)
-		}
-	}
-	return nil
-}
-
-func evalPath(path string) (string, error) {
-	symlinkDir := filepath.Dir(path)
-	symlinkBase := filepath.Base(path)
-	realSymlinkDir, err := filepath.EvalSymlinks(symlinkDir)
-	if err != nil {
-		return path, err
-	}
-	return filepath.Join(realSymlinkDir, symlinkBase), nil
-}
-
-// processAsset validates an asset, replaces placeholders with real
-// paths and does the copying. It may return additional assets to be
-// processed when asset is an executable or a library.
-func processAsset(asset, rootfs string, placeholderMapping map[string]string) ([]string, error) {
-	splitAsset := filepath.SplitList(asset)
-	if len(splitAsset) != 2 {
-		return nil, fmt.Errorf("Malformed asset option: '%v' - expected two absolute paths separated with %v", asset, listSeparator())
-	}
-	ACIAsset := replacePlaceholders(splitAsset[0], placeholderMapping)
-	localAsset := replacePlaceholders(splitAsset[1], placeholderMapping)
-	if err := validateAsset(ACIAsset, localAsset); err != nil {
-		return nil, err
-	}
-	ACIAssetSubPath := filepath.Join(rootfs, filepath.Dir(ACIAsset))
-	err := os.MkdirAll(ACIAssetSubPath, 0755)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to create directory tree for asset '%v': %v", asset, err)
-	}
-	err = copyTree(localAsset, filepath.Join(rootfs, ACIAsset))
-	if err != nil {
-		return nil, fmt.Errorf("Failed to copy assets for %q: %v", asset, err)
-	}
-	additionalAssets, err := getSoLibs(localAsset)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to get dependent assets for %q: %v", localAsset, err)
-	}
-	// HACK! if we are copying libc then try to copy libnss_* libs
-	// (glibc name service switch libs used in networking)
-	if matched, err := filepath.Match("libc.*", filepath.Base(localAsset)); err == nil && matched {
-		toGlob := filepath.Join(filepath.Dir(localAsset), "libnss_*")
-		if matches, err := filepath.Glob(toGlob); err == nil && len(matches) > 0 {
-			matchesAsAssets := make([]string, 0, len(matches))
-			for _, f := range matches {
-				matchesAsAssets = append(matchesAsAssets, getAssetString(f, f))
-			}
-			additionalAssets = append(additionalAssets, matchesAsAssets...)
-		}
-	}
-	return additionalAssets, nil
-}
-
-func replacePlaceholders(path string, placeholderMapping map[string]string) string {
-	Debug("Processing path: ", path)
-	newPath := path
-	for placeholder, replacement := range placeholderMapping {
-		newPath = strings.Replace(newPath, placeholder, replacement, -1)
-	}
-	Debug("Processed path: ", newPath)
-	return newPath
-}
-
-func validateAsset(ACIAsset, localAsset string) error {
-	if !filepath.IsAbs(ACIAsset) {
-		return fmt.Errorf("Wrong ACI asset: '%v' - ACI asset has to be absolute path", ACIAsset)
-	}
-	if !filepath.IsAbs(localAsset) {
-		return fmt.Errorf("Wrong local asset: '%v' - local asset has to be absolute path", localAsset)
-	}
-	fi, err := os.Lstat(localAsset)
-	if err != nil {
-		return fmt.Errorf("Error stating %v: %v", localAsset, err)
-	}
-	mode := fi.Mode()
-	if mode.IsDir() || mode.IsRegular() || isSymlink(mode) {
-		return nil
-	}
-	return fmt.Errorf("Can't handle local asset %v - not a file, not a dir, not a symlink", fi.Name())
-}
-
-func copyTree(src, dest string) error {
-	return filepath.Walk(src, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		rootLess := path[len(src):]
-		target := filepath.Join(dest, rootLess)
-		mode := info.Mode()
-		switch {
-		case mode.IsDir():
-			err := os.Mkdir(target, mode.Perm())
-			if err != nil {
-				return err
-			}
-		case mode.IsRegular():
-			if err := copyRegularFile(path, target); err != nil {
-				return err
-			}
-		case isSymlink(mode):
-			if err := copySymlink(path, target); err != nil {
-				return err
-			}
-		default:
-			return fmt.Errorf("Unsupported node %q in assets, only regular files, directories and symlinks are supported.", path, mode.String())
-		}
-		return nil
-	})
-}
-
-func copyRegularFile(src, dest string) error {
-	srcFile, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer srcFile.Close()
-	destFile, err := os.Create(dest)
-	if err != nil {
-		return err
-	}
-	defer destFile.Close()
-	if _, err := io.Copy(destFile, srcFile); err != nil {
-		return err
-	}
-	fi, err := srcFile.Stat()
-	if err != nil {
-		return err
-	}
-	if err := destFile.Chmod(fi.Mode().Perm()); err != nil {
-		return err
-	}
-	return nil
-}
-
-func copySymlink(src, dest string) error {
-	symTarget, err := os.Readlink(src)
-	if err != nil {
-		return err
-	}
-	if err := os.Symlink(symTarget, dest); err != nil {
-		return err
-	}
-	return nil
-}
-
-// getSoLibs tries to run ldd on given path and to process its output
-// to get a list of shared libraries to copy. This list is returned as
-// an array of assets.
-//
-// man ldd says that running ldd on untrusted executables is dangerous
-// (it might run an executable to get the libraries), so possibly this
-// should be replaced with objdump. Problem with objdump is that it
-// just gives library names, while ldd gives absolute paths to those
-// libraries - to use objdump we need to know the $libdir.
-func getSoLibs(path string) ([]string, error) {
-	assets := []string{}
-	buf := new(bytes.Buffer)
-	args := []string{
-		"ldd",
-		path,
-	}
-	if err := RunCmdFull("", args, nil, "", buf, nil); err != nil {
-		if _, ok := err.(CmdFailedError); !ok {
-			return nil, err
-		}
-	} else {
-		re := regexp.MustCompile(`(?m)^\t(?:\S+\s+=>\s+)?(\/\S+)\s+\([0-9a-fA-Fx]+\)$`)
-		for _, matches := range re.FindAllStringSubmatch(string(buf.Bytes()), -1) {
-			lib := matches[1]
-			if lib == "" {
-				continue
-			}
-			symlinkedAssets, err := getSymlinkedAssets(lib)
-			if err != nil {
-				return nil, err
-			}
-			assets = append(assets, symlinkedAssets...)
-		}
-	}
-	return assets, nil
-}
-
-// getSymlinkedAssets returns an array of many assets if given path is
-// a symlink - useful for getting shared libraries, which are often
-// surrounded with a bunch of symlinks.
-func getSymlinkedAssets(path string) ([]string, error) {
-	assets := []string{}
-	maxLevels := 100
-	levels := maxLevels
-	for {
-		if levels < 1 {
-			return nil, fmt.Errorf("Too many levels of symlinks (>$d)", maxLevels)
-		}
-		fi, err := os.Lstat(path)
-		if err != nil {
-			return nil, err
-		}
-		asset := getAssetString(path, path)
-		assets = append(assets, asset)
-		if !isSymlink(fi.Mode()) {
-			break
-		}
-		symTarget, err := os.Readlink(path)
-		if err != nil {
-			return nil, err
-		}
-		if filepath.IsAbs(symTarget) {
-			path = symTarget
-		} else {
-			path = filepath.Join(filepath.Dir(path), symTarget)
-		}
-		levels--
-	}
-	return assets, nil
-}
-
-func getAssetString(aciAsset, localAsset string) string {
-	return fmt.Sprintf("%s%s%s", aciAsset, listSeparator(), localAsset)
-}
-
-func isSymlink(mode os.FileMode) bool {
-	return mode&os.ModeSymlink == os.ModeSymlink
-}
diff --git a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/binary.go b/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/binary.go
deleted file mode 100644
index ee54f6c641..0000000000
--- a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/binary.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package proj2aci
-
-import (
-	"fmt"
-	"io/ioutil"
-	"strings"
-)
-
-// GetBinaryName checks if useBinary is in binDir and returns it. If
-// useBinary is empty it returns a binary name if there is only one
-// such in binDir. Otherwise it returns an error.
-func GetBinaryName(binDir, useBinary string) (string, error) {
-	fi, err := ioutil.ReadDir(binDir)
-	if err != nil {
-		return "", err
-	}
-
-	switch {
-	case len(fi) < 1:
-		return "", fmt.Errorf("No binaries found in %q", binDir)
-	case len(fi) == 1:
-		name := fi[0].Name()
-		if useBinary != "" && name != useBinary {
-			return "", fmt.Errorf("No such binary found in %q: %q. There is only %q", binDir, useBinary, name)
-		}
-		Debug("found binary: ", name)
-		return name, nil
-	case len(fi) > 1:
-		names := []string{}
-		for _, v := range fi {
-			names = append(names, v.Name())
-		}
-		if useBinary == "" {
-			return "", fmt.Errorf("Found multiple binaries in %q, but no specific binary is preferred. Please specify which binary to pick up. Following binaries are available: %q", binDir, strings.Join(names, `", "`))
-		}
-		for _, v := range names {
-			if v == useBinary {
-				return v, nil
-			}
-		}
-		return "", fmt.Errorf("No such binary found in %q: %q. There are following binaries available: %q", binDir, useBinary, strings.Join(names, `", "`))
-	}
-	panic("Reaching this point shouldn't be possible.")
-}
diff --git a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/builder.go b/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/builder.go
deleted file mode 100644
index e512c572af..0000000000
--- a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/builder.go
+++ /dev/null
@@ -1,365 +0,0 @@
-package proj2aci
-
-import (
-	"archive/tar"
-	"compress/gzip"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-
-	"github.com/appc/spec/aci"
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-)
-
-// CommonConfiguration keeps configuration items common for all the
-// builders. Users of a Builder are supposed to create a
-// BuilderCustomizations instance, get a CommonConfiguration instance
-// via GetCommonConfiguration function and modify it before running
-// Builder.Run().
-type CommonConfiguration struct {
-	Exec        []string
-	UseBinary   string
-	Assets      []string
-	KeepTmpDir  bool
-	TmpDir      string
-	ReuseTmpDir string
-	Project     string
-}
-
-// CommonPaths keeps some paths common for all builders. Implementers
-// of new BuilderCustomizations can read those after they are set up.
-type CommonPaths struct {
-	TmpDir string
-	AciDir string
-	RootFS string
-}
-
-// BuilderCustomizations is an interface for customizing a build
-// process. The order of function roughly describe the build process.
-type BuilderCustomizations interface {
-	Name() string
-	GetCommonConfiguration() *CommonConfiguration
-	ValidateConfiguration() error
-	GetCommonPaths() *CommonPaths
-	SetupPaths() error
-	GetDirectoriesToMake() []string
-	PrepareProject() error
-	GetPlaceholderMapping() map[string]string
-	GetAssets(aciBinDir string) ([]string, error)
-	GetImageName() (*types.ACIdentifier, error)
-	GetBinaryName() (string, error)
-	GetRepoPath() (string, error)
-	GetImageFileName() (string, error)
-}
-
-type Builder struct {
-	manifest  *schema.ImageManifest
-	aciBinDir string
-	custom    BuilderCustomizations
-}
-
-func NewBuilder(custom BuilderCustomizations) *Builder {
-	return &Builder{
-		manifest:  nil,
-		aciBinDir: "/",
-		custom:    custom,
-	}
-}
-
-func (cmd *Builder) Name() string {
-	return cmd.custom.Name()
-}
-
-func (cmd *Builder) Run() error {
-	Info("Validating builder configuration")
-	if err := cmd.validateConfiguration(); err != nil {
-		return err
-	}
-
-	Info("Setting up paths")
-	if err := cmd.setupPaths(); err != nil {
-		return err
-	}
-
-	config := cmd.custom.GetCommonConfiguration()
-	paths := cmd.custom.GetCommonPaths()
-	if config.KeepTmpDir {
-		Info(fmt.Sprintf("Preserving temporary directory %q", paths.TmpDir))
-	} else {
-		defer os.RemoveAll(paths.TmpDir)
-	}
-
-	if config.ReuseTmpDir != "" {
-		Info("Reusing temporary directory")
-		Info("Deleting old ACI contents")
-		if err := os.RemoveAll(paths.AciDir); err != nil {
-			return err
-		}
-
-		Info("Creating directories")
-		if err := cmd.makeDirectories(); err != nil {
-			return err
-		}
-	} else {
-		Info("Creating directories")
-		if err := cmd.makeDirectories(); err != nil {
-			return err
-		}
-
-		Info("Preparing a project")
-		if err := cmd.prepareProject(); err != nil {
-			return err
-		}
-	}
-
-	Info("Copying assets to ACI directory")
-	if err := cmd.copyAssets(); err != nil {
-		return err
-	}
-
-	Info("Preparing manifest")
-	if err := cmd.prepareManifest(); err != nil {
-		return err
-	}
-
-	Info("Writing ACI")
-	if name, err := cmd.writeACI(); err != nil {
-		return err
-	} else {
-		Info(fmt.Sprintf("Done, wrote %q", name))
-	}
-	return nil
-}
-
-func (cmd *Builder) validateConfiguration() error {
-	config := cmd.custom.GetCommonConfiguration()
-	if config == nil {
-		panic("common configuration is nil")
-	}
-	if config.Project == "" {
-		fmt.Errorf("Got no project to build")
-	}
-
-	if config.TmpDir != "" && config.ReuseTmpDir != "" && config.TmpDir != config.ReuseTmpDir {
-		return fmt.Errorf("Specified both tmp dir to reuse and a tmp dir and they are different. ")
-	}
-	if !DirExists(config.ReuseTmpDir) {
-		return fmt.Errorf("Invalid tmp dir to reuse")
-	}
-
-	return cmd.custom.ValidateConfiguration()
-}
-
-func (cmd *Builder) setupPaths() error {
-	config := cmd.custom.GetCommonConfiguration()
-	paths := cmd.custom.GetCommonPaths()
-	tmpDir := ""
-	if config.TmpDir != "" {
-		tmpDir = config.TmpDir
-	} else if config.ReuseTmpDir != "" {
-		tmpDir = config.ReuseTmpDir
-	} else {
-		tmpName := fmt.Sprintf("proj2aci-%s-", cmd.custom.Name())
-		aTmpDir, err := ioutil.TempDir("", tmpName)
-		if err != nil {
-			return fmt.Errorf("Failed to set up temporary directory: %v", err)
-		}
-		tmpDir = aTmpDir
-	}
-	paths.TmpDir = tmpDir
-	paths.AciDir = filepath.Join(paths.TmpDir, "aci")
-	paths.RootFS = filepath.Join(paths.AciDir, "rootfs")
-	return cmd.custom.SetupPaths()
-}
-
-func (cmd *Builder) makeDirectories() error {
-	paths := cmd.custom.GetCommonPaths()
-	config := cmd.custom.GetCommonConfiguration()
-
-	toMake := []string{}
-	if config.ReuseTmpDir == "" && config.TmpDir != "" {
-		tmpDirs, err := tmpDirList(paths.TmpDir)
-		if err != nil {
-			return err
-		}
-		toMake = append(toMake, tmpDirs...)
-	}
-	toMake = append(toMake, paths.AciDir, paths.RootFS)
-	if config.ReuseTmpDir == "" {
-		toMake = append(toMake, cmd.custom.GetDirectoriesToMake()...)
-	}
-
-	for _, dir := range toMake {
-		Debug("mkdir ", dir)
-		if err := os.Mkdir(dir, 0755); err != nil {
-			return fmt.Errorf("Failed to make directory %q: %v", dir, err)
-		}
-	}
-	return nil
-}
-
-func tmpDirList(path string) ([]string, error) {
-	list := []string{}
-	test := path
-	for {
-		if _, err := os.Stat(test); err != nil {
-			if !os.IsNotExist(err) {
-				return nil, err
-			}
-			// prepend
-			list = append([]string{test}, list...)
-			test = filepath.Dir(test)
-		} else {
-			break
-		}
-	}
-	return list, nil
-}
-
-func (cmd *Builder) prepareProject() error {
-	return cmd.custom.PrepareProject()
-}
-
-func (cmd *Builder) copyAssets() error {
-	paths := cmd.custom.GetCommonPaths()
-	config := cmd.custom.GetCommonConfiguration()
-	mapping := cmd.custom.GetPlaceholderMapping()
-	customAssets, err := cmd.custom.GetAssets(cmd.aciBinDir)
-	if err != nil {
-		return err
-	}
-	assets := append(config.Assets, customAssets...)
-	if err := PrepareAssets(assets, paths.RootFS, mapping); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *Builder) prepareManifest() error {
-	name, err := cmd.custom.GetImageName()
-	if err != nil {
-		return err
-	}
-	labels, err := cmd.getLabels()
-	if err != nil {
-		return err
-	}
-	app, err := cmd.getApp()
-	if err != nil {
-		return err
-	}
-
-	cmd.manifest = schema.BlankImageManifest()
-	cmd.manifest.Name = *name
-	cmd.manifest.App = app
-	cmd.manifest.Labels = labels
-	return nil
-}
-
-func (cmd *Builder) getApp() (*types.App, error) {
-	binaryName, err := cmd.custom.GetBinaryName()
-	if err != nil {
-		return nil, err
-	}
-	exec := []string{filepath.Join(cmd.aciBinDir, binaryName)}
-	config := cmd.custom.GetCommonConfiguration()
-
-	return &types.App{
-		Exec:  append(exec, config.Exec...),
-		User:  "0",
-		Group: "0",
-	}, nil
-}
-
-func (cmd *Builder) getLabels() (types.Labels, error) {
-	arch, err := newLabel("arch", runtime.GOARCH)
-	if err != nil {
-		return nil, err
-	}
-	os, err := newLabel("os", runtime.GOOS)
-	if err != nil {
-		return nil, err
-	}
-
-	labels := types.Labels{
-		*arch,
-		*os,
-	}
-
-	vcsLabel, err := cmd.getVCSLabel()
-	if err != nil {
-		return nil, err
-	} else if vcsLabel != nil {
-		labels = append(labels, *vcsLabel)
-	}
-
-	return labels, nil
-}
-
-func newLabel(name, value string) (*types.Label, error) {
-	acName, err := types.NewACIdentifier(name)
-	if err != nil {
-		return nil, err
-	}
-	return &types.Label{
-		Name:  *acName,
-		Value: value,
-	}, nil
-}
-
-func (cmd *Builder) getVCSLabel() (*types.Label, error) {
-	repoPath, err := cmd.custom.GetRepoPath()
-	if err != nil {
-		return nil, err
-	}
-	if repoPath == "" {
-		return nil, nil
-	}
-	name, value, err := GetVCSInfo(repoPath)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to get VCS info: %v", err)
-	}
-	acname, err := types.NewACIdentifier(name)
-	if err != nil {
-		return nil, fmt.Errorf("Invalid VCS label: %v", err)
-	}
-	return &types.Label{
-		Name:  *acname,
-		Value: value,
-	}, nil
-}
-
-func (cmd *Builder) writeACI() (string, error) {
-	mode := os.O_CREATE | os.O_WRONLY | os.O_TRUNC
-	filename, err := cmd.custom.GetImageFileName()
-	if err != nil {
-		return "", err
-	}
-	of, err := os.OpenFile(filename, mode, 0644)
-	if err != nil {
-		return "", fmt.Errorf("Error opening output file: %v", err)
-	}
-	defer of.Close()
-
-	gw := gzip.NewWriter(of)
-	defer gw.Close()
-
-	tr := tar.NewWriter(gw)
-	defer tr.Close()
-
-	// FIXME: the files in the tar archive are added with the
-	// wrong uid/gid. The uid/gid of the aci builder leaks in the
-	// tar archive. See: https://github.com/appc/goaci/issues/16
-	iw := aci.NewImageWriter(*cmd.manifest, tr)
-	paths := cmd.custom.GetCommonPaths()
-	if err := filepath.Walk(paths.AciDir, aci.BuildWalker(paths.AciDir, iw, nil)); err != nil {
-		return "", err
-	}
-	if err := iw.Close(); err != nil {
-		return "", err
-	}
-	return of.Name(), nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/cmake.go b/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/cmake.go
deleted file mode 100644
index e8dea907d0..0000000000
--- a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/cmake.go
+++ /dev/null
@@ -1,234 +0,0 @@
-package proj2aci
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-
-	"golang.org/x/tools/go/vcs"
-)
-
-type CmakeConfiguration struct {
-	CommonConfiguration
-	BinDir      string
-	ReuseSrcDir string
-	CmakeParams []string
-}
-
-type CmakePaths struct {
-	CommonPaths
-	src     string
-	build   string
-	install string
-	binDir  string
-}
-
-type CmakeCustomizations struct {
-	Configuration CmakeConfiguration
-
-	paths       CmakePaths
-	fullBinPath string
-}
-
-func (custom *CmakeCustomizations) Name() string {
-	return "cmake"
-}
-
-func (custom *CmakeCustomizations) GetCommonConfiguration() *CommonConfiguration {
-	return &custom.Configuration.CommonConfiguration
-}
-
-func (custom *CmakeCustomizations) ValidateConfiguration() error {
-	if !DirExists(custom.Configuration.ReuseSrcDir) {
-		return fmt.Errorf("Invalid src dir to reuse")
-	}
-	return nil
-}
-
-func (custom *CmakeCustomizations) GetCommonPaths() *CommonPaths {
-	return &custom.paths.CommonPaths
-}
-
-func (custom *CmakeCustomizations) SetupPaths() error {
-	setupReusableDir(&custom.paths.src, custom.Configuration.ReuseSrcDir, filepath.Join(custom.paths.TmpDir, "src"))
-	custom.paths.build = filepath.Join(custom.paths.TmpDir, "build")
-	custom.paths.install = filepath.Join(custom.paths.TmpDir, "install")
-	return nil
-}
-
-func setupReusableDir(path *string, reusePath, stockPath string) {
-	if path == nil {
-		panic("path in setupReusableDir cannot be nil")
-	}
-	if reusePath != "" {
-		*path = reusePath
-	} else {
-		*path = stockPath
-	}
-}
-
-func (custom *CmakeCustomizations) GetDirectoriesToMake() []string {
-	dirs := []string{
-		custom.paths.build,
-		custom.paths.install,
-	}
-	// not creating custom.paths.src, because go.vcs requires the
-	// src directory to be nonexistent
-	return dirs
-}
-
-func (custom *CmakeCustomizations) PrepareProject() error {
-	if custom.Configuration.ReuseSrcDir == "" {
-		if err := custom.createRepo(); err != nil {
-			return err
-		}
-	}
-
-	Info("Running cmake")
-	if err := custom.runCmake(); err != nil {
-		return err
-	}
-
-	Info("Running make")
-	if err := custom.runMake(); err != nil {
-		return err
-	}
-
-	Info("Running make install")
-	if err := custom.runMakeInstall(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (custom *CmakeCustomizations) createRepo() error {
-	Info(fmt.Sprintf("Downloading %s", custom.Configuration.Project))
-	repo, err := vcs.RepoRootForImportPath(custom.Configuration.Project, false)
-	if err != nil {
-		return err
-	}
-	return repo.VCS.Create(custom.paths.src, repo.Repo)
-}
-
-func (custom *CmakeCustomizations) runCmake() error {
-	args := []string{"cmake"}
-	args = append(args, custom.Configuration.CmakeParams...)
-	args = append(args, custom.paths.src)
-	return RunCmd(args, nil, custom.paths.build)
-}
-
-func (custom *CmakeCustomizations) runMake() error {
-	args := []string{
-		"make",
-		fmt.Sprintf("-j%d", runtime.NumCPU()),
-	}
-	return RunCmd(args, nil, custom.paths.build)
-}
-
-func (custom *CmakeCustomizations) runMakeInstall() error {
-	args := []string{
-		"make",
-		"install",
-	}
-	env := append(os.Environ(), "DESTDIR="+custom.paths.install)
-	return RunCmd(args, env, custom.paths.build)
-}
-
-func (custom *CmakeCustomizations) GetPlaceholderMapping() map[string]string {
-	return map[string]string{
-		"<SRCPATH>":     custom.paths.src,
-		"<BUILDPATH>":   custom.paths.build,
-		"<INSTALLPATH>": custom.paths.install,
-	}
-}
-
-func (custom *CmakeCustomizations) GetAssets(aciBinDir string) ([]string, error) {
-	binaryName, err := custom.GetBinaryName()
-	if err != nil {
-		return nil, err
-	}
-	rootBinary := filepath.Join(aciBinDir, binaryName)
-	return []string{GetAssetString(rootBinary, custom.fullBinPath)}, nil
-}
-
-func (custom *CmakeCustomizations) getBinDir() (string, error) {
-	if custom.Configuration.BinDir != "" {
-		return filepath.Join(custom.paths.install, custom.Configuration.BinDir), nil
-	}
-	dirs := []string{
-		"/usr/local/sbin",
-		"/usr/local/bin",
-		"/usr/sbin",
-		"/usr/bin",
-		"/sbin",
-		"/bin",
-	}
-	for _, dir := range dirs {
-		path := filepath.Join(custom.paths.install, dir)
-		_, err := os.Stat(path)
-		if err != nil {
-			if os.IsNotExist(err) {
-				continue
-			}
-			return "", err
-		}
-		return path, nil
-	}
-	return "", fmt.Errorf("Could not find any bin directory")
-}
-
-func (custom *CmakeCustomizations) GetImageName() (*types.ACIdentifier, error) {
-	imageName := custom.Configuration.Project
-	if filepath.Base(imageName) == "..." {
-		imageName = filepath.Dir(imageName)
-		if custom.Configuration.UseBinary != "" {
-			imageName += "-" + custom.Configuration.UseBinary
-		}
-	}
-	return types.NewACIdentifier(strings.ToLower(imageName))
-}
-
-func (custom *CmakeCustomizations) GetBinaryName() (string, error) {
-	if err := custom.findFullBinPath(); err != nil {
-		return "", err
-	}
-
-	return filepath.Base(custom.fullBinPath), nil
-}
-
-func (custom *CmakeCustomizations) findFullBinPath() error {
-	if custom.fullBinPath != "" {
-		return nil
-	}
-	binDir, err := custom.getBinDir()
-	if err != nil {
-		return err
-	}
-	binary, err := GetBinaryName(binDir, custom.Configuration.UseBinary)
-	if err != nil {
-		return err
-	}
-	custom.fullBinPath = filepath.Join(binDir, binary)
-	return nil
-}
-
-func (custom *CmakeCustomizations) GetRepoPath() (string, error) {
-	return custom.paths.src, nil
-}
-
-func (custom *CmakeCustomizations) GetImageFileName() (string, error) {
-	base := filepath.Base(custom.Configuration.Project)
-	if base == "..." {
-		base = filepath.Base(filepath.Dir(custom.Configuration.Project))
-		if custom.Configuration.UseBinary != "" {
-			base += "-" + custom.Configuration.UseBinary
-		}
-	}
-	return base + schema.ACIExtension, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/go.go b/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/go.go
deleted file mode 100644
index 2ebed255a4..0000000000
--- a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/go.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package proj2aci
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-)
-
-type GoConfiguration struct {
-	CommonConfiguration
-	GoBinary string
-	GoPath   string
-}
-
-type GoPaths struct {
-	CommonPaths
-	project string
-	realGo  string
-	fakeGo  string
-	goRoot  string
-	goBin   string
-}
-
-type GoCustomizations struct {
-	Configuration GoConfiguration
-
-	paths GoPaths
-	app   string
-}
-
-func (custom *GoCustomizations) Name() string {
-	return "go"
-}
-
-func (custom *GoCustomizations) GetCommonConfiguration() *CommonConfiguration {
-	return &custom.Configuration.CommonConfiguration
-}
-
-func (custom *GoCustomizations) GetCommonPaths() *CommonPaths {
-	return &custom.paths.CommonPaths
-}
-
-func (custom *GoCustomizations) ValidateConfiguration() error {
-	if custom.Configuration.GoBinary == "" {
-		return fmt.Errorf("Go binary not found")
-	}
-	return nil
-}
-
-func (custom *GoCustomizations) SetupPaths() error {
-	custom.paths.realGo, custom.paths.fakeGo = custom.getGoPath()
-
-	if os.Getenv("GOPATH") != "" {
-		Warn("GOPATH env var is ignored, use --go-path=\"$GOPATH\" option instead")
-	}
-	custom.paths.goRoot = os.Getenv("GOROOT")
-	if custom.paths.goRoot != "" {
-		Warn("Overriding GOROOT env var to ", custom.paths.goRoot)
-	}
-
-	projectName := getProjectName(custom.Configuration.Project)
-	// Project name is path-like string with slashes, but slash is
-	// not a file separator on every OS.
-	custom.paths.project = filepath.Join(custom.paths.realGo, "src", filepath.Join(strings.Split(projectName, "/")...))
-	custom.paths.goBin = filepath.Join(custom.paths.fakeGo, "bin")
-	return nil
-}
-
-// getGoPath returns go path and fake go path. The former is either in
-// /tmp (which is a default) or some other path as specified by
-// --go-path parameter. The latter is always in /tmp.
-func (custom *GoCustomizations) getGoPath() (string, string) {
-	fakeGoPath := filepath.Join(custom.paths.TmpDir, "gopath")
-	if custom.Configuration.GoPath == "" {
-		return fakeGoPath, fakeGoPath
-	}
-	return custom.Configuration.GoPath, fakeGoPath
-}
-
-func getProjectName(project string) string {
-	if filepath.Base(project) != "..." {
-		return project
-	}
-	return filepath.Dir(project)
-}
-
-func (custom *GoCustomizations) GetDirectoriesToMake() []string {
-	return []string{
-		custom.paths.fakeGo,
-		custom.paths.goBin,
-	}
-}
-
-func (custom *GoCustomizations) PrepareProject() error {
-	Info("Running go get")
-	// Construct args for a go get that does a static build
-	args := []string{
-		"go",
-		"get",
-		"-a",
-		custom.Configuration.Project,
-	}
-
-	env := []string{
-		"GOPATH=" + custom.paths.realGo,
-		"GOBIN=" + custom.paths.goBin,
-		"PATH=" + os.Getenv("PATH"),
-	}
-	if custom.paths.goRoot != "" {
-		env = append(env, "GOROOT="+custom.paths.goRoot)
-	}
-
-	cmd := exec.Cmd{
-		Env:    env,
-		Path:   custom.Configuration.GoBinary,
-		Args:   args,
-		Stderr: os.Stderr,
-		Stdout: os.Stdout,
-	}
-	Debug("env: ", cmd.Env)
-	Debug("running command: ", strings.Join(cmd.Args, " "))
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (custom *GoCustomizations) GetPlaceholderMapping() map[string]string {
-	return map[string]string{
-		"<PROJPATH>": custom.paths.project,
-		"<GOPATH>":   custom.paths.realGo,
-	}
-}
-
-func (custom *GoCustomizations) GetAssets(aciBinDir string) ([]string, error) {
-	name, err := custom.GetBinaryName()
-	if err != nil {
-		return nil, err
-	}
-	aciAsset := filepath.Join(aciBinDir, name)
-	localAsset := filepath.Join(custom.paths.goBin, name)
-
-	return []string{GetAssetString(aciAsset, localAsset)}, nil
-}
-
-func (custom *GoCustomizations) GetImageName() (*types.ACIdentifier, error) {
-	imageName := custom.Configuration.Project
-	if filepath.Base(imageName) == "..." {
-		imageName = filepath.Dir(imageName)
-		if custom.Configuration.UseBinary != "" {
-			imageName += "-" + custom.Configuration.UseBinary
-		}
-	}
-	return types.NewACIdentifier(strings.ToLower(imageName))
-}
-
-func (custom *GoCustomizations) GetBinaryName() (string, error) {
-	if err := custom.findBinaryName(); err != nil {
-		return "", err
-	}
-
-	return custom.app, nil
-}
-
-func (custom *GoCustomizations) findBinaryName() error {
-	if custom.app != "" {
-		return nil
-	}
-	binaryName, err := GetBinaryName(custom.paths.goBin, custom.Configuration.UseBinary)
-	if err != nil {
-		return err
-	}
-	custom.app = binaryName
-	return nil
-}
-
-func (custom *GoCustomizations) GetRepoPath() (string, error) {
-	return custom.paths.project, nil
-}
-
-func (custom *GoCustomizations) GetImageFileName() (string, error) {
-	base := filepath.Base(custom.Configuration.Project)
-	if base == "..." {
-		base = filepath.Base(filepath.Dir(custom.Configuration.Project))
-		if custom.Configuration.UseBinary != "" {
-			base += "-" + custom.Configuration.UseBinary
-		}
-	}
-	return base + schema.ACIExtension, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/run.go b/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/run.go
deleted file mode 100644
index 532990f30d..0000000000
--- a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/run.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package proj2aci
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"strings"
-)
-
-type CmdFailedError struct {
-	Err error
-}
-
-func (e CmdFailedError) Error() string {
-	return fmt.Sprintf("CmdFailedError: %s", e.Err.Error())
-}
-
-type CmdNotFoundError struct {
-	Err error
-}
-
-func (e CmdNotFoundError) Error() string {
-	return fmt.Sprintf("CmdNotFoundError: %s", e.Err.Error())
-}
-
-// RunCmdFull runs given execProg. execProg should be an absolute path
-// to a program or it can be an empty string. In the latter case first
-// string in args is taken and searched for in $PATH.
-//
-// If execution fails then CmdFailedError is returned. This can be
-// useful if we don't care if execution fails or not. CmdNotFoundError
-// is returned if executable is not found.
-func RunCmdFull(execProg string, args, env []string, cwd string, stdout, stderr io.Writer) error {
-	if len(args) < 1 {
-		return fmt.Errorf("No args to execute passed")
-	}
-	prog := execProg
-	if prog == "" {
-		pathProg, err := exec.LookPath(args[0])
-		if err != nil {
-			return CmdNotFoundError{err}
-		}
-		prog = pathProg
-	} else if _, err := os.Stat(prog); err != nil {
-		return CmdNotFoundError{err}
-	}
-	cmd := exec.Cmd{
-		Path:   prog,
-		Args:   args,
-		Env:    env,
-		Dir:    cwd,
-		Stdout: stdout,
-		Stderr: stderr,
-	}
-	Debug(`running command: "`, strings.Join(args, `" "`), `"`)
-	if err := cmd.Run(); err != nil {
-		return CmdFailedError{err}
-	}
-	return nil
-}
-
-func RunCmd(args, env []string, cwd string) error {
-	return RunCmdFull("", args, env, cwd, os.Stdout, os.Stderr)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/util.go b/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/util.go
deleted file mode 100644
index 177c28c805..0000000000
--- a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/util.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package proj2aci
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"unicode/utf8"
-)
-
-var debugEnabled bool
-var pathListSep string
-
-// DirExists checks if directory exists if given path is not empty.
-//
-// This function is rather specific as it is mostly used for checking
-// overrides validity (like overriding temporary directory, where
-// empty string means "do not override").
-func DirExists(path string) bool {
-	if path != "" {
-		fi, err := os.Stat(path)
-		if err != nil || !fi.IsDir() {
-			return false
-		}
-	}
-	return true
-}
-
-func printTo(w io.Writer, i ...interface{}) {
-	s := fmt.Sprint(i...)
-	fmt.Fprintln(w, strings.TrimSuffix(s, "\n"))
-}
-
-func Warn(i ...interface{}) {
-	printTo(os.Stderr, i...)
-}
-
-func Info(i ...interface{}) {
-	printTo(os.Stdout, i...)
-}
-
-func Debug(i ...interface{}) {
-	if debugEnabled {
-		printTo(os.Stdout, i...)
-	}
-}
-
-func InitDebug() {
-	if os.Getenv("GOACI_DEBUG") != "" {
-		debugEnabled = true
-	}
-}
-
-// listSeparator returns filepath.ListSeparator rune as a string.
-func listSeparator() string {
-	if pathListSep == "" {
-		len := utf8.RuneLen(filepath.ListSeparator)
-		if len < 0 {
-			panic("filepath.ListSeparator is not valid utf8?!")
-		}
-		buf := make([]byte, len)
-		len = utf8.EncodeRune(buf, filepath.ListSeparator)
-		pathListSep = string(buf[:len])
-	}
-
-	return pathListSep
-}
diff --git a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/vcs.go b/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/vcs.go
deleted file mode 100644
index 8a6d88b860..0000000000
--- a/Godeps/_workspace/src/github.com/appc/goaci/proj2aci/vcs.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package proj2aci
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-func repoDirExists(projPath, repoDir string) bool {
-	path := filepath.Join(projPath, repoDir)
-	info, err := os.Stat(path)
-	if err != nil {
-		return false
-	}
-	return info.IsDir()
-}
-
-// getId gets first line of commands output which should hold some VCS
-// specific id of current code checkout.
-func getId(dir, cmd string, params []string) (string, error) {
-	args := []string{cmd}
-	args = append(args, params...)
-	buffer := new(bytes.Buffer)
-	cmdPath, err := exec.LookPath(cmd)
-	if err != nil {
-		return "", nil
-	}
-	process := &exec.Cmd{
-		Path: cmdPath,
-		Args: args,
-		Env: []string{
-			"PATH=" + os.Getenv("PATH"),
-		},
-		Dir:    dir,
-		Stdout: buffer,
-	}
-	if err := process.Run(); err != nil {
-		return "", err
-	}
-	output := string(buffer.Bytes())
-	if newline := strings.Index(output, "\n"); newline < 0 {
-		return output, nil
-	} else {
-		return output[:newline], nil
-	}
-}
-
-func getLabelAndId(label, path, cmd string, params []string) (string, string, error) {
-	if info, err := getId(path, cmd, params); err != nil {
-		return "", "", err
-	} else {
-		return label, info, nil
-	}
-}
-
-type VCSInfo interface {
-	IsValid(path string) bool
-	GetLabelAndId(path string) (string, string, error)
-}
-
-type GitInfo struct{}
-
-func (info GitInfo) IsValid(path string) bool {
-	return repoDirExists(path, ".git")
-}
-
-func (info GitInfo) GetLabelAndId(path string) (string, string, error) {
-	return getLabelAndId("git", path, "git", []string{"rev-parse", "HEAD"})
-}
-
-type HgInfo struct{}
-
-func (info HgInfo) IsValid(path string) bool {
-	return repoDirExists(path, ".hg")
-}
-
-func (info HgInfo) GetLabelAndId(path string) (string, string, error) {
-	return getLabelAndId("hg", path, "hg", []string{"id", "-i"})
-}
-
-type SvnInfo struct{}
-
-func (info SvnInfo) IsValid(path string) bool {
-	return repoDirExists(path, ".svn")
-}
-
-func (info SvnInfo) GetLabelAndId(path string) (string, string, error) {
-	return getLabelAndId("svn", path, "svnversion", []string{})
-}
-
-type BzrInfo struct{}
-
-func (info BzrInfo) IsValid(path string) bool {
-	return repoDirExists(path, ".bzr")
-}
-
-func (info BzrInfo) GetLabelAndId(path string) (string, string, error) {
-	return getLabelAndId("bzr", path, "bzr", []string{"revno"})
-}
-
-func GetVCSInfo(projPath string) (string, string, error) {
-	vcses := []VCSInfo{
-		GitInfo{},
-		HgInfo{},
-		SvnInfo{},
-		BzrInfo{},
-	}
-
-	for _, vcs := range vcses {
-		if vcs.IsValid(projPath) {
-			return vcs.GetLabelAndId(projPath)
-		}
-	}
-	return "", "", fmt.Errorf("Unknown code repository in %q", projPath)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/LICENSE b/Godeps/_workspace/src/github.com/appc/spec/LICENSE
deleted file mode 100644
index e06d208186..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/build_aci b/Godeps/_workspace/src/github.com/appc/spec/ace/build_aci
deleted file mode 100644
index ebfc225661..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/build_aci
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-#
-# Builds an ACI containing a go implementation of an ACE validator
-#
-set -eu
-
-PREFIX="ace"
-: ${NO_SIGNATURE=}
-GOOS="$(go env GOOS)"
-GOARCH="$(go env GOARCH)"
-
-if ! [[ $0 =~ "${PREFIX}/build_aci" ]]; then 
-	echo "invoke from repository root" 1>&2
-	exit 255
-fi
-
-if ! [[ -f "bin/ace-validator" ]]; then 
-	./build
-fi
-
-for typ in main sidekick; do 
-	layoutdir="bin/ace-${typ}-layout"
-	mkdir -p ${layoutdir}/rootfs/opt/acvalidator
-	cp bin/ace-validator ${layoutdir}/rootfs/
-	sed -e "s/@GOOS@/$GOOS/" -e "s/@GOARCH@/$GOARCH/" < ${PREFIX}/image_manifest_${typ}.json.in > ${layoutdir}/manifest
-	# now build the tarball, and sign it
-	pushd ${layoutdir} >/dev/null
-		# Set a consistent timestamp so we get a consistent hash
-		# TODO(jonboulle): make this cleaner..
-		for path in rootfs rootfs/ace-validator; do
-			touch -a -m -d 1970-01-01T00:00:00Z ${path}
-		done
-		../actool build --overwrite ./ ../ace-validator-${typ}.aci
-		# TODO(jonboulle): create uncompressed instead, then gzip?
-		HASH=sha512-$(gzip -d -f ../ace-validator-${typ}.aci -c | openssl dgst -sha512 -hex -r | awk '{print $1}')
-		if [ -z "$NO_SIGNATURE" ] ; then
-			gpg --cipher-algo AES256 --armor --output ace-validator-${typ}.aci.asc --detach-sig ../ace-validator-${typ}.aci
-			mv ace-validator-${typ}.aci.asc ../
-		fi
-	popd >/dev/null
-	echo "Wrote ${typ} layout to      ${layoutdir}"
-	echo "Wrote unsigned ${typ} ACI   bin/ace-validator-${typ}.aci"
-	ln -s ${PWD}/bin/ace-validator-${typ}.aci bin/${HASH}
-	echo "Wrote ${typ} layout hash    bin/${HASH}"
-	if [ -f "bin/ace-validator-${typ}.aci.asc" ]; then
-		echo "Wrote ${typ} ACI signature  bin/ace-validator-${typ}.aci.asc"
-	fi
-done
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/doc.go b/Godeps/_workspace/src/github.com/appc/spec/ace/doc.go
deleted file mode 100644
index 476f2c9557..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/doc.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package ace contains a tool intended to be run within an _Application
-// Container Executor_ to validate that the ACE has set up the container
-// environment correctly. This tool can be built into an ACI image ready for
-// running on an executor by using the `build_aci` script.
-package main
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
deleted file mode 100644
index 33157eeead..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_main.json.in
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "acVersion": "0.8.4",
-    "acKind": "ImageManifest",
-    "name": "coreos.com/ace-validator-main",
-    "labels": [
-        { "name": "version", "value": "0.8.4" },
-        { "name": "os", "value": "@GOOS@" },
-        { "name": "arch", "value": "@GOARCH@" }
-    ],
-    "app": {
-        "exec": [
-            "/ace-validator", "main"
-        ],
-        "eventHandlers": [
-            {
-                "name": "pre-start",
-                "exec": [
-                    "/ace-validator", "prestart"
-                ]
-            },
-            {
-                "name": "post-stop",
-                "exec": [
-                    "/ace-validator", "poststop"
-                ]
-            }
-        ],
-        "user": "0",
-        "group": "0",
-        "workingDirectory": "/opt/acvalidator",
-        "environment": [
-            {
-                "name": "IN_ACE_VALIDATOR",
-                "value": "correct"
-            }
-        ],
-        "mountPoints": [
-            {
-                "name": "database",
-                "path": "/db",
-                "readOnly": false
-            }
-        ],
-        "ports": [
-            {
-                "name": "www",
-                "protocol": "tcp",
-                "port": 80
-            }
-        ],
-        "isolators": [
-            {
-                "name": "resource/memory",
-                "value": {"limit": "1G"}
-            }
-        ]
-    },
-    "annotations": [
-        {
-            "name": "created",
-            "value": "2014-10-27T19:32:27.67021798Z"
-        },
-        {
-            "name": "authors",
-            "value": "Carly Container <carly@example.com>, Nat Network <nat@example.com>"
-        },
-        {
-            "name": "homepage",
-            "value": "https://github.com/appc/spec"
-        },
-        {
-            "name": "documentation",
-            "value": "https://github.com/appc/spec/blob/master/README.md"
-        },
-        {
-            "name": "lorem",
-            "value": "ipsum"
-        }
-    ]
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
deleted file mode 100644
index a69bbcf66b..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "acVersion": "0.8.4",
-    "acKind": "ImageManifest",
-    "name": "coreos.com/ace-validator-sidekick",
-    "labels": [
-        { "name": "version", "value": "0.8.4" },
-        { "name": "os", "value": "@GOOS@" },
-        { "name": "arch", "value": "@GOARCH@" }
-    ],
-    "app": {
-        "exec": [
-            "/ace-validator", "sidekick"
-        ],
-        "user": "0",
-        "group": "0",
-        "mountPoints": [
-            {
-                "name": "database",
-                "path": "/db",
-                "readOnly": false
-            }
-        ]
-    }
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/os_default.go b/Godeps/_workspace/src/github.com/appc/spec/ace/os_default.go
deleted file mode 100644
index 4810d4368f..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/os_default.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !linux
-// +build !freebsd
-
-package main
-
-import (
-	"syscall"
-)
-
-func isSameFilesystem(a, b *syscall.Statfs_t) bool {
-	return a.Fsid == b.Fsid
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/os_freebsd.go b/Godeps/_workspace/src/github.com/appc/spec/ace/os_freebsd.go
deleted file mode 100644
index ec7ad0419f..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/os_freebsd.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build freebsd
-
-package main
-
-import (
-	"syscall"
-)
-
-func isSameFilesystem(a, b *syscall.Statfs_t) bool {
-	if a.Fsid != (syscall.Fsid{}) || b.Fsid != (syscall.Fsid{}) {
-		// If Fsid is not empty, we can just compare the IDs
-		return a.Fsid == b.Fsid
-	}
-	// Fsids are zero, this happens in jails, but we can compare the rest
-	return a.Fstypename == b.Fstypename &&
-		a.Mntfromname == b.Mntfromname &&
-		a.Mntonname == b.Mntonname
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/os_linux.go b/Godeps/_workspace/src/github.com/appc/spec/ace/os_linux.go
deleted file mode 100644
index aedfc3ad59..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/os_linux.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package main
-
-import (
-	"fmt"
-	"os"
-)
-
-func checkMountImpl(d string, readonly bool) error {
-	mountinfoPath := fmt.Sprintf("/proc/self/mountinfo")
-	mi, err := os.Open(mountinfoPath)
-	if err != nil {
-		return err
-	}
-	defer mi.Close()
-
-	isMounted, ro, err := parseMountinfo(mi, d)
-	if err != nil {
-		return err
-	}
-	if !isMounted {
-		return fmt.Errorf("%q is not a mount point", d)
-	}
-
-	if ro == readonly {
-		return nil
-	} else {
-		return fmt.Errorf("%q mounted ro=%t, want %t", d, ro, readonly)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/os_shared.go b/Godeps/_workspace/src/github.com/appc/spec/ace/os_shared.go
deleted file mode 100644
index 93964c3b12..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/os_shared.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build !linux
-
-package main
-
-import (
-	"fmt"
-	"path/filepath"
-	"syscall"
-)
-
-func checkMountStatfs(d string, readonly bool) error {
-	// or....
-	// os.Stat(path).Sys().(*syscall.Stat_t).Dev
-	sfs1 := &syscall.Statfs_t{}
-	if err := syscall.Statfs(d, sfs1); err != nil {
-		return fmt.Errorf("error calling statfs on %q: %v", d, err)
-	}
-	sfs2 := &syscall.Statfs_t{}
-	if err := syscall.Statfs(filepath.Dir(d), sfs2); err != nil {
-		return fmt.Errorf("error calling statfs on %q: %v", d, err)
-	}
-	if isSameFilesystem(sfs1, sfs2) {
-		return fmt.Errorf("%q is not a mount point", d)
-	}
-	ro := sfs1.Flags&syscall.O_RDONLY == 1
-	if ro != readonly {
-		return fmt.Errorf("%q mounted ro=%t, want %t", d, ro, readonly)
-	}
-
-	return nil
-}
-
-func checkMountImpl(d string, readonly bool) error {
-	return checkMountStatfs(d, readonly)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go b/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go
deleted file mode 100644
index fdd27ac222..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/ace/validator.go
+++ /dev/null
@@ -1,578 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-/*
-
-This validator tool is intended to be run within an App Container Executor
-(ACE), and verifies that the ACE has been set up correctly.
-
-This verifies the _apps perspective_ of the execution environment.
-
-Changes to the validator need to be reflected in app_manifest.json, and vice-versa
-
-The App Container Execution spec defines the following expectations within the execution environment:
- - Working Directory defaults to the root of the application image, overridden with "workingDirectory"
- - PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
- - USER, LOGNAME username of the user executing this app
- - HOME home directory of the user
- - SHELL login shell of the user
- - AC_APP_NAME the entrypoint that this process was defined from
-
-In addition, we validate:
- - The expected mount points are mounted
- - metadata service reachable at http://169.254.169.255
-
-TODO(jonboulle):
- - should we validate Isolators? (e.g. MemoryLimit + malloc, or capabilities)
- - should we validate ports? (e.g. that they are available to bind to within the network namespace of the pod)
-
-*/
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"reflect"
-	"strings"
-	"time"
-
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-)
-
-const (
-	standardPath     = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-	appNameEnv       = "AC_APP_NAME"
-	metadataPathBase = "/acMetadata/v1"
-
-	// marker files to validate
-	prestartFile = "/prestart"
-	mainFile     = "/main"
-	poststopFile = "/poststop"
-
-	mainVolFile     = "/db/main"
-	sidekickVolFile = "/db/sidekick"
-
-	timeout = 5 * time.Second
-)
-
-var (
-	// Expected values must be kept in sync with app_manifest.json
-	workingDirectory = "/opt/acvalidator"
-	// "Environment"
-	env = map[string]string{
-		"IN_ACE_VALIDATOR": "correct",
-		"HOME":             "/root",
-		"USER":             "root",
-		"LOGNAME":          "root",
-		"SHELL":            "/bin/sh",
-	}
-	// "MountPoints"
-	mps = map[string]types.MountPoint{
-		"database": types.MountPoint{
-			Path:     "/db",
-			ReadOnly: false,
-		},
-	}
-	// "Name"
-	an = "ace-validator-main"
-)
-
-type results []error
-
-// main outputs diagnostic information to stderr and exits 1 if validation fails
-func main() {
-	if len(os.Args) != 2 {
-		stderr("usage: %s [main|sidekick|preStart|postStop]", os.Args[0])
-		os.Exit(64)
-	}
-	mode := os.Args[1]
-	var res results
-	switch strings.ToLower(mode) {
-	case "main":
-		res = validateMain()
-	case "sidekick":
-		res = validateSidekick()
-	case "prestart":
-		res = validatePrestart()
-	case "poststop":
-		res = validatePoststop()
-	default:
-		stderr("unrecognized mode: %s", mode)
-		os.Exit(64)
-	}
-	if len(res) == 0 {
-		fmt.Printf("%s OK\n", mode)
-		os.Exit(0)
-	}
-	fmt.Printf("%s FAIL\n", mode)
-	for _, err := range res {
-		fmt.Fprintln(os.Stderr, "==>", err)
-	}
-	os.Exit(1)
-}
-
-func validateMain() (errs results) {
-	errs = append(errs, assertExists(prestartFile)...)
-	errs = append(errs, assertNotExistsAndCreate(mainFile)...)
-	errs = append(errs, assertNotExists(poststopFile)...)
-	errs = append(errs, ValidatePath(standardPath)...)
-	errs = append(errs, ValidateWorkingDirectory(workingDirectory)...)
-	errs = append(errs, ValidateEnvironment(env)...)
-	errs = append(errs, ValidateMountpoints(mps)...)
-	errs = append(errs, ValidateAppNameEnv(an)...)
-	errs = append(errs, ValidateMetadataSvc()...)
-	errs = append(errs, waitForFile(sidekickVolFile, timeout)...)
-	errs = append(errs, assertNotExistsAndCreate(mainVolFile)...)
-	return
-}
-
-func validateSidekick() (errs results) {
-	errs = append(errs, assertNotExistsAndCreate(sidekickVolFile)...)
-	errs = append(errs, waitForFile(mainVolFile, timeout)...)
-	return
-}
-
-func validatePrestart() (errs results) {
-	errs = append(errs, assertNotExistsAndCreate(prestartFile)...)
-	errs = append(errs, assertNotExists(mainFile)...)
-	errs = append(errs, assertNotExists(poststopFile)...)
-	return
-}
-
-func validatePoststop() (errs results) {
-	errs = append(errs, assertExists(prestartFile)...)
-	errs = append(errs, assertExists(mainFile)...)
-	errs = append(errs, assertNotExistsAndCreate(poststopFile)...)
-	return
-}
-
-// ValidatePath ensures that the PATH has been set up correctly within the
-// environment in which this process is being run
-func ValidatePath(wp string) results {
-	r := results{}
-	gp := os.Getenv("PATH")
-	if wp != gp {
-		r = append(r, fmt.Errorf("PATH not set appropriately (need %q, got %q)", wp, gp))
-	}
-	return r
-}
-
-// ValidateWorkingDirectory ensures that the process working directory is set
-// to the desired path.
-func ValidateWorkingDirectory(wwd string) (r results) {
-	gwd, err := os.Getwd()
-	if err != nil {
-		r = append(r, fmt.Errorf("error getting working directory: %v", err))
-		return
-	}
-	if gwd != wwd {
-		r = append(r, fmt.Errorf("working directory not set appropriately (need %q, got %v)", wwd, gwd))
-	}
-	return
-}
-
-// ValidateEnvironment ensures that the given environment contains the
-// necessary/expected environment variables.
-func ValidateEnvironment(wenv map[string]string) (r results) {
-	for wkey, wval := range wenv {
-		gval := os.Getenv(wkey)
-		if gval != wval {
-			err := fmt.Errorf("environment variable %q not set appropriately (need %q, got %q)", wkey, wval, gval)
-			r = append(r, err)
-		}
-	}
-	return
-}
-
-// ValidateAppNameEnv ensures that the environment variable specifying the
-// entrypoint of this process is set correctly.
-func ValidateAppNameEnv(want string) (r results) {
-	if got := os.Getenv(appNameEnv); got != want {
-		r = append(r, fmt.Errorf("%s not set appropriately (need %q, got %q)", appNameEnv, want, got))
-	}
-	return
-}
-
-// ValidateMountpoints ensures that the given mount points are present in the
-// environment in which this process is running
-func ValidateMountpoints(wmp map[string]types.MountPoint) results {
-	r := results{}
-	// TODO(jonboulle): verify actual source
-	for _, mp := range wmp {
-		if err := checkMount(mp.Path, mp.ReadOnly); err != nil {
-			r = append(r, err)
-		}
-	}
-	return r
-}
-
-func metadataRequest(req *http.Request, expectedContentType string) ([]byte, error) {
-	cli := http.Client{
-		Timeout: 100 * time.Millisecond,
-	}
-
-	req.Header["Metadata-Flavor"] = []string{"AppContainer"}
-
-	resp, err := cli.Do(req)
-	if err != nil {
-		return nil, err
-	}
-
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("Get %s failed with %v", req.URL, resp.StatusCode)
-	}
-
-	if respContentType := resp.Header.Get("Content-Type"); respContentType != expectedContentType {
-		return nil, fmt.Errorf("`%v` did not respond with expected Content-Type header.  Expected %s, received %s",
-			req.URL, expectedContentType, respContentType)
-	}
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("Get %s failed on body read: %v", req.URL, err)
-	}
-
-	return body, nil
-}
-
-func metadataGet(metadataURL, path string, expectedContentType string) ([]byte, error) {
-	uri := metadataURL + metadataPathBase + path
-	req, err := http.NewRequest("GET", uri, nil)
-	if err != nil {
-		panic(err)
-	}
-
-	return metadataRequest(req, expectedContentType)
-}
-
-func metadataPost(metadataURL, path string, body []byte, expectedContentType string) ([]byte, error) {
-	uri := metadataURL + metadataPathBase + path
-	req, err := http.NewRequest("POST", uri, bytes.NewBuffer(body))
-	if err != nil {
-		panic(err)
-	}
-	req.Header.Set("Content-Type", "text/plain")
-
-	return metadataRequest(req, expectedContentType)
-}
-
-func metadataPostForm(metadataURL, path string, data url.Values, expectedContentType string) ([]byte, error) {
-	uri := metadataURL + metadataPathBase + path
-	req, err := http.NewRequest("POST", uri, strings.NewReader(data.Encode()))
-	if err != nil {
-		panic(err)
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-
-	return metadataRequest(req, expectedContentType)
-}
-
-func validatePodAnnotations(metadataURL string, pm *schema.PodManifest) results {
-	r := results{}
-
-	var actualAnnots types.Annotations
-
-	annotJson, err := metadataGet(metadataURL, "/pod/annotations", "application/json")
-	if err != nil {
-		return append(r, err)
-	}
-
-	err = json.Unmarshal(annotJson, &actualAnnots)
-	if err != nil {
-		return append(r, err)
-	}
-
-	if !reflect.DeepEqual(actualAnnots, pm.Annotations) {
-		r = append(r, fmt.Errorf("pod annotations mismatch: %v vs %v", actualAnnots, pm.Annotations))
-	}
-
-	return r
-}
-
-func validatePodMetadata(metadataURL string, pm *schema.PodManifest) results {
-	r := results{}
-
-	uuid, err := metadataGet(metadataURL, "/pod/uuid", "text/plain; charset=us-ascii")
-	if err != nil {
-		return append(r, err)
-	}
-
-	_, err = types.NewUUID(string(uuid))
-	if err != nil {
-		return append(r, fmt.Errorf("malformed UUID returned (%v): %v", string(uuid), err))
-	}
-
-	return append(r, validatePodAnnotations(metadataURL, pm)...)
-}
-
-func validateAppAnnotations(metadataURL string, pm *schema.PodManifest, app *schema.RuntimeApp, img *schema.ImageManifest) results {
-	r := results{}
-
-	// build a map of expected annotations by merging app.Annotations
-	// with PodManifest overrides
-	expectedAnnots := app.Annotations
-	a := pm.Apps.Get(app.Name)
-	if a == nil {
-		panic("could not find app in manifest!")
-	}
-	for _, annot := range a.Annotations {
-		expectedAnnots.Set(annot.Name, annot.Value)
-	}
-	if len(expectedAnnots) == 0 {
-		expectedAnnots = nil
-	}
-
-	var actualAnnots types.Annotations
-
-	annotJson, err := metadataGet(metadataURL, "/apps/"+string(app.Name)+"/annotations", "application/json")
-	if err != nil {
-		return append(r, err)
-	}
-
-	err = json.Unmarshal(annotJson, &actualAnnots)
-	if err != nil {
-		return append(r, err)
-	}
-	if len(actualAnnots) == 0 {
-		actualAnnots = nil
-	}
-
-	if !reflect.DeepEqual(actualAnnots, expectedAnnots) {
-		err := fmt.Errorf("%v annotations mismatch: %v vs %v", app.Name, actualAnnots, expectedAnnots)
-		r = append(r, err)
-	}
-
-	return r
-}
-
-func validateAppMetadata(metadataURL string, pm *schema.PodManifest, app *schema.RuntimeApp) results {
-	r := results{}
-
-	am, err := metadataGet(metadataURL, "/apps/"+app.Name.String()+"/image/manifest", "application/json")
-	if err != nil {
-		return append(r, err)
-	}
-
-	img := &schema.ImageManifest{}
-	if err = json.Unmarshal(am, img); err != nil {
-		return append(r, fmt.Errorf("failed to JSON-decode %q manifest: %v", app.Name.String(), err))
-	}
-
-	id, err := metadataGet(metadataURL, "/apps/"+app.Name.String()+"/image/id", "text/plain; charset=us-ascii")
-	if err != nil {
-		r = append(r, err)
-	}
-
-	if string(id) != app.Image.ID.String() {
-		err = fmt.Errorf("%q's image id mismatch: %v vs %v", app.Name.String(), id, app.Image.ID)
-		r = append(r, err)
-	}
-
-	return append(r, validateAppAnnotations(metadataURL, pm, app, img)...)
-}
-
-func validateSigning(metadataURL string, pm *schema.PodManifest) results {
-	r := results{}
-
-	// Get our UUID
-	uuid, err := metadataGet(metadataURL, "/pod/uuid", "text/plain; charset=us-ascii")
-	if err != nil {
-		return append(r, err)
-	}
-
-	plaintext := "Old MacDonald Had A Farm"
-
-	// Sign
-	sig, err := metadataPostForm(metadataURL, "/pod/hmac/sign", url.Values{
-		"content": []string{plaintext},
-	}, "text/plain; charset=us-ascii")
-	if err != nil {
-		return append(r, err)
-	}
-
-	// Verify
-	_, err = metadataPostForm(metadataURL, "/pod/hmac/verify", url.Values{
-		"content":   []string{plaintext},
-		"uuid":      []string{string(uuid)},
-		"signature": []string{string(sig)},
-	}, "text/plain; charset=us-ascii")
-
-	if err != nil {
-		return append(r, err)
-	}
-
-	return r
-}
-
-func ValidateMetadataSvc() results {
-	r := results{}
-
-	metadataURL := os.Getenv("AC_METADATA_URL")
-	if metadataURL == "" {
-		return append(r, fmt.Errorf("AC_METADATA_URL is not set"))
-	}
-
-	pod, err := metadataGet(metadataURL, "/pod/manifest", "application/json")
-	if err != nil {
-		return append(r, err)
-	}
-
-	pm := &schema.PodManifest{}
-	if err = json.Unmarshal(pod, pm); err != nil {
-		return append(r, fmt.Errorf("failed to JSON-decode pod manifest: %v", err))
-	}
-
-	r = append(r, validatePodMetadata(metadataURL, pm)...)
-
-	for _, app := range pm.Apps {
-		app := app
-		r = append(r, validateAppMetadata(metadataURL, pm, &app)...)
-	}
-
-	return append(r, validateSigning(metadataURL, pm)...)
-}
-
-// checkMount checks that the given string is a mount point, and that it is
-// mounted appropriately read-only or not according to the given bool
-func checkMount(d string, readonly bool) error {
-	return checkMountImpl(d, readonly)
-}
-
-// parseMountinfo parses a Reader representing a /proc/PID/mountinfo file and
-// returns whether dir is mounted and if so, whether it is read-only or not
-func parseMountinfo(mountinfo io.Reader, dir string) (isMounted bool, readOnly bool, err error) {
-	sc := bufio.NewScanner(mountinfo)
-	for sc.Scan() {
-		var (
-			mountID      int
-			parentID     int
-			majorMinor   string
-			root         string
-			mountPoint   string
-			mountOptions string
-		)
-
-		_, err := fmt.Sscanf(sc.Text(), "%d %d %s %s %s %s",
-			&mountID, &parentID, &majorMinor, &root, &mountPoint, &mountOptions)
-		if err != nil {
-			return false, false, err
-		}
-
-		if mountPoint == dir {
-			isMounted = true
-			optionsParts := strings.Split(mountOptions, ",")
-			for _, o := range optionsParts {
-				switch o {
-				case "ro":
-					readOnly = true
-				case "rw":
-					readOnly = false
-				}
-			}
-		}
-	}
-
-	return
-}
-
-// assertNotExistsAndCreate asserts that a file at the given path does not
-// exist, and then proceeds to create (touch) the file. It returns any errors
-// encountered at either of these steps.
-func assertNotExistsAndCreate(p string) []error {
-	var errs []error
-	errs = append(errs, assertNotExists(p)...)
-	if err := touchFile(p); err != nil {
-		errs = append(errs, fmt.Errorf("error touching file %q: %v", p, err))
-	}
-	return errs
-}
-
-// assertNotExists asserts that a file at the given path does not exist. A
-// non-empty list of errors is returned if the file exists or any error is
-// encountered while checking.
-func assertNotExists(p string) []error {
-	var errs []error
-	e, err := fileExists(p)
-	if err != nil {
-		errs = append(errs, fmt.Errorf("error checking %q exists: %v", p, err))
-	}
-	if e {
-		errs = append(errs, fmt.Errorf("file %q exists unexpectedly", p))
-	}
-	return errs
-}
-
-// assertExists asserts that a file exists at the given path. A non-empty
-// list of errors is returned if the file does not exist or any error is
-// encountered while checking.
-func assertExists(p string) []error {
-	var errs []error
-	e, err := fileExists(p)
-	if err != nil {
-		errs = append(errs, fmt.Errorf("error checking %q exists: %v", p, err))
-	}
-	if !e {
-		errs = append(errs, fmt.Errorf("file %q does not exist as expected", p))
-	}
-	return errs
-}
-
-// touchFile creates an empty file, returning any error encountered
-func touchFile(p string) error {
-	_, err := os.Create(p)
-	return err
-}
-
-// fileExists checks whether a file exists at the given path
-func fileExists(p string) (bool, error) {
-	_, err := os.Stat(p)
-	if err == nil {
-		return true, nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}
-
-// waitForFile waits for the file at the given path to appear
-func waitForFile(p string, to time.Duration) []error {
-	done := time.After(to)
-	for {
-		select {
-		case <-done:
-			return []error{
-				fmt.Errorf("timed out waiting for %s", p),
-			}
-		case <-time.After(1):
-			if ok, _ := fileExists(p); ok {
-				return nil
-			}
-		}
-	}
-}
-
-func stderr(format string, a ...interface{}) {
-	out := fmt.Sprintf(format, a...)
-	fmt.Fprintln(os.Stderr, strings.TrimSuffix(out, "\n"))
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/aci/build.go b/Godeps/_workspace/src/github.com/appc/spec/aci/build.go
deleted file mode 100644
index 0d259a27f5..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/aci/build.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package aci
-
-import (
-	"archive/tar"
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/appc/spec/pkg/tarheader"
-)
-
-// TarHeaderWalkFunc is the type of the function which allows setting tar
-// headers or filtering out tar entries when building an ACI. It will be
-// applied to every entry in the tar file.
-//
-// If true is returned, the entry will be included in the final ACI; if false,
-// the entry will not be included.
-type TarHeaderWalkFunc func(hdr *tar.Header) bool
-
-// BuildWalker creates a filepath.WalkFunc that walks over the given root
-// (which should represent an ACI layout on disk) and adds the files in the
-// rootfs/ subdirectory to the given ArchiveWriter
-func BuildWalker(root string, aw ArchiveWriter, cb TarHeaderWalkFunc) filepath.WalkFunc {
-	// cache of inode -> filepath, used to leverage hard links in the archive
-	inos := map[uint64]string{}
-	return func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		relpath, err := filepath.Rel(root, path)
-		if err != nil {
-			return err
-		}
-		if relpath == "." {
-			return nil
-		}
-		if relpath == ManifestFile {
-			// ignore; this will be written by the archive writer
-			// TODO(jonboulle): does this make sense? maybe just remove from archivewriter?
-			return nil
-		}
-
-		link := ""
-		var r io.Reader
-		switch info.Mode() & os.ModeType {
-		case os.ModeSocket:
-			return nil
-		case os.ModeNamedPipe:
-		case os.ModeCharDevice:
-		case os.ModeDevice:
-		case os.ModeDir:
-		case os.ModeSymlink:
-			target, err := os.Readlink(path)
-			if err != nil {
-				return err
-			}
-			link = target
-		default:
-			file, err := os.Open(path)
-			if err != nil {
-				return err
-			}
-			defer file.Close()
-			r = file
-		}
-
-		hdr, err := tar.FileInfoHeader(info, link)
-		if err != nil {
-			panic(err)
-		}
-		// Because os.FileInfo's Name method returns only the base
-		// name of the file it describes, it may be necessary to
-		// modify the Name field of the returned header to provide the
-		// full path name of the file.
-		hdr.Name = relpath
-		tarheader.Populate(hdr, info, inos)
-		// If the file is a hard link to a file we've already seen, we
-		// don't need the contents
-		if hdr.Typeflag == tar.TypeLink {
-			hdr.Size = 0
-			r = nil
-		}
-
-		if cb != nil {
-			if !cb(hdr) {
-				return nil
-			}
-		}
-
-		if err := aw.AddFile(hdr, r); err != nil {
-			return err
-		}
-
-		return nil
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/aci/doc.go b/Godeps/_workspace/src/github.com/appc/spec/aci/doc.go
deleted file mode 100644
index 624d431aff..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/aci/doc.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package aci contains various functions for working with App Container Images.
-package aci
diff --git a/Godeps/_workspace/src/github.com/appc/spec/aci/file.go b/Godeps/_workspace/src/github.com/appc/spec/aci/file.go
deleted file mode 100644
index fe4e1b5bd9..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/aci/file.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package aci
-
-import (
-	"archive/tar"
-	"bytes"
-	"compress/bzip2"
-	"compress/gzip"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os/exec"
-	"path/filepath"
-
-	"github.com/appc/spec/schema"
-)
-
-type FileType string
-
-const (
-	TypeGzip    = FileType("gz")
-	TypeBzip2   = FileType("bz2")
-	TypeXz      = FileType("xz")
-	TypeTar     = FileType("tar")
-	TypeText    = FileType("text")
-	TypeUnknown = FileType("unknown")
-
-	readLen = 512 // max bytes to sniff
-
-	hexHdrGzip  = "1f8b"
-	hexHdrBzip2 = "425a68"
-	hexHdrXz    = "fd377a585a00"
-	hexSigTar   = "7573746172"
-
-	tarOffset = 257
-
-	textMime = "text/plain; charset=utf-8"
-)
-
-var (
-	hdrGzip  []byte
-	hdrBzip2 []byte
-	hdrXz    []byte
-	sigTar   []byte
-	tarEnd   int
-)
-
-func mustDecodeHex(s string) []byte {
-	b, err := hex.DecodeString(s)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-func init() {
-	hdrGzip = mustDecodeHex(hexHdrGzip)
-	hdrBzip2 = mustDecodeHex(hexHdrBzip2)
-	hdrXz = mustDecodeHex(hexHdrXz)
-	sigTar = mustDecodeHex(hexSigTar)
-	tarEnd = tarOffset + len(sigTar)
-}
-
-// DetectFileType attempts to detect the type of file that the given reader
-// represents by comparing it against known file signatures (magic numbers)
-func DetectFileType(r io.Reader) (FileType, error) {
-	var b bytes.Buffer
-	n, err := io.CopyN(&b, r, readLen)
-	if err != nil && err != io.EOF {
-		return TypeUnknown, err
-	}
-	bs := b.Bytes()
-	switch {
-	case bytes.HasPrefix(bs, hdrGzip):
-		return TypeGzip, nil
-	case bytes.HasPrefix(bs, hdrBzip2):
-		return TypeBzip2, nil
-	case bytes.HasPrefix(bs, hdrXz):
-		return TypeXz, nil
-	case n > int64(tarEnd) && bytes.Equal(bs[tarOffset:tarEnd], sigTar):
-		return TypeTar, nil
-	case http.DetectContentType(bs) == textMime:
-		return TypeText, nil
-	default:
-		return TypeUnknown, nil
-	}
-}
-
-// XzReader is an io.ReadCloser which decompresses xz compressed data.
-type XzReader struct {
-	io.ReadCloser
-	cmd     *exec.Cmd
-	closech chan error
-}
-
-// NewXzReader shells out to a command line xz executable (if
-// available) to decompress the given io.Reader using the xz
-// compression format and returns an *XzReader.
-// It is the caller's responsibility to call Close on the XzReader when done.
-func NewXzReader(r io.Reader) (*XzReader, error) {
-	rpipe, wpipe := io.Pipe()
-	ex, err := exec.LookPath("xz")
-	if err != nil {
-		log.Fatalf("couldn't find xz executable: %v", err)
-	}
-	cmd := exec.Command(ex, "--decompress", "--stdout")
-
-	closech := make(chan error)
-
-	cmd.Stdin = r
-	cmd.Stdout = wpipe
-
-	go func() {
-		err := cmd.Run()
-		wpipe.CloseWithError(err)
-		closech <- err
-	}()
-
-	return &XzReader{rpipe, cmd, closech}, nil
-}
-
-func (r *XzReader) Close() error {
-	r.ReadCloser.Close()
-	r.cmd.Process.Kill()
-	return <-r.closech
-}
-
-// ManifestFromImage extracts a new schema.ImageManifest from the given ACI image.
-func ManifestFromImage(rs io.ReadSeeker) (*schema.ImageManifest, error) {
-	var im schema.ImageManifest
-
-	tr, err := NewCompressedTarReader(rs)
-	if err != nil {
-		return nil, err
-	}
-	defer tr.Close()
-
-	for {
-		hdr, err := tr.Next()
-		switch err {
-		case io.EOF:
-			return nil, errors.New("missing manifest")
-		case nil:
-			if filepath.Clean(hdr.Name) == ManifestFile {
-				data, err := ioutil.ReadAll(tr)
-				if err != nil {
-					return nil, err
-				}
-				if err := im.UnmarshalJSON(data); err != nil {
-					return nil, err
-				}
-				return &im, nil
-			}
-		default:
-			return nil, fmt.Errorf("error extracting tarball: %v", err)
-		}
-	}
-}
-
-// TarReadCloser embeds a *tar.Reader and the related io.Closer
-// It is the caller's responsibility to call Close on TarReadCloser when
-// done.
-type TarReadCloser struct {
-	*tar.Reader
-	io.Closer
-}
-
-func (r *TarReadCloser) Close() error {
-	return r.Closer.Close()
-}
-
-// NewCompressedTarReader creates a new TarReadCloser reading from the
-// given ACI image.
-// It is the caller's responsibility to call Close on the TarReadCloser
-// when done.
-func NewCompressedTarReader(rs io.ReadSeeker) (*TarReadCloser, error) {
-	cr, err := NewCompressedReader(rs)
-	if err != nil {
-		return nil, err
-	}
-	return &TarReadCloser{tar.NewReader(cr), cr}, nil
-}
-
-// NewCompressedReader creates a new io.ReaderCloser from the given ACI image.
-// It is the caller's responsibility to call Close on the Reader when done.
-func NewCompressedReader(rs io.ReadSeeker) (io.ReadCloser, error) {
-
-	var (
-		dr  io.ReadCloser
-		err error
-	)
-
-	_, err = rs.Seek(0, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	ftype, err := DetectFileType(rs)
-	if err != nil {
-		return nil, err
-	}
-
-	_, err = rs.Seek(0, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	switch ftype {
-	case TypeGzip:
-		dr, err = gzip.NewReader(rs)
-		if err != nil {
-			return nil, err
-		}
-	case TypeBzip2:
-		dr = ioutil.NopCloser(bzip2.NewReader(rs))
-	case TypeXz:
-		dr, err = NewXzReader(rs)
-		if err != nil {
-			return nil, err
-		}
-	case TypeTar:
-		dr = ioutil.NopCloser(rs)
-	case TypeUnknown:
-		return nil, errors.New("error: unknown image filetype")
-	default:
-		return nil, errors.New("no type returned from DetectFileType?")
-	}
-	return dr, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/aci/layout.go b/Godeps/_workspace/src/github.com/appc/spec/aci/layout.go
deleted file mode 100644
index c2cce5635a..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/aci/layout.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package aci
-
-/*
-
-Image Layout
-
-The on-disk layout of an app container is straightforward.
-It includes a rootfs with all of the files that will exist in the root of the app and a manifest describing the image.
-The layout MUST contain an image manifest.
-
-/manifest
-/rootfs/
-/rootfs/usr/bin/mysql
-
-*/
-
-import (
-	"archive/tar"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-)
-
-const (
-	// Path to manifest file inside the layout
-	ManifestFile = "manifest"
-	// Path to rootfs directory inside the layout
-	RootfsDir = "rootfs"
-)
-
-type ErrOldVersion struct {
-	version types.SemVer
-}
-
-func (e ErrOldVersion) Error() string {
-	return fmt.Sprintf("ACVersion too old. Found major version %v, expected %v", e.version.Major, schema.AppContainerVersion.Major)
-}
-
-var (
-	ErrNoRootFS   = errors.New("no rootfs found in layout")
-	ErrNoManifest = errors.New("no image manifest found in layout")
-)
-
-// ValidateLayout takes a directory and validates that the layout of the directory
-// matches that expected by the Application Container Image format.
-// If any errors are encountered during the validation, it will abort and
-// return the first one.
-func ValidateLayout(dir string) error {
-	fi, err := os.Stat(dir)
-	if err != nil {
-		return fmt.Errorf("error accessing layout: %v", err)
-	}
-	if !fi.IsDir() {
-		return fmt.Errorf("given path %q is not a directory", dir)
-	}
-	var flist []string
-	var imOK, rfsOK bool
-	var im io.Reader
-	walkLayout := func(fpath string, fi os.FileInfo, err error) error {
-		rpath, err := filepath.Rel(dir, fpath)
-		if err != nil {
-			return err
-		}
-		switch rpath {
-		case ".":
-		case ManifestFile:
-			im, err = os.Open(fpath)
-			if err != nil {
-				return err
-			}
-			imOK = true
-		case RootfsDir:
-			if !fi.IsDir() {
-				return errors.New("rootfs is not a directory")
-			}
-			rfsOK = true
-		default:
-			flist = append(flist, rpath)
-		}
-		return nil
-	}
-	if err := filepath.Walk(dir, walkLayout); err != nil {
-		return err
-	}
-	return validate(imOK, im, rfsOK, flist)
-}
-
-// ValidateArchive takes a *tar.Reader and validates that the layout of the
-// filesystem the reader encapsulates matches that expected by the
-// Application Container Image format.  If any errors are encountered during
-// the validation, it will abort and return the first one.
-func ValidateArchive(tr *tar.Reader) error {
-	var fseen map[string]bool = make(map[string]bool)
-	var imOK, rfsOK bool
-	var im bytes.Buffer
-Tar:
-	for {
-		hdr, err := tr.Next()
-		switch {
-		case err == nil:
-		case err == io.EOF:
-			break Tar
-		default:
-			return err
-		}
-		name := filepath.Clean(hdr.Name)
-		switch name {
-		case ".":
-		case ManifestFile:
-			_, err := io.Copy(&im, tr)
-			if err != nil {
-				return err
-			}
-			imOK = true
-		case RootfsDir:
-			if !hdr.FileInfo().IsDir() {
-				return fmt.Errorf("rootfs is not a directory")
-			}
-			rfsOK = true
-		default:
-			if _, seen := fseen[name]; seen {
-				return fmt.Errorf("duplicate file entry in archive: %s", name)
-			}
-			fseen[name] = true
-		}
-	}
-	var flist []string
-	for key := range fseen {
-		flist = append(flist, key)
-	}
-	return validate(imOK, &im, rfsOK, flist)
-}
-
-func validate(imOK bool, im io.Reader, rfsOK bool, files []string) error {
-	defer func() {
-		if rc, ok := im.(io.Closer); ok {
-			rc.Close()
-		}
-	}()
-	if !imOK {
-		return ErrNoManifest
-	}
-	if !rfsOK {
-		return ErrNoRootFS
-	}
-	b, err := ioutil.ReadAll(im)
-	if err != nil {
-		return fmt.Errorf("error reading image manifest: %v", err)
-	}
-	var a schema.ImageManifest
-	if err := a.UnmarshalJSON(b); err != nil {
-		return fmt.Errorf("image manifest validation failed: %v", err)
-	}
-	if a.ACVersion.LessThanMajor(schema.AppContainerVersion) {
-		return ErrOldVersion{
-			version: a.ACVersion,
-		}
-	}
-	for _, f := range files {
-		if !strings.HasPrefix(f, "rootfs") {
-			return fmt.Errorf("unrecognized file path in layout: %q", f)
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/aci/writer.go b/Godeps/_workspace/src/github.com/appc/spec/aci/writer.go
deleted file mode 100644
index 070b09ba53..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/aci/writer.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package aci
-
-import (
-	"archive/tar"
-	"bytes"
-	"encoding/json"
-	"io"
-	"time"
-
-	"github.com/appc/spec/schema"
-)
-
-// ArchiveWriter writes App Container Images. Users wanting to create an ACI or
-// should create an ArchiveWriter and add files to it; the ACI will be written
-// to the underlying tar.Writer
-type ArchiveWriter interface {
-	AddFile(hdr *tar.Header, r io.Reader) error
-	Close() error
-}
-
-type imageArchiveWriter struct {
-	*tar.Writer
-	am *schema.ImageManifest
-}
-
-// NewImageWriter creates a new ArchiveWriter which will generate an App
-// Container Image based on the given manifest and write it to the given
-// tar.Writer
-func NewImageWriter(am schema.ImageManifest, w *tar.Writer) ArchiveWriter {
-	aw := &imageArchiveWriter{
-		w,
-		&am,
-	}
-	return aw
-}
-
-func (aw *imageArchiveWriter) AddFile(hdr *tar.Header, r io.Reader) error {
-	err := aw.Writer.WriteHeader(hdr)
-	if err != nil {
-		return err
-	}
-
-	if r != nil {
-		_, err := io.Copy(aw.Writer, r)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (aw *imageArchiveWriter) addFileNow(path string, contents []byte) error {
-	buf := bytes.NewBuffer(contents)
-	now := time.Now()
-	hdr := tar.Header{
-		Name:       path,
-		Mode:       0644,
-		Uid:        0,
-		Gid:        0,
-		Size:       int64(buf.Len()),
-		ModTime:    now,
-		Typeflag:   tar.TypeReg,
-		Uname:      "root",
-		Gname:      "root",
-		ChangeTime: now,
-	}
-	return aw.AddFile(&hdr, buf)
-}
-
-func (aw *imageArchiveWriter) addManifest(name string, m json.Marshaler) error {
-	out, err := m.MarshalJSON()
-	if err != nil {
-		return err
-	}
-	return aw.addFileNow(name, out)
-}
-
-func (aw *imageArchiveWriter) Close() error {
-	if err := aw.addManifest(ManifestFile, aw.am); err != nil {
-		return err
-	}
-	return aw.Writer.Close()
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/actool.go b/Godeps/_workspace/src/github.com/appc/spec/actool/actool.go
deleted file mode 100644
index 21c5f5fa90..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/actool.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"strings"
-	"text/tabwriter"
-)
-
-const (
-	cliName        = "actool"
-	cliDescription = "actool, the application container tool"
-)
-
-var (
-	globalFlagset = flag.NewFlagSet(cliName, flag.ExitOnError)
-	out           *tabwriter.Writer
-	commands      []*Command
-	globalFlags   = struct {
-		Dir   string
-		Debug bool
-		Help  bool
-	}{}
-	transportFlags = struct {
-		Insecure bool
-	}{}
-)
-
-func init() {
-	globalFlagset.BoolVar(&globalFlags.Help, "help", false, "Print usage information and exit")
-	globalFlagset.BoolVar(&globalFlags.Debug, "debug", false, "Print verbose (debug) output")
-}
-
-type Command struct {
-	Name        string       // Name of the Command and the string to use to invoke it
-	Summary     string       // One-sentence summary of what the Command does
-	Usage       string       // Usage options/arguments
-	Description string       // Detailed description of command
-	Flags       flag.FlagSet // Set of flags associated with this command
-
-	Run func(args []string) int // Run a command with the given arguments, return exit status
-}
-
-func init() {
-	out = new(tabwriter.Writer)
-	out.Init(os.Stdout, 0, 8, 1, '\t', 0)
-	commands = []*Command{
-		cmdBuild,
-		cmdCatManifest,
-		cmdDiscover,
-		cmdHelp,
-		cmdPatchManifest,
-		cmdValidate,
-		cmdVersion,
-	}
-}
-
-func main() {
-	// parse global arguments
-	globalFlagset.Parse(os.Args[1:])
-	args := globalFlagset.Args()
-	if len(args) < 1 || globalFlags.Help {
-		args = []string{"help"}
-	}
-
-	var cmd *Command
-
-	// determine which Command should be run
-	for _, c := range commands {
-		if c.Name == args[0] {
-			cmd = c
-			if err := c.Flags.Parse(args[1:]); err != nil {
-				stderr("%v", err)
-				os.Exit(2)
-			}
-			break
-		}
-	}
-
-	if cmd == nil {
-		stderr("%v: unknown subcommand: %q", cliName, args[0])
-		stderr("Run '%v help' for usage.", cliName)
-		os.Exit(2)
-	}
-	os.Exit(cmd.Run(cmd.Flags.Args()))
-}
-
-func getAllFlags() (flags []*flag.Flag) {
-	return getFlags(globalFlagset)
-}
-
-func getFlags(flagset *flag.FlagSet) (flags []*flag.Flag) {
-	flags = make([]*flag.Flag, 0)
-	flagset.VisitAll(func(f *flag.Flag) {
-		flags = append(flags, f)
-	})
-	return
-}
-
-func stderr(format string, a ...interface{}) {
-	out := fmt.Sprintf(format, a...)
-	fmt.Fprintln(os.Stderr, strings.TrimSuffix(out, "\n"))
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/build.go b/Godeps/_workspace/src/github.com/appc/spec/actool/build.go
deleted file mode 100644
index 1c958eba45..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/build.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"archive/tar"
-	"compress/gzip"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-
-	"github.com/appc/spec/aci"
-	"github.com/appc/spec/schema"
-)
-
-var (
-	buildNocompress bool
-	buildOverwrite  bool
-	buildOwnerRoot  bool
-	cmdBuild        = &Command{
-		Name: "build",
-		Description: `Build an ACI from a given directory. The directory should
-contain an Image Layout. The Image Layout will be validated
-before the ACI is created. The produced ACI will be
-gzip-compressed by default.`,
-		Summary: "Build an ACI from an Image Layout (experimental)",
-		Usage:   `[--overwrite] [--no-compression] [--owner-root] DIRECTORY OUTPUT_FILE`,
-		Run:     runBuild,
-	}
-)
-
-func init() {
-	cmdBuild.Flags.BoolVar(&buildOverwrite, "overwrite", false, "Overwrite target file if it already exists")
-	cmdBuild.Flags.BoolVar(&buildOwnerRoot, "owner-root", false, "Force ownership to root:root on all files")
-	cmdBuild.Flags.BoolVar(&buildNocompress, "no-compression", false, "Do not gzip-compress the produced ACI")
-}
-
-func runBuild(args []string) (exit int) {
-	if len(args) != 2 {
-		stderr("build: Must provide directory and output file")
-		return 1
-	}
-
-	root := args[0]
-	tgt := args[1]
-	ext := filepath.Ext(tgt)
-	if ext != schema.ACIExtension {
-		stderr("build: Extension must be %s (given %s)", schema.ACIExtension, ext)
-		return 1
-	}
-
-	// TODO(jonboulle): stream the validation so we don't have to walk the rootfs twice
-	if err := aci.ValidateLayout(root); err != nil {
-		if e, ok := err.(aci.ErrOldVersion); ok {
-			stderr("build: Warning: %v. Please update your manifest.", e)
-		} else {
-			stderr("build: Layout failed validation: %v", err)
-			return 1
-		}
-	}
-
-	mode := os.O_CREATE | os.O_WRONLY
-	if buildOverwrite {
-		mode |= os.O_TRUNC
-	} else {
-		mode |= os.O_EXCL
-	}
-	fh, err := os.OpenFile(tgt, mode, 0644)
-	if err != nil {
-		if os.IsExist(err) {
-			stderr("build: Target file exists (try --overwrite)")
-		} else {
-			stderr("build: Unable to open target %s: %v", tgt, err)
-		}
-		return 1
-	}
-
-	var gw *gzip.Writer
-	var r io.WriteCloser = fh
-	if !buildNocompress {
-		gw = gzip.NewWriter(fh)
-		r = gw
-	}
-	tr := tar.NewWriter(r)
-
-	defer func() {
-		tr.Close()
-		if !buildNocompress {
-			gw.Close()
-		}
-		fh.Close()
-		if exit != 0 && !buildOverwrite {
-			os.Remove(tgt)
-		}
-	}()
-
-	mpath := filepath.Join(root, aci.ManifestFile)
-	b, err := ioutil.ReadFile(mpath)
-	if err != nil {
-		stderr("build: Unable to read Image Manifest: %v", err)
-		return 1
-	}
-	var im schema.ImageManifest
-	if err := im.UnmarshalJSON(b); err != nil {
-		stderr("build: Unable to load Image Manifest: %v", err)
-		return 1
-	}
-	iw := aci.NewImageWriter(im, tr)
-
-	var walkerCb aci.TarHeaderWalkFunc
-	if buildOwnerRoot {
-		walkerCb = func(hdr *tar.Header) bool {
-			hdr.Uid, hdr.Gid = 0, 0
-			hdr.Uname, hdr.Gname = "root", "root"
-			return true
-		}
-	}
-
-	err = filepath.Walk(root, aci.BuildWalker(root, iw, walkerCb))
-	if err != nil {
-		stderr("build: Error walking rootfs: %v", err)
-		return 1
-	}
-
-	err = iw.Close()
-	if err != nil {
-		stderr("build: Unable to close image %s: %v", tgt, err)
-		return 1
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go b/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go
deleted file mode 100644
index f91f526d7b..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"runtime"
-	"strings"
-
-	"github.com/appc/spec/discovery"
-)
-
-var (
-	outputJson  bool
-	cmdDiscover = &Command{
-		Name:        "discover",
-		Description: "Discover the download URLs for an app",
-		Summary:     "Discover the download URLs for one or more app container images",
-		Usage:       "[--json] APP...",
-		Run:         runDiscover,
-	}
-)
-
-func init() {
-	cmdDiscover.Flags.BoolVar(&transportFlags.Insecure, "insecure", false,
-		"Don't check TLS certificates and allow insecure non-TLS downloads over http")
-	cmdDiscover.Flags.BoolVar(&outputJson, "json", false,
-		"Output result as JSON")
-}
-
-func runDiscover(args []string) (exit int) {
-	if len(args) < 1 {
-		stderr("discover: at least one name required")
-	}
-
-	for _, name := range args {
-		app, err := discovery.NewAppFromString(name)
-		if app.Labels["os"] == "" {
-			app.Labels["os"] = runtime.GOOS
-		}
-		if app.Labels["arch"] == "" {
-			app.Labels["arch"] = runtime.GOARCH
-		}
-		if err != nil {
-			stderr("%s: %s", name, err)
-			return 1
-		}
-		insecure := discovery.InsecureNone
-		if transportFlags.Insecure {
-			insecure = discovery.InsecureTLS | discovery.InsecureHTTP
-		}
-		eps, attempts, err := discovery.DiscoverACIEndpoints(*app, nil, insecure)
-		if err != nil {
-			stderr("error fetching endpoints for %s: %s", name, err)
-			return 1
-		}
-		for _, a := range attempts {
-			fmt.Printf("discover endpoints walk: prefix: %s error: %v\n", a.Prefix, a.Error)
-		}
-		publicKeys, attempts, err := discovery.DiscoverPublicKeys(*app, nil, insecure)
-		if err != nil {
-			stderr("error fetching public keys for %s: %s", name, err)
-			return 1
-		}
-		for _, a := range attempts {
-			fmt.Printf("discover public keys walk: prefix: %s error: %v\n", a.Prefix, a.Error)
-		}
-
-		type discoveryData struct {
-			ACIEndpoints []discovery.ACIEndpoint
-			PublicKeys   []string
-		}
-
-		if outputJson {
-			dd := discoveryData{ACIEndpoints: eps, PublicKeys: publicKeys}
-			jsonBytes, err := json.MarshalIndent(dd, "", "    ")
-			if err != nil {
-				stderr("error generating JSON: %s", err)
-				return 1
-			}
-			fmt.Println(string(jsonBytes))
-		} else {
-			for _, aciEndpoint := range eps {
-				fmt.Printf("ACI: %s, ASC: %s\n", aciEndpoint.ACI, aciEndpoint.ASC)
-			}
-			if len(publicKeys) > 0 {
-				fmt.Println("PublicKeys: " + strings.Join(publicKeys, ","))
-			}
-		}
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/doc.go b/Godeps/_workspace/src/github.com/appc/spec/actool/doc.go
deleted file mode 100644
index e0e446d203..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/doc.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package main contains a tool for building and validating images and
-// manifests that meet the App Container specifications.
-package main
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/help.go b/Godeps/_workspace/src/github.com/appc/spec/actool/help.go
deleted file mode 100644
index 25fa5622cc..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/help.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"strings"
-	"text/template"
-
-	"github.com/appc/spec/schema"
-)
-
-var (
-	cmdHelp = &Command{
-		Name:        "help",
-		Summary:     "Show a list of commands or help for one command",
-		Usage:       "[COMMAND]",
-		Description: "Show a list of commands or detailed help for one command",
-		Run:         runHelp,
-	}
-
-	globalUsageTemplate  *template.Template
-	commandUsageTemplate *template.Template
-	templFuncs           = template.FuncMap{
-		"descToLines": func(s string) []string {
-			// trim leading/trailing whitespace and split into slice of lines
-			return strings.Split(strings.Trim(s, "\n\t "), "\n")
-		},
-		"printOption": func(name, defvalue, usage string) string {
-			prefix := "--"
-			if len(name) == 1 {
-				prefix = "-"
-			}
-			return fmt.Sprintf("\t%s%s=%s\t%s", prefix, name, defvalue, usage)
-		},
-	}
-)
-
-func init() {
-	globalUsageTemplate = template.Must(template.New("global_usage").Funcs(templFuncs).Parse(`
-NAME:
-{{printf "\t%s - %s" .Executable .Description}}
-
-USAGE:
-{{printf "\t%s" .Executable}} [global options] <command> [command options] [arguments...]
-
-VERSION:
-{{printf "\t%s" .Version}}
-
-COMMANDS:{{range .Commands}}
-{{printf "\t%s\t%s" .Name .Summary}}{{end}}
-
-GLOBAL OPTIONS:{{range .Flags}}
-{{printOption .Name .DefValue .Usage}}{{end}}
-
-Run "{{.Executable}} help <command>" for more details on a specific command.
-`[1:]))
-	commandUsageTemplate = template.Must(template.New("command_usage").Funcs(templFuncs).Parse(`
-NAME:
-{{printf "\t%s - %s" .Cmd.Name .Cmd.Summary}}
-
-USAGE:
-{{printf "\t%s %s %s" .Executable .Cmd.Name .Cmd.Usage}}
-
-DESCRIPTION:
-{{range $line := descToLines .Cmd.Description}}{{printf "\t%s" $line}}
-{{end}}
-{{if .CmdFlags}}OPTIONS:{{range .CmdFlags}}
-{{printOption .Name .DefValue .Usage}}{{end}}
-
-{{end}}For help on global options run "{{.Executable}} help"
-`[1:]))
-}
-
-func runHelp(args []string) (exit int) {
-	if len(args) < 1 {
-		printGlobalUsage()
-		return
-	}
-
-	var cmd *Command
-
-	for _, c := range commands {
-		if c.Name == args[0] {
-			cmd = c
-			break
-		}
-	}
-
-	if cmd == nil {
-		stderr("Unrecognized command: %s", args[0])
-		return 1
-	}
-
-	printCommandUsage(cmd)
-	return
-}
-
-func printGlobalUsage() {
-	globalUsageTemplate.Execute(out, struct {
-		Executable  string
-		Commands    []*Command
-		Flags       []*flag.Flag
-		Description string
-		Version     string
-	}{
-		cliName,
-		commands,
-		getAllFlags(),
-		cliDescription,
-		schema.AppContainerVersion.String(),
-	})
-	out.Flush()
-}
-
-func printCommandUsage(cmd *Command) {
-	commandUsageTemplate.Execute(out, struct {
-		Executable string
-		Cmd        *Command
-		CmdFlags   []*flag.Flag
-	}{
-		cliName,
-		cmd,
-		getFlags(&cmd.Flags),
-	})
-	out.Flush()
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go b/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go
deleted file mode 100644
index 46662167dc..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/manifest.go
+++ /dev/null
@@ -1,525 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"archive/tar"
-	"compress/gzip"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/appc/spec/aci"
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-)
-
-var (
-	inputFile  string
-	outputFile string
-
-	patchNocompress        bool
-	patchOverwrite         bool
-	patchReplace           bool
-	patchManifestFile      string
-	patchName              string
-	patchExec              string
-	patchUser              string
-	patchGroup             string
-	patchSupplementaryGIDs string
-	patchCaps              string
-	patchRevokeCaps        string
-	patchMounts            string
-	patchPorts             string
-	patchIsolators         string
-
-	catPrettyPrint bool
-
-	cmdPatchManifest = &Command{
-		Name:        "patch-manifest",
-		Description: `Copy an ACI and patch its manifest.`,
-		Summary:     "Copy an ACI and patch its manifest (experimental)",
-		Usage: `
-		  [--manifest=MANIFEST_FILE]
-		  [--name=example.com/app]
-		  [--exec="/app --debug"]
-		  [--user=uid] [--group=gid]
-		  [--capability=CAP_SYS_ADMIN,CAP_NET_ADMIN]
-		  [--revoke-capability=CAP_SYS_CHROOT,CAP_MKNOD]
-		  [--mounts=work,path=/opt,readOnly=true[:work2,...]]
-		  [--ports=query,protocol=tcp,port=8080[:query2,...]]
-		  [--supplementary-groups=gid1,gid2,...]
-		  [--isolators=resource/cpu,request=50m,limit=100m[:resource/memory,...]]
-		  [--replace]
-		  INPUT_ACI_FILE
-		  [OUTPUT_ACI_FILE]`,
-		Run: runPatchManifest,
-	}
-	cmdCatManifest = &Command{
-		Name:        "cat-manifest",
-		Description: `Print the manifest from an ACI.`,
-		Summary:     "Print the manifest from an ACI",
-		Usage:       ` [--pretty-print] ACI_FILE`,
-		Run:         runCatManifest,
-	}
-)
-
-func init() {
-	cmdPatchManifest.Flags.BoolVar(&patchOverwrite, "overwrite", false, "Overwrite target file if it already exists")
-	cmdPatchManifest.Flags.BoolVar(&patchNocompress, "no-compression", false, "Do not gzip-compress the produced ACI")
-	cmdPatchManifest.Flags.BoolVar(&patchReplace, "replace", false, "Replace the input file")
-
-	cmdPatchManifest.Flags.StringVar(&patchManifestFile, "manifest", "", "Replace image manifest with this file. Incompatible with other replace options.")
-	cmdPatchManifest.Flags.StringVar(&patchName, "name", "", "Replace name")
-	cmdPatchManifest.Flags.StringVar(&patchExec, "exec", "", "Replace the command line to launch the executable")
-	cmdPatchManifest.Flags.StringVar(&patchUser, "user", "", "Replace user")
-	cmdPatchManifest.Flags.StringVar(&patchGroup, "group", "", "Replace group")
-	cmdPatchManifest.Flags.StringVar(&patchSupplementaryGIDs, "supplementary-groups", "", "Replace supplementary groups, expects a comma-separated list.")
-	cmdPatchManifest.Flags.StringVar(&patchCaps, "capability", "", "Set the capability remain set")
-	cmdPatchManifest.Flags.StringVar(&patchRevokeCaps, "revoke-capability", "", "Set the capability remove set")
-	cmdPatchManifest.Flags.StringVar(&patchMounts, "mounts", "", "Replace mount points")
-	cmdPatchManifest.Flags.StringVar(&patchPorts, "ports", "", "Replace ports")
-	cmdPatchManifest.Flags.StringVar(&patchIsolators, "isolators", "", "Replace isolators")
-
-	cmdCatManifest.Flags.BoolVar(&catPrettyPrint, "pretty-print", false, "Print with better style")
-}
-
-func getIsolatorStr(name, value string) string {
-	return fmt.Sprintf(`
-                {
-                    "name": "%s",
-                    "value": { %s }
-                }`, name, value)
-}
-
-func isolatorStrFromString(is string) (types.ACIdentifier, string, error) {
-	is = "name=" + is
-	v, err := url.ParseQuery(strings.Replace(is, ",", "&", -1))
-	if err != nil {
-		return "", "", err
-	}
-
-	var name string
-	var values []string
-	var acn *types.ACIdentifier
-
-	for key, val := range v {
-		if len(val) > 1 {
-			return "", "", fmt.Errorf("label %s with multiple values %q", key, val)
-		}
-
-		switch key {
-		case "name":
-			acn, err = types.NewACIdentifier(val[0])
-			if err != nil {
-				return "", "", err
-			}
-			name = val[0]
-		default:
-			// (TODO)yifan: Not support the default boolean yet.
-			values = append(values, fmt.Sprintf(`"%s": "%s"`, key, val[0]))
-		}
-	}
-	return *acn, getIsolatorStr(name, strings.Join(values, ", ")), nil
-}
-
-func patchManifest(im *schema.ImageManifest) error {
-
-	if patchName != "" {
-		name, err := types.NewACIdentifier(patchName)
-		if err != nil {
-			return err
-		}
-		im.Name = *name
-	}
-
-	var app *types.App = im.App
-	if patchExec != "" {
-		if app == nil {
-			// if the original manifest was missing an app and
-			// patchExec is set let's assume the user is trying to
-			// inject one...
-			im.App = &types.App{}
-			app = im.App
-		}
-		app.Exec = strings.Split(patchExec, " ")
-	}
-
-	if patchUser != "" ||
-		patchGroup != "" ||
-		patchSupplementaryGIDs != "" ||
-		patchCaps != "" ||
-		patchRevokeCaps != "" ||
-		patchMounts != "" ||
-		patchPorts != "" ||
-		patchIsolators != "" {
-		// ...but if we still don't have an app and the user is trying
-		// to patch one of its other parameters, it's an error
-		if app == nil {
-			return fmt.Errorf("no app in the supplied manifest and no exec command provided")
-		}
-	}
-
-	if patchUser != "" {
-		app.User = patchUser
-	}
-
-	if patchGroup != "" {
-		app.Group = patchGroup
-	}
-
-	if patchSupplementaryGIDs != "" {
-		app.SupplementaryGIDs = []int{}
-		gids := strings.Split(patchSupplementaryGIDs, ",")
-		for _, g := range gids {
-			gid, err := strconv.Atoi(g)
-			if err != nil {
-				return fmt.Errorf("invalid supplementary group %q: %v", g, err)
-			}
-			app.SupplementaryGIDs = append(app.SupplementaryGIDs, gid)
-		}
-	}
-
-	if patchCaps != "" {
-		isolator := app.Isolators.GetByName(types.LinuxCapabilitiesRetainSetName)
-		if isolator != nil {
-			return fmt.Errorf("isolator already exists (os/linux/capabilities-retain-set)")
-		}
-
-		// Instantiate a Isolator with the content specified by the --capability
-		// parameter.
-		caps, err := types.NewLinuxCapabilitiesRetainSet(strings.Split(patchCaps, ",")...)
-		if err != nil {
-			return fmt.Errorf("cannot parse capability %q: %v", patchCaps, err)
-		}
-		app.Isolators = append(app.Isolators, caps.AsIsolator())
-	}
-	if patchRevokeCaps != "" {
-		isolator := app.Isolators.GetByName(types.LinuxCapabilitiesRevokeSetName)
-		if isolator != nil {
-			return fmt.Errorf("isolator already exists (os/linux/capabilities-remove-set)")
-		}
-
-		// Instantiate a Isolator with the content specified by the --revoke-capability
-		// parameter.
-		caps, err := types.NewLinuxCapabilitiesRevokeSet(strings.Split(patchRevokeCaps, ",")...)
-		if err != nil {
-			return fmt.Errorf("cannot parse capability %q: %v", patchRevokeCaps, err)
-		}
-		app.Isolators = append(app.Isolators, caps.AsIsolator())
-	}
-
-	if patchMounts != "" {
-		mounts := strings.Split(patchMounts, ":")
-		for _, m := range mounts {
-			mountPoint, err := types.MountPointFromString(m)
-			if err != nil {
-				return fmt.Errorf("cannot parse mount point %q: %v", m, err)
-			}
-			app.MountPoints = append(app.MountPoints, *mountPoint)
-		}
-	}
-
-	if patchPorts != "" {
-		ports := strings.Split(patchPorts, ":")
-		for _, p := range ports {
-			port, err := types.PortFromString(p)
-			if err != nil {
-				return fmt.Errorf("cannot parse port %q: %v", p, err)
-			}
-			app.Ports = append(app.Ports, *port)
-		}
-	}
-
-	if patchIsolators != "" {
-		isolators := strings.Split(patchIsolators, ":")
-		for _, is := range isolators {
-			name, isolatorStr, err := isolatorStrFromString(is)
-			if err != nil {
-				return fmt.Errorf("cannot parse isolator %q: %v", is, err)
-			}
-
-			_, ok := types.ResourceIsolatorNames[name]
-
-			if name == types.LinuxNoNewPrivilegesName {
-				ok = true
-				kv := strings.Split(is, ",")
-				if len(kv) != 2 {
-					return fmt.Errorf("isolator %s: invalid format", name)
-				}
-
-				isolatorStr = fmt.Sprintf(`{ "name": "%s", "value": %s }`, name, kv[1])
-			}
-
-			if !ok {
-				return fmt.Errorf("isolator %s is not supported for patching", name)
-			}
-
-			isolator := &types.Isolator{}
-			if err := isolator.UnmarshalJSON([]byte(isolatorStr)); err != nil {
-				return fmt.Errorf("cannot unmarshal isolator %v: %v", isolatorStr, err)
-			}
-			app.Isolators = append(app.Isolators, *isolator)
-		}
-	}
-	return nil
-}
-
-// extractManifest iterates over the tar reader and locate the manifest. Once
-// located, the manifest can be printed, replaced or patched.
-func extractManifest(tr *tar.Reader, tw *tar.Writer, printManifest bool, newManifest []byte) error {
-Tar:
-	for {
-		hdr, err := tr.Next()
-		switch err {
-		case io.EOF:
-			break Tar
-		case nil:
-			if filepath.Clean(hdr.Name) == aci.ManifestFile {
-				var new_bytes []byte
-
-				bytes, err := ioutil.ReadAll(tr)
-				if err != nil {
-					return err
-				}
-
-				if printManifest && !catPrettyPrint {
-					fmt.Println(string(bytes))
-				}
-
-				im := &schema.ImageManifest{}
-				err = im.UnmarshalJSON(bytes)
-				if err != nil {
-					return err
-				}
-
-				if printManifest && catPrettyPrint {
-					output, err := json.MarshalIndent(im, "", "    ")
-					if err != nil {
-						return err
-					}
-					fmt.Println(string(output))
-				}
-
-				if tw == nil {
-					return nil
-				}
-
-				if len(newManifest) == 0 {
-					err = patchManifest(im)
-					if err != nil {
-						return err
-					}
-
-					new_bytes, err = im.MarshalJSON()
-					if err != nil {
-						return err
-					}
-				} else {
-					new_bytes = newManifest
-				}
-
-				hdr.Size = int64(len(new_bytes))
-				err = tw.WriteHeader(hdr)
-				if err != nil {
-					return err
-				}
-
-				_, err = tw.Write(new_bytes)
-				if err != nil {
-					return err
-				}
-			} else if tw != nil {
-				err := tw.WriteHeader(hdr)
-				if err != nil {
-					return err
-				}
-				_, err = io.Copy(tw, tr)
-				if err != nil {
-					return err
-				}
-			}
-		default:
-			return fmt.Errorf("error reading tarball: %v", err)
-		}
-	}
-
-	return nil
-}
-
-func runPatchManifest(args []string) (exit int) {
-	var fh *os.File
-	var err error
-
-	if patchReplace && patchOverwrite {
-		stderr("patch-manifest: Cannot use both --replace and --overwrite")
-		return 1
-	}
-	if !patchReplace && len(args) != 2 {
-		stderr("patch-manifest: Must provide input and output files (or use --replace)")
-		return 1
-	}
-	if patchReplace && len(args) != 1 {
-		stderr("patch-manifest: Must provide one file")
-		return 1
-	}
-	if patchManifestFile != "" && (patchName != "" || patchExec != "" || patchUser != "" || patchGroup != "" || patchCaps != "" || patchMounts != "") {
-		stderr("patch-manifest: --manifest is incompatible with other manifest editing options")
-		return 1
-	}
-
-	inputFile = args[0]
-
-	// Prepare output writer
-
-	if patchReplace {
-		fh, err = ioutil.TempFile(path.Dir(inputFile), ".actool-tmp."+path.Base(inputFile)+"-")
-		if err != nil {
-			stderr("patch-manifest: Cannot create temporary file: %v", err)
-			return 1
-		}
-	} else {
-		outputFile = args[1]
-
-		ext := filepath.Ext(outputFile)
-		if ext != schema.ACIExtension {
-			stderr("patch-manifest: Extension must be %s (given %s)", schema.ACIExtension, ext)
-			return 1
-		}
-
-		mode := os.O_CREATE | os.O_WRONLY
-		if patchOverwrite {
-			mode |= os.O_TRUNC
-		} else {
-			mode |= os.O_EXCL
-		}
-
-		fh, err = os.OpenFile(outputFile, mode, 0644)
-		if err != nil {
-			if os.IsExist(err) {
-				stderr("patch-manifest: Output file exists (try --overwrite)")
-			} else {
-				stderr("patch-manifest: Unable to open output %s: %v", outputFile, err)
-			}
-			return 1
-		}
-	}
-
-	var gw *gzip.Writer
-	var w io.WriteCloser = fh
-	if !patchNocompress {
-		gw = gzip.NewWriter(fh)
-		w = gw
-	}
-	tw := tar.NewWriter(w)
-
-	defer func() {
-		tw.Close()
-		if !patchNocompress {
-			gw.Close()
-		}
-		fh.Close()
-		if exit != 0 && !patchOverwrite {
-			os.Remove(fh.Name())
-		}
-	}()
-
-	// Prepare input reader
-
-	input, err := os.Open(inputFile)
-	if err != nil {
-		stderr("patch-manifest: Cannot open %s: %v", inputFile, err)
-		return 1
-	}
-	defer input.Close()
-
-	tr, err := aci.NewCompressedTarReader(input)
-	if err != nil {
-		stderr("patch-manifest: Cannot extract %s: %v", inputFile, err)
-		return 1
-	}
-	defer tr.Close()
-
-	var newManifest []byte
-
-	if patchManifestFile != "" {
-		mr, err := os.Open(patchManifestFile)
-		if err != nil {
-			stderr("patch-manifest: Cannot open %s: %v", patchManifestFile, err)
-			return 1
-		}
-		defer input.Close()
-
-		newManifest, err = ioutil.ReadAll(mr)
-		if err != nil {
-			stderr("patch-manifest: Cannot read %s: %v", patchManifestFile, err)
-			return 1
-		}
-	}
-
-	err = extractManifest(tr.Reader, tw, false, newManifest)
-	if err != nil {
-		stderr("patch-manifest: Unable to read %s: %v", inputFile, err)
-		return 1
-	}
-
-	if patchReplace {
-		err = os.Rename(fh.Name(), inputFile)
-		if err != nil {
-			stderr("patch-manifest: Cannot rename %q to %q: %v", fh.Name, inputFile, err)
-			return 1
-		}
-	}
-
-	return
-}
-
-func runCatManifest(args []string) (exit int) {
-	if len(args) != 1 {
-		stderr("cat-manifest: Must provide one file")
-		return 1
-	}
-
-	inputFile = args[0]
-
-	input, err := os.Open(inputFile)
-	if err != nil {
-		stderr("cat-manifest: Cannot open %s: %v", inputFile, err)
-		return 1
-	}
-	defer input.Close()
-
-	tr, err := aci.NewCompressedTarReader(input)
-	if err != nil {
-		stderr("cat-manifest: Cannot extract %s: %v", inputFile, err)
-		return 1
-	}
-	defer tr.Close()
-
-	err = extractManifest(tr.Reader, nil, true, nil)
-	if err != nil {
-		stderr("cat-manifest: Unable to read %s: %v", inputFile, err)
-		return 1
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/validate.go b/Godeps/_workspace/src/github.com/appc/spec/actool/validate.go
deleted file mode 100644
index 12a7f19ff9..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/validate.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strings"
-
-	"github.com/appc/spec/aci"
-	"github.com/appc/spec/schema"
-)
-
-const (
-	typeAppImage    = "appimage"
-	typeImageLayout = "layout"
-	typeManifest    = "manifest"
-)
-
-var (
-	valType     string
-	cmdValidate = &Command{
-		Name:        "validate",
-		Description: "Validate one or more AppContainer files",
-		Summary:     "Validate that one or more images or manifests meet the AppContainer specification",
-		Usage:       "[--type=TYPE] FILE...",
-		Run:         runValidate,
-	}
-	validateTypes = []string{
-		typeAppImage,
-		typeImageLayout,
-		typeManifest,
-	}
-)
-
-func init() {
-	cmdValidate.Flags.StringVar(&valType, "type", "",
-		fmt.Sprintf(`Type of file to validate. If unset, actool will try to detect the type. One of "%s"`, strings.Join(validateTypes, ",")))
-}
-
-func runValidate(args []string) (exit int) {
-	if len(args) < 1 {
-		stderr("must pass one or more files")
-		return 1
-	}
-
-	for _, path := range args {
-		vt := valType
-		fi, err := os.Stat(path)
-		if err != nil {
-			stderr("unable to access %s: %v", path, err)
-			return 1
-		}
-		var fh *os.File
-		if fi.IsDir() {
-			switch vt {
-			case typeImageLayout:
-			case "":
-				vt = typeImageLayout
-			case typeManifest, typeAppImage:
-				stderr("%s is a directory (wrong --type?)", path)
-				return 1
-			default:
-				// should never happen
-				panic(fmt.Sprintf("unexpected type: %v", vt))
-			}
-		} else {
-			fh, err = os.Open(path)
-			if err != nil {
-				stderr("%s: unable to open: %v", path, err)
-				return 1
-			}
-		}
-
-		if vt == "" {
-			vt, err = detectValType(fh)
-			if err != nil {
-				stderr("%s: error detecting file type: %v", path, err)
-				return 1
-			}
-		}
-		switch vt {
-		case typeImageLayout:
-			err = aci.ValidateLayout(path)
-			if err != nil {
-				stderr("%s: invalid image layout: %v", path, err)
-				exit = 1
-			} else if globalFlags.Debug {
-				stderr("%s: valid image layout", path)
-			}
-		case typeAppImage:
-			tr, err := aci.NewCompressedTarReader(fh)
-			if err != nil {
-				stderr("%s: error decompressing file: %v", path, err)
-				return 1
-			}
-			err = aci.ValidateArchive(tr.Reader)
-			tr.Close()
-			fh.Close()
-			if err != nil {
-				if e, ok := err.(aci.ErrOldVersion); ok {
-					stderr("%s: warning: %v", path, e)
-				} else {
-					stderr("%s: error validating: %v", path, err)
-					exit = 1
-				}
-			} else if globalFlags.Debug {
-				stderr("%s: valid app container image", path)
-			}
-		case typeManifest:
-			b, err := ioutil.ReadAll(fh)
-			fh.Close()
-			if err != nil {
-				stderr("%s: unable to read file %s", path, err)
-				return 1
-			}
-			k := schema.Kind{}
-			if err := k.UnmarshalJSON(b); err != nil {
-				stderr("%s: error unmarshaling manifest: %v", path, err)
-				return 1
-			}
-			switch k.ACKind {
-			case "ImageManifest":
-				m := schema.ImageManifest{}
-				err = m.UnmarshalJSON(b)
-			case "PodManifest":
-				m := schema.PodManifest{}
-				err = m.UnmarshalJSON(b)
-			default:
-				// Should not get here; schema.Kind unmarshal should fail
-				panic("bad ACKind")
-			}
-			if err != nil {
-				stderr("%s: invalid %s: %v", path, k.ACKind, err)
-				exit = 1
-			} else if globalFlags.Debug {
-				stderr("%s: valid %s", path, k.ACKind)
-			}
-		default:
-			stderr("%s: unable to detect filetype (try --type)", path)
-			return 1
-		}
-	}
-
-	return
-}
-
-func detectValType(file *os.File) (string, error) {
-	typ, err := aci.DetectFileType(file)
-	if err != nil {
-		return "", err
-	}
-	if _, err := file.Seek(0, 0); err != nil {
-		return "", err
-	}
-	switch typ {
-	case aci.TypeXz, aci.TypeGzip, aci.TypeBzip2, aci.TypeTar:
-		return typeAppImage, nil
-	case aci.TypeText:
-		return typeManifest, nil
-	default:
-		return "", nil
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/version.go b/Godeps/_workspace/src/github.com/appc/spec/actool/version.go
deleted file mode 100644
index 0191ad7b38..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/version.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/appc/spec/schema"
-)
-
-var cmdVersion = &Command{
-	Name:        "version",
-	Description: "Print the version and exit",
-	Summary:     "Print the version and exit",
-	Run:         runVersion,
-}
-
-func runVersion(args []string) (exit int) {
-	fmt.Printf("actool version %s\n", schema.AppContainerVersion.String())
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go
deleted file mode 100644
index b2dc659541..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package discovery
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"regexp"
-	"strings"
-
-	"golang.org/x/net/html"
-	"golang.org/x/net/html/atom"
-)
-
-type acMeta struct {
-	name   string
-	prefix string
-	uri    string
-}
-
-type ACIEndpoint struct {
-	ACI string
-	ASC string
-}
-
-// A struct containing both discovered endpoints and keys. Used to avoid
-// function duplication (one for endpoints and one for keys, so to avoid two
-// doDiscover, two DiscoverWalkFunc)
-type discoveryData struct {
-	ACIEndpoints []ACIEndpoint
-	PublicKeys   []string
-}
-
-type ACIEndpoints []ACIEndpoint
-
-type PublicKeys []string
-
-const (
-	defaultVersion = "latest"
-)
-
-var (
-	templateExpression = regexp.MustCompile(`{.*?}`)
-	errEnough          = errors.New("enough discovery information found")
-)
-
-func appendMeta(meta []acMeta, attrs []html.Attribute) []acMeta {
-	m := acMeta{}
-
-	for _, a := range attrs {
-		if a.Namespace != "" {
-			continue
-		}
-
-		switch a.Key {
-		case "name":
-			m.name = a.Val
-
-		case "content":
-			parts := strings.SplitN(strings.TrimSpace(a.Val), " ", 2)
-			if len(parts) < 2 {
-				break
-			}
-			m.prefix = parts[0]
-			m.uri = strings.TrimSpace(parts[1])
-		}
-	}
-
-	// TODO(eyakubovich): should prefix be optional?
-	if !strings.HasPrefix(m.name, "ac-") || m.prefix == "" || m.uri == "" {
-		return meta
-	}
-
-	return append(meta, m)
-}
-
-func extractACMeta(r io.Reader) []acMeta {
-	var meta []acMeta
-
-	z := html.NewTokenizer(r)
-
-	for {
-		switch z.Next() {
-		case html.ErrorToken:
-			return meta
-
-		case html.StartTagToken, html.SelfClosingTagToken:
-			tok := z.Token()
-			if tok.DataAtom == atom.Meta {
-				meta = appendMeta(meta, tok.Attr)
-			}
-		}
-	}
-}
-
-func renderTemplate(tpl string, kvs ...string) (string, bool) {
-	for i := 0; i < len(kvs); i += 2 {
-		k := kvs[i]
-		v := kvs[i+1]
-		tpl = strings.Replace(tpl, k, v, -1)
-	}
-	return tpl, !templateExpression.MatchString(tpl)
-}
-
-func createTemplateVars(app App) []string {
-	tplVars := []string{"{name}", app.Name.String()}
-	// If a label is called "name", it will be ignored as it appears after
-	// in the slice
-	for n, v := range app.Labels {
-		tplVars = append(tplVars, fmt.Sprintf("{%s}", n), v)
-	}
-	return tplVars
-}
-
-func doDiscover(pre string, hostHeaders map[string]http.Header, app App, insecure InsecureOption) (*discoveryData, error) {
-	app = *app.Copy()
-	if app.Labels["version"] == "" {
-		app.Labels["version"] = defaultVersion
-	}
-
-	_, body, err := httpsOrHTTP(pre, hostHeaders, insecure)
-	if err != nil {
-		return nil, err
-	}
-	defer body.Close()
-
-	meta := extractACMeta(body)
-
-	tplVars := createTemplateVars(app)
-
-	dd := &discoveryData{}
-
-	for _, m := range meta {
-		if !strings.HasPrefix(app.Name.String(), m.prefix) {
-			continue
-		}
-
-		switch m.name {
-		case "ac-discovery":
-			// Ignore not handled variables as {ext} isn't already rendered.
-			uri, _ := renderTemplate(m.uri, tplVars...)
-			asc, ok := renderTemplate(uri, "{ext}", "aci.asc")
-			if !ok {
-				continue
-			}
-			aci, ok := renderTemplate(uri, "{ext}", "aci")
-			if !ok {
-				continue
-			}
-			dd.ACIEndpoints = append(dd.ACIEndpoints, ACIEndpoint{ACI: aci, ASC: asc})
-
-		case "ac-discovery-pubkeys":
-			dd.PublicKeys = append(dd.PublicKeys, m.uri)
-		}
-	}
-
-	return dd, nil
-}
-
-// DiscoverWalk will make HTTPS requests to find discovery meta tags and
-// optionally will use HTTP if insecure is set. hostHeaders specifies the
-// header to apply depending on the host (e.g. authentication). Based on the
-// response of the discoverFn it will continue to recurse up the tree.
-func DiscoverWalk(app App, hostHeaders map[string]http.Header, insecure InsecureOption, discoverFn DiscoverWalkFunc) (dd *discoveryData, err error) {
-	parts := strings.Split(string(app.Name), "/")
-	for i := range parts {
-		end := len(parts) - i
-		pre := strings.Join(parts[:end], "/")
-
-		dd, err = doDiscover(pre, hostHeaders, app, insecure)
-		if derr := discoverFn(pre, dd, err); derr != nil {
-			return dd, derr
-		}
-	}
-
-	return nil, fmt.Errorf("discovery failed")
-}
-
-// DiscoverWalkFunc can stop a DiscoverWalk by returning non-nil error.
-type DiscoverWalkFunc func(prefix string, dd *discoveryData, err error) error
-
-// FailedAttempt represents a failed discovery attempt. This is for debugging
-// and user feedback.
-type FailedAttempt struct {
-	Prefix string
-	Error  error
-}
-
-func walker(attempts *[]FailedAttempt, testFn DiscoverWalkFunc) DiscoverWalkFunc {
-	return func(pre string, dd *discoveryData, err error) error {
-		if err != nil {
-			*attempts = append(*attempts, FailedAttempt{pre, err})
-			return nil
-		}
-		if err := testFn(pre, dd, err); err != nil {
-			return err
-		}
-		return nil
-	}
-}
-
-// DiscoverACIEndpoints will make HTTPS requests to find the ac-discovery meta
-// tags and optionally will use HTTP if insecure is set. hostHeaders
-// specifies the header to apply depending on the host (e.g. authentication).
-// It will not give up until it has exhausted the path or found an image
-// discovery.
-func DiscoverACIEndpoints(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (ACIEndpoints, []FailedAttempt, error) {
-	testFn := func(pre string, dd *discoveryData, err error) error {
-		if len(dd.ACIEndpoints) != 0 {
-			return errEnough
-		}
-		return nil
-	}
-
-	attempts := []FailedAttempt{}
-	dd, err := DiscoverWalk(app, hostHeaders, insecure, walker(&attempts, testFn))
-	if err != nil && err != errEnough {
-		return nil, attempts, err
-	}
-
-	return dd.ACIEndpoints, attempts, nil
-}
-
-// DiscoverPublicKey will make HTTPS requests to find the ac-public-keys meta
-// tags and optionally will use HTTP if insecure is set. hostHeaders
-// specifies the header to apply depending on the host (e.g. authentication).
-// It will not give up until it has exhausted the path or found an public key.
-func DiscoverPublicKeys(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (PublicKeys, []FailedAttempt, error) {
-	testFn := func(pre string, dd *discoveryData, err error) error {
-		if len(dd.PublicKeys) != 0 {
-			return errEnough
-		}
-		return nil
-	}
-
-	attempts := []FailedAttempt{}
-	dd, err := DiscoverWalk(app, hostHeaders, insecure, walker(&attempts, testFn))
-	if err != nil && err != errEnough {
-		return nil, attempts, err
-	}
-
-	return dd.PublicKeys, attempts, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/doc.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/doc.go
deleted file mode 100644
index 55bfc3a02a..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/doc.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package discovery contains an experimental implementation of the Image
-// Discovery section of the appc specification.
-package discovery
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/http.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/http.go
deleted file mode 100644
index 430bcc61cf..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/http.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package discovery
-
-import (
-	"crypto/tls"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/url"
-	"time"
-)
-
-type InsecureOption int
-
-const (
-	defaultDialTimeout = 5 * time.Second
-)
-
-const (
-	InsecureNone InsecureOption = 0
-
-	InsecureTLS InsecureOption = 1 << iota
-	InsecureHTTP
-)
-
-var (
-	// Client is the default http.Client used for discovery requests.
-	Client            *http.Client
-	ClientInsecureTLS *http.Client
-
-	// httpDo is the internal object used by discovery to retrieve URLs; it is
-	// defined here so it can be overridden for testing
-	httpDo            httpDoer
-	httpDoInsecureTLS httpDoer
-)
-
-// httpDoer is an interface used to wrap http.Client for real requests and
-// allow easy mocking in local tests.
-type httpDoer interface {
-	Do(req *http.Request) (resp *http.Response, err error)
-}
-
-func init() {
-	t := &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		Dial: func(n, a string) (net.Conn, error) {
-			return net.DialTimeout(n, a, defaultDialTimeout)
-		},
-	}
-	Client = &http.Client{
-		Transport: t,
-	}
-	httpDo = Client
-
-	// copy for InsecureTLS
-	tInsecureTLS := *t
-	tInsecureTLS.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
-	ClientInsecureTLS = &http.Client{
-		Transport: &tInsecureTLS,
-	}
-	httpDoInsecureTLS = ClientInsecureTLS
-}
-
-func httpsOrHTTP(name string, hostHeaders map[string]http.Header, insecure InsecureOption) (urlStr string, body io.ReadCloser, err error) {
-	fetch := func(scheme string) (urlStr string, res *http.Response, err error) {
-		u, err := url.Parse(scheme + "://" + name)
-		if err != nil {
-			return "", nil, err
-		}
-		u.RawQuery = "ac-discovery=1"
-		urlStr = u.String()
-		req, err := http.NewRequest("GET", urlStr, nil)
-		if err != nil {
-			return "", nil, err
-		}
-		if hostHeader, ok := hostHeaders[u.Host]; ok {
-			req.Header = hostHeader
-		}
-		if insecure&InsecureTLS != 0 {
-			res, err = httpDoInsecureTLS.Do(req)
-			return
-		}
-		res, err = httpDo.Do(req)
-		return
-	}
-	closeBody := func(res *http.Response) {
-		if res != nil {
-			res.Body.Close()
-		}
-	}
-	urlStr, res, err := fetch("https")
-	if err != nil || res.StatusCode != http.StatusOK {
-		if insecure&InsecureHTTP != 0 {
-			closeBody(res)
-			urlStr, res, err = fetch("http")
-		}
-	}
-
-	if res != nil && res.StatusCode != http.StatusOK {
-		err = fmt.Errorf("expected a 200 OK got %d", res.StatusCode)
-	}
-
-	if err != nil {
-		closeBody(res)
-		return "", nil, err
-	}
-	return urlStr, res.Body, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/parse.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/parse.go
deleted file mode 100644
index 7b9d574a69..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/parse.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package discovery
-
-import (
-	"fmt"
-	"net/url"
-	"strings"
-
-	"github.com/appc/spec/schema/common"
-	"github.com/appc/spec/schema/types"
-)
-
-type App struct {
-	Name   types.ACIdentifier
-	Labels map[types.ACIdentifier]string
-}
-
-func NewApp(name string, labels map[types.ACIdentifier]string) (*App, error) {
-	if labels == nil {
-		labels = make(map[types.ACIdentifier]string, 0)
-	}
-	acn, err := types.NewACIdentifier(name)
-	if err != nil {
-		return nil, err
-	}
-	return &App{
-		Name:   *acn,
-		Labels: labels,
-	}, nil
-}
-
-// NewAppFromString takes a command line app parameter and returns a map of labels.
-//
-// Example app parameters:
-// 	example.com/reduce-worker:1.0.0
-// 	example.com/reduce-worker,channel=alpha,label=value
-// 	example.com/reduce-worker:1.0.0,label=value
-//
-// As can be seen in above examples - colon, comma and equal sign have
-// special meaning. If any of them has to be a part of a label's value
-// then consider writing your own string to App parser.
-func NewAppFromString(app string) (*App, error) {
-	var (
-		name   string
-		labels map[types.ACIdentifier]string
-	)
-
-	preparedApp, err := prepareAppString(app)
-	if err != nil {
-		return nil, err
-	}
-	v, err := url.ParseQuery(preparedApp)
-	if err != nil {
-		return nil, err
-	}
-	labels = make(map[types.ACIdentifier]string, 0)
-	for key, val := range v {
-		if len(val) > 1 {
-			return nil, fmt.Errorf("label %s with multiple values %q", key, val)
-		}
-		if key == "name" {
-			name = val[0]
-			continue
-		}
-		labelName, err := types.NewACIdentifier(key)
-		if err != nil {
-			return nil, err
-		}
-		labels[*labelName] = val[0]
-	}
-	a, err := NewApp(name, labels)
-	if err != nil {
-		return nil, err
-	}
-	return a, nil
-}
-
-func prepareAppString(app string) (string, error) {
-	if err := checkColon(app); err != nil {
-		return "", err
-	}
-
-	app = "name=" + strings.Replace(app, ":", ",version=", 1)
-	return common.MakeQueryString(app)
-}
-
-func checkColon(app string) error {
-	firstComma := strings.IndexRune(app, ',')
-	firstColon := strings.IndexRune(app, ':')
-	if firstColon > firstComma && firstComma > -1 {
-		return fmt.Errorf("malformed app string - colon may appear only right after the app name")
-	}
-	if strings.Count(app, ":") > 1 {
-		return fmt.Errorf("malformed app string - colon may appear at most once")
-	}
-	return nil
-}
-
-func (a *App) Copy() *App {
-	ac := &App{
-		Name:   a.Name,
-		Labels: make(map[types.ACIdentifier]string, 0),
-	}
-	for k, v := range a.Labels {
-		ac.Labels[k] = v
-	}
-	return ac
-}
-
-// String returns the URL-like image name
-func (a *App) String() string {
-	img := a.Name.String()
-	for n, v := range a.Labels {
-		img += fmt.Sprintf(",%s=%s", n, v)
-	}
-	return img
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer.go
deleted file mode 100644
index 25a097f056..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package acirenderer
-
-import (
-	"archive/tar"
-	"crypto/sha512"
-	"fmt"
-	"hash"
-	"io"
-	"io/ioutil"
-	"path/filepath"
-	"strings"
-
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-)
-
-// An ACIRegistry provides all functions of an ACIProvider plus functions to
-// search for an aci and get its contents
-type ACIRegistry interface {
-	ACIProvider
-	GetImageManifest(key string) (*schema.ImageManifest, error)
-	GetACI(name types.ACIdentifier, labels types.Labels) (string, error)
-}
-
-// An ACIProvider provides functions to get an ACI contents, to convert an
-// ACI hash to the key under which the ACI is known to the provider and to resolve an
-// image ID to the key under which it's known to the provider.
-type ACIProvider interface {
-	// Read the ACI contents stream given the key. Use ResolveKey to
-	// convert an image ID to the relative provider's key.
-	ReadStream(key string) (io.ReadCloser, error)
-	// Converts an image ID to the, if existent, key under which the
-	// ACI is known to the provider
-	ResolveKey(key string) (string, error)
-	// Converts a Hash to the provider's key
-	HashToKey(h hash.Hash) string
-}
-
-// An Image contains the ImageManifest, the ACIProvider's key and its Level in
-// the dependency tree.
-type Image struct {
-	Im    *schema.ImageManifest
-	Key   string
-	Level uint16
-}
-
-// Images encapsulates an ordered slice of Image structs. It represents a flat
-// dependency tree.
-// The upper Image should be the first in the slice with a level of 0.
-// For example if A is the upper image and has two deps (in order B and C). And C has one dep (D),
-// the slice (reporting the app name and excluding im and Hash) should be:
-// [{A, Level: 0}, {C, Level:1}, {D, Level: 2}, {B, Level: 1}]
-type Images []Image
-
-// ACIFiles represents which files to extract for every ACI
-type ACIFiles struct {
-	Key     string
-	FileMap map[string]struct{}
-}
-
-// RenderedACI is an (ordered) slice of ACIFiles
-type RenderedACI []*ACIFiles
-
-// GetRenderedACIWithImageID, given an imageID, starts with the matching image
-// available in the store, creates the dependencies list and returns the
-// RenderedACI list.
-func GetRenderedACIWithImageID(imageID types.Hash, ap ACIRegistry) (RenderedACI, error) {
-	imgs, err := CreateDepListFromImageID(imageID, ap)
-	if err != nil {
-		return nil, err
-	}
-	return GetRenderedACIFromList(imgs, ap)
-}
-
-// GetRenderedACI, given an image app name and optional labels, starts with the
-// best matching image available in the store, creates the dependencies list
-// and returns the RenderedACI list.
-func GetRenderedACI(name types.ACIdentifier, labels types.Labels, ap ACIRegistry) (RenderedACI, error) {
-	imgs, err := CreateDepListFromNameLabels(name, labels, ap)
-	if err != nil {
-		return nil, err
-	}
-	return GetRenderedACIFromList(imgs, ap)
-}
-
-// GetRenderedACIFromList returns the RenderedACI list. All file outside rootfs
-// are excluded (at the moment only "manifest").
-func GetRenderedACIFromList(imgs Images, ap ACIProvider) (RenderedACI, error) {
-	if len(imgs) == 0 {
-		return nil, fmt.Errorf("image list empty")
-	}
-
-	allFiles := make(map[string]byte)
-	renderedACI := RenderedACI{}
-
-	first := true
-	for i, img := range imgs {
-		pwlm := getUpperPWLM(imgs, i)
-		ra, err := getACIFiles(img, ap, allFiles, pwlm)
-		if err != nil {
-			return nil, err
-		}
-		// Use the manifest from the upper ACI
-		if first {
-			ra.FileMap["manifest"] = struct{}{}
-			first = false
-		}
-		renderedACI = append(renderedACI, ra)
-	}
-
-	return renderedACI, nil
-}
-
-// getUpperPWLM returns the pwl at the lower level for the branch where
-// img[pos] lives.
-func getUpperPWLM(imgs Images, pos int) map[string]struct{} {
-	var pwlm map[string]struct{}
-	curlevel := imgs[pos].Level
-	// Start from our position and go back ignoring the other leafs.
-	for i := pos; i >= 0; i-- {
-		img := imgs[i]
-		if img.Level < curlevel && len(img.Im.PathWhitelist) > 0 {
-			pwlm = pwlToMap(img.Im.PathWhitelist)
-		}
-		curlevel = img.Level
-	}
-	return pwlm
-}
-
-// getACIFiles returns the ACIFiles struct for the given image. All files
-// outside rootfs are excluded (at the moment only "manifest").
-func getACIFiles(img Image, ap ACIProvider, allFiles map[string]byte, pwlm map[string]struct{}) (*ACIFiles, error) {
-	rs, err := ap.ReadStream(img.Key)
-	if err != nil {
-		return nil, err
-	}
-	defer rs.Close()
-
-	hash := sha512.New()
-	r := io.TeeReader(rs, hash)
-
-	thispwlm := pwlToMap(img.Im.PathWhitelist)
-	ra := &ACIFiles{FileMap: make(map[string]struct{})}
-	if err = Walk(tar.NewReader(r), func(hdr *tar.Header) error {
-		name := hdr.Name
-		cleanName := filepath.Clean(name)
-
-		// Add the rootfs directory.
-		if cleanName == "rootfs" && hdr.Typeflag == tar.TypeDir {
-			ra.FileMap[cleanName] = struct{}{}
-			allFiles[cleanName] = hdr.Typeflag
-			return nil
-		}
-
-		// Ignore files outside /rootfs/ (at the moment only "manifest").
-		if !strings.HasPrefix(cleanName, "rootfs/") {
-			return nil
-		}
-
-		// Is the file in our PathWhiteList?
-		// If the file is a directory continue also if not in PathWhiteList
-		if hdr.Typeflag != tar.TypeDir {
-			if len(img.Im.PathWhitelist) > 0 {
-				if _, ok := thispwlm[cleanName]; !ok {
-					return nil
-				}
-			}
-		}
-		// Is the file in the lower level PathWhiteList of this img branch?
-		if pwlm != nil {
-			if _, ok := pwlm[cleanName]; !ok {
-				return nil
-			}
-		}
-		// Is the file already provided by a previous image?
-		if _, ok := allFiles[cleanName]; ok {
-			return nil
-		}
-		// Check that the parent dirs are also of type dir in the upper
-		// images
-		parentDir := filepath.Dir(cleanName)
-		for parentDir != "." && parentDir != "/" {
-			if ft, ok := allFiles[parentDir]; ok && ft != tar.TypeDir {
-				return nil
-			}
-			parentDir = filepath.Dir(parentDir)
-		}
-		ra.FileMap[cleanName] = struct{}{}
-		allFiles[cleanName] = hdr.Typeflag
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	// Tar does not necessarily read the complete file, so ensure we read the entirety into the hash
-	if _, err := io.Copy(ioutil.Discard, r); err != nil {
-		return nil, fmt.Errorf("error reading ACI: %v", err)
-	}
-
-	if g := ap.HashToKey(hash); g != img.Key {
-		return nil, fmt.Errorf("image hash does not match expected (%s != %s)", g, img.Key)
-	}
-
-	ra.Key = img.Key
-	return ra, nil
-}
-
-// pwlToMap converts a pathWhiteList slice to a map for faster search
-// It will also prepend "rootfs/" to the provided paths and they will be
-// relative to "/" so they can be easily compared with the tar.Header.Name
-// If pwl length is 0, a nil map is returned
-func pwlToMap(pwl []string) map[string]struct{} {
-	if len(pwl) == 0 {
-		return nil
-	}
-	m := make(map[string]struct{}, len(pwl))
-	for _, name := range pwl {
-		relpath := filepath.Join("rootfs", name)
-		m[relpath] = struct{}{}
-	}
-	return m
-}
-
-func Walk(tarReader *tar.Reader, walkFunc func(hdr *tar.Header) error) error {
-	for {
-		hdr, err := tarReader.Next()
-		if err == io.EOF {
-			// end of tar archive
-			break
-		}
-		if err != nil {
-			return fmt.Errorf("Error reading tar entry: %v", err)
-		}
-		if err := walkFunc(hdr); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/resolve.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/resolve.go
deleted file mode 100644
index 248bcbf2af..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/resolve.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package acirenderer
-
-import (
-	"container/list"
-
-	"github.com/appc/spec/schema/types"
-)
-
-// CreateDepListFromImageID returns the flat dependency tree of the image with
-// the provided imageID
-func CreateDepListFromImageID(imageID types.Hash, ap ACIRegistry) (Images, error) {
-	key, err := ap.ResolveKey(imageID.String())
-	if err != nil {
-		return nil, err
-	}
-	return createDepList(key, ap)
-}
-
-// CreateDepListFromNameLabels returns the flat dependency tree of the image
-// with the provided app name and optional labels.
-func CreateDepListFromNameLabels(name types.ACIdentifier, labels types.Labels, ap ACIRegistry) (Images, error) {
-	key, err := ap.GetACI(name, labels)
-	if err != nil {
-		return nil, err
-	}
-	return createDepList(key, ap)
-}
-
-// createDepList returns the flat dependency tree as a list of Image type
-func createDepList(key string, ap ACIRegistry) (Images, error) {
-	imgsl := list.New()
-	im, err := ap.GetImageManifest(key)
-	if err != nil {
-		return nil, err
-	}
-
-	img := Image{Im: im, Key: key, Level: 0}
-	imgsl.PushFront(img)
-
-	// Create a flat dependency tree. Use a LinkedList to be able to
-	// insert elements in the list while working on it.
-	for el := imgsl.Front(); el != nil; el = el.Next() {
-		img := el.Value.(Image)
-		dependencies := img.Im.Dependencies
-		for _, d := range dependencies {
-			var depimg Image
-			var depKey string
-			if d.ImageID != nil && !d.ImageID.Empty() {
-				depKey, err = ap.ResolveKey(d.ImageID.String())
-				if err != nil {
-					return nil, err
-				}
-			} else {
-				var err error
-				depKey, err = ap.GetACI(d.ImageName, d.Labels)
-				if err != nil {
-					return nil, err
-				}
-			}
-			im, err := ap.GetImageManifest(depKey)
-			if err != nil {
-				return nil, err
-			}
-			depimg = Image{Im: im, Key: depKey, Level: img.Level + 1}
-			imgsl.InsertAfter(depimg, el)
-		}
-	}
-
-	imgs := Images{}
-	for el := imgsl.Front(); el != nil; el = el.Next() {
-		imgs = append(imgs, el.Value.(Image))
-	}
-	return imgs, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_linux.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_linux.go
deleted file mode 100644
index 4f895cd76e..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_linux.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2016 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package device
-
-// with glibc/sysdeps/unix/sysv/linux/sys/sysmacros.h as reference
-
-func Major(rdev uint64) uint {
-	return uint((rdev>>8)&0xfff) | (uint(rdev>>32) & ^uint(0xfff))
-}
-
-func Minor(rdev uint64) uint {
-	return uint(rdev&0xff) | uint(uint32(rdev>>12) & ^uint32(0xff))
-}
-
-func Makedev(maj uint, min uint) uint64 {
-	return uint64(min&0xff) | (uint64(maj&0xfff) << 8) |
-		((uint64(min) & ^uint64(0xff)) << 12) |
-		((uint64(maj) & ^uint64(0xfff)) << 32)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_posix.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_posix.go
deleted file mode 100644
index c2e1b31697..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/device/device_posix.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build freebsd netbsd openbsd darwin
-
-package device
-
-/*
-#define _BSD_SOURCE
-#define _DEFAULT_SOURCE
-#include <sys/types.h>
-
-unsigned int
-my_major(dev_t dev)
-{
-  return major(dev);
-}
-
-unsigned int
-my_minor(dev_t dev)
-{
-  return minor(dev);
-}
-
-dev_t
-my_makedev(unsigned int maj, unsigned int min)
-{
-       return makedev(maj, min);
-}
-*/
-import "C"
-
-func Major(rdev uint64) uint {
-	major := C.my_major(C.dev_t(rdev))
-	return uint(major)
-}
-
-func Minor(rdev uint64) uint {
-	minor := C.my_minor(C.dev_t(rdev))
-	return uint(minor)
-}
-
-func Makedev(maj uint, min uint) uint64 {
-	dev := C.my_makedev(C.uint(maj), C.uint(min))
-	return uint64(dev)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/doc.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/doc.go
deleted file mode 100644
index 047a0c0fa4..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/doc.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package tarheader contains a simple abstraction to accurately create
-// tar.Headers on different operating systems.
-package tarheader
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_darwin.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_darwin.go
deleted file mode 100644
index 8f68ee77c5..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_darwin.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//+build darwin
-
-package tarheader
-
-import (
-	"archive/tar"
-	"os"
-	"syscall"
-	"time"
-)
-
-func init() {
-	populateHeaderStat = append(populateHeaderStat, populateHeaderCtime)
-}
-
-func populateHeaderCtime(h *tar.Header, fi os.FileInfo, _ map[uint64]string) {
-	st, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return
-	}
-
-	sec, nsec := st.Ctimespec.Unix()
-	ctime := time.Unix(sec, nsec)
-	h.ChangeTime = ctime
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_linux.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_linux.go
deleted file mode 100644
index 2055024084..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_linux.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package tarheader
-
-import (
-	"archive/tar"
-	"os"
-	"syscall"
-	"time"
-)
-
-func init() {
-	populateHeaderStat = append(populateHeaderStat, populateHeaderCtime)
-}
-
-func populateHeaderCtime(h *tar.Header, fi os.FileInfo, _ map[uint64]string) {
-	st, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return
-	}
-
-	sec, nsec := st.Ctim.Unix()
-	ctime := time.Unix(sec, nsec)
-	h.ChangeTime = ctime
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_posix.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_posix.go
deleted file mode 100644
index 0cc083fee6..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/pop_posix.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux freebsd netbsd openbsd
-
-package tarheader
-
-import (
-	"archive/tar"
-	"os"
-	"syscall"
-
-	"github.com/appc/spec/pkg/device"
-)
-
-func init() {
-	populateHeaderStat = append(populateHeaderStat, populateHeaderUnix)
-}
-
-func populateHeaderUnix(h *tar.Header, fi os.FileInfo, seen map[uint64]string) {
-	st, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return
-	}
-	h.Uid = int(st.Uid)
-	h.Gid = int(st.Gid)
-	if st.Mode&syscall.S_IFMT == syscall.S_IFBLK || st.Mode&syscall.S_IFMT == syscall.S_IFCHR {
-		h.Devminor = int64(device.Minor(uint64(st.Rdev)))
-		h.Devmajor = int64(device.Major(uint64(st.Rdev)))
-	}
-	// If we have already seen this inode, generate a hardlink
-	p, ok := seen[uint64(st.Ino)]
-	if ok {
-		h.Linkname = p
-		h.Typeflag = tar.TypeLink
-	} else {
-		seen[uint64(st.Ino)] = h.Name
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/tarheader.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/tarheader.go
deleted file mode 100644
index dc16c33d33..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader/tarheader.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tarheader
-
-import (
-	"archive/tar"
-	"os"
-)
-
-var populateHeaderStat []func(h *tar.Header, fi os.FileInfo, seen map[uint64]string)
-
-func Populate(h *tar.Header, fi os.FileInfo, seen map[uint64]string) {
-	for _, pop := range populateHeaderStat {
-		pop(h, fi, seen)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/common/common.go b/Godeps/_workspace/src/github.com/appc/spec/schema/common/common.go
deleted file mode 100644
index ffc0f6f9b4..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/common/common.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"fmt"
-	"net/url"
-	"strings"
-)
-
-// MakeQueryString takes a comma-separated LABEL=VALUE string and returns an
-// "&"-separated string with URL escaped values.
-//
-// Examples:
-// 	version=1.0.0,label=v1+v2 -> version=1.0.0&label=v1%2Bv2
-// 	name=db,source=/tmp$1 -> name=db&source=%2Ftmp%241
-func MakeQueryString(app string) (string, error) {
-	parts := strings.Split(app, ",")
-	escapedParts := make([]string, len(parts))
-	for i, s := range parts {
-		p := strings.SplitN(s, "=", 2)
-		if len(p) != 2 {
-			return "", fmt.Errorf("malformed string %q - has a label without a value: %s", app, p[0])
-		}
-		escapedParts[i] = fmt.Sprintf("%s=%s", p[0], url.QueryEscape(p[1]))
-	}
-	return strings.Join(escapedParts, "&"), nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/doc.go b/Godeps/_workspace/src/github.com/appc/spec/schema/doc.go
deleted file mode 100644
index ba381543f8..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/doc.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package schema provides definitions for the JSON schema of the different
-// manifests in the App Container Specification. The manifests are canonically
-// represented in their respective structs:
-//   - `ImageManifest`
-//   - `PodManifest`
-//
-// Validation is performed through serialization: if a blob of JSON data will
-// unmarshal to one of the *Manifests, it is considered a valid implementation
-// of the standard. Similarly, if a constructed *Manifest struct marshals
-// successfully to JSON, it must be valid.
-package schema
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/image.go b/Godeps/_workspace/src/github.com/appc/spec/schema/image.go
deleted file mode 100644
index fac4c794c3..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/image.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package schema
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/appc/spec/schema/types"
-
-	"go4.org/errorutil"
-)
-
-const (
-	ACIExtension      = ".aci"
-	ImageManifestKind = types.ACKind("ImageManifest")
-)
-
-type ImageManifest struct {
-	ACKind        types.ACKind       `json:"acKind"`
-	ACVersion     types.SemVer       `json:"acVersion"`
-	Name          types.ACIdentifier `json:"name"`
-	Labels        types.Labels       `json:"labels,omitempty"`
-	App           *types.App         `json:"app,omitempty"`
-	Annotations   types.Annotations  `json:"annotations,omitempty"`
-	Dependencies  types.Dependencies `json:"dependencies,omitempty"`
-	PathWhitelist []string           `json:"pathWhitelist,omitempty"`
-}
-
-// imageManifest is a model to facilitate extra validation during the
-// unmarshalling of the ImageManifest
-type imageManifest ImageManifest
-
-func BlankImageManifest() *ImageManifest {
-	return &ImageManifest{ACKind: ImageManifestKind, ACVersion: AppContainerVersion}
-}
-
-func (im *ImageManifest) UnmarshalJSON(data []byte) error {
-	a := imageManifest(*im)
-	err := json.Unmarshal(data, &a)
-	if err != nil {
-		if serr, ok := err.(*json.SyntaxError); ok {
-			line, col, highlight := errorutil.HighlightBytePosition(bytes.NewReader(data), serr.Offset)
-			return fmt.Errorf("\nError at line %d, column %d\n%s%v", line, col, highlight, err)
-		}
-		return err
-	}
-	nim := ImageManifest(a)
-	if err := nim.assertValid(); err != nil {
-		return err
-	}
-	*im = nim
-	return nil
-}
-
-func (im ImageManifest) MarshalJSON() ([]byte, error) {
-	if err := im.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(imageManifest(im))
-}
-
-var imKindError = types.InvalidACKindError(ImageManifestKind)
-
-// assertValid performs extra assertions on an ImageManifest to ensure that
-// fields are set appropriately, etc. It is used exclusively when marshalling
-// and unmarshalling an ImageManifest. Most field-specific validation is
-// performed through the individual types being marshalled; assertValid()
-// should only deal with higher-level validation.
-func (im *ImageManifest) assertValid() error {
-	if im.ACKind != ImageManifestKind {
-		return imKindError
-	}
-	if im.ACVersion.Empty() {
-		return errors.New(`acVersion must be set`)
-	}
-	if im.Name.Empty() {
-		return errors.New(`name must be set`)
-	}
-	return nil
-}
-
-func (im *ImageManifest) GetLabel(name string) (val string, ok bool) {
-	return im.Labels.Get(name)
-}
-
-func (im *ImageManifest) GetAnnotation(name string) (val string, ok bool) {
-	return im.Annotations.Get(name)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/kind.go b/Godeps/_workspace/src/github.com/appc/spec/schema/kind.go
deleted file mode 100644
index 5dc4f957ec..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/kind.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package schema
-
-import (
-	"encoding/json"
-
-	"github.com/appc/spec/schema/types"
-)
-
-type Kind struct {
-	ACVersion types.SemVer `json:"acVersion"`
-	ACKind    types.ACKind `json:"acKind"`
-}
-
-type kind Kind
-
-func (k *Kind) UnmarshalJSON(data []byte) error {
-	nk := kind{}
-	err := json.Unmarshal(data, &nk)
-	if err != nil {
-		return err
-	}
-	*k = Kind(nk)
-	return nil
-}
-
-func (k Kind) MarshalJSON() ([]byte, error) {
-	return json.Marshal(kind(k))
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/doc.go b/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/doc.go
deleted file mode 100644
index 9cc5734607..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/doc.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package lastditch provides fallback redefinitions of parts of
-// schemas provided by schema package.
-//
-// Almost no validation of schemas is done (besides checking if data
-// really is `JSON`-encoded and kind is either `ImageManifest` or
-// `PodManifest`. This is to get as much data as possible from an
-// invalid manifest. The main aim of the package is to be used for the
-// better error reporting. The another aim might be to force some
-// operation (like removing a pod), which would otherwise fail because
-// of an invalid manifest.
-//
-// To avoid validation during deserialization, types provided by this
-// package use plain strings.
-package lastditch
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/image.go b/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/image.go
deleted file mode 100644
index dc5055a056..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/image.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package lastditch
-
-import (
-	"encoding/json"
-
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-)
-
-type ImageManifest struct {
-	ACVersion string `json:"acVersion"`
-	ACKind    string `json:"acKind"`
-	Name      string `json:"name"`
-	Labels    Labels `json:"labels,omitempty"`
-}
-
-// a type just to avoid a recursion during unmarshalling
-type imageManifest ImageManifest
-
-func (im *ImageManifest) UnmarshalJSON(data []byte) error {
-	i := imageManifest(*im)
-	err := json.Unmarshal(data, &i)
-	if err != nil {
-		return err
-	}
-	if i.ACKind != string(schema.ImageManifestKind) {
-		return types.InvalidACKindError(schema.ImageManifestKind)
-	}
-	*im = ImageManifest(i)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/labels.go b/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/labels.go
deleted file mode 100644
index 5cf93a087c..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/labels.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package lastditch
-
-import (
-	"encoding/json"
-)
-
-type Labels []Label
-
-// a type just to avoid a recursion during unmarshalling
-type labels Labels
-
-type Label struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
-}
-
-func (l *Labels) UnmarshalJSON(data []byte) error {
-	var jl labels
-	if err := json.Unmarshal(data, &jl); err != nil {
-		return err
-	}
-	*l = Labels(jl)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/pod.go b/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/pod.go
deleted file mode 100644
index 2e9d8456bb..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/lastditch/pod.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package lastditch
-
-import (
-	"encoding/json"
-
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-)
-
-type PodManifest struct {
-	ACVersion string  `json:"acVersion"`
-	ACKind    string  `json:"acKind"`
-	Apps      AppList `json:"apps"`
-}
-
-type AppList []RuntimeApp
-
-type RuntimeApp struct {
-	Name  string       `json:"name"`
-	Image RuntimeImage `json:"image"`
-}
-
-type RuntimeImage struct {
-	Name   string `json:"name"`
-	ID     string `json:"id"`
-	Labels Labels `json:"labels,omitempty"`
-}
-
-// a type just to avoid a recursion during unmarshalling
-type podManifest PodManifest
-
-func (pm *PodManifest) UnmarshalJSON(data []byte) error {
-	p := podManifest(*pm)
-	err := json.Unmarshal(data, &p)
-	if err != nil {
-		return err
-	}
-	if p.ACKind != string(schema.PodManifestKind) {
-		return types.InvalidACKindError(schema.PodManifestKind)
-	}
-	*pm = PodManifest(p)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go b/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
deleted file mode 100644
index d4792ff3b4..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package schema
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/appc/spec/schema/types"
-
-	"go4.org/errorutil"
-)
-
-const PodManifestKind = types.ACKind("PodManifest")
-
-type PodManifest struct {
-	ACVersion   types.SemVer        `json:"acVersion"`
-	ACKind      types.ACKind        `json:"acKind"`
-	Apps        AppList             `json:"apps"`
-	Volumes     []types.Volume      `json:"volumes"`
-	Isolators   []types.Isolator    `json:"isolators"`
-	Annotations types.Annotations   `json:"annotations"`
-	Ports       []types.ExposedPort `json:"ports"`
-}
-
-// podManifest is a model to facilitate extra validation during the
-// unmarshalling of the PodManifest
-type podManifest PodManifest
-
-func BlankPodManifest() *PodManifest {
-	return &PodManifest{ACKind: PodManifestKind, ACVersion: AppContainerVersion}
-}
-
-func (pm *PodManifest) UnmarshalJSON(data []byte) error {
-	p := podManifest(*pm)
-	err := json.Unmarshal(data, &p)
-	if err != nil {
-		if serr, ok := err.(*json.SyntaxError); ok {
-			line, col, highlight := errorutil.HighlightBytePosition(bytes.NewReader(data), serr.Offset)
-			return fmt.Errorf("\nError at line %d, column %d\n%s%v", line, col, highlight, err)
-		}
-		return err
-	}
-	npm := PodManifest(p)
-	if err := npm.assertValid(); err != nil {
-		return err
-	}
-	*pm = npm
-	return nil
-}
-
-func (pm PodManifest) MarshalJSON() ([]byte, error) {
-	if err := pm.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(podManifest(pm))
-}
-
-var pmKindError = types.InvalidACKindError(PodManifestKind)
-
-// assertValid performs extra assertions on an PodManifest to
-// ensure that fields are set appropriately, etc. It is used exclusively when
-// marshalling and unmarshalling an PodManifest. Most
-// field-specific validation is performed through the individual types being
-// marshalled; assertValid() should only deal with higher-level validation.
-func (pm *PodManifest) assertValid() error {
-	if pm.ACKind != PodManifestKind {
-		return pmKindError
-	}
-	return nil
-}
-
-type AppList []RuntimeApp
-
-type appList AppList
-
-func (al *AppList) UnmarshalJSON(data []byte) error {
-	a := appList{}
-	err := json.Unmarshal(data, &a)
-	if err != nil {
-		return err
-	}
-	nal := AppList(a)
-	if err := nal.assertValid(); err != nil {
-		return err
-	}
-	*al = nal
-	return nil
-}
-
-func (al AppList) MarshalJSON() ([]byte, error) {
-	if err := al.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(appList(al))
-}
-
-func (al AppList) assertValid() error {
-	seen := map[types.ACName]bool{}
-	for _, a := range al {
-		if _, ok := seen[a.Name]; ok {
-			return fmt.Errorf(`duplicate apps of name %q`, a.Name)
-		}
-		seen[a.Name] = true
-	}
-	return nil
-}
-
-// Get retrieves an app by the specified name from the AppList; if there is
-// no such app, nil is returned. The returned *RuntimeApp MUST be considered
-// read-only.
-func (al AppList) Get(name types.ACName) *RuntimeApp {
-	for _, a := range al {
-		if name.Equals(a.Name) {
-			aa := a
-			return &aa
-		}
-	}
-	return nil
-}
-
-// Mount describes the mapping between a volume and the path it is mounted
-// inside of an app's filesystem.
-type Mount struct {
-	Volume types.ACName `json:"volume"`
-	Path   string       `json:"path"`
-}
-
-func (r Mount) assertValid() error {
-	if r.Volume.Empty() {
-		return errors.New("volume must be set")
-	}
-	if r.Path == "" {
-		return errors.New("path must be set")
-	}
-	return nil
-}
-
-// RuntimeApp describes an application referenced in a PodManifest
-type RuntimeApp struct {
-	Name           types.ACName      `json:"name"`
-	Image          RuntimeImage      `json:"image"`
-	App            *types.App        `json:"app,omitempty"`
-	ReadOnlyRootFS bool              `json:"readOnlyRootFS,omitempty"`
-	Mounts         []Mount           `json:"mounts,omitempty"`
-	Annotations    types.Annotations `json:"annotations,omitempty"`
-}
-
-// RuntimeImage describes an image referenced in a RuntimeApp
-type RuntimeImage struct {
-	Name   *types.ACIdentifier `json:"name,omitempty"`
-	ID     types.Hash          `json:"id"`
-	Labels types.Labels        `json:"labels,omitempty"`
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/acidentifier.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/acidentifier.go
deleted file mode 100644
index 904eda5cbc..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/acidentifier.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"errors"
-	"regexp"
-	"strings"
-)
-
-var (
-	// ValidACIdentifier is a regular expression that defines a valid ACIdentifier
-	ValidACIdentifier = regexp.MustCompile("^[a-z0-9]+([-._~/][a-z0-9]+)*$")
-
-	invalidACIdentifierChars = regexp.MustCompile("[^a-z0-9-._~/]")
-	invalidACIdentifierEdges = regexp.MustCompile("(^[-._~/]+)|([-._~/]+$)")
-
-	ErrEmptyACIdentifier         = ACIdentifierError("ACIdentifier cannot be empty")
-	ErrInvalidEdgeInACIdentifier = ACIdentifierError("ACIdentifier must start and end with only lower case " +
-		"alphanumeric characters")
-	ErrInvalidCharInACIdentifier = ACIdentifierError("ACIdentifier must contain only lower case " +
-		`alphanumeric characters plus "-._~/"`)
-)
-
-// ACIdentifier (an App-Container Identifier) is a format used by keys in image names
-// and image labels of the App Container Standard. An ACIdentifier is restricted to numeric
-// and lowercase URI unreserved characters defined in URI RFC[1]; all alphabetical characters
-// must be lowercase only. Furthermore, the first and last character ("edges") must be
-// alphanumeric, and an ACIdentifier cannot be empty. Programmatically, an ACIdentifier must
-// conform to the regular expression ValidACIdentifier.
-//
-// [1] http://tools.ietf.org/html/rfc3986#section-2.3
-type ACIdentifier string
-
-func (n ACIdentifier) String() string {
-	return string(n)
-}
-
-// Set sets the ACIdentifier to the given value, if it is valid; if not,
-// an error is returned.
-func (n *ACIdentifier) Set(s string) error {
-	nn, err := NewACIdentifier(s)
-	if err == nil {
-		*n = *nn
-	}
-	return err
-}
-
-// Equals checks whether a given ACIdentifier is equal to this one.
-func (n ACIdentifier) Equals(o ACIdentifier) bool {
-	return strings.ToLower(string(n)) == strings.ToLower(string(o))
-}
-
-// Empty returns a boolean indicating whether this ACIdentifier is empty.
-func (n ACIdentifier) Empty() bool {
-	return n.String() == ""
-}
-
-// NewACIdentifier generates a new ACIdentifier from a string. If the given string is
-// not a valid ACIdentifier, nil and an error are returned.
-func NewACIdentifier(s string) (*ACIdentifier, error) {
-	n := ACIdentifier(s)
-	if err := n.assertValid(); err != nil {
-		return nil, err
-	}
-	return &n, nil
-}
-
-// MustACIdentifier generates a new ACIdentifier from a string, If the given string is
-// not a valid ACIdentifier, it panics.
-func MustACIdentifier(s string) *ACIdentifier {
-	n, err := NewACIdentifier(s)
-	if err != nil {
-		panic(err)
-	}
-	return n
-}
-
-func (n ACIdentifier) assertValid() error {
-	s := string(n)
-	if len(s) == 0 {
-		return ErrEmptyACIdentifier
-	}
-	if invalidACIdentifierChars.MatchString(s) {
-		return ErrInvalidCharInACIdentifier
-	}
-	if invalidACIdentifierEdges.MatchString(s) {
-		return ErrInvalidEdgeInACIdentifier
-	}
-	return nil
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface
-func (n *ACIdentifier) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-	nn, err := NewACIdentifier(s)
-	if err != nil {
-		return err
-	}
-	*n = *nn
-	return nil
-}
-
-// MarshalJSON implements the json.Marshaler interface
-func (n ACIdentifier) MarshalJSON() ([]byte, error) {
-	if err := n.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(n.String())
-}
-
-// SanitizeACIdentifier replaces every invalid ACIdentifier character in s with an underscore
-// making it a legal ACIdentifier string. If the character is an upper case letter it
-// replaces it with its lower case. It also removes illegal edge characters
-// (hyphens, period, underscore, tilde and slash).
-//
-// This is a helper function and its algorithm is not part of the spec. It
-// should not be called without the user explicitly asking for a suggestion.
-func SanitizeACIdentifier(s string) (string, error) {
-	s = strings.ToLower(s)
-	s = invalidACIdentifierChars.ReplaceAllString(s, "_")
-	s = invalidACIdentifierEdges.ReplaceAllString(s, "")
-
-	if s == "" {
-		return "", errors.New("must contain at least one valid character")
-	}
-
-	return s, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/ackind.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/ackind.go
deleted file mode 100644
index 1793ca8de8..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/ackind.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-var (
-	ErrNoACKind = ACKindError("ACKind must be set")
-)
-
-// ACKind wraps a string to define a field which must be set with one of
-// several ACKind values. If it is unset, or has an invalid value, the field
-// will refuse to marshal/unmarshal.
-type ACKind string
-
-func (a ACKind) String() string {
-	return string(a)
-}
-
-func (a ACKind) assertValid() error {
-	s := a.String()
-	switch s {
-	case "ImageManifest", "PodManifest":
-		return nil
-	case "":
-		return ErrNoACKind
-	default:
-		msg := fmt.Sprintf("bad ACKind: %s", s)
-		return ACKindError(msg)
-	}
-}
-
-func (a ACKind) MarshalJSON() ([]byte, error) {
-	if err := a.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(a.String())
-}
-
-func (a *ACKind) UnmarshalJSON(data []byte) error {
-	var s string
-	err := json.Unmarshal(data, &s)
-	if err != nil {
-		return err
-	}
-	na := ACKind(s)
-	if err := na.assertValid(); err != nil {
-		return err
-	}
-	*a = na
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/acname.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/acname.go
deleted file mode 100644
index 5ececffb7f..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/acname.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"errors"
-	"regexp"
-	"strings"
-)
-
-var (
-	// ValidACName is a regular expression that defines a valid ACName
-	ValidACName = regexp.MustCompile("^[a-z0-9]+([-][a-z0-9]+)*$")
-
-	invalidACNameChars = regexp.MustCompile("[^a-z0-9-]")
-	invalidACNameEdges = regexp.MustCompile("(^[-]+)|([-]+$)")
-
-	ErrEmptyACName         = ACNameError("ACName cannot be empty")
-	ErrInvalidEdgeInACName = ACNameError("ACName must start and end with only lower case " +
-		"alphanumeric characters")
-	ErrInvalidCharInACName = ACNameError("ACName must contain only lower case " +
-		`alphanumeric characters plus "-"`)
-)
-
-// ACName (an App-Container Name) is a format used by keys in different formats
-// of the App Container Standard. An ACName is restricted to numeric and lowercase
-// characters accepted by the DNS RFC[1] plus "-"; all alphabetical characters must
-// be lowercase only. Furthermore, the first and last character ("edges") must be
-// alphanumeric, and an ACName cannot be empty. Programmatically, an ACName must
-// conform to the regular expression ValidACName.
-//
-// [1] http://tools.ietf.org/html/rfc1123#page-13
-type ACName string
-
-func (n ACName) String() string {
-	return string(n)
-}
-
-// Set sets the ACName to the given value, if it is valid; if not,
-// an error is returned.
-func (n *ACName) Set(s string) error {
-	nn, err := NewACName(s)
-	if err == nil {
-		*n = *nn
-	}
-	return err
-}
-
-// Equals checks whether a given ACName is equal to this one.
-func (n ACName) Equals(o ACName) bool {
-	return strings.ToLower(string(n)) == strings.ToLower(string(o))
-}
-
-// Empty returns a boolean indicating whether this ACName is empty.
-func (n ACName) Empty() bool {
-	return n.String() == ""
-}
-
-// NewACName generates a new ACName from a string. If the given string is
-// not a valid ACName, nil and an error are returned.
-func NewACName(s string) (*ACName, error) {
-	n := ACName(s)
-	if err := n.assertValid(); err != nil {
-		return nil, err
-	}
-	return &n, nil
-}
-
-// MustACName generates a new ACName from a string, If the given string is
-// not a valid ACName, it panics.
-func MustACName(s string) *ACName {
-	n, err := NewACName(s)
-	if err != nil {
-		panic(err)
-	}
-	return n
-}
-
-func (n ACName) assertValid() error {
-	s := string(n)
-	if len(s) == 0 {
-		return ErrEmptyACName
-	}
-	if invalidACNameChars.MatchString(s) {
-		return ErrInvalidCharInACName
-	}
-	if invalidACNameEdges.MatchString(s) {
-		return ErrInvalidEdgeInACName
-	}
-	return nil
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface
-func (n *ACName) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-	nn, err := NewACName(s)
-	if err != nil {
-		return err
-	}
-	*n = *nn
-	return nil
-}
-
-// MarshalJSON implements the json.Marshaler interface
-func (n ACName) MarshalJSON() ([]byte, error) {
-	if err := n.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(n.String())
-}
-
-// SanitizeACName replaces every invalid ACName character in s with a dash
-// making it a legal ACName string. If the character is an upper case letter it
-// replaces it with its lower case. It also removes illegal edge characters
-// (hyphens).
-//
-// This is a helper function and its algorithm is not part of the spec. It
-// should not be called without the user explicitly asking for a suggestion.
-func SanitizeACName(s string) (string, error) {
-	s = strings.ToLower(s)
-	s = invalidACNameChars.ReplaceAllString(s, "-")
-	s = invalidACNameEdges.ReplaceAllString(s, "")
-
-	if s == "" {
-		return "", errors.New("must contain at least one valid character")
-	}
-
-	return s, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/annotations.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/annotations.go
deleted file mode 100644
index ce7743bf53..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/annotations.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-type Annotations []Annotation
-
-type annotations Annotations
-
-type Annotation struct {
-	Name  ACIdentifier `json:"name"`
-	Value string       `json:"value"`
-}
-
-func (a Annotations) assertValid() error {
-	seen := map[ACIdentifier]string{}
-	for _, anno := range a {
-		_, ok := seen[anno.Name]
-		if ok {
-			return fmt.Errorf(`duplicate annotations of name %q`, anno.Name)
-		}
-		seen[anno.Name] = anno.Value
-	}
-	if c, ok := seen["created"]; ok {
-		if _, err := NewDate(c); err != nil {
-			return err
-		}
-	}
-	if h, ok := seen["homepage"]; ok {
-		if _, err := NewURL(h); err != nil {
-			return err
-		}
-	}
-	if d, ok := seen["documentation"]; ok {
-		if _, err := NewURL(d); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (a Annotations) MarshalJSON() ([]byte, error) {
-	if err := a.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(annotations(a))
-}
-
-func (a *Annotations) UnmarshalJSON(data []byte) error {
-	var ja annotations
-	if err := json.Unmarshal(data, &ja); err != nil {
-		return err
-	}
-	na := Annotations(ja)
-	if err := na.assertValid(); err != nil {
-		return err
-	}
-	*a = na
-	return nil
-}
-
-// Retrieve the value of an annotation by the given name from Annotations, if
-// it exists.
-func (a Annotations) Get(name string) (val string, ok bool) {
-	for _, anno := range a {
-		if anno.Name.String() == name {
-			return anno.Value, true
-		}
-	}
-	return "", false
-}
-
-// Set sets the value of an annotation by the given name, overwriting if one already exists.
-func (a *Annotations) Set(name ACIdentifier, value string) {
-	for i, anno := range *a {
-		if anno.Name.Equals(name) {
-			(*a)[i] = Annotation{
-				Name:  name,
-				Value: value,
-			}
-			return
-		}
-	}
-	anno := Annotation{
-		Name:  name,
-		Value: value,
-	}
-	*a = append(*a, anno)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/app.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/app.go
deleted file mode 100644
index df13bf1c3a..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/app.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"path"
-)
-
-type App struct {
-	Exec              Exec           `json:"exec"`
-	EventHandlers     []EventHandler `json:"eventHandlers,omitempty"`
-	User              string         `json:"user"`
-	Group             string         `json:"group"`
-	SupplementaryGIDs []int          `json:"supplementaryGIDs,omitempty"`
-	WorkingDirectory  string         `json:"workingDirectory,omitempty"`
-	Environment       Environment    `json:"environment,omitempty"`
-	MountPoints       []MountPoint   `json:"mountPoints,omitempty"`
-	Ports             []Port         `json:"ports,omitempty"`
-	Isolators         Isolators      `json:"isolators,omitempty"`
-}
-
-// app is a model to facilitate extra validation during the
-// unmarshalling of the App
-type app App
-
-func (a *App) UnmarshalJSON(data []byte) error {
-	ja := app(*a)
-	err := json.Unmarshal(data, &ja)
-	if err != nil {
-		return err
-	}
-	na := App(ja)
-	if err := na.assertValid(); err != nil {
-		return err
-	}
-	if na.Environment == nil {
-		na.Environment = make(Environment, 0)
-	}
-	*a = na
-	return nil
-}
-
-func (a App) MarshalJSON() ([]byte, error) {
-	if err := a.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(app(a))
-}
-
-func (a *App) assertValid() error {
-	if err := a.Exec.assertValid(); err != nil {
-		return err
-	}
-	if a.User == "" {
-		return errors.New(`user is required`)
-	}
-	if a.Group == "" {
-		return errors.New(`group is required`)
-	}
-	if !path.IsAbs(a.WorkingDirectory) && a.WorkingDirectory != "" {
-		return errors.New("workingDirectory must be an absolute path")
-	}
-	eh := make(map[string]bool)
-	for _, e := range a.EventHandlers {
-		name := e.Name
-		if eh[name] {
-			return fmt.Errorf("Only one eventHandler of name %q allowed", name)
-		}
-		eh[name] = true
-	}
-	if err := a.Environment.assertValid(); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/date.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/date.go
deleted file mode 100644
index 4458bf45d9..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/date.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-)
-
-// Date wraps time.Time to marshal/unmarshal to/from JSON strings in strict
-// accordance with RFC3339
-// TODO(jonboulle): golang's implementation seems slightly buggy here;
-// according to http://tools.ietf.org/html/rfc3339#section-5.6 , applications
-// may choose to separate the date and time with a space instead of a T
-// character (for example, `date --rfc-3339` on GNU coreutils) - but this is
-// considered an error by go's parser. File a bug?
-type Date time.Time
-
-func NewDate(s string) (*Date, error) {
-	t, err := time.Parse(time.RFC3339, s)
-	if err != nil {
-		return nil, fmt.Errorf("bad Date: %v", err)
-	}
-	d := Date(t)
-	return &d, nil
-}
-
-func (d Date) String() string {
-	return time.Time(d).Format(time.RFC3339)
-}
-
-func (d *Date) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-	nd, err := NewDate(s)
-	if err != nil {
-		return err
-	}
-	*d = *nd
-	return nil
-}
-
-func (d Date) MarshalJSON() ([]byte, error) {
-	return json.Marshal(d.String())
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/dependencies.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/dependencies.go
deleted file mode 100644
index fb399e4041..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/dependencies.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"errors"
-)
-
-type Dependencies []Dependency
-
-type Dependency struct {
-	ImageName ACIdentifier `json:"imageName"`
-	ImageID   *Hash        `json:"imageID,omitempty"`
-	Labels    Labels       `json:"labels,omitempty"`
-	Size      uint         `json:"size,omitempty"`
-}
-
-type dependency Dependency
-
-func (d Dependency) assertValid() error {
-	if len(d.ImageName) < 1 {
-		return errors.New(`imageName cannot be empty`)
-	}
-	return nil
-}
-
-func (d Dependency) MarshalJSON() ([]byte, error) {
-	if err := d.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(dependency(d))
-}
-
-func (d *Dependency) UnmarshalJSON(data []byte) error {
-	var jd dependency
-	if err := json.Unmarshal(data, &jd); err != nil {
-		return err
-	}
-	nd := Dependency(jd)
-	if err := nd.assertValid(); err != nil {
-		return err
-	}
-	*d = nd
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/doc.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/doc.go
deleted file mode 100644
index 9c540851b0..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/doc.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package types contains structs representing the various types in the app
-// container specification. It is used by the [schema manifest types](../)
-// to enforce validation.
-package types
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/environment.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/environment.go
deleted file mode 100644
index f152a6b88d..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/environment.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-	"regexp"
-)
-
-var (
-	envPattern = regexp.MustCompile("^[A-Za-z_][A-Za-z_0-9]*$")
-)
-
-type Environment []EnvironmentVariable
-
-type environment Environment
-
-type EnvironmentVariable struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
-}
-
-func (ev EnvironmentVariable) assertValid() error {
-	if len(ev.Name) == 0 {
-		return fmt.Errorf(`environment variable name must not be empty`)
-	}
-	if !envPattern.MatchString(ev.Name) {
-		return fmt.Errorf(`environment variable does not have valid identifier %q`, ev.Name)
-	}
-	return nil
-}
-
-func (e Environment) assertValid() error {
-	seen := map[string]bool{}
-	for _, env := range e {
-		if err := env.assertValid(); err != nil {
-			return err
-		}
-		_, ok := seen[env.Name]
-		if ok {
-			return fmt.Errorf(`duplicate environment variable of name %q`, env.Name)
-		}
-		seen[env.Name] = true
-	}
-
-	return nil
-}
-
-func (e Environment) MarshalJSON() ([]byte, error) {
-	if err := e.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(environment(e))
-}
-
-func (e *Environment) UnmarshalJSON(data []byte) error {
-	var je environment
-	if err := json.Unmarshal(data, &je); err != nil {
-		return err
-	}
-	ne := Environment(je)
-	if err := ne.assertValid(); err != nil {
-		return err
-	}
-	*e = ne
-	return nil
-}
-
-// Retrieve the value of an environment variable by the given name from
-// Environment, if it exists.
-func (e Environment) Get(name string) (value string, ok bool) {
-	for _, env := range e {
-		if env.Name == name {
-			return env.Value, true
-		}
-	}
-	return "", false
-}
-
-// Set sets the value of an environment variable by the given name,
-// overwriting if one already exists.
-func (e *Environment) Set(name string, value string) {
-	for i, env := range *e {
-		if env.Name == name {
-			(*e)[i] = EnvironmentVariable{
-				Name:  name,
-				Value: value,
-			}
-			return
-		}
-	}
-	env := EnvironmentVariable{
-		Name:  name,
-		Value: value,
-	}
-	*e = append(*e, env)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/errors.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/errors.go
deleted file mode 100644
index bb46515944..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/errors.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import "fmt"
-
-// An ACKindError is returned when the wrong ACKind is set in a manifest
-type ACKindError string
-
-func (e ACKindError) Error() string {
-	return string(e)
-}
-
-func InvalidACKindError(kind ACKind) ACKindError {
-	return ACKindError(fmt.Sprintf("missing or bad ACKind (must be %#v)", kind))
-}
-
-// An ACVersionError is returned when a bad ACVersion is set in a manifest
-type ACVersionError string
-
-func (e ACVersionError) Error() string {
-	return string(e)
-}
-
-// An ACIdentifierError is returned when a bad value is used for an ACIdentifier
-type ACIdentifierError string
-
-func (e ACIdentifierError) Error() string {
-	return string(e)
-}
-
-// An ACNameError is returned when a bad value is used for an ACName
-type ACNameError string
-
-func (e ACNameError) Error() string {
-	return string(e)
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/event_handler.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/event_handler.go
deleted file mode 100644
index f40c642be4..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/event_handler.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-type EventHandler struct {
-	Name string `json:"name"`
-	Exec Exec   `json:"exec"`
-}
-
-type eventHandler EventHandler
-
-func (e EventHandler) assertValid() error {
-	s := e.Name
-	switch s {
-	case "pre-start", "post-stop":
-		return nil
-	case "":
-		return errors.New(`eventHandler "name" cannot be empty`)
-	default:
-		return fmt.Errorf(`bad eventHandler "name": %q`, s)
-	}
-}
-
-func (e EventHandler) MarshalJSON() ([]byte, error) {
-	if err := e.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(eventHandler(e))
-}
-
-func (e *EventHandler) UnmarshalJSON(data []byte) error {
-	var je eventHandler
-	err := json.Unmarshal(data, &je)
-	if err != nil {
-		return err
-	}
-	ne := EventHandler(je)
-	if err := ne.assertValid(); err != nil {
-		return err
-	}
-	*e = ne
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/exec.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/exec.go
deleted file mode 100644
index fa8b156cfb..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/exec.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import "encoding/json"
-
-type Exec []string
-
-type exec Exec
-
-func (e Exec) assertValid() error {
-	return nil
-}
-
-func (e Exec) MarshalJSON() ([]byte, error) {
-	if err := e.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(exec(e))
-}
-
-func (e *Exec) UnmarshalJSON(data []byte) error {
-	var je exec
-	err := json.Unmarshal(data, &je)
-	if err != nil {
-		return err
-	}
-	ne := Exec(je)
-	if err := ne.assertValid(); err != nil {
-		return err
-	}
-	*e = ne
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/hash.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/hash.go
deleted file mode 100644
index 1c060a47a0..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/hash.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"crypto/sha512"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-const (
-	maxHashSize = (sha512.Size / 2) + len("sha512-")
-)
-
-// Hash encodes a hash specified in a string of the form:
-//    "<type>-<value>"
-// for example
-//    "sha512-06c733b1838136838e6d2d3e8fa5aea4c7905e92[...]"
-// Valid types are currently:
-//  * sha512
-type Hash struct {
-	typ string
-	Val string
-}
-
-func NewHash(s string) (*Hash, error) {
-	elems := strings.Split(s, "-")
-	if len(elems) != 2 {
-		return nil, errors.New("badly formatted hash string")
-	}
-	nh := Hash{
-		typ: elems[0],
-		Val: elems[1],
-	}
-	if err := nh.assertValid(); err != nil {
-		return nil, err
-	}
-	return &nh, nil
-}
-
-func (h Hash) String() string {
-	return fmt.Sprintf("%s-%s", h.typ, h.Val)
-}
-
-func (h *Hash) Set(s string) error {
-	nh, err := NewHash(s)
-	if err == nil {
-		*h = *nh
-	}
-	return err
-}
-
-func (h Hash) Empty() bool {
-	return reflect.DeepEqual(h, Hash{})
-}
-
-func (h Hash) assertValid() error {
-	switch h.typ {
-	case "sha512":
-	case "":
-		return fmt.Errorf("unexpected empty hash type")
-	default:
-		return fmt.Errorf("unrecognized hash type: %v", h.typ)
-	}
-	if h.Val == "" {
-		return fmt.Errorf("unexpected empty hash value")
-	}
-	return nil
-}
-
-func (h *Hash) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-	nh, err := NewHash(s)
-	if err != nil {
-		return err
-	}
-	*h = *nh
-	return nil
-}
-
-func (h Hash) MarshalJSON() ([]byte, error) {
-	if err := h.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(h.String())
-}
-
-func NewHashSHA512(b []byte) *Hash {
-	h := sha512.New()
-	h.Write(b)
-	nh, _ := NewHash(fmt.Sprintf("sha512-%x", h.Sum(nil)))
-	return nh
-}
-
-func ShortHash(hash string) string {
-	if len(hash) > maxHashSize {
-		return hash[:maxHashSize]
-	}
-	return hash
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator.go
deleted file mode 100644
index ecdab0088b..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-)
-
-var (
-	isolatorMap map[ACIdentifier]IsolatorValueConstructor
-)
-
-func init() {
-	isolatorMap = make(map[ACIdentifier]IsolatorValueConstructor)
-}
-
-type IsolatorValueConstructor func() IsolatorValue
-
-func AddIsolatorValueConstructor(n ACIdentifier, i IsolatorValueConstructor) {
-	isolatorMap[n] = i
-}
-
-func AddIsolatorName(n ACIdentifier, ns map[ACIdentifier]struct{}) {
-	ns[n] = struct{}{}
-}
-
-// Isolators encapsulates a list of individual Isolators for the ImageManifest
-// and PodManifest schemas.
-type Isolators []Isolator
-
-// GetByName returns the last isolator in the list by the given name.
-func (is *Isolators) GetByName(name ACIdentifier) *Isolator {
-	var i Isolator
-	for j := len(*is) - 1; j >= 0; j-- {
-		i = []Isolator(*is)[j]
-		if i.Name == name {
-			return &i
-		}
-	}
-	return nil
-}
-
-// Unrecognized returns a set of isolators that are not recognized.
-// An isolator is not recognized if it has not had an associated
-// constructor registered with AddIsolatorValueConstructor.
-func (is *Isolators) Unrecognized() Isolators {
-	u := Isolators{}
-	for _, i := range *is {
-		if i.value == nil {
-			u = append(u, i)
-		}
-	}
-	return u
-}
-
-// IsolatorValue encapsulates the actual value of an Isolator which may be
-// serialized as any arbitrary JSON blob. Specific Isolator types should
-// implement this interface to facilitate unmarshalling and validation.
-type IsolatorValue interface {
-	UnmarshalJSON(b []byte) error
-	AssertValid() error
-}
-
-// Isolator is a model for unmarshalling isolator types from their JSON-encoded
-// representation.
-type Isolator struct {
-	// Name is the name of the Isolator type as defined in the specification.
-	Name ACIdentifier `json:"name"`
-	// ValueRaw captures the raw JSON value of an Isolator that was
-	// unmarshalled. This field is used for unmarshalling only. It MUST NOT
-	// be referenced by external users of the Isolator struct. It is
-	// exported only to satisfy Go's unfortunate requirement that fields
-	// must be capitalized to be unmarshalled successfully.
-	ValueRaw *json.RawMessage `json:"value"`
-	// value captures the "true" value of the isolator.
-	value IsolatorValue
-}
-
-// isolator is a shadow type used for unmarshalling.
-type isolator Isolator
-
-// Value returns the raw Value of this Isolator. Users should perform a type
-// switch/assertion on this value to extract the underlying isolator type.
-func (i *Isolator) Value() IsolatorValue {
-	return i.value
-}
-
-// UnmarshalJSON populates this Isolator from a JSON-encoded representation. To
-// unmarshal the Value of the Isolator, it will use the appropriate constructor
-// as registered by AddIsolatorValueConstructor.
-func (i *Isolator) UnmarshalJSON(b []byte) error {
-	var ii isolator
-	err := json.Unmarshal(b, &ii)
-	if err != nil {
-		return err
-	}
-
-	var dst IsolatorValue
-	con, ok := isolatorMap[ii.Name]
-	if ok {
-		dst = con()
-		err = dst.UnmarshalJSON(*ii.ValueRaw)
-		if err != nil {
-			return err
-		}
-		err = dst.AssertValid()
-		if err != nil {
-			return err
-		}
-	}
-
-	i.value = dst
-	i.ValueRaw = ii.ValueRaw
-	i.Name = ii.Name
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go
deleted file mode 100644
index 678e0bf1f4..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_linux_specific.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"errors"
-)
-
-const (
-	LinuxCapabilitiesRetainSetName = "os/linux/capabilities-retain-set"
-	LinuxCapabilitiesRevokeSetName = "os/linux/capabilities-remove-set"
-	LinuxNoNewPrivilegesName       = "os/linux/no-new-privileges"
-)
-
-var LinuxIsolatorNames = make(map[ACIdentifier]struct{})
-
-func init() {
-	for name, con := range map[ACIdentifier]IsolatorValueConstructor{
-		LinuxCapabilitiesRevokeSetName: func() IsolatorValue { return &LinuxCapabilitiesRevokeSet{} },
-		LinuxCapabilitiesRetainSetName: func() IsolatorValue { return &LinuxCapabilitiesRetainSet{} },
-		LinuxNoNewPrivilegesName:       func() IsolatorValue { v := LinuxNoNewPrivileges(false); return &v },
-	} {
-		AddIsolatorName(name, LinuxIsolatorNames)
-		AddIsolatorValueConstructor(name, con)
-	}
-}
-
-type LinuxNoNewPrivileges bool
-
-func (l LinuxNoNewPrivileges) AssertValid() error {
-	return nil
-}
-
-func (l *LinuxNoNewPrivileges) UnmarshalJSON(b []byte) error {
-	var v bool
-	err := json.Unmarshal(b, &v)
-	if err != nil {
-		return err
-	}
-
-	*l = LinuxNoNewPrivileges(v)
-
-	return nil
-}
-
-type LinuxCapabilitiesSet interface {
-	Set() []LinuxCapability
-	AssertValid() error
-}
-
-type LinuxCapability string
-
-type linuxCapabilitiesSetValue struct {
-	Set []LinuxCapability `json:"set"`
-}
-
-type linuxCapabilitiesSetBase struct {
-	val linuxCapabilitiesSetValue
-}
-
-func (l linuxCapabilitiesSetBase) AssertValid() error {
-	if len(l.val.Set) == 0 {
-		return errors.New("set must be non-empty")
-	}
-	return nil
-}
-
-func (l *linuxCapabilitiesSetBase) UnmarshalJSON(b []byte) error {
-	var v linuxCapabilitiesSetValue
-	err := json.Unmarshal(b, &v)
-	if err != nil {
-		return err
-	}
-
-	l.val = v
-
-	return err
-}
-
-func (l linuxCapabilitiesSetBase) Set() []LinuxCapability {
-	return l.val.Set
-}
-
-type LinuxCapabilitiesRetainSet struct {
-	linuxCapabilitiesSetBase
-}
-
-func NewLinuxCapabilitiesRetainSet(caps ...string) (*LinuxCapabilitiesRetainSet, error) {
-	l := LinuxCapabilitiesRetainSet{
-		linuxCapabilitiesSetBase{
-			linuxCapabilitiesSetValue{
-				make([]LinuxCapability, len(caps)),
-			},
-		},
-	}
-	for i, c := range caps {
-		l.linuxCapabilitiesSetBase.val.Set[i] = LinuxCapability(c)
-	}
-	if err := l.AssertValid(); err != nil {
-		return nil, err
-	}
-	return &l, nil
-}
-
-func (l LinuxCapabilitiesRetainSet) AsIsolator() Isolator {
-	b, err := json.Marshal(l.linuxCapabilitiesSetBase.val)
-	if err != nil {
-		panic(err)
-	}
-	rm := json.RawMessage(b)
-	return Isolator{
-		Name:     LinuxCapabilitiesRetainSetName,
-		ValueRaw: &rm,
-		value:    &l,
-	}
-}
-
-type LinuxCapabilitiesRevokeSet struct {
-	linuxCapabilitiesSetBase
-}
-
-func NewLinuxCapabilitiesRevokeSet(caps ...string) (*LinuxCapabilitiesRevokeSet, error) {
-	l := LinuxCapabilitiesRevokeSet{
-		linuxCapabilitiesSetBase{
-			linuxCapabilitiesSetValue{
-				make([]LinuxCapability, len(caps)),
-			},
-		},
-	}
-	for i, c := range caps {
-		l.linuxCapabilitiesSetBase.val.Set[i] = LinuxCapability(c)
-	}
-	if err := l.AssertValid(); err != nil {
-		return nil, err
-	}
-	return &l, nil
-}
-
-func (l LinuxCapabilitiesRevokeSet) AsIsolator() Isolator {
-	b, err := json.Marshal(l.linuxCapabilitiesSetBase.val)
-	if err != nil {
-		panic(err)
-	}
-	rm := json.RawMessage(b)
-	return Isolator{
-		Name:     LinuxCapabilitiesRevokeSetName,
-		ValueRaw: &rm,
-		value:    &l,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
deleted file mode 100644
index 2ac5130d1c..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"k8s.io/kubernetes/pkg/api/resource"
-)
-
-var (
-	ErrDefaultTrue     = errors.New("default must be false")
-	ErrDefaultRequired = errors.New("default must be true")
-	ErrRequestNonEmpty = errors.New("request not supported by this resource, must be empty")
-
-	ResourceIsolatorNames = make(map[ACIdentifier]struct{})
-)
-
-const (
-	ResourceBlockBandwidthName   = "resource/block-bandwidth"
-	ResourceBlockIOPSName        = "resource/block-iops"
-	ResourceCPUName              = "resource/cpu"
-	ResourceMemoryName           = "resource/memory"
-	ResourceNetworkBandwidthName = "resource/network-bandwidth"
-)
-
-func init() {
-	for name, con := range map[ACIdentifier]IsolatorValueConstructor{
-		ResourceBlockBandwidthName:   func() IsolatorValue { return &ResourceBlockBandwidth{} },
-		ResourceBlockIOPSName:        func() IsolatorValue { return &ResourceBlockIOPS{} },
-		ResourceCPUName:              func() IsolatorValue { return &ResourceCPU{} },
-		ResourceMemoryName:           func() IsolatorValue { return &ResourceMemory{} },
-		ResourceNetworkBandwidthName: func() IsolatorValue { return &ResourceNetworkBandwidth{} },
-	} {
-		AddIsolatorName(name, ResourceIsolatorNames)
-		AddIsolatorValueConstructor(name, con)
-	}
-}
-
-type Resource interface {
-	Limit() *resource.Quantity
-	Request() *resource.Quantity
-	Default() bool
-}
-
-type ResourceBase struct {
-	val resourceValue
-}
-
-type resourceValue struct {
-	Default bool               `json:"default"`
-	Request *resource.Quantity `json:"request"`
-	Limit   *resource.Quantity `json:"limit"`
-}
-
-func (r ResourceBase) Limit() *resource.Quantity {
-	return r.val.Limit
-}
-func (r ResourceBase) Request() *resource.Quantity {
-	return r.val.Request
-}
-func (r ResourceBase) Default() bool {
-	return r.val.Default
-}
-
-func (r *ResourceBase) UnmarshalJSON(b []byte) error {
-	return json.Unmarshal(b, &r.val)
-}
-
-func (r ResourceBase) AssertValid() error {
-	return nil
-}
-
-type ResourceBlockBandwidth struct {
-	ResourceBase
-}
-
-func (r ResourceBlockBandwidth) AssertValid() error {
-	if r.Default() != true {
-		return ErrDefaultRequired
-	}
-	if r.Request() != nil {
-		return ErrRequestNonEmpty
-	}
-	return nil
-}
-
-type ResourceBlockIOPS struct {
-	ResourceBase
-}
-
-func (r ResourceBlockIOPS) AssertValid() error {
-	if r.Default() != true {
-		return ErrDefaultRequired
-	}
-	if r.Request() != nil {
-		return ErrRequestNonEmpty
-	}
-	return nil
-}
-
-type ResourceCPU struct {
-	ResourceBase
-}
-
-func (r ResourceCPU) String() string {
-	return fmt.Sprintf("ResourceCPU(request=%s, limit=%s)", r.Request(), r.Limit())
-}
-
-func (r ResourceCPU) AssertValid() error {
-	if r.Default() != false {
-		return ErrDefaultTrue
-	}
-	return nil
-}
-
-func (r ResourceCPU) AsIsolator() Isolator {
-	isol := isolatorMap[ResourceCPUName]()
-
-	b, err := json.Marshal(r.val)
-	if err != nil {
-		panic(err)
-	}
-	valRaw := json.RawMessage(b)
-	return Isolator{
-		Name:     ResourceCPUName,
-		ValueRaw: &valRaw,
-		value:    isol,
-	}
-}
-
-func NewResourceCPUIsolator(request, limit string) (*ResourceCPU, error) {
-	req, err := resource.ParseQuantity(request)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing request: %v", err)
-	}
-	lim, err := resource.ParseQuantity(limit)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing limit: %v", err)
-	}
-	res := &ResourceCPU{
-		ResourceBase{
-			resourceValue{
-				Request: req,
-				Limit:   lim,
-			},
-		},
-	}
-	if err := res.AssertValid(); err != nil {
-		// should never happen
-		return nil, err
-	}
-	return res, nil
-}
-
-type ResourceMemory struct {
-	ResourceBase
-}
-
-func (r ResourceMemory) String() string {
-	return fmt.Sprintf("ResourceMemory(request=%s, limit=%s)", r.Request(), r.Limit())
-}
-
-func (r ResourceMemory) AssertValid() error {
-	if r.Default() != false {
-		return ErrDefaultTrue
-	}
-	return nil
-}
-
-func (r ResourceMemory) AsIsolator() Isolator {
-	isol := isolatorMap[ResourceMemoryName]()
-
-	b, err := json.Marshal(r.val)
-	if err != nil {
-		panic(err)
-	}
-	valRaw := json.RawMessage(b)
-	return Isolator{
-		Name:     ResourceMemoryName,
-		ValueRaw: &valRaw,
-		value:    isol,
-	}
-}
-
-func NewResourceMemoryIsolator(request, limit string) (*ResourceMemory, error) {
-	req, err := resource.ParseQuantity(request)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing request: %v", err)
-	}
-	lim, err := resource.ParseQuantity(limit)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing limit: %v", err)
-	}
-	res := &ResourceMemory{
-		ResourceBase{
-			resourceValue{
-				Request: req,
-				Limit:   lim,
-			},
-		},
-	}
-	if err := res.AssertValid(); err != nil {
-		// should never happen
-		return nil, err
-	}
-	return res, nil
-}
-
-type ResourceNetworkBandwidth struct {
-	ResourceBase
-}
-
-func (r ResourceNetworkBandwidth) AssertValid() error {
-	if r.Default() != true {
-		return ErrDefaultRequired
-	}
-	if r.Request() != nil {
-		return ErrRequestNonEmpty
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/labels.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/labels.go
deleted file mode 100644
index ebd2bb1a98..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/labels.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-)
-
-var ValidOSArch = map[string][]string{
-	"linux":   {"amd64", "i386", "aarch64", "aarch64_be", "armv6l", "armv7l", "armv7b"},
-	"freebsd": {"amd64", "i386", "arm"},
-	"darwin":  {"x86_64", "i386"},
-}
-
-type Labels []Label
-
-type labels Labels
-
-type Label struct {
-	Name  ACIdentifier `json:"name"`
-	Value string       `json:"value"`
-}
-
-// IsValidOsArch checks if a OS-architecture combination is valid given a map
-// of valid OS-architectures
-func IsValidOSArch(labels map[ACIdentifier]string, validOSArch map[string][]string) error {
-	if os, ok := labels["os"]; ok {
-		if validArchs, ok := validOSArch[os]; !ok {
-			// Not a whitelisted OS. TODO: how to warn rather than fail?
-			validOses := make([]string, 0, len(validOSArch))
-			for validOs := range validOSArch {
-				validOses = append(validOses, validOs)
-			}
-			sort.Strings(validOses)
-			return fmt.Errorf(`bad os %#v (must be one of: %v)`, os, validOses)
-		} else {
-			// Whitelisted OS. We check arch here, as arch makes sense only
-			// when os is defined.
-			if arch, ok := labels["arch"]; ok {
-				found := false
-				for _, validArch := range validArchs {
-					if arch == validArch {
-						found = true
-						break
-					}
-				}
-				if !found {
-					return fmt.Errorf(`bad arch %#v for %v (must be one of: %v)`, arch, os, validArchs)
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func (l Labels) assertValid() error {
-	seen := map[ACIdentifier]string{}
-	for _, lbl := range l {
-		if lbl.Name == "name" {
-			return fmt.Errorf(`invalid label name: "name"`)
-		}
-		_, ok := seen[lbl.Name]
-		if ok {
-			return fmt.Errorf(`duplicate labels of name %q`, lbl.Name)
-		}
-		seen[lbl.Name] = lbl.Value
-	}
-	return IsValidOSArch(seen, ValidOSArch)
-}
-
-func (l Labels) MarshalJSON() ([]byte, error) {
-	if err := l.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(labels(l))
-}
-
-func (l *Labels) UnmarshalJSON(data []byte) error {
-	var jl labels
-	if err := json.Unmarshal(data, &jl); err != nil {
-		return err
-	}
-	nl := Labels(jl)
-	if err := nl.assertValid(); err != nil {
-		return err
-	}
-	*l = nl
-	return nil
-}
-
-// Get retrieves the value of the label by the given name from Labels, if it exists
-func (l Labels) Get(name string) (val string, ok bool) {
-	for _, lbl := range l {
-		if lbl.Name.String() == name {
-			return lbl.Value, true
-		}
-	}
-	return "", false
-}
-
-// ToMap creates a map[ACIdentifier]string.
-func (l Labels) ToMap() map[ACIdentifier]string {
-	labelsMap := make(map[ACIdentifier]string)
-	for _, lbl := range l {
-		labelsMap[lbl.Name] = lbl.Value
-	}
-	return labelsMap
-}
-
-// LabelsFromMap creates Labels from a map[ACIdentifier]string
-func LabelsFromMap(labelsMap map[ACIdentifier]string) (Labels, error) {
-	labels := Labels{}
-	for n, v := range labelsMap {
-		labels = append(labels, Label{Name: n, Value: v})
-	}
-	if err := labels.assertValid(); err != nil {
-		return nil, err
-	}
-	return labels, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/mountpoint.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/mountpoint.go
deleted file mode 100644
index 80eab94563..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/mountpoint.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"errors"
-	"fmt"
-	"net/url"
-	"strconv"
-
-	"github.com/appc/spec/schema/common"
-)
-
-type MountPoint struct {
-	Name     ACName `json:"name"`
-	Path     string `json:"path"`
-	ReadOnly bool   `json:"readOnly,omitempty"`
-}
-
-func (mount MountPoint) assertValid() error {
-	if mount.Name.Empty() {
-		return errors.New("name must be set")
-	}
-	if len(mount.Path) == 0 {
-		return errors.New("path must be set")
-	}
-	return nil
-}
-
-// MountPointFromString takes a command line mountpoint parameter and returns a mountpoint
-//
-// It is useful for actool patch-manifest --mounts
-//
-// Example mountpoint parameters:
-// 	database,path=/tmp,readOnly=true
-func MountPointFromString(mp string) (*MountPoint, error) {
-	var mount MountPoint
-
-	mp = "name=" + mp
-	mpQuery, err := common.MakeQueryString(mp)
-	if err != nil {
-		return nil, err
-	}
-
-	v, err := url.ParseQuery(mpQuery)
-	if err != nil {
-		return nil, err
-	}
-	for key, val := range v {
-		if len(val) > 1 {
-			return nil, fmt.Errorf("label %s with multiple values %q", key, val)
-		}
-
-		switch key {
-		case "name":
-			acn, err := NewACName(val[0])
-			if err != nil {
-				return nil, err
-			}
-			mount.Name = *acn
-		case "path":
-			mount.Path = val[0]
-		case "readOnly":
-			ro, err := strconv.ParseBool(val[0])
-			if err != nil {
-				return nil, err
-			}
-			mount.ReadOnly = ro
-		default:
-			return nil, fmt.Errorf("unknown mountpoint parameter %q", key)
-		}
-	}
-	err = mount.assertValid()
-	if err != nil {
-		return nil, err
-	}
-
-	return &mount, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/port.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/port.go
deleted file mode 100644
index 78d6de4ce1..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/port.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/url"
-	"strconv"
-
-	"github.com/appc/spec/schema/common"
-)
-
-type Port struct {
-	Name            ACName `json:"name"`
-	Protocol        string `json:"protocol"`
-	Port            uint   `json:"port"`
-	Count           uint   `json:"count"`
-	SocketActivated bool   `json:"socketActivated"`
-}
-
-type ExposedPort struct {
-	Name     ACName `json:"name"`
-	HostPort uint   `json:"hostPort"`
-}
-
-type port Port
-
-func (p *Port) UnmarshalJSON(data []byte) error {
-	var pp port
-	if err := json.Unmarshal(data, &pp); err != nil {
-		return err
-	}
-	np := Port(pp)
-	if err := np.assertValid(); err != nil {
-		return err
-	}
-	if np.Count == 0 {
-		np.Count = 1
-	}
-	*p = np
-	return nil
-}
-
-func (p Port) MarshalJSON() ([]byte, error) {
-	if err := p.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(port(p))
-}
-
-func (p Port) assertValid() error {
-	// Although there are no guarantees, most (if not all)
-	// transport protocols use 16 bit ports
-	if p.Port > 65535 || p.Port < 1 {
-		return errors.New("port must be in 1-65535 range")
-	}
-	if p.Port+p.Count > 65536 {
-		return errors.New("end of port range must be in 1-65535 range")
-	}
-	return nil
-}
-
-// PortFromString takes a command line port parameter and returns a port
-//
-// It is useful for actool patch-manifest --ports
-//
-// Example port parameters:
-//      health-check,protocol=udp,port=8000
-// 	query,protocol=tcp,port=8080,count=1,socketActivated=true
-func PortFromString(pt string) (*Port, error) {
-	var port Port
-
-	pt = "name=" + pt
-	ptQuery, err := common.MakeQueryString(pt)
-	if err != nil {
-		return nil, err
-	}
-
-	v, err := url.ParseQuery(ptQuery)
-	if err != nil {
-		return nil, err
-	}
-	for key, val := range v {
-		if len(val) > 1 {
-			return nil, fmt.Errorf("label %s with multiple values %q", key, val)
-		}
-
-		switch key {
-		case "name":
-			acn, err := NewACName(val[0])
-			if err != nil {
-				return nil, err
-			}
-			port.Name = *acn
-		case "protocol":
-			port.Protocol = val[0]
-		case "port":
-			p, err := strconv.ParseUint(val[0], 10, 16)
-			if err != nil {
-				return nil, err
-			}
-			port.Port = uint(p)
-		case "count":
-			cnt, err := strconv.ParseUint(val[0], 10, 16)
-			if err != nil {
-				return nil, err
-			}
-			port.Count = uint(cnt)
-		case "socketActivated":
-			sa, err := strconv.ParseBool(val[0])
-			if err != nil {
-				return nil, err
-			}
-			port.SocketActivated = sa
-		default:
-			return nil, fmt.Errorf("unknown port parameter %q", key)
-		}
-	}
-	err = port.assertValid()
-	if err != nil {
-		return nil, err
-	}
-
-	return &port, nil
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go
deleted file mode 100644
index 0008181a5e..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-
-	"github.com/coreos/go-semver/semver"
-)
-
-var (
-	ErrNoZeroSemVer = ACVersionError("SemVer cannot be zero")
-	ErrBadSemVer    = ACVersionError("SemVer is bad")
-)
-
-// SemVer implements the Unmarshaler interface to define a field that must be
-// a semantic version string
-// TODO(jonboulle): extend upstream instead of wrapping?
-type SemVer semver.Version
-
-// NewSemVer generates a new SemVer from a string. If the given string does
-// not represent a valid SemVer, nil and an error are returned.
-func NewSemVer(s string) (*SemVer, error) {
-	nsv, err := semver.NewVersion(s)
-	if err != nil {
-		return nil, ErrBadSemVer
-	}
-	v := SemVer(*nsv)
-	if v.Empty() {
-		return nil, ErrNoZeroSemVer
-	}
-	return &v, nil
-}
-
-func (sv SemVer) LessThanMajor(versionB SemVer) bool {
-	majorA := semver.Version(sv).Major
-	majorB := semver.Version(versionB).Major
-	if majorA < majorB {
-		return true
-	}
-	return false
-}
-
-func (sv SemVer) LessThanExact(versionB SemVer) bool {
-	vA := semver.Version(sv)
-	vB := semver.Version(versionB)
-	return vA.LessThan(vB)
-}
-
-func (sv SemVer) String() string {
-	s := semver.Version(sv)
-	return s.String()
-}
-
-func (sv SemVer) Empty() bool {
-	return semver.Version(sv) == semver.Version{}
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface
-func (sv *SemVer) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-	v, err := NewSemVer(s)
-	if err != nil {
-		return err
-	}
-	*sv = *v
-	return nil
-}
-
-// MarshalJSON implements the json.Marshaler interface
-func (sv SemVer) MarshalJSON() ([]byte, error) {
-	if sv.Empty() {
-		return nil, ErrNoZeroSemVer
-	}
-	return json.Marshal(sv.String())
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/url.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/url.go
deleted file mode 100644
index d4f8f337da..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/url.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/url"
-)
-
-// URL wraps url.URL to marshal/unmarshal to/from JSON strings and enforce
-// that the scheme is HTTP/HTTPS only
-type URL url.URL
-
-func NewURL(s string) (*URL, error) {
-	uu, err := url.Parse(s)
-	if err != nil {
-		return nil, fmt.Errorf("bad URL: %v", err)
-	}
-	nu := URL(*uu)
-	if err := nu.assertValidScheme(); err != nil {
-		return nil, err
-	}
-	return &nu, nil
-}
-
-func (u URL) String() string {
-	uu := url.URL(u)
-	return uu.String()
-}
-
-func (u URL) assertValidScheme() error {
-	switch u.Scheme {
-	case "http", "https":
-		return nil
-	default:
-		return fmt.Errorf("bad URL scheme, must be http/https")
-	}
-}
-
-func (u *URL) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-	nu, err := NewURL(s)
-	if err != nil {
-		return err
-	}
-	*u = *nu
-	return nil
-}
-
-func (u URL) MarshalJSON() ([]byte, error) {
-	if err := u.assertValidScheme(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(u.String())
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/uuid.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/uuid.go
deleted file mode 100644
index 4925b7606d..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/uuid.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-var (
-	ErrNoEmptyUUID = errors.New("UUID cannot be empty")
-)
-
-// UUID encodes an RFC4122-compliant UUID, marshaled to/from a string
-// TODO(jonboulle): vendor a package for this?
-// TODO(jonboulle): consider more flexibility in input string formats.
-// Right now, we only accept:
-//   "6733C088-A507-4694-AABF-EDBE4FC5266F"
-//   "6733C088A5074694AABFEDBE4FC5266F"
-type UUID [16]byte
-
-func (u UUID) String() string {
-	return fmt.Sprintf("%x-%x-%x-%x-%x", u[0:4], u[4:6], u[6:8], u[8:10], u[10:16])
-}
-
-func (u *UUID) Set(s string) error {
-	nu, err := NewUUID(s)
-	if err == nil {
-		*u = *nu
-	}
-	return err
-}
-
-// NewUUID generates a new UUID from the given string. If the string does not
-// represent a valid UUID, nil and an error are returned.
-func NewUUID(s string) (*UUID, error) {
-	s = strings.Replace(s, "-", "", -1)
-	if len(s) != 32 {
-		return nil, errors.New("bad UUID length != 32")
-	}
-	dec, err := hex.DecodeString(s)
-	if err != nil {
-		return nil, err
-	}
-	var u UUID
-	for i, b := range dec {
-		u[i] = b
-	}
-	return &u, nil
-}
-
-func (u UUID) Empty() bool {
-	return reflect.DeepEqual(u, UUID{})
-}
-
-func (u *UUID) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-	uu, err := NewUUID(s)
-	if uu.Empty() {
-		return ErrNoEmptyUUID
-	}
-	if err == nil {
-		*u = *uu
-	}
-	return err
-}
-
-func (u UUID) MarshalJSON() ([]byte, error) {
-	if u.Empty() {
-		return nil, ErrNoEmptyUUID
-	}
-	return json.Marshal(u.String())
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/volume.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/volume.go
deleted file mode 100644
index c5ae59180f..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/volume.go
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/url"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/appc/spec/schema/common"
-)
-
-const (
-	emptyVolumeDefaultMode = "0755"
-	emptyVolumeDefaultUID  = 0
-	emptyVolumeDefaultGID  = 0
-)
-
-// Volume encapsulates a volume which should be mounted into the filesystem
-// of all apps in a PodManifest
-type Volume struct {
-	Name ACName `json:"name"`
-	Kind string `json:"kind"`
-
-	// currently used only by "host"
-	// TODO(jonboulle): factor out?
-	Source   string `json:"source,omitempty"`
-	ReadOnly *bool  `json:"readOnly,omitempty"`
-
-	// currently used only by "empty"
-	Mode *string `json:"mode,omitempty"`
-	UID  *int    `json:"uid,omitempty"`
-	GID  *int    `json:"gid,omitempty"`
-}
-
-type volume Volume
-
-func (v Volume) assertValid() error {
-	if v.Name.Empty() {
-		return errors.New("name must be set")
-	}
-
-	switch v.Kind {
-	case "empty":
-		if v.Source != "" {
-			return errors.New("source for empty volume must be empty")
-		}
-		if v.Mode == nil {
-			return errors.New("mode for empty volume must be set")
-		}
-		if v.UID == nil {
-			return errors.New("uid for empty volume must be set")
-		}
-		if v.GID == nil {
-			return errors.New("gid for empty volume must be set")
-		}
-		return nil
-	case "host":
-		if v.Source == "" {
-			return errors.New("source for host volume cannot be empty")
-		}
-		if v.Mode != nil {
-			return errors.New("mode for host volume cannot be set")
-		}
-		if v.UID != nil {
-			return errors.New("uid for host volume cannot be set")
-		}
-		if v.GID != nil {
-			return errors.New("gid for host volume cannot be set")
-		}
-		if !filepath.IsAbs(v.Source) {
-			return errors.New("source for host volume must be absolute path")
-		}
-		return nil
-	default:
-		return errors.New(`unrecognized volume kind: should be one of "empty", "host"`)
-	}
-}
-
-func (v *Volume) UnmarshalJSON(data []byte) error {
-	var vv volume
-	if err := json.Unmarshal(data, &vv); err != nil {
-		return err
-	}
-	nv := Volume(vv)
-	maybeSetDefaults(&nv)
-	if err := nv.assertValid(); err != nil {
-		return err
-	}
-	*v = nv
-	return nil
-}
-
-func (v Volume) MarshalJSON() ([]byte, error) {
-	if err := v.assertValid(); err != nil {
-		return nil, err
-	}
-	return json.Marshal(volume(v))
-}
-
-func (v Volume) String() string {
-	s := []string{
-		v.Name.String(),
-		",kind=",
-		v.Kind,
-	}
-	if v.Source != "" {
-		s = append(s, ",source=")
-		s = append(s, v.Source)
-	}
-	if v.ReadOnly != nil {
-		s = append(s, ",readOnly=")
-		s = append(s, strconv.FormatBool(*v.ReadOnly))
-	}
-	switch v.Kind {
-	case "empty":
-		if *v.Mode != emptyVolumeDefaultMode {
-			s = append(s, ",mode=")
-			s = append(s, *v.Mode)
-		}
-		if *v.UID != emptyVolumeDefaultUID {
-			s = append(s, ",uid=")
-			s = append(s, strconv.Itoa(*v.UID))
-		}
-		if *v.GID != emptyVolumeDefaultGID {
-			s = append(s, ",gid=")
-			s = append(s, strconv.Itoa(*v.GID))
-		}
-	}
-	return strings.Join(s, "")
-}
-
-// VolumeFromString takes a command line volume parameter and returns a volume
-//
-// Example volume parameters:
-// 	database,kind=host,source=/tmp,readOnly=true
-func VolumeFromString(vp string) (*Volume, error) {
-	var vol Volume
-
-	vp = "name=" + vp
-	vpQuery, err := common.MakeQueryString(vp)
-	if err != nil {
-		return nil, err
-	}
-
-	v, err := url.ParseQuery(vpQuery)
-	if err != nil {
-		return nil, err
-	}
-	for key, val := range v {
-		val := val
-		if len(val) > 1 {
-			return nil, fmt.Errorf("label %s with multiple values %q", key, val)
-		}
-
-		switch key {
-		case "name":
-			acn, err := NewACName(val[0])
-			if err != nil {
-				return nil, err
-			}
-			vol.Name = *acn
-		case "kind":
-			vol.Kind = val[0]
-		case "source":
-			vol.Source = val[0]
-		case "readOnly":
-			ro, err := strconv.ParseBool(val[0])
-			if err != nil {
-				return nil, err
-			}
-			vol.ReadOnly = &ro
-		case "mode":
-			vol.Mode = &val[0]
-		case "uid":
-			u, err := strconv.Atoi(val[0])
-			if err != nil {
-				return nil, err
-			}
-			vol.UID = &u
-		case "gid":
-			g, err := strconv.Atoi(val[0])
-			if err != nil {
-				return nil, err
-			}
-			vol.GID = &g
-		default:
-			return nil, fmt.Errorf("unknown volume parameter %q", key)
-		}
-	}
-
-	maybeSetDefaults(&vol)
-
-	err = vol.assertValid()
-	if err != nil {
-		return nil, err
-	}
-
-	return &vol, nil
-}
-
-// maybeSetDefaults sets the correct default values for certain fields on a
-// Volume if they are not already been set. These fields are not
-// pre-populated on all Volumes as the Volume type is polymorphic.
-func maybeSetDefaults(vol *Volume) {
-	if vol.Kind == "empty" {
-		if vol.Mode == nil {
-			m := emptyVolumeDefaultMode
-			vol.Mode = &m
-		}
-		if vol.UID == nil {
-			u := emptyVolumeDefaultUID
-			vol.UID = &u
-		}
-		if vol.GID == nil {
-			g := emptyVolumeDefaultGID
-			vol.GID = &g
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
deleted file mode 100644
index 029ebfac35..0000000000
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package schema
-
-import (
-	"github.com/appc/spec/schema/types"
-)
-
-const (
-	// version represents the canonical version of the appc spec and tooling.
-	// For now, the schema and tooling is coupled with the spec itself, so
-	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.4"
-)
-
-var (
-	// AppContainerVersion is the SemVer representation of version
-	AppContainerVersion types.SemVer
-)
-
-func init() {
-	v, err := types.NewSemVer(version)
-	if err != nil {
-		panic(err)
-	}
-	AppContainerVersion = *v
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt
deleted file mode 100644
index 5f14d1162e..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/NOTICE.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-AWS SDK for Go
-Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
-Copyright 2014-2015 Stripe, Inc.
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go
deleted file mode 100644
index cbc6bb1c0b..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/error.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Package awserr represents API error interface accessors for the SDK.
-package awserr
-
-// An Error wraps lower level errors with code, message and an original error.
-// The underlying concrete error type may also satisfy other interfaces which
-// can be to used to obtain more specific information about the error.
-//
-// Calling Error() or String() will always include the full information about
-// an error based on its underlying type.
-//
-// Example:
-//
-//     output, err := s3manage.Upload(svc, input, opts)
-//     if err != nil {
-//         if awsErr, ok := err.(awserr.Error); ok {
-//             // Get error details
-//             log.Println("Error:", awsErr.Code(), awsErr.Message())
-//
-//             // Prints out full error message, including original error if there was one.
-//             log.Println("Error:", awsErr.Error())
-//
-//             // Get original error
-//             if origErr := awsErr.OrigErr(); origErr != nil {
-//                 // operate on original error.
-//             }
-//         } else {
-//             fmt.Println(err.Error())
-//         }
-//     }
-//
-type Error interface {
-	// Satisfy the generic error interface.
-	error
-
-	// Returns the short phrase depicting the classification of the error.
-	Code() string
-
-	// Returns the error details message.
-	Message() string
-
-	// Returns the original error if one was set.  Nil is returned if not set.
-	OrigErr() error
-}
-
-// BatchError is a batch of errors which also wraps lower level errors with code, message,
-// and original errors. Calling Error() will only return the error that is at the end
-// of the list.
-type BatchError interface {
-	// Satisfy the generic error interface.
-	error
-
-	// Returns the short phrase depicting the classification of the error.
-	Code() string
-
-	// Returns the error details message.
-	Message() string
-
-	// Returns the original error if one was set.  Nil is returned if not set.
-	OrigErrs() []error
-}
-
-// New returns an Error object described by the code, message, and origErr.
-//
-// If origErr satisfies the Error interface it will not be wrapped within a new
-// Error object and will instead be returned.
-func New(code, message string, origErr error) Error {
-	return newBaseError(code, message, origErr)
-}
-
-// NewBatchError returns an baseError with an expectation of an array of errors
-func NewBatchError(code, message string, errs []error) BatchError {
-	return newBaseErrors(code, message, errs)
-}
-
-// A RequestFailure is an interface to extract request failure information from
-// an Error such as the request ID of the failed request returned by a service.
-// RequestFailures may not always have a requestID value if the request failed
-// prior to reaching the service such as a connection error.
-//
-// Example:
-//
-//     output, err := s3manage.Upload(svc, input, opts)
-//     if err != nil {
-//         if reqerr, ok := err.(RequestFailure); ok {
-//             log.Println("Request failed", reqerr.Code(), reqerr.Message(), reqerr.RequestID())
-//         } else {
-//             log.Println("Error:", err.Error())
-//         }
-//     }
-//
-// Combined with awserr.Error:
-//
-//    output, err := s3manage.Upload(svc, input, opts)
-//    if err != nil {
-//        if awsErr, ok := err.(awserr.Error); ok {
-//            // Generic AWS Error with Code, Message, and original error (if any)
-//            fmt.Println(awsErr.Code(), awsErr.Message(), awsErr.OrigErr())
-//
-//            if reqErr, ok := err.(awserr.RequestFailure); ok {
-//                // A service error occurred
-//                fmt.Println(reqErr.StatusCode(), reqErr.RequestID())
-//            }
-//        } else {
-//            fmt.Println(err.Error())
-//        }
-//    }
-//
-type RequestFailure interface {
-	Error
-
-	// The status code of the HTTP response.
-	StatusCode() int
-
-	// The request ID returned by the service for a request failure. This will
-	// be empty if no request ID is available such as the request failed due
-	// to a connection error.
-	RequestID() string
-}
-
-// NewRequestFailure returns a new request error wrapper for the given Error
-// provided.
-func NewRequestFailure(err Error, statusCode int, reqID string) RequestFailure {
-	return newRequestError(err, statusCode, reqID)
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go
deleted file mode 100644
index 605f73c5d6..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr/types.go
+++ /dev/null
@@ -1,197 +0,0 @@
-package awserr
-
-import "fmt"
-
-// SprintError returns a string of the formatted error code.
-//
-// Both extra and origErr are optional.  If they are included their lines
-// will be added, but if they are not included their lines will be ignored.
-func SprintError(code, message, extra string, origErr error) string {
-	msg := fmt.Sprintf("%s: %s", code, message)
-	if extra != "" {
-		msg = fmt.Sprintf("%s\n\t%s", msg, extra)
-	}
-	if origErr != nil {
-		msg = fmt.Sprintf("%s\ncaused by: %s", msg, origErr.Error())
-	}
-	return msg
-}
-
-// A baseError wraps the code and message which defines an error. It also
-// can be used to wrap an original error object.
-//
-// Should be used as the root for errors satisfying the awserr.Error. Also
-// for any error which does not fit into a specific error wrapper type.
-type baseError struct {
-	// Classification of error
-	code string
-
-	// Detailed information about error
-	message string
-
-	// Optional original error this error is based off of. Allows building
-	// chained errors.
-	errs []error
-}
-
-// newBaseError returns an error object for the code, message, and err.
-//
-// code is a short no whitespace phrase depicting the classification of
-// the error that is being created.
-//
-// message is the free flow string containing detailed information about the error.
-//
-// origErr is the error object which will be nested under the new error to be returned.
-func newBaseError(code, message string, origErr error) *baseError {
-	b := &baseError{
-		code:    code,
-		message: message,
-	}
-
-	if origErr != nil {
-		b.errs = append(b.errs, origErr)
-	}
-
-	return b
-}
-
-// newBaseErrors returns an error object for the code, message, and errors.
-//
-// code is a short no whitespace phrase depicting the classification of
-// the error that is being created.
-//
-// message is the free flow string containing detailed information about the error.
-//
-// origErrs is the error objects which will be nested under the new errors to be returned.
-func newBaseErrors(code, message string, origErrs []error) *baseError {
-	b := &baseError{
-		code:    code,
-		message: message,
-		errs:    origErrs,
-	}
-
-	return b
-}
-
-// Error returns the string representation of the error.
-//
-// See ErrorWithExtra for formatting.
-//
-// Satisfies the error interface.
-func (b baseError) Error() string {
-	size := len(b.errs)
-	if size > 0 {
-		return SprintError(b.code, b.message, "", errorList(b.errs))
-	}
-
-	return SprintError(b.code, b.message, "", nil)
-}
-
-// String returns the string representation of the error.
-// Alias for Error to satisfy the stringer interface.
-func (b baseError) String() string {
-	return b.Error()
-}
-
-// Code returns the short phrase depicting the classification of the error.
-func (b baseError) Code() string {
-	return b.code
-}
-
-// Message returns the error details message.
-func (b baseError) Message() string {
-	return b.message
-}
-
-// OrigErr returns the original error if one was set. Nil is returned if no error
-// was set. This only returns the first element in the list. If the full list is
-// needed, use BatchError
-func (b baseError) OrigErr() error {
-	if size := len(b.errs); size > 0 {
-		return b.errs[0]
-	}
-
-	return nil
-}
-
-// OrigErrs returns the original errors if one was set. An empty slice is returned if
-// no error was set:w
-func (b baseError) OrigErrs() []error {
-	return b.errs
-}
-
-// So that the Error interface type can be included as an anonymous field
-// in the requestError struct and not conflict with the error.Error() method.
-type awsError Error
-
-// A requestError wraps a request or service error.
-//
-// Composed of baseError for code, message, and original error.
-type requestError struct {
-	awsError
-	statusCode int
-	requestID  string
-}
-
-// newRequestError returns a wrapped error with additional information for request
-// status code, and service requestID.
-//
-// Should be used to wrap all request which involve service requests. Even if
-// the request failed without a service response, but had an HTTP status code
-// that may be meaningful.
-//
-// Also wraps original errors via the baseError.
-func newRequestError(err Error, statusCode int, requestID string) *requestError {
-	return &requestError{
-		awsError:   err,
-		statusCode: statusCode,
-		requestID:  requestID,
-	}
-}
-
-// Error returns the string representation of the error.
-// Satisfies the error interface.
-func (r requestError) Error() string {
-	extra := fmt.Sprintf("status code: %d, request id: %s",
-		r.statusCode, r.requestID)
-	return SprintError(r.Code(), r.Message(), extra, r.OrigErr())
-}
-
-// String returns the string representation of the error.
-// Alias for Error to satisfy the stringer interface.
-func (r requestError) String() string {
-	return r.Error()
-}
-
-// StatusCode returns the wrapped status code for the error
-func (r requestError) StatusCode() int {
-	return r.statusCode
-}
-
-// RequestID returns the wrapped requestID
-func (r requestError) RequestID() string {
-	return r.requestID
-}
-
-// An error list that satisfies the golang interface
-type errorList []error
-
-// Error returns the string representation of the error.
-//
-// Satisfies the error interface.
-func (e errorList) Error() string {
-	msg := ""
-	// How do we want to handle the array size being zero
-	if size := len(e); size > 0 {
-		for i := 0; i < size; i++ {
-			msg += fmt.Sprintf("%s", e[i].Error())
-			// We check the next index to see if it is within the slice.
-			// If it is, then we append a newline. We do this, because unit tests
-			// could be broken with the additional '\n'
-			if i+1 < size {
-				msg += "\n"
-			}
-		}
-	}
-	return msg
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
deleted file mode 100644
index 8429470b9d..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package awsutil
-
-import (
-	"io"
-	"reflect"
-)
-
-// Copy deeply copies a src structure to dst. Useful for copying request and
-// response structures.
-//
-// Can copy between structs of different type, but will only copy fields which
-// are assignable, and exist in both structs. Fields which are not assignable,
-// or do not exist in both structs are ignored.
-func Copy(dst, src interface{}) {
-	dstval := reflect.ValueOf(dst)
-	if !dstval.IsValid() {
-		panic("Copy dst cannot be nil")
-	}
-
-	rcopy(dstval, reflect.ValueOf(src), true)
-}
-
-// CopyOf returns a copy of src while also allocating the memory for dst.
-// src must be a pointer type or this operation will fail.
-func CopyOf(src interface{}) (dst interface{}) {
-	dsti := reflect.New(reflect.TypeOf(src).Elem())
-	dst = dsti.Interface()
-	rcopy(dsti, reflect.ValueOf(src), true)
-	return
-}
-
-// rcopy performs a recursive copy of values from the source to destination.
-//
-// root is used to skip certain aspects of the copy which are not valid
-// for the root node of a object.
-func rcopy(dst, src reflect.Value, root bool) {
-	if !src.IsValid() {
-		return
-	}
-
-	switch src.Kind() {
-	case reflect.Ptr:
-		if _, ok := src.Interface().(io.Reader); ok {
-			if dst.Kind() == reflect.Ptr && dst.Elem().CanSet() {
-				dst.Elem().Set(src)
-			} else if dst.CanSet() {
-				dst.Set(src)
-			}
-		} else {
-			e := src.Type().Elem()
-			if dst.CanSet() && !src.IsNil() {
-				dst.Set(reflect.New(e))
-			}
-			if src.Elem().IsValid() {
-				// Keep the current root state since the depth hasn't changed
-				rcopy(dst.Elem(), src.Elem(), root)
-			}
-		}
-	case reflect.Struct:
-		t := dst.Type()
-		for i := 0; i < t.NumField(); i++ {
-			name := t.Field(i).Name
-			srcVal := src.FieldByName(name)
-			dstVal := dst.FieldByName(name)
-			if srcVal.IsValid() && dstVal.CanSet() {
-				rcopy(dstVal, srcVal, false)
-			}
-		}
-	case reflect.Slice:
-		if src.IsNil() {
-			break
-		}
-
-		s := reflect.MakeSlice(src.Type(), src.Len(), src.Cap())
-		dst.Set(s)
-		for i := 0; i < src.Len(); i++ {
-			rcopy(dst.Index(i), src.Index(i), false)
-		}
-	case reflect.Map:
-		if src.IsNil() {
-			break
-		}
-
-		s := reflect.MakeMap(src.Type())
-		dst.Set(s)
-		for _, k := range src.MapKeys() {
-			v := src.MapIndex(k)
-			v2 := reflect.New(v.Type()).Elem()
-			rcopy(v2, v, false)
-			dst.SetMapIndex(k, v2)
-		}
-	default:
-		// Assign the value if possible. If its not assignable, the value would
-		// need to be converted and the impact of that may be unexpected, or is
-		// not compatible with the dst type.
-		if src.Type().AssignableTo(dst.Type()) {
-			dst.Set(src)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
deleted file mode 100644
index 59fa4a558a..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package awsutil
-
-import (
-	"reflect"
-)
-
-// DeepEqual returns if the two values are deeply equal like reflect.DeepEqual.
-// In addition to this, this method will also dereference the input values if
-// possible so the DeepEqual performed will not fail if one parameter is a
-// pointer and the other is not.
-//
-// DeepEqual will not perform indirection of nested values of the input parameters.
-func DeepEqual(a, b interface{}) bool {
-	ra := reflect.Indirect(reflect.ValueOf(a))
-	rb := reflect.Indirect(reflect.ValueOf(b))
-
-	if raValid, rbValid := ra.IsValid(), rb.IsValid(); !raValid && !rbValid {
-		// If the elements are both nil, and of the same type the are equal
-		// If they are of different types they are not equal
-		return reflect.TypeOf(a) == reflect.TypeOf(b)
-	} else if raValid != rbValid {
-		// Both values must be valid to be equal
-		return false
-	}
-
-	return reflect.DeepEqual(ra.Interface(), rb.Interface())
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
deleted file mode 100644
index 4d2a01e8c4..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
+++ /dev/null
@@ -1,222 +0,0 @@
-package awsutil
-
-import (
-	"reflect"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/jmespath/go-jmespath"
-)
-
-var indexRe = regexp.MustCompile(`(.+)\[(-?\d+)?\]$`)
-
-// rValuesAtPath returns a slice of values found in value v. The values
-// in v are explored recursively so all nested values are collected.
-func rValuesAtPath(v interface{}, path string, createPath, caseSensitive, nilTerm bool) []reflect.Value {
-	pathparts := strings.Split(path, "||")
-	if len(pathparts) > 1 {
-		for _, pathpart := range pathparts {
-			vals := rValuesAtPath(v, pathpart, createPath, caseSensitive, nilTerm)
-			if len(vals) > 0 {
-				return vals
-			}
-		}
-		return nil
-	}
-
-	values := []reflect.Value{reflect.Indirect(reflect.ValueOf(v))}
-	components := strings.Split(path, ".")
-	for len(values) > 0 && len(components) > 0 {
-		var index *int64
-		var indexStar bool
-		c := strings.TrimSpace(components[0])
-		if c == "" { // no actual component, illegal syntax
-			return nil
-		} else if caseSensitive && c != "*" && strings.ToLower(c[0:1]) == c[0:1] {
-			// TODO normalize case for user
-			return nil // don't support unexported fields
-		}
-
-		// parse this component
-		if m := indexRe.FindStringSubmatch(c); m != nil {
-			c = m[1]
-			if m[2] == "" {
-				index = nil
-				indexStar = true
-			} else {
-				i, _ := strconv.ParseInt(m[2], 10, 32)
-				index = &i
-				indexStar = false
-			}
-		}
-
-		nextvals := []reflect.Value{}
-		for _, value := range values {
-			// pull component name out of struct member
-			if value.Kind() != reflect.Struct {
-				continue
-			}
-
-			if c == "*" { // pull all members
-				for i := 0; i < value.NumField(); i++ {
-					if f := reflect.Indirect(value.Field(i)); f.IsValid() {
-						nextvals = append(nextvals, f)
-					}
-				}
-				continue
-			}
-
-			value = value.FieldByNameFunc(func(name string) bool {
-				if c == name {
-					return true
-				} else if !caseSensitive && strings.ToLower(name) == strings.ToLower(c) {
-					return true
-				}
-				return false
-			})
-
-			if nilTerm && value.Kind() == reflect.Ptr && len(components[1:]) == 0 {
-				if !value.IsNil() {
-					value.Set(reflect.Zero(value.Type()))
-				}
-				return []reflect.Value{value}
-			}
-
-			if createPath && value.Kind() == reflect.Ptr && value.IsNil() {
-				// TODO if the value is the terminus it should not be created
-				// if the value to be set to its position is nil.
-				value.Set(reflect.New(value.Type().Elem()))
-				value = value.Elem()
-			} else {
-				value = reflect.Indirect(value)
-			}
-
-			if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
-				if !createPath && value.IsNil() {
-					value = reflect.ValueOf(nil)
-				}
-			}
-
-			if value.IsValid() {
-				nextvals = append(nextvals, value)
-			}
-		}
-		values = nextvals
-
-		if indexStar || index != nil {
-			nextvals = []reflect.Value{}
-			for _, value := range values {
-				value := reflect.Indirect(value)
-				if value.Kind() != reflect.Slice {
-					continue
-				}
-
-				if indexStar { // grab all indices
-					for i := 0; i < value.Len(); i++ {
-						idx := reflect.Indirect(value.Index(i))
-						if idx.IsValid() {
-							nextvals = append(nextvals, idx)
-						}
-					}
-					continue
-				}
-
-				// pull out index
-				i := int(*index)
-				if i >= value.Len() { // check out of bounds
-					if createPath {
-						// TODO resize slice
-					} else {
-						continue
-					}
-				} else if i < 0 { // support negative indexing
-					i = value.Len() + i
-				}
-				value = reflect.Indirect(value.Index(i))
-
-				if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
-					if !createPath && value.IsNil() {
-						value = reflect.ValueOf(nil)
-					}
-				}
-
-				if value.IsValid() {
-					nextvals = append(nextvals, value)
-				}
-			}
-			values = nextvals
-		}
-
-		components = components[1:]
-	}
-	return values
-}
-
-// ValuesAtPath returns a list of values at the case insensitive lexical
-// path inside of a structure.
-func ValuesAtPath(i interface{}, path string) ([]interface{}, error) {
-	result, err := jmespath.Search(path, i)
-	if err != nil {
-		return nil, err
-	}
-
-	v := reflect.ValueOf(result)
-	if !v.IsValid() || (v.Kind() == reflect.Ptr && v.IsNil()) {
-		return nil, nil
-	}
-	if s, ok := result.([]interface{}); ok {
-		return s, err
-	}
-	if v.Kind() == reflect.Map && v.Len() == 0 {
-		return nil, nil
-	}
-	if v.Kind() == reflect.Slice {
-		out := make([]interface{}, v.Len())
-		for i := 0; i < v.Len(); i++ {
-			out[i] = v.Index(i).Interface()
-		}
-		return out, nil
-	}
-
-	return []interface{}{result}, nil
-}
-
-// SetValueAtPath sets a value at the case insensitive lexical path inside
-// of a structure.
-func SetValueAtPath(i interface{}, path string, v interface{}) {
-	if rvals := rValuesAtPath(i, path, true, false, v == nil); rvals != nil {
-		for _, rval := range rvals {
-			if rval.Kind() == reflect.Ptr && rval.IsNil() {
-				continue
-			}
-			setValue(rval, v)
-		}
-	}
-}
-
-func setValue(dstVal reflect.Value, src interface{}) {
-	if dstVal.Kind() == reflect.Ptr {
-		dstVal = reflect.Indirect(dstVal)
-	}
-	srcVal := reflect.ValueOf(src)
-
-	if !srcVal.IsValid() { // src is literal nil
-		if dstVal.CanAddr() {
-			// Convert to pointer so that pointer's value can be nil'ed
-			//                     dstVal = dstVal.Addr()
-		}
-		dstVal.Set(reflect.Zero(dstVal.Type()))
-
-	} else if srcVal.Kind() == reflect.Ptr {
-		if srcVal.IsNil() {
-			srcVal = reflect.Zero(dstVal.Type())
-		} else {
-			srcVal = reflect.ValueOf(src).Elem()
-		}
-		dstVal.Set(srcVal)
-	} else {
-		dstVal.Set(srcVal)
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
deleted file mode 100644
index 0de3eaa0f6..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package awsutil
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-)
-
-// Prettify returns the string representation of a value.
-func Prettify(i interface{}) string {
-	var buf bytes.Buffer
-	prettify(reflect.ValueOf(i), 0, &buf)
-	return buf.String()
-}
-
-// prettify will recursively walk value v to build a textual
-// representation of the value.
-func prettify(v reflect.Value, indent int, buf *bytes.Buffer) {
-	for v.Kind() == reflect.Ptr {
-		v = v.Elem()
-	}
-
-	switch v.Kind() {
-	case reflect.Struct:
-		strtype := v.Type().String()
-		if strtype == "time.Time" {
-			fmt.Fprintf(buf, "%s", v.Interface())
-			break
-		} else if strings.HasPrefix(strtype, "io.") {
-			buf.WriteString("<buffer>")
-			break
-		}
-
-		buf.WriteString("{\n")
-
-		names := []string{}
-		for i := 0; i < v.Type().NumField(); i++ {
-			name := v.Type().Field(i).Name
-			f := v.Field(i)
-			if name[0:1] == strings.ToLower(name[0:1]) {
-				continue // ignore unexported fields
-			}
-			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice || f.Kind() == reflect.Map) && f.IsNil() {
-				continue // ignore unset fields
-			}
-			names = append(names, name)
-		}
-
-		for i, n := range names {
-			val := v.FieldByName(n)
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(n + ": ")
-			prettify(val, indent+2, buf)
-
-			if i < len(names)-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	case reflect.Slice:
-		nl, id, id2 := "", "", ""
-		if v.Len() > 3 {
-			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
-		}
-		buf.WriteString("[" + nl)
-		for i := 0; i < v.Len(); i++ {
-			buf.WriteString(id2)
-			prettify(v.Index(i), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString("," + nl)
-			}
-		}
-
-		buf.WriteString(nl + id + "]")
-	case reflect.Map:
-		buf.WriteString("{\n")
-
-		for i, k := range v.MapKeys() {
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(k.String() + ": ")
-			prettify(v.MapIndex(k), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	default:
-		format := "%v"
-		switch v.Interface().(type) {
-		case string:
-			format = "%q"
-		case io.ReadSeeker, io.Reader:
-			format = "buffer(%p)"
-		}
-		fmt.Fprintf(buf, format, v.Interface())
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
deleted file mode 100644
index b6432f1a11..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package awsutil
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// StringValue returns the string representation of a value.
-func StringValue(i interface{}) string {
-	var buf bytes.Buffer
-	stringValue(reflect.ValueOf(i), 0, &buf)
-	return buf.String()
-}
-
-func stringValue(v reflect.Value, indent int, buf *bytes.Buffer) {
-	for v.Kind() == reflect.Ptr {
-		v = v.Elem()
-	}
-
-	switch v.Kind() {
-	case reflect.Struct:
-		buf.WriteString("{\n")
-
-		names := []string{}
-		for i := 0; i < v.Type().NumField(); i++ {
-			name := v.Type().Field(i).Name
-			f := v.Field(i)
-			if name[0:1] == strings.ToLower(name[0:1]) {
-				continue // ignore unexported fields
-			}
-			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice) && f.IsNil() {
-				continue // ignore unset fields
-			}
-			names = append(names, name)
-		}
-
-		for i, n := range names {
-			val := v.FieldByName(n)
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(n + ": ")
-			stringValue(val, indent+2, buf)
-
-			if i < len(names)-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	case reflect.Slice:
-		nl, id, id2 := "", "", ""
-		if v.Len() > 3 {
-			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
-		}
-		buf.WriteString("[" + nl)
-		for i := 0; i < v.Len(); i++ {
-			buf.WriteString(id2)
-			stringValue(v.Index(i), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString("," + nl)
-			}
-		}
-
-		buf.WriteString(nl + id + "]")
-	case reflect.Map:
-		buf.WriteString("{\n")
-
-		for i, k := range v.MapKeys() {
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(k.String() + ": ")
-			stringValue(v.MapIndex(k), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	default:
-		format := "%v"
-		switch v.Interface().(type) {
-		case string:
-			format = "%q"
-		}
-		fmt.Fprintf(buf, format, v.Interface())
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
deleted file mode 100644
index 4778056ddf..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package metadata
-
-// ClientInfo wraps immutable data from the client.Client structure.
-type ClientInfo struct {
-	ServiceName   string
-	APIVersion    string
-	Endpoint      string
-	SigningName   string
-	SigningRegion string
-	JSONVersion   string
-	TargetPrefix  string
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go
deleted file mode 100644
index 9e83e9260a..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go
+++ /dev/null
@@ -1,311 +0,0 @@
-package aws
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws/credentials"
-)
-
-// UseServiceDefaultRetries instructs the config to use the service's own default
-// number of retries. This will be the default action if Config.MaxRetries
-// is nil also.
-const UseServiceDefaultRetries = -1
-
-// RequestRetryer is an alias for a type that implements the request.Retryer interface.
-type RequestRetryer interface{}
-
-// A Config provides service configuration for service clients. By default,
-// all clients will use the {defaults.DefaultConfig} structure.
-type Config struct {
-	// Enables verbose error printing of all credential chain errors.
-	// Should be used when wanting to see all errors while attempting to retreive
-	// credentials.
-	CredentialsChainVerboseErrors *bool
-
-	// The credentials object to use when signing requests. Defaults to
-	// a chain of credential providers to search for credentials in environment
-	// variables, shared credential file, and EC2 Instance Roles.
-	Credentials *credentials.Credentials
-
-	// An optional endpoint URL (hostname only or fully qualified URI)
-	// that overrides the default generated endpoint for a client. Set this
-	// to `""` to use the default generated endpoint.
-	//
-	// @note You must still provide a `Region` value when specifying an
-	//   endpoint for a client.
-	Endpoint *string
-
-	// The region to send requests to. This parameter is required and must
-	// be configured globally or on a per-client basis unless otherwise
-	// noted. A full list of regions is found in the "Regions and Endpoints"
-	// document.
-	//
-	// @see http://docs.aws.amazon.com/general/latest/gr/rande.html
-	//   AWS Regions and Endpoints
-	Region *string
-
-	// Set this to `true` to disable SSL when sending requests. Defaults
-	// to `false`.
-	DisableSSL *bool
-
-	// The HTTP client to use when sending requests. Defaults to
-	// `http.DefaultClient`.
-	HTTPClient *http.Client
-
-	// An integer value representing the logging level. The default log level
-	// is zero (LogOff), which represents no logging. To enable logging set
-	// to a LogLevel Value.
-	LogLevel *LogLevelType
-
-	// The logger writer interface to write logging messages to. Defaults to
-	// standard out.
-	Logger Logger
-
-	// The maximum number of times that a request will be retried for failures.
-	// Defaults to -1, which defers the max retry setting to the service specific
-	// configuration.
-	MaxRetries *int
-
-	// Retryer guides how HTTP requests should be retried in case of recoverable failures.
-	//
-	// When nil or the value does not implement the request.Retryer interface,
-	// the request.DefaultRetryer will be used.
-	//
-	// When both Retryer and MaxRetries are non-nil, the former is used and
-	// the latter ignored.
-	//
-	// To set the Retryer field in a type-safe manner and with chaining, use
-	// the request.WithRetryer helper function:
-	//
-	//   cfg := request.WithRetryer(aws.NewConfig(), myRetryer)
-	//
-	Retryer RequestRetryer
-
-	// Disables semantic parameter validation, which validates input for missing
-	// required fields and/or other semantic request input errors.
-	DisableParamValidation *bool
-
-	// Disables the computation of request and response checksums, e.g.,
-	// CRC32 checksums in Amazon DynamoDB.
-	DisableComputeChecksums *bool
-
-	// Set this to `true` to force the request to use path-style addressing,
-	// i.e., `http://s3.amazonaws.com/BUCKET/KEY`. By default, the S3 client will
-	// use virtual hosted bucket addressing when possible
-	// (`http://BUCKET.s3.amazonaws.com/KEY`).
-	//
-	// @note This configuration option is specific to the Amazon S3 service.
-	// @see http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
-	//   Amazon S3: Virtual Hosting of Buckets
-	S3ForcePathStyle *bool
-
-	// Set this to `true` to disable the EC2Metadata client from overriding the
-	// default http.Client's Timeout. This is helpful if you do not want the EC2Metadata
-	// client to create a new http.Client. This options is only meaningful if you're not
-	// already using a custom HTTP client with the SDK. Enabled by default.
-	//
-	// Must be set and provided to the session.New() in order to disable the EC2Metadata
-	// overriding the timeout for default credentials chain.
-	//
-	// Example:
-	//    sess := session.New(aws.NewConfig().WithEC2MetadataDiableTimeoutOverride(true))
-	//    svc := s3.New(sess)
-	//
-	EC2MetadataDisableTimeoutOverride *bool
-
-	SleepDelay func(time.Duration)
-}
-
-// NewConfig returns a new Config pointer that can be chained with builder methods to
-// set multiple configuration values inline without using pointers.
-//
-//     svc := s3.New(aws.NewConfig().WithRegion("us-west-2").WithMaxRetries(10))
-//
-func NewConfig() *Config {
-	return &Config{}
-}
-
-// WithCredentialsChainVerboseErrors sets a config verbose errors boolean and returning
-// a Config pointer.
-func (c *Config) WithCredentialsChainVerboseErrors(verboseErrs bool) *Config {
-	c.CredentialsChainVerboseErrors = &verboseErrs
-	return c
-}
-
-// WithCredentials sets a config Credentials value returning a Config pointer
-// for chaining.
-func (c *Config) WithCredentials(creds *credentials.Credentials) *Config {
-	c.Credentials = creds
-	return c
-}
-
-// WithEndpoint sets a config Endpoint value returning a Config pointer for
-// chaining.
-func (c *Config) WithEndpoint(endpoint string) *Config {
-	c.Endpoint = &endpoint
-	return c
-}
-
-// WithRegion sets a config Region value returning a Config pointer for
-// chaining.
-func (c *Config) WithRegion(region string) *Config {
-	c.Region = &region
-	return c
-}
-
-// WithDisableSSL sets a config DisableSSL value returning a Config pointer
-// for chaining.
-func (c *Config) WithDisableSSL(disable bool) *Config {
-	c.DisableSSL = &disable
-	return c
-}
-
-// WithHTTPClient sets a config HTTPClient value returning a Config pointer
-// for chaining.
-func (c *Config) WithHTTPClient(client *http.Client) *Config {
-	c.HTTPClient = client
-	return c
-}
-
-// WithMaxRetries sets a config MaxRetries value returning a Config pointer
-// for chaining.
-func (c *Config) WithMaxRetries(max int) *Config {
-	c.MaxRetries = &max
-	return c
-}
-
-// WithDisableParamValidation sets a config DisableParamValidation value
-// returning a Config pointer for chaining.
-func (c *Config) WithDisableParamValidation(disable bool) *Config {
-	c.DisableParamValidation = &disable
-	return c
-}
-
-// WithDisableComputeChecksums sets a config DisableComputeChecksums value
-// returning a Config pointer for chaining.
-func (c *Config) WithDisableComputeChecksums(disable bool) *Config {
-	c.DisableComputeChecksums = &disable
-	return c
-}
-
-// WithLogLevel sets a config LogLevel value returning a Config pointer for
-// chaining.
-func (c *Config) WithLogLevel(level LogLevelType) *Config {
-	c.LogLevel = &level
-	return c
-}
-
-// WithLogger sets a config Logger value returning a Config pointer for
-// chaining.
-func (c *Config) WithLogger(logger Logger) *Config {
-	c.Logger = logger
-	return c
-}
-
-// WithS3ForcePathStyle sets a config S3ForcePathStyle value returning a Config
-// pointer for chaining.
-func (c *Config) WithS3ForcePathStyle(force bool) *Config {
-	c.S3ForcePathStyle = &force
-	return c
-}
-
-// WithEC2MetadataDisableTimeoutOverride sets a config EC2MetadataDisableTimeoutOverride value
-// returning a Config pointer for chaining.
-func (c *Config) WithEC2MetadataDisableTimeoutOverride(enable bool) *Config {
-	c.EC2MetadataDisableTimeoutOverride = &enable
-	return c
-}
-
-// WithSleepDelay overrides the function used to sleep while waiting for the
-// next retry. Defaults to time.Sleep.
-func (c *Config) WithSleepDelay(fn func(time.Duration)) *Config {
-	c.SleepDelay = fn
-	return c
-}
-
-// MergeIn merges the passed in configs into the existing config object.
-func (c *Config) MergeIn(cfgs ...*Config) {
-	for _, other := range cfgs {
-		mergeInConfig(c, other)
-	}
-}
-
-func mergeInConfig(dst *Config, other *Config) {
-	if other == nil {
-		return
-	}
-
-	if other.CredentialsChainVerboseErrors != nil {
-		dst.CredentialsChainVerboseErrors = other.CredentialsChainVerboseErrors
-	}
-
-	if other.Credentials != nil {
-		dst.Credentials = other.Credentials
-	}
-
-	if other.Endpoint != nil {
-		dst.Endpoint = other.Endpoint
-	}
-
-	if other.Region != nil {
-		dst.Region = other.Region
-	}
-
-	if other.DisableSSL != nil {
-		dst.DisableSSL = other.DisableSSL
-	}
-
-	if other.HTTPClient != nil {
-		dst.HTTPClient = other.HTTPClient
-	}
-
-	if other.LogLevel != nil {
-		dst.LogLevel = other.LogLevel
-	}
-
-	if other.Logger != nil {
-		dst.Logger = other.Logger
-	}
-
-	if other.MaxRetries != nil {
-		dst.MaxRetries = other.MaxRetries
-	}
-
-	if other.Retryer != nil {
-		dst.Retryer = other.Retryer
-	}
-
-	if other.DisableParamValidation != nil {
-		dst.DisableParamValidation = other.DisableParamValidation
-	}
-
-	if other.DisableComputeChecksums != nil {
-		dst.DisableComputeChecksums = other.DisableComputeChecksums
-	}
-
-	if other.S3ForcePathStyle != nil {
-		dst.S3ForcePathStyle = other.S3ForcePathStyle
-	}
-
-	if other.EC2MetadataDisableTimeoutOverride != nil {
-		dst.EC2MetadataDisableTimeoutOverride = other.EC2MetadataDisableTimeoutOverride
-	}
-
-	if other.SleepDelay != nil {
-		dst.SleepDelay = other.SleepDelay
-	}
-}
-
-// Copy will return a shallow copy of the Config object. If any additional
-// configurations are provided they will be merged into the new config returned.
-func (c *Config) Copy(cfgs ...*Config) *Config {
-	dst := &Config{}
-	dst.MergeIn(c)
-
-	for _, cfg := range cfgs {
-		dst.MergeIn(cfg)
-	}
-
-	return dst
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go
deleted file mode 100644
index d6a7b08dff..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/convert_types.go
+++ /dev/null
@@ -1,357 +0,0 @@
-package aws
-
-import "time"
-
-// String returns a pointer to of the string value passed in.
-func String(v string) *string {
-	return &v
-}
-
-// StringValue returns the value of the string pointer passed in or
-// "" if the pointer is nil.
-func StringValue(v *string) string {
-	if v != nil {
-		return *v
-	}
-	return ""
-}
-
-// StringSlice converts a slice of string values into a slice of
-// string pointers
-func StringSlice(src []string) []*string {
-	dst := make([]*string, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// StringValueSlice converts a slice of string pointers into a slice of
-// string values
-func StringValueSlice(src []*string) []string {
-	dst := make([]string, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// StringMap converts a string map of string values into a string
-// map of string pointers
-func StringMap(src map[string]string) map[string]*string {
-	dst := make(map[string]*string)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// StringValueMap converts a string map of string pointers into a string
-// map of string values
-func StringValueMap(src map[string]*string) map[string]string {
-	dst := make(map[string]string)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Bool returns a pointer to of the bool value passed in.
-func Bool(v bool) *bool {
-	return &v
-}
-
-// BoolValue returns the value of the bool pointer passed in or
-// false if the pointer is nil.
-func BoolValue(v *bool) bool {
-	if v != nil {
-		return *v
-	}
-	return false
-}
-
-// BoolSlice converts a slice of bool values into a slice of
-// bool pointers
-func BoolSlice(src []bool) []*bool {
-	dst := make([]*bool, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// BoolValueSlice converts a slice of bool pointers into a slice of
-// bool values
-func BoolValueSlice(src []*bool) []bool {
-	dst := make([]bool, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// BoolMap converts a string map of bool values into a string
-// map of bool pointers
-func BoolMap(src map[string]bool) map[string]*bool {
-	dst := make(map[string]*bool)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// BoolValueMap converts a string map of bool pointers into a string
-// map of bool values
-func BoolValueMap(src map[string]*bool) map[string]bool {
-	dst := make(map[string]bool)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Int returns a pointer to of the int value passed in.
-func Int(v int) *int {
-	return &v
-}
-
-// IntValue returns the value of the int pointer passed in or
-// 0 if the pointer is nil.
-func IntValue(v *int) int {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// IntSlice converts a slice of int values into a slice of
-// int pointers
-func IntSlice(src []int) []*int {
-	dst := make([]*int, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// IntValueSlice converts a slice of int pointers into a slice of
-// int values
-func IntValueSlice(src []*int) []int {
-	dst := make([]int, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// IntMap converts a string map of int values into a string
-// map of int pointers
-func IntMap(src map[string]int) map[string]*int {
-	dst := make(map[string]*int)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// IntValueMap converts a string map of int pointers into a string
-// map of int values
-func IntValueMap(src map[string]*int) map[string]int {
-	dst := make(map[string]int)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Int64 returns a pointer to of the int64 value passed in.
-func Int64(v int64) *int64 {
-	return &v
-}
-
-// Int64Value returns the value of the int64 pointer passed in or
-// 0 if the pointer is nil.
-func Int64Value(v *int64) int64 {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// Int64Slice converts a slice of int64 values into a slice of
-// int64 pointers
-func Int64Slice(src []int64) []*int64 {
-	dst := make([]*int64, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// Int64ValueSlice converts a slice of int64 pointers into a slice of
-// int64 values
-func Int64ValueSlice(src []*int64) []int64 {
-	dst := make([]int64, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// Int64Map converts a string map of int64 values into a string
-// map of int64 pointers
-func Int64Map(src map[string]int64) map[string]*int64 {
-	dst := make(map[string]*int64)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// Int64ValueMap converts a string map of int64 pointers into a string
-// map of int64 values
-func Int64ValueMap(src map[string]*int64) map[string]int64 {
-	dst := make(map[string]int64)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Float64 returns a pointer to of the float64 value passed in.
-func Float64(v float64) *float64 {
-	return &v
-}
-
-// Float64Value returns the value of the float64 pointer passed in or
-// 0 if the pointer is nil.
-func Float64Value(v *float64) float64 {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// Float64Slice converts a slice of float64 values into a slice of
-// float64 pointers
-func Float64Slice(src []float64) []*float64 {
-	dst := make([]*float64, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// Float64ValueSlice converts a slice of float64 pointers into a slice of
-// float64 values
-func Float64ValueSlice(src []*float64) []float64 {
-	dst := make([]float64, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// Float64Map converts a string map of float64 values into a string
-// map of float64 pointers
-func Float64Map(src map[string]float64) map[string]*float64 {
-	dst := make(map[string]*float64)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// Float64ValueMap converts a string map of float64 pointers into a string
-// map of float64 values
-func Float64ValueMap(src map[string]*float64) map[string]float64 {
-	dst := make(map[string]float64)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Time returns a pointer to of the time.Time value passed in.
-func Time(v time.Time) *time.Time {
-	return &v
-}
-
-// TimeValue returns the value of the time.Time pointer passed in or
-// time.Time{} if the pointer is nil.
-func TimeValue(v *time.Time) time.Time {
-	if v != nil {
-		return *v
-	}
-	return time.Time{}
-}
-
-// TimeSlice converts a slice of time.Time values into a slice of
-// time.Time pointers
-func TimeSlice(src []time.Time) []*time.Time {
-	dst := make([]*time.Time, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// TimeValueSlice converts a slice of time.Time pointers into a slice of
-// time.Time values
-func TimeValueSlice(src []*time.Time) []time.Time {
-	dst := make([]time.Time, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// TimeMap converts a string map of time.Time values into a string
-// map of time.Time pointers
-func TimeMap(src map[string]time.Time) map[string]*time.Time {
-	dst := make(map[string]*time.Time)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// TimeValueMap converts a string map of time.Time pointers into a string
-// map of time.Time values
-func TimeValueMap(src map[string]*time.Time) map[string]time.Time {
-	dst := make(map[string]time.Time)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
deleted file mode 100644
index 857311f64c..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package credentials
-
-import (
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-var (
-	// ErrNoValidProvidersFoundInChain Is returned when there are no valid
-	// providers in the ChainProvider.
-	//
-	// This has been deprecated. For verbose error messaging set
-	// aws.Config.CredentialsChainVerboseErrors to true
-	//
-	// @readonly
-	ErrNoValidProvidersFoundInChain = awserr.New("NoCredentialProviders",
-		`no valid providers in chain. Deprecated. 
-	For verbose messaging see aws.Config.CredentialsChainVerboseErrors`,
-		nil)
-)
-
-// A ChainProvider will search for a provider which returns credentials
-// and cache that provider until Retrieve is called again.
-//
-// The ChainProvider provides a way of chaining multiple providers together
-// which will pick the first available using priority order of the Providers
-// in the list.
-//
-// If none of the Providers retrieve valid credentials Value, ChainProvider's
-// Retrieve() will return the error ErrNoValidProvidersFoundInChain.
-//
-// If a Provider is found which returns valid credentials Value ChainProvider
-// will cache that Provider for all calls to IsExpired(), until Retrieve is
-// called again.
-//
-// Example of ChainProvider to be used with an EnvProvider and EC2RoleProvider.
-// In this example EnvProvider will first check if any credentials are available
-// vai the environment variables. If there are none ChainProvider will check
-// the next Provider in the list, EC2RoleProvider in this case. If EC2RoleProvider
-// does not return any credentials ChainProvider will return the error
-// ErrNoValidProvidersFoundInChain
-//
-//     creds := NewChainCredentials(
-//         []Provider{
-//             &EnvProvider{},
-//             &EC2RoleProvider{
-//                 Client: ec2metadata.New(sess),
-//             },
-//         })
-//
-//     // Usage of ChainCredentials with aws.Config
-//     svc := ec2.New(&aws.Config{Credentials: creds})
-//
-type ChainProvider struct {
-	Providers     []Provider
-	curr          Provider
-	VerboseErrors bool
-}
-
-// NewChainCredentials returns a pointer to a new Credentials object
-// wrapping a chain of providers.
-func NewChainCredentials(providers []Provider) *Credentials {
-	return NewCredentials(&ChainProvider{
-		Providers: append([]Provider{}, providers...),
-	})
-}
-
-// Retrieve returns the credentials value or error if no provider returned
-// without error.
-//
-// If a provider is found it will be cached and any calls to IsExpired()
-// will return the expired state of the cached provider.
-func (c *ChainProvider) Retrieve() (Value, error) {
-	var errs []error
-	for _, p := range c.Providers {
-		creds, err := p.Retrieve()
-		if err == nil {
-			c.curr = p
-			return creds, nil
-		}
-		errs = append(errs, err)
-	}
-	c.curr = nil
-
-	var err error
-	err = ErrNoValidProvidersFoundInChain
-	if c.VerboseErrors {
-		err = awserr.NewBatchError("NoCredentialProviders", "no valid providers in chain", errs)
-	}
-	return Value{}, err
-}
-
-// IsExpired will returned the expired state of the currently cached provider
-// if there is one.  If there is no current provider, true will be returned.
-func (c *ChainProvider) IsExpired() bool {
-	if c.curr != nil {
-		return c.curr.IsExpired()
-	}
-
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
deleted file mode 100644
index 7b8ebf5f9d..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
+++ /dev/null
@@ -1,223 +0,0 @@
-// Package credentials provides credential retrieval and management
-//
-// The Credentials is the primary method of getting access to and managing
-// credentials Values. Using dependency injection retrieval of the credential
-// values is handled by a object which satisfies the Provider interface.
-//
-// By default the Credentials.Get() will cache the successful result of a
-// Provider's Retrieve() until Provider.IsExpired() returns true. At which
-// point Credentials will call Provider's Retrieve() to get new credential Value.
-//
-// The Provider is responsible for determining when credentials Value have expired.
-// It is also important to note that Credentials will always call Retrieve the
-// first time Credentials.Get() is called.
-//
-// Example of using the environment variable credentials.
-//
-//     creds := NewEnvCredentials()
-//
-//     // Retrieve the credentials value
-//     credValue, err := creds.Get()
-//     if err != nil {
-//         // handle error
-//     }
-//
-// Example of forcing credentials to expire and be refreshed on the next Get().
-// This may be helpful to proactively expire credentials and refresh them sooner
-// than they would naturally expire on their own.
-//
-//     creds := NewCredentials(&EC2RoleProvider{})
-//     creds.Expire()
-//     credsValue, err := creds.Get()
-//     // New credentials will be retrieved instead of from cache.
-//
-//
-// Custom Provider
-//
-// Each Provider built into this package also provides a helper method to generate
-// a Credentials pointer setup with the provider. To use a custom Provider just
-// create a type which satisfies the Provider interface and pass it to the
-// NewCredentials method.
-//
-//     type MyProvider struct{}
-//     func (m *MyProvider) Retrieve() (Value, error) {...}
-//     func (m *MyProvider) IsExpired() bool {...}
-//
-//     creds := NewCredentials(&MyProvider{})
-//     credValue, err := creds.Get()
-//
-package credentials
-
-import (
-	"sync"
-	"time"
-)
-
-// AnonymousCredentials is an empty Credential object that can be used as
-// dummy placeholder credentials for requests that do not need signed.
-//
-// This Credentials can be used to configure a service to not sign requests
-// when making service API calls. For example, when accessing public
-// s3 buckets.
-//
-//     svc := s3.New(&aws.Config{Credentials: AnonymousCredentials})
-//     // Access public S3 buckets.
-//
-// @readonly
-var AnonymousCredentials = NewStaticCredentials("", "", "")
-
-// A Value is the AWS credentials value for individual credential fields.
-type Value struct {
-	// AWS Access key ID
-	AccessKeyID string
-
-	// AWS Secret Access Key
-	SecretAccessKey string
-
-	// AWS Session Token
-	SessionToken string
-
-	// Provider used to get credentials
-	ProviderName string
-}
-
-// A Provider is the interface for any component which will provide credentials
-// Value. A provider is required to manage its own Expired state, and what to
-// be expired means.
-//
-// The Provider should not need to implement its own mutexes, because
-// that will be managed by Credentials.
-type Provider interface {
-	// Refresh returns nil if it successfully retrieved the value.
-	// Error is returned if the value were not obtainable, or empty.
-	Retrieve() (Value, error)
-
-	// IsExpired returns if the credentials are no longer valid, and need
-	// to be retrieved.
-	IsExpired() bool
-}
-
-// A Expiry provides shared expiration logic to be used by credentials
-// providers to implement expiry functionality.
-//
-// The best method to use this struct is as an anonymous field within the
-// provider's struct.
-//
-// Example:
-//     type EC2RoleProvider struct {
-//         Expiry
-//         ...
-//     }
-type Expiry struct {
-	// The date/time when to expire on
-	expiration time.Time
-
-	// If set will be used by IsExpired to determine the current time.
-	// Defaults to time.Now if CurrentTime is not set.  Available for testing
-	// to be able to mock out the current time.
-	CurrentTime func() time.Time
-}
-
-// SetExpiration sets the expiration IsExpired will check when called.
-//
-// If window is greater than 0 the expiration time will be reduced by the
-// window value.
-//
-// Using a window is helpful to trigger credentials to expire sooner than
-// the expiration time given to ensure no requests are made with expired
-// tokens.
-func (e *Expiry) SetExpiration(expiration time.Time, window time.Duration) {
-	e.expiration = expiration
-	if window > 0 {
-		e.expiration = e.expiration.Add(-window)
-	}
-}
-
-// IsExpired returns if the credentials are expired.
-func (e *Expiry) IsExpired() bool {
-	if e.CurrentTime == nil {
-		e.CurrentTime = time.Now
-	}
-	return e.expiration.Before(e.CurrentTime())
-}
-
-// A Credentials provides synchronous safe retrieval of AWS credentials Value.
-// Credentials will cache the credentials value until they expire. Once the value
-// expires the next Get will attempt to retrieve valid credentials.
-//
-// Credentials is safe to use across multiple goroutines and will manage the
-// synchronous state so the Providers do not need to implement their own
-// synchronization.
-//
-// The first Credentials.Get() will always call Provider.Retrieve() to get the
-// first instance of the credentials Value. All calls to Get() after that
-// will return the cached credentials Value until IsExpired() returns true.
-type Credentials struct {
-	creds        Value
-	forceRefresh bool
-	m            sync.Mutex
-
-	provider Provider
-}
-
-// NewCredentials returns a pointer to a new Credentials with the provider set.
-func NewCredentials(provider Provider) *Credentials {
-	return &Credentials{
-		provider:     provider,
-		forceRefresh: true,
-	}
-}
-
-// Get returns the credentials value, or error if the credentials Value failed
-// to be retrieved.
-//
-// Will return the cached credentials Value if it has not expired. If the
-// credentials Value has expired the Provider's Retrieve() will be called
-// to refresh the credentials.
-//
-// If Credentials.Expire() was called the credentials Value will be force
-// expired, and the next call to Get() will cause them to be refreshed.
-func (c *Credentials) Get() (Value, error) {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if c.isExpired() {
-		creds, err := c.provider.Retrieve()
-		if err != nil {
-			return Value{}, err
-		}
-		c.creds = creds
-		c.forceRefresh = false
-	}
-
-	return c.creds, nil
-}
-
-// Expire expires the credentials and forces them to be retrieved on the
-// next call to Get().
-//
-// This will override the Provider's expired state, and force Credentials
-// to call the Provider's Retrieve().
-func (c *Credentials) Expire() {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	c.forceRefresh = true
-}
-
-// IsExpired returns if the credentials are no longer valid, and need
-// to be retrieved.
-//
-// If the Credentials were forced to be expired with Expire() this will
-// reflect that override.
-func (c *Credentials) IsExpired() bool {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	return c.isExpired()
-}
-
-// isExpired helper method wrapping the definition of expired credentials.
-func (c *Credentials) isExpired() bool {
-	return c.forceRefresh || c.provider.IsExpired()
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
deleted file mode 100644
index 96655bc46a..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package credentials
-
-import (
-	"os"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-// EnvProviderName provides a name of Env provider
-const EnvProviderName = "EnvProvider"
-
-var (
-	// ErrAccessKeyIDNotFound is returned when the AWS Access Key ID can't be
-	// found in the process's environment.
-	//
-	// @readonly
-	ErrAccessKeyIDNotFound = awserr.New("EnvAccessKeyNotFound", "AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment", nil)
-
-	// ErrSecretAccessKeyNotFound is returned when the AWS Secret Access Key
-	// can't be found in the process's environment.
-	//
-	// @readonly
-	ErrSecretAccessKeyNotFound = awserr.New("EnvSecretNotFound", "AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment", nil)
-)
-
-// A EnvProvider retrieves credentials from the environment variables of the
-// running process. Environment credentials never expire.
-//
-// Environment variables used:
-//
-// * Access Key ID:     AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY
-// * Secret Access Key: AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY
-type EnvProvider struct {
-	retrieved bool
-}
-
-// NewEnvCredentials returns a pointer to a new Credentials object
-// wrapping the environment variable provider.
-func NewEnvCredentials() *Credentials {
-	return NewCredentials(&EnvProvider{})
-}
-
-// Retrieve retrieves the keys from the environment.
-func (e *EnvProvider) Retrieve() (Value, error) {
-	e.retrieved = false
-
-	id := os.Getenv("AWS_ACCESS_KEY_ID")
-	if id == "" {
-		id = os.Getenv("AWS_ACCESS_KEY")
-	}
-
-	secret := os.Getenv("AWS_SECRET_ACCESS_KEY")
-	if secret == "" {
-		secret = os.Getenv("AWS_SECRET_KEY")
-	}
-
-	if id == "" {
-		return Value{ProviderName: EnvProviderName}, ErrAccessKeyIDNotFound
-	}
-
-	if secret == "" {
-		return Value{ProviderName: EnvProviderName}, ErrSecretAccessKeyNotFound
-	}
-
-	e.retrieved = true
-	return Value{
-		AccessKeyID:     id,
-		SecretAccessKey: secret,
-		SessionToken:    os.Getenv("AWS_SESSION_TOKEN"),
-		ProviderName:    EnvProviderName,
-	}, nil
-}
-
-// IsExpired returns if the credentials have been retrieved.
-func (e *EnvProvider) IsExpired() bool {
-	return !e.retrieved
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini
deleted file mode 100644
index 7fc91d9d20..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/example.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[default]
-aws_access_key_id = accessKey
-aws_secret_access_key = secret
-aws_session_token = token
-
-[no_token]
-aws_access_key_id = accessKey
-aws_secret_access_key = secret
-
-[with_colon]
-aws_access_key_id: accessKey
-aws_secret_access_key: secret
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
deleted file mode 100644
index 7fb7cbf0db..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
+++ /dev/null
@@ -1,151 +0,0 @@
-package credentials
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/go-ini/ini"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-// SharedCredsProviderName provides a name of SharedCreds provider
-const SharedCredsProviderName = "SharedCredentialsProvider"
-
-var (
-	// ErrSharedCredentialsHomeNotFound is emitted when the user directory cannot be found.
-	//
-	// @readonly
-	ErrSharedCredentialsHomeNotFound = awserr.New("UserHomeNotFound", "user home directory not found.", nil)
-)
-
-// A SharedCredentialsProvider retrieves credentials from the current user's home
-// directory, and keeps track if those credentials are expired.
-//
-// Profile ini file example: $HOME/.aws/credentials
-type SharedCredentialsProvider struct {
-	// Path to the shared credentials file.
-	//
-	// If empty will look for "AWS_SHARED_CREDENTIALS_FILE" env variable. If the
-	// env value is empty will default to current user's home directory.
-	// Linux/OSX: "$HOME/.aws/credentials"
-	// Windows:   "%USERPROFILE%\.aws\credentials"
-	Filename string
-
-	// AWS Profile to extract credentials from the shared credentials file. If empty
-	// will default to environment variable "AWS_PROFILE" or "default" if
-	// environment variable is also not set.
-	Profile string
-
-	// retrieved states if the credentials have been successfully retrieved.
-	retrieved bool
-}
-
-// NewSharedCredentials returns a pointer to a new Credentials object
-// wrapping the Profile file provider.
-func NewSharedCredentials(filename, profile string) *Credentials {
-	return NewCredentials(&SharedCredentialsProvider{
-		Filename: filename,
-		Profile:  profile,
-	})
-}
-
-// Retrieve reads and extracts the shared credentials from the current
-// users home directory.
-func (p *SharedCredentialsProvider) Retrieve() (Value, error) {
-	p.retrieved = false
-
-	filename, err := p.filename()
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, err
-	}
-
-	creds, err := loadProfile(filename, p.profile())
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, err
-	}
-
-	p.retrieved = true
-	return creds, nil
-}
-
-// IsExpired returns if the shared credentials have expired.
-func (p *SharedCredentialsProvider) IsExpired() bool {
-	return !p.retrieved
-}
-
-// loadProfiles loads from the file pointed to by shared credentials filename for profile.
-// The credentials retrieved from the profile will be returned or error. Error will be
-// returned if it fails to read from the file, or the data is invalid.
-func loadProfile(filename, profile string) (Value, error) {
-	config, err := ini.Load(filename)
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to load shared credentials file", err)
-	}
-	iniProfile, err := config.GetSection(profile)
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to get profile", err)
-	}
-
-	id, err := iniProfile.GetKey("aws_access_key_id")
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsAccessKey",
-			fmt.Sprintf("shared credentials %s in %s did not contain aws_access_key_id", profile, filename),
-			err)
-	}
-
-	secret, err := iniProfile.GetKey("aws_secret_access_key")
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsSecret",
-			fmt.Sprintf("shared credentials %s in %s did not contain aws_secret_access_key", profile, filename),
-			nil)
-	}
-
-	// Default to empty string if not found
-	token := iniProfile.Key("aws_session_token")
-
-	return Value{
-		AccessKeyID:     id.String(),
-		SecretAccessKey: secret.String(),
-		SessionToken:    token.String(),
-		ProviderName:    SharedCredsProviderName,
-	}, nil
-}
-
-// filename returns the filename to use to read AWS shared credentials.
-//
-// Will return an error if the user's home directory path cannot be found.
-func (p *SharedCredentialsProvider) filename() (string, error) {
-	if p.Filename == "" {
-		if p.Filename = os.Getenv("AWS_SHARED_CREDENTIALS_FILE"); p.Filename != "" {
-			return p.Filename, nil
-		}
-
-		homeDir := os.Getenv("HOME") // *nix
-		if homeDir == "" {           // Windows
-			homeDir = os.Getenv("USERPROFILE")
-		}
-		if homeDir == "" {
-			return "", ErrSharedCredentialsHomeNotFound
-		}
-
-		p.Filename = filepath.Join(homeDir, ".aws", "credentials")
-	}
-
-	return p.Filename, nil
-}
-
-// profile returns the AWS shared credentials profile.  If empty will read
-// environment variable "AWS_PROFILE". If that is not set profile will
-// return "default".
-func (p *SharedCredentialsProvider) profile() string {
-	if p.Profile == "" {
-		p.Profile = os.Getenv("AWS_PROFILE")
-	}
-	if p.Profile == "" {
-		p.Profile = "default"
-	}
-
-	return p.Profile
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
deleted file mode 100644
index 71189e733d..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package credentials
-
-import (
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-// StaticProviderName provides a name of Static provider
-const StaticProviderName = "StaticProvider"
-
-var (
-	// ErrStaticCredentialsEmpty is emitted when static credentials are empty.
-	//
-	// @readonly
-	ErrStaticCredentialsEmpty = awserr.New("EmptyStaticCreds", "static credentials are empty", nil)
-)
-
-// A StaticProvider is a set of credentials which are set pragmatically,
-// and will never expire.
-type StaticProvider struct {
-	Value
-}
-
-// NewStaticCredentials returns a pointer to a new Credentials object
-// wrapping a static credentials value provider.
-func NewStaticCredentials(id, secret, token string) *Credentials {
-	return NewCredentials(&StaticProvider{Value: Value{
-		AccessKeyID:     id,
-		SecretAccessKey: secret,
-		SessionToken:    token,
-	}})
-}
-
-// Retrieve returns the credentials or error if the credentials are invalid.
-func (s *StaticProvider) Retrieve() (Value, error) {
-	if s.AccessKeyID == "" || s.SecretAccessKey == "" {
-		return Value{ProviderName: StaticProviderName}, ErrStaticCredentialsEmpty
-	}
-
-	s.Value.ProviderName = StaticProviderName
-	return s.Value, nil
-}
-
-// IsExpired returns if the credentials are expired.
-//
-// For StaticProvider, the credentials never expired.
-func (s *StaticProvider) IsExpired() bool {
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go
deleted file mode 100644
index 5766361686..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package aws
-
-import "github.com/aws/aws-sdk-go/aws/awserr"
-
-var (
-	// ErrMissingRegion is an error that is returned if region configuration is
-	// not found.
-	//
-	// @readonly
-	ErrMissingRegion = awserr.New("MissingRegion", "could not find region configuration", nil)
-
-	// ErrMissingEndpoint is an error that is returned if an endpoint cannot be
-	// resolved for a service.
-	//
-	// @readonly
-	ErrMissingEndpoint = awserr.New("MissingEndpoint", "'Endpoint' configuration is required for this service", nil)
-)
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go
deleted file mode 100644
index db87188e20..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/logger.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package aws
-
-import (
-	"log"
-	"os"
-)
-
-// A LogLevelType defines the level logging should be performed at. Used to instruct
-// the SDK which statements should be logged.
-type LogLevelType uint
-
-// LogLevel returns the pointer to a LogLevel. Should be used to workaround
-// not being able to take the address of a non-composite literal.
-func LogLevel(l LogLevelType) *LogLevelType {
-	return &l
-}
-
-// Value returns the LogLevel value or the default value LogOff if the LogLevel
-// is nil. Safe to use on nil value LogLevelTypes.
-func (l *LogLevelType) Value() LogLevelType {
-	if l != nil {
-		return *l
-	}
-	return LogOff
-}
-
-// Matches returns true if the v LogLevel is enabled by this LogLevel. Should be
-// used with logging sub levels. Is safe to use on nil value LogLevelTypes. If
-// LogLevel is nill, will default to LogOff comparison.
-func (l *LogLevelType) Matches(v LogLevelType) bool {
-	c := l.Value()
-	return c&v == v
-}
-
-// AtLeast returns true if this LogLevel is at least high enough to satisfies v.
-// Is safe to use on nil value LogLevelTypes. If LogLevel is nill, will default
-// to LogOff comparison.
-func (l *LogLevelType) AtLeast(v LogLevelType) bool {
-	c := l.Value()
-	return c >= v
-}
-
-const (
-	// LogOff states that no logging should be performed by the SDK. This is the
-	// default state of the SDK, and should be use to disable all logging.
-	LogOff LogLevelType = iota * 0x1000
-
-	// LogDebug state that debug output should be logged by the SDK. This should
-	// be used to inspect request made and responses received.
-	LogDebug
-)
-
-// Debug Logging Sub Levels
-const (
-	// LogDebugWithSigning states that the SDK should log request signing and
-	// presigning events. This should be used to log the signing details of
-	// requests for debugging. Will also enable LogDebug.
-	LogDebugWithSigning LogLevelType = LogDebug | (1 << iota)
-
-	// LogDebugWithHTTPBody states the SDK should log HTTP request and response
-	// HTTP bodys in addition to the headers and path. This should be used to
-	// see the body content of requests and responses made while using the SDK
-	// Will also enable LogDebug.
-	LogDebugWithHTTPBody
-
-	// LogDebugWithRequestRetries states the SDK should log when service requests will
-	// be retried. This should be used to log when you want to log when service
-	// requests are being retried. Will also enable LogDebug.
-	LogDebugWithRequestRetries
-
-	// LogDebugWithRequestErrors states the SDK should log when service requests fail
-	// to build, send, validate, or unmarshal.
-	LogDebugWithRequestErrors
-)
-
-// A Logger is a minimalistic interface for the SDK to log messages to. Should
-// be used to provide custom logging writers for the SDK to use.
-type Logger interface {
-	Log(...interface{})
-}
-
-// A LoggerFunc is a convenience type to convert a function taking a variadic
-// list of arguments and wrap it so the Logger interface can be used.
-//
-// Example:
-//     s3.New(sess, &aws.Config{Logger: aws.LoggerFunc(func(args ...interface{}) {
-//         fmt.Fprintln(os.Stdout, args...)
-//     })})
-type LoggerFunc func(...interface{})
-
-// Log calls the wrapped function with the arguments provided
-func (f LoggerFunc) Log(args ...interface{}) {
-	f(args...)
-}
-
-// NewDefaultLogger returns a Logger which will write log messages to stdout, and
-// use same formatting runes as the stdlib log.Logger
-func NewDefaultLogger() Logger {
-	return &defaultLogger{
-		logger: log.New(os.Stdout, "", log.LstdFlags),
-	}
-}
-
-// A defaultLogger provides a minimalistic logger satisfying the Logger interface.
-type defaultLogger struct {
-	logger *log.Logger
-}
-
-// Log logs the parameters to the stdlib logger. See log.Println.
-func (l defaultLogger) Log(args ...interface{}) {
-	l.logger.Println(args...)
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go
deleted file mode 100644
index 5279c19c09..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers.go
+++ /dev/null
@@ -1,187 +0,0 @@
-package request
-
-import (
-	"fmt"
-	"strings"
-)
-
-// A Handlers provides a collection of request handlers for various
-// stages of handling requests.
-type Handlers struct {
-	Validate         HandlerList
-	Build            HandlerList
-	Sign             HandlerList
-	Send             HandlerList
-	ValidateResponse HandlerList
-	Unmarshal        HandlerList
-	UnmarshalMeta    HandlerList
-	UnmarshalError   HandlerList
-	Retry            HandlerList
-	AfterRetry       HandlerList
-}
-
-// Copy returns of this handler's lists.
-func (h *Handlers) Copy() Handlers {
-	return Handlers{
-		Validate:         h.Validate.copy(),
-		Build:            h.Build.copy(),
-		Sign:             h.Sign.copy(),
-		Send:             h.Send.copy(),
-		ValidateResponse: h.ValidateResponse.copy(),
-		Unmarshal:        h.Unmarshal.copy(),
-		UnmarshalError:   h.UnmarshalError.copy(),
-		UnmarshalMeta:    h.UnmarshalMeta.copy(),
-		Retry:            h.Retry.copy(),
-		AfterRetry:       h.AfterRetry.copy(),
-	}
-}
-
-// Clear removes callback functions for all handlers
-func (h *Handlers) Clear() {
-	h.Validate.Clear()
-	h.Build.Clear()
-	h.Send.Clear()
-	h.Sign.Clear()
-	h.Unmarshal.Clear()
-	h.UnmarshalMeta.Clear()
-	h.UnmarshalError.Clear()
-	h.ValidateResponse.Clear()
-	h.Retry.Clear()
-	h.AfterRetry.Clear()
-}
-
-// A HandlerListRunItem represents an entry in the HandlerList which
-// is being run.
-type HandlerListRunItem struct {
-	Index   int
-	Handler NamedHandler
-	Request *Request
-}
-
-// A HandlerList manages zero or more handlers in a list.
-type HandlerList struct {
-	list []NamedHandler
-
-	// Called after each request handler in the list is called. If set
-	// and the func returns true the HandlerList will continue to iterate
-	// over the request handlers. If false is returned the HandlerList
-	// will stop iterating.
-	//
-	// Should be used if extra logic to be performed between each handler
-	// in the list. This can be used to terminate a list's iteration
-	// based on a condition such as error like, HandlerListStopOnError.
-	// Or for logging like HandlerListLogItem.
-	AfterEachFn func(item HandlerListRunItem) bool
-}
-
-// A NamedHandler is a struct that contains a name and function callback.
-type NamedHandler struct {
-	Name string
-	Fn   func(*Request)
-}
-
-// copy creates a copy of the handler list.
-func (l *HandlerList) copy() HandlerList {
-	n := HandlerList{
-		AfterEachFn: l.AfterEachFn,
-	}
-	n.list = append([]NamedHandler{}, l.list...)
-	return n
-}
-
-// Clear clears the handler list.
-func (l *HandlerList) Clear() {
-	l.list = []NamedHandler{}
-}
-
-// Len returns the number of handlers in the list.
-func (l *HandlerList) Len() int {
-	return len(l.list)
-}
-
-// PushBack pushes handler f to the back of the handler list.
-func (l *HandlerList) PushBack(f func(*Request)) {
-	l.list = append(l.list, NamedHandler{"__anonymous", f})
-}
-
-// PushFront pushes handler f to the front of the handler list.
-func (l *HandlerList) PushFront(f func(*Request)) {
-	l.list = append([]NamedHandler{{"__anonymous", f}}, l.list...)
-}
-
-// PushBackNamed pushes named handler f to the back of the handler list.
-func (l *HandlerList) PushBackNamed(n NamedHandler) {
-	l.list = append(l.list, n)
-}
-
-// PushFrontNamed pushes named handler f to the front of the handler list.
-func (l *HandlerList) PushFrontNamed(n NamedHandler) {
-	l.list = append([]NamedHandler{n}, l.list...)
-}
-
-// Remove removes a NamedHandler n
-func (l *HandlerList) Remove(n NamedHandler) {
-	newlist := []NamedHandler{}
-	for _, m := range l.list {
-		if m.Name != n.Name {
-			newlist = append(newlist, m)
-		}
-	}
-	l.list = newlist
-}
-
-// Run executes all handlers in the list with a given request object.
-func (l *HandlerList) Run(r *Request) {
-	for i, h := range l.list {
-		h.Fn(r)
-		item := HandlerListRunItem{
-			Index: i, Handler: h, Request: r,
-		}
-		if l.AfterEachFn != nil && !l.AfterEachFn(item) {
-			return
-		}
-	}
-}
-
-// HandlerListLogItem logs the request handler and the state of the
-// request's Error value. Always returns true to continue iterating
-// request handlers in a HandlerList.
-func HandlerListLogItem(item HandlerListRunItem) bool {
-	if item.Request.Config.Logger == nil {
-		return true
-	}
-	item.Request.Config.Logger.Log("DEBUG: RequestHandler",
-		item.Index, item.Handler.Name, item.Request.Error)
-
-	return true
-}
-
-// HandlerListStopOnError returns false to stop the HandlerList iterating
-// over request handlers if Request.Error is not nil. True otherwise
-// to continue iterating.
-func HandlerListStopOnError(item HandlerListRunItem) bool {
-	return item.Request.Error == nil
-}
-
-// MakeAddToUserAgentHandler will add the name/version pair to the User-Agent request
-// header. If the extra parameters are provided they will be added as metadata to the
-// name/version pair resulting in the following format.
-// "name/version (extra0; extra1; ...)"
-// The user agent part will be concatenated with this current request's user agent string.
-func MakeAddToUserAgentHandler(name, version string, extra ...string) func(*Request) {
-	ua := fmt.Sprintf("%s/%s", name, version)
-	if len(extra) > 0 {
-		ua += fmt.Sprintf(" (%s)", strings.Join(extra, "; "))
-	}
-	return func(r *Request) {
-		AddToUserAgent(r, ua)
-	}
-}
-
-// MakeAddToUserAgentFreeFormHandler adds the input to the User-Agent request header.
-// The input string will be concatenated with the current request's user agent string.
-func MakeAddToUserAgentFreeFormHandler(s string) func(*Request) {
-	return func(r *Request) {
-		AddToUserAgent(r, s)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go
deleted file mode 100644
index 85eead3d51..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go
+++ /dev/null
@@ -1,302 +0,0 @@
-package request
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"reflect"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/client/metadata"
-)
-
-// A Request is the service request to be made.
-type Request struct {
-	Config     aws.Config
-	ClientInfo metadata.ClientInfo
-	Handlers   Handlers
-
-	Retryer
-	Time             time.Time
-	ExpireTime       time.Duration
-	Operation        *Operation
-	HTTPRequest      *http.Request
-	HTTPResponse     *http.Response
-	Body             io.ReadSeeker
-	BodyStart        int64 // offset from beginning of Body that the request body starts
-	Params           interface{}
-	Error            error
-	Data             interface{}
-	RequestID        string
-	RetryCount       int
-	Retryable        *bool
-	RetryDelay       time.Duration
-	NotHoist         bool
-	SignedHeaderVals http.Header
-
-	built bool
-}
-
-// An Operation is the service API operation to be made.
-type Operation struct {
-	Name       string
-	HTTPMethod string
-	HTTPPath   string
-	*Paginator
-}
-
-// Paginator keeps track of pagination configuration for an API operation.
-type Paginator struct {
-	InputTokens     []string
-	OutputTokens    []string
-	LimitToken      string
-	TruncationToken string
-}
-
-// New returns a new Request pointer for the service API
-// operation and parameters.
-//
-// Params is any value of input parameters to be the request payload.
-// Data is pointer value to an object which the request's response
-// payload will be deserialized to.
-func New(cfg aws.Config, clientInfo metadata.ClientInfo, handlers Handlers,
-	retryer Retryer, operation *Operation, params interface{}, data interface{}) *Request {
-
-	method := operation.HTTPMethod
-	if method == "" {
-		method = "POST"
-	}
-	p := operation.HTTPPath
-	if p == "" {
-		p = "/"
-	}
-
-	httpReq, _ := http.NewRequest(method, "", nil)
-	httpReq.URL, _ = url.Parse(clientInfo.Endpoint + p)
-
-	r := &Request{
-		Config:     cfg,
-		ClientInfo: clientInfo,
-		Handlers:   handlers.Copy(),
-
-		Retryer:     retryer,
-		Time:        time.Now(),
-		ExpireTime:  0,
-		Operation:   operation,
-		HTTPRequest: httpReq,
-		Body:        nil,
-		Params:      params,
-		Error:       nil,
-		Data:        data,
-	}
-	r.SetBufferBody([]byte{})
-
-	return r
-}
-
-// WillRetry returns if the request's can be retried.
-func (r *Request) WillRetry() bool {
-	return r.Error != nil && aws.BoolValue(r.Retryable) && r.RetryCount < r.MaxRetries()
-}
-
-// ParamsFilled returns if the request's parameters have been populated
-// and the parameters are valid. False is returned if no parameters are
-// provided or invalid.
-func (r *Request) ParamsFilled() bool {
-	return r.Params != nil && reflect.ValueOf(r.Params).Elem().IsValid()
-}
-
-// DataFilled returns true if the request's data for response deserialization
-// target has been set and is a valid. False is returned if data is not
-// set, or is invalid.
-func (r *Request) DataFilled() bool {
-	return r.Data != nil && reflect.ValueOf(r.Data).Elem().IsValid()
-}
-
-// SetBufferBody will set the request's body bytes that will be sent to
-// the service API.
-func (r *Request) SetBufferBody(buf []byte) {
-	r.SetReaderBody(bytes.NewReader(buf))
-}
-
-// SetStringBody sets the body of the request to be backed by a string.
-func (r *Request) SetStringBody(s string) {
-	r.SetReaderBody(strings.NewReader(s))
-}
-
-// SetReaderBody will set the request's body reader.
-func (r *Request) SetReaderBody(reader io.ReadSeeker) {
-	r.HTTPRequest.Body = ioutil.NopCloser(reader)
-	r.Body = reader
-}
-
-// Presign returns the request's signed URL. Error will be returned
-// if the signing fails.
-func (r *Request) Presign(expireTime time.Duration) (string, error) {
-	r.ExpireTime = expireTime
-	r.NotHoist = false
-	r.Sign()
-	if r.Error != nil {
-		return "", r.Error
-	}
-	return r.HTTPRequest.URL.String(), nil
-}
-
-// PresignRequest behaves just like presign, but hoists all headers and signs them.
-// Also returns the signed hash back to the user
-func (r *Request) PresignRequest(expireTime time.Duration) (string, http.Header, error) {
-	r.ExpireTime = expireTime
-	r.NotHoist = true
-	r.Sign()
-	if r.Error != nil {
-		return "", nil, r.Error
-	}
-	return r.HTTPRequest.URL.String(), r.SignedHeaderVals, nil
-}
-
-func debugLogReqError(r *Request, stage string, retrying bool, err error) {
-	if !r.Config.LogLevel.Matches(aws.LogDebugWithRequestErrors) {
-		return
-	}
-
-	retryStr := "not retrying"
-	if retrying {
-		retryStr = "will retry"
-	}
-
-	r.Config.Logger.Log(fmt.Sprintf("DEBUG: %s %s/%s failed, %s, error %v",
-		stage, r.ClientInfo.ServiceName, r.Operation.Name, retryStr, err))
-}
-
-// Build will build the request's object so it can be signed and sent
-// to the service. Build will also validate all the request's parameters.
-// Anny additional build Handlers set on this request will be run
-// in the order they were set.
-//
-// The request will only be built once. Multiple calls to build will have
-// no effect.
-//
-// If any Validate or Build errors occur the build will stop and the error
-// which occurred will be returned.
-func (r *Request) Build() error {
-	if !r.built {
-		r.Error = nil
-		r.Handlers.Validate.Run(r)
-		if r.Error != nil {
-			debugLogReqError(r, "Validate Request", false, r.Error)
-			return r.Error
-		}
-		r.Handlers.Build.Run(r)
-		if r.Error != nil {
-			debugLogReqError(r, "Build Request", false, r.Error)
-			return r.Error
-		}
-		r.built = true
-	}
-
-	return r.Error
-}
-
-// Sign will sign the request retuning error if errors are encountered.
-//
-// Send will build the request prior to signing. All Sign Handlers will
-// be executed in the order they were set.
-func (r *Request) Sign() error {
-	r.Build()
-	if r.Error != nil {
-		debugLogReqError(r, "Build Request", false, r.Error)
-		return r.Error
-	}
-
-	r.Handlers.Sign.Run(r)
-	return r.Error
-}
-
-// Send will send the request returning error if errors are encountered.
-//
-// Send will sign the request prior to sending. All Send Handlers will
-// be executed in the order they were set.
-func (r *Request) Send() error {
-	for {
-		r.Sign()
-		if r.Error != nil {
-			return r.Error
-		}
-
-		if aws.BoolValue(r.Retryable) {
-			if r.Config.LogLevel.Matches(aws.LogDebugWithRequestRetries) {
-				r.Config.Logger.Log(fmt.Sprintf("DEBUG: Retrying Request %s/%s, attempt %d",
-					r.ClientInfo.ServiceName, r.Operation.Name, r.RetryCount))
-			}
-
-			// Closing response body. Since we are setting a new request to send off, this
-			// response will get squashed and leaked.
-			r.HTTPResponse.Body.Close()
-
-			// Re-seek the body back to the original point in for a retry so that
-			// send will send the body's contents again in the upcoming request.
-			r.Body.Seek(r.BodyStart, 0)
-			r.HTTPRequest.Body = ioutil.NopCloser(r.Body)
-		}
-		r.Retryable = nil
-
-		r.Handlers.Send.Run(r)
-		if r.Error != nil {
-			err := r.Error
-			r.Handlers.Retry.Run(r)
-			r.Handlers.AfterRetry.Run(r)
-			if r.Error != nil {
-				debugLogReqError(r, "Send Request", false, r.Error)
-				return r.Error
-			}
-			debugLogReqError(r, "Send Request", true, err)
-			continue
-		}
-
-		r.Handlers.UnmarshalMeta.Run(r)
-		r.Handlers.ValidateResponse.Run(r)
-		if r.Error != nil {
-			err := r.Error
-			r.Handlers.UnmarshalError.Run(r)
-			r.Handlers.Retry.Run(r)
-			r.Handlers.AfterRetry.Run(r)
-			if r.Error != nil {
-				debugLogReqError(r, "Validate Response", false, r.Error)
-				return r.Error
-			}
-			debugLogReqError(r, "Validate Response", true, err)
-			continue
-		}
-
-		r.Handlers.Unmarshal.Run(r)
-		if r.Error != nil {
-			err := r.Error
-			r.Handlers.Retry.Run(r)
-			r.Handlers.AfterRetry.Run(r)
-			if r.Error != nil {
-				debugLogReqError(r, "Unmarshal Response", false, r.Error)
-				return r.Error
-			}
-			debugLogReqError(r, "Unmarshal Response", true, err)
-			continue
-		}
-
-		break
-	}
-
-	return nil
-}
-
-// AddToUserAgent adds the string to the end of the request's current user agent.
-func AddToUserAgent(r *Request, s string) {
-	curUA := r.HTTPRequest.Header.Get("User-Agent")
-	if len(curUA) > 0 {
-		s = curUA + " " + s
-	}
-	r.HTTPRequest.Header.Set("User-Agent", s)
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
deleted file mode 100644
index 2939ec473f..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package request
-
-import (
-	"reflect"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awsutil"
-)
-
-//type Paginater interface {
-//	HasNextPage() bool
-//	NextPage() *Request
-//	EachPage(fn func(data interface{}, isLastPage bool) (shouldContinue bool)) error
-//}
-
-// HasNextPage returns true if this request has more pages of data available.
-func (r *Request) HasNextPage() bool {
-	return len(r.nextPageTokens()) > 0
-}
-
-// nextPageTokens returns the tokens to use when asking for the next page of
-// data.
-func (r *Request) nextPageTokens() []interface{} {
-	if r.Operation.Paginator == nil {
-		return nil
-	}
-
-	if r.Operation.TruncationToken != "" {
-		tr, _ := awsutil.ValuesAtPath(r.Data, r.Operation.TruncationToken)
-		if len(tr) == 0 {
-			return nil
-		}
-
-		switch v := tr[0].(type) {
-		case *bool:
-			if !aws.BoolValue(v) {
-				return nil
-			}
-		case bool:
-			if v == false {
-				return nil
-			}
-		}
-	}
-
-	tokens := []interface{}{}
-	tokenAdded := false
-	for _, outToken := range r.Operation.OutputTokens {
-		v, _ := awsutil.ValuesAtPath(r.Data, outToken)
-		if len(v) > 0 {
-			tokens = append(tokens, v[0])
-			tokenAdded = true
-		} else {
-			tokens = append(tokens, nil)
-		}
-	}
-	if !tokenAdded {
-		return nil
-	}
-
-	return tokens
-}
-
-// NextPage returns a new Request that can be executed to return the next
-// page of result data. Call .Send() on this request to execute it.
-func (r *Request) NextPage() *Request {
-	tokens := r.nextPageTokens()
-	if len(tokens) == 0 {
-		return nil
-	}
-
-	data := reflect.New(reflect.TypeOf(r.Data).Elem()).Interface()
-	nr := New(r.Config, r.ClientInfo, r.Handlers, r.Retryer, r.Operation, awsutil.CopyOf(r.Params), data)
-	for i, intok := range nr.Operation.InputTokens {
-		awsutil.SetValueAtPath(nr.Params, intok, tokens[i])
-	}
-	return nr
-}
-
-// EachPage iterates over each page of a paginated request object. The fn
-// parameter should be a function with the following sample signature:
-//
-//   func(page *T, lastPage bool) bool {
-//       return true // return false to stop iterating
-//   }
-//
-// Where "T" is the structure type matching the output structure of the given
-// operation. For example, a request object generated by
-// DynamoDB.ListTablesRequest() would expect to see dynamodb.ListTablesOutput
-// as the structure "T". The lastPage value represents whether the page is
-// the last page of data or not. The return value of this function should
-// return true to keep iterating or false to stop.
-func (r *Request) EachPage(fn func(data interface{}, isLastPage bool) (shouldContinue bool)) error {
-	for page := r; page != nil; page = page.NextPage() {
-		if err := page.Send(); err != nil {
-			return err
-		}
-		if getNextPage := fn(page.Data, !page.HasNextPage()); !getNextPage {
-			return page.Error
-		}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go
deleted file mode 100644
index ab6fff5ac8..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package request
-
-import (
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-// Retryer is an interface to control retry logic for a given service.
-// The default implementation used by most services is the service.DefaultRetryer
-// structure, which contains basic retry logic using exponential backoff.
-type Retryer interface {
-	RetryRules(*Request) time.Duration
-	ShouldRetry(*Request) bool
-	MaxRetries() int
-}
-
-// WithRetryer sets a config Retryer value to the given Config returning it
-// for chaining.
-func WithRetryer(cfg *aws.Config, retryer Retryer) *aws.Config {
-	cfg.Retryer = retryer
-	return cfg
-}
-
-// retryableCodes is a collection of service response codes which are retry-able
-// without any further action.
-var retryableCodes = map[string]struct{}{
-	"RequestError":                           {},
-	"RequestTimeout":                         {},
-	"ProvisionedThroughputExceededException": {},
-	"Throttling":                             {},
-	"ThrottlingException":                    {},
-	"RequestLimitExceeded":                   {},
-	"RequestThrottled":                       {},
-	"LimitExceededException":                 {}, // Deleting 10+ DynamoDb tables at once
-	"TooManyRequestsException":               {}, // Lambda functions
-}
-
-// credsExpiredCodes is a collection of error codes which signify the credentials
-// need to be refreshed. Expired tokens require refreshing of credentials, and
-// resigning before the request can be retried.
-var credsExpiredCodes = map[string]struct{}{
-	"ExpiredToken":          {},
-	"ExpiredTokenException": {},
-	"RequestExpired":        {}, // EC2 Only
-}
-
-func isCodeRetryable(code string) bool {
-	if _, ok := retryableCodes[code]; ok {
-		return true
-	}
-
-	return isCodeExpiredCreds(code)
-}
-
-func isCodeExpiredCreds(code string) bool {
-	_, ok := credsExpiredCodes[code]
-	return ok
-}
-
-// IsErrorRetryable returns whether the error is retryable, based on its Code.
-// Returns false if the request has no Error set.
-func (r *Request) IsErrorRetryable() bool {
-	if r.Error != nil {
-		if err, ok := r.Error.(awserr.Error); ok {
-			return isCodeRetryable(err.Code())
-		}
-	}
-	return false
-}
-
-// IsErrorExpired returns whether the error code is a credential expiry error.
-// Returns false if the request has no Error set.
-func (r *Request) IsErrorExpired() bool {
-	if r.Error != nil {
-		if err, ok := r.Error.(awserr.Error); ok {
-			return isCodeExpiredCreds(err.Code())
-		}
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go
deleted file mode 100644
index 0f067c57f4..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/types.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package aws
-
-import (
-	"io"
-	"sync"
-)
-
-// ReadSeekCloser wraps a io.Reader returning a ReaderSeekerCloser
-func ReadSeekCloser(r io.Reader) ReaderSeekerCloser {
-	return ReaderSeekerCloser{r}
-}
-
-// ReaderSeekerCloser represents a reader that can also delegate io.Seeker and
-// io.Closer interfaces to the underlying object if they are available.
-type ReaderSeekerCloser struct {
-	r io.Reader
-}
-
-// Read reads from the reader up to size of p. The number of bytes read, and
-// error if it occurred will be returned.
-//
-// If the reader is not an io.Reader zero bytes read, and nil error will be returned.
-//
-// Performs the same functionality as io.Reader Read
-func (r ReaderSeekerCloser) Read(p []byte) (int, error) {
-	switch t := r.r.(type) {
-	case io.Reader:
-		return t.Read(p)
-	}
-	return 0, nil
-}
-
-// Seek sets the offset for the next Read to offset, interpreted according to
-// whence: 0 means relative to the origin of the file, 1 means relative to the
-// current offset, and 2 means relative to the end. Seek returns the new offset
-// and an error, if any.
-//
-// If the ReaderSeekerCloser is not an io.Seeker nothing will be done.
-func (r ReaderSeekerCloser) Seek(offset int64, whence int) (int64, error) {
-	switch t := r.r.(type) {
-	case io.Seeker:
-		return t.Seek(offset, whence)
-	}
-	return int64(0), nil
-}
-
-// Close closes the ReaderSeekerCloser.
-//
-// If the ReaderSeekerCloser is not an io.Closer nothing will be done.
-func (r ReaderSeekerCloser) Close() error {
-	switch t := r.r.(type) {
-	case io.Closer:
-		return t.Close()
-	}
-	return nil
-}
-
-// A WriteAtBuffer provides a in memory buffer supporting the io.WriterAt interface
-// Can be used with the s3manager.Downloader to download content to a buffer
-// in memory. Safe to use concurrently.
-type WriteAtBuffer struct {
-	buf []byte
-	m   sync.Mutex
-}
-
-// WriteAt writes a slice of bytes to a buffer starting at the position provided
-// The number of bytes written will be returned, or error. Can overwrite previous
-// written slices if the write ats overlap.
-func (b *WriteAtBuffer) WriteAt(p []byte, pos int64) (n int, err error) {
-	b.m.Lock()
-	defer b.m.Unlock()
-
-	expLen := pos + int64(len(p))
-	if int64(len(b.buf)) < expLen {
-		newBuf := make([]byte, expLen)
-		copy(newBuf, b.buf)
-		b.buf = newBuf
-	}
-	copy(b.buf[pos:], p)
-	return len(p), nil
-}
-
-// Bytes returns a slice of bytes written to the buffer.
-func (b *WriteAtBuffer) Bytes() []byte {
-	b.m.Lock()
-	defer b.m.Unlock()
-	return b.buf[:len(b.buf):len(b.buf)]
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go
deleted file mode 100644
index 669da2d695..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/version.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Package aws provides core functionality for making requests to AWS services.
-package aws
-
-// SDKName is the name of this AWS SDK
-const SDKName = "aws-sdk-go"
-
-// SDKVersion is the version of this SDK
-const SDKVersion = "1.1.7"
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
deleted file mode 100644
index 5469edb60b..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
+++ /dev/null
@@ -1,257 +0,0 @@
-// Package rest provides RESTful serialization of AWS requests and responses.
-package rest
-
-import (
-	"bytes"
-	"encoding/base64"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"path"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// RFC822 returns an RFC822 formatted timestamp for AWS protocols
-const RFC822 = "Mon, 2 Jan 2006 15:04:05 GMT"
-
-// Whether the byte value can be sent without escaping in AWS URLs
-var noEscape [256]bool
-
-var errValueNotSet = fmt.Errorf("value not set")
-
-func init() {
-	for i := 0; i < len(noEscape); i++ {
-		// AWS expects every character except these to be escaped
-		noEscape[i] = (i >= 'A' && i <= 'Z') ||
-			(i >= 'a' && i <= 'z') ||
-			(i >= '0' && i <= '9') ||
-			i == '-' ||
-			i == '.' ||
-			i == '_' ||
-			i == '~'
-	}
-}
-
-// BuildHandler is a named request handler for building rest protocol requests
-var BuildHandler = request.NamedHandler{Name: "awssdk.rest.Build", Fn: Build}
-
-// Build builds the REST component of a service request.
-func Build(r *request.Request) {
-	if r.ParamsFilled() {
-		v := reflect.ValueOf(r.Params).Elem()
-		buildLocationElements(r, v)
-		buildBody(r, v)
-	}
-}
-
-func buildLocationElements(r *request.Request, v reflect.Value) {
-	query := r.HTTPRequest.URL.Query()
-
-	for i := 0; i < v.NumField(); i++ {
-		m := v.Field(i)
-		if n := v.Type().Field(i).Name; n[0:1] == strings.ToLower(n[0:1]) {
-			continue
-		}
-
-		if m.IsValid() {
-			field := v.Type().Field(i)
-			name := field.Tag.Get("locationName")
-			if name == "" {
-				name = field.Name
-			}
-			if m.Kind() == reflect.Ptr {
-				m = m.Elem()
-			}
-			if !m.IsValid() {
-				continue
-			}
-
-			var err error
-			switch field.Tag.Get("location") {
-			case "headers": // header maps
-				err = buildHeaderMap(&r.HTTPRequest.Header, m, field.Tag.Get("locationName"))
-			case "header":
-				err = buildHeader(&r.HTTPRequest.Header, m, name)
-			case "uri":
-				err = buildURI(r.HTTPRequest.URL, m, name)
-			case "querystring":
-				err = buildQueryString(query, m, name)
-			}
-			r.Error = err
-		}
-		if r.Error != nil {
-			return
-		}
-	}
-
-	r.HTTPRequest.URL.RawQuery = query.Encode()
-	updatePath(r.HTTPRequest.URL, r.HTTPRequest.URL.Path)
-}
-
-func buildBody(r *request.Request, v reflect.Value) {
-	if field, ok := v.Type().FieldByName("_"); ok {
-		if payloadName := field.Tag.Get("payload"); payloadName != "" {
-			pfield, _ := v.Type().FieldByName(payloadName)
-			if ptag := pfield.Tag.Get("type"); ptag != "" && ptag != "structure" {
-				payload := reflect.Indirect(v.FieldByName(payloadName))
-				if payload.IsValid() && payload.Interface() != nil {
-					switch reader := payload.Interface().(type) {
-					case io.ReadSeeker:
-						r.SetReaderBody(reader)
-					case []byte:
-						r.SetBufferBody(reader)
-					case string:
-						r.SetStringBody(reader)
-					default:
-						r.Error = awserr.New("SerializationError",
-							"failed to encode REST request",
-							fmt.Errorf("unknown payload type %s", payload.Type()))
-					}
-				}
-			}
-		}
-	}
-}
-
-func buildHeader(header *http.Header, v reflect.Value, name string) error {
-	str, err := convertType(v)
-	if err == errValueNotSet {
-		return nil
-	} else if err != nil {
-		return awserr.New("SerializationError", "failed to encode REST request", err)
-	}
-
-	header.Add(name, str)
-
-	return nil
-}
-
-func buildHeaderMap(header *http.Header, v reflect.Value, prefix string) error {
-	for _, key := range v.MapKeys() {
-		str, err := convertType(v.MapIndex(key))
-		if err == errValueNotSet {
-			continue
-		} else if err != nil {
-			return awserr.New("SerializationError", "failed to encode REST request", err)
-
-		}
-
-		header.Add(prefix+key.String(), str)
-	}
-	return nil
-}
-
-func buildURI(u *url.URL, v reflect.Value, name string) error {
-	value, err := convertType(v)
-	if err == errValueNotSet {
-		return nil
-	} else if err != nil {
-		return awserr.New("SerializationError", "failed to encode REST request", err)
-	}
-
-	uri := u.Path
-	uri = strings.Replace(uri, "{"+name+"}", EscapePath(value, true), -1)
-	uri = strings.Replace(uri, "{"+name+"+}", EscapePath(value, false), -1)
-	u.Path = uri
-
-	return nil
-}
-
-func buildQueryString(query url.Values, v reflect.Value, name string) error {
-	switch value := v.Interface().(type) {
-	case []*string:
-		for _, item := range value {
-			query.Add(name, *item)
-		}
-	case map[string]*string:
-		for key, item := range value {
-			query.Add(key, *item)
-		}
-	case map[string][]*string:
-		for key, items := range value {
-			for _, item := range items {
-				query.Add(key, *item)
-			}
-		}
-	default:
-		str, err := convertType(v)
-		if err == errValueNotSet {
-			return nil
-		} else if err != nil {
-			return awserr.New("SerializationError", "failed to encode REST request", err)
-		}
-		query.Set(name, str)
-	}
-
-	return nil
-}
-
-func updatePath(url *url.URL, urlPath string) {
-	scheme, query := url.Scheme, url.RawQuery
-
-	hasSlash := strings.HasSuffix(urlPath, "/")
-
-	// clean up path
-	urlPath = path.Clean(urlPath)
-	if hasSlash && !strings.HasSuffix(urlPath, "/") {
-		urlPath += "/"
-	}
-
-	// get formatted URL minus scheme so we can build this into Opaque
-	url.Scheme, url.Path, url.RawQuery = "", "", ""
-	s := url.String()
-	url.Scheme = scheme
-	url.RawQuery = query
-
-	// build opaque URI
-	url.Opaque = s + urlPath
-}
-
-// EscapePath escapes part of a URL path in Amazon style
-func EscapePath(path string, encodeSep bool) string {
-	var buf bytes.Buffer
-	for i := 0; i < len(path); i++ {
-		c := path[i]
-		if noEscape[c] || (c == '/' && !encodeSep) {
-			buf.WriteByte(c)
-		} else {
-			buf.WriteByte('%')
-			buf.WriteString(strings.ToUpper(strconv.FormatUint(uint64(c), 16)))
-		}
-	}
-	return buf.String()
-}
-
-func convertType(v reflect.Value) (string, error) {
-	v = reflect.Indirect(v)
-	if !v.IsValid() {
-		return "", errValueNotSet
-	}
-
-	var str string
-	switch value := v.Interface().(type) {
-	case string:
-		str = value
-	case []byte:
-		str = base64.StdEncoding.EncodeToString(value)
-	case bool:
-		str = strconv.FormatBool(value)
-	case int64:
-		str = strconv.FormatInt(value, 10)
-	case float64:
-		str = strconv.FormatFloat(value, 'f', -1, 64)
-	case time.Time:
-		str = value.UTC().Format(RFC822)
-	default:
-		err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
-		return "", err
-	}
-	return str, nil
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
deleted file mode 100644
index 4366de2e1e..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package rest
-
-import "reflect"
-
-// PayloadMember returns the payload field member of i if there is one, or nil.
-func PayloadMember(i interface{}) interface{} {
-	if i == nil {
-		return nil
-	}
-
-	v := reflect.ValueOf(i).Elem()
-	if !v.IsValid() {
-		return nil
-	}
-	if field, ok := v.Type().FieldByName("_"); ok {
-		if payloadName := field.Tag.Get("payload"); payloadName != "" {
-			field, _ := v.Type().FieldByName(payloadName)
-			if field.Tag.Get("type") != "structure" {
-				return nil
-			}
-
-			payload := v.FieldByName(payloadName)
-			if payload.IsValid() || (payload.Kind() == reflect.Ptr && !payload.IsNil()) {
-				return payload.Interface()
-			}
-		}
-	}
-	return nil
-}
-
-// PayloadType returns the type of a payload field member of i if there is one, or "".
-func PayloadType(i interface{}) string {
-	v := reflect.Indirect(reflect.ValueOf(i))
-	if !v.IsValid() {
-		return ""
-	}
-	if field, ok := v.Type().FieldByName("_"); ok {
-		if payloadName := field.Tag.Get("payload"); payloadName != "" {
-			if member, ok := v.Type().FieldByName(payloadName); ok {
-				return member.Tag.Get("type")
-			}
-		}
-	}
-	return ""
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
deleted file mode 100644
index ba46f5bc9f..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
+++ /dev/null
@@ -1,193 +0,0 @@
-package rest
-
-import (
-	"encoding/base64"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// UnmarshalHandler is a named request handler for unmarshaling rest protocol requests
-var UnmarshalHandler = request.NamedHandler{Name: "awssdk.rest.Unmarshal", Fn: Unmarshal}
-
-// UnmarshalMetaHandler is a named request handler for unmarshaling rest protocol request metadata
-var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.rest.UnmarshalMeta", Fn: UnmarshalMeta}
-
-// Unmarshal unmarshals the REST component of a response in a REST service.
-func Unmarshal(r *request.Request) {
-	if r.DataFilled() {
-		v := reflect.Indirect(reflect.ValueOf(r.Data))
-		unmarshalBody(r, v)
-	}
-}
-
-// UnmarshalMeta unmarshals the REST metadata of a response in a REST service
-func UnmarshalMeta(r *request.Request) {
-	r.RequestID = r.HTTPResponse.Header.Get("X-Amzn-Requestid")
-	if r.RequestID == "" {
-		// Alternative version of request id in the header
-		r.RequestID = r.HTTPResponse.Header.Get("X-Amz-Request-Id")
-	}
-	if r.DataFilled() {
-		v := reflect.Indirect(reflect.ValueOf(r.Data))
-		unmarshalLocationElements(r, v)
-	}
-}
-
-func unmarshalBody(r *request.Request, v reflect.Value) {
-	if field, ok := v.Type().FieldByName("_"); ok {
-		if payloadName := field.Tag.Get("payload"); payloadName != "" {
-			pfield, _ := v.Type().FieldByName(payloadName)
-			if ptag := pfield.Tag.Get("type"); ptag != "" && ptag != "structure" {
-				payload := v.FieldByName(payloadName)
-				if payload.IsValid() {
-					switch payload.Interface().(type) {
-					case []byte:
-						b, err := ioutil.ReadAll(r.HTTPResponse.Body)
-						if err != nil {
-							r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
-						} else {
-							payload.Set(reflect.ValueOf(b))
-						}
-					case *string:
-						b, err := ioutil.ReadAll(r.HTTPResponse.Body)
-						if err != nil {
-							r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
-						} else {
-							str := string(b)
-							payload.Set(reflect.ValueOf(&str))
-						}
-					default:
-						switch payload.Type().String() {
-						case "io.ReadSeeker":
-							payload.Set(reflect.ValueOf(aws.ReadSeekCloser(r.HTTPResponse.Body)))
-						case "aws.ReadSeekCloser", "io.ReadCloser":
-							payload.Set(reflect.ValueOf(r.HTTPResponse.Body))
-						default:
-							r.Error = awserr.New("SerializationError",
-								"failed to decode REST response",
-								fmt.Errorf("unknown payload type %s", payload.Type()))
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-func unmarshalLocationElements(r *request.Request, v reflect.Value) {
-	for i := 0; i < v.NumField(); i++ {
-		m, field := v.Field(i), v.Type().Field(i)
-		if n := field.Name; n[0:1] == strings.ToLower(n[0:1]) {
-			continue
-		}
-
-		if m.IsValid() {
-			name := field.Tag.Get("locationName")
-			if name == "" {
-				name = field.Name
-			}
-
-			switch field.Tag.Get("location") {
-			case "statusCode":
-				unmarshalStatusCode(m, r.HTTPResponse.StatusCode)
-			case "header":
-				err := unmarshalHeader(m, r.HTTPResponse.Header.Get(name))
-				if err != nil {
-					r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
-					break
-				}
-			case "headers":
-				prefix := field.Tag.Get("locationName")
-				err := unmarshalHeaderMap(m, r.HTTPResponse.Header, prefix)
-				if err != nil {
-					r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
-					break
-				}
-			}
-		}
-		if r.Error != nil {
-			return
-		}
-	}
-}
-
-func unmarshalStatusCode(v reflect.Value, statusCode int) {
-	if !v.IsValid() {
-		return
-	}
-
-	switch v.Interface().(type) {
-	case *int64:
-		s := int64(statusCode)
-		v.Set(reflect.ValueOf(&s))
-	}
-}
-
-func unmarshalHeaderMap(r reflect.Value, headers http.Header, prefix string) error {
-	switch r.Interface().(type) {
-	case map[string]*string: // we only support string map value types
-		out := map[string]*string{}
-		for k, v := range headers {
-			k = http.CanonicalHeaderKey(k)
-			if strings.HasPrefix(strings.ToLower(k), strings.ToLower(prefix)) {
-				out[k[len(prefix):]] = &v[0]
-			}
-		}
-		r.Set(reflect.ValueOf(out))
-	}
-	return nil
-}
-
-func unmarshalHeader(v reflect.Value, header string) error {
-	if !v.IsValid() || (header == "" && v.Elem().Kind() != reflect.String) {
-		return nil
-	}
-
-	switch v.Interface().(type) {
-	case *string:
-		v.Set(reflect.ValueOf(&header))
-	case []byte:
-		b, err := base64.StdEncoding.DecodeString(header)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&b))
-	case *bool:
-		b, err := strconv.ParseBool(header)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&b))
-	case *int64:
-		i, err := strconv.ParseInt(header, 10, 64)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&i))
-	case *float64:
-		f, err := strconv.ParseFloat(header, 64)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&f))
-	case *time.Time:
-		t, err := time.Parse(RFC822, header)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&t))
-	default:
-		err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
-		return err
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go
deleted file mode 100644
index 244c86da05..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/header_rules.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package v4
-
-import (
-	"net/http"
-	"strings"
-)
-
-// validator houses a set of rule needed for validation of a
-// string value
-type rules []rule
-
-// rule interface allows for more flexible rules and just simply
-// checks whether or not a value adheres to that rule
-type rule interface {
-	IsValid(value string) bool
-}
-
-// IsValid will iterate through all rules and see if any rules
-// apply to the value and supports nested rules
-func (r rules) IsValid(value string) bool {
-	for _, rule := range r {
-		if rule.IsValid(value) {
-			return true
-		}
-	}
-	return false
-}
-
-// mapRule generic rule for maps
-type mapRule map[string]struct{}
-
-// IsValid for the map rule satisfies whether it exists in the map
-func (m mapRule) IsValid(value string) bool {
-	_, ok := m[value]
-	return ok
-}
-
-// whitelist is a generic rule for whitelisting
-type whitelist struct {
-	rule
-}
-
-// IsValid for whitelist checks if the value is within the whitelist
-func (w whitelist) IsValid(value string) bool {
-	return w.rule.IsValid(value)
-}
-
-// blacklist is a generic rule for blacklisting
-type blacklist struct {
-	rule
-}
-
-// IsValid for whitelist checks if the value is within the whitelist
-func (b blacklist) IsValid(value string) bool {
-	return !b.rule.IsValid(value)
-}
-
-type patterns []string
-
-// IsValid for patterns checks each pattern and returns if a match has
-// been found
-func (p patterns) IsValid(value string) bool {
-	for _, pattern := range p {
-		if strings.HasPrefix(http.CanonicalHeaderKey(value), pattern) {
-			return true
-		}
-	}
-	return false
-}
-
-// inclusiveRules rules allow for rules to depend on one another
-type inclusiveRules []rule
-
-// IsValid will return true if all rules are true
-func (r inclusiveRules) IsValid(value string) bool {
-	for _, rule := range r {
-		if !rule.IsValid(value) {
-			return false
-		}
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go b/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
deleted file mode 100644
index 14b0c66161..0000000000
--- a/Godeps/_workspace/src/github.com/aws/aws-sdk-go/private/signer/v4/v4.go
+++ /dev/null
@@ -1,438 +0,0 @@
-// Package v4 implements signing for AWS V4 signer
-package v4
-
-import (
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/private/protocol/rest"
-)
-
-const (
-	authHeaderPrefix = "AWS4-HMAC-SHA256"
-	timeFormat       = "20060102T150405Z"
-	shortTimeFormat  = "20060102"
-)
-
-var ignoredHeaders = rules{
-	blacklist{
-		mapRule{
-			"Content-Length": struct{}{},
-			"User-Agent":     struct{}{},
-		},
-	},
-}
-
-// requiredSignedHeaders is a whitelist for build canonical headers.
-var requiredSignedHeaders = rules{
-	whitelist{
-		mapRule{
-			"Cache-Control":                                               struct{}{},
-			"Content-Disposition":                                         struct{}{},
-			"Content-Encoding":                                            struct{}{},
-			"Content-Language":                                            struct{}{},
-			"Content-Md5":                                                 struct{}{},
-			"Content-Type":                                                struct{}{},
-			"Expires":                                                     struct{}{},
-			"If-Match":                                                    struct{}{},
-			"If-Modified-Since":                                           struct{}{},
-			"If-None-Match":                                               struct{}{},
-			"If-Unmodified-Since":                                         struct{}{},
-			"Range":                                                       struct{}{},
-			"X-Amz-Acl":                                                   struct{}{},
-			"X-Amz-Copy-Source":                                           struct{}{},
-			"X-Amz-Copy-Source-If-Match":                                  struct{}{},
-			"X-Amz-Copy-Source-If-Modified-Since":                         struct{}{},
-			"X-Amz-Copy-Source-If-None-Match":                             struct{}{},
-			"X-Amz-Copy-Source-If-Unmodified-Since":                       struct{}{},
-			"X-Amz-Copy-Source-Range":                                     struct{}{},
-			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Algorithm": struct{}{},
-			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key":       struct{}{},
-			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key-Md5":   struct{}{},
-			"X-Amz-Grant-Full-control":                                    struct{}{},
-			"X-Amz-Grant-Read":                                            struct{}{},
-			"X-Amz-Grant-Read-Acp":                                        struct{}{},
-			"X-Amz-Grant-Write":                                           struct{}{},
-			"X-Amz-Grant-Write-Acp":                                       struct{}{},
-			"X-Amz-Metadata-Directive":                                    struct{}{},
-			"X-Amz-Mfa":                                                   struct{}{},
-			"X-Amz-Request-Payer":                                         struct{}{},
-			"X-Amz-Server-Side-Encryption":                                struct{}{},
-			"X-Amz-Server-Side-Encryption-Aws-Kms-Key-Id":                 struct{}{},
-			"X-Amz-Server-Side-Encryption-Customer-Algorithm":             struct{}{},
-			"X-Amz-Server-Side-Encryption-Customer-Key":                   struct{}{},
-			"X-Amz-Server-Side-Encryption-Customer-Key-Md5":               struct{}{},
-			"X-Amz-Storage-Class":                                         struct{}{},
-			"X-Amz-Website-Redirect-Location":                             struct{}{},
-		},
-	},
-	patterns{"X-Amz-Meta-"},
-}
-
-// allowedHoisting is a whitelist for build query headers. The boolean value
-// represents whether or not it is a pattern.
-var allowedQueryHoisting = inclusiveRules{
-	blacklist{requiredSignedHeaders},
-	patterns{"X-Amz-"},
-}
-
-type signer struct {
-	Request     *http.Request
-	Time        time.Time
-	ExpireTime  time.Duration
-	ServiceName string
-	Region      string
-	CredValues  credentials.Value
-	Credentials *credentials.Credentials
-	Query       url.Values
-	Body        io.ReadSeeker
-	Debug       aws.LogLevelType
-	Logger      aws.Logger
-
-	isPresign          bool
-	formattedTime      string
-	formattedShortTime string
-
-	signedHeaders    string
-	canonicalHeaders string
-	canonicalString  string
-	credentialString string
-	stringToSign     string
-	signature        string
-	authorization    string
-	notHoist         bool
-	signedHeaderVals http.Header
-}
-
-// Sign requests with signature version 4.
-//
-// Will sign the requests with the service config's Credentials object
-// Signing is skipped if the credentials is the credentials.AnonymousCredentials
-// object.
-func Sign(req *request.Request) {
-	// If the request does not need to be signed ignore the signing of the
-	// request if the AnonymousCredentials object is used.
-	if req.Config.Credentials == credentials.AnonymousCredentials {
-		return
-	}
-
-	region := req.ClientInfo.SigningRegion
-	if region == "" {
-		region = aws.StringValue(req.Config.Region)
-	}
-
-	name := req.ClientInfo.SigningName
-	if name == "" {
-		name = req.ClientInfo.ServiceName
-	}
-
-	s := signer{
-		Request:     req.HTTPRequest,
-		Time:        req.Time,
-		ExpireTime:  req.ExpireTime,
-		Query:       req.HTTPRequest.URL.Query(),
-		Body:        req.Body,
-		ServiceName: name,
-		Region:      region,
-		Credentials: req.Config.Credentials,
-		Debug:       req.Config.LogLevel.Value(),
-		Logger:      req.Config.Logger,
-		notHoist:    req.NotHoist,
-	}
-
-	req.Error = s.sign()
-	req.SignedHeaderVals = s.signedHeaderVals
-}
-
-func (v4 *signer) sign() error {
-	if v4.ExpireTime != 0 {
-		v4.isPresign = true
-	}
-
-	if v4.isRequestSigned() {
-		if !v4.Credentials.IsExpired() {
-			// If the request is already signed, and the credentials have not
-			// expired yet ignore the signing request.
-			return nil
-		}
-
-		// The credentials have expired for this request. The current signing
-		// is invalid, and needs to be request because the request will fail.
-		if v4.isPresign {
-			v4.removePresign()
-			// Update the request's query string to ensure the values stays in
-			// sync in the case retrieving the new credentials fails.
-			v4.Request.URL.RawQuery = v4.Query.Encode()
-		}
-	}
-
-	var err error
-	v4.CredValues, err = v4.Credentials.Get()
-	if err != nil {
-		return err
-	}
-
-	if v4.isPresign {
-		v4.Query.Set("X-Amz-Algorithm", authHeaderPrefix)
-		if v4.CredValues.SessionToken != "" {
-			v4.Query.Set("X-Amz-Security-Token", v4.CredValues.SessionToken)
-		} else {
-			v4.Query.Del("X-Amz-Security-Token")
-		}
-	} else if v4.CredValues.SessionToken != "" {
-		v4.Request.Header.Set("X-Amz-Security-Token", v4.CredValues.SessionToken)
-	}
-
-	v4.build()
-
-	if v4.Debug.Matches(aws.LogDebugWithSigning) {
-		v4.logSigningInfo()
-	}
-
-	return nil
-}
-
-const logSignInfoMsg = `DEBUG: Request Signiture:
----[ CANONICAL STRING  ]-----------------------------
-%s
----[ STRING TO SIGN ]--------------------------------
-%s%s
------------------------------------------------------`
-const logSignedURLMsg = `
----[ SIGNED URL ]------------------------------------
-%s`
-
-func (v4 *signer) logSigningInfo() {
-	signedURLMsg := ""
-	if v4.isPresign {
-		signedURLMsg = fmt.Sprintf(logSignedURLMsg, v4.Request.URL.String())
-	}
-	msg := fmt.Sprintf(logSignInfoMsg, v4.canonicalString, v4.stringToSign, signedURLMsg)
-	v4.Logger.Log(msg)
-}
-
-func (v4 *signer) build() {
-
-	v4.buildTime()             // no depends
-	v4.buildCredentialString() // no depends
-
-	unsignedHeaders := v4.Request.Header
-	if v4.isPresign {
-		if !v4.notHoist {
-			urlValues := url.Values{}
-			urlValues, unsignedHeaders = buildQuery(allowedQueryHoisting, unsignedHeaders) // no depends
-			for k := range urlValues {
-				v4.Query[k] = urlValues[k]
-			}
-		}
-	}
-
-	v4.buildCanonicalHeaders(ignoredHeaders, unsignedHeaders)
-	v4.buildCanonicalString() // depends on canon headers / signed headers
-	v4.buildStringToSign()    // depends on canon string
-	v4.buildSignature()       // depends on string to sign
-
-	if v4.isPresign {
-		v4.Request.URL.RawQuery += "&X-Amz-Signature=" + v4.signature
-	} else {
-		parts := []string{
-			authHeaderPrefix + " Credential=" + v4.CredValues.AccessKeyID + "/" + v4.credentialString,
-			"SignedHeaders=" + v4.signedHeaders,
-			"Signature=" + v4.signature,
-		}
-		v4.Request.Header.Set("Authorization", strings.Join(parts, ", "))
-	}
-}
-
-func (v4 *signer) buildTime() {
-	v4.formattedTime = v4.Time.UTC().Format(timeFormat)
-	v4.formattedShortTime = v4.Time.UTC().Format(shortTimeFormat)
-
-	if v4.isPresign {
-		duration := int64(v4.ExpireTime / time.Second)
-		v4.Query.Set("X-Amz-Date", v4.formattedTime)
-		v4.Query.Set("X-Amz-Expires", strconv.FormatInt(duration, 10))
-	} else {
-		v4.Request.Header.Set("X-Amz-Date", v4.formattedTime)
-	}
-}
-
-func (v4 *signer) buildCredentialString() {
-	v4.credentialString = strings.Join([]string{
-		v4.formattedShortTime,
-		v4.Region,
-		v4.ServiceName,
-		"aws4_request",
-	}, "/")
-
-	if v4.isPresign {
-		v4.Query.Set("X-Amz-Credential", v4.CredValues.AccessKeyID+"/"+v4.credentialString)
-	}
-}
-
-func buildQuery(r rule, header http.Header) (url.Values, http.Header) {
-	query := url.Values{}
-	unsignedHeaders := http.Header{}
-	for k, h := range header {
-		if r.IsValid(k) {
-			query[k] = h
-		} else {
-			unsignedHeaders[k] = h
-		}
-	}
-
-	return query, unsignedHeaders
-}
-func (v4 *signer) buildCanonicalHeaders(r rule, header http.Header) {
-	var headers []string
-	headers = append(headers, "host")
-	for k, v := range header {
-		canonicalKey := http.CanonicalHeaderKey(k)
-		if !r.IsValid(canonicalKey) {
-			continue // ignored header
-		}
-
-		lowerCaseKey := strings.ToLower(k)
-		headers = append(headers, lowerCaseKey)
-
-		if v4.signedHeaderVals == nil {
-			v4.signedHeaderVals = make(http.Header)
-		}
-		v4.signedHeaderVals[lowerCaseKey] = v
-	}
-	sort.Strings(headers)
-
-	v4.signedHeaders = strings.Join(headers, ";")
-
-	if v4.isPresign {
-		v4.Query.Set("X-Amz-SignedHeaders", v4.signedHeaders)
-	}
-
-	headerValues := make([]string, len(headers))
-	for i, k := range headers {
-		if k == "host" {
-			headerValues[i] = "host:" + v4.Request.URL.Host
-		} else {
-			headerValues[i] = k + ":" +
-				strings.Join(v4.Request.Header[http.CanonicalHeaderKey(k)], ",")
-		}
-	}
-
-	v4.canonicalHeaders = strings.Join(headerValues, "\n")
-}
-
-func (v4 *signer) buildCanonicalString() {
-	v4.Request.URL.RawQuery = strings.Replace(v4.Query.Encode(), "+", "%20", -1)
-	uri := v4.Request.URL.Opaque
-	if uri != "" {
-		uri = "/" + strings.Join(strings.Split(uri, "/")[3:], "/")
-	} else {
-		uri = v4.Request.URL.Path
-	}
-	if uri == "" {
-		uri = "/"
-	}
-
-	if v4.ServiceName != "s3" {
-		uri = rest.EscapePath(uri, false)
-	}
-
-	v4.canonicalString = strings.Join([]string{
-		v4.Request.Method,
-		uri,
-		v4.Request.URL.RawQuery,
-		v4.canonicalHeaders + "\n",
-		v4.signedHeaders,
-		v4.bodyDigest(),
-	}, "\n")
-}
-
-func (v4 *signer) buildStringToSign() {
-	v4.stringToSign = strings.Join([]string{
-		authHeaderPrefix,
-		v4.formattedTime,
-		v4.credentialString,
-		hex.EncodeToString(makeSha256([]byte(v4.canonicalString))),
-	}, "\n")
-}
-
-func (v4 *signer) buildSignature() {
-	secret := v4.CredValues.SecretAccessKey
-	date := makeHmac([]byte("AWS4"+secret), []byte(v4.formattedShortTime))
-	region := makeHmac(date, []byte(v4.Region))
-	service := makeHmac(region, []byte(v4.ServiceName))
-	credentials := makeHmac(service, []byte("aws4_request"))
-	signature := makeHmac(credentials, []byte(v4.stringToSign))
-	v4.signature = hex.EncodeToString(signature)
-}
-
-func (v4 *signer) bodyDigest() string {
-	hash := v4.Request.Header.Get("X-Amz-Content-Sha256")
-	if hash == "" {
-		if v4.isPresign && v4.ServiceName == "s3" {
-			hash = "UNSIGNED-PAYLOAD"
-		} else if v4.Body == nil {
-			hash = hex.EncodeToString(makeSha256([]byte{}))
-		} else {
-			hash = hex.EncodeToString(makeSha256Reader(v4.Body))
-		}
-		v4.Request.Header.Add("X-Amz-Content-Sha256", hash)
-	}
-	return hash
-}
-
-// isRequestSigned returns if the request is currently signed or presigned
-func (v4 *signer) isRequestSigned() bool {
-	if v4.isPresign && v4.Query.Get("X-Amz-Signature") != "" {
-		return true
-	}
-	if v4.Request.Header.Get("Authorization") != "" {
-		return true
-	}
-
-	return false
-}
-
-// unsign removes signing flags for both signed and presigned requests.
-func (v4 *signer) removePresign() {
-	v4.Query.Del("X-Amz-Algorithm")
-	v4.Query.Del("X-Amz-Signature")
-	v4.Query.Del("X-Amz-Security-Token")
-	v4.Query.Del("X-Amz-Date")
-	v4.Query.Del("X-Amz-Expires")
-	v4.Query.Del("X-Amz-Credential")
-	v4.Query.Del("X-Amz-SignedHeaders")
-}
-
-func makeHmac(key []byte, data []byte) []byte {
-	hash := hmac.New(sha256.New, key)
-	hash.Write(data)
-	return hash.Sum(nil)
-}
-
-func makeSha256(data []byte) []byte {
-	hash := sha256.New()
-	hash.Write(data)
-	return hash.Sum(nil)
-}
-
-func makeSha256Reader(reader io.ReadSeeker) []byte {
-	hash := sha256.New()
-	start, _ := reader.Seek(0, 1)
-	defer reader.Seek(start, 0)
-
-	io.Copy(hash, reader)
-	return hash.Sum(nil)
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/COPYING b/Godeps/_workspace/src/github.com/camlistore/camlistore/COPYING
deleted file mode 100644
index d645695673..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/clients/chrome/clip-it-good/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/clients/chrome/clip-it-good/LICENSE
deleted file mode 100644
index 055361b34f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/clients/chrome/clip-it-good/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2010 Brett Slatkin
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/misc/copyrightifity b/Godeps/_workspace/src/github.com/camlistore/camlistore/misc/copyrightifity
deleted file mode 100644
index 14db513c88..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/misc/copyrightifity
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright 2010 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-# This script adds copyright headers to files.
-
-use strict;
-my $header = do { local $/; <DATA> };
-$header =~ s!\s+$!\n!;
-my $yyyy = (localtime())[5] + 1900;
-$header =~ s/YYYY/$yyyy/ or die;
-
-unless (@ARGV == 1) {
-    die "Usage: copyrightify <filename>\n";
-}
-
-my $file = shift;
-open(my $fh, $file) or die "Open $file error: $!\n";
-my $source = do { local $/; <$fh> };
-close($fh);
-if ($source =~ /Copyright \d\d\d\d/) {
-   print STDERR "# $file - OK\n";
-   exit;
-}
-
-my $newsource = $source;
-if ($file =~ /\.(go|java|aidl)$/) {
-    $header = "/*\n$header*/\n\n";
-    $newsource = $header . $source;
-} elsif ($file =~ /\.py$/) {
-    $header = join("", map { "# $_\n" } split(/\n/, $header));
-    $newsource = $header . $source;
-} else {
-    die "File type not supported.";
-}
-
-
-open(my $fh, ">$file") or die "Open $file error: $!\n";
-print $fh $newsource;
-close($fh) or die;
-
-__END__
-Copyright YYYY The Camlistore Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legal.go b/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legal.go
deleted file mode 100644
index a75283fd6b..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legal.go
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2014 The Camlistore Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package legal provides project-wide storage for compiled-in licenses.
-package legal
-
-var licenses []string
-
-func init() {
-	RegisterLicense(`
-Copyright 2014 The Camlistore Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-`)
-}
-
-// RegisterLicense stores the license text.
-// It doesn't check whether the text was already present.
-func RegisterLicense(text string) {
-	licenses = append(licenses, text)
-	return
-}
-
-// Licenses returns a slice of the licenses.
-func Licenses() []string {
-	return licenses
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legalprint/legalprint.go b/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legalprint/legalprint.go
deleted file mode 100644
index e4a3205a6a..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/pkg/legal/legalprint/legalprint.go
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2014 The Camlistore Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package legalprint provides a printing helper for the legal package.
-package legalprint
-
-import (
-	"flag"
-	"fmt"
-	"io"
-
-	"camlistore.org/pkg/legal"
-)
-
-var (
-	flagLegal = flag.Bool("legal", false, "show licenses")
-)
-
-// MaybePrint will print the licenses if flagLegal has been set.
-// It will return the value of the flagLegal.
-func MaybePrint(out io.Writer) bool {
-	if !*flagLegal {
-		return false
-	}
-	for _, text := range legal.Licenses() {
-		fmt.Fprintln(out, text)
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/bazil.org/fuse/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/bazil.org/fuse/LICENSE
deleted file mode 100644
index d369cb822a..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/bazil.org/fuse/LICENSE
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright (c) 2013, 2014 Tommi Virtanen.
-Copyright (c) 2009, 2011, 2012 The Go Authors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-The following included software components have additional copyright
-notices and license terms that may differ from the above.
-
-
-File fuse.go:
-
-// Adapted from Plan 9 from User Space's src/cmd/9pfuse/fuse.c,
-// which carries this notice:
-//
-// The files in this directory are subject to the following license.
-//
-// The author of this software is Russ Cox.
-//
-//         Copyright (c) 2006 Russ Cox
-//
-// Permission to use, copy, modify, and distribute this software for any
-// purpose without fee is hereby granted, provided that this entire notice
-// is included in all copies of any software which is or includes a copy
-// or modification of this software and in all copies of the supporting
-// documentation for such software.
-//
-// THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
-// WARRANTY.  IN PARTICULAR, THE AUTHOR MAKES NO REPRESENTATION OR WARRANTY
-// OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS
-// FITNESS FOR ANY PARTICULAR PURPOSE.
-
-
-File fuse_kernel.go:
-
-// Derived from FUSE's fuse_kernel.h
-/*
-   This file defines the kernel interface of FUSE
-   Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
-
-
-   This -- and only this -- header file may also be distributed under
-   the terms of the BSD Licence as follows:
-
-   Copyright (C) 2001-2007 Miklos Szeredi. All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-   SUCH DAMAGE.
-*/
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/closure/lib/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/closure/lib/LICENSE
deleted file mode 100644
index d9a10c0d8e..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/closure/lib/LICENSE
+++ /dev/null
@@ -1,176 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/LICENSE
deleted file mode 100644
index 6765f090b4..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The goauth2 Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/PATENTS b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/PATENTS
deleted file mode 100644
index 9e8716353d..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/goauth2/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the goauth2 project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/leveldb-go/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/leveldb-go/LICENSE
deleted file mode 100644
index fec05ce129..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/leveldb-go/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/snappy-go/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/snappy-go/LICENSE
deleted file mode 100644
index 6050c10f4c..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/snappy-go/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 The Snappy-Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/xsrftoken/COPYING b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/xsrftoken/COPYING
deleted file mode 100644
index d645695673..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/code.google.com/p/xsrftoken/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/fontawesome/LICENSE.txt b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/fontawesome/LICENSE.txt
deleted file mode 100644
index 1066d2f825..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/fontawesome/LICENSE.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-fonts/*: SIL OFL 1.1 (http://scripts.sil.org/OFL)
-css/*: MIT (http://opensource.org/licenses/mit-license.html)
-
-Details at http://fortawesome.github.io/Font-Awesome/license/
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/camlistore/lock/COPYING b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/camlistore/lock/COPYING
deleted file mode 100644
index d645695673..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/camlistore/lock/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/dbm/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/dbm/LICENSE
deleted file mode 100644
index 65d761bc9f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/dbm/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2013 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/lldb/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/lldb/LICENSE
deleted file mode 100644
index 65d761bc9f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/exp/lldb/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2013 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/LICENSE
deleted file mode 100644
index 50bbdd2410..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The fileutil Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/falloc/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/falloc/LICENSE
deleted file mode 100644
index 1e92e33dd7..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/falloc/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of CZ.NIC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/hdb/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/hdb/LICENSE
deleted file mode 100644
index 1e92e33dd7..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/hdb/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of CZ.NIC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/storage/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/storage/LICENSE
deleted file mode 100644
index 1e92e33dd7..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/fileutil/storage/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of CZ.NIC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/kv/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/kv/LICENSE
deleted file mode 100644
index 65d761bc9f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/kv/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2013 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/LICENSE
deleted file mode 100644
index 1e92e33dd7..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of CZ.NIC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/mersenne/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/mersenne/LICENSE
deleted file mode 100644
index 7150ce3e43..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/mathutil/mersenne/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 jnml. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of jnml nor the names of his
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/sortutil/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/sortutil/LICENSE
deleted file mode 100644
index 6a66aea5ea..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/sortutil/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/zappy/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/zappy/LICENSE
deleted file mode 100644
index 65d761bc9f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/cznic/zappy/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2013 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/davecgh/go-spew/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/davecgh/go-spew/LICENSE
deleted file mode 100644
index 2a7cfd2bf6..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/davecgh/go-spew/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2012-2013 Dave Collins <dave@davec.name>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/go-sql-driver/mysql/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/go-sql-driver/mysql/LICENSE
deleted file mode 100644
index 14e2f777f6..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/go-sql-driver/mysql/LICENSE
+++ /dev/null
@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/golang/glog/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/golang/glog/LICENSE
deleted file mode 100644
index 37ec93a14f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/golang/glog/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/gorilla/websocket/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/gorilla/websocket/LICENSE
deleted file mode 100644
index 09e5be61d7..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/gorilla/websocket/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2013, Gorilla web toolkit
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/lib/pq/LICENSE.md b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/lib/pq/LICENSE.md
deleted file mode 100644
index 5773904a30..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/lib/pq/LICENSE.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2011-2013, 'pq' Contributors
-Portions Copyright (C) 2011 Blake Mizerany
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/russross/blackfriday/LICENSE.txt b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/russross/blackfriday/LICENSE.txt
deleted file mode 100644
index 2885af3602..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/russross/blackfriday/LICENSE.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Blackfriday is distributed under the Simplified BSD License:
-
-> Copyright © 2011 Russ Ross
-> All rights reserved.
->
-> Redistribution and use in source and binary forms, with or without
-> modification, are permitted provided that the following conditions
-> are met:
->
-> 1.  Redistributions of source code must retain the above copyright
->     notice, this list of conditions and the following disclaimer.
->
-> 2.  Redistributions in binary form must reproduce the above
->     copyright notice, this list of conditions and the following
->     disclaimer in the documentation and/or other materials provided with
->     the distribution.
->
-> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-> "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-> FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-> COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-> INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-> BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-> LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-> ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-> POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/rwcarlsen/goexif/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/rwcarlsen/goexif/LICENSE
deleted file mode 100644
index aa6250465f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/github.com/rwcarlsen/goexif/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Copyright (c) 2012, Robert Carlsen & Contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/glitch/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/glitch/LICENSE
deleted file mode 100644
index 7efba3b1c6..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/glitch/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-The files in here come from www.glitchthegame.com.
-
-License here: http://www.glitchthegame.com/public-domain-game-art/#licensing
-
-All files are provided by Tiny Speck under the Creative Commons CC0 1.0
-Universal License. This is a broadly permissive "No Rights Reserved" license —
-you may do what you please with what we've provided. Our intention is to
-dedicate these works to the public domain and make them freely available to all,
-without restriction. All files are provided AS-IS. Tiny Speck cannot provide any
-support to help you bring these assets into your own projects.
-
-Note: the Glitch logo and trademark are not among the things we are making
-available under this license. Only items in the files explicitly included herein
-are covered.
-
-There is no obligation to link or credit the works, but if you do, please link
-to glitchthegame.com, our permanent "retirement" site for the game and these
-assets. Of course, links/shoutouts to Tiny Speck (tinyspeck.com) and/or Slack
-(slack.com) are appreciated.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/LICENSE
deleted file mode 100644
index 6a66aea5ea..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/PATENTS b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/PATENTS
deleted file mode 100644
index 733099041f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/golang.org/x/image/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/LICENSE
deleted file mode 100644
index 770c7672b4..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-mgo - MongoDB driver for Go
-
-Copyright (c) 2010-2013 - Gustavo Niemeyer <gustavo@niemeyer.net>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/bson/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/bson/LICENSE
deleted file mode 100644
index 890326017b..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/labix.org/v2/mgo/bson/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-BSON library for Go
-
-Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/react/LICENSE.txt b/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/react/LICENSE.txt
deleted file mode 100644
index 261eeb9e9f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/third_party/react/LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/github.com/hjfreyer/taglib-go/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/github.com/hjfreyer/taglib-go/LICENSE
deleted file mode 100644
index 37ec93a14f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/github.com/hjfreyer/taglib-go/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/golang.org/x/oauth2/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/golang.org/x/oauth2/LICENSE
deleted file mode 100644
index d02f24fd52..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/golang.org/x/oauth2/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The oauth2 Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
deleted file mode 100644
index de9c88cb65..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright (c) 2013 Joshua Tacoma
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/cloud/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/cloud/LICENSE
deleted file mode 100644
index a4c5efd822..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/cloud/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2014 Google Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/grpc/LICENSE b/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/grpc/LICENSE
deleted file mode 100644
index f4988b4507..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/grpc/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright 2014, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/grpc/PATENTS b/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/grpc/PATENTS
deleted file mode 100644
index 619f9dbfe6..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/camlistore/vendor/google.golang.org/grpc/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the GRPC project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of GRPC, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of GRPC.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of GRPC or any code incorporated within this
-implementation of GRPC constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of GRPC
-shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/LICENSE b/Godeps/_workspace/src/github.com/camlistore/go4/LICENSE
deleted file mode 100644
index 8f71f43fee..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/legal/legal.go b/Godeps/_workspace/src/github.com/camlistore/go4/legal/legal.go
deleted file mode 100644
index de9ae9c858..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/legal/legal.go
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2014 The Go4 Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package legal provides in-process storage for compiled-in licenses.
-package legal
-
-var licenses []string
-
-// RegisterLicense stores the license text.
-// It doesn't check whether the text was already present.
-func RegisterLicense(text string) {
-	licenses = append(licenses, text)
-	return
-}
-
-// Licenses returns a slice of the licenses.
-func Licenses() []string {
-	return licenses
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/lock/.gitignore b/Godeps/_workspace/src/github.com/camlistore/go4/lock/.gitignore
deleted file mode 100644
index b25c15b81f..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/lock/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock.go b/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock.go
deleted file mode 100644
index a9fb802de6..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock.go
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package lock is a file locking library.
-package lock
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"sync"
-)
-
-// Lock locks the given file, creating the file if necessary. If the
-// file already exists, it must have zero size or an error is returned.
-// The lock is an exclusive lock (a write lock), but locked files
-// should neither be read from nor written to. Such files should have
-// zero size and only exist to co-ordinate ownership across processes.
-//
-// A nil Closer is returned if an error occurred. Otherwise, close that
-// Closer to release the lock.
-//
-// On Linux, FreeBSD and OSX, a lock has the same semantics as fcntl(2)'s
-// advisory locks.  In particular, closing any other file descriptor for the
-// same file will release the lock prematurely.
-//
-// Attempting to lock a file that is already locked by the current process
-// has undefined behavior.
-//
-// On other operating systems, lock will fallback to using the presence and
-// content of a file named name + '.lock' to implement locking behavior.
-func Lock(name string) (io.Closer, error) {
-	abs, err := filepath.Abs(name)
-	if err != nil {
-		return nil, err
-	}
-	lockmu.Lock()
-	defer lockmu.Unlock()
-	if locked[abs] {
-		return nil, fmt.Errorf("file %q already locked", abs)
-	}
-
-	c, err := lockFn(abs)
-	if err != nil {
-		return nil, fmt.Errorf("cannot acquire lock: %v", err)
-	}
-	locked[abs] = true
-	return c, nil
-}
-
-var lockFn = lockPortable
-
-// lockPortable is a portable version not using fcntl. Doesn't handle crashes as gracefully,
-// since it can leave stale lock files.
-func lockPortable(name string) (io.Closer, error) {
-	fi, err := os.Stat(name)
-	if err == nil && fi.Size() > 0 {
-		st := portableLockStatus(name)
-		switch st {
-		case statusLocked:
-			return nil, fmt.Errorf("file %q already locked", name)
-		case statusStale:
-			os.Remove(name)
-		case statusInvalid:
-			return nil, fmt.Errorf("can't Lock file %q: has invalid contents", name)
-		}
-	}
-	f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_EXCL, 0666)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create lock file %s %v", name, err)
-	}
-	if err := json.NewEncoder(f).Encode(&pidLockMeta{OwnerPID: os.Getpid()}); err != nil {
-		return nil, fmt.Errorf("cannot write owner pid: %v", err)
-	}
-	return &unlocker{
-		f:        f,
-		abs:      name,
-		portable: true,
-	}, nil
-}
-
-type lockStatus int
-
-const (
-	statusInvalid lockStatus = iota
-	statusLocked
-	statusUnlocked
-	statusStale
-)
-
-type pidLockMeta struct {
-	OwnerPID int
-}
-
-func portableLockStatus(path string) lockStatus {
-	f, err := os.Open(path)
-	if err != nil {
-		return statusUnlocked
-	}
-	defer f.Close()
-	var meta pidLockMeta
-	if json.NewDecoder(f).Decode(&meta) != nil {
-		return statusInvalid
-	}
-	if meta.OwnerPID == 0 {
-		return statusInvalid
-	}
-	p, err := os.FindProcess(meta.OwnerPID)
-	if err != nil {
-		// e.g. on Windows
-		return statusStale
-	}
-	// On unix, os.FindProcess always is true, so we have to send
-	// it a signal to see if it's alive.
-	if signalZero != nil {
-		if p.Signal(signalZero) != nil {
-			return statusStale
-		}
-	}
-	return statusLocked
-}
-
-var signalZero os.Signal // nil or set by lock_sigzero.go
-
-var (
-	lockmu sync.Mutex
-	locked = map[string]bool{} // abs path -> true
-)
-
-type unlocker struct {
-	portable bool
-	f        *os.File
-	abs      string
-	// once guards the close method call.
-	once sync.Once
-	// err holds the error returned by Close.
-	err error
-}
-
-func (u *unlocker) Close() error {
-	u.once.Do(u.close)
-	return u.err
-}
-
-func (u *unlocker) close() {
-	lockmu.Lock()
-	defer lockmu.Unlock()
-	delete(locked, u.abs)
-
-	if u.portable {
-		// In the portable lock implementation, it's
-		// important to close before removing because
-		// Windows won't allow us to remove an open
-		// file.
-		if err := u.f.Close(); err != nil {
-			u.err = err
-		}
-		if err := os.Remove(u.abs); err != nil {
-			// Note that if both Close and Remove fail,
-			// we care more about the latter than the former
-			// so we'll return that error.
-			u.err = err
-		}
-		return
-	}
-	// In other implementatioons, it's nice for us to clean up.
-	// If we do do this, though, it needs to be before the
-	// u.f.Close below.
-	os.Remove(u.abs)
-	u.err = u.f.Close()
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_appengine.go b/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_appengine.go
deleted file mode 100644
index ab4cad6ab6..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_appengine.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// +build appengine
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
-	"errors"
-	"io"
-)
-
-func init() {
-	lockFn = lockAppEngine
-}
-
-func lockAppEngine(name string) (io.Closer, error) {
-	return nil, errors.New("Lock not available on App Engine")
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_darwin_amd64.go b/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_darwin_amd64.go
deleted file mode 100644
index 35f5787bae..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_darwin_amd64.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// +build darwin,amd64
-// +build !appengine
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-func init() {
-	lockFn = lockFcntl
-}
-
-func lockFcntl(name string) (io.Closer, error) {
-	fi, err := os.Stat(name)
-	if err == nil && fi.Size() > 0 {
-		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
-	}
-
-	f, err := os.Create(name)
-	if err != nil {
-		return nil, fmt.Errorf("Lock Create of %s failed: %v", name, err)
-	}
-
-	// This type matches C's "struct flock" defined in /usr/include/sys/fcntl.h.
-	// TODO: move this into the standard syscall package.
-	k := struct {
-		Start  uint64 // sizeof(off_t): 8
-		Len    uint64 // sizeof(off_t): 8
-		Pid    uint32 // sizeof(pid_t): 4
-		Type   uint16 // sizeof(short): 2
-		Whence uint16 // sizeof(short): 2
-	}{
-		Type:   syscall.F_WRLCK,
-		Whence: uint16(os.SEEK_SET),
-		Start:  0,
-		Len:    0, // 0 means to lock the entire file.
-		Pid:    uint32(os.Getpid()),
-	}
-
-	_, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k)))
-	if errno != 0 {
-		f.Close()
-		return nil, errno
-	}
-	return &unlocker{f: f, abs: name}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_freebsd.go b/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_freebsd.go
deleted file mode 100644
index ee2767a0a6..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_freebsd.go
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-func init() {
-	lockFn = lockFcntl
-}
-
-func lockFcntl(name string) (io.Closer, error) {
-	fi, err := os.Stat(name)
-	if err == nil && fi.Size() > 0 {
-		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
-	}
-
-	f, err := os.Create(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// This type matches C's "struct flock" defined in /usr/include/fcntl.h.
-	// TODO: move this into the standard syscall package.
-	k := struct {
-		Start  int64 /* off_t starting offset */
-		Len    int64 /* off_t len = 0 means until end of file */
-		Pid    int32 /* pid_t lock owner */
-		Type   int16 /* short lock type: read/write, etc. */
-		Whence int16 /* short type of l_start */
-		Sysid  int32 /* int   remote system id or zero for local */
-	}{
-		Start:  0,
-		Len:    0, // 0 means to lock the entire file.
-		Pid:    int32(os.Getpid()),
-		Type:   syscall.F_WRLCK,
-		Whence: int16(os.SEEK_SET),
-		Sysid:  0,
-	}
-
-	_, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k)))
-	if errno != 0 {
-		f.Close()
-		return nil, errno
-	}
-	return &unlocker{f: f, abs: name}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_linux_amd64.go b/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_linux_amd64.go
deleted file mode 100644
index 08b3aae921..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_linux_amd64.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// +build linux,amd64
-// +build !appengine
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-func init() {
-	lockFn = lockFcntl
-}
-
-func lockFcntl(name string) (io.Closer, error) {
-	fi, err := os.Stat(name)
-	if err == nil && fi.Size() > 0 {
-		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
-	}
-
-	f, err := os.Create(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// This type matches C's "struct flock" defined in /usr/include/bits/fcntl.h.
-	// TODO: move this into the standard syscall package.
-	k := struct {
-		Type   uint32
-		Whence uint32
-		Start  uint64
-		Len    uint64
-		Pid    uint32
-	}{
-		Type:   syscall.F_WRLCK,
-		Whence: uint32(os.SEEK_SET),
-		Start:  0,
-		Len:    0, // 0 means to lock the entire file.
-		Pid:    uint32(os.Getpid()),
-	}
-
-	_, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k)))
-	if errno != 0 {
-		f.Close()
-		return nil, errno
-	}
-	return &unlocker{f: f, abs: name}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_linux_arm.go b/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_linux_arm.go
deleted file mode 100644
index ebf87bd3e7..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_linux_arm.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// +build linux,arm
-// +build !appengine
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-func init() {
-	lockFn = lockFcntl
-}
-
-func lockFcntl(name string) (io.Closer, error) {
-	fi, err := os.Stat(name)
-	if err == nil && fi.Size() > 0 {
-		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
-	}
-
-	f, err := os.Create(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// This type matches C's "struct flock" defined in /usr/include/bits/fcntl.h.
-	// TODO: move this into the standard syscall package.
-	k := struct {
-		Type   uint16
-		Whence uint16
-		Start  uint32
-		Len    uint32
-		Pid    uint32
-	}{
-		Type:   syscall.F_WRLCK,
-		Whence: uint16(os.SEEK_SET),
-		Start:  0,
-		Len:    0, // 0 means to lock the entire file.
-		Pid:    uint32(os.Getpid()),
-	}
-
-	const F_SETLK = 6 // actual value. syscall package is wrong: golang.org/issue/7059
-	_, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(F_SETLK), uintptr(unsafe.Pointer(&k)))
-	if errno != 0 {
-		f.Close()
-		return nil, errno
-	}
-	return &unlocker{f: f, abs: name}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_plan9.go b/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_plan9.go
deleted file mode 100644
index d841c27d70..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_plan9.go
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
-	"fmt"
-	"io"
-	"os"
-)
-
-func init() {
-	lockFn = lockPlan9
-}
-
-func lockPlan9(name string) (io.Closer, error) {
-	fi, err := os.Stat(name)
-	if err == nil && fi.Size() > 0 {
-		return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
-	}
-
-	f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE, os.ModeExclusive|0644)
-	if err != nil {
-		return nil, fmt.Errorf("Lock Create of %s failed: %v", name, err)
-	}
-
-	return &unlocker{f: f, abs: name}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_sigzero.go b/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_sigzero.go
deleted file mode 100644
index fd3ba2db19..0000000000
--- a/Godeps/_workspace/src/github.com/camlistore/go4/lock/lock_sigzero.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// +build !appengine
-// +build linux darwin freebsd openbsd netbsd dragonfly
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import "syscall"
-
-func init() {
-	signalZero = syscall.Signal(0)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/LICENSE b/Godeps/_workspace/src/github.com/containernetworking/cni/LICENSE
deleted file mode 100644
index 8f71f43fee..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/args.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/args.go
deleted file mode 100644
index be28ba621f..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/args.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"os"
-	"strings"
-)
-
-type CNIArgs interface {
-	// For use with os/exec; i.e., return nil to inherit the
-	// environment from this process
-	AsEnv() []string
-}
-
-type inherited struct{}
-
-var inheritArgsFromEnv inherited
-
-func (_ *inherited) AsEnv() []string {
-	return nil
-}
-
-func ArgsFromEnv() CNIArgs {
-	return &inheritArgsFromEnv
-}
-
-type Args struct {
-	Command       string
-	ContainerID   string
-	NetNS         string
-	PluginArgs    [][2]string
-	PluginArgsStr string
-	IfName        string
-	Path          string
-}
-
-func (args *Args) AsEnv() []string {
-	env := os.Environ()
-	pluginArgsStr := args.PluginArgsStr
-	if pluginArgsStr == "" {
-		pluginArgsStr = stringify(args.PluginArgs)
-	}
-
-	env = append(env,
-		"CNI_COMMAND="+args.Command,
-		"CNI_CONTAINERID="+args.ContainerID,
-		"CNI_NETNS="+args.NetNS,
-		"CNI_ARGS="+pluginArgsStr,
-		"CNI_IFNAME="+args.IfName,
-		"CNI_PATH="+args.Path)
-	return env
-}
-
-// taken from rkt/networking/net_plugin.go
-func stringify(pluginArgs [][2]string) string {
-	entries := make([]string, len(pluginArgs))
-
-	for i, kv := range pluginArgs {
-		entries[i] = strings.Join(kv[:], "=")
-	}
-
-	return strings.Join(entries, ";")
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/delegate.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/delegate.go
deleted file mode 100644
index ddf1d17274..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/delegate.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2016 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-func DelegateAdd(delegatePlugin string, netconf []byte) (*types.Result, error) {
-	if os.Getenv("CNI_COMMAND") != "ADD" {
-		return nil, fmt.Errorf("CNI_COMMAND is not ADD")
-	}
-
-	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
-
-	pluginPath, err := FindInPath(delegatePlugin, paths)
-	if err != nil {
-		return nil, err
-	}
-
-	return ExecPluginWithResult(pluginPath, netconf, ArgsFromEnv())
-}
-
-func DelegateDel(delegatePlugin string, netconf []byte) error {
-	if os.Getenv("CNI_COMMAND") != "DEL" {
-		return fmt.Errorf("CNI_COMMAND is not DEL")
-	}
-
-	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
-
-	pluginPath, err := FindInPath(delegatePlugin, paths)
-	if err != nil {
-		return err
-	}
-
-	return ExecPluginWithoutResult(pluginPath, netconf, ArgsFromEnv())
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/exec.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/exec.go
deleted file mode 100644
index a85eede66a..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/exec.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"os"
-	"os/exec"
-
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-func pluginErr(err error, output []byte) error {
-	if _, ok := err.(*exec.ExitError); ok {
-		emsg := types.Error{}
-		if perr := json.Unmarshal(output, &emsg); perr != nil {
-			return fmt.Errorf("netplugin failed but error parsing its diagnostic message %q: %v", string(output), perr)
-		}
-		details := ""
-		if emsg.Details != "" {
-			details = fmt.Sprintf("; %v", emsg.Details)
-		}
-		return fmt.Errorf("%v%v", emsg.Msg, details)
-	}
-
-	return err
-}
-
-func ExecPluginWithResult(pluginPath string, netconf []byte, args CNIArgs) (*types.Result, error) {
-	stdoutBytes, err := execPlugin(pluginPath, netconf, args)
-	if err != nil {
-		return nil, err
-	}
-
-	res := &types.Result{}
-	err = json.Unmarshal(stdoutBytes, res)
-	return res, err
-}
-
-func ExecPluginWithoutResult(pluginPath string, netconf []byte, args CNIArgs) error {
-	_, err := execPlugin(pluginPath, netconf, args)
-	return err
-}
-
-func execPlugin(pluginPath string, netconf []byte, args CNIArgs) ([]byte, error) {
-	stdout := &bytes.Buffer{}
-
-	c := exec.Cmd{
-		Env:    args.AsEnv(),
-		Path:   pluginPath,
-		Args:   []string{pluginPath},
-		Stdin:  bytes.NewBuffer(netconf),
-		Stdout: stdout,
-		Stderr: os.Stderr,
-	}
-	if err := c.Run(); err != nil {
-		return nil, pluginErr(err, stdout.Bytes())
-	}
-
-	return stdout.Bytes(), nil
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/find.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/find.go
deleted file mode 100644
index 3b03790711..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/invoke/find.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-)
-
-// FindInPath returns the full path of the plugin by searching in the provided path
-func FindInPath(plugin string, paths []string) (string, error) {
-	if plugin == "" {
-		return "", fmt.Errorf("no plugin name provided")
-	}
-
-	if len(paths) == 0 {
-		return "", fmt.Errorf("no paths provided")
-	}
-
-	var fullpath string
-	for _, path := range paths {
-		full := filepath.Join(path, plugin)
-		if fi, err := os.Stat(full); err == nil && fi.Mode().IsRegular() {
-			fullpath = full
-			break
-		}
-	}
-
-	if fullpath == "" {
-		return "", fmt.Errorf("failed to find plugin %q in path %s", plugin, paths)
-	}
-
-	return fullpath, nil
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/cidr.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/cidr.go
deleted file mode 100644
index dae2c4d0e4..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/cidr.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"math/big"
-	"net"
-)
-
-// NextIP returns IP incremented by 1
-func NextIP(ip net.IP) net.IP {
-	i := ipToInt(ip)
-	return intToIP(i.Add(i, big.NewInt(1)))
-}
-
-// PrevIP returns IP decremented by 1
-func PrevIP(ip net.IP) net.IP {
-	i := ipToInt(ip)
-	return intToIP(i.Sub(i, big.NewInt(1)))
-}
-
-func ipToInt(ip net.IP) *big.Int {
-	if v := ip.To4(); v != nil {
-		return big.NewInt(0).SetBytes(v)
-	}
-	return big.NewInt(0).SetBytes(ip.To16())
-}
-
-func intToIP(i *big.Int) net.IP {
-	return net.IP(i.Bytes())
-}
-
-// Network masks off the host portion of the IP
-func Network(ipn *net.IPNet) *net.IPNet {
-	return &net.IPNet{
-		IP:   ipn.IP.Mask(ipn.Mask),
-		Mask: ipn.Mask,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipforward.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipforward.go
deleted file mode 100644
index 77ee74632a..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipforward.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"io/ioutil"
-)
-
-func EnableIP4Forward() error {
-	return echo1("/proc/sys/net/ipv4/ip_forward")
-}
-
-func EnableIP6Forward() error {
-	return echo1("/proc/sys/net/ipv6/conf/all/forwarding")
-}
-
-func echo1(f string) error {
-	return ioutil.WriteFile(f, []byte("1"), 0644)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipmasq.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipmasq.go
deleted file mode 100644
index 8ee279717a..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/ipmasq.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/coreos/go-iptables/iptables"
-)
-
-// SetupIPMasq installs iptables rules to masquerade traffic
-// coming from ipn and going outside of it
-func SetupIPMasq(ipn *net.IPNet, chain string, comment string) error {
-	ipt, err := iptables.New()
-	if err != nil {
-		return fmt.Errorf("failed to locate iptables: %v", err)
-	}
-
-	if err = ipt.NewChain("nat", chain); err != nil {
-		if err.(*iptables.Error).ExitStatus() != 1 {
-			// TODO(eyakubovich): assumes exit status 1 implies chain exists
-			return err
-		}
-	}
-
-	if err = ipt.AppendUnique("nat", chain, "-d", ipn.String(), "-j", "ACCEPT", "-m", "comment", "--comment", comment); err != nil {
-		return err
-	}
-
-	if err = ipt.AppendUnique("nat", chain, "!", "-d", "224.0.0.0/4", "-j", "MASQUERADE", "-m", "comment", "--comment", comment); err != nil {
-		return err
-	}
-
-	return ipt.AppendUnique("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment)
-}
-
-// TeardownIPMasq undoes the effects of SetupIPMasq
-func TeardownIPMasq(ipn *net.IPNet, chain string, comment string) error {
-	ipt, err := iptables.New()
-	if err != nil {
-		return fmt.Errorf("failed to locate iptables: %v", err)
-	}
-
-	if err = ipt.Delete("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment); err != nil {
-		return err
-	}
-
-	if err = ipt.ClearChain("nat", chain); err != nil {
-		return err
-	}
-
-	return ipt.DeleteChain("nat", chain)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/link.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/link.go
deleted file mode 100644
index 1b78567201..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/link.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"crypto/rand"
-	"fmt"
-	"net"
-	"os"
-
-	"github.com/containernetworking/cni/pkg/ns"
-	"github.com/vishvananda/netlink"
-)
-
-func makeVethPair(name, peer string, mtu int) (netlink.Link, error) {
-	veth := &netlink.Veth{
-		LinkAttrs: netlink.LinkAttrs{
-			Name:  name,
-			Flags: net.FlagUp,
-			MTU:   mtu,
-		},
-		PeerName: peer,
-	}
-	if err := netlink.LinkAdd(veth); err != nil {
-		return nil, err
-	}
-
-	return veth, nil
-}
-
-func makeVeth(name string, mtu int) (peerName string, veth netlink.Link, err error) {
-	for i := 0; i < 10; i++ {
-		peerName, err = RandomVethName()
-		if err != nil {
-			return
-		}
-
-		veth, err = makeVethPair(name, peerName, mtu)
-		switch {
-		case err == nil:
-			return
-
-		case os.IsExist(err):
-			continue
-
-		default:
-			err = fmt.Errorf("failed to make veth pair: %v", err)
-			return
-		}
-	}
-
-	// should really never be hit
-	err = fmt.Errorf("failed to find a unique veth name")
-	return
-}
-
-// RandomVethName returns string "veth" with random prefix (hashed from entropy)
-func RandomVethName() (string, error) {
-	entropy := make([]byte, 4)
-	_, err := rand.Reader.Read(entropy)
-	if err != nil {
-		return "", fmt.Errorf("failed to generate random veth name: %v", err)
-	}
-
-	// NetworkManager (recent versions) will ignore veth devices that start with "veth"
-	return fmt.Sprintf("veth%x", entropy), nil
-}
-
-// SetupVeth sets up a virtual ethernet link.
-// Should be in container netns, and will switch back to hostNS to set the host
-// veth end up.
-func SetupVeth(contVethName string, mtu int, hostNS ns.NetNS) (hostVeth, contVeth netlink.Link, err error) {
-	var hostVethName string
-	hostVethName, contVeth, err = makeVeth(contVethName, mtu)
-	if err != nil {
-		return
-	}
-
-	if err = netlink.LinkSetUp(contVeth); err != nil {
-		err = fmt.Errorf("failed to set %q up: %v", contVethName, err)
-		return
-	}
-
-	hostVeth, err = netlink.LinkByName(hostVethName)
-	if err != nil {
-		err = fmt.Errorf("failed to lookup %q: %v", hostVethName, err)
-		return
-	}
-
-	if err = netlink.LinkSetNsFd(hostVeth, int(hostNS.Fd())); err != nil {
-		err = fmt.Errorf("failed to move veth to host netns: %v", err)
-		return
-	}
-
-	err = hostNS.Do(func(_ ns.NetNS) error {
-		hostVeth, err := netlink.LinkByName(hostVethName)
-		if err != nil {
-			return fmt.Errorf("failed to lookup %q in %q: %v", hostVethName, hostNS.Path(), err)
-		}
-
-		if err = netlink.LinkSetUp(hostVeth); err != nil {
-			return fmt.Errorf("failed to set %q up: %v", hostVethName, err)
-		}
-		return nil
-	})
-	return
-}
-
-// DelLinkByName removes an interface link.
-func DelLinkByName(ifName string) error {
-	iface, err := netlink.LinkByName(ifName)
-	if err != nil {
-		return fmt.Errorf("failed to lookup %q: %v", ifName, err)
-	}
-
-	if err = netlink.LinkDel(iface); err != nil {
-		return fmt.Errorf("failed to delete %q: %v", ifName, err)
-	}
-
-	return nil
-}
-
-// DelLinkByNameAddr remove an interface returns its IP address
-// of the specified family
-func DelLinkByNameAddr(ifName string, family int) (*net.IPNet, error) {
-	iface, err := netlink.LinkByName(ifName)
-	if err != nil {
-		return nil, fmt.Errorf("failed to lookup %q: %v", ifName, err)
-	}
-
-	addrs, err := netlink.AddrList(iface, family)
-	if err != nil || len(addrs) == 0 {
-		return nil, fmt.Errorf("failed to get IP addresses for %q: %v", ifName, err)
-	}
-
-	if err = netlink.LinkDel(iface); err != nil {
-		return nil, fmt.Errorf("failed to delete %q: %v", ifName, err)
-	}
-
-	return addrs[0].IPNet, nil
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/route.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/route.go
deleted file mode 100644
index 6c8658b2a2..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ip/route.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"net"
-
-	"github.com/vishvananda/netlink"
-)
-
-// AddDefaultRoute sets the default route on the given gateway.
-func AddDefaultRoute(gw net.IP, dev netlink.Link) error {
-	_, defNet, _ := net.ParseCIDR("0.0.0.0/0")
-	return AddRoute(defNet, gw, dev)
-}
-
-// AddRoute adds a universally-scoped route to a device.
-func AddRoute(ipn *net.IPNet, gw net.IP, dev netlink.Link) error {
-	return netlink.RouteAdd(&netlink.Route{
-		LinkIndex: dev.Attrs().Index,
-		Scope:     netlink.SCOPE_UNIVERSE,
-		Dst:       ipn,
-		Gw:        gw,
-	})
-}
-
-// AddHostRoute adds a host-scoped route to a device.
-func AddHostRoute(ipn *net.IPNet, gw net.IP, dev netlink.Link) error {
-	return netlink.RouteAdd(&netlink.Route{
-		LinkIndex: dev.Attrs().Index,
-		Scope:     netlink.SCOPE_HOST,
-		Dst:       ipn,
-		Gw:        gw,
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ipam/ipam.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ipam/ipam.go
deleted file mode 100644
index d9fbff74c7..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ipam/ipam.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ipam
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/containernetworking/cni/pkg/invoke"
-	"github.com/containernetworking/cni/pkg/ip"
-	"github.com/containernetworking/cni/pkg/types"
-
-	"github.com/vishvananda/netlink"
-)
-
-func ExecAdd(plugin string, netconf []byte) (*types.Result, error) {
-	return invoke.DelegateAdd(plugin, netconf)
-}
-
-func ExecDel(plugin string, netconf []byte) error {
-	return invoke.DelegateDel(plugin, netconf)
-}
-
-// ConfigureIface takes the result of IPAM plugin and
-// applies to the ifName interface
-func ConfigureIface(ifName string, res *types.Result) error {
-	link, err := netlink.LinkByName(ifName)
-	if err != nil {
-		return fmt.Errorf("failed to lookup %q: %v", ifName, err)
-	}
-
-	if err := netlink.LinkSetUp(link); err != nil {
-		return fmt.Errorf("failed to set %q UP: %v", ifName, err)
-	}
-
-	// TODO(eyakubovich): IPv6
-	addr := &netlink.Addr{IPNet: &res.IP4.IP, Label: ""}
-	if err = netlink.AddrAdd(link, addr); err != nil {
-		return fmt.Errorf("failed to add IP addr to %q: %v", ifName, err)
-	}
-
-	for _, r := range res.IP4.Routes {
-		gw := r.GW
-		if gw == nil {
-			gw = res.IP4.Gateway
-		}
-		if err = ip.AddRoute(&r.Dst, gw, link); err != nil {
-			// we skip over duplicate routes as we assume the first one wins
-			if !os.IsExist(err) {
-				return fmt.Errorf("failed to add route '%v via %v dev %v': %v", r.Dst, gw, ifName, err)
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/README.md b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/README.md
deleted file mode 100644
index e7b20c2f9b..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-### Namespaces, Threads, and Go
-On Linux each OS thread can have a different network namespace.  Go's thread scheduling model switches goroutines between OS threads based on OS thread load and whether the goroutine would block other goroutines.  This can result in a goroutine switching network namespaces without notice and lead to errors in your code.
-
-### Namespace Switching
-Switching namespaces with the `ns.Set()` method is not recommended without additional strategies to prevent unexpected namespace changes when your goroutines switch OS threads.
-
-Go provides the `runtime.LockOSThread()` function to ensure a specific goroutine executes on its current OS thread and prevents any other goroutine from running in that thread until the locked one exits.  Careful usage of `LockOSThread()` and goroutines can provide good control over which network namespace a given goroutine executes in.
-
-For example, you cannot rely on the `ns.Set()` namespace being the current namespace after the `Set()` call unless you do two things.  First, the goroutine calling `Set()` must have previously called `LockOSThread()`.  Second, you must ensure `runtime.UnlockOSThread()` is not called somewhere in-between.  You also cannot rely on the initial network namespace remaining the current network namespace if any other code in your program switches namespaces, unless you have already called `LockOSThread()` in that goroutine.  Note that `LockOSThread()` prevents the Go scheduler from optimally scheduling goroutines for best performance, so `LockOSThread()` should only be used in small, isolated goroutines that release the lock quickly.
-
-### Do() The Recommended Thing
-The `ns.Do()` method provides control over network namespaces for you by implementing these strategies. All code dependent on a particular network namespace should be wrapped in the `ns.Do()` method to ensure the correct namespace is selected for the duration of your code.  For example:
-
-```go
-targetNs, err := ns.NewNS()
-if err != nil {
-    return err
-}
-err = targetNs.Do(func(hostNs ns.NetNS) error {
-	dummy := &netlink.Dummy{
-		LinkAttrs: netlink.LinkAttrs{
-			Name: "dummy0",
-		},
-	}
-	return netlink.LinkAdd(dummy)
-})
-```
-
-### Further Reading
- - https://github.com/golang/go/wiki/LockOSThread
- - http://morsmachine.dk/go-scheduler
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/ns.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/ns.go
deleted file mode 100644
index e29f712ce1..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/ns/ns.go
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ns
-
-import (
-	"crypto/rand"
-	"fmt"
-	"os"
-	"path"
-	"runtime"
-	"strings"
-	"sync"
-	"syscall"
-
-	"golang.org/x/sys/unix"
-)
-
-type NetNS interface {
-	// Executes the passed closure in this object's network namespace,
-	// attemtping to restore the original namespace before returning.
-	// However, since each OS thread can have a different network namespace,
-	// and Go's thread scheduling is highly variable, callers cannot
-	// guarantee any specific namespace is set unless operations that
-	// require that namespace are wrapped with Do().  Also, no code called
-	// from Do() should call runtime.UnlockOSThread(), or the risk
-	// of executing code in an incorrect namespace will be greater.  See
-	// https://github.com/golang/go/wiki/LockOSThread for further details.
-	Do(toRun func(NetNS) error) error
-
-	// Sets the current network namespace to this object's network namespace.
-	// Note that since Go's thread scheduling is highly variable, callers
-	// cannot guarantee the requested namespace will be the current namespace
-	// after this function is called; to ensure this wrap operations that
-	// require the namespace with Do() instead.
-	Set() error
-
-	// Returns the filesystem path representing this object's network namespace
-	Path() string
-
-	// Returns a file descriptor representing this object's network namespace
-	Fd() uintptr
-
-	// Cleans up this instance of the network namespace; if this instance
-	// is the last user the namespace will be destroyed
-	Close() error
-}
-
-type netNS struct {
-	file    *os.File
-	mounted bool
-	closed  bool
-}
-
-func getCurrentThreadNetNSPath() string {
-	// /proc/self/ns/net returns the namespace of the main thread, not
-	// of whatever thread this goroutine is running on.  Make sure we
-	// use the thread's net namespace since the thread is switching around
-	return fmt.Sprintf("/proc/%d/task/%d/ns/net", os.Getpid(), unix.Gettid())
-}
-
-// Returns an object representing the current OS thread's network namespace
-func GetCurrentNS() (NetNS, error) {
-	return GetNS(getCurrentThreadNetNSPath())
-}
-
-const (
-	// https://github.com/torvalds/linux/blob/master/include/uapi/linux/magic.h
-	NSFS_MAGIC   = 0x6e736673
-	PROCFS_MAGIC = 0x9fa0
-)
-
-type NSPathNotExistErr struct{ msg string }
-
-func (e NSPathNotExistErr) Error() string { return e.msg }
-
-type NSPathNotNSErr struct{ msg string }
-
-func (e NSPathNotNSErr) Error() string { return e.msg }
-
-func IsNSorErr(nspath string) error {
-	stat := syscall.Statfs_t{}
-	if err := syscall.Statfs(nspath, &stat); err != nil {
-		if os.IsNotExist(err) {
-			err = NSPathNotExistErr{msg: fmt.Sprintf("failed to Statfs %q: %v", nspath, err)}
-		} else {
-			err = fmt.Errorf("failed to Statfs %q: %v", nspath, err)
-		}
-		return err
-	}
-
-	switch stat.Type {
-	case PROCFS_MAGIC:
-		// Kernel < 3.19
-
-		validPathContent := "ns/"
-		validName := strings.Contains(nspath, validPathContent)
-		if !validName {
-			return NSPathNotNSErr{msg: fmt.Sprintf("path %q doesn't contain %q", nspath, validPathContent)}
-		}
-
-		return nil
-	case NSFS_MAGIC:
-		// Kernel >= 3.19
-
-		return nil
-	default:
-		return NSPathNotNSErr{msg: fmt.Sprintf("unknown FS magic on %q: %x", nspath, stat.Type)}
-	}
-}
-
-// Returns an object representing the namespace referred to by @path
-func GetNS(nspath string) (NetNS, error) {
-	err := IsNSorErr(nspath)
-	if err != nil {
-		return nil, err
-	}
-
-	fd, err := os.Open(nspath)
-	if err != nil {
-		return nil, err
-	}
-
-	return &netNS{file: fd}, nil
-}
-
-// Creates a new persistent network namespace and returns an object
-// representing that namespace, without switching to it
-func NewNS() (NetNS, error) {
-	const nsRunDir = "/var/run/netns"
-
-	b := make([]byte, 16)
-	_, err := rand.Reader.Read(b)
-	if err != nil {
-		return nil, fmt.Errorf("failed to generate random netns name: %v", err)
-	}
-
-	err = os.MkdirAll(nsRunDir, 0755)
-	if err != nil {
-		return nil, err
-	}
-
-	// create an empty file at the mount point
-	nsName := fmt.Sprintf("cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
-	nsPath := path.Join(nsRunDir, nsName)
-	mountPointFd, err := os.Create(nsPath)
-	if err != nil {
-		return nil, err
-	}
-	mountPointFd.Close()
-
-	// Ensure the mount point is cleaned up on errors; if the namespace
-	// was successfully mounted this will have no effect because the file
-	// is in-use
-	defer os.RemoveAll(nsPath)
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	// do namespace work in a dedicated goroutine, so that we can safely
-	// Lock/Unlock OSThread without upsetting the lock/unlock state of
-	// the caller of this function
-	var fd *os.File
-	go (func() {
-		defer wg.Done()
-		runtime.LockOSThread()
-
-		var origNS NetNS
-		origNS, err = GetNS(getCurrentThreadNetNSPath())
-		if err != nil {
-			return
-		}
-		defer origNS.Close()
-
-		// create a new netns on the current thread
-		err = unix.Unshare(unix.CLONE_NEWNET)
-		if err != nil {
-			return
-		}
-		defer origNS.Set()
-
-		// bind mount the new netns from the current thread onto the mount point
-		err = unix.Mount(getCurrentThreadNetNSPath(), nsPath, "none", unix.MS_BIND, "")
-		if err != nil {
-			return
-		}
-
-		fd, err = os.Open(nsPath)
-		if err != nil {
-			return
-		}
-	})()
-	wg.Wait()
-
-	if err != nil {
-		unix.Unmount(nsPath, unix.MNT_DETACH)
-		return nil, fmt.Errorf("failed to create namespace: %v", err)
-	}
-
-	return &netNS{file: fd, mounted: true}, nil
-}
-
-func (ns *netNS) Path() string {
-	return ns.file.Name()
-}
-
-func (ns *netNS) Fd() uintptr {
-	return ns.file.Fd()
-}
-
-func (ns *netNS) errorIfClosed() error {
-	if ns.closed {
-		return fmt.Errorf("%q has already been closed", ns.file.Name())
-	}
-	return nil
-}
-
-func (ns *netNS) Close() error {
-	if err := ns.errorIfClosed(); err != nil {
-		return err
-	}
-
-	if err := ns.file.Close(); err != nil {
-		return fmt.Errorf("Failed to close %q: %v", ns.file.Name(), err)
-	}
-	ns.closed = true
-
-	if ns.mounted {
-		if err := unix.Unmount(ns.file.Name(), unix.MNT_DETACH); err != nil {
-			return fmt.Errorf("Failed to unmount namespace %s: %v", ns.file.Name(), err)
-		}
-		if err := os.RemoveAll(ns.file.Name()); err != nil {
-			return fmt.Errorf("Failed to clean up namespace %s: %v", ns.file.Name(), err)
-		}
-		ns.mounted = false
-	}
-
-	return nil
-}
-
-func (ns *netNS) Do(toRun func(NetNS) error) error {
-	if err := ns.errorIfClosed(); err != nil {
-		return err
-	}
-
-	containedCall := func(hostNS NetNS) error {
-		threadNS, err := GetNS(getCurrentThreadNetNSPath())
-		if err != nil {
-			return fmt.Errorf("failed to open current netns: %v", err)
-		}
-		defer threadNS.Close()
-
-		// switch to target namespace
-		if err = ns.Set(); err != nil {
-			return fmt.Errorf("error switching to ns %v: %v", ns.file.Name(), err)
-		}
-		defer threadNS.Set() // switch back
-
-		return toRun(hostNS)
-	}
-
-	// save a handle to current network namespace
-	hostNS, err := GetNS(getCurrentThreadNetNSPath())
-	if err != nil {
-		return fmt.Errorf("Failed to open current namespace: %v", err)
-	}
-	defer hostNS.Close()
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	var innerError error
-	go func() {
-		defer wg.Done()
-		runtime.LockOSThread()
-		innerError = containedCall(hostNS)
-	}()
-	wg.Wait()
-
-	return innerError
-}
-
-func (ns *netNS) Set() error {
-	if err := ns.errorIfClosed(); err != nil {
-		return err
-	}
-
-	if _, _, err := unix.Syscall(unix.SYS_SETNS, ns.Fd(), uintptr(unix.CLONE_NEWNET), 0); err != 0 {
-		return fmt.Errorf("Error switching to ns %v: %v", ns.file.Name(), err)
-	}
-
-	return nil
-}
-
-// WithNetNSPath executes the passed closure under the given network
-// namespace, restoring the original namespace afterwards.
-func WithNetNSPath(nspath string, toRun func(NetNS) error) error {
-	ns, err := GetNS(nspath)
-	if err != nil {
-		return err
-	}
-	defer ns.Close()
-	return ns.Do(toRun)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/skel/skel.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/skel/skel.go
deleted file mode 100644
index 9cf03917b4..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/skel/skel.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2014 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package skel provides skeleton code for a CNI plugin.
-// In particular, it implements argument parsing and validation.
-package skel
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-// CmdArgs captures all the arguments passed in to the plugin
-// via both env vars and stdin
-type CmdArgs struct {
-	ContainerID string
-	Netns       string
-	IfName      string
-	Args        string
-	Path        string
-	StdinData   []byte
-}
-
-type reqForCmdEntry map[string]bool
-
-// PluginMain is the "main" for a plugin. It accepts
-// two callback functions for add and del commands.
-func PluginMain(cmdAdd, cmdDel func(_ *CmdArgs) error) {
-	var cmd, contID, netns, ifName, args, path string
-
-	vars := []struct {
-		name      string
-		val       *string
-		reqForCmd reqForCmdEntry
-	}{
-		{
-			"CNI_COMMAND",
-			&cmd,
-			reqForCmdEntry{
-				"ADD": true,
-				"DEL": true,
-			},
-		},
-		{
-			"CNI_CONTAINERID",
-			&contID,
-			reqForCmdEntry{
-				"ADD": false,
-				"DEL": false,
-			},
-		},
-		{
-			"CNI_NETNS",
-			&netns,
-			reqForCmdEntry{
-				"ADD": true,
-				"DEL": false,
-			},
-		},
-		{
-			"CNI_IFNAME",
-			&ifName,
-			reqForCmdEntry{
-				"ADD": true,
-				"DEL": true,
-			},
-		},
-		{
-			"CNI_ARGS",
-			&args,
-			reqForCmdEntry{
-				"ADD": false,
-				"DEL": false,
-			},
-		},
-		{
-			"CNI_PATH",
-			&path,
-			reqForCmdEntry{
-				"ADD": true,
-				"DEL": true,
-			},
-		},
-	}
-
-	argsMissing := false
-	for _, v := range vars {
-		*v.val = os.Getenv(v.name)
-		if v.reqForCmd[cmd] && *v.val == "" {
-			log.Printf("%v env variable missing", v.name)
-			argsMissing = true
-		}
-	}
-
-	if argsMissing {
-		dieMsg("required env variables missing")
-	}
-
-	stdinData, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		dieMsg("error reading from stdin: %v", err)
-	}
-
-	cmdArgs := &CmdArgs{
-		ContainerID: contID,
-		Netns:       netns,
-		IfName:      ifName,
-		Args:        args,
-		Path:        path,
-		StdinData:   stdinData,
-	}
-
-	switch cmd {
-	case "ADD":
-		err = cmdAdd(cmdArgs)
-
-	case "DEL":
-		err = cmdDel(cmdArgs)
-
-	default:
-		dieMsg("unknown CNI_COMMAND: %v", cmd)
-	}
-
-	if err != nil {
-		if e, ok := err.(*types.Error); ok {
-			// don't wrap Error in Error
-			dieErr(e)
-		}
-		dieMsg(err.Error())
-	}
-}
-
-func dieMsg(f string, args ...interface{}) {
-	e := &types.Error{
-		Code: 100,
-		Msg:  fmt.Sprintf(f, args...),
-	}
-	dieErr(e)
-}
-
-func dieErr(e *types.Error) {
-	if err := e.Print(); err != nil {
-		log.Print("Error writing error JSON to stdout: ", err)
-	}
-	os.Exit(1)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/testutils/cmd.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/testutils/cmd.go
deleted file mode 100644
index 201b935f40..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/testutils/cmd.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2016 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package testutils
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"os"
-
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-func envCleanup() {
-	os.Unsetenv("CNI_COMMAND")
-	os.Unsetenv("CNI_PATH")
-	os.Unsetenv("CNI_NETNS")
-	os.Unsetenv("CNI_IFNAME")
-}
-
-func CmdAddWithResult(cniNetns, cniIfname string, f func() error) (*types.Result, error) {
-	os.Setenv("CNI_COMMAND", "ADD")
-	os.Setenv("CNI_PATH", os.Getenv("PATH"))
-	os.Setenv("CNI_NETNS", cniNetns)
-	os.Setenv("CNI_IFNAME", cniIfname)
-	defer envCleanup()
-
-	// Redirect stdout to capture plugin result
-	oldStdout := os.Stdout
-	r, w, err := os.Pipe()
-	if err != nil {
-		return nil, err
-	}
-
-	os.Stdout = w
-	err = f()
-	w.Close()
-	if err != nil {
-		return nil, err
-	}
-
-	// parse the result
-	out, err := ioutil.ReadAll(r)
-	os.Stdout = oldStdout
-	if err != nil {
-		return nil, err
-	}
-
-	result := types.Result{}
-	err = json.Unmarshal(out, &result)
-	if err != nil {
-		return nil, err
-	}
-
-	return &result, nil
-}
-
-func CmdDelWithResult(cniNetns, cniIfname string, f func() error) error {
-	os.Setenv("CNI_COMMAND", "DEL")
-	os.Setenv("CNI_PATH", os.Getenv("PATH"))
-	os.Setenv("CNI_NETNS", cniNetns)
-	os.Setenv("CNI_IFNAME", cniIfname)
-	defer envCleanup()
-
-	return f()
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/args.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/args.go
deleted file mode 100644
index 3b667b0f20..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/args.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// UnmarshallableBool typedef for builtin bool
-// because builtin type's methods can't be declared
-type UnmarshallableBool bool
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface.
-// Returns boolean true if the string is "1" or "[Tt]rue"
-// Returns boolean false if the string is "0" or "[Ff]alse"
-func (b *UnmarshallableBool) UnmarshalText(data []byte) error {
-	s := strings.ToLower(string(data))
-	switch s {
-	case "1", "true":
-		*b = true
-	case "0", "false":
-		*b = false
-	default:
-		return fmt.Errorf("Boolean unmarshal error: invalid input %s", s)
-	}
-	return nil
-}
-
-// CommonArgs contains the IgnoreUnknown argument
-// and must be embedded by all Arg structs
-type CommonArgs struct {
-	IgnoreUnknown UnmarshallableBool `json:"ignoreunknown,omitempty"`
-}
-
-// GetKeyField is a helper function to receive Values
-// Values that represent a pointer to a struct
-func GetKeyField(keyString string, v reflect.Value) reflect.Value {
-	return v.Elem().FieldByName(keyString)
-}
-
-// LoadArgs parses args from a string in the form "K=V;K2=V2;..."
-func LoadArgs(args string, container interface{}) error {
-	if args == "" {
-		return nil
-	}
-
-	containerValue := reflect.ValueOf(container)
-
-	pairs := strings.Split(args, ";")
-	unknownArgs := []string{}
-	for _, pair := range pairs {
-		kv := strings.Split(pair, "=")
-		if len(kv) != 2 {
-			return fmt.Errorf("ARGS: invalid pair %q", pair)
-		}
-		keyString := kv[0]
-		valueString := kv[1]
-		keyField := GetKeyField(keyString, containerValue)
-		if !keyField.IsValid() {
-			unknownArgs = append(unknownArgs, pair)
-			continue
-		}
-
-		u := keyField.Addr().Interface().(encoding.TextUnmarshaler)
-		err := u.UnmarshalText([]byte(valueString))
-		if err != nil {
-			return fmt.Errorf("ARGS: error parsing value of pair %q: %v)", pair, err)
-		}
-	}
-
-	isIgnoreUnknown := GetKeyField("IgnoreUnknown", containerValue).Bool()
-	if len(unknownArgs) > 0 && !isIgnoreUnknown {
-		return fmt.Errorf("ARGS: unknown args %q", unknownArgs)
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/types.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/types.go
deleted file mode 100644
index 6948dcb1fb..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/types/types.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"os"
-)
-
-// like net.IPNet but adds JSON marshalling and unmarshalling
-type IPNet net.IPNet
-
-// ParseCIDR takes a string like "10.2.3.1/24" and
-// return IPNet with "10.2.3.1" and /24 mask
-func ParseCIDR(s string) (*net.IPNet, error) {
-	ip, ipn, err := net.ParseCIDR(s)
-	if err != nil {
-		return nil, err
-	}
-
-	ipn.IP = ip
-	return ipn, nil
-}
-
-func (n IPNet) MarshalJSON() ([]byte, error) {
-	return json.Marshal((*net.IPNet)(&n).String())
-}
-
-func (n *IPNet) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return err
-	}
-
-	tmp, err := ParseCIDR(s)
-	if err != nil {
-		return err
-	}
-
-	*n = IPNet(*tmp)
-	return nil
-}
-
-// NetConf describes a network.
-type NetConf struct {
-	Name string `json:"name,omitempty"`
-	Type string `json:"type,omitempty"`
-	IPAM struct {
-		Type string `json:"type,omitempty"`
-	} `json:"ipam,omitempty"`
-	DNS DNS `json:"dns"`
-}
-
-// Result is what gets returned from the plugin (via stdout) to the caller
-type Result struct {
-	IP4 *IPConfig `json:"ip4,omitempty"`
-	IP6 *IPConfig `json:"ip6,omitempty"`
-	DNS DNS       `json:"dns,omitempty"`
-}
-
-func (r *Result) Print() error {
-	return prettyPrint(r)
-}
-
-// String returns a formatted string in the form of "[IP4: $1,][ IP6: $2,] DNS: $3" where
-// $1 represents the receiver's IPv4, $2 represents the receiver's IPv6 and $3 the
-// receiver's DNS. If $1 or $2 are nil, they won't be present in the returned string.
-func (r *Result) String() string {
-	var str string
-	if r.IP4 != nil {
-		str = fmt.Sprintf("IP4:%+v, ", *r.IP4)
-	}
-	if r.IP6 != nil {
-		str += fmt.Sprintf("IP6:%+v, ", *r.IP6)
-	}
-	return fmt.Sprintf("%sDNS:%+v", str, r.DNS)
-}
-
-// IPConfig contains values necessary to configure an interface
-type IPConfig struct {
-	IP      net.IPNet
-	Gateway net.IP
-	Routes  []Route
-}
-
-// DNS contains values interesting for DNS resolvers
-type DNS struct {
-	Nameservers []string `json:"nameservers,omitempty"`
-	Domain      string   `json:"domain,omitempty"`
-	Search      []string `json:"search,omitempty"`
-	Options     []string `json:"options,omitempty"`
-}
-
-type Route struct {
-	Dst net.IPNet
-	GW  net.IP
-}
-
-type Error struct {
-	Code    uint   `json:"code"`
-	Msg     string `json:"msg"`
-	Details string `json:"details,omitempty"`
-}
-
-func (e *Error) Error() string {
-	return e.Msg
-}
-
-func (e *Error) Print() error {
-	return prettyPrint(e)
-}
-
-// net.IPNet is not JSON (un)marshallable so this duality is needed
-// for our custom IPNet type
-
-// JSON (un)marshallable types
-type ipConfig struct {
-	IP      IPNet   `json:"ip"`
-	Gateway net.IP  `json:"gateway,omitempty"`
-	Routes  []Route `json:"routes,omitempty"`
-}
-
-type route struct {
-	Dst IPNet  `json:"dst"`
-	GW  net.IP `json:"gw,omitempty"`
-}
-
-func (c *IPConfig) MarshalJSON() ([]byte, error) {
-	ipc := ipConfig{
-		IP:      IPNet(c.IP),
-		Gateway: c.Gateway,
-		Routes:  c.Routes,
-	}
-
-	return json.Marshal(ipc)
-}
-
-func (c *IPConfig) UnmarshalJSON(data []byte) error {
-	ipc := ipConfig{}
-	if err := json.Unmarshal(data, &ipc); err != nil {
-		return err
-	}
-
-	c.IP = net.IPNet(ipc.IP)
-	c.Gateway = ipc.Gateway
-	c.Routes = ipc.Routes
-	return nil
-}
-
-func (r *Route) UnmarshalJSON(data []byte) error {
-	rt := route{}
-	if err := json.Unmarshal(data, &rt); err != nil {
-		return err
-	}
-
-	r.Dst = net.IPNet(rt.Dst)
-	r.GW = rt.GW
-	return nil
-}
-
-func (r *Route) MarshalJSON() ([]byte, error) {
-	rt := route{
-		Dst: IPNet(r.Dst),
-		GW:  r.GW,
-	}
-
-	return json.Marshal(rt)
-}
-
-func prettyPrint(obj interface{}) error {
-	data, err := json.MarshalIndent(obj, "", "    ")
-	if err != nil {
-		return err
-	}
-	_, err = os.Stdout.Write(data)
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go
deleted file mode 100644
index c0fba38290..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/sysctl/sysctl_linux.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// build +linux
-
-package sysctl
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-	"strings"
-)
-
-// Sysctl provides a method to set/get values from /proc/sys - in linux systems
-// new interface to set/get values of variables formerly handled by sysctl syscall
-// If optional `params` have only one string value - this function will
-// set this value into coresponding sysctl variable
-func Sysctl(name string, params ...string) (string, error) {
-	if len(params) > 1 {
-		return "", fmt.Errorf("unexcepted additional parameters")
-	} else if len(params) == 1 {
-		return setSysctl(name, params[0])
-	}
-	return getSysctl(name)
-}
-
-func getSysctl(name string) (string, error) {
-	fullName := filepath.Join("/proc/sys", strings.Replace(name, ".", "/", -1))
-	fullName = filepath.Clean(fullName)
-	data, err := ioutil.ReadFile(fullName)
-	if err != nil {
-		return "", err
-	}
-
-	return string(data[:len(data)-1]), nil
-}
-
-func setSysctl(name, value string) (string, error) {
-	fullName := filepath.Join("/proc/sys", strings.Replace(name, ".", "/", -1))
-	fullName = filepath.Clean(fullName)
-	if err := ioutil.WriteFile(fullName, []byte(value), 0644); err != nil {
-		return "", err
-	}
-
-	return getSysctl(name)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/utils.go b/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/utils.go
deleted file mode 100644
index 33a2aa7960..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/pkg/utils/utils.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2016 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package utils
-
-import (
-	"crypto/sha512"
-	"fmt"
-)
-
-const (
-	maxChainLength = 28
-	chainPrefix    = "CNI-"
-	prefixLength   = len(chainPrefix)
-)
-
-// Generates a chain name to be used with iptables.
-// Ensures that the generated chain name is exactly
-// maxChainLength chars in length
-func FormatChainName(name string, id string) string {
-	chainBytes := sha512.Sum512([]byte(name + id))
-	chain := fmt.Sprintf("%s%x", chainPrefix, chainBytes)
-	return chain[:maxChainLength]
-}
-
-// FormatComment returns a comment used for easier
-// rule identification within iptables.
-func FormatComment(name string, id string) string {
-	return fmt.Sprintf("name: %q id: %q", name, id)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go
deleted file mode 100644
index 2386f9a9f4..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/daemon.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"log"
-	"net"
-	"net/http"
-	"net/rpc"
-	"os"
-	"path/filepath"
-	"runtime"
-	"sync"
-
-	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types"
-	"github.com/coreos/go-systemd/activation"
-)
-
-const listenFdsStart = 3
-const resendCount = 3
-
-var errNoMoreTries = errors.New("no more tries")
-
-type DHCP struct {
-	mux    sync.Mutex
-	leases map[string]*DHCPLease
-}
-
-func newDHCP() *DHCP {
-	return &DHCP{
-		leases: make(map[string]*DHCPLease),
-	}
-}
-
-// Allocate acquires an IP from a DHCP server for a specified container.
-// The acquired lease will be maintained until Release() is called.
-func (d *DHCP) Allocate(args *skel.CmdArgs, result *types.Result) error {
-	conf := types.NetConf{}
-	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
-		return fmt.Errorf("error parsing netconf: %v", err)
-	}
-
-	clientID := args.ContainerID + "/" + conf.Name
-	l, err := AcquireLease(clientID, args.Netns, args.IfName)
-	if err != nil {
-		return err
-	}
-
-	ipn, err := l.IPNet()
-	if err != nil {
-		l.Stop()
-		return err
-	}
-
-	d.setLease(args.ContainerID, conf.Name, l)
-
-	result.IP4 = &types.IPConfig{
-		IP:      *ipn,
-		Gateway: l.Gateway(),
-		Routes:  l.Routes(),
-	}
-
-	return nil
-}
-
-// Release stops maintenance of the lease acquired in Allocate()
-// and sends a release msg to the DHCP server.
-func (d *DHCP) Release(args *skel.CmdArgs, reply *struct{}) error {
-	conf := types.NetConf{}
-	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
-		return fmt.Errorf("error parsing netconf: %v", err)
-	}
-
-	if l := d.getLease(args.ContainerID, conf.Name); l != nil {
-		l.Stop()
-		return nil
-	}
-
-	return fmt.Errorf("lease not found: %v/%v", args.ContainerID, conf.Name)
-}
-
-func (d *DHCP) getLease(contID, netName string) *DHCPLease {
-	d.mux.Lock()
-	defer d.mux.Unlock()
-
-	// TODO(eyakubovich): hash it to avoid collisions
-	l, ok := d.leases[contID+netName]
-	if !ok {
-		return nil
-	}
-	return l
-}
-
-func (d *DHCP) setLease(contID, netName string, l *DHCPLease) {
-	d.mux.Lock()
-	defer d.mux.Unlock()
-
-	// TODO(eyakubovich): hash it to avoid collisions
-	d.leases[contID+netName] = l
-}
-
-func getListener() (net.Listener, error) {
-	l, err := activation.Listeners(true)
-	if err != nil {
-		return nil, err
-	}
-
-	switch {
-	case len(l) == 0:
-		if err := os.MkdirAll(filepath.Dir(socketPath), 0700); err != nil {
-			return nil, err
-		}
-		return net.Listen("unix", socketPath)
-
-	case len(l) == 1:
-		if l[0] == nil {
-			return nil, fmt.Errorf("LISTEN_FDS=1 but no FD found")
-		}
-		return l[0], nil
-
-	default:
-		return nil, fmt.Errorf("Too many (%v) FDs passed through socket activation", len(l))
-	}
-}
-
-func runDaemon() {
-	// since other goroutines (on separate threads) will change namespaces,
-	// ensure the RPC server does not get scheduled onto those
-	runtime.LockOSThread()
-
-	l, err := getListener()
-	if err != nil {
-		log.Printf("Error getting listener: %v", err)
-		return
-	}
-
-	dhcp := newDHCP()
-	rpc.Register(dhcp)
-	rpc.HandleHTTP()
-	http.Serve(l, nil)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go
deleted file mode 100644
index eb2b403130..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/lease.go
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"log"
-	"math/rand"
-	"net"
-	"sync"
-	"time"
-
-	"github.com/d2g/dhcp4"
-	"github.com/d2g/dhcp4client"
-	"github.com/vishvananda/netlink"
-
-	"github.com/containernetworking/cni/pkg/ns"
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-// RFC 2131 suggests using exponential backoff, starting with 4sec
-// and randomized to +/- 1sec
-const resendDelay0 = 4 * time.Second
-const resendDelayMax = 32 * time.Second
-
-const (
-	leaseStateBound = iota
-	leaseStateRenewing
-	leaseStateRebinding
-)
-
-// This implementation uses 1 OS thread per lease. This is because
-// all the network operations have to be done in network namespace
-// of the interface. This can be improved by switching to the proper
-// namespace for network ops and using fewer threads. However, this
-// needs to be done carefully as dhcp4client ops are blocking.
-
-type DHCPLease struct {
-	clientID      string
-	ack           *dhcp4.Packet
-	opts          dhcp4.Options
-	link          netlink.Link
-	renewalTime   time.Time
-	rebindingTime time.Time
-	expireTime    time.Time
-	stop          chan struct{}
-	wg            sync.WaitGroup
-}
-
-// AcquireLease gets an DHCP lease and then maintains it in the background
-// by periodically renewing it. The acquired lease can be released by
-// calling DHCPLease.Stop()
-func AcquireLease(clientID, netns, ifName string) (*DHCPLease, error) {
-	errCh := make(chan error, 1)
-	l := &DHCPLease{
-		clientID: clientID,
-		stop:     make(chan struct{}),
-	}
-
-	log.Printf("%v: acquiring lease", clientID)
-
-	l.wg.Add(1)
-	go func() {
-		errCh <- ns.WithNetNSPath(netns, func(_ ns.NetNS) error {
-			defer l.wg.Done()
-
-			link, err := netlink.LinkByName(ifName)
-			if err != nil {
-				return fmt.Errorf("error looking up %q: %v", ifName, err)
-			}
-
-			l.link = link
-
-			if err = l.acquire(); err != nil {
-				return err
-			}
-
-			log.Printf("%v: lease acquired, expiration is %v", l.clientID, l.expireTime)
-
-			errCh <- nil
-
-			l.maintain()
-			return nil
-		})
-	}()
-
-	if err := <-errCh; err != nil {
-		return nil, err
-	}
-
-	return l, nil
-}
-
-// Stop terminates the background task that maintains the lease
-// and issues a DHCP Release
-func (l *DHCPLease) Stop() {
-	close(l.stop)
-	l.wg.Wait()
-}
-
-func (l *DHCPLease) acquire() error {
-	c, err := newDHCPClient(l.link)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-
-	if (l.link.Attrs().Flags & net.FlagUp) != net.FlagUp {
-		log.Printf("Link %q down. Attempting to set up", l.link.Attrs().Name)
-		if err = netlink.LinkSetUp(l.link); err != nil {
-			return err
-		}
-	}
-
-	pkt, err := backoffRetry(func() (*dhcp4.Packet, error) {
-		ok, ack, err := c.Request()
-		switch {
-		case err != nil:
-			return nil, err
-		case !ok:
-			return nil, fmt.Errorf("DHCP server NACK'd own offer")
-		default:
-			return &ack, nil
-		}
-	})
-	if err != nil {
-		return err
-	}
-
-	return l.commit(pkt)
-}
-
-func (l *DHCPLease) commit(ack *dhcp4.Packet) error {
-	opts := ack.ParseOptions()
-
-	leaseTime, err := parseLeaseTime(opts)
-	if err != nil {
-		return err
-	}
-
-	rebindingTime, err := parseRebindingTime(opts)
-	if err != nil || rebindingTime > leaseTime {
-		// Per RFC 2131 Section 4.4.5, it should default to 85% of lease time
-		rebindingTime = leaseTime * 85 / 100
-	}
-
-	renewalTime, err := parseRenewalTime(opts)
-	if err != nil || renewalTime > rebindingTime {
-		// Per RFC 2131 Section 4.4.5, it should default to 50% of lease time
-		renewalTime = leaseTime / 2
-	}
-
-	now := time.Now()
-	l.expireTime = now.Add(leaseTime)
-	l.renewalTime = now.Add(renewalTime)
-	l.rebindingTime = now.Add(rebindingTime)
-	l.ack = ack
-	l.opts = opts
-
-	return nil
-}
-
-func (l *DHCPLease) maintain() {
-	state := leaseStateBound
-
-	for {
-		var sleepDur time.Duration
-
-		switch state {
-		case leaseStateBound:
-			sleepDur = l.renewalTime.Sub(time.Now())
-			if sleepDur <= 0 {
-				log.Printf("%v: renewing lease", l.clientID)
-				state = leaseStateRenewing
-				continue
-			}
-
-		case leaseStateRenewing:
-			if err := l.renew(); err != nil {
-				log.Printf("%v: %v", l.clientID, err)
-
-				if time.Now().After(l.rebindingTime) {
-					log.Printf("%v: renawal time expired, rebinding", l.clientID)
-					state = leaseStateRebinding
-				}
-			} else {
-				log.Printf("%v: lease renewed, expiration is %v", l.clientID, l.expireTime)
-				state = leaseStateBound
-			}
-
-		case leaseStateRebinding:
-			if err := l.acquire(); err != nil {
-				log.Printf("%v: %v", l.clientID, err)
-
-				if time.Now().After(l.expireTime) {
-					log.Printf("%v: lease expired, bringing interface DOWN", l.clientID)
-					l.downIface()
-					return
-				}
-			} else {
-				log.Printf("%v: lease rebound, expiration is %v", l.clientID, l.expireTime)
-				state = leaseStateBound
-			}
-		}
-
-		select {
-		case <-time.After(sleepDur):
-
-		case <-l.stop:
-			if err := l.release(); err != nil {
-				log.Printf("%v: failed to release DHCP lease: %v", l.clientID, err)
-			}
-			return
-		}
-	}
-}
-
-func (l *DHCPLease) downIface() {
-	if err := netlink.LinkSetDown(l.link); err != nil {
-		log.Printf("%v: failed to bring %v interface DOWN: %v", l.clientID, l.link.Attrs().Name, err)
-	}
-}
-
-func (l *DHCPLease) renew() error {
-	c, err := newDHCPClient(l.link)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-
-	pkt, err := backoffRetry(func() (*dhcp4.Packet, error) {
-		ok, ack, err := c.Renew(*l.ack)
-		switch {
-		case err != nil:
-			return nil, err
-		case !ok:
-			return nil, fmt.Errorf("DHCP server did not renew lease")
-		default:
-			return &ack, nil
-		}
-	})
-	if err != nil {
-		return err
-	}
-
-	l.commit(pkt)
-	return nil
-}
-
-func (l *DHCPLease) release() error {
-	log.Printf("%v: releasing lease", l.clientID)
-
-	c, err := newDHCPClient(l.link)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-
-	if err = c.Release(*l.ack); err != nil {
-		return fmt.Errorf("failed to send DHCPRELEASE")
-	}
-
-	return nil
-}
-
-func (l *DHCPLease) IPNet() (*net.IPNet, error) {
-	mask := parseSubnetMask(l.opts)
-	if mask == nil {
-		return nil, fmt.Errorf("DHCP option Subnet Mask not found in DHCPACK")
-	}
-
-	return &net.IPNet{
-		IP:   l.ack.YIAddr(),
-		Mask: mask,
-	}, nil
-}
-
-func (l *DHCPLease) Gateway() net.IP {
-	return parseRouter(l.opts)
-}
-
-func (l *DHCPLease) Routes() []types.Route {
-	routes := parseRoutes(l.opts)
-	return append(routes, parseCIDRRoutes(l.opts)...)
-}
-
-// jitter returns a random value within [-span, span) range
-func jitter(span time.Duration) time.Duration {
-	return time.Duration(float64(span) * (2.0*rand.Float64() - 1.0))
-}
-
-func backoffRetry(f func() (*dhcp4.Packet, error)) (*dhcp4.Packet, error) {
-	var baseDelay time.Duration = resendDelay0
-
-	for i := 0; i < resendCount; i++ {
-		pkt, err := f()
-		if err == nil {
-			return pkt, nil
-		}
-
-		log.Print(err)
-
-		time.Sleep(baseDelay + jitter(time.Second))
-
-		if baseDelay < resendDelayMax {
-			baseDelay *= 2
-		}
-	}
-
-	return nil, errNoMoreTries
-}
-
-func newDHCPClient(link netlink.Link) (*dhcp4client.Client, error) {
-	pktsock, err := dhcp4client.NewPacketSock(link.Attrs().Index)
-	if err != nil {
-		return nil, err
-	}
-
-	return dhcp4client.New(
-		dhcp4client.HardwareAddr(link.Attrs().HardwareAddr),
-		dhcp4client.Timeout(5*time.Second),
-		dhcp4client.Broadcast(false),
-		dhcp4client.Connection(pktsock),
-	)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go
deleted file mode 100644
index b537831506..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/main.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"net/rpc"
-	"os"
-	"path/filepath"
-
-	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-const socketPath = "/run/cni/dhcp.sock"
-
-func main() {
-	if len(os.Args) > 1 && os.Args[1] == "daemon" {
-		runDaemon()
-	} else {
-		skel.PluginMain(cmdAdd, cmdDel)
-	}
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	result := types.Result{}
-	if err := rpcCall("DHCP.Allocate", args, &result); err != nil {
-		return err
-	}
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	result := struct{}{}
-	if err := rpcCall("DHCP.Release", args, &result); err != nil {
-		return fmt.Errorf("error dialing DHCP daemon: %v", err)
-	}
-	return nil
-}
-
-func rpcCall(method string, args *skel.CmdArgs, result interface{}) error {
-	client, err := rpc.DialHTTP("unix", socketPath)
-	if err != nil {
-		return fmt.Errorf("error dialing DHCP daemon: %v", err)
-	}
-
-	// The daemon may be running under a different working dir
-	// so make sure the netns path is absolute.
-	netns, err := filepath.Abs(args.Netns)
-	if err != nil {
-		return fmt.Errorf("failed to make %q an absolute path: %v", args.Netns, err)
-	}
-	args.Netns = netns
-
-	err = client.Call(method, args, result)
-	if err != nil {
-		return fmt.Errorf("error calling %v: %v", method, err)
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go
deleted file mode 100644
index b11ec21d55..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/dhcp/options.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/binary"
-	"fmt"
-	"net"
-	"time"
-
-	"github.com/containernetworking/cni/pkg/types"
-	"github.com/d2g/dhcp4"
-)
-
-func parseRouter(opts dhcp4.Options) net.IP {
-	if opts, ok := opts[dhcp4.OptionRouter]; ok {
-		if len(opts) == 4 {
-			return net.IP(opts)
-		}
-	}
-	return nil
-}
-
-func classfulSubnet(sn net.IP) net.IPNet {
-	return net.IPNet{
-		IP:   sn,
-		Mask: sn.DefaultMask(),
-	}
-}
-
-func parseRoutes(opts dhcp4.Options) []types.Route {
-	// StaticRoutes format: pairs of:
-	// Dest = 4 bytes; Classful IP subnet
-	// Router = 4 bytes; IP address of router
-
-	routes := []types.Route{}
-	if opt, ok := opts[dhcp4.OptionStaticRoute]; ok {
-		for len(opt) >= 8 {
-			sn := opt[0:4]
-			r := opt[4:8]
-			rt := types.Route{
-				Dst: classfulSubnet(sn),
-				GW:  r,
-			}
-			routes = append(routes, rt)
-			opt = opt[8:]
-		}
-	}
-
-	return routes
-}
-
-func parseCIDRRoutes(opts dhcp4.Options) []types.Route {
-	// See RFC4332 for format (http://tools.ietf.org/html/rfc3442)
-
-	routes := []types.Route{}
-	if opt, ok := opts[dhcp4.OptionClasslessRouteFormat]; ok {
-		for len(opt) >= 5 {
-			width := int(opt[0])
-			if width > 32 {
-				// error: can't have more than /32
-				return nil
-			}
-			// network bits are compacted to avoid zeros
-			octets := 0
-			if width > 0 {
-				octets = (width-1)/8 + 1
-			}
-
-			if len(opt) < 1+octets+4 {
-				// error: too short
-				return nil
-			}
-
-			sn := make([]byte, 4)
-			copy(sn, opt[1:octets+1])
-
-			gw := net.IP(opt[octets+1 : octets+5])
-
-			rt := types.Route{
-				Dst: net.IPNet{
-					IP:   net.IP(sn),
-					Mask: net.CIDRMask(width, 32),
-				},
-				GW: gw,
-			}
-			routes = append(routes, rt)
-
-			opt = opt[octets+5 : len(opt)]
-		}
-	}
-	return routes
-}
-
-func parseSubnetMask(opts dhcp4.Options) net.IPMask {
-	mask, ok := opts[dhcp4.OptionSubnetMask]
-	if !ok {
-		return nil
-	}
-
-	return net.IPMask(mask)
-}
-
-func parseDuration(opts dhcp4.Options, code dhcp4.OptionCode, optName string) (time.Duration, error) {
-	val, ok := opts[code]
-	if !ok {
-		return 0, fmt.Errorf("option %v not found", optName)
-	}
-	if len(val) != 4 {
-		return 0, fmt.Errorf("option %v is not 4 bytes", optName)
-	}
-
-	secs := binary.BigEndian.Uint32(val)
-	return time.Duration(secs) * time.Second, nil
-}
-
-func parseLeaseTime(opts dhcp4.Options) (time.Duration, error) {
-	return parseDuration(opts, dhcp4.OptionIPAddressLeaseTime, "LeaseTime")
-}
-
-func parseRenewalTime(opts dhcp4.Options) (time.Duration, error) {
-	return parseDuration(opts, dhcp4.OptionRenewalTimeValue, "RenewalTime")
-}
-
-func parseRebindingTime(opts dhcp4.Options) (time.Duration, error) {
-	return parseDuration(opts, dhcp4.OptionRebindingTimeValue, "RebindingTime")
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/README.md b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/README.md
deleted file mode 100644
index 39e9ede217..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/README.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# host-local IP address manager
-
-host-local IPAM allocates IPv4 and IPv6 addresses out of a specified address range.
-
-## Usage
-
-### Obtain an IP
-
-Given the following network configuration:
-
-```
-{
-    "name": "default",
-    "ipam": {
-        "type": "host-local",
-        "subnet": "203.0.113.0/24"
-    }
-}
-```
-
-#### Using the command line interface
-
-```
-$ export CNI_COMMAND=ADD
-$ export CNI_CONTAINERID=f81d4fae-7dec-11d0-a765-00a0c91e6bf6
-$ ./host-local < $conf
-```
-
-```
-{
-    "ip4": {
-        "ip": "203.0.113.1/24"
-    }
-}
-```
-
-## Backends
-
-By default ipmanager stores IP allocations on the local filesystem using the IP address as the file name and the ID as contents. For example:
-
-```
-$ ls /var/lib/cni/networks/default
-```
-```
-203.0.113.1	203.0.113.2
-```
-
-```
-$ cat /var/lib/cni/networks/default/203.0.113.1
-```
-```
-f81d4fae-7dec-11d0-a765-00a0c91e6bf6
-```
-
-## Configuration Files
-
-
-```
-{
-	"name": "ipv6",
-    "ipam": {
-		"type": "host-local",
-		"subnet": "3ffe:ffff:0:01ff::/64",
-		"range-start": "3ffe:ffff:0:01ff::0010",
-		"range-end": "3ffe:ffff:0:01ff::0020",
-		"routes": [
-			{ "dst": "3ffe:ffff:0:01ff::1/64" }
-		]
-	}
-}
-```
-
-```
-{
-    "name": "ipv4",
-	"ipam": {
-		"type": "host-local",
-		"subnet": "203.0.113.1/24",
-		"range-start": "203.0.113.10",
-		"range-end": "203.0.113.20",
-		"routes": [
-			{ "dst": "203.0.113.0/24" }
-		]
-	}
-}
-```
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go
deleted file mode 100644
index 55a3ae6fa4..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/allocator.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/containernetworking/cni/pkg/ip"
-	"github.com/containernetworking/cni/pkg/types"
-	"github.com/containernetworking/cni/plugins/ipam/host-local/backend"
-)
-
-type IPAllocator struct {
-	start net.IP
-	end   net.IP
-	conf  *IPAMConfig
-	store backend.Store
-}
-
-func NewIPAllocator(conf *IPAMConfig, store backend.Store) (*IPAllocator, error) {
-	var (
-		start net.IP
-		end   net.IP
-		err   error
-	)
-	start, end, err = networkRange((*net.IPNet)(&conf.Subnet))
-	if err != nil {
-		return nil, err
-	}
-
-	// skip the .0 address
-	start = ip.NextIP(start)
-
-	if conf.RangeStart != nil {
-		if err := validateRangeIP(conf.RangeStart, (*net.IPNet)(&conf.Subnet)); err != nil {
-			return nil, err
-		}
-		start = conf.RangeStart
-	}
-	if conf.RangeEnd != nil {
-		if err := validateRangeIP(conf.RangeEnd, (*net.IPNet)(&conf.Subnet)); err != nil {
-			return nil, err
-		}
-		// RangeEnd is inclusive
-		end = ip.NextIP(conf.RangeEnd)
-	}
-
-	return &IPAllocator{start, end, conf, store}, nil
-}
-
-func validateRangeIP(ip net.IP, ipnet *net.IPNet) error {
-	if !ipnet.Contains(ip) {
-		return fmt.Errorf("%s not in network: %s", ip, ipnet)
-	}
-	return nil
-}
-
-// Returns newly allocated IP along with its config
-func (a *IPAllocator) Get(id string) (*types.IPConfig, error) {
-	a.store.Lock()
-	defer a.store.Unlock()
-
-	gw := a.conf.Gateway
-	if gw == nil {
-		gw = ip.NextIP(a.conf.Subnet.IP)
-	}
-
-	var requestedIP net.IP
-	if a.conf.Args != nil {
-		requestedIP = a.conf.Args.IP
-	}
-
-	if requestedIP != nil {
-		if gw != nil && gw.Equal(a.conf.Args.IP) {
-			return nil, fmt.Errorf("requested IP must differ gateway IP")
-		}
-
-		subnet := net.IPNet{
-			IP:   a.conf.Subnet.IP,
-			Mask: a.conf.Subnet.Mask,
-		}
-		err := validateRangeIP(requestedIP, &subnet)
-		if err != nil {
-			return nil, err
-		}
-
-		reserved, err := a.store.Reserve(id, requestedIP)
-		if err != nil {
-			return nil, err
-		}
-
-		if reserved {
-			return &types.IPConfig{
-				IP:      net.IPNet{IP: requestedIP, Mask: a.conf.Subnet.Mask},
-				Gateway: gw,
-				Routes:  a.conf.Routes,
-			}, nil
-		}
-		return nil, fmt.Errorf("requested IP address %q is not available in network: %s", requestedIP, a.conf.Name)
-	}
-
-	for cur := a.start; !cur.Equal(a.end); cur = ip.NextIP(cur) {
-		// don't allocate gateway IP
-		if gw != nil && cur.Equal(gw) {
-			continue
-		}
-
-		reserved, err := a.store.Reserve(id, cur)
-		if err != nil {
-			return nil, err
-		}
-		if reserved {
-			return &types.IPConfig{
-				IP:      net.IPNet{IP: cur, Mask: a.conf.Subnet.Mask},
-				Gateway: gw,
-				Routes:  a.conf.Routes,
-			}, nil
-		}
-	}
-	return nil, fmt.Errorf("no IP addresses available in network: %s", a.conf.Name)
-}
-
-// Releases all IPs allocated for the container with given ID
-func (a *IPAllocator) Release(id string) error {
-	a.store.Lock()
-	defer a.store.Unlock()
-
-	return a.store.ReleaseByID(id)
-}
-
-func networkRange(ipnet *net.IPNet) (net.IP, net.IP, error) {
-	if ipnet.IP == nil {
-		return nil, nil, fmt.Errorf("missing field %q in IPAM configuration", "subnet")
-	}
-	ip := ipnet.IP.To4()
-	if ip == nil {
-		ip = ipnet.IP.To16()
-		if ip == nil {
-			return nil, nil, fmt.Errorf("IP not v4 nor v6")
-		}
-	}
-
-	if len(ip) != len(ipnet.Mask) {
-		return nil, nil, fmt.Errorf("IPNet IP and Mask version mismatch")
-	}
-
-	var end net.IP
-	for i := 0; i < len(ip); i++ {
-		end = append(end, ip[i]|^ipnet.Mask[i])
-	}
-	return ipnet.IP, end, nil
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go
deleted file mode 100644
index 88dc5e92bc..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/backend.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"io/ioutil"
-	"net"
-	"os"
-	"path/filepath"
-)
-
-var defaultDataDir = "/var/lib/cni/networks"
-
-type Store struct {
-	FileLock
-	dataDir string
-}
-
-func New(network string) (*Store, error) {
-	dir := filepath.Join(defaultDataDir, network)
-	if err := os.MkdirAll(dir, 0644); err != nil {
-		return nil, err
-	}
-
-	lk, err := NewFileLock(dir)
-	if err != nil {
-		return nil, err
-	}
-	return &Store{*lk, dir}, nil
-}
-
-func (s *Store) Reserve(id string, ip net.IP) (bool, error) {
-	fname := filepath.Join(s.dataDir, ip.String())
-	f, err := os.OpenFile(fname, os.O_RDWR|os.O_EXCL|os.O_CREATE, 0644)
-	if os.IsExist(err) {
-		return false, nil
-	}
-	if err != nil {
-		return false, err
-	}
-	if _, err := f.WriteString(id); err != nil {
-		f.Close()
-		os.Remove(f.Name())
-		return false, err
-	}
-	if err := f.Close(); err != nil {
-		os.Remove(f.Name())
-		return false, err
-	}
-	return true, nil
-}
-
-func (s *Store) Release(ip net.IP) error {
-	return os.Remove(filepath.Join(s.dataDir, ip.String()))
-}
-
-// N.B. This function eats errors to be tolerant and
-// release as much as possible
-func (s *Store) ReleaseByID(id string) error {
-	err := filepath.Walk(s.dataDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil || info.IsDir() {
-			return nil
-		}
-		data, err := ioutil.ReadFile(path)
-		if err != nil {
-			return nil
-		}
-		if string(data) == id {
-			if err := os.Remove(path); err != nil {
-				return nil
-			}
-		}
-		return nil
-	})
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go
deleted file mode 100644
index 7241482515..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk/lock.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"os"
-	"syscall"
-)
-
-// FileLock wraps os.File to be used as a lock using flock
-type FileLock struct {
-	f *os.File
-}
-
-// NewFileLock opens file/dir at path and returns unlocked FileLock object
-func NewFileLock(path string) (*FileLock, error) {
-	f, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return &FileLock{f}, nil
-}
-
-// Close closes underlying file
-func (l *FileLock) Close() error {
-	return l.f.Close()
-}
-
-// Lock acquires an exclusive lock
-func (l *FileLock) Lock() error {
-	return syscall.Flock(int(l.f.Fd()), syscall.LOCK_EX)
-}
-
-// Unlock releases the lock
-func (l *FileLock) Unlock() error {
-	return syscall.Flock(int(l.f.Fd()), syscall.LOCK_UN)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go
deleted file mode 100644
index 45a89b109c..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/backend/store.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backend
-
-import "net"
-
-type Store interface {
-	Lock() error
-	Unlock() error
-	Close() error
-	Reserve(id string, ip net.IP) (bool, error)
-	Release(ip net.IP) error
-	ReleaseByID(id string) error
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/config.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/config.go
deleted file mode 100644
index a0e493cd84..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/config.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-// IPAMConfig represents the IP related network configuration.
-type IPAMConfig struct {
-	Name       string
-	Type       string        `json:"type"`
-	RangeStart net.IP        `json:"rangeStart"`
-	RangeEnd   net.IP        `json:"rangeEnd"`
-	Subnet     types.IPNet   `json:"subnet"`
-	Gateway    net.IP        `json:"gateway"`
-	Routes     []types.Route `json:"routes"`
-	Args       *IPAMArgs     `json:"-"`
-}
-
-type IPAMArgs struct {
-	types.CommonArgs
-	IP net.IP `json:"ip,omitempty"`
-}
-
-type Net struct {
-	Name string      `json:"name"`
-	IPAM *IPAMConfig `json:"ipam"`
-}
-
-// NewIPAMConfig creates a NetworkConfig from the given network name.
-func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, error) {
-	n := Net{}
-	if err := json.Unmarshal(bytes, &n); err != nil {
-		return nil, err
-	}
-
-	if args != "" {
-		n.IPAM.Args = &IPAMArgs{}
-		err := types.LoadArgs(args, n.IPAM.Args)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if n.IPAM == nil {
-		return nil, fmt.Errorf("%q missing 'ipam' key")
-	}
-
-	// Copy net name into IPAM so not to drag Net struct around
-	n.IPAM.Name = n.Name
-
-	return n.IPAM, nil
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/main.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/main.go
deleted file mode 100644
index d2f3c305a5..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/ipam/host-local/main.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk"
-
-	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
-	if err != nil {
-		return err
-	}
-
-	store, err := disk.New(ipamConf.Name)
-	if err != nil {
-		return err
-	}
-	defer store.Close()
-
-	allocator, err := NewIPAllocator(ipamConf, store)
-	if err != nil {
-		return err
-	}
-
-	ipConf, err := allocator.Get(args.ContainerID)
-	if err != nil {
-		return err
-	}
-
-	r := &types.Result{
-		IP4: ipConf,
-	}
-	return r.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
-	if err != nil {
-		return err
-	}
-
-	store, err := disk.New(ipamConf.Name)
-	if err != nil {
-		return err
-	}
-	defer store.Close()
-
-	allocator, err := NewIPAllocator(ipamConf, store)
-	if err != nil {
-		return err
-	}
-
-	return allocator.Release(args.ContainerID)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/bridge/bridge.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/bridge/bridge.go
deleted file mode 100644
index d4fc89c3aa..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/bridge/bridge.go
+++ /dev/null
@@ -1,319 +0,0 @@
-// Copyright 2014 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net"
-	"runtime"
-	"syscall"
-
-	"github.com/containernetworking/cni/pkg/ip"
-	"github.com/containernetworking/cni/pkg/ipam"
-	"github.com/containernetworking/cni/pkg/ns"
-	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types"
-	"github.com/containernetworking/cni/pkg/utils"
-	"github.com/vishvananda/netlink"
-)
-
-const defaultBrName = "cni0"
-
-type NetConf struct {
-	types.NetConf
-	BrName      string `json:"bridge"`
-	IsGW        bool   `json:"isGateway"`
-	IsDefaultGW bool   `json:"isDefaultGateway"`
-	IPMasq      bool   `json:"ipMasq"`
-	MTU         int    `json:"mtu"`
-	HairpinMode bool   `json:"hairpinMode"`
-}
-
-func init() {
-	// this ensures that main runs only on main thread (thread group leader).
-	// since namespace ops (unshare, setns) are done for a single thread, we
-	// must ensure that the goroutine does not jump from OS thread to thread
-	runtime.LockOSThread()
-}
-
-func loadNetConf(bytes []byte) (*NetConf, error) {
-	n := &NetConf{
-		BrName: defaultBrName,
-	}
-	if err := json.Unmarshal(bytes, n); err != nil {
-		return nil, fmt.Errorf("failed to load netconf: %v", err)
-	}
-	return n, nil
-}
-
-func ensureBridgeAddr(br *netlink.Bridge, ipn *net.IPNet) error {
-	addrs, err := netlink.AddrList(br, syscall.AF_INET)
-	if err != nil && err != syscall.ENOENT {
-		return fmt.Errorf("could not get list of IP addresses: %v", err)
-	}
-
-	// if there're no addresses on the bridge, it's ok -- we'll add one
-	if len(addrs) > 0 {
-		ipnStr := ipn.String()
-		for _, a := range addrs {
-			// string comp is actually easiest for doing IPNet comps
-			if a.IPNet.String() == ipnStr {
-				return nil
-			}
-		}
-		return fmt.Errorf("%q already has an IP address different from %v", br.Name, ipn.String())
-	}
-
-	addr := &netlink.Addr{IPNet: ipn, Label: ""}
-	if err := netlink.AddrAdd(br, addr); err != nil {
-		return fmt.Errorf("could not add IP address to %q: %v", br.Name, err)
-	}
-	return nil
-}
-
-func bridgeByName(name string) (*netlink.Bridge, error) {
-	l, err := netlink.LinkByName(name)
-	if err != nil {
-		return nil, fmt.Errorf("could not lookup %q: %v", name, err)
-	}
-	br, ok := l.(*netlink.Bridge)
-	if !ok {
-		return nil, fmt.Errorf("%q already exists but is not a bridge", name)
-	}
-	return br, nil
-}
-
-func ensureBridge(brName string, mtu int) (*netlink.Bridge, error) {
-	br := &netlink.Bridge{
-		LinkAttrs: netlink.LinkAttrs{
-			Name: brName,
-			MTU:  mtu,
-			// Let kernel use default txqueuelen; leaving it unset
-			// means 0, and a zero-length TX queue messes up FIFO
-			// traffic shapers which use TX queue length as the
-			// default packet limit
-			TxQLen: -1,
-		},
-	}
-
-	if err := netlink.LinkAdd(br); err != nil {
-		if err != syscall.EEXIST {
-			return nil, fmt.Errorf("could not add %q: %v", brName, err)
-		}
-
-		// it's ok if the device already exists as long as config is similar
-		br, err = bridgeByName(brName)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if err := netlink.LinkSetUp(br); err != nil {
-		return nil, err
-	}
-
-	return br, nil
-}
-
-func setupVeth(netns ns.NetNS, br *netlink.Bridge, ifName string, mtu int, hairpinMode bool) error {
-	var hostVethName string
-
-	err := netns.Do(func(hostNS ns.NetNS) error {
-		// create the veth pair in the container and move host end into host netns
-		hostVeth, _, err := ip.SetupVeth(ifName, mtu, hostNS)
-		if err != nil {
-			return err
-		}
-
-		hostVethName = hostVeth.Attrs().Name
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	// need to lookup hostVeth again as its index has changed during ns move
-	hostVeth, err := netlink.LinkByName(hostVethName)
-	if err != nil {
-		return fmt.Errorf("failed to lookup %q: %v", hostVethName, err)
-	}
-
-	// connect host veth end to the bridge
-	if err = netlink.LinkSetMaster(hostVeth, br); err != nil {
-		return fmt.Errorf("failed to connect %q to bridge %v: %v", hostVethName, br.Attrs().Name, err)
-	}
-
-	// set hairpin mode
-	if err = netlink.LinkSetHairpin(hostVeth, hairpinMode); err != nil {
-		return fmt.Errorf("failed to setup hairpin mode for %v: %v", hostVethName, err)
-	}
-
-	return nil
-}
-
-func calcGatewayIP(ipn *net.IPNet) net.IP {
-	nid := ipn.IP.Mask(ipn.Mask)
-	return ip.NextIP(nid)
-}
-
-func setupBridge(n *NetConf) (*netlink.Bridge, error) {
-	// create bridge if necessary
-	br, err := ensureBridge(n.BrName, n.MTU)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create bridge %q: %v", n.BrName, err)
-	}
-
-	return br, nil
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	n, err := loadNetConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	if n.IsDefaultGW {
-		n.IsGW = true
-	}
-
-	br, err := setupBridge(n)
-	if err != nil {
-		return err
-	}
-
-	netns, err := ns.GetNS(args.Netns)
-	if err != nil {
-		return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)
-	}
-	defer netns.Close()
-
-	if err = setupVeth(netns, br, args.IfName, n.MTU, n.HairpinMode); err != nil {
-		return err
-	}
-
-	// run the IPAM plugin and get back the config to apply
-	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	// TODO: make this optional when IPv6 is supported
-	if result.IP4 == nil {
-		return errors.New("IPAM plugin returned missing IPv4 config")
-	}
-
-	if result.IP4.Gateway == nil && n.IsGW {
-		result.IP4.Gateway = calcGatewayIP(&result.IP4.IP)
-	}
-
-	if err := netns.Do(func(_ ns.NetNS) error {
-		// set the default gateway if requested
-		if n.IsDefaultGW {
-			_, defaultNet, err := net.ParseCIDR("0.0.0.0/0")
-			if err != nil {
-				return err
-			}
-
-			for _, route := range result.IP4.Routes {
-				if defaultNet.String() == route.Dst.String() {
-					if route.GW != nil && !route.GW.Equal(result.IP4.Gateway) {
-						return fmt.Errorf(
-							"isDefaultGateway ineffective because IPAM sets default route via %q",
-							route.GW,
-						)
-					}
-				}
-			}
-
-			result.IP4.Routes = append(
-				result.IP4.Routes,
-				types.Route{Dst: *defaultNet, GW: result.IP4.Gateway},
-			)
-
-			// TODO: IPV6
-		}
-
-		return ipam.ConfigureIface(args.IfName, result)
-	}); err != nil {
-		return err
-	}
-
-	if n.IsGW {
-		gwn := &net.IPNet{
-			IP:   result.IP4.Gateway,
-			Mask: result.IP4.IP.Mask,
-		}
-
-		if err = ensureBridgeAddr(br, gwn); err != nil {
-			return err
-		}
-
-		if err := ip.EnableIP4Forward(); err != nil {
-			return fmt.Errorf("failed to enable forwarding: %v", err)
-		}
-	}
-
-	if n.IPMasq {
-		chain := utils.FormatChainName(n.Name, args.ContainerID)
-		comment := utils.FormatComment(n.Name, args.ContainerID)
-		if err = ip.SetupIPMasq(ip.Network(&result.IP4.IP), chain, comment); err != nil {
-			return err
-		}
-	}
-
-	result.DNS = n.DNS
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	n, err := loadNetConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	if err := ipam.ExecDel(n.IPAM.Type, args.StdinData); err != nil {
-		return err
-	}
-
-	if args.Netns == "" {
-		return nil
-	}
-
-	var ipn *net.IPNet
-	err = ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
-		var err error
-		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
-		return err
-	})
-	if err != nil {
-		return err
-	}
-
-	if n.IPMasq {
-		chain := utils.FormatChainName(n.Name, args.ContainerID)
-		comment := utils.FormatComment(n.Name, args.ContainerID)
-		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go
deleted file mode 100644
index d7cfc39f4e..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ipvlan/ipvlan.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"runtime"
-
-	"github.com/containernetworking/cni/pkg/ip"
-	"github.com/containernetworking/cni/pkg/ipam"
-	"github.com/containernetworking/cni/pkg/ns"
-	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types"
-	"github.com/vishvananda/netlink"
-)
-
-type NetConf struct {
-	types.NetConf
-	Master string `json:"master"`
-	Mode   string `json:"mode"`
-	MTU    int    `json:"mtu"`
-}
-
-func init() {
-	// this ensures that main runs only on main thread (thread group leader).
-	// since namespace ops (unshare, setns) are done for a single thread, we
-	// must ensure that the goroutine does not jump from OS thread to thread
-	runtime.LockOSThread()
-}
-
-func loadConf(bytes []byte) (*NetConf, error) {
-	n := &NetConf{}
-	if err := json.Unmarshal(bytes, n); err != nil {
-		return nil, fmt.Errorf("failed to load netconf: %v", err)
-	}
-	if n.Master == "" {
-		return nil, fmt.Errorf(`"master" field is required. It specifies the host interface name to virtualize`)
-	}
-	return n, nil
-}
-
-func modeFromString(s string) (netlink.IPVlanMode, error) {
-	switch s {
-	case "", "l2":
-		return netlink.IPVLAN_MODE_L2, nil
-	case "l3":
-		return netlink.IPVLAN_MODE_L3, nil
-	default:
-		return 0, fmt.Errorf("unknown ipvlan mode: %q", s)
-	}
-}
-
-func createIpvlan(conf *NetConf, ifName string, netns ns.NetNS) error {
-	mode, err := modeFromString(conf.Mode)
-	if err != nil {
-		return err
-	}
-
-	m, err := netlink.LinkByName(conf.Master)
-	if err != nil {
-		return fmt.Errorf("failed to lookup master %q: %v", conf.Master, err)
-	}
-
-	// due to kernel bug we have to create with tmpname or it might
-	// collide with the name on the host and error out
-	tmpName, err := ip.RandomVethName()
-	if err != nil {
-		return err
-	}
-
-	mv := &netlink.IPVlan{
-		LinkAttrs: netlink.LinkAttrs{
-			MTU:         conf.MTU,
-			Name:        tmpName,
-			ParentIndex: m.Attrs().Index,
-			Namespace:   netlink.NsFd(int(netns.Fd())),
-		},
-		Mode: mode,
-	}
-
-	if err := netlink.LinkAdd(mv); err != nil {
-		return fmt.Errorf("failed to create ipvlan: %v", err)
-	}
-
-	return netns.Do(func(_ ns.NetNS) error {
-		err := renameLink(tmpName, ifName)
-		if err != nil {
-			return fmt.Errorf("failed to rename ipvlan to %q: %v", ifName, err)
-		}
-		return nil
-	})
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	n, err := loadConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	netns, err := ns.GetNS(args.Netns)
-	if err != nil {
-		return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)
-	}
-	defer netns.Close()
-
-	if err = createIpvlan(n, args.IfName, netns); err != nil {
-		return err
-	}
-
-	// run the IPAM plugin and get back the config to apply
-	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-	if result.IP4 == nil {
-		return errors.New("IPAM plugin returned missing IPv4 config")
-	}
-
-	err = netns.Do(func(_ ns.NetNS) error {
-		return ipam.ConfigureIface(args.IfName, result)
-	})
-	if err != nil {
-		return err
-	}
-
-	result.DNS = n.DNS
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	n, err := loadConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	if args.Netns == "" {
-		return nil
-	}
-
-	return ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
-		return ip.DelLinkByName(args.IfName)
-	})
-}
-
-func renameLink(curName, newName string) error {
-	link, err := netlink.LinkByName(curName)
-	if err != nil {
-		return err
-	}
-
-	return netlink.LinkSetName(link, newName)
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go
deleted file mode 100644
index 7739d7b8eb..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/macvlan/macvlan.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"runtime"
-
-	"github.com/containernetworking/cni/pkg/ip"
-	"github.com/containernetworking/cni/pkg/ipam"
-	"github.com/containernetworking/cni/pkg/ns"
-	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types"
-	"github.com/containernetworking/cni/pkg/utils/sysctl"
-	"github.com/vishvananda/netlink"
-)
-
-const (
-	IPv4InterfaceArpProxySysctlTemplate = "net.ipv4.conf.%s.proxy_arp"
-)
-
-type NetConf struct {
-	types.NetConf
-	Master string `json:"master"`
-	Mode   string `json:"mode"`
-	MTU    int    `json:"mtu"`
-}
-
-func init() {
-	// this ensures that main runs only on main thread (thread group leader).
-	// since namespace ops (unshare, setns) are done for a single thread, we
-	// must ensure that the goroutine does not jump from OS thread to thread
-	runtime.LockOSThread()
-}
-
-func loadConf(bytes []byte) (*NetConf, error) {
-	n := &NetConf{}
-	if err := json.Unmarshal(bytes, n); err != nil {
-		return nil, fmt.Errorf("failed to load netconf: %v", err)
-	}
-	if n.Master == "" {
-		return nil, fmt.Errorf(`"master" field is required. It specifies the host interface name to virtualize`)
-	}
-	return n, nil
-}
-
-func modeFromString(s string) (netlink.MacvlanMode, error) {
-	switch s {
-	case "", "bridge":
-		return netlink.MACVLAN_MODE_BRIDGE, nil
-	case "private":
-		return netlink.MACVLAN_MODE_PRIVATE, nil
-	case "vepa":
-		return netlink.MACVLAN_MODE_VEPA, nil
-	case "passthru":
-		return netlink.MACVLAN_MODE_PASSTHRU, nil
-	default:
-		return 0, fmt.Errorf("unknown macvlan mode: %q", s)
-	}
-}
-
-func createMacvlan(conf *NetConf, ifName string, netns ns.NetNS) error {
-	mode, err := modeFromString(conf.Mode)
-	if err != nil {
-		return err
-	}
-
-	m, err := netlink.LinkByName(conf.Master)
-	if err != nil {
-		return fmt.Errorf("failed to lookup master %q: %v", conf.Master, err)
-	}
-
-	// due to kernel bug we have to create with tmpName or it might
-	// collide with the name on the host and error out
-	tmpName, err := ip.RandomVethName()
-	if err != nil {
-		return err
-	}
-
-	mv := &netlink.Macvlan{
-		LinkAttrs: netlink.LinkAttrs{
-			MTU:         conf.MTU,
-			Name:        tmpName,
-			ParentIndex: m.Attrs().Index,
-			Namespace:   netlink.NsFd(int(netns.Fd())),
-		},
-		Mode: mode,
-	}
-
-	if err := netlink.LinkAdd(mv); err != nil {
-		return fmt.Errorf("failed to create macvlan: %v", err)
-	}
-
-	return netns.Do(func(_ ns.NetNS) error {
-		// TODO: duplicate following lines for ipv6 support, when it will be added in other places
-		ipv4SysctlValueName := fmt.Sprintf(IPv4InterfaceArpProxySysctlTemplate, tmpName)
-		if _, err := sysctl.Sysctl(ipv4SysctlValueName, "1"); err != nil {
-			// remove the newly added link and ignore errors, because we already are in a failed state
-			_ = netlink.LinkDel(mv)
-			return fmt.Errorf("failed to set proxy_arp on newly added interface %q: %v", tmpName, err)
-		}
-
-		err := renameLink(tmpName, ifName)
-		if err != nil {
-			_ = netlink.LinkDel(mv)
-			return fmt.Errorf("failed to rename macvlan to %q: %v", ifName, err)
-		}
-		return nil
-	})
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	n, err := loadConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	netns, err := ns.GetNS(args.Netns)
-	if err != nil {
-		return fmt.Errorf("failed to open netns %q: %v", netns, err)
-	}
-	defer netns.Close()
-
-	if err = createMacvlan(n, args.IfName, netns); err != nil {
-		return err
-	}
-
-	// run the IPAM plugin and get back the config to apply
-	result, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-	if result.IP4 == nil {
-		return errors.New("IPAM plugin returned missing IPv4 config")
-	}
-
-	err = netns.Do(func(_ ns.NetNS) error {
-		return ipam.ConfigureIface(args.IfName, result)
-	})
-	if err != nil {
-		return err
-	}
-
-	result.DNS = n.DNS
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	n, err := loadConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	if args.Netns == "" {
-		return nil
-	}
-
-	return ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
-		return ip.DelLinkByName(args.IfName)
-	})
-}
-
-func renameLink(curName, newName string) error {
-	link, err := netlink.LinkByName(curName)
-	if err != nil {
-		return err
-	}
-
-	return netlink.LinkSetName(link, newName)
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ptp/ptp.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ptp/ptp.go
deleted file mode 100644
index aa695e39e2..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/main/ptp/ptp.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"runtime"
-
-	"github.com/vishvananda/netlink"
-
-	"github.com/containernetworking/cni/pkg/ip"
-	"github.com/containernetworking/cni/pkg/ipam"
-	"github.com/containernetworking/cni/pkg/ns"
-	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types"
-	"github.com/containernetworking/cni/pkg/utils"
-)
-
-func init() {
-	// this ensures that main runs only on main thread (thread group leader).
-	// since namespace ops (unshare, setns) are done for a single thread, we
-	// must ensure that the goroutine does not jump from OS thread to thread
-	runtime.LockOSThread()
-}
-
-type NetConf struct {
-	types.NetConf
-	IPMasq bool `json:"ipMasq"`
-	MTU    int  `json:"mtu"`
-}
-
-func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string, error) {
-	// The IPAM result will be something like IP=192.168.3.5/24, GW=192.168.3.1.
-	// What we want is really a point-to-point link but veth does not support IFF_POINTOPONT.
-	// Next best thing would be to let it ARP but set interface to 192.168.3.5/32 and
-	// add a route like "192.168.3.0/24 via 192.168.3.1 dev $ifName".
-	// Unfortunately that won't work as the GW will be outside the interface's subnet.
-
-	// Our solution is to configure the interface with 192.168.3.5/24, then delete the
-	// "192.168.3.0/24 dev $ifName" route that was automatically added. Then we add
-	// "192.168.3.1/32 dev $ifName" and "192.168.3.0/24 via 192.168.3.1 dev $ifName".
-	// In other words we force all traffic to ARP via the gateway except for GW itself.
-
-	var hostVethName string
-	err := ns.WithNetNSPath(netns, func(hostNS ns.NetNS) error {
-		hostVeth, _, err := ip.SetupVeth(ifName, mtu, hostNS)
-		if err != nil {
-			return err
-		}
-
-		if err = ipam.ConfigureIface(ifName, pr); err != nil {
-			return err
-		}
-
-		contVeth, err := netlink.LinkByName(ifName)
-		if err != nil {
-			return fmt.Errorf("failed to look up %q: %v", ifName, err)
-		}
-
-		// Delete the route that was automatically added
-		route := netlink.Route{
-			LinkIndex: contVeth.Attrs().Index,
-			Dst: &net.IPNet{
-				IP:   pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
-				Mask: pr.IP4.IP.Mask,
-			},
-			Scope: netlink.SCOPE_NOWHERE,
-		}
-
-		if err := netlink.RouteDel(&route); err != nil {
-			return fmt.Errorf("failed to delete route %v: %v", route, err)
-		}
-
-		for _, r := range []netlink.Route{
-			netlink.Route{
-				LinkIndex: contVeth.Attrs().Index,
-				Dst: &net.IPNet{
-					IP:   pr.IP4.Gateway,
-					Mask: net.CIDRMask(32, 32),
-				},
-				Scope: netlink.SCOPE_LINK,
-				Src:   pr.IP4.IP.IP,
-			},
-			netlink.Route{
-				LinkIndex: contVeth.Attrs().Index,
-				Dst: &net.IPNet{
-					IP:   pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
-					Mask: pr.IP4.IP.Mask,
-				},
-				Scope: netlink.SCOPE_UNIVERSE,
-				Gw:    pr.IP4.Gateway,
-				Src:   pr.IP4.IP.IP,
-			},
-		} {
-			if err := netlink.RouteAdd(&r); err != nil {
-				return fmt.Errorf("failed to add route %v: %v", r, err)
-			}
-		}
-
-		hostVethName = hostVeth.Attrs().Name
-
-		return nil
-	})
-	return hostVethName, err
-}
-
-func setupHostVeth(vethName string, ipConf *types.IPConfig) error {
-	// hostVeth moved namespaces and may have a new ifindex
-	veth, err := netlink.LinkByName(vethName)
-	if err != nil {
-		return fmt.Errorf("failed to lookup %q: %v", vethName, err)
-	}
-
-	// TODO(eyakubovich): IPv6
-	ipn := &net.IPNet{
-		IP:   ipConf.Gateway,
-		Mask: net.CIDRMask(32, 32),
-	}
-	addr := &netlink.Addr{IPNet: ipn, Label: ""}
-	if err = netlink.AddrAdd(veth, addr); err != nil {
-		return fmt.Errorf("failed to add IP addr (%#v) to veth: %v", ipn, err)
-	}
-
-	ipn = &net.IPNet{
-		IP:   ipConf.IP.IP,
-		Mask: net.CIDRMask(32, 32),
-	}
-	// dst happens to be the same as IP/net of host veth
-	if err = ip.AddHostRoute(ipn, nil, veth); err != nil && !os.IsExist(err) {
-		return fmt.Errorf("failed to add route on host: %v", err)
-	}
-
-	return nil
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	conf := NetConf{}
-	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
-		return fmt.Errorf("failed to load netconf: %v", err)
-	}
-
-	if err := ip.EnableIP4Forward(); err != nil {
-		return fmt.Errorf("failed to enable forwarding: %v", err)
-	}
-
-	// run the IPAM plugin and get back the config to apply
-	result, err := ipam.ExecAdd(conf.IPAM.Type, args.StdinData)
-	if err != nil {
-		return err
-	}
-	if result.IP4 == nil {
-		return errors.New("IPAM plugin returned missing IPv4 config")
-	}
-
-	hostVethName, err := setupContainerVeth(args.Netns, args.IfName, conf.MTU, result)
-	if err != nil {
-		return err
-	}
-
-	if err = setupHostVeth(hostVethName, result.IP4); err != nil {
-		return err
-	}
-
-	if conf.IPMasq {
-		chain := utils.FormatChainName(conf.Name, args.ContainerID)
-		comment := utils.FormatComment(conf.Name, args.ContainerID)
-		if err = ip.SetupIPMasq(&result.IP4.IP, chain, comment); err != nil {
-			return err
-		}
-	}
-
-	result.DNS = conf.DNS
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	conf := NetConf{}
-	if err := json.Unmarshal(args.StdinData, &conf); err != nil {
-		return fmt.Errorf("failed to load netconf: %v", err)
-	}
-
-	if err := ipam.ExecDel(conf.IPAM.Type, args.StdinData); err != nil {
-		return err
-	}
-
-	if args.Netns == "" {
-		return nil
-	}
-
-	var ipn *net.IPNet
-	err := ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
-		var err error
-		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
-		return err
-	})
-	if err != nil {
-		return err
-	}
-
-	if conf.IPMasq {
-		chain := utils.FormatChainName(conf.Name, args.ContainerID)
-		comment := utils.FormatComment(conf.Name, args.ContainerID)
-		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go
deleted file mode 100644
index 096fe6d677..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/flannel/flannel.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2015 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This is a "meta-plugin". It reads in its own netconf, combines it with
-// the data from flannel generated subnet file and then invokes a plugin
-// like bridge or ipvlan to do the real work.
-
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/containernetworking/cni/pkg/invoke"
-	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-const (
-	defaultSubnetFile = "/run/flannel/subnet.env"
-	stateDir          = "/var/lib/cni/flannel"
-)
-
-type NetConf struct {
-	types.NetConf
-	SubnetFile string                 `json:"subnetFile"`
-	Delegate   map[string]interface{} `json:"delegate"`
-}
-
-type subnetEnv struct {
-	nw     *net.IPNet
-	sn     *net.IPNet
-	mtu    *uint
-	ipmasq *bool
-}
-
-func (se *subnetEnv) missing() string {
-	m := []string{}
-
-	if se.nw == nil {
-		m = append(m, "FLANNEL_NETWORK")
-	}
-	if se.sn == nil {
-		m = append(m, "FLANNEL_SUBNET")
-	}
-	if se.mtu == nil {
-		m = append(m, "FLANNEL_MTU")
-	}
-	if se.ipmasq == nil {
-		m = append(m, "FLANNEL_IPMASQ")
-	}
-	return strings.Join(m, ", ")
-}
-
-func loadFlannelNetConf(bytes []byte) (*NetConf, error) {
-	n := &NetConf{
-		SubnetFile: defaultSubnetFile,
-	}
-	if err := json.Unmarshal(bytes, n); err != nil {
-		return nil, fmt.Errorf("failed to load netconf: %v", err)
-	}
-	return n, nil
-}
-
-func loadFlannelSubnetEnv(fn string) (*subnetEnv, error) {
-	f, err := os.Open(fn)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	se := &subnetEnv{}
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		parts := strings.SplitN(s.Text(), "=", 2)
-		switch parts[0] {
-		case "FLANNEL_NETWORK":
-			_, se.nw, err = net.ParseCIDR(parts[1])
-			if err != nil {
-				return nil, err
-			}
-
-		case "FLANNEL_SUBNET":
-			_, se.sn, err = net.ParseCIDR(parts[1])
-			if err != nil {
-				return nil, err
-			}
-
-		case "FLANNEL_MTU":
-			mtu, err := strconv.ParseUint(parts[1], 10, 32)
-			if err != nil {
-				return nil, err
-			}
-			se.mtu = new(uint)
-			*se.mtu = uint(mtu)
-
-		case "FLANNEL_IPMASQ":
-			ipmasq := parts[1] == "true"
-			se.ipmasq = &ipmasq
-		}
-	}
-	if err := s.Err(); err != nil {
-		return nil, err
-	}
-
-	if m := se.missing(); m != "" {
-		return nil, fmt.Errorf("%v is missing %v", fn, m)
-	}
-
-	return se, nil
-}
-
-func saveScratchNetConf(containerID string, netconf []byte) error {
-	if err := os.MkdirAll(stateDir, 0700); err != nil {
-		return err
-	}
-	path := filepath.Join(stateDir, containerID)
-	return ioutil.WriteFile(path, netconf, 0600)
-}
-
-func consumeScratchNetConf(containerID string) ([]byte, error) {
-	path := filepath.Join(stateDir, containerID)
-	defer os.Remove(path)
-
-	return ioutil.ReadFile(path)
-}
-
-func delegateAdd(cid string, netconf map[string]interface{}) error {
-	netconfBytes, err := json.Marshal(netconf)
-	if err != nil {
-		return fmt.Errorf("error serializing delegate netconf: %v", err)
-	}
-
-	// save the rendered netconf for cmdDel
-	if err = saveScratchNetConf(cid, netconfBytes); err != nil {
-		return err
-	}
-
-	result, err := invoke.DelegateAdd(netconf["type"].(string), netconfBytes)
-	if err != nil {
-		return err
-	}
-
-	return result.Print()
-}
-
-func hasKey(m map[string]interface{}, k string) bool {
-	_, ok := m[k]
-	return ok
-}
-
-func isString(i interface{}) bool {
-	_, ok := i.(string)
-	return ok
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	n, err := loadFlannelNetConf(args.StdinData)
-	if err != nil {
-		return err
-	}
-
-	fenv, err := loadFlannelSubnetEnv(n.SubnetFile)
-	if err != nil {
-		return err
-	}
-
-	if n.Delegate == nil {
-		n.Delegate = make(map[string]interface{})
-	} else {
-		if hasKey(n.Delegate, "type") && !isString(n.Delegate["type"]) {
-			return fmt.Errorf("'delegate' dictionary, if present, must have (string) 'type' field")
-		}
-		if hasKey(n.Delegate, "name") {
-			return fmt.Errorf("'delegate' dictionary must not have 'name' field, it'll be set by flannel")
-		}
-		if hasKey(n.Delegate, "ipam") {
-			return fmt.Errorf("'delegate' dictionary must not have 'ipam' field, it'll be set by flannel")
-		}
-	}
-
-	n.Delegate["name"] = n.Name
-
-	if !hasKey(n.Delegate, "type") {
-		n.Delegate["type"] = "bridge"
-	}
-
-	if !hasKey(n.Delegate, "ipMasq") {
-		// if flannel is not doing ipmasq, we should
-		ipmasq := !*fenv.ipmasq
-		n.Delegate["ipMasq"] = ipmasq
-	}
-
-	if !hasKey(n.Delegate, "mtu") {
-		mtu := fenv.mtu
-		n.Delegate["mtu"] = mtu
-	}
-
-	if n.Delegate["type"].(string) == "bridge" {
-		if !hasKey(n.Delegate, "isGateway") {
-			n.Delegate["isGateway"] = true
-		}
-	}
-
-	n.Delegate["ipam"] = map[string]interface{}{
-		"type":   "host-local",
-		"subnet": fenv.sn.String(),
-		"routes": []types.Route{
-			types.Route{
-				Dst: *fenv.nw,
-			},
-		},
-	}
-
-	return delegateAdd(args.ContainerID, n.Delegate)
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	netconfBytes, err := consumeScratchNetConf(args.ContainerID)
-	if err != nil {
-		return err
-	}
-
-	n := &types.NetConf{}
-	if err = json.Unmarshal(netconfBytes, n); err != nil {
-		return fmt.Errorf("failed to parse netconf: %v", err)
-	}
-
-	return invoke.DelegateDel(n.Type, netconfBytes)
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go b/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go
deleted file mode 100644
index 75ba852c00..0000000000
--- a/Godeps/_workspace/src/github.com/containernetworking/cni/plugins/meta/tuning/tuning.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2016 CNI authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This is a "meta-plugin". It reads in its own netconf, it does not create
-// any network interface but just changes the network sysctl.
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-	"strings"
-
-	"github.com/containernetworking/cni/pkg/ns"
-	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types"
-)
-
-// TuningConf represents the network tuning configuration.
-type TuningConf struct {
-	types.NetConf
-	SysCtl map[string]string `json:"sysctl"`
-}
-
-func cmdAdd(args *skel.CmdArgs) error {
-	tuningConf := TuningConf{}
-	if err := json.Unmarshal(args.StdinData, &tuningConf); err != nil {
-		return fmt.Errorf("failed to load netconf: %v", err)
-	}
-
-	// The directory /proc/sys/net is per network namespace. Enter in the
-	// network namespace before writing on it.
-
-	err := ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
-		for key, value := range tuningConf.SysCtl {
-			fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1))
-			fileName = filepath.Clean(fileName)
-
-			// Refuse to modify sysctl parameters that don't belong
-			// to the network subsystem.
-			if !strings.HasPrefix(fileName, "/proc/sys/net/") {
-				return fmt.Errorf("invalid net sysctl key: %q", key)
-			}
-			content := []byte(value)
-			err := ioutil.WriteFile(fileName, content, 0644)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	result := types.Result{}
-	return result.Print()
-}
-
-func cmdDel(args *skel.CmdArgs) error {
-	// TODO: the settings are not reverted to the previous values. Reverting the
-	// settings is not useful when the whole container goes away but it could be
-	// useful in scenarios where plugins are added and removed at runtime.
-	return nil
-}
-
-func main() {
-	skel.PluginMain(cmdAdd, cmdDel)
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/gexpect/LICENCE b/Godeps/_workspace/src/github.com/coreos/gexpect/LICENCE
deleted file mode 100644
index 50adb0f19c..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/gexpect/LICENCE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (C) 2014 Thomas Rooney
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/coreos/gexpect/README.md b/Godeps/_workspace/src/github.com/coreos/gexpect/README.md
deleted file mode 100644
index 2f9a8b7ee4..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/gexpect/README.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# Gexpect
-
-Gexpect is a pure golang expect-like module.
-
-It makes it simpler to create and control other terminal applications.
-
-	child, err := gexpect.Spawn("python")
-	if err != nil {
-		panic(err)
-	}
-	child.Expect(">>>")
-	child.SendLine("print 'Hello World'")
-	child.Interact()
-	child.Close()
-
-## Examples
-
-`Spawn` handles the argument parsing from a string
-
-	child.Spawn("/bin/sh -c 'echo \"my complicated command\" | tee log | cat > log2'")
-	child.ReadLine() // ReadLine() (string, error)
-	child.ReadUntil(' ') // ReadUntil(delim byte) ([]byte, error)
-
-`ReadLine`, `ReadUntil` and `SendLine` send strings from/to `stdout/stdin` respectively
-
-	child := gexpect.Spawn("cat")
-	child.SendLine("echoing process_stdin") //  SendLine(command string) (error)
-	msg, _ := child.ReadLine() // msg = echoing process_stdin
-
-`Wait` and `Close` allow for graceful and ungraceful termination.
-
-	child.Wait() // Waits until the child terminates naturally.
-	child.Close() // Sends a kill command
-
-`AsyncInteractChannels` spawns two go routines to pipe into and from `stdout`/`stdin`, allowing for some usecases to be a little simpler.
-
-	child := gexpect.spawn("sh")
-	sender, receiver := child.AsyncInteractChannels()
-	sender <- "echo Hello World\n" // Send to stdin
-	line, open := <- receiver // Recieve a line from stdout/stderr
-	// When the subprocess stops (e.g. with child.Close()) , receiver is closed
-	if open {
-		fmt.Printf("Received %s", line)]
-	}
-
-`ExpectRegex` uses golang's internal regex engine to wait until a match from the process with the given regular expression (or an error on process termination with no match).
-
-	child := gexpect.Spawn("echo accb")	
-	match, _ := child.ExpectRegex("a..b")
-	// (match=true)
-
-`ExpectRegexFind` allows for groups to be extracted from process stdout. The first element is an array of containing the total matched text, followed by each subexpression group match.
-
-	child := gexpect.Spawn("echo 123 456 789")
-	result, _ := child.ExpectRegexFind("\d+ (\d+) (\d+)")
-	// result = []string{"123 456 789", "456", "789"}
-
-See `gexpect_test.go` and the `examples` folder for full syntax
-
-## Credits
-
-	github.com/kballard/go-shellquote	
-	github.com/kr/pty
-	KMP Algorithm: "http://blog.databigbang.com/searching-for-substrings-in-streams-a-slight-modification-of-the-knuth-morris-pratt-algorithm-in-haxe/"
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/coreos/gexpect/gexpect.go b/Godeps/_workspace/src/github.com/coreos/gexpect/gexpect.go
deleted file mode 100644
index 4ea620ef6e..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/gexpect/gexpect.go
+++ /dev/null
@@ -1,449 +0,0 @@
-// +build !windows
-
-package gexpect
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"regexp"
-	"time"
-	"unicode/utf8"
-
-	shell "github.com/kballard/go-shellquote"
-	"github.com/kr/pty"
-)
-
-var (
-	ErrEmptySearch = errors.New("empty search string")
-)
-
-type ExpectSubprocess struct {
-	Cmd          *exec.Cmd
-	buf          *buffer
-	outputBuffer []byte
-}
-
-type buffer struct {
-	f       *os.File
-	b       bytes.Buffer
-	collect bool
-
-	collection bytes.Buffer
-}
-
-func (buf *buffer) StartCollecting() {
-	buf.collect = true
-}
-
-func (buf *buffer) StopCollecting() (result string) {
-	result = string(buf.collection.Bytes())
-	buf.collect = false
-	buf.collection.Reset()
-	return result
-}
-
-func (buf *buffer) Read(chunk []byte) (int, error) {
-	nread := 0
-	if buf.b.Len() > 0 {
-		n, err := buf.b.Read(chunk)
-		if err != nil {
-			return n, err
-		}
-		if n == len(chunk) {
-			return n, nil
-		}
-		nread = n
-	}
-	fn, err := buf.f.Read(chunk[nread:])
-	return fn + nread, err
-}
-
-func (buf *buffer) ReadRune() (r rune, size int, err error) {
-	l := buf.b.Len()
-
-	chunk := make([]byte, utf8.UTFMax)
-	if l > 0 {
-		n, err := buf.b.Read(chunk)
-		if err != nil {
-			return 0, 0, err
-		}
-		if utf8.FullRune(chunk[:n]) {
-			r, rL := utf8.DecodeRune(chunk)
-			if n > rL {
-				buf.PutBack(chunk[rL:n])
-			}
-			if buf.collect {
-				buf.collection.WriteRune(r)
-			}
-			return r, rL, nil
-		}
-	}
-	// else add bytes from the file, then try that
-	for l < utf8.UTFMax {
-		fn, err := buf.f.Read(chunk[l : l+1])
-		if err != nil {
-			return 0, 0, err
-		}
-		l = l + fn
-
-		if utf8.FullRune(chunk[:l]) {
-			r, rL := utf8.DecodeRune(chunk)
-			if buf.collect {
-				buf.collection.WriteRune(r)
-			}
-			return r, rL, nil
-		}
-	}
-	return 0, 0, errors.New("File is not a valid UTF=8 encoding")
-}
-
-func (buf *buffer) PutBack(chunk []byte) {
-	if len(chunk) == 0 {
-		return
-	}
-	if buf.b.Len() == 0 {
-		buf.b.Write(chunk)
-		return
-	}
-	d := make([]byte, 0, len(chunk)+buf.b.Len())
-	d = append(d, chunk...)
-	d = append(d, buf.b.Bytes()...)
-	buf.b.Reset()
-	buf.b.Write(d)
-}
-
-func SpawnAtDirectory(command string, directory string) (*ExpectSubprocess, error) {
-	expect, err := _spawn(command)
-	if err != nil {
-		return nil, err
-	}
-	expect.Cmd.Dir = directory
-	return _start(expect)
-}
-
-func Command(command string) (*ExpectSubprocess, error) {
-	expect, err := _spawn(command)
-	if err != nil {
-		return nil, err
-	}
-	return expect, nil
-}
-
-func (expect *ExpectSubprocess) Start() error {
-	_, err := _start(expect)
-	return err
-}
-
-func Spawn(command string) (*ExpectSubprocess, error) {
-	expect, err := _spawn(command)
-	if err != nil {
-		return nil, err
-	}
-	return _start(expect)
-}
-
-func (expect *ExpectSubprocess) Close() error {
-	if err := expect.Cmd.Process.Kill(); err != nil {
-		return err
-	}
-	if err := expect.buf.f.Close(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (expect *ExpectSubprocess) AsyncInteractChannels() (send chan string, receive chan string) {
-	receive = make(chan string)
-	send = make(chan string)
-
-	go func() {
-		for {
-			str, err := expect.ReadLine()
-			if err != nil {
-				close(receive)
-				return
-			}
-			receive <- str
-		}
-	}()
-
-	go func() {
-		for {
-			select {
-			case sendCommand, exists := <-send:
-				{
-					if !exists {
-						return
-					}
-					err := expect.Send(sendCommand)
-					if err != nil {
-						receive <- "gexpect Error: " + err.Error()
-						return
-					}
-				}
-			}
-		}
-	}()
-
-	return
-}
-
-func (expect *ExpectSubprocess) ExpectRegex(regex string) (bool, error) {
-	return regexp.MatchReader(regex, expect.buf)
-}
-
-func (expect *ExpectSubprocess) expectRegexFind(regex string, output bool) ([]string, string, error) {
-	re, err := regexp.Compile(regex)
-	if err != nil {
-		return nil, "", err
-	}
-	expect.buf.StartCollecting()
-	pairs := re.FindReaderSubmatchIndex(expect.buf)
-	stringIndexedInto := expect.buf.StopCollecting()
-	l := len(pairs)
-	numPairs := l / 2
-	result := make([]string, numPairs)
-	for i := 0; i < numPairs; i += 1 {
-		result[i] = stringIndexedInto[pairs[i*2]:pairs[i*2+1]]
-	}
-	// convert indexes to strings
-
-	if len(result) == 0 {
-		err = fmt.Errorf("ExpectRegex didn't find regex '%v'.", regex)
-	} else {
-		// The number in pairs[1] is an index of a first
-		// character outside the whole match
-		putBackIdx := pairs[1]
-		if len(stringIndexedInto) > putBackIdx {
-			stringToPutBack := stringIndexedInto[putBackIdx:]
-			stringIndexedInto = stringIndexedInto[:putBackIdx]
-			expect.buf.PutBack([]byte(stringToPutBack))
-		}
-	}
-	return result, stringIndexedInto, err
-}
-
-func (expect *ExpectSubprocess) expectTimeoutRegexFind(regex string, timeout time.Duration) (result []string, out string, err error) {
-	t := make(chan bool)
-	go func() {
-		result, out, err = expect.ExpectRegexFindWithOutput(regex)
-		t <- false
-	}()
-	go func() {
-		time.Sleep(timeout)
-		err = fmt.Errorf("ExpectRegex timed out after %v finding '%v'.\nOutput:\n%s", timeout, regex, expect.Collect())
-		t <- true
-	}()
-	<-t
-	return result, out, err
-}
-
-func (expect *ExpectSubprocess) ExpectRegexFind(regex string) ([]string, error) {
-	result, _, err := expect.expectRegexFind(regex, false)
-	return result, err
-}
-
-func (expect *ExpectSubprocess) ExpectTimeoutRegexFind(regex string, timeout time.Duration) ([]string, error) {
-	result, _, err := expect.expectTimeoutRegexFind(regex, timeout)
-	return result, err
-}
-
-func (expect *ExpectSubprocess) ExpectRegexFindWithOutput(regex string) ([]string, string, error) {
-	return expect.expectRegexFind(regex, true)
-}
-
-func (expect *ExpectSubprocess) ExpectTimeoutRegexFindWithOutput(regex string, timeout time.Duration) ([]string, string, error) {
-	return expect.expectTimeoutRegexFind(regex, timeout)
-}
-
-func buildKMPTable(searchString string) []int {
-	pos := 2
-	cnd := 0
-	length := len(searchString)
-
-	var table []int
-	if length < 2 {
-		length = 2
-	}
-
-	table = make([]int, length)
-	table[0] = -1
-	table[1] = 0
-
-	for pos < len(searchString) {
-		if searchString[pos-1] == searchString[cnd] {
-			cnd += 1
-			table[pos] = cnd
-			pos += 1
-		} else if cnd > 0 {
-			cnd = table[cnd]
-		} else {
-			table[pos] = 0
-			pos += 1
-		}
-	}
-	return table
-}
-
-func (expect *ExpectSubprocess) ExpectTimeout(searchString string, timeout time.Duration) (e error) {
-	result := make(chan error)
-	go func() {
-		result <- expect.Expect(searchString)
-	}()
-	select {
-	case e = <-result:
-	case <-time.After(timeout):
-		e = fmt.Errorf("Expect timed out after %v waiting for '%v'.\nOutput:\n%s", timeout, searchString, expect.Collect())
-	}
-	return e
-}
-
-func (expect *ExpectSubprocess) Expect(searchString string) (e error) {
-	target := len(searchString)
-	if target < 1 {
-		return ErrEmptySearch
-	}
-	chunk := make([]byte, target*2)
-	if expect.outputBuffer != nil {
-		expect.outputBuffer = expect.outputBuffer[0:]
-	}
-	m := 0
-	i := 0
-	// Build KMP Table
-	table := buildKMPTable(searchString)
-
-	for {
-		n, err := expect.buf.Read(chunk)
-		if err != nil {
-			return err
-		}
-		if expect.outputBuffer != nil {
-			expect.outputBuffer = append(expect.outputBuffer, chunk[:n]...)
-		}
-		offset := m + i
-		for m+i-offset < n {
-			if searchString[i] == chunk[m+i-offset] {
-				i += 1
-				if i == target {
-					unreadIndex := m + i - offset
-					if len(chunk) > unreadIndex {
-						expect.buf.PutBack(chunk[unreadIndex:n])
-					}
-					return nil
-				}
-			} else {
-				m += i - table[i]
-				if table[i] > -1 {
-					i = table[i]
-				} else {
-					i = 0
-				}
-			}
-		}
-	}
-}
-
-func (expect *ExpectSubprocess) Send(command string) error {
-	_, err := io.WriteString(expect.buf.f, command)
-	return err
-}
-
-func (expect *ExpectSubprocess) Capture() {
-	if expect.outputBuffer == nil {
-		expect.outputBuffer = make([]byte, 0)
-	}
-}
-
-func (expect *ExpectSubprocess) Collect() []byte {
-	collectOutput := make([]byte, len(expect.outputBuffer))
-	copy(collectOutput, expect.outputBuffer)
-	expect.outputBuffer = nil
-	return collectOutput
-}
-
-func (expect *ExpectSubprocess) SendLine(command string) error {
-	_, err := io.WriteString(expect.buf.f, command+"\r\n")
-	return err
-}
-
-func (expect *ExpectSubprocess) Interact() {
-	defer expect.Cmd.Wait()
-	io.Copy(os.Stdout, &expect.buf.b)
-	go io.Copy(os.Stdout, expect.buf.f)
-	go io.Copy(expect.buf.f, os.Stdin)
-}
-
-func (expect *ExpectSubprocess) ReadUntil(delim byte) ([]byte, error) {
-	join := make([]byte, 0, 512)
-	chunk := make([]byte, 255)
-
-	for {
-		n, err := expect.buf.Read(chunk)
-
-		for i := 0; i < n; i++ {
-			if chunk[i] == delim {
-				if len(chunk) > i+1 {
-					expect.buf.PutBack(chunk[i+1:n])
-				}
-				return join, nil
-			} else {
-				join = append(join, chunk[i])
-			}
-		}
-
-		if err != nil {
-			return join, err
-		}
-	}
-}
-
-func (expect *ExpectSubprocess) Wait() error {
-	return expect.Cmd.Wait()
-}
-
-func (expect *ExpectSubprocess) ReadLine() (string, error) {
-	str, err := expect.ReadUntil('\n')
-	return string(str), err
-}
-
-func _start(expect *ExpectSubprocess) (*ExpectSubprocess, error) {
-	f, err := pty.Start(expect.Cmd)
-	if err != nil {
-		return nil, err
-	}
-	expect.buf.f = f
-
-	return expect, nil
-}
-
-func _spawn(command string) (*ExpectSubprocess, error) {
-	wrapper := new(ExpectSubprocess)
-
-	wrapper.outputBuffer = nil
-
-	splitArgs, err := shell.Split(command)
-	if err != nil {
-		return nil, err
-	}
-	numArguments := len(splitArgs) - 1
-	if numArguments < 0 {
-		return nil, errors.New("gexpect: No command given to spawn")
-	}
-	path, err := exec.LookPath(splitArgs[0])
-	if err != nil {
-		return nil, err
-	}
-
-	if numArguments >= 1 {
-		wrapper.Cmd = exec.Command(path, splitArgs[1:]...)
-	} else {
-		wrapper.Cmd = exec.Command(path)
-	}
-	wrapper.buf = new(buffer)
-
-	return wrapper, nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-iptables/LICENSE b/Godeps/_workspace/src/github.com/coreos/go-iptables/LICENSE
deleted file mode 100644
index 37ec93a14f..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-iptables/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go b/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go
deleted file mode 100644
index 4b2f2f2f4b..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/iptables.go
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package iptables
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os/exec"
-	"regexp"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-// Adds the output of stderr to exec.ExitError
-type Error struct {
-	exec.ExitError
-	msg string
-}
-
-func (e *Error) ExitStatus() int {
-	return e.Sys().(syscall.WaitStatus).ExitStatus()
-}
-
-func (e *Error) Error() string {
-	return fmt.Sprintf("exit status %v: %v", e.ExitStatus(), e.msg)
-}
-
-type IPTables struct {
-	path     string
-	hasCheck bool
-	hasWait  bool
-}
-
-func New() (*IPTables, error) {
-	path, err := exec.LookPath("iptables")
-	if err != nil {
-		return nil, err
-	}
-	checkPresent, waitPresent, err := getIptablesCommandSupport()
-	if err != nil {
-		return nil, fmt.Errorf("error checking iptables version: %v", err)
-	}
-	ipt := IPTables{
-		path:     path,
-		hasCheck: checkPresent,
-		hasWait:  waitPresent,
-	}
-	return &ipt, nil
-}
-
-// Exists checks if given rulespec in specified table/chain exists
-func (ipt *IPTables) Exists(table, chain string, rulespec ...string) (bool, error) {
-	if !ipt.hasCheck {
-		return ipt.existsForOldIptables(table, chain, rulespec)
-
-	}
-	cmd := append([]string{"-t", table, "-C", chain}, rulespec...)
-	err := ipt.run(cmd...)
-	eerr, eok := err.(*Error)
-	switch {
-	case err == nil:
-		return true, nil
-	case eok && eerr.ExitStatus() == 1:
-		return false, nil
-	default:
-		return false, err
-	}
-}
-
-// Insert inserts rulespec to specified table/chain (in specified pos)
-func (ipt *IPTables) Insert(table, chain string, pos int, rulespec ...string) error {
-	cmd := append([]string{"-t", table, "-I", chain, strconv.Itoa(pos)}, rulespec...)
-	return ipt.run(cmd...)
-}
-
-// Append appends rulespec to specified table/chain
-func (ipt *IPTables) Append(table, chain string, rulespec ...string) error {
-	cmd := append([]string{"-t", table, "-A", chain}, rulespec...)
-	return ipt.run(cmd...)
-}
-
-// AppendUnique acts like Append except that it won't add a duplicate
-func (ipt *IPTables) AppendUnique(table, chain string, rulespec ...string) error {
-	exists, err := ipt.Exists(table, chain, rulespec...)
-	if err != nil {
-		return err
-	}
-
-	if !exists {
-		return ipt.Append(table, chain, rulespec...)
-	}
-
-	return nil
-}
-
-// Delete removes rulespec in specified table/chain
-func (ipt *IPTables) Delete(table, chain string, rulespec ...string) error {
-	cmd := append([]string{"-t", table, "-D", chain}, rulespec...)
-	return ipt.run(cmd...)
-}
-
-// List rules in specified table/chain
-func (ipt *IPTables) List(table, chain string) ([]string, error) {
-	args := []string{"-t", table, "-S", chain}
-	var stdout bytes.Buffer
-	if err := ipt.runWithOutput(args, &stdout); err != nil {
-		return nil, err
-	}
-
-	rules := strings.Split(stdout.String(), "\n")
-	if len(rules) > 0 && rules[len(rules)-1] == "" {
-		rules = rules[:len(rules)-1]
-	}
-
-	return rules, nil
-}
-
-func (ipt *IPTables) NewChain(table, chain string) error {
-	return ipt.run("-t", table, "-N", chain)
-}
-
-// ClearChain flushed (deletes all rules) in the specified table/chain.
-// If the chain does not exist, a new one will be created
-func (ipt *IPTables) ClearChain(table, chain string) error {
-	err := ipt.NewChain(table, chain)
-
-	eerr, eok := err.(*Error)
-	switch {
-	case err == nil:
-		return nil
-	case eok && eerr.ExitStatus() == 1:
-		// chain already exists. Flush (clear) it.
-		return ipt.run("-t", table, "-F", chain)
-	default:
-		return err
-	}
-}
-
-// RenameChain renames the old chain to the new one.
-func (ipt *IPTables) RenameChain(table, oldChain, newChain string) error {
-	return ipt.run("-t", table, "-E", oldChain, newChain)
-}
-
-// DeleteChain deletes the chain in the specified table.
-// The chain must be empty
-func (ipt *IPTables) DeleteChain(table, chain string) error {
-	return ipt.run("-t", table, "-X", chain)
-}
-
-// run runs an iptables command with the given arguments, ignoring
-// any stdout output
-func (ipt *IPTables) run(args ...string) error {
-	return ipt.runWithOutput(args, nil)
-}
-
-// runWithOutput runs an iptables command with the given arguments,
-// writing any stdout output to the given writer
-func (ipt *IPTables) runWithOutput(args []string, stdout io.Writer) error {
-	args = append([]string{ipt.path}, args...)
-	if ipt.hasWait {
-		args = append(args, "--wait")
-	} else {
-		fmu, err := newXtablesFileLock()
-		if err != nil {
-			return err
-		}
-		ul, err := fmu.tryLock()
-		if err != nil {
-			return err
-		}
-		defer ul.Unlock()
-	}
-
-	var stderr bytes.Buffer
-	cmd := exec.Cmd{
-		Path:   ipt.path,
-		Args:   args,
-		Stdout: stdout,
-		Stderr: &stderr,
-	}
-
-	if err := cmd.Run(); err != nil {
-		return &Error{*(err.(*exec.ExitError)), stderr.String()}
-	}
-
-	return nil
-}
-
-// Checks if iptables has the "-C" and "--wait" flag
-func getIptablesCommandSupport() (bool, bool, error) {
-	vstring, err := getIptablesVersionString()
-	if err != nil {
-		return false, false, err
-	}
-
-	v1, v2, v3, err := extractIptablesVersion(vstring)
-	if err != nil {
-		return false, false, err
-	}
-
-	return iptablesHasCheckCommand(v1, v2, v3), iptablesHasWaitCommand(v1, v2, v3), nil
-}
-
-// getIptablesVersion returns the first three components of the iptables version.
-// e.g. "iptables v1.3.66" would return (1, 3, 66, nil)
-func extractIptablesVersion(str string) (int, int, int, error) {
-	versionMatcher := regexp.MustCompile("v([0-9]+)\\.([0-9]+)\\.([0-9]+)")
-	result := versionMatcher.FindStringSubmatch(str)
-	if result == nil {
-		return 0, 0, 0, fmt.Errorf("no iptables version found in string: %s", str)
-	}
-
-	v1, err := strconv.Atoi(result[1])
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
-	v2, err := strconv.Atoi(result[2])
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
-	v3, err := strconv.Atoi(result[3])
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
-	return v1, v2, v3, nil
-}
-
-// Runs "iptables --version" to get the version string
-func getIptablesVersionString() (string, error) {
-	cmd := exec.Command("iptables", "--version")
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return "", err
-	}
-	return out.String(), nil
-}
-
-// Checks if an iptables version is after 1.4.11, when --check was added
-func iptablesHasCheckCommand(v1 int, v2 int, v3 int) bool {
-	if v1 > 1 {
-		return true
-	}
-	if v1 == 1 && v2 > 4 {
-		return true
-	}
-	if v1 == 1 && v2 == 4 && v3 >= 11 {
-		return true
-	}
-	return false
-}
-
-// Checks if an iptables version is after 1.4.20, when --wait was added
-func iptablesHasWaitCommand(v1 int, v2 int, v3 int) bool {
-	if v1 > 1 {
-		return true
-	}
-	if v1 == 1 && v2 > 4 {
-		return true
-	}
-	if v1 == 1 && v2 == 4 && v3 >= 20 {
-		return true
-	}
-	return false
-}
-
-// Checks if a rule specification exists for a table
-func (ipt *IPTables) existsForOldIptables(table, chain string, rulespec []string) (bool, error) {
-	rs := strings.Join(append([]string{"-A", chain}, rulespec...), " ")
-	args := []string{"-t", table, "-S"}
-	var stdout bytes.Buffer
-	err := ipt.runWithOutput(args, &stdout)
-	if err != nil {
-		return false, err
-	}
-	return strings.Contains(stdout.String(), rs), nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/lock.go b/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/lock.go
deleted file mode 100644
index a88e92b4e4..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables/lock.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package iptables
-
-import (
-	"os"
-	"sync"
-	"syscall"
-)
-
-const (
-	// In earlier versions of iptables, the xtables lock was implemented
-	// via a Unix socket, but now flock is used via this lockfile:
-	// http://git.netfilter.org/iptables/commit/?id=aa562a660d1555b13cffbac1e744033e91f82707
-	// Note the LSB-conforming "/run" directory does not exist on old
-	// distributions, so assume "/var" is symlinked
-	xtablesLockFilePath = "/var/run/xtables.lock"
-
-	defaultFilePerm = 0600
-)
-
-type Unlocker interface {
-	Unlock() error
-}
-
-type nopUnlocker struct{}
-
-func (_ nopUnlocker) Unlock() error { return nil }
-
-type fileLock struct {
-	// mu is used to protect against concurrent invocations from within this process
-	mu sync.Mutex
-	fd int
-}
-
-// tryLock takes an exclusive lock on the xtables lock file without blocking.
-// This is best-effort only: if the exclusive lock would block (i.e. because
-// another process already holds it), no error is returned. Otherwise, any
-// error encountered during the locking operation is returned.
-// The returned Unlocker should be used to release the lock when the caller is
-// done invoking iptables commands.
-func (l *fileLock) tryLock() (Unlocker, error) {
-	l.mu.Lock()
-	err := syscall.Flock(l.fd, syscall.LOCK_EX|syscall.LOCK_NB)
-	switch err {
-	case syscall.EWOULDBLOCK:
-		l.mu.Unlock()
-		return nopUnlocker{}, nil
-	case nil:
-		return l, nil
-	default:
-		l.mu.Unlock()
-		return nil, err
-	}
-}
-
-// Unlock closes the underlying file, which implicitly unlocks it as well. It
-// also unlocks the associated mutex.
-func (l *fileLock) Unlock() error {
-	defer l.mu.Unlock()
-	return syscall.Close(l.fd)
-}
-
-// newXtablesFileLock opens a new lock on the xtables lockfile without
-// acquiring the lock
-func newXtablesFileLock() (*fileLock, error) {
-	fd, err := syscall.Open(xtablesLockFilePath, os.O_CREATE, defaultFilePerm)
-	if err != nil {
-		return nil, err
-	}
-	return &fileLock{fd: fd}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-semver/LICENSE b/Godeps/_workspace/src/github.com/coreos/go-semver/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-semver/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/coreos/go-semver/semver/semver.go b/Godeps/_workspace/src/github.com/coreos/go-semver/semver/semver.go
deleted file mode 100644
index 4e10221a18..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-semver/semver/semver.go
+++ /dev/null
@@ -1,202 +0,0 @@
-package semver
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-type Version struct {
-	Major      int64
-	Minor      int64
-	Patch      int64
-	PreRelease PreRelease
-	Metadata   string
-}
-
-type PreRelease string
-
-func splitOff(input *string, delim string) (val string) {
-	parts := strings.SplitN(*input, delim, 2)
-
-	if len(parts) == 2 {
-		*input = parts[0]
-		val = parts[1]
-	}
-
-	return val
-}
-
-func NewVersion(version string) (*Version, error) {
-	v := Version{}
-
-	dotParts := strings.SplitN(version, ".", 3)
-
-	if len(dotParts) != 3 {
-		return nil, errors.New(fmt.Sprintf("%s is not in dotted-tri format", version))
-	}
-
-	v.Metadata = splitOff(&dotParts[2], "+")
-	v.PreRelease = PreRelease(splitOff(&dotParts[2], "-"))
-
-	parsed := make([]int64, 3, 3)
-
-	for i, v := range dotParts[:3] {
-		val, err := strconv.ParseInt(v, 10, 64)
-		parsed[i] = val
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	v.Major = parsed[0]
-	v.Minor = parsed[1]
-	v.Patch = parsed[2]
-
-	return &v, nil
-}
-
-func (v *Version) String() string {
-	var buffer bytes.Buffer
-
-	base := fmt.Sprintf("%d.%d.%d", v.Major, v.Minor, v.Patch)
-	buffer.WriteString(base)
-
-	if v.PreRelease != "" {
-		buffer.WriteString(fmt.Sprintf("-%s", v.PreRelease))
-	}
-
-	if v.Metadata != "" {
-		buffer.WriteString(fmt.Sprintf("+%s", v.Metadata))
-	}
-
-	return buffer.String()
-}
-
-func (v *Version) LessThan(versionB Version) bool {
-	versionA := *v
-	cmp := recursiveCompare(versionA.Slice(), versionB.Slice())
-
-	if cmp == 0 {
-		cmp = preReleaseCompare(versionA, versionB)
-	}
-
-	if cmp == -1 {
-		return true
-	}
-
-	return false
-}
-
-/* Slice converts the comparable parts of the semver into a slice of strings */
-func (v *Version) Slice() []int64 {
-	return []int64{v.Major, v.Minor, v.Patch}
-}
-
-func (p *PreRelease) Slice() []string {
-	preRelease := string(*p)
-	return strings.Split(preRelease, ".")
-}
-
-func preReleaseCompare(versionA Version, versionB Version) int {
-	a := versionA.PreRelease
-	b := versionB.PreRelease
-
-	/* Handle the case where if two versions are otherwise equal it is the
-	 * one without a PreRelease that is greater */
-	if len(a) == 0 && (len(b) > 0) {
-		return 1
-	} else if len(b) == 0 && (len(a) > 0) {
-		return -1
-	}
-
-	// If there is a prelease, check and compare each part.
-	return recursivePreReleaseCompare(a.Slice(), b.Slice())
-}
-
-func recursiveCompare(versionA []int64, versionB []int64) int {
-	if len(versionA) == 0 {
-		return 0
-	}
-
-	a := versionA[0]
-	b := versionB[0]
-
-	if a > b {
-		return 1
-	} else if a < b {
-		return -1
-	}
-
-	return recursiveCompare(versionA[1:], versionB[1:])
-}
-
-func recursivePreReleaseCompare(versionA []string, versionB []string) int {
-	// Handle slice length disparity.
-	if len(versionA) == 0 {
-		// Nothing to compare too, so we return 0
-		return 0
-	} else if len(versionB) == 0 {
-		// We're longer than versionB so return 1.
-		return 1
-	}
-
-	a := versionA[0]
-	b := versionB[0]
-
-	aInt := false; bInt := false
-
-	aI, err := strconv.Atoi(versionA[0])
-	if err == nil {
-		aInt = true
-	}
-
-	bI, err := strconv.Atoi(versionB[0])
-	if err == nil {
-		bInt = true
-	}
-
-	// Handle Integer Comparison
-	if aInt && bInt {
-		if aI > bI {
-			return 1
-		} else if aI < bI {
-			return -1
-		}
-	}
-
-	// Handle String Comparison
-	if a > b {
-		return 1
-	} else if a < b {
-		return -1
-	}
-
-	return recursivePreReleaseCompare(versionA[1:], versionB[1:])
-}
-
-// BumpMajor increments the Major field by 1 and resets all other fields to their default values
-func (v *Version) BumpMajor() {
-	v.Major += 1
-	v.Minor = 0
-	v.Patch = 0
-	v.PreRelease = PreRelease("")
-	v.Metadata = ""
-}
-
-// BumpMinor increments the Minor field by 1 and resets all other fields to their default values
-func (v *Version) BumpMinor() {
-	v.Minor += 1
-	v.Patch = 0
-	v.PreRelease = PreRelease("")
-	v.Metadata = ""
-}
-
-// BumpPatch increments the Patch field by 1 and resets all other fields to their default values
-func (v *Version) BumpPatch() {
-	v.Patch += 1
-	v.PreRelease = PreRelease("")
-	v.Metadata = ""
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-semver/semver/sort.go b/Godeps/_workspace/src/github.com/coreos/go-semver/semver/sort.go
deleted file mode 100644
index 86203007ae..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-semver/semver/sort.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package semver
-
-import (
-	"sort"
-)
-
-type Versions []*Version
-
-func (s Versions) Len() int {
-	return len(s)
-}
-
-func (s Versions) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s Versions) Less(i, j int) bool {
-	return s[i].LessThan(*s[j])
-}
-
-// Sort sorts the given slice of Version
-func Sort(versions []*Version) {
-	sort.Sort(Versions(versions))
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE b/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
deleted file mode 100644
index 37ec93a14f..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files.go
deleted file mode 100644
index c8e85fcd58..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package activation implements primitives for systemd socket activation.
-package activation
-
-import (
-	"os"
-	"strconv"
-	"syscall"
-)
-
-// based on: https://gist.github.com/alberts/4640792
-const (
-	listenFdsStart = 3
-)
-
-func Files(unsetEnv bool) []*os.File {
-	if unsetEnv {
-		defer os.Unsetenv("LISTEN_PID")
-		defer os.Unsetenv("LISTEN_FDS")
-	}
-
-	pid, err := strconv.Atoi(os.Getenv("LISTEN_PID"))
-	if err != nil || pid != os.Getpid() {
-		return nil
-	}
-
-	nfds, err := strconv.Atoi(os.Getenv("LISTEN_FDS"))
-	if err != nil || nfds == 0 {
-		return nil
-	}
-
-	files := make([]*os.File, 0, nfds)
-	for fd := listenFdsStart; fd < listenFdsStart+nfds; fd++ {
-		syscall.CloseOnExec(fd)
-		files = append(files, os.NewFile(uintptr(fd), "LISTEN_FD_"+strconv.Itoa(fd)))
-	}
-
-	return files
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners.go
deleted file mode 100644
index df27c29e9e..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"crypto/tls"
-	"net"
-)
-
-// Listeners returns a slice containing a net.Listener for each matching socket type
-// passed to this process.
-//
-// The order of the file descriptors is preserved in the returned slice.
-// Nil values are used to fill any gaps. For example if systemd were to return file descriptors
-// corresponding with "udp, tcp, tcp", then the slice would contain {nil, net.Listener, net.Listener}
-func Listeners(unsetEnv bool) ([]net.Listener, error) {
-	files := Files(unsetEnv)
-	listeners := make([]net.Listener, len(files))
-
-	for i, f := range files {
-		if pc, err := net.FileListener(f); err == nil {
-			listeners[i] = pc
-		}
-	}
-	return listeners, nil
-}
-
-// TLSListeners returns a slice containing a net.listener for each matching TCP socket type
-// passed to this process.
-// It uses default Listeners func and forces TCP sockets handlers to use TLS based on tlsConfig.
-func TLSListeners(unsetEnv bool, tlsConfig *tls.Config) ([]net.Listener, error) {
-	listeners, err := Listeners(unsetEnv)
-
-	if listeners == nil || err != nil {
-		return nil, err
-	}
-
-	if tlsConfig != nil && err == nil {
-		tlsConfig.NextProtos = []string{"http/1.1"}
-
-		for i, l := range listeners {
-			// Activate TLS only for TCP sockets
-			if l.Addr().Network() == "tcp" {
-				listeners[i] = tls.NewListener(l, tlsConfig)
-			}
-		}
-	}
-
-	return listeners, err
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns.go
deleted file mode 100644
index 48b2ca029d..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"net"
-)
-
-// PacketConns returns a slice containing a net.PacketConn for each matching socket type
-// passed to this process.
-//
-// The order of the file descriptors is preserved in the returned slice.
-// Nil values are used to fill any gaps. For example if systemd were to return file descriptors
-// corresponding with "udp, tcp, udp", then the slice would contain {net.PacketConn, nil, net.PacketConn}
-func PacketConns(unsetEnv bool) ([]net.PacketConn, error) {
-	files := Files(unsetEnv)
-	conns := make([]net.PacketConn, len(files))
-
-	for i, f := range files {
-		if pc, err := net.FilePacketConn(f); err == nil {
-			conns[i] = pc
-		}
-	}
-	return conns, nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go
deleted file mode 100644
index 1699b90332..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Integration with the systemd D-Bus API.  See http://www.freedesktop.org/wiki/Software/systemd/dbus/
-package dbus
-
-import (
-	"fmt"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/godbus/dbus"
-)
-
-const (
-	alpha        = `abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ`
-	num          = `0123456789`
-	alphanum     = alpha + num
-	signalBuffer = 100
-)
-
-// needsEscape checks whether a byte in a potential dbus ObjectPath needs to be escaped
-func needsEscape(i int, b byte) bool {
-	// Escape everything that is not a-z-A-Z-0-9
-	// Also escape 0-9 if it's the first character
-	return strings.IndexByte(alphanum, b) == -1 ||
-		(i == 0 && strings.IndexByte(num, b) != -1)
-}
-
-// PathBusEscape sanitizes a constituent string of a dbus ObjectPath using the
-// rules that systemd uses for serializing special characters.
-func PathBusEscape(path string) string {
-	// Special case the empty string
-	if len(path) == 0 {
-		return "_"
-	}
-	n := []byte{}
-	for i := 0; i < len(path); i++ {
-		c := path[i]
-		if needsEscape(i, c) {
-			e := fmt.Sprintf("_%x", c)
-			n = append(n, []byte(e)...)
-		} else {
-			n = append(n, c)
-		}
-	}
-	return string(n)
-}
-
-// Conn is a connection to systemd's dbus endpoint.
-type Conn struct {
-	// sysconn/sysobj are only used to call dbus methods
-	sysconn *dbus.Conn
-	sysobj  dbus.BusObject
-
-	// sigconn/sigobj are only used to receive dbus signals
-	sigconn *dbus.Conn
-	sigobj  dbus.BusObject
-
-	jobListener struct {
-		jobs map[dbus.ObjectPath]chan<- string
-		sync.Mutex
-	}
-	subscriber struct {
-		updateCh chan<- *SubStateUpdate
-		errCh    chan<- error
-		sync.Mutex
-		ignore      map[dbus.ObjectPath]int64
-		cleanIgnore int64
-	}
-}
-
-// New establishes a connection to the system bus and authenticates.
-// Callers should call Close() when done with the connection.
-func New() (*Conn, error) {
-	return NewConnection(func() (*dbus.Conn, error) {
-		return dbusAuthHelloConnection(dbus.SystemBusPrivate)
-	})
-}
-
-// NewUserConnection establishes a connection to the session bus and
-// authenticates. This can be used to connect to systemd user instances.
-// Callers should call Close() when done with the connection.
-func NewUserConnection() (*Conn, error) {
-	return NewConnection(func() (*dbus.Conn, error) {
-		return dbusAuthHelloConnection(dbus.SessionBusPrivate)
-	})
-}
-
-// NewSystemdConnection establishes a private, direct connection to systemd.
-// This can be used for communicating with systemd without a dbus daemon.
-// Callers should call Close() when done with the connection.
-func NewSystemdConnection() (*Conn, error) {
-	return NewConnection(func() (*dbus.Conn, error) {
-		// We skip Hello when talking directly to systemd.
-		return dbusAuthConnection(func() (*dbus.Conn, error) {
-			return dbus.Dial("unix:path=/run/systemd/private")
-		})
-	})
-}
-
-// Close closes an established connection
-func (c *Conn) Close() {
-	c.sysconn.Close()
-	c.sigconn.Close()
-}
-
-// NewConnection establishes a connection to a bus using a caller-supplied function.
-// This allows connecting to remote buses through a user-supplied mechanism.
-// The supplied function may be called multiple times, and should return independent connections.
-// The returned connection must be fully initialised: the org.freedesktop.DBus.Hello call must have succeeded,
-// and any authentication should be handled by the function.
-func NewConnection(dialBus func() (*dbus.Conn, error)) (*Conn, error) {
-	sysconn, err := dialBus()
-	if err != nil {
-		return nil, err
-	}
-
-	sigconn, err := dialBus()
-	if err != nil {
-		sysconn.Close()
-		return nil, err
-	}
-
-	c := &Conn{
-		sysconn: sysconn,
-		sysobj:  systemdObject(sysconn),
-		sigconn: sigconn,
-		sigobj:  systemdObject(sigconn),
-	}
-
-	c.subscriber.ignore = make(map[dbus.ObjectPath]int64)
-	c.jobListener.jobs = make(map[dbus.ObjectPath]chan<- string)
-
-	// Setup the listeners on jobs so that we can get completions
-	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
-		"type='signal', interface='org.freedesktop.systemd1.Manager', member='JobRemoved'")
-
-	c.dispatch()
-	return c, nil
-}
-
-// GetManagerProperty returns the value of a property on the org.freedesktop.systemd1.Manager
-// interface. The value is returned in its string representation, as defined at
-// https://developer.gnome.org/glib/unstable/gvariant-text.html
-func (c *Conn) GetManagerProperty(prop string) (string, error) {
-	variant, err := c.sysobj.GetProperty("org.freedesktop.systemd1.Manager." + prop)
-	if err != nil {
-		return "", err
-	}
-	return variant.String(), nil
-}
-
-func dbusAuthConnection(createBus func() (*dbus.Conn, error)) (*dbus.Conn, error) {
-	conn, err := createBus()
-	if err != nil {
-		return nil, err
-	}
-
-	// Only use EXTERNAL method, and hardcode the uid (not username)
-	// to avoid a username lookup (which requires a dynamically linked
-	// libc)
-	methods := []dbus.Auth{dbus.AuthExternal(strconv.Itoa(os.Getuid()))}
-
-	err = conn.Auth(methods)
-	if err != nil {
-		conn.Close()
-		return nil, err
-	}
-
-	return conn, nil
-}
-
-func dbusAuthHelloConnection(createBus func() (*dbus.Conn, error)) (*dbus.Conn, error) {
-	conn, err := dbusAuthConnection(createBus)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = conn.Hello(); err != nil {
-		conn.Close()
-		return nil, err
-	}
-
-	return conn, nil
-}
-
-func systemdObject(conn *dbus.Conn) dbus.BusObject {
-	return conn.Object("org.freedesktop.systemd1", dbus.ObjectPath("/org/freedesktop/systemd1"))
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
deleted file mode 100644
index 8f32fe8a7d..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
+++ /dev/null
@@ -1,484 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"errors"
-	"path"
-	"strconv"
-
-	"github.com/godbus/dbus"
-)
-
-func (c *Conn) jobComplete(signal *dbus.Signal) {
-	var id uint32
-	var job dbus.ObjectPath
-	var unit string
-	var result string
-	dbus.Store(signal.Body, &id, &job, &unit, &result)
-	c.jobListener.Lock()
-	out, ok := c.jobListener.jobs[job]
-	if ok {
-		out <- result
-		delete(c.jobListener.jobs, job)
-	}
-	c.jobListener.Unlock()
-}
-
-func (c *Conn) startJob(ch chan<- string, job string, args ...interface{}) (int, error) {
-	if ch != nil {
-		c.jobListener.Lock()
-		defer c.jobListener.Unlock()
-	}
-
-	var p dbus.ObjectPath
-	err := c.sysobj.Call(job, 0, args...).Store(&p)
-	if err != nil {
-		return 0, err
-	}
-
-	if ch != nil {
-		c.jobListener.jobs[p] = ch
-	}
-
-	// ignore error since 0 is fine if conversion fails
-	jobID, _ := strconv.Atoi(path.Base(string(p)))
-
-	return jobID, nil
-}
-
-// StartUnit enqueues a start job and depending jobs, if any (unless otherwise
-// specified by the mode string).
-//
-// Takes the unit to activate, plus a mode string. The mode needs to be one of
-// replace, fail, isolate, ignore-dependencies, ignore-requirements. If
-// "replace" the call will start the unit and its dependencies, possibly
-// replacing already queued jobs that conflict with this. If "fail" the call
-// will start the unit and its dependencies, but will fail if this would change
-// an already queued job. If "isolate" the call will start the unit in question
-// and terminate all units that aren't dependencies of it. If
-// "ignore-dependencies" it will start a unit but ignore all its dependencies.
-// If "ignore-requirements" it will start a unit but only ignore the
-// requirement dependencies. It is not recommended to make use of the latter
-// two options.
-//
-// If the provided channel is non-nil, a result string will be sent to it upon
-// job completion: one of done, canceled, timeout, failed, dependency, skipped.
-// done indicates successful execution of a job. canceled indicates that a job
-// has been canceled  before it finished execution. timeout indicates that the
-// job timeout was reached. failed indicates that the job failed. dependency
-// indicates that a job this job has been depending on failed and the job hence
-// has been removed too. skipped indicates that a job was skipped because it
-// didn't apply to the units current state.
-//
-// If no error occurs, the ID of the underlying systemd job will be returned. There
-// does exist the possibility for no error to be returned, but for the returned job
-// ID to be 0. In this case, the actual underlying ID is not 0 and this datapoint
-// should not be considered authoritative.
-//
-// If an error does occur, it will be returned to the user alongside a job ID of 0.
-func (c *Conn) StartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.StartUnit", name, mode)
-}
-
-// StopUnit is similar to StartUnit but stops the specified unit rather
-// than starting it.
-func (c *Conn) StopUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.StopUnit", name, mode)
-}
-
-// ReloadUnit reloads a unit.  Reloading is done only if the unit is already running and fails otherwise.
-func (c *Conn) ReloadUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadUnit", name, mode)
-}
-
-// RestartUnit restarts a service.  If a service is restarted that isn't
-// running it will be started.
-func (c *Conn) RestartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.RestartUnit", name, mode)
-}
-
-// TryRestartUnit is like RestartUnit, except that a service that isn't running
-// is not affected by the restart.
-func (c *Conn) TryRestartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.TryRestartUnit", name, mode)
-}
-
-// ReloadOrRestart attempts a reload if the unit supports it and use a restart
-// otherwise.
-func (c *Conn) ReloadOrRestartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadOrRestartUnit", name, mode)
-}
-
-// ReloadOrTryRestart attempts a reload if the unit supports it and use a "Try"
-// flavored restart otherwise.
-func (c *Conn) ReloadOrTryRestartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadOrTryRestartUnit", name, mode)
-}
-
-// StartTransientUnit() may be used to create and start a transient unit, which
-// will be released as soon as it is not running or referenced anymore or the
-// system is rebooted. name is the unit name including suffix, and must be
-// unique. mode is the same as in StartUnit(), properties contains properties
-// of the unit.
-func (c *Conn) StartTransientUnit(name string, mode string, properties []Property, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.StartTransientUnit", name, mode, properties, make([]PropertyCollection, 0))
-}
-
-// KillUnit takes the unit name and a UNIX signal number to send.  All of the unit's
-// processes are killed.
-func (c *Conn) KillUnit(name string, signal int32) {
-	c.sysobj.Call("org.freedesktop.systemd1.Manager.KillUnit", 0, name, "all", signal).Store()
-}
-
-// ResetFailedUnit resets the "failed" state of a specific unit.
-func (c *Conn) ResetFailedUnit(name string) error {
-	return c.sysobj.Call("org.freedesktop.systemd1.Manager.ResetFailedUnit", 0, name).Store()
-}
-
-// getProperties takes the unit name and returns all of its dbus object properties, for the given dbus interface
-func (c *Conn) getProperties(unit string, dbusInterface string) (map[string]interface{}, error) {
-	var err error
-	var props map[string]dbus.Variant
-
-	path := unitPath(unit)
-	if !path.IsValid() {
-		return nil, errors.New("invalid unit name: " + unit)
-	}
-
-	obj := c.sysconn.Object("org.freedesktop.systemd1", path)
-	err = obj.Call("org.freedesktop.DBus.Properties.GetAll", 0, dbusInterface).Store(&props)
-	if err != nil {
-		return nil, err
-	}
-
-	out := make(map[string]interface{}, len(props))
-	for k, v := range props {
-		out[k] = v.Value()
-	}
-
-	return out, nil
-}
-
-// GetUnitProperties takes the unit name and returns all of its dbus object properties.
-func (c *Conn) GetUnitProperties(unit string) (map[string]interface{}, error) {
-	return c.getProperties(unit, "org.freedesktop.systemd1.Unit")
-}
-
-func (c *Conn) getProperty(unit string, dbusInterface string, propertyName string) (*Property, error) {
-	var err error
-	var prop dbus.Variant
-
-	path := unitPath(unit)
-	if !path.IsValid() {
-		return nil, errors.New("invalid unit name: " + unit)
-	}
-
-	obj := c.sysconn.Object("org.freedesktop.systemd1", path)
-	err = obj.Call("org.freedesktop.DBus.Properties.Get", 0, dbusInterface, propertyName).Store(&prop)
-	if err != nil {
-		return nil, err
-	}
-
-	return &Property{Name: propertyName, Value: prop}, nil
-}
-
-func (c *Conn) GetUnitProperty(unit string, propertyName string) (*Property, error) {
-	return c.getProperty(unit, "org.freedesktop.systemd1.Unit", propertyName)
-}
-
-// GetServiceProperty returns property for given service name and property name
-func (c *Conn) GetServiceProperty(service string, propertyName string) (*Property, error) {
-	return c.getProperty(service, "org.freedesktop.systemd1.Service", propertyName)
-}
-
-// GetUnitTypeProperties returns the extra properties for a unit, specific to the unit type.
-// Valid values for unitType: Service, Socket, Target, Device, Mount, Automount, Snapshot, Timer, Swap, Path, Slice, Scope
-// return "dbus.Error: Unknown interface" if the unitType is not the correct type of the unit
-func (c *Conn) GetUnitTypeProperties(unit string, unitType string) (map[string]interface{}, error) {
-	return c.getProperties(unit, "org.freedesktop.systemd1."+unitType)
-}
-
-// SetUnitProperties() may be used to modify certain unit properties at runtime.
-// Not all properties may be changed at runtime, but many resource management
-// settings (primarily those in systemd.cgroup(5)) may. The changes are applied
-// instantly, and stored on disk for future boots, unless runtime is true, in which
-// case the settings only apply until the next reboot. name is the name of the unit
-// to modify. properties are the settings to set, encoded as an array of property
-// name and value pairs.
-func (c *Conn) SetUnitProperties(name string, runtime bool, properties ...Property) error {
-	return c.sysobj.Call("org.freedesktop.systemd1.Manager.SetUnitProperties", 0, name, runtime, properties).Store()
-}
-
-func (c *Conn) GetUnitTypeProperty(unit string, unitType string, propertyName string) (*Property, error) {
-	return c.getProperty(unit, "org.freedesktop.systemd1."+unitType, propertyName)
-}
-
-type UnitStatus struct {
-	Name        string          // The primary unit name as string
-	Description string          // The human readable description string
-	LoadState   string          // The load state (i.e. whether the unit file has been loaded successfully)
-	ActiveState string          // The active state (i.e. whether the unit is currently started or not)
-	SubState    string          // The sub state (a more fine-grained version of the active state that is specific to the unit type, which the active state is not)
-	Followed    string          // A unit that is being followed in its state by this unit, if there is any, otherwise the empty string.
-	Path        dbus.ObjectPath // The unit object path
-	JobId       uint32          // If there is a job queued for the job unit the numeric job id, 0 otherwise
-	JobType     string          // The job type as string
-	JobPath     dbus.ObjectPath // The job object path
-}
-
-type storeFunc func(retvalues ...interface{}) error
-
-func (c *Conn) listUnitsInternal(f storeFunc) ([]UnitStatus, error) {
-	result := make([][]interface{}, 0)
-	err := f(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	status := make([]UnitStatus, len(result))
-	statusInterface := make([]interface{}, len(status))
-	for i := range status {
-		statusInterface[i] = &status[i]
-	}
-
-	err = dbus.Store(resultInterface, statusInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return status, nil
-}
-
-// ListUnits returns an array with all currently loaded units. Note that
-// units may be known by multiple names at the same time, and hence there might
-// be more unit names loaded than actual units behind them.
-func (c *Conn) ListUnits() ([]UnitStatus, error) {
-	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnits", 0).Store)
-}
-
-// ListUnitsFiltered returns an array with units filtered by state.
-// It takes a list of units' statuses to filter.
-func (c *Conn) ListUnitsFiltered(states []string) ([]UnitStatus, error) {
-	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsFiltered", 0, states).Store)
-}
-
-// ListUnitsByPatterns returns an array with units.
-// It takes a list of units' statuses and names to filter.
-// Note that units may be known by multiple names at the same time,
-// and hence there might be more unit names loaded than actual units behind them.
-func (c *Conn) ListUnitsByPatterns(states []string, patterns []string) ([]UnitStatus, error) {
-	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByPatterns", 0, states, patterns).Store)
-}
-
-// ListUnitsByNames returns an array with units. It takes a list of units'
-// names and returns an UnitStatus array. Comparing to ListUnitsByPatterns
-// method, this method returns statuses even for inactive or non-existing
-// units. Input array should contain exact unit names, but not patterns.
-func (c *Conn) ListUnitsByNames(units []string) ([]UnitStatus, error) {
-	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByNames", 0, units).Store)
-}
-
-type UnitFile struct {
-	Path string
-	Type string
-}
-
-func (c *Conn) listUnitFilesInternal(f storeFunc) ([]UnitFile, error) {
-	result := make([][]interface{}, 0)
-	err := f(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	files := make([]UnitFile, len(result))
-	fileInterface := make([]interface{}, len(files))
-	for i := range files {
-		fileInterface[i] = &files[i]
-	}
-
-	err = dbus.Store(resultInterface, fileInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return files, nil
-}
-
-// ListUnitFiles returns an array of all available units on disk.
-func (c *Conn) ListUnitFiles() ([]UnitFile, error) {
-	return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFiles", 0).Store)
-}
-
-// ListUnitFilesByPatterns returns an array of all available units on disk matched the patterns.
-func (c *Conn) ListUnitFilesByPatterns(states []string, patterns []string) ([]UnitFile, error) {
-	return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFilesByPatterns", 0, states, patterns).Store)
-}
-
-type LinkUnitFileChange EnableUnitFileChange
-
-// LinkUnitFiles() links unit files (that are located outside of the
-// usual unit search paths) into the unit search path.
-//
-// It takes a list of absolute paths to unit files to link and two
-// booleans. The first boolean controls whether the unit shall be
-// enabled for runtime only (true, /run), or persistently (false,
-// /etc).
-// The second controls whether symlinks pointing to other units shall
-// be replaced if necessary.
-//
-// This call returns a list of the changes made. The list consists of
-// structures with three strings: the type of the change (one of symlink
-// or unlink), the file name of the symlink and the destination of the
-// symlink.
-func (c *Conn) LinkUnitFiles(files []string, runtime bool, force bool) ([]LinkUnitFileChange, error) {
-	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.LinkUnitFiles", 0, files, runtime, force).Store(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	changes := make([]LinkUnitFileChange, len(result))
-	changesInterface := make([]interface{}, len(changes))
-	for i := range changes {
-		changesInterface[i] = &changes[i]
-	}
-
-	err = dbus.Store(resultInterface, changesInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return changes, nil
-}
-
-// EnableUnitFiles() may be used to enable one or more units in the system (by
-// creating symlinks to them in /etc or /run).
-//
-// It takes a list of unit files to enable (either just file names or full
-// absolute paths if the unit files are residing outside the usual unit
-// search paths), and two booleans: the first controls whether the unit shall
-// be enabled for runtime only (true, /run), or persistently (false, /etc).
-// The second one controls whether symlinks pointing to other units shall
-// be replaced if necessary.
-//
-// This call returns one boolean and an array with the changes made. The
-// boolean signals whether the unit files contained any enablement
-// information (i.e. an [Install]) section. The changes list consists of
-// structures with three strings: the type of the change (one of symlink
-// or unlink), the file name of the symlink and the destination of the
-// symlink.
-func (c *Conn) EnableUnitFiles(files []string, runtime bool, force bool) (bool, []EnableUnitFileChange, error) {
-	var carries_install_info bool
-
-	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.EnableUnitFiles", 0, files, runtime, force).Store(&carries_install_info, &result)
-	if err != nil {
-		return false, nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	changes := make([]EnableUnitFileChange, len(result))
-	changesInterface := make([]interface{}, len(changes))
-	for i := range changes {
-		changesInterface[i] = &changes[i]
-	}
-
-	err = dbus.Store(resultInterface, changesInterface...)
-	if err != nil {
-		return false, nil, err
-	}
-
-	return carries_install_info, changes, nil
-}
-
-type EnableUnitFileChange struct {
-	Type        string // Type of the change (one of symlink or unlink)
-	Filename    string // File name of the symlink
-	Destination string // Destination of the symlink
-}
-
-// DisableUnitFiles() may be used to disable one or more units in the system (by
-// removing symlinks to them from /etc or /run).
-//
-// It takes a list of unit files to disable (either just file names or full
-// absolute paths if the unit files are residing outside the usual unit
-// search paths), and one boolean: whether the unit was enabled for runtime
-// only (true, /run), or persistently (false, /etc).
-//
-// This call returns an array with the changes made. The changes list
-// consists of structures with three strings: the type of the change (one of
-// symlink or unlink), the file name of the symlink and the destination of the
-// symlink.
-func (c *Conn) DisableUnitFiles(files []string, runtime bool) ([]DisableUnitFileChange, error) {
-	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.DisableUnitFiles", 0, files, runtime).Store(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	changes := make([]DisableUnitFileChange, len(result))
-	changesInterface := make([]interface{}, len(changes))
-	for i := range changes {
-		changesInterface[i] = &changes[i]
-	}
-
-	err = dbus.Store(resultInterface, changesInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return changes, nil
-}
-
-type DisableUnitFileChange struct {
-	Type        string // Type of the change (one of symlink or unlink)
-	Filename    string // File name of the symlink
-	Destination string // Destination of the symlink
-}
-
-// Reload instructs systemd to scan for and reload unit files. This is
-// equivalent to a 'systemctl daemon-reload'.
-func (c *Conn) Reload() error {
-	return c.sysobj.Call("org.freedesktop.systemd1.Manager.Reload", 0).Store()
-}
-
-func unitPath(name string) dbus.ObjectPath {
-	return dbus.ObjectPath("/org/freedesktop/systemd1/unit/" + PathBusEscape(name))
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go
deleted file mode 100644
index 7520011564..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"github.com/godbus/dbus"
-)
-
-// From the systemd docs:
-//
-// The properties array of StartTransientUnit() may take many of the settings
-// that may also be configured in unit files. Not all parameters are currently
-// accepted though, but we plan to cover more properties with future release.
-// Currently you may set the Description, Slice and all dependency types of
-// units, as well as RemainAfterExit, ExecStart for service units,
-// TimeoutStopUSec and PIDs for scope units, and CPUAccounting, CPUShares,
-// BlockIOAccounting, BlockIOWeight, BlockIOReadBandwidth,
-// BlockIOWriteBandwidth, BlockIODeviceWeight, MemoryAccounting, MemoryLimit,
-// DevicePolicy, DeviceAllow for services/scopes/slices. These fields map
-// directly to their counterparts in unit files and as normal D-Bus object
-// properties. The exception here is the PIDs field of scope units which is
-// used for construction of the scope only and specifies the initial PIDs to
-// add to the scope object.
-
-type Property struct {
-	Name  string
-	Value dbus.Variant
-}
-
-type PropertyCollection struct {
-	Name       string
-	Properties []Property
-}
-
-type execStart struct {
-	Path             string   // the binary path to execute
-	Args             []string // an array with all arguments to pass to the executed command, starting with argument 0
-	UncleanIsFailure bool     // a boolean whether it should be considered a failure if the process exits uncleanly
-}
-
-// PropExecStart sets the ExecStart service property.  The first argument is a
-// slice with the binary path to execute followed by the arguments to pass to
-// the executed command. See
-// http://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart=
-func PropExecStart(command []string, uncleanIsFailure bool) Property {
-	execStarts := []execStart{
-		execStart{
-			Path:             command[0],
-			Args:             command,
-			UncleanIsFailure: uncleanIsFailure,
-		},
-	}
-
-	return Property{
-		Name:  "ExecStart",
-		Value: dbus.MakeVariant(execStarts),
-	}
-}
-
-// PropRemainAfterExit sets the RemainAfterExit service property. See
-// http://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit=
-func PropRemainAfterExit(b bool) Property {
-	return Property{
-		Name:  "RemainAfterExit",
-		Value: dbus.MakeVariant(b),
-	}
-}
-
-// PropDescription sets the Description unit property. See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit#Description=
-func PropDescription(desc string) Property {
-	return Property{
-		Name:  "Description",
-		Value: dbus.MakeVariant(desc),
-	}
-}
-
-func propDependency(name string, units []string) Property {
-	return Property{
-		Name:  name,
-		Value: dbus.MakeVariant(units),
-	}
-}
-
-// PropRequires sets the Requires unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Requires=
-func PropRequires(units ...string) Property {
-	return propDependency("Requires", units)
-}
-
-// PropRequiresOverridable sets the RequiresOverridable unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiresOverridable=
-func PropRequiresOverridable(units ...string) Property {
-	return propDependency("RequiresOverridable", units)
-}
-
-// PropRequisite sets the Requisite unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Requisite=
-func PropRequisite(units ...string) Property {
-	return propDependency("Requisite", units)
-}
-
-// PropRequisiteOverridable sets the RequisiteOverridable unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequisiteOverridable=
-func PropRequisiteOverridable(units ...string) Property {
-	return propDependency("RequisiteOverridable", units)
-}
-
-// PropWants sets the Wants unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Wants=
-func PropWants(units ...string) Property {
-	return propDependency("Wants", units)
-}
-
-// PropBindsTo sets the BindsTo unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#BindsTo=
-func PropBindsTo(units ...string) Property {
-	return propDependency("BindsTo", units)
-}
-
-// PropRequiredBy sets the RequiredBy unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiredBy=
-func PropRequiredBy(units ...string) Property {
-	return propDependency("RequiredBy", units)
-}
-
-// PropRequiredByOverridable sets the RequiredByOverridable unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiredByOverridable=
-func PropRequiredByOverridable(units ...string) Property {
-	return propDependency("RequiredByOverridable", units)
-}
-
-// PropWantedBy sets the WantedBy unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#WantedBy=
-func PropWantedBy(units ...string) Property {
-	return propDependency("WantedBy", units)
-}
-
-// PropBoundBy sets the BoundBy unit property.  See
-// http://www.freedesktop.org/software/systemd/main/systemd.unit.html#BoundBy=
-func PropBoundBy(units ...string) Property {
-	return propDependency("BoundBy", units)
-}
-
-// PropConflicts sets the Conflicts unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Conflicts=
-func PropConflicts(units ...string) Property {
-	return propDependency("Conflicts", units)
-}
-
-// PropConflictedBy sets the ConflictedBy unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#ConflictedBy=
-func PropConflictedBy(units ...string) Property {
-	return propDependency("ConflictedBy", units)
-}
-
-// PropBefore sets the Before unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Before=
-func PropBefore(units ...string) Property {
-	return propDependency("Before", units)
-}
-
-// PropAfter sets the After unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#After=
-func PropAfter(units ...string) Property {
-	return propDependency("After", units)
-}
-
-// PropOnFailure sets the OnFailure unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#OnFailure=
-func PropOnFailure(units ...string) Property {
-	return propDependency("OnFailure", units)
-}
-
-// PropTriggers sets the Triggers unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Triggers=
-func PropTriggers(units ...string) Property {
-	return propDependency("Triggers", units)
-}
-
-// PropTriggeredBy sets the TriggeredBy unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#TriggeredBy=
-func PropTriggeredBy(units ...string) Property {
-	return propDependency("TriggeredBy", units)
-}
-
-// PropPropagatesReloadTo sets the PropagatesReloadTo unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#PropagatesReloadTo=
-func PropPropagatesReloadTo(units ...string) Property {
-	return propDependency("PropagatesReloadTo", units)
-}
-
-// PropRequiresMountsFor sets the RequiresMountsFor unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiresMountsFor=
-func PropRequiresMountsFor(units ...string) Property {
-	return propDependency("RequiresMountsFor", units)
-}
-
-// PropSlice sets the Slice unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#Slice=
-func PropSlice(slice string) Property {
-	return Property{
-		Name:  "Slice",
-		Value: dbus.MakeVariant(slice),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go
deleted file mode 100644
index f92e6fbed1..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-type set struct {
-	data map[string]bool
-}
-
-func (s *set) Add(value string) {
-	s.data[value] = true
-}
-
-func (s *set) Remove(value string) {
-	delete(s.data, value)
-}
-
-func (s *set) Contains(value string) (exists bool) {
-	_, exists = s.data[value]
-	return
-}
-
-func (s *set) Length() int {
-	return len(s.data)
-}
-
-func (s *set) Values() (values []string) {
-	for val, _ := range s.data {
-		values = append(values, val)
-	}
-	return
-}
-
-func newSet() *set {
-	return &set{make(map[string]bool)}
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go
deleted file mode 100644
index 996451445c..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"errors"
-	"time"
-
-	"github.com/godbus/dbus"
-)
-
-const (
-	cleanIgnoreInterval = int64(10 * time.Second)
-	ignoreInterval      = int64(30 * time.Millisecond)
-)
-
-// Subscribe sets up this connection to subscribe to all systemd dbus events.
-// This is required before calling SubscribeUnits. When the connection closes
-// systemd will automatically stop sending signals so there is no need to
-// explicitly call Unsubscribe().
-func (c *Conn) Subscribe() error {
-	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
-		"type='signal',interface='org.freedesktop.systemd1.Manager',member='UnitNew'")
-	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
-		"type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'")
-
-	err := c.sigobj.Call("org.freedesktop.systemd1.Manager.Subscribe", 0).Store()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Unsubscribe this connection from systemd dbus events.
-func (c *Conn) Unsubscribe() error {
-	err := c.sigobj.Call("org.freedesktop.systemd1.Manager.Unsubscribe", 0).Store()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Conn) dispatch() {
-	ch := make(chan *dbus.Signal, signalBuffer)
-
-	c.sigconn.Signal(ch)
-
-	go func() {
-		for {
-			signal, ok := <-ch
-			if !ok {
-				return
-			}
-
-			if signal.Name == "org.freedesktop.systemd1.Manager.JobRemoved" {
-				c.jobComplete(signal)
-			}
-
-			if c.subscriber.updateCh == nil {
-				continue
-			}
-
-			var unitPath dbus.ObjectPath
-			switch signal.Name {
-			case "org.freedesktop.systemd1.Manager.JobRemoved":
-				unitName := signal.Body[2].(string)
-				c.sysobj.Call("org.freedesktop.systemd1.Manager.GetUnit", 0, unitName).Store(&unitPath)
-			case "org.freedesktop.systemd1.Manager.UnitNew":
-				unitPath = signal.Body[1].(dbus.ObjectPath)
-			case "org.freedesktop.DBus.Properties.PropertiesChanged":
-				if signal.Body[0].(string) == "org.freedesktop.systemd1.Unit" {
-					unitPath = signal.Path
-				}
-			}
-
-			if unitPath == dbus.ObjectPath("") {
-				continue
-			}
-
-			c.sendSubStateUpdate(unitPath)
-		}
-	}()
-}
-
-// Returns two unbuffered channels which will receive all changed units every
-// interval.  Deleted units are sent as nil.
-func (c *Conn) SubscribeUnits(interval time.Duration) (<-chan map[string]*UnitStatus, <-chan error) {
-	return c.SubscribeUnitsCustom(interval, 0, func(u1, u2 *UnitStatus) bool { return *u1 != *u2 }, nil)
-}
-
-// SubscribeUnitsCustom is like SubscribeUnits but lets you specify the buffer
-// size of the channels, the comparison function for detecting changes and a filter
-// function for cutting down on the noise that your channel receives.
-func (c *Conn) SubscribeUnitsCustom(interval time.Duration, buffer int, isChanged func(*UnitStatus, *UnitStatus) bool, filterUnit func(string) bool) (<-chan map[string]*UnitStatus, <-chan error) {
-	old := make(map[string]*UnitStatus)
-	statusChan := make(chan map[string]*UnitStatus, buffer)
-	errChan := make(chan error, buffer)
-
-	go func() {
-		for {
-			timerChan := time.After(interval)
-
-			units, err := c.ListUnits()
-			if err == nil {
-				cur := make(map[string]*UnitStatus)
-				for i := range units {
-					if filterUnit != nil && filterUnit(units[i].Name) {
-						continue
-					}
-					cur[units[i].Name] = &units[i]
-				}
-
-				// add all new or changed units
-				changed := make(map[string]*UnitStatus)
-				for n, u := range cur {
-					if oldU, ok := old[n]; !ok || isChanged(oldU, u) {
-						changed[n] = u
-					}
-					delete(old, n)
-				}
-
-				// add all deleted units
-				for oldN := range old {
-					changed[oldN] = nil
-				}
-
-				old = cur
-
-				if len(changed) != 0 {
-					statusChan <- changed
-				}
-			} else {
-				errChan <- err
-			}
-
-			<-timerChan
-		}
-	}()
-
-	return statusChan, errChan
-}
-
-type SubStateUpdate struct {
-	UnitName string
-	SubState string
-}
-
-// SetSubStateSubscriber writes to updateCh when any unit's substate changes.
-// Although this writes to updateCh on every state change, the reported state
-// may be more recent than the change that generated it (due to an unavoidable
-// race in the systemd dbus interface).  That is, this method provides a good
-// way to keep a current view of all units' states, but is not guaranteed to
-// show every state transition they go through.  Furthermore, state changes
-// will only be written to the channel with non-blocking writes.  If updateCh
-// is full, it attempts to write an error to errCh; if errCh is full, the error
-// passes silently.
-func (c *Conn) SetSubStateSubscriber(updateCh chan<- *SubStateUpdate, errCh chan<- error) {
-	c.subscriber.Lock()
-	defer c.subscriber.Unlock()
-	c.subscriber.updateCh = updateCh
-	c.subscriber.errCh = errCh
-}
-
-func (c *Conn) sendSubStateUpdate(path dbus.ObjectPath) {
-	c.subscriber.Lock()
-	defer c.subscriber.Unlock()
-
-	if c.shouldIgnore(path) {
-		return
-	}
-
-	info, err := c.GetUnitProperties(string(path))
-	if err != nil {
-		select {
-		case c.subscriber.errCh <- err:
-		default:
-		}
-	}
-
-	name := info["Id"].(string)
-	substate := info["SubState"].(string)
-
-	update := &SubStateUpdate{name, substate}
-	select {
-	case c.subscriber.updateCh <- update:
-	default:
-		select {
-		case c.subscriber.errCh <- errors.New("update channel full!"):
-		default:
-		}
-	}
-
-	c.updateIgnore(path, info)
-}
-
-// The ignore functions work around a wart in the systemd dbus interface.
-// Requesting the properties of an unloaded unit will cause systemd to send a
-// pair of UnitNew/UnitRemoved signals.  Because we need to get a unit's
-// properties on UnitNew (as that's the only indication of a new unit coming up
-// for the first time), we would enter an infinite loop if we did not attempt
-// to detect and ignore these spurious signals.  The signal themselves are
-// indistinguishable from relevant ones, so we (somewhat hackishly) ignore an
-// unloaded unit's signals for a short time after requesting its properties.
-// This means that we will miss e.g. a transient unit being restarted
-// *immediately* upon failure and also a transient unit being started
-// immediately after requesting its status (with systemctl status, for example,
-// because this causes a UnitNew signal to be sent which then causes us to fetch
-// the properties).
-
-func (c *Conn) shouldIgnore(path dbus.ObjectPath) bool {
-	t, ok := c.subscriber.ignore[path]
-	return ok && t >= time.Now().UnixNano()
-}
-
-func (c *Conn) updateIgnore(path dbus.ObjectPath, info map[string]interface{}) {
-	c.cleanIgnore()
-
-	// unit is unloaded - it will trigger bad systemd dbus behavior
-	if info["LoadState"].(string) == "not-found" {
-		c.subscriber.ignore[path] = time.Now().UnixNano() + ignoreInterval
-	}
-}
-
-// without this, ignore would grow unboundedly over time
-func (c *Conn) cleanIgnore() {
-	now := time.Now().UnixNano()
-	if c.subscriber.cleanIgnore < now {
-		c.subscriber.cleanIgnore = now + cleanIgnoreInterval
-
-		for p, t := range c.subscriber.ignore {
-			if t < now {
-				delete(c.subscriber.ignore, p)
-			}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go
deleted file mode 100644
index 5b408d5847..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"time"
-)
-
-// SubscriptionSet returns a subscription set which is like conn.Subscribe but
-// can filter to only return events for a set of units.
-type SubscriptionSet struct {
-	*set
-	conn *Conn
-}
-
-func (s *SubscriptionSet) filter(unit string) bool {
-	return !s.Contains(unit)
-}
-
-// Subscribe starts listening for dbus events for all of the units in the set.
-// Returns channels identical to conn.SubscribeUnits.
-func (s *SubscriptionSet) Subscribe() (<-chan map[string]*UnitStatus, <-chan error) {
-	// TODO: Make fully evented by using systemd 209 with properties changed values
-	return s.conn.SubscribeUnitsCustom(time.Second, 0,
-		mismatchUnitStatus,
-		func(unit string) bool { return s.filter(unit) },
-	)
-}
-
-// NewSubscriptionSet returns a new subscription set.
-func (conn *Conn) NewSubscriptionSet() *SubscriptionSet {
-	return &SubscriptionSet{newSet(), conn}
-}
-
-// mismatchUnitStatus returns true if the provided UnitStatus objects
-// are not equivalent. false is returned if the objects are equivalent.
-// Only the Name, Description and state-related fields are used in
-// the comparison.
-func mismatchUnitStatus(u1, u2 *UnitStatus) bool {
-	return u1.Name != u2.Name ||
-		u1.Description != u2.Description ||
-		u1.LoadState != u2.LoadState ||
-		u1.ActiveState != u2.ActiveState ||
-		u1.SubState != u2.SubState
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go
deleted file mode 100644
index 4fd29c66f1..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/journal.go
+++ /dev/null
@@ -1,971 +0,0 @@
-// Copyright 2015 RedHat, Inc.
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package sdjournal provides a low-level Go interface to the
-// systemd journal wrapped around the sd-journal C API.
-//
-// All public read methods map closely to the sd-journal API functions. See the
-// sd-journal.h documentation[1] for information about each function.
-//
-// To write to the journal, see the pure-Go "journal" package
-//
-// [1] http://www.freedesktop.org/software/systemd/man/sd-journal.html
-package sdjournal
-
-// #include <systemd/sd-journal.h>
-// #include <systemd/sd-id128.h>
-// #include <stdlib.h>
-// #include <syslog.h>
-//
-// int
-// my_sd_journal_open(void *f, sd_journal **ret, int flags)
-// {
-//   int (*sd_journal_open)(sd_journal **, int);
-//
-//   sd_journal_open = f;
-//   return sd_journal_open(ret, flags);
-// }
-//
-// int
-// my_sd_journal_open_directory(void *f, sd_journal **ret, const char *path, int flags)
-// {
-//   int (*sd_journal_open_directory)(sd_journal **, const char *, int);
-//
-//   sd_journal_open_directory = f;
-//   return sd_journal_open_directory(ret, path, flags);
-// }
-//
-// void
-// my_sd_journal_close(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_close)(sd_journal *);
-//
-//   sd_journal_close = f;
-//   sd_journal_close(j);
-// }
-//
-// int
-// my_sd_journal_get_usage(void *f, sd_journal *j, uint64_t *bytes)
-// {
-//   int (*sd_journal_get_usage)(sd_journal *, uint64_t *);
-//
-//   sd_journal_get_usage = f;
-//   return sd_journal_get_usage(j, bytes);
-// }
-//
-// int
-// my_sd_journal_add_match(void *f, sd_journal *j, const void *data, size_t size)
-// {
-//   int (*sd_journal_add_match)(sd_journal *, const void *, size_t);
-//
-//   sd_journal_add_match = f;
-//   return sd_journal_add_match(j, data, size);
-// }
-//
-// int
-// my_sd_journal_add_disjunction(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_add_disjunction)(sd_journal *);
-//
-//   sd_journal_add_disjunction = f;
-//   return sd_journal_add_disjunction(j);
-// }
-//
-// int
-// my_sd_journal_add_conjunction(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_add_conjunction)(sd_journal *);
-//
-//   sd_journal_add_conjunction = f;
-//   return sd_journal_add_conjunction(j);
-// }
-//
-// void
-// my_sd_journal_flush_matches(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_flush_matches)(sd_journal *);
-//
-//   sd_journal_flush_matches = f;
-//   sd_journal_flush_matches(j);
-// }
-//
-// int
-// my_sd_journal_next(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_next)(sd_journal *);
-//
-//   sd_journal_next = f;
-//   return sd_journal_next(j);
-// }
-//
-// int
-// my_sd_journal_next_skip(void *f, sd_journal *j, uint64_t skip)
-// {
-//   int (*sd_journal_next_skip)(sd_journal *, uint64_t);
-//
-//   sd_journal_next_skip = f;
-//   return sd_journal_next_skip(j, skip);
-// }
-//
-// int
-// my_sd_journal_previous(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_previous)(sd_journal *);
-//
-//   sd_journal_previous = f;
-//   return sd_journal_previous(j);
-// }
-//
-// int
-// my_sd_journal_previous_skip(void *f, sd_journal *j, uint64_t skip)
-// {
-//   int (*sd_journal_previous_skip)(sd_journal *, uint64_t);
-//
-//   sd_journal_previous_skip = f;
-//   return sd_journal_previous_skip(j, skip);
-// }
-//
-// int
-// my_sd_journal_get_data(void *f, sd_journal *j, const char *field, const void **data, size_t *length)
-// {
-//   int (*sd_journal_get_data)(sd_journal *, const char *, const void **, size_t *);
-//
-//   sd_journal_get_data = f;
-//   return sd_journal_get_data(j, field, data, length);
-// }
-//
-// int
-// my_sd_journal_set_data_threshold(void *f, sd_journal *j, size_t sz)
-// {
-//   int (*sd_journal_set_data_threshold)(sd_journal *, size_t);
-//
-//   sd_journal_set_data_threshold = f;
-//   return sd_journal_set_data_threshold(j, sz);
-// }
-//
-// int
-// my_sd_journal_get_cursor(void *f, sd_journal *j, char **cursor)
-// {
-//   int (*sd_journal_get_cursor)(sd_journal *, char **);
-//
-//   sd_journal_get_cursor = f;
-//   return sd_journal_get_cursor(j, cursor);
-// }
-//
-// int
-// my_sd_journal_test_cursor(void *f, sd_journal *j, const char *cursor)
-// {
-//   int (*sd_journal_test_cursor)(sd_journal *, const char *);
-//
-//   sd_journal_test_cursor = f;
-//   return sd_journal_test_cursor(j, cursor);
-// }
-//
-// int
-// my_sd_journal_get_realtime_usec(void *f, sd_journal *j, uint64_t *usec)
-// {
-//   int (*sd_journal_get_realtime_usec)(sd_journal *, uint64_t *);
-//
-//   sd_journal_get_realtime_usec = f;
-//   return sd_journal_get_realtime_usec(j, usec);
-// }
-//
-// int
-// my_sd_journal_get_monotonic_usec(void *f, sd_journal *j, uint64_t *usec, sd_id128_t *boot_id)
-// {
-//   int (*sd_journal_get_monotonic_usec)(sd_journal *, uint64_t *, sd_id128_t *);
-//
-//   sd_journal_get_monotonic_usec = f;
-//   return sd_journal_get_monotonic_usec(j, usec, boot_id);
-// }
-//
-// int
-// my_sd_journal_seek_head(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_seek_head)(sd_journal *);
-//
-//   sd_journal_seek_head = f;
-//   return sd_journal_seek_head(j);
-// }
-//
-// int
-// my_sd_journal_seek_tail(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_seek_tail)(sd_journal *);
-//
-//   sd_journal_seek_tail = f;
-//   return sd_journal_seek_tail(j);
-// }
-//
-//
-// int
-// my_sd_journal_seek_cursor(void *f, sd_journal *j, const char *cursor)
-// {
-//   int (*sd_journal_seek_cursor)(sd_journal *, const char *);
-//
-//   sd_journal_seek_cursor = f;
-//   return sd_journal_seek_cursor(j, cursor);
-// }
-//
-// int
-// my_sd_journal_seek_realtime_usec(void *f, sd_journal *j, uint64_t usec)
-// {
-//   int (*sd_journal_seek_realtime_usec)(sd_journal *, uint64_t);
-//
-//   sd_journal_seek_realtime_usec = f;
-//   return sd_journal_seek_realtime_usec(j, usec);
-// }
-//
-// int
-// my_sd_journal_wait(void *f, sd_journal *j, uint64_t timeout_usec)
-// {
-//   int (*sd_journal_wait)(sd_journal *, uint64_t);
-//
-//   sd_journal_wait = f;
-//   return sd_journal_wait(j, timeout_usec);
-// }
-//
-// void
-// my_sd_journal_restart_data(void *f, sd_journal *j)
-// {
-//   void (*sd_journal_restart_data)(sd_journal *);
-//
-//   sd_journal_restart_data = f;
-//   sd_journal_restart_data(j);
-// }
-//
-// int
-// my_sd_journal_enumerate_data(void *f, sd_journal *j, const void **data, size_t *length)
-// {
-//   int (*sd_journal_enumerate_data)(sd_journal *, const void **, size_t *);
-//
-//   sd_journal_enumerate_data = f;
-//   return sd_journal_enumerate_data(j, data, length);
-// }
-//
-import "C"
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-	"unsafe"
-
-	"github.com/coreos/pkg/dlopen"
-)
-
-var libsystemdFunctions = map[string]unsafe.Pointer{}
-
-// Journal entry field strings which correspond to:
-// http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
-const (
-	// User Journal Fields
-	SD_JOURNAL_FIELD_MESSAGE           = "MESSAGE"
-	SD_JOURNAL_FIELD_MESSAGE_ID        = "MESSAGE_ID"
-	SD_JOURNAL_FIELD_PRIORITY          = "PRIORITY"
-	SD_JOURNAL_FIELD_CODE_FILE         = "CODE_FILE"
-	SD_JOURNAL_FIELD_CODE_LINE         = "CODE_LINE"
-	SD_JOURNAL_FIELD_CODE_FUNC         = "CODE_FUNC"
-	SD_JOURNAL_FIELD_ERRNO             = "ERRNO"
-	SD_JOURNAL_FIELD_SYSLOG_FACILITY   = "SYSLOG_FACILITY"
-	SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER = "SYSLOG_IDENTIFIER"
-	SD_JOURNAL_FIELD_SYSLOG_PID        = "SYSLOG_PID"
-
-	// Trusted Journal Fields
-	SD_JOURNAL_FIELD_PID                       = "_PID"
-	SD_JOURNAL_FIELD_UID                       = "_UID"
-	SD_JOURNAL_FIELD_GID                       = "_GID"
-	SD_JOURNAL_FIELD_COMM                      = "_COMM"
-	SD_JOURNAL_FIELD_EXE                       = "_EXE"
-	SD_JOURNAL_FIELD_CMDLINE                   = "_CMDLINE"
-	SD_JOURNAL_FIELD_CAP_EFFECTIVE             = "_CAP_EFFECTIVE"
-	SD_JOURNAL_FIELD_AUDIT_SESSION             = "_AUDIT_SESSION"
-	SD_JOURNAL_FIELD_AUDIT_LOGINUID            = "_AUDIT_LOGINUID"
-	SD_JOURNAL_FIELD_SYSTEMD_CGROUP            = "_SYSTEMD_CGROUP"
-	SD_JOURNAL_FIELD_SYSTEMD_SESSION           = "_SYSTEMD_SESSION"
-	SD_JOURNAL_FIELD_SYSTEMD_UNIT              = "_SYSTEMD_UNIT"
-	SD_JOURNAL_FIELD_SYSTEMD_USER_UNIT         = "_SYSTEMD_USER_UNIT"
-	SD_JOURNAL_FIELD_SYSTEMD_OWNER_UID         = "_SYSTEMD_OWNER_UID"
-	SD_JOURNAL_FIELD_SYSTEMD_SLICE             = "_SYSTEMD_SLICE"
-	SD_JOURNAL_FIELD_SELINUX_CONTEXT           = "_SELINUX_CONTEXT"
-	SD_JOURNAL_FIELD_SOURCE_REALTIME_TIMESTAMP = "_SOURCE_REALTIME_TIMESTAMP"
-	SD_JOURNAL_FIELD_BOOT_ID                   = "_BOOT_ID"
-	SD_JOURNAL_FIELD_MACHINE_ID                = "_MACHINE_ID"
-	SD_JOURNAL_FIELD_HOSTNAME                  = "_HOSTNAME"
-	SD_JOURNAL_FIELD_TRANSPORT                 = "_TRANSPORT"
-
-	// Address Fields
-	SD_JOURNAL_FIELD_CURSOR              = "__CURSOR"
-	SD_JOURNAL_FIELD_REALTIME_TIMESTAMP  = "__REALTIME_TIMESTAMP"
-	SD_JOURNAL_FIELD_MONOTONIC_TIMESTAMP = "__MONOTONIC_TIMESTAMP"
-)
-
-// Journal event constants
-const (
-	SD_JOURNAL_NOP        = int(C.SD_JOURNAL_NOP)
-	SD_JOURNAL_APPEND     = int(C.SD_JOURNAL_APPEND)
-	SD_JOURNAL_INVALIDATE = int(C.SD_JOURNAL_INVALIDATE)
-)
-
-const (
-	// IndefiniteWait is a sentinel value that can be passed to
-	// sdjournal.Wait() to signal an indefinite wait for new journal
-	// events. It is implemented as the maximum value for a time.Duration:
-	// https://github.com/golang/go/blob/e4dcf5c8c22d98ac9eac7b9b226596229624cb1d/src/time/time.go#L434
-	IndefiniteWait time.Duration = 1<<63 - 1
-)
-
-var libsystemdNames = []string{
-	// systemd < 209
-	"libsystemd-journal.so.0",
-	"libsystemd-journal.so",
-
-	// systemd >= 209 merged libsystemd-journal into libsystemd proper
-	"libsystemd.so.0",
-	"libsystemd.so",
-}
-
-// Journal is a Go wrapper of an sd_journal structure.
-type Journal struct {
-	cjournal *C.sd_journal
-	mu       sync.Mutex
-	lib      *dlopen.LibHandle
-}
-
-// JournalEntry represents all fields of a journal entry plus address fields.
-type JournalEntry struct {
-	Fields             map[string]string
-	Cursor             string
-	RealtimeTimestamp  uint64
-	MonotonicTimestamp uint64
-}
-
-// Match is a convenience wrapper to describe filters supplied to AddMatch.
-type Match struct {
-	Field string
-	Value string
-}
-
-// String returns a string representation of a Match suitable for use with AddMatch.
-func (m *Match) String() string {
-	return m.Field + "=" + m.Value
-}
-
-func (j *Journal) getFunction(name string) (unsafe.Pointer, error) {
-	j.mu.Lock()
-	defer j.mu.Unlock()
-	f, ok := libsystemdFunctions[name]
-	if !ok {
-		var err error
-		f, err = j.lib.GetSymbolPointer(name)
-		if err != nil {
-			return nil, err
-		}
-
-		libsystemdFunctions[name] = f
-	}
-
-	return f, nil
-}
-
-// NewJournal returns a new Journal instance pointing to the local journal
-func NewJournal() (j *Journal, err error) {
-	h, err := dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err == nil {
-			return
-		}
-		err2 := h.Close()
-		if err2 != nil {
-			err = fmt.Errorf(`%q and "error closing handle: %v"`, err, err2)
-		}
-	}()
-
-	j = &Journal{lib: h}
-
-	sd_journal_open, err := j.getFunction("sd_journal_open")
-	if err != nil {
-		return nil, err
-	}
-
-	r := C.my_sd_journal_open(sd_journal_open, &j.cjournal, C.SD_JOURNAL_LOCAL_ONLY)
-
-	if r < 0 {
-		return nil, fmt.Errorf("failed to open journal: %d", syscall.Errno(-r))
-	}
-
-	return j, nil
-}
-
-// NewJournalFromDir returns a new Journal instance pointing to a journal residing
-// in a given directory. The supplied path may be relative or absolute; if
-// relative, it will be converted to an absolute path before being opened.
-func NewJournalFromDir(path string) (j *Journal, err error) {
-	h, err := dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err == nil {
-			return
-		}
-		err2 := h.Close()
-		if err2 != nil {
-			err = fmt.Errorf(`%q and "error closing handle: %v"`, err, err2)
-		}
-	}()
-
-	path, err = filepath.Abs(path)
-	if err != nil {
-		return nil, err
-	}
-
-	j = &Journal{lib: h}
-
-	sd_journal_open_directory, err := j.getFunction("sd_journal_open_directory")
-	if err != nil {
-		return nil, err
-	}
-
-	p := C.CString(path)
-	defer C.free(unsafe.Pointer(p))
-
-	r := C.my_sd_journal_open_directory(sd_journal_open_directory, &j.cjournal, p, 0)
-	if r < 0 {
-		return nil, fmt.Errorf("failed to open journal in directory %q: %d", path, syscall.Errno(-r))
-	}
-
-	return j, nil
-}
-
-// Close closes a journal opened with NewJournal.
-func (j *Journal) Close() error {
-	sd_journal_close, err := j.getFunction("sd_journal_close")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	C.my_sd_journal_close(sd_journal_close, j.cjournal)
-	j.mu.Unlock()
-
-	// we don't close the handle to reuse the symbol cache between Journal
-	// instances. It will go away when the process exits.
-	return nil
-}
-
-// AddMatch adds a match by which to filter the entries of the journal.
-func (j *Journal) AddMatch(match string) error {
-	sd_journal_add_match, err := j.getFunction("sd_journal_add_match")
-	if err != nil {
-		return err
-	}
-
-	m := C.CString(match)
-	defer C.free(unsafe.Pointer(m))
-
-	j.mu.Lock()
-	r := C.my_sd_journal_add_match(sd_journal_add_match, j.cjournal, unsafe.Pointer(m), C.size_t(len(match)))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to add match: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// AddDisjunction inserts a logical OR in the match list.
-func (j *Journal) AddDisjunction() error {
-	sd_journal_add_disjunction, err := j.getFunction("sd_journal_add_disjunction")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_add_disjunction(sd_journal_add_disjunction, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to add a disjunction in the match list: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// AddConjunction inserts a logical AND in the match list.
-func (j *Journal) AddConjunction() error {
-	sd_journal_add_conjunction, err := j.getFunction("sd_journal_add_conjunction")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_add_conjunction(sd_journal_add_conjunction, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to add a conjunction in the match list: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// FlushMatches flushes all matches, disjunctions and conjunctions.
-func (j *Journal) FlushMatches() {
-	sd_journal_flush_matches, err := j.getFunction("sd_journal_flush_matches")
-	if err != nil {
-		return
-	}
-
-	j.mu.Lock()
-	C.my_sd_journal_flush_matches(sd_journal_flush_matches, j.cjournal)
-	j.mu.Unlock()
-}
-
-// Next advances the read pointer into the journal by one entry.
-func (j *Journal) Next() (int, error) {
-	sd_journal_next, err := j.getFunction("sd_journal_next")
-	if err != nil {
-		return -1, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_next(sd_journal_next, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return int(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
-	}
-
-	return int(r), nil
-}
-
-// NextSkip advances the read pointer by multiple entries at once,
-// as specified by the skip parameter.
-func (j *Journal) NextSkip(skip uint64) (uint64, error) {
-	sd_journal_next_skip, err := j.getFunction("sd_journal_next_skip")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_next_skip(sd_journal_next_skip, j.cjournal, C.uint64_t(skip))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
-	}
-
-	return uint64(r), nil
-}
-
-// Previous sets the read pointer into the journal back by one entry.
-func (j *Journal) Previous() (uint64, error) {
-	sd_journal_previous, err := j.getFunction("sd_journal_previous")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_previous(sd_journal_previous, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
-	}
-
-	return uint64(r), nil
-}
-
-// PreviousSkip sets back the read pointer by multiple entries at once,
-// as specified by the skip parameter.
-func (j *Journal) PreviousSkip(skip uint64) (uint64, error) {
-	sd_journal_previous_skip, err := j.getFunction("sd_journal_previous_skip")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_previous_skip(sd_journal_previous_skip, j.cjournal, C.uint64_t(skip))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
-	}
-
-	return uint64(r), nil
-}
-
-// GetData gets the data object associated with a specific field from the
-// current journal entry.
-func (j *Journal) GetData(field string) (string, error) {
-	sd_journal_get_data, err := j.getFunction("sd_journal_get_data")
-	if err != nil {
-		return "", err
-	}
-
-	f := C.CString(field)
-	defer C.free(unsafe.Pointer(f))
-
-	var d unsafe.Pointer
-	var l C.size_t
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_data(sd_journal_get_data, j.cjournal, f, &d, &l)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return "", fmt.Errorf("failed to read message: %d", syscall.Errno(-r))
-	}
-
-	msg := C.GoStringN((*C.char)(d), C.int(l))
-
-	return msg, nil
-}
-
-// GetDataValue gets the data object associated with a specific field from the
-// current journal entry, returning only the value of the object.
-func (j *Journal) GetDataValue(field string) (string, error) {
-	val, err := j.GetData(field)
-	if err != nil {
-		return "", err
-	}
-	return strings.SplitN(val, "=", 2)[1], nil
-}
-
-// GetEntry returns a full representation of a journal entry with
-// all key-value pairs of data as well as address fields (cursor, realtime
-// timestamp and monotonic timestamp)
-func (j *Journal) GetEntry() (*JournalEntry, error) {
-	sd_journal_get_realtime_usec, err := j.getFunction("sd_journal_get_realtime_usec")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_get_monotonic_usec, err := j.getFunction("sd_journal_get_monotonic_usec")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_get_cursor, err := j.getFunction("sd_journal_get_cursor")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_restart_data, err := j.getFunction("sd_journal_restart_data")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_enumerate_data, err := j.getFunction("sd_journal_enumerate_data")
-	if err != nil {
-		return nil, err
-	}
-
-	j.mu.Lock()
-	defer j.mu.Unlock()
-
-	var r C.int
-	entry := &JournalEntry{Fields: make(map[string]string)}
-
-	var realtimeUsec C.uint64_t
-	r = C.my_sd_journal_get_realtime_usec(sd_journal_get_realtime_usec, j.cjournal, &realtimeUsec)
-	if r < 0 {
-		return nil, fmt.Errorf("failed to get realtime timestamp: %d", syscall.Errno(-r))
-	}
-
-	entry.RealtimeTimestamp = uint64(realtimeUsec)
-
-	var monotonicUsec C.uint64_t
-	var boot_id C.sd_id128_t
-
-	r = C.my_sd_journal_get_monotonic_usec(sd_journal_get_monotonic_usec, j.cjournal, &monotonicUsec, &boot_id)
-	if r < 0 {
-		return nil, fmt.Errorf("failed to get monotonic timestamp: %d", syscall.Errno(-r))
-	}
-
-	entry.MonotonicTimestamp = uint64(monotonicUsec)
-
-	var c *C.char
-	r = C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &c)
-	if r < 0 {
-		return nil, fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
-	}
-
-	entry.Cursor = C.GoString(c)
-
-	// Implements the JOURNAL_FOREACH_DATA_RETVAL macro from journal-internal.h
-	var d unsafe.Pointer
-	var l C.size_t
-	C.my_sd_journal_restart_data(sd_journal_restart_data, j.cjournal)
-	for {
-		r = C.my_sd_journal_enumerate_data(sd_journal_enumerate_data, j.cjournal, &d, &l)
-		if r == 0 {
-			break
-		}
-
-		if r < 0 {
-			return nil, fmt.Errorf("failed to read message field: %d", syscall.Errno(-r))
-		}
-
-		msg := C.GoStringN((*C.char)(d), C.int(l))
-		kv := strings.SplitN(msg, "=", 2)
-		if len(kv) < 2 {
-			return nil, fmt.Errorf("failed to parse field")
-		}
-
-		entry.Fields[kv[0]] = kv[1]
-	}
-
-	return entry, nil
-}
-
-// SetDataThresold sets the data field size threshold for data returned by
-// GetData. To retrieve the complete data fields this threshold should be
-// turned off by setting it to 0, so that the library always returns the
-// complete data objects.
-func (j *Journal) SetDataThreshold(threshold uint64) error {
-	sd_journal_set_data_threshold, err := j.getFunction("sd_journal_set_data_threshold")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_set_data_threshold(sd_journal_set_data_threshold, j.cjournal, C.size_t(threshold))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to set data threshold: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// GetRealtimeUsec gets the realtime (wallclock) timestamp of the current
-// journal entry.
-func (j *Journal) GetRealtimeUsec() (uint64, error) {
-	var usec C.uint64_t
-
-	sd_journal_get_realtime_usec, err := j.getFunction("sd_journal_get_realtime_usec")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_realtime_usec(sd_journal_get_realtime_usec, j.cjournal, &usec)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to get realtime timestamp: %d", syscall.Errno(-r))
-	}
-
-	return uint64(usec), nil
-}
-
-// GetMonotonicUsec gets the monotonic timestamp of the current journal entry.
-func (j *Journal) GetMonotonicUsec() (uint64, error) {
-	var usec C.uint64_t
-	var boot_id C.sd_id128_t
-
-	sd_journal_get_monotonic_usec, err := j.getFunction("sd_journal_get_monotonic_usec")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_monotonic_usec(sd_journal_get_monotonic_usec, j.cjournal, &usec, &boot_id)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to get monotonic timestamp: %d", syscall.Errno(-r))
-	}
-
-	return uint64(usec), nil
-}
-
-// GetCursor gets the cursor of the current journal entry.
-func (j *Journal) GetCursor() (string, error) {
-	var d *C.char
-
-	sd_journal_get_cursor, err := j.getFunction("sd_journal_get_cursor")
-	if err != nil {
-		return "", err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &d)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return "", fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
-	}
-
-	cursor := C.GoString(d)
-
-	return cursor, nil
-}
-
-// TestCursor checks whether the current position in the journal matches the
-// specified cursor
-func (j *Journal) TestCursor(cursor string) error {
-	sd_journal_test_cursor, err := j.getFunction("sd_journal_test_cursor")
-	if err != nil {
-		return err
-	}
-
-	c := C.CString(cursor)
-	defer C.free(unsafe.Pointer(c))
-
-	j.mu.Lock()
-	r := C.my_sd_journal_test_cursor(sd_journal_test_cursor, j.cjournal, c)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to test to cursor %q: %d", cursor, syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// SeekHead seeks to the beginning of the journal, i.e. the oldest available
-// entry.
-func (j *Journal) SeekHead() error {
-	sd_journal_seek_head, err := j.getFunction("sd_journal_seek_head")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_seek_head(sd_journal_seek_head, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to seek to head of journal: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// SeekTail may be used to seek to the end of the journal, i.e. the most recent
-// available entry.
-func (j *Journal) SeekTail() error {
-	sd_journal_seek_tail, err := j.getFunction("sd_journal_seek_tail")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_seek_tail(sd_journal_seek_tail, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to seek to tail of journal: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// SeekRealtimeUsec seeks to the entry with the specified realtime (wallclock)
-// timestamp, i.e. CLOCK_REALTIME.
-func (j *Journal) SeekRealtimeUsec(usec uint64) error {
-	sd_journal_seek_realtime_usec, err := j.getFunction("sd_journal_seek_realtime_usec")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_seek_realtime_usec(sd_journal_seek_realtime_usec, j.cjournal, C.uint64_t(usec))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to seek to %d: %d", usec, syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// SeekCursor seeks to a concrete journal cursor.
-func (j *Journal) SeekCursor(cursor string) error {
-	sd_journal_seek_cursor, err := j.getFunction("sd_journal_seek_cursor")
-	if err != nil {
-		return err
-	}
-
-	c := C.CString(cursor)
-	defer C.free(unsafe.Pointer(c))
-
-	j.mu.Lock()
-	r := C.my_sd_journal_seek_cursor(sd_journal_seek_cursor, j.cjournal, c)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to seek to cursor %q: %d", cursor, syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// Wait will synchronously wait until the journal gets changed. The maximum time
-// this call sleeps may be controlled with the timeout parameter.  If
-// sdjournal.IndefiniteWait is passed as the timeout parameter, Wait will
-// wait indefinitely for a journal change.
-func (j *Journal) Wait(timeout time.Duration) int {
-	var to uint64
-
-	sd_journal_wait, err := j.getFunction("sd_journal_wait")
-	if err != nil {
-		return -1
-	}
-
-	if timeout == IndefiniteWait {
-		// sd_journal_wait(3) calls for a (uint64_t) -1 to be passed to signify
-		// indefinite wait, but using a -1 overflows our C.uint64_t, so we use an
-		// equivalent hex value.
-		to = 0xffffffffffffffff
-	} else {
-		to = uint64(time.Now().Add(timeout).Unix() / 1000)
-	}
-	j.mu.Lock()
-	r := C.my_sd_journal_wait(sd_journal_wait, j.cjournal, C.uint64_t(to))
-	j.mu.Unlock()
-
-	return int(r)
-}
-
-// GetUsage returns the journal disk space usage, in bytes.
-func (j *Journal) GetUsage() (uint64, error) {
-	var out C.uint64_t
-
-	sd_journal_get_usage, err := j.getFunction("sd_journal_get_usage")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_usage(sd_journal_get_usage, j.cjournal, &out)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to get journal disk space usage: %d", syscall.Errno(-r))
-	}
-
-	return uint64(out), nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
deleted file mode 100644
index 71ee806a96..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/sdjournal/read.go
+++ /dev/null
@@ -1,252 +0,0 @@
-// Copyright 2015 RedHat, Inc.
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package sdjournal
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"strings"
-	"time"
-)
-
-var (
-	ErrExpired = errors.New("Timeout expired")
-)
-
-// JournalReaderConfig represents options to drive the behavior of a JournalReader.
-type JournalReaderConfig struct {
-	// The Since, NumFromTail and Cursor options are mutually exclusive and
-	// determine where the reading begins within the journal. The order in which
-	// options are written is exactly the order of precedence.
-	Since       time.Duration // start relative to a Duration from now
-	NumFromTail uint64        // start relative to the tail
-	Cursor      string        // start relative to the cursor
-
-	// Show only journal entries whose fields match the supplied values. If
-	// the array is empty, entries will not be filtered.
-	Matches []Match
-
-	// If not empty, the journal instance will point to a journal residing
-	// in this directory. The supplied path may be relative or absolute.
-	Path string
-}
-
-// JournalReader is an io.ReadCloser which provides a simple interface for iterating through the
-// systemd journal. A JournalReader is not safe for concurrent use by multiple goroutines.
-type JournalReader struct {
-	journal   *Journal
-	msgReader *strings.Reader
-}
-
-// NewJournalReader creates a new JournalReader with configuration options that are similar to the
-// systemd journalctl tool's iteration and filtering features.
-func NewJournalReader(config JournalReaderConfig) (*JournalReader, error) {
-	r := &JournalReader{}
-
-	// Open the journal
-	var err error
-	if config.Path != "" {
-		r.journal, err = NewJournalFromDir(config.Path)
-	} else {
-		r.journal, err = NewJournal()
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	// Add any supplied matches
-	for _, m := range config.Matches {
-		r.journal.AddMatch(m.String())
-	}
-
-	// Set the start position based on options
-	if config.Since != 0 {
-		// Start based on a relative time
-		start := time.Now().Add(config.Since)
-		if err := r.journal.SeekRealtimeUsec(uint64(start.UnixNano() / 1000)); err != nil {
-			return nil, err
-		}
-	} else if config.NumFromTail != 0 {
-		// Start based on a number of lines before the tail
-		if err := r.journal.SeekTail(); err != nil {
-			return nil, err
-		}
-
-		// Move the read pointer into position near the tail. Go one further than
-		// the option so that the initial cursor advancement positions us at the
-		// correct starting point.
-		if _, err := r.journal.PreviousSkip(config.NumFromTail + 1); err != nil {
-			return nil, err
-		}
-	} else if config.Cursor != "" {
-		// Start based on a custom cursor
-		if err := r.journal.SeekCursor(config.Cursor); err != nil {
-			return nil, err
-		}
-	}
-
-	return r, nil
-}
-
-// Read reads entries from the journal. Read follows the Reader interface so
-// it must be able to read a specific amount of bytes. Journald on the other
-// hand only allows us to read full entries of arbitrary size (without byte
-// granularity). JournalReader is therefore internally buffering entries that
-// don't fit in the read buffer. Callers should keep calling until 0 and/or an
-// error is returned.
-func (r *JournalReader) Read(b []byte) (int, error) {
-	var err error
-
-	if r.msgReader == nil {
-		var c int
-
-		// Advance the journal cursor. It has to be called at least one time
-		// before reading
-		c, err = r.journal.Next()
-
-		// An unexpected error
-		if err != nil {
-			return 0, err
-		}
-
-		// EOF detection
-		if c == 0 {
-			return 0, io.EOF
-		}
-
-		// Build a message
-		var msg string
-		msg, err = r.buildMessage()
-
-		if err != nil {
-			return 0, err
-		}
-		r.msgReader = strings.NewReader(msg)
-	}
-
-	// Copy and return the message
-	var sz int
-	sz, err = r.msgReader.Read(b)
-	if err == io.EOF {
-		// The current entry has been fully read. Don't propagate this
-		// EOF, so the next entry can be read at the next Read()
-		// iteration.
-		r.msgReader = nil
-		return sz, nil
-	}
-	if err != nil {
-		return sz, err
-	}
-	if r.msgReader.Len() == 0 {
-		r.msgReader = nil
-	}
-
-	return sz, nil
-}
-
-// Close closes the JournalReader's handle to the journal.
-func (r *JournalReader) Close() error {
-	return r.journal.Close()
-}
-
-// Rewind attempts to rewind the JournalReader to the first entry.
-func (r *JournalReader) Rewind() error {
-	r.msgReader = nil
-	return r.journal.SeekHead()
-}
-
-// Follow synchronously follows the JournalReader, writing each new journal entry to writer. The
-// follow will continue until a single time.Time is received on the until channel.
-func (r *JournalReader) Follow(until <-chan time.Time, writer io.Writer) (err error) {
-
-	// Process journal entries and events. Entries are flushed until the tail or
-	// timeout is reached, and then we wait for new events or the timeout.
-	var msg = make([]byte, 64*1<<(10))
-process:
-	for {
-		c, err := r.Read(msg)
-		if err != nil && err != io.EOF {
-			break process
-		}
-
-		select {
-		case <-until:
-			return ErrExpired
-		default:
-			if c > 0 {
-				if _, err = writer.Write(msg[:c]); err != nil {
-					break process
-				}
-				continue process
-			}
-		}
-
-		// We're at the tail, so wait for new events or time out.
-		// Holds journal events to process. Tightly bounded for now unless there's a
-		// reason to unblock the journal watch routine more quickly.
-		events := make(chan int, 1)
-		pollDone := make(chan bool, 1)
-		go func() {
-			for {
-				select {
-				case <-pollDone:
-					return
-				default:
-					events <- r.journal.Wait(time.Duration(1) * time.Second)
-				}
-			}
-		}()
-
-		select {
-		case <-until:
-			pollDone <- true
-			return ErrExpired
-		case e := <-events:
-			pollDone <- true
-			switch e {
-			case SD_JOURNAL_NOP, SD_JOURNAL_APPEND, SD_JOURNAL_INVALIDATE:
-				// TODO: need to account for any of these?
-			default:
-				log.Printf("Received unknown event: %d\n", e)
-			}
-			continue process
-		}
-	}
-
-	return
-}
-
-// buildMessage returns a string representing the current journal entry in a simple format which
-// includes the entry timestamp and MESSAGE field.
-func (r *JournalReader) buildMessage() (string, error) {
-	var msg string
-	var usec uint64
-	var err error
-
-	if msg, err = r.journal.GetData("MESSAGE"); err != nil {
-		return "", err
-	}
-
-	if usec, err = r.journal.GetRealtimeUsec(); err != nil {
-		return "", err
-	}
-
-	timestamp := time.Unix(0, int64(usec)*int64(time.Microsecond))
-
-	return fmt.Sprintf("%s %s\n", timestamp, msg), nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/deserialize.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/deserialize.go
deleted file mode 100644
index 8a88162f98..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/deserialize.go
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"unicode"
-)
-
-const (
-	// SYSTEMD_LINE_MAX mimics the maximum line length that systemd can use.
-	// On typical systemd platforms (i.e. modern Linux), this will most
-	// commonly be 2048, so let's use that as a sanity check.
-	// Technically, we should probably pull this at runtime:
-	//    SYSTEMD_LINE_MAX = int(C.sysconf(C.__SC_LINE_MAX))
-	// but this would introduce an (unfortunate) dependency on cgo
-	SYSTEMD_LINE_MAX = 2048
-
-	// characters that systemd considers indicate a newline
-	SYSTEMD_NEWLINE = "\r\n"
-)
-
-var (
-	ErrLineTooLong = fmt.Errorf("line too long (max %d bytes)", SYSTEMD_LINE_MAX)
-)
-
-// Deserialize parses a systemd unit file into a list of UnitOption objects.
-func Deserialize(f io.Reader) (opts []*UnitOption, err error) {
-	lexer, optchan, errchan := newLexer(f)
-	go lexer.lex()
-
-	for opt := range optchan {
-		opts = append(opts, &(*opt))
-	}
-
-	err = <-errchan
-	return opts, err
-}
-
-func newLexer(f io.Reader) (*lexer, <-chan *UnitOption, <-chan error) {
-	optchan := make(chan *UnitOption)
-	errchan := make(chan error, 1)
-	buf := bufio.NewReader(f)
-
-	return &lexer{buf, optchan, errchan, ""}, optchan, errchan
-}
-
-type lexer struct {
-	buf     *bufio.Reader
-	optchan chan *UnitOption
-	errchan chan error
-	section string
-}
-
-func (l *lexer) lex() {
-	var err error
-	defer func() {
-		close(l.optchan)
-		close(l.errchan)
-	}()
-	next := l.lexNextSection
-	for next != nil {
-		if l.buf.Buffered() >= SYSTEMD_LINE_MAX {
-			// systemd truncates lines longer than LINE_MAX
-			// https://bugs.freedesktop.org/show_bug.cgi?id=85308
-			// Rather than allowing this to pass silently, let's
-			// explicitly gate people from encountering this
-			line, err := l.buf.Peek(SYSTEMD_LINE_MAX)
-			if err != nil {
-				l.errchan <- err
-				return
-			}
-			if bytes.IndexAny(line, SYSTEMD_NEWLINE) == -1 {
-				l.errchan <- ErrLineTooLong
-				return
-			}
-		}
-
-		next, err = next()
-		if err != nil {
-			l.errchan <- err
-			return
-		}
-	}
-}
-
-type lexStep func() (lexStep, error)
-
-func (l *lexer) lexSectionName() (lexStep, error) {
-	sec, err := l.buf.ReadBytes(']')
-	if err != nil {
-		return nil, errors.New("unable to find end of section")
-	}
-
-	return l.lexSectionSuffixFunc(string(sec[:len(sec)-1])), nil
-}
-
-func (l *lexer) lexSectionSuffixFunc(section string) lexStep {
-	return func() (lexStep, error) {
-		garbage, _, err := l.toEOL()
-		if err != nil {
-			return nil, err
-		}
-
-		garbage = bytes.TrimSpace(garbage)
-		if len(garbage) > 0 {
-			return nil, fmt.Errorf("found garbage after section name %s: %v", l.section, garbage)
-		}
-
-		return l.lexNextSectionOrOptionFunc(section), nil
-	}
-}
-
-func (l *lexer) ignoreLineFunc(next lexStep) lexStep {
-	return func() (lexStep, error) {
-		for {
-			line, _, err := l.toEOL()
-			if err != nil {
-				return nil, err
-			}
-
-			line = bytes.TrimSuffix(line, []byte{' '})
-
-			// lack of continuation means this line has been exhausted
-			if !bytes.HasSuffix(line, []byte{'\\'}) {
-				break
-			}
-		}
-
-		// reached end of buffer, safe to exit
-		return next, nil
-	}
-}
-
-func (l *lexer) lexNextSection() (lexStep, error) {
-	r, _, err := l.buf.ReadRune()
-	if err != nil {
-		if err == io.EOF {
-			err = nil
-		}
-		return nil, err
-	}
-
-	if r == '[' {
-		return l.lexSectionName, nil
-	} else if isComment(r) {
-		return l.ignoreLineFunc(l.lexNextSection), nil
-	}
-
-	return l.lexNextSection, nil
-}
-
-func (l *lexer) lexNextSectionOrOptionFunc(section string) lexStep {
-	return func() (lexStep, error) {
-		r, _, err := l.buf.ReadRune()
-		if err != nil {
-			if err == io.EOF {
-				err = nil
-			}
-			return nil, err
-		}
-
-		if unicode.IsSpace(r) {
-			return l.lexNextSectionOrOptionFunc(section), nil
-		} else if r == '[' {
-			return l.lexSectionName, nil
-		} else if isComment(r) {
-			return l.ignoreLineFunc(l.lexNextSectionOrOptionFunc(section)), nil
-		}
-
-		l.buf.UnreadRune()
-		return l.lexOptionNameFunc(section), nil
-	}
-}
-
-func (l *lexer) lexOptionNameFunc(section string) lexStep {
-	return func() (lexStep, error) {
-		var partial bytes.Buffer
-		for {
-			r, _, err := l.buf.ReadRune()
-			if err != nil {
-				return nil, err
-			}
-
-			if r == '\n' || r == '\r' {
-				return nil, errors.New("unexpected newline encountered while parsing option name")
-			}
-
-			if r == '=' {
-				break
-			}
-
-			partial.WriteRune(r)
-		}
-
-		name := strings.TrimSpace(partial.String())
-		return l.lexOptionValueFunc(section, name, bytes.Buffer{}), nil
-	}
-}
-
-func (l *lexer) lexOptionValueFunc(section, name string, partial bytes.Buffer) lexStep {
-	return func() (lexStep, error) {
-		for {
-			line, eof, err := l.toEOL()
-			if err != nil {
-				return nil, err
-			}
-
-			if len(bytes.TrimSpace(line)) == 0 {
-				break
-			}
-
-			partial.Write(line)
-
-			// lack of continuation means this value has been exhausted
-			idx := bytes.LastIndex(line, []byte{'\\'})
-			if idx == -1 || idx != (len(line)-1) {
-				break
-			}
-
-			if !eof {
-				partial.WriteRune('\n')
-			}
-
-			return l.lexOptionValueFunc(section, name, partial), nil
-		}
-
-		val := partial.String()
-		if strings.HasSuffix(val, "\n") {
-			// A newline was added to the end, so the file didn't end with a backslash.
-			// => Keep the newline
-			val = strings.TrimSpace(val) + "\n"
-		} else {
-			val = strings.TrimSpace(val)
-		}
-		l.optchan <- &UnitOption{Section: section, Name: name, Value: val}
-
-		return l.lexNextSectionOrOptionFunc(section), nil
-	}
-}
-
-// toEOL reads until the end-of-line or end-of-file.
-// Returns (data, EOFfound, error)
-func (l *lexer) toEOL() ([]byte, bool, error) {
-	line, err := l.buf.ReadBytes('\n')
-	// ignore EOF here since it's roughly equivalent to EOL
-	if err != nil && err != io.EOF {
-		return nil, false, err
-	}
-
-	line = bytes.TrimSuffix(line, []byte{'\r'})
-	line = bytes.TrimSuffix(line, []byte{'\n'})
-
-	return line, err == io.EOF, nil
-}
-
-func isComment(r rune) bool {
-	return r == '#' || r == ';'
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/escape.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/escape.go
deleted file mode 100644
index 63b11726db..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/escape.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Implements systemd-escape [--unescape] [--path]
-
-package unit
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-const (
-	allowed = `:_.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789`
-)
-
-// If isPath is true:
-//   We remove redundant '/'s, the leading '/', and trailing '/'.
-//   If the result is empty, a '/' is inserted.
-//
-// We always:
-//  Replace the following characters with `\x%x`:
-//   Leading `.`
-//   `-`, `\`, and anything not in this set: `:-_.\[0-9a-zA-Z]`
-//  Replace '/' with '-'.
-func escape(unescaped string, isPath bool) string {
-	e := []byte{}
-	inSlashes := false
-	start := true
-	for i := 0; i < len(unescaped); i++ {
-		c := unescaped[i]
-		if isPath {
-			if c == '/' {
-				inSlashes = true
-				continue
-			} else if inSlashes {
-				inSlashes = false
-				if !start {
-					e = append(e, '-')
-				}
-			}
-		}
-
-		if c == '/' {
-			e = append(e, '-')
-		} else if start && c == '.' || strings.IndexByte(allowed, c) == -1 {
-			e = append(e, []byte(fmt.Sprintf(`\x%x`, c))...)
-		} else {
-			e = append(e, c)
-		}
-		start = false
-	}
-	if isPath && len(e) == 0 {
-		e = append(e, '-')
-	}
-	return string(e)
-}
-
-// If isPath is true:
-//   We always return a string beginning with '/'.
-//
-// We always:
-//  Replace '-' with '/'.
-//  Replace `\x%x` with the value represented in hex.
-func unescape(escaped string, isPath bool) string {
-	u := []byte{}
-	for i := 0; i < len(escaped); i++ {
-		c := escaped[i]
-		if c == '-' {
-			c = '/'
-		} else if c == '\\' && len(escaped)-i >= 4 && escaped[i+1] == 'x' {
-			n, err := strconv.ParseInt(escaped[i+2:i+4], 16, 8)
-			if err == nil {
-				c = byte(n)
-				i += 3
-			}
-		}
-		u = append(u, c)
-	}
-	if isPath && (len(u) == 0 || u[0] != '/') {
-		u = append([]byte("/"), u...)
-	}
-	return string(u)
-}
-
-// UnitNameEscape escapes a string as `systemd-escape` would
-func UnitNameEscape(unescaped string) string {
-	return escape(unescaped, false)
-}
-
-// UnitNameUnescape unescapes a string as `systemd-escape --unescape` would
-func UnitNameUnescape(escaped string) string {
-	return unescape(escaped, false)
-}
-
-// UnitNamePathEscape escapes a string as `systemd-escape --path` would
-func UnitNamePathEscape(unescaped string) string {
-	return escape(unescaped, true)
-}
-
-// UnitNamePathUnescape unescapes a string as `systemd-escape --path --unescape` would
-func UnitNamePathUnescape(escaped string) string {
-	return unescape(escaped, true)
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/option.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/option.go
deleted file mode 100644
index e5d21e19d9..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/option.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"fmt"
-)
-
-type UnitOption struct {
-	Section string
-	Name    string
-	Value   string
-}
-
-func NewUnitOption(section, name, value string) *UnitOption {
-	return &UnitOption{Section: section, Name: name, Value: value}
-}
-
-func (uo *UnitOption) String() string {
-	return fmt.Sprintf("{Section: %q, Name: %q, Value: %q}", uo.Section, uo.Name, uo.Value)
-}
-
-func (uo *UnitOption) Match(other *UnitOption) bool {
-	return uo.Section == other.Section &&
-		uo.Name == other.Name &&
-		uo.Value == other.Value
-}
-
-func AllMatch(u1 []*UnitOption, u2 []*UnitOption) bool {
-	length := len(u1)
-	if length != len(u2) {
-		return false
-	}
-
-	for i := 0; i < length; i++ {
-		if !u1[i].Match(u2[i]) {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/serialize.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/serialize.go
deleted file mode 100644
index e07799cad6..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/unit/serialize.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"bytes"
-	"io"
-)
-
-// Serialize encodes all of the given UnitOption objects into a
-// unit file. When serialized the options are sorted in their
-// supplied order but grouped by section.
-func Serialize(opts []*UnitOption) io.Reader {
-	var buf bytes.Buffer
-
-	if len(opts) == 0 {
-		return &buf
-	}
-
-	// Index of sections -> ordered options
-	idx := map[string][]*UnitOption{}
-	// Separately preserve order in which sections were seen
-	sections := []string{}
-	for _, opt := range opts {
-		sec := opt.Section
-		if _, ok := idx[sec]; !ok {
-			sections = append(sections, sec)
-		}
-		idx[sec] = append(idx[sec], opt)
-	}
-
-	for i, sect := range sections {
-		writeSectionHeader(&buf, sect)
-		writeNewline(&buf)
-
-		opts := idx[sect]
-		for _, opt := range opts {
-			writeOption(&buf, opt)
-			writeNewline(&buf)
-		}
-		if i < len(sections)-1 {
-			writeNewline(&buf)
-		}
-	}
-
-	return &buf
-}
-
-func writeNewline(buf *bytes.Buffer) {
-	buf.WriteRune('\n')
-}
-
-func writeSectionHeader(buf *bytes.Buffer, section string) {
-	buf.WriteRune('[')
-	buf.WriteString(section)
-	buf.WriteRune(']')
-}
-
-func writeOption(buf *bytes.Buffer, opt *UnitOption) {
-	buf.WriteString(opt.Name)
-	buf.WriteRune('=')
-	buf.WriteString(opt.Value)
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go b/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
deleted file mode 100644
index e4ed8b2639..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/util/util.go
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package util contains utility functions related to systemd that applications
-// can use to check things like whether systemd is running.  Note that some of
-// these functions attempt to manually load systemd libraries at runtime rather
-// than linking against them.
-package util
-
-// #include <stdlib.h>
-// #include <sys/types.h>
-// #include <unistd.h>
-//
-// int
-// my_sd_pid_get_owner_uid(void *f, pid_t pid, uid_t *uid)
-// {
-//   int (*sd_pid_get_owner_uid)(pid_t, uid_t *);
-//
-//   sd_pid_get_owner_uid = (int (*)(pid_t, uid_t *))f;
-//   return sd_pid_get_owner_uid(pid, uid);
-// }
-//
-// int
-// my_sd_pid_get_unit(void *f, pid_t pid, char **unit)
-// {
-//   int (*sd_pid_get_unit)(pid_t, char **);
-//
-//   sd_pid_get_unit = (int (*)(pid_t, char **))f;
-//   return sd_pid_get_unit(pid, unit);
-// }
-//
-// int
-// my_sd_pid_get_slice(void *f, pid_t pid, char **slice)
-// {
-//   int (*sd_pid_get_slice)(pid_t, char **);
-//
-//   sd_pid_get_slice = (int (*)(pid_t, char **))f;
-//   return sd_pid_get_slice(pid, slice);
-// }
-//
-// int
-// am_session_leader()
-// {
-//   return (getsid(0) == getpid());
-// }
-import "C"
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strings"
-	"syscall"
-	"unsafe"
-
-	"github.com/coreos/pkg/dlopen"
-)
-
-var libsystemdNames = []string{
-	// systemd < 209
-	"libsystemd-login.so.0",
-	"libsystemd-login.so",
-
-	// systemd >= 209 merged libsystemd-login into libsystemd proper
-	"libsystemd.so.0",
-	"libsystemd.so",
-}
-
-// GetRunningSlice attempts to retrieve the name of the systemd slice in which
-// the current process is running.
-// This function is a wrapper around the libsystemd C library; if it cannot be
-// opened, an error is returned.
-func GetRunningSlice() (slice string, err error) {
-	var h *dlopen.LibHandle
-	h, err = dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err1 := h.Close(); err1 != nil {
-			err = err1
-		}
-	}()
-
-	sd_pid_get_slice, err := h.GetSymbolPointer("sd_pid_get_slice")
-	if err != nil {
-		return
-	}
-
-	var s string
-	sl := C.CString(s)
-	defer C.free(unsafe.Pointer(sl))
-
-	ret := C.my_sd_pid_get_slice(sd_pid_get_slice, 0, &sl)
-	if ret < 0 {
-		err = fmt.Errorf("error calling sd_pid_get_slice: %v", syscall.Errno(-ret))
-		return
-	}
-
-	return C.GoString(sl), nil
-}
-
-// RunningFromSystemService tries to detect whether the current process has
-// been invoked from a system service. The condition for this is whether the
-// process is _not_ a user process. User processes are those running in session
-// scopes or under per-user `systemd --user` instances.
-//
-// To avoid false positives on systems without `pam_systemd` (which is
-// responsible for creating user sessions), this function also uses a heuristic
-// to detect whether it's being invoked from a session leader process. This is
-// the case if the current process is executed directly from a service file
-// (e.g. with `ExecStart=/this/cmd`). Note that this heuristic will fail if the
-// command is instead launched in a subshell or similar so that it is not
-// session leader (e.g. `ExecStart=/bin/bash -c "/this/cmd"`)
-//
-// This function is a wrapper around the libsystemd C library; if this is
-// unable to successfully open a handle to the library for any reason (e.g. it
-// cannot be found), an errr will be returned
-func RunningFromSystemService() (ret bool, err error) {
-	var h *dlopen.LibHandle
-	h, err = dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err1 := h.Close(); err1 != nil {
-			err = err1
-		}
-	}()
-
-	sd_pid_get_owner_uid, err := h.GetSymbolPointer("sd_pid_get_owner_uid")
-	if err != nil {
-		return
-	}
-
-	var uid C.uid_t
-	errno := C.my_sd_pid_get_owner_uid(sd_pid_get_owner_uid, 0, &uid)
-	serrno := syscall.Errno(-errno)
-	// when we're running from a unit file, sd_pid_get_owner_uid returns
-	// ENOENT (systemd <220) or ENXIO (systemd >=220)
-	switch {
-	case errno >= 0:
-		ret = false
-	case serrno == syscall.ENOENT, serrno == syscall.ENXIO:
-		// Since the implementation of sessions in systemd relies on
-		// the `pam_systemd` module, using the sd_pid_get_owner_uid
-		// heuristic alone can result in false positives if that module
-		// (or PAM itself) is not present or properly configured on the
-		// system. As such, we also check if we're the session leader,
-		// which should be the case if we're invoked from a unit file,
-		// but not if e.g. we're invoked from the command line from a
-		// user's login session
-		ret = C.am_session_leader() == 1
-	default:
-		err = fmt.Errorf("error calling sd_pid_get_owner_uid: %v", syscall.Errno(-errno))
-	}
-	return
-}
-
-// CurrentUnitName attempts to retrieve the name of the systemd system unit
-// from which the calling process has been invoked. It wraps the systemd
-// `sd_pid_get_unit` call, with the same caveat: for processes not part of a
-// systemd system unit, this function will return an error.
-func CurrentUnitName() (unit string, err error) {
-	var h *dlopen.LibHandle
-	h, err = dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err1 := h.Close(); err1 != nil {
-			err = err1
-		}
-	}()
-
-	sd_pid_get_unit, err := h.GetSymbolPointer("sd_pid_get_unit")
-	if err != nil {
-		return
-	}
-
-	var s string
-	u := C.CString(s)
-	defer C.free(unsafe.Pointer(u))
-
-	ret := C.my_sd_pid_get_unit(sd_pid_get_unit, 0, &u)
-	if ret < 0 {
-		err = fmt.Errorf("error calling sd_pid_get_unit: %v", syscall.Errno(-ret))
-		return
-	}
-
-	unit = C.GoString(u)
-	return
-}
-
-// IsRunningSystemd checks whether the host was booted with systemd as its init
-// system. This functions similarly to systemd's `sd_booted(3)`: internally, it
-// checks whether /run/systemd/system/ exists and is a directory.
-// http://www.freedesktop.org/software/systemd/man/sd_booted.html
-func IsRunningSystemd() bool {
-	fi, err := os.Lstat("/run/systemd/system")
-	if err != nil {
-		return false
-	}
-	return fi.IsDir()
-}
-
-// GetMachineID returns a host's 128-bit machine ID as a string. This functions
-// similarly to systemd's `sd_id128_get_machine`: internally, it simply reads
-// the contents of /etc/machine-id
-// http://www.freedesktop.org/software/systemd/man/sd_id128_get_machine.html
-func GetMachineID() (string, error) {
-	machineID, err := ioutil.ReadFile("/etc/machine-id")
-	if err != nil {
-		return "", fmt.Errorf("failed to read /etc/machine-id: %v", err)
-	}
-	return strings.TrimSpace(string(machineID)), nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/LICENSE b/Godeps/_workspace/src/github.com/coreos/go-tspi/LICENSE
deleted file mode 100644
index e06d208186..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tpmclient/tpmclient.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tpmclient/tpmclient.go
deleted file mode 100644
index fb5279b2a1..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tpmclient/tpmclient.go
+++ /dev/null
@@ -1,310 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tpmclient
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"time"
-
-	"github.com/coreos/go-tspi/tspiconst"
-	"github.com/coreos/go-tspi/verification"
-)
-
-// TPMClient represents a connection to a system running a daemon providing
-// access to TPM functionality
-type TPMClient struct {
-	host    string
-	timeout time.Duration
-}
-
-const (
-	GetEKCertURL    = "/v1/getEkcert"
-	ExtendURL       = "/v1/extend"
-	QuoteURL        = "/v1/quote"
-	GenerateAikURL  = "/v1/generateAik"
-	GenerateKeyURL  = "/v1/generateKey"
-	AikChallengeURL = "/v1/aikChallenge"
-)
-
-func (client *TPMClient) get(endpoint string) (*http.Response, error) {
-	url := fmt.Sprintf("http://%s%s", client.host, endpoint)
-	httpClient := &http.Client{
-		Timeout: client.timeout,
-	}
-	resp, err := httpClient.Get(url)
-	return resp, err
-}
-
-func (client *TPMClient) post(endpoint string, data io.Reader) (*http.Response, error) {
-	url := fmt.Sprintf("http://%s%s", client.host, endpoint)
-	httpClient := &http.Client{
-		Timeout: client.timeout,
-	}
-	resp, err := httpClient.Post(url, "application/json", data)
-	return resp, err
-}
-
-type EkcertResponse struct {
-	EKCert []byte
-}
-
-// GetEKCert obtains the Endorsement Key certificate from the client TPM. This
-// is an X509 certificate containing the public half of the Endorsement Key
-// and a signature chain chaining back to a vendor-issued signing certificate.
-func (client *TPMClient) GetEKCert() (ekcert []byte, err error) {
-	var ekcertData EkcertResponse
-
-	ekresp, err := client.get(GetEKCertURL)
-	if err != nil {
-		return nil, fmt.Errorf("Can't obtain ekcert: %s", err)
-	}
-	defer ekresp.Body.Close()
-	body, err := ioutil.ReadAll(ekresp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("Can't read ekcert response: %s", err)
-	}
-
-	err = json.Unmarshal(body, &ekcertData)
-	if err != nil {
-		return nil, fmt.Errorf("Can't parse ekcert response: %s", err)
-	}
-
-	return ekcertData.EKCert, nil
-}
-
-type AikResponse struct {
-	AIKBlob []byte
-	AIKPub  []byte
-}
-
-// GenerateAIK requests that the TPM generate a new Attestation Identity Key.
-// It returns an unencrypted copy of the public half of the AIK, along with
-// a TSPI key blob encrypted by the TPM.
-func (client *TPMClient) GenerateAIK() (aikpub []byte, aikblob []byte, err error) {
-	var aikData AikResponse
-
-	aikresp, err := client.post(GenerateAikURL, nil)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't generate AIK: %s", err)
-	}
-	defer aikresp.Body.Close()
-	body, err := ioutil.ReadAll(aikresp.Body)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't read AIK response: %s", err)
-	}
-
-	err = json.Unmarshal(body, &aikData)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't parse AIK response: %s (%s)", err, body)
-	}
-
-	aikpub = aikData.AIKPub
-	aikblob = aikData.AIKBlob
-
-	return aikpub, aikblob, nil
-}
-
-type KeyData struct {
-	KeyFlags int
-}
-
-type KeyResponse struct {
-	KeyBlob []byte
-	KeyPub  []byte
-}
-
-// GenerateKey requests that the TPM generate a new keypair
-func (client *TPMClient) GenerateKey(flags int) (keypub []byte, keyblob []byte, err error) {
-	var keyData KeyData
-	var keyResponse KeyResponse
-
-	keyData.KeyFlags = flags
-	request, err := json.Marshal(keyData)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't construct request JSON: %s", err)
-	}
-
-	keyresp, err := client.post(GenerateKeyURL, bytes.NewBuffer(request))
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't generate key: %s", err)
-	}
-	defer keyresp.Body.Close()
-	body, err := ioutil.ReadAll(keyresp.Body)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't read key response: %s", err)
-	}
-
-	err = json.Unmarshal(body, &keyResponse)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't parse key response: %s (%s)", err, body)
-	}
-
-	keypub = keyResponse.KeyPub
-	keyblob = keyResponse.KeyBlob
-
-	return keypub, keyblob, nil
-}
-
-type ChallengeData struct {
-	AIK     []byte
-	Asymenc []byte
-	Symenc  []byte
-}
-
-type ChallengeResponse struct {
-	Response []byte
-}
-
-// ValidateAIK challenges the TPM to validate an AIK by using the provided
-// key blob to decrypt a secret encrypted with the public half of the
-// AIK. This will only be possible if the TPM is able to decrypt the
-// encrypted key blob.  The AIK is used to decrypt asymenc, which then
-// provides the AES key used to encrypt symenc. Decrypting symenc provides
-// the original secret, which is then returned.
-func (client *TPMClient) ValidateAIK(aikblob []byte, asymenc []byte, symenc []byte) (secret []byte, err error) {
-	var challenge ChallengeData
-	var response ChallengeResponse
-
-	challenge.AIK = aikblob
-	challenge.Asymenc = asymenc
-	challenge.Symenc = symenc
-
-	request, err := json.Marshal(challenge)
-	if err != nil {
-		return nil, fmt.Errorf("Can't construct challenge JSON: %s", err)
-	}
-	chalresp, err := client.post(AikChallengeURL, bytes.NewBuffer(request))
-	if err != nil {
-		return nil, fmt.Errorf("Can't perform AIK challenge: %s", err)
-	}
-	defer chalresp.Body.Close()
-	body, err := ioutil.ReadAll(chalresp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("Can't read AIK challenge response: %s", err)
-	}
-
-	err = json.Unmarshal(body, &response)
-	if err != nil {
-		return nil, fmt.Errorf("Can't parse AIK challenge response: %s", err)
-	}
-	return response.Response, nil
-}
-
-type ExtendInput struct {
-	Pcr       int
-	Eventtype int
-	Data      []byte
-	Event     string
-}
-
-// Extend extends a TPM PCR with the provided data. If event is nil, data must
-// be pre-hashed with SHA1 and will be used to extend the PCR directly. If
-// event is not nil, data and event will be hashed to generate the extension
-// value. Event will then be stored in the TPM event log.
-func (client *TPMClient) Extend(pcr int, eventtype int, data []byte, event string) error {
-	var extendData ExtendInput
-
-	extendData.Pcr = pcr
-	extendData.Eventtype = eventtype
-	extendData.Data = data
-	extendData.Event = event
-
-	request, err := json.Marshal(extendData)
-	if err != nil {
-		return fmt.Errorf("Can't construct extension JSON: %s", err)
-	}
-	chalresp, err := client.post(ExtendURL, bytes.NewBuffer(request))
-	if err != nil {
-		return fmt.Errorf("Can't perform PCR extension: %s", err)
-	}
-	defer chalresp.Body.Close()
-
-	return nil
-}
-
-type QuoteData struct {
-	AIK   []byte
-	PCRs  []int
-	Nonce []byte
-}
-
-type QuoteResponse struct {
-	Data       []byte
-	Validation []byte
-	PCRValues  [][]byte
-	Events     []tspiconst.Log
-}
-
-// GetQuote obtains a PCR quote from the TPM. It takes the aikpub Tspi Key, the
-// encrypted AIK blob and a list of PCRs as arguments. The response will
-// contain an array of PCR values, an array of log entries and any error.
-func (client *TPMClient) GetQuote(aikpub []byte, aikblob []byte, pcrs []int) (pcrvals [][]byte, log []tspiconst.Log, err error) {
-	var quoteRequest QuoteData
-	var response QuoteResponse
-
-	nonce := make([]byte, 20)
-	_, err = rand.Read(nonce)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Unable to generate nonce: %s", err)
-	}
-
-	quoteRequest.AIK = aikblob
-	quoteRequest.PCRs = pcrs
-	quoteRequest.Nonce = nonce
-
-	request, err := json.Marshal(quoteRequest)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't construct quote request JSON: %s", err)
-	}
-	chalresp, err := client.post(QuoteURL, bytes.NewBuffer(request))
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't perform obtain quote: %s", err)
-	}
-	defer chalresp.Body.Close()
-	body, err := ioutil.ReadAll(chalresp.Body)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't read quote response: %s", err)
-	}
-
-	err = json.Unmarshal(body, &response)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't parse quote response: %s", err)
-	}
-
-	aikmod := aikpub[28:]
-
-	err = verification.QuoteVerify(response.Data, response.Validation, aikmod, response.PCRValues, nonce)
-
-	if err != nil {
-		return nil, nil, fmt.Errorf("Can't verify quote: %s", err)
-	}
-
-	return response.PCRValues, response.Events, nil
-}
-
-// New returns a TPMClient structure configured to connect to the provided
-// host with the provided timeout.
-func New(host string, timeout time.Duration) *TPMClient {
-	return &TPMClient{
-		host:    host,
-		timeout: timeout,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspiconst/tspiconst.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/tspiconst/tspiconst.go
deleted file mode 100644
index f2446db76b..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/tspiconst/tspiconst.go
+++ /dev/null
@@ -1,538 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tspiconst
-
-const (
-	TSS_OBJECT_TYPE_POLICY                                = 0x01
-	TSS_OBJECT_TYPE_RSAKEY                                = 0x02
-	TSS_OBJECT_TYPE_ENCDATA                               = 0x03
-	TSS_OBJECT_TYPE_PCRS                                  = 0x04
-	TSS_OBJECT_TYPE_HASH                                  = 0x05
-	TSS_OBJECT_TYPE_DELFAMILY                             = 0x06
-	TSS_OBJECT_TYPE_NV                                    = 0x07
-	TSS_OBJECT_TYPE_MIGDATA                               = 0x08
-	TSS_OBJECT_TYPE_DAA_CERTIFICATE                       = 0x09
-	TSS_OBJECT_TYPE_DAA_ISSUER_KEY                        = 0x0a
-	TSS_OBJECT_TYPE_DAA_ARA_KEY                           = 0x0b
-	TSS_KEY_NO_AUTHORIZATION                              = 0x00000000
-	TSS_KEY_AUTHORIZATION                                 = 0x00000001
-	TSS_KEY_AUTHORIZATION_PRIV_USE_ONLY                   = 0x00000002
-	TSS_KEY_NON_VOLATILE                                  = 0x00000000
-	TSS_KEY_VOLATILE                                      = 0x00000004
-	TSS_KEY_NOT_MIGRATABLE                                = 0x00000000
-	TSS_KEY_MIGRATABLE                                    = 0x00000008
-	TSS_KEY_TYPE_DEFAULT                                  = 0x00000000
-	TSS_KEY_TYPE_SIGNING                                  = 0x00000010
-	TSS_KEY_TYPE_STORAGE                                  = 0x00000020
-	TSS_KEY_TYPE_IDENTITY                                 = 0x00000030
-	TSS_KEY_TYPE_AUTHCHANGE                               = 0x00000040
-	TSS_KEY_TYPE_BIND                                     = 0x00000050
-	TSS_KEY_TYPE_LEGACY                                   = 0x00000060
-	TSS_KEY_TYPE_MIGRATE                                  = 0x00000070
-	TSS_KEY_TYPE_BITMASK                                  = 0x000000F0
-	TSS_KEY_SIZE_DEFAULT                                  = 0x00000000
-	TSS_KEY_SIZE_512                                      = 0x00000100
-	TSS_KEY_SIZE_1024                                     = 0x00000200
-	TSS_KEY_SIZE_2048                                     = 0x00000300
-	TSS_KEY_SIZE_4096                                     = 0x00000400
-	TSS_KEY_SIZE_8192                                     = 0x00000500
-	TSS_KEY_SIZE_16384                                    = 0x00000600
-	TSS_KEY_SIZE_BITMASK                                  = 0x00000F00
-	TSS_KEY_NOT_CERTIFIED_MIGRATABLE                      = 0x00000000
-	TSS_KEY_CERTIFIED_MIGRATABLE                          = 0x00001000
-	TSS_KEY_STRUCT_DEFAULT                                = 0x00000000
-	TSS_KEY_STRUCT_KEY                                    = 0x00004000
-	TSS_KEY_STRUCT_KEY12                                  = 0x00008000
-	TSS_KEY_STRUCT_BITMASK                                = 0x0001C000
-	TSS_KEY_EMPTY_KEY                                     = 0x00000000
-	TSS_KEY_TSP_SRK                                       = 0x04000000
-	TSS_KEY_TEMPLATE_BITMASK                              = 0xFC000000
-	TSS_ENCDATA_SEAL                                      = 0x00000001
-	TSS_ENCDATA_BIND                                      = 0x00000002
-	TSS_ENCDATA_LEGACY                                    = 0x00000003
-	TSS_HASH_DEFAULT                                      = 0x00000000
-	TSS_HASH_SHA1                                         = 0x00000001
-	TSS_HASH_OTHER                                        = 0xFFFFFFFF
-	TSS_POLICY_USAGE                                      = 0x00000001
-	TSS_POLICY_MIGRATION                                  = 0x00000002
-	TSS_POLICY_OPERATOR                                   = 0x00000003
-	TSS_PCRS_STRUCT_DEFAULT                               = 0x00000000
-	TSS_PCRS_STRUCT_INFO                                  = 0x00000001
-	TSS_PCRS_STRUCT_INFO_LONG                             = 0x00000002
-	TSS_PCRS_STRUCT_INFO_SHORT                            = 0x00000003
-	TSS_TSPATTRIB_CONTEXT_SILENT_MODE                     = 0x00000001
-	TSS_TSPATTRIB_CONTEXT_MACHINE_NAME                    = 0x00000002
-	TSS_TSPATTRIB_CONTEXT_VERSION_MODE                    = 0x00000003
-	TSS_TSPATTRIB_CONTEXT_TRANSPORT                       = 0x00000004
-	TSS_TSPATTRIB_CONTEXT_CONNECTION_VERSION              = 0x00000005
-	TSS_TSPATTRIB_SECRET_HASH_MODE                        = 0x00000006
-	TSS_TSPATTRIB_CONTEXTTRANS_CONTROL                    = 0x00000008
-	TSS_TSPATTRIB_CONTEXTTRANS_MODE                       = 0x00000010
-	TSS_TSPATTRIB_CONTEXT_NOT_SILENT                      = 0x00000000
-	TSS_TSPATTRIB_CONTEXT_SILENT                          = 0x00000001
-	TSS_TSPATTRIB_CONTEXT_VERSION_AUTO                    = 0x00000001
-	TSS_TSPATTRIB_CONTEXT_VERSION_V1_1                    = 0x00000002
-	TSS_TSPATTRIB_CONTEXT_VERSION_V1_2                    = 0x00000003
-	TSS_TSPATTRIB_DISABLE_TRANSPORT                       = 0x00000016
-	TSS_TSPATTRIB_ENABLE_TRANSPORT                        = 0x00000032
-	TSS_TSPATTRIB_TRANSPORT_NO_DEFAULT_ENCRYPTION         = 0x00000000
-	TSS_TSPATTRIB_TRANSPORT_DEFAULT_ENCRYPTION            = 0x00000001
-	TSS_TSPATTRIB_TRANSPORT_AUTHENTIC_CHANNEL             = 0x00000002
-	TSS_TSPATTRIB_TRANSPORT_EXCLUSIVE                     = 0x00000004
-	TSS_TSPATTRIB_TRANSPORT_STATIC_AUTH                   = 0x00000008
-	TSS_CONNECTION_VERSION_1_1                            = 0x00000001
-	TSS_CONNECTION_VERSION_1_2                            = 0x00000002
-	TSS_TSPATTRIB_SECRET_HASH_MODE_POPUP                  = 0x00000001
-	TSS_TSPATTRIB_HASH_MODE_NOT_NULL                      = 0x00000000
-	TSS_TSPATTRIB_HASH_MODE_NULL                          = 0x00000001
-	TSS_TSPATTRIB_TPM_CALLBACK_COLLATEIDENTITY            = 0x00000001
-	TSS_TSPATTRIB_TPM_CALLBACK_ACTIVATEIDENTITY           = 0x00000002
-	TSS_TSPATTRIB_TPM_ORDINAL_AUDIT_STATUS                = 0x00000003
-	TSS_TSPATTRIB_TPM_CREDENTIAL                          = 0x00001000
-	TPM_CAP_PROP_TPM_CLEAR_ORDINAL_AUDIT                  = 0x00000000
-	TPM_CAP_PROP_TPM_SET_ORDINAL_AUDIT                    = 0x00000001
-	TSS_TPMATTRIB_EKCERT                                  = 0x00000001
-	TSS_TPMATTRIB_TPM_CC                                  = 0x00000002
-	TSS_TPMATTRIB_PLATFORMCERT                            = 0x00000003
-	TSS_TPMATTRIB_PLATFORM_CC                             = 0x00000004
-	TSS_TSPATTRIB_POLICY_CALLBACK_HMAC                    = 0x00000080
-	TSS_TSPATTRIB_POLICY_CALLBACK_XOR_ENC                 = 0x00000100
-	TSS_TSPATTRIB_POLICY_CALLBACK_TAKEOWNERSHIP           = 0x00000180
-	TSS_TSPATTRIB_POLICY_CALLBACK_CHANGEAUTHASYM          = 0x00000200
-	TSS_TSPATTRIB_POLICY_SECRET_LIFETIME                  = 0x00000280
-	TSS_TSPATTRIB_POLICY_POPUPSTRING                      = 0x00000300
-	TSS_TSPATTRIB_POLICY_CALLBACK_SEALX_MASK              = 0x00000380
-	TSS_TSPATTRIB_POLICY_DELEGATION_INFO                  = 0x00000001
-	TSS_TSPATTRIB_POLICY_DELEGATION_PCR                   = 0x00000002
-	TSS_SECRET_LIFETIME_ALWAYS                            = 0x00000001
-	TSS_SECRET_LIFETIME_COUNTER                           = 0x00000002
-	TSS_SECRET_LIFETIME_TIMER                             = 0x00000003
-	TSS_TSPATTRIB_POLSECRET_LIFETIME_ALWAYS               = TSS_SECRET_LIFETIME_ALWAYS
-	TSS_TSPATTRIB_POLSECRET_LIFETIME_COUNTER              = TSS_SECRET_LIFETIME_COUNTER
-	TSS_TSPATTRIB_POLSECRET_LIFETIME_TIMER                = TSS_SECRET_LIFETIME_TIMER
-	TSS_TSPATTRIB_POLICYSECRET_LIFETIME_ALWAYS            = TSS_SECRET_LIFETIME_ALWAYS
-	TSS_TSPATTRIB_POLICYSECRET_LIFETIME_COUNTER           = TSS_SECRET_LIFETIME_COUNTER
-	TSS_TSPATTRIB_POLICYSECRET_LIFETIME_TIMER             = TSS_SECRET_LIFETIME_TIMER
-	TSS_TSPATTRIB_POLDEL_TYPE                             = 0x00000001
-	TSS_TSPATTRIB_POLDEL_INDEX                            = 0x00000002
-	TSS_TSPATTRIB_POLDEL_PER1                             = 0x00000003
-	TSS_TSPATTRIB_POLDEL_PER2                             = 0x00000004
-	TSS_TSPATTRIB_POLDEL_LABEL                            = 0x00000005
-	TSS_TSPATTRIB_POLDEL_FAMILYID                         = 0x00000006
-	TSS_TSPATTRIB_POLDEL_VERCOUNT                         = 0x00000007
-	TSS_TSPATTRIB_POLDEL_OWNERBLOB                        = 0x00000008
-	TSS_TSPATTRIB_POLDEL_KEYBLOB                          = 0x00000009
-	TSS_TSPATTRIB_POLDELPCR_LOCALITY                      = 0x00000001
-	TSS_TSPATTRIB_POLDELPCR_DIGESTATRELEASE               = 0x00000002
-	TSS_TSPATTRIB_POLDELPCR_SELECTION                     = 0x00000003
-	TSS_DELEGATIONTYPE_NONE                               = 0x00000001
-	TSS_DELEGATIONTYPE_OWNER                              = 0x00000002
-	TSS_DELEGATIONTYPE_KEY                                = 0x00000003
-	TSS_SECRET_MODE_NONE                                  = 0x00000800
-	TSS_SECRET_MODE_SHA1                                  = 0x00001000
-	TSS_SECRET_MODE_PLAIN                                 = 0x00001800
-	TSS_SECRET_MODE_POPUP                                 = 0x00002000
-	TSS_SECRET_MODE_CALLBACK                              = 0x00002800
-	TSS_TSPATTRIB_ENCDATA_BLOB                            = 0x00000008
-	TSS_TSPATTRIB_ENCDATA_PCR                             = 0x00000010
-	TSS_TSPATTRIB_ENCDATA_PCR_LONG                        = 0x00000018
-	TSS_TSPATTRIB_ENCDATA_SEAL                            = 0x00000020
-	TSS_TSPATTRIB_ENCDATABLOB_BLOB                        = 0x00000001
-	TSS_TSPATTRIB_ENCDATAPCR_DIGEST_ATCREATION            = 0x00000002
-	TSS_TSPATTRIB_ENCDATAPCR_DIGEST_ATRELEASE             = 0x00000003
-	TSS_TSPATTRIB_ENCDATAPCR_SELECTION                    = 0x00000004
-	TSS_TSPATTRIB_ENCDATAPCR_DIGEST_RELEASE               = TSS_TSPATTRIB_ENCDATAPCR_DIGEST_ATRELEASE
-	TSS_TSPATTRIB_ENCDATAPCRLONG_LOCALITY_ATCREATION      = 0x00000005
-	TSS_TSPATTRIB_ENCDATAPCRLONG_LOCALITY_ATRELEASE       = 0x00000006
-	TSS_TSPATTRIB_ENCDATAPCRLONG_CREATION_SELECTION       = 0x00000007
-	TSS_TSPATTRIB_ENCDATAPCRLONG_RELEASE_SELECTION        = 0x00000008
-	TSS_TSPATTRIB_ENCDATAPCRLONG_DIGEST_ATCREATION        = 0x00000009
-	TSS_TSPATTRIB_ENCDATAPCRLONG_DIGEST_ATRELEASE         = 0x0000000A
-	TSS_TSPATTRIB_ENCDATASEAL_PROTECT_MODE                = 0x00000001
-	TSS_TSPATTRIB_ENCDATASEAL_NOPROTECT                   = 0x00000000
-	TSS_TSPATTRIB_ENCDATASEAL_PROTECT                     = 0x00000001
-	TSS_TSPATTRIB_ENCDATASEAL_NO_PROTECT                  = TSS_TSPATTRIB_ENCDATASEAL_NOPROTECT
-	TSS_TSPATTRIB_NV_INDEX                                = 0x00000001
-	TSS_TSPATTRIB_NV_PERMISSIONS                          = 0x00000002
-	TSS_TSPATTRIB_NV_STATE                                = 0x00000003
-	TSS_TSPATTRIB_NV_DATASIZE                             = 0x00000004
-	TSS_TSPATTRIB_NV_PCR                                  = 0x00000005
-	TSS_TSPATTRIB_NVSTATE_READSTCLEAR                     = 0x00100000
-	TSS_TSPATTRIB_NVSTATE_WRITESTCLEAR                    = 0x00200000
-	TSS_TSPATTRIB_NVSTATE_WRITEDEFINE                     = 0x00300000
-	TSS_TSPATTRIB_NVPCR_READPCRSELECTION                  = 0x01000000
-	TSS_TSPATTRIB_NVPCR_READDIGESTATRELEASE               = 0x02000000
-	TSS_TSPATTRIB_NVPCR_READLOCALITYATRELEASE             = 0x03000000
-	TSS_TSPATTRIB_NVPCR_WRITEPCRSELECTION                 = 0x04000000
-	TSS_TSPATTRIB_NVPCR_WRITEDIGESTATRELEASE              = 0x05000000
-	TSS_TSPATTRIB_NVPCR_WRITELOCALITYATRELEASE            = 0x06000000
-	TSS_NV_TPM                                            = 0x80000000
-	TSS_NV_PLATFORM                                       = 0x40000000
-	TSS_NV_USER                                           = 0x20000000
-	TSS_NV_DEFINED                                        = 0x10000000
-	TSS_NV_MASK_TPM                                       = 0x80000000
-	TSS_NV_MASK_PLATFORM                                  = 0x40000000
-	TSS_NV_MASK_USER                                      = 0x20000000
-	TSS_NV_MASK_DEFINED                                   = 0x10000000
-	TSS_NV_MASK_RESERVED                                  = 0x0f000000
-	TSS_NV_MASK_PURVIEW                                   = 0x00ff0000
-	TSS_NV_MASK_INDEX                                     = 0x0000ffff
-	TSS_NV_INDEX_SESSIONS                                 = 0x00011101
-	TSS_MIGATTRIB_MIGRATIONBLOB                           = 0x00000010
-	TSS_MIGATTRIB_MIGRATIONTICKET                         = 0x00000020
-	TSS_MIGATTRIB_AUTHORITY_DATA                          = 0x00000030
-	TSS_MIGATTRIB_MIG_AUTH_DATA                           = 0x00000040
-	TSS_MIGATTRIB_TICKET_DATA                             = 0x00000050
-	TSS_MIGATTRIB_PAYLOAD_TYPE                            = 0x00000060
-	TSS_MIGATTRIB_MIGRATION_XOR_BLOB                      = 0x00000101
-	TSS_MIGATTRIB_MIGRATION_REWRAPPED_BLOB                = 0x00000102
-	TSS_MIGATTRIB_MIG_MSALIST_PUBKEY_BLOB                 = 0x00000103
-	TSS_MIGATTRIB_MIG_AUTHORITY_PUBKEY_BLOB               = 0x00000104
-	TSS_MIGATTRIB_MIG_DESTINATION_PUBKEY_BLOB             = 0x00000105
-	TSS_MIGATTRIB_MIG_SOURCE_PUBKEY_BLOB                  = 0x00000106
-	TSS_MIGATTRIB_MIG_REWRAPPED_BLOB                      = TSS_MIGATTRIB_MIGRATION_REWRAPPED_BLOB
-	TSS_MIGATTRIB_MIG_XOR_BLOB                            = TSS_MIGATTRIB_MIGRATION_XOR_BLOB
-	TSS_MIGATTRIB_AUTHORITY_DIGEST                        = 0x00000301
-	TSS_MIGATTRIB_AUTHORITY_APPROVAL_HMAC                 = 0x00000302
-	TSS_MIGATTRIB_AUTHORITY_MSALIST                       = 0x00000303
-	TSS_MIGATTRIB_MIG_AUTH_AUTHORITY_DIGEST               = 0x00000401
-	TSS_MIGATTRIB_MIG_AUTH_DESTINATION_DIGEST             = 0x00000402
-	TSS_MIGATTRIB_MIG_AUTH_SOURCE_DIGEST                  = 0x00000403
-	TSS_MIGATTRIB_TICKET_SIG_DIGEST                       = 0x00000501
-	TSS_MIGATTRIB_TICKET_SIG_VALUE                        = 0x00000502
-	TSS_MIGATTRIB_TICKET_SIG_TICKET                       = 0x00000503
-	TSS_MIGATTRIB_TICKET_RESTRICT_TICKET                  = 0x00000504
-	TSS_MIGATTRIB_PT_MIGRATE_RESTRICTED                   = 0x00000601
-	TSS_MIGATTRIB_PT_MIGRATE_EXTERNAL                     = 0x00000602
-	TSS_TSPATTRIB_HASH_IDENTIFIER                         = 0x00001000
-	TSS_TSPATTRIB_ALG_IDENTIFIER                          = 0x00002000
-	TSS_TSPATTRIB_PCRS_INFO                               = 0x00000001
-	TSS_TSPATTRIB_PCRSINFO_PCRSTRUCT                      = 0x00000001
-	TSS_TSPATTRIB_DELFAMILY_STATE                         = 0x00000001
-	TSS_TSPATTRIB_DELFAMILY_INFO                          = 0x00000002
-	TSS_TSPATTRIB_DELFAMILYSTATE_LOCKED                   = 0x00000001
-	TSS_TSPATTRIB_DELFAMILYSTATE_ENABLED                  = 0x00000002
-	TSS_TSPATTRIB_DELFAMILYINFO_LABEL                     = 0x00000003
-	TSS_TSPATTRIB_DELFAMILYINFO_VERCOUNT                  = 0x00000004
-	TSS_TSPATTRIB_DELFAMILYINFO_FAMILYID                  = 0x00000005
-	TSS_DELEGATE_INCREMENTVERIFICATIONCOUNT               = 1
-	TSS_DELEGATE_CACHEOWNERDELEGATION_OVERWRITEEXISTING   = 1
-	TSS_TSPATTRIB_DAACRED_COMMIT                          = 0x00000001
-	TSS_TSPATTRIB_DAACRED_ATTRIB_GAMMAS                   = 0x00000002
-	TSS_TSPATTRIB_DAACRED_CREDENTIAL_BLOB                 = 0x00000003
-	TSS_TSPATTRIB_DAACRED_CALLBACK_SIGN                   = 0x00000004
-	TSS_TSPATTRIB_DAACRED_CALLBACK_VERIFYSIGNATURE        = 0x00000005
-	TSS_TSPATTRIB_DAACOMMIT_NUMBER                        = 0x00000001
-	TSS_TSPATTRIB_DAACOMMIT_SELECTION                     = 0x00000002
-	TSS_TSPATTRIB_DAACOMMIT_COMMITMENTS                   = 0x00000003
-	TSS_TSPATTRIB_DAAATTRIBGAMMAS_BLOB                    = 0xffffffff
-	TSS_TSPATTRIB_DAAISSUERKEY_BLOB                       = 0x00000001
-	TSS_TSPATTRIB_DAAISSUERKEY_PUBKEY                     = 0x00000002
-	TSS_TSPATTRIB_DAAISSUERKEYBLOB_PUBLIC_KEY             = 0x00000001
-	TSS_TSPATTRIB_DAAISSUERKEYBLOB_SECRET_KEY             = 0x00000002
-	TSS_TSPATTRIB_DAAISSUERKEYBLOB_KEYBLOB                = 0x00000003
-	TSS_TSPATTRIB_DAAISSUERKEYBLOB_PROOF                  = 0x00000004
-	TSS_TSPATTRIB_DAAISSUERKEYPUBKEY_NUM_ATTRIBS          = 0x00000001
-	TSS_TSPATTRIB_DAAISSUERKEYPUBKEY_NUM_PLATFORM_ATTRIBS = 0x00000002
-	TSS_TSPATTRIB_DAAISSUERKEYPUBKEY_NUM_ISSUER_ATTRIBS   = 0x00000003
-	TSS_TSPATTRIB_DAAARAKEY_BLOB                          = 0x00000001
-	TSS_TSPATTRIB_DAAARAKEYBLOB_PUBLIC_KEY                = 0x00000001
-	TSS_TSPATTRIB_DAAARAKEYBLOB_SECRET_KEY                = 0x00000002
-	TSS_TSPATTRIB_DAAARAKEYBLOB_KEYBLOB                   = 0x00000003
-	TSS_FLAG_DAA_PSEUDONYM_PLAIN                          = 0x00000000
-	TSS_FLAG_DAA_PSEUDONYM_ENCRYPTED                      = 0x00000001
-	TSS_TSPATTRIB_KEY_BLOB                                = 0x00000040
-	TSS_TSPATTRIB_KEY_INFO                                = 0x00000080
-	TSS_TSPATTRIB_KEY_UUID                                = 0x000000C0
-	TSS_TSPATTRIB_KEY_PCR                                 = 0x00000100
-	TSS_TSPATTRIB_RSAKEY_INFO                             = 0x00000140
-	TSS_TSPATTRIB_KEY_REGISTER                            = 0x00000180
-	TSS_TSPATTRIB_KEY_PCR_LONG                            = 0x000001c0
-	TSS_TSPATTRIB_KEY_CONTROLBIT                          = 0x00000200
-	TSS_TSPATTRIB_KEY_CMKINFO                             = 0x00000400
-	TSS_TSPATTRIB_KEYBLOB_BLOB                            = 0x00000008
-	TSS_TSPATTRIB_KEYBLOB_PUBLIC_KEY                      = 0x00000010
-	TSS_TSPATTRIB_KEYBLOB_PRIVATE_KEY                     = 0x00000028
-	TSS_TSPATTRIB_KEYINFO_SIZE                            = 0x00000080
-	TSS_TSPATTRIB_KEYINFO_USAGE                           = 0x00000100
-	TSS_TSPATTRIB_KEYINFO_KEYFLAGS                        = 0x00000180
-	TSS_TSPATTRIB_KEYINFO_AUTHUSAGE                       = 0x00000200
-	TSS_TSPATTRIB_KEYINFO_ALGORITHM                       = 0x00000280
-	TSS_TSPATTRIB_KEYINFO_SIGSCHEME                       = 0x00000300
-	TSS_TSPATTRIB_KEYINFO_ENCSCHEME                       = 0x00000380
-	TSS_TSPATTRIB_KEYINFO_MIGRATABLE                      = 0x00000400
-	TSS_TSPATTRIB_KEYINFO_REDIRECTED                      = 0x00000480
-	TSS_TSPATTRIB_KEYINFO_VOLATILE                        = 0x00000500
-	TSS_TSPATTRIB_KEYINFO_AUTHDATAUSAGE                   = 0x00000580
-	TSS_TSPATTRIB_KEYINFO_VERSION                         = 0x00000600
-	TSS_TSPATTRIB_KEYINFO_CMK                             = 0x00000680
-	TSS_TSPATTRIB_KEYINFO_KEYSTRUCT                       = 0x00000700
-	TSS_TSPATTRIB_KEYCONTROL_OWNEREVICT                   = 0x00000780
-	TSS_TSPATTRIB_KEYINFO_RSA_EXPONENT                    = 0x00001000
-	TSS_TSPATTRIB_KEYINFO_RSA_MODULUS                     = 0x00002000
-	TSS_TSPATTRIB_KEYINFO_RSA_KEYSIZE                     = 0x00003000
-	TSS_TSPATTRIB_KEYINFO_RSA_PRIMES                      = 0x00004000
-	TSS_TSPATTRIB_KEYPCR_DIGEST_ATCREATION                = 0x00008000
-	TSS_TSPATTRIB_KEYPCR_DIGEST_ATRELEASE                 = 0x00010000
-	TSS_TSPATTRIB_KEYPCR_SELECTION                        = 0x00018000
-	TSS_TSPATTRIB_KEYREGISTER_USER                        = 0x02000000
-	TSS_TSPATTRIB_KEYREGISTER_SYSTEM                      = 0x04000000
-	TSS_TSPATTRIB_KEYREGISTER_NO                          = 0x06000000
-	TSS_TSPATTRIB_KEYPCRLONG_LOCALITY_ATCREATION          = 0x00040000
-	TSS_TSPATTRIB_KEYPCRLONG_LOCALITY_ATRELEASE           = 0x00080000
-	TSS_TSPATTRIB_KEYPCRLONG_CREATION_SELECTION           = 0x000C0000
-	TSS_TSPATTRIB_KEYPCRLONG_RELEASE_SELECTION            = 0x00100000
-	TSS_TSPATTRIB_KEYPCRLONG_DIGEST_ATCREATION            = 0x00140000
-	TSS_TSPATTRIB_KEYPCRLONG_DIGEST_ATRELEASE             = 0x00180000
-	TSS_TSPATTRIB_KEYINFO_CMK_MA_APPROVAL                 = 0x00000010
-	TSS_TSPATTRIB_KEYINFO_CMK_MA_DIGEST                   = 0x00000020
-	TSS_KEY_SIZEVAL_512BIT                                = 0x0200
-	TSS_KEY_SIZEVAL_1024BIT                               = 0x0400
-	TSS_KEY_SIZEVAL_2048BIT                               = 0x0800
-	TSS_KEY_SIZEVAL_4096BIT                               = 0x1000
-	TSS_KEY_SIZEVAL_8192BIT                               = 0x2000
-	TSS_KEY_SIZEVAL_16384BIT                              = 0x4000
-	TSS_KEYUSAGE_BIND                                     = 0x00
-	TSS_KEYUSAGE_IDENTITY                                 = 0x01
-	TSS_KEYUSAGE_LEGACY                                   = 0x02
-	TSS_KEYUSAGE_SIGN                                     = 0x03
-	TSS_KEYUSAGE_STORAGE                                  = 0x04
-	TSS_KEYUSAGE_AUTHCHANGE                               = 0x05
-	TSS_KEYUSAGE_MIGRATE                                  = 0x06
-	TSS_KEYFLAG_REDIRECTION                               = 0x00000001
-	TSS_KEYFLAG_MIGRATABLE                                = 0x00000002
-	TSS_KEYFLAG_VOLATILEKEY                               = 0x00000004
-	TSS_KEYFLAG_CERTIFIED_MIGRATABLE                      = 0x00000008
-	TSS_ALG_RSA                                           = 0x20
-	TSS_ALG_DES                                           = 0x21
-	TSS_ALG_3DES                                          = 0x22
-	TSS_ALG_SHA                                           = 0x23
-	TSS_ALG_HMAC                                          = 0x24
-	TSS_ALG_AES128                                        = 0x25
-	TSS_ALG_AES192                                        = 0x26
-	TSS_ALG_AES256                                        = 0x27
-	TSS_ALG_XOR                                           = 0x28
-	TSS_ALG_MGF1                                          = 0x29
-	TSS_ALG_AES                                           = TSS_ALG_AES128
-	TSS_ALG_DEFAULT                                       = 0xfe
-	TSS_ALG_DEFAULT_SIZE                                  = 0xff
-	TSS_SS_NONE                                           = 0x10
-	TSS_SS_RSASSAPKCS1V15_SHA1                            = 0x11
-	TSS_SS_RSASSAPKCS1V15_DER                             = 0x12
-	TSS_SS_RSASSAPKCS1V15_INFO                            = 0x13
-	TSS_ES_NONE                                           = 0x10
-	TSS_ES_RSAESPKCSV15                                   = 0x11
-	TSS_ES_RSAESOAEP_SHA1_MGF1                            = 0x12
-	TSS_ES_SYM_CNT                                        = 0x13
-	TSS_ES_SYM_OFB                                        = 0x14
-	TSS_ES_SYM_CBC_PKCS5PAD                               = 0x15
-	TSS_PS_TYPE_USER                                      = 1
-	TSS_PS_TYPE_SYSTEM                                    = 2
-	TSS_MS_MIGRATE                                        = 0x20
-	TSS_MS_REWRAP                                         = 0x21
-	TSS_MS_MAINT                                          = 0x22
-	TSS_MS_RESTRICT_MIGRATE                               = 0x23
-	TSS_MS_RESTRICT_APPROVE_DOUBLE                        = 0x24
-	TSS_MS_RESTRICT_MIGRATE_EXTERNAL                      = 0x25
-	TSS_KEYAUTH_AUTH_NEVER                                = 0x10
-	TSS_KEYAUTH_AUTH_ALWAYS                               = 0x11
-	TSS_KEYAUTH_AUTH_PRIV_USE_ONLY                        = 0x12
-	TSS_TPMSTATUS_DISABLEOWNERCLEAR                       = 0x00000001
-	TSS_TPMSTATUS_DISABLEFORCECLEAR                       = 0x00000002
-	TSS_TPMSTATUS_DISABLED                                = 0x00000003
-	TSS_TPMSTATUS_DEACTIVATED                             = 0x00000004
-	TSS_TPMSTATUS_OWNERSETDISABLE                         = 0x00000005
-	TSS_TPMSTATUS_SETOWNERINSTALL                         = 0x00000006
-	TSS_TPMSTATUS_DISABLEPUBEKREAD                        = 0x00000007
-	TSS_TPMSTATUS_ALLOWMAINTENANCE                        = 0x00000008
-	TSS_TPMSTATUS_PHYSPRES_LIFETIMELOCK                   = 0x00000009
-	TSS_TPMSTATUS_PHYSPRES_HWENABLE                       = 0x0000000A
-	TSS_TPMSTATUS_PHYSPRES_CMDENABLE                      = 0x0000000B
-	TSS_TPMSTATUS_PHYSPRES_LOCK                           = 0x0000000C
-	TSS_TPMSTATUS_PHYSPRESENCE                            = 0x0000000D
-	TSS_TPMSTATUS_PHYSICALDISABLE                         = 0x0000000E
-	TSS_TPMSTATUS_CEKP_USED                               = 0x0000000F
-	TSS_TPMSTATUS_PHYSICALSETDEACTIVATED                  = 0x00000010
-	TSS_TPMSTATUS_SETTEMPDEACTIVATED                      = 0x00000011
-	TSS_TPMSTATUS_POSTINITIALISE                          = 0x00000012
-	TSS_TPMSTATUS_TPMPOST                                 = 0x00000013
-	TSS_TPMSTATUS_TPMPOSTLOCK                             = 0x00000014
-	TSS_TPMSTATUS_DISABLEPUBSRKREAD                       = 0x00000016
-	TSS_TPMSTATUS_MAINTENANCEUSED                         = 0x00000017
-	TSS_TPMSTATUS_OPERATORINSTALLED                       = 0x00000018
-	TSS_TPMSTATUS_OPERATOR_INSTALLED                      = TSS_TPMSTATUS_OPERATORINSTALLED
-	TSS_TPMSTATUS_FIPS                                    = 0x00000019
-	TSS_TPMSTATUS_ENABLEREVOKEEK                          = 0x0000001A
-	TSS_TPMSTATUS_ENABLE_REVOKEEK                         = TSS_TPMSTATUS_ENABLEREVOKEEK
-	TSS_TPMSTATUS_NV_LOCK                                 = 0x0000001B
-	TSS_TPMSTATUS_TPM_ESTABLISHED                         = 0x0000001C
-	TSS_TPMSTATUS_RESETLOCK                               = 0x0000001D
-	TSS_TPMSTATUS_DISABLE_FULL_DA_LOGIC_INFO              = 0x0000001D
-	TSS_TPMCAP_ORD                                        = 0x10
-	TSS_TPMCAP_ALG                                        = 0x11
-	TSS_TPMCAP_FLAG                                       = 0x12
-	TSS_TPMCAP_PROPERTY                                   = 0x13
-	TSS_TPMCAP_VERSION                                    = 0x14
-	TSS_TPMCAP_VERSION_VAL                                = 0x15
-	TSS_TPMCAP_NV_LIST                                    = 0x16
-	TSS_TPMCAP_NV_INDEX                                   = 0x17
-	TSS_TPMCAP_MFR                                        = 0x18
-	TSS_TPMCAP_SYM_MODE                                   = 0x19
-	TSS_TPMCAP_HANDLE                                     = 0x1a
-	TSS_TPMCAP_TRANS_ES                                   = 0x1b
-	TSS_TPMCAP_AUTH_ENCRYPT                               = 0x1c
-	TSS_TPMCAP_SET_PERM_FLAGS                             = 0x1d
-	TSS_TPMCAP_SET_VENDOR                                 = 0x1e
-	TSS_TPMCAP_DA_LOGIC                                   = 0x1f
-	TSS_TPMCAP_PROP_PCR                                   = 0x10
-	TSS_TPMCAP_PROP_DIR                                   = 0x11
-	TSS_TPMCAP_PROP_MANUFACTURER                          = 0x12
-	TSS_TPMCAP_PROP_SLOTS                                 = 0x13
-	TSS_TPMCAP_PROP_KEYS                                  = TSS_TPMCAP_PROP_SLOTS
-	TSS_TPMCAP_PROP_FAMILYROWS                            = 0x14
-	TSS_TPMCAP_PROP_DELEGATEROWS                          = 0x15
-	TSS_TPMCAP_PROP_OWNER                                 = 0x16
-	TSS_TPMCAP_PROP_MAXKEYS                               = 0x18
-	TSS_TPMCAP_PROP_AUTHSESSIONS                          = 0x19
-	TSS_TPMCAP_PROP_MAXAUTHSESSIONS                       = 0x1a
-	TSS_TPMCAP_PROP_TRANSESSIONS                          = 0x1b
-	TSS_TPMCAP_PROP_MAXTRANSESSIONS                       = 0x1c
-	TSS_TPMCAP_PROP_SESSIONS                              = 0x1d
-	TSS_TPMCAP_PROP_MAXSESSIONS                           = 0x1e
-	TSS_TPMCAP_PROP_CONTEXTS                              = 0x1f
-	TSS_TPMCAP_PROP_MAXCONTEXTS                           = 0x20
-	TSS_TPMCAP_PROP_DAASESSIONS                           = 0x21
-	TSS_TPMCAP_PROP_MAXDAASESSIONS                        = 0x22
-	TSS_TPMCAP_PROP_DAA_INTERRUPT                         = 0x23
-	TSS_TPMCAP_PROP_COUNTERS                              = 0x24
-	TSS_TPMCAP_PROP_MAXCOUNTERS                           = 0x25
-	TSS_TPMCAP_PROP_ACTIVECOUNTER                         = 0x26
-	TSS_TPMCAP_PROP_MIN_COUNTER                           = 0x27
-	TSS_TPMCAP_PROP_TISTIMEOUTS                           = 0x28
-	TSS_TPMCAP_PROP_STARTUPEFFECTS                        = 0x29
-	TSS_TPMCAP_PROP_MAXCONTEXTCOUNTDIST                   = 0x2a
-	TSS_TPMCAP_PROP_CMKRESTRICTION                        = 0x2b
-	TSS_TPMCAP_PROP_DURATION                              = 0x2c
-	TSS_TPMCAP_PROP_MAXNVAVAILABLE                        = 0x2d
-	TSS_TPMCAP_PROP_INPUTBUFFERSIZE                       = 0x2e
-	TSS_TPMCAP_PROP_REVISION                              = 0x2f
-	TSS_TPMCAP_PROP_LOCALITIES_AVAIL                      = 0x32
-	TSS_RT_KEY                                            = 0x00000010
-	TSS_RT_AUTH                                           = 0x00000020
-	TSS_RT_TRANS                                          = 0x00000030
-	TSS_RT_COUNTER                                        = 0x00000040
-	TSS_TCSCAP_ALG                                        = 0x00000001
-	TSS_TCSCAP_VERSION                                    = 0x00000002
-	TSS_TCSCAP_CACHING                                    = 0x00000003
-	TSS_TCSCAP_PERSSTORAGE                                = 0x00000004
-	TSS_TCSCAP_MANUFACTURER                               = 0x00000005
-	TSS_TCSCAP_PLATFORM_CLASS                             = 0x00000006
-	TSS_TCSCAP_TRANSPORT                                  = 0x00000007
-	TSS_TCSCAP_PLATFORM_INFO                              = 0x00000008
-	TSS_TCSCAP_PROP_KEYCACHE                              = 0x00000100
-	TSS_TCSCAP_PROP_AUTHCACHE                             = 0x00000101
-	TSS_TCSCAP_PROP_MANUFACTURER_STR                      = 0x00000102
-	TSS_TCSCAP_PROP_MANUFACTURER_ID                       = 0x00000103
-	TSS_TCSCAP_PLATFORM_VERSION                           = 0x00001100
-	TSS_TCSCAP_PLATFORM_TYPE                              = 0x00001101
-	TSS_TCSCAP_TRANS_EXCLUSIVE                            = 0x00002100
-	TSS_TCSCAP_PROP_HOST_PLATFORM                         = 0x00003001
-	TSS_TCSCAP_PROP_ALL_PLATFORMS                         = 0x00003002
-	TSS_TSPCAP_ALG                                        = 0x00000010
-	TSS_TSPCAP_VERSION                                    = 0x00000011
-	TSS_TSPCAP_PERSSTORAGE                                = 0x00000012
-	TSS_TSPCAP_MANUFACTURER                               = 0x00000013
-	TSS_TSPCAP_RETURNVALUE_INFO                           = 0x00000015
-	TSS_TSPCAP_PLATFORM_INFO                              = 0x00000016
-	TSS_TSPCAP_PROP_MANUFACTURER_STR                      = 0x00000102
-	TSS_TSPCAP_PROP_MANUFACTURER_ID                       = 0x00000103
-	TSS_TSPCAP_PLATFORM_TYPE                              = 0x00000201
-	TSS_TSPCAP_PLATFORM_VERSION                           = 0x00000202
-	TSS_TSPCAP_PROP_RETURNVALUE_INFO                      = 0x00000201
-	TSS_EV_CODE_CERT                                      = 0x00000001
-	TSS_EV_CODE_NOCERT                                    = 0x00000002
-	TSS_EV_XML_CONFIG                                     = 0x00000003
-	TSS_EV_NO_ACTION                                      = 0x00000004
-	TSS_EV_SEPARATOR                                      = 0x00000005
-	TSS_EV_ACTION                                         = 0x00000006
-	TSS_EV_PLATFORM_SPECIFIC                              = 0x00000007
-	TSS_TSPCAP_RANDOMLIMIT                                = 0x00001000
-	TSS_PCRS_DIRECTION_CREATION                           = 1
-	TSS_PCRS_DIRECTION_RELEASE                            = 2
-	TSS_BLOB_STRUCT_VERSION                               = 0x01
-	TSS_BLOB_TYPE_KEY                                     = 0x01
-	TSS_BLOB_TYPE_PUBKEY                                  = 0x02
-	TSS_BLOB_TYPE_MIGKEY                                  = 0x03
-	TSS_BLOB_TYPE_SEALEDDATA                              = 0x04
-	TSS_BLOB_TYPE_BOUNDDATA                               = 0x05
-	TSS_BLOB_TYPE_MIGTICKET                               = 0x06
-	TSS_BLOB_TYPE_PRIVATEKEY                              = 0x07
-	TSS_BLOB_TYPE_PRIVATEKEY_MOD1                         = 0x08
-	TSS_BLOB_TYPE_RANDOM_XOR                              = 0x09
-	TSS_BLOB_TYPE_CERTIFY_INFO                            = 0x0A
-	TSS_BLOB_TYPE_KEY_1_2                                 = 0x0B
-	TSS_BLOB_TYPE_CERTIFY_INFO_2                          = 0x0C
-	TSS_BLOB_TYPE_CMK_MIG_KEY                             = 0x0D
-	TSS_BLOB_TYPE_CMK_BYTE_STREAM                         = 0x0E
-	TSS_CMK_DELEGATE_SIGNING                              = 1 << 31
-	TSS_CMK_DELEGATE_STORAGE                              = 1 << 30
-	TSS_CMK_DELEGATE_BIND                                 = 1 << 29
-	TSS_CMK_DELEGATE_LEGACY                               = 1 << 28
-	TSS_CMK_DELEGATE_MIGRATE                              = 1 << 27
-	TSS_DAA_LENGTH_N                                      = 256
-	TSS_DAA_LENGTH_F                                      = 13
-	TSS_DAA_LENGTH_E                                      = 46
-	TSS_DAA_LENGTH_E_PRIME                                = 15
-	TSS_DAA_LENGTH_V                                      = 317
-	TSS_DAA_LENGTH_SAFETY                                 = 10
-	TSS_DAA_LENGTH_HASH                                   = 20
-	TSS_DAA_LENGTH_S                                      = 128
-	TSS_DAA_LENGTH_GAMMA                                  = 204
-	TSS_DAA_LENGTH_RHO                                    = 26
-	TSS_DAA_LENGTH_MFG1_GAMMA                             = 214
-	TSS_DAA_LENGTH_MGF1_AR                                = 25
-	TPM_ALG_RSA                                           = 0x00000001
-	TPM_ALG_DES                                           = 0x00000002
-	TPM_ALG_3DES                                          = 0x00000003
-	TPM_ALG_SHA                                           = 0x00000004
-	TPM_ALG_HMAC                                          = 0x00000005
-	TPM_ALG_AES                                           = 0x00000006
-	TPM_ALG_AES128                                        = TPM_ALG_AES
-	TPM_ALG_MGF1                                          = 0x00000007
-	TPM_ALG_AES192                                        = 0x00000008
-	TPM_ALG_AES256                                        = 0x00000009
-	TPM_ALG_XOR                                           = 0x0000000A
-	TPM_SS_NONE                                           = 0x0001
-	TPM_SS_RSASSAPKCS1v15_SHA1                            = 0x0002
-	TPM_SS_RSASSAPKCS1v15_DER                             = 0x0003
-	TPM_SS_RSASSAPKCS1v15_INFO                            = 0x0004
-	TPM_ES_NONE                                           = 0x0001
-	TPM_ES_RSAESPKCSv15                                   = 0x0002
-	TPM_ES_RSAESOAEP_SHA1_MGF1                            = 0x0003
-	TPM_ES_SYM_CNT                                        = 0x0004
-	TPM_ES_SYM_CTR                                        = TPM_ES_SYM_CNT
-	TPM_ES_SYM_OFB                                        = 0x0005
-	TPM_ES_SYM_CBC_PKCS5PAD                               = 0x00FF
-)
-
-// Log represents an entry from the TSS event log. Pcr is the register that
-// was extended by the event. Eventtype is the type of the event. PcrValue
-// is the value that was hashed into the TPM. Event is the raw event data.
-type Log struct {
-	Pcr       int32
-	Eventtype int32
-	PcrValue  [20]byte
-	Event     []byte
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-tspi/verification/verification.go b/Godeps/_workspace/src/github.com/coreos/go-tspi/verification/verification.go
deleted file mode 100644
index 15e06e2103..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/go-tspi/verification/verification.go
+++ /dev/null
@@ -1,654 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package verification
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha1"
-	"crypto/x509"
-	"encoding/binary"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"math/big"
-
-	"github.com/coreos/go-tspi/tspiconst"
-)
-
-func pad(plaintext []byte, bsize int) ([]byte, error) {
-	if bsize >= 256 {
-		return nil, errors.New("bsize must be < 256")
-	}
-	pad := bsize - (len(plaintext) % bsize)
-	if pad == 0 {
-		pad = bsize
-	}
-	for i := 0; i < pad; i++ {
-		plaintext = append(plaintext, byte(pad))
-	}
-	return plaintext, nil
-}
-
-// GenerateChallenge takes a copy of the EK certificate, the public half of
-// the AIK to be challenged and a secret. It then symmetrically encrypts the
-// secret with a randomly generated AES key and Asymmetrically encrypts the
-// AES key with the public half of the EK. These can then be provided to the
-// TPM in order to ensure that the AIK is under the control of the TPM. It
-// returns the asymmetrically and symmetrically encrypted data, along with
-// any error.
-func GenerateChallenge(ekcert []byte, aikpub []byte, secret []byte) (asymenc []byte, symenc []byte, err error) {
-	aeskey := make([]byte, 16)
-	iv := make([]byte, 16)
-
-	_, err = rand.Read(aeskey)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	_, err = rand.Read(iv)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	/*
-	 * The EK certificate has an OID for rsaesOaep which will break
-	 * parsing. Replace it with rsaEncryption instead.
-	 */
-	ekcert = bytes.Replace(ekcert, []byte{0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x07}, []byte{0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01}, 1)
-	cert, err := x509.ParseCertificate(ekcert)
-	pubkey := cert.PublicKey.(*rsa.PublicKey)
-
-	asymplain := []byte{0x00, 0x00, 0x00, 0x06, 0x00, 0xff, 0x00, 0x10}
-	asymplain = append(asymplain, aeskey...)
-	hash := sha1.Sum(aikpub)
-	asymplain = append(asymplain, hash[:]...)
-
-	label := []byte{'T', 'C', 'P', 'A'}
-	asymenc, err = rsa.EncryptOAEP(sha1.New(), rand.Reader, pubkey, asymplain, label)
-	block, err := aes.NewCipher(aeskey)
-	if err != nil {
-		return nil, nil, err
-	}
-	cbc := cipher.NewCBCEncrypter(block, iv)
-	secret, err = pad(secret, len(iv))
-	if err != nil {
-		return nil, nil, err
-	}
-	symenc = make([]byte, len(secret))
-	cbc.CryptBlocks(symenc, secret)
-
-	symheader := new(bytes.Buffer)
-	err = binary.Write(symheader, binary.BigEndian, (uint32)(len(symenc)+len(iv)))
-	if err != nil {
-		return nil, nil, err
-	}
-	err = binary.Write(symheader, binary.BigEndian, (uint32)(tspiconst.TPM_ALG_AES))
-	if err != nil {
-		return nil, nil, err
-	}
-	err = binary.Write(symheader, binary.BigEndian, (uint16)(tspiconst.TPM_ES_SYM_CBC_PKCS5PAD))
-	if err != nil {
-		return nil, nil, err
-	}
-	err = binary.Write(symheader, binary.BigEndian, (uint16)(tspiconst.TPM_SS_NONE))
-	if err != nil {
-		return nil, nil, err
-	}
-	err = binary.Write(symheader, binary.BigEndian, (uint32)(12))
-	if err != nil {
-		return nil, nil, err
-	}
-	err = binary.Write(symheader, binary.BigEndian, (uint32)(128))
-	if err != nil {
-		return nil, nil, err
-	}
-	err = binary.Write(symheader, binary.BigEndian, (uint32)(len(iv)))
-	if err != nil {
-		return nil, nil, err
-	}
-	err = binary.Write(symheader, binary.BigEndian, (uint32)(0))
-	if err != nil {
-		return nil, nil, err
-	}
-	header := make([]byte, 28)
-	err = binary.Read(symheader, binary.BigEndian, &header)
-	header = append(header, iv...)
-	header = append(header, symenc...)
-	symenc = header
-
-	return asymenc, symenc, nil
-}
-
-// VerifyEKCert verifies that the provided EK certificate is signed by a
-// trusted manufacturer.
-func VerifyEKCert(ekcert []byte) error {
-	trustedCerts := map[string]string{
-		"STM1": `-----BEGIN CERTIFICATE-----
-MIIDzDCCArSgAwIBAgIEAAAAATANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJD
-SDEeMBwGA1UEChMVU1RNaWNyb2VsZWN0cm9uaWNzIE5WMRswGQYDVQQDExJTVE0g
-VFBNIEVLIFJvb3QgQ0EwHhcNMDkwNzI4MDAwMDAwWhcNMjkxMjMxMDAwMDAwWjBV
-MQswCQYDVQQGEwJDSDEeMBwGA1UEChMVU1RNaWNyb2VsZWN0cm9uaWNzIE5WMSYw
-JAYDVQQDEx1TVE0gVFBNIEVLIEludGVybWVkaWF0ZSBDQSAwMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJQYnWO8iw955vWqakWNr3YyazQnNzqV97+l
-Qa+wUKMVY+lsyhAyOyXO31j4+clvsj6+JhNEwQtcnpkSc+TX60eZvLhgZPUgRVuK
-B9w4GUVyg/db593QUmP8K41Is8E+l32CQdcVh9go0toqf/oS/za1TDFHEHLlB4dC
-joKkfr3/hkGA9XJaoUopO2ELt4Otop12aw1BknoiTh1+YbzrZtAlIwK2TX99GW3S
-IjaCi+fLoXyK2Fmx8vKnr9JfNL888xK9BQfhZzKmbKm/eLD1e1CFRs1B3z2gd3ax
-pW5j1OIkSBMOIUeip5+7xvYo2gor5mxatB+rzSvrWup9AwIcymMCAwEAAaOBrjCB
-qzAdBgNVHQ4EFgQU88kVdKbnc/8TvwxrrXp7Zc8ceCAwHwYDVR0jBBgwFoAUb+bF
-bAe3bIsKgZKDXMtBHva00ScwRQYDVR0gAQH/BDswOTA3BgRVHSAAMC8wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cuc3QuY29tL1RQTS9yZXBvc2l0b3J5LzAOBgNVHQ8B
-Af8EBAMCAAQwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0BAQsFAAOCAQEA
-uZqViou3aZDGvaAn29gghOkj04SkEWViZR3dU3DGrA+5ZX+zr6kZduus3Hf0bVHT
-I318PZGTml1wm6faDRomE8bI5xADWhPiCQ1Gf7cFPiqaPkq7mgdC6SGlQtRAfoP8
-ISUJlih0UtsqBWGql4lpk5G6YmvAezguWmMR0/O5Cx5w8YKfXkwAhegGmMGIoJFO
-oSzJrS7jK2GnGCuRG65OQVC5HiQY2fFF0JePLWG/D56djNxMbPNGTHF3+yBWg0DU
-0xJKYKGFdjFcw0Wi0m2j49Pv3JD1f78c2Z3I/65pkklZGu4awnKQcHeGIbdYF0hQ
-LtDSBV4DR9q5GVxSR9JPgQ==
------END CERTIFICATE-----`,
-		"STM2": `-----BEGIN CERTIFICATE-----
-MIIDzDCCArSgAwIBAgIEAAAAAzANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJD
-SDEeMBwGA1UEChMVU1RNaWNyb2VsZWN0cm9uaWNzIE5WMRswGQYDVQQDExJTVE0g
-VFBNIEVLIFJvb3QgQ0EwHhcNMTEwMTIxMDAwMDAwWhcNMjkxMjMxMDAwMDAwWjBV
-MQswCQYDVQQGEwJDSDEeMBwGA1UEChMVU1RNaWNyb2VsZWN0cm9uaWNzIE5WMSYw
-JAYDVQQDEx1TVE0gVFBNIEVLIEludGVybWVkaWF0ZSBDQSAwMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJO3ihn/uHgV3HrlPZpv8+1+xg9ccLf3pVXJ
-oT5n8PHHixN6ZRBmf/Ng85/ODZzxnotC64WD8GHMLyQ0Cna3MJF+MGJZ5R5JkuJR
-B4CtgTPwcTVZIsCuup0aDWnPzYqHwvfaiD2FD0aaxCnTKIjWU9OztTD2I61xW2LK
-EY4Vde+W3C7WZgS5TpqkbhJzy2NJj6oSMDKklfI3X8jVf7bngMcCR3X3NcIo349I
-Dt1r1GfwB+oWrhogZVnMFJKAoSYP8aQrLDVl7SQOAgTXz2IDD6bo1jga/8Kb72dD
-h8D2qrkqWh7Hwdas3jqqbb9uiq6O2dJJY86FjffjXPo3jGlFjTsCAwEAAaOBrjCB
-qzAdBgNVHQ4EFgQUVx+Aa0fM55v6NZR87Yi40QBa4J4wHwYDVR0jBBgwFoAUb+bF
-bAe3bIsKgZKDXMtBHvaO0ScwRQYDVR0gAQH/BDswOTA3BgRVHSAAMC8wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cuc3QuY29tL1RQTS9yZXBvc2l0b3J5LzAOBgNVHQ8B
-Af8EBAMCAAQwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQsFAAOCAQEA
-4gllWq44PFWcv0JgMPOtyXDQx30YB5vBpjS0in7f/Y/r+1Dd8q3EZwNOwYApe+Lp
-/ldNqCXw4XzmO8ZCVWOdQdVOqHZuSOhe++Jn0S7M4z2/1PQ6EbRczGfw3dlX63Ec
-cEnrn6YMcgPC63Q+ID53vbTS3gpeX/SGpngtVwnzpuJ5rBajqSQUo5jBTBtuGQpO
-Ko6Eu7U6Ouz7BVgOSn0mLbfSRb77PjOLZ3+97gSiMmV0iofS7ufemYqA8sF7ZFv/
-lM2eOe/eeS56Jw+IPsnEU0Tf8Tn9hnEig1KP8VByRTWAJgiEOgX2nTs5iJbyZeIZ
-RUjDHQQ5onqhgjpfRsC95g==
------END CERTIFICATE-----`,
-		"NTC1": `-----BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIGAK3jXfbVMA0GCSqGSIb3DQEBBQUAMFIxUDAcBgNVBAMT
-FU5UQyBUUE0gRUsgUm9vdCBDQSAwMTAlBgNVBAoTHk51dm90b24gVGVjaG5vbG9n
-eSBDb3Jwb3JhdGlvbjAJBgNVBAYTAlRXMB4XDTEyMDcxMTE2MjkzMFoXDTMyMDcx
-MTE2MjkzMFowUjFQMBwGA1UEAxMVTlRDIFRQTSBFSyBSb290IENBIDAxMCUGA1UE
-ChMeTnV2b3RvbiBUZWNobm9sb2d5IENvcnBvcmF0aW9uMAkGA1UEBhMCVFcwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoNqxhtD4yUtXhqKQGGZemoKJy
-uj1RnWvmNgzItLeejNU8B6fOnpMQyoS4K72tMhhFRK2jV9RYzyJMSjEwyX0ASTO1
-2yMti2UJQS60d36eGwk8WLgrFnnITlemshi01h9t1MOmay3TO1LLH/3/VDKJ+jbd
-cbfIO2bBquN8r3/ojYUaNSPj6pK1mmsMoJXF4dGRSEwb/4ozBIw5dugm1MEq4Zj3
-GZ0YPg5wyLRugQbt7DkUOX4FGuK5p/C0u5zX8u33EGTrDrRz3ye3zO+aAY1xXF/m
-qwEqgxX5M8f0/DXTTO/CfeIksuPeOzujFtXfi5Cy64eeIZ0nAUG3jbtnGjoFAgMB
-AAGjJjAkMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAGAQH/AgEAMA0GCSqG
-SIb3DQEBBQUAA4IBAQBBQznOPJAsD4Yvyt/hXtVJSgBX/+rRfoaqbdt3UMbUPJYi
-pUoTUgaTx02DVRwommO+hLx7CS++1F2zorWC8qQyvNbg7iffQbbjWitt8NPE6kCr
-q0Y5g7M/LkQDd5N3cFfC15uFJOtlj+A2DGzir8dlXU/0qNq9dBFbi+y+Y3rAT+wK
-fktmN82UT861wTUzDvnXO+v7H5DYXjUU8kejPW6q+GgsccIbVTOdHNNWbMrcD9yf
-oS91nMZ/+/n7IfFWXNN82qERsrvOFCDsbIzUOR30N0IP++oqGfwAbKFfCOCFUz6j
-jpXUdJlh22tp12UMsreibmi5bsWYBgybwSbRgvzE
------END CERTIFICATE-----`,
-		"NTC2": `-----BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIGAPadBmPZMA0GCSqGSIb3DQEBBQUAMFIxUDAcBgNVBAMT
-FU5UQyBUUE0gRUsgUm9vdCBDQSAwMjAlBgNVBAoTHk51dm90b24gVGVjaG5vbG9n
-eSBDb3Jwb3JhdGlvbjAJBgNVBAYTAlRXMB4XDTEyMDcxMTE2MzMyNFoXDTMyMDcx
-MTE2MzMyNFowUjFQMBwGA1UEAxMVTlRDIFRQTSBFSyBSb290IENBIDAyMCUGA1UE
-ChMeTnV2b3RvbiBUZWNobm9sb2d5IENvcnBvcmF0aW9uMAkGA1UEBhMCVFcwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSagWxaANT1YA2YUSN7sq7yzOT
-1ymbIM+WijhE5AGcLwLFoJ9fmaQrYL6fAW2EW/Q3yu97Q9Ysr8yYZ2XCCfxfseEr
-Vs80an8Nk6LkTDz8+0Hm0Cct0klvNUAZEIvWpmgHZMvGijXyOcp4z494d8B28Ynb
-I7x0JMXZZQQKQi+WfuHtntF+2osYScweocipPrGeONLKU9sngWZ2vnnvw1SBneTa
-irxq0Q0SD6Bx9jtxvdf87euk8JzfPhX8jp8GEeAjmLwGR+tnOQrDmczGNmp7YYNN
-R+Q7NZVoYWHw5jaoZnNxbouWUXZZxFqDsB/ndCKWtsIzRYPuWcqrFcmUN4SVAgMB
-AAGjJjAkMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAGAQH/AgEAMA0GCSqG
-SIb3DQEBBQUAA4IBAQAIkdDSErzPLPYrVthw4lKjW4tRYelUicMPEHKjQeVUAAS5
-y9XTzB4DWISDAFsgtQjqHJj0xCG+vpY0Rmn2FCO/0YpP+YBQkdbJOsiyXCdFy9e4
-gGjQ24gw1B+rr84+pkI51y952NYBdoQDeb7diPe+24U94f//DYt/JQ8cJua4alr3
-2Pohhh5TxCXXfU2EHt67KyqBSxCSy9m4OkCOGLHL2X5nQIdXVj178mw6DSAwyhwR
-n3uJo5MvUEoQTFZJKGSXfab619mIgzEr+YHsIQToqf44VfDMDdM+MFiXQ3a5fLii
-hEKQ9DhBPtpHAbhFA4jhCiG9HA8FdEplJ+M4uxNz
------END CERTIFICATE-----`,
-		"IFX1": `-----BEGIN CERTIFICATE-----
-MIIEnzCCA4egAwIBAgIEMV64bDANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
-RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
-aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
-QTAeFw0wNTEwMjAxMzQ3NDNaFw0yNTEwMjAxMzQ3NDNaMHcxCzAJBgNVBAYTAkRF
-MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
-cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
-aWF0ZSBDQSAwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALftPhYN
-t4rE+JnU/XOPICbOBLvfo6iA7nuq7zf4DzsAWBdsZEdFJQfaK331ihG3IpQnlQ2i
-YtDim289265f0J4OkPFpKeFU27CsfozVaNUm6UR/uzwA8ncxFc3iZLRMRNLru/Al
-VG053ULVDQMVx2iwwbBSAYO9pGiGbk1iMmuZaSErMdb9v0KRUyZM7yABiyDlM3cz
-UQX5vLWV0uWqxdGoHwNva5u3ynP9UxPTZWHZOHE6+14rMzpobs6Ww2RR8BgF96rh
-4rRAZEl8BXhwiQq4STvUXkfvdpWH4lzsGcDDtrB6Nt3KvVNvsKz+b07Dk+Xzt+EH
-NTf3Byk2HlvX+scCAwEAAaOCATswggE3MB0GA1UdDgQWBBQ4k8292HPEIzMV4bE7
-qWoNI8wQxzAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
-HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
-d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
-MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
-BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
-RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
-DQYJKoZIhvcNAQEFBQADggEBABJ1+Ap3rNlxZ0FW0aIgdzktbNHlvXWNxFdYIBbM
-OKjmbOos0Y4O60eKPu259XmMItCUmtbzF3oKYXq6ybARUT2Lm+JsseMF5VgikSlU
-BJALqpKVjwAds81OtmnIQe2LSu4xcTSavpsL4f52cUAu/maMhtSgN9mq5roYptq9
-DnSSDZrX4uYiMPl//rBaNDBflhJ727j8xo9CCohF3yQUoQm7coUgbRMzyO64yMIO
-3fhb+Vuc7sNwrMOz3VJN14C3JMoGgXy0c57IP/kD5zGRvljKEvrRC2I147+fPeLS
-DueRMS6lblvRKiZgmGAg7YaKOkOaEmVDMQ+fTo2Po7hI5wc=
------END CERTIFICATE-----`,
-		"IFX2": `-----BEGIN CERTIFICATE-----
-MIIEnzCCA4egAwIBAgIEaItIgTANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
-RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
-aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
-QTAeFw0wNjEyMjExMDM0MDBaFw0yNjEyMjExMDM0MDBaMHcxCzAJBgNVBAYTAkRF
-MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
-cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
-aWF0ZSBDQSAwMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK6KnP5R
-8ppq9TtPu3mAs3AFxdWhzK5ks+BixGR6mpzyXG64Bjl4xzBXeBIVtlBZXYvIAJ5s
-eCTEEsnZc9eKNJeFLdmXQ/siRrTeonyxoS4aL1mVEQebLUz2gN9J6j1ewly+OvGk
-jEYouGCzA+fARzLeRIrhuhBI0kUChbH7VM8FngJsbT4xKB3EJ6Wttma25VSimkAr
-SPS6dzUDRS1OFCWtAtHJW6YjBnA4wgR8WfpXsnjeNpwEEB+JciWu1VAueLNI+Kis
-RiferCfsgWRvHkR6RQf04h+FlhnYHJnf1ktqcEi1oYAjLsbYOAwqyoU1Pev9cS28
-EA6FTJcxjuHhH9ECAwEAAaOCATswggE3MB0GA1UdDgQWBBRDMlr1UAQGVIkwzamm
-fceAZ7l4ATAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
-HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
-d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
-MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
-BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
-RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
-DQYJKoZIhvcNAQEFBQADggEBAIZAaYGzf9AYv6DqoUNx6wdpayhCeX75/IHuFQ/d
-gLzat9Vd6qNKdAByskpOjpE0KRauEzD/BhTtkEJDazPSmVP1QxAPjqGaD+JjqhS/
-Q6aY+1PSDi2zRIDA66V2yFJDcUBTtShbdTg144YSkVSY5UCKhQrsdg8yAbs7saAB
-LHzVebTXffjmkTk5GZk26d/AZQRjfssta1N/TWhWTfuZtwYvjZmgDPeCfr6AOPLr
-pVJz+ntzUKGpQ+5mwDJXMZ0qeiFIgXUlU0D+lfuajc/x9rgix9cM+o7amgDlRi1T
-55Uu2vzUQ9jLUaISFaTTMag+quBDhx8BDVu+igLp5hvBtxQ=
------END CERTIFICATE-----`,
-		"IFX3": `-----BEGIN CERTIFICATE-----
-MIIEnzCCA4egAwIBAgIEH7fYljANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
-RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
-aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
-QTAeFw0wNzA0MTMxNjQ0MjRaFw0yNzA0MTMxNjQ0MjRaMHcxCzAJBgNVBAYTAkRF
-MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
-cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
-aWF0ZSBDQSAwMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJWdPAuH
-z/p1tIwB1QXlPD/PjedZ4uBZdwPH5tI3Uve0TzbR/mO5clx/loWn7nZ5cHkH1nhB
-R67JEFY0a9GithPfITh0XRxPcisLBE/SoqZ90KHFaS+N6SwOpdCP0GlUg1OesKCF
-79Z6fXrkTZsVpPqdawdZK+oUsDO9z9U6xqV7bwsS75Y+QiHsm6UTgAkSNQnuFMP3
-NqQyDi/BaWaYRGQ6K8pM7Y7e1h21z/+5X7LncZXU8hgpYpu2zQPg96IkYboVUKL4
-00snaPcOvfagsBUGlBltNfz7geaSuWTCdwEiwlkCYZqCtbkAj5FiStajrzP72BfT
-2fshIv+5eF7Qp5ECAwEAAaOCATswggE3MB0GA1UdDgQWBBTGyypNtylL6RFyT1BB
-MQtMQvibsjAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
-HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
-d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
-MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
-BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
-RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
-DQYJKoZIhvcNAQEFBQADggEBAGN1bkh4J90DGcOPP2BlwE6ejJ0iDKf1zF+7CLu5
-WS5K4dvuzsWUoQ5eplUt1LrIlorLr46mLokZD0RTG8t49Rcw4AvxMgWk7oYk69q2
-0MGwXwgZ5OQypHaPwslmddLcX+RyEvjrdGpQx3E/87ZrQP8OKnmqI3pBlB8QwCGL
-SV9AERaGDpzIHoObLlUjgHuD6aFekPfeIu1xbN25oZCWmqFVIhkKxWE1Xu+qqHIA
-dnCFhoIWH3ie9OsJh/iDRaANYYGyplIibDx1FJA8fqiBiBBKUlPoJvbqmZs4meMd
-OoeOuCvQ7op28UtaoV6H6BSYmN5dOgW7r1lX2Re0nd84NGE=
------END CERTIFICATE-----`,
-		"IFX4": `-----BEGIN CERTIFICATE-----
-MIIEnzCCA4egAwIBAgIEDhD4wDANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
-RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
-aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
-QTAeFw0wNzEyMDMxMzA3NTVaFw0yNzEyMDMxMzA3NTVaMHcxCzAJBgNVBAYTAkRF
-MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
-cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
-aWF0ZSBDQSAwNDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN3UBmDk
-jJzzJ+WCgrq4tILtE9KJPMGHwvCsbJOlo7eHiEb8JQzGK1prkPQ3dowFRXPnqONP
-WUa36/J3R32xgvuZHqAdliZCt8IUb9qYhDenuXo1SSqJ8LWp30QIJ0vnkaQ2TCkO
-bveZZR3hK2OZKRTkFaV/iy2RH+Qs4JAe3diD8mlIu2gXAXnKJSkrzW6gbMzrlTOi
-RCuGcatpy7Hfmodbz/0Trbuwtc3dyJZ3Ko1z9bz2Oirjh93RrmYjbtL0HhkAjMOR
-83GLrzwUddSqmxtXXX8j5i+/gmE3AO71swOIESdGugxaKUzJ1jTqWKMZcx0E6BFI
-lDIfKk0fJlSxHfECAwEAAaOCATswggE3MB0GA1UdDgQWBBSIs8E/YQXRBCKfWsDr
-SZVkrNRzvTAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
-HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
-d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
-MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
-BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
-RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
-DQYJKoZIhvcNAQEFBQADggEBAFtqClQNBLOzcGZUpsBqlz3frzM45iiBpxosG1Re
-IgoAgtIBEtl609TG51tmpm294KqpfKZVO+xNzovm8k/heGb0jmYf+q1ggrk2qT4v
-Qy2jgE0jbP/P8WWq8NHC13uMcBUGPaka7yofEDDwz7TcduQyJVfG2pd1vflnzP0+
-iiJpfCk3CAQQnb+B7zsOp7jHNwpvHP+FhNwZaikaa0OdR/ML9da1sOOW3oJSTEjW
-SMLuhaZHtcVgitvtOVvCI/aq47rNJku3xQ7c/s8FHnFzQQ+Q4TExbP20SrqQIlL/
-9sFAb7/nKYNauusakiF3pfvMrJOJigNfJyIcWaGfyyQtVVI=
------END CERTIFICATE-----`,
-		"IFX5": `-----BEGIN CERTIFICATE-----
-MIIEnzCCA4egAwIBAgIEVuRoqzANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
-RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
-aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
-QTAeFw0wOTEyMTExMDM4NDJaFw0yOTEyMTExMDM4NDJaMHcxCzAJBgNVBAYTAkRF
-MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
-cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
-aWF0ZSBDQSAwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL79zMCO
-bjkg7gCWEuyGO49CisF/QrGoz9adW1FBuSW8U9IOlvWXNsvoasC1mhrsfkRRojuU
-mWifxxxcVfOI9v1SbRfJ+i6lG21IcVe6ywLJdDliT+3vzvrb/2hU/XjCCMDWb/Pw
-aZslV5iL4QEiKxvRIiWMYHW0MkkL7mzRBDVN/Vz3ZiL5Lpq7awiKuX9OXpS2a1wf
-qSGAlm2TxjU884q9Ky85JJugn0Q/C3dc8aaFPKLHlRs6rIvN1l0LwB1b5EWPzTPJ
-d9EhRPFJOAbJS66nSgX06Fl7eWB71ow6w/25otLQCbpy6OrF8wBVMtPMHqFb1c32
-PaaNzpCBnIU7vaMCAwEAAaOCATswggE3MB0GA1UdDgQWBBS7z3zBhCExZtq1vlOo
-cBTd00jYzDAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
-HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
-d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
-MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
-BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
-RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
-DQYJKoZIhvcNAQEFBQADggEBAHomNJtmFNtRJI2+s6ZwdzCTHXXIcR/T+N/lfPbE
-hIUG4Kg+3uQMP7zBi22m3I3Kk9SXsjLqV5mnsQUGMGlF7jw5W5Q+d6NSJz4taw9D
-2DsiUxE/i5vrjWiUaWxv2Eckd4MUexe5Qz8YSh4FPqLB8FZnAlgx2kfdzRIUjkMq
-EgFK8ZRSUjXdczvsud68YPVMIZTxK0L8POGJ6RYiDrjTelprfZ4pKKZ79XwxwAIo
-pG6emUEf+doRT0KoHoCHr9vvWCWKhojqlQ6jflPZcEsNBMbq5KHVN77vOU58OKx1
-56v3EaqrZenVFt8+n6h2NzhOmg2quQXIr0V9jEg8GAMehDs=
------END CERTIFICATE-----`,
-		"IFX8": `-----BEGIN CERTIFICATE-----
-MIIEnzCCA4egAwIBAgIEfGoY6jANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
-RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
-aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
-QTAeFw0xMjA3MTcwOTI0NTJaFw0zMDEwMTgyMzU5NTlaMHcxCzAJBgNVBAYTAkRF
-MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
-cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
-aWF0ZSBDQSAwODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOJaIJu6
-r/betrMgWJ/JZ5j8ytoAA9RWq0cw7+W0e5L2kDLJMM288wYT+iEbfwx6sWSLAl7q
-okXYDtTB9MFNhQ5ZWFLslFXbYigtXJxwANcSdPISTF1Czn6LLi1fu1EHddwCXFC8
-xaX0iGgQ9pZklvAy2ijK9BPHquWisisEiWZNRT9dCVylzOR3+p2YOC3ZrRmg7Bj+
-DkC7dltTTO6dPR+LNOFe01pJlpZdF4YHcu4EC10gRu0quZz1LtDZWFKezK7rg5Rj
-LSAJbKOsGXjl6hQXMtADEX9Vlz1vItD21OYCNRsu6VdipiL0bl0aAio4BV3GMyjk
-0gHnQwCk9k/YPU8CAwEAAaOCATswggE3MB0GA1UdDgQWBBRMS01kiQjkW/5aENNj
-h6aIrsHPeDAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
-HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
-d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
-MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
-BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
-RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
-DQYJKoZIhvcNAQEFBQADggEBALMiDyQ9WKH/eTI84Mk8KYk+TXXEwf+fhgeCvxOQ
-G0FTSmOpJaNIzxWXr/gDbY3dO0ODjWRKYvhimZUuV+ckMA+wZX2C6o8g5njpWIOH
-pSAa+W35ijArh0Zt3MASJ46avd+fnQGTdzT0hK46gx6n2KixLvaZsR3JtuwUFYlQ
-wzmz/UsbBNEoPiR8p5E0Zf5GEGiTqkmBVYyS6XA34axpMMRHy0wI7AGs0gVihwUM
-rr0iWOu+GAcrm11lcYzqJvuEkfenAF62ufA2Ktv+Ut2xiRC0jUIp73CeplAJsqBr
-camV3pJn3qYPI5c1njMRYnoRFWQbrOR5ADWDQLFQPYRrJmg=
------END CERTIFICATE-----`,
-		"IFX15": `-----BEGIN CERTIFICATE-----
-MIIEnzCCA4egAwIBAgIER3V5aDANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJE
-RTEQMA4GA1UECBMHQmF2YXJpYTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9n
-aWVzIEFHMQwwCgYDVQQLEwNBSU0xGzAZBgNVBAMTEklGWCBUUE0gRUsgUm9vdCBD
-QTAeFw0xMjExMTQxNDQzMzRaFw0zMDEwMTgyMzU5NTlaMHcxCzAJBgNVBAYTAkRF
-MQ8wDQYDVQQIEwZTYXhvbnkxITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2ll
-cyBBRzEMMAoGA1UECxMDQUlNMSYwJAYDVQQDEx1JRlggVFBNIEVLIEludGVybWVk
-aWF0ZSBDQSAxNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKS6pgcg
-OQWSozVbMkdf9jZkpGdT4U735zs0skfpjoKK2CgpLMO/+oGKbObm/DQPRQO/oxvq
-jJNBKz55QBgKd+MoQ6t+2J8mcQ91Nfwqnm1C4r+c4zezJ1Utk/KIYNqpFDAzefBA
-/lK8IxQ6kmzxcIFE4skaFsSgkearSZGG6sA9A51yxwvs8yUrQF51ICEUM7wDb4cM
-53utaFdm6p6m9UZGSmmrdTiemOkuuwtl8IUQXfuk9lFyQsACBTM95Hrts0IzI6hX
-QeTwSL4JqyEnKP9vbtT4eXzWNycqSYBf0+Uo/HHZo9WuVDUaA4I9zcmD0qCvSOT0
-NAj4ifJ7SPGInU0CAwEAAaOCATswggE3MB0GA1UdDgQWBBR4pAnEV95pJvbfQsYR
-TrflaptW5zAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADBYBgNV
-HSABAf8ETjBMMEoGC2CGSAGG+EUBBy8BMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93
-d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDCBlwYDVR0jBIGP
-MIGMgBRW65FEhWPWcrOu1EWWC/eUDlRCpqFxpG8wbTELMAkGA1UEBhMCREUxEDAO
-BgNVBAgTB0JhdmFyaWExITAfBgNVBAoTGEluZmluZW9uIFRlY2hub2xvZ2llcyBB
-RzEMMAoGA1UECxMDQUlNMRswGQYDVQQDExJJRlggVFBNIEVLIFJvb3QgQ0GCAQMw
-DQYJKoZIhvcNAQEFBQADggEBAAnZDdJZs5QgAXnl0Jo5sCqktZcwcK+V1+uhsqrT
-Z7OJ9Ze1YJ9XB14KxRfmck7Erl5HVc6PtUcLnR0tuJKKKqm7dTe4sQEFYd5usjrW
-KSG6y7BOH7AdonocILY9OIxuNwxMAqhK8LIjkkRCeOWSvCqLnaLtrP52C0fBkTTM
-SWX7YnsutXEpwhro3Qsnm9hL9s3s/WoIuNKUcLFH/qWKztpxXnF0zip73gcZbwEy
-1GPQQpYnxFJ2R2ab2RHlO+3Uf3FDxn+eRLXNl95ZZ6GE4OIIpKEg2urIiig0HmGA
-ijO6JfJxT30H9QNsx78sjYs7pOfMw6DfiqJ8Fx82GcCUOyM=
------END CERTIFICATE-----`,
-	}
-
-	trustedKeys := map[string]string{
-		"ATM1": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5a+4yXtubUnGJPz7ZVjW
-spGhe5Tr9BhrWQ9QOfDoVlkmi+tg2Gqc9qA9R39WhiiEmKuQ3+4XIvO+XFFrVCv+
-8YuEnBIIu46FEX1LBG7LnUJbkgAV0pzHMWOghLhDIGcGg/6kO9fH+7KcwfwNah+Z
-Lkfbfis3cm09RlOG8RSq8LyK8Zc07QH2M7L/8PFnRRQ5MnAgW7vuk8h/M62TTy+y
-DVuWl/jnh3vrKgVMoOyL/iM3EdFHIV+r/lJOI/HRAlkieCRGiJ1kJI4tQpUXiL+t
-K2iB1yAxnqcSQzWWxlNuu6sAUV2tI+qMVM2o6eT1f/MM7+b4nmyuBrdOIO5dvTek
-7wIDAQAB
------END PUBLIC KEY-----`,
-		"ATM10": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1HEeCn82r8Vrg64howvt
-s/2Yj5yuXhEv7FwUaISo7rYFnAbstyMVGNsL24reRW7aiyj65iHEojx1Car3Jlu8
-hYfTqiagFmEK/qe8erEatwg5jFQ0GdK3a9Tw7nhYZjjpe98sRjL/DQlI5NiKClPF
-4ZNqI418MGmzmPN/QNxRnKJAr5LTE8FZCMShm5V9ege72oLj4VfPuz29fQLBZWJA
-2+NUy6gCpcUShejGfm9DTGBk0m3wruqyXuzKzJ4U0Xo5nTqp7ZV/JLbSWnTJxs72
-hZ4D1nbi0paPQgcK5FYbIwQ1WuEpN5QMfilsAZFbokQnQa+jX2Rzleoa0mURVEnG
-TQIDAQAB
------END PUBLIC KEY-----`,
-		"ATM11": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrS1Ei1VvLxVYWNv/s35
-aYmHa5MOnvQybgW/i1XuINZuPQqYNw02wrWRA5eft2ts+FkJDvbz6edtqH30Cjx+
-pmE9OvotY7O7rboruz2W2PpcQ0/inLUixNiq/A8giKRWJaTNsiF6VLNEWEe5sf3r
-e6+C/ZQUfwupM56bU0JrIMxEgp8SCFguQsNwcq2txtr1ujgX4PN6DOet6BcrTpsY
-vxKhQPbL/Tfl/kMqYVzqqyrBGgkg8+2FRxO6bVSJCwryrA37ZwkgJl3k/qibTFzw
-JVfJnGaT57L/TUVJRwADtVN+oJFcQamR7N6VIuohx7fp7U8t8nrKhZpIwK405hLE
-1wIDAQAB
------END PUBLIC KEY-----`,
-		"ATM12": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1R4fVBbUI7tsaRuS0VvH
-TiouZ7L/HAokHIsozeLKamistnoCNKMyz40pwGenK8l0XnvJveoAlT+3tbKmmeo7
-iR1QP28shN8ggnObHZpBN2cPiySh0A8uYIEXY3sJMrNZ/h2MMbjYD2nUyreVpuj+
-mytSbvmB1eqcj9p4JBY1aqwXBrm0DqxZXJsVNBkjJ7c9kFy3ze8yccTFKx/wXe7v
-PHgoWKA7RLtM2i/ppJdQgT/IubOrhZTyWPpvLQDpNf0p/SDmByw3/RzinPFlxUmA
-eBzvTDwM7jEsZIUQGDZIBhifK45VLLrQiDTTOL8eVw9D8H0zn8AJu7cF9w9oYQj6
-fQIDAQAB
------END PUBLIC KEY-----`,
-		"ATM13": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwSvUzUQRjD3KyZMJu5CZ
-sHVLqAN0mBT86nivjCV+RhHsR0uSU110NKjb2IHXM3fYaJlgvZRTAQJ3c8jPc0bV
-tC0+521QKKt86OLi0+nrNT2QzLtrJgx6eRoYiu9se2F0u/zB+PHQ0R8qVOI1xw0W
-FVK2w2+mRT3WN4Udp0Rn6LKPRXCq59JPfuD7hNBVmwp9uzj2TLp8ljMRSbChRjek
-u9H4G+b2qa4wf2g9R5/Eqq5cMwYsD4357cuhlfqWQxD61J93ro2Hf5+30JrZF2yo
-/TX5ocdQqnvLeape1KZGTDrikNXD9eIhR53yT4aBAK/RB8scsbwjn5tnoIBO0GAE
-wwIDAQAB
------END PUBLIC KEY-----`,
-		"ATM2": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6e/oMMyv7NPlNKo9A7ls
-wJDkE14LZGSsKiRyzyJe2qHCoBwsZEq3QV2w4ducngcOysRaczDd8Cku9Z332dbi
-9Tq6RZapk/eL7mcBF/XBNu7Wft3PDRTzs8gpM3xFHo59+OAjeax3TE8yR6Phiipp
-42uI9f184vQsgwzEWNz6kMUP5mwe3Hm9y8RlTzrpJAtVtW9w7LmoSeOHHgzsEGG9
-q5F2PkY6X0Ft9eDQaIOlTofkSHzvG2VLv8MJINMjnXrPnvF8dqG38lzAIvDfJKKx
-E5MjY2aoFc1dfISQDv4sYx02b6jwfDl8pFCrwCzH7cWmIE0hD2BV2LpurURTi+kk
-MQIDAQAB
------END PUBLIC KEY-----`,
-		"ATM3": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmFAUATJ/8xIeuFW0aKNZ
-cwCtDLDOQoGIez+sg64EmJ+rEKNHfPQj7ee3UxiARWoLvmrMwMZFHXVuHb6Q6QUB
-H2OmUZfhcBXm94ZbXrFQyDxosR3lU+JZu5JK0X76kZAQtiBI2/UkJMt0xRUm1P7p
-InKnqk9HYw2HpwrCYZII78R2N8bfGJAXOpz1oOpI7jVHewtJY/gun1jgXuOwNW+1
-ouDaUrB/8t9m0lvsoeqduq0Nhvl4AL6kxVFp4sSX3gFuSORcbFP4hu7UMJy6g59d
-bsgpulbltd2+HDqxEa4VPOe3IlC4iUso091vq+V49ThYOZ0TXFjk1dNdcTFuK2O8
-kQIDAQAB
------END PUBLIC KEY-----`,
-		"ATM4": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxtl1salu/2SXeqCGMtac
-0GMCqx6Qeh4KtrviPfGVdObksuyGRPPuaW25/oYNGLlf2x/kDlknB2eZFMiW8otK
-XV+xO50uFcxoTHXZ1wnMD8x6CgM0z0j3DQ5d0eu5sRRDd7GHYEpuvMj0x8pgkZk+
-C+Ux2hWlj8xEiEDH8q5wyP5AX92GkpoUAL0e4vUV7/cCEBcsLOs8Oq6rKzmig82k
-sDiL/Tn/8TtsSmUAwT/FzM/gi79x0D1hHtXyLOFPDIrOy3d3cz5QMOSSLDHGjmoa
-DBF0+rcBRJCCU2iBtfIMBevJO1IBUmj/EgerHWWaf5pNNJAL62eAeeaWKm5OaX6b
-VQIDAQAB
------END PUBLIC KEY-----`,
-		"ATM5": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqg1FjhOQ/GsqgUL+WSBc
-fYr3hkxxl1EBaCIqiolc1R5TmZabaHoCUIJmhwXfFGhFvhZrI0AcEqIYANLgY0ri
-vn4h6vV+rrwtxM1X7X8hmT+AdvxL2p9lOCp7XNpQ2Rw+o/2JhuBSUv+opW7K6wPu
-mwUpy4gL+dAozZyBjan5Co9sP5Yh3kdG3+ezRsfxf3CnS76NhjHglK9AWUdM1c6m
-FGqTP+fU9ySTpoabrnDUzIcedu5OsMZa5L1LeLKHrqrbM3b995aU9RPrIQoO3x+B
-Sau9Ab0d614zpD0TeWwjBT7Y5rIg14bIx7DiA+4kGRE5fHZtpdSWpgJmlkcObSSd
-vQIDAQAB
------END PUBLIC KEY-----`,
-		"ATM6": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw9s9ykpgzH1Birz8JVmH
-c/jXNSaFsDQYM9hcS3513P7arS+r/musmUqfdybY/GQ8+YqAA6IZq+xlGZ7WUEmx
-vo/Hlnm/FQj3epZGD3ruApm+8dLV4Hvs4RjZCS8cfpkRZygh+nRdrZ3aAwZRjQbh
-vl8mAJOQ2Rp9ANaZMzYjre7adkuqIFDa83nKgn4XkMIft+MthOvcMYmZtSL64gvA
-NZ7PiryB2cMhS+0yAMGK/Oqm0ELIRk8wqAR/l3txRVxoQEqA9fBk2bvGNiWva92c
-hxCLpEX9+CcZWvUeH6Up5a2EDxw8BgxE0L6sqjINWn2uN0x7jlKysg+XEyo7qUpM
-RQIDAQAB
------END PUBLIC KEY-----`,
-		"ATM7": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlYRfDD3bMJB7w6Fl+Kez
-oIaEkzz+2VCeF8v3ohsNnSKCgcx8uk7Seyp50bEtLB6vOzwgcM5WjFItKyYLZaHt
-P43q3iHsvISjAGNcYGcQ3NrM4ia6pc2geVraupldPTdQFOQjwd+0P/Q2/RMbWY6g
-+sbjIDtItEc1vhf6bI3TinT+bGxxXdR9B6qWgLNc/H31wsBNN2nPv1K4wE8MWfAV
-7hcK2NoIc1zGEY+IiWPtXSu48zmvS2lxKWWYuiHBwCt5ns/U7M8XSjkaj7SbhD02
-yKwiMavu7SMAceSWWMBuhjgm9/zfMAPKO9weQixVCeuXspByefsekPuk5ohbWOS/
-bwIDAQAB
------END PUBLIC KEY-----`,
-		"ATM8": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylXag4JmzoqaTK8eCcSj
-DSOGRcrX8IK/fBawgEWKAgPy/yu+8FGXXK10XDeI1fmlAefDr7349Cn+v9/y+Mff
-XIduKCqR5ZP9M1+fBk7k5l4x2SeC9NfIMG+c0yJ6m1kEmsSN04nlKk8foo54L7DY
-+Kkjfh6EPxyzxsMDqqTrMifBThF2kqo5KUBDdBjIkOUH1dbLWGjEgUpKocCu2M41
-U7jmjToatkA+d3V+PyQRF4/lJkTYiv6Jy1Zl1qpEkLvR0qKrzoHkOij7zBpQ/46B
-2BW1pARjU7AIp3NtfS5THL59mpXxpuyj6y2h0wxNVRkPZpnVA0ZWHgz9J4TcIgAN
-PwIDAQAB
------END PUBLIC KEY-----`,
-		"ATM9": `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxa0XBIlBj9t5bYB81Cea
-mlV3I3rTathgyUn2VL7/wng2vK5x7BB3a1wjXt5k/uwR/M5tfIDOSjug/SdDfTWk
-ZRe82Ij/oYJOytcrFzEzouIZVA7t/uKdXzRwz7dZ6LPnNVkp8GiWUDCDpTNNmnvi
-eZcjqofajDcc0EC720NT+NqmkAJd0qYMs+i4TA2om2C2Lxpkq+YdJp2pJOCCQquC
-wmLXB8OxrddjX4QW5mHzigx4fanC/GJcXuRQPXqLruHZlWmUqU7Sl6yZEluItHbB
-ri4BxD3Q7eXH0sM3rZGUCLr3lMPXjGsfpogZT4zLr075QIxtwe5OUpnslU61c34X
-BwIDAQAB
------END PUBLIC KEY-----`,
-	}
-
-	cert, err := x509.ParseCertificate(ekcert)
-	if err != nil {
-		return fmt.Errorf("Unable to parse EKCert: %s", err)
-	}
-
-	for vendor, certificate := range trustedCerts {
-		block, _ := pem.Decode([]byte(certificate))
-		testcert, err := x509.ParseCertificate(block.Bytes)
-		if err != nil {
-			return fmt.Errorf("Unable to parse %s: %s", vendor, err)
-		}
-		err = testcert.CheckSignature(cert.SignatureAlgorithm, cert.RawTBSCertificate, cert.Signature)
-		if err == nil {
-			return nil
-		}
-	}
-
-	for vendor, key := range trustedKeys {
-		block, _ := pem.Decode([]byte(key))
-		pubkey, err := x509.ParsePKIXPublicKey(block.Bytes)
-		if err != nil {
-			return fmt.Errorf("Unable to parse %s: %s", vendor, err)
-		}
-		hashdata := sha1.Sum(cert.RawTBSCertificate[:])
-		err = rsa.VerifyPKCS1v15(pubkey.(*rsa.PublicKey), crypto.SHA1, hashdata[:], cert.Signature)
-		if err == nil {
-			return nil
-		}
-	}
-
-	return fmt.Errorf("No matching certificate found")
-}
-
-// QuoteVerify verifies that a quote was genuinely provided by the TPM. It
-// takes the quote data, quote validation blob, public half of the AIK,
-// current PCR values and the nonce used in the original quote request. It
-// then verifies that the validation block is a valid signature for the
-// quote data, that the secrets are the same (in order to avoid replay
-// attacks), and that the PCR values are the same. It returns an error if
-// any stage of the validation fails.
-func QuoteVerify(data []byte, validation []byte, aikpub []byte, pcrvalues [][]byte, secret []byte) error {
-	n := big.NewInt(0)
-	n.SetBytes(aikpub)
-	e := 65537
-
-	pKey := rsa.PublicKey{N: n, E: int(e)}
-
-	dataHash := sha1.Sum(data[:])
-
-	err := rsa.VerifyPKCS1v15(&pKey, crypto.SHA1, dataHash[:], validation)
-	if err != nil {
-		return err
-	}
-
-	pcrHash := data[8:28]
-	nonceHash := data[28:48]
-
-	secretHash := sha1.Sum(secret[:])
-
-	if bytes.Equal(secretHash[:], nonceHash) == false {
-		return fmt.Errorf("Secret doesn't match")
-	}
-
-	pcrComposite := []byte{0x00, 0x02, 0xff, 0xff, 0x00, 0x00, 0x01, 0x40}
-	for i := 0; i < 16; i++ {
-		pcrComposite = append(pcrComposite, pcrvalues[i]...)
-	}
-	pcrCompositeHash := sha1.Sum(pcrComposite[:])
-
-	if bytes.Equal(pcrCompositeHash[:], pcrHash) == false {
-		return fmt.Errorf("PCR values don't match")
-	}
-
-	return nil
-}
-
-// KeyVerify verifies that a key certification request was genuinely
-// provided by the TPM. It takes the certification data, certification
-// validation blob, the public half of the AIK, the public half of the key
-// to be certified and the nonce used in the original quote request. It then
-// verifies that the validation block is a valid signature for the
-// certification data, that the certification data matches the certified key
-// and that the secrets are the same (in order to avoid replay attacks). It
-// returns an error if any stage of the validation fails.
-func KeyVerify(data []byte, validation []byte, aikpub []byte, keypub []byte, secret []byte) error {
-	n := big.NewInt(0)
-	n.SetBytes(aikpub)
-	e := 65537
-
-	pKey := rsa.PublicKey{N: n, E: int(e)}
-
-	dataHash := sha1.Sum(data[:])
-
-	err := rsa.VerifyPKCS1v15(&pKey, crypto.SHA1, dataHash[:], validation)
-	if err != nil {
-		return err
-	}
-
-	keyHash := data[43:63]
-	nonceHash := data[63:83]
-
-	secretHash := sha1.Sum(secret[:])
-
-	if bytes.Equal(secretHash[:], nonceHash) == false {
-		return fmt.Errorf("Secret doesn't match")
-	}
-
-	certHash := sha1.Sum(keypub[:])
-
-	if bytes.Equal(certHash[:], keyHash) == false {
-		return fmt.Errorf("Key doesn't match")
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/ioprogress/LICENSE b/Godeps/_workspace/src/github.com/coreos/ioprogress/LICENSE
deleted file mode 100644
index 2298515904..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/ioprogress/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Mitchell Hashimoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/coreos/ioprogress/README.md b/Godeps/_workspace/src/github.com/coreos/ioprogress/README.md
deleted file mode 100644
index 3d291e9d14..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/ioprogress/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# ioprogress
-
-ioprogress is a Go (golang) library with implementations of `io.Reader`
-and `io.Writer` that draws progress bars. The primary use case for these
-are for CLI applications but alternate progress bar writers can be supplied
-for alternate environments.
-
-## Example
-
-![Progress](http://g.recordit.co/GO5HxT16QH.gif)
-
-## Installation
-
-Standard `go get`:
-
-```
-$ go get github.com/mitchellh/ioprogress
-```
-
-## Usage
-
-Here is an example of outputting a basic progress bar to the CLI as
-we're "downloading" from some other `io.Reader` (perhaps from a network
-connection):
-
-```go
-// Imagine this came from some external source, such as a network connection,
-// and that we have the full size of it, such as from a Content-Length HTTP
-// header.
-var r io.Reader
-
-// Create the progress reader
-progressR := &ioprogress.Reader{
-	Reader: r,
-	Size:   rSize,
-}
-
-// Copy all of the reader to some local file f. As it copies, the
-// progressR will write progress to the terminal on os.Stdout. This is
-// customizable.
-io.Copy(f, progressR)
-```
diff --git a/Godeps/_workspace/src/github.com/coreos/ioprogress/draw.go b/Godeps/_workspace/src/github.com/coreos/ioprogress/draw.go
deleted file mode 100644
index b659be5b67..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/ioprogress/draw.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package ioprogress
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	"golang.org/x/crypto/ssh/terminal"
-)
-
-// DrawFunc is the callback type for drawing progress.
-type DrawFunc func(int64, int64) error
-
-// DrawTextFormatFunc is a callback used by DrawFuncs that draw text in
-// order to format the text into some more human friendly format.
-type DrawTextFormatFunc func(int64, int64) string
-
-var defaultDrawFunc DrawFunc
-
-func init() {
-	defaultDrawFunc = DrawTerminal(os.Stdout)
-}
-
-// isTerminal returns True when w is going to a tty, and false otherwise.
-func isTerminal(w io.Writer) bool {
-	if f, ok := w.(*os.File); ok {
-		return terminal.IsTerminal(int(f.Fd()))
-	}
-	return false
-}
-
-// DrawTerminal returns a DrawFunc that draws a progress bar to an io.Writer
-// that is assumed to be a terminal (and therefore respects carriage returns).
-func DrawTerminal(w io.Writer) DrawFunc {
-	return DrawTerminalf(w, func(progress, total int64) string {
-		return fmt.Sprintf("%d/%d", progress, total)
-	})
-}
-
-// DrawTerminalf returns a DrawFunc that draws a progress bar to an io.Writer
-// that is formatted with the given formatting function.
-func DrawTerminalf(w io.Writer, f DrawTextFormatFunc) DrawFunc {
-	var maxLength int
-
-	return func(progress, total int64) error {
-		if progress == -1 && total == -1 {
-			_, err := fmt.Fprintf(w, "\n")
-			return err
-		}
-
-		// Make sure we pad it to the max length we've ever drawn so that
-		// we don't have trailing characters.
-		line := f(progress, total)
-		if len(line) < maxLength {
-			line = fmt.Sprintf(
-				"%s%s",
-				line,
-				strings.Repeat(" ", maxLength-len(line)))
-		}
-		maxLength = len(line)
-
-		terminate := "\r"
-		if !isTerminal(w) {
-			terminate = "\n"
-		}
-		_, err := fmt.Fprint(w, line+terminate)
-		return err
-	}
-}
-
-var byteUnits = []string{"B", "KB", "MB", "GB", "TB", "PB"}
-
-// DrawTextFormatBytes is a DrawTextFormatFunc that formats the progress
-// and total into human-friendly byte formats.
-func DrawTextFormatBytes(progress, total int64) string {
-	return fmt.Sprintf("%s/%s", ByteUnitStr(progress), ByteUnitStr(total))
-}
-
-// DrawTextFormatBar returns a DrawTextFormatFunc that draws a progress
-// bar with the given width (in characters). This can be used in conjunction
-// with another DrawTextFormatFunc to create a progress bar with bytes, for
-// example:
-//
-//     bar := DrawTextFormatBar(20)
-//     func(progress, total int64) string {
-//         return fmt.Sprintf(
-//           "%s %s",
-//           bar(progress, total),
-//           DrawTextFormatBytes(progress, total))
-//     }
-//
-func DrawTextFormatBar(width int64) DrawTextFormatFunc {
-	return DrawTextFormatBarForW(width, nil)
-}
-
-// DrawTextFormatBarForW returns a DrawTextFormatFunc as described in the docs
-// for DrawTextFormatBar, however if the io.Writer passed in is not a tty then
-// the returned function will always return "".
-func DrawTextFormatBarForW(width int64, w io.Writer) DrawTextFormatFunc {
-	if w != nil && !isTerminal(w) {
-		return func(progress, total int64) string {
-			return ""
-		}
-	}
-
-	width -= 2
-
-	return func(progress, total int64) string {
-		current := int64((float64(progress) / float64(total)) * float64(width))
-		return fmt.Sprintf(
-			"[%s%s]",
-			strings.Repeat("=", int(current)),
-			strings.Repeat(" ", int(width-current)))
-	}
-}
-
-// ByteUnitStr pretty prints a number of bytes.
-func ByteUnitStr(n int64) string {
-	var unit string
-	size := float64(n)
-	for i := 1; i < len(byteUnits); i++ {
-		if size < 1000 {
-			unit = byteUnits[i-1]
-			break
-		}
-
-		size = size / 1000
-	}
-
-	return fmt.Sprintf("%.3g %s", size, unit)
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/ioprogress/reader.go b/Godeps/_workspace/src/github.com/coreos/ioprogress/reader.go
deleted file mode 100644
index 7d52731e2d..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/ioprogress/reader.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package ioprogress
-
-import (
-	"io"
-	"time"
-)
-
-// Reader is an implementation of io.Reader that draws the progress of
-// reading some data.
-type Reader struct {
-	// Reader is the underlying reader to read from
-	Reader io.Reader
-
-	// Size is the total size of the data coming out of the reader.
-	Size int64
-
-	// DrawFunc is the callback to invoke to draw the progress bar. By
-	// default, this will be DrawTerminal(os.Stdout).
-	//
-	// DrawInterval is the minimum time to wait between reads to update the
-	// progress bar.
-	DrawFunc     DrawFunc
-	DrawInterval time.Duration
-
-	progress int64
-	lastDraw time.Time
-}
-
-// Read reads from the underlying reader and invokes the DrawFunc if
-// appropriate. The DrawFunc is executed when there is data that is
-// read (progress is made) and at least DrawInterval time has passed.
-func (r *Reader) Read(p []byte) (int, error) {
-	// If we haven't drawn before, initialize the progress bar
-	if r.lastDraw.IsZero() {
-		r.initProgress()
-	}
-
-	// Read from the underlying source
-	n, err := r.Reader.Read(p)
-
-	// Always increment the progress even if there was an error
-	r.progress += int64(n)
-
-	// If we don't have any errors, then draw the progress. If we are
-	// at the end of the data, then finish the progress.
-	if err == nil {
-		// Only draw if we read data or we've never read data before (to
-		// initialize the progress bar).
-		if n > 0 {
-			r.drawProgress()
-		}
-	}
-	if err == io.EOF {
-		r.finishProgress()
-	}
-
-	return n, err
-}
-
-func (r *Reader) drawProgress() {
-	// If we've drawn before, then make sure that the draw interval
-	// has passed before we draw again.
-	interval := r.DrawInterval
-	if interval == 0 {
-		interval = time.Second
-	}
-	if !r.lastDraw.IsZero() {
-		nextDraw := r.lastDraw.Add(interval)
-		if time.Now().Before(nextDraw) {
-			return
-		}
-	}
-
-	// Draw
-	f := r.drawFunc()
-	f(r.progress, r.Size)
-
-	// Record this draw so that we don't draw again really quickly
-	r.lastDraw = time.Now()
-}
-
-func (r *Reader) finishProgress() {
-	f := r.drawFunc()
-	f(r.progress, r.Size)
-
-	// Print a newline
-	f(-1, -1)
-
-	// Reset lastDraw so we don't finish again
-	var zeroDraw time.Time
-	r.lastDraw = zeroDraw
-}
-
-func (r *Reader) initProgress() {
-	var zeroDraw time.Time
-	r.lastDraw = zeroDraw
-	r.drawProgress()
-	r.lastDraw = zeroDraw
-}
-
-func (r *Reader) drawFunc() DrawFunc {
-	if r.DrawFunc == nil {
-		return defaultDrawFunc
-	}
-
-	return r.DrawFunc
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/LICENSE b/Godeps/_workspace/src/github.com/coreos/pkg/LICENSE
deleted file mode 100644
index e06d208186..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/pkg/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/NOTICE b/Godeps/_workspace/src/github.com/coreos/pkg/NOTICE
deleted file mode 100644
index b39ddfa5cb..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/pkg/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-CoreOS Project
-Copyright 2014 CoreOS, Inc
-
-This product includes software developed at CoreOS, Inc.
-(http://www.coreos.com/).
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen.go b/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen.go
deleted file mode 100644
index 23774f612e..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package dlopen provides some convenience functions to dlopen a library and
-// get its symbols.
-package dlopen
-
-// #cgo LDFLAGS: -ldl
-// #include <stdlib.h>
-// #include <dlfcn.h>
-import "C"
-import (
-	"errors"
-	"fmt"
-	"unsafe"
-)
-
-var ErrSoNotFound = errors.New("unable to open a handle to the library")
-
-// LibHandle represents an open handle to a library (.so)
-type LibHandle struct {
-	Handle  unsafe.Pointer
-	Libname string
-}
-
-// GetHandle tries to get a handle to a library (.so), attempting to access it
-// by the names specified in libs and returning the first that is successfully
-// opened. Callers are responsible for closing the handler. If no library can
-// be successfully opened, an error is returned.
-func GetHandle(libs []string) (*LibHandle, error) {
-	for _, name := range libs {
-		libname := C.CString(name)
-		defer C.free(unsafe.Pointer(libname))
-		handle := C.dlopen(libname, C.RTLD_LAZY)
-		if handle != nil {
-			h := &LibHandle{
-				Handle:  handle,
-				Libname: name,
-			}
-			return h, nil
-		}
-	}
-	return nil, ErrSoNotFound
-}
-
-// GetSymbolPointer takes a symbol name and returns a pointer to the symbol.
-func (l *LibHandle) GetSymbolPointer(symbol string) (unsafe.Pointer, error) {
-	sym := C.CString(symbol)
-	defer C.free(unsafe.Pointer(sym))
-
-	C.dlerror()
-	p := C.dlsym(l.Handle, sym)
-	e := C.dlerror()
-	if e != nil {
-		return nil, fmt.Errorf("error resolving symbol %q: %v", symbol, errors.New(C.GoString(e)))
-	}
-
-	return p, nil
-}
-
-// Close closes a LibHandle.
-func (l *LibHandle) Close() error {
-	C.dlerror()
-	C.dlclose(l.Handle)
-	e := C.dlerror()
-	if e != nil {
-		return fmt.Errorf("error closing %v: %v", l.Libname, errors.New(C.GoString(e)))
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen_example.go b/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen_example.go
deleted file mode 100644
index 48a660104f..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/pkg/dlopen/dlopen_example.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// +build linux
-
-package dlopen
-
-// #include <string.h>
-// #include <stdlib.h>
-//
-// int
-// my_strlen(void *f, const char *s)
-// {
-//   size_t (*strlen)(const char *);
-//
-//   strlen = (size_t (*)(const char *))f;
-//   return strlen(s);
-// }
-import "C"
-
-import (
-	"fmt"
-	"unsafe"
-)
-
-func strlen(libs []string, s string) (int, error) {
-	h, err := GetHandle(libs)
-	if err != nil {
-		return -1, fmt.Errorf(`couldn't get a handle to the library: %v`, err)
-	}
-	defer h.Close()
-
-	f := "strlen"
-	cs := C.CString(s)
-	defer C.free(unsafe.Pointer(cs))
-
-	strlen, err := h.GetSymbolPointer(f)
-	if err != nil {
-		return -1, fmt.Errorf(`couldn't get symbol %q: %v`, f, err)
-	}
-
-	len := C.my_strlen(strlen, cs)
-
-	return int(len), nil
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go
deleted file mode 100644
index 04cd0dfa30..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/iocopy.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2016 CoreOS Inc
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package progressutil
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"sync"
-	"time"
-)
-
-var (
-	ErrAlreadyStarted = errors.New("cannot add copies after PrintAndWait has been called")
-)
-
-type copyReader struct {
-	reader  io.Reader
-	current int64
-	total   int64
-	pb      *ProgressBar
-}
-
-func (cr *copyReader) Read(p []byte) (int, error) {
-	n, err := cr.reader.Read(p)
-	cr.current += int64(n)
-	err1 := cr.updateProgressBar()
-	if err == nil {
-		err = err1
-	}
-	return n, err
-}
-
-func (cr *copyReader) updateProgressBar() error {
-	cr.pb.SetPrintAfter(cr.formattedProgress())
-
-	progress := float64(cr.current) / float64(cr.total)
-	if progress > 1 {
-		progress = 1
-	}
-	return cr.pb.SetCurrentProgress(progress)
-}
-
-// NewCopyProgressPrinter returns a new CopyProgressPrinter
-func NewCopyProgressPrinter() *CopyProgressPrinter {
-	return &CopyProgressPrinter{results: make(chan error), cancel: make(chan struct{})}
-}
-
-// CopyProgressPrinter will perform an arbitrary number of io.Copy calls, while
-// continually printing the progress of each copy.
-type CopyProgressPrinter struct {
-	results chan error
-	cancel  chan struct{}
-
-	// `lock` mutex protects all fields below it in CopyProgressPrinter struct
-	lock    sync.Mutex
-	readers []*copyReader
-	started bool
-	pbp     *ProgressBarPrinter
-}
-
-// AddCopy adds a copy for this CopyProgressPrinter to perform. An io.Copy call
-// will be made to copy bytes from reader to dest, and name and size will be
-// used to label the progress bar and display how much progress has been made.
-// If size is 0, the total size of the reader is assumed to be unknown.
-// AddCopy can only be called before PrintAndWait; otherwise, ErrAlreadyStarted
-// will be returned.
-func (cpp *CopyProgressPrinter) AddCopy(reader io.Reader, name string, size int64, dest io.Writer) error {
-	cpp.lock.Lock()
-	defer cpp.lock.Unlock()
-
-	if cpp.started {
-		return ErrAlreadyStarted
-	}
-	if cpp.pbp == nil {
-		cpp.pbp = &ProgressBarPrinter{}
-		cpp.pbp.PadToBeEven = true
-	}
-
-	cr := &copyReader{
-		reader:  reader,
-		current: 0,
-		total:   size,
-		pb:      cpp.pbp.AddProgressBar(),
-	}
-	cr.pb.SetPrintBefore(name)
-	cr.pb.SetPrintAfter(cr.formattedProgress())
-
-	cpp.readers = append(cpp.readers, cr)
-
-	go func() {
-		_, err := io.Copy(dest, cr)
-		select {
-		case <-cpp.cancel:
-			return
-		case cpp.results <- err:
-			return
-		}
-	}()
-	return nil
-}
-
-// PrintAndWait will print the progress for each copy operation added with
-// AddCopy to printTo every printInterval. This will continue until every added
-// copy is finished, or until cancel is written to.
-// PrintAndWait may only be called once; any subsequent calls will immediately
-// return ErrAlreadyStarted.  After PrintAndWait has been called, no more
-// copies may be added to the CopyProgressPrinter.
-func (cpp *CopyProgressPrinter) PrintAndWait(printTo io.Writer, printInterval time.Duration, cancel chan struct{}) error {
-	cpp.lock.Lock()
-	if cpp.started {
-		cpp.lock.Unlock()
-		return ErrAlreadyStarted
-	}
-	cpp.started = true
-	cpp.lock.Unlock()
-
-	n := len(cpp.readers)
-	if n == 0 {
-		// Nothing to do.
-		return nil
-	}
-
-	defer close(cpp.cancel)
-	t := time.NewTicker(printInterval)
-	allDone := false
-	for i := 0; i < n; {
-		select {
-		case <-cancel:
-			return nil
-		case <-t.C:
-			_, err := cpp.pbp.Print(printTo)
-			if err != nil {
-				return err
-			}
-		case err := <-cpp.results:
-			i++
-			// Once completion is signaled, further on this just drains
-			// (unlikely) errors from the channel.
-			if err == nil && !allDone {
-				allDone, err = cpp.pbp.Print(printTo)
-			}
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (cr *copyReader) formattedProgress() string {
-	var totalStr string
-	if cr.total == 0 {
-		totalStr = "?"
-	} else {
-		totalStr = ByteUnitStr(cr.total)
-	}
-	return fmt.Sprintf("%s / %s", ByteUnitStr(cr.current), totalStr)
-}
-
-var byteUnits = []string{"B", "KB", "MB", "GB", "TB", "PB"}
-
-// ByteUnitStr pretty prints a number of bytes.
-func ByteUnitStr(n int64) string {
-	var unit string
-	size := float64(n)
-	for i := 1; i < len(byteUnits); i++ {
-		if size < 1000 {
-			unit = byteUnits[i-1]
-			break
-		}
-
-		size = size / 1000
-	}
-
-	return fmt.Sprintf("%.3g %s", size, unit)
-}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go b/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go
deleted file mode 100644
index 224c124acd..0000000000
--- a/Godeps/_workspace/src/github.com/coreos/pkg/progressutil/progressbar.go
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright 2016 CoreOS Inc
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package progressutil
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"sync"
-
-	"golang.org/x/crypto/ssh/terminal"
-)
-
-var (
-	// ErrorProgressOutOfBounds is returned if the progress is set to a value
-	// not between 0 and 1.
-	ErrorProgressOutOfBounds = fmt.Errorf("progress is out of bounds (0 to 1)")
-
-	// ErrorNoBarsAdded is returned when no progress bars have been added to a
-	// ProgressBarPrinter before PrintAndWait is called.
-	ErrorNoBarsAdded = fmt.Errorf("AddProgressBar hasn't been called yet")
-)
-
-// ProgressBar represents one progress bar in a ProgressBarPrinter. Should not
-// be created directly, use the AddProgressBar on a ProgressBarPrinter to
-// create these.
-type ProgressBar struct {
-	lock sync.Mutex
-
-	currentProgress float64
-	printBefore     string
-	printAfter      string
-	done            bool
-}
-
-func (pb *ProgressBar) clone() *ProgressBar {
-	pb.lock.Lock()
-	pbClone := &ProgressBar{
-		currentProgress: pb.currentProgress,
-		printBefore:     pb.printBefore,
-		printAfter:      pb.printAfter,
-		done:            pb.done,
-	}
-	pb.lock.Unlock()
-	return pbClone
-}
-
-func (pb *ProgressBar) GetCurrentProgress() float64 {
-	pb.lock.Lock()
-	val := pb.currentProgress
-	pb.lock.Unlock()
-	return val
-}
-
-// SetCurrentProgress sets the progress of this ProgressBar. The progress must
-// be between 0 and 1 inclusive.
-func (pb *ProgressBar) SetCurrentProgress(progress float64) error {
-	if progress < 0 || progress > 1 {
-		return ErrorProgressOutOfBounds
-	}
-	pb.lock.Lock()
-	pb.currentProgress = progress
-	pb.lock.Unlock()
-	return nil
-}
-
-// GetDone returns whether or not this progress bar is done
-func (pb *ProgressBar) GetDone() bool {
-	pb.lock.Lock()
-	val := pb.done
-	pb.lock.Unlock()
-	return val
-}
-
-// SetDone sets whether or not this progress bar is done
-func (pb *ProgressBar) SetDone(val bool) {
-	pb.lock.Lock()
-	pb.done = val
-	pb.lock.Unlock()
-}
-
-// GetPrintBefore gets the text printed on the line before the progress bar.
-func (pb *ProgressBar) GetPrintBefore() string {
-	pb.lock.Lock()
-	val := pb.printBefore
-	pb.lock.Unlock()
-	return val
-}
-
-// SetPrintBefore sets the text printed on the line before the progress bar.
-func (pb *ProgressBar) SetPrintBefore(before string) {
-	pb.lock.Lock()
-	pb.printBefore = before
-	pb.lock.Unlock()
-}
-
-// GetPrintAfter gets the text printed on the line after the progress bar.
-func (pb *ProgressBar) GetPrintAfter() string {
-	pb.lock.Lock()
-	val := pb.printAfter
-	pb.lock.Unlock()
-	return val
-}
-
-// SetPrintAfter sets the text printed on the line after the progress bar.
-func (pb *ProgressBar) SetPrintAfter(after string) {
-	pb.lock.Lock()
-	pb.printAfter = after
-	pb.lock.Unlock()
-}
-
-// ProgressBarPrinter will print out the progress of some number of
-// ProgressBars.
-type ProgressBarPrinter struct {
-	lock sync.Mutex
-
-	// DisplayWidth can be set to influence how large the progress bars are.
-	// The bars will be scaled to attempt to produce lines of this number of
-	// characters, but lines of different lengths may still be printed. When
-	// this value is 0 (aka unset), 80 character columns are assumed.
-	DisplayWidth int
-	// PadToBeEven, when set to true, will make Print pad the printBefore text
-	// with trailing spaces and the printAfter text with leading spaces to make
-	// the progress bars the same length.
-	PadToBeEven         bool
-	numLinesInLastPrint int
-	progressBars        []*ProgressBar
-	maxBefore           int
-	maxAfter            int
-}
-
-// AddProgressBar will create a new ProgressBar, register it with this
-// ProgressBarPrinter, and return it. This must be called at least once before
-// PrintAndWait is called.
-func (pbp *ProgressBarPrinter) AddProgressBar() *ProgressBar {
-	pb := &ProgressBar{}
-	pbp.lock.Lock()
-	pbp.progressBars = append(pbp.progressBars, pb)
-	pbp.lock.Unlock()
-	return pb
-}
-
-// Print will print out progress information for each ProgressBar that has been
-// added to this ProgressBarPrinter. The progress will be written to printTo,
-// and if printTo is a terminal it will draw progress bars.  AddProgressBar
-// must be called at least once before Print is called. If printing to a
-// terminal, all draws after the first one will move the cursor up to draw over
-// the previously printed bars.
-func (pbp *ProgressBarPrinter) Print(printTo io.Writer) (bool, error) {
-	pbp.lock.Lock()
-	var bars []*ProgressBar
-	for _, bar := range pbp.progressBars {
-		bars = append(bars, bar.clone())
-	}
-	numColumns := pbp.DisplayWidth
-	pbp.lock.Unlock()
-
-	if len(bars) == 0 {
-		return false, ErrorNoBarsAdded
-	}
-
-	if numColumns == 0 {
-		numColumns = 80
-	}
-
-	if isTerminal(printTo) {
-		moveCursorUp(printTo, pbp.numLinesInLastPrint)
-	}
-
-	for _, bar := range bars {
-		beforeSize := len(bar.GetPrintBefore())
-		afterSize := len(bar.GetPrintAfter())
-		if beforeSize > pbp.maxBefore {
-			pbp.maxBefore = beforeSize
-		}
-		if afterSize > pbp.maxAfter {
-			pbp.maxAfter = afterSize
-		}
-	}
-
-	allDone := true
-	for _, bar := range bars {
-		if isTerminal(printTo) {
-			bar.printToTerminal(printTo, numColumns, pbp.PadToBeEven, pbp.maxBefore, pbp.maxAfter)
-		} else {
-			bar.printToNonTerminal(printTo)
-		}
-		allDone = allDone && bar.GetCurrentProgress() == 1
-	}
-
-	pbp.numLinesInLastPrint = len(bars)
-
-	return allDone, nil
-}
-
-// moveCursorUp moves the cursor up numLines in the terminal
-func moveCursorUp(printTo io.Writer, numLines int) {
-	if numLines > 0 {
-		fmt.Fprintf(printTo, "\033[%dA", numLines)
-	}
-}
-
-func (pb *ProgressBar) printToTerminal(printTo io.Writer, numColumns int, padding bool, maxBefore, maxAfter int) {
-	before := pb.GetPrintBefore()
-	after := pb.GetPrintAfter()
-
-	if padding {
-		before = before + strings.Repeat(" ", maxBefore-len(before))
-		after = strings.Repeat(" ", maxAfter-len(after)) + after
-	}
-
-	progressBarSize := numColumns - (len(fmt.Sprintf("%s [] %s", before, after)))
-	progressBar := ""
-	if progressBarSize > 0 {
-		currentProgress := int(pb.GetCurrentProgress() * float64(progressBarSize))
-		progressBar = fmt.Sprintf("[%s%s] ",
-			strings.Repeat("=", currentProgress),
-			strings.Repeat(" ", progressBarSize-currentProgress))
-	} else {
-		// If we can't fit the progress bar, better to not pad the before/after.
-		before = pb.GetPrintBefore()
-		after = pb.GetPrintAfter()
-	}
-
-	fmt.Fprintf(printTo, "%s %s%s\n", before, progressBar, after)
-}
-
-func (pb *ProgressBar) printToNonTerminal(printTo io.Writer) {
-	if !pb.GetDone() {
-		fmt.Fprintf(printTo, "%s %s\n", pb.printBefore, pb.printAfter)
-		if pb.GetCurrentProgress() == 1 {
-			pb.SetDone(true)
-		}
-	}
-}
-
-// isTerminal returns True when w is going to a tty, and false otherwise.
-func isTerminal(w io.Writer) bool {
-	if f, ok := w.(*os.File); ok {
-		return terminal.IsTerminal(int(f.Fd()))
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/LICENSE.md b/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/LICENSE.md
deleted file mode 100644
index 1cade6cef6..0000000000
--- a/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Brian Goff
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/md2man.go b/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/md2man.go
deleted file mode 100644
index 8f44fa1550..0000000000
--- a/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/md2man.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package md2man
-
-import (
-	"github.com/russross/blackfriday"
-)
-
-func Render(doc []byte) []byte {
-	renderer := RoffRenderer(0)
-	extensions := 0
-	extensions |= blackfriday.EXTENSION_NO_INTRA_EMPHASIS
-	extensions |= blackfriday.EXTENSION_TABLES
-	extensions |= blackfriday.EXTENSION_FENCED_CODE
-	extensions |= blackfriday.EXTENSION_AUTOLINK
-	extensions |= blackfriday.EXTENSION_SPACE_HEADERS
-	extensions |= blackfriday.EXTENSION_FOOTNOTES
-	extensions |= blackfriday.EXTENSION_TITLEBLOCK
-
-	return blackfriday.Markdown(doc, renderer, extensions)
-}
diff --git a/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/roff.go b/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/roff.go
deleted file mode 100644
index 4478786b7b..0000000000
--- a/Godeps/_workspace/src/github.com/cpuguy83/go-md2man/md2man/roff.go
+++ /dev/null
@@ -1,269 +0,0 @@
-package md2man
-
-import (
-	"bytes"
-	"fmt"
-	"html"
-	"strings"
-
-	"github.com/russross/blackfriday"
-)
-
-type roffRenderer struct{}
-
-func RoffRenderer(flags int) blackfriday.Renderer {
-	return &roffRenderer{}
-}
-
-func (r *roffRenderer) GetFlags() int {
-	return 0
-}
-
-func (r *roffRenderer) TitleBlock(out *bytes.Buffer, text []byte) {
-	out.WriteString(".TH ")
-
-	splitText := bytes.Split(text, []byte("\n"))
-	for i, line := range splitText {
-		line = bytes.TrimPrefix(line, []byte("% "))
-		if i == 0 {
-			line = bytes.Replace(line, []byte("("), []byte("\" \""), 1)
-			line = bytes.Replace(line, []byte(")"), []byte("\" \""), 1)
-		}
-		line = append([]byte("\""), line...)
-		line = append(line, []byte("\" ")...)
-		out.Write(line)
-	}
-
-	out.WriteString(" \"\"\n")
-}
-
-func (r *roffRenderer) BlockCode(out *bytes.Buffer, text []byte, lang string) {
-	out.WriteString("\n.PP\n.RS\n\n.nf\n")
-	escapeSpecialChars(out, text)
-	out.WriteString("\n.fi\n.RE\n")
-}
-
-func (r *roffRenderer) BlockQuote(out *bytes.Buffer, text []byte) {
-	out.WriteString("\n.PP\n.RS\n")
-	out.Write(text)
-	out.WriteString("\n.RE\n")
-}
-
-func (r *roffRenderer) BlockHtml(out *bytes.Buffer, text []byte) {
-	out.Write(text)
-}
-
-func (r *roffRenderer) Header(out *bytes.Buffer, text func() bool, level int, id string) {
-	marker := out.Len()
-
-	switch {
-	case marker == 0:
-		// This is the doc header
-		out.WriteString(".TH ")
-	case level == 1:
-		out.WriteString("\n\n.SH ")
-	case level == 2:
-		out.WriteString("\n.SH ")
-	default:
-		out.WriteString("\n.SS ")
-	}
-
-	if !text() {
-		out.Truncate(marker)
-		return
-	}
-}
-
-func (r *roffRenderer) HRule(out *bytes.Buffer) {
-	out.WriteString("\n.ti 0\n\\l'\\n(.lu'\n")
-}
-
-func (r *roffRenderer) List(out *bytes.Buffer, text func() bool, flags int) {
-	marker := out.Len()
-	out.WriteString(".IP ")
-	if flags&blackfriday.LIST_TYPE_ORDERED != 0 {
-		out.WriteString("\\(bu 2")
-	} else {
-		out.WriteString("\\n+[step" + string(flags) + "]")
-	}
-	out.WriteString("\n")
-	if !text() {
-		out.Truncate(marker)
-		return
-	}
-
-}
-
-func (r *roffRenderer) ListItem(out *bytes.Buffer, text []byte, flags int) {
-	out.WriteString("\n\\item ")
-	out.Write(text)
-}
-
-func (r *roffRenderer) Paragraph(out *bytes.Buffer, text func() bool) {
-	marker := out.Len()
-	out.WriteString("\n.PP\n")
-	if !text() {
-		out.Truncate(marker)
-		return
-	}
-	if marker != 0 {
-		out.WriteString("\n")
-	}
-}
-
-// TODO: This might now work
-func (r *roffRenderer) Table(out *bytes.Buffer, header []byte, body []byte, columnData []int) {
-	out.WriteString(".TS\nallbox;\n")
-
-	out.Write(header)
-	out.Write(body)
-	out.WriteString("\n.TE\n")
-}
-
-func (r *roffRenderer) TableRow(out *bytes.Buffer, text []byte) {
-	if out.Len() > 0 {
-		out.WriteString("\n")
-	}
-	out.Write(text)
-	out.WriteString("\n")
-}
-
-func (r *roffRenderer) TableHeaderCell(out *bytes.Buffer, text []byte, align int) {
-	if out.Len() > 0 {
-		out.WriteString(" ")
-	}
-	out.Write(text)
-	out.WriteString(" ")
-}
-
-// TODO: This is probably broken
-func (r *roffRenderer) TableCell(out *bytes.Buffer, text []byte, align int) {
-	if out.Len() > 0 {
-		out.WriteString("\t")
-	}
-	out.Write(text)
-	out.WriteString("\t")
-}
-
-func (r *roffRenderer) Footnotes(out *bytes.Buffer, text func() bool) {
-
-}
-
-func (r *roffRenderer) FootnoteItem(out *bytes.Buffer, name, text []byte, flags int) {
-
-}
-
-func (r *roffRenderer) AutoLink(out *bytes.Buffer, link []byte, kind int) {
-	out.WriteString("\n\\[la]")
-	out.Write(link)
-	out.WriteString("\\[ra]")
-}
-
-func (r *roffRenderer) CodeSpan(out *bytes.Buffer, text []byte) {
-	out.WriteString("\\fB\\fC")
-	escapeSpecialChars(out, text)
-	out.WriteString("\\fR")
-}
-
-func (r *roffRenderer) DoubleEmphasis(out *bytes.Buffer, text []byte) {
-	out.WriteString("\\fB")
-	out.Write(text)
-	out.WriteString("\\fP")
-}
-
-func (r *roffRenderer) Emphasis(out *bytes.Buffer, text []byte) {
-	out.WriteString("\\fI")
-	out.Write(text)
-	out.WriteString("\\fP")
-}
-
-func (r *roffRenderer) Image(out *bytes.Buffer, link []byte, title []byte, alt []byte) {
-}
-
-func (r *roffRenderer) LineBreak(out *bytes.Buffer) {
-	out.WriteString("\n.br\n")
-}
-
-func (r *roffRenderer) Link(out *bytes.Buffer, link []byte, title []byte, content []byte) {
-	r.AutoLink(out, link, 0)
-}
-
-func (r *roffRenderer) RawHtmlTag(out *bytes.Buffer, tag []byte) {
-	out.Write(tag)
-}
-
-func (r *roffRenderer) TripleEmphasis(out *bytes.Buffer, text []byte) {
-	out.WriteString("\\s+2")
-	out.Write(text)
-	out.WriteString("\\s-2")
-}
-
-func (r *roffRenderer) StrikeThrough(out *bytes.Buffer, text []byte) {
-}
-
-func (r *roffRenderer) FootnoteRef(out *bytes.Buffer, ref []byte, id int) {
-
-}
-
-func (r *roffRenderer) Entity(out *bytes.Buffer, entity []byte) {
-	out.WriteString(html.UnescapeString(string(entity)))
-}
-
-func processFooterText(text []byte) []byte {
-	text = bytes.TrimPrefix(text, []byte("% "))
-	newText := []byte{}
-	textArr := strings.Split(string(text), ") ")
-
-	for i, w := range textArr {
-		if i == 0 {
-			w = strings.Replace(w, "(", "\" \"", 1)
-			w = fmt.Sprintf("\"%s\"", w)
-		} else {
-			w = fmt.Sprintf(" \"%s\"", w)
-		}
-		newText = append(newText, []byte(w)...)
-	}
-	newText = append(newText, []byte(" \"\"")...)
-
-	return newText
-}
-
-func (r *roffRenderer) NormalText(out *bytes.Buffer, text []byte) {
-	escapeSpecialChars(out, text)
-}
-
-func (r *roffRenderer) DocumentHeader(out *bytes.Buffer) {
-}
-
-func (r *roffRenderer) DocumentFooter(out *bytes.Buffer) {
-}
-
-func needsBackslash(c byte) bool {
-	for _, r := range []byte("-_&\\~") {
-		if c == r {
-			return true
-		}
-	}
-	return false
-}
-
-func escapeSpecialChars(out *bytes.Buffer, text []byte) {
-	for i := 0; i < len(text); i++ {
-		// directly copy normal characters
-		org := i
-
-		for i < len(text) && !needsBackslash(text[i]) {
-			i++
-		}
-		if i > org {
-			out.Write(text[org:i])
-		}
-
-		// escape a character
-		if i >= len(text) {
-			break
-		}
-		out.WriteByte('\\')
-		out.WriteByte(text[i])
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/b/AUTHORS b/Godeps/_workspace/src/github.com/cznic/b/AUTHORS
deleted file mode 100644
index 0078f5f5b6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/b/AUTHORS
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/b/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/b/CONTRIBUTORS
deleted file mode 100644
index 094c323ef2..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/b/CONTRIBUTORS
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Brian Fallik <bfallik@gmail.com>
-Dan Kortschak <dan.kortschak@adelaide.edu.au>
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/b/LICENSE b/Godeps/_workspace/src/github.com/cznic/b/LICENSE
deleted file mode 100644
index 54c6e90872..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/b/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The b Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/b/Makefile b/Godeps/_workspace/src/github.com/cznic/b/Makefile
deleted file mode 100644
index b02c86dbef..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/b/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2014 The b Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-.PHONY: all todo clean cover generic mem nuke cpu
-
-testbin=b.test
-
-all: editor
-	go build
-	go vet
-	golint .
-	go install
-	make todo
-
-editor:
-	gofmt -l -s -w .
-	go test -i
-	go test
-
-clean:
-	@go clean
-	rm -f *~ *.out $(testbin)
-
-cover:
-	t=$(shell tempfile) ; go test -coverprofile $$t && go tool cover -html $$t && unlink $$t
-
-cpu:
-	go test -c
-	./$(testbin) -test.cpuprofile cpu.out
-	go tool pprof --lines $(testbin) cpu.out
-
-generic:
-	@# writes to stdout a version where the type of key is KEY and the type
-	@# of value is VALUE.
-	@#
-	@# Intended use is to replace all textual occurrences of KEY or VALUE in
-	@# the output with your desired types.
-	@sed -e 's|interface{}[^{]*/\*K\*/|KEY|g' -e 's|interface{}[^{]*/\*V\*/|VALUE|g' btree.go
-
-mem:
-	go test -c
-	./$(testbin) -test.bench . -test.memprofile mem.out -test.memprofilerate 1
-	go tool pprof --lines --web --alloc_space $(testbin) mem.out
-
-nuke: clean
-	rm -f *.test *.out
-
-todo:
-	@grep -n ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* *.go || true
-	@grep -n TODO *.go || true
-	@grep -n BUG *.go || true
-	@grep -n println *.go || true
diff --git a/Godeps/_workspace/src/github.com/cznic/b/README.md b/Godeps/_workspace/src/github.com/cznic/b/README.md
deleted file mode 100644
index 5a2d803026..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/b/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-b
-=
-
-Package b implements a B+tree.
-
-Installation:
-
-    $ go get github.com/cznic/b
-
-Documentation: [godoc.org/github.com/cznic/b](http://godoc.org/github.com/cznic/b)
diff --git a/Godeps/_workspace/src/github.com/cznic/b/btree.go b/Godeps/_workspace/src/github.com/cznic/b/btree.go
deleted file mode 100644
index 18cbeb8b05..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/b/btree.go
+++ /dev/null
@@ -1,929 +0,0 @@
-// Copyright 2014 The b Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package b
-
-import (
-	"fmt"
-	"io"
-	"sync"
-)
-
-const (
-	kx = 32 //TODO benchmark tune this number if using custom key/value type(s).
-	kd = 32 //TODO benchmark tune this number if using custom key/value type(s).
-)
-
-func init() {
-	if kd < 1 {
-		panic(fmt.Errorf("kd %d: out of range", kd))
-	}
-
-	if kx < 2 {
-		panic(fmt.Errorf("kx %d: out of range", kx))
-	}
-}
-
-var (
-	btDPool = sync.Pool{New: func() interface{} { return &d{} }}
-	btEPool = btEpool{sync.Pool{New: func() interface{} { return &Enumerator{} }}}
-	btTPool = btTpool{sync.Pool{New: func() interface{} { return &Tree{} }}}
-	btXPool = sync.Pool{New: func() interface{} { return &x{} }}
-)
-
-type btTpool struct{ sync.Pool }
-
-func (p *btTpool) get(cmp Cmp) *Tree {
-	x := p.Get().(*Tree)
-	x.cmp = cmp
-	return x
-}
-
-type btEpool struct{ sync.Pool }
-
-func (p *btEpool) get(err error, hit bool, i int, k interface{} /*K*/, q *d, t *Tree, ver int64) *Enumerator {
-	x := p.Get().(*Enumerator)
-	x.err, x.hit, x.i, x.k, x.q, x.t, x.ver = err, hit, i, k, q, t, ver
-	return x
-}
-
-type (
-	// Cmp compares a and b. Return value is:
-	//
-	//	< 0 if a <  b
-	//	  0 if a == b
-	//	> 0 if a >  b
-	//
-	Cmp func(a, b interface{} /*K*/) int
-
-	d struct { // data page
-		c int
-		d [2*kd + 1]de
-		n *d
-		p *d
-	}
-
-	de struct { // d element
-		k interface{} /*K*/
-		v interface{} /*V*/
-	}
-
-	// Enumerator captures the state of enumerating a tree. It is returned
-	// from the Seek* methods. The enumerator is aware of any mutations
-	// made to the tree in the process of enumerating it and automatically
-	// resumes the enumeration at the proper key, if possible.
-	//
-	// However, once an Enumerator returns io.EOF to signal "no more
-	// items", it does no more attempt to "resync" on tree mutation(s).  In
-	// other words, io.EOF from an Enumaretor is "sticky" (idempotent).
-	Enumerator struct {
-		err error
-		hit bool
-		i   int
-		k   interface{} /*K*/
-		q   *d
-		t   *Tree
-		ver int64
-	}
-
-	// Tree is a B+tree.
-	Tree struct {
-		c     int
-		cmp   Cmp
-		first *d
-		last  *d
-		r     interface{}
-		ver   int64
-	}
-
-	xe struct { // x element
-		ch interface{}
-		k  interface{} /*K*/
-	}
-
-	x struct { // index page
-		c int
-		x [2*kx + 2]xe
-	}
-)
-
-var ( // R/O zero values
-	zd  d
-	zde de
-	ze  Enumerator
-	zk  interface{} /*K*/
-	zt  Tree
-	zx  x
-	zxe xe
-)
-
-func clr(q interface{}) {
-	switch x := q.(type) {
-	case *x:
-		for i := 0; i <= x.c; i++ { // Ch0 Sep0 ... Chn-1 Sepn-1 Chn
-			clr(x.x[i].ch)
-		}
-		*x = zx
-		btXPool.Put(x)
-	case *d:
-		*x = zd
-		btDPool.Put(x)
-	}
-}
-
-// -------------------------------------------------------------------------- x
-
-func newX(ch0 interface{}) *x {
-	r := btXPool.Get().(*x)
-	r.x[0].ch = ch0
-	return r
-}
-
-func (q *x) extract(i int) {
-	q.c--
-	if i < q.c {
-		copy(q.x[i:], q.x[i+1:q.c+1])
-		q.x[q.c].ch = q.x[q.c+1].ch
-		q.x[q.c].k = zk  // GC
-		q.x[q.c+1] = zxe // GC
-	}
-}
-
-func (q *x) insert(i int, k interface{} /*K*/, ch interface{}) *x {
-	c := q.c
-	if i < c {
-		q.x[c+1].ch = q.x[c].ch
-		copy(q.x[i+2:], q.x[i+1:c])
-		q.x[i+1].k = q.x[i].k
-	}
-	c++
-	q.c = c
-	q.x[i].k = k
-	q.x[i+1].ch = ch
-	return q
-}
-
-func (q *x) siblings(i int) (l, r *d) {
-	if i >= 0 {
-		if i > 0 {
-			l = q.x[i-1].ch.(*d)
-		}
-		if i < q.c {
-			r = q.x[i+1].ch.(*d)
-		}
-	}
-	return
-}
-
-// -------------------------------------------------------------------------- d
-
-func (l *d) mvL(r *d, c int) {
-	copy(l.d[l.c:], r.d[:c])
-	copy(r.d[:], r.d[c:r.c])
-	l.c += c
-	r.c -= c
-}
-
-func (l *d) mvR(r *d, c int) {
-	copy(r.d[c:], r.d[:r.c])
-	copy(r.d[:c], l.d[l.c-c:])
-	r.c += c
-	l.c -= c
-}
-
-// ----------------------------------------------------------------------- Tree
-
-// TreeNew returns a newly created, empty Tree. The compare function is used
-// for key collation.
-func TreeNew(cmp Cmp) *Tree {
-	return btTPool.get(cmp)
-}
-
-// Clear removes all K/V pairs from the tree.
-func (t *Tree) Clear() {
-	if t.r == nil {
-		return
-	}
-
-	clr(t.r)
-	t.c, t.first, t.last, t.r = 0, nil, nil, nil
-	t.ver++
-}
-
-// Close performs Clear and recycles t to a pool for possible later reuse. No
-// references to t should exist or such references must not be used afterwards.
-func (t *Tree) Close() {
-	t.Clear()
-	*t = zt
-	btTPool.Put(t)
-}
-
-func (t *Tree) cat(p *x, q, r *d, pi int) {
-	t.ver++
-	q.mvL(r, r.c)
-	if r.n != nil {
-		r.n.p = q
-	} else {
-		t.last = q
-	}
-	q.n = r.n
-	*r = zd
-	btDPool.Put(r)
-	if p.c > 1 {
-		p.extract(pi)
-		p.x[pi].ch = q
-		return
-	}
-
-	switch x := t.r.(type) {
-	case *x:
-		*x = zx
-		btXPool.Put(x)
-	case *d:
-		*x = zd
-		btDPool.Put(x)
-	}
-	t.r = q
-}
-
-func (t *Tree) catX(p, q, r *x, pi int) {
-	t.ver++
-	q.x[q.c].k = p.x[pi].k
-	copy(q.x[q.c+1:], r.x[:r.c])
-	q.c += r.c + 1
-	q.x[q.c].ch = r.x[r.c].ch
-	*r = zx
-	btXPool.Put(r)
-	if p.c > 1 {
-		p.c--
-		pc := p.c
-		if pi < pc {
-			p.x[pi].k = p.x[pi+1].k
-			copy(p.x[pi+1:], p.x[pi+2:pc+1])
-			p.x[pc].ch = p.x[pc+1].ch
-			p.x[pc].k = zk     // GC
-			p.x[pc+1].ch = nil // GC
-		}
-		return
-	}
-
-	switch x := t.r.(type) {
-	case *x:
-		*x = zx
-		btXPool.Put(x)
-	case *d:
-		*x = zd
-		btDPool.Put(x)
-	}
-	t.r = q
-}
-
-// Delete removes the k's KV pair, if it exists, in which case Delete returns
-// true.
-func (t *Tree) Delete(k interface{} /*K*/) (ok bool) {
-	pi := -1
-	var p *x
-	q := t.r
-	if q == nil {
-		return false
-	}
-
-	for {
-		var i int
-		i, ok = t.find(q, k)
-		if ok {
-			switch x := q.(type) {
-			case *x:
-				if x.c < kx && q != t.r {
-					x, i = t.underflowX(p, x, pi, i)
-				}
-				pi = i + 1
-				p = x
-				q = x.x[pi].ch
-				ok = false
-				continue
-			case *d:
-				t.extract(x, i)
-				if x.c >= kd {
-					return true
-				}
-
-				if q != t.r {
-					t.underflow(p, x, pi)
-				} else if t.c == 0 {
-					t.Clear()
-				}
-				return true
-			}
-		}
-
-		switch x := q.(type) {
-		case *x:
-			if x.c < kx && q != t.r {
-				x, i = t.underflowX(p, x, pi, i)
-			}
-			pi = i
-			p = x
-			q = x.x[i].ch
-		case *d:
-			return false
-		}
-	}
-}
-
-func (t *Tree) extract(q *d, i int) { // (r interface{} /*V*/) {
-	t.ver++
-	//r = q.d[i].v // prepared for Extract
-	q.c--
-	if i < q.c {
-		copy(q.d[i:], q.d[i+1:q.c+1])
-	}
-	q.d[q.c] = zde // GC
-	t.c--
-	return
-}
-
-func (t *Tree) find(q interface{}, k interface{} /*K*/) (i int, ok bool) {
-	var mk interface{} /*K*/
-	l := 0
-	switch x := q.(type) {
-	case *x:
-		h := x.c - 1
-		for l <= h {
-			m := (l + h) >> 1
-			mk = x.x[m].k
-			switch cmp := t.cmp(k, mk); {
-			case cmp > 0:
-				l = m + 1
-			case cmp == 0:
-				return m, true
-			default:
-				h = m - 1
-			}
-		}
-	case *d:
-		h := x.c - 1
-		for l <= h {
-			m := (l + h) >> 1
-			mk = x.d[m].k
-			switch cmp := t.cmp(k, mk); {
-			case cmp > 0:
-				l = m + 1
-			case cmp == 0:
-				return m, true
-			default:
-				h = m - 1
-			}
-		}
-	}
-	return l, false
-}
-
-// First returns the first item of the tree in the key collating order, or
-// (zero-value, zero-value) if the tree is empty.
-func (t *Tree) First() (k interface{} /*K*/, v interface{} /*V*/) {
-	if q := t.first; q != nil {
-		q := &q.d[0]
-		k, v = q.k, q.v
-	}
-	return
-}
-
-// Get returns the value associated with k and true if it exists. Otherwise Get
-// returns (zero-value, false).
-func (t *Tree) Get(k interface{} /*K*/) (v interface{} /*V*/, ok bool) {
-	q := t.r
-	if q == nil {
-		return
-	}
-
-	for {
-		var i int
-		if i, ok = t.find(q, k); ok {
-			switch x := q.(type) {
-			case *x:
-				q = x.x[i+1].ch
-				continue
-			case *d:
-				return x.d[i].v, true
-			}
-		}
-		switch x := q.(type) {
-		case *x:
-			q = x.x[i].ch
-		default:
-			return
-		}
-	}
-}
-
-func (t *Tree) insert(q *d, i int, k interface{} /*K*/, v interface{} /*V*/) *d {
-	t.ver++
-	c := q.c
-	if i < c {
-		copy(q.d[i+1:], q.d[i:c])
-	}
-	c++
-	q.c = c
-	q.d[i].k, q.d[i].v = k, v
-	t.c++
-	return q
-}
-
-// Last returns the last item of the tree in the key collating order, or
-// (zero-value, zero-value) if the tree is empty.
-func (t *Tree) Last() (k interface{} /*K*/, v interface{} /*V*/) {
-	if q := t.last; q != nil {
-		q := &q.d[q.c-1]
-		k, v = q.k, q.v
-	}
-	return
-}
-
-// Len returns the number of items in the tree.
-func (t *Tree) Len() int {
-	return t.c
-}
-
-func (t *Tree) overflow(p *x, q *d, pi, i int, k interface{} /*K*/, v interface{} /*V*/) {
-	t.ver++
-	l, r := p.siblings(pi)
-
-	if l != nil && l.c < 2*kd {
-		l.mvL(q, 1)
-		t.insert(q, i-1, k, v)
-		p.x[pi-1].k = q.d[0].k
-		return
-	}
-
-	if r != nil && r.c < 2*kd {
-		if i < 2*kd {
-			q.mvR(r, 1)
-			t.insert(q, i, k, v)
-			p.x[pi].k = r.d[0].k
-			return
-		}
-
-		t.insert(r, 0, k, v)
-		p.x[pi].k = k
-		return
-	}
-
-	t.split(p, q, pi, i, k, v)
-}
-
-// Seek returns an Enumerator positioned on a an item such that k >= item's
-// key. ok reports if k == item.key The Enumerator's position is possibly
-// after the last item in the tree.
-func (t *Tree) Seek(k interface{} /*K*/) (e *Enumerator, ok bool) {
-	q := t.r
-	if q == nil {
-		e = btEPool.get(nil, false, 0, k, nil, t, t.ver)
-		return
-	}
-
-	for {
-		var i int
-		if i, ok = t.find(q, k); ok {
-			switch x := q.(type) {
-			case *x:
-				q = x.x[i+1].ch
-				continue
-			case *d:
-				return btEPool.get(nil, ok, i, k, x, t, t.ver), true
-			}
-		}
-
-		switch x := q.(type) {
-		case *x:
-			q = x.x[i].ch
-		case *d:
-			return btEPool.get(nil, ok, i, k, x, t, t.ver), false
-		}
-	}
-}
-
-// SeekFirst returns an enumerator positioned on the first KV pair in the tree,
-// if any. For an empty tree, err == io.EOF is returned and e will be nil.
-func (t *Tree) SeekFirst() (e *Enumerator, err error) {
-	q := t.first
-	if q == nil {
-		return nil, io.EOF
-	}
-
-	return btEPool.get(nil, true, 0, q.d[0].k, q, t, t.ver), nil
-}
-
-// SeekLast returns an enumerator positioned on the last KV pair in the tree,
-// if any. For an empty tree, err == io.EOF is returned and e will be nil.
-func (t *Tree) SeekLast() (e *Enumerator, err error) {
-	q := t.last
-	if q == nil {
-		return nil, io.EOF
-	}
-
-	return btEPool.get(nil, true, q.c-1, q.d[q.c-1].k, q, t, t.ver), nil
-}
-
-// Set sets the value associated with k.
-func (t *Tree) Set(k interface{} /*K*/, v interface{} /*V*/) {
-	//dbg("--- PRE Set(%v, %v)\n%s", k, v, t.dump())
-	//defer func() {
-	//	dbg("--- POST\n%s\n====\n", t.dump())
-	//}()
-
-	pi := -1
-	var p *x
-	q := t.r
-	if q == nil {
-		z := t.insert(btDPool.Get().(*d), 0, k, v)
-		t.r, t.first, t.last = z, z, z
-		return
-	}
-
-	for {
-		i, ok := t.find(q, k)
-		if ok {
-			switch x := q.(type) {
-			case *x:
-				if x.c > 2*kx {
-					x, i = t.splitX(p, x, pi, i)
-				}
-				pi = i + 1
-				p = x
-				q = x.x[i+1].ch
-				continue
-			case *d:
-				x.d[i].v = v
-			}
-			return
-		}
-
-		switch x := q.(type) {
-		case *x:
-			if x.c > 2*kx {
-				x, i = t.splitX(p, x, pi, i)
-			}
-			pi = i
-			p = x
-			q = x.x[i].ch
-		case *d:
-			switch {
-			case x.c < 2*kd:
-				t.insert(x, i, k, v)
-			default:
-				t.overflow(p, x, pi, i, k, v)
-			}
-			return
-		}
-	}
-}
-
-// Put combines Get and Set in a more efficient way where the tree is walked
-// only once. The upd(ater) receives (old-value, true) if a KV pair for k
-// exists or (zero-value, false) otherwise. It can then return a (new-value,
-// true) to create or overwrite the existing value in the KV pair, or
-// (whatever, false) if it decides not to create or not to update the value of
-// the KV pair.
-//
-// 	tree.Set(k, v) call conceptually equals calling
-//
-// 	tree.Put(k, func(interface{} /*K*/, bool){ return v, true })
-//
-// modulo the differing return values.
-func (t *Tree) Put(k interface{} /*K*/, upd func(oldV interface{} /*V*/, exists bool) (newV interface{} /*V*/, write bool)) (oldV interface{} /*V*/, written bool) {
-	pi := -1
-	var p *x
-	q := t.r
-	var newV interface{} /*V*/
-	if q == nil {
-		// new KV pair in empty tree
-		newV, written = upd(newV, false)
-		if !written {
-			return
-		}
-
-		z := t.insert(btDPool.Get().(*d), 0, k, newV)
-		t.r, t.first, t.last = z, z, z
-		return
-	}
-
-	for {
-		i, ok := t.find(q, k)
-		if ok {
-			switch x := q.(type) {
-			case *x:
-				if x.c > 2*kx {
-					x, i = t.splitX(p, x, pi, i)
-				}
-				pi = i + 1
-				p = x
-				q = x.x[i+1].ch
-				continue
-			case *d:
-				oldV = x.d[i].v
-				newV, written = upd(oldV, true)
-				if !written {
-					return
-				}
-
-				x.d[i].v = newV
-			}
-			return
-		}
-
-		switch x := q.(type) {
-		case *x:
-			if x.c > 2*kx {
-				x, i = t.splitX(p, x, pi, i)
-			}
-			pi = i
-			p = x
-			q = x.x[i].ch
-		case *d: // new KV pair
-			newV, written = upd(newV, false)
-			if !written {
-				return
-			}
-
-			switch {
-			case x.c < 2*kd:
-				t.insert(x, i, k, newV)
-			default:
-				t.overflow(p, x, pi, i, k, newV)
-			}
-			return
-		}
-	}
-}
-
-func (t *Tree) split(p *x, q *d, pi, i int, k interface{} /*K*/, v interface{} /*V*/) {
-	t.ver++
-	r := btDPool.Get().(*d)
-	if q.n != nil {
-		r.n = q.n
-		r.n.p = r
-	} else {
-		t.last = r
-	}
-	q.n = r
-	r.p = q
-
-	copy(r.d[:], q.d[kd:2*kd])
-	for i := range q.d[kd:] {
-		q.d[kd+i] = zde
-	}
-	q.c = kd
-	r.c = kd
-	var done bool
-	if i > kd {
-		done = true
-		t.insert(r, i-kd, k, v)
-	}
-	if pi >= 0 {
-		p.insert(pi, r.d[0].k, r)
-	} else {
-		t.r = newX(q).insert(0, r.d[0].k, r)
-	}
-	if done {
-		return
-	}
-
-	t.insert(q, i, k, v)
-}
-
-func (t *Tree) splitX(p *x, q *x, pi int, i int) (*x, int) {
-	t.ver++
-	r := btXPool.Get().(*x)
-	copy(r.x[:], q.x[kx+1:])
-	q.c = kx
-	r.c = kx
-	if pi >= 0 {
-		p.insert(pi, q.x[kx].k, r)
-		q.x[kx].k = zk
-		for i := range q.x[kx+1:] {
-			q.x[kx+i+1] = zxe
-		}
-
-		switch {
-		case i < kx:
-			return q, i
-		case i == kx:
-			return p, pi
-		default: // i > kx
-			return r, i - kx - 1
-		}
-	}
-
-	nr := newX(q).insert(0, q.x[kx].k, r)
-	t.r = nr
-	q.x[kx].k = zk
-	for i := range q.x[kx+1:] {
-		q.x[kx+i+1] = zxe
-	}
-
-	switch {
-	case i < kx:
-		return q, i
-	case i == kx:
-		return nr, 0
-	default: // i > kx
-		return r, i - kx - 1
-	}
-}
-
-func (t *Tree) underflow(p *x, q *d, pi int) {
-	t.ver++
-	l, r := p.siblings(pi)
-
-	if l != nil && l.c+q.c >= 2*kd {
-		l.mvR(q, 1)
-		p.x[pi-1].k = q.d[0].k
-		return
-	}
-
-	if r != nil && q.c+r.c >= 2*kd {
-		q.mvL(r, 1)
-		p.x[pi].k = r.d[0].k
-		r.d[r.c] = zde // GC
-		return
-	}
-
-	if l != nil {
-		t.cat(p, l, q, pi-1)
-		return
-	}
-
-	t.cat(p, q, r, pi)
-}
-
-func (t *Tree) underflowX(p *x, q *x, pi int, i int) (*x, int) {
-	t.ver++
-	var l, r *x
-
-	if pi >= 0 {
-		if pi > 0 {
-			l = p.x[pi-1].ch.(*x)
-		}
-		if pi < p.c {
-			r = p.x[pi+1].ch.(*x)
-		}
-	}
-
-	if l != nil && l.c > kx {
-		q.x[q.c+1].ch = q.x[q.c].ch
-		copy(q.x[1:], q.x[:q.c])
-		q.x[0].ch = l.x[l.c].ch
-		q.x[0].k = p.x[pi-1].k
-		q.c++
-		i++
-		l.c--
-		p.x[pi-1].k = l.x[l.c].k
-		return q, i
-	}
-
-	if r != nil && r.c > kx {
-		q.x[q.c].k = p.x[pi].k
-		q.c++
-		q.x[q.c].ch = r.x[0].ch
-		p.x[pi].k = r.x[0].k
-		copy(r.x[:], r.x[1:r.c])
-		r.c--
-		rc := r.c
-		r.x[rc].ch = r.x[rc+1].ch
-		r.x[rc].k = zk
-		r.x[rc+1].ch = nil
-		return q, i
-	}
-
-	if l != nil {
-		i += l.c + 1
-		t.catX(p, l, q, pi-1)
-		q = l
-		return q, i
-	}
-
-	t.catX(p, q, r, pi)
-	return q, i
-}
-
-// ----------------------------------------------------------------- Enumerator
-
-// Close recycles e to a pool for possible later reuse. No references to e
-// should exist or such references must not be used afterwards.
-func (e *Enumerator) Close() {
-	*e = ze
-	btEPool.Put(e)
-}
-
-// Next returns the currently enumerated item, if it exists and moves to the
-// next item in the key collation order. If there is no item to return, err ==
-// io.EOF is returned.
-func (e *Enumerator) Next() (k interface{} /*K*/, v interface{} /*V*/, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	if e.ver != e.t.ver {
-		f, hit := e.t.Seek(e.k)
-		if !e.hit && hit {
-			if err = f.next(); err != nil {
-				return
-			}
-		}
-
-		*e = *f
-		f.Close()
-	}
-	if e.q == nil {
-		e.err, err = io.EOF, io.EOF
-		return
-	}
-
-	if e.i >= e.q.c {
-		if err = e.next(); err != nil {
-			return
-		}
-	}
-
-	i := e.q.d[e.i]
-	k, v = i.k, i.v
-	e.k, e.hit = k, false
-	e.next()
-	return
-}
-
-func (e *Enumerator) next() error {
-	if e.q == nil {
-		e.err = io.EOF
-		return io.EOF
-	}
-
-	switch {
-	case e.i < e.q.c-1:
-		e.i++
-	default:
-		if e.q, e.i = e.q.n, 0; e.q == nil {
-			e.err = io.EOF
-		}
-	}
-	return e.err
-}
-
-// Prev returns the currently enumerated item, if it exists and moves to the
-// previous item in the key collation order. If there is no item to return, err
-// == io.EOF is returned.
-func (e *Enumerator) Prev() (k interface{} /*K*/, v interface{} /*V*/, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	if e.ver != e.t.ver {
-		f, hit := e.t.Seek(e.k)
-		if !e.hit && hit {
-			if err = f.prev(); err != nil {
-				return
-			}
-		}
-
-		*e = *f
-		f.Close()
-	}
-	if e.q == nil {
-		e.err, err = io.EOF, io.EOF
-		return
-	}
-
-	if e.i >= e.q.c {
-		if err = e.next(); err != nil {
-			return
-		}
-	}
-
-	i := e.q.d[e.i]
-	k, v = i.k, i.v
-	e.k, e.hit = k, false
-	e.prev()
-	return
-}
-
-func (e *Enumerator) prev() error {
-	if e.q == nil {
-		e.err = io.EOF
-		return io.EOF
-	}
-
-	switch {
-	case e.i > 0:
-		e.i--
-	default:
-		if e.q = e.q.p; e.q == nil {
-			e.err = io.EOF
-			break
-		}
-
-		e.i = e.q.c - 1
-	}
-	return e.err
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/b/doc.go b/Godeps/_workspace/src/github.com/cznic/b/doc.go
deleted file mode 100644
index ddcf73704f..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/b/doc.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 The b Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package b implements the B+tree flavor of a BTree.
-//
-// Changelog
-//
-// 2014-06-26: Lower GC presure by recycling things.
-//
-// 2014-04-18: Added new method Put.
-//
-// Generic types
-//
-// Keys and their associated values are interface{} typed, similar to all of
-// the containers in the standard library.
-//
-// Semiautomatic production of a type specific variant of this package is
-// supported via
-//
-//	$ make generic
-//
-// This command will write to stdout a version of the btree.go file where every
-// key type occurrence is replaced by the word 'KEY' and every value type
-// occurrence is replaced by the word 'VALUE'. Then you have to replace these
-// tokens with your desired type(s), using any technique you're comfortable
-// with.
-//
-// This is how, for example, 'example/int.go' was created:
-//
-//	$ mkdir example
-//	$ make generic | sed -e 's/KEY/int/g' -e 's/VALUE/int/g' > example/int.go
-//
-// No other changes to int.go are necessary, it compiles just fine.
-//
-// Running the benchmarks for 1000 keys on a machine with Intel i5-4670 CPU @
-// 3.4GHz, Go release 1.4.2.
-//
-//	$ go test -bench 1e3 example/all_test.go example/int.go
-//	PASS
-//	BenchmarkSetSeq1e3	   10000	    151620 ns/op
-//	BenchmarkGetSeq1e3	   10000	    115354 ns/op
-//	BenchmarkSetRnd1e3	    5000	    255865 ns/op
-//	BenchmarkGetRnd1e3	   10000	    140466 ns/op
-//	BenchmarkDelSeq1e3	   10000	    143860 ns/op
-//	BenchmarkDelRnd1e3	   10000	    188228 ns/op
-//	BenchmarkSeekSeq1e3	   10000	    156448 ns/op
-//	BenchmarkSeekRnd1e3	   10000	    190587 ns/op
-//	BenchmarkNext1e3	  200000	      9407 ns/op
-//	BenchmarkPrev1e3	  200000	      9306 ns/op
-//	ok  	command-line-arguments	26.369s
-//	$
-package b
diff --git a/Godeps/_workspace/src/github.com/cznic/b/example/Makefile b/Godeps/_workspace/src/github.com/cznic/b/example/Makefile
deleted file mode 100644
index 6c0f1856d9..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/b/example/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2014 The b Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-.PHONY: all todo clean cover mem
-
-testbin=b.test
-
-all: editor
-	go build
-	go vet
-	make todo
-
-editor:
-	go fmt
-	go test -i
-	go test
-
-mem:
-	go test -c
-	./$(testbin) -test.bench . -test.memprofile mem.out -test.memprofilerate 1
-	go tool pprof --lines --web --alloc_space $(testbin) mem.out
-
-todo:
-	@grep -n ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* *.go || true
-	@grep -n TODO *.go || true
-	@grep -n BUG *.go || true
-	@grep -n println *.go || true
-
-clean:
-	@go clean
-	rm -f *~
-
-cover:
-	t=$(shell tempfile) ; go test -coverprofile $$t && go tool cover -html $$t && unlink $$t
diff --git a/Godeps/_workspace/src/github.com/cznic/b/example/int.go b/Godeps/_workspace/src/github.com/cznic/b/example/int.go
deleted file mode 100644
index 54f7fdffdd..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/b/example/int.go
+++ /dev/null
@@ -1,929 +0,0 @@
-// Copyright 2014 The b Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package b
-
-import (
-	"fmt"
-	"io"
-	"sync"
-)
-
-const (
-	kx = 32 //TODO benchmark tune this number if using custom key/value type(s).
-	kd = 32 //TODO benchmark tune this number if using custom key/value type(s).
-)
-
-func init() {
-	if kd < 1 {
-		panic(fmt.Errorf("kd %d: out of range", kd))
-	}
-
-	if kx < 2 {
-		panic(fmt.Errorf("kx %d: out of range", kx))
-	}
-}
-
-var (
-	btDPool = sync.Pool{New: func() interface{} { return &d{} }}
-	btEPool = btEpool{sync.Pool{New: func() interface{} { return &Enumerator{} }}}
-	btTPool = btTpool{sync.Pool{New: func() interface{} { return &Tree{} }}}
-	btXPool = sync.Pool{New: func() interface{} { return &x{} }}
-)
-
-type btTpool struct{ sync.Pool }
-
-func (p *btTpool) get(cmp Cmp) *Tree {
-	x := p.Get().(*Tree)
-	x.cmp = cmp
-	return x
-}
-
-type btEpool struct{ sync.Pool }
-
-func (p *btEpool) get(err error, hit bool, i int, k int, q *d, t *Tree, ver int64) *Enumerator {
-	x := p.Get().(*Enumerator)
-	x.err, x.hit, x.i, x.k, x.q, x.t, x.ver = err, hit, i, k, q, t, ver
-	return x
-}
-
-type (
-	// Cmp compares a and b. Return value is:
-	//
-	//	< 0 if a <  b
-	//	  0 if a == b
-	//	> 0 if a >  b
-	//
-	Cmp func(a, b int) int
-
-	d struct { // data page
-		c int
-		d [2*kd + 1]de
-		n *d
-		p *d
-	}
-
-	de struct { // d element
-		k int
-		v int
-	}
-
-	// Enumerator captures the state of enumerating a tree. It is returned
-	// from the Seek* methods. The enumerator is aware of any mutations
-	// made to the tree in the process of enumerating it and automatically
-	// resumes the enumeration at the proper key, if possible.
-	//
-	// However, once an Enumerator returns io.EOF to signal "no more
-	// items", it does no more attempt to "resync" on tree mutation(s).  In
-	// other words, io.EOF from an Enumaretor is "sticky" (idempotent).
-	Enumerator struct {
-		err error
-		hit bool
-		i   int
-		k   int
-		q   *d
-		t   *Tree
-		ver int64
-	}
-
-	// Tree is a B+tree.
-	Tree struct {
-		c     int
-		cmp   Cmp
-		first *d
-		last  *d
-		r     interface{}
-		ver   int64
-	}
-
-	xe struct { // x element
-		ch interface{}
-		k  int
-	}
-
-	x struct { // index page
-		c int
-		x [2*kx + 2]xe
-	}
-)
-
-var ( // R/O zero values
-	zd  d
-	zde de
-	ze  Enumerator
-	zk  int
-	zt  Tree
-	zx  x
-	zxe xe
-)
-
-func clr(q interface{}) {
-	switch x := q.(type) {
-	case *x:
-		for i := 0; i <= x.c; i++ { // Ch0 Sep0 ... Chn-1 Sepn-1 Chn
-			clr(x.x[i].ch)
-		}
-		*x = zx
-		btXPool.Put(x)
-	case *d:
-		*x = zd
-		btDPool.Put(x)
-	}
-}
-
-// -------------------------------------------------------------------------- x
-
-func newX(ch0 interface{}) *x {
-	r := btXPool.Get().(*x)
-	r.x[0].ch = ch0
-	return r
-}
-
-func (q *x) extract(i int) {
-	q.c--
-	if i < q.c {
-		copy(q.x[i:], q.x[i+1:q.c+1])
-		q.x[q.c].ch = q.x[q.c+1].ch
-		q.x[q.c].k = zk  // GC
-		q.x[q.c+1] = zxe // GC
-	}
-}
-
-func (q *x) insert(i int, k int, ch interface{}) *x {
-	c := q.c
-	if i < c {
-		q.x[c+1].ch = q.x[c].ch
-		copy(q.x[i+2:], q.x[i+1:c])
-		q.x[i+1].k = q.x[i].k
-	}
-	c++
-	q.c = c
-	q.x[i].k = k
-	q.x[i+1].ch = ch
-	return q
-}
-
-func (q *x) siblings(i int) (l, r *d) {
-	if i >= 0 {
-		if i > 0 {
-			l = q.x[i-1].ch.(*d)
-		}
-		if i < q.c {
-			r = q.x[i+1].ch.(*d)
-		}
-	}
-	return
-}
-
-// -------------------------------------------------------------------------- d
-
-func (l *d) mvL(r *d, c int) {
-	copy(l.d[l.c:], r.d[:c])
-	copy(r.d[:], r.d[c:r.c])
-	l.c += c
-	r.c -= c
-}
-
-func (l *d) mvR(r *d, c int) {
-	copy(r.d[c:], r.d[:r.c])
-	copy(r.d[:c], l.d[l.c-c:])
-	r.c += c
-	l.c -= c
-}
-
-// ----------------------------------------------------------------------- Tree
-
-// TreeNew returns a newly created, empty Tree. The compare function is used
-// for key collation.
-func TreeNew(cmp Cmp) *Tree {
-	return btTPool.get(cmp)
-}
-
-// Clear removes all K/V pairs from the tree.
-func (t *Tree) Clear() {
-	if t.r == nil {
-		return
-	}
-
-	clr(t.r)
-	t.c, t.first, t.last, t.r = 0, nil, nil, nil
-	t.ver++
-}
-
-// Close performs Clear and recycles t to a pool for possible later reuse. No
-// references to t should exist or such references must not be used afterwards.
-func (t *Tree) Close() {
-	t.Clear()
-	*t = zt
-	btTPool.Put(t)
-}
-
-func (t *Tree) cat(p *x, q, r *d, pi int) {
-	t.ver++
-	q.mvL(r, r.c)
-	if r.n != nil {
-		r.n.p = q
-	} else {
-		t.last = q
-	}
-	q.n = r.n
-	*r = zd
-	btDPool.Put(r)
-	if p.c > 1 {
-		p.extract(pi)
-		p.x[pi].ch = q
-		return
-	}
-
-	switch x := t.r.(type) {
-	case *x:
-		*x = zx
-		btXPool.Put(x)
-	case *d:
-		*x = zd
-		btDPool.Put(x)
-	}
-	t.r = q
-}
-
-func (t *Tree) catX(p, q, r *x, pi int) {
-	t.ver++
-	q.x[q.c].k = p.x[pi].k
-	copy(q.x[q.c+1:], r.x[:r.c])
-	q.c += r.c + 1
-	q.x[q.c].ch = r.x[r.c].ch
-	*r = zx
-	btXPool.Put(r)
-	if p.c > 1 {
-		p.c--
-		pc := p.c
-		if pi < pc {
-			p.x[pi].k = p.x[pi+1].k
-			copy(p.x[pi+1:], p.x[pi+2:pc+1])
-			p.x[pc].ch = p.x[pc+1].ch
-			p.x[pc].k = zk     // GC
-			p.x[pc+1].ch = nil // GC
-		}
-		return
-	}
-
-	switch x := t.r.(type) {
-	case *x:
-		*x = zx
-		btXPool.Put(x)
-	case *d:
-		*x = zd
-		btDPool.Put(x)
-	}
-	t.r = q
-}
-
-// Delete removes the k's KV pair, if it exists, in which case Delete returns
-// true.
-func (t *Tree) Delete(k int) (ok bool) {
-	pi := -1
-	var p *x
-	q := t.r
-	if q == nil {
-		return false
-	}
-
-	for {
-		var i int
-		i, ok = t.find(q, k)
-		if ok {
-			switch x := q.(type) {
-			case *x:
-				if x.c < kx && q != t.r {
-					x, i = t.underflowX(p, x, pi, i)
-				}
-				pi = i + 1
-				p = x
-				q = x.x[pi].ch
-				ok = false
-				continue
-			case *d:
-				t.extract(x, i)
-				if x.c >= kd {
-					return true
-				}
-
-				if q != t.r {
-					t.underflow(p, x, pi)
-				} else if t.c == 0 {
-					t.Clear()
-				}
-				return true
-			}
-		}
-
-		switch x := q.(type) {
-		case *x:
-			if x.c < kx && q != t.r {
-				x, i = t.underflowX(p, x, pi, i)
-			}
-			pi = i
-			p = x
-			q = x.x[i].ch
-		case *d:
-			return false
-		}
-	}
-}
-
-func (t *Tree) extract(q *d, i int) { // (r int) {
-	t.ver++
-	//r = q.d[i].v // prepared for Extract
-	q.c--
-	if i < q.c {
-		copy(q.d[i:], q.d[i+1:q.c+1])
-	}
-	q.d[q.c] = zde // GC
-	t.c--
-	return
-}
-
-func (t *Tree) find(q interface{}, k int) (i int, ok bool) {
-	var mk int
-	l := 0
-	switch x := q.(type) {
-	case *x:
-		h := x.c - 1
-		for l <= h {
-			m := (l + h) >> 1
-			mk = x.x[m].k
-			switch cmp := t.cmp(k, mk); {
-			case cmp > 0:
-				l = m + 1
-			case cmp == 0:
-				return m, true
-			default:
-				h = m - 1
-			}
-		}
-	case *d:
-		h := x.c - 1
-		for l <= h {
-			m := (l + h) >> 1
-			mk = x.d[m].k
-			switch cmp := t.cmp(k, mk); {
-			case cmp > 0:
-				l = m + 1
-			case cmp == 0:
-				return m, true
-			default:
-				h = m - 1
-			}
-		}
-	}
-	return l, false
-}
-
-// First returns the first item of the tree in the key collating order, or
-// (zero-value, zero-value) if the tree is empty.
-func (t *Tree) First() (k int, v int) {
-	if q := t.first; q != nil {
-		q := &q.d[0]
-		k, v = q.k, q.v
-	}
-	return
-}
-
-// Get returns the value associated with k and true if it exists. Otherwise Get
-// returns (zero-value, false).
-func (t *Tree) Get(k int) (v int, ok bool) {
-	q := t.r
-	if q == nil {
-		return
-	}
-
-	for {
-		var i int
-		if i, ok = t.find(q, k); ok {
-			switch x := q.(type) {
-			case *x:
-				q = x.x[i+1].ch
-				continue
-			case *d:
-				return x.d[i].v, true
-			}
-		}
-		switch x := q.(type) {
-		case *x:
-			q = x.x[i].ch
-		default:
-			return
-		}
-	}
-}
-
-func (t *Tree) insert(q *d, i int, k int, v int) *d {
-	t.ver++
-	c := q.c
-	if i < c {
-		copy(q.d[i+1:], q.d[i:c])
-	}
-	c++
-	q.c = c
-	q.d[i].k, q.d[i].v = k, v
-	t.c++
-	return q
-}
-
-// Last returns the last item of the tree in the key collating order, or
-// (zero-value, zero-value) if the tree is empty.
-func (t *Tree) Last() (k int, v int) {
-	if q := t.last; q != nil {
-		q := &q.d[q.c-1]
-		k, v = q.k, q.v
-	}
-	return
-}
-
-// Len returns the number of items in the tree.
-func (t *Tree) Len() int {
-	return t.c
-}
-
-func (t *Tree) overflow(p *x, q *d, pi, i int, k int, v int) {
-	t.ver++
-	l, r := p.siblings(pi)
-
-	if l != nil && l.c < 2*kd {
-		l.mvL(q, 1)
-		t.insert(q, i-1, k, v)
-		p.x[pi-1].k = q.d[0].k
-		return
-	}
-
-	if r != nil && r.c < 2*kd {
-		if i < 2*kd {
-			q.mvR(r, 1)
-			t.insert(q, i, k, v)
-			p.x[pi].k = r.d[0].k
-			return
-		}
-
-		t.insert(r, 0, k, v)
-		p.x[pi].k = k
-		return
-	}
-
-	t.split(p, q, pi, i, k, v)
-}
-
-// Seek returns an Enumerator positioned on a an item such that k >= item's
-// key. ok reports if k == item.key The Enumerator's position is possibly
-// after the last item in the tree.
-func (t *Tree) Seek(k int) (e *Enumerator, ok bool) {
-	q := t.r
-	if q == nil {
-		e = btEPool.get(nil, false, 0, k, nil, t, t.ver)
-		return
-	}
-
-	for {
-		var i int
-		if i, ok = t.find(q, k); ok {
-			switch x := q.(type) {
-			case *x:
-				q = x.x[i+1].ch
-				continue
-			case *d:
-				return btEPool.get(nil, ok, i, k, x, t, t.ver), true
-			}
-		}
-
-		switch x := q.(type) {
-		case *x:
-			q = x.x[i].ch
-		case *d:
-			return btEPool.get(nil, ok, i, k, x, t, t.ver), false
-		}
-	}
-}
-
-// SeekFirst returns an enumerator positioned on the first KV pair in the tree,
-// if any. For an empty tree, err == io.EOF is returned and e will be nil.
-func (t *Tree) SeekFirst() (e *Enumerator, err error) {
-	q := t.first
-	if q == nil {
-		return nil, io.EOF
-	}
-
-	return btEPool.get(nil, true, 0, q.d[0].k, q, t, t.ver), nil
-}
-
-// SeekLast returns an enumerator positioned on the last KV pair in the tree,
-// if any. For an empty tree, err == io.EOF is returned and e will be nil.
-func (t *Tree) SeekLast() (e *Enumerator, err error) {
-	q := t.last
-	if q == nil {
-		return nil, io.EOF
-	}
-
-	return btEPool.get(nil, true, q.c-1, q.d[q.c-1].k, q, t, t.ver), nil
-}
-
-// Set sets the value associated with k.
-func (t *Tree) Set(k int, v int) {
-	//dbg("--- PRE Set(%v, %v)\n%s", k, v, t.dump())
-	//defer func() {
-	//	dbg("--- POST\n%s\n====\n", t.dump())
-	//}()
-
-	pi := -1
-	var p *x
-	q := t.r
-	if q == nil {
-		z := t.insert(btDPool.Get().(*d), 0, k, v)
-		t.r, t.first, t.last = z, z, z
-		return
-	}
-
-	for {
-		i, ok := t.find(q, k)
-		if ok {
-			switch x := q.(type) {
-			case *x:
-				if x.c > 2*kx {
-					x, i = t.splitX(p, x, pi, i)
-				}
-				pi = i + 1
-				p = x
-				q = x.x[i+1].ch
-				continue
-			case *d:
-				x.d[i].v = v
-			}
-			return
-		}
-
-		switch x := q.(type) {
-		case *x:
-			if x.c > 2*kx {
-				x, i = t.splitX(p, x, pi, i)
-			}
-			pi = i
-			p = x
-			q = x.x[i].ch
-		case *d:
-			switch {
-			case x.c < 2*kd:
-				t.insert(x, i, k, v)
-			default:
-				t.overflow(p, x, pi, i, k, v)
-			}
-			return
-		}
-	}
-}
-
-// Put combines Get and Set in a more efficient way where the tree is walked
-// only once. The upd(ater) receives (old-value, true) if a KV pair for k
-// exists or (zero-value, false) otherwise. It can then return a (new-value,
-// true) to create or overwrite the existing value in the KV pair, or
-// (whatever, false) if it decides not to create or not to update the value of
-// the KV pair.
-//
-// 	tree.Set(k, v) call conceptually equals calling
-//
-// 	tree.Put(k, func(int, bool){ return v, true })
-//
-// modulo the differing return values.
-func (t *Tree) Put(k int, upd func(oldV int, exists bool) (newV int, write bool)) (oldV int, written bool) {
-	pi := -1
-	var p *x
-	q := t.r
-	var newV int
-	if q == nil {
-		// new KV pair in empty tree
-		newV, written = upd(newV, false)
-		if !written {
-			return
-		}
-
-		z := t.insert(btDPool.Get().(*d), 0, k, newV)
-		t.r, t.first, t.last = z, z, z
-		return
-	}
-
-	for {
-		i, ok := t.find(q, k)
-		if ok {
-			switch x := q.(type) {
-			case *x:
-				if x.c > 2*kx {
-					x, i = t.splitX(p, x, pi, i)
-				}
-				pi = i + 1
-				p = x
-				q = x.x[i+1].ch
-				continue
-			case *d:
-				oldV = x.d[i].v
-				newV, written = upd(oldV, true)
-				if !written {
-					return
-				}
-
-				x.d[i].v = newV
-			}
-			return
-		}
-
-		switch x := q.(type) {
-		case *x:
-			if x.c > 2*kx {
-				x, i = t.splitX(p, x, pi, i)
-			}
-			pi = i
-			p = x
-			q = x.x[i].ch
-		case *d: // new KV pair
-			newV, written = upd(newV, false)
-			if !written {
-				return
-			}
-
-			switch {
-			case x.c < 2*kd:
-				t.insert(x, i, k, newV)
-			default:
-				t.overflow(p, x, pi, i, k, newV)
-			}
-			return
-		}
-	}
-}
-
-func (t *Tree) split(p *x, q *d, pi, i int, k int, v int) {
-	t.ver++
-	r := btDPool.Get().(*d)
-	if q.n != nil {
-		r.n = q.n
-		r.n.p = r
-	} else {
-		t.last = r
-	}
-	q.n = r
-	r.p = q
-
-	copy(r.d[:], q.d[kd:2*kd])
-	for i := range q.d[kd:] {
-		q.d[kd+i] = zde
-	}
-	q.c = kd
-	r.c = kd
-	var done bool
-	if i > kd {
-		done = true
-		t.insert(r, i-kd, k, v)
-	}
-	if pi >= 0 {
-		p.insert(pi, r.d[0].k, r)
-	} else {
-		t.r = newX(q).insert(0, r.d[0].k, r)
-	}
-	if done {
-		return
-	}
-
-	t.insert(q, i, k, v)
-}
-
-func (t *Tree) splitX(p *x, q *x, pi int, i int) (*x, int) {
-	t.ver++
-	r := btXPool.Get().(*x)
-	copy(r.x[:], q.x[kx+1:])
-	q.c = kx
-	r.c = kx
-	if pi >= 0 {
-		p.insert(pi, q.x[kx].k, r)
-		q.x[kx].k = zk
-		for i := range q.x[kx+1:] {
-			q.x[kx+i+1] = zxe
-		}
-
-		switch {
-		case i < kx:
-			return q, i
-		case i == kx:
-			return p, pi
-		default: // i > kx
-			return r, i - kx - 1
-		}
-	}
-
-	nr := newX(q).insert(0, q.x[kx].k, r)
-	t.r = nr
-	q.x[kx].k = zk
-	for i := range q.x[kx+1:] {
-		q.x[kx+i+1] = zxe
-	}
-
-	switch {
-	case i < kx:
-		return q, i
-	case i == kx:
-		return nr, 0
-	default: // i > kx
-		return r, i - kx - 1
-	}
-}
-
-func (t *Tree) underflow(p *x, q *d, pi int) {
-	t.ver++
-	l, r := p.siblings(pi)
-
-	if l != nil && l.c+q.c >= 2*kd {
-		l.mvR(q, 1)
-		p.x[pi-1].k = q.d[0].k
-		return
-	}
-
-	if r != nil && q.c+r.c >= 2*kd {
-		q.mvL(r, 1)
-		p.x[pi].k = r.d[0].k
-		r.d[r.c] = zde // GC
-		return
-	}
-
-	if l != nil {
-		t.cat(p, l, q, pi-1)
-		return
-	}
-
-	t.cat(p, q, r, pi)
-}
-
-func (t *Tree) underflowX(p *x, q *x, pi int, i int) (*x, int) {
-	t.ver++
-	var l, r *x
-
-	if pi >= 0 {
-		if pi > 0 {
-			l = p.x[pi-1].ch.(*x)
-		}
-		if pi < p.c {
-			r = p.x[pi+1].ch.(*x)
-		}
-	}
-
-	if l != nil && l.c > kx {
-		q.x[q.c+1].ch = q.x[q.c].ch
-		copy(q.x[1:], q.x[:q.c])
-		q.x[0].ch = l.x[l.c].ch
-		q.x[0].k = p.x[pi-1].k
-		q.c++
-		i++
-		l.c--
-		p.x[pi-1].k = l.x[l.c].k
-		return q, i
-	}
-
-	if r != nil && r.c > kx {
-		q.x[q.c].k = p.x[pi].k
-		q.c++
-		q.x[q.c].ch = r.x[0].ch
-		p.x[pi].k = r.x[0].k
-		copy(r.x[:], r.x[1:r.c])
-		r.c--
-		rc := r.c
-		r.x[rc].ch = r.x[rc+1].ch
-		r.x[rc].k = zk
-		r.x[rc+1].ch = nil
-		return q, i
-	}
-
-	if l != nil {
-		i += l.c + 1
-		t.catX(p, l, q, pi-1)
-		q = l
-		return q, i
-	}
-
-	t.catX(p, q, r, pi)
-	return q, i
-}
-
-// ----------------------------------------------------------------- Enumerator
-
-// Close recycles e to a pool for possible later reuse. No references to e
-// should exist or such references must not be used afterwards.
-func (e *Enumerator) Close() {
-	*e = ze
-	btEPool.Put(e)
-}
-
-// Next returns the currently enumerated item, if it exists and moves to the
-// next item in the key collation order. If there is no item to return, err ==
-// io.EOF is returned.
-func (e *Enumerator) Next() (k int, v int, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	if e.ver != e.t.ver {
-		f, hit := e.t.Seek(e.k)
-		if !e.hit && hit {
-			if err = f.next(); err != nil {
-				return
-			}
-		}
-
-		*e = *f
-		f.Close()
-	}
-	if e.q == nil {
-		e.err, err = io.EOF, io.EOF
-		return
-	}
-
-	if e.i >= e.q.c {
-		if err = e.next(); err != nil {
-			return
-		}
-	}
-
-	i := e.q.d[e.i]
-	k, v = i.k, i.v
-	e.k, e.hit = k, false
-	e.next()
-	return
-}
-
-func (e *Enumerator) next() error {
-	if e.q == nil {
-		e.err = io.EOF
-		return io.EOF
-	}
-
-	switch {
-	case e.i < e.q.c-1:
-		e.i++
-	default:
-		if e.q, e.i = e.q.n, 0; e.q == nil {
-			e.err = io.EOF
-		}
-	}
-	return e.err
-}
-
-// Prev returns the currently enumerated item, if it exists and moves to the
-// previous item in the key collation order. If there is no item to return, err
-// == io.EOF is returned.
-func (e *Enumerator) Prev() (k int, v int, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	if e.ver != e.t.ver {
-		f, hit := e.t.Seek(e.k)
-		if !e.hit && hit {
-			if err = f.prev(); err != nil {
-				return
-			}
-		}
-
-		*e = *f
-		f.Close()
-	}
-	if e.q == nil {
-		e.err, err = io.EOF, io.EOF
-		return
-	}
-
-	if e.i >= e.q.c {
-		if err = e.next(); err != nil {
-			return
-		}
-	}
-
-	i := e.q.d[e.i]
-	k, v = i.k, i.v
-	e.k, e.hit = k, false
-	e.prev()
-	return
-}
-
-func (e *Enumerator) prev() error {
-	if e.q == nil {
-		e.err = io.EOF
-		return io.EOF
-	}
-
-	switch {
-	case e.i > 0:
-		e.i--
-	default:
-		if e.q = e.q.p; e.q == nil {
-			e.err = io.EOF
-			break
-		}
-
-		e.i = e.q.c - 1
-	}
-	return e.err
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/bufs/AUTHORS b/Godeps/_workspace/src/github.com/cznic/bufs/AUTHORS
deleted file mode 100644
index 0078f5f5b6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/bufs/AUTHORS
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/bufs/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/bufs/CONTRIBUTORS
deleted file mode 100644
index 5e86f0607c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/bufs/CONTRIBUTORS
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/bufs/LICENSE b/Godeps/_workspace/src/github.com/cznic/bufs/LICENSE
deleted file mode 100644
index 7d80fe28eb..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/bufs/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The bufs Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/bufs/Makefile b/Godeps/_workspace/src/github.com/cznic/bufs/Makefile
deleted file mode 100644
index c98c23d6df..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/bufs/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2014 The bufs Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-all: clean
-	go fmt
-	go test -i
-	go test
-	go build
-	go vet
-	golint .
-	go install
-	make todo
-
-todo:
-	@grep -n ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alnum:]] *.go || true
-	@grep -n TODO *.go || true
-	@grep -n FIXME *.go || true
-	@grep -n BUG *.go || true
-
-clean:
-	rm -f bufs.test mem.out *~
-
-demo:
-	go test -bench . -benchmem
-	go test -c
-	./bufs.test -test.v -test.run Foo -test.memprofile mem.out \
-		-test.memprofilerate 1
-	go tool pprof bufs.test mem.out --alloc_space --nodefraction 0.0001 \
-	       --edgefraction 0	-web
-	@echo "Note: Foo vs FooBufs allocated memory is in hundreds of MBs vs 8 kB."
diff --git a/Godeps/_workspace/src/github.com/cznic/bufs/README.md b/Godeps/_workspace/src/github.com/cznic/bufs/README.md
deleted file mode 100644
index 3f3d56f19d..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/bufs/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-bufs
-====
-
-Package bufs implements a simple buffer cache.
-
- installation: go get github.com/cznic/bufs
-
-documentation: http://godoc.org/github.com/cznic/bufs
diff --git a/Godeps/_workspace/src/github.com/cznic/bufs/bufs.go b/Godeps/_workspace/src/github.com/cznic/bufs/bufs.go
deleted file mode 100644
index f4e0eee2a6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/bufs/bufs.go
+++ /dev/null
@@ -1,391 +0,0 @@
-// Copyright 2014 The bufs Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package bufs implements a simple buffer cache.
-//
-// The intended use scheme is like:
-//
-//	type Foo struct {
-//		buffers bufs.Buffers
-//		...
-//	}
-//
-//	// Bar can call Qux, but not the other way around (in this example).
-//	const maxFooDepth = 2
-//
-//	func NewFoo() *Foo {
-//		return &Foo{buffers: bufs.New(maxFooDepth), ...}
-//	}
-//
-//	func (f *Foo) Bar(n int) {
-//		buf := f.buffers.Alloc(n) // needed locally for computation and/or I/O
-//		defer f.buffers.Free()
-//		...
-//		f.Qux(whatever)
-//	}
-//
-//	func (f *Foo) Qux(n int) {
-//		buf := f.buffers.Alloc(n) // needed locally for computation and/or I/O
-//		defer f.buffers.Free()
-//		...
-//	}
-//
-// The whole idea behind 'bufs' is that when calling e.g. Foo.Bar N times, then
-// normally, without using 'bufs', there will be 2*N (in this example) []byte
-// buffers allocated.  While using 'bufs', only 2 buffers (in this example)
-// will ever be created. For large N it can be a substantial difference.
-//
-// It's not a good idea to use Buffers to cache too big buffers. The cost of
-// having a cached buffer is that the buffer is naturally not eligible for
-// garbage collection.  Of course, that holds only while the Foo instance is
-// reachable, in the above example.
-//
-// The buffer count limit is intentionally "hard" (read panicking), although
-// configurable in New().  The rationale is to prevent recursive calls, using
-// Alloc, to cause excessive, "static" memory consumption. Tune the limit
-// carefully or do not use Buffers from within [mutually] recursive functions
-// where the nesting depth is not realistically bounded to some rather small
-// number.
-//
-// Buffers cannot guarantee improvements to you program performance. There may
-// be a gain in case where they fit well. Firm grasp on what your code is
-// actually doing, when and in what order is essential to proper use of
-// Buffers. It's _highly_ recommended to first do profiling and memory
-// profiling before even thinking about using 'bufs'. The real world example,
-// and cause for this package, was a first correct, yet no optimizations done
-// version of a program; producing few MB of useful data while allocating 20+GB
-// of memory.  Of course the garbage collector properly kicked in, yet the
-// memory abuse caused ~80+% of run time to be spent memory management.  The
-// program _was_ expected to be slow in its still development phase, but the
-// bottleneck was guessed to be in I/O.  Actually the hard disk was waiting for
-// the billions bytes being allocated and zeroed. Garbage collect on low
-// memory, rinse and repeat.
-//
-// In the provided tests, TestFoo and TestFooBufs do the same simulated work,
-// except the later uses Buffers while the former does not. Suggested test runs
-// which show the differences:
-//
-//	$ go test -bench . -benchmem
-//
-//	or
-//
-//	$ go test -c
-//	$ ./bufs.test -test.v -test.run Foo -test.memprofile mem.out -test.memprofilerate 1
-//	$ go tool pprof bufs.test mem.out --alloc_space --nodefraction 0.0001 --edgefraction 0 -web
-//	$ # Note: Foo vs FooBufs allocated memory is in hundreds of MBs vs 8 kB.
-//
-//	or
-//
-//	$ make demo # same as all of the above
-//
-//
-// NOTE: Alloc/Free calls must be properly nested in the same way as in for
-// example BeginTransaction/EndTransaction pairs. If your code can panic then
-// the pairing should be enforced by deferred calls.
-//
-// NOTE: Buffers objects do not allocate any space until requested by Alloc,
-// the mechanism works on demand only.
-//
-// FAQ: Why the 'bufs' package name?
-//
-// Package name 'bufs' was intentionally chosen instead of the perhaps more
-// conventional 'buf'. There are already too many 'buf' named things in the
-// code out there and that'll be a source of a lot of trouble. It's a bit
-// similar situation as in the case of package "strings" (not "string").
-package bufs
-
-import (
-	"errors"
-	"sort"
-	"sync"
-)
-
-// Buffers type represents a buffer ([]byte) cache.
-//
-// NOTE: Do not modify Buffers directly, use only its methods. Do not create
-// additional values (copies) of Buffers, that'll break its functionality. Use
-// a pointer instead to refer to a single instance from different
-// places/scopes.
-type Buffers [][]byte
-
-// New returns a newly created instance of Buffers with a maximum capacity of n
-// buffers.
-//
-// NOTE: 'bufs.New(n)' is the same as 'make(bufs.Buffers, n)'.
-func New(n int) Buffers {
-	return make(Buffers, n)
-}
-
-// Alloc will return a buffer such that len(r) == n. It will firstly try to
-// find an existing and unused buffer of big enough size. Only when there is no
-// such, then one of the buffer slots is reallocated to a bigger size.
-//
-// It's okay to use append with buffers returned by Alloc. But it can cause
-// allocation in that case and will again be producing load for the garbage
-// collector. The best use of Alloc is for I/O buffers where the needed size of
-// the buffer is figured out at some point of the code path in a 'final size'
-// sense. Another real world example are compression/decompression buffers.
-//
-// NOTE: The buffer returned by Alloc _is not_ zeroed. That's okay for e.g.
-// passing a buffer to io.Reader. If you need a zeroed buffer use Calloc.
-//
-// NOTE: Buffers returned from Alloc _must not_ be exposed/returned to your
-// clients.  Those buffers are intended to be used strictly internally, within
-// the methods of some "object".
-//
-// NOTE: Alloc will panic if there are no buffers (buffer slots) left.
-func (p *Buffers) Alloc(n int) (r []byte) {
-	b := *p
-	if len(b) == 0 {
-		panic(errors.New("Buffers.Alloc: out of buffers"))
-	}
-
-	biggest, best, biggestI, bestI := -1, -1, -1, -1
-	for i, v := range b {
-		//ln := len(v)
-		// The above was correct, buts it's just confusing. It worked
-		// because not the buffers, but slices of them are returned in
-		// the 'if best >= n' code path.
-		ln := cap(v)
-
-		if ln >= biggest {
-			biggest, biggestI = ln, i
-		}
-
-		if ln >= n && (bestI < 0 || best > ln) {
-			best, bestI = ln, i
-			if ln == n {
-				break
-			}
-		}
-	}
-
-	last := len(b) - 1
-	if best >= n {
-		r = b[bestI]
-		b[last], b[bestI] = b[bestI], b[last]
-		*p = b[:last]
-		return r[:n]
-	}
-
-	r = make([]byte, n, overCommit(n))
-	b[biggestI] = r
-	b[last], b[biggestI] = b[biggestI], b[last]
-	*p = b[:last]
-	return
-}
-
-// Calloc will acquire a buffer using Alloc and then clears it to zeros. The
-// zeroing goes up to n, not cap(r).
-func (p *Buffers) Calloc(n int) (r []byte) {
-	r = p.Alloc(n)
-	for i := range r {
-		r[i] = 0
-	}
-	return
-}
-
-// Free makes the lastly allocated by Alloc buffer free (available) again for
-// Alloc.
-//
-// NOTE: Improper Free invocations, like in the sequence {New, Alloc, Free,
-// Free}, will panic.
-func (p *Buffers) Free() {
-	b := *p
-	b = b[:len(b)+1]
-	*p = b
-}
-
-// Stats reports memory consumed by Buffers, without accounting for some
-// (smallish) additional overhead.
-func (p *Buffers) Stats() (bytes int) {
-	b := *p
-	b = b[:cap(b)]
-	for _, v := range b {
-		bytes += cap(v)
-	}
-	return
-}
-
-// Cache caches buffers ([]byte). A zero value of Cache is ready for use.
-//
-// NOTE: Do not modify a Cache directly, use only its methods. Do not create
-// additional values (copies) of a Cache, that'll break its functionality. Use
-// a pointer instead to refer to a single instance from different
-// places/scopes.
-type Cache [][]byte
-
-// Get returns a buffer ([]byte) of length n. If no such buffer is cached then
-// a biggest cached buffer is resized to have length n and returned. If there
-// are no cached items at all, Get returns a newly allocated buffer.
-//
-// In other words the cache policy is:
-//
-// - If the cache is empty, the buffer must be newly created and returned.
-// Cache remains empty.
-//
-// - If a buffer of sufficient size is found in the cache, remove it from the
-// cache and return it.
-//
-// - Otherwise the cache is non empty, but no cached buffer is big enough.
-// Enlarge the biggest cached buffer, remove it from the cache and return it.
-// This provide cached buffers size adjustment based on demand.
-//
-// In short, if the cache is not empty, Get guarantees to make it always one
-// item less.  This rules prevent uncontrolled cache grow in some scenarios.
-// The older policy was not preventing that. Another advantage is better cached
-// buffers sizes "auto tuning", although not in every possible use case.
-//
-// NOTE: The buffer returned by Get _is not guaranteed_ to be zeroed. That's
-// okay for e.g.  passing a buffer to io.Reader. If you need a zeroed buffer
-// use Cget.
-func (c *Cache) Get(n int) []byte {
-	r, _ := c.get(n)
-	return r
-}
-
-func (c *Cache) get(n int) (r []byte, isZeroed bool) {
-	s := *c
-	lens := len(s)
-	if lens == 0 {
-		r, isZeroed = make([]byte, n, overCommit(n)), true
-		return
-	}
-
-	i := sort.Search(lens, func(x int) bool { return len(s[x]) >= n })
-	if i == lens {
-		i--
-		s[i] = make([]byte, n, overCommit(n))
-	}
-	r = s[i][:n]
-	copy(s[i:], s[i+1:])
-	s[lens-1] = nil
-	s = s[:lens-1]
-	*c = s
-	return r, false
-}
-
-// Cget will acquire a buffer using Get and then clears it to zeros. The
-// zeroing goes up to n, not cap(r).
-func (c *Cache) Cget(n int) (r []byte) {
-	r, ok := c.get(n)
-	if ok {
-		return
-	}
-
-	for i := range r {
-		r[i] = 0
-	}
-	return
-}
-
-// Put caches b for possible later reuse (via Get). No other references to b's
-// backing array may exist. Otherwise a big mess is sooner or later inevitable.
-func (c *Cache) Put(b []byte) {
-	b = b[:cap(b)]
-	lenb := len(b)
-	if lenb == 0 {
-		return
-	}
-
-	s := *c
-	lens := len(s)
-	i := sort.Search(lens, func(x int) bool { return len(s[x]) >= lenb })
-	s = append(s, nil)
-	copy(s[i+1:], s[i:])
-	s[i] = b
-	*c = s
-	return
-}
-
-// Stats reports memory consumed by a Cache, without accounting for some
-// (smallish) additional overhead. 'n' is the number of cached buffers, bytes
-// is their combined capacity.
-func (c Cache) Stats() (n, bytes int) {
-	n = len(c)
-	for _, v := range c {
-		bytes += cap(v)
-	}
-	return
-}
-
-// CCache is a Cache which is safe for concurrent use by multiple goroutines.
-type CCache struct {
-	c  Cache
-	mu sync.Mutex
-}
-
-// Get returns a buffer ([]byte) of length n. If no such buffer is cached then
-// a biggest cached buffer is resized to have length n and returned. If there
-// are no cached items at all, Get returns a newly allocated buffer.
-//
-// In other words the cache policy is:
-//
-// - If the cache is empty, the buffer must be newly created and returned.
-// Cache remains empty.
-//
-// - If a buffer of sufficient size is found in the cache, remove it from the
-// cache and return it.
-//
-// - Otherwise the cache is non empty, but no cached buffer is big enough.
-// Enlarge the biggest cached buffer, remove it from the cache and return it.
-// This provide cached buffers size adjustment based on demand.
-//
-// In short, if the cache is not empty, Get guarantees to make it always one
-// item less.  This rules prevent uncontrolled cache grow in some scenarios.
-// The older policy was not preventing that. Another advantage is better cached
-// buffers sizes "auto tuning", although not in every possible use case.
-//
-// NOTE: The buffer returned by Get _is not guaranteed_ to be zeroed. That's
-// okay for e.g.  passing a buffer to io.Reader. If you need a zeroed buffer
-// use Cget.
-func (c *CCache) Get(n int) []byte {
-	c.mu.Lock()
-	r, _ := c.c.get(n)
-	c.mu.Unlock()
-	return r
-}
-
-// Cget will acquire a buffer using Get and then clears it to zeros. The
-// zeroing goes up to n, not cap(r).
-func (c *CCache) Cget(n int) (r []byte) {
-	c.mu.Lock()
-	r = c.c.Cget(n)
-	c.mu.Unlock()
-	return
-}
-
-// Put caches b for possible later reuse (via Get). No other references to b's
-// backing array may exist. Otherwise a big mess is sooner or later inevitable.
-func (c *CCache) Put(b []byte) {
-	c.mu.Lock()
-	c.c.Put(b)
-	c.mu.Unlock()
-}
-
-// Stats reports memory consumed by a Cache, without accounting for some
-// (smallish) additional overhead. 'n' is the number of cached buffers, bytes
-// is their combined capacity.
-func (c *CCache) Stats() (n, bytes int) {
-	c.mu.Lock()
-	n, bytes = c.c.Stats()
-	c.mu.Unlock()
-	return
-}
-
-// GCache is a ready to use global instance of a CCache.
-var GCache CCache
-
-func overCommit(n int) int {
-	switch {
-	case n < 8:
-		return 8
-	case n < 1e5:
-		return 2 * n
-	case n < 1e6:
-		return 3 * n / 2
-	default:
-		return n
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/dbm/LICENSE b/Godeps/_workspace/src/github.com/cznic/exp/dbm/LICENSE
deleted file mode 100644
index 80c7ae7fa6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/dbm/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The dbm Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc.go
deleted file mode 100644
index 887604def2..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc.go
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Two Phase Commit & Structural ACID
-
-package lldb
-
-import (
-	"bufio"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/cznic/fileutil"
-	"github.com/cznic/mathutil"
-)
-
-var _ Filer = &ACIDFiler0{} // Ensure ACIDFiler0 is a Filer
-
-type acidWrite struct {
-	b   []byte
-	off int64
-}
-
-type acidWriter0 ACIDFiler0
-
-func (a *acidWriter0) WriteAt(b []byte, off int64) (n int, err error) {
-	f := (*ACIDFiler0)(a)
-	if f.bwal == nil { // new epoch
-		f.data = f.data[:0]
-		f.bwal = bufio.NewWriter(f.wal)
-		if err = a.writePacket([]interface{}{wpt00Header, walTypeACIDFiler0, ""}); err != nil {
-			return
-		}
-	}
-
-	if err = a.writePacket([]interface{}{wpt00WriteData, b, off}); err != nil {
-		return
-	}
-
-	f.data = append(f.data, acidWrite{b, off})
-	return len(b), nil
-}
-
-func (a *acidWriter0) writePacket(items []interface{}) (err error) {
-	f := (*ACIDFiler0)(a)
-	b, err := EncodeScalars(items...)
-	if err != nil {
-		return
-	}
-
-	var b4 [4]byte
-	binary.BigEndian.PutUint32(b4[:], uint32(len(b)))
-	if _, err = f.bwal.Write(b4[:]); err != nil {
-		return
-	}
-
-	if _, err = f.bwal.Write(b); err != nil {
-		return
-	}
-
-	if m := (4 + len(b)) % 16; m != 0 {
-		var pad [15]byte
-		_, err = f.bwal.Write(pad[:16-m])
-	}
-	return
-}
-
-// WAL Packet Tags
-const (
-	wpt00Header = iota
-	wpt00WriteData
-	wpt00Checkpoint
-)
-
-const (
-	walTypeACIDFiler0 = iota
-)
-
-// ACIDFiler0 is a very simple, synchronous implementation of 2PC. It uses a
-// single write ahead log file to provide the structural atomicity
-// (BeginUpdate/EndUpdate/Rollback) and durability (DB can be recovered from
-// WAL if a crash occurred).
-//
-// ACIDFiler0 is a Filer.
-//
-// NOTE: Durable synchronous 2PC involves three fsyncs in this implementation
-// (WAL, DB, zero truncated WAL).  Where possible, it's recommended to collect
-// transactions for, say one second before performing the two phase commit as
-// the typical performance for rotational hard disks is about few tens of
-// fsyncs per second atmost. For an example of such collective transaction
-// approach please see the colecting FSM STT in Dbm's documentation[1].
-//
-//  [1]: http://godoc.org/github.com/cznic/exp/dbm
-type ACIDFiler0 struct {
-	*RollbackFiler
-	wal               *os.File
-	bwal              *bufio.Writer
-	data              []acidWrite
-	testHook          bool  // keeps WAL untruncated (once)
-	peakWal           int64 // tracks WAL maximum used size
-	peakBitFilerPages int   // track maximum transaction memory
-}
-
-// NewACIDFiler0 returns a  newly created ACIDFiler0 with WAL in wal.
-//
-// If the WAL is zero sized then a previous clean shutdown of db is taken for
-// granted and no recovery procedure is taken.
-//
-// If the WAL is of non zero size then it is checked for having a
-// commited/fully finished transaction not yet been reflected in db. If such
-// transaction exists it's committed to db. If the recovery process finishes
-// successfully, the WAL is truncated to zero size and fsync'ed prior to return
-// from NewACIDFiler0.
-func NewACIDFiler(db Filer, wal *os.File) (r *ACIDFiler0, err error) {
-	fi, err := wal.Stat()
-	if err != nil {
-		return
-	}
-
-	r = &ACIDFiler0{wal: wal}
-
-	if fi.Size() != 0 {
-		if err = r.recoverDb(db); err != nil {
-			return
-		}
-	}
-
-	acidWriter := (*acidWriter0)(r)
-
-	if r.RollbackFiler, err = NewRollbackFiler(
-		db,
-		func(sz int64) (err error) {
-			// Checkpoint
-			if err = acidWriter.writePacket([]interface{}{wpt00Checkpoint, sz}); err != nil {
-				return
-			}
-
-			if err = r.bwal.Flush(); err != nil {
-				return
-			}
-
-			r.bwal = nil
-
-			if err = r.wal.Sync(); err != nil {
-				return
-			}
-
-			wfi, err := r.wal.Stat()
-			switch err != nil {
-			case true:
-				// unexpected, but ignored
-			case false:
-				r.peakWal = mathutil.MaxInt64(wfi.Size(), r.peakWal)
-			}
-
-			// Phase 1 commit complete
-
-			for _, v := range r.data {
-				if _, err := db.WriteAt(v.b, v.off); err != nil {
-					return err
-				}
-			}
-
-			if err = db.Truncate(sz); err != nil {
-				return
-			}
-
-			if err = db.Sync(); err != nil {
-				return
-			}
-
-			// Phase 2 commit complete
-
-			if !r.testHook {
-				if err = r.wal.Truncate(0); err != nil {
-					return
-				}
-
-				if _, err = r.wal.Seek(0, 0); err != nil {
-					return
-				}
-			}
-
-			r.testHook = false
-			return r.wal.Sync()
-
-		},
-		acidWriter,
-	); err != nil {
-		return
-	}
-
-	return r, nil
-}
-
-// PeakWALSize reports the maximum size WAL has ever used.
-func (a ACIDFiler0) PeakWALSize() int64 {
-	return a.peakWal
-}
-
-func (a *ACIDFiler0) readPacket(f *bufio.Reader) (items []interface{}, err error) {
-	var b4 [4]byte
-	n, err := io.ReadAtLeast(f, b4[:], 4)
-	if n != 4 {
-		return
-	}
-
-	ln := int(binary.BigEndian.Uint32(b4[:]))
-	m := (4 + ln) % 16
-	padd := (16 - m) % 16
-	b := make([]byte, ln+padd)
-	if n, err = io.ReadAtLeast(f, b, len(b)); n != len(b) {
-		return
-	}
-
-	return DecodeScalars(b[:ln])
-}
-
-func (a *ACIDFiler0) recoverDb(db Filer) (err error) {
-	fi, err := a.wal.Stat()
-	if err != nil {
-		return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: err}
-	}
-
-	if sz := fi.Size(); sz%16 != 0 {
-		return &ErrILSEQ{Type: ErrFileSize, Name: a.wal.Name(), Arg: sz}
-	}
-
-	f := bufio.NewReader(a.wal)
-	items, err := a.readPacket(f)
-	if err != nil {
-		return
-	}
-
-	if len(items) != 3 || items[0] != int64(wpt00Header) || items[1] != int64(walTypeACIDFiler0) {
-		return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("invalid packet items %#v", items)}
-	}
-
-	tr := NewBTree(nil)
-
-	for {
-		items, err = a.readPacket(f)
-		if err != nil {
-			return
-		}
-
-		if len(items) < 2 {
-			return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("too few packet items %#v", items)}
-		}
-
-		switch items[0] {
-		case int64(wpt00WriteData):
-			if len(items) != 3 {
-				return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("invalid data packet items %#v", items)}
-			}
-
-			b, off := items[1].([]byte), items[2].(int64)
-			var key [8]byte
-			binary.BigEndian.PutUint64(key[:], uint64(off))
-			if err = tr.Set(key[:], b); err != nil {
-				return
-			}
-		case int64(wpt00Checkpoint):
-			var b1 [1]byte
-			if n, err := f.Read(b1[:]); n != 0 || err == nil {
-				return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("checkpoint n %d, err %v", n, err)}
-			}
-
-			if len(items) != 2 {
-				return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("checkpoint packet invalid items %#v", items)}
-			}
-
-			sz := items[1].(int64)
-			enum, err := tr.seekFirst()
-			if err != nil {
-				return err
-			}
-
-			for {
-				k, v, err := enum.current()
-				if err != nil {
-					if fileutil.IsEOF(err) {
-						break
-					}
-
-					return err
-				}
-
-				if _, err = db.WriteAt(v, int64(binary.BigEndian.Uint64(k))); err != nil {
-					return err
-				}
-
-				if err = enum.next(); err != nil {
-					if fileutil.IsEOF(err) {
-						break
-					}
-
-					return err
-				}
-			}
-
-			if err = db.Truncate(sz); err != nil {
-				return err
-			}
-
-			if err = db.Sync(); err != nil {
-				return err
-			}
-
-			// Recovery complete
-
-			if err = a.wal.Truncate(0); err != nil {
-				return err
-			}
-
-			return a.wal.Sync()
-		default:
-			return &ErrILSEQ{Type: ErrInvalidWAL, Name: a.wal.Name(), More: fmt.Sprintf("packet tag %v", items[0])}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc_docs.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc_docs.go
deleted file mode 100644
index 02c993b8ba..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc_docs.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-
-Anatomy of a WAL file
-
-WAL file
-	A sequence of packets
-
-WAL packet, parts in slice notation
-	[0:4],   4 bytes:        N uint32        // network byte order
-	[4:4+N], N bytes:        payload []byte  // gb encoded scalars
-
-Packets, including the 4 byte 'size' prefix, MUST BE padded to size == 0 (mod
-16). The values of the padding bytes MUST BE zero.
-
-Encoded scalars first item is a packet type number (packet tag). The meaning of
-any other item(s) of the payload depends on the packet tag.
-
-Packet definitions
-
-	{wpt00Header int, typ int, s string}
-		typ:	Must be zero (ACIDFiler0 file).
-		s:	Any comment string, empty string is okay.
-
-		This packet must be present only once - as the first packet of
-		a WAL file.
-
-	{wpt00WriteData int, b []byte, off int64}
-		Write data (WriteAt(b, off)).
-
-	{wpt00Checkpoint int, sz int64}
-		Checkpoint (Truncate(sz)).
-
-		This packet must be present only once - as the last packet of
-		a WAL file.
-
-*/
-
-package lldb
-
-//TODO optimize bitfiler/wal/2pc data above final size
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/AUTHORS b/Godeps/_workspace/src/github.com/cznic/exp/lldb/AUTHORS
deleted file mode 100644
index 0078f5f5b6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/AUTHORS
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/exp/lldb/CONTRIBUTORS
deleted file mode 100644
index 5e86f0607c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/CONTRIBUTORS
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/LICENSE b/Godeps/_workspace/src/github.com/cznic/exp/lldb/LICENSE
deleted file mode 100644
index 27e4447a49..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The lldb Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/Makefile b/Godeps/_workspace/src/github.com/cznic/exp/lldb/Makefile
deleted file mode 100644
index cd8248a8e5..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2014 The lldb Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-.PHONY: all editor clean cover nuke
-
-testbin=lldb.test
-grep=--include=*.go
-
-all: editor
-	go build
-	go vet
-	golint .
-	go install
-	make todo
-
-clean:
-	go clean
-	rm -f *~ cov cov.html bad-dump good-dump lldb.test old.txt new.txt \
-		test-acidfiler0-* _test.db _wal
-
-cover:
-	t=$(shell tempfile) ; go test -coverprofile $$t && go tool cover -html $$t && unlink $$t
-
-editor:
-	go fmt
-	go test -i
-	go test -timeout 1h
-	
-mem:
-	go test -c
-	./$(testbin) -test.bench . -test.memprofile mem.out -test.memprofilerate 1 -test.timeout 24h
-	go tool pprof --lines --web --alloc_space $(testbin) mem.out
-
-nuke: clean
-	go clean -i
-
-todo:
-	@grep -nr $(grep) BUG * || true
-	@grep -nr $(grep) LATER * || true
-	@grep -nr $(grep) MAYBE * || true
-	@grep -nr $(grep) TODO * || true
-	@grep -nr $(grep) FIXME * || true
-	@grep -nr $(grep) ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* * || true
-	@grep -nr $(grep) println * || true
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/README.md b/Godeps/_workspace/src/github.com/cznic/exp/lldb/README.md
deleted file mode 100644
index 470bf541d0..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-lldb
-====
-
-Package lldb (WIP) implements a low level database engine.
-
-Installation: $ go get github.com/cznic/exp/lldb
-
-Documentation: [godoc.org/github.com/cznic/exp/lldb](http://godoc.org/github.com/cznic/exp/lldb)
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree.go
deleted file mode 100644
index 57b0f39c62..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree.go
+++ /dev/null
@@ -1,2297 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package lldb
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"sort"
-	"strings"
-
-	"github.com/cznic/bufs"
-	"github.com/cznic/fileutil"
-	"github.com/cznic/sortutil"
-)
-
-const (
-	kData             = 256         // [1, 512]
-	kIndex            = 256         // [2, 2048]
-	kKV               = 19          // Size of the key/value field in btreeDataPage
-	kSz               = kKV - 1 - 7 // Content prefix size
-	kH                = kKV - 7     // Content field offset for handle
-	tagBTreeDataPage  = 1
-	tagBTreeIndexPage = 0
-)
-
-// BTree is a B+tree[1][2], i.e. a variant which speeds up
-// enumeration/iteration of the BTree. According to its origin it can be
-// volatile (backed only by memory) or non-volatile (backed by a non-volatile
-// Allocator).
-//
-// The specific implementation of BTrees in this package are B+trees with
-// delayed split/concatenation (discussed in e.g. [3]).
-//
-// Note: No BTree methods returns io.EOF for physical Filer reads/writes.  The
-// io.EOF is returned only by bTreeEnumerator methods to indicate "no more K-V
-// pair".
-//
-//  [1]: http://en.wikipedia.org/wiki/B+tree
-//  [2]: http://zgking.com:8080/home/donghui/publications/books/dshandbook_BTree.pdf
-//  [3]: http://people.cs.aau.dk/~simas/aalg06/UbiquitBtree.pdf
-type BTree struct {
-	store   btreeStore
-	root    btree
-	collate func(a, b []byte) int
-	serial  uint64
-}
-
-// NewBTree returns a new, memory-only BTree.
-func NewBTree(collate func(a, b []byte) int) *BTree {
-	store := newMemBTreeStore()
-	root, err := newBTree(store)
-	if err != nil { // should not happen
-		panic(err.Error())
-	}
-
-	return &BTree{store, root, collate, 0}
-}
-
-// IsMem reports if t is a memory only BTree.
-func (t *BTree) IsMem() (r bool) {
-	_, r = t.store.(*memBTreeStore)
-	return
-}
-
-// Clear empties the tree.
-func (t *BTree) Clear() (err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	t.serial++
-	return t.root.clear(t.store)
-}
-
-// Delete deletes key and its associated value from the tree.
-func (t *BTree) Delete(key []byte) (err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	t.serial++
-	_, err = t.root.extract(t.store, nil, t.collate, key)
-	return
-}
-
-// DeleteAny deletes one key and its associated value from the tree. If the
-// tree is empty on return then empty is true.
-func (t *BTree) DeleteAny() (empty bool, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	t.serial++
-	return t.root.deleteAny(t.store)
-}
-
-func elem(v interface{}) string {
-	switch x := v.(type) {
-	default:
-		panic("internal error")
-	case nil:
-		return "nil"
-	case bool:
-		if x {
-			return "true"
-		}
-
-		return "false"
-	case int64:
-		return fmt.Sprint(x)
-	case uint64:
-		return fmt.Sprint(x)
-	case float64:
-		s := fmt.Sprintf("%g", x)
-		if !strings.Contains(s, ".") {
-			s += "."
-		}
-		return s
-	case complex128:
-		s := fmt.Sprint(x)
-		return s[1 : len(s)-1]
-	case []byte:
-		return fmt.Sprintf("[]byte{% 02x}", x)
-	case string:
-		return fmt.Sprintf("%q", x)
-	}
-}
-
-// Dump outputs a human readable dump of t to w. It is usable iff t keys and
-// values are encoded scalars (see EncodeScalars). Intended use is only for
-// examples or debugging. Some type information is lost in the rendering, for
-// example a float value '17.' and an integer value '17' may both output as
-// '17'.
-func (t *BTree) Dump(w io.Writer) (err error) {
-	enum, err := t.seekFirst()
-	if err != nil {
-		return
-	}
-
-	for {
-		bkey, bval, err := enum.current()
-		if err != nil {
-			return err
-		}
-
-		key, err := DecodeScalars(bkey)
-		if err != nil {
-			return err
-		}
-
-		val, err := DecodeScalars(bval)
-		if err != nil {
-			return err
-		}
-
-		kk := []string{}
-		if key == nil {
-			kk = []string{"null"}
-		}
-		for _, v := range key {
-			kk = append(kk, elem(v))
-		}
-		vv := []string{}
-		if val == nil {
-			vv = []string{"null"}
-		}
-		for _, v := range val {
-			vv = append(vv, elem(v))
-		}
-		skey := strings.Join(kk, ", ")
-		sval := strings.Join(vv, ", ")
-		if len(vv) > 1 {
-			sval = fmt.Sprintf("[]interface{%s}", sval)
-		}
-		if _, err = fmt.Fprintf(w, "%s → %s\n", skey, sval); err != nil {
-			return err
-		}
-
-		err = enum.next()
-		if err != nil {
-			if fileutil.IsEOF(err) {
-				err = nil
-				break
-			}
-
-			return err
-		}
-	}
-	return
-}
-
-// Extract is a combination of Get and Delete. If the key exists in the tree,
-// it is returned (like Get) and also deleted from a tree in a more efficient
-// way which doesn't walk it twice.  The returned slice may be a sub-slice of
-// buf if buf was large enough to hold the entire content.  Otherwise, a newly
-// allocated slice will be returned.  It is valid to pass a nil buf.
-func (t *BTree) Extract(buf, key []byte) (value []byte, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	t.serial++
-	return t.root.extract(t.store, buf, t.collate, key)
-}
-
-// First returns the first KV pair of the tree, if it exists. Otherwise key == nil
-// and value == nil.
-func (t *BTree) First() (key, value []byte, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	var p btreeDataPage
-	if _, p, err = t.root.first(t.store); err != nil || p == nil {
-		return
-	}
-
-	if key, err = p.key(t.store, 0); err != nil {
-		return
-	}
-
-	value, err = p.value(t.store, 0)
-	return
-}
-
-// Get returns the value associated with key, or nil if no such value exists.
-// The returned slice may be a sub-slice of buf if buf was large enough to hold
-// the entire content.  Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil buf.
-//
-// Get is safe for concurrent access by multiple goroutines iff no other
-// goroutine mutates the tree.
-func (t *BTree) Get(buf, key []byte) (value []byte, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	buffer := bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(buffer)
-	if buffer, err = t.root.get(t.store, buffer, t.collate, key); buffer == nil || err != nil {
-		return
-	}
-
-	value = need(len(buffer), buf)
-	copy(value, buffer)
-	return
-}
-
-// Handle reports t's handle.
-func (t *BTree) Handle() int64 {
-	return int64(t.root)
-}
-
-// Last returns the last KV pair of the tree, if it exists. Otherwise key == nil
-// and value == nil.
-func (t *BTree) Last() (key, value []byte, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	var p btreeDataPage
-	if _, p, err = t.root.last(t.store); err != nil || p == nil {
-		return
-	}
-
-	index := p.len() - 1
-	if key, err = p.key(t.store, index); err != nil {
-		return
-	}
-
-	value, err = p.value(t.store, index)
-	return
-}
-
-// Put combines Get and Set in a more efficient way where the tree is walked
-// only once.  The upd(ater) receives the current (key, old-value), if that
-// exists or (key, nil) otherwise.  It can then return a (new-value, true, nil)
-// to create or overwrite the existing value in the KV pair, or (whatever,
-// false, nil) if it decides not to create or not to update the value of the KV
-// pair.
-//
-// 	tree.Set(k, v)
-//
-// conceptually equals
-//
-// 	tree.Put(k, func(k, v []byte){ return v, true }([]byte, bool))
-//
-// modulo the differing return values.
-//
-// The returned slice may be a sub-slice of buf if buf was large enough to hold
-// the entire content.  Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil buf.
-func (t *BTree) Put(buf, key []byte, upd func(key, old []byte) (new []byte, write bool, err error)) (old []byte, written bool, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	t.serial++
-	return t.root.put2(buf, t.store, t.collate, key, upd)
-}
-
-// Seek returns an Enumerator with "position" or an error of any. Normally the
-// position is on a KV pair such that key >= KV.key. Then hit is key == KV.key.
-// The position is possibly "after" the last KV pair, but that is not an error.
-//
-// Seek is safe for concurrent access by multiple goroutines iff no other
-// goroutine mutates the tree.
-func (t *BTree) Seek(key []byte) (enum *BTreeEnumerator, hit bool, err error) {
-	enum0, hit, err := t.seek(key)
-	if err != nil {
-		return
-	}
-
-	enum = &BTreeEnumerator{
-		enum:     enum0,
-		firstHit: hit,
-		key:      append([]byte(nil), key...),
-	}
-	return
-}
-
-func (t *BTree) seek(key []byte) (enum *bTreeEnumerator, hit bool, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	r := &bTreeEnumerator{t: t, collate: t.collate, serial: t.serial}
-	if r.p, r.index, hit, err = t.root.seek(t.store, r.collate, key); err != nil {
-		return
-	}
-
-	enum = r
-	return
-}
-
-// IndexSeek returns an Enumerator with "position" or an error of any. Normally
-// the position is on a KV pair such that key >= KV.key. Then hit is key ==
-// KV.key.  The position is possibly "after" the last KV pair, but that is not
-// an error.  The collate function originally passed to CreateBTree is used for
-// enumerating the tree but a custom collate function c is used for IndexSeek.
-//
-// IndexSeek is safe for concurrent access by multiple goroutines iff no other
-// goroutine mutates the tree.
-func (t *BTree) IndexSeek(key []byte, c func(a, b []byte) int) (enum *BTreeEnumerator, hit bool, err error) { //TODO +test
-	enum0, hit, err := t.indexSeek(key, c)
-	if err != nil {
-		return
-	}
-
-	enum = &BTreeEnumerator{
-		enum:     enum0,
-		firstHit: hit,
-		key:      append([]byte(nil), key...),
-	}
-	return
-}
-
-func (t *BTree) indexSeek(key []byte, c func(a, b []byte) int) (enum *bTreeEnumerator, hit bool, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	r := &bTreeEnumerator{t: t, collate: t.collate, serial: t.serial}
-	if r.p, r.index, hit, err = t.root.seek(t.store, c, key); err != nil {
-		return
-	}
-
-	enum = r
-	return
-}
-
-// seekFirst returns an enumerator positioned on the first KV pair in the tree,
-// if any.  For an empty tree, err == io.EOF is returend.
-//
-// SeekFirst is safe for concurrent access by multiple goroutines iff no other
-// goroutine mutates the tree.
-func (t *BTree) SeekFirst() (enum *BTreeEnumerator, err error) {
-	enum0, err := t.seekFirst()
-	if err != nil {
-		return
-	}
-
-	var key []byte
-	if key, _, err = enum0.current(); err != nil {
-		return
-	}
-
-	enum = &BTreeEnumerator{
-		enum:     enum0,
-		firstHit: true,
-		key:      append([]byte(nil), key...),
-	}
-	return
-}
-
-func (t *BTree) seekFirst() (enum *bTreeEnumerator, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	var p btreeDataPage
-	if _, p, err = t.root.first(t.store); err == nil && p == nil {
-		err = io.EOF
-	}
-	if err != nil {
-		return
-	}
-
-	return &bTreeEnumerator{t: t, collate: t.collate, p: p, index: 0, serial: t.serial}, nil
-}
-
-// seekLast returns an enumerator positioned on the last KV pair in the tree,
-// if any.  For an empty tree, err == io.EOF is returend.
-//
-// SeekLast is safe for concurrent access by multiple goroutines iff no other
-// goroutine mutates the tree.
-func (t *BTree) SeekLast() (enum *BTreeEnumerator, err error) {
-	enum0, err := t.seekLast()
-	if err != nil {
-		return
-	}
-
-	var key []byte
-	if key, _, err = enum0.current(); err != nil {
-		return
-	}
-
-	enum = &BTreeEnumerator{
-		enum:     enum0,
-		firstHit: true,
-		key:      append([]byte(nil), key...),
-	}
-	return
-}
-
-func (t *BTree) seekLast() (enum *bTreeEnumerator, err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	var p btreeDataPage
-	if _, p, err = t.root.last(t.store); err == nil && p == nil {
-		err = io.EOF
-	}
-	if err != nil {
-		return
-	}
-
-	return &bTreeEnumerator{t: t, collate: t.collate, p: p, index: p.len() - 1, serial: t.serial}, nil
-}
-
-// Set sets the value associated with key. Any previous value, if existed, is
-// overwritten by the new one.
-func (t *BTree) Set(key, value []byte) (err error) {
-	if t == nil {
-		err = errors.New("BTree method invoked on nil receiver")
-		return
-	}
-
-	t.serial++
-	dst := bufs.GCache.Get(maxBuf)
-	_, err = t.root.put(dst, t.store, t.collate, key, value, true)
-	bufs.GCache.Put(dst)
-	return
-}
-
-// bTreeEnumerator is a closure of a BTree and a position. It is returned from
-// BTree.seek.
-//
-// NOTE: bTreeEnumerator cannot be used after its BTree was mutated after the
-// bTreeEnumerator was acquired from any of the seek, seekFirst, seekLast
-// methods.
-type bTreeEnumerator struct {
-	t       *BTree
-	collate func(a, b []byte) int
-	p       btreeDataPage
-	index   int
-	serial  uint64
-}
-
-// Current returns the KV pair the enumerator is currently positioned on. If
-// the position is before the first KV pair in the tree or after the last KV
-// pair in the tree then err == io.EOF is returned.
-//
-// If the enumerator has been invalidated by updating the tree, ErrINVAL is
-// returned.
-func (e *bTreeEnumerator) current() (key, value []byte, err error) {
-	if e == nil {
-		err = errors.New("bTreeEnumerator method invoked on nil receiver")
-		return
-	}
-
-	if e.serial != e.t.serial {
-		err = &ErrINVAL{Src: "bTreeEnumerator invalidated by updating the tree"}
-		return
-	}
-
-	if e.p == nil || e.index == e.p.len() {
-		return nil, nil, io.EOF
-	}
-
-	if key, err = e.p.key(e.t.store, e.index); err != nil {
-		return
-	}
-
-	value, err = e.p.value(e.t.store, e.index)
-	return
-}
-
-// Next attempts to position the enumerator onto the next KV pair wrt the
-// current position. If there is no "next" KV pair, io.EOF is returned.
-//
-// If the enumerator has been invalidated by updating the tree, ErrINVAL is
-// returned.
-func (e *bTreeEnumerator) next() (err error) {
-	if e == nil {
-		err = errors.New("bTreeEnumerator method invoked on nil receiver")
-		return
-	}
-
-	if e.serial != e.t.serial {
-		err = &ErrINVAL{Src: "bTreeEnumerator invalidated by updating the tree"}
-		return
-	}
-
-	if e.p == nil {
-		return io.EOF
-	}
-
-	switch {
-	case e.index < e.p.len()-1:
-		e.index++
-	default:
-		ph := e.p.next()
-		if ph == 0 {
-			err = io.EOF
-			break
-		}
-
-		if e.p, err = e.t.store.Get(e.p, ph); err != nil {
-			e.p = nil
-			return
-		}
-		e.index = 0
-	}
-	return
-}
-
-// Prev attempts to position the enumerator onto the previous KV pair wrt the
-// current position. If there is no "previous" KV pair, io.EOF is returned.
-//
-// If the enumerator has been invalidated by updating the tree, ErrINVAL is
-// returned.
-func (e *bTreeEnumerator) prev() (err error) {
-	if e == nil {
-		err = errors.New("bTreeEnumerator method invoked on nil receiver")
-		return
-	}
-
-	if e.serial != e.t.serial {
-		err = &ErrINVAL{Src: "bTreeEnumerator invalidated by updating the tree"}
-		return
-	}
-
-	if e.p == nil {
-		return io.EOF
-	}
-
-	switch {
-	case e.index > 0:
-		e.index--
-	default:
-		ph := e.p.prev()
-		if ph == 0 {
-			err = io.EOF
-			break
-		}
-
-		if e.p, err = e.t.store.Get(e.p, ph); err != nil {
-			e.p = nil
-			return
-		}
-		e.index = e.p.len() - 1
-	}
-	return
-}
-
-// BTreeEnumerator captures the state of enumerating a tree. It is returned
-// from the Seek* methods.  The enumerator is aware of any mutations made to
-// the tree in the process of enumerating it and automatically resumes the
-// enumeration.
-type BTreeEnumerator struct {
-	enum     *bTreeEnumerator
-	err      error
-	key      []byte
-	firstHit bool
-}
-
-// Next returns the currently enumerated KV pair, if it exists and moves to the
-// next KV in the key collation order. If there is no KV pair to return, err ==
-// io.EOF is returned.
-//
-// Next is safe for concurrent access by multiple goroutines iff no other
-// goroutine mutates the tree.
-func (e *BTreeEnumerator) Next() (key, value []byte, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	canRetry := true
-retry:
-	if key, value, err = e.enum.current(); err != nil {
-		if _, ok := err.(*ErrINVAL); !ok || !canRetry {
-			e.err = err
-			return
-		}
-
-		canRetry = false
-		var hit bool
-		if e.enum, hit, err = e.enum.t.seek(e.key); err != nil {
-			e.err = err
-			return
-		}
-
-		if !e.firstHit && hit {
-			err = e.enum.next()
-			if err != nil {
-				e.err = err
-				return
-			}
-		}
-
-		goto retry
-	}
-
-	e.firstHit = false
-	e.key = append([]byte(nil), key...)
-	e.err = e.enum.next()
-	return
-}
-
-// Prev returns the currently enumerated KV pair, if it exists and moves to the
-// previous KV in the key collation order. If there is no KV pair to return,
-// err == io.EOF is returned.
-//
-// Prev is safe for concurrent access by multiple goroutines iff no other
-// goroutine mutates the tree.
-func (e *BTreeEnumerator) Prev() (key, value []byte, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	canRetry := true
-retry:
-	if key, value, err = e.enum.current(); err != nil {
-		if _, ok := err.(*ErrINVAL); !ok || !canRetry {
-			e.err = err
-			return
-		}
-
-		canRetry = false
-		var hit bool
-		if e.enum, hit, err = e.enum.t.seek(e.key); err != nil {
-			e.err = err
-			return
-		}
-
-		if !e.firstHit && hit {
-			err = e.enum.prev()
-			if err != nil {
-				e.err = err
-				return
-			}
-		}
-
-		goto retry
-	}
-
-	e.firstHit = false
-	e.key = append([]byte(nil), key...)
-	e.err = e.enum.prev()
-	return
-}
-
-// CreateBTree creates a new BTree in store. It returns the tree, its (freshly
-// assigned) handle (for OpenBTree or RemoveBTree) or an error, if any.
-func CreateBTree(store *Allocator, collate func(a, b []byte) int) (bt *BTree, handle int64, err error) {
-	r := &BTree{store: store, collate: collate}
-	if r.root, err = newBTree(store); err != nil {
-		return
-	}
-
-	return r, int64(r.root), nil
-}
-
-// OpenBTree opens a store's BTree using handle. It returns the tree or an
-// error, if any. The same tree may be opened more than once, but operations on
-// the separate instances should not ever overlap or void the other instances.
-// However, the intended API usage is to open the same tree handle only once
-// (handled by some upper layer "dispatcher").
-func OpenBTree(store *Allocator, collate func(a, b []byte) int, handle int64) (bt *BTree, err error) {
-	r := &BTree{store: store, root: btree(handle), collate: collate}
-	b := bufs.GCache.Get(7)
-	defer bufs.GCache.Put(b)
-	if b, err = store.Get(b, handle); err != nil {
-		return
-	}
-
-	if len(b) != 7 {
-		return nil, &ErrILSEQ{Off: h2off(handle), More: "btree.go:671"}
-	}
-
-	return r, nil
-}
-
-// RemoveBTree removes tree, represented by handle from store. Empty trees are
-// cheap, each uses only few bytes of the store. If there's a chance that a
-// tree will eventually get reused (non empty again), it's recommended to
-// not/never remove it.  One advantage of such approach is a stable handle of
-// such tree.
-func RemoveBTree(store *Allocator, handle int64) (err error) {
-	tree, err := OpenBTree(store, nil, handle)
-	if err != nil {
-		return
-	}
-
-	if err = tree.Clear(); err != nil {
-		return
-	}
-
-	return store.Free(handle)
-}
-
-type btreeStore interface {
-	Alloc(b []byte) (handle int64, err error)
-	Free(handle int64) (err error)
-	Get(dst []byte, handle int64) (b []byte, err error)
-	Realloc(handle int64, b []byte) (err error)
-}
-
-// Read only zero bytes
-var zeros [2 * kKV]byte
-
-func init() {
-	if kData < 1 || kData > 512 {
-		panic(fmt.Errorf("kData %d: out of limits", kData))
-	}
-
-	if kIndex < 2 || kIndex > 2048 {
-		panic(fmt.Errorf("kIndex %d: out of limits", kIndex))
-	}
-
-	if kKV < 8 || kKV > 23 {
-		panic(fmt.Errorf("kKV %d: out of limits", kKV))
-	}
-
-	if n := len(zeros); n < 15 {
-		panic(fmt.Errorf("not enough zeros: %d", n))
-	}
-}
-
-type memBTreeStore struct {
-	h int64
-	m map[int64][]byte
-}
-
-func newMemBTreeStore() *memBTreeStore {
-	return &memBTreeStore{h: 0, m: map[int64][]byte{}}
-}
-
-func (s *memBTreeStore) String() string {
-	var a sortutil.Int64Slice
-	for k := range s.m {
-		a = append(a, k)
-	}
-	sort.Sort(a)
-	var sa []string
-	for _, k := range a {
-		sa = append(sa, fmt.Sprintf("%#x:|% x|", k, s.m[k]))
-	}
-	return strings.Join(sa, "\n")
-}
-
-func (s *memBTreeStore) Alloc(b []byte) (handle int64, err error) {
-	s.h++
-	handle = s.h
-	s.m[handle] = bpack(b)
-	return
-}
-
-func (s *memBTreeStore) Free(handle int64) (err error) {
-	if _, ok := s.m[handle]; !ok {
-		return &ErrILSEQ{Type: ErrOther, Off: h2off(handle), More: "btree.go:754"}
-	}
-
-	delete(s.m, handle)
-	return
-}
-
-func (s *memBTreeStore) Get(dst []byte, handle int64) (b []byte, err error) {
-	r, ok := s.m[handle]
-	if !ok {
-		return nil, &ErrILSEQ{Type: ErrOther, Off: h2off(handle), More: "btree.go:764"}
-	}
-
-	b = need(len(r), dst)
-	copy(b, r)
-	return
-}
-
-func (s *memBTreeStore) Realloc(handle int64, b []byte) (err error) {
-	if _, ok := s.m[handle]; !ok {
-		return &ErrILSEQ{Type: ErrOther, Off: h2off(handle), More: "btree.go:774"}
-	}
-
-	s.m[handle] = bpack(b)
-	return
-}
-
-/*
-
-0...0 (1 bytes):
-Flag
-
-	  0
-	+---+
-	| 0 |
-	+---+
-
-0 indicates an index page
-
-1...count*14-1
-"array" of items, 14 bytes each. Count of items in kIndex-1..2*kIndex+2
-
-	Count = (len(raw) - 8) / 14
-
-	  0..6     7..13
-	+-------+----------+
-	| Child | DataPage |
-	+-------+----------+
-
-	Child    == handle of a child index page
-	DataPage == handle of a data page
-
-Offsets into the raw []byte:
-Child[X]    == 1+14*X
-DataPage[X] == 8+14*X
-
-*/
-type btreeIndexPage []byte
-
-func newBTreeIndexPage(leftmostChild int64) (p btreeIndexPage) {
-	p = bufs.GCache.Get(1 + (kIndex+1)*2*7)[:8]
-	p[0] = tagBTreeIndexPage
-	h2b(p[1:], leftmostChild)
-	return
-}
-
-func (p btreeIndexPage) len() int {
-	return (len(p) - 8) / 14
-}
-
-func (p btreeIndexPage) child(index int) int64 {
-	return b2h(p[1+14*index:])
-}
-
-func (p btreeIndexPage) setChild(index int, dp int64) {
-	h2b(p[1+14*index:], dp)
-}
-
-func (p btreeIndexPage) dataPage(index int) int64 {
-	return b2h(p[8+14*index:])
-}
-
-func (p btreeIndexPage) setDataPage(index int, dp int64) {
-	h2b(p[8+14*index:], dp)
-}
-
-func (q btreeIndexPage) insert(index int) btreeIndexPage {
-	switch len0 := q.len(); {
-	case index < len0:
-		has := len(q)
-		need := has + 14
-		switch {
-		case cap(q) >= need:
-			q = q[:need]
-		default:
-			q = append(q, zeros[:14]...)
-		}
-		copy(q[8+14*(index+1):8+14*(index+1)+2*(len0-index)*7], q[8+14*index:])
-	case index == len0:
-		has := len(q)
-		need := has + 14
-		switch {
-		case cap(q) >= need:
-			q = q[:need]
-		default:
-			q = append(q, zeros[:14]...)
-		}
-	}
-	return q
-}
-
-func (p btreeIndexPage) insert3(index int, dataPage, child int64) btreeIndexPage {
-	p = p.insert(index)
-	p.setDataPage(index, dataPage)
-	p.setChild(index+1, child)
-	return p
-}
-
-func (p btreeIndexPage) cmp(a btreeStore, c func(a, b []byte) int, keyA []byte, keyBIndex int) (int, error) {
-	b := bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(b)
-	dp, err := a.Get(b, p.dataPage(keyBIndex))
-	if err != nil {
-		return 0, err
-	}
-
-	return btreeDataPage(dp).cmp(a, c, keyA, 0)
-}
-
-func (q btreeIndexPage) setLen(n int) btreeIndexPage {
-	q = q[:cap(q)]
-	need := 8 + 14*n
-	if need < len(q) {
-		return q[:need]
-	}
-	return append(q, make([]byte, need-len(q))...)
-}
-
-func (p btreeIndexPage) split(a btreeStore, root btree, ph *int64, parent int64, parentIndex int, index *int) (btreeIndexPage, error) {
-	right := newBTreeIndexPage(0)
-	canRecycle := true
-	defer func() {
-		if canRecycle {
-			bufs.GCache.Put(right)
-		}
-	}()
-	right = right.setLen(kIndex)
-	copy(right[1:1+(2*kIndex+1)*7], p[1+14*(kIndex+1):])
-	p = p.setLen(kIndex)
-	if err := a.Realloc(*ph, p); err != nil {
-		return nil, err
-	}
-
-	rh, err := a.Alloc(right)
-	if err != nil {
-		return nil, err
-	}
-
-	if parentIndex >= 0 {
-		var pp btreeIndexPage = bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(pp)
-		if pp, err = a.Get(pp, parent); err != nil {
-			return nil, err
-		}
-		pp = pp.insert3(parentIndex, p.dataPage(kIndex), rh)
-		if err = a.Realloc(parent, pp); err != nil {
-			return nil, err
-		}
-
-	} else {
-		nr := newBTreeIndexPage(*ph)
-		defer bufs.GCache.Put(nr)
-		nr = nr.insert3(0, p.dataPage(kIndex), rh)
-		nrh, err := a.Alloc(nr)
-		if err != nil {
-			return nil, err
-		}
-
-		if err = a.Realloc(int64(root), h2b(make([]byte, 7), nrh)); err != nil {
-			return nil, err
-		}
-	}
-	if *index > kIndex {
-		p = right
-		canRecycle = false
-		*ph = rh
-		*index -= kIndex + 1
-	}
-	return p, nil
-}
-
-// p is dirty on return
-func (p btreeIndexPage) extract(index int) btreeIndexPage {
-	n := p.len() - 1
-	if index < n {
-		sz := (n-index)*14 + 7
-		copy(p[1+14*index:1+14*index+sz], p[1+14*(index+1):])
-	}
-	return p.setLen(n)
-}
-
-// must persist all changes made
-func (p btreeIndexPage) underflow(a btreeStore, root, iroot, parent int64, ph *int64, parentIndex int, index *int) (btreeIndexPage, error) {
-	lh, rh, err := checkSiblings(a, parent, parentIndex)
-	if err != nil {
-		return nil, err
-	}
-
-	var left btreeIndexPage = bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(left)
-
-	if lh != 0 {
-		if left, err = a.Get(left, lh); err != nil {
-			return nil, err
-		}
-
-		if lc := btreeIndexPage(left).len(); lc > kIndex {
-			var pp = bufs.GCache.Get(maxBuf)
-			defer bufs.GCache.Put(pp)
-			if pp, err = a.Get(pp, parent); err != nil {
-				return nil, err
-			}
-
-			pc := p.len()
-			p = p.setLen(pc + 1)
-			di, si, sz := 1+1*14, 1+0*14, (2*pc+1)*7
-			copy(p[di:di+sz], p[si:])
-			p.setChild(0, btreeIndexPage(left).child(lc))
-			p.setDataPage(0, btreeIndexPage(pp).dataPage(parentIndex-1))
-			*index++
-			btreeIndexPage(pp).setDataPage(parentIndex-1, btreeIndexPage(left).dataPage(lc-1))
-			left = left.setLen(lc - 1)
-			if err = a.Realloc(parent, pp); err != nil {
-				return nil, err
-			}
-
-			if err = a.Realloc(*ph, p); err != nil {
-				return nil, err
-			}
-
-			return p, a.Realloc(lh, left)
-		}
-	}
-
-	if rh != 0 {
-		right := bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(right)
-		if right, err = a.Get(right, rh); err != nil {
-			return nil, err
-		}
-
-		if rc := btreeIndexPage(right).len(); rc > kIndex {
-			pp := bufs.GCache.Get(maxBuf)
-			defer bufs.GCache.Put(pp)
-			if pp, err = a.Get(pp, parent); err != nil {
-				return nil, err
-			}
-
-			pc := p.len()
-			p = p.setLen(pc + 1)
-			p.setDataPage(pc, btreeIndexPage(pp).dataPage(parentIndex))
-			pc++
-			p.setChild(pc, btreeIndexPage(right).child(0))
-			btreeIndexPage(pp).setDataPage(parentIndex, btreeIndexPage(right).dataPage(0))
-			di, si, sz := 1+0*14, 1+1*14, (2*rc+1)*7
-			copy(right[di:di+sz], right[si:])
-			right = btreeIndexPage(right).setLen(rc - 1)
-			if err = a.Realloc(parent, pp); err != nil {
-				return nil, err
-			}
-
-			if err = a.Realloc(*ph, p); err != nil {
-				return nil, err
-			}
-
-			return p, a.Realloc(rh, right)
-		}
-	}
-
-	if lh != 0 {
-		*index += left.len() + 1
-		if left, err = left.concat(a, root, iroot, parent, lh, *ph, parentIndex-1); err != nil {
-			return p, err
-		}
-
-		p, *ph = left, lh
-		return p, nil
-	}
-
-	return p.concat(a, root, iroot, parent, *ph, rh, parentIndex)
-}
-
-// must persist all changes made
-func (p btreeIndexPage) concat(a btreeStore, root, iroot, parent, ph, rh int64, parentIndex int) (btreeIndexPage, error) {
-	pp := bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(pp)
-	pp, err := a.Get(pp, parent)
-	if err != nil {
-		return nil, err
-	}
-
-	right := bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(right)
-	if right, err = a.Get(right, rh); err != nil {
-		return nil, err
-	}
-
-	pc := p.len()
-	rc := btreeIndexPage(right).len()
-	p = p.setLen(pc + rc + 1)
-	p.setDataPage(pc, btreeIndexPage(pp).dataPage(parentIndex))
-	di, si, sz := 1+14*(pc+1), 1+0*14, (2*rc+1)*7
-	copy(p[di:di+sz], right[si:])
-	if err := a.Realloc(ph, p); err != nil {
-		return nil, err
-	}
-
-	if err := a.Free(rh); err != nil {
-		return nil, err
-	}
-
-	if pc := btreeIndexPage(pp).len(); pc > 1 {
-		if parentIndex < pc-1 {
-			di, si, sz := 8+parentIndex*14, 8+(parentIndex+1)*14, 2*(pc-1-parentIndex)*7
-			copy(pp[di:si+sz], pp[si:])
-		}
-		pp = btreeIndexPage(pp).setLen(pc - 1)
-		return p, a.Realloc(parent, pp)
-	}
-
-	if err := a.Free(iroot); err != nil {
-		return nil, err
-	}
-
-	b7 := bufs.GCache.Get(7)
-	defer bufs.GCache.Put(b7)
-	return p, a.Realloc(root, h2b(b7[:7], ph))
-}
-
-/*
-
-0...0 (1 bytes):
-Flag
-
-	  0
-	+---+
-	| 1 |
-	+---+
-
-1 indicates a data page
-
-1...14 (14 bytes)
-
-	  1..7  8..14
-	+------+------+
-	| Prev | Next |
-	+------+------+
-
-	Prev, Next == Handles of the data pages doubly linked list
-
-	Count = (len(raw) - 15) / (2*kKV)
-
-15...count*2*kKV-1
-"array" of items, 2*kKV bytes each. Count of items in kData-1..2*kData
-
-Item
-	  0..kKV-1   kKV..2*kKV-1
-	+----------+--------------+
-	|   Key    |    Value     |
-	+----------+--------------+
-
-Key/Value encoding
-
-Length 0...kKV-1
-
-	  0    1...N    N+1...kKV-1
-	+---+---------+-------------+
-	| N |  Data   |  Padding    |
-	+---+---------+-------------+
-
-	N       == content length
-	Data    == Key or Value content
-	Padding == MUST be zero bytes
-
-Length >= kKV
-
-	   0     1...kkV-8   kKV-7...kkV-1
-	+------+-----------+--------------+
-	| 0xFF |   Data    |      H       |
-	+------+-----------+--------------+
-
-	Data == Key or Value content, first kKV-7 bytes
-	H    == Handle to THE REST of the content, w/o the first bytes in Data.
-
-Offsets into the raw []byte:
-Key[X]   == 15+2*kKV*X
-Value[X] == 15+kKV+2*kKV*X
-*/
-type btreeDataPage []byte
-
-func newBTreeDataPage() (p btreeDataPage) {
-	p = bufs.GCache.Cget(1 + 2*7 + (kData+1)*2*kKV)[:1+2*7]
-	p[0] = tagBTreeDataPage
-	return
-}
-
-func newBTreeDataPageAlloc(a btreeStore) (p btreeDataPage, h int64, err error) {
-	p = newBTreeDataPage()
-	h, err = a.Alloc(p)
-	return
-}
-
-func (p btreeDataPage) len() int {
-	return (len(p) - 15) / (2 * kKV)
-}
-
-func (q btreeDataPage) setLen(n int) btreeDataPage {
-	q = q[:cap(q)]
-	need := 15 + 2*kKV*n
-	if need < len(q) {
-		return q[:need]
-	}
-	return append(q, make([]byte, need-len(q))...)
-}
-
-func (p btreeDataPage) prev() int64 {
-	return b2h(p[1:])
-}
-
-func (p btreeDataPage) next() int64 {
-	return b2h(p[8:])
-}
-
-func (p btreeDataPage) setPrev(h int64) {
-	h2b(p[1:], h)
-}
-
-func (p btreeDataPage) setNext(h int64) {
-	h2b(p[8:], h)
-}
-
-func (q btreeDataPage) insert(index int) btreeDataPage {
-	switch len0 := q.len(); {
-	case index < len0:
-		has := len(q)
-		need := has + 2*kKV
-		switch {
-		case cap(q) >= need:
-			q = q[:need]
-		default:
-			q = append(q, zeros[:2*kKV]...)
-		}
-		q.copy(q, index+1, index, len0-index)
-		return q
-	case index == len0:
-		has := len(q)
-		need := has + 2*kKV
-		switch {
-		case cap(q) >= need:
-			return q[:need]
-		default:
-			return append(q, zeros[:2*kKV]...)
-		}
-	}
-	panic("internal error")
-}
-
-func (p btreeDataPage) contentField(off int) (b []byte, h int64) {
-	p = p[off:]
-	switch n := int(p[0]); {
-	case n >= kKV: // content has a handle
-		b = append([]byte(nil), p[1:1+kSz]...)
-		h = b2h(p[kH:])
-	default: // content is embedded
-		b, h = append([]byte(nil), p[1:1+n]...), 0
-	}
-	return
-}
-
-func (p btreeDataPage) content(a btreeStore, off int) (b []byte, err error) {
-	b, h := p.contentField(off)
-	if h == 0 {
-		return
-	}
-
-	// content has a handle
-	b2, err := a.Get(nil, h) //TODO buffers: Later, not a public API
-	if err != nil {
-		return nil, err
-	}
-
-	return append(b, b2...), nil
-}
-
-func (p btreeDataPage) setContent(a btreeStore, off int, b []byte) (err error) {
-	p = p[off:]
-	switch {
-	case p[0] >= kKV: // existing content has a handle
-		switch n := len(b); {
-		case n < kKV:
-			p[0] = byte(n)
-			if err = a.Free(b2h(p[kH:])); err != nil {
-				return
-			}
-			copy(p[1:], b)
-		default:
-			// reuse handle
-			copy(p[1:1+kSz], b)
-			return a.Realloc(b2h(p[kH:]), b[kSz:])
-		}
-	default: // existing content is embedded
-		switch n := len(b); {
-		case n < kKV:
-			p[0] = byte(n)
-			copy(p[1:], b)
-		default:
-			p[0] = 0xff
-			copy(p[1:1+kSz], b)
-			h, err := a.Alloc(b[kSz:])
-			if err != nil {
-				return err
-			}
-
-			h2b(p[kH:], h)
-		}
-	}
-	return
-}
-
-func (p btreeDataPage) keyField(index int) (b []byte, h int64) {
-	return p.contentField(15 + 2*kKV*index)
-}
-
-func (p btreeDataPage) key(a btreeStore, index int) (b []byte, err error) {
-	return p.content(a, 15+2*kKV*index)
-}
-
-func (p btreeDataPage) valueField(index int) (b []byte, h int64) {
-	return p.contentField(15 + kKV + 2*kKV*index)
-}
-
-func (p btreeDataPage) value(a btreeStore, index int) (b []byte, err error) {
-	return p.content(a, 15+kKV+2*kKV*index)
-}
-
-func (p btreeDataPage) valueCopy(a btreeStore, index int) (b []byte, err error) {
-	if b, err = p.content(a, 15+kKV+2*kKV*index); err != nil {
-		return
-	}
-
-	return append([]byte(nil), b...), nil
-}
-
-func (p btreeDataPage) setKey(a btreeStore, index int, key []byte) (err error) {
-	return p.setContent(a, 15+2*kKV*index, key)
-}
-
-func (p btreeDataPage) setValue(a btreeStore, index int, value []byte) (err error) {
-	return p.setContent(a, 15+kKV+2*kKV*index, value)
-}
-
-func (p btreeDataPage) cmp(a btreeStore, c func(a, b []byte) int, keyA []byte, keyBIndex int) (y int, err error) {
-	var keyB []byte
-	if keyB, err = p.content(a, 15+2*kKV*keyBIndex); err != nil {
-		return
-	}
-
-	return c(keyA, keyB), nil
-}
-
-func (p btreeDataPage) copy(src btreeDataPage, di, si, n int) {
-	do, so := 15+2*kKV*di, 15+2*kKV*si
-	copy(p[do:do+2*kKV*n], src[so:])
-}
-
-// {p,left} dirty on exit
-func (p btreeDataPage) moveLeft(left btreeDataPage, n int) (btreeDataPage, btreeDataPage) {
-	nl, np := left.len(), p.len()
-	left = left.setLen(nl + n)
-	left.copy(p, nl, 0, n)
-	p.copy(p, 0, n, np-n)
-	return p.setLen(np - n), left
-}
-
-func (p btreeDataPage) moveRight(right btreeDataPage, n int) (btreeDataPage, btreeDataPage) {
-	nr, np := right.len(), p.len()
-	right = right.setLen(nr + n)
-	right.copy(right, n, 0, nr)
-	right.copy(p, 0, np-n, n)
-	return p.setLen(np - n), right
-}
-
-func (p btreeDataPage) insertItem(a btreeStore, index int, key, value []byte) (btreeDataPage, error) {
-	p = p.insert(index)
-	di, sz := 15+2*kKV*index, 2*kKV
-	copy(p[di:di+sz], zeros[:sz])
-	if err := p.setKey(a, index, key); err != nil {
-		return nil, err
-	}
-	return p, p.setValue(a, index, value)
-}
-
-func (p btreeDataPage) split(a btreeStore, root, ph, parent int64, parentIndex, index int, key, value []byte) (btreeDataPage, error) {
-	right, rh, err := newBTreeDataPageAlloc(a)
-	// fails defer bufs.GCache.Put(right)
-	if err != nil {
-		return nil, err
-	}
-
-	if next := p.next(); next != 0 {
-		right.setNext(p.next())
-		nxh := right.next()
-		nx := bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(nx)
-		if nx, err = a.Get(nx, nxh); err != nil {
-			return nil, err
-		}
-
-		btreeDataPage(nx).setPrev(rh)
-		if err = a.Realloc(nxh, nx); err != nil {
-			return nil, err
-		}
-	}
-
-	p.setNext(rh)
-	right.setPrev(ph)
-	right = right.setLen(kData)
-	right.copy(p, 0, kData, kData)
-	p = p.setLen(kData)
-
-	if parentIndex >= 0 {
-		var pp btreeIndexPage = bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(pp)
-		if pp, err = a.Get(pp, parent); err != nil {
-			return nil, err
-		}
-
-		pp = pp.insert3(parentIndex, rh, rh)
-		if err = a.Realloc(parent, pp); err != nil {
-			return nil, err
-		}
-
-	} else {
-		nr := newBTreeIndexPage(ph)
-		defer bufs.GCache.Put(nr)
-		nr = nr.insert3(0, rh, rh)
-		nrh, err := a.Alloc(nr)
-		if err != nil {
-			return nil, err
-		}
-
-		if err = a.Realloc(root, h2b(make([]byte, 7), nrh)); err != nil {
-			return nil, err
-		}
-
-	}
-	if index > kData {
-		if right, err = right.insertItem(a, index-kData, key, value); err != nil {
-			return nil, err
-		}
-	} else {
-		if p, err = p.insertItem(a, index, key, value); err != nil {
-			return nil, err
-		}
-	}
-	if err = a.Realloc(ph, p); err != nil {
-		return nil, err
-	}
-
-	return p, a.Realloc(rh, right)
-}
-
-func (p btreeDataPage) overflow(a btreeStore, root, ph, parent int64, parentIndex, index int, key, value []byte) (btreeDataPage, error) {
-	leftH, rightH, err := checkSiblings(a, parent, parentIndex)
-	if err != nil {
-		return nil, err
-	}
-
-	if leftH != 0 {
-		left := btreeDataPage(bufs.GCache.Get(maxBuf))
-		defer bufs.GCache.Put(left)
-		if left, err = a.Get(left, leftH); err != nil {
-			return nil, err
-		}
-
-		if left.len() < 2*kData {
-
-			p, left = p.moveLeft(left, 1)
-			if err = a.Realloc(leftH, left); err != nil {
-				return nil, err
-			}
-
-			if p, err = p.insertItem(a, index-1, key, value); err != nil {
-				return nil, err
-			}
-
-			return p, a.Realloc(ph, p)
-		}
-	}
-
-	if rightH != 0 {
-		right := btreeDataPage(bufs.GCache.Get(maxBuf))
-		defer bufs.GCache.Put(right)
-		if right, err = a.Get(right, rightH); err != nil {
-			return nil, err
-		}
-
-		if right.len() < 2*kData {
-			if index < 2*kData {
-				p, right = p.moveRight(right, 1)
-				if err = a.Realloc(rightH, right); err != nil {
-					return nil, err
-				}
-
-				if p, err = p.insertItem(a, index, key, value); err != nil {
-					return nil, err
-				}
-
-				return p, a.Realloc(ph, p)
-			} else {
-				if right, err = right.insertItem(a, 0, key, value); err != nil {
-					return nil, err
-				}
-
-				return p, a.Realloc(rightH, right)
-			}
-		}
-	}
-	return p.split(a, root, ph, parent, parentIndex, index, key, value)
-}
-
-func (p btreeDataPage) swap(a btreeStore, di int, value []byte, canOverwrite bool) (oldValue []byte, err error) {
-	if oldValue, err = p.value(a, di); err != nil {
-		return
-	}
-
-	if !canOverwrite {
-		return
-	}
-
-	oldValue = append([]byte(nil), oldValue...)
-	err = p.setValue(a, di, value)
-	return
-}
-
-type btreePage []byte
-
-func (p btreePage) isIndex() bool {
-	return p[0] == tagBTreeIndexPage
-}
-
-func (p btreePage) len() int {
-	if p.isIndex() {
-		return btreeIndexPage(p).len()
-	}
-
-	return btreeDataPage(p).len()
-}
-
-func (p btreePage) find(a btreeStore, c func(a, b []byte) int, key []byte) (index int, ok bool, err error) {
-	l := 0
-	h := p.len() - 1
-	isIndex := p.isIndex()
-	if c == nil {
-		c = bytes.Compare
-	}
-	for l <= h {
-		index = (l + h) >> 1
-		var cmp int
-		if isIndex {
-			if cmp, err = btreeIndexPage(p).cmp(a, c, key, index); err != nil {
-				return
-			}
-		} else {
-			if cmp, err = btreeDataPage(p).cmp(a, c, key, index); err != nil {
-				return
-			}
-		}
-		switch ok = cmp == 0; {
-		case cmp > 0:
-			l = index + 1
-		case ok:
-			return
-		default:
-			h = index - 1
-		}
-	}
-	return l, false, nil
-}
-
-// p is dirty after extract!
-func (p btreeDataPage) extract(a btreeStore, index int) (btreeDataPage, []byte, error) {
-	value, err := p.valueCopy(a, index)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if _, h := p.keyField(index); h != 0 {
-		if err = a.Free(h); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	if _, h := p.valueField(index); h != 0 {
-		if err = a.Free(h); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	n := p.len() - 1
-	if index < n {
-		p.copy(p, index, index+1, n-index)
-	}
-	return p.setLen(n), value, nil
-}
-
-func checkSiblings(a btreeStore, parent int64, parentIndex int) (left, right int64, err error) {
-	if parentIndex >= 0 {
-		var p btreeIndexPage = bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(p)
-		if p, err = a.Get(p, parent); err != nil {
-			return
-		}
-
-		if parentIndex > 0 {
-			left = p.child(parentIndex - 1)
-		}
-		if parentIndex < p.len() {
-			right = p.child(parentIndex + 1)
-		}
-	}
-	return
-}
-
-// underflow must persist all changes made.
-func (p btreeDataPage) underflow(a btreeStore, root, iroot, parent, ph int64, parentIndex int) (err error) {
-	lh, rh, err := checkSiblings(a, parent, parentIndex)
-	if err != nil {
-		return err
-	}
-
-	if lh != 0 {
-		left := bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(left)
-		if left, err = a.Get(left, lh); err != nil {
-			return err
-		}
-
-		if btreeDataPage(left).len()+p.len() >= 2*kData {
-			left, p = btreeDataPage(left).moveRight(p, 1)
-			if err = a.Realloc(lh, left); err != nil {
-				return err
-			}
-
-			return a.Realloc(ph, p)
-		}
-	}
-
-	if rh != 0 {
-		right := bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(right)
-		if right, err = a.Get(right, rh); err != nil {
-			return err
-		}
-
-		if p.len()+btreeDataPage(right).len() > 2*kData {
-			right, p = btreeDataPage(right).moveLeft(p, 1)
-			if err = a.Realloc(rh, right); err != nil {
-				return err
-			}
-
-			return a.Realloc(ph, p)
-		}
-	}
-
-	if lh != 0 {
-		left := bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(left)
-		if left, err = a.Get(left, lh); err != nil {
-			return err
-		}
-
-		if err = a.Realloc(ph, p); err != nil {
-			return err
-		}
-
-		return btreeDataPage(left).concat(a, root, iroot, parent, lh, ph, parentIndex-1)
-	}
-
-	return p.concat(a, root, iroot, parent, ph, rh, parentIndex)
-}
-
-// concat must persist all changes made.
-func (p btreeDataPage) concat(a btreeStore, root, iroot, parent, ph, rh int64, parentIndex int) (err error) {
-	right := bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(right)
-	if right, err = a.Get(right, rh); err != nil {
-		return err
-	}
-
-	right, p = btreeDataPage(right).moveLeft(p, btreeDataPage(right).len())
-	nxh := btreeDataPage(right).next()
-	if nxh != 0 {
-		nx := bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(nx)
-		if nx, err = a.Get(nx, nxh); err != nil {
-			return err
-		}
-
-		btreeDataPage(nx).setPrev(ph)
-		if err = a.Realloc(nxh, nx); err != nil {
-			return err
-		}
-	}
-	p.setNext(nxh)
-	if err = a.Free(rh); err != nil {
-		return err
-	}
-
-	pp := bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(pp)
-	if pp, err = a.Get(pp, parent); err != nil {
-		return err
-	}
-
-	if btreeIndexPage(pp).len() > 1 {
-		pp = btreeIndexPage(pp).extract(parentIndex)
-		btreeIndexPage(pp).setChild(parentIndex, ph)
-		if err = a.Realloc(parent, pp); err != nil {
-			return err
-		}
-
-		return a.Realloc(ph, p)
-	}
-
-	if err = a.Free(iroot); err != nil {
-		return err
-	}
-
-	if err = a.Realloc(ph, p); err != nil {
-		return err
-	}
-
-	var b7 [7]byte
-	return a.Realloc(root, h2b(b7[:], ph))
-}
-
-// external "root" is stable and contains the real root.
-type btree int64
-
-func newBTree(a btreeStore) (btree, error) {
-	r, err := a.Alloc(zeros[:7])
-	return btree(r), err
-}
-
-func (root btree) String(a btreeStore) string {
-	r := bufs.GCache.Get(16)
-	defer bufs.GCache.Put(r)
-	r, err := a.Get(r, int64(root))
-	if err != nil {
-		panic(err)
-	}
-
-	iroot := b2h(r)
-	m := map[int64]bool{int64(root): true}
-
-	s := []string{fmt.Sprintf("tree %#x -> %#x\n====", root, iroot)}
-	if iroot == 0 {
-		return s[0]
-	}
-
-	var f func(int64, string)
-	f = func(h int64, ind string) {
-		if m[h] {
-			return
-		}
-
-		m[h] = true
-		var b btreePage = bufs.GCache.Get(maxBuf)
-		defer bufs.GCache.Put(b)
-		var err error
-		if b, err = a.Get(b, h); err != nil {
-			panic(err)
-		}
-
-		s = append(s, fmt.Sprintf("%s@%#x", ind, h))
-		switch b.isIndex() {
-		case true:
-			da := []int64{}
-			b := btreeIndexPage(b)
-			for i := 0; i < b.len(); i++ {
-				c, d := b.child(i), b.dataPage(i)
-				s = append(s, fmt.Sprintf("%schild[%d] %#x dataPage[%d] %#x", ind, i, c, i, d))
-				da = append(da, c)
-				da = append(da, d)
-			}
-			i := b.len()
-			c := b.child(i)
-			s = append(s, fmt.Sprintf("%schild[%d] %#x", ind, i, c))
-			for _, c := range da {
-				f(c, ind+"  ")
-			}
-			f(c, ind+"  ")
-		case false:
-			b := btreeDataPage(b)
-			s = append(s, fmt.Sprintf("%sprev %#x next %#x", ind, b.prev(), b.next()))
-			for i := 0; i < b.len(); i++ {
-				k, err := b.key(a, i)
-				if err != nil {
-					panic(err)
-				}
-
-				v, err := b.value(a, i)
-				if err != nil {
-					panic(err)
-				}
-
-				s = append(s, fmt.Sprintf("%sK[%d]|% x| V[%d]|% x|", ind, i, k, i, v))
-			}
-		}
-	}
-
-	f(int64(iroot), "")
-	return strings.Join(s, "\n")
-}
-
-func (root btree) put(dst []byte, a btreeStore, c func(a, b []byte) int, key, value []byte, canOverwrite bool) (prev []byte, err error) {
-	prev, _, err = root.put2(dst, a, c, key, func(key, old []byte) (new []byte, write bool, err error) {
-		new, write = value, true
-		return
-	})
-	return
-}
-
-func (root btree) put2(dst []byte, a btreeStore, c func(a, b []byte) int, key []byte, upd func(key, old []byte) (new []byte, write bool, err error)) (old []byte, written bool, err error) {
-	var r, value []byte
-	if r, err = a.Get(dst, int64(root)); err != nil {
-		return
-	}
-
-	iroot := b2h(r)
-	var h int64
-	if iroot == 0 {
-		p := newBTreeDataPage()
-		defer bufs.GCache.Put(p)
-		if value, written, err = upd(key, nil); err != nil || !written {
-			return
-		}
-
-		if p, err = p.insertItem(a, 0, key, value); err != nil {
-			return
-		}
-
-		h, err = a.Alloc(p)
-		if err != nil {
-			return nil, true, err
-		}
-
-		err = a.Realloc(int64(root), h2b(r, h)[:7])
-		return
-	}
-
-	parentIndex := -1
-	var parent int64
-	ph := iroot
-
-	p := bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(p)
-
-	for {
-		if p, err = a.Get(p[:cap(p)], ph); err != nil {
-			return
-		}
-
-		var index int
-		var ok bool
-
-		if index, ok, err = btreePage(p).find(a, c, key); err != nil {
-			return
-		}
-
-		switch {
-		case ok: // Key found
-			if btreePage(p).isIndex() {
-				ph = btreeIndexPage(p).dataPage(index)
-				if p, err = a.Get(p, ph); err != nil {
-					return
-				}
-
-				if old, err = btreeDataPage(p).valueCopy(a, 0); err != nil {
-					return
-				}
-
-				if value, written, err = upd(key, old); err != nil || !written {
-					return
-				}
-
-				if _, err = btreeDataPage(p).swap(a, 0, value, true); err != nil {
-					return
-				}
-
-				err = a.Realloc(ph, p)
-				return
-			}
-
-			if old, err = btreeDataPage(p).valueCopy(a, index); err != nil {
-				return
-			}
-
-			if value, written, err = upd(key, old); err != nil || !written {
-				return
-			}
-
-			if _, err = btreeDataPage(p).swap(a, index, value, true); err != nil {
-				return
-			}
-
-			err = a.Realloc(ph, p)
-			return
-		case btreePage(p).isIndex():
-			if btreePage(p).len() > 2*kIndex {
-				if p, err = btreeIndexPage(p).split(a, root, &ph, parent, parentIndex, &index); err != nil {
-					return
-				}
-			}
-			parentIndex = index
-			parent = ph
-			ph = btreeIndexPage(p).child(index)
-		default:
-			if value, written, err = upd(key, nil); err != nil || !written {
-				return
-			}
-
-			if btreePage(p).len() < 2*kData { // page is not full
-				if p, err = btreeDataPage(p).insertItem(a, index, key, value); err != nil {
-					return
-				}
-
-				err = a.Realloc(ph, p)
-				return
-			}
-
-			// page is full
-			p, err = btreeDataPage(p).overflow(a, int64(root), ph, parent, parentIndex, index, key, value)
-			return
-		}
-	}
-}
-
-//TODO actually use 'dst' to return 'value'
-func (root btree) get(a btreeStore, dst []byte, c func(a, b []byte) int, key []byte) (b []byte, err error) {
-	var r []byte
-	if r, err = a.Get(dst, int64(root)); err != nil {
-		return
-	}
-
-	iroot := b2h(r)
-	if iroot == 0 {
-		return
-	}
-
-	ph := iroot
-
-	for {
-		var p btreePage
-		if p, err = a.Get(p, ph); err != nil {
-			return
-		}
-
-		var index int
-		var ok bool
-		if index, ok, err = p.find(a, c, key); err != nil {
-			return
-		}
-
-		switch {
-		case ok:
-			if p.isIndex() {
-				dh := btreeIndexPage(p).dataPage(index)
-				dp, err := a.Get(dst, dh)
-				if err != nil {
-					return nil, err
-				}
-
-				return btreeDataPage(dp).value(a, 0)
-			}
-
-			return btreeDataPage(p).value(a, index)
-		case p.isIndex():
-			ph = btreeIndexPage(p).child(index)
-		default:
-			return
-		}
-	}
-}
-
-//TODO actually use 'dst' to return 'value'
-func (root btree) extract(a btreeStore, dst []byte, c func(a, b []byte) int, key []byte) (value []byte, err error) {
-	var r []byte
-	if r, err = a.Get(dst, int64(root)); err != nil {
-		return
-	}
-
-	iroot := b2h(r)
-	if iroot == 0 {
-		return
-	}
-
-	ph := iroot
-	parentIndex := -1
-	var parent int64
-
-	p := bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(p)
-
-	for {
-		if p, err = a.Get(p[:cap(p)], ph); err != nil {
-			return
-		}
-
-		var index int
-		var ok bool
-		if index, ok, err = btreePage(p).find(a, c, key); err != nil {
-			return
-		}
-
-		if ok {
-			if btreePage(p).isIndex() {
-				dph := btreeIndexPage(p).dataPage(index)
-				dp, err := a.Get(dst, dph)
-				if err != nil {
-					return nil, err
-				}
-
-				if btreeDataPage(dp).len() > kData {
-					if dp, value, err = btreeDataPage(dp).extract(a, 0); err != nil {
-						return nil, err
-					}
-
-					return value, a.Realloc(dph, dp)
-				}
-
-				if btreeIndexPage(p).len() < kIndex && ph != iroot {
-					var err error
-					if p, err = btreeIndexPage(p).underflow(a, int64(root), iroot, parent, &ph, parentIndex, &index); err != nil {
-						return nil, err
-					}
-				}
-				parentIndex = index + 1
-				parent = ph
-				ph = btreeIndexPage(p).child(parentIndex)
-				continue
-			}
-
-			p, value, err = btreeDataPage(p).extract(a, index)
-			if btreePage(p).len() >= kData {
-				err = a.Realloc(ph, p)
-				return
-			}
-
-			if ph != iroot {
-				err = btreeDataPage(p).underflow(a, int64(root), iroot, parent, ph, parentIndex)
-				return
-			}
-
-			if btreePage(p).len() == 0 {
-				if err = a.Free(ph); err != nil {
-					return
-				}
-
-				err = a.Realloc(int64(root), zeros[:7])
-				return
-			}
-			err = a.Realloc(ph, p)
-			return
-		}
-
-		if !btreePage(p).isIndex() {
-			return
-		}
-
-		if btreePage(p).len() < kIndex && ph != iroot {
-			if p, err = btreeIndexPage(p).underflow(a, int64(root), iroot, parent, &ph, parentIndex, &index); err != nil {
-				return nil, err
-			}
-		}
-		parentIndex = index
-		parent = ph
-		ph = btreeIndexPage(p).child(index)
-	}
-}
-
-func (root btree) deleteAny(a btreeStore) (bool, error) {
-	r := bufs.GCache.Get(7)
-	defer bufs.GCache.Put(r)
-	var err error
-	if r, err = a.Get(r, int64(root)); err != nil {
-		return false, err
-	}
-
-	iroot := b2h(r)
-	if iroot == 0 {
-		return true, nil
-	}
-
-	ph := iroot
-	parentIndex := -1
-	var parent int64
-	p := bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(p)
-
-	for {
-		if p, err = a.Get(p, ph); err != nil {
-			return false, err
-		}
-
-		index := btreePage(p).len() / 2
-		if btreePage(p).isIndex() {
-			dph := btreeIndexPage(p).dataPage(index)
-			dp := bufs.GCache.Get(maxBuf)
-			defer bufs.GCache.Put(dp)
-			if dp, err = a.Get(dp, dph); err != nil {
-				return false, err
-			}
-
-			if btreeDataPage(dp).len() > kData {
-				if dp, _, err = btreeDataPage(dp).extract(a, 0); err != nil {
-					return false, err
-				}
-
-				return false, a.Realloc(dph, dp)
-			}
-
-			if btreeIndexPage(p).len() < kIndex && ph != iroot {
-				if p, err = btreeIndexPage(p).underflow(a, int64(root), iroot, parent, &ph, parentIndex, &index); err != nil {
-					return false, err
-				}
-			}
-			parentIndex = index + 1
-			parent = ph
-			ph = btreeIndexPage(p).child(parentIndex)
-			continue
-		}
-
-		p, _, err = btreeDataPage(p).extract(a, index)
-		if btreePage(p).len() >= kData {
-			err = a.Realloc(ph, p)
-			return false, err
-		}
-
-		if ph != iroot {
-			err = btreeDataPage(p).underflow(a, int64(root), iroot, parent, ph, parentIndex)
-			return false, err
-		}
-
-		if btreePage(p).len() == 0 {
-			if err = a.Free(ph); err != nil {
-				return true, err
-			}
-
-			return true, a.Realloc(int64(root), zeros[:7])
-		}
-
-		return false, a.Realloc(ph, p)
-	}
-}
-
-func (root btree) first(a btreeStore) (ph int64, p btreeDataPage, err error) {
-	r := bufs.GCache.Get(7)
-	defer bufs.GCache.Put(r)
-	if r, err = a.Get(r, int64(root)); err != nil {
-		return
-	}
-
-	for ph = b2h(r); ph != 0; ph = btreeIndexPage(p).child(0) {
-		if p, err = a.Get(p, ph); err != nil {
-			return
-		}
-
-		if !btreePage(p).isIndex() {
-			break
-		}
-	}
-
-	return
-}
-
-func (root btree) last(a btreeStore) (ph int64, p btreeDataPage, err error) {
-	r := bufs.GCache.Get(7)
-	defer bufs.GCache.Put(r)
-	if r, err = a.Get(r, int64(root)); err != nil {
-		return
-	}
-
-	for ph = b2h(r); ph != 0; ph = btreeIndexPage(p).child(btreeIndexPage(p).len()) {
-		if p, err = a.Get(p, ph); err != nil {
-			return
-		}
-
-		if !btreePage(p).isIndex() {
-			break
-		}
-	}
-
-	return
-}
-
-// key >= p[index].key
-func (root btree) seek(a btreeStore, c func(a, b []byte) int, key []byte) (p btreeDataPage, index int, equal bool, err error) {
-	r := bufs.GCache.Get(7)
-	defer bufs.GCache.Put(r)
-	if r, err = a.Get(r, int64(root)); err != nil {
-		return
-	}
-
-	for ph := b2h(r); ph != 0; ph = btreeIndexPage(p).child(index) {
-		if p, err = a.Get(p, ph); err != nil {
-			break
-		}
-
-		if index, equal, err = btreePage(p).find(a, c, key); err != nil {
-			break
-		}
-
-		if equal {
-			if !btreePage(p).isIndex() {
-				break
-			}
-
-			p, err = a.Get(p, btreeIndexPage(p).dataPage(index))
-			index = 0
-			break
-		}
-
-		if !btreePage(p).isIndex() {
-			break
-		}
-	}
-	return
-}
-
-func (root btree) clear(a btreeStore) (err error) {
-	r := bufs.GCache.Get(7)
-	defer bufs.GCache.Put(r)
-	if r, err = a.Get(r, int64(root)); err != nil {
-		return
-	}
-
-	iroot := b2h(r)
-	if iroot == 0 {
-		return
-	}
-
-	if err = root.clear2(a, iroot); err != nil {
-		return
-	}
-
-	var b [7]byte
-	return a.Realloc(int64(root), b[:])
-}
-
-func (root btree) clear2(a btreeStore, ph int64) (err error) {
-	var p = bufs.GCache.Get(maxBuf)
-	defer bufs.GCache.Put(p)
-	if p, err = a.Get(p, ph); err != nil {
-		return
-	}
-
-	switch btreePage(p).isIndex() {
-	case true:
-		ip := btreeIndexPage(p)
-		for i := 0; i <= ip.len(); i++ {
-			root.clear2(a, ip.child(i))
-
-		}
-	case false:
-		dp := btreeDataPage(p)
-		for i := 0; i < dp.len(); i++ {
-			if err = dp.setKey(a, i, nil); err != nil {
-				return
-			}
-
-			if err = dp.setValue(a, i, nil); err != nil {
-				return
-			}
-		}
-	}
-	return a.Free(ph)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/errors.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/errors.go
deleted file mode 100644
index 7dffe7f10c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/errors.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Some errors returned by this package.
-//
-// Note that this package can return more errors than declared here, for
-// example io.EOF from Filer.ReadAt().
-
-package lldb
-
-import (
-	"fmt"
-)
-
-// ErrDecodeScalars is possibly returned from DecodeScalars
-type ErrDecodeScalars struct {
-	B []byte // Data being decoded
-	I int    // offending offset
-}
-
-// Error implements the built in error type.
-func (e *ErrDecodeScalars) Error() string {
-	return fmt.Sprintf("DecodeScalars: corrupted data @ %d/%d", e.I, len(e.B))
-}
-
-// ErrINVAL reports invalid values passed as parameters, for example negative
-// offsets where only non-negative ones are allowed or read from the DB.
-type ErrINVAL struct {
-	Src string
-	Val interface{}
-}
-
-// Error implements the built in error type.
-func (e *ErrINVAL) Error() string {
-	return fmt.Sprintf("%s: %+v", e.Src, e.Val)
-}
-
-// ErrPERM is for example reported when a Filer is closed while BeginUpdate(s)
-// are not balanced with EndUpdate(s)/Rollback(s) or when EndUpdate or Rollback
-// is invoked which is not paired with a BeginUpdate.
-type ErrPERM struct {
-	Src string
-}
-
-// Error implements the built in error type.
-func (e *ErrPERM) Error() string {
-	return fmt.Sprintf("%s: Operation not permitted", string(e.Src))
-}
-
-// ErrTag represents an ErrILSEQ kind.
-type ErrType int
-
-// ErrILSEQ types
-const (
-	ErrOther ErrType = iota
-
-	ErrAdjacentFree          // Adjacent free blocks (.Off and .Arg)
-	ErrDecompress            // Used compressed block: corrupted compression
-	ErrExpFreeTag            // Expected a free block tag, got .Arg
-	ErrExpUsedTag            // Expected a used block tag, got .Arg
-	ErrFLT                   // Free block is invalid or referenced multiple times
-	ErrFLTLoad               // FLT truncated to .Off, need size >= .Arg
-	ErrFLTSize               // Free block size (.Arg) doesn't belong to its list min size: .Arg2
-	ErrFileSize              // File .Name size (.Arg) != 0 (mod 16)
-	ErrFreeChaining          // Free block, .prev.next doesn't point back to this block
-	ErrFreeTailBlock         // Last block is free
-	ErrHead                  // Head of a free block list has non zero Prev (.Arg)
-	ErrInvalidRelocTarget    // Reloc doesn't target (.Arg) a short or long used block
-	ErrInvalidWAL            // Corrupted write ahead log. .Name: file name, .More: more
-	ErrLongFreeBlkTooLong    // Long free block spans beyond EOF, size .Arg
-	ErrLongFreeBlkTooShort   // Long free block must have at least 2 atoms, got only .Arg
-	ErrLongFreeNextBeyondEOF // Long free block .Next (.Arg) spans beyond EOF
-	ErrLongFreePrevBeyondEOF // Long free block .Prev (.Arg) spans beyond EOF
-	ErrLongFreeTailTag       // Expected a long free block tail tag, got .Arg
-	ErrLostFreeBlock         // Free block is not in any FLT list
-	ErrNullReloc             // Used reloc block with nil target
-	ErrRelocBeyondEOF        // Used reloc points (.Arg) beyond EOF
-	ErrShortFreeTailTag      // Expected a short free block tail tag, got .Arg
-	ErrSmall                 // Request for a free block (.Arg) returned a too small one (.Arg2) at .Off
-	ErrTailTag               // Block at .Off has invalid tail CC (compression code) tag, got .Arg
-	ErrUnexpReloc            // Unexpected reloc block referred to from reloc block .Arg
-	ErrVerifyPadding         // Used block has nonzero padding
-	ErrVerifyTailSize        // Long free block size .Arg but tail size .Arg2
-	ErrVerifyUsedSpan        // Used block size (.Arg) spans beyond EOF
-)
-
-// ErrILSEQ reports a corrupted file format. Details in fields according to Type.
-type ErrILSEQ struct {
-	Type ErrType
-	Off  int64
-	Arg  int64
-	Arg2 int64
-	Arg3 int64
-	Name string
-	More interface{}
-}
-
-// Error implements the built in error type.
-func (e *ErrILSEQ) Error() string {
-	switch e.Type {
-	case ErrAdjacentFree:
-		return fmt.Sprintf("Adjacent free blocks at offset %#x and %#x", e.Off, e.Arg)
-	case ErrDecompress:
-		return fmt.Sprintf("Compressed block at offset %#x: Corrupted compressed content", e.Off)
-	case ErrExpFreeTag:
-		return fmt.Sprintf("Block at offset %#x: Expected a free block tag, got %#2x", e.Off, e.Arg)
-	case ErrExpUsedTag:
-		return fmt.Sprintf("Block at ofset %#x: Expected a used block tag, got %#2x", e.Off, e.Arg)
-	case ErrFLT:
-		return fmt.Sprintf("Free block at offset %#x is invalid or referenced multiple times", e.Off)
-	case ErrFLTLoad:
-		return fmt.Sprintf("FLT truncated to size %d, expected at least %d", e.Off, e.Arg)
-	case ErrFLTSize:
-		return fmt.Sprintf("Free block at offset %#x has size (%#x) should be at least (%#x)", e.Off, e.Arg, e.Arg2)
-	case ErrFileSize:
-		return fmt.Sprintf("File %q size (%#x) != 0 (mod 16)", e.Name, e.Arg)
-	case ErrFreeChaining:
-		return fmt.Sprintf("Free block at offset %#x: .prev.next doesn point back here.", e.Off)
-	case ErrFreeTailBlock:
-		return fmt.Sprintf("Free block at offset %#x: Cannot be last file block", e.Off)
-	case ErrHead:
-		return fmt.Sprintf("Block at offset %#x: Head of free block list has non zero .prev %#x", e.Off, e.Arg)
-	case ErrInvalidRelocTarget:
-		return fmt.Sprintf("Used reloc block at offset %#x: Target (%#x) is not a short or long used block", e.Off, e.Arg)
-	case ErrInvalidWAL:
-		return fmt.Sprintf("Corrupted write ahead log file: %q %v", e.Name, e.More)
-	case ErrLongFreeBlkTooLong:
-		return fmt.Sprintf("Long free block at offset %#x: Size (%#x) beyond EOF", e.Off, e.Arg)
-	case ErrLongFreeBlkTooShort:
-		return fmt.Sprintf("Long free block at offset %#x: Size (%#x) too small", e.Off, e.Arg)
-	case ErrLongFreeNextBeyondEOF:
-		return fmt.Sprintf("Long free block at offset %#x: Next (%#x) points beyond EOF", e.Off, e.Arg)
-	case ErrLongFreePrevBeyondEOF:
-		return fmt.Sprintf("Long free block at offset %#x: Prev (%#x) points beyond EOF", e.Off, e.Arg)
-	case ErrLongFreeTailTag:
-		return fmt.Sprintf("Block at offset %#x: Expected long free tail tag, got %#2x", e.Off, e.Arg)
-	case ErrLostFreeBlock:
-		return fmt.Sprintf("Free block at offset %#x: not in any FLT list", e.Off)
-	case ErrNullReloc:
-		return fmt.Sprintf("Used reloc block at offset %#x: Nil target", e.Off)
-	case ErrRelocBeyondEOF:
-		return fmt.Sprintf("Used reloc block at offset %#x: Link (%#x) points beyond EOF", e.Off, e.Arg)
-	case ErrShortFreeTailTag:
-		return fmt.Sprintf("Block at offset %#x: Expected short free tail tag, got %#2x", e.Off, e.Arg)
-	case ErrSmall:
-		return fmt.Sprintf("Request for of free block of size %d returned a too small (%d) one at offset %#x", e.Arg, e.Arg2, e.Off)
-	case ErrTailTag:
-		return fmt.Sprintf("Block at offset %#x: Invalid tail CC tag, got %#2x", e.Off, e.Arg)
-	case ErrUnexpReloc:
-		return fmt.Sprintf("Block at offset %#x: Unexpected reloc block. Referred to from reloc block at offset %#x", e.Off, e.Arg)
-	case ErrVerifyPadding:
-		return fmt.Sprintf("Used block at offset %#x: Nonzero padding", e.Off)
-	case ErrVerifyTailSize:
-		return fmt.Sprintf("Long free block at offset %#x: Size %#x, but tail size %#x", e.Off, e.Arg, e.Arg2)
-	case ErrVerifyUsedSpan:
-		return fmt.Sprintf("Used block at offset %#x: Size %#x spans beyond EOF", e.Off, e.Arg)
-	}
-
-	more := ""
-	if e.More != nil {
-		more = fmt.Sprintf(", %v", e.More)
-	}
-	off := ""
-	if e.Off != 0 {
-		off = fmt.Sprintf(", off: %#x", e.Off)
-	}
-
-	return fmt.Sprintf("Error%s%s", off, more)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc.go
deleted file mode 100644
index 2969036e24..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc.go
+++ /dev/null
@@ -1,1981 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The storage space management.
-
-package lldb
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"sort"
-	"strings"
-	"sync"
-
-	"github.com/cznic/bufs"
-	"github.com/cznic/mathutil"
-	"github.com/cznic/zappy"
-)
-
-const (
-	maxBuf = maxRq + 20 // bufs,Buffers.Alloc
-)
-
-// Options are passed to the NewAllocator to amend some configuration.  The
-// compatibility promise is the same as of struct types in the Go standard
-// library - introducing changes can be made only by adding new exported
-// fields, which is backward compatible as long as client code uses field names
-// to assign values of imported struct types literals.
-//
-// NOTE: No options are currently defined.
-type Options struct{}
-
-// AllocStats record statistics about a Filer. It can be optionally filled by
-// Allocator.Verify, if successful.
-type AllocStats struct {
-	Handles     int64           // total valid handles in use
-	Compression int64           // number of compressed blocks
-	TotalAtoms  int64           // total number of atoms == AllocAtoms + FreeAtoms
-	AllocBytes  int64           // bytes allocated (after decompression, if/where used)
-	AllocAtoms  int64           // atoms allocated/used, including relocation atoms
-	Relocations int64           // number of relocated used blocks
-	FreeAtoms   int64           // atoms unused
-	AllocMap    map[int64]int64 // allocated block size in atoms -> count of such blocks
-	FreeMap     map[int64]int64 // free block size in atoms -> count of such blocks
-}
-
-/*
-
-Allocator implements "raw" storage space management (allocation and
-deallocation) for a low level of a DB engine.  The storage is an abstraction
-provided by a Filer.
-
-The terms MUST or MUST NOT, if/where used in the documentation of Allocator,
-written in all caps as seen here, are a requirement for any possible
-alternative implementations aiming for compatibility with this one.
-
-Filer file
-
-A Filer file, or simply 'file', is a linear, contiguous sequence of blocks.
-Blocks may be either free (currently unused) or allocated (currently used).
-Some blocks may eventually become virtual in a sense as they may not be
-realized in the storage (sparse files).
-
-Free Lists Table
-
-File starts with a FLT. This table records heads of 14 doubly linked free
-lists. The zero based index (I) vs minimal size of free blocks in that list,
-except the last one which registers free blocks of size 4112+ atoms:
-
-	MinSize == 2^I
-
-	For example 0 -> 1, 1 -> 2, ... 12 -> 4096.
-
-Each entry in the FLT is 8 bytes in netwtork order, MSB MUST be zero, ie. the
-slot value is effectively only 7 bytes. The value is the handle of the head of
-the respective doubly linked free list. The FLT size is 14*8 == 112(0x70)
-bytes. If the free blocks list for any particular size is empty, the respective
-FLT slot is zero. Sizes of free blocks in one list MUST NOT overlap with sizes
-of free lists in other list. For example, even though a free block of size 2
-technically is of minimal size >= 1, it MUST NOT be put to the list for slot 0
-(minimal size 1), but in slot 1( minimal size 2).
-
-	slot 0:		sizes [1, 2)
-	slot 1:		sizes [2, 4)
-	slot 2:		sizes [4, 8)
-	...
-	slot 11:	sizes [2048, 4096)
-	slot 12:	sizes [4096, 4112)
-	slot 13:	sizes [4112, inf)
-
-The last FLT slot collects all free blocks bigger than its minimal size. That
-still respects the 'no overlap' invariant.
-
-File blocks
-
-A block is a linear, contiguous sequence of atoms. The first and last atoms of
-a block provide information about, for example, whether the block is free or
-used, what is the size of the block, etc.  Details are discussed elsewhere. The
-first block of a file starts immediately after FLT, ie. at file offset
-112(0x70).
-
-Block atoms
-
-An atom is a fixed size piece of a block (and thus of a file too); it is 16
-bytes long. A consequence is that for a valid file:
-
- filesize == 0 (mod 16)
-
-The first atom of the first block is considered to be atom #1.
-
-Block handles
-
-A handle is an integer referring to a block. The reference is the number of the
-atom the block starts with. Put in other way:
-
- handle == offset/16 - 6
- offset == 16 * (handle + 6)
-
-`offset` is the offset of the first byte of the block, measured in bytes
-- as in fseek(3). Handle has type `int64`, but only the lower 7 bytes may be
-nonzero while referring to a block, both in code as well as when persisted in
-the the file's internal bookkeeping structures - see 'Block types' bellow. So a
-handle is effectively only `uint56`.  This also means that the maximum usable
-size of a file is 2^56 atoms.  That is 2^60 bytes == 1 exabyte (10^18 bytes).
-
-Nil handles
-
-A handle with numeric value of '0' refers to no block.
-
-Zero padding
-
-A padding is used to round-up a block size to be a whole number of atoms. Any
-padding, if present, MUST be all zero bytes. Note that the size of padding is
-in [0, 15].
-
-Content wiping
-
-When a block is deallocated, its data content is not wiped as the added
-overhead may be substantial while not necessarily needed. Client code should
-however overwrite the content of any block having sensitive data with eg. zeros
-(good compression) - before deallocating the block.
-
-Block tags
-
-Every block is tagged in its first byte (a head tag) and last byte (tail tag).
-Block types are:
-
- 1. Short content used block (head tags 0x00-0xFB)
- 2. Long content used block (head tag 0xFC)
- 3. Relocated used block (head tag 0xFD)
- 4. Short, single atom, free block (head tag 0xFE)
- 5. Long free block (head tag 0xFF)
-
-Note: Relocated used block, 3. above (head tag 0xFD) MUST NOT refer to blocks
-other then 1. or 2. above (head tags 0x00-0xFC).
-
-Content blocks
-
-Used blocks (head tags 0x00-0xFC) tail tag distinguish used/unused block and if
-content is compressed or not.
-
-Content compression
-
-The tail flag of an used block is one of
-
-	CC == 0 // Content is not compressed.
-	CC == 1 // Content is in zappy compression format.
-
-If compression of written content is enabled, there are two cases: If
-compressed size < original size then the compressed content should be written
-if it will save at least one atom of the block. If compressed size >= original
-size then the compressed content should not be used.
-
-It's recommended to use compression. For example the BTrees implementation
-assumes compression is used. Using compression may cause a slowdown in some
-cases while it may as well cause a speedup.
-
-Short content block
-
-Short content block carries content of length between N == 0(0x00) and N ==
-251(0xFB) bytes.
-
-	|<-first atom start  ...  last atom end->|
-	+---++--   ...   --+--   ...   --++------+
-	| 0 ||    1...     |  0x*...0x*E || 0x*F |
-	+---++--   ...   --+--   ...   --++------+
-	| N ||   content   |   padding   ||  CC  |
-	+---++--   ...   --+--   ...   --++------+
-
-	A == (N+1)/16 + 1        // The number of atoms in the block [1, 16]
-	padding == 15 - (N+1)%16 // Length of the zero padding
-
-Long content block
-
-Long content block carries content of length between N == 252(0xFC) and N ==
-65787(0x100FB) bytes.
-
-	|<-first atom start    ...     last atom end->|
-	+------++------+-- ... --+--  ...   --++------+
-	|  0   || 1..2 |   3...  | 0x*...0x*E || 0x*F |
-	+------++------+-- ... --+--  ...   --++------+
-	| 0xFC ||  M   | content |  padding   ||  CC  |
-	+------++------+-- ... --+--  ...   --++------+
-
-	A == (N+3)/16 + 1        // The number of atoms in the block [16, 4112]
-	M == N % 0x10000         // Stored as 2 bytes in network byte order
-	padding == 15 - (N+3)%16 // Length of the zero padding
-
-Relocated used block
-
-Relocated block allows to permanently assign a handle to some content and
-resize the content anytime afterwards without having to update all the possible
-existing references; the handle can be constant while the content size may be
-dynamic. When relocating a block, any space left by the original block content,
-above this single atom block, MUST be reclaimed.
-
-Relocations MUST point only to a used short or long block == blocks with tags
-0x00...0xFC.
-
-	+------++------+---------++----+
-	|  0   || 1..7 | 8...14  || 15 |
-	+------++------+---------++----+
-	| 0xFD ||  H   | padding || 0  |
-	+------++------+---------++----+
-
-H is the handle of the relocated block in network byte order.
-
-Free blocks
-
-Free blocks are the result of space deallocation. Free blocks are organized in
-one or more doubly linked lists, abstracted by the FLT interface. Free blocks
-MUST be "registered" by putting them in such list. Allocator MUST reuse a big
-enough free block, if such exists, before growing the file size. When a free
-block is created by deallocation or reallocation it MUST be joined with any
-adjacently existing free blocks before "registering". If the resulting free
-block is now a last block of a file, the free block MUST be discarded and the
-file size MUST be truncated accordingly instead. Put differently, there MUST
-NOT ever be a free block at the file end.
-
-A single free atom
-
-Is an unused block of size 1 atom.
-
-	+------++------+--------++------+
-	|  0   || 1..7 | 8...14 ||  15  |
-	+------++------+--------++------+
-	| 0xFE ||  P   |   N    || 0xFE |
-	+------++------+--------++------+
-
-P and N, stored in network byte order, are the previous and next free block
-handles in the doubly linked list to which this free block belongs.
-
-A long unused block
-
-Is an unused block of size > 1 atom.
-
-	+------++------+-------+---------+- ... -+----------++------+
-	|  0   || 1..7 | 8..14 | 15...21 |       | Z-7..Z-1 ||  Z   |
-	+------++------+-------+---------+- ... -+----------++------+
-	| 0xFF ||  S   |   P   |    N    | Leak  |    S     || 0xFF |
-	+------++------+-------+---------+- ... -+----------++------+
-
-	Z == 16 * S - 1
-
-S is the size of this unused block in atoms. P and N are the previous and next
-free block handles in the doubly linked list to which this free block belongs.
-Leak contains any data the block had before deallocating this block.  See also
-the subtitle 'Content wiping' above. S, P and N are stored in network byte
-order. Large free blocks may trigger a consideration of file hole punching of
-the Leak field - for some value of 'large'.
-
-Note: Allocator methods vs CRUD[1]:
-
-	Alloc	[C]reate
-	Get	[R]ead
-	Realloc	[U]pdate
-	Free	[D]elete
-
-Note: No Allocator method returns io.EOF.
-
-  [1]: http://en.wikipedia.org/wiki/Create,_read,_update_and_delete
-
-*/
-type Allocator struct {
-	f        Filer
-	flt      flt
-	Compress bool // enables content compression
-	cache    cache
-	m        map[int64]*node
-	lru      lst
-	expHit   int64
-	expMiss  int64
-	cacheSz  int
-	hit      uint16
-	miss     uint16
-	mu       sync.Mutex
-}
-
-// NewAllocator returns a new Allocator. To open an existing file, pass its
-// Filer. To create a "new" file, pass a Filer which file is of zero size.
-func NewAllocator(f Filer, opts *Options) (a *Allocator, err error) {
-	if opts == nil { // Enforce *Options is always passed
-		return nil, errors.New("NewAllocator: nil opts passed")
-	}
-
-	a = &Allocator{
-		f:       f,
-		cacheSz: 10,
-	}
-
-	a.cinit()
-	switch x := f.(type) {
-	case *RollbackFiler:
-		x.afterRollback = func() error {
-			a.cinit()
-			return a.flt.load(a.f, 0)
-		}
-	case *ACIDFiler0:
-		x.RollbackFiler.afterRollback = func() error {
-			a.cinit()
-			return a.flt.load(a.f, 0)
-		}
-	}
-
-	sz, err := f.Size()
-	if err != nil {
-		return
-	}
-
-	a.flt.init()
-	if sz == 0 {
-		var b [fltSz]byte
-		if err = a.f.BeginUpdate(); err != nil {
-			return
-		}
-
-		if _, err = f.WriteAt(b[:], 0); err != nil {
-			a.f.Rollback()
-			return
-		}
-
-		return a, a.f.EndUpdate()
-	}
-
-	return a, a.flt.load(f, 0)
-}
-
-// CacheStats reports cache statistics.
-//
-//TODO return a struct perhaps.
-func (a *Allocator) CacheStats() (buffersUsed, buffersTotal int, bytesUsed, bytesTotal, hits, misses int64) {
-	buffersUsed = len(a.m)
-	buffersTotal = buffersUsed + len(a.cache)
-	bytesUsed = a.lru.size()
-	bytesTotal = bytesUsed + a.cache.size()
-	hits = a.expHit
-	misses = a.expMiss
-	return
-}
-
-func (a *Allocator) cinit() {
-	for h, n := range a.m {
-		a.cache.put(a.lru.remove(n))
-		delete(a.m, h)
-	}
-	if a.m == nil {
-		a.m = map[int64]*node{}
-	}
-}
-
-func (a *Allocator) cadd(b []byte, h int64) {
-	if len(a.m) < a.cacheSz {
-		n := a.cache.get(len(b))
-		n.h = h
-		copy(n.b, b)
-		a.m[h] = a.lru.pushFront(n)
-		return
-	}
-
-	// cache full
-	delete(a.m, a.cache.put(a.lru.removeBack()).h)
-	n := a.cache.get(len(b))
-	n.h = h
-	copy(n.b, b)
-	a.m[h] = a.lru.pushFront(n)
-	return
-}
-
-func (a *Allocator) cfree(h int64) {
-	n, ok := a.m[h]
-	if !ok { // must have been evicted
-		return
-	}
-
-	a.cache.put(a.lru.remove(n))
-	delete(a.m, h)
-}
-
-// Alloc allocates storage space for b and returns the handle of the new block
-// with content set to b or an error, if any. The returned handle is valid only
-// while the block is used - until the block is deallocated. No two valid
-// handles share the same value within the same Filer, but any value of a
-// handle not referring to any used block may become valid any time as a result
-// of Alloc.
-//
-// Invoking Alloc on an empty Allocator is guaranteed to return handle with
-// value 1. The intended use of content of handle 1 is a root "directory" of
-// other data held by an Allocator.
-//
-// Passing handles not obtained initially from Alloc or not anymore valid to
-// any other Allocator methods can result in an irreparably corrupted database.
-func (a *Allocator) Alloc(b []byte) (handle int64, err error) {
-	buf := bufs.GCache.Get(zappy.MaxEncodedLen(len(b)))
-	defer bufs.GCache.Put(buf)
-	buf, _, cc, err := a.makeUsedBlock(buf, b)
-	if err != nil {
-		return
-	}
-
-	if handle, err = a.alloc(buf, cc); err == nil {
-		a.cadd(b, handle)
-	}
-	return
-}
-
-func (a *Allocator) alloc(b []byte, cc byte) (h int64, err error) {
-	rqAtoms := n2atoms(len(b))
-	if h = a.flt.find(rqAtoms); h == 0 { // must grow
-		var sz int64
-		if sz, err = a.f.Size(); err != nil {
-			return
-		}
-
-		h = off2h(sz)
-		err = a.writeUsedBlock(h, cc, b)
-		return
-	}
-
-	// Handle is the first item of a free blocks list.
-	tag, s, prev, next, err := a.nfo(h)
-	if err != nil {
-		return
-	}
-
-	if tag != tagFreeShort && tag != tagFreeLong {
-		err = &ErrILSEQ{Type: ErrExpFreeTag, Off: h2off(h), Arg: int64(tag)}
-		return
-	}
-
-	if prev != 0 {
-		err = &ErrILSEQ{Type: ErrHead, Off: h2off(h), Arg: prev}
-		return
-	}
-
-	if s < int64(rqAtoms) {
-		err = &ErrILSEQ{Type: ErrSmall, Arg: int64(rqAtoms), Arg2: s, Off: h2off(h)}
-		return
-	}
-
-	if err = a.unlink(h, s, prev, next); err != nil {
-		return
-	}
-
-	if s > int64(rqAtoms) {
-		freeH := h + int64(rqAtoms)
-		freeAtoms := s - int64(rqAtoms)
-		if err = a.link(freeH, freeAtoms); err != nil {
-			return
-		}
-	}
-	return h, a.writeUsedBlock(h, cc, b)
-}
-
-// Free deallocates the block referred to by handle or returns an error, if
-// any.
-//
-// After Free succeeds, handle is invalid and must not be used.
-//
-// Handle must have been obtained initially from Alloc and must be still valid,
-// otherwise a database may get irreparably corrupted.
-func (a *Allocator) Free(handle int64) (err error) {
-	if handle <= 0 || handle > maxHandle {
-		return &ErrINVAL{"Allocator.Free: handle out of limits", handle}
-	}
-
-	a.cfree(handle)
-	return a.free(handle, 0, true)
-}
-
-func (a *Allocator) free(h, from int64, acceptRelocs bool) (err error) {
-	tag, atoms, _, n, err := a.nfo(h)
-	if err != nil {
-		return
-	}
-
-	switch tag {
-	default:
-		// nop
-	case tagUsedLong:
-		// nop
-	case tagUsedRelocated:
-		if !acceptRelocs {
-			return &ErrILSEQ{Type: ErrUnexpReloc, Off: h2off(h), Arg: h2off(from)}
-		}
-
-		if err = a.free(n, h, false); err != nil {
-			return
-		}
-	case tagFreeShort, tagFreeLong:
-		return &ErrINVAL{"Allocator.Free: attempt to free a free block at off", h2off(h)}
-	}
-
-	return a.free2(h, atoms)
-}
-
-func (a *Allocator) free2(h, atoms int64) (err error) {
-	sz, err := a.f.Size()
-	if err != nil {
-		return
-	}
-
-	ltag, latoms, lp, ln, err := a.leftNfo(h)
-	if err != nil {
-		return
-	}
-
-	if ltag != tagFreeShort && ltag != tagFreeLong {
-		latoms = 0
-	}
-
-	var rtag byte
-	var ratoms, rp, rn int64
-
-	isTail := h2off(h)+atoms*16 == sz
-	if !isTail {
-		if rtag, ratoms, rp, rn, err = a.nfo(h + atoms); err != nil {
-			return
-		}
-	}
-
-	if rtag != tagFreeShort && rtag != tagFreeLong {
-		ratoms = 0
-	}
-
-	switch {
-	case latoms == 0 && ratoms == 0:
-		// -> isolated <-
-		if isTail { // cut tail
-			return a.f.Truncate(h2off(h))
-		}
-
-		return a.link(h, atoms)
-	case latoms == 0 && ratoms != 0:
-		// right join ->
-		if err = a.unlink(h+atoms, ratoms, rp, rn); err != nil {
-			return
-		}
-
-		return a.link(h, atoms+ratoms)
-	case latoms != 0 && ratoms == 0:
-		// <- left join
-		if err = a.unlink(h-latoms, latoms, lp, ln); err != nil {
-			return
-		}
-
-		if isTail {
-			return a.f.Truncate(h2off(h - latoms))
-		}
-
-		return a.link(h-latoms, latoms+atoms)
-	}
-
-	// case latoms != 0 && ratoms != 0:
-	// <- middle join ->
-	lh, rh := h-latoms, h+atoms
-	if err = a.unlink(lh, latoms, lp, ln); err != nil {
-		return
-	}
-
-	// Prev unlink may have invalidated rp or rn
-	if _, _, rp, rn, err = a.nfo(rh); err != nil {
-		return
-	}
-
-	if err = a.unlink(rh, ratoms, rp, rn); err != nil {
-		return
-	}
-
-	return a.link(h-latoms, latoms+atoms+ratoms)
-}
-
-// Add a free block h to the appropriate free list
-func (a *Allocator) link(h, atoms int64) (err error) {
-	if err = a.makeFree(h, atoms, 0, a.flt.head(atoms)); err != nil {
-		return
-	}
-
-	return a.flt.setHead(h, atoms, a.f)
-}
-
-// Remove free block h from the free list
-func (a *Allocator) unlink(h, atoms, p, n int64) (err error) {
-	switch {
-	case p == 0 && n == 0:
-		// single item list, must be head
-		return a.flt.setHead(0, atoms, a.f)
-	case p == 0 && n != 0:
-		// head of list (has next item[s])
-		if err = a.prev(n, 0); err != nil {
-			return
-		}
-
-		// new head
-		return a.flt.setHead(n, atoms, a.f)
-	case p != 0 && n == 0:
-		// last item in list
-		return a.next(p, 0)
-	}
-	// case p != 0 && n != 0:
-	// intermediate item in a list
-	if err = a.next(p, n); err != nil {
-		return
-	}
-
-	return a.prev(n, p)
-}
-
-//TODO remove ?
-// Return len(slice) == n, reuse src if possible.
-func need(n int, src []byte) []byte {
-	if cap(src) < n {
-		bufs.GCache.Put(src)
-		return bufs.GCache.Get(n)
-	}
-
-	return src[:n]
-}
-
-// Get returns the data content of a block referred to by handle or an error if
-// any.  The returned slice may be a sub-slice of buf if buf was large enough
-// to hold the entire content.  Otherwise, a newly allocated slice will be
-// returned.  It is valid to pass a nil buf.
-//
-// If the content was stored using compression then it is transparently
-// returned decompressed.
-//
-// Handle must have been obtained initially from Alloc and must be still valid,
-// otherwise invalid data may be returned without detecting the error.
-//
-// Get is safe for concurrent access by multiple goroutines iff no other
-// goroutine mutates the DB.
-func (a *Allocator) Get(buf []byte, handle int64) (b []byte, err error) {
-	buf = buf[:cap(buf)]
-	a.mu.Lock() // X1+
-	if n, ok := a.m[handle]; ok {
-		a.lru.moveToFront(n)
-		b = need(len(n.b), buf)
-		copy(b, n.b)
-		a.expHit++
-		a.hit++
-		a.mu.Unlock() // X1-
-		return
-	}
-
-	a.expMiss++
-	a.miss++
-	if a.miss > 10 && len(a.m) < 500 {
-		if 100*a.hit/a.miss < 95 {
-			a.cacheSz++
-		}
-		a.hit, a.miss = 0, 0
-	}
-	a.mu.Unlock() // X1-
-
-	defer func(h int64) {
-		if err == nil {
-			a.mu.Lock() // X2+
-			a.cadd(b, h)
-			a.mu.Unlock() // X2-
-		}
-	}(handle)
-
-	first := bufs.GCache.Get(16)
-	defer bufs.GCache.Put(first)
-	relocated := false
-	relocSrc := handle
-reloc:
-	if handle <= 0 || handle > maxHandle {
-		return nil, &ErrINVAL{"Allocator.Get: handle out of limits", handle}
-	}
-
-	off := h2off(handle)
-	if err = a.read(first, off); err != nil {
-		return
-	}
-
-	switch tag := first[0]; tag {
-	default:
-		dlen := int(tag)
-		atoms := n2atoms(dlen)
-		switch atoms {
-		case 1:
-			switch tag := first[15]; tag {
-			default:
-				return nil, &ErrILSEQ{Type: ErrTailTag, Off: off, Arg: int64(tag)}
-			case tagNotCompressed:
-				b = need(dlen, buf)
-				copy(b, first[1:])
-				return
-			case tagCompressed:
-				return zappy.Decode(buf, first[1:dlen+1])
-			}
-		default:
-			cc := bufs.GCache.Get(1)
-			defer bufs.GCache.Put(cc)
-			dlen := int(tag)
-			atoms := n2atoms(dlen)
-			tailOff := off + 16*int64(atoms) - 1
-			if err = a.read(cc, tailOff); err != nil {
-				return
-			}
-
-			switch tag := cc[0]; tag {
-			default:
-				return nil, &ErrILSEQ{Type: ErrTailTag, Off: off, Arg: int64(tag)}
-			case tagNotCompressed:
-				b = need(dlen, buf)
-				off += 1
-				if err = a.read(b, off); err != nil {
-					b = buf[:0]
-				}
-				return
-			case tagCompressed:
-				zbuf := bufs.GCache.Get(dlen)
-				defer bufs.GCache.Put(zbuf)
-				off += 1
-				if err = a.read(zbuf, off); err != nil {
-					return buf[:0], err
-				}
-
-				return zappy.Decode(buf, zbuf)
-			}
-		}
-	case 0:
-		return buf[:0], nil
-	case tagUsedLong:
-		cc := bufs.GCache.Get(1)
-		defer bufs.GCache.Put(cc)
-		dlen := m2n(int(first[1])<<8 | int(first[2]))
-		atoms := n2atoms(dlen)
-		tailOff := off + 16*int64(atoms) - 1
-		if err = a.read(cc, tailOff); err != nil {
-			return
-		}
-
-		switch tag := cc[0]; tag {
-		default:
-			return nil, &ErrILSEQ{Type: ErrTailTag, Off: off, Arg: int64(tag)}
-		case tagNotCompressed:
-			b = need(dlen, buf)
-			off += 3
-			if err = a.read(b, off); err != nil {
-				b = buf[:0]
-			}
-			return
-		case tagCompressed:
-			zbuf := bufs.GCache.Get(dlen)
-			defer bufs.GCache.Put(zbuf)
-			off += 3
-			if err = a.read(zbuf, off); err != nil {
-				return buf[:0], err
-			}
-
-			return zappy.Decode(buf, zbuf)
-		}
-	case tagFreeShort, tagFreeLong:
-		return nil, &ErrILSEQ{Type: ErrExpUsedTag, Off: off, Arg: int64(tag)}
-	case tagUsedRelocated:
-		if relocated {
-			return nil, &ErrILSEQ{Type: ErrUnexpReloc, Off: off, Arg: relocSrc}
-		}
-
-		handle = b2h(first[1:])
-		relocated = true
-		goto reloc
-	}
-}
-
-var reallocTestHook bool
-
-// Realloc sets the content of a block referred to by handle or returns an
-// error, if any.
-//
-// Handle must have been obtained initially from Alloc and must be still valid,
-// otherwise a database may get irreparably corrupted.
-func (a *Allocator) Realloc(handle int64, b []byte) (err error) {
-	if handle <= 0 || handle > maxHandle {
-		return &ErrINVAL{"Realloc: handle out of limits", handle}
-	}
-
-	a.cfree(handle)
-	if err = a.realloc(handle, b); err != nil {
-		return
-	}
-
-	if reallocTestHook {
-		if err = cacheAudit(a.m, &a.lru); err != nil {
-			return
-		}
-	}
-
-	a.cadd(b, handle)
-	return
-}
-
-func (a *Allocator) realloc(handle int64, b []byte) (err error) {
-	var dlen, needAtoms0 int
-
-	b8 := bufs.GCache.Get(8)
-	defer bufs.GCache.Put(b8)
-	dst := bufs.GCache.Get(zappy.MaxEncodedLen(len(b)))
-	defer bufs.GCache.Put(dst)
-	b, needAtoms0, cc, err := a.makeUsedBlock(dst, b)
-	if err != nil {
-		return
-	}
-
-	needAtoms := int64(needAtoms0)
-	off := h2off(handle)
-	if err = a.read(b8[:], off); err != nil {
-		return
-	}
-
-	switch tag := b8[0]; tag {
-	default:
-		dlen = int(b8[0])
-	case tagUsedLong:
-		dlen = m2n(int(b8[1])<<8 | int(b8[2]))
-	case tagUsedRelocated:
-		if err = a.free(b2h(b8[1:]), handle, false); err != nil {
-			return err
-		}
-
-		dlen = 0
-	case tagFreeShort, tagFreeLong:
-		return &ErrINVAL{"Allocator.Realloc: invalid handle", handle}
-	}
-
-	atoms := int64(n2atoms(dlen))
-retry:
-	switch {
-	case needAtoms < atoms:
-		// in place shrink
-		if err = a.writeUsedBlock(handle, cc, b); err != nil {
-			return
-		}
-
-		fh, fa := handle+needAtoms, atoms-needAtoms
-		sz, err := a.f.Size()
-		if err != nil {
-			return err
-		}
-
-		if h2off(fh)+16*fa == sz {
-			return a.f.Truncate(h2off(fh))
-		}
-
-		return a.free2(fh, fa)
-	case needAtoms == atoms:
-		// in place replace
-		return a.writeUsedBlock(handle, cc, b)
-	}
-
-	// case needAtoms > atoms:
-	// in place extend or relocate
-	var sz int64
-	if sz, err = a.f.Size(); err != nil {
-		return
-	}
-
-	off = h2off(handle)
-	switch {
-	case off+atoms*16 == sz:
-		// relocating tail block - shortcut
-		return a.writeUsedBlock(handle, cc, b)
-	default:
-		if off+atoms*16 < sz {
-			// handle is not a tail block, check right neighbour
-			rh := handle + atoms
-			rtag, ratoms, p, n, e := a.nfo(rh)
-			if e != nil {
-				return e
-			}
-
-			if rtag == tagFreeShort || rtag == tagFreeLong {
-				// Right neighbour is a free block
-				if needAtoms <= atoms+ratoms {
-					// can expand in place
-					if err = a.unlink(rh, ratoms, p, n); err != nil {
-						return
-					}
-
-					atoms += ratoms
-					goto retry
-
-				}
-			}
-		}
-	}
-
-	if atoms > 1 {
-		if err = a.realloc(handle, nil); err != nil {
-			return
-		}
-	}
-
-	var newH int64
-	if newH, err = a.alloc(b, cc); err != nil {
-		return err
-	}
-
-	rb := bufs.GCache.Cget(16)
-	defer bufs.GCache.Put(rb)
-	rb[0] = tagUsedRelocated
-	h2b(rb[1:], newH)
-	if err = a.writeAt(rb[:], h2off(handle)); err != nil {
-		return
-	}
-
-	return a.writeUsedBlock(newH, cc, b)
-}
-
-func (a *Allocator) writeAt(b []byte, off int64) (err error) {
-	var n int
-	if n, err = a.f.WriteAt(b, off); err != nil {
-		return
-	}
-
-	if n != len(b) {
-		err = io.ErrShortWrite
-	}
-	return
-}
-
-func (a *Allocator) write(off int64, b ...[]byte) (err error) {
-	rq := 0
-	for _, part := range b {
-		rq += len(part)
-	}
-	buf := bufs.GCache.Get(rq)
-	defer bufs.GCache.Put(buf)
-	buf = buf[:0]
-	for _, part := range b {
-		buf = append(buf, part...)
-	}
-	return a.writeAt(buf, off)
-}
-
-func (a *Allocator) read(b []byte, off int64) (err error) {
-	var rn int
-	if rn, err = a.f.ReadAt(b, off); rn != len(b) {
-		return &ErrILSEQ{Type: ErrOther, Off: off, More: err}
-	}
-
-	return nil
-}
-
-// nfo returns h's tag. If it's a free block then return also (s)ize (in
-// atoms), (p)rev and (n)ext. If it's a used block then only (s)ize is returned
-// (again in atoms). If it's a used relocate block then (n)ext is set to the
-// relocation target handle.
-func (a *Allocator) nfo(h int64) (tag byte, s, p, n int64, err error) {
-	off := h2off(h)
-	rq := int64(22)
-	sz, err := a.f.Size()
-	if err != nil {
-		return
-	}
-
-	if off+rq >= sz {
-		if rq = sz - off; rq < 15 {
-			err = io.ErrUnexpectedEOF
-			return
-		}
-	}
-
-	buf := bufs.GCache.Get(22)
-	defer bufs.GCache.Put(buf)
-	if err = a.read(buf[:rq], off); err != nil {
-		return
-	}
-
-	switch tag = buf[0]; tag {
-	default:
-		s = int64(n2atoms(int(tag)))
-	case tagUsedLong:
-		s = int64(n2atoms(m2n(int(buf[1])<<8 | int(buf[2]))))
-	case tagFreeLong:
-		if rq < 22 {
-			err = io.ErrUnexpectedEOF
-			return
-		}
-
-		s, p, n = b2h(buf[1:]), b2h(buf[8:]), b2h(buf[15:])
-	case tagUsedRelocated:
-		s, n = 1, b2h(buf[1:])
-	case tagFreeShort:
-		s, p, n = 1, b2h(buf[1:]), b2h(buf[8:])
-	}
-	return
-}
-
-// leftNfo returns nfo for h's left neighbor if h > 1 and the left neighbor is
-// a free block. Otherwise all zero values are returned instead.
-func (a *Allocator) leftNfo(h int64) (tag byte, s, p, n int64, err error) {
-	if !(h > 1) {
-		return
-	}
-
-	buf := bufs.GCache.Get(8)
-	defer bufs.GCache.Put(buf)
-	off := h2off(h)
-	if err = a.read(buf[:], off-8); err != nil {
-		return
-	}
-
-	switch tag := buf[7]; tag {
-	case tagFreeShort:
-		return a.nfo(h - 1)
-	case tagFreeLong:
-		return a.nfo(h - b2h(buf[:]))
-	}
-	return
-}
-
-// Set h.prev = p
-func (a *Allocator) prev(h, p int64) (err error) {
-	b := bufs.GCache.Get(7)
-	defer bufs.GCache.Put(b)
-	off := h2off(h)
-	if err = a.read(b[:1], off); err != nil {
-		return
-	}
-
-	switch tag := b[0]; tag {
-	default:
-		return &ErrILSEQ{Type: ErrExpFreeTag, Off: off, Arg: int64(tag)}
-	case tagFreeShort:
-		off += 1
-	case tagFreeLong:
-		off += 8
-	}
-	return a.writeAt(h2b(b[:7], p), off)
-}
-
-// Set h.next = n
-func (a *Allocator) next(h, n int64) (err error) {
-	b := bufs.GCache.Get(7)
-	defer bufs.GCache.Put(b)
-	off := h2off(h)
-	if err = a.read(b[:1], off); err != nil {
-		return
-	}
-
-	switch tag := b[0]; tag {
-	default:
-		return &ErrILSEQ{Type: ErrExpFreeTag, Off: off, Arg: int64(tag)}
-	case tagFreeShort:
-		off += 8
-	case tagFreeLong:
-		off += 15
-	}
-	return a.writeAt(h2b(b[:7], n), off)
-}
-
-// Make the filer image @h a free block.
-func (a *Allocator) makeFree(h, atoms, prev, next int64) (err error) {
-	buf := bufs.GCache.Get(22)
-	defer bufs.GCache.Put(buf)
-	switch {
-	case atoms == 1:
-		buf[0], buf[15] = tagFreeShort, tagFreeShort
-		h2b(buf[1:], prev)
-		h2b(buf[8:], next)
-		if err = a.write(h2off(h), buf[:16]); err != nil {
-			return
-		}
-	default:
-
-		buf[0] = tagFreeLong
-		h2b(buf[1:], atoms)
-		h2b(buf[8:], prev)
-		h2b(buf[15:], next)
-		if err = a.write(h2off(h), buf[:22]); err != nil {
-			return
-		}
-
-		h2b(buf[:], atoms)
-		buf[7] = tagFreeLong
-		if err = a.write(h2off(h+atoms)-8, buf[:8]); err != nil {
-			return
-		}
-	}
-	if prev != 0 {
-		if err = a.next(prev, h); err != nil {
-			return
-		}
-	}
-
-	if next != 0 {
-		err = a.prev(next, h)
-	}
-	return
-}
-
-func (a *Allocator) makeUsedBlock(dst []byte, b []byte) (w []byte, rqAtoms int, cc byte, err error) {
-	cc = tagNotCompressed
-	w = b
-
-	var n int
-	if n = len(b); n > maxRq {
-		return nil, 0, 0, &ErrINVAL{"Allocator.makeUsedBlock: content size out of limits", n}
-	}
-
-	rqAtoms = n2atoms(n)
-	if a.Compress && n > 14 { // attempt compression
-		if dst, err = zappy.Encode(dst, b); err != nil {
-			return
-		}
-
-		n2 := len(dst)
-		if rqAtoms2 := n2atoms(n2); rqAtoms2 < rqAtoms { // compression saved at least a single atom
-			w, n, rqAtoms, cc = dst, n2, rqAtoms2, tagCompressed
-		}
-	}
-	return
-}
-
-func (a *Allocator) writeUsedBlock(h int64, cc byte, b []byte) (err error) {
-	n := len(b)
-	rq := n2atoms(n) << 4
-	buf := bufs.GCache.Get(rq)
-	defer bufs.GCache.Put(buf)
-	switch n <= maxShort {
-	case true:
-		buf[0] = byte(n)
-		copy(buf[1:], b)
-	case false:
-		m := n2m(n)
-		buf[0], buf[1], buf[2] = tagUsedLong, byte(m>>8), byte(m)
-		copy(buf[3:], b)
-	}
-	if p := n2padding(n); p != 0 {
-		copy(buf[rq-1-p:], zeros[:])
-	}
-	buf[rq-1] = cc
-	return a.writeAt(buf, h2off(h))
-}
-
-func (a *Allocator) verifyUnused(h, totalAtoms int64, tag byte, log func(error) bool, fast bool) (atoms, prev, next int64, err error) {
-	switch tag {
-	default:
-		panic("internal error")
-	case tagFreeShort:
-		var b [16]byte
-		off := h2off(h)
-		if err = a.read(b[:], off); err != nil {
-			return
-		}
-
-		if b[15] != tagFreeShort {
-			err = &ErrILSEQ{Type: ErrShortFreeTailTag, Off: off, Arg: int64(b[15])}
-			log(err)
-			return
-		}
-
-		atoms, prev, next = 1, b2h(b[1:]), b2h(b[8:])
-	case tagFreeLong:
-		var b [22]byte
-		off := h2off(h)
-		if err = a.read(b[:], off); err != nil {
-			return
-		}
-
-		atoms, prev, next = b2h(b[1:]), b2h(b[8:]), b2h(b[15:])
-		if fast {
-			return
-		}
-
-		if atoms < 2 {
-			err = &ErrILSEQ{Type: ErrLongFreeBlkTooShort, Off: off, Arg: int64(atoms)}
-			break
-		}
-
-		if h+atoms-1 > totalAtoms {
-			err = &ErrILSEQ{Type: ErrLongFreeBlkTooLong, Off: off, Arg: atoms}
-			break
-		}
-
-		if prev > totalAtoms {
-			err = &ErrILSEQ{Type: ErrLongFreePrevBeyondEOF, Off: off, Arg: next}
-			break
-		}
-
-		if next > totalAtoms {
-			err = &ErrILSEQ{Type: ErrLongFreeNextBeyondEOF, Off: off, Arg: next}
-			break
-		}
-
-		toff := h2off(h+atoms) - 8
-		if err = a.read(b[:8], toff); err != nil {
-			return
-		}
-
-		if b[7] != tag {
-			err = &ErrILSEQ{Type: ErrLongFreeTailTag, Off: off, Arg: int64(b[7])}
-			break
-		}
-
-		if s2 := b2h(b[:]); s2 != atoms {
-			err = &ErrILSEQ{Type: ErrVerifyTailSize, Off: off, Arg: atoms, Arg2: s2}
-			break
-		}
-
-	}
-	if err != nil {
-		log(err)
-	}
-	return
-}
-
-func (a *Allocator) verifyUsed(h, totalAtoms int64, tag byte, buf, ubuf []byte, log func(error) bool, fast bool) (compressed bool, dlen int, atoms, link int64, err error) {
-	var (
-		padding  int
-		doff     int64
-		padZeros [15]byte
-		tailBuf  [16]byte
-	)
-
-	switch tag {
-	default: // Short used
-		dlen = int(tag)
-		atoms = int64((dlen+1)/16) + 1
-		padding = 15 - (dlen+1)%16
-		doff = h2off(h) + 1
-	case tagUsedLong:
-		off := h2off(h) + 1
-		var b2 [2]byte
-		if err = a.read(b2[:], off); err != nil {
-			return
-		}
-
-		dlen = m2n(int(b2[0])<<8 | int(b2[1]))
-		atoms = int64((dlen+3)/16) + 1
-		padding = 15 - (dlen+3)%16
-		doff = h2off(h) + 3
-	case tagUsedRelocated:
-		dlen = 7
-		atoms = 1
-		padding = 7
-		doff = h2off(h) + 1
-	case tagFreeShort, tagFreeLong:
-		panic("internal error")
-	}
-
-	if fast {
-		if tag == tagUsedRelocated {
-			dlen = 0
-			if err = a.read(buf[:7], doff); err != nil {
-				return
-			}
-
-			link = b2h(buf)
-		}
-
-		return false, dlen, atoms, link, nil
-	}
-
-	if ok := h+atoms-1 <= totalAtoms; !ok { // invalid last block
-		err = &ErrILSEQ{Type: ErrVerifyUsedSpan, Off: h2off(h), Arg: atoms}
-		log(err)
-		return
-	}
-
-	tailsz := 1 + padding
-	off := h2off(h) + 16*atoms - int64(tailsz)
-	if err = a.read(tailBuf[:tailsz], off); err != nil {
-		return false, 0, 0, 0, err
-	}
-
-	if ok := bytes.Equal(padZeros[:padding], tailBuf[:padding]); !ok {
-		err = &ErrILSEQ{Type: ErrVerifyPadding, Off: h2off(h)}
-		log(err)
-		return
-	}
-
-	var cc byte
-	switch cc = tailBuf[padding]; cc {
-	default:
-		err = &ErrILSEQ{Type: ErrTailTag, Off: h2off(h)}
-		log(err)
-		return
-	case tagCompressed:
-		compressed = true
-		if tag == tagUsedRelocated {
-			err = &ErrILSEQ{Type: ErrTailTag, Off: h2off(h)}
-			log(err)
-			return
-		}
-
-		fallthrough
-	case tagNotCompressed:
-		if err = a.read(buf[:dlen], doff); err != nil {
-			return false, 0, 0, 0, err
-		}
-	}
-
-	if cc == tagCompressed {
-		if ubuf, err = zappy.Decode(ubuf, buf[:dlen]); err != nil || len(ubuf) > maxRq {
-			err = &ErrILSEQ{Type: ErrDecompress, Off: h2off(h)}
-			log(err)
-			return
-		}
-
-		dlen = len(ubuf)
-	}
-
-	if tag == tagUsedRelocated {
-		link = b2h(buf)
-		if link == 0 {
-			err = &ErrILSEQ{Type: ErrNullReloc, Off: h2off(h)}
-			log(err)
-			return
-		}
-
-		if link > totalAtoms { // invalid last block
-			err = &ErrILSEQ{Type: ErrRelocBeyondEOF, Off: h2off(h), Arg: link}
-			log(err)
-			return
-		}
-	}
-
-	return
-}
-
-var nolog = func(error) bool { return false }
-
-// Verify attempts to find any structural errors in a Filer wrt the
-// organization of it as defined by Allocator. 'bitmap' is a scratch pad for
-// necessary bookkeeping and will grow to at most to Allocator's
-// Filer.Size()/128 (0,78%).  Any problems found are reported to 'log' except
-// non verify related errors like disk read fails etc.  If 'log' returns false
-// or the error doesn't allow to (reliably) continue, the verification process
-// is stopped and an error is returned from the Verify function. Passing a nil
-// log works like providing a log function always returning false. Any
-// non-structural errors, like for instance Filer read errors, are NOT reported
-// to 'log', but returned as the Verify's return value, because Verify cannot
-// proceed in such cases.  Verify returns nil only if it fully completed
-// verifying Allocator's Filer without detecting any error.
-//
-// It is recommended to limit the number reported problems by returning false
-// from 'log' after reaching some limit. Huge and corrupted DB can produce an
-// overwhelming error report dataset.
-//
-// The verifying process will scan the whole DB at least 3 times (a trade
-// between processing space and time consumed). It doesn't read the content of
-// free blocks above the head/tail info bytes. If the 3rd phase detects lost
-// free space, then a 4th scan (a faster one) is performed to precisely report
-// all of them.
-//
-// If the DB/Filer to be verified is reasonably small, respective if its
-// size/128 can comfortably fit within process's free memory, then it is
-// recommended to consider using a MemFiler for the bit map.
-//
-// Statistics are returned via 'stats' if non nil. The statistics are valid
-// only if Verify succeeded, ie. it didn't reported anything to log and it
-// returned a nil error.
-func (a *Allocator) Verify(bitmap Filer, log func(error) bool, stats *AllocStats) (err error) {
-	if log == nil {
-		log = nolog
-	}
-
-	n, err := bitmap.Size()
-	if err != nil {
-		return
-	}
-
-	if n != 0 {
-		return &ErrINVAL{"Allocator.Verify: bit map initial size non zero (%d)", n}
-	}
-
-	var bits int64
-	bitMask := [8]byte{1, 2, 4, 8, 16, 32, 64, 128}
-	byteBuf := []byte{0}
-
-	//DONE
-	// +performance, this implementation is hopefully correct but _very_
-	// naive, probably good as a prototype only. Use maybe a MemFiler
-	// "cache" etc.
-	// ----
-	// Turns out the OS caching is as effective as it can probably get.
-	bit := func(on bool, h int64) (wasOn bool, err error) {
-		m := bitMask[h&7]
-		off := h >> 3
-		var v byte
-		sz, err := bitmap.Size()
-		if err != nil {
-			return
-		}
-
-		if off < sz {
-			if n, err := bitmap.ReadAt(byteBuf, off); n != 1 {
-				return false, &ErrILSEQ{Type: ErrOther, Off: off, More: fmt.Errorf("Allocator.Verify - reading bitmap: %s", err)}
-			}
-
-			v = byteBuf[0]
-		}
-		switch wasOn = v&m != 0; on {
-		case true:
-			if !wasOn {
-				v |= m
-				bits++
-			}
-		case false:
-			if wasOn {
-				v ^= m
-				bits--
-			}
-		}
-		byteBuf[0] = v
-		if n, err := bitmap.WriteAt(byteBuf, off); n != 1 || err != nil {
-			return false, &ErrILSEQ{Type: ErrOther, Off: off, More: fmt.Errorf("Allocator.Verify - writing bitmap: %s", err)}
-		}
-
-		return
-	}
-
-	// Phase 1 - sequentially scan a.f to reliably determine block
-	// boundaries. Set a bit for every block start.
-	var (
-		buf, ubuf       [maxRq]byte
-		prevH, h, atoms int64
-		wasOn           bool
-		tag             byte
-		st              = AllocStats{
-			AllocMap: map[int64]int64{},
-			FreeMap:  map[int64]int64{},
-		}
-		dlen int
-	)
-
-	fsz, err := a.f.Size()
-	if err != nil {
-		return
-	}
-
-	ok := fsz%16 == 0
-	totalAtoms := (fsz - fltSz) / atomLen
-	if !ok {
-		err = &ErrILSEQ{Type: ErrFileSize, Name: a.f.Name(), Arg: fsz}
-		log(err)
-		return
-	}
-
-	st.TotalAtoms = totalAtoms
-	prevTag := -1
-	lastH := int64(-1)
-
-	for h = 1; h <= totalAtoms; h += atoms {
-		prevH = h // For checking last block == used
-
-		off := h2off(h)
-		if err = a.read(buf[:1], off); err != nil {
-			return
-		}
-
-		switch tag = buf[0]; tag {
-		default: // Short used
-			fallthrough
-		case tagUsedLong, tagUsedRelocated:
-			var compressed bool
-			if compressed, dlen, atoms, _, err = a.verifyUsed(h, totalAtoms, tag, buf[:], ubuf[:], log, false); err != nil {
-				return
-			}
-
-			if compressed {
-				st.Compression++
-			}
-			st.AllocAtoms += atoms
-			switch {
-			case tag == tagUsedRelocated:
-				st.AllocMap[1]++
-				st.Relocations++
-			default:
-				st.AllocMap[atoms]++
-				st.AllocBytes += int64(dlen)
-				st.Handles++
-			}
-		case tagFreeShort, tagFreeLong:
-			if prevTag == tagFreeShort || prevTag == tagFreeLong {
-				err = &ErrILSEQ{Type: ErrAdjacentFree, Off: h2off(lastH), Arg: off}
-				log(err)
-				return
-			}
-
-			if atoms, _, _, err = a.verifyUnused(h, totalAtoms, tag, log, false); err != nil {
-				return
-			}
-
-			st.FreeMap[atoms]++
-			st.FreeAtoms += atoms
-		}
-
-		if wasOn, err = bit(true, h); err != nil {
-			return
-		}
-
-		if wasOn {
-			panic("internal error")
-		}
-
-		prevTag = int(tag)
-		lastH = h
-	}
-
-	if totalAtoms != 0 && (tag == tagFreeShort || tag == tagFreeLong) {
-		err = &ErrILSEQ{Type: ErrFreeTailBlock, Off: h2off(prevH)}
-		log(err)
-		return
-	}
-
-	// Phase 2 - check used blocks, turn off the map bit for every used
-	// block.
-	for h = 1; h <= totalAtoms; h += atoms {
-		off := h2off(h)
-		if err = a.read(buf[:1], off); err != nil {
-			return
-		}
-
-		var link int64
-		switch tag = buf[0]; tag {
-		default: // Short used
-			fallthrough
-		case tagUsedLong, tagUsedRelocated:
-			if _, _, atoms, link, err = a.verifyUsed(h, totalAtoms, tag, buf[:], ubuf[:], log, true); err != nil {
-				return
-			}
-		case tagFreeShort, tagFreeLong:
-			if atoms, _, _, err = a.verifyUnused(h, totalAtoms, tag, log, true); err != nil {
-				return
-			}
-		}
-
-		turnoff := true
-		switch tag {
-		case tagUsedRelocated:
-			if err = a.read(buf[:1], h2off(link)); err != nil {
-				return
-			}
-
-			switch linkedTag := buf[0]; linkedTag {
-			case tagFreeShort, tagFreeLong, tagUsedRelocated:
-				err = &ErrILSEQ{Type: ErrInvalidRelocTarget, Off: off, Arg: link}
-				log(err)
-				return
-			}
-
-		case tagFreeShort, tagFreeLong:
-			turnoff = false
-		}
-
-		if !turnoff {
-			continue
-		}
-
-		if wasOn, err = bit(false, h); err != nil {
-			return
-		}
-
-		if !wasOn {
-			panic("internal error")
-		}
-
-	}
-
-	// Phase 3 - using the flt check heads link to proper free blocks.  For
-	// every free block, walk the list, verify the {next, prev} links and
-	// turn the respective map bit off. After processing all free lists,
-	// the map bits count should be zero. Otherwise there are "lost" free
-	// blocks.
-
-	var prev, next, fprev, fnext int64
-	rep := a.flt
-
-	for _, list := range rep {
-		prev, next = 0, list.head
-		for ; next != 0; prev, next = next, fnext {
-			if wasOn, err = bit(false, next); err != nil {
-				return
-			}
-
-			if !wasOn {
-				err = &ErrILSEQ{Type: ErrFLT, Off: h2off(next), Arg: h}
-				log(err)
-				return
-			}
-
-			off := h2off(next)
-			if err = a.read(buf[:1], off); err != nil {
-				return
-			}
-
-			switch tag = buf[0]; tag {
-			default:
-				panic("internal error")
-			case tagFreeShort, tagFreeLong:
-				if atoms, fprev, fnext, err = a.verifyUnused(next, totalAtoms, tag, log, true); err != nil {
-					return
-				}
-
-				if min := list.minSize; atoms < min {
-					err = &ErrILSEQ{Type: ErrFLTSize, Off: h2off(next), Arg: atoms, Arg2: min}
-					log(err)
-					return
-				}
-
-				if fprev != prev {
-					err = &ErrILSEQ{Type: ErrFreeChaining, Off: h2off(next)}
-					log(err)
-					return
-				}
-			}
-		}
-
-	}
-
-	if bits == 0 { // Verify succeeded
-		if stats != nil {
-			*stats = st
-		}
-		return
-	}
-
-	// Phase 4 - if after phase 3 there are lost free blocks, report all of
-	// them to 'log'
-	for i := range ubuf { // setup zeros for compares
-		ubuf[i] = 0
-	}
-
-	var off, lh int64
-	rem, err := bitmap.Size()
-	if err != nil {
-		return err
-	}
-
-	for rem != 0 {
-		rq := int(mathutil.MinInt64(64*1024, rem))
-		var n int
-		if n, err = bitmap.ReadAt(buf[:rq], off); n != rq {
-			return &ErrILSEQ{Type: ErrOther, Off: off, More: fmt.Errorf("bitmap ReadAt(size %d, off %#x): %s", rq, off, err)}
-		}
-
-		if !bytes.Equal(buf[:rq], ubuf[:rq]) {
-			for d, v := range buf[:rq] {
-				if v != 0 {
-					for i, m := range bitMask {
-						if v&m != 0 {
-							lh = 8*(off+int64(d)) + int64(i)
-							err = &ErrILSEQ{Type: ErrLostFreeBlock, Off: h2off(lh)}
-							log(err)
-							return
-						}
-					}
-				}
-			}
-		}
-
-		off += int64(rq)
-		rem -= int64(rq)
-	}
-
-	return
-}
-
-type fltSlot struct {
-	head    int64
-	minSize int64
-}
-
-func (f fltSlot) String() string {
-	return fmt.Sprintf("head %#x, minSize %#x\n", f.head, f.minSize)
-}
-
-type flt [14]fltSlot
-
-func (f *flt) init() {
-	sz := 1
-	for i := range *f {
-		f[i].minSize, f[i].head = int64(sz), 0
-		sz <<= 1
-	}
-	f[13].minSize = 4112
-}
-
-func (f *flt) load(fi Filer, off int64) (err error) {
-	b := bufs.GCache.Get(fltSz)
-	defer bufs.GCache.Put(b)
-	if _, err = fi.ReadAt(b[:], off); err != nil {
-		return
-	}
-
-	for i := range *f {
-		off := 8*i + 1
-		f[i].head = b2h(b[off:])
-	}
-	return
-}
-
-func (f *flt) find(rq int) (h int64) {
-	switch {
-	case rq < 1:
-		panic(rq)
-	case rq >= maxFLTRq:
-		h, f[13].head = f[13].head, 0
-		return
-	default:
-		g := f[mathutil.Log2Uint16(uint16(rq)):]
-		for i := range g {
-			p := &g[i]
-			if rq <= int(p.minSize) {
-				if h = p.head; h != 0 {
-					p.head = 0
-					return
-				}
-			}
-		}
-		return
-	}
-}
-
-func (f *flt) head(atoms int64) (h int64) {
-	switch {
-	case atoms < 1:
-		panic(atoms)
-	case atoms >= maxFLTRq:
-		return f[13].head
-	default:
-		lg := mathutil.Log2Uint16(uint16(atoms))
-		g := f[lg:]
-		for i := range g {
-			if atoms < g[i+1].minSize {
-				return g[i].head
-			}
-		}
-		panic("internal error")
-	}
-}
-
-func (f *flt) setHead(h, atoms int64, fi Filer) (err error) {
-	switch {
-	case atoms < 1:
-		panic(atoms)
-	case atoms >= maxFLTRq:
-		b := bufs.GCache.Get(7)
-		defer bufs.GCache.Put(b)
-		if _, err = fi.WriteAt(h2b(b[:], h), 8*13+1); err != nil {
-			return
-		}
-
-		f[13].head = h
-		return
-	default:
-		lg := mathutil.Log2Uint16(uint16(atoms))
-		g := f[lg:]
-		for i := range f {
-			if atoms < g[i+1].minSize {
-				b := bufs.GCache.Get(7)
-				defer bufs.GCache.Put(b)
-				if _, err = fi.WriteAt(h2b(b[:], h), 8*int64(i+lg)+1); err != nil {
-					return
-				}
-
-				g[i].head = h
-				return
-			}
-		}
-		panic("internal error")
-	}
-}
-
-func (f *flt) String() string {
-	a := []string{}
-	for i, v := range *f {
-		a = append(a, fmt.Sprintf("[%2d] %s", i, v))
-	}
-	return strings.Join(a, "")
-}
-
-type node struct {
-	b          []byte
-	h          int64
-	prev, next *node
-}
-
-type cache []*node
-
-func (c *cache) get(n int) *node {
-	r, _ := c.get2(n)
-	return r
-}
-
-func (c *cache) get2(n int) (r *node, isZeroed bool) {
-	s := *c
-	lens := len(s)
-	if lens == 0 {
-		return &node{b: make([]byte, n, mathutil.Min(2*n, maxBuf))}, true
-	}
-
-	i := sort.Search(lens, func(x int) bool { return len(s[x].b) >= n })
-	if i == lens {
-		i--
-		s[i].b, isZeroed = make([]byte, n, mathutil.Min(2*n, maxBuf)), true
-	}
-
-	r = s[i]
-	r.b = r.b[:n]
-	copy(s[i:], s[i+1:])
-	s = s[:lens-1]
-	*c = s
-	return
-}
-
-func (c *cache) cget(n int) (r *node) {
-	r, ok := c.get2(n)
-	if ok {
-		return
-	}
-
-	for i := range r.b {
-		r.b[i] = 0
-	}
-	return
-}
-
-func (c *cache) size() (sz int64) {
-	for _, n := range *c {
-		sz += int64(cap(n.b))
-	}
-	return
-}
-
-func (c *cache) put(n *node) *node {
-	s := *c
-	n.b = n.b[:cap(n.b)]
-	lenb := len(n.b)
-	lens := len(s)
-	i := sort.Search(lens, func(x int) bool { return len(s[x].b) >= lenb })
-	s = append(s, nil)
-	copy(s[i+1:], s[i:])
-	s[i] = n
-	*c = s
-	return n
-}
-
-type lst struct {
-	front, back *node
-}
-
-func (l *lst) pushFront(n *node) *node {
-	if l.front == nil {
-		l.front, l.back, n.prev, n.next = n, n, nil, nil
-		return n
-	}
-
-	n.prev, n.next, l.front.prev, l.front = nil, l.front, n, n
-	return n
-}
-
-func (l *lst) remove(n *node) *node {
-	if n.prev == nil {
-		l.front = n.next
-	} else {
-		n.prev.next = n.next
-	}
-	if n.next == nil {
-		l.back = n.prev
-	} else {
-		n.next.prev = n.prev
-	}
-	n.prev, n.next = nil, nil
-	return n
-}
-
-func (l *lst) removeBack() *node {
-	return l.remove(l.back)
-}
-
-func (l *lst) moveToFront(n *node) *node {
-	return l.pushFront(l.remove(n))
-}
-
-func (l *lst) size() (sz int64) {
-	for n := l.front; n != nil; n = n.next {
-		sz += int64(cap(n.b))
-	}
-	return
-}
-
-func cacheAudit(m map[int64]*node, l *lst) (err error) {
-	cnt := 0
-	for h, n := range m {
-		if g, e := n.h, h; g != e {
-			return fmt.Errorf("cacheAudit: invalid node handle %d != %d", g, e)
-		}
-
-		if cnt, err = l.audit(n, true); err != nil {
-			return
-		}
-	}
-
-	if g, e := cnt, len(m); g != e {
-		return fmt.Errorf("cacheAudit: invalid cache size %d != %d", g, e)
-	}
-
-	return
-}
-
-func (l *lst) audit(n *node, onList bool) (cnt int, err error) {
-	if !onList && (n.prev != nil || n.next != nil) {
-		return -1, fmt.Errorf("lst.audit: free node with non nil linkage")
-	}
-
-	if l.front == nil && l.back != nil || l.back == nil && l.front != nil {
-		return -1, fmt.Errorf("lst.audit: one of .front/.back is nil while the other is non nil")
-	}
-
-	if l.front == l.back && l.front != nil {
-		x := l.front
-		if x.prev != nil || x.next != nil {
-			return -1, fmt.Errorf("lst.audit: single node has non nil linkage")
-		}
-
-		if onList && x != n {
-			return -1, fmt.Errorf("lst.audit: single node is alien")
-		}
-	}
-
-	seen := false
-	var prev *node
-	x := l.front
-	for x != nil {
-		cnt++
-		if x.prev != prev {
-			return -1, fmt.Errorf("lst.audit: broken .prev linkage")
-		}
-
-		if x == n {
-			seen = true
-		}
-
-		prev = x
-		x = x.next
-	}
-
-	if prev != l.back {
-		return -1, fmt.Errorf("lst.audit: broken .back linkage")
-	}
-
-	if onList && !seen {
-		return -1, fmt.Errorf("lst.audit: node missing in list")
-	}
-
-	if !onList && seen {
-		return -1, fmt.Errorf("lst.audit: node should not be on the list")
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer.go
deleted file mode 100644
index 38b389387a..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// An abstraction of file like (persistent) storage with optional (abstracted)
-// support for structural integrity.
-
-package lldb
-
-import (
-	"fmt"
-
-	"github.com/cznic/mathutil"
-)
-
-func doubleTrouble(first, second error) error {
-	return fmt.Errorf("%q. Additionally, while attempting to recover (rollback): %q", first, second)
-}
-
-// A Filer is a []byte-like model of a file or similar entity. It may
-// optionally implement support for structural transaction safety. In contrast
-// to a file stream, a Filer is not sequentially accessible. ReadAt and WriteAt
-// are always "addressed" by an offset and are assumed to perform atomically.
-// A Filer is not safe for concurrent access, it's designed for consumption by
-// the other objects in package, which should use a Filer from one goroutine
-// only or via a mutex. BeginUpdate, EndUpdate and Rollback must be either all
-// implemented by a Filer for structural integrity - or they should be all
-// no-ops; where/if that requirement is relaxed.
-//
-// If a Filer wraps another Filer implementation, it usually invokes the same
-// methods on the "inner" one, after some possible argument translations etc.
-// If a Filer implements the structural transactions handling methods
-// (BeginUpdate, EndUpdate and Rollback) as no-ops _and_ wraps another Filer:
-// it then still MUST invoke those methods on the inner Filer. This is
-// important for the case where a RollbackFiler exists somewhere down the
-// chain.  It's also important for an Allocator - to know when it must
-// invalidate its FLT cache.
-type Filer interface {
-	// BeginUpdate increments the "nesting" counter (initially zero). Every
-	// call to BeginUpdate must be eventually "balanced" by exactly one of
-	// EndUpdate or Rollback. Calls to BeginUpdate may nest.
-	BeginUpdate() error
-
-	// Analogous to os.File.Close().
-	Close() error
-
-	// EndUpdate decrements the "nesting" counter. If it's zero after that
-	// then assume the "storage" has reached structural integrity (after a
-	// batch of partial updates). If a Filer implements some support for
-	// that (write ahead log, journal, etc.) then the appropriate actions
-	// are to be taken for nesting == 0. Invocation of an unbalanced
-	// EndUpdate is an error.
-	EndUpdate() error
-
-	// Analogous to os.File.Name().
-	Name() string
-
-	// PunchHole deallocates space inside a "file" in the byte range
-	// starting at off and continuing for size bytes. The actual hole
-	// created by PunchHole may be smaller than requested. The Filer size
-	// (as reported by `Size()` does not change when hole punching, even
-	// when punching the end of a file off.  In contrast to the Linux
-	// implementation of FALLOC_FL_PUNCH_HOLE in `fallocate`(2); a Filer is
-	// free not only to ignore `PunchHole()` (implement it as a nop), but
-	// additionally no guarantees about the content of the hole, when
-	// eventually read back, are required, i.e.  any data, not only zeros,
-	// can be read from the "hole", including just anything what was left
-	// there - with all of the possible security problems.
-	PunchHole(off, size int64) error
-
-	// As os.File.ReadAt. Note: `off` is an absolute "file pointer"
-	// address and cannot be negative even when a Filer is a InnerFiler.
-	ReadAt(b []byte, off int64) (n int, err error)
-
-	// Rollback cancels and undoes the innermost pending update level.
-	// Rollback decrements the "nesting" counter.  If a Filer implements
-	// some support for keeping structural integrity (write ahead log,
-	// journal, etc.) then the appropriate actions are to be taken.
-	// Invocation of an unbalanced Rollback is an error.
-	Rollback() error
-
-	// Analogous to os.File.FileInfo().Size().
-	Size() (int64, error)
-
-	// Analogous to os.Sync().
-	Sync() (err error)
-
-	// Analogous to os.File.Truncate().
-	Truncate(size int64) error
-
-	// Analogous to os.File.WriteAt(). Note: `off` is an absolute "file
-	// pointer" address and cannot be negative even when a Filer is a
-	// InnerFiler.
-	WriteAt(b []byte, off int64) (n int, err error)
-}
-
-var _ Filer = &InnerFiler{} // Ensure InnerFiler is a Filer.
-
-// A InnerFiler is a Filer with added addressing/size translation.
-type InnerFiler struct {
-	outer Filer
-	off   int64
-}
-
-// NewInnerFiler returns a new InnerFiler wrapped by `outer` in a way which
-// adds `off` to every access.
-//
-// For example, considering:
-//
-// 	inner := NewInnerFiler(outer, 10)
-//
-// then
-//
-// 	inner.WriteAt([]byte{42}, 4)
-//
-// translates to
-//
-// 	outer.WriteAt([]byte{42}, 14)
-//
-// But an attempt to emulate
-//
-// 	outer.WriteAt([]byte{17}, 9)
-//
-// by
-//
-// 	inner.WriteAt([]byte{17}, -1)
-//
-// will fail as the `off` parameter can never be < 0. Also note that
-//
-// 	inner.Size() == outer.Size() - off,
-//
-// i.e. `inner` pretends no `outer` exists. Finally, after e.g.
-//
-// 	inner.Truncate(7)
-// 	outer.Size() == 17
-//
-// will be true.
-func NewInnerFiler(outer Filer, off int64) *InnerFiler { return &InnerFiler{outer, off} }
-
-// BeginUpdate implements Filer.
-func (f *InnerFiler) BeginUpdate() error { return f.outer.BeginUpdate() }
-
-// Close implements Filer.
-func (f *InnerFiler) Close() (err error) { return f.outer.Close() }
-
-// EndUpdate implements Filer.
-func (f *InnerFiler) EndUpdate() error { return f.outer.EndUpdate() }
-
-// Name implements Filer.
-func (f *InnerFiler) Name() string { return f.outer.Name() }
-
-// PunchHole implements Filer. `off`, `size` must be >= 0.
-func (f *InnerFiler) PunchHole(off, size int64) error { return f.outer.PunchHole(f.off+off, size) }
-
-// ReadAt implements Filer. `off` must be >= 0.
-func (f *InnerFiler) ReadAt(b []byte, off int64) (n int, err error) {
-	if off < 0 {
-		return 0, &ErrINVAL{f.outer.Name() + ":ReadAt invalid off", off}
-	}
-
-	return f.outer.ReadAt(b, f.off+off)
-}
-
-// Rollback implements Filer.
-func (f *InnerFiler) Rollback() error { return f.outer.Rollback() }
-
-// Size implements Filer.
-func (f *InnerFiler) Size() (int64, error) {
-	sz, err := f.outer.Size()
-	if err != nil {
-		return 0, err
-	}
-
-	return mathutil.MaxInt64(sz-f.off, 0), nil
-}
-
-// Sync() implements Filer.
-func (f *InnerFiler) Sync() (err error) {
-	return f.outer.Sync()
-}
-
-// Truncate implements Filer.
-func (f *InnerFiler) Truncate(size int64) error { return f.outer.Truncate(size + f.off) }
-
-// WriteAt implements Filer. `off` must be >= 0.
-func (f *InnerFiler) WriteAt(b []byte, off int64) (n int, err error) {
-	if off < 0 {
-		return 0, &ErrINVAL{f.outer.Name() + ":WriteAt invalid off", off}
-	}
-
-	return f.outer.WriteAt(b, f.off+off)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/gb.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/gb.go
deleted file mode 100644
index e9090a5473..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/gb.go
+++ /dev/null
@@ -1,812 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Utilities to encode/decode and collate Go predeclared scalar types (and the
-// typeless nil and []byte).  The encoding format is a variation of the one
-// used by the "encoding/gob" package.
-
-package lldb
-
-import (
-	"bytes"
-	"fmt"
-	"math"
-
-	"github.com/cznic/mathutil"
-)
-
-const (
-	gbNull     = iota // 0x00
-	gbFalse           // 0x01
-	gbTrue            // 0x02
-	gbFloat0          // 0x03
-	gbFloat1          // 0x04
-	gbFloat2          // 0x05
-	gbFloat3          // 0x06
-	gbFloat4          // 0x07
-	gbFloat5          // 0x08
-	gbFloat6          // 0x09
-	gbFloat7          // 0x0a
-	gbFloat8          // 0x0b
-	gbComplex0        // 0x0c
-	gbComplex1        // 0x0d
-	gbComplex2        // 0x0e
-	gbComplex3        // 0x0f
-	gbComplex4        // 0x10
-	gbComplex5        // 0x11
-	gbComplex6        // 0x12
-	gbComplex7        // 0x13
-	gbComplex8        // 0x14
-	gbBytes00         // 0x15
-	gbBytes01         // 0x16
-	gbBytes02         // 0x17
-	gbBytes03         // 0x18
-	gbBytes04         // 0x19
-	gbBytes05         // 0x1a
-	gbBytes06         // 0x1b
-	gbBytes07         // 0x1c
-	gbBytes08         // 0x1d
-	gbBytes09         // 0x1e
-	gbBytes10         // 0x1f
-	gbBytes11         // 0x20
-	gbBytes12         // 0x21
-	gbBytes13         // 0x22
-	gbBytes14         // 0x23
-	gbBytes15         // 0x24
-	gbBytes16         // 0x25
-	gbBytes17         // Ox26
-	gbBytes1          // 0x27
-	gbBytes2          // 0x28: Offset by one to allow 64kB sized []byte.
-	gbString00        // 0x29
-	gbString01        // 0x2a
-	gbString02        // 0x2b
-	gbString03        // 0x2c
-	gbString04        // 0x2d
-	gbString05        // 0x2e
-	gbString06        // 0x2f
-	gbString07        // 0x30
-	gbString08        // 0x31
-	gbString09        // 0x32
-	gbString10        // 0x33
-	gbString11        // 0x34
-	gbString12        // 0x35
-	gbString13        // 0x36
-	gbString14        // 0x37
-	gbString15        // 0x38
-	gbString16        // 0x39
-	gbString17        // 0x3a
-	gbString1         // 0x3b
-	gbString2         // 0x3c
-	gbUintP1          // 0x3d
-	gbUintP2          // 0x3e
-	gbUintP3          // 0x3f
-	gbUintP4          // 0x40
-	gbUintP5          // 0x41
-	gbUintP6          // 0x42
-	gbUintP7          // 0x43
-	gbUintP8          // 0x44
-	gbIntM8           // 0x45
-	gbIntM7           // 0x46
-	gbIntM6           // 0x47
-	gbIntM5           // 0x48
-	gbIntM4           // 0x49
-	gbIntM3           // 0x4a
-	gbIntM2           // 0x4b
-	gbIntM1           // 0x4c
-	gbIntP1           // 0x4d
-	gbIntP2           // 0x4e
-	gbIntP3           // 0x4f
-	gbIntP4           // 0x50
-	gbIntP5           // 0x51
-	gbIntP6           // 0x52
-	gbIntP7           // 0x53
-	gbIntP8           // 0x54
-	gbInt0            // 0x55
-
-	gbIntMax = 255 - gbInt0 // 0xff == 170
-)
-
-// EncodeScalars encodes a vector of predeclared scalar type values to a
-// []byte, making it suitable to store it as a "record" in a DB or to use it as
-// a key of a BTree.
-func EncodeScalars(scalars ...interface{}) (b []byte, err error) {
-	for _, scalar := range scalars {
-		switch x := scalar.(type) {
-		default:
-			return nil, &ErrINVAL{"EncodeScalars: unsupported type", fmt.Sprintf("%T in `%#v`", x, scalars)}
-
-		case nil:
-			b = append(b, gbNull)
-
-		case bool:
-			switch x {
-			case false:
-				b = append(b, gbFalse)
-			case true:
-				b = append(b, gbTrue)
-			}
-
-		case float32:
-			encFloat(float64(x), &b)
-		case float64:
-			encFloat(x, &b)
-
-		case complex64:
-			encComplex(complex128(x), &b)
-		case complex128:
-			encComplex(x, &b)
-
-		case string:
-			n := len(x)
-			if n <= 17 {
-				b = append(b, byte(gbString00+n))
-				b = append(b, []byte(x)...)
-				break
-			}
-
-			if n > 65535 {
-				return nil, fmt.Errorf("EncodeScalars: cannot encode string of length %d (limit 65536)", n)
-			}
-
-			pref := byte(gbString1)
-			if n > 255 {
-				pref++
-			}
-			b = append(b, pref)
-			encUint0(uint64(n), &b)
-			b = append(b, []byte(x)...)
-
-		case int8:
-			encInt(int64(x), &b)
-		case int16:
-			encInt(int64(x), &b)
-		case int32:
-			encInt(int64(x), &b)
-		case int64:
-			encInt(x, &b)
-		case int:
-			encInt(int64(x), &b)
-
-		case uint8:
-			encUint(uint64(x), &b)
-		case uint16:
-			encUint(uint64(x), &b)
-		case uint32:
-			encUint(uint64(x), &b)
-		case uint64:
-			encUint(x, &b)
-		case uint:
-			encUint(uint64(x), &b)
-		case []byte:
-			n := len(x)
-			if n <= 17 {
-				b = append(b, byte(gbBytes00+n))
-				b = append(b, []byte(x)...)
-				break
-			}
-
-			if n > 655356 {
-				return nil, fmt.Errorf("EncodeScalars: cannot encode []byte of length %d (limit 65536)", n)
-			}
-
-			pref := byte(gbBytes1)
-			if n > 255 {
-				pref++
-			}
-			b = append(b, pref)
-			if n <= 255 {
-				b = append(b, byte(n))
-			} else {
-				n--
-				b = append(b, byte(n>>8), byte(n))
-			}
-			b = append(b, x...)
-		}
-	}
-	return
-}
-
-func encComplex(f complex128, b *[]byte) {
-	encFloatPrefix(gbComplex0, real(f), b)
-	encFloatPrefix(gbComplex0, imag(f), b)
-}
-
-func encFloatPrefix(prefix byte, f float64, b *[]byte) {
-	u := math.Float64bits(f)
-	var n uint64
-	for i := 0; i < 8; i++ {
-		n <<= 8
-		n |= u & 0xFF
-		u >>= 8
-	}
-	bits := mathutil.BitLenUint64(n)
-	if bits == 0 {
-		*b = append(*b, prefix)
-		return
-	}
-
-	// 0 1 2 3 4 5 6 7 8 9
-	// . 1 1 1 1 1 1 1 1 2
-	encUintPrefix(prefix+1+byte((bits-1)>>3), n, b)
-}
-
-func encFloat(f float64, b *[]byte) {
-	encFloatPrefix(gbFloat0, f, b)
-}
-
-func encUint0(n uint64, b *[]byte) {
-	switch {
-	case n <= 0xff:
-		*b = append(*b, byte(n))
-	case n <= 0xffff:
-		*b = append(*b, byte(n>>8), byte(n))
-	case n <= 0xffffff:
-		*b = append(*b, byte(n>>16), byte(n>>8), byte(n))
-	case n <= 0xffffffff:
-		*b = append(*b, byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n <= 0xffffffffff:
-		*b = append(*b, byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n <= 0xffffffffffff:
-		*b = append(*b, byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n <= 0xffffffffffffff:
-		*b = append(*b, byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n <= math.MaxUint64:
-		*b = append(*b, byte(n>>56), byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	}
-}
-
-func encUintPrefix(prefix byte, n uint64, b *[]byte) {
-	*b = append(*b, prefix)
-	encUint0(n, b)
-}
-
-func encUint(n uint64, b *[]byte) {
-	bits := mathutil.Max(1, mathutil.BitLenUint64(n))
-	encUintPrefix(gbUintP1+byte((bits-1)>>3), n, b)
-}
-
-func encInt(n int64, b *[]byte) {
-	switch {
-	case n < -0x100000000000000:
-		*b = append(*b, byte(gbIntM8), byte(n>>56), byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n < -0x1000000000000:
-		*b = append(*b, byte(gbIntM7), byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n < -0x10000000000:
-		*b = append(*b, byte(gbIntM6), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n < -0x100000000:
-		*b = append(*b, byte(gbIntM5), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n < -0x1000000:
-		*b = append(*b, byte(gbIntM4), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n < -0x10000:
-		*b = append(*b, byte(gbIntM3), byte(n>>16), byte(n>>8), byte(n))
-	case n < -0x100:
-		*b = append(*b, byte(gbIntM2), byte(n>>8), byte(n))
-	case n < 0:
-		*b = append(*b, byte(gbIntM1), byte(n))
-	case n <= gbIntMax:
-		*b = append(*b, byte(gbInt0+n))
-	case n <= 0xff:
-		*b = append(*b, gbIntP1, byte(n))
-	case n <= 0xffff:
-		*b = append(*b, gbIntP2, byte(n>>8), byte(n))
-	case n <= 0xffffff:
-		*b = append(*b, gbIntP3, byte(n>>16), byte(n>>8), byte(n))
-	case n <= 0xffffffff:
-		*b = append(*b, gbIntP4, byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n <= 0xffffffffff:
-		*b = append(*b, gbIntP5, byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n <= 0xffffffffffff:
-		*b = append(*b, gbIntP6, byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n <= 0xffffffffffffff:
-		*b = append(*b, gbIntP7, byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	case n <= 0x7fffffffffffffff:
-		*b = append(*b, gbIntP8, byte(n>>56), byte(n>>48), byte(n>>40), byte(n>>32), byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-	}
-}
-
-func decodeFloat(b []byte) float64 {
-	var u uint64
-	for i, v := range b {
-		u |= uint64(v) << uint((i+8-len(b))*8)
-	}
-	return math.Float64frombits(u)
-}
-
-// DecodeScalars decodes a []byte produced by EncodeScalars.
-func DecodeScalars(b []byte) (scalars []interface{}, err error) {
-	b0 := b
-	for len(b) != 0 {
-		switch tag := b[0]; tag {
-		//default:
-		//return nil, fmt.Errorf("tag %d(%#x) not supported", b[0], b[0])
-		case gbNull:
-			scalars = append(scalars, nil)
-			b = b[1:]
-		case gbFalse:
-			scalars = append(scalars, false)
-			b = b[1:]
-		case gbTrue:
-			scalars = append(scalars, true)
-			b = b[1:]
-		case gbFloat0:
-			scalars = append(scalars, 0.0)
-			b = b[1:]
-		case gbFloat1, gbFloat2, gbFloat3, gbFloat4, gbFloat5, gbFloat6, gbFloat7, gbFloat8:
-			n := 1 + int(tag) - gbFloat0
-			if len(b) < n-1 {
-				goto corrupted
-			}
-
-			scalars = append(scalars, decodeFloat(b[1:n]))
-			b = b[n:]
-		case gbComplex0, gbComplex1, gbComplex2, gbComplex3, gbComplex4, gbComplex5, gbComplex6, gbComplex7, gbComplex8:
-			n := 1 + int(tag) - gbComplex0
-			if len(b) < n-1 {
-				goto corrupted
-			}
-
-			re := decodeFloat(b[1:n])
-			b = b[n:]
-
-			if len(b) == 0 {
-				goto corrupted
-			}
-
-			tag = b[0]
-			if tag < gbComplex0 || tag > gbComplex8 {
-				goto corrupted
-			}
-
-			n = 1 + int(tag) - gbComplex0
-			if len(b) < n-1 {
-				goto corrupted
-			}
-
-			scalars = append(scalars, complex(re, decodeFloat(b[1:n])))
-			b = b[n:]
-		case gbBytes00, gbBytes01, gbBytes02, gbBytes03, gbBytes04,
-			gbBytes05, gbBytes06, gbBytes07, gbBytes08, gbBytes09,
-			gbBytes10, gbBytes11, gbBytes12, gbBytes13, gbBytes14,
-			gbBytes15, gbBytes16, gbBytes17:
-			n := int(tag - gbBytes00)
-			if len(b) < n+1 {
-				goto corrupted
-			}
-
-			scalars = append(scalars, append([]byte(nil), b[1:n+1]...))
-			b = b[n+1:]
-		case gbBytes1:
-			if len(b) < 2 {
-				goto corrupted
-			}
-
-			n := int(b[1])
-			b = b[2:]
-			if len(b) < n {
-				goto corrupted
-			}
-
-			scalars = append(scalars, append([]byte(nil), b[:n]...))
-			b = b[n:]
-		case gbBytes2:
-			if len(b) < 3 {
-				goto corrupted
-			}
-
-			n := int(b[1])<<8 | int(b[2]) + 1
-			b = b[3:]
-			if len(b) < n {
-				goto corrupted
-			}
-
-			scalars = append(scalars, append([]byte(nil), b[:n]...))
-			b = b[n:]
-		case gbString00, gbString01, gbString02, gbString03, gbString04,
-			gbString05, gbString06, gbString07, gbString08, gbString09,
-			gbString10, gbString11, gbString12, gbString13, gbString14,
-			gbString15, gbString16, gbString17:
-			n := int(tag - gbString00)
-			if len(b) < n+1 {
-				goto corrupted
-			}
-
-			scalars = append(scalars, string(b[1:n+1]))
-			b = b[n+1:]
-		case gbString1:
-			if len(b) < 2 {
-				goto corrupted
-			}
-
-			n := int(b[1])
-			b = b[2:]
-			if len(b) < n {
-				goto corrupted
-			}
-
-			scalars = append(scalars, string(b[:n]))
-			b = b[n:]
-		case gbString2:
-			if len(b) < 3 {
-				goto corrupted
-			}
-
-			n := int(b[1])<<8 | int(b[2])
-			b = b[3:]
-			if len(b) < n {
-				goto corrupted
-			}
-
-			scalars = append(scalars, string(b[:n]))
-			b = b[n:]
-		case gbUintP1, gbUintP2, gbUintP3, gbUintP4, gbUintP5, gbUintP6, gbUintP7, gbUintP8:
-			b = b[1:]
-			n := 1 + int(tag) - gbUintP1
-			if len(b) < n {
-				goto corrupted
-			}
-
-			var u uint64
-			for _, v := range b[:n] {
-				u = u<<8 | uint64(v)
-			}
-			scalars = append(scalars, u)
-			b = b[n:]
-		case gbIntM8, gbIntM7, gbIntM6, gbIntM5, gbIntM4, gbIntM3, gbIntM2, gbIntM1:
-			b = b[1:]
-			n := 8 - (int(tag) - gbIntM8)
-			if len(b) < n {
-				goto corrupted
-			}
-			u := uint64(math.MaxUint64)
-			for _, v := range b[:n] {
-				u = u<<8 | uint64(v)
-			}
-			scalars = append(scalars, int64(u))
-			b = b[n:]
-		case gbIntP1, gbIntP2, gbIntP3, gbIntP4, gbIntP5, gbIntP6, gbIntP7, gbIntP8:
-			b = b[1:]
-			n := 1 + int(tag) - gbIntP1
-			if len(b) < n {
-				goto corrupted
-			}
-
-			i := int64(0)
-			for _, v := range b[:n] {
-				i = i<<8 | int64(v)
-			}
-			scalars = append(scalars, i)
-			b = b[n:]
-		default:
-			scalars = append(scalars, int64(b[0])-gbInt0)
-			b = b[1:]
-		}
-	}
-	return append([]interface{}(nil), scalars...), nil
-
-corrupted:
-	return nil, &ErrDecodeScalars{append([]byte(nil), b0...), len(b0) - len(b)}
-}
-
-func collateComplex(x, y complex128) int {
-	switch rx, ry := real(x), real(y); {
-	case rx < ry:
-		return -1
-	case rx == ry:
-		switch ix, iy := imag(x), imag(y); {
-		case ix < iy:
-			return -1
-		case ix == iy:
-			return 0
-		case ix > iy:
-			return 1
-		}
-	}
-	//case rx > ry:
-	return 1
-}
-
-func collateFloat(x, y float64) int {
-	switch {
-	case x < y:
-		return -1
-	case x == y:
-		return 0
-	}
-	//case x > y:
-	return 1
-}
-
-func collateInt(x, y int64) int {
-	switch {
-	case x < y:
-		return -1
-	case x == y:
-		return 0
-	}
-	//case x > y:
-	return 1
-}
-
-func collateUint(x, y uint64) int {
-	switch {
-	case x < y:
-		return -1
-	case x == y:
-		return 0
-	}
-	//case x > y:
-	return 1
-}
-
-func collateIntUint(x int64, y uint64) int {
-	if y > math.MaxInt64 {
-		return -1
-	}
-
-	return collateInt(x, int64(y))
-}
-
-func collateUintInt(x uint64, y int64) int {
-	return -collateIntUint(y, x)
-}
-
-func collateType(i interface{}) (r interface{}, err error) {
-	switch x := i.(type) {
-	default:
-		return nil, fmt.Errorf("invalid collate type %T", x)
-	case nil:
-		return i, nil
-	case bool:
-		return i, nil
-	case int8:
-		return int64(x), nil
-	case int16:
-		return int64(x), nil
-	case int32:
-		return int64(x), nil
-	case int64:
-		return i, nil
-	case int:
-		return int64(x), nil
-	case uint8:
-		return uint64(x), nil
-	case uint16:
-		return uint64(x), nil
-	case uint32:
-		return uint64(x), nil
-	case uint64:
-		return i, nil
-	case uint:
-		return uint64(x), nil
-	case float32:
-		return float64(x), nil
-	case float64:
-		return i, nil
-	case complex64:
-		return complex128(x), nil
-	case complex128:
-		return i, nil
-	case []byte:
-		return i, nil
-	case string:
-		return i, nil
-	}
-}
-
-// Collate collates two arrays of Go predeclared scalar types (and the typeless
-// nil or []byte). If any other type appears in x or y, Collate will return a
-// non nil error.  String items are collated using strCollate or lexically
-// byte-wise (as when using Go comparison operators) when strCollate is nil.
-// []byte items are collated using bytes.Compare.
-//
-// Collate returns:
-//
-// 	-1 if x <  y
-// 	 0 if x == y
-// 	+1 if x >  y
-//
-// The same value as defined above must be returned from strCollate.
-//
-// The "outer" ordering is: nil, bool, number, []byte, string. IOW, nil is
-// "smaller" than anything else except other nil, numbers collate before
-// []byte, []byte collate before strings, etc.
-//
-// Integers and real numbers collate as expected in math. However, complex
-// numbers are not ordered in Go. Here the ordering is defined: Complex numbers
-// are in comparison considered first only by their real part. Iff the result
-// is equality then the imaginary part is used to determine the ordering. In
-// this "second order" comparing, integers and real numbers are considered as
-// complex numbers with a zero imaginary part.
-func Collate(x, y []interface{}, strCollate func(string, string) int) (r int, err error) {
-	nx, ny := len(x), len(y)
-
-	switch {
-	case nx == 0 && ny != 0:
-		return -1, nil
-	case nx == 0 && ny == 0:
-		return 0, nil
-	case nx != 0 && ny == 0:
-		return 1, nil
-	}
-
-	r = 1
-	if nx > ny {
-		x, y, r = y, x, -r
-	}
-
-	var c int
-	for i, xi0 := range x {
-		yi0 := y[i]
-		xi, err := collateType(xi0)
-		if err != nil {
-			return 0, err
-		}
-
-		yi, err := collateType(yi0)
-		if err != nil {
-			return 0, err
-		}
-
-		switch x := xi.(type) {
-		default:
-			panic(fmt.Errorf("internal error: %T", x))
-
-		case nil:
-			switch yi.(type) {
-			case nil:
-				// nop
-			default:
-				return -r, nil
-			}
-
-		case bool:
-			switch y := yi.(type) {
-			case nil:
-				return r, nil
-			case bool:
-				switch {
-				case !x && y:
-					return -r, nil
-				case x == y:
-					// nop
-				case x && !y:
-					return r, nil
-				}
-			default:
-				return -r, nil
-			}
-
-		case int64:
-			switch y := yi.(type) {
-			case nil, bool:
-				return r, nil
-			case int64:
-				c = collateInt(x, y)
-			case uint64:
-				c = collateIntUint(x, y)
-			case float64:
-				c = collateFloat(float64(x), y)
-			case complex128:
-				c = collateComplex(complex(float64(x), 0), y)
-			case []byte:
-				return -r, nil
-			case string:
-				return -r, nil
-			}
-
-			if c != 0 {
-				return c * r, nil
-			}
-
-		case uint64:
-			switch y := yi.(type) {
-			case nil, bool:
-				return r, nil
-			case int64:
-				c = collateUintInt(x, y)
-			case uint64:
-				c = collateUint(x, y)
-			case float64:
-				c = collateFloat(float64(x), y)
-			case complex128:
-				c = collateComplex(complex(float64(x), 0), y)
-			case []byte:
-				return -r, nil
-			case string:
-				return -r, nil
-			}
-
-			if c != 0 {
-				return c * r, nil
-			}
-
-		case float64:
-			switch y := yi.(type) {
-			case nil, bool:
-				return r, nil
-			case int64:
-				c = collateFloat(x, float64(y))
-			case uint64:
-				c = collateFloat(x, float64(y))
-			case float64:
-				c = collateFloat(x, y)
-			case complex128:
-				c = collateComplex(complex(x, 0), y)
-			case []byte:
-				return -r, nil
-			case string:
-				return -r, nil
-			}
-
-			if c != 0 {
-				return c * r, nil
-			}
-
-		case complex128:
-			switch y := yi.(type) {
-			case nil, bool:
-				return r, nil
-			case int64:
-				c = collateComplex(x, complex(float64(y), 0))
-			case uint64:
-				c = collateComplex(x, complex(float64(y), 0))
-			case float64:
-				c = collateComplex(x, complex(y, 0))
-			case complex128:
-				c = collateComplex(x, y)
-			case []byte:
-				return -r, nil
-			case string:
-				return -r, nil
-			}
-
-			if c != 0 {
-				return c * r, nil
-			}
-
-		case []byte:
-			switch y := yi.(type) {
-			case nil, bool, int64, uint64, float64, complex128:
-				return r, nil
-			case []byte:
-				c = bytes.Compare(x, y)
-			case string:
-				return -r, nil
-			}
-
-			if c != 0 {
-				return c * r, nil
-			}
-
-		case string:
-			switch y := yi.(type) {
-			case nil, bool, int64, uint64, float64, complex128:
-				return r, nil
-			case []byte:
-				return r, nil
-			case string:
-				switch {
-				case strCollate != nil:
-					c = strCollate(x, y)
-				case x < y:
-					return -r, nil
-				case x == y:
-					c = 0
-				case x > y:
-					return r, nil
-				}
-			}
-
-			if c != 0 {
-				return c * r, nil
-			}
-		}
-	}
-
-	if nx == ny {
-		return 0, nil
-	}
-
-	return -r, nil
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/lldb.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/lldb.go
deleted file mode 100644
index 8f77ec8add..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/lldb.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package lldb (WIP) implements a low level database engine. The database
-// model used could be considered a specific implementation of some small(est)
-// intersection of models listed in [1]. As a settled term is lacking, it'll be
-// called here a 'Virtual memory model' (VMM).
-//
-// Experimental release notes
-//
-// This is an experimental release. Don't open a DB from two applications or
-// two instances of an application - it will get corrupted (no file locking is
-// implemented and this task is delegated to lldb's clients).
-//
-// WARNING: THE LLDB API IS SUBJECT TO CHANGE.
-//
-// Filers
-//
-// A Filer is an abstraction of storage. A Filer may be a part of some process'
-// virtual address space, an OS file, a networked, remote file etc. Persistence
-// of the storage is optional, opaque to VMM and it is specific to a concrete
-// Filer implementation.
-//
-// Space management
-//
-// Mechanism to allocate, reallocate (resize), deallocate (and later reclaim
-// the unused) contiguous parts of a Filer, called blocks.  Blocks are
-// identified and referred to by a handle, an int64.
-//
-// BTrees
-//
-// In addition to the VMM like services, lldb provides volatile and
-// non-volatile BTrees. Keys and values of a BTree are limited in size to 64kB
-// each (a bit more actually). Support for larger keys/values, if desired, can
-// be built atop a BTree to certain limits.
-//
-// Handles vs pointers
-//
-// A handle is the abstracted storage counterpart of a memory address.  There
-// is one fundamental difference, though. Resizing a block never results in a
-// change to the handle which refers to the resized block, so a handle is more
-// akin to an unique numeric id/key. Yet it shares one property of pointers -
-// handles can be associated again with blocks after the original handle block
-// was deallocated. In other words, a handle uniqueness domain is the state of
-// the database and is not something comparable to e.g. an ever growing
-// numbering sequence.
-//
-// Also, as with memory pointers, dangling handles can be created and blocks
-// overwritten when such handles are used. Using a zero handle to refer to a
-// block will not panic; however, the resulting error is effectively the same
-// exceptional situation as dereferencing a nil pointer.
-//
-// Blocks
-//
-// Allocated/used blocks, are limited in size to only a little bit more than
-// 64kB.  Bigger semantic entities/structures must be built in lldb's client
-// code.  The content of a block has no semantics attached, it's only a fully
-// opaque `[]byte`.
-//
-// Scalars
-//
-// Use of "scalars" applies to EncodeScalars, DecodeScalars and Collate. Those
-// first two "to bytes" and "from bytes" functions are suggested for handling
-// multi-valued Allocator content items and/or keys/values of BTrees (using
-// Collate for keys). Types called "scalar" are:
-//
-//	nil (the typeless one)
-//	bool
-//	all integral types: [u]int8, [u]int16, [u]int32, [u]int, [u]int64
-//	all floating point types: float32, float64
-//	all complex types: complex64, complex128
-//	[]byte (64kB max)
-//	string (64kb max)
-//
-// Specific implementations
-//
-// Included are concrete implementations of some of the VMM interfaces included
-// to ease serving simple client code or for testing and possibly as an
-// example.  More details in the documentation of such implementations.
-//
-//  [1]: http://en.wikipedia.org/wiki/Database_model
-package lldb
-
-const (
-	fltSz            = 0x70 // size of the FLT
-	maxShort         = 251
-	maxRq            = 65787
-	maxFLTRq         = 4112
-	maxHandle        = 1<<56 - 1
-	atomLen          = 16
-	tagUsedLong      = 0xfc
-	tagUsedRelocated = 0xfd
-	tagFreeShort     = 0xfe
-	tagFreeLong      = 0xff
-	tagNotCompressed = 0
-	tagCompressed    = 1
-)
-
-// Content size n -> blocksize in atoms.
-func n2atoms(n int) int {
-	if n > maxShort {
-		n += 2
-	}
-	return (n+1)/16 + 1
-}
-
-// Content size n -> number of padding zeros.
-func n2padding(n int) int {
-	if n > maxShort {
-		n += 2
-	}
-	return 15 - (n+1)&15
-}
-
-// Handle <-> offset
-func h2off(h int64) int64   { return (h + 6) * 16 }
-func off2h(off int64) int64 { return off/16 - 6 }
-
-// Get a 7B int64 from b
-func b2h(b []byte) (h int64) {
-	for _, v := range b[:7] {
-		h = h<<8 | int64(v)
-	}
-	return
-}
-
-// Put a 7B int64 into b
-func h2b(b []byte, h int64) []byte {
-	for i := range b[:7] {
-		b[i], h = byte(h>>48), h<<8
-	}
-	return b
-}
-
-// Content length N (must be in [252, 65787]) to long used block M field.
-func n2m(n int) (m int) {
-	return n % 0x10000
-}
-
-// Long used block M (must be in [0, 65535]) field to content length N.
-func m2n(m int) (n int) {
-	if m <= maxShort {
-		m += 0x10000
-	}
-	return m
-}
-
-func bpack(a []byte) []byte {
-	if cap(a) > len(a) {
-		return append([]byte(nil), a...)
-	}
-
-	return a
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/memfiler.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/memfiler.go
deleted file mode 100644
index 417e92f3aa..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/memfiler.go
+++ /dev/null
@@ -1,344 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// A memory-only implementation of Filer.
-
-/*
-
-pgBits: 8
-BenchmarkMemFilerWrSeq	  100000	     19430 ns/op	1646.93 MB/s
-BenchmarkMemFilerRdSeq	  100000	     17390 ns/op	1840.13 MB/s
-BenchmarkMemFilerWrRand	 1000000	      1903 ns/op	 133.94 MB/s
-BenchmarkMemFilerRdRand	 1000000	      1153 ns/op	 221.16 MB/s
-
-pgBits: 9
-BenchmarkMemFilerWrSeq	  100000	     16195 ns/op	1975.80 MB/s
-BenchmarkMemFilerRdSeq	  200000	     13011 ns/op	2459.39 MB/s
-BenchmarkMemFilerWrRand	 1000000	      2248 ns/op	 227.28 MB/s
-BenchmarkMemFilerRdRand	 1000000	      1177 ns/op	 433.94 MB/s
-
-pgBits: 10
-BenchmarkMemFilerWrSeq	  100000	     16169 ns/op	1979.04 MB/s
-BenchmarkMemFilerRdSeq	  200000	     12673 ns/op	2524.91 MB/s
-BenchmarkMemFilerWrRand	 1000000	      5550 ns/op	 184.30 MB/s
-BenchmarkMemFilerRdRand	 1000000	      1699 ns/op	 601.79 MB/s
-
-pgBits: 11
-BenchmarkMemFilerWrSeq	  100000	     13449 ns/op	2379.31 MB/s
-BenchmarkMemFilerRdSeq	  200000	     12058 ns/op	2653.80 MB/s
-BenchmarkMemFilerWrRand	  500000	      4335 ns/op	 471.47 MB/s
-BenchmarkMemFilerRdRand	 1000000	      2843 ns/op	 719.47 MB/s
-
-pgBits: 12
-BenchmarkMemFilerWrSeq	  200000	     11976 ns/op	2672.00 MB/s
-BenchmarkMemFilerRdSeq	  200000	     12255 ns/op	2611.06 MB/s
-BenchmarkMemFilerWrRand	  200000	      8058 ns/op	 507.14 MB/s
-BenchmarkMemFilerRdRand	  500000	      4365 ns/op	 936.15 MB/s
-
-pgBits: 13
-BenchmarkMemFilerWrSeq	  200000	     10852 ns/op	2948.69 MB/s
-BenchmarkMemFilerRdSeq	  200000	     11561 ns/op	2767.77 MB/s
-BenchmarkMemFilerWrRand	  200000	      9748 ns/op	 840.15 MB/s
-BenchmarkMemFilerRdRand	  500000	      7236 ns/op	1131.59 MB/s
-
-pgBits: 14
-BenchmarkMemFilerWrSeq	  200000	     10328 ns/op	3098.12 MB/s
-BenchmarkMemFilerRdSeq	  200000	     11292 ns/op	2833.66 MB/s
-BenchmarkMemFilerWrRand	  100000	     16768 ns/op	 978.75 MB/s
-BenchmarkMemFilerRdRand	  200000	     13033 ns/op	1258.43 MB/s
-
-pgBits: 15
-BenchmarkMemFilerWrSeq	  200000	     10309 ns/op	3103.93 MB/s
-BenchmarkMemFilerRdSeq	  200000	     11126 ns/op	2876.12 MB/s
-BenchmarkMemFilerWrRand	   50000	     31985 ns/op	1021.74 MB/s
-BenchmarkMemFilerRdRand	  100000	     25217 ns/op	1297.65 MB/s
-
-pgBits: 16
-BenchmarkMemFilerWrSeq	  200000	     10324 ns/op	3099.45 MB/s
-BenchmarkMemFilerRdSeq	  200000	     11201 ns/op	2856.80 MB/s
-BenchmarkMemFilerWrRand	   20000	     55226 ns/op	1184.76 MB/s
-BenchmarkMemFilerRdRand	   50000	     48316 ns/op	1355.16 MB/s
-
-pgBits: 17
-BenchmarkMemFilerWrSeq	  200000	     10377 ns/op	3083.53 MB/s
-BenchmarkMemFilerRdSeq	  200000	     11018 ns/op	2904.18 MB/s
-BenchmarkMemFilerWrRand	   10000	    143425 ns/op	 913.12 MB/s
-BenchmarkMemFilerRdRand	   20000	     95267 ns/op	1376.99 MB/s
-
-pgBits: 18
-BenchmarkMemFilerWrSeq	  200000	     10312 ns/op	3102.96 MB/s
-BenchmarkMemFilerRdSeq	  200000	     11069 ns/op	2890.84 MB/s
-BenchmarkMemFilerWrRand	    5000	    280910 ns/op	 934.14 MB/s
-BenchmarkMemFilerRdRand	   10000	    188500 ns/op	1388.17 MB/s
-
-*/
-
-package lldb
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-
-	"github.com/cznic/fileutil"
-	"github.com/cznic/mathutil"
-)
-
-const (
-	pgBits = 16
-	pgSize = 1 << pgBits
-	pgMask = pgSize - 1
-)
-
-var _ Filer = &MemFiler{} // Ensure MemFiler is a Filer.
-
-type memFilerMap map[int64]*[pgSize]byte
-
-// MemFiler is a memory backed Filer. It implements BeginUpdate, EndUpdate and
-// Rollback as no-ops. MemFiler is not automatically persistent, but it has
-// ReadFrom and WriteTo methods.
-type MemFiler struct {
-	m    memFilerMap
-	nest int
-	size int64
-}
-
-// NewMemFiler returns a new MemFiler.
-func NewMemFiler() *MemFiler {
-	return &MemFiler{m: memFilerMap{}}
-}
-
-// BeginUpdate implements Filer.
-func (f *MemFiler) BeginUpdate() error {
-	f.nest++
-	return nil
-}
-
-// Close implements Filer.
-func (f *MemFiler) Close() (err error) {
-	if f.nest != 0 {
-		return &ErrPERM{(f.Name() + ":Close")}
-	}
-
-	return
-}
-
-// EndUpdate implements Filer.
-func (f *MemFiler) EndUpdate() (err error) {
-	if f.nest == 0 {
-		return &ErrPERM{(f.Name() + ": EndUpdate")}
-	}
-
-	f.nest--
-	return
-}
-
-// Name implements Filer.
-func (f *MemFiler) Name() string {
-	return fmt.Sprintf("%p.memfiler", f)
-}
-
-// PunchHole implements Filer.
-func (f *MemFiler) PunchHole(off, size int64) (err error) {
-	if off < 0 {
-		return &ErrINVAL{f.Name() + ": PunchHole off", off}
-	}
-
-	if size < 0 || off+size > f.size {
-		return &ErrINVAL{f.Name() + ": PunchHole size", size}
-	}
-
-	first := off >> pgBits
-	if off&pgMask != 0 {
-		first++
-	}
-	off += size - 1
-	last := off >> pgBits
-	if off&pgMask != 0 {
-		last--
-	}
-	if limit := f.size >> pgBits; last > limit {
-		last = limit
-	}
-	for pg := first; pg <= last; pg++ {
-		delete(f.m, pg)
-	}
-	return
-}
-
-var zeroPage [pgSize]byte
-
-// ReadAt implements Filer.
-func (f *MemFiler) ReadAt(b []byte, off int64) (n int, err error) {
-	avail := f.size - off
-	pgI := off >> pgBits
-	pgO := int(off & pgMask)
-	rem := len(b)
-	if int64(rem) >= avail {
-		rem = int(avail)
-		err = io.EOF
-	}
-	for rem != 0 && avail > 0 {
-		pg := f.m[pgI]
-		if pg == nil {
-			pg = &zeroPage
-		}
-		nc := copy(b[:mathutil.Min(rem, pgSize)], pg[pgO:])
-		pgI++
-		pgO = 0
-		rem -= nc
-		n += nc
-		b = b[nc:]
-	}
-	return
-}
-
-// ReadFrom is a helper to populate MemFiler's content from r.  'n' reports the
-// number of bytes read from 'r'.
-func (f *MemFiler) ReadFrom(r io.Reader) (n int64, err error) {
-	if err = f.Truncate(0); err != nil {
-		return
-	}
-
-	var (
-		b   [pgSize]byte
-		rn  int
-		off int64
-	)
-
-	var rerr error
-	for rerr == nil {
-		if rn, rerr = r.Read(b[:]); rn != 0 {
-			f.WriteAt(b[:rn], off)
-			off += int64(rn)
-			n += int64(rn)
-		}
-	}
-	if !fileutil.IsEOF(rerr) {
-		err = rerr
-	}
-	return
-}
-
-// Rollback implements Filer.
-func (f *MemFiler) Rollback() (err error) { return }
-
-// Size implements Filer.
-func (f *MemFiler) Size() (int64, error) {
-	return f.size, nil
-}
-
-// Sync implements Filer.
-func (f *MemFiler) Sync() error {
-	return nil
-}
-
-// Truncate implements Filer.
-func (f *MemFiler) Truncate(size int64) (err error) {
-	switch {
-	case size < 0:
-		return &ErrINVAL{"Truncate size", size}
-	case size == 0:
-		f.m = memFilerMap{}
-		f.size = 0
-		return
-	}
-
-	first := size >> pgBits
-	if size&pgMask != 0 {
-		first++
-	}
-	last := f.size >> pgBits
-	if f.size&pgMask != 0 {
-		last++
-	}
-	for ; first < last; first++ {
-		delete(f.m, first)
-	}
-
-	f.size = size
-	return
-}
-
-// WriteAt implements Filer.
-func (f *MemFiler) WriteAt(b []byte, off int64) (n int, err error) {
-	pgI := off >> pgBits
-	pgO := int(off & pgMask)
-	n = len(b)
-	rem := n
-	var nc int
-	for rem != 0 {
-		if pgO == 0 && rem >= pgSize && bytes.Equal(b[:pgSize], zeroPage[:]) {
-			delete(f.m, pgI)
-			nc = pgSize
-		} else {
-			pg := f.m[pgI]
-			if pg == nil {
-				pg = new([pgSize]byte)
-				f.m[pgI] = pg
-			}
-			nc = copy((*pg)[pgO:], b)
-		}
-		pgI++
-		pgO = 0
-		rem -= nc
-		b = b[nc:]
-	}
-	f.size = mathutil.MaxInt64(f.size, off+int64(n))
-	return
-}
-
-// WriteTo is a helper to copy/persist MemFiler's content to w.  If w is also
-// an io.WriterAt then WriteTo may attempt to _not_ write any big, for some
-// value of big, runs of zeros, i.e. it will attempt to punch holes, where
-// possible, in `w` if that happens to be a freshly created or to zero length
-// truncated OS file.  'n' reports the number of bytes written to 'w'.
-func (f *MemFiler) WriteTo(w io.Writer) (n int64, err error) {
-	var (
-		b      [pgSize]byte
-		wn, rn int
-		off    int64
-		rerr   error
-	)
-
-	if wa, ok := w.(io.WriterAt); ok {
-		lastPgI := f.size >> pgBits
-		for pgI := int64(0); pgI <= lastPgI; pgI++ {
-			sz := pgSize
-			if pgI == lastPgI {
-				sz = int(f.size & pgMask)
-			}
-			pg := f.m[pgI]
-			if pg != nil {
-				wn, err = wa.WriteAt(pg[:sz], off)
-				if err != nil {
-					return
-				}
-
-				n += int64(wn)
-				off += int64(sz)
-				if wn != sz {
-					return n, io.ErrShortWrite
-				}
-			}
-		}
-		return
-	}
-
-	var werr error
-	for rerr == nil {
-		if rn, rerr = f.ReadAt(b[:], off); rn != 0 {
-			off += int64(rn)
-			if wn, werr = w.Write(b[:rn]); werr != nil {
-				return n, werr
-			}
-
-			n += int64(wn)
-		}
-	}
-	if !fileutil.IsEOF(rerr) {
-		err = rerr
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/osfiler.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/osfiler.go
deleted file mode 100644
index d6e189a18f..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/osfiler.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package lldb
-
-import (
-	"io"
-	"os"
-
-	"github.com/cznic/mathutil"
-)
-
-var _ Filer = (*OSFiler)(nil)
-
-// OSFile is an os.File like minimal set of methods allowing to construct a
-// Filer.
-type OSFile interface {
-	Name() string
-	Stat() (fi os.FileInfo, err error)
-	Sync() (err error)
-	Truncate(size int64) (err error)
-	io.Closer
-	io.Reader
-	io.ReaderAt
-	io.Seeker
-	io.Writer
-	io.WriterAt
-}
-
-// OSFiler is like a SimpleFileFiler but based on an OSFile.
-type OSFiler struct {
-	f    OSFile
-	nest int
-	size int64 // not set if < 0
-}
-
-// NewOSFiler returns a Filer from an OSFile. This Filer is like the
-// SimpleFileFiler, it does not implement the transaction related methods.
-func NewOSFiler(f OSFile) (r *OSFiler) {
-	return &OSFiler{
-		f:    f,
-		size: -1,
-	}
-}
-
-// BeginUpdate implements Filer.
-func (f *OSFiler) BeginUpdate() (err error) {
-	f.nest++
-	return nil
-}
-
-// Close implements Filer.
-func (f *OSFiler) Close() (err error) {
-	if f.nest != 0 {
-		return &ErrPERM{(f.Name() + ":Close")}
-	}
-
-	return f.f.Close()
-}
-
-// EndUpdate implements Filer.
-func (f *OSFiler) EndUpdate() (err error) {
-	if f.nest == 0 {
-		return &ErrPERM{(f.Name() + ":EndUpdate")}
-	}
-
-	f.nest--
-	return
-}
-
-// Name implements Filer.
-func (f *OSFiler) Name() string {
-	return f.f.Name()
-}
-
-// PunchHole implements Filer.
-func (f *OSFiler) PunchHole(off, size int64) (err error) {
-	return
-}
-
-// ReadAt implements Filer.
-func (f *OSFiler) ReadAt(b []byte, off int64) (n int, err error) {
-	return f.f.ReadAt(b, off)
-}
-
-// Rollback implements Filer.
-func (f *OSFiler) Rollback() (err error) { return }
-
-// Size implements Filer.
-func (f *OSFiler) Size() (n int64, err error) {
-	if f.size < 0 { // boot
-		fi, err := f.f.Stat()
-		if err != nil {
-			return 0, err
-		}
-
-		f.size = fi.Size()
-	}
-	return f.size, nil
-}
-
-// Sync implements Filer.
-func (f *OSFiler) Sync() (err error) {
-	return f.f.Sync()
-}
-
-// Truncate implements Filer.
-func (f *OSFiler) Truncate(size int64) (err error) {
-	if size < 0 {
-		return &ErrINVAL{"Truncate size", size}
-	}
-
-	f.size = size
-	return f.f.Truncate(size)
-}
-
-// WriteAt implements Filer.
-func (f *OSFiler) WriteAt(b []byte, off int64) (n int, err error) {
-	if f.size < 0 { // boot
-		fi, err := os.Stat(f.f.Name())
-		if err != nil {
-			return 0, err
-		}
-
-		f.size = fi.Size()
-	}
-	f.size = mathutil.MaxInt64(f.size, int64(len(b))+off)
-	return f.f.WriteAt(b, off)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/simplefilefiler.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/simplefilefiler.go
deleted file mode 100644
index de32e64916..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/simplefilefiler.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// A basic os.File backed Filer.
-
-package lldb
-
-import (
-	"os"
-
-	"github.com/cznic/fileutil"
-	"github.com/cznic/mathutil"
-)
-
-var _ Filer = &SimpleFileFiler{} // Ensure SimpleFileFiler is a Filer.
-
-// SimpleFileFiler is an os.File backed Filer intended for use where structural
-// consistency can be reached by other means (SimpleFileFiler is for example
-// wrapped in eg. an RollbackFiler or ACIDFiler0) or where persistence is not
-// required (temporary/working data sets).
-//
-// SimpleFileFiler is the most simple os.File backed Filer implementation as it
-// does not really implement BeginUpdate and EndUpdate/Rollback in any way
-// which would protect the structural integrity of data. If misused e.g. as a
-// real database storage w/o other measures, it can easily cause data loss
-// when, for example, a power outage occurs or the updating process terminates
-// abruptly.
-type SimpleFileFiler struct {
-	file *os.File
-	nest int
-	size int64 // not set if < 0
-}
-
-// NewSimpleFileFiler returns a new SimpleFileFiler.
-func NewSimpleFileFiler(f *os.File) *SimpleFileFiler {
-	return &SimpleFileFiler{file: f, size: -1}
-}
-
-// BeginUpdate implements Filer.
-func (f *SimpleFileFiler) BeginUpdate() error {
-	f.nest++
-	return nil
-}
-
-// Close implements Filer.
-func (f *SimpleFileFiler) Close() (err error) {
-	if f.nest != 0 {
-		return &ErrPERM{(f.Name() + ":Close")}
-	}
-
-	return f.file.Close()
-}
-
-// EndUpdate implements Filer.
-func (f *SimpleFileFiler) EndUpdate() (err error) {
-	if f.nest == 0 {
-		return &ErrPERM{(f.Name() + ":EndUpdate")}
-	}
-
-	f.nest--
-	return
-}
-
-// Name implements Filer.
-func (f *SimpleFileFiler) Name() string {
-	return f.file.Name()
-}
-
-// PunchHole implements Filer.
-func (f *SimpleFileFiler) PunchHole(off, size int64) (err error) {
-	return fileutil.PunchHole(f.file, off, size)
-}
-
-// ReadAt implements Filer.
-func (f *SimpleFileFiler) ReadAt(b []byte, off int64) (n int, err error) {
-	return f.file.ReadAt(b, off)
-}
-
-// Rollback implements Filer.
-func (f *SimpleFileFiler) Rollback() (err error) { return }
-
-// Size implements Filer.
-func (f *SimpleFileFiler) Size() (int64, error) {
-	if f.size < 0 { // boot
-		fi, err := os.Stat(f.file.Name())
-		if err != nil {
-			return 0, err
-		}
-
-		f.size = fi.Size()
-	}
-	return f.size, nil
-}
-
-// Sync implements Filer.
-func (f *SimpleFileFiler) Sync() error {
-	return f.file.Sync()
-}
-
-// Truncate implements Filer.
-func (f *SimpleFileFiler) Truncate(size int64) (err error) {
-	if size < 0 {
-		return &ErrINVAL{"Truncate size", size}
-	}
-
-	f.size = size
-	return f.file.Truncate(size)
-}
-
-// WriteAt implements Filer.
-func (f *SimpleFileFiler) WriteAt(b []byte, off int64) (n int, err error) {
-	if f.size < 0 { // boot
-		fi, err := os.Stat(f.file.Name())
-		if err != nil {
-			return 0, err
-		}
-
-		f.size = fi.Size()
-	}
-	f.size = mathutil.MaxInt64(f.size, int64(len(b))+off)
-	return f.file.WriteAt(b, off)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact.go
deleted file mode 100644
index f9ad1cbfb7..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact.go
+++ /dev/null
@@ -1,629 +0,0 @@
-// Copyright 2014 The lldb Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Structural transactions.
-
-package lldb
-
-//DONE+ TransactionalMemoryFiler
-//	----
-//	Use NewRollbackFiler(myMemFiler, ...)
-
-/*
-
-bfBits: 3
-BenchmarkRollbackFiler	20000000	       102 ns/op	   9.73 MB/s
-
-bfBits: 4
-BenchmarkRollbackFiler	50000000	        55.7 ns/op	  17.95 MB/s
-
-bfBits: 5
-BenchmarkRollbackFiler	100000000	        32.2 ns/op	  31.06 MB/s
-
-bfBits: 6
-BenchmarkRollbackFiler	100000000	        20.6 ns/op	  48.46 MB/s
-
-bfBits: 7
-BenchmarkRollbackFiler	100000000	        15.1 ns/op	  66.12 MB/s
-
-bfBits: 8
-BenchmarkRollbackFiler	100000000	        10.5 ns/op	  95.66 MB/s
-
-bfBits: 9
-BenchmarkRollbackFiler	200000000	         8.02 ns/op	 124.74 MB/s
-
-bfBits: 10
-BenchmarkRollbackFiler	200000000	         9.25 ns/op	 108.09 MB/s
-
-bfBits: 11
-BenchmarkRollbackFiler	100000000	        11.7 ns/op	  85.47 MB/s
-
-bfBits: 12
-BenchmarkRollbackFiler	100000000	        17.2 ns/op	  57.99 MB/s
-
-bfBits: 13
-BenchmarkRollbackFiler	100000000	        32.7 ns/op	  30.58 MB/s
-
-bfBits: 14
-BenchmarkRollbackFiler	50000000	        39.6 ns/op	  25.27 MB/s
-
-*/
-
-import (
-	"fmt"
-	"io"
-	"sync"
-
-	"github.com/cznic/fileutil"
-	"github.com/cznic/mathutil"
-)
-
-var (
-	_ Filer = &bitFiler{}      // Ensure bitFiler is a Filer.
-	_ Filer = &RollbackFiler{} // ditto
-)
-
-const (
-	bfBits = 9
-	bfSize = 1 << bfBits
-	bfMask = bfSize - 1
-)
-
-var (
-	bitmask       = [8]byte{1, 2, 4, 8, 16, 32, 64, 128}
-	bitZeroPage   bitPage
-	allDirtyFlags [bfSize >> 3]byte
-)
-
-func init() {
-	for i := range allDirtyFlags {
-		allDirtyFlags[i] = 0xff
-	}
-}
-
-type (
-	bitPage struct {
-		prev, next *bitPage
-		data       [bfSize]byte
-		flags      [bfSize >> 3]byte
-		dirty      bool
-	}
-
-	bitFilerMap map[int64]*bitPage
-
-	bitFiler struct {
-		parent Filer
-		m      bitFilerMap
-		size   int64
-	}
-)
-
-func newBitFiler(parent Filer) (f *bitFiler, err error) {
-	sz, err := parent.Size()
-	if err != nil {
-		return
-	}
-
-	return &bitFiler{parent: parent, m: bitFilerMap{}, size: sz}, nil
-}
-
-func (f *bitFiler) BeginUpdate() error { panic("internal error") }
-func (f *bitFiler) EndUpdate() error   { panic("internal error") }
-func (f *bitFiler) Rollback() error    { panic("internal error") }
-func (f *bitFiler) Sync() error        { panic("internal error") }
-
-func (f *bitFiler) Close() (err error)   { return }
-func (f *bitFiler) Name() string         { return fmt.Sprintf("%p.bitfiler", f) }
-func (f *bitFiler) Size() (int64, error) { return f.size, nil }
-
-func (f *bitFiler) PunchHole(off, size int64) (err error) {
-	first := off >> bfBits
-	if off&bfMask != 0 {
-		first++
-	}
-	off += size - 1
-	last := off >> bfBits
-	if off&bfMask != 0 {
-		last--
-	}
-	if limit := f.size >> bfBits; last > limit {
-		last = limit
-	}
-	for pgI := first; pgI <= last; pgI++ {
-		pg := &bitPage{}
-		pg.flags = allDirtyFlags
-		f.m[pgI] = pg
-	}
-	return
-}
-
-func (f *bitFiler) ReadAt(b []byte, off int64) (n int, err error) {
-	avail := f.size - off
-	pgI := off >> bfBits
-	pgO := int(off & bfMask)
-	rem := len(b)
-	if int64(rem) >= avail {
-		rem = int(avail)
-		err = io.EOF
-	}
-	for rem != 0 && avail > 0 {
-		pg := f.m[pgI]
-		if pg == nil {
-			pg = &bitPage{}
-			if f.parent != nil {
-				_, err = f.parent.ReadAt(pg.data[:], off&^bfMask)
-				if err != nil && !fileutil.IsEOF(err) {
-					return
-				}
-
-				err = nil
-			}
-			f.m[pgI] = pg
-		}
-		nc := copy(b[:mathutil.Min(rem, bfSize)], pg.data[pgO:])
-		pgI++
-		pgO = 0
-		rem -= nc
-		n += nc
-		b = b[nc:]
-		off += int64(nc)
-	}
-	return
-}
-
-func (f *bitFiler) Truncate(size int64) (err error) {
-	switch {
-	case size < 0:
-		return &ErrINVAL{"Truncate size", size}
-	case size == 0:
-		f.m = bitFilerMap{}
-		f.size = 0
-		return
-	}
-
-	first := size >> bfBits
-	if size&bfMask != 0 {
-		first++
-	}
-	last := f.size >> bfBits
-	if f.size&bfMask != 0 {
-		last++
-	}
-	for ; first < last; first++ {
-		delete(f.m, first)
-	}
-
-	f.size = size
-	return
-}
-
-func (f *bitFiler) WriteAt(b []byte, off int64) (n int, err error) {
-	off0 := off
-	pgI := off >> bfBits
-	pgO := int(off & bfMask)
-	n = len(b)
-	rem := n
-	var nc int
-	for rem != 0 {
-		pg := f.m[pgI]
-		if pg == nil {
-			pg = &bitPage{}
-			if f.parent != nil {
-				_, err = f.parent.ReadAt(pg.data[:], off&^bfMask)
-				if err != nil && !fileutil.IsEOF(err) {
-					return
-				}
-
-				err = nil
-			}
-			f.m[pgI] = pg
-		}
-		nc = copy(pg.data[pgO:], b)
-		pgI++
-		pg.dirty = true
-		for i := pgO; i < pgO+nc; i++ {
-			pg.flags[i>>3] |= bitmask[i&7]
-		}
-		pgO = 0
-		rem -= nc
-		b = b[nc:]
-		off += int64(nc)
-	}
-	f.size = mathutil.MaxInt64(f.size, off0+int64(n))
-	return
-}
-
-func (f *bitFiler) link() {
-	for pgI, pg := range f.m {
-		nx, ok := f.m[pgI+1]
-		if !ok || !nx.dirty {
-			continue
-		}
-
-		nx.prev, pg.next = pg, nx
-	}
-}
-
-func (f *bitFiler) dumpDirty(w io.WriterAt) (nwr int, err error) {
-	f.link()
-	for pgI, pg := range f.m {
-		if !pg.dirty {
-			continue
-		}
-
-		for pg.prev != nil && pg.prev.dirty {
-			pg = pg.prev
-			pgI--
-		}
-
-		for pg != nil && pg.dirty {
-			last := false
-			var off int64
-			first := -1
-			for i := 0; i < bfSize; i++ {
-				flag := pg.flags[i>>3]&bitmask[i&7] != 0
-				switch {
-				case flag && !last: // Leading edge detected
-					off = pgI<<bfBits + int64(i)
-					first = i
-				case !flag && last: // Trailing edge detected
-					n, err := w.WriteAt(pg.data[first:i], off)
-					if n != i-first {
-						return 0, err
-					}
-					first = -1
-					nwr++
-				}
-
-				last = flag
-			}
-			if first >= 0 {
-				i := bfSize
-				n, err := w.WriteAt(pg.data[first:i], off)
-				if n != i-first {
-					return 0, err
-				}
-
-				nwr++
-			}
-
-			pg.dirty = false
-			pg = pg.next
-			pgI++
-		}
-	}
-	return
-}
-
-// RollbackFiler is a Filer implementing structural transaction handling.
-// Structural transactions should be small and short lived because all non
-// committed data are held in memory until committed or discarded by a
-// Rollback.
-//
-// While using RollbackFiler, every intended update of the wrapped Filler, by
-// WriteAt, Truncate or PunchHole, _must_ be made within a transaction.
-// Attempts to do it outside of a transaction will return ErrPERM. OTOH,
-// invoking ReadAt outside of a transaction is not a problem.
-//
-// No nested transactions: All updates within a transaction are held in memory.
-// On a matching EndUpdate the updates held in memory are actually written to
-// the wrapped Filer.
-//
-// Nested transactions: Correct data will be seen from RollbackFiler when any
-// level of a nested transaction is rollbacked. The actual writing to the
-// wrapped Filer happens only when the outer most transaction nesting level is
-// closed.
-//
-// Invoking Rollback is an alternative to EndUpdate. It discards all changes
-// made at the current transaction level and returns the "state" (possibly not
-// yet persisted) of the Filer to what it was before the corresponding
-// BeginUpdate.
-//
-// During an open transaction, all reads (using ReadAt) are "dirty" reads,
-// seeing the uncommitted changes made to the Filer's data.
-//
-// Lldb databases should be based upon a RollbackFiler.
-//
-// With a wrapped MemFiler one gets transactional memory. With, for example a
-// wrapped disk based SimpleFileFiler it protects against at least some HW
-// errors - if Rollback is properly invoked on such failures and/or if there's
-// some WAL or 2PC or whatever other safe mechanism based recovery procedure
-// used by the client.
-//
-// The "real" writes to the wrapped Filer (or WAL instead) go through the
-// writerAt supplied to NewRollbackFiler.
-//
-// List of functions/methods which are recommended to be wrapped in a
-// BeginUpdate/EndUpdate structural transaction:
-//
-// 	Allocator.Alloc
-// 	Allocator.Free
-// 	Allocator.Realloc
-//
-//	CreateBTree
-// 	RemoveBTree
-// 	BTree.Clear
-// 	BTree.Delete
-// 	BTree.DeleteAny
-// 	BTree.Clear
-// 	BTree.Extract
-// 	BTree.Get (it can mutate the DB)
-// 	BTree.Put
-// 	BTree.Set
-//
-// NOTE: RollbackFiler is a generic solution intended to wrap Filers provided
-// by this package which do not implement any of the transactional methods.
-// RollbackFiler thus _does not_ invoke any of the transactional methods of its
-// wrapped Filer.
-//
-// RollbackFiler is safe for concurrent use by multiple goroutines.
-type RollbackFiler struct {
-	mu           sync.RWMutex
-	inCallback   bool
-	inCallbackMu sync.RWMutex
-	bitFiler     *bitFiler
-	checkpoint   func(int64) error
-	closed       bool
-	f            Filer
-	parent       Filer
-	tlevel       int // transaction nesting level, 0 == not in transaction
-	writerAt     io.WriterAt
-
-	// afterRollback, if not nil, is called after performing Rollback
-	// without errros.
-	afterRollback func() error
-}
-
-// NewRollbackFiler returns a RollbackFiler wrapping f.
-//
-// The checkpoint parameter
-//
-// The checkpoint function is called after closing (by EndUpdate) the upper
-// most level open transaction if all calls of writerAt were successful and the
-// DB (or eg. a WAL) is thus now in a consistent state (virtually, in the ideal
-// world with no write caches, no HW failures, no process crashes, ...).
-//
-// NOTE: In, for example, a 2PC it is necessary to reflect also the sz
-// parameter as the new file size (as in the parameter to Truncate). All
-// changes were successfully written already by writerAt before invoking
-// checkpoint.
-//
-// The writerAt parameter
-//
-// The writerAt interface is used to commit the updates of the wrapped Filer.
-// If any invocation of writerAt fails then a non nil error will be returned
-// from EndUpdate and checkpoint will _not_ ne called.  Neither is necessary to
-// call Rollback. The rule of thumb: The [structural] transaction [level] is
-// closed by invoking exactly once one of EndUpdate _or_ Rollback.
-//
-// It is presumed that writerAt uses WAL or 2PC or whatever other safe
-// mechanism to physically commit the updates.
-//
-// Updates performed by invocations of writerAt are byte-precise, but not
-// necessarily maximum possible length precise. IOW, for example an update
-// crossing page boundaries may be performed by more than one writerAt
-// invocation.  No offset sorting is performed.  This may change if it proves
-// to be a problem. Such change would be considered backward compatible.
-//
-// NOTE: Using RollbackFiler, but failing to ever invoke a matching "closing"
-// EndUpdate after an "opening" BeginUpdate means neither writerAt or
-// checkpoint will ever get called - with all the possible data loss
-// consequences.
-func NewRollbackFiler(f Filer, checkpoint func(sz int64) error, writerAt io.WriterAt) (r *RollbackFiler, err error) {
-	if f == nil || checkpoint == nil || writerAt == nil {
-		return nil, &ErrINVAL{Src: "lldb.NewRollbackFiler, nil argument"}
-	}
-
-	return &RollbackFiler{
-		checkpoint: checkpoint,
-		f:          f,
-		writerAt:   writerAt,
-	}, nil
-}
-
-// Implements Filer.
-func (r *RollbackFiler) BeginUpdate() (err error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	parent := r.f
-	if r.tlevel != 0 {
-		parent = r.bitFiler
-	}
-	r.bitFiler, err = newBitFiler(parent)
-	if err != nil {
-		return
-	}
-
-	r.tlevel++
-	return
-}
-
-// Implements Filer.
-//
-// Close will return an error if not invoked at nesting level 0.  However, to
-// allow emergency closing from eg. a signal handler; if Close is invoked
-// within an open transaction(s), it rollbacks any non committed open
-// transactions and performs the Close operation.
-//
-// IOW: Regardless of the transaction nesting level the Close is always
-// performed but any uncommitted transaction data are lost.
-func (r *RollbackFiler) Close() (err error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if r.closed {
-		return &ErrPERM{r.f.Name() + ": Already closed"}
-	}
-
-	r.closed = true
-	if err = r.f.Close(); err != nil {
-		return
-	}
-
-	if r.tlevel != 0 {
-		err = &ErrPERM{r.f.Name() + ": Close inside an open transaction"}
-	}
-
-	return
-}
-
-// Implements Filer.
-func (r *RollbackFiler) EndUpdate() (err error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if r.tlevel == 0 {
-		return &ErrPERM{r.f.Name() + " : EndUpdate outside of a transaction"}
-	}
-
-	sz, err := r.size() // Cannot call .Size() -> deadlock
-	if err != nil {
-		return
-	}
-
-	r.tlevel--
-	bf := r.bitFiler
-	parent := bf.parent
-	w := r.writerAt
-	if r.tlevel != 0 {
-		w = parent
-	}
-	nwr, err := bf.dumpDirty(w)
-	if err != nil {
-		return
-	}
-
-	switch {
-	case r.tlevel == 0:
-		r.bitFiler = nil
-		if nwr == 0 {
-			return
-		}
-
-		return r.checkpoint(sz)
-	default:
-		r.bitFiler = parent.(*bitFiler)
-		sz, _ := bf.Size() // bitFiler.Size() never returns err != nil
-		return parent.Truncate(sz)
-	}
-}
-
-// Implements Filer.
-func (r *RollbackFiler) Name() string {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-
-	return r.f.Name()
-}
-
-// Implements Filer.
-func (r *RollbackFiler) PunchHole(off, size int64) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if r.tlevel == 0 {
-		return &ErrPERM{r.f.Name() + ": PunchHole outside of a transaction"}
-	}
-
-	if off < 0 {
-		return &ErrINVAL{r.f.Name() + ": PunchHole off", off}
-	}
-
-	if size < 0 || off+size > r.bitFiler.size {
-		return &ErrINVAL{r.f.Name() + ": PunchHole size", size}
-	}
-
-	return r.bitFiler.PunchHole(off, size)
-}
-
-// Implements Filer.
-func (r *RollbackFiler) ReadAt(b []byte, off int64) (n int, err error) {
-	r.inCallbackMu.RLock()
-	defer r.inCallbackMu.RUnlock()
-	if !r.inCallback {
-		r.mu.RLock()
-		defer r.mu.RUnlock()
-	}
-	if r.tlevel == 0 {
-		return r.f.ReadAt(b, off)
-	}
-
-	return r.bitFiler.ReadAt(b, off)
-}
-
-// Implements Filer.
-func (r *RollbackFiler) Rollback() (err error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if r.tlevel == 0 {
-		return &ErrPERM{r.f.Name() + ": Rollback outside of a transaction"}
-	}
-
-	if r.tlevel > 1 {
-		r.bitFiler = r.bitFiler.parent.(*bitFiler)
-	}
-	r.tlevel--
-	if f := r.afterRollback; f != nil {
-		r.inCallbackMu.Lock()
-		r.inCallback = true
-		r.inCallbackMu.Unlock()
-		defer func() {
-			r.inCallbackMu.Lock()
-			r.inCallback = false
-			r.inCallbackMu.Unlock()
-		}()
-		return f()
-	}
-	return
-}
-
-func (r *RollbackFiler) size() (sz int64, err error) {
-	if r.tlevel == 0 {
-		return r.f.Size()
-	}
-
-	return r.bitFiler.Size()
-}
-
-// Implements Filer.
-func (r *RollbackFiler) Size() (sz int64, err error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	return r.size()
-}
-
-// Implements Filer.
-func (r *RollbackFiler) Sync() error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	return r.f.Sync()
-}
-
-// Implements Filer.
-func (r *RollbackFiler) Truncate(size int64) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if r.tlevel == 0 {
-		return &ErrPERM{r.f.Name() + ": Truncate outside of a transaction"}
-	}
-
-	return r.bitFiler.Truncate(size)
-}
-
-// Implements Filer.
-func (r *RollbackFiler) WriteAt(b []byte, off int64) (n int, err error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if r.tlevel == 0 {
-		return 0, &ErrPERM{r.f.Name() + ": WriteAt outside of a transaction"}
-	}
-
-	return r.bitFiler.WriteAt(b, off)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/AUTHORS b/Godeps/_workspace/src/github.com/cznic/fileutil/AUTHORS
deleted file mode 100644
index 288ea0b1e7..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/AUTHORS
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-CZ.NIC z.s.p.o. <kontakt@nic.cz>
-Jan Mercl <0xjnml@gmail.com>
-Aaron Bieber <deftly@gmail.com>
-
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/fileutil/CONTRIBUTORS
deleted file mode 100644
index 223b21a307..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/CONTRIBUTORS
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Bill Thiede <xinu.tv>
-Gary Burd <gary@beagledreams.com>
-Jan Mercl <0xjnml@gmail.com>
-Nick Owens <mischief@offblast.org>
-Tamás Gulácsi <gt-dev@gthomas.eu>
-Aaron Bieber <deftly@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/LICENSE b/Godeps/_workspace/src/github.com/cznic/fileutil/LICENSE
deleted file mode 100644
index 50bbdd2410..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The fileutil Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/Makefile b/Godeps/_workspace/src/github.com/cznic/fileutil/Makefile
deleted file mode 100644
index 5849cc20a2..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2014 The fileutil authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-.PHONY: all clean editor todo
-
-all: editor
-	go vet
-	golint .
-	go install
-	make todo
-
-editor:
-	go fmt
-	go test -i
-	go test
-	go build
-
-todo:
-	@grep -n ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* *.go || true
-	@grep -n TODO *.go || true
-	@grep -n BUG *.go || true
-	@grep -n println *.go || true
-
-clean:
-	@go clean
-	rm -f y.output
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/README b/Godeps/_workspace/src/github.com/cznic/fileutil/README
deleted file mode 100644
index f43d5f0047..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/README
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a goinstall-able mirror of modified code already published at:
-http://git.nic.cz/redmine/projects/gofileutil/repository
-
-Packages in this repository:
-
-Install: $go get github.com/cznic/fileutil
-Godocs: http://godoc.org/github.com/cznic/fileutil
-
-Install: $go get github.com/cznic/fileutil/storage
-Godocs: http://godoc.org/github.com/cznic/fileutil/storage
-
-Install: $go get github.com/cznic/fileutil/falloc
-Godocs: http://godoc.org/github.com/cznic/fileutil/falloc
-
-Install: $go get github.com/cznic/fileutil/hdb
-Godocs: http://godoc.org/github.com/cznic/fileutil/hdb
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/LICENSE b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/LICENSE
deleted file mode 100644
index 1e92e33dd7..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of CZ.NIC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/README b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/README
deleted file mode 100644
index 23313fc505..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a goinstall-able mirror of modified code already published at:
-https://git.nic.cz/redmine/projects/gofileutil/repository/show/falloc
-
-Install: $go get github.com/cznic/fileutil/falloc
-Godocs: http://gopkgdoc.appspot.com/pkg/github.com/cznic/fileutil/falloc
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/docs.go b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/docs.go
deleted file mode 100644
index 21772fcd06..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/docs.go
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-/*
-
-WIP: Package falloc provides allocation/deallocation of space within a
-file/store (WIP, unstable API).
-
-Overall structure:
- File == n blocks.
- Block == n atoms.
- Atom == 16 bytes.
-
-x6..x0 == least significant 7 bytes of a 64 bit integer, highest (7th) byte is
-0 and is not stored in the file.
-
-Block first byte
-
-Aka block type tag.
-
-------------------------------------------------------------------------------
-
-0xFF: Free atom (free block of size 1).
- +------++---------++---------++------+
- |  0   ||  1...7  || 8...14  ||  15  |
- +------++---------++---------++------+
- | 0xFF || p6...p0 || n6...n0 || 0xFF |
- +------++---------++---------++------+
-
-Link to the previous free block (atom addressed) is p6...p0, next dtto in
-n6...n0.  Doubly linked lists of "compatible" free blocks allows for free space
-reclaiming and merging.  "Compatible" == of size at least some K. Heads of all
-such lists are organized per K or intervals of Ks elsewhere.
-
-------------------------------------------------------------------------------
-
-0xFE: Free block, size == s6...s0 atoms.
- +------++---------++---------++---------++--
- |  +0  ||  1...7  || 8...14  || 15...21 || 22...16*size-1
- +------++---------++---------++---------++--
- | 0xFE || p6...p0 || n6...n0 || s6...s0 || ...
- +------++---------++---------++---------++--
-
-Prev and next links as in the 0xFF first byte case.  End of this block - see
-"Block last byte": 0xFE bellow. Data between == undefined.
-
-------------------------------------------------------------------------------
-
-0xFD:  Relocated block.
- +------++---------++-----------++------+
- |  0   ||  1...7  ||  8...14   ||  15  |
- +------++---------++-----------++------+
- | 0xFD || r6...r0 || undefined || 0x00 | // == used block
- +------++---------++-----------++------+
-
-Relocation link is r6..r0 == atom address. Relocations MUST NOT chain and MUST
-point to a "content" block, i.e. one with the first byte in 0x00...0xFC.
-
-Relocated block allows to permanently assign a handle/file pointer ("atom"
-address) to some content and resize the content anytime afterwards w/o having
-to update all the possible existing references to the original handle.
-
-------------------------------------------------------------------------------
-
-0xFC: Used long block.
- +------++---------++--------------------++---------+---+
- |  0   ||  1...2  ||      3...N+2       ||         |   |
- +------++---------++--------------------++---------+---+
- | 0xFC || n1...n0 || N bytes of content || padding | Z |
- +------++---------++--------------------++---------+---+
-
-This block type is used for content of length in N == 238...61680 bytes. N is
-encoded as a 2 byte unsigned integer n1..n0 in network byte order. Values
-bellow 238 are reserved, those content lengths are to be carried by the
-0x00..0xFB block types.
-
- 1. n in 0x00EE...0xF0F0 is used for content under the same rules
-    as in the 0x01..0xED type.
-
- 2. If the last byte of the content is not the last byte of an atom then
-    the last byte of the block is 0x00.
-
- 3. If the last byte of the content IS the last byte of an atom:
-
-   3.1 If the last byte of content is in 0x00..0xFD then everything is OK.
-
-   3.2 If the last byte of content is 0xFE or 0xFF then the escape
-       via n > 0xF0F0 MUST be used AND the block's last byte is 0x00 or 0x01,
-       meaning value 0xFE and 0xFF respectively.
-
- 4. n in 0xF0F1...0xFFFF is like the escaped 0xEE..0xFB block.
-    N == 13 + 16(n - 0xF0F1).
-
-Discussion of the padding and Z fields - see the 0x01..0xED block type.
-
-------------------------------------------------------------------------------
-
-0xEE...0xFB: Used escaped short block.
- +---++----------------------++---+
- | 0 ||        1...N-1       ||   |
- +---++----------------------++---+
- | X || N-1 bytes of content || Z |
- +---++----------------------++---+
-
-N == 15 + 16(X - 0xEE). Z is the content last byte encoded as follows.
-
-case Z == 0x00:	The last byte of content is 0xFE
-
-case Z == 0x01:	The last byte of content is 0xFF
-
-------------------------------------------------------------------------------
-
-0x01...0xED: Used short block.
- +---++--------------------++---------+---+
- | 0 ||        1...N       ||         |   |
- +---++--------------------++---------+---+
- | N || N bytes of content || padding | Z |
- +---++--------------------++---------+---+
-
-This block type is used for content of length in 1...237 bytes.  The value of
-the "padding" field, if of non zero length, is undefined.
-
-If the last byte of content is the last byte of an atom (== its file byte
-offset & 0xF == 0xF) then such last byte MUST be in 0x00...0xFD.
-
-If the last byte of content is the last byte of an atom AND the last byte of
-content is 0xFE or 0xFF then the short escape block type (0xEE...0xFB) MUST be
-used.
-
-If the last byte of content is not the last byte of an atom, then the last byte
-of such block, i.e. the Z field, which is also a last byte of some atom, MUST
-be 0x00 (i.e. the used block marker).  Other "tail" values are reserved.
-
-------------------------------------------------------------------------------
-
-0x00: Used empty block.
- +------++-----------++------+
- |  0   ||  1...14   ||  15  |
- +------++-----------++------+
- | 0x00 || undefined || 0x00 | // == used block, other "tail" values reserved.
- +------++-----------++------+
-
-All of the rules for 0x01..0xED applies. Depicted only for its different
-semantics (e.g. an allocated [existing] string but with length of zero).
-
-==============================================================================
-
-Block last byte
-
-------------------------------------------------------------------------------
-
-0xFF: Free atom. Layout - see "Block first byte": FF.
-
-------------------------------------------------------------------------------
-
-0xFE: Free block, size n atoms. Preceding 7 bytes == size (s6...s0) of the free
-block in atoms, network byte order
-   --++---------++------+
-     || -8...-2 ||  -1  |
-   --++---------++------+
- ... || s6...s0 || 0xFE | <- block's last byte
-   --++---------++------+
-
-Layout at start of this block - see "Block first byte": FE.
-
-------------------------------------------------------------------------------
-
-0x00...0xFD: Used (non free) block.
-
-==============================================================================
-
-Free lists table
-
-The free lists table content is stored in the standard layout of a used block.
-
-A table item is a 7 byte size field followed by a 7 byte atom address field
-(both in network byte order), thus every item is 14 contiguous bytes. The
-item's address field is pointing to a free block.  The size field determines
-the minimal size (in atoms) of free blocks on that list.
-
-The free list table is n above items, thus the content has 14n bytes. Note that
-the largest block content is 61680 bytes and as there are 14 bytes per table
-item, so the table is limited to at most 4405 entries.
-
-Items in the table do not have to be sorted according to their size field values.
-
-No two items can have the same value of the size field.
-
-When freeing blocks, the block MUST be linked into an item list with the
-highest possible size field, which is less or equal to the number of atoms in
-the new free block.
-
-When freeing a block, the block MUST be first merged with any adjacent free
-blocks (thus possibly creating a bigger free block) using information derived
-from the adjacent blocks first and last bytes. Such merged free blocks MUST be
-removed from their original doubly linked lists. Afterwards the new bigger free
-block is put to the free list table in the appropriate item.
-
-Items with address field == 0 are legal. Such item is a placeholder for a empty
-list of free blocks of the item's size.
-
-Items with size field == 0 are legal. Such item is a placeholder, used e.g. to
-avoid further reallocations/redirecting of the free lists table.
-
-The largest possible allocation request (for content length 61680 bytes) is
-0xF10 (3856) atoms.  All free blocks of this or bigger size are presumably put
-into a single table item with the size 3856. It may be useful to additionally
-have a free lists table item which links free blocks of some bigger size (say
-1M+) and then use the OS sparse file support (if present) to save the physical
-space used by such free blocks.
-
-Smaller (<3856 atoms) free blocks can be organized exactly (every distinct size
-has its table item) or the sizes can run using other schema like e.g. "1, 2,
-4, 8, ..." (powers of 2) or "1, 2, 3, 5, 8, 13, ..." (the Fibonacci sequence)
-or they may be fine tuned to a specific usage pattern.
-
-==============================================================================
-
-Header
-
-The first block of a file (atom address == file offset == 0) is the file header.
-The header block has the standard layout of a used short non escaped block.
-
-Special conditions apply: The header block and its content MUST be like this:
-
- +------+---------+---------+------+
- |  0   |  1...7  | 8...14  |  15  |
- +------+---------+---------+------+
- | 0x0F | m6...m0 | f6...f0 | FLTT |
- +------+---------+---------+------+
-
-m6..m0 is a "magic" value 0xF1C1A1FE51B1E.
-
-f6...f0 is the atom address of the free lists table (discussed elsewhere).
-If f6...f0 == 0x00 the there is no free lists table (yet).
-
-FLTT describes the type of the Free List Table. Currently defined values:
-
-------------------------------------------------------------------------------
-
-FLTT == 0: Free List Table is fixed at atom address 2. It has a fixed size for 3856 entries
-for free list of size 1..3855 atoms and the last is for the list of free block >= 3856 atoms.
-*/
-package falloc
-
-const (
-	INVALID_HANDLE = Handle(-1)
-)
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/error.go b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/error.go
deleted file mode 100644
index dad3d29e68..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/error.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-package falloc
-
-import "fmt"
-
-// EBadRequest is an error produced for invalid operation, e.g. for data of more than maximum allowed.
-type EBadRequest struct {
-	Name string
-	Size int
-}
-
-func (e *EBadRequest) Error() string {
-	return fmt.Sprintf("%s: size %d", e.Name, e.Size)
-}
-
-// EClose is a file/store close error.
-type EClose struct {
-	Name string
-	Err  error
-}
-
-func (e *EClose) Error() string {
-	return fmt.Sprintf("%sx: %s", e.Name, e.Err)
-}
-
-// ECorrupted is a file/store format error.
-type ECorrupted struct {
-	Name string
-	Ofs  int64
-}
-
-func (e *ECorrupted) Error() string {
-	return fmt.Sprintf("%s: corrupted data @%#x", e.Name, e.Ofs)
-}
-
-// ECreate is a file/store create error.
-type ECreate struct {
-	Name string
-	Err  error
-}
-
-func (e *ECreate) Error() string {
-	return fmt.Sprintf("%s: %s", e.Name, e.Err)
-}
-
-// EFreeList is a file/store format error.
-type EFreeList struct {
-	Name  string
-	Size  int64
-	Block int64
-}
-
-func (e *EFreeList) Error() string {
-	return fmt.Sprintf("%s: invalid free list item, size %#x, block %#x", e.Name, e.Size, e.Block)
-}
-
-// EHandle is an error type reported for invalid Handles.
-type EHandle struct {
-	Name   string
-	Handle Handle
-}
-
-func (e EHandle) Error() string {
-	return fmt.Sprintf("%s: invalid handle %#x", e.Name, e.Handle)
-}
-
-// EHeader is a file/store format error.
-type EHeader struct {
-	Name     string
-	Header   []byte
-	Expected []byte
-}
-
-func (e *EHeader) Error() string {
-	return fmt.Sprintf("%s: invalid header, got [% x], expected [% x]", e.Name, e.Header, e.Expected)
-}
-
-// ENullHandle is a file/store access error via a null handle.
-type ENullHandle string
-
-func (e ENullHandle) Error() string {
-	return fmt.Sprintf("%s: access via null handle", e)
-}
-
-// EOpen is a file/store open error.
-type EOpen struct {
-	Name string
-	Err  error
-}
-
-func (e *EOpen) Error() string {
-	return fmt.Sprintf("%s: %s", e.Name, e.Err)
-}
-
-// ERead is a file/store read error.
-type ERead struct {
-	Name string
-	Ofs  int64
-	Err  error
-}
-
-func (e *ERead) Error() string {
-	return fmt.Sprintf("%s, %#x: %s", e.Name, e.Ofs, e.Err)
-}
-
-// ESize is a file/store size error.
-type ESize struct {
-	Name string
-	Size int64
-}
-
-func (e *ESize) Error() string {
-	return fmt.Sprintf("%s: invalid size %#x(%d), size %%16 != 0", e.Name, e.Size, e.Size)
-}
-
-// EWrite is a file/store write error.
-type EWrite struct {
-	Name string
-	Ofs  int64
-	Err  error
-}
-
-func (e *EWrite) Error() string {
-	return fmt.Sprintf("%s, %#x: %s", e.Name, e.Ofs, e.Err)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/falloc.go b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/falloc.go
deleted file mode 100644
index 066a7047f3..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/falloc.go
+++ /dev/null
@@ -1,676 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-/*
-
-This is an mostly (WIP) conforming implementation of the "specs" in docs.go.
-
-The main incompletness is support for only one kind of FTL, though this table kind is still per "specs".
-
-*/
-
-package falloc
-
-import (
-	"bytes"
-	"github.com/cznic/fileutil/storage"
-	"sync"
-)
-
-// Handle is a reference to a block in a file/store.
-// Handle is an uint56 wrapped in an in64, i.e. the most significant byte must be always zero.
-type Handle int64
-
-// Put puts the 7 least significant bytes of h into b. The MSB of h should be zero.
-func (h Handle) Put(b []byte) {
-	for ofs := 6; ofs >= 0; ofs-- {
-		b[ofs] = byte(h)
-		h >>= 8
-	}
-}
-
-// Get gets the 7 least significant bytes of h from b. The MSB of h is zeroed.
-func (h *Handle) Get(b []byte) {
-	var x Handle
-	for ofs := 0; ofs <= 6; ofs++ {
-		x = x<<8 | Handle(b[ofs])
-	}
-	*h = x
-}
-
-// File is a file/store with space allocation/deallocation support.
-type File struct {
-	f       storage.Accessor
-	atoms   int64       // current file size in atom units
-	canfree int64       // only blocks >= canfree can be subject to Free()
-	freetab [3857]int64 // freetab[0] is unused, freetab[1] is size 1 ptr, freetab[2] is size 2 ptr, ...
-	rwm     sync.RWMutex
-}
-
-func (f *File) read(b []byte, off int64) {
-	if n, err := f.f.ReadAt(b, off); n != len(b) {
-		panic(&ERead{f.f.Name(), off, err})
-	}
-}
-
-func (f *File) write(b []byte, off int64) {
-	if n, err := f.f.WriteAt(b, off); n != len(b) {
-		panic(&EWrite{f.f.Name(), off, err})
-	}
-}
-
-var ( // R/O
-	hdr   = []byte{0x0f, 0xf1, 0xc1, 0xa1, 0xfe, 0xa5, 0x1b, 0x1e, 0, 0, 0, 0, 0, 0, 2, 0} // free lists table @2
-	empty = make([]byte, 16)
-	zero  = []byte{0}
-	zero7 = make([]byte, 7)
-)
-
-// New returns a new File backed by store or an error if any.
-// Any existing data in store are discarded.
-func New(store storage.Accessor) (f *File, err error) {
-	f = &File{f: store}
-	return f, storage.Mutate(store, func() (err error) {
-		if err = f.f.Truncate(0); err != nil {
-			return &ECreate{f.f.Name(), err}
-		}
-
-		if _, err = f.Alloc(hdr[1:]); err != nil { //TODO internal panicking versions of the exported fns.
-			return
-		}
-
-		if _, err = f.Alloc(nil); err != nil { // (empty) root @1
-			return
-		}
-
-		b := make([]byte, 3856*14)
-		for i := 1; i <= 3856; i++ {
-			Handle(i).Put(b[(i-1)*14:])
-		}
-		if _, err = f.Alloc(b); err != nil {
-			return
-		}
-
-		f.canfree = f.atoms
-		return
-	})
-}
-
-// Open returns a new File backed by store or an error if any.
-// Store already has to be in a valid format.
-func Open(store storage.Accessor) (f *File, err error) {
-	defer func() {
-		if e := recover(); e != nil {
-			f = nil
-			err = e.(error)
-		}
-	}()
-
-	fi, err := store.Stat()
-	if err != nil {
-		panic(&EOpen{store.Name(), err})
-	}
-
-	fs := fi.Size()
-	if fs&0xf != 0 {
-		panic(&ESize{store.Name(), fi.Size()})
-	}
-
-	f = &File{f: store, atoms: fs >> 4}
-	b := make([]byte, len(hdr))
-	f.read(b, 0)
-	if !bytes.Equal(b, hdr) {
-		panic(&EHeader{store.Name(), b, append([]byte{}, hdr...)})
-	}
-
-	var atoms int64
-	b, atoms = f.readUsed(2)
-	f.canfree = atoms + 2
-	ofs := 0
-	var size, p Handle
-	for ofs < len(b) {
-		size.Get(b[ofs:])
-		ofs += 7
-		p.Get(b[ofs:])
-		ofs += 7
-		if sz, pp := int64(size), int64(p); size == 0 || size > 3856 || (pp != 0 && pp < f.canfree) || pp<<4 > fs-16 {
-			panic(&EFreeList{store.Name(), sz, pp})
-		}
-
-		f.freetab[size] = int64(p)
-	}
-	return
-}
-
-// Accessor returns the File's underlying Accessor.
-func (f *File) Accessor() storage.Accessor {
-	return f.f
-}
-
-// Close closes f and returns an error if any.
-func (f *File) Close() (err error) {
-	return storage.Mutate(f.Accessor(), func() (err error) {
-		if err = f.f.Close(); err != nil {
-			err = &EClose{f.f.Name(), err}
-		}
-		return
-	})
-}
-
-// Root returns the handle of the DB root (top level directory, ...).
-func (f *File) Root() Handle {
-	return 1
-}
-
-func (f *File) readUsed(atom int64) (content []byte, atoms int64) {
-	b, redirected := make([]byte, 7), false
-redir:
-	ofs := atom << 4
-	f.read(b[:1], ofs)
-	switch pre := b[0]; {
-	default:
-		panic(&ECorrupted{f.f.Name(), ofs})
-	case pre == 0x00: // Empty block
-	case pre >= 1 && pre <= 237: // Short
-		content = make([]byte, pre)
-		f.read(content, ofs+1)
-	case pre >= 0xee && pre <= 0xfb: // Short esc
-		content = make([]byte, 15+16*(pre-0xee))
-		f.read(content, ofs+1)
-		content[len(content)-1] += 0xfe
-	case pre == 0xfc: // Long
-		f.read(b[:2], ofs+1)
-		n := int(b[0])<<8 + int(b[1])
-		switch {
-		default:
-			panic(&ECorrupted{f.f.Name(), ofs + 1})
-		case n >= 238 && n <= 61680: // Long non esc
-			content = make([]byte, n)
-			f.read(content, ofs+3)
-		case n >= 61681: // Long esc
-			content = make([]byte, 13+16*(n-0xf0f1))
-			f.read(content, ofs+3)
-			content[len(content)-1] += 0xfe
-		}
-	case pre == 0xfd: // redir
-		if redirected {
-			panic(&ECorrupted{f.f.Name(), ofs})
-		}
-
-		f.read(b[:7], ofs+1)
-		(*Handle)(&atom).Get(b)
-		redirected = true
-		goto redir
-	}
-	return content, rq2Atoms(len(content))
-}
-
-func (f *File) writeUsed(b []byte, atom int64) {
-	n := len(b)
-	switch ofs, atoms, endmark := atom<<4, rq2Atoms(n), true; {
-	default:
-		panic("internal error")
-	case n == 0:
-		f.write(empty, ofs)
-	case n <= 237:
-		if (n+1)&0xf == 0 { // content end == atom end
-			if v := b[n-1]; v >= 0xfe { // escape
-				pre := []byte{byte((16*0xee + n - 15) >> 4)}
-				f.write(pre, ofs)
-				f.write(b[:n-1], ofs+1)
-				f.write([]byte{v - 0xfe}, ofs+atoms<<4-1)
-				return
-			}
-			endmark = false
-		}
-		// non esacpe
-		pre := []byte{byte(n)}
-		f.write(pre, ofs)
-		f.write(b, ofs+1)
-		if endmark {
-			f.write(zero, ofs+atoms<<4-1) // last block byte <- used block
-		}
-	case n > 237 && n <= 61680:
-		if (n+3)&0xf == 0 { // content end == atom end
-			if v := b[n-1]; v >= 0xfe { // escape
-				x := (16*0xf0f1 + n - 13) >> 4
-				pre := []byte{0xFC, byte(x >> 8), byte(x)}
-				f.write(pre, ofs)
-				f.write(b[:n-1], ofs+3)
-				f.write([]byte{v - 0xfe}, ofs+atoms<<4-1)
-				return
-			}
-			endmark = false
-		}
-		// non esacpe
-		pre := []byte{0xfc, byte(n >> 8), byte(n)}
-		f.write(pre, ofs)
-		f.write(b, ofs+3)
-		if endmark {
-			f.write(zero, ofs+atoms<<4-1) // last block byte <- used block
-		}
-	}
-}
-
-func rq2Atoms(rqbytes int) (rqatoms int64) {
-	if rqbytes > 237 {
-		rqbytes += 2
-	}
-	return int64(rqbytes>>4 + 1)
-}
-
-func (f *File) extend(b []byte) (handle int64) {
-	handle = f.atoms
-	f.writeUsed(b, handle)
-	f.atoms += rq2Atoms(len(b))
-	return
-}
-
-// Alloc stores b in a newly allocated space and returns its handle and an error if any.
-func (f *File) Alloc(b []byte) (handle Handle, err error) {
-	err = storage.Mutate(f.Accessor(), func() (err error) {
-		rqAtoms := rq2Atoms(len(b))
-		if rqAtoms > 3856 {
-			return &EBadRequest{f.f.Name(), len(b)}
-		}
-
-		for foundsize, foundp := range f.freetab[rqAtoms:] {
-			if foundp != 0 {
-				// this works only for the current unique sizes list (except the last item!)
-				size := int64(foundsize) + rqAtoms
-				handle = Handle(foundp)
-				if size == 3856 {
-					buf := make([]byte, 7)
-					f.read(buf, int64(handle)<<4+15)
-					(*Handle)(&size).Get(buf)
-				}
-				f.delFree(int64(handle), size)
-				if rqAtoms < size {
-					f.addFree(int64(handle)+rqAtoms, size-rqAtoms)
-				}
-				f.writeUsed(b, int64(handle))
-				return
-			}
-		}
-
-		handle = Handle(f.extend(b))
-		return
-	})
-	return
-}
-
-// checkLeft returns the atom size of a free bleck left adjacent to block @atom.
-// If that block is not free the returned size is 0.
-func (f *File) checkLeft(atom int64) (size int64) {
-	if atom <= f.canfree {
-		return
-	}
-
-	b := make([]byte, 7)
-	fp := atom << 4
-	f.read(b[:1], fp-1)
-	switch last := b[0]; {
-	case last <= 0xfd:
-		// used block
-	case last == 0xfe:
-		f.read(b, fp-8)
-		(*Handle)(&size).Get(b)
-	case last == 0xff:
-		size = 1
-	}
-	return
-}
-
-// getInfo returns the block @atom type and size.
-func (f *File) getInfo(atom int64) (pref byte, size int64) {
-	b := make([]byte, 7)
-	fp := atom << 4
-	f.read(b[:1], fp)
-	switch pref = b[0]; {
-	case pref == 0: // Empty used
-		size = 1
-	case pref >= 1 && pref <= 237: // Short
-		size = rq2Atoms(int(pref))
-	case pref >= 0xee && pref <= 0xfb: // Short esc
-		size = rq2Atoms(15 + 16*int(pref-0xee))
-	case pref == 0xfc: // Long
-		f.read(b[:2], fp+1)
-		n := int(b[0])<<8 + int(b[1])
-		switch {
-		default:
-			panic(&ECorrupted{f.f.Name(), fp + 1})
-		case n >= 238 && n <= 61680: // Long non esc
-			size = rq2Atoms(n)
-		case n >= 61681: // Long esc
-			size = rq2Atoms(13 + 16*(n-0xf0f1))
-		}
-	case pref == 0xfd: // reloc
-		size = 1
-	case pref == 0xfe:
-		f.read(b, fp+15)
-		(*Handle)(&size).Get(b)
-	case pref == 0xff:
-		size = 1
-	}
-	return
-}
-
-// getSize returns the atom size of the block @atom and wheter it is free.
-func (f *File) getSize(atom int64) (size int64, isFree bool) {
-	var typ byte
-	typ, size = f.getInfo(atom)
-	isFree = typ >= 0xfe
-	return
-}
-
-// checkRight returns the atom size of a free bleck right adjacent to block @atom,atoms.
-// If that block is not free the returned size is 0.
-func (f *File) checkRight(atom, atoms int64) (size int64) {
-	if atom+atoms >= f.atoms {
-		return
-	}
-
-	if sz, free := f.getSize(atom + atoms); free {
-		size = sz
-	}
-	return
-}
-
-// delFree removes the atoms@atom free block from the free block list
-func (f *File) delFree(atom, atoms int64) {
-	b := make([]byte, 15)
-	size := int(atoms)
-	if n := len(f.freetab); atoms >= int64(n) {
-		size = n - 1
-	}
-	fp := atom << 4
-	f.read(b[1:], fp+1)
-	var prev, next Handle
-	prev.Get(b[1:])
-	next.Get(b[8:])
-
-	switch {
-	case prev == 0 && next != 0:
-		next.Put(b)
-		f.write(b[:7], int64(32+3+7+(size-1)*14))
-		f.write(zero7, int64(next)<<4+1)
-		f.freetab[size] = int64(next)
-	case prev != 0 && next == 0:
-		f.write(zero7, int64(prev)<<4+8)
-	case prev != 0 && next != 0:
-		prev.Put(b)
-		f.write(b[:7], int64(next)<<4+1)
-		next.Put(b)
-		f.write(b[:7], int64(prev)<<4+8)
-	default: // prev == 0 && next == 0:
-		f.write(zero7, int64(32+3+7+(size-1)*14))
-		f.freetab[size] = 0
-	}
-}
-
-// addFree adds atoms@atom to the free block lists and marks it free.
-func (f *File) addFree(atom, atoms int64) {
-	b := make([]byte, 7)
-	size := int(atoms)
-	if n := len(f.freetab); atoms >= int64(n) {
-		size = n - 1
-	}
-	head := f.freetab[size]
-	if head == 0 { // empty list
-		f.makeFree(0, atom, atoms, 0)
-		Handle(atom).Put(b)
-		f.write(b, int64(32+3+7+(size-1)*14))
-		f.freetab[size] = atom
-		return
-	}
-
-	Handle(atom).Put(b)
-	f.write(b, head<<4+1)            // head.prev = atom
-	f.makeFree(0, atom, atoms, head) // atom.next = head
-	f.write(b, int64(32+3+7+(size-1)*14))
-	f.freetab[size] = atom
-}
-
-// makeFree sets up the content of a free block atoms@atom, fills the prev and next links.
-func (f *File) makeFree(prev, atom, atoms, next int64) {
-	b := make([]byte, 23)
-	fp := atom << 4
-	if atoms == 1 {
-		b[0] = 0xff
-		Handle(prev).Put(b[1:])
-		Handle(next).Put(b[8:])
-		b[15] = 0xff
-		f.write(b[:16], fp)
-		return
-	}
-
-	b[0] = 0xfe
-	Handle(prev).Put(b[1:])
-	Handle(next).Put(b[8:])
-	Handle(atoms).Put(b[15:])
-	f.write(b[:22], fp)
-	b[22] = 0xfe
-	f.write(b[15:], fp+atoms<<4-8)
-}
-
-// Read reads and return the data associated with handle and an error if any.
-// Passing an invalid handle to Read may return invalid data without error.
-// It's like getting garbage via passing an invalid pointer to C.memcopy().
-func (f *File) Read(handle Handle) (b []byte, err error) {
-	defer func() {
-		if e := recover(); e != nil {
-			b = nil
-			err = e.(error)
-		}
-	}()
-
-	switch handle {
-	case 0:
-		panic(ENullHandle(f.f.Name()))
-	case 2:
-		panic(&EHandle{f.f.Name(), handle})
-	default:
-		b, _ = f.readUsed(int64(handle))
-	}
-	return
-}
-
-// Free frees space associated with handle and returns an error if any. Passing an invalid
-// handle to Free or reusing handle afterwards will probably corrupt the database or provide
-// invalid data on Read. It's like corrupting memory via passing an invalid pointer to C.free()
-// or reusing that pointer.
-func (f *File) Free(handle Handle) (err error) {
-	return storage.Mutate(f.Accessor(), func() (err error) {
-		atom := int64(handle)
-		atoms, isFree := f.getSize(atom)
-		if isFree || atom < f.canfree {
-			return &EHandle{f.f.Name(), handle}
-		}
-
-		leftFree, rightFree := f.checkLeft(atom), f.checkRight(atom, atoms)
-		switch {
-		case leftFree != 0 && rightFree != 0:
-			f.delFree(atom-leftFree, leftFree)
-			f.delFree(atom+atoms, rightFree)
-			f.addFree(atom-leftFree, leftFree+atoms+rightFree)
-		case leftFree != 0 && rightFree == 0:
-			f.delFree(atom-leftFree, leftFree)
-			if atom+atoms == f.atoms { // the left free neighbour and this block together are an empy tail
-				f.atoms = atom - leftFree
-				f.f.Truncate(f.atoms << 4)
-				return
-			}
-
-			f.addFree(atom-leftFree, leftFree+atoms)
-		case leftFree == 0 && rightFree != 0:
-			f.delFree(atom+atoms, rightFree)
-			f.addFree(atom, atoms+rightFree)
-		default: // leftFree == 0 && rightFree == 0
-			if atom+atoms < f.atoms { // isolated inner block
-				f.addFree(atom, atoms)
-				return
-			}
-
-			f.f.Truncate(atom << 4) // isolated tail block, shrink file
-			f.atoms = atom
-		}
-		return
-	})
-}
-
-// Realloc reallocates space associted with handle to acomodate b, returns the newhandle
-// newly associated with b and an error if any. If keepHandle == true then Realloc guarantees
-// newhandle == handle even if the new data are larger then the previous content associated
-// with handle. If !keepHandle && newhandle != handle then reusing handle will probably corrupt
-// the database.
-// The above effects are like corrupting memory/data via passing an invalid pointer to C.realloc().
-func (f *File) Realloc(handle Handle, b []byte, keepHandle bool) (newhandle Handle, err error) {
-	err = storage.Mutate(f.Accessor(), func() (err error) {
-		switch handle {
-		case 0, 2:
-			return &EHandle{f.f.Name(), handle}
-		case 1:
-			keepHandle = true
-		}
-		newhandle = handle
-		atom, newatoms := int64(handle), rq2Atoms(len(b))
-		if newatoms > 3856 {
-			return &EBadRequest{f.f.Name(), len(b)}
-		}
-
-		typ, oldatoms := f.getInfo(atom)
-		switch {
-		default:
-			return &ECorrupted{f.f.Name(), atom << 4}
-		case typ <= 0xfc: // non relocated used block
-			switch {
-			case newatoms == oldatoms: // in place replace
-				f.writeUsed(b, atom)
-			case newatoms < oldatoms: // in place shrink
-				rightFree := f.checkRight(atom, oldatoms)
-				if rightFree > 0 { // right join
-					f.delFree(atom+oldatoms, rightFree)
-				}
-				f.addFree(atom+newatoms, oldatoms+rightFree-newatoms)
-				f.writeUsed(b, atom)
-			case newatoms > oldatoms:
-				if rightFree := f.checkRight(atom, oldatoms); rightFree > 0 && newatoms <= oldatoms+rightFree {
-					f.delFree(atom+oldatoms, rightFree)
-					if newatoms < oldatoms+rightFree {
-						f.addFree(atom+newatoms, oldatoms+rightFree-newatoms)
-					}
-					f.writeUsed(b, atom)
-					return
-				}
-
-				if !keepHandle {
-					f.Free(Handle(atom))
-					newhandle, err = f.Alloc(b)
-					return
-				}
-
-				// reloc
-				newatom, e := f.Alloc(b)
-				if e != nil {
-					return e
-				}
-
-				buf := make([]byte, 16)
-				buf[0] = 0xfd
-				Handle(newatom).Put(buf[1:])
-				f.Realloc(Handle(atom), buf[1:], true)
-				f.write(buf[:1], atom<<4)
-			}
-		case typ == 0xfd: // reloc
-			var target Handle
-			buf := make([]byte, 7)
-			f.read(buf, atom<<4+1)
-			target.Get(buf)
-			switch {
-			case newatoms == 1:
-				f.writeUsed(b, atom)
-				f.Free(target)
-			default:
-				if rightFree := f.checkRight(atom, 1); rightFree > 0 && newatoms <= 1+rightFree {
-					f.delFree(atom+1, rightFree)
-					if newatoms < 1+rightFree {
-						f.addFree(atom+newatoms, 1+rightFree-newatoms)
-					}
-					f.writeUsed(b, atom)
-					f.Free(target)
-					return
-				}
-
-				newtarget, e := f.Realloc(Handle(target), b, false)
-				if e != nil {
-					return e
-				}
-
-				if newtarget != target {
-					Handle(newtarget).Put(buf)
-					f.write(buf, atom<<4+1)
-				}
-			}
-		}
-		return
-	})
-	return
-}
-
-// Lock locks f for writing. If the lock is already locked for reading or writing,
-// Lock blocks until the lock is available. To ensure that the lock eventually becomes available,
-// a blocked Lock call excludes new readers from acquiring the lock.
-func (f *File) Lock() {
-	f.rwm.Lock()
-}
-
-// RLock locks f for reading. If the lock is already locked for writing or there is a writer
-// already waiting to release the lock, RLock blocks until the writer has released the lock.
-func (f *File) RLock() {
-	f.rwm.RLock()
-}
-
-// Unlock unlocks f for writing. It is a run-time error if f is not locked for writing on entry to Unlock.
-//
-// As with Mutexes, a locked RWMutex is not associated with a particular goroutine.
-// One goroutine may RLock (Lock) f and then arrange for another goroutine to RUnlock (Unlock) it.
-func (f *File) Unlock() {
-	f.rwm.Unlock()
-}
-
-// RUnlock undoes a single RLock call; it does not affect other simultaneous readers.
-// It is a run-time error if f is not locked for reading on entry to RUnlock.
-func (f *File) RUnlock() {
-	f.rwm.RUnlock()
-}
-
-// LockedAlloc wraps Alloc in a Lock/Unlock pair.
-func (f *File) LockedAlloc(b []byte) (handle Handle, err error) {
-	f.Lock()
-	defer f.Unlock()
-	return f.Alloc(b)
-}
-
-// LockedFree wraps Free in a Lock/Unlock pair.
-func (f *File) LockedFree(handle Handle) (err error) {
-	f.Lock()
-	defer f.Unlock()
-	return f.Free(handle)
-}
-
-// LockedRead wraps Read in a RLock/RUnlock pair.
-func (f *File) LockedRead(handle Handle) (b []byte, err error) {
-	f.RLock()
-	defer f.RUnlock()
-	return f.Read(handle)
-}
-
-// LockedRealloc wraps Realloc in a Lock/Unlock pair.
-func (f *File) LockedRealloc(handle Handle, b []byte, keepHandle bool) (newhandle Handle, err error) {
-	f.Lock()
-	defer f.Unlock()
-	return f.Realloc(handle, b, keepHandle)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/test_deps.go b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/test_deps.go
deleted file mode 100644
index 3bdd39f2b5..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/test_deps.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-package falloc
-
-// Pull test dependencies too.
-// Enables easy 'go test X' after 'go get X'
-import (
-	_ "github.com/cznic/fileutil"
-	_ "github.com/cznic/fileutil/storage"
-	_ "github.com/cznic/mathutil"
-)
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil.go b/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil.go
deleted file mode 100644
index 2f0f7ab155..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil.go
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright (c) 2014 The fileutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package fileutil collects some file utility functions.
-package fileutil
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"sync"
-	"time"
-)
-
-// GoMFile is a concurrent access safe version of MFile.
-type GoMFile struct {
-	mfile *MFile
-	mutex sync.Mutex
-}
-
-// NewGoMFile return a newly created GoMFile.
-func NewGoMFile(fname string, flag int, perm os.FileMode, delta_ns int64) (m *GoMFile, err error) {
-	m = &GoMFile{}
-	if m.mfile, err = NewMFile(fname, flag, perm, delta_ns); err != nil {
-		m = nil
-	}
-	return
-}
-
-func (m *GoMFile) File() (file *os.File, err error) {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-	return m.mfile.File()
-}
-
-func (m *GoMFile) SetChanged() {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-	m.mfile.SetChanged()
-}
-
-func (m *GoMFile) SetHandler(h MFileHandler) {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-	m.mfile.SetHandler(h)
-}
-
-// MFileHandler resolves modifications of File.
-// Possible File context is expected to be a part of the handler's closure.
-type MFileHandler func(*os.File) error
-
-// MFile represents an os.File with a guard/handler on change/modification.
-// Example use case is an app with a configuration file which can be modified at any time
-// and have to be reloaded in such event prior to performing something configurable by that
-// file. The checks are made only on access to the MFile file by
-// File() and a time threshold/hysteresis value can be chosen on creating a new MFile.
-type MFile struct {
-	file    *os.File
-	handler MFileHandler
-	t0      int64
-	delta   int64
-	ctime   int64
-}
-
-// NewMFile returns a newly created MFile or Error if any.
-// The fname, flag and perm parameters have the same meaning as in os.Open.
-// For meaning of the delta_ns parameter please see the (m *MFile) File() docs.
-func NewMFile(fname string, flag int, perm os.FileMode, delta_ns int64) (m *MFile, err error) {
-	m = &MFile{}
-	m.t0 = time.Now().UnixNano()
-	if m.file, err = os.OpenFile(fname, flag, perm); err != nil {
-		return
-	}
-
-	var fi os.FileInfo
-	if fi, err = m.file.Stat(); err != nil {
-		return
-	}
-
-	m.ctime = fi.ModTime().UnixNano()
-	m.delta = delta_ns
-	runtime.SetFinalizer(m, func(m *MFile) {
-		m.file.Close()
-	})
-	return
-}
-
-// SetChanged forces next File() to unconditionally handle modification of the wrapped os.File.
-func (m *MFile) SetChanged() {
-	m.ctime = -1
-}
-
-// SetHandler sets a function to be invoked when modification of MFile is to be processed.
-func (m *MFile) SetHandler(h MFileHandler) {
-	m.handler = h
-}
-
-// File returns an os.File from MFile. If time elapsed between the last invocation of this function
-// and now is at least delta_ns ns (a parameter of NewMFile) then the file is checked for
-// change/modification. For delta_ns == 0 the modification is checked w/o getting os.Time().
-// If a change is detected a handler is invoked on the MFile file.
-// Any of these steps can produce an Error. If that happens the function returns nil, Error.
-func (m *MFile) File() (file *os.File, err error) {
-	var now int64
-
-	mustCheck := m.delta == 0
-	if !mustCheck {
-		now = time.Now().UnixNano()
-		mustCheck = now-m.t0 > m.delta
-	}
-
-	if mustCheck { // check interval reached
-		var fi os.FileInfo
-		if fi, err = m.file.Stat(); err != nil {
-			return
-		}
-
-		if fi.ModTime().UnixNano() != m.ctime { // modification detected
-			if m.handler == nil {
-				return nil, fmt.Errorf("no handler set for modified file %q", m.file.Name())
-			}
-			if err = m.handler(m.file); err != nil {
-				return
-			}
-
-			m.ctime = fi.ModTime().UnixNano()
-		}
-		m.t0 = now
-	}
-
-	return m.file, nil
-}
-
-// Read reads buf from r. It will either fill the full buf or fail.
-// It wraps the functionality of an io.Reader which may return less bytes than requested,
-// but may block if not all data are ready for the io.Reader.
-func Read(r io.Reader, buf []byte) (err error) {
-	have := 0
-	remain := len(buf)
-	got := 0
-	for remain > 0 {
-		if got, err = r.Read(buf[have:]); err != nil {
-			return
-		}
-
-		remain -= got
-		have += got
-	}
-	return
-}
-
-// "os" and/or "syscall" extensions
-
-// FadviseAdvice is used by Fadvise.
-type FadviseAdvice int
-
-// FAdviseAdvice values.
-const (
-	// $ grep FADV /usr/include/bits/fcntl.h
-	POSIX_FADV_NORMAL     FadviseAdvice = iota // No further special treatment.
-	POSIX_FADV_RANDOM                          // Expect random page references.
-	POSIX_FADV_SEQUENTIAL                      // Expect sequential page references.
-	POSIX_FADV_WILLNEED                        // Will need these pages.
-	POSIX_FADV_DONTNEED                        // Don't need these pages.
-	POSIX_FADV_NOREUSE                         // Data will be accessed once.
-)
-
-// TempFile creates a new temporary file in the directory dir with a name
-// ending with suffix, basename starting with prefix, opens the file for
-// reading and writing, and returns the resulting *os.File.  If dir is the
-// empty string, TempFile uses the default directory for temporary files (see
-// os.TempDir).  Multiple programs calling TempFile simultaneously will not
-// choose the same file.  The caller can use f.Name() to find the pathname of
-// the file.  It is the caller's responsibility to remove the file when no
-// longer needed.
-//
-// NOTE: This function differs from ioutil.TempFile.
-func TempFile(dir, prefix, suffix string) (f *os.File, err error) {
-	if dir == "" {
-		dir = os.TempDir()
-	}
-
-	nconflict := 0
-	for i := 0; i < 10000; i++ {
-		name := filepath.Join(dir, prefix+nextInfix()+suffix)
-		f, err = os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
-		if os.IsExist(err) {
-			if nconflict++; nconflict > 10 {
-				rand = reseed()
-			}
-			continue
-		}
-		break
-	}
-	return
-}
-
-// Random number state.
-// We generate random temporary file names so that there's a good
-// chance the file doesn't exist yet - keeps the number of tries in
-// TempFile to a minimum.
-var rand uint32
-var randmu sync.Mutex
-
-func reseed() uint32 {
-	return uint32(time.Now().UnixNano() + int64(os.Getpid()))
-}
-
-func nextInfix() string {
-	randmu.Lock()
-	r := rand
-	if r == 0 {
-		r = reseed()
-	}
-	r = r*1664525 + 1013904223 // constants from Numerical Recipes
-	rand = r
-	randmu.Unlock()
-	return strconv.Itoa(int(1e9 + r%1e9))[1:]
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_arm.go b/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_arm.go
deleted file mode 100644
index 9410d1bb26..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_arm.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014 The fileutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package fileutil
-
-import (
-	"io"
-	"os"
-)
-
-// PunchHole deallocates space inside a file in the byte range starting at
-// offset and continuing for len bytes. Not supported on ARM.
-func PunchHole(f *os.File, off, len int64) error {
-	return nil
-}
-
-// Fadvise predeclares an access pattern for file data.  See also 'man 2
-// posix_fadvise'. Not supported on ARM.
-func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
-	return nil
-}
-
-// IsEOF reports whether err is an EOF condition.
-func IsEOF(err error) bool { return err == io.EOF }
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_darwin.go b/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_darwin.go
deleted file mode 100644
index a19723fc78..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_darwin.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014 The fileutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package fileutil
-
-import (
-	"io"
-	"os"
-)
-
-// PunchHole deallocates space inside a file in the byte range starting at
-// offset and continuing for len bytes. Not supported on OSX.
-func PunchHole(f *os.File, off, len int64) error {
-	return nil
-}
-
-// Fadvise predeclares an access pattern for file data.  See also 'man 2
-// posix_fadvise'. Not supported on OSX.
-func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
-	return nil
-}
-
-// IsEOF reports whether err is an EOF condition.
-func IsEOF(err error) bool { return err == io.EOF }
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_freebsd.go b/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_freebsd.go
deleted file mode 100644
index 0865093e2b..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_freebsd.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014 The fileutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package fileutil
-
-import (
-	"io"
-	"os"
-)
-
-// PunchHole deallocates space inside a file in the byte range starting at
-// offset and continuing for len bytes. Unimplemented on FreeBSD.
-func PunchHole(f *os.File, off, len int64) error {
-	return nil
-}
-
-// Fadvise predeclares an access pattern for file data.  See also 'man 2
-// posix_fadvise'. Unimplemented on FreeBSD.
-func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
-	return nil
-}
-
-// IsEOF reports whether err is an EOF condition.
-func IsEOF(err error) bool { return err == io.EOF }
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_linux.go b/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_linux.go
deleted file mode 100644
index 8babfc5533..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_linux.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) 2014 The fileutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !arm
-
-package fileutil
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"os"
-	"strconv"
-	"syscall"
-)
-
-func n(s []byte) byte {
-	for i, c := range s {
-		if c < '0' || c > '9' {
-			s = s[:i]
-			break
-		}
-	}
-	v, _ := strconv.Atoi(string(s))
-	return byte(v)
-}
-
-func init() {
-	b, err := ioutil.ReadFile("/proc/sys/kernel/osrelease")
-	if err != nil {
-		panic(err)
-	}
-
-	tokens := bytes.Split(b, []byte("."))
-	if len(tokens) > 3 {
-		tokens = tokens[:3]
-	}
-	switch len(tokens) {
-	case 3:
-		// Supported since kernel 2.6.38
-		if bytes.Compare([]byte{n(tokens[0]), n(tokens[1]), n(tokens[2])}, []byte{2, 6, 38}) < 0 {
-			puncher = func(*os.File, int64, int64) error { return nil }
-		}
-	case 2:
-		if bytes.Compare([]byte{n(tokens[0]), n(tokens[1])}, []byte{2, 7}) < 0 {
-			puncher = func(*os.File, int64, int64) error { return nil }
-		}
-	default:
-		puncher = func(*os.File, int64, int64) error { return nil }
-	}
-}
-
-var puncher = func(f *os.File, off, len int64) error {
-	const (
-		/*
-			/usr/include/linux$ grep FL_ falloc.h
-		*/
-		_FALLOC_FL_KEEP_SIZE  = 0x01 // default is extend size
-		_FALLOC_FL_PUNCH_HOLE = 0x02 // de-allocates range
-	)
-
-	_, _, errno := syscall.Syscall6(
-		syscall.SYS_FALLOCATE,
-		uintptr(f.Fd()),
-		uintptr(_FALLOC_FL_KEEP_SIZE|_FALLOC_FL_PUNCH_HOLE),
-		uintptr(off),
-		uintptr(len),
-		0, 0)
-	if errno != 0 {
-		return os.NewSyscallError("SYS_FALLOCATE", errno)
-	}
-	return nil
-}
-
-// PunchHole deallocates space inside a file in the byte range starting at
-// offset and continuing for len bytes. No-op for kernels < 2.6.38 (or < 2.7).
-func PunchHole(f *os.File, off, len int64) error {
-	return puncher(f, off, len)
-}
-
-// Fadvise predeclares an access pattern for file data.  See also 'man 2
-// posix_fadvise'.
-func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
-	_, _, errno := syscall.Syscall6(
-		syscall.SYS_FADVISE64,
-		uintptr(f.Fd()),
-		uintptr(off),
-		uintptr(len),
-		uintptr(advice),
-		0, 0)
-	return os.NewSyscallError("SYS_FADVISE64", errno)
-}
-
-// IsEOF reports whether err is an EOF condition.
-func IsEOF(err error) bool { return err == io.EOF }
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_openbsd.go b/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_openbsd.go
deleted file mode 100644
index 428171bdfe..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_openbsd.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014 The fileutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package fileutil
-
-import (
-	"io"
-	"os"
-)
-
-// PunchHole deallocates space inside a file in the byte range starting at
-// offset and continuing for len bytes. Similar to FreeBSD, this is
-// unimplemented.
-func PunchHole(f *os.File, off, len int64) error {
-	return nil
-}
-
-// Unimplemented on OpenBSD.
-func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
-	return nil
-}
-
-// IsEOF reports whether err is an EOF condition.
-func IsEOF(err error) bool { return err == io.EOF }
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_plan9.go b/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_plan9.go
deleted file mode 100644
index a2db64e2d3..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_plan9.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014 The fileutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package fileutil
-
-import (
-	"io"
-	"os"
-)
-
-// PunchHole deallocates space inside a file in the byte range starting at
-// offset and continuing for len bytes. Unimplemented on Plan 9.
-func PunchHole(f *os.File, off, len int64) error {
-	return nil
-}
-
-// Fadvise predeclares an access pattern for file data.  See also 'man 2
-// posix_fadvise'. Unimplemented on Plan 9.
-func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
-	return nil
-}
-
-// IsEOF reports whether err is an EOF condition.
-func IsEOF(err error) bool { return err == io.EOF }
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_solaris.go b/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_solaris.go
deleted file mode 100644
index 61dfcde38f..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_solaris.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2013 jnml. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.3
-
-package fileutil
-
-import (
-	"io"
-	"os"
-)
-
-// PunchHole deallocates space inside a file in the byte range starting at
-// offset and continuing for len bytes. Not supported on Solaris.
-func PunchHole(f *os.File, off, len int64) error {
-	return nil
-}
-
-// Fadvise predeclares an access pattern for file data.  See also 'man 2
-// posix_fadvise'. Not supported on Solaris.
-func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
-	return nil
-}
-
-// IsEOF reports whether err is an EOF condition.
-func IsEOF(err error) bool { return err == io.EOF }
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_windows.go b/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_windows.go
deleted file mode 100644
index 3a81f2fc87..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/fileutil_windows.go
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2014 The fileutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package fileutil
-
-import (
-	"io"
-	"os"
-	"sync"
-	"syscall"
-	"unsafe"
-)
-
-// PunchHole deallocates space inside a file in the byte range starting at
-// offset and continuing for len bytes. Not supported on Windows.
-func PunchHole(f *os.File, off, len int64) error {
-	return puncher(f, off, len)
-}
-
-// Fadvise predeclares an access pattern for file data.  See also 'man 2
-// posix_fadvise'. Not supported on Windows.
-func Fadvise(f *os.File, off, len int64, advice FadviseAdvice) error {
-	return nil
-}
-
-// IsEOF reports whether err is an EOF condition.
-func IsEOF(err error) bool {
-	if err == io.EOF {
-		return true
-	}
-
-	// http://social.technet.microsoft.com/Forums/windowsserver/en-US/1a16311b-c625-46cf-830b-6a26af488435/how-to-solve-error-38-0x26-errorhandleeof-using-fsctlgetretrievalpointers
-	x, ok := err.(*os.PathError)
-	return ok && x.Op == "read" && x.Err.(syscall.Errno) == 0x26
-}
-
-var (
-	modkernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-	procDeviceIOControl = modkernel32.NewProc("DeviceIoControl")
-
-	sparseFilesMu sync.Mutex
-	sparseFiles   map[uintptr]struct{}
-)
-
-func init() {
-	// sparseFiles is an fd set for already "sparsed" files - according to
-	// msdn.microsoft.com/en-us/library/windows/desktop/aa364225(v=vs.85).aspx
-	// the file handles are unique per process.
-	sparseFiles = make(map[uintptr]struct{})
-}
-
-// puncHoleWindows punches a hole into the given file starting at offset,
-// measuring "size" bytes
-// (http://msdn.microsoft.com/en-us/library/windows/desktop/aa364597%28v=vs.85%29.aspx)
-func puncher(file *os.File, offset, size int64) error {
-	if err := ensureFileSparse(file); err != nil {
-		return err
-	}
-
-	// http://msdn.microsoft.com/en-us/library/windows/desktop/aa364411%28v=vs.85%29.aspx
-	// typedef struct _FILE_ZERO_DATA_INFORMATION {
-	//  LARGE_INTEGER FileOffset;
-	//  LARGE_INTEGER BeyondFinalZero;
-	//} FILE_ZERO_DATA_INFORMATION, *PFILE_ZERO_DATA_INFORMATION;
-	type fileZeroDataInformation struct {
-		FileOffset, BeyondFinalZero int64
-	}
-
-	lpInBuffer := fileZeroDataInformation{
-		FileOffset:      offset,
-		BeyondFinalZero: offset + size}
-	return deviceIOControl(false, file.Fd(), uintptr(unsafe.Pointer(&lpInBuffer)), 16)
-}
-
-// // http://msdn.microsoft.com/en-us/library/windows/desktop/cc948908%28v=vs.85%29.aspx
-// type fileSetSparseBuffer struct {
-//	 SetSparse bool
-// }
-
-func ensureFileSparse(file *os.File) (err error) {
-	fd := file.Fd()
-	sparseFilesMu.Lock()
-	if _, ok := sparseFiles[fd]; ok {
-		sparseFilesMu.Unlock()
-		return nil
-	}
-
-	if err = deviceIOControl(true, fd, 0, 0); err == nil {
-		sparseFiles[fd] = struct{}{}
-	}
-	sparseFilesMu.Unlock()
-	return err
-}
-
-func deviceIOControl(setSparse bool, fd, inBuf, inBufLen uintptr) (err error) {
-	const (
-		//http://source.winehq.org/source/include/winnt.h#L4605
-		file_read_data  = 1
-		file_write_data = 2
-
-		// METHOD_BUFFERED	0
-		method_buffered = 0
-		// FILE_ANY_ACCESS   0
-		file_any_access = 0
-		// FILE_DEVICE_FILE_SYSTEM   0x00000009
-		file_device_file_system = 0x00000009
-		// FILE_SPECIAL_ACCESS   (FILE_ANY_ACCESS)
-		file_special_access = file_any_access
-		file_read_access    = file_read_data
-		file_write_access   = file_write_data
-
-		// http://source.winehq.org/source/include/winioctl.h
-		// #define CTL_CODE 	(  	DeviceType,
-		//		Function,
-		//		Method,
-		//		Access  		 )
-		//    ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)
-
-		// FSCTL_SET_COMPRESSION   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA)
-		fsctl_set_compression = (file_device_file_system << 16) | ((file_read_access | file_write_access) << 14) | (16 << 2) | method_buffered
-		// FSCTL_SET_SPARSE   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
-		fsctl_set_sparse = (file_device_file_system << 16) | (file_special_access << 14) | (49 << 2) | method_buffered
-		// FSCTL_SET_ZERO_DATA   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA)
-		fsctl_set_zero_data = (file_device_file_system << 16) | (file_write_data << 14) | (50 << 2) | method_buffered
-	)
-	retPtr := uintptr(unsafe.Pointer(&(make([]byte, 8)[0])))
-	var r1 uintptr
-	var e1 syscall.Errno
-	if setSparse {
-		// BOOL
-		// WINAPI
-		// DeviceIoControl( (HANDLE) hDevice,                      // handle to a file
-		//                  FSCTL_SET_SPARSE,                      // dwIoControlCode
-		//                  (PFILE_SET_SPARSE_BUFFER) lpInBuffer,  // input buffer
-		//                  (DWORD) nInBufferSize,                 // size of input buffer
-		//                  NULL,                                  // lpOutBuffer
-		//                  0,                                     // nOutBufferSize
-		//                  (LPDWORD) lpBytesReturned,             // number of bytes returned
-		//                  (LPOVERLAPPED) lpOverlapped );         // OVERLAPPED structure
-		r1, _, e1 = syscall.Syscall9(procDeviceIOControl.Addr(), 8,
-			fd,
-			uintptr(fsctl_set_sparse),
-			// If the lpInBuffer parameter is NULL, the operation will behave the same as if the SetSparse member of the FILE_SET_SPARSE_BUFFER structure were TRUE. In other words, the operation sets the file to a sparse file.
-			0, // uintptr(unsafe.Pointer(&lpInBuffer)),
-			0, // 1,
-			0,
-			0,
-			retPtr,
-			0,
-			0)
-	} else {
-		// BOOL
-		// WINAPI
-		// DeviceIoControl( (HANDLE) hDevice,              // handle to a file
-		//                  FSCTL_SET_ZERO_DATA,           // dwIoControlCode
-		//                  (LPVOID) lpInBuffer,           // input buffer
-		//                  (DWORD) nInBufferSize,         // size of input buffer
-		//                  NULL,                          // lpOutBuffer
-		//                  0,                             // nOutBufferSize
-		//                  (LPDWORD) lpBytesReturned,     // number of bytes returned
-		//                  (LPOVERLAPPED) lpOverlapped ); // OVERLAPPED structure
-		r1, _, e1 = syscall.Syscall9(procDeviceIOControl.Addr(), 8,
-			fd,
-			uintptr(fsctl_set_zero_data),
-			inBuf,
-			inBufLen,
-			0,
-			0,
-			retPtr,
-			0,
-			0)
-	}
-	if r1 == 0 {
-		if e1 != 0 {
-			err = error(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/LICENSE b/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/LICENSE
deleted file mode 100644
index 1e92e33dd7..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of CZ.NIC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/README b/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/README
deleted file mode 100644
index 05ce89f92e..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a goinstall-able mirror of modified code already published at:
-https://git.nic.cz/redmine/projects/gofileutil/repository/show/hdb
-
-Install: $go get github.com/cznic/fileutil/hdb
-Godocs: http://gopkgdoc.appspot.com/pkg/github.com/cznic/fileutil/hdb
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/hdb.go b/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/hdb.go
deleted file mode 100644
index 7c7113d9d3..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/hdb.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-/*
-WIP: Package hdb provides a "handle"/value DB like store, but actually it's
-closer to the model of a process's virtual memory and its alloc, free and move
-methods.
-
-The hdb package is a thin layer around falloc.File providing stable-only
-handles and the basic synchronizing primitives.  The central functionality of
-hdb are the New, Set, Get and Delete methods of Store.
-
-Conceptual analogy:
-	New	    alloc(sizeof(content)), return new "memory" pointer (a handle).
-
-	Get	    memmove() from "memory" "pointed to" by handle to the result content.
-		    Note: Handle "knows" the size of its content.
-
-	Set	    memmove() from content to "memory" pointed to by handle.
-		    In contrast to real memory, the new content may have different
-		    size than the previously stored one w/o additional handling
-		    and the "pointer" handle remains the same.
-
-	Delete	    free() the "memory" "pointed to" by handle.
-*/
-package hdb
-
-import (
-	"github.com/cznic/fileutil/falloc"
-	"github.com/cznic/fileutil/storage"
-)
-
-type Store struct {
-	f *falloc.File
-}
-
-// New returns a newly created Store backed by accessor, discarding its conents if any.
-// If successful, methods on the returned Store can be used for I/O.
-// It returns the Store and an error, if any.
-func New(accessor storage.Accessor) (store *Store, err error) {
-	s := &Store{}
-	if s.f, err = falloc.New(accessor); err == nil {
-		store = s
-	}
-	return
-}
-
-// Open opens the Store from accessor.
-// If successful, methods on the returned Store can be used for data exchange.
-// It returns the Store and an error, if any.
-func Open(accessor storage.Accessor) (store *Store, err error) {
-	s := &Store{}
-	if s.f, err = falloc.Open(accessor); err == nil {
-		store = s
-	}
-	return
-}
-
-// Close closes the store. Further access to the store has undefined behavior and may panic.
-// It returns an error, if any.
-func (s *Store) Close() (err error) {
-	defer func() {
-		s.f = nil
-	}()
-
-	return s.f.Close()
-}
-
-// Delete deletes the data associated with handle.
-// It returns an error if any.
-func (s *Store) Delete(handle falloc.Handle) (err error) {
-	return s.f.Free(handle)
-}
-
-// Get gets the data associated with handle.
-// It returns the data and an error, if any.
-func (s *Store) Get(handle falloc.Handle) (b []byte, err error) {
-	return s.f.Read(handle)
-}
-
-// New associates data with a new handle.
-// It returns the handle and an error, if any.
-func (s *Store) New(b []byte) (handle falloc.Handle, err error) {
-	return s.f.Alloc(b)
-}
-
-// Set associates data with an existing handle.
-// It returns an error, if any.
-func (s *Store) Set(handle falloc.Handle, b []byte) (err error) {
-	_, err = s.f.Realloc(handle, b, true)
-	return
-}
-
-// Root returns the handle of the DB root (top level directory, ...).
-func (s *Store) Root() falloc.Handle {
-	return s.f.Root()
-}
-
-// File returns the underlying falloc.File of 's'.
-func (s *Store) File() *falloc.File {
-	return s.f
-}
-
-// Lock locks 's' for writing. If the lock is already locked for reading or writing,
-// Lock blocks until the lock is available. To ensure that the lock eventually becomes available,
-// a blocked Lock call excludes new readers from acquiring the lock.
-func (s *Store) Lock() {
-	s.f.Lock()
-}
-
-// RLock locks 's' for reading. If the lock is already locked for writing or there is a writer
-// already waiting to release the lock, RLock blocks until the writer has released the lock.
-func (s *Store) RLock() {
-	s.f.RLock()
-}
-
-// Unlock unlocks 's' for writing. It's a run-time error if 's' is not locked for writing on entry to Unlock.
-//
-// As with Mutexes, a locked RWMutex is not associated with a particular goroutine.
-// One goroutine may RLock (Lock) 's' and then arrange for another goroutine to RUnlock (Unlock) it.
-func (s *Store) Unlock() {
-	s.f.Unlock()
-}
-
-// RUnlock undoes a single RLock call; it does not affect other simultaneous readers.
-// It's a run-time error if 's' is not locked for reading on entry to RUnlock.
-func (s *Store) RUnlock() {
-	s.f.RUnlock()
-}
-
-// LockedNew wraps New in a Lock/Unlock pair.
-func (s *Store) LockedNew(b []byte) (handle falloc.Handle, err error) {
-	return s.f.LockedAlloc(b)
-}
-
-// LockedDelete wraps Delete in a Lock/Unlock pair.
-func (s *Store) LockedDelete(handle falloc.Handle) (err error) {
-	return s.f.LockedFree(handle)
-}
-
-// LockedGet wraps Get in a RLock/RUnlock pair.
-func (s *Store) LockedGet(handle falloc.Handle) (b []byte, err error) {
-	return s.f.LockedRead(handle)
-}
-
-// LockedSet wraps Set in a Lock/Unlock pair.
-func (s *Store) LockedSet(handle falloc.Handle, b []byte) (err error) {
-	_, err = s.f.Realloc(handle, b, true)
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/test_deps.go b/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/test_deps.go
deleted file mode 100644
index 3164f63ae1..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/test_deps.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-package hdb
-
-// Pull test dependencies too.
-// Enables easy 'go test X' after 'go get X'
-import (
-// nothing yet
-)
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/LICENSE b/Godeps/_workspace/src/github.com/cznic/fileutil/storage/LICENSE
deleted file mode 100644
index 1e92e33dd7..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of CZ.NIC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/README b/Godeps/_workspace/src/github.com/cznic/fileutil/storage/README
deleted file mode 100644
index 2a400fced6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a goinstall-able mirror of modified code already published at:
-https://git.nic.cz/redmine/projects/gofileutil/repository/show/storage
-
-Install: $go get github.com/cznic/fileutil/storage
-Godocs: http://gopkgdoc.appspot.com/pkg/github.com/cznic/fileutil/storage
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/cache.go b/Godeps/_workspace/src/github.com/cznic/fileutil/storage/cache.go
deleted file mode 100644
index 3a6115a71a..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/cache.go
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-package storage
-
-import (
-	"container/list"
-	"io"
-	"math"
-	"os"
-	"sync"
-	"sync/atomic"
-)
-
-type cachepage struct {
-	b     [512]byte
-	dirty bool
-	lru   *list.Element
-	pi    int64
-	valid int // page content is b[:valid]
-}
-
-func (p *cachepage) wr(b []byte, off int) (wasDirty bool) {
-	copy(p.b[off:], b)
-	if n := off + len(b); n > p.valid {
-		p.valid = n
-	}
-	wasDirty = p.dirty
-	p.dirty = true
-	return
-}
-
-func (c *Cache) rd(off int64, read bool) (p *cachepage, ok bool) {
-	c.Rq++
-	pi := off >> 9
-	if p, ok = c.m[pi]; ok {
-		c.lru.MoveToBack(p.lru)
-		return
-	}
-
-	if !read {
-		return
-	}
-
-	fp := off &^ 511
-	if fp >= c.size {
-		return
-	}
-
-	rq := 512
-	if fp+512 > c.size {
-		rq = int(c.size - fp)
-	}
-	p = &cachepage{pi: pi, valid: rq}
-	p.lru = c.lru.PushBack(p)
-	if n, err := c.f.ReadAt(p.b[:p.valid], fp); n != rq {
-		panic(err)
-	}
-
-	c.Load++
-	if c.advise != nil {
-		c.advise(fp, 512, false)
-	}
-	c.m[pi], ok = p, true
-	return
-}
-
-func (c *Cache) wr(off int64) (p *cachepage) {
-	var ok bool
-	if p, ok = c.rd(off, false); ok {
-		return
-	}
-
-	pi := off >> 9
-	p = &cachepage{pi: pi}
-	p.lru = c.lru.PushBack(p)
-	c.m[pi] = p
-	return
-}
-
-// Cache provides caching support for another store Accessor.
-type Cache struct {
-	advise   func(int64, int, bool)
-	clean    chan bool
-	cleaning int32
-	close    chan bool
-	f        Accessor
-	fi       *FileInfo
-	lock     sync.Mutex
-	lru      *list.List
-	m        map[int64]*cachepage
-	maxpages int
-	size     int64
-	sync     chan bool
-	wlist    *list.List
-	write    chan bool
-	writing  int32
-	Rq       int64 // Pages requested from cache
-	Load     int64 // Pages loaded (cache miss)
-	Purge    int64 // Pages purged
-	Top      int   // "High water" pages
-}
-
-// Implementation of Accessor.
-func (c *Cache) BeginUpdate() error { return nil }
-
-// Implementation of Accessor.
-func (c *Cache) EndUpdate() error { return nil }
-
-// NewCache creates a caching Accessor from store with total of maxcache bytes.
-// NewCache returns the new Cache, implementing Accessor or an error if any.
-//
-// The LRU mechanism is used, so the cache tries to keep often accessed pages cached.
-//
-func NewCache(store Accessor, maxcache int64, advise func(int64, int, bool)) (c *Cache, err error) {
-	var fi os.FileInfo
-	if fi, err = store.Stat(); err != nil {
-		return
-	}
-
-	x := maxcache >> 9
-	if x > math.MaxInt32/2 {
-		x = math.MaxInt32 / 2
-	}
-	c = &Cache{
-		advise:   advise,
-		clean:    make(chan bool, 1),
-		close:    make(chan bool),
-		f:        store,
-		lru:      list.New(), // front == oldest used, back == last recently used
-		m:        make(map[int64]*cachepage),
-		maxpages: int(x),
-		size:     fi.Size(),
-		sync:     make(chan bool),
-		wlist:    list.New(),
-		write:    make(chan bool, 1),
-	}
-	c.fi = NewFileInfo(fi, c)
-	go c.writer()
-	go c.cleaner(int((int64(c.maxpages) * 95) / 100)) // hysteresis
-	return
-}
-
-func (c *Cache) Accessor() Accessor {
-	return c.f
-}
-
-func (c *Cache) Close() (err error) {
-	close(c.write)
-	<-c.close
-	close(c.clean)
-	<-c.close
-	return c.f.Close()
-}
-
-func (c *Cache) Name() (s string) {
-	return c.f.Name()
-}
-
-func (c *Cache) ReadAt(b []byte, off int64) (n int, err error) {
-	po := int(off) & 0x1ff
-	bp := 0
-	rem := len(b)
-	m := 0
-	for rem != 0 {
-		c.lock.Lock() // X1+
-		p, ok := c.rd(off, true)
-		if !ok {
-			c.lock.Unlock() // X1-
-			return -1, io.EOF
-		}
-
-		rq := rem
-		if po+rq > 512 {
-			rq = 512 - po
-		}
-		if n := copy(b[bp:bp+rq], p.b[po:p.valid]); n != rq {
-			c.lock.Unlock() // X1-
-			return -1, io.EOF
-		}
-
-		m = len(c.m)
-		c.lock.Unlock() // X1-
-		po = 0
-		bp += rq
-		off += int64(rq)
-		rem -= rq
-		n += rq
-	}
-	if m > c.maxpages && atomic.CompareAndSwapInt32(&c.cleaning, 0, 1) {
-		if m > c.Top {
-			c.Top = m
-		}
-		c.clean <- true
-	}
-	return
-}
-
-func (c *Cache) Stat() (fi os.FileInfo, err error) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	return c.fi, nil
-}
-
-func (c *Cache) Sync() (err error) {
-	c.write <- false
-	<-c.sync
-	return
-}
-
-func (c *Cache) Truncate(size int64) (err error) {
-	c.Sync() //TODO improve (discard pages, the writer goroutine should also be aware, ...)
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	c.size = size
-	return c.f.Truncate(size)
-}
-
-func (c *Cache) WriteAt(b []byte, off int64) (n int, err error) {
-	po := int(off) & 0x1ff
-	bp := 0
-	rem := len(b)
-	m := 0
-	for rem != 0 {
-		c.lock.Lock() // X+
-		p := c.wr(off)
-		rq := rem
-		if po+rq > 512 {
-			rq = 512 - po
-		}
-		if wasDirty := p.wr(b[bp:bp+rq], po); !wasDirty {
-			c.wlist.PushBack(p)
-		}
-		m = len(c.m)
-		po = 0
-		bp += rq
-		off += int64(rq)
-		if off > c.size {
-			c.size = off
-		}
-		c.lock.Unlock() // X-
-		rem -= rq
-		n += rq
-	}
-	if atomic.CompareAndSwapInt32(&c.writing, 0, 1) {
-		c.write <- true
-	}
-	if m > c.maxpages && atomic.CompareAndSwapInt32(&c.cleaning, 0, 1) {
-		if m > c.Top {
-			c.Top = m
-		}
-		c.clean <- true
-	}
-	return
-}
-
-func (c *Cache) writer() {
-	for ok := true; ok; {
-		var wr bool
-		var off int64
-		wr, ok = <-c.write
-		for {
-			c.lock.Lock() // X1+
-			item := c.wlist.Front()
-			if item == nil {
-				c.lock.Unlock() // X1-
-				break
-			}
-
-			p := item.Value.(*cachepage)
-			off = p.pi << 9
-			if n, err := c.f.WriteAt(p.b[:p.valid], off); n != p.valid {
-				c.lock.Unlock()                    // X1-
-				panic("TODO Cache.writer errchan") //TODO +errchan
-				panic(err)
-			}
-
-			p.dirty = false
-			c.wlist.Remove(item)
-			if c.advise != nil {
-				c.advise(off, 512, true)
-			}
-			c.lock.Unlock() // X1-
-		}
-		switch {
-		case wr:
-			atomic.AddInt32(&c.writing, -1)
-		case ok:
-			c.sync <- true
-		}
-	}
-	c.close <- true
-}
-
-func (c *Cache) cleaner(limit int) {
-	for _ = range c.clean {
-		var item *list.Element
-		for {
-			c.lock.Lock() // X1+
-			if len(c.m) < limit {
-				c.lock.Unlock() // X1-
-				break
-			}
-
-			if item == nil {
-				item = c.lru.Front()
-			}
-			if p := item.Value.(*cachepage); !p.dirty {
-				delete(c.m, p.pi)
-				c.lru.Remove(item)
-				c.Purge++
-			}
-			item = item.Next()
-			c.lock.Unlock() // X1-
-		}
-		atomic.AddInt32(&c.cleaning, -1)
-	}
-	c.close <- true
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/file.go b/Godeps/_workspace/src/github.com/cznic/fileutil/storage/file.go
deleted file mode 100644
index 94feda5efb..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/file.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-package storage
-
-import (
-	"os"
-)
-
-// FileAccessor is the concrete type returned by NewFile and OpenFile.
-type FileAccessor struct {
-	*os.File
-}
-
-// Implementation of Accessor.
-func (f *FileAccessor) BeginUpdate() error { return nil }
-
-// Implementation of Accessor.
-func (f *FileAccessor) EndUpdate() error { return nil }
-
-// NewFile returns an Accessor backed by an os.File named name, It opens the
-// named file with specified flag (os.O_RDWR etc.) and perm, (0666 etc.) if
-// applicable.  If successful, methods on the returned Accessor can be used for
-// I/O.  It returns the Accessor and an Error, if any.
-//
-// NOTE: The returned Accessor implements BeginUpdate and EndUpdate as a no op.
-func NewFile(name string, flag int, perm os.FileMode) (store Accessor, err error) {
-	var f FileAccessor
-	if f.File, err = os.OpenFile(name, flag, perm); err == nil {
-		store = &f
-	}
-	return
-}
-
-// OpenFile returns an Accessor backed by an existing os.File named name, It
-// opens the named file with specified flag (os.O_RDWR etc.) and perm, (0666
-// etc.) if applicable.  If successful, methods on the returned Accessor can be
-// used for I/O.  It returns the Accessor and an Error, if any.
-//
-// NOTE: The returned Accessor implements BeginUpdate and EndUpdate as a no op.
-func OpenFile(name string, flag int, perm os.FileMode) (store Accessor, err error) {
-	var f FileAccessor
-	if f.File, err = os.OpenFile(name, flag, perm); err == nil {
-		store = &f
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/mem.go b/Godeps/_workspace/src/github.com/cznic/fileutil/storage/mem.go
deleted file mode 100644
index 7cda0b667e..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/mem.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-package storage
-
-import (
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"math"
-	"os"
-)
-
-//TODO -> exported type w/ exported fields
-type memaccessor struct {
-	f  *os.File
-	fi *FileInfo
-	b  []byte
-}
-
-// Implementation of Accessor.
-func (m *memaccessor) BeginUpdate() error { return nil }
-
-// Implementation of Accessor.
-func (f *memaccessor) EndUpdate() error { return nil }
-
-// NewMem returns a new Accessor backed by an os.File.  The returned Accessor
-// keeps all of the store content in memory.  The memory and file images are
-// synced only by Sync and Close.  Recomended for small amounts of data only
-// and content which may be lost on process kill/crash.  NewMem return the
-// Accessor or an error of any.
-//
-// NOTE: The returned Accessor implements BeginUpdate and EndUpdate as a no op.
-func NewMem(f *os.File) (store Accessor, err error) {
-	a := &memaccessor{f: f}
-	if err = f.Truncate(0); err != nil {
-		return
-	}
-
-	var fi os.FileInfo
-	if fi, err = a.f.Stat(); err != nil {
-		return
-	}
-
-	a.fi = NewFileInfo(fi, a)
-	store = a
-	return
-}
-
-// OpenMem return a new Accessor backed by an os.File.  The store content is
-// loaded from f.  The returned Accessor keeps all of the store content in
-// memory.  The memory and file images are synced only Sync and Close.
-// Recomended for small amounts of data only and content which may be lost on
-// process kill/crash.  OpenMem return the Accessor or an error of any.
-//
-// NOTE: The returned Accessor implements BeginUpdate and EndUpdate as a no op.
-func OpenMem(f *os.File) (store Accessor, err error) {
-	a := &memaccessor{f: f}
-	if a.b, err = ioutil.ReadAll(a.f); err != nil {
-		a.f.Close()
-		return
-	}
-
-	var fi os.FileInfo
-	if fi, err = a.f.Stat(); err != nil {
-		a.f.Close()
-		return
-	}
-
-	a.fi = NewFileInfo(fi, a)
-	store = a
-	return
-}
-
-// Close implements Accessor. Specifically it synchronizes the memory and file images.
-func (a *memaccessor) Close() (err error) {
-	defer func() {
-		a.b = nil
-		if a.f != nil {
-			if e := a.f.Close(); e != nil && err == nil {
-				err = e
-			}
-		}
-		a.f = nil
-	}()
-
-	return a.Sync()
-}
-
-func (a *memaccessor) Name() string {
-	return a.f.Name()
-}
-
-func (a *memaccessor) ReadAt(b []byte, off int64) (n int, err error) {
-	if off < 0 || off > math.MaxInt32 {
-		return -1, fmt.Errorf("ReadAt: illegal offset %#x", off)
-	}
-
-	rq, fp := len(b), int(off)
-	if fp+rq > len(a.b) {
-		return -1, fmt.Errorf("ReadAt: illegal rq %#x @ offset %#x, len %#x", rq, fp, len(a.b))
-	}
-
-	copy(b, a.b[fp:])
-	return
-}
-
-func (a *memaccessor) Stat() (fi os.FileInfo, err error) {
-	i := a.fi
-	i.FSize = int64(len(a.b))
-	fi = i
-	return
-}
-
-// Sync implements Accessor. Specifically it synchronizes the memory and file images.
-func (a *memaccessor) Sync() (err error) {
-	var n int
-	if n, err = a.f.WriteAt(a.b, 0); n != len(a.b) {
-		return
-	}
-
-	return a.f.Truncate(int64(len(a.b)))
-}
-
-func (a *memaccessor) Truncate(size int64) (err error) {
-	defer func() {
-		if e := recover(); e != nil {
-			err = e.(error)
-		}
-	}()
-
-	if size > math.MaxInt32 {
-		panic(errors.New("truncate: illegal size"))
-	}
-
-	a.b = a.b[:int(size)]
-	return
-}
-
-func (a *memaccessor) WriteAt(b []byte, off int64) (n int, err error) {
-	if off < 0 || off > math.MaxInt32 {
-		return -1, errors.New("WriteAt: illegal offset")
-	}
-
-	rq, fp, size := len(b), int(off), len(a.b)
-	if need := rq + fp; need > size {
-		if need <= cap(a.b) {
-			a.b = a.b[:need]
-		} else {
-			nb := make([]byte, need, 2*need)
-			copy(nb, a.b)
-			a.b = nb
-		}
-	}
-
-	copy(a.b[int(off):], b)
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/probe.go b/Godeps/_workspace/src/github.com/cznic/fileutil/storage/probe.go
deleted file mode 100644
index 53b146a6eb..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/probe.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-package storage
-
-import "sync/atomic"
-
-// Probe collects usage statistics of the embeded Accessor.
-// Probe itself IS an Accessor.
-type Probe struct {
-	Accessor
-	Chain     *Probe
-	OpsRd     int64
-	OpsWr     int64
-	BytesRd   int64
-	BytesWr   int64
-	SectorsRd int64 // Assuming 512 byte sector size
-	SectorsWr int64
-}
-
-// NewProbe returns a newly created probe which embedes the src Accessor.
-// The retuned *Probe satisfies Accessor. if chain != nil then Reset()
-// is cascaded down the chained Probes.
-func NewProbe(src Accessor, chain *Probe) *Probe {
-	return &Probe{Accessor: src, Chain: chain}
-}
-
-func reset(n *int64) {
-	atomic.AddInt64(n, -atomic.AddInt64(n, 0))
-}
-
-// Reset zeroes the collected statistics of p.
-func (p *Probe) Reset() {
-	if p.Chain != nil {
-		p.Chain.Reset()
-	}
-	reset(&p.OpsRd)
-	reset(&p.OpsWr)
-	reset(&p.BytesRd)
-	reset(&p.BytesWr)
-	reset(&p.SectorsRd)
-	reset(&p.SectorsWr)
-}
-
-func (p *Probe) ReadAt(b []byte, off int64) (n int, err error) {
-	n, err = p.Accessor.ReadAt(b, off)
-	atomic.AddInt64(&p.OpsRd, 1)
-	atomic.AddInt64(&p.BytesRd, int64(n))
-	if n <= 0 {
-		return
-	}
-
-	sectorFirst := off >> 9
-	sectorLast := (off + int64(n) - 1) >> 9
-	atomic.AddInt64(&p.SectorsRd, sectorLast-sectorFirst+1)
-	return
-}
-
-func (p *Probe) WriteAt(b []byte, off int64) (n int, err error) {
-	n, err = p.Accessor.WriteAt(b, off)
-	atomic.AddInt64(&p.OpsWr, 1)
-	atomic.AddInt64(&p.BytesWr, int64(n))
-	if n <= 0 {
-		return
-	}
-
-	sectorFirst := off >> 9
-	sectorLast := (off + int64(n) - 1) >> 9
-	atomic.AddInt64(&p.SectorsWr, sectorLast-sectorFirst+1)
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/storage.go b/Godeps/_workspace/src/github.com/cznic/fileutil/storage/storage.go
deleted file mode 100644
index 4956053a0c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/storage.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-// WIP: Package storage defines and implements storage providers and store accessors.
-package storage
-
-import (
-	"os"
-	"sync"
-	"time"
-)
-
-// FileInfo is a type implementing os.FileInfo which has setable fields, like
-// the older os.FileInfo used to have. It is used wehere e.g. the Size is
-// needed to be faked (encapsulated/memory only file, file cache, etc.).
-type FileInfo struct {
-	FName    string      // base name of the file
-	FSize    int64       // length in bytes
-	FMode    os.FileMode // file mode bits
-	FModTime time.Time   // modification time
-	FIsDir   bool        // abbreviation for Mode().IsDir()
-	sys      interface{} // underlying data source (can be nil)
-}
-
-// NewFileInfo creates FileInfo from os.FileInfo fi.
-func NewFileInfo(fi os.FileInfo, sys interface{}) *FileInfo {
-	return &FileInfo{fi.Name(), fi.Size(), fi.Mode(), fi.ModTime(), fi.IsDir(), sys}
-}
-
-// Implementation of os.FileInfo
-func (fi *FileInfo) Name() string {
-	return fi.FName
-}
-
-// Implementation of os.FileInfo
-func (fi *FileInfo) Size() int64 {
-	return fi.FSize
-}
-
-// Implementation of os.FileInfo
-func (fi *FileInfo) Mode() os.FileMode {
-	return fi.FMode
-}
-
-// Implementation of os.FileInfo
-func (fi *FileInfo) ModTime() time.Time {
-	return fi.FModTime
-}
-
-// Implementation of os.FileInfo
-func (fi *FileInfo) IsDir() bool {
-	return fi.FIsDir
-}
-
-func (fi *FileInfo) Sys() interface{} {
-	return fi.sys
-}
-
-// Accessor provides I/O methods to access a store.
-type Accessor interface {
-
-	// Close closes the store, rendering it unusable for I/O. It returns an
-	// error, if any.
-	Close() error
-
-	// Name returns the name of the file as presented to Open.
-	Name() string
-
-	// ReadAt reads len(b) bytes from the store starting at byte offset off.
-	// It returns the number of bytes read and the error, if any.
-	// EOF is signaled by a zero count with err set to os.EOF.
-	// ReadAt always returns a non-nil Error when n != len(b).
-	ReadAt(b []byte, off int64) (n int, err error)
-
-	// Stat returns the FileInfo structure describing the store. It returns
-	// the os.FileInfo and an error, if any.
-	Stat() (fi os.FileInfo, err error)
-
-	// Sync commits the current contents of the store to stable storage.
-	// Typically, this means flushing the file system's in-memory copy of
-	// recently written data to disk.
-	Sync() (err error)
-
-	// Truncate changes the size of the store. It does not change the I/O
-	// offset.
-	Truncate(size int64) error
-
-	// WriteAt writes len(b) bytes to the store starting at byte offset off.
-	// It returns the number of bytes written and an error, if any.
-	// WriteAt returns a non-nil Error when n != len(b).
-	WriteAt(b []byte, off int64) (n int, err error)
-
-	// Before every [structural] change of a store the BeginUpdate is to be
-	// called and paired with EndUpdate after the change makes the store's
-	// state consistent again. Invocations of BeginUpdate may nest. On
-	// invoking the last non nested EndUpdate an implicit "commit" should
-	// be performed by the store/provider. The concrete mechanism is
-	// unspecified. It could be for example a write-ahead log.  Stores may
-	// implement BeginUpdate and EndUpdate as a (documented) no op.
-	BeginUpdate() error
-	EndUpdate() error
-}
-
-// Mutate is a helper/wrapper for executing f in between a.BeginUpdate and
-// a.EndUpdate.  Any parameters and/or return values except an error should be
-// captured by a function literal passed as f. The returned err is either nil
-// or the first non nil error returned from the sequence of execution:
-// BeginUpdate, [f,] EndUpdate. The pair BeginUpdate/EndUpdate *is* invoked
-// always regardles of any possible errors produced.  Mutate doesn't handle
-// panic, it should be used only with a function [literal] which doesn't panic.
-// Otherwise the pairing of BeginUpdate/EndUpdate is not guaranteed.
-//
-// NOTE: If BeginUpdate, which is invoked before f, returns a non-nil error,
-// then f is not invoked at all (but EndUpdate still is).
-func Mutate(a Accessor, f func() error) (err error) {
-	defer func() {
-		if e := a.EndUpdate(); e != nil && err == nil {
-			err = e
-		}
-	}()
-
-	if err = a.BeginUpdate(); err != nil {
-		return
-	}
-
-	return f()
-}
-
-// LockedMutate wraps Mutate in yet another layer consisting of a
-// l.Lock/l.Unlock pair. All other limitations apply as in Mutate, e.g. no
-// panics are allowed to happen - otherwise no guarantees can be made about
-// Unlock matching the Lock.
-func LockedMutate(a Accessor, l sync.Locker, f func() error) (err error) {
-	l.Lock()
-	defer l.Unlock()
-
-	return Mutate(a, f)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/test_deps.go b/Godeps/_workspace/src/github.com/cznic/fileutil/storage/test_deps.go
deleted file mode 100644
index 92ac44a5bf..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/storage/test_deps.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-package storage
-
-// Pull test dependencies too.
-// Enables easy 'go test X' after 'go get X'
-import (
-// nothing yet
-)
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/test_deps.go b/Godeps/_workspace/src/github.com/cznic/fileutil/test_deps.go
deleted file mode 100644
index eec608ab3a..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/test_deps.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2014 The fileutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-package fileutil
-
-// Pull test dependencies too.
-// Enables easy 'go test X' after 'go get X'
-import (
-// nothing yet
-)
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/AUTHORS b/Godeps/_workspace/src/github.com/cznic/mathutil/AUTHORS
deleted file mode 100644
index d04c450118..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/AUTHORS
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-CZ.NIC z.s.p.o. <kontakt@nic.cz>
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/mathutil/CONTRIBUTORS
deleted file mode 100644
index 9c9a5dd84c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/CONTRIBUTORS
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Gary Burd <gary@beagledreams.com>
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/LICENSE b/Godeps/_workspace/src/github.com/cznic/mathutil/LICENSE
deleted file mode 100644
index 128a1b64a4..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The mathutil Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/Makefile b/Godeps/_workspace/src/github.com/cznic/mathutil/Makefile
deleted file mode 100644
index b99ba9adf2..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2014 The mathutil Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-.PHONY: all todo clean nuke
-
-grep=--include=*.go --include=*.run --include=*.y
-
-all: editor
-	go build
-	go vet || true
-	golint .
-	go install
-	make todo
-
-clean:
-	go clean
-
-editor:
-	go fmt
-	go test -i
-	go test
-
-todo:
-	@grep -nr $(grep) ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* * || true
-	@grep -nr $(grep) TODO * || true
-	@grep -nr $(grep) BUG * || true
-	@grep -nr $(grep) println * || true
-
-nuke: clean
-	go clean -i
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/README b/Godeps/_workspace/src/github.com/cznic/mathutil/README
deleted file mode 100644
index a9ee59c401..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This is a goinstall-able mirror of modified code already published at:
-http://git.nic.cz/redmine/projects/gornd/repository
-
-Packages in this repository:
-
-Install: $ go get github.com/cznic/mathutil
-Godocs:  http://godoc.org/github.com/cznic/mathutil
-
-Install: $ go get github.com/cznic/mathutil/mersenne
-Godocs:  http://godoc.org/github.com/cznic/mathutil/mersenne
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/bits.go b/Godeps/_workspace/src/github.com/cznic/mathutil/bits.go
deleted file mode 100644
index 6eaa4e3054..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/bits.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright (c) 2014 The mathutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mathutil
-
-import (
-	"math/big"
-)
-
-// BitLenByte returns the bit width of the non zero part of n.
-func BitLenByte(n byte) int {
-	return log2[n] + 1
-}
-
-// BitLenUint16 returns the bit width of the non zero part of n.
-func BitLenUint16(n uint16) int {
-	if b := n >> 8; b != 0 {
-		return log2[b] + 8 + 1
-	}
-
-	return log2[n] + 1
-}
-
-// BitLenUint32 returns the bit width of the non zero part of n.
-func BitLenUint32(n uint32) int {
-	if b := n >> 24; b != 0 {
-		return log2[b] + 24 + 1
-	}
-
-	if b := n >> 16; b != 0 {
-		return log2[b] + 16 + 1
-	}
-
-	if b := n >> 8; b != 0 {
-		return log2[b] + 8 + 1
-	}
-
-	return log2[n] + 1
-}
-
-// BitLen returns the bit width of the non zero part of n.
-func BitLen(n int) int { // Should handle correctly [future] 64 bit Go ints
-	if IntBits == 64 {
-		return BitLenUint64(uint64(n))
-	}
-
-	if b := byte(n >> 24); b != 0 {
-		return log2[b] + 24 + 1
-	}
-
-	if b := byte(n >> 16); b != 0 {
-		return log2[b] + 16 + 1
-	}
-
-	if b := byte(n >> 8); b != 0 {
-		return log2[b] + 8 + 1
-	}
-
-	return log2[byte(n)] + 1
-}
-
-// BitLenUint returns the bit width of the non zero part of n.
-func BitLenUint(n uint) int { // Should handle correctly [future] 64 bit Go uints
-	if IntBits == 64 {
-		return BitLenUint64(uint64(n))
-	}
-
-	if b := n >> 24; b != 0 {
-		return log2[b] + 24 + 1
-	}
-
-	if b := n >> 16; b != 0 {
-		return log2[b] + 16 + 1
-	}
-
-	if b := n >> 8; b != 0 {
-		return log2[b] + 8 + 1
-	}
-
-	return log2[n] + 1
-}
-
-// BitLenUint64 returns the bit width of the non zero part of n.
-func BitLenUint64(n uint64) int {
-	if b := n >> 56; b != 0 {
-		return log2[b] + 56 + 1
-	}
-
-	if b := n >> 48; b != 0 {
-		return log2[b] + 48 + 1
-	}
-
-	if b := n >> 40; b != 0 {
-		return log2[b] + 40 + 1
-	}
-
-	if b := n >> 32; b != 0 {
-		return log2[b] + 32 + 1
-	}
-
-	if b := n >> 24; b != 0 {
-		return log2[b] + 24 + 1
-	}
-
-	if b := n >> 16; b != 0 {
-		return log2[b] + 16 + 1
-	}
-
-	if b := n >> 8; b != 0 {
-		return log2[b] + 8 + 1
-	}
-
-	return log2[n] + 1
-}
-
-// BitLenUintptr returns the bit width of the non zero part of n.
-func BitLenUintptr(n uintptr) int {
-	if b := n >> 56; b != 0 {
-		return log2[b] + 56 + 1
-	}
-
-	if b := n >> 48; b != 0 {
-		return log2[b] + 48 + 1
-	}
-
-	if b := n >> 40; b != 0 {
-		return log2[b] + 40 + 1
-	}
-
-	if b := n >> 32; b != 0 {
-		return log2[b] + 32 + 1
-	}
-
-	if b := n >> 24; b != 0 {
-		return log2[b] + 24 + 1
-	}
-
-	if b := n >> 16; b != 0 {
-		return log2[b] + 16 + 1
-	}
-
-	if b := n >> 8; b != 0 {
-		return log2[b] + 8 + 1
-	}
-
-	return log2[n] + 1
-}
-
-// PopCountByte returns population count of n (number of bits set in n).
-func PopCountByte(n byte) int {
-	return int(popcnt[byte(n)])
-}
-
-// PopCountUint16 returns population count of n (number of bits set in n).
-func PopCountUint16(n uint16) int {
-	return int(popcnt[byte(n>>8)]) + int(popcnt[byte(n)])
-}
-
-// PopCountUint32 returns population count of n (number of bits set in n).
-func PopCountUint32(n uint32) int {
-	return int(popcnt[byte(n>>24)]) + int(popcnt[byte(n>>16)]) +
-		int(popcnt[byte(n>>8)]) + int(popcnt[byte(n)])
-}
-
-// PopCount returns population count of n (number of bits set in n).
-func PopCount(n int) int { // Should handle correctly [future] 64 bit Go ints
-	if IntBits == 64 {
-		return PopCountUint64(uint64(n))
-	}
-
-	return PopCountUint32(uint32(n))
-}
-
-// PopCountUint returns population count of n (number of bits set in n).
-func PopCountUint(n uint) int { // Should handle correctly [future] 64 bit Go uints
-	if IntBits == 64 {
-		return PopCountUint64(uint64(n))
-	}
-
-	return PopCountUint32(uint32(n))
-}
-
-// PopCountUintptr returns population count of n (number of bits set in n).
-func PopCountUintptr(n uintptr) int {
-	if UintPtrBits == 64 {
-		return PopCountUint64(uint64(n))
-	}
-
-	return PopCountUint32(uint32(n))
-}
-
-// PopCountUint64 returns population count of n (number of bits set in n).
-func PopCountUint64(n uint64) int {
-	return int(popcnt[byte(n>>56)]) + int(popcnt[byte(n>>48)]) +
-		int(popcnt[byte(n>>40)]) + int(popcnt[byte(n>>32)]) +
-		int(popcnt[byte(n>>24)]) + int(popcnt[byte(n>>16)]) +
-		int(popcnt[byte(n>>8)]) + int(popcnt[byte(n)])
-}
-
-// PopCountBigInt returns population count of |n| (number of bits set in |n|).
-func PopCountBigInt(n *big.Int) (r int) {
-	for _, v := range n.Bits() {
-		r += PopCountUintptr(uintptr(v))
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/envelope.go b/Godeps/_workspace/src/github.com/cznic/mathutil/envelope.go
deleted file mode 100644
index ff8e6012a6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/envelope.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2014 The mathutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mathutil
-
-import (
-	"math"
-)
-
-// Approximation type determines approximation methods used by e.g. Envelope.
-type Approximation int
-
-// Specific approximation method tags
-const (
-	_          Approximation = iota
-	Linear                   // As named
-	Sinusoidal               // Smooth for all derivations
-)
-
-// Envelope is an utility for defining simple curves using a small (usually)
-// set of data points.  Envelope returns a value defined by x, points and
-// approximation.  The value of x must be in [0,1) otherwise the result is
-// undefined or the function may panic. Points are interpreted as dividing the
-// [0,1) interval in len(points)-1 sections, so len(points) must be > 1 or the
-// function may panic. According to the left and right points closing/adjacent
-// to the section the resulting value is interpolated using the chosen
-// approximation method.  Unsupported values of approximation are silently
-// interpreted as 'Linear'.
-func Envelope(x float64, points []float64, approximation Approximation) float64 {
-	step := 1 / float64(len(points)-1)
-	fslot := math.Floor(x / step)
-	mod := x - fslot*step
-	slot := int(fslot)
-	l, r := points[slot], points[slot+1]
-	rmod := mod / step
-	switch approximation {
-	case Sinusoidal:
-		k := (math.Sin(math.Pi*(rmod-0.5)) + 1) / 2
-		return l + (r-l)*k
-	case Linear:
-		fallthrough
-	default:
-		return l + (r-l)*rmod
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example/.gitignore b/Godeps/_workspace/src/github.com/cznic/mathutil/example/.gitignore
deleted file mode 100644
index ae251f36fc..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-example
-Makefile
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example/example.go b/Godeps/_workspace/src/github.com/cznic/mathutil/example/example.go
deleted file mode 100644
index 30a2d11580..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example/example.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-// +build ignore
-
-package main
-
-import (
-	"bufio"
-	"flag"
-	"github.com/cznic/mathutil"
-	"log"
-	"math"
-	"os"
-)
-
-/*
-
-$ # Usage e.g.:
-$ go run example.go -max 1024 > mathutil.dat # generate 1kB of "random" data
-
-*/
-func main() {
-	r, err := mathutil.NewFC32(math.MinInt32, math.MaxInt32, true)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	var mflag uint64
-	flag.Uint64Var(&mflag, "max", 0, "limit output to max bytes")
-	flag.Parse()
-	stdout := bufio.NewWriter(os.Stdout)
-	if mflag != 0 {
-		for i := uint64(0); i < mflag; i++ {
-			if err := stdout.WriteByte(byte(r.Next())); err != nil {
-				log.Fatal(err)
-			}
-		}
-		stdout.Flush()
-		return
-	}
-
-	for stdout.WriteByte(byte(r.Next())) == nil {
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example2/.gitignore b/Godeps/_workspace/src/github.com/cznic/mathutil/example2/.gitignore
deleted file mode 100644
index 85c399941f..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-example2
-Makefile
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example2/example2.go b/Godeps/_workspace/src/github.com/cznic/mathutil/example2/example2.go
deleted file mode 100644
index 409aeef3e2..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example2/example2.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-// +build ignore
-
-package main
-
-import (
-	"bytes"
-	"github.com/cznic/mathutil"
-	"image"
-	"image/png"
-	"io/ioutil"
-	"log"
-	"math"
-	"math/rand"
-)
-
-// $ go run example2.go # view rand.png and rnd.png by your favorite pic viewer
-//
-// see http://www.boallen.com/random-numbers.html
-func main() {
-	sqr := image.Rect(0, 0, 511, 511)
-	r, err := mathutil.NewFC32(math.MinInt32, math.MaxInt32, true)
-	if err != nil {
-		log.Fatal("NewFC32", err)
-	}
-
-	img := image.NewGray(sqr)
-	for y := 0; y < 512; y++ {
-		for x := 0; x < 512; x++ {
-			if r.Next()&1 != 0 {
-				img.Set(x, y, image.White)
-			}
-		}
-	}
-	buf := bytes.NewBuffer(nil)
-	if err := png.Encode(buf, img); err != nil {
-		log.Fatal("Encode rnd.png ", err)
-	}
-
-	if err := ioutil.WriteFile("rnd.png", buf.Bytes(), 0666); err != nil {
-		log.Fatal("ioutil.WriteFile/rnd.png ", err)
-	}
-
-	r2 := rand.New(rand.NewSource(0))
-	img = image.NewGray(sqr)
-	for y := 0; y < 512; y++ {
-		for x := 0; x < 512; x++ {
-			if r2.Int()&1 != 0 {
-				img.Set(x, y, image.White)
-			}
-		}
-	}
-	buf = bytes.NewBuffer(nil)
-	if err := png.Encode(buf, img); err != nil {
-		log.Fatal("Encode rand.png ", err)
-	}
-
-	if err := ioutil.WriteFile("rand.png", buf.Bytes(), 0666); err != nil {
-		log.Fatal("ioutil.WriteFile/rand.png ", err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example3/.gitignore b/Godeps/_workspace/src/github.com/cznic/mathutil/example3/.gitignore
deleted file mode 100644
index 474f23a049..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example3/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-example3
-Makefile
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example3/example3.go b/Godeps/_workspace/src/github.com/cznic/mathutil/example3/example3.go
deleted file mode 100644
index 572d108b61..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example3/example3.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2011 CZ.NIC z.s.p.o. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// blame: jnml, labs.nic.cz
-
-// +build ignore
-
-package main
-
-import (
-	"bufio"
-	"flag"
-	"log"
-	"math/rand"
-	"os"
-)
-
-/*
-
-$ # Usage e.g.:
-$ go run example3.go -max 1024 > rand.dat # generate 1kB of "random" data
-
-*/
-func main() {
-	r := rand.New(rand.NewSource(1))
-	var mflag uint64
-	flag.Uint64Var(&mflag, "max", 0, "limit output to max bytes")
-	flag.Parse()
-	stdout := bufio.NewWriter(os.Stdout)
-	if mflag != 0 {
-		for i := uint64(0); i < mflag; i++ {
-			if err := stdout.WriteByte(byte(r.Int())); err != nil {
-				log.Fatal(err)
-			}
-		}
-		stdout.Flush()
-		return
-	}
-
-	for stdout.WriteByte(byte(r.Int())) == nil {
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example4/main.go b/Godeps/_workspace/src/github.com/cznic/mathutil/example4/main.go
deleted file mode 100644
index 52b35655ce..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example4/main.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) 2011 jnml. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// Let QRN be the number of quadratic residues of N.  Let Q be QRN/N.  From a
-// sorted list of primorial products < 2^32 find "record breakers".  "Record
-// breaker" is N with new lowest Q.
-//
-// There are only 49 "record breakers" < 2^32.
-//
-// To run the example $ go run main.go
-package main
-
-import (
-	"fmt"
-	"math"
-	"sort"
-	"time"
-
-	"github.com/cznic/mathutil"
-	"github.com/cznic/sortutil"
-)
-
-func main() {
-	pp := mathutil.PrimorialProductsUint32(0, math.MaxUint32, 32)
-	sort.Sort(sortutil.Uint32Slice(pp))
-	var bestN, bestD uint32 = 1, 1
-	order, checks := 0, 0
-	var ixDirty uint32
-	m := make([]byte, math.MaxUint32>>3)
-	for _, n := range pp {
-		for i := range m[:ixDirty+1] {
-			m[i] = 0
-		}
-		ixDirty = 0
-		checks++
-		limit0 := mathutil.QScaleUint32(n, bestN, bestD)
-		if limit0 > math.MaxUint32 {
-			panic(0)
-		}
-		limit := uint32(limit0)
-		n64 := uint64(n)
-		hi := n64 >> 1
-		hits := uint32(0)
-		check := true
-		fmt.Printf("\r%10d %d/%d", n, checks, len(pp))
-		t0 := time.Now()
-		for i := uint64(0); i < hi; i++ {
-			sq := uint32(i * i % n64)
-			ix := sq >> 3
-			msk := byte(1 << (sq & 7))
-			if m[ix]&msk == 0 {
-				hits++
-				if hits >= limit {
-					check = false
-					break
-				}
-			}
-			m[ix] |= msk
-			if ix > ixDirty {
-				ixDirty = ix
-			}
-		}
-
-		adjPrime := ".." // Composite before
-		if mathutil.IsPrime(n - 1) {
-			adjPrime = "P." // Prime before
-		}
-		switch mathutil.IsPrime(n + 1) {
-		case true:
-			adjPrime += "P" // Prime after
-		case false:
-			adjPrime += "." // Composite after
-		}
-
-		if check && mathutil.QCmpUint32(hits, n, bestN, bestD) < 0 {
-			order++
-			d := time.Since(t0)
-			bestN, bestD = hits, n
-			q := float64(hits) / float64(n)
-			fmt.Printf(
-				"\r%2s #%03d %d %d %.2f %.2E %s %s %v\n",
-				adjPrime, order, n, hits,
-				1/q, q, d, time.Now().Format("15:04:05"), mathutil.FactorInt(n),
-			)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example4/results b/Godeps/_workspace/src/github.com/cznic/mathutil/example4/results
deleted file mode 100644
index 1642c9d85c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example4/results
+++ /dev/null
@@ -1,55 +0,0 @@
-$ time go run main.go
-..P #001 2 1 2.00 5.00E-01 3us 11:13:37
-P.. #002 8 3 2.67 3.75E-01 1us 11:13:37
-P.P #003 12 4 3.00 3.33E-01 1us 11:13:37
-..P #004 16 4 4.00 2.50E-01 1us 11:13:37
-P.. #005 32 7 4.57 2.19E-01 1us 11:13:37
-P.. #006 48 8 6.00 1.67E-01 1us 11:13:37
-..P #007 96 14 6.86 1.46E-01 2us 11:13:37
-... #008 144 16 9.00 1.11E-01 2us 11:13:37
-P.P #009 240 24 10.00 1.00E-01 3us 11:13:37
-... #010 288 28 10.29 9.72E-02 4us 11:13:37
-P.. #011 480 42 11.43 8.75E-02 6us 11:13:37
-..P #012 576 48 12.00 8.33E-02 7us 11:13:37
-P.. #013 720 48 15.00 6.67E-02 8us 11:13:37
-P.. #014 1440 84 17.14 5.83E-02 15us 11:13:37
-... #015 1680 96 17.50 5.71E-02 17us 11:13:37
-P.. #016 2880 144 20.00 5.00E-02 28us 11:13:37
-... #017 3600 176 20.45 4.89E-02 35us 11:13:37
-P.. #018 5040 192 26.25 3.81E-02 50us 11:13:37
-P.. #019 10080 336 30.00 3.33E-02 96us 11:13:37
-..P #020 18480 576 32.08 3.12E-02 174us 11:13:37
-..P #021 20160 576 35.00 2.86E-02 190us 11:13:37
-... #022 25200 704 35.80 2.79E-02 237us 11:13:37
-... #023 36960 1008 36.67 2.73E-02 348us 11:13:37
-... #024 50400 1232 40.91 2.44E-02 473us 11:13:37
-P.P #025 55440 1152 48.12 2.08E-02 518us 11:13:37
-P.P #026 110880 2016 55.00 1.82E-02 1.039ms 11:13:37
-... #027 221760 3456 64.17 1.56E-02 2.056ms 11:13:37
-... #028 277200 4224 65.62 1.52E-02 2.82ms 11:13:37
-... #029 443520 6624 66.96 1.49E-02 4.179ms 11:13:37
-... #030 480480 7056 68.10 1.47E-02 4.536ms 11:13:37
-... #031 554400 7392 75.00 1.33E-02 5.217ms 11:13:37
-... #032 720720 8064 89.38 1.12E-02 6.919ms 11:13:37
-P.. #033 1441440 14112 102.14 9.79E-03 14.767ms 11:13:38
-... #034 2882880 24192 119.17 8.39E-03 28.661ms 11:13:38
-... #035 3603600 29568 121.88 8.21E-03 35.55ms 11:13:38
-... #036 5765760 46368 124.35 8.04E-03 57.798ms 11:13:38
-... #037 7207200 51744 139.29 7.18E-03 75.157ms 11:13:38
-... #038 12252240 72576 168.82 5.92E-03 147.179ms 11:13:38
-P.. #039 24504480 127008 192.94 5.18E-03 507.174ms 11:13:40
-... #040 49008960 217728 225.09 4.44E-03 1.334847s 11:13:43
-P.. #041 61261200 266112 230.21 4.34E-03 1.739597s 11:13:45
-... #042 98017920 417312 234.88 4.26E-03 2.971988s 11:13:51
-... #043 122522400 465696 263.10 3.80E-03 3.767685s 11:13:57
-P.P #044 232792560 725760 320.76 3.12E-03 7.425308s 11:14:15
-P.. #045 465585120 1270080 366.58 2.73E-03 15.18066s 11:14:50
-P.. #046 931170240 2177280 427.68 2.34E-03 34.22548s 11:16:06
-..P #047 1163962800 2661120 437.40 2.29E-03 45.038331s 11:17:10
-..P #048 1862340480 4173120 446.27 2.24E-03 1m10.288676s 11:19:26
-... #049 2327925600 4656960 499.88 2.00E-03 1m31.882756s 11:21:44
-4257792000 1679/1679
-real	11m36.548s
-user	11m30.530s
-sys	0m1.700s
-$
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/ff/main.go b/Godeps/_workspace/src/github.com/cznic/mathutil/ff/main.go
deleted file mode 100644
index 6cec57afb8..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/ff/main.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) jnml. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// Factor Finder - searches for Mersenne number factors of one specific special
-// form.
-package main
-
-import (
-	"flag"
-	"fmt"
-	"math/big"
-	"runtime"
-	"time"
-
-	"github.com/cznic/mathutil"
-)
-
-const (
-	pp  = 1
-	pp2 = 10
-)
-
-var (
-	_1 = big.NewInt(1)
-	_2 = big.NewInt(2)
-)
-
-func main() {
-	runtime.GOMAXPROCS(2)
-	oClass := flag.Uint64("c", 2, `factor "class" number`)
-	oDuration := flag.Duration("d", time.Second, "duration to spend on one class")
-	flag.Parse()
-	class := *oClass
-	for class&1 != 0 {
-		class >>= 1
-	}
-	class = mathutil.MaxUint64(class, 2)
-
-	for {
-		c := time.After(*oDuration)
-		factor := big.NewInt(0)
-		factor.SetUint64(class)
-		exp := big.NewInt(0)
-	oneClass:
-		for {
-			select {
-			case <-c:
-				break oneClass
-			default:
-			}
-
-			exp.Set(factor)
-			factor.Lsh(factor, 1)
-			factor.Add(factor, _1)
-			if !factor.ProbablyPrime(pp) {
-				continue
-			}
-
-			if !exp.ProbablyPrime(pp) {
-				continue
-			}
-
-			if mathutil.ModPowBigInt(_2, exp, factor).Cmp(_1) != 0 {
-				continue
-			}
-
-			if !factor.ProbablyPrime(pp2) {
-				continue
-			}
-
-			if !exp.ProbablyPrime(pp2) {
-				continue
-			}
-
-			fmt.Printf("%d: %s | M%s (%d bits)\n", class, factor, exp, factor.BitLen())
-		}
-
-		class += 2
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/mathutil.go b/Godeps/_workspace/src/github.com/cznic/mathutil/mathutil.go
deleted file mode 100644
index e8f3f5622c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/mathutil.go
+++ /dev/null
@@ -1,829 +0,0 @@
-// Copyright (c) 2014 The mathutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package mathutil provides utilities supplementing the standard 'math' and
-// 'math/rand' packages.
-//
-// Compatibility issues
-//
-// 2013-12-13: The following functions have been REMOVED
-//
-// 	func Uint64ToBigInt(n uint64) *big.Int
-// 	func Uint64FromBigInt(n *big.Int) (uint64, bool)
-//
-// 2013-05-13: The following functions are now DEPRECATED
-//
-// 	func Uint64ToBigInt(n uint64) *big.Int
-// 	func Uint64FromBigInt(n *big.Int) (uint64, bool)
-//
-// These functions will be REMOVED with Go release 1.1+1.
-//
-// 2013-01-21: The following functions have been REMOVED
-//
-// 	func MaxInt() int
-// 	func MinInt() int
-// 	func MaxUint() uint
-// 	func UintPtrBits() int
-//
-// They are now replaced by untyped constants
-//
-// 	MaxInt
-// 	MinInt
-// 	MaxUint
-// 	UintPtrBits
-//
-// Additionally one more untyped constant was added
-//
-// 	IntBits
-//
-// This change breaks any existing code depending on the above removed
-// functions.  They should have not been published in the first place, that was
-// unfortunate. Instead, defining such architecture and/or implementation
-// specific integer limits and bit widths as untyped constants improves
-// performance and allows for static dead code elimination if it depends on
-// these values. Thanks to minux for pointing it out in the mail list
-// (https://groups.google.com/d/msg/golang-nuts/tlPpLW6aJw8/NT3mpToH-a4J).
-//
-// 2012-12-12: The following functions will be DEPRECATED with Go release
-// 1.0.3+1 and REMOVED with Go release 1.0.3+2, b/c of
-// http://code.google.com/p/go/source/detail?r=954a79ee3ea8
-//
-// 	func Uint64ToBigInt(n uint64) *big.Int
-// 	func Uint64FromBigInt(n *big.Int) (uint64, bool)
-package mathutil
-
-import (
-	"math"
-	"math/big"
-)
-
-// Architecture and/or implementation specific integer limits and bit widths.
-const (
-	MaxInt      = 1<<(IntBits-1) - 1
-	MinInt      = -MaxInt - 1
-	MaxUint     = 1<<IntBits - 1
-	IntBits     = 1 << (^uint(0)>>32&1 + ^uint(0)>>16&1 + ^uint(0)>>8&1 + 3)
-	UintPtrBits = 1 << (^uintptr(0)>>32&1 + ^uintptr(0)>>16&1 + ^uintptr(0)>>8&1 + 3)
-)
-
-var (
-	_1 = big.NewInt(1)
-	_2 = big.NewInt(2)
-)
-
-// GCDByte returns the greatest common divisor of a and b. Based on:
-// http://en.wikipedia.org/wiki/Euclidean_algorithm#Implementations
-func GCDByte(a, b byte) byte {
-	for b != 0 {
-		a, b = b, a%b
-	}
-	return a
-}
-
-// GCDUint16 returns the greatest common divisor of a and b.
-func GCDUint16(a, b uint16) uint16 {
-	for b != 0 {
-		a, b = b, a%b
-	}
-	return a
-}
-
-// GCD returns the greatest common divisor of a and b.
-func GCDUint32(a, b uint32) uint32 {
-	for b != 0 {
-		a, b = b, a%b
-	}
-	return a
-}
-
-// GCD64 returns the greatest common divisor of a and b.
-func GCDUint64(a, b uint64) uint64 {
-	for b != 0 {
-		a, b = b, a%b
-	}
-	return a
-}
-
-// ISqrt returns floor(sqrt(n)). Typical run time is few hundreds of ns.
-func ISqrt(n uint32) (x uint32) {
-	if n == 0 {
-		return
-	}
-
-	if n >= math.MaxUint16*math.MaxUint16 {
-		return math.MaxUint16
-	}
-
-	var px, nx uint32
-	for x = n; ; px, x = x, nx {
-		nx = (x + n/x) / 2
-		if nx == x || nx == px {
-			break
-		}
-	}
-	return
-}
-
-// SqrtUint64 returns floor(sqrt(n)). Typical run time is about 0.5 µs.
-func SqrtUint64(n uint64) (x uint64) {
-	if n == 0 {
-		return
-	}
-
-	if n >= math.MaxUint32*math.MaxUint32 {
-		return math.MaxUint32
-	}
-
-	var px, nx uint64
-	for x = n; ; px, x = x, nx {
-		nx = (x + n/x) / 2
-		if nx == x || nx == px {
-			break
-		}
-	}
-	return
-}
-
-// SqrtBig returns floor(sqrt(n)). It panics on n < 0.
-func SqrtBig(n *big.Int) (x *big.Int) {
-	switch n.Sign() {
-	case -1:
-		panic(-1)
-	case 0:
-		return big.NewInt(0)
-	}
-
-	var px, nx big.Int
-	x = big.NewInt(0)
-	x.SetBit(x, n.BitLen()/2+1, 1)
-	for {
-		nx.Rsh(nx.Add(x, nx.Div(n, x)), 1)
-		if nx.Cmp(x) == 0 || nx.Cmp(&px) == 0 {
-			break
-		}
-		px.Set(x)
-		x.Set(&nx)
-	}
-	return
-}
-
-// Log2Byte returns log base 2 of n. It's the same as index of the highest
-// bit set in n.  For n == 0 -1 is returned.
-func Log2Byte(n byte) int {
-	return log2[n]
-}
-
-// Log2Uint16 returns log base 2 of n. It's the same as index of the highest
-// bit set in n.  For n == 0 -1 is returned.
-func Log2Uint16(n uint16) int {
-	if b := n >> 8; b != 0 {
-		return log2[b] + 8
-	}
-
-	return log2[n]
-}
-
-// Log2Uint32 returns log base 2 of n. It's the same as index of the highest
-// bit set in n.  For n == 0 -1 is returned.
-func Log2Uint32(n uint32) int {
-	if b := n >> 24; b != 0 {
-		return log2[b] + 24
-	}
-
-	if b := n >> 16; b != 0 {
-		return log2[b] + 16
-	}
-
-	if b := n >> 8; b != 0 {
-		return log2[b] + 8
-	}
-
-	return log2[n]
-}
-
-// Log2Uint64 returns log base 2 of n. It's the same as index of the highest
-// bit set in n.  For n == 0 -1 is returned.
-func Log2Uint64(n uint64) int {
-	if b := n >> 56; b != 0 {
-		return log2[b] + 56
-	}
-
-	if b := n >> 48; b != 0 {
-		return log2[b] + 48
-	}
-
-	if b := n >> 40; b != 0 {
-		return log2[b] + 40
-	}
-
-	if b := n >> 32; b != 0 {
-		return log2[b] + 32
-	}
-
-	if b := n >> 24; b != 0 {
-		return log2[b] + 24
-	}
-
-	if b := n >> 16; b != 0 {
-		return log2[b] + 16
-	}
-
-	if b := n >> 8; b != 0 {
-		return log2[b] + 8
-	}
-
-	return log2[n]
-}
-
-// ModPowByte computes (b^e)%m. It panics for m == 0 || b == e == 0.
-//
-// See also: http://en.wikipedia.org/wiki/Modular_exponentiation#Right-to-left_binary_method
-func ModPowByte(b, e, m byte) byte {
-	if b == 0 && e == 0 {
-		panic(0)
-	}
-
-	if m == 1 {
-		return 0
-	}
-
-	r := uint16(1)
-	for b, m := uint16(b), uint16(m); e > 0; b, e = b*b%m, e>>1 {
-		if e&1 == 1 {
-			r = r * b % m
-		}
-	}
-	return byte(r)
-}
-
-// ModPowByte computes (b^e)%m. It panics for m == 0 || b == e == 0.
-func ModPowUint16(b, e, m uint16) uint16 {
-	if b == 0 && e == 0 {
-		panic(0)
-	}
-
-	if m == 1 {
-		return 0
-	}
-
-	r := uint32(1)
-	for b, m := uint32(b), uint32(m); e > 0; b, e = b*b%m, e>>1 {
-		if e&1 == 1 {
-			r = r * b % m
-		}
-	}
-	return uint16(r)
-}
-
-// ModPowUint32 computes (b^e)%m. It panics for m == 0 || b == e == 0.
-func ModPowUint32(b, e, m uint32) uint32 {
-	if b == 0 && e == 0 {
-		panic(0)
-	}
-
-	if m == 1 {
-		return 0
-	}
-
-	r := uint64(1)
-	for b, m := uint64(b), uint64(m); e > 0; b, e = b*b%m, e>>1 {
-		if e&1 == 1 {
-			r = r * b % m
-		}
-	}
-	return uint32(r)
-}
-
-// ModPowUint64 computes (b^e)%m. It panics for m == 0 || b == e == 0.
-func ModPowUint64(b, e, m uint64) (r uint64) {
-	if b == 0 && e == 0 {
-		panic(0)
-	}
-
-	if m == 1 {
-		return 0
-	}
-
-	return modPowBigInt(big.NewInt(0).SetUint64(b), big.NewInt(0).SetUint64(e), big.NewInt(0).SetUint64(m)).Uint64()
-}
-
-func modPowBigInt(b, e, m *big.Int) (r *big.Int) {
-	r = big.NewInt(1)
-	for i, n := 0, e.BitLen(); i < n; i++ {
-		if e.Bit(i) != 0 {
-			r.Mod(r.Mul(r, b), m)
-		}
-		b.Mod(b.Mul(b, b), m)
-	}
-	return
-}
-
-// ModPowBigInt computes (b^e)%m. Returns nil for e < 0. It panics for m == 0 || b == e == 0.
-func ModPowBigInt(b, e, m *big.Int) (r *big.Int) {
-	if b.Sign() == 0 && e.Sign() == 0 {
-		panic(0)
-	}
-
-	if m.Cmp(_1) == 0 {
-		return big.NewInt(0)
-	}
-
-	if e.Sign() < 0 {
-		return
-	}
-
-	return modPowBigInt(big.NewInt(0).Set(b), big.NewInt(0).Set(e), m)
-}
-
-var uint64ToBigIntDelta big.Int
-
-func init() {
-	uint64ToBigIntDelta.SetBit(&uint64ToBigIntDelta, 63, 1)
-}
-
-var uintptrBits int
-
-func init() {
-	x := uint64(math.MaxUint64)
-	uintptrBits = BitLenUintptr(uintptr(x))
-}
-
-// UintptrBits returns the bit width of an uintptr at the executing machine.
-func UintptrBits() int {
-	return uintptrBits
-}
-
-// AddUint128_64 returns the uint128 sum of uint64 a and b.
-func AddUint128_64(a, b uint64) (hi uint64, lo uint64) {
-	lo = a + b
-	if lo < a {
-		hi = 1
-	}
-	return
-}
-
-// MulUint128_64 returns the uint128 bit product of uint64 a and b.
-func MulUint128_64(a, b uint64) (hi, lo uint64) {
-	/*
-		2^(2 W) ahi bhi + 2^W alo bhi + 2^W ahi blo + alo blo
-
-		FEDCBA98 76543210 FEDCBA98 76543210
-		                  ---- alo*blo ----
-		         ---- alo*bhi ----
-		         ---- ahi*blo ----
-		---- ahi*bhi ----
-	*/
-	const w = 32
-	const m = 1<<w - 1
-	ahi, bhi, alo, blo := a>>w, b>>w, a&m, b&m
-	lo = alo * blo
-	mid1 := alo * bhi
-	mid2 := ahi * blo
-	c1, lo := AddUint128_64(lo, mid1<<w)
-	c2, lo := AddUint128_64(lo, mid2<<w)
-	_, hi = AddUint128_64(ahi*bhi, mid1>>w+mid2>>w+uint64(c1+c2))
-	return
-}
-
-// PowerizeBigInt returns (e, p) such that e is the smallest number for which p
-// == b^e is greater or equal n. For n < 0 or b < 2 (0, nil) is returned.
-//
-// NOTE: Run time for large values of n (above about 2^1e6 ~= 1e300000) can be
-// significant and/or unacceptabe.  For any smaller values of n the function
-// typically performs in sub second time.  For "small" values of n (cca bellow
-// 2^1e3 ~= 1e300) the same can be easily below 10 µs.
-//
-// A special (and trivial) case of b == 2 is handled separately and performs
-// much faster.
-func PowerizeBigInt(b, n *big.Int) (e uint32, p *big.Int) {
-	switch {
-	case b.Cmp(_2) < 0 || n.Sign() < 0:
-		return
-	case n.Sign() == 0 || n.Cmp(_1) == 0:
-		return 0, big.NewInt(1)
-	case b.Cmp(_2) == 0:
-		p = big.NewInt(0)
-		e = uint32(n.BitLen() - 1)
-		p.SetBit(p, int(e), 1)
-		if p.Cmp(n) < 0 {
-			p.Mul(p, _2)
-			e++
-		}
-		return
-	}
-
-	bw := b.BitLen()
-	nw := n.BitLen()
-	p = big.NewInt(1)
-	var bb, r big.Int
-	for {
-		switch p.Cmp(n) {
-		case -1:
-			x := uint32((nw - p.BitLen()) / bw)
-			if x == 0 {
-				x = 1
-			}
-			e += x
-			switch x {
-			case 1:
-				p.Mul(p, b)
-			default:
-				r.Set(_1)
-				bb.Set(b)
-				e := x
-				for {
-					if e&1 != 0 {
-						r.Mul(&r, &bb)
-					}
-					if e >>= 1; e == 0 {
-						break
-					}
-
-					bb.Mul(&bb, &bb)
-				}
-				p.Mul(p, &r)
-			}
-		case 0, 1:
-			return
-		}
-	}
-}
-
-// PowerizeUint32BigInt returns (e, p) such that e is the smallest number for
-// which p == b^e is greater or equal n. For n < 0 or b < 2 (0, nil) is
-// returned.
-//
-// More info: see PowerizeBigInt.
-func PowerizeUint32BigInt(b uint32, n *big.Int) (e uint32, p *big.Int) {
-	switch {
-	case b < 2 || n.Sign() < 0:
-		return
-	case n.Sign() == 0 || n.Cmp(_1) == 0:
-		return 0, big.NewInt(1)
-	case b == 2:
-		p = big.NewInt(0)
-		e = uint32(n.BitLen() - 1)
-		p.SetBit(p, int(e), 1)
-		if p.Cmp(n) < 0 {
-			p.Mul(p, _2)
-			e++
-		}
-		return
-	}
-
-	var bb big.Int
-	bb.SetInt64(int64(b))
-	return PowerizeBigInt(&bb, n)
-}
-
-/*
-ProbablyPrimeUint32 returns true if n is prime or n is a pseudoprime to base a.
-It implements the Miller-Rabin primality test for one specific value of 'a' and
-k == 1.
-
-Wrt pseudocode shown at
-http://en.wikipedia.org/wiki/Miller-Rabin_primality_test#Algorithm_and_running_time
-
- Input: n > 3, an odd integer to be tested for primality;
- Input: k, a parameter that determines the accuracy of the test
- Output: composite if n is composite, otherwise probably prime
- write n − 1 as 2^s·d with d odd by factoring powers of 2 from n − 1
- LOOP: repeat k times:
-    pick a random integer a in the range [2, n − 2]
-    x ← a^d mod n
-    if x = 1 or x = n − 1 then do next LOOP
-    for r = 1 .. s − 1
-       x ← x^2 mod n
-       if x = 1 then return composite
-       if x = n − 1 then do next LOOP
-    return composite
- return probably prime
-
-... this function behaves like passing 1 for 'k' and additionaly a
-fixed/non-random 'a'.  Otherwise it's the same algorithm.
-
-See also: http://mathworld.wolfram.com/Rabin-MillerStrongPseudoprimeTest.html
-*/
-func ProbablyPrimeUint32(n, a uint32) bool {
-	d, s := n-1, 0
-	for ; d&1 == 0; d, s = d>>1, s+1 {
-	}
-	x := uint64(ModPowUint32(a, d, n))
-	if x == 1 || uint32(x) == n-1 {
-		return true
-	}
-
-	for ; s > 1; s-- {
-		if x = x * x % uint64(n); x == 1 {
-			return false
-		}
-
-		if uint32(x) == n-1 {
-			return true
-		}
-	}
-	return false
-}
-
-// ProbablyPrimeUint64_32 returns true if n is prime or n is a pseudoprime to
-// base a. It implements the Miller-Rabin primality test for one specific value
-// of 'a' and k == 1.  See also ProbablyPrimeUint32.
-func ProbablyPrimeUint64_32(n uint64, a uint32) bool {
-	d, s := n-1, 0
-	for ; d&1 == 0; d, s = d>>1, s+1 {
-	}
-	x := ModPowUint64(uint64(a), d, n)
-	if x == 1 || x == n-1 {
-		return true
-	}
-
-	bx, bn := big.NewInt(0).SetUint64(x), big.NewInt(0).SetUint64(n)
-	for ; s > 1; s-- {
-		if x = bx.Mod(bx.Mul(bx, bx), bn).Uint64(); x == 1 {
-			return false
-		}
-
-		if x == n-1 {
-			return true
-		}
-	}
-	return false
-}
-
-// ProbablyPrimeBigInt_32 returns true if n is prime or n is a pseudoprime to
-// base a. It implements the Miller-Rabin primality test for one specific value
-// of 'a' and k == 1.  See also ProbablyPrimeUint32.
-func ProbablyPrimeBigInt_32(n *big.Int, a uint32) bool {
-	var d big.Int
-	d.Set(n)
-	d.Sub(&d, _1) // d <- n-1
-	s := 0
-	for ; d.Bit(s) == 0; s++ {
-	}
-	nMinus1 := big.NewInt(0).Set(&d)
-	d.Rsh(&d, uint(s))
-
-	x := ModPowBigInt(big.NewInt(int64(a)), &d, n)
-	if x.Cmp(_1) == 0 || x.Cmp(nMinus1) == 0 {
-		return true
-	}
-
-	for ; s > 1; s-- {
-		if x = x.Mod(x.Mul(x, x), n); x.Cmp(_1) == 0 {
-			return false
-		}
-
-		if x.Cmp(nMinus1) == 0 {
-			return true
-		}
-	}
-	return false
-}
-
-// ProbablyPrimeBigInt returns true if n is prime or n is a pseudoprime to base
-// a. It implements the Miller-Rabin primality test for one specific value of
-// 'a' and k == 1.  See also ProbablyPrimeUint32.
-func ProbablyPrimeBigInt(n, a *big.Int) bool {
-	var d big.Int
-	d.Set(n)
-	d.Sub(&d, _1) // d <- n-1
-	s := 0
-	for ; d.Bit(s) == 0; s++ {
-	}
-	nMinus1 := big.NewInt(0).Set(&d)
-	d.Rsh(&d, uint(s))
-
-	x := ModPowBigInt(a, &d, n)
-	if x.Cmp(_1) == 0 || x.Cmp(nMinus1) == 0 {
-		return true
-	}
-
-	for ; s > 1; s-- {
-		if x = x.Mod(x.Mul(x, x), n); x.Cmp(_1) == 0 {
-			return false
-		}
-
-		if x.Cmp(nMinus1) == 0 {
-			return true
-		}
-	}
-	return false
-}
-
-// Max returns the larger of a and b.
-func Max(a, b int) int {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// Min returns the smaller of a and b.
-func Min(a, b int) int {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// UMax returns the larger of a and b.
-func UMax(a, b uint) uint {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// UMin returns the smaller of a and b.
-func UMin(a, b uint) uint {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// MaxByte returns the larger of a and b.
-func MaxByte(a, b byte) byte {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// MinByte returns the smaller of a and b.
-func MinByte(a, b byte) byte {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// MaxInt8 returns the larger of a and b.
-func MaxInt8(a, b int8) int8 {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// MinInt8 returns the smaller of a and b.
-func MinInt8(a, b int8) int8 {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// MaxUint16 returns the larger of a and b.
-func MaxUint16(a, b uint16) uint16 {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// MinUint16 returns the smaller of a and b.
-func MinUint16(a, b uint16) uint16 {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// MaxInt16 returns the larger of a and b.
-func MaxInt16(a, b int16) int16 {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// MinInt16 returns the smaller of a and b.
-func MinInt16(a, b int16) int16 {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// MaxUint32 returns the larger of a and b.
-func MaxUint32(a, b uint32) uint32 {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// MinUint32 returns the smaller of a and b.
-func MinUint32(a, b uint32) uint32 {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// MaxInt32 returns the larger of a and b.
-func MaxInt32(a, b int32) int32 {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// MinInt32 returns the smaller of a and b.
-func MinInt32(a, b int32) int32 {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// MaxUint64 returns the larger of a and b.
-func MaxUint64(a, b uint64) uint64 {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// MinUint64 returns the smaller of a and b.
-func MinUint64(a, b uint64) uint64 {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// MaxInt64 returns the larger of a and b.
-func MaxInt64(a, b int64) int64 {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// MinInt64 returns the smaller of a and b.
-func MinInt64(a, b int64) int64 {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
-// ToBase produces n in base b. For example
-//
-// 	ToBase(2047, 22) -> [1, 5, 4]
-//
-//	1 * 22^0           1
-//	5 * 22^1         110
-//	4 * 22^2        1936
-//	                ----
-//	                2047
-//
-// ToBase panics for bases < 2.
-func ToBase(n *big.Int, b int) []int {
-	var nn big.Int
-	nn.Set(n)
-	if b < 2 {
-		panic("invalid base")
-	}
-
-	k := 1
-	switch nn.Sign() {
-	case -1:
-		nn.Neg(&nn)
-		k = -1
-	case 0:
-		return []int{0}
-	}
-
-	bb := big.NewInt(int64(b))
-	var r []int
-	rem := big.NewInt(0)
-	for nn.Sign() != 0 {
-		nn.QuoRem(&nn, bb, rem)
-		r = append(r, k*int(rem.Int64()))
-	}
-	return r
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/AUTHORS b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/AUTHORS
deleted file mode 100644
index 0078f5f5b6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/AUTHORS
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/CONTRIBUTORS
deleted file mode 100644
index 5e86f0607c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/CONTRIBUTORS
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/LICENSE b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/LICENSE
deleted file mode 100644
index 4fa2a1f4fd..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The mersenne Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/Makefile b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/Makefile
deleted file mode 100644
index a12fc5750c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2014 The mersenne Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-all: editor
-	go build
-	go vet
-	golint .
-	go install
-	make todo
-
-editor:
-	go fmt
-	go test -i
-	go test
-
-todo:
-	@grep -n ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alnum:]] *.go || true
-	@grep -n TODO *.go || true
-	@grep -n FIXME *.go || true
-	@grep -n BUG *.go || true
-
-clean:
-	rm -f *~
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/README b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/README
deleted file mode 100644
index afa401c717..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Install: $ go get github.com/cznic/mathutil/mersenne
-Godocs:  http://gopkgdoc.appspot.com/pkg/github.com/cznic/mathutil/mersenne
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/mersenne.go b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/mersenne.go
deleted file mode 100644
index 21b6f396cf..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/mersenne.go
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright (c) 2014 The mersenne Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package mersenne collects utilities related to Mersenne numbers[1] and/or some
-of their properties.
-
-Exponent
-
-In this documentation the term 'exponent' refers to 'n' of a Mersenne number Mn
-equal to 2^n-1. This package supports only uint32 sized exponents. New()
-currently supports exponents only up to math.MaxInt32 (31 bits, up to 256 MB
-required to represent such Mn in memory as a big.Int).
-
-Links
-
-Referenced from above:
- [1] http://en.wikipedia.org/wiki/Mersenne_number
-*/
-package mersenne
-
-import (
-	"math"
-	"math/big"
-
-	"github.com/cznic/mathutil"
-	"github.com/remyoudompheng/bigfft"
-)
-
-var (
-	_0 = big.NewInt(0)
-	_1 = big.NewInt(1)
-	_2 = big.NewInt(2)
-)
-
-// Knowns list the exponent of currently (March 2012) known Mersenne primes
-// exponents in order.  See also: http://oeis.org/A000043 for a partial list.
-var Knowns = []uint32{
-	2,  // #1
-	3,  // #2
-	5,  // #3
-	7,  // #4
-	13, // #5
-	17, // #6
-	19, // #7
-	31, // #8
-	61, // #9
-	89, // #10
-
-	107,  // #11
-	127,  // #12
-	521,  // #13
-	607,  // #14
-	1279, // #15
-	2203, // #16
-	2281, // #17
-	3217, // #18
-	4253, // #19
-	4423, // #20
-
-	9689,   // #21
-	9941,   // #22
-	11213,  // #23
-	19937,  // #24
-	21701,  // #25
-	23209,  // #26
-	44497,  // #27
-	86243,  // #28
-	110503, // #29
-	132049, // #30
-
-	216091,   // #31
-	756839,   // #32
-	859433,   // #33
-	1257787,  // #34
-	1398269,  // #35
-	2976221,  // #36
-	3021377,  // #37
-	6972593,  // #38
-	13466917, // #39
-	20996011, // #40
-
-	24036583, // #41
-	25964951, // #42
-	30402457, // #43
-	32582657, // #44
-	37156667, // #45
-	42643801, // #46
-	43112609, // #47
-	57885161, // #48
-}
-
-// Known maps the exponent of known Mersenne primes its ordinal number/rank.
-// Ranks > 41 are currently provisional.
-var Known map[uint32]int
-
-func init() {
-	Known = map[uint32]int{}
-	for i, v := range Knowns {
-		Known[v] = i + 1
-	}
-}
-
-// New returns Mn == 2^n-1 for n <= math.MaxInt32 or nil otherwise.
-func New(n uint32) (m *big.Int) {
-	if n > math.MaxInt32 {
-		return
-	}
-
-	m = big.NewInt(0)
-	return m.Sub(m.SetBit(m, int(n), 1), _1)
-}
-
-// HasFactorUint32 returns true if d | Mn. Typical run time for a 32 bit factor
-// and a 32 bit exponent is < 1 µs.
-func HasFactorUint32(d, n uint32) bool {
-	return d == 1 || d&1 != 0 && mathutil.ModPowUint32(2, n, d) == 1
-}
-
-// HasFactorUint64 returns true if d | Mn. Typical run time for a 64 bit factor
-// and a 32 bit exponent is < 30 µs.
-func HasFactorUint64(d uint64, n uint32) bool {
-	return d == 1 || d&1 != 0 && mathutil.ModPowUint64(2, uint64(n), d) == 1
-}
-
-// HasFactorBigInt returns true if d | Mn, d > 0. Typical run time for a 128
-// bit factor and a 32 bit exponent is < 75 µs.
-func HasFactorBigInt(d *big.Int, n uint32) bool {
-	return d.Cmp(_1) == 0 || d.Sign() > 0 && d.Bit(0) == 1 &&
-		mathutil.ModPowBigInt(_2, big.NewInt(int64(n)), d).Cmp(_1) == 0
-}
-
-// HasFactorBigInt2 returns true if d | Mn, d > 0
-func HasFactorBigInt2(d, n *big.Int) bool {
-	return d.Cmp(_1) == 0 || d.Sign() > 0 && d.Bit(0) == 1 &&
-		mathutil.ModPowBigInt(_2, n, d).Cmp(_1) == 0
-}
-
-/*
-FromFactorBigInt returns n such that d | Mn if n <= max and d is odd. In other
-cases zero is returned.
-
-It is conjectured that every odd d ∊ N divides infinitely many Mersenne numbers.
-The returned n should be the exponent of smallest such Mn.
-
-NOTE: The computation of n from a given d performs roughly in O(n). It is
-thus highly recomended to use the 'max' argument to limit the "searched"
-exponent upper bound as appropriate. Otherwise the computation can take a long
-time as a large factor can be a divisor of a Mn with exponent above the uint32
-limits.
-
-The FromFactorBigInt function is a modification of the original Will
-Edgington's "reverse method", discussed here:
-http://tech.groups.yahoo.com/group/primenumbers/message/15061
-*/
-func FromFactorBigInt(d *big.Int, max uint32) (n uint32) {
-	if d.Bit(0) == 0 {
-		return
-	}
-
-	var m big.Int
-	for n < max {
-		m.Add(&m, d)
-		i := 0
-		for ; m.Bit(i) == 1; i++ {
-			if n == math.MaxUint32 {
-				return 0
-			}
-
-			n++
-		}
-		m.Rsh(&m, uint(i))
-		if m.Sign() == 0 {
-			if n > max {
-				n = 0
-			}
-			return
-		}
-	}
-	return 0
-}
-
-// Mod sets mod to n % Mexp and returns mod. It panics for exp == 0 || exp >=
-// math.MaxInt32 || n < 0.
-func Mod(mod, n *big.Int, exp uint32) *big.Int {
-	if exp == 0 || exp >= math.MaxInt32 || n.Sign() < 0 {
-		panic(0)
-	}
-
-	m := New(exp)
-	mod.Set(n)
-	var x big.Int
-	for mod.BitLen() > int(exp) {
-		x.Set(mod)
-		x.Rsh(&x, uint(exp))
-		mod.And(mod, m)
-		mod.Add(mod, &x)
-	}
-	if mod.BitLen() == int(exp) && mod.Cmp(m) == 0 {
-		mod.SetInt64(0)
-	}
-	return mod
-}
-
-// ModPow2 returns x such that 2^Me % Mm == 2^x. It panics for m < 2.  Typical
-// run time is < 1 µs. Use instead of ModPow(2, e, m) wherever possible.
-func ModPow2(e, m uint32) (x uint32) {
-	/*
-		m < 2 -> panic
-		e == 0 -> x == 0
-		e == 1 -> x == 1
-
-		2^M1 % M2 == 2^1 %  3 == 2^1    10 // 2^1, 3, 5, 7 ...		+2k
-		2^M1 % M3 == 2^1 %  7 == 2^1   010 // 2^1, 4, 7, ...		+3k
-		2^M1 % M4 == 2^1 % 15 == 2^1  0010 // 2^1, 5, 9, 13...		+4k
-		2^M1 % M5 == 2^1 % 31 == 2^1 00010 // 2^1, 6, 11, 16...		+5k
-
-		2^M2 % M2 == 2^3 %  3 == 2^1   10.. // 2^3, 5, 7, 9, 11, ...	+2k
-		2^M2 % M3 == 2^3 %  7 == 2^0 001... // 2^3, 6, 9, 12, 15, ...	+3k
-		2^M2 % M4 == 2^3 % 15 == 2^3   1000 // 2^3, 7, 11, 15, 19, ...	+4k
-		2^M2 % M5 == 2^3 % 31 == 2^3  01000 // 2^3, 8, 13, 18, 23, ...	+5k
-
-		2^M3 % M2 == 2^7 %   3 == 2^1       10..--.. // 2^3, 5, 7...	+2k
-		2^M3 % M3 == 2^7 %   7 == 2^1      010...--- //	2^1, 4, 7...	+3k
-		2^M3 % M4 == 2^7 %  15 == 2^3       1000.... //			+4k
-		2^M3 % M5 == 2^7 %  31 == 2^2     00100..... //			+5k
-		2^M3 % M6 == 2^7 %  63 == 2^1   000010...... //			+6k
-		2^M3 % M7 == 2^7 % 127 == 2^0 0000001.......
-		2^M3 % M8 == 2^7 % 255 == 2^7       10000000
-		2^M3 % M9 == 2^7 % 511 == 2^7      010000000
-
-		2^M4 % M2 == 2^15 %   3 == 2^1 10..--..--..--..
-		2^M4 % M3 == 2^15 %   7 == 2^0 1...---...---...
-		2^M4 % M4 == 2^15 %  15 == 2^3 1000....----....
-		2^M4 % M5 == 2^15 %  31 == 2^0 1.....-----.....
-		2^M4 % M6 == 2^15 %  63 == 2^3 1000......------
-		2^M4 % M7 == 2^15 % 127 == 2^1 10.......-------
-		2^M4 % M8 == 2^15 % 255 == 2^7 10000000........
-		2^M4 % M9 == 2^15 % 511 == 2^6 1000000.........
-	*/
-	switch {
-	case m < 2:
-		panic(0)
-	case e < 2:
-		return e
-	}
-
-	if x = mathutil.ModPowUint32(2, e, m); x == 0 {
-		return m - 1
-	}
-
-	return x - 1
-}
-
-// ModPow returns b^Me % Mm. Run time grows quickly with 'e' and/or 'm' when b
-// != 2 (then ModPow2 is used).
-func ModPow(b, e, m uint32) (r *big.Int) {
-	if m == 1 {
-		return big.NewInt(0)
-	}
-
-	if b == 2 {
-		x := ModPow2(e, m)
-		r = big.NewInt(0)
-		r.SetBit(r, int(x), 1)
-		return
-	}
-
-	bb := big.NewInt(int64(b))
-	r = big.NewInt(1)
-	for ; e != 0; e-- {
-		r = bigfft.Mul(r, bb)
-		Mod(r, r, m)
-		bb = bigfft.Mul(bb, bb)
-		Mod(bb, bb, m)
-	}
-	return
-}
-
-// ProbablyPrime returns true if Mn is prime or is a pseudoprime to base a.
-// Note: Every Mp, prime p, is a prime or is a pseudoprime to base 2, actually
-// to every base 2^i, i ∊ [1, p). In contrast - it is conjectured (w/o any
-// known counterexamples) that no composite Mp, prime p, is a pseudoprime to
-// base 3.
-func ProbablyPrime(n, a uint32) bool {
-	//TODO +test, +bench
-	if a == 2 {
-		return ModPow2(n-1, n) == 0
-	}
-
-	nMinus1 := New(n)
-	nMinus1.Sub(nMinus1, _1)
-	x := ModPow(a, n-1, n)
-	return x.Cmp(_1) == 0 || x.Cmp(nMinus1) == 0
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/nist-sts-2-1-1-report b/Godeps/_workspace/src/github.com/cznic/mathutil/nist-sts-2-1-1-report
deleted file mode 100644
index 20e686c61b..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/nist-sts-2-1-1-report
+++ /dev/null
@@ -1,267 +0,0 @@
-$ ./example -max 100000000 > rnd.dat
-$ ./assess 1000000
-           G E N E R A T O R    S E L E C T I O N 
-           ______________________________________
-
-    [0] Input File                 [1] Linear Congruential
-    [2] Quadratic Congruential I   [3] Quadratic Congruential II
-    [4] Cubic Congruential         [5] XOR
-    [6] Modular Exponentiation     [7] Blum-Blum-Shub
-    [8] Micali-Schnorr             [9] G Using SHA-1
-
-   Enter Choice: 0
-
-
-		User Prescribed Input File: rnd.dat
-
-                S T A T I S T I C A L   T E S T S
-                _________________________________
-
-    [01] Frequency                       [02] Block Frequency
-    [03] Cumulative Sums                 [04] Runs
-    [05] Longest Run of Ones             [06] Rank
-    [07] Discrete Fourier Transform      [08] Nonperiodic Template Matchings
-    [09] Overlapping Template Matchings  [10] Universal Statistical
-    [11] Approximate Entropy             [12] Random Excursions
-    [13] Random Excursions Variant       [14] Serial
-    [15] Linear Complexity
-
-         INSTRUCTIONS
-            Enter 0 if you DO NOT want to apply all of the
-            statistical tests to each sequence and 1 if you DO.
-
-   Enter Choice: 1
-
-        P a r a m e t e r   A d j u s t m e n t s
-        -----------------------------------------
-    [1] Block Frequency Test - block length(M):         128
-    [2] NonOverlapping Template Test - block length(m): 9
-    [3] Overlapping Template Test - block length(m):    9
-    [4] Approximate Entropy Test - block length(m):     10
-    [5] Serial Test - block length(m):                  16
-    [6] Linear Complexity Test - block length(M):       500
-
-   Select Test (0 to continue): 0
-
-   How many bitstreams? 200
-
-   Input File Format:
-    [0] ASCII - A sequence of ASCII 0's and 1's
-    [1] Binary - Each byte in data file contains 8 bits of data
-
-   Select input mode:  1
-
-     Statistical Testing In Progress.........
-
-     Statistical Testing Complete!!!!!!!!!!!!
-
-$ cat experiments/AlgorithmTesting/finalAnalysisReport.txt 
-------------------------------------------------------------------------------
-RESULTS FOR THE UNIFORMITY OF P-VALUES AND THE PROPORTION OF PASSING SEQUENCES
-------------------------------------------------------------------------------
-   generator is <rnd.dat>
-------------------------------------------------------------------------------
- C1  C2  C3  C4  C5  C6  C7  C8  C9 C10  P-VALUE  PROPORTION  STATISTICAL TEST
-------------------------------------------------------------------------------
- 28  22  17  19  15   8  24  23  19  25  0.093720    198/200     Frequency
- 20  18  24  14  18  17  16  28  21  24  0.504219    199/200     BlockFrequency
- 25  22  17  24  19  21  22  15  16  19  0.825505    197/200     CumulativeSums
- 27  17  16  22  14  26  14  25  19  20  0.304126    199/200     CumulativeSums
- 22  19  14  23  22  22  13  28  13  24  0.224821    199/200     Runs
- 20  24  18  21  15  13  22  23  24  20  0.719747    197/200     LongestRun
- 22  26  18  22  26  15  17  22  20  12  0.410055    199/200     Rank
- 25  22  26  22  20  16  20  20  16  13  0.585209    195/200     FFT
- 22  11  15  26  33  24  21  13  14  21  0.013102    197/200     NonOverlappingTemplate
- 17  11  16  27  19  24  19  20  28  19  0.219006    200/200     NonOverlappingTemplate
- 23  27  24  15  21  11  18  27  15  19  0.162606    197/200     NonOverlappingTemplate
- 21  18  13  20  19  23  20  17  26  23  0.749884    197/200     NonOverlappingTemplate
- 24  22  24  24  24  21  13  15  17  16  0.494392    196/200     NonOverlappingTemplate
- 24  16  23  15  23  18  25  16  18  22  0.699313    199/200     NonOverlappingTemplate
- 19  23  21  16  27  18  17  20  18  21  0.859637    198/200     NonOverlappingTemplate
- 12  20  16  19  26  14  30  20  24  19  0.141256    198/200     NonOverlappingTemplate
- 18  21  17  21  20  14  25  19  24  21  0.859637    198/200     NonOverlappingTemplate
- 24  25  21  18  23  15  23  17  16  18  0.749884    199/200     NonOverlappingTemplate
- 20  22  22  18  16  22  28  16  14  22  0.574903    198/200     NonOverlappingTemplate
- 18  23  22  17  24  25  19  16  23  13  0.626709    199/200     NonOverlappingTemplate
- 17  22  14  19  21  21  18  19  24  25  0.842937    198/200     NonOverlappingTemplate
- 18  17  26  21  22  15  22  18  21  20  0.883171    197/200     NonOverlappingTemplate
- 19  25  16  32  15  19  20  18  16  20  0.236810    199/200     NonOverlappingTemplate
- 19  18  15  21  24  22  18  21  20  22  0.964295    200/200     NonOverlappingTemplate
- 21  14  17  23  26  19  20  22  20  18  0.834308    196/200     NonOverlappingTemplate
- 15  21  17  27  26  23  21  17  24   9  0.129620    198/200     NonOverlappingTemplate
- 25  17  19  19  18  22  21  22  21  16  0.951205    196/200     NonOverlappingTemplate
- 20  19  24  21  19  24  16  18  17  22  0.946308    197/200     NonOverlappingTemplate
- 27  16  19  18  23  19  22  17  22  17  0.807412    197/200     NonOverlappingTemplate
- 14  18  21  23  23  20  14  22  20  25  0.719747    198/200     NonOverlappingTemplate
- 18  22  19  12  24  25  25  22  18  15  0.474986    198/200     NonOverlappingTemplate
- 21  18  23  17  19  18  28  19  20  17  0.825505    198/200     NonOverlappingTemplate
- 20  19  15  16  27  20  26  17  20  20  0.657933    198/200     NonOverlappingTemplate
- 17  25  21  21  11  19  22  16  27  21  0.401199    198/200     NonOverlappingTemplate
- 19  16  15  18  24  19  25  25  19  20  0.769527    199/200     NonOverlappingTemplate
- 18  20  20  26  20  12  24  25  19  16  0.524101    198/200     NonOverlappingTemplate
- 14  16  18  23  21  21  19  19  28  21  0.668321    197/200     NonOverlappingTemplate
- 21  20  23  25  21  22  19  17  14  18  0.875539    197/200     NonOverlappingTemplate
- 14  16  29  22  23  13  20  29  17  17  0.099513    197/200     NonOverlappingTemplate
- 14  19  27  19  17  23  18  24  20  19  0.709558    199/200     NonOverlappingTemplate
- 18  15  21  19  27  22  21  23  17  17  0.779188    198/200     NonOverlappingTemplate
- 13  23  13  22  22  23  22  21  21  20  0.689019    199/200     NonOverlappingTemplate
- 17  14  26  26  16  21  30  15  21  14  0.096578    199/200     NonOverlappingTemplate
- 18  21  24  23  21  13  23  23  19  15  0.719747    197/200     NonOverlappingTemplate
- 19  21  14  32  20  15  16  18  24  21  0.202268    199/200     NonOverlappingTemplate
- 27  22  20  21  21  14  15  22  14  24  0.474986    196/200     NonOverlappingTemplate
- 31  12  25  11  21  18  19  16  24  23  0.050305    197/200     NonOverlappingTemplate
- 17  26  20  22  15  27  22  19  12  20  0.383827    199/200     NonOverlappingTemplate
- 15  22  14  14  31  15  27  18  23  21  0.078086    194/200     NonOverlappingTemplate
- 19  19  14  15  24  21  25  21  20  22  0.788728    197/200     NonOverlappingTemplate
- 20  21  19  22  25  18  13  24  28  10  0.153763    195/200     NonOverlappingTemplate
- 23  17  21  25  21  20  13  30  14  16  0.196920    196/200     NonOverlappingTemplate
- 17  31  17  22  16  15  28  23  11  20  0.050305    197/200     NonOverlappingTemplate
- 15  21  26  27  15  18  19  21  18  20  0.605916    198/200     NonOverlappingTemplate
- 23  18  15  14  20  21  20  20  20  29  0.554420    200/200     NonOverlappingTemplate
- 22  19  19  18  19  17  22  21  31  12  0.311542    199/200     NonOverlappingTemplate
- 16  22  23  21  19  19  18  24  21  17  0.960198    197/200     NonOverlappingTemplate
- 21  21  17  20  16  23  25  22  18  17  0.917870    200/200     NonOverlappingTemplate
- 27  17  17  16  21  20  22  18  21  21  0.859637    197/200     NonOverlappingTemplate
- 18  24  15  27  18  21  18  16  24  19  0.657933    199/200     NonOverlappingTemplate
- 13  16  21  21  15  25  18  22  29  20  0.326749    198/200     NonOverlappingTemplate
- 18  17  23  23  15  19  26  30  11  18  0.125927    198/200     NonOverlappingTemplate
- 30  21  18  22  17  21  15  17  21  18  0.544254    195/200     NonOverlappingTemplate
- 12  18  19  24  16  24  18  24  28  17  0.311542    199/200     NonOverlappingTemplate
- 20  15  23  15  18  30  23  18  17  21  0.410055    196/200     NonOverlappingTemplate
- 15  18  23  16  29  21  22  16  19  21  0.544254    200/200     NonOverlappingTemplate
- 18  16  27  13  21  22  22  21  16  24  0.534146    199/200     NonOverlappingTemplate
- 20  25  18  21  16  21  17  28  21  13  0.484646    200/200     NonOverlappingTemplate
- 23  22  13  22  14  20  26  18  19  23  0.574903    197/200     NonOverlappingTemplate
- 21  24  25  13  19  22  18  13  24  21  0.504219    199/200     NonOverlappingTemplate
- 19  13  18  25  22  15  23  28  19  18  0.410055    195/200     NonOverlappingTemplate
- 20  15  27  22  26  26  14  13  21  16  0.181557    198/200     NonOverlappingTemplate
- 18  18  19  23  18  20  19  21  24  20  0.991468    200/200     NonOverlappingTemplate
- 18  23  17  14  20  25  22  22  22  17  0.816537    198/200     NonOverlappingTemplate
- 26  15  15  11  23  21  21  16  36  16  0.005557    196/200     NonOverlappingTemplate
- 27  13  21  23  21  16  19  20  16  24  0.544254    198/200     NonOverlappingTemplate
- 16  15  32  17  20  23  22  19  20  16  0.262249    200/200     NonOverlappingTemplate
- 26  19  24  13  24  16  18  18  13  29  0.137282    199/200     NonOverlappingTemplate
- 15  18  14  27  32  21  15  20  19  19  0.112047    198/200     NonOverlappingTemplate
- 22  23  22  18  20  23  19  22  16  15  0.924076    196/200     NonOverlappingTemplate
- 18  17  21  22  14  17  22  24  20  25  0.798139    199/200     NonOverlappingTemplate
- 15  17  19  24  21  23  17  25  23  16  0.739918    196/200     NonOverlappingTemplate
- 22  11  15  26  32  25  21  13  14  21  0.017305    197/200     NonOverlappingTemplate
- 22  16  19  23  22  21  21  19  17  20  0.985788    200/200     NonOverlappingTemplate
- 22  28  18  24  14  20  23  21  20  10  0.230755    198/200     NonOverlappingTemplate
- 14  13  22  28  14  28  17  22  23  19  0.129620    197/200     NonOverlappingTemplate
- 22  16  22  20  21  21  16  19  18  25  0.935716    198/200     NonOverlappingTemplate
- 15  20  23  17  19  22  21  23  18  22  0.951205    200/200     NonOverlappingTemplate
- 20  24  21  19  17  19  19  24  15  22  0.930026    198/200     NonOverlappingTemplate
- 18  21  15  21  17  28  24  22  20  14  0.534146    200/200     NonOverlappingTemplate
- 19  15  19  19  20  20  15  25  23  25  0.779188    198/200     NonOverlappingTemplate
- 17  24  25  16  15  21  18  19  23  22  0.788728    198/200     NonOverlappingTemplate
- 15  20  18  25  24  15  21  31  18  13  0.141256    200/200     NonOverlappingTemplate
- 24  17  19  20  18  21  15  22  24  20  0.924076    196/200     NonOverlappingTemplate
- 23  18  17  21  17  28  23  21  18  14  0.605916    197/200     NonOverlappingTemplate
- 21  19  22  23  16  17  20  21  22  19  0.985788    200/200     NonOverlappingTemplate
- 27  17  21  27  24  15  15  17  15  22  0.304126    199/200     NonOverlappingTemplate
- 25  28  20  24  13  14  16  22  19  19  0.304126    197/200     NonOverlappingTemplate
- 27  16  14  24  22  18  24  20  18  17  0.564639    196/200     NonOverlappingTemplate
- 18  18  24  19  19  19  26  11  27  19  0.375313    195/200     NonOverlappingTemplate
- 20  15  29  19  26  16  21  11  18  25  0.141256    197/200     NonOverlappingTemplate
- 19  14  21  25  11  23  22  25  26  14  0.176657    199/200     NonOverlappingTemplate
- 18  23  20  17  19  18  29  22  26   8  0.102526    199/200     NonOverlappingTemplate
- 22  17  18  16  18  20  19  19  25  26  0.834308    198/200     NonOverlappingTemplate
- 25  18  14  16  16  24  18  18  30  21  0.268917    198/200     NonOverlappingTemplate
- 24  21  23  13  12  22  20  23  20  22  0.554420    196/200     NonOverlappingTemplate
- 18  21  21  30  22  17  19  14  18  20  0.534146    197/200     NonOverlappingTemplate
- 25  20  22  21  15  18  17  20  17  25  0.825505    199/200     NonOverlappingTemplate
- 18  21  22  21  18  20  26  16  20  18  0.941144    197/200     NonOverlappingTemplate
- 23  18  22  25  12  16  17  19  26  22  0.474986    198/200     NonOverlappingTemplate
- 22  18  29  23  19  23  17  17  15  17  0.534146    198/200     NonOverlappingTemplate
- 19  21  17  26  18  15  22  26  15  21  0.626709    197/200     NonOverlappingTemplate
- 16  20  20  23  18  21  18  18  25  21  0.955835    199/200     NonOverlappingTemplate
- 23  21  20  21  22  10  15  27  15  26  0.186566    198/200     NonOverlappingTemplate
- 18  26  20  26  26  18  17  17  20  12  0.358641    198/200     NonOverlappingTemplate
- 24  20  21  18  24  12  19  27  14  21  0.401199    195/200     NonOverlappingTemplate
- 16  25  15  21  24  18  18  25  22  16  0.657933    199/200     NonOverlappingTemplate
- 24  14  17  26  15  17  17  25  21  24  0.428095    200/200     NonOverlappingTemplate
- 22  24  11  20  22  24  19  18  12  28  0.176657    196/200     NonOverlappingTemplate
- 27  16  27  18  27  14  13  16  21  21  0.141256    197/200     NonOverlappingTemplate
- 23  25  20  18  23  17  15  23  19  17  0.834308    196/200     NonOverlappingTemplate
- 19  21  20  27  16  16  18  25  16  22  0.678686    199/200     NonOverlappingTemplate
- 25  22  21  19  15  19  22  19  25  13  0.657933    197/200     NonOverlappingTemplate
- 19  28  21  25  20  12  18  13  29  15  0.073417    198/200     NonOverlappingTemplate
- 20  24  21  19  21  15  17  24  20  19  0.941144    198/200     NonOverlappingTemplate
- 18  29  23  17  24  19  17  18  16  19  0.585209    200/200     NonOverlappingTemplate
- 18  28  18  16  25  21  18  20  14  22  0.544254    198/200     NonOverlappingTemplate
- 22  19  23  22  22  21  21  26  12  12  0.401199    199/200     NonOverlappingTemplate
- 22  15  25  16  21  27  14  22  21  17  0.484646    199/200     NonOverlappingTemplate
- 18  25  20  23  30  17  13  22  18  14  0.213309    200/200     NonOverlappingTemplate
- 20  23  21  21  23  29  16  13  16  18  0.410055    199/200     NonOverlappingTemplate
- 21  19  16  22  31  18  20  17  18  18  0.514124    198/200     NonOverlappingTemplate
- 26  22  12  14  23  17  21  24  21  20  0.455937    197/200     NonOverlappingTemplate
- 21  17  18  17  14  32  21  26  18  16  0.162606    197/200     NonOverlappingTemplate
- 22  24  22  23  11  15  17  18  29  19  0.230755    198/200     NonOverlappingTemplate
- 19  27  20  19  23  15  24  15  21  17  0.657933    198/200     NonOverlappingTemplate
- 20  25  16  10  24  13  23  21  21  27  0.149495    200/200     NonOverlappingTemplate
- 19  21  21  27  17  17  19  21  21  17  0.904708    200/200     NonOverlappingTemplate
- 18  23  15  19  24  21  23  21  13  23  0.719747    198/200     NonOverlappingTemplate
- 26  16  28  19  19  18  17  17  16  24  0.474986    199/200     NonOverlappingTemplate
- 24  32  17  18  20  13  18  18  19  21  0.236810    195/200     NonOverlappingTemplate
- 26  25  18  17  12  19  20  23  21  19  0.585209    196/200     NonOverlappingTemplate
- 18  26  25  12  18  16  24  19  18  24  0.410055    199/200     NonOverlappingTemplate
- 27  21  22  27  21  14  18  14  23  13  0.219006    197/200     NonOverlappingTemplate
- 18  23  24  16  19  21  16  26  20  17  0.798139    199/200     NonOverlappingTemplate
- 19  30  15  27  14  19  24  11  22  19  0.073417    198/200     NonOverlappingTemplate
- 20  23  22  20  22  15  22  21  18  17  0.964295    198/200     NonOverlappingTemplate
- 22  31  16  26  13  19  17  22  24  10  0.037566    197/200     NonOverlappingTemplate
- 18  24  22  14  23  19  16  18  19  27  0.637119    197/200     NonOverlappingTemplate
- 19  20  21  22  21  18  19  22  20  18  0.999438    198/200     NonOverlappingTemplate
- 27  15  21  18  28  18  15  23  18  17  0.375313    195/200     NonOverlappingTemplate
- 26  23  20  20  23  19  20  23  14  12  0.514124    199/200     NonOverlappingTemplate
- 18  19  11  15  21  24  20  26  23  23  0.428095    198/200     NonOverlappingTemplate
- 19  16  21  25  19  21  15  24  24  16  0.749884    197/200     NonOverlappingTemplate
- 17  26  23  18  20  26  23  14  18  15  0.494392    198/200     NonOverlappingTemplate
- 15  17  19  24  21  23  17  25  23  16  0.739918    196/200     NonOverlappingTemplate
- 26  19  20  20  24  22  22  13  14  20  0.605916    198/200     OverlappingTemplate
- 29  24  17  21  18  13  18  21  17  22  0.446556    196/200     Universal
- 22  18  22  20  20  21  22  21  18  16  0.992952    198/200     ApproximateEntropy
- 14   8  13   9  11  13  13   8   7  10  0.719747    106/106     RandomExcursions
- 13  18   9   7  12  12   9   6  12   8  0.236810    104/106     RandomExcursions
- 11  15  10   7  11  14   9   6  12  11  0.595549    106/106     RandomExcursions
- 15   7  12  12   9  11  16   8  10   6  0.350485    106/106     RandomExcursions
- 10  10  12  16  10  12  10   7  13   6  0.554420    106/106     RandomExcursions
-  8   7  12  10  11  16  11  13  10   8  0.657933    106/106     RandomExcursions
-  9   6  12  12  14   9  11  13  10  10  0.816537    104/106     RandomExcursions
- 10  10   7  12  11   9  10  13  14  10  0.911413    105/106     RandomExcursions
-  8   8  12   9  10   5  13  12  17  12  0.319084    104/106     RandomExcursionsVariant
-  5  11  10  11   7  11  10  15  11  15  0.455937    104/106     RandomExcursionsVariant
-  6  12  11   8  12  12  12  13  13   7  0.699313    104/106     RandomExcursionsVariant
- 14  10  11   6  12   9   8  12  11  13  0.779188    104/106     RandomExcursionsVariant
- 12  12  10   7  17   6   6  12  13  11  0.262249    103/106     RandomExcursionsVariant
- 13   8  14  13   7   6   6  13  15  11  0.249284    102/106     RandomExcursionsVariant
- 12  12  12  13   7   9   6  13  12  10  0.739918    105/106     RandomExcursionsVariant
- 13  15  12   8   9  10   6   9  14  10  0.574903    106/106     RandomExcursionsVariant
- 10  15   9  12  14  10   8  11   7  10  0.739918    105/106     RandomExcursionsVariant
- 13  12   8  11  12  11   9  10  11   9  0.978072    103/106     RandomExcursionsVariant
- 10  13  12  12   8  13   8   9  14   7  0.739918    104/106     RandomExcursionsVariant
- 12  10  10  14   7   8   7  13  14  11  0.657933    106/106     RandomExcursionsVariant
- 10  13  10  10  13  10  12   6  10  12  0.897763    106/106     RandomExcursionsVariant
-  9  12  15   8  13   8  12   8  11  10  0.779188    106/106     RandomExcursionsVariant
-  9  13  15  10  10  10   8  14   6  11  0.616305    106/106     RandomExcursionsVariant
-  7  17   9  12   9  11  10  16   4  11  0.129620    106/106     RandomExcursionsVariant
- 10   9  10  15   7  12   7   8  12  16  0.419021    106/106     RandomExcursionsVariant
-  9  12  11   8   8   9  15  12   9  13  0.798139    106/106     RandomExcursionsVariant
- 17  34  11  22  22  17  19  20  13  25  0.026057    199/200     Serial
- 22  20  16  22  20  18  20  18  23  21  0.989786    199/200     Serial
- 12  33  25  29  21  11  21  15  14  19  0.003996    199/200     LinearComplexity
-
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-The minimum pass rate for each statistical test with the exception of the
-random excursion (variant) test is approximately = 193 for a
-sample size = 200 binary sequences.
-
-The minimum pass rate for the random excursion (variant) test
-is approximately = 101 for a sample size = 106 binary sequences.
-
-For further guidelines construct a probability table using the MAPLE program
-provided in the addendum section of the documentation.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-$
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/permute.go b/Godeps/_workspace/src/github.com/cznic/mathutil/permute.go
deleted file mode 100644
index bf828b694f..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/permute.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2014 The mathutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mathutil
-
-import (
-	"sort"
-)
-
-// Generate the first permutation of data.
-func PermutationFirst(data sort.Interface) {
-	sort.Sort(data)
-}
-
-// Generate the next permutation of data if possible and return true.
-// Return false if there is no more permutation left.
-// Based on the algorithm described here:
-// http://en.wikipedia.org/wiki/Permutation#Generation_in_lexicographic_order
-func PermutationNext(data sort.Interface) bool {
-	var k, l int
-	for k = data.Len() - 2; ; k-- { // 1.
-		if k < 0 {
-			return false
-		}
-
-		if data.Less(k, k+1) {
-			break
-		}
-	}
-	for l = data.Len() - 1; !data.Less(k, l); l-- { // 2.
-	}
-	data.Swap(k, l)                             // 3.
-	for i, j := k+1, data.Len()-1; i < j; i++ { // 4.
-		data.Swap(i, j)
-		j--
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/primes.go b/Godeps/_workspace/src/github.com/cznic/mathutil/primes.go
deleted file mode 100644
index 2c82eb033e..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/primes.go
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright (c) 2014 The mathutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mathutil
-
-import (
-	"math"
-)
-
-// IsPrimeUint16 returns true if n is prime. Typical run time is few ns.
-func IsPrimeUint16(n uint16) bool {
-	return n > 0 && primes16[n-1] == 1
-}
-
-// NextPrimeUint16 returns first prime > n and true if successful or an
-// undefined value and false if there is no next prime in the uint16 limits.
-// Typical run time is few ns.
-func NextPrimeUint16(n uint16) (p uint16, ok bool) {
-	return n + uint16(primes16[n]), n < 65521
-}
-
-// IsPrime returns true if n is prime. Typical run time is about 100 ns.
-//
-//TODO rename to IsPrimeUint32
-func IsPrime(n uint32) bool {
-	switch {
-	case n&1 == 0:
-		return n == 2
-	case n%3 == 0:
-		return n == 3
-	case n%5 == 0:
-		return n == 5
-	case n%7 == 0:
-		return n == 7
-	case n%11 == 0:
-		return n == 11
-	case n%13 == 0:
-		return n == 13
-	case n%17 == 0:
-		return n == 17
-	case n%19 == 0:
-		return n == 19
-	case n%23 == 0:
-		return n == 23
-	case n%29 == 0:
-		return n == 29
-	case n%31 == 0:
-		return n == 31
-	case n%37 == 0:
-		return n == 37
-	case n%41 == 0:
-		return n == 41
-	case n%43 == 0:
-		return n == 43
-	case n%47 == 0:
-		return n == 47
-	case n%53 == 0:
-		return n == 53 // Benchmarked optimum
-	case n < 65536:
-		// use table data
-		return IsPrimeUint16(uint16(n))
-	default:
-		mod := ModPowUint32(2, (n+1)/2, n)
-		if mod != 2 && mod != n-2 {
-			return false
-		}
-		blk := &lohi[n>>24]
-		lo, hi := blk.lo, blk.hi
-		for lo <= hi {
-			index := (lo + hi) >> 1
-			liar := liars[index]
-			switch {
-			case n > liar:
-				lo = index + 1
-			case n < liar:
-				hi = index - 1
-			default:
-				return false
-			}
-		}
-		return true
-	}
-}
-
-// IsPrimeUint64 returns true if n is prime. Typical run time is few tens of µs.
-//
-// SPRP bases: http://miller-rabin.appspot.com
-func IsPrimeUint64(n uint64) bool {
-	switch {
-	case n%2 == 0:
-		return n == 2
-	case n%3 == 0:
-		return n == 3
-	case n%5 == 0:
-		return n == 5
-	case n%7 == 0:
-		return n == 7
-	case n%11 == 0:
-		return n == 11
-	case n%13 == 0:
-		return n == 13
-	case n%17 == 0:
-		return n == 17
-	case n%19 == 0:
-		return n == 19
-	case n%23 == 0:
-		return n == 23
-	case n%29 == 0:
-		return n == 29
-	case n%31 == 0:
-		return n == 31
-	case n%37 == 0:
-		return n == 37
-	case n%41 == 0:
-		return n == 41
-	case n%43 == 0:
-		return n == 43
-	case n%47 == 0:
-		return n == 47
-	case n%53 == 0:
-		return n == 53
-	case n%59 == 0:
-		return n == 59
-	case n%61 == 0:
-		return n == 61
-	case n%67 == 0:
-		return n == 67
-	case n%71 == 0:
-		return n == 71
-	case n%73 == 0:
-		return n == 73
-	case n%79 == 0:
-		return n == 79
-	case n%83 == 0:
-		return n == 83
-	case n%89 == 0:
-		return n == 89 // Benchmarked optimum
-	case n <= math.MaxUint16:
-		return IsPrimeUint16(uint16(n))
-	case n <= math.MaxUint32:
-		return ProbablyPrimeUint32(uint32(n), 11000544) &&
-			ProbablyPrimeUint32(uint32(n), 31481107)
-	case n < 105936894253:
-		return ProbablyPrimeUint64_32(n, 2) &&
-			ProbablyPrimeUint64_32(n, 1005905886) &&
-			ProbablyPrimeUint64_32(n, 1340600841)
-	case n < 31858317218647:
-		return ProbablyPrimeUint64_32(n, 2) &&
-			ProbablyPrimeUint64_32(n, 642735) &&
-			ProbablyPrimeUint64_32(n, 553174392) &&
-			ProbablyPrimeUint64_32(n, 3046413974)
-	case n < 3071837692357849:
-		return ProbablyPrimeUint64_32(n, 2) &&
-			ProbablyPrimeUint64_32(n, 75088) &&
-			ProbablyPrimeUint64_32(n, 642735) &&
-			ProbablyPrimeUint64_32(n, 203659041) &&
-			ProbablyPrimeUint64_32(n, 3613982119)
-	default:
-		return ProbablyPrimeUint64_32(n, 2) &&
-			ProbablyPrimeUint64_32(n, 325) &&
-			ProbablyPrimeUint64_32(n, 9375) &&
-			ProbablyPrimeUint64_32(n, 28178) &&
-			ProbablyPrimeUint64_32(n, 450775) &&
-			ProbablyPrimeUint64_32(n, 9780504) &&
-			ProbablyPrimeUint64_32(n, 1795265022)
-	}
-}
-
-// NextPrime returns first prime > n and true if successful or an undefined value and false if there
-// is no next prime in the uint32 limits. Typical run time is about 2 µs.
-//
-//TODO rename to NextPrimeUint32
-func NextPrime(n uint32) (p uint32, ok bool) {
-	switch {
-	case n < 65521:
-		p16, _ := NextPrimeUint16(uint16(n))
-		return uint32(p16), true
-	case n >= math.MaxUint32-4:
-		return
-	}
-
-	n++
-	var d0, d uint32
-	switch mod := n % 6; mod {
-	case 0:
-		d0, d = 1, 4
-	case 1:
-		d = 4
-	case 2, 3, 4:
-		d0, d = 5-mod, 2
-	case 5:
-		d = 2
-	}
-
-	p = n + d0
-	if p < n { // overflow
-		return
-	}
-
-	for {
-		if IsPrime(p) {
-			return p, true
-		}
-
-		p0 := p
-		p += d
-		if p < p0 { // overflow
-			break
-		}
-
-		d ^= 6
-	}
-	return
-}
-
-// NextPrimeUint64 returns first prime > n and true if successful or an undefined value and false if there
-// is no next prime in the uint64 limits. Typical run time is in hundreds of µs.
-func NextPrimeUint64(n uint64) (p uint64, ok bool) {
-	switch {
-	case n < 65521:
-		p16, _ := NextPrimeUint16(uint16(n))
-		return uint64(p16), true
-	case n >= 18446744073709551557: // last uint64 prime
-		return
-	}
-
-	n++
-	var d0, d uint64
-	switch mod := n % 6; mod {
-	case 0:
-		d0, d = 1, 4
-	case 1:
-		d = 4
-	case 2, 3, 4:
-		d0, d = 5-mod, 2
-	case 5:
-		d = 2
-	}
-
-	p = n + d0
-	if p < n { // overflow
-		return
-	}
-
-	for {
-		if ok = IsPrimeUint64(p); ok {
-			break
-		}
-
-		p0 := p
-		p += d
-		if p < p0 { // overflow
-			break
-		}
-
-		d ^= 6
-	}
-	return
-}
-
-// FactorTerm is one term of an integer factorization.
-type FactorTerm struct {
-	Prime uint32 // The divisor
-	Power uint32 // Term == Prime^Power
-}
-
-// FactorTerms represent a factorization of an integer
-type FactorTerms []FactorTerm
-
-// FactorInt returns prime factorization of n > 1 or nil otherwise.
-// Resulting factors are ordered by Prime. Typical run time is few µs.
-func FactorInt(n uint32) (f FactorTerms) {
-	switch {
-	case n < 2:
-		return
-	case IsPrime(n):
-		return []FactorTerm{{n, 1}}
-	}
-
-	f, w := make([]FactorTerm, 9), 0
-	prime16 := uint16(0)
-	for {
-		var ok bool
-		if prime16, ok = NextPrimeUint16(prime16); !ok {
-			break
-		}
-
-		prime := uint32(prime16)
-		if prime*prime > n {
-			break
-		}
-
-		power := uint32(0)
-		for n%prime == 0 {
-			n /= prime
-			power++
-		}
-		if power != 0 {
-			f[w] = FactorTerm{prime, power}
-			w++
-		}
-		if n == 1 {
-			break
-		}
-	}
-	if n != 1 {
-		f[w] = FactorTerm{n, 1}
-		w++
-	}
-	return f[:w]
-}
-
-// PrimorialProductsUint32 returns a slice of numbers in [lo, hi] which are a
-// product of max 'max' primorials. The slice is not sorted.
-//
-// See also: http://en.wikipedia.org/wiki/Primorial
-func PrimorialProductsUint32(lo, hi, max uint32) (r []uint32) {
-	lo64, hi64 := int64(lo), int64(hi)
-	if max > 31 { // N/A
-		max = 31
-	}
-
-	var f func(int64, int64, uint32)
-	f = func(n, p int64, emax uint32) {
-		e := uint32(1)
-		for n <= hi64 && e <= emax {
-			n *= p
-			if n >= lo64 && n <= hi64 {
-				r = append(r, uint32(n))
-			}
-			if n < hi64 {
-				p, _ := NextPrime(uint32(p))
-				f(n, int64(p), e)
-			}
-			e++
-		}
-	}
-
-	f(1, 2, max)
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/rat.go b/Godeps/_workspace/src/github.com/cznic/mathutil/rat.go
deleted file mode 100644
index 91b1c6fb1e..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/rat.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2014 The mathutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mathutil
-
-// QCmpUint32 compares a/b and c/d and returns:
-//
-//   -1 if a/b <  c/d
-//    0 if a/b == c/d
-//   +1 if a/b >  c/d
-//
-func QCmpUint32(a, b, c, d uint32) int {
-	switch x, y := uint64(a)*uint64(d), uint64(b)*uint64(c); {
-	case x < y:
-		return -1
-	case x == y:
-		return 0
-	default: // x > y
-		return 1
-	}
-}
-
-// QScaleUint32 returns a such that a/b >= c/d.
-func QScaleUint32(b, c, d uint32) (a uint64) {
-	return 1 + (uint64(b)*uint64(c))/uint64(d)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/rnd.go b/Godeps/_workspace/src/github.com/cznic/mathutil/rnd.go
deleted file mode 100644
index 9132dc0d55..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/rnd.go
+++ /dev/null
@@ -1,383 +0,0 @@
-// Copyright (c) 2014 The mathutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mathutil
-
-import (
-	"fmt"
-	"math"
-	"math/big"
-)
-
-// FC32 is a full cycle PRNG covering the 32 bit signed integer range.
-// In contrast to full cycle generators shown at e.g. http://en.wikipedia.org/wiki/Full_cycle,
-// this code doesn't produce values at constant delta (mod cycle length).
-// The 32 bit limit is per this implementation, the algorithm used has no intrinsic limit on the cycle size.
-// Properties include:
-//	- Adjustable limits on creation (hi, lo).
-//	- Positionable/randomly accessible (Pos, Seek).
-//	- Repeatable (deterministic).
-//	- Can run forward or backward (Next, Prev).
-//	- For a billion numbers cycle the Next/Prev PRN can be produced in cca 100-150ns.
-//	  That's like 5-10 times slower compared to PRNs generated using the (non FC) rand package.
-type FC32 struct {
-	cycle   int64     // On average: 3 * delta / 2, (HQ: 2 * delta)
-	delta   int64     // hi - lo
-	factors [][]int64 // This trades some space for hopefully a bit of speed (multiple adding vs multiplying).
-	lo      int
-	mods    []int   // pos % set
-	pos     int64   // Within cycle.
-	primes  []int64 // Ordered. ∏ primes == cycle.
-	set     []int64 // Reordered primes (magnitude order bases) according to seed.
-}
-
-// NewFC32 returns a newly created FC32 adjusted for the closed interval [lo, hi] or an Error if any.
-// If hq == true then trade some generation time for improved (pseudo)randomness.
-func NewFC32(lo, hi int, hq bool) (r *FC32, err error) {
-	if lo > hi {
-		return nil, fmt.Errorf("invalid range %d > %d", lo, hi)
-	}
-
-	if uint64(hi)-uint64(lo) > math.MaxUint32 {
-		return nil, fmt.Errorf("range out of int32 limits %d, %d", lo, hi)
-	}
-
-	delta := int64(hi) - int64(lo)
-	// Find the primorial covering whole delta
-	n, set, p := int64(1), []int64{}, uint32(2)
-	if hq {
-		p++
-	}
-	for {
-		set = append(set, int64(p))
-		n *= int64(p)
-		if n > delta {
-			break
-		}
-		p, _ = NextPrime(p)
-	}
-
-	// Adjust the set so n ∊ [delta, 2 * delta] (HQ: [delta, 3 * delta])
-	// while keeping the cardinality of the set (correlates with the statistic "randomness quality")
-	// at max, i.e. discard atmost one member.
-	i := -1 // no candidate prime
-	if n > 2*(delta+1) {
-		for j, p := range set {
-			q := n / p
-			if q < delta+1 {
-				break
-			}
-
-			i = j // mark the highest candidate prime set index
-		}
-	}
-	if i >= 0 { // shrink the inner cycle
-		n = n / set[i]
-		set = delete(set, i)
-	}
-	r = &FC32{
-		cycle:   n,
-		delta:   delta,
-		factors: make([][]int64, len(set)),
-		lo:      lo,
-		mods:    make([]int, len(set)),
-		primes:  set,
-	}
-	r.Seed(1) // the default seed should be always non zero
-	return
-}
-
-// Cycle reports the length of the inner FCPRNG cycle.
-// Cycle is atmost the double (HQ: triple) of the generator period (hi - lo + 1).
-func (r *FC32) Cycle() int64 {
-	return r.cycle
-}
-
-// Next returns the first PRN after Pos.
-func (r *FC32) Next() int {
-	return r.step(1)
-}
-
-// Pos reports the current position within the inner cycle.
-func (r *FC32) Pos() int64 {
-	return r.pos
-}
-
-// Prev return the first PRN before Pos.
-func (r *FC32) Prev() int {
-	return r.step(-1)
-}
-
-// Seed uses the provided seed value to initialize the generator to a deterministic state.
-// A zero seed produces a "canonical" generator with worse randomness than for most non zero seeds.
-// Still, the FC property holds for any seed value.
-func (r *FC32) Seed(seed int64) {
-	u := uint64(seed)
-	r.set = mix(r.primes, &u)
-	n := int64(1)
-	for i, p := range r.set {
-		k := make([]int64, p)
-		v := int64(0)
-		for j := range k {
-			k[j] = v
-			v += n
-		}
-		n *= p
-		r.factors[i] = mix(k, &u)
-	}
-}
-
-// Seek sets Pos to |pos| % Cycle.
-func (r *FC32) Seek(pos int64) { //vet:ignore
-	if pos < 0 {
-		pos = -pos
-	}
-	pos %= r.cycle
-	r.pos = pos
-	for i, p := range r.set {
-		r.mods[i] = int(pos % p)
-	}
-}
-
-func (r *FC32) step(dir int) int {
-	for { // avg loops per step: 3/2 (HQ: 2)
-		y := int64(0)
-		pos := r.pos
-		pos += int64(dir)
-		switch {
-		case pos < 0:
-			pos = r.cycle - 1
-		case pos >= r.cycle:
-			pos = 0
-		}
-		r.pos = pos
-		for i, mod := range r.mods {
-			mod += dir
-			p := int(r.set[i])
-			switch {
-			case mod < 0:
-				mod = p - 1
-			case mod >= p:
-				mod = 0
-			}
-			r.mods[i] = mod
-			y += r.factors[i][mod]
-		}
-		if y <= r.delta {
-			return int(y) + r.lo
-		}
-	}
-}
-
-func delete(set []int64, i int) (y []int64) {
-	for j, v := range set {
-		if j != i {
-			y = append(y, v)
-		}
-	}
-	return
-}
-
-func mix(set []int64, seed *uint64) (y []int64) {
-	for len(set) != 0 {
-		*seed = rol(*seed)
-		i := int(*seed % uint64(len(set)))
-		y = append(y, set[i])
-		set = delete(set, i)
-	}
-	return
-}
-
-func rol(u uint64) (y uint64) {
-	y = u << 1
-	if int64(u) < 0 {
-		y |= 1
-	}
-	return
-}
-
-// FCBig is a full cycle PRNG covering ranges outside of the int32 limits.
-// For more info see the FC32 docs.
-// Next/Prev PRN on a 1e15 cycle can be produced in about 2 µsec.
-type FCBig struct {
-	cycle   *big.Int     // On average: 3 * delta / 2, (HQ: 2 * delta)
-	delta   *big.Int     // hi - lo
-	factors [][]*big.Int // This trades some space for hopefully a bit of speed (multiple adding vs multiplying).
-	lo      *big.Int
-	mods    []int    // pos % set
-	pos     *big.Int // Within cycle.
-	primes  []int64  // Ordered. ∏ primes == cycle.
-	set     []int64  // Reordered primes (magnitude order bases) according to seed.
-}
-
-// NewFCBig returns a newly created FCBig adjusted for the closed interval [lo, hi] or an Error if any.
-// If hq == true then trade some generation time for improved (pseudo)randomness.
-func NewFCBig(lo, hi *big.Int, hq bool) (r *FCBig, err error) {
-	if lo.Cmp(hi) > 0 {
-		return nil, fmt.Errorf("invalid range %d > %d", lo, hi)
-	}
-
-	delta := big.NewInt(0)
-	delta.Add(delta, hi).Sub(delta, lo)
-
-	// Find the primorial covering whole delta
-	n, set, pp, p := big.NewInt(1), []int64{}, big.NewInt(0), uint32(2)
-	if hq {
-		p++
-	}
-	for {
-		set = append(set, int64(p))
-		pp.SetInt64(int64(p))
-		n.Mul(n, pp)
-		if n.Cmp(delta) > 0 {
-			break
-		}
-		p, _ = NextPrime(p)
-	}
-
-	// Adjust the set so n ∊ [delta, 2 * delta] (HQ: [delta, 3 * delta])
-	// while keeping the cardinality of the set (correlates with the statistic "randomness quality")
-	// at max, i.e. discard atmost one member.
-	dd1 := big.NewInt(1)
-	dd1.Add(dd1, delta)
-	dd2 := big.NewInt(0)
-	dd2.Lsh(dd1, 1)
-	i := -1 // no candidate prime
-	if n.Cmp(dd2) > 0 {
-		q := big.NewInt(0)
-		for j, p := range set {
-			pp.SetInt64(p)
-			q.Set(n)
-			q.Div(q, pp)
-			if q.Cmp(dd1) < 0 {
-				break
-			}
-
-			i = j // mark the highest candidate prime set index
-		}
-	}
-	if i >= 0 { // shrink the inner cycle
-		pp.SetInt64(set[i])
-		n.Div(n, pp)
-		set = delete(set, i)
-	}
-	r = &FCBig{
-		cycle:   n,
-		delta:   delta,
-		factors: make([][]*big.Int, len(set)),
-		lo:      lo,
-		mods:    make([]int, len(set)),
-		pos:     big.NewInt(0),
-		primes:  set,
-	}
-	r.Seed(1) // the default seed should be always non zero
-	return
-}
-
-// Cycle reports the length of the inner FCPRNG cycle.
-// Cycle is atmost the double (HQ: triple) of the generator period (hi - lo + 1).
-func (r *FCBig) Cycle() *big.Int {
-	return r.cycle
-}
-
-// Next returns the first PRN after Pos.
-func (r *FCBig) Next() *big.Int {
-	return r.step(1)
-}
-
-// Pos reports the current position within the inner cycle.
-func (r *FCBig) Pos() *big.Int {
-	return r.pos
-}
-
-// Prev return the first PRN before Pos.
-func (r *FCBig) Prev() *big.Int {
-	return r.step(-1)
-}
-
-// Seed uses the provided seed value to initialize the generator to a deterministic state.
-// A zero seed produces a "canonical" generator with worse randomness than for most non zero seeds.
-// Still, the FC property holds for any seed value.
-func (r *FCBig) Seed(seed int64) {
-	u := uint64(seed)
-	r.set = mix(r.primes, &u)
-	n := big.NewInt(1)
-	v := big.NewInt(0)
-	pp := big.NewInt(0)
-	for i, p := range r.set {
-		k := make([]*big.Int, p)
-		v.SetInt64(0)
-		for j := range k {
-			k[j] = big.NewInt(0)
-			k[j].Set(v)
-			v.Add(v, n)
-		}
-		pp.SetInt64(p)
-		n.Mul(n, pp)
-		r.factors[i] = mixBig(k, &u)
-	}
-}
-
-// Seek sets Pos to |pos| % Cycle.
-func (r *FCBig) Seek(pos *big.Int) {
-	r.pos.Set(pos)
-	r.pos.Abs(r.pos)
-	r.pos.Mod(r.pos, r.cycle)
-	mod := big.NewInt(0)
-	pp := big.NewInt(0)
-	for i, p := range r.set {
-		pp.SetInt64(p)
-		r.mods[i] = int(mod.Mod(r.pos, pp).Int64())
-	}
-}
-
-func (r *FCBig) step(dir int) (y *big.Int) {
-	y = big.NewInt(0)
-	d := big.NewInt(int64(dir))
-	for { // avg loops per step: 3/2 (HQ: 2)
-		r.pos.Add(r.pos, d)
-		switch {
-		case r.pos.Sign() < 0:
-			r.pos.Add(r.pos, r.cycle)
-		case r.pos.Cmp(r.cycle) >= 0:
-			r.pos.SetInt64(0)
-		}
-		for i, mod := range r.mods {
-			mod += dir
-			p := int(r.set[i])
-			switch {
-			case mod < 0:
-				mod = p - 1
-			case mod >= p:
-				mod = 0
-			}
-			r.mods[i] = mod
-			y.Add(y, r.factors[i][mod])
-		}
-		if y.Cmp(r.delta) <= 0 {
-			y.Add(y, r.lo)
-			return
-		}
-		y.SetInt64(0)
-	}
-}
-
-func deleteBig(set []*big.Int, i int) (y []*big.Int) {
-	for j, v := range set {
-		if j != i {
-			y = append(y, v)
-		}
-	}
-	return
-}
-
-func mixBig(set []*big.Int, seed *uint64) (y []*big.Int) {
-	for len(set) != 0 {
-		*seed = rol(*seed)
-		i := int(*seed % uint64(len(set)))
-		y = append(y, set[i])
-		set = deleteBig(set, i)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/tables.go b/Godeps/_workspace/src/github.com/cznic/mathutil/tables.go
deleted file mode 100644
index f32952c007..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/tables.go
+++ /dev/null
@@ -1,6995 +0,0 @@
-// Copyright (c) 2014 The mathutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// "Static" data
-
-package mathutil
-
-var (
-	// Set bits count in a byte
-	popcnt = [256]byte{
-		0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, // 0
-		1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, // 1
-		1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, // 2
-		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 3
-		1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, // 4
-		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 5
-		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 6
-		3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, // 7
-		1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, // 8
-		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 9
-		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 10
-		3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, // 11
-		2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, // 12
-		3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, // 13
-		3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, // 14
-		4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8, // 15
-	}
-
-	// Highest set bit index in a byte
-	log2 = [256]int{
-		-1, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, // 0
-
-		4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, // 1
-
-		5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, // 2
-		5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, // 3
-
-		6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, // 4
-		6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, // 5
-		6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, // 6
-		6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, // 7
-
-		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 8
-		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 9
-		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 10
-		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 11
-		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 12
-		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 13
-		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 14
-		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // 15
-	}
-
-	// "Predivisors": 2-53
-	liars = [3660]uint32{
-		31621, 42799, 49141, 49981, 65077, 65281, 80581, 83333, 88357, 90751,
-		104653, 130561, 164737, 188057, 194221, 196093, 215749, 219781, 220729, 253241,
-		256999, 271951, 280601, 282133, 357761, 390937, 458989, 486737, 489997, 514447,
-		580337, 587861, 611701, 647089, 653333, 657901, 665281, 665333, 688213, 710533,
-		721801, 722261, 738541, 741751, 742813, 745889, 769757, 818201, 838861, 873181,
-		877099, 916327, 976873, 983401, 1016801, 1018921, 1053761, 1064053, 1073021, 1082401,
-		1109461, 1132657, 1145257, 1168513, 1194649, 1207361, 1251949, 1252697, 1302451, 1325843,
-		1357441, 1373653, 1397419, 1441091, 1493857, 1507963, 1509709, 1530787, 1584133, 1678541,
-		1690501, 1730977, 1735841, 1811573, 1876393, 1969417, 1987021, 2004403, 2081713, 2163001,
-		2181961, 2205967, 2261953, 2264369, 2269093, 2284453, 2304167, 2387797, 2487941, 2510569,
-		2670361, 2746477, 2748023, 2757241, 2811271, 2909197, 2944261, 2976487, 3048841, 3090091,
-		3116107, 3125281, 3225601, 3363121, 3375041, 3400013, 3413533, 3429037, 3539101, 3542533,
-		3567481, 3568661, 3605429, 3656449, 3763801, 3828001, 3898129, 3911197, 3985921, 4072729,
-		4181921, 4188889, 4209661, 4360621, 4469471, 4480477, 4513841, 4835209, 4863127, 4869313,
-		4877641, 4922413, 5016191, 5044033, 5095177, 5173169, 5173601, 5176153, 5256091, 5271841,
-		5284333, 5351537, 5489641, 5590621, 5672041, 5919187, 6027193, 6118141, 6140161, 6159301,
-		6189121, 6226193, 6233977, 6236257, 6278533, 6334351, 6368689, 6386993, 6631549, 6658669,
-		6779137, 6787327, 6836233, 6952037, 6955541, 6998881, 7017193, 7232321, 7306261, 7306561,
-		7429117, 7462001, 7674967, 7725901, 7759937, 7820201, 7883731, 8036033, 8095447, 8239477,
-		8384513, 8534233, 8725753, 8727391, 8902741, 9006401, 9056501, 9073513, 9131401, 9345541,
-		9371251, 9439201, 9480461, 9533701, 9564169, 9567673, 9588151, 9591661, 9729301, 9774181,
-		9863461, 10024561, 10084177, 10323769, 10331141, 10386241, 10425511, 10610063, 10700761, 10712857,
-		10763653, 10974881, 11081459, 11115037, 11335501, 11541307, 11585293, 11592397, 11777599, 12032021,
-		12096613, 12263131, 12322133, 12327121, 12599233, 12854437, 13057787, 13338371, 13446253, 13500313,
-		13635289, 13694761, 13747361, 13773061, 14026897, 14154337, 14179537, 14324473, 14469841, 14671801,
-		14676481, 14709241, 14794081, 14796289, 14865121, 15101893, 15139199, 15162941, 15188557, 15220951,
-		15247621, 15479777, 15525241, 15603391, 15621409, 15700301, 15802681, 15976747, 15978007, 16070429,
-		16132321, 16149169, 16153633, 16324001, 16349477, 16360381, 16705021, 16773121, 16822081, 16843009,
-		16853077, 16879501, 16973393, 17098369, 17116837, 17134043, 17208601, 17236801, 17327773, 17375249,
-		17405537, 17585969, 17870561, 18067501, 18073817, 18366937, 18443701, 18454921, 18535177, 18653353,
-		18740971, 19328653, 19384289, 19404139, 19471033, 19607561, 20261251, 20417311, 20647621, 20968501,
-		21042001, 21303343, 21306157, 21359521, 21397381, 21400481, 21623659, 21654533, 22075579, 22087477,
-		22369621, 22591301, 22669501, 22711873, 22849481, 22953673, 23247901, 23382529, 23464033, 23577497,
-		23634181, 23734901, 23828017, 23872213, 23963869, 24214051, 24356377, 25080101, 25150501, 25276421,
-		25326001, 25457833, 25629913, 25696133, 25768261, 25909453, 26280073, 26377921, 26821601, 26840269,
-		26877421, 26886817, 27108397, 27118601, 27219697, 27271151, 27279409, 27331921, 27380831, 27392041,
-		27409541, 27491237, 27509653, 27664033, 27798461, 27808463, 28325881, 28527049, 28572961, 29111881,
-		29214541, 29581501, 30022129, 30090817, 30185569, 30219757, 30295141, 30338593, 30388753, 30418957,
-		30576151, 30662497, 30740417, 30881551, 30894307, 31040833, 31166803, 31436123, 31735621, 31759121,
-		32091781, 32095057, 32168117, 32285041, 32497921, 32676481, 33146717, 33298337, 33600533, 33627301,
-		33704101, 33872593, 34003061, 34043101, 34124641, 34540801, 34856167, 34944001, 35576599, 35703361,
-		35820937, 35851037, 36291193, 36307981, 36861901, 36919681, 36974341, 37109467, 37376509, 37439201,
-		37964809, 37988497, 38010307, 38046817, 38118763, 38210323, 39465091, 39512773, 39655153, 39684157,
-		40165093, 40238797, 40315441, 40361197, 40629601, 40782589, 40827473, 40987201, 41121433, 41568101,
-		41604109, 41642681, 41662297, 41840809, 42009217, 42485119, 42623017, 42984589, 43224397, 43363601,
-		43661257, 44070841, 44314129, 44465221, 44482901, 45100177, 45175201, 45219329, 45414433, 45819541,
-		45879941, 46094401, 46325029, 46386589, 46469809, 46517857, 46679761, 46860001, 47220367, 47903701,
-		47918581, 48064021, 48191653, 48269761, 48316969, 48400753, 48448661, 48551161, 48563089, 49075417,
-		49303801, 49411801, 49459801, 50155733, 50201089, 50443201, 50523661, 51030601, 51129781, 51302353,
-		51500521, 52072021, 52119289, 52204237, 53283169, 53399449, 53656021, 53675623, 53695721, 53711113,
-		54029741, 54449431, 55109401, 55176097, 55318957, 55729957, 56052361, 56420033, 56479897, 56810137,
-		57762433, 58003213, 58422409, 58449847, 58509977, 58679941, 58755877, 59631211, 59840537, 59913157,
-		59953741, 60155201, 60352921, 60547831, 60566431, 60581401, 60696661, 60738257, 60957361, 61201009,
-		61219789, 61377109, 61832377, 62756641, 63001801, 63002501, 63065281, 63167743, 63318169, 63328469,
-		63346999, 63388033, 64148717, 64605041, 64735897, 65144501, 65254393, 65301013, 65350801, 65359477,
-		66096253, 67194401, 67642513, 67928221, 68102641, 68154001, 68165761, 68512867, 68621701, 68839597,
-		69030901, 69128641, 69176647, 69228967, 69231061, 69485281, 69612061, 69885649, 70149631, 70463489,
-		70593931, 70728121, 71079661, 71734417, 72498253, 72543547, 73562833, 73645001, 74411131, 74927161,
-		75140137, 75565873, 76725091, 76745101, 77533123, 77648941, 77812153, 77817979, 78939089, 79398901,
-		79411201, 79417801, 79464533, 79786523, 80142761, 80146909, 80375707, 80556337, 80687881, 80891009,
-		81433591, 81954133, 82273201, 82506439, 82870517, 82929001, 83083001, 83103329, 83204801, 84164033,
-		84350561, 84421081, 84487457, 84998503, 85328717, 85519337, 85823401, 86027329, 86438857, 86530621,
-		86999837, 87499651, 87694261, 88256449, 88368853, 88661861, 89308771, 89784581, 90270613, 90278161,
-		90341197, 90665789, 90698401, 91433281, 91659283, 92438581, 92625121, 93431521, 93541537, 93571633,
-		93643201, 93677761, 93926197, 94316401, 94502701, 95451361, 95452781, 96135601, 96618397, 96791881,
-		96888641, 96895441, 96904081, 96925921, 97255801, 97496449, 97796953, 97863529, 97924217, 99036001,
-		99115297, 99486889, 99789673, 99898801, 100463443, 100618933, 100943201, 101152133, 101218921, 101270251,
-		101276579, 101649241, 102004421, 102678031, 102690677, 102690901, 103301633, 104078857, 104524421, 104988673,
-		105305443, 105919633, 106485121, 106622353, 106743073, 107360641, 107543333, 108596953, 109231229, 109437751,
-		109541461, 109879837, 110135821, 110139499, 110312773, 110413333, 110717861, 111370141, 111654401, 112032001,
-		112402981, 112828801, 113589601, 113605201, 113730481, 113892589, 114305441, 114329881, 114701341, 114842677,
-		114910489, 115039081, 115174681, 115497901, 115804501, 115873801, 116090081, 116321617, 116617289, 116682721,
-		116696161, 116998669, 117987841, 118466401, 118901521, 119092801, 119204809, 119261113, 119327041, 119558011,
-		119743537, 119940853, 120296677, 120517021, 120838609, 121062001, 121374241, 121472359, 121609489, 122166307,
-		122396737, 122941981, 123481777, 123671671, 123877081, 123987793, 124145473, 124630273, 124818601, 125284141,
-		125686241, 125848577, 126132553, 127050067, 128079409, 128124151, 128396921, 128468957, 128665319, 128987429,
-		129205781, 129256273, 129357061, 129461617, 129524669, 130556329, 130693393, 130944133, 131023201, 131567929,
-		131938561, 132332201, 132338881, 132440521, 132575071, 133216381, 133302781, 133467517, 133800661, 134696801,
-		134767153, 134868029, 135263269, 135296053, 135308881, 135945853, 135969401, 136043641, 136661201, 136722433,
-		137415821, 137763037, 138030721, 138403981, 138828821, 139295701, 139487041, 140197051, 142525333, 142922413,
-		143106133, 143168581, 145348529, 146156617, 146272901, 146659801, 146843929, 146884393, 147028001, 147287141,
-		148109473, 148171769, 148910653, 149389633, 150379693, 150960239, 150988753, 151533377, 151589881, 152716537,
-		152922001, 152991841, 153369061, 153589801, 153754873, 153928133, 154287451, 154513633, 154944533, 155203361,
-		156114061, 156532799, 157069189, 157368661, 157405249, 157725829, 158068153, 158192317, 158397247, 158496911,
-		158544401, 158895281, 160348189, 160378861, 160491329, 160587841, 160672201, 160730389, 161184013, 161216021,
-		161289649, 161304001, 161423377, 162026869, 162067441, 162690481, 162771337, 162776041, 163442551, 163954561,
-		164111281, 165061909, 165224321, 165938653, 166082309, 166339057, 166406561, 166827943, 167579497, 167582377,
-		167692141, 167881121, 168566501, 169655641, 170640961, 170782921, 170856533, 171454321, 172116181, 172436713,
-		172947529, 173401621, 174479729, 176030977, 176597821, 176609441, 176977921, 177167233, 177254533, 177693521,
-		177927641, 177951973, 178837201, 178956971, 179083601, 179285137, 179820257, 180115489, 180497633, 180703451,
-		181285001, 181285537, 181542601, 181647497, 182383111, 183677341, 184411567, 185653333, 186183469, 186393481,
-		186983521, 187050529, 187667969, 187761241, 188516329, 188985961, 189714193, 189738361, 189941761, 190212181,
-		190382161, 190913297, 191233813, 191648161, 191981609, 192346153, 192857761, 193330237, 193638337, 193949641,
-		194556451, 196035001, 196049701, 196231393, 198982759, 199674721, 200143351, 200753281, 201261061, 202130197,
-		202156813, 202538857, 203505697, 204280501, 204582457, 204766381, 205057561, 206304961, 206453509, 206504033,
-		206529737, 207008569, 207030541, 207132481, 207477001, 207618781, 208051201, 208969223, 209246701, 209404369,
-		209990881, 210592873, 210842113, 213035761, 214038533, 214110541, 214852609, 214858717, 215436241, 216821881,
-		217123069, 217875571, 218603617, 218642029, 218947121, 219621781, 220531501, 220883521, 221368153, 221415781,
-		221884001, 222010721, 222630193, 223449463, 223625851, 223782263, 224074369, 224136013, 224769241, 224957893,
-		225853633, 226359547, 226450297, 227132641, 227444101, 227475481, 228652201, 228842209, 228988033, 229589413,
-		230357761, 231383461, 231405701, 231927781, 232114433, 232460821, 232771501, 233110081, 234869009, 235426913,
-		235928071, 237791143, 238001653, 238833421, 240068041, 240371713, 240694513, 240785047, 241505377, 242067841,
-		242650717, 242860069, 243583201, 243955141, 244883981, 245006623, 245950561, 246099317, 246282511, 246434761,
-		246658441, 247318957, 247321301, 247416101, 249582481, 250436033, 250958401, 250988173, 251528401, 251663837,
-		251855893, 252853921, 253610281, 253893397, 255416897, 256831433, 257590661, 258020473, 258043229, 258234401,
-		258944401, 259763093, 259765747, 260156101, 260518801, 260736341, 260963389, 261186001, 261703417, 262979501,
-		263428181, 264269449, 264384469, 265020001, 265584133, 265735969, 265836161, 266790481, 266925601, 270525737,
-		271272569, 271763467, 271826629, 271950829, 273361789, 273480637, 274701913, 274810241, 274919401, 275283401,
-		275619961, 276018913, 276131137, 276542401, 276638321, 277787141, 278943061, 279377281, 280885153, 282253141,
-		282471853, 282769771, 283900961, 284166877, 284301751, 284736091, 284834299, 285820501, 286316801, 287160301,
-		287449091, 287715121, 288099001, 288117721, 288735277, 290643601, 290706781, 290953921, 291088513, 291461633,
-		292153681, 292290181, 292433321, 292902481, 293346637, 293847721, 293938261, 295419097, 295743017, 297624961,
-		297798961, 298212601, 299367877, 299736181, 301413001, 302635351, 304080001, 307629401, 307694323, 307972801,
-		308483209, 309666361, 310474249, 310978027, 311177213, 311411629, 311655829, 311671361, 312408113, 312614021,
-		314184487, 315034513, 315351521, 317137969, 317365933, 317641171, 317796119, 319053281, 319374577, 319440769,
-		319726177, 320326003, 321324589, 321850849, 322469701, 322941881, 324477697, 325028089, 325352101, 325546873,
-		326266051, 326405713, 326469137, 326628721, 326694301, 326695141, 327073601, 327093409, 327398009, 328302901,
-		329153653, 329769721, 330198331, 330759617, 331658081, 331934989, 337135501, 337420679, 337665901, 337783981,
-		338125537, 338458807, 338914369, 339195097, 339492169, 339794641, 341958121, 341994131, 343017529, 343052833,
-		344201441, 344255551, 344776301, 346080391, 348989101, 349752913, 350031973, 350244577, 351058753, 351177769,
-		352802803, 352932337, 353815801, 353932801, 354062809, 356604421, 356836819, 357348601, 357872971, 358416577,
-		359394751, 359727073, 360145633, 360375181, 360787771, 361307521, 361312337, 362569201, 363170837, 363430637,
-		364550761, 365077373, 365231401, 366487201, 366532321, 366652201, 367559501, 367632301, 368016949, 368476501,
-		369667561, 371011801, 371611153, 372167101, 373012777, 373533617, 373669453, 373906513, 374346361, 374988661,
-		376957153, 377192353, 377334497, 377458849, 377806687, 377869031, 378792649, 379732501, 380137633, 382304161,
-		384100001, 385175113, 385319089, 387072661, 388695301, 390609941, 390612221, 391014937, 392679737, 393611653,
-		394723177, 396864469, 399156661, 399302581, 399647221, 400385701, 400557109, 401100881, 403095967, 403293313,
-		405739681, 405782623, 407737201, 407889161, 409302001, 409458241, 410613809, 410680357, 411618241, 411851389,
-		412836689, 413138881, 413429801, 413778817, 414216461, 414368641, 415200361, 415204501, 415476343, 416964241,
-		417767201, 417779909, 418044563, 418226581, 418616161, 418617281, 418667401, 419184481, 420607441, 421942951,
-		422429041, 422928101, 423384001, 423465001, 424175761, 424411501, 424431541, 425967301, 426174101, 426219649,
-		426770437, 426783811, 427294141, 428180191, 428758201, 429135841, 429509837, 430046857, 430381921, 430646401,
-		430733701, 432227449, 434042801, 435016187, 435358657, 435993301, 436465501, 437247841, 437462101, 437597101,
-		437866087, 439309261, 441354497, 441650591, 441758461, 442050577, 442181291, 442543553, 444660421, 445429693,
-		446414621, 446619617, 449501761, 450807481, 450866021, 450872573, 452990401, 453366029, 453967739, 454745773,
-		455198563, 457274161, 457320533, 459785089, 460251733, 460585861, 461151121, 461272267, 461329601, 462587329,
-		462639409, 462701513, 464012033, 464955857, 465505633, 466290949, 466758181, 467100937, 468410113, 468950021,
-		470120257, 470268137, 470644021, 471535373, 471664513, 472814413, 473581057, 474892741, 474970501, 474983881,
-		475723849, 478614067, 479962009, 480668347, 481153501, 481239361, 482488393, 482824669, 482921297, 483006889,
-		483029821, 483945601, 484200289, 486063001, 486902929, 487896601, 488104681, 488169289, 488585521, 488656981,
-		489994201, 490950461, 491738801, 493108481, 494288677, 495909871, 496109729, 496560349, 497148599, 497285713,
-		498662561, 498706651, 498905189, 500747293, 501172241, 501472333, 502686713, 504870241, 505473263, 505532773,
-		505798213, 506349421, 507142567, 507323521, 508606771, 509302873, 509551201, 510925609, 511098521, 511215521,
-		511611673, 512330281, 514738981, 516045197, 516259657, 516764063, 517662001, 518216201, 518548801, 521501473,
-		522390109, 522758233, 523756711, 526067821, 526359289, 526686889, 528013333, 528043753, 528220117, 530630701,
-		531095029, 531681281, 532126801, 532758241, 532800133, 533429881, 534782293, 535252867, 535428577, 535517581,
-		536003333, 536114197, 536342419, 536870911, 540207097, 540621181, 540654409, 540680141, 542497201, 542536457,
-		544861633, 545550433, 545622401, 546102481, 546117301, 546322201, 548080513, 548989561, 549308761, 550132741,
-		550230409, 550635373, 550853137, 551313001, 552573793, 553027201, 554487121, 554599051, 554964001, 555321007,
-		555465601, 556001377, 556069849, 556095433, 556114609, 557165209, 558235109, 558900821, 558977761, 561448487,
-		562367821, 563298061, 563947141, 564298489, 564689381, 565664761, 565707061, 567358513, 567596401, 568902001,
-		568967221, 569332177, 569495809, 570941881, 572123521, 572228929, 572430769, 572567353, 572936869, 573817861,
-		573862021, 574998841, 575326033, 576724219, 577210181, 577352641, 577613261, 579606301, 579956653, 581618143,
-		582389641, 582799951, 585261637, 586706821, 587343541, 588049001, 591242653, 591822001, 592467451, 592468777,
-		593682169, 593728489, 595405201, 595590841, 597537361, 597717121, 599135767, 599945293, 600893921, 601606487,
-		602379181, 604584221, 605454917, 605961049, 606872449, 607148653, 607750681, 608421637, 608917753, 609361567,
-		609813781, 611097401, 611374453, 611770513, 611812321, 611817421, 612006253, 613849601, 614742241, 615361183,
-		615760133, 615895897, 616280897, 617087701, 619239457, 619365121, 619480601, 620169409, 620544961, 620755537,
-		621769669, 622137601, 623735953, 624303241, 624732421, 625060801, 625482001, 626717471, 627886657, 628868467,
-		629134081, 630496621, 630622753, 630811513, 631767943, 631974613, 633289807, 635155291, 635291077, 635319361,
-		636287653, 636337073, 636936697, 638502913, 638837761, 639305921, 639807781, 640650931, 640977373, 643036321,
-		643316461, 643552909, 644004817, 644453633, 644457551, 644731357, 644900257, 645556481, 648056449, 648328801,
-		651011329, 651064681, 651151801, 651514753, 652469641, 653235841, 653260633, 655264369, 657732349, 659526601,
-		659846021, 660095641, 660754117, 661122881, 661207177, 662134201, 663760681, 665462081, 668498321, 670976641,
-		670987021, 671716921, 672103001, 672108193, 673778827, 675260477, 676359391, 678481693, 680983817, 681019921,
-		681124207, 681303241, 682528687, 683316001, 683362681, 684350833, 686059921, 687741401, 689537441, 690035713,
-		690562601, 691131349, 692535637, 693456521, 694116893, 696042901, 696321949, 696998251, 697821857, 698192041,
-		698819711, 702683101, 705303457, 705351583, 706728377, 707691601, 709409993, 710382401, 710617861, 710721001,
-		714490481, 717096641, 717653129, 717831211, 720767521, 722955773, 724160251, 724969087, 725508241, 731276521,
-		732805681, 734166217, 736668013, 739444021, 739576801, 740988151, 741182401, 741214237, 742017181, 742550401,
-		744500641, 745493761, 745745461, 746331041, 747406801, 748638001, 749172821, 749640161, 750632137, 751226401,
-		751705597, 752186593, 753233717, 753574537, 753594001, 754020361, 754874257, 756205633, 756271909, 756980137,
-		758581651, 758687581, 758901701, 759252367, 759266621, 759638881, 762699649, 763907741, 764033999, 764240611,
-		765378241, 766303693, 766823797, 770201221, 770909107, 770937931, 771043201, 771337891, 772495777, 773131927,
-		773807401, 775368901, 775896181, 776443769, 777218989, 781471001, 782823281, 784450393, 784777393, 784783477,
-		784966297, 787085857, 787209277, 788046901, 788931361, 789082001, 790453049, 791118043, 792144161, 792145729,
-		794201333, 794399041, 794937601, 795064909, 796072003, 796200901, 796560703, 797418997, 797834017, 799162561,
-		799630753, 799898833, 799916101, 801093011, 801227269, 801866647, 804978721, 805505957, 805771501, 807115753,
-		807218413, 808214161, 809790881, 810023881, 810455101, 811110301, 811478533, 811607777, 811730923, 815430533,
-		815796413, 816024161, 816215401, 816549121, 817832329, 818401321, 819466201, 819743233, 822018961, 822531841,
-		824389441, 826004467, 829512001, 830664451, 831933901, 832048447, 832127489, 832169857, 833610751, 837766217,
-		839268139, 839280691, 839908217, 840749761, 841217653, 841660961, 842785841, 842824981, 842960981, 843161887,
-		844545271, 845376533, 846961321, 848090377, 848755969, 849548671, 852432769, 854094781, 854868257, 855734401,
-		857100421, 857902861, 858687103, 859096477, 860334301, 862082677, 862678081, 863196181, 863609113, 863984881,
-		865242841, 867022747, 867110501, 867638201, 868088341, 868111597, 868691401, 870985223, 871157233, 871195561,
-		871908481, 876850801, 877542481, 878492941, 878940833, 879995689, 880870513, 880922657, 883276549, 884304037,
-		884952001, 886180429, 887795221, 888868441, 892740853, 893692819, 894264337, 896901461, 897087361, 897283213,
-		899019353, 900736411, 901848301, 902566501, 903108821, 903390643, 905040953, 907378669, 907670501, 907711561,
-		908005249, 910202509, 910867481, 911484421, 914348737, 914906539, 920375821, 920696653, 921858631, 922845241,
-		923437213, 926756881, 927106561, 927877001, 929159941, 930530701, 932148253, 933729421, 935794081, 936421141,
-		937675393, 938376181, 939947009, 940123801, 941056273, 941734657, 943271569, 944832533, 946034057, 946787377,
-		947878081, 949317217, 949697233, 952893881, 954924013, 957600541, 957631249, 958131157, 958735681, 960269377,
-		960946321, 962442001, 962489557, 962523169, 964412837, 965501857, 967266451, 967287751, 967790401, 968283247,
-		968413217, 968751241, 969528337, 970586713, 971975071, 974113601, 974471243, 974774401, 975576281, 976396961,
-		977483449, 979363153, 980056507, 980725201, 981484561, 983456377, 984133441, 984252001, 985052881, 985075681,
-		987842101, 994133479, 995586373, 995650921, 997836841, 998489017, 998590601, 998596741, 998724481, 999828727,
-		1002261781, 1003062061, 1005402133, 1005833971, 1006800829, 1008777001, 1008839999, 1009025263, 1009140161, 1011319501,
-		1011333061, 1011570457, 1011909271, 1012438391, 1013833153, 1015339441, 1015626151, 1017748057, 1020515761, 1021281301,
-		1022336611, 1024041853, 1024123501, 1024605121, 1025035129, 1026738161, 1027744453, 1028494429, 1034252929, 1034958601,
-		1040234231, 1049584313, 1050102901, 1050535501, 1054999441, 1055009117, 1056121453, 1057426651, 1063212481, 1065508321,
-		1065602281, 1066972301, 1069388497, 1070639389, 1070941987, 1071512749, 1071643249, 1072898711, 1073159281, 1073288581,
-		1073484823, 1075100041, 1077133397, 1078467589, 1081798061, 1082472553, 1084241341, 1084444481, 1090858081, 1093150081,
-		1093352833, 1093526353, 1094042321, 1097416321, 1098743563, 1100624857, 1101623381, 1101673501, 1102573501, 1102750013,
-		1104194521, 1105038871, 1106529761, 1106580817, 1106595493, 1107138961, 1108135381, 1109304913, 1110582947, 1111205873,
-		1111939201, 1112671603, 1114277221, 1116379301, 1117202557, 1117785881, 1117828001, 1117890019, 1119412321, 1120076281,
-		1120981021, 1121176981, 1123406047, 1123625501, 1123727617, 1124396521, 1125038377, 1127040769, 1130933429, 1134367777,
-		1138289041, 1138607233, 1139137057, 1140573601, 1142466151, 1147434289, 1148578201, 1150229761, 1151670001, 1153164097,
-		1153440289, 1154343961, 1154691409, 1154987209, 1155939709, 1156761911, 1156993373, 1157839381, 1159421509, 1160844821,
-		1163098249, 1163227759, 1164218641, 1165717129, 1166475601, 1166598217, 1168221121, 1168256953, 1168492417, 1173229201,
-		1173545533, 1174300093, 1180970407, 1181566219, 1183338241, 1184554801, 1186325981, 1187235193, 1191153937, 1191216133,
-		1192314817, 1192412033, 1192903531, 1193229577, 1193557093, 1195524181, 1196852273, 1198650961, 1198880261, 1200456577,
-		1200778753, 1202142061, 1204205449, 1205606533, 1205772499, 1209998077, 1210393801, 1210562701, 1210653541, 1213619761,
-		1217181061, 1217823517, 1217924159, 1219816261, 1219858921, 1220114377, 1221127013, 1222861271, 1223531677, 1223941657,
-		1225128829, 1226230297, 1226855293, 1227220801, 1229491063, 1229751667, 1230446653, 1231362793, 1232445677, 1234125721,
-		1234646533, 1235188597, 1235864033, 1236313501, 1236442421, 1238825569, 1242171349, 1242858317, 1249166881, 1249785941,
-		1250656621, 1252236421, 1254277909, 1255665613, 1257102001, 1258903981, 1260332137, 1263293281, 1264145401, 1265477791,
-		1266003461, 1266273793, 1266425101, 1267345081, 1269295201, 1269835201, 1270193401, 1270489621, 1270667353, 1272558739,
-		1272866167, 1282447477, 1282568741, 1285636801, 1286298133, 1286298263, 1296613501, 1297443913, 1299072721, 1299784141,
-		1299963601, 1301509249, 1301926081, 1302745481, 1306836001, 1307004641, 1307520469, 1307823661, 1308758533, 1308998741,
-		1309723213, 1309983901, 1310329567, 1311255661, 1311616153, 1312332001, 1312573123, 1313396221, 1315858381, 1316169541,
-		1318126321, 1318717531, 1319978701, 1319992181, 1320793813, 1321058213, 1323668917, 1325172421, 1325329297, 1328256247,
-		1329174601, 1329431689, 1331973329, 1341010577, 1341926401, 1343575381, 1344597577, 1344975721, 1345514101, 1345523401,
-		1347387361, 1348964401, 1350685001, 1351126261, 1352453257, 1353051517, 1356241321, 1356328121, 1357459183, 1362463807,
-		1362515701, 1362742561, 1365662917, 1366587661, 1366608377, 1368769681, 1371908137, 1372681861, 1375322101, 1376799577,
-		1378646179, 1379464633, 1382453333, 1383283129, 1385656829, 1386705433, 1388972353, 1389353941, 1389975149, 1391890033,
-		1393851553, 1394640941, 1394746081, 1394942473, 1397357851, 1398883201, 1400859847, 1401840833, 1404008369, 1404253369,
-		1406826241, 1406851249, 1409372779, 1413803197, 1414154827, 1414529533, 1415969101, 1417986901, 1421475031, 1424503849,
-		1425860101, 1426319563, 1426534201, 1427771089, 1428966001, 1432354901, 1435091377, 1438648993, 1440231941, 1440922891,
-		1441139641, 1441678411, 1442945689, 1443388481, 1443742273, 1446298309, 1446434677, 1446818651, 1448921633, 1451635201,
-		1454282449, 1454445413, 1456527461, 1457378449, 1461307717, 1463065501, 1463178817, 1463992661, 1464568381, 1465908193,
-		1465945417, 1468540477, 1468824787, 1469059481, 1469960377, 1470080501, 1470650851, 1471628401, 1472221921, 1473580001,
-		1477289941, 1481626513, 1482274513, 1482876673, 1483873861, 1483918801, 1485061471, 1486564301, 1493114149, 1495190699,
-		1497221281, 1497965713, 1499971457, 1499989177, 1500142001, 1501165097, 1502171117, 1502403121, 1503240559, 1503705601,
-		1504139521, 1504832033, 1507746241, 1509156013, 1510870241, 1511558533, 1515175087, 1515785041, 1517039371, 1518014689,
-		1518290707, 1520190341, 1521221473, 1522302121, 1526732803, 1529648231, 1529819971, 1530495289, 1532419099, 1532569681,
-		1532755369, 1533343261, 1534063081, 1535020133, 1536112001, 1536251047, 1536883357, 1537433899, 1537641691, 1538012449,
-		1539583921, 1539804001, 1540454761, 1540550413, 1541047813, 1541849761, 1541955409, 1544145121, 1545019813, 1545177581,
-		1546106773, 1546340401, 1546508057, 1547140841, 1547543161, 1547712601, 1550924873, 1554270481, 1557118081, 1560312001,
-		1560620041, 1561800833, 1565893201, 1566594551, 1567830241, 1568916311, 1574362441, 1574601601, 1577983489, 1578009401,
-		1580449201, 1581576641, 1581714481, 1582783777, 1583230241, 1583658649, 1586436193, 1587650401, 1590394313, 1593706201,
-		1595647351, 1595887921, 1598197201, 1602517949, 1603765021, 1603810561, 1603994701, 1609916491, 1609935913, 1612121473,
-		1614508267, 1617795181, 1617921667, 1619447741, 1620646177, 1627103521, 1627898401, 1628692201, 1630062253, 1630307617,
-		1631314609, 1632286673, 1632513601, 1633044241, 1636185601, 1637434657, 1637436457, 1637930893, 1638294661, 1639351981,
-		1639846391, 1641971701, 1642814653, 1644637051, 1645413001, 1647225529, 1648076041, 1649430889, 1650265549, 1650682153,
-		1654940509, 1655660761, 1656229921, 1656280033, 1656917377, 1659009601, 1661202113, 1668037621, 1668926629, 1669893661,
-		1671603667, 1671714241, 1672125131, 1674091141, 1674658133, 1675978193, 1678274581, 1679130641, 1680901381, 1683174533,
-		1685433413, 1686001861, 1687248001, 1691745821, 1692605041, 1694128129, 1695158921, 1696893101, 1698707377, 1699279441,
-		1700250049, 1709909293, 1710753001, 1712392321, 1714322377, 1716160321, 1716714793, 1716774481, 1718013133, 1718088301,
-		1719197621, 1721061497, 1721986313, 1722007169, 1722685777, 1725675451, 1726372441, 1731048937, 1731995497, 1732924001,
-		1734059291, 1734285601, 1735071913, 1736481601, 1738687469, 1740214841, 1742288881, 1742815621, 1743166441, 1744605097,
-		1746692641, 1746721681, 1749124829, 1750412161, 1754818561, 1757148121, 1760014561, 1766984389, 1767234613, 1769091241,
-		1769267761, 1770236893, 1771303801, 1772267281, 1773582977, 1776439261, 1776820033, 1779649381, 1779892577, 1784306273,
-		1784638309, 1785843547, 1786005521, 1787934881, 1790023861, 1791426787, 1792442737, 1792588813, 1794814103, 1801558201,
-		1801774081, 1802510669, 1803768091, 1804906517, 1805947313, 1809888967, 1816408273, 1817067169, 1819829749, 1820306953,
-		1821514633, 1828682101, 1828887061, 1831258601, 1835114401, 1837156049, 1837599769, 1839568981, 1841034961, 1841099261,
-		1841479501, 1844028961, 1846171781, 1847811673, 1849964117, 1850233897, 1850598961, 1852496761, 1853926777, 1854084649,
-		1854940231, 1856689453, 1857221281, 1858098497, 1858197961, 1860373241, 1861026133, 1861880689, 1862880401, 1866409861,
-		1867906721, 1868682241, 1871987041, 1872937057, 1873177693, 1874634721, 1874849929, 1878691753, 1879111697, 1879623157,
-		1879775501, 1883509633, 1883785681, 1885915841, 1894909141, 1894955311, 1897700113, 1899081757, 1899525601, 1900687381,
-		1903447841, 1904658913, 1905958891, 1908088001, 1909566073, 1910134309, 1911197947, 1912950241, 1914303841, 1915391521,
-		1916987593, 1917397637, 1920301951, 1921309633, 1922092567, 1922687293, 1923224689, 1923311317, 1923845801, 1924201501,
-		1925042737, 1928903971, 1929862849, 1930403333, 1930447501, 1930534453, 1930915169, 1934350351, 1938264241, 1940048881,
-		1943951041, 1944125633, 1945042181, 1950987193, 1952513369, 1952968753, 1957705177, 1959659857, 1960708261, 1963149553,
-		1965007601, 1968002149, 1970065681, 1974474049, 1977257441, 1982123893, 1982826961, 1988071801, 1988713189, 1988835713,
-		1988965861, 1989192277, 1991063449, 1995784961, 1995830761, 1996231189, 1996339649, 1997844157, 1998780001, 1999053601,
-		1999111801, 1999743661, 2004299641, 2007646961, 2013554869, 2013834961, 2016481477, 2017021333, 2017509601, 2019564769,
-		2021392369, 2021884343, 2027675701, 2028279793, 2028631361, 2028812399, 2029830409, 2030600833, 2036224321, 2043173273,
-		2049293401, 2050617713, 2052149221, 2054711381, 2055634561, 2057267941, 2057835781, 2058072041, 2059739221, 2062612033,
-		2068867841, 2070739441, 2072624761, 2076192007, 2081039297, 2081551753, 2082146617, 2083034113, 2083997441, 2085453649,
-		2085882661, 2086645009, 2093300401, 2095627153, 2096046457, 2097317377, 2100292841, 2101470541, 2101744837, 2104994449,
-		2106147457, 2107148761, 2114643217, 2115769633, 2115986557, 2116483027, 2116541221, 2117031263, 2117555641, 2118621097,
-		2120096161, 2123601751, 2124078653, 2124691213, 2127197489, 2128104001, 2129304997, 2130134533, 2131004737, 2131811501,
-		2140699681, 2140771609, 2141340833, 2144961253, 2147418113, 2147429509, 2152627801, 2154446641, 2155416251, 2156151313,
-		2164282177, 2168431201, 2170282969, 2172155819, 2173499329, 2173540951, 2173579801, 2175126601, 2175406201, 2175646177,
-		2177374321, 2177645557, 2178082901, 2178939221, 2180221201, 2182281601, 2182802689, 2185362233, 2187717761, 2193980881,
-		2199617701, 2200115713, 2201924341, 2202101761, 2202205897, 2203649197, 2203856497, 2206095589, 2210578759, 2213431729,
-		2216960929, 2217879901, 2219072017, 2224252801, 2229468697, 2231332357, 2233031701, 2240507821, 2241880033, 2241982009,
-		2244932281, 2245519981, 2246762899, 2248354153, 2251732033, 2254314241, 2254757077, 2256197761, 2256748777, 2256751837,
-		2262861901, 2269307587, 2274584089, 2283289681, 2284416181, 2289251669, 2289624793, 2290316377, 2290910257, 2291205461,
-		2292068143, 2295209281, 2296995121, 2299190401, 2300628601, 2300795353, 2301745249, 2304120001, 2308966661, 2309241601,
-		2309405617, 2311558021, 2311575001, 2315137261, 2320527613, 2323147201, 2324867399, 2329584217, 2330569541, 2331181621,
-		2335341601, 2338157597, 2338728001, 2340460487, 2345907961, 2347597981, 2352371251, 2354453561, 2355230749, 2355320101,
-		2355622721, 2355649921, 2355735089, 2358534361, 2360261989, 2370771181, 2370928337, 2371350101, 2372976563, 2374232977,
-		2375415841, 2377166401, 2378309041, 2381782597, 2382678101, 2383164577, 2385574201, 2389072321, 2389544977, 2393708761,
-		2394311233, 2398393661, 2404912501, 2411128441, 2412172153, 2412675721, 2413973071, 2422296241, 2423401681, 2425249601,
-		2428648967, 2428870753, 2428986913, 2429407961, 2430697513, 2431136401, 2431144801, 2432761633, 2432860273, 2433791593,
-		2434964321, 2434974433, 2435091221, 2436691321, 2437907779, 2438778413, 2442050353, 2442454561, 2443708961, 2444950561,
-		2448039497, 2448374689, 2453473049, 2454285751, 2456536681, 2457846161, 2463713281, 2471205361, 2473120961, 2473189441,
-		2473823353, 2474308069, 2474676949, 2476283239, 2477814193, 2478643907, 2480147521, 2480343553, 2482435981, 2482682131,
-		2484408301, 2486017249, 2488420801, 2488591117, 2492480233, 2494660033, 2494984321, 2495834329, 2499327041, 2501012599,
-		2501771329, 2502525637, 2504008609, 2506529257, 2506733189, 2507121037, 2508178843, 2513230891, 2516684801, 2519297089,
-		2525070241, 2526566041, 2528291341, 2529410281, 2529827821, 2529854713, 2530351561, 2532630787, 2533465661, 2533797017,
-		2535516173, 2537105761, 2539406281, 2539736257, 2540469901, 2541660367, 2542479481, 2544590161, 2545934077, 2548051801,
-		2550139253, 2550780277, 2551365769, 2552418761, 2553272929, 2555391481, 2561945401, 2564536201, 2565186137, 2570087521,
-		2571180247, 2575060949, 2575737361, 2577345541, 2582092189, 2582246701, 2582952769, 2583322381, 2584460701, 2588054401,
-		2588582089, 2590663681, 2593065721, 2595276353, 2597289241, 2597294701, 2598933481, 2600611861, 2602343521, 2602378721,
-		2604465013, 2604803701, 2611122229, 2611461529, 2613382201, 2614688801, 2616180821, 2617563031, 2621080741, 2621977627,
-		2622993661, 2624549929, 2625903601, 2626783921, 2627284987, 2630643401, 2632605049, 2634284801, 2634804481, 2634820813,
-		2638067881, 2639099233, 2642159809, 2642582251, 2646751249, 2646790033, 2648662777, 2649907201, 2650820329, 2651507713,
-		2654716321, 2656494271, 2658630913, 2658696301, 2659265701, 2668095181, 2668469431, 2670972949, 2672605657, 2672651521,
-		2676053333, 2677147201, 2677821121, 2678785621, 2681041843, 2682823681, 2683742491, 2684284441, 2687655169, 2688124001,
-		2689427281, 2690408533, 2690867401, 2693739751, 2695115473, 2700818017, 2700891839, 2701878941, 2704957909, 2706863833,
-		2707661501, 2716157989, 2716275007, 2717428033, 2719319513, 2721666817, 2721721939, 2723859001, 2725357249, 2733156029,
-		2736316301, 2738184697, 2740336561, 2744329909, 2746021741, 2753333227, 2753538001, 2759392633, 2765323397, 2766006253,
-		2767672189, 2769080161, 2769602333, 2774295577, 2777887297, 2778304273, 2779477741, 2781117721, 2781226477, 2786028337,
-		2787998641, 2789218909, 2800352011, 2805762961, 2809635901, 2812672981, 2814748201, 2823570433, 2824256377, 2824804693,
-		2824854913, 2828205397, 2832384133, 2832743713, 2837697773, 2837917633, 2840634109, 2840871041, 2841190381, 2847894377,
-		2848466281, 2848722131, 2855046421, 2855071801, 2855512909, 2862066481, 2865483601, 2866005139, 2866527841, 2870377309,
-		2871536561, 2872527733, 2872948321, 2874382853, 2877769501, 2881429741, 2882370481, 2885594497, 2887955533, 2890316801,
-		2890414873, 2892426029, 2894667781, 2895004927, 2899294889, 2903776129, 2915953633, 2916247819, 2918295451, 2920691161,
-		2923042141, 2924158001, 2929062533, 2929106753, 2930831641, 2931708097, 2932327549, 2936227603, 2936958181, 2941174897,
-		2941343633, 2944555681, 2944677961, 2945208001, 2945549881, 2951136343, 2956724317, 2957320351, 2965700233, 2967053953,
-		2968206601, 2974506841, 2975377429, 2976930001, 2978766341, 2980689601, 2986025677, 2987414977, 2990152901, 2993462713,
-		2993495041, 2994098281, 2994415201, 2998202353, 2998919873, 3000688381, 3001561441, 3002647829, 3004443679, 3009628301,
-		3011421841, 3014101261, 3015502181, 3016957381, 3017444761, 3018147217, 3018576689, 3019916461, 3025350343, 3026575553,
-		3028586471, 3030393901, 3033332641, 3034402681, 3034817209, 3035375047, 3036079729, 3037295801, 3037781251, 3038880473,
-		3039681457, 3041984353, 3042630533, 3048159841, 3050190163, 3056100623, 3056160929, 3057886591, 3058670677, 3059397793,
-		3063685633, 3065998717, 3076505209, 3077122133, 3079496551, 3082054697, 3082068013, 3083053387, 3083537689, 3083884651,
-		3088408429, 3089013313, 3091019777, 3094763851, 3099670657, 3103800701, 3112974481, 3114125071, 3115667521, 3120445697,
-		3122287981, 3129914881, 3133899409, 3135040133, 3143282221, 3145410761, 3150972917, 3156599161, 3156643141, 3157579861,
-		3163106953, 3166504273, 3167442721, 3170262409, 3172658653, 3175204531, 3175255717, 3178375201, 3181356263, 3181391641,
-		3182606857, 3182655361, 3182891401, 3185472001, 3187035113, 3187421077, 3187939921, 3196397821, 3196431829, 3197565001,
-		3197632441, 3197911001, 3197911741, 3199164901, 3205663921, 3207297773, 3208902491, 3212465437, 3215031751, 3217412881,
-		3219808411, 3221580281, 3222693421, 3224143441, 3225081473, 3227082823, 3227209057, 3229131137, 3233558021, 3237992101,
-		3242533897, 3248236309, 3250348417, 3250700737, 3252148621, 3257334541, 3258647809, 3258892801, 3261114601, 3263097641,
-		3263568901, 3263626957, 3264820001, 3265122451, 3267417677, 3268506541, 3268841941, 3270933121, 3271999249, 3272030401,
-		3272702497, 3274264033, 3275671969, 3276075709, 3277047649, 3278640289, 3280067129, 3282974857, 3287174129, 3288757249,
-		3295362727, 3296403601, 3299246833, 3302322241, 3304307341, 3305829073, 3306686659, 3306957593, 3310858777, 3312489577,
-		3312536569, 3313196881, 3315139717, 3320669437, 3323308501, 3323590463, 3323829169, 3328354801, 3332800021, 3334350781,
-		3340214413, 3342005633, 3344191241, 3346172189, 3347908801, 3349218881, 3350993969, 3352091557, 3355382857, 3355953001,
-		3357417181, 3359737921, 3360511981, 3369139201, 3371024521, 3371452921, 3371693063, 3372667121, 3373086601, 3381052177,
-		3381901921, 3385842877, 3386603221, 3387014401, 3387487351, 3389030261, 3395091311, 3399205591, 3399890413, 3402234749,
-		3407609221, 3407772817, 3407952169, 3408135121, 3409339393, 3411250081, 3411574801, 3411829693, 3412575097, 3415379701,
-		3415832137, 3417522841, 3420143941, 3421845001, 3423222757, 3423580481, 3427050673, 3428133103, 3429457921, 3429982081,
-		3430804297, 3432695921, 3432997537, 3433458073, 3434575327, 3435973837, 3440195713, 3443704261, 3449768513, 3450717901,
-		3453900913, 3458257741, 3461861761, 3463907761, 3464236901, 3466158361, 3470716657, 3474335437, 3480174001, 3482161261,
-		3485747521, 3489958697, 3491763493, 3492178873, 3492883081, 3493262761, 3497607433, 3504132113, 3512030497, 3512291021,
-		3512369857, 3513604657, 3516565057, 3519318721, 3524086333, 3525088961, 3529119361, 3529864391, 3532687201, 3533662129,
-		3533856913, 3538213381, 3542303047, 3543203333, 3548378341, 3549286001, 3549988261, 3552158521, 3553567057, 3557646401,
-		3562963973, 3563340457, 3566428301, 3574891757, 3582711841, 3583249921, 3583604161, 3584800801, 3586833253, 3587553971,
-		3589937261, 3590409439, 3593276353, 3594110081, 3596491907, 3596815169, 3598772761, 3602006101, 3605151241, 3611571121,
-		3612298321, 3612825221, 3614770573, 3616574081, 3620631169, 3628526287, 3630596257, 3631828481, 3632452741, 3635993089,
-		3649116277, 3649965281, 3650158849, 3651572609, 3656355841, 3658730893, 3662387977, 3662503093, 3663084541, 3668926801,
-		3669587533, 3672754633, 3677180797, 3679657997, 3682471321, 3685647701, 3685775741, 3692307161, 3695628133, 3697278427,
-		3700801861, 3705582073, 3705623281, 3708123301, 3708905341, 3709626961, 3712887289, 3713287801, 3713448769, 3718226401,
-		3721486081, 3723410161, 3723699373, 3725016749, 3727828501, 3729097633, 3733761739, 3736293461, 3745192001, 3746101189,
-		3749383681, 3751554581, 3751782737, 3754680403, 3756668401, 3759781369, 3760622689, 3760896133, 3762110881, 3767640601,
-		3773061337, 3774337201, 3784123501, 3787491457, 3798040471, 3798626833, 3799111681, 3800084401, 3805699501, 3807112123,
-		3807308269, 3807749821, 3809018947, 3813919453, 3817561777, 3817706621, 3821233121, 3827035237, 3832807681, 3833208961,
-		3842941741, 3846174151, 3846532801, 3847106803, 3850058689, 3852800033, 3863326897, 3865604023, 3867183937, 3874471147,
-		3874523017, 3875096893, 3875965417, 3886515361, 3886643801, 3887423437, 3887635753, 3891892421, 3891919417, 3894053311,
-		3896079281, 3897241129, 3897869201, 3898906129, 3900327241, 3903711841, 3905533721, 3905876501, 3907577521, 3907752241,
-		3912174421, 3914880337, 3914923211, 3915467341, 3915604421, 3915921241, 3918227437, 3922321561, 3926912669, 3929293061,
-		3934940833, 3935864017, 3936123601, 3945165841, 3947233201, 3947383201, 3953408801, 3953949421, 3955572001, 3958597301,
-		3958930441, 3959578801, 3960728641, 3962037061, 3966350203, 3967343161, 3971095301, 3973556837, 3979485931, 3982017601,
-		3987528793, 3987960913, 3991124341, 3992697997, 3997536427, 4005660961, 4007365741, 4011996871, 4015548769, 4017684529,
-		4018283501, 4020144133, 4026822577, 4027012021, 4027518961, 4028465873, 4028771849, 4031223841, 4034969401, 4034993269,
-		4035498409, 4036395581, 4042538497, 4044601751, 4044884689, 4048493983, 4053267217, 4054039841, 4057195309, 4058433931,
-		4059776533, 4060942381, 4061009971, 4064633821, 4067039461, 4067887501, 4068671881, 4071644893, 4075241633, 4075721921,
-		4076009857, 4079665633, 4079682361, 4083376067, 4085074909, 4088147617, 4088838913, 4092929149, 4098258707, 4099180801,
-		4100934241, 4103745689, 4105691393, 4108970251, 4109461709, 4109711581, 4110320663, 4113013141, 4115891893, 4117058221,
-		4117447441, 4121286907, 4127050621, 4129914673, 4133928761, 4135847101, 4136916001, 4137262541, 4138838401, 4139015987,
-		4150174393, 4155375349, 4157008813, 4162880401, 4166032873, 4183664101, 4185636781, 4186561633, 4187360341, 4191864013,
-		4192060699, 4195843037, 4196323561, 4204344601, 4206006229, 4206295433, 4212105409, 4215885697, 4218900001, 4220122321,
-		4232966251, 4234224601, 4237212061, 4243744201, 4244022301, 4244663651, 4247990917, 4250920459, 4251904273, 4255695013,
-		4257003353, 4261352869, 4271267333, 4275011401, 4277526901, 4278305651, 4282867213, 4285148981, 4293088801, 4294901761,
-	}
-
-	primes16 = [65536]byte{
-		2, 1, 1, 2, 1, 2, 1, 4, 3, 2, // 0-9
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 10-19
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 20-29
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 30-39
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 40-49
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 50-59
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 60-69
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 70-79
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 80-89
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 90-99
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 100-109
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 110-119
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 120-129
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 130-139
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 140-149
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 150-159
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 160-169
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 170-179
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 180-189
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 190-199
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 200-209
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 210-219
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 220-229
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 230-239
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 240-249
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 250-259
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 260-269
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 270-279
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 280-289
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 290-299
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 300-309
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 310-319
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 320-329
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 330-339
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 340-349
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 350-359
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 360-369
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 370-379
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 380-389
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 390-399
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 400-409
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 410-419
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 420-429
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 430-439
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 440-449
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 450-459
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 460-469
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 470-479
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 480-489
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 490-499
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 500-509
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 510-519
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 520-529
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 530-539
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 540-549
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 550-559
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 560-569
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 570-579
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 580-589
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 590-599
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 600-609
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 610-619
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 620-629
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 630-639
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 640-649
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 650-659
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 660-669
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 670-679
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 680-689
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 690-699
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 700-709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 710-719
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 720-729
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 730-739
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 740-749
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 750-759
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 760-769
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 770-779
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 780-789
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 790-799
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 800-809
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 810-819
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 820-829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 830-839
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 840-849
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 850-859
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 860-869
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 870-879
-		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 880-889
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 890-899
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 900-909
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 910-919
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 920-929
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 930-939
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 940-949
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 950-959
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 960-969
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 970-979
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 980-989
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 990-999
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 1000-1009
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 1010-1019
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1020-1029
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 1030-1039
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 1040-1049
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1050-1059
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 1060-1069
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1070-1079
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1080-1089
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 1090-1099
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 1100-1109
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1110-1119
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 1120-1129
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 1130-1139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1140-1149
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 1150-1159
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1160-1169
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1170-1179
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1180-1189
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1190-1199
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1200-1209
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 1210-1219
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 1220-1229
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 1230-1239
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 1240-1249
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 1250-1259
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1260-1269
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 1270-1279
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 1280-1289
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1290-1299
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 1300-1309
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 1310-1319
-		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 1320-1329
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 1330-1339
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 1340-1349
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1350-1359
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1360-1369
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1370-1379
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 1380-1389
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 1390-1399
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 1400-1409
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1410-1419
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 1420-1429
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 1430-1439
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1440-1449
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 1450-1459
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1460-1469
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1470-1479
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 1480-1489
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 1490-1499
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1500-1509
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1510-1519
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1520-1529
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1530-1539
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 1540-1549
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 1550-1559
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1560-1569
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 1570-1579
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 1580-1589
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1590-1599
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 1600-1609
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 1610-1619
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 1620-1629
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 1630-1639
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1640-1649
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1650-1659
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 24, // 1660-1669
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 1670-1679
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1680-1689
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 1690-1699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 1700-1709
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1710-1719
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 1720-1729
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1730-1739
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1740-1749
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 1750-1759
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1760-1769
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1770-1779
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 1780-1789
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1790-1799
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1800-1809
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1810-1819
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 1820-1829
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 1830-1839
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 1840-1849
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1850-1859
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 1860-1869
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 1870-1879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 1880-1889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1890-1899
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1900-1909
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 1910-1919
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 1920-1929
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 1930-1939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 1940-1949
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 1950-1959
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 1960-1969
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 1970-1979
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 1980-1989
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 1990-1999
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2000-2009
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2010-2019
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 2020-2029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 2030-2039
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2040-2049
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 2050-2059
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 2060-2069
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2070-2079
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 2080-2089
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 2090-2099
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2100-2109
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 2110-2119
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2120-2129
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2130-2139
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 2140-2149
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2150-2159
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 2160-2169
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 2170-2179
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 2180-2189
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2190-2199
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 2200-2209
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2210-2219
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 2220-2229
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 2230-2239
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2240-2249
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 2250-2259
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 2260-2269
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2270-2279
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2280-2289
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 2290-2299
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2300-2309
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 2310-2319
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2320-2329
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 2330-2339
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2340-2349
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 2350-2359
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2360-2369
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2370-2379
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 2380-2389
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 2390-2399
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2400-2409
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2410-2419
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 2420-2429
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2430-2439
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 2440-2449
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 2450-2459
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2460-2469
-		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 2470-2479
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 2480-2489
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2490-2499
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 2500-2509
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2510-2519
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2520-2529
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 2530-2539
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 2540-2549
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 2550-2559
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 2560-2569
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 2570-2579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2580-2589
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 2590-2599
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 2600-2609
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2610-2619
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2620-2629
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 2630-2639
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2640-2649
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 2650-2659
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2660-2669
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2670-2679
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 2680-2689
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 2690-2699
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2700-2709
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 2710-2719
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2720-2729
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 2730-2739
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 2740-2749
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 2750-2759
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2760-2769
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 2770-2779
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2780-2789
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2790-2799
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 2800-2809
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 2810-2819
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2820-2829
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 2830-2839
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 2840-2849
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 2850-2859
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 2860-2869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 2870-2879
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2880-2889
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 2890-2899
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 2900-2909
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 2910-2919
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 2920-2929
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 2930-2939
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 2940-2949
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 2950-2959
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 2960-2969
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 2970-2979
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 2980-2989
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 2990-2999
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3000-3009
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 3010-3019
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 3020-3029
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3030-3039
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 3040-3049
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3050-3059
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 3060-3069
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 3070-3079
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 3080-3089
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 3090-3099
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 3100-3109
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 3110-3119
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 3120-3129
-		7, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 3130-3139
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 3140-3149
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3150-3159
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 3160-3169
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3170-3179
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3180-3189
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3190-3199
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 3200-3209
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3210-3219
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 3220-3229
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 3230-3239
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3240-3249
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 3250-3259
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3260-3269
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 3270-3279
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 3280-3289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 3290-3299
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3300-3309
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 3310-3319
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 3320-3329
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3330-3339
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 3340-3349
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 3350-3359
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3360-3369
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 3370-3379
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 3380-3389
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 3390-3399
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3400-3409
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 3410-3419
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3420-3429
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 3430-3439
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 3440-3449
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3450-3459
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 3460-3469
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 3470-3479
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3480-3489
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 3490-3499
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3500-3509
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 3510-3519
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 3520-3529
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 3530-3539
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 3540-3549
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 3550-3559
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3560-3569
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3570-3579
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 3580-3589
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 3590-3599
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3600-3609
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 3610-3619
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 3620-3629
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3630-3639
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 3640-3649
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 3650-3659
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3660-3669
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 3670-3679
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3680-3689
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3690-3699
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 3700-3709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 3710-3719
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 3720-3729
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 3730-3739
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 3740-3749
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3750-3759
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 3760-3769
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 3770-3779
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3780-3789
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 3790-3799
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 3800-3809
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3810-3819
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 3820-3829
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 3830-3839
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3840-3849
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 3850-3859
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 3860-3869
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3870-3879
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 3880-3889
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 3890-3899
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 3900-3909
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 3910-3919
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 3920-3929
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 3930-3939
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 3940-3949
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 3950-3959
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 3960-3969
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 3970-3979
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 3980-3989
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 3990-3999
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 4000-4009
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 4010-4019
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 4020-4029
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 4030-4039
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 4040-4049
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 4050-4059
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4060-4069
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 4070-4079
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4080-4089
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 4090-4099
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4100-4109
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4110-4119
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 4120-4129
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 4130-4139
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4140-4149
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 18, // 4150-4159
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4160-4169
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 4170-4179
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 4180-4189
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4190-4199
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4200-4209
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 4210-4219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 4220-4229
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4230-4239
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4240-4249
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 4250-4259
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4260-4269
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4270-4279
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 4280-4289
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 4290-4299
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 4300-4309
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4310-4319
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 4320-4329
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 4330-4339
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 4340-4349
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4350-4359
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4360-4369
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4370-4379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4380-4389
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 4390-4399
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 4400-4409
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4410-4419
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4420-4429
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4430-4439
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 4440-4449
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4450-4459
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4460-4469
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4470-4479
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4480-4489
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 4490-4499
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4500-4509
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 4510-4519
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 4520-4529
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4530-4539
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 4540-4549
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4550-4559
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 4560-4569
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4570-4579
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 4580-4589
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4590-4599
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4600-4609
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4610-4619
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 4620-4629
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 4630-4639
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 4640-4649
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4650-4659
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 4660-4669
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 4670-4679
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4680-4689
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4690-4699
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4700-4709
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4710-4719
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 4720-4729
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 4730-4739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4740-4749
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 4750-4759
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 4760-4769
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4770-4779
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 4780-4789
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 4790-4799
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4800-4809
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 4810-4819
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4820-4829
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 4830-4839
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 4840-4849
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4850-4859
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4860-4869
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 4870-4879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 4880-4889
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 4890-4899
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 4900-4909
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 4910-4919
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 4920-4929
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 4930-4939
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 4940-4949
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 4950-4959
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 4960-4969
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 4970-4979
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 4980-4989
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 4990-4999
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 5000-5009
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5010-5019
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 5020-5029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 5030-5039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5040-5049
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 5050-5059
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5060-5069
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5070-5079
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 5080-5089
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 5090-5099
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5100-5109
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 5110-5119
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 5120-5129
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5130-5139
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5140-5149
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 5150-5159
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5160-5169
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 5170-5179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 5180-5189
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 5190-5199
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 5200-5209
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5210-5219
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5220-5229
-		1, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 5230-5239
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 5240-5249
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5250-5259
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5260-5269
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 5270-5279
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5280-5289
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5290-5299
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 5300-5309
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5310-5319
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 5320-5329
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 5330-5339
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5340-5349
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 5350-5359
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 5360-5369
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5370-5379
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5380-5389
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 5390-5399
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5400-5409
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 5410-5419
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5420-5429
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5430-5439
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 5440-5449
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 5450-5459
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5460-5469
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 5470-5479
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 5480-5489
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5490-5499
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 5500-5509
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 5510-5519
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5520-5529
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 5530-5539
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5540-5549
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5550-5559
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 5560-5569
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 5570-5579
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5580-5589
-		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 5590-5599
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 5600-5609
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5610-5619
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 5620-5629
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 5630-5639
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5640-5649
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 5650-5659
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 5660-5669
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5670-5679
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 5680-5689
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 5690-5699
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5700-5709
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 5710-5719
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5720-5729
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5730-5739
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 5740-5749
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 5750-5759
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 5760-5769
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 5770-5779
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 5780-5789
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5790-5799
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5800-5809
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 5810-5819
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 5820-5829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 5830-5839
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 5840-5849
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 5850-5859
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 5860-5869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 5870-5879
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5880-5889
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 5890-5899
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 5900-5909
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5910-5919
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 5920-5929
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 5930-5939
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 5940-5949
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 5950-5959
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 5960-5969
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 5970-5979
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 5980-5989
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 5990-5999
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6000-6009
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 6010-6019
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 6020-6029
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6030-6039
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 6040-6049
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 6050-6059
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6060-6069
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 6070-6079
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6080-6089
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6090-6099
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6100-6109
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6110-6119
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6120-6129
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6130-6139
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6140-6149
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6150-6159
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6160-6169
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 6170-6179
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6180-6189
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 6190-6199
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6200-6209
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6210-6219
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 6220-6229
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6230-6239
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 6240-6249
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6250-6259
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6260-6269
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 6270-6279
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 6280-6289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6290-6299
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6300-6309
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6310-6319
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 6320-6329
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6330-6339
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6340-6349
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6350-6359
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6360-6369
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 6370-6379
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 6380-6389
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 6390-6399
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 6400-6409
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6410-6419
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 6420-6429
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 6430-6439
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6440-6449
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 6450-6459
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 6460-6469
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6470-6479
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6480-6489
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 6490-6499
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 6500-6509
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6510-6519
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 6520-6529
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6530-6539
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6540-6549
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6550-6559
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6560-6569
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6570-6579
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 6580-6589
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 6590-6599
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 6600-6609
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 6610-6619
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6620-6629
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 6630-6639
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6640-6649
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6650-6659
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6660-6669
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 6670-6679
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6680-6689
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6690-6699
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 6700-6709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 6710-6719
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6720-6729
-		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 6730-6739
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 6740-6749
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6750-6759
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 6760-6769
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6770-6779
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 6780-6789
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 6790-6799
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 6800-6809
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6810-6819
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 6820-6829
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6830-6839
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6840-6849
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6850-6859
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 6860-6869
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 6870-6879
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 6880-6889
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 6890-6899
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6900-6909
-		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 6910-6919
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 6920-6929
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 6930-6939
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 6940-6949
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 6950-6959
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6960-6969
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 6970-6979
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 6980-6989
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 6990-6999
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7000-7009
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 7010-7019
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 7020-7029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7030-7039
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7040-7049
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 7050-7059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 7060-7069
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 7070-7079
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 7080-7089
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7090-7099
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 7100-7109
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7110-7119
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 7120-7129
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 7130-7139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7140-7149
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 7150-7159
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 7160-7169
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 7170-7179
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7180-7189
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7190-7199
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 7200-7209
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 7210-7219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 7220-7229
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7230-7239
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 7240-7249
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 7250-7259
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 7260-7269
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7270-7279
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7280-7289
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 7290-7299
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 7300-7309
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7310-7319
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7320-7329
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 7330-7339
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 7340-7349
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 7350-7359
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 7360-7369
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 7370-7379
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7380-7389
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 7390-7399
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7400-7409
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 7410-7419
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7420-7429
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 7430-7439
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7440-7449
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 7450-7459
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 7460-7469
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 7470-7479
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 7480-7489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 7490-7499
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 7500-7509
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7510-7519
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 7520-7529
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 7530-7539
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 7540-7549
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 7550-7559
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7560-7569
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 7570-7579
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 7580-7589
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7590-7599
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 7600-7609
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7610-7619
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 7620-7629
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7630-7639
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 7640-7649
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 7650-7659
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7660-7669
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 7670-7679
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 7680-7689
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7690-7699
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7700-7709
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7710-7719
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 7720-7729
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7730-7739
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7740-7749
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 30, // 7750-7759
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 7760-7769
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 7770-7779
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 7780-7789
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 7790-7799
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 7800-7809
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7810-7819
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 7820-7829
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7830-7839
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7840-7849
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 7850-7859
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7860-7869
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 7870-7879
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 7880-7889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 7890-7899
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 7900-7909
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 7910-7919
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 7920-7929
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 7930-7939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 7940-7949
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7950-7959
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 7960-7969
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 7970-7979
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 7980-7989
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 7990-7999
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 8000-8009
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 8010-8019
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8020-8029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 8030-8039
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8040-8049
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 8050-8059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 8060-8069
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8070-8079
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 8080-8089
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8090-8099
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8100-8109
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 8110-8119
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 8120-8129
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 8130-8139
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 8140-8149
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8150-8159
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 8160-8169
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 8170-8179
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8180-8189
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8190-8199
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 8200-8209
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 8210-8219
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8220-8229
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 8230-8239
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 8240-8249
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8250-8259
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 8260-8269
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 8270-8279
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 8280-8289
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 8290-8299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8300-8309
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 8310-8319
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 8320-8329
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 8330-8339
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8340-8349
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 8350-8359
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 8360-8369
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 8370-8379
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 30, // 8380-8389
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 8390-8399
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8400-8409
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 8410-8419
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 8420-8429
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8430-8439
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 8440-8449
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8450-8459
-		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 8460-8469
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 8470-8479
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 8480-8489
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8490-8499
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8500-8509
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8510-8519
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 8520-8529
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 8530-8539
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 8540-8549
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8550-8559
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 8560-8569
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8570-8579
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 8580-8589
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 8590-8599
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 8600-8609
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8610-8619
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 8620-8629
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8630-8639
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 8640-8649
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8650-8659
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 8660-8669
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 8670-8679
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 8680-8689
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 8690-8699
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 8700-8709
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 8710-8719
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8720-8729
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 8730-8739
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 8740-8749
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8750-8759
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8760-8769
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 8770-8779
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 8780-8789
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8790-8799
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 8800-8809
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 8810-8819
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8820-8829
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 8830-8839
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 8840-8849
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8850-8859
-		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 8860-8869
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 8870-8879
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 8880-8889
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 8890-8899
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 8900-8909
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8910-8919
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 8920-8929
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 8930-8939
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 8940-8949
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 8950-8959
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 8960-8969
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 8970-8979
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 8980-8989
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 8990-8999
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9000-9009
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 9010-9019
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 9020-9029
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9030-9039
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 9040-9049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 9050-9059
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 9060-9069
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 9070-9079
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9080-9089
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9090-9099
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 9100-9109
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9110-9119
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 9120-9129
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 9130-9139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9140-9149
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9150-9159
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9160-9169
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 9170-9179
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 9180-9189
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 9190-9199
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 9200-9209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9210-9219
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 9220-9229
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 9230-9239
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9240-9249
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 9250-9259
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9260-9269
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9270-9279
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 9280-9289
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 9290-9299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9300-9309
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 9310-9319
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 9320-9329
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9330-9339
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 9340-9349
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 9350-9359
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9360-9369
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 9370-9379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9380-9389
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 9390-9399
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 9400-9409
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 9410-9419
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9420-9429
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 9430-9439
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 9440-9449
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9450-9459
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 9460-9469
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 9470-9479
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9480-9489
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 9490-9499
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9500-9509
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9510-9519
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9520-9529
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 9530-9539
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9540-9549
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 9550-9559
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 9560-9569
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9570-9579
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 9580-9589
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9590-9599
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9600-9609
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 9610-9619
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 9620-9629
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9630-9639
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 9640-9649
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9650-9659
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9660-9669
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 9670-9679
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 9680-9689
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 9690-9699
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 9700-9709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 9710-9719
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9720-9729
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 9730-9739
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 9740-9749
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9750-9759
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 9760-9769
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9770-9779
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 9780-9789
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9790-9799
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 9800-9809
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 9810-9819
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 9820-9829
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 9830-9839
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9840-9849
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 9850-9859
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9860-9869
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9870-9879
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 9880-9889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9890-9899
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 9900-9909
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 9910-9919
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 9920-9929
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 9930-9939
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 9940-9949
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9950-9959
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 9960-9969
-		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 9970-9979
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 9980-9989
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 9990-9999
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 10000-10009
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 10010-10019
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 10020-10029
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 10030-10039
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 10040-10049
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10050-10059
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 10060-10069
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 10070-10079
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10080-10089
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 10090-10099
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 10100-10109
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 10110-10119
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10120-10129
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 10130-10139
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10140-10149
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 10150-10159
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 10160-10169
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10170-10179
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10180-10189
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 10190-10199
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10200-10209
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10210-10219
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 10220-10229
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10230-10239
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 10240-10249
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 10250-10259
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10260-10269
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 10270-10279
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 10280-10289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10290-10299
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 10300-10309
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 10310-10319
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10320-10329
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 10330-10339
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 10340-10349
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 10350-10359
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 10360-10369
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 10370-10379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10380-10389
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 10390-10399
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 10400-10409
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 10410-10419
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 10420-10429
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 10430-10439
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10440-10449
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 10450-10459
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 10460-10469
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 10470-10479
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 10480-10489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 10490-10499
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10500-10509
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 10510-10519
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 10520-10529
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 10530-10539
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 10540-10549
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 10550-10559
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 10560-10569
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 10570-10579
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 10580-10589
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10590-10599
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 10600-10609
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 10610-10619
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10620-10629
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 10630-10639
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10640-10649
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 10650-10659
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 10660-10669
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 10670-10679
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 10680-10689
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 10690-10699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 10700-10709
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10710-10719
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 10720-10729
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 10730-10739
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10740-10749
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 10750-10759
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10760-10769
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10770-10779
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 10780-10789
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 10790-10799
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 10800-10809
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 10810-10819
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 10820-10829
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 10830-10839
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 10840-10849
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 10850-10859
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 10860-10869
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10870-10879
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 10880-10889
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10890-10899
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 10900-10909
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 10910-10919
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 10920-10929
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 10930-10939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 10940-10949
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 10950-10959
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 10960-10969
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 10970-10979
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 10980-10989
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 10990-10999
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 11000-11009
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11010-11019
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 11020-11029
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11030-11039
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 11040-11049
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 11050-11059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11060-11069
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11070-11079
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 11080-11089
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 11090-11099
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11100-11109
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 11110-11119
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11120-11129
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 11130-11139
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 11140-11149
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11150-11159
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11160-11169
-		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 11170-11179
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11180-11189
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 11190-11199
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11200-11209
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 11210-11219
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 11220-11229
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 11230-11239
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 11240-11249
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11250-11259
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11260-11269
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 11270-11279
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 11280-11289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 11290-11299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11300-11309
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11310-11319
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 11320-11329
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 11330-11339
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11340-11349
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 11350-11359
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 11360-11369
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11370-11379
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 11380-11389
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 11390-11399
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11400-11409
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11410-11419
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 11420-11429
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11430-11439
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 11440-11449
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11450-11459
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11460-11469
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11470-11479
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 11480-11489
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11490-11499
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 11500-11509
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 11510-11519
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 11520-11529
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 11530-11539
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11540-11549
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 11550-11559
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 11560-11569
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 11570-11579
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11580-11589
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 11590-11599
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11600-11609
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11610-11619
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11620-11629
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 11630-11639
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11640-11649
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 11650-11659
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11660-11669
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11670-11679
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 11680-11689
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11690-11699
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11700-11709
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 11710-11719
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11720-11729
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11730-11739
-		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 11740-11749
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 11750-11759
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11760-11769
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 11770-11779
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 11780-11789
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11790-11799
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11800-11809
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 11810-11819
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 11820-11829
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 11830-11839
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 11840-11849
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11850-11859
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 11860-11869
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11870-11879
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 11880-11889
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 11890-11899
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 11900-11909
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11910-11919
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 11920-11929
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 11930-11939
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 11940-11949
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 11950-11959
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 11960-11969
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 11970-11979
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 11980-11989
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 11990-11999
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12000-12009
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 12010-12019
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12020-12029
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12030-12039
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 12040-12049
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 12050-12059
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12060-12069
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 12070-12079
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12080-12089
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12090-12099
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 12100-12109
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 12110-12119
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 12120-12129
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12130-12139
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12140-12149
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12150-12159
-		1, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 12160-12169
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 12170-12179
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12180-12189
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12190-12199
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 12200-12209
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12210-12219
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 12220-12229
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 12230-12239
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12240-12249
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 12250-12259
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12260-12269
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12270-12279
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 12280-12289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12290-12299
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 12300-12309
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12310-12319
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 12320-12329
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12330-12339
-		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 12340-12349
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 12350-12359
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12360-12369
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 12370-12379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12380-12389
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12390-12399
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 12400-12409
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 12410-12419
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12420-12429
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 12430-12439
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12440-12449
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 12450-12459
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12460-12469
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12470-12479
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12480-12489
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12490-12499
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 12500-12509
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 12510-12519
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 12520-12529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 12530-12539
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12540-12549
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 12550-12559
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 12560-12569
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12570-12579
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 12580-12589
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12590-12599
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12600-12609
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 12610-12619
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 12620-12629
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12630-12639
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12640-12649
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 12650-12659
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12660-12669
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 12670-12679
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 12680-12689
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12690-12699
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 12700-12709
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 12710-12719
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 12720-12729
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 12730-12739
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 12740-12749
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12750-12759
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 12760-12769
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12770-12779
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12780-12789
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 12790-12799
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 12800-12809
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12810-12819
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 12820-12829
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12830-12839
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12840-12849
-		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 12850-12859
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 12860-12869
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 12870-12879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 12880-12889
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12890-12899
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 12900-12909
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 12910-12919
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 12920-12929
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12930-12939
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 12940-12949
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 12950-12959
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 12960-12969
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 12970-12979
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 12980-12989
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 12990-12999
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 24, // 13000-13009
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 13010-13019
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13020-13029
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 13030-13039
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 13040-13049
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13050-13059
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 13060-13069
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 13070-13079
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13080-13089
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 13090-13099
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 13100-13109
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13110-13119
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 13120-13129
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13130-13139
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 13140-13149
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 13150-13159
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 13160-13169
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 13170-13179
-		3, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 13180-13189
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 13190-13199
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13200-13209
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 13210-13219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 13220-13229
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13230-13239
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 13240-13249
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 13250-13259
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 13260-13269
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 13270-13279
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13280-13289
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 13290-13299
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 13300-13309
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 13310-13319
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 13320-13329
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 13330-13339
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 13340-13349
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13350-13359
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 13360-13369
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13370-13379
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13380-13389
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 13390-13399
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13400-13409
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 13410-13419
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 13420-13429
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13430-13439
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13440-13449
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 13450-13459
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 13460-13469
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 13470-13479
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 13480-13489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 13490-13499
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13500-13509
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 13510-13519
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 13520-13529
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 13530-13539
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13540-13549
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 13550-13559
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 13560-13569
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 13570-13579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13580-13589
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 13590-13599
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13600-13609
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 13610-13619
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 13620-13629
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 13630-13639
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 13640-13649
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 13650-13659
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 13660-13669
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 13670-13679
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 13680-13689
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 13690-13699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 13700-13709
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13710-13719
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 13720-13729
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 13730-13739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13740-13749
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 13750-13759
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 13760-13769
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13770-13779
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 13780-13789
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 13790-13799
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 13800-13809
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 13810-13819
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 13820-13829
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13830-13839
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 13840-13849
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 13850-13859
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13860-13869
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 13870-13879
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 13880-13889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13890-13899
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 13900-13909
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 13910-13919
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 13920-13929
-		1, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 13930-13939
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 13940-13949
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 13950-13959
-		3, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 13960-13969
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 13970-13979
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 13980-13989
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 13990-13999
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 14000-14009
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 14010-14019
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 14020-14029
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 14030-14039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14040-14049
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 14050-14059
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14060-14069
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14070-14079
-		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 14080-14089
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 14090-14099
-		7, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 14100-14109
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 14110-14119
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 14120-14129
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14130-14139
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 14140-14149
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 14150-14159
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14160-14169
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 14170-14179
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 14180-14189
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 14190-14199
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 14200-14209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14210-14219
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 14220-14229
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14230-14239
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 14240-14249
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 14250-14259
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 14260-14269
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14270-14279
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14280-14289
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 14290-14299
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 14300-14309
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14310-14319
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 14320-14329
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14330-14339
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 14340-14349
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 14350-14359
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 14360-14369
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 14370-14379
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 14380-14389
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14390-14399
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14400-14409
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 14410-14419
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 14420-14429
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 14430-14439
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 14440-14449
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14450-14459
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 14460-14469
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 14470-14479
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14480-14489
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14490-14499
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 14500-14509
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14510-14519
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14520-14529
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 14530-14539
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 14540-14549
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14550-14559
-		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 14560-14569
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 14570-14579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14580-14589
-		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 14590-14599
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 14600-14609
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 14610-14619
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 14620-14629
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 14630-14639
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14640-14649
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 14650-14659
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14660-14669
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14670-14679
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 14680-14689
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14690-14699
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14700-14709
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 14710-14719
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 14720-14729
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14730-14739
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 14740-14749
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 14750-14759
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14760-14769
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 14770-14779
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 14780-14789
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 14790-14799
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14800-14809
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 14810-14819
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14820-14829
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14830-14839
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 14840-14849
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 14850-14859
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 14860-14869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 14870-14879
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14880-14889
-		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 14890-14899
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 14900-14909
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14910-14919
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 14920-14929
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 14930-14939
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 14940-14949
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 14950-14959
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 14960-14969
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 14970-14979
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 14980-14989
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 14990-14999
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15000-15009
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 15010-15019
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15020-15029
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 15030-15039
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15040-15049
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15050-15059
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15060-15069
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 15070-15079
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15080-15089
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15090-15099
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 15100-15109
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15110-15119
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15120-15129
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 15130-15139
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15140-15149
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15150-15159
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15160-15169
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 15170-15179
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15180-15189
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 15190-15199
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 15200-15209
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 15210-15219
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15220-15229
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15230-15239
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 15240-15249
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 15250-15259
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 15260-15269
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 15270-15279
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 15280-15289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 15290-15299
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15300-15309
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 15310-15319
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 15320-15329
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 15330-15339
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 15340-15349
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 15350-15359
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15360-15369
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 15370-15379
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15380-15389
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15390-15399
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15400-15409
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 15410-15419
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 15420-15429
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 15430-15439
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 15440-15449
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15450-15459
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15460-15469
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 15470-15479
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 15480-15489
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 15490-15499
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15500-15509
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 15510-15519
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 15520-15529
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15530-15539
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15540-15549
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 15550-15559
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15560-15569
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15570-15579
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 15580-15589
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15590-15599
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 15600-15609
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 15610-15619
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15620-15629
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15630-15639
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 15640-15649
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15650-15659
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 15660-15669
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 15670-15679
-		3, 2, 1, 44, 43, 42, 41, 40, 39, 38, // 15680-15689
-		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 15690-15699
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 15700-15709
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 15710-15719
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 15720-15729
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 15730-15739
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15740-15749
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15750-15759
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15760-15769
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 15770-15779
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 15780-15789
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15790-15799
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 15800-15809
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15810-15819
-		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 15820-15829
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 15830-15839
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 15840-15849
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 15850-15859
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 15860-15869
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 15870-15879
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 15880-15889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15890-15899
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 15900-15909
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 15910-15919
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 15920-15929
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 15930-15939
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 15940-15949
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 15950-15959
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15960-15969
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 15970-15979
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15980-15989
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 15990-15999
-		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 16000-16009
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 16010-16019
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16020-16029
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 16030-16039
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16040-16049
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16050-16059
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 16060-16069
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 16070-16079
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16080-16089
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16090-16099
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 16100-16109
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16110-16119
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 16120-16129
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 16130-16139
-		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 16140-16149
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 16150-16159
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 16160-16169
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16170-16179
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 16180-16189
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 16190-16199
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16200-16209
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16210-16219
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 16220-16229
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 16230-16239
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 16240-16249
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 16250-16259
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16260-16269
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 16270-16279
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 16280-16289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16290-16299
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 16300-16309
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 16310-16319
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16320-16329
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 16330-16339
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 16340-16349
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16350-16359
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 16360-16369
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16370-16379
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 16380-16389
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 16390-16399
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16400-16409
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16410-16419
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16420-16429
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 16430-16439
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16440-16449
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 16450-16459
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16460-16469
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16470-16479
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16480-16489
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 16490-16499
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 16500-16509
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 16510-16519
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 16520-16529
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16530-16539
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16540-16549
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 16550-16559
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16560-16569
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 16570-16579
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 16580-16589
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16590-16599
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 16600-16609
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 16610-16619
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16620-16629
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 16630-16639
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 16640-16649
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16650-16659
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16660-16669
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 16670-16679
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16680-16689
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 16690-16699
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 16700-16709
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 16710-16719
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 16720-16729
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16730-16739
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 16740-16749
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 16750-16759
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 16760-16769
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 16770-16779
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 16780-16789
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 16790-16799
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16800-16809
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16810-16819
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 16820-16829
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16830-16839
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 16840-16849
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 16850-16859
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16860-16869
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 16870-16879
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 16880-16889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16890-16899
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 16900-16909
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 16910-16919
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 16920-16929
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16930-16939
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 16940-16949
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 16950-16959
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 16960-16969
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 16970-16979
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 16980-16989
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 16990-16999
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17000-17009
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17010-17019
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 17020-17029
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 17030-17039
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17040-17049
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 17050-17059
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17060-17069
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 17070-17079
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17080-17089
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 17090-17099
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 17100-17109
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17110-17119
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 17120-17129
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 17130-17139
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 17140-17149
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 17150-17159
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 17160-17169
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17170-17179
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17180-17189
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17190-17199
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 17200-17209
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 17210-17219
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17220-17229
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 17230-17239
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17240-17249
-		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 17250-17259
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 17260-17269
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 17270-17279
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17280-17289
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 17290-17299
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17300-17309
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 17310-17319
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17320-17329
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 17330-17339
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17340-17349
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 17350-17359
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17360-17369
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17370-17379
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 17380-17389
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 17390-17399
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17400-17409
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 17410-17419
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17420-17429
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17430-17439
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 17440-17449
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17450-17459
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 17460-17469
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17470-17479
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17480-17489
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 17490-17499
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 17500-17509
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 17510-17519
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 17520-17529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 17530-17539
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17540-17549
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 17550-17559
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 17560-17569
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17570-17579
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17580-17589
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 17590-17599
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 17600-17609
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17610-17619
-		3, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 17620-17629
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 17630-17639
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17640-17649
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 17650-17659
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 17660-17669
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17670-17679
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 17680-17689
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17690-17699
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 17700-17709
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 17710-17719
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 17720-17729
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 17730-17739
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 17740-17749
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17750-17759
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 17760-17769
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17770-17779
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17780-17789
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17790-17799
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 17800-17809
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17810-17819
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 17820-17829
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 17830-17839
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17840-17849
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17850-17859
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 17860-17869
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17870-17879
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17880-17889
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 17890-17899
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 17900-17909
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17910-17919
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 17920-17929
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 17930-17939
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 17940-17949
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 17950-17959
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 17960-17969
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 17970-17979
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 24, // 17980-17989
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 17990-17999
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18000-18009
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 18010-18019
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 18020-18029
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18030-18039
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 18040-18049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 18050-18059
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18060-18069
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 18070-18079
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 18080-18089
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 18090-18099
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18100-18109
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 18110-18119
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18120-18129
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 18130-18139
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 18140-18149
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18150-18159
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18160-18169
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18170-18179
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18180-18189
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18190-18199
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18200-18209
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 18210-18219
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 18220-18229
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 18230-18239
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18240-18249
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 18250-18259
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 18260-18269
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18270-18279
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 18280-18289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18290-18299
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18300-18309
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 18310-18319
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18320-18329
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18330-18339
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18340-18349
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 18350-18359
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18360-18369
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 18370-18379
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18380-18389
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18390-18399
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18400-18409
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 18410-18419
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 18420-18429
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 18430-18439
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 18440-18449
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18450-18459
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 18460-18469
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18470-18479
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18480-18489
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 18490-18499
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 18500-18509
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 18510-18519
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 18520-18529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 18530-18539
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18540-18549
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 18550-18559
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 18560-18569
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18570-18579
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 18580-18589
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 18590-18599
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18600-18609
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 18610-18619
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18620-18629
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 18630-18639
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 18640-18649
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18650-18659
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18660-18669
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18670-18679
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18680-18689
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18690-18699
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18700-18709
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 18710-18719
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18720-18729
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18730-18739
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 18740-18749
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 18750-18759
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18760-18769
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 18770-18779
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 18780-18789
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 18790-18799
-		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 18800-18809
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 18810-18819
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18820-18829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 18830-18839
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18840-18849
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 18850-18859
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 18860-18869
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 18870-18879
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 18880-18889
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 18890-18899
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18900-18909
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 28, // 18910-18919
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 18920-18929
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 18930-18939
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 18940-18949
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 18950-18959
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 18960-18969
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 18970-18979
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 18980-18989
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 18990-18999
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 19000-19009
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 19010-19019
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19020-19029
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 19030-19039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19040-19049
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 19050-19059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 19060-19069
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 19070-19079
-		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 19080-19089
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 19090-19099
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19100-19109
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19110-19119
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 19120-19129
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 19130-19139
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 19140-19149
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19150-19159
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 19160-19169
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19170-19179
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 19180-19189
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 19190-19199
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 19200-19209
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 19210-19219
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19220-19229
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 19230-19239
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 19240-19249
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 19250-19259
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19260-19269
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 19270-19279
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 19280-19289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19290-19299
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 19300-19309
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 19310-19319
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19320-19329
-		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 19330-19339
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 19340-19349
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 19350-19359
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19360-19369
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 19370-19379
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 19380-19389
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19390-19399
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 19400-19409
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 19410-19419
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 19420-19429
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 19430-19439
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 19440-19449
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19450-19459
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 19460-19469
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19470-19479
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 19480-19489
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19490-19499
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 19500-19509
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19510-19519
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19520-19529
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19530-19539
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 19540-19549
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 19550-19559
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19560-19569
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19570-19579
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 19580-19589
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 19590-19599
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 52, // 19600-19609
-		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 19610-19619
-		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 19620-19629
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 19630-19639
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19640-19649
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19650-19659
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19660-19669
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19670-19679
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 19680-19689
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 19690-19699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 19700-19709
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 19710-19719
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 19720-19729
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 19730-19739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19740-19749
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 19750-19759
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 19760-19769
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 19770-19779
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19780-19789
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 19790-19799
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19800-19809
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 19810-19819
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 19820-19829
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19830-19839
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 19840-19849
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 19850-19859
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 19860-19869
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 19870-19879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 19880-19889
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 19890-19899
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 19900-19909
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 19910-19919
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 19920-19929
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 19930-19939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 19940-19949
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19950-19959
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 19960-19969
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 19970-19979
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 19980-19989
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 19990-19999
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20000-20009
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20010-20019
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 20020-20029
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20030-20039
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 20040-20049
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20050-20059
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 20060-20069
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 20070-20079
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 20080-20089
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20090-20099
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 20100-20109
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 20110-20119
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 20120-20129
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20130-20139
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 20140-20149
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20150-20159
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20160-20169
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 20170-20179
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20180-20189
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20190-20199
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 20200-20209
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 20210-20219
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20220-20229
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 20230-20239
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 20240-20249
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20250-20259
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 20260-20269
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20270-20279
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 20280-20289
-		7, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 20290-20299
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 20300-20309
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20310-20319
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 20320-20329
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 20330-20339
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 20340-20349
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 20350-20359
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 20360-20369
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 20370-20379
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 20380-20389
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 20390-20399
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 20400-20409
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 20410-20419
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20420-20429
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20430-20439
-		1, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 20440-20449
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 20450-20459
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20460-20469
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 20470-20479
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 20480-20489
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20490-20499
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 20500-20509
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20510-20519
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20520-20529
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 20530-20539
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 20540-20549
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20550-20559
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 20560-20569
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 20570-20579
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20580-20589
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 20590-20599
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20600-20609
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20610-20619
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 20620-20629
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 20630-20639
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 20640-20649
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20650-20659
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20660-20669
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20670-20679
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20680-20689
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 20690-20699
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 20700-20709
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 20710-20719
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20720-20729
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20730-20739
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 20740-20749
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 20750-20759
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20760-20769
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 20770-20779
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 20780-20789
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 20790-20799
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 40, // 20800-20809
-		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 20810-20819
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 20820-20829
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 20830-20839
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 20840-20849
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 20850-20859
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 20860-20869
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 20870-20879
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 20880-20889
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 20890-20899
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20900-20909
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20910-20919
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 20920-20929
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 20930-20939
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 20940-20949
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 20950-20959
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20960-20969
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20970-20979
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 20980-20989
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 20990-20999
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21000-21009
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 21010-21019
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 21020-21029
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 21030-21039
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21040-21049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 21050-21059
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 21060-21069
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21070-21079
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 21080-21089
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21090-21099
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 21100-21109
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21110-21119
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21120-21129
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 21130-21139
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 21140-21149
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21150-21159
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 21160-21169
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 21170-21179
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21180-21189
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21190-21199
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21200-21209
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21210-21219
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 21220-21229
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21230-21239
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 21240-21249
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21250-21259
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 21260-21269
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21270-21279
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 21280-21289
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 21290-21299
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21300-21309
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 21310-21319
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21320-21329
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21330-21339
-		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 21340-21349
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 21350-21359
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21360-21369
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 21370-21379
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 21380-21389
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21390-21399
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 21400-21409
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 21410-21419
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21420-21429
-		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 21430-21439
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 21440-21449
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21450-21459
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 21460-21469
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21470-21479
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21480-21489
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 21490-21499
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 21500-21509
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21510-21519
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 21520-21529
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 21530-21539
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21540-21549
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 21550-21559
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 21560-21569
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 21570-21579
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 21580-21589
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 21590-21599
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21600-21609
-		1, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 21610-21619
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 21620-21629
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21630-21639
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 21640-21649
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21650-21659
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21660-21669
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 21670-21679
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21680-21689
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21690-21699
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21700-21709
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 21710-21719
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 21720-21729
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 21730-21739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21740-21749
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 21750-21759
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21760-21769
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 21770-21779
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 21780-21789
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 21790-21799
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 21800-21809
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 21810-21819
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21820-21829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 21830-21839
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21840-21849
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 21850-21859
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 21860-21869
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21870-21879
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 21880-21889
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21890-21899
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21900-21909
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 21910-21919
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 21920-21929
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21930-21939
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 21940-21949
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21950-21959
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 21960-21969
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 21970-21979
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 21980-21989
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 21990-21999
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 22000-22009
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 22010-22019
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 22020-22029
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 22030-22039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22040-22049
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22050-22059
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 22060-22069
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 22070-22079
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22080-22089
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 22090-22099
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 22100-22109
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22110-22119
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 22120-22129
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 22130-22139
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 22140-22149
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 22150-22159
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22160-22169
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 22170-22179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 22180-22189
-		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 22190-22199
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 22200-22209
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 22210-22219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 22220-22229
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22230-22239
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 22240-22249
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 22250-22259
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22260-22269
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 22270-22279
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 22280-22289
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22290-22299
-		3, 2, 1, 4, 3, 2, 1, 36, 35, 34, // 22300-22309
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 22310-22319
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 22320-22329
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22330-22339
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 22340-22349
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22350-22359
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 22360-22369
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22370-22379
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22380-22389
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 22390-22399
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 22400-22409
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 22410-22419
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22420-22429
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 22430-22439
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 22440-22449
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 22450-22459
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 22460-22469
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22470-22479
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 22480-22489
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22490-22499
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22500-22509
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 22510-22519
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22520-22529
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22530-22539
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 22540-22549
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22550-22559
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 22560-22569
-		1, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 22570-22579
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 22580-22589
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 22590-22599
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22600-22609
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 22610-22619
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22620-22629
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 22630-22639
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 22640-22649
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 22650-22659
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 22660-22669
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 22670-22679
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22680-22689
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 22690-22699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 22700-22709
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 22710-22719
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 22720-22729
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 22730-22739
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22740-22749
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 22750-22759
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 22760-22769
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 22770-22779
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 22780-22789
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22790-22799
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 22800-22809
-		1, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 22810-22819
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 22820-22829
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 22830-22839
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22840-22849
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 22850-22859
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22860-22869
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 22870-22879
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 22880-22889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22890-22899
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 22900-22909
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22910-22919
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 22920-22929
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 22930-22939
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 22940-22949
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 22950-22959
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 22960-22969
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 22970-22979
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 22980-22989
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 22990-22999
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 23000-23009
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23010-23019
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 23020-23029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 23030-23039
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23040-23049
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 23050-23059
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 23060-23069
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23070-23079
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23080-23089
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 23090-23099
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23100-23109
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 23110-23119
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23120-23129
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23130-23139
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 23140-23149
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 23150-23159
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 23160-23169
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 23170-23179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 23180-23189
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23190-23199
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 23200-23209
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23210-23219
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 23220-23229
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 23230-23239
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23240-23249
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 23250-23259
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 23260-23269
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 23270-23279
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23280-23289
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 23290-23299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23300-23309
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23310-23319
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 23320-23329
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 23330-23339
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23340-23349
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23350-23359
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 23360-23369
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 23370-23379
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 23380-23389
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 23390-23399
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23400-23409
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 23410-23419
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23420-23429
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23430-23439
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23440-23449
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 23450-23459
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23460-23469
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 23470-23479
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23480-23489
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23490-23499
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 23500-23509
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 23510-23519
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23520-23529
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 23530-23539
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 23540-23549
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23550-23559
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 23560-23569
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23570-23579
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23580-23589
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 23590-23599
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 23600-23609
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23610-23619
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 23620-23629
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 23630-23639
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 23640-23649
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23650-23659
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 23660-23669
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 23670-23679
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 30, // 23680-23689
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 23690-23699
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 23700-23709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 23710-23719
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 23720-23729
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23730-23739
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 23740-23749
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 23750-23759
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 23760-23769
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 23770-23779
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 23780-23789
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23790-23799
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23800-23809
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 23810-23819
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23820-23829
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 23830-23839
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23840-23849
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23850-23859
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 23860-23869
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 23870-23879
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 23880-23889
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 23890-23899
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 23900-23909
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 23910-23919
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 23920-23929
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 23930-23939
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 23940-23949
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 23950-23959
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 23960-23969
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 23970-23979
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 23980-23989
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 23990-23999
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 24000-24009
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 24010-24019
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 24020-24029
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24030-24039
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 24040-24049
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24050-24059
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24060-24069
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24070-24079
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24080-24089
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24090-24099
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 24100-24109
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24110-24119
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24120-24129
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 24130-24139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24140-24149
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24150-24159
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 24160-24169
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 24170-24179
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24180-24189
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24190-24199
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 24200-24209
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24210-24219
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 24220-24229
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 24230-24239
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 24240-24249
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 24250-24259
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 24260-24269
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24270-24279
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 24280-24289
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 24290-24299
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24300-24309
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 24310-24319
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 24320-24329
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 24330-24339
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24340-24349
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 24350-24359
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24360-24369
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 24370-24379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24380-24389
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24390-24399
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24400-24409
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 24410-24419
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24420-24429
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 24430-24439
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 24440-24449
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24450-24459
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 24460-24469
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24470-24479
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24480-24489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 24490-24499
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 24500-24509
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 24510-24519
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24520-24529
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 24530-24539
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 24540-24549
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 24550-24559
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24560-24569
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 24570-24579
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24580-24589
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 24590-24599
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24600-24609
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24610-24619
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24620-24629
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 24630-24639
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 24640-24649
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 24650-24659
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24660-24669
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 24670-24679
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 24680-24689
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 24690-24699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 24700-24709
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 24710-24719
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24720-24729
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 24730-24739
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 24740-24749
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24750-24759
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 24760-24769
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24770-24779
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24780-24789
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 24790-24799
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 24800-24809
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24810-24819
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 24820-24829
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 24830-24839
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 24840-24849
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 24850-24859
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24860-24869
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 24870-24879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 24880-24889
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 24890-24899
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 24900-24909
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 24910-24919
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 24920-24929
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 24930-24939
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 24940-24949
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 24950-24959
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 24960-24969
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 24970-24979
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 24980-24989
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 24990-24999
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25000-25009
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 25010-25019
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25020-25029
-		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 25030-25039
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25040-25049
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 25050-25059
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25060-25069
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 25070-25079
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 25080-25089
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 25090-25099
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25100-25109
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 25110-25119
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 25120-25129
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25130-25139
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25140-25149
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 25150-25159
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 25160-25169
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25170-25179
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 25180-25189
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 25190-25199
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25200-25209
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 25210-25219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 25220-25229
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25230-25239
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 25240-25249
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 25250-25259
-		1, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 25260-25269
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 25270-25279
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 25280-25289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25290-25299
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 25300-25309
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25310-25319
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25320-25329
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 25330-25339
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 25340-25349
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 25350-25359
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25360-25369
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 25370-25379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25380-25389
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25390-25399
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 25400-25409
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25410-25419
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 25420-25429
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 25430-25439
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25440-25449
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 25450-25459
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 25460-25469
-		1, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 25470-25479
-		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 25480-25489
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 25490-25499
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 25500-25509
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25510-25519
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 25520-25529
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 25530-25539
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 25540-25549
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25550-25559
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25560-25569
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 25570-25579
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 25580-25589
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25590-25599
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 25600-25609
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25610-25619
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25620-25629
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 25630-25639
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 25640-25649
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 25650-25659
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25660-25669
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 25670-25679
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25680-25689
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 25690-25699
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 25700-25709
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 25710-25719
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25720-25729
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 25730-25739
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 25740-25749
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 25750-25759
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 25760-25769
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 25770-25779
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25780-25789
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 25790-25799
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25800-25809
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 25810-25819
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 25820-25829
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25830-25839
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 25840-25849
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25850-25859
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 25860-25869
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 25870-25879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 25880-25889
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 25890-25899
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 25900-25909
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 25910-25919
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25920-25929
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 25930-25939
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 25940-25949
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 25950-25959
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 25960-25969
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 25970-25979
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 25980-25989
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 25990-25999
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 26000-26009
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26010-26019
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 26020-26029
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26030-26039
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26040-26049
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 26050-26059
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 26060-26069
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26070-26079
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 26080-26089
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 26090-26099
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26100-26109
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 26110-26119
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 26120-26129
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26130-26139
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26140-26149
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 26150-26159
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26160-26169
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26170-26179
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 26180-26189
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26190-26199
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 26200-26209
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26210-26219
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 26220-26229
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 26230-26239
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 26240-26249
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26250-26259
-		1, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 26260-26269
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 26270-26279
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26280-26289
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 26290-26299
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 26300-26309
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26310-26319
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26320-26329
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 26330-26339
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 26340-26349
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 26350-26359
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26360-26369
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26370-26379
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26380-26389
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 26390-26399
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 26400-26409
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26410-26419
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 26420-26429
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 26430-26439
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 26440-26449
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 26450-26459
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26460-26469
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 26470-26479
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 26480-26489
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26490-26499
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26500-26509
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 26510-26519
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26520-26529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 26530-26539
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26540-26549
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26550-26559
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26560-26569
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 26570-26579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26580-26589
-		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 26590-26599
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 26600-26609
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26610-26619
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26620-26629
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 26630-26639
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 26640-26649
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26650-26659
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 26660-26669
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26670-26679
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 26680-26689
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 26690-26699
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26700-26709
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 26710-26719
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 26720-26729
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 26730-26739
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 26740-26749
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 26750-26759
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26760-26769
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26770-26779
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 26780-26789
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26790-26799
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26800-26809
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 26810-26819
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 26820-26829
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 26830-26839
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 26840-26849
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26850-26859
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 26860-26869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 26870-26879
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26880-26889
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 26890-26899
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 26900-26909
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26910-26919
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 26920-26929
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 26930-26939
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 26940-26949
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 26950-26959
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 26960-26969
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 26970-26979
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 26980-26989
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 26990-26999
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27000-27009
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 27010-27019
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27020-27029
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27030-27039
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 27040-27049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27050-27059
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 27060-27069
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 27070-27079
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27080-27089
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27090-27099
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 18, // 27100-27109
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27110-27119
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 27120-27129
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27130-27139
-		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 27140-27149
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 27150-27159
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27160-27169
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 27170-27179
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27180-27189
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 27190-27199
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27200-27209
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 27210-27219
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27220-27229
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27230-27239
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27240-27249
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 27250-27259
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27260-27269
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27270-27279
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 27280-27289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 27290-27299
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 27300-27309
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27310-27319
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 27320-27329
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 27330-27339
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 27340-27349
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27350-27359
-		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 27360-27369
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 27370-27379
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27380-27389
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 27390-27399
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 27400-27409
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27410-27419
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27420-27429
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 27430-27439
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 27440-27449
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 27450-27459
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27460-27469
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27470-27479
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 27480-27489
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 27490-27499
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 27500-27509
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27510-27519
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 27520-27529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27530-27539
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27540-27549
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 27550-27559
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 27560-27569
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27570-27579
-		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 27580-27589
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 27590-27599
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27600-27609
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 27610-27619
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27620-27629
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27630-27639
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 27640-27649
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 27650-27659
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27660-27669
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 27670-27679
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 27680-27689
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27690-27699
-		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 27700-27709
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 27710-27719
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27720-27729
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 27730-27739
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 27740-27749
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27750-27759
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 27760-27769
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 27770-27779
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27780-27789
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 27790-27799
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 27800-27809
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 27810-27819
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 27820-27829
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27830-27839
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27840-27849
-		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 27850-27859
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 27860-27869
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27870-27879
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 27880-27889
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 27890-27899
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 27900-27909
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 27910-27919
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 27920-27929
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 27930-27939
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 27940-27949
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 27950-27959
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 27960-27969
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 27970-27979
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 27980-27989
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 27990-27999
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28000-28009
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 28010-28019
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28020-28029
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 28030-28039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28040-28049
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 28050-28059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 28060-28069
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28070-28079
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 28080-28089
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 28090-28099
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 28100-28109
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28110-28119
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 28120-28129
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 28130-28139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28140-28149
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28150-28159
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 28160-28169
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28170-28179
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 28180-28189
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28190-28199
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28200-28209
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 28210-28219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 48, // 28220-28229
-		47, 46, 45, 44, 43, 42, 41, 40, 39, 38, // 28230-28239
-		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 28240-28249
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 28250-28259
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28260-28269
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 28270-28279
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 28280-28289
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 28290-28299
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 28300-28309
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 28310-28319
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 28320-28329
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28330-28339
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 28340-28349
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 28350-28359
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 28360-28369
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28370-28379
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28380-28389
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 28390-28399
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 28400-28409
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28410-28419
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 28420-28429
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 28430-28439
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 28440-28449
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28450-28459
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 28460-28469
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 28470-28479
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28480-28489
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 28490-28499
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28500-28509
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 28510-28519
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28520-28529
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28530-28539
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 28540-28549
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 28550-28559
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28560-28569
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 28570-28579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28580-28589
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28590-28599
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 28600-28609
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 28610-28619
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28620-28629
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28630-28639
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 28640-28649
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28650-28659
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 28660-28669
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28670-28679
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 28680-28689
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28690-28699
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 28700-28709
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 28710-28719
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 28720-28729
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 28730-28739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28740-28749
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 28750-28759
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28760-28769
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28770-28779
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 28780-28789
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 28790-28799
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28800-28809
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 28810-28819
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 28820-28829
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28830-28839
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 28840-28849
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 28850-28859
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 28860-28869
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 28870-28879
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 28880-28889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28890-28899
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 28900-28909
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28910-28919
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 28920-28929
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 28930-28939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 28940-28949
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 28950-28959
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28960-28969
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 28970-28979
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 28980-28989
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 28990-28999
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 29000-29009
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 29010-29019
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 29020-29029
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 29030-29039
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 29040-29049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 29050-29059
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 29060-29069
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 29070-29079
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 29080-29089
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29090-29099
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 29100-29109
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29110-29119
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 29120-29129
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 29130-29139
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29140-29149
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 29150-29159
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29160-29169
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 29170-29179
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29180-29189
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29190-29199
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 29200-29209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29210-29219
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29220-29229
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29230-29239
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 29240-29249
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 29250-29259
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 29260-29269
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29270-29279
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 29280-29289
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29290-29299
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 29300-29309
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29310-29319
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29320-29329
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 29330-29339
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 29340-29349
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29350-29359
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 29360-29369
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29370-29379
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 29380-29389
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 29390-29399
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29400-29409
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29410-29419
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 29420-29429
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29430-29439
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 29440-29449
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 29450-29459
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29460-29469
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 29470-29479
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 29480-29489
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29490-29499
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 29500-29509
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29510-29519
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 29520-29529
-		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 29530-29539
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 29540-29549
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29550-29559
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 29560-29569
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 29570-29579
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 29580-29589
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 29590-29599
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29600-29609
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 29610-29619
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 29620-29629
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 29630-29639
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 29640-29649
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29650-29659
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 29660-29669
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29670-29679
-		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 29680-29689
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 29690-29699
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29700-29709
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 29710-29719
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 29720-29729
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29730-29739
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29740-29749
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 29750-29759
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 29760-29769
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 29770-29779
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 29780-29789
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29790-29799
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 29800-29809
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 29810-29819
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29820-29829
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 29830-29839
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 29840-29849
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29850-29859
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 29860-29869
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 29870-29879
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 29880-29889
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 29890-29899
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29900-29909
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 29910-29919
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 29920-29929
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 29930-29939
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 29940-29949
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 29950-29959
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 29960-29969
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 29970-29979
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 29980-29989
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 29990-29999
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30000-30009
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 30010-30019
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 30020-30029
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30030-30039
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 30040-30049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 30050-30059
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30060-30069
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 30070-30079
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30080-30089
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30090-30099
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 30100-30109
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 30110-30119
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30120-30129
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 30130-30139
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30140-30149
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30150-30159
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 30160-30169
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30170-30179
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 30180-30189
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30190-30199
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 30200-30209
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30210-30219
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 30220-30229
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30230-30239
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30240-30249
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 30250-30259
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30260-30269
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 30270-30279
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30280-30289
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 30290-30299
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30300-30309
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 30310-30319
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 30320-30329
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30330-30339
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 30340-30349
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30350-30359
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 30360-30369
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 30370-30379
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30380-30389
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30390-30399
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 30400-30409
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30410-30419
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 30420-30429
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 30430-30439
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 30440-30449
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30450-30459
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 30460-30469
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30470-30479
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30480-30489
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 30490-30499
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 30500-30509
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 30510-30519
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 30520-30529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 30530-30539
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30540-30549
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 18, // 30550-30559
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30560-30569
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 30570-30579
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30580-30589
-		3, 2, 1, 38, 37, 36, 35, 34, 33, 32, // 30590-30599
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 30600-30609
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30610-30619
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30620-30629
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30630-30639
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 30640-30649
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30650-30659
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30660-30669
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 30670-30679
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 30680-30689
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30690-30699
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 30700-30709
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 30710-30719
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 30720-30729
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 30730-30739
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 30740-30749
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30750-30759
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 30760-30769
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 30770-30779
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 30780-30789
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30790-30799
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 30800-30809
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 30810-30819
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 30820-30829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30830-30839
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30840-30849
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 30850-30859
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 30860-30869
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30870-30879
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 30880-30889
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 30890-30899
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30900-30909
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30910-30919
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30920-30929
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 30930-30939
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 30940-30949
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 30950-30959
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 30960-30969
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 30970-30979
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 30980-30989
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 30990-30999
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31000-31009
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 31010-31019
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31020-31029
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 31030-31039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31040-31049
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31050-31059
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 31060-31069
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 31070-31079
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31080-31089
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 31090-31099
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 31100-31109
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31110-31119
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 31120-31129
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 31130-31139
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31140-31149
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 31150-31159
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31160-31169
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31170-31179
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 31180-31189
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 31190-31199
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 31200-31209
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 31210-31219
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 31220-31229
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 31230-31239
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 31240-31249
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 31250-31259
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31260-31269
-		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 31270-31279
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 31280-31289
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31290-31299
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 31300-31309
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 31310-31319
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 31320-31329
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 31330-31339
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31340-31349
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 31350-31359
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 31360-31369
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 31370-31379
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31380-31389
-		1, 2, 1, 4, 3, 2, 1, 72, 71, 70, // 31390-31399
-		69, 68, 67, 66, 65, 64, 63, 62, 61, 60, // 31400-31409
-		59, 58, 57, 56, 55, 54, 53, 52, 51, 50, // 31410-31419
-		49, 48, 47, 46, 45, 44, 43, 42, 41, 40, // 31420-31429
-		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 31430-31439
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 31440-31449
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 31450-31459
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 31460-31469
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 31470-31479
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 31480-31489
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 31490-31499
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31500-31509
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 31510-31519
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31520-31529
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31530-31539
-		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 31540-31549
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31550-31559
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 31560-31569
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 31570-31579
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 31580-31589
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31590-31599
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 31600-31609
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31610-31619
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 31620-31629
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31630-31639
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 31640-31649
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 31650-31659
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 31660-31669
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31670-31679
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 31680-31689
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 31690-31699
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 31700-31709
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31710-31719
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 31720-31729
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31730-31739
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31740-31749
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 31750-31759
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 31760-31769
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 31770-31779
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31780-31789
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 31790-31799
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31800-31809
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 31810-31819
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 31820-31829
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31830-31839
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 31840-31849
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 31850-31859
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31860-31869
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 31870-31879
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 31880-31889
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31890-31899
-		7, 6, 5, 4, 3, 2, 1, 50, 49, 48, // 31900-31909
-		47, 46, 45, 44, 43, 42, 41, 40, 39, 38, // 31910-31919
-		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 31920-31929
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 31930-31939
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 31940-31949
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 31950-31959
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 31960-31969
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 31970-31979
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 31980-31989
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 31990-31999
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 32000-32009
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32010-32019
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 32020-32029
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32030-32039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32040-32049
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 32050-32059
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 32060-32069
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32070-32079
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 32080-32089
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 32090-32099
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32100-32109
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 32110-32119
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32120-32129
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32130-32139
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 32140-32149
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 32150-32159
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32160-32169
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 32170-32179
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 32180-32189
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32190-32199
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 32200-32209
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 32210-32219
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32220-32229
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 32230-32239
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32240-32249
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 32250-32259
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 32260-32269
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 32270-32279
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32280-32289
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 32290-32299
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 32300-32309
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32310-32319
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 32320-32329
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32330-32339
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32340-32349
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 32350-32359
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 32360-32369
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 32370-32379
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32380-32389
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32390-32399
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32400-32409
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 32410-32419
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 32420-32429
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32430-32439
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 32440-32449
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32450-32459
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 32460-32469
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 32470-32479
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32480-32489
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32490-32499
-		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 32500-32509
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32510-32519
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32520-32529
-		1, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 32530-32539
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32540-32549
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32550-32559
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 32560-32569
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 32570-32579
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 32580-32589
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32590-32599
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 32600-32609
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32610-32619
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32620-32629
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 32630-32639
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32640-32649
-		3, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 32650-32659
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 32660-32669
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32670-32679
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32680-32689
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 32690-32699
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 32700-32709
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 30, // 32710-32719
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 32720-32729
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 32730-32739
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 32740-32749
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32750-32759
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32760-32769
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 32770-32779
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 32780-32789
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 32790-32799
-		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 32800-32809
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 32810-32819
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 32820-32829
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 32830-32839
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 32840-32849
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 32850-32859
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 32860-32869
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32870-32879
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 32880-32889
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 32890-32899
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 32900-32909
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 32910-32919
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32920-32929
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 32930-32939
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 32940-32949
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 32950-32959
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 32960-32969
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 32970-32979
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 32980-32989
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 32990-32999
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33000-33009
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 33010-33019
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 33020-33029
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 33030-33039
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 33040-33049
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 33050-33059
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33060-33069
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 33070-33079
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33080-33089
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33090-33099
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 33100-33109
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 33110-33119
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 33120-33129
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33130-33139
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33140-33149
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33150-33159
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33160-33169
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33170-33179
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33180-33189
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 33190-33199
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33200-33209
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33210-33219
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 33220-33229
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33230-33239
-		7, 6, 5, 4, 3, 2, 1, 40, 39, 38, // 33240-33249
-		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 33250-33259
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 33260-33269
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33270-33279
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 33280-33289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33290-33299
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33300-33309
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 33310-33319
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33320-33329
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33330-33339
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 33340-33349
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 33350-33359
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33360-33369
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 33370-33379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33380-33389
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33390-33399
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 33400-33409
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 33410-33419
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 33420-33429
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 33430-33439
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33440-33449
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 33450-33459
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 33460-33469
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 33470-33479
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 33480-33489
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 33490-33499
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 33500-33509
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33510-33519
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 33520-33529
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 33530-33539
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 33540-33549
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33550-33559
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 33560-33569
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 33570-33579
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 33580-33589
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33590-33599
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33600-33609
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 33610-33619
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 33620-33629
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 33630-33639
-		1, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 33640-33649
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 33650-33659
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33660-33669
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 33670-33679
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 33680-33689
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33690-33699
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 33700-33709
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33710-33719
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33720-33729
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 33730-33739
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33740-33749
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 33750-33759
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 33760-33769
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 33770-33779
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33780-33789
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 33790-33799
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 33800-33809
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33810-33819
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 33820-33829
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 33830-33839
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33840-33849
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 33850-33859
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33860-33869
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 33870-33879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 33880-33889
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 33890-33899
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33900-33909
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 33910-33919
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 33920-33929
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 33930-33939
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 33940-33949
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 33950-33959
-		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 33960-33969
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 33970-33979
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 33980-33989
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 33990-33999
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 34000-34009
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 34010-34019
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34020-34029
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 34030-34039
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34040-34049
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 34050-34059
-		1, 62, 61, 60, 59, 58, 57, 56, 55, 54, // 34060-34069
-		53, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 34070-34079
-		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 34080-34089
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 34090-34099
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 34100-34109
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34110-34119
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 34120-34129
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34130-34139
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 34140-34149
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 34150-34159
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34160-34169
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34170-34179
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 34180-34189
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 34190-34199
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34200-34209
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 34210-34219
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34220-34229
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 34230-34239
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34240-34249
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 34250-34259
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34260-34269
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 34270-34279
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 34280-34289
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 34290-34299
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 34300-34309
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 34310-34319
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 34320-34329
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 34330-34339
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34340-34349
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34350-34359
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 34360-34369
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34370-34379
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 34380-34389
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34390-34399
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34400-34409
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34410-34419
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 34420-34429
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 34430-34439
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34440-34449
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 34450-34459
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 34460-34469
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34470-34479
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 34480-34489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 34490-34499
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34500-34509
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 34510-34519
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34520-34529
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34530-34539
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 34, // 34540-34549
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 34550-34559
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 34560-34569
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34570-34579
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 34580-34589
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34590-34599
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 34600-34609
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34610-34619
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34620-34629
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 34630-34639
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 34640-34649
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34650-34659
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34660-34669
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 34670-34679
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34680-34689
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 34690-34699
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34700-34709
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34710-34719
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 34720-34729
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 34730-34739
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 34740-34749
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 34750-34759
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34760-34769
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34770-34779
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 34780-34789
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 34790-34799
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 34800-34809
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 34810-34819
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 34820-34829
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34830-34839
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 34840-34849
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 34850-34859
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34860-34869
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 34870-34879
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 34880-34889
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 34890-34899
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 34900-34909
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 34910-34919
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 34920-34929
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 34930-34939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 34940-34949
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34950-34959
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 34960-34969
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 34970-34979
-		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 34980-34989
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 34990-34999
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 35000-35009
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35010-35019
-		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 35020-35029
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35030-35039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35040-35049
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 35050-35059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 35060-35069
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35070-35079
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 35080-35089
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 35090-35099
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 35100-35109
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 35110-35119
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 35120-35129
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35130-35139
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 35140-35149
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 35150-35159
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35160-35169
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 35170-35179
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35180-35189
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35190-35199
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35200-35209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35210-35219
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 35220-35229
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35230-35239
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35240-35249
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 35250-35259
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 35260-35269
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 35270-35279
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35280-35289
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35290-35299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35300-35309
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 35310-35319
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 35320-35329
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 35330-35339
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35340-35349
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 35350-35359
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 35360-35369
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35370-35379
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35380-35389
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 35390-35399
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 35400-35409
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 35410-35419
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 35420-35429
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 35430-35439
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 35440-35449
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35450-35459
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 35460-35469
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35470-35479
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35480-35489
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 35490-35499
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 35500-35509
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35510-35519
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 35520-35529
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 35530-35539
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 35540-35549
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 35550-35559
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 35560-35569
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 35570-35579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35580-35589
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 35590-35599
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 35600-35609
-		7, 6, 5, 4, 3, 2, 1, 54, 53, 52, // 35610-35619
-		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 35620-35629
-		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 35630-35639
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 35640-35649
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35650-35659
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35660-35669
-		1, 6, 5, 4, 3, 2, 1, 52, 51, 50, // 35670-35679
-		49, 48, 47, 46, 45, 44, 43, 42, 41, 40, // 35680-35689
-		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 35690-35699
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 35700-35709
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 35710-35719
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 35720-35729
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 35730-35739
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 35740-35749
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 35750-35759
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35760-35769
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 35770-35779
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 35780-35789
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 35790-35799
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 35800-35809
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 35810-35819
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35820-35829
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 35830-35839
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35840-35849
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35850-35859
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 35860-35869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 35870-35879
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 35880-35889
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 35890-35899
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35900-35909
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35910-35919
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 35920-35929
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 35930-35939
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 35940-35949
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 35950-35959
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 35960-35969
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 35970-35979
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 35980-35989
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 35990-35999
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 36000-36009
-		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 36010-36019
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 36020-36029
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 36030-36039
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 36040-36049
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36050-36059
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36060-36069
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 36070-36079
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 36080-36089
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 36090-36099
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 36100-36109
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 36110-36119
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36120-36129
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 36130-36139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36140-36149
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36150-36159
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 36160-36169
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 36170-36179
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 36180-36189
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 36190-36199
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 36200-36209
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 36210-36219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 36220-36229
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36230-36239
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36240-36249
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36250-36259
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 36260-36269
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 36270-36279
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36280-36289
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 36290-36299
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36300-36309
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 36310-36319
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 36320-36329
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36330-36339
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 36340-36349
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 36350-36359
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36360-36369
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 36370-36379
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 44, // 36380-36389
-		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 36390-36399
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 36400-36409
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 36410-36419
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36420-36429
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 36430-36439
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36440-36449
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 36450-36459
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 36460-36469
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 36470-36479
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36480-36489
-		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 36490-36499
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 36500-36509
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36510-36519
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 36520-36529
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36530-36539
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36540-36549
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 36550-36559
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 36560-36569
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36570-36579
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 36580-36589
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 36590-36599
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 36600-36609
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 36610-36619
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 36620-36629
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36630-36639
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 36640-36649
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 36650-36659
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36660-36669
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36670-36679
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 36680-36689
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 36690-36699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 36700-36709
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 36710-36719
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 36720-36729
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 36730-36739
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 36740-36749
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36750-36759
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 36760-36769
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 36770-36779
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 36780-36789
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 36790-36799
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 36800-36809
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36810-36819
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36820-36829
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 36830-36839
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 36840-36849
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 36850-36859
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 36860-36869
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 36870-36879
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 36880-36889
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 36890-36899
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36900-36909
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 36910-36919
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 36920-36929
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36930-36939
-		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 36940-36949
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 36950-36959
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 36960-36969
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 36970-36979
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 36980-36989
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 36990-36999
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 37000-37009
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 37010-37019
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 37020-37029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 37030-37039
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 37040-37049
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37050-37059
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 37060-37069
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37070-37079
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 37080-37089
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 37090-37099
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37100-37109
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37110-37119
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 37120-37129
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 37130-37139
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 37140-37149
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 37150-37159
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37160-37169
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37170-37179
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 37180-37189
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 37190-37199
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37200-37209
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37210-37219
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 37220-37229
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37230-37239
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 37240-37249
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 37250-37259
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37260-37269
-		3, 2, 1, 4, 3, 2, 1, 30, 29, 28, // 37270-37279
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 37280-37289
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37290-37299
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 37300-37309
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 37310-37319
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37320-37329
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 37330-37339
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37340-37349
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37350-37359
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 37360-37369
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 37370-37379
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37380-37389
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 37390-37399
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 37400-37409
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37410-37419
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 37420-37429
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37430-37439
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 37440-37449
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37450-37459
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 37460-37469
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37470-37479
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 37480-37489
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 37490-37499
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37500-37509
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 37510-37519
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 37520-37529
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 37530-37539
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 37540-37549
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37550-37559
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37560-37569
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 37570-37579
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 37580-37589
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37590-37599
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 37600-37609
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 37610-37619
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 37620-37629
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 37630-37639
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 37640-37649
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37650-37659
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 37660-37669
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 37670-37679
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37680-37689
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 37690-37699
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37700-37709
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 37710-37719
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 37720-37729
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37730-37739
-		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 37740-37749
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 37750-37759
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 37760-37769
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37770-37779
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 37780-37789
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 37790-37799
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37800-37809
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 37810-37819
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37820-37829
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37830-37839
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37840-37849
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 37850-37859
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37860-37869
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 37870-37879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 37880-37889
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 37890-37899
-		7, 6, 5, 4, 3, 2, 1, 44, 43, 42, // 37900-37909
-		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 37910-37919
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 37920-37929
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 37930-37939
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 37940-37949
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 37950-37959
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 37960-37969
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 37970-37979
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 37980-37989
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 37990-37999
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38000-38009
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 38010-38019
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 38020-38029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 38030-38039
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 38040-38049
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 38050-38059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 38060-38069
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38070-38079
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 38080-38089
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 38090-38099
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38100-38109
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 38110-38119
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 38120-38129
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 38130-38139
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 38140-38149
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 38150-38159
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 38160-38169
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 38170-38179
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 38180-38189
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38190-38199
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 38200-38209
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 38210-38219
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38220-38229
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 38230-38239
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 38240-38249
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38250-38259
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38260-38269
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 38270-38279
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 38280-38289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 38290-38299
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 38300-38309
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38310-38319
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 38320-38329
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 38330-38339
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38340-38349
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 38350-38359
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38360-38369
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 38370-38379
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38380-38389
-		3, 2, 1, 38, 37, 36, 35, 34, 33, 32, // 38390-38399
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 38400-38409
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 38410-38419
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38420-38429
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 38430-38439
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 38440-38449
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 38450-38459
-		1, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 38460-38469
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 38470-38479
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 38480-38489
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38490-38499
-		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 38500-38509
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 38510-38519
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 38520-38529
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38530-38539
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 38540-38549
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38550-38559
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 24, // 38560-38569
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 38570-38579
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38580-38589
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 38590-38599
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 38600-38609
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 38610-38619
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 38620-38629
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 38630-38639
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38640-38649
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 38650-38659
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 38660-38669
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 38670-38679
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38680-38689
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 38690-38699
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38700-38709
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 38710-38719
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 38720-38729
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 38730-38739
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 38740-38749
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 38750-38759
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 38760-38769
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38770-38779
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 38780-38789
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38790-38799
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 38800-38809
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38810-38819
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38820-38829
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 38830-38839
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38840-38849
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38850-38859
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 38860-38869
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 38870-38879
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38880-38889
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38890-38899
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 38900-38909
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 38910-38919
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 38920-38929
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 38930-38939
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38940-38949
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 38950-38959
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 38960-38969
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 38970-38979
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 38980-38989
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 38990-38999
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39000-39009
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39010-39019
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 39020-39029
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39030-39039
-		1, 2, 1, 4, 3, 2, 1, 32, 31, 30, // 39040-39049
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 39050-39059
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39060-39069
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 39070-39079
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39080-39089
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 39090-39099
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 39100-39109
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 39110-39119
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39120-39129
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 39130-39139
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 39140-39149
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 39150-39159
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 39160-39169
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39170-39179
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39180-39189
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 39190-39199
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39200-39209
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 39210-39219
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 39220-39229
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 39230-39239
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39240-39249
-		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 39250-39259
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 39260-39269
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 39270-39279
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39280-39289
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 39290-39299
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39300-39309
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 39310-39319
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 39320-39329
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39330-39339
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 39340-39349
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39350-39359
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 39360-39369
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 39370-39379
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 39380-39389
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 39390-39399
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 39400-39409
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 39410-39419
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39420-39429
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39430-39439
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 39440-39449
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39450-39459
-		1, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 39460-39469
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 39470-39479
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39480-39489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39490-39499
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 39500-39509
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39510-39519
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 39520-39529
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39530-39539
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39540-39549
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39550-39559
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 39560-39569
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39570-39579
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 39580-39589
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 39590-39599
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 39600-39609
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39610-39619
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 39620-39629
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 39630-39639
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39640-39649
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39650-39659
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 39660-39669
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 39670-39679
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 39680-39689
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39690-39699
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 39700-39709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39710-39719
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 39720-39729
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 39730-39739
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 39740-39749
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39750-39759
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 39760-39769
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 39770-39779
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39780-39789
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 39790-39799
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 39800-39809
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39810-39819
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 39820-39829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 39830-39839
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 39840-39849
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 39850-39859
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 39860-39869
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 39870-39879
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 39880-39889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39890-39899
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 39900-39909
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39910-39919
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 39920-39929
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 39930-39939
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 39940-39949
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 39950-39959
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 39960-39969
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 39970-39979
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 39980-39989
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 39990-39999
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 40000-40009
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 40010-40019
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40020-40029
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 24, // 40030-40039
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 40040-40049
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40050-40059
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 40060-40069
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40070-40079
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40080-40089
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 40090-40099
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40100-40109
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40110-40119
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 40120-40129
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 40130-40139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40140-40149
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 40150-40159
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 40160-40169
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 40170-40179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 40180-40189
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 40190-40199
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40200-40209
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 40210-40219
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40220-40229
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 40230-40239
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40240-40249
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 40250-40259
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40260-40269
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40270-40279
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 54, // 40280-40289
-		53, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 40290-40299
-		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 40300-40309
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 40310-40319
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 40320-40329
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40330-40339
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 40340-40349
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 40350-40359
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 40360-40369
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40370-40379
-		7, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 40380-40389
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 40390-40399
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 40400-40409
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40410-40419
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 40420-40429
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 40430-40439
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 40440-40449
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 40450-40459
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40460-40469
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40470-40479
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 40480-40489
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 40490-40499
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 40500-40509
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 40510-40519
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 40520-40529
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40530-40539
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 40540-40549
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 40550-40559
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40560-40569
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40570-40579
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 40580-40589
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 40590-40599
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 40600-40609
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40610-40619
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 40620-40629
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 54, // 40630-40639
-		53, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 40640-40649
-		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 40650-40659
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 40660-40669
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 40670-40679
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40680-40689
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 40690-40699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 40700-40709
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 40710-40719
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 40720-40729
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 40730-40739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40740-40749
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 40750-40759
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 40760-40769
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40770-40779
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 40780-40789
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40790-40799
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40800-40809
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 40810-40819
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 40820-40829
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40830-40839
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 40840-40849
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 40850-40859
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 40860-40869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 40870-40879
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 40880-40889
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40890-40899
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 40900-40909
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 40910-40919
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 40920-40929
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 40930-40939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 40940-40949
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 40950-40959
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40960-40969
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 40970-40979
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 40980-40989
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 40990-40999
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41000-41009
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41010-41019
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 41020-41029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 41030-41039
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41040-41049
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 41050-41059
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 41060-41069
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41070-41079
-		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 41080-41089
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 41090-41099
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41100-41109
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 41110-41119
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41120-41129
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41130-41139
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 41140-41149
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41150-41159
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 41160-41169
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 41170-41179
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 41180-41189
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41190-41199
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 41200-41209
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 41210-41219
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41220-41229
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 41230-41239
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 41240-41249
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41250-41259
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 41260-41269
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41270-41279
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41280-41289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 34, // 41290-41299
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 41300-41309
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 41310-41319
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41320-41329
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 41330-41339
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41340-41349
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 41350-41359
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 41360-41369
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41370-41379
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 41380-41389
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 41390-41399
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41400-41409
-		1, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 41410-41419
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 41420-41429
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41430-41439
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 41440-41449
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 41450-41459
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 41460-41469
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 41470-41479
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41480-41489
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 41490-41499
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41500-41509
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 41510-41519
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41520-41529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 41530-41539
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 41540-41549
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 41550-41559
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41560-41569
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 41570-41579
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41580-41589
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 41590-41599
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 41600-41609
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41610-41619
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 41620-41629
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41630-41639
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 41640-41649
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 41650-41659
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 41660-41669
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41670-41679
-		1, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 41680-41689
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 41690-41699
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41700-41709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 41710-41719
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 41720-41729
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 41730-41739
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 41740-41749
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 41750-41759
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41760-41769
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 41770-41779
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 41780-41789
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41790-41799
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 41800-41809
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 41810-41819
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 41820-41829
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41830-41839
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 41840-41849
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 41850-41859
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 41860-41869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 41870-41879
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41880-41889
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 41890-41899
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 41900-41909
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 41910-41919
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 41920-41929
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41930-41939
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 41940-41949
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 41950-41959
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 41960-41969
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 41970-41979
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 41980-41989
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 41990-41999
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42000-42009
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 42010-42019
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 42020-42029
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42030-42039
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 42040-42049
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42050-42059
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42060-42069
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 42070-42079
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 42080-42089
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42090-42099
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 42100-42109
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42110-42119
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42120-42129
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 42130-42139
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42140-42149
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42150-42159
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42160-42169
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 42170-42179
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42180-42189
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 42190-42199
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 42200-42209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42210-42219
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 42220-42229
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 42230-42239
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42240-42249
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 42250-42259
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42260-42269
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42270-42279
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 42280-42289
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 42290-42299
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 42300-42309
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42310-42319
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 42320-42329
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42330-42339
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42340-42349
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 42350-42359
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42360-42369
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 42370-42379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42380-42389
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42390-42399
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 24, // 42400-42409
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 42410-42419
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42420-42429
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 42430-42439
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 42440-42449
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 42450-42459
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 42460-42469
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 42470-42479
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 42480-42489
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42490-42499
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 42500-42509
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 42510-42519
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42520-42529
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 42530-42539
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42540-42549
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42550-42559
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 42560-42569
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42570-42579
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 42580-42589
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42590-42599
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42600-42609
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 42610-42619
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42620-42629
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42630-42639
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 42640-42649
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42650-42659
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 42660-42669
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42670-42679
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 42680-42689
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 42690-42699
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 42700-42709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 42710-42719
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 42720-42729
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42730-42739
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 42740-42749
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 42750-42759
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42760-42769
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 42770-42779
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42780-42789
-		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 42790-42799
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 42800-42809
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 42810-42819
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42820-42829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 42830-42839
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42840-42849
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 42850-42859
-		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 42860-42869
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 42870-42879
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 42880-42889
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 42890-42899
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 42900-42909
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42910-42919
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 42920-42929
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 42930-42939
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 42940-42949
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 42950-42959
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 42960-42969
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 42970-42979
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 42980-42989
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 42990-42999
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 43000-43009
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 43010-43019
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43020-43029
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 43030-43039
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 43040-43049
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43050-43059
-		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 43060-43069
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43070-43079
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43080-43089
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 43090-43099
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43100-43109
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 43110-43119
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43120-43129
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 43130-43139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43140-43149
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 43150-43159
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43160-43169
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 43170-43179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 43180-43189
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43190-43199
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 43200-43209
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43210-43219
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43220-43229
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 43230-43239
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43240-43249
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43250-43259
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43260-43269
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43270-43279
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 43280-43289
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43290-43299
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43300-43309
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 43310-43319
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43320-43329
-		1, 60, 59, 58, 57, 56, 55, 54, 53, 52, // 43330-43339
-		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 43340-43349
-		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 43350-43359
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 43360-43369
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43370-43379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43380-43389
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 43390-43399
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 43400-43409
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43410-43419
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 43420-43429
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43430-43439
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43440-43449
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 43450-43459
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43460-43469
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43470-43479
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 43480-43489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 43490-43499
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43500-43509
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 43510-43519
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43520-43529
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43530-43539
-		1, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 43540-43549
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43550-43559
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43560-43569
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 43570-43579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43580-43589
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 43590-43599
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 43600-43609
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43610-43619
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 43620-43629
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 43630-43639
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 43640-43649
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43650-43659
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 43660-43669
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43670-43679
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43680-43689
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 43690-43699
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43700-43709
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 43710-43719
-		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 43720-43729
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43730-43739
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43740-43749
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 43750-43759
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 43760-43769
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 43770-43779
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 43780-43789
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 43790-43799
-		1, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 43800-43809
-		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 43810-43819
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 43820-43829
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43830-43839
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43840-43849
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43850-43859
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 43860-43869
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 43870-43879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 43880-43889
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 43890-43899
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43900-43909
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 43910-43919
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 43920-43929
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 43930-43939
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 43940-43949
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 43950-43959
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 43960-43969
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 43970-43979
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 43980-43989
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 43990-43999
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44000-44009
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 44010-44019
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 44020-44029
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44030-44039
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44040-44049
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 44050-44059
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44060-44069
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44070-44079
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 44080-44089
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44090-44099
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44100-44109
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 44110-44119
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 44120-44129
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 44130-44139
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44140-44149
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 44150-44159
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44160-44169
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 44170-44179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 44180-44189
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44190-44199
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 44200-44209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44210-44219
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 44220-44229
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44230-44239
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44240-44249
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 44250-44259
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 44260-44269
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 44270-44279
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44280-44289
-		3, 2, 1, 58, 57, 56, 55, 54, 53, 52, // 44290-44299
-		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 44300-44309
-		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 44310-44319
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 44320-44329
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 44330-44339
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44340-44349
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 44350-44359
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44360-44369
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44370-44379
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 44380-44389
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 44390-44399
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44400-44409
-		7, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 44410-44419
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 44420-44429
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44430-44439
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 44440-44449
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 44450-44459
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 44460-44469
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44470-44479
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 44480-44489
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 44490-44499
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 44500-44509
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 44510-44519
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44520-44529
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 44530-44539
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 44540-44549
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44550-44559
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 44560-44569
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44570-44579
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 44580-44589
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 44590-44599
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44600-44609
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 44610-44619
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 44620-44629
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 44630-44639
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 44640-44649
-		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 44650-44659
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 44660-44669
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44670-44679
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 44680-44689
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 44690-44699
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44700-44709
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44710-44719
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 44720-44729
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44730-44739
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44740-44749
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 44750-44759
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 44760-44769
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 44770-44779
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44780-44789
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 44790-44799
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 44800-44809
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 44810-44819
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 44820-44829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 44830-44839
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 44840-44849
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44850-44859
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 44860-44869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44870-44879
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 44880-44889
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 44890-44899
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 44900-44909
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 44910-44919
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 44920-44929
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 44930-44939
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44940-44949
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 44950-44959
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 44960-44969
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 44970-44979
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 44980-44989
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 44990-44999
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45000-45009
-		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 45010-45019
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 45020-45029
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 45030-45039
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45040-45049
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 45050-45059
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45060-45069
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45070-45079
-		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 45080-45089
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 45090-45099
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 45100-45109
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 45110-45119
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 45120-45129
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 45130-45139
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 45140-45149
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45150-45159
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 45160-45169
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 45170-45179
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45180-45189
-		1, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 45190-45199
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 45200-45209
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 45210-45219
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45220-45229
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 45230-45239
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 45240-45249
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 45250-45259
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 45260-45269
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45270-45279
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 45280-45289
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 45290-45299
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 45300-45309
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 45310-45319
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 45320-45329
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 45330-45339
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 45340-45349
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45350-45359
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45360-45369
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 45370-45379
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 45380-45389
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45390-45399
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 45400-45409
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 45410-45419
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45420-45429
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 42, // 45430-45439
-		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 45440-45449
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 45450-45459
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 45460-45469
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45470-45479
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45480-45489
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45490-45499
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 45500-45509
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45510-45519
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 45520-45529
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 45530-45539
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45540-45549
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 45550-45559
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 45560-45569
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45570-45579
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 45580-45589
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 45590-45599
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45600-45609
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 45610-45619
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45620-45629
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45630-45639
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 45640-45649
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 45650-45659
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45660-45669
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 45670-45679
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45680-45689
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 45690-45699
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 45700-45709
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 45710-45719
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45720-45729
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 45730-45739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45740-45749
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45750-45759
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 45760-45769
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 38, // 45770-45779
-		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 45780-45789
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 45790-45799
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45800-45809
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 45810-45819
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 45820-45829
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 45830-45839
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45840-45849
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 45850-45859
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 45860-45869
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 45870-45879
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 45880-45889
-		3, 2, 1, 50, 49, 48, 47, 46, 45, 44, // 45890-45899
-		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 45900-45909
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 45910-45919
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 45920-45929
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 45930-45939
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 45940-45949
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 45950-45959
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 45960-45969
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 45970-45979
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 45980-45989
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 45990-45999
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 46000-46009
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46010-46019
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 46020-46029
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46030-46039
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46040-46049
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46050-46059
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46060-46069
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 46070-46079
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46080-46089
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 46090-46099
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 46100-46109
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 46110-46119
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46120-46129
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 46130-46139
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 46140-46149
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 46150-46159
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46160-46169
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46170-46179
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 46180-46189
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 46190-46199
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46200-46209
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 46210-46219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 46220-46229
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 46230-46239
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 46240-46249
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46250-46259
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46260-46269
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 46270-46279
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 46280-46289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46290-46299
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 46300-46309
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 46310-46319
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 46320-46329
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 46330-46339
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46340-46349
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 46350-46359
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 46360-46369
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46370-46379
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46380-46389
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 46390-46399
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46400-46409
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 46410-46419
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46420-46429
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46430-46439
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46440-46449
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 46450-46459
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46460-46469
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 46470-46479
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 46480-46489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 46490-46499
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46500-46509
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46510-46519
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 46520-46529
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46530-46539
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 46540-46549
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 46550-46559
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 46560-46569
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 46570-46579
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46580-46589
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46590-46599
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46600-46609
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 46610-46619
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46620-46629
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 46630-46639
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 46640-46649
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46650-46659
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 46660-46669
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46670-46679
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46680-46689
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46690-46699
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 46700-46709
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46710-46719
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 46720-46729
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 46730-46739
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46740-46749
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 46750-46759
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46760-46769
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 46770-46779
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 46780-46789
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 46790-46799
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 46800-46809
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 46810-46819
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 46820-46829
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 46830-46839
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46840-46849
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 46850-46859
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 46860-46869
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 46870-46879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 46880-46889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 46890-46899
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 46900-46909
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 46910-46919
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46920-46929
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 46930-46939
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 46940-46949
-		7, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 46950-46959
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 46960-46969
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 46970-46979
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 46980-46989
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 46990-46999
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47000-47009
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 47010-47019
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 47020-47029
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47030-47039
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47040-47049
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 47050-47059
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 47060-47069
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47070-47079
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47080-47089
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 47090-47099
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47100-47109
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 47110-47119
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 47120-47129
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47130-47139
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 47140-47149
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47150-47159
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 47160-47169
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47170-47179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 47180-47189
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47190-47199
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 47200-47209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47210-47219
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47220-47229
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 47230-47239
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47240-47249
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47250-47259
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 47260-47269
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 47270-47279
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47280-47289
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 47290-47299
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 47300-47309
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 47310-47319
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47320-47329
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 47330-47339
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47340-47349
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 47350-47359
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 47360-47369
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47370-47379
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 47380-47389
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47390-47399
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 47400-47409
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 47410-47419
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47420-47429
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47430-47439
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47440-47449
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 47450-47459
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 47460-47469
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 47470-47479
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47480-47489
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 47490-47499
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47500-47509
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 47510-47519
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47520-47529
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 47530-47539
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 47540-47549
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47550-47559
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 47560-47569
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47570-47579
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47580-47589
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 47590-47599
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 47600-47609
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47610-47619
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 47620-47629
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 47630-47639
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47640-47649
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 47650-47659
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 47660-47669
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47670-47679
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 47680-47689
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 47690-47699
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47700-47709
-		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 47710-47719
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47720-47729
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 47730-47739
-		1, 2, 1, 34, 33, 32, 31, 30, 29, 28, // 47740-47749
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 47750-47759
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47760-47769
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 47770-47779
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47780-47789
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 47790-47799
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 47800-47809
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 47810-47819
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 47820-47829
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 47830-47839
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 47840-47849
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 47850-47859
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 47860-47869
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 47870-47879
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 47880-47889
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47890-47899
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 47900-47909
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 47910-47919
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47920-47929
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 47930-47939
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 47940-47949
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 47950-47959
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 47960-47969
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 47970-47979
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 47980-47989
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 47990-47999
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48000-48009
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 48010-48019
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 48020-48029
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48030-48039
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 48040-48049
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 48050-48059
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48060-48069
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 48070-48079
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48080-48089
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48090-48099
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 48100-48109
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 48110-48119
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48120-48129
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 48130-48139
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48140-48149
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 48150-48159
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 48160-48169
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 48170-48179
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 48180-48189
-		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 48190-48199
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 48200-48209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48210-48219
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48220-48229
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 48230-48239
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 48240-48249
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 48250-48259
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48260-48269
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48270-48279
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48280-48289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 48290-48299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48300-48309
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 48310-48319
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48320-48329
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 48330-48339
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48340-48349
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 48350-48359
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48360-48369
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48370-48379
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 48380-48389
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 48390-48399
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 48400-48409
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 48410-48419
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48420-48429
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 48430-48439
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 48440-48449
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48450-48459
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 48460-48469
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 48470-48479
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 48480-48489
-		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 48490-48499
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 48500-48509
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48510-48519
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 48520-48529
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 48530-48539
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 48540-48549
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48550-48559
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 48560-48569
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 48570-48579
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 48580-48589
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 48590-48599
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48600-48609
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 48610-48619
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 48620-48629
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48630-48639
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 48640-48649
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48650-48659
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48660-48669
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 52, // 48670-48679
-		51, 50, 49, 48, 47, 46, 45, 44, 43, 42, // 48680-48689
-		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 48690-48699
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 48700-48709
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 48710-48719
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48720-48729
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 48730-48739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 48740-48749
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 48750-48759
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 48760-48769
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 48770-48779
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 48780-48789
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 48790-48799
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 48800-48809
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 48810-48819
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 48820-48829
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48830-48839
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 48840-48849
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 48850-48859
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 48860-48869
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48870-48879
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 48880-48889
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48890-48899
-		7, 6, 5, 4, 3, 2, 1, 40, 39, 38, // 48900-48909
-		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 48910-48919
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 48920-48929
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 48930-48939
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 48940-48949
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 48950-48959
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48960-48969
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 48970-48979
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 48980-48989
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 48990-48999
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 49000-49009
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 49010-49019
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49020-49029
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 49030-49039
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 49040-49049
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 49050-49059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 49060-49069
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49070-49079
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49080-49089
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49090-49099
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 49100-49109
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 49110-49119
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 49120-49129
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 49130-49139
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49140-49149
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 49150-49159
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 49160-49169
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 49170-49179
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49180-49189
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 49190-49199
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 49200-49209
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49210-49219
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 49220-49229
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49230-49239
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49240-49249
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 49250-49259
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49260-49269
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 49270-49279
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49280-49289
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 49290-49299
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 49300-49309
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 49310-49319
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49320-49329
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 49330-49339
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49340-49349
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49350-49359
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 22, // 49360-49369
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 49370-49379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49380-49389
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 49390-49399
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 49400-49409
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 49410-49419
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 49420-49429
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 49430-49439
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49440-49449
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 49450-49459
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 49460-49469
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 49470-49479
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 49480-49489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 49490-49499
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49500-49509
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49510-49519
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 49520-49529
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 49530-49539
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 49540-49549
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 38, // 49550-49559
-		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 49560-49569
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 49570-49579
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49580-49589
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 49590-49599
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 49600-49609
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 49610-49619
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 49620-49629
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 49630-49639
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49640-49649
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49650-49659
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 49660-49669
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49670-49679
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49680-49689
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 49690-49699
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49700-49709
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 49710-49719
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 49720-49729
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 49730-49739
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 49740-49749
-		7, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 49750-49759
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 49760-49769
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49770-49779
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 49780-49789
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49790-49799
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 49800-49809
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49810-49819
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 49820-49829
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 49830-49839
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 49840-49849
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 49850-49859
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49860-49869
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 49870-49879
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49880-49889
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 49890-49899
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 49900-49909
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 49910-49919
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 49920-49929
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 49930-49939
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 49940-49949
-		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 49950-49959
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 49960-49969
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 49970-49979
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 49980-49989
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 49990-49999
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50000-50009
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50010-50019
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 50020-50029
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50030-50039
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50040-50049
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 50050-50059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 50060-50069
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 50070-50079
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50080-50089
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 50090-50099
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50100-50109
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50110-50119
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 50120-50129
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50130-50139
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50140-50149
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 50150-50159
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50160-50169
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 50170-50179
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 50180-50189
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50190-50199
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 50200-50209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50210-50219
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50220-50229
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 50230-50239
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50240-50249
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50250-50259
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 50260-50269
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50270-50279
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50280-50289
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50290-50299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50300-50309
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50310-50319
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50320-50329
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 50330-50339
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 50340-50349
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50350-50359
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50360-50369
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50370-50379
-		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 50380-50389
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50390-50399
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50400-50409
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50410-50419
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 50420-50429
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50430-50439
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 50440-50449
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 50450-50459
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 50460-50469
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 50470-50479
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50480-50489
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50490-50499
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 50500-50509
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50510-50519
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 50520-50529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50530-50539
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 50540-50549
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 50550-50559
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50560-50569
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50570-50579
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50580-50589
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 50590-50599
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 50600-50609
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50610-50619
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 50620-50629
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50630-50639
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 50640-50649
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50650-50659
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50660-50669
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50670-50679
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 50680-50689
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 50690-50699
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 50700-50709
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50710-50719
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 50720-50729
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50730-50739
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50740-50749
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 50750-50759
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50760-50769
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 50770-50779
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 50780-50789
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 50790-50799
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50800-50809
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50810-50819
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50820-50829
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 50830-50839
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 50840-50849
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 50850-50859
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 50860-50869
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 50870-50879
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50880-50889
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 50890-50899
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 50900-50909
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 50910-50919
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 50920-50929
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 50930-50939
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 50940-50949
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 50950-50959
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 50960-50969
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 50970-50979
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 50980-50989
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 50990-50999
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 51000-51009
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 51010-51019
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51020-51029
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51030-51039
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 51040-51049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 51050-51059
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51060-51069
-		1, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 51070-51079
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 51080-51089
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51090-51099
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 51100-51109
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 51110-51119
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51120-51129
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 51130-51139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51140-51149
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 51150-51159
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 51160-51169
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 51170-51179
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51180-51189
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 51190-51199
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 51200-51209
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 51210-51219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 51220-51229
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 51230-51239
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51240-51249
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51250-51259
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 51260-51269
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51270-51279
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 51280-51289
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51290-51299
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 51300-51309
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51310-51319
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 51320-51329
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51330-51339
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 12, // 51340-51349
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51350-51359
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 51360-51369
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51370-51379
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 51380-51389
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51390-51399
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51400-51409
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 51410-51419
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 51420-51429
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 51430-51439
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 51440-51449
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51450-51459
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51460-51469
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 51470-51479
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 51480-51489
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51490-51499
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 51500-51509
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 51510-51519
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51520-51529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 51530-51539
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51540-51549
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51550-51559
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 51560-51569
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 51570-51579
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51580-51589
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 51590-51599
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51600-51609
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 51610-51619
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51620-51629
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 51630-51639
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 51640-51649
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 51650-51659
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51660-51669
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 51670-51679
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 51680-51689
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 51690-51699
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51700-51709
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 51710-51719
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 51720-51729
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51730-51739
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 51740-51749
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51750-51759
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 51760-51769
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 51770-51779
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 51780-51789
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51790-51799
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 51800-51809
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 51810-51819
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 51820-51829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 51830-51839
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51840-51849
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 51850-51859
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 51860-51869
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 51870-51879
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 51880-51889
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 51890-51899
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 51900-51909
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 51910-51919
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 51920-51929
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51930-51939
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 51940-51949
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 51950-51959
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51960-51969
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 51970-51979
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 51980-51989
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 51990-51999
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 52000-52009
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52010-52019
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 52020-52029
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 52030-52039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52040-52049
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 52050-52059
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 52060-52069
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52070-52079
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 52080-52089
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52090-52099
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 52100-52109
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52110-52119
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 52120-52129
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52130-52139
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52140-52149
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 52150-52159
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 52160-52169
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 52170-52179
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 52180-52189
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52190-52199
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 52200-52209
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52210-52219
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 52220-52229
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 52230-52239
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 52240-52249
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 52250-52259
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 52260-52269
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52270-52279
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 52280-52289
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52290-52299
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52300-52309
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 52310-52319
-		1, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 52320-52329
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 52330-52339
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 52340-52349
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52350-52359
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 52360-52369
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 52370-52379
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 52380-52389
-		1, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 52390-52399
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 52400-52409
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 52410-52419
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52420-52429
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 52430-52439
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52440-52449
-		3, 2, 1, 4, 3, 2, 1, 32, 31, 30, // 52450-52459
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 52460-52469
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52470-52479
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 52480-52489
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52490-52499
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52500-52509
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 52510-52519
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 52520-52529
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52530-52539
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 52540-52549
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 52550-52559
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 52560-52569
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 52570-52579
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 52580-52589
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52590-52599
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 52600-52609
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52610-52619
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 52620-52629
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 52630-52639
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 52640-52649
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52650-52659
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52660-52669
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 52670-52679
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52680-52689
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 52690-52699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 52700-52709
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52710-52719
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52720-52729
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 52730-52739
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 52740-52749
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 52750-52759
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 52760-52769
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 52770-52779
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 52780-52789
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52790-52799
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52800-52809
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 52810-52819
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52820-52829
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 52830-52839
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52840-52849
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 52850-52859
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52860-52869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 52870-52879
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 52880-52889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52890-52899
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 52900-52909
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 52910-52919
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 52920-52929
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 52930-52939
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 52940-52949
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 52950-52959
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 52960-52969
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 52970-52979
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 52980-52989
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 52990-52999
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 53000-53009
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 53010-53019
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 53020-53029
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53030-53039
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53040-53049
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53050-53059
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 53060-53069
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 53070-53079
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 53080-53089
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 53090-53099
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53100-53109
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 53110-53119
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 53120-53129
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53130-53139
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 53140-53149
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53150-53159
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53160-53169
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 53170-53179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 53180-53189
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53190-53199
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 53200-53209
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53210-53219
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53220-53229
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 28, // 53230-53239
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 53240-53249
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53250-53259
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 53260-53269
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 53270-53279
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53280-53289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 53290-53299
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 53300-53309
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53310-53319
-		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 53320-53329
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 53330-53339
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53340-53349
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 53350-53359
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53360-53369
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53370-53379
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53380-53389
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53390-53399
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53400-53409
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 53410-53419
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53420-53429
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53430-53439
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53440-53449
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 53450-53459
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53460-53469
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 53470-53479
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 53480-53489
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53490-53499
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 53500-53509
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53510-53519
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 53520-53529
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53530-53539
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 53540-53549
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53550-53559
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 53560-53569
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53570-53579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53580-53589
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 53590-53599
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 53600-53609
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 53610-53619
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 53620-53629
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 53630-53639
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53640-53649
-		3, 2, 1, 4, 3, 2, 1, 24, 23, 22, // 53650-53659
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53660-53669
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53670-53679
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53680-53689
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 53690-53699
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53700-53709
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 53710-53719
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53720-53729
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 53730-53739
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53740-53749
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 53750-53759
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53760-53769
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 53770-53779
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 53780-53789
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 53790-53799
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 53800-53809
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 53810-53819
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53820-53829
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 53830-53839
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 53840-53849
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53850-53859
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 53860-53869
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53870-53879
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 53880-53889
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 53890-53899
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53900-53909
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 53910-53919
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 53920-53929
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 53930-53939
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 53940-53949
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 53950-53959
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 53960-53969
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 53970-53979
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 53980-53989
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 53990-53999
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54000-54009
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 54010-54019
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54020-54029
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 54030-54039
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 54040-54049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 54050-54059
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 54060-54069
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54070-54079
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 54080-54089
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54090-54099
-		1, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54100-54109
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54110-54119
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54120-54129
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 54130-54139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54140-54149
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54150-54159
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 54160-54169
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54170-54179
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54180-54189
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 54190-54199
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54200-54209
-		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 54210-54219
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 54220-54229
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54230-54239
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54240-54249
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54250-54259
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 54260-54269
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 54270-54279
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54280-54289
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 54290-54299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54300-54309
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 54310-54319
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 54320-54329
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54330-54339
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 54340-54349
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54350-54359
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 54360-54369
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 54370-54379
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54380-54389
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54390-54399
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 54400-54409
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 54410-54419
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54420-54429
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54430-54439
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 54440-54449
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54450-54459
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 54460-54469
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 54470-54479
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54480-54489
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 54490-54499
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 54500-54509
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 54510-54519
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54520-54529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 54530-54539
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 54540-54549
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 54550-54559
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 54560-54569
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 54570-54579
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 54580-54589
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54590-54599
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54600-54609
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54610-54619
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 54620-54629
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54630-54639
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 54640-54649
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54650-54659
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54660-54669
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 54670-54679
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 54680-54689
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54690-54699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 54700-54709
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 54710-54719
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 54720-54729
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54730-54739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54740-54749
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54750-54759
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 54760-54769
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 54770-54779
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 54780-54789
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 54790-54799
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 54800-54809
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54810-54819
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 54820-54829
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 54830-54839
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54840-54849
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 54850-54859
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 54860-54869
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 54870-54879
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 54880-54889
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 54890-54899
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 54900-54909
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 54910-54919
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 54920-54929
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54930-54939
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 54940-54949
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 54950-54959
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 54960-54969
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 54970-54979
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 54980-54989
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 54990-54999
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 55000-55009
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55010-55019
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 55020-55029
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55030-55039
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 55040-55049
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 55050-55059
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55060-55069
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 55070-55079
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 55080-55089
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55090-55099
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 55100-55109
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 55110-55119
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 55120-55129
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55130-55139
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 55140-55149
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55150-55159
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 55160-55169
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 55170-55179
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 55180-55189
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55190-55199
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55200-55209
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 55210-55219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 55220-55229
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55230-55239
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 55240-55249
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 32, // 55250-55259
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 55260-55269
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 55270-55279
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55280-55289
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 55290-55299
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55300-55309
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 55310-55319
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55320-55329
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 55330-55339
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 55340-55349
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 55350-55359
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55360-55369
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 55370-55379
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55380-55389
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 55390-55399
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55400-55409
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 55410-55419
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55420-55429
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 55430-55439
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55440-55449
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 55450-55459
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 55460-55469
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55470-55479
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 55480-55489
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55490-55499
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55500-55509
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55510-55519
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 55520-55529
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55530-55539
-		1, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 55540-55549
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 55550-55559
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55560-55569
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 55570-55579
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 55580-55589
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55590-55599
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 55600-55609
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 55610-55619
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55620-55629
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 55630-55639
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 55640-55649
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55650-55659
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 55660-55669
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 55670-55679
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55680-55689
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 55690-55699
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55700-55709
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 55710-55719
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55720-55729
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 55730-55739
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 55740-55749
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 55750-55759
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 55760-55769
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55770-55779
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55780-55789
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 55790-55799
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55800-55809
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 55810-55819
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 55820-55829
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55830-55839
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 55840-55849
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 55850-55859
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55860-55869
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 55870-55879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 55880-55889
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 55890-55899
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 55900-55909
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 55910-55919
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 55920-55929
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 55930-55939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 55940-55949
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55950-55959
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 55960-55969
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 55970-55979
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 55980-55989
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 55990-55999
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 30, // 56000-56009
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 56010-56019
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56020-56029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 56030-56039
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56040-56049
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 56050-56059
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 56060-56069
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56070-56079
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56080-56089
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 56090-56099
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56100-56109
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 56110-56119
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 56120-56129
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56130-56139
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 56140-56149
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56150-56159
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 56160-56169
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 56170-56179
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56180-56189
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 56190-56199
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 56200-56209
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 56210-56219
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56220-56229
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 56230-56239
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 56240-56249
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56250-56259
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 30, // 56260-56269
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 56270-56279
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56280-56289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 56290-56299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56300-56309
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 56310-56319
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56320-56329
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 56330-56339
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56340-56349
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 56350-56359
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 56360-56369
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56370-56379
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 56380-56389
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 56390-56399
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56400-56409
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 56410-56419
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56420-56429
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56430-56439
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 56440-56449
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 56450-56459
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56460-56469
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 56470-56479
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 56480-56489
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56490-56499
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 56500-56509
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 56510-56519
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 56520-56529
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 56530-56539
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 56540-56549
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56550-56559
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 56560-56569
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 56570-56579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56580-56589
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 56590-56599
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56600-56609
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56610-56619
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 56620-56629
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 56630-56639
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 56640-56649
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 56650-56659
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 56660-56669
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56670-56679
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 56680-56689
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56690-56699
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56700-56709
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 56710-56719
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56720-56729
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 56730-56739
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 56740-56749
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56750-56759
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56760-56769
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 56770-56779
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 56780-56789
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 56790-56799
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 56800-56809
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 56810-56819
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 56820-56829
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56830-56839
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 56840-56849
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 56850-56859
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56860-56869
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 56870-56879
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56880-56889
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 56890-56899
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 56900-56909
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56910-56919
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 56920-56929
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56930-56939
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 56940-56949
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 56950-56959
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 56960-56969
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 56970-56979
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 56980-56989
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 38, // 56990-56999
-		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 57000-57009
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 57010-57019
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57020-57029
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 57030-57039
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 57040-57049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 57050-57059
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57060-57069
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 57070-57079
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 57080-57089
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 57090-57099
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 57100-57109
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 57110-57119
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57120-57129
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 57130-57139
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 57140-57149
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57150-57159
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57160-57169
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 57170-57179
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57180-57189
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57190-57199
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 57200-57209
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57210-57219
-		1, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 57220-57229
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57230-57239
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57240-57249
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 57250-57259
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 57260-57269
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57270-57279
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 57280-57289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57290-57299
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 57300-57309
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 57310-57319
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 57320-57329
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57330-57339
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 57340-57349
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57350-57359
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57360-57369
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57370-57379
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 57380-57389
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 57390-57399
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57400-57409
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 57410-57419
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 57420-57429
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 57430-57439
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57440-57449
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 57450-57459
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 57460-57469
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57470-57479
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57480-57489
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57490-57499
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 57500-57509
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57510-57519
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 57520-57529
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 57530-57539
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57540-57549
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 57550-57559
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57560-57569
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57570-57579
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57580-57589
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 57590-57599
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 57600-57609
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 57610-57619
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57620-57629
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 57630-57639
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 57640-57649
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 57650-57659
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 57660-57669
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 57670-57679
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 57680-57689
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 57690-57699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 57700-57709
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 57710-57719
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 57720-57729
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 57730-57739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57740-57749
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 57750-57759
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57760-57769
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 57770-57779
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 57780-57789
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 57790-57799
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 20, // 57800-57809
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 57810-57819
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 57820-57829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 57830-57839
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57840-57849
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 57850-57859
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 57860-57869
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57870-57879
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 57880-57889
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 57890-57899
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 57900-57909
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 57910-57919
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 57920-57929
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57930-57939
-		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 57940-57949
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 57950-57959
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 57960-57969
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 57970-57979
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 57980-57989
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 57990-57999
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 58000-58009
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 58010-58019
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58020-58029
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 58030-58039
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 58040-58049
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58050-58059
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58060-58069
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 58070-58079
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58080-58089
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 58090-58099
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 58100-58109
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58110-58119
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 58120-58129
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58130-58139
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58140-58149
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 58150-58159
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 58160-58169
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58170-58179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 58180-58189
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 58190-58199
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58200-58209
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 58210-58219
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 58220-58229
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58230-58239
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 58240-58249
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 58250-58259
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58260-58269
-		1, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 58270-58279
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 58280-58289
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58290-58299
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 58300-58309
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58310-58319
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58320-58329
-		7, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 58330-58339
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 58340-58349
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 58350-58359
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 10, // 58360-58369
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 58370-58379
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58380-58389
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 58390-58399
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58400-58409
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 58410-58419
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 58420-58429
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 58430-58439
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58440-58449
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 58450-58459
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58460-58469
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58470-58479
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 58480-58489
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 58490-58499
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58500-58509
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 58510-58519
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58520-58529
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58530-58539
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 58540-58549
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58550-58559
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58560-58569
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 58570-58579
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 58580-58589
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58590-58599
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 58600-58609
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 58610-58619
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58620-58629
-		1, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 58630-58639
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58640-58649
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58650-58659
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58660-58669
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 58670-58679
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58680-58689
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 58690-58699
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58700-58709
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58710-58719
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58720-58729
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58730-58739
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58740-58749
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58750-58759
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58760-58769
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58770-58779
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 42, // 58780-58789
-		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 58790-58799
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 58800-58809
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 58810-58819
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58820-58829
-		1, 58, 57, 56, 55, 54, 53, 52, 51, 50, // 58830-58839
-		49, 48, 47, 46, 45, 44, 43, 42, 41, 40, // 58840-58849
-		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 58850-58859
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 58860-58869
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 58870-58879
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 58880-58889
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 58890-58899
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 58900-58909
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 58910-58919
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 58920-58929
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 58930-58939
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 58940-58949
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 58950-58959
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 58960-58969
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 58970-58979
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 58980-58989
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 58990-58999
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 59000-59009
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59010-59019
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 59020-59029
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59030-59039
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59040-59049
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 59050-59059
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 59060-59069
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 59070-59079
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 59080-59089
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 59090-59099
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 59100-59109
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 59110-59119
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 59120-59129
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59130-59139
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 59140-59149
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 59150-59159
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 59160-59169
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59170-59179
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 59180-59189
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 59190-59199
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 59200-59209
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 59210-59219
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59220-59229
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 59230-59239
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 59240-59249
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59250-59259
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 59260-59269
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 59270-59279
-		1, 52, 51, 50, 49, 48, 47, 46, 45, 44, // 59280-59289
-		43, 42, 41, 40, 39, 38, 37, 36, 35, 34, // 59290-59299
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 59300-59309
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 59310-59319
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59320-59329
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 59330-59339
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59340-59349
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 59350-59359
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 59360-59369
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 59370-59379
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 59380-59389
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 59390-59399
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 59400-59409
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 59410-59419
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59420-59429
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59430-59439
-		1, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 59440-59449
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 59450-59459
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 59460-59469
-		1, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 59470-59479
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 59480-59489
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 59490-59499
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 59500-59509
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 59510-59519
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 59520-59529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 59530-59539
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 59540-59549
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 59550-59559
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 59560-59569
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59570-59579
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 59580-59589
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59590-59599
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59600-59609
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 59610-59619
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 22, // 59620-59629
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59630-59639
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59640-59649
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 59650-59659
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 59660-59669
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 59670-59679
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59680-59689
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 59690-59699
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 59700-59709
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59710-59719
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 59720-59729
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59730-59739
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 59740-59749
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 59750-59759
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59760-59769
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 59770-59779
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59780-59789
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 59790-59799
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 59800-59809
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 59810-59819
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59820-59829
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 59830-59839
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 59840-59849
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 59850-59859
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 59860-59869
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 59870-59879
-		7, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 59880-59889
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 59890-59899
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59900-59909
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59910-59919
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 59920-59929
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 59930-59939
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59940-59949
-		1, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 59950-59959
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59960-59969
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 59970-59979
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 59980-59989
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 59990-59999
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60000-60009
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 60010-60019
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 60020-60029
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 60030-60039
-		1, 36, 35, 34, 33, 32, 31, 30, 29, 28, // 60040-60049
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 60050-60059
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60060-60069
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60070-60079
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 60080-60089
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60090-60099
-		1, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 60100-60109
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60110-60119
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60120-60129
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 60130-60139
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 60140-60149
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60150-60159
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 40, // 60160-60169
-		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 60170-60179
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 60180-60189
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60190-60199
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 60200-60209
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60210-60219
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 60220-60229
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 60230-60239
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60240-60249
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 60250-60259
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60260-60269
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60270-60279
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 60280-60289
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 60290-60299
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60300-60309
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 60310-60319
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60320-60329
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60330-60339
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 60340-60349
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 60350-60359
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60360-60369
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 60370-60379
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 60380-60389
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 60390-60399
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60400-60409
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 60410-60419
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 60420-60429
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60430-60439
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 60440-60449
-		7, 6, 5, 4, 3, 2, 1, 36, 35, 34, // 60450-60459
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 60460-60469
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 60470-60479
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60480-60489
-		3, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 60490-60499
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 60500-60509
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60510-60519
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 60520-60529
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 50, // 60530-60539
-		49, 48, 47, 46, 45, 44, 43, 42, 41, 40, // 60540-60549
-		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 60550-60559
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 60560-60569
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60570-60579
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 60580-60589
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60590-60599
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 60600-60609
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60610-60619
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 60620-60629
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 60630-60639
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 60640-60649
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 60650-60659
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60660-60669
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 60670-60679
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 60680-60689
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60690-60699
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 60700-60709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 60710-60719
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60720-60729
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 60730-60739
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60740-60749
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 60750-60759
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 60760-60769
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 60770-60779
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60780-60789
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 60790-60799
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60800-60809
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60810-60819
-		1, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 60820-60829
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 60830-60839
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 60840-60849
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 60850-60859
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 60860-60869
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 60870-60879
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 60880-60889
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 60890-60899
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 60900-60909
-		3, 2, 1, 4, 3, 2, 1, 2, 1, 4, // 60910-60919
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 60920-60929
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 60930-60939
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 60940-60949
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 60950-60959
-		1, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 60960-60969
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 60970-60979
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 60980-60989
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 60990-60999
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 61000-61009
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 61010-61019
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 61020-61029
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61030-61039
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61040-61049
-		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 61050-61059
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 61060-61069
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61070-61079
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61080-61089
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 22, // 61090-61099
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61100-61109
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61110-61119
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 61120-61129
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61130-61139
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61140-61149
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 61150-61159
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 42, // 61160-61169
-		41, 40, 39, 38, 37, 36, 35, 34, 33, 32, // 61170-61179
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 61180-61189
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61190-61199
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61200-61209
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61210-61219
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61220-61229
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61230-61239
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61240-61249
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61250-61259
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61260-61269
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61270-61279
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61280-61289
-		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 61290-61299
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 61300-61309
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61310-61319
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61320-61329
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 61330-61339
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 61340-61349
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61350-61359
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 61360-61369
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 61370-61379
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61380-61389
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61390-61399
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 8, // 61400-61409
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 61410-61419
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61420-61429
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61430-61439
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61440-61449
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61450-61459
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 61460-61469
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61470-61479
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 61480-61489
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 61490-61499
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 61500-61509
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 24, // 61510-61519
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61520-61529
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61530-61539
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 61540-61549
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 2, // 61550-61559
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61560-61569
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61570-61579
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 61580-61589
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61590-61599
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 61600-61609
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 61610-61619
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 61620-61629
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61630-61639
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61640-61649
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 61650-61659
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61660-61669
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 61670-61679
-		1, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 61680-61689
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61690-61699
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 61700-61709
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61710-61719
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 61720-61729
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61730-61739
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61740-61749
-		1, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 61750-61759
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 61760-61769
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61770-61779
-		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 61780-61789
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 61790-61799
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61800-61809
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 61810-61819
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 61820-61829
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61830-61839
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 61840-61849
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61850-61859
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61860-61869
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 61870-61879
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 61880-61889
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 61890-61899
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 61900-61909
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 61910-61919
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 61920-61929
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 61930-61939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 61940-61949
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 61950-61959
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 61960-61969
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 61970-61979
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 61980-61989
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 61990-61999
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 62000-62009
-		1, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 62010-62019
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62020-62029
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 62030-62039
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62040-62049
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 62050-62059
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62060-62069
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62070-62079
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62080-62089
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 62090-62099
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62100-62109
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 62110-62119
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 62120-62129
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 62130-62139
-		1, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 62140-62149
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 62150-62159
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62160-62169
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62170-62179
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 62180-62189
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62190-62199
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62200-62209
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 62210-62219
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62220-62229
-		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 62230-62239
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 62240-62249
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62250-62259
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62260-62269
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 62270-62279
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 62280-62289
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 62290-62299
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 62300-62309
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62310-62319
-		3, 2, 1, 4, 3, 2, 1, 20, 19, 18, // 62320-62329
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 62330-62339
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 62340-62349
-		1, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 62350-62359
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62360-62369
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62370-62379
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 62380-62389
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62390-62399
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 62400-62409
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62410-62419
-		3, 2, 1, 36, 35, 34, 33, 32, 31, 30, // 62420-62429
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 62430-62439
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62440-62449
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 62450-62459
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62460-62469
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 62470-62479
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 62480-62489
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 62490-62499
-		1, 6, 5, 4, 3, 2, 1, 26, 25, 24, // 62500-62509
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62510-62519
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62520-62529
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 62530-62539
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 62540-62549
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62550-62559
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 62560-62569
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62570-62579
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62580-62589
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62590-62599
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 62600-62609
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 62610-62619
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62620-62629
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 62630-62639
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62640-62649
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 24, // 62650-62659
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62660-62669
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62670-62679
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 62680-62689
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62690-62699
-		1, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 62700-62709
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62710-62719
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 62720-62729
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62730-62739
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 62740-62749
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 62750-62759
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 62760-62769
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 62770-62779
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62780-62789
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62790-62799
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62800-62809
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 62810-62819
-		7, 6, 5, 4, 3, 2, 1, 24, 23, 22, // 62820-62829
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 62830-62839
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62840-62849
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62850-62859
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 62860-62869
-		3, 2, 1, 24, 23, 22, 21, 20, 19, 18, // 62870-62879
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 62880-62889
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 62890-62899
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 62900-62909
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62910-62919
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 62920-62929
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 62930-62939
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 62940-62949
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 62950-62959
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 62960-62969
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 62970-62979
-		1, 2, 1, 4, 3, 2, 1, 2, 1, 40, // 62980-62989
-		39, 38, 37, 36, 35, 34, 33, 32, 31, 30, // 62990-62999
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 63000-63009
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63010-63019
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63020-63029
-		1, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 63030-63039
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63040-63049
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 63050-63059
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63060-63069
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 18, // 63070-63079
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63080-63089
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63090-63099
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 63100-63109
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 63110-63119
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 63120-63129
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63130-63139
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 30, // 63140-63149
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 63150-63159
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63160-63169
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 63170-63179
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63180-63189
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 63190-63199
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63200-63209
-		1, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 63210-63219
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 63220-63229
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63230-63239
-		1, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 63240-63249
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 63250-63259
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63260-63269
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 63270-63279
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63280-63289
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 12, // 63290-63299
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63300-63309
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 63310-63319
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63320-63329
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63330-63339
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63340-63349
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 63350-63359
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63360-63369
-		7, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 63370-63379
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63380-63389
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 63390-63399
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 63400-63409
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63410-63419
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63420-63429
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 63430-63439
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 63440-63449
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63450-63459
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 63460-63469
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 63470-63479
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63480-63489
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 22, // 63490-63499
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 63500-63509
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63510-63519
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63520-63529
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 63530-63539
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63540-63549
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 63550-63559
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63560-63569
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63570-63579
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 63580-63589
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63590-63599
-		1, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 63600-63609
-		1, 6, 5, 4, 3, 2, 1, 12, 11, 10, // 63610-63619
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 63620-63629
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63630-63639
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 10, // 63640-63649
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 63650-63659
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 63660-63669
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63670-63679
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63680-63689
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63690-63699
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 63700-63709
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 63710-63719
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63720-63729
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63730-63739
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 63740-63749
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63750-63759
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63760-63769
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 63770-63779
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63780-63789
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 63790-63799
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 63800-63809
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63810-63819
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 63820-63829
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 63830-63839
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 63840-63849
-		3, 2, 1, 4, 3, 2, 1, 6, 5, 4, // 63850-63859
-		3, 2, 1, 38, 37, 36, 35, 34, 33, 32, // 63860-63869
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 63870-63879
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 63880-63889
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 63890-63899
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 63900-63909
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 63910-63919
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 20, // 63920-63929
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 63930-63939
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 63940-63949
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 63950-63959
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63960-63969
-		7, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 63970-63979
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 63980-63989
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 63990-63999
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64000-64009
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 14, // 64010-64019
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64020-64029
-		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 64030-64039
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64040-64049
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64050-64059
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 64060-64069
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64070-64079
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64080-64089
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64090-64099
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 64100-64109
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64110-64119
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 64120-64129
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 64130-64139
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64140-64149
-		1, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 64150-64159
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64160-64169
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 64170-64179
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 28, // 64180-64189
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 64190-64199
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 64200-64209
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64210-64219
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 64220-64229
-		1, 6, 5, 4, 3, 2, 1, 34, 33, 32, // 64230-64239
-		31, 30, 29, 28, 27, 26, 25, 24, 23, 22, // 64240-64249
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 64250-64259
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64260-64269
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 64270-64279
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 64280-64289
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64290-64299
-		1, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 64300-64309
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 64310-64319
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64320-64329
-		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 64330-64339
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 64340-64349
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64350-64359
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64360-64369
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 64370-64379
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64380-64389
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 64390-64399
-		3, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 64400-64409
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64410-64419
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64420-64429
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 64430-64439
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64440-64449
-		1, 2, 1, 30, 29, 28, 27, 26, 25, 24, // 64450-64459
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64460-64469
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64470-64479
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 10, // 64480-64489
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 64490-64499
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64500-64509
-		3, 2, 1, 40, 39, 38, 37, 36, 35, 34, // 64510-64519
-		33, 32, 31, 30, 29, 28, 27, 26, 25, 24, // 64520-64529
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 64530-64539
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64540-64549
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 64550-64559
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 64560-64569
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 64570-64579
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64580-64589
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64590-64599
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 64600-64609
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 64610-64619
-		1, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64620-64629
-		3, 2, 1, 28, 27, 26, 25, 24, 23, 22, // 64630-64639
-		21, 20, 19, 18, 17, 16, 15, 14, 13, 12, // 64640-64649
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64650-64659
-		1, 2, 1, 4, 3, 2, 1, 12, 11, 10, // 64660-64669
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 64670-64679
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64680-64689
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 64690-64699
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 8, // 64700-64709
-		7, 6, 5, 4, 3, 2, 1, 30, 29, 28, // 64710-64719
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 64720-64729
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 64730-64739
-		7, 6, 5, 4, 3, 2, 1, 16, 15, 14, // 64740-64749
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 64750-64759
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 64760-64769
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64770-64779
-		1, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 64780-64789
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 64790-64799
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64800-64809
-		1, 6, 5, 4, 3, 2, 1, 32, 31, 30, // 64810-64819
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 64820-64829
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64830-64839
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 64840-64849
-		3, 2, 1, 18, 17, 16, 15, 14, 13, 12, // 64850-64859
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64860-64869
-		1, 6, 5, 4, 3, 2, 1, 2, 1, 12, // 64870-64879
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64880-64889
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64890-64899
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64900-64909
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 64910-64919
-		1, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 64920-64929
-		7, 6, 5, 4, 3, 2, 1, 14, 13, 12, // 64930-64939
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 64940-64949
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 64950-64959
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 28, // 64960-64969
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18, // 64970-64979
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 64980-64989
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 64990-64999
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 65000-65009
-		1, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65010-65019
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 4, // 65020-65029
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 65030-65039
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65040-65049
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 65050-65059
-		3, 2, 1, 8, 7, 6, 5, 4, 3, 2, // 65060-65069
-		1, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 65070-65079
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 10, // 65080-65089
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 65090-65099
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 65100-65109
-		1, 8, 7, 6, 5, 4, 3, 2, 1, 4, // 65110-65119
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 12, // 65120-65129
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 65130-65139
-		1, 6, 5, 4, 3, 2, 1, 20, 19, 18, // 65140-65149
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65150-65159
-		7, 6, 5, 4, 3, 2, 1, 4, 3, 2, // 65160-65169
-		1, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 65170-65179
-		3, 2, 1, 20, 19, 18, 17, 16, 15, 14, // 65180-65189
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65190-65199
-		3, 2, 1, 10, 9, 8, 7, 6, 5, 4, // 65200-65209
-		3, 2, 1, 26, 25, 24, 23, 22, 21, 20, // 65210-65219
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 65220-65229
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 65230-65239
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65240-65249
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 65250-65259
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 18, // 65260-65269
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65270-65279
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 65280-65289
-		3, 2, 1, 16, 15, 14, 13, 12, 11, 10, // 65290-65299
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 14, // 65300-65309
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65310-65319
-		3, 2, 1, 4, 3, 2, 1, 26, 25, 24, // 65320-65329
-		23, 22, 21, 20, 19, 18, 17, 16, 15, 14, // 65330-65339
-		13, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65340-65349
-		3, 2, 1, 4, 3, 2, 1, 14, 13, 12, // 65350-65359
-		11, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 65360-65369
-		1, 10, 9, 8, 7, 6, 5, 4, 3, 2, // 65370-65379
-		1, 12, 11, 10, 9, 8, 7, 6, 5, 4, // 65380-65389
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 65390-65399
-		7, 6, 5, 4, 3, 2, 1, 6, 5, 4, // 65400-65409
-		3, 2, 1, 6, 5, 4, 3, 2, 1, 4, // 65410-65419
-		3, 2, 1, 14, 13, 12, 11, 10, 9, 8, // 65420-65429
-		7, 6, 5, 4, 3, 2, 1, 10, 9, 8, // 65430-65439
-		7, 6, 5, 4, 3, 2, 1, 2, 1, 30, // 65440-65449
-		29, 28, 27, 26, 25, 24, 23, 22, 21, 20, // 65450-65459
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 65460-65469
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 18, // 65470-65479
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, // 65480-65489
-		7, 6, 5, 4, 3, 2, 1, 22, 21, 20, // 65490-65499
-		19, 18, 17, 16, 15, 14, 13, 12, 11, 10, // 65500-65509
-		9, 8, 7, 6, 5, 4, 3, 2, 1, 2, // 65510-65519
-		1, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 65520-65529
-		0, 0, 0, 0, 0, 0,
-	}
-
-	lohi [256]struct{ lo, hi int }
-)
-
-func init() {
-	for i, v := range liars {
-		blk := v >> 24
-		x := &lohi[blk]
-		if x.lo == 0 || i < x.lo {
-			x.lo = i
-		}
-		if i > x.hi {
-			x.hi = i
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/test_deps.go b/Godeps/_workspace/src/github.com/cznic/mathutil/test_deps.go
deleted file mode 100644
index 40054dcad2..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/test_deps.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2014 The mathutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mathutil
-
-// Pull test dependencies too.
-// Enables easy 'go test X' after 'go get X'
-import (
-// nothing yet
-)
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/AUTHORS b/Godeps/_workspace/src/github.com/cznic/ql/AUTHORS
deleted file mode 100644
index 0078f5f5b6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/AUTHORS
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/ql/CONTRIBUTORS
deleted file mode 100644
index 6b6aed2dd8..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/CONTRIBUTORS
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Dan Kortschak <dan.kortschak@adelaide.edu.au>
-Jan Mercl <0xjnml@gmail.com>
-OpenNota <opennota@gmail.com>
-Viktor Kojouharov <vkojouharov@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/LICENSE b/Godeps/_workspace/src/github.com/cznic/ql/LICENSE
deleted file mode 100644
index 0d10c02b92..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The ql Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/Makefile b/Godeps/_workspace/src/github.com/cznic/ql/Makefile
deleted file mode 100644
index 5fb8c0841f..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (c) 2014 The ql Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-.PHONY: all clean nuke
-
-all: editor scanner.go parser.go
-	go build
-	go vet || true
-	golint
-	make todo
-	go install ./...
-
-bench: all
-	go test -run NONE -bench .
-
-clean:
-	go clean
-	rm -f *~ y.go y.tab.c *.out ql.test
-
-coerce.go: helper/helper.go
-	if [ -f coerce.go ] ; then rm coerce.go ; fi
-	go run helper/helper.go | gofmt > $@
-
-cover:
-	t=$(shell tempfile) ; go test -coverprofile $$t && go tool cover -html $$t && unlink $$t
-
-cpu: ql.test
-	go test -c
-	./$< -test.bench . -test.cpuprofile cpu.out
-	go tool pprof --lines $< cpu.out
-
-editor: ql.y scanner.go parser.go coerce.go
-	gofmt -s -l -w *.go
-	go test -i
-	go test
-
-internalError:
-	egrep -ho '"internal error.*"' *.go | sort | cat -n
-
-mem: ql.test
-	go test -c
-	./$< -test.bench . -test.memprofile mem.out
-	go tool pprof --lines --web --alloc_space $< mem.out
-
-nuke:
-	go clean -i
-
-parser.go: parser.y
-	a=$(shell tempfile) ; \
-	  goyacc -o /dev/null -xegen $$a $< ; \
-	  goyacc -cr -o $@ -xe $$a $< ; \
-	  rm -f $$a
-	sed -i -e 's|//line.*||' -e 's/yyEofCode/yyEOFCode/' $@
-
-ql.test: all
-
-ql.y: doc.go
-	sed -n '1,/^package/ s/^\/\/  //p' < $< \
-		| ebnf2y -o $@ -oe $*.ebnf -start StatementList -pkg $* -p _
-	goyacc -cr -o /dev/null $@
-
-scanner.go: scanner.l parser.go
-	golex -o $@ $<
-
-todo:
-	@grep -n ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* *.go *.l parser.y || true
-	@grep -n TODO *.go *.l parser.y testdata.ql || true
-	@grep -n BUG *.go *.l parser.y || true
-	@grep -n println *.go *.l parser.y || true
-
-later:
-	@grep -n LATER *.go *.l parser.y || true
-	@grep -n MAYBE *.go *.l parser.y || true
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/README.md b/Godeps/_workspace/src/github.com/cznic/ql/README.md
deleted file mode 100644
index c7a453a32b..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-ql
-==
-
-Package ql is a pure Go embedded (S)QL database.
-
-Installation
-
-    $ go get github.com/cznic/ql
-
-Documentation: [godoc.org/github.com/cznic/ql](http://godoc.org/github.com/cznic/ql)
-
-----
-
-Accompanying tool to play with a DB
-
-Installation
-
-    $ go get github.com/cznic/ql/ql
-
-Documentation: [godoc.org/github.com/cznic/ql/ql](http://godoc.org/github.com/cznic/ql/ql)
-
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/benchcmp b/Godeps/_workspace/src/github.com/cznic/ql/benchcmp
deleted file mode 100644
index a0f7a50c08..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/benchcmp
+++ /dev/null
@@ -1 +0,0 @@
-go test -test.run NONE -test.bench . -test.benchmem -timeout 1h | tee $1
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/blob.go b/Godeps/_workspace/src/github.com/cznic/ql/blob.go
deleted file mode 100644
index 2005b52c7e..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/blob.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"bytes"
-	"encoding/gob"
-	"math/big"
-	"sync"
-	"time"
-)
-
-const shortBlob = 256 // bytes
-
-var (
-	gobInitDuration = time.Duration(278)
-	gobInitInt      = big.NewInt(42)
-	gobInitRat      = big.NewRat(355, 113)
-	gobInitTime     time.Time
-)
-
-func init() {
-	var err error
-	if gobInitTime, err = time.ParseInLocation(
-		"Jan 2, 2006 at 3:04pm (MST)",
-		"Jul 9, 2012 at 5:02am (CEST)",
-		time.FixedZone("XYZ", 1234),
-	); err != nil {
-		panic(err)
-	}
-	newGobCoder()
-}
-
-type gobCoder struct {
-	buf bytes.Buffer
-	dec *gob.Decoder
-	enc *gob.Encoder
-	mu  sync.Mutex
-}
-
-func newGobCoder() (g *gobCoder) {
-	g = &gobCoder{}
-	g.enc = gob.NewEncoder(&g.buf)
-	if err := g.enc.Encode(gobInitInt); err != nil {
-		panic(err)
-	}
-
-	if err := g.enc.Encode(gobInitRat); err != nil {
-		panic(err)
-	}
-
-	if err := g.enc.Encode(gobInitTime); err != nil {
-		panic(err)
-	}
-
-	if err := g.enc.Encode(gobInitDuration); err != nil {
-		panic(err)
-	}
-
-	g.dec = gob.NewDecoder(&g.buf)
-	i := big.NewInt(0)
-	if err := g.dec.Decode(i); err != nil {
-		panic(err)
-	}
-
-	r := big.NewRat(3, 5)
-	if err := g.dec.Decode(r); err != nil {
-		panic(err)
-	}
-
-	t := time.Now()
-	if err := g.dec.Decode(&t); err != nil {
-		panic(err)
-	}
-
-	var d time.Duration
-	if err := g.dec.Decode(&d); err != nil {
-		panic(err)
-	}
-
-	return
-}
-
-func isBlobType(v interface{}) (bool, Type) {
-	switch v.(type) {
-	case []byte:
-		return true, Blob
-	case *big.Int:
-		return true, BigInt
-	case *big.Rat:
-		return true, BigRat
-	case time.Time:
-		return true, Time
-	case time.Duration:
-		return true, Duration
-	default:
-		return false, -1
-	}
-}
-
-func (g *gobCoder) encode(v interface{}) (b []byte, err error) {
-	g.mu.Lock()
-	defer g.mu.Unlock()
-
-	g.buf.Reset()
-	switch x := v.(type) {
-	case []byte:
-		return x, nil
-	case *big.Int:
-		err = g.enc.Encode(x)
-	case *big.Rat:
-		err = g.enc.Encode(x)
-	case time.Time:
-		err = g.enc.Encode(x)
-	case time.Duration:
-		err = g.enc.Encode(int64(x))
-	default:
-		panic("internal error 002")
-	}
-	b = g.buf.Bytes()
-	return
-}
-
-func (g *gobCoder) decode(b []byte, typ int) (v interface{}, err error) {
-	g.mu.Lock()
-	defer g.mu.Unlock()
-
-	g.buf.Reset()
-	g.buf.Write(b)
-	switch typ {
-	case qBlob:
-		return b, nil
-	case qBigInt:
-		x := big.NewInt(0)
-		err = g.dec.Decode(&x)
-		v = x
-	case qBigRat:
-		x := big.NewRat(1, 1)
-		err = g.dec.Decode(&x)
-		v = x
-	case qTime:
-		var x time.Time
-		err = g.dec.Decode(&x)
-		v = x
-	case qDuration:
-		var x int64
-		err = g.dec.Decode(&x)
-		v = time.Duration(x)
-	default:
-		panic("internal error 003")
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/btree.go b/Godeps/_workspace/src/github.com/cznic/ql/btree.go
deleted file mode 100644
index 2b588b70d8..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/btree.go
+++ /dev/null
@@ -1,725 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"io"
-)
-
-const (
-	kx = 128 //DONE benchmark tune this number if using custom key/value type(s).
-	kd = 64  //DONE benchmark tune this number if using custom key/value type(s).
-)
-
-type (
-	// cmp compares a and b. Return value is:
-	//
-	//	< 0 if a <  b
-	//	  0 if a == b
-	//	> 0 if a >  b
-	//
-	cmp func(a, b []interface{}) int
-
-	d struct { // data page
-		c int
-		d [2*kd + 1]de
-		n *d
-		p *d
-	}
-
-	de struct { // d element
-		k []interface{}
-		v []interface{}
-	}
-
-	enumerator struct {
-		err error
-		hit bool
-		i   int
-		k   []interface{}
-		q   *d
-		t   *tree
-		ver int64
-	}
-
-	// tree is a B+tree.
-	tree struct {
-		c     int
-		cmp   cmp
-		first *d
-		last  *d
-		r     interface{}
-		ver   int64
-	}
-
-	xe struct { // x element
-		ch  interface{}
-		sep *d
-	}
-
-	x struct { // index page
-		c int
-		x [2*kx + 2]xe
-	}
-)
-
-var ( // R/O zero values
-	zd  d
-	zde de
-	zx  x
-	zxe xe
-)
-
-func clr(q interface{}) {
-	switch z := q.(type) {
-	case *x:
-		for i := 0; i <= z.c; i++ { // Ch0 Sep0 ... Chn-1 Sepn-1 Chn
-			clr(z.x[i].ch)
-		}
-		*z = zx // GC
-	case *d:
-		*z = zd // GC
-	}
-}
-
-// -------------------------------------------------------------------------- x
-
-func newX(ch0 interface{}) *x {
-	r := &x{}
-	r.x[0].ch = ch0
-	return r
-}
-
-func (q *x) extract(i int) {
-	q.c--
-	if i < q.c {
-		copy(q.x[i:], q.x[i+1:q.c+1])
-		q.x[q.c].ch = q.x[q.c+1].ch
-		q.x[q.c].sep = nil // GC
-		q.x[q.c+1] = zxe   // GC
-	}
-}
-
-func (q *x) insert(i int, d *d, ch interface{}) *x {
-	c := q.c
-	if i < c {
-		q.x[c+1].ch = q.x[c].ch
-		copy(q.x[i+2:], q.x[i+1:c])
-		q.x[i+1].sep = q.x[i].sep
-	}
-	c++
-	q.c = c
-	q.x[i].sep = d
-	q.x[i+1].ch = ch
-	return q
-}
-
-func (q *x) siblings(i int) (l, r *d) {
-	if i >= 0 {
-		if i > 0 {
-			l = q.x[i-1].ch.(*d)
-		}
-		if i < q.c {
-			r = q.x[i+1].ch.(*d)
-		}
-	}
-	return
-}
-
-// -------------------------------------------------------------------------- d
-
-func (l *d) mvL(r *d, c int) {
-	copy(l.d[l.c:], r.d[:c])
-	copy(r.d[:], r.d[c:r.c])
-	l.c += c
-	r.c -= c
-}
-
-func (l *d) mvR(r *d, c int) {
-	copy(r.d[c:], r.d[:r.c])
-	copy(r.d[:c], l.d[l.c-c:])
-	r.c += c
-	l.c -= c
-}
-
-// ----------------------------------------------------------------------- tree
-
-// treeNew returns a newly created, empty tree. The compare function is used
-// for key collation.
-func treeNew(cmp cmp) *tree {
-	return &tree{cmp: cmp}
-}
-
-// Clear removes all K/V pairs from the tree.
-func (t *tree) Clear() {
-	if t.r == nil {
-		return
-	}
-
-	clr(t.r)
-	t.c, t.first, t.last, t.r = 0, nil, nil, nil
-	t.ver++
-}
-
-func (t *tree) cat(p *x, q, r *d, pi int) {
-	t.ver++
-	q.mvL(r, r.c)
-	if r.n != nil {
-		r.n.p = q
-	} else {
-		t.last = q
-	}
-	q.n = r.n
-	if p.c > 1 {
-		p.extract(pi)
-		p.x[pi].ch = q
-	} else {
-		t.r = q
-	}
-}
-
-func (t *tree) catX(p, q, r *x, pi int) {
-	t.ver++
-	q.x[q.c].sep = p.x[pi].sep
-	copy(q.x[q.c+1:], r.x[:r.c])
-	q.c += r.c + 1
-	q.x[q.c].ch = r.x[r.c].ch
-	if p.c > 1 {
-		p.c--
-		pc := p.c
-		if pi < pc {
-			p.x[pi].sep = p.x[pi+1].sep
-			copy(p.x[pi+1:], p.x[pi+2:pc+1])
-			p.x[pc].ch = p.x[pc+1].ch
-			p.x[pc].sep = nil  // GC
-			p.x[pc+1].ch = nil // GC
-		}
-		return
-	}
-
-	t.r = q
-}
-
-//Delete removes the k's KV pair, if it exists, in which case Delete returns
-//true.
-func (t *tree) Delete(k []interface{}) (ok bool) {
-	pi := -1
-	var p *x
-	q := t.r
-	if q == nil {
-		return
-	}
-
-	for {
-		var i int
-		i, ok = t.find(q, k)
-		if ok {
-			switch z := q.(type) {
-			case *x:
-				dp := z.x[i].sep
-				switch {
-				case dp.c > kd:
-					t.extract(dp, 0)
-				default:
-					if z.c < kx && q != t.r {
-						t.underflowX(p, &z, pi, &i)
-					}
-					pi = i + 1
-					p = z
-					q = z.x[pi].ch
-					ok = false
-					continue
-				}
-			case *d:
-				t.extract(z, i)
-				if z.c >= kd {
-					return
-				}
-
-				if q != t.r {
-					t.underflow(p, z, pi)
-				} else if t.c == 0 {
-					t.Clear()
-				}
-			}
-			return
-		}
-
-		switch z := q.(type) {
-		case *x:
-			if z.c < kx && q != t.r {
-				t.underflowX(p, &z, pi, &i)
-			}
-			pi = i
-			p = z
-			q = z.x[i].ch
-		case *d:
-			return
-		}
-	}
-}
-
-func (t *tree) extract(q *d, i int) { // (r []interface{}) {
-	t.ver++
-	//r = q.d[i].v // prepared for Extract
-	q.c--
-	if i < q.c {
-		copy(q.d[i:], q.d[i+1:q.c+1])
-	}
-	q.d[q.c] = zde // GC
-	t.c--
-	return
-}
-
-func (t *tree) find(q interface{}, k []interface{}) (i int, ok bool) {
-	var mk []interface{}
-	l := 0
-	switch z := q.(type) {
-	case *x:
-		h := z.c - 1
-		for l <= h {
-			m := (l + h) >> 1
-			mk = z.x[m].sep.d[0].k
-			switch cmp := t.cmp(k, mk); {
-			case cmp > 0:
-				l = m + 1
-			case cmp == 0:
-				return m, true
-			default:
-				h = m - 1
-			}
-		}
-	case *d:
-		h := z.c - 1
-		for l <= h {
-			m := (l + h) >> 1
-			mk = z.d[m].k
-			switch cmp := t.cmp(k, mk); {
-			case cmp > 0:
-				l = m + 1
-			case cmp == 0:
-				return m, true
-			default:
-				h = m - 1
-			}
-		}
-	}
-	return l, false
-}
-
-// First returns the first item of the tree in the key collating order, or
-// (nil, nil) if the tree is empty.
-func (t *tree) First() (k []interface{}, v []interface{}) {
-	if q := t.first; q != nil {
-		q := &q.d[0]
-		k, v = q.k, q.v
-	}
-	return
-}
-
-// Get returns the value associated with k and true if it exists. Otherwise Get
-// returns (nil, false).
-func (t *tree) Get(k []interface{}) (v []interface{}, ok bool) {
-	q := t.r
-	if q == nil {
-		return
-	}
-
-	for {
-		var i int
-		if i, ok = t.find(q, k); ok {
-			switch z := q.(type) {
-			case *x:
-				return z.x[i].sep.d[0].v, true
-			case *d:
-				return z.d[i].v, true
-			}
-		}
-		switch z := q.(type) {
-		case *x:
-			q = z.x[i].ch
-		default:
-			return
-		}
-	}
-}
-
-func (t *tree) insert(q *d, i int, k []interface{}, v []interface{}) *d {
-	t.ver++
-	c := q.c
-	if i < c {
-		copy(q.d[i+1:], q.d[i:c])
-	}
-	c++
-	q.c = c
-	q.d[i].k, q.d[i].v = k, v
-	t.c++
-	return q
-}
-
-// Last returns the last item of the tree in the key collating order, or (nil,
-// nil) if the tree is empty.
-func (t *tree) Last() (k []interface{}, v []interface{}) {
-	if q := t.last; q != nil {
-		q := &q.d[q.c-1]
-		k, v = q.k, q.v
-	}
-	return
-}
-
-// Len returns the number of items in the tree.
-func (t *tree) Len() int {
-	return t.c
-}
-
-func (t *tree) overflow(p *x, q *d, pi, i int, k []interface{}, v []interface{}) {
-	t.ver++
-	l, r := p.siblings(pi)
-
-	if l != nil && l.c < 2*kd && i > 0 {
-		l.mvL(q, 1)
-		t.insert(q, i-1, k, v)
-		return
-	}
-
-	if r != nil && r.c < 2*kd {
-		if i < 2*kd {
-			q.mvR(r, 1)
-			t.insert(q, i, k, v)
-		} else {
-			t.insert(r, 0, k, v)
-		}
-		return
-	}
-
-	t.split(p, q, pi, i, k, v)
-}
-
-// Seek returns an enumerator positioned on a an item such that k >= item's
-// key. ok reports if k == item.key The enumerator's position is possibly
-// after the last item in the tree.
-func (t *tree) Seek(k []interface{}) (e *enumerator, ok bool) {
-	q := t.r
-	if q == nil {
-		e = &enumerator{nil, false, 0, k, nil, t, t.ver}
-		return
-	}
-
-	for {
-		var i int
-		if i, ok = t.find(q, k); ok {
-			switch z := q.(type) {
-			case *x:
-				e = &enumerator{nil, ok, 0, k, z.x[i].sep, t, t.ver}
-				return
-			case *d:
-				e = &enumerator{nil, ok, i, k, z, t, t.ver}
-				return
-			}
-		}
-		switch z := q.(type) {
-		case *x:
-			q = z.x[i].ch
-		case *d:
-			e = &enumerator{nil, ok, i, k, z, t, t.ver}
-			return
-		}
-	}
-}
-
-// SeekFirst returns an enumerator positioned on the first KV pair in the tree,
-// if any. For an empty tree, err == io.EOF is returned and e will be nil.
-func (t *tree) SeekFirst() (e *enumerator, err error) {
-	q := t.first
-	if q == nil {
-		return nil, io.EOF
-	}
-
-	return &enumerator{nil, true, 0, q.d[0].k, q, t, t.ver}, nil
-}
-
-// SeekLast returns an enumerator positioned on the last KV pair in the tree,
-// if any. For an empty tree, err == io.EOF is returned and e will be nil.
-func (t *tree) SeekLast() (e *enumerator, err error) {
-	q := t.last
-	if q == nil {
-		return nil, io.EOF
-	}
-
-	return &enumerator{nil, true, q.c - 1, q.d[q.c-1].k, q, t, t.ver}, nil
-}
-
-// Set sets the value associated with k.
-func (t *tree) Set(k []interface{}, v []interface{}) {
-	pi := -1
-	var p *x
-	q := t.r
-	if q != nil {
-		for {
-			i, ok := t.find(q, k)
-			if ok {
-				switch z := q.(type) {
-				case *x:
-					z.x[i].sep.d[0].v = v
-				case *d:
-					z.d[i].v = v
-				}
-				return
-			}
-
-			switch z := q.(type) {
-			case *x:
-				if z.c > 2*kx {
-					t.splitX(p, &z, pi, &i)
-				}
-				pi = i
-				p = z
-				q = z.x[i].ch
-			case *d:
-				switch {
-				case z.c < 2*kd:
-					t.insert(z, i, k, v)
-				default:
-					t.overflow(p, z, pi, i, k, v)
-				}
-				return
-			}
-		}
-	}
-
-	z := t.insert(&d{}, 0, k, v)
-	t.r, t.first, t.last = z, z, z
-	return
-}
-
-func (t *tree) split(p *x, q *d, pi, i int, k []interface{}, v []interface{}) {
-	t.ver++
-	r := &d{}
-	if q.n != nil {
-		r.n = q.n
-		r.n.p = r
-	} else {
-		t.last = r
-	}
-	q.n = r
-	r.p = q
-
-	copy(r.d[:], q.d[kd:2*kd])
-	for i := range q.d[kd:] {
-		q.d[kd+i] = zde
-	}
-	q.c = kd
-	r.c = kd
-	if pi >= 0 {
-		p.insert(pi, r, r)
-	} else {
-		t.r = newX(q).insert(0, r, r)
-	}
-	if i > kd {
-		t.insert(r, i-kd, k, v)
-		return
-	}
-
-	t.insert(q, i, k, v)
-}
-
-func (t *tree) splitX(p *x, pp **x, pi int, i *int) {
-	t.ver++
-	q := *pp
-	r := &x{}
-	copy(r.x[:], q.x[kx+1:])
-	q.c = kx
-	r.c = kx
-	if pi >= 0 {
-		p.insert(pi, q.x[kx].sep, r)
-	} else {
-		t.r = newX(q).insert(0, q.x[kx].sep, r)
-	}
-	q.x[kx].sep = nil
-	for i := range q.x[kx+1:] {
-		q.x[kx+i+1] = zxe
-	}
-	if *i > kx {
-		*pp = r
-		*i -= kx + 1
-	}
-}
-
-func (t *tree) underflow(p *x, q *d, pi int) {
-	t.ver++
-	l, r := p.siblings(pi)
-
-	if l != nil && l.c+q.c >= 2*kd {
-		l.mvR(q, 1)
-	} else if r != nil && q.c+r.c >= 2*kd {
-		q.mvL(r, 1)
-		r.d[r.c] = zde // GC
-	} else if l != nil {
-		t.cat(p, l, q, pi-1)
-	} else {
-		t.cat(p, q, r, pi)
-	}
-}
-
-func (t *tree) underflowX(p *x, pp **x, pi int, i *int) {
-	t.ver++
-	var l, r *x
-	q := *pp
-
-	if pi >= 0 {
-		if pi > 0 {
-			l = p.x[pi-1].ch.(*x)
-		}
-		if pi < p.c {
-			r = p.x[pi+1].ch.(*x)
-		}
-	}
-
-	if l != nil && l.c > kx {
-		q.x[q.c+1].ch = q.x[q.c].ch
-		copy(q.x[1:], q.x[:q.c])
-		q.x[0].ch = l.x[l.c].ch
-		q.x[0].sep = p.x[pi-1].sep
-		q.c++
-		*i++
-		l.c--
-		p.x[pi-1].sep = l.x[l.c].sep
-		return
-	}
-
-	if r != nil && r.c > kx {
-		q.x[q.c].sep = p.x[pi].sep
-		q.c++
-		q.x[q.c].ch = r.x[0].ch
-		p.x[pi].sep = r.x[0].sep
-		copy(r.x[:], r.x[1:r.c])
-		r.c--
-		rc := r.c
-		r.x[rc].ch = r.x[rc+1].ch
-		r.x[rc].sep = nil
-		r.x[rc+1].ch = nil
-		return
-	}
-
-	if l != nil {
-		*i += l.c + 1
-		t.catX(p, l, q, pi-1)
-		*pp = l
-		return
-	}
-
-	t.catX(p, q, r, pi)
-}
-
-// ----------------------------------------------------------------- enumerator
-
-// Next returns the currently enumerated item, if it exists and moves to the
-// next item in the key collation order. If there is no item to return, err ==
-// io.EOF is returned.
-func (e *enumerator) Next() (k []interface{}, v []interface{}, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	if e.ver != e.t.ver {
-		f, hit := e.t.Seek(e.k)
-		if !e.hit && hit {
-			if err = f.next(); err != nil {
-				return
-			}
-		}
-
-		*e = *f
-	}
-	if e.q == nil {
-		e.err, err = io.EOF, io.EOF
-		return
-	}
-
-	if e.i >= e.q.c {
-		if err = e.next(); err != nil {
-			return
-		}
-	}
-
-	i := e.q.d[e.i]
-	k, v = i.k, i.v
-	e.k, e.hit = k, false
-	e.next()
-	return
-}
-
-func (e *enumerator) next() error {
-	if e.q == nil {
-		e.err = io.EOF
-		return io.EOF
-	}
-
-	switch {
-	case e.i < e.q.c-1:
-		e.i++
-	default:
-		if e.q, e.i = e.q.n, 0; e.q == nil {
-			e.err = io.EOF
-		}
-	}
-	return e.err
-}
-
-// Prev returns the currently enumerated item, if it exists and moves to the
-// previous item in the key collation order. If there is no item to return, err
-// == io.EOF is returned.
-func (e *enumerator) Prev() (k []interface{}, v []interface{}, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	if e.ver != e.t.ver {
-		f, hit := e.t.Seek(e.k)
-		if !e.hit && hit {
-			if err = f.prev(); err != nil {
-				return
-			}
-		}
-
-		*e = *f
-	}
-	if e.q == nil {
-		e.err, err = io.EOF, io.EOF
-		return
-	}
-
-	if e.i >= e.q.c {
-		if err = e.next(); err != nil {
-			return
-		}
-	}
-
-	i := e.q.d[e.i]
-	k, v = i.k, i.v
-	e.k, e.hit = k, false
-	e.prev()
-	return
-}
-
-func (e *enumerator) prev() error {
-	if e.q == nil {
-		e.err = io.EOF
-		return io.EOF
-	}
-
-	switch {
-	case e.i > 0:
-		e.i--
-	default:
-		if e.q = e.q.p; e.q == nil {
-			e.err = io.EOF
-			break
-		}
-
-		e.i = e.q.c - 1
-	}
-	return e.err
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/builtin.go b/Godeps/_workspace/src/github.com/cznic/ql/builtin.go
deleted file mode 100644
index 1c4bc1c1af..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/builtin.go
+++ /dev/null
@@ -1,991 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"fmt"
-	"math/rand"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-)
-
-//TODO agg bigint, bigrat, time, duration
-
-var builtin = map[string]struct {
-	f           func([]interface{}, map[interface{}]interface{}) (interface{}, error)
-	minArgs     int
-	maxArgs     int
-	isStatic    bool
-	isAggregate bool
-}{
-	"__testBlob":   {builtinTestBlob, 1, 1, true, false},
-	"__testString": {builtinTestString, 1, 1, true, false},
-	"avg":          {builtinAvg, 1, 1, false, true},
-	"complex":      {builtinComplex, 2, 2, true, false},
-	"contains":     {builtinContains, 2, 2, true, false},
-	"count":        {builtinCount, 0, 1, false, true},
-	"date":         {builtinDate, 8, 8, true, false},
-	"day":          {builtinDay, 1, 1, true, false},
-	"formatTime":   {builtinFormatTime, 2, 2, true, false},
-	"formatFloat":  {builtinFormatFloat, 1, 4, true, false},
-	"formatInt":    {builtinFormatInt, 1, 2, true, false},
-	"hasPrefix":    {builtinHasPrefix, 2, 2, true, false},
-	"hasSuffix":    {builtinHasSuffix, 2, 2, true, false},
-	"hour":         {builtinHour, 1, 1, true, false},
-	"hours":        {builtinHours, 1, 1, true, false},
-	"id":           {builtinID, 0, 1, false, false},
-	"imag":         {builtinImag, 1, 1, true, false},
-	"len":          {builtinLen, 1, 1, true, false},
-	"max":          {builtinMax, 1, 1, false, true},
-	"min":          {builtinMin, 1, 1, false, true},
-	"minute":       {builtinMinute, 1, 1, true, false},
-	"minutes":      {builtinMinutes, 1, 1, true, false},
-	"month":        {builtinMonth, 1, 1, true, false},
-	"nanosecond":   {builtinNanosecond, 1, 1, true, false},
-	"nanoseconds":  {builtinNanoseconds, 1, 1, true, false},
-	"now":          {builtinNow, 0, 0, false, false},
-	"parseTime":    {builtinParseTime, 2, 2, true, false},
-	"real":         {builtinReal, 1, 1, true, false},
-	"second":       {builtinSecond, 1, 1, true, false},
-	"seconds":      {builtinSeconds, 1, 1, true, false},
-	"since":        {builtinSince, 1, 1, false, false},
-	"sum":          {builtinSum, 1, 1, false, true},
-	"timeIn":       {builtinTimeIn, 2, 2, true, false},
-	"weekday":      {builtinWeekday, 1, 1, true, false},
-	"year":         {builtinYear, 1, 1, true, false},
-	"yearDay":      {builtinYearday, 1, 1, true, false},
-}
-
-func badNArgs(min int, s string, arg []interface{}) error {
-	a := []string{}
-	for _, v := range arg {
-		a = append(a, fmt.Sprintf("%v", v))
-	}
-	switch len(arg) < min {
-	case true:
-		return fmt.Errorf("missing argument to %s(%s)", s, strings.Join(a, ", "))
-	default: //case false:
-		return fmt.Errorf("too many arguments to %s(%s)", s, strings.Join(a, ", "))
-	}
-}
-
-func invArg(arg interface{}, s string) error {
-	return fmt.Errorf("invalid argument %v (type %T) for %s", arg, arg, s)
-}
-
-func builtinTestBlob(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	n, err := intExpr(arg[0])
-	if err != nil {
-		return nil, err
-	}
-
-	rng := rand.New(rand.NewSource(n))
-	b := make([]byte, n)
-	for i := range b {
-		b[i] = byte(rng.Int())
-	}
-	return b, nil
-}
-
-func builtinTestString(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	n, err := intExpr(arg[0])
-	if err != nil {
-		return nil, err
-	}
-
-	rng := rand.New(rand.NewSource(n))
-	b := make([]byte, n)
-	for i := range b {
-		b[i] = byte(rng.Int())
-	}
-	return string(b), nil
-}
-
-func builtinAvg(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	type avg struct {
-		sum interface{}
-		n   uint64
-	}
-
-	if _, ok := ctx["$agg0"]; ok {
-		return
-	}
-
-	fn := ctx["$fn"]
-	if _, ok := ctx["$agg"]; ok {
-		data, ok := ctx[fn].(avg)
-		if !ok {
-			return
-		}
-
-		switch x := data.sum.(type) {
-		case complex64:
-			return complex64(complex128(x) / complex(float64(data.n), 0)), nil
-		case complex128:
-			return complex64(complex128(x) / complex(float64(data.n), 0)), nil
-		case float32:
-			return float32(float64(x) / float64(data.n)), nil
-		case float64:
-			return float64(x) / float64(data.n), nil
-		case int8:
-			return int8(int64(x) / int64(data.n)), nil
-		case int16:
-			return int16(int64(x) / int64(data.n)), nil
-		case int32:
-			return int32(int64(x) / int64(data.n)), nil
-		case int64:
-			return int64(int64(x) / int64(data.n)), nil
-		case uint8:
-			return uint8(uint64(x) / data.n), nil
-		case uint16:
-			return uint16(uint64(x) / data.n), nil
-		case uint32:
-			return uint32(uint64(x) / data.n), nil
-		case uint64:
-			return uint64(uint64(x) / data.n), nil
-		}
-
-	}
-
-	data, _ := ctx[fn].(avg)
-	y := arg[0]
-	if y == nil {
-		return
-	}
-
-	switch x := data.sum.(type) {
-	case nil:
-		switch y := y.(type) {
-		case float32, float64, int8, int16, int32, int64, uint8, uint16, uint32, uint64:
-			data = avg{y, 0}
-		default:
-			return nil, fmt.Errorf("avg: cannot accept %v (value if type %T)", y, y)
-		}
-	case complex64:
-		data.sum = x + y.(complex64)
-	case complex128:
-		data.sum = x + y.(complex128)
-	case float32:
-		data.sum = x + y.(float32)
-	case float64:
-		data.sum = x + y.(float64)
-	case int8:
-		data.sum = x + y.(int8)
-	case int16:
-		data.sum = x + y.(int16)
-	case int32:
-		data.sum = x + y.(int32)
-	case int64:
-		data.sum = x + y.(int64)
-	case uint8:
-		data.sum = x + y.(uint8)
-	case uint16:
-		data.sum = x + y.(uint16)
-	case uint32:
-		data.sum = x + y.(uint32)
-	case uint64:
-		data.sum = x + y.(uint64)
-	}
-	data.n++
-	ctx[fn] = data
-	return
-}
-
-func builtinComplex(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
-	re, im := arg[0], arg[1]
-	if re == nil || im == nil {
-		return nil, nil
-	}
-
-	re, im = coerce(re, im)
-	if reflect.TypeOf(re) != reflect.TypeOf(im) {
-		return nil, fmt.Errorf("complex(%T(%#v), %T(%#v)): invalid types", re, re, im, im)
-	}
-
-	switch re := re.(type) {
-	case idealFloat:
-		return idealComplex(complex(float64(re), float64(im.(idealFloat)))), nil
-	case idealInt:
-		return idealComplex(complex(float64(re), float64(im.(idealInt)))), nil
-	case idealRune:
-		return idealComplex(complex(float64(re), float64(im.(idealRune)))), nil
-	case idealUint:
-		return idealComplex(complex(float64(re), float64(im.(idealUint)))), nil
-	case float32:
-		return complex(float32(re), im.(float32)), nil
-	case float64:
-		return complex(float64(re), im.(float64)), nil
-	case int8:
-		return complex(float64(re), float64(im.(int8))), nil
-	case int16:
-		return complex(float64(re), float64(im.(int16))), nil
-	case int32:
-		return complex(float64(re), float64(im.(int32))), nil
-	case int64:
-		return complex(float64(re), float64(im.(int64))), nil
-	case uint8:
-		return complex(float64(re), float64(im.(uint8))), nil
-	case uint16:
-		return complex(float64(re), float64(im.(uint16))), nil
-	case uint32:
-		return complex(float64(re), float64(im.(uint32))), nil
-	case uint64:
-		return complex(float64(re), float64(im.(uint64))), nil
-	default:
-		return nil, invArg(re, "complex")
-	}
-}
-
-func builtinContains(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
-	switch s := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case string:
-		switch chars := arg[1].(type) {
-		case nil:
-			return nil, nil
-		case string:
-			return strings.Contains(s, chars), nil
-		default:
-			return nil, invArg(chars, "string")
-		}
-	default:
-		return nil, invArg(s, "string")
-	}
-}
-
-func builtinCount(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	if _, ok := ctx["$agg0"]; ok {
-		return int64(0), nil
-	}
-
-	fn := ctx["$fn"]
-	if _, ok := ctx["$agg"]; ok {
-		return ctx[fn].(int64), nil
-	}
-
-	n, _ := ctx[fn].(int64)
-	switch len(arg) {
-	case 0:
-		n++
-	case 1:
-		if arg[0] != nil {
-			n++
-		}
-	default:
-		panic("internal error 067")
-	}
-	ctx[fn] = n
-	return
-}
-
-func builtinDate(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
-	for i, v := range arg {
-		switch i {
-		case 7:
-			switch x := v.(type) {
-			case string:
-			default:
-				return nil, invArg(x, "date")
-			}
-		default:
-			switch x := v.(type) {
-			case int64:
-			case idealInt:
-				arg[i] = int64(x)
-			default:
-				return nil, invArg(x, "date")
-			}
-		}
-	}
-
-	sloc := arg[7].(string)
-	loc := time.Local
-	switch sloc {
-	case "local":
-	default:
-		loc, err = time.LoadLocation(sloc)
-		if err != nil {
-			return
-		}
-	}
-
-	return time.Date(
-		int(arg[0].(int64)),
-		time.Month(arg[1].(int64)),
-		int(arg[2].(int64)),
-		int(arg[3].(int64)),
-		int(arg[4].(int64)),
-		int(arg[5].(int64)),
-		int(arg[6].(int64)),
-		loc,
-	), nil
-}
-
-func builtinLen(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case string:
-		return int64(len(x)), nil
-	default:
-		return nil, invArg(x, "len")
-	}
-}
-
-func builtinDay(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return int64(x.Day()), nil
-	default:
-		return nil, invArg(x, "day")
-	}
-}
-
-func builtinFormatTime(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		switch y := arg[1].(type) {
-		case nil:
-			return nil, nil
-		case string:
-			return x.Format(y), nil
-		default:
-			return nil, invArg(y, "formatTime")
-		}
-	default:
-		return nil, invArg(x, "formatTime")
-	}
-}
-
-func builtinFormatFloat(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	var val float64
-	var fmt byte = 'g'
-
-	prec := -1
-	bitSize := 64
-
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case float32:
-		val = float64(x)
-		bitSize = 32
-	case float64:
-		val = x
-	default:
-		return nil, invArg(x, "formatFloat")
-	}
-
-	switch len(arg) {
-	case 4:
-		arg3 := coerce1(arg[3], int64(0))
-		switch y := arg3.(type) {
-		case nil:
-			return nil, nil
-		case int64:
-			bitSize = int(y)
-		default:
-			return nil, invArg(y, "formatFloat")
-		}
-		fallthrough
-	case 3:
-		arg2 := coerce1(arg[2], int64(0))
-		switch y := arg2.(type) {
-		case nil:
-			return nil, nil
-		case int64:
-			prec = int(y)
-		default:
-			return nil, invArg(y, "formatFloat")
-		}
-		fallthrough
-	case 2:
-		arg1 := coerce1(arg[1], byte(0))
-		switch y := arg1.(type) {
-		case nil:
-			return nil, nil
-		case byte:
-			fmt = y
-		default:
-			return nil, invArg(y, "formatFloat")
-		}
-	}
-
-	return strconv.FormatFloat(val, fmt, prec, bitSize), nil
-}
-
-func builtinFormatInt(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	var intVal int64
-	var uintVal uint64
-
-	uintType := false
-	base := 10
-
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case int8:
-		intVal = int64(x)
-	case int16:
-		intVal = int64(x)
-	case int32:
-		intVal = int64(x)
-	case int64:
-		intVal = x
-	case uint8:
-		uintType = true
-		uintVal = uint64(x)
-	case uint16:
-		uintType = true
-		uintVal = uint64(x)
-	case uint32:
-		uintType = true
-		uintVal = uint64(x)
-	case uint64:
-		uintType = true
-		uintVal = x
-	default:
-		return nil, invArg(x, "formatInt")
-	}
-
-	switch len(arg) {
-	case 2:
-		arg1 := coerce1(arg[1], int64(0))
-		switch y := arg1.(type) {
-		case nil:
-			return nil, nil
-		case int64:
-			base = int(y)
-		default:
-			return nil, invArg(y, "formatInt")
-		}
-	}
-
-	if uintType {
-		return strconv.FormatUint(uintVal, base), nil
-	}
-
-	return strconv.FormatInt(intVal, base), nil
-}
-
-func builtinHasPrefix(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
-	switch s := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case string:
-		switch prefix := arg[1].(type) {
-		case nil:
-			return nil, nil
-		case string:
-			return strings.HasPrefix(s, prefix), nil
-		default:
-			return nil, invArg(prefix, "string")
-		}
-	default:
-		return nil, invArg(s, "string")
-	}
-}
-
-func builtinHasSuffix(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
-	switch s := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case string:
-		switch suffix := arg[1].(type) {
-		case nil:
-			return nil, nil
-		case string:
-			return strings.HasSuffix(s, suffix), nil
-		default:
-			return nil, invArg(suffix, "string")
-		}
-	default:
-		return nil, invArg(s, "string")
-	}
-}
-
-func builtinHour(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return int64(x.Hour()), nil
-	default:
-		return nil, invArg(x, "hour")
-	}
-}
-
-func builtinHours(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Duration:
-		return x.Hours(), nil
-	default:
-		return nil, invArg(x, "hours")
-	}
-}
-
-func builtinID(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := ctx["$id"].(type) {
-	case map[string]interface{}:
-		if len(arg) == 0 {
-			return nil, nil
-		}
-
-		tab := arg[0].(*ident)
-		id, ok := x[tab.s]
-		if !ok {
-			return nil, fmt.Errorf("value not available: id(%s)", tab)
-		}
-
-		if _, ok := id.(int64); ok {
-			return id, nil
-		}
-
-		return nil, fmt.Errorf("value not available: id(%s)", tab)
-	case int64:
-		return x, nil
-	default:
-		return nil, nil
-	}
-}
-
-func builtinImag(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case idealComplex:
-		return imag(x), nil
-	case complex64:
-		return imag(x), nil
-	case complex128:
-		return imag(x), nil
-	default:
-		return nil, invArg(x, "imag")
-	}
-}
-
-func builtinMax(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	if _, ok := ctx["$agg0"]; ok {
-		return
-	}
-
-	fn := ctx["$fn"]
-	if _, ok := ctx["$agg"]; ok {
-		if v, ok = ctx[fn]; ok {
-			return
-		}
-
-		return nil, nil
-	}
-
-	max := ctx[fn]
-	y := arg[0]
-	if y == nil {
-		return
-	}
-	switch x := max.(type) {
-	case nil:
-		switch y := y.(type) {
-		case float32, float64, string, int8, int16, int32, int64, uint8, uint16, uint32, uint64, time.Time:
-			max = y
-		default:
-			return nil, fmt.Errorf("max: cannot accept %v (value if type %T)", y, y)
-		}
-	case float32:
-		if y := y.(float32); y > x {
-			max = y
-		}
-	case float64:
-		if y := y.(float64); y > x {
-			max = y
-		}
-	case string:
-		if y := y.(string); y > x {
-			max = y
-		}
-	case int8:
-		if y := y.(int8); y > x {
-			max = y
-		}
-	case int16:
-		if y := y.(int16); y > x {
-			max = y
-		}
-	case int32:
-		if y := y.(int32); y > x {
-			max = y
-		}
-	case int64:
-		if y := y.(int64); y > x {
-			max = y
-		}
-	case uint8:
-		if y := y.(uint8); y > x {
-			max = y
-		}
-	case uint16:
-		if y := y.(uint16); y > x {
-			max = y
-		}
-	case uint32:
-		if y := y.(uint32); y > x {
-			max = y
-		}
-	case uint64:
-		if y := y.(uint64); y > x {
-			max = y
-		}
-	case time.Time:
-		if y := y.(time.Time); y.After(x) {
-			max = y
-		}
-	}
-	ctx[fn] = max
-	return
-}
-
-func builtinMin(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	if _, ok := ctx["$agg0"]; ok {
-		return
-	}
-
-	fn := ctx["$fn"]
-	if _, ok := ctx["$agg"]; ok {
-		if v, ok = ctx[fn]; ok {
-			return
-		}
-
-		return nil, nil
-	}
-
-	min := ctx[fn]
-	y := arg[0]
-	if y == nil {
-		return
-	}
-	switch x := min.(type) {
-	case nil:
-		switch y := y.(type) {
-		case float32, float64, string, int8, int16, int32, int64, uint8, uint16, uint32, uint64, time.Time:
-			min = y
-		default:
-			return nil, fmt.Errorf("min: cannot accept %v (value if type %T)", y, y)
-		}
-	case float32:
-		if y := y.(float32); y < x {
-			min = y
-		}
-	case float64:
-		if y := y.(float64); y < x {
-			min = y
-		}
-	case string:
-		if y := y.(string); y < x {
-			min = y
-		}
-	case int8:
-		if y := y.(int8); y < x {
-			min = y
-		}
-	case int16:
-		if y := y.(int16); y < x {
-			min = y
-		}
-	case int32:
-		if y := y.(int32); y < x {
-			min = y
-		}
-	case int64:
-		if y := y.(int64); y < x {
-			min = y
-		}
-	case uint8:
-		if y := y.(uint8); y < x {
-			min = y
-		}
-	case uint16:
-		if y := y.(uint16); y < x {
-			min = y
-		}
-	case uint32:
-		if y := y.(uint32); y < x {
-			min = y
-		}
-	case uint64:
-		if y := y.(uint64); y < x {
-			min = y
-		}
-	case time.Time:
-		if y := y.(time.Time); y.Before(x) {
-			min = y
-		}
-	}
-	ctx[fn] = min
-	return
-}
-
-func builtinMinute(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return int64(x.Minute()), nil
-	default:
-		return nil, invArg(x, "minute")
-	}
-}
-
-func builtinMinutes(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Duration:
-		return x.Minutes(), nil
-	default:
-		return nil, invArg(x, "minutes")
-	}
-}
-
-func builtinMonth(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return int64(x.Month()), nil
-	default:
-		return nil, invArg(x, "month")
-	}
-}
-
-func builtinNanosecond(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return int64(x.Nanosecond()), nil
-	default:
-		return nil, invArg(x, "nanosecond")
-	}
-}
-
-func builtinNanoseconds(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Duration:
-		return x.Nanoseconds(), nil
-	default:
-		return nil, invArg(x, "nanoseconds")
-	}
-}
-
-func builtinNow(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	return time.Now(), nil
-}
-
-func builtinParseTime(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	var a [2]string
-	for i, v := range arg {
-		switch x := v.(type) {
-		case nil:
-			return nil, nil
-		case string:
-			a[i] = x
-		default:
-			return nil, invArg(x, "parseTime")
-		}
-	}
-
-	t, err := time.Parse(a[0], a[1])
-	if err != nil {
-		return nil, err
-	}
-
-	ls := t.Location().String()
-	if ls == "UTC" {
-		return t, nil
-	}
-
-	l, err := time.LoadLocation(ls)
-	if err != nil {
-		return t, nil
-	}
-
-	return time.ParseInLocation(a[0], a[1], l)
-}
-
-func builtinReal(arg []interface{}, _ map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case idealComplex:
-		return real(x), nil
-	case complex64:
-		return real(x), nil
-	case complex128:
-		return real(x), nil
-	default:
-		return nil, invArg(x, "real")
-	}
-}
-
-func builtinSecond(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return int64(x.Second()), nil
-	default:
-		return nil, invArg(x, "second")
-	}
-}
-
-func builtinSeconds(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Duration:
-		return x.Seconds(), nil
-	default:
-		return nil, invArg(x, "seconds")
-	}
-}
-
-func builtinSince(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return time.Since(x), nil
-	default:
-		return nil, invArg(x, "since")
-	}
-}
-
-func builtinSum(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	if _, ok := ctx["$agg0"]; ok {
-		return
-	}
-
-	fn := ctx["$fn"]
-	if _, ok := ctx["$agg"]; ok {
-		if v, ok = ctx[fn]; ok {
-			return
-		}
-
-		return nil, nil
-	}
-
-	sum := ctx[fn]
-	y := arg[0]
-	if y == nil {
-		return
-	}
-	switch x := sum.(type) {
-	case nil:
-		switch y := y.(type) {
-		case complex64, complex128, float32, float64, int8, int16, int32, int64, uint8, uint16, uint32, uint64:
-			sum = y
-		default:
-			return nil, fmt.Errorf("sum: cannot accept %v (value if type %T)", y, y)
-		}
-	case complex64:
-		sum = x + y.(complex64)
-	case complex128:
-		sum = x + y.(complex128)
-	case float32:
-		sum = x + y.(float32)
-	case float64:
-		sum = x + y.(float64)
-	case int8:
-		sum = x + y.(int8)
-	case int16:
-		sum = x + y.(int16)
-	case int32:
-		sum = x + y.(int32)
-	case int64:
-		sum = x + y.(int64)
-	case uint8:
-		sum = x + y.(uint8)
-	case uint16:
-		sum = x + y.(uint16)
-	case uint32:
-		sum = x + y.(uint32)
-	case uint64:
-		sum = x + y.(uint64)
-	}
-	ctx[fn] = sum
-	return
-}
-
-func builtinTimeIn(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		switch y := arg[1].(type) {
-		case nil:
-			return nil, nil
-		case string:
-			loc := time.Local
-			switch y {
-			case "local":
-			default:
-				loc, err = time.LoadLocation(y)
-				if err != nil {
-					return
-				}
-			}
-
-			return x.In(loc), nil
-		default:
-			return nil, invArg(x, "timeIn")
-		}
-	default:
-		return nil, invArg(x, "timeIn")
-	}
-}
-
-func builtinWeekday(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return int64(x.Weekday()), nil
-	default:
-		return nil, invArg(x, "weekday")
-	}
-}
-
-func builtinYear(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return int64(x.Year()), nil
-	default:
-		return nil, invArg(x, "year")
-	}
-}
-
-func builtinYearday(arg []interface{}, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	switch x := arg[0].(type) {
-	case nil:
-		return nil, nil
-	case time.Time:
-		return int64(x.YearDay()), nil
-	default:
-		return nil, invArg(x, "yearDay")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/coerce.go b/Godeps/_workspace/src/github.com/cznic/ql/coerce.go
deleted file mode 100644
index bd384f93e6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/coerce.go
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2013 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// CAUTION: This file was generated automatically by
-//
-//	$ go run helper/helper.go -o coerce.go
-//
-// DO NOT EDIT!
-
-package ql
-
-import (
-	"math"
-	"math/big"
-	"reflect"
-	"time"
-)
-
-func coerce(a, b interface{}) (x, y interface{}) {
-	if reflect.TypeOf(a) == reflect.TypeOf(b) {
-		return a, b
-	}
-
-	switch a.(type) {
-	case idealComplex, idealFloat, idealInt, idealRune, idealUint:
-		switch b.(type) {
-		case idealComplex, idealFloat, idealInt, idealRune, idealUint:
-			x, y = coerce1(a, b), b
-			if reflect.TypeOf(x) == reflect.TypeOf(y) {
-				return
-			}
-
-			return a, coerce1(b, a)
-		default:
-			return coerce1(a, b), b
-		}
-	default:
-		switch b.(type) {
-		case idealComplex, idealFloat, idealInt, idealRune, idealUint:
-			return a, coerce1(b, a)
-		default:
-			return a, b
-		}
-	}
-}
-
-func coerce1(inVal, otherVal interface{}) (coercedInVal interface{}) {
-	coercedInVal = inVal
-	if otherVal == nil {
-		return
-	}
-
-	switch x := inVal.(type) {
-	case nil:
-		return
-	case idealComplex:
-		switch otherVal.(type) {
-		//case idealComplex:
-		//case idealFloat:
-		//case idealInt:
-		//case idealRune:
-		//case idealUint:
-		//case bool:
-		case complex64:
-			return complex64(x)
-		case complex128:
-			return complex128(x)
-			//case float32:
-			//case float64:
-			//case int8:
-			//case int16:
-			//case int32:
-			//case int64:
-			//case string:
-			//case uint8:
-			//case uint16:
-			//case uint32:
-			//case uint64:
-			//case *big.Int:
-			//case *big.Rat:
-			//case time.Time:
-			//case time.Duration:
-		}
-	case idealFloat:
-		switch otherVal.(type) {
-		case idealComplex:
-			return idealComplex(complex(float64(x), 0))
-		case idealFloat:
-			return idealFloat(float64(x))
-		//case idealInt:
-		//case idealRune:
-		//case idealUint:
-		//case bool:
-		case complex64:
-			return complex64(complex(float32(x), 0))
-		case complex128:
-			return complex128(complex(float64(x), 0))
-		case float32:
-			return float32(float64(x))
-		case float64:
-			return float64(float64(x))
-		//case int8:
-		//case int16:
-		//case int32:
-		//case int64:
-		//case string:
-		//case uint8:
-		//case uint16:
-		//case uint32:
-		//case uint64:
-		//case *big.Int:
-		case *big.Rat:
-			return big.NewRat(1, 1).SetFloat64(float64(x))
-			//case time.Time:
-			//case time.Duration:
-		}
-	case idealInt:
-		switch otherVal.(type) {
-		case idealComplex:
-			return idealComplex(complex(float64(x), 0))
-		case idealFloat:
-			return idealFloat(int64(x))
-		case idealInt:
-			return idealInt(int64(x))
-		//case idealRune:
-		case idealUint:
-			if x >= 0 {
-				return idealUint(int64(x))
-			}
-		//case bool:
-		case complex64:
-			return complex64(complex(float32(x), 0))
-		case complex128:
-			return complex128(complex(float64(x), 0))
-		case float32:
-			return float32(int64(x))
-		case float64:
-			return float64(int64(x))
-		case int8:
-			if x >= math.MinInt8 && x <= math.MaxInt8 {
-				return int8(int64(x))
-			}
-		case int16:
-			if x >= math.MinInt16 && x <= math.MaxInt16 {
-				return int16(int64(x))
-			}
-		case int32:
-			if x >= math.MinInt32 && x <= math.MaxInt32 {
-				return int32(int64(x))
-			}
-		case int64:
-			return int64(int64(x))
-		//case string:
-		case uint8:
-			if x >= 0 && x <= math.MaxUint8 {
-				return uint8(int64(x))
-			}
-		case uint16:
-			if x >= 0 && x <= math.MaxUint16 {
-				return uint16(int64(x))
-			}
-		case uint32:
-			if x >= 0 && x <= math.MaxUint32 {
-				return uint32(int64(x))
-			}
-		case uint64:
-			if x >= 0 {
-				return uint64(int64(x))
-			}
-		case *big.Int:
-			return big.NewInt(int64(x))
-		case *big.Rat:
-			return big.NewRat(1, 1).SetInt64(int64(x))
-		//case time.Time:
-		case time.Duration:
-			return time.Duration(int64(x))
-		}
-	case idealRune:
-		switch otherVal.(type) {
-		case idealComplex:
-			return idealComplex(complex(float64(x), 0))
-		case idealFloat:
-			return idealFloat(int64(x))
-		case idealInt:
-			return idealInt(int64(x))
-		case idealRune:
-			return idealRune(int64(x))
-		case idealUint:
-			return idealUint(int64(x))
-		//case bool:
-		case complex64:
-			return complex64(complex(float32(x), 0))
-		case complex128:
-			return complex128(complex(float64(x), 0))
-		case float32:
-			return float32(int64(x))
-		case float64:
-			return float64(int64(x))
-		case int8:
-			return int8(int64(x))
-		case int16:
-			return int16(int64(x))
-		case int32:
-			return int32(int64(x))
-		case int64:
-			return int64(int64(x))
-		//case string:
-		case uint8:
-			return uint8(int64(x))
-		case uint16:
-			return uint16(int64(x))
-		case uint32:
-			return uint32(int64(x))
-		case uint64:
-			return uint64(int64(x))
-		case *big.Int:
-			return big.NewInt(int64(x))
-		case *big.Rat:
-			return big.NewRat(1, 1).SetInt64(int64(x))
-		//case time.Time:
-		case time.Duration:
-			return time.Duration(int64(x))
-		}
-	case idealUint:
-		switch otherVal.(type) {
-		case idealComplex:
-			return idealComplex(complex(float64(x), 0))
-		case idealFloat:
-			return idealFloat(uint64(x))
-		case idealInt:
-			if x <= math.MaxInt64 {
-				return idealInt(int64(x))
-			}
-		//case idealRune:
-		case idealUint:
-			return idealUint(uint64(x))
-		//case bool:
-		case complex64:
-			return complex64(complex(float32(x), 0))
-		case complex128:
-			return complex128(complex(float64(x), 0))
-		case float32:
-			return float32(uint64(x))
-		case float64:
-			return float64(uint64(x))
-		case int8:
-			if x <= math.MaxInt8 {
-				return int8(int64(x))
-			}
-		case int16:
-			if x <= math.MaxInt16 {
-				return int16(int64(x))
-			}
-		case int32:
-			if x <= math.MaxInt32 {
-				return int32(int64(x))
-			}
-		case int64:
-			if x <= math.MaxInt64 {
-				return int64(int64(x))
-			}
-		//case string:
-		case uint8:
-			if x >= 0 && x <= math.MaxUint8 {
-				return uint8(int64(x))
-			}
-		case uint16:
-			if x >= 0 && x <= math.MaxUint16 {
-				return uint16(int64(x))
-			}
-		case uint32:
-			if x >= 0 && x <= math.MaxUint32 {
-				return uint32(int64(x))
-			}
-		case uint64:
-			return uint64(uint64(x))
-		case *big.Int:
-			return big.NewInt(0).SetUint64(uint64(x))
-		case *big.Rat:
-			return big.NewRat(1, 1).SetInt(big.NewInt(0).SetUint64(uint64(x)))
-		//case time.Time:
-		case time.Duration:
-			if x <= math.MaxInt64 {
-				return time.Duration(int64(x))
-			}
-		}
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/design/doc.go b/Godeps/_workspace/src/github.com/cznic/ql/design/doc.go
deleted file mode 100644
index 7e6718cfdf..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/design/doc.go
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-
-Package design describes some of the data structures used in QL.
-
-Handles
-
-A handle is a 7 byte "pointer" to a block in the DB[0].
-
-Scalar encoding
-
-Encoding of so called "scalars" provided by [1]. Unless specified otherwise,
-all values discussed below are scalars, encoded scalars or encoding of scalar
-arrays.
-
-Database root
-
-DB root is a 1-scalar found at a fixed handle (#1).
-
-	+---+------+--------+-----------------------+
-	| # | Name |  Type  |     Description       |
-	+---+------+--------+-----------------------+
-	| 0 | head | handle | First table meta data |
-	+---+------+--------+-----------------------+
-
-Head is the head of a single linked list of table of meta data. It's zero if
-there are no tables in the DB.
-
-Table meta data
-
-Table meta data are a 6-scalar.
-
-	+---+---------+--------+--------------------------+
-	| # | Name    | Type   |      Description         |
-	+---+---------+--------+--------------------------+
-	| 0 | next    | handle | Next table meta data.    |
-	| 1 | scols   | string | Column defintitions      |
-	| 2 | hhead   | handle | -> head -> first record  |
-	| 3 | name    | string | Table name               |
-	| 4 | indices | string | Index definitions        |
-	| 5 | hxroots | handle | Index B+Trees roots list |
-	+---+---------+--------+--------------------------+
-
-Fields #4 and #5 are optional for backward compatibility with existing
-databases.  OTOH, forward compatibility will not work. Once any indices are
-created using a newer QL version the older versions of QL, expecting only 4
-fields of meta data will not be able to use the DB. That's the intended
-behavior because the older versions of QL cannot update the indexes, which can
-break queries runned by the newer QL version which expect indices to be always
-actualized on any table-with-indices mutation.
-
-The handle of the next table meta data is in the field #0 (next). If there is
-no next table meta data, the field is zero. Names and types of table columns
-are stored in field #1 (scols). A single field is described by concatenating a
-type tag and the column name. The type tags are
-
-	bool       'b'
-	complex64  'c'
-	complex128 'd'
-	float32    'f'
-	float64    'g', alias float
-	int8       'i'
-	int16      'j'
-	int32      'k'
-	int64      'l', alias int
-	string     's'
-	uint8      'u', alias byte
-	uint16     'v'
-	uint32     'w'
-	uint64     'x', alias uint
-	bigInt     'I'
-	bigRat     'R'
-	blob       'B'
-	duration   'D'
-	time       'T'
-
-The scols value is the above described encoded fields joined using "|". For
-example
-
-	CREATE TABLE t (Foo bool, Bar string, Baz float);
-
-This statement adds a table meta data with scols
-
-	"bFool|sBar|gBaz"
-
-Columns can be dropped from a table
-
-	ALTER TABLE t DROP COLUMN Bar;
-
-This "erases" the field info in scols, so the value becomes
-
-	"bFool||gBaz"
-
-Colums can be added to a table
-
-	ALTER TABLE t ADD Count uint;
-
-New fields are always added to the end of scols
-
-	"bFool||gBaz|xCount"
-
-Index of a field in strings.Split(scols, "|") is the index of the field in a
-table record. The above discussed rules for column dropping and column adding
-allow for schema evolution without a need to reshape any existing table data.
-Dropped columns are left where they are and new records insert nil in their
-place. The encoded nil is one byte. Added columns, when not present in
-preexisting records are returned as nil values. If the overhead of dropped
-columns becomes an issue and there's time/space and memory enough to move the
-records of a table around:
-
-	BEGIN TRANSACTION;
-		CREATE TABLE new (column definitions);
-		INSERT INTO new SELECT * FROM old;
-		DROP TABLE old;
-		CREATE TABLE old (column definitions);
-		INSERT INTO old SELECT * FROM new;
-		DROP TABLE new;
-	END TRANSACTION;
-
-This is not very time/space effective and for Big Data it can cause an OOM
-because transactions are limited by memory resources available to the process.
-Perhaps a method and/or QL statement to do this in-place should be added
-(MAYBE consider adopting MySQL's OPTIMIZE TABLE syntax).
-
-Field #2 (hhead) is a handle to a head of table records, i.e. not a handle to
-the first record in the table. It is thus always non zero even for a table
-having no records. The reason for this "double pointer" schema is to enable
-adding (linking) a new record by updating a single value of the (hhead pointing
-to) head.
-
-	tableMeta.hhead	-> head	-> firstTableRecord
-
-The table name is stored in field #3 (name).
-
-Indices
-
-Consider an index named N, indexing column named C.  The encoding of this
-particular index is a string "<tag>N". <tag> is a string "n" for non unique
-indices and "u" for unique indices. There is this index information for the
-index possibly indexing the record id() and for all other columns of scols.
-Where the column is not indexed, the index info is an empty string. Infos for
-all indexes are joined with "|". For example
-
-	BEGIN TRANSACTION;
-		CREATE TABLE t (Foo int, Bar bool, Baz string);
-		CREATE INDEX X ON t (Baz);
-		CREATE UNIQUE INDEX Y ON t (Foo);
-	COMMIT;
-
-The values of fields #1 and #4 for the above are
-
-	  scols: "lFoo|bBar|sBaz"
-	indices: "|uY||nX"
-
-Aligning properly the "|" split parts
-
-                     id   col #0   col#1    col#2
-	+----------+----+--------+--------+--------+
-	|   scols: |    | "lFoo" | "bBar" | "sBaz" |
-	+----------+----+--------+--------+--------+
-	| indices: | "" | "uY"   | ""     | "nX"   |
-	+----------+----+--------+--------+--------+
-
-shows that the record id() is not indexed for this table while the columns Foo
-and Baz are.
-
-Note that there cannot be two differently named indexes for the same column and
-it's intended. The indices are B+Trees[2]. The list of handles to their roots
-is pointed to by hxroots with zeros for non indexed columns. For the previous
-example
-
-	tableMeta.hxroots -> {0, y, 0, x}
-
-where x is the root of the B+Tree for the X index and y is the root of the
-B+Tree for the Y index. If there would be an index for id(), its B+Tree root
-will be present where the first zero is. Similarly to hhead, hxroots is never
-zero, even when there are no indices for a table.
-
-Table record
-
-A table record is an N-scalar.
-
-	+-----+------------+--------+-------------------------------+
-	|  #  |    Name    |  Type  |      Description              |
-	+-----+------------+--------+-------------------------------+
-	|  0  | next       | handle | Next record or zero.          |
-	|  1  | id         | int64  | Automatically assigned unique |
-	|     |            |        | value obtainable by id().     |
-	|  2  | field #0   | scalar | First field of the record.    |
-	|  3  | field #1   | scalar | Second field of the record.   |
-	     ...
-	| N-1 | field #N-2 | scalar | Last field of the record.     |
-	+-----+------------+--------+-------------------------------+
-
-The linked "ordering" of table records has no semantics and it doesn't have to
-correlate to the order of how the records were added to the table. In fact, an
-efficient way of the linking leads to "ordering" which is actually reversed wrt
-the insertion order.
-
-Non unique index
-
-The composite key of the B+Tree is {indexed values, record handle}. The B+Tree
-value is not used.
-
-	           B+Tree key                    B+Tree value
-	+----------------+---------------+      +--------------+
-	| Indexed Values | Record Handle |  ->  |   not used   |
-	+----------------+---------------+      +--------------+
-
-Unique index
-
-If the indexed values are all NULL then the composite B+Tree key is {nil,
-record handle} and the B+Tree value is not used.
-
-	        B+Tree key                B+Tree value
-	+------+-----------------+      +--------------+
-	| NULL |  Record Handle  |  ->  |   not used   |
-	+------+-----------------+      +--------------+
-
-If the indexed values are not all NULL then key of the B+Tree key are the indexed
-values and the B+Tree value is the record handle. 
-
-	        B+Tree key                B+Tree value
-	+----------------+      +---------------+
-	| Indexed Values |  ->  | Record Handle |
-	+----------------+      +---------------+
-
-Non scalar types
-
-Scalar types of [1] are bool, complex*, float*, int*, uint*, string and []byte
-types. All other types are "blob-like".
-
-	QL type         Go type
-	-----------------------------
-	blob            []byte
-	bigint          big.Int
-	bigrat          big.Rat
-	time            time.Time
-	duration        time.Duration
-
-Memory back-end stores the Go type directly. File back-end must resort to
-encode all of the above as (tagged) []byte due to the lack of more types
-supported natively by lldb. NULL values of blob-like types are encoded as nil
-(gbNull in lldb/gb.go), exactly the same as the already existing QL types are.
-
-Blob encoding
-
-The values of the blob-like types are first encoded into a []byte slice:
-
-	+-----------------------+-------------------+
-	| blob                  | raw               |
-	| bigint, bigrat, time	| gob encoded       |
-	| duration		| gob encoded int64 |
-	+-----------------------+-------------------+
-
-The gob encoding is "differential" wrt an initial encoding of all of the
-blob-like type. IOW, the initial type descriptors which gob encoding must write
-out are stripped off and "resupplied" on decoding transparently. See also
-blob.go. If the length of the resulting slice is <= shortBlob, the first and
-only chunk is the scalar encoding of
-
-	
-	[]interface{}{typeTag, slice}.                  // initial (and last) chunk
-
-The length of slice can be zero (for blob("")). If the resulting slice is long
-(> shortBlob), the first chunk comes from encoding
-
-	[]interface{}{typeTag, nextHandle, firstPart}.  // initial, but not final chunk
-
-In this case len(firstPart) <= shortBlob. Second and other chunks: If the chunk
-is the last one, src is
-
-	[]interface{lastPart}.                          // overflow chunk (last)
-
-In this case len(lastPart) <= 64kB. If the chunk is not the last one, src is
-
-	[]interface{}{nextHandle, part}.                // overflow chunk (not last)
-
-In this case len(part) == 64kB.
-
-Links
-
-Referenced from above:
-
-  [0]: http://godoc.org/github.com/cznic/exp/lldb#hdr-Block_handles
-  [1]: http://godoc.org/github.com/cznic/exp/lldb#EncodeScalars
-  [2]: http://godoc.org/github.com/cznic/exp/lldb#BTree
-
-Rationale
-
-While these notes might be useful to anyone looking at QL sources, the
-specifically intended reader is my future self.
-
-*/
-package design
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/doc.go b/Godeps/_workspace/src/github.com/cznic/ql/doc.go
deleted file mode 100644
index 7a8baf10eb..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/doc.go
+++ /dev/null
@@ -1,2606 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//MAYBE set operations
-//MAYBE +=, -=, ...
-
-//TODO verify there's a graceful failure for a 2G+ blob on a 32 bit machine.
-
-// Package ql implements a pure Go embedded SQL database engine.
-//
-// QL is a member of the SQL family of languages. It is less complex and less
-// powerful than SQL (whichever specification SQL is considered to be).
-//
-// Change list
-//
-// 2015-06-15: To improve compatibility with other SQL implementations, the
-// count built-in aggregate function now accepts * as its argument.
-//
-// 2015-05-29: The execution planner was rewritten from scratch. It should use
-// indices in all places where they were used before plus in some additional
-// situations.  It is possible to investigate the plan using the newly added
-// EXPLAIN statement.  The QL tool is handy for such analysis. If the planner
-// would have used an index, but no such exists, the plan includes hints in
-// form of copy/paste ready CREATE INDEX statements.
-//
-// The planner is still quite simple and a lot of work on it is yet ahead. You
-// can help this process by filling an issue with a schema and query which
-// fails to use an index or indices when it should, in your opinion. Bonus
-// points for including output of `ql 'explain <query>'`.
-//
-// 2015-05-09: The grammar of the CREATE INDEX statement now accepts an
-// expression list instead of a single expression, which was further limited to
-// just a column name or the built-in id().  As a side effect, composite
-// indices are now functional. However, the values in the expression-list style
-// index are not yet used by other statements or the statement/query planner.
-// The composite index is useful while having UNIQUE clause to check for
-// semantically duplicate rows before they get added to the table or when such
-// a row is mutated using the UPDATE statement and the expression-list style
-// index tuple of the row is thus recomputed.
-//
-// 2015-05-02: The Schema field of table __Table now correctly reflects any
-// column constraints and/or defaults. Also, the (*DB).Info method now has that
-// information provided in new ColumInfo fields NotNull, Constraint and
-// Default.
-//
-// 2015-04-20: Added support for {LEFT,RIGHT,FULL} [OUTER] JOIN.
-//
-// 2015-04-18: Column definitions can now have constraints and defaults.
-// Details are discussed in the "Constraints and defaults" chapter below the
-// CREATE TABLE statement documentation.
-//
-// 2015-03-06: New built-in functions formatFloat and formatInt. Thanks
-// urandom! (https://github.com/urandom)
-//
-// 2015-02-16: IN predicate now accepts a SELECT statement. See the updated
-// "Predicates" section.
-//
-// 2015-01-17: Logical operators || and && have now alternative spellings: OR
-// and AND (case insensitive).  AND was a keyword before, but OR is a new one.
-// This can possibly break existing queries. For the record, it's a good idea
-// to not use any name appearing in, for example, [7] in your queries as the
-// list of QL's keywords may expand for gaining better compatibility with
-// existing SQL "standards".
-//
-// 2015-01-12: ACID guarantees were tightened at the cost of performance in
-// some cases. The write collecting window mechanism, a formerly used
-// implementation detail, was removed. Inserting rows one by one in a
-// transaction is now slow. I mean very slow. Try to avoid inserting single
-// rows in a transaction. Instead, whenever possible, perform batch updates of
-// tens to, say thousands of rows in a single transaction. See also:
-// http://www.sqlite.org/faq.html#q19, the discussed synchronization principles
-// involved are the same as for QL, modulo minor details.
-//
-// Note: A side effect is that closing a DB before exiting an application, both
-// for the Go API and through database/sql driver, is no more required,
-// strictly speaking. Beware that exiting an application while there is an open
-// (uncommitted) transaction in progress means losing the transaction data.
-// However, the DB will not become corrupted because of not closing it. Nor
-// that was the case before, but formerly failing to close a DB could have
-// resulted in losing the data of the last transaction.
-//
-// 2014-09-21: id() now optionally accepts a single argument - a table name.
-//
-// 2014-09-01: Added the DB.Flush() method and the LIKE pattern matching
-// predicate.
-//
-// 2014-08-08: The built in functions max and min now accept also time values.
-// Thanks opennota! (https://github.com/opennota)
-//
-// 2014-06-05: RecordSet interface extended by new methods FirstRow and Rows.
-//
-// 2014-06-02: Indices on id() are now used by SELECT statements.
-//
-// 2014-05-07: Introduction of Marshal, Schema, Unmarshal.
-//
-// 2014-04-15:
-//
-// Added optional IF NOT EXISTS clause to CREATE INDEX and optional IF EXISTS
-// clause to DROP INDEX.
-//
-// 2014-04-12:
-//
-// The column Unique in the virtual table __Index was renamed to IsUnique
-// because the old name is a keyword. Unfortunately, this is a breaking change,
-// sorry.
-//
-// 2014-04-11: Introduction of LIMIT, OFFSET.
-//
-// 2014-04-10: Introduction of query rewriting.
-//
-// 2014-04-07: Introduction of indices.
-//
-// Building non CGO QL
-//
-// QL imports zappy[8], a block-based compressor, which speeds up its
-// performance by using a C version of the compression/decompression
-// algorithms.  If a CGO-free (pure Go) version of QL, or an app using QL, is
-// required, please include 'purego' in the -tags option of go
-// {build,get,install}. For example:
-//
-//	$ go get -tags purego github.com/cznic/ql
-//
-// If zappy was installed before installing QL, it might be necessary to
-// rebuild zappy first (or rebuild QL with all its dependencies using the -a
-// option):
-//
-//	$ touch "$GOPATH"/src/github.com/cznic/zappy/*.go
-//	$ go install -tags purego github.com/cznic/zappy
-//	$ go install github.com/cznic/ql
-//
-// Notation
-//
-// The syntax is specified using Extended Backus-Naur Form (EBNF)
-//
-// 	Production  = production_name "=" [ Expression ] "." .
-// 	Expression  = Alternative { "|" Alternative } .
-// 	Alternative = Term { Term } .
-// 	Term        = production_name | token [ "…" token ] | Group | Option | Repetition .
-// 	Group       = "(" Expression ")" .
-// 	Option      = "[" Expression "]" .
-// 	Repetition  = "{" Expression "}" .
-// 	Productions are expressions constructed from terms and the following operators, in increasing precedence
-//
-// 	|   alternation
-// 	()  grouping
-// 	[]  option (0 or 1 times)
-// 	{}  repetition (0 to n times)
-//
-// Lower-case production names are used to identify lexical tokens.
-// Non-terminals are in CamelCase. Lexical tokens are enclosed in double quotes
-// "" or back quotes ``.
-//
-// The form a … b represents the set of characters from a through b as
-// alternatives. The horizontal ellipsis … is also used elsewhere in the spec
-// to informally denote various enumerations or code snippets that are not
-// further specified.
-//
-// QL source code representation
-//
-// QL source code is Unicode text encoded in UTF-8. The text is not
-// canonicalized, so a single accented code point is distinct from the same
-// character constructed from combining an accent and a letter; those are
-// treated as two code points.  For simplicity, this document will use the
-// unqualified term character to refer to a Unicode code point in the source
-// text.
-//
-// Each code point is distinct; for instance, upper and lower case letters are
-// different characters.
-//
-// Implementation restriction: For compatibility with other tools, the parser
-// may disallow the NUL character (U+0000) in the statement.
-//
-// Implementation restriction: A byte order mark is disallowed anywhere in QL
-// statements.
-//
-// Characters
-//
-// The following terms are used to denote specific character classes
-//
-//  newline        = . // the Unicode code point U+000A
-//  unicode_char   = . // an arbitrary Unicode code point except newline
-//  ascii_letter   = "a" … "z" | "A" … "Z" .
-//
-// Letters and digits
-//
-// The underscore character _ (U+005F) is considered a letter.
-//
-//  letter        = ascii_letter | "_" .
-//  decimal_digit = "0" … "9" .
-//  octal_digit   = "0" … "7" .
-//  hex_digit     = "0" … "9" | "A" … "F" | "a" … "f" .
-//
-// Lexical elements
-//
-// Lexical elements are comments, tokens, identifiers, keywords, operators and
-// delimiters, integer, floating-point, imaginary, rune and string literals and
-// QL parameters.
-//
-// Comments
-//
-// There are three forms of comments
-//
-// Line comments start with the character sequence // or -- and stop at the end
-// of the line. A line comment acts like a space.
-//
-// General comments start with the character sequence /* and continue through
-// the character sequence */. A general comment acts like a space.
-//
-// Comments do not nest.
-//
-// Tokens
-//
-// Tokens form the vocabulary of QL. There are four classes: identifiers,
-// keywords, operators and delimiters, and literals. White space, formed from
-// spaces (U+0020), horizontal tabs (U+0009), carriage returns (U+000D), and
-// newlines (U+000A), is ignored except as it separates tokens that would
-// otherwise combine into a single token.
-//
-// Semicolons
-//
-// The formal grammar uses semicolons ";" as separators of QL statements. A
-// single QL statement or the last QL statement in a list of statements can
-// have an optional semicolon terminator. (Actually a separator from the
-// following empty statement.)
-//
-// Identifiers
-//
-// Identifiers name entities such as tables or record set columns. An
-// identifier is a sequence of one or more letters and digits. The first
-// character in an identifier must be a letter.
-//
-//  identifier = letter { letter | decimal_digit } .
-//
-// For example
-//
-// 	price
-// 	_tmp42
-// 	Sales
-//
-// No identifiers are predeclared, however note that no keyword can be used as
-// an identifier.  Identifiers starting with two underscores are used for meta
-// data virtual tables names. For forward compatibility, users should generally
-// avoid using any identifiers starting with two underscores. For example
-//
-//	__Column
-//	__Column2
-//	__Index
-//	__Table
-//
-// Keywords
-//
-// The following keywords are reserved and may not be used as identifiers.
-//
-//	ADD      COLUMN      false     int32   ORDER     uint16
-//	ALTER    complex128  float     int64   OUTER     uint32
-//	AND      complex64   float32   int8    RIGHT     uint64
-//	AS       CREATE      float64   INTO    SELECT    uint8
-//	ASC      DEFAULT     FROM      JOIN    SET       UNIQUE
-//	BETWEEN  DELETE      GROUP     LEFT    string    UPDATE
-//	bigint   DESC        IF        LIMIT   TABLE     VALUES
-//	bigrat   DISTINCT    IN        LIKE    time      WHERE
-//	blob     DROP        INDEX     NOT     true
-//	bool     duration    INSERT    NULL    OR
-//	BY       EXISTS      int       OFFSET  TRUNCATE
-//	byte     EXPLAIN     int16     ON      uint
-//
-// Keywords are not case sensitive.
-//
-// Operators and Delimiters
-//
-// The following character sequences represent operators, delimiters, and other
-// special tokens
-//
-// 	+    &    &&    ==    !=    (    )
-// 	-    |    ||    <     <=    [    ]
-// 	*    ^          >     >=    ,    ;
-// 	/    <<         =           .
-// 	%    >>         !
-// 	     &^
-//
-// Operators consisting of more than one character are referred to by names in
-// the rest of the documentation
-//
-//  andand = "&&" .
-//  andnot = "&^" .
-//  lsh    = "<<" .
-//  le     = "<=" .
-//  eq     = "==" .
-//  ge     = ">=" .
-//  neq    = "!=" .
-//  oror   = "||" .
-//  rsh    = ">>" .
-//
-// Integer literals
-//
-// An integer literal is a sequence of digits representing an integer constant.
-// An optional prefix sets a non-decimal base: 0 for octal, 0x or 0X for
-// hexadecimal.  In hexadecimal literals, letters a-f and A-F represent values
-// 10 through 15.
-//
-//  int_lit     = decimal_lit | octal_lit | hex_lit .
-//  decimal_lit = ( "1" … "9" ) { decimal_digit } .
-//  octal_lit   = "0" { octal_digit } .
-//  hex_lit     = "0" ( "x" | "X" ) hex_digit { hex_digit } .
-//
-// For example
-//
-// 	42
-// 	0600
-// 	0xBadFace
-// 	1701411834604692
-//
-// Floating-point literals
-//
-// A floating-point literal is a decimal representation of a floating-point
-// constant. It has an integer part, a decimal point, a fractional part, and an
-// exponent part. The integer and fractional part comprise decimal digits; the
-// exponent part is an e or E followed by an optionally signed decimal
-// exponent.  One of the integer part or the fractional part may be elided; one
-// of the decimal point or the exponent may be elided.
-//
-//  float_lit = decimals "." [ decimals ] [ exponent ] |
-//              decimals exponent |
-//              "." decimals [ exponent ] .
-//  decimals  = decimal_digit { decimal_digit } .
-//  exponent  = ( "e" | "E" ) [ "+" | "-" ] decimals .
-//
-// For example
-//
-// 	0.
-// 	72.40
-// 	072.40  // == 72.40
-// 	2.71828
-// 	1.e+0
-// 	6.67428e-11
-// 	1E6
-// 	.25
-// 	.12345E+5
-//
-// Imaginary literals
-//
-// An imaginary literal is a decimal representation of the imaginary part of a
-// complex constant. It consists of a floating-point literal or decimal integer
-// followed by the lower-case letter i.
-//
-//  imaginary_lit = (decimals | float_lit) "i" .
-//
-// For example
-//
-// 	0i
-// 	011i  // == 11i
-// 	0.i
-// 	2.71828i
-// 	1.e+0i
-// 	6.67428e-11i
-// 	1E6i
-// 	.25i
-// 	.12345E+5i
-//
-// Rune literals
-//
-// A rune literal represents a rune constant, an integer value identifying a
-// Unicode code point. A rune literal is expressed as one or more characters
-// enclosed in single quotes. Within the quotes, any character may appear
-// except single quote and newline. A single quoted character represents the
-// Unicode value of the character itself, while multi-character sequences
-// beginning with a backslash encode values in various formats.
-//
-// The simplest form represents the single character within the quotes; since
-// QL statements are Unicode characters encoded in UTF-8, multiple
-// UTF-8-encoded bytes may represent a single integer value. For instance, the
-// literal 'a' holds a single byte representing a literal a, Unicode U+0061,
-// value 0x61, while 'ä' holds two bytes (0xc3 0xa4) representing a literal
-// a-dieresis, U+00E4, value 0xe4.
-//
-// Several backslash escapes allow arbitrary values to be encoded as ASCII
-// text.  There are four ways to represent the integer value as a numeric
-// constant: \x followed by exactly two hexadecimal digits; \u followed by
-// exactly four hexadecimal digits; \U followed by exactly eight hexadecimal
-// digits, and a plain backslash \ followed by exactly three octal digits. In
-// each case the value of the literal is the value represented by the digits in
-// the corresponding base.
-//
-// Although these representations all result in an integer, they have different
-// valid ranges. Octal escapes must represent a value between 0 and 255
-// inclusive.  Hexadecimal escapes satisfy this condition by construction. The
-// escapes \u and \U represent Unicode code points so within them some values
-// are illegal, in particular those above 0x10FFFF and surrogate halves.
-//
-// After a backslash, certain single-character escapes represent special
-// values
-//
-// 	\a   U+0007 alert or bell
-// 	\b   U+0008 backspace
-// 	\f   U+000C form feed
-// 	\n   U+000A line feed or newline
-// 	\r   U+000D carriage return
-// 	\t   U+0009 horizontal tab
-// 	\v   U+000b vertical tab
-// 	\\   U+005c backslash
-// 	\'   U+0027 single quote  (valid escape only within rune literals)
-// 	\"   U+0022 double quote  (valid escape only within string literals)
-//
-// All other sequences starting with a backslash are illegal inside rune
-// literals.
-//
-//  rune_lit         = "'" ( unicode_value | byte_value ) "'" .
-//  unicode_value    = unicode_char | little_u_value | big_u_value | escaped_char .
-//  byte_value       = octal_byte_value | hex_byte_value .
-//  octal_byte_value = `\` octal_digit octal_digit octal_digit .
-//  hex_byte_value   = `\` "x" hex_digit hex_digit .
-//  little_u_value   = `\` "u" hex_digit hex_digit hex_digit hex_digit .
-//  big_u_value      = `\` "U" hex_digit hex_digit hex_digit hex_digit
-//                             hex_digit hex_digit hex_digit hex_digit .
-//  escaped_char     = `\` ( "a" | "b" | "f" | "n" | "r" | "t" | "v" | `\` | "'" | `"` ) .
-//
-// For example
-//
-// 	'a'
-// 	'ä'
-// 	'本'
-// 	'\t'
-// 	'\000'
-// 	'\007'
-// 	'\377'
-// 	'\x07'
-// 	'\xff'
-// 	'\u12e4'
-// 	'\U00101234'
-// 	'aa'         // illegal: too many characters
-// 	'\xa'        // illegal: too few hexadecimal digits
-// 	'\0'         // illegal: too few octal digits
-// 	'\uDFFF'     // illegal: surrogate half
-// 	'\U00110000' // illegal: invalid Unicode code point
-//
-// String literals
-//
-// A string literal represents a string constant obtained from concatenating a
-// sequence of characters. There are two forms: raw string literals and
-// interpreted string literals.
-//
-// Raw string literals are character sequences between back quotes ``. Within
-// the quotes, any character is legal except back quote. The value of a raw
-// string literal is the string composed of the uninterpreted (implicitly
-// UTF-8-encoded) characters between the quotes; in particular, backslashes
-// have no special meaning and the string may contain newlines. Carriage
-// returns inside raw string literals are discarded from the raw string value.
-//
-// Interpreted string literals are character sequences between double quotes
-// "".  The text between the quotes, which may not contain newlines, forms the
-// value of the literal, with backslash escapes interpreted as they are in rune
-// literals (except that \' is illegal and \" is legal), with the same
-// restrictions. The three-digit octal (\nnn) and two-digit hexadecimal (\xnn)
-// escapes represent individual bytes of the resulting string; all other
-// escapes represent the (possibly multi-byte) UTF-8 encoding of individual
-// characters. Thus inside a string literal \377 and \xFF represent a single
-// byte of value 0xFF=255, while ÿ, \u00FF, \U000000FF and \xc3\xbf represent
-// the two bytes 0xc3 0xbf of the UTF-8 encoding of character U+00FF.
-//
-//  string_lit             = raw_string_lit | interpreted_string_lit .
-//  raw_string_lit         = "`" { unicode_char | newline } "`" .
-//  interpreted_string_lit = `"` { unicode_value | byte_value } `"` .
-//
-// For example
-//
-// 	`abc`  // same as "abc"
-// 	`\n
-// 	\n`    // same as "\\n\n\\n"
-// 	"\n"
-// 	""
-// 	"Hello, world!\n"
-// 	"日本語"
-// 	"\u65e5本\U00008a9e"
-// 	"\xff\u00FF"
-// 	"\uD800"       // illegal: surrogate half
-// 	"\U00110000"   // illegal: invalid Unicode code point
-//
-// These examples all represent the same string
-//
-// 	"日本語"                                 // UTF-8 input text
-// 	`日本語`                                 // UTF-8 input text as a raw literal
-// 	"\u65e5\u672c\u8a9e"                    // the explicit Unicode code points
-// 	"\U000065e5\U0000672c\U00008a9e"        // the explicit Unicode code points
-// 	"\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"  // the explicit UTF-8 bytes
-//
-// If the statement source represents a character as two code points, such as a
-// combining form involving an accent and a letter, the result will be an error
-// if placed in a rune literal (it is not a single code point), and will appear
-// as two code points if placed in a string literal.
-//
-// QL parameters
-//
-// Literals are assigned their values from the respective text representation
-// at "compile" (parse) time. QL parameters provide the same functionality as
-// literals, but their value is assigned at execution time from an expression
-// list passed to DB.Run or DB.Execute. Using '?' or '$' is completely
-// equivalent.
-//
-//  ql_parameter = ( "?" | "$" ) "1" … "9" { "0" … "9" } .
-//
-// For example
-//
-// 	SELECT DepartmentID
-// 	FROM department
-// 	WHERE DepartmentID == ?1
-// 	ORDER BY DepartmentName;
-//
-// 	SELECT employee.LastName
-// 	FROM department, employee
-// 	WHERE department.DepartmentID == $1 && employee.LastName > $2
-// 	ORDER BY DepartmentID;
-//
-// Constants
-//
-// Keywords 'false' and 'true' (not case sensitive) represent the two possible
-// constant values of type bool (also not case sensitive).
-//
-// Keyword 'NULL' (not case sensitive) represents an untyped constant which is
-// assignable to any type. NULL is distinct from any other value of any type.
-//
-// Types
-//
-// A type determines the set of values and operations specific to values of
-// that type. A type is specified by a type name.
-//
-//  Type = "bigint"      // http://golang.org/pkg/math/big/#Int
-//       | "bigrat"      // http://golang.org/pkg/math/big/#Rat
-//       | "blob"        // []byte
-//       | "bool"
-//       | "byte"        // alias for uint8
-//       | "complex128"
-//       | "complex64"
-//       | "duration"    // http://golang.org/pkg/time/#Duration
-//       | "float"       // alias for float64
-//       | "float32"
-//       | "float64"
-//       | "int"         // alias for int64
-//       | "int16"
-//       | "int32"
-//       | "int64"
-//       | "int8"
-//       | "rune"        // alias for int32
-//       | "string"
-//       | "time"        // http://golang.org/pkg/time/#Time
-//       | "uint"        // alias for uint64
-//       | "uint16"
-//       | "uint32"
-//       | "uint64"
-//       | "uint8" .
-//
-// Named instances of the boolean, numeric, and string types are keywords. The
-// names are not case sensitive.
-//
-// Note: The blob type is exchanged between the back end and the API as []byte.
-// On 32 bit platforms this limits the size which the implementation can handle
-// to 2G.
-//
-// Boolean types
-//
-// A boolean type represents the set of Boolean truth values denoted by the
-// predeclared constants true and false. The predeclared boolean type is bool.
-//
-// Duration type
-//
-// A duration type represents the elapsed time between two instants as an int64
-// nanosecond count. The representation limits the largest representable
-// duration to approximately 290 years.
-//
-// Numeric types
-//
-// A numeric type represents sets of integer or floating-point values. The
-// predeclared architecture-independent numeric types are
-//
-// 	uint8       the set of all unsigned  8-bit integers (0 to 255)
-// 	uint16      the set of all unsigned 16-bit integers (0 to 65535)
-// 	uint32      the set of all unsigned 32-bit integers (0 to 4294967295)
-// 	uint64      the set of all unsigned 64-bit integers (0 to 18446744073709551615)
-//
-// 	int8        the set of all signed  8-bit integers (-128 to 127)
-// 	int16       the set of all signed 16-bit integers (-32768 to 32767)
-// 	int32       the set of all signed 32-bit integers (-2147483648 to 2147483647)
-// 	int64       the set of all signed 64-bit integers (-9223372036854775808 to 9223372036854775807)
-// 	duration    the set of all signed 64-bit integers (-9223372036854775808 to 9223372036854775807)
-//	bigint      the set of all integers
-//
-//	bigrat      the set of all rational numbers
-//
-// 	float32     the set of all IEEE-754 32-bit floating-point numbers
-// 	float64     the set of all IEEE-754 64-bit floating-point numbers
-//
-// 	complex64   the set of all complex numbers with float32 real and imaginary parts
-// 	complex128  the set of all complex numbers with float64 real and imaginary parts
-//
-// 	byte        alias for uint8
-// 	float       alias for float64
-// 	int         alias for int64
-// 	rune        alias for int32
-// 	uint        alias for uint64
-//
-// The value of an n-bit integer is n bits wide and represented using two's
-// complement arithmetic.
-//
-// Conversions are required when different numeric types are mixed in an
-// expression or assignment.
-//
-// String types
-//
-// A string type represents the set of string values. A string value is a
-// (possibly empty) sequence of bytes. The case insensitive keyword for the
-// string type is 'string'.
-//
-// The length of a string (its size in bytes) can be discovered using the
-// built-in function len.
-//
-// Time types
-//
-// A time type represents an instant in time with nanosecond precision. Each
-// time has associated with it a location, consulted when computing the
-// presentation form of the time.
-//
-// Predeclared functions
-//
-// The following functions are implicitly declared
-//
-//	avg          complex     contains    count       date
-//	day          formatTime  formatFloat formatInt
-//	hasPrefix    hasSuffix   hour        hours       id
-//	imag         len         max         min         minute
-//	minutes      month       nanosecond  nanoseconds now
-//	parseTime    real        second      seconds     since
-//	sum          timeIn      weekday     year        yearDay
-//
-// Expressions
-//
-// An expression specifies the computation of a value by applying operators and
-// functions to operands.
-//
-// Operands
-//
-// Operands denote the elementary values in an expression. An operand may be a
-// literal, a (possibly qualified) identifier denoting a constant or a function
-// or a table/record set column, or a parenthesized expression.
-//
-//  Operand = Literal | QualifiedIdent | "(" Expression ")" .
-//  Literal = "FALSE" | "NULL" | "TRUE"
-//  	| float_lit | imaginary_lit | int_lit | rune_lit | string_lit
-//  	| ql_parameter .
-//
-// Qualified identifiers
-//
-// A qualified identifier is an identifier qualified with a table/record set
-// name prefix.
-//
-//  QualifiedIdent = identifier [ "." identifier ] .
-//
-// For example
-//
-// 	invoice.Num	// might denote column 'Num' from table 'invoice'
-//
-// Primary expressions
-//
-// Primary expression are the operands for unary and binary expressions.
-//
-//  PrimaryExpression = Operand
-//              | Conversion
-//              | PrimaryExpression Index
-//              | PrimaryExpression Slice
-//              | PrimaryExpression Call .
-//
-//  Call  = "(" [ "*" | ExpressionList ] ")" . // * only in count(*).
-//  Index = "[" Expression "]" .
-//  Slice = "[" [ Expression ] ":" [ Expression ] "]" .
-//
-// For example
-//
-// 	x
-// 	2
-// 	(s + ".txt")
-// 	f(3.1415, true)
-// 	s[i : j + 1]
-//
-// Index expressions
-//
-// A primary expression of the form
-//
-// 	s[x]
-//
-// denotes the element of a string indexed by x. Its type is byte. The value x
-// is called the index.  The following rules apply
-//
-// - The index x must be of integer type except bigint or duration; it is in
-// range if 0 <= x < len(s), otherwise it is out of range.
-//
-// - A constant index must be non-negative and representable by a value of type
-// int.
-//
-// - A constant index must be in range if the string a is a literal.
-//
-// - If x is out of range at run time, a run-time error occurs.
-//
-// - s[x] is the byte at index x and the type of s[x] is byte.
-//
-// If s is NULL or x is NULL then the result is NULL.
-//
-// Otherwise s[x] is illegal.
-//
-// Slices
-//
-// For a string, the primary expression
-//
-// 	s[low : high]
-//
-// constructs a substring. The indices low and high select which elements
-// appear in the result. The result has indices starting at 0 and length equal
-// to high - low.
-//
-// For convenience, any of the indices may be omitted. A missing low index
-// defaults to zero; a missing high index defaults to the length of the sliced
-// operand
-//
-// 	s[2:]  // same s[2 : len(s)]
-// 	s[:3]  // same as s[0 : 3]
-// 	s[:]   // same as s[0 : len(s)]
-//
-// The indices low and high are in range if 0 <= low <= high <= len(a),
-// otherwise they are out of range. A constant index must be non-negative and
-// representable by a value of type int. If both indices are constant, they
-// must satisfy low <= high. If the indices are out of range at run time, a
-// run-time error occurs.
-//
-// Integer values of type bigint or duration cannot be used as indices.
-//
-// If s is NULL the result is NULL. If low or high is not omitted and is NULL
-// then the result is NULL.
-//
-// Calls
-//
-// Given an identifier f denoting a predeclared function,
-//
-// 	f(a1, a2, … an)
-//
-// calls f with arguments a1, a2, … an. Arguments are evaluated before the
-// function is called. The type of the expression is the result type of f.
-//
-// 	complex(x, y)
-// 	len(name)
-//
-// In a function call, the function value and arguments are evaluated in the
-// usual order. After they are evaluated, the parameters of the call are passed
-// by value to the function and the called function begins execution. The
-// return value of the function is passed by value when the function returns.
-//
-// Calling an undefined function causes a compile-time error.
-//
-// Operators
-//
-// Operators combine operands into expressions.
-//
-//  Expression = Term { ( oror | "OR" ) Term } .
-//
-//  ExpressionList = Expression { "," Expression } [ "," ].
-//  Factor =  PrimaryFactor  { ( ge | ">" | le | "<" | neq | eq | "LIKE" ) PrimaryFactor } [ Predicate ] .
-//  PrimaryFactor = PrimaryTerm  { ( "^" | "|" | "-" | "+" ) PrimaryTerm } .
-//  PrimaryTerm = UnaryExpr { ( andnot | "&" | lsh | rsh | "%" | "/" | "*" ) UnaryExpr } .
-//  Term = Factor { ( andand | "AND" ) Factor } .
-//  UnaryExpr = [ "^" | "!" | "-" | "+" ] PrimaryExpression .
-//
-// Comparisons are discussed elsewhere. For other binary operators, the operand
-// types must be identical unless the operation involves shifts or untyped
-// constants. For operations involving constants only, see the section on
-// constant expressions.
-//
-// Except for shift operations, if one operand is an untyped constant and the
-// other operand is not, the constant is converted to the type of the other
-// operand.
-//
-// The right operand in a shift expression must have unsigned integer type or
-// be an untyped constant that can be converted to unsigned integer type. If
-// the left operand of a non-constant shift expression is an untyped constant,
-// the type of the constant is what it would be if the shift expression were
-// replaced by its left operand alone.
-//
-// Pattern matching
-//
-// Expressions of the form
-//
-//	expr1 LIKE expr2
-//
-// yeild a boolean value true if expr2, a regular expression, matches expr1
-// (see also [6]).  Both expression must be of type string. If any one of the
-// expressions is NULL the result is NULL.
-//
-// Predicates
-//
-// Predicates are special form expressions having a boolean result type.
-//
-// Expressions of the form
-//
-//	expr IN ( expr1, expr2, expr3, ... )		// case A
-//
-//	expr NOT IN ( expr1, expr2, expr3, ... )	// case B
-//
-// are equivalent, including NULL handling, to
-//
-//	expr == expr1 || expr == expr2 || expr == expr3 || ...	// case A
-//
-//	expr != expr1 && expr != expr2 && expr != expr3 && ...	// case B
-//
-// The types of involved expressions must be comparable as defined in
-// "Comparison operators".
-//
-// Another form of the IN predicate creates the expression list from a result
-// of a SelectStmt.
-//
-//	DELETE FROM t WHERE id() IN (SELECT id_t FROM u WHERE inactive_days > 365)
-//
-// The SelectStmt must select only one column. The produced expression list is
-// resource limited by the memory available to the process. NULL values
-// produced by the SelectStmt are ignored, but if all records of the SelectStmt
-// are NULL the predicate yields NULL. The select statement is evaluated only
-// once. If the type of expr is not the same as the type of the field returned
-// by the SelectStmt then the set operation yields false. The type of the
-// column returned by the SelectStmt must be one of the simple (non blob-like)
-// types:
-//
-//	bool
-//	byte         // alias uint8
-//	complex128
-//	complex64
-//	float        // alias float64
-//	float32
-//	float64
-//	int          // alias int64
-//	int16
-//	int32
-//	int64
-//	int8
-//	rune         // alias int32
-//	string
-//	uint         // alias uint64
-//	uint16
-//	uint32
-//	uint64
-//	uint8
-//
-// Expressions of the form
-//
-//	expr BETWEEN low AND high	// case A
-//
-//	expr NOT BETWEEN low AND high	// case B
-//
-// are equivalent, including NULL handling, to
-//
-//	expr >= low && expr <= high	// case A
-//
-//	expr < low || expr > high	// case B
-//
-// The types of involved expressions must be ordered as defined in "Comparison
-// operators".
-//
-//  Predicate = (
-//  			[ "NOT" ] (
-//  			  "IN" "(" ExpressionList ")"
-//  			| "IN" "(" SelectStmt [ ";" ] ")"
-//  			| "BETWEEN" PrimaryFactor "AND" PrimaryFactor
-//  			)
-//              |       "IS" [ "NOT" ] "NULL"
-//  	).
-//
-// Expressions of the form
-//
-//	expr IS NULL		// case A
-//
-//	expr IS NOT NULL	// case B
-//
-// yeild a boolean value true if expr does not have a specific type (case A) or
-// if expr has a specific type (case B). In other cases the result is a boolean
-// value false.
-//
-// Operator precedence
-//
-// Unary operators have the highest precedence.
-//
-// There are five precedence levels for binary operators. Multiplication
-// operators bind strongest, followed by addition operators, comparison
-// operators, && (logical AND), and finally || (logical OR)
-//
-// 	Precedence    Operator
-// 	    5             *  /  %  <<  >>  &  &^
-// 	    4             +  -  |  ^
-// 	    3             ==  !=  <  <=  >  >=
-// 	    2             &&
-// 	    1             ||
-//
-// Binary operators of the same precedence associate from left to right. For
-// instance, x / y * z is the same as (x / y) * z.
-//
-// 	+x
-// 	23 + 3*x[i]
-// 	x <= f()
-// 	^a >> b
-// 	f() || g()
-// 	x == y+1 && z > 0
-//
-// Note that the operator precedence is reflected explicitly by the grammar.
-//
-// Arithmetic operators
-//
-// Arithmetic operators apply to numeric values and yield a result of the same
-// type as the first operand. The four standard arithmetic operators (+, -, *,
-// /) apply to integer, rational, floating-point, and complex types; + also
-// applies to strings; +,- also applies to times.  All other arithmetic
-// operators apply to integers only.
-//
-// 	+    sum                    integers, rationals, floats, complex values, strings
-// 	-    difference             integers, rationals, floats, complex values, times
-// 	*    product                integers, rationals, floats, complex values
-// 	/    quotient               integers, rationals, floats, complex values
-// 	%    remainder              integers
-//
-// 	&    bitwise AND            integers
-// 	|    bitwise OR             integers
-// 	^    bitwise XOR            integers
-// 	&^   bit clear (AND NOT)    integers
-//
-// 	<<   left shift             integer << unsigned integer
-// 	>>   right shift            integer >> unsigned integer
-//
-// Strings can be concatenated using the + operator
-//
-// 	"hi" + string(c) + " and good bye"
-//
-// String addition creates a new string by concatenating the operands.
-//
-// A value of type duration can be added to or subtracted from a value of type time.
-//
-//	now() + duration("1h")	// time after 1 hour from now
-//	duration("1h") + now()	// time after 1 hour from now
-//	now() - duration("1h")	// time before 1 hour from now
-//	duration("1h") - now()	// illegal, negative times do not exist
-//
-// Times can subtracted from each other producing a value of type duration.
-//
-//	now() - t0	// elapsed time since t0
-//	now() + now()	// illegal, operator + not defined for times
-//
-// For two integer values x and y, the integer quotient q = x / y and remainder
-// r = x % y satisfy the following relationships
-//
-// 	x = q*y + r  and  |r| < |y|
-//
-// with x / y truncated towards zero ("truncated division").
-//
-// 	 x     y     x / y     x % y
-// 	 5     3       1         2
-// 	-5     3      -1        -2
-// 	 5    -3      -1         2
-// 	-5    -3       1        -2
-//
-// As an exception to this rule, if the dividend x is the most negative value
-// for the int type of x, the quotient q = x / -1 is equal to x (and r = 0).
-//
-// 				 x, q
-// 	int8                     -128
-// 	int16                  -32768
-// 	int32             -2147483648
-// 	int64    -9223372036854775808
-//
-// If the divisor is a constant expression, it must not be zero. If the divisor
-// is zero at run time, a run-time error occurs. If the dividend is
-// non-negative and the divisor is a constant power of 2, the division may be
-// replaced by a right shift, and computing the remainder may be replaced by a
-// bitwise AND operation
-//
-// 	 x     x / 4     x % 4     x >> 2     x & 3
-// 	 11      2         3         2          3
-// 	-11     -2        -3        -3          1
-//
-// The shift operators shift the left operand by the shift count specified by
-// the right operand. They implement arithmetic shifts if the left operand is a
-// signed integer and logical shifts if it is an unsigned integer. There is no
-// upper limit on the shift count. Shifts behave as if the left operand is
-// shifted n times by 1 for a shift count of n. As a result, x << 1 is the same
-// as x*2 and x >> 1 is the same as x/2 but truncated towards negative
-// infinity.
-//
-// For integer operands, the unary operators +, -, and ^ are defined as follows
-//
-// 	+x                          is 0 + x
-// 	-x    negation              is 0 - x
-// 	^x    bitwise complement    is m ^ x  with m = "all bits set to 1" for unsigned x
-// 	                                      and  m = -1 for signed x
-//
-// For floating-point and complex numbers, +x is the same as x, while -x is the
-// negation of x. The result of a floating-point or complex division by zero is
-// not specified beyond the IEEE-754 standard; whether a run-time error occurs
-// is implementation-specific.
-//
-// Whenever any operand of any arithmetic operation, unary or binary, is NULL,
-// as well as in the case of the string concatenating operation, the result is
-// NULL.
-//
-//	42*NULL		// the result is NULL
-//	NULL/x		// the result is NULL
-//	"foo"+NULL	// the result is NULL
-//
-// Integer overflow
-//
-// For unsigned integer values, the operations +, -, *, and << are computed
-// modulo 2n, where n is the bit width of the unsigned integer's type. Loosely
-// speaking, these unsigned integer operations discard high bits upon overflow,
-// and expressions may rely on ``wrap around''.
-//
-// For signed integers with a finite bit width, the operations +, -, *, and <<
-// may legally overflow and the resulting value exists and is deterministically
-// defined by the signed integer representation, the operation, and its
-// operands. No exception is raised as a result of overflow. An evaluator may
-// not optimize an expression under the assumption that overflow does not
-// occur. For instance, it may not assume that x < x + 1 is always true.
-//
-// Integers of type bigint and rationals do not overflow but their handling is
-// limited by the memory resources available to the program.
-//
-// Comparison operators
-//
-// Comparison operators compare two operands and yield a boolean value.
-//
-// 	==    equal
-// 	!=    not equal
-// 	<     less
-// 	<=    less or equal
-// 	>     greater
-// 	>=    greater or equal
-//
-// In any comparison, the first operand must be of same type as is the second
-// operand, or vice versa.
-//
-// The equality operators == and != apply to operands that are comparable. The
-// ordering operators <, <=, >, and >= apply to operands that are ordered.
-// These terms and the result of the comparisons are defined as follows
-//
-// - Boolean values are comparable. Two boolean values are equal if they are
-// either both true or both false.
-//
-// - Complex values are comparable. Two complex values u and v are equal if
-// both real(u) == real(v) and imag(u) == imag(v).
-//
-// - Integer values are comparable and ordered, in the usual way. Note that
-// durations are integers.
-//
-// - Floating point values are comparable and ordered, as defined by the
-// IEEE-754 standard.
-//
-// - Rational values are comparable and ordered, in the usual way.
-//
-// - String values are comparable and ordered, lexically byte-wise.
-//
-// - Time values are comparable and ordered.
-//
-// Whenever any operand of any comparison operation is NULL, the result is
-// NULL.
-//
-// Note that slices are always of type string.
-//
-// Logical operators
-//
-// Logical operators apply to boolean values and yield a boolean result. The
-// right operand is evaluated conditionally.
-//
-// 	&&    conditional AND    p && q  is  "if p then q else false"
-// 	||    conditional OR     p || q  is  "if p then true else q"
-// 	!     NOT                !p      is  "not p"
-//
-// The truth tables for logical operations with NULL values
-//
-// 	+-------+-------+---------+---------+
-// 	|   p   |   q   |  p || q |  p && q |
-// 	+-------+-------+---------+---------+
-// 	| true  | true  | *true   |  true   |
-// 	| true  | false | *true   |  false  |
-// 	| true  | NULL  | *true   |  NULL   |
-// 	| false | true  |  true   | *false  |
-// 	| false | false |  false  | *false  |
-// 	| false | NULL  |  NULL   | *false  |
-// 	| NULL  | true  |  true   |  NULL   |
-// 	| NULL  | false |  NULL   |  false  |
-// 	| NULL  | NULL  |  NULL   |  NULL   |
-// 	+-------+-------+---------+---------+
-// 	 * indicates q is not evaluated.
-//
-// 	+-------+-------+
-// 	|   p   |  !p   |
-// 	+-------+-------+
-// 	| true  | false |
-// 	| false | true  |
-// 	| NULL  | NULL  |
-// 	+-------+-------+
-//
-// Conversions
-//
-// Conversions are expressions of the form T(x) where T is a type and x is an
-// expression that can be converted to type T.
-//
-//  Conversion = Type "(" Expression ")" .
-//
-// A constant value x can be converted to type T in any of these cases:
-//
-// - x is representable by a value of type T.
-//
-// - x is a floating-point constant, T is a floating-point type, and x is
-// representable by a value of type T after rounding using IEEE 754
-// round-to-even rules. The constant T(x) is the rounded value.
-//
-// - x is an integer constant and T is a string type. The same rule as for
-// non-constant x applies in this case.
-//
-// Converting a constant yields a typed constant as result.
-//
-// 	float32(2.718281828)     // 2.718281828 of type float32
-// 	complex128(1)            // 1.0 + 0.0i of type complex128
-// 	float32(0.49999999)      // 0.5 of type float32
-// 	string('x')              // "x" of type string
-// 	string(0x266c)           // "♬" of type string
-// 	"foo" + "bar"            // "foobar"
-// 	int(1.2)                 // illegal: 1.2 cannot be represented as an int
-// 	string(65.0)             // illegal: 65.0 is not an integer constant
-//
-// A non-constant value x can be converted to type T in any of these cases:
-//
-// - x has type T.
-//
-// - x's type and T are both integer or floating point types.
-//
-// - x's type and T are both complex types.
-//
-// - x is an integer, except bigint or duration, and T is a string type.
-//
-// Specific rules apply to (non-constant) conversions between numeric types or
-// to and from a string type. These conversions may change the representation
-// of x and incur a run-time cost. All other conversions only change the type
-// but not the representation of x.
-//
-// A conversion of NULL to any type yields NULL.
-//
-// Conversions between numeric types
-//
-// For the conversion of non-constant numeric values, the following rules
-// apply
-//
-// 1. When converting between integer types, if the value is a signed integer,
-// it is sign extended to implicit infinite precision; otherwise it is zero
-// extended.  It is then truncated to fit in the result type's size. For
-// example, if v == uint16(0x10F0), then uint32(int8(v)) == 0xFFFFFFF0. The
-// conversion always yields a valid value; there is no indication of overflow.
-//
-// 2. When converting a floating-point number to an integer, the fraction is
-// discarded (truncation towards zero).
-//
-// 3. When converting an integer or floating-point number to a floating-point
-// type, or a complex number to another complex type, the result value is
-// rounded to the precision specified by the destination type. For instance,
-// the value of a variable x of type float32 may be stored using additional
-// precision beyond that of an IEEE-754 32-bit number, but float32(x)
-// represents the result of rounding x's value to 32-bit precision. Similarly,
-// x + 0.1 may use more than 32 bits of precision, but float32(x + 0.1) does
-// not.
-//
-// In all non-constant conversions involving floating-point or complex values,
-// if the result type cannot represent the value the conversion succeeds but
-// the result value is implementation-dependent.
-//
-// Conversions to and from a string type
-//
-// 1. Converting a signed or unsigned integer value to a string type yields a
-// string containing the UTF-8 representation of the integer. Values outside
-// the range of valid Unicode code points are converted to "\uFFFD".
-//
-// 	string('a')       // "a"
-// 	string(-1)        // "\ufffd" == "\xef\xbf\xbd"
-// 	string(0xf8)      // "\u00f8" == "ø" == "\xc3\xb8"
-// 	string(0x65e5)    // "\u65e5" == "日" == "\xe6\x97\xa5"
-//
-// 2. Converting a blob to a string type yields a string whose successive bytes
-// are the elements of the blob.
-//
-//	string(b /* []byte{'h', 'e', 'l', 'l', '\xc3', '\xb8'} */)   // "hellø"
-//	string(b /* []byte{} */)                                     // ""
-//	string(b /* []byte(nil) */)                                  // ""
-//
-// 3. Converting a value of a string type to a blob yields a blob whose
-// successive elements are the bytes of the string.
-//
-//	blob("hellø")   // []byte{'h', 'e', 'l', 'l', '\xc3', '\xb8'}
-//	blob("")        // []byte{}
-//
-// 4. Converting a value of a bigint type to a string yields a string
-// containing the decimal decimal representation of the integer.
-//
-//	string(M9)	// "2305843009213693951"
-//
-// 5. Converting a value of a string type to a bigint yields a bigint value
-// containing the integer represented by the string value. A prefix of “0x” or
-// “0X” selects base 16; the “0” prefix selects base 8, and a “0b” or “0B”
-// prefix selects base 2. Otherwise the value is interpreted in base 10. An
-// error occurs if the string value is not in any valid format.
-//
-//	bigint("2305843009213693951")		// M9
-//	bigint("0x1ffffffffffffffffffffff")	// M10 == 2^89-1
-//
-// 6. Converting a value of a rational type to a string yields a string
-// containing the decimal decimal representation of the rational in the form
-// "a/b" (even if b == 1).
-//
-//	string(bigrat(355)/bigrat(113))	// "355/113"
-//
-// 7. Converting a value of a string type to a bigrat yields a bigrat value
-// containing the rational represented by the string value. The string can be
-// given as a fraction "a/b" or as a floating-point number optionally followed
-// by an exponent. An error occurs if the string value is not in any valid
-// format.
-//
-//	bigrat("1.2e-34")
-//	bigrat("355/113")
-//
-// 8. Converting a value of a duration type to a string returns a string
-// representing the duration in the form "72h3m0.5s". Leading zero units are
-// omitted. As a special case, durations less than one second format using a
-// smaller unit (milli-, micro-, or nanoseconds) to ensure that the leading
-// digit is non-zero. The zero duration formats as 0, with no unit.
-//
-//	string(elapsed)	// "1h", for example
-//
-// 9. Converting a string value to a duration yields a duration represented by
-// the string.  A duration string is a possibly signed sequence of decimal
-// numbers, each with optional fraction and a unit suffix, such as "300ms",
-// "-1.5h" or "2h45m". Valid time units are "ns", "us" (or "µs"), "ms", "s",
-// "m", "h".
-//
-//	duration("1m")	// http://golang.org/pkg/time/#Minute
-//
-// 10. Converting a time value to a string returns the time formatted using the
-// format string
-//
-//	"2006-01-02 15:04:05.999999999 -0700 MST"
-//
-// Order of evaluation
-//
-// When evaluating the operands of an expression or of function calls,
-// operations are evaluated in lexical left-to-right order.
-//
-// For example, in the evaluation of
-//
-// 	g(h(), i()+x[j()], c)
-//
-// the function calls and evaluation of c happen in the order h(), i(), j(), c.
-//
-// Floating-point operations within a single expression are evaluated according
-// to the associativity of the operators. Explicit parentheses affect the
-// evaluation by overriding the default associativity. In the expression x + (y
-// + z) the addition y + z is performed before adding x.
-//
-// Statements
-//
-// Statements control execution.
-//
-//  Statement =  EmptyStmt | AlterTableStmt | BeginTransactionStmt | CommitStmt
-//  	| CreateIndexStmt | CreateTableStmt | DeleteFromStmt | DropIndexStmt
-//  	| DropTableStmt | InsertIntoStmt | RollbackStmt | SelectStmt
-//  	| TruncateTableStmt | UpdateStmt | ExplainStmt.
-//
-//  StatementList = Statement { ";" Statement } .
-//
-// Empty statements
-//
-// The empty statement does nothing.
-//
-//  EmptyStmt = .
-//
-// ALTER TABLE
-//
-// Alter table statements modify existing tables.  With the ADD clause it adds
-// a new column to the table. The column must not exist. With the DROP clause
-// it removes an existing column from a table. The column must exist and it
-// must be not the only (last) column of the table. IOW, there cannot be a
-// table with no columns.
-//
-//  AlterTableStmt = "ALTER" "TABLE" TableName ( "ADD" ColumnDef | "DROP" "COLUMN"  ColumnName ) .
-//
-// For example
-//
-//	BEGIN TRANSACTION;
-// 		ALTER TABLE Stock ADD Qty int;
-// 		ALTER TABLE Income DROP COLUMN Taxes;
-//	COMMIT;
-//
-// When adding a column to a table with existing data, the constraint clause of
-// the ColumnDef cannot be used. Adding a constrained column to an empty table
-// is fine.
-//
-// BEGIN TRANSACTION
-//
-// Begin transactions statements introduce a new transaction level. Every
-// transaction level must be eventually balanced by exactly one of COMMIT or
-// ROLLBACK statements. Note that when a transaction is roll-backed because of
-// a statement failure then no explicit balancing of the respective BEGIN
-// TRANSACTION is statement is required nor permitted.
-//
-// Failure to properly balance any opened transaction level may cause dead
-// locks and/or lose of data updated in the uppermost opened but never properly
-// closed transaction level.
-//
-//  BeginTransactionStmt = "BEGIN" "TRANSACTION" .
-//
-// For example
-//
-//	BEGIN TRANSACTION;
-//		INSERT INTO foo VALUES (42, 3.14);
-//		INSERT INTO foo VALUES (-1, 2.78);
-//	COMMIT;
-//
-// Mandatory transactions
-//
-// A database cannot be updated (mutated) outside of a transaction. Statements
-// requiring a transaction
-//
-//	ALTER TABLE
-//	COMMIT
-//	CREATE INDEX
-//	CREATE TABLE
-//	DELETE FROM
-//	DROP INDEX
-//	DROP TABLE
-//	INSERT INTO
-//	ROLLBACK
-//	TRUNCATE TABLE
-//	UPDATE
-//
-// A database is effectively read only outside of a transaction. Statements not
-// requiring a transaction
-//
-//	BEGIN TRANSACTION
-//	SELECT FROM
-//
-// COMMIT
-//
-// The commit statement closes the innermost transaction nesting level. If
-// that's the outermost level then the updates to the DB made by the
-// transaction are atomically made persistent.
-//
-//  CommitStmt = "COMMIT" .
-//
-// For example
-//
-//	BEGIN TRANSACTION;
-//		INSERT INTO AccountA (Amount) VALUES ($1);
-//		INSERT INTO AccountB (Amount) VALUES (-$1);
-//	COMMIT;
-//
-// CREATE INDEX
-//
-// Create index statements create new indices. Index is a named projection of
-// ordered values of a table column to the respective records. As a special
-// case the id() of the record can be indexed. Index name must not be the same
-// as any of the existing tables and it also cannot be the same as of any
-// column name of the table the index is on.
-//
-//  CreateIndexStmt = "CREATE" [ "UNIQUE" ] "INDEX" [ "IF" "NOT" "EXISTS" ]
-//  	IndexName "ON" TableName "(" ExpressionList ")" .
-//
-// For example
-//
-//	BEGIN TRANSACTION;
-//		CREATE TABLE Orders (CustomerID int, Date time);
-//		CREATE INDEX OrdersID ON Orders (id());
-//		CREATE INDEX OrdersDate ON Orders (Date);
-//		CREATE TABLE Items (OrderID int, ProductID int, Qty int);
-//		CREATE INDEX ItemsOrderID ON Items (OrderID);
-//	COMMIT;
-//
-// Now certain SELECT statements may use the indices to speed up joins and/or
-// to speed up record set filtering when the WHERE clause is used; or the
-// indices might be used to improve the performance when the ORDER BY clause is
-// present.
-//
-// The UNIQUE modifier requires the indexed values tuple to be index-wise
-// unique or have all values NULL.
-//
-// The optional IF NOT EXISTS clause makes the statement a no operation if the
-// index already exists.
-//
-// Simple index
-//
-// A simple index consists of only one expression which must be either a column
-// name or the built-in id().
-//
-// Expression list index
-//
-// A more complex and more general index is one that consists of more than one
-// expression or its single expression does not qualify as a simple index. In
-// this case the type of all expressions in the list must be one of the non
-// blob-like types.
-//
-// Note: Blob-like types are blob, bigint, bigrat, time and duration.
-//
-// CREATE TABLE
-//
-// Create table statements create new tables. A column definition declares the
-// column name and type. Table names and column names are case sensitive.
-// Neither a table or an index of the same name may exist in the DB.
-//
-//  CreateTableStmt = "CREATE" "TABLE" [ "IF" "NOT" "EXISTS" ] TableName
-//  	"(" ColumnDef { "," ColumnDef } [ "," ] ")" .
-//
-//  ColumnDef = ColumnName Type [ "NOT" "NULL" | Expression ] [ "DEFAULT" Expression ] .
-//  ColumnName = identifier .
-//  TableName = identifier .
-//
-// For example
-//
-//	BEGIN TRANSACTION;
-// 		CREATE TABLE department (
-// 			DepartmentID   int,
-// 			DepartmentName string,
-// 		);
-// 		CREATE TABLE employee (
-// 			LastName	string,
-// 			DepartmentID	int,
-// 		);
-//	COMMIT;
-//
-// The optional IF NOT EXISTS clause makes the statement a no operation if the
-// table already exists.
-//
-// The optional constraint clause has two forms. The first one is found in many
-// SQL dialects.
-//
-//	BEGIN TRANSACTION;
-// 		CREATE TABLE department (
-// 			DepartmentID   int,
-// 			DepartmentName string NOT NULL,
-// 		);
-//	COMMIT;
-//
-// This form prevents the data in column DepartmentName to be NULL.
-//
-// The second form allows an arbitrary boolean expression to be used to
-// validate the column. If the value of the expression is true then the
-// validation succeeded. If the value of the expression is false or NULL then
-// the validation fails. If the value of the expression is not of type bool an
-// error occurs.
-//
-//	BEGIN TRANSACTION;
-// 		CREATE TABLE department (
-// 			DepartmentID   int,
-// 			DepartmentName string DepartmentName IN ("HQ", "R/D", "Lab", "HR"),
-// 		);
-//	COMMIT;
-//
-//	BEGIN TRANSACTION;
-// 		CREATE TABLE t (
-//			TimeStamp time TimeStamp < now() && since(TimeStamp) < duration("10s"),
-//			Event string Event != "" && Event like "[0-9]+:[ \t]+.*",
-//		);
-//	COMMIT;
-//
-// The optional DEFAULT clause is an expression which, if present, is
-// substituted instead of a NULL value when the colum is assigned a value.
-//
-//	BEGIN TRANSACTION;
-// 		CREATE TABLE department (
-// 			DepartmentID   int,
-// 			DepartmentName string DepartmentName IN ("HQ", "R/D", "Lab", "HR") DEFAULT "HQ",
-// 		);
-//	COMMIT;
-//
-// Note that the constraint and/or default expressions may refer to other
-// columns by name:
-//
-//	BEGIN TRANSACTION;
-//		CREATE TABLE t (
-//			a int,
-//			b int b > a && b < c DEFAULT (a+c)/2,
-//			c int,
-//	);
-//	COMMIT;
-//
-//
-// Constraints and defaults
-//
-// When a table row is inserted by the INSERT INTO statement or when a table
-// row is updated by the UPDATE statement, the order of operations is as
-// follows:
-//
-// 1. The new values of the affected columns are set and the values of all the
-// row columns become the named values which can be referred to in default
-// expressions evaluated in step 2.
-//
-// 2. If any row column value is NULL and the DEFAULT clause is present in the
-// column's definition, the default expression is evaluated and its value is
-// set as the respective column value.
-//
-// 3. The values, potentially updated, of row columns become the named values
-// which can be referred to in constraint expressions evaluated during step 4.
-//
-// 4. All row columns which definition has the constraint clause present will
-// have that constraint checked. If any constraint violation is detected, the
-// overall operation fails and no changes to the table are made.
-//
-// DELETE FROM
-//
-// Delete from statements remove rows from a table, which must exist.
-//
-//  DeleteFromStmt = "DELETE" "FROM" TableName [ WhereClause ] .
-//
-// For example
-//
-//	BEGIN TRANSACTION;
-//		DELETE FROM DepartmentID
-//		WHERE DepartmentName == "Ponies";
-//	COMMIT;
-//
-// If the WHERE clause is not present then all rows are removed and the
-// statement is equivalent to the TRUNCATE TABLE statement.
-//
-// DROP INDEX
-//
-// Drop index statements remove indices from the DB. The index must exist.
-//
-//  DropIndexStmt = "DROP" "INDEX" [ "IF" "EXISTS" ] IndexName .
-//  IndexName = identifier .
-//
-// For example
-//
-//	BEGIN TRANSACTION;
-//		DROP INDEX ItemsOrderID;
-//	COMMIT;
-//
-// The optional IF EXISTS clause makes the statement a no operation if the
-// index does not exist.
-//
-// DROP TABLE
-//
-// Drop table statements remove tables from the DB. The table must exist.
-//
-//  DropTableStmt = "DROP" "TABLE" [ "IF" "EXISTS" ] TableName .
-//
-// For example
-//
-//	BEGIN TRANSACTION;
-// 		DROP TABLE Inventory;
-//	COMMIT;
-//
-// The optional IF EXISTS clause makes the statement a no operation if the
-// table does not exist.
-//
-// INSERT INTO
-//
-// Insert into statements insert new rows into tables. New rows come from
-// literal data, if using the VALUES clause, or are a result of select
-// statement. In the later case the select statement is fully evaluated before
-// the insertion of any rows is performed, allowing to insert values calculated
-// from the same table rows are to be inserted into. If the ColumnNameList part
-// is omitted then the number of values inserted in the row must be the same as
-// are columns in the table. If the ColumnNameList part is present then the
-// number of values per row must be same as the same number of column names.
-// All other columns of the record are set to NULL.  The type of the value
-// assigned to a column must be the same as is the column's type or the value
-// must be NULL.
-//
-//  InsertIntoStmt = "INSERT" "INTO" TableName [ "(" ColumnNameList ")" ] ( Values | SelectStmt ) .
-//
-//  ColumnNameList = ColumnName { "," ColumnName } [ "," ] .
-//  Values = "VALUES" "(" ExpressionList ")" { "," "(" ExpressionList ")" } [ "," ] .
-//
-// For example
-//
-//	BEGIN TRANSACTION;
-// 		INSERT INTO department (DepartmentID) VALUES (42);
-//
-// 		INSERT INTO department (
-// 			DepartmentName,
-// 			DepartmentID,
-// 		)
-// 		VALUES (
-// 			"R&D",
-// 			42,
-// 		);
-//
-// 		INSERT INTO department VALUES
-//			(42, "R&D"),
-//			(17, "Sales"),
-// 		;
-//	COMMIT;
-//
-//	BEGIN TRANSACTION;
-//		INSERT INTO department (DepartmentName, DepartmentID)
-//		SELECT DepartmentName+"/headquarters", DepartmentID+1000
-//		FROM department;
-//	COMMIT;
-//
-// If any of the columns of the table were defined using the optional
-// constraints clause or the optional defaults clause then those are processed
-// on a per row basis. The details are discussed in the "Constraints and
-// defaults" chapter below the CREATE TABLE statement documentation.
-//
-// Explain statement
-//
-// Explain statement produces a recordset consisting of lines of text which
-// describe the execution plan of a statement, if any.
-//
-//  ExplainStmt = "EXPLAIN" Statement .
-//
-// For example, the QL tool treats the explain statement specially and outputs
-// the joined lines:
-//
-//	$ ql 'create table t(i int); create table u(j int)'
-//	$ ql 'explain select * from t, u where t.i > 42 && u.j < 314'
-//	┌Compute Cartesian product of
-//	│   ┌Iterate all rows of table "t"
-//	│   └Output field names ["i"]
-//	│   ┌Iterate all rows of table "u"
-//	│   └Output field names ["j"]
-//	└Output field names ["t.i" "u.j"]
-//	┌Filter on t.i > 42 && u.j < 314
-//	│Possibly useful indices
-//	│CREATE INDEX xt_i ON t(i);
-//	│CREATE INDEX xu_j ON u(j);
-//	└Output field names ["t.i" "u.j"]
-//	$ ql 'CREATE INDEX xt_i ON t(i); CREATE INDEX xu_j ON u(j);'
-//	$ ql 'explain select * from t, u where t.i > 42 && u.j < 314'
-//	┌Compute Cartesian product of
-//	│   ┌Iterate all rows of table "t" using index "xt_i" where i > 42
-//	│   └Output field names ["i"]
-//	│   ┌Iterate all rows of table "u" using index "xu_j" where j < 314
-//	│   └Output field names ["j"]
-//	└Output field names ["t.i" "u.j"]
-//	$ ql 'explain select * from t where i > 12 and i between 10 and 20 and i < 42'
-//	┌Iterate all rows of table "t" using index "xt_i" where i > 12 && i <= 20
-//	└Output field names ["i"]
-//	$
-//
-// The explanation may aid in uderstanding how a statement/query would be
-// executed and if indices are used as expected - or which indices may possibly
-// improve the statement performance.  The create index statements above were
-// directly copy/pasted in the terminal from the suggestions provided by the
-// filter recordset pipeline part returned by the explain statement.
-//
-// If the statement has nothing special in its plan, the result is the original
-// statement.
-//
-//	$ ql 'explain delete from t where 42 < i'
-//	DELETE FROM t WHERE i > 42;
-//	$
-//
-// To get an explanation of the select statement of the IN predicate, use the EXPLAIN
-// statement with that particular select statement.
-//
-//	$ ql 'explain select * from t where i in (select j from u where j > 0)'
-//	┌Iterate all rows of table "t"
-//	└Output field names ["i"]
-//	┌Filter on i IN (SELECT j FROM u WHERE j > 0;)
-//	└Output field names ["i"]
-//	$ ql 'explain select j from u where j > 0'
-//	┌Iterate all rows of table "u" using index "xu_j" where j > 0
-//	└Output field names ["j"]
-//	$
-//
-// ROLLBACK
-//
-// The rollback statement closes the innermost transaction nesting level
-// discarding any updates to the DB made by it. If that's the outermost level
-// then the effects on the DB are as if the transaction never happened.
-//
-//  RollbackStmt = "ROLLBACK" .
-//
-// For example
-//
-//	// First statement list
-//	BEGIN TRANSACTION
-//		SELECT * INTO tmp FROM foo;
-//		INSERT INTO tmp SELECT * from bar;
-//		SELECT * from tmp;
-//
-// The (temporary) record set from the last statement is returned and can be
-// processed by the client.
-//
-//	// Second statement list
-//	ROLLBACK;
-//
-// In this case the rollback is the same as 'DROP TABLE tmp;' but it can be a
-// more complex operation.
-//
-// SELECT FROM
-//
-// Select from statements produce recordsets. The optional DISTINCT modifier
-// ensures all rows in the result recordset are unique. Either all of the
-// resulting fields are returned ('*') or only those named in FieldList.
-//
-// RecordSetList is a list of table names or parenthesized select statements,
-// optionally (re)named using the AS clause.
-//
-// The result can be filtered using a WhereClause and orderd by the OrderBy
-// clause.
-//
-//  SelectStmt = "SELECT" [ "DISTINCT" ] ( "*" | FieldList ) "FROM" RecordSetList
-//  	[ JoinClause ] [ WhereClause ] [ GroupByClause ] [ OrderBy ] [ Limit ] [ Offset ].
-//
-//  JoinClause = ( "LEFT" | "RIGHT" | "FULL" ) [ "OUTER" ] "JOIN" RecordSet "ON" Expression .
-//
-//  RecordSet = ( TableName | "(" SelectStmt [ ";" ] ")" ) [ "AS" identifier ] .
-//  RecordSetList = RecordSet { "," RecordSet } [ "," ] .
-//
-// For example
-//
-// 	SELECT * FROM Stock;
-//
-// 	SELECT DepartmentID
-// 	FROM department
-// 	WHERE DepartmentID == 42
-// 	ORDER BY DepartmentName;
-//
-// 	SELECT employee.LastName
-// 	FROM department, employee
-// 	WHERE department.DepartmentID == employee.DepartmentID
-// 	ORDER BY DepartmentID;
-//
-// If Recordset is a nested, parenthesized SelectStmt then it must be given a
-// name using the AS clause if its field are to be accessible in expressions.
-//
-// 	SELECT a.b, c.d
-// 	FROM
-// 		x AS a,
-// 		(
-// 			SELECT * FROM y;
-// 		) AS c
-//	WHERE a.e > c.e;
-//
-// Fields naming rules
-//
-// A field is an named expression. Identifiers, not used as a type in
-// conversion or a function name in the Call clause, denote names of (other)
-// fields, values of which should be used in the expression.
-//
-//  Field = Expression [ "AS" identifier ] .
-//
-// The expression can be named using the AS clause.  If the AS clause is not
-// present and the expression consists solely of a field name, then that field
-// name is used as the name of the resulting field. Otherwise the field is
-// unnamed.
-//
-// For example
-//
-//	SELECT 314, 42 as AUQLUE, DepartmentID, DepartmentID+1000, LastName as Name from employee;
-//	// Fields are []string{"", "AUQLUE", "DepartmentID", "", "Name"}
-//
-// The SELECT statement can optionally enumerate the desired/resulting fields
-// in a list.
-//
-//  FieldList = Field { "," Field } [ "," ] .
-//
-// No two identical field names can appear in the list.
-//
-//	SELECT DepartmentID, LastName, DepartmentID from employee;
-//	// duplicate field name "DepartmentID"
-//
-//	SELECT DepartmentID, LastName, DepartmentID as ID2 from employee;
-//	// works
-//
-// When more than one record set is used in the FROM clause record set list,
-// the result record set field names are rewritten to be qualified using
-// the record set names.
-//
-//	SELECT * FROM employee, department;
-//	// Fields are []string{"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-//
-// If a particular record set doesn't have a name, its respective fields became
-// unnamed.
-//
-//	SELECT * FROM employee as e, ( SELECT * FROM department);
-//	// Fields are []string{"e.LastName", "e.DepartmentID", "", ""
-//
-//	SELECT * FROM employee AS e, ( SELECT * FROM department) AS d;
-//	// Fields are []string{"e.LastName", "e.DepartmentID", "d.DepartmentID", "d.DepartmentName"
-//
-// Outer joins
-//
-// The optional JOIN clause, for example
-//
-//	SELECT *
-//	FROM a
-//	LEFT OUTER JOIN b ON expr;
-//
-// is mostly equal to
-//
-//	SELECT *
-//	FROM a, b
-//	WHERE expr;
-//
-// except that the rows from a which, when they appear in the cross join, never
-// made expr to evaluate to true, are combined with a virtual row from b,
-// containing all nulls, and added to the result set. For the RIGHT JOIN
-// variant the discussed rules are used for rows from b not satisfying expr ==
-// true and the virtual, all-null row "comes" from a. The FULL JOIN adds the
-// respective rows which would be otherwise provided by the separate executions
-// of the LEFT JOIN and RIGHT JOIN variants. For more thorough OUTER JOIN
-// discussion please see the Wikipedia article at [10].
-//
-// Recordset ordering
-//
-// Resultins rows of a SELECT statement can be optionally ordered by the ORDER
-// BY clause.  Collating proceeds by considering the expressions in the
-// expression list left to right until a collating order is determined. Any
-// possibly remaining expressions are not evaluated.
-//
-//  OrderBy = "ORDER" "BY" ExpressionList [ "ASC" | "DESC" ] .
-//
-// All of the expression values must yield an ordered type or NULL. Ordered
-// types are defined in "Comparison operators". Collating of elements having a
-// NULL value is different compared to what the comparison operators yield in
-// expression evaluation (NULL result instead of a boolean value).
-//
-// Below, T denotes a non NULL value of any QL type.
-//
-// 	NULL < T
-//
-// NULL collates before any non NULL value (is considered smaller than T).
-//
-//	NULL == NULL
-//
-// Two NULLs have no collating order (are considered equal).
-//
-// Recordset filtering
-//
-// The WHERE clause restricts records considered by some statements, like
-// SELECT FROM, DELETE FROM, or UPDATE.
-//
-//	expression value	consider the record
-//	----------------	-------------------
-//	true			yes
-//	false or NULL		no
-//
-// It is an error if the expression evaluates to a non null value of non bool
-// type.
-//
-//  WhereClause = "WHERE" Expression .
-//
-// Recordset grouping
-//
-// The GROUP BY clause is used to project rows having common values into a
-// smaller set of rows.
-//
-// For example
-//
-//	SELECT Country, sum(Qty) FROM Sales GROUP BY Country;
-//
-//	SELECT Country, Product FROM Sales GROUP BY Country, Product;
-//
-//	SELECT DISTINCT Country, Product FROM Sales;
-//
-// Using the GROUP BY without any aggregate functions in the selected fields is
-// in certain cases equal to using the DISTINCT modifier. The last two examples
-// above produce the same resultsets.
-//
-//  GroupByClause = "GROUP BY" ColumnNameList .
-//
-// Skipping records
-//
-// The optional OFFSET clause allows to ignore first N records.  For example
-//
-//	SELECT * FROM t OFFSET 10;
-//
-// The above will produce only rows 11, 12, ... of the record set, if they
-// exist. The value of the expression must a non negative integer, but not
-// bigint or duration.
-//
-//  Offset = "OFFSET" Expression .
-//
-// Limiting the result set size
-//
-// The optional LIMIT clause allows to ignore all but first N records.  For
-// example
-//
-//	SELECT * FROM t LIMIT 10;
-//
-// The above will return at most the first 10 records of the record set. The
-// value of the expression must a non negative integer, but not bigint or
-// duration.
-//
-//  Limit = "Limit" Expression .
-//
-// The LIMIT and OFFSET clauses can be combined. For example
-//
-//	SELECT * FROM t LIMIT 5 OFFSET 3;
-//
-// Considering table t has, say 10 records, the above will produce only records
-// 4 - 8.
-//
-//	#1:	Ignore 1/3
-//	#2:	Ignore 2/3
-//	#3:	Ignore 3/3
-//	#4:	Return 1/5
-//	#5:	Return 2/5
-//	#6:	Return 3/5
-//	#7:	Return 4/5
-//	#8:	Return 5/5
-//
-// After returning record #8, no more result rows/records are computed.
-//
-// Select statement evaluation order
-//
-// 1. The FROM clause is evaluated, producing a Cartesian product of its source
-// record sets (tables or nested SELECT statements).
-//
-// 2. If present, the JOIN cluase is evaluated on the result set of the
-// previous evaluation and the recordset specified by the JOIN clause. (...
-// JOIN Recordset ON ...)
-//
-// 3. If present, the WHERE clause is evaluated on the result set of the
-// previous evaluation.
-//
-// 4. If present, the GROUP BY clause is evaluated on the result set of the
-// previous evaluation(s).
-//
-// 5. The SELECT field expressions are evaluated on the result set of the
-// previous evaluation(s).
-//
-// 6. If present, the DISTINCT modifier is evaluated on the result set of the
-// previous evaluation(s).
-//
-// 7. If present, the ORDER BY clause is evaluated on the result set of the
-// previous evaluation(s).
-//
-// 8. If present, the OFFSET clause is evaluated on the result set of the
-// previous evaluation(s). The offset expression is evaluated once for the
-// first record produced by the previous evaluations.
-//
-// 9. If present, the LIMIT clause is evaluated on the result set of the
-// previous evaluation(s). The limit expression is evaluated once for the first
-// record produced by the previous evaluations.
-//
-//
-// TRUNCATE TABLE
-//
-// Truncate table statements remove all records from a table. The table must
-// exist.
-//
-//  TruncateTableStmt = "TRUNCATE" "TABLE" TableName .
-//
-// For example
-//
-//	BEGIN TRANSACTION
-// 		TRUNCATE TABLE department;
-//	COMMIT;
-//
-// UPDATE
-//
-// Update statements change values of fields in rows of a table.
-//
-//  UpdateStmt = "UPDATE" TableName [ "SET" ] AssignmentList [ WhereClause ] .
-//
-//  AssignmentList = Assignment { "," Assignment } [ "," ] .
-//  Assignment = ColumnName "=" Expression .
-//
-// For example
-//
-//	BEGIN TRANSACTION
-// 		UPDATE department
-//			DepartmentName = DepartmentName + " dpt.",
-//			DepartmentID = 1000+DepartmentID,
-//		WHERE DepartmentID < 1000;
-//	COMMIT;
-//
-// Note: The SET clause is optional.
-//
-// If any of the columns of the table were defined using the optional
-// constraints clause or the optional defaults clause then those are processed
-// on a per row basis. The details are discussed in the "Constraints and
-// defaults" chapter below the CREATE TABLE statement documentation.
-//
-// System Tables
-//
-// To allow to query for DB meta data, there exist specially named tables, some
-// of them being virtual.
-//
-// Note: Virtual system tables may have fake table-wise unique but meaningless
-// and unstable record IDs. Do not apply the built-in id() to any system table.
-//
-// Tables Table
-//
-// The table __Table lists all tables in the DB. The schema is
-//
-//	CREATE TABLE __Table (Name string, Schema string);
-//
-// The Schema column returns the statement to (re)create table Name. This table
-// is virtual.
-//
-// Columns Table
-//
-// The table __Colum lists all columns of all tables in the DB. The schema is
-//
-//	CREATE TABLE __Column (TableName string, Ordinal int, Name string, Type string);
-//
-// The Ordinal column defines the 1-based index of the column in the record.
-// This table is virtual.
-//
-// Columns2 Table
-//
-// The table __Colum2 lists all columns of all tables in the DB which have the
-// constraint NOT NULL or which have a constraint expression defined or which
-// have a default expression defined. The schema is
-//
-//	CREATE TABLE __Column2 (TableName string, Name string, NotNull bool, ConstraintExpr string, DefaultExpr string)
-//
-// It's possible to obtain a consolidated recordset for all properties of all
-// DB columns using
-//
-//	SELECT
-//		__Column.TableName, __Column.Ordinal, __Column.Name, __Column.Type,
-//		__Column2.NotNull, __Column2.ConstraintExpr, __Column2.DefaultExpr,
-//	FROM __Column
-//	LEFT JOIN __Column2
-//	ON __Column.TableName == __Column2.TableName && __Column.Name == __Column2.Name
-//	ORDER BY __Column.TableName, __Column.Ordinal;
-//
-// The Name column is the column name in TableName.
-//
-// Indices table
-//
-// The table __Index lists all indices in the DB. The schema is
-//
-//	CREATE TABLE __Index (TableName string, ColumnName string, Name string, IsUnique bool);
-//
-// The IsUnique columns reflects if the index was created using the optional
-// UNIQUE clause. This table is virtual.
-//
-// Built-in functions
-//
-// Built-in functions are predeclared.
-//
-// Average
-//
-// The built-in aggregate function avg returns the average of values of an
-// expression.  Avg ignores NULL values, but returns NULL if all values of a
-// column are NULL or if avg is applied to an empty record set.
-//
-// 	func avg(e numeric) typeof(e)
-//
-// The column values must be of a numeric type.
-//
-//	SELECT salesperson, avg(sales) FROM salesforce GROUP BY salesperson;
-//
-// Contains
-//
-// The built-in function contains returns true if substr is within s.
-//
-//	func contains(s, substr string) bool
-//
-// If any argument to contains is NULL the result is NULL.
-//
-// Count
-//
-// The built-in aggregate function count returns how many times an expression
-// has a non NULL values or the number of rows in a record set. Note: count()
-// returns 0 for an empty record set.
-//
-//	func count() int             // The number of rows in a record set.
-//	func count(*) int            // Equivalent to count().
-// 	func count(e expression) int // The number of cases where the expression value is not NULL.
-//
-// For example
-//
-//	SELECT count() FROM department; // # of rows
-//
-//	SELECT count(*) FROM department; // # of rows
-//
-//	SELECT count(DepartmentID) FROM department; // # of records with non NULL field DepartmentID
-//
-//	SELECT count()-count(DepartmentID) FROM department; // # of records with NULL field DepartmentID
-//
-//	SELECT count(foo+bar*3) AS y FROM t; // # of cases where 'foo+bar*3' is non NULL
-//
-// Date
-//
-// Date returns the time corresponding to
-//
-//	yyyy-mm-dd hh:mm:ss + nsec nanoseconds
-//
-// in the appropriate zone for that time in the given location.
-//
-// The month, day, hour, min, sec, and nsec values may be outside their usual
-// ranges and will be normalized during the conversion. For example, October 32
-// converts to November 1.
-//
-// A daylight savings time transition skips or repeats times. For example, in
-// the United States, March 13, 2011 2:15am never occurred, while November 6,
-// 2011 1:15am occurred twice. In such cases, the choice of time zone, and
-// therefore the time, is not well-defined. Date returns a time that is correct
-// in one of the two zones involved in the transition, but it does not
-// guarantee which.
-//
-// 	func date(year, month, day, hour, min, sec, nsec int, loc string) time
-//
-// A location maps time instants to the zone in use at that time. Typically,
-// the location represents the collection of time offsets in use in a
-// geographical area, such as "CEST" and "CET" for central Europe.  "local"
-// represents the system's local time zone. "UTC" represents Universal
-// Coordinated Time (UTC).
-//
-// The month specifies a month of the year (January = 1, ...).
-//
-// If any argument to date is NULL the result is NULL.
-//
-// Day
-//
-// The built-in function day returns the day of the month specified by t.
-//
-// 	func day(t time) int
-//
-// If the argument to day is NULL the result is NULL.
-//
-// Format time
-//
-// The built-in function formatTime returns a textual representation of the
-// time value formatted according to layout, which defines the format by
-// showing how the reference time,
-//
-//	Mon Jan 2 15:04:05 -0700 MST 2006
-//
-// would be displayed if it were the value; it serves as an example of the
-// desired output. The same display rules will then be applied to the time
-// value.
-//
-// 	func formatTime(t time, layout string) string
-//
-// If any argument to formatTime is NULL the result is NULL.
-//
-// NOTE: The string value of the time zone, like "CET" or "ACDT", is dependent
-// on the time zone of the machine the function is run on. For example, if the
-// t value is in "CET", but the machine is in "ACDT", instead of "CET" the
-// result is "+0100". This is the same what Go (time.Time).String() returns and
-// in fact formatTime directly calls t.String().
-//
-//	formatTime(date(2006, 1, 2, 15, 4, 5, 999999999, "CET"))
-//
-// returns
-//
-//	2006-01-02 15:04:05.999999999 +0100 CET
-//
-// on a machine in the CET time zone, but may return
-//
-//	2006-01-02 15:04:05.999999999 +0100 +0100
-//
-// on a machine in the ACDT zone. The time value is in both cases the same so
-// its ordering and comparing is correct. Only the display value can differ.
-//
-// Format numbers
-//
-// The built-in functions formatFloat and formatInt format numbers
-// to strings using go's number format functions in the `strconv` package. For
-// all three functions, only the first argument is mandatory. The default values
-// of the rest are shown in the examples. If the first argument is NULL, the
-// result is NULL.
-//
-//	formatFloat(43.2[, 'g', -1, 64]) string
-//
-// returns
-//
-//	"43.2"
-//
-//	formatInt(-42[, 10]) string
-//
-// returns
-//
-//	"-42"
-//
-//	formatInt(uint32(42)[, 10]) string
-//
-// returns
-//
-//	"42"
-//
-// Unlike the `strconv` equivalent, the formatInt function handles all integer
-// types, both signed and unsigned.
-//
-// HasPrefix
-//
-// The built-in function hasPrefix tests whether the string s begins with prefix.
-//
-//	func hasPrefix(s, prefix string) bool
-//
-// If any argument to hasPrefix is NULL the result is NULL.
-//
-// HasSuffix
-//
-// The built-in function hasSuffix tests whether the string s ends with suffix.
-//
-//	func hasSuffix(s, suffix string) bool
-//
-// If any argument to hasSuffix is NULL the result is NULL.
-//
-// Hour
-//
-// The built-in function hour returns the hour within the day specified by t,
-// in the range [0, 23].
-//
-// 	func hour(t time) int
-//
-// If the argument to hour is NULL the result is NULL.
-//
-// Hours
-//
-// The built-in function hours returns the duration as a floating point number
-// of hours.
-//
-// 	func hours(d duration) float
-//
-// If the argument to hours is NULL the result is NULL.
-//
-// Record id
-//
-// The built-in function id takes zero or one arguments. If no argument is
-// provided, id() returns a table-unique automatically assigned numeric
-// identifier of type int. Ids of deleted records are not reused unless the DB
-// becomes completely empty (has no tables).
-//
-// 	func id() int
-//
-// For example
-//
-// 	SELECT id(), LastName
-// 	FROM employee;
-//
-// If id() without arguments is called for a row which is not a table record
-// then the result value is NULL.
-//
-// For example
-//
-//	SELECT id(), e.LastName, e.DepartmentID, d.DepartmentID
-//	FROM
-//		employee AS e,
-//		department AS d,
-//	WHERE e.DepartmentID == d.DepartmentID;
-//	// Will always return NULL in first field.
-//
-//	SELECT e.ID, e.LastName, e.DepartmentID, d.DepartmentID
-//	FROM
-//		(SELECT id() AS ID, LastName, DepartmentID FROM employee) AS e,
-//		department as d,
-//	WHERE e.DepartmentID == d.DepartmentID;
-//	// Will work.
-//
-// If id() has one argument it must be a table name of a table in a cross join.
-//
-// For example
-//
-// 	SELECT *
-// 	FROM foo, bar
-// 	WHERE bar.fooID == id(foo)
-// 	ORDER BY id(foo);
-//
-// Length
-//
-// The built-in function len takes a string argument and returns the lentgh of
-// the string in bytes.
-//
-// 	func len(s string) int
-//
-// The expression len(s) is constant if s is a string constant.
-//
-// If the argument to len is NULL the result is NULL.
-//
-// Maximum
-//
-// The built-in aggregate function max returns the largest value of an
-// expression in a record set.  Max ignores NULL values, but returns NULL if
-// all values of a column are NULL or if max is applied to an empty record set.
-//
-// 	func max(e expression) typeof(e) // The largest value of the expression.
-//
-// The expression values must be of an ordered type.
-//
-// For example
-//
-//	SELECT department, max(sales) FROM t GROUP BY department;
-//
-// Minimum
-//
-// The built-in aggregate function min returns the smallest value of an
-// expression in a record set.  Min ignores NULL values, but returns NULL if
-// all values of a column are NULL or if min is applied to an empty record set.
-//
-// 	func min(e expression) typeof(e) // The smallest value of the expression.
-//
-// For example
-//
-//	SELECT a, min(b) FROM t GROUP BY a;
-//
-// The column values must be of an ordered type.
-//
-// Minute
-//
-// The built-in function minute returns the minute offset within the hour
-// specified by t, in the range [0, 59].
-//
-// 	func minute(t time) int
-//
-// If the argument to minute is NULL the result is NULL.
-//
-// Minutes
-//
-// The built-in function minutes returns the duration as a floating point
-// number of minutes.
-//
-// 	func minutes(d duration) float
-//
-// If the argument to minutes is NULL the result is NULL.
-//
-// Month
-//
-// The built-in function month returns the month of the year specified by t
-// (January = 1, ...).
-//
-// 	func month(t time) int
-//
-// If the argument to month is NULL the result is NULL.
-//
-// Nanosecond
-//
-// The built-in function nanosecond returns the nanosecond offset within the
-// second specified by t, in the range [0, 999999999].
-//
-// 	func nanosecond(t time) int
-//
-// If the argument to nanosecond is NULL the result is NULL.
-//
-// Nanoseconds
-//
-// The built-in function nanoseconds returns the duration as an integer
-// nanosecond count.
-//
-// 	func nanoseconds(d duration) float
-//
-// If the argument to nanoseconds is NULL the result is NULL.
-//
-// Now
-//
-// The built-in function now returns the current local time.
-//
-// 	func now() time
-//
-// Parse time
-//
-// The built-in function parseTime parses a formatted string and returns the
-// time value it represents. The layout defines the format by showing how the
-// reference time,
-//
-//	Mon Jan 2 15:04:05 -0700 MST 2006
-//
-// would be interpreted if it were the value; it serves as an example of the
-// input format. The same interpretation will then be made to the input string.
-//
-// Elements omitted from the value are assumed to be zero or, when zero is
-// impossible, one, so parsing "3:04pm" returns the time corresponding to Jan
-// 1, year 0, 15:04:00 UTC (note that because the year is 0, this time is
-// before the zero Time). Years must be in the range 0000..9999. The day of the
-// week is checked for syntax but it is otherwise ignored.
-//
-// In the absence of a time zone indicator, parseTime returns a time in UTC.
-//
-// When parsing a time with a zone offset like -0700, if the offset corresponds
-// to a time zone used by the current location, then parseTime uses that
-// location and zone in the returned time. Otherwise it records the time as
-// being in a fabricated location with time fixed at the given zone offset.
-//
-// When parsing a time with a zone abbreviation like MST, if the zone
-// abbreviation has a defined offset in the current location, then that offset
-// is used. The zone abbreviation "UTC" is recognized as UTC regardless of
-// location. If the zone abbreviation is unknown, Parse records the time as
-// being in a fabricated location with the given zone abbreviation and a zero
-// offset. This choice means that such a time can be parses and reformatted
-// with the same layout losslessly, but the exact instant used in the
-// representation will differ by the actual zone offset. To avoid such
-// problems, prefer time layouts that use a numeric zone offset.
-//
-// 	func parseTime(layout, value string) time
-//
-// If any argument to parseTime is NULL the result is NULL.
-//
-// Second
-//
-// The built-in function second returns the second offset within the minute
-// specified by t, in the range [0, 59].
-//
-// 	func second(t time) int
-//
-// If the argument to second is NULL the result is NULL.
-//
-// Seconds
-//
-// The built-in function seconds returns the duration as a floating point
-// number of seconds.
-//
-// 	func seconds(d duration) float
-//
-// If the argument to seconds is NULL the result is NULL.
-//
-// Since
-//
-// The built-in function since returns the time elapsed since t. It is
-// shorthand for now()-t.
-//
-// 	func since(t time) duration
-//
-// If the argument to since is NULL the result is NULL.
-//
-// Sum
-//
-// The built-in aggregate function sum returns the sum of values of an
-// expression for all rows of a record set. Sum ignores NULL values, but
-// returns NULL if all values of a column are NULL or if sum is applied to an
-// empty record set.
-//
-// 	func sum(e expression) typeof(e) // The sum of the values of the expression.
-//
-// The column values must be of a numeric type.
-//
-//	SELECT salesperson, sum(sales) FROM salesforce GROUP BY salesperson;
-//
-// Time in a specific zone
-//
-// The built-in function timeIn returns t with the location information set to
-// loc. For discussion of the loc argument please see date().
-//
-// 	func timeIn(t time, loc string) time
-//
-// If any argument to timeIn is NULL the result is NULL.
-//
-// Weekday
-//
-// The built-in function weekday returns the day of the week specified by t.
-// Sunday == 0, Monday == 1, ...
-//
-// 	func weekday(t time) int
-//
-// If the argument to weekday is NULL the result is NULL.
-//
-// Year
-//
-// The built-in function year returns the year in which t occurs.
-//
-// 	func year(t time) int
-//
-// If the argument to year is NULL the result is NULL.
-//
-// Year day
-//
-// The built-in function yearDay returns the day of the year specified by t, in
-// the range [1,365] for non-leap years, and [1,366] in leap years.
-//
-// 	func yearDay(t time) int
-//
-// If the argument to yearDay is NULL the result is NULL.
-//
-// Manipulating complex numbers
-//
-// Three functions assemble and disassemble complex numbers. The built-in
-// function complex constructs a complex value from a floating-point real and
-// imaginary part, while real and imag extract the real and imaginary parts of
-// a complex value.
-//
-// 	complex(realPart, imaginaryPart floatT) complexT
-// 	real(complexT) floatT
-// 	imag(complexT) floatT
-//
-// The type of the arguments and return value correspond. For complex, the two
-// arguments must be of the same floating-point type and the return type is the
-// complex type with the corresponding floating-point constituents: complex64
-// for float32, complex128 for float64. The real and imag functions together
-// form the inverse, so for a complex value z, z == complex(real(z), imag(z)).
-//
-// If the operands of these functions are all constants, the return value is a
-// constant.
-//
-// 	complex(2, -2)             	// complex128
-// 	complex(1.0, -1.4)         	// complex128
-// 	float32(math.Cos(math.Pi/2))  	// float32
-// 	complex(5, float32(-x))         // complex64
-// 	imag(b)                   	// float64
-// 	real(complex(5, float32(-x)))   // float32
-//
-// If any argument to any of complex, real, imag functions is NULL the result
-// is NULL.
-//
-// Size guarantees
-//
-// For the numeric types, the following sizes are guaranteed
-//
-// 	type                                            size in bytes
-//
-// 	byte, uint8, int8                                1
-// 	uint16, int16                                    2
-// 	uint32, int32, float32                           4
-// 	uint, uint64, int, int64, float64, complex64     8
-// 	complex128                                      16
-//
-// License
-//
-// Portions of this specification page are modifications based on work[2]
-// created and shared by Google[3] and used according to terms described in the
-// Creative Commons 3.0 Attribution License[4].
-//
-// This specification is licensed under the Creative Commons Attribution 3.0
-// License, and code is licensed under a BSD license[5].
-//
-// References
-//
-// Links from the above documentation
-//
-// 	[1]: http://golang.org/ref/spec#Notation
-//	[2]: http://golang.org/ref/spec
-//	[3]: http://code.google.com/policies.html
-//	[4]: http://creativecommons.org/licenses/by/3.0/
-//	[5]: http://golang.org/LICENSE
-//	[6]: http://golang.org/pkg/regexp/#Regexp.MatchString
-//	[7]: http://developer.mimer.com/validator/sql-reserved-words.tml
-//	[8]: http://godoc.org/github.com/cznic/zappy
-//	[9]: http://www.w3schools.com/sql/sql_default.asp
-//	[10]: http://en.wikipedia.org/wiki/Join_(SQL)#Outer_join
-//
-// Implementation details
-//
-// This section is not part of the specification.
-//
-// Indices
-//
-// WARNING: The implementation of indices is new and it surely needs more time
-// to become mature.
-//
-// Indices are used currently used only by the WHERE clause. The following
-// expression patterns of 'WHERE expression' are recognized and trigger index
-// use.
-//
-// 	- WHERE c                   // For bool typed indexed column c
-// 	- WHERE !c                  // For bool typed indexed column c
-// 	- WHERE c relOp constExpr   // For indexed column c
-// 	- WHERE c relOp parameter   // For indexed column c
-// 	- WHERE parameter relOp c   // For indexed column c
-// 	- WHERE constExpr relOp c   // For indexed column c
-//
-// The relOp is one of the relation operators <, <=, ==, >=, >. For the
-// equality operator both operands must be of comparable types. For all other
-// operators both operands must be of ordered types. The constant expression is
-// a compile time constant expression. Some constant folding is still a TODO.
-// Parameter is a QL parameter ($1 etc.).
-//
-// Query rewriting
-//
-// Consider tables t and u, both with an indexed field f. The WHERE expression
-// doesn't comply with the above simple detected cases.
-//
-//	SELECT * FROM t, u WHERE t.f < x && u.f < y;
-//
-// However, such query is now automatically rewritten to
-//
-//	SELECT * FROM
-//		(SELECT * FROM t WHERE f < x),
-//		(SELECT * FROM u WHERE f < y);
-//
-// which will use both of the indices. The impact of using the indices can be
-// substantial (cf.  BenchmarkCrossJoin*) if the resulting rows have low
-// "selectivity", ie. only few rows from both tables are selected by the
-// respective WHERE filtering.
-//
-// Note: Existing QL DBs can be used and indices can be added to them. However,
-// once any indices are present in the DB, the old QL versions cannot work with
-// such DB anymore.
-//
-// Benchmarks
-//
-// Running a benchmark with -v (-test.v) outputs information about the scale
-// used to report records/s and a brief description of the benchmark. For
-// example
-//
-//	$ go test -run NONE -bench 'SelectMem.*1e[23]' -v
-//	PASS
-//	BenchmarkSelectMem1kBx1e2	   50000	     67680 ns/op	1477537.05 MB/s
-//	--- BENCH: BenchmarkSelectMem1kBx1e2
-//		all_test.go:310:
-//			=============================================================
-//			NOTE: All benchmarks report records/s as 1000000 bytes/s.
-//			=============================================================
-//		all_test.go:321: Having a table of 100 records, each of size 1kB, measure the performance of
-//			SELECT * FROM t;
-//
-//	BenchmarkSelectMem1kBx1e3	    5000	    634819 ns/op	1575251.01 MB/s
-//	--- BENCH: BenchmarkSelectMem1kBx1e3
-//		all_test.go:321: Having a table of 1000 records, each of size 1kB, measure the performance of
-//			SELECT * FROM t;
-//
-//	ok  	github.com/cznic/ql	7.496s
-//	$
-//
-// Running the full suite of benchmarks takes a lot of time. Use the -timeout
-// flag to avoid them being killed after the default time limit (10 minutes).
-package ql
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/driver.go b/Godeps/_workspace/src/github.com/cznic/ql/driver.go
deleted file mode 100644
index b660e4cb65..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/driver.go
+++ /dev/null
@@ -1,523 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// database/sql/driver
-
-package ql
-
-import (
-	"bytes"
-	"database/sql"
-	"database/sql/driver"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-)
-
-var (
-	_ driver.Conn    = (*driverConn)(nil)
-	_ driver.Driver  = (*sqlDriver)(nil)
-	_ driver.Execer  = (*driverConn)(nil)
-	_ driver.Queryer = (*driverConn)(nil)
-	_ driver.Result  = (*driverResult)(nil)
-	_ driver.Rows    = (*driverRows)(nil)
-	_ driver.Stmt    = (*driverStmt)(nil)
-	_ driver.Tx      = (*driverConn)(nil)
-
-	txBegin    = MustCompile("BEGIN TRANSACTION;")
-	txCommit   = MustCompile("COMMIT;")
-	txRollback = MustCompile("ROLLBACK;")
-
-	errNoResult = errors.New("query statement does not produce a result set (no top level SELECT)")
-)
-
-type errList []error
-
-func (e *errList) append(err error) {
-	if err != nil {
-		*e = append(*e, err)
-	}
-}
-
-func (e errList) error() error {
-	if len(e) == 0 {
-		return nil
-	}
-
-	return e
-}
-
-func (e errList) Error() string {
-	a := make([]string, len(e))
-	for i, v := range e {
-		a[i] = v.Error()
-	}
-	return strings.Join(a, "\n")
-}
-
-func params(args []driver.Value) []interface{} {
-	r := make([]interface{}, len(args))
-	for i, v := range args {
-		r[i] = interface{}(v)
-	}
-	return r
-}
-
-var (
-	fileDriver     = &sqlDriver{dbs: map[string]*driverDB{}}
-	fileDriverOnce sync.Once
-	memDriver      = &sqlDriver{isMem: true, dbs: map[string]*driverDB{}}
-	memDriverOnce  sync.Once
-)
-
-// RegisterDriver registers a QL database/sql/driver[0] named "ql". The name
-// parameter of
-//
-//	sql.Open("ql", name)
-//
-// is interpreted as a path name to a named DB file which will be created if
-// not present. The underlying QL database data are persisted on db.Close().
-// RegisterDriver can be safely called multiple times, it'll register the
-// driver only once.
-//
-// The name argument can be optionally prefixed by "file://". In that case the
-// prefix is stripped before interpreting it as a file name.
-//
-// The name argument can be optionally prefixed by "memory://". In that case
-// the prefix is stripped before interpreting it as a name of a memory-only,
-// volatile DB.
-//
-//  [0]: http://golang.org/pkg/database/sql/driver/
-func RegisterDriver() {
-	fileDriverOnce.Do(func() { sql.Register("ql", fileDriver) })
-}
-
-// RegisterMemDriver registers a QL memory database/sql/driver[0] named
-// "ql-mem".  The name parameter of
-//
-//	sql.Open("ql-mem", name)
-//
-// is interpreted as an unique memory DB name which will be created if not
-// present. The underlying QL memory database data are not persisted on
-// db.Close(). RegisterMemDriver can be safely called multiple times, it'll
-// register the driver only once.
-//
-//  [0]: http://golang.org/pkg/database/sql/driver/
-func RegisterMemDriver() {
-	memDriverOnce.Do(func() { sql.Register("ql-mem", memDriver) })
-}
-
-type driverDB struct {
-	db       *DB
-	name     string
-	refcount int
-}
-
-func newDriverDB(db *DB, name string) *driverDB {
-	return &driverDB{db: db, name: name, refcount: 1}
-}
-
-// sqlDriver implements the interface required by database/sql/driver.
-type sqlDriver struct {
-	dbs   map[string]*driverDB
-	isMem bool
-	mu    sync.Mutex
-}
-
-func (d *sqlDriver) lock() func() {
-	d.mu.Lock()
-	return d.mu.Unlock
-}
-
-// Open returns a new connection to the database.  The name is a string in a
-// driver-specific format.
-//
-// Open may return a cached connection (one previously closed), but doing so is
-// unnecessary; the sql package maintains a pool of idle connections for
-// efficient re-use.
-//
-// The returned connection is only used by one goroutine at a time.
-func (d *sqlDriver) Open(name string) (driver.Conn, error) {
-	if d != fileDriver && d != memDriver {
-		return nil, fmt.Errorf("open: unexpected/unsupported instance of driver.Driver: %p", d)
-	}
-
-	switch {
-	case d == fileDriver && strings.HasPrefix(name, "file://"):
-		name = name[len("file://"):]
-	case d == fileDriver && strings.HasPrefix(name, "memory://"):
-		d = memDriver
-		name = name[len("memory://"):]
-	}
-	name = filepath.Clean(name)
-	if name == "" || name == "." || name == string(os.PathSeparator) {
-		return nil, fmt.Errorf("invalid DB name %q", name)
-	}
-
-	defer d.lock()()
-	db := d.dbs[name]
-	if db == nil {
-		var err error
-		var db0 *DB
-		switch d.isMem {
-		case true:
-			db0, err = OpenMem()
-		default:
-			db0, err = OpenFile(name, &Options{CanCreate: true})
-		}
-		if err != nil {
-			return nil, err
-		}
-
-		db = newDriverDB(db0, name)
-		d.dbs[name] = db
-		return newDriverConn(d, db), nil
-	}
-
-	db.refcount++
-	return newDriverConn(d, db), nil
-}
-
-// driverConn is a connection to a database. It is not used concurrently by
-// multiple goroutines.
-//
-// Conn is assumed to be stateful.
-type driverConn struct {
-	ctx    *TCtx
-	db     *driverDB
-	driver *sqlDriver
-	stop   map[*driverStmt]struct{}
-	tnl    int
-}
-
-func newDriverConn(d *sqlDriver, ddb *driverDB) driver.Conn {
-	r := &driverConn{
-		db:     ddb,
-		driver: d,
-		stop:   map[*driverStmt]struct{}{},
-	}
-	return r
-}
-
-// Prepare returns a prepared statement, bound to this connection.
-func (c *driverConn) Prepare(query string) (driver.Stmt, error) {
-	list, err := Compile(query)
-	if err != nil {
-		return nil, err
-	}
-
-	s := &driverStmt{conn: c, stmt: list}
-	c.stop[s] = struct{}{}
-	return s, nil
-}
-
-// Close invalidates and potentially stops any current prepared statements and
-// transactions, marking this connection as no longer in use.
-//
-// Because the sql package maintains a free pool of connections and only calls
-// Close when there's a surplus of idle connections, it shouldn't be necessary
-// for drivers to do their own connection caching.
-func (c *driverConn) Close() error {
-	var err errList
-	for s := range c.stop {
-		err.append(s.Close())
-	}
-	defer c.driver.lock()()
-	dbs, name := c.driver.dbs, c.db.name
-	v := dbs[name]
-	v.refcount--
-	if v.refcount == 0 {
-		err.append(c.db.db.Close())
-		delete(dbs, name)
-	}
-	return err.error()
-}
-
-// Begin starts and returns a new transaction.
-func (c *driverConn) Begin() (driver.Tx, error) {
-	if c.ctx == nil {
-		c.ctx = NewRWCtx()
-	}
-
-	if _, _, err := c.db.db.Execute(c.ctx, txBegin); err != nil {
-		return nil, err
-	}
-
-	c.tnl++
-	return c, nil
-}
-
-func (c *driverConn) Commit() error {
-	if c.tnl == 0 || c.ctx == nil {
-		return errCommitNotInTransaction
-	}
-
-	if _, _, err := c.db.db.Execute(c.ctx, txCommit); err != nil {
-		return err
-	}
-
-	c.tnl--
-	if c.tnl == 0 {
-		c.ctx = nil
-	}
-	return nil
-}
-
-func (c *driverConn) Rollback() error {
-	if c.tnl == 0 || c.ctx == nil {
-		return errRollbackNotInTransaction
-	}
-
-	if _, _, err := c.db.db.Execute(c.ctx, txRollback); err != nil {
-		return err
-	}
-
-	c.tnl--
-	if c.tnl == 0 {
-		c.ctx = nil
-	}
-	return nil
-}
-
-// Execer is an optional interface that may be implemented by a Conn.
-//
-// If a Conn does not implement Execer, the sql package's DB.Exec will first
-// prepare a query, execute the statement, and then close the statement.
-//
-// Exec may return driver.ErrSkip.
-func (c *driverConn) Exec(query string, args []driver.Value) (driver.Result, error) {
-	list, err := Compile(query)
-	if err != nil {
-		return nil, err
-	}
-
-	return driverExec(c.db, c.ctx, list, args)
-}
-
-func driverExec(db *driverDB, ctx *TCtx, list List, args []driver.Value) (driver.Result, error) {
-	if _, _, err := db.db.Execute(ctx, list, params(args)...); err != nil {
-		return nil, err
-	}
-
-	if len(list.l) == 1 {
-		switch list.l[0].(type) {
-		case *createTableStmt, *dropTableStmt, *alterTableAddStmt,
-			*alterTableDropColumnStmt, *truncateTableStmt:
-			return driver.ResultNoRows, nil
-		}
-	}
-
-	r := &driverResult{}
-	if ctx != nil {
-		r.lastInsertID, r.rowsAffected = ctx.LastInsertID, ctx.RowsAffected
-	}
-	return r, nil
-}
-
-// Queryer is an optional interface that may be implemented by a Conn.
-//
-// If a Conn does not implement Queryer, the sql package's DB.Query will first
-// prepare a query, execute the statement, and then close the statement.
-//
-// Query may return driver.ErrSkip.
-func (c *driverConn) Query(query string, args []driver.Value) (driver.Rows, error) {
-	list, err := Compile(query)
-	if err != nil {
-		return nil, err
-	}
-
-	return driverQuery(c.db, c.ctx, list, args)
-}
-
-func driverQuery(db *driverDB, ctx *TCtx, list List, args []driver.Value) (driver.Rows, error) {
-	rss, _, err := db.db.Execute(ctx, list, params(args)...)
-	if err != nil {
-		return nil, err
-	}
-
-	switch n := len(rss); n {
-	case 0:
-		return nil, errNoResult
-	case 1:
-		return newdriverRows(rss[len(rss)-1]), nil
-	default:
-		return nil, fmt.Errorf("query produced %d result sets, expected only one", n)
-	}
-}
-
-// driverResult is the result of a query execution.
-type driverResult struct {
-	lastInsertID int64
-	rowsAffected int64
-}
-
-// LastInsertId returns the database's auto-generated ID after, for example, an
-// INSERT into a table with primary key.
-func (r *driverResult) LastInsertId() (int64, error) { // -golint
-	return r.lastInsertID, nil
-}
-
-// RowsAffected returns the number of rows affected by the query.
-func (r *driverResult) RowsAffected() (int64, error) {
-	return r.rowsAffected, nil
-}
-
-// driverRows is an iterator over an executed query's results.
-type driverRows struct {
-	rs   Recordset
-	done chan int
-	rows chan interface{}
-}
-
-func newdriverRows(rs Recordset) *driverRows {
-	r := &driverRows{
-		rs:   rs,
-		done: make(chan int),
-		rows: make(chan interface{}, 500),
-	}
-	go func() {
-		err := io.EOF
-		if e := r.rs.Do(false, func(data []interface{}) (bool, error) {
-			select {
-			case r.rows <- data:
-				return true, nil
-			case <-r.done:
-				return false, nil
-			}
-		}); e != nil {
-			err = e
-		}
-
-		select {
-		case r.rows <- err:
-		case <-r.done:
-		}
-	}()
-	return r
-}
-
-// Columns returns the names of the columns. The number of columns of the
-// result is inferred from the length of the slice.  If a particular column
-// name isn't known, an empty string should be returned for that entry.
-func (r *driverRows) Columns() []string {
-	f, _ := r.rs.Fields()
-	return f
-}
-
-// Close closes the rows iterator.
-func (r *driverRows) Close() error {
-	close(r.done)
-	return nil
-}
-
-// Next is called to populate the next row of data into the provided slice. The
-// provided slice will be the same size as the Columns() are wide.
-//
-// The dest slice may be populated only with a driver Value type, but excluding
-// string.  All string values must be converted to []byte.
-//
-// Next should return io.EOF when there are no more rows.
-func (r *driverRows) Next(dest []driver.Value) error {
-	select {
-	case rx := <-r.rows:
-		switch x := rx.(type) {
-		case error:
-			return x
-		case []interface{}:
-			if g, e := len(x), len(dest); g != e {
-				return fmt.Errorf("field count mismatch: got %d, need %d", g, e)
-			}
-
-			for i, xi := range x {
-				switch v := xi.(type) {
-				case nil, int64, float64, bool, []byte, time.Time:
-					dest[i] = v
-				case complex64, complex128, *big.Int, *big.Rat:
-					var buf bytes.Buffer
-					fmt.Fprintf(&buf, "%v", v)
-					dest[i] = buf.Bytes()
-				case int8:
-					dest[i] = int64(v)
-				case int16:
-					dest[i] = int64(v)
-				case int32:
-					dest[i] = int64(v)
-				case int:
-					dest[i] = int64(v)
-				case uint8:
-					dest[i] = int64(v)
-				case uint16:
-					dest[i] = int64(v)
-				case uint32:
-					dest[i] = int64(v)
-				case uint64:
-					dest[i] = int64(v)
-				case uint:
-					dest[i] = int64(v)
-				case time.Duration:
-					dest[i] = int64(v)
-				case string:
-					dest[i] = []byte(v)
-				default:
-					return fmt.Errorf("internal error 004")
-				}
-			}
-			return nil
-		default:
-			return fmt.Errorf("internal error 005")
-		}
-	case <-r.done:
-		return io.EOF
-	}
-}
-
-// driverStmt is a prepared statement. It is bound to a driverConn and not used
-// by multiple goroutines concurrently.
-type driverStmt struct {
-	conn *driverConn
-	stmt List
-}
-
-// Close closes the statement.
-//
-// As of Go 1.1, a Stmt will not be closed if it's in use by any queries.
-func (s *driverStmt) Close() error {
-	delete(s.conn.stop, s)
-	return nil
-}
-
-// NumInput returns the number of placeholder parameters.
-//
-// If NumInput returns >= 0, the sql package will sanity check argument counts
-// from callers and return errors to the caller before the statement's Exec or
-// Query methods are called.
-//
-// NumInput may also return -1, if the driver doesn't know its number of
-// placeholders. In that case, the sql package will not sanity check Exec or
-// Query argument counts.
-func (s *driverStmt) NumInput() int {
-	if x := s.stmt; len(x.l) == 1 {
-		return x.params
-	}
-
-	return -1
-}
-
-// Exec executes a query that doesn't return rows, such as an INSERT or UPDATE.
-func (s *driverStmt) Exec(args []driver.Value) (driver.Result, error) {
-	c := s.conn
-	return driverExec(c.db, c.ctx, s.stmt, args)
-}
-
-// Exec executes a query that may return rows, such as a SELECT.
-func (s *driverStmt) Query(args []driver.Value) (driver.Rows, error) {
-	c := s.conn
-	return driverQuery(c.db, c.ctx, s.stmt, args)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/driver/Makefile b/Godeps/_workspace/src/github.com/cznic/ql/driver/Makefile
deleted file mode 100644
index f1b64ee663..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/driver/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2014 The ql Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-.PHONY: all clean nuke
-
-all: editor
-	go install
-	go vet
-	golint .
-	make todo
-
-bench: all
-	go test -run NONE -bench .
-
-clean:
-	go clean
-	rm -f *~
-
-cover:
-	t=$(shell tempfile) ; go test -coverprofile $$t && go tool cover -html $$t && unlink $$t
-
-editor:
-	go fmt
-	go test -i
-	go test
-	go build
-
-nuke:
-	go clean -i
-
-todo:
-	@grep -n ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* *.go || true
-	@grep -n TODO *.go || true
-	@grep -n BUG *.go || true
-	@grep -n println *.go || true
-
-later:
-	@grep -n LATER *.go || true
-	@grep -n MAYBE *.go || true
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/driver/driver.go b/Godeps/_workspace/src/github.com/cznic/ql/driver/driver.go
deleted file mode 100644
index 557c70d828..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/driver/driver.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package driver registers a QL sql/driver named "ql" and a memory driver named "ql-mem".
-
-See also [0], [1] and [3].
-
-Usage
-
-A skeleton program using ql/driver.
-
-	package main
-
-	import (
-		"database/sql"
-
-		_ "github.com/cznic/ql/driver"
-	)
-
-	func main() {
-		...
-		// Disk file DB
-		db, err := sql.Open("ql", "ql.db")  // [2]
-		// alternatively
-		db, err := sql.Open("ql", "file://ql.db")
-
-		// and/or
-
-		// RAM DB
-		mdb, err := sql.Open("ql-mem", "mem.db")
-		// alternatively
-		mdb, err := sql.Open("ql", "memory://mem.db")
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		// Use db/mdb here
-		...
-	}
-
-This package exports nothing.
-
-Links
-
-Referenced from above:
-
-  [0]: http://godoc.org/github.com/cznic/ql
-  [1]: http://golang.org/pkg/database/sql/
-  [2]: http://golang.org/pkg/database/sql/#Open
-  [3]: http://golang.org/pkg/database/sql/driver
-*/
-package driver
-
-import "github.com/cznic/ql"
-
-func init() {
-	ql.RegisterDriver()
-	ql.RegisterMemDriver()
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/errors.go b/Godeps/_workspace/src/github.com/cznic/ql/errors.go
deleted file mode 100644
index 305414f4a9..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/errors.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"errors"
-)
-
-var (
-	errBeginTransNoCtx          = errors.New("BEGIN TRANSACTION: Must use R/W context, have nil")
-	errCommitNotInTransaction   = errors.New("COMMIT: Not in transaction")
-	errDivByZero                = errors.New("division by zero")
-	errIncompatibleDBFormat     = errors.New("incompatible DB format")
-	errNoDataForHandle          = errors.New("read: no data for handle")
-	errRollbackNotInTransaction = errors.New("ROLLBACK: Not in transaction")
-)
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/etc.go b/Godeps/_workspace/src/github.com/cznic/ql/etc.go
deleted file mode 100644
index c2e1524af0..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/etc.go
+++ /dev/null
@@ -1,2805 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"math"
-	"math/big"
-	"strings"
-	"time"
-)
-
-// QL types.
-const (
-	qBool       = 0x62 // 'b'
-	qComplex64  = 0x63 // 'c'
-	qComplex128 = 0x64 // 'd'
-	qFloat32    = 0x66 // 'f'
-	qFloat64    = 0x67 // 'g', alias float
-	qInt8       = 0x69 // 'i'
-	qInt16      = 0x6a // 'j'
-	qInt32      = 0x6b // 'k'
-	qInt64      = 0x6c // 'l', alias int
-	qString     = 0x73 // 's'
-	qUint8      = 0x75 // 'u', alias byte
-	qUint16     = 0x76 // 'v'
-	qUint32     = 0x77 // 'w'
-	qUint64     = 0x78 // 'x', alias uint
-
-	qBigInt   = 0x49 // 'I'
-	qBigRat   = 0x52 // 'R'
-	qBlob     = 0x42 // 'B'
-	qDuration = 0x44 // 'D'
-	qTime     = 0x54 // 'T'
-)
-
-var (
-	type2Str = map[int]string{
-		qBigInt:     "bigint",
-		qBigRat:     "bigrat",
-		qBlob:       "blob",
-		qBool:       "bool",
-		qComplex128: "complex128",
-		qComplex64:  "complex64",
-		qDuration:   "duration",
-		qFloat32:    "float32",
-		qFloat64:    "float64",
-		qInt16:      "int16",
-		qInt32:      "int32",
-		qInt64:      "int64",
-		qInt8:       "int8",
-		qString:     "string",
-		qTime:       "time",
-		qUint16:     "uint16",
-		qUint32:     "uint32",
-		qUint64:     "uint64",
-		qUint8:      "uint8",
-	}
-)
-
-func typeStr(typ int) (r string) {
-	return type2Str[typ]
-}
-
-func noEOF(err error) error {
-	if err == io.EOF {
-		err = nil
-	}
-	return err
-}
-
-func runErr(err error) error { return fmt.Errorf("run time error: %s", err) }
-
-func invXOp(s, x interface{}) error {
-	return fmt.Errorf("invalid operation: %v[%v] (index of type %T)", s, x, x)
-}
-
-func invSOp(s interface{}) error {
-	return fmt.Errorf("cannot slice %s (type %T)", s, s)
-}
-
-func invNegX(x interface{}) error {
-	return fmt.Errorf("invalid string index %v (index must be non-negative)", x)
-}
-
-func invNegLO(x interface{}) error {
-	return fmt.Errorf("invalid LIMIT or OFFSET value %v (must be non-negative)", x)
-}
-
-func invSliceNegX(x interface{}) error {
-	return fmt.Errorf("invalid slice index %v (index must be non-negative)", x)
-}
-
-func invBoundX(s string, x uint64) error {
-	return fmt.Errorf("invalid string index %d (out of bounds for %d-byte string)", x, len(s))
-}
-
-func invSliceBoundX(s string, x uint64) error {
-	return fmt.Errorf("invalid slice index %d (out of bounds for %d-byte string)", x, len(s))
-}
-
-func intExpr(x interface{}) (i int64, err error) {
-	switch x := x.(type) {
-	case idealInt:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return int64(x), nil
-	case idealRune:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return int64(x), nil
-	case idealUint:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return int64(x), nil
-	case int8:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return int64(x), nil
-	case int16:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return int64(x), nil
-	case int32:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return int64(x), nil
-	case int64:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return int64(x), nil
-	case uint8:
-		return int64(x), nil
-	case uint16:
-		return int64(x), nil
-	case uint32:
-		return int64(x), nil
-	case uint64:
-		return int64(x), nil
-	default:
-		return 0, fmt.Errorf("non-integer expression: %v (value of type %T)", x, x)
-	}
-}
-
-func limOffExpr(x interface{}) (i uint64, err error) {
-	switch x := x.(type) {
-	case idealInt:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return uint64(x), nil
-	case idealRune:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return uint64(x), nil
-	case idealUint:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return uint64(x), nil
-	case int8:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return uint64(x), nil
-	case int16:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return uint64(x), nil
-	case int32:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return uint64(x), nil
-	case int64:
-		if x < 0 {
-			return 0, invNegLO(x)
-		}
-
-		return uint64(x), nil
-	case uint8:
-		return uint64(x), nil
-	case uint16:
-		return uint64(x), nil
-	case uint32:
-		return uint64(x), nil
-	case uint64:
-		return uint64(x), nil
-	default:
-		return 0, fmt.Errorf("non-integer used in LIMIT or OFFSET: %v (value of type %T)", x, x)
-	}
-}
-
-func indexExpr(s *string, x interface{}) (i uint64, err error) {
-	switch x := x.(type) {
-	case idealFloat:
-		if x < 0 {
-			return 0, invNegX(x)
-		}
-
-		if s != nil && int(x) >= len(*s) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case idealInt:
-		if x < 0 {
-			return 0, invNegX(x)
-		}
-
-		if s != nil && int64(x) >= int64(len(*s)) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case idealRune:
-		if x < 0 {
-			return 0, invNegX(x)
-		}
-
-		if s != nil && int32(x) >= int32(len(*s)) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case idealUint:
-		if x < 0 {
-			return 0, invNegX(x)
-		}
-
-		if s != nil && uint64(x) >= uint64(len(*s)) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case int8:
-		if x < 0 {
-			return 0, invNegX(x)
-		}
-
-		if s != nil && int(x) >= len(*s) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case int16:
-		if x < 0 {
-			return 0, invNegX(x)
-		}
-
-		if s != nil && int(x) >= len(*s) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case int32:
-		if x < 0 {
-			return 0, invNegX(x)
-		}
-
-		if s != nil && int(x) >= len(*s) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case int64:
-		if x < 0 {
-			return 0, invNegX(x)
-		}
-
-		if s != nil && x >= int64(len(*s)) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case uint8:
-		if s != nil && int(x) >= len(*s) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case uint16:
-		if s != nil && int(x) >= len(*s) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case uint32:
-		if s != nil && x >= uint32(len(*s)) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case uint64:
-		if s != nil && x >= uint64(len(*s)) {
-			return 0, invBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	default:
-		return 0, fmt.Errorf("non-integer string index %v (value of type %T)", x, x)
-	}
-}
-
-func sliceExpr(s *string, x interface{}, mod int) (i uint64, err error) {
-	switch x := x.(type) {
-	case idealFloat:
-		if x < 0 {
-			return 0, invSliceNegX(x)
-		}
-
-		if s != nil && int(x) >= len(*s)+mod {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case idealInt:
-		if x < 0 {
-			return 0, invSliceNegX(x)
-		}
-
-		if s != nil && int64(x) >= int64(len(*s)+mod) {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case idealRune:
-		if x < 0 {
-			return 0, invSliceNegX(x)
-		}
-
-		if s != nil && int32(x) >= int32(len(*s)+mod) {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case idealUint:
-		if x < 0 {
-			return 0, invSliceNegX(x)
-		}
-
-		if s != nil && uint64(x) >= uint64(len(*s)+mod) {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case int8:
-		if x < 0 {
-			return 0, invSliceNegX(x)
-		}
-
-		if s != nil && int(x) >= len(*s)+mod {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case int16:
-		if x < 0 {
-			return 0, invSliceNegX(x)
-		}
-
-		if s != nil && int(x) >= len(*s)+mod {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case int32:
-		if x < 0 {
-			return 0, invSliceNegX(x)
-		}
-
-		if s != nil && int(x) >= len(*s)+mod {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case int64:
-		if x < 0 {
-			return 0, invSliceNegX(x)
-		}
-
-		if s != nil && x >= int64(len(*s)+mod) {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case uint8:
-		if s != nil && int(x) >= len(*s)+mod {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case uint16:
-		if s != nil && int(x) >= len(*s)+mod {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case uint32:
-		if s != nil && x >= uint32(len(*s)+mod) {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	case uint64:
-		if s != nil && x >= uint64(len(*s)+mod) {
-			return 0, invSliceBoundX(*s, uint64(x))
-		}
-
-		return uint64(x), nil
-	default:
-		return 0, fmt.Errorf("invalid slice index %s (type %T)", x, x)
-	}
-}
-
-type iop int
-
-func (o iop) String() string {
-	switch i := int(o); i {
-	case andand:
-		return "&&"
-	case andnot:
-		return "&^"
-	case lsh:
-		return "<<"
-	case le:
-		return "<="
-	case eq:
-		return "=="
-	case ge:
-		return ">="
-	case neq:
-		return "!="
-	case oror:
-		return "||"
-	case rsh:
-		return ">>"
-	default:
-		return string(i)
-	}
-}
-
-func ideal(v interface{}) interface{} {
-	switch x := v.(type) {
-	case idealComplex:
-		return complex128(x)
-	case idealFloat:
-		return float64(x)
-	case idealInt:
-		return int64(x)
-	case idealRune:
-		return int64(x)
-	case idealUint:
-		return uint64(x)
-	default:
-		return v
-	}
-}
-
-func eval(v expression, execCtx *execCtx, ctx map[interface{}]interface{}) (y interface{}) {
-	y, err := expand1(v.eval(execCtx, ctx))
-	if err != nil {
-		panic(err) // panic ok here
-	}
-	return
-}
-
-func eval2(a, b expression, execCtx *execCtx, ctx map[interface{}]interface{}) (x, y interface{}) {
-	return eval(a, execCtx, ctx), eval(b, execCtx, ctx)
-}
-
-func invOp2(x, y interface{}, o int) (interface{}, error) {
-	return nil, fmt.Errorf("invalid operation: %v %v %v (mismatched types %T and %T)", x, iop(o), y, ideal(x), ideal(y))
-}
-
-func undOp(x interface{}, o int) (interface{}, error) {
-	return nil, fmt.Errorf("invalid operation: %v%v (operator %v not defined on %T)", iop(o), x, iop(o), x)
-}
-
-func undOp2(x, y interface{}, o int) (interface{}, error) {
-	return nil, fmt.Errorf("invalid operation: %v %v %v (operator %v not defined on %T)", x, iop(o), y, iop(o), x)
-}
-
-func invConv(val interface{}, typ int) (interface{}, error) {
-	return nil, fmt.Errorf("cannot convert %v (type %T) to type %s", val, val, typeStr(typ))
-}
-
-func truncConv(val interface{}) (interface{}, error) {
-	return nil, fmt.Errorf("constant %v truncated to integer", val)
-}
-
-func convert(val interface{}, typ int) (v interface{}, err error) { //NTYPE
-	if val == nil {
-		return nil, nil
-	}
-
-	switch typ {
-	case qBool:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		//case idealFloat:
-		//case idealInt:
-		//case idealRune:
-		//case idealUint:
-		case bool:
-			return bool(x), nil
-		//case complex64:
-		//case complex128:
-		//case float32:
-		//case float64:
-		//case int8:
-		//case int16:
-		//case int32:
-		//case int64:
-		//case string:
-		//case uint8:
-		//case uint16:
-		//case uint32:
-		//case uint64:
-		default:
-			return invConv(val, typ)
-		}
-	case qComplex64:
-		switch x := val.(type) {
-		//case nil:
-		case idealComplex:
-			return complex64(x), nil
-		case idealFloat:
-			return complex(float32(x), 0), nil
-		case idealInt:
-			return complex(float32(x), 0), nil
-		case idealRune:
-			return complex(float32(x), 0), nil
-		case idealUint:
-			return complex(float32(x), 0), nil
-		//case bool:
-		case complex64:
-			return complex64(x), nil
-		case complex128:
-			return complex64(x), nil
-		//case float32:
-		//case float64:
-		//case int8:
-		//case int16:
-		//case int32:
-		//case int64:
-		//case string:
-		//case uint8:
-		//case uint16:
-		//case uint32:
-		//case uint64:
-		default:
-			return invConv(val, typ)
-		}
-	case qComplex128:
-		switch x := val.(type) {
-		//case nil:
-		case idealComplex:
-			return complex128(x), nil
-		case idealFloat:
-			return complex(float64(x), 0), nil
-		case idealInt:
-			return complex(float64(x), 0), nil
-		case idealRune:
-			return complex(float64(x), 0), nil
-		case idealUint:
-			return complex(float64(x), 0), nil
-		//case bool:
-		case complex64:
-			return complex128(x), nil
-		case complex128:
-			return complex128(x), nil
-		//case float32:
-		//case float64:
-		//case int8:
-		//case int16:
-		//case int32:
-		//case int64:
-		//case string:
-		//case uint8:
-		//case uint16:
-		//case uint32:
-		//case uint64:
-		default:
-			return invConv(val, typ)
-		}
-	case qFloat32:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			return float32(x), nil
-		case idealInt:
-			return float32(x), nil
-		case idealRune:
-			return float32(x), nil
-		case idealUint:
-			return float32(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return float32(x), nil
-		case float64:
-			return float32(x), nil
-		case int8:
-			return float32(x), nil
-		case int16:
-			return float32(x), nil
-		case int32:
-			return float32(x), nil
-		case int64:
-			return float32(x), nil
-		//case string:
-		case uint8:
-			return float32(x), nil
-		case uint16:
-			return float32(x), nil
-		case uint32:
-			return float32(x), nil
-		case uint64:
-			return float32(x), nil
-		case *big.Int:
-			v, _ := big.NewRat(1, 1).SetInt(x).Float64()
-			return float32(v), nil
-		case *big.Rat:
-			v, _ := x.Float64()
-			return float32(v), nil
-		case time.Duration:
-			return float32(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qFloat64:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			return float64(x), nil
-		case idealInt:
-			return float64(x), nil
-		case idealRune:
-			return float64(x), nil
-		case idealUint:
-			return float64(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return float64(x), nil
-		case float64:
-			return float64(x), nil
-		case int8:
-			return float64(x), nil
-		case int16:
-			return float64(x), nil
-		case int32:
-			return float64(x), nil
-		case int64:
-			return float64(x), nil
-		//case string:
-		case uint8:
-			return float64(x), nil
-		case uint16:
-			return float64(x), nil
-		case uint32:
-			return float64(x), nil
-		case uint64:
-			return float64(x), nil
-		case *big.Int:
-			v, _ := big.NewRat(1, 1).SetInt(x).Float64()
-			return v, nil
-		case *big.Rat:
-			v, _ := x.Float64()
-			return v, nil
-		case time.Duration:
-			return float64(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qInt8:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			if _, frac := math.Modf(float64(x)); frac != 0 {
-				return truncConv(x)
-			}
-
-			return int8(x), nil
-		case idealInt:
-			return int8(x), nil
-		case idealRune:
-			return int8(x), nil
-		case idealUint:
-			return int8(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return int8(x), nil
-		case float64:
-			return int8(x), nil
-		case int8:
-			return int8(x), nil
-		case int16:
-			return int8(x), nil
-		case int32:
-			return int8(x), nil
-		case int64:
-			return int8(x), nil
-		//case string:
-		case uint8:
-			return int8(x), nil
-		case uint16:
-			return int8(x), nil
-		case uint32:
-			return int8(x), nil
-		case uint64:
-			return int8(x), nil
-		case *big.Int:
-			return int8(x.Int64()), nil
-		case time.Duration:
-			return int8(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qInt16:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			if _, frac := math.Modf(float64(x)); frac != 0 {
-				return truncConv(x)
-			}
-
-			return int16(x), nil
-		case idealInt:
-			return int16(x), nil
-		case idealRune:
-			return int16(x), nil
-		case idealUint:
-			return int16(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return int16(x), nil
-		case float64:
-			return int16(x), nil
-		case int8:
-			return int16(x), nil
-		case int16:
-			return int16(x), nil
-		case int32:
-			return int16(x), nil
-		case int64:
-			return int16(x), nil
-		//case string:
-		case uint8:
-			return int16(x), nil
-		case uint16:
-			return int16(x), nil
-		case uint32:
-			return int16(x), nil
-		case uint64:
-			return int16(x), nil
-		case *big.Int:
-			return int16(x.Int64()), nil
-		case time.Duration:
-			return int16(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qInt32:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			if _, frac := math.Modf(float64(x)); frac != 0 {
-				return truncConv(x)
-			}
-
-			return int32(x), nil
-		case idealInt:
-			return int32(x), nil
-		case idealRune:
-			return int32(x), nil
-		case idealUint:
-			return int32(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return int32(x), nil
-		case float64:
-			return int32(x), nil
-		case int8:
-			return int32(x), nil
-		case int16:
-			return int32(x), nil
-		case int32:
-			return int32(x), nil
-		case int64:
-			return int32(x), nil
-		//case string:
-		case uint8:
-			return int32(x), nil
-		case uint16:
-			return int32(x), nil
-		case uint32:
-			return int32(x), nil
-		case uint64:
-			return int32(x), nil
-		case *big.Int:
-			return int32(x.Int64()), nil
-		case time.Duration:
-			return int32(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qInt64:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			if _, frac := math.Modf(float64(x)); frac != 0 {
-				return truncConv(x)
-			}
-
-			return int64(x), nil
-		case idealInt:
-			return int64(x), nil
-		case idealRune:
-			return int64(x), nil
-		case idealUint:
-			return int64(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return int64(x), nil
-		case float64:
-			return int64(x), nil
-		case int8:
-			return int64(x), nil
-		case int16:
-			return int64(x), nil
-		case int32:
-			return int64(x), nil
-		case int64:
-			return int64(x), nil
-		//case string:
-		case uint8:
-			return int64(x), nil
-		case uint16:
-			return int64(x), nil
-		case uint32:
-			return int64(x), nil
-		case uint64:
-			return int64(x), nil
-		case *big.Int:
-			return x.Int64(), nil
-		case time.Duration:
-			return int64(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qString:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		//case idealFloat:
-		case idealInt:
-			return string(x), nil
-		case idealRune:
-			return string(x), nil
-		case idealUint:
-			return string(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		//case float32:
-		//case float64:
-		case int8:
-			return string(x), nil
-		case int16:
-			return string(x), nil
-		case int32:
-			return string(x), nil
-		case int64:
-			return string(x), nil
-		case string:
-			return string(x), nil
-		case uint8:
-			return string(x), nil
-		case uint16:
-			return string(x), nil
-		case uint32:
-			return string(x), nil
-		case uint64:
-			return string(x), nil
-		case []byte:
-			return string(x), nil
-		case *big.Int:
-			return x.String(), nil
-		case time.Time:
-			return x.String(), nil
-		case time.Duration:
-			return x.String(), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qUint8:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			if _, frac := math.Modf(float64(x)); frac != 0 {
-				return truncConv(x)
-			}
-
-			return uint8(x), nil
-		case idealInt:
-			return uint8(x), nil
-		case idealRune:
-			return uint8(x), nil
-		case idealUint:
-			return uint8(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return uint8(x), nil
-		case float64:
-			return uint8(x), nil
-		case int8:
-			return uint8(x), nil
-		case int16:
-			return uint8(x), nil
-		case int32:
-			return uint8(x), nil
-		case int64:
-			return uint8(x), nil
-		//case string:
-		case uint8:
-			return uint8(x), nil
-		case uint16:
-			return uint8(x), nil
-		case uint32:
-			return uint8(x), nil
-		case uint64:
-			return uint8(x), nil
-		case *big.Int:
-			return uint8(x.Int64()), nil
-		case time.Duration:
-			return uint8(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qUint16:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			if _, frac := math.Modf(float64(x)); frac != 0 {
-				return truncConv(x)
-			}
-
-			return uint16(x), nil
-		case idealInt:
-			return uint16(x), nil
-		case idealRune:
-			return uint16(x), nil
-		case idealUint:
-			return uint16(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return uint16(x), nil
-		case float64:
-			return uint16(x), nil
-		case int8:
-			return uint16(x), nil
-		case int16:
-			return uint16(x), nil
-		case int32:
-			return uint16(x), nil
-		case int64:
-			return uint16(x), nil
-		//case string:
-		case uint8:
-			return uint16(x), nil
-		case uint16:
-			return uint16(x), nil
-		case uint32:
-			return uint16(x), nil
-		case uint64:
-			return uint16(x), nil
-		case *big.Int:
-			return uint16(x.Int64()), nil
-		case time.Duration:
-			return uint16(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qUint32:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			if _, frac := math.Modf(float64(x)); frac != 0 {
-				return truncConv(x)
-			}
-
-			return uint32(x), nil
-		case idealInt:
-			return uint32(x), nil
-		case idealRune:
-			return uint32(x), nil
-		case idealUint:
-			return uint32(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return uint32(x), nil
-		case float64:
-			return uint32(x), nil
-		case int8:
-			return uint32(x), nil
-		case int16:
-			return uint32(x), nil
-		case int32:
-			return uint32(x), nil
-		case int64:
-			return uint32(x), nil
-		//case string:
-		case uint8:
-			return uint32(x), nil
-		case uint16:
-			return uint32(x), nil
-		case uint32:
-			return uint32(x), nil
-		case uint64:
-			return uint32(x), nil
-		case *big.Int:
-			return uint32(x.Int64()), nil
-		case time.Duration:
-			return uint32(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qUint64:
-		switch x := val.(type) {
-		//case nil:
-		//case idealComplex:
-		case idealFloat:
-			if _, frac := math.Modf(float64(x)); frac != 0 {
-				return truncConv(x)
-			}
-
-			return uint64(x), nil
-		case idealInt:
-			return uint64(x), nil
-		case idealRune:
-			return uint64(x), nil
-		case idealUint:
-			return uint64(x), nil
-		//case bool:
-		//case complex64:
-		//case complex128:
-		case float32:
-			return uint64(x), nil
-		case float64:
-			return uint64(x), nil
-		case int8:
-			return uint64(x), nil
-		case int16:
-			return uint64(x), nil
-		case int32:
-			return uint64(x), nil
-		case int64:
-			return uint64(x), nil
-		//case string:
-		case uint8:
-			return uint64(x), nil
-		case uint16:
-			return uint64(x), nil
-		case uint32:
-			return uint64(x), nil
-		case uint64:
-			return uint64(x), nil
-		case *big.Int:
-			return x.Uint64(), nil
-		case time.Duration:
-			return uint64(x), nil
-		default:
-			return invConv(val, typ)
-		}
-	case qBlob:
-		switch x := val.(type) {
-		case string:
-			return []byte(x), nil
-		case []byte:
-			return x, nil
-		default:
-			return invConv(val, typ)
-		}
-	case qBigInt:
-		switch x := val.(type) {
-		// case blob
-		// case bool
-		//case idealComplex:
-		case idealFloat:
-			if _, frac := math.Modf(float64(x)); frac != 0 {
-				return truncConv(x)
-			}
-
-			rr := big.NewRat(1, 1).SetFloat64(float64(x))
-			ii := big.NewInt(0).Set(rr.Num())
-			ii.Quo(ii, rr.Denom())
-			return ii, nil
-		case idealInt:
-			return big.NewInt(0).SetInt64(int64(x)), nil
-		case idealRune:
-			return big.NewInt(0).SetInt64(int64(x)), nil
-		case idealUint:
-			return big.NewInt(0).SetUint64(uint64(x)), nil
-		//case complex64
-		//case complex128
-		case float32:
-			rr := big.NewRat(1, 1).SetFloat64(float64(x))
-			ii := big.NewInt(0).Set(rr.Num())
-			ii.Quo(ii, rr.Denom())
-			return ii, nil
-		case float64:
-			rr := big.NewRat(1, 1).SetFloat64(float64(x))
-			ii := big.NewInt(0).Set(rr.Num())
-			ii.Quo(ii, rr.Denom())
-			return ii, nil
-		case int8:
-			return big.NewInt(0).SetInt64(int64(x)), nil
-		case int16:
-			return big.NewInt(0).SetInt64(int64(x)), nil
-		case int32:
-			return big.NewInt(0).SetInt64(int64(x)), nil
-		case int64:
-			return big.NewInt(0).SetInt64(x), nil
-		case string:
-			y := big.NewInt(0)
-			if _, ok := y.SetString(x, 0); !ok {
-				return invConv(val, typ)
-			}
-
-			return y, nil
-		case uint8:
-			return big.NewInt(0).SetUint64(uint64(x)), nil
-		case uint16:
-			return big.NewInt(0).SetUint64(uint64(x)), nil
-		case uint32:
-			return big.NewInt(0).SetUint64(uint64(x)), nil
-		case uint64:
-			return big.NewInt(0).SetUint64(x), nil
-		case *big.Int:
-			return x, nil
-		case *big.Rat:
-			ii := big.NewInt(0).Set(x.Num())
-			ii.Div(ii, x.Denom())
-			return ii, nil
-		default:
-			return invConv(val, typ)
-		}
-	case qBigRat:
-		switch x := val.(type) {
-		// case blob
-		// case bool
-		//case idealComplex:
-		case idealFloat:
-			return big.NewRat(1, 1).SetFloat64(float64(x)), nil
-		case idealInt:
-			return big.NewRat(1, 1).SetInt64(int64(x)), nil
-		case idealRune:
-			return big.NewRat(1, 1).SetInt64(int64(x)), nil
-		case idealUint:
-			return big.NewRat(1, 1).SetInt(big.NewInt(0).SetUint64(uint64(x))), nil
-		//case complex64
-		//case complex128
-		case float32:
-			return big.NewRat(1, 1).SetFloat64(float64(x)), nil
-		case float64:
-			return big.NewRat(1, 1).SetFloat64(x), nil
-		case int8:
-			return big.NewRat(1, 1).SetInt64(int64(x)), nil
-		case int16:
-			return big.NewRat(1, 1).SetInt64(int64(x)), nil
-		case int32:
-			return big.NewRat(1, 1).SetInt64(int64(x)), nil
-		case int64:
-			return big.NewRat(1, 1).SetInt64(x), nil
-		case string:
-			y := big.NewRat(1, 1)
-			if _, ok := y.SetString(x); !ok {
-				return invConv(val, typ)
-			}
-
-			return y, nil
-		case uint8:
-			return big.NewRat(1, 1).SetInt64(int64(x)), nil
-		case uint16:
-			return big.NewRat(1, 1).SetInt64(int64(x)), nil
-		case uint32:
-			return big.NewRat(1, 1).SetInt64(int64(x)), nil
-		case uint64:
-			return big.NewRat(1, 1).SetInt(big.NewInt(0).SetUint64(x)), nil
-		case *big.Int:
-			return big.NewRat(1, 1).SetInt(x), nil
-		case *big.Rat:
-			return x, nil
-		default:
-			return invConv(val, typ)
-		}
-	case qDuration:
-		switch x := val.(type) {
-		// case blob
-		// case bool
-		//case idealComplex:
-		case idealFloat:
-			return time.Duration(x), nil
-		case idealInt:
-			return time.Duration(x), nil
-		case idealRune:
-			return time.Duration(x), nil
-		case idealUint:
-			return time.Duration(x), nil
-		//case complex64
-		//case complex128
-		case float32:
-			return time.Duration(x), nil
-		case float64:
-			return time.Duration(x), nil
-		case int8:
-			return time.Duration(x), nil
-		case int16:
-			return time.Duration(x), nil
-		case int32:
-			return time.Duration(x), nil
-		case int64:
-			return time.Duration(x), nil
-		case string:
-			return time.ParseDuration(x)
-		case uint8:
-			return time.Duration(x), nil
-		case uint16:
-			return time.Duration(x), nil
-		case uint32:
-			return time.Duration(x), nil
-		case uint64:
-			return time.Duration(x), nil
-		case *big.Int:
-			return time.Duration(x.Int64()), nil
-		case *big.Rat:
-			f, _ := x.Float64()
-			return time.Duration(f), nil
-		case time.Duration:
-			return x, nil
-		default:
-			return invConv(val, typ)
-		}
-	case qTime:
-		switch x := val.(type) {
-		// case blob
-		// case bool
-		//case idealComplex:
-		//case idealFloat:
-		//case idealInt:
-		//case idealRune:
-		//case idealUint:
-		//case complex64
-		//case complex128
-		//case float32:
-		//case float64:
-		//case int8:
-		//case int16:
-		//case int32:
-		//case int64:
-		//case string:
-		//case uint8:
-		//case uint16:
-		//case uint32:
-		//case uint64:
-		//case *big.Int:
-		//case *big.Rat:
-		//case time.Duration:
-		case time.Time:
-			return x, nil
-		default:
-			return invConv(val, typ)
-		}
-	default:
-		panic("internal error 006")
-	}
-}
-
-func invShiftRHS(lhs, rhs interface{}) (interface{}, error) {
-	return nil, fmt.Errorf("invalid operation: %v << %v (shift count type %T, must be unsigned integer)", lhs, rhs, rhs)
-}
-
-func invTruncInt(v interface{}) error {
-	return fmt.Errorf("constant %v truncated to integer", v)
-}
-
-func overflow(v interface{}, typ int) error {
-	return fmt.Errorf("constant %v overflows %s", v, typeStr(typ))
-}
-
-func typeCheck1(val interface{}, c *col) (interface{}, error) {
-	rec := []interface{}{val}
-	c = c.clone()
-	c.index = 0
-	if err := typeCheck(rec, []*col{c}); err != nil {
-		return nil, err
-	}
-
-	return rec[0], nil
-}
-
-func typeCheck(rec []interface{}, cols []*col) (err error) {
-	for _, c := range cols {
-		i := c.index
-		if v := rec[i]; !c.typeCheck(v) {
-			switch v.(type) {
-			case idealComplex:
-				y := complex128(v.(idealComplex))
-				switch c.typ {
-				case qBool:
-				case qComplex64:
-					rec[i] = complex64(y)
-					continue
-				case qComplex128:
-					rec[i] = complex128(y)
-					continue
-				case qFloat32, qFloat64, qInt8, qInt16, qInt32, qInt64, qUint8, qUint16, qUint32, qUint64:
-					return fmt.Errorf("constant %v truncated to real", y)
-				}
-			case idealFloat:
-				y := float64(v.(idealFloat))
-				switch c.typ {
-				case qBool:
-				case qComplex64:
-					rec[i] = complex(float32(y), 0)
-					continue
-				case qComplex128:
-					rec[i] = complex(float64(y), 0)
-					continue
-				case qFloat32:
-					rec[i] = float32(y)
-					continue
-				case qFloat64:
-					rec[i] = float64(y)
-					continue
-				case qInt8:
-					if math.Floor(y) != y {
-						return invTruncInt(y)
-					}
-
-					if y < math.MinInt8 || y > math.MaxInt8 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int8(y)
-					continue
-				case qInt16:
-					if math.Floor(y) != y {
-						return invTruncInt(y)
-					}
-
-					if y < math.MinInt16 || y > math.MaxInt16 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int16(y)
-					continue
-				case qInt32:
-					if math.Floor(y) != y {
-						return invTruncInt(y)
-					}
-
-					if y < math.MinInt32 || y > math.MaxInt32 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int32(y)
-					continue
-				case qInt64:
-					if math.Floor(y) != y {
-						return invTruncInt(y)
-					}
-
-					if y < math.MinInt64 || y > math.MaxInt64 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int64(y)
-					continue
-				case qString:
-				case qUint8:
-					if math.Floor(y) != y {
-						return invTruncInt(y)
-					}
-
-					if y < 0 || y > math.MaxUint8 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint8(y)
-					continue
-				case qUint16:
-					if math.Floor(y) != y {
-						return invTruncInt(y)
-					}
-
-					if y < 0 || y > math.MaxUint16 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint16(y)
-					continue
-				case qUint32:
-					if math.Floor(y) != y {
-						return invTruncInt(y)
-					}
-
-					if y < 0 || y > math.MaxUint32 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint32(y)
-					continue
-				case qUint64:
-					if math.Floor(y) != y {
-						return invTruncInt(y)
-					}
-
-					if y < 0 || y > math.MaxUint64 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint64(y)
-					continue
-				case qBigInt:
-					if math.Floor(y) != y {
-						return invTruncInt(y)
-					}
-
-					rr := big.NewRat(1, 1).SetFloat64(y)
-					ii := big.NewInt(0)
-					ii.Set(rr.Num())
-					ii.Quo(ii, rr.Denom())
-					rec[i] = ii
-					continue
-				case qBigRat:
-					rec[i] = big.NewRat(1, 1).SetFloat64(y)
-					continue
-				}
-			case idealInt:
-				y := int64(v.(idealInt))
-				switch c.typ {
-				case qBool:
-				case qComplex64:
-					rec[i] = complex(float32(y), 0)
-					continue
-				case qComplex128:
-					rec[i] = complex(float64(y), 0)
-					continue
-				case qFloat32:
-					rec[i] = float32(y)
-					continue
-				case qFloat64:
-					rec[i] = float64(y)
-					continue
-				case qInt8:
-					if y < math.MinInt8 || y > math.MaxInt8 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int8(y)
-					continue
-				case qInt16:
-					if y < math.MinInt16 || y > math.MaxInt16 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int16(y)
-					continue
-				case qInt32:
-					if y < math.MinInt32 || y > math.MaxInt32 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int32(y)
-					continue
-				case qInt64:
-					if y < math.MinInt64 || y > math.MaxInt64 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int64(y)
-					continue
-				case qString:
-				case qUint8:
-					if y < 0 || y > math.MaxUint8 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint8(y)
-					continue
-				case qUint16:
-					if y < 0 || y > math.MaxUint16 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint16(y)
-					continue
-				case qUint32:
-					if y < 0 || y > math.MaxUint32 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint32(y)
-					continue
-				case qUint64:
-					if y < 0 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint64(y)
-					continue
-				case qBigInt:
-					rec[i] = big.NewInt(y)
-					continue
-				case qBigRat:
-					rec[i] = big.NewRat(1, 1).SetInt64(y)
-					continue
-				}
-			case idealRune:
-				y := int64(v.(idealRune))
-				switch c.typ {
-				case qBool:
-				case qComplex64:
-					rec[i] = complex(float32(y), 0)
-					continue
-				case qComplex128:
-					rec[i] = complex(float64(y), 0)
-					continue
-				case qFloat32:
-					rec[i] = float32(y)
-					continue
-				case qFloat64:
-					rec[i] = float64(y)
-					continue
-				case qInt8:
-					if y < math.MinInt8 || y > math.MaxInt8 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int8(y)
-					continue
-				case qInt16:
-					if y < math.MinInt16 || y > math.MaxInt16 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int16(y)
-					continue
-				case qInt32:
-					if y < math.MinInt32 || y > math.MaxInt32 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int32(y)
-					continue
-				case qInt64:
-					if y < math.MinInt64 || y > math.MaxInt64 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int64(y)
-					continue
-				case qString:
-				case qUint8:
-					if y < 0 || y > math.MaxUint8 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint8(y)
-					continue
-				case qUint16:
-					if y < 0 || y > math.MaxUint16 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint16(y)
-					continue
-				case qUint32:
-					if y < 0 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint32(y)
-					continue
-				case qUint64:
-					if y < 0 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint64(y)
-					continue
-				case qBigInt:
-					rec[i] = big.NewInt(y)
-					continue
-				case qBigRat:
-					rec[i] = big.NewRat(1, 1).SetInt64(y)
-					continue
-				}
-			case idealUint:
-				y := uint64(v.(idealUint))
-				switch c.typ {
-				case qBool:
-				case qComplex64:
-					rec[i] = complex(float32(y), 0)
-					continue
-				case qComplex128:
-					rec[i] = complex(float64(y), 0)
-					continue
-				case qFloat32:
-					rec[i] = float32(y)
-					continue
-				case qFloat64:
-					rec[i] = float64(y)
-					continue
-				case qInt8:
-					if y > math.MaxInt8 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int8(y)
-					continue
-				case qInt16:
-					if y > math.MaxInt16 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int16(y)
-					continue
-				case qInt32:
-					if y > math.MaxInt32 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int32(y)
-					continue
-				case qInt64:
-					if y > math.MaxInt64 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = int64(y)
-					continue
-				case qString:
-					rec[i] = string(y)
-					continue
-				case qUint8:
-					if y > math.MaxUint8 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint8(y)
-					continue
-				case qUint16:
-					if y > math.MaxUint16 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint16(y)
-					continue
-				case qUint32:
-					if y > math.MaxUint32 {
-						return overflow(y, c.typ)
-					}
-
-					rec[i] = uint32(y)
-					continue
-				case qUint64:
-					rec[i] = uint64(y)
-					continue
-				case qBigInt:
-					rec[i] = big.NewInt(0).SetUint64(y)
-					continue
-				case qBigRat:
-					ii := big.NewInt(0).SetUint64(y)
-					rec[i] = big.NewRat(1, 1).SetInt(ii)
-					continue
-				}
-			}
-			return fmt.Errorf("cannot use %v (type %T) in assignment to, or comparison with, column %s (type %s)", v, ideal(v), c.name, typeStr(c.typ))
-		}
-	}
-	return
-}
-
-//TODO collate1 should return errors instead of panicing
-func collate1(a, b interface{}) int {
-	switch x := a.(type) {
-	case nil:
-		if b != nil {
-			return -1
-		}
-
-		return 0
-	case bool:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case bool:
-			if !x && y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		default:
-			// Make bool collate before anything except nil and
-			// other bool for index seeking first non NULL value.
-			return -1
-		}
-	case idealComplex:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case idealComplex:
-			if x == y {
-				return 0
-			}
-
-			if real(x) < real(y) {
-				return -1
-			}
-
-			if real(x) > real(y) {
-				return 1
-			}
-
-			if imag(x) < imag(y) {
-				return -1
-			}
-
-			return 1
-		case complex64:
-			{
-				x, y := complex64(x), complex64(y)
-				if x == y {
-					return 0
-				}
-
-				if real(x) < real(y) {
-					return -1
-				}
-
-				if real(x) > real(y) {
-					return 1
-				}
-
-				if imag(x) < imag(y) {
-					return -1
-				}
-
-				return 1
-			}
-		case complex128:
-			{
-				x := complex128(x)
-				if x == y {
-					return 0
-				}
-
-				if real(x) < real(y) {
-					return -1
-				}
-
-				if real(x) > real(y) {
-					return 1
-				}
-
-				if imag(x) < imag(y) {
-					return -1
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 012")
-		}
-	case idealUint:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case idealUint:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case uint8:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case uint16:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case uint32:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case uint64:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case uint:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 013")
-		}
-	case idealRune:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case idealRune:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case int8:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case int16:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case int32:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case int64:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case int:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 014")
-		}
-	case idealInt:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case idealInt:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case int8:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case int16:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case int32:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case int64:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case int:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 015")
-		}
-	case idealFloat:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case idealFloat:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case float32:
-			{
-				x, y := float64(x), float64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case float64:
-			{
-				x, y := float64(x), float64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 016")
-		}
-	case complex64:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case complex64:
-			if x == y {
-				return 0
-			}
-
-			if real(x) < real(y) {
-				return -1
-			}
-
-			if real(x) > real(y) {
-				return 1
-			}
-
-			if imag(x) < imag(y) {
-				return -1
-			}
-
-			return 1
-		case idealComplex:
-			{
-				x, y := complex64(x), complex64(y)
-				if x == y {
-					return 0
-				}
-
-				if real(x) < real(y) {
-					return -1
-				}
-
-				if real(x) > real(y) {
-					return 1
-				}
-
-				if imag(x) < imag(y) {
-					return -1
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 017")
-		}
-	case complex128:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case complex128:
-			if x == y {
-				return 0
-			}
-
-			if real(x) < real(y) {
-				return -1
-			}
-
-			if real(x) > real(y) {
-				return 1
-			}
-
-			if imag(x) < imag(y) {
-				return -1
-			}
-
-			return 1
-		case idealComplex:
-			{
-				x, y := complex128(x), complex128(y)
-				if x == y {
-					return 0
-				}
-
-				if real(x) < real(y) {
-					return -1
-				}
-
-				if real(x) > real(y) {
-					return 1
-				}
-
-				if imag(x) < imag(y) {
-					return -1
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 018")
-		}
-	case float32:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case float32:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealFloat:
-			{
-				x, y := float32(x), float32(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 019")
-		}
-	case float64:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case float64:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealFloat:
-			{
-				x, y := float64(x), float64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 020")
-		}
-	case int8:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case int8:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealInt:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 021")
-		}
-	case int16:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case int16:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealInt:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 022")
-		}
-	case int32:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case int32:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealInt:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 023")
-		}
-	case int64:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case int64:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealInt:
-			{
-				x, y := int64(x), int64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 024")
-		}
-	case uint8:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case uint8:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealInt:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case idealUint:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 025")
-		}
-	case uint16:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case uint16:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealInt:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case idealUint:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 026")
-		}
-	case uint32:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case uint32:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealInt:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case idealUint:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 027")
-		}
-	case uint64:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case uint64:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		case idealInt:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		case idealUint:
-			{
-				x, y := uint64(x), uint64(y)
-				if x < y {
-					return -1
-				}
-
-				if x == y {
-					return 0
-				}
-
-				return 1
-			}
-		default:
-			panic("internal error 028")
-		}
-	case string:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case string:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		default:
-			panic("internal error 029")
-		}
-	case []byte:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case []byte:
-			return bytes.Compare(x, y)
-		default:
-			panic("internal error 030")
-		}
-	case *big.Int:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case *big.Int:
-			return x.Cmp(y)
-		case idealInt:
-			{
-				y := big.NewInt(int64(y))
-				return x.Cmp(y)
-			}
-		case idealUint:
-			{
-				u := big.NewInt(0)
-				u.SetUint64(uint64(y))
-				return x.Cmp(u)
-			}
-		default:
-			panic("internal error 031")
-		}
-	case *big.Rat:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case *big.Rat:
-			return x.Cmp(y)
-		case idealInt:
-			{
-				y := big.NewRat(int64(y), 1)
-				return x.Cmp(y)
-			}
-		case idealUint:
-			{
-				u := big.NewInt(0)
-				u.SetUint64(uint64(y))
-				var y big.Rat
-				y.SetInt(u)
-				return x.Cmp(&y)
-			}
-		default:
-			panic("internal error 032")
-		}
-	case time.Time:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case time.Time:
-			if x.Before(y) {
-				return -1
-			}
-
-			if x.Equal(y) {
-				return 0
-			}
-
-			return 1
-		default:
-			panic("internal error 033")
-		}
-	case time.Duration:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case time.Duration:
-			if x < y {
-				return -1
-			}
-
-			if x == y {
-				return 0
-			}
-
-			return 1
-		default:
-			panic("internal error 034")
-		}
-	case chunk:
-		switch y := b.(type) {
-		case nil:
-			return 1
-		case chunk:
-			a, err := x.expand()
-			if err != nil {
-				panic(err)
-			}
-
-			b, err := y.expand()
-			if err != nil {
-				panic(err)
-			}
-
-			return collate1(a, b)
-		default:
-			panic("internal error 035")
-		}
-	default:
-		//dbg("%T(%v) %T(%v)", a, a, b, b)
-		panic("internal error 036")
-	}
-}
-
-//TODO collate should return errors from collate1
-func collate(x, y []interface{}) (r int) {
-	//defer func() { dbg("%v %v -> %v", x, y, r) }()
-	nx, ny := len(x), len(y)
-
-	switch {
-	case nx == 0 && ny != 0:
-		return -1
-	case nx == 0 && ny == 0:
-		return 0
-	case nx != 0 && ny == 0:
-		return 1
-	}
-
-	r = 1
-	if nx > ny {
-		x, y, r = y, x, -r
-	}
-
-	for i, xi := range x {
-		if c := collate1(xi, y[i]); c != 0 {
-			return c * r
-		}
-	}
-
-	if nx == ny {
-		return 0
-	}
-
-	return -r
-}
-
-var collators = map[bool]func(a, b []interface{}) int{false: collateDesc, true: collate}
-
-func collateDesc(a, b []interface{}) int {
-	return -collate(a, b)
-}
-
-func isOrderedType(v interface{}) (y interface{}, r bool, err error) {
-	//dbg("====")
-	//dbg("%T(%v)", v, v)
-	//defer func() { dbg("%T(%v)", y, y) }()
-	switch x := v.(type) {
-	case idealFloat, idealInt, idealRune, idealUint,
-		float32, float64,
-		int8, int16, int32, int64,
-		uint8, uint16, uint32, uint64,
-		string:
-		return v, true, nil
-	case *big.Int, *big.Rat, time.Time, time.Duration:
-		return x, true, nil
-	case chunk:
-		if y, err = x.expand(); err != nil {
-			return
-		}
-
-		return isOrderedType(y)
-	}
-
-	return v, false, nil
-}
-
-var isSystemName = map[string]bool{
-	"__Column":        true,
-	"__Column2":       true,
-	"__Index":         true,
-	"__Index2":        true,
-	"__Index2_Column": true,
-	"__Index2_Expr":   true,
-	"__Table":         true,
-}
-
-func qualifier(s string) string {
-	if pos := strings.IndexByte(s, '.'); pos >= 0 {
-		s = s[:pos]
-	}
-	return s
-}
-
-func mustQualifier(s string) string {
-	q := qualifier(s)
-	if q == s {
-		panic("internal error 068")
-	}
-
-	return q
-}
-
-func selector(s string) string {
-	if pos := strings.IndexByte(s, '.'); pos >= 0 {
-		s = s[pos+1:]
-	}
-	return s
-}
-
-func mustSelector(s string) string {
-	q := selector(s)
-	if q == s {
-		panic("internal error 053")
-	}
-
-	return q
-}
-
-func qnames(l []string) []string {
-	r := make([]string, len(l))
-	for i, v := range l {
-		r[i] = fmt.Sprintf("%q", v)
-	}
-	return r
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/expr.go b/Godeps/_workspace/src/github.com/cznic/ql/expr.go
deleted file mode 100644
index 3e6954fbe6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/expr.go
+++ /dev/null
@@ -1,4023 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found pIn the LICENSE file.
-
-package ql
-
-import (
-	"fmt"
-	"math/big"
-	"regexp"
-	"strings"
-	"time"
-)
-
-var (
-	_ expression = (*binaryOperation)(nil)
-	_ expression = (*call)(nil)
-	_ expression = (*conversion)(nil)
-	_ expression = (*ident)(nil)
-	_ expression = (*indexOp)(nil)
-	_ expression = (*isNull)(nil)
-	_ expression = (*pIn)(nil)
-	_ expression = (*pLike)(nil)
-	_ expression = (*parameter)(nil)
-	_ expression = (*pexpr)(nil)
-	_ expression = (*slice)(nil)
-	_ expression = (*unaryOperation)(nil)
-	_ expression = value{}
-)
-
-type expression interface {
-	clone(arg []interface{}, unqualify ...string) (expression, error)
-	eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error)
-	isStatic() bool
-	String() string
-}
-
-func cloneExpressionList(arg []interface{}, list []expression, unqualify ...string) ([]expression, error) {
-	r := make([]expression, len(list))
-	var err error
-	for i, v := range list {
-		if r[i], err = v.clone(arg, unqualify...); err != nil {
-			return nil, err
-		}
-	}
-	return r, nil
-}
-
-func isConstValue(v interface{}) interface{} {
-	switch x := v.(type) {
-	case value:
-		return x.val
-	case
-		idealComplex,
-		idealFloat,
-		idealInt,
-		idealRune,
-		idealUint:
-		return v
-	default:
-		return nil
-	}
-}
-
-func isColumnExpression(v expression) (bool, string) {
-	x, ok := v.(*ident)
-	if ok {
-		return true, x.s
-	}
-
-	c, ok := v.(*call)
-	if !ok || c.f != "id" || len(c.arg) != 0 {
-		return false, ""
-	}
-
-	return true, "id()"
-}
-
-func mentionedColumns0(e expression, q, nq bool, m map[string]struct{}) {
-	switch x := e.(type) {
-	case parameter,
-		value:
-		// nop
-	case *binaryOperation:
-		mentionedColumns0(x.l, q, nq, m)
-		mentionedColumns0(x.r, q, nq, m)
-	case *call:
-		if x.f != "id" {
-			for _, e := range x.arg {
-				mentionedColumns0(e, q, nq, m)
-			}
-		}
-	case *conversion:
-		mentionedColumns0(x.val, q, nq, m)
-	case *ident:
-		if q && x.isQualified() {
-			m[x.s] = struct{}{}
-		}
-		if nq && !x.isQualified() {
-			m[x.s] = struct{}{}
-		}
-	case *indexOp:
-		mentionedColumns0(x.expr, q, nq, m)
-		mentionedColumns0(x.x, q, nq, m)
-	case *isNull:
-		mentionedColumns0(x.expr, q, nq, m)
-	case *pexpr:
-		mentionedColumns0(x.expr, q, nq, m)
-	case *pIn:
-		mentionedColumns0(x.expr, q, nq, m)
-		for _, e := range x.list {
-			mentionedColumns0(e, q, nq, m)
-		}
-	case *pLike:
-		mentionedColumns0(x.expr, q, nq, m)
-		mentionedColumns0(x.pattern, q, nq, m)
-	case *slice:
-		mentionedColumns0(x.expr, q, nq, m)
-		if y := x.lo; y != nil {
-			mentionedColumns0(*y, q, nq, m)
-		}
-		if y := x.hi; y != nil {
-			mentionedColumns0(*y, q, nq, m)
-		}
-	case *unaryOperation:
-		mentionedColumns0(x.v, q, nq, m)
-	default:
-		panic("internal error 052")
-	}
-}
-
-func mentionedColumns(e expression) map[string]struct{} {
-	m := map[string]struct{}{}
-	mentionedColumns0(e, false, true, m)
-	return m
-}
-
-func mentionedQColumns(e expression) map[string]struct{} {
-	m := map[string]struct{}{}
-	mentionedColumns0(e, true, false, m)
-	return m
-}
-
-func staticExpr(e expression) (expression, error) {
-	if e.isStatic() {
-		v, err := e.eval(nil, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		if v == nil {
-			return value{nil}, nil
-		}
-
-		return value{v}, nil
-	}
-
-	return e, nil
-}
-
-type (
-	idealComplex complex128
-	idealFloat   float64
-	idealInt     int64
-	idealRune    int32
-	idealUint    uint64
-)
-
-type exprTab struct {
-	expr  expression
-	table string
-}
-
-type pexpr struct {
-	expr expression
-}
-
-func (p *pexpr) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	expr, err := p.expr.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	return &pexpr{expr: expr}, nil
-}
-
-func (p *pexpr) isStatic() bool { return p.expr.isStatic() }
-
-func (p *pexpr) String() string {
-	return fmt.Sprintf("(%s)", p.expr)
-}
-
-func (p *pexpr) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	return p.expr.eval(execCtx, ctx)
-}
-
-//DONE newBetween
-//LATER like newBetween, check all others have and use new*
-
-func newBetween(expr, lo, hi interface{}, not bool) (expression, error) {
-	e, err := staticExpr(expr.(expression))
-	if err != nil {
-		return nil, err
-	}
-
-	l, err := staticExpr(lo.(expression))
-	if err != nil {
-		return nil, err
-	}
-
-	h, err := staticExpr(hi.(expression))
-	if err != nil {
-		return nil, err
-	}
-
-	var a, b expression
-	op := andand
-	switch {
-	case not: // e < l || e > h
-		op = oror
-		if a, err = newBinaryOperation('<', e, l); err != nil {
-			return nil, err
-		}
-
-		if b, err = newBinaryOperation('>', e, h); err != nil {
-			return nil, err
-		}
-	default: // e >= l && e <= h
-		if a, err = newBinaryOperation(ge, e, l); err != nil {
-			return nil, err
-		}
-
-		if b, err = newBinaryOperation(le, e, h); err != nil {
-			return nil, err
-		}
-	}
-
-	if a, err = staticExpr(a); err != nil {
-		return nil, err
-	}
-
-	if b, err = staticExpr(b); err != nil {
-		return nil, err
-	}
-
-	ret, err := newBinaryOperation(op, a, b)
-	if err != nil {
-		return nil, err
-	}
-
-	return staticExpr(ret)
-}
-
-type pLike struct {
-	expr    expression
-	pattern expression
-	re      *regexp.Regexp
-	sexpr   *string
-}
-
-func (p *pLike) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	expr, err := p.expr.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	pattern, err := p.pattern.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	return &pLike{
-		expr:    expr,
-		pattern: pattern,
-		re:      p.re,
-		sexpr:   p.sexpr,
-	}, nil
-}
-
-func (p *pLike) isStatic() bool { return p.expr.isStatic() && p.pattern.isStatic() }
-func (p *pLike) String() string { return fmt.Sprintf("%s LIKE %s", p.expr, p.pattern) }
-
-func (p *pLike) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	var sexpr string
-	var ok bool
-	switch {
-	case p.sexpr != nil:
-		sexpr = *p.sexpr
-	default:
-		expr, err := expand1(p.expr.eval(execCtx, ctx))
-		if err != nil {
-			return nil, err
-		}
-
-		if expr == nil {
-			return nil, nil
-		}
-
-		sexpr, ok = expr.(string)
-		if !ok {
-			return nil, fmt.Errorf("non-string expression in LIKE: %v (value of type %T)", expr, expr)
-		}
-
-		if p.expr.isStatic() {
-			p.sexpr = new(string)
-			*p.sexpr = sexpr
-		}
-	}
-
-	re := p.re
-	if re == nil {
-		pattern, err := expand1(p.pattern.eval(execCtx, ctx))
-		if err != nil {
-			return nil, err
-		}
-
-		if pattern == nil {
-			return nil, nil
-		}
-
-		spattern, ok := pattern.(string)
-		if !ok {
-			return nil, fmt.Errorf("non-string pattern in LIKE: %v (value of type %T)", pattern, pattern)
-		}
-
-		if re, err = regexp.Compile(spattern); err != nil {
-			return nil, err
-		}
-
-		if p.pattern.isStatic() {
-			p.re = re
-		}
-	}
-
-	return re.MatchString(sexpr), nil
-}
-
-type binaryOperation struct {
-	op   int
-	l, r expression
-}
-
-func newBinaryOperation0(op int, x, y interface{}) (v expression, err error) {
-	if op == eq {
-		if l, ok := x.(value); ok {
-			if b, ok := l.val.(bool); ok {
-				if b { // true == y: y
-					return y.(expression), nil
-				}
-
-				// false == y: !y
-				return newUnaryOperation('!', y)
-			}
-		}
-
-		if r, ok := y.(value); ok {
-			if b, ok := r.val.(bool); ok {
-				if b { // x == true: x
-					return x.(expression), nil
-				}
-
-				// x == false: !x
-				return newUnaryOperation('!', x)
-			}
-		}
-	}
-
-	if op == neq {
-		if l, ok := x.(value); ok {
-			if b, ok := l.val.(bool); ok {
-				if b { // true != y: !y
-					return newUnaryOperation('!', y)
-				}
-
-				// false != y: y
-				return y.(expression), nil
-			}
-		}
-
-		if r, ok := y.(value); ok {
-			if b, ok := r.val.(bool); ok {
-				if b { // x != true: !x
-					return newUnaryOperation('!', x)
-				}
-
-				// x != false: x
-				return x.(expression), nil
-			}
-		}
-	}
-
-	b := binaryOperation{op, x.(expression), y.(expression)}
-	var lv interface{}
-	if e := b.l; e.isStatic() {
-		if lv, err = e.eval(nil, nil); err != nil {
-			return nil, err
-		}
-
-		b.l = value{lv}
-	}
-
-	if e := b.r; e.isStatic() {
-		v, err := e.eval(nil, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		if v == nil {
-			return value{nil}, nil
-		}
-
-		if op == '/' || op == '%' {
-			rb := binaryOperation{eq, e, value{idealInt(0)}}
-			val, err := rb.eval(nil, nil)
-			if err != nil {
-				return nil, err
-			}
-
-			if val.(bool) {
-				return nil, errDivByZero
-			}
-		}
-
-		if b.l.isStatic() && lv == nil {
-			return value{nil}, nil
-		}
-
-		b.r = value{v}
-	}
-
-	if !b.isStatic() {
-		return &b, nil
-	}
-
-	val, err := b.eval(nil, nil)
-	return value{val}, err
-}
-
-func newBinaryOperation(op int, x, y interface{}) (v expression, err error) {
-	expr, err := newBinaryOperation0(op, x, y)
-	if err != nil {
-		return nil, err
-	}
-
-	b, ok := expr.(*binaryOperation)
-	if !ok {
-		return expr, nil
-	}
-
-	if _, ok := b.l.(*ident); ok {
-		return expr, nil
-	}
-
-	if c, ok := b.l.(*call); ok && c.f == "id" {
-		return expr, nil
-	}
-
-	var r expression
-	if r, ok = b.r.(*ident); !ok {
-		r1, ok := b.r.(*call)
-		if !ok || r1.f != "id" || len(r1.arg) != 0 {
-			return expr, nil
-		}
-
-		r = r1
-	}
-
-	// Normalize expr relOp indent: ident invRelOp expr
-	switch b.op {
-	case '<':
-		return &binaryOperation{'>', r, b.l}, nil
-	case le:
-		return &binaryOperation{ge, r, b.l}, nil
-	case '>':
-		return &binaryOperation{'<', r, b.l}, nil
-	case ge:
-		return &binaryOperation{le, r, b.l}, nil
-	case eq, neq:
-		return &binaryOperation{b.op, r, b.l}, nil
-	default:
-		return expr, nil
-	}
-}
-
-func (o *binaryOperation) isIdentRelOpVal() (bool, string, interface{}, error) {
-	sid := ""
-	id, ok := o.l.(*ident)
-	if !ok {
-		f, ok := o.l.(*call)
-		if !ok || f.f != "id" || len(f.arg) != 0 {
-			return false, "", nil, nil
-		}
-
-		sid = "id()"
-	} else {
-		if id.isQualified() {
-			return false, "", nil, nil
-		}
-
-		sid = id.s
-	}
-
-	if v, ok := o.r.(value); ok {
-		switch o.op {
-		case '<',
-			le,
-			'>',
-			ge,
-			eq,
-			neq:
-			return true, sid, v.val, nil
-		default:
-			return false, "", nil, nil
-		}
-	}
-
-	return false, "", nil, nil
-}
-
-func (o *binaryOperation) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	l, err := o.l.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	r, err := o.r.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	return newBinaryOperation(o.op, l, r)
-}
-
-func (o *binaryOperation) isStatic() bool { return o.l.isStatic() && o.r.isStatic() }
-
-func (o *binaryOperation) String() string {
-	return fmt.Sprintf("%s %s %s", o.l, iop(o.op), o.r)
-}
-
-func (o *binaryOperation) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (r interface{}, err error) {
-	defer func() {
-		if e := recover(); e != nil {
-			switch x := e.(type) {
-			case error:
-				r, err = nil, x
-			default:
-				r, err = nil, fmt.Errorf("%v", x)
-			}
-		}
-	}()
-
-	switch op := o.op; op {
-	case andand:
-		a, err := expand1(o.l.eval(execCtx, ctx))
-		if err != nil {
-			return nil, err
-		}
-
-		switch x := a.(type) {
-		case nil:
-			b, err := expand1(o.r.eval(execCtx, ctx))
-			if err != nil {
-				return nil, err
-			}
-
-			switch y := b.(type) {
-			case nil:
-				return nil, nil
-			case bool:
-				if !y {
-					return false, nil
-				}
-
-				return nil, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			if !x {
-				return false, nil
-			}
-
-			b, err := expand1(o.r.eval(execCtx, ctx))
-			if err != nil {
-				return nil, err
-			}
-
-			switch y := b.(type) {
-			case nil:
-				return nil, nil
-			case bool:
-				return y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return undOp(x, op)
-		}
-	case oror:
-		a, err := expand1(o.l.eval(execCtx, ctx))
-		if err != nil {
-			return nil, err
-		}
-
-		switch x := a.(type) {
-		case nil:
-			b, err := expand1(o.r.eval(execCtx, ctx))
-			if err != nil {
-				return nil, err
-			}
-
-			switch y := b.(type) {
-			case nil:
-				return nil, nil
-			case bool:
-				if y {
-					return y, nil
-				}
-
-				return nil, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			if x {
-				return x, nil
-			}
-
-			b, err := expand1(o.r.eval(execCtx, ctx))
-			if err != nil {
-				return nil, err
-			}
-
-			switch y := b.(type) {
-			case nil:
-				return nil, nil
-			case bool:
-				return y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return undOp(x, op)
-		}
-	case '>':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			switch y := b.(type) {
-			case string:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				return x.Cmp(y) > 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				return x.Cmp(y) > 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x > y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Time:
-			switch y := b.(type) {
-			case time.Time:
-				return x.After(y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case '<':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			switch y := b.(type) {
-			case string:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				return x.Cmp(y) < 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				return x.Cmp(y) < 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x < y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Time:
-			switch y := b.(type) {
-			case time.Time:
-				return x.Before(y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case le:
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			switch y := b.(type) {
-			case string:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				return x.Cmp(y) <= 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				return x.Cmp(y) <= 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x <= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Time:
-			switch y := b.(type) {
-			case time.Time:
-				return x.Before(y) || x.Equal(y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case ge:
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			switch y := b.(type) {
-			case string:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				return x.Cmp(y) >= 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				return x.Cmp(y) >= 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x >= y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Time:
-			switch y := b.(type) {
-			case time.Time:
-				return x.After(y) || x.Equal(y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case neq:
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			switch y := b.(type) {
-			case idealComplex:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			switch y := b.(type) {
-			case bool:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case complex64:
-			switch y := b.(type) {
-			case complex64:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case complex128:
-			switch y := b.(type) {
-			case complex128:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			switch y := b.(type) {
-			case string:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				return x.Cmp(y) != 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				return x.Cmp(y) != 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x != y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Time:
-			switch y := b.(type) {
-			case time.Time:
-				return !x.Equal(y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case eq:
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			switch y := b.(type) {
-			case idealComplex:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			switch y := b.(type) {
-			case bool:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case complex64:
-			switch y := b.(type) {
-			case complex64:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case complex128:
-			switch y := b.(type) {
-			case complex128:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			switch y := b.(type) {
-			case string:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				return x.Cmp(y) == 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				return x.Cmp(y) == 0, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x == y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Time:
-			switch y := b.(type) {
-			case time.Time:
-				return x.Equal(y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case '+':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			switch y := b.(type) {
-			case idealComplex:
-				return idealComplex(complex64(x) + complex64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return idealFloat(float64(x) + float64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return idealInt(int64(x) + int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return idealRune(int64(x) + int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return idealUint(uint64(x) + uint64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			switch y := b.(type) {
-			case complex64:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case complex128:
-			switch y := b.(type) {
-			case complex128:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			switch y := b.(type) {
-			case string:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x + y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				var z big.Int
-				return z.Add(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				var z big.Rat
-				return z.Add(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x + y, nil
-			case time.Time:
-				return y.Add(x), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Time:
-			switch y := b.(type) {
-			case time.Duration:
-				return x.Add(y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case '-':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			switch y := b.(type) {
-			case idealComplex:
-				return idealComplex(complex64(x) - complex64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return idealFloat(float64(x) - float64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return idealInt(int64(x) - int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return idealRune(int64(x) - int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return idealUint(uint64(x) - uint64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			switch y := b.(type) {
-			case complex64:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case complex128:
-			switch y := b.(type) {
-			case complex128:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				var z big.Int
-				return z.Sub(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				var z big.Rat
-				return z.Sub(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x - y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Time:
-			switch y := b.(type) {
-			case time.Duration:
-				return x.Add(-y), nil
-			case time.Time:
-				return x.Sub(y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case rsh:
-		a, b := eval2(o.l, o.r, execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-
-		var cnt uint64
-		switch y := b.(type) {
-		//case nil:
-		case idealComplex:
-			return invShiftRHS(a, b)
-		case idealFloat:
-			return invShiftRHS(a, b)
-		case idealInt:
-			cnt = uint64(y)
-		case idealRune:
-			cnt = uint64(y)
-		case idealUint:
-			cnt = uint64(y)
-		case bool:
-			return invShiftRHS(a, b)
-		case complex64:
-			return invShiftRHS(a, b)
-		case complex128:
-			return invShiftRHS(a, b)
-		case float32:
-			return invShiftRHS(a, b)
-		case float64:
-			return invShiftRHS(a, b)
-		case int8:
-			return invShiftRHS(a, b)
-		case int16:
-			return invShiftRHS(a, b)
-		case int32:
-			return invShiftRHS(a, b)
-		case int64:
-			return invShiftRHS(a, b)
-		case string:
-			return invShiftRHS(a, b)
-		case uint8:
-			cnt = uint64(y)
-		case uint16:
-			cnt = uint64(y)
-		case uint32:
-			cnt = uint64(y)
-		case uint64:
-			cnt = uint64(y)
-		default:
-			return invOp2(a, b, op)
-		}
-
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			return undOp2(a, b, op)
-		case idealInt:
-			return idealInt(int64(x) >> cnt), nil
-		case idealRune:
-			return idealRune(int64(x) >> cnt), nil
-		case idealUint:
-			return idealUint(uint64(x) >> cnt), nil
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			return undOp2(a, b, op)
-		case float64:
-			return undOp2(a, b, op)
-		case int8:
-			return x >> cnt, nil
-		case int16:
-			return x >> cnt, nil
-		case int32:
-			return x >> cnt, nil
-		case int64:
-			return x >> cnt, nil
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			return x >> cnt, nil
-		case uint16:
-			return x >> cnt, nil
-		case uint32:
-			return x >> cnt, nil
-		case uint64:
-			return x >> cnt, nil
-		case *big.Int:
-			var z big.Int
-			return z.Rsh(x, uint(cnt)), nil
-		case time.Duration:
-			return x >> cnt, nil
-		default:
-			return invOp2(a, b, op)
-		}
-	case lsh:
-		a, b := eval2(o.l, o.r, execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-
-		var cnt uint64
-		switch y := b.(type) {
-		//case nil:
-		case idealComplex:
-			return invShiftRHS(a, b)
-		case idealFloat:
-			return invShiftRHS(a, b)
-		case idealInt:
-			cnt = uint64(y)
-		case idealRune:
-			cnt = uint64(y)
-		case idealUint:
-			cnt = uint64(y)
-		case bool:
-			return invShiftRHS(a, b)
-		case complex64:
-			return invShiftRHS(a, b)
-		case complex128:
-			return invShiftRHS(a, b)
-		case float32:
-			return invShiftRHS(a, b)
-		case float64:
-			return invShiftRHS(a, b)
-		case int8:
-			return invShiftRHS(a, b)
-		case int16:
-			return invShiftRHS(a, b)
-		case int32:
-			return invShiftRHS(a, b)
-		case int64:
-			return invShiftRHS(a, b)
-		case string:
-			return invShiftRHS(a, b)
-		case uint8:
-			cnt = uint64(y)
-		case uint16:
-			cnt = uint64(y)
-		case uint32:
-			cnt = uint64(y)
-		case uint64:
-			cnt = uint64(y)
-		default:
-			return invOp2(a, b, op)
-		}
-
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			return undOp2(a, b, op)
-		case idealInt:
-			return idealInt(int64(x) << cnt), nil
-		case idealRune:
-			return idealRune(int64(x) << cnt), nil
-		case idealUint:
-			return idealUint(uint64(x) << cnt), nil
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			return undOp2(a, b, op)
-		case float64:
-			return undOp2(a, b, op)
-		case int8:
-			return x << cnt, nil
-		case int16:
-			return x << cnt, nil
-		case int32:
-			return x << cnt, nil
-		case int64:
-			return x << cnt, nil
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			return x << cnt, nil
-		case uint16:
-			return x << cnt, nil
-		case uint32:
-			return x << cnt, nil
-		case uint64:
-			return x << cnt, nil
-		case *big.Int:
-			var z big.Int
-			return z.Lsh(x, uint(cnt)), nil
-		case time.Duration:
-			return x << cnt, nil
-		default:
-			return invOp2(a, b, op)
-		}
-	case '&':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			return undOp2(a, b, op)
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return idealInt(int64(x) & int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return idealRune(int64(x) & int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return idealUint(uint64(x) & uint64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			return undOp2(a, b, op)
-		case float64:
-			return undOp2(a, b, op)
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x & y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x & y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x & y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x & y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x & y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x & y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x & y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x & y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				var z big.Int
-				return z.And(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x & y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case '|':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			return undOp2(a, b, op)
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return idealInt(int64(x) | int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return idealRune(int64(x) | int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return idealUint(uint64(x) | uint64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			return undOp2(a, b, op)
-		case float64:
-			return undOp2(a, b, op)
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x | y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x | y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x | y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x | y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x | y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x | y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x | y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x | y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				var z big.Int
-				return z.Or(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x | y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case andnot:
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			return undOp2(a, b, op)
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return idealInt(int64(x) &^ int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return idealRune(int64(x) &^ int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return idealUint(uint64(x) &^ uint64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			return undOp2(a, b, op)
-		case float64:
-			return undOp2(a, b, op)
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x &^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x &^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x &^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x &^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x &^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x &^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x &^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x &^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				var z big.Int
-				return z.AndNot(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x &^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case '^':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			return undOp2(a, b, op)
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return idealInt(int64(x) ^ int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return idealRune(int64(x) ^ int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return idealUint(uint64(x) ^ uint64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			return undOp2(a, b, op)
-		case float64:
-			return undOp2(a, b, op)
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x ^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x ^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x ^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x ^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x ^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x ^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x ^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x ^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				var z big.Int
-				return z.Xor(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x ^ y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case '%':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp2(a, b, op)
-		case idealFloat:
-			return undOp2(a, b, op)
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return idealInt(int64(x) % int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return idealRune(int64(x) % int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return idealUint(uint64(x) % uint64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			return undOp2(a, b, op)
-		case complex128:
-			return undOp2(a, b, op)
-		case float32:
-			return undOp2(a, b, op)
-		case float64:
-			return undOp2(a, b, op)
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x % y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x % y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x % y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x % y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x % y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x % y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x % y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x % y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				if y.Sign() == 0 {
-					return nil, errDivByZero
-				}
-
-				var z big.Int
-				return z.Mod(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x % y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case '/':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			switch y := b.(type) {
-			case idealComplex:
-				return idealComplex(complex64(x) / complex64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return idealFloat(float64(x) / float64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return idealInt(int64(x) / int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return idealRune(int64(x) / int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return idealUint(uint64(x) / uint64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			switch y := b.(type) {
-			case complex64:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case complex128:
-			switch y := b.(type) {
-			case complex128:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				if y.Sign() == 0 {
-					return nil, errDivByZero
-				}
-
-				var z big.Int
-				return z.Quo(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				if y.Sign() == 0 {
-					return nil, errDivByZero
-				}
-
-				var z big.Rat
-				return z.Quo(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x / y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	case '*':
-		a, b := o.get2(execCtx, ctx)
-		if a == nil || b == nil {
-			return
-		}
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			switch y := b.(type) {
-			case idealComplex:
-				return idealComplex(complex64(x) * complex64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealFloat:
-			switch y := b.(type) {
-			case idealFloat:
-				return idealFloat(float64(x) * float64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealInt:
-			switch y := b.(type) {
-			case idealInt:
-				return idealInt(int64(x) * int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealRune:
-			switch y := b.(type) {
-			case idealRune:
-				return idealRune(int64(x) * int64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case idealUint:
-			switch y := b.(type) {
-			case idealUint:
-				return idealUint(uint64(x) * uint64(y)), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case bool:
-			return undOp2(a, b, op)
-		case complex64:
-			switch y := b.(type) {
-			case complex64:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case complex128:
-			switch y := b.(type) {
-			case complex128:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float32:
-			switch y := b.(type) {
-			case float32:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case float64:
-			switch y := b.(type) {
-			case float64:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int8:
-			switch y := b.(type) {
-			case int8:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int16:
-			switch y := b.(type) {
-			case int16:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int32:
-			switch y := b.(type) {
-			case int32:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case int64:
-			switch y := b.(type) {
-			case int64:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case string:
-			return undOp2(a, b, op)
-		case uint8:
-			switch y := b.(type) {
-			case uint8:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint16:
-			switch y := b.(type) {
-			case uint16:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint32:
-			switch y := b.(type) {
-			case uint32:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case uint64:
-			switch y := b.(type) {
-			case uint64:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Int:
-			switch y := b.(type) {
-			case *big.Int:
-				var z big.Int
-				return z.Mul(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case *big.Rat:
-			switch y := b.(type) {
-			case *big.Rat:
-				var z big.Rat
-				return z.Mul(x, y), nil
-			default:
-				return invOp2(x, y, op)
-			}
-		case time.Duration:
-			switch y := b.(type) {
-			case time.Duration:
-				return x * y, nil
-			default:
-				return invOp2(x, y, op)
-			}
-		default:
-			return invOp2(a, b, op)
-		}
-	default:
-		panic("internal error 037")
-	}
-}
-
-func (o *binaryOperation) get2(execCtx *execCtx, ctx map[interface{}]interface{}) (x, y interface{}) {
-	x, y = eval2(o.l, o.r, execCtx, ctx)
-	//dbg("get2 pIn     - ", x, y)
-	//defer func() {dbg("get2 coerced ", x, y)}()
-	return coerce(x, y)
-}
-
-type ident struct {
-	s string
-}
-
-func (i *ident) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	x := strings.IndexByte(i.s, '.')
-	if x < 0 {
-		return &ident{s: i.s}, nil
-	}
-
-	q := i.s[:x]
-	for _, v := range unqualify {
-		if q == v {
-			return &ident{i.s[x+1:]}, nil
-		}
-	}
-	return &ident{s: i.s}, nil
-}
-
-func (i *ident) isQualified() bool { return strings.Contains(i.s, ".") }
-
-func (i *ident) isStatic() bool { return false }
-
-func (i *ident) String() string { return i.s }
-
-func (i *ident) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	if _, ok := ctx["$agg0"]; ok {
-		return int64(0), nil
-	}
-
-	//defer func() { dbg("ident %q -> %v %v", i.s, v, err) }()
-	v, ok := ctx[i.s]
-	if !ok {
-		err = fmt.Errorf("unknown field %s", i.s)
-	}
-	return
-}
-
-type pInEval struct {
-	m      map[interface{}]struct{} // IN (SELECT...) results
-	sample interface{}
-}
-
-type pIn struct {
-	expr expression
-	list []expression
-	not  bool
-	sel  *selectStmt
-}
-
-func (n *pIn) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	expr, err := n.expr.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	list, err := cloneExpressionList(arg, n.list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &pIn{
-		expr: expr,
-		list: list,
-		not:  n.not,
-		sel:  n.sel,
-	}, nil
-}
-
-func (n *pIn) isStatic() bool {
-	if !n.expr.isStatic() || n.sel != nil {
-		return false
-	}
-
-	for _, v := range n.list {
-		if !v.isStatic() {
-			return false
-		}
-	}
-	return true
-}
-
-//LATER newIn
-
-func (n *pIn) String() string {
-	if n.sel == nil {
-		a := []string{}
-		for _, v := range n.list {
-			a = append(a, v.String())
-		}
-		if n.not {
-			return fmt.Sprintf("%s NOT IN (%s)", n.expr, strings.Join(a, ","))
-		}
-
-		return fmt.Sprintf("%s IN (%s)", n.expr, strings.Join(a, ","))
-	}
-
-	if n.not {
-		return fmt.Sprintf("%s NOT IN (%s)", n.expr, n.sel)
-	}
-
-	return fmt.Sprintf("%s IN (%s)", n.expr, n.sel)
-}
-
-func (n *pIn) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	lhs, err := expand1(n.expr.eval(execCtx, ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	if lhs == nil {
-		return nil, nil //TODO Add test for NULL LHS.
-	}
-
-	if n.sel == nil {
-		for _, v := range n.list {
-			b, err := newBinaryOperation(eq, value{lhs}, v)
-			if err != nil {
-				return nil, err
-			}
-
-			eval, err := b.eval(execCtx, ctx)
-			if err != nil {
-				return nil, err
-			}
-
-			if x, ok := eval.(bool); ok && x {
-				return !n.not, nil
-			}
-		}
-		return n.not, nil
-	}
-
-	var ev *pInEval
-	ev0 := ctx[n]
-	if ev0 == nil { // SELECT not yet evaluated.
-		r, err := n.sel.plan(execCtx)
-		if err != nil {
-			return nil, err
-		}
-
-		if g, e := len(r.fieldNames()), 1; g != e {
-			return false, fmt.Errorf("IN (%s): mismatched field count, have %d, need %d", n.sel, g, e)
-		}
-
-		ev = &pInEval{m: map[interface{}]struct{}{}}
-		ctx[n] = ev
-		m := ev.m
-		typechecked := false
-		if err := r.do(execCtx, func(id interface{}, data []interface{}) (more bool, err error) {
-			if typechecked {
-				if data[0] == nil {
-					return true, nil
-				}
-
-				m[data[0]] = struct{}{}
-			}
-
-			if data[0] == nil {
-				return true, nil
-			}
-
-			ev.sample = data[0]
-			switch ev.sample.(type) {
-			case bool, byte, complex128, complex64, float32,
-				float64, int16, int32, int64, int8,
-				string, uint16, uint32, uint64:
-				typechecked = true
-				m[ev.sample] = struct{}{}
-				return true, nil
-			default:
-				return false, fmt.Errorf("IN (%s): invalid field type: %T", n.sel, data[0])
-			}
-
-		}); err != nil {
-			return nil, err
-		}
-	} else {
-		ev = ev0.(*pInEval)
-	}
-
-	if ev.sample == nil {
-		return nil, nil
-	}
-
-	_, ok := ev.m[coerce1(lhs, ev.sample)]
-	return ok != n.not, nil
-}
-
-type value struct {
-	val interface{}
-}
-
-func (l value) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	return value{val: l.val}, nil
-}
-
-func (l value) isStatic() bool { return true }
-
-func (l value) String() string {
-	switch x := l.val.(type) {
-	case nil:
-		return "NULL"
-	case idealComplex:
-		s := fmt.Sprint(x)
-		return s[1 : len(s)-1]
-	case complex64:
-		s := fmt.Sprint(x)
-		return s[1 : len(s)-1]
-	case complex128:
-		s := fmt.Sprint(x)
-		return s[1 : len(s)-1]
-	case string:
-		return fmt.Sprintf("%q", x)
-	case time.Duration:
-		return fmt.Sprintf("duration(%q)", l.val)
-	case time.Time:
-		return fmt.Sprintf("time(%q)", l.val)
-	case *big.Rat:
-		return fmt.Sprintf("bigrat(%q)", l.val)
-	case *big.Int:
-		return fmt.Sprintf(`bigint("%v")`, l.val)
-	default:
-		return fmt.Sprintf("%v", l.val)
-	}
-}
-
-func (l value) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (interface{}, error) {
-	return l.val, nil
-}
-
-type conversion struct {
-	typ int
-	val expression
-}
-
-func (c *conversion) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	val, err := c.val.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	return &conversion{typ: c.typ, val: val}, nil
-}
-
-func (c *conversion) isStatic() bool {
-	return c.val.isStatic()
-}
-
-//LATER newConversion or fake unary op
-
-func (c *conversion) String() string {
-	return fmt.Sprintf("%s(%s)", typeStr(c.typ), c.val)
-}
-
-func (c *conversion) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	val, err := expand1(c.val.eval(execCtx, ctx))
-	if err != nil {
-		return
-	}
-
-	return convert(val, c.typ)
-}
-
-type unaryOperation struct {
-	op int
-	v  expression
-}
-
-func newUnaryOperation(op int, x interface{}) (v expression, err error) {
-	l, ok := x.(expression)
-	if !ok {
-		panic("internal error 038")
-	}
-
-	for {
-		pe, ok := l.(*pexpr)
-		if ok {
-			l = pe.expr
-			continue
-		}
-
-		break
-	}
-
-	if l.isStatic() {
-		val, err := l.eval(nil, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		l = value{val}
-	}
-
-	if op == '!' {
-		b, ok := l.(*binaryOperation)
-		if ok {
-			switch b.op {
-			case eq:
-				b.op = neq
-				return b, nil
-			case neq:
-				b.op = eq
-				return b, nil
-			case '>':
-				b.op = le
-				return b, nil
-			case ge:
-				b.op = '<'
-				return b, nil
-			case '<':
-				b.op = ge
-				return b, nil
-			case le:
-				b.op = '>'
-				return b, nil
-			}
-		}
-
-		u, ok := l.(*unaryOperation)
-		if ok && u.op == '!' { // !!x: x
-			return u.v, nil
-		}
-	}
-
-	return &unaryOperation{op, l}, nil
-}
-
-func (u *unaryOperation) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	v, err := u.v.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	return &unaryOperation{op: u.op, v: v}, nil
-}
-
-func (u *unaryOperation) isStatic() bool { return u.v.isStatic() }
-
-func (u *unaryOperation) String() string {
-	switch u.v.(type) {
-	case *binaryOperation:
-		return fmt.Sprintf("%s(%s)", iop(u.op), u.v)
-	default:
-		return fmt.Sprintf("%s%s", iop(u.op), u.v)
-	}
-}
-
-// !ident
-func (u *unaryOperation) isNotQIdent() (bool, string, expression) {
-	if u.op != '!' {
-		return false, "", nil
-	}
-
-	id, ok := u.v.(*ident)
-	if ok && id.isQualified() {
-		return true, mustQualifier(id.s), &unaryOperation{'!', &ident{mustSelector(id.s)}}
-	}
-
-	return false, "", nil
-}
-
-func (u *unaryOperation) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (r interface{}, err error) {
-	defer func() {
-		if e := recover(); e != nil {
-			switch x := e.(type) {
-			case error:
-				r, err = nil, x
-			default:
-				r, err = nil, fmt.Errorf("%v", x)
-			}
-		}
-	}()
-
-	switch op := u.op; op {
-	case '!':
-		a := eval(u.v, execCtx, ctx)
-		if a == nil {
-			return
-		}
-
-		switch x := a.(type) {
-		case bool:
-			return !x, nil
-		default:
-			return undOp(a, op)
-		}
-	case '^':
-		a := eval(u.v, execCtx, ctx)
-		if a == nil {
-			return
-		}
-
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return undOp(a, op)
-		case idealFloat:
-			return undOp(a, op)
-		case idealInt:
-			return ^x, nil
-		case idealRune:
-			return ^x, nil
-		case idealUint:
-			return ^x, nil
-		case bool:
-			return undOp(a, op)
-		case complex64:
-			return undOp(a, op)
-		case complex128:
-			return undOp(a, op)
-		case float32:
-			return undOp(a, op)
-		case float64:
-			return undOp(a, op)
-		case int8:
-			return ^x, nil
-		case int16:
-			return ^x, nil
-		case int32:
-			return ^x, nil
-		case int64:
-			return ^x, nil
-		case string:
-			return undOp(a, op)
-		case uint8:
-			return ^x, nil
-		case uint16:
-			return ^x, nil
-		case uint32:
-			return ^x, nil
-		case uint64:
-			return ^x, nil
-		case *big.Int:
-			var z big.Int
-			return z.Not(x), nil
-		case time.Duration:
-			return ^x, nil
-		default:
-			return undOp(a, op)
-		}
-	case '+':
-		a := eval(u.v, execCtx, ctx)
-		if a == nil {
-			return
-		}
-
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return +x, nil
-		case idealFloat:
-			return +x, nil
-		case idealInt:
-			return +x, nil
-		case idealRune:
-			return +x, nil
-		case idealUint:
-			return +x, nil
-		case bool:
-			return undOp(a, op)
-		case complex64:
-			return +x, nil
-		case complex128:
-			return +x, nil
-		case float32:
-			return +x, nil
-		case float64:
-			return +x, nil
-		case int8:
-			return +x, nil
-		case int16:
-			return +x, nil
-		case int32:
-			return +x, nil
-		case int64:
-			return +x, nil
-		case string:
-			return undOp(a, op)
-		case uint8:
-			return +x, nil
-		case uint16:
-			return +x, nil
-		case uint32:
-			return +x, nil
-		case uint64:
-			return +x, nil
-		case *big.Int:
-			var z big.Int
-			return z.Set(x), nil
-		case *big.Rat:
-			var z big.Rat
-			return z.Set(x), nil
-		case time.Duration:
-			return x, nil
-		default:
-			return undOp(a, op)
-		}
-	case '-':
-		a := eval(u.v, execCtx, ctx)
-		if a == nil {
-			return
-		}
-
-		switch x := a.(type) {
-		//case nil:
-		case idealComplex:
-			return -x, nil
-		case idealFloat:
-			return -x, nil
-		case idealInt:
-			return -x, nil
-		case idealRune:
-			return -x, nil
-		case idealUint:
-			return -x, nil
-		case bool:
-			return undOp(a, op)
-		case complex64:
-			return -x, nil
-		case complex128:
-			return -x, nil
-		case float32:
-			return -x, nil
-		case float64:
-			return -x, nil
-		case int8:
-			return -x, nil
-		case int16:
-			return -x, nil
-		case int32:
-			return -x, nil
-		case int64:
-			return -x, nil
-		case string:
-			return undOp(a, op)
-		case uint8:
-			return -x, nil
-		case uint16:
-			return -x, nil
-		case uint32:
-			return -x, nil
-		case uint64:
-			return -x, nil
-		case *big.Int:
-			var z big.Int
-			return z.Neg(x), nil
-		case *big.Rat:
-			var z big.Rat
-			return z.Neg(x), nil
-		case time.Duration:
-			return -x, nil
-		default:
-			return undOp(a, op)
-		}
-	default:
-		panic("internal error 039")
-	}
-}
-
-type call struct {
-	f   string
-	arg []expression
-}
-
-func newCall(f string, arg []expression) (v expression, isAgg bool, err error) {
-	x := builtin[f]
-	if x.f == nil {
-		return nil, false, fmt.Errorf("undefined: %s", f)
-	}
-
-	isAgg = x.isAggregate
-	if g, min, max := len(arg), x.minArgs, x.maxArgs; g < min || g > max {
-		a := []interface{}{}
-		for _, v := range arg {
-			a = append(a, v)
-		}
-		return nil, false, badNArgs(min, f, a)
-	}
-
-	c := call{f: f}
-	for _, val := range arg {
-		if !val.isStatic() {
-			c.arg = append(c.arg, val)
-			continue
-		}
-
-		eval, err := val.eval(nil, nil)
-		if err != nil {
-			return nil, isAgg, err
-		}
-
-		c.arg = append(c.arg, value{eval})
-	}
-
-	return &c, isAgg, nil
-}
-
-func (c *call) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	list, err := cloneExpressionList(arg, c.arg)
-	if err != nil {
-		return nil, err
-	}
-
-	return &call{f: c.f, arg: list}, nil
-}
-
-func (c *call) isStatic() bool {
-	v := builtin[c.f]
-	if v.f == nil || !v.isStatic {
-		return false
-	}
-
-	for _, v := range c.arg {
-		if !v.isStatic() {
-			return false
-		}
-	}
-	return true
-}
-
-func (c *call) String() string {
-	a := []string{}
-	for _, v := range c.arg {
-		a = append(a, v.String())
-	}
-	return fmt.Sprintf("%s(%s)", c.f, strings.Join(a, ", "))
-}
-
-func (c *call) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	f, ok := builtin[c.f]
-	if !ok {
-		return nil, fmt.Errorf("unknown function %s", c.f)
-	}
-
-	isID := c.f == "id"
-	a := make([]interface{}, len(c.arg))
-	for i, arg := range c.arg {
-		if v, err = expand1(arg.eval(execCtx, ctx)); err != nil {
-			if !isID {
-				return nil, err
-			}
-
-			if _, ok := arg.(*ident); !ok {
-				return nil, err
-			}
-
-			a[i] = arg
-			continue
-		}
-
-		a[i] = v
-	}
-
-	if ctx != nil {
-		ctx["$fn"] = c
-	}
-	return f.f(a, ctx)
-}
-
-type parameter struct {
-	n int
-}
-
-func (p parameter) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	i := p.n - 1
-	if i < len(arg) {
-		return value{val: arg[i]}, nil
-	}
-
-	return nil, fmt.Errorf("missing %s", p)
-}
-
-func (parameter) isStatic() bool { return false }
-
-func (p parameter) String() string { return fmt.Sprintf("$%d", p.n) }
-
-func (p parameter) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	i := p.n - 1
-	if i < len(execCtx.arg) {
-		return execCtx.arg[i], nil
-	}
-
-	return nil, fmt.Errorf("missing %s", p)
-}
-
-//MAYBE make it an unary operation
-type isNull struct {
-	expr expression
-	not  bool
-}
-
-//LATER newIsNull
-
-func (is *isNull) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	expr, err := is.expr.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	return &isNull{expr: expr, not: is.not}, nil
-}
-
-func (is *isNull) isStatic() bool { return is.expr.isStatic() }
-
-func (is *isNull) String() string {
-	if is.not {
-		return fmt.Sprintf("%s IS NOT NULL", is.expr)
-	}
-
-	return fmt.Sprintf("%s IS NULL", is.expr)
-}
-
-func (is *isNull) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	val, err := is.expr.eval(execCtx, ctx)
-	if err != nil {
-		return
-	}
-
-	return val == nil != is.not, nil
-}
-
-type indexOp struct {
-	expr, x expression
-}
-
-func newIndex(sv, xv expression) (v expression, err error) {
-	s, fs, i := "", false, uint64(0)
-	x := indexOp{sv, xv}
-	if x.expr.isStatic() {
-		v, err := x.expr.eval(nil, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		if v == nil {
-			return value{nil}, nil
-		}
-
-		if s, fs = v.(string); !fs {
-			return nil, invXOp(sv, xv)
-		}
-
-		x.expr = value{s}
-	}
-
-	if x.x.isStatic() {
-		v, err := x.x.eval(nil, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		if v == nil {
-			return value{nil}, nil
-		}
-
-		var p *string
-		if fs {
-			p = &s
-		}
-		if i, err = indexExpr(p, v); err != nil {
-			return nil, err
-		}
-
-		x.x = value{i}
-	}
-
-	return &x, nil
-}
-
-func (x *indexOp) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	expr, err := x.expr.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	x2, err := x.x.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	return &indexOp{expr: expr, x: x2}, nil
-}
-
-func (x *indexOp) isStatic() bool {
-	return x.expr.isStatic() && x.x.isStatic()
-}
-
-func (x *indexOp) String() string { return fmt.Sprintf("%s[%s]", x.expr, x.x) }
-
-func (x *indexOp) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	s0, err := x.expr.eval(execCtx, ctx)
-	if err != nil {
-		return nil, runErr(err)
-	}
-
-	s, ok := s0.(string)
-	if !ok {
-		return nil, runErr(invXOp(s0, x.x))
-	}
-
-	i0, err := x.x.eval(execCtx, ctx)
-	if err != nil {
-		return nil, runErr(err)
-	}
-
-	if i0 == nil {
-		return nil, nil
-	}
-
-	i, err := indexExpr(&s, i0)
-	if err != nil {
-		return nil, runErr(err)
-	}
-
-	return s[i], nil
-}
-
-type slice struct {
-	expr   expression
-	lo, hi *expression
-}
-
-func newSlice(e expression, lo, hi *expression) (v expression, err error) {
-	y := slice{e, lo, hi}
-	var val interface{}
-	if e := y.expr; e.isStatic() {
-		if val, err = e.eval(nil, nil); err != nil {
-			return nil, err
-		}
-
-		if val == nil {
-			return value{nil}, nil
-		}
-
-		y.expr = value{val}
-	}
-
-	if p := y.lo; p != nil {
-		if e := expr(*p); e.isStatic() {
-			if val, err = e.eval(nil, nil); err != nil {
-				return nil, err
-			}
-
-			if val == nil {
-				return value{nil}, nil
-			}
-
-			v := expression(value{val})
-			y.lo = &v
-		}
-	}
-
-	if p := y.hi; p != nil {
-		if e := expr(*p); e.isStatic() {
-			if val, err = e.eval(nil, nil); err != nil {
-				return nil, err
-			}
-
-			if val == nil {
-				return value{nil}, nil
-			}
-
-			v := expression(value{val})
-			y.hi = &v
-		}
-	}
-	return &y, nil
-}
-
-func (s *slice) clone(arg []interface{}, unqualify ...string) (expression, error) {
-	expr, err := s.expr.clone(arg, unqualify...)
-	if err != nil {
-		return nil, err
-	}
-
-	r := &slice{expr: expr, lo: s.lo, hi: s.hi}
-	if s.lo != nil {
-		e, err := (*s.lo).clone(arg, unqualify...)
-		if err != nil {
-			return nil, err
-		}
-
-		r.lo = &e
-	}
-	if s.hi != nil {
-		e, err := (*s.hi).clone(arg, unqualify...)
-		if err != nil {
-			return nil, err
-		}
-
-		r.hi = &e
-	}
-	return r, nil
-}
-
-func (s *slice) eval(execCtx *execCtx, ctx map[interface{}]interface{}) (v interface{}, err error) {
-	s0, err := s.expr.eval(execCtx, ctx)
-	if err != nil {
-		return
-	}
-
-	if s0 == nil {
-		return
-	}
-
-	ss, ok := s0.(string)
-	if !ok {
-		return nil, runErr(invSOp(s0))
-	}
-
-	var iLo, iHi uint64
-	if s.lo != nil {
-		i, err := (*s.lo).eval(execCtx, ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		if i == nil {
-			return nil, err
-		}
-
-		if iLo, err = sliceExpr(&ss, i, 0); err != nil {
-			return nil, err
-		}
-	}
-
-	iHi = uint64(len(ss))
-	if s.hi != nil {
-		i, err := (*s.hi).eval(execCtx, ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		if i == nil {
-			return nil, err
-		}
-
-		if iHi, err = sliceExpr(&ss, i, 1); err != nil {
-			return nil, err
-		}
-	}
-
-	return ss[iLo:iHi], nil
-}
-
-func (s *slice) isStatic() bool {
-	if !s.expr.isStatic() {
-		return false
-	}
-
-	if p := s.lo; p != nil && !(*p).isStatic() {
-		return false
-	}
-
-	if p := s.hi; p != nil && !(*p).isStatic() {
-		return false
-	}
-
-	return false
-}
-
-func (s *slice) String() string {
-	switch {
-	case s.lo == nil && s.hi == nil:
-		return fmt.Sprintf("%v[:]", s.expr)
-	case s.lo == nil && s.hi != nil:
-		return fmt.Sprintf("%v[:%v]", s.expr, *s.hi)
-	case s.lo != nil && s.hi == nil:
-		return fmt.Sprintf("%v[%v:]", s.expr, *s.lo)
-	default: //case s.lo != nil && s.hi != nil:
-		return fmt.Sprintf("%v[%v:%v]", s.expr, *s.lo, *s.hi)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/file.go b/Godeps/_workspace/src/github.com/cznic/ql/file.go
deleted file mode 100644
index c7fb7c95ed..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/file.go
+++ /dev/null
@@ -1,1279 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Well known handles
-// 1: root
-// 2: id
-
-package ql
-
-import (
-	"crypto/sha1"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/big"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"github.com/camlistore/go4/lock"
-	"github.com/cznic/exp/lldb"
-	"github.com/cznic/mathutil"
-)
-
-const (
-	magic = "\x60\xdbql"
-)
-
-var (
-	_ btreeIndex    = (*fileIndex)(nil)
-	_ btreeIterator = (*fileBTreeIterator)(nil)
-	_ indexIterator = (*fileIndexIterator)(nil)
-	_ storage       = (*file)(nil)
-	_ temp          = (*fileTemp)(nil)
-)
-
-type chunk struct { // expanded to blob types lazily
-	f *file
-	b []byte
-}
-
-func (c chunk) expand() (v interface{}, err error) {
-	return c.f.loadChunks(c.b)
-}
-
-func expand1(data interface{}, e error) (v interface{}, err error) {
-	if e != nil {
-		return nil, e
-	}
-
-	c, ok := data.(chunk)
-	if !ok {
-		return data, nil
-	}
-
-	return c.expand()
-}
-
-func expand(data []interface{}) (err error) {
-	for i, v := range data {
-		if data[i], err = expand1(v, nil); err != nil {
-			return
-		}
-	}
-	return
-}
-
-// OpenFile returns a DB backed by a named file. The back end limits the size
-// of a record to about 64 kB.
-func OpenFile(name string, opt *Options) (db *DB, err error) {
-	var f lldb.OSFile
-	if f = opt.OSFile; f == nil {
-		f, err = os.OpenFile(name, os.O_RDWR, 0666)
-		if err != nil {
-			if !os.IsNotExist(err) {
-				return nil, err
-			}
-
-			if !opt.CanCreate {
-				return nil, err
-			}
-
-			f, err = os.OpenFile(name, os.O_CREATE|os.O_EXCL|os.O_RDWR, 0666)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	fi, err := newFileFromOSFile(f) // always ACID
-	if err != nil {
-		return
-	}
-
-	if fi.tempFile = opt.TempFile; fi.tempFile == nil {
-		fi.tempFile = func(dir, prefix string) (f lldb.OSFile, err error) {
-			f0, err := ioutil.TempFile(dir, prefix)
-			return f0, err
-		}
-	}
-
-	return newDB(fi)
-}
-
-// Options amend the behavior of OpenFile.
-//
-// CanCreate
-//
-// The CanCreate option enables OpenFile to create the DB file if it does not
-// exists.
-//
-// OSFile
-//
-// OSFile allows to pass an os.File like back end providing, for example,
-// encrypted storage. If this field is nil then OpenFile uses the file named by
-// the 'name' parameter instead.
-//
-// TempFile
-//
-// TempFile provides a temporary file used for evaluating the GROUP BY, ORDER
-// BY, ... clauses. The hook is intended to be used by encrypted DB back ends
-// to avoid leaks of unecrypted data to such temp files by providing temp files
-// which are encrypted as well. Note that *os.File satisfies the lldb.OSFile
-// interface.
-//
-// If TempFile is nil it defaults to ioutil.TempFile.
-type Options struct {
-	CanCreate bool
-	OSFile    lldb.OSFile
-	TempFile  func(dir, prefix string) (f lldb.OSFile, err error)
-}
-
-type fileBTreeIterator struct {
-	en *lldb.BTreeEnumerator
-	t  *fileTemp
-}
-
-func (it *fileBTreeIterator) Next() (k, v []interface{}, err error) {
-	bk, bv, err := it.en.Next()
-	if err != nil {
-		return
-	}
-
-	if k, err = lldb.DecodeScalars(bk); err != nil {
-		return
-	}
-
-	for i, val := range k {
-		b, ok := val.([]byte)
-		if !ok {
-			continue
-		}
-
-		c := chunk{it.t.file, b}
-		if k[i], err = c.expand(); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	if err = enforce(k, it.t.colsK); err != nil {
-		return
-	}
-
-	if v, err = lldb.DecodeScalars(bv); err != nil {
-		return
-	}
-
-	for i, val := range v {
-		b, ok := val.([]byte)
-		if !ok {
-			continue
-		}
-
-		c := chunk{it.t.file, b}
-		if v[i], err = c.expand(); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	err = enforce(v, it.t.colsV)
-	return
-}
-
-func enforce(val []interface{}, cols []*col) (err error) {
-	for i, v := range val {
-		if val[i], err = convert(v, cols[i].typ); err != nil {
-			return
-		}
-	}
-	return
-}
-
-//NTYPE
-func infer(from []interface{}, to *[]*col) {
-	if len(*to) == 0 {
-		*to = make([]*col, len(from))
-		for i := range *to {
-			(*to)[i] = &col{}
-		}
-	}
-	for i, c := range *to {
-		if f := from[i]; f != nil {
-			switch x := f.(type) {
-			//case nil:
-			case idealComplex:
-				c.typ = qComplex128
-				from[i] = complex128(x)
-			case idealFloat:
-				c.typ = qFloat64
-				from[i] = float64(x)
-			case idealInt:
-				c.typ = qInt64
-				from[i] = int64(x)
-			case idealRune:
-				c.typ = qInt32
-				from[i] = int32(x)
-			case idealUint:
-				c.typ = qUint64
-				from[i] = uint64(x)
-			case bool:
-				c.typ = qBool
-			case complex128:
-				c.typ = qComplex128
-			case complex64:
-				c.typ = qComplex64
-			case float64:
-				c.typ = qFloat64
-			case float32:
-				c.typ = qFloat32
-			case int8:
-				c.typ = qInt8
-			case int16:
-				c.typ = qInt16
-			case int32:
-				c.typ = qInt32
-			case int64:
-				c.typ = qInt64
-			case string:
-				c.typ = qString
-			case uint8:
-				c.typ = qUint8
-			case uint16:
-				c.typ = qUint16
-			case uint32:
-				c.typ = qUint32
-			case uint64:
-				c.typ = qUint64
-			case []byte:
-				c.typ = qBlob
-			case *big.Int:
-				c.typ = qBigInt
-			case *big.Rat:
-				c.typ = qBigRat
-			case time.Time:
-				c.typ = qTime
-			case time.Duration:
-				c.typ = qDuration
-			case chunk:
-				vals, err := lldb.DecodeScalars([]byte(x.b))
-				if err != nil {
-					panic(err)
-				}
-
-				if len(vals) == 0 {
-					panic("internal error 040")
-				}
-
-				i, ok := vals[0].(int64)
-				if !ok {
-					panic("internal error 041")
-				}
-
-				c.typ = int(i)
-			case map[string]interface{}: // map of ids of a cross join
-			default:
-				panic("internal error 042")
-			}
-		}
-	}
-}
-
-type fileTemp struct {
-	*file
-	colsK []*col
-	colsV []*col
-	t     *lldb.BTree
-}
-
-func (t *fileTemp) BeginTransaction() error {
-	return nil
-}
-
-func (t *fileTemp) Get(k []interface{}) (v []interface{}, err error) {
-	if err = expand(k); err != nil {
-		return
-	}
-
-	if err = t.flatten(k); err != nil {
-		return nil, err
-	}
-
-	bk, err := lldb.EncodeScalars(k...)
-	if err != nil {
-		return
-	}
-
-	bv, err := t.t.Get(nil, bk)
-	if err != nil {
-		return
-	}
-
-	return lldb.DecodeScalars(bv)
-}
-
-func (t *fileTemp) Drop() (err error) {
-	if t.f0 == nil {
-		return
-	}
-
-	fn := t.f0.Name()
-	if err = t.f0.Close(); err != nil {
-		return
-	}
-
-	if fn == "" {
-		return
-	}
-
-	return os.Remove(fn)
-}
-
-func (t *fileTemp) SeekFirst() (it btreeIterator, err error) {
-	en, err := t.t.SeekFirst()
-	if err != nil {
-		return
-	}
-
-	return &fileBTreeIterator{t: t, en: en}, nil
-}
-
-func (t *fileTemp) Set(k, v []interface{}) (err error) {
-	if err = expand(k); err != nil {
-		return
-	}
-
-	if err = expand(v); err != nil {
-		return
-	}
-
-	infer(k, &t.colsK)
-	infer(v, &t.colsV)
-
-	if err = t.flatten(k); err != nil {
-		return
-	}
-
-	bk, err := lldb.EncodeScalars(k...)
-	if err != nil {
-		return
-	}
-
-	if err = t.flatten(v); err != nil {
-		return
-	}
-
-	bv, err := lldb.EncodeScalars(v...)
-	if err != nil {
-		return
-	}
-
-	return t.t.Set(bk, bv)
-}
-
-type file struct {
-	a        *lldb.Allocator
-	codec    *gobCoder
-	f        lldb.Filer
-	f0       lldb.OSFile
-	id       int64
-	lck      io.Closer
-	mu       sync.Mutex
-	name     string
-	tempFile func(dir, prefix string) (f lldb.OSFile, err error)
-	wal      *os.File
-}
-
-func newFileFromOSFile(f lldb.OSFile) (fi *file, err error) {
-	nm := lockName(f.Name())
-	lck, err := lock.Lock(nm)
-	if err != nil {
-		if lck != nil {
-			lck.Close()
-		}
-		return nil, err
-	}
-
-	close := true
-	defer func() {
-		if close && lck != nil {
-			lck.Close()
-		}
-	}()
-
-	var w *os.File
-	closew := false
-	wn := walName(f.Name())
-	w, err = os.OpenFile(wn, os.O_CREATE|os.O_EXCL|os.O_RDWR, 0666)
-	closew = true
-	defer func() {
-		if closew {
-			nm := w.Name()
-			w.Close()
-			os.Remove(nm)
-			w = nil
-		}
-	}()
-
-	if err != nil {
-		if !os.IsExist(err) {
-			return nil, err
-		}
-
-		closew = false
-		w, err = os.OpenFile(wn, os.O_RDWR, 0666)
-		if err != nil {
-			return nil, err
-		}
-
-		closew = true
-		st, err := w.Stat()
-		if err != nil {
-			return nil, err
-		}
-
-		if st.Size() != 0 {
-			return nil, fmt.Errorf("(file-001) non empty WAL file %s exists", wn)
-		}
-	}
-
-	info, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-
-	switch sz := info.Size(); {
-	case sz == 0:
-		b := make([]byte, 16)
-		copy(b, []byte(magic))
-		if _, err := f.Write(b); err != nil {
-			return nil, err
-		}
-
-		filer := lldb.Filer(lldb.NewOSFiler(f))
-		filer = lldb.NewInnerFiler(filer, 16)
-		if filer, err = lldb.NewACIDFiler(filer, w); err != nil {
-			return nil, err
-		}
-
-		a, err := lldb.NewAllocator(filer, &lldb.Options{})
-		if err != nil {
-			return nil, err
-		}
-
-		a.Compress = true
-		s := &file{
-			a:     a,
-			codec: newGobCoder(),
-			f0:    f,
-			f:     filer,
-			lck:   lck,
-			name:  f.Name(),
-			wal:   w,
-		}
-		if err = s.BeginTransaction(); err != nil {
-			return nil, err
-		}
-
-		h, err := s.Create()
-		if err != nil {
-			return nil, err
-		}
-
-		if h != 1 { // root
-			panic("internal error 043")
-		}
-
-		if h, err = s.a.Alloc(make([]byte, 8)); err != nil {
-			return nil, err
-		}
-
-		if h != 2 { // id
-			panic("internal error 044")
-		}
-
-		close, closew = false, false
-		return s, s.Commit()
-	default:
-		b := make([]byte, 16)
-		if _, err := f.Read(b); err != nil {
-			return nil, err
-		}
-
-		if string(b[:len(magic)]) != magic {
-			return nil, fmt.Errorf("(file-002) unknown file format")
-		}
-
-		filer := lldb.Filer(lldb.NewOSFiler(f))
-		filer = lldb.NewInnerFiler(filer, 16)
-		if filer, err = lldb.NewACIDFiler(filer, w); err != nil {
-			return nil, err
-		}
-
-		a, err := lldb.NewAllocator(filer, &lldb.Options{})
-		if err != nil {
-			return nil, err
-		}
-
-		bid, err := a.Get(nil, 2) // id
-		if err != nil {
-			return nil, err
-		}
-
-		if len(bid) != 8 {
-			return nil, fmt.Errorf("(file-003) corrupted DB: id |% x|", bid)
-		}
-
-		id := int64(0)
-		for _, v := range bid {
-			id = (id << 8) | int64(v)
-		}
-
-		a.Compress = true
-		s := &file{
-			a:     a,
-			codec: newGobCoder(),
-			f0:    f,
-			f:     filer,
-			id:    id,
-			lck:   lck,
-			name:  f.Name(),
-			wal:   w,
-		}
-
-		close, closew = false, false
-		return s, nil
-	}
-}
-
-func (s *file) OpenIndex(unique bool, handle int64) (btreeIndex, error) {
-	t, err := lldb.OpenBTree(s.a, s.collate, handle)
-	if err != nil {
-		return nil, err
-	}
-
-	return &fileIndex{s, handle, t, unique}, nil
-}
-
-func (s *file) CreateIndex(unique bool) ( /* handle */ int64, btreeIndex, error) {
-	t, h, err := lldb.CreateBTree(s.a, s.collate)
-	if err != nil {
-		return -1, nil, err
-	}
-
-	return h, &fileIndex{s, h, t, unique}, nil
-}
-
-func (s *file) Acid() bool { return s.wal != nil }
-
-func errSet(p *error, errs ...error) (err error) {
-	err = *p
-	for _, e := range errs {
-		if err != nil {
-			return
-		}
-		*p, err = e, e
-	}
-	return
-}
-
-func (s *file) lock() func() {
-	s.mu.Lock()
-	return s.mu.Unlock
-}
-
-func (s *file) Close() (err error) {
-	defer s.lock()()
-
-	es := s.f0.Sync()
-	ef := s.f0.Close()
-	var ew error
-	if s.wal != nil {
-		ew = s.wal.Close()
-	}
-	el := s.lck.Close()
-	return errSet(&err, es, ef, ew, el)
-}
-
-func (s *file) Name() string { return s.name }
-
-func (s *file) Verify() (allocs int64, err error) {
-	defer s.lock()()
-	var stat lldb.AllocStats
-	if err = s.a.Verify(lldb.NewMemFiler(), nil, &stat); err != nil {
-		return
-	}
-
-	allocs = stat.AllocAtoms
-	return
-}
-
-func (s *file) expandBytes(d []interface{}) (err error) {
-	for i, v := range d {
-		b, ok := v.([]byte)
-		if !ok {
-			continue
-		}
-
-		d[i], err = s.loadChunks(b)
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-func (s *file) collate(a, b []byte) int { //TODO w/ error return
-	da, err := lldb.DecodeScalars(a)
-	if err != nil {
-		panic(err)
-	}
-
-	if err = s.expandBytes(da); err != nil {
-		panic(err)
-	}
-
-	db, err := lldb.DecodeScalars(b)
-	if err != nil {
-		panic(err)
-	}
-
-	if err = s.expandBytes(db); err != nil {
-		panic(err)
-	}
-
-	//dbg("da: %v, db: %v", da, db)
-	return collate(da, db)
-}
-
-func (s *file) CreateTemp(asc bool) (bt temp, err error) {
-	f, err := s.tempFile("", "ql-tmp-")
-	if err != nil {
-		return nil, err
-	}
-
-	fn := f.Name()
-	filer := lldb.NewOSFiler(f)
-	a, err := lldb.NewAllocator(filer, &lldb.Options{})
-	if err != nil {
-		f.Close()
-		os.Remove(fn)
-		return nil, err
-	}
-
-	k := 1
-	if !asc {
-		k = -1
-	}
-
-	t, _, err := lldb.CreateBTree(a, func(a, b []byte) int { //TODO w/ error return
-		return k * s.collate(a, b)
-	})
-	if err != nil {
-		f.Close()
-		if fn != "" {
-			os.Remove(fn)
-		}
-		return nil, err
-	}
-
-	x := &fileTemp{file: &file{
-		a:     a,
-		codec: newGobCoder(),
-		f0:    f,
-	},
-		t: t}
-	return x, nil
-}
-
-func (s *file) BeginTransaction() (err error) {
-	defer s.lock()()
-	return s.f.BeginUpdate()
-}
-
-func (s *file) Rollback() (err error) {
-	defer s.lock()()
-	return s.f.Rollback()
-}
-
-func (s *file) Commit() (err error) {
-	defer s.lock()()
-	return s.f.EndUpdate()
-}
-
-func (s *file) Create(data ...interface{}) (h int64, err error) {
-	if err = expand(data); err != nil {
-		return
-	}
-
-	if err = s.flatten(data); err != nil {
-		return
-	}
-
-	b, err := lldb.EncodeScalars(data...)
-	if err != nil {
-		return
-	}
-
-	defer s.lock()()
-	return s.a.Alloc(b)
-}
-
-func (s *file) Delete(h int64, blobCols ...*col) (err error) {
-	switch len(blobCols) {
-	case 0:
-		defer s.lock()()
-		return s.a.Free(h)
-	default:
-		return s.free(h, blobCols)
-	}
-}
-
-func (s *file) ResetID() (err error) {
-	s.id = 0
-	return
-}
-
-func (s *file) ID() (int64, error) {
-	defer s.lock()()
-
-	s.id++
-	b := make([]byte, 8)
-	id := s.id
-	for i := 7; i >= 0; i-- {
-		b[i] = byte(id)
-		id >>= 8
-	}
-
-	return s.id, s.a.Realloc(2, b)
-}
-
-func (s *file) free(h int64, blobCols []*col) (err error) {
-	b, err := s.a.Get(nil, h) //LATER +bufs
-	if err != nil {
-		return
-	}
-
-	rec, err := lldb.DecodeScalars(b)
-	if err != nil {
-		return
-	}
-
-	for _, col := range blobCols {
-		if col.index >= len(rec) {
-			return fmt.Errorf("(file-004) file.free: corrupted DB (record len)")
-		}
-		if col.index+2 >= len(rec) {
-			continue
-		}
-
-		switch x := rec[col.index+2].(type) {
-		case nil:
-			// nop
-		case []byte:
-			if err = s.freeChunks(x); err != nil {
-				return
-			}
-		}
-	}
-	defer s.lock()()
-	return s.a.Free(h)
-}
-
-func (s *file) Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error) { //NTYPE
-	b, err := s.a.Get(nil, h) //LATER +bufs
-	if err != nil {
-		return
-	}
-
-	rec, err := lldb.DecodeScalars(b)
-	if err != nil {
-		return
-	}
-
-	for _, col := range cols {
-		i := col.index + 2
-		if i >= len(rec) || rec[i] == nil {
-			continue
-		}
-
-		switch col.typ {
-		case 0:
-		case qBool:
-		case qComplex64:
-			rec[i] = complex64(rec[i].(complex128))
-		case qComplex128:
-		case qFloat32:
-			rec[i] = float32(rec[i].(float64))
-		case qFloat64:
-		case qInt8:
-			rec[i] = int8(rec[i].(int64))
-		case qInt16:
-			rec[i] = int16(rec[i].(int64))
-		case qInt32:
-			rec[i] = int32(rec[i].(int64))
-		case qInt64:
-		case qString:
-		case qUint8:
-			rec[i] = uint8(rec[i].(uint64))
-		case qUint16:
-			rec[i] = uint16(rec[i].(uint64))
-		case qUint32:
-			rec[i] = uint32(rec[i].(uint64))
-		case qUint64:
-		case qBlob, qBigInt, qBigRat, qTime, qDuration:
-			switch x := rec[i].(type) {
-			case []byte:
-				rec[i] = chunk{f: s, b: x}
-			default:
-				return nil, fmt.Errorf("(file-006) corrupted DB: non nil chunk type is not []byte")
-			}
-		default:
-			panic("internal error 045")
-		}
-	}
-
-	if cols != nil {
-		for n, dn := len(cols)+2, len(rec); dn < n; dn++ {
-			rec = append(rec, nil)
-		}
-	}
-
-	return rec, nil
-}
-
-func (s *file) freeChunks(enc []byte) (err error) {
-	items, err := lldb.DecodeScalars(enc)
-	if err != nil {
-		return
-	}
-
-	var ok bool
-	var next int64
-	switch len(items) {
-	case 2:
-		return
-	case 3:
-		if next, ok = items[1].(int64); !ok || next == 0 {
-			return fmt.Errorf("(file-007) corrupted DB: first chunk link")
-		}
-	default:
-		return fmt.Errorf("(file-008) corrupted DB: first chunk")
-	}
-
-	for next != 0 {
-		b, err := s.a.Get(nil, next)
-		if err != nil {
-			return err
-		}
-
-		if items, err = lldb.DecodeScalars(b); err != nil {
-			return err
-		}
-
-		var h int64
-		switch len(items) {
-		case 1:
-			// nop
-		case 2:
-			if h, ok = items[0].(int64); !ok {
-				return fmt.Errorf("(file-009) corrupted DB: chunk link")
-			}
-
-		default:
-			return fmt.Errorf("(file-010) corrupted DB: chunk items %d (%v)", len(items), items)
-		}
-
-		s.mu.Lock()
-		if err = s.a.Free(next); err != nil {
-			s.mu.Unlock()
-			return err
-		}
-
-		s.mu.Unlock()
-		next = h
-	}
-	return
-}
-
-func (s *file) loadChunks(enc []byte) (v interface{}, err error) {
-	items, err := lldb.DecodeScalars(enc)
-	if err != nil {
-		return
-	}
-
-	var ok bool
-	var next int64
-	switch len(items) {
-	case 2:
-		// nop
-	case 3:
-		if next, ok = items[1].(int64); !ok || next == 0 {
-			return nil, fmt.Errorf("(file-011) corrupted DB: first chunk link")
-		}
-	default:
-		//fmt.Printf("%d: %#v\n", len(items), items)
-		return nil, fmt.Errorf("(file-012) corrupted DB: first chunk")
-	}
-
-	typ, ok := items[0].(int64)
-	if !ok {
-		return nil, fmt.Errorf("(file-013) corrupted DB: first chunk tag")
-	}
-
-	buf, ok := items[len(items)-1].([]byte)
-	if !ok {
-		return nil, fmt.Errorf("(file-014) corrupted DB: first chunk data")
-	}
-
-	for next != 0 {
-		b, err := s.a.Get(nil, next)
-		if err != nil {
-			return nil, err
-		}
-
-		if items, err = lldb.DecodeScalars(b); err != nil {
-			return nil, err
-		}
-
-		switch len(items) {
-		case 1:
-			next = 0
-		case 2:
-			if next, ok = items[0].(int64); !ok {
-				return nil, fmt.Errorf("(file-015) corrupted DB: chunk link")
-			}
-
-			items = items[1:]
-		default:
-			return nil, fmt.Errorf("(file-016) corrupted DB: chunk items %d (%v)", len(items), items)
-		}
-
-		if b, ok = items[0].([]byte); !ok {
-			return nil, fmt.Errorf("(file-017) corrupted DB: chunk data")
-		}
-
-		buf = append(buf, b...)
-	}
-	return s.codec.decode(buf, int(typ))
-}
-
-func (s *file) Update(h int64, data ...interface{}) (err error) {
-	b, err := lldb.EncodeScalars(data...)
-	if err != nil {
-		return
-	}
-
-	defer s.lock()()
-	return s.a.Realloc(h, b)
-}
-
-func (s *file) UpdateRow(h int64, blobCols []*col, data ...interface{}) (err error) {
-	if len(blobCols) == 0 {
-		return s.Update(h, data...)
-	}
-
-	if err = expand(data); err != nil {
-		return
-	}
-
-	data0, err := s.Read(nil, h, blobCols...)
-	if err != nil {
-		return
-	}
-
-	for _, c := range blobCols {
-		if c.index+2 >= len(data0) {
-			continue
-		}
-
-		if x := data0[c.index+2]; x != nil {
-			if err = s.freeChunks(x.(chunk).b); err != nil {
-				return
-			}
-		}
-	}
-
-	if err = s.flatten(data); err != nil {
-		return
-	}
-
-	return s.Update(h, data...)
-}
-
-// []interface{}{qltype, ...}->[]interface{}{lldb scalar type, ...}
-// + long blobs are (pre)written to a chain of chunks.
-func (s *file) flatten(data []interface{}) (err error) {
-	for i, v := range data {
-		tag := 0
-		var b []byte
-		switch x := v.(type) {
-		case []byte:
-			tag = qBlob
-			b = x
-		case *big.Int:
-			tag = qBigInt
-			b, err = s.codec.encode(x)
-		case *big.Rat:
-			tag = qBigRat
-			b, err = s.codec.encode(x)
-		case time.Time:
-			tag = qTime
-			b, err = s.codec.encode(x)
-		case time.Duration:
-			tag = qDuration
-			b, err = s.codec.encode(x)
-		default:
-			continue
-		}
-		if err != nil {
-			return
-		}
-
-		const chunk = 1 << 16
-		chunks := 0
-		var next int64
-		var buf []byte
-		for rem := len(b); rem > shortBlob; {
-			n := mathutil.Min(rem, chunk)
-			part := b[rem-n:]
-			b = b[:rem-n]
-			rem -= n
-			switch next {
-			case 0: // last chunk
-				buf, err = lldb.EncodeScalars([]interface{}{part}...)
-			default: // middle chunk
-				buf, err = lldb.EncodeScalars([]interface{}{next, part}...)
-			}
-			if err != nil {
-				return
-			}
-
-			s.mu.Lock()
-			h, err := s.a.Alloc(buf)
-			s.mu.Unlock()
-			if err != nil {
-				return err
-			}
-
-			next = h
-			chunks++
-		}
-
-		switch next {
-		case 0: // single chunk
-			buf, err = lldb.EncodeScalars([]interface{}{tag, b}...)
-		default: // multi chunks
-			buf, err = lldb.EncodeScalars([]interface{}{tag, next, b}...)
-		}
-		if err != nil {
-			return
-		}
-
-		data[i] = buf
-	}
-	return
-}
-
-func lockName(dbname string) string {
-	base := filepath.Base(filepath.Clean(dbname)) + "lockfile"
-	h := sha1.New()
-	io.WriteString(h, base)
-	return filepath.Join(filepath.Dir(dbname), fmt.Sprintf(".%x", h.Sum(nil)))
-}
-
-func walName(dbname string) (r string) {
-	base := filepath.Base(filepath.Clean(dbname))
-	h := sha1.New()
-	io.WriteString(h, base)
-	return filepath.Join(filepath.Dir(dbname), fmt.Sprintf(".%x", h.Sum(nil)))
-}
-
-type fileIndex struct {
-	f      *file
-	h      int64
-	t      *lldb.BTree
-	unique bool
-}
-
-func (x *fileIndex) Clear() error {
-	return x.t.Clear()
-}
-
-var gbZeroInt64 []byte
-
-func init() {
-	var err error
-	if gbZeroInt64, err = lldb.EncodeScalars(int64(0)); err != nil {
-		panic(err)
-	}
-}
-
-func isIndexNull(data []interface{}) bool {
-	for _, v := range data {
-		if v != nil {
-			return false
-		}
-	}
-	return true
-}
-
-// The []byte version of the key in the BTree shares chunks, if any, with
-// the value stored in the record.
-func (x *fileIndex) Create(indexedValues []interface{}, h int64) error {
-	for i, indexedValue := range indexedValues {
-		chunk, ok := indexedValue.(chunk)
-		if ok {
-			indexedValues[i] = chunk.b
-		}
-	}
-
-	t := x.t
-	switch {
-	case !x.unique:
-		k, err := lldb.EncodeScalars(append(indexedValues, h)...)
-		if err != nil {
-			return err
-		}
-
-		return t.Set(k, gbZeroInt64)
-	case isIndexNull(indexedValues): // unique, NULL
-		k, err := lldb.EncodeScalars(nil, h)
-		if err != nil {
-			return err
-		}
-
-		return t.Set(k, gbZeroInt64)
-	default: // unique, non NULL
-		k, err := lldb.EncodeScalars(append(indexedValues, int64(0))...)
-		if err != nil {
-			return err
-		}
-
-		v, err := lldb.EncodeScalars(h)
-		if err != nil {
-			return err
-		}
-
-		_, _, err = t.Put(nil, k, func(key, old []byte) (new []byte, write bool, err error) {
-			if old == nil {
-				return v, true, nil
-			}
-
-			return nil, false, fmt.Errorf("(file-018) cannot insert into unique index: duplicate value(s): %v", indexedValues)
-		})
-		return err
-	}
-}
-
-func (x *fileIndex) Delete(indexedValues []interface{}, h int64) error {
-	for i, indexedValue := range indexedValues {
-		chunk, ok := indexedValue.(chunk)
-		if ok {
-			indexedValues[i] = chunk.b
-		}
-	}
-
-	t := x.t
-	var k []byte
-	var err error
-	switch {
-	case !x.unique:
-		k, err = lldb.EncodeScalars(append(indexedValues, h)...)
-	case isIndexNull(indexedValues): // unique, NULL
-		k, err = lldb.EncodeScalars(nil, h)
-	default: // unique, non NULL
-		k, err = lldb.EncodeScalars(append(indexedValues, int64(0))...)
-	}
-	if err != nil {
-		return err
-	}
-
-	return t.Delete(k)
-}
-
-func (x *fileIndex) Drop() error {
-	if err := x.Clear(); err != nil {
-		return err
-	}
-
-	return x.f.a.Free(x.h)
-}
-
-func (x *fileIndex) Seek(indexedValues []interface{}) (indexIterator, bool, error) { //TODO(indices) blobs: +test
-	k, err := lldb.EncodeScalars(append(indexedValues, 0)...)
-	if err != nil {
-		return nil, false, err
-	}
-
-	en, hit, err := x.t.Seek(k)
-	if err != nil {
-		return nil, false, err
-	}
-
-	return &fileIndexIterator{x.f, en, x.unique}, hit, nil
-}
-
-func (x *fileIndex) SeekFirst() (iter indexIterator, err error) {
-	en, err := x.t.SeekFirst()
-	return &fileIndexIterator{x.f, en, x.unique}, err
-}
-
-func (x *fileIndex) SeekLast() (iter indexIterator, err error) {
-	en, err := x.t.SeekLast()
-	return &fileIndexIterator{x.f, en, x.unique}, err
-}
-
-type fileIndexIterator struct {
-	f      *file
-	en     *lldb.BTreeEnumerator
-	unique bool
-}
-
-func (i *fileIndexIterator) nextPrev(f func() ([]byte, []byte, error)) ([]interface{}, int64, error) { //TODO(indices) blobs: +test
-	bk, bv, err := f()
-	if err != nil {
-		return nil, -1, err
-	}
-
-	dk, err := lldb.DecodeScalars(bk)
-	if err != nil {
-		return nil, -1, err
-	}
-
-	b, ok := dk[0].([]byte)
-	if ok {
-		dk[0] = chunk{i.f, b}
-		if expand(dk[:1]); err != nil {
-			return nil, -1, err
-		}
-	}
-
-	var k indexKey
-	k.value = dk[:len(dk)-1]
-	switch i.unique {
-	case true:
-		if isIndexNull(k.value) {
-			return nil, dk[len(dk)-1].(int64), nil
-		}
-
-		dv, err := lldb.DecodeScalars(bv)
-		if err != nil {
-			return nil, -1, err
-		}
-
-		return k.value, dv[0].(int64), nil
-	default:
-		return k.value, dk[len(dk)-1].(int64), nil
-	}
-}
-
-func (i *fileIndexIterator) Next() ([]interface{}, int64, error) { //TODO(indices) blobs: +test
-	return i.nextPrev(i.en.Next)
-}
-
-func (i *fileIndexIterator) Prev() ([]interface{}, int64, error) { //TODO(indices) blobs: +test
-	return i.nextPrev(i.en.Prev)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/helper/helper.go b/Godeps/_workspace/src/github.com/cznic/ql/helper/helper.go
deleted file mode 100644
index 7ce3015391..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/helper/helper.go
+++ /dev/null
@@ -1,338 +0,0 @@
-// +build ignore
-
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bufio"
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"os"
-)
-
-type t int
-
-const (
-	qNil t = iota
-	idealComplex
-	idealFloat
-	idealInt
-	idealRune
-	idealUint
-	qBool
-	qComplex64
-	qComplex128
-	qFloat32
-	qFloat64
-	qInt8
-	qInt16
-	qInt32
-	qInt64
-	qString
-	qUint8
-	qUint16
-	qUint32
-	qUint64
-	qBigInt
-	qBigRat
-	qTime
-	qDuration
-
-	qEnd
-)
-
-func (n t) String() string {
-	switch n {
-	case qNil:
-		return "nil"
-	case idealComplex:
-		return "idealComplex"
-	case idealFloat:
-		return "idealFloat"
-	case idealInt:
-		return "idealInt"
-	case idealRune:
-		return "idealRune"
-	case idealUint:
-		return "idealUint"
-	case qBool:
-		return "bool"
-	case qComplex64:
-		return "complex64"
-	case qComplex128:
-		return "complex128"
-	case qFloat32:
-		return "float32"
-	case qFloat64:
-		return "float64"
-	case qInt8:
-		return "int8"
-	case qInt16:
-		return "int16"
-	case qInt32:
-		return "int32"
-	case qInt64:
-		return "int64"
-	case qString:
-		return "string"
-	case qUint8:
-		return "uint8"
-	case qUint16:
-		return "uint16"
-	case qUint32:
-		return "uint32"
-	case qUint64:
-		return "uint64"
-	case qBigInt:
-		return "*big.Int"
-	case qBigRat:
-		return "*big.Rat"
-	case qTime:
-		return "time.Time"
-	case qDuration:
-		return "time.Duration"
-	default:
-		panic("internal error 046")
-	}
-}
-
-func coerceIdealComplex(typ t) string {
-	switch typ {
-	case qComplex64, qComplex128:
-		return fmt.Sprintf("return %s(x)\n", typ)
-	default:
-		return ""
-	}
-}
-
-func coerceIdealFloat(typ t) string {
-	switch typ {
-	case idealComplex:
-		return fmt.Sprintf("return %s(complex(float64(x), 0))\n", typ)
-	case qComplex64:
-		return fmt.Sprintf("return %s(complex(float32(x), 0))\n", typ)
-	case qComplex128:
-		return fmt.Sprintf("return %s(complex(float64(x), 0))\n", typ)
-	case idealFloat, qFloat32, qFloat64:
-		return fmt.Sprintf("return %s(float64(x))\n", typ)
-	case qBigRat:
-		return fmt.Sprintf("return big.NewRat(1, 1).SetFloat64(float64(x))\n")
-	default:
-		return ""
-	}
-	return ""
-}
-
-func coerceIdealInt(typ t) string {
-	switch typ {
-	case idealComplex:
-		return fmt.Sprintf("return %s(complex(float64(x), 0))\n", typ)
-	case qComplex64:
-		return fmt.Sprintf("return %s(complex(float32(x), 0))\n", typ)
-	case qComplex128:
-		return fmt.Sprintf("return %s(complex(float64(x), 0))\n", typ)
-	case idealFloat, idealInt, qFloat32, qFloat64, qInt64:
-		return fmt.Sprintf("return %s(int64(x))\n", typ)
-	case idealUint:
-		return fmt.Sprintf("if x >= 0 { return %s(int64(x)) }\n", typ)
-	case qInt8:
-		return fmt.Sprintf("if x >= math.MinInt8 && x<= math.MaxInt8 { return %s(int64(x)) }\n", typ)
-	case qInt16:
-		return fmt.Sprintf("if x >= math.MinInt16 && x<= math.MaxInt16 { return %s(int64(x)) }\n", typ)
-	case qInt32:
-		return fmt.Sprintf("if x >= math.MinInt32 && x<= math.MaxInt32 { return %s(int64(x)) }\n", typ)
-	case qUint8:
-		return fmt.Sprintf("if x >= 0 && x<= math.MaxUint8 { return %s(int64(x)) }\n", typ)
-	case qUint16:
-		return fmt.Sprintf("if x >= 0 && x<= math.MaxUint16 { return %s(int64(x)) }\n", typ)
-	case qUint32:
-		return fmt.Sprintf("if x >= 0 && x<= math.MaxUint32 { return %s(int64(x)) }\n", typ)
-	case qUint64:
-		return fmt.Sprintf("if x >= 0 { return %s(int64(x)) }\n", typ)
-	case qBigInt:
-		return fmt.Sprintf("return big.NewInt(int64(x))\n")
-	case qBigRat:
-		return fmt.Sprintf("return big.NewRat(1, 1).SetInt64(int64(x))\n")
-	case qDuration:
-		return fmt.Sprintf("return time.Duration(int64(x))\n")
-	default:
-		return ""
-	}
-	return ""
-}
-
-func coerceIdealRune(typ t) string {
-	switch typ {
-	case idealComplex:
-		return fmt.Sprintf("return %s(complex(float64(x), 0))\n", typ)
-	case qComplex64:
-		return fmt.Sprintf("return %s(complex(float32(x), 0))\n", typ)
-	case qComplex128:
-		return fmt.Sprintf("return %s(complex(float64(x), 0))\n", typ)
-	case idealFloat, idealInt, idealRune, idealUint, qFloat32, qFloat64, qInt8, qInt16, qInt32, qInt64, qUint8, qUint16, qUint32, qUint64:
-		return fmt.Sprintf("return %s(int64(x))\n", typ)
-	case qBigInt:
-		return fmt.Sprintf("return big.NewInt(int64(x))\n")
-	case qBigRat:
-		return fmt.Sprintf("return big.NewRat(1, 1).SetInt64(int64(x))\n")
-	case qDuration:
-		return fmt.Sprintf("return time.Duration(int64(x))\n")
-	default:
-		return ""
-	}
-	return ""
-}
-
-func coerceIdealUint(typ t) string {
-	switch typ {
-	case idealComplex:
-		return fmt.Sprintf("return %s(complex(float64(x), 0))\n", typ)
-	case qComplex64:
-		return fmt.Sprintf("return %s(complex(float32(x), 0))\n", typ)
-	case qComplex128:
-		return fmt.Sprintf("return %s(complex(float64(x), 0))\n", typ)
-	case idealFloat, idealUint, qFloat32, qFloat64, qUint64:
-		return fmt.Sprintf("return %s(uint64(x))\n", typ)
-	case idealInt:
-		return fmt.Sprintf("if x <= math.MaxInt64 { return %s(int64(x)) }\n", typ)
-	case qInt8:
-		return fmt.Sprintf("if x <= math.MaxInt8 { return %s(int64(x)) }\n", typ)
-	case qInt16:
-		return fmt.Sprintf("if  x<= math.MaxInt16 { return %s(int64(x)) }\n", typ)
-	case qInt32:
-		return fmt.Sprintf("if  x<= math.MaxInt32 { return %s(int64(x)) }\n", typ)
-	case qInt64:
-		return fmt.Sprintf("if  x<= math.MaxInt64 { return %s(int64(x)) }\n", typ)
-	case qUint8:
-		return fmt.Sprintf("if x >= 0 && x<= math.MaxUint8 { return %s(int64(x)) }\n", typ)
-	case qUint16:
-		return fmt.Sprintf("if x >= 0 && x<= math.MaxUint16 { return %s(int64(x)) }\n", typ)
-	case qUint32:
-		return fmt.Sprintf("if x >= 0 && x<= math.MaxUint32 { return %s(int64(x)) }\n", typ)
-	case qBigInt:
-		return fmt.Sprintf("return big.NewInt(0).SetUint64(uint64(x))\n")
-	case qBigRat:
-		return fmt.Sprintf("return big.NewRat(1, 1).SetInt(big.NewInt(0).SetUint64(uint64(x)))\n")
-	case qDuration:
-		return fmt.Sprintf("if x <= math.MaxInt64 { return time.Duration(int64(x)) }\n")
-	default:
-		return ""
-	}
-	return ""
-}
-
-func genCoerce1(w io.Writer, in t, f func(out t) string) {
-	fmt.Fprintf(w, "\tcase %s:\n", in)
-	fmt.Fprintf(w, "\t\tswitch otherVal.(type) {\n")
-
-	for i := idealComplex; i < qEnd; i++ {
-		s := f(i)
-		switch s {
-		case "":
-			fmt.Fprintf(w, "\t\t//case %s:\n", i)
-		default:
-			fmt.Fprintf(w, "\t\tcase %s:\n", i)
-			fmt.Fprintf(w, "\t\t\t%s", s)
-		}
-	}
-
-	fmt.Fprintf(w, "\t\t}\n") // switch
-}
-
-func genCoerce(w io.Writer) {
-	fmt.Fprintf(w,
-		`
-func coerce1(inVal, otherVal interface{}) (coercedInVal interface{}) {
-	coercedInVal = inVal
-	if otherVal == nil {
-		return
-	}
-
-	switch x := inVal.(type) {
-	case nil:
-		return
-`)
-	genCoerce1(w, idealComplex, coerceIdealComplex)
-	genCoerce1(w, idealFloat, coerceIdealFloat)
-	genCoerce1(w, idealInt, coerceIdealInt)
-	genCoerce1(w, idealRune, coerceIdealRune)
-	genCoerce1(w, idealUint, coerceIdealUint)
-	fmt.Fprintf(w, "\t}\n") // switch
-
-	fmt.Fprintf(w, "\treturn\n}\n") // func
-}
-
-func main() {
-	ofn := flag.String("o", "", "")
-	flag.Parse()
-	_, err := os.Stat(*ofn)
-	if err == nil {
-		log.Fatalf("%s exists", *ofn)
-	}
-
-	w := bufio.NewWriter(os.Stdout)
-	if s := *ofn; s != "" {
-		f, err := os.Create(s)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		defer f.Close()
-		w = bufio.NewWriter(f)
-	}
-	defer w.Flush()
-
-	fmt.Fprintf(w, `// Copyright 2013 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// CAUTION: This file was generated automatically by
-//
-//	$ go run helper/helper.go -o coerce.go
-//
-// DO NOT EDIT!
-
- package ql
-
-import (
-	"math"
-	"math/big"
-	"reflect"
-	"time"
-)
-
-func coerce(a, b interface{}) (x, y interface{}) {
-	if reflect.TypeOf(a) == reflect.TypeOf(b) {
-		return a, b
-	}
-
-	switch a.(type) {
-	case idealComplex, idealFloat, idealInt, idealRune, idealUint:
-		switch b.(type) {
-		case idealComplex, idealFloat, idealInt, idealRune, idealUint:
-			x, y = coerce1(a, b), b
-			if reflect.TypeOf(x) == reflect.TypeOf(y) {
-				return
-			}
-
-			return a, coerce1(b, a)
-		default:
-			return coerce1(a, b), b
-		}
-	default:
-		switch b.(type) {
-		case idealComplex, idealFloat, idealInt, idealRune, idealUint:
-			return a, coerce1(b, a)
-		default:
-			return a, b
-		}
-	}
-}
-`)
-	genCoerce(w)
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/httpfs.go b/Godeps/_workspace/src/github.com/cznic/ql/httpfs.go
deleted file mode 100644
index 89c6f89c52..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/httpfs.go
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright (c) 2014 ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/cznic/mathutil"
-)
-
-var (
-	_ http.FileSystem = (*HTTPFS)(nil)
-	_ http.File       = (*HTTPFile)(nil)
-	_ os.FileInfo     = (*HTTPFile)(nil)
-	_ os.FileInfo     = (*dirEntry)(nil)
-)
-
-type dirEntry string
-
-func (d dirEntry) Name() string       { return string(d) }
-func (d dirEntry) Size() int64        { return -1 }
-func (d dirEntry) Mode() os.FileMode  { return os.ModeDir }
-func (d dirEntry) ModTime() time.Time { return time.Time{} }
-func (d dirEntry) IsDir() bool        { return true }
-func (d dirEntry) Sys() interface{}   { return interface{}(nil) }
-
-// A HTTPFile is returned by the HTTPFS's Open method and can be served by the
-// http.FileServer implementation.
-type HTTPFile struct {
-	closed     bool
-	content    []byte
-	dirEntries []os.FileInfo
-	isFile     bool
-	name       string
-	off        int
-	sz         int
-}
-
-// Close implements http.File.
-func (f *HTTPFile) Close() error {
-	if f.closed {
-		return os.ErrInvalid
-	}
-
-	f.closed = true
-	return nil
-}
-
-// IsDir implements os.FileInfo
-func (f *HTTPFile) IsDir() bool { return !f.isFile }
-
-// Mode implements os.FileInfo
-func (f *HTTPFile) Mode() os.FileMode {
-	switch f.isFile {
-	case false:
-		return os.FileMode(0444)
-	default:
-		return os.ModeDir
-	}
-}
-
-// ModTime implements os.FileInfo
-func (f *HTTPFile) ModTime() time.Time {
-	return time.Time{}
-}
-
-// Name implements os.FileInfo
-func (f *HTTPFile) Name() string { return path.Base(f.name) }
-
-// Size implements os.FileInfo
-func (f *HTTPFile) Size() int64 {
-	switch f.isFile {
-	case false:
-		return -1
-	default:
-		return int64(len(f.content))
-	}
-}
-
-// Stat implements http.File.
-func (f *HTTPFile) Stat() (os.FileInfo, error) { return f, nil }
-
-// Sys implements os.FileInfo
-func (f *HTTPFile) Sys() interface{} { return interface{}(nil) }
-
-// Readdir implements http.File.
-func (f *HTTPFile) Readdir(count int) ([]os.FileInfo, error) {
-	if f.isFile {
-		return nil, fmt.Errorf("not a directory: %s", f.name)
-	}
-
-	if count <= 0 {
-		r := f.dirEntries
-		f.dirEntries = f.dirEntries[:0]
-		return r, nil
-	}
-
-	rq := mathutil.Min(count, len(f.dirEntries))
-	r := f.dirEntries[:rq]
-	f.dirEntries = f.dirEntries[rq:]
-	if len(r) != 0 {
-		return r, nil
-	}
-
-	return nil, io.EOF
-}
-
-// Read implements http.File.
-func (f *HTTPFile) Read(b []byte) (int, error) {
-	if f.closed {
-		return 0, os.ErrInvalid
-	}
-
-	n := copy(b, f.content[f.off:])
-	f.off += n
-	if n != 0 {
-		return n, nil
-	}
-
-	return 0, io.EOF
-}
-
-// Seek implements http.File.
-func (f *HTTPFile) Seek(offset int64, whence int) (int64, error) {
-	if f.closed {
-		return 0, os.ErrInvalid
-	}
-
-	if offset < 0 {
-		return int64(f.off), fmt.Errorf("cannot seek before start of file")
-	}
-
-	switch whence {
-	case 0:
-		noff := int64(f.off) + offset
-		if noff > mathutil.MaxInt {
-			return int64(f.off), fmt.Errorf("seek target overflows int: %d", noff)
-		}
-
-		f.off = mathutil.Min(int(offset), len(f.content))
-		if f.off == int(offset) {
-			return offset, nil
-		}
-
-		return int64(f.off), io.EOF
-	case 1:
-		noff := int64(f.off) + offset
-		if noff > mathutil.MaxInt {
-			return int64(f.off), fmt.Errorf("seek target overflows int: %d", noff)
-		}
-
-		off := mathutil.Min(f.off+int(offset), len(f.content))
-		if off == f.off+int(offset) {
-			f.off = off
-			return int64(off), nil
-		}
-
-		f.off = off
-		return int64(off), io.EOF
-	case 2:
-		noff := int64(f.off) - offset
-		if noff < 0 {
-			return int64(f.off), fmt.Errorf("cannot seek before start of file")
-		}
-
-		f.off = len(f.content) - int(offset)
-		return int64(f.off), nil
-	default:
-		return int64(f.off), fmt.Errorf("seek: invalid whence %d", whence)
-	}
-}
-
-// HTTPFS implements a http.FileSystem backed by data in a DB.
-type HTTPFS struct {
-	db       *DB
-	dir, get List
-}
-
-// NewHTTPFS returns a http.FileSystem backed by a result record set of query.
-// The record set provides two mandatory fields: path and content (the field
-// names are case sensitive). Type of name must be string and type of content
-// must be blob (ie. []byte). Field 'path' value is the "file" pathname, which
-// must be rooted; and field 'content' value is its "data".
-func (db *DB) NewHTTPFS(query string) (*HTTPFS, error) {
-	if _, err := Compile(query); err != nil {
-		return nil, err
-	}
-
-	dir, err := Compile(fmt.Sprintf("SELECT path FROM (%s) WHERE hasPrefix(path, $1)", query))
-	if err != nil {
-		return nil, err
-	}
-
-	get, err := Compile(fmt.Sprintf("SELECT content FROM (%s) WHERE path == $1", query))
-	if err != nil {
-		return nil, err
-	}
-
-	return &HTTPFS{db: db, dir: dir, get: get}, nil
-}
-
-// Open implements http.FileSystem. The name parameter represents a file path.
-// The elements in a file path are separated by slash ('/', U+002F) characters,
-// regardless of host operating system convention.
-func (f *HTTPFS) Open(name string) (http.File, error) {
-	if filepath.Separator != '/' && strings.IndexRune(name, filepath.Separator) >= 0 ||
-		strings.Contains(name, "\x00") {
-		return nil, fmt.Errorf("invalid character in file path: %q", name)
-	}
-
-	name = path.Clean("/" + name)
-	rs, _, err := f.db.Execute(nil, f.get, name)
-	if err != nil {
-		return nil, err
-	}
-
-	n := 0
-	var fdata []byte
-	if err = rs[0].Do(false, func(data []interface{}) (more bool, err error) {
-		switch n {
-		case 0:
-			var ok bool
-			fdata, ok = data[0].([]byte)
-			if !ok {
-				return false, fmt.Errorf("open: expected blob, got %T", data[0])
-			}
-			n++
-			return true, nil
-		default:
-			return false, fmt.Errorf("open: more than one result was returned for %s", name)
-		}
-	}); err != nil {
-		return nil, err
-	}
-
-	if n == 1 { // file found
-		return &HTTPFile{name: name, isFile: true, content: fdata}, nil
-	}
-
-	dirName := name
-	if dirName[len(dirName)-1] != filepath.Separator {
-		dirName += string(filepath.Separator)
-	}
-	// Open("/a/b"): {/a/b/c.x,/a/b/d.x,/a/e.x,/a/b/f/g.x} -> {c.x,d.x,f}
-	rs, _, err = f.db.Execute(nil, f.dir, dirName)
-	if err != nil {
-		return nil, err
-	}
-
-	n = 0
-	r := &HTTPFile{name: dirName}
-	m := map[string]bool{}
-	x := len(dirName)
-	if err = rs[0].Do(false, func(data []interface{}) (more bool, err error) {
-		n++
-		switch name := data[0].(type) {
-		case string:
-			if filepath.Separator != '/' && strings.IndexRune(name, filepath.Separator) >= 0 ||
-				strings.Contains(name, "\x00") {
-				return false, fmt.Errorf("invalid character in file path: %q", name)
-			}
-
-			name = path.Clean("/" + name)
-			rest := name[x:]
-			parts := strings.Split(rest, "/")
-			if len(parts) == 0 {
-				return true, nil
-			}
-
-			nm := parts[0]
-			switch len(parts) {
-			case 1: // file
-				r.dirEntries = append(r.dirEntries, &HTTPFile{isFile: true, name: nm})
-			default: // directory
-				if !m[nm] {
-					r.dirEntries = append(r.dirEntries, dirEntry(nm))
-				}
-				m[nm] = true
-			}
-			return true, nil
-		default:
-			return false, fmt.Errorf("expected string path, got %T(%v)", name, name)
-		}
-	}); err != nil {
-		return nil, err
-	}
-
-	if n != 0 {
-		return r, nil
-	}
-
-	return nil, os.ErrNotExist
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/introspection.go b/Godeps/_workspace/src/github.com/cznic/ql/introspection.go
deleted file mode 100644
index 61ac9a928d..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/introspection.go
+++ /dev/null
@@ -1,625 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"reflect"
-	"strings"
-	"sync"
-)
-
-var (
-	schemaCache = map[reflect.Type]*StructInfo{}
-	schemaMu    sync.RWMutex
-)
-
-// StructInfo describes a struct type. An instance of StructInfo obtained from
-// StructSchema is shared and must not be mutated.  That includes the values
-// pointed to by the elements of Fields and Indices.
-type StructInfo struct {
-	Fields  []*StructField // Fields describe the considered fields of a struct type.
-	HasID   bool           // Whether the struct has a considered field named ID of type int64.
-	Indices []*StructIndex // Indices describe indices defined by the index or uindex ql tags.
-	IsPtr   bool           // Whether the StructInfo was derived from a pointer to a struct.
-}
-
-// StructIndex describes an index defined by the ql tag index or uindex.
-type StructIndex struct {
-	ColumnName string // Name of the column the index is on.
-	Name       string // Name of the index.
-	Unique     bool   // Whether the index is unique.
-}
-
-// StructField describes a considered field of a struct type.
-type StructField struct {
-	Index         int               // Index is the index of the field for reflect.Value.Field.
-	IsID          bool              // Whether the field corresponds to record id().
-	IsPtr         bool              // Whether the field is a pointer type.
-	MarshalType   reflect.Type      // The reflect.Type a field must be converted to when marshaling or nil when it is assignable directly. (Field->value)
-	Name          string            // Field name or value of the name tag (like in `ql:"name foo"`).
-	ReflectType   reflect.Type      // The reflect.Type of the field.
-	Tags          map[string]string // QL tags of this field. (`ql:"a, b c, d"` -> {"a": "", "b": "c", "d": ""})
-	Type          Type              // QL type of the field.
-	UnmarshalType reflect.Type      // The reflect.Type a value must be converted to when unmarshaling or nil when it is assignable directly. (Field<-value)
-	ZeroPtr       reflect.Value     // The reflect.Zero value of the field if it's a pointer type.
-}
-
-func (s *StructField) check(v interface{}) error {
-	t := reflect.TypeOf(v)
-	if !s.ReflectType.AssignableTo(t) {
-		if !s.ReflectType.ConvertibleTo(t) {
-			return fmt.Errorf("type %s (%v) cannot be converted to %T", s.ReflectType.Name(), s.ReflectType.Kind(), t.Name())
-		}
-
-		s.MarshalType = t
-	}
-
-	if !t.AssignableTo(s.ReflectType) {
-		if !t.ConvertibleTo(s.ReflectType) {
-			return fmt.Errorf("type %s (%v) cannot be converted to %T", t.Name(), t.Kind(), s.ReflectType.Name())
-		}
-
-		s.UnmarshalType = s.ReflectType
-	}
-	return nil
-}
-
-func parseTag(s string) map[string]string {
-	m := map[string]string{}
-	for _, v := range strings.Split(s, ",") {
-		v = strings.TrimSpace(v)
-		switch n := strings.IndexRune(v, ' '); {
-		case n < 0:
-			m[v] = ""
-		default:
-			m[v[:n]] = v[n+1:]
-		}
-	}
-	return m
-}
-
-// StructSchema returns StructInfo for v which must be a struct instance or a
-// pointer to a struct.  The info is computed only once for every type.
-// Subsequent calls to StructSchema for the same type return a cached
-// StructInfo.
-//
-// Note: The returned StructSchema is shared and must be not mutated, including
-// any other data structures it may point to.
-func StructSchema(v interface{}) (*StructInfo, error) {
-	if v == nil {
-		return nil, fmt.Errorf("cannot derive schema for %T(%v)", v, v)
-	}
-
-	typ := reflect.TypeOf(v)
-	schemaMu.RLock()
-	if r, ok := schemaCache[typ]; ok {
-		schemaMu.RUnlock()
-		return r, nil
-	}
-
-	schemaMu.RUnlock()
-	var schemaPtr bool
-	t := typ
-	if t.Kind() == reflect.Ptr {
-		t = t.Elem()
-		schemaPtr = true
-	}
-	if k := t.Kind(); k != reflect.Struct {
-		return nil, fmt.Errorf("cannot derive schema for type %T (%v)", v, k)
-	}
-
-	r := &StructInfo{IsPtr: schemaPtr}
-	for i := 0; i < t.NumField(); i++ {
-		f := t.Field(i)
-		fn := f.Name
-		if !ast.IsExported(fn) {
-			continue
-		}
-
-		tags := parseTag(f.Tag.Get("ql"))
-		if _, ok := tags["-"]; ok {
-			continue
-		}
-
-		if s := tags["name"]; s != "" {
-			fn = s
-		}
-
-		if fn == "ID" && f.Type.Kind() == reflect.Int64 {
-			r.HasID = true
-		}
-		var ix, unique bool
-		var xn string
-		xfn := fn
-		if s := tags["index"]; s != "" {
-			if _, ok := tags["uindex"]; ok {
-				return nil, fmt.Errorf("both index and uindex in QL struct tag")
-			}
-
-			ix, xn = true, s
-		} else if s := tags["uindex"]; s != "" {
-			if _, ok := tags["index"]; ok {
-				return nil, fmt.Errorf("both index and uindex in QL struct tag")
-			}
-
-			ix, unique, xn = true, true, s
-		}
-		if ix {
-			if fn == "ID" && r.HasID {
-				xfn = "id()"
-			}
-			r.Indices = append(r.Indices, &StructIndex{Name: xn, ColumnName: xfn, Unique: unique})
-		}
-
-		sf := &StructField{Index: i, Name: fn, Tags: tags, Type: Type(-1), ReflectType: f.Type}
-		fk := sf.ReflectType.Kind()
-		if fk == reflect.Ptr {
-			sf.IsPtr = true
-			sf.ZeroPtr = reflect.Zero(sf.ReflectType)
-			sf.ReflectType = sf.ReflectType.Elem()
-			fk = sf.ReflectType.Kind()
-		}
-
-		switch fk {
-		case reflect.Bool:
-			sf.Type = Bool
-			if err := sf.check(false); err != nil {
-				return nil, err
-			}
-		case reflect.Int, reflect.Uint:
-			return nil, fmt.Errorf("only integers of fixed size can be used to derive a schema: %v", fk)
-		case reflect.Int8:
-			sf.Type = Int8
-			if err := sf.check(int8(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Int16:
-			if err := sf.check(int16(0)); err != nil {
-				return nil, err
-			}
-			sf.Type = Int16
-		case reflect.Int32:
-			if err := sf.check(int32(0)); err != nil {
-				return nil, err
-			}
-			sf.Type = Int32
-		case reflect.Int64:
-			if sf.ReflectType.Name() == "Duration" && sf.ReflectType.PkgPath() == "time" {
-				sf.Type = Duration
-				break
-			}
-
-			sf.Type = Int64
-			if err := sf.check(int64(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Uint8:
-			sf.Type = Uint8
-			if err := sf.check(uint8(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Uint16:
-			sf.Type = Uint16
-			if err := sf.check(uint16(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Uint32:
-			sf.Type = Uint32
-			if err := sf.check(uint32(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Uint64:
-			sf.Type = Uint64
-			if err := sf.check(uint64(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Float32:
-			sf.Type = Float32
-			if err := sf.check(float32(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Float64:
-			sf.Type = Float64
-			if err := sf.check(float64(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Complex64:
-			sf.Type = Complex64
-			if err := sf.check(complex64(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Complex128:
-			sf.Type = Complex128
-			if err := sf.check(complex128(0)); err != nil {
-				return nil, err
-			}
-		case reflect.Slice:
-			sf.Type = Blob
-			if err := sf.check([]byte(nil)); err != nil {
-				return nil, err
-			}
-		case reflect.Struct:
-			switch sf.ReflectType.PkgPath() {
-			case "math/big":
-				switch sf.ReflectType.Name() {
-				case "Int":
-					sf.Type = BigInt
-				case "Rat":
-					sf.Type = BigRat
-				}
-			case "time":
-				switch sf.ReflectType.Name() {
-				case "Time":
-					sf.Type = Time
-				}
-			}
-		case reflect.String:
-			sf.Type = String
-			if err := sf.check(""); err != nil {
-				return nil, err
-			}
-		}
-
-		if sf.Type < 0 {
-			return nil, fmt.Errorf("cannot derive schema for type %s (%v)", sf.ReflectType.Name(), fk)
-		}
-
-		sf.IsID = fn == "ID" && r.HasID
-		r.Fields = append(r.Fields, sf)
-	}
-
-	schemaMu.Lock()
-	schemaCache[typ] = r
-	if t != typ {
-		r2 := *r
-		r2.IsPtr = false
-		schemaCache[t] = &r2
-	}
-	schemaMu.Unlock()
-	return r, nil
-}
-
-// MustStructSchema is like StructSchema but panics on error. It simplifies
-// safe initialization of global variables holding StructInfo.
-//
-// MustStructSchema is safe for concurrent use by multiple goroutines.
-func MustStructSchema(v interface{}) *StructInfo {
-	s, err := StructSchema(v)
-	if err != nil {
-		panic(err)
-	}
-
-	return s
-}
-
-// SchemaOptions amend the result of Schema.
-type SchemaOptions struct {
-	// Don't wrap the CREATE statement(s) in a transaction.
-	NoTransaction bool
-
-	// Don't insert the IF NOT EXISTS clause in the CREATE statement(s).
-	NoIfNotExists bool
-
-	// Do not strip the "pkg." part from type name "pkg.Type", produce
-	// "pkg_Type" table name instead. Applies only when no name is passed
-	// to Schema().
-	KeepPrefix bool
-}
-
-var zeroSchemaOptions SchemaOptions
-
-// Schema returns a CREATE TABLE/INDEX statement(s) for a table derived from a
-// struct or an error, if any.  The table is named using the name parameter. If
-// name is an empty string then the type name of the struct is used while non
-// conforming characters are replaced by underscores. Value v can be also a
-// pointer to a struct.
-//
-// Every considered struct field type must be one of the QL types or a type
-// convertible to string, bool, int*, uint*, float* or complex* type or pointer
-// to such type. Integers with a width dependent on the architecture can not be
-// used. Only exported fields are considered. If an exported field QL tag
-// contains "-" (`ql:"-"`) then such field is not considered. A field with name
-// ID, having type int64, corresponds to id() - and is thus not a part of the
-// CREATE statement. A field QL tag containing "index name" or "uindex name"
-// triggers additionally creating an index or unique index on the respective
-// field.  Fields can be renamed using a QL tag "name newName".  Fields are
-// considered in the order of appearance. A QL tag is a struct tag part
-// prefixed by "ql:". Tags can be combined, for example:
-//
-//	type T struct {
-//		Foo	string	`ql:"index xFoo, name Bar"`
-//	}
-//
-// If opts.NoTransaction == true then the statement(s) are not wrapped in a
-// transaction. If opt.NoIfNotExists == true then the CREATE statement(s) omits
-// the IF NOT EXISTS clause. Passing nil opts is equal to passing
-// &SchemaOptions{}
-//
-// Schema is safe for concurrent use by multiple goroutines.
-func Schema(v interface{}, name string, opt *SchemaOptions) (List, error) {
-	if opt == nil {
-		opt = &zeroSchemaOptions
-	}
-	s, err := StructSchema(v)
-	if err != nil {
-		return List{}, err
-	}
-
-	var buf bytes.Buffer
-	if !opt.NoTransaction {
-		buf.WriteString("BEGIN TRANSACTION; ")
-	}
-	buf.WriteString("CREATE TABLE ")
-	if !opt.NoIfNotExists {
-		buf.WriteString("IF NOT EXISTS ")
-	}
-	if name == "" {
-		name = fmt.Sprintf("%T", v)
-		if !opt.KeepPrefix {
-			a := strings.Split(name, ".")
-			if l := len(a); l > 1 {
-				name = a[l-1]
-			}
-		}
-		nm := []rune{}
-		for _, v := range name {
-			switch {
-			case v >= '0' && v <= '9' || v == '_' || v >= 'a' && v <= 'z' || v >= 'A' && v <= 'Z':
-				// ok
-			default:
-				v = '_'
-			}
-			nm = append(nm, v)
-		}
-		name = string(nm)
-	}
-	buf.WriteString(name + " (")
-	for _, v := range s.Fields {
-		if v.IsID {
-			continue
-		}
-
-		buf.WriteString(fmt.Sprintf("%s %s, ", v.Name, v.Type))
-	}
-	buf.WriteString("); ")
-	for _, v := range s.Indices {
-		buf.WriteString("CREATE ")
-		if v.Unique {
-			buf.WriteString("UNIQUE ")
-		}
-		buf.WriteString("INDEX ")
-		if !opt.NoIfNotExists {
-			buf.WriteString("IF NOT EXISTS ")
-		}
-		buf.WriteString(fmt.Sprintf("%s ON %s (%s); ", v.Name, name, v.ColumnName))
-	}
-	if !opt.NoTransaction {
-		buf.WriteString("COMMIT; ")
-	}
-	l, err := Compile(buf.String())
-	if err != nil {
-		return List{}, fmt.Errorf("%s: %v", buf.String(), err)
-	}
-
-	return l, nil
-}
-
-// MustSchema is like Schema but panics on error. It simplifies safe
-// initialization of global variables holding compiled schemas.
-//
-// MustSchema is safe for concurrent use by multiple goroutines.
-func MustSchema(v interface{}, name string, opt *SchemaOptions) List {
-	l, err := Schema(v, name, opt)
-	if err != nil {
-		panic(err)
-	}
-
-	return l
-}
-
-// Marshal converts, in the order of appearance, fields of a struct instance v
-// to []interface{} or an error, if any. Value v can be also a pointer to a
-// struct.
-//
-// Every considered struct field type must be one of the QL types or a type
-// convertible to string, bool, int*, uint*, float* or complex* type or pointer
-// to such type. Integers with a width dependent on the architecture can not be
-// used. Only exported fields are considered. If an exported field QL tag
-// contains "-" then such field is not considered. A QL tag is a struct tag
-// part prefixed by "ql:".  Field with name ID, having type int64, corresponds
-// to id() - and is thus not part of the result.
-//
-// Marshal is safe for concurrent use by multiple goroutines.
-func Marshal(v interface{}) ([]interface{}, error) {
-	s, err := StructSchema(v)
-	if err != nil {
-		return nil, err
-	}
-
-	val := reflect.ValueOf(v)
-	if s.IsPtr {
-		val = val.Elem()
-	}
-	n := len(s.Fields)
-	if s.HasID {
-		n--
-	}
-	r := make([]interface{}, n)
-	j := 0
-	for _, v := range s.Fields {
-		if v.IsID {
-			continue
-		}
-
-		f := val.Field(v.Index)
-		if v.IsPtr {
-			if f.IsNil() {
-				r[j] = nil
-				j++
-				continue
-			}
-
-			f = f.Elem()
-		}
-		if m := v.MarshalType; m != nil {
-			f = f.Convert(m)
-		}
-		r[j] = f.Interface()
-		j++
-	}
-	return r, nil
-}
-
-// MustMarshal is like Marshal but panics on error. It simplifies marshaling of
-// "safe" types, like eg. those which were already verified by Schema or
-// MustSchema.  When the underlying Marshal returns an error, MustMarshal
-// panics.
-//
-// MustMarshal is safe for concurrent use by multiple goroutines.
-func MustMarshal(v interface{}) []interface{} {
-	r, err := Marshal(v)
-	if err != nil {
-		panic(err)
-	}
-
-	return r
-}
-
-// Unmarshal stores data from []interface{} in the struct value pointed to by
-// v.
-//
-// Every considered struct field type must be one of the QL types or a type
-// convertible to string, bool, int*, uint*, float* or complex* type or pointer
-// to such type. Integers with a width dependent on the architecture can not be
-// used. Only exported fields are considered. If an exported field QL tag
-// contains "-" then such field is not considered. A QL tag is a struct tag
-// part prefixed by "ql:".  Fields are considered in the order of appearance.
-// Types of values in data must be compatible with the corresponding considered
-// field of v.
-//
-// If the struct has no ID field then the number of values in data must be equal
-// to the number of considered fields of v.
-//
-//	type T struct {
-//		A bool
-//		B string
-//	}
-//
-// Assuming the schema is
-//
-//	CREATE TABLE T (A bool, B string);
-//
-// Data might be a result of queries like
-//
-//	SELECT * FROM T;
-//	SELECT A, B FROM T;
-//
-// If the struct has a considered ID field then the number of values in data
-// must be equal to the number of considered fields in v - or one less. In the
-// later case the ID field is not set.
-//
-//	type U struct {
-//		ID int64
-//		A  bool
-//		B  string
-//	}
-//
-// Assuming the schema is
-//
-//	CREATE TABLE T (A bool, B string);
-//
-// Data might be a result of queries like
-//
-//	SELECT * FROM T;             // ID not set
-//	SELECT A, B FROM T;          // ID not set
-//	SELECT id(), A, B FROM T;    // ID is set
-//
-// To unmarshal a value from data into a pointer field of v, Unmarshal first
-// handles the case of the value being nil. In that case, Unmarshal sets the
-// pointer to nil. Otherwise, Unmarshal unmarshals the data value into value
-// pointed at by the pointer. If the pointer is nil, Unmarshal allocates a new
-// value for it to point to.
-//
-// Unmarshal is safe for concurrent use by multiple goroutines.
-func Unmarshal(v interface{}, data []interface{}) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			var ok bool
-			if err, ok = r.(error); !ok {
-				err = fmt.Errorf("%v", r)
-			}
-			err = fmt.Errorf("unmarshal: %v", err)
-		}
-	}()
-
-	s, err := StructSchema(v)
-	if err != nil {
-		return err
-	}
-
-	if !s.IsPtr {
-		return fmt.Errorf("unmarshal: need a pointer to a struct")
-	}
-
-	id := false
-	nv, nf := len(data), len(s.Fields)
-	switch s.HasID {
-	case true:
-		switch {
-		case nv == nf:
-			id = true
-		case nv == nf-1:
-			// ok
-		default:
-			return fmt.Errorf("unmarshal: got %d values, need %d or %d", nv, nf-1, nf)
-		}
-	default:
-		switch {
-		case nv == nf:
-			// ok
-		default:
-			return fmt.Errorf("unmarshal: got %d values, need %d", nv, nf)
-		}
-	}
-
-	j := 0
-	vVal := reflect.ValueOf(v)
-	if s.IsPtr {
-		vVal = vVal.Elem()
-	}
-	for _, sf := range s.Fields {
-		if sf.IsID && !id {
-			continue
-		}
-
-		d := data[j]
-		val := reflect.ValueOf(d)
-		j++
-
-		fVal := vVal.Field(sf.Index)
-		if u := sf.UnmarshalType; u != nil {
-			val = val.Convert(u)
-		}
-		if !sf.IsPtr {
-			fVal.Set(val)
-			continue
-		}
-
-		if d == nil {
-			fVal.Set(sf.ZeroPtr)
-			continue
-		}
-
-		if fVal.IsNil() {
-			fVal.Set(reflect.New(sf.ReflectType))
-		}
-
-		fVal.Elem().Set(val)
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/mem.go b/Godeps/_workspace/src/github.com/cznic/ql/mem.go
deleted file mode 100644
index bd2a2dd269..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/mem.go
+++ /dev/null
@@ -1,1277 +0,0 @@
-// Copyright (c) 2014 ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Plain memory storage back end.
-
-package ql
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"math/big"
-	"time"
-)
-
-var (
-	_ btreeIndex    = (*memIndex)(nil)
-	_ btreeIterator = (*memBTreeIterator)(nil)
-	_ indexIterator = (*xenumerator2)(nil)
-	_ storage       = (*mem)(nil)
-	_ temp          = (*memTemp)(nil)
-)
-
-type memIndex struct {
-	m      *mem
-	t      *xtree
-	unique bool
-}
-
-func newMemIndex(m *mem, unique bool) *memIndex {
-	r := &memIndex{t: xtreeNew(), unique: unique, m: m}
-	//dbg("newMemIndex %p, %p", r, m)
-	return r
-}
-
-func (x *memIndex) Clear() error {
-	//dbg("memIndex(%p, %p).Clear", x, x.m)
-	x.m.newUndo(undoClearX, 0, []interface{}{x, x.t})
-	x.t = xtreeNew()
-	return nil
-}
-
-func (x *memIndex) Create(indexedValues []interface{}, h int64) error {
-	//dbg("memIndex(%p, %p).Create %v, %v", x, x.m, indexedValues, h)
-	t := x.t
-	switch {
-	case !x.unique:
-		k := indexKey{indexedValues, h}
-		x.m.newUndo(undoCreateX, 0, []interface{}{x, k}) //TODO why is old value, if any, not saved?
-		t.Set(k, 0)
-	case isIndexNull(indexedValues): // unique, NULL
-		k := indexKey{nil, h}
-		x.m.newUndo(undoCreateX, 0, []interface{}{x, k}) //TODO why is old value, if any, not saved?
-		t.Set(k, 0)
-	default: // unique, non NULL
-		k := indexKey{indexedValues, 0}
-		if _, ok := t.Get(k); ok { //LATER need .Put
-			return fmt.Errorf("cannot insert into unique index: duplicate value(s): %v", indexedValues)
-		}
-
-		x.m.newUndo(undoCreateX, 0, []interface{}{x, k}) //TODO why is old value, if any, not saved?
-		t.Set(k, int(h))
-	}
-	return nil
-}
-
-func (x *memIndex) Delete(indexedValues []interface{}, h int64) error {
-	//dbg("memIndex(%p, %p).Delete %v, %v", x, x.m, indexedValues, h)
-	t := x.t
-	var k indexKey
-	var v interface{}
-	var ok, okv bool
-	switch {
-	case !x.unique:
-		k = indexKey{indexedValues, h}
-		v, okv = t.Get(k)
-		ok = t.delete(k)
-	case isIndexNull(indexedValues): // unique, NULL
-		k = indexKey{nil, h}
-		v, okv = t.Get(k)
-		ok = t.delete(k)
-	default: // unique, non NULL
-		k = indexKey{indexedValues, 0}
-		v, okv = t.Get(k)
-		ok = t.delete(k)
-	}
-	if ok {
-		if okv {
-			x.m.newUndo(undoDeleteX, int64(v.(int)), []interface{}{x, k})
-		}
-		return nil
-	}
-
-	return fmt.Errorf("internal error 047")
-}
-
-func (x *memIndex) Drop() error {
-	x.m.newUndo(undoDropX, 0, []interface{}{x, *x})
-	*x = memIndex{}
-	return nil
-}
-
-func (x *memIndex) Seek(indexedValues []interface{}) (indexIterator, bool, error) {
-	it, hit := x.t.Seek(indexKey{indexedValues, 0})
-	return &xenumerator2{*it, x.unique}, hit, nil
-}
-
-func (x *memIndex) SeekFirst() (iter indexIterator, err error) {
-	it, err := x.t.SeekFirst()
-	if err != nil {
-		return nil, err
-	}
-
-	return &xenumerator2{*it, x.unique}, nil
-}
-
-func (x *memIndex) SeekLast() (iter indexIterator, err error) {
-	it, err := x.t.SeekLast()
-	if err != nil {
-		return nil, err
-	}
-
-	return &xenumerator2{*it, x.unique}, nil
-}
-
-type xenumerator2 struct {
-	it     xenumerator
-	unique bool
-}
-
-func (it *xenumerator2) Next() ([]interface{}, int64, error) {
-	k, h, err := it.it.Next()
-	if err != nil {
-		return nil, -1, err
-	}
-
-	switch it.unique {
-	case true:
-		if k.value == nil {
-			return nil, k.h, nil
-		}
-
-		return k.value, h, nil
-	default:
-		return k.value, k.h, nil
-	}
-}
-
-func (it *xenumerator2) Prev() ([]interface{}, int64, error) {
-	k, h, err := it.it.Prev()
-	if err != nil {
-		return nil, -1, err
-	}
-
-	switch it.unique {
-	case true:
-		if k.value == nil {
-			return nil, k.h, nil
-		}
-
-		return k.value, h, nil
-	default:
-		return k.value, k.h, nil
-	}
-}
-
-type memBTreeIterator enumerator
-
-func (it *memBTreeIterator) Next() (k, v []interface{}, err error) {
-	return (*enumerator)(it).Next()
-}
-
-type memTemp struct {
-	tree  *tree
-	store *mem
-}
-
-func (t *memTemp) BeginTransaction() (err error) {
-	return nil
-}
-
-func (t *memTemp) Get(k []interface{}) (v []interface{}, err error) {
-	v, _ = t.tree.Get(k)
-	return
-}
-
-func (t *memTemp) Create(data ...interface{}) (h int64, err error) {
-	s := t.store
-	switch n := len(s.recycler); {
-	case n != 0:
-		h = int64(s.recycler[n-1])
-		s.recycler = s.recycler[:n-1]
-		s.data[h] = s.clone(data...)
-	default:
-		h = int64(len(s.data))
-		s.data = append(s.data, s.clone(data...))
-	}
-	return
-}
-
-func (t *memTemp) Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error) {
-	return t.store.Read(dst, h, cols...)
-}
-
-func (*memTemp) Drop() (err error) { return }
-
-func (t *memTemp) Set(k, v []interface{}) (err error) {
-	t.tree.Set(append([]interface{}(nil), k...), t.store.clone(v...))
-	return
-}
-
-func (t *memTemp) SeekFirst() (e btreeIterator, err error) {
-	en, err := t.tree.SeekFirst()
-	if err != nil {
-		return
-	}
-
-	return (*memBTreeIterator)(en), nil
-}
-
-const (
-	undoCreateNewHandle = iota
-	undoCreateRecycledHandle
-	undoUpdate
-	undoDelete
-	undoClearX  // {0: *memIndex, 1: *xtree}
-	undoCreateX // {0: *memIndex, 1: indexKey}
-	undoDeleteX // {0: *memIndex, 1: indexKey}
-	undoDropX   // {0: *memIndex, 1: memIndex}
-)
-
-type undo struct {
-	tag  int
-	h    int64
-	data []interface{}
-}
-
-type undos struct {
-	list   []undo
-	parent *undos
-}
-
-type mem struct {
-	data     [][]interface{}
-	id       int64
-	recycler []int
-	tnl      int
-	rollback *undos
-}
-
-func newMemStorage() (s *mem, err error) {
-	s = &mem{data: [][]interface{}{nil}}
-	if err = s.BeginTransaction(); err != nil {
-		return nil, err
-	}
-
-	h, err := s.Create()
-	if h != 1 {
-		panic("internal error 048")
-	}
-
-	if err = s.Commit(); err != nil {
-		return nil, err
-	}
-
-	return
-}
-
-func (s *mem) OpenIndex(unique bool, handle int64) (btreeIndex, error) { // Never called on the memory backend.
-	panic("internal error 049")
-}
-
-func (s *mem) newUndo(tag int, h int64, data []interface{}) {
-	s.rollback.list = append(s.rollback.list, undo{tag, h, data})
-}
-
-func (s *mem) Acid() bool { return false }
-
-func (s *mem) Close() (err error) {
-	if s.tnl != 0 {
-		return fmt.Errorf("cannot close DB while open transaction exist")
-	}
-	*s = mem{}
-	return
-}
-
-func (s *mem) CreateIndex(unique bool) ( /* handle */ int64, btreeIndex, error) {
-	return -1, newMemIndex(s, unique), nil // handle of memIndex should never be used
-}
-
-func (s *mem) Name() string { return fmt.Sprintf("/proc/self/mem/%p", s) } // fake, non existing name
-
-// OpenMem returns a new, empty DB backed by the process' memory. The back end
-// has no limits on field/record/table/DB size other than memory available to
-// the process.
-func OpenMem() (db *DB, err error) {
-	s, err := newMemStorage()
-	if err != nil {
-		return
-	}
-
-	if db, err = newDB(s); err != nil {
-		return nil, err
-	}
-
-	db.isMem = true
-	return db, nil
-}
-
-func (s *mem) Verify() (allocs int64, err error) {
-	for _, v := range s.recycler {
-		if s.data[v] != nil {
-			return 0, fmt.Errorf("corrupted: non nil free handle %d", s.data[v])
-		}
-	}
-
-	for _, v := range s.data {
-		if v != nil {
-			allocs++
-		}
-	}
-
-	if allocs != int64(len(s.data))-1-int64(len(s.recycler)) {
-		return 0, fmt.Errorf("corrupted: len(data) %d, len(recycler) %d, allocs %d", len(s.data), len(s.recycler), allocs)
-	}
-
-	return
-}
-
-func (s *mem) String() string {
-	var b bytes.Buffer
-	for i, v := range s.data {
-		b.WriteString(fmt.Sprintf("s.data[%d] %#v\n", i, v))
-	}
-	for i, v := range s.recycler {
-		b.WriteString(fmt.Sprintf("s.recycler[%d] %v\n", i, v))
-	}
-	return b.String()
-}
-
-func (s *mem) CreateTemp(asc bool) (_ temp, err error) {
-	st, err := newMemStorage()
-	if err != nil {
-		return
-	}
-
-	return &memTemp{
-		tree:  treeNew(collators[asc]),
-		store: st,
-	}, nil
-}
-
-func (s *mem) ResetID() (err error) {
-	s.id = 0
-	return
-}
-
-func (s *mem) ID() (id int64, err error) {
-	s.id++
-	return s.id, nil
-}
-
-func (s *mem) clone(data ...interface{}) []interface{} {
-	r := make([]interface{}, len(data))
-	for i, v := range data {
-		switch x := v.(type) {
-		case nil:
-			// nop
-		case idealComplex:
-			r[i] = complex128(x)
-		case idealFloat:
-			r[i] = float64(x)
-		case idealInt:
-			r[i] = int64(x)
-		case idealRune:
-			r[i] = int32(x)
-		case idealUint:
-			r[i] = uint64(x)
-		case bool:
-			r[i] = x
-		case complex64:
-			r[i] = x
-		case complex128:
-			r[i] = x
-		case float32:
-			r[i] = x
-		case float64:
-			r[i] = x
-		case int:
-			r[i] = int64(x)
-		case int8:
-			r[i] = x
-		case int16:
-			r[i] = x
-		case int32:
-			r[i] = x
-		case int64:
-			r[i] = x
-		case string:
-			r[i] = x
-		case uint:
-			r[i] = uint64(x)
-		case uint8:
-			r[i] = x
-		case uint16:
-			r[i] = x
-		case uint32:
-			r[i] = x
-		case uint64:
-			r[i] = x
-		case []byte:
-			r[i] = append([]byte(nil), x...)
-		case *big.Int:
-			r[i] = big.NewInt(0).Set(x)
-		case *big.Rat:
-			r[i] = big.NewRat(1, 2).Set(x)
-		case time.Time:
-			t := x
-			r[i] = t
-		case time.Duration:
-			r[i] = x
-		case map[string]interface{}: // map of ids of a cross join
-			r[i] = x
-		default:
-			panic("internal error 050")
-		}
-	}
-	return r
-}
-
-func (s *mem) Create(data ...interface{}) (h int64, err error) {
-	switch n := len(s.recycler); {
-	case n != 0:
-		h = int64(s.recycler[n-1])
-		s.recycler = s.recycler[:n-1]
-		s.data[h] = s.clone(data...)
-		r := s.rollback
-		r.list = append(r.list, undo{
-			tag: undoCreateRecycledHandle,
-			h:   h,
-		})
-	default:
-		h = int64(len(s.data))
-		s.data = append(s.data, s.clone(data...))
-		r := s.rollback
-		r.list = append(r.list, undo{
-			tag: undoCreateNewHandle,
-			h:   h,
-		})
-	}
-	return
-}
-
-func (s *mem) Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error) {
-	if i := int(h); i != 0 && i < len(s.data) {
-		d := s.clone(s.data[h]...)
-		if cols == nil {
-			return d, nil
-		}
-
-		for n, dn := len(cols)+2, len(d); dn < n; dn++ {
-			d = append(d, nil)
-		}
-		return d, nil
-	}
-
-	return nil, errNoDataForHandle
-}
-
-func (s *mem) UpdateRow(h int64, _ []*col, data ...interface{}) (err error) {
-	return s.Update(h, data...)
-}
-
-func (s *mem) Update(h int64, data ...interface{}) (err error) {
-	r := s.rollback
-	r.list = append(r.list, undo{
-		tag:  undoUpdate,
-		h:    h,
-		data: s.data[h],
-	})
-	s.data[h] = s.clone(data...)
-	return
-}
-
-func (s *mem) Delete(h int64, _ ...*col) (err error) {
-	r := s.rollback
-	r.list = append(r.list, undo{
-		tag:  undoDelete,
-		h:    h,
-		data: s.data[h],
-	})
-	s.recycler = append(s.recycler, int(h))
-	s.data[h] = nil
-	return
-}
-
-func (s *mem) BeginTransaction() (err error) {
-	s.rollback = &undos{parent: s.rollback}
-	s.tnl++
-	return nil
-}
-
-func (s *mem) Rollback() (err error) {
-	if s.tnl == 0 {
-		return errRollbackNotInTransaction
-	}
-
-	list := s.rollback.list
-	for i := len(list) - 1; i >= 0; i-- {
-		undo := list[i]
-		switch h, data := int(undo.h), undo.data; undo.tag {
-		case undoCreateNewHandle:
-			d := s.data
-			s.data = d[:len(d)-1]
-		case undoCreateRecycledHandle:
-			s.data[h] = nil
-			r := s.recycler
-			s.recycler = append(r, h)
-		case undoUpdate:
-			s.data[h] = data
-		case undoDelete:
-			s.data[h] = data
-			s.recycler = s.recycler[:len(s.recycler)-1]
-		case undoClearX:
-			x, t := data[0].(*memIndex), data[1].(*xtree)
-			x.t = t
-		case undoCreateX:
-			x, k := data[0].(*memIndex), data[1].(indexKey)
-			x.t.delete(k)
-		case undoDeleteX:
-			x, k := data[0].(*memIndex), data[1].(indexKey)
-			x.t.Set(k, h)
-		case undoDropX:
-			x, v := data[0].(*memIndex), data[1].(memIndex)
-			*x = v
-		default:
-			panic("internal error 051")
-		}
-	}
-
-	s.tnl--
-	s.rollback = s.rollback.parent
-	return nil
-}
-
-func (s *mem) Commit() (err error) {
-	if s.tnl == 0 {
-		return errCommitNotInTransaction
-	}
-
-	s.tnl--
-	s.rollback = s.rollback.parent
-	return nil
-}
-
-// Transaction index B+Tree
-//LATER make it just a wrapper of the implementation in btree.go.
-
-type (
-	xd struct { // data page
-		c  int
-		xd [2*kd + 1]xde
-		n  *xd
-		p  *xd
-	}
-
-	xde struct { // xd element
-		k indexKey
-		v int
-	}
-
-	// xenumerator captures the state of enumerating a tree. It is returned
-	// from the Seek* methods. The enumerator is aware of any mutations
-	// made to the tree in the process of enumerating it and automatically
-	// resumes the enumeration at the proper key, if possible.
-	//
-	// However, once an xenumerator returns io.EOF to signal "no more
-	// items", it does no more attempt to "resync" on tree mutation(s).  In
-	// other words, io.EOF from an Enumaretor is "sticky" (idempotent).
-	xenumerator struct {
-		err error
-		hit bool
-		i   int
-		k   indexKey
-		q   *xd
-		t   *xtree
-		ver int64
-	}
-
-	// xtree is a B+tree.
-	xtree struct {
-		c     int
-		first *xd
-		last  *xd
-		r     interface{}
-		ver   int64
-	}
-
-	xxe struct { // xx element
-		ch  interface{}
-		sep *xd
-	}
-
-	xx struct { // index page
-		c  int
-		xx [2*kx + 2]xxe
-	}
-)
-
-func (a *indexKey) cmp(b *indexKey) int {
-	r := collate(a.value, b.value)
-	if r != 0 {
-		return r
-	}
-
-	return int(a.h) - int(b.h)
-}
-
-var ( // R/O zero values
-	zxd  xd
-	zxde xde
-	zxx  xx
-	zxxe xxe
-)
-
-func xclr(q interface{}) {
-	switch xx := q.(type) {
-	case *xx:
-		for i := 0; i <= xx.c; i++ { // Ch0 Sep0 ... Chn-1 Sepn-1 Chn
-			xclr(xx.xx[i].ch)
-		}
-		*xx = zxx // GC
-	case *xd:
-		*xx = zxd // GC
-	}
-}
-
-// -------------------------------------------------------------------------- xx
-
-func xnewX(ch0 interface{}) *xx {
-	r := &xx{}
-	r.xx[0].ch = ch0
-	return r
-}
-
-func (q *xx) extract(i int) {
-	q.c--
-	if i < q.c {
-		copy(q.xx[i:], q.xx[i+1:q.c+1])
-		q.xx[q.c].ch = q.xx[q.c+1].ch
-		q.xx[q.c].sep = nil // GC
-		q.xx[q.c+1] = zxxe  // GC
-	}
-}
-
-func (q *xx) insert(i int, xd *xd, ch interface{}) *xx {
-	c := q.c
-	if i < c {
-		q.xx[c+1].ch = q.xx[c].ch
-		copy(q.xx[i+2:], q.xx[i+1:c])
-		q.xx[i+1].sep = q.xx[i].sep
-	}
-	c++
-	q.c = c
-	q.xx[i].sep = xd
-	q.xx[i+1].ch = ch
-	return q
-}
-
-func (q *xx) siblings(i int) (l, r *xd) {
-	if i >= 0 {
-		if i > 0 {
-			l = q.xx[i-1].ch.(*xd)
-		}
-		if i < q.c {
-			r = q.xx[i+1].ch.(*xd)
-		}
-	}
-	return
-}
-
-// -------------------------------------------------------------------------- xd
-
-func (l *xd) mvL(r *xd, c int) {
-	copy(l.xd[l.c:], r.xd[:c])
-	copy(r.xd[:], r.xd[c:r.c])
-	l.c += c
-	r.c -= c
-}
-
-func (l *xd) mvR(r *xd, c int) {
-	copy(r.xd[c:], r.xd[:r.c])
-	copy(r.xd[:c], l.xd[l.c-c:])
-	r.c += c
-	l.c -= c
-}
-
-// ----------------------------------------------------------------------- xtree
-
-// xtreeNew returns a newly created, empty xtree. The compare function is used
-// for key collation.
-func xtreeNew() *xtree {
-	return &xtree{}
-}
-
-// Clear removes all K/V pairs from the tree.
-func (t *xtree) Clear() {
-	if t.r == nil {
-		return
-	}
-
-	xclr(t.r)
-	t.c, t.first, t.last, t.r = 0, nil, nil, nil
-	t.ver++
-}
-
-func (t *xtree) cat(p *xx, q, r *xd, pi int) {
-	t.ver++
-	q.mvL(r, r.c)
-	if r.n != nil {
-		r.n.p = q
-	} else {
-		t.last = q
-	}
-	q.n = r.n
-	if p.c > 1 {
-		p.extract(pi)
-		p.xx[pi].ch = q
-	} else {
-		t.r = q
-	}
-}
-
-func (t *xtree) catX(p, q, r *xx, pi int) {
-	t.ver++
-	q.xx[q.c].sep = p.xx[pi].sep
-	copy(q.xx[q.c+1:], r.xx[:r.c])
-	q.c += r.c + 1
-	q.xx[q.c].ch = r.xx[r.c].ch
-	if p.c > 1 {
-		p.c--
-		pc := p.c
-		if pi < pc {
-			p.xx[pi].sep = p.xx[pi+1].sep
-			copy(p.xx[pi+1:], p.xx[pi+2:pc+1])
-			p.xx[pc].ch = p.xx[pc+1].ch
-			p.xx[pc].sep = nil  // GC
-			p.xx[pc+1].ch = nil // GC
-		}
-		return
-	}
-
-	t.r = q
-}
-
-//Delete removes the k's KV pair, if it exists, in which case Delete returns
-//true.
-func (t *xtree) delete(k indexKey) (ok bool) {
-	pi := -1
-	var p *xx
-	q := t.r
-	if q == nil {
-		return
-	}
-
-	for {
-		var i int
-		i, ok = t.find(q, k)
-		if ok {
-			switch xx := q.(type) {
-			case *xx:
-				dp := xx.xx[i].sep
-				switch {
-				case dp.c > kd:
-					t.extract(dp, 0)
-				default:
-					if xx.c < kx && q != t.r {
-						t.underflowX(p, &xx, pi, &i)
-					}
-					pi = i + 1
-					p = xx
-					q = xx.xx[pi].ch
-					ok = false
-					continue
-				}
-			case *xd:
-				t.extract(xx, i)
-				if xx.c >= kd {
-					return
-				}
-
-				if q != t.r {
-					t.underflow(p, xx, pi)
-				} else if t.c == 0 {
-					t.Clear()
-				}
-			}
-			return
-		}
-
-		switch xx := q.(type) {
-		case *xx:
-			if xx.c < kx && q != t.r {
-				t.underflowX(p, &xx, pi, &i)
-			}
-			pi = i
-			p = xx
-			q = xx.xx[i].ch
-		case *xd:
-			return
-		}
-	}
-}
-
-func (t *xtree) extract(q *xd, i int) { // (r int64) {
-	t.ver++
-	//r = q.xd[i].v // prepared for Extract
-	q.c--
-	if i < q.c {
-		copy(q.xd[i:], q.xd[i+1:q.c+1])
-	}
-	q.xd[q.c] = zxde // GC
-	t.c--
-	return
-}
-
-func (t *xtree) find(q interface{}, k indexKey) (i int, ok bool) {
-	var mk indexKey
-	l := 0
-	switch xx := q.(type) {
-	case *xx:
-		h := xx.c - 1
-		for l <= h {
-			m := (l + h) >> 1
-			mk = xx.xx[m].sep.xd[0].k
-			switch cmp := k.cmp(&mk); {
-			case cmp > 0:
-				l = m + 1
-			case cmp == 0:
-				return m, true
-			default:
-				h = m - 1
-			}
-		}
-	case *xd:
-		h := xx.c - 1
-		for l <= h {
-			m := (l + h) >> 1
-			mk = xx.xd[m].k
-			switch cmp := k.cmp(&mk); {
-			case cmp > 0:
-				l = m + 1
-			case cmp == 0:
-				return m, true
-			default:
-				h = m - 1
-			}
-		}
-	}
-	return l, false
-}
-
-// First returns the first item of the tree in the key collating order, or
-// (nil, nil) if the tree is empty.
-func (t *xtree) First() (k indexKey, v int) {
-	if q := t.first; q != nil {
-		q := &q.xd[0]
-		k, v = q.k, q.v
-	}
-	return
-}
-
-// Get returns the value associated with k and true if it exists. Otherwise Get
-// returns (nil, false).
-func (t *xtree) Get(k indexKey) (v int, ok bool) {
-	q := t.r
-	if q == nil {
-		return
-	}
-
-	for {
-		var i int
-		if i, ok = t.find(q, k); ok {
-			switch xx := q.(type) {
-			case *xx:
-				return xx.xx[i].sep.xd[0].v, true
-			case *xd:
-				return xx.xd[i].v, true
-			}
-		}
-		switch xx := q.(type) {
-		case *xx:
-			q = xx.xx[i].ch
-		default:
-			return
-		}
-	}
-}
-
-func (t *xtree) insert(q *xd, i int, k indexKey, v int) *xd {
-	t.ver++
-	c := q.c
-	if i < c {
-		copy(q.xd[i+1:], q.xd[i:c])
-	}
-	c++
-	q.c = c
-	q.xd[i].k, q.xd[i].v = k, v
-	t.c++
-	return q
-}
-
-// Last returns the last item of the tree in the key collating order, or (nil,
-// nil) if the tree is empty.
-func (t *xtree) Last() (k indexKey, v int) {
-	if q := t.last; q != nil {
-		q := &q.xd[q.c-1]
-		k, v = q.k, q.v
-	}
-	return
-}
-
-// Len returns the number of items in the tree.
-func (t *xtree) Len() int {
-	return t.c
-}
-
-func (t *xtree) overflow(p *xx, q *xd, pi, i int, k indexKey, v int) {
-	t.ver++
-	l, r := p.siblings(pi)
-
-	if l != nil && l.c < 2*kd {
-		l.mvL(q, 1)
-		t.insert(q, i-1, k, v)
-		return
-	}
-
-	if r != nil && r.c < 2*kd {
-		if i < 2*kd {
-			q.mvR(r, 1)
-			t.insert(q, i, k, v)
-		} else {
-			t.insert(r, 0, k, v)
-		}
-		return
-	}
-
-	t.split(p, q, pi, i, k, v)
-}
-
-// Seek returns an xenumerator positioned on a an item such that k >= item's
-// key. ok reports if k == item.key The xenumerator's position is possibly
-// after the last item in the tree.
-func (t *xtree) Seek(k indexKey) (e *xenumerator, ok bool) {
-	q := t.r
-	if q == nil {
-		e = &xenumerator{nil, false, 0, k, nil, t, t.ver}
-		return
-	}
-
-	for {
-		var i int
-		if i, ok = t.find(q, k); ok {
-			switch xx := q.(type) {
-			case *xx:
-				e = &xenumerator{nil, ok, 0, k, xx.xx[i].sep, t, t.ver}
-				return
-			case *xd:
-				e = &xenumerator{nil, ok, i, k, xx, t, t.ver}
-				return
-			}
-		}
-		switch xx := q.(type) {
-		case *xx:
-			q = xx.xx[i].ch
-		case *xd:
-			e = &xenumerator{nil, ok, i, k, xx, t, t.ver}
-			return
-		}
-	}
-}
-
-// SeekFirst returns an enumerator positioned on the first KV pair in the tree,
-// if any. For an empty tree, err == io.EOF is returned and e will be nil.
-func (t *xtree) SeekFirst() (e *xenumerator, err error) {
-	q := t.first
-	if q == nil {
-		return nil, io.EOF
-	}
-
-	return &xenumerator{nil, true, 0, q.xd[0].k, q, t, t.ver}, nil
-}
-
-// SeekLast returns an enumerator positioned on the last KV pair in the tree,
-// if any. For an empty tree, err == io.EOF is returned and e will be nil.
-func (t *xtree) SeekLast() (e *xenumerator, err error) {
-	q := t.last
-	if q == nil {
-		return nil, io.EOF
-	}
-
-	return &xenumerator{nil, true, q.c - 1, q.xd[q.c-1].k, q, t, t.ver}, nil
-}
-
-// Set sets the value associated with k.
-func (t *xtree) Set(k indexKey, v int) {
-	pi := -1
-	var p *xx
-	q := t.r
-	if q != nil {
-		for {
-			i, ok := t.find(q, k)
-			if ok {
-				switch xx := q.(type) {
-				case *xx:
-					xx.xx[i].sep.xd[0].v = v
-				case *xd:
-					xx.xd[i].v = v
-				}
-				return
-			}
-
-			switch xx := q.(type) {
-			case *xx:
-				if xx.c > 2*kx {
-					t.splitX(p, &xx, pi, &i)
-				}
-				pi = i
-				p = xx
-				q = xx.xx[i].ch
-			case *xd:
-				switch {
-				case xx.c < 2*kd:
-					t.insert(xx, i, k, v)
-				default:
-					t.overflow(p, xx, pi, i, k, v)
-				}
-				return
-			}
-		}
-	}
-
-	z := t.insert(&xd{}, 0, k, v)
-	t.r, t.first, t.last = z, z, z
-	return
-}
-
-func (t *xtree) split(p *xx, q *xd, pi, i int, k indexKey, v int) {
-	t.ver++
-	r := &xd{}
-	if q.n != nil {
-		r.n = q.n
-		r.n.p = r
-	} else {
-		t.last = r
-	}
-	q.n = r
-	r.p = q
-
-	copy(r.xd[:], q.xd[kd:2*kd])
-	for i := range q.xd[kd:] {
-		q.xd[kd+i] = zxde
-	}
-	q.c = kd
-	r.c = kd
-	if pi >= 0 {
-		p.insert(pi, r, r)
-	} else {
-		t.r = xnewX(q).insert(0, r, r)
-	}
-	if i > kd {
-		t.insert(r, i-kd, k, v)
-		return
-	}
-
-	t.insert(q, i, k, v)
-}
-
-func (t *xtree) splitX(p *xx, pp **xx, pi int, i *int) {
-	t.ver++
-	q := *pp
-	r := &xx{}
-	copy(r.xx[:], q.xx[kx+1:])
-	q.c = kx
-	r.c = kx
-	if pi >= 0 {
-		p.insert(pi, q.xx[kx].sep, r)
-	} else {
-		t.r = xnewX(q).insert(0, q.xx[kx].sep, r)
-	}
-	q.xx[kx].sep = nil
-	for i := range q.xx[kx+1:] {
-		q.xx[kx+i+1] = zxxe
-	}
-	if *i > kx {
-		*pp = r
-		*i -= kx + 1
-	}
-}
-
-func (t *xtree) underflow(p *xx, q *xd, pi int) {
-	t.ver++
-	l, r := p.siblings(pi)
-
-	if l != nil && l.c+q.c >= 2*kd {
-		l.mvR(q, 1)
-	} else if r != nil && q.c+r.c >= 2*kd {
-		q.mvL(r, 1)
-		r.xd[r.c] = zxde // GC
-	} else if l != nil {
-		t.cat(p, l, q, pi-1)
-	} else {
-		t.cat(p, q, r, pi)
-	}
-}
-
-func (t *xtree) underflowX(p *xx, pp **xx, pi int, i *int) {
-	t.ver++
-	var l, r *xx
-	q := *pp
-
-	if pi >= 0 {
-		if pi > 0 {
-			l = p.xx[pi-1].ch.(*xx)
-		}
-		if pi < p.c {
-			r = p.xx[pi+1].ch.(*xx)
-		}
-	}
-
-	if l != nil && l.c > kx {
-		q.xx[q.c+1].ch = q.xx[q.c].ch
-		copy(q.xx[1:], q.xx[:q.c])
-		q.xx[0].ch = l.xx[l.c].ch
-		q.xx[0].sep = p.xx[pi-1].sep
-		q.c++
-		*i++
-		l.c--
-		p.xx[pi-1].sep = l.xx[l.c].sep
-		return
-	}
-
-	if r != nil && r.c > kx {
-		q.xx[q.c].sep = p.xx[pi].sep
-		q.c++
-		q.xx[q.c].ch = r.xx[0].ch
-		p.xx[pi].sep = r.xx[0].sep
-		copy(r.xx[:], r.xx[1:r.c])
-		r.c--
-		rc := r.c
-		r.xx[rc].ch = r.xx[rc+1].ch
-		r.xx[rc].sep = nil
-		r.xx[rc+1].ch = nil
-		return
-	}
-
-	if l != nil {
-		*i += l.c + 1
-		t.catX(p, l, q, pi-1)
-		*pp = l
-		return
-	}
-
-	t.catX(p, q, r, pi)
-}
-
-// ----------------------------------------------------------------- xenumerator
-
-// Next returns the currently enumerated item, if it exists and moves to the
-// next item in the key collation order. If there is no item to return, err ==
-// io.EOF is returned.
-func (e *xenumerator) Next() (k indexKey, v int64, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	if e.ver != e.t.ver {
-		f, hit := e.t.Seek(e.k)
-		if !e.hit && hit {
-			if err = f.next(); err != nil {
-				return
-			}
-		}
-
-		*e = *f
-	}
-	if e.q == nil {
-		e.err, err = io.EOF, io.EOF
-		return
-	}
-
-	if e.i >= e.q.c {
-		if err = e.next(); err != nil {
-			return
-		}
-	}
-
-	i := e.q.xd[e.i]
-	k, v = i.k, int64(i.v)
-	e.k, e.hit = k, false
-	e.next()
-	return
-}
-
-func (e *xenumerator) next() error {
-	if e.q == nil {
-		e.err = io.EOF
-		return io.EOF
-	}
-
-	switch {
-	case e.i < e.q.c-1:
-		e.i++
-	default:
-		if e.q, e.i = e.q.n, 0; e.q == nil {
-			e.err = io.EOF
-		}
-	}
-	return e.err
-}
-
-// Prev returns the currently enumerated item, if it exists and moves to the
-// previous item in the key collation order. If there is no item to return, err
-// == io.EOF is returned.
-func (e *xenumerator) Prev() (k indexKey, v int64, err error) {
-	if err = e.err; err != nil {
-		return
-	}
-
-	if e.ver != e.t.ver {
-		f, hit := e.t.Seek(e.k)
-		if !e.hit && hit {
-			if err = f.prev(); err != nil {
-				return
-			}
-		}
-
-		*e = *f
-	}
-	if e.q == nil {
-		e.err, err = io.EOF, io.EOF
-		return
-	}
-
-	if e.i >= e.q.c {
-		if err = e.next(); err != nil {
-			return
-		}
-	}
-
-	i := e.q.xd[e.i]
-	k, v = i.k, int64(i.v)
-	e.k, e.hit = k, false
-	e.prev()
-	return
-}
-
-func (e *xenumerator) prev() error {
-	if e.q == nil {
-		e.err = io.EOF
-		return io.EOF
-	}
-
-	switch {
-	case e.i > 0:
-		e.i--
-	default:
-		if e.q = e.q.p; e.q == nil {
-			e.err = io.EOF
-			break
-		}
-
-		e.i = e.q.c - 1
-	}
-	return e.err
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/parser.go b/Godeps/_workspace/src/github.com/cznic/ql/parser.go
deleted file mode 100644
index 1fb6e04a54..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/parser.go
+++ /dev/null
@@ -1,2637 +0,0 @@
-// CAUTION: Generated file - DO NOT EDIT.
-
-// Copyright (c) 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Inital yacc source generated by ebnf2y[1]
-// at 2013-10-04 23:10:47.861401015 +0200 CEST
-//
-//  $ ebnf2y -o ql.y -oe ql.ebnf -start StatementList -pkg ql -p _
-//
-//   [1]: http://github.com/cznic/ebnf2y
-
-package ql
-
-import __yyfmt__ "fmt"
-
-import (
-	"fmt"
-
-	"github.com/cznic/mathutil"
-)
-
-type yySymType struct {
-	yys  int
-	line int
-	col  int
-	item interface{}
-	list []interface{}
-}
-
-type yyXError struct {
-	state, xsym int
-}
-
-const (
-	yyDefault       = 57437
-	yyEOFCode       = 57344
-	add             = 57352
-	alter           = 57353
-	and             = 57354
-	andand          = 57355
-	andnot          = 57356
-	as              = 57357
-	asc             = 57358
-	begin           = 57359
-	between         = 57360
-	bigIntType      = 57361
-	bigRatType      = 57362
-	blobType        = 57363
-	boolType        = 57364
-	by              = 57365
-	byteType        = 57366
-	column          = 57367
-	commit          = 57368
-	complex128Type  = 57369
-	complex64Type   = 57370
-	create          = 57371
-	defaultKwd      = 57372
-	deleteKwd       = 57373
-	desc            = 57374
-	distinct        = 57375
-	drop            = 57376
-	durationType    = 57377
-	eq              = 57378
-	yyErrCode       = 57345
-	exists          = 57379
-	explain         = 57380
-	falseKwd        = 57381
-	float32Type     = 57383
-	float64Type     = 57384
-	floatLit        = 57346
-	floatType       = 57382
-	from            = 57385
-	full            = 57386
-	ge              = 57387
-	group           = 57388
-	identifier      = 57347
-	ifKwd           = 57389
-	imaginaryLit    = 57348
-	in              = 57390
-	index           = 57391
-	insert          = 57392
-	int16Type       = 57394
-	int32Type       = 57395
-	int64Type       = 57396
-	int8Type        = 57397
-	intLit          = 57349
-	intType         = 57393
-	into            = 57398
-	is              = 57399
-	join            = 57400
-	le              = 57401
-	left            = 57402
-	like            = 57403
-	limit           = 57404
-	lsh             = 57405
-	neq             = 57406
-	not             = 57407
-	null            = 57408
-	offset          = 57409
-	on              = 57410
-	or              = 57411
-	order           = 57412
-	oror            = 57413
-	outer           = 57414
-	parseExpression = 57436
-	qlParam         = 57350
-	right           = 57415
-	rollback        = 57416
-	rsh             = 57417
-	runeType        = 57418
-	selectKwd       = 57419
-	set             = 57420
-	stringLit       = 57351
-	stringType      = 57421
-	tableKwd        = 57422
-	timeType        = 57423
-	transaction     = 57424
-	trueKwd         = 57425
-	truncate        = 57426
-	uint16Type      = 57428
-	uint32Type      = 57429
-	uint64Type      = 57430
-	uint8Type       = 57431
-	uintType        = 57427
-	unique          = 57432
-	update          = 57433
-	values          = 57434
-	where           = 57435
-
-	yyMaxDepth = 200
-	yyTabOfs   = -216
-)
-
-var (
-	yyXLAT = map[int]int{
-		59:    0,   // ';' (192x)
-		57344: 1,   // $end (191x)
-		41:    2,   // ')' (164x)
-		43:    3,   // '+' (133x)
-		45:    4,   // '-' (133x)
-		94:    5,   // '^' (133x)
-		44:    6,   // ',' (130x)
-		40:    7,   // '(' (125x)
-		57347: 8,   // identifier (116x)
-		57409: 9,   // offset (103x)
-		57404: 10,  // limit (101x)
-		57372: 11,  // defaultKwd (94x)
-		57412: 12,  // order (90x)
-		57435: 13,  // where (87x)
-		57408: 14,  // null (84x)
-		57361: 15,  // bigIntType (83x)
-		57362: 16,  // bigRatType (83x)
-		57363: 17,  // blobType (83x)
-		57364: 18,  // boolType (83x)
-		57366: 19,  // byteType (83x)
-		57369: 20,  // complex128Type (83x)
-		57370: 21,  // complex64Type (83x)
-		57377: 22,  // durationType (83x)
-		57383: 23,  // float32Type (83x)
-		57384: 24,  // float64Type (83x)
-		57382: 25,  // floatType (83x)
-		57394: 26,  // int16Type (83x)
-		57395: 27,  // int32Type (83x)
-		57396: 28,  // int64Type (83x)
-		57397: 29,  // int8Type (83x)
-		57393: 30,  // intType (83x)
-		57418: 31,  // runeType (83x)
-		57421: 32,  // stringType (83x)
-		57423: 33,  // timeType (83x)
-		57428: 34,  // uint16Type (83x)
-		57429: 35,  // uint32Type (83x)
-		57430: 36,  // uint64Type (83x)
-		57431: 37,  // uint8Type (83x)
-		57427: 38,  // uintType (83x)
-		57381: 39,  // falseKwd (81x)
-		57346: 40,  // floatLit (81x)
-		57388: 41,  // group (81x)
-		57348: 42,  // imaginaryLit (81x)
-		57349: 43,  // intLit (81x)
-		57407: 44,  // not (81x)
-		57411: 45,  // or (81x)
-		57413: 46,  // oror (81x)
-		57350: 47,  // qlParam (81x)
-		57351: 48,  // stringLit (81x)
-		57425: 49,  // trueKwd (81x)
-		33:    50,  // '!' (77x)
-		57385: 51,  // from (75x)
-		57358: 52,  // asc (71x)
-		57374: 53,  // desc (71x)
-		93:    54,  // ']' (70x)
-		57357: 55,  // as (69x)
-		58:    56,  // ':' (67x)
-		57354: 57,  // and (67x)
-		57355: 58,  // andand (65x)
-		124:   59,  // '|' (56x)
-		57360: 60,  // between (54x)
-		57390: 61,  // in (54x)
-		60:    62,  // '<' (53x)
-		62:    63,  // '>' (53x)
-		57378: 64,  // eq (53x)
-		57387: 65,  // ge (53x)
-		57399: 66,  // is (53x)
-		57401: 67,  // le (53x)
-		57403: 68,  // like (53x)
-		57406: 69,  // neq (53x)
-		57513: 70,  // Type (52x)
-		57453: 71,  // Conversion (51x)
-		57483: 72,  // Literal (51x)
-		57484: 73,  // Operand (51x)
-		57488: 74,  // PrimaryExpression (51x)
-		57491: 75,  // QualifiedIdent (51x)
-		42:    76,  // '*' (48x)
-		57514: 77,  // UnaryExpr (47x)
-		37:    78,  // '%' (44x)
-		38:    79,  // '&' (44x)
-		47:    80,  // '/' (44x)
-		57356: 81,  // andnot (44x)
-		57405: 82,  // lsh (44x)
-		57417: 83,  // rsh (44x)
-		57490: 84,  // PrimaryTerm (40x)
-		57489: 85,  // PrimaryFactor (36x)
-		91:    86,  // '[' (31x)
-		57470: 87,  // Factor (25x)
-		57471: 88,  // Factor1 (25x)
-		57511: 89,  // Term (24x)
-		57467: 90,  // Expression (23x)
-		57519: 91,  // logOr (16x)
-		57446: 92,  // ColumnName (10x)
-		57386: 93,  // full (10x)
-		57402: 94,  // left (10x)
-		57415: 95,  // right (10x)
-		57419: 96,  // selectKwd (10x)
-		57510: 97,  // TableName (9x)
-		57449: 98,  // CommaOpt (7x)
-		57468: 99,  // ExpressionList (7x)
-		57410: 100, // on (7x)
-		57497: 101, // SelectStmt (7x)
-		57400: 102, // join (6x)
-		57443: 103, // Call (5x)
-		57376: 104, // drop (5x)
-		57476: 105, // Index (5x)
-		57506: 106, // Slice (5x)
-		57445: 107, // ColumnDef (4x)
-		57379: 108, // exists (4x)
-		57389: 109, // ifKwd (4x)
-		57391: 110, // index (4x)
-		57414: 111, // outer (4x)
-		57422: 112, // tableKwd (4x)
-		57434: 113, // values (4x)
-		57353: 114, // alter (3x)
-		57438: 115, // AlterTableStmt (3x)
-		57359: 116, // begin (3x)
-		57442: 117, // BeginTransactionStmt (3x)
-		57368: 118, // commit (3x)
-		57450: 119, // CommitStmt (3x)
-		57371: 120, // create (3x)
-		57455: 121, // CreateIndexStmt (3x)
-		57457: 122, // CreateTableStmt (3x)
-		57461: 123, // DeleteFromStmt (3x)
-		57373: 124, // deleteKwd (3x)
-		57463: 125, // DropIndexStmt (3x)
-		57464: 126, // DropTableStmt (3x)
-		57465: 127, // EmptyStmt (3x)
-		57380: 128, // explain (3x)
-		57466: 129, // ExplainStmt (3x)
-		57392: 130, // insert (3x)
-		57477: 131, // InsertIntoStmt (3x)
-		57492: 132, // RecordSet (3x)
-		57493: 133, // RecordSet1 (3x)
-		57416: 134, // rollback (3x)
-		57496: 135, // RollbackStmt (3x)
-		57520: 136, // semiOpt (3x)
-		57508: 137, // Statement (3x)
-		57426: 138, // truncate (3x)
-		57512: 139, // TruncateTableStmt (3x)
-		57433: 140, // update (3x)
-		57515: 141, // UpdateStmt (3x)
-		57517: 142, // WhereClause (3x)
-		61:    143, // '=' (2x)
-		57352: 144, // add (2x)
-		57439: 145, // Assignment (2x)
-		57365: 146, // by (2x)
-		57447: 147, // ColumnNameList (2x)
-		57458: 148, // CreateTableStmt1 (2x)
-		57472: 149, // Field (2x)
-		57518: 150, // logAnd (2x)
-		57420: 151, // set (2x)
-		46:    152, // '.' (1x)
-		57440: 153, // AssignmentList (1x)
-		57441: 154, // AssignmentList1 (1x)
-		57444: 155, // Call1 (1x)
-		57367: 156, // column (1x)
-		57448: 157, // ColumnNameList1 (1x)
-		57451: 158, // Constraint (1x)
-		57452: 159, // ConstraintOpt (1x)
-		57454: 160, // CreateIndexIfNotExists (1x)
-		57456: 161, // CreateIndexStmtUnique (1x)
-		57459: 162, // Default (1x)
-		57460: 163, // DefaultOpt (1x)
-		57375: 164, // distinct (1x)
-		57462: 165, // DropIndexIfExists (1x)
-		57469: 166, // ExpressionList1 (1x)
-		57473: 167, // Field1 (1x)
-		57474: 168, // FieldList (1x)
-		57475: 169, // GroupByClause (1x)
-		57478: 170, // InsertIntoStmt1 (1x)
-		57479: 171, // InsertIntoStmt2 (1x)
-		57398: 172, // into (1x)
-		57480: 173, // JoinClause (1x)
-		57481: 174, // JoinClauseOpt (1x)
-		57482: 175, // JoinType (1x)
-		57485: 176, // OrderBy (1x)
-		57486: 177, // OrderBy1 (1x)
-		57487: 178, // OuterOpt (1x)
-		57436: 179, // parseExpression (1x)
-		57494: 180, // RecordSet2 (1x)
-		57495: 181, // RecordSetList (1x)
-		57498: 182, // SelectStmtDistinct (1x)
-		57499: 183, // SelectStmtFieldList (1x)
-		57500: 184, // SelectStmtGroup (1x)
-		57501: 185, // SelectStmtLimit (1x)
-		57502: 186, // SelectStmtOffset (1x)
-		57503: 187, // SelectStmtOrder (1x)
-		57504: 188, // SelectStmtWhere (1x)
-		57505: 189, // SetOpt (1x)
-		57507: 190, // Start (1x)
-		57509: 191, // StatementList (1x)
-		57424: 192, // transaction (1x)
-		57432: 193, // unique (1x)
-		57516: 194, // UpdateStmt1 (1x)
-		57437: 195, // $default (0x)
-		57345: 196, // error (0x)
-	}
-
-	yySymNames = []string{
-		"';'",
-		"$end",
-		"')'",
-		"'+'",
-		"'-'",
-		"'^'",
-		"','",
-		"'('",
-		"identifier",
-		"offset",
-		"limit",
-		"defaultKwd",
-		"order",
-		"where",
-		"null",
-		"bigIntType",
-		"bigRatType",
-		"blobType",
-		"boolType",
-		"byteType",
-		"complex128Type",
-		"complex64Type",
-		"durationType",
-		"float32Type",
-		"float64Type",
-		"floatType",
-		"int16Type",
-		"int32Type",
-		"int64Type",
-		"int8Type",
-		"intType",
-		"runeType",
-		"stringType",
-		"timeType",
-		"uint16Type",
-		"uint32Type",
-		"uint64Type",
-		"uint8Type",
-		"uintType",
-		"falseKwd",
-		"floatLit",
-		"group",
-		"imaginaryLit",
-		"intLit",
-		"not",
-		"or",
-		"oror",
-		"qlParam",
-		"stringLit",
-		"trueKwd",
-		"'!'",
-		"from",
-		"asc",
-		"desc",
-		"']'",
-		"as",
-		"':'",
-		"and",
-		"andand",
-		"'|'",
-		"between",
-		"in",
-		"'<'",
-		"'>'",
-		"eq",
-		"ge",
-		"is",
-		"le",
-		"like",
-		"neq",
-		"Type",
-		"Conversion",
-		"Literal",
-		"Operand",
-		"PrimaryExpression",
-		"QualifiedIdent",
-		"'*'",
-		"UnaryExpr",
-		"'%'",
-		"'&'",
-		"'/'",
-		"andnot",
-		"lsh",
-		"rsh",
-		"PrimaryTerm",
-		"PrimaryFactor",
-		"'['",
-		"Factor",
-		"Factor1",
-		"Term",
-		"Expression",
-		"logOr",
-		"ColumnName",
-		"full",
-		"left",
-		"right",
-		"selectKwd",
-		"TableName",
-		"CommaOpt",
-		"ExpressionList",
-		"on",
-		"SelectStmt",
-		"join",
-		"Call",
-		"drop",
-		"Index",
-		"Slice",
-		"ColumnDef",
-		"exists",
-		"ifKwd",
-		"index",
-		"outer",
-		"tableKwd",
-		"values",
-		"alter",
-		"AlterTableStmt",
-		"begin",
-		"BeginTransactionStmt",
-		"commit",
-		"CommitStmt",
-		"create",
-		"CreateIndexStmt",
-		"CreateTableStmt",
-		"DeleteFromStmt",
-		"deleteKwd",
-		"DropIndexStmt",
-		"DropTableStmt",
-		"EmptyStmt",
-		"explain",
-		"ExplainStmt",
-		"insert",
-		"InsertIntoStmt",
-		"RecordSet",
-		"RecordSet1",
-		"rollback",
-		"RollbackStmt",
-		"semiOpt",
-		"Statement",
-		"truncate",
-		"TruncateTableStmt",
-		"update",
-		"UpdateStmt",
-		"WhereClause",
-		"'='",
-		"add",
-		"Assignment",
-		"by",
-		"ColumnNameList",
-		"CreateTableStmt1",
-		"Field",
-		"logAnd",
-		"set",
-		"'.'",
-		"AssignmentList",
-		"AssignmentList1",
-		"Call1",
-		"column",
-		"ColumnNameList1",
-		"Constraint",
-		"ConstraintOpt",
-		"CreateIndexIfNotExists",
-		"CreateIndexStmtUnique",
-		"Default",
-		"DefaultOpt",
-		"distinct",
-		"DropIndexIfExists",
-		"ExpressionList1",
-		"Field1",
-		"FieldList",
-		"GroupByClause",
-		"InsertIntoStmt1",
-		"InsertIntoStmt2",
-		"into",
-		"JoinClause",
-		"JoinClauseOpt",
-		"JoinType",
-		"OrderBy",
-		"OrderBy1",
-		"OuterOpt",
-		"parseExpression",
-		"RecordSet2",
-		"RecordSetList",
-		"SelectStmtDistinct",
-		"SelectStmtFieldList",
-		"SelectStmtGroup",
-		"SelectStmtLimit",
-		"SelectStmtOffset",
-		"SelectStmtOrder",
-		"SelectStmtWhere",
-		"SetOpt",
-		"Start",
-		"StatementList",
-		"transaction",
-		"unique",
-		"UpdateStmt1",
-		"$default",
-		"error",
-	}
-
-	yyReductions = map[int]struct{ xsym, components int }{
-		0:   {0, 1},
-		1:   {190, 1},
-		2:   {190, 2},
-		3:   {115, 5},
-		4:   {115, 6},
-		5:   {145, 3},
-		6:   {153, 3},
-		7:   {154, 0},
-		8:   {154, 3},
-		9:   {117, 2},
-		10:  {103, 3},
-		11:  {103, 3},
-		12:  {155, 0},
-		13:  {155, 1},
-		14:  {107, 4},
-		15:  {92, 1},
-		16:  {147, 3},
-		17:  {157, 0},
-		18:  {157, 3},
-		19:  {119, 1},
-		20:  {158, 2},
-		21:  {158, 1},
-		22:  {159, 0},
-		23:  {159, 1},
-		24:  {71, 4},
-		25:  {121, 10},
-		26:  {160, 0},
-		27:  {160, 3},
-		28:  {161, 0},
-		29:  {161, 1},
-		30:  {122, 8},
-		31:  {122, 11},
-		32:  {148, 0},
-		33:  {148, 3},
-		34:  {162, 2},
-		35:  {163, 0},
-		36:  {163, 1},
-		37:  {123, 3},
-		38:  {123, 4},
-		39:  {125, 4},
-		40:  {165, 0},
-		41:  {165, 2},
-		42:  {126, 3},
-		43:  {126, 5},
-		44:  {127, 0},
-		45:  {129, 2},
-		46:  {90, 1},
-		47:  {90, 3},
-		48:  {91, 1},
-		49:  {91, 1},
-		50:  {99, 3},
-		51:  {166, 0},
-		52:  {166, 3},
-		53:  {87, 1},
-		54:  {87, 5},
-		55:  {87, 6},
-		56:  {87, 6},
-		57:  {87, 7},
-		58:  {87, 5},
-		59:  {87, 6},
-		60:  {87, 3},
-		61:  {87, 4},
-		62:  {88, 1},
-		63:  {88, 3},
-		64:  {88, 3},
-		65:  {88, 3},
-		66:  {88, 3},
-		67:  {88, 3},
-		68:  {88, 3},
-		69:  {88, 3},
-		70:  {149, 2},
-		71:  {167, 0},
-		72:  {167, 2},
-		73:  {168, 1},
-		74:  {168, 3},
-		75:  {169, 3},
-		76:  {105, 3},
-		77:  {131, 10},
-		78:  {131, 5},
-		79:  {170, 0},
-		80:  {170, 3},
-		81:  {171, 0},
-		82:  {171, 5},
-		83:  {72, 1},
-		84:  {72, 1},
-		85:  {72, 1},
-		86:  {72, 1},
-		87:  {72, 1},
-		88:  {72, 1},
-		89:  {72, 1},
-		90:  {73, 1},
-		91:  {73, 1},
-		92:  {73, 1},
-		93:  {73, 3},
-		94:  {176, 4},
-		95:  {177, 0},
-		96:  {177, 1},
-		97:  {177, 1},
-		98:  {74, 1},
-		99:  {74, 1},
-		100: {74, 2},
-		101: {74, 2},
-		102: {74, 2},
-		103: {85, 1},
-		104: {85, 3},
-		105: {85, 3},
-		106: {85, 3},
-		107: {85, 3},
-		108: {84, 1},
-		109: {84, 3},
-		110: {84, 3},
-		111: {84, 3},
-		112: {84, 3},
-		113: {84, 3},
-		114: {84, 3},
-		115: {84, 3},
-		116: {75, 1},
-		117: {75, 3},
-		118: {132, 2},
-		119: {133, 1},
-		120: {133, 4},
-		121: {136, 0},
-		122: {136, 1},
-		123: {180, 0},
-		124: {180, 2},
-		125: {181, 1},
-		126: {181, 3},
-		127: {135, 1},
-		128: {175, 1},
-		129: {175, 1},
-		130: {175, 1},
-		131: {178, 0},
-		132: {178, 1},
-		133: {173, 6},
-		134: {174, 0},
-		135: {174, 1},
-		136: {101, 12},
-		137: {185, 0},
-		138: {185, 2},
-		139: {186, 0},
-		140: {186, 2},
-		141: {182, 0},
-		142: {182, 1},
-		143: {183, 1},
-		144: {183, 1},
-		145: {183, 2},
-		146: {188, 0},
-		147: {188, 1},
-		148: {184, 0},
-		149: {184, 1},
-		150: {187, 0},
-		151: {187, 1},
-		152: {106, 3},
-		153: {106, 4},
-		154: {106, 4},
-		155: {106, 5},
-		156: {137, 1},
-		157: {137, 1},
-		158: {137, 1},
-		159: {137, 1},
-		160: {137, 1},
-		161: {137, 1},
-		162: {137, 1},
-		163: {137, 1},
-		164: {137, 1},
-		165: {137, 1},
-		166: {137, 1},
-		167: {137, 1},
-		168: {137, 1},
-		169: {137, 1},
-		170: {137, 1},
-		171: {191, 1},
-		172: {191, 3},
-		173: {97, 1},
-		174: {89, 1},
-		175: {89, 3},
-		176: {150, 1},
-		177: {150, 1},
-		178: {139, 3},
-		179: {70, 1},
-		180: {70, 1},
-		181: {70, 1},
-		182: {70, 1},
-		183: {70, 1},
-		184: {70, 1},
-		185: {70, 1},
-		186: {70, 1},
-		187: {70, 1},
-		188: {70, 1},
-		189: {70, 1},
-		190: {70, 1},
-		191: {70, 1},
-		192: {70, 1},
-		193: {70, 1},
-		194: {70, 1},
-		195: {70, 1},
-		196: {70, 1},
-		197: {70, 1},
-		198: {70, 1},
-		199: {70, 1},
-		200: {70, 1},
-		201: {70, 1},
-		202: {70, 1},
-		203: {141, 5},
-		204: {194, 0},
-		205: {194, 1},
-		206: {77, 1},
-		207: {77, 2},
-		208: {77, 2},
-		209: {77, 2},
-		210: {77, 2},
-		211: {142, 2},
-		212: {189, 0},
-		213: {189, 1},
-		214: {98, 0},
-		215: {98, 1},
-	}
-
-	yyXErrors = map[yyXError]string{
-		yyXError{1, -1}:   "expected $end",
-		yyXError{43, -1}:  "expected '('",
-		yyXError{157, -1}: "expected '('",
-		yyXError{181, -1}: "expected '('",
-		yyXError{281, -1}: "expected '('",
-		yyXError{309, -1}: "expected '('",
-		yyXError{313, -1}: "expected '('",
-		yyXError{344, -1}: "expected '('",
-		yyXError{118, -1}: "expected ')'",
-		yyXError{119, -1}: "expected ')'",
-		yyXError{120, -1}: "expected ')'",
-		yyXError{187, -1}: "expected ')'",
-		yyXError{189, -1}: "expected ')'",
-		yyXError{190, -1}: "expected ')'",
-		yyXError{194, -1}: "expected ')'",
-		yyXError{196, -1}: "expected ')'",
-		yyXError{265, -1}: "expected ')'",
-		yyXError{279, -1}: "expected ')'",
-		yyXError{284, -1}: "expected ')'",
-		yyXError{290, -1}: "expected ')'",
-		yyXError{318, -1}: "expected ')'",
-		yyXError{335, -1}: "expected ')'",
-		yyXError{346, -1}: "expected ')'",
-		yyXError{36, -1}:  "expected '='",
-		yyXError{233, -1}: "expected BY",
-		yyXError{236, -1}: "expected BY",
-		yyXError{352, -1}: "expected COLUMN",
-		yyXError{7, -1}:   "expected CREATE INDEX optional UNIQUE clause or one of [INDEX, TABLE, UNIQUE]",
-		yyXError{337, -1}: "expected CREATE INDEX statement optional IF NOT EXISTS cluse or one of [IF, identifier]",
-		yyXError{316, -1}: "expected CREATE TABLE statement colum definition list or optional comma or one of [')', ',']",
-		yyXError{333, -1}: "expected CREATE TABLE statement colum definition list or optional comma or one of [')', ',']",
-		yyXError{293, -1}: "expected DROP INDEX statement optional IF EXISTS clause or one of [IF, identifier]",
-		yyXError{296, -1}: "expected EXISTS",
-		yyXError{300, -1}: "expected EXISTS",
-		yyXError{311, -1}: "expected EXISTS",
-		yyXError{340, -1}: "expected EXISTS",
-		yyXError{8, -1}:   "expected FROM",
-		yyXError{215, -1}: "expected FROM",
-		yyXError{216, -1}: "expected FROM",
-		yyXError{306, -1}: "expected INDEX",
-		yyXError{307, -1}: "expected INDEX",
-		yyXError{276, -1}: "expected INSERT INTO statement optional column list clause or SELECT statement or one of ['(', SELECT, VALUES]",
-		yyXError{285, -1}: "expected INSERT INTO statement optional values list or optional comma or one of [$end, ',', ';']",
-		yyXError{11, -1}:  "expected INTO",
-		yyXError{257, -1}: "expected JOIN",
-		yyXError{258, -1}: "expected JOIN",
-		yyXError{310, -1}: "expected NOT",
-		yyXError{339, -1}: "expected NOT",
-		yyXError{176, -1}: "expected NULL",
-		yyXError{324, -1}: "expected NULL",
-		yyXError{260, -1}: "expected ON",
-		yyXError{342, -1}: "expected ON",
-		yyXError{246, -1}: "expected ORDER BY clause optional collation specification or one of [$end, ')', ';', ASC, DESC, LIMIT, OFFSET]",
-		yyXError{217, -1}: "expected RecordSetList or one of ['(', identifier]",
-		yyXError{13, -1}:  "expected SELECT statement field list or SELECT statement optional DISTINCT clause or one of ['!', '(', '*', '+', '-', '^', DISTINCT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{210, -1}: "expected SELECT statement field list or one of ['!', '(', '*', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{224, -1}: "expected SELECT statement optional GROUP BY clause or SELECT statement optional JOIN clause or SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or SELECT statement optional WHERE clause or one of [$end, ')', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE]",
-		yyXError{222, -1}: "expected SELECT statement optional GROUP BY clause or SELECT statement optional JOIN clause or SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or SELECT statement optional WHERE clause or optional comma or one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE]",
-		yyXError{230, -1}: "expected SELECT statement optional GROUP BY clause or SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or SELECT statement optional WHERE clause or one of [$end, ')', ';', GROUP, LIMIT, OFFSET, ORDER, WHERE]",
-		yyXError{231, -1}: "expected SELECT statement optional GROUP BY clause or SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or one of [$end, ')', ';', GROUP, LIMIT, OFFSET, ORDER]",
-		yyXError{234, -1}: "expected SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or SELECT statement optional ORDER BY clause or one of [$end, ')', ';', LIMIT, OFFSET, ORDER]",
-		yyXError{237, -1}: "expected SELECT statement optional LIMIT clause or SELECT statement optional OFFSET clause or one of [$end, ')', ';', LIMIT, OFFSET]",
-		yyXError{239, -1}: "expected SELECT statement optional OFFSET clause or one of [$end, ')', ';', OFFSET]",
-		yyXError{220, -1}: "expected SELECT statement or SELECT",
-		yyXError{186, -1}: "expected SELECT statement or expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, SELECT, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{193, -1}: "expected SELECT statement or expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, SELECT, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{277, -1}: "expected SELECT statement or one of [SELECT, VALUES]",
-		yyXError{33, -1}:  "expected SetOpt or assignment list or one of [SET, identifier]",
-		yyXError{0, -1}:   "expected Start or one of [$end, ';', ALTER, BEGIN, COMMIT, CREATE, DELETE, DROP, EXPLAIN, INSERT, ROLLBACK, SELECT, TRUNCATE, UPDATE, parse expression prefix]",
-		yyXError{4, -1}:   "expected TABLE",
-		yyXError{30, -1}:  "expected TABLE",
-		yyXError{5, -1}:   "expected TRANSACTION",
-		yyXError{39, -1}:  "expected UPDATE statement optional WHERE clause or one of [$end, ';', WHERE]",
-		yyXError{304, -1}: "expected WHERE clause or one of [$end, ';', WHERE]",
-		yyXError{37, -1}:  "expected assignment list optional trailing comma or optional comma or one of [$end, ',', ';', WHERE]",
-		yyXError{34, -1}:  "expected assignment list or identifier",
-		yyXError{204, -1}: "expected assignment or one of [$end, ';', WHERE, identifier]",
-		yyXError{250, -1}: "expected column name list or identifier",
-		yyXError{278, -1}: "expected column name list or identifier",
-		yyXError{251, -1}: "expected column name list with optional trailing comma or optional comma or one of [$end, ')', ',', ';', LIMIT, OFFSET, ORDER]",
-		yyXError{353, -1}: "expected column name or identifier",
-		yyXError{255, -1}: "expected column name or one of [$end, ')', ';', LIMIT, OFFSET, ORDER, identifier]",
-		yyXError{109, -1}: "expected expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{121, -1}: "expected expression list expression or logical or operator or optional comma or one of [$end, ')', ',', ';', ASC, DESC, LIMIT, OFFSET, OR, ||]",
-		yyXError{245, -1}: "expected expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{283, -1}: "expected expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{289, -1}: "expected expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{345, -1}: "expected expression list or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{124, -1}: "expected expression or one of [$end, '!', '(', ')', '+', '-', ';', '^', ASC, DESC, LIMIT, NULL, OFFSET, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{96, -1}:  "expected expression or one of ['!', '(', '+', '-', ':', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{101, -1}: "expected expression or one of ['!', '(', '+', '-', ']', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{114, -1}: "expected expression or one of ['!', '(', '+', '-', ']', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{3, -1}:   "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{42, -1}:  "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{58, -1}:  "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{199, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{206, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{240, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{243, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{261, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{329, -1}: "expected expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{104, -1}: "expected expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{212, -1}: "expected field expression optional AS clause or logical or operator or one of [',', AS, FROM, OR, ||]",
-		yyXError{270, -1}: "expected field expression or one of ['!', '(', '+', '-', '^', FROM, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{95, -1}:  "expected function call optional argument list or one of ['!', '(', ')', '*', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{61, -1}:  "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{94, -1}:  "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{128, -1}: "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{129, -1}: "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{130, -1}: "expected function call or string index or string slice or one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{35, -1}:  "expected identifier",
-		yyXError{131, -1}: "expected identifier",
-		yyXError{268, -1}: "expected identifier",
-		yyXError{273, -1}: "expected identifier",
-		yyXError{299, -1}: "expected identifier",
-		yyXError{301, -1}: "expected identifier",
-		yyXError{338, -1}: "expected identifier",
-		yyXError{341, -1}: "expected identifier",
-		yyXError{343, -1}: "expected identifier",
-		yyXError{44, -1}:  "expected logical and operator or one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{108, -1}: "expected logical and operator or one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{125, -1}: "expected logical or operator or one of [$end, ')', ',', ';', ASC, DESC, LIMIT, OFFSET, OR, ||]",
-		yyXError{325, -1}: "expected logical or operator or one of [$end, ')', ',', ';', DEFAULT, OR, ||]",
-		yyXError{331, -1}: "expected logical or operator or one of [$end, ')', ',', ';', OR, ||]",
-		yyXError{262, -1}: "expected logical or operator or one of [$end, ')', ';', GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{45, -1}:  "expected logical or operator or one of [$end, ')', ';', GROUP, LIMIT, OFFSET, OR, ORDER, ||]",
-		yyXError{241, -1}: "expected logical or operator or one of [$end, ')', ';', OFFSET, OR, ||]",
-		yyXError{244, -1}: "expected logical or operator or one of [$end, ')', ';', OR, ||]",
-		yyXError{207, -1}: "expected logical or operator or one of [$end, ',', ';', OR, WHERE, ||]",
-		yyXError{356, -1}: "expected logical or operator or one of [$end, OR, ||]",
-		yyXError{147, -1}: "expected logical or operator or one of [')', OR, ||]",
-		yyXError{200, -1}: "expected logical or operator or one of [')', OR, ||]",
-		yyXError{100, -1}: "expected logical or operator or one of [':', ']', OR, ||]",
-		yyXError{102, -1}: "expected logical or operator or one of [']', OR, ||]",
-		yyXError{115, -1}: "expected logical or operator or one of [']', OR, ||]",
-		yyXError{64, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '.', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{48, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{49, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{50, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{51, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{52, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{53, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{54, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{55, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{56, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{57, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{59, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{60, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{97, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{98, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{99, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{103, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{107, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{113, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{116, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{117, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{126, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{127, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{132, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{148, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{201, -1}: "expected one of [!=, $end, &&, &^, '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', '[', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{62, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{63, -1}:  "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{140, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{141, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{142, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{143, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{144, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{145, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{146, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{153, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{154, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{155, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{156, -1}: "expected one of [!=, $end, &&, &^, '%', '&', ')', '*', '+', ',', '-', '/', ':', ';', '<', '>', ']', '^', '|', <<, <=, ==, >=, >>, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{47, -1}:  "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{168, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{169, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{170, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{171, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{172, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{173, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{174, -1}: "expected one of [!=, $end, &&, ')', '+', ',', '-', ':', ';', '<', '>', ']', '^', '|', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{46, -1}:  "expected one of [!=, $end, &&, ')', ',', ':', ';', '<', '>', ']', <=, ==, >=, AND, AS, ASC, BETWEEN, DEFAULT, DESC, FROM, GROUP, IN, IS, LIKE, LIMIT, NOT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{180, -1}: "expected one of [$end, &&, ')', '+', ',', '-', ':', ';', ']', '^', '|', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{185, -1}: "expected one of [$end, &&, ')', '+', ',', '-', ':', ';', ']', '^', '|', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{65, -1}:  "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{112, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{175, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{177, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{191, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{192, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{197, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{198, -1}: "expected one of [$end, &&, ')', ',', ':', ';', ']', AND, AS, ASC, DEFAULT, DESC, FROM, GROUP, LIMIT, OFFSET, OR, ORDER, WHERE, ||]",
-		yyXError{66, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{67, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{68, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{69, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{70, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{71, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{72, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{73, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{74, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{75, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{76, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{77, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{78, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{79, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{80, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{81, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{82, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{83, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{84, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{85, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{86, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{87, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{88, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{89, -1}:  "expected one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{32, -1}:  "expected one of [$end, '(', ';', ADD, DROP, SELECT, SET, VALUES, WHERE, identifier]",
-		yyXError{288, -1}: "expected one of [$end, '(', ';']",
-		yyXError{38, -1}:  "expected one of [$end, ')', ',', ';', '=', LIMIT, OFFSET, ORDER, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, float, float32, float64, int, int16, int32, int64, int8, rune, string, time, uint, uint16, uint32, uint64, uint8]",
-		yyXError{219, -1}: "expected one of [$end, ')', ',', ';', AS, FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
-		yyXError{266, -1}: "expected one of [$end, ')', ',', ';', AS, FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
-		yyXError{326, -1}: "expected one of [$end, ')', ',', ';', DEFAULT]",
-		yyXError{327, -1}: "expected one of [$end, ')', ',', ';', DEFAULT]",
-		yyXError{267, -1}: "expected one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
-		yyXError{269, -1}: "expected one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
-		yyXError{221, -1}: "expected one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE]",
-		yyXError{263, -1}: "expected one of [$end, ')', ',', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE]",
-		yyXError{256, -1}: "expected one of [$end, ')', ',', ';', LIMIT, OFFSET, ORDER]",
-		yyXError{328, -1}: "expected one of [$end, ')', ',', ';']",
-		yyXError{330, -1}: "expected one of [$end, ')', ',', ';']",
-		yyXError{123, -1}: "expected one of [$end, ')', ';', ASC, DESC, LIMIT, OFFSET]",
-		yyXError{229, -1}: "expected one of [$end, ')', ';', GROUP, LIMIT, OFFSET, ORDER, WHERE]",
-		yyXError{232, -1}: "expected one of [$end, ')', ';', GROUP, LIMIT, OFFSET, ORDER]",
-		yyXError{235, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET, ORDER]",
-		yyXError{252, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET, ORDER]",
-		yyXError{254, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET, ORDER]",
-		yyXError{238, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET]",
-		yyXError{247, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET]",
-		yyXError{248, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET]",
-		yyXError{249, -1}: "expected one of [$end, ')', ';', LIMIT, OFFSET]",
-		yyXError{242, -1}: "expected one of [$end, ')', ';']",
-		yyXError{205, -1}: "expected one of [$end, ',', ';', WHERE]",
-		yyXError{291, -1}: "expected one of [$end, ',', ';']",
-		yyXError{203, -1}: "expected one of [$end, ';', WHERE]",
-		yyXError{2, -1}:   "expected one of [$end, ';']",
-		yyXError{6, -1}:   "expected one of [$end, ';']",
-		yyXError{12, -1}:  "expected one of [$end, ';']",
-		yyXError{14, -1}:  "expected one of [$end, ';']",
-		yyXError{15, -1}:  "expected one of [$end, ';']",
-		yyXError{16, -1}:  "expected one of [$end, ';']",
-		yyXError{17, -1}:  "expected one of [$end, ';']",
-		yyXError{18, -1}:  "expected one of [$end, ';']",
-		yyXError{19, -1}:  "expected one of [$end, ';']",
-		yyXError{20, -1}:  "expected one of [$end, ';']",
-		yyXError{21, -1}:  "expected one of [$end, ';']",
-		yyXError{22, -1}:  "expected one of [$end, ';']",
-		yyXError{23, -1}:  "expected one of [$end, ';']",
-		yyXError{24, -1}:  "expected one of [$end, ';']",
-		yyXError{25, -1}:  "expected one of [$end, ';']",
-		yyXError{26, -1}:  "expected one of [$end, ';']",
-		yyXError{27, -1}:  "expected one of [$end, ';']",
-		yyXError{28, -1}:  "expected one of [$end, ';']",
-		yyXError{29, -1}:  "expected one of [$end, ';']",
-		yyXError{40, -1}:  "expected one of [$end, ';']",
-		yyXError{41, -1}:  "expected one of [$end, ';']",
-		yyXError{209, -1}: "expected one of [$end, ';']",
-		yyXError{282, -1}: "expected one of [$end, ';']",
-		yyXError{287, -1}: "expected one of [$end, ';']",
-		yyXError{292, -1}: "expected one of [$end, ';']",
-		yyXError{295, -1}: "expected one of [$end, ';']",
-		yyXError{298, -1}: "expected one of [$end, ';']",
-		yyXError{302, -1}: "expected one of [$end, ';']",
-		yyXError{305, -1}: "expected one of [$end, ';']",
-		yyXError{321, -1}: "expected one of [$end, ';']",
-		yyXError{336, -1}: "expected one of [$end, ';']",
-		yyXError{347, -1}: "expected one of [$end, ';']",
-		yyXError{348, -1}: "expected one of [$end, ';']",
-		yyXError{354, -1}: "expected one of [$end, ';']",
-		yyXError{355, -1}: "expected one of [$end, ';']",
-		yyXError{358, -1}: "expected one of [$end, ';']",
-		yyXError{211, -1}: "expected one of ['!', '(', '*', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{105, -1}: "expected one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{106, -1}: "expected one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{110, -1}: "expected one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{111, -1}: "expected one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{320, -1}: "expected one of [')', ',']",
-		yyXError{178, -1}: "expected one of ['+', '-', '^', '|', AND]",
-		yyXError{183, -1}: "expected one of ['+', '-', '^', '|', AND]",
-		yyXError{213, -1}: "expected one of [',', FROM]",
-		yyXError{214, -1}: "expected one of [',', FROM]",
-		yyXError{271, -1}: "expected one of [',', FROM]",
-		yyXError{272, -1}: "expected one of [',', FROM]",
-		yyXError{274, -1}: "expected one of [',', FROM]",
-		yyXError{350, -1}: "expected one of [ADD, DROP]",
-		yyXError{158, -1}: "expected one of [BETWEEN, IN]",
-		yyXError{9, -1}:   "expected one of [INDEX, TABLE]",
-		yyXError{225, -1}: "expected one of [JOIN, OUTER]",
-		yyXError{226, -1}: "expected one of [JOIN, OUTER]",
-		yyXError{227, -1}: "expected one of [JOIN, OUTER]",
-		yyXError{160, -1}: "expected one of [NOT, NULL]",
-		yyXError{280, -1}: "expected one of [SELECT, VALUES]",
-		yyXError{323, -1}: "expected optional DEFAULT clause or one of [$end, ')', ',', ';', DEFAULT]",
-		yyXError{322, -1}: "expected optional DEFAULT clause or optional column value constraint or one of [$end, '!', '(', ')', '+', ',', '-', ';', '^', DEFAULT, NOT, NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{228, -1}: "expected optional OUTER clause or one of [JOIN, OUTER]",
-		yyXError{122, -1}: "expected optional comma or one of [$end, ')', ',', ';', ASC, DESC, LIMIT, OFFSET]",
-		yyXError{253, -1}: "expected optional comma or one of [$end, ')', ',', ';', LIMIT, OFFSET, ORDER]",
-		yyXError{202, -1}: "expected optional comma or one of [$end, ',', ';', WHERE]",
-		yyXError{286, -1}: "expected optional comma or one of [$end, ',', ';']",
-		yyXError{317, -1}: "expected optional comma or one of [')', ',']",
-		yyXError{334, -1}: "expected optional comma or one of [')', ',']",
-		yyXError{159, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{161, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{162, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{163, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{164, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{165, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{166, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{167, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{179, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{182, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{184, -1}: "expected primary expression factor or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{90, -1}:  "expected primary expression or one of ['(', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{91, -1}:  "expected primary expression or one of ['(', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{92, -1}:  "expected primary expression or one of ['(', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{93, -1}:  "expected primary expression or one of ['(', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{149, -1}: "expected primary expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{150, -1}: "expected primary expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{151, -1}: "expected primary expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{152, -1}: "expected primary expression term or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{218, -1}: "expected record set optional AS clause or one of [$end, ')', ',', ';', AS, FULL, GROUP, LEFT, LIMIT, OFFSET, ON, ORDER, RIGHT, WHERE]",
-		yyXError{223, -1}: "expected record set or one of [$end, '(', ')', ';', FULL, GROUP, LEFT, LIMIT, OFFSET, ORDER, RIGHT, WHERE, identifier]",
-		yyXError{259, -1}: "expected record set or one of ['(', identifier]",
-		yyXError{188, -1}: "expected semiOpt or one of [')', ';']",
-		yyXError{195, -1}: "expected semiOpt or one of [')', ';']",
-		yyXError{264, -1}: "expected semiOpt or one of [')', ';']",
-		yyXError{10, -1}:  "expected statement or one of [$end, ';', ALTER, BEGIN, COMMIT, CREATE, DELETE, DROP, EXPLAIN, INSERT, ROLLBACK, SELECT, TRUNCATE, UPDATE]",
-		yyXError{357, -1}: "expected statement or one of [$end, ';', ALTER, BEGIN, COMMIT, CREATE, DELETE, DROP, EXPLAIN, INSERT, ROLLBACK, SELECT, TRUNCATE, UPDATE]",
-		yyXError{314, -1}: "expected table column definition or identifier",
-		yyXError{332, -1}: "expected table column definition or identifier",
-		yyXError{351, -1}: "expected table column definition or identifier",
-		yyXError{319, -1}: "expected table column definition or one of [')', identifier]",
-		yyXError{31, -1}:  "expected table name or identifier",
-		yyXError{208, -1}: "expected table name or identifier",
-		yyXError{275, -1}: "expected table name or identifier",
-		yyXError{297, -1}: "expected table name or identifier",
-		yyXError{303, -1}: "expected table name or identifier",
-		yyXError{312, -1}: "expected table name or identifier",
-		yyXError{349, -1}: "expected table name or identifier",
-		yyXError{294, -1}: "expected table name or one of [IF, identifier]",
-		yyXError{308, -1}: "expected table name or one of [IF, identifier]",
-		yyXError{315, -1}: "expected type or one of [bigint, bigrat, blob, bool, byte, complex128, complex64, duration, float, float32, float64, int, int16, int32, int64, int8, rune, string, time, uint, uint16, uint32, uint64, uint8]",
-		yyXError{133, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{134, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{135, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{136, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{137, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{138, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-		yyXError{139, -1}: "expected unary expression or one of ['!', '(', '+', '-', '^', NULL, QL parameter, bigint, bigrat, blob, bool, byte, complex128, complex64, duration, false, float, float32, float64, floating-point literal, identifier, imaginary literal, int, int16, int32, int64, int8, integer literal, rune, string, string literal, time, true, uint, uint16, uint32, uint64, uint8]",
-	}
-
-	yyParseTab = [359][]uint16{
-		// 0
-		{172, 172, 96: 229, 101: 242, 104: 225, 114: 220, 231, 221, 232, 222, 233, 223, 234, 235, 236, 224, 237, 238, 230, 226, 239, 227, 240, 134: 228, 241, 137: 245, 246, 243, 247, 244, 179: 219, 190: 217, 218},
-		{1: 216},
-		{573, 215},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 572},
-		{112: 565},
-		// 5
-		{192: 564},
-		{197, 197},
-		{110: 188, 112: 524, 161: 522, 193: 523},
-		{51: 519},
-		{110: 509, 112: 510},
-		// 10
-		{172, 172, 96: 229, 101: 242, 104: 225, 114: 220, 231, 221, 232, 222, 233, 223, 234, 235, 236, 224, 237, 238, 230, 226, 239, 227, 240, 134: 228, 241, 137: 508, 246, 243, 247, 244},
-		{172: 491},
-		{89, 89},
-		{3: 75, 75, 75, 7: 75, 75, 14: 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 42: 75, 75, 47: 75, 75, 75, 75, 76: 75, 164: 427, 182: 426},
-		{60, 60},
-		// 15
-		{59, 59},
-		{58, 58},
-		{57, 57},
-		{56, 56},
-		{55, 55},
-		// 20
-		{54, 54},
-		{53, 53},
-		{52, 52},
-		{51, 51},
-		{50, 50},
-		// 25
-		{49, 49},
-		{48, 48},
-		{47, 47},
-		{46, 46},
-		{45, 45},
-		// 30
-		{112: 424},
-		{8: 248, 97: 249},
-		{43, 43, 7: 43, 43, 13: 43, 96: 43, 104: 43, 113: 43, 144: 43, 151: 43},
-		{8: 4, 151: 251, 189: 250},
-		{8: 254, 92: 252, 145: 253, 153: 255},
-		// 35
-		{8: 3},
-		{143: 422},
-		{209, 209, 6: 209, 13: 209, 154: 418},
-		{201, 201, 201, 6: 201, 9: 201, 201, 12: 201, 15: 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, 143: 201},
-		{12, 12, 13: 258, 142: 257, 194: 256},
-		// 40
-		{13, 13},
-		{11, 11},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 261},
-		{7: 415},
-		{170, 170, 170, 6: 170, 9: 170, 170, 170, 170, 170, 41: 170, 45: 170, 170, 51: 170, 170, 170, 170, 170, 170, 327, 326, 150: 325},
-		// 45
-		{5, 5, 5, 9: 5, 5, 12: 5, 41: 5, 45: 322, 321, 91: 320},
-		{163, 163, 163, 6: 163, 9: 163, 163, 163, 163, 163, 41: 163, 44: 374, 163, 163, 51: 163, 163, 163, 163, 163, 163, 163, 163, 60: 375, 373, 380, 378, 382, 377, 376, 379, 383, 381},
-		{154, 154, 154, 368, 367, 365, 154, 9: 154, 154, 154, 154, 154, 41: 154, 44: 154, 154, 154, 51: 154, 154, 154, 154, 154, 154, 154, 154, 366, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154},
-		{133, 133, 133, 133, 133, 133, 133, 133, 9: 133, 133, 133, 133, 133, 41: 133, 44: 133, 133, 133, 51: 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 76: 133, 78: 133, 133, 133, 133, 133, 133, 86: 133},
-		{132, 132, 132, 132, 132, 132, 132, 132, 9: 132, 132, 132, 132, 132, 41: 132, 44: 132, 132, 132, 51: 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 76: 132, 78: 132, 132, 132, 132, 132, 132, 86: 132},
-		// 50
-		{131, 131, 131, 131, 131, 131, 131, 131, 9: 131, 131, 131, 131, 131, 41: 131, 44: 131, 131, 131, 51: 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 76: 131, 78: 131, 131, 131, 131, 131, 131, 86: 131},
-		{130, 130, 130, 130, 130, 130, 130, 130, 9: 130, 130, 130, 130, 130, 41: 130, 44: 130, 130, 130, 51: 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 76: 130, 78: 130, 130, 130, 130, 130, 130, 86: 130},
-		{129, 129, 129, 129, 129, 129, 129, 129, 9: 129, 129, 129, 129, 129, 41: 129, 44: 129, 129, 129, 51: 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 76: 129, 78: 129, 129, 129, 129, 129, 129, 86: 129},
-		{128, 128, 128, 128, 128, 128, 128, 128, 9: 128, 128, 128, 128, 128, 41: 128, 44: 128, 128, 128, 51: 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 76: 128, 78: 128, 128, 128, 128, 128, 128, 86: 128},
-		{127, 127, 127, 127, 127, 127, 127, 127, 9: 127, 127, 127, 127, 127, 41: 127, 44: 127, 127, 127, 51: 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 76: 127, 78: 127, 127, 127, 127, 127, 127, 86: 127},
-		// 55
-		{126, 126, 126, 126, 126, 126, 126, 126, 9: 126, 126, 126, 126, 126, 41: 126, 44: 126, 126, 126, 51: 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 76: 126, 78: 126, 126, 126, 126, 126, 126, 86: 126},
-		{125, 125, 125, 125, 125, 125, 125, 125, 9: 125, 125, 125, 125, 125, 41: 125, 44: 125, 125, 125, 51: 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 76: 125, 78: 125, 125, 125, 125, 125, 125, 86: 125},
-		{124, 124, 124, 124, 124, 124, 124, 124, 9: 124, 124, 124, 124, 124, 41: 124, 44: 124, 124, 124, 51: 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 76: 124, 78: 124, 124, 124, 124, 124, 124, 86: 124},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 363},
-		{118, 118, 118, 118, 118, 118, 118, 118, 9: 118, 118, 118, 118, 118, 41: 118, 44: 118, 118, 118, 51: 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 76: 118, 78: 118, 118, 118, 118, 118, 118, 86: 118},
-		// 60
-		{117, 117, 117, 117, 117, 117, 117, 117, 9: 117, 117, 117, 117, 117, 41: 117, 44: 117, 117, 117, 51: 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 76: 117, 78: 117, 117, 117, 117, 117, 117, 86: 117},
-		{10, 10, 10, 10, 10, 10, 10, 311, 9: 10, 10, 10, 10, 10, 41: 10, 44: 10, 10, 10, 51: 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 76: 10, 78: 10, 10, 10, 10, 10, 10, 86: 312, 103: 315, 105: 313, 314},
-		{113, 113, 113, 113, 113, 113, 113, 9: 113, 113, 113, 113, 113, 41: 113, 44: 113, 113, 113, 51: 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 76: 355, 78: 353, 350, 354, 349, 351, 352},
-		{108, 108, 108, 108, 108, 108, 108, 9: 108, 108, 108, 108, 108, 41: 108, 44: 108, 108, 108, 51: 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 76: 108, 78: 108, 108, 108, 108, 108, 108},
-		{100, 100, 100, 100, 100, 100, 100, 100, 9: 100, 100, 100, 100, 100, 41: 100, 44: 100, 100, 100, 51: 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 76: 100, 78: 100, 100, 100, 100, 100, 100, 86: 100, 152: 347},
-		// 65
-		{42, 42, 42, 6: 42, 9: 42, 42, 42, 42, 42, 41: 42, 45: 42, 42, 51: 42, 42, 42, 42, 42, 42, 42, 42},
-		{37, 37, 37, 37, 37, 37, 37, 37, 37, 11: 37, 14: 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 42: 37, 37, 37, 47: 37, 37, 37, 37},
-		{36, 36, 36, 36, 36, 36, 36, 36, 36, 11: 36, 14: 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 42: 36, 36, 36, 47: 36, 36, 36, 36},
-		{35, 35, 35, 35, 35, 35, 35, 35, 35, 11: 35, 14: 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 42: 35, 35, 35, 47: 35, 35, 35, 35},
-		{34, 34, 34, 34, 34, 34, 34, 34, 34, 11: 34, 14: 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 42: 34, 34, 34, 47: 34, 34, 34, 34},
-		// 70
-		{33, 33, 33, 33, 33, 33, 33, 33, 33, 11: 33, 14: 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 42: 33, 33, 33, 47: 33, 33, 33, 33},
-		{32, 32, 32, 32, 32, 32, 32, 32, 32, 11: 32, 14: 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 42: 32, 32, 32, 47: 32, 32, 32, 32},
-		{31, 31, 31, 31, 31, 31, 31, 31, 31, 11: 31, 14: 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 42: 31, 31, 31, 47: 31, 31, 31, 31},
-		{30, 30, 30, 30, 30, 30, 30, 30, 30, 11: 30, 14: 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 42: 30, 30, 30, 47: 30, 30, 30, 30},
-		{29, 29, 29, 29, 29, 29, 29, 29, 29, 11: 29, 14: 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 42: 29, 29, 29, 47: 29, 29, 29, 29},
-		// 75
-		{28, 28, 28, 28, 28, 28, 28, 28, 28, 11: 28, 14: 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 42: 28, 28, 28, 47: 28, 28, 28, 28},
-		{27, 27, 27, 27, 27, 27, 27, 27, 27, 11: 27, 14: 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 42: 27, 27, 27, 47: 27, 27, 27, 27},
-		{26, 26, 26, 26, 26, 26, 26, 26, 26, 11: 26, 14: 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 42: 26, 26, 26, 47: 26, 26, 26, 26},
-		{25, 25, 25, 25, 25, 25, 25, 25, 25, 11: 25, 14: 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 42: 25, 25, 25, 47: 25, 25, 25, 25},
-		{24, 24, 24, 24, 24, 24, 24, 24, 24, 11: 24, 14: 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 42: 24, 24, 24, 47: 24, 24, 24, 24},
-		// 80
-		{23, 23, 23, 23, 23, 23, 23, 23, 23, 11: 23, 14: 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 42: 23, 23, 23, 47: 23, 23, 23, 23},
-		{22, 22, 22, 22, 22, 22, 22, 22, 22, 11: 22, 14: 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 42: 22, 22, 22, 47: 22, 22, 22, 22},
-		{21, 21, 21, 21, 21, 21, 21, 21, 21, 11: 21, 14: 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 42: 21, 21, 21, 47: 21, 21, 21, 21},
-		{20, 20, 20, 20, 20, 20, 20, 20, 20, 11: 20, 14: 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 42: 20, 20, 20, 47: 20, 20, 20, 20},
-		{19, 19, 19, 19, 19, 19, 19, 19, 19, 11: 19, 14: 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 42: 19, 19, 19, 47: 19, 19, 19, 19},
-		// 85
-		{18, 18, 18, 18, 18, 18, 18, 18, 18, 11: 18, 14: 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 42: 18, 18, 18, 47: 18, 18, 18, 18},
-		{17, 17, 17, 17, 17, 17, 17, 17, 17, 11: 17, 14: 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 42: 17, 17, 17, 47: 17, 17, 17, 17},
-		{16, 16, 16, 16, 16, 16, 16, 16, 16, 11: 16, 14: 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 42: 16, 16, 16, 47: 16, 16, 16, 16},
-		{15, 15, 15, 15, 15, 15, 15, 15, 15, 11: 15, 14: 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 42: 15, 15, 15, 47: 15, 15, 15, 15},
-		{14, 14, 14, 14, 14, 14, 14, 14, 14, 11: 14, 14: 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 42: 14, 14, 14, 47: 14, 14, 14, 14},
-		// 90
-		{7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 70: 259, 276, 271, 275, 346, 273},
-		{7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 70: 259, 276, 271, 275, 345, 273},
-		{7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 70: 259, 276, 271, 275, 344, 273},
-		{7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 70: 259, 276, 271, 275, 310, 273},
-		{6, 6, 6, 6, 6, 6, 6, 311, 9: 6, 6, 6, 6, 6, 41: 6, 44: 6, 6, 6, 51: 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 76: 6, 78: 6, 6, 6, 6, 6, 6, 86: 312, 103: 315, 105: 313, 314},
-		// 95
-		{2: 204, 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 335, 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 336, 155: 334},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 56: 317, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 316},
-		{116, 116, 116, 116, 116, 116, 116, 116, 9: 116, 116, 116, 116, 116, 41: 116, 44: 116, 116, 116, 51: 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 76: 116, 78: 116, 116, 116, 116, 116, 116, 86: 116},
-		{115, 115, 115, 115, 115, 115, 115, 115, 9: 115, 115, 115, 115, 115, 41: 115, 44: 115, 115, 115, 51: 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 76: 115, 78: 115, 115, 115, 115, 115, 115, 86: 115},
-		{114, 114, 114, 114, 114, 114, 114, 114, 9: 114, 114, 114, 114, 114, 41: 114, 44: 114, 114, 114, 51: 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 76: 114, 78: 114, 114, 114, 114, 114, 114, 86: 114},
-		// 100
-		{45: 322, 321, 54: 329, 56: 330, 91: 320},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 54: 319, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 318},
-		{45: 322, 321, 54: 323, 91: 320},
-		{64, 64, 64, 64, 64, 64, 64, 64, 9: 64, 64, 64, 64, 64, 41: 64, 44: 64, 64, 64, 51: 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 76: 64, 78: 64, 64, 64, 64, 64, 64, 86: 64},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 324},
-		// 105
-		{3: 168, 168, 168, 7: 168, 168, 14: 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 42: 168, 168, 47: 168, 168, 168, 168},
-		{3: 167, 167, 167, 7: 167, 167, 14: 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 42: 167, 167, 47: 167, 167, 167, 167},
-		{63, 63, 63, 63, 63, 63, 63, 63, 9: 63, 63, 63, 63, 63, 41: 63, 44: 63, 63, 63, 51: 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 76: 63, 78: 63, 63, 63, 63, 63, 63, 86: 63},
-		{169, 169, 169, 6: 169, 9: 169, 169, 169, 169, 169, 41: 169, 45: 169, 169, 51: 169, 169, 169, 169, 169, 169, 327, 326, 150: 325},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 328, 262},
-		// 110
-		{3: 40, 40, 40, 7: 40, 40, 14: 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 42: 40, 40, 47: 40, 40, 40, 40},
-		{3: 39, 39, 39, 7: 39, 39, 14: 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 42: 39, 39, 47: 39, 39, 39, 39},
-		{41, 41, 41, 6: 41, 9: 41, 41, 41, 41, 41, 41: 41, 45: 41, 41, 51: 41, 41, 41, 41, 41, 41, 41, 41},
-		{140, 140, 140, 140, 140, 140, 140, 140, 9: 140, 140, 140, 140, 140, 41: 140, 44: 140, 140, 140, 51: 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 76: 140, 78: 140, 140, 140, 140, 140, 140, 86: 140},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 54: 332, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 331},
-		// 115
-		{45: 322, 321, 54: 333, 91: 320},
-		{62, 62, 62, 62, 62, 62, 62, 62, 9: 62, 62, 62, 62, 62, 41: 62, 44: 62, 62, 62, 51: 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 76: 62, 78: 62, 62, 62, 62, 62, 62, 86: 62},
-		{61, 61, 61, 61, 61, 61, 61, 61, 9: 61, 61, 61, 61, 61, 41: 61, 44: 61, 61, 61, 51: 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 76: 61, 78: 61, 61, 61, 61, 61, 61, 86: 61},
-		{2: 343},
-		{2: 342},
-		// 120
-		{2: 203},
-		{165, 165, 165, 6: 165, 9: 165, 165, 45: 322, 321, 52: 165, 165, 91: 320, 166: 338},
-		{2, 2, 2, 6: 340, 9: 2, 2, 52: 2, 2, 98: 339},
-		{166, 166, 166, 9: 166, 166, 52: 166, 166},
-		{1, 1, 1, 309, 308, 306, 7: 274, 280, 1, 1, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 52: 1, 1, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 341},
-		// 125
-		{164, 164, 164, 6: 164, 9: 164, 164, 45: 322, 321, 52: 164, 164, 91: 320},
-		{205, 205, 205, 205, 205, 205, 205, 205, 9: 205, 205, 205, 205, 205, 41: 205, 44: 205, 205, 205, 51: 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 76: 205, 78: 205, 205, 205, 205, 205, 205, 86: 205},
-		{206, 206, 206, 206, 206, 206, 206, 206, 9: 206, 206, 206, 206, 206, 41: 206, 44: 206, 206, 206, 51: 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 76: 206, 78: 206, 206, 206, 206, 206, 206, 86: 206},
-		{7, 7, 7, 7, 7, 7, 7, 311, 9: 7, 7, 7, 7, 7, 41: 7, 44: 7, 7, 7, 51: 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 76: 7, 78: 7, 7, 7, 7, 7, 7, 86: 312, 103: 315, 105: 313, 314},
-		{8, 8, 8, 8, 8, 8, 8, 311, 9: 8, 8, 8, 8, 8, 41: 8, 44: 8, 8, 8, 51: 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 76: 8, 78: 8, 8, 8, 8, 8, 8, 86: 312, 103: 315, 105: 313, 314},
-		// 130
-		{9, 9, 9, 9, 9, 9, 9, 311, 9: 9, 9, 9, 9, 9, 41: 9, 44: 9, 9, 9, 51: 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 76: 9, 78: 9, 9, 9, 9, 9, 9, 86: 312, 103: 315, 105: 313, 314},
-		{8: 348},
-		{99, 99, 99, 99, 99, 99, 99, 99, 9: 99, 99, 99, 99, 99, 41: 99, 44: 99, 99, 99, 51: 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 76: 99, 78: 99, 99, 99, 99, 99, 99, 86: 99},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 362},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 361},
-		// 135
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 360},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 359},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 358},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 357},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 356},
-		// 140
-		{101, 101, 101, 101, 101, 101, 101, 9: 101, 101, 101, 101, 101, 41: 101, 44: 101, 101, 101, 51: 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 76: 101, 78: 101, 101, 101, 101, 101, 101},
-		{102, 102, 102, 102, 102, 102, 102, 9: 102, 102, 102, 102, 102, 41: 102, 44: 102, 102, 102, 51: 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 76: 102, 78: 102, 102, 102, 102, 102, 102},
-		{103, 103, 103, 103, 103, 103, 103, 9: 103, 103, 103, 103, 103, 41: 103, 44: 103, 103, 103, 51: 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 76: 103, 78: 103, 103, 103, 103, 103, 103},
-		{104, 104, 104, 104, 104, 104, 104, 9: 104, 104, 104, 104, 104, 41: 104, 44: 104, 104, 104, 51: 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 76: 104, 78: 104, 104, 104, 104, 104, 104},
-		{105, 105, 105, 105, 105, 105, 105, 9: 105, 105, 105, 105, 105, 41: 105, 44: 105, 105, 105, 51: 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 76: 105, 78: 105, 105, 105, 105, 105, 105},
-		// 145
-		{106, 106, 106, 106, 106, 106, 106, 9: 106, 106, 106, 106, 106, 41: 106, 44: 106, 106, 106, 51: 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 76: 106, 78: 106, 106, 106, 106, 106, 106},
-		{107, 107, 107, 107, 107, 107, 107, 9: 107, 107, 107, 107, 107, 41: 107, 44: 107, 107, 107, 51: 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 76: 107, 78: 107, 107, 107, 107, 107, 107},
-		{2: 364, 45: 322, 321, 91: 320},
-		{123, 123, 123, 123, 123, 123, 123, 123, 9: 123, 123, 123, 123, 123, 41: 123, 44: 123, 123, 123, 51: 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 76: 123, 78: 123, 123, 123, 123, 123, 123, 86: 123},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 372},
-		// 150
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 371},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 370},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 369},
-		{109, 109, 109, 109, 109, 109, 109, 9: 109, 109, 109, 109, 109, 41: 109, 44: 109, 109, 109, 51: 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 76: 355, 78: 353, 350, 354, 349, 351, 352},
-		{110, 110, 110, 110, 110, 110, 110, 9: 110, 110, 110, 110, 110, 41: 110, 44: 110, 110, 110, 51: 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 76: 355, 78: 353, 350, 354, 349, 351, 352},
-		// 155
-		{111, 111, 111, 111, 111, 111, 111, 9: 111, 111, 111, 111, 111, 41: 111, 44: 111, 111, 111, 51: 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 76: 355, 78: 353, 350, 354, 349, 351, 352},
-		{112, 112, 112, 112, 112, 112, 112, 9: 112, 112, 112, 112, 112, 41: 112, 44: 112, 112, 112, 51: 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 76: 355, 78: 353, 350, 354, 349, 351, 352},
-		{7: 409},
-		{60: 398, 397},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 394},
-		// 160
-		{14: 391, 44: 392},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 390},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 389},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 388},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 387},
-		// 165
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 386},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 385},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 384},
-		{147, 147, 147, 368, 367, 365, 147, 9: 147, 147, 147, 147, 147, 41: 147, 44: 147, 147, 147, 51: 147, 147, 147, 147, 147, 147, 147, 147, 366, 147, 147, 147, 147, 147, 147, 147, 147, 147, 147},
-		{148, 148, 148, 368, 367, 365, 148, 9: 148, 148, 148, 148, 148, 41: 148, 44: 148, 148, 148, 51: 148, 148, 148, 148, 148, 148, 148, 148, 366, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148},
-		// 170
-		{149, 149, 149, 368, 367, 365, 149, 9: 149, 149, 149, 149, 149, 41: 149, 44: 149, 149, 149, 51: 149, 149, 149, 149, 149, 149, 149, 149, 366, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149},
-		{150, 150, 150, 368, 367, 365, 150, 9: 150, 150, 150, 150, 150, 41: 150, 44: 150, 150, 150, 51: 150, 150, 150, 150, 150, 150, 150, 150, 366, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150},
-		{151, 151, 151, 368, 367, 365, 151, 9: 151, 151, 151, 151, 151, 41: 151, 44: 151, 151, 151, 51: 151, 151, 151, 151, 151, 151, 151, 151, 366, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151},
-		{152, 152, 152, 368, 367, 365, 152, 9: 152, 152, 152, 152, 152, 41: 152, 44: 152, 152, 152, 51: 152, 152, 152, 152, 152, 152, 152, 152, 366, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152},
-		{153, 153, 153, 368, 367, 365, 153, 9: 153, 153, 153, 153, 153, 41: 153, 44: 153, 153, 153, 51: 153, 153, 153, 153, 153, 153, 153, 153, 366, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153},
-		// 175
-		{156, 156, 156, 6: 156, 9: 156, 156, 156, 156, 156, 41: 156, 45: 156, 156, 51: 156, 156, 156, 156, 156, 156, 156, 156},
-		{14: 393},
-		{155, 155, 155, 6: 155, 9: 155, 155, 155, 155, 155, 41: 155, 45: 155, 155, 51: 155, 155, 155, 155, 155, 155, 155, 155},
-		{3: 368, 367, 365, 57: 395, 59: 366},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 396},
-		// 180
-		{158, 158, 158, 368, 367, 365, 158, 9: 158, 158, 158, 158, 158, 41: 158, 45: 158, 158, 51: 158, 158, 158, 158, 158, 158, 158, 158, 366},
-		{7: 402},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 399},
-		{3: 368, 367, 365, 57: 400, 59: 366},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 401},
-		// 185
-		{157, 157, 157, 368, 367, 365, 157, 9: 157, 157, 157, 157, 157, 41: 157, 45: 157, 157, 51: 157, 157, 157, 157, 157, 157, 157, 157, 366},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 96: 229, 99: 403, 101: 404},
-		{2: 408},
-		{406, 2: 95, 136: 405},
-		{2: 407},
-		// 190
-		{2: 94},
-		{159, 159, 159, 6: 159, 9: 159, 159, 159, 159, 159, 41: 159, 45: 159, 159, 51: 159, 159, 159, 159, 159, 159, 159, 159},
-		{161, 161, 161, 6: 161, 9: 161, 161, 161, 161, 161, 41: 161, 45: 161, 161, 51: 161, 161, 161, 161, 161, 161, 161, 161},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 96: 229, 99: 410, 101: 411},
-		{2: 414},
-		// 195
-		{406, 2: 95, 136: 412},
-		{2: 413},
-		{160, 160, 160, 6: 160, 9: 160, 160, 160, 160, 160, 41: 160, 45: 160, 160, 51: 160, 160, 160, 160, 160, 160, 160, 160},
-		{162, 162, 162, 6: 162, 9: 162, 162, 162, 162, 162, 41: 162, 45: 162, 162, 51: 162, 162, 162, 162, 162, 162, 162, 162},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 416},
-		// 200
-		{2: 417, 45: 322, 321, 91: 320},
-		{192, 192, 192, 192, 192, 192, 192, 192, 9: 192, 192, 192, 192, 192, 41: 192, 44: 192, 192, 192, 51: 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 76: 192, 78: 192, 192, 192, 192, 192, 192, 86: 192},
-		{2, 2, 6: 420, 13: 2, 98: 419},
-		{210, 210, 13: 210},
-		{1, 1, 8: 254, 13: 1, 92: 252, 145: 421},
-		// 205
-		{208, 208, 6: 208, 13: 208},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 423},
-		{211, 211, 6: 211, 13: 211, 45: 322, 321, 91: 320},
-		{8: 248, 97: 425},
-		{38, 38},
-		// 210
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 432, 279, 84: 278, 263, 87: 281, 262, 260, 428, 149: 429, 168: 430, 183: 431},
-		{3: 74, 74, 74, 7: 74, 74, 14: 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 42: 74, 74, 47: 74, 74, 74, 74, 76: 74},
-		{6: 145, 45: 322, 321, 51: 145, 55: 489, 91: 320, 167: 488},
-		{6: 143, 51: 143},
-		{6: 486, 51: 72},
-		// 215
-		{51: 433},
-		{51: 73},
-		{7: 436, 435, 132: 437, 434, 181: 438},
-		{93, 93, 93, 6: 93, 9: 93, 93, 12: 93, 93, 41: 93, 55: 484, 93: 93, 93, 93, 100: 93, 180: 483},
-		{97, 97, 97, 6: 97, 9: 97, 97, 12: 97, 97, 41: 97, 55: 97, 93: 97, 97, 97, 100: 97},
-		// 220
-		{96: 229, 101: 480},
-		{91, 91, 91, 6: 91, 9: 91, 91, 12: 91, 91, 41: 91, 93: 91, 91, 91},
-		{2, 2, 2, 6: 439, 9: 2, 2, 12: 2, 2, 41: 2, 93: 2, 2, 2, 98: 440},
-		{1, 1, 1, 7: 436, 435, 1, 1, 12: 1, 1, 41: 1, 93: 1, 1, 1, 132: 479, 434},
-		{82, 82, 82, 9: 82, 82, 12: 82, 82, 41: 82, 93: 443, 441, 442, 173: 445, 446, 444},
-		// 225
-		{102: 88, 111: 88},
-		{102: 87, 111: 87},
-		{102: 86, 111: 86},
-		{102: 85, 111: 473, 178: 474},
-		{81, 81, 81, 9: 81, 81, 12: 81, 81, 41: 81},
-		// 230
-		{70, 70, 70, 9: 70, 70, 12: 70, 258, 41: 70, 142: 448, 188: 447},
-		{68, 68, 68, 9: 68, 68, 12: 68, 41: 449, 169: 451, 184: 450},
-		{69, 69, 69, 9: 69, 69, 12: 69, 41: 69},
-		{146: 466},
-		{66, 66, 66, 9: 66, 66, 12: 452, 176: 454, 187: 453},
-		// 235
-		{67, 67, 67, 9: 67, 67, 12: 67},
-		{146: 461},
-		{79, 79, 79, 9: 79, 456, 185: 455},
-		{65, 65, 65, 9: 65, 65},
-		{77, 77, 77, 9: 459, 186: 458},
-		// 240
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 457},
-		{78, 78, 78, 9: 78, 45: 322, 321, 91: 320},
-		{80, 80, 80},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 460},
-		{76, 76, 76, 45: 322, 321, 91: 320},
-		// 245
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 462},
-		{121, 121, 121, 9: 121, 121, 52: 464, 465, 177: 463},
-		{122, 122, 122, 9: 122, 122},
-		{120, 120, 120, 9: 120, 120},
-		{119, 119, 119, 9: 119, 119},
-		// 250
-		{8: 254, 92: 467, 147: 468},
-		{199, 199, 199, 6: 199, 9: 199, 199, 12: 199, 157: 469},
-		{141, 141, 141, 9: 141, 141, 12: 141},
-		{2, 2, 2, 6: 471, 9: 2, 2, 12: 2, 98: 470},
-		{200, 200, 200, 9: 200, 200, 12: 200},
-		// 255
-		{1, 1, 1, 8: 254, 1, 1, 12: 1, 92: 472},
-		{198, 198, 198, 6: 198, 9: 198, 198, 12: 198},
-		{102: 84},
-		{102: 475},
-		{7: 436, 435, 132: 476, 434},
-		// 260
-		{100: 477},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 478},
-		{83, 83, 83, 9: 83, 83, 12: 83, 83, 41: 83, 45: 322, 321, 91: 320},
-		{90, 90, 90, 6: 90, 9: 90, 90, 12: 90, 90, 41: 90, 93: 90, 90, 90},
-		{406, 2: 95, 136: 481},
-		// 265
-		{2: 482},
-		{96, 96, 96, 6: 96, 9: 96, 96, 12: 96, 96, 41: 96, 55: 96, 93: 96, 96, 96, 100: 96},
-		{98, 98, 98, 6: 98, 9: 98, 98, 12: 98, 98, 41: 98, 93: 98, 98, 98, 100: 98},
-		{8: 485},
-		{92, 92, 92, 6: 92, 9: 92, 92, 12: 92, 92, 41: 92, 93: 92, 92, 92, 100: 92},
-		// 270
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 71, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 428, 149: 487},
-		{6: 142, 51: 142},
-		{6: 146, 51: 146},
-		{8: 490},
-		{6: 144, 51: 144},
-		// 275
-		{8: 248, 97: 492},
-		{7: 494, 96: 137, 113: 137, 170: 493},
-		{96: 229, 101: 498, 113: 497},
-		{8: 254, 92: 467, 147: 495},
-		{2: 496},
-		// 280
-		{96: 136, 113: 136},
-		{7: 499},
-		{138, 138},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 500},
-		{2: 501},
-		// 285
-		{135, 135, 6: 135, 171: 502},
-		{2, 2, 6: 504, 98: 503},
-		{139, 139},
-		{1, 1, 7: 505},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 506},
-		// 290
-		{2: 507},
-		{134, 134, 6: 134},
-		{171, 171},
-		{8: 176, 109: 516, 165: 515},
-		{8: 248, 97: 511, 109: 512},
-		// 295
-		{174, 174},
-		{108: 513},
-		{8: 248, 97: 514},
-		{173, 173},
-		{8: 518},
-		// 300
-		{108: 517},
-		{8: 175},
-		{177, 177},
-		{8: 248, 97: 520},
-		{179, 179, 13: 258, 142: 521},
-		// 305
-		{178, 178},
-		{110: 553},
-		{110: 187},
-		{8: 248, 97: 525, 109: 526},
-		{7: 548},
-		// 310
-		{44: 527},
-		{108: 528},
-		{8: 248, 97: 529},
-		{7: 530},
-		{8: 254, 92: 531, 107: 532},
-		// 315
-		{15: 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 70: 538},
-		{2: 184, 6: 184, 148: 533},
-		{2: 2, 6: 535, 98: 534},
-		{2: 537},
-		{2: 1, 8: 254, 92: 531, 107: 536},
-		// 320
-		{2: 183, 6: 183},
-		{185, 185},
-		{194, 194, 194, 309, 308, 306, 194, 274, 280, 11: 194, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 540, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 541, 158: 542, 539},
-		{181, 181, 181, 6: 181, 11: 545, 162: 546, 544},
-		{14: 543},
-		// 325
-		{195, 195, 195, 6: 195, 11: 195, 45: 322, 321, 91: 320},
-		{193, 193, 193, 6: 193, 11: 193},
-		{196, 196, 196, 6: 196, 11: 196},
-		{202, 202, 202, 6: 202},
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 547},
-		// 330
-		{180, 180, 180, 6: 180},
-		{182, 182, 182, 6: 182, 45: 322, 321, 91: 320},
-		{8: 254, 92: 531, 107: 549},
-		{2: 184, 6: 184, 148: 550},
-		{2: 2, 6: 535, 98: 551},
-		// 335
-		{2: 552},
-		{186, 186},
-		{8: 190, 109: 555, 160: 554},
-		{8: 558},
-		{44: 556},
-		// 340
-		{108: 557},
-		{8: 189},
-		{100: 559},
-		{8: 560},
-		{7: 561},
-		// 345
-		{3: 309, 308, 306, 7: 274, 280, 14: 265, 282, 283, 284, 285, 286, 287, 288, 289, 291, 292, 290, 294, 295, 296, 297, 293, 298, 299, 300, 302, 303, 304, 305, 301, 264, 267, 42: 268, 269, 47: 272, 270, 266, 307, 70: 259, 276, 271, 275, 277, 273, 77: 279, 84: 278, 263, 87: 281, 262, 260, 337, 99: 562},
-		{2: 563},
-		{191, 191},
-		{207, 207},
-		{8: 248, 97: 566},
-		// 350
-		{104: 568, 144: 567},
-		{8: 254, 92: 531, 107: 571},
-		{156: 569},
-		{8: 254, 92: 570},
-		{212, 212},
-		// 355
-		{213, 213},
-		{1: 214, 45: 322, 321, 91: 320},
-		{172, 172, 96: 229, 101: 242, 104: 225, 114: 220, 231, 221, 232, 222, 233, 223, 234, 235, 236, 224, 237, 238, 230, 226, 239, 227, 240, 134: 228, 241, 137: 574, 246, 243, 247, 244},
-		{44, 44},
-	}
-)
-
-var yyDebug = 0
-
-type yyLexer interface {
-	Lex(lval *yySymType) int
-	Error(s string)
-}
-
-type yyLexerEx interface {
-	yyLexer
-	Reduced(rule, state int, lval *yySymType) bool
-}
-
-func yySymName(c int) (s string) {
-	x, ok := yyXLAT[c]
-	if ok {
-		return yySymNames[x]
-	}
-
-	return __yyfmt__.Sprintf("%d", c)
-}
-
-func yylex1(yylex yyLexer, lval *yySymType) (n int) {
-	n = yylex.Lex(lval)
-	if n <= 0 {
-		n = yyEOFCode
-	}
-	if yyDebug >= 3 {
-		__yyfmt__.Printf("\nlex %s(%#x %d), lval: %+v\n", yySymName(n), n, n, lval)
-	}
-	return n
-}
-
-func yyParse(yylex yyLexer) int {
-	const yyError = 196
-
-	yyEx, _ := yylex.(yyLexerEx)
-	var yyn int
-	var yylval yySymType
-	var yyVAL yySymType
-	yyS := make([]yySymType, 200)
-
-	Nerrs := 0   /* number of errors */
-	Errflag := 0 /* error recovery flag */
-	yyerrok := func() {
-		if yyDebug >= 2 {
-			__yyfmt__.Printf("yyerrok()\n")
-		}
-		Errflag = 0
-	}
-	_ = yyerrok
-	yystate := 0
-	yychar := -1
-	var yyxchar int
-	var yyshift int
-	yyp := -1
-	goto yystack
-
-ret0:
-	return 0
-
-ret1:
-	return 1
-
-yystack:
-	/* put a state and value onto the stack */
-	yyp++
-	if yyp >= len(yyS) {
-		nyys := make([]yySymType, len(yyS)*2)
-		copy(nyys, yyS)
-		yyS = nyys
-	}
-	yyS[yyp] = yyVAL
-	yyS[yyp].yys = yystate
-
-yynewstate:
-	if yychar < 0 {
-		yychar = yylex1(yylex, &yylval)
-		var ok bool
-		if yyxchar, ok = yyXLAT[yychar]; !ok {
-			yyxchar = len(yySymNames) // > tab width
-		}
-	}
-	if yyDebug >= 4 {
-		var a []int
-		for _, v := range yyS[:yyp+1] {
-			a = append(a, v.yys)
-		}
-		__yyfmt__.Printf("state stack %v\n", a)
-	}
-	row := yyParseTab[yystate]
-	yyn = 0
-	if yyxchar < len(row) {
-		if yyn = int(row[yyxchar]); yyn != 0 {
-			yyn += yyTabOfs
-		}
-	}
-	switch {
-	case yyn > 0: // shift
-		yychar = -1
-		yyVAL = yylval
-		yystate = yyn
-		yyshift = yyn
-		if yyDebug >= 2 {
-			__yyfmt__.Printf("shift, and goto state %d\n", yystate)
-		}
-		if Errflag > 0 {
-			Errflag--
-		}
-		goto yystack
-	case yyn < 0: // reduce
-	case yystate == 1: // accept
-		if yyDebug >= 2 {
-			__yyfmt__.Println("accept")
-		}
-		goto ret0
-	}
-
-	if yyn == 0 {
-		/* error ... attempt to resume parsing */
-		switch Errflag {
-		case 0: /* brand new error */
-			if yyDebug >= 1 {
-				__yyfmt__.Printf("no action for %s in state %d\n", yySymName(yychar), yystate)
-			}
-			msg, ok := yyXErrors[yyXError{yystate, yyxchar}]
-			if !ok {
-				msg, ok = yyXErrors[yyXError{yystate, -1}]
-			}
-			if !ok && yyshift != 0 {
-				msg, ok = yyXErrors[yyXError{yyshift, yyxchar}]
-			}
-			if !ok {
-				msg, ok = yyXErrors[yyXError{yyshift, -1}]
-			}
-			if !ok || msg == "" {
-				msg = "syntax error"
-			}
-			yylex.Error(msg)
-			Nerrs++
-			fallthrough
-
-		case 1, 2: /* incompletely recovered error ... try again */
-			Errflag = 3
-
-			/* find a state where "error" is a legal shift action */
-			for yyp >= 0 {
-				row := yyParseTab[yyS[yyp].yys]
-				if yyError < len(row) {
-					yyn = int(row[yyError]) + yyTabOfs
-					if yyn > 0 { // hit
-						if yyDebug >= 2 {
-							__yyfmt__.Printf("error recovery found error shift in state %d\n", yyS[yyp].yys)
-						}
-						yystate = yyn /* simulate a shift of "error" */
-						goto yystack
-					}
-				}
-
-				/* the current p has no shift on "error", pop stack */
-				if yyDebug >= 2 {
-					__yyfmt__.Printf("error recovery pops state %d\n", yyS[yyp].yys)
-				}
-				yyp--
-			}
-			/* there is no state on the stack with an error shift ... abort */
-			if yyDebug >= 2 {
-				__yyfmt__.Printf("error recovery failed\n")
-			}
-			goto ret1
-
-		case 3: /* no shift yet; clobber input char */
-			if yyDebug >= 2 {
-				__yyfmt__.Printf("error recovery discards %s\n", yySymName(yychar))
-			}
-			if yychar == yyEOFCode {
-				goto ret1
-			}
-
-			yychar = -1
-			goto yynewstate /* try again in the same state */
-		}
-	}
-
-	r := -yyn
-	x0 := yyReductions[r]
-	x, n := x0.xsym, x0.components
-	yypt := yyp
-	_ = yypt // guard against "declared and not used"
-
-	yyp -= n
-	if yyp+1 >= len(yyS) {
-		nyys := make([]yySymType, len(yyS)*2)
-		copy(nyys, yyS)
-		yyS = nyys
-	}
-	yyVAL = yyS[yyp+1]
-
-	/* consult goto table to find next state */
-	exState := yystate
-	yystate = int(yyParseTab[yyS[yyp].yys][x]) + yyTabOfs
-	/* reduction by production r */
-	if yyDebug >= 2 {
-		__yyfmt__.Printf("reduce using rule %v (%s), and goto state %d\n", r, yySymNames[x], yystate)
-	}
-
-	switch r {
-	case 2:
-		{
-			yylex.(*lexer).expr = expr(yyS[yypt-0].item)
-		}
-	case 3:
-		{
-			yyVAL.item = &alterTableAddStmt{tableName: yyS[yypt-2].item.(string), c: yyS[yypt-0].item.(*col)}
-		}
-	case 4:
-		{
-			yyVAL.item = &alterTableDropColumnStmt{tableName: yyS[yypt-3].item.(string), colName: yyS[yypt-0].item.(string)}
-		}
-	case 5:
-		{
-			yyVAL.item = assignment{colName: yyS[yypt-2].item.(string), expr: expr(yyS[yypt-0].item)}
-		}
-	case 6:
-		{
-			yyVAL.item = append([]assignment{yyS[yypt-2].item.(assignment)}, yyS[yypt-1].item.([]assignment)...)
-		}
-	case 7:
-		{
-			yyVAL.item = []assignment{}
-		}
-	case 8:
-		{
-			yyVAL.item = append(yyS[yypt-2].item.([]assignment), yyS[yypt-0].item.(assignment))
-		}
-	case 9:
-		{
-			yyVAL.item = beginTransactionStmt{}
-		}
-	case 10:
-		{
-			yyVAL.item = yyS[yypt-1].item
-		}
-	case 11:
-		{
-			yyVAL.item = '*'
-		}
-	case 12:
-		{
-			yyVAL.item = []expression{}
-		}
-	case 14:
-		{
-			x := &col{name: yyS[yypt-3].item.(string), typ: yyS[yypt-2].item.(int), constraint: yyS[yypt-1].item.(*constraint)}
-			if yyS[yypt-0].item != nil {
-				x.dflt = expr(yyS[yypt-0].item)
-			}
-			yyVAL.item = x
-		}
-	case 16:
-		{
-			yyVAL.item = append([]string{yyS[yypt-2].item.(string)}, yyS[yypt-1].item.([]string)...)
-		}
-	case 17:
-		{
-			yyVAL.item = []string{}
-		}
-	case 18:
-		{
-			yyVAL.item = append(yyS[yypt-2].item.([]string), yyS[yypt-0].item.(string))
-		}
-	case 19:
-		{
-			yyVAL.item = commitStmt{}
-		}
-	case 20:
-		{
-			yyVAL.item = &constraint{}
-		}
-	case 21:
-		{
-			yyVAL.item = &constraint{expr(yyS[yypt-0].item)}
-		}
-	case 22:
-		{
-			yyVAL.item = (*constraint)(nil)
-		}
-	case 24:
-		{
-			yyVAL.item = &conversion{typ: yyS[yypt-3].item.(int), val: expr(yyS[yypt-1].item)}
-		}
-	case 25:
-		{
-			indexName, tableName, exprList := yyS[yypt-5].item.(string), yyS[yypt-3].item.(string), yyS[yypt-1].item.([]expression)
-			simpleIndex := len(exprList) == 1
-			var columnName string
-			if simpleIndex {
-				expr := exprList[0]
-				switch x := expr.(type) {
-				case *ident:
-					columnName = x.s
-				case *call:
-					if x.f == "id" && len(x.arg) == 0 {
-						columnName = "id()"
-						break
-					}
-
-					simpleIndex = false
-				default:
-					simpleIndex = false
-				}
-			}
-
-			if !simpleIndex {
-				columnName = ""
-			}
-			yyVAL.item = &createIndexStmt{unique: yyS[yypt-8].item.(bool), ifNotExists: yyS[yypt-6].item.(bool), indexName: indexName, tableName: tableName, colName: columnName, exprList: exprList}
-
-			if indexName == tableName || indexName == columnName {
-				yylex.(*lexer).err("index name collision: %s", indexName)
-				return 1
-			}
-
-			if yylex.(*lexer).root {
-				break
-			}
-
-			if isSystemName[indexName] || isSystemName[tableName] {
-				yylex.(*lexer).err("name is used for system tables: %s", indexName)
-				return 1
-			}
-		}
-	case 26:
-		{
-			yyVAL.item = false
-		}
-	case 27:
-		{
-			yyVAL.item = true
-		}
-	case 28:
-		{
-			yyVAL.item = false
-		}
-	case 29:
-		{
-			yyVAL.item = true
-		}
-	case 30:
-		{
-			nm := yyS[yypt-5].item.(string)
-			yyVAL.item = &createTableStmt{tableName: nm, cols: append([]*col{yyS[yypt-3].item.(*col)}, yyS[yypt-2].item.([]*col)...)}
-
-			if yylex.(*lexer).root {
-				break
-			}
-
-			if isSystemName[nm] {
-				yylex.(*lexer).err("name is used for system tables: %s", nm)
-				return 1
-			}
-		}
-	case 31:
-		{
-			nm := yyS[yypt-5].item.(string)
-			yyVAL.item = &createTableStmt{ifNotExists: true, tableName: nm, cols: append([]*col{yyS[yypt-3].item.(*col)}, yyS[yypt-2].item.([]*col)...)}
-
-			if yylex.(*lexer).root {
-				break
-			}
-
-			if isSystemName[nm] {
-				yylex.(*lexer).err("name is used for system tables: %s", nm)
-				return 1
-			}
-		}
-	case 32:
-		{
-			yyVAL.item = []*col{}
-		}
-	case 33:
-		{
-			yyVAL.item = append(yyS[yypt-2].item.([]*col), yyS[yypt-0].item.(*col))
-		}
-	case 34:
-		{
-			yyVAL.item = yyS[yypt-0].item
-		}
-	case 35:
-		{
-			yyVAL.item = nil
-		}
-	case 37:
-		{
-			yyVAL.item = &truncateTableStmt{yyS[yypt-0].item.(string)}
-
-			if yylex.(*lexer).root {
-				break
-			}
-
-			if isSystemName[yyS[yypt-0].item.(string)] {
-				yylex.(*lexer).err("name is used for system tables: %s", yyS[yypt-0].item.(string))
-				return 1
-			}
-		}
-	case 38:
-		{
-			yyVAL.item = &deleteStmt{tableName: yyS[yypt-1].item.(string), where: yyS[yypt-0].item.(*whereRset).expr}
-
-			if yylex.(*lexer).root {
-				break
-			}
-
-			if isSystemName[yyS[yypt-1].item.(string)] {
-				yylex.(*lexer).err("name is used for system tables: %s", yyS[yypt-1].item.(string))
-				return 1
-			}
-		}
-	case 39:
-		{
-			yyVAL.item = &dropIndexStmt{ifExists: yyS[yypt-1].item.(bool), indexName: yyS[yypt-0].item.(string)}
-		}
-	case 40:
-		{
-			yyVAL.item = false
-		}
-	case 41:
-		{
-			yyVAL.item = true
-		}
-	case 42:
-		{
-			nm := yyS[yypt-0].item.(string)
-			yyVAL.item = &dropTableStmt{tableName: nm}
-
-			if yylex.(*lexer).root {
-				break
-			}
-
-			if isSystemName[nm] {
-				yylex.(*lexer).err("name is used for system tables: %s", nm)
-				return 1
-			}
-		}
-	case 43:
-		{
-			nm := yyS[yypt-0].item.(string)
-			yyVAL.item = &dropTableStmt{ifExists: true, tableName: nm}
-
-			if yylex.(*lexer).root {
-				break
-			}
-
-			if isSystemName[nm] {
-				yylex.(*lexer).err("name is used for system tables: %s", nm)
-				return 1
-			}
-		}
-	case 44:
-		{
-			yyVAL.item = nil
-		}
-	case 45:
-		{
-			yyVAL.item = &explainStmt{yyS[yypt-0].item.(stmt)}
-		}
-	case 47:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation(oror, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 50:
-		{
-			yyVAL.item = append([]expression{expr(yyS[yypt-2].item)}, yyS[yypt-1].item.([]expression)...)
-		}
-	case 51:
-		{
-			yyVAL.item = []expression(nil)
-		}
-	case 52:
-		{
-			yyVAL.item = append(yyS[yypt-2].item.([]expression), expr(yyS[yypt-0].item))
-		}
-	case 54:
-		{
-			yyVAL.item = &pIn{expr: yyS[yypt-4].item.(expression), list: yyS[yypt-1].item.([]expression)}
-		}
-	case 55:
-		{
-			yyVAL.item = &pIn{expr: yyS[yypt-5].item.(expression), not: true, list: yyS[yypt-1].item.([]expression)}
-		}
-	case 56:
-		{
-			yyVAL.item = &pIn{expr: yyS[yypt-5].item.(expression), sel: yyS[yypt-2].item.(*selectStmt)}
-		}
-	case 57:
-		{
-			yyVAL.item = &pIn{expr: yyS[yypt-6].item.(expression), not: true, sel: yyS[yypt-2].item.(*selectStmt)}
-		}
-	case 58:
-		{
-			var err error
-			if yyVAL.item, err = newBetween(yyS[yypt-4].item, yyS[yypt-2].item, yyS[yypt-0].item, false); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 59:
-		{
-			var err error
-			if yyVAL.item, err = newBetween(yyS[yypt-5].item, yyS[yypt-2].item, yyS[yypt-0].item, true); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 60:
-		{
-			yyVAL.item = &isNull{expr: yyS[yypt-2].item.(expression)}
-		}
-	case 61:
-		{
-			yyVAL.item = &isNull{expr: yyS[yypt-3].item.(expression), not: true}
-		}
-	case 63:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation(ge, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 64:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation('>', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 65:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation(le, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 66:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation('<', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 67:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation(neq, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 68:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation(eq, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 69:
-		{
-			yyVAL.item = &pLike{expr: yyS[yypt-2].item.(expression), pattern: yyS[yypt-0].item.(expression)}
-		}
-	case 70:
-		{
-			expr, name := expr(yyS[yypt-1].item), yyS[yypt-0].item.(string)
-			if name == "" {
-				s, ok := expr.(*ident)
-				if ok {
-					name = s.s
-				}
-			}
-			yyVAL.item = &fld{expr: expr, name: name}
-		}
-	case 71:
-		{
-			yyVAL.item = ""
-		}
-	case 72:
-		{
-			yyVAL.item = yyS[yypt-0].item
-		}
-	case 73:
-		{
-			yyVAL.item = []*fld{yyS[yypt-0].item.(*fld)}
-		}
-	case 74:
-		{
-			l, f := yyS[yypt-2].item.([]*fld), yyS[yypt-0].item.(*fld)
-			if f.name != "" {
-				if f := findFld(l, f.name); f != nil {
-					yylex.(*lexer).err("duplicate field name %q", f.name)
-					return 1
-				}
-			}
-
-			yyVAL.item = append(yyS[yypt-2].item.([]*fld), yyS[yypt-0].item.(*fld))
-		}
-	case 75:
-		{
-			yyVAL.item = &groupByRset{colNames: yyS[yypt-0].item.([]string)}
-		}
-	case 76:
-		{
-			yyVAL.item = yyS[yypt-1].item
-		}
-	case 77:
-		{
-			yyVAL.item = &insertIntoStmt{tableName: yyS[yypt-7].item.(string), colNames: yyS[yypt-6].item.([]string), lists: append([][]expression{yyS[yypt-3].item.([]expression)}, yyS[yypt-1].item.([][]expression)...)}
-
-			if yylex.(*lexer).root {
-				break
-			}
-
-			if isSystemName[yyS[yypt-7].item.(string)] {
-				yylex.(*lexer).err("name is used for system tables: %s", yyS[yypt-7].item.(string))
-				return 1
-			}
-		}
-	case 78:
-		{
-			yyVAL.item = &insertIntoStmt{tableName: yyS[yypt-2].item.(string), colNames: yyS[yypt-1].item.([]string), sel: yyS[yypt-0].item.(*selectStmt)}
-		}
-	case 79:
-		{
-			yyVAL.item = []string{}
-		}
-	case 80:
-		{
-			yyVAL.item = yyS[yypt-1].item
-		}
-	case 81:
-		{
-			yyVAL.item = [][]expression{}
-		}
-	case 82:
-		{
-			yyVAL.item = append(yyS[yypt-4].item.([][]expression), yyS[yypt-1].item.([]expression))
-		}
-	case 90:
-		{
-			yyVAL.item = value{yyS[yypt-0].item}
-		}
-	case 91:
-		{
-			n := yyS[yypt-0].item.(int)
-			yyVAL.item = parameter{n}
-			l := yylex.(*lexer)
-			l.params = mathutil.Max(l.params, n)
-			if n == 0 {
-				l.err("parameter number must be non zero")
-				return 1
-			}
-		}
-	case 92:
-		{
-			yyVAL.item = &ident{yyS[yypt-0].item.(string)}
-		}
-	case 93:
-		{
-			yyVAL.item = &pexpr{expr: expr(yyS[yypt-1].item)}
-		}
-	case 94:
-		{
-			yyVAL.item = &orderByRset{by: yyS[yypt-1].item.([]expression), asc: yyS[yypt-0].item.(bool)}
-		}
-	case 95:
-		{
-			yyVAL.item = true // ASC by default
-		}
-	case 96:
-		{
-			yyVAL.item = true
-		}
-	case 97:
-		{
-			yyVAL.item = false
-		}
-	case 100:
-		{
-			var err error
-			if yyVAL.item, err = newIndex(yyS[yypt-1].item.(expression), expr(yyS[yypt-0].item)); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 101:
-		{
-			var err error
-			s := yyS[yypt-0].item.([2]*expression)
-			if yyVAL.item, err = newSlice(yyS[yypt-1].item.(expression), s[0], s[1]); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 102:
-		{
-			x := yylex.(*lexer)
-			f, ok := yyS[yypt-1].item.(*ident)
-			if !ok {
-				x.err("expected identifier or qualified identifier")
-				return 1
-			}
-
-			if r, ok := yyS[yypt-0].item.(rune); ok {
-				if f.isQualified() || f.s != "count" || r != '*' {
-					x.err(fmt.Sprintf("invalid expression %s(%c)", f, r))
-					return 1
-				}
-
-				yyS[yypt-0].item = []expression(nil)
-			}
-
-			var err error
-			var agg bool
-			if yyVAL.item, agg, err = newCall(f.s, yyS[yypt-0].item.([]expression)); err != nil {
-				x.err("%v", err)
-				return 1
-			}
-			if n := len(x.agg); n > 0 {
-				x.agg[n-1] = x.agg[n-1] || agg
-			}
-		}
-	case 104:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation('^', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 105:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation('|', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 106:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation('-', yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 107:
-		{
-			var err error
-			yyVAL.item, err = newBinaryOperation('+', yyS[yypt-2].item, yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 109:
-		{
-			var err error
-			yyVAL.item, err = newBinaryOperation(andnot, yyS[yypt-2].item, yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 110:
-		{
-			var err error
-			yyVAL.item, err = newBinaryOperation('&', yyS[yypt-2].item, yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 111:
-		{
-			var err error
-			yyVAL.item, err = newBinaryOperation(lsh, yyS[yypt-2].item, yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 112:
-		{
-			var err error
-			yyVAL.item, err = newBinaryOperation(rsh, yyS[yypt-2].item, yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 113:
-		{
-			var err error
-			yyVAL.item, err = newBinaryOperation('%', yyS[yypt-2].item, yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 114:
-		{
-			var err error
-			yyVAL.item, err = newBinaryOperation('/', yyS[yypt-2].item, yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 115:
-		{
-			var err error
-			yyVAL.item, err = newBinaryOperation('*', yyS[yypt-2].item, yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 117:
-		{
-			yyVAL.item = fmt.Sprintf("%s.%s", yyS[yypt-2].item.(string), yyS[yypt-0].item.(string))
-		}
-	case 118:
-		{
-			yyVAL.item = []interface{}{yyS[yypt-1].item, yyS[yypt-0].item}
-		}
-	case 120:
-		{
-			yyVAL.item = yyS[yypt-2].item
-		}
-	case 123:
-		{
-			yyVAL.item = ""
-		}
-	case 124:
-		{
-			yyVAL.item = yyS[yypt-0].item
-		}
-	case 125:
-		{
-			yyVAL.list = []interface{}{yyS[yypt-0].item}
-		}
-	case 126:
-		{
-			yyVAL.list = append(yyS[yypt-2].list, yyS[yypt-0].item)
-		}
-	case 127:
-		{
-			yyVAL.item = rollbackStmt{}
-		}
-	case 128:
-		{
-			yyVAL.item = leftJoin
-		}
-	case 129:
-		{
-			yyVAL.item = rightJoin
-		}
-	case 130:
-		{
-			yyVAL.item = fullJoin
-		}
-	case 131:
-		{
-			yyVAL.item = nil
-		}
-	case 133:
-		{
-			yyVAL.item = []interface{}{yyS[yypt-5].item, yyS[yypt-2].item, yyS[yypt-0].item}
-		}
-	case 134:
-		{
-			yyVAL.item = nil
-		}
-	case 136:
-		{
-			x := yylex.(*lexer)
-			n := len(x.agg)
-			join := &joinRset{sources: yyS[yypt-7].list}
-			if o := yyS[yypt-5].item; o != nil {
-				o := o.([]interface{})
-				join.typ = o[0].(int)
-				join.sources = append(join.sources, o[1].([]interface{}))
-				join.on = o[2].(expression)
-			}
-			yyVAL.item = &selectStmt{
-				distinct:      yyS[yypt-10].item.(bool),
-				flds:          yyS[yypt-9].item.([]*fld),
-				from:          join,
-				hasAggregates: x.agg[n-1],
-				where:         yyS[yypt-4].item.(*whereRset),
-				group:         yyS[yypt-3].item.(*groupByRset),
-				order:         yyS[yypt-2].item.(*orderByRset),
-				limit:         yyS[yypt-1].item.(*limitRset),
-				offset:        yyS[yypt-0].item.(*offsetRset),
-			}
-			x.agg = x.agg[:n-1]
-		}
-	case 137:
-		{
-			yyVAL.item = (*limitRset)(nil)
-		}
-	case 138:
-		{
-			yyVAL.item = &limitRset{expr: expr(yyS[yypt-0].item)}
-		}
-	case 139:
-		{
-			yyVAL.item = (*offsetRset)(nil)
-		}
-	case 140:
-		{
-			yyVAL.item = &offsetRset{expr: expr(yyS[yypt-0].item)}
-		}
-	case 141:
-		{
-			yyVAL.item = false
-		}
-	case 142:
-		{
-			yyVAL.item = true
-		}
-	case 143:
-		{
-			yyVAL.item = []*fld{}
-		}
-	case 144:
-		{
-			yyVAL.item = yyS[yypt-0].item
-		}
-	case 145:
-		{
-			yyVAL.item = yyS[yypt-1].item
-		}
-	case 146:
-		{
-			yyVAL.item = (*whereRset)(nil)
-		}
-	case 148:
-		{
-			yyVAL.item = (*groupByRset)(nil)
-		}
-	case 150:
-		{
-			yyVAL.item = (*orderByRset)(nil)
-		}
-	case 152:
-		{
-			yyVAL.item = [2]*expression{nil, nil}
-		}
-	case 153:
-		{
-			hi := expr(yyS[yypt-1].item)
-			yyVAL.item = [2]*expression{nil, &hi}
-		}
-	case 154:
-		{
-			lo := expr(yyS[yypt-2].item)
-			yyVAL.item = [2]*expression{&lo, nil}
-		}
-	case 155:
-		{
-			lo := expr(yyS[yypt-3].item)
-			hi := expr(yyS[yypt-1].item)
-			yyVAL.item = [2]*expression{&lo, &hi}
-		}
-	case 171:
-		{
-			if yyS[yypt-0].item != nil {
-				yylex.(*lexer).list = []stmt{yyS[yypt-0].item.(stmt)}
-			}
-		}
-	case 172:
-		{
-			if yyS[yypt-0].item != nil {
-				yylex.(*lexer).list = append(yylex.(*lexer).list, yyS[yypt-0].item.(stmt))
-			}
-		}
-	case 175:
-		{
-			var err error
-			if yyVAL.item, err = newBinaryOperation(andand, yyS[yypt-2].item, yyS[yypt-0].item); err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 178:
-		{
-			yyVAL.item = &truncateTableStmt{tableName: yyS[yypt-0].item.(string)}
-		}
-	case 203:
-		{
-			var expr expression
-			if w := yyS[yypt-0].item; w != nil {
-				expr = w.(*whereRset).expr
-			}
-			yyVAL.item = &updateStmt{tableName: yyS[yypt-3].item.(string), list: yyS[yypt-1].item.([]assignment), where: expr}
-
-			if yylex.(*lexer).root {
-				break
-			}
-
-			if isSystemName[yyS[yypt-3].item.(string)] {
-				yylex.(*lexer).err("name is used for system tables: %s", yyS[yypt-3].item.(string))
-				return 1
-			}
-		}
-	case 204:
-		{
-			yyVAL.item = nil
-		}
-	case 207:
-		{
-			var err error
-			yyVAL.item, err = newUnaryOperation('^', yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 208:
-		{
-			var err error
-			yyVAL.item, err = newUnaryOperation('!', yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 209:
-		{
-			var err error
-			yyVAL.item, err = newUnaryOperation('-', yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 210:
-		{
-			var err error
-			yyVAL.item, err = newUnaryOperation('+', yyS[yypt-0].item)
-			if err != nil {
-				yylex.(*lexer).err("%v", err)
-				return 1
-			}
-		}
-	case 211:
-		{
-			yyVAL.item = &whereRset{expr: expr(yyS[yypt-0].item)}
-		}
-
-	}
-
-	if yyEx != nil && yyEx.Reduced(r, exState, &yyVAL) {
-		return -1
-	}
-	goto yystack /* stack new state and value */
-}
-
-func expr(v interface{}) expression {
-	e := v.(expression)
-	for {
-		x, ok := e.(*pexpr)
-		if !ok {
-			return e
-		}
-		e = x.expr
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/parser.y b/Godeps/_workspace/src/github.com/cznic/ql/parser.y
deleted file mode 100644
index 979c3289aa..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/parser.y
+++ /dev/null
@@ -1,1337 +0,0 @@
-%{
-// Copyright (c) 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-		
-// Inital yacc source generated by ebnf2y[1]
-// at 2013-10-04 23:10:47.861401015 +0200 CEST
-//
-//  $ ebnf2y -o ql.y -oe ql.ebnf -start StatementList -pkg ql -p _
-// 
-//   [1]: http://github.com/cznic/ebnf2y
-
-package ql
-
-import (
-	"fmt"
-
-	"github.com/cznic/mathutil"
-)
-
-%}
-
-%union {
-	line int
-	col  int
-	item interface{}
-	list []interface{}
-}
-
-%token	<item>
-
-	/*yy:token "1.%d"   */	floatLit	"floating-point literal"
-	/*yy:token "%c"     */	identifier	"identifier"
-	/*yy:token "%di"    */	imaginaryLit	"imaginary literal"
-	/*yy:token "%d"     */	intLit		"integer literal"
-	/*yy:token "$%d"    */	qlParam		"QL parameter"
-	/*yy:token "\"%c\"" */	stringLit	"string literal"
-
-	add		"ADD"
-	alter		"ALTER"
-	and 		"AND"
-	andand 		"&&"
-	andnot		"&^"
-	as		"AS"
-	asc		"ASC"
-	begin		"BEGIN"
-	between		"BETWEEN"
-	bigIntType	"bigint"
-	bigRatType	"bigrat"
-	blobType	"blob"
-	boolType	"bool"
-	by		"BY"
-	byteType	"byte"
-	column		"COLUMN"
-	commit		"COMMIT"
-	complex128Type	"complex128"
-	complex64Type	"complex64"
-	create		"CREATE"
-	defaultKwd	"DEFAULT"
-	deleteKwd	"DELETE"
-	desc		"DESC"
-	distinct	"DISTINCT"
-	drop		"DROP"
-	durationType	"duration"
-	eq		"=="
-	exists		"EXISTS"
-	explain		"EXPLAIN"
-	falseKwd	"false"
-	floatType	"float"
-	float32Type	"float32"
-	float64Type	"float64"
-	from		"FROM"
-	full		"FULL"
-	ge		">="
-	group		"GROUP"
-	ifKwd		"IF"
-	in		"IN"
-	index		"INDEX"
-	insert		"INSERT"
-	intType		"int"
-	int16Type	"int16"
-	int32Type	"int32"
-	int64Type	"int64"
-	int8Type	"int8"
-	into		"INTO"
-	is		"IS"
-	join		"JOIN"
-	le		"<="
-	left		"LEFT"
-	like		"LIKE"
-	limit		"LIMIT"
-	lsh 		"<<"
-	neq		"!="
-	not		"NOT"
-	null		"NULL"
-	offset		"OFFSET"
-	on		"ON"
-	or		"OR"
-	order		"ORDER"
-	oror		"||"
-	outer		"OUTER"
-	right		"RIGHT"
-	rollback	"ROLLBACK"
-	rsh		">>"
-	runeType	"rune"
-	selectKwd	"SELECT"
-	set		"SET"
-	stringType	"string"
-	tableKwd	"TABLE"
-	timeType	"time"
-	transaction	"TRANSACTION"
-	trueKwd		"true"
-	truncate	"TRUNCATE"
-	uintType	"uint"
-	uint16Type	"uint16"
-	uint32Type	"uint32"
-	uint64Type	"uint64"
-	uint8Type	"uint8",
-	unique		"UNIQUE"
-	update		"UPDATE"
-	values		"VALUES"
-	where		"WHERE"
-
-	parseExpression	"parse expression prefix"
-
-%type	<item>
-	AlterTableStmt		"ALTER TABLE statement"
-	Assignment		"assignment"
-	AssignmentList		"assignment list"
-	AssignmentList1		"assignment list optional trailing comma"
-	BeginTransactionStmt	"BEGIN TRANSACTION statement"
-	Call			"function call"
-	Call1			"function call optional argument list"
-	ColumnDef		"table column definition"
-	ColumnName		"column name"
-	ColumnNameList		"column name list"
-	ColumnNameList1		"column name list with optional trailing comma"
-	CommaOpt		"optional comma"
-	CommitStmt		"COMMIT statement"
-	Constraint		"column value constraint"
-	ConstraintOpt		"optional column value constraint"
-	Conversion		"conversion"
-	CreateIndexStmt		"CREATE INDEX statement"
-	CreateIndexIfNotExists	"CREATE INDEX statement optional IF NOT EXISTS cluse"
-	CreateIndexStmtUnique	"CREATE INDEX optional UNIQUE clause"
-	CreateTableStmt		"CREATE TABLE statement"
-	CreateTableStmt1	"CREATE TABLE statement colum definition list"
-	Default			"DEFAULT clause"
-	DefaultOpt		"optional DEFAULT clause"
-	DeleteFromStmt		"DELETE FROM statement"
-	DropIndexStmt		"DROP INDEX statement"
-	DropIndexIfExists	"DROP INDEX statement optional IF EXISTS clause"
-	DropTableStmt		"DROP TABLE statement"
-	EmptyStmt		"empty statement"
-	ExplainStmt		"EXPLAIN statement"
-	Expression		"expression"
-	ExpressionList		"expression list"
-	ExpressionList1		"expression list expression"
-	Factor			"expression factor"
-	Factor1			"binary expression factor"
-	Field			"field expression"
-	Field1			"field expression optional AS clause"
-	FieldList		"field expression list"
-	GroupByClause		"GROUP BY clause"
-	Index			"string index"
-	InsertIntoStmt		"INSERT INTO statement"
-	InsertIntoStmt1		"INSERT INTO statement optional column list clause"
-	InsertIntoStmt2		"INSERT INTO statement optional values list"
-	JoinClause		"SELECT statement JOIN clause"
-	JoinClauseOpt		"SELECT statement optional JOIN clause"
-	JoinType		"join type"
-	Literal			"literal value"
-	logAnd			"logical and operator"
-	logOr			"logical or operator"
-	Operand			"operand"
-	OrderBy			"ORDER BY clause"
-	OrderBy1		"ORDER BY clause optional collation specification"
-	OuterOpt		"optional OUTER clause"
-	QualifiedIdent		"qualified identifier"
-	PrimaryExpression	"primary expression"
-	PrimaryFactor		"primary expression factor"
-	PrimaryTerm		"primary expression term"
-	RecordSet		"record set"
-	RecordSet1		"record set name or parenthesized SELECTECT statement"
-	RecordSet2		"record set optional AS clause"
-	RollbackStmt		"ROLLBACK statement"
-	SelectStmt		"SELECT statement"
-	SelectStmtDistinct	"SELECT statement optional DISTINCT clause"
-	SelectStmtFieldList	"SELECT statement field list"
-	SelectStmtLimit		"SELECT statement optional LIMIT clause"
-	SelectStmtWhere		"SELECT statement optional WHERE clause"
-	SelectStmtGroup		"SELECT statement optional GROUP BY clause"
-	SelectStmtOffset	"SELECT statement optional OFFSET clause"
-	SelectStmtOrder		"SELECT statement optional ORDER BY clause"
-	Slice			"string slice"
-	Statement		"statement"
-	StatementList		"statement list"
-	TableName		"table name"
-	Term			"expression term"
-	TruncateTableStmt	"TRANSACTION TABLE statement"
-	Type			"type"
-	UnaryExpr		"unary expression"
-	UpdateStmt		"UPDATE statement"
-	UpdateStmt1		"UPDATE statement optional WHERE clause"
-	WhereClause		"WHERE clause"
-
-%type	<list>	RecordSetList
-
-%start	Start
-
-%%
-
-Start:
-	StatementList
-|	parseExpression Expression
-	{
-		yylex.(*lexer).expr = expr($2)
-	}
-
-AlterTableStmt:
-	"ALTER" "TABLE" TableName "ADD" ColumnDef
-	{
-		$$ = &alterTableAddStmt{tableName: $3.(string), c: $5.(*col)}
-	}
-|	"ALTER" "TABLE" TableName "DROP" "COLUMN" ColumnName
-	{
-		$$ = &alterTableDropColumnStmt{tableName: $3.(string), colName: $6.(string)}
-	}
-
-Assignment:
-	ColumnName '=' Expression
-	{
-		$$ = assignment{colName: $1.(string), expr: expr($3)}
-	}
-
-AssignmentList:
-	Assignment AssignmentList1 CommaOpt
-	{
-		$$ = append([]assignment{$1.(assignment)}, $2.([]assignment)...)
-	}
-
-AssignmentList1:
-	/* EMPTY */
-	{
-		$$ = []assignment{}
-	}
-|	AssignmentList1 ',' Assignment
-	{
-		$$ = append($1.([]assignment), $3.(assignment))
-	}
-
-BeginTransactionStmt:
-	"BEGIN" "TRANSACTION"
-	{
-		$$ = beginTransactionStmt{}
-	}
-
-Call:
-	'(' Call1 ')'
-	{
-		$$ = $2
-	}
-|	'(' '*' ')'
-	{
-		$<item>$ = '*'
-	}
-
-Call1:
-	/* EMPTY */
-	{
-		$$ = []expression{}
-	}
-|	ExpressionList
-
-ColumnDef:
-	ColumnName Type ConstraintOpt DefaultOpt
-	{
-		x := &col{name: $1.(string), typ: $2.(int), constraint: $3.(*constraint)}
-		if $4 != nil {
-			x.dflt = expr($4)
-		}
-		$$ = x
-	}
-
-ColumnName:
-	identifier
-
-ColumnNameList:
-	ColumnName ColumnNameList1 CommaOpt
-	{
-		$$ = append([]string{$1.(string)}, $2.([]string)...)
-	}
-
-ColumnNameList1:
-	/* EMPTY */
-	{
-		$$ = []string{}
-	}
-|	ColumnNameList1 ',' ColumnName
-	{
-		$$ = append($1.([]string), $3.(string))
-	}
-
-CommitStmt:
-	"COMMIT"
-	{
-		$$ = commitStmt{}
-	}
-
-Constraint:
-	"NOT" "NULL"
-	{
-		$$ = &constraint{}
-	}
-|	Expression
-	{
-		$$ = &constraint{expr($1)}
-	}
-
-ConstraintOpt:
-	{
-		$$ = (*constraint)(nil)
-	}
-|	Constraint
-
-Conversion:
-	Type '(' Expression ')'
-	{
-		$$ = &conversion{typ: $1.(int), val: expr($3)}
-	}
-
-CreateIndexStmt:
-	"CREATE" CreateIndexStmtUnique "INDEX" CreateIndexIfNotExists identifier "ON" identifier '(' ExpressionList ')'
-	{
-		indexName, tableName, exprList := $5.(string), $7.(string), $9.([]expression)
-		simpleIndex := len(exprList) == 1
-		var columnName string
-		if simpleIndex {
-			expr := exprList[0]
-			switch x := expr.(type) {
-			case *ident:
-				columnName = x.s
-			case *call:
-				if x.f == "id" && len(x.arg) == 0 {
-					columnName = "id()"
-					break
-				}
-
-				simpleIndex = false
-			default:
-				simpleIndex = false
-			}
-		}
-		
-		if !simpleIndex {
-			columnName = ""
-		}
-		$$ = &createIndexStmt{unique: $2.(bool), ifNotExists: $4.(bool), indexName: indexName, tableName: tableName, colName: columnName, exprList: exprList}
-
-		if indexName == tableName || indexName == columnName {
-			yylex.(*lexer).err("index name collision: %s", indexName)
-			return 1
-		}
-
-		if yylex.(*lexer).root {
-			break
-		}
-
-		if isSystemName[indexName] || isSystemName[tableName] {
-			yylex.(*lexer).err("name is used for system tables: %s", indexName)
-			return 1
-		}
-	}
-
-CreateIndexIfNotExists:
-	{
-		$$ = false
-	}
-|	"IF" "NOT" "EXISTS"
-	{
-		$$ = true
-	}
-
-CreateIndexStmtUnique:
-	{
-		$$ = false
-	}
-|	"UNIQUE"
-	{
-		$$ = true
-	}
-
-CreateTableStmt:
-	"CREATE" "TABLE" TableName '(' ColumnDef CreateTableStmt1 CommaOpt ')'
-	{
-		nm := $3.(string)
-		$$ = &createTableStmt{tableName: nm, cols: append([]*col{$5.(*col)}, $6.([]*col)...)}
-
-		if yylex.(*lexer).root {
-			break
-		}
-
-		if isSystemName[nm] {
-			yylex.(*lexer).err("name is used for system tables: %s", nm)
-			return 1
-		}
-	}
-|	"CREATE" "TABLE" "IF" "NOT" "EXISTS" TableName '(' ColumnDef CreateTableStmt1 CommaOpt ')'
-	{
-		nm := $6.(string)
-		$$ = &createTableStmt{ifNotExists: true, tableName: nm, cols: append([]*col{$8.(*col)}, $9.([]*col)...)}
-
-		if yylex.(*lexer).root {
-			break
-		}
-
-		if isSystemName[nm] {
-			yylex.(*lexer).err("name is used for system tables: %s", nm)
-			return 1
-		}
-	}
-
-CreateTableStmt1:
-	/* EMPTY */
-	{
-		$$ = []*col{}
-	}
-|	CreateTableStmt1 ',' ColumnDef
-	{
-		$$ = append($1.([]*col), $3.(*col))
-	}
-
-Default:
-	"DEFAULT" Expression
-	{
-		$$ = $2
-	}
-
-DefaultOpt:
-	{
-		$$ = nil
-	}
-|	Default
-
-DeleteFromStmt:
-	"DELETE" "FROM" TableName
-	{
-		$$ = &truncateTableStmt{$3.(string)}
-
-		if yylex.(*lexer).root {
-			break
-		}
-
-		if isSystemName[$3.(string)] {
-			yylex.(*lexer).err("name is used for system tables: %s", $3.(string))
-			return 1
-		}
-	}
-|	"DELETE" "FROM" TableName WhereClause
-	{
-		$$ = &deleteStmt{tableName: $3.(string), where: $4.(*whereRset).expr}
-
-		if yylex.(*lexer).root {
-			break
-		}
-
-		if isSystemName[$3.(string)] {
-			yylex.(*lexer).err("name is used for system tables: %s", $3.(string))
-			return 1
-		}
-	}
-
-DropIndexStmt:
-	"DROP" "INDEX" DropIndexIfExists identifier
-	{
-		$$ = &dropIndexStmt{ifExists: $3.(bool), indexName: $4.(string)}
-	}
-
-DropIndexIfExists:
-	{
-		$$ = false
-	}
-|	"IF" "EXISTS"
-	{
-		$$ = true
-	}
-
-DropTableStmt:
-	"DROP" "TABLE" TableName
-	{
-		nm := $3.(string)
-		$$ = &dropTableStmt{tableName: nm}
-
-		if yylex.(*lexer).root {
-			break
-		}
-
-		if isSystemName[nm] {
-			yylex.(*lexer).err("name is used for system tables: %s", nm)
-			return 1
-		}
-	}
-|	"DROP" "TABLE" "IF" "EXISTS" TableName
-	{
-		nm := $5.(string)
-		$$ = &dropTableStmt{ifExists: true, tableName: nm}
-
-		if yylex.(*lexer).root {
-			break
-		}
-
-		if isSystemName[nm] {
-			yylex.(*lexer).err("name is used for system tables: %s", nm)
-			return 1
-		}
-	}
-
-EmptyStmt:
-	/* EMPTY */
-	{
-		$$ = nil
-	}
-
-ExplainStmt:
-	"EXPLAIN" Statement
-	{
-		$$ = &explainStmt{$2.(stmt)}
-	}
-
-Expression:
-	Term
-|	Expression logOr Term
-	{
-		var err error
-		if $$, err = newBinaryOperation(oror, $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-
-logOr:
-	"||"
-	{
-	}
-|	"OR"
-	{
-	}
-
-ExpressionList:
-	Expression ExpressionList1 CommaOpt
-	{
-		$$ = append([]expression{expr($1)}, $2.([]expression)...)
-	}
-
-ExpressionList1:
-	/* EMPTY */
-	{
-		$$ = []expression(nil)
-	}
-|	ExpressionList1 ',' Expression
-	{
-		$$ = append($1.([]expression), expr($3))
-	}
-
-Factor:
-	Factor1
-|       Factor1 "IN" '(' ExpressionList ')'
-        {
-		$$ = &pIn{expr: $1.(expression), list: $4.([]expression)}
-        }
-|       Factor1 "NOT" "IN" '(' ExpressionList ')'
-        {
-		$$ = &pIn{expr: $1.(expression), not: true, list: $5.([]expression)}
-        }
-|       Factor1 "IN" '(' SelectStmt semiOpt ')'
-        {
-		$$ = &pIn{expr: $1.(expression), sel: $4.(*selectStmt)}
-        }
-|       Factor1 "NOT" "IN" '(' SelectStmt semiOpt ')'
-        {
-		$$ = &pIn{expr: $1.(expression), not: true, sel: $5.(*selectStmt)}
-        }
-|       Factor1 "BETWEEN" PrimaryFactor "AND" PrimaryFactor
-        {
-		var err error
-		if $$, err = newBetween($1, $3, $5, false); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-        }
-|       Factor1 "NOT" "BETWEEN" PrimaryFactor "AND" PrimaryFactor
-        {
-		var err error
-		if $$, err = newBetween($1, $4, $6, true); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-        }
-|       Factor1 "IS" "NULL"
-        {
-		$$ = &isNull{expr: $1.(expression)}
-        }
-|       Factor1 "IS" "NOT" "NULL"
-        {
-		$$ = &isNull{expr: $1.(expression), not: true}
-        }
-
-Factor1:
-        PrimaryFactor
-|       Factor1 ">=" PrimaryFactor
-        {
-		var err error
-		if $$, err = newBinaryOperation(ge, $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-        }
-|       Factor1 '>' PrimaryFactor
-        {
-		var err error
-		if $$, err = newBinaryOperation('>', $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-        }
-|       Factor1 "<=" PrimaryFactor
-        {
-		var err error
-		if $$, err = newBinaryOperation(le, $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-        }
-|       Factor1 '<' PrimaryFactor
-        {
-		var err error
-		if $$, err = newBinaryOperation('<', $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-        }
-|       Factor1 "!=" PrimaryFactor
-        {
-		var err error
-		if $$, err = newBinaryOperation(neq, $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-        }
-|       Factor1 "==" PrimaryFactor
-        {
-		var err error
-		if $$, err = newBinaryOperation(eq, $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-        }
-|	Factor1 "LIKE" PrimaryFactor
-	{
-		$$ = &pLike{expr: $1.(expression), pattern: $3.(expression)}
-	}
-
-Field:
-	Expression Field1
-	{
-		expr, name := expr($1), $2.(string)
-		if name == "" {
-			s, ok := expr.(*ident)
-			if ok {
-				name = s.s
-			}
-		}
-		$$ = &fld{expr: expr, name: name}
-	}
-
-Field1:
-	/* EMPTY */
-	{
-		$$ = ""
-	}
-|	"AS" identifier
-	{
-		$$ = $2
-	}
-
-FieldList:
-	Field
-	{
-		$$ = []*fld{$1.(*fld)}
-	}
-|	FieldList ',' Field
-	{
-		l, f := $1.([]*fld), $3.(*fld)
-		if f.name != "" {
-			if f := findFld(l, f.name); f != nil {
-				yylex.(*lexer).err("duplicate field name %q", f.name)
-				return 1
-			}
-		}
-
-		$$ = append($1.([]*fld), $3.(*fld))
-	}
-
-GroupByClause:
-	"GROUP" "BY" ColumnNameList
-	{
-		$$ = &groupByRset{colNames: $3.([]string)}
-	}
-
-Index:
-	'[' Expression ']'
-	{
-		$$ = $2
-	}
-
-InsertIntoStmt:
-	"INSERT" "INTO" TableName InsertIntoStmt1 "VALUES" '(' ExpressionList ')' InsertIntoStmt2 CommaOpt
-	{
-		$$ = &insertIntoStmt{tableName: $3.(string), colNames: $4.([]string), lists: append([][]expression{$7.([]expression)}, $9.([][]expression)...)}
-
-		if yylex.(*lexer).root {
-			break
-		}
-
-		if isSystemName[$3.(string)] {
-			yylex.(*lexer).err("name is used for system tables: %s", $3.(string))
-			return 1
-		}
-	}
-|	"INSERT" "INTO" TableName InsertIntoStmt1 SelectStmt
-	{
-		$$ = &insertIntoStmt{tableName: $3.(string), colNames: $4.([]string), sel: $5.(*selectStmt)}
-	}
-
-InsertIntoStmt1:
-	/* EMPTY */
-	{
-		$$ = []string{}
-	}
-|	'(' ColumnNameList ')'
-	{
-		$$ = $2
-	}
-
-InsertIntoStmt2:
-	/* EMPTY */
-	{
-		$$ = [][]expression{}
-	}
-|	InsertIntoStmt2 ',' '(' ExpressionList ')'
-	{
-		$$ = append($1.([][]expression), $4.([]expression))
-	}
-
-Literal:
-	"false"
-|	"NULL"
-|	"true"
-|	floatLit
-|	imaginaryLit
-|	intLit
-|	stringLit
-
-Operand:
-	Literal
-	{
-		$$ = value{$1}
-	}
-|	qlParam
-	{
-		n := $1.(int)
-		$$ = parameter{n}
-		l := yylex.(*lexer)
-		l.params = mathutil.Max(l.params, n)
-		if n == 0 {
-			l.err("parameter number must be non zero")
-			return 1
-		}
-	}
-|	QualifiedIdent
-	{
-		$$ = &ident{$1.(string)}
-	}
-|	'(' Expression ')'
-	{
-		$$ = &pexpr{expr: expr($2)}
-	}
-
-OrderBy:
-	"ORDER" "BY" ExpressionList OrderBy1
-	{
-		$$ = &orderByRset{by: $3.([]expression), asc: $4.(bool)}
-	}
-
-OrderBy1:
-	/* EMPTY */
-	{
-		$$ = true // ASC by default
-	}
-|	"ASC"
-	{
-		$$ = true
-	}
-|	"DESC"
-	{
-		$$ = false
-	}
-
-PrimaryExpression:
-	Operand
-|	Conversion
-|	PrimaryExpression Index
-	{
-		var err error
-		if $$, err = newIndex($1.(expression), expr($2)); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryExpression Slice
-	{
-		var err error
-		s := $2.([2]*expression)
-		if $$, err = newSlice($1.(expression), s[0], s[1]); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryExpression Call
-	{
-		x := yylex.(*lexer)
-		f, ok := $1.(*ident)
-		if !ok {
-			x.err("expected identifier or qualified identifier")
-			return 1
-		}
-
-		if r, ok := $2.(rune); ok {
-			if f.isQualified() || f.s != "count" || r != '*' {
-				x.err(fmt.Sprintf("invalid expression %s(%c)", f, r))
-				return 1
-			}
-
-			$2 = []expression(nil)
-		}
-
-		var err error
-		var agg bool
-		if $$, agg, err = newCall(f.s, $2.([]expression)); err != nil {
-			x.err("%v", err)
-			return 1
-		}
-		if n := len(x.agg); n > 0 {
-			x.agg[n-1] = x.agg[n-1] || agg
-		}
-	}
-
-PrimaryFactor:
-	PrimaryTerm
-|	PrimaryFactor '^' PrimaryTerm
-	{
-		var err error
-		if $$, err = newBinaryOperation('^', $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryFactor '|' PrimaryTerm
-	{
-		var err error
-		if $$, err = newBinaryOperation('|', $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryFactor '-' PrimaryTerm
-	{
-		var err error
-		if $$, err = newBinaryOperation('-', $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryFactor '+' PrimaryTerm
-	{
-		var err error
-		$$, err = newBinaryOperation('+', $1, $3)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-
-PrimaryTerm:
-	UnaryExpr
-|	PrimaryTerm "&^" UnaryExpr
-	{
-		var err error
-		$$, err = newBinaryOperation(andnot, $1, $3)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryTerm '&' UnaryExpr
-	{
-		var err error
-		$$, err = newBinaryOperation('&', $1, $3)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryTerm "<<" UnaryExpr
-	{
-		var err error
-		$$, err = newBinaryOperation(lsh, $1, $3)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryTerm ">>" UnaryExpr
-	{
-		var err error
-		$$, err = newBinaryOperation(rsh, $1, $3)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryTerm '%' UnaryExpr
-	{
-		var err error
-		$$, err = newBinaryOperation('%', $1, $3)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryTerm '/' UnaryExpr
-	{
-		var err error
-		$$, err = newBinaryOperation('/', $1, $3)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	PrimaryTerm '*' UnaryExpr
-	{
-		var err error
-		$$, err = newBinaryOperation('*', $1, $3)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-
-QualifiedIdent:
-	identifier
-|	identifier '.' identifier
-	{
-		$$ = fmt.Sprintf("%s.%s", $1.(string), $3.(string))
-	}
-
-RecordSet:
-	RecordSet1 RecordSet2
-	{
-		$$ = []interface{}{$1, $2}
-	}
-
-RecordSet1:
-	identifier
-|	'(' SelectStmt semiOpt ')'
-	{
-		$$ = $2
-	}
-
-semiOpt:
-	/* EMPTY */
-|	';'
-
-RecordSet2:
-	/* EMPTY */
-	{
-		$$ = ""
-	}
-|	"AS" identifier
-	{
-		$$ = $2
-	}
-
-RecordSetList:
-	RecordSet
-	{
-		$$ = []interface{}{$1}
-	}
-|	RecordSetList ',' RecordSet
-	{
-		$$ = append($1, $3)
-	}
-
-RollbackStmt:
-	"ROLLBACK"
-	{
-		$$ = rollbackStmt{}
-	}
-
-JoinType:
-	"LEFT"
-	{
-		$$ = leftJoin
-	}
-|	"RIGHT"
-	{
-		$$ = rightJoin
-	}
-|	"FULL"
-	{
-		$$ = fullJoin
-	}
-
-OuterOpt:
-	{
-		$$ = nil
-	}
-|	"OUTER"
-
-JoinClause:
-	JoinType OuterOpt "JOIN" RecordSet "ON" Expression
-	{
-		$$ = []interface{}{$1, $4, $6}
-	}
-
-JoinClauseOpt:
-	{
-		$$ = nil
-	}
-|	JoinClause
-
-SelectStmt:
-	"SELECT" SelectStmtDistinct SelectStmtFieldList "FROM" RecordSetList
-	CommaOpt JoinClauseOpt SelectStmtWhere SelectStmtGroup SelectStmtOrder
-	SelectStmtLimit SelectStmtOffset
-	{
-		x := yylex.(*lexer)
-		n := len(x.agg)
-		join := &joinRset{sources: $5}
-		if o := $7; o != nil {
-			o := o.([]interface{})
-			join.typ = o[0].(int)
-			join.sources = append(join.sources, o[1].([]interface{}))
-			join.on = o[2].(expression)
-		}
-		$$ = &selectStmt{
-			distinct:      $2.(bool),
-			flds:          $3.([]*fld),
-			from:          join,
-			hasAggregates: x.agg[n-1],
-			where:         $8.(*whereRset),
-			group:         $9.(*groupByRset),
-			order:         $10.(*orderByRset),
-			limit:         $11.(*limitRset),
-			offset:        $12.(*offsetRset),
-		}
-		x.agg = x.agg[:n-1]
-	}
-
-SelectStmtLimit:
-	{
-		$$ = (*limitRset)(nil)
-	}
-|	"LIMIT" Expression
-	{
-		$$ = &limitRset{expr: expr($2)}
-	}
-
-SelectStmtOffset:
-	{
-		$$ = (*offsetRset)(nil)
-	}
-|	"OFFSET" Expression
-	{
-		$$ = &offsetRset{expr: expr($2)}
-	}
-
-SelectStmtDistinct:
-	/* EMPTY */
-	{
-		$$ = false
-	}
-|	"DISTINCT"
-	{
-		$$ = true
-	}
-
-SelectStmtFieldList:
-	'*'
-	{
-		$$ = []*fld{}
-	}
-|	FieldList
-	{
-		$$ = $1
-	}
-|	FieldList ','
-	{
-		$$ = $1
-	}
-
-SelectStmtWhere:
-	/* EMPTY */
-	{
-		$$ = (*whereRset)(nil)
-	}
-|	WhereClause
-
-SelectStmtGroup:
-	/* EMPTY */
-	{
-		$$ = (*groupByRset)(nil)
-	}
-|	GroupByClause
-
-SelectStmtOrder:
-	/* EMPTY */
-	{
-		$$ = (*orderByRset)(nil)
-	}
-|	OrderBy
-
-Slice:
-	'[' ':' ']'
-	{
-		$$ = [2]*expression{nil, nil}
-	}
-|	'[' ':' Expression ']'
-	{
-		hi := expr($3)
-		$$ = [2]*expression{nil, &hi}
-	}
-|	'[' Expression ':' ']'
-	{
-		lo := expr($2)
-		$$ = [2]*expression{&lo, nil}
-	}
-|	'[' Expression ':' Expression ']'
-	{
-		lo := expr($2)
-		hi := expr($4)
-		$$ = [2]*expression{&lo, &hi}
-	}
-
-Statement:
-	EmptyStmt
-|	AlterTableStmt
-|	BeginTransactionStmt
-|	CommitStmt
-|	CreateIndexStmt
-|	CreateTableStmt
-|	DeleteFromStmt
-|	DropIndexStmt
-|	DropTableStmt
-|	ExplainStmt
-|	InsertIntoStmt
-|	RollbackStmt
-|	SelectStmt
-|	TruncateTableStmt
-|	UpdateStmt
-
-StatementList:
-	Statement
-	{
-		if $1 != nil {
-			yylex.(*lexer).list = []stmt{$1.(stmt)}
-		}
-	}
-|	StatementList ';' Statement
-	{
-		if $3 != nil {
-			yylex.(*lexer).list = append(yylex.(*lexer).list, $3.(stmt))
-		}
-	}
-
-TableName:
-	identifier
-
-Term:
-	Factor
-|	Term logAnd Factor
-	{
-		var err error
-		if $$, err = newBinaryOperation(andand, $1, $3); err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-
-logAnd:
-	"&&"
-	{
-	}
-|	"AND"
-	{
-	}
-
-TruncateTableStmt:
-	"TRUNCATE" "TABLE" TableName
-	{
-		$$ = &truncateTableStmt{tableName: $3.(string)}
-	}
-
-Type:
-	"bigint"
-|	"bigrat"
-|	"blob"
-|	"bool"
-|	"byte"
-|	"complex128"
-|	"complex64"
-|	"duration"
-|	"float"
-|	"float32"
-|	"float64"
-|	"int"
-|	"int16"
-|	"int32"
-|	"int64"
-|	"int8"
-|	"rune"
-|	"string"
-|	"time"
-|	"uint"
-|	"uint16"
-|	"uint32"
-|	"uint64"
-|	"uint8"
-
-UpdateStmt:
-	"UPDATE" TableName SetOpt AssignmentList UpdateStmt1
-	{
-		var expr expression
-		if w := $5; w != nil {
-			expr = w.(*whereRset).expr
-		}
-		$$ = &updateStmt{tableName: $2.(string), list: $4.([]assignment), where: expr}
-
-		if yylex.(*lexer).root {
-			break
-		}
-
-		if isSystemName[$2.(string)] {
-			yylex.(*lexer).err("name is used for system tables: %s", $2.(string))
-			return 1
-		}
-	}
-
-UpdateStmt1:
-	/* EMPTY */
-	{
-		$$ = nil
-	}
-|	WhereClause
-
-UnaryExpr:
-	PrimaryExpression
-|	'^'  PrimaryExpression
-	{
-		var err error
-		$$, err = newUnaryOperation('^', $2)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	'!' PrimaryExpression
-	{
-		var err error
-		$$, err = newUnaryOperation('!', $2)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	'-' PrimaryExpression
-	{
-		var err error
-		$$, err = newUnaryOperation('-', $2)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-|	'+' PrimaryExpression
-	{
-		var err error
-		$$, err = newUnaryOperation('+', $2)
-		if err != nil {
-			yylex.(*lexer).err("%v", err)
-			return 1
-		}
-	}
-
-WhereClause:
-	"WHERE" Expression
-	{
-		$$ = &whereRset{expr: expr($2)}
-	}
-
-
-SetOpt:
-	{
-	}
-|	"SET"
-	{
-	}
-
-CommaOpt:
-	{
-	}
-|	','
-	{
-	}
-
-%%
-
-func expr(v interface{}) expression {
-	e := v.(expression)
-	for {
-		x, ok := e.(*pexpr)
-		if !ok {
-			return e
-		}
-		e = x.expr
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/plan.go b/Godeps/_workspace/src/github.com/cznic/ql/plan.go
deleted file mode 100644
index be52b72c6a..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/plan.go
+++ /dev/null
@@ -1,2800 +0,0 @@
-// Copyright 2015 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-
-	"github.com/cznic/b"
-	"github.com/cznic/strutil"
-)
-
-const (
-	_               = iota
-	indexEq         // [L]
-	indexFalse      // [false]
-	indexGe         // [L, ...)
-	indexGt         // (L, ...)
-	indexIsNotNull  // (NULL, ...)
-	indexIsNull     // [NULL]
-	indexIntervalCC // [L, H]
-	indexIntervalCO // [L, H)
-	indexIntervalOC // (L, H]
-	indexIntervalOO // (L, H)
-	indexLe         // (..., H]
-	indexLt         // (..., H)
-	indexNe         // (L)
-	indexTrue       // [true]
-)
-
-// Note: All plans must have a pointer receiver. Enables planA == planB operation.
-var (
-	_ plan = (*crossJoinDefaultPlan)(nil)
-	_ plan = (*distinctDefaultPlan)(nil)
-	_ plan = (*explainDefaultPlan)(nil)
-	_ plan = (*filterDefaultPlan)(nil)
-	_ plan = (*fullJoinDefaultPlan)(nil)
-	_ plan = (*groupByDefaultPlan)(nil)
-	_ plan = (*indexPlan)(nil)
-	_ plan = (*leftJoinDefaultPlan)(nil)
-	_ plan = (*limitDefaultPlan)(nil)
-	_ plan = (*nullPlan)(nil)
-	_ plan = (*offsetDefaultPlan)(nil)
-	_ plan = (*orderByDefaultPlan)(nil)
-	_ plan = (*rightJoinDefaultPlan)(nil)
-	_ plan = (*selectFieldsDefaultPlan)(nil)
-	_ plan = (*selectFieldsGroupPlan)(nil)
-	_ plan = (*selectIndexDefaultPlan)(nil)
-	_ plan = (*sysColumnDefaultPlan)(nil)
-	_ plan = (*sysIndexDefaultPlan)(nil)
-	_ plan = (*sysTableDefaultPlan)(nil)
-	_ plan = (*tableDefaultPlan)(nil)
-	_ plan = (*tableNilPlan)(nil)
-)
-
-type plan interface {
-	do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error
-	explain(w strutil.Formatter)
-	fieldNames() []string
-	filter(expr expression) (p plan, indicesSought []string, err error)
-	hasID() bool
-}
-
-func isTableOrIndex(p plan) bool {
-	switch p.(type) {
-	case
-		*indexPlan,
-		*sysColumnDefaultPlan,
-		*sysIndexDefaultPlan,
-		*sysTableDefaultPlan,
-		*tableDefaultPlan:
-		return true
-	default:
-		return false
-	}
-}
-
-// Invariants
-// - All interval plans produce rows in ascending index value collating order.
-// - L <= H
-type indexPlan struct {
-	src   *table
-	cname string
-	xname string
-	x     btreeIndex
-	kind  int         // See interval* consts.
-	lval  interface{} // L, H: Ordered and comparable (lldb perspective).
-	hval  interface{}
-}
-
-func (r *indexPlan) doGe(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ...
-	// ---  ---  ---  ---  ---  +  +  +++  +++  +++
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{r.lval})
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		_, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doGt(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ...
-	// ---  ---  ---  ---  ---  -  -  +++  +++  +++
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{r.lval})
-	if err != nil {
-		return noEOF(err)
-	}
-
-	var ok bool
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		if !ok {
-			val, err := expand1(k[0], nil)
-			if err != nil {
-				return err
-			}
-
-			if collate1(val, r.lval) == 0 {
-				continue
-			}
-
-			ok = true
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doInterval00(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ..., H-1, H-1, H, H, H+1, H+1, ...
-	// ---  ---  ---  ---  ---  -  -  +++  +++  +++  +++  +++  -  -  ---  ---  ---
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{r.lval})
-	if err != nil {
-		return noEOF(err)
-	}
-
-	var ok bool
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		if !ok {
-			val, err := expand1(k[0], nil)
-			if err != nil {
-				return err
-			}
-
-			if collate1(val, r.lval) == 0 {
-				continue
-			}
-
-			ok = true
-		}
-
-		val, err := expand1(k[0], nil)
-		if err != nil {
-			return err
-		}
-
-		if collate1(val, r.hval) == 0 {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doIntervalOC(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ..., H-1, H-1, H, H, H+1, H+1, ...
-	// ---  ---  ---  ---  ---  -  -  +++  +++  +++  +++  +++  +  +  ---  ---  ---
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{r.lval})
-	if err != nil {
-		return noEOF(err)
-	}
-
-	var ok bool
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		if !ok {
-			val, err := expand1(k[0], nil)
-			if err != nil {
-				return err
-			}
-
-			if collate1(val, r.lval) == 0 {
-				continue
-			}
-
-			ok = true
-		}
-
-		val, err := expand1(k[0], nil)
-		if err != nil {
-			return err
-		}
-
-		if collate1(val, r.hval) > 0 {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doIntervalCC(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ..., H-1, H-1, H, H, H+1, H+1, ...
-	// ---  ---  ---  ---  ---  +  +  +++  +++  +++  +++  +++  +  +  ---  ---  ---
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{r.lval})
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		val, err := expand1(k[0], nil)
-		if err != nil {
-			return err
-		}
-
-		if collate1(val, r.hval) > 0 {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doIntervalCO(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ..., H-1, H-1, H, H, H+1, H+1, ...
-	// ---  ---  ---  ---  ---  +  +  +++  +++  +++  +++  +++  -  -  ---  ---  ---
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{r.lval})
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		val, err := expand1(k[0], nil)
-		if err != nil {
-			return err
-		}
-
-		if collate1(val, r.hval) >= 0 {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doLe(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., H-1, H-1, H, H, H+1, H+1, ...
-	// ---  ---  +++  +++  +++  +  +  ---  ---
-	t := r.src
-	it, err := r.x.SeekFirst()
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		if k == nil || k[0] == nil {
-			continue
-		}
-
-		val, err := expand1(k[0], nil)
-		if err != nil {
-			return err
-		}
-
-		if collate1(val, r.hval) > 0 {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doLt(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., H-1, H-1, H, H, H+1, H+1, ...
-	// ---  ---  +++  +++  +++  -  -  ---  ---
-	t := r.src
-	it, err := r.x.SeekFirst()
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		if k == nil || k[0] == nil {
-			continue
-		}
-
-		val, err := expand1(k[0], nil)
-		if err != nil {
-			return err
-		}
-
-		if collate1(val, r.hval) >= 0 {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doEq(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ...
-	// ---  ---  ---  ---  ---  +  +  ---  ---  ---
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{r.lval})
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		val, err := expand1(k[0], nil)
-		if err != nil {
-			return err
-		}
-
-		if collate1(val, r.lval) != 0 {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doNe(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ..., L-1, L-1, L, L, L+1, L+1, ...
-	// ---  ---  +++  +++  +++  -  -  +++  +++  +++
-	t := r.src
-	it, err := r.x.SeekFirst()
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		if k == nil || k[0] == nil {
-			continue
-		}
-
-		val, err := expand1(k[0], nil)
-		if err != nil {
-			return err
-		}
-
-		if collate1(val, r.hval) == 0 {
-			continue
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doIsNull(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ...
-	// +++  +++  ---
-	t := r.src
-	it, err := r.x.SeekFirst()
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		if k != nil && k[0] != nil {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doIsNotNull(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	// nil, nil, ...
-	// ---  ---  +++
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{false}) // lldb collates false right after NULL.
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		_, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doFalse(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{false})
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		b, ok := k[0].(bool)
-		if !ok || b {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) doTrue(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	t := r.src
-	it, _, err := r.x.Seek([]interface{}{true})
-	if err != nil {
-		return noEOF(err)
-	}
-
-	for {
-		k, h, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		if _, ok := k[0].(bool); !ok {
-			return nil
-		}
-
-		id, data, err := t.row(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		if more, err := f(id, data); err != nil || !more {
-			return err
-		}
-	}
-}
-
-func (r *indexPlan) do(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) error {
-	switch r.kind {
-	case indexEq:
-		return r.doEq(ctx, f)
-	case indexGe:
-		return r.doGe(ctx, f)
-	case indexGt:
-		return r.doGt(ctx, f)
-	case indexLe:
-		return r.doLe(ctx, f)
-	case indexLt:
-		return r.doLt(ctx, f)
-	case indexNe:
-		return r.doNe(ctx, f)
-	case indexIsNull:
-		return r.doIsNull(ctx, f)
-	case indexIsNotNull:
-		return r.doIsNotNull(ctx, f)
-	case indexFalse:
-		return r.doFalse(ctx, f)
-	case indexTrue:
-		return r.doTrue(ctx, f)
-	case indexIntervalOO:
-		return r.doInterval00(ctx, f)
-	case indexIntervalCC:
-		return r.doIntervalCC(ctx, f)
-	case indexIntervalOC:
-		return r.doIntervalOC(ctx, f)
-	case indexIntervalCO:
-		return r.doIntervalCO(ctx, f)
-	default:
-		//dbg("", r.kind)
-		panic("internal error 072")
-	}
-}
-
-func (r *indexPlan) explain(w strutil.Formatter) {
-	s := ""
-	if r.kind == indexFalse {
-		s = "!"
-	}
-	w.Format("┌Iterate all rows of table %q using index %q where %s%s", r.src.name, r.xname, s, r.cname)
-	switch r.kind {
-	case indexEq:
-		w.Format(" == %v", value{r.lval})
-	case indexGe:
-		w.Format(" >= %v", value{r.lval})
-	case indexGt:
-		w.Format(" > %v", value{r.lval})
-	case indexLe:
-		w.Format(" <= %v", value{r.hval})
-	case indexLt:
-		w.Format(" < %v", value{r.hval})
-	case indexNe:
-		w.Format(" != %v", value{r.lval})
-	case indexIsNull:
-		w.Format(" IS NULL")
-	case indexIsNotNull:
-		w.Format(" IS NOT NULL")
-	case indexFalse, indexTrue:
-		// nop
-	case indexIntervalOO:
-		w.Format(" > %v && %s < %v", value{r.lval}, r.cname, value{r.hval})
-	case indexIntervalCC:
-		w.Format(" >= %v && %s <= %v", value{r.lval}, r.cname, value{r.hval})
-	case indexIntervalCO:
-		w.Format(" >= %v && %s < %v", value{r.lval}, r.cname, value{r.hval})
-	case indexIntervalOC:
-		w.Format(" > %v && %s <= %v", value{r.lval}, r.cname, value{r.hval})
-	default:
-		//dbg("", r.kind)
-		panic("internal error 073")
-	}
-	w.Format("\n└Output field names %v\n", qnames(r.fieldNames()))
-}
-
-func (r *indexPlan) fieldNames() []string { return r.src.fieldNames() }
-
-func (r *indexPlan) filterEq(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(r.lval, val) == 0 {
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case ge:
-		if collate1(r.lval, val) >= 0 {
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case '>':
-		if collate1(r.lval, val) > 0 {
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case le:
-		if collate1(r.lval, val) <= 0 {
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case '<':
-		if collate1(r.lval, val) < 0 {
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case neq:
-		if collate1(r.lval, val) != 0 {
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filterGe(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(r.lval, val) <= 0 {
-			r.lval = val
-			r.kind = indexEq
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case ge:
-		if collate1(r.lval, val) < 0 {
-			r.lval = val
-		}
-		return r, nil, nil
-	case '>':
-		if collate1(r.lval, val) <= 0 {
-			r.lval = val
-			r.kind = indexGt
-		}
-		return r, nil, nil
-	case le:
-		switch c := collate1(r.lval, val); {
-		case c < 0:
-			r.hval = val
-			r.kind = indexIntervalCC
-			return r, nil, nil
-		case c == 0:
-			r.kind = indexEq
-			return r, nil, nil
-		default: // c > 0
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-	case '<':
-		if collate1(r.lval, val) < 0 {
-			r.hval = val
-			r.kind = indexIntervalCO
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case neq:
-		switch c := collate1(r.lval, val); {
-		case c < 0:
-			//MAYBE ORed intervals
-		case c == 0:
-			r.kind = indexGt
-			return r, nil, nil
-		default: // c > 0
-			return r, nil, nil
-		}
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filterGt(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(r.lval, val) < 0 {
-			r.lval = val
-			r.kind = indexEq
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case ge:
-		if collate1(r.lval, val) < 0 {
-			r.lval = val
-			r.kind = indexGe
-		}
-		return r, nil, nil
-	case '>':
-		if collate1(r.lval, val) < 0 {
-			r.lval = val
-		}
-		return r, nil, nil
-	case le:
-		if collate1(r.lval, val) < 0 {
-			r.hval = val
-			r.kind = indexIntervalOC
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case '<':
-		if collate1(r.lval, val) < 0 {
-			r.hval = val
-			r.kind = indexIntervalOO
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case neq:
-		if collate1(r.lval, val) >= 0 {
-			return r, nil, nil
-		}
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filterLe(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(r.hval, val) >= 0 {
-			r.lval = val
-			r.kind = indexEq
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case ge:
-		switch c := collate1(r.hval, val); {
-		case c < 0:
-			return &nullPlan{r.fieldNames()}, nil, nil
-		case c == 0:
-			r.lval = val
-			r.kind = indexEq
-			return r, nil, nil
-		default: // c > 0
-			r.lval = val
-			r.kind = indexIntervalCC
-			return r, nil, nil
-		}
-	case '>':
-		if collate1(r.hval, val) > 0 {
-			r.lval = val
-			r.kind = indexIntervalOC
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case le:
-		if collate1(r.hval, val) > 0 {
-			r.hval = val
-		}
-		return r, nil, nil
-	case '<':
-		if collate1(r.hval, val) >= 0 {
-			r.hval = val
-			r.kind = indexLt
-		}
-		return r, nil, nil
-	case neq:
-		switch c := collate1(r.hval, val); {
-		case c < 0:
-			return r, nil, nil
-		case c == 0:
-			r.kind = indexLt
-			return r, nil, nil
-		default: // c > 0
-			//bop
-		}
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filterLt(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(r.hval, val) > 0 {
-			r.lval = val
-			r.kind = indexEq
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case ge:
-		if collate1(r.hval, val) > 0 {
-			r.lval = val
-			r.kind = indexIntervalCO
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case '>':
-		if collate1(r.hval, val) > 0 {
-			r.lval = val
-			r.kind = indexIntervalOO
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case le:
-		if collate1(r.hval, val) > 0 {
-			r.hval = val
-			r.kind = indexLe
-		}
-		return r, nil, nil
-	case '<':
-		if collate1(r.hval, val) > 0 {
-			r.hval = val
-		}
-		return r, nil, nil
-	case neq:
-		if collate1(r.hval, val) > 0 {
-			return nil, nil, nil
-		}
-
-		return r, nil, nil
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filterCC(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(val, r.lval) < 0 || collate1(val, r.hval) > 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		r.lval = val
-		r.kind = indexEq
-		return r, nil, nil
-	case ge:
-		if collate1(val, r.lval) <= 0 {
-			return r, nil, nil
-		}
-
-		switch c := collate1(val, r.hval); {
-		case c < 0:
-			r.lval = val
-			return r, nil, nil
-		case c == 0:
-			r.lval = val
-			r.kind = indexEq
-			return r, nil, nil
-		default:
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-	case '>':
-		switch c := collate1(val, r.lval); {
-		case c < 0:
-			return r, nil, nil
-		case c == 0:
-			r.kind = indexIntervalOC
-			return r, nil, nil
-		default:
-			if collate1(val, r.hval) < 0 {
-				r.lval = val
-				r.kind = indexIntervalOC
-				return r, nil, nil
-			}
-
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-	case le:
-		switch c := collate1(val, r.lval); {
-		case c < 0:
-			return &nullPlan{r.fieldNames()}, nil, nil
-		case c == 0:
-			r.kind = indexEq
-			return r, nil, nil
-		default:
-			if collate1(val, r.hval) < 0 {
-				r.hval = val
-			}
-			return r, nil, nil
-		}
-	case '<':
-		if collate1(val, r.lval) <= 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		if collate1(val, r.hval) <= 0 {
-			r.hval = val
-			r.kind = indexIntervalCO
-		}
-		return r, nil, nil
-	case neq:
-		switch c := collate1(val, r.lval); {
-		case c < 0:
-			return r, nil, nil
-		case c == 0:
-			r.kind = indexIntervalOC
-			return r, nil, nil
-		default:
-			switch c := collate1(val, r.hval); {
-			case c == 0:
-				r.kind = indexIntervalCO
-				return r, nil, nil
-			case c > 0:
-				return r, nil, nil
-			default:
-				return nil, nil, nil
-			}
-		}
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filterOC(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(val, r.lval) <= 0 || collate1(val, r.hval) > 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		r.lval = val
-		r.kind = indexEq
-		return r, nil, nil
-	case ge:
-		if collate1(val, r.lval) <= 0 {
-			return r, nil, nil
-		}
-
-		switch c := collate1(val, r.hval); {
-		case c < 0:
-			r.lval = val
-			r.kind = indexIntervalCC
-			return r, nil, nil
-		case c == 0:
-			r.lval = val
-			r.kind = indexEq
-			return r, nil, nil
-		default:
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-	case '>':
-		if collate1(val, r.lval) <= 0 {
-			return r, nil, nil
-		}
-
-		if collate1(val, r.hval) < 0 {
-			r.lval = val
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case le:
-		if collate1(val, r.lval) <= 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		if collate1(val, r.hval) < 0 {
-			r.hval = val
-		}
-		return r, nil, nil
-	case '<':
-		if collate1(val, r.lval) <= 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		switch c := collate1(val, r.hval); {
-		case c < 0:
-			r.hval = val
-			r.kind = indexIntervalOO
-		case c == 0:
-			r.kind = indexIntervalOO
-		}
-		return r, nil, nil
-	case neq:
-		if collate1(val, r.lval) <= 0 {
-			return r, nil, nil
-		}
-
-		switch c := collate1(val, r.hval); {
-		case c < 0:
-			return nil, nil, nil
-		case c == 0:
-			r.kind = indexIntervalOO
-			return r, nil, nil
-		default:
-			return r, nil, nil
-		}
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filterOO(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(val, r.lval) <= 0 || collate1(val, r.hval) >= 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		r.lval = val
-		r.kind = indexEq
-		return r, nil, nil
-	case ge:
-		if collate1(val, r.lval) <= 0 {
-			return r, nil, nil
-		}
-
-		if collate1(val, r.hval) < 0 {
-			r.lval = val
-			r.kind = indexIntervalCO
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case '>':
-		if collate1(val, r.lval) <= 0 {
-			return r, nil, nil
-		}
-
-		if collate1(val, r.hval) < 0 {
-			r.lval = val
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case le:
-		if collate1(val, r.lval) <= 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		if collate1(val, r.hval) < 0 {
-			r.hval = val
-			r.kind = indexIntervalOC
-		}
-		return r, nil, nil
-	case '<':
-		if collate1(val, r.lval) <= 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		if collate1(val, r.hval) < 0 {
-			r.hval = val
-		}
-		return r, nil, nil
-	case neq:
-		if collate1(val, r.lval) <= 0 || collate1(val, r.hval) >= 0 {
-			return r, nil, nil
-		}
-
-		return nil, nil, nil
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filterCO(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(val, r.lval) < 0 || collate1(val, r.hval) >= 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		r.lval = val
-		r.kind = indexEq
-		return r, nil, nil
-	case ge:
-		if collate1(val, r.lval) <= 0 {
-			return r, nil, nil
-		}
-
-		if collate1(val, r.hval) < 0 {
-			r.lval = val
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case '>':
-		switch c := collate1(val, r.lval); {
-		case c < 0:
-			return r, nil, nil
-		case c == 0:
-			r.kind = indexIntervalOO
-			return r, nil, nil
-		default:
-			if collate1(val, r.hval) < 0 {
-				r.lval = val
-				r.kind = indexIntervalOO
-				return r, nil, nil
-			}
-
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-	case le:
-		switch c := collate1(val, r.lval); {
-		case c < 0:
-			return &nullPlan{r.fieldNames()}, nil, nil
-		case c == 0:
-			r.kind = indexEq
-			return r, nil, nil
-		default:
-			if collate1(val, r.hval) < 0 {
-				r.hval = val
-				r.kind = indexIntervalCC
-			}
-			return r, nil, nil
-		}
-	case '<':
-		if collate1(val, r.lval) <= 0 {
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-
-		if collate1(val, r.hval) < 0 {
-			r.hval = val
-		}
-		return r, nil, nil
-	case neq:
-		switch c := collate1(val, r.lval); {
-		case c < 0:
-			return r, nil, nil
-		case c == 0:
-			r.kind = indexIntervalOO
-			return r, nil, nil
-		default:
-			if collate1(val, r.hval) < 0 {
-				return nil, nil, nil
-			}
-
-			return r, nil, nil
-		}
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filterNe(binOp2 int, val interface{}) (plan, []string, error) {
-	switch binOp2 {
-	case eq:
-		if collate1(val, r.lval) != 0 {
-			r.lval = val
-			r.kind = indexEq
-			return r, nil, nil
-		}
-
-		return &nullPlan{r.fieldNames()}, nil, nil
-	case ge:
-		switch c := collate1(val, r.lval); {
-		case c < 0:
-			return nil, nil, nil //TODO
-		case c == 0:
-			r.kind = indexGt
-			return r, nil, nil
-		default:
-			r.lval = val
-			r.kind = indexGe
-			return r, nil, nil
-		}
-	case '>':
-		if collate1(val, r.lval) < 0 {
-			return nil, nil, nil //TODO
-		}
-
-		r.lval = val
-		r.kind = indexGt
-		return r, nil, nil
-	case le:
-		switch c := collate1(val, r.lval); {
-		case c < 0:
-			r.hval = val
-			r.kind = indexLe
-			return r, nil, nil
-		case c == 0:
-			r.kind = indexLt
-			return r, nil, nil
-		default:
-			return nil, nil, nil //TODO
-		}
-	case '<':
-		if collate1(val, r.lval) <= 0 {
-			r.hval = val
-			r.kind = indexLt
-			return r, nil, nil
-		}
-
-		return nil, nil, nil //TODO
-	case neq:
-		if collate1(val, r.lval) == 0 {
-			return r, nil, nil
-		}
-
-		return nil, nil, nil
-	}
-	return nil, nil, nil
-}
-
-func (r *indexPlan) filter(expr expression) (plan, []string, error) {
-	switch x := expr.(type) {
-	case *binaryOperation:
-		ok, cname, val, err := x.isIdentRelOpVal()
-		if err != nil {
-			return nil, nil, err
-		}
-
-		if !ok || r.cname != cname {
-			break
-		}
-
-		if val, err = typeCheck1(val, findCol(r.src.cols, cname)); err != nil {
-			return nil, nil, err
-		}
-
-		switch r.kind {
-		case indexEq: // [L]
-			return r.filterEq(x.op, val)
-		case indexGe: // [L, ...)
-			return r.filterGe(x.op, val)
-		case indexGt: // (L, ...)
-			return r.filterGt(x.op, val)
-		case indexIntervalCC: // [L, H]
-			return r.filterCC(x.op, val)
-		case indexIntervalCO: // [L, H)
-			return r.filterCO(x.op, val)
-		case indexIntervalOC: // (L, H]
-			return r.filterOC(x.op, val)
-		case indexIntervalOO: // (L, H)
-			return r.filterOO(x.op, val)
-		case indexLe: // (..., H]
-			return r.filterLe(x.op, val)
-		case indexLt: // (..., H)
-			return r.filterLt(x.op, val)
-		case indexNe: // (L)
-			return r.filterNe(x.op, val)
-		}
-	case *ident:
-		cname := x.s
-		if r.cname != cname {
-			break
-		}
-
-		switch r.kind {
-		case indexFalse: // [false]
-			return &nullPlan{r.fieldNames()}, nil, nil
-		case indexTrue: // [true]
-			return r, nil, nil
-		}
-	case *unaryOperation:
-		if x.op != '!' {
-			break
-		}
-
-		operand, ok := x.v.(*ident)
-		if !ok {
-			break
-		}
-
-		cname := operand.s
-		if r.cname != cname {
-			break
-		}
-
-		switch r.kind {
-		case indexFalse: // [false]
-			return r, nil, nil
-		case indexTrue: // [true]
-			return &nullPlan{r.fieldNames()}, nil, nil
-		}
-	}
-
-	return nil, nil, nil
-}
-
-func (r *indexPlan) hasID() bool { return true }
-
-type explainDefaultPlan struct {
-	s stmt
-}
-
-func (r *explainDefaultPlan) hasID() bool { return false }
-
-func (r *explainDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error {
-	var buf bytes.Buffer
-	switch x := r.s.(type) {
-	default:
-		w := strutil.IndentFormatter(&buf, "│   ")
-		x.explain(ctx, w)
-	}
-
-	a := bytes.Split(buf.Bytes(), []byte{'\n'})
-	for _, v := range a[:len(a)-1] {
-		if more, err := f(nil, []interface{}{string(v)}); !more || err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (r *explainDefaultPlan) explain(w strutil.Formatter) {
-	return
-}
-
-func (r *explainDefaultPlan) fieldNames() []string {
-	return []string{""}
-}
-
-func (r *explainDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-type filterDefaultPlan struct {
-	plan
-	expr expression
-	is   []string
-}
-
-func (r *filterDefaultPlan) hasID() bool { return r.plan.hasID() }
-
-func (r *filterDefaultPlan) explain(w strutil.Formatter) {
-	r.plan.explain(w)
-	w.Format("┌Filter on %v\n", r.expr)
-	if len(r.is) != 0 {
-		w.Format("│Possibly useful indices\n")
-		m := map[string]bool{}
-		for _, v := range r.is {
-			if !m[v] {
-				m[v] = true
-				n := ""
-				for _, r := range v {
-					if r >= '0' && r <= '9' || r >= 'a' && r <= 'z' || r >= 'A' && r <= 'Z' || r == '_' {
-						n += string(r)
-						continue
-					}
-
-					n += "_"
-				}
-				for strings.Contains(n, "__") {
-					n = strings.Replace(n, "__", "_", -1)
-				}
-				for strings.HasSuffix(n, "_") {
-					n = n[:len(n)-1]
-				}
-				w.Format("│CREATE INDEX x%s ON %s;\n", n, v)
-			}
-		}
-	}
-	w.Format("└Output field names %v\n", qnames(r.plan.fieldNames()))
-}
-
-func (r *filterDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
-	m := map[interface{}]interface{}{}
-	fields := r.plan.fieldNames()
-	return r.plan.do(ctx, func(rid interface{}, data []interface{}) (bool, error) {
-		for i, v := range fields {
-			m[v] = data[i]
-		}
-		m["$id"] = rid
-		val, err := r.expr.eval(ctx, m)
-		if err != nil {
-			return false, err
-		}
-
-		if val == nil {
-			return true, nil
-		}
-
-		x, ok := val.(bool)
-		if !ok {
-			return false, fmt.Errorf("invalid boolean expression %s (value of type %T)", val, val)
-		}
-
-		if !x {
-			return true, nil
-		}
-
-		return f(rid, data)
-	})
-}
-
-type crossJoinDefaultPlan struct {
-	rsets  []plan
-	names  []string
-	fields []string
-}
-
-func (r *crossJoinDefaultPlan) hasID() bool { return false }
-
-func (r *crossJoinDefaultPlan) explain(w strutil.Formatter) {
-	w.Format("┌Compute Cartesian product of%i\n")
-	for i, v := range r.rsets {
-		sel := !isTableOrIndex(v)
-		if sel {
-			w.Format("┌Iterate all rows of virtual table %q%i\n", r.names[i])
-		}
-		v.explain(w)
-		if sel {
-			w.Format("%u└Output field names %v\n", qnames(v.fieldNames()))
-		}
-	}
-	w.Format("%u└Output field names %v\n", qnames(r.fields))
-}
-
-func (r *crossJoinDefaultPlan) filter(expr expression) (plan, []string, error) {
-	var is []string
-	for i, v := range r.names {
-		e2, err := expr.clone(nil, v)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		p2, is2, err := r.rsets[i].filter(e2)
-		is = append(is, is2...)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		if p2 != nil {
-			r.rsets[i] = p2
-			return r, is, nil
-		}
-	}
-	return nil, is, nil
-}
-
-func (r *crossJoinDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
-	if len(r.rsets) == 1 {
-		return r.rsets[0].do(ctx, f)
-	}
-
-	ids := map[string]interface{}{}
-	var g func([]interface{}, []plan, int) error
-	g = func(prefix []interface{}, rsets []plan, x int) (err error) {
-		return rsets[0].do(ctx, func(id interface{}, in []interface{}) (bool, error) {
-			ids[r.names[x]] = id
-			if len(rsets) > 1 {
-				return true, g(append(prefix, in...), rsets[1:], x+1)
-			}
-
-			return f(ids, append(prefix, in...))
-		})
-	}
-	return g(nil, r.rsets, 0)
-}
-
-func (r *crossJoinDefaultPlan) fieldNames() []string { return r.fields }
-
-type distinctDefaultPlan struct {
-	src    plan
-	fields []string
-}
-
-func (r *distinctDefaultPlan) hasID() bool { return false }
-
-func (r *distinctDefaultPlan) explain(w strutil.Formatter) {
-	r.src.explain(w)
-	w.Format("┌Compute distinct rows\n└Output field names %v\n", r.fields)
-}
-
-func (r *distinctDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *distinctDefaultPlan) fieldNames() []string { return r.fields }
-
-func (r *distinctDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
-	t, err := ctx.db.store.CreateTemp(true)
-	if err != nil {
-		return
-	}
-
-	defer func() {
-		if derr := t.Drop(); derr != nil && err == nil {
-			err = derr
-		}
-	}()
-
-	if err = r.src.do(ctx, func(id interface{}, in []interface{}) (bool, error) {
-		if err = t.Set(in, nil); err != nil {
-			return false, err
-		}
-
-		return true, nil
-	}); err != nil {
-		return
-	}
-
-	var data []interface{}
-	more := true
-	it, err := t.SeekFirst()
-	for more && err == nil {
-		data, _, err = it.Next()
-		if err != nil {
-			break
-		}
-
-		more, err = f(nil, data)
-	}
-	return noEOF(err)
-}
-
-type groupByDefaultPlan struct {
-	colNames []string
-	src      plan
-	fields   []string
-}
-
-func (r *groupByDefaultPlan) hasID() bool { return false }
-
-func (r *groupByDefaultPlan) explain(w strutil.Formatter) {
-	r.src.explain(w)
-	switch {
-	case len(r.colNames) == 0: //TODO this case should not exist for this plan, should become tableDefaultPlan
-		w.Format("┌Group by distinct rows")
-	default:
-		w.Format("┌Group by")
-		for _, v := range r.colNames {
-			w.Format(" %s,", v)
-		}
-	}
-	w.Format("\n└Output field names %v\n", qnames(r.fields))
-}
-
-func (r *groupByDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *groupByDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
-	t, err := ctx.db.store.CreateTemp(true)
-	if err != nil {
-		return
-	}
-
-	defer func() {
-		if derr := t.Drop(); derr != nil && err == nil {
-			err = derr
-		}
-	}()
-
-	var gcols []*col
-	var cols []*col
-	m := map[string]int{}
-	for i, v := range r.src.fieldNames() {
-		m[v] = i
-	}
-	for _, c := range r.colNames {
-		i, ok := m[c]
-		if !ok {
-			return fmt.Errorf("unknown field %s", c)
-		}
-
-		gcols = append(gcols, &col{name: c, index: i})
-	}
-	k := make([]interface{}, len(r.colNames)) //TODO optimize when len(r.cols) == 0, should become tableDefaultPlan
-	if err = r.src.do(ctx, func(rid interface{}, in []interface{}) (more bool, err error) {
-		infer(in, &cols)
-		for i, c := range gcols {
-			k[i] = in[c.index]
-		}
-		h0, err := t.Get(k)
-		if err != nil {
-			return false, err
-		}
-
-		var h int64
-		if len(h0) != 0 {
-			h, _ = h0[0].(int64)
-		}
-		nh, err := t.Create(append([]interface{}{h, nil}, in...)...)
-		if err != nil {
-			return false, err
-		}
-
-		for i, c := range gcols {
-			k[i] = in[c.index]
-		}
-		err = t.Set(k, []interface{}{nh})
-		if err != nil {
-			return false, err
-		}
-
-		return true, nil
-	}); err != nil {
-		return
-	}
-
-	for i, v := range r.src.fieldNames()[:len(cols)] {
-		cols[i].name = v
-		cols[i].index = i
-	}
-	if more, err := f(nil, []interface{}{t, cols}); !more || err != nil {
-		return err
-	}
-
-	it, err := t.SeekFirst()
-	more := true
-	var data []interface{}
-	for more && err == nil {
-		if _, data, err = it.Next(); err != nil {
-			break
-		}
-
-		more, err = f(nil, data)
-	}
-	return noEOF(err)
-}
-
-func (r *groupByDefaultPlan) fieldNames() []string { return r.fields }
-
-type selectIndexDefaultPlan struct {
-	nm string
-	x  interface{}
-}
-
-func (r *selectIndexDefaultPlan) hasID() bool { return false }
-
-func (r *selectIndexDefaultPlan) explain(w strutil.Formatter) {
-	w.Format("┌Iterate all values of index %q\n└Output field names N/A\n", r.nm)
-}
-
-func (r *selectIndexDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *selectIndexDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
-	var x btreeIndex
-	switch ix := r.x.(type) {
-	case *indexedCol:
-		x = ix.x
-	case *index2:
-		x = ix.x
-	default:
-		panic("internal error 007")
-	}
-
-	en, err := x.SeekFirst()
-	if err != nil {
-		return noEOF(err)
-	}
-
-	var id int64
-	for {
-		k, _, err := en.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		id++
-		if more, err := f(id, k); !more || err != nil {
-			return err
-		}
-	}
-}
-
-func (r *selectIndexDefaultPlan) fieldNames() []string {
-	return []string{r.nm}
-}
-
-type limitDefaultPlan struct {
-	expr   expression
-	src    plan
-	fields []string
-}
-
-func (r *limitDefaultPlan) hasID() bool { return r.src.hasID() }
-
-func (r *limitDefaultPlan) explain(w strutil.Formatter) {
-	r.src.explain(w)
-	w.Format("┌Pass first %v records\n└Output field names %v\n", r.expr, r.fields)
-}
-
-func (r *limitDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *limitDefaultPlan) fieldNames() []string { return r.fields }
-
-func (r *limitDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) (err error) {
-	m := map[interface{}]interface{}{}
-	var eval bool
-	var lim uint64
-	return r.src.do(ctx, func(rid interface{}, in []interface{}) (more bool, err error) {
-		if !eval {
-			for i, fld := range r.fields {
-				if fld != "" {
-					m[fld] = in[i]
-				}
-			}
-			m["$id"] = rid
-			val, err := r.expr.eval(ctx, m)
-			if err != nil {
-				return false, err
-			}
-
-			if val == nil {
-				return true, nil
-			}
-
-			if lim, err = limOffExpr(val); err != nil {
-				return false, err
-			}
-
-			eval = true
-		}
-		switch lim {
-		case 0:
-			return false, nil
-		default:
-			lim--
-			return f(rid, in)
-		}
-	})
-}
-
-type offsetDefaultPlan struct {
-	expr   expression
-	src    plan
-	fields []string
-}
-
-func (r *offsetDefaultPlan) hasID() bool { return r.src.hasID() }
-
-func (r *offsetDefaultPlan) explain(w strutil.Formatter) {
-	r.src.explain(w)
-	w.Format("┌Skip first %v records\n└Output field names %v\n", r.expr, qnames(r.fields))
-}
-
-func (r *offsetDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *offsetDefaultPlan) fieldNames() []string { return r.fields }
-
-func (r *offsetDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
-	m := map[interface{}]interface{}{}
-	var eval bool
-	var off uint64
-	return r.src.do(ctx, func(rid interface{}, in []interface{}) (bool, error) {
-		if !eval {
-			for i, fld := range r.fields {
-				if fld != "" {
-					m[fld] = in[i]
-				}
-			}
-			m["$id"] = rid
-			val, err := r.expr.eval(ctx, m)
-			if err != nil {
-				return false, err
-			}
-
-			if val == nil {
-				return true, nil
-			}
-
-			if off, err = limOffExpr(val); err != nil {
-				return false, err
-			}
-
-			eval = true
-		}
-		if off > 0 {
-			off--
-			return true, nil
-		}
-
-		return f(rid, in)
-	})
-}
-
-type orderByDefaultPlan struct {
-	asc    bool
-	by     []expression
-	src    plan
-	fields []string
-}
-
-func (r *orderByDefaultPlan) hasID() bool { return r.src.hasID() }
-
-func (r *orderByDefaultPlan) explain(w strutil.Formatter) {
-	r.src.explain(w)
-	w.Format("┌Order%s by", map[bool]string{false: " descending"}[r.asc])
-	for _, v := range r.by {
-		w.Format(" %s,", v)
-	}
-	w.Format("\n└Output field names %v\n", qnames(r.fields))
-}
-
-func (r *orderByDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *orderByDefaultPlan) fieldNames() []string { return r.fields }
-
-func (r *orderByDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
-	t, err := ctx.db.store.CreateTemp(r.asc)
-	if err != nil {
-		return
-	}
-
-	defer func() {
-		if derr := t.Drop(); derr != nil && err == nil {
-			err = derr
-		}
-	}()
-
-	m := map[interface{}]interface{}{}
-	flds := r.fields
-	k := make([]interface{}, len(r.by)+1)
-	id := int64(-1)
-	if err = r.src.do(ctx, func(rid interface{}, in []interface{}) (bool, error) {
-		id++
-		for i, fld := range flds {
-			if fld != "" {
-				m[fld] = in[i]
-			}
-		}
-		m["$id"] = rid
-		for i, expr := range r.by {
-			val, err := expr.eval(ctx, m)
-			if err != nil {
-				return false, err
-			}
-
-			if val != nil {
-				val, ordered, err := isOrderedType(val)
-				if err != nil {
-					return false, err
-				}
-
-				if !ordered {
-					return false, fmt.Errorf("cannot order by %v (type %T)", val, val)
-
-				}
-			}
-
-			k[i] = val
-		}
-		k[len(r.by)] = id
-		if err = t.Set(k, in); err != nil {
-			return false, err
-		}
-
-		return true, nil
-	}); err != nil {
-		return
-	}
-
-	it, err := t.SeekFirst()
-	if err != nil {
-		return noEOF(err)
-	}
-
-	var data []interface{}
-	more := true
-	for more && err == nil {
-		if _, data, err = it.Next(); err != nil {
-			break
-		}
-
-		more, err = f(nil, data)
-	}
-	return noEOF(err)
-}
-
-type selectFieldsDefaultPlan struct {
-	flds   []*fld
-	src    plan
-	fields []string
-}
-
-func (r *selectFieldsDefaultPlan) hasID() bool { return r.src.hasID() }
-
-func (r *selectFieldsDefaultPlan) explain(w strutil.Formatter) {
-	//TODO check for non existing fields
-	r.src.explain(w)
-	w.Format("┌Evaluate")
-	for _, v := range r.flds {
-		w.Format(" %s as %s,", v.expr, fmt.Sprintf("%q", v.name))
-	}
-	w.Format("\n└Output field names %v\n", qnames(r.fields))
-}
-
-func (r *selectFieldsDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *selectFieldsDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
-	fields := r.src.fieldNames()
-	m := map[interface{}]interface{}{}
-	return r.src.do(ctx, func(rid interface{}, in []interface{}) (bool, error) {
-		for i, nm := range fields {
-			if nm != "" {
-				m[nm] = in[i]
-			}
-		}
-		m["$id"] = rid
-		out := make([]interface{}, len(r.flds))
-		for i, fld := range r.flds {
-			var err error
-			if out[i], err = fld.expr.eval(ctx, m); err != nil {
-				return false, err
-			}
-		}
-		return f(rid, out)
-	})
-}
-
-func (r *selectFieldsDefaultPlan) fieldNames() []string { return r.fields }
-
-type selectFieldsGroupPlan struct {
-	flds   []*fld
-	src    *groupByDefaultPlan
-	fields []string
-}
-
-func (r *selectFieldsGroupPlan) hasID() bool { return false }
-
-func (r *selectFieldsGroupPlan) explain(w strutil.Formatter) {
-	//TODO check for non existing fields
-	r.src.explain(w)
-	w.Format("┌Evaluate")
-	for _, v := range r.flds {
-		w.Format(" %s as %s,", v.expr, fmt.Sprintf("%q", v.name))
-	}
-	w.Format("\n└Output field names %v\n", qnames(r.fields))
-}
-
-func (r *selectFieldsGroupPlan) fieldNames() []string { return r.fields }
-
-func (r *selectFieldsGroupPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *selectFieldsGroupPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
-	var t temp
-	var cols []*col
-	var err error
-	out := make([]interface{}, len(r.flds))
-	ok := false
-	rows := false
-	if err = r.src.do(ctx, func(rid interface{}, in []interface{}) (bool, error) {
-		if ok {
-			h := in[0].(int64)
-			m := map[interface{}]interface{}{}
-			for h != 0 {
-				in, err = t.Read(nil, h, cols...)
-				if err != nil {
-					return false, err
-				}
-
-				rec := in[2:]
-				for i, c := range cols {
-					if nm := c.name; nm != "" {
-						m[nm] = rec[i]
-					}
-				}
-				m["$id"] = rid
-				for _, fld := range r.flds {
-					if _, err = fld.expr.eval(ctx, m); err != nil {
-						return false, err
-					}
-				}
-
-				h = in[0].(int64)
-			}
-			m["$agg"] = true
-			for i, fld := range r.flds {
-				if out[i], err = fld.expr.eval(ctx, m); err != nil {
-					return false, err
-				}
-			}
-			rows = true
-			return f(nil, out)
-		}
-
-		ok = true
-		t = in[0].(temp)
-		cols = in[1].([]*col)
-		if len(r.flds) == 0 { // SELECT *
-			r.flds = make([]*fld, len(cols))
-			for i, v := range cols {
-				r.flds[i] = &fld{expr: &ident{v.name}, name: v.name}
-			}
-			out = make([]interface{}, len(r.flds))
-		}
-		return true, nil
-	}); err != nil {
-		return err
-	}
-
-	if rows {
-		return nil
-	}
-
-	m := map[interface{}]interface{}{"$agg0": true} // aggregate empty record set
-	for i, fld := range r.flds {
-		if out[i], err = fld.expr.eval(ctx, m); err != nil {
-			return err
-		}
-	}
-	_, err = f(nil, out)
-
-	return err
-}
-
-type sysColumnDefaultPlan struct{}
-
-func (r *sysColumnDefaultPlan) hasID() bool { return false }
-
-func (r *sysColumnDefaultPlan) explain(w strutil.Formatter) {
-	w.Format("┌Iterate all rows of table \"__Column\"\n└Output field names %v\n", qnames(r.fieldNames()))
-}
-
-func (r *sysColumnDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *sysColumnDefaultPlan) fieldNames() []string {
-	return []string{"TableName", "Ordinal", "Name", "Type"}
-}
-
-func (r *sysColumnDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
-	rec := make([]interface{}, 4)
-	di, err := ctx.db.info()
-	if err != nil {
-		return err
-	}
-
-	var id int64
-	for _, ti := range di.Tables {
-		rec[0] = ti.Name
-		var ix int64
-		for _, ci := range ti.Columns {
-			ix++
-			rec[1] = ix
-			rec[2] = ci.Name
-			rec[3] = ci.Type.String()
-			id++
-			if more, err := f(id, rec); !more || err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-type sysIndexDefaultPlan struct{}
-
-func (r *sysIndexDefaultPlan) hasID() bool { return false }
-
-func (r *sysIndexDefaultPlan) explain(w strutil.Formatter) {
-	w.Format("┌Iterate all rows of table \"__Index\"\n└Output field names %v\n", qnames(r.fieldNames()))
-}
-
-func (r *sysIndexDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *sysIndexDefaultPlan) fieldNames() []string {
-	return []string{"TableName", "ColumnName", "Name", "IsUnique"}
-}
-
-func (r *sysIndexDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
-	rec := make([]interface{}, 4)
-	di, err := ctx.db.info()
-	if err != nil {
-		return err
-	}
-
-	var id int64
-	for _, xi := range di.Indices {
-		rec[0] = xi.Table
-		rec[1] = xi.Column
-		rec[2] = xi.Name
-		rec[3] = xi.Unique
-		id++
-		if more, err := f(id, rec); !more || err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-type sysTableDefaultPlan struct{}
-
-func (r *sysTableDefaultPlan) hasID() bool { return false }
-
-func (r *sysTableDefaultPlan) explain(w strutil.Formatter) {
-	w.Format("┌Iterate all rows of table \"__Table\"\n└Output field names %v\n", qnames(r.fieldNames()))
-}
-
-func (r *sysTableDefaultPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *sysTableDefaultPlan) fieldNames() []string { return []string{"Name", "Schema"} }
-
-func (r *sysTableDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) error {
-	rec := make([]interface{}, 2)
-	di, err := ctx.db.info()
-	if err != nil {
-		return err
-	}
-
-	var id int64
-	for _, ti := range di.Tables {
-		rec[0] = ti.Name
-		a := []string{}
-		for _, ci := range ti.Columns {
-			s := ""
-			if ci.NotNull {
-				s += " NOT NULL"
-			}
-			if c := ci.Constraint; c != "" {
-				s += " " + c
-			}
-			if d := ci.Default; d != "" {
-				s += " DEFAULT " + d
-			}
-			a = append(a, fmt.Sprintf("%s %s%s", ci.Name, ci.Type, s))
-		}
-		rec[1] = fmt.Sprintf("CREATE TABLE %s (%s);", ti.Name, strings.Join(a, ", "))
-		id++
-		if more, err := f(id, rec); !more || err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-type tableNilPlan struct {
-	t *table
-}
-
-func (r *tableNilPlan) hasID() bool { return true }
-
-func (r *tableNilPlan) explain(w strutil.Formatter) {
-	w.Format("┌Iterate all rows of table %q\n└Output field names %v\n", r.t.name, qnames(r.fieldNames()))
-}
-
-func (r *tableNilPlan) fieldNames() []string { return []string{} }
-
-func (r *tableNilPlan) filter(expr expression) (plan, []string, error) {
-	return nil, nil, nil
-}
-
-func (r *tableNilPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (bool, error)) (err error) {
-	t := r.t
-	h := t.head
-	cols := t.cols
-	for h > 0 {
-		rec, err := t.store.Read(nil, h, cols...) // 0:next, 1:id, 2...: data
-		if err != nil {
-			return err
-		}
-
-		if m, err := f(rec[1], nil); !m || err != nil {
-			return err
-		}
-
-		h = rec[0].(int64) // next
-	}
-	return nil
-}
-
-type tableDefaultPlan struct {
-	t      *table
-	fields []string
-}
-
-func (r *tableDefaultPlan) hasID() bool { return true }
-
-func (r *tableDefaultPlan) explain(w strutil.Formatter) {
-	w.Format("┌Iterate all rows of table %q\n└Output field names %v\n", r.t.name, qnames(r.fields))
-}
-
-func (r *tableDefaultPlan) filterBinOp(x *binaryOperation) (plan, []string, error) {
-	ok, cn, rval, err := x.isIdentRelOpVal()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if !ok {
-		return nil, nil, nil
-	}
-
-	t := r.t
-	c, ix := t.findIndexByColName(cn)
-	if ix == nil { // Column cn has no index.
-		return nil, []string{fmt.Sprintf("%s(%s)", t.name, cn)}, nil
-	}
-
-	if rval, err = typeCheck1(rval, c); err != nil {
-		return nil, nil, err
-	}
-
-	switch x.op {
-	case eq:
-		return &indexPlan{t, cn, ix.name, ix.x, indexEq, rval, rval}, nil, nil
-	case '<':
-		return &indexPlan{t, cn, ix.name, ix.x, indexLt, nil, rval}, nil, nil
-	case le:
-		return &indexPlan{t, cn, ix.name, ix.x, indexLe, nil, rval}, nil, nil
-	case ge:
-		return &indexPlan{t, cn, ix.name, ix.x, indexGe, rval, nil}, nil, nil
-	case '>':
-		return &indexPlan{t, cn, ix.name, ix.x, indexGt, rval, nil}, nil, nil
-	case neq:
-		return &indexPlan{t, cn, ix.name, ix.x, indexNe, rval, rval}, nil, nil
-	default:
-		panic("internal error 069")
-	}
-}
-
-func (r *tableDefaultPlan) filterIdent(x *ident, trueValue bool) (plan, []string, error) {
-	cn := x.s
-	t := r.t
-	for _, v := range t.cols {
-		if v.name != cn {
-			continue
-		}
-
-		if v.typ != qBool {
-			return nil, nil, nil
-		}
-
-		xi := v.index + 1 // 0: id()
-		if xi >= len(t.indices) {
-			return nil, nil, nil
-		}
-
-		ix := t.indices[xi]
-		if ix == nil { // Column cn has no index.
-			return nil, []string{fmt.Sprintf("%s(%s)", t.name, cn)}, nil
-		}
-
-		kind := indexFalse
-		if trueValue {
-			kind = indexTrue
-		}
-		return &indexPlan{t, cn, ix.name, ix.x, kind, nil, nil}, nil, nil
-	}
-	return nil, nil, nil
-}
-
-func (r *tableDefaultPlan) filterIsNull(x *isNull) (plan, []string, error) {
-	ok, cn := isColumnExpression(x.expr)
-	if !ok {
-		return nil, nil, nil
-	}
-
-	t := r.t
-	_, ix := t.findIndexByColName(cn)
-	if ix == nil { // Column cn has no index.
-		return nil, []string{fmt.Sprintf("%s(%s)", t.name, cn)}, nil
-	}
-
-	switch {
-	case x.not:
-		return &indexPlan{t, cn, ix.name, ix.x, indexIsNotNull, nil, nil}, nil, nil
-	default:
-		return &indexPlan{t, cn, ix.name, ix.x, indexIsNull, nil, nil}, nil, nil
-	}
-}
-
-func (r *tableDefaultPlan) filter(expr expression) (plan, []string, error) {
-	cols := mentionedColumns(expr)
-	for _, v := range r.fields {
-		delete(cols, v)
-	}
-	for k := range cols {
-		return nil, nil, fmt.Errorf("unknown field %s", k)
-	}
-
-	var is []string
-
-	//TODO var sexpr string
-	//TODO for _, ix := range t.indices2 {
-	//TODO 	if len(ix.exprList) != 1 {
-	//TODO 		continue
-	//TODO 	}
-
-	//TODO 	if sexpr == "" {
-	//TODO 		sexpr = expr.String()
-	//TODO 	}
-	//TODO 	if ix.sources[0] != sexpr {
-	//TODO 		continue
-	//TODO 	}
-
-	//TODO }
-
-	switch x := expr.(type) {
-	case *binaryOperation:
-		return r.filterBinOp(x)
-	case *ident:
-		return r.filterIdent(x, true)
-	case *isNull:
-		return r.filterIsNull(x)
-	case *unaryOperation:
-		if x.op != '!' {
-			break
-		}
-
-		if operand, ok := x.v.(*ident); ok {
-			return r.filterIdent(operand, false)
-		}
-	default:
-		//dbg("", expr)
-		return nil, is, nil //TODO
-	}
-
-	return nil, is, nil
-}
-
-func (r *tableDefaultPlan) do(ctx *execCtx, f func(interface{}, []interface{}) (bool, error)) (err error) {
-	t := r.t
-	cols := t.cols
-	h := t.head
-	for h > 0 {
-		rec, err := t.row0(ctx, h)
-		if err != nil {
-			return err
-		}
-
-		h = rec[0].(int64)
-		id := rec[1].(int64)
-		for i, c := range cols {
-			rec[i] = rec[c.index+2]
-		}
-		if m, err := f(id, rec[:len(cols)]); !m || err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (r *tableDefaultPlan) fieldNames() []string { return r.fields }
-
-type nullPlan struct {
-	fields []string
-}
-
-func (r *nullPlan) hasID() bool { return false }
-
-func (r *nullPlan) fieldNames() []string { return r.fields }
-
-func (r *nullPlan) explain(w strutil.Formatter) {
-	w.Format("┌Iterate no rows\n└Output field names %v\n", qnames(r.fields))
-}
-
-func (r *nullPlan) do(*execCtx, func(interface{}, []interface{}) (bool, error)) error {
-	return nil
-}
-
-func (r *nullPlan) filter(expr expression) (plan, []string, error) {
-	return r, nil, nil
-}
-
-type leftJoinDefaultPlan struct {
-	on     expression
-	rsets  []plan
-	names  []string
-	right  int
-	fields []string
-}
-
-func (r *leftJoinDefaultPlan) hasID() bool { return false }
-
-func (r *leftJoinDefaultPlan) explain(w strutil.Formatter) {
-	w.Format("┌Compute Cartesian product of%i\n")
-	for i, v := range r.rsets {
-		sel := !isTableOrIndex(v)
-		if sel {
-			w.Format("┌Iterate all rows of virtual table %q%i\n", r.names[i])
-		}
-		v.explain(w)
-		if sel {
-			w.Format("%u└Output field names %v\n", qnames(v.fieldNames()))
-		}
-	}
-	w.Format("Extend the product with all NULL rows of %q when no match for %v%u\n", r.names[len(r.names)-1], r.on)
-	w.Format("└Output field names %v\n", qnames(r.fields))
-}
-
-func (r *leftJoinDefaultPlan) filter(expr expression) (plan, []string, error) {
-	var is []string
-	for i, v := range r.names {
-		e2, err := expr.clone(nil, v)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		p2, is2, err := r.rsets[i].filter(e2)
-		is = append(is, is2...)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		if p2 != nil {
-			r.rsets[i] = p2
-			return r, is, nil
-		}
-	}
-	return nil, is, nil
-}
-
-type rightJoinDefaultPlan struct {
-	leftJoinDefaultPlan
-}
-
-func (r *rightJoinDefaultPlan) hasID() bool { return false }
-
-func (r *rightJoinDefaultPlan) explain(w strutil.Formatter) {
-	w.Format("┌Compute Cartesian product of%i\n")
-	for i, v := range r.rsets {
-		sel := !isTableOrIndex(v)
-		if sel {
-			w.Format("┌Iterate all rows of virtual table %q%i\n", r.names[i])
-		}
-		v.explain(w)
-		if sel {
-			w.Format("%u└Output field names %v\n", qnames(v.fieldNames()))
-		}
-	}
-	w.Format("Extend the product with all NULL rows of all but %q when no match for %v%u\n", r.names[len(r.names)-1], r.on)
-	w.Format("└Output field names %v\n", qnames(r.fields))
-}
-
-func (r *rightJoinDefaultPlan) filter(expr expression) (plan, []string, error) {
-	var is []string
-	for i, v := range r.names {
-		e2, err := expr.clone(nil, v)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		p2, is2, err := r.rsets[i].filter(e2)
-		is = append(is, is2...)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		if p2 != nil {
-			r.rsets[i] = p2
-			return r, is, nil
-		}
-	}
-	return nil, is, nil
-}
-
-type fullJoinDefaultPlan struct {
-	leftJoinDefaultPlan
-}
-
-func (r *fullJoinDefaultPlan) hasID() bool { return false }
-
-func (r *fullJoinDefaultPlan) explain(w strutil.Formatter) {
-	w.Format("┌Compute Cartesian product of%i\n")
-	for i, v := range r.rsets {
-		sel := !isTableOrIndex(v)
-		if sel {
-			w.Format("┌Iterate all rows of virtual table %q%i\n", r.names[i])
-		}
-		v.explain(w)
-		if sel {
-			w.Format("%u└Output field names %v\n", qnames(v.fieldNames()))
-		}
-	}
-	w.Format("Extend the product with all NULL rows of %q when no match for %v\n", r.names[len(r.names)-1], r.on)
-	w.Format("Extend the product with all NULL rows of all but %q when no match for %v%u\n", r.names[len(r.names)-1], r.on)
-	w.Format("└Output field names %v\n", qnames(r.fields))
-}
-
-func (r *fullJoinDefaultPlan) filter(expr expression) (plan, []string, error) {
-	var is []string
-	for i, v := range r.names {
-		e2, err := expr.clone(nil, v)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		p2, is2, err := r.rsets[i].filter(e2)
-		is = append(is, is2...)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		if p2 != nil {
-			r.rsets[i] = p2
-			return r, is, nil
-		}
-	}
-	return nil, is, nil
-}
-
-func (r *leftJoinDefaultPlan) fieldNames() []string { return r.fields }
-
-func (r *leftJoinDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error {
-	m := map[interface{}]interface{}{}
-	ids := map[string]interface{}{}
-	var g func([]interface{}, []plan, int) error
-	var match bool
-	g = func(prefix []interface{}, rsets []plan, x int) (err error) {
-		return rsets[0].do(ctx, func(id interface{}, in []interface{}) (bool, error) {
-			ids[r.names[x]] = id
-			row := append(prefix, in...)
-			if len(rsets) > 1 {
-				if len(rsets) == 2 {
-					match = false
-				}
-				if err = g(row, rsets[1:], x+1); err != nil {
-					return false, err
-				}
-
-				if len(rsets) != 2 || match {
-					return true, nil
-				}
-
-				ids[r.names[x+1]] = nil
-				return f(ids, append(row, make([]interface{}, r.right)...))
-			}
-
-			for i, fld := range r.fields {
-				if fld != "" {
-					m[fld] = row[i]
-				}
-			}
-
-			val, err := r.on.eval(ctx, m)
-			if err != nil {
-				return false, err
-			}
-
-			if val == nil {
-				return true, nil
-			}
-
-			x, ok := val.(bool)
-			if !ok {
-				return false, fmt.Errorf("invalid ON expression %s (value of type %T)", val, val)
-			}
-
-			if !x {
-				return true, nil
-			}
-
-			match = true
-			return f(ids, row)
-		})
-	}
-	return g(nil, r.rsets, 0)
-}
-
-func (r *rightJoinDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error {
-	right := r.right
-	left := len(r.fields) - right
-	n := len(r.rsets)
-	m := map[interface{}]interface{}{}
-	ids := map[string]interface{}{}
-	var g func([]interface{}, []plan, int) error
-	var match bool
-	nf := len(r.fields)
-	fields := append(append([]string(nil), r.fields[nf-right:]...), r.fields[:nf-right]...)
-	g = func(prefix []interface{}, rsets []plan, x int) (err error) {
-		return rsets[0].do(ctx, func(id interface{}, in []interface{}) (bool, error) {
-			ids[r.names[x]] = id
-			row := append(prefix, in...)
-			if len(rsets) > 1 {
-				if len(rsets) == n {
-					match = false
-				}
-				if err = g(row, rsets[1:], x+1); err != nil {
-					return false, err
-				}
-
-				if len(rsets) != n || match {
-					return true, nil
-				}
-
-				for i := 0; i < n-1; i++ {
-					ids[r.names[i]] = nil
-				}
-
-				// rigth, left -> left, right
-				return f(ids, append(make([]interface{}, left), row[:right]...))
-			}
-
-			for i, fld := range fields {
-				if fld != "" {
-					m[fld] = row[i]
-				}
-			}
-
-			val, err := r.on.eval(ctx, m)
-			if err != nil {
-				return false, err
-			}
-
-			if val == nil {
-				return true, nil
-			}
-
-			x, ok := val.(bool)
-			if !ok {
-				return false, fmt.Errorf("invalid ON expression %s (value of type %T)", val, val)
-			}
-
-			if !x {
-				return true, nil
-			}
-
-			match = true
-			// rigth, left -> left, right
-			return f(ids, append(append([]interface{}(nil), row[right:]...), row[:right]...))
-		})
-	}
-	return g(nil, append([]plan{r.rsets[n-1]}, r.rsets[:n-1]...), 0)
-}
-
-func (r *fullJoinDefaultPlan) do(ctx *execCtx, f func(id interface{}, data []interface{}) (more bool, err error)) error {
-	b3 := b.TreeNew(func(a, b interface{}) int {
-		x := a.(int64)
-		y := b.(int64)
-		if x < y {
-			return -1
-		}
-
-		if x == y {
-			return 0
-		}
-
-		return 1
-	})
-	m := map[interface{}]interface{}{}
-	ids := map[string]interface{}{}
-	var g func([]interface{}, []plan, int) error
-	var match bool
-	var rid int64
-	firstR := true
-	g = func(prefix []interface{}, rsets []plan, x int) (err error) {
-		return rsets[0].do(ctx, func(id interface{}, in []interface{}) (bool, error) {
-			ids[r.names[x]] = id
-			row := append(prefix, in...)
-			if len(rsets) > 1 {
-				if len(rsets) == 2 {
-					match = false
-					rid = 0
-				}
-				if err = g(row, rsets[1:], x+1); err != nil {
-					return false, err
-				}
-
-				if len(rsets) == 2 {
-					firstR = false
-				}
-				if len(rsets) != 2 || match {
-					return true, nil
-				}
-
-				ids[r.names[x+1]] = nil
-				return f(ids, append(row, make([]interface{}, r.right)...))
-			}
-
-			rid++
-			if firstR {
-				b3.Set(rid, in)
-			}
-			for i, fld := range r.fields {
-				if fld != "" {
-					m[fld] = row[i]
-				}
-			}
-
-			val, err := r.on.eval(ctx, m)
-			if err != nil {
-				return false, err
-			}
-
-			if val == nil {
-				return true, nil
-			}
-
-			x, ok := val.(bool)
-			if !ok {
-				return false, fmt.Errorf("invalid ON expression %s (value of type %T)", val, val)
-			}
-
-			if !x {
-				return true, nil
-			}
-
-			match = true
-			b3.Delete(rid)
-			return f(ids, row)
-		})
-	}
-	if err := g(nil, r.rsets, 0); err != nil {
-		return err
-	}
-
-	it, err := b3.SeekFirst()
-	if err != nil {
-		return noEOF(err)
-	}
-
-	pref := make([]interface{}, len(r.fields)-r.right)
-	for {
-		_, v, err := it.Next()
-		if err != nil {
-			return noEOF(err)
-		}
-
-		more, err := f(nil, append(pref, v.([]interface{})...))
-		if err != nil || !more {
-			return err
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/ql.ebnf b/Godeps/_workspace/src/github.com/cznic/ql/ql.ebnf
deleted file mode 100644
index f8b418d8cf..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/ql.ebnf
+++ /dev/null
@@ -1,225 +0,0 @@
-andand = "&&" .
-andnot = "&^" .
-ascii_letter = "a" … "z" | "A" … "Z" .
-big_u_value = "\\" "U" hex_digit hex_digit hex_digit hex_digit hex_digit hex_digit hex_digit hex_digit .
-byte_value = octal_byte_value | hex_byte_value .
-decimal_digit = "0" … "9" .
-decimal_lit = ( "1" … "9" ) { decimal_digit } .
-decimals = decimal_digit { decimal_digit } .
-eq = "==" .
-escaped_char = "\\" (
-		  "a"
-		| "b"
-		| "f"
-		| "n"
-		| "r"
-		| "t"
-		| "v"
-		| "\\"
-		| "'"
-		| "\""
-	  ) .
-exponent = ( "e" | "E" ) [ "+" | "-" ] decimals .
-float_lit = decimals "." [ decimals ] [ exponent ]
-	| decimals exponent
-	| "." decimals [ exponent ] .
-ge = ">=" .
-hex_byte_value = "\\" "x" hex_digit hex_digit .
-hex_digit = "0" … "9"
-	| "A" … "F"
-	| "a" … "f" .
-hex_lit = "0" ( "x" | "X" ) hex_digit { hex_digit } .
-identifier = letter { letter | decimal_digit } .
-imaginary_lit = ( decimals | float_lit ) "i" .
-int_lit = decimal_lit
-	| octal_lit
-	| hex_lit .
-interpreted_string_lit = "\"" { unicode_value | byte_value } "\"" .
-le = "<=" .
-letter = ascii_letter | "_" .
-little_u_value = "\\" "u" hex_digit hex_digit hex_digit hex_digit .
-lsh = "<<" .
-neq = "!=" .
-newline = .
-octal_byte_value = "\\" octal_digit octal_digit octal_digit .
-octal_digit = "0" … "7" .
-octal_lit = "0" { octal_digit } .
-oror = "||" .
-ql_parameter = ( "?" | "$" ) "1" … "9" { "0" … "9" } .
-raw_string_lit = "`" { unicode_char | newline } "`" .
-rsh = ">>" .
-rune_lit = "'" ( unicode_value | byte_value ) "'" .
-string_lit = raw_string_lit | interpreted_string_lit .
-unicode_char = .
-unicode_value = unicode_char
-	| little_u_value
-	| big_u_value
-	| escaped_char .
-
-AlterTableStmt = "ALTER" "TABLE" TableName (
-		  "ADD" ColumnDef
-		| "DROP" "COLUMN" ColumnName
-	  ) .
-Assignment = ColumnName "=" Expression .
-AssignmentList = Assignment { "," Assignment } [ "," ] .
-BeginTransactionStmt = "BEGIN" "TRANSACTION" .
-Call = "(" [ "*" | ExpressionList ] ")" .
-ColumnDef = ColumnName Type [
-		  "NOT" "NULL"
-		| Expression
-	  ] [ "DEFAULT" Expression ] .
-ColumnName = identifier .
-ColumnNameList = ColumnName { "," ColumnName } [ "," ] .
-CommitStmt = "COMMIT" .
-Conversion = Type "(" Expression ")" .
-CreateIndexStmt = "CREATE" [ "UNIQUE" ] "INDEX" [
-		 "IF" "NOT" "EXISTS"
-	  ] IndexName "ON" TableName "(" ExpressionList ")" .
-CreateTableStmt = "CREATE" "TABLE" [
-		 "IF" "NOT" "EXISTS"
-	  ] TableName "(" ColumnDef { "," ColumnDef } [ "," ] ")" .
-DeleteFromStmt = "DELETE" "FROM" TableName [ WhereClause ] .
-DropIndexStmt = "DROP" "INDEX" [ "IF" "EXISTS" ] IndexName .
-DropTableStmt = "DROP" "TABLE" [ "IF" "EXISTS" ] TableName .
-EmptyStmt = .
-ExplainStmt = "EXPLAIN" Statement .
-Expression = Term {
-		 ( oror | "OR" ) Term
-	  } .
-ExpressionList = Expression { "," Expression } [ "," ] .
-Factor = PrimaryFactor {
-		 (
-			  ge
-			| ">"
-			| le
-			| "<"
-			| neq
-			| eq
-			| "LIKE"
-		  ) PrimaryFactor
-	  } [ Predicate ] .
-Field = Expression [ "AS" identifier ] .
-FieldList = Field { "," Field } [ "," ] .
-GroupByClause = "GROUP BY" ColumnNameList .
-Index = "[" Expression "]" .
-IndexName = identifier .
-InsertIntoStmt = "INSERT" "INTO" TableName [
-		 "(" ColumnNameList ")"
-	  ] ( Values | SelectStmt ) .
-JoinClause = (
-		  "LEFT"
-		| "RIGHT"
-		| "FULL"
-	  ) [ "OUTER" ] "JOIN" RecordSet "ON" Expression .
-Limit = "Limit" Expression .
-Literal = "FALSE"
-	| "NULL"
-	| "TRUE"
-	| float_lit
-	| imaginary_lit
-	| int_lit
-	| rune_lit
-	| string_lit
-	| ql_parameter .
-Offset = "OFFSET" Expression .
-Operand = Literal
-	| QualifiedIdent
-	| "(" Expression ")" .
-OrderBy = "ORDER" "BY" ExpressionList [ "ASC" | "DESC" ] .
-Predicate = (
-		  [ "NOT" ] (
-			  "IN" "(" ExpressionList ")"
-			| "IN" "(" SelectStmt [ ";" ] ")"
-			| "BETWEEN" PrimaryFactor "AND" PrimaryFactor
-		  )
-		| "IS" [ "NOT" ] "NULL"
-	  ) .
-PrimaryExpression = Operand
-	| Conversion
-	| PrimaryExpression Index
-	| PrimaryExpression Slice
-	| PrimaryExpression Call .
-PrimaryFactor = PrimaryTerm {
-		 (
-			  "^"
-			| "|"
-			| "-"
-			| "+"
-		  ) PrimaryTerm
-	  } .
-PrimaryTerm = UnaryExpr {
-		 (
-			  andnot
-			| "&"
-			| lsh
-			| rsh
-			| "%"
-			| "/"
-			| "*"
-		  ) UnaryExpr
-	  } .
-QualifiedIdent = identifier [ "." identifier ] .
-RecordSet = (
-		  TableName
-		| "(" SelectStmt [ ";" ] ")"
-	  ) [ "AS" identifier ] .
-RecordSetList = RecordSet { "," RecordSet } [ "," ] .
-RollbackStmt = "ROLLBACK" .
-SelectStmt = "SELECT" [ "DISTINCT" ] ( "*" | FieldList ) "FROM" RecordSetList [ JoinClause ] [ WhereClause ] [ GroupByClause ] [ OrderBy ] [ Limit ] [ Offset ] .
-Slice = "[" [ Expression ] ":" [ Expression ] "]" .
-Statement = EmptyStmt
-	| AlterTableStmt
-	| BeginTransactionStmt
-	| CommitStmt
-	| CreateIndexStmt
-	| CreateTableStmt
-	| DeleteFromStmt
-	| DropIndexStmt
-	| DropTableStmt
-	| InsertIntoStmt
-	| RollbackStmt
-	| SelectStmt
-	| TruncateTableStmt
-	| UpdateStmt
-	| ExplainStmt .
-StatementList = Statement { ";" Statement } .
-TableName = identifier .
-Term = Factor {
-		 ( andand | "AND" ) Factor
-	  } .
-TruncateTableStmt = "TRUNCATE" "TABLE" TableName .
-Type = "bigint"
-	| "bigrat"
-	| "blob"
-	| "bool"
-	| "byte"
-	| "complex128"
-	| "complex64"
-	| "duration"
-	| "float"
-	| "float32"
-	| "float64"
-	| "int"
-	| "int16"
-	| "int32"
-	| "int64"
-	| "int8"
-	| "rune"
-	| "string"
-	| "time"
-	| "uint"
-	| "uint16"
-	| "uint32"
-	| "uint64"
-	| "uint8" .
-UnaryExpr = [
-		  "^"
-		| "!"
-		| "-"
-		| "+"
-	  ] PrimaryExpression .
-UpdateStmt = "UPDATE" TableName [ "SET" ] AssignmentList [ WhereClause ] .
-Values = "VALUES" "(" ExpressionList ")" {
-		 "," "(" ExpressionList ")"
-	  } [ "," ] .
-WhereClause = "WHERE" Expression .
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/ql.go b/Godeps/_workspace/src/github.com/cznic/ql/ql.go
deleted file mode 100644
index 82c3c5fa58..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/ql.go
+++ /dev/null
@@ -1,1729 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//LATER profile mem
-//LATER profile cpu
-//LATER coverage
-
-package ql
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"math/big"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/cznic/strutil"
-)
-
-const (
-	crossJoin = iota
-	leftJoin
-	rightJoin
-	fullJoin
-)
-
-// NOTE: all rset implementations must be safe for concurrent use by multiple
-// goroutines.  If the do method requires any execution domain local data, they
-// must be held out of the implementing instance.
-var (
-	_ rset = (*distinctRset)(nil)
-	_ rset = (*groupByRset)(nil)
-	_ rset = (*joinRset)(nil)
-	_ rset = (*limitRset)(nil)
-	_ rset = (*offsetRset)(nil)
-	_ rset = (*orderByRset)(nil)
-	_ rset = (*selectRset)(nil)
-	_ rset = (*selectStmt)(nil)
-	_ rset = (*tableRset)(nil)
-	_ rset = (*whereRset)(nil)
-
-	isTesting bool // enables test hook: select from an index
-)
-
-type rset interface {
-	plan(ctx *execCtx) (plan, error)
-}
-
-type recordset struct {
-	ctx *execCtx
-	plan
-	tx *TCtx
-}
-
-func (r recordset) fieldNames() []interface{} {
-	f := r.plan.fieldNames()
-	a := make([]interface{}, len(f))
-	for i, v := range f {
-		a[i] = v
-	}
-	return a
-}
-
-// Do implements Recordset.
-func (r recordset) Do(names bool, f func(data []interface{}) (bool, error)) error {
-	if names {
-		if more, err := f(r.fieldNames()); err != nil || !more {
-			return err
-		}
-	}
-	return r.ctx.db.do(r, f)
-}
-
-// Fields implements Recordset.
-func (r recordset) Fields() (names []string, err error) {
-	return r.plan.fieldNames(), nil
-}
-
-// FirstRow implements Recordset.
-func (r recordset) FirstRow() (row []interface{}, err error) {
-	rows, err := r.Rows(1, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(rows) != 0 {
-		return rows[0], nil
-	}
-
-	return nil, nil
-}
-
-// Rows implements Recordset.
-func (r recordset) Rows(limit, offset int) ([][]interface{}, error) {
-	var rows [][]interface{}
-	if err := r.Do(false, func(row []interface{}) (bool, error) {
-		if offset > 0 {
-			offset--
-			return true, nil
-		}
-
-		switch {
-		case limit < 0:
-			rows = append(rows, row)
-			return true, nil
-		case limit == 0:
-			return false, nil
-		default: // limit > 0
-			rows = append(rows, row)
-			limit--
-			return limit > 0, nil
-		}
-	}); err != nil {
-		return nil, err
-	}
-
-	return rows, nil
-}
-
-// List represents a group of compiled statements.
-type List struct {
-	l      []stmt
-	params int
-}
-
-// String implements fmt.Stringer
-func (l List) String() string {
-	var b bytes.Buffer
-	f := strutil.IndentFormatter(&b, "\t")
-	for _, s := range l.l {
-		switch s.(type) {
-		case beginTransactionStmt:
-			f.Format("%s\n%i", s)
-		case commitStmt, rollbackStmt:
-			f.Format("%u%s\n", s)
-		default:
-			f.Format("%s\n", s)
-		}
-	}
-	return b.String()
-}
-
-// IsExplainStmt reports whether l is a single EXPLAIN statment or a single EXPLAIN
-// statment enclosed in a transaction.
-func (l List) IsExplainStmt() bool {
-	switch len(l.l) {
-	case 1:
-		_, ok := l.l[0].(*explainStmt)
-		return ok
-	case 3:
-		if _, ok := l.l[0].(beginTransactionStmt); !ok {
-			return false
-		}
-		if _, ok := l.l[1].(*explainStmt); !ok {
-			return false
-		}
-		_, ok := l.l[2].(commitStmt)
-		return ok
-	default:
-		return false
-	}
-}
-
-type groupByRset struct {
-	colNames []string
-	src      plan
-}
-
-func (r *groupByRset) plan(ctx *execCtx) (plan, error) {
-	fields := r.src.fieldNames()
-	for _, v := range r.colNames {
-		found := false
-		for _, v2 := range fields {
-			if v == v2 {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return nil, fmt.Errorf("unknown field %s", v)
-		}
-	}
-	return &groupByDefaultPlan{colNames: r.colNames, src: r.src, fields: fields}, nil
-}
-
-// TCtx represents transaction context. It enables to execute multiple
-// statement lists in the same context. The same context guarantees the state
-// of the DB cannot change in between the separated executions.
-//
-// LastInsertID
-//
-// LastInsertID is updated by INSERT INTO statements. The value considers
-// performed ROLLBACK statements, if any, even though roll backed IDs are not
-// reused. QL clients should treat the field as read only.
-//
-// RowsAffected
-//
-// RowsAffected is updated by INSERT INTO, DELETE FROM and UPDATE statements.
-// The value does not (yet) consider any ROLLBACK statements involved.  QL
-// clients should treat the field as read only.
-type TCtx struct {
-	LastInsertID int64
-	RowsAffected int64
-}
-
-// NewRWCtx returns a new read/write transaction context.  NewRWCtx is safe for
-// concurrent use by multiple goroutines, every one of them will get a new,
-// unique conext.
-func NewRWCtx() *TCtx { return &TCtx{} }
-
-// Recordset is a result of a select statment. It can call a user function for
-// every row (record) in the set using the Do method.
-//
-// Recordsets can be safely reused. Evaluation of the rows is performed lazily.
-// Every invocation of Do will see the current, potentially actualized data.
-//
-// Do
-//
-// Do will call f for every row (record) in the Recordset.
-//
-// If f returns more == false or err != nil then f will not be called for any
-// remaining rows in the set and the err value is returned from Do.
-//
-// If names == true then f is firstly called with a virtual row
-// consisting of field (column) names of the RecordSet.
-//
-// Do is executed in a read only context and performs a RLock of the
-// database.
-//
-// Do is safe for concurrent use by multiple goroutines.
-//
-// Fields
-//
-// Fields return a slice of field names of the recordset. The result is computed
-// without actually computing the recordset rows.
-//
-// FirstRow
-//
-// FirstRow will return the first row of the RecordSet or an error, if any. If
-// the Recordset has no rows the result is (nil, nil).
-//
-// Rows
-//
-// Rows will return rows in Recordset or an error, if any. The semantics of
-// limit and offset are the same as of the LIMIT and OFFSET clauses of the
-// SELECT statement. To get all rows pass limit < 0. If there are no rows to
-// return the result is (nil, nil).
-type Recordset interface {
-	Do(names bool, f func(data []interface{}) (more bool, err error)) error
-	Fields() (names []string, err error)
-	FirstRow() (row []interface{}, err error)
-	Rows(limit, offset int) (rows [][]interface{}, err error)
-}
-
-type assignment struct {
-	colName string
-	expr    expression
-}
-
-func (a *assignment) String() string {
-	return fmt.Sprintf("%s=%s", a.colName, a.expr)
-}
-
-type distinctRset struct {
-	src plan
-}
-
-func (r *distinctRset) plan(ctx *execCtx) (plan, error) {
-	return &distinctDefaultPlan{src: r.src, fields: r.src.fieldNames()}, nil
-}
-
-type orderByRset struct {
-	asc bool
-	by  []expression
-	src plan
-}
-
-func (r *orderByRset) String() string {
-	a := make([]string, len(r.by))
-	for i, v := range r.by {
-		a[i] = v.String()
-	}
-	s := strings.Join(a, ", ")
-	if !r.asc {
-		s += " DESC"
-	}
-	return s
-}
-
-func (r *orderByRset) plan(ctx *execCtx) (plan, error) {
-	if _, ok := r.src.(*nullPlan); ok {
-		return r.src, nil
-	}
-
-	var by []expression
-	fields := r.src.fieldNames()
-	for _, e := range r.by {
-		cols := mentionedColumns(e)
-		for k := range cols {
-			found := false
-			for _, v := range fields {
-				if k == v {
-					found = true
-					break
-				}
-			}
-			if !found {
-				return nil, fmt.Errorf("unknown field %s", k)
-			}
-		}
-		if len(cols) == 0 {
-			v, err := e.eval(ctx, nil)
-			if err != nil {
-				by = append(by, e)
-				continue
-			}
-
-			if isConstValue(v) != nil {
-				continue
-			}
-		}
-
-		by = append(by, e)
-	}
-	return &orderByDefaultPlan{asc: r.asc, by: by, src: r.src, fields: fields}, nil
-}
-
-type whereRset struct {
-	expr expression
-	src  plan
-}
-
-func (r *whereRset) planBinOp(x *binaryOperation) (plan, error) {
-	p := r.src
-	ok, cn := isColumnExpression(x.l)
-	if ok && cn == "id()" {
-		if v := isConstValue(x.r); v != nil {
-			v, err := typeCheck1(v, idCol)
-			if err != nil {
-				return nil, err
-			}
-
-			rv := v.(int64)
-			switch {
-			case p.hasID():
-				switch x.op {
-				case '<':
-					if rv <= 1 {
-						return &nullPlan{p.fieldNames()}, nil
-					}
-				case '>':
-					if rv <= 0 {
-						return p, nil
-					}
-				case ge:
-					if rv >= 1 {
-						return p, nil
-					}
-				case neq:
-					if rv <= 0 {
-						return p, nil
-					}
-				case eq:
-					if rv <= 0 {
-						return &nullPlan{p.fieldNames()}, nil
-					}
-				case le:
-					if rv <= 0 {
-						return &nullPlan{p.fieldNames()}, nil
-					}
-				}
-			}
-		}
-	}
-
-	var err error
-	var p2 plan
-	var is []string
-	switch x.op {
-	case eq, ge, '>', le, '<', neq:
-		if p2, is, err = p.filter(x); err != nil {
-			return nil, err
-		}
-
-		if p2 != nil {
-			return p2, nil
-		}
-	case andand:
-		var in []expression
-		var f func(expression)
-		f = func(e expression) {
-			b, ok := e.(*binaryOperation)
-			if !ok || b.op != andand {
-				in = append(in, e)
-				return
-			}
-
-			f(b.l)
-			f(b.r)
-		}
-		f(x)
-		out := []expression{}
-		p := r.src
-		isNewPlan := false
-		for _, e := range in {
-			p2, is2, err := p.filter(e)
-			if err != nil {
-				return nil, err
-			}
-
-			if p2 == nil {
-				is = append(is, is2...)
-				out = append(out, e)
-				continue
-			}
-
-			p = p2
-			isNewPlan = true
-		}
-
-		if !isNewPlan {
-			break
-		}
-
-		if len(out) == 0 {
-			return p, nil
-		}
-
-		for len(out) > 1 {
-			n := len(out)
-			e, err := newBinaryOperation(andand, out[n-2], out[n-1])
-			if err != nil {
-				return nil, err
-			}
-
-			out = out[:n-1]
-			out[n-2] = e
-		}
-
-		return &filterDefaultPlan{p, out[0], is}, nil
-	}
-
-	return &filterDefaultPlan{p, x, is}, nil
-}
-
-func (r *whereRset) planIdent(x *ident) (plan, error) {
-	p := r.src
-	p2, is, err := p.filter(x)
-	if err != nil {
-		return nil, err
-	}
-
-	if p2 != nil {
-		return p2, nil
-	}
-
-	return &filterDefaultPlan{p, x, is}, nil
-}
-
-func (r *whereRset) planIsNull(x *isNull) (plan, error) {
-	p := r.src
-	ok, cn := isColumnExpression(x.expr)
-	if !ok {
-		return &filterDefaultPlan{p, x, nil}, nil
-	}
-
-	if cn == "id()" {
-		switch {
-		case p.hasID():
-			switch {
-			case x.not: // IS NOT NULL
-				return p, nil
-			default: // IS NULL
-				return &nullPlan{p.fieldNames()}, nil
-			}
-		default:
-			switch {
-			case x.not: // IS NOT NULL
-				return &nullPlan{p.fieldNames()}, nil
-			default: // IS NULL
-				return p, nil
-			}
-		}
-	}
-
-	p2, is, err := p.filter(x)
-	if err != nil {
-		return nil, err
-	}
-
-	if p2 != nil {
-		return p2, nil
-	}
-
-	return &filterDefaultPlan{p, x, is}, nil
-}
-
-func (r *whereRset) planUnaryOp(x *unaryOperation) (plan, error) {
-	p := r.src
-	p2, is, err := p.filter(x)
-	if err != nil {
-		return nil, err
-	}
-
-	if p2 != nil {
-		return p2, nil
-	}
-
-	return &filterDefaultPlan{p, x, is}, nil
-}
-
-func (r *whereRset) plan(ctx *execCtx) (plan, error) {
-	expr, err := r.expr.clone(ctx.arg)
-	if err != nil {
-		return nil, err
-	}
-
-	switch r.src.(type) {
-	case *leftJoinDefaultPlan, *rightJoinDefaultPlan, *fullJoinDefaultPlan:
-		return &filterDefaultPlan{r.src, expr, nil}, nil
-	}
-
-	switch x := expr.(type) {
-	case *binaryOperation:
-		return r.planBinOp(x)
-	case *ident:
-		return r.planIdent(x)
-	case *isNull:
-		return r.planIsNull(x)
-	case *pIn:
-		//TODO optimize
-		//TODO show plan
-	case *pLike:
-		//TODO optimize
-	case *unaryOperation:
-		return r.planUnaryOp(x)
-	}
-
-	return &filterDefaultPlan{r.src, expr, nil}, nil
-}
-
-type offsetRset struct {
-	expr expression
-	src  plan
-}
-
-func (r *offsetRset) plan(ctx *execCtx) (plan, error) {
-	return &offsetDefaultPlan{expr: r.expr, src: r.src, fields: r.src.fieldNames()}, nil
-}
-
-type limitRset struct {
-	expr expression
-	src  plan
-}
-
-func (r *limitRset) plan(ctx *execCtx) (plan, error) {
-	return &limitDefaultPlan{expr: r.expr, src: r.src, fields: r.src.fieldNames()}, nil
-}
-
-type selectRset struct {
-	flds []*fld
-	src  plan
-}
-
-func (r *selectRset) plan(ctx *execCtx) (plan, error) {
-	var flds2 []*fld
-	if len(r.flds) != 0 {
-		m := map[string]struct{}{}
-		for _, v := range r.flds {
-			mentionedColumns0(v.expr, true, true, m)
-		}
-		for _, v := range r.src.fieldNames() {
-			delete(m, v)
-		}
-		for k := range m {
-			return nil, fmt.Errorf("unknown field %s", k)
-		}
-
-		flds2 = append(flds2, r.flds...)
-	}
-
-	if x, ok := r.src.(*groupByDefaultPlan); ok {
-		if len(r.flds) == 0 {
-			fields := x.fieldNames()
-			flds := make([]*fld, len(fields))
-			for i, v := range fields {
-				flds[i] = &fld{&ident{v}, v}
-			}
-			return &selectFieldsGroupPlan{flds: flds, src: x, fields: fields}, nil
-		}
-
-		p := &selectFieldsGroupPlan{flds: flds2, src: x}
-		for _, v := range r.flds {
-			p.fields = append(p.fields, v.name)
-		}
-		return p, nil
-	}
-
-	if len(r.flds) == 0 {
-		return r.src, nil
-	}
-
-	f0 := r.src.fieldNames()
-	if len(f0) == len(flds2) {
-		match := true
-		for i, v := range flds2 {
-			if x, ok := v.expr.(*ident); ok && x.s == f0[i] && v.name == f0[i] {
-				continue
-			}
-
-			match = false
-			break
-		}
-
-		if match {
-			return r.src, nil
-		}
-	}
-
-	src := r.src
-	if x, ok := src.(*tableDefaultPlan); ok {
-		isconst := true
-		for _, v := range flds2 {
-			if isConstValue(v.expr) == nil {
-				isconst = false
-				break
-			}
-		}
-		if isconst { // #250
-			src = &tableNilPlan{x.t}
-		}
-	}
-
-	p := &selectFieldsDefaultPlan{flds: flds2, src: src}
-	for _, v := range r.flds {
-		p.fields = append(p.fields, v.name)
-	}
-	return p, nil
-}
-
-type tableRset string
-
-func (r tableRset) plan(ctx *execCtx) (plan, error) {
-	switch r {
-	case "__Table":
-		return &sysTableDefaultPlan{}, nil
-	case "__Column":
-		return &sysColumnDefaultPlan{}, nil
-	case "__Index":
-		return &sysIndexDefaultPlan{}, nil
-	}
-
-	t, ok := ctx.db.root.tables[string(r)]
-	if !ok && isTesting {
-		if _, x0 := ctx.db.root.findIndexByName(string(r)); x0 != nil {
-			return &selectIndexDefaultPlan{nm: string(r), x: x0}, nil
-		}
-	}
-
-	if !ok {
-		return nil, fmt.Errorf("table %s does not exist", r)
-	}
-
-	rs := &tableDefaultPlan{t: t}
-	for _, col := range t.cols {
-		rs.fields = append(rs.fields, col.name)
-	}
-	return rs, nil
-}
-
-func findFldIndex(fields []*fld, name string) int {
-	for i, f := range fields {
-		if f.name == name {
-			return i
-		}
-	}
-
-	return -1
-}
-
-func findFld(fields []*fld, name string) (f *fld) {
-	for _, f = range fields {
-		if f.name == name {
-			return
-		}
-	}
-
-	return nil
-}
-
-type col struct {
-	index      int
-	name       string
-	typ        int
-	constraint *constraint
-	dflt       expression
-}
-
-var idCol = &col{name: "id()", typ: qInt64}
-
-func findCol(cols []*col, name string) (c *col) {
-	for _, c = range cols {
-		if c.name == name {
-			return
-		}
-	}
-
-	return nil
-}
-
-func (f *col) clone() *col {
-	var r col
-	r = *f
-	r.constraint = f.constraint.clone()
-	if f.dflt != nil {
-		r.dflt, _ = r.dflt.clone(nil)
-	}
-	return &r
-}
-
-func (f *col) typeCheck(x interface{}) (ok bool) { //NTYPE
-	switch x.(type) {
-	case nil:
-		return true
-	case bool:
-		return f.typ == qBool
-	case complex64:
-		return f.typ == qComplex64
-	case complex128:
-		return f.typ == qComplex128
-	case float32:
-		return f.typ == qFloat32
-	case float64:
-		return f.typ == qFloat64
-	case int8:
-		return f.typ == qInt8
-	case int16:
-		return f.typ == qInt16
-	case int32:
-		return f.typ == qInt32
-	case int64:
-		return f.typ == qInt64
-	case string:
-		return f.typ == qString
-	case uint8:
-		return f.typ == qUint8
-	case uint16:
-		return f.typ == qUint16
-	case uint32:
-		return f.typ == qUint32
-	case uint64:
-		return f.typ == qUint64
-	case []byte:
-		return f.typ == qBlob
-	case *big.Int:
-		return f.typ == qBigInt
-	case *big.Rat:
-		return f.typ == qBigRat
-	case time.Time:
-		return f.typ == qTime
-	case time.Duration:
-		return f.typ == qDuration
-	case chunk:
-		return true // was checked earlier
-	}
-	return
-}
-
-func cols2meta(f []*col) (s string) {
-	a := []string{}
-	for _, f := range f {
-		a = append(a, string(f.typ)+f.name)
-	}
-	return strings.Join(a, "|")
-}
-
-// DB represent the database capable of executing QL statements.
-type DB struct {
-	cc          *TCtx // Current transaction context
-	isMem       bool
-	mu          sync.Mutex
-	root        *root
-	rw          bool // DB FSM
-	rwmu        sync.RWMutex
-	store       storage
-	tnl         int // Transaction nesting level
-	exprCache   map[string]expression
-	exprCacheMu sync.Mutex
-	hasIndex2   int // 0: nope, 1: in progress, 2: yes.
-}
-
-var selIndex2Expr = MustCompile("select Expr from __Index2_Expr where Index2_ID == $1")
-
-func newDB(store storage) (db *DB, err error) {
-	db0 := &DB{
-		exprCache: map[string]expression{},
-		store:     store,
-	}
-	if db0.root, err = newRoot(store); err != nil {
-		return
-	}
-
-	ctx := &execCtx{db: db0}
-	for _, t := range db0.root.tables {
-		if err := t.constraintsAndDefaults(ctx); err != nil {
-			return nil, err
-		}
-	}
-
-	if !db0.hasAllIndex2() {
-		return db0, nil
-	}
-
-	db0.hasIndex2 = 2
-	rss, _, err := db0.Run(nil, "select id(), TableName, IndexName, IsUnique, Root from __Index2 where !IsSimple")
-	if err != nil {
-		return nil, err
-	}
-
-	rows, err := rss[0].Rows(-1, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, row := range rows {
-		defer func() {
-			if e := recover(); e != nil {
-				err = fmt.Errorf("error loading DB indices: %v", e)
-			}
-		}()
-
-		id := row[0].(int64)
-		tn := row[1].(string)
-		xn := row[2].(string)
-		unique := row[3].(bool)
-		xroot := row[4].(int64)
-
-		t := db0.root.tables[tn]
-		if t == nil {
-			return nil, fmt.Errorf("DB index refers to nonexistent table: %s", tn)
-		}
-
-		x, err := store.OpenIndex(unique, xroot)
-		if err != nil {
-			return nil, err
-		}
-
-		if v := t.indices2[xn]; v != nil {
-			return nil, fmt.Errorf("duplicate DB index: %s", xn)
-		}
-
-		ix := &index2{
-			unique: unique,
-			x:      x,
-			xroot:  xroot,
-		}
-
-		rss, _, err := db0.Execute(nil, selIndex2Expr, id)
-		if err != nil {
-			return nil, err
-		}
-
-		rows, err := rss[0].Rows(-1, 0)
-		if err != nil {
-			return nil, err
-		}
-
-		if len(rows) == 0 {
-			return nil, fmt.Errorf("index has no expression: %s", xn)
-		}
-
-		var sources []string
-		var list []expression
-		for _, row := range rows {
-			src, ok := row[0].(string)
-			if !ok {
-				return nil, fmt.Errorf("index %s: expression of type %T", xn, row[0])
-			}
-
-			expr, err := db0.str2expr(src)
-			if err != nil {
-				return nil, fmt.Errorf("index %s: expression error: %v", xn, err)
-			}
-
-			sources = append(sources, src)
-			list = append(list, expr)
-		}
-
-		ix.sources = sources
-		ix.exprList = list
-		if t.indices2 == nil {
-			t.indices2 = map[string]*index2{}
-		}
-		t.indices2[xn] = ix
-	}
-	return db0, nil
-}
-
-func (db *DB) deleteIndex2ByIndexName(nm string) error {
-	for _, s := range deleteIndex2ByIndexName.l {
-		if _, err := s.exec(&execCtx{db: db, arg: []interface{}{nm}}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (db *DB) deleteIndex2ByTableName(nm string) error {
-	for _, s := range deleteIndex2ByTableName.l {
-		if _, err := s.exec(&execCtx{db: db, arg: []interface{}{nm}}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (db *DB) createIndex2() error {
-	if db.hasIndex2 != 0 {
-		return nil
-	}
-
-	db.hasIndex2 = 1
-	ctx := execCtx{db: db}
-	for _, s := range createIndex2.l {
-		if _, err := s.exec(&ctx); err != nil {
-			db.hasIndex2 = 0
-			return err
-		}
-	}
-
-	for t := db.root.thead; t != nil; t = t.tnext {
-		for i, index := range t.indices {
-			if index == nil {
-				continue
-			}
-
-			expr := "id()"
-			if i != 0 {
-				expr = t.cols[i-1].name
-			}
-
-			if err := db.insertIndex2(t.name, index.name, []string{expr}, index.unique, true, index.xroot); err != nil {
-				db.hasIndex2 = 0
-				return err
-			}
-		}
-	}
-
-	db.hasIndex2 = 2
-	return nil
-}
-
-func (db *DB) insertIndex2(tableName, indexName string, expr []string, unique, isSimple bool, h int64) error {
-	ctx := execCtx{db: db}
-	ctx.arg = []interface{}{
-		tableName,
-		indexName,
-		unique,
-		isSimple,
-		h,
-	}
-	if _, err := insertIndex2.l[0].exec(&ctx); err != nil {
-		return err
-	}
-
-	id := db.root.lastInsertID
-	for _, e := range expr {
-		ctx.arg = []interface{}{id, e}
-		if _, err := insertIndex2Expr.l[0].exec(&ctx); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (db *DB) hasAllIndex2() bool {
-	t := db.root.tables
-	if _, ok := t["__Index2"]; !ok {
-		return false
-	}
-
-	_, ok := t["__Index2_Expr"]
-	return ok
-}
-
-func (db *DB) str2expr(expr string) (expression, error) {
-	db.exprCacheMu.Lock()
-	e := db.exprCache[expr]
-	db.exprCacheMu.Unlock()
-	if e != nil {
-		return e, nil
-	}
-
-	e, err := compileExpr(expr)
-	if err != nil {
-		return nil, err
-	}
-
-	db.exprCacheMu.Lock()
-	for k := range db.exprCache {
-		if len(db.exprCache) < 1000 {
-			break
-		}
-
-		delete(db.exprCache, k)
-	}
-	db.exprCache[expr] = e
-	db.exprCacheMu.Unlock()
-	return e, nil
-}
-
-// Name returns the name of the DB.
-func (db *DB) Name() string { return db.store.Name() }
-
-// Run compiles and executes a statement list.  It returns, if applicable, a
-// RecordSet slice and/or an index and error.
-//
-// For more details please see DB.Execute
-//
-// Run is safe for concurrent use by multiple goroutines.
-func (db *DB) Run(ctx *TCtx, ql string, arg ...interface{}) (rs []Recordset, index int, err error) {
-	l, err := Compile(ql)
-	if err != nil {
-		return nil, -1, err
-	}
-
-	return db.Execute(ctx, l, arg...)
-}
-
-func (db *DB) run(ctx *TCtx, ql string, arg ...interface{}) (rs []Recordset, index int, err error) {
-	l, err := compile(ql)
-	if err != nil {
-		return nil, -1, err
-	}
-
-	return db.Execute(ctx, l, arg...)
-}
-
-// Compile parses the ql statements from src and returns a compiled list for
-// DB.Execute or an error if any.
-//
-// Compile is safe for concurrent use by multiple goroutines.
-func Compile(src string) (List, error) {
-	l := newLexer(src)
-	if yyParse(l) != 0 {
-		return List{}, l.errs[0]
-	}
-
-	return List{l.list, l.params}, nil
-}
-
-func compileExpr(src string) (expression, error) {
-	l := newLexer(src)
-	l.inj = parseExpression
-	if yyParse(l) != 0 {
-		return nil, l.errs[0]
-	}
-
-	return l.expr, nil
-}
-
-func compile(src string) (List, error) {
-	l := newLexer(src)
-	l.root = true
-	if yyParse(l) != 0 {
-		return List{}, l.errs[0]
-	}
-
-	return List{l.list, l.params}, nil
-}
-
-// MustCompile is like Compile but panics if the ql statements in src cannot be
-// compiled. It simplifies safe initialization of global variables holding
-// compiled statement lists for DB.Execute.
-//
-// MustCompile is safe for concurrent use by multiple goroutines.
-func MustCompile(src string) List {
-	list, err := Compile(src)
-	if err != nil {
-		panic("ql: Compile(" + strconv.Quote(src) + "): " + err.Error()) // panic ok here
-	}
-
-	return list
-}
-
-func mustCompile(src string) List {
-	list, err := compile(src)
-	if err != nil {
-		panic("ql: compile(" + strconv.Quote(src) + "): " + err.Error()) // panic ok here
-	}
-
-	return list
-}
-
-// Execute executes statements in a list while substituting QL paramaters from
-// arg.
-//
-// The resulting []Recordset corresponds to the SELECT FROM statements in the
-// list.
-//
-// If err != nil then index is the zero based index of the failed QL statement.
-// Empty statements do not count.
-//
-// The FSM STT describing the relations between DB states, statements and the
-// ctx parameter.
-//
-//  +-----------+---------------------+------------------+------------------+------------------+
-//  |\  Event   |                     |                  |                  |                  |
-//  | \-------\ |     BEGIN           |                  |                  |    Other         |
-//  |   State  \|     TRANSACTION     |      COMMIT      |     ROLLBACK     |    statement     |
-//  +-----------+---------------------+------------------+------------------+------------------+
-//  | RD        | if PC == nil        | return error     | return error     | DB.RLock         |
-//  |           |     return error    |                  |                  | Execute(1)       |
-//  | CC == nil |                     |                  |                  | DB.RUnlock       |
-//  | TNL == 0  | DB.Lock             |                  |                  |                  |
-//  |           | CC = PC             |                  |                  |                  |
-//  |           | TNL++               |                  |                  |                  |
-//  |           | DB.BeginTransaction |                  |                  |                  |
-//  |           | State = WR          |                  |                  |                  |
-//  +-----------+---------------------+------------------+------------------+------------------+
-//  | WR        | if PC == nil        | if PC != CC      | if PC != CC      | if PC == nil     |
-//  |           |     return error    |     return error |     return error |     DB.Rlock     |
-//  | CC != nil |                     |                  |                  |     Execute(1)   |
-//  | TNL != 0  | if PC != CC         | DB.Commit        | DB.Rollback      |     RUnlock      |
-//  |           |     DB.Lock         | TNL--            | TNL--            | else if PC != CC |
-//  |           |     CC = PC         | if TNL == 0      | if TNL == 0      |     return error |
-//  |           |                     |     CC = nil     |     CC = nil     | else             |
-//  |           | TNL++               |     State = RD   |     State = RD   |     Execute(2)   |
-//  |           | DB.BeginTransaction |     DB.Unlock    |     DB.Unlock    |                  |
-//  +-----------+---------------------+------------------+------------------+------------------+
-//  CC: Curent transaction context
-//  PC: Passed transaction context
-//  TNL: Transaction nesting level
-//
-// Lock, Unlock, RLock, RUnlock semantics above are the same as in
-// sync.RWMutex.
-//
-// (1): Statement list is executed outside of a transaction. Attempts to update
-// the DB will fail, the execution context is read-only. Other statements with
-// read only context will execute concurrently. If any statement fails, the
-// execution of the statement list is aborted.
-//
-// Note that the RLock/RUnlock surrounds every single "other" statement when it
-// is executed outside of a transaction. If read consistency is required by a
-// list of more than one statement then an explicit BEGIN TRANSACTION / COMMIT
-// or ROLLBACK wrapper must be provided. Otherwise the state of the DB may
-// change in between executing any two out-of-transaction statements.
-//
-// (2): Statement list is executed inside an isolated transaction. Execution of
-// statements can update the DB, the execution context is read-write. If any
-// statement fails, the execution of the statement list is aborted and the DB
-// is automatically rolled back to the TNL which was active before the start of
-// execution of the statement list.
-//
-// Execute is safe for concurrent use by multiple goroutines, but one must
-// consider the blocking issues as discussed above.
-//
-// ACID
-//
-// Atomicity: Transactions are atomic. Transactions can be nested. Commit or
-// rollbacks work on the current transaction level. Transactions are made
-// persistent only on the top level commit. Reads made from within an open
-// transaction are dirty reads.
-//
-// Consistency: Transactions bring the DB from one structurally consistent
-// state to other structurally consistent state.
-//
-// Isolation: Transactions are isolated. Isolation is implemented by
-// serialization.
-//
-// Durability: Transactions are durable. A two phase commit protocol and a
-// write ahead log is used. Database is recovered after a crash from the write
-// ahead log automatically on open.
-func (db *DB) Execute(ctx *TCtx, l List, arg ...interface{}) (rs []Recordset, index int, err error) {
-	// Sanitize args
-	for i, v := range arg {
-		switch x := v.(type) {
-		case nil, bool, complex64, complex128, float32, float64, string,
-			int8, int16, int32, int64, int,
-			uint8, uint16, uint32, uint64, uint,
-			*big.Int, *big.Rat, []byte, time.Duration, time.Time:
-		case big.Int:
-			arg[i] = &x
-		case big.Rat:
-			arg[i] = &x
-		default:
-			return nil, 0, fmt.Errorf("cannot use arg[%d] (type %T):unsupported type", i, v)
-		}
-	}
-
-	tnl0 := -1
-	if ctx != nil {
-		ctx.LastInsertID, ctx.RowsAffected = 0, 0
-	}
-
-	list := l.l
-	for _, s := range list {
-		r, tnla, tnl, err := db.run1(ctx, s, arg...)
-		if tnl0 < 0 {
-			tnl0 = tnla
-		}
-		if err != nil {
-			for tnl > tnl0 {
-				var e2 error
-				if _, _, tnl, e2 = db.run1(ctx, rollbackStmt{}); e2 != nil {
-					err = e2
-				}
-			}
-			return rs, index, err
-		}
-
-		if r != nil {
-			if x, ok := r.(recordset); ok {
-				x.tx = ctx
-				r = x
-			}
-			rs = append(rs, r)
-		}
-	}
-	return
-}
-
-func (db *DB) run1(pc *TCtx, s stmt, arg ...interface{}) (rs Recordset, tnla, tnlb int, err error) {
-	db.mu.Lock()
-	tnla = db.tnl
-	tnlb = db.tnl
-	switch db.rw {
-	case false:
-		switch s.(type) {
-		case beginTransactionStmt:
-			defer db.mu.Unlock()
-			if pc == nil {
-				return nil, tnla, tnlb, errors.New("BEGIN TRANSACTION: cannot start a transaction in nil TransactionCtx")
-			}
-
-			if err = db.store.BeginTransaction(); err != nil {
-				return
-			}
-
-			db.beginTransaction()
-			db.rwmu.Lock()
-			db.cc = pc
-			db.tnl++
-			tnlb = db.tnl
-			db.rw = true
-			return
-		case commitStmt:
-			defer db.mu.Unlock()
-			return nil, tnla, tnlb, errCommitNotInTransaction
-		case rollbackStmt:
-			defer db.mu.Unlock()
-			return nil, tnla, tnlb, errRollbackNotInTransaction
-		default:
-			if s.isUpdating() {
-				db.mu.Unlock()
-				return nil, tnla, tnlb, fmt.Errorf("attempt to update the DB outside of a transaction")
-			}
-
-			db.rwmu.RLock() // can safely grab before Unlock
-			db.mu.Unlock()
-			defer db.rwmu.RUnlock()
-			rs, err = s.exec(&execCtx{db, arg}) // R/O tctx
-			return rs, tnla, tnlb, err
-		}
-	default: // case true:
-		switch s.(type) {
-		case beginTransactionStmt:
-			defer db.mu.Unlock()
-
-			if pc == nil {
-				return nil, tnla, tnlb, errBeginTransNoCtx
-			}
-
-			if pc != db.cc {
-				for db.rw == true {
-					db.mu.Unlock() // Transaction isolation
-					db.mu.Lock()
-				}
-
-				db.rw = true
-				db.rwmu.Lock()
-			}
-
-			if err = db.store.BeginTransaction(); err != nil {
-				return
-			}
-
-			db.beginTransaction()
-			db.cc = pc
-			db.tnl++
-			tnlb = db.tnl
-			return
-		case commitStmt:
-			defer db.mu.Unlock()
-			if pc != db.cc {
-				return nil, tnla, tnlb, fmt.Errorf("invalid passed transaction context")
-			}
-
-			db.commit()
-			err = db.store.Commit()
-			db.tnl--
-			tnlb = db.tnl
-			if db.tnl != 0 {
-				return
-			}
-
-			db.cc = nil
-			db.rw = false
-			db.rwmu.Unlock()
-			return
-		case rollbackStmt:
-			defer db.mu.Unlock()
-			defer func() { pc.LastInsertID = db.root.lastInsertID }()
-			if pc != db.cc {
-				return nil, tnla, tnlb, fmt.Errorf("invalid passed transaction context")
-			}
-
-			db.rollback()
-			err = db.store.Rollback()
-			db.tnl--
-			tnlb = db.tnl
-			if db.tnl != 0 {
-				return
-			}
-
-			db.cc = nil
-			db.rw = false
-			db.rwmu.Unlock()
-			return
-		default:
-			if pc == nil {
-				if s.isUpdating() {
-					db.mu.Unlock()
-					return nil, tnla, tnlb, fmt.Errorf("attempt to update the DB outside of a transaction")
-				}
-
-				db.mu.Unlock() // must Unlock before RLock
-				db.rwmu.RLock()
-				defer db.rwmu.RUnlock()
-				rs, err = s.exec(&execCtx{db, arg})
-				return rs, tnla, tnlb, err
-			}
-
-			defer db.mu.Unlock()
-			defer func() { pc.LastInsertID = db.root.lastInsertID }()
-			if pc != db.cc {
-				return nil, tnla, tnlb, fmt.Errorf("invalid passed transaction context")
-			}
-
-			rs, err = s.exec(&execCtx{db, arg})
-			return rs, tnla, tnlb, err
-		}
-	}
-}
-
-// Flush ends the transaction collecting window, if applicable. IOW, if the DB
-// is dirty, it schedules a 2PC (WAL + DB file) commit on the next outer most
-// DB.Commit or performs it synchronously if there's currently no open
-// transaction.
-//
-// The collecting window is an implementation detail and future versions of
-// Flush may become a no operation while keeping the operation semantics.
-func (db *DB) Flush() (err error) {
-	return nil
-}
-
-// Close will close the DB. Successful Close is idempotent.
-func (db *DB) Close() error {
-	db.mu.Lock()
-	defer db.mu.Unlock()
-	if db.store == nil {
-		return nil
-	}
-
-	if db.tnl != 0 {
-		return fmt.Errorf("cannot close DB while open transaction exist")
-	}
-
-	err := db.store.Close()
-	db.root, db.store = nil, nil
-	return err
-}
-
-func (db *DB) do(r recordset, f func(data []interface{}) (bool, error)) (err error) {
-	db.mu.Lock()
-	switch db.rw {
-	case false:
-		db.rwmu.RLock() // can safely grab before Unlock
-		db.mu.Unlock()
-		defer db.rwmu.RUnlock()
-	default: // case true:
-		if r.tx == nil {
-			db.mu.Unlock() // must Unlock before RLock
-			db.rwmu.RLock()
-			defer db.rwmu.RUnlock()
-			break
-		}
-
-		defer db.mu.Unlock()
-		if r.tx != db.cc {
-			return fmt.Errorf("invalid passed transaction context")
-		}
-	}
-
-	return r.do(r.ctx, func(id interface{}, data []interface{}) (bool, error) {
-		if err = expand(data); err != nil {
-			return false, err
-		}
-
-		return f(data)
-	})
-}
-
-func (db *DB) beginTransaction() { //TODO Rewrite, must use much smaller undo info!
-	root := *db.root
-	root.parent = db.root
-	root.tables = make(map[string]*table, len(db.root.tables))
-	var tprev *table
-	for t := db.root.thead; t != nil; t = t.tnext {
-		t2 := t.clone()
-		root.tables[t2.name] = t2
-		t2.tprev = tprev
-		switch {
-		case tprev == nil:
-			root.thead = t2
-		default:
-			tprev.tnext = t2
-		}
-		tprev = t2
-	}
-	db.root = &root
-}
-
-func (db *DB) rollback() {
-	db.root = db.root.parent
-}
-
-func (db *DB) commit() {
-	db.root.parent = db.root.parent.parent
-}
-
-// Type represents a QL type (bigint, int, string, ...)
-type Type int
-
-// Values of ColumnInfo.Type.
-const (
-	BigInt     Type = qBigInt
-	BigRat          = qBigRat
-	Blob            = qBlob
-	Bool            = qBool
-	Complex128      = qComplex128
-	Complex64       = qComplex64
-	Duration        = qDuration
-	Float32         = qFloat32
-	Float64         = qFloat64
-	Int16           = qInt16
-	Int32           = qInt32
-	Int64           = qInt64
-	Int8            = qInt8
-	String          = qString
-	Time            = qTime
-	Uint16          = qUint16
-	Uint32          = qUint32
-	Uint64          = qUint64
-	Uint8           = qUint8
-)
-
-// String implements fmt.Stringer.
-func (t Type) String() string {
-	return typeStr(int(t))
-}
-
-// ColumnInfo provides meta data describing a table column.
-type ColumnInfo struct {
-	Name       string // Column name.
-	Type       Type   // Column type (BigInt, BigRat, ...).
-	NotNull    bool   // Column cannot be NULL.
-	Constraint string // Constraint expression, if any.
-	Default    string // Default expression, if any.
-}
-
-// TableInfo provides meta data describing a DB table.
-type TableInfo struct {
-	// Table name.
-	Name string
-
-	// Table schema. Columns are listed in the order in which they appear
-	// in the schema.
-	Columns []ColumnInfo
-}
-
-// IndexInfo provides meta data describing a DB index.  It corresponds to the
-// statement
-//
-//	CREATE INDEX Name ON Table (Column);
-type IndexInfo struct {
-	Name           string   // Index name
-	Table          string   // Table name.
-	Column         string   // Column name.
-	Unique         bool     // Wheter the index is unique.
-	ExpressionList []string // Index expression list.
-}
-
-// DbInfo provides meta data describing a DB.
-type DbInfo struct {
-	Name    string      // DB name.
-	Tables  []TableInfo // Tables in the DB.
-	Indices []IndexInfo // Indices in the DB.
-}
-
-func (db *DB) info() (r *DbInfo, err error) {
-	_, hasColumn2 := db.root.tables["__Column2"]
-	r = &DbInfo{Name: db.Name()}
-	for nm, t := range db.root.tables {
-		ti := TableInfo{Name: nm}
-		m := map[string]*ColumnInfo{}
-		if hasColumn2 {
-			rs, err := selectColumn2.l[0].exec(&execCtx{db: db, arg: []interface{}{nm}})
-			if err != nil {
-				return nil, err
-			}
-
-			if err := rs.(recordset).do(
-				&execCtx{db: db, arg: []interface{}{nm}},
-				func(id interface{}, data []interface{}) (bool, error) {
-					ci := &ColumnInfo{NotNull: data[1].(bool), Constraint: data[2].(string), Default: data[3].(string)}
-					m[data[0].(string)] = ci
-					return true, nil
-				},
-			); err != nil {
-				return nil, err
-			}
-		}
-		for _, c := range t.cols {
-			ci := ColumnInfo{Name: c.name, Type: Type(c.typ)}
-			if c2 := m[c.name]; c2 != nil {
-				ci.NotNull = c2.NotNull
-				ci.Constraint = c2.Constraint
-				ci.Default = c2.Default
-			}
-			ti.Columns = append(ti.Columns, ci)
-		}
-		r.Tables = append(r.Tables, ti)
-		for i, x := range t.indices {
-			if x == nil {
-				continue
-			}
-
-			var cn string
-			switch {
-			case i == 0:
-				cn = "id()"
-			default:
-				cn = t.cols0[i-1].name
-			}
-			r.Indices = append(r.Indices, IndexInfo{x.name, nm, cn, x.unique, []string{cn}})
-		}
-		var a []string
-		for k := range t.indices2 {
-			a = append(a, k)
-		}
-		for _, k := range a {
-			x := t.indices2[k]
-			a = a[:0]
-			for _, e := range x.exprList {
-				a = append(a, e.String())
-			}
-			r.Indices = append(r.Indices, IndexInfo{k, nm, "", x.unique, a})
-		}
-	}
-	return
-}
-
-// Info provides meta data describing a DB or an error if any. It locks the DB
-// to obtain the result.
-func (db *DB) Info() (r *DbInfo, err error) {
-	db.mu.Lock()
-	defer db.mu.Unlock()
-	return db.info()
-}
-
-type constraint struct {
-	expr expression // If expr == nil: constraint is 'NOT NULL'
-}
-
-func (c *constraint) clone() *constraint {
-	if c == nil {
-		return nil
-	}
-
-	var e expression
-	if c.expr != nil {
-		e, _ = c.expr.clone(nil)
-	}
-	return &constraint{e}
-}
-
-type joinRset struct {
-	sources []interface{}
-	typ     int
-	on      expression
-}
-
-func (r *joinRset) String() string {
-	a := make([]string, len(r.sources))
-	for i, pair0 := range r.sources {
-		pair := pair0.([]interface{})
-		altName := pair[1].(string)
-		switch x := pair[0].(type) {
-		case string: // table name
-			switch {
-			case altName == "":
-				a[i] = x
-			default:
-				a[i] = fmt.Sprintf("%s AS %s", x, altName)
-			}
-		case *selectStmt:
-			switch {
-			case altName == "":
-				a[i] = fmt.Sprintf("(%s)", x)
-			default:
-				a[i] = fmt.Sprintf("(%s) AS %s", x, altName)
-			}
-		default:
-			panic("internal error 054")
-		}
-	}
-	n := len(a)
-	a2 := a[:n-1]
-	j := a[n-1]
-	var s string
-	switch r.typ {
-	case crossJoin:
-		return strings.Join(a, ", ")
-	case leftJoin:
-		s = strings.Join(a2, ",") + " LEFT"
-	case rightJoin:
-		s = strings.Join(a2, ",") + " RIGHT"
-	case fullJoin:
-		s = strings.Join(a2, ",") + " FULL"
-	}
-	s += " OUTER JOIN " + j + " ON " + r.on.String()
-	return s
-}
-
-func (r *joinRset) plan(ctx *execCtx) (plan, error) {
-	rsets := make([]plan, len(r.sources))
-	names := make([]string, len(r.sources))
-	var err error
-	m := map[string]bool{}
-	var fields []string
-	for i, v := range r.sources {
-		pair := v.([]interface{})
-		src := pair[0]
-		nm := pair[1].(string)
-		if s, ok := src.(string); ok {
-			src = tableRset(s)
-			if nm == "" {
-				nm = s
-			}
-		}
-		if m[nm] {
-			return nil, fmt.Errorf("%s: duplicate name %s", r.String(), nm)
-		}
-
-		if nm != "" {
-			m[nm] = true
-		}
-		names[i] = nm
-		var q plan
-		switch x := src.(type) {
-		case rset:
-			if q, err = x.plan(ctx); err != nil {
-				return nil, err
-			}
-		case plan:
-			q = x
-		default:
-			panic("internal error 008")
-		}
-
-		switch {
-		case len(r.sources) == 1:
-			fields = q.fieldNames()
-		default:
-			for _, f := range q.fieldNames() {
-				if strings.Contains(f, ".") {
-					return nil, fmt.Errorf("cannot join on recordset with already qualified field names (use the AS clause): %s", f)
-				}
-
-				if f != "" && nm != "" {
-					f = fmt.Sprintf("%s.%s", nm, f)
-				}
-				if nm == "" {
-					f = ""
-				}
-				fields = append(fields, f)
-			}
-		}
-		rsets[i] = q
-	}
-
-	if len(rsets) == 1 {
-		return rsets[0], nil
-	}
-
-	right := len(rsets[len(rsets)-1].fieldNames())
-	switch r.typ {
-	case crossJoin:
-		return &crossJoinDefaultPlan{rsets: rsets, names: names, fields: fields}, nil
-	case leftJoin:
-		return &leftJoinDefaultPlan{rsets: rsets, names: names, fields: fields, on: r.on, right: right}, nil
-	case rightJoin:
-		return &rightJoinDefaultPlan{leftJoinDefaultPlan{rsets: rsets, names: names, fields: fields, on: r.on, right: right}}, nil
-	case fullJoin:
-		return &fullJoinDefaultPlan{leftJoinDefaultPlan{rsets: rsets, names: names, fields: fields, on: r.on, right: right}}, nil
-	default:
-		panic("internal error 010")
-	}
-}
-
-type fld struct {
-	expr expression
-	name string
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/ql.y b/Godeps/_workspace/src/github.com/cznic/ql/ql.y
deleted file mode 100644
index ffe4d50c56..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/ql.y
+++ /dev/null
@@ -1,1687 +0,0 @@
-%{
-
-//TODO Put your favorite license here
-		
-// yacc source generated by ebnf2y[1]
-// at 2015-12-07 11:13:21.828981967 +0100 CET
-//
-//  $ ebnf2y -o ql.y -oe ql.ebnf -start StatementList -pkg ql -p _
-//
-// CAUTION: If this file is a Go source file (*.go), it was generated
-// automatically by '$ go tool yacc' from a *.y file - DO NOT EDIT in that case!
-// 
-//   [1]: http://github.com/cznic/ebnf2y
-
-package ql //TODO real package name
-
-//TODO required only be the demo _dump function
-import (
-	"bytes"
-	"fmt"
-	"strings"
-
-	"github.com/cznic/strutil"
-)
-
-%}
-
-%union {
-	item interface{} //TODO insert real field(s)
-}
-
-%token	_ANDAND
-%token	_ANDNOT
-%token	_EQ
-%token	_FLOAT_LIT
-%token	_GE
-%token	_IDENTIFIER
-%token	_IMAGINARY_LIT
-%token	_INT_LIT
-%token	_LE
-%token	_LSH
-%token	_NEQ
-%token	_OROR
-%token	_QL_PARAMETER
-%token	_RSH
-%token	_RUNE_LIT
-%token	_STRING_LIT
-
-%type	<item> 	/*TODO real type(s), if/where applicable */
-	_ANDAND
-	_ANDNOT
-	_EQ
-	_FLOAT_LIT
-	_GE
-	_IDENTIFIER
-	_IMAGINARY_LIT
-	_INT_LIT
-	_LE
-	_LSH
-	_NEQ
-	_OROR
-	_QL_PARAMETER
-	_RSH
-	_RUNE_LIT
-	_STRING_LIT
-
-%token _ADD
-%token _ALTER
-%token _AND
-%token _AS
-%token _ASC
-%token _BEGIN
-%token _BETWEEN
-%token _BIGINT
-%token _BIGRAT
-%token _BLOB
-%token _BOOL
-%token _BY
-%token _BYTE
-%token _COLUMN
-%token _COMMIT
-%token _COMPLEX128
-%token _COMPLEX64
-%token _CREATE
-%token _DEFAULT
-%token _DELETE
-%token _DESC
-%token _DISTINCT
-%token _DROP
-%token _DURATION
-%token _EXISTS
-%token _EXPLAIN
-%token _FALSE
-%token _FLOAT
-%token _FLOAT32
-%token _FLOAT64
-%token _FROM
-%token _FULL
-%token _GROUPBY
-%token _IF
-%token _IN
-%token _INDEX
-%token _INSERT
-%token _INT
-%token _INT16
-%token _INT32
-%token _INT64
-%token _INT8
-%token _INTO
-%token _IS
-%token _JOIN
-%token _LEFT
-%token _LIKE
-%token _LIMIT
-%token _NOT
-%token _NULL
-%token _OFFSET
-%token _ON
-%token _OR
-%token _ORDER
-%token _OUTER
-%token _RIGHT
-%token _ROLLBACK
-%token _RUNE
-%token _SELECT
-%token _SET
-%token _STRING
-%token _TABLE
-%token _TIME
-%token _TRANSACTION
-%token _TRUE
-%token _TRUNCATE
-%token _UINT
-%token _UINT16
-%token _UINT32
-%token _UINT64
-%token _UINT8
-%token _UNIQUE
-%token _UPDATE
-%token _VALUES
-%token _WHERE
-
-%type	<item> 	/*TODO real type(s), if/where applicable */
-	AlterTableStmt
-	AlterTableStmt1
-	Assignment
-	AssignmentList
-	AssignmentList1
-	AssignmentList2
-	BeginTransactionStmt
-	Call
-	Call1
-	Call11
-	ColumnDef
-	ColumnDef1
-	ColumnDef11
-	ColumnDef2
-	ColumnName
-	ColumnNameList
-	ColumnNameList1
-	ColumnNameList2
-	CommitStmt
-	Conversion
-	CreateIndexStmt
-	CreateIndexStmt1
-	CreateIndexStmt2
-	CreateTableStmt
-	CreateTableStmt1
-	CreateTableStmt2
-	CreateTableStmt3
-	DeleteFromStmt
-	DeleteFromStmt1
-	DropIndexStmt
-	DropIndexStmt1
-	DropTableStmt
-	DropTableStmt1
-	EmptyStmt
-	ExplainStmt
-	Expression
-	Expression1
-	Expression11
-	ExpressionList
-	ExpressionList1
-	ExpressionList2
-	Factor
-	Factor1
-	Factor11
-	Factor2
-	Field
-	Field1
-	FieldList
-	FieldList1
-	FieldList2
-	GroupByClause
-	Index
-	IndexName
-	InsertIntoStmt
-	InsertIntoStmt1
-	InsertIntoStmt2
-	JoinClause
-	JoinClause1
-	JoinClause2
-	Limit
-	Literal
-	Offset
-	Operand
-	OrderBy
-	OrderBy1
-	OrderBy11
-	Predicate
-	Predicate1
-	Predicate11
-	Predicate12
-	Predicate121
-	Predicate13
-	PrimaryExpression
-	PrimaryFactor
-	PrimaryFactor1
-	PrimaryFactor11
-	PrimaryTerm
-	PrimaryTerm1
-	PrimaryTerm11
-	QualifiedIdent
-	QualifiedIdent1
-	RecordSet
-	RecordSet1
-	RecordSet11
-	RecordSet2
-	RecordSetList
-	RecordSetList1
-	RecordSetList2
-	RollbackStmt
-	SelectStmt
-	SelectStmt1
-	SelectStmt2
-	SelectStmt3
-	SelectStmt4
-	SelectStmt5
-	SelectStmt6
-	SelectStmt7
-	SelectStmt8
-	Slice
-	Slice1
-	Slice2
-	Start
-	Statement
-	StatementList
-	StatementList1
-	TableName
-	Term
-	Term1
-	Term11
-	TruncateTableStmt
-	Type
-	UnaryExpr
-	UnaryExpr1
-	UnaryExpr11
-	UpdateStmt
-	UpdateStmt1
-	UpdateStmt2
-	Values
-	Values1
-	Values2
-	WhereClause
-
-/*TODO %left, %right, ... declarations */
-
-%start Start
-
-%%
-
-AlterTableStmt:
-	_ALTER _TABLE TableName AlterTableStmt1
-	{
-		$$ = []AlterTableStmt{"ALTER", "TABLE", $3, $4} //TODO 1
-	}
-
-AlterTableStmt1:
-	_ADD ColumnDef
-	{
-		$$ = []AlterTableStmt1{"ADD", $2} //TODO 2
-	}
-|	_DROP _COLUMN ColumnName
-	{
-		$$ = []AlterTableStmt1{"DROP", "COLUMN", $3} //TODO 3
-	}
-
-Assignment:
-	ColumnName '=' Expression
-	{
-		$$ = []Assignment{$1, "=", $3} //TODO 4
-	}
-
-AssignmentList:
-	Assignment AssignmentList1 AssignmentList2
-	{
-		$$ = []AssignmentList{$1, $2, $3} //TODO 5
-	}
-
-AssignmentList1:
-	/* EMPTY */
-	{
-		$$ = []AssignmentList1(nil) //TODO 6
-	}
-|	AssignmentList1 ',' Assignment
-	{
-		$$ = append($1.([]AssignmentList1), ",", $3) //TODO 7
-	}
-
-AssignmentList2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 8
-	}
-|	','
-	{
-		$$ = "," //TODO 9
-	}
-
-BeginTransactionStmt:
-	_BEGIN _TRANSACTION
-	{
-		$$ = []BeginTransactionStmt{"BEGIN", "TRANSACTION"} //TODO 10
-	}
-
-Call:
-	'(' Call1 ')'
-	{
-		$$ = []Call{"(", $2, ")"} //TODO 11
-	}
-
-Call1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 12
-	}
-|	Call11
-	{
-		$$ = $1 //TODO 13
-	}
-
-Call11:
-	'*'
-	{
-		$$ = "*" //TODO 14
-	}
-|	ExpressionList
-	{
-		$$ = $1 //TODO 15
-	}
-
-ColumnDef:
-	ColumnName Type ColumnDef1 ColumnDef2
-	{
-		$$ = []ColumnDef{$1, $2, $3, $4} //TODO 16
-	}
-
-ColumnDef1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 17
-	}
-|	ColumnDef11
-	{
-		$$ = $1 //TODO 18
-	}
-
-ColumnDef11:
-	_NOT _NULL
-	{
-		$$ = []ColumnDef11{"NOT", "NULL"} //TODO 19
-	}
-|	Expression
-	{
-		$$ = $1 //TODO 20
-	}
-
-ColumnDef2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 21
-	}
-|	_DEFAULT Expression
-	{
-		$$ = []ColumnDef2{"DEFAULT", $2} //TODO 22
-	}
-
-ColumnName:
-	_IDENTIFIER
-	{
-		$$ = $1 //TODO 23
-	}
-
-ColumnNameList:
-	ColumnName ColumnNameList1 ColumnNameList2
-	{
-		$$ = []ColumnNameList{$1, $2, $3} //TODO 24
-	}
-
-ColumnNameList1:
-	/* EMPTY */
-	{
-		$$ = []ColumnNameList1(nil) //TODO 25
-	}
-|	ColumnNameList1 ',' ColumnName
-	{
-		$$ = append($1.([]ColumnNameList1), ",", $3) //TODO 26
-	}
-
-ColumnNameList2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 27
-	}
-|	','
-	{
-		$$ = "," //TODO 28
-	}
-
-CommitStmt:
-	_COMMIT
-	{
-		$$ = "COMMIT" //TODO 29
-	}
-
-Conversion:
-	Type '(' Expression ')'
-	{
-		$$ = []Conversion{$1, "(", $3, ")"} //TODO 30
-	}
-
-CreateIndexStmt:
-	_CREATE CreateIndexStmt1 _INDEX CreateIndexStmt2 IndexName _ON TableName '(' ExpressionList ')'
-	{
-		$$ = []CreateIndexStmt{"CREATE", $2, "INDEX", $4, $5, "ON", $7, "(", $9, ")"} //TODO 31
-	}
-
-CreateIndexStmt1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 32
-	}
-|	_UNIQUE
-	{
-		$$ = "UNIQUE" //TODO 33
-	}
-
-CreateIndexStmt2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 34
-	}
-|	_IF _NOT _EXISTS
-	{
-		$$ = []CreateIndexStmt2{"IF", "NOT", "EXISTS"} //TODO 35
-	}
-
-CreateTableStmt:
-	_CREATE _TABLE CreateTableStmt1 TableName '(' ColumnDef CreateTableStmt2 CreateTableStmt3 ')'
-	{
-		$$ = []CreateTableStmt{"CREATE", "TABLE", $3, $4, "(", $6, $7, $8, ")"} //TODO 36
-	}
-
-CreateTableStmt1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 37
-	}
-|	_IF _NOT _EXISTS
-	{
-		$$ = []CreateTableStmt1{"IF", "NOT", "EXISTS"} //TODO 38
-	}
-
-CreateTableStmt2:
-	/* EMPTY */
-	{
-		$$ = []CreateTableStmt2(nil) //TODO 39
-	}
-|	CreateTableStmt2 ',' ColumnDef
-	{
-		$$ = append($1.([]CreateTableStmt2), ",", $3) //TODO 40
-	}
-
-CreateTableStmt3:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 41
-	}
-|	','
-	{
-		$$ = "," //TODO 42
-	}
-
-DeleteFromStmt:
-	_DELETE _FROM TableName DeleteFromStmt1
-	{
-		$$ = []DeleteFromStmt{"DELETE", "FROM", $3, $4} //TODO 43
-	}
-
-DeleteFromStmt1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 44
-	}
-|	WhereClause
-	{
-		$$ = $1 //TODO 45
-	}
-
-DropIndexStmt:
-	_DROP _INDEX DropIndexStmt1 IndexName
-	{
-		$$ = []DropIndexStmt{"DROP", "INDEX", $3, $4} //TODO 46
-	}
-
-DropIndexStmt1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 47
-	}
-|	_IF _EXISTS
-	{
-		$$ = []DropIndexStmt1{"IF", "EXISTS"} //TODO 48
-	}
-
-DropTableStmt:
-	_DROP _TABLE DropTableStmt1 TableName
-	{
-		$$ = []DropTableStmt{"DROP", "TABLE", $3, $4} //TODO 49
-	}
-
-DropTableStmt1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 50
-	}
-|	_IF _EXISTS
-	{
-		$$ = []DropTableStmt1{"IF", "EXISTS"} //TODO 51
-	}
-
-EmptyStmt:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 52
-	}
-
-ExplainStmt:
-	_EXPLAIN Statement
-	{
-		$$ = []ExplainStmt{"EXPLAIN", $2} //TODO 53
-	}
-
-Expression:
-	Term Expression1
-	{
-		$$ = []Expression{$1, $2} //TODO 54
-	}
-
-Expression1:
-	/* EMPTY */
-	{
-		$$ = []Expression1(nil) //TODO 55
-	}
-|	Expression1 Expression11 Term
-	{
-		$$ = append($1.([]Expression1), $2, $3) //TODO 56
-	}
-
-Expression11:
-	_OROR
-	{
-		$$ = $1 //TODO 57
-	}
-|	_OR
-	{
-		$$ = "OR" //TODO 58
-	}
-
-ExpressionList:
-	Expression ExpressionList1 ExpressionList2
-	{
-		$$ = []ExpressionList{$1, $2, $3} //TODO 59
-	}
-
-ExpressionList1:
-	/* EMPTY */
-	{
-		$$ = []ExpressionList1(nil) //TODO 60
-	}
-|	ExpressionList1 ',' Expression
-	{
-		$$ = append($1.([]ExpressionList1), ",", $3) //TODO 61
-	}
-
-ExpressionList2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 62
-	}
-|	','
-	{
-		$$ = "," //TODO 63
-	}
-
-Factor:
-	PrimaryFactor Factor1 Factor2
-	{
-		$$ = []Factor{$1, $2, $3} //TODO 64
-	}
-
-Factor1:
-	/* EMPTY */
-	{
-		$$ = []Factor1(nil) //TODO 65
-	}
-|	Factor1 Factor11 PrimaryFactor
-	{
-		$$ = append($1.([]Factor1), $2, $3) //TODO 66
-	}
-
-Factor11:
-	_GE
-	{
-		$$ = $1 //TODO 67
-	}
-|	'>'
-	{
-		$$ = ">" //TODO 68
-	}
-|	_LE
-	{
-		$$ = $1 //TODO 69
-	}
-|	'<'
-	{
-		$$ = "<" //TODO 70
-	}
-|	_NEQ
-	{
-		$$ = $1 //TODO 71
-	}
-|	_EQ
-	{
-		$$ = $1 //TODO 72
-	}
-|	_LIKE
-	{
-		$$ = "LIKE" //TODO 73
-	}
-
-Factor2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 74
-	}
-|	Predicate
-	{
-		$$ = $1 //TODO 75
-	}
-
-Field:
-	Expression Field1
-	{
-		$$ = []Field{$1, $2} //TODO 76
-	}
-
-Field1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 77
-	}
-|	_AS _IDENTIFIER
-	{
-		$$ = []Field1{"AS", $2} //TODO 78
-	}
-
-FieldList:
-	Field FieldList1 FieldList2
-	{
-		$$ = []FieldList{$1, $2, $3} //TODO 79
-	}
-
-FieldList1:
-	/* EMPTY */
-	{
-		$$ = []FieldList1(nil) //TODO 80
-	}
-|	FieldList1 ',' Field
-	{
-		$$ = append($1.([]FieldList1), ",", $3) //TODO 81
-	}
-
-FieldList2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 82
-	}
-|	','
-	{
-		$$ = "," //TODO 83
-	}
-
-GroupByClause:
-	_GROUPBY ColumnNameList
-	{
-		$$ = []GroupByClause{"GROUP BY", $2} //TODO 84
-	}
-
-Index:
-	'[' Expression ']'
-	{
-		$$ = []Index{"[", $2, "]"} //TODO 85
-	}
-
-IndexName:
-	_IDENTIFIER
-	{
-		$$ = $1 //TODO 86
-	}
-
-InsertIntoStmt:
-	_INSERT _INTO TableName InsertIntoStmt1 InsertIntoStmt2
-	{
-		$$ = []InsertIntoStmt{"INSERT", "INTO", $3, $4, $5} //TODO 87
-	}
-
-InsertIntoStmt1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 88
-	}
-|	'(' ColumnNameList ')'
-	{
-		$$ = []InsertIntoStmt1{"(", $2, ")"} //TODO 89
-	}
-
-InsertIntoStmt2:
-	Values
-	{
-		$$ = $1 //TODO 90
-	}
-|	SelectStmt
-	{
-		$$ = $1 //TODO 91
-	}
-
-JoinClause:
-	JoinClause1 JoinClause2 _JOIN RecordSet _ON Expression
-	{
-		$$ = []JoinClause{$1, $2, "JOIN", $4, "ON", $6} //TODO 92
-	}
-
-JoinClause1:
-	_LEFT
-	{
-		$$ = "LEFT" //TODO 93
-	}
-|	_RIGHT
-	{
-		$$ = "RIGHT" //TODO 94
-	}
-|	_FULL
-	{
-		$$ = "FULL" //TODO 95
-	}
-
-JoinClause2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 96
-	}
-|	_OUTER
-	{
-		$$ = "OUTER" //TODO 97
-	}
-
-Limit:
-	_LIMIT Expression
-	{
-		$$ = []Limit{"Limit", $2} //TODO 98
-	}
-
-Literal:
-	_FALSE
-	{
-		$$ = "FALSE" //TODO 99
-	}
-|	_NULL
-	{
-		$$ = "NULL" //TODO 100
-	}
-|	_TRUE
-	{
-		$$ = "TRUE" //TODO 101
-	}
-|	_FLOAT_LIT
-	{
-		$$ = $1 //TODO 102
-	}
-|	_IMAGINARY_LIT
-	{
-		$$ = $1 //TODO 103
-	}
-|	_INT_LIT
-	{
-		$$ = $1 //TODO 104
-	}
-|	_RUNE_LIT
-	{
-		$$ = $1 //TODO 105
-	}
-|	_STRING_LIT
-	{
-		$$ = $1 //TODO 106
-	}
-|	_QL_PARAMETER
-	{
-		$$ = $1 //TODO 107
-	}
-
-Offset:
-	_OFFSET Expression
-	{
-		$$ = []Offset{"OFFSET", $2} //TODO 108
-	}
-
-Operand:
-	Literal
-	{
-		$$ = $1 //TODO 109
-	}
-|	QualifiedIdent
-	{
-		$$ = $1 //TODO 110
-	}
-|	'(' Expression ')'
-	{
-		$$ = []Operand{"(", $2, ")"} //TODO 111
-	}
-
-OrderBy:
-	_ORDER _BY ExpressionList OrderBy1
-	{
-		$$ = []OrderBy{"ORDER", "BY", $3, $4} //TODO 112
-	}
-
-OrderBy1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 113
-	}
-|	OrderBy11
-	{
-		$$ = $1 //TODO 114
-	}
-
-OrderBy11:
-	_ASC
-	{
-		$$ = "ASC" //TODO 115
-	}
-|	_DESC
-	{
-		$$ = "DESC" //TODO 116
-	}
-
-Predicate:
-	Predicate1
-	{
-		$$ = $1 //TODO 117
-	}
-
-Predicate1:
-	Predicate11 Predicate12
-	{
-		$$ = []Predicate1{$1, $2} //TODO 118
-	}
-|	_IS Predicate13 _NULL
-	{
-		$$ = []Predicate1{"IS", $2, "NULL"} //TODO 119
-	}
-
-Predicate11:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 120
-	}
-|	_NOT
-	{
-		$$ = "NOT" //TODO 121
-	}
-
-Predicate12:
-	_IN '(' ExpressionList ')'
-	{
-		$$ = []Predicate12{"IN", "(", $3, ")"} //TODO 122
-	}
-|	_IN '(' SelectStmt Predicate121 ')'
-	{
-		$$ = []Predicate12{"IN", "(", $3, $4, ")"} //TODO 123
-	}
-|	_BETWEEN PrimaryFactor _AND PrimaryFactor
-	{
-		$$ = []Predicate12{"BETWEEN", $2, "AND", $4} //TODO 124
-	}
-
-Predicate121:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 125
-	}
-|	';'
-	{
-		$$ = ";" //TODO 126
-	}
-
-Predicate13:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 127
-	}
-|	_NOT
-	{
-		$$ = "NOT" //TODO 128
-	}
-
-PrimaryExpression:
-	Operand
-	{
-		$$ = $1 //TODO 129
-	}
-|	Conversion
-	{
-		$$ = $1 //TODO 130
-	}
-|	PrimaryExpression Index
-	{
-		$$ = []PrimaryExpression{$1, $2} //TODO 131
-	}
-|	PrimaryExpression Slice
-	{
-		$$ = []PrimaryExpression{$1, $2} //TODO 132
-	}
-|	PrimaryExpression Call
-	{
-		$$ = []PrimaryExpression{$1, $2} //TODO 133
-	}
-
-PrimaryFactor:
-	PrimaryTerm PrimaryFactor1
-	{
-		$$ = []PrimaryFactor{$1, $2} //TODO 134
-	}
-
-PrimaryFactor1:
-	/* EMPTY */
-	{
-		$$ = []PrimaryFactor1(nil) //TODO 135
-	}
-|	PrimaryFactor1 PrimaryFactor11 PrimaryTerm
-	{
-		$$ = append($1.([]PrimaryFactor1), $2, $3) //TODO 136
-	}
-
-PrimaryFactor11:
-	'^'
-	{
-		$$ = "^" //TODO 137
-	}
-|	'|'
-	{
-		$$ = "|" //TODO 138
-	}
-|	'-'
-	{
-		$$ = "-" //TODO 139
-	}
-|	'+'
-	{
-		$$ = "+" //TODO 140
-	}
-
-PrimaryTerm:
-	UnaryExpr PrimaryTerm1
-	{
-		$$ = []PrimaryTerm{$1, $2} //TODO 141
-	}
-
-PrimaryTerm1:
-	/* EMPTY */
-	{
-		$$ = []PrimaryTerm1(nil) //TODO 142
-	}
-|	PrimaryTerm1 PrimaryTerm11 UnaryExpr
-	{
-		$$ = append($1.([]PrimaryTerm1), $2, $3) //TODO 143
-	}
-
-PrimaryTerm11:
-	_ANDNOT
-	{
-		$$ = $1 //TODO 144
-	}
-|	'&'
-	{
-		$$ = "&" //TODO 145
-	}
-|	_LSH
-	{
-		$$ = $1 //TODO 146
-	}
-|	_RSH
-	{
-		$$ = $1 //TODO 147
-	}
-|	'%'
-	{
-		$$ = "%" //TODO 148
-	}
-|	'/'
-	{
-		$$ = "/" //TODO 149
-	}
-|	'*'
-	{
-		$$ = "*" //TODO 150
-	}
-
-QualifiedIdent:
-	_IDENTIFIER QualifiedIdent1
-	{
-		$$ = []QualifiedIdent{$1, $2} //TODO 151
-	}
-
-QualifiedIdent1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 152
-	}
-|	'.' _IDENTIFIER
-	{
-		$$ = []QualifiedIdent1{".", $2} //TODO 153
-	}
-
-RecordSet:
-	RecordSet1 RecordSet2
-	{
-		$$ = []RecordSet{$1, $2} //TODO 154
-	}
-
-RecordSet1:
-	TableName
-	{
-		$$ = $1 //TODO 155
-	}
-|	'(' SelectStmt RecordSet11 ')'
-	{
-		$$ = []RecordSet1{"(", $2, $3, ")"} //TODO 156
-	}
-
-RecordSet11:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 157
-	}
-|	';'
-	{
-		$$ = ";" //TODO 158
-	}
-
-RecordSet2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 159
-	}
-|	_AS _IDENTIFIER
-	{
-		$$ = []RecordSet2{"AS", $2} //TODO 160
-	}
-
-RecordSetList:
-	RecordSet RecordSetList1 RecordSetList2
-	{
-		$$ = []RecordSetList{$1, $2, $3} //TODO 161
-	}
-
-RecordSetList1:
-	/* EMPTY */
-	{
-		$$ = []RecordSetList1(nil) //TODO 162
-	}
-|	RecordSetList1 ',' RecordSet
-	{
-		$$ = append($1.([]RecordSetList1), ",", $3) //TODO 163
-	}
-
-RecordSetList2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 164
-	}
-|	','
-	{
-		$$ = "," //TODO 165
-	}
-
-RollbackStmt:
-	_ROLLBACK
-	{
-		$$ = "ROLLBACK" //TODO 166
-	}
-
-SelectStmt:
-	_SELECT SelectStmt1 SelectStmt2 _FROM RecordSetList SelectStmt3 SelectStmt4 SelectStmt5 SelectStmt6 SelectStmt7 SelectStmt8
-	{
-		$$ = []SelectStmt{"SELECT", $2, $3, "FROM", $5, $6, $7, $8, $9, $10, $11} //TODO 167
-	}
-
-SelectStmt1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 168
-	}
-|	_DISTINCT
-	{
-		$$ = "DISTINCT" //TODO 169
-	}
-
-SelectStmt2:
-	'*'
-	{
-		$$ = "*" //TODO 170
-	}
-|	FieldList
-	{
-		$$ = $1 //TODO 171
-	}
-
-SelectStmt3:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 172
-	}
-|	JoinClause
-	{
-		$$ = $1 //TODO 173
-	}
-
-SelectStmt4:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 174
-	}
-|	WhereClause
-	{
-		$$ = $1 //TODO 175
-	}
-
-SelectStmt5:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 176
-	}
-|	GroupByClause
-	{
-		$$ = $1 //TODO 177
-	}
-
-SelectStmt6:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 178
-	}
-|	OrderBy
-	{
-		$$ = $1 //TODO 179
-	}
-
-SelectStmt7:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 180
-	}
-|	Limit
-	{
-		$$ = $1 //TODO 181
-	}
-
-SelectStmt8:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 182
-	}
-|	Offset
-	{
-		$$ = $1 //TODO 183
-	}
-
-Slice:
-	'[' Slice1 ':' Slice2 ']'
-	{
-		$$ = []Slice{"[", $2, ":", $4, "]"} //TODO 184
-	}
-
-Slice1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 185
-	}
-|	Expression
-	{
-		$$ = $1 //TODO 186
-	}
-
-Slice2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 187
-	}
-|	Expression
-	{
-		$$ = $1 //TODO 188
-	}
-
-Start:
-	StatementList
-	{
-		_parserResult = $1 //TODO 189
-	}
-
-Statement:
-	EmptyStmt
-	{
-		$$ = $1 //TODO 190
-	}
-|	AlterTableStmt
-	{
-		$$ = $1 //TODO 191
-	}
-|	BeginTransactionStmt
-	{
-		$$ = $1 //TODO 192
-	}
-|	CommitStmt
-	{
-		$$ = $1 //TODO 193
-	}
-|	CreateIndexStmt
-	{
-		$$ = $1 //TODO 194
-	}
-|	CreateTableStmt
-	{
-		$$ = $1 //TODO 195
-	}
-|	DeleteFromStmt
-	{
-		$$ = $1 //TODO 196
-	}
-|	DropIndexStmt
-	{
-		$$ = $1 //TODO 197
-	}
-|	DropTableStmt
-	{
-		$$ = $1 //TODO 198
-	}
-|	InsertIntoStmt
-	{
-		$$ = $1 //TODO 199
-	}
-|	RollbackStmt
-	{
-		$$ = $1 //TODO 200
-	}
-|	SelectStmt
-	{
-		$$ = $1 //TODO 201
-	}
-|	TruncateTableStmt
-	{
-		$$ = $1 //TODO 202
-	}
-|	UpdateStmt
-	{
-		$$ = $1 //TODO 203
-	}
-|	ExplainStmt
-	{
-		$$ = $1 //TODO 204
-	}
-
-StatementList:
-	Statement StatementList1
-	{
-		$$ = []StatementList{$1, $2} //TODO 205
-	}
-
-StatementList1:
-	/* EMPTY */
-	{
-		$$ = []StatementList1(nil) //TODO 206
-	}
-|	StatementList1 ';' Statement
-	{
-		$$ = append($1.([]StatementList1), ";", $3) //TODO 207
-	}
-
-TableName:
-	_IDENTIFIER
-	{
-		$$ = $1 //TODO 208
-	}
-
-Term:
-	Factor Term1
-	{
-		$$ = []Term{$1, $2} //TODO 209
-	}
-
-Term1:
-	/* EMPTY */
-	{
-		$$ = []Term1(nil) //TODO 210
-	}
-|	Term1 Term11 Factor
-	{
-		$$ = append($1.([]Term1), $2, $3) //TODO 211
-	}
-
-Term11:
-	_ANDAND
-	{
-		$$ = $1 //TODO 212
-	}
-|	_AND
-	{
-		$$ = "AND" //TODO 213
-	}
-
-TruncateTableStmt:
-	_TRUNCATE _TABLE TableName
-	{
-		$$ = []TruncateTableStmt{"TRUNCATE", "TABLE", $3} //TODO 214
-	}
-
-Type:
-	_BIGINT
-	{
-		$$ = "bigint" //TODO 215
-	}
-|	_BIGRAT
-	{
-		$$ = "bigrat" //TODO 216
-	}
-|	_BLOB
-	{
-		$$ = "blob" //TODO 217
-	}
-|	_BOOL
-	{
-		$$ = "bool" //TODO 218
-	}
-|	_BYTE
-	{
-		$$ = "byte" //TODO 219
-	}
-|	_COMPLEX128
-	{
-		$$ = "complex128" //TODO 220
-	}
-|	_COMPLEX64
-	{
-		$$ = "complex64" //TODO 221
-	}
-|	_DURATION
-	{
-		$$ = "duration" //TODO 222
-	}
-|	_FLOAT
-	{
-		$$ = "float" //TODO 223
-	}
-|	_FLOAT32
-	{
-		$$ = "float32" //TODO 224
-	}
-|	_FLOAT64
-	{
-		$$ = "float64" //TODO 225
-	}
-|	_INT
-	{
-		$$ = "int" //TODO 226
-	}
-|	_INT16
-	{
-		$$ = "int16" //TODO 227
-	}
-|	_INT32
-	{
-		$$ = "int32" //TODO 228
-	}
-|	_INT64
-	{
-		$$ = "int64" //TODO 229
-	}
-|	_INT8
-	{
-		$$ = "int8" //TODO 230
-	}
-|	_RUNE
-	{
-		$$ = "rune" //TODO 231
-	}
-|	_STRING
-	{
-		$$ = "string" //TODO 232
-	}
-|	_TIME
-	{
-		$$ = "time" //TODO 233
-	}
-|	_UINT
-	{
-		$$ = "uint" //TODO 234
-	}
-|	_UINT16
-	{
-		$$ = "uint16" //TODO 235
-	}
-|	_UINT32
-	{
-		$$ = "uint32" //TODO 236
-	}
-|	_UINT64
-	{
-		$$ = "uint64" //TODO 237
-	}
-|	_UINT8
-	{
-		$$ = "uint8" //TODO 238
-	}
-
-UnaryExpr:
-	UnaryExpr1 PrimaryExpression
-	{
-		$$ = []UnaryExpr{$1, $2} //TODO 239
-	}
-
-UnaryExpr1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 240
-	}
-|	UnaryExpr11
-	{
-		$$ = $1 //TODO 241
-	}
-
-UnaryExpr11:
-	'^'
-	{
-		$$ = "^" //TODO 242
-	}
-|	'!'
-	{
-		$$ = "!" //TODO 243
-	}
-|	'-'
-	{
-		$$ = "-" //TODO 244
-	}
-|	'+'
-	{
-		$$ = "+" //TODO 245
-	}
-
-UpdateStmt:
-	_UPDATE TableName UpdateStmt1 AssignmentList UpdateStmt2
-	{
-		$$ = []UpdateStmt{"UPDATE", $2, $3, $4, $5} //TODO 246
-	}
-
-UpdateStmt1:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 247
-	}
-|	_SET
-	{
-		$$ = "SET" //TODO 248
-	}
-
-UpdateStmt2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 249
-	}
-|	WhereClause
-	{
-		$$ = $1 //TODO 250
-	}
-
-Values:
-	_VALUES '(' ExpressionList ')' Values1 Values2
-	{
-		$$ = []Values{"VALUES", "(", $3, ")", $5, $6} //TODO 251
-	}
-
-Values1:
-	/* EMPTY */
-	{
-		$$ = []Values1(nil) //TODO 252
-	}
-|	Values1 ',' '(' ExpressionList ')'
-	{
-		$$ = append($1.([]Values1), ",", "(", $4, ")") //TODO 253
-	}
-
-Values2:
-	/* EMPTY */
-	{
-		$$ = nil //TODO 254
-	}
-|	','
-	{
-		$$ = "," //TODO 255
-	}
-
-WhereClause:
-	_WHERE Expression
-	{
-		$$ = []WhereClause{"WHERE", $2} //TODO 256
-	}
-
-%%
-
-//TODO remove demo stuff below
-
-var _parserResult interface{}
-
-type (
-	AlterTableStmt interface{}
-	AlterTableStmt1 interface{}
-	Assignment interface{}
-	AssignmentList interface{}
-	AssignmentList1 interface{}
-	AssignmentList2 interface{}
-	BeginTransactionStmt interface{}
-	Call interface{}
-	Call1 interface{}
-	Call11 interface{}
-	ColumnDef interface{}
-	ColumnDef1 interface{}
-	ColumnDef11 interface{}
-	ColumnDef2 interface{}
-	ColumnName interface{}
-	ColumnNameList interface{}
-	ColumnNameList1 interface{}
-	ColumnNameList2 interface{}
-	CommitStmt interface{}
-	Conversion interface{}
-	CreateIndexStmt interface{}
-	CreateIndexStmt1 interface{}
-	CreateIndexStmt2 interface{}
-	CreateTableStmt interface{}
-	CreateTableStmt1 interface{}
-	CreateTableStmt2 interface{}
-	CreateTableStmt3 interface{}
-	DeleteFromStmt interface{}
-	DeleteFromStmt1 interface{}
-	DropIndexStmt interface{}
-	DropIndexStmt1 interface{}
-	DropTableStmt interface{}
-	DropTableStmt1 interface{}
-	EmptyStmt interface{}
-	ExplainStmt interface{}
-	Expression interface{}
-	Expression1 interface{}
-	Expression11 interface{}
-	ExpressionList interface{}
-	ExpressionList1 interface{}
-	ExpressionList2 interface{}
-	Factor interface{}
-	Factor1 interface{}
-	Factor11 interface{}
-	Factor2 interface{}
-	Field interface{}
-	Field1 interface{}
-	FieldList interface{}
-	FieldList1 interface{}
-	FieldList2 interface{}
-	GroupByClause interface{}
-	Index interface{}
-	IndexName interface{}
-	InsertIntoStmt interface{}
-	InsertIntoStmt1 interface{}
-	InsertIntoStmt2 interface{}
-	JoinClause interface{}
-	JoinClause1 interface{}
-	JoinClause2 interface{}
-	Limit interface{}
-	Literal interface{}
-	Offset interface{}
-	Operand interface{}
-	OrderBy interface{}
-	OrderBy1 interface{}
-	OrderBy11 interface{}
-	Predicate interface{}
-	Predicate1 interface{}
-	Predicate11 interface{}
-	Predicate12 interface{}
-	Predicate121 interface{}
-	Predicate13 interface{}
-	PrimaryExpression interface{}
-	PrimaryFactor interface{}
-	PrimaryFactor1 interface{}
-	PrimaryFactor11 interface{}
-	PrimaryTerm interface{}
-	PrimaryTerm1 interface{}
-	PrimaryTerm11 interface{}
-	QualifiedIdent interface{}
-	QualifiedIdent1 interface{}
-	RecordSet interface{}
-	RecordSet1 interface{}
-	RecordSet11 interface{}
-	RecordSet2 interface{}
-	RecordSetList interface{}
-	RecordSetList1 interface{}
-	RecordSetList2 interface{}
-	RollbackStmt interface{}
-	SelectStmt interface{}
-	SelectStmt1 interface{}
-	SelectStmt2 interface{}
-	SelectStmt3 interface{}
-	SelectStmt4 interface{}
-	SelectStmt5 interface{}
-	SelectStmt6 interface{}
-	SelectStmt7 interface{}
-	SelectStmt8 interface{}
-	Slice interface{}
-	Slice1 interface{}
-	Slice2 interface{}
-	Start interface{}
-	Statement interface{}
-	StatementList interface{}
-	StatementList1 interface{}
-	TableName interface{}
-	Term interface{}
-	Term1 interface{}
-	Term11 interface{}
-	TruncateTableStmt interface{}
-	Type interface{}
-	UnaryExpr interface{}
-	UnaryExpr1 interface{}
-	UnaryExpr11 interface{}
-	UpdateStmt interface{}
-	UpdateStmt1 interface{}
-	UpdateStmt2 interface{}
-	Values interface{}
-	Values1 interface{}
-	Values2 interface{}
-	WhereClause interface{}
-)
-	
-func _dump() {
-	s := fmt.Sprintf("%#v", _parserResult)
-	s = strings.Replace(s, "%", "%%", -1)
-	s = strings.Replace(s, "{", "{%i\n", -1)
-	s = strings.Replace(s, "}", "%u\n}", -1)
-	s = strings.Replace(s, ", ", ",\n", -1)
-	var buf bytes.Buffer
-	strutil.IndentFormatter(&buf, ". ").Format(s)
-	buf.WriteString("\n")
-	a := strings.Split(buf.String(), "\n")
-	for _, v := range a {
-		if strings.HasSuffix(v, "(nil)") || strings.HasSuffix(v, "(nil),") {
-			continue
-		}
-	
-		fmt.Println(v)
-	}
-}
-
-// End of demo stuff
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/ql/Makefile b/Godeps/_workspace/src/github.com/cznic/ql/ql/Makefile
deleted file mode 100644
index e795538a76..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/ql/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2014 The ql Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-.PHONY: all clean nuke
-
-all: editor
-	go vet
-	go install
-	make todo
-
-clean:
-	go clean
-	rm -f *~ ql
-
-editor:
-	go fmt
-	go install
-
-todo:
-	@grep -n ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* *.go || true
-	@grep -n TODO *.go || true
-	@grep -n BUG *.go || true
-	@grep -n println *.go || true
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/ql/README.md b/Godeps/_workspace/src/github.com/cznic/ql/ql/README.md
deleted file mode 100644
index 07139fd617..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/ql/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-ql
-==
-
-Command ql is a utility to explore a database, prototype a schema or test drive a query, etc.
-
-Installation
-
-    $ go get github.com/cznic/ql/ql
-
-Documentation: [godoc.org/github.com/cznic/ql/ql](http://godoc.org/github.com/cznic/ql/ql)
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/ql/main.go b/Godeps/_workspace/src/github.com/cznic/ql/ql/main.go
deleted file mode 100644
index 568fd706e2..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/ql/main.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Command ql is a utility to explore a database, prototype a schema or test
-// drive a query, etc.
-//
-// Installation:
-//
-//	$ go get github.com/cznic/ql/ql
-//
-// Usage:
-//
-//	ql [-db name] [-schema regexp] [-tables regexp] [-fld] statement_list
-//
-// Options:
-//
-//	-db name	Name of the database to use. Defaults to "ql.db".
-//			If the DB file does not exists it is created automatically.
-//
-//	-schema re	If re != "" show the CREATE statements of matching tables and exit.
-//
-//	-tables re	If re != "" show the matching table names and exit.
-//
-//	-fld		First row of a query result set will show field names.
-//
-//	statement_list	QL statements to execute.
-//			If no non flag arguments are present, ql reads from stdin.
-//			The list is wrapped into an automatic transaction.
-//
-//	-t		Report and measure time to execute, including creating/opening and closing the DB.
-//
-// Example:
-//
-//	$ ql 'create table t (i int, s string)'
-//	$ ql << EOF
-//	> insert into t values
-//	> (1, "a"),
-//	> (2, "b"),
-//	> (3, "c"),
-//	> EOF
-//	$ ql 'select * from t'
-//	3, "c"
-//	2, "b"
-//	1, "a"
-//	$ ql -fld 'select * from t where i != 2 order by s'
-//	"i", "s"
-//	1, "a"
-//	3, "c"
-//	$
-package main
-
-import (
-	"bufio"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/cznic/ql"
-)
-
-func str(data []interface{}) string {
-	a := make([]string, len(data))
-	for i, v := range data {
-		switch x := v.(type) {
-		case string:
-			a[i] = fmt.Sprintf("%q", x)
-		default:
-			a[i] = fmt.Sprint(x)
-		}
-	}
-	return strings.Join(a, ", ")
-}
-
-func main() {
-	if err := do(); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func do() (err error) {
-	oDB := flag.String("db", "ql.db", "The DB file to open. It'll be created if missing.")
-	oFlds := flag.Bool("fld", false, "Show recordset's field names.")
-	oSchema := flag.String("schema", "", "If non empty, show the CREATE statements of matching tables and exit.")
-	oTables := flag.String("tables", "", "If non empty, list matching table names and exit.")
-	oTime := flag.Bool("t", false, "Measure and report time to execute the statement(s) including DB create/open/close.")
-	flag.Parse()
-
-	t0 := time.Now()
-	if *oTime {
-		defer func() {
-			fmt.Fprintf(os.Stderr, "%s\n", time.Since(t0))
-		}()
-	}
-
-	db, err := ql.OpenFile(*oDB, &ql.Options{CanCreate: true})
-	if err != nil {
-		return err
-	}
-
-	defer func() {
-		ec := db.Close()
-		switch {
-		case ec != nil && err != nil:
-			log.Println(ec)
-		case ec != nil:
-			err = ec
-		}
-	}()
-
-	if pat := *oSchema; pat != "" {
-		re, err := regexp.Compile(pat)
-		if err != nil {
-			return err
-		}
-
-		nfo, err := db.Info()
-		if err != nil {
-			return err
-		}
-
-		r := []string{}
-		for _, ti := range nfo.Tables {
-			if !re.MatchString(ti.Name) {
-				continue
-			}
-
-			a := []string{}
-			for _, ci := range ti.Columns {
-				a = append(a, fmt.Sprintf("%s %s", ci.Name, ci.Type))
-			}
-			r = append(r, fmt.Sprintf("CREATE TABLE %s (%s);", ti.Name, strings.Join(a, ", ")))
-		}
-		sort.Strings(r)
-		if len(r) != 0 {
-			fmt.Println(strings.Join(r, "\n"))
-		}
-		return nil
-	}
-
-	if pat := *oTables; pat != "" {
-		re, err := regexp.Compile(pat)
-		if err != nil {
-			return err
-		}
-
-		nfo, err := db.Info()
-		if err != nil {
-			return err
-		}
-
-		r := []string{}
-		for _, ti := range nfo.Tables {
-			if !re.MatchString(ti.Name) {
-				continue
-			}
-
-			r = append(r, ti.Name)
-		}
-		sort.Strings(r)
-		if len(r) != 0 {
-			fmt.Println(strings.Join(r, "\n"))
-		}
-		return nil
-	}
-
-	var src string
-	switch n := flag.NArg(); n {
-	case 0:
-		b, err := ioutil.ReadAll(bufio.NewReader(os.Stdin))
-		if err != nil {
-			return err
-		}
-
-		src = string(b)
-	default:
-		a := make([]string, n)
-		for i := range a {
-			a[i] = flag.Arg(i)
-		}
-		src = strings.Join(a, " ")
-	}
-
-	src = "BEGIN TRANSACTION; " + src + "; COMMIT;"
-	l, err := ql.Compile(src)
-	if err != nil {
-		log.Println(src)
-		return err
-	}
-
-	rs, i, err := db.Execute(ql.NewRWCtx(), l)
-	if err != nil {
-		a := strings.Split(strings.TrimSpace(fmt.Sprint(l)), "\n")
-		return fmt.Errorf("%v: %s", err, a[i])
-	}
-
-	if len(rs) == 0 {
-		return
-	}
-
-	switch {
-	case l.IsExplainStmt():
-		return rs[len(rs)-1].Do(*oFlds, func(data []interface{}) (bool, error) {
-			fmt.Println(data[0])
-			return true, nil
-		})
-	default:
-		return rs[len(rs)-1].Do(*oFlds, func(data []interface{}) (bool, error) {
-			fmt.Println(str(data))
-			return true, nil
-		})
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/scanner.go b/Godeps/_workspace/src/github.com/cznic/ql/scanner.go
deleted file mode 100644
index aafa3cf8fa..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/scanner.go
+++ /dev/null
@@ -1,4129 +0,0 @@
-// CAUTION: Generated file - DO NOT EDIT.
-
-/*
-Copyright (c) 2014 The ql Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-*/
-
-package ql
-
-import (
-	"fmt"
-	"math"
-	"strconv"
-	"unicode"
-)
-
-type lexer struct {
-	agg    []bool
-	c      int
-	col    int
-	errs   []error
-	expr   expression
-	i      int
-	inj    int
-	lcol   int
-	line   int
-	list   []stmt
-	ncol   int
-	nline  int
-	params int
-	sc     int
-	src    string
-	val    []byte
-	root   bool
-}
-
-func newLexer(src string) (l *lexer) {
-	l = &lexer{
-		src:   src,
-		nline: 1,
-		ncol:  0,
-	}
-	l.next()
-	return
-}
-
-func (l *lexer) next() int {
-	if l.c != 0 {
-		l.val = append(l.val, byte(l.c))
-	}
-	l.c = 0
-	if l.i < len(l.src) {
-		l.c = int(l.src[l.i])
-		l.i++
-	}
-	switch l.c {
-	case '\n':
-		l.lcol = l.ncol
-		l.nline++
-		l.ncol = 0
-	default:
-		l.ncol++
-	}
-	return l.c
-}
-
-func (l *lexer) err0(ln, c int, s string, arg ...interface{}) {
-	err := fmt.Errorf(fmt.Sprintf("%d:%d ", ln, c)+s, arg...)
-	l.errs = append(l.errs, err)
-}
-
-func (l *lexer) err(s string, arg ...interface{}) {
-	l.err0(l.line, l.col, s, arg...)
-}
-
-func (l *lexer) Error(s string) {
-	l.err(s)
-}
-
-func (l *lexer) Lex(lval *yySymType) (r int) {
-	//defer func() { dbg("Lex -> %d(%#x)", r, r) }()
-	defer func() {
-		lval.line, lval.col = l.line, l.col
-	}()
-	const (
-		INITIAL = iota
-		S1
-		S2
-	)
-
-	if n := l.inj; n != 0 {
-		l.inj = 0
-		return n
-	}
-
-	c0, c := 0, l.c
-
-yystate0:
-
-	l.val = l.val[:0]
-	c0, l.line, l.col = l.c, l.nline, l.ncol
-
-	switch yyt := l.sc; yyt {
-	default:
-		panic(fmt.Errorf(`invalid start condition %d`, yyt))
-	case 0: // start condition: INITIAL
-		goto yystart1
-	case 1: // start condition: S1
-		goto yystart319
-	case 2: // start condition: S2
-		goto yystart324
-	}
-
-	goto yystate0 // silence unused label error
-	goto yystate1 // silence unused label error
-yystate1:
-	c = l.next()
-yystart1:
-	switch {
-	default:
-		goto yystate3 // c >= '\x01' && c <= '\b' || c == '\v' || c == '\f' || c >= '\x0e' && c <= '\x1f' || c == '#' || c == '%%' || c >= '(' && c <= ',' || c == ':' || c == ';' || c == '@' || c >= '[' && c <= '^' || c == '{' || c >= '}' && c <= 'ÿ'
-	case c == '!':
-		goto yystate6
-	case c == '"':
-		goto yystate8
-	case c == '$' || c == '?':
-		goto yystate9
-	case c == '&':
-		goto yystate11
-	case c == '-':
-		goto yystate19
-	case c == '.':
-		goto yystate21
-	case c == '/':
-		goto yystate27
-	case c == '0':
-		goto yystate32
-	case c == '<':
-		goto yystate40
-	case c == '=':
-		goto yystate43
-	case c == '>':
-		goto yystate45
-	case c == 'A' || c == 'a':
-		goto yystate48
-	case c == 'B' || c == 'b':
-		goto yystate60
-	case c == 'C' || c == 'c':
-		goto yystate87
-	case c == 'D' || c == 'd':
-		goto yystate111
-	case c == 'E' || c == 'e':
-		goto yystate141
-	case c == 'F' || c == 'f':
-		goto yystate152
-	case c == 'G' || c == 'g':
-		goto yystate171
-	case c == 'H' || c == 'K' || c == 'M' || c == 'P' || c == 'Q' || c >= 'X' && c <= 'Z' || c == '_' || c == 'h' || c == 'k' || c == 'm' || c == 'p' || c == 'q' || c >= 'x' && c <= 'z':
-		goto yystate176
-	case c == 'I' || c == 'i':
-		goto yystate177
-	case c == 'J' || c == 'j':
-		goto yystate197
-	case c == 'L' || c == 'l':
-		goto yystate201
-	case c == 'N' || c == 'n':
-		goto yystate211
-	case c == 'O' || c == 'o':
-		goto yystate217
-	case c == 'R' || c == 'r':
-		goto yystate232
-	case c == 'S' || c == 's':
-		goto yystate247
-	case c == 'T' || c == 't':
-		goto yystate259
-	case c == 'U' || c == 'u':
-		goto yystate284
-	case c == 'V' || c == 'v':
-		goto yystate305
-	case c == 'W' || c == 'w':
-		goto yystate311
-	case c == '\'':
-		goto yystate14
-	case c == '\n':
-		goto yystate5
-	case c == '\t' || c == '\r' || c == ' ':
-		goto yystate4
-	case c == '\x00':
-		goto yystate2
-	case c == '`':
-		goto yystate316
-	case c == '|':
-		goto yystate317
-	case c >= '1' && c <= '9':
-		goto yystate38
-	}
-
-yystate2:
-	c = l.next()
-	goto yyrule1
-
-yystate3:
-	c = l.next()
-	goto yyrule101
-
-yystate4:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule2
-	case c == '\t' || c == '\n' || c == '\r' || c == ' ':
-		goto yystate5
-	}
-
-yystate5:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule2
-	case c == '\t' || c == '\n' || c == '\r' || c == ' ':
-		goto yystate5
-	}
-
-yystate6:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c == '=':
-		goto yystate7
-	}
-
-yystate7:
-	c = l.next()
-	goto yyrule21
-
-yystate8:
-	c = l.next()
-	goto yyrule10
-
-yystate9:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c >= '0' && c <= '9':
-		goto yystate10
-	}
-
-yystate10:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule100
-	case c >= '0' && c <= '9':
-		goto yystate10
-	}
-
-yystate11:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c == '&':
-		goto yystate12
-	case c == '^':
-		goto yystate13
-	}
-
-yystate12:
-	c = l.next()
-	goto yyrule15
-
-yystate13:
-	c = l.next()
-	goto yyrule16
-
-yystate14:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c == '\'':
-		goto yystate16
-	case c == '\\':
-		goto yystate17
-	case c >= '\x01' && c <= '&' || c >= '(' && c <= '[' || c >= ']' && c <= 'ÿ':
-		goto yystate15
-	}
-
-yystate15:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c == '\'':
-		goto yystate16
-	case c == '\\':
-		goto yystate17
-	case c >= '\x01' && c <= '&' || c >= '(' && c <= '[' || c >= ']' && c <= 'ÿ':
-		goto yystate15
-	}
-
-yystate16:
-	c = l.next()
-	goto yyrule12
-
-yystate17:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c == '\'':
-		goto yystate18
-	case c == '\\':
-		goto yystate17
-	case c >= '\x01' && c <= '&' || c >= '(' && c <= '[' || c >= ']' && c <= 'ÿ':
-		goto yystate15
-	}
-
-yystate18:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule12
-	case c == '\'':
-		goto yystate16
-	case c == '\\':
-		goto yystate17
-	case c >= '\x01' && c <= '&' || c >= '(' && c <= '[' || c >= ']' && c <= 'ÿ':
-		goto yystate15
-	}
-
-yystate19:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c == '-':
-		goto yystate20
-	}
-
-yystate20:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule3
-	case c >= '\x01' && c <= '\t' || c >= '\v' && c <= 'ÿ':
-		goto yystate20
-	}
-
-yystate21:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c >= '0' && c <= '9':
-		goto yystate22
-	}
-
-yystate22:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule9
-	case c == 'E' || c == 'e':
-		goto yystate23
-	case c == 'i':
-		goto yystate26
-	case c >= '0' && c <= '9':
-		goto yystate22
-	}
-
-yystate23:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c == '+' || c == '-':
-		goto yystate24
-	case c >= '0' && c <= '9':
-		goto yystate25
-	}
-
-yystate24:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c >= '0' && c <= '9':
-		goto yystate25
-	}
-
-yystate25:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule9
-	case c == 'i':
-		goto yystate26
-	case c >= '0' && c <= '9':
-		goto yystate25
-	}
-
-yystate26:
-	c = l.next()
-	goto yyrule7
-
-yystate27:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c == '*':
-		goto yystate28
-	case c == '/':
-		goto yystate31
-	}
-
-yystate28:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c == '*':
-		goto yystate29
-	case c >= '\x01' && c <= ')' || c >= '+' && c <= 'ÿ':
-		goto yystate28
-	}
-
-yystate29:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c == '*':
-		goto yystate29
-	case c == '/':
-		goto yystate30
-	case c >= '\x01' && c <= ')' || c >= '+' && c <= '.' || c >= '0' && c <= 'ÿ':
-		goto yystate28
-	}
-
-yystate30:
-	c = l.next()
-	goto yyrule5
-
-yystate31:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule4
-	case c >= '\x01' && c <= '\t' || c >= '\v' && c <= 'ÿ':
-		goto yystate31
-	}
-
-yystate32:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule8
-	case c == '.':
-		goto yystate22
-	case c == '8' || c == '9':
-		goto yystate34
-	case c == 'E' || c == 'e':
-		goto yystate23
-	case c == 'X' || c == 'x':
-		goto yystate36
-	case c == 'i':
-		goto yystate35
-	case c >= '0' && c <= '7':
-		goto yystate33
-	}
-
-yystate33:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule8
-	case c == '.':
-		goto yystate22
-	case c == '8' || c == '9':
-		goto yystate34
-	case c == 'E' || c == 'e':
-		goto yystate23
-	case c == 'i':
-		goto yystate35
-	case c >= '0' && c <= '7':
-		goto yystate33
-	}
-
-yystate34:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c == '.':
-		goto yystate22
-	case c == 'E' || c == 'e':
-		goto yystate23
-	case c == 'i':
-		goto yystate35
-	case c >= '0' && c <= '9':
-		goto yystate34
-	}
-
-yystate35:
-	c = l.next()
-	goto yyrule6
-
-yystate36:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'a' && c <= 'f':
-		goto yystate37
-	}
-
-yystate37:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule8
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'a' && c <= 'f':
-		goto yystate37
-	}
-
-yystate38:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule8
-	case c == '.':
-		goto yystate22
-	case c == 'E' || c == 'e':
-		goto yystate23
-	case c == 'i':
-		goto yystate35
-	case c >= '0' && c <= '9':
-		goto yystate39
-	}
-
-yystate39:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule8
-	case c == '.':
-		goto yystate22
-	case c == 'E' || c == 'e':
-		goto yystate23
-	case c == 'i':
-		goto yystate35
-	case c >= '0' && c <= '9':
-		goto yystate39
-	}
-
-yystate40:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c == '<':
-		goto yystate41
-	case c == '=':
-		goto yystate42
-	}
-
-yystate41:
-	c = l.next()
-	goto yyrule17
-
-yystate42:
-	c = l.next()
-	goto yyrule18
-
-yystate43:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c == '=':
-		goto yystate44
-	}
-
-yystate44:
-	c = l.next()
-	goto yyrule19
-
-yystate45:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c == '=':
-		goto yystate46
-	case c == '>':
-		goto yystate47
-	}
-
-yystate46:
-	c = l.next()
-	goto yyrule20
-
-yystate47:
-	c = l.next()
-	goto yyrule23
-
-yystate48:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'D' || c == 'd':
-		goto yystate50
-	case c == 'L' || c == 'l':
-		goto yystate52
-	case c == 'N' || c == 'n':
-		goto yystate56
-	case c == 'S' || c == 's':
-		goto yystate58
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'K' || c == 'M' || c >= 'O' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'k' || c == 'm' || c >= 'o' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate49:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate50:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'D' || c == 'd':
-		goto yystate51
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'z':
-		goto yystate49
-	}
-
-yystate51:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule24
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate52:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate53
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate53:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate54
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate54:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'R' || c == 'r':
-		goto yystate55
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate55:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule25
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate56:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'D' || c == 'd':
-		goto yystate57
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'z':
-		goto yystate49
-	}
-
-yystate57:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule26
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate58:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule28
-	case c == 'C' || c == 'c':
-		goto yystate59
-	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
-		goto yystate49
-	}
-
-yystate59:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule27
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate60:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate61
-	case c == 'I' || c == 'i':
-		goto yystate70
-	case c == 'L' || c == 'l':
-		goto yystate78
-	case c == 'O' || c == 'o':
-		goto yystate81
-	case c == 'Y' || c == 'y':
-		goto yystate84
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'H' || c == 'J' || c == 'K' || c == 'M' || c == 'N' || c >= 'P' && c <= 'X' || c == 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'h' || c == 'j' || c == 'k' || c == 'm' || c == 'n' || c >= 'p' && c <= 'x' || c == 'z':
-		goto yystate49
-	}
-
-yystate61:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'G' || c == 'g':
-		goto yystate62
-	case c == 'T' || c == 't':
-		goto yystate65
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'H' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'f' || c >= 'h' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate62:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate63
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate63:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate64
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate64:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule29
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate65:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'W' || c == 'w':
-		goto yystate66
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'V' || c >= 'X' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'v' || c >= 'x' && c <= 'z':
-		goto yystate49
-	}
-
-yystate66:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate67
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate67:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate68
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate68:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate69
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate69:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule30
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate70:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'G' || c == 'g':
-		goto yystate71
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'H' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'f' || c >= 'h' && c <= 'z':
-		goto yystate49
-	}
-
-yystate71:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate72
-	case c == 'R' || c == 'r':
-		goto yystate75
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate72:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate73
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate73:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate74
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate74:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule75
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate75:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate76
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate76:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate77
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate77:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule76
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate78:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate79
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	}
-
-yystate79:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'B' || c == 'b':
-		goto yystate80
-	case c >= '0' && c <= '9' || c == 'A' || c >= 'C' && c <= 'Z' || c == '_' || c == 'a' || c >= 'c' && c <= 'z':
-		goto yystate49
-	}
-
-yystate80:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule77
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate81:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate82
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	}
-
-yystate82:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate83
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate83:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule78
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate84:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule31
-	case c == 'T' || c == 't':
-		goto yystate85
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate85:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate86
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate86:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule79
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate87:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate88
-	case c == 'R' || c == 'r':
-		goto yystate106
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c == 'P' || c == 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c == 'p' || c == 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate88:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate89
-	case c == 'M' || c == 'm':
-		goto yystate93
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'n' && c <= 'z':
-		goto yystate49
-	}
-
-yystate89:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'U' || c == 'u':
-		goto yystate90
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate90:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'M' || c == 'm':
-		goto yystate91
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'L' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'l' || c >= 'n' && c <= 'z':
-		goto yystate49
-	}
-
-yystate91:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate92
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate92:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule32
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate93:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'M' || c == 'm':
-		goto yystate94
-	case c == 'P' || c == 'p':
-		goto yystate97
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'L' || c == 'N' || c == 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'l' || c == 'n' || c == 'o' || c >= 'q' && c <= 'z':
-		goto yystate49
-	}
-
-yystate94:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate95
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate95:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate96
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate96:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule33
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate97:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate98
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate98:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate99
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate99:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'X' || c == 'x':
-		goto yystate100
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'W' || c == 'Y' || c == 'Z' || c == '_' || c >= 'a' && c <= 'w' || c == 'y' || c == 'z':
-		goto yystate49
-	}
-
-yystate100:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '0' || c >= '2' && c <= '5' || c >= '7' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	case c == '1':
-		goto yystate101
-	case c == '6':
-		goto yystate104
-	}
-
-yystate101:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '0' || c == '1' || c >= '3' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	case c == '2':
-		goto yystate102
-	}
-
-yystate102:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '8':
-		goto yystate103
-	case c >= '0' && c <= '7' || c == '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate103:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule80
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate104:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '4':
-		goto yystate105
-	case c >= '0' && c <= '3' || c >= '5' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate105:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule81
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate106:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate107
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate107:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate108
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate108:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate109
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate109:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate110
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate110:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule34
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate111:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate112
-	case c == 'I' || c == 'i':
-		goto yystate124
-	case c == 'R' || c == 'r':
-		goto yystate131
-	case c == 'U' || c == 'u':
-		goto yystate134
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'H' || c >= 'J' && c <= 'Q' || c == 'S' || c == 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'h' || c >= 'j' && c <= 'q' || c == 's' || c == 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate112:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'F' || c == 'f':
-		goto yystate113
-	case c == 'L' || c == 'l':
-		goto yystate118
-	case c == 'S' || c == 's':
-		goto yystate122
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'K' || c >= 'M' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'k' || c >= 'm' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate113:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate114
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate114:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'U' || c == 'u':
-		goto yystate115
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate115:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate116
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate116:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate117
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate117:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule35
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate118:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate119
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate119:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate120
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate120:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate121
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate121:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule36
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate122:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'C' || c == 'c':
-		goto yystate123
-	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
-		goto yystate49
-	}
-
-yystate123:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule37
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate124:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'S' || c == 's':
-		goto yystate125
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate125:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate126
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate126:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate127
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate127:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate128
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate128:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'C' || c == 'c':
-		goto yystate129
-	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
-		goto yystate49
-	}
-
-yystate129:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate130
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate130:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule38
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate131:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate132
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	}
-
-yystate132:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'P' || c == 'p':
-		goto yystate133
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'o' || c >= 'q' && c <= 'z':
-		goto yystate49
-	}
-
-yystate133:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule39
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate134:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'R' || c == 'r':
-		goto yystate135
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate135:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate136
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate136:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate137
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate137:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate138
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate138:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate139
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	}
-
-yystate139:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate140
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate140:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule82
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate141:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'X' || c == 'x':
-		goto yystate142
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'W' || c == 'Y' || c == 'Z' || c == '_' || c >= 'a' && c <= 'w' || c == 'y' || c == 'z':
-		goto yystate49
-	}
-
-yystate142:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate143
-	case c == 'P' || c == 'p':
-		goto yystate147
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'o' || c >= 'q' && c <= 'z':
-		goto yystate49
-	}
-
-yystate143:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'S' || c == 's':
-		goto yystate144
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate144:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate145
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate145:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'S' || c == 's':
-		goto yystate146
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate146:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule40
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate147:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate148
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate148:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate149
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate149:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate150
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate150:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate151
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate151:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule41
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate152:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate153
-	case c == 'L' || c == 'l':
-		goto yystate157
-	case c == 'R' || c == 'r':
-		goto yystate165
-	case c == 'U' || c == 'u':
-		goto yystate168
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'K' || c >= 'M' && c <= 'Q' || c == 'S' || c == 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'k' || c >= 'm' && c <= 'q' || c == 's' || c == 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate153:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate154
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate154:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'S' || c == 's':
-		goto yystate155
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate155:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate156
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate156:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule73
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate157:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate158
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	}
-
-yystate158:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate159
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate159:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate160
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate160:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule83
-	case c == '3':
-		goto yystate161
-	case c == '6':
-		goto yystate163
-	case c >= '0' && c <= '2' || c == '4' || c == '5' || c >= '7' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate161:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '0' || c == '1' || c >= '3' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	case c == '2':
-		goto yystate162
-	}
-
-yystate162:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule84
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate163:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '4':
-		goto yystate164
-	case c >= '0' && c <= '3' || c >= '5' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate164:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule85
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate165:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate166
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	}
-
-yystate166:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'M' || c == 'm':
-		goto yystate167
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'L' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'l' || c >= 'n' && c <= 'z':
-		goto yystate49
-	}
-
-yystate167:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule42
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate168:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate169
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate169:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate170
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate170:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule43
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate171:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'R' || c == 'r':
-		goto yystate172
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate172:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate173
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	}
-
-yystate173:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'U' || c == 'u':
-		goto yystate174
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate174:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'P' || c == 'p':
-		goto yystate175
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'o' || c >= 'q' && c <= 'z':
-		goto yystate49
-	}
-
-yystate175:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule44
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate176:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate177:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'F' || c == 'f':
-		goto yystate178
-	case c == 'N' || c == 'n':
-		goto yystate179
-	case c == 'S' || c == 's':
-		goto yystate196
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'M' || c >= 'O' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'm' || c >= 'o' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate178:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule45
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate179:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule49
-	case c == 'D' || c == 'd':
-		goto yystate180
-	case c == 'S' || c == 's':
-		goto yystate183
-	case c == 'T' || c == 't':
-		goto yystate187
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'R' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'r' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate180:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate181
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate181:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'X' || c == 'x':
-		goto yystate182
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'W' || c == 'Y' || c == 'Z' || c == '_' || c >= 'a' && c <= 'w' || c == 'y' || c == 'z':
-		goto yystate49
-	}
-
-yystate182:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule46
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate183:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate184
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate184:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'R' || c == 'r':
-		goto yystate185
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate185:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate186
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate186:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule47
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate187:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule86
-	case c == '0' || c == '2' || c == '4' || c == '5' || c == '7' || c == '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	case c == '1':
-		goto yystate188
-	case c == '3':
-		goto yystate190
-	case c == '6':
-		goto yystate192
-	case c == '8':
-		goto yystate194
-	case c == 'O' || c == 'o':
-		goto yystate195
-	}
-
-yystate188:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '6':
-		goto yystate189
-	case c >= '0' && c <= '5' || c >= '7' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate189:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule87
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate190:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '0' || c == '1' || c >= '3' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	case c == '2':
-		goto yystate191
-	}
-
-yystate191:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule88
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate192:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '4':
-		goto yystate193
-	case c >= '0' && c <= '3' || c >= '5' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate193:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule89
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate194:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule90
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate195:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule48
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate196:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule50
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate197:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate198
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	}
-
-yystate198:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate199
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate199:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate200
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate200:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule51
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate201:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate202
-	case c == 'I' || c == 'i':
-		goto yystate205
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate202:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'F' || c == 'f':
-		goto yystate203
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'z':
-		goto yystate49
-	}
-
-yystate203:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate204
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate204:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule52
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate205:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'K' || c == 'k':
-		goto yystate206
-	case c == 'M' || c == 'm':
-		goto yystate208
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'J' || c == 'L' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'j' || c == 'l' || c >= 'n' && c <= 'z':
-		goto yystate49
-	}
-
-yystate206:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate207
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate207:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule53
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate208:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate209
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate209:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate210
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate210:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule54
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate211:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate212
-	case c == 'U' || c == 'u':
-		goto yystate214
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate212:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate213
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate213:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule55
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate214:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate215
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate215:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate216
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate216:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule72
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate217:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'F' || c == 'f':
-		goto yystate218
-	case c == 'N' || c == 'n':
-		goto yystate223
-	case c == 'R' || c == 'r':
-		goto yystate224
-	case c == 'U' || c == 'u':
-		goto yystate228
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'M' || c >= 'O' && c <= 'Q' || c == 'S' || c == 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'm' || c >= 'o' && c <= 'q' || c == 's' || c == 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate218:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'F' || c == 'f':
-		goto yystate219
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'E' || c >= 'G' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'e' || c >= 'g' && c <= 'z':
-		goto yystate49
-	}
-
-yystate219:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'S' || c == 's':
-		goto yystate220
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate220:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate221
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate221:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate222
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate222:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule56
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate223:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule57
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate224:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule59
-	case c == 'D' || c == 'd':
-		goto yystate225
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'z':
-		goto yystate49
-	}
-
-yystate225:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate226
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate226:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'R' || c == 'r':
-		goto yystate227
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate227:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule58
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate228:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate229
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate229:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate230
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate230:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'R' || c == 'r':
-		goto yystate231
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate231:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule60
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate232:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate233
-	case c == 'O' || c == 'o':
-		goto yystate237
-	case c == 'U' || c == 'u':
-		goto yystate244
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'N' || c >= 'P' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'n' || c >= 'p' && c <= 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate233:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'G' || c == 'g':
-		goto yystate234
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'H' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'f' || c >= 'h' && c <= 'z':
-		goto yystate49
-	}
-
-yystate234:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'H' || c == 'h':
-		goto yystate235
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'G' || c >= 'I' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'g' || c >= 'i' && c <= 'z':
-		goto yystate49
-	}
-
-yystate235:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate236
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate236:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule61
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate237:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate238
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate238:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate239
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate239:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'B' || c == 'b':
-		goto yystate240
-	case c >= '0' && c <= '9' || c == 'A' || c >= 'C' && c <= 'Z' || c == '_' || c == 'a' || c >= 'c' && c <= 'z':
-		goto yystate49
-	}
-
-yystate240:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate241
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate241:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'C' || c == 'c':
-		goto yystate242
-	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
-		goto yystate49
-	}
-
-yystate242:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'K' || c == 'k':
-		goto yystate243
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'J' || c >= 'L' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'j' || c >= 'l' && c <= 'z':
-		goto yystate49
-	}
-
-yystate243:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule62
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate244:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate245
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate245:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate246
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate246:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule91
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate247:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate248
-	case c == 'T' || c == 't':
-		goto yystate254
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate248:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate249
-	case c == 'T' || c == 't':
-		goto yystate253
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate249:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate250
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate250:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'C' || c == 'c':
-		goto yystate251
-	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
-		goto yystate49
-	}
-
-yystate251:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate252
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate252:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule63
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate253:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule64
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate254:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'R' || c == 'r':
-		goto yystate255
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate255:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate256
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate256:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate257
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate257:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'G' || c == 'g':
-		goto yystate258
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'H' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'f' || c >= 'h' && c <= 'z':
-		goto yystate49
-	}
-
-yystate258:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule92
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate259:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate260
-	case c == 'I' || c == 'i':
-		goto yystate264
-	case c == 'R' || c == 'r':
-		goto yystate267
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'H' || c >= 'J' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'h' || c >= 'j' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate260:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'B' || c == 'b':
-		goto yystate261
-	case c >= '0' && c <= '9' || c == 'A' || c >= 'C' && c <= 'Z' || c == '_' || c == 'a' || c >= 'c' && c <= 'z':
-		goto yystate49
-	}
-
-yystate261:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate262
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate262:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate263
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate263:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule65
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate264:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'M' || c == 'm':
-		goto yystate265
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'L' || c >= 'N' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'l' || c >= 'n' && c <= 'z':
-		goto yystate49
-	}
-
-yystate265:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate266
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate266:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule93
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate267:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate268
-	case c == 'U' || c == 'u':
-		goto yystate277
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'b' && c <= 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate268:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate269
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate269:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'S' || c == 's':
-		goto yystate270
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate270:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate271
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate271:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'C' || c == 'c':
-		goto yystate272
-	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
-		goto yystate49
-	}
-
-yystate272:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate273
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate273:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate274
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate274:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'O' || c == 'o':
-		goto yystate275
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'N' || c >= 'P' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'n' || c >= 'p' && c <= 'z':
-		goto yystate49
-	}
-
-yystate275:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate276
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate276:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule66
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate277:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate278
-	case c == 'N' || c == 'n':
-		goto yystate279
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate278:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule74
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate279:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'C' || c == 'c':
-		goto yystate280
-	case c >= '0' && c <= '9' || c == 'A' || c == 'B' || c >= 'D' && c <= 'Z' || c == '_' || c == 'a' || c == 'b' || c >= 'd' && c <= 'z':
-		goto yystate49
-	}
-
-yystate280:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate281
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate281:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate282
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate282:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate283
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate283:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule67
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate284:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate285
-	case c == 'N' || c == 'n':
-		goto yystate295
-	case c == 'P' || c == 'p':
-		goto yystate300
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'M' || c == 'O' || c >= 'Q' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'm' || c == 'o' || c >= 'q' && c <= 'z':
-		goto yystate49
-	}
-
-yystate285:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'N' || c == 'n':
-		goto yystate286
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'M' || c >= 'O' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'm' || c >= 'o' && c <= 'z':
-		goto yystate49
-	}
-
-yystate286:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate287
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate287:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule94
-	case c == '0' || c == '2' || c == '4' || c == '5' || c == '7' || c == '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	case c == '1':
-		goto yystate288
-	case c == '3':
-		goto yystate290
-	case c == '6':
-		goto yystate292
-	case c == '8':
-		goto yystate294
-	}
-
-yystate288:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '6':
-		goto yystate289
-	case c >= '0' && c <= '5' || c >= '7' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate289:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule95
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate290:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '0' || c == '1' || c >= '3' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	case c == '2':
-		goto yystate291
-	}
-
-yystate291:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule96
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate292:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == '4':
-		goto yystate293
-	case c >= '0' && c <= '3' || c >= '5' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate293:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule97
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate294:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule98
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate295:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'I' || c == 'i':
-		goto yystate296
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'H' || c >= 'J' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'h' || c >= 'j' && c <= 'z':
-		goto yystate49
-	}
-
-yystate296:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'Q' || c == 'q':
-		goto yystate297
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'P' || c >= 'R' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'p' || c >= 'r' && c <= 'z':
-		goto yystate49
-	}
-
-yystate297:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'U' || c == 'u':
-		goto yystate298
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate298:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate299
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate299:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule69
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate300:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'D' || c == 'd':
-		goto yystate301
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'C' || c >= 'E' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'c' || c >= 'e' && c <= 'z':
-		goto yystate49
-	}
-
-yystate301:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate302
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate302:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'T' || c == 't':
-		goto yystate303
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'S' || c >= 'U' && c <= 'Z' || c == '_' || c >= 'a' && c <= 's' || c >= 'u' && c <= 'z':
-		goto yystate49
-	}
-
-yystate303:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate304
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate304:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule68
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate305:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'A' || c == 'a':
-		goto yystate306
-	case c >= '0' && c <= '9' || c >= 'B' && c <= 'Z' || c == '_' || c >= 'b' && c <= 'z':
-		goto yystate49
-	}
-
-yystate306:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'L' || c == 'l':
-		goto yystate307
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'K' || c >= 'M' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'k' || c >= 'm' && c <= 'z':
-		goto yystate49
-	}
-
-yystate307:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'U' || c == 'u':
-		goto yystate308
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'T' || c >= 'V' && c <= 'Z' || c == '_' || c >= 'a' && c <= 't' || c >= 'v' && c <= 'z':
-		goto yystate49
-	}
-
-yystate308:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate309
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate309:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'S' || c == 's':
-		goto yystate310
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'R' || c >= 'T' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'r' || c >= 't' && c <= 'z':
-		goto yystate49
-	}
-
-yystate310:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule70
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate311:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'H' || c == 'h':
-		goto yystate312
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'G' || c >= 'I' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'g' || c >= 'i' && c <= 'z':
-		goto yystate49
-	}
-
-yystate312:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate313
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate313:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'R' || c == 'r':
-		goto yystate314
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Q' || c >= 'S' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'q' || c >= 's' && c <= 'z':
-		goto yystate49
-	}
-
-yystate314:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule99
-	case c == 'E' || c == 'e':
-		goto yystate315
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'D' || c >= 'F' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'd' || c >= 'f' && c <= 'z':
-		goto yystate49
-	}
-
-yystate315:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule71
-	case c >= '0' && c <= '9' || c >= 'A' && c <= 'Z' || c == '_' || c >= 'a' && c <= 'z':
-		goto yystate49
-	}
-
-yystate316:
-	c = l.next()
-	goto yyrule11
-
-yystate317:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule101
-	case c == '|':
-		goto yystate318
-	}
-
-yystate318:
-	c = l.next()
-	goto yyrule22
-
-	goto yystate319 // silence unused label error
-yystate319:
-	c = l.next()
-yystart319:
-	switch {
-	default:
-		goto yystate320 // c >= '\x01' && c <= '!' || c >= '#' && c <= '[' || c >= ']' && c <= 'ÿ'
-	case c == '"':
-		goto yystate321
-	case c == '\\':
-		goto yystate322
-	case c == '\x00':
-		goto yystate2
-	}
-
-yystate320:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c == '"':
-		goto yystate321
-	case c == '\\':
-		goto yystate322
-	case c >= '\x01' && c <= '!' || c >= '#' && c <= '[' || c >= ']' && c <= 'ÿ':
-		goto yystate320
-	}
-
-yystate321:
-	c = l.next()
-	goto yyrule13
-
-yystate322:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c == '"':
-		goto yystate323
-	case c == '\\':
-		goto yystate322
-	case c >= '\x01' && c <= '!' || c >= '#' && c <= '[' || c >= ']' && c <= 'ÿ':
-		goto yystate320
-	}
-
-yystate323:
-	c = l.next()
-	switch {
-	default:
-		goto yyrule13
-	case c == '"':
-		goto yystate321
-	case c == '\\':
-		goto yystate322
-	case c >= '\x01' && c <= '!' || c >= '#' && c <= '[' || c >= ']' && c <= 'ÿ':
-		goto yystate320
-	}
-
-	goto yystate324 // silence unused label error
-yystate324:
-	c = l.next()
-yystart324:
-	switch {
-	default:
-		goto yystate325 // c >= '\x01' && c <= '_' || c >= 'a' && c <= 'ÿ'
-	case c == '\x00':
-		goto yystate2
-	case c == '`':
-		goto yystate326
-	}
-
-yystate325:
-	c = l.next()
-	switch {
-	default:
-		goto yyabort
-	case c == '`':
-		goto yystate326
-	case c >= '\x01' && c <= '_' || c >= 'a' && c <= 'ÿ':
-		goto yystate325
-	}
-
-yystate326:
-	c = l.next()
-	goto yyrule14
-
-yyrule1: // \0
-	{
-		return 0
-	}
-yyrule2: // [ \t\n\r]+
-
-	goto yystate0
-yyrule3: // --.*
-
-	goto yystate0
-yyrule4: // \/\/.*
-
-	goto yystate0
-yyrule5: // \/\*([^*]|\*+[^*/])*\*+\/
-
-	goto yystate0
-yyrule6: // {imaginary_ilit}
-	{
-		return l.int(lval, true)
-	}
-yyrule7: // {imaginary_lit}
-	{
-		return l.float(lval, true)
-	}
-yyrule8: // {int_lit}
-	{
-		return l.int(lval, false)
-	}
-yyrule9: // {float_lit}
-	{
-		return l.float(lval, false)
-	}
-yyrule10: // \"
-	{
-		l.sc = S1
-		goto yystate0
-	}
-yyrule11: // `
-	{
-		l.sc = S2
-		goto yystate0
-	}
-yyrule12: // '(\\.|[^'])*'
-	{
-		if ret := l.str(lval, ""); ret != stringLit {
-			return ret
-		}
-		lval.item = idealRune(lval.item.(string)[0])
-		return intLit
-	}
-yyrule13: // (\\.|[^\"])*\"
-	{
-		return l.str(lval, "\"")
-	}
-yyrule14: // ([^`]|\n)*`
-	{
-		return l.str(lval, "`")
-	}
-yyrule15: // "&&"
-	{
-		return andand
-	}
-yyrule16: // "&^"
-	{
-		return andnot
-	}
-yyrule17: // "<<"
-	{
-		return lsh
-	}
-yyrule18: // "<="
-	{
-		return le
-	}
-yyrule19: // "=="
-	{
-		return eq
-	}
-yyrule20: // ">="
-	{
-		return ge
-	}
-yyrule21: // "!="
-	{
-		return neq
-	}
-yyrule22: // "||"
-	{
-		return oror
-	}
-yyrule23: // ">>"
-	{
-		return rsh
-	}
-yyrule24: // {add}
-	{
-		return add
-	}
-yyrule25: // {alter}
-	{
-		return alter
-	}
-yyrule26: // {and}
-	{
-		return and
-	}
-yyrule27: // {asc}
-	{
-		return asc
-	}
-yyrule28: // {as}
-	{
-		return as
-	}
-yyrule29: // {begin}
-	{
-		return begin
-	}
-yyrule30: // {between}
-	{
-		return between
-	}
-yyrule31: // {by}
-	{
-		return by
-	}
-yyrule32: // {column}
-	{
-		return column
-	}
-yyrule33: // {commit}
-	{
-		return commit
-	}
-yyrule34: // {create}
-	{
-		return create
-	}
-yyrule35: // {default}
-	{
-		return defaultKwd
-	}
-yyrule36: // {delete}
-	{
-		return deleteKwd
-	}
-yyrule37: // {desc}
-	{
-		return desc
-	}
-yyrule38: // {distinct}
-	{
-		return distinct
-	}
-yyrule39: // {drop}
-	{
-		return drop
-	}
-yyrule40: // {exists}
-	{
-		return exists
-	}
-yyrule41: // {explain}
-	{
-		return explain
-	}
-yyrule42: // {from}
-	{
-		return from
-	}
-yyrule43: // {full}
-	{
-		return full
-	}
-yyrule44: // {group}
-	{
-		return group
-	}
-yyrule45: // {if}
-	{
-		return ifKwd
-	}
-yyrule46: // {index}
-	{
-		return index
-	}
-yyrule47: // {insert}
-	{
-		return insert
-	}
-yyrule48: // {into}
-	{
-		return into
-	}
-yyrule49: // {in}
-	{
-		return in
-	}
-yyrule50: // {is}
-	{
-		return is
-	}
-yyrule51: // {join}
-	{
-		return join
-	}
-yyrule52: // {left}
-	{
-		return left
-	}
-yyrule53: // {like}
-	{
-		return like
-	}
-yyrule54: // {limit}
-	{
-		return limit
-	}
-yyrule55: // {not}
-	{
-		return not
-	}
-yyrule56: // {offset}
-	{
-		return offset
-	}
-yyrule57: // {on}
-	{
-		return on
-	}
-yyrule58: // {order}
-	{
-		return order
-	}
-yyrule59: // {or}
-	{
-		return or
-	}
-yyrule60: // {outer}
-	{
-		return outer
-	}
-yyrule61: // {right}
-	{
-		return right
-	}
-yyrule62: // {rollback}
-	{
-		return rollback
-	}
-yyrule63: // {select}
-	{
-		l.agg = append(l.agg, false)
-		return selectKwd
-	}
-yyrule64: // {set}
-	{
-		return set
-	}
-yyrule65: // {table}
-	{
-		return tableKwd
-	}
-yyrule66: // {transaction}
-	{
-		return transaction
-	}
-yyrule67: // {truncate}
-	{
-		return truncate
-	}
-yyrule68: // {update}
-	{
-		return update
-	}
-yyrule69: // {unique}
-	{
-		return unique
-	}
-yyrule70: // {values}
-	{
-		return values
-	}
-yyrule71: // {where}
-	{
-		return where
-	}
-yyrule72: // {null}
-	{
-		lval.item = nil
-		return null
-	}
-yyrule73: // {false}
-	{
-		lval.item = false
-		return falseKwd
-	}
-yyrule74: // {true}
-	{
-		lval.item = true
-		return trueKwd
-	}
-yyrule75: // {bigint}
-	{
-		lval.item = qBigInt
-		return bigIntType
-	}
-yyrule76: // {bigrat}
-	{
-		lval.item = qBigRat
-		return bigRatType
-	}
-yyrule77: // {blob}
-	{
-		lval.item = qBlob
-		return blobType
-	}
-yyrule78: // {bool}
-	{
-		lval.item = qBool
-		return boolType
-	}
-yyrule79: // {byte}
-	{
-		lval.item = qUint8
-		return byteType
-	}
-yyrule80: // {complex}128
-	{
-		lval.item = qComplex128
-		return complex128Type
-	}
-yyrule81: // {complex}64
-	{
-		lval.item = qComplex64
-		return complex64Type
-	}
-yyrule82: // {duration}
-	{
-		lval.item = qDuration
-		return durationType
-	}
-yyrule83: // {float}
-	{
-		lval.item = qFloat64
-		return floatType
-	}
-yyrule84: // {float}32
-	{
-		lval.item = qFloat32
-		return float32Type
-	}
-yyrule85: // {float}64
-	{
-		lval.item = qFloat64
-		return float64Type
-	}
-yyrule86: // {int}
-	{
-		lval.item = qInt64
-		return intType
-	}
-yyrule87: // {int}16
-	{
-		lval.item = qInt16
-		return int16Type
-	}
-yyrule88: // {int}32
-	{
-		lval.item = qInt32
-		return int32Type
-	}
-yyrule89: // {int}64
-	{
-		lval.item = qInt64
-		return int64Type
-	}
-yyrule90: // {int}8
-	{
-		lval.item = qInt8
-		return int8Type
-	}
-yyrule91: // {rune}
-	{
-		lval.item = qInt32
-		return runeType
-	}
-yyrule92: // {string}
-	{
-		lval.item = qString
-		return stringType
-	}
-yyrule93: // {time}
-	{
-		lval.item = qTime
-		return timeType
-	}
-yyrule94: // {uint}
-	{
-		lval.item = qUint64
-		return uintType
-	}
-yyrule95: // {uint}16
-	{
-		lval.item = qUint16
-		return uint16Type
-	}
-yyrule96: // {uint}32
-	{
-		lval.item = qUint32
-		return uint32Type
-	}
-yyrule97: // {uint}64
-	{
-		lval.item = qUint64
-		return uint64Type
-	}
-yyrule98: // {uint}8
-	{
-		lval.item = qUint8
-		return uint8Type
-	}
-yyrule99: // {ident}
-	{
-		lval.item = string(l.val)
-		return identifier
-	}
-yyrule100: // ($|\?){D}
-	{
-		lval.item, _ = strconv.Atoi(string(l.val[1:]))
-		return qlParam
-	}
-yyrule101: // .
-	{
-		return c0
-	}
-	panic("unreachable")
-
-	goto yyabort // silence unused label error
-
-yyabort: // no lexem recognized
-	return int(unicode.ReplacementChar)
-}
-
-func (l *lexer) npos() (line, col int) {
-	if line, col = l.nline, l.ncol; col == 0 {
-		line--
-		col = l.lcol + 1
-	}
-	return
-}
-
-func (l *lexer) str(lval *yySymType, pref string) int {
-	l.sc = 0
-	s := pref + string(l.val)
-	s, err := strconv.Unquote(s)
-	if err != nil {
-		l.err("string literal: %v", err)
-		return int(unicode.ReplacementChar)
-	}
-
-	lval.item = s
-	return stringLit
-}
-
-func (l *lexer) int(lval *yySymType, im bool) int {
-	if im {
-		l.val = l.val[:len(l.val)-1]
-	}
-	n, err := strconv.ParseUint(string(l.val), 0, 64)
-	if err != nil {
-		l.err("integer literal: %v", err)
-		return int(unicode.ReplacementChar)
-	}
-
-	if im {
-		lval.item = idealComplex(complex(0, float64(n)))
-		return imaginaryLit
-	}
-
-	switch {
-	case n < math.MaxInt64:
-		lval.item = idealInt(n)
-	default:
-		lval.item = idealUint(n)
-	}
-	return intLit
-}
-
-func (l *lexer) float(lval *yySymType, im bool) int {
-	if im {
-		l.val = l.val[:len(l.val)-1]
-	}
-	n, err := strconv.ParseFloat(string(l.val), 64)
-	if err != nil {
-		l.err("float literal: %v", err)
-		return int(unicode.ReplacementChar)
-	}
-
-	if im {
-		lval.item = idealComplex(complex(0, n))
-		return imaginaryLit
-	}
-
-	lval.item = idealFloat(n)
-	return floatLit
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/scanner.l b/Godeps/_workspace/src/github.com/cznic/ql/scanner.l
deleted file mode 100644
index 1f28714189..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/scanner.l
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
-Copyright (c) 2014 The ql Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-*/
-
-%{
-
-package ql
-
-import (
-        "fmt"
-        "math"
-        "strconv"
-        "unicode"
-)
-
-type lexer struct {
-        agg    []bool
-        c      int
-        col    int
-        errs   []error
-	expr   expression
-        i      int
-	inj    int
-        lcol   int
-        line   int
-        list   []stmt
-        ncol   int
-        nline  int
-        params int
-        sc     int
-        src    string
-        val    []byte
-	root   bool
-}
-
-func newLexer(src string) (l *lexer) {
-        l = &lexer{
-                src:    src,
-                nline:  1,
-                ncol:   0,
-        }
-        l.next()
-        return
-}
-
-func (l *lexer) next() int {
-        if l.c != 0 {
-                l.val = append(l.val, byte(l.c))
-        }
-        l.c = 0
-        if l.i < len(l.src) {
-                l.c = int(l.src[l.i])
-                l.i++
-        }
-        switch l.c {
-        case '\n':
-                l.lcol = l.ncol
-                l.nline++
-                l.ncol = 0
-        default:
-                l.ncol++
-        }
-        return l.c
-}
-
-func (l *lexer) err0(ln, c int, s string, arg ...interface{}) {
-        err := fmt.Errorf(fmt.Sprintf("%d:%d ", ln, c)+s, arg...)
-        l.errs = append(l.errs, err)
-}
-
-func (l *lexer) err(s string, arg ...interface{}) {
-        l.err0(l.line, l.col, s, arg...)
-}
-
-func (l *lexer) Error(s string) {
-        l.err(s)
-}
-
-func (l *lexer) Lex(lval *yySymType) (r int) {
-        //defer func() { dbg("Lex -> %d(%#x)", r, r) }()
-        defer func() {
-                lval.line, lval.col = l.line, l.col
-        }()
-        const (
-                INITIAL = iota
-                S1
-                S2
-        )
-
-	if n := l.inj; n != 0 {
-		l.inj = 0
-		return n
-	}
-
-        c0, c := 0, l.c
-%}
-
-int_lit         {decimal_lit}|{octal_lit}|{hex_lit}
-decimal_lit     [1-9][0-9]*
-octal_lit       0[0-7]*
-hex_lit         0[xX][0-9a-fA-F]+
-
-float_lit       {D}"."{D}?{E}?|{D}{E}|"."{D}{E}?
-D                [0-9]+
-E                [eE][-+]?[0-9]+
-
-imaginary_ilit  {D}i
-imaginary_lit   {float_lit}i
-
-a               [aA]
-b               [bB]
-c               [cC]
-d               [dD]
-e               [eE]
-f               [fF]
-g               [gG]
-h               [hH]
-i               [iI]
-j               [jJ]
-k               [kK]
-l               [lL]
-m               [mM]
-n               [nN]
-o               [oO]
-p               [pP]
-q               [qQ]
-r               [rR]
-s               [sS]
-t               [tT]
-u               [uU]
-v               [vV]
-w               [wW]
-x               [xX]
-y               [yY]
-z               [zZ]
-
-add             {a}{d}{d}
-alter           {a}{l}{t}{e}{r}
-and             {a}{n}{d}
-as              {a}{s}
-asc             {a}{s}{c}
-begin           {b}{e}{g}{i}{n}
-between         {b}{e}{t}{w}{e}{e}{n}
-by              {b}{y}
-column          {c}{o}{l}{u}{m}{n}
-commit          {c}{o}{m}{m}{i}{t}
-create          {c}{r}{e}{a}{t}{e}
-default         {d}{e}{f}{a}{u}{l}{t}
-delete          {d}{e}{l}{e}{t}{e}
-desc            {d}{e}{s}{c}
-distinct        {d}{i}{s}{t}{i}{n}{c}{t}
-drop            {d}{r}{o}{p}
-exists          {e}{x}{i}{s}{t}{s}
-explain		{e}{x}{p}{l}{a}{i}{n}
-from            {f}{r}{o}{m}
-full            {f}{u}{l}{l}
-group           {g}{r}{o}{u}{p}
-if              {i}{f}
-in              {i}{n}
-index           {i}{n}{d}{e}{x}
-insert          {i}{n}{s}{e}{r}{t}
-into            {i}{n}{t}{o}
-is              {i}{s}
-join            {j}{o}{i}{n}
-left            {l}{e}{f}{t}
-like            {l}{i}{k}{e}
-limit           {l}{i}{m}{i}{t}
-not             {n}{o}{t}
-offset          {o}{f}{f}{s}{e}{t}
-on              {o}{n}
-or              {o}{r}
-order           {o}{r}{d}{e}{r}
-outer           {o}{u}{t}{e}{r}
-right           {r}{i}{g}{h}{t}
-rollback        {r}{o}{l}{l}{b}{a}{c}{k}
-select          {s}{e}{l}{e}{c}{t}
-set             {s}{e}{t}
-table           {t}{a}{b}{l}{e}
-transaction     {t}{r}{a}{n}{s}{a}{c}{t}{i}{o}{n}
-truncate        {t}{r}{u}{n}{c}{a}{t}{e}
-unique          {u}{n}{i}{q}{u}{e}
-update          {u}{p}{d}{a}{t}{e}
-values          {v}{a}{l}{u}{e}{s}
-where           {w}{h}{e}{r}{e}
-
-null            {n}{u}{l}{l}
-false           {f}{a}{l}{s}{e}
-true            {t}{r}{u}{e}
-
-bigint          {b}{i}{g}{i}{n}{t}
-bigrat          {b}{i}{g}{r}{a}{t}
-blob            {b}{l}{o}{b}
-bool            {b}{o}{o}{l}
-byte            {b}{y}{t}{e}
-complex         {c}{o}{m}{p}{l}{e}{x}
-duration        {d}{u}{r}{a}{t}{i}{o}{n}
-float           {f}{l}{o}{a}{t}
-int             {i}{n}{t}
-rune            {r}{u}{n}{e}
-string          {s}{t}{r}{i}{n}{g}
-time            {t}{i}{m}{e}
-uint            {u}{i}{n}{t}
-
-idchar0         [a-zA-Z_]
-idchars         {idchar0}|[0-9]
-ident           {idchar0}{idchars}*
-
-%yyc c
-%yyn c = l.next()
-%yyt l.sc
-
-%x S1 S2
-
-%%
-                        l.val = l.val[:0]
-                        c0, l.line, l.col = l.c, l.nline, l.ncol
-                        
-<*>\0                   return 0
-
-[ \t\n\r]+
---.*
-\/\/.*
-\/\*([^*]|\*+[^*/])*\*+\/
-
-{imaginary_ilit}        return l.int(lval, true)
-{imaginary_lit}         return l.float(lval, true)
-{int_lit}               return l.int(lval, false)
-{float_lit}             return l.float(lval, false)
-
-\"                      l.sc = S1
-`                       l.sc = S2
-
-'(\\.|[^'])*'           if ret := l.str(lval, ""); ret != stringLit {
-                                return ret
-                        }
-                        lval.item = idealRune(lval.item.(string)[0])
-                        return intLit
-
-<S1>(\\.|[^\"])*\"      return l.str(lval, "\"")
-<S2>([^`]|\n)*`         return l.str(lval, "`")
-
-"&&"                    return andand
-"&^"                    return andnot
-"<<"                    return lsh
-"<="                    return le
-"=="                    return eq
-">="                    return ge
-"!="                    return neq
-"||"                    return oror
-">>"                    return rsh
-
-{add}                   return add
-{alter}                 return alter
-{and}                   return and
-{asc}                   return asc
-{as}                    return as
-{begin}                 return begin
-{between}               return between
-{by}                    return by
-{column}                return column
-{commit}                return commit
-{create}                return create
-{default}               return defaultKwd
-{delete}                return deleteKwd
-{desc}                  return desc
-{distinct}              return distinct
-{drop}                  return drop
-{exists}                return exists
-{explain}               return explain
-{from}                  return from
-{full}                  return full
-{group}                 return group
-{if}                    return ifKwd
-{index}                 return index
-{insert}                return insert
-{into}                  return into
-{in}                    return in
-{is}                    return is
-{join}                  return join
-{left}                  return left
-{like}                  return like
-{limit}                 return limit
-{not}                   return not
-{offset}                return offset
-{on}                    return on
-{order}                 return order
-{or}                    return or
-{outer}                 return outer
-{right}                 return right
-
-{rollback}              return rollback
-
-{select}                l.agg = append(l.agg, false)
-                        return selectKwd
-
-{set}                   return set
-{table}                 return tableKwd
-{transaction}           return transaction
-{truncate}              return truncate
-{update}                return update
-{unique}                return unique
-{values}                return values
-{where}                 return where
-
-{null}                  lval.item = nil
-                        return null
-
-{false}                 lval.item = false
-                        return falseKwd
-
-{true}                  lval.item = true
-                        return trueKwd
-
-{bigint}                lval.item = qBigInt
-                        return bigIntType
-
-{bigrat}                lval.item = qBigRat
-                        return bigRatType
-
-{blob}                  lval.item = qBlob
-                        return blobType
-
-{bool}                  lval.item = qBool
-                        return boolType
-
-{byte}                  lval.item = qUint8
-                        return byteType
-
-{complex}128            lval.item = qComplex128
-                        return complex128Type
-
-{complex}64             lval.item = qComplex64
-                        return complex64Type
-
-{duration}              lval.item = qDuration
-                        return durationType
-
-{float}                 lval.item = qFloat64
-                        return floatType
-
-{float}32               lval.item = qFloat32
-                        return float32Type
-
-{float}64               lval.item = qFloat64
-                        return float64Type
-
-{int}                   lval.item = qInt64
-                        return intType
-
-{int}16                 lval.item = qInt16
-                        return int16Type
-
-{int}32                 lval.item = qInt32
-                        return int32Type
-
-{int}64                 lval.item = qInt64
-                        return int64Type
-
-{int}8                  lval.item = qInt8
-                        return int8Type
-
-{rune}                  lval.item = qInt32
-                        return runeType
-
-{string}                lval.item = qString
-                        return stringType
-
-{time}                  lval.item = qTime
-                        return timeType
-
-{uint}                  lval.item = qUint64
-                        return uintType
-
-{uint}16                lval.item = qUint16
-                        return uint16Type
-
-{uint}32                lval.item = qUint32
-                        return uint32Type
-
-{uint}64                lval.item = qUint64
-                        return uint64Type
-
-{uint}8                 lval.item = qUint8
-                        return uint8Type
-
-{ident}                 lval.item = string(l.val)
-                        return identifier
-
-($|\?){D}               lval.item, _ = strconv.Atoi(string(l.val[1:]))
-                        return qlParam
-
-.                       return c0
-
-%%
-                        return int(unicode.ReplacementChar)
-}
-
-func (l *lexer) npos() (line, col int) {
-        if line, col = l.nline, l.ncol; col == 0 {
-                line--
-                col = l.lcol+1
-        }
-        return
-} 
-
-func (l *lexer) str(lval *yySymType, pref string) int {
-        l.sc = 0
-        s := pref + string(l.val)
-        s, err := strconv.Unquote(s)
-        if err != nil {
-                l.err("string literal: %v", err)
-                return int(unicode.ReplacementChar)
-        }
-
-        lval.item = s
-        return stringLit
-}
-
-func (l *lexer) int(lval *yySymType, im bool) int {
-        if im {
-                l.val = l.val[:len(l.val)-1]
-        }
-        n, err := strconv.ParseUint(string(l.val), 0, 64)
-        if err != nil {
-                l.err("integer literal: %v", err)
-                return int(unicode.ReplacementChar)
-        }
-
-        if im {
-                lval.item = idealComplex(complex(0, float64(n)))
-                return imaginaryLit
-        }
-
-        switch {
-        case n < math.MaxInt64:
-                lval.item = idealInt(n)
-        default:
-                lval.item = idealUint(n)
-        }
-        return intLit
-}
-
-func (l *lexer) float(lval *yySymType, im bool) int {
-        if im {
-                l.val = l.val[:len(l.val)-1]
-        }
-        n, err := strconv.ParseFloat(string(l.val), 64)
-        if err != nil {
-                l.err("float literal: %v", err)
-                return int(unicode.ReplacementChar)
-        }
-
-        if im {
-                lval.item = idealComplex(complex(0, n))
-                return imaginaryLit
-        }
-
-        lval.item = idealFloat(n)
-        return floatLit
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/stmt.go b/Godeps/_workspace/src/github.com/cznic/ql/stmt.go
deleted file mode 100644
index 8de367d4c9..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/stmt.go
+++ /dev/null
@@ -1,1268 +0,0 @@
-// Copyright (c) 2014 ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"sync"
-
-	"github.com/cznic/strutil"
-)
-
-// NOTE: all stmt implementations must be safe for concurrent use by multiple
-// goroutines.  If the exec method requires any execution domain local data,
-// they must be held out of the implementing instance.
-var (
-	_ stmt = (*alterTableAddStmt)(nil)
-	_ stmt = (*alterTableDropColumnStmt)(nil)
-	_ stmt = (*createIndexStmt)(nil)
-	_ stmt = (*createTableStmt)(nil)
-	_ stmt = (*deleteStmt)(nil) //TODO optimizer plan
-	_ stmt = (*dropIndexStmt)(nil)
-	_ stmt = (*dropTableStmt)(nil)
-	_ stmt = (*explainStmt)(nil)
-	_ stmt = (*insertIntoStmt)(nil)
-	_ stmt = (*selectStmt)(nil)
-	_ stmt = (*truncateTableStmt)(nil)
-	_ stmt = (*updateStmt)(nil) //TODO optimizer plan
-	_ stmt = beginTransactionStmt{}
-	_ stmt = commitStmt{}
-	_ stmt = rollbackStmt{}
-)
-
-var (
-	createColumn2 = mustCompile(`
-		create table if not exists __Column2 (
-			TableName string,
-			Name string,
-			NotNull bool,
-			ConstraintExpr string,
-			DefaultExpr string,
-		);
-		create index if not exists __Column2TableName on __Column2(TableName);
-	`)
-
-	insertColumn2 = mustCompile(`insert into __Column2 values($1, $2, $3, $4, $5)`)
-
-	selectColumn2 = MustCompile(`
-		select Name, NotNull, ConstraintExpr, DefaultExpr
-		from __Column2
-		where TableName == $1
-	`)
-
-	deleteColumn2 = mustCompile(`
-		delete from __Column2
-		where TableName == $1 && Name == $2
-	`)
-
-	createIndex2 = mustCompile(`
-		// Index register 2.
-		create table if not exists __Index2(
-			TableName string,
-			IndexName string,
-			IsUnique  bool,
-			IsSimple  bool,   // Just a column name or id().
-			Root      int64,  // BTree handle
-		);
-
-		// Expressions for given index. Compared in order of id(__Index2_Expr).
-		create table if not exists __Index2_Expr(
-			Index2_ID int,
-			Expr      string,
-		);
-
-		create index if not exists __xIndex2_TableName on __Index2(TableName);
-		create unique index if not exists __xIndex2_IndexName on __Index2(IndexName);
-		create index if not exists __xIndex2_ID on __Index2(id());
-		create index if not exists __xIndex2_Expr_Index2_ID on __Index2_Expr(Index2_ID);
-`)
-
-	insertIndex2     = mustCompile("insert into __Index2 values($1, $2, $3, $4, $5)")
-	insertIndex2Expr = mustCompile("insert into __Index2_Expr values($1, $2)")
-
-	deleteIndex2ByIndexName = mustCompile(`
-		delete from __Index2_Expr
-		where Index2_ID in (
-			select id() from __Index2 where IndexName == $1;
-		);	
-
-		delete from __Index2
-		where IndexName == $1;
-`)
-	deleteIndex2ByTableName = mustCompile(`
-		delete from __Index2_Expr
-		where Index2_ID in (
-			select id() from __Index2 where TableName == $1;
-		);	
-
-		delete from __Index2
-		where TableName == $1;
-`)
-)
-
-type stmt interface {
-	// never invoked for
-	// - beginTransactionStmt
-	// - commitStmt
-	// - rollbackStmt
-	exec(ctx *execCtx) (Recordset, error)
-
-	explain(ctx *execCtx, w strutil.Formatter)
-
-	// return value ignored for
-	// - beginTransactionStmt
-	// - commitStmt
-	// - rollbackStmt
-	isUpdating() bool
-	String() string
-}
-
-type execCtx struct { //LATER +shared temp
-	db  *DB
-	arg []interface{}
-}
-
-type explainStmt struct {
-	s stmt
-}
-
-func (s *explainStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	for {
-		x, ok := s.s.(*explainStmt)
-		if !ok {
-			s.s.explain(ctx, w)
-			return
-		}
-
-		s = x
-	}
-}
-
-func (s *explainStmt) String() string {
-	return "EXPLAIN " + s.s.String()
-}
-
-func (*explainStmt) isUpdating() bool { return false }
-
-func (s *explainStmt) exec(ctx *execCtx) (_ Recordset, err error) {
-	return recordset{ctx, &explainDefaultPlan{s.s}, ctx.db.cc}, nil
-}
-
-type updateStmt struct {
-	tableName string
-	list      []assignment
-	where     expression
-}
-
-func (s *updateStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *updateStmt) String() string {
-	u := fmt.Sprintf("UPDATE %s", s.tableName)
-	a := make([]string, len(s.list))
-	for i, v := range s.list {
-		a[i] = v.String()
-	}
-	w := ""
-	if s.where != nil {
-		w = fmt.Sprintf(" WHERE %s", s.where)
-	}
-	return fmt.Sprintf("%s %s%s;", u, strings.Join(a, ", "), w)
-}
-
-func (s *updateStmt) exec(ctx *execCtx) (_ Recordset, err error) {
-	t, ok := ctx.db.root.tables[s.tableName]
-	if !ok {
-		return nil, fmt.Errorf("UPDATE: table %s does not exist", s.tableName)
-	}
-
-	tcols := make([]*col, len(s.list))
-	for i, asgn := range s.list {
-		col := findCol(t.cols, asgn.colName)
-		if col == nil {
-			return nil, fmt.Errorf("UPDATE: unknown column %s", asgn.colName)
-		}
-		tcols[i] = col
-	}
-
-	m := map[interface{}]interface{}{}
-	var nh int64
-	expr := s.where
-	blobCols := t.blobCols()
-	cc := ctx.db.cc
-	var old []interface{}
-	var touched []bool
-	if t.hasIndices() {
-		old = make([]interface{}, len(t.cols0))
-		touched = make([]bool, len(t.cols0))
-	}
-	for h := t.head; h != 0; h = nh {
-		// Read can return lazily expanded chunks
-		data, err := t.store.Read(nil, h, t.cols...)
-		if err != nil {
-			return nil, err
-		}
-
-		nh = data[0].(int64)
-		for _, col := range t.cols {
-			m[col.name] = data[2+col.index]
-		}
-		id := data[1].(int64)
-		m["$id"] = id
-		if expr != nil {
-			val, err := s.where.eval(ctx, m)
-			if err != nil {
-				return nil, err
-			}
-
-			if val == nil {
-				continue
-			}
-
-			x, ok := val.(bool)
-			if !ok {
-				return nil, fmt.Errorf("invalid WHERE expression %s (value of type %T)", val, val)
-			}
-
-			if !x {
-				continue
-			}
-		}
-
-		// hit
-		for _, ix := range t.indices2 {
-			vlist, err := ix.eval(ctx, t.cols, id, data[2:])
-			if err != nil {
-				return nil, err
-			}
-
-			if err := ix.x.Delete(vlist, h); err != nil {
-				return nil, err
-			}
-		}
-		for i, asgn := range s.list {
-			val, err := asgn.expr.eval(ctx, m)
-			if err != nil {
-				return nil, err
-			}
-
-			colIndex := tcols[i].index
-			if t.hasIndices() {
-				old[colIndex] = data[2+colIndex]
-				touched[colIndex] = true
-			}
-			data[2+colIndex] = val
-		}
-		if err = typeCheck(data[2:], t.cols); err != nil {
-			return nil, err
-		}
-
-		if err = t.checkConstraintsAndDefaults(ctx, data[2:], m); err != nil {
-			return nil, err
-		}
-
-		for i, v := range t.indices {
-			if i == 0 { // id() N/A
-				continue
-			}
-
-			if v == nil || !touched[i-1] {
-				continue
-			}
-
-			if err = v.x.Delete([]interface{}{old[i-1]}, h); err != nil {
-				return nil, err
-			}
-		}
-
-		if err = t.store.UpdateRow(h, blobCols, data...); err != nil { //LATER detect which blobs are actually affected
-			return nil, err
-		}
-
-		for i, v := range t.indices {
-			if i == 0 { // id() N/A
-				continue
-			}
-
-			if v == nil || !touched[i-1] {
-				continue
-			}
-
-			if err = v.x.Create([]interface{}{data[2+i-1]}, h); err != nil {
-				return nil, err
-			}
-		}
-		for _, ix := range t.indices2 {
-			vlist, err := ix.eval(ctx, t.cols, id, data[2:])
-			if err != nil {
-				return nil, err
-			}
-
-			if err := ix.x.Create(vlist, h); err != nil {
-				return nil, err
-			}
-		}
-
-		cc.RowsAffected++
-	}
-	return
-}
-
-func (s *updateStmt) isUpdating() bool { return true }
-
-type deleteStmt struct {
-	tableName string
-	where     expression
-}
-
-func (s *deleteStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *deleteStmt) String() string {
-	switch {
-	case s.where == nil:
-		return fmt.Sprintf("DELETE FROM %s;", s.tableName)
-	default:
-		return fmt.Sprintf("DELETE FROM %s WHERE %s;", s.tableName, s.where)
-	}
-}
-
-func (s *deleteStmt) exec(ctx *execCtx) (_ Recordset, err error) {
-	t, ok := ctx.db.root.tables[s.tableName]
-	if !ok {
-		return nil, fmt.Errorf("DELETE FROM: table %s does not exist", s.tableName)
-	}
-
-	m := map[interface{}]interface{}{}
-	var ph, h, nh int64
-	var data []interface{}
-	blobCols := t.blobCols()
-	cc := ctx.db.cc
-	for h = t.head; h != 0; ph, h = h, nh {
-		for i, v := range data {
-			c, ok := v.(chunk)
-			if !ok {
-				continue
-			}
-
-			data[i] = c.b
-		}
-		// Read can return lazily expanded chunks
-		data, err = t.store.Read(nil, h, t.cols...)
-		if err != nil {
-			return nil, err
-		}
-
-		nh = data[0].(int64)
-		for _, col := range t.cols {
-			m[col.name] = data[2+col.index]
-		}
-		id := data[1].(int64)
-		m["$id"] = id
-		val, err := s.where.eval(ctx, m)
-		if err != nil {
-			return nil, err
-		}
-
-		if val == nil {
-			continue
-		}
-
-		x, ok := val.(bool)
-		if !ok {
-			return nil, fmt.Errorf("invalid WHERE expression %s (value of type %T)", val, val)
-		}
-
-		if !x {
-			continue
-		}
-
-		// hit
-		for i, v := range t.indices {
-			if v == nil {
-				continue
-			}
-
-			// overflow chunks left in place
-			if err = v.x.Delete([]interface{}{data[i+1]}, h); err != nil {
-				return nil, err
-			}
-		}
-		for _, ix := range t.indices2 {
-			vlist, err := ix.eval(ctx, t.cols, id, data[2:])
-			if err != nil {
-				return nil, err
-			}
-
-			if err := ix.x.Delete(vlist, h); err != nil {
-				return nil, err
-			}
-		}
-
-		// overflow chunks freed here
-		if err = t.store.Delete(h, blobCols...); err != nil {
-			return nil, err
-		}
-
-		cc.RowsAffected++
-		switch {
-		case ph == 0 && nh == 0: // "only"
-			fallthrough
-		case ph == 0 && nh != 0: // "first"
-			if err = t.store.Update(t.hhead, nh); err != nil {
-				return nil, err
-			}
-
-			t.head, h = nh, 0
-		case ph != 0 && nh == 0: // "last"
-			fallthrough
-		case ph != 0 && nh != 0: // "inner"
-			pdata, err := t.store.Read(nil, ph, t.cols...)
-			if err != nil {
-				return nil, err
-			}
-
-			for i, v := range pdata {
-				if x, ok := v.(chunk); ok {
-					pdata[i] = x.b
-				}
-			}
-			pdata[0] = nh
-			if err = t.store.Update(ph, pdata...); err != nil {
-				return nil, err
-			}
-
-			h = ph
-		}
-	}
-
-	return
-}
-
-func (s *deleteStmt) isUpdating() bool { return true }
-
-type truncateTableStmt struct {
-	tableName string
-}
-
-func (s *truncateTableStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *truncateTableStmt) String() string { return fmt.Sprintf("TRUNCATE TABLE %s;", s.tableName) }
-
-func (s *truncateTableStmt) exec(ctx *execCtx) (Recordset, error) {
-	t, ok := ctx.db.root.tables[s.tableName]
-	if !ok {
-		return nil, fmt.Errorf("TRUNCATE TABLE: table %s does not exist", s.tableName)
-	}
-
-	return nil, t.truncate()
-}
-
-func (s *truncateTableStmt) isUpdating() bool { return true }
-
-type dropIndexStmt struct {
-	ifExists  bool
-	indexName string
-}
-
-func (s *dropIndexStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *dropIndexStmt) String() string { return fmt.Sprintf("DROP INDEX %s;", s.indexName) }
-
-func (s *dropIndexStmt) exec(ctx *execCtx) (Recordset, error) {
-	t, x := ctx.db.root.findIndexByName(s.indexName)
-	if x == nil {
-		if s.ifExists {
-			return nil, nil
-		}
-
-		return nil, fmt.Errorf("DROP INDEX: index %s does not exist", s.indexName)
-	}
-
-	if ctx.db.hasAllIndex2() {
-		if err := ctx.db.deleteIndex2ByIndexName(s.indexName); err != nil {
-			return nil, err
-		}
-	}
-
-	switch ix := x.(type) {
-	case *indexedCol:
-		for i, v := range t.indices {
-			if v == nil || v.name != s.indexName {
-				continue
-			}
-
-			return nil, t.dropIndex(i)
-		}
-	case *index2:
-		delete(t.indices2, s.indexName)
-		return nil, ix.x.Drop()
-	}
-
-	panic("internal error 058")
-}
-
-func (s *dropIndexStmt) isUpdating() bool { return true }
-
-type dropTableStmt struct {
-	ifExists  bool
-	tableName string
-}
-
-func (s *dropTableStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *dropTableStmt) String() string { return fmt.Sprintf("DROP TABLE %s;", s.tableName) }
-
-func (s *dropTableStmt) exec(ctx *execCtx) (Recordset, error) {
-	t, ok := ctx.db.root.tables[s.tableName]
-	if !ok {
-		if s.ifExists {
-			return nil, nil
-		}
-
-		return nil, fmt.Errorf("DROP TABLE: table %s does not exist", s.tableName)
-	}
-
-	if ctx.db.hasAllIndex2() {
-		if err := ctx.db.deleteIndex2ByTableName(s.tableName); err != nil {
-			return nil, err
-		}
-	}
-
-	return nil, ctx.db.root.dropTable(t)
-}
-
-func (s *dropTableStmt) isUpdating() bool { return true }
-
-type alterTableDropColumnStmt struct {
-	tableName, colName string
-}
-
-func (s *alterTableDropColumnStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *alterTableDropColumnStmt) String() string {
-	return fmt.Sprintf("ALTER TABLE %s DROP COLUMN %s;", s.tableName, s.colName)
-}
-
-func (s *alterTableDropColumnStmt) exec(ctx *execCtx) (Recordset, error) {
-	t, ok := ctx.db.root.tables[s.tableName]
-	if !ok {
-		return nil, fmt.Errorf("ALTER TABLE: table %s does not exist", s.tableName)
-	}
-
-	cols := t.cols
-	for _, c := range cols {
-		if c.name == s.colName {
-			if len(cols) == 1 {
-				return nil, fmt.Errorf("ALTER TABLE %s DROP COLUMN: cannot drop the only column: %s", s.tableName, s.colName)
-			}
-
-			if _, ok := ctx.db.root.tables["__Column2"]; ok {
-				if _, err := deleteColumn2.l[0].exec(&execCtx{db: ctx.db, arg: []interface{}{s.tableName, c.name}}); err != nil {
-					return nil, err
-				}
-			}
-
-			c.name = ""
-			t.cols0[c.index].name = ""
-			if t.hasIndices() {
-				if len(t.indices) != 0 {
-					if v := t.indices[c.index+1]; v != nil {
-						if err := t.dropIndex(c.index + 1); err != nil {
-							return nil, err
-						}
-
-						if ctx.db.hasAllIndex2() {
-							if err := ctx.db.deleteIndex2ByIndexName(v.name); err != nil {
-								return nil, err
-							}
-						}
-					}
-				}
-
-				for nm, ix := range t.indices2 {
-					for _, e := range ix.exprList {
-						m := mentionedColumns(e)
-						if _, ok := m[s.colName]; ok {
-							if err := ctx.db.deleteIndex2ByIndexName(nm); err != nil {
-								return nil, err
-							}
-
-							if err := ix.x.Drop(); err != nil {
-								return nil, err
-							}
-
-							delete(t.indices2, nm)
-							break
-						}
-					}
-				}
-			}
-			if err := t.constraintsAndDefaults(ctx); err != nil {
-				return nil, err
-			}
-
-			return nil, t.updated()
-		}
-	}
-
-	return nil, fmt.Errorf("ALTER TABLE %s DROP COLUMN: column %s does not exist", s.tableName, s.colName)
-}
-
-func (s *alterTableDropColumnStmt) isUpdating() bool { return true }
-
-type alterTableAddStmt struct {
-	tableName string
-	c         *col
-}
-
-func (s *alterTableAddStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *alterTableAddStmt) String() string {
-	r := fmt.Sprintf("ALTER TABLE %s ADD %s %s", s.tableName, s.c.name, typeStr(s.c.typ))
-	c := s.c
-	if x := c.constraint; x != nil { //TODO add (*col).String()
-		switch e := x.expr; {
-		case e != nil:
-			r += " " + e.String()
-		default:
-			r += " NOT NULL"
-		}
-	}
-	if x := c.dflt; x != nil {
-		r += " DEFAULT " + x.String()
-	}
-	return r + ";"
-}
-
-func (s *alterTableAddStmt) exec(ctx *execCtx) (Recordset, error) {
-	t, ok := ctx.db.root.tables[s.tableName]
-	if !ok {
-		return nil, fmt.Errorf("ALTER TABLE: table %s does not exist", s.tableName)
-	}
-
-	hasRecords := t.head != 0
-	c := s.c
-	if c.constraint != nil && hasRecords {
-		return nil, fmt.Errorf("ALTER TABLE %s ADD %s: cannot add constrained column to table with existing data", s.tableName, c.name)
-	}
-
-	cols := t.cols
-	for _, c := range cols {
-		nm := c.name
-		if nm == s.c.name {
-			return nil, fmt.Errorf("ALTER TABLE %s ADD: column %s exists", s.tableName, nm)
-		}
-	}
-
-	if len(t.indices) != 0 {
-		t.indices = append(t.indices, nil)
-		t.xroots = append(t.xroots, 0)
-		if err := t.store.Update(t.hxroots, t.xroots...); err != nil {
-			return nil, err
-		}
-	}
-
-	if c.constraint != nil || c.dflt != nil {
-		for _, s := range createColumn2.l {
-			_, err := s.exec(&execCtx{db: ctx.db})
-			if err != nil {
-				return nil, err
-			}
-		}
-		notNull := c.constraint != nil && c.constraint.expr == nil
-		var co, d string
-		if c.constraint != nil && c.constraint.expr != nil {
-			co = c.constraint.expr.String()
-		}
-		if e := c.dflt; e != nil {
-			d = e.String()
-		}
-		if _, err := insertColumn2.l[0].exec(&execCtx{db: ctx.db, arg: []interface{}{s.tableName, c.name, notNull, co, d}}); err != nil {
-			return nil, err
-		}
-	}
-
-	t.cols0 = append(t.cols0, s.c)
-	if err := t.constraintsAndDefaults(ctx); err != nil {
-		return nil, err
-	}
-
-	return nil, t.updated()
-}
-
-func (s *alterTableAddStmt) isUpdating() bool { return true }
-
-type selectStmt struct {
-	distinct      bool
-	flds          []*fld
-	from          *joinRset
-	group         *groupByRset
-	hasAggregates bool
-	limit         *limitRset
-	mu            sync.Mutex
-	offset        *offsetRset
-	order         *orderByRset
-	where         *whereRset
-}
-
-func (s *selectStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	p, err := s.plan(ctx)
-	if err != nil {
-		w.Format("ERROR: %v\n", err)
-		return
-	}
-
-	p.explain(w)
-}
-
-func (s *selectStmt) String() string {
-	var b bytes.Buffer
-	b.WriteString("SELECT")
-	if s.distinct {
-		b.WriteString(" DISTINCT")
-	}
-	switch {
-	case len(s.flds) == 0:
-		b.WriteString(" *")
-	default:
-		a := make([]string, len(s.flds))
-		for i, v := range s.flds {
-			s := v.expr.String()
-			if v.name != "" && v.name != s {
-				s += " AS " + v.name
-			}
-			a[i] = s
-		}
-		b.WriteString(" " + strings.Join(a, ", "))
-	}
-	b.WriteString(" FROM ")
-	b.WriteString(s.from.String())
-	if s.where != nil {
-		b.WriteString(" WHERE ")
-		b.WriteString(s.where.expr.String())
-	}
-	if s.group != nil {
-		b.WriteString(" GROUP BY ")
-		b.WriteString(strings.Join(s.group.colNames, ", "))
-	}
-	if s.order != nil {
-		b.WriteString(" ORDER BY ")
-		b.WriteString(s.order.String())
-	}
-	if s.limit != nil {
-		b.WriteString(" LIMIT ")
-		b.WriteString(s.limit.expr.String())
-	}
-	if s.offset != nil {
-		b.WriteString(" OFFSET ")
-		b.WriteString(s.offset.expr.String())
-	}
-	b.WriteRune(';')
-	return b.String()
-}
-
-func (s *selectStmt) plan(ctx *execCtx) (plan, error) { //LATER overlapping goroutines/pipelines
-	r, err := s.from.plan(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	if w := s.where; w != nil {
-		if r, err = (&whereRset{expr: w.expr, src: r}).plan(ctx); err != nil {
-			return nil, err
-		}
-	}
-	switch {
-	case !s.hasAggregates && s.group == nil: // nop
-	case !s.hasAggregates && s.group != nil:
-		if r, err = (&groupByRset{colNames: s.group.colNames, src: r}).plan(ctx); err != nil {
-			return nil, err
-		}
-	case s.hasAggregates && s.group == nil:
-		if r, err = (&groupByRset{src: r}).plan(ctx); err != nil {
-			return nil, err
-		}
-	case s.hasAggregates && s.group != nil:
-		if r, err = (&groupByRset{colNames: s.group.colNames, src: r}).plan(ctx); err != nil {
-			return nil, err
-		}
-	}
-	if r, err = (&selectRset{flds: s.flds, src: r}).plan(ctx); err != nil {
-		return nil, err
-	}
-
-	if s.distinct {
-		if r, err = (&distinctRset{src: r}).plan(ctx); err != nil {
-			return nil, err
-		}
-	}
-	if s := s.order; s != nil {
-		if r, err = (&orderByRset{asc: s.asc, by: s.by, src: r}).plan(ctx); err != nil {
-			return nil, err
-		}
-	}
-	if s := s.offset; s != nil {
-		if r, err = (&offsetRset{s.expr, r}).plan(ctx); err != nil {
-			return nil, err
-		}
-	}
-	if s := s.limit; s != nil {
-		if r, err = (&limitRset{s.expr, r}).plan(ctx); err != nil {
-			return nil, err
-		}
-	}
-	return r, nil
-}
-
-func (s *selectStmt) exec(ctx *execCtx) (rs Recordset, err error) {
-	r, err := s.plan(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	return recordset{ctx, r, nil}, nil
-}
-
-func (s *selectStmt) isUpdating() bool { return false }
-
-type insertIntoStmt struct {
-	colNames  []string
-	lists     [][]expression
-	sel       *selectStmt
-	tableName string
-}
-
-func (s *insertIntoStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *insertIntoStmt) String() string {
-	cn := ""
-	if len(s.colNames) != 0 {
-		cn = fmt.Sprintf(" (%s)", strings.Join(s.colNames, ", "))
-	}
-	switch {
-	case s.sel != nil:
-		return fmt.Sprintf("INSERT INTO %s%s %s;", s.tableName, cn, s.sel)
-	default:
-		a := make([]string, len(s.lists))
-		for i, v := range s.lists {
-			b := make([]string, len(v))
-			for i, v := range v {
-				b[i] = v.String()
-			}
-			a[i] = fmt.Sprintf("(%s)", strings.Join(b, ", "))
-		}
-		return fmt.Sprintf("INSERT INTO %s%s VALUES %s;", s.tableName, cn, strings.Join(a, ", "))
-	}
-}
-
-func (s *insertIntoStmt) execSelect(t *table, cols []*col, ctx *execCtx) (_ Recordset, err error) {
-	//TODO missing rs column number eq check
-	r, err := s.sel.plan(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	h := t.head
-	data0 := make([]interface{}, len(t.cols0)+2)
-	cc := ctx.db.cc
-	m := map[interface{}]interface{}{}
-	if err = r.do(ctx, func(_ interface{}, data []interface{}) (more bool, err error) {
-		for i, d := range data {
-			data0[cols[i].index+2] = d
-		}
-		if err = typeCheck(data0[2:], cols); err != nil {
-			return
-		}
-
-		if err = t.checkConstraintsAndDefaults(ctx, data0[2:], m); err != nil {
-			return false, err
-		}
-
-		id, err := t.store.ID()
-		if err != nil {
-			return false, err
-		}
-
-		data0[0] = h
-		data0[1] = id
-
-		// Any overflow chunks are written here.
-		if h, err = t.store.Create(data0...); err != nil {
-			return false, err
-		}
-
-		for i, v := range t.indices {
-			if v == nil {
-				continue
-			}
-
-			// Any overflow chunks are shared with the BTree key
-			if err = v.x.Create([]interface{}{data0[i+1]}, h); err != nil {
-				return false, err
-			}
-		}
-		for _, ix := range t.indices2 {
-			vlist, err := ix.eval(ctx, t.cols, id, data0[2:])
-			if err != nil {
-				return false, err
-			}
-
-			if err := ix.x.Create(vlist, h); err != nil {
-				return false, err
-			}
-		}
-
-		cc.RowsAffected++
-		ctx.db.root.lastInsertID = id
-		return true, nil
-	}); err != nil {
-		return nil, err
-	}
-
-	t.head = h
-	return nil, t.store.Update(t.hhead, h)
-}
-
-func (s *insertIntoStmt) exec(ctx *execCtx) (_ Recordset, err error) {
-	root := ctx.db.root
-	t, ok := root.tables[s.tableName]
-	if !ok {
-		return nil, fmt.Errorf("INSERT INTO %s: table does not exist", s.tableName)
-	}
-
-	var cols []*col
-	switch len(s.colNames) {
-	case 0:
-		cols = t.cols
-	default:
-		for _, colName := range s.colNames {
-			if col := findCol(t.cols, colName); col != nil {
-				cols = append(cols, col)
-				continue
-			}
-
-			return nil, fmt.Errorf("INSERT INTO %s: unknown column %s", s.tableName, colName)
-		}
-	}
-
-	if s.sel != nil {
-		return s.execSelect(t, cols, ctx)
-	}
-
-	for _, list := range s.lists {
-		if g, e := len(list), len(cols); g != e {
-			return nil, fmt.Errorf("INSERT INTO %s: expected %d value(s), have %d", s.tableName, e, g)
-		}
-	}
-
-	cc := ctx.db.cc
-	r := make([]interface{}, len(t.cols0))
-	m := map[interface{}]interface{}{}
-	for _, list := range s.lists {
-		for i, expr := range list {
-			val, err := expr.eval(ctx, m)
-			if err != nil {
-				return nil, err
-			}
-
-			r[cols[i].index] = val
-		}
-		if err = typeCheck(r, cols); err != nil {
-			return nil, err
-		}
-
-		if err = t.checkConstraintsAndDefaults(ctx, r, m); err != nil {
-			return nil, err
-		}
-
-		id, err := t.addRecord(ctx, r)
-		if err != nil {
-			return nil, err
-		}
-
-		cc.RowsAffected++
-		root.lastInsertID = id
-	}
-	return nil, nil
-}
-
-func (s *insertIntoStmt) isUpdating() bool { return true }
-
-type beginTransactionStmt struct{}
-
-func (s beginTransactionStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (beginTransactionStmt) String() string { return "BEGIN TRANSACTION;" }
-func (beginTransactionStmt) exec(*execCtx) (Recordset, error) {
-	panic("internal error 059")
-}
-func (beginTransactionStmt) isUpdating() bool {
-	panic("internal error 060")
-}
-
-type commitStmt struct{}
-
-func (s commitStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (commitStmt) String() string { return "COMMIT;" }
-func (commitStmt) exec(*execCtx) (Recordset, error) {
-	panic("internal error 061")
-}
-func (commitStmt) isUpdating() bool {
-	panic("internal error 062")
-}
-
-type rollbackStmt struct{}
-
-func (s rollbackStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (rollbackStmt) String() string { return "ROLLBACK;" }
-func (rollbackStmt) exec(*execCtx) (Recordset, error) {
-	panic("internal error 063")
-}
-func (rollbackStmt) isUpdating() bool {
-	panic("internal error 064")
-}
-
-type createIndexStmt struct {
-	colName     string // alt. "id()" for simple index on id()
-	ifNotExists bool
-	indexName   string
-	tableName   string
-	unique      bool
-	exprList    []expression
-}
-
-func (s *createIndexStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *createIndexStmt) isSimpleIndex() bool { return s.colName != "" }
-
-func (s *createIndexStmt) String() string {
-	u := ""
-	if s.unique {
-		u = "UNIQUE "
-	}
-	e := ""
-	if s.ifNotExists {
-		e = "IF NOT EXISTS "
-	}
-	expr := s.colName
-	if !s.isSimpleIndex() {
-		var a []string
-		for _, v := range s.exprList {
-			a = append(a, v.String())
-		}
-		expr = strings.Join(a, ", ")
-	}
-	return fmt.Sprintf("CREATE %sINDEX %s%s ON %s (%s);", u, e, s.indexName, s.tableName, expr)
-}
-
-func (s *createIndexStmt) exec(ctx *execCtx) (Recordset, error) {
-	root := ctx.db.root
-	if t, i := root.findIndexByName(s.indexName); i != nil {
-		if s.ifNotExists {
-			return nil, nil
-		}
-
-		return nil, fmt.Errorf("CREATE INDEX: table %s already has an index named %s", t.name, s.indexName)
-	}
-
-	if root.tables[s.indexName] != nil {
-		return nil, fmt.Errorf("CREATE INDEX: index name collision with existing table: %s", s.indexName)
-	}
-
-	t, ok := root.tables[s.tableName]
-	if !ok {
-		return nil, fmt.Errorf("CREATE INDEX: table does not exist %s", s.tableName)
-	}
-
-	if findCol(t.cols, s.indexName) != nil {
-		return nil, fmt.Errorf("CREATE INDEX: index name collision with existing column: %s", s.indexName)
-	}
-
-	var h int64
-	var err error
-	switch {
-	case s.isSimpleIndex():
-		colIndex := -1
-		if s.colName != "id()" {
-			c := findCol(t.cols, s.colName)
-			if c == nil {
-				return nil, fmt.Errorf("CREATE INDEX: column does not exist: %s", s.colName)
-			}
-
-			colIndex = c.index
-		}
-
-		if h, err = t.addIndex(s.unique, s.indexName, colIndex); err != nil {
-			return nil, fmt.Errorf("CREATE INDEX: %v", err)
-		}
-
-		if err = t.updated(); err != nil {
-			return nil, err
-		}
-	default:
-		for _, e := range s.exprList {
-			m := mentionedColumns(e)
-			for colName := range m {
-				c := findCol(t.cols, colName)
-				if c == nil {
-					return nil, fmt.Errorf("CREATE INDEX: column does not exist: %s", colName)
-				}
-			}
-		}
-		if h, err = t.addIndex2(ctx, s.unique, s.indexName, s.exprList); err != nil {
-			return nil, fmt.Errorf("CREATE INDEX: %v", err)
-		}
-	}
-
-	switch ctx.db.hasIndex2 {
-	case 0:
-		if err := ctx.db.createIndex2(); err != nil {
-			return nil, err
-		}
-
-		if s.isSimpleIndex() {
-			return nil, nil
-		}
-	case 1:
-		return nil, nil
-	case 2:
-		if s.isSimpleIndex() {
-			return nil, ctx.db.insertIndex2(s.tableName, s.indexName, []string{s.colName}, s.unique, true, h)
-		}
-	default:
-		panic("internal error 011")
-	}
-
-	exprList := make([]string, 0, len(s.exprList))
-	for _, e := range s.exprList {
-		exprList = append(exprList, e.String())
-	}
-	return nil, ctx.db.insertIndex2(s.tableName, s.indexName, exprList, s.unique, false, h)
-}
-
-func (s *createIndexStmt) isUpdating() bool { return true }
-
-type createTableStmt struct {
-	ifNotExists bool
-	tableName   string
-	cols        []*col
-}
-
-func (s *createTableStmt) explain(ctx *execCtx, w strutil.Formatter) {
-	w.Format("%s\n", s)
-}
-
-func (s *createTableStmt) String() string {
-	a := make([]string, len(s.cols))
-	for i, v := range s.cols {
-		var c, d string
-		if x := v.constraint; x != nil {
-			switch e := x.expr; {
-			case e != nil:
-				c = " " + e.String()
-			default:
-				c = " NOT NULL"
-			}
-		}
-		if x := v.dflt; x != nil {
-			d = " DEFAULT " + x.String()
-		}
-		a[i] = fmt.Sprintf("%s %s%s%s", v.name, typeStr(v.typ), c, d)
-	}
-	e := ""
-	if s.ifNotExists {
-		e = "IF NOT EXISTS "
-	}
-	return fmt.Sprintf("CREATE TABLE %s%s (%s);", e, s.tableName, strings.Join(a, ", "))
-}
-
-func (s *createTableStmt) exec(ctx *execCtx) (_ Recordset, err error) {
-	var cols []*col
-	for _, v := range s.cols {
-		cols = append(cols, v.clone())
-	}
-	root := ctx.db.root
-	if _, ok := root.tables[s.tableName]; ok {
-		if s.ifNotExists {
-			return nil, nil
-		}
-
-		return nil, fmt.Errorf("CREATE TABLE: table exists %s", s.tableName)
-	}
-
-	if t, x := root.findIndexByName(s.tableName); x != nil {
-		return nil, fmt.Errorf("CREATE TABLE: table %s has index %s", t.name, s.tableName)
-	}
-
-	m := map[string]bool{}
-	mustCreateColumn2 := true
-	for i, c := range cols {
-		nm := c.name
-		if m[nm] {
-			return nil, fmt.Errorf("CREATE TABLE: duplicate column %s", nm)
-		}
-
-		m[nm] = true
-		c.index = i
-		if c.constraint != nil || c.dflt != nil {
-			if mustCreateColumn2 {
-				for _, stmt := range createColumn2.l {
-					_, err := stmt.exec(&execCtx{db: ctx.db})
-					if err != nil {
-						return nil, err
-					}
-				}
-			}
-
-			mustCreateColumn2 = false
-			notNull := c.constraint != nil && c.constraint.expr == nil
-			var co, d string
-			if c.constraint != nil && c.constraint.expr != nil {
-				co = c.constraint.expr.String()
-			}
-			if e := c.dflt; e != nil {
-				d = e.String()
-			}
-			if _, err := insertColumn2.l[0].exec(&execCtx{db: ctx.db, arg: []interface{}{s.tableName, c.name, notNull, co, d}}); err != nil {
-				return nil, err
-			}
-		}
-	}
-	t, err := root.createTable(s.tableName, cols)
-	if err != nil {
-		return nil, err
-	}
-
-	return nil, t.constraintsAndDefaults(ctx)
-}
-
-func (s *createTableStmt) isUpdating() bool { return true }
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/storage.go b/Godeps/_workspace/src/github.com/cznic/ql/storage.go
deleted file mode 100644
index fa7a4bf0c6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/storage.go
+++ /dev/null
@@ -1,991 +0,0 @@
-// Copyright (c) 2014 ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ql
-
-import (
-	"fmt"
-	"strings"
-)
-
-type storage interface {
-	Acid() bool
-	BeginTransaction() error
-	Close() error
-	Commit() error
-	Create(data ...interface{}) (h int64, err error)
-	CreateIndex(unique bool) (handle int64, x btreeIndex, err error)
-	CreateTemp(asc bool) (bt temp, err error)
-	Delete(h int64, blobCols ...*col) error //LATER split the nil blobCols case
-	ID() (id int64, err error)
-	Name() string
-	OpenIndex(unique bool, handle int64) (btreeIndex, error) // Never called on the memory backend.
-	Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error)
-	ResetID() (err error)
-	Rollback() error
-	Update(h int64, data ...interface{}) error
-	UpdateRow(h int64, blobCols []*col, data ...interface{}) error
-	Verify() (allocs int64, err error)
-}
-
-type btreeIterator interface {
-	Next() (k, v []interface{}, err error)
-}
-
-type temp interface {
-	BeginTransaction() error
-	Create(data ...interface{}) (h int64, err error)
-	Drop() (err error)
-	Get(k []interface{}) (v []interface{}, err error)
-	Read(dst []interface{}, h int64, cols ...*col) (data []interface{}, err error)
-	SeekFirst() (e btreeIterator, err error)
-	Set(k, v []interface{}) (err error)
-}
-
-type indexIterator interface {
-	Next() (k []interface{}, h int64, err error)
-	Prev() (k []interface{}, h int64, err error)
-}
-
-type btreeIndex interface {
-	Clear() error                                                               // supports truncate table statement
-	Create(indexedValues []interface{}, h int64) error                          // supports insert into statement
-	Delete(indexedValues []interface{}, h int64) error                          // supports delete from statement
-	Drop() error                                                                // supports drop table, drop index statements
-	Seek(indexedValues []interface{}) (iter indexIterator, hit bool, err error) // supports where clause
-	SeekFirst() (iter indexIterator, err error)                                 // supports aggregate min / ascending order by
-	SeekLast() (iter indexIterator, err error)                                  // supports aggregate max / descending order by
-}
-
-type indexedCol struct { // Column name or id() index.
-	name   string
-	unique bool
-	x      btreeIndex
-	xroot  int64
-}
-
-type index2 struct { // Expression list index.
-	unique   bool
-	x        btreeIndex
-	xroot    int64
-	sources  []string
-	exprList []expression
-}
-
-func (x *index2) eval(ctx *execCtx, cols []*col, id int64, r []interface{}) ([]interface{}, error) {
-	f, isFile := ctx.db.store.(*file)
-	vlist := make([]interface{}, len(x.exprList))
-	m := map[interface{}]interface{}{"$id": id}
-	for _, col := range cols {
-		ci := col.index
-		v := interface{}(nil)
-		if ci < len(r) {
-			v = r[ci]
-		}
-		if b, ok := v.([]byte); ok && isFile {
-			var err error
-			if v, err = expand1(chunk{f: f, b: b}, nil); err != nil {
-				return nil, err
-			}
-		}
-		m[col.name] = v
-	}
-	for i, e := range x.exprList {
-		v, err := e.eval(ctx, m)
-		if err != nil {
-			return nil, err
-		}
-
-		if ok, typ := isBlobType(v); ok {
-			return nil, fmt.Errorf("value of a complex index cannot be of blob-like type: %v", typ)
-		}
-
-		vlist[i] = v
-	}
-	return vlist, nil
-}
-
-type indexKey struct {
-	value []interface{}
-	h     int64
-}
-
-// storage fields
-// 0: next  int64
-// 1: scols string
-// 2: hhead int64
-// 3: name  string
-// 4: indices string - optional
-// 5: hxroots int64 - optional
-type table struct {
-	cols        []*col // logical
-	cols0       []*col // physical
-	h           int64  //
-	head        int64  // head of the single linked record list
-	hhead       int64  // handle of the head of the single linked record list
-	hxroots     int64
-	indices     []*indexedCol
-	indices2    map[string]*index2
-	name        string
-	next        int64 // single linked table list
-	store       storage
-	tnext       *table
-	tprev       *table
-	xroots      []interface{}
-	constraints []*constraint
-	defaults    []expression
-}
-
-func (t *table) hasIndices() bool  { return len(t.indices) != 0 || len(t.indices2) != 0 }
-func (t *table) hasIndices2() bool { return len(t.indices2) != 0 }
-
-func (t *table) constraintsAndDefaults(ctx *execCtx) error {
-	if isSystemName[t.name] {
-		return nil
-	}
-
-	_, ok := ctx.db.root.tables["__Column2"]
-	if !ok {
-		return nil
-	}
-
-	cols := t.cols
-	constraints := make([]*constraint, len(cols))
-	defaults := make([]expression, len(cols))
-	arg := []interface{}{t.name}
-	rs, err := selectColumn2.l[0].exec(&execCtx{db: ctx.db, arg: arg})
-	if err != nil {
-		return err
-	}
-
-	var rows [][]interface{}
-	ok = false
-	if err := rs.(recordset).do(
-		&execCtx{db: ctx.db, arg: arg},
-		func(id interface{}, data []interface{}) (more bool, err error) {
-			rows = append(rows, data)
-			return true, nil
-		},
-	); err != nil {
-		return err
-	}
-
-	for _, row := range rows {
-		nm := row[0].(string)
-		nonNull := row[1].(bool)
-		cexpr := row[2].(string)
-		dexpr := row[3].(string)
-		for i, c := range cols {
-			if c.name == nm {
-				var co *constraint
-				if nonNull || cexpr != "" {
-					co = &constraint{}
-					constraints[i] = co
-					if cexpr != "" {
-						if co.expr, err = ctx.db.str2expr(cexpr); err != nil {
-							return fmt.Errorf("constraint %q: %v", cexpr, err)
-						}
-					}
-
-					t.constraints = constraints
-				}
-				if dexpr != "" {
-					if defaults[i], err = ctx.db.str2expr(dexpr); err != nil {
-						return fmt.Errorf("constraint %q: %v", dexpr, err)
-					}
-
-					t.defaults = defaults
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func (t *table) checkConstraintsAndDefaults(ctx *execCtx, row []interface{}, m map[interface{}]interface{}) error {
-	cols := t.cols
-
-	if len(t.defaults) != 0 {
-		// 1.
-		for _, c := range cols {
-			m[c.name] = row[c.index]
-		}
-
-		// 2.
-		for i, c := range cols {
-			val := row[c.index]
-			expr := t.defaults[i]
-			if val != nil || expr == nil {
-				continue
-			}
-
-			dval, err := expr.eval(ctx, m)
-			if err != nil {
-				return err
-			}
-
-			row[c.index] = dval
-			if err = typeCheck(row, []*col{c}); err != nil {
-				return err
-			}
-		}
-	}
-
-	if len(t.constraints) != 0 {
-		// 3.
-		for _, c := range cols {
-			m[c.name] = row[c.index]
-		}
-
-		// 4.
-		for i, c := range cols {
-			constraint := t.constraints[i]
-			if constraint == nil {
-				continue
-			}
-
-			val := row[c.index]
-			expr := constraint.expr
-			if expr == nil { // Constraint: NOT NULL
-				if val == nil {
-					return fmt.Errorf("column %s: constraint violation: NOT NULL", c.name)
-				}
-
-				continue
-			}
-
-			// Constraint is an expression
-			cval, err := expr.eval(ctx, m)
-			if err != nil {
-				return err
-			}
-
-			if cval == nil {
-				return fmt.Errorf("column %s: constraint violation: %s", c.name, expr)
-			}
-
-			bval, ok := cval.(bool)
-			if !ok {
-				return fmt.Errorf("column %s: non bool constraint expression: %s", c.name, expr)
-			}
-
-			if !bval {
-				return fmt.Errorf("column %s: constraint violation: %s", c.name, expr)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (t *table) clone() *table {
-	r := &table{}
-	*r = *t
-	r.constraints = append([]*constraint(nil), t.constraints...)
-	r.defaults = append([]expression(nil), t.defaults...)
-	r.indices2 = nil
-	if n := len(t.indices2); n != 0 {
-		r.indices2 = make(map[string]*index2, n)
-		for k, v := range t.indices2 {
-			r.indices2[k] = v
-		}
-	}
-	r.cols = make([]*col, len(t.cols))
-	for i, v := range t.cols {
-		c := &col{}
-		*c = *v
-		r.cols[i] = c
-	}
-	r.cols0 = make([]*col, len(t.cols0))
-	for i, v := range t.cols0 {
-		c := &col{}
-		*c = *v
-		r.cols0[i] = c
-	}
-	r.indices = make([]*indexedCol, len(t.indices))
-	for i, v := range t.indices {
-		if v != nil {
-			c := &indexedCol{}
-			*c = *v
-			r.indices[i] = c
-		}
-	}
-	r.xroots = make([]interface{}, len(t.xroots))
-	copy(r.xroots, t.xroots)
-	r.tnext, r.tprev = nil, nil
-	return r
-}
-
-func (t *table) findIndexByColName(name string) (*col, *indexedCol) {
-	for i, v := range t.indices {
-		if v == nil {
-			continue
-		}
-
-		if i == 0 {
-			if name == "id()" {
-				return idCol, v
-			}
-
-			continue
-		}
-
-		if c := t.cols[i-1]; c.name == name {
-			return c, v
-		}
-	}
-
-	return nil, nil
-}
-
-func (t *table) findIndexByName(name string) interface{} {
-	for _, v := range t.indices {
-		if v != nil && v.name == name {
-			return v
-		}
-	}
-	for k, v := range t.indices2 {
-		if k == name {
-			return v
-		}
-	}
-	return nil
-}
-
-func (t *table) load() (err error) {
-	data, err := t.store.Read(nil, t.h)
-	if err != nil {
-		return
-	}
-
-	var hasIndices bool
-	switch n := len(data); n {
-	case 4:
-	case 6:
-		hasIndices = true
-	default:
-		return fmt.Errorf("corrupted DB: table data len %d", n)
-	}
-
-	var ok bool
-	if t.next, ok = data[0].(int64); !ok {
-		return fmt.Errorf("corrupted DB: table data[0] of type %T", data[0])
-	}
-
-	scols, ok := data[1].(string)
-	if !ok {
-		return fmt.Errorf("corrupted DB: table data[1] of type %T", data[1])
-	}
-
-	if t.hhead, ok = data[2].(int64); !ok {
-		return fmt.Errorf("corrupted DB: table data[2] of type %T", data[2])
-	}
-
-	if t.name, ok = data[3].(string); !ok {
-		return fmt.Errorf("corrupted DB: table data[3] of type %T", data[3])
-	}
-
-	var head []interface{}
-	if head, err = t.store.Read(nil, t.hhead); err != nil {
-		return err
-	}
-
-	if len(head) != 1 {
-		return fmt.Errorf("corrupted DB: table head data len %d", len(head))
-	}
-
-	if t.head, ok = head[0].(int64); !ok {
-		return fmt.Errorf("corrupted DB: table head data[0] of type %T", head[0])
-	}
-
-	a := strings.Split(scols, "|")
-	t.cols0 = make([]*col, len(a))
-	for i, v := range a {
-		if len(v) < 1 {
-			return fmt.Errorf("corrupted DB: field info %q", v)
-		}
-
-		col := &col{name: v[1:], typ: int(v[0]), index: i}
-		t.cols0[i] = col
-		if col.name != "" {
-			t.cols = append(t.cols, col)
-		}
-	}
-
-	if !hasIndices {
-		return
-	}
-
-	if t.hxroots, ok = data[5].(int64); !ok {
-		return fmt.Errorf("corrupted DB: table data[5] of type %T", data[5])
-	}
-
-	xroots, err := t.store.Read(nil, t.hxroots)
-	if err != nil {
-		return err
-	}
-
-	if g, e := len(xroots), len(t.cols0)+1; g != e {
-		return fmt.Errorf("corrupted DB: got %d index roots, expected %d", g, e)
-	}
-
-	indices, ok := data[4].(string)
-	if !ok {
-		return fmt.Errorf("corrupted DB: table data[4] of type %T", data[4])
-	}
-
-	a = strings.Split(indices, "|")
-	if g, e := len(a), len(t.cols0)+1; g != e {
-		return fmt.Errorf("corrupted DB: got %d index definitions, expected %d", g, e)
-	}
-
-	t.indices = make([]*indexedCol, len(a))
-	for i, v := range a {
-		if v == "" {
-			continue
-		}
-
-		if len(v) < 2 {
-			return fmt.Errorf("corrupted DB: invalid index definition %q", v)
-		}
-
-		nm := v[1:]
-		h, ok := xroots[i].(int64)
-		if !ok {
-			return fmt.Errorf("corrupted DB: table index root of type %T", xroots[i])
-		}
-
-		if h == 0 {
-			return fmt.Errorf("corrupted DB: missing root for index %s", nm)
-		}
-
-		unique := v[0] == 'u'
-		x, err := t.store.OpenIndex(unique, h)
-		if err != nil {
-			return err
-		}
-
-		t.indices[i] = &indexedCol{nm, unique, x, h}
-	}
-	t.xroots = xroots
-
-	return
-}
-
-func newTable(store storage, name string, next int64, cols []*col, tprev, tnext *table) (t *table, err error) {
-	hhead, err := store.Create(int64(0))
-	if err != nil {
-		return
-	}
-
-	scols := cols2meta(cols)
-	h, err := store.Create(next, scols, hhead, name)
-	if err != nil {
-		return
-	}
-
-	t = &table{
-		cols0: cols,
-		h:     h,
-		hhead: hhead,
-		name:  name,
-		next:  next,
-		store: store,
-		tnext: tnext,
-		tprev: tprev,
-	}
-	return t.updateCols(), nil
-}
-
-func (t *table) blobCols() (r []*col) {
-	for _, c := range t.cols0 {
-		switch c.typ {
-		case qBlob, qBigInt, qBigRat, qTime, qDuration:
-			r = append(r, c)
-		}
-	}
-	return
-}
-
-func (t *table) truncate() (err error) {
-	h := t.head
-	var rec []interface{}
-	blobCols := t.blobCols()
-	for h != 0 {
-		rec, err := t.store.Read(rec, h)
-		if err != nil {
-			return err
-		}
-		nh := rec[0].(int64)
-
-		if err = t.store.Delete(h, blobCols...); err != nil { //LATER remove double read for len(blobCols) != 0
-			return err
-		}
-
-		h = nh
-	}
-	if err = t.store.Update(t.hhead, 0); err != nil {
-		return
-	}
-
-	for _, v := range t.indices {
-		if v == nil {
-			continue
-		}
-
-		if err := v.x.Clear(); err != nil {
-			return err
-		}
-	}
-	for _, ix := range t.indices2 {
-		if err := ix.x.Clear(); err != nil {
-			return err
-		}
-	}
-	t.head = 0
-	return t.updated()
-}
-
-func (t *table) addIndex0(unique bool, indexName string, colIndex int) (int64, btreeIndex, error) {
-	switch len(t.indices) {
-	case 0:
-		indices := make([]*indexedCol, len(t.cols0)+1)
-		h, x, err := t.store.CreateIndex(unique)
-		if err != nil {
-			return -1, nil, err
-		}
-
-		indices[colIndex+1] = &indexedCol{indexName, unique, x, h}
-		xroots := make([]interface{}, len(indices))
-		xroots[colIndex+1] = h
-		hx, err := t.store.Create(xroots...)
-		if err != nil {
-			return -1, nil, err
-		}
-
-		t.hxroots, t.xroots, t.indices = hx, xroots, indices
-		return h, x, t.updated()
-	default:
-		ex := t.indices[colIndex+1]
-		if ex != nil && ex.name != "" {
-			colName := "id()"
-			if colIndex >= 0 {
-				colName = t.cols0[colIndex].name
-			}
-			return -1, nil, fmt.Errorf("column %s already has an index: %s", colName, ex.name)
-		}
-
-		h, x, err := t.store.CreateIndex(unique)
-		if err != nil {
-			return -1, nil, err
-		}
-
-		t.xroots[colIndex+1] = h
-		if err := t.store.Update(t.hxroots, t.xroots...); err != nil {
-			return -1, nil, err
-		}
-
-		t.indices[colIndex+1] = &indexedCol{indexName, unique, x, h}
-		return h, x, t.updated()
-	}
-}
-
-func (t *table) addIndex(unique bool, indexName string, colIndex int) (int64, error) {
-	hx, x, err := t.addIndex0(unique, indexName, colIndex)
-	if err != nil {
-		return -1, err
-	}
-
-	// Must fill the new index.
-	ncols := len(t.cols0)
-	h, store := t.head, t.store
-	for h != 0 {
-		rec, err := store.Read(nil, h, t.cols...)
-		if err != nil {
-			return -1, err
-		}
-
-		if n := ncols + 2 - len(rec); n > 0 {
-			rec = append(rec, make([]interface{}, n)...)
-		}
-
-		if err = x.Create([]interface{}{rec[colIndex+2]}, h); err != nil {
-			return -1, err
-		}
-
-		h = rec[0].(int64)
-	}
-	return hx, nil
-}
-
-func (t *table) addIndex2(execCtx *execCtx, unique bool, indexName string, exprList []expression) (int64, error) {
-	if _, ok := t.indices2[indexName]; ok {
-		panic("internal error 009")
-	}
-
-	hx, x, err := t.store.CreateIndex(unique)
-	if err != nil {
-		return -1, err
-	}
-	var a []string
-	for _, v := range exprList {
-		a = append(a, v.String())
-	}
-	x2 := &index2{unique, x, hx, a, exprList}
-	if t.indices2 == nil {
-		t.indices2 = map[string]*index2{}
-	}
-	t.indices2[indexName] = x2
-
-	// Must fill the new index.
-	m := map[interface{}]interface{}{}
-	h, store := t.head, t.store
-	for h != 0 {
-		rec, err := store.Read(nil, h, t.cols...)
-		if err != nil {
-			return -1, err
-		}
-
-		for _, col := range t.cols {
-			ci := col.index
-			v := interface{}(nil)
-			if ci < len(rec) {
-				v = rec[ci+2]
-			}
-			m[col.name] = v
-		}
-
-		id := rec[1].(int64)
-		vlist, err := x2.eval(execCtx, t.cols, id, rec[2:])
-		if err != nil {
-			return -1, err
-		}
-
-		if err := x2.x.Create(vlist, h); err != nil {
-			return -1, err
-		}
-
-		h = rec[0].(int64)
-	}
-	return hx, nil
-}
-
-func (t *table) dropIndex(xIndex int) error {
-	t.xroots[xIndex] = 0
-	if err := t.indices[xIndex].x.Drop(); err != nil {
-		return err
-	}
-
-	t.indices[xIndex] = nil
-	return t.updated()
-}
-
-func (t *table) updated() (err error) {
-	switch {
-	case len(t.indices) != 0:
-		a := []string{}
-		for _, v := range t.indices {
-			if v == nil {
-				a = append(a, "")
-				continue
-			}
-
-			s := "n"
-			if v.unique {
-				s = "u"
-			}
-			a = append(a, s+v.name)
-		}
-		return t.store.Update(t.h, t.next, cols2meta(t.updateCols().cols0), t.hhead, t.name, strings.Join(a, "|"), t.hxroots)
-	default:
-		return t.store.Update(t.h, t.next, cols2meta(t.updateCols().cols0), t.hhead, t.name)
-	}
-}
-
-// storage fields
-// 0: next record handle int64
-// 1: record id          int64
-// 2...: data row
-func (t *table) addRecord(execCtx *execCtx, r []interface{}) (id int64, err error) {
-	if id, err = t.store.ID(); err != nil {
-		return
-	}
-
-	r = append([]interface{}{t.head, id}, r...)
-	h, err := t.store.Create(r...)
-	if err != nil {
-		return
-	}
-
-	for i, v := range t.indices {
-		if v == nil {
-			continue
-		}
-
-		if err = v.x.Create([]interface{}{r[i+1]}, h); err != nil {
-			return
-		}
-	}
-
-	for _, ix := range t.indices2 {
-		vlist, err := ix.eval(execCtx, t.cols, id, r[2:])
-		if err != nil {
-			return -1, err
-		}
-
-		if err := ix.x.Create(vlist, h); err != nil {
-			return -1, err
-		}
-	}
-
-	if err = t.store.Update(t.hhead, h); err != nil {
-		return
-	}
-
-	t.head = h
-	return
-}
-
-func (t *table) flds() (r []*fld) {
-	r = make([]*fld, len(t.cols))
-	for i, v := range t.cols {
-		r[i] = &fld{expr: &ident{v.name}, name: v.name}
-	}
-	return
-}
-
-func (t *table) fieldNames() []string {
-	r := make([]string, len(t.cols))
-	for i, v := range t.cols {
-		r[i] = v.name
-	}
-	return r
-}
-
-func (t *table) updateCols() *table {
-	t.cols = t.cols[:0]
-	for i, c := range t.cols0 {
-		if c.name != "" {
-			c.index = i
-			t.cols = append(t.cols, c)
-		}
-	}
-	return t
-}
-
-func (t *table) row0(ctx *execCtx, h int64) ([]interface{}, error) {
-	rec, err := ctx.db.store.Read(nil, h, t.cols...)
-	if err != nil {
-		return nil, err
-	}
-
-	if d := len(t.cols) - (len(rec) - 2); d > 0 {
-		rec = append(rec, make([]interface{}, d)...)
-	}
-
-	return rec, nil
-}
-
-func (t *table) row(ctx *execCtx, h int64) (int64, []interface{}, error) {
-	rec, err := t.row0(ctx, h)
-	if err != nil {
-		return -1, nil, err
-	}
-
-	return rec[1].(int64), rec[2:], nil
-}
-
-// storage fields
-// 0: handle of first table in DB int64
-type root struct {
-	head         int64 // Single linked table list
-	lastInsertID int64
-	parent       *root
-	rowsAffected int64 //LATER implement
-	store        storage
-	tables       map[string]*table
-	thead        *table
-}
-
-func newRoot(store storage) (r *root, err error) {
-	data, err := store.Read(nil, 1)
-	if err != nil {
-		return
-	}
-
-	switch len(data) {
-	case 0: // new empty DB, create empty table list
-		if err = store.BeginTransaction(); err != nil {
-			return
-		}
-
-		if err = store.Update(1, int64(0)); err != nil {
-			store.Rollback()
-			return
-		}
-
-		if err = store.Commit(); err != nil {
-			return
-		}
-
-		return &root{
-			store:  store,
-			tables: map[string]*table{},
-		}, nil
-	case 1: // existing DB, load tables
-		if len(data) != 1 {
-			return nil, fmt.Errorf("corrupted DB: root is an %d-scalar", len(data))
-		}
-
-		p, ok := data[0].(int64)
-		if !ok {
-			return nil, fmt.Errorf("corrupted DB: root head has type %T", data[0])
-		}
-
-		r := &root{
-			head:   p,
-			store:  store,
-			tables: map[string]*table{},
-		}
-
-		var tprev *table
-		for p != 0 {
-			t := &table{
-				h:     p,
-				store: store,
-				tprev: tprev,
-			}
-
-			if r.thead == nil {
-				r.thead = t
-			}
-			if tprev != nil {
-				tprev.tnext = t
-			}
-			tprev = t
-
-			if err = t.load(); err != nil {
-				return nil, err
-			}
-
-			if r.tables[t.name] != nil { // duplicate
-				return nil, fmt.Errorf("corrupted DB: duplicate table metadata for table %s", t.name)
-			}
-
-			r.tables[t.name] = t
-			p = t.next
-		}
-		return r, nil
-	default:
-		return nil, errIncompatibleDBFormat
-	}
-}
-
-func (r *root) findIndexByName(name string) (*table, interface{}) {
-	for _, t := range r.tables {
-		if i := t.findIndexByName(name); i != nil {
-			return t, i
-		}
-	}
-
-	return nil, nil
-}
-
-func (r *root) updated() (err error) {
-	return r.store.Update(1, r.head)
-}
-
-func (r *root) createTable(name string, cols []*col) (t *table, err error) {
-	if _, ok := r.tables[name]; ok {
-		panic("internal error 065")
-	}
-
-	if t, err = newTable(r.store, name, r.head, cols, nil, r.thead); err != nil {
-		return nil, err
-	}
-
-	if err = r.store.Update(1, t.h); err != nil {
-		return nil, err
-	}
-
-	if p := r.thead; p != nil {
-		p.tprev = t
-	}
-	r.tables[name], r.head, r.thead = t, t.h, t
-	return
-}
-
-func (r *root) dropTable(t *table) (err error) {
-	defer func() {
-		if err != nil {
-			return
-		}
-
-		delete(r.tables, t.name)
-	}()
-
-	if err = t.truncate(); err != nil {
-		return
-	}
-
-	if err = t.store.Delete(t.hhead); err != nil {
-		return
-	}
-
-	if err = t.store.Delete(t.h); err != nil {
-		return
-	}
-
-	for _, v := range t.indices {
-		if v != nil && v.x != nil {
-			if err = v.x.Drop(); err != nil {
-				return
-			}
-		}
-	}
-	for _, v := range t.indices2 {
-		if err = v.x.Drop(); err != nil {
-			return
-		}
-	}
-
-	if h := t.hxroots; h != 0 {
-		if err = t.store.Delete(h); err != nil {
-			return
-		}
-	}
-
-	switch {
-	case t.tprev == nil && t.tnext == nil:
-		r.head = 0
-		r.thead = nil
-		err = r.updated()
-		return errSet(&err, r.store.ResetID())
-	case t.tprev == nil && t.tnext != nil:
-		next := t.tnext
-		next.tprev = nil
-		r.head = next.h
-		r.thead = next
-		if err = r.updated(); err != nil {
-			return
-		}
-
-		return next.updated()
-	case t.tprev != nil && t.tnext == nil: // last in list
-		prev := t.tprev
-		prev.next = 0
-		prev.tnext = nil
-		return prev.updated()
-	default: //case t.tprev != nil && t.tnext != nil:
-		prev, next := t.tprev, t.tnext
-		prev.next = next.h
-		prev.tnext = next
-		next.tprev = prev
-		if err = prev.updated(); err != nil {
-			return
-		}
-
-		return next.updated()
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/testdata.log b/Godeps/_workspace/src/github.com/cznic/ql/testdata.log
deleted file mode 100644
index 0e13dcfbba..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/testdata.log
+++ /dev/null
@@ -1,8382 +0,0 @@
----- 0
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2" "c3"]
-
----- 3
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2" "c3" "c4"]
-
----- 8
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c3"]
-
----- 15
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-
----- 19
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2" "c3" "c4"]
-
----- 20
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2" "c4"]
-
----- 22
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 24
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-
----- 28
-SELECT 3 * c1 AS v FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Evaluate 3 * c1 as "v",
-└Output field names ["v"]
-
----- 29
-SELECT c2 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Evaluate c2 as "c2",
-└Output field names ["c2"]
-
----- 30
-SELECT c1 AS X, c2 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Evaluate c1 as "X", c2 as "c2",
-└Output field names ["X" "c2"]
-
----- 31
-SELECT c2, c1 AS Y FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Evaluate c2 as "c2", c1 as "Y",
-└Output field names ["c2" "Y"]
-
----- 33
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1" "c2"]
-
----- 35
-SELECT * FROM t ORDER BY c1;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Order by c1,
-└Output field names ["c1" "c2"]
-
----- 36
-SELECT * FROM t ORDER BY c1;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Order by c1,
-└Output field names ["c1" "c2"]
-
----- 37
-SELECT * FROM t ORDER BY c1 DESC;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Order descending by c1,
-└Output field names ["c1" "c2"]
-
----- 38
-SELECT * FROM t WHERE c1 % 2 == 0 ORDER BY c2 DESC;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Filter on c1 % 2 == 0
-└Output field names ["c1" "c2"]
-┌Order descending by c2,
-└Output field names ["c1" "c2"]
-
----- 39
-SELECT * FROM t ORDER BY c1, c2;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Order by c1, c2,
-└Output field names ["c1" "c2"]
-
----- 40
-SELECT * FROM t ORDER BY c2, c1;
-┌Iterate all rows of table "t"
-└Output field names ["c1" "c2"]
-┌Order by c2, c1,
-└Output field names ["c1" "c2"]
-
----- 44
-SELECT employee.LastName FROM employee, department;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate employee.LastName as "employee.LastName",
-└Output field names ["employee.LastName"]
-
----- 45
-SELECT * FROM employee, department ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by employee.LastName,
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 46
-SELECT * FROM employee, department WHERE employee.DepartmentID == department.DepartmentID;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 47
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID FROM employee, department WHERE employee.DepartmentID == department.DepartmentID ORDER BY department.DepartmentName, employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate department.DepartmentName as "department.DepartmentName", department.DepartmentID as "department.DepartmentID", employee.LastName as "employee.LastName", employee.DepartmentID as "employee.DepartmentID",
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-┌Order by department.DepartmentName, employee.LastName,
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-
----- 48
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID FROM employee, department WHERE department.DepartmentName IN ("Sales","Engineering","HR","Clerical") ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on department.DepartmentName IN ("Sales","Engineering","HR","Clerical")
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate department.DepartmentName as "department.DepartmentName", department.DepartmentID as "department.DepartmentID", employee.LastName as "employee.LastName", employee.DepartmentID as "employee.DepartmentID",
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-┌Order by employee.LastName,
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-
----- 49
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID FROM employee, department WHERE (department.DepartmentID + 1000) IN (1031,1035,1036) ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on (department.DepartmentID + 1000) IN (1031,1035,1036)
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate department.DepartmentName as "department.DepartmentName", department.DepartmentID as "department.DepartmentID", employee.LastName as "employee.LastName", employee.DepartmentID as "employee.DepartmentID",
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-┌Order by employee.LastName,
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-
----- 50
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID FROM employee, department WHERE department.DepartmentName NOT IN ("Engineering","HR","Clerical");
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on department.DepartmentName NOT IN ("Engineering","HR","Clerical")
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate department.DepartmentName as "department.DepartmentName", department.DepartmentID as "department.DepartmentID", employee.LastName as "employee.LastName", employee.DepartmentID as "employee.DepartmentID",
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-
----- 51
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID FROM employee, department WHERE department.DepartmentID >= 34 && department.DepartmentID <= 36 ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on department.DepartmentID >= 34 && department.DepartmentID <= 36
-│Possibly useful indices
-│CREATE INDEX xdepartment_DepartmentID ON department(DepartmentID);
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate department.DepartmentName as "department.DepartmentName", department.DepartmentID as "department.DepartmentID", employee.LastName as "employee.LastName", employee.DepartmentID as "employee.DepartmentID",
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-┌Order by employee.LastName,
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-
----- 52
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID FROM employee, department WHERE department.DepartmentID >= 34 && department.DepartmentID <= 36 ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on department.DepartmentID >= 34 && department.DepartmentID <= 36
-│Possibly useful indices
-│CREATE INDEX xdepartment_DepartmentID ON department(DepartmentID);
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate department.DepartmentName as "department.DepartmentName", department.DepartmentID as "department.DepartmentID", employee.LastName as "employee.LastName", employee.DepartmentID as "employee.DepartmentID",
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-┌Order by employee.LastName,
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-
----- 53
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID FROM employee, department WHERE department.DepartmentID < 33 || department.DepartmentID > 34 ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on department.DepartmentID < 33 || department.DepartmentID > 34
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate department.DepartmentName as "department.DepartmentName", department.DepartmentID as "department.DepartmentID", employee.LastName as "employee.LastName", employee.DepartmentID as "employee.DepartmentID",
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-┌Order by employee.LastName,
-└Output field names ["department.DepartmentName" "department.DepartmentID" "employee.LastName" "employee.DepartmentID"]
-
----- 56
-SELECT LastName AS a, LastName AS b FROM employee ORDER BY a, b;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "a", LastName as "b",
-└Output field names ["a" "b"]
-┌Order by a, b,
-└Output field names ["a" "b"]
-
----- 57
-SELECT employee.LastName AS name, employee.DepartmentID AS id, department.DepartmentName AS department, department.DepartmentID AS id2 FROM employee, department WHERE employee.DepartmentID == department.DepartmentID ORDER BY name, id, department, id2;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate employee.LastName as "name", employee.DepartmentID as "id", department.DepartmentName as "department", department.DepartmentID as "id2",
-└Output field names ["name" "id" "department" "id2"]
-┌Order by name, id, department, id2,
-└Output field names ["name" "id" "department" "id2"]
-
----- 59
-SELECT * FROM employee ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 60
-SELECT * FROM employee AS e ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 65
-SELECT * FROM (SELECT * FROM employee;) ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 66
-SELECT * FROM (SELECT LastName AS Name FROM employee;) ORDER BY Name;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "Name",
-└Output field names ["Name"]
-┌Order by Name,
-└Output field names ["Name"]
-
----- 68
-SELECT name AS Name FROM (SELECT LastName AS name FROM employee AS e;) ORDER BY Name;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "name",
-└Output field names ["name"]
-┌Evaluate name as "Name",
-└Output field names ["Name"]
-┌Order by Name,
-└Output field names ["Name"]
-
----- 69
-SELECT name AS Name FROM (SELECT LastName AS name FROM employee;) ORDER BY Name;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "name",
-└Output field names ["name"]
-┌Evaluate name as "Name",
-└Output field names ["Name"]
-┌Order by Name,
-└Output field names ["Name"]
-
----- 70
-SELECT employee.LastName, department.DepartmentName, department.DepartmentID FROM (SELECT * FROM employee, department WHERE employee.DepartmentID == department.DepartmentID;) ORDER BY department.DepartmentName, employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Evaluate employee.LastName as "employee.LastName", department.DepartmentName as "department.DepartmentName", department.DepartmentID as "department.DepartmentID",
-└Output field names ["employee.LastName" "department.DepartmentName" "department.DepartmentID"]
-┌Order by department.DepartmentName, employee.LastName,
-└Output field names ["employee.LastName" "department.DepartmentName" "department.DepartmentID"]
-
----- 71
-SELECT e.LastName, d.DepartmentName, d.DepartmentID FROM (SELECT * FROM employee AS e, department AS d WHERE e.DepartmentID == d.DepartmentID;) ORDER BY d.DepartmentName, e.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Evaluate e.LastName as "e.LastName", d.DepartmentName as "d.DepartmentName", d.DepartmentID as "d.DepartmentID",
-└Output field names ["e.LastName" "d.DepartmentName" "d.DepartmentID"]
-┌Order by d.DepartmentName, e.LastName,
-└Output field names ["e.LastName" "d.DepartmentName" "d.DepartmentID"]
-
----- 72
-SELECT e.LastName AS name, d.DepartmentName AS department, d.DepartmentID AS id FROM (SELECT * FROM employee AS e, department AS d WHERE e.DepartmentID == d.DepartmentID;) ORDER BY department, name;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Evaluate e.LastName as "name", d.DepartmentName as "department", d.DepartmentID as "id",
-└Output field names ["name" "department" "id"]
-┌Order by department, name,
-└Output field names ["name" "department" "id"]
-
----- 73
-SELECT name, department, id FROM (SELECT e.LastName AS name, e.DepartmentID AS id, d.DepartmentName AS department, d.DepartmentID AS fid FROM employee AS e, department AS d WHERE e.DepartmentID == d.DepartmentID;) ORDER BY department, name;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Evaluate e.LastName as "name", e.DepartmentID as "id", d.DepartmentName as "department", d.DepartmentID as "fid",
-└Output field names ["name" "id" "department" "fid"]
-┌Evaluate name as "name", department as "department", id as "id",
-└Output field names ["name" "department" "id"]
-┌Order by department, name,
-└Output field names ["name" "department" "id"]
-
----- 74
-SELECT * FROM (SELECT * FROM employee;), (SELECT * FROM department;);
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["" "" "" ""]
-
----- 75
-SELECT * FROM (SELECT * FROM employee;) AS e, (SELECT * FROM department;) ORDER BY e.LastName, e.DepartmentID;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "" ""]
-┌Order by e.LastName, e.DepartmentID,
-└Output field names ["e.LastName" "e.DepartmentID" "" ""]
-
----- 76
-SELECT * FROM (SELECT * FROM employee;), (SELECT * FROM department;) AS d ORDER BY d.DepartmentID DESC;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["" "" "d.DepartmentID" "d.DepartmentName"]
-┌Order descending by d.DepartmentID,
-└Output field names ["" "" "d.DepartmentID" "d.DepartmentName"]
-
----- 77
-SELECT * FROM employee, (SELECT * FROM department;) ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "" ""]
-┌Order by employee.LastName,
-└Output field names ["employee.LastName" "employee.DepartmentID" "" ""]
-
----- 78
-SELECT * FROM (SELECT * FROM employee;) AS e, (SELECT * FROM department;) AS d WHERE e.DepartmentID == d.DepartmentID ORDER BY d.DepartmentName, e.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Order by d.DepartmentName, e.LastName,
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-
----- 79
-SELECT * FROM employee, (SELECT * FROM department;) AS d WHERE employee.DepartmentID == d.DepartmentID ORDER BY d.DepartmentName, employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on employee.DepartmentID == d.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Order by d.DepartmentName, employee.LastName,
-└Output field names ["employee.LastName" "employee.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-
----- 80
-SELECT * FROM employee AS e, (SELECT * FROM department;) AS d WHERE e.DepartmentID == d.DepartmentID ORDER BY d.DepartmentName, e.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Order by d.DepartmentName, e.LastName,
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-
----- 81
-SELECT * FROM employee AS e, (SELECT * FROM department;) AS d WHERE e.DepartmentID == d.DepartmentID ORDER BY e.DepartmentID, e.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Order by e.DepartmentID, e.LastName,
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-
----- 82
-SELECT * FROM employee AS e, (SELECT * FROM department;) AS d WHERE e.DepartmentID == d.DepartmentID ORDER BY e.DepartmentID, e.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Order by e.DepartmentID, e.LastName,
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-
----- 84
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 87
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 88
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 92
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 94
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 95
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 96
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 98
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 102
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 104
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 106
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 107
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 109
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 110
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 111
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 112
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 113
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 115
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 116
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 118
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 119
-SELECT * FROM t WHERE c1 > 3;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 > 3
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 120
-SELECT * FROM t WHERE c1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1
-└Output field names ["c1"]
-
----- 122
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 123
-SELECT * FROM t WHERE c1 == 8;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 8
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 124
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 125
-SELECT * FROM t WHERE c1 == 8;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 8
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 126
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 127
-SELECT * FROM t WHERE c1 == 8;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 8
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 128
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 129
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 130
-SELECT * FROM t WHERE c1 == 8;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 8
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 131
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 132
-SELECT * FROM t WHERE c1 == 8;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 8
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 133
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 134
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 135
-SELECT * FROM t WHERE c1 == 8;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 8
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 136
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 137
-SELECT * FROM t WHERE c1 == 1;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 1
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 138
-SELECT * FROM t WHERE c1 == 8;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 8
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 139
-SELECT * FROM t WHERE c1 == 8;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 8
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 140
-SELECT * FROM t WHERE c1 == 2;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 2
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 141
-SELECT * FROM t WHERE c1 == 2;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 2
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 142
-SELECT * FROM t WHERE c1 == 2;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 2
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 143
-SELECT * FROM t WHERE c1 == "foo";
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == "foo"
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 144
-SELECT * FROM t WHERE c1 == 2+5i;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 2+5i
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 145
-SELECT * FROM t WHERE c1 == "2";
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == "2"
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 146
-SELECT * FROM t WHERE c1 == 2+5i;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 2+5i
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 147
-SELECT * FROM t WHERE c1 == 2;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == 2
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 148
-SELECT * FROM t WHERE c1 == "foo";
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-┌Filter on c1 == "foo"
-│Possibly useful indices
-│CREATE INDEX xt_c1 ON t(c1);
-└Output field names ["c1"]
-
----- 153
-SELECT 314, 42 AS AUQLUE, DepartmentID, DepartmentID + 1000, LastName AS Name FROM employee ORDER BY Name;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate 314 as "", 42 as "AUQLUE", DepartmentID as "DepartmentID", DepartmentID + 1000 as "", LastName as "Name",
-└Output field names ["" "AUQLUE" "DepartmentID" "" "Name"]
-┌Order by Name,
-└Output field names ["" "AUQLUE" "DepartmentID" "" "Name"]
-
----- 154
-SELECT * FROM employee AS e, (SELECT * FROM department;) ORDER BY e.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "" ""]
-┌Order by e.LastName,
-└Output field names ["e.LastName" "e.DepartmentID" "" ""]
-
----- 155
-SELECT * FROM employee AS e, (SELECT * FROM department;) AS d ORDER BY e.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Order by e.LastName,
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-
----- 157
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c1"]
-
----- 158
-SELECT * FROM p;
-┌Iterate all rows of table "p"
-└Output field names ["p"]
-
----- 159
-SELECT p.p AS p, q.p AS q, p.p || q.p AS p_or_q, p.p && q.p AS p_and_q FROM p, p AS q;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "p"
-│   └Output field names ["p"]
-│   ┌Iterate all rows of table "p"
-│   └Output field names ["p"]
-└Output field names ["p.p" "q.p"]
-┌Evaluate p.p as "p", q.p as "q", p.p || q.p as "p_or_q", p.p && q.p as "p_and_q",
-└Output field names ["p" "q" "p_or_q" "p_and_q"]
-
----- 160
-SELECT p, !p AS not_p FROM p;
-┌Iterate all rows of table "p"
-└Output field names ["p"]
-┌Evaluate p as "p", !p as "not_p",
-└Output field names ["p" "not_p"]
-
----- 161
-SELECT * FROM department WHERE DepartmentID >= 33 ORDER BY DepartmentID;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentID" "DepartmentName"]
-┌Filter on DepartmentID >= 33
-│Possibly useful indices
-│CREATE INDEX xdepartment_DepartmentID ON department(DepartmentID);
-└Output field names ["DepartmentID" "DepartmentName"]
-┌Order by DepartmentID,
-└Output field names ["DepartmentID" "DepartmentName"]
-
----- 162
-SELECT * FROM department WHERE DepartmentID <= 34 ORDER BY DepartmentID;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentID" "DepartmentName"]
-┌Filter on DepartmentID <= 34
-│Possibly useful indices
-│CREATE INDEX xdepartment_DepartmentID ON department(DepartmentID);
-└Output field names ["DepartmentID" "DepartmentName"]
-┌Order by DepartmentID,
-└Output field names ["DepartmentID" "DepartmentName"]
-
----- 163
-SELECT * FROM department WHERE DepartmentID < 34 ORDER BY DepartmentID;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentID" "DepartmentName"]
-┌Filter on DepartmentID < 34
-│Possibly useful indices
-│CREATE INDEX xdepartment_DepartmentID ON department(DepartmentID);
-└Output field names ["DepartmentID" "DepartmentName"]
-┌Order by DepartmentID,
-└Output field names ["DepartmentID" "DepartmentName"]
-
----- 164
-SELECT +DepartmentID FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate +DepartmentID as "",
-└Output field names [""]
-
----- 165
-SELECT * FROM employee ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 166
-SELECT * FROM employee ORDER BY LastName DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 167
-SELECT 1023 + DepartmentID AS y FROM employee ORDER BY y DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate 1023 + DepartmentID as "y",
-└Output field names ["y"]
-┌Order descending by y,
-└Output field names ["y"]
-
----- 168
-SELECT +DepartmentID AS y FROM employee ORDER BY y DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate +DepartmentID as "y",
-└Output field names ["y"]
-┌Order descending by y,
-└Output field names ["y"]
-
----- 169
-SELECT * FROM employee ORDER BY DepartmentID, LastName DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by DepartmentID, LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 170
-SELECT * FROM employee ORDER BY 0 + DepartmentID DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by 0 + DepartmentID,
-└Output field names ["LastName" "DepartmentID"]
-
----- 171
-SELECT * FROM employee ORDER BY +DepartmentID DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by +DepartmentID,
-└Output field names ["LastName" "DepartmentID"]
-
----- 172
-SELECT ^DepartmentID AS y FROM employee ORDER BY y DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate ^DepartmentID as "y",
-└Output field names ["y"]
-┌Order descending by y,
-└Output field names ["y"]
-
----- 173
-SELECT ^uint8(DepartmentID) AS y FROM employee ORDER BY y DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate ^uint8(DepartmentID) as "y",
-└Output field names ["y"]
-┌Order descending by y,
-└Output field names ["y"]
-
----- 174
-SELECT * FROM t ORDER BY r;
-┌Iterate all rows of table "t"
-└Output field names ["r"]
-┌Order by r,
-└Output field names ["r"]
-
----- 175
-SELECT i ^ 1 AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Evaluate i ^ 1 as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 176
-SELECT i | 1 AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Evaluate i | 1 as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 177
-SELECT i & 1 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Evaluate i & 1 as "",
-└Output field names [""]
-
----- 178
-SELECT i &^ 1 AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Evaluate i &^ 1 as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 179
-SELECT * FROM employee WHERE LastName == "Jones" || DepartmentID IS NULL ORDER BY LastName DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Filter on LastName == "Jones" || DepartmentID IS NULL
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 180
-SELECT * FROM employee WHERE LastName != "Jones" && DepartmentID IS NOT NULL ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Filter on LastName != "Jones" && DepartmentID IS NOT NULL
-│Possibly useful indices
-│CREATE INDEX xemployee_LastName ON employee(LastName);
-│CREATE INDEX xemployee_DepartmentID ON employee(DepartmentID);
-└Output field names ["LastName" "DepartmentID"]
-┌Order by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 185
-SELECT DepartmentID[0] FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate DepartmentID[0] as "",
-└Output field names [""]
-
----- 186
-SELECT "foo"[-DepartmentID] FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate "foo"[-DepartmentID] as "",
-└Output field names [""]
-
----- 187
-SELECT LastName[100] FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName[100] as "",
-└Output field names [""]
-
----- 188
-SELECT LastName[0], LastName FROM employee ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName[0] as "", LastName as "LastName",
-└Output field names ["" "LastName"]
-┌Order by LastName,
-└Output field names ["" "LastName"]
-
----- 189
-SELECT LastName, string(LastName[0]), string(LastName[1]), string(LastName[2]), string(LastName[3]) FROM employee ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "LastName", string(LastName[0]) as "", string(LastName[1]) as "", string(LastName[2]) as "", string(LastName[3]) as "",
-└Output field names ["LastName" "" "" "" ""]
-┌Order by LastName,
-└Output field names ["LastName" "" "" "" ""]
-
----- 190
-SELECT LastName, LastName[:], LastName[:2], LastName[2:], LastName[1:3] FROM employee ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "LastName", LastName[:] as "", LastName[:2] as "", LastName[2:] as "", LastName[1:3] as "",
-└Output field names ["LastName" "" "" "" ""]
-┌Order by LastName,
-└Output field names ["LastName" "" "" "" ""]
-
----- 192
-SELECT DepartmentID, LastName, LastName[:4], LastName[:0 * DepartmentID], LastName[0 * DepartmentID:0], LastName[0 * DepartmentID:0 * DepartmentID] FROM employee ORDER BY LastName DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate DepartmentID as "DepartmentID", LastName as "LastName", LastName[:4] as "", LastName[:0 * DepartmentID] as "", LastName[0 * DepartmentID:0] as "", LastName[0 * DepartmentID:0 * DepartmentID] as "",
-└Output field names ["DepartmentID" "LastName" "" "" "" ""]
-┌Order descending by LastName,
-└Output field names ["DepartmentID" "LastName" "" "" "" ""]
-
----- 193
-SELECT DepartmentID AS x, DepartmentID << 1 AS a, 1 << uint64(DepartmentID) AS b FROM employee WHERE DepartmentID IS NOT NULL ORDER BY x;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Filter on DepartmentID IS NOT NULL
-│Possibly useful indices
-│CREATE INDEX xemployee_DepartmentID ON employee(DepartmentID);
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate DepartmentID as "x", DepartmentID << 1 as "a", 1 << uint64(DepartmentID) as "b",
-└Output field names ["x" "a" "b"]
-┌Order by x,
-└Output field names ["x" "a" "b"]
-
----- 194
-SELECT DepartmentID AS x, DepartmentID >> 1 AS a, 9223372036854775808 >> uint64(DepartmentID) AS b FROM employee WHERE DepartmentID IS NOT NULL ORDER BY x;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Filter on DepartmentID IS NOT NULL
-│Possibly useful indices
-│CREATE INDEX xemployee_DepartmentID ON employee(DepartmentID);
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate DepartmentID as "x", DepartmentID >> 1 as "a", 9223372036854775808 >> uint64(DepartmentID) as "b",
-└Output field names ["x" "a" "b"]
-┌Order by x,
-└Output field names ["x" "a" "b"]
-
----- 195
-SELECT DISTINCT DepartmentID FROM employee WHERE DepartmentID IS NOT NULL;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Filter on DepartmentID IS NOT NULL
-│Possibly useful indices
-│CREATE INDEX xemployee_DepartmentID ON employee(DepartmentID);
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate DepartmentID as "DepartmentID",
-└Output field names ["DepartmentID"]
-┌Compute distinct rows
-└Output field names [DepartmentID]
-
----- 196
-SELECT DISTINCT e.DepartmentID, d.DepartmentID, e.LastName FROM employee AS e, department AS d WHERE e.DepartmentID == d.DepartmentID;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Evaluate e.DepartmentID as "e.DepartmentID", d.DepartmentID as "d.DepartmentID", e.LastName as "e.LastName",
-└Output field names ["e.DepartmentID" "d.DepartmentID" "e.LastName"]
-┌Compute distinct rows
-└Output field names [e.DepartmentID d.DepartmentID e.LastName]
-
----- 197
-SELECT DISTINCT e.DepartmentID, d.DepartmentID, e.LastName FROM employee AS e, department AS d WHERE e.DepartmentID == d.DepartmentID ORDER BY e.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Evaluate e.DepartmentID as "e.DepartmentID", d.DepartmentID as "d.DepartmentID", e.LastName as "e.LastName",
-└Output field names ["e.DepartmentID" "d.DepartmentID" "e.LastName"]
-┌Compute distinct rows
-└Output field names [e.DepartmentID d.DepartmentID e.LastName]
-┌Order by e.LastName,
-└Output field names ["e.DepartmentID" "d.DepartmentID" "e.LastName"]
-
----- 198
-SELECT * FROM employee, department ORDER BY employee.LastName, department.DepartmentID;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by employee.LastName, department.DepartmentID,
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 199
-SELECT * FROM employee, department WHERE employee.DepartmentID == department.DepartmentID ORDER BY employee.LastName, department.DepartmentID;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Filter on employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by employee.LastName, department.DepartmentID,
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 200
-SELECT * FROM department ORDER BY DepartmentID;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentID" "DepartmentName"]
-┌Order by DepartmentID,
-└Output field names ["DepartmentID" "DepartmentName"]
-
----- 201
-SELECT * FROM department ORDER BY DepartmentID;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentID" "DepartmentName"]
-┌Order by DepartmentID,
-└Output field names ["DepartmentID" "DepartmentName"]
-
----- 202
-SELECT * FROM department;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentID" "DepartmentName"]
-
----- 203
-SELECT * FROM department ORDER BY DepartmentID;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentID" "DepartmentName"]
-┌Order by DepartmentID,
-└Output field names ["DepartmentID" "DepartmentName"]
-
----- 204
-SELECT id(), LastName FROM employee ORDER BY id();
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate id() as "", LastName as "LastName",
-└Output field names ["" "LastName"]
-┌Order by id(),
-└Output field names ["" "LastName"]
-
----- 205
-SELECT id(), LastName FROM employee ORDER BY id();
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate id() as "", LastName as "LastName",
-└Output field names ["" "LastName"]
-┌Order by id(),
-└Output field names ["" "LastName"]
-
----- 206
-SELECT id(), LastName FROM employee ORDER BY id();
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate id() as "", LastName as "LastName",
-└Output field names ["" "LastName"]
-┌Order by id(),
-└Output field names ["" "LastName"]
-
----- 207
-SELECT id(), e.LastName, e.DepartmentID, d.DepartmentID FROM employee AS e, department AS d WHERE e.DepartmentID == d.DepartmentID ORDER BY e.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Evaluate id() as "", e.LastName as "e.LastName", e.DepartmentID as "e.DepartmentID", d.DepartmentID as "d.DepartmentID",
-└Output field names ["" "e.LastName" "e.DepartmentID" "d.DepartmentID"]
-┌Order by e.LastName,
-└Output field names ["" "e.LastName" "e.DepartmentID" "d.DepartmentID"]
-
----- 208
-SELECT e.ID, e.LastName, e.DepartmentID, d.DepartmentID FROM (SELECT id() AS ID, LastName, DepartmentID FROM employee;) AS e, department AS d WHERE e.DepartmentID == d.DepartmentID ORDER BY e.ID;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of virtual table "e"
-│   │   ┌Iterate all rows of table "employee"
-│   │   └Output field names ["LastName" "DepartmentID"]
-│   │   ┌Evaluate id() as "ID", LastName as "LastName", DepartmentID as "DepartmentID",
-│   │   └Output field names ["ID" "LastName" "DepartmentID"]
-│   └Output field names ["ID" "LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-└Output field names ["e.ID" "e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Filter on e.DepartmentID == d.DepartmentID
-└Output field names ["e.ID" "e.LastName" "e.DepartmentID" "d.DepartmentID" "d.DepartmentName"]
-┌Evaluate e.ID as "e.ID", e.LastName as "e.LastName", e.DepartmentID as "e.DepartmentID", d.DepartmentID as "d.DepartmentID",
-└Output field names ["e.ID" "e.LastName" "e.DepartmentID" "d.DepartmentID"]
-┌Order by e.ID,
-└Output field names ["e.ID" "e.LastName" "e.DepartmentID" "d.DepartmentID"]
-
----- 209
-SELECT * FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-
----- 210
-SELECT * FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-
----- 211
-SELECT * FROM employee ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 212
-SELECT * FROM employee ORDER BY LastName DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 213
-SELECT * FROM employee ORDER BY LastName DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 214
-SELECT * FROM employee ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 215
-SELECT * FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-
----- 216
-SELECT * FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-
----- 217
-SELECT * FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-
----- 223
-SELECT LastName[:len(LastName) - 3] AS y FROM employee ORDER BY y;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName[:len(LastName) - 3] as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 224
-SELECT complex(float32(DepartmentID + int64(id())), 0) AS x, complex(DepartmentID + int64(id()), 0) FROM employee ORDER BY real(x) DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate complex(float32(DepartmentID + int64(id())), 0) as "x", complex(DepartmentID + int64(id()), 0) as "",
-└Output field names ["x" ""]
-┌Order descending by real(x),
-└Output field names ["x" ""]
-
----- 225
-SELECT real(complex(float32(DepartmentID + int64(id())), 0)) AS x, real(complex(DepartmentID + int64(id()), 0)) FROM employee ORDER BY x DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate real(complex(float32(DepartmentID + int64(id())), 0)) as "x", real(complex(DepartmentID + int64(id()), 0)) as "",
-└Output field names ["x" ""]
-┌Order descending by x,
-└Output field names ["x" ""]
-
----- 226
-SELECT imag(complex(0, float32(DepartmentID + int64(id())))) AS x, imag(complex(0, DepartmentID + int64(id()))) FROM employee ORDER BY x DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate imag(complex(0, float32(DepartmentID + int64(id())))) as "x", imag(complex(0, DepartmentID + int64(id()))) as "",
-└Output field names ["x" ""]
-┌Order descending by x,
-└Output field names ["x" ""]
-
----- 227
-SELECT 100 * id(), c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate 100 * id() as "", c as "c",
-└Output field names ["" "c"]
-
----- 229
-SELECT * FROM b;
-┌Iterate all rows of table "b"
-└Output field names ["b"]
-
----- 230
-SELECT * FROM c;
-┌Iterate all rows of table "c"
-└Output field names ["c"]
-
----- 231
-SELECT * FROM a;
-┌Iterate all rows of table "a"
-└Output field names ["a"]
-
----- 233
-SELECT * FROM c;
-┌Iterate all rows of table "c"
-└Output field names ["c"]
-
----- 234
-SELECT * FROM a;
-┌Iterate all rows of table "a"
-└Output field names ["a"]
-
----- 235
-SELECT * FROM b;
-┌Iterate all rows of table "b"
-└Output field names ["b"]
-
----- 237
-SELECT * FROM a, b;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["c"]
-│   ┌Iterate all rows of table "b"
-│   └Output field names ["d"]
-└Output field names ["a.c" "b.d"]
-
----- 238
-SELECT 9 * x2.c AS x2, 3 * x1.c AS x1, 1 * x0.c AS x0, 9 * x2.c + 3 * x1.c + x0.c AS y FROM a AS x2, a AS x1, a AS x0 ORDER BY y;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["c"]
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["c"]
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["c"]
-└Output field names ["x2.c" "x1.c" "x0.c"]
-┌Evaluate 9 * x2.c as "x2", 3 * x1.c as "x1", 1 * x0.c as "x0", 9 * x2.c + 3 * x1.c + x0.c as "y",
-└Output field names ["x2" "x1" "x0" "y"]
-┌Order by y,
-└Output field names ["x2" "x1" "x0" "y"]
-
----- 239
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 243
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 244
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 247
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-
----- 248
-SELECT i == 4294967280 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Evaluate i == 4294967280 as "",
-└Output field names [""]
-
----- 249
-SELECT id() == 1 && s == "a" || id() == 2 && s == "�" && s == "�" || id() == 3 && s == "ø" && s == "ø" && s == "ø" || id() == 4 && s == "日" && s == "日" && s == "日" FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Evaluate id() == 1 && s == "a" || id() == 2 && s == "�" && s == "�" || id() == 3 && s == "ø" && s == "ø" && s == "ø" || id() == 4 && s == "日" && s == "日" && s == "日" as "",
-└Output field names [""]
-
----- 250
-SELECT 3.3, 3.3 FROM t;
-┌Iterate all rows of table "t"
-└Output field names []
-┌Evaluate 3.3 as "", 3.3 as "",
-└Output field names ["" ""]
-
----- 252
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 253
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 255
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 257
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 260
-SELECT count() FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 261
-SELECT count() AS y FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate count() as "y",
-└Output field names ["y"]
-
----- 262
-SELECT 3 * count() AS y FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate 3 * count() as "y",
-└Output field names ["y"]
-
----- 263
-SELECT count(LastName) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate count(LastName) as "",
-└Output field names [""]
-
----- 264
-SELECT count(DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate count(DepartmentID) as "",
-└Output field names [""]
-
----- 265
-SELECT count() - count(DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate count() - count(DepartmentID) as "",
-└Output field names [""]
-
----- 266
-SELECT min(LastName), min(DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate min(LastName) as "", min(DepartmentID) as "",
-└Output field names ["" ""]
-
----- 267
-SELECT max(LastName), max(DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate max(LastName) as "", max(DepartmentID) as "",
-└Output field names ["" ""]
-
----- 268
-SELECT sum(LastName), sum(DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate sum(LastName) as "", sum(DepartmentID) as "",
-└Output field names ["" ""]
-
----- 269
-SELECT sum(DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate sum(DepartmentID) as "",
-└Output field names [""]
-
----- 270
-SELECT avg(DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate avg(DepartmentID) as "",
-└Output field names [""]
-
----- 272
-SELECT DepartmentID, sum(DepartmentID) AS s FROM employee GROUP BY DepartmentID ORDER BY s DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by DepartmentID,
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate DepartmentID as "DepartmentID", sum(DepartmentID) as "s",
-└Output field names ["DepartmentID" "s"]
-┌Order descending by s,
-└Output field names ["DepartmentID" "s"]
-
----- 273
-SELECT DepartmentID, count(LastName + string(DepartmentID)) AS y FROM employee GROUP BY DepartmentID ORDER BY y DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by DepartmentID,
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate DepartmentID as "DepartmentID", count(LastName + string(DepartmentID)) as "y",
-└Output field names ["DepartmentID" "y"]
-┌Order descending by y,
-└Output field names ["DepartmentID" "y"]
-
----- 274
-SELECT DepartmentID, sum(2 * DepartmentID) AS s FROM employee GROUP BY DepartmentID ORDER BY s DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by DepartmentID,
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate DepartmentID as "DepartmentID", sum(2 * DepartmentID) as "s",
-└Output field names ["DepartmentID" "s"]
-┌Order descending by s,
-└Output field names ["DepartmentID" "s"]
-
----- 275
-SELECT min(2 * DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate min(2 * DepartmentID) as "",
-└Output field names [""]
-
----- 276
-SELECT max(2 * DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate max(2 * DepartmentID) as "",
-└Output field names [""]
-
----- 277
-SELECT avg(2 * DepartmentID) FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by distinct rows
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate avg(2 * DepartmentID) as "",
-└Output field names [""]
-
----- 278
-SELECT * FROM employee GROUP BY DepartmentID;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by DepartmentID,
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "LastName", DepartmentID as "DepartmentID",
-└Output field names ["LastName" "DepartmentID"]
-
----- 279
-SELECT * FROM employee GROUP BY DepartmentID ORDER BY LastName DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by DepartmentID,
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "LastName", DepartmentID as "DepartmentID",
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 280
-SELECT * FROM employee GROUP BY DepartmentID, LastName ORDER BY LastName DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by DepartmentID, LastName,
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "LastName", DepartmentID as "DepartmentID",
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 281
-SELECT * FROM employee GROUP BY LastName, DepartmentID ORDER BY LastName DESC;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Group by LastName, DepartmentID,
-└Output field names ["LastName" "DepartmentID"]
-┌Evaluate LastName as "LastName", DepartmentID as "DepartmentID",
-└Output field names ["LastName" "DepartmentID"]
-┌Order descending by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 282
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 283
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 284
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 285
-SELECT count() FROM t WHERE n < 2;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Filter on n < 2
-│Possibly useful indices
-│CREATE INDEX xt_n ON t(n);
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 286
-SELECT count() FROM t WHERE n < 1;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Filter on n < 1
-│Possibly useful indices
-│CREATE INDEX xt_n ON t(n);
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 287
-SELECT count() FROM t WHERE n < 0;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Filter on n < 0
-│Possibly useful indices
-│CREATE INDEX xt_n ON t(n);
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 288
-SELECT s + 10 FROM (SELECT sum(n) AS s FROM t WHERE n < 2;);
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Filter on n < 2
-│Possibly useful indices
-│CREATE INDEX xt_n ON t(n);
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate sum(n) as "s",
-└Output field names ["s"]
-┌Evaluate s + 10 as "",
-└Output field names [""]
-
----- 289
-SELECT s + 10 FROM (SELECT sum(n) AS s FROM t WHERE n < 1;);
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Filter on n < 1
-│Possibly useful indices
-│CREATE INDEX xt_n ON t(n);
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate sum(n) as "s",
-└Output field names ["s"]
-┌Evaluate s + 10 as "",
-└Output field names [""]
-
----- 290
-SELECT s + 10 FROM (SELECT sum(n) AS s FROM t WHERE n < 0;);
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Filter on n < 0
-│Possibly useful indices
-│CREATE INDEX xt_n ON t(n);
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate sum(n) as "s",
-└Output field names ["s"]
-┌Evaluate s + 10 as "",
-└Output field names [""]
-
----- 291
-SELECT sum(n) AS s FROM t WHERE n < 2;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Filter on n < 2
-│Possibly useful indices
-│CREATE INDEX xt_n ON t(n);
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate sum(n) as "s",
-└Output field names ["s"]
-
----- 292
-SELECT sum(n) AS s FROM t WHERE n < 1;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Filter on n < 1
-│Possibly useful indices
-│CREATE INDEX xt_n ON t(n);
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate sum(n) as "s",
-└Output field names ["s"]
-
----- 293
-SELECT sum(n) AS s FROM t WHERE n < 0;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Filter on n < 0
-│Possibly useful indices
-│CREATE INDEX xt_n ON t(n);
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate sum(n) as "s",
-└Output field names ["s"]
-
----- 294
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 295
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 296
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["n"]
-┌Group by distinct rows
-└Output field names ["n"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 297
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["S"]
-┌Group by distinct rows
-└Output field names ["S"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 298
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["S"]
-┌Group by distinct rows
-└Output field names ["S"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 299
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 300
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 301
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 302
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 303
-SELECT string(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate string(c) as "",
-└Output field names [""]
-
----- 304
-SELECT string(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate string(c) as "",
-└Output field names [""]
-
----- 305
-SELECT string(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate string(c) as "",
-└Output field names [""]
-
----- 306
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 307
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 308
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 309
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 310
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 311
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 312
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 313
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 314
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 315
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 316
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 317
-SELECT i, string(b) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-┌Evaluate i as "i", string(b) as "",
-└Output field names ["i" ""]
-
----- 318
-SELECT i, string(b) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-┌Evaluate i as "i", string(b) as "",
-└Output field names ["i" ""]
-
----- 319
-SELECT i, string(b) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-┌Evaluate i as "i", string(b) as "",
-└Output field names ["i" ""]
-
----- 320
-SELECT i, string(b) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-┌Evaluate i as "i", string(b) as "",
-└Output field names ["i" ""]
-
----- 321
-SELECT i, string(b) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-┌Evaluate i as "i", string(b) as "",
-└Output field names ["i" ""]
-
----- 322
-SELECT i, string(b) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-┌Evaluate i as "i", string(b) as "",
-└Output field names ["i" ""]
-
----- 323
-SELECT * FROM t ORDER BY true, c, false;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by true, c, false,
-└Output field names ["c"]
-
----- 324
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 325
-SELECT * FROM t ORDER BY 42, c, 24;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 326
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 327
-SELECT * FROM t ORDER BY 42, c, 24;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 328
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 329
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 330
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-
----- 331
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 332
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 334
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 335
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 337
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 338
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 339
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 340
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 341
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 342
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 343
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 344
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 345
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 346
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 347
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 348
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 349
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 350
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 351
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 352
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 353
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 354
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 355
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 356
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 357
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 358
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 359
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 360
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 361
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 362
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 363
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 364
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 365
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 366
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 367
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-
----- 368
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-
----- 369
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-
----- 370
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 371
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 372
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 373
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 374
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 375
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 376
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 377
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 378
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 379
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 380
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 381
-SELECT * FROM t WHERE c > 100 ORDER BY c DESC;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c > 100
-│Possibly useful indices
-│CREATE INDEX xt_c ON t(c);
-└Output field names ["c"]
-┌Order descending by c,
-└Output field names ["c"]
-
----- 382
-SELECT * FROM t WHERE c < 110 ORDER BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c < 110
-│Possibly useful indices
-│CREATE INDEX xt_c ON t(c);
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 383
-SELECT * FROM t WHERE c <= 110 ORDER BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c <= 110
-│Possibly useful indices
-│CREATE INDEX xt_c ON t(c);
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 384
-SELECT * FROM t WHERE c >= 110 ORDER BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c >= 110
-│Possibly useful indices
-│CREATE INDEX xt_c ON t(c);
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 385
-SELECT * FROM t WHERE c != 110 ORDER BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c != 110
-│Possibly useful indices
-│CREATE INDEX xt_c ON t(c);
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 386
-SELECT * FROM t WHERE c == 110 ORDER BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c == 110
-│Possibly useful indices
-│CREATE INDEX xt_c ON t(c);
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 387
-SELECT c + 1000 AS s FROM t ORDER BY s;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate c + 1000 as "s",
-└Output field names ["s"]
-┌Order by s,
-└Output field names ["s"]
-
----- 388
-SELECT 1000 - c AS s FROM t ORDER BY s;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate 1000 - c as "s",
-└Output field names ["s"]
-┌Order by s,
-└Output field names ["s"]
-
----- 389
-SELECT c >> 1 AS s FROM t ORDER BY s;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate c >> 1 as "s",
-└Output field names ["s"]
-┌Order by s,
-└Output field names ["s"]
-
----- 390
-SELECT c << 1 AS s FROM t ORDER BY s;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate c << 1 as "s",
-└Output field names ["s"]
-┌Order by s,
-└Output field names ["s"]
-
----- 391
-SELECT * FROM t WHERE c & 349525 == 70992;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c & 349525 == 70992
-└Output field names ["c"]
-
----- 392
-SELECT * FROM t WHERE c | 349525 == 358389;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c | 349525 == 358389
-└Output field names ["c"]
-
----- 393
-SELECT * FROM t WHERE c &^ 349525 == 8864;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c &^ 349525 == 8864
-└Output field names ["c"]
-
----- 394
-SELECT * FROM t WHERE c ^ 349525 == 287397;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c ^ 349525 == 287397
-└Output field names ["c"]
-
----- 395
-SELECT * FROM t WHERE c % 256 == 240;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c % 256 == 240
-└Output field names ["c"]
-
----- 396
-SELECT * FROM t WHERE c * 16 == 1277696;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on c * 16 == 1277696
-└Output field names ["c"]
-
----- 397
-SELECT * FROM t WHERE ^c == -79857;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on ^c == -79857
-└Output field names ["c"]
-
----- 398
-SELECT * FROM t WHERE +c == 79856;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on +c == 79856
-└Output field names ["c"]
-
----- 399
-SELECT * FROM t WHERE -c == -79856;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Filter on -c == -79856
-└Output field names ["c"]
-
----- 400
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 401
-SELECT c, sum(i) FROM t GROUP BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c" "i"]
-┌Group by c,
-└Output field names ["c" "i"]
-┌Evaluate c as "c", sum(i) as "",
-└Output field names ["c" ""]
-
----- 402
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 403
-SELECT * FROM t ORDER BY 15, c, 16;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 404
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 405
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 406
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 407
-SELECT c / d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c / d as "",
-└Output field names [""]
-
----- 408
-SELECT c % d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c % d as "",
-└Output field names [""]
-
----- 409
-SELECT c == d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c == d as "",
-└Output field names [""]
-
----- 410
-SELECT c == d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c == d as "",
-└Output field names [""]
-
----- 411
-SELECT c != d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c != d as "",
-└Output field names [""]
-
----- 412
-SELECT c != d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c != d as "",
-└Output field names [""]
-
----- 413
-SELECT c < d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c < d as "",
-└Output field names [""]
-
----- 414
-SELECT c < d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c < d as "",
-└Output field names [""]
-
----- 415
-SELECT c <= d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c <= d as "",
-└Output field names [""]
-
----- 416
-SELECT c <= d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c <= d as "",
-└Output field names [""]
-
----- 417
-SELECT c > d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c > d as "",
-└Output field names [""]
-
----- 418
-SELECT c > d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c > d as "",
-└Output field names [""]
-
----- 419
-SELECT c >= d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c >= d as "",
-└Output field names [""]
-
----- 420
-SELECT c >= d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c >= d as "",
-└Output field names [""]
-
----- 421
-SELECT c / d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c / d as "",
-└Output field names [""]
-
----- 422
-SELECT c / d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate c / d as "",
-└Output field names [""]
-
----- 424
-SELECT +c, -d FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate +c as "", -d as "",
-└Output field names ["" ""]
-
----- 425
-SELECT 1 + c, d + 1, 1.5 + c, d + 1.5 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "d"]
-┌Evaluate 1 + c as "", d + 1 as "", 1.5 + c as "", d + 1.5 as "",
-└Output field names ["" "" "" ""]
-
----- 426
-SELECT float64(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate float64(c) as "",
-└Output field names [""]
-
----- 427
-SELECT formatTime(timeIn(c, "UTC"), "2006-01-02 15:04:05.999999999 -0700") FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatTime(timeIn(c, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as "",
-└Output field names [""]
-
----- 428
-SELECT c, string(c) FROM t ORDER BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate c as "c", string(c) as "",
-└Output field names ["c" ""]
-┌Order by c,
-└Output field names ["c" ""]
-
----- 429
-SELECT since(c) > duration("24h0m0s") FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate since(c) > duration("24h0m0s") as "",
-└Output field names [""]
-
----- 430
-SELECT since(c) >= duration("24h0m0s") FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate since(c) >= duration("24h0m0s") as "",
-└Output field names [""]
-
----- 431
-SELECT a > a, a > b, a > c, b > a, b > b, b > c, c > a, c > b, c > c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a > a as "", a > b as "", a > c as "", b > a as "", b > b as "", b > c as "", c > a as "", c > b as "", c > c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 432
-SELECT a < a, a < b, a < c, b < a, b < b, b < c, c < a, c < b, c < c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a < a as "", a < b as "", a < c as "", b < a as "", b < b as "", b < c as "", c < a as "", c < b as "", c < c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 433
-SELECT a <= a, a <= b, a <= c, b <= a, b <= b, b <= c, c <= a, c <= b, c <= c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a <= a as "", a <= b as "", a <= c as "", b <= a as "", b <= b as "", b <= c as "", c <= a as "", c <= b as "", c <= c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 434
-SELECT a >= a, a >= b, a >= c, b >= a, b >= b, b >= c, c >= a, c >= b, c >= c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a >= a as "", a >= b as "", a >= c as "", b >= a as "", b >= b as "", b >= c as "", c >= a as "", c >= b as "", c >= c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 435
-SELECT a != a, a != b, a != c, b != a, b != b, b != c, c != a, c != b, c != c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a != a as "", a != b as "", a != c as "", b != a as "", b != b as "", b != c as "", c != a as "", c != b as "", c != c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 436
-SELECT a == a, a == b, a == c, b == a, b == b, b == c, c == a, c == b, c == c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a == a as "", a == b as "", a == c as "", b == a as "", b == b as "", b == c as "", c == a as "", c == b as "", c == c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 437
-SELECT b + c, a + c, a + b, a + b + c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate b + c as "", a + c as "", a + b as "", a + b + c as "",
-└Output field names ["" "" "" ""]
-
----- 438
-SELECT b - c, a - c, a - b, a - b - c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate b - c as "", a - c as "", a - b as "", a - b - c as "",
-└Output field names ["" "" "" ""]
-
----- 439
-SELECT a >> 1, b >> 1, c >> 1 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a >> 1 as "", b >> 1 as "", c >> 1 as "",
-└Output field names ["" "" ""]
-
----- 440
-SELECT a << 1, b << 1, c << 1 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a << 1 as "", b << 1 as "", c << 1 as "",
-└Output field names ["" "" ""]
-
----- 441
-SELECT a & 255 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate a & 255 as "",
-└Output field names [""]
-
----- 442
-SELECT a | 256 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate a | 256 as "",
-└Output field names [""]
-
----- 443
-SELECT a &^ 3376 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate a &^ 3376 as "",
-└Output field names [""]
-
----- 444
-SELECT a % duration("2h0m0s"), a % duration("1m0s") FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate a % duration("2h0m0s") as "", a % duration("1m0s") as "",
-└Output field names ["" ""]
-
----- 445
-SELECT a / 2, b / 2, c / 2 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a / 2 as "", b / 2 as "", c / 2 as "",
-└Output field names ["" "" ""]
-
----- 446
-SELECT a * 2, 2 * b, c * 2 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a * 2 as "", 2 * b as "", c * 2 as "",
-└Output field names ["" "" ""]
-
----- 447
-SELECT ^a, ^b, ^c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate ^a as "", ^b as "", ^c as "",
-└Output field names ["" "" ""]
-
----- 448
-SELECT +a, +b, +c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate +a as "", +b as "", +c as "",
-└Output field names ["" "" ""]
-
----- 449
-SELECT -a, -b, -c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate -a as "", -b as "", -c as "",
-└Output field names ["" "" ""]
-
----- 450
-SELECT a > a, a > b, a > c, b > a, b > b, b > c, c > a, c > b, c > c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a > a as "", a > b as "", a > c as "", b > a as "", b > b as "", b > c as "", c > a as "", c > b as "", c > c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 451
-SELECT a < a, a < b, a < c, b < a, b < b, b < c, c < a, c < b, c < c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a < a as "", a < b as "", a < c as "", b < a as "", b < b as "", b < c as "", c < a as "", c < b as "", c < c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 452
-SELECT a <= a, a <= b, a <= c, b <= a, b <= b, b <= c, c <= a, c <= b, c <= c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a <= a as "", a <= b as "", a <= c as "", b <= a as "", b <= b as "", b <= c as "", c <= a as "", c <= b as "", c <= c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 453
-SELECT a >= a, a >= b, a >= c, b >= a, b >= b, b >= c, c >= a, c >= b, c >= c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a >= a as "", a >= b as "", a >= c as "", b >= a as "", b >= b as "", b >= c as "", c >= a as "", c >= b as "", c >= c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 454
-SELECT a != a, a != b, a != c, b != a, b != b, b != c, c != a, c != b, c != c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a != a as "", a != b as "", a != c as "", b != a as "", b != b as "", b != c as "", c != a as "", c != b as "", c != c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 455
-SELECT a == a, a == b, a == c, b == a, b == b, b == c, c == a, c == b, c == c FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate a == a as "", a == b as "", a == c as "", b == a as "", b == b as "", b == c as "", c == a as "", c == b as "", c == c as "",
-└Output field names ["" "" "" "" "" "" "" "" ""]
-
----- 456
-SELECT formatTime(timeIn(a + b, "UTC"), "2006-01-02 15:04:05.999999999 -0700") FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b"]
-┌Evaluate formatTime(timeIn(a + b, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as "",
-└Output field names [""]
-
----- 457
-SELECT formatTime(timeIn(b + a, "UTC"), "2006-01-02 15:04:05.999999999 -0700") FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b"]
-┌Evaluate formatTime(timeIn(b + a, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as "",
-└Output field names [""]
-
----- 458
-SELECT a + a FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b"]
-┌Evaluate a + a as "",
-└Output field names [""]
-
----- 459
-SELECT a - b FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b"]
-┌Evaluate a - b as "",
-└Output field names [""]
-
----- 460
-SELECT formatTime(timeIn(a - b, "UTC"), "2006-01-02 15:04:05.999999999 -0700") FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b"]
-┌Evaluate formatTime(timeIn(a - b, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as "",
-└Output field names [""]
-
----- 461
-SELECT b - a FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b"]
-┌Evaluate b - a as "",
-└Output field names [""]
-
----- 462
-SELECT hours(a), minutes(a), seconds(a), nanoseconds(a) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate hours(a) as "", minutes(a) as "", seconds(a) as "", nanoseconds(a) as "",
-└Output field names ["" "" "" ""]
-
----- 463
-SELECT a < now(), a < now(), a >= now(), a >= now() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate a < now() as "", a < now() as "", a >= now() as "", a >= now() as "",
-└Output field names ["" "" "" ""]
-
----- 464
-SELECT formatTime(timeIn(a, "UTC"), "2006-01-02 15:04:05.999999999 -0700") AS a FROM t ORDER BY a;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate formatTime(timeIn(a, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as "a",
-└Output field names ["a"]
-┌Order by a,
-└Output field names ["a"]
-
----- 465
-SELECT hour(timeIn(a, "UTC")) AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate hour(timeIn(a, "UTC")) as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 466
-SELECT minute(a) AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate minute(a) as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 467
-SELECT second(a) AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate second(a) as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 468
-SELECT nanosecond(a) AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate nanosecond(a) as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 469
-SELECT year(a) AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate year(a) as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 470
-SELECT day(a) AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate day(a) as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 471
-SELECT month(a) AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate month(a) as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 472
-SELECT weekday(a) AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate weekday(a) as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 473
-SELECT yearDay(a) AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate yearDay(a) as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 474
-SELECT timeIn(a, ""), timeIn(a, "UTC") AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate timeIn(a, "") as "", timeIn(a, "UTC") as "y",
-└Output field names ["" "y"]
-┌Order by y,
-└Output field names ["" "y"]
-
----- 475
-SELECT formatTime(timeIn(a, "UTC"), "Jan 2, 2006 at 3:04pm (UTC)") AS y FROM t ORDER BY y;
-┌Iterate all rows of table "t"
-└Output field names ["a"]
-┌Evaluate formatTime(timeIn(a, "UTC"), "Jan 2, 2006 at 3:04pm (UTC)") as "y",
-└Output field names ["y"]
-┌Order by y,
-└Output field names ["y"]
-
----- 478
-SELECT a, b, formatTime(timeIn(t, "UTC"), "2006-01-02 15:04:05.999999999 -0700") AS t FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "t"]
-┌Evaluate a as "a", b as "b", formatTime(timeIn(t, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as "t",
-└Output field names ["a" "b" "t"]
-
----- 479
-SELECT a, b, formatTime(timeIn(t, "UTC"), "2006-01-02 15:04:05.999999999 -0700") AS t FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "t"]
-┌Evaluate a as "a", b as "b", formatTime(timeIn(t, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as "t",
-└Output field names ["a" "b" "t"]
-
----- 480
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "d"]
-
----- 481
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "d"]
-
----- 482
-SELECT * FROM t ORDER BY real(c);
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by real(c),
-└Output field names ["c"]
-
----- 483
-SELECT id() AS i, contains(42, substr) FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["s" "substr"]
-┌Evaluate id() as "i", contains(42, substr) as "",
-└Output field names ["i" ""]
-┌Order by i,
-└Output field names ["i" ""]
-
----- 484
-SELECT id() AS i, contains(s, true) FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["s" "substr"]
-┌Evaluate id() as "i", contains(s, true) as "",
-└Output field names ["i" ""]
-┌Order by i,
-└Output field names ["i" ""]
-
----- 485
-SELECT id() AS i, contains(s, substr) FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["s" "substr"]
-┌Evaluate id() as "i", contains(s, substr) as "",
-└Output field names ["i" ""]
-┌Order by i,
-└Output field names ["i" ""]
-
----- 486
-SELECT id() AS i, hasPrefix(42, prefix) FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["s" "prefix"]
-┌Evaluate id() as "i", hasPrefix(42, prefix) as "",
-└Output field names ["i" ""]
-┌Order by i,
-└Output field names ["i" ""]
-
----- 487
-SELECT id() AS i, hasPrefix(s, false) FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["s" "prefix"]
-┌Evaluate id() as "i", hasPrefix(s, false) as "",
-└Output field names ["i" ""]
-┌Order by i,
-└Output field names ["i" ""]
-
----- 488
-SELECT id() AS i, hasPrefix(s, prefix) FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["s" "prefix"]
-┌Evaluate id() as "i", hasPrefix(s, prefix) as "",
-└Output field names ["i" ""]
-┌Order by i,
-└Output field names ["i" ""]
-
----- 489
-SELECT id() AS i, hasSuffix(42, suffix) FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["s" "suffix"]
-┌Evaluate id() as "i", hasSuffix(42, suffix) as "",
-└Output field names ["i" ""]
-┌Order by i,
-└Output field names ["i" ""]
-
----- 490
-SELECT id() AS i, hasSuffix(s, true) FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["s" "suffix"]
-┌Evaluate id() as "i", hasSuffix(s, true) as "",
-└Output field names ["i" ""]
-┌Order by i,
-└Output field names ["i" ""]
-
----- 491
-SELECT id() AS i, hasSuffix(s, suffix) FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["s" "suffix"]
-┌Evaluate id() as "i", hasSuffix(s, suffix) as "",
-└Output field names ["i" ""]
-┌Order by i,
-└Output field names ["i" ""]
-
----- 493
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 495
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 496
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-
----- 497
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 498
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 499
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-
----- 500
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 501
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 502
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "s"]
-
----- 503
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "s"]
-
----- 504
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c" "s"]
-
----- 508
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 509
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 512
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 513
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 514
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 515
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 516
-SELECT * FROM t ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by id(),
-└Output field names ["c"]
-
----- 517
-SELECT * FROM t ORDER BY c;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Order by c,
-└Output field names ["c"]
-
----- 518
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 526
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 528
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 529
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 530
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 531
-SELECT * FROM t ORDER BY s;
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Order by s,
-└Output field names ["s"]
-
----- 532
-SELECT * FROM t ORDER BY s;
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Order by s,
-└Output field names ["s"]
-
----- 533
-SELECT * FROM t ORDER BY s;
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Order by s,
-└Output field names ["s"]
-
----- 534
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 535
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 536
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 537
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-
----- 538
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 539
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-
----- 540
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 541
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 542
-SELECT * FROM t ORDER BY s;
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Order by s,
-└Output field names ["s"]
-
----- 543
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 545
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 546
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 547
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-
----- 548
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-┌Order by i,
-└Output field names ["i" "s"]
-
----- 549
-SELECT * FROM t ORDER BY s;
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-┌Order by s,
-└Output field names ["i" "s"]
-
----- 550
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 551
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 552
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 553
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 554
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 555
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 556
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 557
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 558
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 559
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 560
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 561
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 562
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 563
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 564
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 565
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 566
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 569
-SELECT len(string(b)) AS n FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["b"]
-┌Evaluate len(string(b)) as "n",
-└Output field names ["n"]
-
----- 570
-SELECT len(string(b)) AS n FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["b"]
-┌Evaluate len(string(b)) as "n",
-└Output field names ["n"]
-
----- 571
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-
----- 572
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-
----- 574
-SELECT * FROM t AS u;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 577
-SELECT i FROM t AS u;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 578
-SELECT i FROM t WHERE b ORDER BY i;
-┌Iterate all rows of table "t" using index "x" where b
-└Output field names ["i" "b"]
-┌Evaluate i as "i",
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 580
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 581
-SELECT i FROM t WHERE i < 30;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i < 30
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i"]
-
----- 582
-SELECT i FROM t WHERE i < 30;
-┌Iterate all rows of table "t" using index "x" where i < 30
-└Output field names ["i"]
-
----- 583
-SELECT * FROM t WHERE i <= 30;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i <= 30
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i"]
-
----- 584
-SELECT * FROM t WHERE i <= 30;
-┌Iterate all rows of table "t" using index "x" where i <= 30
-└Output field names ["i"]
-
----- 585
-SELECT i FROM t WHERE i == 30;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i == 30
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i"]
-
----- 586
-SELECT i FROM t WHERE i == 30;
-┌Iterate all rows of table "t" using index "x" where i == 30
-└Output field names ["i"]
-
----- 587
-SELECT * FROM t WHERE i >= 30;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i >= 30
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i"]
-
----- 588
-SELECT * FROM t WHERE i >= 30;
-┌Iterate all rows of table "t" using index "x" where i >= 30
-└Output field names ["i"]
-
----- 589
-SELECT * FROM t WHERE i > 30;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i > 30
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i"]
-
----- 590
-SELECT * FROM t WHERE i > 30;
-┌Iterate all rows of table "t" using index "x" where i > 30
-└Output field names ["i"]
-
----- 591
-SELECT i FROM t WHERE !b ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-┌Filter on !b
-└Output field names ["i" "b"]
-┌Evaluate i as "i",
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 592
-SELECT i FROM t WHERE !b ORDER BY i;
-┌Iterate all rows of table "t" using index "x" where !b
-└Output field names ["i" "b"]
-┌Evaluate i as "i",
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 593
-SELECT i FROM t WHERE i < $1;
-┌Iterate all rows of table "t" using index "x" where i < 30
-└Output field names ["i"]
-
----- 594
-SELECT * FROM t WHERE i <= $1;
-┌Iterate all rows of table "t" using index "x" where i <= 30
-└Output field names ["i"]
-
----- 595
-SELECT i FROM t WHERE i == $1;
-┌Iterate all rows of table "t" using index "x" where i == 30
-└Output field names ["i"]
-
----- 596
-SELECT * FROM t WHERE i >= $1;
-┌Iterate all rows of table "t" using index "x" where i >= 30
-└Output field names ["i"]
-
----- 597
-SELECT * FROM t WHERE i > $1;
-┌Iterate all rows of table "t" using index "x" where i > 30
-└Output field names ["i"]
-
----- 598
-SELECT i FROM t WHERE i < $1;
-┌Iterate all rows of table "t" using index "x" where i < 30
-└Output field names ["i"]
-
----- 599
-SELECT * FROM t WHERE i <= $1;
-┌Iterate all rows of table "t" using index "x" where i <= 30
-└Output field names ["i"]
-
----- 600
-SELECT i FROM t WHERE i == $1;
-┌Iterate all rows of table "t" using index "x" where i == 30
-└Output field names ["i"]
-
----- 601
-SELECT * FROM t WHERE i >= $1;
-┌Iterate all rows of table "t" using index "x" where i >= 30
-└Output field names ["i"]
-
----- 602
-SELECT * FROM t WHERE i > $1;
-┌Iterate all rows of table "t" using index "x" where i > 30
-└Output field names ["i"]
-
----- 603
-SELECT i FROM t WHERE i < 30;
-┌Iterate all rows of table "t" using index "x" where i < 30
-└Output field names ["i"]
-
----- 604
-SELECT * FROM t WHERE i <= 30;
-┌Iterate all rows of table "t" using index "x" where i <= 30
-└Output field names ["i"]
-
----- 605
-SELECT i FROM t WHERE i == 30;
-┌Iterate all rows of table "t" using index "x" where i == 30
-└Output field names ["i"]
-
----- 606
-SELECT * FROM t WHERE i >= 30;
-┌Iterate all rows of table "t" using index "x" where i >= 30
-└Output field names ["i"]
-
----- 607
-SELECT * FROM t WHERE i > 30;
-┌Iterate all rows of table "t" using index "x" where i > 30
-└Output field names ["i"]
-
----- 608
-SELECT * FROM t WHERE i < 30;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i < 30
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i"]
-
----- 609
-SELECT * FROM t WHERE i < 30;
-┌Iterate all rows of table "t" using index "x" where i < 30
-└Output field names ["i"]
-
----- 624
-SELECT * FROM __Table;
-┌Iterate all rows of table "__Table"
-└Output field names ["Name" "Schema"]
-
----- 625
-SELECT * FROM __Table ORDER BY Name;
-┌Iterate all rows of table "__Table"
-└Output field names ["Name" "Schema"]
-┌Order by Name,
-└Output field names ["Name" "Schema"]
-
----- 626
-SELECT * FROM __Table ORDER BY Name;
-┌Iterate all rows of table "__Table"
-└Output field names ["Name" "Schema"]
-┌Order by Name,
-└Output field names ["Name" "Schema"]
-
----- 627
-SELECT * FROM __Column;
-┌Iterate all rows of table "__Column"
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-
----- 628
-SELECT * FROM __Column ORDER BY TableName, Name;
-┌Iterate all rows of table "__Column"
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-┌Order by TableName, Name,
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-
----- 629
-SELECT * FROM __Column ORDER BY TableName, Ordinal;
-┌Iterate all rows of table "__Column"
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-┌Order by TableName, Ordinal,
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-
----- 630
-SELECT * FROM __Index;
-┌Iterate all rows of table "__Index"
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-
----- 631
-SELECT * FROM __Index ORDER BY TableName, Name;
-┌Iterate all rows of table "__Index"
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-┌Order by TableName, Name,
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-
----- 632
-SELECT * FROM __Index WHERE !hasPrefix(TableName, "__") ORDER BY TableName, ColumnName, Name;
-┌Iterate all rows of table "__Index"
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-┌Order by TableName, ColumnName, Name,
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-
----- 633
-SELECT * FROM __Index WHERE !hasPrefix(TableName, "__") ORDER BY TableName, ColumnName, Name;
-┌Iterate all rows of table "__Index"
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-┌Order by TableName, ColumnName, Name,
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-
----- 634
-SELECT * FROM __Index WHERE !hasPrefix(TableName, "__") ORDER BY TableName, ColumnName, Name;
-┌Iterate all rows of table "__Index"
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-┌Order by TableName, ColumnName, Name,
-└Output field names ["TableName" "ColumnName" "Name" "IsUnique"]
-
----- 635
-SELECT c.TableName, c.Ordinal, c.Name FROM __Table AS t, __Column AS c WHERE t.Name == "u" && t.Name == c.TableName ORDER BY c.Ordinal;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "__Table"
-│   └Output field names ["Name" "Schema"]
-│   ┌Iterate all rows of table "__Column"
-│   └Output field names ["TableName" "Ordinal" "Name" "Type"]
-└Output field names ["t.Name" "t.Schema" "c.TableName" "c.Ordinal" "c.Name" "c.Type"]
-┌Filter on t.Name == "u" && t.Name == c.TableName
-└Output field names ["t.Name" "t.Schema" "c.TableName" "c.Ordinal" "c.Name" "c.Type"]
-┌Evaluate c.TableName as "c.TableName", c.Ordinal as "c.Ordinal", c.Name as "c.Name",
-└Output field names ["c.TableName" "c.Ordinal" "c.Name"]
-┌Order by c.Ordinal,
-└Output field names ["c.TableName" "c.Ordinal" "c.Name"]
-
----- 636
-SELECT * FROM t WHERE s == "test";
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-┌Filter on s == "test"
-│Possibly useful indices
-│CREATE INDEX xt_s ON t(s);
-└Output field names ["i" "s"]
-
----- 637
-SELECT * FROM t WHERE s == "test";
-┌Iterate all rows of table "t" using index "idx_s" where s == "test"
-└Output field names ["i" "s"]
-
----- 638
-SELECT * FROM __Table ORDER BY Name;
-┌Iterate all rows of table "__Table"
-└Output field names ["Name" "Schema"]
-┌Order by Name,
-└Output field names ["Name" "Schema"]
-
----- 639
-SELECT * FROM __Table WHERE Name == "artist";
-┌Iterate all rows of table "__Table"
-└Output field names ["Name" "Schema"]
-┌Filter on Name == "artist"
-└Output field names ["Name" "Schema"]
-
----- 640
-SELECT * FROM __Column ORDER BY TableName, Ordinal;
-┌Iterate all rows of table "__Column"
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-┌Order by TableName, Ordinal,
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-
----- 641
-SELECT * FROM __Column WHERE TableName == "artist" ORDER BY TableName, Ordinal;
-┌Iterate all rows of table "__Column"
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-┌Filter on TableName == "artist"
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-┌Order by TableName, Ordinal,
-└Output field names ["TableName" "Ordinal" "Name" "Type"]
-
----- 642
-SELECT * FROM t, u WHERE u.y < 60 && t.k < 7;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "t"
-│   └Output field names ["i" "j" "k"]
-│   ┌Iterate all rows of table "u"
-│   └Output field names ["x" "y" "z"]
-└Output field names ["t.i" "t.j" "t.k" "u.x" "u.y" "u.z"]
-┌Filter on u.y < 60 && t.k < 7
-│Possibly useful indices
-│CREATE INDEX xu_y ON u(y);
-│CREATE INDEX xt_k ON t(k);
-└Output field names ["t.i" "t.j" "t.k" "u.x" "u.y" "u.z"]
-
----- 643
-SELECT * FROM t, u WHERE u.y < 60 && t.k < 7;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "t" using index "xk" where k < 7
-│   └Output field names ["i" "j" "k"]
-│   ┌Iterate all rows of table "u"
-│   └Output field names ["x" "y" "z"]
-└Output field names ["t.i" "t.j" "t.k" "u.x" "u.y" "u.z"]
-┌Filter on u.y < 60
-│Possibly useful indices
-│CREATE INDEX xu_y ON u(y);
-└Output field names ["t.i" "t.j" "t.k" "u.x" "u.y" "u.z"]
-
----- 644
-SELECT * FROM t, u WHERE u.y < 60 && t.k < 7;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "t"
-│   └Output field names ["i" "j" "k"]
-│   ┌Iterate all rows of table "u" using index "xy" where y < 60
-│   └Output field names ["x" "y" "z"]
-└Output field names ["t.i" "t.j" "t.k" "u.x" "u.y" "u.z"]
-┌Filter on t.k < 7
-│Possibly useful indices
-│CREATE INDEX xt_k ON t(k);
-└Output field names ["t.i" "t.j" "t.k" "u.x" "u.y" "u.z"]
-
----- 645
-SELECT * FROM t, u WHERE u.y < 60 && t.k < 7;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "t" using index "xk" where k < 7
-│   └Output field names ["i" "j" "k"]
-│   ┌Iterate all rows of table "u" using index "xy" where y < 60
-│   └Output field names ["x" "y" "z"]
-└Output field names ["t.i" "t.j" "t.k" "u.x" "u.y" "u.z"]
-
----- 646
-SELECT * FROM t OFFSET -1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Skip first -1 records
-└Output field names ["i"]
-
----- 647
-SELECT * FROM t OFFSET 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Skip first 0 records
-└Output field names ["i"]
-
----- 648
-SELECT * FROM t OFFSET 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Skip first 1 records
-└Output field names ["i"]
-
----- 649
-SELECT * FROM t ORDER BY id() OFFSET -1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first -1 records
-└Output field names ["i"]
-
----- 650
-SELECT * FROM t ORDER BY id() OFFSET 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 0 records
-└Output field names ["i"]
-
----- 651
-SELECT * FROM t ORDER BY id() OFFSET 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 1 records
-└Output field names ["i"]
-
----- 652
-SELECT * FROM t ORDER BY id() OFFSET 2;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 2 records
-└Output field names ["i"]
-
----- 653
-SELECT * FROM t ORDER BY id() LIMIT -1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Pass first -1 records
-└Output field names [i]
-
----- 654
-SELECT * FROM t ORDER BY id() LIMIT 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Pass first 0 records
-└Output field names [i]
-
----- 655
-SELECT * FROM t ORDER BY id() LIMIT 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Pass first 1 records
-└Output field names [i]
-
----- 656
-SELECT * FROM t ORDER BY id() LIMIT -1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Pass first -1 records
-└Output field names [i]
-
----- 657
-SELECT * FROM t ORDER BY id() LIMIT 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Pass first 0 records
-└Output field names [i]
-
----- 658
-SELECT * FROM t ORDER BY id() LIMIT 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Pass first 1 records
-└Output field names [i]
-
----- 659
-SELECT * FROM t ORDER BY id() LIMIT 2;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Pass first 2 records
-└Output field names [i]
-
----- 660
-SELECT * FROM t ORDER BY id() LIMIT 3;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Pass first 3 records
-└Output field names [i]
-
----- 661
-SELECT * FROM t ORDER BY id() LIMIT 0 OFFSET 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 0 records
-└Output field names ["i"]
-┌Pass first 0 records
-└Output field names [i]
-
----- 662
-SELECT * FROM t ORDER BY id() LIMIT 0 OFFSET 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 1 records
-└Output field names ["i"]
-┌Pass first 0 records
-└Output field names [i]
-
----- 663
-SELECT * FROM t ORDER BY id() LIMIT 0 OFFSET 2;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 2 records
-└Output field names ["i"]
-┌Pass first 0 records
-└Output field names [i]
-
----- 664
-SELECT * FROM t ORDER BY id() LIMIT 0 OFFSET 3;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 3 records
-└Output field names ["i"]
-┌Pass first 0 records
-└Output field names [i]
-
----- 665
-SELECT * FROM t ORDER BY id() LIMIT 1 OFFSET 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 0 records
-└Output field names ["i"]
-┌Pass first 1 records
-└Output field names [i]
-
----- 666
-SELECT * FROM t ORDER BY id() LIMIT 1 OFFSET 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 1 records
-└Output field names ["i"]
-┌Pass first 1 records
-└Output field names [i]
-
----- 667
-SELECT * FROM t ORDER BY id() LIMIT 1 OFFSET 2;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 2 records
-└Output field names ["i"]
-┌Pass first 1 records
-└Output field names [i]
-
----- 668
-SELECT * FROM t ORDER BY id() LIMIT 1 OFFSET 3;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 3 records
-└Output field names ["i"]
-┌Pass first 1 records
-└Output field names [i]
-
----- 669
-SELECT * FROM t ORDER BY id() LIMIT 2 OFFSET 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 0 records
-└Output field names ["i"]
-┌Pass first 2 records
-└Output field names [i]
-
----- 670
-SELECT * FROM t ORDER BY id() LIMIT 2 OFFSET 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 1 records
-└Output field names ["i"]
-┌Pass first 2 records
-└Output field names [i]
-
----- 671
-SELECT * FROM t ORDER BY id() LIMIT 2 OFFSET 2;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 2 records
-└Output field names ["i"]
-┌Pass first 2 records
-└Output field names [i]
-
----- 672
-SELECT * FROM t ORDER BY id() LIMIT 2 OFFSET 3;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 3 records
-└Output field names ["i"]
-┌Pass first 2 records
-└Output field names [i]
-
----- 673
-SELECT * FROM t ORDER BY id() LIMIT 3 OFFSET 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 0 records
-└Output field names ["i"]
-┌Pass first 3 records
-└Output field names [i]
-
----- 674
-SELECT * FROM t ORDER BY id() LIMIT 3 OFFSET 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 1 records
-└Output field names ["i"]
-┌Pass first 3 records
-└Output field names [i]
-
----- 675
-SELECT * FROM t ORDER BY id() LIMIT 3 OFFSET 2;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 2 records
-└Output field names ["i"]
-┌Pass first 3 records
-└Output field names [i]
-
----- 676
-SELECT * FROM t ORDER BY id() LIMIT 3 OFFSET 3;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-┌Skip first 3 records
-└Output field names ["i"]
-┌Pass first 3 records
-└Output field names [i]
-
----- 677
-SELECT * FROM (SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a, (SELECT * FROM u ORDER BY i;) AS b ORDER BY a.i, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of virtual table "a"
-│   │   ┌Iterate all rows of table "t"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   │   ┌Skip first 1 records
-│   │   └Output field names ["i"]
-│   │   ┌Pass first 2 records
-│   │   └Output field names [i]
-│   └Output field names ["i"]
-│   ┌Iterate all rows of virtual table "b"
-│   │   ┌Iterate all rows of table "u"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   └Output field names ["i"]
-└Output field names ["a.i" "b.i"]
-┌Order by a.i, b.i,
-└Output field names ["a.i" "b.i"]
-
----- 678
-SELECT * FROM (SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a, (SELECT * FROM u ORDER BY i OFFSET 1;) AS b ORDER BY a.i, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of virtual table "a"
-│   │   ┌Iterate all rows of table "t"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   │   ┌Skip first 1 records
-│   │   └Output field names ["i"]
-│   │   ┌Pass first 2 records
-│   │   └Output field names [i]
-│   └Output field names ["i"]
-│   ┌Iterate all rows of virtual table "b"
-│   │   ┌Iterate all rows of table "u"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   │   ┌Skip first 1 records
-│   │   └Output field names ["i"]
-│   └Output field names ["i"]
-└Output field names ["a.i" "b.i"]
-┌Order by a.i, b.i,
-└Output field names ["a.i" "b.i"]
-
----- 679
-SELECT * FROM (SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a, (SELECT * FROM u ORDER BY i LIMIT 1;) AS b ORDER BY a.i, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of virtual table "a"
-│   │   ┌Iterate all rows of table "t"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   │   ┌Skip first 1 records
-│   │   └Output field names ["i"]
-│   │   ┌Pass first 2 records
-│   │   └Output field names [i]
-│   └Output field names ["i"]
-│   ┌Iterate all rows of virtual table "b"
-│   │   ┌Iterate all rows of table "u"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   │   ┌Pass first 1 records
-│   │   └Output field names [i]
-│   └Output field names ["i"]
-└Output field names ["a.i" "b.i"]
-┌Order by a.i, b.i,
-└Output field names ["a.i" "b.i"]
-
----- 680
-SELECT * FROM (SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a, (SELECT * FROM u ORDER BY i LIMIT 1 OFFSET 1;) AS b ORDER BY a.i, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of virtual table "a"
-│   │   ┌Iterate all rows of table "t"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   │   ┌Skip first 1 records
-│   │   └Output field names ["i"]
-│   │   ┌Pass first 2 records
-│   │   └Output field names [i]
-│   └Output field names ["i"]
-│   ┌Iterate all rows of virtual table "b"
-│   │   ┌Iterate all rows of table "u"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   │   ┌Skip first 1 records
-│   │   └Output field names ["i"]
-│   │   ┌Pass first 1 records
-│   │   └Output field names [i]
-│   └Output field names ["i"]
-└Output field names ["a.i" "b.i"]
-┌Order by a.i, b.i,
-└Output field names ["a.i" "b.i"]
-
----- 681
-SELECT * FROM (SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a, (SELECT * FROM u ORDER BY i LIMIT 1 OFFSET 1;) AS b ORDER BY a.i, b.i LIMIT 1;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of virtual table "a"
-│   │   ┌Iterate all rows of table "t"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   │   ┌Skip first 1 records
-│   │   └Output field names ["i"]
-│   │   ┌Pass first 2 records
-│   │   └Output field names [i]
-│   └Output field names ["i"]
-│   ┌Iterate all rows of virtual table "b"
-│   │   ┌Iterate all rows of table "u"
-│   │   └Output field names ["i"]
-│   │   ┌Order by i,
-│   │   └Output field names ["i"]
-│   │   ┌Skip first 1 records
-│   │   └Output field names ["i"]
-│   │   ┌Pass first 1 records
-│   │   └Output field names [i]
-│   └Output field names ["i"]
-└Output field names ["a.i" "b.i"]
-┌Order by a.i, b.i,
-└Output field names ["a.i" "b.i"]
-┌Pass first 1 records
-└Output field names [a.i b.i]
-
----- 682
-SELECT count(1) AS total FROM fibonacci WHERE input >= 5 && input <= 7 || input == 3;
-┌Iterate all rows of table "fibonacci"
-└Output field names ["input" "output"]
-┌Filter on input >= 5 && input <= 7 || input == 3
-└Output field names ["input" "output"]
-┌Group by distinct rows
-└Output field names ["input" "output"]
-┌Evaluate count(1) as "total",
-└Output field names ["total"]
-
----- 683
-SELECT * FROM fibonacci WHERE input >= 5 && input <= 7 || input == 3 ORDER BY input DESC LIMIT 2 OFFSET 1;
-┌Iterate all rows of table "fibonacci"
-└Output field names ["input" "output"]
-┌Filter on input >= 5 && input <= 7 || input == 3
-└Output field names ["input" "output"]
-┌Order descending by input,
-└Output field names ["input" "output"]
-┌Skip first 1 records
-└Output field names ["input" "output"]
-┌Pass first 2 records
-└Output field names [input output]
-
----- 684
-SELECT * FROM fibonacci ORDER BY input;
-┌Iterate all rows of table "fibonacci"
-└Output field names ["input" "output"]
-┌Order by input,
-└Output field names ["input" "output"]
-
----- 685
-SELECT * FROM fibonacci ORDER BY input;
-┌Iterate all rows of table "fibonacci"
-└Output field names ["input" "output"]
-┌Order by input,
-└Output field names ["input" "output"]
-
----- 686
-SELECT count() AS total FROM fibonacci WHERE input >= 5 && input <= 7 || input == 3;
-┌Iterate all rows of table "fibonacci"
-└Output field names ["input" "output"]
-┌Filter on input >= 5 && input <= 7 || input == 3
-└Output field names ["input" "output"]
-┌Group by distinct rows
-└Output field names ["input" "output"]
-┌Evaluate count() as "total",
-└Output field names ["total"]
-
----- 687
-SELECT count() AS total FROM fibonacci WHERE input >= 5 && input <= 7 || input == 3;
-┌Iterate all rows of table "fibonacci"
-└Output field names ["input" "output"]
-┌Filter on input >= 5 && input <= 7 || input == 3
-└Output field names ["input" "output"]
-┌Group by distinct rows
-└Output field names ["input" "output"]
-┌Evaluate count() as "total",
-└Output field names ["total"]
-
----- 688
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 689
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 690
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 691
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 692
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 693
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 694
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 695
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 696
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 697
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 698
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 699
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 700
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 701
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 702
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 703
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 704
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 705
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 706
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 707
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 708
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 709
-SELECT * FROM t ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 711
-SELECT s FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-┌Evaluate s as "s",
-└Output field names ["s"]
-
----- 712
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 714
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 715
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 716
-SELECT s FROM t WHERE s != "z";
-┌Iterate all rows of table "t" using index "x" where s != "z"
-└Output field names ["i" "s"]
-┌Evaluate s as "s",
-└Output field names ["s"]
-
----- 717
-SELECT s FROM t WHERE s < "z";
-┌Iterate all rows of table "t" using index "x" where s < "z"
-└Output field names ["i" "s"]
-┌Evaluate s as "s",
-└Output field names ["s"]
-
----- 718
-SELECT s FROM t WHERE s < "z";
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-┌Filter on s < "z"
-│Possibly useful indices
-│CREATE INDEX xt_s ON t(s);
-└Output field names ["i" "s"]
-┌Evaluate s as "s",
-└Output field names ["s"]
-
----- 721
-SELECT s FROM t WHERE s < "z";
-┌Iterate all rows of table "t"
-└Output field names ["i" "s"]
-┌Filter on s < "z"
-│Possibly useful indices
-│CREATE INDEX xt_s ON t(s);
-└Output field names ["i" "s"]
-┌Evaluate s as "s",
-└Output field names ["s"]
-
----- 722
-SELECT p, string(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["p" "c"]
-┌Evaluate p as "p", string(c) as "",
-└Output field names ["p" ""]
-
----- 723
-SELECT p, string(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["p" "c"]
-┌Evaluate p as "p", string(c) as "",
-└Output field names ["p" ""]
-
----- 724
-SELECT p, string(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["p" "c"]
-┌Evaluate p as "p", string(c) as "",
-└Output field names ["p" ""]
-
----- 725
-SELECT * FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-
----- 726
-SELECT * FROM employee;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-
----- 727
-SELECT * FROM employee ORDER BY LastName;
-┌Iterate all rows of table "employee"
-└Output field names ["LastName" "DepartmentID"]
-┌Order by LastName,
-└Output field names ["LastName" "DepartmentID"]
-
----- 728
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["username" "departname" "created" "detail_id" "height" "avatar" "is_man"]
-
----- 729
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["username" "departname" "created" "detail_id" "height" "avatar" "is_man"]
-
----- 730
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["username" "departname" "created" "detail_id" "height" "avatar" "is_man"]
-
----- 731
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["username" "departname" "created" "detail_id" "height" "avatar" "is_man"]
-
----- 732
-SELECT id() IN (SELECT id() FROM t WHERE username == "2xiaolunwen";), username == "2xiaolunwen", len(string(avatar)) == 2097152 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["username" "departname" "created" "detail_id" "height" "avatar" "is_man"]
-┌Evaluate id() IN (SELECT id() FROM t WHERE username == "2xiaolunwen";) as "", username == "2xiaolunwen" as "", len(string(avatar)) == 2097152 as "",
-└Output field names ["" "" ""]
-
----- 733
-SELECT id() IN (SELECT id() FROM t WHERE username == "xiaolunwen";), username == "xiaolunwen", len(string(avatar)) == 1048576 FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["username" "departname" "created" "detail_id" "height" "avatar" "is_man"]
-┌Evaluate id() IN (SELECT id() FROM t WHERE username == "xiaolunwen";) as "", username == "xiaolunwen" as "", len(string(avatar)) == 1048576 as "",
-└Output field names ["" "" ""]
-
----- 734
-SELECT user, remain, total FROM no_id_user WHERE user == "xlw" LIMIT 1;
-┌Iterate all rows of table "no_id_user" using index "UQE_no_id_user_user" where user == "xlw"
-└Output field names ["user" "remain" "total"]
-┌Pass first 1 records
-└Output field names [user remain total]
-
----- 735
-SELECT * FROM t WHERE id() < 4;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on id() < 4
-│Possibly useful indices
-│CREATE INDEX xt_id ON t(id());
-└Output field names ["i"]
-
----- 736
-SELECT * FROM t WHERE i < 4;
-┌Iterate all rows of table "t" using index "x" where i < 4
-└Output field names ["i"]
-
----- 737
-SELECT * FROM t WHERE i <= 4;
-┌Iterate all rows of table "t" using index "x" where i <= 4
-└Output field names ["i"]
-
----- 738
-SELECT * FROM t WHERE i == 4;
-┌Iterate all rows of table "t" using index "x" where i == 4
-└Output field names ["i"]
-
----- 739
-SELECT * FROM t WHERE i >= 4;
-┌Iterate all rows of table "t" using index "x" where i >= 4
-└Output field names ["i"]
-
----- 740
-SELECT * FROM t WHERE i > 4;
-┌Iterate all rows of table "t" using index "x" where i > 4
-└Output field names ["i"]
-
----- 741
-SELECT * FROM (SELECT i FROM t WHERE i < 4;) AS t, (SELECT * FROM u WHERE i < 40;) AS u;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "t" using index "x" where i < 4
-│   └Output field names ["i"]
-│   ┌Iterate all rows of table "u" using index "y" where i < 40
-│   └Output field names ["i"]
-└Output field names ["t.i" "u.i"]
-
----- 742
-SELECT max(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate max(t) as "T",
-└Output field names ["T"]
-
----- 743
-SELECT max(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate max(t) as "T",
-└Output field names ["T"]
-
----- 744
-SELECT max(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate max(t) as "T",
-└Output field names ["T"]
-
----- 745
-SELECT max(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate max(t) as "T",
-└Output field names ["T"]
-
----- 746
-SELECT max(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate max(t) as "T",
-└Output field names ["T"]
-
----- 747
-SELECT max(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate max(t) as "T",
-└Output field names ["T"]
-
----- 748
-SELECT min(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate min(t) as "T",
-└Output field names ["T"]
-
----- 749
-SELECT min(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate min(t) as "T",
-└Output field names ["T"]
-
----- 750
-SELECT min(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate min(t) as "T",
-└Output field names ["T"]
-
----- 751
-SELECT min(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate min(t) as "T",
-└Output field names ["T"]
-
----- 752
-SELECT min(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate min(t) as "T",
-└Output field names ["T"]
-
----- 753
-SELECT min(t) AS T FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate min(t) as "T",
-└Output field names ["T"]
-
----- 754
-SELECT * FROM department;
-┌Iterate all rows of table "department"
-└Output field names ["Name" "score"]
-
-SELECT * FROM department;
-┌Iterate all rows of table "department"
-└Output field names ["Name" "score"]
-
-SELECT * FROM department ORDER BY Name;
-┌Iterate all rows of table "department"
-└Output field names ["Name" "score"]
-┌Order by Name,
-└Output field names ["Name" "score"]
-
----- 755
-SELECT id(), s FROM t WHERE s LIKE "foo" ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on s LIKE "foo"
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 756
-SELECT id(), s FROM t WHERE !s LIKE "foo" ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on !s LIKE "foo"
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 757
-SELECT id(), s FROM t WHERE s LIKE "foo" IS NULL ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on s LIKE "foo" IS NULL
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 758
-SELECT id(), s FROM t WHERE s LIKE "foo" IS NOT NULL ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on s LIKE "foo" IS NOT NULL
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 759
-SELECT id(), s FROM t WHERE s LIKE "bar" ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on s LIKE "bar"
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 760
-SELECT id(), s FROM t WHERE s LIKE "^bar" ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on s LIKE "^bar"
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 761
-SELECT id(), s FROM t WHERE s LIKE "bar$" ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on s LIKE "bar$"
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 762
-SELECT id(), s FROM t WHERE s LIKE "bar$" ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on s LIKE "bar$"
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 763
-SELECT id(), s FROM t WHERE s + "qux" LIKE "qux$" ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on s + "qux" LIKE "qux$"
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 764
-SELECT id(), s FROM t WHERE s + "quxx" LIKE "qux$" ORDER BY id();
-┌Iterate all rows of table "t"
-└Output field names ["s"]
-┌Filter on s + "quxx" LIKE "qux$"
-└Output field names ["s"]
-┌Evaluate id() as "", s as "s",
-└Output field names ["" "s"]
-┌Order by id(),
-└Output field names ["" "s"]
-
----- 765
-SELECT * FROM (SELECT id() AS ID, i FROM foo;) AS foo, bar WHERE bar.fooID == foo.ID ORDER BY foo.ID;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of virtual table "foo"
-│   │   ┌Iterate all rows of table "foo"
-│   │   └Output field names ["i"]
-│   │   ┌Evaluate id() as "ID", i as "i",
-│   │   └Output field names ["ID" "i"]
-│   └Output field names ["ID" "i"]
-│   ┌Iterate all rows of table "bar"
-│   └Output field names ["fooID" "s"]
-└Output field names ["foo.ID" "foo.i" "bar.fooID" "bar.s"]
-┌Filter on bar.fooID == foo.ID
-└Output field names ["foo.ID" "foo.i" "bar.fooID" "bar.s"]
-┌Order by foo.ID,
-└Output field names ["foo.ID" "foo.i" "bar.fooID" "bar.s"]
-
----- 766
-SELECT * FROM foo, bar WHERE bar.fooID == id(foo) ORDER BY id(foo);
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "foo"
-│   └Output field names ["i"]
-│   ┌Iterate all rows of table "bar"
-│   └Output field names ["fooID" "s"]
-└Output field names ["foo.i" "bar.fooID" "bar.s"]
-┌Filter on bar.fooID == id(foo)
-└Output field names ["foo.i" "bar.fooID" "bar.s"]
-┌Order by id(foo),
-└Output field names ["foo.i" "bar.fooID" "bar.s"]
-
----- 767
-SELECT * FROM t WHERE name == "b" && mail == "bar@example.com";
-┌Iterate all rows of table "t"
-└Output field names ["name" "mail"]
-┌Filter on name == "b" && mail == "bar@example.com"
-│Possibly useful indices
-│CREATE INDEX xt_name ON t(name);
-│CREATE INDEX xt_mail ON t(mail);
-└Output field names ["name" "mail"]
-
----- 768
-SELECT * FROM t WHERE name == "b" && mail == "bar@example.com";
-┌Iterate all rows of table "t"
-└Output field names ["name" "mail"]
-┌Filter on name == "b" && mail == "bar@example.com"
-│Possibly useful indices
-│CREATE INDEX xt_name ON t(name);
-│CREATE INDEX xt_mail ON t(mail);
-└Output field names ["name" "mail"]
-
----- 769
-SELECT * FROM t WHERE name == "b" || mail == "bar@example.com" ORDER BY name;
-┌Iterate all rows of table "t"
-└Output field names ["name" "mail"]
-┌Filter on name == "b" || mail == "bar@example.com"
-└Output field names ["name" "mail"]
-┌Order by name,
-└Output field names ["name" "mail"]
-
----- 770
-SELECT * FROM t WHERE name == "b" || mail == "bar@example.com" ORDER BY name;
-┌Iterate all rows of table "t"
-└Output field names ["name" "mail"]
-┌Filter on name == "b" || mail == "bar@example.com"
-└Output field names ["name" "mail"]
-┌Order by name,
-└Output field names ["name" "mail"]
-
----- 771
-SELECT id(), i FROM tableA WHERE id() IN (SELECT idA FROM tableB;) ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Filter on id() IN (SELECT idA FROM tableB;)
-└Output field names ["i"]
-┌Evaluate id() as "", i as "i",
-└Output field names ["" "i"]
-┌Order by id(),
-└Output field names ["" "i"]
-
----- 772
-SELECT id(), i FROM tableA WHERE id() NOT IN (SELECT idA FROM tableB;) ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Filter on id() NOT IN (SELECT idA FROM tableB;)
-└Output field names ["i"]
-┌Evaluate id() as "", i as "i",
-└Output field names ["" "i"]
-┌Order by id(),
-└Output field names ["" "i"]
-
----- 773
-SELECT id(), i FROM tableA ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Evaluate id() as "", i as "i",
-└Output field names ["" "i"]
-┌Order by id(),
-└Output field names ["" "i"]
-
----- 774
-SELECT id(), i FROM tableA ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Evaluate id() as "", i as "i",
-└Output field names ["" "i"]
-┌Order by id(),
-└Output field names ["" "i"]
-
----- 775
-SELECT id(), i FROM tableA ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Evaluate id() as "", i as "i",
-└Output field names ["" "i"]
-┌Order by id(),
-└Output field names ["" "i"]
-
----- 776
-SELECT id(), i FROM tableA ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Evaluate id() as "", i as "i",
-└Output field names ["" "i"]
-┌Order by id(),
-└Output field names ["" "i"]
-
----- 777
-SELECT id(), i FROM tableA ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Evaluate id() as "", i as "i",
-└Output field names ["" "i"]
-┌Order by id(),
-└Output field names ["" "i"]
-
----- 778
-SELECT id(), i FROM tableA ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Evaluate id() as "", i as "i",
-└Output field names ["" "i"]
-┌Order by id(),
-└Output field names ["" "i"]
-
----- 781
-SELECT i FROM tableA WHERE id() IN (SELECT idA FROM tableB;) ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Filter on id() IN (SELECT idA FROM tableB;)
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-
----- 782
-SELECT i FROM tableA WHERE id() IN (SELECT idA FROM tableB;) ORDER BY id();
-┌Iterate all rows of table "tableA"
-└Output field names ["i"]
-┌Filter on id() IN (SELECT idA FROM tableB;)
-└Output field names ["i"]
-┌Order by id(),
-└Output field names ["i"]
-
----- 783
-SELECT * FROM testA;
-┌Iterate all rows of table "testA"
-└Output field names ["comment" "data"]
-
----- 784
-SELECT * FROM testA;
-┌Iterate all rows of table "testA"
-└Output field names ["comment" "data"]
-
----- 785
-SELECT * FROM testA ORDER BY comment;
-┌Iterate all rows of table "testA"
-└Output field names ["comment" "data"]
-┌Order by comment,
-└Output field names ["comment" "data"]
-
----- 786
-SELECT * FROM testA ORDER BY comment;
-┌Iterate all rows of table "testA"
-└Output field names ["comment" "data"]
-┌Order by comment,
-└Output field names ["comment" "data"]
-
----- 787
-SELECT * FROM testA ORDER BY comment;
-┌Iterate all rows of table "testA"
-└Output field names ["comment" "data"]
-┌Order by comment,
-└Output field names ["comment" "data"]
-
----- 788
-SELECT * FROM testA ORDER BY comment;
-┌Iterate all rows of table "testA"
-└Output field names ["comment" "data"]
-┌Order by comment,
-└Output field names ["comment" "data"]
-
----- 789
-SELECT * FROM testA ORDER BY comment;
-┌Iterate all rows of table "testA"
-└Output field names ["comment" "data"]
-┌Order by comment,
-└Output field names ["comment" "data"]
-
----- 790
-SELECT * FROM testA ORDER BY comment;
-┌Iterate all rows of table "testA"
-└Output field names ["comment" "data"]
-┌Order by comment,
-└Output field names ["comment" "data"]
-
----- 791
-SELECT formatFloat(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatFloat(c) as "",
-└Output field names [""]
-
----- 792
-SELECT formatFloat(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatFloat(c) as "",
-└Output field names [""]
-
----- 793
-SELECT formatFloat(c, 98) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatFloat(c, 98) as "",
-└Output field names [""]
-
----- 794
-SELECT formatFloat(c, 101, 5) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatFloat(c, 101, 5) as "",
-└Output field names [""]
-
----- 795
-SELECT formatFloat(c, 98, 7, 32) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatFloat(c, 98, 7, 32) as "",
-└Output field names [""]
-
----- 796
-SELECT formatInt(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c) as "",
-└Output field names [""]
-
----- 797
-SELECT formatInt(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c) as "",
-└Output field names [""]
-
----- 798
-SELECT formatInt(c, 18) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c, 18) as "",
-└Output field names [""]
-
----- 799
-SELECT formatInt(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c) as "",
-└Output field names [""]
-
----- 800
-SELECT formatInt(c) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c) as "",
-└Output field names [""]
-
----- 801
-SELECT formatInt(c, 18) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c, 18) as "",
-└Output field names [""]
-
----- 802
-SELECT formatInt(c, 18) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c, 18) as "",
-└Output field names [""]
-
----- 803
-SELECT formatInt(c, 18) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c, 18) as "",
-└Output field names [""]
-
----- 804
-SELECT formatInt(c, 18) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c, 18) as "",
-└Output field names [""]
-
----- 805
-SELECT formatInt(c, 18) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c, 18) as "",
-└Output field names [""]
-
----- 806
-SELECT formatInt(c, 18) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c, 18) as "",
-└Output field names [""]
-
----- 807
-SELECT formatInt(c, 18) FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-┌Evaluate formatInt(c, 18) as "",
-└Output field names [""]
-
----- 808
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 809
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i" "b"]
-
----- 815
-SELECT * FROM __Column2;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 816
-SELECT * FROM __Column2;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 817
-SELECT * FROM __Column2;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 818
-SELECT * FROM __Column2;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 819
-SELECT * FROM __Column2;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 822
-SELECT * FROM __Column2;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 823
-SELECT * FROM __Column2;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 824
-SELECT * FROM __Column2;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 825
-SELECT * FROM __Column2;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 830
-SELECT * FROM __Column2 ORDER BY Name;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-┌Order by Name,
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 831
-SELECT * FROM __Column2 ORDER BY Name;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-┌Order by Name,
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 832
-SELECT * FROM __Column2 ORDER BY Name;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-┌Order by Name,
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 833
-SELECT * FROM __Column2 ORDER BY Name;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-┌Order by Name,
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 834
-SELECT * FROM __Column2 ORDER BY Name;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-┌Order by Name,
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 835
-SELECT * FROM __Column2 ORDER BY Name;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-┌Order by Name,
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 836
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 837
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 839
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 842
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 844
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 846
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 847
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 850
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 854
-SELECT * FROM department;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentName"]
-
----- 855
-SELECT * FROM department;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentName"]
-
----- 857
-SELECT * FROM department;
-┌Iterate all rows of table "department"
-└Output field names ["DepartmentName"]
-
----- 858
-SELECT TimeStamp IS NOT NULL FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["TimeStamp"]
-┌Evaluate TimeStamp IS NOT NULL as "",
-└Output field names [""]
-
----- 861
-SELECT TimeStamp IS NOT NULL FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["TimeStamp"]
-┌Evaluate TimeStamp IS NOT NULL as "",
-└Output field names [""]
-
----- 862
-SELECT TimeStamp IS NOT NULL FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["TimeStamp"]
-┌Evaluate TimeStamp IS NOT NULL as "",
-└Output field names [""]
-
----- 864
-SELECT Event FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["Event"]
-
----- 865
-SELECT b FROM t ORDER BY b DESC;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate b as "b",
-└Output field names ["b"]
-┌Order descending by b,
-└Output field names ["b"]
-
----- 866
-SELECT b FROM t ORDER BY b DESC;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate b as "b",
-└Output field names ["b"]
-┌Order descending by b,
-└Output field names ["b"]
-
----- 868
-SELECT b FROM t ORDER BY b DESC;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate b as "b",
-└Output field names ["b"]
-┌Order descending by b,
-└Output field names ["b"]
-
----- 870
-SELECT b FROM t ORDER BY b DESC;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-┌Evaluate b as "b",
-└Output field names ["b"]
-┌Order descending by b,
-└Output field names ["b"]
-
----- 871
-SELECT * FROM employee LEFT OUTER JOIN department ON employee.DepartmentID == department.DepartmentID ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of "department" when no match for employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by employee.LastName,
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 872
-SELECT * FROM employee LEFT OUTER JOIN department ON employee.DepartmentID == department.DepartmentID ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of "department" when no match for employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by employee.LastName,
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 873
-SELECT * FROM employee RIGHT OUTER JOIN department ON employee.DepartmentID == department.DepartmentID ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of all but "department" when no match for employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by employee.LastName,
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 874
-SELECT * FROM employee RIGHT OUTER JOIN department ON employee.DepartmentID == department.DepartmentID ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of all but "department" when no match for employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by employee.LastName,
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 875
-SELECT * FROM employee FULL OUTER JOIN department ON employee.DepartmentID == none;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of "department" when no match for employee.DepartmentID == none
-│   Extend the product with all NULL rows of all but "department" when no match for employee.DepartmentID == none
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 876
-SELECT * FROM employee FULL OUTER JOIN department ON employee.DepartmentID == none;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of "department" when no match for employee.DepartmentID == none
-│   Extend the product with all NULL rows of all but "department" when no match for employee.DepartmentID == none
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 877
-SELECT * FROM t1 LEFT OUTER JOIN t2 ON t1.s1 == t2.s1;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "t1"
-│   └Output field names ["s1"]
-│   ┌Iterate all rows of table "t2"
-│   └Output field names ["s1"]
-│   Extend the product with all NULL rows of "t2" when no match for t1.s1 == t2.s1
-└Output field names ["t1.s1" "t2.s1"]
-
----- 878
-SELECT * FROM a LEFT OUTER JOIN b ON a.i == b.i ORDER BY a.s, a.i, b.s, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["i" "s"]
-│   ┌Iterate all rows of table "b"
-│   └Output field names ["i" "s"]
-│   Extend the product with all NULL rows of "b" when no match for a.i == b.i
-└Output field names ["a.i" "a.s" "b.i" "b.s"]
-┌Order by a.s, a.i, b.s, b.i,
-└Output field names ["a.i" "a.s" "b.i" "b.s"]
-
----- 879
-SELECT * FROM a RIGHT OUTER JOIN b ON a.i == b.i ORDER BY a.s, a.i, b.s, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["i" "s"]
-│   ┌Iterate all rows of table "b"
-│   └Output field names ["i" "s"]
-│   Extend the product with all NULL rows of all but "b" when no match for a.i == b.i
-└Output field names ["a.i" "a.s" "b.i" "b.s"]
-┌Order by a.s, a.i, b.s, b.i,
-└Output field names ["a.i" "a.s" "b.i" "b.s"]
-
----- 880
-SELECT * FROM b LEFT OUTER JOIN a ON a.i == b.i ORDER BY a.s, a.i, b.s, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "b"
-│   └Output field names ["i" "s"]
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["i" "s"]
-│   Extend the product with all NULL rows of "a" when no match for a.i == b.i
-└Output field names ["b.i" "b.s" "a.i" "a.s"]
-┌Order by a.s, a.i, b.s, b.i,
-└Output field names ["b.i" "b.s" "a.i" "a.s"]
-
----- 881
-SELECT * FROM b RIGHT OUTER JOIN a ON a.i == b.i ORDER BY a.s, a.i, b.s, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "b"
-│   └Output field names ["i" "s"]
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["i" "s"]
-│   Extend the product with all NULL rows of all but "a" when no match for a.i == b.i
-└Output field names ["b.i" "b.s" "a.i" "a.s"]
-┌Order by a.s, a.i, b.s, b.i,
-└Output field names ["b.i" "b.s" "a.i" "a.s"]
-
----- 882
-SELECT * FROM a FULL OUTER JOIN b ON a.i == b.i ORDER BY a.s, a.i, b.s, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["i" "s"]
-│   ┌Iterate all rows of table "b"
-│   └Output field names ["i" "s"]
-│   Extend the product with all NULL rows of "b" when no match for a.i == b.i
-│   Extend the product with all NULL rows of all but "b" when no match for a.i == b.i
-└Output field names ["a.i" "a.s" "b.i" "b.s"]
-┌Order by a.s, a.i, b.s, b.i,
-└Output field names ["a.i" "a.s" "b.i" "b.s"]
-
----- 883
-SELECT * FROM a FULL OUTER JOIN b ON a.i == b.i ORDER BY a.s, a.i, b.s, b.i;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "a"
-│   └Output field names ["i" "s"]
-│   ┌Iterate all rows of table "b"
-│   └Output field names ["i" "s"]
-│   Extend the product with all NULL rows of "b" when no match for a.i == b.i
-│   Extend the product with all NULL rows of all but "b" when no match for a.i == b.i
-└Output field names ["a.i" "a.s" "b.i" "b.s"]
-┌Order by a.s, a.i, b.s, b.i,
-└Output field names ["a.i" "a.s" "b.i" "b.s"]
-
----- 884
-SELECT * FROM employee FULL OUTER JOIN department ON employee.DepartmentID == department.DepartmentID ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of "department" when no match for employee.DepartmentID == department.DepartmentID
-│   Extend the product with all NULL rows of all but "department" when no match for employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by employee.LastName,
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 885
-SELECT * FROM employee FULL OUTER JOIN department ON employee.DepartmentID == department.DepartmentID ORDER BY employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of "department" when no match for employee.DepartmentID == department.DepartmentID
-│   Extend the product with all NULL rows of all but "department" when no match for employee.DepartmentID == department.DepartmentID
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by employee.LastName,
-└Output field names ["employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 886
-SELECT * FROM t,employee LEFT OUTER JOIN department ON employee.DepartmentID == department.DepartmentID ORDER BY t.s, employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "t"
-│   └Output field names ["s"]
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of "department" when no match for employee.DepartmentID == department.DepartmentID
-└Output field names ["t.s" "employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by t.s, employee.LastName,
-└Output field names ["t.s" "employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 887
-SELECT * FROM t,employee RIGHT OUTER JOIN department ON employee.DepartmentID == department.DepartmentID ORDER BY t.s, employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "t"
-│   └Output field names ["s"]
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of all but "department" when no match for employee.DepartmentID == department.DepartmentID
-└Output field names ["t.s" "employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by t.s, employee.LastName,
-└Output field names ["t.s" "employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 888
-SELECT * FROM t,employee FULL OUTER JOIN department ON employee.DepartmentID == department.DepartmentID ORDER BY t.s, employee.LastName;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "t"
-│   └Output field names ["s"]
-│   ┌Iterate all rows of table "employee"
-│   └Output field names ["LastName" "DepartmentID"]
-│   ┌Iterate all rows of table "department"
-│   └Output field names ["DepartmentID" "DepartmentName"]
-│   Extend the product with all NULL rows of "department" when no match for employee.DepartmentID == department.DepartmentID
-│   Extend the product with all NULL rows of all but "department" when no match for employee.DepartmentID == department.DepartmentID
-└Output field names ["t.s" "employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-┌Order by t.s, employee.LastName,
-└Output field names ["t.s" "employee.LastName" "employee.DepartmentID" "department.DepartmentID" "department.DepartmentName"]
-
----- 889
-SELECT * FROM __Table WHERE !hasPrefix(Name, "__") ORDER BY Name;
-┌Iterate all rows of table "__Table"
-└Output field names ["Name" "Schema"]
-┌Filter on !hasPrefix(Name, "__")
-└Output field names ["Name" "Schema"]
-┌Order by Name,
-└Output field names ["Name" "Schema"]
-
----- 890
-SELECT * FROM __Column2 ORDER BY TableName, Name;
-┌Iterate all rows of table "__Column2"
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-┌Order by TableName, Name,
-└Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-
----- 891
-SELECT __Column.TableName, __Column.Ordinal, __Column.Name, __Column.Type, __Column2.NotNull, __Column2.ConstraintExpr, __Column2.DefaultExpr FROM __Column LEFT OUTER JOIN __Column2 ON __Column.TableName == __Column2.TableName && __Column.Name == __Column2.Name WHERE !hasPrefix(__Column.TableName, "__") ORDER BY __Column.TableName, __Column.Ordinal;
-┌Compute Cartesian product of
-│   ┌Iterate all rows of table "__Column"
-│   └Output field names ["TableName" "Ordinal" "Name" "Type"]
-│   ┌Iterate all rows of table "__Column2"
-│   └Output field names ["TableName" "Name" "NotNull" "ConstraintExpr" "DefaultExpr"]
-│   Extend the product with all NULL rows of "__Column2" when no match for __Column.TableName == __Column2.TableName && __Column.Name == __Column2.Name
-└Output field names ["__Column.TableName" "__Column.Ordinal" "__Column.Name" "__Column.Type" "__Column2.TableName" "__Column2.Name" "__Column2.NotNull" "__Column2.ConstraintExpr" "__Column2.DefaultExpr"]
-┌Filter on !hasPrefix(__Column.TableName, "__")
-└Output field names ["__Column.TableName" "__Column.Ordinal" "__Column.Name" "__Column.Type" "__Column2.TableName" "__Column2.Name" "__Column2.NotNull" "__Column2.ConstraintExpr" "__Column2.DefaultExpr"]
-┌Evaluate __Column.TableName as "__Column.TableName", __Column.Ordinal as "__Column.Ordinal", __Column.Name as "__Column.Name", __Column.Type as "__Column.Type", __Column2.NotNull as "__Column2.NotNull", __Column2.ConstraintExpr as "__Column2.ConstraintExpr", __Column2.DefaultExpr as "__Column2.DefaultExpr",
-└Output field names ["__Column.TableName" "__Column.Ordinal" "__Column.Name" "__Column.Type" "__Column2.NotNull" "__Column2.ConstraintExpr" "__Column2.DefaultExpr"]
-┌Order by __Column.TableName, __Column.Ordinal,
-└Output field names ["__Column.TableName" "__Column.Ordinal" "__Column.Name" "__Column.Type" "__Column2.NotNull" "__Column2.ConstraintExpr" "__Column2.DefaultExpr"]
-
----- 902
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__");
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 903
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x";);
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-
----- 904
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__");
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 905
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x";);
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-
----- 906
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 907
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 908
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 909
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 910
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 911
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 912
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 913
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 914
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 915
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 916
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 917
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 918
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 919
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 920
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 921
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 922
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 923
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 924
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 925
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 926
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 927
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 928
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 929
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 930
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE !hasPrefix(TableName, "__") ORDER BY IndexName;
-┌Iterate all rows of table "__Index2"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Filter on !hasPrefix(TableName, "__")
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-┌Order by IndexName,
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 931
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 932
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 933
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 934
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 935
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 936
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 937
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x" || IndexName == "y";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 938
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 || Root == -1 FROM __Index2 WHERE TableName == "t";
-┌Iterate all rows of table "__Index2" using index "__xIndex2_TableName" where TableName == "t"
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" "Root"]
-┌Evaluate TableName as "TableName", IndexName as "IndexName", IsUnique as "IsUnique", IsSimple as "IsSimple", Root > 0 || Root == -1 as "",
-└Output field names ["TableName" "IndexName" "IsUnique" "IsSimple" ""]
-
----- 939
-SELECT Expr FROM __Index2_Expr WHERE Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x";) ORDER BY Expr;
-┌Iterate all rows of table "__Index2_Expr"
-└Output field names ["Index2_ID" "Expr"]
-┌Filter on Index2_ID IN (SELECT id() FROM __Index2 WHERE IndexName == "x";)
-└Output field names ["Index2_ID" "Expr"]
-┌Evaluate Expr as "Expr",
-└Output field names ["Expr"]
-┌Order by Expr,
-└Output field names ["Expr"]
-
----- 940
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 941
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 942
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["a" "b" "c"]
-
----- 943
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 950
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 952
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 953
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 954
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 955
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 956
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 957
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 959
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 963
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 964
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["c"]
-
----- 966
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 967
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 968
-SELECT * FROM y;
-┌Iterate all values of index "y"
-└Output field names N/A
-
----- 970
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 971
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 972
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 974
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 975
-SELECT * FROM x;
-┌Iterate all values of index "x"
-└Output field names N/A
-
----- 981
-EXPLAIN SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 982
-EXPLAIN EXPLAIN SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 983
-SELECT * FROM t WHERE i != 42;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i != 42
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i"]
-
----- 984
-SELECT * FROM t WHERE i != 42;
-┌Iterate all rows of table "t" using index "x" where i != 42
-└Output field names ["i"]
-
----- 985
-SELECT * FROM t WHERE i != 42;
-┌Iterate all rows of table "t" using index "x" where i != 42
-└Output field names ["i"]
-
----- 986
-SELECT * FROM t WHERE id() > 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 987
-SELECT * FROM t WHERE id() > 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 988
-SELECT * FROM t WHERE i IS NULL;
-┌Iterate all rows of table "t"
-└Output field names ["i" "j"]
-┌Filter on i IS NULL
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i" "j"]
-
----- 989
-SELECT * FROM t WHERE i IS NULL;
-┌Iterate all rows of table "t" using index "x" where i IS NULL
-└Output field names ["i" "j"]
-
----- 990
-SELECT * FROM t WHERE i IS NOT NULL;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i IS NOT NULL
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i"]
-
----- 991
-SELECT * FROM t WHERE i IS NOT NULL;
-┌Iterate all rows of table "t" using index "x" where i IS NOT NULL
-└Output field names ["i"]
-
----- 992
-SELECT * FROM t WHERE id() IS NULL;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 993
-SELECT * FROM t WHERE id() IS NOT NULL;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 994
-SELECT * FROM t WHERE id() IS NULL;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 995
-SELECT * FROM t WHERE id() IS NOT NULL;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 996
-SELECT * FROM t WHERE id() == 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 997
-SELECT * FROM t WHERE id() == 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 998
-SELECT * FROM t WHERE id() < 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 999
-SELECT * FROM t WHERE id() < 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1000
-SELECT * FROM t WHERE id() <= 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1001
-SELECT * FROM t WHERE id() <= 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1002
-SELECT * FROM t WHERE id() > 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 1003
-SELECT * FROM t WHERE id() > 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 1004
-SELECT * FROM t WHERE id() >= 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 1005
-SELECT * FROM t WHERE id() >= 1;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 1006
-SELECT * FROM t WHERE id() != 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 1007
-SELECT * FROM t WHERE id() != 0;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 1008
-SELECT * FROM t WHERE i > -1 && i < 314 || i > 1000 && i < 2000;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i > -1 && i < 314 || i > 1000 && i < 2000
-└Output field names ["i"]
-
----- 1009
-SELECT i FROM t WHERE !b ORDER BY i;
-┌Iterate all rows of table "t" using index "x" where !b
-└Output field names ["i" "b"]
-┌Evaluate i as "i",
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 1010
-SELECT i FROM t WHERE i == 0 && i == -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1011
-SELECT i FROM t WHERE i == 0 && i == -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1012
-SELECT i FROM t WHERE i == 0 && i == 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1013
-SELECT i FROM t WHERE i == 0 && i == 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1014
-SELECT i FROM t WHERE i == 0 && i == 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1015
-SELECT i FROM t WHERE i == 0 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1016
-SELECT i FROM t WHERE i == 0 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1017
-SELECT i FROM t WHERE i == 0 && i >= 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1018
-SELECT i FROM t WHERE i == 0 && i >= 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1019
-SELECT i FROM t WHERE i == 0 && i >= 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1020
-SELECT i FROM t WHERE i == 0 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1021
-SELECT i FROM t WHERE i == 0 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1022
-SELECT i FROM t WHERE i == 0 && i > 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1023
-SELECT i FROM t WHERE i == 0 && i > 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1024
-SELECT i FROM t WHERE i == 0 && i > 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1025
-SELECT i FROM t WHERE i == 0 && i <= -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1026
-SELECT i FROM t WHERE i == 0 && i <= -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1027
-SELECT i FROM t WHERE i == 0 && i <= 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1028
-SELECT i FROM t WHERE i == 0 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1029
-SELECT i FROM t WHERE i == 0 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1030
-SELECT i FROM t WHERE i == 0 && i < -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1031
-SELECT i FROM t WHERE i == 0 && i < -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1032
-SELECT i FROM t WHERE i == 0 && i < 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1033
-SELECT i FROM t WHERE i == 0 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1034
-SELECT i FROM t WHERE i == 0 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1035
-SELECT i FROM t WHERE i == 0 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1036
-SELECT i FROM t WHERE i == 0 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1037
-SELECT i FROM t WHERE i == 0 && i != 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1038
-SELECT i FROM t WHERE i == 0 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1039
-SELECT i FROM t WHERE i == 0 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1040
-SELECT * FROM t WHERE !b && b ORDER BY i;
-┌Iterate no rows
-└Output field names ["i" "b"]
-
----- 1041
-SELECT * FROM t WHERE !b && !b ORDER BY i;
-┌Iterate all rows of table "t" using index "x" where !b
-└Output field names ["i" "b"]
-┌Order by i,
-└Output field names ["i" "b"]
-
----- 1042
-SELECT * FROM t WHERE b && !b ORDER BY i;
-┌Iterate no rows
-└Output field names ["i" "b"]
-
----- 1043
-SELECT * FROM t WHERE b && b ORDER BY i;
-┌Iterate all rows of table "t" using index "x" where b
-└Output field names ["i" "b"]
-┌Order by i,
-└Output field names ["i" "b"]
-
----- 1045
-SELECT i FROM t WHERE i >= 0 && i == -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1046
-SELECT i FROM t WHERE i >= 0 && i == -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1047
-SELECT i FROM t WHERE i >= 0 && i == 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1048
-SELECT i FROM t WHERE i >= 0 && i == 1;
-┌Iterate all rows of table "t" using index "x" where i == 1
-└Output field names ["i"]
-
----- 1049
-SELECT i FROM t WHERE i >= 0 && i == 2;
-┌Iterate all rows of table "t" using index "x" where i == 2
-└Output field names ["i"]
-
----- 1050
-SELECT i FROM t WHERE i >= 0 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i >= 0
-└Output field names ["i"]
-
----- 1051
-SELECT i FROM t WHERE i >= 0 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i >= 0
-└Output field names ["i"]
-
----- 1052
-SELECT i FROM t WHERE i >= 0 && i >= 0;
-┌Iterate all rows of table "t" using index "x" where i >= 0
-└Output field names ["i"]
-
----- 1053
-SELECT i FROM t WHERE i >= 0 && i >= 1;
-┌Iterate all rows of table "t" using index "x" where i >= 1
-└Output field names ["i"]
-
----- 1054
-SELECT i FROM t WHERE i >= 0 && i >= 2;
-┌Iterate all rows of table "t" using index "x" where i >= 2
-└Output field names ["i"]
-
----- 1055
-SELECT i FROM t WHERE i >= 0 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i >= 0
-└Output field names ["i"]
-
----- 1056
-SELECT i FROM t WHERE i >= 0 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i >= 0
-└Output field names ["i"]
-
----- 1057
-SELECT i FROM t WHERE i >= 0 && i > 0;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1058
-SELECT i FROM t WHERE i >= 0 && i > 1;
-┌Iterate all rows of table "t" using index "x" where i > 1
-└Output field names ["i"]
-
----- 1059
-SELECT i FROM t WHERE i >= 0 && i > 2;
-┌Iterate all rows of table "t" using index "x" where i > 2
-└Output field names ["i"]
-
----- 1060
-SELECT i FROM t WHERE i >= 0 && i <= -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1061
-SELECT i FROM t WHERE i >= 0 && i <= -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1062
-SELECT i FROM t WHERE i >= 0 && i <= 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1063
-SELECT i FROM t WHERE i >= 0 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i >= 0 && i <= 1
-└Output field names ["i"]
-
----- 1064
-SELECT i FROM t WHERE i >= 0 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i >= 0 && i <= 2
-└Output field names ["i"]
-
----- 1065
-SELECT i FROM t WHERE i >= 0 && i < -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1066
-SELECT i FROM t WHERE i >= 0 && i < -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1067
-SELECT i FROM t WHERE i >= 0 && i < 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1068
-SELECT i FROM t WHERE i >= 0 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i >= 0 && i < 1
-└Output field names ["i"]
-
----- 1069
-SELECT i FROM t WHERE i >= 0 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i >= 0 && i < 2
-└Output field names ["i"]
-
----- 1070
-SELECT i FROM t WHERE i >= 0 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i >= 0
-└Output field names ["i"]
-
----- 1071
-SELECT i FROM t WHERE i >= 0 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i >= 0
-└Output field names ["i"]
-
----- 1072
-SELECT i FROM t WHERE i >= 0 && i != 0;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1073
-SELECT i FROM t WHERE i >= 0 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i >= 0
-└Output field names ["i"]
-┌Filter on i != 1
-└Output field names ["i"]
-
----- 1074
-SELECT i FROM t WHERE i >= 0 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i >= 0
-└Output field names ["i"]
-┌Filter on i != 2
-└Output field names ["i"]
-
----- 1075
-SELECT i FROM t WHERE i > 0 && i == -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1076
-SELECT i FROM t WHERE i > 0 && i == -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1077
-SELECT i FROM t WHERE i > 0 && i == 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1078
-SELECT i FROM t WHERE i > 0 && i == 1;
-┌Iterate all rows of table "t" using index "x" where i == 1
-└Output field names ["i"]
-
----- 1079
-SELECT i FROM t WHERE i > 0 && i == 2;
-┌Iterate all rows of table "t" using index "x" where i == 2
-└Output field names ["i"]
-
----- 1080
-SELECT i FROM t WHERE i > 0 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1081
-SELECT i FROM t WHERE i > 0 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1082
-SELECT i FROM t WHERE i > 0 && i >= 0;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1083
-SELECT i FROM t WHERE i > 0 && i >= 1;
-┌Iterate all rows of table "t" using index "x" where i >= 1
-└Output field names ["i"]
-
----- 1084
-SELECT i FROM t WHERE i > 0 && i >= 2;
-┌Iterate all rows of table "t" using index "x" where i >= 2
-└Output field names ["i"]
-
----- 1085
-SELECT i FROM t WHERE i > 0 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1086
-SELECT i FROM t WHERE i > 0 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1087
-SELECT i FROM t WHERE i > 0 && i > 0;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1088
-SELECT i FROM t WHERE i > 0 && i > 1;
-┌Iterate all rows of table "t" using index "x" where i > 1
-└Output field names ["i"]
-
----- 1089
-SELECT i FROM t WHERE i > 0 && i > 2;
-┌Iterate all rows of table "t" using index "x" where i > 2
-└Output field names ["i"]
-
----- 1090
-SELECT i FROM t WHERE i > 0 && i <= -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1091
-SELECT i FROM t WHERE i > 0 && i <= -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1092
-SELECT i FROM t WHERE i > 0 && i <= 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1093
-SELECT i FROM t WHERE i > 0 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i > 0 && i <= 1
-└Output field names ["i"]
-
----- 1094
-SELECT i FROM t WHERE i > 0 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i > 0 && i <= 2
-└Output field names ["i"]
-
----- 1095
-SELECT i FROM t WHERE i > 0 && i < -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1096
-SELECT i FROM t WHERE i > 0 && i < -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1097
-SELECT i FROM t WHERE i > 0 && i < 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1098
-SELECT i FROM t WHERE i > 0 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i > 0 && i < 1
-└Output field names ["i"]
-
----- 1099
-SELECT i FROM t WHERE i > 0 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i > 0 && i < 2
-└Output field names ["i"]
-
----- 1100
-SELECT i FROM t WHERE i > 0 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1101
-SELECT i FROM t WHERE i > 0 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1102
-SELECT i FROM t WHERE i > 0 && i != 0;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1103
-SELECT i FROM t WHERE i > 0 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-┌Filter on i != 1
-└Output field names ["i"]
-
----- 1104
-SELECT i FROM t WHERE i > 0 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-┌Filter on i != 2
-└Output field names ["i"]
-
----- 1105
-SELECT i FROM t WHERE i <= 0 && i == -2;
-┌Iterate all rows of table "t" using index "x" where i == -2
-└Output field names ["i"]
-
----- 1106
-SELECT i FROM t WHERE i <= 0 && i == -1;
-┌Iterate all rows of table "t" using index "x" where i == -1
-└Output field names ["i"]
-
----- 1107
-SELECT i FROM t WHERE i <= 0 && i == 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1108
-SELECT i FROM t WHERE i <= 0 && i == 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1109
-SELECT i FROM t WHERE i <= 0 && i == 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1110
-SELECT i FROM t WHERE i <= 0 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i >= -2 && i <= 0
-└Output field names ["i"]
-
----- 1111
-SELECT i FROM t WHERE i <= 0 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 0
-└Output field names ["i"]
-
----- 1112
-SELECT i FROM t WHERE i <= 0 && i >= 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1113
-SELECT i FROM t WHERE i <= 0 && i >= 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1114
-SELECT i FROM t WHERE i <= 0 && i >= 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1115
-SELECT i FROM t WHERE i <= 0 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i > -2 && i <= 0
-└Output field names ["i"]
-
----- 1116
-SELECT i FROM t WHERE i <= 0 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 0
-└Output field names ["i"]
-
----- 1117
-SELECT i FROM t WHERE i <= 0 && i > 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1118
-SELECT i FROM t WHERE i <= 0 && i > 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1119
-SELECT i FROM t WHERE i <= 0 && i > 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1120
-SELECT i FROM t WHERE i <= 0 && i <= -2;
-┌Iterate all rows of table "t" using index "x" where i <= -2
-└Output field names ["i"]
-
----- 1121
-SELECT i FROM t WHERE i <= 0 && i <= -1;
-┌Iterate all rows of table "t" using index "x" where i <= -1
-└Output field names ["i"]
-
----- 1122
-SELECT i FROM t WHERE i <= 0 && i <= 0;
-┌Iterate all rows of table "t" using index "x" where i <= 0
-└Output field names ["i"]
-
----- 1123
-SELECT i FROM t WHERE i <= 0 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i <= 0
-└Output field names ["i"]
-
----- 1124
-SELECT i FROM t WHERE i <= 0 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i <= 0
-└Output field names ["i"]
-
----- 1125
-SELECT i FROM t WHERE i <= 0 && i < -2;
-┌Iterate all rows of table "t" using index "x" where i < -2
-└Output field names ["i"]
-
----- 1126
-SELECT i FROM t WHERE i <= 0 && i < -1;
-┌Iterate all rows of table "t" using index "x" where i < -1
-└Output field names ["i"]
-
----- 1127
-SELECT i FROM t WHERE i <= 0 && i < 0;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1128
-SELECT i FROM t WHERE i <= 0 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i <= 0
-└Output field names ["i"]
-
----- 1129
-SELECT i FROM t WHERE i <= 0 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i <= 0
-└Output field names ["i"]
-
----- 1130
-SELECT i FROM t WHERE i <= 0 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i <= 0
-└Output field names ["i"]
-┌Filter on i != -2
-└Output field names ["i"]
-
----- 1131
-SELECT i FROM t WHERE i <= 0 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i <= 0
-└Output field names ["i"]
-┌Filter on i != -1
-└Output field names ["i"]
-
----- 1132
-SELECT i FROM t WHERE i <= 0 && i != 0;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1133
-SELECT i FROM t WHERE i <= 0 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i <= 0
-└Output field names ["i"]
-
----- 1134
-SELECT i FROM t WHERE i <= 0 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i <= 0
-└Output field names ["i"]
-
----- 1135
-SELECT i FROM t WHERE i < 0 && i == -2;
-┌Iterate all rows of table "t" using index "x" where i == -2
-└Output field names ["i"]
-
----- 1136
-SELECT i FROM t WHERE i < 0 && i == -1;
-┌Iterate all rows of table "t" using index "x" where i == -1
-└Output field names ["i"]
-
----- 1137
-SELECT i FROM t WHERE i < 0 && i == 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1138
-SELECT i FROM t WHERE i < 0 && i == 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1139
-SELECT i FROM t WHERE i < 0 && i == 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1140
-SELECT i FROM t WHERE i < 0 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i >= -2 && i < 0
-└Output field names ["i"]
-
----- 1141
-SELECT i FROM t WHERE i < 0 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 0
-└Output field names ["i"]
-
----- 1142
-SELECT i FROM t WHERE i < 0 && i >= 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1143
-SELECT i FROM t WHERE i < 0 && i >= 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1144
-SELECT i FROM t WHERE i < 0 && i >= 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1145
-SELECT i FROM t WHERE i < 0 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i > -2 && i < 0
-└Output field names ["i"]
-
----- 1146
-SELECT i FROM t WHERE i < 0 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 0
-└Output field names ["i"]
-
----- 1147
-SELECT i FROM t WHERE i < 0 && i > 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1148
-SELECT i FROM t WHERE i < 0 && i > 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1149
-SELECT i FROM t WHERE i < 0 && i > 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1150
-SELECT i FROM t WHERE i < 0 && i <= -2;
-┌Iterate all rows of table "t" using index "x" where i <= -2
-└Output field names ["i"]
-
----- 1151
-SELECT i FROM t WHERE i < 0 && i <= -1;
-┌Iterate all rows of table "t" using index "x" where i <= -1
-└Output field names ["i"]
-
----- 1152
-SELECT i FROM t WHERE i < 0 && i <= 0;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1153
-SELECT i FROM t WHERE i < 0 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1154
-SELECT i FROM t WHERE i < 0 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1155
-SELECT i FROM t WHERE i < 0 && i < -2;
-┌Iterate all rows of table "t" using index "x" where i < -2
-└Output field names ["i"]
-
----- 1156
-SELECT i FROM t WHERE i < 0 && i < -1;
-┌Iterate all rows of table "t" using index "x" where i < -1
-└Output field names ["i"]
-
----- 1157
-SELECT i FROM t WHERE i < 0 && i < 0;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1158
-SELECT i FROM t WHERE i < 0 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1159
-SELECT i FROM t WHERE i < 0 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1160
-SELECT i FROM t WHERE i < 0 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-┌Filter on i != -2
-└Output field names ["i"]
-
----- 1161
-SELECT i FROM t WHERE i < 0 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-┌Filter on i != -1
-└Output field names ["i"]
-
----- 1162
-SELECT i FROM t WHERE i < 0 && i != 0;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1163
-SELECT i FROM t WHERE i < 0 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1164
-SELECT i FROM t WHERE i < 0 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1165
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1166
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == -1;
-┌Iterate all rows of table "t" using index "x" where i == -1
-└Output field names ["i"]
-
----- 1167
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1168
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == 1;
-┌Iterate all rows of table "t" using index "x" where i == 1
-└Output field names ["i"]
-
----- 1169
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1170
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 1
-└Output field names ["i"]
-
----- 1171
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 1
-└Output field names ["i"]
-
----- 1172
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= 0;
-┌Iterate all rows of table "t" using index "x" where i >= 0 && i <= 1
-└Output field names ["i"]
-
----- 1173
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= 1;
-┌Iterate all rows of table "t" using index "x" where i == 1
-└Output field names ["i"]
-
----- 1174
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1175
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 1
-└Output field names ["i"]
-
----- 1176
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1177
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > 0;
-┌Iterate all rows of table "t" using index "x" where i > 0 && i <= 1
-└Output field names ["i"]
-
----- 1178
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1179
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1180
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1181
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= -1;
-┌Iterate all rows of table "t" using index "x" where i == -1
-└Output field names ["i"]
-
----- 1182
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= 0;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 0
-└Output field names ["i"]
-
----- 1183
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 1
-└Output field names ["i"]
-
----- 1184
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 1
-└Output field names ["i"]
-
----- 1185
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1186
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1187
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < 0;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 0
-└Output field names ["i"]
-
----- 1188
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1189
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 1
-└Output field names ["i"]
-
----- 1190
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 1
-└Output field names ["i"]
-
----- 1191
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1192
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != 0;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 1
-└Output field names ["i"]
-┌Filter on i != 0
-└Output field names ["i"]
-
----- 1193
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1194
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 1
-└Output field names ["i"]
-
----- 1195
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1196
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1197
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1198
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == 1;
-┌Iterate all rows of table "t" using index "x" where i == 1
-└Output field names ["i"]
-
----- 1199
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1200
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1201
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1202
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= 0;
-┌Iterate all rows of table "t" using index "x" where i >= 0 && i <= 1
-└Output field names ["i"]
-
----- 1203
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= 1;
-┌Iterate all rows of table "t" using index "x" where i == 1
-└Output field names ["i"]
-
----- 1204
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1205
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1206
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1207
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > 0;
-┌Iterate all rows of table "t" using index "x" where i > 0 && i <= 1
-└Output field names ["i"]
-
----- 1208
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1209
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1210
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1211
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1212
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= 0;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 0
-└Output field names ["i"]
-
----- 1213
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1214
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1215
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1216
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1217
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < 0;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 0
-└Output field names ["i"]
-
----- 1218
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1219
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1220
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1221
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1222
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != 0;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-┌Filter on i != 0
-└Output field names ["i"]
-
----- 1223
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1224
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 1
-└Output field names ["i"]
-
----- 1225
-SELECT i FROM t WHERE i > -1 && i < 1 && i == -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1226
-SELECT i FROM t WHERE i > -1 && i < 1 && i == -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1227
-SELECT i FROM t WHERE i > -1 && i < 1 && i == 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1228
-SELECT i FROM t WHERE i > -1 && i < 1 && i == 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1229
-SELECT i FROM t WHERE i > -1 && i < 1 && i == 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1230
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1231
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1232
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= 0;
-┌Iterate all rows of table "t" using index "x" where i >= 0 && i < 1
-└Output field names ["i"]
-
----- 1233
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1234
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1235
-SELECT i FROM t WHERE i > -1 && i < 1 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1236
-SELECT i FROM t WHERE i > -1 && i < 1 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1237
-SELECT i FROM t WHERE i > -1 && i < 1 && i > 0;
-┌Iterate all rows of table "t" using index "x" where i > 0 && i < 1
-└Output field names ["i"]
-
----- 1238
-SELECT i FROM t WHERE i > -1 && i < 1 && i > 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1239
-SELECT i FROM t WHERE i > -1 && i < 1 && i > 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1240
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1241
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1242
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= 0;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i <= 0
-└Output field names ["i"]
-
----- 1243
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1244
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1245
-SELECT i FROM t WHERE i > -1 && i < 1 && i < -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1246
-SELECT i FROM t WHERE i > -1 && i < 1 && i < -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1247
-SELECT i FROM t WHERE i > -1 && i < 1 && i < 0;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 0
-└Output field names ["i"]
-
----- 1248
-SELECT i FROM t WHERE i > -1 && i < 1 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1249
-SELECT i FROM t WHERE i > -1 && i < 1 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1250
-SELECT i FROM t WHERE i > -1 && i < 1 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1251
-SELECT i FROM t WHERE i > -1 && i < 1 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1252
-SELECT i FROM t WHERE i > -1 && i < 1 && i != 0;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-┌Filter on i != 0
-└Output field names ["i"]
-
----- 1253
-SELECT i FROM t WHERE i > -1 && i < 1 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1254
-SELECT i FROM t WHERE i > -1 && i < 1 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1255
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1256
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == -1;
-┌Iterate all rows of table "t" using index "x" where i == -1
-└Output field names ["i"]
-
----- 1257
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1258
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1259
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1260
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1261
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == -1;
-┌Iterate all rows of table "t" using index "x" where i == -1
-└Output field names ["i"]
-
----- 1262
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 0;
-┌Iterate all rows of table "t" using index "x" where i == 0
-└Output field names ["i"]
-
----- 1263
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1264
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1265
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1266
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1267
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= 0;
-┌Iterate all rows of table "t" using index "x" where i >= 0 && i < 1
-└Output field names ["i"]
-
----- 1268
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1269
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1270
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1271
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1272
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > 0;
-┌Iterate all rows of table "t" using index "x" where i > 0 && i < 1
-└Output field names ["i"]
-
----- 1273
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > 1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1274
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > 2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1275
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1276
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= -1;
-┌Iterate all rows of table "t" using index "x" where i == -1
-└Output field names ["i"]
-
----- 1277
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= 0;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i <= 0
-└Output field names ["i"]
-
----- 1278
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1279
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1280
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < -2;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1281
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < -1;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1282
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < 0;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 0
-└Output field names ["i"]
-
----- 1283
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1284
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1285
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1286
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i > -1 && i < 1
-└Output field names ["i"]
-
----- 1287
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != 0;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-┌Filter on i != 0
-└Output field names ["i"]
-
----- 1288
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1289
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i >= -1 && i < 1
-└Output field names ["i"]
-
----- 1290
-SELECT i FROM t WHERE i != 0 && i == -2;
-┌Iterate all rows of table "t" using index "x" where i == -2
-└Output field names ["i"]
-
----- 1291
-SELECT i FROM t WHERE i != 0 && i == -1;
-┌Iterate all rows of table "t" using index "x" where i == -1
-└Output field names ["i"]
-
----- 1292
-SELECT i FROM t WHERE i != 0 && i == 0;
-┌Iterate no rows
-└Output field names ["i"]
-
----- 1293
-SELECT i FROM t WHERE i != 0 && i == 1;
-┌Iterate all rows of table "t" using index "x" where i == 1
-└Output field names ["i"]
-
----- 1294
-SELECT i FROM t WHERE i != 0 && i == 2;
-┌Iterate all rows of table "t" using index "x" where i == 2
-└Output field names ["i"]
-
----- 1295
-SELECT i FROM t WHERE i != 0 && i >= -2;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i >= -2
-└Output field names ["i"]
-
----- 1296
-SELECT i FROM t WHERE i != 0 && i >= -1;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i >= -1
-└Output field names ["i"]
-
----- 1297
-SELECT i FROM t WHERE i != 0 && i >= 0;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1298
-SELECT i FROM t WHERE i != 0 && i >= 1;
-┌Iterate all rows of table "t" using index "x" where i >= 1
-└Output field names ["i"]
-
----- 1299
-SELECT i FROM t WHERE i != 0 && i >= 2;
-┌Iterate all rows of table "t" using index "x" where i >= 2
-└Output field names ["i"]
-
----- 1300
-SELECT i FROM t WHERE i != 0 && i > -2;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i > -2
-└Output field names ["i"]
-
----- 1301
-SELECT i FROM t WHERE i != 0 && i > -1;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i > -1
-└Output field names ["i"]
-
----- 1302
-SELECT i FROM t WHERE i != 0 && i > 0;
-┌Iterate all rows of table "t" using index "x" where i > 0
-└Output field names ["i"]
-
----- 1303
-SELECT i FROM t WHERE i != 0 && i > 1;
-┌Iterate all rows of table "t" using index "x" where i > 1
-└Output field names ["i"]
-
----- 1304
-SELECT i FROM t WHERE i != 0 && i > 2;
-┌Iterate all rows of table "t" using index "x" where i > 2
-└Output field names ["i"]
-
----- 1305
-SELECT i FROM t WHERE i != 0 && i <= -2;
-┌Iterate all rows of table "t" using index "x" where i <= -2
-└Output field names ["i"]
-
----- 1306
-SELECT i FROM t WHERE i != 0 && i <= -1;
-┌Iterate all rows of table "t" using index "x" where i <= -1
-└Output field names ["i"]
-
----- 1307
-SELECT i FROM t WHERE i != 0 && i <= 0;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1308
-SELECT i FROM t WHERE i != 0 && i <= 1;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i <= 1
-└Output field names ["i"]
-
----- 1309
-SELECT i FROM t WHERE i != 0 && i <= 2;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i <= 2
-└Output field names ["i"]
-
----- 1310
-SELECT i FROM t WHERE i != 0 && i < -2;
-┌Iterate all rows of table "t" using index "x" where i < -2
-└Output field names ["i"]
-
----- 1311
-SELECT i FROM t WHERE i != 0 && i < -1;
-┌Iterate all rows of table "t" using index "x" where i < -1
-└Output field names ["i"]
-
----- 1312
-SELECT i FROM t WHERE i != 0 && i < 0;
-┌Iterate all rows of table "t" using index "x" where i < 0
-└Output field names ["i"]
-
----- 1313
-SELECT i FROM t WHERE i != 0 && i < 1;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i < 1
-└Output field names ["i"]
-
----- 1314
-SELECT i FROM t WHERE i != 0 && i < 2;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i < 2
-└Output field names ["i"]
-
----- 1315
-SELECT i FROM t WHERE i != 0 && i != -2;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i != -2
-└Output field names ["i"]
-
----- 1316
-SELECT i FROM t WHERE i != 0 && i != -1;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i != -1
-└Output field names ["i"]
-
----- 1317
-SELECT i FROM t WHERE i != 0 && i != 0;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-
----- 1318
-SELECT i FROM t WHERE i != 0 && i != 1;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i != 1
-└Output field names ["i"]
-
----- 1319
-SELECT i FROM t WHERE i != 0 && i != 2;
-┌Iterate all rows of table "t" using index "x" where i != 0
-└Output field names ["i"]
-┌Filter on i != 2
-└Output field names ["i"]
-
----- 1320
-SELECT * FROM t WHERE i > 0 && j > 0 ORDER BY i, j;
-┌Iterate all rows of table "t"
-└Output field names ["i" "j" "k"]
-┌Filter on i > 0 && j > 0
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-│CREATE INDEX xt_j ON t(j);
-└Output field names ["i" "j" "k"]
-┌Order by i, j,
-└Output field names ["i" "j" "k"]
-
----- 1321
-SELECT * FROM t WHERE i > 0 && j > 0 ORDER BY i, j;
-┌Iterate all rows of table "t" using index "xi" where i > 0
-└Output field names ["i" "j" "k"]
-┌Filter on j > 0
-└Output field names ["i" "j" "k"]
-┌Order by i, j,
-└Output field names ["i" "j" "k"]
-
----- 1322
-SELECT * FROM t WHERE i > 0 && j > 0 ORDER BY i, j;
-┌Iterate all rows of table "t" using index "xj" where j > 0
-└Output field names ["i" "j" "k"]
-┌Filter on i > 0
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i" "j" "k"]
-┌Order by i, j,
-└Output field names ["i" "j" "k"]
-
----- 1323
-SELECT * FROM t WHERE i > 0 && j > 0 ORDER BY i, j;
-┌Iterate all rows of table "t" using index "xi" where i > 0
-└Output field names ["i" "j" "k"]
-┌Filter on j > 0
-└Output field names ["i" "j" "k"]
-┌Order by i, j,
-└Output field names ["i" "j" "k"]
-
----- 1324
-SELECT * FROM t WHERE j > 0 && i > 0 ORDER BY i, j;
-┌Iterate all rows of table "t" using index "xj" where j > 0
-└Output field names ["i" "j" "k"]
-┌Filter on i > 0
-└Output field names ["i" "j" "k"]
-┌Order by i, j,
-└Output field names ["i" "j" "k"]
-
----- 1325
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0;
-┌Iterate all rows of table "t"
-└Output field names ["i" "j" "k"]
-┌Filter on i > 0 && j > 0 && k > 0
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-│CREATE INDEX xt_j ON t(j);
-│CREATE INDEX xt_k ON t(k);
-└Output field names ["i" "j" "k"]
-
----- 1326
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0;
-┌Iterate all rows of table "t" using index "xi" where i > 0
-└Output field names ["i" "j" "k"]
-┌Filter on j > 0 && k > 0
-└Output field names ["i" "j" "k"]
-
----- 1327
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0;
-┌Iterate all rows of table "t" using index "xj" where j > 0
-└Output field names ["i" "j" "k"]
-┌Filter on i > 0 && k > 0
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i" "j" "k"]
-
----- 1328
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0;
-┌Iterate all rows of table "t" using index "xk" where k > 0
-└Output field names ["i" "j" "k"]
-┌Filter on i > 0 && j > 0
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-│CREATE INDEX xt_j ON t(j);
-└Output field names ["i" "j" "k"]
-
----- 1329
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-┌Iterate all rows of table "t"
-└Output field names ["i" "j" "k" "l"]
-┌Filter on i > 0 && j > 0 && k > 0 && l > 0
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-│CREATE INDEX xt_j ON t(j);
-│CREATE INDEX xt_k ON t(k);
-│CREATE INDEX xt_l ON t(l);
-└Output field names ["i" "j" "k" "l"]
-
----- 1330
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-┌Iterate all rows of table "t" using index "xi" where i > 0
-└Output field names ["i" "j" "k" "l"]
-┌Filter on j > 0 && k > 0 && l > 0
-└Output field names ["i" "j" "k" "l"]
-
----- 1331
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-┌Iterate all rows of table "t" using index "xj" where j > 0
-└Output field names ["i" "j" "k" "l"]
-┌Filter on i > 0 && k > 0 && l > 0
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i" "j" "k" "l"]
-
----- 1332
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-┌Iterate all rows of table "t" using index "xk" where k > 0
-└Output field names ["i" "j" "k" "l"]
-┌Filter on i > 0 && j > 0 && l > 0
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-│CREATE INDEX xt_j ON t(j);
-└Output field names ["i" "j" "k" "l"]
-
----- 1333
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-┌Iterate all rows of table "t" using index "xl" where l > 0
-└Output field names ["i" "j" "k" "l"]
-┌Filter on i > 0 && j > 0 && k > 0
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-│CREATE INDEX xt_j ON t(j);
-│CREATE INDEX xt_k ON t(k);
-└Output field names ["i" "j" "k" "l"]
-
----- 1334
-SELECT * FROM t WHERE i > 12 && i >= 10 && i <= 20 && i < 15 ORDER BY i;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Filter on i > 12 && i >= 10 && i <= 20 && i < 15
-│Possibly useful indices
-│CREATE INDEX xt_i ON t(i);
-└Output field names ["i"]
-┌Order by i,
-└Output field names ["i"]
-
----- 1335
-SELECT * FROM t WHERE i > 12 && i >= 10 && i <= 20 && i < 42;
-┌Iterate all rows of table "t" using index "xt_i" where i > 12 && i <= 20
-└Output field names ["i"]
-
----- 1336
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-
----- 1337
-SELECT * FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-
----- 1340
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["t"]
-┌Group by distinct rows
-└Output field names ["t"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 1341
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Group by distinct rows
-└Output field names ["i"]
-┌Evaluate count() as "",
-└Output field names [""]
-
----- 1342
-SELECT count() FROM t;
-┌Iterate all rows of table "t"
-└Output field names ["i"]
-┌Group by distinct rows
-└Output field names ["i"]
-┌Evaluate count() as "",
-└Output field names [""]
-
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/testdata.ql b/Godeps/_workspace/src/github.com/cznic/ql/testdata.ql
deleted file mode 100644
index 2272a66239..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/ql/testdata.ql
+++ /dev/null
@@ -1,15633 +0,0 @@
-// Copyright (c) 2014 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// vi:filetype=sql
-
--- 0
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int);
-	INSERT INTO t VALUES(11, 22, 33);
-COMMIT;
-SELECT * FROM t;
-|"c1", "c2", "c3"
-[11 22 33]
-
--- 1
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int);
-	CREATE TABLE t (c1 int);
-COMMIT;
-||table.*exists
-
--- 2
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c1 int, c4 int);
-COMMIT;
-||duplicate column
-
--- 3
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int);
-	ALTER TABLE t ADD c4 string;
-	INSERT INTO t VALUES (1, 2, 3, "foo");
-COMMIT;
-SELECT * FROM t;
-|"c1", "c2", "c3", "c4"
-[1 2 3 foo]
-
--- 4
-BEGIN TRANSACTION;
-	ALTER TABLE none ADD c1 int;
-COMMIT;
-||table .* not exist
-
--- 5
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int);
-	ALTER TABLE t ADD c2 int;
-COMMIT;
-||column .* exists
-
--- 6
-BEGIN TRANSACTION;
-	ALTER TABLE none DROP COLUMN c1;
-COMMIT;
-||table .* not exist
-
--- 7
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int);
-	ALTER TABLE t DROP COLUMN c4;
-COMMIT;
-||column .* not exist
-
--- 8
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int);
-	ALTER TABLE t DROP COLUMN c2;
-	INSERT INTO t VALUES (1, 2);
-COMMIT;
-SELECT * FROM t;
-|"c1", "c3"
-[1 2]
-
--- 9
-BEGIN TRANSACTION;
-	DROP TABLE none;
-COMMIT;
-||table .* not exist
-
--- 10
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int);
-	DROP TABLE t;
-COMMIT;
-SELECT * FROM t;
-||table .* not exist
-
--- 11
-BEGIN TRANSACTION;
-	INSERT INTO none VALUES (1, 2);
-COMMIT;
-||table .* not exist
-
--- 12
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int);
-	INSERT INTO t VALUES (1);
-COMMIT;
-||expect
-
--- 13
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int);
-	INSERT INTO t VALUES (1, 2, 3);
-COMMIT;
-||expect
-
--- 14
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int);
-	INSERT INTO t VALUES (1, 2/(3*5-15));
-COMMIT;
-||division by zero
-
--- 15
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int);
-	INSERT INTO t VALUES (2+3*4, 2*3+4);
-COMMIT;
-SELECT * FROM t;
-|"c1", "c2"
-[14 10]
-
--- 16
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int, c4 int);
-	INSERT INTO t (c2, c4) VALUES (1);
-COMMIT;
-||expect
-
--- 17
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int, c4 int);
-	INSERT INTO t (c2, c4) VALUES (1, 2, 3);
-COMMIT;
-||expect
-
--- 18
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int, c4 int);
-	INSERT INTO t (c2, none) VALUES (1, 2);
-COMMIT;
-||unknown
-
--- 19
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int, c4 int);
-	INSERT INTO t (c2, c3) VALUES (2+3*4, 2*3+4);
-	INSERT INTO t VALUES (1, 2, 3, 4, );
-COMMIT;
-SELECT * FROM t;
-|"c1", "c2", "c3", "c4"
-[1 2 3 4]
-[<nil> 14 10 <nil>]
-
--- 20
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 int, c3 int, c4 int);
-	ALTER TABLE t DROP COLUMN c3;
-	INSERT INTO t (c1, c4) VALUES (42, 314);
-	INSERT INTO t (c1, c2) VALUES (2+3*4, 2*3+4);
-	INSERT INTO t VALUES (1, 2, 3);
-COMMIT;
-SELECT * FROM t;
-|"c1", "c2", "c4"
-[1 2 3]
-[14 10 <nil>]
-[42 <nil> 314]
-
--- 21
-BEGIN TRANSACTION;
-	TRUNCATE TABLE none;
-COMMIT;
-||table .* not exist
-
--- 22
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int);
-	INSERT INTO t VALUES(278);
-	TRUNCATE TABLE t;
-	INSERT INTO t VALUES(314);
-COMMIT;
-SELECT * FROM t;
-|"c1"
-[314]
-
--- 23
-SELECT * FROM none;
-||table .* not exist
-
--- 24
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (2, "b");
-	INSERT INTO t VALUES (1, "a");
-COMMIT;
-SELECT * FROM t;
-|"c1", "c2"
-[1 a]
-[2 b]
-
--- 25
-SELECT c1 FROM none;
-||table .* not exist
-
--- 26
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (2, "b");
-COMMIT;
-SELECT none FROM t;
-||unknown
-
--- 27
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (2, "b");
-COMMIT;
-SELECT c1, none, c2 FROM t;
-||unknown
-
--- 28
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int32, c2 string);
-	INSERT INTO t VALUES (2, "b");
-	INSERT INTO t VALUES (1, "a");
-COMMIT;
-SELECT 3*c1 AS v FROM t;
-|"v"
-[3]
-[6]
-
--- 29
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (2, "b");
-	INSERT INTO t VALUES (1, "a");
-COMMIT;
-SELECT c2 FROM t;
-|"c2"
-[a]
-[b]
-
--- 30
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (2, "b");
-	INSERT INTO t VALUES (1, "a");
-COMMIT;
-SELECT c1 AS X, c2 FROM t;
-|"X", "c2"
-[1 a]
-[2 b]
-
--- 31
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (2, "b");
-	INSERT INTO t VALUES (1, "a");
-COMMIT;
-SELECT c2, c1 AS Y FROM t;
-|"c2", "Y"
-[a 1]
-[b 2]
-
--- 32
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (2, "b");
-COMMIT;
-SELECT * FROM t WHERE c3 == 1;
-||unknown
-
--- 33
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (2, "b");
-COMMIT;
-SELECT * FROM t WHERE c1 == 1;
-|"c1", "c2"
-[1 a]
-
--- 34
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (2, "b");
-COMMIT;
-SELECT * FROM t ORDER BY c3;
-||unknown
-
--- 35
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int32, c2 string);
-	INSERT INTO t VALUES (22, "bc");
-	INSERT INTO t VALUES (11, "ab");
-	INSERT INTO t VALUES (33, "cd");
-COMMIT;
-SELECT * FROM t ORDER BY c1;
-|"c1", "c2"
-[11 ab]
-[22 bc]
-[33 cd]
-
--- 36
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (2, "b");
-COMMIT;
-SELECT * FROM t ORDER BY c1 ASC;
-|"c1", "c2"
-[1 a]
-[2 b]
-
--- 37
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (2, "b");
-COMMIT;
-SELECT * FROM t ORDER BY c1 DESC;
-|"c1", "c2"
-[2 b]
-[1 a]
-
--- 38
-BEGIN TRANSACTION;
-CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (2, "b");
-	INSERT INTO t VALUES (3, "c");
-	INSERT INTO t VALUES (4, "d");
-	INSERT INTO t VALUES (5, "e");
-	INSERT INTO t VALUES (6, "f");
-	INSERT INTO t VALUES (7, "g");
-COMMIT;
-SELECT * FROM t
-WHERE c1 % 2 == 0
-ORDER BY c2 DESC;
-|"c1", "c2"
-[6 f]
-[4 d]
-[2 b]
-
--- 39
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (2, "a");
-	INSERT INTO t VALUES (3, "b");
-	INSERT INTO t VALUES (4, "b");
-	INSERT INTO t VALUES (5, "c");
-	INSERT INTO t VALUES (6, "c");
-	INSERT INTO t VALUES (7, "d");
-COMMIT;
-SELECT * FROM t
-ORDER BY c1, c2;
-|"c1", "c2"
-[1 a]
-[2 a]
-[3 b]
-[4 b]
-[5 c]
-[6 c]
-[7 d]
-
--- 40
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int, c2 string);
-	INSERT INTO t VALUES (1, "d");
-	INSERT INTO t VALUES (2, "c");
-	INSERT INTO t VALUES (3, "c");
-	INSERT INTO t VALUES (4, "b");
-	INSERT INTO t VALUES (5, "b");
-	INSERT INTO t VALUES (6, "a");
-	INSERT INTO t VALUES (7, "a");
-COMMIT;
-SELECT * FROM t
-ORDER BY c2, c1
-|"c1", "c2"
-[6 a]
-[7 a]
-[4 b]
-[5 b]
-[2 c]
-[3 c]
-[1 d]
-
--- S 41
-SELECT * FROM employee, none;
-||table .* not exist
-
--- S 42
-SELECT employee.LastName FROM employee, none;
-||table .* not exist
-
--- S 43
-SELECT none FROM employee, department;
-||unknown
-
--- S 44
-SELECT employee.LastName FROM employee, department;
-|"employee.LastName"
-[Williams]
-[Williams]
-[Williams]
-[Williams]
-[Smith]
-[Smith]
-[Smith]
-[Smith]
-[Robinson]
-[Robinson]
-[Robinson]
-[Robinson]
-[Heisenberg]
-[Heisenberg]
-[Heisenberg]
-[Heisenberg]
-[Jones]
-[Jones]
-[Jones]
-[Jones]
-[Rafferty]
-[Rafferty]
-[Rafferty]
-[Rafferty]
-
--- S 45
-SELECT * FROM employee, department
-ORDER by employee.LastName;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[Heisenberg 33 35 Marketing]
-[Heisenberg 33 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Heisenberg 33 31 Sales]
-[Jones 33 35 Marketing]
-[Jones 33 34 Clerical]
-[Jones 33 33 Engineering]
-[Jones 33 31 Sales]
-[Rafferty 31 35 Marketing]
-[Rafferty 31 34 Clerical]
-[Rafferty 31 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 35 Marketing]
-[Robinson 34 34 Clerical]
-[Robinson 34 33 Engineering]
-[Robinson 34 31 Sales]
-[Smith 34 35 Marketing]
-[Smith 34 34 Clerical]
-[Smith 34 33 Engineering]
-[Smith 34 31 Sales]
-[Williams <nil> 35 Marketing]
-[Williams <nil> 34 Clerical]
-[Williams <nil> 33 Engineering]
-[Williams <nil> 31 Sales]
-
--- S 46
-SELECT *
-FROM employee, department
-WHERE employee.DepartmentID == department.DepartmentID;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[Smith 34 34 Clerical]
-[Robinson 34 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-
--- S 47
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID
-FROM employee, department
-WHERE employee.DepartmentID == department.DepartmentID
-ORDER BY department.DepartmentName, employee.LastName;
-|"department.DepartmentName", "department.DepartmentID", "employee.LastName", "employee.DepartmentID"
-[Clerical 34 Robinson 34]
-[Clerical 34 Smith 34]
-[Engineering 33 Heisenberg 33]
-[Engineering 33 Jones 33]
-[Sales 31 Rafferty 31]
-
--- S 48
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID
-FROM employee, department
-WHERE department.DepartmentName IN ("Sales", "Engineering", "HR", "Clerical")
-ORDER BY employee.LastName;
-|"department.DepartmentName", "department.DepartmentID", "employee.LastName", "employee.DepartmentID"
-[Clerical 34 Heisenberg 33]
-[Engineering 33 Heisenberg 33]
-[Sales 31 Heisenberg 33]
-[Clerical 34 Jones 33]
-[Engineering 33 Jones 33]
-[Sales 31 Jones 33]
-[Clerical 34 Rafferty 31]
-[Engineering 33 Rafferty 31]
-[Sales 31 Rafferty 31]
-[Clerical 34 Robinson 34]
-[Engineering 33 Robinson 34]
-[Sales 31 Robinson 34]
-[Clerical 34 Smith 34]
-[Engineering 33 Smith 34]
-[Sales 31 Smith 34]
-[Clerical 34 Williams <nil>]
-[Engineering 33 Williams <nil>]
-[Sales 31 Williams <nil>]
-
--- S 49
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID
-FROM employee, department
-WHERE (department.DepartmentID+1000) IN (1031, 1035, 1036)
-ORDER BY employee.LastName;
-|"department.DepartmentName", "department.DepartmentID", "employee.LastName", "employee.DepartmentID"
-[Marketing 35 Heisenberg 33]
-[Sales 31 Heisenberg 33]
-[Marketing 35 Jones 33]
-[Sales 31 Jones 33]
-[Marketing 35 Rafferty 31]
-[Sales 31 Rafferty 31]
-[Marketing 35 Robinson 34]
-[Sales 31 Robinson 34]
-[Marketing 35 Smith 34]
-[Sales 31 Smith 34]
-[Marketing 35 Williams <nil>]
-[Sales 31 Williams <nil>]
-
--- S 50
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID
-FROM employee, department
-WHERE department.DepartmentName NOT IN ("Engineering", "HR", "Clerical");
-|"department.DepartmentName", "department.DepartmentID", "employee.LastName", "employee.DepartmentID"
-[Marketing 35 Williams <nil>]
-[Sales 31 Williams <nil>]
-[Marketing 35 Smith 34]
-[Sales 31 Smith 34]
-[Marketing 35 Robinson 34]
-[Sales 31 Robinson 34]
-[Marketing 35 Heisenberg 33]
-[Sales 31 Heisenberg 33]
-[Marketing 35 Jones 33]
-[Sales 31 Jones 33]
-[Marketing 35 Rafferty 31]
-[Sales 31 Rafferty 31]
-
--- S 51
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID
-FROM employee, department
-WHERE department.DepartmentID BETWEEN 34 AND 36
-ORDER BY employee.LastName;
-|"department.DepartmentName", "department.DepartmentID", "employee.LastName", "employee.DepartmentID"
-[Marketing 35 Heisenberg 33]
-[Clerical 34 Heisenberg 33]
-[Marketing 35 Jones 33]
-[Clerical 34 Jones 33]
-[Marketing 35 Rafferty 31]
-[Clerical 34 Rafferty 31]
-[Marketing 35 Robinson 34]
-[Clerical 34 Robinson 34]
-[Marketing 35 Smith 34]
-[Clerical 34 Smith 34]
-[Marketing 35 Williams <nil>]
-[Clerical 34 Williams <nil>]
-
--- S 52
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID
-FROM employee, department
-WHERE department.DepartmentID BETWEEN int64(34) AND int64(36)
-ORDER BY employee.LastName;
-|"department.DepartmentName", "department.DepartmentID", "employee.LastName", "employee.DepartmentID"
-[Marketing 35 Heisenberg 33]
-[Clerical 34 Heisenberg 33]
-[Marketing 35 Jones 33]
-[Clerical 34 Jones 33]
-[Marketing 35 Rafferty 31]
-[Clerical 34 Rafferty 31]
-[Marketing 35 Robinson 34]
-[Clerical 34 Robinson 34]
-[Marketing 35 Smith 34]
-[Clerical 34 Smith 34]
-[Marketing 35 Williams <nil>]
-[Clerical 34 Williams <nil>]
-
--- S 53
-SELECT department.DepartmentName, department.DepartmentID, employee.LastName, employee.DepartmentID
-FROM employee, department
-WHERE department.DepartmentID NOT BETWEEN 33 AND 34 //TODO plan for 'or' in this case is possible.
-ORDER BY employee.LastName;
-|"department.DepartmentName", "department.DepartmentID", "employee.LastName", "employee.DepartmentID"
-[Marketing 35 Heisenberg 33]
-[Sales 31 Heisenberg 33]
-[Marketing 35 Jones 33]
-[Sales 31 Jones 33]
-[Marketing 35 Rafferty 31]
-[Sales 31 Rafferty 31]
-[Marketing 35 Robinson 34]
-[Sales 31 Robinson 34]
-[Marketing 35 Smith 34]
-[Sales 31 Smith 34]
-[Marketing 35 Williams <nil>]
-[Sales 31 Williams <nil>]
-
--- S 54
-SELECT LastName, LastName FROM employee;
-||duplicate
-
--- S 55
-SELECT LastName+", " AS a, LastName AS a FROM employee;
-||duplicate
-
--- S 56
-SELECT LastName AS a, LastName AS b FROM employee
-ORDER by a, b;
-|"a", "b"
-[Heisenberg Heisenberg]
-[Jones Jones]
-[Rafferty Rafferty]
-[Robinson Robinson]
-[Smith Smith]
-[Williams Williams]
-
--- S 57
-SELECT employee.LastName AS name, employee.DepartmentID AS id, department.DepartmentName AS department, department.DepartmentID AS id2
-FROM employee, department
-WHERE employee.DepartmentID == department.DepartmentID
-ORDER BY name, id, department, id2;
-|"name", "id", "department", "id2"
-[Heisenberg 33 Engineering 33]
-[Jones 33 Engineering 33]
-[Rafferty 31 Sales 31]
-[Robinson 34 Clerical 34]
-[Smith 34 Clerical 34]
-
--- S 58
-SELECT * FROM;
-||expected .*RecordSetList
-
--- S 59
-SELECT * FROM employee
-ORDER BY LastName;
-|"LastName", "DepartmentID"
-[Heisenberg 33]
-[Jones 33]
-[Rafferty 31]
-[Robinson 34]
-[Smith 34]
-[Williams <nil>]
-
--- S 60
-SELECT * FROM employee AS e
-ORDER BY LastName;
-|"LastName", "DepartmentID"
-[Heisenberg 33]
-[Jones 33]
-[Rafferty 31]
-[Robinson 34]
-[Smith 34]
-[Williams <nil>]
-
--- S 61
-SELECT none FROM (
-	SELECT * FROM employee;
-	SELECT * FROM department;
-);
-||expected .*'\)'
-
--- S 62
-SELECT none FROM (
-	SELECT * FROM employee;
-);
-||unknown
-
--- S 63
-SELECT noneCol FROM (
-	SELECT * FROM noneTab
-);
-||not exist
-
--- S 64
-SELECT noneCol FROM (
-	SELECT * FROM employee
-);
-||unknown
-
--- S 65
-SELECT * FROM (
-	SELECT * FROM employee
-)
-ORDER BY LastName;
-|"LastName", "DepartmentID"
-[Heisenberg 33]
-[Jones 33]
-[Rafferty 31]
-[Robinson 34]
-[Smith 34]
-[Williams <nil>]
-
--- S 66
-SELECT * FROM (
-	SELECT LastName AS Name FROM employee
-)
-ORDER BY Name;
-|"Name"
-[Heisenberg]
-[Jones]
-[Rafferty]
-[Robinson]
-[Smith]
-[Williams]
-
--- S 67
-SELECT Name FROM (
-	SELECT LastName AS name FROM employee
-);
-||unknown
-
--- S 68
-SELECT name AS Name FROM (
-	SELECT LastName AS name
-	FROM employee AS e
-)
-ORDER BY Name;
-|"Name"
-[Heisenberg]
-[Jones]
-[Rafferty]
-[Robinson]
-[Smith]
-[Williams]
-
--- S 69
-SELECT name AS Name FROM (
-	SELECT LastName AS name FROM employee
-)
-ORDER BY Name;
-|"Name"
-[Heisenberg]
-[Jones]
-[Rafferty]
-[Robinson]
-[Smith]
-[Williams]
-
--- S 70
-SELECT employee.LastName, department.DepartmentName, department.DepartmentID FROM (
-	SELECT *
-	FROM employee, department
-	WHERE employee.DepartmentID == department.DepartmentID
-)
-ORDER BY department.DepartmentName, employee.LastName
-|"employee.LastName", "department.DepartmentName", "department.DepartmentID"
-[Robinson Clerical 34]
-[Smith Clerical 34]
-[Heisenberg Engineering 33]
-[Jones Engineering 33]
-[Rafferty Sales 31]
-
--- S 71
-SELECT e.LastName, d.DepartmentName, d.DepartmentID FROM (
-	SELECT *
-	FROM employee AS e, department AS d
-	WHERE e.DepartmentID == d.DepartmentID
-)
-ORDER by d.DepartmentName, e.LastName;
-|"e.LastName", "d.DepartmentName", "d.DepartmentID"
-[Robinson Clerical 34]
-[Smith Clerical 34]
-[Heisenberg Engineering 33]
-[Jones Engineering 33]
-[Rafferty Sales 31]
-
--- S 72
-SELECT e.LastName AS name, d.DepartmentName AS department, d.DepartmentID AS id FROM (
-	SELECT *
-	FROM employee AS e, department AS d
-	WHERE e.DepartmentID == d.DepartmentID
-)
-ORDER by department, name
-|"name", "department", "id"
-[Robinson Clerical 34]
-[Smith Clerical 34]
-[Heisenberg Engineering 33]
-[Jones Engineering 33]
-[Rafferty Sales 31]
-
--- S 73
-SELECT name, department, id FROM (
-	SELECT e.LastName AS name, e.DepartmentID AS id, d.DepartmentName AS department, d.DepartmentID AS fid
-	FROM employee AS e, department AS d
-	WHERE e.DepartmentID == d.DepartmentID
-)
-ORDER by department, name;
-|"name", "department", "id"
-[Robinson Clerical 34]
-[Smith Clerical 34]
-[Heisenberg Engineering 33]
-[Jones Engineering 33]
-[Rafferty Sales 31]
-
--- S 74
-SELECT *
-FROM
-(
-	SELECT *
-	FROM employee
-),
-(
-	SELECT *
-	FROM department
-);
-|"", "", "", ""
-[Williams <nil> 35 Marketing]
-[Williams <nil> 34 Clerical]
-[Williams <nil> 33 Engineering]
-[Williams <nil> 31 Sales]
-[Smith 34 35 Marketing]
-[Smith 34 34 Clerical]
-[Smith 34 33 Engineering]
-[Smith 34 31 Sales]
-[Robinson 34 35 Marketing]
-[Robinson 34 34 Clerical]
-[Robinson 34 33 Engineering]
-[Robinson 34 31 Sales]
-[Heisenberg 33 35 Marketing]
-[Heisenberg 33 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Heisenberg 33 31 Sales]
-[Jones 33 35 Marketing]
-[Jones 33 34 Clerical]
-[Jones 33 33 Engineering]
-[Jones 33 31 Sales]
-[Rafferty 31 35 Marketing]
-[Rafferty 31 34 Clerical]
-[Rafferty 31 33 Engineering]
-[Rafferty 31 31 Sales]
-
--- S 75
-SELECT *
-FROM
-(
-	SELECT *
-	FROM employee
-) AS e,
-(
-	SELECT *
-	FROM department
-)
-ORDER BY e.LastName, e.DepartmentID;
-|"e.LastName", "e.DepartmentID", "", ""
-[Heisenberg 33 35 Marketing]
-[Heisenberg 33 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Heisenberg 33 31 Sales]
-[Jones 33 35 Marketing]
-[Jones 33 34 Clerical]
-[Jones 33 33 Engineering]
-[Jones 33 31 Sales]
-[Rafferty 31 35 Marketing]
-[Rafferty 31 34 Clerical]
-[Rafferty 31 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 35 Marketing]
-[Robinson 34 34 Clerical]
-[Robinson 34 33 Engineering]
-[Robinson 34 31 Sales]
-[Smith 34 35 Marketing]
-[Smith 34 34 Clerical]
-[Smith 34 33 Engineering]
-[Smith 34 31 Sales]
-[Williams <nil> 35 Marketing]
-[Williams <nil> 34 Clerical]
-[Williams <nil> 33 Engineering]
-[Williams <nil> 31 Sales]
-
--- S 76
-SELECT *
-FROM
-(
-	SELECT *
-	FROM employee
-),
-(
-	SELECT *
-	FROM department
-) AS d
-ORDER BY d.DepartmentID DESC;
-|"", "", "d.DepartmentID", "d.DepartmentName"
-[Rafferty 31 35 Marketing]
-[Jones 33 35 Marketing]
-[Heisenberg 33 35 Marketing]
-[Robinson 34 35 Marketing]
-[Smith 34 35 Marketing]
-[Williams <nil> 35 Marketing]
-[Rafferty 31 34 Clerical]
-[Jones 33 34 Clerical]
-[Heisenberg 33 34 Clerical]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-[Williams <nil> 34 Clerical]
-[Rafferty 31 33 Engineering]
-[Jones 33 33 Engineering]
-[Heisenberg 33 33 Engineering]
-[Robinson 34 33 Engineering]
-[Smith 34 33 Engineering]
-[Williams <nil> 33 Engineering]
-[Rafferty 31 31 Sales]
-[Jones 33 31 Sales]
-[Heisenberg 33 31 Sales]
-[Robinson 34 31 Sales]
-[Smith 34 31 Sales]
-[Williams <nil> 31 Sales]
-
--- S 77
-SELECT *
-FROM
-	employee,
-	(
-		SELECT *
-		FROM department
-	)
-ORDER BY employee.LastName;
-|"employee.LastName", "employee.DepartmentID", "", ""
-[Heisenberg 33 35 Marketing]
-[Heisenberg 33 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Heisenberg 33 31 Sales]
-[Jones 33 35 Marketing]
-[Jones 33 34 Clerical]
-[Jones 33 33 Engineering]
-[Jones 33 31 Sales]
-[Rafferty 31 35 Marketing]
-[Rafferty 31 34 Clerical]
-[Rafferty 31 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 35 Marketing]
-[Robinson 34 34 Clerical]
-[Robinson 34 33 Engineering]
-[Robinson 34 31 Sales]
-[Smith 34 35 Marketing]
-[Smith 34 34 Clerical]
-[Smith 34 33 Engineering]
-[Smith 34 31 Sales]
-[Williams <nil> 35 Marketing]
-[Williams <nil> 34 Clerical]
-[Williams <nil> 33 Engineering]
-[Williams <nil> 31 Sales]
-
--- S 78
-SELECT *
-FROM
-(
-	SELECT *
-	FROM employee
-) AS e,
-(
-	SELECT *
-	FROM department
-) AS d
-WHERE e.DepartmentID == d.DepartmentID
-ORDER BY d.DepartmentName, e.LastName;
-|"e.LastName", "e.DepartmentID", "d.DepartmentID", "d.DepartmentName"
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-
--- S 79
-SELECT *
-FROM
-	employee,
-	(
-		SELECT *
-		FROM department
-	) AS d
-WHERE employee.DepartmentID == d.DepartmentID
-ORDER BY d.DepartmentName, employee.LastName;
-|"employee.LastName", "employee.DepartmentID", "d.DepartmentID", "d.DepartmentName"
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-
--- S 80
-SELECT *
-FROM
-	employee AS e,
-	(
-		SELECT *
-		FROM department
-	) AS d
-WHERE e.DepartmentID == d.DepartmentID
-ORDER BY d.DepartmentName, e.LastName;
-|"e.LastName", "e.DepartmentID", "d.DepartmentID", "d.DepartmentName"
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-
--- S 81
-SELECT *
-FROM
-	employee AS e,
-	(
-		SELECT *
-		FROM department
-	) AS d
-WHERE e.DepartmentID == d.DepartmentID == true
-ORDER BY e.DepartmentID, e.LastName;
-|"e.LastName", "e.DepartmentID", "d.DepartmentID", "d.DepartmentName"
-[Rafferty 31 31 Sales]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-
--- S 82
-SELECT *
-FROM
-	employee AS e,
-	(
-		SELECT *
-		FROM department
-	) AS d
-WHERE e.DepartmentID != d.DepartmentID == false
-ORDER BY e.DepartmentID, e.LastName;
-|"e.LastName", "e.DepartmentID", "d.DepartmentID", "d.DepartmentName"
-[Rafferty 31 31 Sales]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-
--- 83
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 bool);
-	INSERT INTO t VALUES (1);
-COMMIT;
-||type int64.*type bool
-
--- 84
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 bool);
-	INSERT INTO t VALUES (true);
-COMMIT;
-SELECT * from t;
-|"c1"
-[true]
-
--- 85
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int8);
-	INSERT INTO t VALUES ("foo");
-COMMIT;
-||type string.*type int8
-
--- 86
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int8);
-	INSERT INTO t VALUES (0x1234);
-COMMIT;
-SELECT * from t;
-||overflow
-
--- 87
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int16);
-	INSERT INTO t VALUES (87);
-COMMIT;
-SELECT * from t;
-|"c1"
-[87]
-
--- 88
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int16);
-	INSERT INTO t VALUES (int16(0x12345678));
-COMMIT;
-SELECT * from t;
-|"c1"
-[22136]
-
--- 89
-BEGIN TRANSACTION;
-CREATE TABLE t (c1 int32);
-	INSERT INTO t VALUES (uint32(1));
-COMMIT;
-||type uint32.*type int32
-
--- 90
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int32);
-	INSERT INTO t VALUES (0xabcd12345678);
-COMMIT;
-SELECT * from t;
-||overflow
-
--- 91
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int64);
-	INSERT INTO t VALUES (int8(1));
-COMMIT;
-||type int8.*type int64
-
--- 92
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int64);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t;
-|"c1"
-[1]
-
--- 93
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int);
-	INSERT INTO t VALUES (int8(1));
-COMMIT;
-||type int8.*type int64
-
--- 94
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int);
-	INSERT INTO t VALUES (94);
-COMMIT;
-SELECT * from t;
-|"c1"
-[94]
-
--- 95
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint8);
-	INSERT INTO t VALUES (95);
-COMMIT;
-SELECT * from t;
-|"c1"
-[95]
-
--- 96
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint8);
-	INSERT INTO t VALUES (uint8(0x1234));
-COMMIT;
-SELECT * from t;
-|"c1"
-[52]
-
--- 97
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 byte);
-	INSERT INTO t VALUES (int8(1));
-COMMIT;
-||type int8.*type uint8
-
--- 98
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint8);
-	INSERT INTO t VALUES (byte(0x1234));
-COMMIT;
-SELECT * from t;
-|"c1"
-[52]
-
--- 99
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint16);
-	INSERT INTO t VALUES (int(1));
-COMMIT;
-||type int64.*uint16
-
--- 100
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint16);
-	INSERT INTO t VALUES (0x12345678);
-COMMIT;
-SELECT * from t;
-||overflow
-
--- 101
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint32);
-	INSERT INTO t VALUES (int32(1));
-COMMIT;
-||type int32.*type uint32
-
--- 102
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint32);
-	INSERT INTO t VALUES (uint32(0xabcd12345678));
-COMMIT;
-SELECT * from t;
-|"c1"
-[305419896]
-
--- 103
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint64);
-	INSERT INTO t VALUES (int(1));
-COMMIT;
-||type int64.*type uint64
-
--- 104
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint64);
-	INSERT INTO t VALUES (uint64(1));
-COMMIT;
-SELECT * from t;
-|"c1"
-[1]
-
--- 105
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint);
-	INSERT INTO t VALUES (int(1));
-COMMIT;
-||type int64.*type uint64
-
--- 106
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t;
-|"c1"
-[1]
-
--- 107
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float32);
-	INSERT INTO t VALUES (107);
-COMMIT;
-SELECT * from t;
-|"c1"
-[107]
-
--- 108
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float32);
-	INSERT INTO t VALUES (float64(1));
-COMMIT;
-SELECT * from t;
-||type float64.*type float32
-
--- 109
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float32);
-	INSERT INTO t VALUES (1.2);
-COMMIT;
-SELECT * from t;
-|"c1"
-[1.2]
-
--- 110
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float64);
-	INSERT INTO t VALUES (1.2);
-COMMIT;
-SELECT * from t;
-|"c1"
-[1.2]
-
--- 111
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float);
-	INSERT INTO t VALUES (111.1);
-COMMIT;
-SELECT * from t;
-|"c1"
-[111.1]
-
--- 112
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float);
-	INSERT INTO t VALUES (-112.1);
-COMMIT;
-SELECT * from t;
-|"c1"
-[-112.1]
-
--- 113
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 complex64);
-	INSERT INTO t VALUES (complex(1, 0.5));
-COMMIT;
-SELECT * from t;
-|"c1"
-[(1+0.5i)]
-
--- 114
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 complex64);
-	INSERT INTO t VALUES (complex128(complex(1, 0.5)));
-COMMIT;
-SELECT * from t;
-||type complex128.*type complex64
-
--- 115
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 complex128);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t;
-|"c1"
-[(1+0i)]
-
--- 116
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 complex128);
-	INSERT INTO t VALUES (complex(1, 0.5));
-COMMIT;
-SELECT * from t;
-|"c1"
-[(1+0.5i)]
-
--- 117
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 string);
-	INSERT INTO t VALUES (1);
-COMMIT;
-||type int64.*type string
-
--- 118
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 string);
-	INSERT INTO t VALUES ("a"+"b");
-COMMIT;
-SELECT * from t;
-|"c1"
-[ab]
-
--- 119
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 bool);
-	INSERT INTO t VALUES (true);
-COMMIT;
-SELECT * from t
-WHERE c1 > 3;
-||operator .* not defined .* bool
-
--- 120
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 bool);
-	INSERT INTO t VALUES (true);
-COMMIT;
-SELECT * from t
-WHERE c1;
-|"c1"
-[true]
-
--- 121
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int8);
-	INSERT INTO t VALUES (float(1));
-COMMIT;
-SELECT * from t
-WHERE c1 == 8;
-||type float64.*type int8
-
--- 122
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int8);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == int8(1);
-|"c1"
-[1]
-
--- 123
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int16);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == int(8);
-||mismatched .* int16 .* int64
-
--- 124
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int16);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == 1;
-|"c1"
-[1]
-
--- 125
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int32);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == int(8);
-||mismatched .* int32 .* int64
-
--- 126
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int32);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == 1;
-|"c1"
-[1]
-
--- 127
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int64);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == byte(8);
-||mismatched .* int64 .* uint8
-
--- 128
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int64);
-	INSERT INTO t VALUES (int64(1));
-COMMIT;
-SELECT * from t
-WHERE c1 == 1;
-|"c1"
-[1]
-
--- 129
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == 1;
-|"c1"
-[1]
-
--- 130
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint8);
-	INSERT INTO t VALUES (byte(1));
-COMMIT;
-SELECT * from t
-WHERE c1 == int8(8);
-||mismatched .* uint8 .* int8
-
--- 131
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint8);
-	INSERT INTO t VALUES (byte(1));
-COMMIT;
-SELECT * from t
-WHERE c1 == 1;
-|"c1"
-[1]
-
--- 132
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint16);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == byte(8);
-||mismatched .* uint16 .* uint8
-
--- 133
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint16);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == 1;
-|"c1"
-[1]
-
--- 134
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint32);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == 1;
-|"c1"
-[1]
-
--- 135
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint64);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == int(8);
-||mismatched .* uint64 .* int64
-
--- 136
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint64);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == 1;
-|"c1"
-[1]
-
--- 137
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 uint);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * from t
-WHERE c1 == 1;
-|"c1"
-[1]
-
--- 138
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float32);
-	INSERT INTO t VALUES (8);
-COMMIT;
-SELECT * from t
-WHERE c1 == byte(8);
-||mismatched .* float32 .* uint8
-
--- 139
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float32);
-	INSERT INTO t VALUES (8);
-COMMIT;
-SELECT * from t
-WHERE c1 == 8;
-|"c1"
-[8]
-
--- 140
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float64);
-	INSERT INTO t VALUES (2);
-COMMIT;
-SELECT * from t
-WHERE c1 == byte(2);
-||mismatched .* float64 .* uint8
-
--- 141
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float64);
-	INSERT INTO t VALUES (2);
-COMMIT;
-SELECT * from t
-WHERE c1 == 2;
-|"c1"
-[2]
-
--- 142
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 float);
-	INSERT INTO t VALUES (2.);
-COMMIT;
-SELECT * from t
-WHERE c1 == 2;
-|"c1"
-[2]
-
--- 143
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 complex64);
-	INSERT INTO t VALUES (complex(2., 5.));
-COMMIT;
-SELECT * from t
-WHERE c1 == "foo";
-||mismatched .* complex64 .* string
-
--- 144
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 complex64);
-	INSERT INTO t VALUES (complex(2, 5.));
-COMMIT;
-SELECT * from t
-WHERE c1 == 2+5i;
-|"c1"
-[(2+5i)]
-
--- 145
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 complex128);
-	INSERT INTO t VALUES (2+5i);
-COMMIT;
-SELECT * from t
-WHERE c1 == "2";
-||mismatched .* complex128 .* string
-
--- 146
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 complex128);
-	INSERT INTO t VALUES (2+5i);
-COMMIT;
-SELECT * from t
-WHERE c1 == complex(2, 5);
-|"c1"
-[(2+5i)]
-
--- 147
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 string);
-	INSERT INTO t VALUES ("foo");
-COMMIT;
-SELECT * from t
-WHERE c1 == 2;
-||mismatched .* string .* int64
-
--- 148
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 string);
-	INSERT INTO t VALUES ("f"+"oo");
-COMMIT;
-SELECT * from t
-WHERE c1 == "fo"+"o";
-|"c1"
-[foo]
-
--- 149
-SELECT 2/(3*5-15) AS foo FROM bar;
-||division by zero
-
--- 150
-SELECT 2.0/(2.0-2.0) AS foo FROM bar;
-||division by zero
-
--- 151
-SELECT 2i/(2i-2i) AS foo FROM bar;
-||division by zero
-
--- 152
-SELECT 2/(3*5-x) AS foo FROM bar;
-||table .* not exist
-
--- S 153
-SELECT 314, 42 AS AUQLUE, DepartmentID, DepartmentID+1000, LastName AS Name
-FROM employee
-ORDER BY Name;
-|"", "AUQLUE", "DepartmentID", "", "Name"
-[314 42 33 1033 Heisenberg]
-[314 42 33 1033 Jones]
-[314 42 31 1031 Rafferty]
-[314 42 34 1034 Robinson]
-[314 42 34 1034 Smith]
-[314 42 <nil> <nil> Williams]
-
--- S 154
-SELECT *
-FROM
-	employee AS e,
-	( SELECT * FROM department)
-ORDER BY e.LastName;
-|"e.LastName", "e.DepartmentID", "", ""
-[Heisenberg 33 35 Marketing]
-[Heisenberg 33 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Heisenberg 33 31 Sales]
-[Jones 33 35 Marketing]
-[Jones 33 34 Clerical]
-[Jones 33 33 Engineering]
-[Jones 33 31 Sales]
-[Rafferty 31 35 Marketing]
-[Rafferty 31 34 Clerical]
-[Rafferty 31 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 35 Marketing]
-[Robinson 34 34 Clerical]
-[Robinson 34 33 Engineering]
-[Robinson 34 31 Sales]
-[Smith 34 35 Marketing]
-[Smith 34 34 Clerical]
-[Smith 34 33 Engineering]
-[Smith 34 31 Sales]
-[Williams <nil> 35 Marketing]
-[Williams <nil> 34 Clerical]
-[Williams <nil> 33 Engineering]
-[Williams <nil> 31 Sales]
-
--- S 155
-SELECT * FROM employee AS e, ( SELECT * FROM department) AS d
-ORDER BY e.LastName;
-|"e.LastName", "e.DepartmentID", "d.DepartmentID", "d.DepartmentName"
-[Heisenberg 33 35 Marketing]
-[Heisenberg 33 34 Clerical]
-[Heisenberg 33 33 Engineering]
-[Heisenberg 33 31 Sales]
-[Jones 33 35 Marketing]
-[Jones 33 34 Clerical]
-[Jones 33 33 Engineering]
-[Jones 33 31 Sales]
-[Rafferty 31 35 Marketing]
-[Rafferty 31 34 Clerical]
-[Rafferty 31 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 35 Marketing]
-[Robinson 34 34 Clerical]
-[Robinson 34 33 Engineering]
-[Robinson 34 31 Sales]
-[Smith 34 35 Marketing]
-[Smith 34 34 Clerical]
-[Smith 34 33 Engineering]
-[Smith 34 31 Sales]
-[Williams <nil> 35 Marketing]
-[Williams <nil> 34 Clerical]
-[Williams <nil> 33 Engineering]
-[Williams <nil> 31 Sales]
-
--- 156
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 int32, c2 string);
-	INSERT INTO t VALUES (1, "a");
-	INSERT INTO t VALUES (int64(2), "b");
-COMMIT;
-SELECT c2 FROM t;
-||type int64.*type int32
-
--- 157
-BEGIN TRANSACTION;
-	CREATE TABLE t (c1 complex64);
-	INSERT INTO t VALUES(1);
-COMMIT;
-SELECT * FROM t;
-|"c1"
-[(1+0i)]
-
--- 158
-BEGIN TRANSACTION;
-	CREATE TABLE p (p bool);
-	INSERT INTO p VALUES (NULL), (false), (true);
-COMMIT;
-SELECT * FROM p;
-|"p"
-[true]
-[false]
-[<nil>]
-
--- 159
-BEGIN TRANSACTION;
-	CREATE TABLE p (p bool);
-	INSERT INTO p VALUES (NULL), (false), (true);
-COMMIT;
-SELECT p.p AS p, q.p AS q, p.p OR q.p AS p_or_q, p.p && q.p aS p_and_q FROM p, p AS q;
-|"p", "q", "p_or_q", "p_and_q"
-[true true true true]
-[true false true false]
-[true <nil> true <nil>]
-[false true true false]
-[false false false false]
-[false <nil> <nil> false]
-[<nil> true true <nil>]
-[<nil> false <nil> false]
-[<nil> <nil> <nil> <nil>]
-
--- 160
-BEGIN TRANSACTION;
-	CREATE TABLE p (p bool);
-	INSERT INTO p VALUES (NULL), (false), (true);
-COMMIT;
-SELECT p, !p AS not_p FROM p;
-|"p", "not_p"
-[true false]
-[false true]
-[<nil> <nil>]
-
--- S 161
-SELECT * FROM department WHERE DepartmentID >= 33
-ORDER BY DepartmentID;
-|"DepartmentID", "DepartmentName"
-[33 Engineering]
-[34 Clerical]
-[35 Marketing]
-
--- S 162
-SELECT * FROM department WHERE DepartmentID <= 34
-ORDER BY DepartmentID;
-|"DepartmentID", "DepartmentName"
-[31 Sales]
-[33 Engineering]
-[34 Clerical]
-
--- S 163
-SELECT * FROM department WHERE DepartmentID < 34
-ORDER BY DepartmentID;
-|"DepartmentID", "DepartmentName"
-[31 Sales]
-[33 Engineering]
-
--- S 164
-SELECT +DepartmentID FROM employee;
-|""
-[<nil>]
-[34]
-[34]
-[33]
-[33]
-[31]
-
--- S 165
-SELECT * FROM employee
-ORDER BY LastName;
-|"LastName", "DepartmentID"
-[Heisenberg 33]
-[Jones 33]
-[Rafferty 31]
-[Robinson 34]
-[Smith 34]
-[Williams <nil>]
-
--- S 166
-SELECT *
-FROM employee
-ORDER BY LastName DESC;
-|"LastName", "DepartmentID"
-[Williams <nil>]
-[Smith 34]
-[Robinson 34]
-[Rafferty 31]
-[Jones 33]
-[Heisenberg 33]
-
--- S 167
-SELECT 1023+DepartmentID AS y FROM employee
-ORDER BY y DESC;
-|"y"
-[1057]
-[1057]
-[1056]
-[1056]
-[1054]
-[<nil>]
-
--- S 168
-SELECT +DepartmentID AS y FROM employee
-ORDER BY y DESC;
-|"y"
-[34]
-[34]
-[33]
-[33]
-[31]
-[<nil>]
-
--- S 169
-SELECT * FROM employee ORDER BY DepartmentID, LastName DESC;
-|"LastName", "DepartmentID"
-[Smith 34]
-[Robinson 34]
-[Jones 33]
-[Heisenberg 33]
-[Rafferty 31]
-[Williams <nil>]
-
--- S 170
-SELECT * FROM employee ORDER BY 0+DepartmentID DESC;
-|"LastName", "DepartmentID"
-[Robinson 34]
-[Smith 34]
-[Jones 33]
-[Heisenberg 33]
-[Rafferty 31]
-[Williams <nil>]
-
--- S 171
-SELECT * FROM employee ORDER BY +DepartmentID DESC;
-|"LastName", "DepartmentID"
-[Robinson 34]
-[Smith 34]
-[Jones 33]
-[Heisenberg 33]
-[Rafferty 31]
-[Williams <nil>]
-
--- S 172
-SELECT ^DepartmentID AS y FROM employee
-ORDER BY y DESC;
-|"y"
-[-32]
-[-34]
-[-34]
-[-35]
-[-35]
-[<nil>]
-
--- S 173
-SELECT ^byte(DepartmentID) AS y FROM employee ORDER BY y DESC;
-|"y"
-[224]
-[222]
-[222]
-[221]
-[221]
-[<nil>]
-
--- 174
-BEGIN TRANSACTION;
-	CREATE TABLE t (r RUNE);
-	INSERT INTO t VALUES (1), ('A'), (rune(int(0x21)));
-COMMIT;
-SELECT * FROM t
-ORDER BY r;
-|"r"
-[1]
-[33]
-[65]
-
--- 175
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (-2), (-1), (0), (1), (2);
-COMMIT;
-SELECT i^1 AS y FROM t
-ORDER by y;
-|"y"
-[-2]
-[-1]
-[0]
-[1]
-[3]
-
--- 176
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (-2), (-1), (0), (1), (2);
-COMMIT;
-SELECT i&or;1 AS y FROM t
-ORDER BY y;
-|"y"
-[-1]
-[-1]
-[1]
-[1]
-[3]
-
--- 177
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (-2), (-1), (0), (1), (2);
-COMMIT;
-SELECT i&1 FROM t;
-|""
-[0]
-[1]
-[0]
-[1]
-[0]
-
--- 178
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (-2), (-1), (0), (1), (2);
-COMMIT;
-SELECT i&^1 AS y FROM t
-ORDER BY y;
-|"y"
-[-2]
-[-2]
-[0]
-[0]
-[2]
-
--- S 179
-SELECT * from employee WHERE LastName == "Jones" OR DepartmentID IS NULL
-ORDER by LastName DESC;
-|"LastName", "DepartmentID"
-[Williams <nil>]
-[Jones 33]
-
--- S 180
-SELECT * from employee WHERE LastName != "Jones" && DepartmentID IS NOT NULL
-ORDER BY LastName;
-|"LastName", "DepartmentID"
-[Heisenberg 33]
-[Rafferty 31]
-[Robinson 34]
-[Smith 34]
-
--- 181
-SELECT 42[0] FROM foo;
-||invalid operation.*index of type
-
--- 182
-SELECT "foo"[-1] FROM foo;
-||invalid string index.*index .* non.*negative
-
--- 183
-SELECT "foo"[3] FROM foo;
-||invalid string index.*out of bounds
-
--- 184
-BEGIN TRANSACTION;
-	CREATE TABLE foo(i int);
-COMMIT;
-SELECT "foo"["bar">true] FROM foo;
-||mismatched types
-
--- S 185
-SELECT DepartmentID[0] FROM employee;
-||run.time error.*invalid operation.*index of type
-
--- S 186
-SELECT "foo"[-DepartmentID] FROM employee;
-||run.time error.*invalid string index.*index .* non.*negative
-
--- S 187
-SELECT LastName[100] FROM employee;
-||run.time.error.*invalid string index.*out of bounds
-
--- S 188
-SELECT LastName[0], LastName FROM employee ORDER BY LastName;
-|"", "LastName"
-[72 Heisenberg]
-[74 Jones]
-[82 Rafferty]
-[82 Robinson]
-[83 Smith]
-[87 Williams]
-
--- S 189
-SELECT LastName, string(LastName[0]), string(LastName[1]), string(LastName[2]), string(LastName[3])
-FROM employee
-ORDER BY LastName;
-|"LastName", "", "", "", ""
-[Heisenberg H e i s]
-[Jones J o n e]
-[Rafferty R a f f]
-[Robinson R o b i]
-[Smith S m i t]
-[Williams W i l l]
-
--- S 190
-SELECT LastName, LastName[:], LastName[:2], LastName[2:], LastName[1:3]
-FROM employee
-ORDER by LastName;
-|"LastName", "", "", "", ""
-[Heisenberg Heisenberg He isenberg ei]
-[Jones Jones Jo nes on]
-[Rafferty Rafferty Ra fferty af]
-[Robinson Robinson Ro binson ob]
-[Smith Smith Sm ith mi]
-[Williams Williams Wi lliams il]
-
--- S 191
-SELECT LastName
-FROM employee
-WHERE department IS NULL;
-||unknown field department
-
--- S 192
-SELECT
-	DepartmentID,
-	LastName,
-	LastName[:4],
-	LastName[:0*DepartmentID],
-	LastName[0*DepartmentID:0],
-	LastName[0*DepartmentID:0*DepartmentID],
-FROM
-	employee,
-ORDER BY LastName DESC;
-|"DepartmentID", "LastName", "", "", "", ""
-[<nil> Williams Will <nil> <nil> <nil>]
-[34 Smith Smit   ]
-[34 Robinson Robi   ]
-[31 Rafferty Raff   ]
-[33 Jones Jone   ]
-[33 Heisenberg Heis   ]
-
--- S 193
-SELECT
-	DepartmentID AS x,
-	DepartmentID<<1 AS a,
-	1<<uint(DepartmentID) AS b,
-FROM
-	employee,
-WHERE DepartmentID IS NOT NULL
-ORDER BY x;
-|"x", "a", "b"
-[31 62 2147483648]
-[33 66 8589934592]
-[33 66 8589934592]
-[34 68 17179869184]
-[34 68 17179869184]
-
--- S 194
-SELECT
-	DepartmentID AS x,
-	DepartmentID>>1 AS a,
-	uint(1)<<63>>uint(DepartmentID) AS b,
-FROM
-	employee,
-WHERE DepartmentID IS NOT NULL
-ORDER BY x;
-|"x", "a", "b"
-[31 15 4294967296]
-[33 16 1073741824]
-[33 16 1073741824]
-[34 17 536870912]
-[34 17 536870912]
-
--- S 195
-SELECT DISTINCT DepartmentID
-FROM employee
-WHERE DepartmentID IS NOT NULL;
-|"DepartmentID"
-[31]
-[33]
-[34]
-
--- S 196
-SELECT DISTINCT e.DepartmentID, d.DepartmentID, e.LastName
-FROM employee AS e, department AS d
-WHERE e.DepartmentID == d.DepartmentID;
-|"e.DepartmentID", "d.DepartmentID", "e.LastName"
-[31 31 Rafferty]
-[33 33 Heisenberg]
-[33 33 Jones]
-[34 34 Robinson]
-[34 34 Smith]
-
--- S 197
-SELECT DISTINCT e.DepartmentID, d.DepartmentID, e.LastName
-FROM employee AS e, department AS d
-WHERE e.DepartmentID == d.DepartmentID
-ORDER BY e.LastName;
-|"e.DepartmentID", "d.DepartmentID", "e.LastName"
-[33 33 Heisenberg]
-[33 33 Jones]
-[31 31 Rafferty]
-[34 34 Robinson]
-[34 34 Smith]
-
--- S 198, http://en.wikipedia.org/wiki/Join_(SQL)#Cross_join
-SELECT *
-FROM employee, department
-ORDER BY employee.LastName, department.DepartmentID;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[Heisenberg 33 31 Sales]
-[Heisenberg 33 33 Engineering]
-[Heisenberg 33 34 Clerical]
-[Heisenberg 33 35 Marketing]
-[Jones 33 31 Sales]
-[Jones 33 33 Engineering]
-[Jones 33 34 Clerical]
-[Jones 33 35 Marketing]
-[Rafferty 31 31 Sales]
-[Rafferty 31 33 Engineering]
-[Rafferty 31 34 Clerical]
-[Rafferty 31 35 Marketing]
-[Robinson 34 31 Sales]
-[Robinson 34 33 Engineering]
-[Robinson 34 34 Clerical]
-[Robinson 34 35 Marketing]
-[Smith 34 31 Sales]
-[Smith 34 33 Engineering]
-[Smith 34 34 Clerical]
-[Smith 34 35 Marketing]
-[Williams <nil> 31 Sales]
-[Williams <nil> 33 Engineering]
-[Williams <nil> 34 Clerical]
-[Williams <nil> 35 Marketing]
-
--- S 199, http://en.wikipedia.org/wiki/Join_(SQL)#Inner_join
-SELECT *
-FROM employee, department
-WHERE employee.DepartmentID == department.DepartmentID
-ORDER BY employee.LastName, department.DepartmentID;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-
--- S 200
-BEGIN TRANSACTION;
-	INSERT INTO department (DepartmentID, DepartmentName)
-	SELECT DepartmentID+1000, DepartmentName+"/headquarters"
-	FROM department;
-COMMIT;
-SELECT * FROM department
-ORDER BY DepartmentID;
-|"DepartmentID", "DepartmentName"
-[31 Sales]
-[33 Engineering]
-[34 Clerical]
-[35 Marketing]
-[1031 Sales/headquarters]
-[1033 Engineering/headquarters]
-[1034 Clerical/headquarters]
-[1035 Marketing/headquarters]
-
--- S 201`
-BEGIN TRANSACTION;
-	INSERT INTO department (DepartmentName, DepartmentID)
-	SELECT DepartmentName+"/headquarters", DepartmentID+1000
-	FROM department;
-COMMIT;
-SELECT * FROM department
-ORDER BY DepartmentID;
-|"DepartmentID", "DepartmentName"
-[31 Sales]
-[33 Engineering]
-[34 Clerical]
-[35 Marketing]
-[1031 Sales/headquarters]
-[1033 Engineering/headquarters]
-[1034 Clerical/headquarters]
-[1035 Marketing/headquarters]
-
--- S 202
-BEGIN TRANSACTION;
-	DELETE FROM department;
-COMMIT;
-SELECT * FROM department
-|"DepartmentID", "DepartmentName"
-
--- S 203
-BEGIN TRANSACTION;
-	DELETE FROM department
-	WHERE DepartmentID == 35 OR DepartmentName != "" && DepartmentName[0] == 'C';
-COMMIT;
-SELECT * FROM department
-ORDER BY DepartmentID;
-|"DepartmentID", "DepartmentName"
-[31 Sales]
-[33 Engineering]
-
--- S 204
-SELECT id(), LastName
-FROM employee
-ORDER BY id();
-|"", "LastName"
-[5 Rafferty]
-[6 Jones]
-[7 Heisenberg]
-[8 Robinson]
-[9 Smith]
-[10 Williams]
-
--- S 205 //TODO investigate plan, add variant w/ DESC, check plan.
-BEGIN TRANSACTION;
-	DELETE FROM employee
-	WHERE LastName == "Jones";
-COMMIT;
-SELECT id(), LastName
-FROM employee
-ORDER BY id();
-|"", "LastName"
-[5 Rafferty]
-[7 Heisenberg]
-[8 Robinson]
-[9 Smith]
-[10 Williams]
-
--- S 206
-BEGIN TRANSACTION;
-	DELETE FROM employee
-	WHERE LastName == "Jones";
-	INSERT INTO employee (LastName) VALUES ("Jones");
-COMMIT;
-SELECT id(), LastName
-FROM employee
-ORDER BY id();
-|"", "LastName"
-[5 Rafferty]
-[7 Heisenberg]
-[8 Robinson]
-[9 Smith]
-[10 Williams]
-[11 Jones]
-
--- S 207
-SELECT id(), e.LastName, e.DepartmentID, d.DepartmentID
-FROM
-	employee AS e,
-	department AS d,
-WHERE e.DepartmentID == d.DepartmentID
-ORDER BY e.LastName;
-|"", "e.LastName", "e.DepartmentID", "d.DepartmentID"
-[<nil> Heisenberg 33 33]
-[<nil> Jones 33 33]
-[<nil> Rafferty 31 31]
-[<nil> Robinson 34 34]
-[<nil> Smith 34 34]
-
--- S 208
-SELECT e.ID, e.LastName, e.DepartmentID, d.DepartmentID
-FROM
-	(SELECT id() AS ID, LastName, DepartmentID FROM employee;) AS e,
-	department AS d,
-WHERE e.DepartmentID == d.DepartmentID
-ORDER BY e.ID;
-|"e.ID", "e.LastName", "e.DepartmentID", "d.DepartmentID"
-[5 Rafferty 31 31]
-[6 Jones 33 33]
-[7 Heisenberg 33 33]
-[8 Robinson 34 34]
-[9 Smith 34 34]
-
--- S 209
-BEGIN TRANSACTION;
-	UPDATE none
-		DepartmentID = DepartmentID+1000,
-	WHERE DepartmentID == 33;
-COMMIT;
-SELECT * FROM employee;
-||table.*not.*exist
-
--- S 210
-BEGIN TRANSACTION;
-	UPDATE employee
-		FirstName = "Williams"
-	WHERE DepartmentID == 33;
-COMMIT;
-SELECT * FROM employee;
-||unknown.*FirstName
-
--- S 211
-BEGIN TRANSACTION;
-	UPDATE employee
-		DepartmentID = DepartmentID+1000,
-	WHERE DepartmentID == 33;
-COMMIT;
-SELECT * FROM employee
-ORDER BY LastName;
-|"LastName", "DepartmentID"
-[Heisenberg 1033]
-[Jones 1033]
-[Rafferty 31]
-[Robinson 34]
-[Smith 34]
-[Williams <nil>]
-
--- S 212
-BEGIN TRANSACTION;
-	UPDATE employee
-		DepartmentID = DepartmentID+1000,
-		LastName = "Mr. "+LastName
-	WHERE id() == 7;
-COMMIT;
-SELECT * FROM employee
-ORDER BY LastName DESC;
-|"LastName", "DepartmentID"
-[Williams <nil>]
-[Smith 34]
-[Robinson 34]
-[Rafferty 31]
-[Mr. Heisenberg 1033]
-[Jones 33]
-
--- S 213
-BEGIN TRANSACTION;
-	UPDATE employee
-		LastName = "Mr. "+LastName,
-		DepartmentID = DepartmentID+1000,
-	WHERE id() == 7;
-COMMIT;
-SELECT * FROM employee
-ORDER BY LastName DESC;
-|"LastName", "DepartmentID"
-[Williams <nil>]
-[Smith 34]
-[Robinson 34]
-[Rafferty 31]
-[Mr. Heisenberg 1033]
-[Jones 33]
-
--- S 214
-BEGIN TRANSACTION;
-	UPDATE employee
-		DepartmentID = DepartmentID+1000;
-COMMIT;
-SELECT * FROM employee
-ORDER BY LastName;
-|"LastName", "DepartmentID"
-[Heisenberg 1033]
-[Jones 1033]
-[Rafferty 1031]
-[Robinson 1034]
-[Smith 1034]
-[Williams <nil>]
-
--- S 215
-BEGIN TRANSACTION;
-	UPDATE employee
-		DepartmentId = DepartmentID+1000;
-COMMIT;
-SELECT * FROM employee;
-||unknown
-
--- S 216
-BEGIN TRANSACTION;
-	UPDATE employee
-		DepartmentID = DepartmentId+1000;
-COMMIT;
-SELECT * FROM employee;
-||unknown
-
--- S 217
-BEGIN TRANSACTION;
-	UPDATE employee
-		DepartmentID = "foo";
-COMMIT;
-SELECT * FROM employee;
-||type string.*type int64
-
--- S 218
-SELECT foo[len()] FROM bar;
-||missing argument
-
--- S 219
-SELECT foo[len(42)] FROM bar;
-||invalid argument
-
--- S 220
-SELECT foo[len(42, 24)] FROM bar;
-||too many
-
--- S 221
-SELECT foo[len("baz")] FROM bar;
-||table
-
--- S 222
-SELECT LastName[len("baz")-4] FROM employee;
-||invalid string index
-
--- S 223
-SELECT LastName[:len(LastName)-3] AS y FROM employee
-ORDER BY y;
-|"y"
-[Heisenb]
-[Jo]
-[Raffe]
-[Robin]
-[Sm]
-[Willi]
-
--- S 224
-SELECT complex(float32(DepartmentID+int(id())), 0) AS x, complex(DepartmentID+int(id()), 0)
-FROM employee
-ORDER by real(x) DESC;
-|"x", ""
-[(43+0i) (43+0i)]
-[(42+0i) (42+0i)]
-[(40+0i) (40+0i)]
-[(39+0i) (39+0i)]
-[(36+0i) (36+0i)]
-[<nil> <nil>]
-
--- S 225
-SELECT real(complex(float32(DepartmentID+int(id())), 0)) AS x, real(complex(DepartmentID+int(id()), 0))
-FROM employee
-ORDER BY x DESC;
-|"x", ""
-[43 43]
-[42 42]
-[40 40]
-[39 39]
-[36 36]
-[<nil> <nil>]
-
--- S 226
-SELECT imag(complex(0, float32(DepartmentID+int(id())))) AS x, imag(complex(0, DepartmentID+int(id())))
-FROM employee
-ORDER BY x DESC;
-|"x", ""
-[43 43]
-[42 42]
-[40 40]
-[39 39]
-[36 36]
-[<nil> <nil>]
-
--- 227
-BEGIN TRANSACTION;
-	CREATE TABLE t (c string);
-	INSERT INTO t VALUES("foo"), ("bar");
-	DELETE FROM t WHERE c == "foo";
-COMMIT;
-SELECT 100*id(), c FROM t;
-|"", "c"
-[200 bar]
-
--- 228
-BEGIN TRANSACTION;
-	CREATE TABLE a (a int);
-	CREATE TABLE b (b int);
-	CREATE TABLE c (c int);
-	DROP TABLE a;
-COMMIT;
-SELECT * FROM a;
-||table a does not exist
-
--- 229
-BEGIN TRANSACTION;
-	CREATE TABLE a (a int);
-	CREATE TABLE b (b int);
-	CREATE TABLE c (c int);
-	DROP TABLE a;
-COMMIT;
-SELECT * FROM b;
-|"b"
-
--- 230
-BEGIN TRANSACTION;
-	CREATE TABLE a (a int);
-	CREATE TABLE b (b int);
-	CREATE TABLE c (c int);
-	DROP TABLE a;
-COMMIT;
-SELECT * FROM c;
-|"c"
-
--- 231
-BEGIN TRANSACTION;
-	CREATE TABLE a (a int);
-	CREATE TABLE b (b int);
-	CREATE TABLE c (c int);
-	DROP TABLE b;
-COMMIT;
-SELECT * FROM a;
-|"a"
-
--- 232
-BEGIN TRANSACTION;
-	CREATE TABLE a (a int);
-	CREATE TABLE b (b int);
-	CREATE TABLE c (c int);
-	DROP TABLE b;
-COMMIT;
-SELECT * FROM b;
-||table b does not exist
-
--- 233
-BEGIN TRANSACTION;
-	CREATE TABLE a (a int);
-	CREATE TABLE b (b int);
-	CREATE TABLE c (c int);
-	DROP TABLE b;
-COMMIT;
-SELECT * FROM c;
-|"c"
-
--- 234
-BEGIN TRANSACTION;
-	CREATE TABLE a (a int);
-	CREATE TABLE b (b int);
-	CREATE TABLE c (c int);
-	DROP TABLE c;
-COMMIT;
-SELECT * FROM a;
-|"a"
-
--- 235
-BEGIN TRANSACTION;
-	CREATE TABLE a (a int);
-	CREATE TABLE b (b int);
-	CREATE TABLE c (c int);
-	DROP TABLE c;
-COMMIT;
-SELECT * FROM b;
-|"b"
-
--- 236
-BEGIN TRANSACTION;
-	CREATE TABLE a (a int);
-	CREATE TABLE b (b int);
-	CREATE TABLE c (c int);
-	DROP TABLE c;
-COMMIT;
-SELECT * FROM c;
-||table c does not exist
-
--- 237
-BEGIN TRANSACTION;
-	CREATE TABLE a (c int);
-	INSERT INTO a VALUES (10), (11), (12);
-	CREATE TABLE b (d int);
-	INSERT INTO b VALUES (20), (21), (22), (23);
-COMMIT;
-SELECT * FROM a, b;
-|"a.c", "b.d"
-[12 23]
-[12 22]
-[12 21]
-[12 20]
-[11 23]
-[11 22]
-[11 21]
-[11 20]
-[10 23]
-[10 22]
-[10 21]
-[10 20]
-
--- 238
-BEGIN TRANSACTION;
-	CREATE TABLE a (c int);
-	INSERT INTO a VALUES (0), (1), (2);
-COMMIT;
-SELECT
-	9*x2.c AS x2,
-	3*x1.c AS x1,
-	1*x0.c AS x0,
-	9*x2.c + 3*x1.c + x0.c AS y,
-FROM
-	a AS x2,
-	a AS x1,
-	a AS x0,
-ORDER BY y;
-|"x2", "x1", "x0", "y"
-[0 0 0 0]
-[0 0 1 1]
-[0 0 2 2]
-[0 3 0 3]
-[0 3 1 4]
-[0 3 2 5]
-[0 6 0 6]
-[0 6 1 7]
-[0 6 2 8]
-[9 0 0 9]
-[9 0 1 10]
-[9 0 2 11]
-[9 3 0 12]
-[9 3 1 13]
-[9 3 2 14]
-[9 6 0 15]
-[9 6 1 16]
-[9 6 2 17]
-[18 0 0 18]
-[18 0 1 19]
-[18 0 2 20]
-[18 3 0 21]
-[18 3 1 22]
-[18 3 2 23]
-[18 6 0 24]
-[18 6 1 25]
-[18 6 2 26]
-
--- 239
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	INSERT INTO t VALUES (242);
-	DELETE FROM t WHERE c != 0;
-COMMIT;
-SELECT * FROM t
-|"c"
-
--- 240
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (242), (12, 24);
-COMMIT;
-||expect
-
--- 241
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (24, 2), (1224);
-COMMIT;
-||expect
-
--- 242
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-ROLLBACK;
-SELECT * from t;
-||does not exist
-
--- 243
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-BEGIN TRANSACTION;
-	DROP TABLE T;
-COMMIT;
-SELECT * from t;
-||does not exist
-
--- 244
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-BEGIN TRANSACTION;
-	DROP TABLE t;
-ROLLBACK;
-SELECT * from t;
-|"i"
-
--- 245
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (int(1.2));
-COMMIT;
-SELECT * FROM t;
-||truncated
-
--- 246
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (string(65.0));
-COMMIT;
-SELECT * FROM t;
-||cannot convert
-
--- 247
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES (string(65));
-COMMIT;
-SELECT * FROM t;
-|"s"
-[A]
-
--- 248
-BEGIN TRANSACTION;
-	CREATE TABLE t (i uint32);
-	INSERT INTO t VALUES (uint32(int8(uint16(0x10F0))));
-COMMIT;
-SELECT i == 0xFFFFFFF0 FROM t;
-|""
-[true]
-
--- 249
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		(string('a')),		// "a"
-		(string(-1)),		// "\ufffd" == "\xef\xbf\xbd"
-		(string(0xf8)),		// "\u00f8" == "ø" == "\xc3\xb8"
-		(string(0x65e5)),	// "\u65e5" == "日" == "\xe6\x97\xa5"
-	;
-COMMIT;
-SELECT
-	id() == 1 && s == "a" OR 
-	id() == 2 && s == "\ufffd" && s == "\xef\xbf\xbd" OR 
-	id() == 3 && s == "\u00f8" && s == "ø" && s == "\xc3\xb8" OR 
-	id() == 4 && s == "\u65e5" && s == "日" && s == "\xe6\x97\xa5"
-FROM t;
-|""
-[true]
-[true]
-[true]
-[true]
-
--- 250
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (0);
-COMMIT;
-SELECT 2.3+1, 1+2.3 FROM t;
-|"", ""
-[3.3 3.3]
-
--- 251
-BEGIN TRANSACTION;
-	CREATE TABLE t (i byte);
-	INSERT INTO t VALUES (-1+byte(2));
-COMMIT;
-SELECT * FROM t;
-||mismatched
-
--- 252
-BEGIN TRANSACTION;
-	CREATE TABLE t (i byte);
-	INSERT INTO t VALUES (1+byte(2));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[3]
-
--- 253
-BEGIN TRANSACTION;
-	CREATE TABLE t (i byte);
-	INSERT INTO t VALUES (255+byte(2));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[1]
-
--- 254
-BEGIN TRANSACTION;
-	CREATE TABLE t (i byte);
-	INSERT INTO t VALUES (256+byte(2));
-COMMIT;
-SELECT * FROM t;
-||mismatched
-
--- 255
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int8);
-	INSERT INTO t VALUES (127+int8(2));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[-127]
-
--- 256
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int8);
-	INSERT INTO t VALUES (-129+int8(2));
-COMMIT;
-SELECT * FROM t;
-||mismatched
-
--- 257
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int8);
-	INSERT INTO t VALUES (-128+int8(2));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[-126]
-
--- 258
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int8);
-	INSERT INTO t VALUES (128+int8(2));
-COMMIT;
-SELECT * FROM t;
-||mismatched
-
--- S 259
-SELECT count(none) FROM employee;
-||unknown
-
--- S 260
-SELECT count() FROM employee;
-|""
-[6]
-
--- S 261
-SELECT count() AS y FROM employee;
-|"y"
-[6]
-
--- S 262
-SELECT 3*count() AS y FROM employee;
-|"y"
-[18]
-
--- S 263
-SELECT count(LastName) FROM employee;
-|""
-[6]
-
--- S 264
-SELECT count(DepartmentID) FROM employee;
-|""
-[5]
-
--- S 265
-SELECT count() - count(DepartmentID) FROM employee;
-|""
-[1]
-
--- S 266
-SELECT min(LastName), min(DepartmentID) FROM employee;
-|"", ""
-[Heisenberg 31]
-
--- S 267
-SELECT max(LastName), max(DepartmentID) FROM employee;
-|"", ""
-[Williams 34]
-
--- S 268
-SELECT sum(LastName), sum(DepartmentID) FROM employee;
-||cannot
-
--- S 269
-SELECT sum(DepartmentID) FROM employee;
-|""
-[165]
-
--- S 270
-SELECT avg(DepartmentID) FROM employee;
-|""
-[33]
-
--- S 271
-SELECT DepartmentID FROM employee GROUP BY none;
-||unknown
-
--- S 272
-SELECT DepartmentID, sum(DepartmentID) AS s FROM employee GROUP BY DepartmentID ORDER BY s DESC;
-|"DepartmentID", "s"
-[34 68]
-[33 66]
-[31 31]
-[<nil> <nil>]
-
--- S 273
-SELECT DepartmentID, count(LastName+string(DepartmentID)) AS y FROM employee GROUP BY DepartmentID ORDER BY y DESC ;
-|"DepartmentID", "y"
-[34 2]
-[33 2]
-[31 1]
-[<nil> 0]
-
--- S 274
-SELECT DepartmentID, sum(2*DepartmentID) AS s FROM employee GROUP BY DepartmentID ORDER BY s DESC;
-|"DepartmentID", "s"
-[34 136]
-[33 132]
-[31 62]
-[<nil> <nil>]
-
--- S 275
-SELECT min(2*DepartmentID) FROM employee;
-|""
-[62]
-
--- S 276
-SELECT max(2*DepartmentID) FROM employee;
-|""
-[68]
-
--- S 277
-SELECT avg(2*DepartmentID) FROM employee;
-|""
-[66]
-
--- S 278
-SELECT * FROM employee GROUP BY DepartmentID;
-|"LastName", "DepartmentID"
-[Williams <nil>]
-[Rafferty 31]
-[Heisenberg 33]
-[Smith 34]
-
--- S 279
-SELECT * FROM employee GROUP BY DepartmentID ORDER BY LastName DESC;
-|"LastName", "DepartmentID"
-[Williams <nil>]
-[Smith 34]
-[Rafferty 31]
-[Heisenberg 33]
-
--- S 280
-SELECT * FROM employee GROUP BY DepartmentID, LastName ORDER BY LastName DESC;
-|"LastName", "DepartmentID"
-[Williams <nil>]
-[Smith 34]
-[Robinson 34]
-[Rafferty 31]
-[Jones 33]
-[Heisenberg 33]
-
--- S 281
-SELECT * FROM employee GROUP BY LastName, DepartmentID  ORDER BY LastName DESC;
-|"LastName", "DepartmentID"
-[Williams <nil>]
-[Smith 34]
-[Robinson 34]
-[Rafferty 31]
-[Jones 33]
-[Heisenberg 33]
-
--- 282
-BEGIN TRANSACTION;
-	CREATE TABLE s (i int);
-	CREATE TABLE t (i int);
-COMMIT;
-BEGIN TRANSACTION;
-	DROP TABLE s;
-COMMIT;
-SELECT * FROM t;
-|"i"
-
--- 283
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-COMMIT;
-SELECT count() FROM t;
-|""
-[0]
-
--- 284
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT count() FROM t;
-|""
-[2]
-
--- 285
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT count() FROM t WHERE n < 2;
-|""
-[2]
-
--- 286
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT count() FROM t WHERE n < 1;
-|""
-[1]
-
--- 287
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT count() FROM t WHERE n < 0;
-|""
-[0]
-
--- 288
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT s+10 FROM (SELECT sum(n) AS s FROM t WHERE n < 2);
-|""
-[11]
-
--- 289
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT s+10 FROM (SELECT sum(n) AS s FROM t WHERE n < 1);
-|""
-[10]
-
--- 290
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT s+10 FROM (SELECT sum(n) AS s FROM t WHERE n < 0);
-|""
-[<nil>]
-
--- 291
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT sum(n) AS s FROM t WHERE n < 2;
-|"s"
-[1]
-
--- 292
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT sum(n) AS s FROM t WHERE n < 1;
-|"s"
-[0]
-
--- 293
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1);
-COMMIT;
-SELECT sum(n) AS s FROM t WHERE n < 0;
-|"s"
-[<nil>]
-
--- 294
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t SELECT count() FROM t;
-	INSERT INTO t SELECT count() FROM t;
-	INSERT INTO t SELECT count() FROM t;
-COMMIT;
-SELECT count() FROM t;
-|""
-[3]
-
--- 295
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t SELECT count() FROM t;
-	INSERT INTO t SELECT count() FROM t;
-	INSERT INTO t SELECT count() FROM t;
-	INSERT INTO t SELECT * FROM t;
-COMMIT;
-SELECT count() FROM t;
-|""
-[6]
-
--- 296
-BEGIN TRANSACTION;
-	CREATE TABLE t (n int);
-	INSERT INTO t VALUES (0), (1), (2);
-	INSERT INTO t SELECT * FROM t;
-COMMIT;
-SELECT count() FROM t;
-|""
-[6]
-
--- 297
-BEGIN TRANSACTION;
-	CREATE TABLE t(S string);
-	INSERT INTO t SELECT "perfect!" FROM (SELECT count() AS cnt FROM t WHERE S == "perfect!") WHERE cnt == 0;
-COMMIT;
-SELECT count() FROM t;
-|""
-[1]
-
--- 298
-BEGIN TRANSACTION;
-	CREATE TABLE t(S string);
-	INSERT INTO t SELECT "perfect!" FROM (SELECT count() AS cnt FROM t WHERE S == "perfect!") WHERE cnt == 0;
-	INSERT INTO t SELECT "perfect!" FROM (SELECT count() AS cnt FROM t WHERE S == "perfect!") WHERE cnt == 0;
-COMMIT;
-SELECT count() FROM t;
-|""
-[1]
-
--- 299
-BEGIN TRANSACTION;
-	CREATE TABLE t(c blob);
-	INSERT INTO t VALUES (blob("a"));
-COMMIT;
-SELECT * FROM t;
-|"c"
-[[97]]
-
--- 300
-BEGIN TRANSACTION;
-	CREATE TABLE t(c blob);
-	INSERT INTO t VALUES (blob(`
-0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
-`));
-COMMIT;
-SELECT * FROM t;
-|"c"
-[[10 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 10]]
-
--- 301
-BEGIN TRANSACTION;
-	CREATE TABLE t(c blob);
-	INSERT INTO t VALUES (blob(
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF"));
-COMMIT;
-SELECT * FROM t;
-|"c"
-[[48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 65 66 67 68 69 70]]
-
--- 302
-BEGIN TRANSACTION;
-	CREATE TABLE t(c blob);
-	INSERT INTO t VALUES (blob(
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF"+
-"!"));
-COMMIT;
-SELECT * FROM t;
-|"c"
-[[48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 65 66 67 68 69 70 33]]
-
--- 303
-BEGIN TRANSACTION;
-	CREATE TABLE t(c blob);
-	INSERT INTO t VALUES (blob("hell\xc3\xb8"));
-COMMIT;
-SELECT string(c) FROM t;
-|""
-[hellø]
-
--- 304
-BEGIN TRANSACTION;
-	CREATE TABLE t(c blob);
-	INSERT INTO t VALUES (blob(
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF"+
-"!"));
-COMMIT;
-SELECT string(c) FROM t;
-|""
-[0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!]
-
--- 305
-BEGIN TRANSACTION;
-	CREATE TABLE t(c blob);
-	INSERT INTO t VALUES (blob(""));
-COMMIT;
-SELECT string(c) FROM t;
-|""
-[]
-
--- 306
-BEGIN TRANSACTION;
-	CREATE TABLE t(c blob);
-	INSERT INTO t VALUES (blob("hellø"));
-COMMIT;
-SELECT * FROM t;
-|"c"
-[[104 101 108 108 195 184]]
-
--- 307
-BEGIN TRANSACTION;
-	CREATE TABLE t(c blob);
-	INSERT INTO t VALUES (blob(""));
-COMMIT;
-SELECT * FROM t;
-|"c"
-[[]]
-
--- 308
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob("0")),
-	;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[0 [48]]
-
--- 309
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob("0")),
-		(1, blob("1")),
-	;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[1 [49]]
-[0 [48]]
-
--- 310
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob("0")),
-		(1, blob("1")),
-		(2, blob("2")),
-	;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[2 [50]]
-[1 [49]]
-[0 [48]]
-
--- 311
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob("0")),
-	;
-	DELETE FROM t WHERE i == 0;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-
--- 312
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob("0")),
-		(1, blob("1")),
-	;
-	DELETE FROM t WHERE i == 0;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[1 [49]]
-
--- 313
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob("0")),
-		(1, blob("1")),
-	;
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[0 [48]]
-
--- 314
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob("0")),
-		(1, blob("1")),
-		(2, blob("2")),
-	;
-	DELETE FROM t WHERE i == 0;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[2 [50]]
-[1 [49]]
-
--- 315
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob("0")),
-		(1, blob("1")),
-		(2, blob("2")),
-	;
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[2 [50]]
-[0 [48]]
-
--- 316
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob("0")),
-		(1, blob("1")),
-		(2, blob("2")),
-	;
-	DELETE FROM t WHERE i == 2;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[1 [49]]
-[0 [48]]
-
--- 317
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob(
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-	;
-	DELETE FROM t WHERE i == 0;
-COMMIT;
-SELECT i, string(b) FROM t;
-|"i", ""
-
--- 318
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob(
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-		(1, blob(
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-	;
-	DELETE FROM t WHERE i == 0;
-COMMIT;
-SELECT i, string(b) FROM t;
-|"i", ""
-[1 1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!]
-
--- 319
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob(
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-		(1, blob(
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-	;
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT i, string(b) FROM t;
-|"i", ""
-[0 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!]
-
--- 320
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob(
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-		(1, blob(
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-		(2, blob(
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-	;
-	DELETE FROM t WHERE i == 0;
-COMMIT;
-SELECT i, string(b) FROM t;
-|"i", ""
-[2 2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef2123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!]
-[1 1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!]
-
--- 321
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob(
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-		(1, blob(
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-		(2, blob(
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-	;
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT i, string(b) FROM t;
-|"i", ""
-[2 2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef2123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!]
-[0 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!]
-
--- 322
-BEGIN TRANSACTION;
-	CREATE TABLE t(i int, b blob);
-	INSERT INTO t VALUES
-		(0, blob(
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-		(1, blob(
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-		(2, blob(
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!")),
-	;
-	DELETE FROM t WHERE i == 2;
-COMMIT;
-SELECT i, string(b) FROM t;
-|"i", ""
-[1 1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!]
-[0 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!]
-
--- 323
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bool);
-	INSERT INTO t VALUES (false), (true);
-COMMIT;
-SELECT * FROM t ORDER BY true, c, false;
-||cannot .* bool
-
--- 324
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bool, i int);
-	INSERT INTO t VALUES (false, 1), (true, 2), (false, 10), (true, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[false 11]
-[true 22]
-
--- 325
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int8);
-	INSERT INTO t VALUES (1), (2);
-COMMIT;
-SELECT * FROM t ORDER BY 42, c, 24;
-|"c"
-[1]
-[2]
-
--- 326
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int8, i int);
-	INSERT INTO t VALUES (99, 1), (100, 2), (99, 10), (100, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[99 11]
-[100 22]
-
--- 327
-BEGIN TRANSACTION;
-	CREATE TABLE t (c blob);
-	INSERT INTO t VALUES (blob("A")), (blob("B"));
-COMMIT;
-SELECT * FROM t ORDER BY 42, c, 24;
-||cannot .* \[\]uint8
-
--- 328
-BEGIN TRANSACTION;
-	CREATE TABLE t (c blob, i int);
-	INSERT INTO t VALUES (blob("A"), 1), (blob("B"), 2);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[[65] 1]
-[[66] 2]
-
--- 329
-BEGIN TRANSACTION;
-	CREATE TABLE t (c blob, i int);
-	INSERT INTO t VALUES (blob("A"), 10), (blob("B"), 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[[65] 10]
-[[66] 20]
-
--- 330
-BEGIN TRANSACTION;
-	CREATE TABLE t (c blob, i int);
-	INSERT INTO t VALUES (blob("A"), 1), (blob("B"), 2), (blob("A"), 10), (blob("B"), 20);
-COMMIT;
-SELECT * FROM t;
-|"c", "i"
-[[66] 20]
-[[65] 10]
-[[66] 2]
-[[65] 1]
-
--- 331
-BEGIN TRANSACTION;
-	CREATE TABLE t (c string, i int);
-	INSERT INTO t VALUES ("A", 1), ("B", 2), ("A", 10), ("B", 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[A 11]
-[B 22]
-
--- 332
-BEGIN TRANSACTION;
-	CREATE TABLE t (c blob, i int);
-	INSERT INTO t VALUES (blob("A"), 1), (blob("B"), 2), (blob("A"), 10), (blob("B"), 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[[65] 11]
-[[66] 22]
-
--- 333
-BEGIN TRANSACTION;
-	CREATE TABLE t (c byte);
-	INSERT INTO t VALUES (42), (314);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-||overflow
-
--- 334
-BEGIN TRANSACTION;
-	CREATE TABLE t (c byte);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 335
-BEGIN TRANSACTION;
-	CREATE TABLE t (c byte, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 336
-BEGIN TRANSACTION;
-	CREATE TABLE t (c byte);
-	INSERT INTO t VALUES (42), (3.14);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-||truncated
-
--- 337
-BEGIN TRANSACTION;
-	CREATE TABLE t (c complex64);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-||cannot order by
-
--- 338
-BEGIN TRANSACTION;
-	CREATE TABLE t (c complex64, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[(100+0i) 11]
-[(101+0i) 22]
-
--- 339
-BEGIN TRANSACTION;
-	CREATE TABLE t (c complex128);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-||cannot order by
-
--- 340
-BEGIN TRANSACTION;
-	CREATE TABLE t (c complex128, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[(100+0i) 11]
-[(101+0i) 22]
-
--- 341
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 342
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 343
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float64);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 344
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float64, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 345
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float32);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 346
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float32, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 347
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 348
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 349
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int64);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 350
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int64, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 351
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int8);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 352
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int8, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 353
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int16);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 354
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int16, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 355
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int32);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 356
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int32, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 357
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 358
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 359
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint64);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 360
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint64, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 361
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint8);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 362
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint8, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 363
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint16);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 364
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint16, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 365
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint32);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 366
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint32, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 367
-BEGIN TRANSACTION;
-	CREATE TABLE t (c blob, i int);
-	INSERT INTO t VALUES (blob("A"), 1), (blob("B"), 2);
-	UPDATE t c = blob("C") WHERE i == 2;
-COMMIT;
-SELECT * FROM t;
-|"c", "i"
-[[67] 2]
-[[65] 1]
-
--- 368
-BEGIN TRANSACTION;
-	CREATE TABLE t (c blob, i int);
-	INSERT INTO t VALUES
-		(blob(
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!"
-		), 1),
-		(blob(
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!"
-		), 2);
-	UPDATE t c = blob(
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"2123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!"
-	) WHERE i == 2;
-COMMIT;
-SELECT * FROM t;
-|"c", "i"
-[[50 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 50 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 50 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 50 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 65 66 67 68 69 70 33] 2]
-[[48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 65 66 67 68 69 70 33] 1]
-
--- 369
-BEGIN TRANSACTION;
-	CREATE TABLE t (c blob, i int);
-	INSERT INTO t VALUES
-		(blob(
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"0123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!"
-		), 1),
-		(blob(
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-			"1123456789abcdef0123456789abcdef0123456789abcdef0123456789ABCDEF!"
-		), 2);
-	UPDATE t i = 42 WHERE i == 2;
-COMMIT;
-SELECT * FROM t;
-|"c", "i"
-[[49 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 49 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 49 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 49 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 65 66 67 68 69 70 33] 42]
-[[48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 97 98 99 100 101 102 48 49 50 51 52 53 54 55 56 57 65 66 67 68 69 70 33] 1]
-
--- 370
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * FROM t;
-|"i"
-[1]
-
--- 371
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	INSERT INTO t VALUES (bigint("1"));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[1]
-
--- 372
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	INSERT INTO t VALUES (bigint("12345678901234567890123456789"));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[12345678901234567890123456789]
-
--- 373
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	INSERT INTO t VALUES (bigint(2e10));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[20000000000]
-
--- 374
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	INSERT INTO t VALUES (bigint(2e18));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[2000000000000000000]
-
--- 375
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	INSERT INTO t VALUES (bigint(2e19));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[20000000000000000000]
-
--- 376
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	INSERT INTO t VALUES (bigint(2e20));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[200000000000000000000]
-
--- 377
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	INSERT INTO t VALUES (bigint("0x1fffffffffffffff"));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[2305843009213693951]
-
--- 378
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	INSERT INTO t VALUES (bigint("0x1ffffffffffffffffffffff"));
-COMMIT;
-SELECT * FROM t;
-|"i"
-[618970019642690137449562111]
-
--- 379
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42]
-[114]
-
--- 380
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100 11]
-[101 22]
-
--- 381
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT * FROM t WHERE c > 100 ORDER BY c DESC;
-|"c"
-[111]
-[110]
-[101]
-
--- 382
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT * FROM t WHERE c < 110 ORDER BY c;
-|"c"
-[100]
-[101]
-
--- 383
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT * FROM t WHERE c <= 110 ORDER BY c;
-|"c"
-[100]
-[101]
-[110]
-
--- 384
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT * FROM t WHERE c >= 110 ORDER BY c;
-|"c"
-[110]
-[111]
-
--- 385
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT * FROM t WHERE c != 110 ORDER BY c;
-|"c"
-[100]
-[101]
-[111]
-
--- 386
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT * FROM t WHERE c == 110 ORDER BY c;
-|"c"
-[110]
-
--- 387
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT (c+1000) as s FROM t ORDER BY s;
-|"s"
-[1100]
-[1101]
-[1110]
-[1111]
-
--- 388
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT (1000-c) as s FROM t ORDER BY s;
-|"s"
-[889]
-[890]
-[899]
-[900]
-
--- 389
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT (c>>1) as s FROM t ORDER BY s;
-|"s"
-[50]
-[50]
-[55]
-[55]
-
--- 390
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (100), (101), (110), (111);
-COMMIT;
-SELECT (c<<1) as s FROM t ORDER BY s;
-|"s"
-[200]
-[202]
-[220]
-[222]
-
--- 391
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (0x137f0);
-COMMIT;
-SELECT * FROM t WHERE c&0x55555 == 0x11550;
-|"c"
-[79856]
-
--- 392
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (0x137f0);
-COMMIT;
-SELECT * FROM t WHERE c&or;0x55555 == 0x577f5;
-|"c"
-[79856]
-
--- 393
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (0x137f0);
-COMMIT;
-SELECT * FROM t WHERE c&^0x55555 == 0x022a0;
-|"c"
-[79856]
-
--- 394
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (0x137f0);
-COMMIT;
-SELECT * FROM t WHERE c^0x55555 == 0x462a5;
-|"c"
-[79856]
-
--- 395
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (0x137f0);
-COMMIT;
-SELECT * FROM t WHERE c%256 == 0xf0;
-|"c"
-[79856]
-
--- 396
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (0x137f0);
-COMMIT;
-SELECT * FROM t WHERE c*16 == 0x137f00;
-|"c"
-[79856]
-
--- 397
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (0x137f0);
-COMMIT;
-SELECT * FROM t WHERE ^c == -(0x137f0+1);
-|"c"
-[79856]
-
--- 398
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (0x137f0);
-COMMIT;
-SELECT * FROM t WHERE +c == 0x137f0;
-|"c"
-[79856]
-
--- 399
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint);
-	INSERT INTO t VALUES (0x137f0);
-COMMIT;
-SELECT * FROM t WHERE -c == -79856;
-|"c"
-[79856]
-
--- 400
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat);
-	INSERT INTO t VALUES (42), (114);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[42/1]
-[114/1]
-
--- 401
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, i int);
-	INSERT INTO t VALUES (100, 1), (101, 2), (100, 10), (101, 20);
-COMMIT;
-SELECT c, sum(i) FROM t GROUP BY c;
-|"c", ""
-[100/1 11]
-[101/1 22]
-
--- 402
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat);
-	INSERT INTO t VALUES (42.24), (114e3);
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[5944751508129055/140737488355328]
-[114000/1]
-
--- 403
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat);
-	INSERT INTO t VALUES ('A'), ('B');
-COMMIT;
-SELECT * FROM t ORDER BY 15, c, 16;
-|"c"
-[65/1]
-[66/1]
-
--- 404
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat);
-	INSERT INTO t VALUES (bigrat("2/3")+bigrat("5/7"));
-COMMIT;
-SELECT * FROM t;
-|"c"
-[29/21]
-
--- 405
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat);
-	INSERT INTO t VALUES (bigrat("2/3")-bigrat("5/7"));
-COMMIT;
-SELECT * FROM t;
-|"c"
-[-1/21]
-
--- 406
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat);
-	INSERT INTO t VALUES (bigrat("2/3")*bigrat("5/7"));
-COMMIT;
-SELECT * FROM t;
-|"c"
-[10/21]
-
--- 407
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint, d bigint);
-	INSERT INTO t VALUES (1, 0);
-COMMIT;
-SELECT c/d FROM t;
-||division .* zero
-
--- 408
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigint, d bigint);
-	INSERT INTO t VALUES (1, 0);
-COMMIT;
-SELECT c%d FROM t;
-||division .* zero
-
--- 409
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("5/7"));
-COMMIT;
-SELECT c == d FROM t;
-|""
-[false]
-
--- 410
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("4/6"));
-COMMIT;
-SELECT c == d FROM t;
-|""
-[true]
-
--- 411
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("5/7"));
-COMMIT;
-SELECT c != d FROM t;
-|""
-[true]
-
--- 412
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("4/6"));
-COMMIT;
-SELECT c != d FROM t;
-|""
-[false]
-
--- 413
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("5/7"));
-COMMIT;
-SELECT c < d FROM t;
-|""
-[true]
-
--- 414
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("4/6"));
-COMMIT;
-SELECT c < d FROM t;
-|""
-[false]
-
--- 415
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("5/7"));
-COMMIT;
-SELECT c <= d FROM t;
-|""
-[true]
-
--- 416
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("4/6"));
-COMMIT;
-SELECT c <= d FROM t;
-|""
-[true]
-
--- 417
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("5/7"));
-COMMIT;
-SELECT c > d FROM t;
-|""
-[false]
-
--- 418
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("4/6"));
-COMMIT;
-SELECT c > d FROM t;
-|""
-[false]
-
--- 419
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("5/7"));
-COMMIT;
-SELECT c >= d FROM t;
-|""
-[false]
-
--- 420
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("4/6"));
-COMMIT;
-SELECT c >= d FROM t;
-|""
-[true]
-
--- 421
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("5/7"));
-COMMIT;
-SELECT c / d FROM t;
-|""
-[14/15]
-
--- 422
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("0"));
-COMMIT;
-SELECT c / d FROM t;
-||division .* zero
-
--- 423
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("0"));
-COMMIT;
-SELECT c / (6-2*3) FROM t;
-||division .* zero
-
--- 424
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("5/7"));
-COMMIT;
-SELECT +c, -d FROM t;
-|"", ""
-[2/3 -5/7]
-
--- 425
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat, d bigrat);
-	INSERT INTO t VALUES (bigrat("2/3"), bigrat("5/7"));
-COMMIT;
-SELECT 1+c, d+1, 1.5+c, d+1.5 FROM t;
-|"", "", "", ""
-[5/3 12/7 13/6 31/14]
-
--- 426
-BEGIN TRANSACTION;
-	CREATE TABLE t (c bigrat);
-	INSERT INTO t VALUES (bigrat("355/113"));
-COMMIT;
-SELECT float(c) FROM t;
-|""
-[3.1415929203539825]
-
--- 427
-BEGIN TRANSACTION;
-	CREATE TABLE t (c time);
-	INSERT INTO t VALUES (date(2006, 1, 2, 15, 4, 5, 999999999, "CET"));
-COMMIT;
-SELECT formatTime(timeIn(c, "UTC"), "2006-01-02 15:04:05.999999999 -0700") FROM t;
-|""
-[2006-01-02 14:04:05.999999999 +0000]
-
--- 428
-BEGIN TRANSACTION;
-	CREATE TABLE t (c duration);
-	INSERT INTO t VALUES (duration("1s")), (duration("1m")), (duration("1h"));
-COMMIT;
-SELECT c, string(c) FROM t ORDER BY c;
-|"c", ""
-[1s 1s]
-[1m0s 1m0s]
-[1h0m0s 1h0m0s]
-
--- 429
-BEGIN TRANSACTION;
-	CREATE TABLE t (c time);
-	INSERT INTO t VALUES (date(2013, 11, 26, 10, 18, 5, 999999999, "CET"));
-COMMIT;
-SELECT since(c) > duration("24h") FROM t;
-|""
-[true]
-
--- 430
-BEGIN TRANSACTION;
-	CREATE TABLE t (c time);
-	INSERT INTO t VALUES (date(2013, 11, 26, 10, 32, 5, 999999999, "CET"));
-COMMIT;
-SELECT !(since(c) < duration("24h")) FROM t;
-|""
-[true]
-
--- 431
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("42h21m11.999999994s"),
-			duration("42h21m11.999999995s"),
-			duration("42h21m11.999999996s"),
-		),
-	;
-COMMIT;
-SELECT a > a, a > b, a > c, b > a, b > b, b > c, c > a, c > b, c > c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[false false false true false false true true false]
-
--- 432
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("42h21m11.999999994s"),
-			duration("42h21m11.999999995s"),
-			duration("42h21m11.999999996s"),
-		),
-	;
-COMMIT;
-SELECT a < a, a < b, a < c, b < a, b < b, b < c, c < a, c < b, c < c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[false true true false false true false false false]
-
--- 433
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("42h21m11.999999994s"),
-			duration("42h21m11.999999995s"),
-			duration("42h21m11.999999996s"),
-		),
-	;
-COMMIT;
-SELECT a <= a, a <= b, a <= c, b <= a, b <= b, b <= c, c <= a, c <= b, c <= c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[true true true false true true false false true]
-
--- 434
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("42h21m11.999999994s"),
-			duration("42h21m11.999999995s"),
-			duration("42h21m11.999999996s"),
-		),
-	;
-COMMIT;
-SELECT a >= a, a >= b, a >= c, b >= a, b >= b, b >= c, c >= a, c >= b, c >= c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[true false false true true false true true true]
-
--- 435
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("42h21m11.999999994s"),
-			duration("42h21m11.999999995s"),
-			duration("42h21m11.999999996s"),
-		),
-	;
-COMMIT;
-SELECT a != a, a != b, a != c, b != a, b != b, b != c, c != a, c != b, c != c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[false true true true false true true true false]
-
--- 436
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("42h21m11.999999994s"),
-			duration("42h21m11.999999995s"),
-			duration("42h21m11.999999996s"),
-		),
-	;
-COMMIT;
-SELECT a == a, a == b, a == c, b == a, b == b, b == c, c == a, c == b, c == c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[true false false false true false false false true]
-
--- 437
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("5h"),
-			duration("3m"),
-			duration("2s"),
-		),
-	;
-COMMIT;
-SELECT b+c, a+c, a+b, a+b+c FROM t;
-|"", "", "", ""
-[3m2s 5h0m2s 5h3m0s 5h3m2s]
-
--- 438
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("5h"),
-			duration("3m"),
-			duration("2s"),
-		),
-	;
-COMMIT;
-SELECT b-c, a-c, a-b, a-b-c FROM t;
-|"", "", "", ""
-[2m58s 4h59m58s 4h57m0s 4h56m58s]
-
--- 439
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("5h"),
-			duration("3m"),
-			duration("2s"),
-		),
-	;
-COMMIT;
-SELECT a>>1, b>>1, c>>1 FROM t;
-|"", "", ""
-[2h30m0s 1m30s 1s]
-
--- 440
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("5h"),
-			duration("3m"),
-			duration("2s"),
-		),
-	;
-COMMIT;
-SELECT a<<1, b<<1, c<<1 FROM t;
-|"", "", ""
-[10h0m0s 6m0s 4s]
-
--- 441
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration);
-	INSERT INTO t VALUES (
-			duration("257ns"),
-		),
-	;
-COMMIT;
-SELECT a & 255 FROM t;
-|""
-[1ns]
-
--- 442
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration);
-	INSERT INTO t VALUES (
-			duration("1ns"),
-		),
-	;
-COMMIT;
-SELECT a &or; 256 FROM t;
-|""
-[257ns]
-
--- 443
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration);
-	INSERT INTO t VALUES (
-			duration(0x731),
-		),
-	;
-COMMIT;
-SELECT a &^ 0xd30 FROM t;
-|""
-[513ns]
-
--- 444
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration);
-	INSERT INTO t VALUES (
-			duration("3h2m1s"),
-		),
-	;
-COMMIT;
-SELECT a % duration("2h"), a % duration("1m") FROM t;
-|"", ""
-[1h2m1s 1s]
-
--- 445
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("5h"),
-			duration("3m"),
-			duration("2s"),
-		),
-	;
-COMMIT;
-SELECT a/2, b/2, c/2 FROM t;
-|"", "", ""
-[2h30m0s 1m30s 1s]
-
--- 446
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("5h"),
-			duration("3m"),
-			duration("2s"),
-		),
-	;
-COMMIT;
-SELECT a*2, 2*b, c*2 FROM t;
-|"", "", ""
-[10h0m0s 6m0s 4s]
-
--- 447
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("1ns"),
-			duration("3ns"),
-			duration("5ns"),
-		),
-	;
-COMMIT;
-SELECT ^a, ^b, ^c FROM t;
-|"", "", ""
-[-2ns -4ns -6ns]
-
--- 448
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("1ns"),
-			duration("3ns"),
-			duration("5ns"),
-		),
-	;
-COMMIT;
-SELECT +a, +b, +c FROM t;
-|"", "", ""
-[1ns 3ns 5ns]
-
--- 449
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration, b duration, c duration);
-	INSERT INTO t VALUES (
-			duration("1ns"),
-			duration("3ns"),
-			duration("5ns"),
-		),
-	;
-COMMIT;
-SELECT -a, -b, -c FROM t;
-|"", "", ""
-[-1ns -3ns -5ns]
-
--- 450
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b time, c time);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999994, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999995, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999996, "CET"),
-		),
-	;
-COMMIT;
-SELECT a > a, a > b, a > c, b > a, b > b, b > c, c > a, c > b, c > c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[false false false true false false true true false]
-
--- 451
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b time, c time);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999994, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999995, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999996, "CET"),
-		),
-	;
-COMMIT;
-SELECT a < a, a < b, a < c, b < a, b < b, b < c, c < a, c < b, c < c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[false true true false false true false false false]
-
--- 452
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b time, c time);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999994, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999995, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999996, "CET"),
-		),
-	;
-COMMIT;
-SELECT a <= a, a <= b, a <= c, b <= a, b <= b, b <= c, c <= a, c <= b, c <= c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[true true true false true true false false true]
-
--- 453
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b time, c time);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999994, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999995, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999996, "CET"),
-		),
-	;
-COMMIT;
-SELECT a >= a, a >= b, a >= c, b >= a, b >= b, b >= c, c >= a, c >= b, c >= c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[true false false true true false true true true]
-
--- 454
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b time, c time);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999994, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999995, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999996, "CET"),
-		),
-	;
-COMMIT;
-SELECT a != a, a != b, a != c, b != a, b != b, b != c, c != a, c != b, c != c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[false true true true false true true true false]
-
--- 455
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b time, c time);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999994, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999995, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999996, "CET"),
-		),
-	;
-COMMIT;
-SELECT a == a, a == b, a == c, b == a, b == b, b == c, c == a, c == b, c == c FROM t;
-|"", "", "", "", "", "", "", "", ""
-[true false false false true false false false true]
-
--- 456
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b duration);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999999, "CET"),
-			duration("3h2m1s"),
-		),
-	;
-COMMIT;
-SELECT formatTime(timeIn(a+b, "UTC"), "2006-01-02 15:04:05.999999999 -0700") FROM t;
-|""
-[2013-11-27 14:03:03.999999999 +0000]
-
--- 457
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b duration);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999999, "CET"),
-			duration("3h2m1s"),
-		),
-	;
-COMMIT;
-SELECT formatTime(timeIn(b+a, "UTC"), "2006-01-02 15:04:05.999999999 -0700") FROM t;
-|""
-[2013-11-27 14:03:03.999999999 +0000]
-
--- 458
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b duration);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999999, "CET"),
-			duration("3h2m1s"),
-		),
-	;
-COMMIT;
-SELECT a+a FROM t;
-||invalid operation
-
--- 459
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b time);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 13, 2, 3, 999999999, "CET"),
-			date(2013, 11, 27, 12, 1, 2, 999999999, "CET"),
-		),
-	;
-COMMIT;
-SELECT a-b FROM t;
-|""
-[1h1m1s]
-
--- 460
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b duration);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999999, "CET"),
-			duration("3h2m1s"),
-		),
-	;
-COMMIT;
-SELECT formatTime(timeIn(a-b, "UTC"), "2006-01-02 15:04:05.999999999 -0700") FROM t;
-|""
-[2013-11-27 07:59:01.999999999 +0000]
-
--- 461
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time, b duration);
-	INSERT INTO t VALUES (
-			date(2013, 11, 27, 12, 1, 2, 999999999, "CET"),
-			duration("3h2m1s"),
-		),
-	;
-COMMIT;
-SELECT b-a FROM t;
-||invalid operation
-
--- 462
-BEGIN TRANSACTION;
-	CREATE TABLE t (a duration);
-	INSERT INTO t VALUES (
-			duration("3h2m1.5s"),
-		),
-	;
-COMMIT;
-SELECT hours(a), minutes(a), seconds(a), nanoseconds(a) FROM t;
-|"", "", "", ""
-[3.03375 182.025 10921.5 10921500000000]
-
--- 463
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES (now()-duration("1s"));
-COMMIT;
-SELECT a < now(), now() > a, a >= now(), now() <= a FROM t;
-|"", "", "", ""
-[true true false false]
-
--- 464
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04pm (MST)", "Nov 27, 2013 at 2:07pm (CET)")),
-		(parseTime("2006-Jan-02", "2013-Nov-27")),
-	;
-COMMIT;
-SELECT formatTime(timeIn(a, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as a FROM t ORDER BY a;
-|"a"
-[2013-11-27 00:00:00 +0000]
-[2013-11-27 13:07:00 +0000]
-
--- 465
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04pm (MST)", "Nov 27, 2013 at 2:07pm (CET)")),
-		(parseTime("2006-Jan-02", "2013-Nov-27")),
-	;
-COMMIT;
-SELECT hour(timeIn(a, "UTC")) AS y FROM t ORDER BY y;
-|"y"
-[0]
-[13]
-
--- 466
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04pm (MST)", "Nov 27, 2013 at 2:07pm (CET)")),
-		(parseTime("2006-Jan-02", "2013-Nov-27")),
-	;
-COMMIT;
-SELECT minute(a) AS y FROM t ORDER BY y;
-|"y"
-[0]
-[7]
-
--- 467
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04:05pm (MST)", "Nov 27, 2013 at 2:07:31pm (CET)")),
-		(parseTime("2006-Jan-02", "2013-Nov-27")),
-	;
-COMMIT;
-SELECT second(a) AS y FROM t ORDER BY y;
-|"y"
-[0]
-[31]
-
--- 468
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04:05pm (MST)", "Nov 27, 2013 at 2:07:31.123456789pm (CET)")),
-		(parseTime("2006-Jan-02", "2013-Nov-27")),
-	;
-COMMIT;
-SELECT nanosecond(a) AS y FROM t ORDER BY y;
-|"y"
-[0]
-[123456789]
-
--- 469
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04:05pm (MST)", "Nov 27, 2013 at 2:07:31.123456789pm (CET)")),
-		(parseTime("2006-Jan-02", "2014-Nov-28")),
-	;
-COMMIT;
-SELECT year(a) AS y FROM t ORDER BY y;
-|"y"
-[2013]
-[2014]
-
--- 470
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04:05pm (MST)", "Nov 27, 2013 at 2:07:31.123456789pm (CET)")),
-		(parseTime("2006-Jan-02", "2014-Nov-28")),
-	;
-COMMIT;
-SELECT day(a) AS y FROM t ORDER BY y;
-|"y"
-[27]
-[28]
-
--- 471
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04:05pm (MST)", "Nov 27, 2013 at 2:07:31.123456789pm (CET)")),
-		(parseTime("2006-Jan-02", "2014-Dec-28")),
-	;
-COMMIT;
-SELECT month(a) AS y FROM t ORDER BY y;
-|"y"
-[11]
-[12]
-
--- 472
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04:05pm (MST)", "Nov 27, 2013 at 2:07:31.123456789pm (CET)")),
-		(parseTime("2006-Jan-02", "2013-Sep-08")),
-	;
-COMMIT;
-SELECT weekday(a) AS y FROM t ORDER BY y;
-|"y"
-[0]
-[3]
-
--- 473
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04:05pm (MST)", "Feb 1, 2013 at 2:07:31.123456789pm (CET)")),
-		(parseTime("2006-Jan-02", "2014-Feb-02")),
-	;
-COMMIT;
-SELECT yearDay(a) AS y FROM t ORDER BY y;
-|"y"
-[32]
-[33]
-
--- 474
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04pm (MST)", "Feb 1, 2013 at 2:07pm (CET)")),
-		(parseTime("2006-Jan-02", "2014-Feb-02")),
-	;
-COMMIT;
-SELECT timeIn(a, ""), timeIn(a, "UTC") AS y FROM t ORDER BY y;
-|"", "y"
-[2013-02-01 13:07:00 +0000 UTC 2013-02-01 13:07:00 +0000 UTC]
-[2014-02-02 00:00:00 +0000 UTC 2014-02-02 00:00:00 +0000 UTC]
-
--- 475
-BEGIN TRANSACTION;
-	CREATE TABLE t (a time);
-	INSERT INTO t VALUES
-		(parseTime("Jan 2, 2006 at 3:04pm (MST)", "Feb 1, 2013 at 2:07pm (CET)")),
-		(parseTime("2006-Jan-02", "2014-Feb-02")),
-	;
-COMMIT;
-SELECT formatTime(timeIn(a, "UTC"), "Jan 2, 2006 at 3:04pm (UTC)") AS y FROM t ORDER BY y;
-|"y"
-[Feb 1, 2013 at 1:07pm (UTC)]
-[Feb 2, 2014 at 12:00am (UTC)]
-
--- 476
-BEGIN TRANSACTION;
-	BEGIN TRANSACTION;
-	COMMIT;
-COMMIT;
-SELECT * FROM t;
-||does not exist
-
--- 477
-BEGIN TRANSACTION;
-	BEGIN TRANSACTION;
-	ROLLBACK;
-COMMIT;
-SELECT * FROM t;
-||does not exist
-
--- 478 // https://github.com/cznic/ql/issues/23
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b string, t time);
-	INSERT INTO t VALUES (1, "a", parseTime("Jan 2, 2006 at 3:04pm (MST)", "Jan 12, 2014 at 6:26pm (CET)"));
-	INSERT INTO t VALUES (2, "b", parseTime("Jan 2, 2006 at 3:04pm (MST)", "Jan 12, 2014 at 6:27pm (CET)"));
-	UPDATE t b = "hello" WHERE a == 1;
-COMMIT;
-SELECT a, b, formatTime(timeIn(t, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as t FROM t;
-|"a", "b", "t"
-[2 b 2014-01-12 17:27:00 +0000]
-[1 hello 2014-01-12 17:26:00 +0000]
-
--- 479 // https://github.com/cznic/ql/issues/23
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b string, t time);
-	INSERT INTO t VALUES (1, "a", parseTime("Jan 2, 2006 at 3:04pm (MST)", "Jan 12, 2014 at 6:26pm (CET)"));
-	INSERT INTO t VALUES (2, "b", parseTime("Jan 2, 2006 at 3:04pm (MST)", "Jan 12, 2014 at 6:27pm (CET)"));
-	UPDATE t
-		b = "hello",
-		t = parseTime("Jan 2, 2006 at 3:04pm (MST)", "Jan 12, 2014 at 6:28pm (CET)"),
-	WHERE a == 1;
-COMMIT;
-SELECT a, b, formatTime(timeIn(t, "UTC"), "2006-01-02 15:04:05.999999999 -0700") as t FROM t;
-|"a", "b", "t"
-[2 b 2014-01-12 17:27:00 +0000]
-[1 hello 2014-01-12 17:28:00 +0000]
-
--- 480 // https://github.com/cznic/ql/issues/23
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b string, d duration);
-	INSERT INTO t VALUES (1, "a", duration("1m"));
-	INSERT INTO t VALUES (2, "b", duration("2m"));
-	UPDATE t b = "hello" WHERE a == 1;
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "d"
-[2 b 2m0s]
-[1 hello 1m0s]
-
--- 481 // https://github.com/cznic/ql/issues/23
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b string, d duration);
-	INSERT INTO t VALUES (1, "a", duration("1m"));
-	INSERT INTO t VALUES (2, "b", duration("2m"));
-	UPDATE t
-		b = "hello",
-		d = duration("3m"),
-	WHERE a == 1;
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "d"
-[2 b 2m0s]
-[1 hello 3m0s]
-
--- 482 // https://github.com/cznic/ql/issues/24
-BEGIN TRANSACTION;
-	CREATE TABLE t (c complex128);
-	INSERT INTO t VALUES
-		(2+complex128(1)),
-		(22+complex(0, 1)),
-	;
-COMMIT;
-SELECT * FROM t ORDER BY real(c);
-|"c"
-[(3+0i)]
-[(22+1i)]
-
--- 483
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string, substr string);
-	INSERT INTO t VALUES
-		("seafood", "foo"),
-		("seafood", "bar"),
-		("seafood", ""),
-		("", ""),
-	;
-COMMIT;
-SELECT id() as i, contains(42, substr) FROM t ORDER BY i;
-||invalid .* 42
-
--- 484
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string, substr string);
-	INSERT INTO t VALUES
-		("seafood", "foo"),
-		("seafood", "bar"),
-		("seafood", ""),
-		("", ""),
-	;
-COMMIT;
-SELECT id() as i, contains(s, true) FROM t ORDER BY i;
-||invalid .* true
-
--- 485
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string, substr string);
-	INSERT INTO t VALUES
-		("seafood", "foo"),
-		("seafood", "bar"),
-		("seafood", ""),
-		("", ""),
-		("", NULL),
-		("foo", NULL),
-		(NULL, ""),
-		(NULL, "foo"),
-		(NULL, NULL),
-	;
-COMMIT;
-SELECT id() as i, contains(s, substr) FROM t ORDER BY i;
-|"i", ""
-[1 true]
-[2 false]
-[3 true]
-[4 true]
-[5 <nil>]
-[6 <nil>]
-[7 <nil>]
-[8 <nil>]
-[9 <nil>]
-
--- 486
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string, prefix string);
-	INSERT INTO t VALUES
-		("", ""),
-		("f", ""),
-		("", "foo"),
-		("f", "foo"),
-		("fo", "foo"),
-		("foo", "foo"),
-		("fooo", "foo"),
-	;
-COMMIT;
-SELECT id() as i, hasPrefix(42, prefix) FROM t ORDER BY i;
-||invalid .* 42
-
--- 487
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string, prefix string);
-	INSERT INTO t VALUES
-		("", ""),
-		("f", ""),
-		("", "foo"),
-		("f", "foo"),
-		("fo", "foo"),
-		("foo", "foo"),
-		("fooo", "foo"),
-	;
-COMMIT;
-SELECT id() as i, hasPrefix(s, false) FROM t ORDER BY i;
-||invalid .* false
-
--- 488
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string, prefix string);
-	INSERT INTO t VALUES
-		("", ""),
-		("f", ""),
-		("", "foo"),
-		("f", "foo"),
-		("fo", "foo"),
-		("foo", "foo"),
-		("fooo", "foo"),
-		("", NULL),
-		("foo", NULL),
-		(NULL, ""),
-		(NULL, "foo"),
-		(NULL, NULL),
-	;
-COMMIT;
-SELECT id() as i, hasPrefix(s, prefix) FROM t ORDER BY i;
-|"i", ""
-[1 true]
-[2 true]
-[3 false]
-[4 false]
-[5 false]
-[6 true]
-[7 true]
-[8 <nil>]
-[9 <nil>]
-[10 <nil>]
-[11 <nil>]
-[12 <nil>]
-
--- 489
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string, suffix string);
-	INSERT INTO t VALUES
-		("", ""),
-		("f", ""),
-		("x", "foo"),
-		("xf", "foo"),
-		("xfo", "foo"),
-		("xfoo", "foo"),
-		("xfooo", "foo"),
-	;
-COMMIT;
-SELECT id() as i, hasSuffix(42, suffix) FROM t ORDER BY i;
-||invalid .* 42
-
--- 490
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string, suffix string);
-	INSERT INTO t VALUES
-		("", ""),
-		("f", ""),
-		("x", "foo"),
-		("xf", "foo"),
-		("xfo", "foo"),
-		("xfoo", "foo"),
-		("xfooo", "foo"),
-	;
-COMMIT;
-SELECT id() as i, hasSuffix(s, true) FROM t ORDER BY i;
-||invalid .* true
-
--- 491
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string, suffix string);
-	INSERT INTO t VALUES
-		("", ""),
-		("f", ""),
-		("x", "foo"),
-		("xf", "foo"),
-		("xfo", "foo"),
-		("xfoo", "foo"),
-		("xfooo", "foo"),
-		("", NULL),
-		("foo", NULL),
-		(NULL, ""),
-		(NULL, "foo"),
-		(NULL, NULL),
-	;
-COMMIT;
-SELECT id() as i, hasSuffix(s, suffix) FROM t ORDER BY i;
-|"i", ""
-[1 true]
-[2 true]
-[3 false]
-[4 false]
-[5 false]
-[6 true]
-[7 false]
-[8 <nil>]
-[9 <nil>]
-[10 <nil>]
-[11 <nil>]
-[12 <nil>]
-
--- 492 // issue #27
-BEGIN TRANSACTION;
-	DROP TABLE nonexistent;
-COMMIT;
-||does not exist
-
--- 493 // issue #27
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	DROP TABLE IF EXISTS nonexistent;
-COMMIT;
-SELECT * FROM t;
-|"i"
-
--- 494 // issue #27
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE t (i int);
-COMMIT;
-||exist
-
--- 495 // issue #27
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE IF NOT EXISTS t (s string);
-COMMIT;
-SELECT * FROM t;
-|"i"
-
--- 496 // issue #28
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-	ALTER TABLE t ADD s string;
-COMMIT;
-SELECT * FROM t;
-|"i", "s"
-[42 <nil>]
-
--- 497
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-BEGIN TRANSACTION;
-	INSERT INTO t VALUES(1000);
-	BEGIN TRANSACTION;
-		INSERT INTO t VALUES(2000);
-	COMMIT;
-	INSERT INTO t VALUES(3000);
-COMMIT;
-SELECT * FROM t;
-|"i"
-[3000]
-[2000]
-[1000]
-
--- 498
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-BEGIN TRANSACTION;
-	INSERT INTO t VALUES(1000);
-	BEGIN TRANSACTION;
-		INSERT INTO t VALUES(2000);
-	ROLLBACK;
-	INSERT INTO t VALUES(3000);
-COMMIT;
-SELECT * FROM t;
-|"i"
-[3000]
-[1000]
-
--- 499
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	INSERT INTO t VALUES(42, "foo");
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-SELECT * FROM t;
-|"s"
-[foo]
-
--- 500
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	INSERT INTO t VALUES(42, "foo");
-	ALTER TABLE t DROP COLUMN s;
-COMMIT;
-SELECT * FROM t;
-|"i"
-[42]
-
--- 501 // new spec rule: table must have at least 1 column
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t DROP COLUMN c;
-COMMIT;
-SELECT * FROM t;
-||cannot drop.*column
-
--- 502 // fixed bug
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int, s string);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t DROP COLUMN s;
-ROLLBACK;
-SELECT * FROM t;
-|"c", "s"
-
--- 503 // fixed bug
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int, s string);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t ADD b bool;
-ROLLBACK;
-SELECT * FROM t;
-|"c", "s"
-
--- 504 // fixed bug
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int, s string);
-COMMIT;
-BEGIN TRANSACTION;
-	DROP TABLE t;
-ROLLBACK;
-SELECT * FROM t;
-|"c", "s"
-
--- 505 // fixed bug
-BEGIN TRANSACTION;
-	CREATE INDEX x ON t (qty());
-COMMIT;
-||undefined.* qty
-
--- 506
-BEGIN TRANSACTION;
-	CREATE INDEX x ON t (qty);
-COMMIT;
-||table.*not exist
-
--- 507
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (qty);
-COMMIT;
-||column.*not exist
-
--- 508
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (id());
-COMMIT;
-SELECT * FROM t;
-|"c"
-
--- 509
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX y ON t (c);
-COMMIT;
-SELECT * FROM t;
-|"c"
-
--- 510
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (id());
-	CREATE INDEX y ON t (id());
-COMMIT;
-SELECT * FROM t;
-||already
-
--- 511
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (id());
-	CREATE INDEX x ON t (c);
-COMMIT;
-SELECT * FROM t;
-||already
-
--- 512
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (id());
-	CREATE INDEX y ON t (c);
-COMMIT;
-SELECT * FROM t;
-|"c"
-
--- 513
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX y ON t (c);
-	CREATE INDEX x ON t (id());
-COMMIT;
-SELECT * FROM t;
-|"c"
-
--- 514
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (id());
-	INSERT INTO t VALUES(42);
-COMMIT;
-SELECT * FROM t;
-|"c"
-[42]
-
--- 515
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	INSERT INTO t VALUES(42);
-	CREATE INDEX x ON t (id());
-COMMIT;
-SELECT * FROM t;
-|"c"
-[42]
-
--- 516
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	INSERT INTO t VALUES(42);
-	INSERT INTO t VALUES(24);
-	CREATE INDEX x ON t (id());
-	INSERT INTO t VALUES(1);
-	CREATE INDEX i ON t (c);
-	INSERT INTO t VALUES(999);
-COMMIT;
-SELECT * FROM t ORDER BY id();
-|"c"
-[42]
-[24]
-[1]
-[999]
-
--- 517
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	INSERT INTO t VALUES(42);
-	INSERT INTO t VALUES(24);
-	CREATE INDEX x ON t (id());
-	INSERT INTO t VALUES(1);
-	CREATE INDEX i ON t (c);
-	INSERT INTO t VALUES(999);
-COMMIT;
-SELECT * FROM t ORDER BY c;
-|"c"
-[1]
-[24]
-[42]
-[999]
-
--- 518
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX xid ON t (id());
-	INSERT INTO t VALUES(42);
-	INSERT INTO t VALUES(24);
-	CREATE INDEX ii ON t (i);
-	INSERT INTO t VALUES(1);
-	INSERT INTO t VALUES(999);
-	UPDATE t i = 240 WHERE i == 24;
-	DELETE FROM t WHERE i == 240;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[42]
-[999]
-
--- 519
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX i ON t (i);
-COMMIT;
-||collision: i
-
--- 520
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX t ON t (i);
-COMMIT;
-||collision: t
-
--- 521
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (s string);
-	CREATE INDEX u ON t (i);
-COMMIT;
-||collision.*: u
-
--- 522
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (s string);
-	CREATE INDEX z ON t (i);
-	CREATE INDEX z ON u (s);
-COMMIT;
-||already
-
--- 523
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX u ON u (s);
-COMMIT;
-||collision: u
-
--- 524
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX v ON u (v);
-COMMIT;
-||collision: v
-
--- 525
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX s ON t (i);
-COMMIT;
-||collision.*: s
-
--- 526
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX id ON t (i);
-COMMIT;
-SELECT * FROM t;
-|"i"
-
--- 527
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	CREATE TABLE x (s string);
-COMMIT;
-||table t.*index x
-
--- 528
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-BEGIN TRANSACTION;
-	INSERT INTO t VALUES(1000);
-	BEGIN TRANSACTION;
-		INSERT INTO t VALUES(2000);
-	ROLLBACK;
-	INSERT INTO t VALUES(3000);
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1000]
-[3000]
-
--- 529
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42);
-	TRUNCATE TABLE t;
-COMMIT;
-SELECT * FROM t;
-|"i"
-
--- 530
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42);
-	DELETE FROM t;
-COMMIT;
-SELECT * FROM t;
-|"i"
-
--- 531
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX xi ON t (i);
-	INSERT INTO t VALUES (42, "foo");
-	ALTER TABLE t DROP COLUMN i;
-	INSERT INTO t VALUES ("bar");
-COMMIT;
-SELECT * FROM t ORDER BY s;
-|"s"
-[bar]
-[foo]
-
--- 532
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX xs ON t (s);
-	INSERT INTO t VALUES (42, "foo");
-	ALTER TABLE t DROP COLUMN i;
-	INSERT INTO t VALUES ("bar");
-COMMIT;
-SELECT * FROM t ORDER BY s;
-|"s"
-[bar]
-[foo]
-
--- 533
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX xi ON t (i);
-	CREATE INDEX xs ON t (s);
-	INSERT INTO t VALUES (42, "foo");
-	ALTER TABLE t DROP COLUMN i;
-	INSERT INTO t VALUES ("bar");
-COMMIT;
-SELECT * FROM t ORDER BY s;
-|"s"
-[bar]
-[foo]
-
--- 534
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX xi ON t (i);
-	INSERT INTO t VALUES (42, "foo");
-	ALTER TABLE t DROP COLUMN s;
-	INSERT INTO t VALUES (24);
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[24]
-[42]
-
--- 535
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX xs ON t (s);
-	INSERT INTO t VALUES (42, "foo");
-	ALTER TABLE t DROP COLUMN s;
-	INSERT INTO t VALUES (24);
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[24]
-[42]
-
--- 536
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX xi ON t (i);
-	CREATE INDEX xs ON t (s);
-	INSERT INTO t VALUES (42, "foo");
-	ALTER TABLE t DROP COLUMN s;
-	INSERT INTO t VALUES (24);
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[24]
-[42]
-
--- 537
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	INSERT INTO t VALUES (42, "foo");
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-SELECT * FROM t;
-|"s"
-[foo]
-
--- 538
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	INSERT INTO t VALUES (42, "foo");
-	ALTER TABLE t DROP COLUMN s;
-COMMIT;
-SELECT * FROM t;
-|"i"
-[42]
-
--- 539
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	INSERT INTO t VALUES (42, "foo");
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-SELECT * FROM t;
-|"s"
-[foo]
-
--- 540
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	INSERT INTO t VALUES (42, "foo");
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t DROP COLUMN s;
-COMMIT;
-SELECT * FROM t;
-|"i"
-[42]
-
--- 541
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42, "foo");
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t DROP COLUMN s;
-COMMIT;
-BEGIN TRANSACTION;
-	INSERT INTO t VALUES (24);
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[24]
-[42]
-
--- 542
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42, "foo");
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-BEGIN TRANSACTION;
-	INSERT INTO t VALUES ("bar");
-COMMIT;
-SELECT * FROM t ORDER BY s;
-|"s"
-[bar]
-[foo]
-
--- 543
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42);
-	INSERT INTO t SELECT 10*i FROM t;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[42]
-[420]
-
--- 544
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42);
-	INSERT INTO t SELECT 10*i FROM t;
-	DROP INDEX none;
-COMMIT;
-||index none does not exist
-
--- 545
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42);
-	INSERT INTO t SELECT 10*i FROM t;
-	DROP INDEX x;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[42]
-[420]
-
--- 546
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42);
-	INSERT INTO t SELECT 10*i FROM t;
-COMMIT;
-BEGIN TRANSACTION;
-	DROP INDEX x;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[42]
-[420]
-
--- 547
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	ALTER TABLE t ADD s string;
-COMMIT;
-SELECT * FROM t;
-|"i", "s"
-
--- 548
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	ALTER TABLE t ADD s string;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i", "s"
-
--- 549
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t ADD s string;
-COMMIT;
-SELECT * FROM t ORDER BY s;
-|"i", "s"
-
--- 550
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[42]
-
--- 551
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (42);
-	INSERT INTO t VALUES (420);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[42]
-[420]
-
--- 552
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (420);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[42]
-[420]
-
--- 553
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (420);
-	INSERT INTO t VALUES (42);
-	INSERT INTO t VALUES (100);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[42]
-[100]
-[420]
-
--- 554
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (420);
-	INSERT INTO t VALUES (42);
-	INSERT INTO t VALUES (100);
-	DELETE FROM t WHERE i == 100;
-COMMIT;
-SELECT * FROM x;
-|"x"
-[42]
-[420]
-
--- 555
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (420);
-	INSERT INTO t VALUES (42);
-	INSERT INTO t VALUES (100);
-COMMIT;
-BEGIN TRANSACTION;
-	DELETE FROM t WHERE i == 100;
-COMMIT;
-SELECT * FROM x;
-|"x"
-[42]
-[420]
-
--- 556
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (1);
-	INSERT INTO t VALUES (2);
-	INSERT INTO t VALUES (3);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1]
-[2]
-[3]
-
--- 557
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (1);
-	INSERT INTO t VALUES (3);
-	INSERT INTO t VALUES (2);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1]
-[2]
-[3]
-
--- 558
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (2);
-	INSERT INTO t VALUES (1);
-	INSERT INTO t VALUES (3);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1]
-[2]
-[3]
-
--- 559
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (2);
-	INSERT INTO t VALUES (3);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1]
-[2]
-[3]
-
--- 560
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (3);
-	INSERT INTO t VALUES (1);
-	INSERT INTO t VALUES (2);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1]
-[2]
-[3]
-
--- 561
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (3);
-	INSERT INTO t VALUES (2);
-	INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1]
-[2]
-[3]
-
--- 562
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (bigint(1) << 100);
-	INSERT INTO t VALUES (bigint(1) << 100 - 1);
-	INSERT INTO t VALUES (bigint(1) << (256*8));
-	INSERT INTO t VALUES (bigint(1) << 100 + 1);
-	INSERT INTO t VALUES (bigint(1) << 10);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1024]
-[1267650600228229401496703205375]
-[1267650600228229401496703205376]
-[1267650600228229401496703205377]
-[32317006071311007300714876688669951960444102669715484032130345427524655138867890893197201411522913463688717960921898019494119559150490921095088152386448283120630877367300996091750197750389652106796057638384067568276792218642619756161838094338476170470581645852036305042887575891541065808607552399123930385521914333389668342420684974786564569494856176035326322058077805659331026192708460314150258592864177116725943603718461857357598351152301645904403697613233287231227125684710820209725157101726931323469678542580656697935045997268352998638215525166389437335543602135433229604645318478604952148193555853611059596230656]
-
--- 563
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (bigint(1) << 100);
-	INSERT INTO t VALUES (bigint(1) << 100 - 1);
-	INSERT INTO t VALUES (bigint(1) << (256*8));
-	INSERT INTO t VALUES (bigint(1) << 100 + 1);
-	INSERT INTO t VALUES (bigint(1) << 10);
-COMMIT;
-BEGIN TRANSACTION;
-	DELETE FROM t WHERE i == (bigint(1) << (256*8));
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1024]
-[1267650600228229401496703205375]
-[1267650600228229401496703205376]
-[1267650600228229401496703205377]
-
--- 564
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (bigint(1) << 100);
-	INSERT INTO t VALUES (bigint(1) << 100 - 1);
-	INSERT INTO t VALUES (bigint(1) << 100 + 1);
-	INSERT INTO t VALUES (bigint(1) << 10);
-COMMIT;
-BEGIN TRANSACTION;
-	UPDATE t
-		i = i+10,
-	WHERE i == bigint(1) << 100;
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1024]
-[1267650600228229401496703205375]
-[1267650600228229401496703205377]
-[1267650600228229401496703205386]
-
--- 565
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (bigint(1) << 100);
-	INSERT INTO t VALUES (bigint(1) << 100 - 1);
-	INSERT INTO t VALUES (bigint(1) << (256*8));
-	INSERT INTO t VALUES (bigint(1) << 100 + 1);
-	INSERT INTO t VALUES (bigint(1) << 10);
-COMMIT;
-BEGIN TRANSACTION;
-	UPDATE t
-		i = 42,
-	WHERE i == bigint(1) << (256*8);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[42]
-[1024]
-[1267650600228229401496703205375]
-[1267650600228229401496703205376]
-[1267650600228229401496703205377]
-
--- 566
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (bigint(1) << 100);
-	INSERT INTO t VALUES (bigint(1) << 100 - 1);
-	INSERT INTO t VALUES (bigint(42));
-	INSERT INTO t VALUES (bigint(1) << 100 + 1);
-	INSERT INTO t VALUES (bigint(1) << 10);
-COMMIT;
-BEGIN TRANSACTION;
-	UPDATE t
-		i = bigint(1) << (256*8),
-	WHERE i == 42;
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1024]
-[1267650600228229401496703205375]
-[1267650600228229401496703205376]
-[1267650600228229401496703205377]
-[32317006071311007300714876688669951960444102669715484032130345427524655138867890893197201411522913463688717960921898019494119559150490921095088152386448283120630877367300996091750197750389652106796057638384067568276792218642619756161838094338476170470581645852036305042887575891541065808607552399123930385521914333389668342420684974786564569494856176035326322058077805659331026192708460314150258592864177116725943603718461857357598351152301645904403697613233287231227125684710820209725157101726931323469678542580656697935045997268352998638215525166389437335543602135433229604645318478604952148193555853611059596230656]
-
--- 567
-BEGIN TRANSACTION;
-	CREATE TABLE t (b blob);
-	CREATE INDEX x ON t (b);
-	INSERT INTO t VALUES (blob(
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" // > shortBlob
-	));
-	DROP TABLE t;
-COMMIT;
-SELECT * FROM t;
-||does not exist
-
--- 568
-BEGIN TRANSACTION;
-	CREATE TABLE t (b blob);
-	CREATE INDEX x ON t (b);
-	INSERT INTO t VALUES (blob(
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" // > shortBlob
-	));
-	DROP TABLE t;
-COMMIT;
-BEGIN TRANSACTION;
-	DROP TABLE t;
-COMMIT;
-SELECT * FROM t;
-||does not exist
-
--- 569
-BEGIN TRANSACTION;
-	CREATE TABLE t (b blob);
-	CREATE INDEX x ON t (b);
-	INSERT INTO t VALUES (blob(
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" // > shortBlob
-	));
-	DROP INDEX x;
-COMMIT;
-SELECT len(string(b)) AS n FROM t;
-|"n"
-[320]
-
--- 570
-BEGIN TRANSACTION;
-	CREATE TABLE t (b blob);
-	CREATE INDEX x ON t (b);
-	INSERT INTO t VALUES (blob(
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"+
-		"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" // > shortBlob
-	));
-COMMIT;
-BEGIN TRANSACTION;
-	DROP INDEX x;
-COMMIT;
-SELECT len(string(b)) AS n FROM t;
-|"n"
-[320]
-
--- 571
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-	ALTER TABLE t ADD s string;
-COMMIT;
-SELECT * FROM t;
-|"i", "s"
-[42 <nil>]
-
--- 572
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t ADD s string;
-COMMIT;
-SELECT * FROM t;
-|"i", "s"
-[42 <nil>]
-
--- 573
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM q.t;
-||expected .*where
-
--- 574
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-COMMIT;
-SELECT * FROM t AS u;
-|"i"
-[42]
-
--- 575
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-COMMIT;
-SELECT u.x FROM t AS u;
-||unknown field u.x
-
--- 576
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-COMMIT;
-SELECT u.i FROM t AS u;
-||unknown field u.i
-
--- 577
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-COMMIT;
-SELECT i FROM t AS u;
-|"i"
-[42]
-
--- 578
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, b bool);
-	CREATE INDEX x ON t (b);
-	INSERT INTO t VALUES(24, false);
-	INSERT INTO t VALUES(333, NULL);
-	INSERT INTO t VALUES(42, true);
-	INSERT INTO t VALUES(240, false);
-	INSERT INTO t VALUES(420, true);
-COMMIT;
-SELECT i FROM t WHERE b ORDER BY i;
-|"i"
-[42]
-[420]
-
--- 579
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(10, "foo");
-COMMIT;
-SELECT * FROM t WHERE i < "30";
-||type string.*type int64
-
--- 580
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[<nil>]
-[<nil>]
-[10]
-[10]
-[20]
-[20]
-[30]
-[30]
-[40]
-[40]
-[50]
-[50]
-
--- 581
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE i < 30;
-|"i"
-[10]
-[20]
-[20]
-[10]
-
--- 582 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE i < 30;
-|"i"
-[10]
-[10]
-[20]
-[20]
-
--- 583
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i <= 30;
-|"i"
-[10]
-[20]
-[30]
-[30]
-[20]
-[10]
-
--- 584 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i <= 30;
-|"i"
-[10]
-[10]
-[20]
-[20]
-[30]
-[30]
-
--- 585
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE i == 30;
-|"i"
-[30]
-[30]
-
--- 586 // index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE i == 30;
-|"i"
-[30]
-[30]
-
--- 587
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i >= 30;
-|"i"
-[50]
-[40]
-[30]
-[30]
-[40]
-[50]
-
--- 588 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i >= 30;
-|"i"
-[30]
-[30]
-[40]
-[40]
-[50]
-[50]
-
--- 589
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i > 30;
-|"i"
-[50]
-[40]
-[40]
-[50]
-
--- 590 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i > 30;
-|"i"
-[40]
-[40]
-[50]
-[50]
-
--- 591
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, b bool);
-	INSERT INTO t VALUES(24, false);
-	INSERT INTO t VALUES(333, NULL);
-	INSERT INTO t VALUES(42, true);
-	INSERT INTO t VALUES(240, false);
-	INSERT INTO t VALUES(420, true);
-COMMIT;
-SELECT i FROM t WHERE !b ORDER BY i;
-|"i"
-[24]
-[240]
-
--- 592
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, b bool);
-	CREATE INDEX x ON t (b);
-	INSERT INTO t VALUES(24, false);
-	INSERT INTO t VALUES(333, NULL);
-	INSERT INTO t VALUES(42, true);
-	INSERT INTO t VALUES(240, false);
-	INSERT INTO t VALUES(420, true);
-COMMIT;
-SELECT i FROM t WHERE !b ORDER BY i;
-|"i"
-[24]
-[240]
-
--- 593 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE i < $1; // 30
-|"i"
-[10]
-[10]
-[20]
-[20]
-
--- 594 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i <= $1; // 30
-|"i"
-[10]
-[10]
-[20]
-[20]
-[30]
-[30]
-
--- 595 // index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE i == $1; // 30
-|"i"
-[30]
-[30]
-
--- 596 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i >= $1; // 30
-|"i"
-[30]
-[30]
-[40]
-[40]
-[50]
-[50]
-
--- 597 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i > $1; // 30
-|"i"
-[40]
-[40]
-[50]
-[50]
-
--- 598 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE $1 > i; // 30
-|"i"
-[10]
-[10]
-[20]
-[20]
-
--- 599 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE $1 >= i; // 30
-|"i"
-[10]
-[10]
-[20]
-[20]
-[30]
-[30]
-
--- 600 // index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE $1 == i; // 30
-|"i"
-[30]
-[30]
-
--- 601 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE $1 <= i; // 30
-|"i"
-[30]
-[30]
-[40]
-[40]
-[50]
-[50]
-
--- 602 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE $1 < i; // 30
-|"i"
-[40]
-[40]
-[50]
-[50]
-
--- 603 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE 30 > i;
-|"i"
-[10]
-[10]
-[20]
-[20]
-
--- 604 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE 30 >= i;
-|"i"
-[10]
-[10]
-[20]
-[20]
-[30]
-[30]
-
--- 605 // index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT i FROM t WHERE 30 == i;
-|"i"
-[30]
-[30]
-
--- 606 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE 30 <= i;
-|"i"
-[30]
-[30]
-[40]
-[40]
-[50]
-[50]
-
--- 607 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE 30 < i;
-|"i"
-[40]
-[40]
-[50]
-[50]
-
--- 608
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i < 30;
-|"i"
-[20]
-[10]
-
--- 609 // ordered -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE UNIQUE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i < 30;
-|"i"
-[10]
-[20]
-
--- 610
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE UNIQUE INDEX x ON t (i);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM t WHERE i < 30;
-||duplicate
-
--- 611 // Issue #34
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-COMMIT;
-SELECT * FROM t WHERE i == $0;
-||parameter.*non zero
-
--- 612
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE __Table (i int);
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 613
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE __Column (i int);
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 614
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE __Index (i int);
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 615
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	DROP TABLE __Table;
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 616
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	DROP TABLE __Column;
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 617
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	DROP TABLE __Index;
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 618
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX __Table ON t (i);
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 619
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX __Column ON t (i);
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 620
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX __Index ON t (i);
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 621
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON __Table (Name);
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 622
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON __Column (Name);
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 623
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON __Index (Name);
-COMMIT;
-SELECT * FROM t;
-||system table
-
--- 624
-SELECT * FROM __Table;
-|"Name", "Schema"
-
--- 625
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-COMMIT;
-SELECT * FROM __Table ORDER BY Name;
-|"Name", "Schema"
-[t CREATE TABLE t (i int64, s string);]
-
--- 626
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE TABLE u (b bool, i bigint, t time, d duration);
-COMMIT;
-SELECT * FROM __Table ORDER BY Name;
-|"Name", "Schema"
-[t CREATE TABLE t (i int64, s string);]
-[u CREATE TABLE u (b bool, i bigint, t time, d duration);]
-
--- 627
-SELECT * FROM __Column;
-|"TableName", "Ordinal", "Name", "Type"
-
--- 628
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-COMMIT;
-SELECT * FROM __Column ORDER BY TableName, Name;
-|"TableName", "Ordinal", "Name", "Type"
-[t 1 i int64]
-[t 2 s string]
-
--- 629
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE TABLE u (b bool, i bigint, t time, d duration);
-COMMIT;
-SELECT * FROM __Column ORDER BY TableName, Ordinal;
-|"TableName", "Ordinal", "Name", "Type"
-[t 1 i int64]
-[t 2 s string]
-[u 1 b bool]
-[u 2 i bigint]
-[u 3 t time]
-[u 4 d duration]
-
--- 630
-SELECT * FROM __Index;
-|"TableName", "ColumnName", "Name", "IsUnique"
-
--- 631
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-COMMIT;
-SELECT * FROM __Index ORDER BY TableName, Name;
-|"TableName", "ColumnName", "Name", "IsUnique"
-
--- 632
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (i);
-COMMIT;
-SELECT * FROM __Index WHERE !hasPrefix(TableName, "__") ORDER BY TableName, ColumnName, Name;
-|"TableName", "ColumnName", "Name", "IsUnique"
-[t i x false]
-
--- 633
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (i);
-	CREATE INDEX id ON t (id());
-	CREATE TABLE u (b bool, i bigint, t time, d duration);
-COMMIT;
-SELECT * FROM __Index WHERE !hasPrefix(TableName, "__") ORDER BY TableName, ColumnName, Name;
-|"TableName", "ColumnName", "Name", "IsUnique"
-[t i x false]
-[t id() id false]
-
--- 634
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (i);
-	CREATE INDEX id ON t (id());
-	CREATE TABLE u (b bool, i bigint, t time, d duration);
-	CREATE INDEX z ON u (t);
-	CREATE UNIQUE INDEX y ON u (i);
-COMMIT;
-SELECT * FROM __Index WHERE !hasPrefix(TableName, "__") ORDER BY TableName, ColumnName, Name;
-|"TableName", "ColumnName", "Name", "IsUnique"
-[t i x false]
-[t id() id false]
-[u i y true]
-[u t z false]
-
--- 635
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (i);
-	CREATE INDEX id ON t (id());
-	CREATE TABLE u (b bool, i bigint, t time, d duration);
-	CREATE INDEX z ON u (t);
-	CREATE UNIQUE INDEX y ON u (i);
-COMMIT;
-SELECT c.TableName, c.Ordinal, c.Name
-FROM __Table AS t, __Column AS c
-WHERE t.Name == "u" && t.Name == c.TableName
-ORDER BY c.Ordinal;
-|"c.TableName", "c.Ordinal", "c.Name"
-[u 1 b]
-[u 2 i]
-[u 3 t]
-[u 4 d]
-
--- 636 // https://github.com/cznic/ql/issues/36
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	INSERT INTO t VALUES (1, "test");
-COMMIT;
-SELECT * FROM t WHERE s == "test";
-|"i", "s"
-[1 test]
-
--- 637 // https://github.com/cznic/ql/issues/36
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	INSERT INTO t VALUES (1, "test");
-	CREATE INDEX idx_s ON t (s);
-COMMIT;
-SELECT * FROM t WHERE s == "test";
-|"i", "s"
-[1 test]
-
--- 638 // https://github.com/cznic/ql/issues/37
-BEGIN TRANSACTION;
-	CREATE TABLE artist (id int64, name string);
-	CREATE TABLE data_types (id int64, _uint int64, _uint8 int64, _uint16
-		int64, _uint32 int64, _uint64 int64, _int int64, _int8 int64,
-		_int16 int64, _int32 int64, _int64 int64, _float32 float32,
-		_float64 float64, _bool bool, _string string, _date time, _time
-		time);
-COMMIT;
-SELECT * FROM __Table ORDER BY Name; // Must sort, map range is not deterministic.
-|"Name", "Schema"
-[artist CREATE TABLE artist (id int64, name string);]
-[data_types CREATE TABLE data_types (id int64, _uint int64, _uint8 int64, _uint16 int64, _uint32 int64, _uint64 int64, _int int64, _int8 int64, _int16 int64, _int32 int64, _int64 int64, _float32 float32, _float64 float64, _bool bool, _string string, _date time, _time time);]
-
--- 639 // https://github.com/cznic/ql/issues/37
-BEGIN TRANSACTION;
-	CREATE TABLE artist (id int64, name string);
-	CREATE TABLE data_types (id int64, _uint int64, _uint8 int64, _uint16
-		int64, _uint32 int64, _uint64 int64, _int int64, _int8 int64,
-		_int16 int64, _int32 int64, _int64 int64, _float32 float32,
-		_float64 float64, _bool bool, _string string, _date time, _time
-		time);
-COMMIT;
-SELECT * FROM __Table WHERE Name == "artist";
-|"Name", "Schema"
-[artist CREATE TABLE artist (id int64, name string);]
-
--- 640 // https://github.com/cznic/ql/issues/37
-BEGIN TRANSACTION;
-	CREATE TABLE artist (id int64, name string);
-	CREATE TABLE data_types (id int64, _uint int64, _uint8 int64, _uint16
-		int64, _uint32 int64, _uint64 int64, _int int64, _int8 int64,
-		_int16 int64, _int32 int64, _int64 int64, _float32 float32,
-		_float64 float64, _bool bool, _string string, _date time, _time
-		time);
-COMMIT;
-SELECT * FROM __Column ORDER BY TableName, Ordinal;
-|"TableName", "Ordinal", "Name", "Type"
-[artist 1 id int64]
-[artist 2 name string]
-[data_types 1 id int64]
-[data_types 2 _uint int64]
-[data_types 3 _uint8 int64]
-[data_types 4 _uint16 int64]
-[data_types 5 _uint32 int64]
-[data_types 6 _uint64 int64]
-[data_types 7 _int int64]
-[data_types 8 _int8 int64]
-[data_types 9 _int16 int64]
-[data_types 10 _int32 int64]
-[data_types 11 _int64 int64]
-[data_types 12 _float32 float32]
-[data_types 13 _float64 float64]
-[data_types 14 _bool bool]
-[data_types 15 _string string]
-[data_types 16 _date time]
-[data_types 17 _time time]
-
--- 641 // https://github.com/cznic/ql/issues/37
-BEGIN TRANSACTION;
-	CREATE TABLE artist (id int64, name string);
-	CREATE TABLE data_types (id int64, _uint int64, _uint8 int64, _uint16
-		int64, _uint32 int64, _uint64 int64, _int int64, _int8 int64,
-		_int16 int64, _int32 int64, _int64 int64, _float32 float32,
-		_float64 float64, _bool bool, _string string, _date time, _time
-		time);
-COMMIT;
-SELECT * FROM __Column WHERE TableName == "artist" ORDER BY TableName, Ordinal;
-|"TableName", "Ordinal", "Name", "Type"
-[artist 1 id int64]
-[artist 2 name string]
-
--- 642
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	INSERT INTO t VALUES
-		(1, 2, 3),
-		(4, 5, 6);
-	CREATE TABLE u (x int, y int, z int);
-	INSERT INTO u VALUES
-		(10, 20, 30),
-		(40, 50, 60);
-COMMIT;
-SELECT * FROM t, u WHERE u.y < 60 && t.k < 7;
-|"t.i", "t.j", "t.k", "u.x", "u.y", "u.z"
-[4 5 6 40 50 60]
-[4 5 6 10 20 30]
-[1 2 3 40 50 60]
-[1 2 3 10 20 30]
-
--- 643 // order -> xk used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	CREATE INDEX xk ON t (k);
-	INSERT INTO t VALUES
-		(1, 2, 3),
-		(4, 5, 6);
-	CREATE TABLE u (x int, y int, z int);
-	INSERT INTO u VALUES
-		(10, 20, 30),
-		(40, 50, 60);
-COMMIT;
-SELECT * FROM t, u WHERE u.y < 60 && t.k < 7;
-|"t.i", "t.j", "t.k", "u.x", "u.y", "u.z"
-[1 2 3 40 50 60]
-[1 2 3 10 20 30]
-[4 5 6 40 50 60]
-[4 5 6 10 20 30]
-
--- 644 // order -> xy used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	INSERT INTO t VALUES
-		(1, 2, 3),
-		(4, 5, 6);
-	CREATE TABLE u (x int, y int, z int);
-	CREATE INDEX xy ON u (y);
-	INSERT INTO u VALUES
-		(10, 20, 30),
-		(40, 50, 60);
-COMMIT;
-SELECT * FROM t, u WHERE u.y < 60 && t.k < 7;
-|"t.i", "t.j", "t.k", "u.x", "u.y", "u.z"
-[4 5 6 10 20 30]
-[4 5 6 40 50 60]
-[1 2 3 10 20 30]
-[1 2 3 40 50 60]
-
--- 645 // order -> both xk and xy used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	CREATE INDEX xk ON t (k);
-	INSERT INTO t VALUES
-		(1, 2, 3),
-		(4, 5, 6);
-	CREATE TABLE u (x int, y int, z int);
-	CREATE INDEX xy ON u (y);
-	INSERT INTO u VALUES
-		(10, 20, 30),
-		(40, 50, 60);
-COMMIT;
-SELECT * FROM t, u WHERE u.y < 60 && t.k < 7;
-|"t.i", "t.j", "t.k", "u.x", "u.y", "u.z"
-[1 2 3 10 20 30]
-[1 2 3 40 50 60]
-[4 5 6 10 20 30]
-[4 5 6 40 50 60]
-
--- 646 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM t OFFSET -1; // no rows -> not evaluated
-|"i"
-
--- 647 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM t OFFSET 0; // no rows -> not evaluated
-|"i"
-
--- 648 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM t OFFSET 1; // no rows -> not evaluated
-|"i"
-
--- 649 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() OFFSET -1;
-||invalid .* -1 .*must.* non-negative
-
--- 650 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() OFFSET 0;
-|"i"
-[42]
-[24]
-
--- 651 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() OFFSET 1;
-|"i"
-[24]
-
--- 652 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() OFFSET 2;
-|"i"
-
--- 653 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT -1; // no rows -> not evaluated
-|"i"
-
--- 654 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 0; // no rows -> not evaluated
-|"i"
-
--- 655 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 1; // no rows -> not evaluated
-|"i"
-
--- 656 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT -1;
-||invalid .* -1 .*must.* non-negative
-
--- 657 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 0;
-|"i"
-
--- 658 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 1;
-|"i"
-[42]
-
--- 659 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 2;
-|"i"
-[42]
-[24]
-
--- 660 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 3;
-|"i"
-[42]
-[24]
-
--- 661 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 0 OFFSET 0;
-|"i"
-
--- 662 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 0 OFFSET 1;
-|"i"
-
--- 663 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 0 OFFSET 2;
-|"i"
-
--- 664 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 0 OFFSET 3;
-|"i"
-
--- 665 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 1 OFFSET 0;
-|"i"
-[42]
-
--- 666 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 1 OFFSET 1;
-|"i"
-[24]
-
--- 667 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 1 OFFSET 2;
-|"i"
-
--- 668 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 1 OFFSET 3;
-|"i"
-
--- 669 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 2 OFFSET 0;
-|"i"
-[42]
-[24]
-
--- 670 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 2 OFFSET 1;
-|"i"
-[24]
-
--- 671 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 2 OFFSET 2;
-|"i"
-
--- 672 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 2 OFFSET 3;
-|"i"
-
--- 673 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 3 OFFSET 0;
-|"i"
-[42]
-[24]
-
--- 674 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 3 OFFSET 1;
-|"i"
-[24]
-
--- 675 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 3 OFFSET 2;
-|"i"
-
--- 676 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42), (24);
-COMMIT;
-SELECT * FROM t ORDER BY id() LIMIT 3 OFFSET 3;
-|"i"
-
--- 677 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3);
-	CREATE TABLE u (i int);
-	INSERT INTO u VALUES(10), (20), (30);
-COMMIT;
-SELECT * FROM
-	(SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a,
-	(SELECT * FROM u ORDER BY i) AS b,
-ORDER BY a.i, b.i;
-|"a.i", "b.i"
-[2 10]
-[2 20]
-[2 30]
-[3 10]
-[3 20]
-[3 30]
-
--- 678 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3);
-	CREATE TABLE u (i int);
-	INSERT INTO u VALUES(10), (20), (30);
-COMMIT;
-SELECT * FROM
-	(SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a,
-	(SELECT * FROM u ORDER BY i OFFSET 1) AS b,
-ORDER BY a.i, b.i;
-|"a.i", "b.i"
-[2 20]
-[2 30]
-[3 20]
-[3 30]
-
--- 679 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3);
-	CREATE TABLE u (i int);
-	INSERT INTO u VALUES(10), (20), (30);
-COMMIT;
-SELECT * FROM
-	(SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a,
-	(SELECT * FROM u ORDER BY i LIMIT 1) AS b,
-ORDER BY a.i, b.i;
-|"a.i", "b.i"
-[2 10]
-[3 10]
-
--- 680 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3);
-	CREATE TABLE u (i int);
-	INSERT INTO u VALUES(10), (20), (30);
-COMMIT;
-SELECT * FROM
-	(SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a,
-	(SELECT * FROM u ORDER BY i LIMIT 1 OFFSET 1) AS b,
-ORDER BY a.i, b.i;
-|"a.i", "b.i"
-[2 20]
-[3 20]
-
--- 681 // https://github.com/cznic/ql/issues/41
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3);
-	CREATE TABLE u (i int);
-	INSERT INTO u VALUES(10), (20), (30);
-COMMIT;
-SELECT * FROM
-	(SELECT * FROM t ORDER BY i LIMIT 2 OFFSET 1;) AS a,
-	(SELECT * FROM u ORDER BY i LIMIT 1 OFFSET 1) AS b,
-ORDER BY a.i, b.i
-LIMIT 1;
-|"a.i", "b.i"
-[2 20]
-
--- 682 // https://github.com/cznic/ql/issues/42
-BEGIN TRANSACTION;
-  DROP TABLE IF EXISTS fibonacci;
-  CREATE TABLE fibonacci(
-    input int,
-    output int
-  );
-COMMIT;
-
-BEGIN TRANSACTION;
-  INSERT INTO fibonacci (input, output) VALUES (0, 0);
-  INSERT INTO fibonacci (input, output) VALUES (1, 1);
-  INSERT INTO fibonacci (input, output) VALUES (2, 1);
-  INSERT INTO fibonacci (input, output) VALUES (3, 2);
-  INSERT INTO fibonacci (input, output) VALUES (4, 3);
-  INSERT INTO fibonacci (input, output) VALUES (5, 5);
-  INSERT INTO fibonacci (input, output) VALUES (6, 8);
-  INSERT INTO fibonacci (input, output) VALUES (7, 13);
-  INSERT INTO fibonacci (input, output) VALUES (8, 21);
-  INSERT INTO fibonacci (input, output) VALUES (9, 34);
-COMMIT;
-
---' Should print 4.
-SELECT count(1) AS total FROM fibonacci WHERE input >= 5 && input <= 7 OR input == 3;
-|"total"
-[4]
-
--- 683 // https://github.com/cznic/ql/issues/42
-BEGIN TRANSACTION;
-  DROP TABLE IF EXISTS fibonacci;
-  CREATE TABLE fibonacci(
-    input int,
-    output int
-  );
-COMMIT;
-
-BEGIN TRANSACTION;
-  INSERT INTO fibonacci (input, output) VALUES (0, 0);
-  INSERT INTO fibonacci (input, output) VALUES (1, 1);
-  INSERT INTO fibonacci (input, output) VALUES (2, 1);
-  INSERT INTO fibonacci (input, output) VALUES (3, 2);
-  INSERT INTO fibonacci (input, output) VALUES (4, 3);
-  INSERT INTO fibonacci (input, output) VALUES (5, 5);
-  INSERT INTO fibonacci (input, output) VALUES (6, 8);
-  INSERT INTO fibonacci (input, output) VALUES (7, 13);
-  INSERT INTO fibonacci (input, output) VALUES (8, 21);
-  INSERT INTO fibonacci (input, output) VALUES (9, 34);
-COMMIT;
-
---' Should output (6, 8) (5, 5).
-SELECT * FROM fibonacci WHERE input >= 5 && input <= 7 OR input == 3 ORDER BY input DESC LIMIT 2 OFFSET 1;
-|"input", "output"
-[6 8]
-[5 5]
-
--- 684 // https://github.com/cznic/ql/issues/42
-BEGIN TRANSACTION;
-  DROP TABLE IF EXISTS fibonacci;
-  CREATE TABLE fibonacci(
-    input int,
-    output int
-  );
-COMMIT;
-
-BEGIN TRANSACTION;
-  INSERT INTO fibonacci (input, output) VALUES (0, 0);
-  INSERT INTO fibonacci (input, output) VALUES (1, 1);
-  INSERT INTO fibonacci (input, output) VALUES (2, 1);
-  INSERT INTO fibonacci (input, output) VALUES (3, 2);
-  INSERT INTO fibonacci (input, output) VALUES (4, 3);
-  INSERT INTO fibonacci (input, output) VALUES (5, 5);
-  INSERT INTO fibonacci (input, output) VALUES (6, 8);
-  INSERT INTO fibonacci (input, output) VALUES (7, 13);
-  INSERT INTO fibonacci (input, output) VALUES (8, 21);
-  INSERT INTO fibonacci (input, output) VALUES (9, 34);
-  --' Let's delete 4 rows.
-  // Delete where input == 5, input == 6, input == 7 or input == 3
-  DELETE FROM fibonacci WHERE input >= 5 && input <= 7 OR input == 3;
-COMMIT;
-SELECT * FROM fibonacci ORDER BY input;
-|"input", "output"
-[0 0]
-[1 1]
-[2 1]
-[4 3]
-[8 21]
-[9 34]
-
--- 685 // https://github.com/cznic/ql/issues/42
-BEGIN TRANSACTION;
-  DROP TABLE IF EXISTS fibonacci;
-  CREATE TABLE fibonacci(
-    input int,
-    output int
-  );
-COMMIT;
-
-BEGIN TRANSACTION;
-  INSERT INTO fibonacci (input, output) VALUES (0, 0);
-  INSERT INTO fibonacci (input, output) VALUES (1, 1);
-  INSERT INTO fibonacci (input, output) VALUES (2, 1);
-  INSERT INTO fibonacci (input, output) VALUES (3, 2);
-  INSERT INTO fibonacci (input, output) VALUES (4, 3);
-  INSERT INTO fibonacci (input, output) VALUES (5, 5);
-  INSERT INTO fibonacci (input, output) VALUES (6, 8);
-  INSERT INTO fibonacci (input, output) VALUES (7, 13);
-  INSERT INTO fibonacci (input, output) VALUES (8, 21);
-  INSERT INTO fibonacci (input, output) VALUES (9, 34);
-COMMIT;
---' Let's delete 4 rows.
-BEGIN TRANSACTION;
-  // Delete where input == 5, input == 6, input == 7 or input == 3
-  DELETE FROM fibonacci WHERE input >= 5 && input <= 7 OR input == 3;
-COMMIT;
-SELECT * FROM fibonacci ORDER BY input;
-|"input", "output"
-[0 0]
-[1 1]
-[2 1]
-[4 3]
-[8 21]
-[9 34]
-
--- 686 // https://github.com/cznic/ql/issues/42
-BEGIN TRANSACTION;
-  DROP TABLE IF EXISTS fibonacci;
-  CREATE TABLE fibonacci(
-    input int,
-    output int
-  );
-COMMIT;
-
-BEGIN TRANSACTION;
-  INSERT INTO fibonacci (input, output) VALUES (0, 0);
-  INSERT INTO fibonacci (input, output) VALUES (1, 1);
-  INSERT INTO fibonacci (input, output) VALUES (2, 1);
-  INSERT INTO fibonacci (input, output) VALUES (3, 2);
-  INSERT INTO fibonacci (input, output) VALUES (4, 3);
-  INSERT INTO fibonacci (input, output) VALUES (5, 5);
-  INSERT INTO fibonacci (input, output) VALUES (6, 8);
-  INSERT INTO fibonacci (input, output) VALUES (7, 13);
-  INSERT INTO fibonacci (input, output) VALUES (8, 21);
-  INSERT INTO fibonacci (input, output) VALUES (9, 34);
-  --' Let's delete 4 rows.
-  // Delete where input == 5, input == 6, input == 7 or input == 3
-  DELETE FROM fibonacci WHERE input >= 5 && input <= 7 OR input == 3;
-COMMIT;
---' Try to count the rows we've just deleted, using the very same condition. Result is 1, should be 0.
-SELECT count() AS total FROM fibonacci WHERE input >= 5 && input <= 7 OR input == 3;
-|"total"
-[0]
-
--- 687 // https://github.com/cznic/ql/issues/42
-BEGIN TRANSACTION;
-  DROP TABLE IF EXISTS fibonacci;
-  CREATE TABLE fibonacci(
-    input int,
-    output int
-  );
-COMMIT;
-
-BEGIN TRANSACTION;
-  INSERT INTO fibonacci (input, output) VALUES (0, 0);
-  INSERT INTO fibonacci (input, output) VALUES (1, 1);
-  INSERT INTO fibonacci (input, output) VALUES (2, 1);
-  INSERT INTO fibonacci (input, output) VALUES (3, 2);
-  INSERT INTO fibonacci (input, output) VALUES (4, 3);
-  INSERT INTO fibonacci (input, output) VALUES (5, 5);
-  INSERT INTO fibonacci (input, output) VALUES (6, 8);
-  INSERT INTO fibonacci (input, output) VALUES (7, 13);
-  INSERT INTO fibonacci (input, output) VALUES (8, 21);
-  INSERT INTO fibonacci (input, output) VALUES (9, 34);
-COMMIT;
-BEGIN TRANSACTION;
-  --' Let's delete 4 rows.
-  // Delete where input == 5, input == 6, input == 7 or input == 3
-  DELETE FROM fibonacci WHERE input >= 5 && input <= 7 OR input == 3;
-COMMIT;
---' Try to count the rows we've just deleted, using the very same condition. Result is 1, should be 0.
-SELECT count() AS total FROM fibonacci WHERE input >= 5 && input <= 7 OR input == 3;
-|"total"
-[0]
-
--- 688
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1);
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-
--- 689
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2);
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[2]
-
--- 690
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2);
-	DELETE FROM t WHERE i == 2;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-
--- 691
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3);
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[2]
-[3]
-
--- 692
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3);
-	DELETE FROM t WHERE i == 2;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[3]
-
--- 693
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3);
-	DELETE FROM t WHERE i == 3;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[2]
-
--- 694
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[2]
-[3]
-[4]
-
--- 695
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 2;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[3]
-[4]
-
--- 696
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 3;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[2]
-[4]
-
--- 697
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 4;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[2]
-[3]
-
--- 698
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 1;
-	DELETE FROM t WHERE i == 2;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[3]
-[4]
-
--- 699
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 2;
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[3]
-[4]
-
--- 700
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 2;
-	DELETE FROM t WHERE i == 3;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[4]
-
--- 701
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 3;
-	DELETE FROM t WHERE i == 2;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[4]
-
--- 702
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 3;
-	DELETE FROM t WHERE i == 4;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[2]
-
--- 703
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 4;
-	DELETE FROM t WHERE i == 3;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[2]
-
--- 704
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 1;
-	DELETE FROM t WHERE i == 3;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[2]
-[4]
-
--- 705
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 3;
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[2]
-[4]
-
--- 706
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 1;
-	DELETE FROM t WHERE i == 4;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[2]
-[3]
-
--- 707
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 4;
-	DELETE FROM t WHERE i == 1;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[2]
-[3]
-
--- 708
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 2;
-	DELETE FROM t WHERE i == 4;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[3]
-
--- 709
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(1), (2), (3), (4);
-	DELETE FROM t WHERE i == 4;
-	DELETE FROM t WHERE i == 2;
-COMMIT;
-SELECT * FROM t ORDER BY i;
-|"i"
-[1]
-[3]
-
--- 710 // https://github.com/cznic/ql/issues/43
-SELECT Name, Unique FROM __Index;
-||expected .*Field
-
--- 711
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-COMMIT;
-SELECT s FROM t;
-|"s"
-[foo]
-[bar]
-
--- 712
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-COMMIT;
-SELECT * FROM x;
-|"x"
-[bar]
-[foo]
-
--- 713
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (s);
-	CREATE INDEX x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-COMMIT;
-SELECT * FROM x;
-||already
-
--- 714
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX IF NOT EXISTS x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-COMMIT;
-SELECT * FROM x;
-|"x"
-[bar]
-[foo]
-
--- 715
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (s);
-	CREATE INDEX IF NOT EXISTS x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-COMMIT;
-SELECT * FROM x;
-|"x"
-[bar]
-[foo]
-
--- 716
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX IF NOT EXISTS x ON t (s);
-	CREATE INDEX IF NOT EXISTS x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-COMMIT;
-SELECT s FROM t WHERE s != "z";
-|"s"
-[bar]
-[foo]
-
--- 717
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX IF NOT EXISTS x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-COMMIT;
-SELECT s FROM t WHERE s < "z"; // ordered -> index is used
-|"s"
-[bar]
-[foo]
-
--- 718
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX IF NOT EXISTS x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-	DROP INDEX x;
-COMMIT;
-SELECT s FROM t WHERE s < "z";
-|"s"
-[foo]
-[bar]
-
--- 719
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX IF NOT EXISTS x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-	DROP INDEX x;
-	DROP INDEX x;
-COMMIT;
-SELECT s FROM t WHERE s < "z";
-||does not exist
-
--- 720
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX IF NOT EXISTS x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-	DROP INDEX IF EXISTS x;
-	DROP INDEX x;
-COMMIT;
-SELECT s FROM t WHERE s < "z";
-||does not exist
-
--- 721
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX IF NOT EXISTS x ON t (s);
-	INSERT INTO t VALUES (1, "bar"), (2, "foo");
-	DROP INDEX x;
-	DROP INDEX IF EXISTS x;
-COMMIT;
-SELECT s FROM t WHERE s < "z";
-|"s"
-[foo]
-[bar]
-
--- 722
-BEGIN TRANSACTION;
-	CREATE TABLE t (p string, c blob);
-	CREATE UNIQUE INDEX x ON t (p);
-	INSERT INTO t VALUES
-		("empty", blob("")),
-	;
-COMMIT;
-SELECT p, string(c) FROM t;
-|"p", ""
-[empty ]
-
--- 723
-BEGIN TRANSACTION;
-	CREATE TABLE t (p string, c blob);
-	CREATE INDEX x ON t (p);
-	INSERT INTO t VALUES
-		("empty", blob("")),
-	;
-COMMIT;
-BEGIN TRANSACTION;
-	DELETE FROM t WHERE p == "empty";
-COMMIT;
-SELECT p, string(c) FROM t;
-|"p", ""
-
--- 724
-BEGIN TRANSACTION;
-	CREATE TABLE t (p string, c blob);
-	CREATE UNIQUE INDEX x ON t (p);
-	INSERT INTO t VALUES
-		("empty", blob("")),
-	;
-COMMIT;
-BEGIN TRANSACTION;
-	DELETE FROM t WHERE p == "empty";
-COMMIT;
-SELECT p, string(c) FROM t;
-|"p", ""
-
--- S 725
-BEGIN TRANSACTION;
-	UPDATE none SET
-		DepartmentID = DepartmentID+1000,
-	WHERE DepartmentID == 33;
-COMMIT;
-SELECT * FROM employee;
-||table.*not.*exist
-
--- S 726
-BEGIN TRANSACTION;
-	UPDATE employee SET
-		FirstName = "Williams"
-	WHERE DepartmentID == 33;
-COMMIT;
-SELECT * FROM employee;
-||unknown.*FirstName
-
--- S 727
-BEGIN TRANSACTION;
-	UPDATE employee SET
-		DepartmentID = DepartmentID+1000,
-	WHERE DepartmentID == 33;
-COMMIT;
-SELECT * FROM employee
-ORDER BY LastName;
-|"LastName", "DepartmentID"
-[Heisenberg 1033]
-[Jones 1033]
-[Rafferty 31]
-[Robinson 34]
-[Smith 34]
-[Williams <nil>]
-
--- 728 // https://github.com/cznic/ql/issues/49
-BEGIN TRANSACTION;
-	CREATE TABLE IF NOT EXISTS t (username string, departname string, created time, detail_id int, height float64, avatar blob, is_man bool);
-	CREATE UNIQUE INDEX UQE_userinfo_username ON t (username);
-	INSERT INTO t (username, departname, created, detail_id, height, avatar, is_man) VALUES ( 
-		"xiaolunwen",
-		"dev",
-		now(),
-		1,
-		1.78,
-		blob("012"),
-		true,
-	);
-	DELETE FROM t WHERE id() IN (SELECT id() FROM t);
-COMMIT;
-SELECT * FROM t;
-|"username", "departname", "created", "detail_id", "height", "avatar", "is_man"
-
--- 729 // https://github.com/cznic/ql/issues/49
-BEGIN TRANSACTION;
-	CREATE TABLE IF NOT EXISTS t (username string, departname string, created time, detail_id int, height float64, avatar blob, is_man bool);
-	CREATE UNIQUE INDEX UQE_userinfo_username ON t (username);
-	INSERT INTO t (username, departname, created, detail_id, height, avatar, is_man) VALUES ( 
-		"xiaolunwen",
-		"dev",
-		now(),
-		1,
-		1.78,
-		__testBlob(256),
-		true,
-	);
-	DELETE FROM t WHERE id() IN (SELECT id() FROM t);
-COMMIT;
-SELECT * FROM t;
-|"username", "departname", "created", "detail_id", "height", "avatar", "is_man"
-
--- 730 // https://github.com/cznic/ql/issues/49
-BEGIN TRANSACTION;
-	CREATE TABLE IF NOT EXISTS t (username string, departname string, created time, detail_id int, height float64, avatar blob, is_man bool);
-	CREATE UNIQUE INDEX UQE_userinfo_username ON t (username);
-	INSERT INTO t (username, departname, created, detail_id, height, avatar, is_man) VALUES ( 
-		"xiaolunwen",
-		"dev",
-		now(),
-		1,
-		1.78,
-		__testBlob(1<<16),
-		true,
-	);
-	DELETE FROM t WHERE id() IN (SELECT id() FROM t);
-COMMIT;
-SELECT * FROM t;
-|"username", "departname", "created", "detail_id", "height", "avatar", "is_man"
-
--- 731 // https://github.com/cznic/ql/issues/49
-BEGIN TRANSACTION;
-	CREATE TABLE IF NOT EXISTS t (username string, departname string, created time, detail_id int, height float64, avatar blob, is_man bool);
-	CREATE UNIQUE INDEX UQE_userinfo_username ON t (username);
-	INSERT INTO t (username, departname, created, detail_id, height, avatar, is_man) VALUES ( 
-		"xiaolunwen",
-		"dev",
-		now(),
-		1,
-		1.78,
-		__testBlob(1<<20),
-		true,
-	);
-	DELETE FROM t WHERE id() IN (SELECT id() FROM t);
-COMMIT;
-SELECT * FROM t;
-|"username", "departname", "created", "detail_id", "height", "avatar", "is_man"
-
--- 732 // https://github.com/cznic/ql/issues/49
-BEGIN TRANSACTION;
-	CREATE TABLE IF NOT EXISTS t (username string, departname string, created time, detail_id int, height float64, avatar blob, is_man bool);
-	CREATE UNIQUE INDEX UQE_userinfo_username ON t (username);
-	INSERT INTO t (username, departname, created, detail_id, height, avatar, is_man) VALUES ( 
-		"xiaolunwen",
-		"dev",
-		now(),
-		1,
-		1.78,
-		__testBlob(1<<20),
-		true,
-	), (
-		"2xiaolunwen",
-		"2dev",
-		now(),
-		2,
-		2.78,
-		__testBlob(1<<21),
-		true,
-	);
-	DELETE FROM t WHERE id() IN (SELECT id() FROM t WHERE username == "xiaolunwen"); //TODO simplify, also everywhere else
-COMMIT;
-SELECT id() IN (SELECT id() FROM t WHERE username == "2xiaolunwen"), username == "2xiaolunwen", len(string(avatar)) == 1<<21 FROM t;
-|"", "", ""
-[true true true]
-
--- 733 // https://github.com/cznic/ql/issues/49
-BEGIN TRANSACTION;
-	CREATE TABLE IF NOT EXISTS t (username string, departname string, created time, detail_id int, height float64, avatar blob, is_man bool);
-	CREATE UNIQUE INDEX UQE_userinfo_username ON t (username);
-	INSERT INTO t (username, departname, created, detail_id, height, avatar, is_man) VALUES ( 
-		"xiaolunwen",
-		"dev",
-		now(),
-		1,
-		1.78,
-		__testBlob(1<<20),
-		true,
-	), (
-		"2xiaolunwen",
-		"2dev",
-		now(),
-		2,
-		2.78,
-		__testBlob(1<<21),
-		true,
-	);
-	DELETE FROM t WHERE id() IN (SELECT id() FROM t WHERE username == "2xiaolunwen");
-COMMIT;
-SELECT id() IN (SELECT id() FROM t WHERE username == "xiaolunwen"), username == "xiaolunwen", len(string(avatar)) == 1<<20 FROM t;
-|"", "", ""
-[true true true]
-
--- 734 // https://github.com/cznic/ql/issues/51
-BEGIN TRANSACTION;
-	CREATE TABLE IF NOT EXISTS no_id_user (user string, remain int, total int);
-	CREATE UNIQUE INDEX UQE_no_id_user_user ON no_id_user (user);
-	DELETE FROM no_id_user WHERE user == "xlw";
-	INSERT INTO no_id_user (user, remain, total) VALUES ("xlw", 20, 100);
-COMMIT;
-SELECT user, remain, total FROM no_id_user WHERE user == "xlw" LIMIT 1;
-|"user", "remain", "total"
-[xlw 20 100]
-
--- 735
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (1), (2), (3), (4), (5), (6);
-COMMIT;
-SELECT * FROM t WHERE id() < 4; // reverse order -> no index used
-|"i"
-[3]
-[2]
-[1]
-
--- 736
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (1), (2), (3), (4), (5), (6);
-COMMIT;
-SELECT * FROM t WHERE i < 4 ; // ordered -> index is used
-|"i"
-[1]
-[2]
-[3]
-
--- 737
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (1), (2), (3), (4), (5), (6);
-COMMIT;
-SELECT * FROM t WHERE i <= 4; // ordered -> index is used
-|"i"
-[1]
-[2]
-[3]
-[4]
-
--- 738
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (1), (2), (3), (4), (5), (6);
-COMMIT;
-SELECT * FROM t WHERE i == 4;
-|"i"
-[4]
-
--- 739
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (1), (2), (3), (4), (5), (6);
-COMMIT;
-SELECT * FROM t WHERE i >= 4; // ordered -> index is used
-|"i"
-[4]
-[5]
-[6]
-
--- 740
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	INSERT INTO t VALUES (1), (2), (3), (4), (5), (6);
-COMMIT;
-SELECT * FROM t WHERE i > 4;
-|"i"
-[5]
-[6]
-
--- 741
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i);
-	CREATE TABLE u (i int);
-	CREATE INDEX y ON u (i);
-	INSERT INTO t VALUES (1), (2), (3), (4), (5), (6);
-	INSERT INTO u VALUES (10), (20), (30), (40), (50), (60);
-COMMIT;
-SELECT * FROM
-	(SELECT i FROM t WHERE i < 4) AS t,
-	(SELECT * FROM u WHERE i < 40) AS u; // ordered -> both indices are used
-|"t.i", "u.i"
-[1 10]
-[1 20]
-[1 30]
-[2 10]
-[2 20]
-[2 30]
-[3 10]
-[3 20]
-[3 30]
-
--- 742 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(NULL),
-	;
-COMMIT;
-SELECT max(t) as T FROM t;
-|"T"
-[<nil>]
-
--- 743 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(NULL),
-		(NULL),
-	;
-COMMIT;
-SELECT max(t) as T FROM t;
-|"T"
-[<nil>]
-
--- 744 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(NULL),
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:11")),
-	;
-COMMIT;
-SELECT max(t) as T FROM t;
-|"T"
-[2014-08-08 14:05:11 +0000 UTC]
-
--- 745 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:11")),
-		(NULL),
-	;
-COMMIT;
-SELECT max(t) as T FROM t;
-|"T"
-[2014-08-08 14:05:11 +0000 UTC]
-
--- 746 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:11")),
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:12")),
-	;
-COMMIT;
-SELECT max(t) as T FROM t;
-|"T"
-[2014-08-08 14:05:12 +0000 UTC]
-
--- 747 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:12")),
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:11")),
-	;
-COMMIT;
-SELECT max(t) as T FROM t;
-|"T"
-[2014-08-08 14:05:12 +0000 UTC]
-
--- 748 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(NULL),
-	;
-COMMIT;
-SELECT min(t) as T FROM t;
-|"T"
-[<nil>]
-
--- 749 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(NULL),
-		(NULL),
-	;
-COMMIT;
-SELECT min(t) as T FROM t;
-|"T"
-[<nil>]
-
--- 750 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(NULL),
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:11")),
-	;
-COMMIT;
-SELECT min(t) as T FROM t;
-|"T"
-[2014-08-08 14:05:11 +0000 UTC]
-
--- 751 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:11")),
-		(NULL),
-	;
-COMMIT;
-SELECT min(t) as T FROM t;
-|"T"
-[2014-08-08 14:05:11 +0000 UTC]
-
--- 752 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:11")),
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:12")),
-	;
-COMMIT;
-SELECT min(t) as T FROM t;
-|"T"
-[2014-08-08 14:05:11 +0000 UTC]
-
--- 753 // https://github.com/cznic/ql/pull/65
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:12")),
-		(parseTime("2006-01-02 15:04:05", "2014-08-08 14:05:11")),
-	;
-COMMIT;
-SELECT min(t) as T FROM t;
-|"T"
-[2014-08-08 14:05:11 +0000 UTC]
-
--- 754 // https://github.com/cznic/ql/issues/68
-BEGIN TRANSACTION;
-	CREATE TABLE department (Name string);
-	INSERT INTO department (Name) VALUES ("small"), ("large"), ("medium");
-	SELECT * FROM department;
-	ALTER TABLE department ADD score float;
-	SELECT * from department;
-	UPDATE department SET score=0 WHERE Name=="small";
-COMMIT;
-SELECT * FROM department ORDER BY Name;
-|"Name", "score"
-[large <nil>]
-[medium <nil>]
-[small 0]
-
--- 755
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE s LIKE "foo"
-ORDER BY id();
-|"", "s"
-[1 seafood]
-[2 A fool on the hill]
-[5 foobar]
-
--- 756
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE !(s LIKE "foo")
-ORDER BY id();
-|"", "s"
-[4 barbaz]
-
--- 757
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE s LIKE "foo" IS NULL
-ORDER BY id();
-|"", "s"
-[3 <nil>]
-
--- 758
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE s LIKE "foo" IS NOT NULL
-ORDER BY id();
-|"", "s"
-[1 seafood]
-[2 A fool on the hill]
-[4 barbaz]
-[5 foobar]
-
--- 759
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE s LIKE "bar"
-ORDER BY id();
-|"", "s"
-[4 barbaz]
-[5 foobar]
-
--- 760
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE s LIKE "^bar"
-ORDER BY id();
-|"", "s"
-[4 barbaz]
-
--- 761
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE s LIKE "bar$"
-ORDER BY id();
-|"", "s"
-[5 foobar]
-
--- 762
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE s LIKE "bar"+"$"
-ORDER BY id();
-|"", "s"
-[5 foobar]
-
--- 763
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE s+"qux" LIKE "qux"+"$"
-ORDER BY id();
-|"", "s"
-[1 seafood]
-[2 A fool on the hill]
-[4 barbaz]
-[5 foobar]
-
--- 764
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES
-		("seafood"),
-		("A fool on the hill"),
-		(NULL),
-		("barbaz"),
-		("foobar"),
-	;
-COMMIT;
-SELECT id(), s
-FROM t
-WHERE s+"quxx" LIKE "qux"+"$"
-ORDER BY id();
-|"", "s"
-
--- 765 // https://github.com/cznic/ql/issues/75
-BEGIN TRANSACTION;
-	CREATE TABLE foo (i int);
-	INSERT INTO foo VALUES (10), (20);
-	CREATE TABLE bar (fooID int, s string);
-	INSERT INTO bar SELECT id(), "ten" FROM foo WHERE i == 10;
-	INSERT INTO bar SELECT id(), "twenty" FROM foo WHERE i == 20;
-COMMIT;
-SELECT *
-FROM
-	(SELECT id() AS ID, i FROM foo) AS foo,
-	bar
-WHERE bar.fooID == foo.ID
-ORDER BY foo.ID;
-|"foo.ID", "foo.i", "bar.fooID", "bar.s"
-[1 10 1 ten]
-[2 20 2 twenty]
-
--- 766 // https://github.com/cznic/ql/issues/75
-BEGIN TRANSACTION;
-	CREATE TABLE foo (i int);
-	INSERT INTO foo VALUES (10), (20);
-	CREATE TABLE bar (fooID int, s string);
-	INSERT INTO bar SELECT id(), "ten" FROM foo WHERE i == 10;
-	INSERT INTO bar SELECT id(), "twenty" FROM foo WHERE i == 20;
-COMMIT;
-SELECT *
-FROM foo, bar
-WHERE bar.fooID == id(foo)
-ORDER BY id(foo);
-|"foo.i", "bar.fooID", "bar.s"
-[10 1 ten]
-[20 2 twenty]
-
--- 767 // https://github.com/cznic/ql/issues/81
-BEGIN TRANSACTION;
-	CREATE TABLE t (name string, mail string);
-	INSERT INTO t VALUES
-		("a", "foo@example.com"),
-		("b", "bar@example.com"),
-		("c", "baz@example.com"),
-		("d", "foo@example.com"),
-		("e", "bar@example.com"),
-		("f", "baz@example.com"),
-	;
-COMMIT;
-SELECT *
-FROM t
-WHERE name == "b" AND mail == "bar@example.com";
-|"name", "mail"
-[b bar@example.com]
-
--- 768 // https://github.com/cznic/ql/issues/81
-BEGIN TRANSACTION;
-	CREATE TABLE t (name string, mail string);
-	INSERT INTO t VALUES
-		("a", "foo@example.com"),
-		("b", "bar@example.com"),
-		("c", "baz@example.com"),
-		("d", "foo@example.com"),
-		("e", "bar@example.com"),
-		("f", "baz@example.com"),
-	;
-COMMIT;
-SELECT *
-FROM t
-WHERE name == "b" and mail == "bar@example.com";
-|"name", "mail"
-[b bar@example.com]
-
--- 769 // https://github.com/cznic/ql/issues/81
-BEGIN TRANSACTION;
-	CREATE TABLE t (name string, mail string);
-	INSERT INTO t VALUES
-		("a", "foo@example.com"),
-		("b", "bar@example.com"),
-		("c", "baz@example.com"),
-		("d", "foo@example.com"),
-		("e", "bar@example.com"),
-		("f", "baz@example.com"),
-	;
-COMMIT;
-SELECT *
-FROM t
-WHERE name == "b" OR mail == "bar@example.com"
-ORDER BY name;
-|"name", "mail"
-[b bar@example.com]
-[e bar@example.com]
-
--- 770 // https://github.com/cznic/ql/issues/81
-BEGIN TRANSACTION;
-	CREATE TABLE t (name string, mail string);
-	INSERT INTO t VALUES
-		("a", "foo@example.com"),
-		("b", "bar@example.com"),
-		("c", "baz@example.com"),
-		("d", "foo@example.com"),
-		("e", "bar@example.com"),
-		("f", "baz@example.com"),
-	;
-COMMIT;
-SELECT *
-FROM t
-WHERE name == "b" or mail == "bar@example.com"
-ORDER BY name;
-|"name", "mail"
-[b bar@example.com]
-[e bar@example.com]
-
--- 771 // https://github.com/cznic/ql/issues/72
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB
-		SELECT id() FROM tableA WHERE i&1 == 0;
-COMMIT;
-SELECT id(), i FROM tableA WHERE id() IN (SELECT idA FROM tableB) ORDER BY id();
-|"", "i"
-[2 12]
-[4 14]
-[6 16]
-
--- 772 // https://github.com/cznic/ql/issues/72
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB
-		SELECT id() FROM tableA WHERE i&1 == 0;
-COMMIT;
-SELECT id(), i FROM tableA WHERE id() NOT IN (SELECT idA FROM tableB) ORDER BY id();
-|"", "i"
-[1 11]
-[3 13]
-[5 15]
-
--- 773 // https://github.com/cznic/ql/issues/72
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB
-		SELECT id() FROM tableA WHERE i&1 == 0;
-	DELETE FROM tableA WHERE id() IN (SELECT idA FROM tableB);
-COMMIT;
-SELECT id(), i FROM tableA ORDER BY id();
-|"", "i"
-[1 11]
-[3 13]
-[5 15]
-
--- 774 // https://github.com/cznic/ql/issues/72
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB
-		SELECT id() FROM tableA WHERE i&1 == 0;
-	DELETE FROM tableA WHERE id() NOT IN (SELECT idA FROM tableB);
-COMMIT;
-SELECT id(), i FROM tableA ORDER BY id();
-|"", "i"
-[2 12]
-[4 14]
-[6 16]
-
--- 775 // https://github.com/cznic/ql/issues/72, coerce
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB
-		SELECT id() FROM tableA WHERE i&1 == 0;
-	DELETE FROM tableA WHERE 2 IN (SELECT idA FROM tableB);
-COMMIT;
-SELECT id(), i FROM tableA ORDER BY id();
-|"", "i"
-
--- 776 // https://github.com/cznic/ql/issues/72, coerce
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB
-		SELECT id() FROM tableA WHERE i&1 == 0;
-	DELETE FROM tableA WHERE 2 NOT IN (SELECT idA FROM tableB);
-COMMIT;
-SELECT id(), i FROM tableA ORDER BY id();
-|"", "i"
-[1 11]
-[2 12]
-[3 13]
-[4 14]
-[5 15]
-[6 16]
-
--- 777 // https://github.com/cznic/ql/issues/72, different types have zero set intersetion.
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB
-		SELECT id() FROM tableA WHERE i&1 == 0;
-	DELETE FROM tableA WHERE 3.14 IN (SELECT idA FROM tableB);
-COMMIT;
-SELECT id(), i FROM tableA ORDER BY id();
-|"", "i"
-[1 11]
-[2 12]
-[3 13]
-[4 14]
-[5 15]
-[6 16]
-
--- 778 // https://github.com/cznic/ql/issues/72, different have zero set intersection but NOT makes the result true.
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB
-		SELECT id() FROM tableA WHERE i&1 == 0;
-	DELETE FROM tableA WHERE 3.14 NOT IN (SELECT idA FROM tableB);
-COMMIT;
-SELECT id(), i FROM tableA ORDER BY id();
-|"", "i"
-
--- 779 // https://github.com/cznic/ql/issues/72, invalid field type
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA time);
-	INSERT INTO tableB
-		SELECT now() FROM tableA WHERE i&1 == 0;
-	DELETE FROM tableA WHERE 3.14 NOT IN (SELECT idA FROM tableB);
-COMMIT;
-SELECT id(), i FROM tableA ORDER BY id();
-||invalid field type
-
--- 780 // https://github.com/cznic/ql/issues/72, too many fields
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int, name string);
-	INSERT INTO tableB
-		SELECT id(), "foo" FROM tableA WHERE i&1 == 0;
-	DELETE FROM tableA WHERE id() NOT IN (SELECT * FROM tableB);
-COMMIT;
-SELECT id(), i FROM tableA ORDER BY id();
-||mismatched field count
-
--- 781 // https://github.com/cznic/ql/issues/72, some NULL
-BEGIN TRANSACTION;
-	DROP TABLE IF EXISTS tableA;
-	DROP TABLE IF EXISTS tableB;
-COMMIT;
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB VALUES(NULL);
-	INSERT INTO tableB
-		SELECT id() FROM tableA WHERE i&1 == 0;
-COMMIT;
-SELECT i FROM tableA WHERE id() IN (SELECT idA from tableB) ORDER BY id();
-|"i"
-[12]
-[14]
-[16]
-
--- 782 // https://github.com/cznic/ql/issues/72, all NULL
-BEGIN TRANSACTION;
-	DROP TABLE IF EXISTS tableA;
-	DROP TABLE IF EXISTS tableB;
-COMMIT;
-BEGIN TRANSACTION;
-	CREATE TABLE tableA (i int);
-	INSERT INTO tableA VALUES
-		(11),
-		(12),
-		(13),
-		(14),
-		(15),
-		(16),
-	;
-	CREATE TABLE tableB (idA int);
-	INSERT INTO tableB VALUES(NULL);
-COMMIT;
-SELECT i FROM tableA WHERE id() IN (SELECT idA from tableB) ORDER BY id();
-|"i"
-
--- 783 // https://github.com/cznic/ql/issues/84
-BEGIN TRANSACTION;
-	CREATE TABLE testA (
-		comment string,
-		data blob,
-	);
-INSERT INTO testA (comment) VALUES ("c1");
-UPDATE testA SET data = blob("newVal");
-COMMIT;
-SELECT * FROM testA;
-|"comment", "data"
-[c1 [110 101 119 86 97 108]]
-
--- 784 // https://github.com/cznic/ql/issues/84
-BEGIN TRANSACTION;
-	CREATE TABLE testA (
-		comment string,
-		data blob,
-	);
-INSERT INTO testA (comment) VALUES ("c1");
-UPDATE testA SET data = __testBlob(257);
-COMMIT;
-SELECT * FROM testA;
-|"comment", "data"
-[c1 [209 231 244 253 191 74 169 85 3 88 111 250 130 24 50 218 91 40 161 60 32 53 58 129 75 81 71 109 70 211 146 67 107 65 150 142 179 2 173 53 73 229 68 154 46 108 47 91 179 98 107 202 157 189 137 4 47 39 93 235 58 112 186 143 68 85 217 33 155 218 180 143 27 76 155 226 205 31 187 12 68 33 75 110 208 42 99 61 223 170 228 184 243 241 64 39 174 64 19 129 203 84 254 78 102 59 16 104 151 21 201 4 117 20 99 125 162 19 201 211 171 71 26 173 37 52 16 115 143 113 128 206 85 192 126 252 146 224 184 146 101 35 198 231 35 236 189 114 184 92 58 124 128 162 106 95 241 186 172 196 31 138 44 178 168 127 69 116 225 27 53 171 157 185 48 205 167 150 77 69 129 86 72 117 129 121 62 224 186 31 116 4 196 103 206 63 185 236 75 172 217 51 223 26 195 127 79 72 199 160 103 92 192 202 67 17 99 200 111 174 71 24 64 119 113 178 105 44 12 25 70 6 69 173 90 100 171 122 155 220 185 99 41 101 190 142 44 217 102 93 63 225 218 239 167 40 254]]
-
--- 785 // https://github.com/cznic/ql/issues/84
-BEGIN TRANSACTION;
-	CREATE TABLE testA (
-		comment string,
-		data blob,
-	);
-INSERT INTO testA (comment) VALUES ("c1"), ("c2");
-UPDATE testA SET data = blob("newVal") WHERE comment == "c1";
-COMMIT;
-SELECT * FROM testA ORDER BY comment;
-|"comment", "data"
-[c1 [110 101 119 86 97 108]]
-[c2 <nil>]
-
--- 786 // https://github.com/cznic/ql/issues/84
-BEGIN TRANSACTION;
-	CREATE TABLE testA (
-		comment string,
-		data blob,
-	);
-INSERT INTO testA (comment) VALUES ("c1"), ("c2");
-UPDATE testA SET data = blob("newVal") WHERE comment == "c2";
-COMMIT;
-SELECT * FROM testA ORDER BY comment;
-|"comment", "data"
-[c1 <nil>]
-[c2 [110 101 119 86 97 108]]
-
--- 787 // https://github.com/cznic/ql/issues/84
-BEGIN TRANSACTION;
-	CREATE TABLE testA (
-		comment string,
-		data blob,
-	);
-INSERT INTO testA (comment) VALUES ("c1"), ("c2");
-UPDATE testA SET data = blob("newVal");
-COMMIT;
-SELECT * FROM testA ORDER BY comment;
-|"comment", "data"
-[c1 [110 101 119 86 97 108]]
-[c2 [110 101 119 86 97 108]]
-
--- 788 // https://github.com/cznic/ql/issues/84
-BEGIN TRANSACTION;
-	CREATE TABLE testA (
-		comment string,
-		data blob,
-	);
-INSERT INTO testA (comment) VALUES ("c1"), ("c2");
-UPDATE testA SET data = __testBlob(257) WHERE comment == "c1";
-COMMIT;
-SELECT * FROM testA ORDER BY comment;
-|"comment", "data"
-[c1 [209 231 244 253 191 74 169 85 3 88 111 250 130 24 50 218 91 40 161 60 32 53 58 129 75 81 71 109 70 211 146 67 107 65 150 142 179 2 173 53 73 229 68 154 46 108 47 91 179 98 107 202 157 189 137 4 47 39 93 235 58 112 186 143 68 85 217 33 155 218 180 143 27 76 155 226 205 31 187 12 68 33 75 110 208 42 99 61 223 170 228 184 243 241 64 39 174 64 19 129 203 84 254 78 102 59 16 104 151 21 201 4 117 20 99 125 162 19 201 211 171 71 26 173 37 52 16 115 143 113 128 206 85 192 126 252 146 224 184 146 101 35 198 231 35 236 189 114 184 92 58 124 128 162 106 95 241 186 172 196 31 138 44 178 168 127 69 116 225 27 53 171 157 185 48 205 167 150 77 69 129 86 72 117 129 121 62 224 186 31 116 4 196 103 206 63 185 236 75 172 217 51 223 26 195 127 79 72 199 160 103 92 192 202 67 17 99 200 111 174 71 24 64 119 113 178 105 44 12 25 70 6 69 173 90 100 171 122 155 220 185 99 41 101 190 142 44 217 102 93 63 225 218 239 167 40 254]]
-[c2 <nil>]
-
--- 789 // https://github.com/cznic/ql/issues/84
-BEGIN TRANSACTION;
-	CREATE TABLE testA (
-		comment string,
-		data blob,
-	);
-INSERT INTO testA (comment) VALUES ("c1"), ("c2");
-UPDATE testA SET data = __testBlob(257) WHERE comment == "c2";
-COMMIT;
-SELECT * FROM testA ORDER BY comment;
-|"comment", "data"
-[c1 <nil>]
-[c2 [209 231 244 253 191 74 169 85 3 88 111 250 130 24 50 218 91 40 161 60 32 53 58 129 75 81 71 109 70 211 146 67 107 65 150 142 179 2 173 53 73 229 68 154 46 108 47 91 179 98 107 202 157 189 137 4 47 39 93 235 58 112 186 143 68 85 217 33 155 218 180 143 27 76 155 226 205 31 187 12 68 33 75 110 208 42 99 61 223 170 228 184 243 241 64 39 174 64 19 129 203 84 254 78 102 59 16 104 151 21 201 4 117 20 99 125 162 19 201 211 171 71 26 173 37 52 16 115 143 113 128 206 85 192 126 252 146 224 184 146 101 35 198 231 35 236 189 114 184 92 58 124 128 162 106 95 241 186 172 196 31 138 44 178 168 127 69 116 225 27 53 171 157 185 48 205 167 150 77 69 129 86 72 117 129 121 62 224 186 31 116 4 196 103 206 63 185 236 75 172 217 51 223 26 195 127 79 72 199 160 103 92 192 202 67 17 99 200 111 174 71 24 64 119 113 178 105 44 12 25 70 6 69 173 90 100 171 122 155 220 185 99 41 101 190 142 44 217 102 93 63 225 218 239 167 40 254]]
-
--- 790 // https://github.com/cznic/ql/issues/84
-BEGIN TRANSACTION;
-	CREATE TABLE testA (
-		comment string,
-		data blob,
-	);
-INSERT INTO testA (comment) VALUES ("c1"), ("c2");
-UPDATE testA SET data = __testBlob(257);
-COMMIT;
-SELECT * FROM testA ORDER BY comment;
-|"comment", "data"
-[c1 [209 231 244 253 191 74 169 85 3 88 111 250 130 24 50 218 91 40 161 60 32 53 58 129 75 81 71 109 70 211 146 67 107 65 150 142 179 2 173 53 73 229 68 154 46 108 47 91 179 98 107 202 157 189 137 4 47 39 93 235 58 112 186 143 68 85 217 33 155 218 180 143 27 76 155 226 205 31 187 12 68 33 75 110 208 42 99 61 223 170 228 184 243 241 64 39 174 64 19 129 203 84 254 78 102 59 16 104 151 21 201 4 117 20 99 125 162 19 201 211 171 71 26 173 37 52 16 115 143 113 128 206 85 192 126 252 146 224 184 146 101 35 198 231 35 236 189 114 184 92 58 124 128 162 106 95 241 186 172 196 31 138 44 178 168 127 69 116 225 27 53 171 157 185 48 205 167 150 77 69 129 86 72 117 129 121 62 224 186 31 116 4 196 103 206 63 185 236 75 172 217 51 223 26 195 127 79 72 199 160 103 92 192 202 67 17 99 200 111 174 71 24 64 119 113 178 105 44 12 25 70 6 69 173 90 100 171 122 155 220 185 99 41 101 190 142 44 217 102 93 63 225 218 239 167 40 254]]
-[c2 [209 231 244 253 191 74 169 85 3 88 111 250 130 24 50 218 91 40 161 60 32 53 58 129 75 81 71 109 70 211 146 67 107 65 150 142 179 2 173 53 73 229 68 154 46 108 47 91 179 98 107 202 157 189 137 4 47 39 93 235 58 112 186 143 68 85 217 33 155 218 180 143 27 76 155 226 205 31 187 12 68 33 75 110 208 42 99 61 223 170 228 184 243 241 64 39 174 64 19 129 203 84 254 78 102 59 16 104 151 21 201 4 117 20 99 125 162 19 201 211 171 71 26 173 37 52 16 115 143 113 128 206 85 192 126 252 146 224 184 146 101 35 198 231 35 236 189 114 184 92 58 124 128 162 106 95 241 186 172 196 31 138 44 178 168 127 69 116 225 27 53 171 157 185 48 205 167 150 77 69 129 86 72 117 129 121 62 224 186 31 116 4 196 103 206 63 185 236 75 172 217 51 223 26 195 127 79 72 199 160 103 92 192 202 67 17 99 200 111 174 71 24 64 119 113 178 105 44 12 25 70 6 69 173 90 100 171 122 155 220 185 99 41 101 190 142 44 217 102 93 63 225 218 239 167 40 254]]
-
--- 791
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float32);
-	INSERT INTO t VALUES (43.2);
-COMMIT;
-SELECT formatFloat(c) FROM t;
-|""
-[43.2]
-
--- 792
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float64);
-	INSERT INTO t VALUES (43.2);
-COMMIT;
-SELECT formatFloat(c) FROM t;
-|""
-[43.2]
-
--- 793
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float64);
-	INSERT INTO t VALUES (43.2);
-COMMIT;
-SELECT formatFloat(c, 'b') FROM t;
-|""
-[6079859496950170p-47]
-
--- 794
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float64);
-	INSERT INTO t VALUES (43.2);
-COMMIT;
-SELECT formatFloat(c, 'e', 5) FROM t;
-|""
-[4.32000e+01]
-
--- 795
-BEGIN TRANSACTION;
-	CREATE TABLE t (c float64);
-	INSERT INTO t VALUES (43.2);
-COMMIT;
-SELECT formatFloat(c, 'b', 7, 32) FROM t;
-|""
-[11324621p-18]
-
--- 796
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int32);
-	INSERT INTO t VALUES (-42);
-COMMIT;
-SELECT formatInt(c) FROM t;
-|""
-[-42]
-
--- 797
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int64);
-	INSERT INTO t VALUES (-42);
-COMMIT;
-SELECT formatInt(c) FROM t;
-|""
-[-42]
-
--- 798
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int64);
-	INSERT INTO t VALUES (-42);
-COMMIT;
-SELECT formatInt(c, 18) FROM t;
-|""
-[-26]
-
--- 799
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint32);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT formatInt(c) FROM t;
-|""
-[42]
-
--- 800
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint64);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT formatInt(c) FROM t;
-|""
-[42]
-
--- 801
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint64);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT formatInt(c, 18) FROM t;
-|""
-[26]
-
--- 802
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	INSERT INTO t VALUES (-42);
-COMMIT;
-SELECT formatInt(c, 18) FROM t;
-|""
-[-26]
-
--- 803
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT formatInt(c, 18) FROM t;
-|""
-[26]
-
--- 804
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int8);
-	INSERT INTO t VALUES (-42);
-COMMIT;
-SELECT formatInt(c, 18) FROM t;
-|""
-[-26]
-
--- 805
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint8);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT formatInt(c, 18) FROM t;
-|""
-[26]
-
--- 806
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int16);
-	INSERT INTO t VALUES (-42);
-COMMIT;
-SELECT formatInt(c, 18) FROM t;
-|""
-[-26]
-
--- 807
-BEGIN TRANSACTION;
-	CREATE TABLE t (c uint16);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT formatInt(c, 18) FROM t;
-|""
-[26]
-
--- 808
-BEGIN TRANSACTION;
-        CREATE TABLE t (i int);
-        INSERT INTO t VALUES(42);
-        ALTER TABLE t ADD b blob;
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[42 <nil>]
-
--- 809
-BEGIN TRANSACTION;
-        CREATE TABLE t (i int);
-        INSERT INTO t VALUES(42);
-        ALTER TABLE t ADD b blob;
-        UPDATE t b = blob("a");
-COMMIT;
-SELECT * FROM t;
-|"i", "b"
-[42 [97]]
-
--- 810 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-        DROP TABLE __Column2;
-COMMIT;
-||system table
-
--- 811 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-        CREATE TABLE __Column2 (i int);
-COMMIT;
-||system table
-
--- 812 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-        UPDATE __Column2 SET i = 42;
-COMMIT;
-||system table
-
--- 813 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-        CREATE INDEX __Column2Default ON __Column2(DefaultExpr);
-COMMIT;
-||system table
-
--- 814 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM __Column2;
-||does not exist
-
--- 815 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int DEFAULT 42);
-COMMIT;
-SELECT * FROM __Column2;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t i false  42]
-
--- 816 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int NOT NULL);
-COMMIT;
-SELECT * FROM __Column2;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t i true  ]
-
--- 817 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int NOT NULL DEFAULT 43);
-COMMIT;
-SELECT * FROM __Column2;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t i true  43]
-
--- 818 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int i > 44);
-COMMIT;
-SELECT * FROM __Column2;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t i false i > 44 ]
-
--- 819 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int i > 45 DEFAULT 46);
-COMMIT;
-SELECT * FROM __Column2;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t i false i > 45 46]
-
--- 820 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	ALTER TABLE t ADD s string;
-COMMIT;
-SELECT * FROM __Column2;
-||does not exist
-
--- 821 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t ADD s string;
-COMMIT;
-SELECT * FROM __Column2;
-||does not exist
-
--- 822 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	ALTER TABLE t ADD s string DEFAULT "foo";
-COMMIT;
-SELECT * FROM __Column2;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t s false  "foo"]
-
--- 823 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t ADD s string DEFAULT "foo";
-COMMIT;
-SELECT * FROM __Column2;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t s false  "foo"]
-
--- 824 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	ALTER TABLE t ADD s string NOT NULL;
-COMMIT;
-SELECT * FROM __Column2;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t s true  ]
-
--- 825 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t ADD s string NOT NULL;
-COMMIT;
-SELECT * FROM __Column2;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t s true  ]
-
--- 826 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-	ALTER TABLE t ADD s string NOT NULL;
-COMMIT;
-SELECT * FROM __Column2;
-||existing data
-
--- 827 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t ADD s string NOT NULL;
-COMMIT;
-SELECT * FROM __Column2;
-||existing data
-
--- 828 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-	ALTER TABLE t ADD s string s > "";
-COMMIT;
-SELECT * FROM __Column2;
-||existing data
-
--- 829 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES(42);
-	ALTER TABLE t ADD s string s > "";
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t ADD s string s > "";
-COMMIT;
-SELECT * FROM __Column2;
-||existing data
-
--- 830 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int DEFAULT 42, s string DEFAULT 43);
-COMMIT;
-SELECT * FROM __Column2 ORDER BY Name;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t i false  42]
-[t s false  43]
-
--- 831 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int DEFAULT 42, s string DEFAULT 43);
-	ALTER TABLE t DROP COLUMN s;
-COMMIT;
-SELECT * FROM __Column2 ORDER BY Name;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t i false  42]
-
--- 832 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int DEFAULT 42, s string DEFAULT 43);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t DROP COLUMN s;
-COMMIT;
-SELECT * FROM __Column2 ORDER BY Name;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t i false  42]
-
--- 833 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int DEFAULT 42, s string DEFAULT 43);
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-SELECT * FROM __Column2 ORDER BY Name;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t s false  43]
-
--- 834 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int DEFAULT 42, s string DEFAULT 43);
-COMMIT;
-BEGIN TRANSACTION;
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-SELECT * FROM __Column2 ORDER BY Name;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t s false  43]
-
--- 835 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int NOT NULL);
-	INSERT INTO t VALUES(42);
-COMMIT;
-SELECT * FROM __Column2 ORDER BY Name;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t i true  ]
-
--- 836 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int, c int);
-	INSERT INTO t VALUES(NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[<nil> <nil> <nil>]
-
--- 837 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int NOT NULL, c int);
-	INSERT INTO t VALUES(NULL, 42, NULL);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[<nil> 42 <nil>]
-
--- 838 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int NOT NULL, c int);
-	INSERT INTO t VALUES(NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM t;
-||NOT NULL
-
--- 839 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int DEFAULT 42, c int);
-	INSERT INTO t VALUES(NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[<nil> 42 <nil>]
-
--- 840 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > 42, c int);
-	INSERT INTO t VALUES(NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM t;
-||constraint violation
-
--- 841 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > 42, c int);
-	INSERT INTO t VALUES(NULL, 42, NULL);
-COMMIT;
-SELECT * FROM t;
-||constraint violation
-
--- 842 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > 42, c int);
-	INSERT INTO t VALUES(NULL, 43, NULL);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[<nil> 43 <nil>]
-
--- 843 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > 42 DEFAULT 42, c int);
-	INSERT INTO t VALUES(NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM t;
-||constraint violation
-
--- 844 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > 42 DEFAULT 43, c int);
-	INSERT INTO t VALUES(NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[<nil> 43 <nil>]
-
--- 845 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > 42 DEFAULT 43, c int);
-	INSERT INTO t VALUES(NULL, 42, NULL);
-COMMIT;
-SELECT * FROM t;
-||constraint violation
-
--- 846 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > 42 DEFAULT 430, c int);
-	INSERT INTO t VALUES(NULL, 43, NULL);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[<nil> 43 <nil>]
-
--- 847 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > a && b < c, c int);
-	INSERT INTO t VALUES(1, 2, 3);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[1 2 3]
-
--- 848 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > a && b < c, c int);
-	INSERT INTO t VALUES(1, 1, 3);
-COMMIT;
-SELECT * FROM t;
-||constraint violation
-
--- 849 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > a && b < c, c int);
-	INSERT INTO t VALUES(1, 3, 3);
-COMMIT;
-SELECT * FROM t;
-||constraint violation
-
--- 850 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > a && b < c DEFAULT (a+c)/2, c int);
-	INSERT INTO t VALUES(1, NULL, 3);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[1 2 3]
-
--- 851 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > a && b < c DEFAULT (a+c)/2, c int);
-	INSERT INTO t VALUES(1, 1, 3);
-COMMIT;
-SELECT * FROM t;
-||constraint violation
-
--- 852 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int b > a && b < c DEFAULT (a+c)/2, c int);
-	INSERT INTO t VALUES(1, 3, 3);
-COMMIT;
-SELECT * FROM t;
-||constraint violation
-
--- 853 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE department (
-		DepartmentName string DepartmentName IN ("HQ", "R/D", "Lab", "HR")
-			DEFAULT "HQ",
-	);
-	INSERT INTO department VALUES ("foo");
-COMMIT;
-SELECT * FROM department;
-||constraint violation
-
--- 854 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE department (
-		DepartmentName string DepartmentName IN ("HQ", "R/D", "Lab", "HR")
-			DEFAULT "HQ",
-	);
-	INSERT INTO department VALUES ("HQ");
-COMMIT;
-SELECT * FROM department;
-|"DepartmentName"
-[HQ]
-
--- 855 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE department (
-		DepartmentName string DepartmentName IN ("HQ", "R/D", "Lab", "HR")
-			DEFAULT "HQ",
-	);
-	INSERT INTO department VALUES (NULL);
-COMMIT;
-SELECT * FROM department;
-|"DepartmentName"
-[HQ]
-
--- 856 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE department (
-		DepartmentName string DepartmentName IN ("HQ", "R/D", "Lab", "HR")
-			DEFAULT "HQ",
-	);
-	INSERT INTO department VALUES ("R&D");
-COMMIT;
-SELECT * FROM department;
-||constraint violation
-
--- 857 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE department (
-		DepartmentName string DepartmentName IN ("HQ", "R/D", "Lab", "HR")
-			DEFAULT "HQ",
-	);
-	INSERT INTO department VALUES ("R/D");
-COMMIT;
-SELECT * FROM department;
-|"DepartmentName"
-[R/D]
-
--- 858 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (
-		TimeStamp time TimeStamp <= now() && since(TimeStamp) < duration("10s") DEFAULT now(),
-	);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT TimeStamp IS NOT NULL FROM t;
-|""
-[true]
-
--- 859 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (
-		TimeStamp time TimeStamp <= now() && since(TimeStamp) < duration("10s") DEFAULT now(),
-	);
-	INSERT INTO t VALUES(now()-duration("11s"));
-COMMIT;
-SELECT TimeStamp IS NOT NULL FROM t;
-||constraint violation
-
--- 860 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (
-		TimeStamp time TimeStamp <= now() && since(TimeStamp) < duration("10s") DEFAULT now(),
-	);
-	INSERT INTO t VALUES(now()+duration("1s"));
-COMMIT;
-SELECT TimeStamp IS NOT NULL FROM t;
-||constraint violation
-
--- 861 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (
-		TimeStamp time TimeStamp <= now() && since(TimeStamp) < duration("10s") DEFAULT now(),
-	);
-	INSERT INTO t VALUES(now()-duration("1s"));
-COMMIT;
-SELECT TimeStamp IS NOT NULL FROM t;
-|""
-[true]
-
--- 862 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (
-		TimeStamp time TimeStamp <= now() && since(TimeStamp) < duration("10s") DEFAULT now(),
-	);
-	INSERT INTO t VALUES(now());
-COMMIT;
-SELECT TimeStamp IS NOT NULL FROM t;
-|""
-[true]
-
--- 863 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (
-		Event string Event != "" && Event LIKE "[0-9]+:[ \t]+.*",
-	);
-	INSERT INTO t VALUES("123 foo");
-COMMIT;
-SELECT Event FROM t;
-||constraint violation
-
--- 864 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (
-		Event string Event != "" && Event LIKE "[0-9]+:[ \t]+.*",
-	);
-	INSERT INTO t VALUES("123: foo");
-COMMIT;
-SELECT Event FROM t;
-|"Event"
-[123: foo]
-
--- 865 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int, c int);
-	CREATE TABLE s (i int);
-	INSERT INTO s VALUES (1), (2), (NULL), (3), (4);
-	INSERT INTO t(b) SELECT * FROM s;
-COMMIT;
-SELECT b FROM t ORDER BY b DESC;
-|"b"
-[4]
-[3]
-[2]
-[1]
-[<nil>]
-
--- 866 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int NOT NULL, c int);
-	CREATE TABLE s (i int);
-	INSERT INTO s VALUES (1), (2), (NULL), (3), (4);
-	INSERT INTO t(b) SELECT * FROM s WHERE i IS NOT NULL;
-COMMIT;
-SELECT b FROM t ORDER BY b DESC;
-|"b"
-[4]
-[3]
-[2]
-[1]
-
--- 867 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int NOT NULL, c int);
-	CREATE TABLE s (i int);
-	INSERT INTO s VALUES (1), (2), (NULL), (3), (4);
-	INSERT INTO t(b) SELECT * FROM s;
-COMMIT;
-SELECT i FROM t ORDER BY b DESC;
-||NOT NULL
-
--- 868 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int, c int);
-	INSERT INTO t(b) VALUES (10), (20), (30);
-	UPDATE t b = NULL WHERE b == 20;
-COMMIT;
-SELECT b FROM t ORDER BY b DESC;
-|"b"
-[30]
-[10]
-[<nil>]
-
--- 869 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int NOT NULL, c int);
-	INSERT INTO t(b) VALUES (10), (20), (30);
-	UPDATE t b = NULL WHERE b == 20;
-COMMIT;
-SELECT b FROM t ORDER BY b DESC;
-||NOT NULL
-
--- 870 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t (a int, b int NOT NULL DEFAULT 42, c int);
-	INSERT INTO t(b) VALUES (10), (20), (30);
-	UPDATE t b = NULL WHERE b == 20;
-COMMIT;
-SELECT b FROM t ORDER BY b DESC;
-|"b"
-[42]
-[30]
-[10]
-
--- S 871 // https://github.com/cznic/ql/issues/91
-SELECT *
-FROM employee 
-LEFT OUTER JOIN department
-ON employee.DepartmentID == department.DepartmentID
-ORDER BY employee.LastName;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-[Williams <nil> <nil> <nil>]
-
--- S 872 // https://github.com/cznic/ql/issues/91
-SELECT *
-FROM employee 
-LEFT JOIN department
-ON employee.DepartmentID == department.DepartmentID
-ORDER BY employee.LastName;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-[Williams <nil> <nil> <nil>]
-
--- S 873 // https://github.com/cznic/ql/issues/91
-SELECT *
-FROM employee 
-RIGHT OUTER JOIN department
-ON employee.DepartmentID == department.DepartmentID
-ORDER BY employee.LastName;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[<nil> <nil> 35 Marketing]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-
--- S 874 // https://github.com/cznic/ql/issues/91
-SELECT *
-FROM employee 
-RIGHT JOIN department
-ON employee.DepartmentID == department.DepartmentID
-ORDER BY employee.LastName;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[<nil> <nil> 35 Marketing]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-
--- S 875 // https://github.com/cznic/ql/issues/91
-SELECT *
-FROM employee 
-FULL OUTER JOIN department
-ON employee.DepartmentID == none;
-||unknown
-
--- S 876 // https://github.com/cznic/ql/issues/91
-SELECT *
-FROM employee 
-FULL JOIN department
-ON employee.DepartmentID == none;
-||unknown
-
--- 877 // https://dev.mysql.com/worklog/task/?id=1604
-BEGIN TRANSACTION;
-	CREATE TABLE t1 (s1 int);
-	CREATE TABLE t2 (s1 int);
-	INSERT INTO t1 VALUES (1);
-	INSERT INTO t1 VALUES (1);
-COMMIT;
-SELECT * FROM t1 LEFT JOIN t2 ON t1.s1 == t2.s1;
-|"t1.s1", "t2.s1"
-[1 <nil>]
-[1 <nil>]
-
--- 878 // https://github.com/cznic/ql/issues/91
-BEGIN TRANSACTION;
-	CREATE TABLE a (i int, s string);
-	INSERT INTO a VALUES (1, "a"), (3, "a"), (NULL, "an1"), (NULL, "an2");
-	CREATE TABLE b (i int, s string);
-	INSERT INTO b VALUES (2, "b"), (3, "b"), (NULL, "bn1"), (NULL, "bn2");
-COMMIT;
-SELECT * FROM a LEFT JOIN b ON a.i == b.i
-ORDER BY a.s, a.i, b.s, b.i;
-|"a.i", "a.s", "b.i", "b.s"
-[1 a <nil> <nil>]
-[3 a 3 b]
-[<nil> an1 <nil> <nil>]
-[<nil> an2 <nil> <nil>]
-
--- 879 // https://github.com/cznic/ql/issues/91
-BEGIN TRANSACTION;
-	CREATE TABLE a (i int, s string);
-	INSERT INTO a VALUES (1, "a"), (3, "a"), (NULL, "an1"), (NULL, "an2");
-	CREATE TABLE b (i int, s string);
-	INSERT INTO b VALUES (2, "b"), (3, "b"), (NULL, "bn1"), (NULL, "bn2");
-COMMIT;
-SELECT * FROM a RIGHT JOIN b ON a.i == b.i
-ORDER BY a.s, a.i, b.s, b.i;
-|"a.i", "a.s", "b.i", "b.s"
-[<nil> <nil> 2 b]
-[<nil> <nil> <nil> bn1]
-[<nil> <nil> <nil> bn2]
-[3 a 3 b]
-
--- 880 // https://github.com/cznic/ql/issues/91
-BEGIN TRANSACTION;
-	CREATE TABLE a (i int, s string);
-	INSERT INTO a VALUES (1, "a"), (3, "a"), (NULL, "an1"), (NULL, "an2");
-	CREATE TABLE b (i int, s string);
-	INSERT INTO b VALUES (2, "b"), (3, "b"), (NULL, "bn1"), (NULL, "bn2");
-COMMIT;
-SELECT * FROM b LEFT JOIN a ON a.i == b.i
-ORDER BY a.s, a.i, b.s, b.i;
-|"b.i", "b.s", "a.i", "a.s"
-[2 b <nil> <nil>]
-[<nil> bn1 <nil> <nil>]
-[<nil> bn2 <nil> <nil>]
-[3 b 3 a]
-
--- 881 // https://github.com/cznic/ql/issues/91
-BEGIN TRANSACTION;
-	CREATE TABLE a (i int, s string);
-	INSERT INTO a VALUES (1, "a"), (3, "a"), (NULL, "an1"), (NULL, "an2");
-	CREATE TABLE b (i int, s string);
-	INSERT INTO b VALUES (2, "b"), (3, "b"), (NULL, "bn1"), (NULL, "bn2");
-COMMIT;
-SELECT * FROM b RIGHT JOIN a ON a.i == b.i
-ORDER BY a.s, a.i, b.s, b.i;
-|"b.i", "b.s", "a.i", "a.s"
-[<nil> <nil> 1 a]
-[3 b 3 a]
-[<nil> <nil> <nil> an1]
-[<nil> <nil> <nil> an2]
-
--- 882 // https://github.com/cznic/ql/issues/91
-BEGIN TRANSACTION;
-	CREATE TABLE a (i int, s string);
-	INSERT INTO a VALUES (1, "a"), (3, "a");
-	CREATE TABLE b (i int, s string);
-	INSERT INTO b VALUES (2, "b"), (3, "b");
-COMMIT;
-SELECT * FROM a FULL JOIN b ON a.i == b.i
-ORDER BY a.s, a.i, b.s, b.i;
-|"a.i", "a.s", "b.i", "b.s"
-[<nil> <nil> 2 b]
-[1 a <nil> <nil>]
-[3 a 3 b]
-
--- 883 // https://github.com/cznic/ql/issues/91
-BEGIN TRANSACTION;
-	CREATE TABLE a (i int, s string);
-	INSERT INTO a VALUES (1, "a"), (3, "a");
-	CREATE TABLE b (i int, s string);
-	INSERT INTO b VALUES (2, "b"), (3, "b");
-COMMIT;
-SELECT * FROM a FULL OUTER JOIN b ON a.i == b.i
-ORDER BY a.s, a.i, b.s, b.i;
-|"a.i", "a.s", "b.i", "b.s"
-[<nil> <nil> 2 b]
-[1 a <nil> <nil>]
-[3 a 3 b]
-
--- S 884 // https://github.com/cznic/ql/issues/91
-SELECT *
-FROM employee 
-FULL JOIN department
-ON employee.DepartmentID == department.DepartmentID
-ORDER BY employee.LastName;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[<nil> <nil> 35 Marketing]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-[Williams <nil> <nil> <nil>]
-
--- S 885 // https://github.com/cznic/ql/issues/91
-SELECT *
-FROM employee 
-FULL OUTER JOIN department
-ON employee.DepartmentID == department.DepartmentID
-ORDER BY employee.LastName;
-|"employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[<nil> <nil> 35 Marketing]
-[Heisenberg 33 33 Engineering]
-[Jones 33 33 Engineering]
-[Rafferty 31 31 Sales]
-[Robinson 34 34 Clerical]
-[Smith 34 34 Clerical]
-[Williams <nil> <nil> <nil>]
-
--- S 886 // https://github.com/cznic/ql/issues/91
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES ("A"), ("B");
-COMMIT;
-SELECT *
-FROM t, employee 
-LEFT JOIN department
-ON employee.DepartmentID == department.DepartmentID
-ORDER BY t.s, employee.LastName;
-|"t.s", "employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[A Heisenberg 33 33 Engineering]
-[A Jones 33 33 Engineering]
-[A Rafferty 31 31 Sales]
-[A Robinson 34 34 Clerical]
-[A Smith 34 34 Clerical]
-[A Williams <nil> <nil> <nil>]
-[B Heisenberg 33 33 Engineering]
-[B Jones 33 33 Engineering]
-[B Rafferty 31 31 Sales]
-[B Robinson 34 34 Clerical]
-[B Smith 34 34 Clerical]
-[B Williams <nil> <nil> <nil>]
-
--- S 887 // https://github.com/cznic/ql/issues/91
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES ("A"), ("B");
-COMMIT;
-SELECT *
-FROM t, employee 
-RIGHT JOIN department
-ON employee.DepartmentID == department.DepartmentID
-ORDER BY t.s, employee.LastName;
-|"t.s", "employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[<nil> <nil> <nil> 35 Marketing]
-[A Heisenberg 33 33 Engineering]
-[A Jones 33 33 Engineering]
-[A Rafferty 31 31 Sales]
-[A Robinson 34 34 Clerical]
-[A Smith 34 34 Clerical]
-[B Heisenberg 33 33 Engineering]
-[B Jones 33 33 Engineering]
-[B Rafferty 31 31 Sales]
-[B Robinson 34 34 Clerical]
-[B Smith 34 34 Clerical]
-
--- S 888 // https://github.com/cznic/ql/issues/91
-BEGIN TRANSACTION;
-	CREATE TABLE t (s string);
-	INSERT INTO t VALUES ("A"), ("B");
-COMMIT;
-SELECT *
-FROM t, employee 
-FULL JOIN department
-ON employee.DepartmentID == department.DepartmentID
-ORDER BY t.s, employee.LastName;
-|"t.s", "employee.LastName", "employee.DepartmentID", "department.DepartmentID", "department.DepartmentName"
-[<nil> <nil> <nil> 35 Marketing]
-[A Heisenberg 33 33 Engineering]
-[A Jones 33 33 Engineering]
-[A Rafferty 31 31 Sales]
-[A Robinson 34 34 Clerical]
-[A Smith 34 34 Clerical]
-[A Williams <nil> <nil> <nil>]
-[B Heisenberg 33 33 Engineering]
-[B Jones 33 33 Engineering]
-[B Rafferty 31 31 Sales]
-[B Robinson 34 34 Clerical]
-[B Smith 34 34 Clerical]
-[B Williams <nil> <nil> <nil>]
-
--- 889 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t1 (a int, b int, c int);
-	CREATE TABLE t2 (a int, b int NOT NULL, c int);
-	CREATE TABLE t3 (a int, b int a < b && b < c, c int);
-	CREATE TABLE t4 (a int, b int a < b && b < c DEFAULT (a+c)/2, c int);
-	CREATE TABLE t5 (a int, b int NOT NULL DEFAULT (a+c)/2, c int);
-	CREATE TABLE t6 (a int, b int DEFAULT (a+c)/2, c int);
-COMMIT;
-SELECT * FROM __Table WHERE !hasPrefix(Name, "__") ORDER BY Name;
-|"Name", "Schema"
-[t1 CREATE TABLE t1 (a int64, b int64, c int64);]
-[t2 CREATE TABLE t2 (a int64, b int64 NOT NULL, c int64);]
-[t3 CREATE TABLE t3 (a int64, b int64 a < b && b < c, c int64);]
-[t4 CREATE TABLE t4 (a int64, b int64 a < b && b < c DEFAULT (a + c) / 2, c int64);]
-[t5 CREATE TABLE t5 (a int64, b int64 NOT NULL DEFAULT (a + c) / 2, c int64);]
-[t6 CREATE TABLE t6 (a int64, b int64 DEFAULT (a + c) / 2, c int64);]
-
--- 890 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t1 (a int, b int, c int);
-	CREATE TABLE t2 (a int, b int NOT NULL, c int);
-	CREATE TABLE t3 (a int, b int a < b && b < c, c int);
-	CREATE TABLE t4 (a int, b int a < b && b < c DEFAULT (a+c)/2, c int);
-	CREATE TABLE t5 (a int, b int NOT NULL DEFAULT (a+c)/2, c int);
-	CREATE TABLE t6 (a int, b int DEFAULT (a+c)/2, c int);
-COMMIT;
-SELECT * FROM __Column2 ORDER BY TableName, Name;
-|"TableName", "Name", "NotNull", "ConstraintExpr", "DefaultExpr"
-[t2 b true  ]
-[t3 b false a < b && b < c ]
-[t4 b false a < b && b < c (a + c) / 2]
-[t5 b true  (a + c) / 2]
-[t6 b false  (a + c) / 2]
-
--- 891 // https://github.com/cznic/ql/issues/85
-BEGIN TRANSACTION;
-	CREATE TABLE t1 (a int, b int, c int);
-	CREATE TABLE t2 (a int, b int NOT NULL, c int);
-	CREATE TABLE t3 (a int, b int a < b && b < c, c int);
-	CREATE TABLE t4 (a int, b int a < b && b < c DEFAULT (a+c)/2, c int);
-	CREATE TABLE t5 (a int, b int NOT NULL DEFAULT (a+c)/2, c int);
-	CREATE TABLE t6 (a int, b int DEFAULT (a+c)/2, c int);
-COMMIT;
-SELECT
-	__Column.TableName, __Column.Ordinal, __Column.Name, __Column.Type,
-	__Column2.NotNull, __Column2.ConstraintExpr, __Column2.DefaultExpr,
-FROM __Column
-LEFT JOIN __Column2
-ON __Column.TableName == __Column2.TableName && __Column.Name == __Column2.Name
-WHERE !hasPrefix(__Column.TableName, "__") 
-ORDER BY __Column.TableName, __Column.Ordinal;
-|"__Column.TableName", "__Column.Ordinal", "__Column.Name", "__Column.Type", "__Column2.NotNull", "__Column2.ConstraintExpr", "__Column2.DefaultExpr"
-[t1 1 a int64 <nil> <nil> <nil>]
-[t1 2 b int64 <nil> <nil> <nil>]
-[t1 3 c int64 <nil> <nil> <nil>]
-[t2 1 a int64 <nil> <nil> <nil>]
-[t2 2 b int64 true  ]
-[t2 3 c int64 <nil> <nil> <nil>]
-[t3 1 a int64 <nil> <nil> <nil>]
-[t3 2 b int64 false a < b && b < c ]
-[t3 3 c int64 <nil> <nil> <nil>]
-[t4 1 a int64 <nil> <nil> <nil>]
-[t4 2 b int64 false a < b && b < c (a + c) / 2]
-[t4 3 c int64 <nil> <nil> <nil>]
-[t5 1 a int64 <nil> <nil> <nil>]
-[t5 2 b int64 true  (a + c) / 2]
-[t5 3 c int64 <nil> <nil> <nil>]
-[t6 1 a int64 <nil> <nil> <nil>]
-[t6 2 b int64 false  (a + c) / 2]
-[t6 3 c int64 <nil> <nil> <nil>]
-
--- 892
-BEGIN TRANSACTION;
-        DROP TABLE __Index2;
-COMMIT;
-||system table
-
--- 893
-BEGIN TRANSACTION;
-        CREATE TABLE __Index2 (i int);
-COMMIT;
-||system table
-
--- 894
-BEGIN TRANSACTION;
-        UPDATE __Index2 SET i = 42;
-COMMIT;
-||system table
-
--- 895
-BEGIN TRANSACTION;
-        CREATE INDEX __Index2X ON __Index2(x);
-COMMIT;
-||system table
-
--- 896
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM __Index2;
-||does not exist
-
--- 897
-BEGIN TRANSACTION;
-        DROP TABLE __Index2_Expr;
-COMMIT;
-||system table
-
--- 898
-BEGIN TRANSACTION;
-        CREATE TABLE __Index2_Expr (i int);
-COMMIT;
-||system table
-
--- 899
-BEGIN TRANSACTION;
-        UPDATE __Index2_Expr SET i = 42;
-COMMIT;
-||system table
-
--- 900
-BEGIN TRANSACTION;
-        CREATE INDEX __Index2X ON __Index2_Expr(x);
-COMMIT;
-||system table
-
--- 901
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-SELECT * FROM __Index2_Expr;
-||does not exist
-
--- 902
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__");
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false true true]
-
--- 903
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x"
-);
-|"Expr"
-[i]
-
--- 904
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__");
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false true true]
-
--- 905
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x"
-);
-|"Expr"
-[id()]
-
--- 906
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE unique INDEX x ON t(i);
-	CREATE INDEX y ON t(id());
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x true true true]
-[t y false true true]
-
--- 907
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON t(id());
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[i]
-[id()]
-
--- 908
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON t(id());
-	DROP INDEX x;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t y false true true]
-
--- 909
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON t(id());
-	DROP INDEX y;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false true true]
-
--- 910
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON t(id());
-	DROP INDEX x;
-	DROP INDEX y;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-
--- 911
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON t(id());
-	DROP INDEX x;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[id()]
-
--- 912
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON t(id());
-	DROP INDEX y;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[i]
-
--- 913
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON t(id());
-	DROP INDEX x;
-	DROP INDEX y;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-
--- 914
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false true true]
-[u y false true true]
-
--- 915
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	DROP TABLE t;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[u y false true true]
-
--- 916
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	DROP TABLE u;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false true true]
-
--- 917
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	DROP TABLE t;
-	DROP TABLE u;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-
--- 918
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	DROP TABLE u;
-	DROP TABLE t;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-
--- 919
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[i]
-[j]
-
--- 920
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	DROP TABLE t;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[j]
-
--- 921
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	DROP TABLE u;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[i]
-
--- 922
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	DROP TABLE t;
-	DROP TABLE u;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-
--- 923
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE TABLE u (j int);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	DROP TABLE u;
-	DROP TABLE t;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2 
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-
--- 924
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false true true]
-[u y false true true]
-
--- 925
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[u y false true true]
-
--- 926
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE t DROP COLUMN a;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false true true]
-[u y false true true]
-
--- 927
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE u DROP COLUMN j;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false true true]
-
--- 928
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE u DROP COLUMN b;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false true true]
-[u y false true true]
-
--- 929
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE t DROP COLUMN i;
-	ALTER TABLE u DROP COLUMN j;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-
--- 930
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE u DROP COLUMN j;
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: memory DB
-FROM __Index2
-WHERE !hasPrefix(TableName, "__")
-ORDER BY IndexName;
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-
--- 931
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[i]
-[j]
-
--- 932
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[j]
-
--- 933
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE t DROP COLUMN a;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[i]
-[j]
-
--- 934
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE u DROP COLUMN j;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[i]
-
--- 935
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE u DROP COLUMN b;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-[i]
-[j]
-
--- 936
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE t DROP COLUMN i;
-	ALTER TABLE u DROP COLUMN j;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-
--- 937
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, a string);
-	CREATE TABLE u (j int, b string);
-	CREATE INDEX x ON t(i);
-	CREATE INDEX y ON u(j);
-	ALTER TABLE u DROP COLUMN j;
-	ALTER TABLE t DROP COLUMN i;
-COMMIT;
-SELECT Expr
-FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2
-	WHERE IndexName == "x" OR IndexName == "y"
-)
-ORDER BY Expr;
-|"Expr"
-
--- 938
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a + c, c - b);
-COMMIT;
-SELECT TableName, IndexName, IsUnique, IsSimple, Root > 0 OR Root == -1 // -1: mem DB
-FROM __Index2
-WHERE TableName == "t";
-|"TableName", "IndexName", "IsUnique", "IsSimple", ""
-[t x false false true]
-
--- 939
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a + c, c - b);
-COMMIT;
-SELECT Expr FROM __Index2_Expr
-WHERE Index2_ID IN (
-	SELECT id()
-	FROM __Index2
-	WHERE IndexName == "x"
-)
-ORDER BY Expr;
-|"Expr"
-[a + c]
-[c - b]
-
--- 940
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	INSERT INTO t VALUES(1, 2, 3);
-	CREATE INDEX x ON t(a + c, c - b);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[1 2 3]
-
--- 941
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	INSERT INTO t VALUES(1, 2, 3);
-	CREATE INDEX x ON t(a + c, c - b);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[4 1]
-
--- 942
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a + c, c - b);
-	INSERT INTO t VALUES(1, 2, 3);
-COMMIT;
-SELECT * FROM t;
-|"a", "b", "c"
-[1 2 3]
-
--- 943
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a + c, c - b);
-	INSERT INTO t VALUES(1, 2, 3);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[4 1]
-
--- 944
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a + c, c - b);
-	DROP INDEX x;
-COMMIT;
-SELECT * FROM x;
-||x does not exist
-
--- 945
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a + c, c - b);
-	DROP TABLE t;
-COMMIT;
-SELECT * FROM x;
-||x does not exist
-
--- 946
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a + c, c - b);
-	ALTER TABLE t DROP COLUMN a;
-COMMIT;
-SELECT * FROM x;
-||x does not exist
-
--- 947
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a + c, c - b);
-	ALTER TABLE t DROP COLUMN b;
-COMMIT;
-SELECT * FROM x;
-||x does not exist
-
--- 948
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a + c, c - b);
-	ALTER TABLE t DROP COLUMN c;
-COMMIT;
-SELECT * FROM x;
-||x does not exist
-
--- 949
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a, c);
-	ALTER TABLE t DROP COLUMN a;
-COMMIT;
-SELECT * FROM x;
-||x does not exist
-
--- 950
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a, c);
-	ALTER TABLE t DROP COLUMN b;
-COMMIT;
-SELECT * FROM x;
-|"x"
-
--- 951
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a, c);
-	ALTER TABLE t DROP COLUMN a;
-COMMIT;
-SELECT * FROM x;
-||x does not exist
-
--- 952
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a, c);
-	INSERT INTO t VALUES(1, 2, 3);
-	ALTER TABLE t DROP COLUMN b;
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1 3]
-
--- 953
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(a, c);
-	INSERT INTO t VALUES(10, 20, 30);
-	ALTER TABLE t DROP COLUMN b;
-	INSERT INTO t VALUES(1, 3);
-	ALTER TABLE t ADD b string;
-	INSERT INTO t VALUES(5, 15, "foo");
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1 3]
-[5 15]
-[10 30]
-
--- 954
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(b, c);
-	INSERT INTO t VALUES (100, 200, 300), (1, 2, 3), (10, 20, 30);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[2 3]
-[20 30]
-[200 300]
-
--- 955
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(b);
-	INSERT INTO t VALUES (100, 200, 300), (1, 2, 3), (10, 20, 30);
-	INSERT INTO t VALUES (NULL, 200, 300), (1, NULL, 3), (10, NULL, 30), (NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[<nil>]
-[<nil>]
-[<nil>]
-[2]
-[20]
-[200]
-[200]
-
--- 956
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(b, c);
-	INSERT INTO t VALUES
-		(100, 200, 300), (1, 2, 3), (10, 20, 30),
-		(NULL, 200, 300), (1, NULL, 3), (10, NULL, 30),
-		(NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[<nil> <nil>]
-[<nil> 3]
-[<nil> 30]
-[2 3]
-[20 30]
-[200 300]
-[200 300]
-
--- 957
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(b, c);
-	INSERT INTO t VALUES
-		(100, 200, 300), (1, 2, 3), (10, 20, 30),
-		(NULL, 200, 300), (1, NULL, 3), (10, NULL, 30),
-		(NULL, NULL, NULL), (NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[<nil> <nil>]
-[<nil> <nil>]
-[<nil> 3]
-[<nil> 30]
-[2 3]
-[20 30]
-[200 300]
-[200 300]
-
--- 958
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE UNIQUE INDEX x ON t(b, c);
-	INSERT INTO t VALUES
-		(100, 200, 300), (1, 2, 3), (10, 20, 30),
-		(NULL, 200, 300), (1, NULL, 3), (10, NULL, 30),
-		(NULL, NULL, NULL), (NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM x;
-||duplicate .* [200 300]
-
--- 959
-BEGIN TRANSACTION;
-	CREATE TABLE t(a int, b int, c int);
-	CREATE INDEX x ON t(b, c);
-	INSERT INTO t VALUES
-		(100, 200, 300), (1, 2, 3), (10, 20, 30),
-		(NULL, 200, 301), (1, NULL, 3), (10, NULL, 30),
-		(NULL, NULL, NULL), (NULL, NULL, NULL);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[<nil> <nil>]
-[<nil> <nil>]
-[<nil> 3]
-[<nil> 30]
-[2 3]
-[20 30]
-[200 300]
-[200 301]
-
--- 960
-BEGIN TRANSACTION;
-	CREATE INDEX x ON t (qty()+1);
-COMMIT;
-||undefined.* qty
-
--- 961
-BEGIN TRANSACTION;
-	CREATE INDEX x ON t (qty+1);
-COMMIT;
-||table.*not exist
-
--- 962
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (qty+1);
-COMMIT;
-||column.*not exist
-
--- 963
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (id()+1);
-COMMIT;
-SELECT * FROM t;
-|"c"
-
--- 964
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (id()+1);
-	CREATE INDEX y ON t (id()+1);
-COMMIT;
-SELECT * FROM t;
-|"c"
-
--- 965
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (id()+1);
-	CREATE INDEX x ON t (c+1);
-COMMIT;
-SELECT * FROM t;
-||already
-
--- 966
-BEGIN TRANSACTION;
-	CREATE TABLE t (c int);
-	CREATE INDEX x ON t (c+1);
-	INSERT INTO t VALUES(42);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[43]
-
--- 967
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i+1000);
-	INSERT INTO t VALUES(42);
-	INSERT INTO t VALUES(24);
-	CREATE INDEX y ON t (i+2000);
-	INSERT INTO t VALUES(1);
-	INSERT INTO t VALUES(999);
-	UPDATE t i = 240 WHERE i == 24;
-	DELETE FROM t WHERE i == 240;
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1001]
-[1042]
-[1999]
-
--- 968
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i+1000);
-	INSERT INTO t VALUES(42);
-	INSERT INTO t VALUES(24);
-	CREATE INDEX y ON t (i+2000);
-	INSERT INTO t VALUES(1);
-	INSERT INTO t VALUES(999);
-	UPDATE t i = 240 WHERE i == 24;
-	DELETE FROM t WHERE i == 240;
-COMMIT;
-SELECT * FROM y;
-|"y"
-[2001]
-[2042]
-[2999]
-
--- 969
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX i ON t (i+1);
-COMMIT;
-||collision .*: i
-
-
--- 970
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i+1);
-COMMIT;
-BEGIN TRANSACTION;
-	INSERT INTO t VALUES(1000);
-	BEGIN TRANSACTION;
-		INSERT INTO t VALUES(2000);
-	ROLLBACK;
-	INSERT INTO t VALUES(3000);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[1001]
-[3001]
-
--- 971
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i+1);
-	INSERT INTO t VALUES (42);
-	TRUNCATE TABLE t;
-COMMIT;
-SELECT * FROM x;
-|"x"
-
--- 972
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i+1);
-	INSERT INTO t VALUES (42);
-	DELETE FROM t;
-COMMIT;
-SELECT * FROM x;
-|"x"
-
--- 973
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, s string);
-	CREATE INDEX x ON t (i+1);
-	INSERT INTO t VALUES (42, "foo");
-	ALTER TABLE t DROP COLUMN i;
-	INSERT INTO t VALUES ("bar");
-COMMIT;
-SELECT * FROM x;
-||x does not exist
-
--- 974
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t (i+1);
-	INSERT INTO t VALUES(NULL);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(30);
-	INSERT INTO t VALUES(20);
-	INSERT INTO t VALUES(40);
-	INSERT INTO t VALUES(10);
-	INSERT INTO t VALUES(50);
-	INSERT INTO t VALUES(NULL);
-COMMIT;
-SELECT * FROM x;
-|"x"
-[<nil>]
-[<nil>]
-[11]
-[11]
-[21]
-[21]
-[31]
-[31]
-[41]
-[41]
-[51]
-[51]
-
--- 975
-BEGIN TRANSACTION;
-	CREATE TABLE t (i blob);
-	CREATE INDEX x ON t (blob(string(i)));
-COMMIT;
-SELECT * FROM x;
-|"x"
-
--- 976
-BEGIN TRANSACTION;
-	CREATE TABLE t (i blob);
-	CREATE INDEX x ON t (blob(string(i)));
-	INSERT INTO t VALUES (blob("foo"));
-COMMIT;
-SELECT * FROM x;
-||blob-like
-
--- 977
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigint);
-	CREATE INDEX x ON t (i+1);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT * FROM x;
-||blob-like
-
--- 978
-BEGIN TRANSACTION;
-	CREATE TABLE t (i bigrat);
-	CREATE INDEX x ON t (i+1);
-	INSERT INTO t VALUES (42);
-COMMIT;
-SELECT * FROM x;
-||blob-like
-
--- 979
-BEGIN TRANSACTION;
-	CREATE TABLE t (i time);
-	CREATE INDEX x ON t (timeIn(i, "local"));
-	INSERT INTO t VALUES (now());
-COMMIT;
-SELECT * FROM x;
-||blob-like
-
--- 980
-BEGIN TRANSACTION;
-	CREATE TABLE t (i duration);
-	CREATE INDEX x ON t (since(now()));
-	INSERT INTO t VALUES (duration("3s"));
-COMMIT;
-SELECT * FROM x;
-||blob-like
-
--- 981
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-EXPLAIN SELECT * FROM t;
-|""
-[┌Iterate all rows of table "t"]
-[└Output field names ["i"]]
-
--- 982
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-COMMIT;
-EXPLAIN EXPLAIN SELECT * FROM t;
-|""
-[┌Iterate all rows of table "t"]
-[└Output field names ["i"]]
-
--- 983
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (42), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE i != 42;
-|"i"
-[278]
-[-1]
-[0]
-[314]
-
--- 984 // order -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (314), (0), (NULL), (42), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE i != 42;
-|"i"
-[-1]
-[0]
-[278]
-[314]
-
--- 985 // order -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE i != 42;
-|"i"
-[-1]
-[0]
-[278]
-[314]
-
--- 986
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() > 0;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 987
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() > 0;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 988
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int);
-	INSERT INTO t VALUES (314, 100), (0, 200), (NULL, 300), (-1, 400), (278, 500);
-COMMIT;
-SELECT * FROM t WHERE i IS NULL;
-|"i", "j"
-[<nil> 300]
-
--- 989
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (314, 100), (0, 200), (NULL, 300), (-1, 400), (278, 500);
-COMMIT;
-SELECT * FROM t WHERE i IS NULL;
-|"i", "j"
-[<nil> 300]
-
--- 990
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE i IS NOT NULL;
-|"i"
-[278]
-[-1]
-[0]
-[314]
-
--- 991 // order -> index is used
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-	CREATE INDEX x ON t(i);
-COMMIT;
-SELECT * FROM t WHERE i IS NOT NULL;
-|"i"
-[-1]
-[0]
-[278]
-[314]
-
--- 992
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() IS NULL;
-|"i"
-
--- 993
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() IS NOT NULL;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 994
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() IS NULL;
-|"i"
-
--- 995
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() IS NOT NULL;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 996
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() == 0;
-|"i"
-
--- 997
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() ==  0;
-|"i"
-
--- 998
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() < 1;
-|"i"
-
--- 999
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() < 1;
-|"i"
-
--- 1000
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() <= 0;
-|"i"
-
--- 1001
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() <= 0;
-|"i"
-
--- 1002
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() > 0;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 1003
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() > 0;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 1004
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() >= 1;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 1005
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() >= 1;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 1006
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() != 0;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 1007
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(id());
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE id() != 0;
-|"i"
-[278]
-[-1]
-[<nil>]
-[0]
-[314]
-
--- 1008
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (314), (0), (NULL), (-1), (278);
-COMMIT;
-SELECT * FROM t WHERE -1 < i && 314 > i OR i > 1000 && i < 2000; //MAYBE use ORed intervals
-|"i"
-[278]
-[0]
-
--- 1009
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, b bool);
-	CREATE INDEX x ON t (b);
-	INSERT INTO t VALUES(24, false);
-	INSERT INTO t VALUES(333, NULL);
-	INSERT INTO t VALUES(42, true);
-	INSERT INTO t VALUES(240, false);
-	INSERT INTO t VALUES(420, true);
-COMMIT;
-SELECT i FROM t WHERE !b ORDER BY i;
-|"i"
-[24]
-[240]
-
--- 1010
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i == -2;
-|"i"
-
--- 1011
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i == -1;
-|"i"
-
--- 1012
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i == 0;
-|"i"
-[0]
-
--- 1013
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i == 1;
-|"i"
-
--- 1014
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i == 2;
-|"i"
-
--- 1015
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i >= -2;
-|"i"
-[0]
-
--- 1016
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i >= -1;
-|"i"
-[0]
-
--- 1017
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i >= 0;
-|"i"
-[0]
-
--- 1018
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i >= 1;
-|"i"
-
--- 1019
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i >= 2;
-|"i"
-
--- 1020
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i > -2;
-|"i"
-[0]
-
--- 1021
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i > -1;
-|"i"
-[0]
-
--- 1022
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i > 0;
-|"i"
-
--- 1023
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i > 1;
-|"i"
-
--- 1024
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i > 2;
-|"i"
-
--- 1025
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i <= -2;
-|"i"
-
--- 1026
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i <= -1;
-|"i"
-
--- 1027
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i <= 0;
-|"i"
-[0]
-
--- 1028
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i <= 1;
-|"i"
-[0]
-
--- 1029
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i <= 2;
-|"i"
-[0]
-
--- 1030
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i < -2;
-|"i"
-
--- 1031
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i < -1;
-|"i"
-
--- 1032
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i < 0;
-|"i"
-
--- 1033
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i < 1;
-|"i"
-[0]
-
--- 1034
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i < 2;
-|"i"
-[0]
-
--- 1035
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i != -2;
-|"i"
-[0]
-
--- 1036
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i != -1;
-|"i"
-[0]
-
--- 1037
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i != 0;
-|"i"
-
--- 1038
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i != 1;
-|"i"
-[0]
-
--- 1039
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i == 0 && i != 2;
-|"i"
-[0]
-
--- 1040
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, b bool);
-	CREATE INDEX x ON t(b);
-	INSERT INTO t VALUES (1, false), (NULL, NULL), (-2, false), (0, true), (2, false), (-1, true);
-COMMIT;
-SELECT * FROM t WHERE !b && b ORDER BY i;
-|"i", "b"
-
--- 1041
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, b bool);
-	CREATE INDEX x ON t(b);
-	INSERT INTO t VALUES (1, false), (NULL, NULL), (-2, false), (0, true), (2, false), (-1, true);
-COMMIT;
-SELECT * FROM t WHERE !b && !b ORDER BY i;
-|"i", "b"
-[-2 false]
-[1 false]
-[2 false]
-
--- 1042
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, b bool);
-	CREATE INDEX x ON t(b);
-	INSERT INTO t VALUES (1, false), (NULL, NULL), (-2, false), (0, true), (2, false), (-1, true);
-COMMIT;
-SELECT * FROM t WHERE b && !b ORDER BY i;
-|"i", "b"
-
--- 1043
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, b bool);
-	CREATE INDEX x ON t(b);
-	INSERT INTO t VALUES (1, false), (NULL, NULL), (-2, false), (0, true), (2, false), (-1, true);
-COMMIT;
-SELECT * FROM t WHERE b && b ORDER BY i;
-|"i", "b"
-[-1 true]
-[0 true]
-
--- 1044
-SELECT * FROM nothing; // align 5
-||.
-
--- 1045
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i == -2;
-|"i"
-
--- 1046
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i == -1;
-|"i"
-
--- 1047
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i == 0;
-|"i"
-[0]
-
--- 1048
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i == 1;
-|"i"
-[1]
-
--- 1049
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i == 2;
-|"i"
-[2]
-
--- 1050
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i >= -2;
-|"i"
-[0]
-[1]
-[2]
-
--- 1051
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i >= -1;
-|"i"
-[0]
-[1]
-[2]
-
--- 1052
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i >= 0;
-|"i"
-[0]
-[1]
-[2]
-
--- 1053
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i >= 1;
-|"i"
-[1]
-[2]
-
--- 1054
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i >= 2;
-|"i"
-[2]
-
--- 1055
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i > -2;
-|"i"
-[0]
-[1]
-[2]
-
--- 1056
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i > -1;
-|"i"
-[0]
-[1]
-[2]
-
--- 1057
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i > 0;
-|"i"
-[1]
-[2]
-
--- 1058
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i > 1;
-|"i"
-[2]
-
--- 1059
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i > 2;
-|"i"
-
--- 1060
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i <= -2;
-|"i"
-
--- 1061
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i <= -1;
-|"i"
-
--- 1062
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i <= 0;
-|"i"
-[0]
-
--- 1063
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i <= 1;
-|"i"
-[0]
-[1]
-
--- 1064
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i <= 2;
-|"i"
-[0]
-[1]
-[2]
-
--- 1065
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i < -2;
-|"i"
-
--- 1066
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i < -1;
-|"i"
-
--- 1067
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i < 0;
-|"i"
-
--- 1068
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i < 1;
-|"i"
-[0]
-
--- 1069
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i < 2;
-|"i"
-[0]
-[1]
-
--- 1070
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i != -2;
-|"i"
-[0]
-[1]
-[2]
-
--- 1071
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i != -1;
-|"i"
-[0]
-[1]
-[2]
-
--- 1072
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i != 0;
-|"i"
-[1]
-[2]
-
--- 1073
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i != 1;
-|"i"
-[0]
-[2]
-
--- 1074
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= 0 && i != 2;
-|"i"
-[0]
-[1]
-
--- 1075
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i == -2;
-|"i"
-
--- 1076
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i == -1;
-|"i"
-
--- 1077
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i == 0;
-|"i"
-
--- 1078
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i == 1;
-|"i"
-[1]
-
--- 1079
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i == 2;
-|"i"
-[2]
-
--- 1080
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i >= -2;
-|"i"
-[1]
-[2]
-
--- 1081
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i >= -1;
-|"i"
-[1]
-[2]
-
--- 1082
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i >= 0;
-|"i"
-[1]
-[2]
-
--- 1083
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i >= 1;
-|"i"
-[1]
-[2]
-
--- 1084
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i >= 2;
-|"i"
-[2]
-
--- 1085
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i > -2;
-|"i"
-[1]
-[2]
-
--- 1086
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i > -1;
-|"i"
-[1]
-[2]
-
--- 1087
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i > 0;
-|"i"
-[1]
-[2]
-
--- 1088
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i > 1;
-|"i"
-[2]
-
--- 1089
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i > 2;
-|"i"
-
--- 1090
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i <= -2;
-|"i"
-
--- 1091
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i <= -1;
-|"i"
-
--- 1092
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i <= 0;
-|"i"
-
--- 1093
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i <= 1;
-|"i"
-[1]
-
--- 1094
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i <= 2;
-|"i"
-[1]
-[2]
-
--- 1095
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i < -2;
-|"i"
-
--- 1096
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i < -1;
-|"i"
-
--- 1097
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i < 0;
-|"i"
-
--- 1098
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i < 1;
-|"i"
-
--- 1099
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i < 2;
-|"i"
-[1]
-
--- 1100
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i != -2;
-|"i"
-[1]
-[2]
-
--- 1101
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i != -1;
-|"i"
-[1]
-[2]
-
--- 1102
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i != 0;
-|"i"
-[1]
-[2]
-
--- 1103
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i != 1;
-|"i"
-[2]
-
--- 1104
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > 0 && i != 2;
-|"i"
-[1]
-
--- 1105
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i == -2;
-|"i"
-[-2]
-
--- 1106
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i == -1;
-|"i"
-[-1]
-
--- 1107
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i == 0;
-|"i"
-[0]
-
--- 1108
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i == 1;
-|"i"
-
--- 1109
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i == 2;
-|"i"
-
--- 1110
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i >= -2;
-|"i"
-[-2]
-[-1]
-[0]
-
--- 1111
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i >= -1;
-|"i"
-[-1]
-[0]
-
--- 1112
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i >= 0;
-|"i"
-[0]
-
--- 1113
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i >= 1;
-|"i"
-
--- 1114
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i >= 2;
-|"i"
-
--- 1115
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i > -2;
-|"i"
-[-1]
-[0]
-
--- 1116
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i > -1;
-|"i"
-[0]
-
--- 1117
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i > 0;
-|"i"
-
--- 1118
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i > 1;
-|"i"
-
--- 1119
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i > 2;
-|"i"
-
--- 1120
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i <= -2;
-|"i"
-[-2]
-
--- 1121
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i <= -1;
-|"i"
-[-2]
-[-1]
-
--- 1122
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i <= 0;
-|"i"
-[-2]
-[-1]
-[0]
-
--- 1123
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i <= 1;
-|"i"
-[-2]
-[-1]
-[0]
-
--- 1124
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i <= 2;
-|"i"
-[-2]
-[-1]
-[0]
-
--- 1125
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i < -2;
-|"i"
-
--- 1126
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i < -1;
-|"i"
-[-2]
-
--- 1127
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i < 0;
-|"i"
-[-2]
-[-1]
-
--- 1128
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i < 1;
-|"i"
-[-2]
-[-1]
-[0]
-
--- 1129
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i < 2;
-|"i"
-[-2]
-[-1]
-[0]
-
--- 1130
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i != -2;
-|"i"
-[-1]
-[0]
-
--- 1131
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i != -1;
-|"i"
-[-2]
-[0]
-
--- 1132
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i != 0;
-|"i"
-[-2]
-[-1]
-
--- 1133
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i != 1;
-|"i"
-[-2]
-[-1]
-[0]
-
--- 1134
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i <= 0 && i != 2;
-|"i"
-[-2]
-[-1]
-[0]
-
--- 1135
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i == -2;
-|"i"
-[-2]
-
--- 1136
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i == -1;
-|"i"
-[-1]
-
--- 1137
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i == 0;
-|"i"
-
--- 1138
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i == 1;
-|"i"
-
--- 1139
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i == 2;
-|"i"
-
--- 1140
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i >= -2;
-|"i"
-[-2]
-[-1]
-
--- 1141
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i >= -1;
-|"i"
-[-1]
-
--- 1142
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i >= 0;
-|"i"
-
--- 1143
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i >= 1;
-|"i"
-
--- 1144
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i >= 2;
-|"i"
-
--- 1145
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i > -2;
-|"i"
-[-1]
-
--- 1146
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i > -1;
-|"i"
-
--- 1147
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i > 0;
-|"i"
-
--- 1148
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i > 1;
-|"i"
-
--- 1149
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i > 2;
-|"i"
-
--- 1150
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i <= -2;
-|"i"
-[-2]
-
--- 1151
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i <= -1;
-|"i"
-[-2]
-[-1]
-
--- 1152
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i <= 0;
-|"i"
-[-2]
-[-1]
-
--- 1153
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i <= 1;
-|"i"
-[-2]
-[-1]
-
--- 1154
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i <= 2;
-|"i"
-[-2]
-[-1]
-
--- 1155
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i < -2;
-|"i"
-
--- 1156
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i < -1;
-|"i"
-[-2]
-
--- 1157
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i < 0;
-|"i"
-[-2]
-[-1]
-
--- 1158
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i < 1;
-|"i"
-[-2]
-[-1]
-
--- 1159
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i < 2;
-|"i"
-[-2]
-[-1]
-
--- 1160
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i != -2;
-|"i"
-[-1]
--- 1161
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i != -1;
-|"i"
-[-2]
-
--- 1162
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i != 0;
-|"i"
-[-2]
-[-1]
-
--- 1163
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i != 1;
-|"i"
-[-2]
-[-1]
-
--- 1164
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i < 0 && i != 2;
-|"i"
-[-2]
-[-1]
-
--- 1165
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == -2;
-|"i"
-
--- 1166
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == -1;
-|"i"
-[-1]
-
--- 1167
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == 0;
-|"i"
-[0]
-
--- 1168
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == 1;
-|"i"
-[1]
-
--- 1169
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i == 2;
-|"i"
-
--- 1170
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= -2;
-|"i"
-[-1]
-[0]
-[1]
-
--- 1171
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= -1;
-|"i"
-[-1]
-[0]
-[1]
-
--- 1172
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= 0;
-|"i"
-[0]
-[1]
-
--- 1173
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= 1;
-|"i"
-[1]
-
--- 1174
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i >= 2;
-|"i"
-
--- 1175
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > -2;
-|"i"
-[-1]
-[0]
-[1]
-
--- 1176
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > -1;
-|"i"
-[0]
-[1]
-
--- 1177
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > 0;
-|"i"
-[1]
-
--- 1178
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > 1;
-|"i"
-
--- 1179
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i > 2;
-|"i"
-
--- 1180
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= -2;
-|"i"
-
--- 1181
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= -1;
-|"i"
-[-1]
-
--- 1182
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= 0;
-|"i"
-[-1]
-[0]
-
--- 1183
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= 1;
-|"i"
-[-1]
-[0]
-[1]
-
--- 1184
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i <= 2;
-|"i"
-[-1]
-[0]
-[1]
-
--- 1185
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < -2;
-|"i"
-
--- 1186
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < -1;
-|"i"
-
--- 1187
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < 0;
-|"i"
-[-1]
-
--- 1188
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < 1;
-|"i"
-[-1]
-[0]
-
--- 1189
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i < 2;
-|"i"
-[-1]
-[0]
-[1]
-
--- 1190
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != -2;
-|"i"
-[-1]
-[0]
-[1]
-
--- 1191
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != -1;
-|"i"
-[0]
-[1]
-
--- 1192
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != 0;
-|"i"
-[-1]
-[1]
-
--- 1193
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != 1;
-|"i"
-[-1]
-[0]
-
--- 1194
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i <= 1 && i != 2;
-|"i"
-[-1]
-[0]
-[1]
-
--- 1195
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == -2;
-|"i"
-
--- 1196
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == -1;
-|"i"
-
--- 1197
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == 0;
-|"i"
-[0]
-
--- 1198
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == 1;
-|"i"
-[1]
-
--- 1199
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i == 2;
-|"i"
-
--- 1200
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= -2;
-|"i"
-[0]
-[1]
-
--- 1201
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= -1;
-|"i"
-[0]
-[1]
-
--- 1202
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= 0;
-|"i"
-[0]
-[1]
-
--- 1203
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= 1;
-|"i"
-[1]
-
--- 1204
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i >= 2;
-|"i"
-
--- 1205
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > -2;
-|"i"
-[0]
-[1]
-
--- 1206
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > -1;
-|"i"
-[0]
-[1]
-
--- 1207
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > 0;
-|"i"
-[1]
-
--- 1208
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > 1;
-|"i"
-
--- 1209
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i > 2;
-|"i"
-
--- 1210
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= -2;
-|"i"
-
--- 1211
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= -1;
-|"i"
-
--- 1212
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= 0;
-|"i"
-[0]
-
--- 1213
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= 1;
-|"i"
-[0]
-[1]
-
--- 1214
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i <= 2;
-|"i"
-[0]
-[1]
-
--- 1215
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < -2;
-|"i"
-
--- 1216
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < -1;
-|"i"
-
--- 1217
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < 0;
-|"i"
-
--- 1218
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < 1;
-|"i"
-[0]
-
--- 1219
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i < 2;
-|"i"
-[0]
-[1]
-
--- 1220
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != -2;
-|"i"
-[0]
-[1]
-
--- 1221
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != -1;
-|"i"
-[0]
-[1]
-
--- 1222
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != 0;
-|"i"
-[1]
-
--- 1223
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != 1;
-|"i"
-[0]
-
--- 1224
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i <= 1 && i != 2;
-|"i"
-[0]
-[1]
-
--- 1225
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i == -2;
-|"i"
-
--- 1226
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i == -1;
-|"i"
-
--- 1227
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i == 0;
-|"i"
-[0]
-
--- 1228
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i == 1;
-|"i"
-
--- 1229
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i == 2;
-|"i"
-
--- 1230
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= -2;
-|"i"
-[0]
-
--- 1231
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= -1;
-|"i"
-[0]
-
--- 1232
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= 0;
-|"i"
-[0]
-
--- 1233
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= 1;
-|"i"
-
--- 1234
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i >= 2;
-|"i"
-
--- 1235
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i > -2;
-|"i"
-[0]
-
--- 1236
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i > -1;
-|"i"
-[0]
-
--- 1237
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i > 0;
-|"i"
-
--- 1238
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i > 1;
-|"i"
-
--- 1239
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i > 2;
-|"i"
-
--- 1240
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= -2;
-|"i"
-
--- 1241
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= -1;
-|"i"
-
--- 1242
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= 0;
-|"i"
-[0]
-
--- 1243
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= 1;
-|"i"
-[0]
-
--- 1244
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i <= 2;
-|"i"
-[0]
-
--- 1245
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i < -2;
-|"i"
-
--- 1246
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i < -1;
-|"i"
-
--- 1247
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i < 0;
-|"i"
-
--- 1248
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i < 1;
-|"i"
-[0]
-
--- 1249
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i < 2;
-|"i"
-[0]
-
--- 1250
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i != -2;
-|"i"
-[0]
-
--- 1251
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i != -1;
-|"i"
-[0]
-
--- 1252
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i != 0;
-|"i"
-
--- 1253
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i != 1;
-|"i"
-[0]
-
--- 1254
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i > -1 && i < 1 && i != 2;
-|"i"
-[0]
-
--- 1255
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == -2;
-|"i"
-
--- 1256
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == -1;
-|"i"
-[-1]
-
--- 1257
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 0;
-|"i"
-[0]
-
--- 1258
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 1;
-|"i"
-
--- 1259
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 2;
-|"i"
-
--- 1260
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == -2;
-|"i"
-
--- 1261
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == -1;
-|"i"
-[-1]
-
--- 1262
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 0;
-|"i"
-[0]
-
--- 1263
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 1;
-|"i"
-
--- 1264
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i == 2;
-|"i"
-
--- 1265
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= -2;
-|"i"
-[-1]
-[0]
-
--- 1266
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= -1;
-|"i"
-[-1]
-[0]
-
--- 1267
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= 0;
-|"i"
-[0]
-
--- 1268
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= 1;
-|"i"
-
--- 1269
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i >= 2;
-|"i"
-
--- 1270
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > -2;
-|"i"
-[-1]
-[0]
-
--- 1271
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > -1;
-|"i"
-[0]
-
--- 1272
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > 0;
-|"i"
-
--- 1273
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > 1;
-|"i"
-
--- 1274
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i > 2;
-|"i"
-
--- 1275
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= -2;
-|"i"
-
--- 1276
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= -1;
-|"i"
-[-1]
-
--- 1277
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= 0;
-|"i"
-[-1]
-[0]
-
-
--- 1278
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= 1;
-|"i"
-[-1]
-[0]
-
--- 1279
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i <= 2;
-|"i"
-[-1]
-[0]
-
--- 1280
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < -2;
-|"i"
-
--- 1281
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < -1;
-|"i"
-
--- 1282
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < 0;
-|"i"
-[-1]
-
-
--- 1283
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < 1;
-|"i"
-[-1]
-[0]
-
--- 1284
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i < 2;
-|"i"
-[-1]
-[0]
-
--- 1285
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != -2;
-|"i"
-[-1]
-[0]
-
--- 1286
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != -1;
-|"i"
-[0]
-
--- 1287
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != 0;
-|"i"
-[-1]
-
-
--- 1288
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != 1;
-|"i"
-[-1]
-[0]
-
--- 1289
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i >= -1 && i < 1 && i != 2;
-|"i"
-[-1]
-[0]
-
--- 1290
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i == -2;
-|"i"
-[-2]
-
--- 1291
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i == -1;
-|"i"
-[-1]
-
--- 1292
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i == 0;
-|"i"
-
-
--- 1293
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i == 1;
-|"i"
-[1]
-
--- 1294
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i == 2;
-|"i"
-[2]
-
--- 1295
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i >= -2;
-|"i"
-[-2]
-[-1]
-[1]
-[2]
-
--- 1296
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i >= -1;
-|"i"
-[-1]
-[1]
-[2]
-
--- 1297
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i >= 0;
-|"i"
-[1]
-[2]
-
-
--- 1298
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i >= 1;
-|"i"
-[1]
-[2]
-
--- 1299
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i >= 2;
-|"i"
-[2]
-
--- 1300
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i > -2;
-|"i"
-[-1]
-[1]
-[2]
-
--- 1301
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i > -1;
-|"i"
-[1]
-[2]
-
--- 1302
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i > 0;
-|"i"
-[1]
-[2]
-
-
--- 1303
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i > 1;
-|"i"
-[2]
-
--- 1304
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i > 2;
-|"i"
-
--- 1305
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i <= -2;
-|"i"
-[-2]
-
--- 1306
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i <= -1;
-|"i"
-[-2]
-[-1]
-
--- 1307
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i <= 0;
-|"i"
-[-2]
-[-1]
-
-
--- 1308
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i <= 1;
-|"i"
-[-2]
-[-1]
-[1]
-
--- 1309
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i <= 2;
-|"i"
-[-2]
-[-1]
-[1]
-[2]
-
--- 1310
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i < -2;
-|"i"
-
--- 1311
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i < -1;
-|"i"
-[-2]
-
--- 1312
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i < 0;
-|"i"
-[-2]
-[-1]
-
-
--- 1313
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i < 1;
-|"i"
-[-2]
-[-1]
-
--- 1314
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i < 2;
-|"i"
-[-2]
-[-1]
-[1]
-
--- 1315
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i != -2;
-|"i"
-[-1]
-[1]
-[2]
-
--- 1316
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i != -1;
-|"i"
-[-2]
-[1]
-[2]
-
--- 1317
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i != 0;
-|"i"
-[-2]
-[-1]
-[1]
-[2]
-
-
--- 1318
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i != 1;
-|"i"
-[-2]
-[-1]
-[2]
-
--- 1319
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX x ON t(i);
-	INSERT INTO t VALUES (1), (NULL), (-2), (0), (2), (-1);
-COMMIT;
-SELECT i FROM t WHERE i != 0 && i != 2;
-|"i"
-[-2]
-[-1]
-[1]
-
--- 1320
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	INSERT INTO t VALUES
-	(1, 2, 3),
-	(4, 5, -6),
-	(7, -8, 9),
-	(10, -11, -12),
-	(-13, 14, 15),
-	(-16, 17, -18),
-	(-19, -20, 21),
-	(-22, -23, -24);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 ORDER BY i, j;
-|"i", "j", "k"
-[1 2 3]
-[4 5 -6]
-
--- 1321
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	CREATE INDEX xi ON t(i);
-	INSERT INTO t VALUES
-	(1, 2, 3),
-	(4, 5, -6),
-	(7, -8, 9),
-	(10, -11, -12),
-	(-13, 14, 15),
-	(-16, 17, -18),
-	(-19, -20, 21),
-	(-22, -23, -24);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 ORDER BY i, j;
-|"i", "j", "k"
-[1 2 3]
-[4 5 -6]
-
--- 1322
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	CREATE INDEX xj ON t(j);
-	INSERT INTO t VALUES
-	(1, 2, 3),
-	(4, 5, -6),
-	(7, -8, 9),
-	(10, -11, -12),
-	(-13, 14, 15),
-	(-16, 17, -18),
-	(-19, -20, 21),
-	(-22, -23, -24);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 ORDER BY i, j;
-|"i", "j", "k"
-[1 2 3]
-[4 5 -6]
-
--- 1323
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	CREATE INDEX xi ON t(i);
-	CREATE INDEX xj ON t(j);
-	INSERT INTO t VALUES
-	(1, 2, 3),
-	(4, 5, -6),
-	(7, -8, 9),
-	(10, -11, -12),
-	(-13, 14, 15),
-	(-16, 17, -18),
-	(-19, -20, 21),
-	(-22, -23, -24);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 ORDER BY i, j;
-|"i", "j", "k"
-[1 2 3]
-[4 5 -6]
-
--- 1324
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	CREATE INDEX xi ON t(i);
-	CREATE INDEX xj ON t(j);
-	INSERT INTO t VALUES
-	(1, 2, 3),
-	(4, 5, -6),
-	(7, -8, 9),
-	(10, -11, -12),
-	(-13, 14, 15),
-	(-16, 17, -18),
-	(-19, -20, 21),
-	(-22, -23, -24);
-COMMIT;
-SELECT * FROM t WHERE j > 0 && i > 0 ORDER BY i, j;
-|"i", "j", "k"
-[1 2 3]
-[4 5 -6]
-
--- 1325
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	INSERT INTO t VALUES
-	(1, 2, 3),
-	(4, 5, -6),
-	(7, -8, 9),
-	(10, -11, -12),
-	(-13, 14, 15),
-	(-16, 17, -18),
-	(-19, -20, 21),
-	(-22, -23, -24);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0;
-|"i", "j", "k"
-[1 2 3]
-
--- 1326
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	CREATE INDEX xi ON t(i);
-	INSERT INTO t VALUES
-	(1, 2, 3),
-	(4, 5, -6),
-	(7, -8, 9),
-	(10, -11, -12),
-	(-13, 14, 15),
-	(-16, 17, -18),
-	(-19, -20, 21),
-	(-22, -23, -24);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0;
-|"i", "j", "k"
-[1 2 3]
-
--- 1327
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	CREATE INDEX xj ON t(j);
-	INSERT INTO t VALUES
-	(1, 2, 3),
-	(4, 5, -6),
-	(7, -8, 9),
-	(10, -11, -12),
-	(-13, 14, 15),
-	(-16, 17, -18),
-	(-19, -20, 21),
-	(-22, -23, -24);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0;
-|"i", "j", "k"
-[1 2 3]
-
--- 1328
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int);
-	CREATE INDEX xk ON t(k);
-	INSERT INTO t VALUES
-	(1, 2, 3),
-	(4, 5, -6),
-	(7, -8, 9),
-	(10, -11, -12),
-	(-13, 14, 15),
-	(-16, 17, -18),
-	(-19, -20, 21),
-	(-22, -23, -24);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0;
-|"i", "j", "k"
-[1 2 3]
-
--- 1329
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int, l int);
-	INSERT INTO t VALUES
-	(1, 2, 3, 25),
-	(4, 5, -6, -26),
-	(7, -8, 9, 27),
-	(10, -11, -12, -28),
-	(-13, 14, 15, 29),
-	(-16, 17, -18, -30),
-	(-19, -20, 21, 31),
-	(-22, -23, -24, -32);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-|"i", "j", "k", "l"
-[1 2 3 25]
-
--- 1330
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int, l int);
-	CREATE INDEX xi ON t(i);
-	INSERT INTO t VALUES
-	(1, 2, 3, 25),
-	(4, 5, -6, -26),
-	(7, -8, 9, 27),
-	(10, -11, -12, -28),
-	(-13, 14, 15, 29),
-	(-16, 17, -18, -30),
-	(-19, -20, 21, 31),
-	(-22, -23, -24, -32);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-|"i", "j", "k", "l"
-[1 2 3 25]
-
--- 1331
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int, l int);
-	CREATE INDEX xj ON t(j);
-	INSERT INTO t VALUES
-	(1, 2, 3, 25),
-	(4, 5, -6, -26),
-	(7, -8, 9, 27),
-	(10, -11, -12, -28),
-	(-13, 14, 15, 29),
-	(-16, 17, -18, -30),
-	(-19, -20, 21, 31),
-	(-22, -23, -24, -32);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-|"i", "j", "k", "l"
-[1 2 3 25]
-
--- 1332
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int, l int);
-	CREATE INDEX xk ON t(k);
-	INSERT INTO t VALUES
-	(1, 2, 3, 25),
-	(4, 5, -6, -26),
-	(7, -8, 9, 27),
-	(10, -11, -12, -28),
-	(-13, 14, 15, 29),
-	(-16, 17, -18, -30),
-	(-19, -20, 21, 31),
-	(-22, -23, -24, -32);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-|"i", "j", "k", "l"
-[1 2 3 25]
-
--- 1333
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int, j int, k int, l int);
-	CREATE INDEX xl ON t(l);
-	INSERT INTO t VALUES
-	(1, 2, 3, 25),
-	(4, 5, -6, -26),
-	(7, -8, 9, 27),
-	(10, -11, -12, -28),
-	(-13, 14, 15, 29),
-	(-16, 17, -18, -30),
-	(-19, -20, 21, 31),
-	(-22, -23, -24, -32);
-COMMIT;
-SELECT * FROM t WHERE i > 0 && j > 0 && k > 0 && l > 0;
-|"i", "j", "k", "l"
-[1 2 3 25]
-
--- 1334
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (13), (15), (11), (16), (12), (14);
-COMMIT;
-SELECT * FROM t WHERE i > 12 && i BETWEEN 10 AND 20 AND i < 15 ORDER BY i;
-|"i"
-[13]
-[14]
-
--- 1335
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	CREATE INDEX xt_i ON t(i);
-	INSERT INTO t VALUES (13), (15), (11), (16), (12), (14);
-COMMIT;
-SELECT * FROM t WHERE i > 12 && i BETWEEN 10 AND 20 AND i < 42;
-|"i"
-[13]
-[14]
-[15]
-[16]
-
--- 1336 // https://github.com/cznic/ql/issues/102
-BEGIN TRANSACTION;
-	CREATE TABLE t (i byte);
-	INSERT INTO t VALUES (NULL);
-COMMIT;
-SELECT * FROM t;
-|"i"
-[<nil>]
-
--- 1337 // https://github.com/cznic/ql/issues/103
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-	INSERT INTO t VALUES (date(2015, 6, 11, 11, 7, 50, 0, "UTC"));
-	CREATE INDEX x ON t(t);
-COMMIT;
-SELECT * FROM t;
-|"t"
-[2015-06-11 11:07:50 +0000 UTC]
-
--- 1338
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-COMMIT;
-SELECT len(*) FROM t;
-||invalid expression
-
--- 1339
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-COMMIT;
-SELECT t.count(*) FROM t;
-||invalid expression
-
--- 1339
-BEGIN TRANSACTION;
-	CREATE TABLE t (t time);
-COMMIT;
-SELECT count(*) FROM t;
-|""
-[0]
-
--- 1340
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (1), (NULL), (3);
-COMMIT;
-SELECT count(*) FROM t;
-|""
-[3]
-
--- 1341
-BEGIN TRANSACTION;
-	CREATE TABLE t (i int);
-	INSERT INTO t VALUES (1), (NULL), (3);
-COMMIT;
-SELECT count() FROM t;
-|""
-[3]
diff --git a/Godeps/_workspace/src/github.com/cznic/sortutil/AUTHORS b/Godeps/_workspace/src/github.com/cznic/sortutil/AUTHORS
deleted file mode 100644
index 0078f5f5b6..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/sortutil/AUTHORS
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/sortutil/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/sortutil/CONTRIBUTORS
deleted file mode 100644
index 9c9a5dd84c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/sortutil/CONTRIBUTORS
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Gary Burd <gary@beagledreams.com>
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/sortutil/LICENSE b/Godeps/_workspace/src/github.com/cznic/sortutil/LICENSE
deleted file mode 100644
index 67983e0e61..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/sortutil/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The sortutil Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/sortutil/Makefile b/Godeps/_workspace/src/github.com/cznic/sortutil/Makefile
deleted file mode 100644
index b77748de93..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/sortutil/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2014 The sortutil Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-.PHONY: all clean editor later nuke todo
-
-grep=--include=*.go
-
-all: editor
-	go vet
-	golint .
-	make todo
-
-clean:
-	go clean
-	rm -f *~
-
-editor:
-	go fmt
-	go test -i
-	go test
-	go build
-
-later:
-	@grep -n $(grep) LATER * || true
-	@grep -n $(grep) MAYBE * || true
-
-nuke: clean
-	go clean -i
-
-todo:
-	@grep -nr $(grep) ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* * || true
-	@grep -nr $(grep) TODO * || true
-	@grep -nr $(grep) BUG * || true
-	@grep -nr $(grep) println * || true
diff --git a/Godeps/_workspace/src/github.com/cznic/sortutil/README b/Godeps/_workspace/src/github.com/cznic/sortutil/README
deleted file mode 100644
index 84ef92ccd0..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/sortutil/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Packages in this repository:
-
-Install: $ go get github.com/cznic/sortutil
-Godocs:  http://godoc.org/github.com/cznic/sortutil
diff --git a/Godeps/_workspace/src/github.com/cznic/sortutil/sortutil.go b/Godeps/_workspace/src/github.com/cznic/sortutil/sortutil.go
deleted file mode 100644
index c0ced542d3..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/sortutil/sortutil.go
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright 2014 The sortutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package sortutil provides utilities supplementing the standard 'sort' package.
-package sortutil
-
-import "sort"
-
-// ByteSlice attaches the methods of sort.Interface to []byte, sorting in increasing order.
-type ByteSlice []byte
-
-func (s ByteSlice) Len() int           { return len(s) }
-func (s ByteSlice) Less(i, j int) bool { return s[i] < s[j] }
-func (s ByteSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s ByteSlice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchBytes searches for x in a sorted slice of bytes and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchBytes(a []byte, x byte) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// Float32Slice attaches the methods of sort.Interface to []float32, sorting in increasing order.
-type Float32Slice []float32
-
-func (s Float32Slice) Len() int           { return len(s) }
-func (s Float32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s Float32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s Float32Slice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchFloat32s searches for x in a sorted slice of float32 and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchFloat32s(a []float32, x float32) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// Int8Slice attaches the methods of sort.Interface to []int8, sorting in increasing order.
-type Int8Slice []int8
-
-func (s Int8Slice) Len() int           { return len(s) }
-func (s Int8Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s Int8Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s Int8Slice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchInt8s searches for x in a sorted slice of int8 and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchInt8s(a []int8, x int8) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// Int16Slice attaches the methods of sort.Interface to []int16, sorting in increasing order.
-type Int16Slice []int16
-
-func (s Int16Slice) Len() int           { return len(s) }
-func (s Int16Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s Int16Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s Int16Slice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchInt16s searches for x in a sorted slice of int16 and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchInt16s(a []int16, x int16) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// Int32Slice attaches the methods of sort.Interface to []int32, sorting in increasing order.
-type Int32Slice []int32
-
-func (s Int32Slice) Len() int           { return len(s) }
-func (s Int32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s Int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s Int32Slice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchInt32s searches for x in a sorted slice of int32 and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchInt32s(a []int32, x int32) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// Int64Slice attaches the methods of sort.Interface to []int64, sorting in increasing order.
-type Int64Slice []int64
-
-func (s Int64Slice) Len() int           { return len(s) }
-func (s Int64Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s Int64Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s Int64Slice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchInt64s searches for x in a sorted slice of int64 and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchInt64s(a []int64, x int64) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// UintSlice attaches the methods of sort.Interface to []uint, sorting in increasing order.
-type UintSlice []uint
-
-func (s UintSlice) Len() int           { return len(s) }
-func (s UintSlice) Less(i, j int) bool { return s[i] < s[j] }
-func (s UintSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s UintSlice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchUints searches for x in a sorted slice of uints and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchUints(a []uint, x uint) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// Uint16Slice attaches the methods of sort.Interface to []uint16, sorting in increasing order.
-type Uint16Slice []uint16
-
-func (s Uint16Slice) Len() int           { return len(s) }
-func (s Uint16Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s Uint16Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s Uint16Slice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchUint16s searches for x in a sorted slice of uint16 and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchUint16s(a []uint16, x uint16) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// Uint32Slice attaches the methods of sort.Interface to []uint32, sorting in increasing order.
-type Uint32Slice []uint32
-
-func (s Uint32Slice) Len() int           { return len(s) }
-func (s Uint32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s Uint32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s Uint32Slice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchUint32s searches for x in a sorted slice of uint32 and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchUint32s(a []uint32, x uint32) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// Uint64Slice attaches the methods of sort.Interface to []uint64, sorting in increasing order.
-type Uint64Slice []uint64
-
-func (s Uint64Slice) Len() int           { return len(s) }
-func (s Uint64Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s Uint64Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s Uint64Slice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchUint64s searches for x in a sorted slice of uint64 and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchUint64s(a []uint64, x uint64) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// RuneSlice attaches the methods of sort.Interface to []rune, sorting in increasing order.
-type RuneSlice []rune
-
-func (s RuneSlice) Len() int           { return len(s) }
-func (s RuneSlice) Less(i, j int) bool { return s[i] < s[j] }
-func (s RuneSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// Sort is a convenience method.
-func (s RuneSlice) Sort() {
-	sort.Sort(s)
-}
-
-// SearchRunes searches for x in a sorted slice of uint64 and returns the index
-// as specified by sort.Search. The slice must be sorted in ascending order.
-func SearchRunes(a []rune, x rune) int {
-	return sort.Search(len(a), func(i int) bool { return a[i] >= x })
-}
-
-// Dedupe returns n, the number of distinct elements in data. The resulting
-// elements are sorted in elements [0, n) or data[:n] for a slice.
-func Dedupe(data sort.Interface) (n int) {
-	if n = data.Len(); n < 2 {
-		return n
-	}
-
-	sort.Sort(data)
-	a, b := 0, 1
-	for b < n {
-		if data.Less(a, b) {
-			a++
-			if a != b {
-				data.Swap(a, b)
-			}
-		}
-		b++
-	}
-	return a + 1
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/strutil/AUTHORS b/Godeps/_workspace/src/github.com/cznic/strutil/AUTHORS
deleted file mode 100644
index d04c450118..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/strutil/AUTHORS
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-CZ.NIC z.s.p.o. <kontakt@nic.cz>
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/strutil/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/strutil/CONTRIBUTORS
deleted file mode 100644
index 5e86f0607c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/strutil/CONTRIBUTORS
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/strutil/LICENSE b/Godeps/_workspace/src/github.com/cznic/strutil/LICENSE
deleted file mode 100644
index 2fdd92cf71..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/strutil/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The strutil Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/strutil/Makefile b/Godeps/_workspace/src/github.com/cznic/strutil/Makefile
deleted file mode 100644
index 0cdf1cf885..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/strutil/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-.PHONY: all clean editor later nuke todo cover cpu
-
-grep=--include=*.go
-target=foo.test
-
-all: editor
-	make todo
-
-clean:
-	go clean
-	rm -f *~
-
-cover:
-	t=$(shell tempfile) ; go test -coverprofile $$t && go tool cover -html $$t && unlink $$t
-
-cpu: $(target)
-	./$< -noerr -test.cpuprofile cpu.out
-	go tool pprof --lines $< cpu.out
-
-editor:
-	go fmt
-	go test -i
-	go test
-	go build
-
-later:
-	@grep -n $(grep) LATER * || true
-	@grep -n $(grep) MAYBE * || true
-
-nuke: clean
-	go clean -i
-
-todo:
-	@grep -nr $(grep) ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alpha:]][[:alnum:]]* * || true
-	@grep -nr $(grep) TODO * || true
-	@grep -nr $(grep) BUG * || true
-	@grep -nr $(grep) [^[:alpha:]]println * || true
diff --git a/Godeps/_workspace/src/github.com/cznic/strutil/README b/Godeps/_workspace/src/github.com/cznic/strutil/README
deleted file mode 100644
index a8652a3dc0..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/strutil/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a goinstall-able mirror of modified code already published at:
-http://git.nic.cz/redmine/projects/gostrutil/repository
-
-Online godoc documentation for this package (should be) available at:
-http://gopkgdoc.appspot.com/pkg/github.com/cznic/strutil
-
-Installation:
-$ go get github.com/cznic/strutil
diff --git a/Godeps/_workspace/src/github.com/cznic/strutil/strutil.go b/Godeps/_workspace/src/github.com/cznic/strutil/strutil.go
deleted file mode 100644
index ba83489df7..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/strutil/strutil.go
+++ /dev/null
@@ -1,428 +0,0 @@
-// Copyright (c) 2014 The sortutil Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package strutil collects utils supplemental to the standard strings package.
-package strutil
-
-import (
-	"bytes"
-	"encoding/base32"
-	"encoding/base64"
-	"fmt"
-	"io"
-	"strings"
-	"sync"
-)
-
-// Base32ExtDecode decodes base32 extended (RFC 4648) text to binary data.
-func Base32ExtDecode(text []byte) (data []byte, err error) {
-	n := base32.HexEncoding.DecodedLen(len(text))
-	data = make([]byte, n)
-	decoder := base32.NewDecoder(base32.HexEncoding, bytes.NewBuffer(text))
-	if n, err = decoder.Read(data); err != nil {
-		n = 0
-	}
-	data = data[:n]
-	return
-}
-
-// Base32ExtEncode encodes binary data to base32 extended (RFC 4648) encoded text.
-func Base32ExtEncode(data []byte) (text []byte) {
-	n := base32.HexEncoding.EncodedLen(len(data))
-	buf := bytes.NewBuffer(make([]byte, 0, n))
-	encoder := base32.NewEncoder(base32.HexEncoding, buf)
-	encoder.Write(data)
-	encoder.Close()
-	if buf.Len() != n {
-		panic("internal error")
-	}
-	return buf.Bytes()
-}
-
-// Base64Decode decodes base64 text to binary data.
-func Base64Decode(text []byte) (data []byte, err error) {
-	n := base64.StdEncoding.DecodedLen(len(text))
-	data = make([]byte, n)
-	decoder := base64.NewDecoder(base64.StdEncoding, bytes.NewBuffer(text))
-	if n, err = decoder.Read(data); err != nil {
-		n = 0
-	}
-	data = data[:n]
-	return
-}
-
-// Base64Encode encodes binary data to base64 encoded text.
-func Base64Encode(data []byte) (text []byte) {
-	n := base64.StdEncoding.EncodedLen(len(data))
-	buf := bytes.NewBuffer(make([]byte, 0, n))
-	encoder := base64.NewEncoder(base64.StdEncoding, buf)
-	encoder.Write(data)
-	encoder.Close()
-	if buf.Len() != n {
-		panic("internal error")
-	}
-	return buf.Bytes()
-}
-
-// Formatter is an io.Writer extended by a fmt.Printf like function Format
-type Formatter interface {
-	io.Writer
-	Format(format string, args ...interface{}) (n int, errno error)
-}
-
-type indentFormatter struct {
-	io.Writer
-	indent      []byte
-	indentLevel int
-	state       int
-}
-
-const (
-	st0 = iota
-	stBOL
-	stPERC
-	stBOL_PERC
-)
-
-// IndentFormatter returns a new Formatter which interprets %i and %u in the
-// Format() format string as indent and undent commands. The commands can
-// nest. The Formatter writes to io.Writer 'w' and inserts one 'indent'
-// string per current indent level value.
-// Behaviour of commands reaching negative indent levels is undefined.
-//	IndentFormatter(os.Stdout, "\t").Format("abc%d%%e%i\nx\ny\n%uz\n", 3)
-// output:
-//	abc3%e
-//		x
-//		y
-//	z
-// The Go quoted string literal form of the above is:
-//	"abc%%e\n\tx\n\tx\nz\n"
-// The commands can be scattered between separate invocations of Format(),
-// i.e. the formatter keeps track of the indent level and knows if it is
-// positioned on start of a line and should emit indentation(s).
-// The same output as above can be produced by e.g.:
-//	f := IndentFormatter(os.Stdout, " ")
-//	f.Format("abc%d%%e%i\nx\n", 3)
-//	f.Format("y\n%uz\n")
-func IndentFormatter(w io.Writer, indent string) Formatter {
-	return &indentFormatter{w, []byte(indent), 0, stBOL}
-}
-
-func (f *indentFormatter) format(flat bool, format string, args ...interface{}) (n int, errno error) {
-	buf := []byte{}
-	for i := 0; i < len(format); i++ {
-		c := format[i]
-		switch f.state {
-		case st0:
-			switch c {
-			case '\n':
-				cc := c
-				if flat && f.indentLevel != 0 {
-					cc = ' '
-				}
-				buf = append(buf, cc)
-				f.state = stBOL
-			case '%':
-				f.state = stPERC
-			default:
-				buf = append(buf, c)
-			}
-		case stBOL:
-			switch c {
-			case '\n':
-				cc := c
-				if flat && f.indentLevel != 0 {
-					cc = ' '
-				}
-				buf = append(buf, cc)
-			case '%':
-				f.state = stBOL_PERC
-			default:
-				if !flat {
-					for i := 0; i < f.indentLevel; i++ {
-						buf = append(buf, f.indent...)
-					}
-				}
-				buf = append(buf, c)
-				f.state = st0
-			}
-		case stBOL_PERC:
-			switch c {
-			case 'i':
-				f.indentLevel++
-				f.state = stBOL
-			case 'u':
-				f.indentLevel--
-				f.state = stBOL
-			default:
-				if !flat {
-					for i := 0; i < f.indentLevel; i++ {
-						buf = append(buf, f.indent...)
-					}
-				}
-				buf = append(buf, '%', c)
-				f.state = st0
-			}
-		case stPERC:
-			switch c {
-			case 'i':
-				f.indentLevel++
-				f.state = st0
-			case 'u':
-				f.indentLevel--
-				f.state = st0
-			default:
-				buf = append(buf, '%', c)
-				f.state = st0
-			}
-		default:
-			panic("unexpected state")
-		}
-	}
-	switch f.state {
-	case stPERC, stBOL_PERC:
-		buf = append(buf, '%')
-	}
-	return f.Write([]byte(fmt.Sprintf(string(buf), args...)))
-}
-
-func (f *indentFormatter) Format(format string, args ...interface{}) (n int, errno error) {
-	return f.format(false, format, args...)
-}
-
-type flatFormatter indentFormatter
-
-// FlatFormatter returns a newly created Formatter with the same functionality as the one returned
-// by IndentFormatter except it allows a newline in the 'format' string argument of Format
-// to pass through iff indent level is currently zero.
-//
-// If indent level is non-zero then such new lines are changed to a space character.
-// There is no indent string, the %i and %u format verbs are used solely to determine the indent level.
-//
-// The FlatFormatter is intended for flattening of normally nested structure textual representation to
-// a one top level structure per line form.
-//	FlatFormatter(os.Stdout, " ").Format("abc%d%%e%i\nx\ny\n%uz\n", 3)
-// output in the form of a Go quoted string literal:
-//	"abc3%%e x y z\n"
-func FlatFormatter(w io.Writer) Formatter {
-	return (*flatFormatter)(IndentFormatter(w, "").(*indentFormatter))
-}
-
-func (f *flatFormatter) Format(format string, args ...interface{}) (n int, errno error) {
-	return (*indentFormatter)(f).format(true, format, args...)
-}
-
-// Pool handles aligning of strings having equal values to the same string instance.
-// Intended use is to conserve some memory e.g. where a large number of identically valued strings
-// with non identical backing arrays may exists in several semantically distinct instances of some structs.
-// Pool is *not* concurrent access safe. It doesn't handle common prefix/suffix aligning,
-// e.g. having s1 == "abc" and s2 == "bc", s2 is not automatically aligned as s1[1:].
-type Pool struct {
-	pool map[string]string
-}
-
-// NewPool returns a newly created Pool.
-func NewPool() *Pool {
-	return &Pool{map[string]string{}}
-}
-
-// Align returns a string with the same value as its argument. It guarantees that
-// all aligned strings share a single instance in memory.
-func (p *Pool) Align(s string) string {
-	if a, ok := p.pool[s]; ok {
-		return a
-	}
-
-	s = StrPack(s)
-	p.pool[s] = s
-	return s
-}
-
-// Count returns the number of items in the pool.
-func (p *Pool) Count() int {
-	return len(p.pool)
-}
-
-// GoPool is a concurrent access safe version of Pool.
-type GoPool struct {
-	pool map[string]string
-	rwm  *sync.RWMutex
-}
-
-// NewGoPool returns a newly created GoPool.
-func NewGoPool() (p *GoPool) {
-	return &GoPool{map[string]string{}, &sync.RWMutex{}}
-}
-
-// Align returns a string with the same value as its argument. It guarantees that
-// all aligned strings share a single instance in memory.
-func (p *GoPool) Align(s string) (y string) {
-	if s != "" {
-		p.rwm.RLock()               // R++
-		if a, ok := p.pool[s]; ok { // found
-			p.rwm.RUnlock() // R--
-			return a
-		}
-
-		p.rwm.RUnlock() // R--
-		// not found but with a race condition, retry within a write lock
-		p.rwm.Lock()                // W++
-		defer p.rwm.Unlock()        // W--
-		if a, ok := p.pool[s]; ok { // done in a race
-			return a
-		}
-
-		// we won
-		s = StrPack(s)
-		p.pool[s] = s
-		return s
-	}
-
-	return
-}
-
-// Count returns the number of items in the pool.
-func (p *GoPool) Count() int {
-	return len(p.pool)
-}
-
-// Dict is a string <-> id bijection. Dict is *not* concurrent access safe for assigning new ids
-// to strings not yet contained in the bijection.
-// Id for an empty string is guaranteed to be 0,
-// thus Id for any non empty string is guaranteed to be non zero.
-type Dict struct {
-	si map[string]int
-	is []string
-}
-
-// NewDict returns a newly created Dict.
-func NewDict() (d *Dict) {
-	d = &Dict{map[string]int{}, []string{}}
-	d.Id("")
-	return
-}
-
-// Count returns the number of items in the dict.
-func (d *Dict) Count() int {
-	return len(d.is)
-}
-
-// Id maps string s to its numeric identificator.
-func (d *Dict) Id(s string) (y int) {
-	if y, ok := d.si[s]; ok {
-		return y
-	}
-
-	s = StrPack(s)
-	y = len(d.is)
-	d.si[s] = y
-	d.is = append(d.is, s)
-	return
-}
-
-// S maps an id to its string value and ok == true. Id values not contained in the bijection
-// return "", false.
-func (d *Dict) S(id int) (s string, ok bool) {
-	if id >= len(d.is) {
-		return "", false
-	}
-	return d.is[id], true
-}
-
-// GoDict is a concurrent access safe version of Dict.
-type GoDict struct {
-	si  map[string]int
-	is  []string
-	rwm *sync.RWMutex
-}
-
-// NewGoDict returns a newly created GoDict.
-func NewGoDict() (d *GoDict) {
-	d = &GoDict{map[string]int{}, []string{}, &sync.RWMutex{}}
-	d.Id("")
-	return
-}
-
-// Count returns the number of items in the dict.
-func (d *GoDict) Count() int {
-	return len(d.is)
-}
-
-// Id maps string s to its numeric identificator. The implementation honors getting
-// an existing id at the cost of assigning a new one.
-func (d *GoDict) Id(s string) (y int) {
-	d.rwm.RLock()             // R++
-	if y, ok := d.si[s]; ok { // found
-		d.rwm.RUnlock() // R--
-		return y
-	}
-
-	d.rwm.RUnlock() // R--
-
-	// not found but with a race condition
-	d.rwm.Lock()              // W++ recheck with write lock
-	defer d.rwm.Unlock()      // W--
-	if y, ok := d.si[s]; ok { // some other goroutine won already
-		return y
-	}
-
-	// a race free not found state => insert the string
-	s = StrPack(s)
-	y = len(d.is)
-	d.si[s] = y
-	d.is = append(d.is, s)
-	return
-}
-
-// S maps an id to its string value and ok == true. Id values not contained in the bijection
-// return "", false.
-func (d *GoDict) S(id int) (s string, ok bool) {
-	d.rwm.RLock()         // R++
-	defer d.rwm.RUnlock() // R--
-	if id >= len(d.is) {
-		return "", false
-	}
-	return d.is[id], true
-}
-
-// StrPack returns a new instance of s which is tightly packed in memory.
-// It is intended for avoiding the situation where having a live reference
-// to a string slice over an unreferenced biger underlying string keeps the biger one
-// in memory anyway - it can't be GCed.
-func StrPack(s string) string {
-	return string([]byte(s))
-}
-
-// JoinFields returns strings in flds joined by sep. Flds may contain arbitrary
-// bytes, including the sep as they are safely escaped. JoinFields panics if
-// sep is the backslash character or if len(sep) != 1.
-func JoinFields(flds []string, sep string) string {
-	if len(sep) != 1 || sep == "\\" {
-		panic("invalid separator")
-	}
-
-	a := make([]string, len(flds))
-	for i, v := range flds {
-		v = strings.Replace(v, "\\", "\\0", -1)
-		a[i] = strings.Replace(v, sep, "\\1", -1)
-	}
-	return strings.Join(a, sep)
-}
-
-// SplitFields splits s, which must be produced by JoinFields using the same
-// sep, into flds.  SplitFields panics if sep is the backslash character or if
-// len(sep) != 1.
-func SplitFields(s, sep string) (flds []string) {
-	if len(sep) != 1 || sep == "\\" {
-		panic("invalid separator")
-	}
-
-	a := strings.Split(s, sep)
-	r := make([]string, len(a))
-	for i, v := range a {
-		v = strings.Replace(v, "\\1", sep, -1)
-		r[i] = strings.Replace(v, "\\0", "\\", -1)
-	}
-	return r
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/AUTHORS b/Godeps/_workspace/src/github.com/cznic/zappy/AUTHORS
deleted file mode 100644
index 22c8397d5f..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/AUTHORS
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file lists authors for copyright purposes.  This file is distinct from
-# the CONTRIBUTORS files.  See the latter for an explanation.
-#
-# Names should be added to this file as:
-#     Name or Organization <email address>
-#
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
-The Snappy-Go Authors
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/CONTRIBUTORS b/Godeps/_workspace/src/github.com/cznic/zappy/CONTRIBUTORS
deleted file mode 100644
index 7693bdab74..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/CONTRIBUTORS
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file lists people who contributed code to this repository.  The AUTHORS
-# file lists the copyright holders; this file lists people.
-#
-# Names should be added to this file like so:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Jan Mercl <0xjnml@gmail.com>
-Mathieu Lonjaret <mathieu.lonjaret@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/LICENSE b/Godeps/_workspace/src/github.com/cznic/zappy/LICENSE
deleted file mode 100644
index bc67059c52..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The zappy Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the authors nor the names of the
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/Makefile b/Godeps/_workspace/src/github.com/cznic/zappy/Makefile
deleted file mode 100644
index c6726d13e0..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2014 The zappy Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-all: editor
-	go tool vet -printfuncs Log:0,Logf:0 .
-	golint .
-	go install
-	make todo
-
-editor:
-	go fmt
-	go test -i
-	@#go test
-	./purego.sh
-
-todo:
-	@grep -n ^[[:space:]]*_[[:space:]]*=[[:space:]][[:alnum:]] *.go || true
-	@grep -n TODO *.go || true
-	@grep -n BUG *.go || true
-	@grep -n println *.go || true
-
-clean:
-	rm -f *~ cov cov.html
-
-gocov:
-	gocov test $(COV) | gocov-html > cov.html
-
-bench:
-	go test -run NONE -bench B
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/README.md b/Godeps/_workspace/src/github.com/cznic/zappy/README.md
deleted file mode 100644
index 6fc6f68a70..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-zappy
-=====
-
-Package zappy implements the zappy block-based compression format.  It aims for
-a combination of good speed and reasonable compression.
-
-Installation: $ go get github.com/cznic/zappy
-
-Documentation: [godoc.org/github.com/cznic/zappy](http://godoc.org/github.com/cznic/zappy)
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/SNAPPY-GO-LICENSE b/Godeps/_workspace/src/github.com/cznic/zappy/SNAPPY-GO-LICENSE
deleted file mode 100644
index 6050c10f4c..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/SNAPPY-GO-LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 The Snappy-Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/decode.go b/Godeps/_workspace/src/github.com/cznic/zappy/decode.go
deleted file mode 100644
index 867c8deea5..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/decode.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 The zappy Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the SNAPPY-GO-LICENSE file.
-
-package zappy
-
-import (
-	"encoding/binary"
-	"errors"
-)
-
-// ErrCorrupt reports that the input is invalid.
-var ErrCorrupt = errors.New("zappy: corrupt input")
-
-// DecodedLen returns the length of the decoded block.
-func DecodedLen(src []byte) (int, error) {
-	v, _, err := decodedLen(src)
-	return v, err
-}
-
-// decodedLen returns the length of the decoded block and the number of bytes
-// that the length header occupied.
-func decodedLen(src []byte) (blockLen, headerLen int, err error) {
-	v, n := binary.Uvarint(src)
-	if n == 0 {
-		return 0, 0, ErrCorrupt
-	}
-
-	if uint64(int(v)) != v {
-		return 0, 0, errors.New("zappy: decoded block is too large")
-	}
-
-	return int(v), n, nil
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/decode_cgo.go b/Godeps/_workspace/src/github.com/cznic/zappy/decode_cgo.go
deleted file mode 100644
index 993c99242b..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/decode_cgo.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2014 The zappy Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the SNAPPY-GO-LICENSE file.
-
-// +build cgo,!purego
-
-package zappy
-
-/*
-
-#include <stdint.h>
-#include <string.h>
-
-// supports only uint32 encoded values
-int uvarint(unsigned int* n, uint8_t* src, int len) {
-	int r = 0;
-	unsigned int v = 0;
-	unsigned int s = 0;
-	while ((len-- != 0) && (++r <= 5)) {
-		uint8_t b = *src++;
-		v = v | ((b&0x7f)<<s);
-		if (b < 0x80) {
-			*n = v;
-			return r;
-		}
-
-		s += 7;
-	}
-	return -1;
-}
-
-int varint(int* n, uint8_t* src, int len) {
-	unsigned int u;
-	int i = uvarint(&u, src, len);
-	int x = u>>1;
-	if ((u&1) != 0)
-		x = ~x;
-	*n = x;
-	return i;
-}
-
-int decode(int s, int len_src, uint8_t* src, int len_dst, uint8_t* dst) {
-	int d = 0;
-	int length;
-	while (s < len_src) {
-		int n, i = varint(&n, src+s, len_src-s);
-		if (i <= 0) {
-			return -1;
-		}
-
-		s += i;
-		if (n >= 0) {
-			length = n+1;
-			if ((length > len_dst-d) || (length > len_src-s))
-				return -1;
-
-			memcpy(dst+d, src+s, length);
-			d += length;
-			s += length;
-			continue;
-		}
-
-
-		length = -n;
-		int offset;
-		i = uvarint((unsigned int*)(&offset), src+s, len_src-s);
-		if (i <= 0)
-			return -1;
-
-		s += i;
-		if (s > len_src)
-			return -1;
-
-		int end = d+length;
-		if ((offset > d) || (end > len_dst))
-			return -1;
-
-		for( ; d < end; d++)
-			*(dst+d) = *(dst+d-offset);
-	}
-	return d;
-}
-
-*/
-import "C"
-
-func puregoDecode() bool { return false }
-
-// Decode returns the decoded form of src. The returned slice may be a sub-
-// slice of buf if buf was large enough to hold the entire decoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil buf.
-func Decode(buf, src []byte) ([]byte, error) {
-	dLen, s, err := decodedLen(src)
-	if err != nil {
-		return nil, err
-	}
-
-	if dLen == 0 {
-		if len(src) == 1 {
-			return nil, nil
-		}
-
-		return nil, ErrCorrupt
-	}
-
-	if len(buf) < dLen {
-		buf = make([]byte, dLen)
-	}
-
-	d := int(C.decode(C.int(s), C.int(len(src)), (*C.uint8_t)(&src[0]), C.int(len(buf)), (*C.uint8_t)(&buf[0])))
-	if d != dLen {
-		return nil, ErrCorrupt
-	}
-
-	return buf[:d], nil
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/decode_nocgo.go b/Godeps/_workspace/src/github.com/cznic/zappy/decode_nocgo.go
deleted file mode 100644
index 75b782f8fa..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/decode_nocgo.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2014 The zappy Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the SNAPPY-GO-LICENSE file.
-
-// +build !cgo purego
-
-package zappy
-
-import (
-	"encoding/binary"
-)
-
-func puregoDecode() bool { return true }
-
-// Decode returns the decoded form of src. The returned slice may be a sub-
-// slice of buf if buf was large enough to hold the entire decoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil buf.
-func Decode(buf, src []byte) ([]byte, error) {
-	dLen, s, err := decodedLen(src)
-	if err != nil {
-		return nil, err
-	}
-
-	if dLen == 0 {
-		if len(src) == 1 {
-			return nil, nil
-		}
-
-		return nil, ErrCorrupt
-	}
-
-	if len(buf) < dLen {
-		buf = make([]byte, dLen)
-	}
-
-	var d, offset, length int
-	for s < len(src) {
-		n, i := binary.Varint(src[s:])
-		if i <= 0 {
-			return nil, ErrCorrupt
-		}
-
-		s += i
-		if n >= 0 {
-			length = int(n + 1)
-			if length > len(buf)-d || length > len(src)-s {
-				return nil, ErrCorrupt
-			}
-
-			copy(buf[d:], src[s:s+length])
-			d += length
-			s += length
-			continue
-		}
-
-		length = int(-n)
-		off64, i := binary.Uvarint(src[s:])
-		if i <= 0 {
-			return nil, ErrCorrupt
-		}
-
-		offset = int(off64)
-		s += i
-		if s > len(src) {
-			return nil, ErrCorrupt
-		}
-
-		end := d + length
-		if offset > d || end > len(buf) {
-			return nil, ErrCorrupt
-		}
-
-		for s, v := range buf[d-offset : end-offset] {
-			buf[d+s] = v
-		}
-		d = end
-
-	}
-	if d != dLen {
-		return nil, ErrCorrupt
-	}
-
-	return buf[:d], nil
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/encode.go b/Godeps/_workspace/src/github.com/cznic/zappy/encode.go
deleted file mode 100644
index 27ceba03b8..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/encode.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 The zappy Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the SNAPPY-GO-LICENSE file.
-
-package zappy
-
-import (
-	"encoding/binary"
-)
-
-// We limit how far copy back-references can go, the same as the snappy C++
-// code.
-const maxOffset = 1 << 20
-
-// emitCopy writes a copy chunk and returns the number of bytes written.
-func emitCopy(dst []byte, offset, length int) (n int) {
-	n = binary.PutVarint(dst, int64(-length))
-	n += binary.PutUvarint(dst[n:], uint64(offset))
-	return
-}
-
-// emitLiteral writes a literal chunk and returns the number of bytes written.
-func emitLiteral(dst, lit []byte) (n int) {
-	n = binary.PutVarint(dst, int64(len(lit)-1))
-	n += copy(dst[n:], lit)
-	return
-}
-
-// MaxEncodedLen returns the maximum length of a zappy block, given its
-// uncompressed length.
-func MaxEncodedLen(srcLen int) int {
-	return 10 + srcLen
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/encode_cgo.go b/Godeps/_workspace/src/github.com/cznic/zappy/encode_cgo.go
deleted file mode 100644
index 6c343f58eb..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/encode_cgo.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2014 The zappy Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the SNAPPY-GO-LICENSE file.
-
-// +build cgo,!purego
-
-package zappy
-
-/*
-
-#include <stdint.h>
-#include <string.h>
-
-#define MAXOFFSET 1<<20
-
-int putUvarint(uint8_t* buf, unsigned int x) {
-	int i = 1;
-	for (; x >= 0x80; i++) {
-		*buf++ = x|0x80;
-		x >>= 7;
-	}
-	*buf = x;
-	return i;
-}
-
-int putVarint(uint8_t* buf, int x) {
-	unsigned int ux = x << 1;
-	if (x < 0)
-		ux = ~ux;
-	return putUvarint(buf, ux);
-}
-
-int emitLiteral(uint8_t* dst, uint8_t* lit, int len_lit) {
-	int n = putVarint(dst, len_lit-1);
-	memcpy(dst+n, lit, len_lit);
-	return n+len_lit;
-}
-
-int emitCopy(uint8_t* dst, int off, int len) {
-	int n = putVarint(dst, -len);
-	return n+putUvarint(dst+n, (unsigned int)off);
-}
-
-int encode(int d, uint8_t* dst, uint8_t* src, int len_src) {
-	int table[1<<12];
-	int s = 0;
-	int t = 0;
-	int lit = 0;
-	int lim = 0;
-	memset(table, 0, sizeof(table));
-	for (lim = len_src-3; s < lim; ) {
-		// Update the hash table.
-		uint32_t b0 = src[s];
-		uint32_t b1 = src[s+1];
-		uint32_t b2 = src[s+2];
-		uint32_t b3 = src[s+3];
-		uint32_t h = b0 | (b1<<8) | (b2<<16) | (b3<<24);
-		uint32_t i;
-more:
-		i = (h*0x1e35a7bd)>>20;
-		t = table[i];
-		table[i] = s;
-		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-		if ((t == 0) || (s-t >= MAXOFFSET) || (b0 != src[t]) || (b1 != src[t+1]) || (b2 != src[t+2]) || (b3 != src[t+3])) {
-			s++;
-			if (s >= lim)
-				break;
-
-			b0 = b1;
-			b1 = b2;
-			b2 = b3;
-			b3 = src[s+3];
-			h = (h>>8) | ((b3)<<24);
-			goto more;
-		}
-
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if (lit != s) {
-			d += emitLiteral(dst+d, src+lit, s-lit);
-		}
-		// Extend the match to be as long as possible.
-		int s0 = s;
-		s += 4;
-		t += 4;
-		while ((s < len_src) && (src[s] == src[t])) {
-			s++;
-			t++;
-		}
-		d += emitCopy(dst+d, s-t, s-s0);
-		lit = s;
-	}
-	// Emit any final pending literal bytes and return.
-	if (lit != len_src) {
-		d += emitLiteral(dst+d, src+lit, len_src-lit);
-	}
-	return d;
-}
-
-*/
-import "C"
-
-import (
-	"encoding/binary"
-	"fmt"
-	"math"
-)
-
-func puregoEncode() bool { return false }
-
-// Encode returns the encoded form of src. The returned slice may be a sub-
-// slice of buf if buf was large enough to hold the entire encoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil buf.
-func Encode(buf, src []byte) ([]byte, error) {
-	if n := MaxEncodedLen(len(src)); len(buf) < n {
-		buf = make([]byte, n)
-	}
-
-	if len(src) > math.MaxInt32 {
-		return nil, fmt.Errorf("zappy.Encode: too long data: %d bytes", len(src))
-	}
-
-	// The block starts with the varint-encoded length of the decompressed bytes.
-	d := binary.PutUvarint(buf, uint64(len(src)))
-
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			d += emitLiteral(buf[d:], src)
-		}
-		return buf[:d], nil
-	}
-
-	d = int(C.encode(C.int(d), (*C.uint8_t)(&buf[0]), (*C.uint8_t)(&src[0]), C.int(len(src))))
-	return buf[:d], nil
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/encode_nocgo.go b/Godeps/_workspace/src/github.com/cznic/zappy/encode_nocgo.go
deleted file mode 100644
index 1d1df44395..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/encode_nocgo.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2014 The zappy Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the SNAPPY-GO-LICENSE file.
-
-// +build !cgo purego
-
-package zappy
-
-import (
-	"encoding/binary"
-	"fmt"
-	"math"
-)
-
-func puregoEncode() bool { return true }
-
-// Encode returns the encoded form of src. The returned slice may be a sub-
-// slice of buf if buf was large enough to hold the entire encoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil buf.
-func Encode(buf, src []byte) ([]byte, error) {
-	if n := MaxEncodedLen(len(src)); len(buf) < n {
-		buf = make([]byte, n)
-	}
-
-	if len(src) > math.MaxInt32 {
-		return nil, fmt.Errorf("zappy.Encode: too long data: %d bytes", len(src))
-	}
-
-	// The block starts with the varint-encoded length of the decompressed bytes.
-	d := binary.PutUvarint(buf, uint64(len(src)))
-
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			d += emitLiteral(buf[d:], src)
-		}
-		return buf[:d], nil
-	}
-
-	// Iterate over the source bytes.
-	var (
-		table [1 << 12]int // Hash table
-		s     int          // The iterator position.
-		t     int          // The last position with the same hash as s.
-		lit   int          // The start position of any pending literal bytes.
-	)
-	for lim := len(src) - 3; s < lim; {
-		// Update the hash table.
-		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
-		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
-	more:
-		p := &table[(h*0x1e35a7bd)>>20]
-		t, *p = *p, s
-		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-		if t == 0 || s-t >= maxOffset || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
-			s++
-			if s >= lim {
-				break
-			}
-
-			b0, b1, b2, b3 = b1, b2, b3, src[s+3]
-			h = h>>8 | uint32(b3)<<24
-			goto more
-		}
-
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			d += emitLiteral(buf[d:], src[lit:s])
-		}
-		// Extend the match to be as long as possible.
-		s0 := s
-		s, t = s+4, t+4
-		for s < len(src) && src[s] == src[t] {
-			s++
-			t++
-		}
-		// Emit the copied bytes.
-		d += emitCopy(buf[d:], s-t, s-s0)
-		lit = s
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		d += emitLiteral(buf[d:], src[lit:])
-	}
-	return buf[:d], nil
-}
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/purego.sh b/Godeps/_workspace/src/github.com/cznic/zappy/purego.sh
deleted file mode 100644
index e2fec14e63..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/purego.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2014 The zappy Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-set -e
-set -v
-
-CGO_ENABLED=0 go test -purego true
-CGO_ENABLED=0 go test -purego true -tags purego 
-CGO_ENABLED=1 go test -purego false
-CGO_ENABLED=1 go test -purego true -tags purego 
diff --git a/Godeps/_workspace/src/github.com/cznic/zappy/zappy.go b/Godeps/_workspace/src/github.com/cznic/zappy/zappy.go
deleted file mode 100644
index 760df34a15..0000000000
--- a/Godeps/_workspace/src/github.com/cznic/zappy/zappy.go
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright 2014 The zappy Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the SNAPPY-GO-LICENSE file.
-
-/*
-Package zappy implements the zappy block-based compression format.  It aims for
-a combination of good speed and reasonable compression.
-
-Zappy is a format incompatible, API compatible fork of snappy-go[1]. The C++
-snappy implementation is at [2].
-
-Reasons for the fork
-
-The snappy compression is pretty good. Yet it has one problem built into its
-format definition[3] - the maximum length of a copy "instruction" is 64 bytes.
-For some specific usage patterns with long runs of repeated data, it turns out
-the compression is suboptimal. For example a 1:1000 "sparseness" 64kB bit index
-with only few set bits is compressed to about 3kB (about 1000 of 64B copy, 3
-byte "instructions").
-
-Format description
-
-Zappy uses much less complicated format than snappy. Each encoded block begins
-with the uvarint-encoded[4] length of the decoded data, followed by a sequence
-of chunks. Chunks begin and end on byte boundaries. The chunk starts with a
-varint encoded number N:
-
-	N >= 0: N+1 literal bytes follow.
-
-	N < 0: copy -N bytes, starting at offset M (in the following uvarint).
-
-Performance issues
-
-Compression rate is roughly the same as of snappy for the reference data set:
-
-                  testdata/html: snappy   23320, zappy   22943, 0.984, orig  102400
-              testdata/urls.10K: snappy  334437, zappy  355163, 1.062, orig  702087
-             testdata/house.jpg: snappy  126711, zappy  126694, 1.000, orig  126958
-  testdata/mapreduce-osdi-1.pdf: snappy   77227, zappy   77646, 1.005, orig   94330
-              testdata/html_x_4: snappy   92350, zappy   22956, 0.249, orig  409600
-               testdata/cp.html: snappy   11938, zappy   12961, 1.086, orig   24603
-              testdata/fields.c: snappy    4825, zappy    5395, 1.118, orig   11150
-           testdata/grammar.lsp: snappy    1814, zappy    1933, 1.066, orig    3721
-           testdata/kennedy.xls: snappy  423518, zappy  440597, 1.040, orig 1029744
-           testdata/alice29.txt: snappy   89550, zappy  104016, 1.162, orig  152089
-          testdata/asyoulik.txt: snappy   79583, zappy   91345, 1.148, orig  125179
-            testdata/lcet10.txt: snappy  238761, zappy  275488, 1.154, orig  426754
-          testdata/plrabn12.txt: snappy  324567, zappy  376885, 1.161, orig  481861
-                  testdata/ptt5: snappy   96350, zappy   91465, 0.949, orig  513216
-                   testdata/sum: snappy   18927, zappy   20015, 1.057, orig   38240
-               testdata/xargs.1: snappy    2532, zappy    2793, 1.103, orig    4227
-         testdata/geo.protodata: snappy   23362, zappy   20759, 0.889, orig  118588
-             testdata/kppkn.gtb: snappy   73962, zappy   87200, 1.179, orig  184320
-                          TOTAL: snappy 2043734, zappy 2136254, 1.045, orig 4549067
-
-Zappy has better RLE handling (1/1000+1 non zero bytes in each index):
-
-     Sparse bit index      16 B: snappy       9, zappy       9, 1.000
-     Sparse bit index      32 B: snappy      10, zappy      10, 1.000
-     Sparse bit index      64 B: snappy      11, zappy      10, 0.909
-     Sparse bit index     128 B: snappy      16, zappy      14, 0.875
-     Sparse bit index     256 B: snappy      22, zappy      14, 0.636
-     Sparse bit index     512 B: snappy      36, zappy      16, 0.444
-     Sparse bit index    1024 B: snappy      57, zappy      18, 0.316
-     Sparse bit index    2048 B: snappy     111, zappy      32, 0.288
-     Sparse bit index    4096 B: snappy     210, zappy      31, 0.148
-     Sparse bit index    8192 B: snappy     419, zappy      75, 0.179
-     Sparse bit index   16384 B: snappy     821, zappy     138, 0.168
-     Sparse bit index   32768 B: snappy    1627, zappy     232, 0.143
-     Sparse bit index   65536 B: snappy    3243, zappy     451, 0.139
-
-When compiled with CGO_ENABLED=1, zappy is now faster than snappy-go.
-Old=snappy-go, new=zappy:
-
- benchmark                   old MB/s     new MB/s  speedup
- BenchmarkWordsDecode1e3       148.98       189.04    1.27x
- BenchmarkWordsDecode1e4       150.29       182.51    1.21x
- BenchmarkWordsDecode1e5       145.79       182.95    1.25x
- BenchmarkWordsDecode1e6       167.43       187.69    1.12x
- BenchmarkWordsEncode1e3        47.11       145.69    3.09x
- BenchmarkWordsEncode1e4        81.47       136.50    1.68x
- BenchmarkWordsEncode1e5        78.86       127.93    1.62x
- BenchmarkWordsEncode1e6        96.81       142.95    1.48x
- Benchmark_UFlat0              316.87       463.19    1.46x
- Benchmark_UFlat1              231.56       350.32    1.51x
- Benchmark_UFlat2             3656.68      8258.39    2.26x
- Benchmark_UFlat3              892.56      1270.09    1.42x
- Benchmark_UFlat4              315.84       959.08    3.04x
- Benchmark_UFlat5              211.70       301.55    1.42x
- Benchmark_UFlat6              211.59       258.29    1.22x
- Benchmark_UFlat7              209.80       272.21    1.30x
- Benchmark_UFlat8              254.59       301.70    1.19x
- Benchmark_UFlat9              163.39       192.66    1.18x
- Benchmark_UFlat10             155.46       189.70    1.22x
- Benchmark_UFlat11             170.11       198.95    1.17x
- Benchmark_UFlat12             148.32       178.78    1.21x
- Benchmark_UFlat13             359.25       579.99    1.61x
- Benchmark_UFlat14             197.27       291.33    1.48x
- Benchmark_UFlat15             185.75       248.07    1.34x
- Benchmark_UFlat16             362.74       582.66    1.61x
- Benchmark_UFlat17             222.95       240.01    1.08x
- Benchmark_ZFlat0              188.66       311.89    1.65x
- Benchmark_ZFlat1              101.46       201.34    1.98x
- Benchmark_ZFlat2               93.62       244.50    2.61x
- Benchmark_ZFlat3              102.79       243.34    2.37x
- Benchmark_ZFlat4              191.64       625.32    3.26x
- Benchmark_ZFlat5              103.09       169.39    1.64x
- Benchmark_ZFlat6              110.35       182.57    1.65x
- Benchmark_ZFlat7               89.56       190.53    2.13x
- Benchmark_ZFlat8              154.05       235.68    1.53x
- Benchmark_ZFlat9               87.58       133.51    1.52x
- Benchmark_ZFlat10              82.08       127.51    1.55x
- Benchmark_ZFlat11              91.36       138.91    1.52x
- Benchmark_ZFlat12              79.24       123.02    1.55x
- Benchmark_ZFlat13             217.04       374.26    1.72x
- Benchmark_ZFlat14             100.33       168.03    1.67x
- Benchmark_ZFlat15              80.79       160.46    1.99x
- Benchmark_ZFlat16             213.32       375.79    1.76x
- Benchmark_ZFlat17             135.37       197.13    1.46x
-
-The package builds with CGO_ENABLED=0 as well, but the performance is worse.
-
-
- $ CGO_ENABLED=0 go test -test.run=NONE -test.bench=. > old.benchcmp
- $ CGO_ENABLED=1 go test -test.run=NONE -test.bench=. > new.benchcmp
- $ benchcmp old.benchcmp new.benchcmp
- benchmark                  old ns/op    new ns/op    delta
- BenchmarkWordsDecode1e3         9735         5288  -45.68%
- BenchmarkWordsDecode1e4       100229        55369  -44.76%
- BenchmarkWordsDecode1e5      1037611       546420  -47.34%
- BenchmarkWordsDecode1e6      9559352      5335307  -44.19%
- BenchmarkWordsEncode1e3        16206         6629  -59.10%
- BenchmarkWordsEncode1e4       140283        73161  -47.85%
- BenchmarkWordsEncode1e5      1476657       781756  -47.06%
- BenchmarkWordsEncode1e6     12702229      6997656  -44.91%
- Benchmark_UFlat0              397307       221198  -44.33%
- Benchmark_UFlat1             3890483      2008341  -48.38%
- Benchmark_UFlat2               35810        15398  -57.00%
- Benchmark_UFlat3              140850        74194  -47.32%
- Benchmark_UFlat4              814575       426783  -47.61%
- Benchmark_UFlat5              156995        81473  -48.10%
- Benchmark_UFlat6               77645        43161  -44.41%
- Benchmark_UFlat7               25415        13579  -46.57%
- Benchmark_UFlat8             6372440      3412916  -46.44%
- Benchmark_UFlat9             1453679       789956  -45.66%
- Benchmark_UFlat10            1243146       660747  -46.85%
- Benchmark_UFlat11            3903493      2146334  -45.02%
- Benchmark_UFlat12            5106250      2696144  -47.20%
- Benchmark_UFlat13            1641394       884969  -46.08%
- Benchmark_UFlat14             262206       131174  -49.97%
- Benchmark_UFlat15              32325        17047  -47.26%
- Benchmark_UFlat16             366991       204877  -44.17%
- Benchmark_UFlat17            1343988       770907  -42.64%
- Benchmark_ZFlat0              579954       329812  -43.13%
- Benchmark_ZFlat1             6564692      3504867  -46.61%
- Benchmark_ZFlat2              902029       513700  -43.05%
- Benchmark_ZFlat3              678722       384312  -43.38%
- Benchmark_ZFlat4             1197389       654361  -45.35%
- Benchmark_ZFlat5              262677       144939  -44.82%
- Benchmark_ZFlat6              111249        60876  -45.28%
- Benchmark_ZFlat7               39024        19420  -50.24%
- Benchmark_ZFlat8             8046106      4387928  -45.47%
- Benchmark_ZFlat9             2043167      1143139  -44.05%
- Benchmark_ZFlat10            1781604       980528  -44.96%
- Benchmark_ZFlat11            5478647      3078585  -43.81%
- Benchmark_ZFlat12            7245995      3929863  -45.77%
- Benchmark_ZFlat13            2432529      1371606  -43.61%
- Benchmark_ZFlat14             420315       227494  -45.88%
- Benchmark_ZFlat15              52378        26564  -49.28%
- Benchmark_ZFlat16             567047       316196  -44.24%
- Benchmark_ZFlat17            1630820       937310  -42.53%
-
- benchmark                   old MB/s     new MB/s  speedup
- BenchmarkWordsDecode1e3       102.71       189.08    1.84x
- BenchmarkWordsDecode1e4        99.77       180.60    1.81x
- BenchmarkWordsDecode1e5        96.38       183.01    1.90x
- BenchmarkWordsDecode1e6       104.61       187.43    1.79x
- BenchmarkWordsEncode1e3        61.70       150.85    2.44x
- BenchmarkWordsEncode1e4        71.28       136.68    1.92x
- BenchmarkWordsEncode1e5        67.72       127.92    1.89x
- BenchmarkWordsEncode1e6        78.73       142.90    1.82x
- Benchmark_UFlat0              257.73       462.93    1.80x
- Benchmark_UFlat1              180.46       349.59    1.94x
- Benchmark_UFlat2             3545.30      8244.61    2.33x
- Benchmark_UFlat3              669.72      1271.39    1.90x
- Benchmark_UFlat4              502.84       959.74    1.91x
- Benchmark_UFlat5              156.71       301.98    1.93x
- Benchmark_UFlat6              143.60       258.33    1.80x
- Benchmark_UFlat7              146.41       274.01    1.87x
- Benchmark_UFlat8              161.59       301.72    1.87x
- Benchmark_UFlat9              104.62       192.53    1.84x
- Benchmark_UFlat10             100.70       189.45    1.88x
- Benchmark_UFlat11             109.33       198.83    1.82x
- Benchmark_UFlat12              94.37       178.72    1.89x
- Benchmark_UFlat13             312.67       579.93    1.85x
- Benchmark_UFlat14             145.84       291.52    2.00x
- Benchmark_UFlat15             130.77       247.95    1.90x
- Benchmark_UFlat16             323.14       578.82    1.79x
- Benchmark_UFlat17             137.14       239.09    1.74x
- Benchmark_ZFlat0              176.57       310.48    1.76x
- Benchmark_ZFlat1              106.95       200.32    1.87x
- Benchmark_ZFlat2              140.75       247.14    1.76x
- Benchmark_ZFlat3              138.98       245.45    1.77x
- Benchmark_ZFlat4              342.08       625.95    1.83x
- Benchmark_ZFlat5               93.66       169.75    1.81x
- Benchmark_ZFlat6              100.23       183.16    1.83x
- Benchmark_ZFlat7               95.35       191.60    2.01x
- Benchmark_ZFlat8              127.98       234.68    1.83x
- Benchmark_ZFlat9               74.44       133.04    1.79x
- Benchmark_ZFlat10              70.26       127.66    1.82x
- Benchmark_ZFlat11              77.89       138.62    1.78x
- Benchmark_ZFlat12              66.50       122.62    1.84x
- Benchmark_ZFlat13             210.98       374.17    1.77x
- Benchmark_ZFlat14              90.98       168.09    1.85x
- Benchmark_ZFlat15              80.70       159.12    1.97x
- Benchmark_ZFlat16             209.13       375.04    1.79x
- Benchmark_ZFlat17             113.02       196.65    1.74x
- $
-
-Build tags
-
-If a constraint 'purego' appears in the build constraints [5] then a pure Go
-version is built regardless of the $CGO_ENABLED value.
-
-	$ touch zappy.go ; go install -tags purego github.com/cznic/zappy # for example
-
-Information sources
-
-... referenced from the above documentation.
-
- [1]: http://code.google.com/p/snappy-go/
- [2]: http://code.google.com/p/snappy/
- [3]: http://code.google.com/p/snappy/source/browse/trunk/format_description.txt
- [4]: http://golang.org/pkg/encoding/binary/
- [5]: http://golang.org/pkg/go/build/#hdr-Build_Constraints
-*/
-package zappy
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE b/Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE
deleted file mode 100644
index f7d058a358..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2013 Skagerrak Software Limited. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Skagerrak Software Limited nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4/README.md b/Godeps/_workspace/src/github.com/d2g/dhcp4/README.md
deleted file mode 100644
index 6752dc71a2..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# DHCP4 - A DHCP library written in Go.
-
-Warning: This library is still being developed.  Function calls will change.
-
-I've removed Server Functionality, for me this project supports the underlying DHCP format not the implementation.
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4/constants.go b/Godeps/_workspace/src/github.com/d2g/dhcp4/constants.go
deleted file mode 100644
index 183a778371..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4/constants.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package dhcp4
-
-// OpCodes
-const (
-	BootRequest OpCode = 1 // From Client
-	BootReply   OpCode = 2 // From Server
-)
-
-// DHCP Message Type 53
-const (
-	Discover MessageType = 1 // Broadcast Packet From Client - Can I have an IP?
-	Offer    MessageType = 2 // Broadcast From Server - Here's an IP
-	Request  MessageType = 3 // Broadcast From Client - I'll take that IP (Also start for renewals)
-	Decline  MessageType = 4 // Broadcast From Client - Sorry I can't use that IP
-	ACK      MessageType = 5 // From Server, Yes you can have that IP
-	NAK      MessageType = 6 // From Server, No you cannot have that IP
-	Release  MessageType = 7 // From Client, I don't need that IP anymore
-	Inform   MessageType = 8 // From Client, I have this IP and there's nothing you can do about it
-)
-
-// DHCP Options
-const (
-	End                          OptionCode = 255
-	Pad                          OptionCode = 0
-	OptionSubnetMask             OptionCode = 1
-	OptionTimeOffset             OptionCode = 2
-	OptionRouter                 OptionCode = 3
-	OptionTimeServer             OptionCode = 4
-	OptionNameServer             OptionCode = 5
-	OptionDomainNameServer       OptionCode = 6
-	OptionLogServer              OptionCode = 7
-	OptionCookieServer           OptionCode = 8
-	OptionLPRServer              OptionCode = 9
-	OptionImpressServer          OptionCode = 10
-	OptionResourceLocationServer OptionCode = 11
-	OptionHostName               OptionCode = 12
-	OptionBootFileSize           OptionCode = 13
-	OptionMeritDumpFile          OptionCode = 14
-	OptionDomainName             OptionCode = 15
-	OptionSwapServer             OptionCode = 16
-	OptionRootPath               OptionCode = 17
-	OptionExtensionsPath         OptionCode = 18
-
-	// IP Layer Parameters per Host
-	OptionIPForwardingEnableDisable          OptionCode = 19
-	OptionNonLocalSourceRoutingEnableDisable OptionCode = 20
-	OptionPolicyFilter                       OptionCode = 21
-	OptionMaximumDatagramReassemblySize      OptionCode = 22
-	OptionDefaultIPTimeToLive                OptionCode = 23
-	OptionPathMTUAgingTimeout                OptionCode = 24
-	OptionPathMTUPlateauTable                OptionCode = 25
-
-	// IP Layer Parameters per Interface
-	OptionInterfaceMTU              OptionCode = 26
-	OptionAllSubnetsAreLocal        OptionCode = 27
-	OptionBroadcastAddress          OptionCode = 28
-	OptionPerformMaskDiscovery      OptionCode = 29
-	OptionMaskSupplier              OptionCode = 30
-	OptionPerformRouterDiscovery    OptionCode = 31
-	OptionRouterSolicitationAddress OptionCode = 32
-	OptionStaticRoute               OptionCode = 33
-
-	// Link Layer Parameters per Interface
-	OptionTrailerEncapsulation  OptionCode = 34
-	OptionARPCacheTimeout       OptionCode = 35
-	OptionEthernetEncapsulation OptionCode = 36
-
-	// TCP Parameters
-	OptionTCPDefaultTTL        OptionCode = 37
-	OptionTCPKeepaliveInterval OptionCode = 38
-	OptionTCPKeepaliveGarbage  OptionCode = 39
-
-	// Application and Service Parameters
-	OptionNetworkInformationServiceDomain            OptionCode = 40
-	OptionNetworkInformationServers                  OptionCode = 41
-	OptionNetworkTimeProtocolServers                 OptionCode = 42
-	OptionVendorSpecificInformation                  OptionCode = 43
-	OptionNetBIOSOverTCPIPNameServer                 OptionCode = 44
-	OptionNetBIOSOverTCPIPDatagramDistributionServer OptionCode = 45
-	OptionNetBIOSOverTCPIPNodeType                   OptionCode = 46
-	OptionNetBIOSOverTCPIPScope                      OptionCode = 47
-	OptionXWindowSystemFontServer                    OptionCode = 48
-	OptionXWindowSystemDisplayManager                OptionCode = 49
-	OptionNetworkInformationServicePlusDomain        OptionCode = 64
-	OptionNetworkInformationServicePlusServers       OptionCode = 65
-	OptionMobileIPHomeAgent                          OptionCode = 68
-	OptionSimpleMailTransportProtocol                OptionCode = 69
-	OptionPostOfficeProtocolServer                   OptionCode = 70
-	OptionNetworkNewsTransportProtocol               OptionCode = 71
-	OptionDefaultWorldWideWebServer                  OptionCode = 72
-	OptionDefaultFingerServer                        OptionCode = 73
-	OptionDefaultInternetRelayChatServer             OptionCode = 74
-	OptionStreetTalkServer                           OptionCode = 75
-	OptionStreetTalkDirectoryAssistance              OptionCode = 76
-
-	// DHCP Extensions
-	OptionRequestedIPAddress     OptionCode = 50
-	OptionIPAddressLeaseTime     OptionCode = 51
-	OptionOverload               OptionCode = 52
-	OptionDHCPMessageType        OptionCode = 53
-	OptionServerIdentifier       OptionCode = 54
-	OptionParameterRequestList   OptionCode = 55
-	OptionMessage                OptionCode = 56
-	OptionMaximumDHCPMessageSize OptionCode = 57
-	OptionRenewalTimeValue       OptionCode = 58
-	OptionRebindingTimeValue     OptionCode = 59
-	OptionVendorClassIdentifier  OptionCode = 60
-	OptionClientIdentifier       OptionCode = 61
-
-	OptionTFTPServerName OptionCode = 66
-	OptionBootFileName   OptionCode = 67
-
-	OptionUserClass OptionCode = 77
-
-	OptionClientArchitecture OptionCode = 93
-
-	OptionTZPOSIXString    OptionCode = 100
-	OptionTZDatabaseString OptionCode = 101
-
-	OptionClasslessRouteFormat OptionCode = 121
-)
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4/helpers.go b/Godeps/_workspace/src/github.com/d2g/dhcp4/helpers.go
deleted file mode 100644
index 4b1463869f..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4/helpers.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package dhcp4
-
-import (
-	"encoding/binary"
-	"net"
-	"time"
-)
-
-// IPRange returns how many ips in the ip range from start to stop (inclusive)
-func IPRange(start, stop net.IP) int {
-	//return int(Uint([]byte(stop))-Uint([]byte(start))) + 1
-	return int(binary.BigEndian.Uint32(stop.To4())) - int(binary.BigEndian.Uint32(start.To4())) + 1
-}
-
-// IPAdd returns a copy of start + add.
-// IPAdd(net.IP{192,168,1,1},30) returns net.IP{192.168.1.31}
-func IPAdd(start net.IP, add int) net.IP { // IPv4 only
-	start = start.To4()
-	//v := Uvarint([]byte(start))
-	result := make(net.IP, 4)
-	binary.BigEndian.PutUint32(result, binary.BigEndian.Uint32(start)+uint32(add))
-	//PutUint([]byte(result), v+uint64(add))
-	return result
-}
-
-// IPLess returns where IP a is less than IP b.
-func IPLess(a, b net.IP) bool {
-	b = b.To4()
-	for i, ai := range a.To4() {
-		if ai != b[i] {
-			return ai < b[i]
-		}
-	}
-	return false
-}
-
-// IPInRange returns true if ip is between (inclusive) start and stop.
-func IPInRange(start, stop, ip net.IP) bool {
-	return !(IPLess(ip, start) || IPLess(stop, ip))
-}
-
-// OptionsLeaseTime - converts a time.Duration to a 4 byte slice, compatible
-// with OptionIPAddressLeaseTime.
-func OptionsLeaseTime(d time.Duration) []byte {
-	leaseBytes := make([]byte, 4)
-	binary.BigEndian.PutUint32(leaseBytes, uint32(d/time.Second))
-	//PutUvarint(leaseBytes, uint64(d/time.Second))
-	return leaseBytes
-}
-
-// JoinIPs returns a byte slice of IP addresses, one immediately after the other
-// This may be useful for creating multiple IP options such as OptionRouter.
-func JoinIPs(ips []net.IP) (b []byte) {
-	for _, v := range ips {
-		b = append(b, v.To4()...)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4/option.go b/Godeps/_workspace/src/github.com/d2g/dhcp4/option.go
deleted file mode 100644
index f3239e1980..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4/option.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package dhcp4
-
-type OptionCode byte
-
-type Option struct {
-	Code  OptionCode
-	Value []byte
-}
-
-// Map of DHCP options
-type Options map[OptionCode][]byte
-
-// SelectOrderOrAll has same functionality as SelectOrder, except if the order
-// param is nil, whereby all options are added (in arbitary order).
-func (o Options) SelectOrderOrAll(order []byte) []Option {
-	if order == nil {
-		opts := make([]Option, 0, len(o))
-		for i, v := range o {
-			opts = append(opts, Option{Code: i, Value: v})
-		}
-		return opts
-	}
-	return o.SelectOrder(order)
-}
-
-// SelectOrder returns a slice of options ordered and selected by a byte array
-// usually defined by OptionParameterRequestList.  This result is expected to be
-// used in ReplyPacket()'s []Option parameter.
-func (o Options) SelectOrder(order []byte) []Option {
-	opts := make([]Option, 0, len(order))
-	for _, v := range order {
-		if data, ok := o[OptionCode(v)]; ok {
-			opts = append(opts, Option{Code: OptionCode(v), Value: data})
-		}
-	}
-	return opts
-}
-
-type OpCode byte
-type MessageType byte // Option 53
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4/packet.go b/Godeps/_workspace/src/github.com/d2g/dhcp4/packet.go
deleted file mode 100644
index 5e547c86fa..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4/packet.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package dhcp4
-
-import (
-	"net"
-	"time"
-)
-
-// A DHCP packet
-type Packet []byte
-
-func (p Packet) OpCode() OpCode { return OpCode(p[0]) }
-func (p Packet) HType() byte    { return p[1] }
-func (p Packet) HLen() byte     { return p[2] }
-func (p Packet) Hops() byte     { return p[3] }
-func (p Packet) XId() []byte    { return p[4:8] }
-func (p Packet) Secs() []byte   { return p[8:10] } // Never Used?
-func (p Packet) Flags() []byte  { return p[10:12] }
-func (p Packet) CIAddr() net.IP { return net.IP(p[12:16]) }
-func (p Packet) YIAddr() net.IP { return net.IP(p[16:20]) }
-func (p Packet) SIAddr() net.IP { return net.IP(p[20:24]) }
-func (p Packet) GIAddr() net.IP { return net.IP(p[24:28]) }
-func (p Packet) CHAddr() net.HardwareAddr {
-	hLen := p.HLen()
-	if hLen > 16 { // Prevent chaddr exceeding p boundary
-		hLen = 16
-	}
-	return net.HardwareAddr(p[28 : 28+hLen]) // max endPos 44
-}
-
-// 192 bytes of zeros BOOTP legacy
-func (p Packet) Cookie() []byte { return p[236:240] }
-func (p Packet) Options() []byte {
-	if len(p) > 240 {
-		return p[240:]
-	}
-	return nil
-}
-
-func (p Packet) Broadcast() bool { return p.Flags()[0] > 127 }
-
-func (p Packet) SetBroadcast(broadcast bool) {
-	if p.Broadcast() != broadcast {
-		p.Flags()[0] ^= 128
-	}
-}
-
-func (p Packet) SetOpCode(c OpCode) { p[0] = byte(c) }
-func (p Packet) SetCHAddr(a net.HardwareAddr) {
-	copy(p[28:44], a)
-	p[2] = byte(len(a))
-}
-func (p Packet) SetHType(hType byte)     { p[1] = hType }
-func (p Packet) SetCookie(cookie []byte) { copy(p.Cookie(), cookie) }
-func (p Packet) SetHops(hops byte)       { p[3] = hops }
-func (p Packet) SetXId(xId []byte)       { copy(p.XId(), xId) }
-func (p Packet) SetSecs(secs []byte)     { copy(p.Secs(), secs) }
-func (p Packet) SetFlags(flags []byte)   { copy(p.Flags(), flags) }
-func (p Packet) SetCIAddr(ip net.IP)     { copy(p.CIAddr(), ip.To4()) }
-func (p Packet) SetYIAddr(ip net.IP)     { copy(p.YIAddr(), ip.To4()) }
-func (p Packet) SetSIAddr(ip net.IP)     { copy(p.SIAddr(), ip.To4()) }
-func (p Packet) SetGIAddr(ip net.IP)     { copy(p.GIAddr(), ip.To4()) }
-
-// Parses the packet's options into an Options map
-func (p Packet) ParseOptions() Options {
-	opts := p.Options()
-	options := make(Options, 10)
-	for len(opts) >= 2 && OptionCode(opts[0]) != End {
-		if OptionCode(opts[0]) == Pad {
-			opts = opts[1:]
-			continue
-		}
-		size := int(opts[1])
-		if len(opts) < 2+size {
-			break
-		}
-		options[OptionCode(opts[0])] = opts[2 : 2+size]
-		opts = opts[2+size:]
-	}
-	return options
-}
-
-func NewPacket(opCode OpCode) Packet {
-	p := make(Packet, 241)
-	p.SetOpCode(opCode)
-	p.SetHType(1) // Ethernet
-	p.SetCookie([]byte{99, 130, 83, 99})
-	p[240] = byte(End)
-	return p
-}
-
-// Appends a DHCP option to the end of a packet
-func (p *Packet) AddOption(o OptionCode, value []byte) {
-	*p = append((*p)[:len(*p)-1], []byte{byte(o), byte(len(value))}...) // Strip off End, Add OptionCode and Length
-	*p = append(*p, value...)                                           // Add Option Value
-	*p = append(*p, byte(End))                                          // Add on new End
-}
-
-// Removes all options from packet.
-func (p *Packet) StripOptions() {
-	*p = append((*p)[:240], byte(End))
-}
-
-// Creates a request packet that a Client would send to a server.
-func RequestPacket(mt MessageType, chAddr net.HardwareAddr, cIAddr net.IP, xId []byte, broadcast bool, options []Option) Packet {
-	p := NewPacket(BootRequest)
-	p.SetCHAddr(chAddr)
-	p.SetXId(xId)
-	if cIAddr != nil {
-		p.SetCIAddr(cIAddr)
-	}
-	p.SetBroadcast(broadcast)
-	p.AddOption(OptionDHCPMessageType, []byte{byte(mt)})
-	for _, o := range options {
-		p.AddOption(o.Code, o.Value)
-	}
-	p.PadToMinSize()
-	return p
-}
-
-// ReplyPacket creates a reply packet that a Server would send to a client.
-// It uses the req Packet param to copy across common/necessary fields to
-// associate the reply the request.
-func ReplyPacket(req Packet, mt MessageType, serverId, yIAddr net.IP, leaseDuration time.Duration, options []Option) Packet {
-	p := NewPacket(BootReply)
-	p.SetXId(req.XId())
-	p.SetFlags(req.Flags())
-	p.SetYIAddr(yIAddr)
-	p.SetGIAddr(req.GIAddr())
-	p.SetCHAddr(req.CHAddr())
-	p.SetSecs(req.Secs())
-	p.AddOption(OptionDHCPMessageType, []byte{byte(mt)})
-	p.AddOption(OptionServerIdentifier, []byte(serverId))
-	p.AddOption(OptionIPAddressLeaseTime, OptionsLeaseTime(leaseDuration))
-	for _, o := range options {
-		p.AddOption(o.Code, o.Value)
-	}
-	p.PadToMinSize()
-	return p
-}
-
-// PadToMinSize pads a packet so that when sent over UDP, the entire packet,
-// is 300 bytes (BOOTP min), to be compatible with really old devices.
-var padder [272]byte
-
-func (p *Packet) PadToMinSize() {
-	if n := len(*p); n < 272 {
-		*p = append(*p, padder[:272-n]...)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4client/LICENSE b/Godeps/_workspace/src/github.com/d2g/dhcp4client/LICENSE
deleted file mode 100644
index c33dcc7c92..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4client/LICENSE
+++ /dev/null
@@ -1,354 +0,0 @@
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-
-     means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of version
-        1.1 or earlier of the License, but not also under the terms of a
-        Secondary License.
-
-1.6. “Executable Form”
-
-     means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-
-     means a work that combines Covered Software with other material, in a separate
-     file or files, that is not Covered Software.
-
-1.8. “License”
-
-     means this document.
-
-1.9. “Licensable”
-
-     means having the right to grant, to the maximum extent possible, whether at the
-     time of the initial grant or subsequently, any and all of the rights conveyed by
-     this License.
-
-1.10. “Modifications”
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to, deletion
-        from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-
-      means any patent claim(s), including without limitation, method, process,
-      and apparatus claims, in any patent Licensable by such Contributor that
-      would be infringed, but for the grant of the License, by the making,
-      using, selling, offering for sale, having made, import, or transfer of
-      either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-
-      means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, “You” includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, “control” means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or as
-        part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its Contributions
-        or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution become
-     effective for each Contribution on the date the Contributor first distributes
-     such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under this
-     License. No additional rights or licenses will be implied from the distribution
-     or licensing of Covered Software under this License. Notwithstanding Section
-     2.1(b) above, no patent license is granted by a Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party’s
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of its
-        Contributions.
-
-     This License does not grant any rights in the trademarks, service marks, or
-     logos of any Contributor (except as may be necessary to comply with the
-     notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this License
-     (see Section 10.2) or under the terms of a Secondary License (if permitted
-     under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its Contributions
-     are its original creation(s) or it has sufficient rights to grant the
-     rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under applicable
-     copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under the
-     terms of this License. You must inform recipients that the Source Code Form
-     of the Covered Software is governed by the terms of this License, and how
-     they can obtain a copy of this License. You may not attempt to alter or
-     restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this License,
-        or sublicense it under different terms, provided that the license for
-        the Executable Form does not attempt to limit or alter the recipients’
-        rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for the
-     Covered Software. If the Larger Work is a combination of Covered Software
-     with a work governed by one or more Secondary Licenses, and the Covered
-     Software is not Incompatible With Secondary Licenses, this License permits
-     You to additionally distribute such Covered Software under the terms of
-     such Secondary License(s), so that the recipient of the Larger Work may, at
-     their option, further distribute the Covered Software under the terms of
-     either this License or such Secondary License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices (including
-     copyright notices, patent notices, disclaimers of warranty, or limitations
-     of liability) contained within the Source Code Form of the Covered
-     Software, except that You may alter any license notices to the extent
-     required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on behalf
-     of any Contributor. You must make it absolutely clear that any such
-     warranty, support, indemnity, or liability obligation is offered by You
-     alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute, judicial
-   order, or regulation then You must: (a) comply with the terms of this License
-   to the maximum extent possible; and (b) describe the limitations and the code
-   they affect. Such description must be placed in a text file included with all
-   distributions of the Covered Software under this License. Except to the
-   extent prohibited by statute or regulation, such description must be
-   sufficiently detailed for a recipient of ordinary skill to be able to
-   understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
-     if such Contributor fails to notify You of the non-compliance by some
-     reasonable means prior to 60 days after You have come back into compliance.
-     Moreover, Your grants from a particular Contributor are reinstated on an
-     ongoing basis if such Contributor notifies You of the non-compliance by
-     some reasonable means, this is the first time You have received notice of
-     non-compliance with this License from such Contributor, and You become
-     compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions, counter-claims,
-     and cross-claims) alleging that a Contributor Version directly or
-     indirectly infringes any patent, then the rights granted to You by any and
-     all Contributors for the Covered Software under Section 2.1 of this License
-     shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an “as is” basis, without
-   warranty of any kind, either expressed, implied, or statutory, including,
-   without limitation, warranties that the Covered Software is free of defects,
-   merchantable, fit for a particular purpose or non-infringing. The entire
-   risk as to the quality and performance of the Covered Software is with You.
-   Should any Covered Software prove defective in any respect, You (not any
-   Contributor) assume the cost of any necessary servicing, repair, or
-   correction. This disclaimer of warranty constitutes an essential part of this
-   License. No use of  any Covered Software is authorized under this License
-   except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from such
-   party’s negligence to the extent applicable law prohibits such limitation.
-   Some jurisdictions do not allow the exclusion or limitation of incidental or
-   consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts of
-   a jurisdiction where the defendant maintains its principal place of business
-   and such litigation shall be governed by laws of that jurisdiction, without
-   reference to its conflict-of-law provisions. Nothing in this Section shall
-   prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject matter
-   hereof. If any provision of this License is held to be unenforceable, such
-   provision shall be reformed only to the extent necessary to make it
-   enforceable. Any law or regulation which provides that the language of a
-   contract shall be construed against the drafter shall not be used to construe
-   this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version of
-      the License under which You originally received the Covered Software, or
-      under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a modified
-      version of this License if you rename the license and remove any
-      references to the name of the license steward (except to note that such
-      modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-      If You choose to distribute Source Code Form that is Incompatible With
-      Secondary Licenses under the terms of this version of the License, the
-      notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then
-You may include the notice in a location (such as a LICENSE file in a relevant
-directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-
-      This Source Code Form is “Incompatible
-      With Secondary Licenses”, as defined by
-      the Mozilla Public License, v. 2.0.
-
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4client/README.md b/Godeps/_workspace/src/github.com/d2g/dhcp4client/README.md
deleted file mode 100644
index 785ac2c1df..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4client/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-dhcp4client [![GoDoc](https://godoc.org/github.com/d2g/dhcp4client?status.svg)](http://godoc.org/github.com/d2g/dhcp4client) [![Coverage Status](https://coveralls.io/repos/d2g/dhcp4client/badge.svg?branch=HEAD)](https://coveralls.io/r/d2g/dhcp4client?branch=HEAD) [![Codeship Status for d2g/dhcp4client](https://codeship.com/projects/d75d9860-b364-0132-bc79-7e1d8cf367b9/status?branch=master)](https://codeship.com/projects/70187)
-===========
-
-DHCP Client
-
-
-###### Thanks to:
-@eyakubovich For AF_PACKET support.
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go b/Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go
deleted file mode 100644
index ab852c650e..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go
+++ /dev/null
@@ -1,366 +0,0 @@
-package dhcp4client
-
-import (
-	"bytes"
-	"crypto/rand"
-	"net"
-	"time"
-
-	"github.com/d2g/dhcp4"
-)
-
-const (
-	MaxDHCPLen = 576
-)
-
-type Client struct {
-	hardwareAddr  net.HardwareAddr //The HardwareAddr to send in the request.
-	ignoreServers []net.IP         //List of Servers to Ignore requests from.
-	timeout       time.Duration    //Time before we timeout.
-	broadcast     bool             //Set the Bcast flag in BOOTP Flags
-	connection    connection       //The Connection Method to use
-}
-
-/*
- * Abstracts the type of underlying socket used
- */
-type connection interface {
-	Close() error
-	Write(packet []byte) error
-	ReadFrom() ([]byte, net.IP, error)
-	SetReadTimeout(t time.Duration) error
-}
-
-func New(options ...func(*Client) error) (*Client, error) {
-	c := Client{
-		timeout:   time.Second * 10,
-		broadcast: true,
-	}
-
-	err := c.SetOption(options...)
-	if err != nil {
-		return nil, err
-	}
-
-	//if connection hasn't been set as an option create the default.
-	if c.connection == nil {
-		conn, err := NewInetSock()
-		if err != nil {
-			return nil, err
-		}
-		c.connection = conn
-	}
-
-	return &c, nil
-}
-
-func (c *Client) SetOption(options ...func(*Client) error) error {
-	for _, opt := range options {
-		if err := opt(c); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func Timeout(t time.Duration) func(*Client) error {
-	return func(c *Client) error {
-		c.timeout = t
-		return nil
-	}
-}
-
-func IgnoreServers(s []net.IP) func(*Client) error {
-	return func(c *Client) error {
-		c.ignoreServers = s
-		return nil
-	}
-}
-
-func HardwareAddr(h net.HardwareAddr) func(*Client) error {
-	return func(c *Client) error {
-		c.hardwareAddr = h
-		return nil
-	}
-}
-
-func Broadcast(b bool) func(*Client) error {
-	return func(c *Client) error {
-		c.broadcast = b
-		return nil
-	}
-}
-
-func Connection(conn connection) func(*Client) error {
-	return func(c *Client) error {
-		c.connection = conn
-		return nil
-	}
-}
-
-/*
- * Close Connections
- */
-func (c *Client) Close() error {
-	if c.connection != nil {
-		return c.connection.Close()
-	}
-	return nil
-}
-
-/*
- * Send the Discovery Packet to the Broadcast Channel
- */
-func (c *Client) SendDiscoverPacket() (dhcp4.Packet, error) {
-	discoveryPacket := c.DiscoverPacket()
-	discoveryPacket.PadToMinSize()
-
-	return discoveryPacket, c.SendPacket(discoveryPacket)
-}
-
-/*
- * Retreive Offer...
- * Wait for the offer for a specific Discovery Packet.
- */
-func (c *Client) GetOffer(discoverPacket *dhcp4.Packet) (dhcp4.Packet, error) {
-	for {
-		c.connection.SetReadTimeout(c.timeout)
-		readBuffer, source, err := c.connection.ReadFrom()
-		if err != nil {
-			return dhcp4.Packet{}, err
-		}
-
-		offerPacket := dhcp4.Packet(readBuffer)
-		offerPacketOptions := offerPacket.ParseOptions()
-
-		// Ignore Servers in my Ignore list
-		for _, ignoreServer := range c.ignoreServers {
-			if source.Equal(ignoreServer) {
-				continue
-			}
-
-			if offerPacket.SIAddr().Equal(ignoreServer) {
-				continue
-			}
-		}
-
-		if len(offerPacketOptions[dhcp4.OptionDHCPMessageType]) < 1 || dhcp4.MessageType(offerPacketOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.Offer || !bytes.Equal(discoverPacket.XId(), offerPacket.XId()) {
-			continue
-		}
-
-		return offerPacket, nil
-	}
-
-}
-
-/*
- * Send Request Based On the offer Received.
- */
-func (c *Client) SendRequest(offerPacket *dhcp4.Packet) (dhcp4.Packet, error) {
-	requestPacket := c.RequestPacket(offerPacket)
-	requestPacket.PadToMinSize()
-
-	return requestPacket, c.SendPacket(requestPacket)
-}
-
-/*
- * Retreive Acknowledgement
- * Wait for the offer for a specific Request Packet.
- */
-func (c *Client) GetAcknowledgement(requestPacket *dhcp4.Packet) (dhcp4.Packet, error) {
-	for {
-		c.connection.SetReadTimeout(c.timeout)
-		readBuffer, source, err := c.connection.ReadFrom()
-		if err != nil {
-			return dhcp4.Packet{}, err
-		}
-
-		acknowledgementPacket := dhcp4.Packet(readBuffer)
-		acknowledgementPacketOptions := acknowledgementPacket.ParseOptions()
-
-		// Ignore Servers in my Ignore list
-		for _, ignoreServer := range c.ignoreServers {
-			if source.Equal(ignoreServer) {
-				continue
-			}
-
-			if acknowledgementPacket.SIAddr().Equal(ignoreServer) {
-				continue
-			}
-		}
-
-		if !bytes.Equal(requestPacket.XId(), acknowledgementPacket.XId()) || len(acknowledgementPacketOptions[dhcp4.OptionDHCPMessageType]) < 1 || (dhcp4.MessageType(acknowledgementPacketOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.ACK && dhcp4.MessageType(acknowledgementPacketOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.NAK) {
-			continue
-		}
-
-		return acknowledgementPacket, nil
-	}
-}
-
-/*
- * Send a DHCP Packet.
- */
-func (c *Client) SendPacket(packet dhcp4.Packet) error {
-	return c.connection.Write(packet)
-}
-
-/*
- * Create Discover Packet
- */
-func (c *Client) DiscoverPacket() dhcp4.Packet {
-	messageid := make([]byte, 4)
-	if _, err := rand.Read(messageid); err != nil {
-		panic(err)
-	}
-
-	packet := dhcp4.NewPacket(dhcp4.BootRequest)
-	packet.SetCHAddr(c.hardwareAddr)
-	packet.SetXId(messageid)
-	packet.SetBroadcast(c.broadcast)
-
-	packet.AddOption(dhcp4.OptionDHCPMessageType, []byte{byte(dhcp4.Discover)})
-	//packet.PadToMinSize()
-	return packet
-}
-
-/*
- * Create Request Packet
- */
-func (c *Client) RequestPacket(offerPacket *dhcp4.Packet) dhcp4.Packet {
-	offerOptions := offerPacket.ParseOptions()
-
-	packet := dhcp4.NewPacket(dhcp4.BootRequest)
-	packet.SetCHAddr(c.hardwareAddr)
-
-	packet.SetXId(offerPacket.XId())
-	packet.SetCIAddr(offerPacket.CIAddr())
-	packet.SetSIAddr(offerPacket.SIAddr())
-
-	packet.SetBroadcast(c.broadcast)
-	packet.AddOption(dhcp4.OptionDHCPMessageType, []byte{byte(dhcp4.Request)})
-	packet.AddOption(dhcp4.OptionRequestedIPAddress, (offerPacket.YIAddr()).To4())
-	packet.AddOption(dhcp4.OptionServerIdentifier, offerOptions[dhcp4.OptionServerIdentifier])
-
-	//packet.PadToMinSize()
-	return packet
-}
-
-/*
- * Create Request Packet For a Renew
- */
-func (c *Client) RenewalRequestPacket(acknowledgement *dhcp4.Packet) dhcp4.Packet {
-	messageid := make([]byte, 4)
-	if _, err := rand.Read(messageid); err != nil {
-		panic(err)
-	}
-
-	acknowledgementOptions := acknowledgement.ParseOptions()
-
-	packet := dhcp4.NewPacket(dhcp4.BootRequest)
-	packet.SetCHAddr(acknowledgement.CHAddr())
-
-	packet.SetXId(messageid)
-	packet.SetCIAddr(acknowledgement.YIAddr())
-	packet.SetSIAddr(acknowledgement.SIAddr())
-
-	packet.SetBroadcast(c.broadcast)
-	packet.AddOption(dhcp4.OptionDHCPMessageType, []byte{byte(dhcp4.Request)})
-	packet.AddOption(dhcp4.OptionRequestedIPAddress, (acknowledgement.YIAddr()).To4())
-	packet.AddOption(dhcp4.OptionServerIdentifier, acknowledgementOptions[dhcp4.OptionServerIdentifier])
-
-	//packet.PadToMinSize()
-	return packet
-}
-
-/*
- * Create Release Packet For a Release
- */
-func (c *Client) ReleasePacket(acknowledgement *dhcp4.Packet) dhcp4.Packet {
-	messageid := make([]byte, 4)
-	if _, err := rand.Read(messageid); err != nil {
-		panic(err)
-	}
-
-	acknowledgementOptions := acknowledgement.ParseOptions()
-
-	packet := dhcp4.NewPacket(dhcp4.BootRequest)
-	packet.SetCHAddr(acknowledgement.CHAddr())
-
-	packet.SetXId(messageid)
-	packet.SetCIAddr(acknowledgement.YIAddr())
-
-	packet.AddOption(dhcp4.OptionDHCPMessageType, []byte{byte(dhcp4.Release)})
-	packet.AddOption(dhcp4.OptionServerIdentifier, acknowledgementOptions[dhcp4.OptionServerIdentifier])
-
-	//packet.PadToMinSize()
-	return packet
-}
-
-/*
- * Lets do a Full DHCP Request.
- */
-func (c *Client) Request() (bool, dhcp4.Packet, error) {
-	discoveryPacket, err := c.SendDiscoverPacket()
-	if err != nil {
-		return false, discoveryPacket, err
-	}
-
-	offerPacket, err := c.GetOffer(&discoveryPacket)
-	if err != nil {
-		return false, offerPacket, err
-	}
-
-	requestPacket, err := c.SendRequest(&offerPacket)
-	if err != nil {
-		return false, requestPacket, err
-	}
-
-	acknowledgement, err := c.GetAcknowledgement(&requestPacket)
-	if err != nil {
-		return false, acknowledgement, err
-	}
-
-	acknowledgementOptions := acknowledgement.ParseOptions()
-	if dhcp4.MessageType(acknowledgementOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.ACK {
-		return false, acknowledgement, nil
-	}
-
-	return true, acknowledgement, nil
-}
-
-/*
- * Renew a lease backed on the Acknowledgement Packet.
- * Returns Sucessfull, The AcknoledgementPacket, Any Errors
- */
-func (c *Client) Renew(acknowledgement dhcp4.Packet) (bool, dhcp4.Packet, error) {
-	renewRequest := c.RenewalRequestPacket(&acknowledgement)
-	renewRequest.PadToMinSize()
-
-	err := c.SendPacket(renewRequest)
-	if err != nil {
-		return false, renewRequest, err
-	}
-
-	newAcknowledgement, err := c.GetAcknowledgement(&renewRequest)
-	if err != nil {
-		return false, newAcknowledgement, err
-	}
-
-	newAcknowledgementOptions := newAcknowledgement.ParseOptions()
-	if dhcp4.MessageType(newAcknowledgementOptions[dhcp4.OptionDHCPMessageType][0]) != dhcp4.ACK {
-		return false, newAcknowledgement, nil
-	}
-
-	return true, newAcknowledgement, nil
-}
-
-/*
- * Release a lease backed on the Acknowledgement Packet.
- * Returns Any Errors
- */
-func (c *Client) Release(acknowledgement dhcp4.Packet) error {
-	release := c.ReleasePacket(&acknowledgement)
-	release.PadToMinSize()
-
-	return c.SendPacket(release)
-}
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4client/inetsock.go b/Godeps/_workspace/src/github.com/d2g/dhcp4client/inetsock.go
deleted file mode 100644
index 293f186538..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4client/inetsock.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package dhcp4client
-
-import (
-	"net"
-	"time"
-)
-
-type inetSock struct {
-	*net.UDPConn
-
-	laddr net.UDPAddr
-	raddr net.UDPAddr
-}
-
-func NewInetSock(options ...func(*inetSock) error) (*inetSock, error) {
-	c := &inetSock{
-		laddr: net.UDPAddr{IP: net.IPv4(0, 0, 0, 0), Port: 68},
-		raddr: net.UDPAddr{IP: net.IPv4bcast, Port: 67},
-	}
-
-	err := c.setOption(options...)
-	if err != nil {
-		return nil, err
-	}
-
-	conn, err := net.ListenUDP("udp4", &c.laddr)
-	if err != nil {
-		return nil, err
-	}
-
-	c.UDPConn = conn
-	return c, err
-}
-
-func (c *inetSock) setOption(options ...func(*inetSock) error) error {
-	for _, opt := range options {
-		if err := opt(c); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func SetLocalAddr(l net.UDPAddr) func(*inetSock) error {
-	return func(c *inetSock) error {
-		c.laddr = l
-		return nil
-	}
-}
-
-func SetRemoteAddr(r net.UDPAddr) func(*inetSock) error {
-	return func(c *inetSock) error {
-		c.raddr = r
-		return nil
-	}
-}
-
-func (c *inetSock) Write(packet []byte) error {
-	_, err := c.WriteToUDP(packet, &c.raddr)
-	return err
-}
-
-func (c *inetSock) ReadFrom() ([]byte, net.IP, error) {
-	readBuffer := make([]byte, MaxDHCPLen)
-	n, source, err := c.ReadFromUDP(readBuffer)
-	if source != nil {
-		return readBuffer[:n], source.IP, err
-	} else {
-		return readBuffer[:n], net.IP{}, err
-	}
-}
-
-func (c *inetSock) SetReadTimeout(t time.Duration) error {
-	return c.SetReadDeadline(time.Now().Add(t))
-}
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4client/init.go b/Godeps/_workspace/src/github.com/d2g/dhcp4client/init.go
deleted file mode 100644
index 67ae8a3a13..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4client/init.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package dhcp4client
-
-import (
-	"math/rand"
-	"time"
-)
-
-func init() {
-	rand.Seed(time.Now().Unix())
-}
diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go b/Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go
deleted file mode 100644
index a21c265fb4..0000000000
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package dhcp4client
-
-import (
-	"crypto/rand"
-	"encoding/binary"
-	"net"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-const (
-	minIPHdrLen = 20
-	maxIPHdrLen = 60
-	udpHdrLen   = 8
-	ip4Ver      = 0x40
-	ttl         = 16
-	srcPort     = 68
-	dstPort     = 67
-)
-
-var (
-	bcastMAC = []byte{255, 255, 255, 255, 255, 255}
-)
-
-// abstracts AF_PACKET
-type packetSock struct {
-	fd      int
-	ifindex int
-}
-
-func NewPacketSock(ifindex int) (*packetSock, error) {
-	fd, err := unix.Socket(unix.AF_PACKET, unix.SOCK_DGRAM, int(swap16(unix.ETH_P_IP)))
-	if err != nil {
-		return nil, err
-	}
-
-	addr := unix.SockaddrLinklayer{
-		Ifindex:  ifindex,
-		Protocol: swap16(unix.ETH_P_IP),
-	}
-
-	if err = unix.Bind(fd, &addr); err != nil {
-		return nil, err
-	}
-
-	return &packetSock{
-		fd:      fd,
-		ifindex: ifindex,
-	}, nil
-}
-
-func (pc *packetSock) Close() error {
-	return unix.Close(pc.fd)
-}
-
-func (pc *packetSock) Write(packet []byte) error {
-	lladdr := unix.SockaddrLinklayer{
-		Ifindex:  pc.ifindex,
-		Protocol: swap16(unix.ETH_P_IP),
-		Halen:    uint8(len(bcastMAC)),
-	}
-	copy(lladdr.Addr[:], bcastMAC)
-
-	pkt := make([]byte, minIPHdrLen+udpHdrLen+len(packet))
-
-	fillIPHdr(pkt[0:minIPHdrLen], udpHdrLen+uint16(len(packet)))
-	fillUDPHdr(pkt[minIPHdrLen:minIPHdrLen+udpHdrLen], uint16(len(packet)))
-
-	// payload
-	copy(pkt[minIPHdrLen+udpHdrLen:len(pkt)], packet)
-
-	return unix.Sendto(pc.fd, pkt, 0, &lladdr)
-}
-
-func (pc *packetSock) ReadFrom() ([]byte, net.IP, error) {
-	pkt := make([]byte, maxIPHdrLen+udpHdrLen+MaxDHCPLen)
-	n, _, err := unix.Recvfrom(pc.fd, pkt, 0)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// IP hdr len
-	ihl := int(pkt[0]&0x0F) * 4
-	// Source IP address
-	src := net.IP(pkt[12:16])
-
-	return pkt[ihl+udpHdrLen : n], src, nil
-}
-
-func (pc *packetSock) SetReadTimeout(t time.Duration) error {
-
-	tv := unix.NsecToTimeval(t.Nanoseconds())
-	return unix.SetsockoptTimeval(pc.fd, unix.SOL_SOCKET, unix.SO_RCVTIMEO, &tv)
-}
-
-// compute's 1's complement checksum
-func chksum(p []byte, csum []byte) {
-	cklen := len(p)
-	s := uint32(0)
-	for i := 0; i < (cklen - 1); i += 2 {
-		s += uint32(p[i+1])<<8 | uint32(p[i])
-	}
-	if cklen&1 == 1 {
-		s += uint32(p[cklen-1])
-	}
-	s = (s >> 16) + (s & 0xffff)
-	s = s + (s >> 16)
-	s = ^s
-
-	csum[0] = uint8(s & 0xff)
-	csum[1] = uint8(s >> 8)
-}
-
-func fillIPHdr(hdr []byte, payloadLen uint16) {
-	// version + IHL
-	hdr[0] = ip4Ver | (minIPHdrLen / 4)
-	// total length
-	binary.BigEndian.PutUint16(hdr[2:4], uint16(len(hdr))+payloadLen)
-	// identification
-	if _, err := rand.Read(hdr[4:5]); err != nil {
-		panic(err)
-	}
-	// TTL
-	hdr[8] = 16
-	// Protocol
-	hdr[9] = unix.IPPROTO_UDP
-	// dst IP
-	copy(hdr[16:20], net.IPv4bcast.To4())
-	// compute IP hdr checksum
-	chksum(hdr[0:len(hdr)], hdr[10:12])
-}
-
-func fillUDPHdr(hdr []byte, payloadLen uint16) {
-	// src port
-	binary.BigEndian.PutUint16(hdr[0:2], srcPort)
-	// dest port
-	binary.BigEndian.PutUint16(hdr[2:4], dstPort)
-	// length
-	binary.BigEndian.PutUint16(hdr[4:6], udpHdrLen+payloadLen)
-}
-
-func swap16(x uint16) uint16 {
-	var b [2]byte
-	binary.BigEndian.PutUint16(b[:], x)
-	return binary.LittleEndian.Uint16(b[:])
-}
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/LICENSE b/Godeps/_workspace/src/github.com/docker/distribution/LICENSE
deleted file mode 100644
index e06d208186..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/digest.go b/Godeps/_workspace/src/github.com/docker/distribution/digest/digest.go
deleted file mode 100644
index 31d821bba7..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/digest/digest.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package digest
-
-import (
-	"fmt"
-	"hash"
-	"io"
-	"regexp"
-	"strings"
-)
-
-const (
-	// DigestSha256EmptyTar is the canonical sha256 digest of empty data
-	DigestSha256EmptyTar = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-)
-
-// Digest allows simple protection of hex formatted digest strings, prefixed
-// by their algorithm. Strings of type Digest have some guarantee of being in
-// the correct format and it provides quick access to the components of a
-// digest string.
-//
-// The following is an example of the contents of Digest types:
-//
-// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
-//
-// This allows to abstract the digest behind this type and work only in those
-// terms.
-type Digest string
-
-// NewDigest returns a Digest from alg and a hash.Hash object.
-func NewDigest(alg Algorithm, h hash.Hash) Digest {
-	return NewDigestFromBytes(alg, h.Sum(nil))
-}
-
-// NewDigestFromBytes returns a new digest from the byte contents of p.
-// Typically, this can come from hash.Hash.Sum(...) or xxx.SumXXX(...)
-// functions. This is also useful for rebuilding digests from binary
-// serializations.
-func NewDigestFromBytes(alg Algorithm, p []byte) Digest {
-	return Digest(fmt.Sprintf("%s:%x", alg, p))
-}
-
-// NewDigestFromHex returns a Digest from alg and a the hex encoded digest.
-func NewDigestFromHex(alg, hex string) Digest {
-	return Digest(fmt.Sprintf("%s:%s", alg, hex))
-}
-
-// DigestRegexp matches valid digest types.
-var DigestRegexp = regexp.MustCompile(`[a-zA-Z0-9-_+.]+:[a-fA-F0-9]+`)
-
-// DigestRegexpAnchored matches valid digest types, anchored to the start and end of the match.
-var DigestRegexpAnchored = regexp.MustCompile(`^` + DigestRegexp.String() + `$`)
-
-var (
-	// ErrDigestInvalidFormat returned when digest format invalid.
-	ErrDigestInvalidFormat = fmt.Errorf("invalid checksum digest format")
-
-	// ErrDigestInvalidLength returned when digest has invalid length.
-	ErrDigestInvalidLength = fmt.Errorf("invalid checksum digest length")
-
-	// ErrDigestUnsupported returned when the digest algorithm is unsupported.
-	ErrDigestUnsupported = fmt.Errorf("unsupported digest algorithm")
-)
-
-// ParseDigest parses s and returns the validated digest object. An error will
-// be returned if the format is invalid.
-func ParseDigest(s string) (Digest, error) {
-	d := Digest(s)
-
-	return d, d.Validate()
-}
-
-// FromReader returns the most valid digest for the underlying content using
-// the canonical digest algorithm.
-func FromReader(rd io.Reader) (Digest, error) {
-	return Canonical.FromReader(rd)
-}
-
-// FromBytes digests the input and returns a Digest.
-func FromBytes(p []byte) Digest {
-	return Canonical.FromBytes(p)
-}
-
-// Validate checks that the contents of d is a valid digest, returning an
-// error if not.
-func (d Digest) Validate() error {
-	s := string(d)
-
-	if !DigestRegexpAnchored.MatchString(s) {
-		return ErrDigestInvalidFormat
-	}
-
-	i := strings.Index(s, ":")
-	if i < 0 {
-		return ErrDigestInvalidFormat
-	}
-
-	// case: "sha256:" with no hex.
-	if i+1 == len(s) {
-		return ErrDigestInvalidFormat
-	}
-
-	switch algorithm := Algorithm(s[:i]); algorithm {
-	case SHA256, SHA384, SHA512:
-		if algorithm.Size()*2 != len(s[i+1:]) {
-			return ErrDigestInvalidLength
-		}
-		break
-	default:
-		return ErrDigestUnsupported
-	}
-
-	return nil
-}
-
-// Algorithm returns the algorithm portion of the digest. This will panic if
-// the underlying digest is not in a valid format.
-func (d Digest) Algorithm() Algorithm {
-	return Algorithm(d[:d.sepIndex()])
-}
-
-// Hex returns the hex digest portion of the digest. This will panic if the
-// underlying digest is not in a valid format.
-func (d Digest) Hex() string {
-	return string(d[d.sepIndex()+1:])
-}
-
-func (d Digest) String() string {
-	return string(d)
-}
-
-func (d Digest) sepIndex() int {
-	i := strings.Index(string(d), ":")
-
-	if i < 0 {
-		panic("could not find ':' in digest: " + d)
-	}
-
-	return i
-}
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/digester.go b/Godeps/_workspace/src/github.com/docker/distribution/digest/digester.go
deleted file mode 100644
index f3105a45b6..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/digest/digester.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package digest
-
-import (
-	"crypto"
-	"fmt"
-	"hash"
-	"io"
-)
-
-// Algorithm identifies and implementation of a digester by an identifier.
-// Note the that this defines both the hash algorithm used and the string
-// encoding.
-type Algorithm string
-
-// supported digest types
-const (
-	SHA256 Algorithm = "sha256" // sha256 with hex encoding
-	SHA384 Algorithm = "sha384" // sha384 with hex encoding
-	SHA512 Algorithm = "sha512" // sha512 with hex encoding
-
-	// Canonical is the primary digest algorithm used with the distribution
-	// project. Other digests may be used but this one is the primary storage
-	// digest.
-	Canonical = SHA256
-)
-
-var (
-	// TODO(stevvooe): Follow the pattern of the standard crypto package for
-	// registration of digests. Effectively, we are a registerable set and
-	// common symbol access.
-
-	// algorithms maps values to hash.Hash implementations. Other algorithms
-	// may be available but they cannot be calculated by the digest package.
-	algorithms = map[Algorithm]crypto.Hash{
-		SHA256: crypto.SHA256,
-		SHA384: crypto.SHA384,
-		SHA512: crypto.SHA512,
-	}
-)
-
-// Available returns true if the digest type is available for use. If this
-// returns false, New and Hash will return nil.
-func (a Algorithm) Available() bool {
-	h, ok := algorithms[a]
-	if !ok {
-		return false
-	}
-
-	// check availability of the hash, as well
-	return h.Available()
-}
-
-func (a Algorithm) String() string {
-	return string(a)
-}
-
-// Size returns number of bytes returned by the hash.
-func (a Algorithm) Size() int {
-	h, ok := algorithms[a]
-	if !ok {
-		return 0
-	}
-	return h.Size()
-}
-
-// Set implemented to allow use of Algorithm as a command line flag.
-func (a *Algorithm) Set(value string) error {
-	if value == "" {
-		*a = Canonical
-	} else {
-		// just do a type conversion, support is queried with Available.
-		*a = Algorithm(value)
-	}
-
-	return nil
-}
-
-// New returns a new digester for the specified algorithm. If the algorithm
-// does not have a digester implementation, nil will be returned. This can be
-// checked by calling Available before calling New.
-func (a Algorithm) New() Digester {
-	return &digester{
-		alg:  a,
-		hash: a.Hash(),
-	}
-}
-
-// Hash returns a new hash as used by the algorithm. If not available, the
-// method will panic. Check Algorithm.Available() before calling.
-func (a Algorithm) Hash() hash.Hash {
-	if !a.Available() {
-		// NOTE(stevvooe): A missing hash is usually a programming error that
-		// must be resolved at compile time. We don't import in the digest
-		// package to allow users to choose their hash implementation (such as
-		// when using stevvooe/resumable or a hardware accelerated package).
-		//
-		// Applications that may want to resolve the hash at runtime should
-		// call Algorithm.Available before call Algorithm.Hash().
-		panic(fmt.Sprintf("%v not available (make sure it is imported)", a))
-	}
-
-	return algorithms[a].New()
-}
-
-// FromReader returns the digest of the reader using the algorithm.
-func (a Algorithm) FromReader(rd io.Reader) (Digest, error) {
-	digester := a.New()
-
-	if _, err := io.Copy(digester.Hash(), rd); err != nil {
-		return "", err
-	}
-
-	return digester.Digest(), nil
-}
-
-// FromBytes digests the input and returns a Digest.
-func (a Algorithm) FromBytes(p []byte) Digest {
-	digester := a.New()
-
-	if _, err := digester.Hash().Write(p); err != nil {
-		// Writes to a Hash should never fail. None of the existing
-		// hash implementations in the stdlib or hashes vendored
-		// here can return errors from Write. Having a panic in this
-		// condition instead of having FromBytes return an error value
-		// avoids unnecessary error handling paths in all callers.
-		panic("write to hash function returned error: " + err.Error())
-	}
-
-	return digester.Digest()
-}
-
-// TODO(stevvooe): Allow resolution of verifiers using the digest type and
-// this registration system.
-
-// Digester calculates the digest of written data. Writes should go directly
-// to the return value of Hash, while calling Digest will return the current
-// value of the digest.
-type Digester interface {
-	Hash() hash.Hash // provides direct access to underlying hash instance.
-	Digest() Digest
-}
-
-// digester provides a simple digester definition that embeds a hasher.
-type digester struct {
-	alg  Algorithm
-	hash hash.Hash
-}
-
-func (d *digester) Hash() hash.Hash {
-	return d.hash
-}
-
-func (d *digester) Digest() Digest {
-	return NewDigest(d.alg, d.hash)
-}
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/doc.go b/Godeps/_workspace/src/github.com/docker/distribution/digest/doc.go
deleted file mode 100644
index f64b0db32b..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/digest/doc.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Package digest provides a generalized type to opaquely represent message
-// digests and their operations within the registry. The Digest type is
-// designed to serve as a flexible identifier in a content-addressable system.
-// More importantly, it provides tools and wrappers to work with
-// hash.Hash-based digests with little effort.
-//
-// Basics
-//
-// The format of a digest is simply a string with two parts, dubbed the
-// "algorithm" and the "digest", separated by a colon:
-//
-// 	<algorithm>:<digest>
-//
-// An example of a sha256 digest representation follows:
-//
-// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
-//
-// In this case, the string "sha256" is the algorithm and the hex bytes are
-// the "digest".
-//
-// Because the Digest type is simply a string, once a valid Digest is
-// obtained, comparisons are cheap, quick and simple to express with the
-// standard equality operator.
-//
-// Verification
-//
-// The main benefit of using the Digest type is simple verification against a
-// given digest. The Verifier interface, modeled after the stdlib hash.Hash
-// interface, provides a common write sink for digest verification. After
-// writing is complete, calling the Verifier.Verified method will indicate
-// whether or not the stream of bytes matches the target digest.
-//
-// Missing Features
-//
-// In addition to the above, we intend to add the following features to this
-// package:
-//
-// 1. A Digester type that supports write sink digest calculation.
-//
-// 2. Suspend and resume of ongoing digest calculations to support efficient digest verification in the registry.
-//
-package digest
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/set.go b/Godeps/_workspace/src/github.com/docker/distribution/digest/set.go
deleted file mode 100644
index 3fac41b40f..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/digest/set.go
+++ /dev/null
@@ -1,245 +0,0 @@
-package digest
-
-import (
-	"errors"
-	"sort"
-	"strings"
-	"sync"
-)
-
-var (
-	// ErrDigestNotFound is used when a matching digest
-	// could not be found in a set.
-	ErrDigestNotFound = errors.New("digest not found")
-
-	// ErrDigestAmbiguous is used when multiple digests
-	// are found in a set. None of the matching digests
-	// should be considered valid matches.
-	ErrDigestAmbiguous = errors.New("ambiguous digest string")
-)
-
-// Set is used to hold a unique set of digests which
-// may be easily referenced by easily  referenced by a string
-// representation of the digest as well as short representation.
-// The uniqueness of the short representation is based on other
-// digests in the set. If digests are ommited from this set,
-// collisions in a larger set may not be detected, therefore it
-// is important to always do short representation lookups on
-// the complete set of digests. To mitigate collisions, an
-// appropriately long short code should be used.
-type Set struct {
-	mutex   sync.RWMutex
-	entries digestEntries
-}
-
-// NewSet creates an empty set of digests
-// which may have digests added.
-func NewSet() *Set {
-	return &Set{
-		entries: digestEntries{},
-	}
-}
-
-// checkShortMatch checks whether two digests match as either whole
-// values or short values. This function does not test equality,
-// rather whether the second value could match against the first
-// value.
-func checkShortMatch(alg Algorithm, hex, shortAlg, shortHex string) bool {
-	if len(hex) == len(shortHex) {
-		if hex != shortHex {
-			return false
-		}
-		if len(shortAlg) > 0 && string(alg) != shortAlg {
-			return false
-		}
-	} else if !strings.HasPrefix(hex, shortHex) {
-		return false
-	} else if len(shortAlg) > 0 && string(alg) != shortAlg {
-		return false
-	}
-	return true
-}
-
-// Lookup looks for a digest matching the given string representation.
-// If no digests could be found ErrDigestNotFound will be returned
-// with an empty digest value. If multiple matches are found
-// ErrDigestAmbiguous will be returned with an empty digest value.
-func (dst *Set) Lookup(d string) (Digest, error) {
-	dst.mutex.RLock()
-	defer dst.mutex.RUnlock()
-	if len(dst.entries) == 0 {
-		return "", ErrDigestNotFound
-	}
-	var (
-		searchFunc func(int) bool
-		alg        Algorithm
-		hex        string
-	)
-	dgst, err := ParseDigest(d)
-	if err == ErrDigestInvalidFormat {
-		hex = d
-		searchFunc = func(i int) bool {
-			return dst.entries[i].val >= d
-		}
-	} else {
-		hex = dgst.Hex()
-		alg = dgst.Algorithm()
-		searchFunc = func(i int) bool {
-			if dst.entries[i].val == hex {
-				return dst.entries[i].alg >= alg
-			}
-			return dst.entries[i].val >= hex
-		}
-	}
-	idx := sort.Search(len(dst.entries), searchFunc)
-	if idx == len(dst.entries) || !checkShortMatch(dst.entries[idx].alg, dst.entries[idx].val, string(alg), hex) {
-		return "", ErrDigestNotFound
-	}
-	if dst.entries[idx].alg == alg && dst.entries[idx].val == hex {
-		return dst.entries[idx].digest, nil
-	}
-	if idx+1 < len(dst.entries) && checkShortMatch(dst.entries[idx+1].alg, dst.entries[idx+1].val, string(alg), hex) {
-		return "", ErrDigestAmbiguous
-	}
-
-	return dst.entries[idx].digest, nil
-}
-
-// Add adds the given digest to the set. An error will be returned
-// if the given digest is invalid. If the digest already exists in the
-// set, this operation will be a no-op.
-func (dst *Set) Add(d Digest) error {
-	if err := d.Validate(); err != nil {
-		return err
-	}
-	dst.mutex.Lock()
-	defer dst.mutex.Unlock()
-	entry := &digestEntry{alg: d.Algorithm(), val: d.Hex(), digest: d}
-	searchFunc := func(i int) bool {
-		if dst.entries[i].val == entry.val {
-			return dst.entries[i].alg >= entry.alg
-		}
-		return dst.entries[i].val >= entry.val
-	}
-	idx := sort.Search(len(dst.entries), searchFunc)
-	if idx == len(dst.entries) {
-		dst.entries = append(dst.entries, entry)
-		return nil
-	} else if dst.entries[idx].digest == d {
-		return nil
-	}
-
-	entries := append(dst.entries, nil)
-	copy(entries[idx+1:], entries[idx:len(entries)-1])
-	entries[idx] = entry
-	dst.entries = entries
-	return nil
-}
-
-// Remove removes the given digest from the set. An err will be
-// returned if the given digest is invalid. If the digest does
-// not exist in the set, this operation will be a no-op.
-func (dst *Set) Remove(d Digest) error {
-	if err := d.Validate(); err != nil {
-		return err
-	}
-	dst.mutex.Lock()
-	defer dst.mutex.Unlock()
-	entry := &digestEntry{alg: d.Algorithm(), val: d.Hex(), digest: d}
-	searchFunc := func(i int) bool {
-		if dst.entries[i].val == entry.val {
-			return dst.entries[i].alg >= entry.alg
-		}
-		return dst.entries[i].val >= entry.val
-	}
-	idx := sort.Search(len(dst.entries), searchFunc)
-	// Not found if idx is after or value at idx is not digest
-	if idx == len(dst.entries) || dst.entries[idx].digest != d {
-		return nil
-	}
-
-	entries := dst.entries
-	copy(entries[idx:], entries[idx+1:])
-	entries = entries[:len(entries)-1]
-	dst.entries = entries
-
-	return nil
-}
-
-// All returns all the digests in the set
-func (dst *Set) All() []Digest {
-	dst.mutex.RLock()
-	defer dst.mutex.RUnlock()
-	retValues := make([]Digest, len(dst.entries))
-	for i := range dst.entries {
-		retValues[i] = dst.entries[i].digest
-	}
-
-	return retValues
-}
-
-// ShortCodeTable returns a map of Digest to unique short codes. The
-// length represents the minimum value, the maximum length may be the
-// entire value of digest if uniqueness cannot be achieved without the
-// full value. This function will attempt to make short codes as short
-// as possible to be unique.
-func ShortCodeTable(dst *Set, length int) map[Digest]string {
-	dst.mutex.RLock()
-	defer dst.mutex.RUnlock()
-	m := make(map[Digest]string, len(dst.entries))
-	l := length
-	resetIdx := 0
-	for i := 0; i < len(dst.entries); i++ {
-		var short string
-		extended := true
-		for extended {
-			extended = false
-			if len(dst.entries[i].val) <= l {
-				short = dst.entries[i].digest.String()
-			} else {
-				short = dst.entries[i].val[:l]
-				for j := i + 1; j < len(dst.entries); j++ {
-					if checkShortMatch(dst.entries[j].alg, dst.entries[j].val, "", short) {
-						if j > resetIdx {
-							resetIdx = j
-						}
-						extended = true
-					} else {
-						break
-					}
-				}
-				if extended {
-					l++
-				}
-			}
-		}
-		m[dst.entries[i].digest] = short
-		if i >= resetIdx {
-			l = length
-		}
-	}
-	return m
-}
-
-type digestEntry struct {
-	alg    Algorithm
-	val    string
-	digest Digest
-}
-
-type digestEntries []*digestEntry
-
-func (d digestEntries) Len() int {
-	return len(d)
-}
-
-func (d digestEntries) Less(i, j int) bool {
-	if d[i].val != d[j].val {
-		return d[i].val < d[j].val
-	}
-	return d[i].alg < d[j].alg
-}
-
-func (d digestEntries) Swap(i, j int) {
-	d[i], d[j] = d[j], d[i]
-}
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/digest/verifiers.go b/Godeps/_workspace/src/github.com/docker/distribution/digest/verifiers.go
deleted file mode 100644
index 9af3be1341..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/digest/verifiers.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package digest
-
-import (
-	"hash"
-	"io"
-)
-
-// Verifier presents a general verification interface to be used with message
-// digests and other byte stream verifications. Users instantiate a Verifier
-// from one of the various methods, write the data under test to it then check
-// the result with the Verified method.
-type Verifier interface {
-	io.Writer
-
-	// Verified will return true if the content written to Verifier matches
-	// the digest.
-	Verified() bool
-}
-
-// NewDigestVerifier returns a verifier that compares the written bytes
-// against a passed in digest.
-func NewDigestVerifier(d Digest) (Verifier, error) {
-	if err := d.Validate(); err != nil {
-		return nil, err
-	}
-
-	return hashVerifier{
-		hash:   d.Algorithm().Hash(),
-		digest: d,
-	}, nil
-}
-
-type hashVerifier struct {
-	digest Digest
-	hash   hash.Hash
-}
-
-func (hv hashVerifier) Write(p []byte) (n int, err error) {
-	return hv.hash.Write(p)
-}
-
-func (hv hashVerifier) Verified() bool {
-	return hv.digest == NewDigest(hv.digest.Algorithm(), hv.hash)
-}
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/reference/reference.go b/Godeps/_workspace/src/github.com/docker/distribution/reference/reference.go
deleted file mode 100644
index c188472a40..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/reference/reference.go
+++ /dev/null
@@ -1,334 +0,0 @@
-// Package reference provides a general type to represent any way of referencing images within the registry.
-// Its main purpose is to abstract tags and digests (content-addressable hash).
-//
-// Grammar
-//
-// 	reference                       := repository [ ":" tag ] [ "@" digest ]
-//	name                            := [hostname '/'] component ['/' component]*
-//	hostname                        := hostcomponent ['.' hostcomponent]* [':' port-number]
-//	hostcomponent                   := /([a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])/
-//	port-number                     := /[0-9]+/
-//	component                       := alpha-numeric [separator alpha-numeric]*
-// 	alpha-numeric                   := /[a-z0-9]+/
-//	separator                       := /[_.]|__|[-]*/
-//
-//	tag                             := /[\w][\w.-]{0,127}/
-//
-//	digest                          := digest-algorithm ":" digest-hex
-//	digest-algorithm                := digest-algorithm-component [ digest-algorithm-separator digest-algorithm-component ]
-//	digest-algorithm-separator      := /[+.-_]/
-//	digest-algorithm-component      := /[A-Za-z][A-Za-z0-9]*/
-//	digest-hex                      := /[0-9a-fA-F]{32,}/ ; At least 128 bit digest value
-package reference
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/docker/distribution/digest"
-)
-
-const (
-	// NameTotalLengthMax is the maximum total number of characters in a repository name.
-	NameTotalLengthMax = 255
-)
-
-var (
-	// ErrReferenceInvalidFormat represents an error while trying to parse a string as a reference.
-	ErrReferenceInvalidFormat = errors.New("invalid reference format")
-
-	// ErrTagInvalidFormat represents an error while trying to parse a string as a tag.
-	ErrTagInvalidFormat = errors.New("invalid tag format")
-
-	// ErrDigestInvalidFormat represents an error while trying to parse a string as a tag.
-	ErrDigestInvalidFormat = errors.New("invalid digest format")
-
-	// ErrNameEmpty is returned for empty, invalid repository names.
-	ErrNameEmpty = errors.New("repository name must have at least one component")
-
-	// ErrNameTooLong is returned when a repository name is longer than NameTotalLengthMax.
-	ErrNameTooLong = fmt.Errorf("repository name must not be more than %v characters", NameTotalLengthMax)
-)
-
-// Reference is an opaque object reference identifier that may include
-// modifiers such as a hostname, name, tag, and digest.
-type Reference interface {
-	// String returns the full reference
-	String() string
-}
-
-// Field provides a wrapper type for resolving correct reference types when
-// working with encoding.
-type Field struct {
-	reference Reference
-}
-
-// AsField wraps a reference in a Field for encoding.
-func AsField(reference Reference) Field {
-	return Field{reference}
-}
-
-// Reference unwraps the reference type from the field to
-// return the Reference object. This object should be
-// of the appropriate type to further check for different
-// reference types.
-func (f Field) Reference() Reference {
-	return f.reference
-}
-
-// MarshalText serializes the field to byte text which
-// is the string of the reference.
-func (f Field) MarshalText() (p []byte, err error) {
-	return []byte(f.reference.String()), nil
-}
-
-// UnmarshalText parses text bytes by invoking the
-// reference parser to ensure the appropriately
-// typed reference object is wrapped by field.
-func (f *Field) UnmarshalText(p []byte) error {
-	r, err := Parse(string(p))
-	if err != nil {
-		return err
-	}
-
-	f.reference = r
-	return nil
-}
-
-// Named is an object with a full name
-type Named interface {
-	Reference
-	Name() string
-}
-
-// Tagged is an object which has a tag
-type Tagged interface {
-	Reference
-	Tag() string
-}
-
-// NamedTagged is an object including a name and tag.
-type NamedTagged interface {
-	Named
-	Tag() string
-}
-
-// Digested is an object which has a digest
-// in which it can be referenced by
-type Digested interface {
-	Reference
-	Digest() digest.Digest
-}
-
-// Canonical reference is an object with a fully unique
-// name including a name with hostname and digest
-type Canonical interface {
-	Named
-	Digest() digest.Digest
-}
-
-// SplitHostname splits a named reference into a
-// hostname and name string. If no valid hostname is
-// found, the hostname is empty and the full value
-// is returned as name
-func SplitHostname(named Named) (string, string) {
-	name := named.Name()
-	match := anchoredNameRegexp.FindStringSubmatch(name)
-	if match == nil || len(match) != 3 {
-		return "", name
-	}
-	return match[1], match[2]
-}
-
-// Parse parses s and returns a syntactically valid Reference.
-// If an error was encountered it is returned, along with a nil Reference.
-// NOTE: Parse will not handle short digests.
-func Parse(s string) (Reference, error) {
-	matches := ReferenceRegexp.FindStringSubmatch(s)
-	if matches == nil {
-		if s == "" {
-			return nil, ErrNameEmpty
-		}
-		// TODO(dmcgowan): Provide more specific and helpful error
-		return nil, ErrReferenceInvalidFormat
-	}
-
-	if len(matches[1]) > NameTotalLengthMax {
-		return nil, ErrNameTooLong
-	}
-
-	ref := reference{
-		name: matches[1],
-		tag:  matches[2],
-	}
-	if matches[3] != "" {
-		var err error
-		ref.digest, err = digest.ParseDigest(matches[3])
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	r := getBestReferenceType(ref)
-	if r == nil {
-		return nil, ErrNameEmpty
-	}
-
-	return r, nil
-}
-
-// ParseNamed parses s and returns a syntactically valid reference implementing
-// the Named interface. The reference must have a name, otherwise an error is
-// returned.
-// If an error was encountered it is returned, along with a nil Reference.
-// NOTE: ParseNamed will not handle short digests.
-func ParseNamed(s string) (Named, error) {
-	ref, err := Parse(s)
-	if err != nil {
-		return nil, err
-	}
-	named, isNamed := ref.(Named)
-	if !isNamed {
-		return nil, fmt.Errorf("reference %s has no name", ref.String())
-	}
-	return named, nil
-}
-
-// WithName returns a named object representing the given string. If the input
-// is invalid ErrReferenceInvalidFormat will be returned.
-func WithName(name string) (Named, error) {
-	if len(name) > NameTotalLengthMax {
-		return nil, ErrNameTooLong
-	}
-	if !anchoredNameRegexp.MatchString(name) {
-		return nil, ErrReferenceInvalidFormat
-	}
-	return repository(name), nil
-}
-
-// WithTag combines the name from "name" and the tag from "tag" to form a
-// reference incorporating both the name and the tag.
-func WithTag(name Named, tag string) (NamedTagged, error) {
-	if !anchoredTagRegexp.MatchString(tag) {
-		return nil, ErrTagInvalidFormat
-	}
-	return taggedReference{
-		name: name.Name(),
-		tag:  tag,
-	}, nil
-}
-
-// WithDigest combines the name from "name" and the digest from "digest" to form
-// a reference incorporating both the name and the digest.
-func WithDigest(name Named, digest digest.Digest) (Canonical, error) {
-	if !anchoredDigestRegexp.MatchString(digest.String()) {
-		return nil, ErrDigestInvalidFormat
-	}
-	return canonicalReference{
-		name:   name.Name(),
-		digest: digest,
-	}, nil
-}
-
-func getBestReferenceType(ref reference) Reference {
-	if ref.name == "" {
-		// Allow digest only references
-		if ref.digest != "" {
-			return digestReference(ref.digest)
-		}
-		return nil
-	}
-	if ref.tag == "" {
-		if ref.digest != "" {
-			return canonicalReference{
-				name:   ref.name,
-				digest: ref.digest,
-			}
-		}
-		return repository(ref.name)
-	}
-	if ref.digest == "" {
-		return taggedReference{
-			name: ref.name,
-			tag:  ref.tag,
-		}
-	}
-
-	return ref
-}
-
-type reference struct {
-	name   string
-	tag    string
-	digest digest.Digest
-}
-
-func (r reference) String() string {
-	return r.name + ":" + r.tag + "@" + r.digest.String()
-}
-
-func (r reference) Name() string {
-	return r.name
-}
-
-func (r reference) Tag() string {
-	return r.tag
-}
-
-func (r reference) Digest() digest.Digest {
-	return r.digest
-}
-
-type repository string
-
-func (r repository) String() string {
-	return string(r)
-}
-
-func (r repository) Name() string {
-	return string(r)
-}
-
-type digestReference digest.Digest
-
-func (d digestReference) String() string {
-	return d.String()
-}
-
-func (d digestReference) Digest() digest.Digest {
-	return digest.Digest(d)
-}
-
-type taggedReference struct {
-	name string
-	tag  string
-}
-
-func (t taggedReference) String() string {
-	return t.name + ":" + t.tag
-}
-
-func (t taggedReference) Name() string {
-	return t.name
-}
-
-func (t taggedReference) Tag() string {
-	return t.tag
-}
-
-type canonicalReference struct {
-	name   string
-	digest digest.Digest
-}
-
-func (c canonicalReference) String() string {
-	return c.name + "@" + c.digest.String()
-}
-
-func (c canonicalReference) Name() string {
-	return c.name
-}
-
-func (c canonicalReference) Digest() digest.Digest {
-	return c.digest
-}
diff --git a/Godeps/_workspace/src/github.com/docker/distribution/reference/regexp.go b/Godeps/_workspace/src/github.com/docker/distribution/reference/regexp.go
deleted file mode 100644
index a4ffe5b642..0000000000
--- a/Godeps/_workspace/src/github.com/docker/distribution/reference/regexp.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package reference
-
-import "regexp"
-
-var (
-	// alphaNumericRegexp defines the alpha numeric atom, typically a
-	// component of names. This only allows lower case characters and digits.
-	alphaNumericRegexp = match(`[a-z0-9]+`)
-
-	// separatorRegexp defines the separators allowed to be embedded in name
-	// components. This allow one period, one or two underscore and multiple
-	// dashes.
-	separatorRegexp = match(`(?:[._]|__|[-]*)`)
-
-	// nameComponentRegexp restricts registry path component names to start
-	// with at least one letter or number, with following parts able to be
-	// separated by one period, one or two underscore and multiple dashes.
-	nameComponentRegexp = expression(
-		alphaNumericRegexp,
-		optional(repeated(separatorRegexp, alphaNumericRegexp)))
-
-	// hostnameComponentRegexp restricts the registry hostname component of a
-	// repository name to start with a component as defined by hostnameRegexp
-	// and followed by an optional port.
-	hostnameComponentRegexp = match(`(?:[a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])`)
-
-	// hostnameRegexp defines the structure of potential hostname components
-	// that may be part of image names. This is purposely a subset of what is
-	// allowed by DNS to ensure backwards compatibility with Docker image
-	// names.
-	hostnameRegexp = expression(
-		hostnameComponentRegexp,
-		optional(repeated(literal(`.`), hostnameComponentRegexp)),
-		optional(literal(`:`), match(`[0-9]+`)))
-
-	// TagRegexp matches valid tag names. From docker/docker:graph/tags.go.
-	TagRegexp = match(`[\w][\w.-]{0,127}`)
-
-	// anchoredTagRegexp matches valid tag names, anchored at the start and
-	// end of the matched string.
-	anchoredTagRegexp = anchored(TagRegexp)
-
-	// DigestRegexp matches valid digests.
-	DigestRegexp = match(`[A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][[:xdigit:]]{32,}`)
-
-	// anchoredDigestRegexp matches valid digests, anchored at the start and
-	// end of the matched string.
-	anchoredDigestRegexp = anchored(DigestRegexp)
-
-	// NameRegexp is the format for the name component of references. The
-	// regexp has capturing groups for the hostname and name part omitting
-	// the seperating forward slash from either.
-	NameRegexp = expression(
-		optional(hostnameRegexp, literal(`/`)),
-		nameComponentRegexp,
-		optional(repeated(literal(`/`), nameComponentRegexp)))
-
-	// anchoredNameRegexp is used to parse a name value, capturing the
-	// hostname and trailing components.
-	anchoredNameRegexp = anchored(
-		optional(capture(hostnameRegexp), literal(`/`)),
-		capture(nameComponentRegexp,
-			optional(repeated(literal(`/`), nameComponentRegexp))))
-
-	// ReferenceRegexp is the full supported format of a reference. The regexp
-	// is anchored and has capturing groups for name, tag, and digest
-	// components.
-	ReferenceRegexp = anchored(capture(NameRegexp),
-		optional(literal(":"), capture(TagRegexp)),
-		optional(literal("@"), capture(DigestRegexp)))
-)
-
-// match compiles the string to a regular expression.
-var match = regexp.MustCompile
-
-// literal compiles s into a literal regular expression, escaping any regexp
-// reserved characters.
-func literal(s string) *regexp.Regexp {
-	re := match(regexp.QuoteMeta(s))
-
-	if _, complete := re.LiteralPrefix(); !complete {
-		panic("must be a literal")
-	}
-
-	return re
-}
-
-// expression defines a full expression, where each regular expression must
-// follow the previous.
-func expression(res ...*regexp.Regexp) *regexp.Regexp {
-	var s string
-	for _, re := range res {
-		s += re.String()
-	}
-
-	return match(s)
-}
-
-// optional wraps the expression in a non-capturing group and makes the
-// production optional.
-func optional(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(group(expression(res...)).String() + `?`)
-}
-
-// repeated wraps the regexp in a non-capturing group to get one or more
-// matches.
-func repeated(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(group(expression(res...)).String() + `+`)
-}
-
-// group wraps the regexp in a non-capturing group.
-func group(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(`(?:` + expression(res...).String() + `)`)
-}
-
-// capture wraps the expression in a capturing group.
-func capture(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(`(` + expression(res...).String() + `)`)
-}
-
-// anchored anchors the regular expression by adding start and end delimiters.
-func anchored(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(`^` + expression(res...).String() + `$`)
-}
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/.gitignore b/Godeps/_workspace/src/github.com/dustin/go-humanize/.gitignore
deleted file mode 100644
index 05b40514a7..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-#*
-*.[568]
-*.a
-*~
-[568].out
-_*
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/LICENSE b/Godeps/_workspace/src/github.com/dustin/go-humanize/LICENSE
deleted file mode 100644
index 8d9a94a906..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 2005-2008  Dustin Sallings <dustin@spy.net>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-<http://www.opensource.org/licenses/mit-license.php>
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/README.markdown b/Godeps/_workspace/src/github.com/dustin/go-humanize/README.markdown
deleted file mode 100644
index f94e8154f6..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/README.markdown
+++ /dev/null
@@ -1,81 +0,0 @@
-# Humane Units
-
-Just a few functions for helping humanize times and sizes.
-
-`go get` it as `github.com/dustin/go-humanize`, import it as
-`"github.com/dustin/go-humanize"`, use it as `humanize`
-
-See [godoc](https://godoc.org/github.com/dustin/go-humanize) for
-complete documentation.
-
-## Sizes
-
-This lets you take numbers like `82854982` and convert them to useful
-strings like, `83MB` or `79MiB` (whichever you prefer).
-
-Example:
-
-    fmt.Printf("That file is %s.", humanize.Bytes(82854982))
-
-## Times
-
-This lets you take a `time.Time` and spit it out in relative terms.
-For example, `12 seconds ago` or `3 days from now`.
-
-Example:
-
-    fmt.Printf("This was touched %s", humanize.Time(someTimeInstance))
-
-Thanks to Kyle Lemons for the time implementation from an IRC
-conversation one day.  It's pretty neat.
-
-## Ordinals
-
-From a [mailing list discussion][odisc] where a user wanted to be able
-to label ordinals.
-
-    0 -> 0th
-    1 -> 1st
-    2 -> 2nd
-    3 -> 3rd
-    4 -> 4th
-    [...]
-
-Example:
-
-    fmt.Printf("You're my %s best friend.", humanize.Ordinal(193))
-
-## Commas
-
-Want to shove commas into numbers?  Be my guest.
-
-    0 -> 0
-    100 -> 100
-    1000 -> 1,000
-    1000000000 -> 1,000,000,000
-    -100000 -> -100,000
-
-Example:
-
-    fmt.Printf("You owe $%s.\n", humanize.Comma(6582491))
-
-## Ftoa
-
-Nicer float64 formatter that removes trailing zeros.
-
-    fmt.Printf("%f", 2.24)                   // 2.240000
-    fmt.Printf("%s", humanize.Ftoa(2.24))    // 2.24
-    fmt.Printf("%f", 2.0)                    // 2.000000
-    fmt.Printf("%s", humanize.Ftoa(2.0))     // 2
-
-## SI notation
-
-Format numbers with [SI notation][sinotation].
-
-Example:
-
-    humanize.SI(0.00000000223, "M")    // 2.23nM
-
-
-[odisc]: https://groups.google.com/d/topic/golang-nuts/l8NhI74jl-4/discussion
-[sinotation]: http://en.wikipedia.org/wiki/Metric_prefix
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/big.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/big.go
deleted file mode 100644
index f49dc337dc..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/big.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package humanize
-
-import (
-	"math/big"
-)
-
-// order of magnitude (to a max order)
-func oomm(n, b *big.Int, maxmag int) (float64, int) {
-	mag := 0
-	m := &big.Int{}
-	for n.Cmp(b) >= 0 {
-		n.DivMod(n, b, m)
-		mag++
-		if mag == maxmag && maxmag >= 0 {
-			break
-		}
-	}
-	return float64(n.Int64()) + (float64(m.Int64()) / float64(b.Int64())), mag
-}
-
-// total order of magnitude
-// (same as above, but with no upper limit)
-func oom(n, b *big.Int) (float64, int) {
-	mag := 0
-	m := &big.Int{}
-	for n.Cmp(b) >= 0 {
-		n.DivMod(n, b, m)
-		mag++
-	}
-	return float64(n.Int64()) + (float64(m.Int64()) / float64(b.Int64())), mag
-}
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/bigbytes.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/bigbytes.go
deleted file mode 100644
index e4a814a904..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/bigbytes.go
+++ /dev/null
@@ -1,164 +0,0 @@
-package humanize
-
-import (
-	"fmt"
-	"math/big"
-	"strings"
-	"unicode"
-)
-
-var (
-	bigIECExp = big.NewInt(1024)
-
-	// BigByte is one byte in bit.Ints
-	BigByte = big.NewInt(1)
-	// BigKiByte is 1,024 bytes in bit.Ints
-	BigKiByte = (&big.Int{}).Mul(BigByte, bigIECExp)
-	// BigMiByte is 1,024 k bytes in bit.Ints
-	BigMiByte = (&big.Int{}).Mul(BigKiByte, bigIECExp)
-	// BigGiByte is 1,024 m bytes in bit.Ints
-	BigGiByte = (&big.Int{}).Mul(BigMiByte, bigIECExp)
-	// BigTiByte is 1,024 g bytes in bit.Ints
-	BigTiByte = (&big.Int{}).Mul(BigGiByte, bigIECExp)
-	// BigPiByte is 1,024 t bytes in bit.Ints
-	BigPiByte = (&big.Int{}).Mul(BigTiByte, bigIECExp)
-	// BigEiByte is 1,024 p bytes in bit.Ints
-	BigEiByte = (&big.Int{}).Mul(BigPiByte, bigIECExp)
-	// BigZiByte is 1,024 e bytes in bit.Ints
-	BigZiByte = (&big.Int{}).Mul(BigEiByte, bigIECExp)
-	// BigYiByte is 1,024 z bytes in bit.Ints
-	BigYiByte = (&big.Int{}).Mul(BigZiByte, bigIECExp)
-)
-
-var (
-	bigSIExp = big.NewInt(1000)
-
-	// BigSIByte is one SI byte in big.Ints
-	BigSIByte = big.NewInt(1)
-	// BigKByte is 1,000 SI bytes in big.Ints
-	BigKByte = (&big.Int{}).Mul(BigSIByte, bigSIExp)
-	// BigMByte is 1,000 SI k bytes in big.Ints
-	BigMByte = (&big.Int{}).Mul(BigKByte, bigSIExp)
-	// BigGByte is 1,000 SI m bytes in big.Ints
-	BigGByte = (&big.Int{}).Mul(BigMByte, bigSIExp)
-	// BigTByte is 1,000 SI g bytes in big.Ints
-	BigTByte = (&big.Int{}).Mul(BigGByte, bigSIExp)
-	// BigPByte is 1,000 SI t bytes in big.Ints
-	BigPByte = (&big.Int{}).Mul(BigTByte, bigSIExp)
-	// BigEByte is 1,000 SI p bytes in big.Ints
-	BigEByte = (&big.Int{}).Mul(BigPByte, bigSIExp)
-	// BigZByte is 1,000 SI e bytes in big.Ints
-	BigZByte = (&big.Int{}).Mul(BigEByte, bigSIExp)
-	// BigYByte is 1,000 SI z bytes in big.Ints
-	BigYByte = (&big.Int{}).Mul(BigZByte, bigSIExp)
-)
-
-var bigBytesSizeTable = map[string]*big.Int{
-	"b":   BigByte,
-	"kib": BigKiByte,
-	"kb":  BigKByte,
-	"mib": BigMiByte,
-	"mb":  BigMByte,
-	"gib": BigGiByte,
-	"gb":  BigGByte,
-	"tib": BigTiByte,
-	"tb":  BigTByte,
-	"pib": BigPiByte,
-	"pb":  BigPByte,
-	"eib": BigEiByte,
-	"eb":  BigEByte,
-	"zib": BigZiByte,
-	"zb":  BigZByte,
-	"yib": BigYiByte,
-	"yb":  BigYByte,
-	// Without suffix
-	"":   BigByte,
-	"ki": BigKiByte,
-	"k":  BigKByte,
-	"mi": BigMiByte,
-	"m":  BigMByte,
-	"gi": BigGiByte,
-	"g":  BigGByte,
-	"ti": BigTiByte,
-	"t":  BigTByte,
-	"pi": BigPiByte,
-	"p":  BigPByte,
-	"ei": BigEiByte,
-	"e":  BigEByte,
-	"z":  BigZByte,
-	"zi": BigZiByte,
-	"y":  BigYByte,
-	"yi": BigYiByte,
-}
-
-var ten = big.NewInt(10)
-
-func humanateBigBytes(s, base *big.Int, sizes []string) string {
-	if s.Cmp(ten) < 0 {
-		return fmt.Sprintf("%dB", s)
-	}
-	c := (&big.Int{}).Set(s)
-	val, mag := oomm(c, base, len(sizes)-1)
-	suffix := sizes[mag]
-	f := "%.0f%s"
-	if val < 10 {
-		f = "%.1f%s"
-	}
-
-	return fmt.Sprintf(f, val, suffix)
-
-}
-
-// BigBytes produces a human readable representation of an SI size.
-//
-// See also: ParseBigBytes.
-//
-// BigBytes(82854982) -> 83MB
-func BigBytes(s *big.Int) string {
-	sizes := []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
-	return humanateBigBytes(s, bigSIExp, sizes)
-}
-
-// BigIBytes produces a human readable representation of an IEC size.
-//
-// See also: ParseBigBytes.
-//
-// BigIBytes(82854982) -> 79MiB
-func BigIBytes(s *big.Int) string {
-	sizes := []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"}
-	return humanateBigBytes(s, bigIECExp, sizes)
-}
-
-// ParseBigBytes parses a string representation of bytes into the number
-// of bytes it represents.
-//
-// See also: BigBytes, BigIBytes.
-//
-// ParseBigBytes("42MB") -> 42000000, nil
-// ParseBigBytes("42mib") -> 44040192, nil
-func ParseBigBytes(s string) (*big.Int, error) {
-	lastDigit := 0
-	for _, r := range s {
-		if !(unicode.IsDigit(r) || r == '.') {
-			break
-		}
-		lastDigit++
-	}
-
-	val := &big.Rat{}
-	_, err := fmt.Sscanf(s[:lastDigit], "%f", val)
-	if err != nil {
-		return nil, err
-	}
-
-	extra := strings.ToLower(strings.TrimSpace(s[lastDigit:]))
-	if m, ok := bigBytesSizeTable[extra]; ok {
-		mv := (&big.Rat{}).SetInt(m)
-		val.Mul(val, mv)
-		rv := &big.Int{}
-		rv.Div(val.Num(), val.Denom())
-		return rv, nil
-	}
-
-	return nil, fmt.Errorf("unhandled size name: %v", extra)
-}
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/bytes.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/bytes.go
deleted file mode 100644
index b7a77b5296..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/bytes.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package humanize
-
-import (
-	"fmt"
-	"math"
-	"strconv"
-	"strings"
-	"unicode"
-)
-
-// IEC Sizes.
-// kibis of bits
-const (
-	Byte = 1 << (iota * 10)
-	KiByte
-	MiByte
-	GiByte
-	TiByte
-	PiByte
-	EiByte
-)
-
-// SI Sizes.
-const (
-	IByte = 1
-	KByte = IByte * 1000
-	MByte = KByte * 1000
-	GByte = MByte * 1000
-	TByte = GByte * 1000
-	PByte = TByte * 1000
-	EByte = PByte * 1000
-)
-
-var bytesSizeTable = map[string]uint64{
-	"b":   Byte,
-	"kib": KiByte,
-	"kb":  KByte,
-	"mib": MiByte,
-	"mb":  MByte,
-	"gib": GiByte,
-	"gb":  GByte,
-	"tib": TiByte,
-	"tb":  TByte,
-	"pib": PiByte,
-	"pb":  PByte,
-	"eib": EiByte,
-	"eb":  EByte,
-	// Without suffix
-	"":   Byte,
-	"ki": KiByte,
-	"k":  KByte,
-	"mi": MiByte,
-	"m":  MByte,
-	"gi": GiByte,
-	"g":  GByte,
-	"ti": TiByte,
-	"t":  TByte,
-	"pi": PiByte,
-	"p":  PByte,
-	"ei": EiByte,
-	"e":  EByte,
-}
-
-func logn(n, b float64) float64 {
-	return math.Log(n) / math.Log(b)
-}
-
-func humanateBytes(s uint64, base float64, sizes []string) string {
-	if s < 10 {
-		return fmt.Sprintf("%dB", s)
-	}
-	e := math.Floor(logn(float64(s), base))
-	suffix := sizes[int(e)]
-	val := math.Floor(float64(s)/math.Pow(base, e)*10+0.5) / 10
-	f := "%.0f%s"
-	if val < 10 {
-		f = "%.1f%s"
-	}
-
-	return fmt.Sprintf(f, val, suffix)
-}
-
-// Bytes produces a human readable representation of an SI size.
-//
-// See also: ParseBytes.
-//
-// Bytes(82854982) -> 83MB
-func Bytes(s uint64) string {
-	sizes := []string{"B", "kB", "MB", "GB", "TB", "PB", "EB"}
-	return humanateBytes(s, 1000, sizes)
-}
-
-// IBytes produces a human readable representation of an IEC size.
-//
-// See also: ParseBytes.
-//
-// IBytes(82854982) -> 79MiB
-func IBytes(s uint64) string {
-	sizes := []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"}
-	return humanateBytes(s, 1024, sizes)
-}
-
-// ParseBytes parses a string representation of bytes into the number
-// of bytes it represents.
-//
-// See Also: Bytes, IBytes.
-//
-// ParseBytes("42MB") -> 42000000, nil
-// ParseBytes("42mib") -> 44040192, nil
-func ParseBytes(s string) (uint64, error) {
-	lastDigit := 0
-	for _, r := range s {
-		if !(unicode.IsDigit(r) || r == '.') {
-			break
-		}
-		lastDigit++
-	}
-
-	f, err := strconv.ParseFloat(s[:lastDigit], 64)
-	if err != nil {
-		return 0, err
-	}
-
-	extra := strings.ToLower(strings.TrimSpace(s[lastDigit:]))
-	if m, ok := bytesSizeTable[extra]; ok {
-		f *= float64(m)
-		if f >= math.MaxUint64 {
-			return 0, fmt.Errorf("too large: %v", s)
-		}
-		return uint64(f), nil
-	}
-
-	return 0, fmt.Errorf("unhandled size name: %v", extra)
-}
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/comma.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/comma.go
deleted file mode 100644
index b65ea6fa78..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/comma.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package humanize
-
-import (
-	"bytes"
-	"math/big"
-	"strconv"
-	"strings"
-)
-
-// Comma produces a string form of the given number in base 10 with
-// commas after every three orders of magnitude.
-//
-// e.g. Comma(834142) -> 834,142
-func Comma(v int64) string {
-	sign := ""
-	if v < 0 {
-		sign = "-"
-		v = 0 - v
-	}
-
-	parts := []string{"", "", "", "", "", "", ""}
-	j := len(parts) - 1
-
-	for v > 999 {
-		parts[j] = strconv.FormatInt(v%1000, 10)
-		switch len(parts[j]) {
-		case 2:
-			parts[j] = "0" + parts[j]
-		case 1:
-			parts[j] = "00" + parts[j]
-		}
-		v = v / 1000
-		j--
-	}
-	parts[j] = strconv.Itoa(int(v))
-	return sign + strings.Join(parts[j:], ",")
-}
-
-// Commaf produces a string form of the given number in base 10 with
-// commas after every three orders of magnitude.
-//
-// e.g. Comma(834142.32) -> 834,142.32
-func Commaf(v float64) string {
-	buf := &bytes.Buffer{}
-	if v < 0 {
-		buf.Write([]byte{'-'})
-		v = 0 - v
-	}
-
-	comma := []byte{','}
-
-	parts := strings.Split(strconv.FormatFloat(v, 'f', -1, 64), ".")
-	pos := 0
-	if len(parts[0])%3 != 0 {
-		pos += len(parts[0]) % 3
-		buf.WriteString(parts[0][:pos])
-		buf.Write(comma)
-	}
-	for ; pos < len(parts[0]); pos += 3 {
-		buf.WriteString(parts[0][pos : pos+3])
-		buf.Write(comma)
-	}
-	buf.Truncate(buf.Len() - 1)
-
-	if len(parts) > 1 {
-		buf.Write([]byte{'.'})
-		buf.WriteString(parts[1])
-	}
-	return buf.String()
-}
-
-// BigComma produces a string form of the given big.Int in base 10
-// with commas after every three orders of magnitude.
-func BigComma(b *big.Int) string {
-	sign := ""
-	if b.Sign() < 0 {
-		sign = "-"
-		b.Abs(b)
-	}
-
-	athousand := big.NewInt(1000)
-	c := (&big.Int{}).Set(b)
-	_, m := oom(c, athousand)
-	parts := make([]string, m+1)
-	j := len(parts) - 1
-
-	mod := &big.Int{}
-	for b.Cmp(athousand) >= 0 {
-		b.DivMod(b, athousand, mod)
-		parts[j] = strconv.FormatInt(mod.Int64(), 10)
-		switch len(parts[j]) {
-		case 2:
-			parts[j] = "0" + parts[j]
-		case 1:
-			parts[j] = "00" + parts[j]
-		}
-		j--
-	}
-	parts[j] = strconv.Itoa(int(b.Int64()))
-	return sign + strings.Join(parts[j:], ",")
-}
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/ftoa.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/ftoa.go
deleted file mode 100644
index c76190b106..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/ftoa.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package humanize
-
-import "strconv"
-
-func stripTrailingZeros(s string) string {
-	offset := len(s) - 1
-	for offset > 0 {
-		if s[offset] == '.' {
-			offset--
-			break
-		}
-		if s[offset] != '0' {
-			break
-		}
-		offset--
-	}
-	return s[:offset+1]
-}
-
-// Ftoa converts a float to a string with no trailing zeros.
-func Ftoa(num float64) string {
-	return stripTrailingZeros(strconv.FormatFloat(num, 'f', 6, 64))
-}
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/humanize.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/humanize.go
deleted file mode 100644
index a69540a06b..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/humanize.go
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-Package humanize converts boring ugly numbers to human-friendly strings and back.
-
-Durations can be turned into strings such as "3 days ago", numbers
-representing sizes like 82854982 into useful strings like, "83MB" or
-"79MiB" (whichever you prefer).
-*/
-package humanize
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/number.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/number.go
deleted file mode 100644
index 32141348c8..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/number.go
+++ /dev/null
@@ -1,192 +0,0 @@
-package humanize
-
-/*
-Slightly adapted from the source to fit go-humanize.
-
-Author: https://github.com/gorhill
-Source: https://gist.github.com/gorhill/5285193
-
-*/
-
-import (
-	"math"
-	"strconv"
-)
-
-var (
-	renderFloatPrecisionMultipliers = [...]float64{
-		1,
-		10,
-		100,
-		1000,
-		10000,
-		100000,
-		1000000,
-		10000000,
-		100000000,
-		1000000000,
-	}
-
-	renderFloatPrecisionRounders = [...]float64{
-		0.5,
-		0.05,
-		0.005,
-		0.0005,
-		0.00005,
-		0.000005,
-		0.0000005,
-		0.00000005,
-		0.000000005,
-		0.0000000005,
-	}
-)
-
-// FormatFloat produces a formatted number as string based on the following user-specified criteria:
-// * thousands separator
-// * decimal separator
-// * decimal precision
-//
-// Usage: s := RenderFloat(format, n)
-// The format parameter tells how to render the number n.
-//
-// See examples: http://play.golang.org/p/LXc1Ddm1lJ
-//
-// Examples of format strings, given n = 12345.6789:
-// "#,###.##" => "12,345.67"
-// "#,###." => "12,345"
-// "#,###" => "12345,678"
-// "#\u202F###,##" => "12 345,68"
-// "#.###,###### => 12.345,678900
-// "" (aka default format) => 12,345.67
-//
-// The highest precision allowed is 9 digits after the decimal symbol.
-// There is also a version for integer number, FormatInteger(),
-// which is convenient for calls within template.
-func FormatFloat(format string, n float64) string {
-	// Special cases:
-	//   NaN = "NaN"
-	//   +Inf = "+Infinity"
-	//   -Inf = "-Infinity"
-	if math.IsNaN(n) {
-		return "NaN"
-	}
-	if n > math.MaxFloat64 {
-		return "Infinity"
-	}
-	if n < -math.MaxFloat64 {
-		return "-Infinity"
-	}
-
-	// default format
-	precision := 2
-	decimalStr := "."
-	thousandStr := ","
-	positiveStr := ""
-	negativeStr := "-"
-
-	if len(format) > 0 {
-		format := []rune(format)
-
-		// If there is an explicit format directive,
-		// then default values are these:
-		precision = 9
-		thousandStr = ""
-
-		// collect indices of meaningful formatting directives
-		formatIndx := []int{}
-		for i, char := range format {
-			if char != '#' && char != '0' {
-				formatIndx = append(formatIndx, i)
-			}
-		}
-
-		if len(formatIndx) > 0 {
-			// Directive at index 0:
-			//   Must be a '+'
-			//   Raise an error if not the case
-			// index: 0123456789
-			//        +0.000,000
-			//        +000,000.0
-			//        +0000.00
-			//        +0000
-			if formatIndx[0] == 0 {
-				if format[formatIndx[0]] != '+' {
-					panic("RenderFloat(): invalid positive sign directive")
-				}
-				positiveStr = "+"
-				formatIndx = formatIndx[1:]
-			}
-
-			// Two directives:
-			//   First is thousands separator
-			//   Raise an error if not followed by 3-digit
-			// 0123456789
-			// 0.000,000
-			// 000,000.00
-			if len(formatIndx) == 2 {
-				if (formatIndx[1] - formatIndx[0]) != 4 {
-					panic("RenderFloat(): thousands separator directive must be followed by 3 digit-specifiers")
-				}
-				thousandStr = string(format[formatIndx[0]])
-				formatIndx = formatIndx[1:]
-			}
-
-			// One directive:
-			//   Directive is decimal separator
-			//   The number of digit-specifier following the separator indicates wanted precision
-			// 0123456789
-			// 0.00
-			// 000,0000
-			if len(formatIndx) == 1 {
-				decimalStr = string(format[formatIndx[0]])
-				precision = len(format) - formatIndx[0] - 1
-			}
-		}
-	}
-
-	// generate sign part
-	var signStr string
-	if n >= 0.000000001 {
-		signStr = positiveStr
-	} else if n <= -0.000000001 {
-		signStr = negativeStr
-		n = -n
-	} else {
-		signStr = ""
-		n = 0.0
-	}
-
-	// split number into integer and fractional parts
-	intf, fracf := math.Modf(n + renderFloatPrecisionRounders[precision])
-
-	// generate integer part string
-	intStr := strconv.Itoa(int(intf))
-
-	// add thousand separator if required
-	if len(thousandStr) > 0 {
-		for i := len(intStr); i > 3; {
-			i -= 3
-			intStr = intStr[:i] + thousandStr + intStr[i:]
-		}
-	}
-
-	// no fractional part, we can leave now
-	if precision == 0 {
-		return signStr + intStr
-	}
-
-	// generate fractional part
-	fracStr := strconv.Itoa(int(fracf * renderFloatPrecisionMultipliers[precision]))
-	// may need padding
-	if len(fracStr) < precision {
-		fracStr = "000000000000000"[:precision-len(fracStr)] + fracStr
-	}
-
-	return signStr + intStr + decimalStr + fracStr
-}
-
-// FormatInteger produces a formatted number as string.
-// See FormatFloat.
-func FormatInteger(format string, n int) string {
-	return FormatFloat(format, float64(n))
-}
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/ordinals.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/ordinals.go
deleted file mode 100644
index 43d88a8619..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/ordinals.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package humanize
-
-import "strconv"
-
-// Ordinal gives you the input number in a rank/ordinal format.
-//
-// Ordinal(3) -> 3rd
-func Ordinal(x int) string {
-	suffix := "th"
-	switch x % 10 {
-	case 1:
-		if x%100 != 11 {
-			suffix = "st"
-		}
-	case 2:
-		if x%100 != 12 {
-			suffix = "nd"
-		}
-	case 3:
-		if x%100 != 13 {
-			suffix = "rd"
-		}
-	}
-	return strconv.Itoa(x) + suffix
-}
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/si.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/si.go
deleted file mode 100644
index dee8b765a0..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/si.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package humanize
-
-import (
-	"errors"
-	"math"
-	"regexp"
-	"strconv"
-)
-
-var siPrefixTable = map[float64]string{
-	-24: "y", // yocto
-	-21: "z", // zepto
-	-18: "a", // atto
-	-15: "f", // femto
-	-12: "p", // pico
-	-9:  "n", // nano
-	-6:  "µ", // micro
-	-3:  "m", // milli
-	0:   "",
-	3:   "k", // kilo
-	6:   "M", // mega
-	9:   "G", // giga
-	12:  "T", // tera
-	15:  "P", // peta
-	18:  "E", // exa
-	21:  "Z", // zetta
-	24:  "Y", // yotta
-}
-
-var revSIPrefixTable = revfmap(siPrefixTable)
-
-// revfmap reverses the map and precomputes the power multiplier
-func revfmap(in map[float64]string) map[string]float64 {
-	rv := map[string]float64{}
-	for k, v := range in {
-		rv[v] = math.Pow(10, k)
-	}
-	return rv
-}
-
-var riParseRegex *regexp.Regexp
-
-func init() {
-	ri := `^([0-9.]+)([`
-	for _, v := range siPrefixTable {
-		ri += v
-	}
-	ri += `]?)(.*)`
-
-	riParseRegex = regexp.MustCompile(ri)
-}
-
-// ComputeSI finds the most appropriate SI prefix for the given number
-// and returns the prefix along with the value adjusted to be within
-// that prefix.
-//
-// See also: SI, ParseSI.
-//
-// e.g. ComputeSI(2.2345e-12) -> (2.2345, "p")
-func ComputeSI(input float64) (float64, string) {
-	if input == 0 {
-		return 0, ""
-	}
-	exponent := math.Floor(logn(input, 10))
-	exponent = math.Floor(exponent/3) * 3
-
-	value := input / math.Pow(10, exponent)
-
-	// Handle special case where value is exactly 1000.0
-	// Should return 1M instead of 1000k
-	if value == 1000.0 {
-		exponent += 3
-		value = input / math.Pow(10, exponent)
-	}
-
-	prefix := siPrefixTable[exponent]
-	return value, prefix
-}
-
-// SI returns a string with default formatting.
-//
-// SI uses Ftoa to format float value, removing trailing zeros.
-//
-// See also: ComputeSI, ParseSI.
-//
-// e.g. SI(1000000, B) -> 1MB
-// e.g. SI(2.2345e-12, "F") -> 2.2345pF
-func SI(input float64, unit string) string {
-	value, prefix := ComputeSI(input)
-	return Ftoa(value) + prefix + unit
-}
-
-var errInvalid = errors.New("invalid input")
-
-// ParseSI parses an SI string back into the number and unit.
-//
-// See also: SI, ComputeSI.
-//
-// e.g. ParseSI(2.2345pF) -> (2.2345e-12, "F", nil)
-func ParseSI(input string) (float64, string, error) {
-	found := riParseRegex.FindStringSubmatch(input)
-	if len(found) != 4 {
-		return 0, "", errInvalid
-	}
-	mag := revSIPrefixTable[found[2]]
-	unit := found[3]
-
-	base, err := strconv.ParseFloat(found[1], 64)
-	return base * mag, unit, err
-}
diff --git a/Godeps/_workspace/src/github.com/dustin/go-humanize/times.go b/Godeps/_workspace/src/github.com/dustin/go-humanize/times.go
deleted file mode 100644
index 592ebe1d62..0000000000
--- a/Godeps/_workspace/src/github.com/dustin/go-humanize/times.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package humanize
-
-import (
-	"fmt"
-	"math"
-	"sort"
-	"time"
-)
-
-// Seconds-based time units
-const (
-	Minute   = 60
-	Hour     = 60 * Minute
-	Day      = 24 * Hour
-	Week     = 7 * Day
-	Month    = 30 * Day
-	Year     = 12 * Month
-	LongTime = 37 * Year
-)
-
-// Time formats a time into a relative string.
-//
-// Time(someT) -> "3 weeks ago"
-func Time(then time.Time) string {
-	return RelTime(then, time.Now(), "ago", "from now")
-}
-
-var magnitudes = []struct {
-	d      int64
-	format string
-	divby  int64
-}{
-	{1, "now", 1},
-	{2, "1 second %s", 1},
-	{Minute, "%d seconds %s", 1},
-	{2 * Minute, "1 minute %s", 1},
-	{Hour, "%d minutes %s", Minute},
-	{2 * Hour, "1 hour %s", 1},
-	{Day, "%d hours %s", Hour},
-	{2 * Day, "1 day %s", 1},
-	{Week, "%d days %s", Day},
-	{2 * Week, "1 week %s", 1},
-	{Month, "%d weeks %s", Week},
-	{2 * Month, "1 month %s", 1},
-	{Year, "%d months %s", Month},
-	{18 * Month, "1 year %s", 1},
-	{2 * Year, "2 years %s", 1},
-	{LongTime, "%d years %s", Year},
-	{math.MaxInt64, "a long while %s", 1},
-}
-
-// RelTime formats a time into a relative string.
-//
-// It takes two times and two labels.  In addition to the generic time
-// delta string (e.g. 5 minutes), the labels are used applied so that
-// the label corresponding to the smaller time is applied.
-//
-// RelTime(timeInPast, timeInFuture, "earlier", "later") -> "3 weeks earlier"
-func RelTime(a, b time.Time, albl, blbl string) string {
-	lbl := albl
-	diff := b.Unix() - a.Unix()
-
-	after := a.After(b)
-	if after {
-		lbl = blbl
-		diff = a.Unix() - b.Unix()
-	}
-
-	n := sort.Search(len(magnitudes), func(i int) bool {
-		return magnitudes[i].d > diff
-	})
-
-	mag := magnitudes[n]
-	args := []interface{}{}
-	escaped := false
-	for _, ch := range mag.format {
-		if escaped {
-			switch ch {
-			case '%':
-			case 's':
-				args = append(args, lbl)
-			case 'd':
-				args = append(args, diff/mag.divby)
-			}
-			escaped = false
-		} else {
-			escaped = ch == '%'
-		}
-	}
-	return fmt.Sprintf(mag.format, args...)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/.gitignore b/Godeps/_workspace/src/github.com/go-ini/ini/.gitignore
deleted file mode 100644
index 7adca9439c..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-testdata/conf_out.ini
-ini.sublime-project
-ini.sublime-workspace
-testdata/conf_reflect.ini
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE b/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE
deleted file mode 100644
index 37ec93a14f..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/Makefile b/Godeps/_workspace/src/github.com/go-ini/ini/Makefile
deleted file mode 100644
index ac034e5258..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: build test bench vet
-
-build: vet bench
-
-test:
-	go test -v -cover -race
-
-bench:
-	go test -v -cover -race -test.bench=. -test.benchmem
-
-vet:
-	go vet
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README.md b/Godeps/_workspace/src/github.com/go-ini/ini/README.md
deleted file mode 100644
index a87cca2328..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/README.md
+++ /dev/null
@@ -1,632 +0,0 @@
-ini [![Build Status](https://drone.io/github.com/go-ini/ini/status.png)](https://drone.io/github.com/go-ini/ini/latest) [![](http://gocover.io/_badge/github.com/go-ini/ini)](http://gocover.io/github.com/go-ini/ini)
-===
-
-![](https://avatars0.githubusercontent.com/u/10216035?v=3&s=200)
-
-Package ini provides INI file read and write functionality in Go.
-
-[简体中文](README_ZH.md)
-
-## Feature
-
-- Load multiple data sources(`[]byte` or file) with overwrites.
-- Read with recursion values.
-- Read with parent-child sections.
-- Read with auto-increment key names.
-- Read with multiple-line values.
-- Read with tons of helper methods.
-- Read and convert values to Go types.
-- Read and **WRITE** comments of sections and keys.
-- Manipulate sections, keys and comments with ease.
-- Keep sections and keys in order as you parse and save.
-
-## Installation
-
-To use a tagged revision:
-
-	go get gopkg.in/ini.v1
-
-To use with latest changes:
-
-	go get github.com/go-ini/ini
-
-Please add `-u` flag to update in the future.
-
-### Testing
-
-If you want to test on your machine, please apply `-t` flag:
-
-	go get -t gopkg.in/ini.v1
-
-Please add `-u` flag to update in the future.
-
-## Getting Started
-
-### Loading from data sources
-
-A **Data Source** is either raw data in type `[]byte` or a file name with type `string` and you can load **as many as** data sources you want. Passing other types will simply return an error.
-
-```go
-cfg, err := ini.Load([]byte("raw data"), "filename")
-```
-
-Or start with an empty object:
-
-```go
-cfg := ini.Empty()
-```
-
-When you cannot decide how many data sources to load at the beginning, you still able to **Append()** them later.
-
-```go
-err := cfg.Append("other file", []byte("other raw data"))
-```
-
-If you have a list of files with possibilities that some of them may not available at the time, and you don't know exactly which ones, you can use `LooseLoad` to ignore nonexistent files without returning error.
-
-```go
-cfg, err := ini.LooseLoad("filename", "filename_404")
-```
-
-The cool thing is, whenever the file is available to load while you're calling `Reload` method, it will be counted as usual.
-
-### Working with sections
-
-To get a section, you would need to:
-
-```go
-section, err := cfg.GetSection("section name")
-```
-
-For a shortcut for default section, just give an empty string as name:
-
-```go
-section, err := cfg.GetSection("")
-```
-
-When you're pretty sure the section exists, following code could make your life easier:
-
-```go
-section := cfg.Section("")
-```
-
-What happens when the section somehow does not exist? Don't panic, it automatically creates and returns a new section to you.
-
-To create a new section:
-
-```go
-err := cfg.NewSection("new section")
-```
-
-To get a list of sections or section names:
-
-```go
-sections := cfg.Sections()
-names := cfg.SectionStrings()
-```
-
-### Working with keys
-
-To get a key under a section:
-
-```go
-key, err := cfg.Section("").GetKey("key name")
-```
-
-Same rule applies to key operations:
-
-```go
-key := cfg.Section("").Key("key name")
-```
-
-To check if a key exists:
-
-```go
-yes := cfg.Section("").HasKey("key name")
-```
-
-To create a new key:
-
-```go
-err := cfg.Section("").NewKey("name", "value")
-```
-
-To get a list of keys or key names:
-
-```go
-keys := cfg.Section("").Keys()
-names := cfg.Section("").KeyStrings()
-```
-
-To get a clone hash of keys and corresponding values:
-
-```go
-hash := cfg.GetSection("").KeysHash()
-```
-
-### Working with values
-
-To get a string value:
-
-```go
-val := cfg.Section("").Key("key name").String()
-```
-
-To validate key value on the fly:
-
-```go
-val := cfg.Section("").Key("key name").Validate(func(in string) string {
-	if len(in) == 0 {
-		return "default"
-	}
-	return in
-})
-```
-
-If you do not want any auto-transformation (such as recursive read) for the values, you can get raw value directly (this way you get much better performance):
-
-```go
-val := cfg.Section("").Key("key name").Value()
-```
-
-To check if raw value exists:
-
-```go
-yes := cfg.Section("").HasValue("test value")
-```
-
-To get value with types:
-
-```go
-// For boolean values:
-// true when value is: 1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On
-// false when value is: 0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off
-v, err = cfg.Section("").Key("BOOL").Bool()
-v, err = cfg.Section("").Key("FLOAT64").Float64()
-v, err = cfg.Section("").Key("INT").Int()
-v, err = cfg.Section("").Key("INT64").Int64()
-v, err = cfg.Section("").Key("UINT").Uint()
-v, err = cfg.Section("").Key("UINT64").Uint64()
-v, err = cfg.Section("").Key("TIME").TimeFormat(time.RFC3339)
-v, err = cfg.Section("").Key("TIME").Time() // RFC3339
-
-v = cfg.Section("").Key("BOOL").MustBool()
-v = cfg.Section("").Key("FLOAT64").MustFloat64()
-v = cfg.Section("").Key("INT").MustInt()
-v = cfg.Section("").Key("INT64").MustInt64()
-v = cfg.Section("").Key("UINT").MustUint()
-v = cfg.Section("").Key("UINT64").MustUint64()
-v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339)
-v = cfg.Section("").Key("TIME").MustTime() // RFC3339
-
-// Methods start with Must also accept one argument for default value
-// when key not found or fail to parse value to given type.
-// Except method MustString, which you have to pass a default value.
-
-v = cfg.Section("").Key("String").MustString("default")
-v = cfg.Section("").Key("BOOL").MustBool(true)
-v = cfg.Section("").Key("FLOAT64").MustFloat64(1.25)
-v = cfg.Section("").Key("INT").MustInt(10)
-v = cfg.Section("").Key("INT64").MustInt64(99)
-v = cfg.Section("").Key("UINT").MustUint(3)
-v = cfg.Section("").Key("UINT64").MustUint64(6)
-v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339, time.Now())
-v = cfg.Section("").Key("TIME").MustTime(time.Now()) // RFC3339
-```
-
-What if my value is three-line long?
-
-```ini
-[advance]
-ADDRESS = """404 road,
-NotFound, State, 5000
-Earth"""
-```
-
-Not a problem!
-
-```go
-cfg.Section("advance").Key("ADDRESS").String()
-
-/* --- start ---
-404 road,
-NotFound, State, 5000
-Earth
-------  end  --- */
-```
-
-That's cool, how about continuation lines?
-
-```ini
-[advance]
-two_lines = how about \
-	continuation lines?
-lots_of_lines = 1 \
-	2 \
-	3 \
-	4
-```
-
-Piece of cake!
-
-```go
-cfg.Section("advance").Key("two_lines").String() // how about continuation lines?
-cfg.Section("advance").Key("lots_of_lines").String() // 1 2 3 4
-```
-
-Note that single quotes around values will be stripped:
-
-```ini
-foo = "some value" // foo: some value
-bar = 'some value' // bar: some value
-```
-
-That's all? Hmm, no.
-
-#### Helper methods of working with values
-
-To get value with given candidates:
-
-```go
-v = cfg.Section("").Key("STRING").In("default", []string{"str", "arr", "types"})
-v = cfg.Section("").Key("FLOAT64").InFloat64(1.1, []float64{1.25, 2.5, 3.75})
-v = cfg.Section("").Key("INT").InInt(5, []int{10, 20, 30})
-v = cfg.Section("").Key("INT64").InInt64(10, []int64{10, 20, 30})
-v = cfg.Section("").Key("UINT").InUint(4, []int{3, 6, 9})
-v = cfg.Section("").Key("UINT64").InUint64(8, []int64{3, 6, 9})
-v = cfg.Section("").Key("TIME").InTimeFormat(time.RFC3339, time.Now(), []time.Time{time1, time2, time3})
-v = cfg.Section("").Key("TIME").InTime(time.Now(), []time.Time{time1, time2, time3}) // RFC3339
-```
-
-Default value will be presented if value of key is not in candidates you given, and default value does not need be one of candidates.
-
-To validate value in a given range:
-
-```go
-vals = cfg.Section("").Key("FLOAT64").RangeFloat64(0.0, 1.1, 2.2)
-vals = cfg.Section("").Key("INT").RangeInt(0, 10, 20)
-vals = cfg.Section("").Key("INT64").RangeInt64(0, 10, 20)
-vals = cfg.Section("").Key("UINT").RangeUint(0, 3, 9)
-vals = cfg.Section("").Key("UINT64").RangeUint64(0, 3, 9)
-vals = cfg.Section("").Key("TIME").RangeTimeFormat(time.RFC3339, time.Now(), minTime, maxTime)
-vals = cfg.Section("").Key("TIME").RangeTime(time.Now(), minTime, maxTime) // RFC3339
-```
-
-##### Auto-split values into a slice
-
-To use zero value of type for invalid inputs:
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> [0.0 2.2 0.0 0.0]
-vals = cfg.Section("").Key("STRINGS").Strings(",")
-vals = cfg.Section("").Key("FLOAT64S").Float64s(",")
-vals = cfg.Section("").Key("INTS").Ints(",")
-vals = cfg.Section("").Key("INT64S").Int64s(",")
-vals = cfg.Section("").Key("UINTS").Uints(",")
-vals = cfg.Section("").Key("UINT64S").Uint64s(",")
-vals = cfg.Section("").Key("TIMES").Times(",")
-```
-
-To exclude invalid values out of result slice:
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> [2.2]
-vals = cfg.Section("").Key("FLOAT64S").ValidFloat64s(",")
-vals = cfg.Section("").Key("INTS").ValidInts(",")
-vals = cfg.Section("").Key("INT64S").ValidInt64s(",")
-vals = cfg.Section("").Key("UINTS").ValidUints(",")
-vals = cfg.Section("").Key("UINT64S").ValidUint64s(",")
-vals = cfg.Section("").Key("TIMES").ValidTimes(",")
-```
-
-Or to return nothing but error when have invalid inputs:
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> error
-vals = cfg.Section("").Key("FLOAT64S").StrictFloat64s(",")
-vals = cfg.Section("").Key("INTS").StrictInts(",")
-vals = cfg.Section("").Key("INT64S").StrictInt64s(",")
-vals = cfg.Section("").Key("UINTS").StrictUints(",")
-vals = cfg.Section("").Key("UINT64S").StrictUint64s(",")
-vals = cfg.Section("").Key("TIMES").StrictTimes(",")
-```
-
-### Save your configuration
-
-Finally, it's time to save your configuration to somewhere.
-
-A typical way to save configuration is writing it to a file:
-
-```go
-// ...
-err = cfg.SaveTo("my.ini")
-err = cfg.SaveToIndent("my.ini", "\t")
-```
-
-Another way to save is writing to a `io.Writer` interface:
-
-```go
-// ...
-cfg.WriteTo(writer)
-cfg.WriteToIndent(writer, "\t")
-```
-
-## Advanced Usage
-
-### Recursive Values
-
-For all value of keys, there is a special syntax `%(<name>)s`, where `<name>` is the key name in same section or default section, and `%(<name>)s` will be replaced by corresponding value(empty string if key not found). You can use this syntax at most 99 level of recursions.
-
-```ini
-NAME = ini
-
-[author]
-NAME = Unknwon
-GITHUB = https://github.com/%(NAME)s
-
-[package]
-FULL_NAME = github.com/go-ini/%(NAME)s
-```
-
-```go
-cfg.Section("author").Key("GITHUB").String()		// https://github.com/Unknwon
-cfg.Section("package").Key("FULL_NAME").String()	// github.com/go-ini/ini
-```
-
-### Parent-child Sections
-
-You can use `.` in section name to indicate parent-child relationship between two or more sections. If the key not found in the child section, library will try again on its parent section until there is no parent section.
-
-```ini
-NAME = ini
-VERSION = v1
-IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
-
-[package]
-CLONE_URL = https://%(IMPORT_PATH)s
-
-[package.sub]
-```
-
-```go
-cfg.Section("package.sub").Key("CLONE_URL").String()	// https://gopkg.in/ini.v1
-```
-
-### Auto-increment Key Names
-
-If key name is `-` in data source, then it would be seen as special syntax for auto-increment key name start from 1, and every section is independent on counter.
-
-```ini
-[features]
--: Support read/write comments of keys and sections
--: Support auto-increment of key names
--: Support load multiple files to overwrite key values
-```
-
-```go
-cfg.Section("features").KeyStrings()	// []{"#1", "#2", "#3"}
-```
-
-### Map To Struct
-
-Want more objective way to play with INI? Cool.
-
-```ini
-Name = Unknwon
-age = 21
-Male = true
-Born = 1993-01-01T20:17:05Z
-
-[Note]
-Content = Hi is a good man!
-Cities = HangZhou, Boston
-```
-
-```go
-type Note struct {
-	Content string
-	Cities  []string
-}
-
-type Person struct {
-	Name string
-	Age  int `ini:"age"`
-	Male bool
-	Born time.Time
-	Note
-	Created time.Time `ini:"-"`
-}
-
-func main() {
-	cfg, err := ini.Load("path/to/ini")
-	// ...
-	p := new(Person)
-	err = cfg.MapTo(p)
-	// ...
-
-	// Things can be simpler.
-	err = ini.MapTo(p, "path/to/ini")
-	// ...
-
-	// Just map a section? Fine.
-	n := new(Note)
-	err = cfg.Section("Note").MapTo(n)
-	// ...
-}
-```
-
-Can I have default value for field? Absolutely.
-
-Assign it before you map to struct. It will keep the value as it is if the key is not presented or got wrong type.
-
-```go
-// ...
-p := &Person{
-	Name: "Joe",
-}
-// ...
-```
-
-It's really cool, but what's the point if you can't give me my file back from struct?
-
-### Reflect From Struct
-
-Why not?
-
-```go
-type Embeded struct {
-	Dates  []time.Time `delim:"|"`
-	Places []string
-	None   []int
-}
-
-type Author struct {
-	Name      string `ini:"NAME"`
-	Male      bool
-	Age       int
-	GPA       float64
-	NeverMind string `ini:"-"`
-	*Embeded
-}
-
-func main() {
-	a := &Author{"Unknwon", true, 21, 2.8, "",
-		&Embeded{
-			[]time.Time{time.Now(), time.Now()},
-			[]string{"HangZhou", "Boston"},
-			[]int{},
-		}}
-	cfg := ini.Empty()
-	err = ini.ReflectFrom(cfg, a)
-	// ...
-}
-```
-
-So, what do I get?
-
-```ini
-NAME = Unknwon
-Male = true
-Age = 21
-GPA = 2.8
-
-[Embeded]
-Dates = 2015-08-07T22:14:22+08:00|2015-08-07T22:14:22+08:00
-Places = HangZhou,Boston
-None =
-```
-
-#### Name Mapper
-
-To save your time and make your code cleaner, this library supports [`NameMapper`](https://gowalker.org/gopkg.in/ini.v1#NameMapper) between struct field and actual section and key name.
-
-There are 2 built-in name mappers:
-
-- `AllCapsUnderscore`: it converts to format `ALL_CAPS_UNDERSCORE` then match section or key.
-- `TitleUnderscore`: it converts to format `title_underscore` then match section or key.
-
-To use them:
-
-```go
-type Info struct {
-	PackageName string
-}
-
-func main() {
-	err = ini.MapToWithMapper(&Info{}, ini.TitleUnderscore, []byte("package_name=ini"))
-	// ...
-
-	cfg, err := ini.Load([]byte("PACKAGE_NAME=ini"))
-	// ...
-	info := new(Info)
-	cfg.NameMapper = ini.AllCapsUnderscore
-	err = cfg.MapTo(info)
-	// ...
-}
-```
-
-Same rules of name mapper apply to `ini.ReflectFromWithMapper` function.
-
-#### Other Notes On Map/Reflect
-
-Any embedded struct is treated as a section by default, and there is no automatic parent-child relations in map/reflect feature:
-
-```go
-type Child struct {
-	Age string
-}
-
-type Parent struct {
-	Name string
-	Child
-}
-
-type Config struct {
-	City string
-	Parent
-}
-```
-
-Example configuration:
-
-```ini
-City = Boston
-
-[Parent]
-Name = Unknwon
-
-[Child]
-Age = 21
-```
-
-What if, yes, I'm paranoid, I want embedded struct to be in the same section. Well, all roads lead to Rome.
-
-```go
-type Child struct {
-	Age string
-}
-
-type Parent struct {
-	Name string
-	Child `ini:"Parent"`
-}
-
-type Config struct {
-	City string
-	Parent
-}
-```
-
-Example configuration:
-
-```ini
-City = Boston
-
-[Parent]
-Name = Unknwon
-Age = 21
-```
-
-## Getting Help
-
-- [API Documentation](https://gowalker.org/gopkg.in/ini.v1)
-- [File An Issue](https://github.com/go-ini/ini/issues/new)
-
-## FAQs
-
-### What does `BlockMode` field do?
-
-By default, library lets you read and write values so we need a locker to make sure your data is safe. But in cases that you are very sure about only reading data through the library, you can set `cfg.BlockMode = false` to speed up read operations about **50-70%** faster.
-
-### Why another INI library?
-
-Many people are using my another INI library [goconfig](https://github.com/Unknwon/goconfig), so the reason for this one is I would like to make more Go style code. Also when you set `cfg.BlockMode = false`, this one is about **10-30%** faster.
-
-To make those changes I have to confirm API broken, so it's safer to keep it in another place and start using `gopkg.in` to version my package at this time.(PS: shorter import path)
-
-## License
-
-This project is under Apache v2 License. See the [LICENSE](LICENSE) file for the full license text.
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md b/Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md
deleted file mode 100644
index 75c10051a1..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/README_ZH.md
+++ /dev/null
@@ -1,619 +0,0 @@
-本包提供了 Go 语言中读写 INI 文件的功能。
-
-## 功能特性
-
-- 支持覆盖加载多个数据源（`[]byte` 或文件）
-- 支持递归读取键值
-- 支持读取父子分区
-- 支持读取自增键名
-- 支持读取多行的键值
-- 支持大量辅助方法
-- 支持在读取时直接转换为 Go 语言类型
-- 支持读取和 **写入** 分区和键的注释
-- 轻松操作分区、键值和注释
-- 在保存文件时分区和键值会保持原有的顺序
-
-## 下载安装
-
-使用一个特定版本：
-
-    go get gopkg.in/ini.v1
-
-使用最新版：
-
-	go get github.com/go-ini/ini
-
-如需更新请添加 `-u` 选项。
-
-### 测试安装
-
-如果您想要在自己的机器上运行测试，请使用 `-t` 标记：
-
-	go get -t gopkg.in/ini.v1
-
-如需更新请添加 `-u` 选项。
-
-## 开始使用
-
-### 从数据源加载
-
-一个 **数据源** 可以是 `[]byte` 类型的原始数据，或 `string` 类型的文件路径。您可以加载 **任意多个** 数据源。如果您传递其它类型的数据源，则会直接返回错误。
-
-```go
-cfg, err := ini.Load([]byte("raw data"), "filename")
-```
-
-或者从一个空白的文件开始：
-
-```go
-cfg := ini.Empty()
-```
-
-当您在一开始无法决定需要加载哪些数据源时，仍可以使用 **Append()** 在需要的时候加载它们。
-
-```go
-err := cfg.Append("other file", []byte("other raw data"))
-```
-
-当您想要加载一系列文件，但是不能够确定其中哪些文件是不存在的，可以通过调用函数 `LooseLoad` 来忽略它们（`Load` 会因为文件不存在而返回错误）：
-
-```go
-cfg, err := ini.LooseLoad("filename", "filename_404")
-```
-
-更牛逼的是，当那些之前不存在的文件在重新调用 `Reload` 方法的时候突然出现了，那么它们会被正常加载。
-
-### 操作分区（Section）
-
-获取指定分区：
-
-```go
-section, err := cfg.GetSection("section name")
-```
-
-如果您想要获取默认分区，则可以用空字符串代替分区名：
-
-```go
-section, err := cfg.GetSection("")
-```
-
-当您非常确定某个分区是存在的，可以使用以下简便方法：
-
-```go
-section := cfg.Section("")
-```
-
-如果不小心判断错了，要获取的分区其实是不存在的，那会发生什么呢？没事的，它会自动创建并返回一个对应的分区对象给您。
-
-创建一个分区：
-
-```go
-err := cfg.NewSection("new section")
-```
-
-获取所有分区对象或名称：
-
-```go
-sections := cfg.Sections()
-names := cfg.SectionStrings()
-```
-
-### 操作键（Key）
-
-获取某个分区下的键：
-
-```go
-key, err := cfg.Section("").GetKey("key name")
-```
-
-和分区一样，您也可以直接获取键而忽略错误处理：
-
-```go
-key := cfg.Section("").Key("key name")
-```
-
-判断某个键是否存在：
-
-```go
-yes := cfg.Section("").HasKey("key name")
-```
-
-创建一个新的键：
-
-```go
-err := cfg.Section("").NewKey("name", "value")
-```
-
-获取分区下的所有键或键名：
-
-```go
-keys := cfg.Section("").Keys()
-names := cfg.Section("").KeyStrings()
-```
-
-获取分区下的所有键值对的克隆：
-
-```go
-hash := cfg.GetSection("").KeysHash()
-```
-
-### 操作键值（Value）
-
-获取一个类型为字符串（string）的值：
-
-```go
-val := cfg.Section("").Key("key name").String()
-```
-
-获取值的同时通过自定义函数进行处理验证：
-
-```go
-val := cfg.Section("").Key("key name").Validate(func(in string) string {
-	if len(in) == 0 {
-		return "default"
-	}
-	return in
-})
-```
-
-如果您不需要任何对值的自动转变功能（例如递归读取），可以直接获取原值（这种方式性能最佳）：
-
-```go
-val := cfg.Section("").Key("key name").Value()
-```
-
-判断某个原值是否存在：
-
-```go
-yes := cfg.Section("").HasValue("test value")
-```
-
-获取其它类型的值：
-
-```go
-// 布尔值的规则：
-// true 当值为：1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On
-// false 当值为：0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off
-v, err = cfg.Section("").Key("BOOL").Bool()
-v, err = cfg.Section("").Key("FLOAT64").Float64()
-v, err = cfg.Section("").Key("INT").Int()
-v, err = cfg.Section("").Key("INT64").Int64()
-v, err = cfg.Section("").Key("UINT").Uint()
-v, err = cfg.Section("").Key("UINT64").Uint64()
-v, err = cfg.Section("").Key("TIME").TimeFormat(time.RFC3339)
-v, err = cfg.Section("").Key("TIME").Time() // RFC3339
-
-v = cfg.Section("").Key("BOOL").MustBool()
-v = cfg.Section("").Key("FLOAT64").MustFloat64()
-v = cfg.Section("").Key("INT").MustInt()
-v = cfg.Section("").Key("INT64").MustInt64()
-v = cfg.Section("").Key("UINT").MustUint()
-v = cfg.Section("").Key("UINT64").MustUint64()
-v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339)
-v = cfg.Section("").Key("TIME").MustTime() // RFC3339
-
-// 由 Must 开头的方法名允许接收一个相同类型的参数来作为默认值，
-// 当键不存在或者转换失败时，则会直接返回该默认值。
-// 但是，MustString 方法必须传递一个默认值。
-
-v = cfg.Seciont("").Key("String").MustString("default")
-v = cfg.Section("").Key("BOOL").MustBool(true)
-v = cfg.Section("").Key("FLOAT64").MustFloat64(1.25)
-v = cfg.Section("").Key("INT").MustInt(10)
-v = cfg.Section("").Key("INT64").MustInt64(99)
-v = cfg.Section("").Key("UINT").MustUint(3)
-v = cfg.Section("").Key("UINT64").MustUint64(6)
-v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339, time.Now())
-v = cfg.Section("").Key("TIME").MustTime(time.Now()) // RFC3339
-```
-
-如果我的值有好多行怎么办？
-
-```ini
-[advance]
-ADDRESS = """404 road,
-NotFound, State, 5000
-Earth"""
-```
-
-嗯哼？小 case！
-
-```go
-cfg.Section("advance").Key("ADDRESS").String()
-
-/* --- start ---
-404 road,
-NotFound, State, 5000
-Earth
-------  end  --- */
-```
-
-赞爆了！那要是我属于一行的内容写不下想要写到第二行怎么办？
-
-```ini
-[advance]
-two_lines = how about \
-	continuation lines?
-lots_of_lines = 1 \
-	2 \
-	3 \
-	4
-```
-
-简直是小菜一碟！
-
-```go
-cfg.Section("advance").Key("two_lines").String() // how about continuation lines?
-cfg.Section("advance").Key("lots_of_lines").String() // 1 2 3 4
-```
-
-需要注意的是，值两侧的单引号会被自动剔除：
-
-```ini
-foo = "some value" // foo: some value
-bar = 'some value' // bar: some value
-```
-
-这就是全部了？哈哈，当然不是。
-
-#### 操作键值的辅助方法
-
-获取键值时设定候选值：
-
-```go
-v = cfg.Section("").Key("STRING").In("default", []string{"str", "arr", "types"})
-v = cfg.Section("").Key("FLOAT64").InFloat64(1.1, []float64{1.25, 2.5, 3.75})
-v = cfg.Section("").Key("INT").InInt(5, []int{10, 20, 30})
-v = cfg.Section("").Key("INT64").InInt64(10, []int64{10, 20, 30})
-v = cfg.Section("").Key("UINT").InUint(4, []int{3, 6, 9})
-v = cfg.Section("").Key("UINT64").InUint64(8, []int64{3, 6, 9})
-v = cfg.Section("").Key("TIME").InTimeFormat(time.RFC3339, time.Now(), []time.Time{time1, time2, time3})
-v = cfg.Section("").Key("TIME").InTime(time.Now(), []time.Time{time1, time2, time3}) // RFC3339
-```
-
-如果获取到的值不是候选值的任意一个，则会返回默认值，而默认值不需要是候选值中的一员。
-
-验证获取的值是否在指定范围内：
-
-```go
-vals = cfg.Section("").Key("FLOAT64").RangeFloat64(0.0, 1.1, 2.2)
-vals = cfg.Section("").Key("INT").RangeInt(0, 10, 20)
-vals = cfg.Section("").Key("INT64").RangeInt64(0, 10, 20)
-vals = cfg.Section("").Key("UINT").RangeUint(0, 3, 9)
-vals = cfg.Section("").Key("UINT64").RangeUint64(0, 3, 9)
-vals = cfg.Section("").Key("TIME").RangeTimeFormat(time.RFC3339, time.Now(), minTime, maxTime)
-vals = cfg.Section("").Key("TIME").RangeTime(time.Now(), minTime, maxTime) // RFC3339
-```
-
-##### 自动分割键值到切片（slice）
-
-当存在无效输入时，使用零值代替：
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> [0.0 2.2 0.0 0.0]
-vals = cfg.Section("").Key("STRINGS").Strings(",")
-vals = cfg.Section("").Key("FLOAT64S").Float64s(",")
-vals = cfg.Section("").Key("INTS").Ints(",")
-vals = cfg.Section("").Key("INT64S").Int64s(",")
-vals = cfg.Section("").Key("UINTS").Uints(",")
-vals = cfg.Section("").Key("UINT64S").Uint64s(",")
-vals = cfg.Section("").Key("TIMES").Times(",")
-```
-
-从结果切片中剔除无效输入：
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> [2.2]
-vals = cfg.Section("").Key("FLOAT64S").ValidFloat64s(",")
-vals = cfg.Section("").Key("INTS").ValidInts(",")
-vals = cfg.Section("").Key("INT64S").ValidInt64s(",")
-vals = cfg.Section("").Key("UINTS").ValidUints(",")
-vals = cfg.Section("").Key("UINT64S").ValidUint64s(",")
-vals = cfg.Section("").Key("TIMES").ValidTimes(",")
-```
-
-当存在无效输入时，直接返回错误：
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> error
-vals = cfg.Section("").Key("FLOAT64S").StrictFloat64s(",")
-vals = cfg.Section("").Key("INTS").StrictInts(",")
-vals = cfg.Section("").Key("INT64S").StrictInt64s(",")
-vals = cfg.Section("").Key("UINTS").StrictUints(",")
-vals = cfg.Section("").Key("UINT64S").StrictUint64s(",")
-vals = cfg.Section("").Key("TIMES").StrictTimes(",")
-```
-
-### 保存配置
-
-终于到了这个时刻，是时候保存一下配置了。
-
-比较原始的做法是输出配置到某个文件：
-
-```go
-// ...
-err = cfg.SaveTo("my.ini")
-err = cfg.SaveToIndent("my.ini", "\t")
-```
-
-另一个比较高级的做法是写入到任何实现 `io.Writer` 接口的对象中：
-
-```go
-// ...
-cfg.WriteTo(writer)
-cfg.WriteToIndent(writer, "\t")
-```
-
-### 高级用法
-
-#### 递归读取键值
-
-在获取所有键值的过程中，特殊语法 `%(<name>)s` 会被应用，其中 `<name>` 可以是相同分区或者默认分区下的键名。字符串 `%(<name>)s` 会被相应的键值所替代，如果指定的键不存在，则会用空字符串替代。您可以最多使用 99 层的递归嵌套。
-
-```ini
-NAME = ini
-
-[author]
-NAME = Unknwon
-GITHUB = https://github.com/%(NAME)s
-
-[package]
-FULL_NAME = github.com/go-ini/%(NAME)s
-```
-
-```go
-cfg.Section("author").Key("GITHUB").String()		// https://github.com/Unknwon
-cfg.Section("package").Key("FULL_NAME").String()	// github.com/go-ini/ini
-```
-
-#### 读取父子分区
-
-您可以在分区名称中使用 `.` 来表示两个或多个分区之间的父子关系。如果某个键在子分区中不存在，则会去它的父分区中再次寻找，直到没有父分区为止。
-
-```ini
-NAME = ini
-VERSION = v1
-IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
-
-[package]
-CLONE_URL = https://%(IMPORT_PATH)s
-
-[package.sub]
-```
-
-```go
-cfg.Section("package.sub").Key("CLONE_URL").String()	// https://gopkg.in/ini.v1
-```
-
-#### 读取自增键名
-
-如果数据源中的键名为 `-`，则认为该键使用了自增键名的特殊语法。计数器从 1 开始，并且分区之间是相互独立的。
-
-```ini
-[features]
--: Support read/write comments of keys and sections
--: Support auto-increment of key names
--: Support load multiple files to overwrite key values
-```
-
-```go
-cfg.Section("features").KeyStrings()	// []{"#1", "#2", "#3"}
-```
-
-### 映射到结构
-
-想要使用更加面向对象的方式玩转 INI 吗？好主意。
-
-```ini
-Name = Unknwon
-age = 21
-Male = true
-Born = 1993-01-01T20:17:05Z
-
-[Note]
-Content = Hi is a good man!
-Cities = HangZhou, Boston
-```
-
-```go
-type Note struct {
-	Content string
-	Cities  []string
-}
-
-type Person struct {
-	Name string
-	Age  int `ini:"age"`
-	Male bool
-	Born time.Time
-	Note
-	Created time.Time `ini:"-"`
-}
-
-func main() {
-	cfg, err := ini.Load("path/to/ini")
-	// ...
-	p := new(Person)
-	err = cfg.MapTo(p)
-	// ...
-
-	// 一切竟可以如此的简单。
-	err = ini.MapTo(p, "path/to/ini")
-	// ...
-
-	// 嗯哼？只需要映射一个分区吗？
-	n := new(Note)
-	err = cfg.Section("Note").MapTo(n)
-	// ...
-}
-```
-
-结构的字段怎么设置默认值呢？很简单，只要在映射之前对指定字段进行赋值就可以了。如果键未找到或者类型错误，该值不会发生改变。
-
-```go
-// ...
-p := &Person{
-	Name: "Joe",
-}
-// ...
-```
-
-这样玩 INI 真的好酷啊！然而，如果不能还给我原来的配置文件，有什么卵用？
-
-### 从结构反射
-
-可是，我有说不能吗？
-
-```go
-type Embeded struct {
-	Dates  []time.Time `delim:"|"`
-	Places []string
-	None   []int
-}
-
-type Author struct {
-	Name      string `ini:"NAME"`
-	Male      bool
-	Age       int
-	GPA       float64
-	NeverMind string `ini:"-"`
-	*Embeded
-}
-
-func main() {
-	a := &Author{"Unknwon", true, 21, 2.8, "",
-		&Embeded{
-			[]time.Time{time.Now(), time.Now()},
-			[]string{"HangZhou", "Boston"},
-			[]int{},
-		}}
-	cfg := ini.Empty()
-	err = ini.ReflectFrom(cfg, a)
-	// ...
-}
-```
-
-瞧瞧，奇迹发生了。
-
-```ini
-NAME = Unknwon
-Male = true
-Age = 21
-GPA = 2.8
-
-[Embeded]
-Dates = 2015-08-07T22:14:22+08:00|2015-08-07T22:14:22+08:00
-Places = HangZhou,Boston
-None =
-```
-
-#### 名称映射器（Name Mapper）
-
-为了节省您的时间并简化代码，本库支持类型为 [`NameMapper`](https://gowalker.org/gopkg.in/ini.v1#NameMapper) 的名称映射器，该映射器负责结构字段名与分区名和键名之间的映射。
-
-目前有 2 款内置的映射器：
-
-- `AllCapsUnderscore`：该映射器将字段名转换至格式 `ALL_CAPS_UNDERSCORE` 后再去匹配分区名和键名。
-- `TitleUnderscore`：该映射器将字段名转换至格式 `title_underscore` 后再去匹配分区名和键名。
-
-使用方法：
-
-```go
-type Info struct{
-	PackageName string
-}
-
-func main() {
-	err = ini.MapToWithMapper(&Info{}, ini.TitleUnderscore, []byte("package_name=ini"))
-	// ...
-
-	cfg, err := ini.Load([]byte("PACKAGE_NAME=ini"))
-	// ...
-	info := new(Info)
-	cfg.NameMapper = ini.AllCapsUnderscore
-	err = cfg.MapTo(info)
-	// ...
-}
-```
-
-使用函数 `ini.ReflectFromWithMapper` 时也可应用相同的规则。
-
-#### 映射/反射的其它说明
-
-任何嵌入的结构都会被默认认作一个不同的分区，并且不会自动产生所谓的父子分区关联：
-
-```go
-type Child struct {
-	Age string
-}
-
-type Parent struct {
-	Name string
-	Child
-}
-
-type Config struct {
-	City string
-	Parent
-}
-```
-
-示例配置文件：
-
-```ini
-City = Boston
-
-[Parent]
-Name = Unknwon
-
-[Child]
-Age = 21
-```
-
-很好，但是，我就是要嵌入结构也在同一个分区。好吧，你爹是李刚！
-
-```go
-type Child struct {
-	Age string
-}
-
-type Parent struct {
-	Name string
-	Child `ini:"Parent"`
-}
-
-type Config struct {
-	City string
-	Parent
-}
-```
-
-示例配置文件：
-
-```ini
-City = Boston
-
-[Parent]
-Name = Unknwon
-Age = 21
-```
-
-## 获取帮助
-
-- [API 文档](https://gowalker.org/gopkg.in/ini.v1)
-- [创建工单](https://github.com/go-ini/ini/issues/new)
-
-## 常见问题
-
-### 字段 `BlockMode` 是什么？
-
-默认情况下，本库会在您进行读写操作时采用锁机制来确保数据时间。但在某些情况下，您非常确定只进行读操作。此时，您可以通过设置 `cfg.BlockMode = false` 来将读操作提升大约 **50-70%** 的性能。
-
-### 为什么要写另一个 INI 解析库？
-
-许多人都在使用我的 [goconfig](https://github.com/Unknwon/goconfig) 来完成对 INI 文件的操作，但我希望使用更加 Go 风格的代码。并且当您设置 `cfg.BlockMode = false` 时，会有大约 **10-30%** 的性能提升。
-
-为了做出这些改变，我必须对 API 进行破坏，所以新开一个仓库是最安全的做法。除此之外，本库直接使用 `gopkg.in` 来进行版本化发布。（其实真相是导入路径更短了）
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/ini.go b/Godeps/_workspace/src/github.com/go-ini/ini/ini.go
deleted file mode 100644
index f186148aad..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/ini.go
+++ /dev/null
@@ -1,465 +0,0 @@
-// Copyright 2014 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-// Package ini provides INI file read and write functionality in Go.
-package ini
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-const (
-	// Name for default section. You can use this constant or the string literal.
-	// In most of cases, an empty string is all you need to access the section.
-	DEFAULT_SECTION = "DEFAULT"
-
-	// Maximum allowed depth when recursively substituing variable names.
-	_DEPTH_VALUES = 99
-	_VERSION      = "1.11.0"
-)
-
-// Version returns current package version literal.
-func Version() string {
-	return _VERSION
-}
-
-var (
-	// Delimiter to determine or compose a new line.
-	// This variable will be changed to "\r\n" automatically on Windows
-	// at package init time.
-	LineBreak = "\n"
-
-	// Variable regexp pattern: %(variable)s
-	varPattern = regexp.MustCompile(`%\(([^\)]+)\)s`)
-
-	// Indicate whether to align "=" sign with spaces to produce pretty output
-	// or reduce all possible spaces for compact format.
-	PrettyFormat = true
-
-	// Explicitly write DEFAULT section header
-	DefaultHeader = false
-)
-
-func init() {
-	if runtime.GOOS == "windows" {
-		LineBreak = "\r\n"
-	}
-}
-
-func inSlice(str string, s []string) bool {
-	for _, v := range s {
-		if str == v {
-			return true
-		}
-	}
-	return false
-}
-
-// dataSource is an interface that returns object which can be read and closed.
-type dataSource interface {
-	ReadCloser() (io.ReadCloser, error)
-}
-
-// sourceFile represents an object that contains content on the local file system.
-type sourceFile struct {
-	name string
-}
-
-func (s sourceFile) ReadCloser() (_ io.ReadCloser, err error) {
-	return os.Open(s.name)
-}
-
-type bytesReadCloser struct {
-	reader io.Reader
-}
-
-func (rc *bytesReadCloser) Read(p []byte) (n int, err error) {
-	return rc.reader.Read(p)
-}
-
-func (rc *bytesReadCloser) Close() error {
-	return nil
-}
-
-// sourceData represents an object that contains content in memory.
-type sourceData struct {
-	data []byte
-}
-
-func (s *sourceData) ReadCloser() (io.ReadCloser, error) {
-	return &bytesReadCloser{bytes.NewReader(s.data)}, nil
-}
-
-// File represents a combination of a or more INI file(s) in memory.
-type File struct {
-	// Should make things safe, but sometimes doesn't matter.
-	BlockMode bool
-	// Make sure data is safe in multiple goroutines.
-	lock sync.RWMutex
-
-	// Allow combination of multiple data sources.
-	dataSources []dataSource
-	// Actual data is stored here.
-	sections map[string]*Section
-
-	// To keep data in order.
-	sectionList []string
-
-	// Whether the parser should ignore nonexistent files or return error.
-	looseMode bool
-
-	NameMapper
-}
-
-// newFile initializes File object with given data sources.
-func newFile(dataSources []dataSource, looseMode bool) *File {
-	return &File{
-		BlockMode:   true,
-		dataSources: dataSources,
-		sections:    make(map[string]*Section),
-		sectionList: make([]string, 0, 10),
-		looseMode:   looseMode,
-	}
-}
-
-func parseDataSource(source interface{}) (dataSource, error) {
-	switch s := source.(type) {
-	case string:
-		return sourceFile{s}, nil
-	case []byte:
-		return &sourceData{s}, nil
-	default:
-		return nil, fmt.Errorf("error parsing data source: unknown type '%s'", s)
-	}
-}
-
-func loadSources(looseMode bool, source interface{}, others ...interface{}) (_ *File, err error) {
-	sources := make([]dataSource, len(others)+1)
-	sources[0], err = parseDataSource(source)
-	if err != nil {
-		return nil, err
-	}
-	for i := range others {
-		sources[i+1], err = parseDataSource(others[i])
-		if err != nil {
-			return nil, err
-		}
-	}
-	f := newFile(sources, looseMode)
-	if err = f.Reload(); err != nil {
-		return nil, err
-	}
-	return f, nil
-}
-
-// Load loads and parses from INI data sources.
-// Arguments can be mixed of file name with string type, or raw data in []byte.
-// It will return error if list contains nonexistent files.
-func Load(source interface{}, others ...interface{}) (*File, error) {
-	return loadSources(false, source, others...)
-}
-
-// LooseLoad has exactly same functionality as Load function
-// except it ignores nonexistent files instead of returning error.
-func LooseLoad(source interface{}, others ...interface{}) (*File, error) {
-	return loadSources(true, source, others...)
-}
-
-// Empty returns an empty file object.
-func Empty() *File {
-	// Ignore error here, we sure our data is good.
-	f, _ := Load([]byte(""))
-	return f
-}
-
-// NewSection creates a new section.
-func (f *File) NewSection(name string) (*Section, error) {
-	if len(name) == 0 {
-		return nil, errors.New("error creating new section: empty section name")
-	}
-
-	if f.BlockMode {
-		f.lock.Lock()
-		defer f.lock.Unlock()
-	}
-
-	if inSlice(name, f.sectionList) {
-		return f.sections[name], nil
-	}
-
-	f.sectionList = append(f.sectionList, name)
-	f.sections[name] = newSection(f, name)
-	return f.sections[name], nil
-}
-
-// NewSections creates a list of sections.
-func (f *File) NewSections(names ...string) (err error) {
-	for _, name := range names {
-		if _, err = f.NewSection(name); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// GetSection returns section by given name.
-func (f *File) GetSection(name string) (*Section, error) {
-	if len(name) == 0 {
-		name = DEFAULT_SECTION
-	}
-
-	if f.BlockMode {
-		f.lock.RLock()
-		defer f.lock.RUnlock()
-	}
-
-	sec := f.sections[name]
-	if sec == nil {
-		return nil, fmt.Errorf("section '%s' does not exist", name)
-	}
-	return sec, nil
-}
-
-// Section assumes named section exists and returns a zero-value when not.
-func (f *File) Section(name string) *Section {
-	sec, err := f.GetSection(name)
-	if err != nil {
-		// Note: It's OK here because the only possible error is empty section name,
-		// but if it's empty, this piece of code won't be executed.
-		sec, _ = f.NewSection(name)
-		return sec
-	}
-	return sec
-}
-
-// Section returns list of Section.
-func (f *File) Sections() []*Section {
-	sections := make([]*Section, len(f.sectionList))
-	for i := range f.sectionList {
-		sections[i] = f.Section(f.sectionList[i])
-	}
-	return sections
-}
-
-// SectionStrings returns list of section names.
-func (f *File) SectionStrings() []string {
-	list := make([]string, len(f.sectionList))
-	copy(list, f.sectionList)
-	return list
-}
-
-// DeleteSection deletes a section.
-func (f *File) DeleteSection(name string) {
-	if f.BlockMode {
-		f.lock.Lock()
-		defer f.lock.Unlock()
-	}
-
-	if len(name) == 0 {
-		name = DEFAULT_SECTION
-	}
-
-	for i, s := range f.sectionList {
-		if s == name {
-			f.sectionList = append(f.sectionList[:i], f.sectionList[i+1:]...)
-			delete(f.sections, name)
-			return
-		}
-	}
-}
-
-func (f *File) reload(s dataSource) error {
-	r, err := s.ReadCloser()
-	if err != nil {
-		return err
-	}
-	defer r.Close()
-
-	return f.parse(r)
-}
-
-// Reload reloads and parses all data sources.
-func (f *File) Reload() (err error) {
-	for _, s := range f.dataSources {
-		if err = f.reload(s); err != nil {
-			// In loose mode, we create an empty default section for nonexistent files.
-			if os.IsNotExist(err) && f.looseMode {
-				f.parse(bytes.NewBuffer(nil))
-				continue
-			}
-			return err
-		}
-	}
-	return nil
-}
-
-// Append appends one or more data sources and reloads automatically.
-func (f *File) Append(source interface{}, others ...interface{}) error {
-	ds, err := parseDataSource(source)
-	if err != nil {
-		return err
-	}
-	f.dataSources = append(f.dataSources, ds)
-	for _, s := range others {
-		ds, err = parseDataSource(s)
-		if err != nil {
-			return err
-		}
-		f.dataSources = append(f.dataSources, ds)
-	}
-	return f.Reload()
-}
-
-// WriteToIndent writes content into io.Writer with given indention.
-// If PrettyFormat has been set to be true,
-// it will align "=" sign with spaces under each section.
-func (f *File) WriteToIndent(w io.Writer, indent string) (n int64, err error) {
-	equalSign := "="
-	if PrettyFormat {
-		equalSign = " = "
-	}
-
-	// Use buffer to make sure target is safe until finish encoding.
-	buf := bytes.NewBuffer(nil)
-	for i, sname := range f.sectionList {
-		sec := f.Section(sname)
-		if len(sec.Comment) > 0 {
-			if sec.Comment[0] != '#' && sec.Comment[0] != ';' {
-				sec.Comment = "; " + sec.Comment
-			}
-			if _, err = buf.WriteString(sec.Comment + LineBreak); err != nil {
-				return 0, err
-			}
-		}
-
-		if i > 0 || DefaultHeader {
-			if _, err = buf.WriteString("[" + sname + "]" + LineBreak); err != nil {
-				return 0, err
-			}
-		} else {
-			// Write nothing if default section is empty
-			if len(sec.keyList) == 0 {
-				continue
-			}
-		}
-
-		// Count and generate alignment length and buffer spaces
-		alignLength := 0
-		if PrettyFormat {
-			for i := 0; i < len(sec.keyList); i++ {
-				if len(sec.keyList[i]) > alignLength {
-					alignLength = len(sec.keyList[i])
-				}
-			}
-		}
-		alignSpaces := bytes.Repeat([]byte(" "), alignLength)
-
-		for _, kname := range sec.keyList {
-			key := sec.Key(kname)
-			if len(key.Comment) > 0 {
-				if len(indent) > 0 && sname != DEFAULT_SECTION {
-					buf.WriteString(indent)
-				}
-				if key.Comment[0] != '#' && key.Comment[0] != ';' {
-					key.Comment = "; " + key.Comment
-				}
-				if _, err = buf.WriteString(key.Comment + LineBreak); err != nil {
-					return 0, err
-				}
-			}
-
-			if len(indent) > 0 && sname != DEFAULT_SECTION {
-				buf.WriteString(indent)
-			}
-
-			switch {
-			case key.isAutoIncr:
-				kname = "-"
-			case strings.ContainsAny(kname, "\"=:"):
-				kname = "`" + kname + "`"
-			case strings.Contains(kname, "`"):
-				kname = `"""` + kname + `"""`
-			}
-			if _, err = buf.WriteString(kname); err != nil {
-				return 0, err
-			}
-
-			// Write out alignment spaces before "=" sign
-			if PrettyFormat {
-				buf.Write(alignSpaces[:alignLength-len(kname)])
-			}
-
-			val := key.value
-			// In case key value contains "\n", "`", "\"", "#" or ";"
-			if strings.ContainsAny(val, "\n`") {
-				val = `"""` + val + `"""`
-			} else if strings.ContainsAny(val, "#;") {
-				val = "`" + val + "`"
-			}
-			if _, err = buf.WriteString(equalSign + val + LineBreak); err != nil {
-				return 0, err
-			}
-		}
-
-		// Put a line between sections
-		if _, err = buf.WriteString(LineBreak); err != nil {
-			return 0, err
-		}
-	}
-
-	return buf.WriteTo(w)
-}
-
-// WriteTo writes file content into io.Writer.
-func (f *File) WriteTo(w io.Writer) (int64, error) {
-	return f.WriteToIndent(w, "")
-}
-
-// SaveToIndent writes content to file system with given value indention.
-func (f *File) SaveToIndent(filename, indent string) error {
-	// Note: Because we are truncating with os.Create,
-	// 	so it's safer to save to a temporary file location and rename afte done.
-	tmpPath := filename + "." + strconv.Itoa(time.Now().Nanosecond()) + ".tmp"
-	defer os.Remove(tmpPath)
-
-	fw, err := os.Create(tmpPath)
-	if err != nil {
-		return err
-	}
-
-	if _, err = f.WriteToIndent(fw, indent); err != nil {
-		fw.Close()
-		return err
-	}
-	fw.Close()
-
-	// Remove old file and rename the new one.
-	os.Remove(filename)
-	return os.Rename(tmpPath, filename)
-}
-
-// SaveTo writes content to file system.
-func (f *File) SaveTo(filename string) error {
-	return f.SaveToIndent(filename, "")
-}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/key.go b/Godeps/_workspace/src/github.com/go-ini/ini/key.go
deleted file mode 100644
index 7cbccd38e6..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/key.go
+++ /dev/null
@@ -1,616 +0,0 @@
-// Copyright 2014 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package ini
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// Key represents a key under a section.
-type Key struct {
-	s          *Section
-	Comment    string
-	name       string
-	value      string
-	isAutoIncr bool
-}
-
-// Name returns name of key.
-func (k *Key) Name() string {
-	return k.name
-}
-
-// Value returns raw value of key for performance purpose.
-func (k *Key) Value() string {
-	return k.value
-}
-
-// String returns string representation of value.
-func (k *Key) String() string {
-	val := k.value
-	if strings.Index(val, "%") == -1 {
-		return val
-	}
-
-	for i := 0; i < _DEPTH_VALUES; i++ {
-		vr := varPattern.FindString(val)
-		if len(vr) == 0 {
-			break
-		}
-
-		// Take off leading '%(' and trailing ')s'.
-		noption := strings.TrimLeft(vr, "%(")
-		noption = strings.TrimRight(noption, ")s")
-
-		// Search in the same section.
-		nk, err := k.s.GetKey(noption)
-		if err != nil {
-			// Search again in default section.
-			nk, _ = k.s.f.Section("").GetKey(noption)
-		}
-
-		// Substitute by new value and take off leading '%(' and trailing ')s'.
-		val = strings.Replace(val, vr, nk.value, -1)
-	}
-	return val
-}
-
-// Validate accepts a validate function which can
-// return modifed result as key value.
-func (k *Key) Validate(fn func(string) string) string {
-	return fn(k.String())
-}
-
-// parseBool returns the boolean value represented by the string.
-//
-// It accepts 1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On,
-// 0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off.
-// Any other value returns an error.
-func parseBool(str string) (value bool, err error) {
-	switch str {
-	case "1", "t", "T", "true", "TRUE", "True", "YES", "yes", "Yes", "y", "ON", "on", "On":
-		return true, nil
-	case "0", "f", "F", "false", "FALSE", "False", "NO", "no", "No", "n", "OFF", "off", "Off":
-		return false, nil
-	}
-	return false, fmt.Errorf("parsing \"%s\": invalid syntax", str)
-}
-
-// Bool returns bool type value.
-func (k *Key) Bool() (bool, error) {
-	return parseBool(k.String())
-}
-
-// Float64 returns float64 type value.
-func (k *Key) Float64() (float64, error) {
-	return strconv.ParseFloat(k.String(), 64)
-}
-
-// Int returns int type value.
-func (k *Key) Int() (int, error) {
-	return strconv.Atoi(k.String())
-}
-
-// Int64 returns int64 type value.
-func (k *Key) Int64() (int64, error) {
-	return strconv.ParseInt(k.String(), 10, 64)
-}
-
-// Uint returns uint type valued.
-func (k *Key) Uint() (uint, error) {
-	u, e := strconv.ParseUint(k.String(), 10, 64)
-	return uint(u), e
-}
-
-// Uint64 returns uint64 type value.
-func (k *Key) Uint64() (uint64, error) {
-	return strconv.ParseUint(k.String(), 10, 64)
-}
-
-// Duration returns time.Duration type value.
-func (k *Key) Duration() (time.Duration, error) {
-	return time.ParseDuration(k.String())
-}
-
-// TimeFormat parses with given format and returns time.Time type value.
-func (k *Key) TimeFormat(format string) (time.Time, error) {
-	return time.Parse(format, k.String())
-}
-
-// Time parses with RFC3339 format and returns time.Time type value.
-func (k *Key) Time() (time.Time, error) {
-	return k.TimeFormat(time.RFC3339)
-}
-
-// MustString returns default value if key value is empty.
-func (k *Key) MustString(defaultVal string) string {
-	val := k.String()
-	if len(val) == 0 {
-		return defaultVal
-	}
-	return val
-}
-
-// MustBool always returns value without error,
-// it returns false if error occurs.
-func (k *Key) MustBool(defaultVal ...bool) bool {
-	val, err := k.Bool()
-	if len(defaultVal) > 0 && err != nil {
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustFloat64 always returns value without error,
-// it returns 0.0 if error occurs.
-func (k *Key) MustFloat64(defaultVal ...float64) float64 {
-	val, err := k.Float64()
-	if len(defaultVal) > 0 && err != nil {
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustInt always returns value without error,
-// it returns 0 if error occurs.
-func (k *Key) MustInt(defaultVal ...int) int {
-	val, err := k.Int()
-	if len(defaultVal) > 0 && err != nil {
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustInt64 always returns value without error,
-// it returns 0 if error occurs.
-func (k *Key) MustInt64(defaultVal ...int64) int64 {
-	val, err := k.Int64()
-	if len(defaultVal) > 0 && err != nil {
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustUint always returns value without error,
-// it returns 0 if error occurs.
-func (k *Key) MustUint(defaultVal ...uint) uint {
-	val, err := k.Uint()
-	if len(defaultVal) > 0 && err != nil {
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustUint64 always returns value without error,
-// it returns 0 if error occurs.
-func (k *Key) MustUint64(defaultVal ...uint64) uint64 {
-	val, err := k.Uint64()
-	if len(defaultVal) > 0 && err != nil {
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustDuration always returns value without error,
-// it returns zero value if error occurs.
-func (k *Key) MustDuration(defaultVal ...time.Duration) time.Duration {
-	val, err := k.Duration()
-	if len(defaultVal) > 0 && err != nil {
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustTimeFormat always parses with given format and returns value without error,
-// it returns zero value if error occurs.
-func (k *Key) MustTimeFormat(format string, defaultVal ...time.Time) time.Time {
-	val, err := k.TimeFormat(format)
-	if len(defaultVal) > 0 && err != nil {
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustTime always parses with RFC3339 format and returns value without error,
-// it returns zero value if error occurs.
-func (k *Key) MustTime(defaultVal ...time.Time) time.Time {
-	return k.MustTimeFormat(time.RFC3339, defaultVal...)
-}
-
-// In always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) In(defaultVal string, candidates []string) string {
-	val := k.String()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InFloat64 always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InFloat64(defaultVal float64, candidates []float64) float64 {
-	val := k.MustFloat64()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InInt always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InInt(defaultVal int, candidates []int) int {
-	val := k.MustInt()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InInt64 always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InInt64(defaultVal int64, candidates []int64) int64 {
-	val := k.MustInt64()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InUint always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InUint(defaultVal uint, candidates []uint) uint {
-	val := k.MustUint()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InUint64 always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InUint64(defaultVal uint64, candidates []uint64) uint64 {
-	val := k.MustUint64()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InTimeFormat always parses with given format and returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InTimeFormat(format string, defaultVal time.Time, candidates []time.Time) time.Time {
-	val := k.MustTimeFormat(format)
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InTime always parses with RFC3339 format and returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InTime(defaultVal time.Time, candidates []time.Time) time.Time {
-	return k.InTimeFormat(time.RFC3339, defaultVal, candidates)
-}
-
-// RangeFloat64 checks if value is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeFloat64(defaultVal, min, max float64) float64 {
-	val := k.MustFloat64()
-	if val < min || val > max {
-		return defaultVal
-	}
-	return val
-}
-
-// RangeInt checks if value is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeInt(defaultVal, min, max int) int {
-	val := k.MustInt()
-	if val < min || val > max {
-		return defaultVal
-	}
-	return val
-}
-
-// RangeInt64 checks if value is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeInt64(defaultVal, min, max int64) int64 {
-	val := k.MustInt64()
-	if val < min || val > max {
-		return defaultVal
-	}
-	return val
-}
-
-// RangeTimeFormat checks if value with given format is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeTimeFormat(format string, defaultVal, min, max time.Time) time.Time {
-	val := k.MustTimeFormat(format)
-	if val.Unix() < min.Unix() || val.Unix() > max.Unix() {
-		return defaultVal
-	}
-	return val
-}
-
-// RangeTime checks if value with RFC3339 format is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeTime(defaultVal, min, max time.Time) time.Time {
-	return k.RangeTimeFormat(time.RFC3339, defaultVal, min, max)
-}
-
-// Strings returns list of string divided by given delimiter.
-func (k *Key) Strings(delim string) []string {
-	str := k.String()
-	if len(str) == 0 {
-		return []string{}
-	}
-
-	vals := strings.Split(str, delim)
-	for i := range vals {
-		vals[i] = strings.TrimSpace(vals[i])
-	}
-	return vals
-}
-
-// Float64s returns list of float64 divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Float64s(delim string) []float64 {
-	vals, _ := k.getFloat64s(delim, true, false)
-	return vals
-}
-
-// Ints returns list of int divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Ints(delim string) []int {
-	vals, _ := k.getInts(delim, true, false)
-	return vals
-}
-
-// Int64s returns list of int64 divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Int64s(delim string) []int64 {
-	vals, _ := k.getInt64s(delim, true, false)
-	return vals
-}
-
-// Uints returns list of uint divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Uints(delim string) []uint {
-	vals, _ := k.getUints(delim, true, false)
-	return vals
-}
-
-// Uint64s returns list of uint64 divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Uint64s(delim string) []uint64 {
-	vals, _ := k.getUint64s(delim, true, false)
-	return vals
-}
-
-// TimesFormat parses with given format and returns list of time.Time divided by given delimiter.
-// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
-func (k *Key) TimesFormat(format, delim string) []time.Time {
-	vals, _ := k.getTimesFormat(format, delim, true, false)
-	return vals
-}
-
-// Times parses with RFC3339 format and returns list of time.Time divided by given delimiter.
-// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
-func (k *Key) Times(delim string) []time.Time {
-	return k.TimesFormat(time.RFC3339, delim)
-}
-
-// ValidFloat64s returns list of float64 divided by given delimiter. If some value is not float, then
-// it will not be included to result list.
-func (k *Key) ValidFloat64s(delim string) []float64 {
-	vals, _ := k.getFloat64s(delim, false, false)
-	return vals
-}
-
-// ValidInts returns list of int divided by given delimiter. If some value is not integer, then it will
-// not be included to result list.
-func (k *Key) ValidInts(delim string) []int {
-	vals, _ := k.getInts(delim, false, false)
-	return vals
-}
-
-// ValidInt64s returns list of int64 divided by given delimiter. If some value is not 64-bit integer,
-// then it will not be included to result list.
-func (k *Key) ValidInt64s(delim string) []int64 {
-	vals, _ := k.getInt64s(delim, false, false)
-	return vals
-}
-
-// ValidUints returns list of uint divided by given delimiter. If some value is not unsigned integer,
-// then it will not be included to result list.
-func (k *Key) ValidUints(delim string) []uint {
-	vals, _ := k.getUints(delim, false, false)
-	return vals
-}
-
-// ValidUint64s returns list of uint64 divided by given delimiter. If some value is not 64-bit unsigned
-// integer, then it will not be included to result list.
-func (k *Key) ValidUint64s(delim string) []uint64 {
-	vals, _ := k.getUint64s(delim, false, false)
-	return vals
-}
-
-// ValidTimesFormat parses with given format and returns list of time.Time divided by given delimiter.
-func (k *Key) ValidTimesFormat(format, delim string) []time.Time {
-	vals, _ := k.getTimesFormat(format, delim, false, false)
-	return vals
-}
-
-// ValidTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter.
-func (k *Key) ValidTimes(delim string) []time.Time {
-	return k.ValidTimesFormat(time.RFC3339, delim)
-}
-
-// StrictFloat64s returns list of float64 divided by given delimiter or error on first invalid input.
-func (k *Key) StrictFloat64s(delim string) ([]float64, error) {
-	return k.getFloat64s(delim, false, true)
-}
-
-// StrictInts returns list of int divided by given delimiter or error on first invalid input.
-func (k *Key) StrictInts(delim string) ([]int, error) {
-	return k.getInts(delim, false, true)
-}
-
-// StrictInt64s returns list of int64 divided by given delimiter or error on first invalid input.
-func (k *Key) StrictInt64s(delim string) ([]int64, error) {
-	return k.getInt64s(delim, false, true)
-}
-
-// StrictUints returns list of uint divided by given delimiter or error on first invalid input.
-func (k *Key) StrictUints(delim string) ([]uint, error) {
-	return k.getUints(delim, false, true)
-}
-
-// StrictUint64s returns list of uint64 divided by given delimiter or error on first invalid input.
-func (k *Key) StrictUint64s(delim string) ([]uint64, error) {
-	return k.getUint64s(delim, false, true)
-}
-
-// StrictTimesFormat parses with given format and returns list of time.Time divided by given delimiter
-// or error on first invalid input.
-func (k *Key) StrictTimesFormat(format, delim string) ([]time.Time, error) {
-	return k.getTimesFormat(format, delim, false, true)
-}
-
-// StrictTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter
-// or error on first invalid input.
-func (k *Key) StrictTimes(delim string) ([]time.Time, error) {
-	return k.StrictTimesFormat(time.RFC3339, delim)
-}
-
-// getFloat64s returns list of float64 divided by given delimiter.
-func (k *Key) getFloat64s(delim string, addInvalid, returnOnInvalid bool) ([]float64, error) {
-	strs := k.Strings(delim)
-	vals := make([]float64, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.ParseFloat(str, 64)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// getInts returns list of int divided by given delimiter.
-func (k *Key) getInts(delim string, addInvalid, returnOnInvalid bool) ([]int, error) {
-	strs := k.Strings(delim)
-	vals := make([]int, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.Atoi(str)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// getInt64s returns list of int64 divided by given delimiter.
-func (k *Key) getInt64s(delim string, addInvalid, returnOnInvalid bool) ([]int64, error) {
-	strs := k.Strings(delim)
-	vals := make([]int64, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.ParseInt(str, 10, 64)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// getUints returns list of uint divided by given delimiter.
-func (k *Key) getUints(delim string, addInvalid, returnOnInvalid bool) ([]uint, error) {
-	strs := k.Strings(delim)
-	vals := make([]uint, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.ParseUint(str, 10, 0)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, uint(val))
-		}
-	}
-	return vals, nil
-}
-
-// getUint64s returns list of uint64 divided by given delimiter.
-func (k *Key) getUint64s(delim string, addInvalid, returnOnInvalid bool) ([]uint64, error) {
-	strs := k.Strings(delim)
-	vals := make([]uint64, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.ParseUint(str, 10, 64)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// getTimesFormat parses with given format and returns list of time.Time divided by given delimiter.
-func (k *Key) getTimesFormat(format, delim string, addInvalid, returnOnInvalid bool) ([]time.Time, error) {
-	strs := k.Strings(delim)
-	vals := make([]time.Time, 0, len(strs))
-	for _, str := range strs {
-		val, err := time.Parse(format, str)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// SetValue changes key value.
-func (k *Key) SetValue(v string) {
-	if k.s.f.BlockMode {
-		k.s.f.lock.Lock()
-		defer k.s.f.lock.Unlock()
-	}
-
-	k.value = v
-	k.s.keysHash[k.name] = v
-}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/parser.go b/Godeps/_workspace/src/github.com/go-ini/ini/parser.go
deleted file mode 100644
index 1c1bf91f0e..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/parser.go
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright 2015 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package ini
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"unicode"
-)
-
-type tokenType int
-
-const (
-	_TOKEN_INVALID tokenType = iota
-	_TOKEN_COMMENT
-	_TOKEN_SECTION
-	_TOKEN_KEY
-)
-
-type parser struct {
-	buf     *bufio.Reader
-	isEOF   bool
-	count   int
-	comment *bytes.Buffer
-}
-
-func newParser(r io.Reader) *parser {
-	return &parser{
-		buf:     bufio.NewReader(r),
-		count:   1,
-		comment: &bytes.Buffer{},
-	}
-}
-
-// BOM handles header of BOM-UTF8 format.
-// http://en.wikipedia.org/wiki/Byte_order_mark#Representations_of_byte_order_marks_by_encoding
-func (p *parser) BOM() error {
-	mask, err := p.buf.Peek(3)
-	if err != nil && err != io.EOF {
-		return err
-	} else if len(mask) < 3 {
-		return nil
-	} else if mask[0] == 239 && mask[1] == 187 && mask[2] == 191 {
-		p.buf.Read(mask)
-	}
-	return nil
-}
-
-func (p *parser) readUntil(delim byte) ([]byte, error) {
-	data, err := p.buf.ReadBytes(delim)
-	if err != nil {
-		if err == io.EOF {
-			p.isEOF = true
-		} else {
-			return nil, err
-		}
-	}
-	return data, nil
-}
-
-func cleanComment(in []byte) ([]byte, bool) {
-	i := bytes.IndexAny(in, "#;")
-	if i == -1 {
-		return nil, false
-	}
-	return in[i:], true
-}
-
-func readKeyName(in []byte) (string, int, error) {
-	line := string(in)
-
-	// Check if key name surrounded by quotes.
-	var keyQuote string
-	if line[0] == '"' {
-		if len(line) > 6 && string(line[0:3]) == `"""` {
-			keyQuote = `"""`
-		} else {
-			keyQuote = `"`
-		}
-	} else if line[0] == '`' {
-		keyQuote = "`"
-	}
-
-	// Get out key name
-	endIdx := -1
-	if len(keyQuote) > 0 {
-		startIdx := len(keyQuote)
-		// FIXME: fail case -> """"""name"""=value
-		pos := strings.Index(line[startIdx:], keyQuote)
-		if pos == -1 {
-			return "", -1, fmt.Errorf("missing closing key quote: %s", line)
-		}
-		pos += startIdx
-
-		// Find key-value delimiter
-		i := strings.IndexAny(line[pos+startIdx:], "=:")
-		if i < 0 {
-			return "", -1, fmt.Errorf("key-value delimiter not found: %s", line)
-		}
-		endIdx = pos + i
-		return strings.TrimSpace(line[startIdx:pos]), endIdx + startIdx + 1, nil
-	}
-
-	endIdx = strings.IndexAny(line, "=:")
-	if endIdx < 0 {
-		return "", -1, fmt.Errorf("key-value delimiter not found: %s", line)
-	}
-	return strings.TrimSpace(line[0:endIdx]), endIdx + 1, nil
-}
-
-func (p *parser) readMultilines(line, val, valQuote string) (string, error) {
-	for {
-		data, err := p.readUntil('\n')
-		if err != nil {
-			return "", err
-		}
-		next := string(data)
-
-		pos := strings.LastIndex(next, valQuote)
-		if pos > -1 {
-			val += next[:pos]
-
-			comment, has := cleanComment([]byte(next[pos:]))
-			if has {
-				p.comment.Write(bytes.TrimSpace(comment))
-			}
-			break
-		}
-		val += next
-		if p.isEOF {
-			return "", fmt.Errorf("missing closing key quote from '%s' to '%s'", line, next)
-		}
-	}
-	return val, nil
-}
-
-func (p *parser) readContinuationLines(val string) (string, error) {
-	for {
-		data, err := p.readUntil('\n')
-		if err != nil {
-			return "", err
-		}
-		next := strings.TrimSpace(string(data))
-
-		if len(next) == 0 {
-			break
-		}
-		val += next
-		if val[len(val)-1] != '\\' {
-			break
-		}
-		val = val[:len(val)-1]
-	}
-	return val, nil
-}
-
-// hasSurroundedQuote check if and only if the first and last characters
-// are quotes \" or \'.
-// It returns false if any other parts also contain same kind of quotes.
-func hasSurroundedQuote(in string, quote byte) bool {
-	return len(in) > 2 && in[0] == quote && in[len(in)-1] == quote &&
-		strings.IndexByte(in[1:], quote) == len(in)-2
-}
-
-func (p *parser) readValue(in []byte) (string, error) {
-	line := strings.TrimLeftFunc(string(in), unicode.IsSpace)
-	if len(line) == 0 {
-		return "", nil
-	}
-
-	var valQuote string
-	if len(line) > 3 && string(line[0:3]) == `"""` {
-		valQuote = `"""`
-	} else if line[0] == '`' {
-		valQuote = "`"
-	}
-
-	if len(valQuote) > 0 {
-		startIdx := len(valQuote)
-		pos := strings.LastIndex(line[startIdx:], valQuote)
-		// Check for multi-line value
-		if pos == -1 {
-			return p.readMultilines(line, line[startIdx:], valQuote)
-		}
-
-		return line[startIdx : pos+startIdx], nil
-	}
-
-	// Won't be able to reach here if value only contains whitespace.
-	line = strings.TrimSpace(line)
-
-	// Check continuation lines
-	if line[len(line)-1] == '\\' {
-		return p.readContinuationLines(line[:len(line)-1])
-	}
-
-	i := strings.IndexAny(line, "#;")
-	if i > -1 {
-		p.comment.WriteString(line[i:])
-		line = strings.TrimSpace(line[:i])
-	}
-
-	// Trim single quotes
-	if hasSurroundedQuote(line, '\'') ||
-		hasSurroundedQuote(line, '"') {
-		line = line[1 : len(line)-1]
-	}
-	return line, nil
-}
-
-// parse parses data through an io.Reader.
-func (f *File) parse(reader io.Reader) (err error) {
-	p := newParser(reader)
-	if err = p.BOM(); err != nil {
-		return fmt.Errorf("BOM: %v", err)
-	}
-
-	// Ignore error because default section name is never empty string.
-	section, _ := f.NewSection(DEFAULT_SECTION)
-
-	var line []byte
-	for !p.isEOF {
-		line, err = p.readUntil('\n')
-		if err != nil {
-			return err
-		}
-
-		line = bytes.TrimLeftFunc(line, unicode.IsSpace)
-		if len(line) == 0 {
-			continue
-		}
-
-		// Comments
-		if line[0] == '#' || line[0] == ';' {
-			// Note: we do not care ending line break,
-			// it is needed for adding second line,
-			// so just clean it once at the end when set to value.
-			p.comment.Write(line)
-			continue
-		}
-
-		// Section
-		if line[0] == '[' {
-			// Read to the next ']' (TODO: support quoted strings)
-			closeIdx := bytes.IndexByte(line, ']')
-			if closeIdx == -1 {
-				return fmt.Errorf("unclosed section: %s", line)
-			}
-
-			section, err = f.NewSection(string(line[1:closeIdx]))
-			if err != nil {
-				return err
-			}
-
-			comment, has := cleanComment(line[closeIdx+1:])
-			if has {
-				p.comment.Write(comment)
-			}
-
-			section.Comment = strings.TrimSpace(p.comment.String())
-
-			// Reset aotu-counter and comments
-			p.comment.Reset()
-			p.count = 1
-			continue
-		}
-
-		kname, offset, err := readKeyName(line)
-		if err != nil {
-			return err
-		}
-
-		// Auto increment.
-		isAutoIncr := false
-		if kname == "-" {
-			isAutoIncr = true
-			kname = "#" + strconv.Itoa(p.count)
-			p.count++
-		}
-
-		key, err := section.NewKey(kname, "")
-		if err != nil {
-			return err
-		}
-		key.isAutoIncr = isAutoIncr
-
-		value, err := p.readValue(line[offset:])
-		if err != nil {
-			return err
-		}
-		key.SetValue(value)
-		key.Comment = strings.TrimSpace(p.comment.String())
-		p.comment.Reset()
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/section.go b/Godeps/_workspace/src/github.com/go-ini/ini/section.go
deleted file mode 100644
index ed8cbdb54a..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/section.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2014 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package ini
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-)
-
-// Section represents a config section.
-type Section struct {
-	f        *File
-	Comment  string
-	name     string
-	keys     map[string]*Key
-	keyList  []string
-	keysHash map[string]string
-}
-
-func newSection(f *File, name string) *Section {
-	return &Section{f, "", name, make(map[string]*Key), make([]string, 0, 10), make(map[string]string)}
-}
-
-// Name returns name of Section.
-func (s *Section) Name() string {
-	return s.name
-}
-
-// NewKey creates a new key to given section.
-func (s *Section) NewKey(name, val string) (*Key, error) {
-	if len(name) == 0 {
-		return nil, errors.New("error creating new key: empty key name")
-	}
-
-	if s.f.BlockMode {
-		s.f.lock.Lock()
-		defer s.f.lock.Unlock()
-	}
-
-	if inSlice(name, s.keyList) {
-		s.keys[name].value = val
-		return s.keys[name], nil
-	}
-
-	s.keyList = append(s.keyList, name)
-	s.keys[name] = &Key{s, "", name, val, false}
-	s.keysHash[name] = val
-	return s.keys[name], nil
-}
-
-// GetKey returns key in section by given name.
-func (s *Section) GetKey(name string) (*Key, error) {
-	// FIXME: change to section level lock?
-	if s.f.BlockMode {
-		s.f.lock.RLock()
-	}
-	key := s.keys[name]
-	if s.f.BlockMode {
-		s.f.lock.RUnlock()
-	}
-
-	if key == nil {
-		// Check if it is a child-section.
-		sname := s.name
-		for {
-			if i := strings.LastIndex(sname, "."); i > -1 {
-				sname = sname[:i]
-				sec, err := s.f.GetSection(sname)
-				if err != nil {
-					continue
-				}
-				return sec.GetKey(name)
-			} else {
-				break
-			}
-		}
-		return nil, fmt.Errorf("error when getting key of section '%s': key '%s' not exists", s.name, name)
-	}
-	return key, nil
-}
-
-// HasKey returns true if section contains a key with given name.
-func (s *Section) HasKey(name string) bool {
-	key, _ := s.GetKey(name)
-	return key != nil
-}
-
-// Haskey is a backwards-compatible name for HasKey.
-func (s *Section) Haskey(name string) bool {
-	return s.HasKey(name)
-}
-
-// HasValue returns true if section contains given raw value.
-func (s *Section) HasValue(value string) bool {
-	if s.f.BlockMode {
-		s.f.lock.RLock()
-		defer s.f.lock.RUnlock()
-	}
-
-	for _, k := range s.keys {
-		if value == k.value {
-			return true
-		}
-	}
-	return false
-}
-
-// Key assumes named Key exists in section and returns a zero-value when not.
-func (s *Section) Key(name string) *Key {
-	key, err := s.GetKey(name)
-	if err != nil {
-		// It's OK here because the only possible error is empty key name,
-		// but if it's empty, this piece of code won't be executed.
-		key, _ = s.NewKey(name, "")
-		return key
-	}
-	return key
-}
-
-// Keys returns list of keys of section.
-func (s *Section) Keys() []*Key {
-	keys := make([]*Key, len(s.keyList))
-	for i := range s.keyList {
-		keys[i] = s.Key(s.keyList[i])
-	}
-	return keys
-}
-
-// KeyStrings returns list of key names of section.
-func (s *Section) KeyStrings() []string {
-	list := make([]string, len(s.keyList))
-	copy(list, s.keyList)
-	return list
-}
-
-// KeysHash returns keys hash consisting of names and values.
-func (s *Section) KeysHash() map[string]string {
-	if s.f.BlockMode {
-		s.f.lock.RLock()
-		defer s.f.lock.RUnlock()
-	}
-
-	hash := map[string]string{}
-	for key, value := range s.keysHash {
-		hash[key] = value
-	}
-	return hash
-}
-
-// DeleteKey deletes a key from section.
-func (s *Section) DeleteKey(name string) {
-	if s.f.BlockMode {
-		s.f.lock.Lock()
-		defer s.f.lock.Unlock()
-	}
-
-	for i, k := range s.keyList {
-		if k == name {
-			s.keyList = append(s.keyList[:i], s.keyList[i+1:]...)
-			delete(s.keys, name)
-			return
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/go-ini/ini/struct.go b/Godeps/_workspace/src/github.com/go-ini/ini/struct.go
deleted file mode 100644
index 3fb92c3962..0000000000
--- a/Godeps/_workspace/src/github.com/go-ini/ini/struct.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// Copyright 2014 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package ini
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"reflect"
-	"time"
-	"unicode"
-)
-
-// NameMapper represents a ini tag name mapper.
-type NameMapper func(string) string
-
-// Built-in name getters.
-var (
-	// AllCapsUnderscore converts to format ALL_CAPS_UNDERSCORE.
-	AllCapsUnderscore NameMapper = func(raw string) string {
-		newstr := make([]rune, 0, len(raw))
-		for i, chr := range raw {
-			if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
-				if i > 0 {
-					newstr = append(newstr, '_')
-				}
-			}
-			newstr = append(newstr, unicode.ToUpper(chr))
-		}
-		return string(newstr)
-	}
-	// TitleUnderscore converts to format title_underscore.
-	TitleUnderscore NameMapper = func(raw string) string {
-		newstr := make([]rune, 0, len(raw))
-		for i, chr := range raw {
-			if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
-				if i > 0 {
-					newstr = append(newstr, '_')
-				}
-				chr -= ('A' - 'a')
-			}
-			newstr = append(newstr, chr)
-		}
-		return string(newstr)
-	}
-)
-
-func (s *Section) parseFieldName(raw, actual string) string {
-	if len(actual) > 0 {
-		return actual
-	}
-	if s.f.NameMapper != nil {
-		return s.f.NameMapper(raw)
-	}
-	return raw
-}
-
-func parseDelim(actual string) string {
-	if len(actual) > 0 {
-		return actual
-	}
-	return ","
-}
-
-var reflectTime = reflect.TypeOf(time.Now()).Kind()
-
-// setWithProperType sets proper value to field based on its type,
-// but it does not return error for failing parsing,
-// because we want to use default value that is already assigned to strcut.
-func setWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string) error {
-	switch t.Kind() {
-	case reflect.String:
-		if len(key.String()) == 0 {
-			return nil
-		}
-		field.SetString(key.String())
-	case reflect.Bool:
-		boolVal, err := key.Bool()
-		if err != nil {
-			return nil
-		}
-		field.SetBool(boolVal)
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		durationVal, err := key.Duration()
-		// Skip zero value
-		if err == nil && int(durationVal) > 0 {
-			field.Set(reflect.ValueOf(durationVal))
-			return nil
-		}
-
-		intVal, err := key.Int64()
-		if err != nil || intVal == 0 {
-			return nil
-		}
-		field.SetInt(intVal)
-	//	byte is an alias for uint8, so supporting uint8 breaks support for byte
-	case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		durationVal, err := key.Duration()
-		if err == nil {
-			field.Set(reflect.ValueOf(durationVal))
-			return nil
-		}
-
-		uintVal, err := key.Uint64()
-		if err != nil {
-			return nil
-		}
-		field.SetUint(uintVal)
-
-	case reflect.Float64:
-		floatVal, err := key.Float64()
-		if err != nil {
-			return nil
-		}
-		field.SetFloat(floatVal)
-	case reflectTime:
-		timeVal, err := key.Time()
-		if err != nil {
-			return nil
-		}
-		field.Set(reflect.ValueOf(timeVal))
-	case reflect.Slice:
-		vals := key.Strings(delim)
-		numVals := len(vals)
-		if numVals == 0 {
-			return nil
-		}
-
-		sliceOf := field.Type().Elem().Kind()
-
-		var times []time.Time
-		if sliceOf == reflectTime {
-			times = key.Times(delim)
-		}
-
-		slice := reflect.MakeSlice(field.Type(), numVals, numVals)
-		for i := 0; i < numVals; i++ {
-			switch sliceOf {
-			case reflectTime:
-				slice.Index(i).Set(reflect.ValueOf(times[i]))
-			default:
-				slice.Index(i).Set(reflect.ValueOf(vals[i]))
-			}
-		}
-		field.Set(slice)
-	default:
-		return fmt.Errorf("unsupported type '%s'", t)
-	}
-	return nil
-}
-
-func (s *Section) mapTo(val reflect.Value) error {
-	if val.Kind() == reflect.Ptr {
-		val = val.Elem()
-	}
-	typ := val.Type()
-
-	for i := 0; i < typ.NumField(); i++ {
-		field := val.Field(i)
-		tpField := typ.Field(i)
-
-		tag := tpField.Tag.Get("ini")
-		if tag == "-" {
-			continue
-		}
-
-		fieldName := s.parseFieldName(tpField.Name, tag)
-		if len(fieldName) == 0 || !field.CanSet() {
-			continue
-		}
-
-		isAnonymous := tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous
-		isStruct := tpField.Type.Kind() == reflect.Struct
-		if isAnonymous {
-			field.Set(reflect.New(tpField.Type.Elem()))
-		}
-
-		if isAnonymous || isStruct {
-			if sec, err := s.f.GetSection(fieldName); err == nil {
-				if err = sec.mapTo(field); err != nil {
-					return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
-				}
-				continue
-			}
-		}
-
-		if key, err := s.GetKey(fieldName); err == nil {
-			if err = setWithProperType(tpField.Type, key, field, parseDelim(tpField.Tag.Get("delim"))); err != nil {
-				return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
-			}
-		}
-	}
-	return nil
-}
-
-// MapTo maps section to given struct.
-func (s *Section) MapTo(v interface{}) error {
-	typ := reflect.TypeOf(v)
-	val := reflect.ValueOf(v)
-	if typ.Kind() == reflect.Ptr {
-		typ = typ.Elem()
-		val = val.Elem()
-	} else {
-		return errors.New("cannot map to non-pointer struct")
-	}
-
-	return s.mapTo(val)
-}
-
-// MapTo maps file to given struct.
-func (f *File) MapTo(v interface{}) error {
-	return f.Section("").MapTo(v)
-}
-
-// MapTo maps data sources to given struct with name mapper.
-func MapToWithMapper(v interface{}, mapper NameMapper, source interface{}, others ...interface{}) error {
-	cfg, err := Load(source, others...)
-	if err != nil {
-		return err
-	}
-	cfg.NameMapper = mapper
-	return cfg.MapTo(v)
-}
-
-// MapTo maps data sources to given struct.
-func MapTo(v, source interface{}, others ...interface{}) error {
-	return MapToWithMapper(v, nil, source, others...)
-}
-
-// reflectWithProperType does the opposite thing with setWithProperType.
-func reflectWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string) error {
-	switch t.Kind() {
-	case reflect.String:
-		key.SetValue(field.String())
-	case reflect.Bool,
-		reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
-		reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
-		reflect.Float64,
-		reflectTime:
-		key.SetValue(fmt.Sprint(field))
-	case reflect.Slice:
-		vals := field.Slice(0, field.Len())
-		if field.Len() == 0 {
-			return nil
-		}
-
-		var buf bytes.Buffer
-		isTime := fmt.Sprint(field.Type()) == "[]time.Time"
-		for i := 0; i < field.Len(); i++ {
-			if isTime {
-				buf.WriteString(vals.Index(i).Interface().(time.Time).Format(time.RFC3339))
-			} else {
-				buf.WriteString(fmt.Sprint(vals.Index(i)))
-			}
-			buf.WriteString(delim)
-		}
-		key.SetValue(buf.String()[:buf.Len()-1])
-	default:
-		return fmt.Errorf("unsupported type '%s'", t)
-	}
-	return nil
-}
-
-func (s *Section) reflectFrom(val reflect.Value) error {
-	if val.Kind() == reflect.Ptr {
-		val = val.Elem()
-	}
-	typ := val.Type()
-
-	for i := 0; i < typ.NumField(); i++ {
-		field := val.Field(i)
-		tpField := typ.Field(i)
-
-		tag := tpField.Tag.Get("ini")
-		if tag == "-" {
-			continue
-		}
-
-		fieldName := s.parseFieldName(tpField.Name, tag)
-		if len(fieldName) == 0 || !field.CanSet() {
-			continue
-		}
-
-		if (tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous) ||
-			(tpField.Type.Kind() == reflect.Struct) {
-			// Note: The only error here is section doesn't exist.
-			sec, err := s.f.GetSection(fieldName)
-			if err != nil {
-				// Note: fieldName can never be empty here, ignore error.
-				sec, _ = s.f.NewSection(fieldName)
-			}
-			if err = sec.reflectFrom(field); err != nil {
-				return fmt.Errorf("error reflecting field(%s): %v", fieldName, err)
-			}
-			continue
-		}
-
-		// Note: Same reason as secion.
-		key, err := s.GetKey(fieldName)
-		if err != nil {
-			key, _ = s.NewKey(fieldName, "")
-		}
-		if err = reflectWithProperType(tpField.Type, key, field, parseDelim(tpField.Tag.Get("delim"))); err != nil {
-			return fmt.Errorf("error reflecting field(%s): %v", fieldName, err)
-		}
-
-	}
-	return nil
-}
-
-// ReflectFrom reflects secion from given struct.
-func (s *Section) ReflectFrom(v interface{}) error {
-	typ := reflect.TypeOf(v)
-	val := reflect.ValueOf(v)
-	if typ.Kind() == reflect.Ptr {
-		typ = typ.Elem()
-		val = val.Elem()
-	} else {
-		return errors.New("cannot reflect from non-pointer struct")
-	}
-
-	return s.reflectFrom(val)
-}
-
-// ReflectFrom reflects file from given struct.
-func (f *File) ReflectFrom(v interface{}) error {
-	return f.Section("").ReflectFrom(v)
-}
-
-// ReflectFrom reflects data sources from given struct with name mapper.
-func ReflectFromWithMapper(cfg *File, v interface{}, mapper NameMapper) error {
-	cfg.NameMapper = mapper
-	return cfg.ReflectFrom(v)
-}
-
-// ReflectFrom reflects data sources from given struct.
-func ReflectFrom(cfg *File, v interface{}) error {
-	return ReflectFromWithMapper(cfg, v, nil)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/.travis.yml b/Godeps/_workspace/src/github.com/go-ole/go-ole/.travis.yml
deleted file mode 100644
index 0c2c02bdf2..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: go
-sudo: false
-
-go:
-  - 1.1
-  - 1.2
-  - 1.3
-  - 1.4
-  - tip
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ChangeLog.md b/Godeps/_workspace/src/github.com/go-ole/go-ole/ChangeLog.md
deleted file mode 100644
index 4ba6a8c64d..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/ChangeLog.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Version 1.x.x
-
-* **Add more test cases and reference new test COM server project.** (Placeholder for future additions)
-
-# Version 1.2.0-alphaX
-
-**Minimum supported version is now Go 1.4. Go 1.1 support is deprecated, but should still build.**
-
- * Added CI configuration for Travis-CI and AppVeyor.
- * Added test InterfaceID and ClassID for the COM Test Server project.
- * Added more inline documentation (#83).
- * Added IEnumVARIANT implementation (#88).
- * Added IEnumVARIANT test cases (#99, #100, #101).
- * Added support for retrieving `time.Time` from VARIANT (#92).
- * Added test case for IUnknown (#64).
- * Added test case for IDispatch (#64).
- * Added test cases for scalar variants (#64, #76).
-
-# Version 1.1.1
-
- * Fixes for Linux build.
- * Fixes for Windows build.
-
-# Version 1.1.0
-
-The change to provide building on all platforms is a new feature. The increase in minor version reflects that and allows those who wish to stay on 1.0.x to continue to do so. Support for 1.0.x will be limited to bug fixes.
-
- * Move GUID out of variables.go into its own file to make new documentation available.
- * Move OleError out of ole.go into its own file to make new documentation available.
- * Add documentation to utility functions.
- * Add documentation to variant receiver functions.
- * Add documentation to ole structures.
- * Make variant available to other systems outside of Windows.
- * Make OLE structures available to other systems outside of Windows.
-
-## New Features
-
- * Library should now be built on all platforms supported by Go. Library will NOOP on any platform that is not Windows.
- * More functions are now documented and available on godoc.org.
-
-# Version 1.0.1
-
- 1. Fix package references from repository location change.
-
-# Version 1.0.0
-
-This version is stable enough for use. The COM API is still incomplete, but provides enough functionality for accessing COM servers using IDispatch interface.
-
-There is no changelog for this version. Check commits for history.
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/README.md b/Godeps/_workspace/src/github.com/go-ole/go-ole/README.md
deleted file mode 100644
index 0ea9db33c7..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-#Go OLE
-
-[![Build status](https://ci.appveyor.com/api/projects/status/qr0u2sf7q43us9fj?svg=true)](https://ci.appveyor.com/project/jacobsantos/go-ole-jgs28)
-[![Build Status](https://travis-ci.org/go-ole/go-ole.svg?branch=master)](https://travis-ci.org/go-ole/go-ole)
-[![GoDoc](https://godoc.org/github.com/go-ole/go-ole?status.svg)](https://godoc.org/github.com/go-ole/go-ole)
-
-Go bindings for Windows COM using shared libraries instead of cgo.
-
-By Yasuhiro Matsumoto.
-
-## Install
-
-To experiment with go-ole, you can just compile and run the example program:
-
-```
-go get github.com/go-ole/go-ole
-cd /path/to/go-ole/
-go test
-
-cd /path/to/go-ole/example/excel
-go run excel.go
-```
-
-## Continuous Integration
-
-Continuous integration configuration has been added for both Travis-CI and AppVeyor. You will have to add these to your own account for your fork in order for it to run.
-
-**Travis-CI**
-
-Travis-CI was added to check builds on Linux to ensure that `go get` works when cross building. Currently, Travis-CI is not used to test cross-building, but this may be changed in the future. It is also not currently possible to test the library on Linux, since COM API is specific to Windows and it is not currently possible to run a COM server on Linux or even connect to a remote COM server.
-
-**AppVeyor**
-
-AppVeyor is used to build on Windows using the (in-development) test COM server. It is currently only used to test the build and ensure that the code works on Windows. It will be used to register a COM server and then run the test cases based on the test COM server.
-
-The tests currently do run and do pass and this should be maintained with commits.
-
-##Versioning
-
-Go OLE uses [semantic versioning](http://semver.org) for version numbers, which is similar to the version contract of the Go language. Which means that the major version will always maintain backwards compatibility with minor versions. Minor versions will only add new additions and changes. Fixes will always be in patch. 
-
-This contract should allow you to upgrade to new minor and patch versions without breakage or modifications to your existing code. Leave a ticket, if there is breakage, so that it could be fixed.
-
-##LICENSE
-
-Under the MIT License: http://mattn.mit-license.org/2013
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/appveyor.yml b/Godeps/_workspace/src/github.com/go-ole/go-ole/appveyor.yml
deleted file mode 100644
index e66dd31a1d..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/appveyor.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Notes:
-#   - Minimal appveyor.yml file is an empty file. All sections are optional.
-#   - Indent each level of configuration with 2 spaces. Do not use tabs!
-#   - All section names are case-sensitive.
-#   - Section names should be unique on each level.
-
-version: "1.3.0.{build}-alpha-{branch}"
-
-os: Windows Server 2012 R2
-
-branches:
-  only:
-    - master
-    - v1.2
-    - v1.1
-    - v1.0
-
-skip_tags: true
-
-clone_folder: c:\gopath\src\github.com\go-ole\go-ole
-
-environment:
-  GOPATH: c:\gopath
-  matrix:
-  - GOARCH: amd64
-    GOVERSION: 1.4
-    GOROOT: c:\go
-    DOWNLOADPLATFORM: "x64"
-
-install:
-  - choco install mingw
-  - SET PATH=c:\tools\mingw64\bin;%PATH%
-  # - Download COM Server
-  - ps: Start-FileDownload "https://github.com/go-ole/test-com-server/releases/download/v1.0.2/test-com-server-${env:DOWNLOADPLATFORM}.zip"
-  - 7z e test-com-server-%DOWNLOADPLATFORM%.zip -oc:\gopath\src\github.com\go-ole\go-ole > NUL
-  - c:\gopath\src\github.com\go-ole\go-ole\build\register-assembly.bat
-  # - set
-  - go version
-  - go env
-  - c:\gopath\src\github.com\go-ole\go-ole\build\compile-go.bat
-  - go tool dist install -v cmd/8a
-  - go tool dist install -v cmd/8c
-  - go tool dist install -v cmd/8g
-  - go tool dist install -v cmd/8l
-  - go tool dist install -v cmd/6a
-  - go tool dist install -v cmd/6c
-  - go tool dist install -v cmd/6g
-  - go tool dist install -v cmd/6l
-  - go get -u golang.org/x/tools/cmd/cover
-  - go get -u golang.org/x/tools/cmd/godoc
-  - go get -u golang.org/x/tools/cmd/stringer
-
-build_script:
-  - cd c:\gopath\src\github.com\go-ole\go-ole
-  - go get -v -t ./...
-  - go build
-  - go test -v -cover ./...
-
-# disable automatic tests
-test: off
-
-# disable deployment
-deploy: off
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/com.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/com.go
deleted file mode 100644
index f224fa069a..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/com.go
+++ /dev/null
@@ -1,329 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"errors"
-	"syscall"
-	"time"
-	"unicode/utf16"
-	"unsafe"
-)
-
-var (
-	procCoInitialize, _            = modole32.FindProc("CoInitialize")
-	procCoInitializeEx, _          = modole32.FindProc("CoInitializeEx")
-	procCoUninitialize, _          = modole32.FindProc("CoUninitialize")
-	procCoCreateInstance, _        = modole32.FindProc("CoCreateInstance")
-	procCoTaskMemFree, _           = modole32.FindProc("CoTaskMemFree")
-	procCLSIDFromProgID, _         = modole32.FindProc("CLSIDFromProgID")
-	procCLSIDFromString, _         = modole32.FindProc("CLSIDFromString")
-	procStringFromCLSID, _         = modole32.FindProc("StringFromCLSID")
-	procStringFromIID, _           = modole32.FindProc("StringFromIID")
-	procIIDFromString, _           = modole32.FindProc("IIDFromString")
-	procGetUserDefaultLCID, _      = modkernel32.FindProc("GetUserDefaultLCID")
-	procCopyMemory, _              = modkernel32.FindProc("RtlMoveMemory")
-	procVariantInit, _             = modoleaut32.FindProc("VariantInit")
-	procVariantClear, _            = modoleaut32.FindProc("VariantClear")
-	procVariantTimeToSystemTime, _ = modoleaut32.FindProc("VariantTimeToSystemTime")
-	procSysAllocString, _          = modoleaut32.FindProc("SysAllocString")
-	procSysAllocStringLen, _       = modoleaut32.FindProc("SysAllocStringLen")
-	procSysFreeString, _           = modoleaut32.FindProc("SysFreeString")
-	procSysStringLen, _            = modoleaut32.FindProc("SysStringLen")
-	procCreateDispTypeInfo, _      = modoleaut32.FindProc("CreateDispTypeInfo")
-	procCreateStdDispatch, _       = modoleaut32.FindProc("CreateStdDispatch")
-	procGetActiveObject, _         = modoleaut32.FindProc("GetActiveObject")
-
-	procGetMessageW, _      = moduser32.FindProc("GetMessageW")
-	procDispatchMessageW, _ = moduser32.FindProc("DispatchMessageW")
-)
-
-// coInitialize initializes COM library on current thread.
-//
-// MSDN documentation suggests that this function should not be called. Call
-// CoInitializeEx() instead. The reason has to do with threading and this
-// function is only for single-threaded apartments.
-//
-// That said, most users of the library have gotten away with just this
-// function. If you are experiencing threading issues, then use
-// CoInitializeEx().
-func coInitialize() (err error) {
-	// http://msdn.microsoft.com/en-us/library/windows/desktop/ms678543(v=vs.85).aspx
-	// Suggests that no value should be passed to CoInitialized.
-	// Could just be Call() since the parameter is optional. <-- Needs testing to be sure.
-	hr, _, _ := procCoInitialize.Call(uintptr(0))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// coInitializeEx initializes COM library with concurrency model.
-func coInitializeEx(coinit uint32) (err error) {
-	// http://msdn.microsoft.com/en-us/library/windows/desktop/ms695279(v=vs.85).aspx
-	// Suggests that the first parameter is not only optional but should always be NULL.
-	hr, _, _ := procCoInitializeEx.Call(uintptr(0), uintptr(coinit))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// CoInitialize initializes COM library on current thread.
-//
-// MSDN documentation suggests that this function should not be called. Call
-// CoInitializeEx() instead. The reason has to do with threading and this
-// function is only for single-threaded apartments.
-//
-// That said, most users of the library have gotten away with just this
-// function. If you are experiencing threading issues, then use
-// CoInitializeEx().
-func CoInitialize(p uintptr) (err error) {
-	// p is ignored and won't be used.
-	// Avoid any variable not used errors.
-	p = uintptr(0)
-	return coInitialize()
-}
-
-// CoInitializeEx initializes COM library with concurrency model.
-func CoInitializeEx(p uintptr, coinit uint32) (err error) {
-	// Avoid any variable not used errors.
-	p = uintptr(0)
-	return coInitializeEx(coinit)
-}
-
-// CoUninitialize uninitializes COM Library.
-func CoUninitialize() {
-	procCoUninitialize.Call()
-}
-
-// CoTaskMemFree frees memory pointer.
-func CoTaskMemFree(memptr uintptr) {
-	procCoTaskMemFree.Call(memptr)
-}
-
-// CLSIDFromProgID retrieves Class Identifier with the given Program Identifier.
-//
-// The Programmatic Identifier must be registered, because it will be looked up
-// in the Windows Registry. The registry entry has the following keys: CLSID,
-// Insertable, Protocol and Shell
-// (https://msdn.microsoft.com/en-us/library/dd542719(v=vs.85).aspx).
-//
-// programID identifies the class id with less precision and is not guaranteed
-// to be unique. These are usually found in the registry under
-// HKEY_LOCAL_MACHINE\SOFTWARE\Classes, usually with the format of
-// "Program.Component.Version" with version being optional.
-//
-// CLSIDFromProgID in Windows API.
-func CLSIDFromProgID(progId string) (clsid *GUID, err error) {
-	var guid GUID
-	lpszProgID := uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(progId)))
-	hr, _, _ := procCLSIDFromProgID.Call(lpszProgID, uintptr(unsafe.Pointer(&guid)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	clsid = &guid
-	return
-}
-
-// CLSIDFromString retrieves Class ID from string representation.
-//
-// This is technically the string version of the GUID and will convert the
-// string to object.
-//
-// CLSIDFromString in Windows API.
-func CLSIDFromString(str string) (clsid *GUID, err error) {
-	var guid GUID
-	lpsz := uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(str)))
-	hr, _, _ := procCLSIDFromString.Call(lpsz, uintptr(unsafe.Pointer(&guid)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	clsid = &guid
-	return
-}
-
-// StringFromCLSID returns GUID formated string from GUID object.
-func StringFromCLSID(clsid *GUID) (str string, err error) {
-	var p *uint16
-	hr, _, _ := procStringFromCLSID.Call(uintptr(unsafe.Pointer(clsid)), uintptr(unsafe.Pointer(&p)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	str = LpOleStrToString(p)
-	return
-}
-
-// IIDFromString returns GUID from program ID.
-func IIDFromString(progId string) (clsid *GUID, err error) {
-	var guid GUID
-	lpsz := uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(progId)))
-	hr, _, _ := procIIDFromString.Call(lpsz, uintptr(unsafe.Pointer(&guid)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	clsid = &guid
-	return
-}
-
-// StringFromIID returns GUID formatted string from GUID object.
-func StringFromIID(iid *GUID) (str string, err error) {
-	var p *uint16
-	hr, _, _ := procStringFromIID.Call(uintptr(unsafe.Pointer(iid)), uintptr(unsafe.Pointer(&p)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	str = LpOleStrToString(p)
-	return
-}
-
-// CreateInstance of single uninitialized object with GUID.
-func CreateInstance(clsid *GUID, iid *GUID) (unk *IUnknown, err error) {
-	if iid == nil {
-		iid = IID_IUnknown
-	}
-	hr, _, _ := procCoCreateInstance.Call(
-		uintptr(unsafe.Pointer(clsid)),
-		0,
-		CLSCTX_SERVER,
-		uintptr(unsafe.Pointer(iid)),
-		uintptr(unsafe.Pointer(&unk)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// GetActiveObject retrieves pointer to active object.
-func GetActiveObject(clsid *GUID, iid *GUID) (unk *IUnknown, err error) {
-	if iid == nil {
-		iid = IID_IUnknown
-	}
-	hr, _, _ := procGetActiveObject.Call(
-		uintptr(unsafe.Pointer(clsid)),
-		uintptr(unsafe.Pointer(iid)),
-		uintptr(unsafe.Pointer(&unk)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// VariantInit initializes variant.
-func VariantInit(v *VARIANT) (err error) {
-	hr, _, _ := procVariantInit.Call(uintptr(unsafe.Pointer(v)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// VariantClear clears value in Variant settings to VT_EMPTY.
-func VariantClear(v *VARIANT) (err error) {
-	hr, _, _ := procVariantClear.Call(uintptr(unsafe.Pointer(v)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// SysAllocString allocates memory for string and copies string into memory.
-func SysAllocString(v string) (ss *int16) {
-	pss, _, _ := procSysAllocString.Call(uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(v))))
-	ss = (*int16)(unsafe.Pointer(pss))
-	return
-}
-
-// SysAllocStringLen copies up to length of given string returning pointer.
-func SysAllocStringLen(v string) (ss *int16) {
-	utf16 := utf16.Encode([]rune(v + "\x00"))
-	ptr := &utf16[0]
-
-	pss, _, _ := procSysAllocStringLen.Call(uintptr(unsafe.Pointer(ptr)), uintptr(len(utf16)-1))
-	ss = (*int16)(unsafe.Pointer(pss))
-	return
-}
-
-// SysFreeString frees string system memory. This must be called with SysAllocString.
-func SysFreeString(v *int16) (err error) {
-	hr, _, _ := procSysFreeString.Call(uintptr(unsafe.Pointer(v)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// SysStringLen is the length of the system allocated string.
-func SysStringLen(v *int16) uint32 {
-	l, _, _ := procSysStringLen.Call(uintptr(unsafe.Pointer(v)))
-	return uint32(l)
-}
-
-// CreateStdDispatch provides default IDispatch implementation for IUnknown.
-//
-// This handles default IDispatch implementation for objects. It haves a few
-// limitations with only supporting one language. It will also only return
-// default exception codes.
-func CreateStdDispatch(unk *IUnknown, v uintptr, ptinfo *IUnknown) (disp *IDispatch, err error) {
-	hr, _, _ := procCreateStdDispatch.Call(
-		uintptr(unsafe.Pointer(unk)),
-		v,
-		uintptr(unsafe.Pointer(ptinfo)),
-		uintptr(unsafe.Pointer(&disp)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// CreateDispTypeInfo provides default ITypeInfo implementation for IDispatch.
-//
-// This will not handle the full implementation of the interface.
-func CreateDispTypeInfo(idata *INTERFACEDATA) (pptinfo *IUnknown, err error) {
-	hr, _, _ := procCreateDispTypeInfo.Call(
-		uintptr(unsafe.Pointer(idata)),
-		uintptr(GetUserDefaultLCID()),
-		uintptr(unsafe.Pointer(&pptinfo)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// copyMemory moves location of a block of memory.
-func copyMemory(dest unsafe.Pointer, src unsafe.Pointer, length uint32) {
-	procCopyMemory.Call(uintptr(dest), uintptr(src), uintptr(length))
-}
-
-// GetUserDefaultLCID retrieves current user default locale.
-func GetUserDefaultLCID() (lcid uint32) {
-	ret, _, _ := procGetUserDefaultLCID.Call()
-	lcid = uint32(ret)
-	return
-}
-
-// GetMessage in message queue from runtime.
-//
-// This function appears to block. PeekMessage does not block.
-func GetMessage(msg *Msg, hwnd uint32, MsgFilterMin uint32, MsgFilterMax uint32) (ret int32, err error) {
-	r0, _, err := procGetMessageW.Call(uintptr(unsafe.Pointer(msg)), uintptr(hwnd), uintptr(MsgFilterMin), uintptr(MsgFilterMax))
-	ret = int32(r0)
-	return
-}
-
-// DispatchMessage to window procedure.
-func DispatchMessage(msg *Msg) (ret int32) {
-	r0, _, _ := procDispatchMessageW.Call(uintptr(unsafe.Pointer(msg)))
-	ret = int32(r0)
-	return
-}
-
-// GetVariantDate converts COM Variant Time value to Go time.Time.
-func GetVariantDate(value float64) (time.Time, error) {
-	var st syscall.Systemtime
-	r, _, _ := procVariantTimeToSystemTime.Call(uintptr(unsafe.Pointer(&value)), uintptr(unsafe.Pointer(&st)))
-	if r != 0 {
-		return time.Date(int(st.Year), time.Month(st.Month), int(st.Day), int(st.Hour), int(st.Minute), int(st.Second), int(st.Milliseconds/1000), nil), nil
-	}
-	return time.Now(), errors.New("Could not convert to time, passing current time.")
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/com_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/com_func.go
deleted file mode 100644
index 425aad3233..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/com_func.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// +build !windows
-
-package ole
-
-import (
-	"time"
-	"unsafe"
-)
-
-// coInitialize initializes COM library on current thread.
-//
-// MSDN documentation suggests that this function should not be called. Call
-// CoInitializeEx() instead. The reason has to do with threading and this
-// function is only for single-threaded apartments.
-//
-// That said, most users of the library have gotten away with just this
-// function. If you are experiencing threading issues, then use
-// CoInitializeEx().
-func coInitialize() error {
-	return NewError(E_NOTIMPL)
-}
-
-// coInitializeEx initializes COM library with concurrency model.
-func coInitializeEx(coinit uint32) error {
-	return NewError(E_NOTIMPL)
-}
-
-// CoInitialize initializes COM library on current thread.
-//
-// MSDN documentation suggests that this function should not be called. Call
-// CoInitializeEx() instead. The reason has to do with threading and this
-// function is only for single-threaded apartments.
-//
-// That said, most users of the library have gotten away with just this
-// function. If you are experiencing threading issues, then use
-// CoInitializeEx().
-func CoInitialize(p uintptr) error {
-	return NewError(E_NOTIMPL)
-}
-
-// CoInitializeEx initializes COM library with concurrency model.
-func CoInitializeEx(p uintptr, coinit uint32) error {
-	return NewError(E_NOTIMPL)
-}
-
-// CoUninitialize uninitializes COM Library.
-func CoUninitialize() {}
-
-// CoTaskMemFree frees memory pointer.
-func CoTaskMemFree(memptr uintptr) {}
-
-// CLSIDFromProgID retrieves Class Identifier with the given Program Identifier.
-//
-// The Programmatic Identifier must be registered, because it will be looked up
-// in the Windows Registry. The registry entry has the following keys: CLSID,
-// Insertable, Protocol and Shell
-// (https://msdn.microsoft.com/en-us/library/dd542719(v=vs.85).aspx).
-//
-// programID identifies the class id with less precision and is not guaranteed
-// to be unique. These are usually found in the registry under
-// HKEY_LOCAL_MACHINE\SOFTWARE\Classes, usually with the format of
-// "Program.Component.Version" with version being optional.
-//
-// CLSIDFromProgID in Windows API.
-func CLSIDFromProgID(progId string) (*GUID, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// CLSIDFromString retrieves Class ID from string representation.
-//
-// This is technically the string version of the GUID and will convert the
-// string to object.
-//
-// CLSIDFromString in Windows API.
-func CLSIDFromString(str string) (*GUID, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// StringFromCLSID returns GUID formated string from GUID object.
-func StringFromCLSID(clsid *GUID) (string, error) {
-	return "", NewError(E_NOTIMPL)
-}
-
-// IIDFromString returns GUID from program ID.
-func IIDFromString(progId string) (*GUID, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// StringFromIID returns GUID formatted string from GUID object.
-func StringFromIID(iid *GUID) (string, error) {
-	return "", NewError(E_NOTIMPL)
-}
-
-// CreateInstance of single uninitialized object with GUID.
-func CreateInstance(clsid *GUID, iid *GUID) (*IUnknown, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// GetActiveObject retrieves pointer to active object.
-func GetActiveObject(clsid *GUID, iid *GUID) (*IUnknown, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// VariantInit initializes variant.
-func VariantInit(v *VARIANT) error {
-	return NewError(E_NOTIMPL)
-}
-
-// VariantClear clears value in Variant settings to VT_EMPTY.
-func VariantClear(v *VARIANT) error {
-	return NewError(E_NOTIMPL)
-}
-
-// SysAllocString allocates memory for string and copies string into memory.
-func SysAllocString(v string) *int16 {
-	u := int16(0)
-	return &u
-}
-
-// SysAllocStringLen copies up to length of given string returning pointer.
-func SysAllocStringLen(v string) *int16 {
-	u := int16(0)
-	return &u
-}
-
-// SysFreeString frees string system memory. This must be called with SysAllocString.
-func SysFreeString(v *int16) error {
-	return NewError(E_NOTIMPL)
-}
-
-// SysStringLen is the length of the system allocated string.
-func SysStringLen(v *int16) uint32 {
-	return uint32(0)
-}
-
-// CreateStdDispatch provides default IDispatch implementation for IUnknown.
-//
-// This handles default IDispatch implementation for objects. It haves a few
-// limitations with only supporting one language. It will also only return
-// default exception codes.
-func CreateStdDispatch(unk *IUnknown, v uintptr, ptinfo *IUnknown) (*IDispatch, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// CreateDispTypeInfo provides default ITypeInfo implementation for IDispatch.
-//
-// This will not handle the full implementation of the interface.
-func CreateDispTypeInfo(idata *INTERFACEDATA) (*IUnknown, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// copyMemory moves location of a block of memory.
-func copyMemory(dest unsafe.Pointer, src unsafe.Pointer, length uint32) {}
-
-// GetUserDefaultLCID retrieves current user default locale.
-func GetUserDefaultLCID() uint32 {
-	return uint32(0)
-}
-
-// GetMessage in message queue from runtime.
-//
-// This function appears to block. PeekMessage does not block.
-func GetMessage(msg *Msg, hwnd uint32, MsgFilterMin uint32, MsgFilterMax uint32) (int32, error) {
-	return int32(0), NewError(E_NOTIMPL)
-}
-
-// DispatchMessage to window procedure.
-func DispatchMessage(msg *Msg) int32 {
-	return int32(0)
-}
-
-func GetVariantDate(value float64) (time.Time, error) {
-	return time.Now(), NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/connect.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/connect.go
deleted file mode 100644
index b2ac2ec67a..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/connect.go
+++ /dev/null
@@ -1,192 +0,0 @@
-package ole
-
-// Connection contains IUnknown for fluent interface interaction.
-//
-// Deprecated. Use oleutil package instead.
-type Connection struct {
-	Object *IUnknown // Access COM
-}
-
-// Initialize COM.
-func (*Connection) Initialize() (err error) {
-	return coInitialize()
-}
-
-// Uninitialize COM.
-func (*Connection) Uninitialize() {
-	CoUninitialize()
-}
-
-// Create IUnknown object based first on ProgId and then from String.
-func (c *Connection) Create(progId string) (err error) {
-	var clsid *GUID
-	clsid, err = CLSIDFromProgID(progId)
-	if err != nil {
-		clsid, err = CLSIDFromString(progId)
-		if err != nil {
-			return
-		}
-	}
-
-	unknown, err := CreateInstance(clsid, IID_IUnknown)
-	if err != nil {
-		return
-	}
-	c.Object = unknown
-
-	return
-}
-
-// Release IUnknown object.
-func (c *Connection) Release() {
-	c.Object.Release()
-}
-
-// Load COM object from list of programIDs or strings.
-func (c *Connection) Load(names ...string) (errors []error) {
-	var tempErrors []error = make([]error, len(names))
-	var numErrors int = 0
-	for _, name := range names {
-		err := c.Create(name)
-		if err != nil {
-			tempErrors = append(tempErrors, err)
-			numErrors += 1
-			continue
-		}
-		break
-	}
-
-	copy(errors, tempErrors[0:numErrors])
-	return
-}
-
-// Dispatch returns Dispatch object.
-func (c *Connection) Dispatch() (object *Dispatch, err error) {
-	dispatch, err := c.Object.QueryInterface(IID_IDispatch)
-	if err != nil {
-		return
-	}
-	object = &Dispatch{dispatch}
-	return
-}
-
-// Dispatch stores IDispatch object.
-type Dispatch struct {
-	Object *IDispatch // Dispatch object.
-}
-
-// Call method on IDispatch with parameters.
-func (d *Dispatch) Call(method string, params ...interface{}) (result *VARIANT, err error) {
-	id, err := d.GetId(method)
-	if err != nil {
-		return
-	}
-
-	result, err = d.Invoke(id, DISPATCH_METHOD, params)
-	return
-}
-
-// MustCall method on IDispatch with parameters.
-func (d *Dispatch) MustCall(method string, params ...interface{}) (result *VARIANT) {
-	id, err := d.GetId(method)
-	if err != nil {
-		panic(err)
-	}
-
-	result, err = d.Invoke(id, DISPATCH_METHOD, params)
-	if err != nil {
-		panic(err)
-	}
-
-	return
-}
-
-// Get property on IDispatch with parameters.
-func (d *Dispatch) Get(name string, params ...interface{}) (result *VARIANT, err error) {
-	id, err := d.GetId(name)
-	if err != nil {
-		return
-	}
-	result, err = d.Invoke(id, DISPATCH_PROPERTYGET, params)
-	return
-}
-
-// MustGet property on IDispatch with parameters.
-func (d *Dispatch) MustGet(name string, params ...interface{}) (result *VARIANT) {
-	id, err := d.GetId(name)
-	if err != nil {
-		panic(err)
-	}
-
-	result, err = d.Invoke(id, DISPATCH_PROPERTYGET, params)
-	if err != nil {
-		panic(err)
-	}
-	return
-}
-
-// Set property on IDispatch with parameters.
-func (d *Dispatch) Set(name string, params ...interface{}) (result *VARIANT, err error) {
-	id, err := d.GetId(name)
-	if err != nil {
-		return
-	}
-	result, err = d.Invoke(id, DISPATCH_PROPERTYPUT, params)
-	return
-}
-
-// MustSet property on IDispatch with parameters.
-func (d *Dispatch) MustSet(name string, params ...interface{}) (result *VARIANT) {
-	id, err := d.GetId(name)
-	if err != nil {
-		panic(err)
-	}
-
-	result, err = d.Invoke(id, DISPATCH_PROPERTYPUT, params)
-	if err != nil {
-		panic(err)
-	}
-	return
-}
-
-// GetId retrieves ID of name on IDispatch.
-func (d *Dispatch) GetId(name string) (id int32, err error) {
-	var dispid []int32
-	dispid, err = d.Object.GetIDsOfName([]string{name})
-	if err != nil {
-		return
-	}
-	id = dispid[0]
-	return
-}
-
-// GetIds retrieves all IDs of names on IDispatch.
-func (d *Dispatch) GetIds(names ...string) (dispid []int32, err error) {
-	dispid, err = d.Object.GetIDsOfName(names)
-	return
-}
-
-// Invoke IDispatch on DisplayID of dispatch type with parameters.
-//
-// There have been problems where if send cascading params..., it would error
-// out because the parameters would be empty.
-func (d *Dispatch) Invoke(id int32, dispatch int16, params []interface{}) (result *VARIANT, err error) {
-	if len(params) < 1 {
-		result, err = d.Object.Invoke(id, dispatch)
-	} else {
-		result, err = d.Object.Invoke(id, dispatch, params...)
-	}
-	return
-}
-
-// Release IDispatch object.
-func (d *Dispatch) Release() {
-	d.Object.Release()
-}
-
-// Connect initializes COM and attempts to load IUnknown based on given names.
-func Connect(names ...string) (connection *Connection) {
-	connection.Initialize()
-	connection.Load(names...)
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/constants.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/constants.go
deleted file mode 100644
index fd0c6d74b0..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/constants.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package ole
-
-const (
-	CLSCTX_INPROC_SERVER   = 1
-	CLSCTX_INPROC_HANDLER  = 2
-	CLSCTX_LOCAL_SERVER    = 4
-	CLSCTX_INPROC_SERVER16 = 8
-	CLSCTX_REMOTE_SERVER   = 16
-	CLSCTX_ALL             = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER
-	CLSCTX_INPROC          = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER
-	CLSCTX_SERVER          = CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER
-)
-
-const (
-	COINIT_APARTMENTTHREADED = 0x2
-	COINIT_MULTITHREADED     = 0x0
-	COINIT_DISABLE_OLE1DDE   = 0x4
-	COINIT_SPEED_OVER_MEMORY = 0x8
-)
-
-const (
-	DISPATCH_METHOD         = 1
-	DISPATCH_PROPERTYGET    = 2
-	DISPATCH_PROPERTYPUT    = 4
-	DISPATCH_PROPERTYPUTREF = 8
-)
-
-const (
-	S_OK           = 0x00000000
-	E_UNEXPECTED   = 0x8000FFFF
-	E_NOTIMPL      = 0x80004001
-	E_OUTOFMEMORY  = 0x8007000E
-	E_INVALIDARG   = 0x80070057
-	E_NOINTERFACE  = 0x80004002
-	E_POINTER      = 0x80004003
-	E_HANDLE       = 0x80070006
-	E_ABORT        = 0x80004004
-	E_FAIL         = 0x80004005
-	E_ACCESSDENIED = 0x80070005
-	E_PENDING      = 0x8000000A
-
-	CO_E_CLASSSTRING = 0x800401F3
-)
-
-const (
-	CC_FASTCALL = iota
-	CC_CDECL
-	CC_MSCPASCAL
-	CC_PASCAL = CC_MSCPASCAL
-	CC_MACPASCAL
-	CC_STDCALL
-	CC_FPFASTCALL
-	CC_SYSCALL
-	CC_MPWCDECL
-	CC_MPWPASCAL
-	CC_MAX = CC_MPWPASCAL
-)
-
-type VT uint16
-
-const (
-	VT_EMPTY           VT = 0x0
-	VT_NULL            VT = 0x1
-	VT_I2              VT = 0x2
-	VT_I4              VT = 0x3
-	VT_R4              VT = 0x4
-	VT_R8              VT = 0x5
-	VT_CY              VT = 0x6
-	VT_DATE            VT = 0x7
-	VT_BSTR            VT = 0x8
-	VT_DISPATCH        VT = 0x9
-	VT_ERROR           VT = 0xa
-	VT_BOOL            VT = 0xb
-	VT_VARIANT         VT = 0xc
-	VT_UNKNOWN         VT = 0xd
-	VT_DECIMAL         VT = 0xe
-	VT_I1              VT = 0x10
-	VT_UI1             VT = 0x11
-	VT_UI2             VT = 0x12
-	VT_UI4             VT = 0x13
-	VT_I8              VT = 0x14
-	VT_UI8             VT = 0x15
-	VT_INT             VT = 0x16
-	VT_UINT            VT = 0x17
-	VT_VOID            VT = 0x18
-	VT_HRESULT         VT = 0x19
-	VT_PTR             VT = 0x1a
-	VT_SAFEARRAY       VT = 0x1b
-	VT_CARRAY          VT = 0x1c
-	VT_USERDEFINED     VT = 0x1d
-	VT_LPSTR           VT = 0x1e
-	VT_LPWSTR          VT = 0x1f
-	VT_RECORD          VT = 0x24
-	VT_INT_PTR         VT = 0x25
-	VT_UINT_PTR        VT = 0x26
-	VT_FILETIME        VT = 0x40
-	VT_BLOB            VT = 0x41
-	VT_STREAM          VT = 0x42
-	VT_STORAGE         VT = 0x43
-	VT_STREAMED_OBJECT VT = 0x44
-	VT_STORED_OBJECT   VT = 0x45
-	VT_BLOB_OBJECT     VT = 0x46
-	VT_CF              VT = 0x47
-	VT_CLSID           VT = 0x48
-	VT_BSTR_BLOB       VT = 0xfff
-	VT_VECTOR          VT = 0x1000
-	VT_ARRAY           VT = 0x2000
-	VT_BYREF           VT = 0x4000
-	VT_RESERVED        VT = 0x8000
-	VT_ILLEGAL         VT = 0xffff
-	VT_ILLEGALMASKED   VT = 0xfff
-	VT_TYPEMASK        VT = 0xfff
-)
-
-const (
-	DISPID_UNKNOWN     = -1
-	DISPID_VALUE       = 0
-	DISPID_PROPERTYPUT = -3
-	DISPID_NEWENUM     = -4
-	DISPID_EVALUATE    = -5
-	DISPID_CONSTRUCTOR = -6
-	DISPID_DESTRUCTOR  = -7
-	DISPID_COLLECT     = -8
-)
-
-const (
-	TKIND_ENUM      = 1
-	TKIND_RECORD    = 2
-	TKIND_MODULE    = 3
-	TKIND_INTERFACE = 4
-	TKIND_DISPATCH  = 5
-	TKIND_COCLASS   = 6
-	TKIND_ALIAS     = 7
-	TKIND_UNION     = 8
-	TKIND_MAX       = 9
-)
-
-// Safe Array Feature Flags
-
-const (
-	FADF_AUTO        = 0x0001
-	FADF_STATIC      = 0x0002
-	FADF_EMBEDDED    = 0x0004
-	FADF_FIXEDSIZE   = 0x0010
-	FADF_RECORD      = 0x0020
-	FADF_HAVEIID     = 0x0040
-	FADF_HAVEVARTYPE = 0x0080
-	FADF_BSTR        = 0x0100
-	FADF_UNKNOWN     = 0x0200
-	FADF_DISPATCH    = 0x0400
-	FADF_VARIANT     = 0x0800
-	FADF_RESERVED    = 0xF008
-)
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/error.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/error.go
deleted file mode 100644
index 096b456d3a..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/error.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package ole
-
-// OleError stores COM errors.
-type OleError struct {
-	hr          uintptr
-	description string
-	subError    error
-}
-
-// NewError creates new error with HResult.
-func NewError(hr uintptr) *OleError {
-	return &OleError{hr: hr}
-}
-
-// NewErrorWithDescription creates new COM error with HResult and description.
-func NewErrorWithDescription(hr uintptr, description string) *OleError {
-	return &OleError{hr: hr, description: description}
-}
-
-// NewErrorWithSubError creates new COM error with parent error.
-func NewErrorWithSubError(hr uintptr, description string, err error) *OleError {
-	return &OleError{hr: hr, description: description, subError: err}
-}
-
-// Code is the HResult.
-func (v *OleError) Code() uintptr {
-	return uintptr(v.hr)
-}
-
-// String description, either manually set or format message with error code.
-func (v *OleError) String() string {
-	if v.description != "" {
-		return errstr(int(v.hr)) + " (" + v.description + ")"
-	}
-	return errstr(int(v.hr))
-}
-
-// Error implements error interface.
-func (v *OleError) Error() string {
-	return v.String()
-}
-
-// Description retrieves error summary, if there is one.
-func (v *OleError) Description() string {
-	return v.description
-}
-
-// SubError returns parent error, if there is one.
-func (v *OleError) SubError() error {
-	return v.subError
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/error_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/error_func.go
deleted file mode 100644
index 8a2ffaa272..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/error_func.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !windows
-
-package ole
-
-// errstr converts error code to string.
-func errstr(errno int) string {
-	return ""
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/error_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/error_windows.go
deleted file mode 100644
index d0e8e68595..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/error_windows.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"fmt"
-	"syscall"
-	"unicode/utf16"
-)
-
-// errstr converts error code to string.
-func errstr(errno int) string {
-	// ask windows for the remaining errors
-	var flags uint32 = syscall.FORMAT_MESSAGE_FROM_SYSTEM | syscall.FORMAT_MESSAGE_ARGUMENT_ARRAY | syscall.FORMAT_MESSAGE_IGNORE_INSERTS
-	b := make([]uint16, 300)
-	n, err := syscall.FormatMessage(flags, 0, uint32(errno), 0, b, nil)
-	if err != nil {
-		return fmt.Sprintf("error %d (FormatMessage failed with: %v)", errno, err)
-	}
-	// trim terminating \r and \n
-	for ; n > 0 && (b[n-1] == '\n' || b[n-1] == '\r'); n-- {
-	}
-	return string(utf16.Decode(b[:n]))
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/guid.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/guid.go
deleted file mode 100644
index 609ef0bfe3..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/guid.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package ole
-
-var (
-	// IID_NULL is null Interface ID, used when no other Interface ID is known.
-	IID_NULL = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
-
-	// IID_IUnknown is for IUnknown interfaces.
-	IID_IUnknown = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
-
-	// IID_IDispatch is for IDispatch interfaces.
-	IID_IDispatch = &GUID{0x00020400, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
-
-	// IID_IEnumVariant is for IEnumVariant interfaces
-	IID_IEnumVariant = &GUID{0x00020404, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
-
-	// IID_IConnectionPointContainer is for IConnectionPointContainer interfaces.
-	IID_IConnectionPointContainer = &GUID{0xB196B284, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
-
-	// IID_IConnectionPoint is for IConnectionPoint interfaces.
-	IID_IConnectionPoint = &GUID{0xB196B286, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
-
-	// IID_IInspectable is for IInspectable interfaces.
-	IID_IInspectable = &GUID{0xaf86e2e0, 0xb12d, 0x4c6a, [8]byte{0x9c, 0x5a, 0xd7, 0xaa, 0x65, 0x10, 0x1e, 0x90}}
-
-	// IID_IProvideClassInfo is for IProvideClassInfo interfaces.
-	IID_IProvideClassInfo = &GUID{0xb196b283, 0xbab4, 0x101a, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
-)
-
-// These are for testing and not part of any library.
-var (
-	// IID_ICOMTestString is for ICOMTestString interfaces.
-	//
-	// {E0133EB4-C36F-469A-9D3D-C66B84BE19ED}
-	IID_ICOMTestString = &GUID{0xe0133eb4, 0xc36f, 0x469a, [8]byte{0x9d, 0x3d, 0xc6, 0x6b, 0x84, 0xbe, 0x19, 0xed}}
-
-	// IID_ICOMTestInt8 is for ICOMTestInt8 interfaces.
-	//
-	// {BEB06610-EB84-4155-AF58-E2BFF53608B4}
-	IID_ICOMTestInt8 = &GUID{0xbeb06610, 0xeb84, 0x4155, [8]byte{0xaf, 0x58, 0xe2, 0xbf, 0xf5, 0x36, 0x80, 0xb4}}
-
-	// IID_ICOMTestInt16 is for ICOMTestInt16 interfaces.
-	//
-	// {DAA3F9FA-761E-4976-A860-8364CE55F6FC}
-	IID_ICOMTestInt16 = &GUID{0xdaa3f9fa, 0x761e, 0x4976, [8]byte{0xa8, 0x60, 0x83, 0x64, 0xce, 0x55, 0xf6, 0xfc}}
-
-	// IID_ICOMTestInt32 is for ICOMTestInt32 interfaces.
-	//
-	// {E3DEDEE7-38A2-4540-91D1-2EEF1D8891B0}
-	IID_ICOMTestInt32 = &GUID{0xe3dedee7, 0x38a2, 0x4540, [8]byte{0x91, 0xd1, 0x2e, 0xef, 0x1d, 0x88, 0x91, 0xb0}}
-
-	// IID_ICOMTestInt64 is for ICOMTestInt64 interfaces.
-	//
-	// {8D437CBC-B3ED-485C-BC32-C336432A1623}
-	IID_ICOMTestInt64 = &GUID{0x8d437cbc, 0xb3ed, 0x485c, [8]byte{0xbc, 0x32, 0xc3, 0x36, 0x43, 0x2a, 0x16, 0x23}}
-
-	// IID_ICOMTestFloat is for ICOMTestFloat interfaces.
-	//
-	// {BF1ED004-EA02-456A-AA55-2AC8AC6B054C}
-	IID_ICOMTestFloat = &GUID{0xbf1ed004, 0xea02, 0x456a, [8]byte{0xaa, 0x55, 0x2a, 0xc8, 0xac, 0x6b, 0x5, 0x4c}}
-
-	// IID_ICOMTestDouble is for ICOMTestDouble interfaces.
-	//
-	// {BF908A81-8687-4E93-999F-D86FAB284BA0}
-	IID_ICOMTestDouble = &GUID{0xbf908a81, 0x8687, 0x4e93, [8]byte{0x99, 0x9f, 0xd8, 0x6f, 0xab, 0x28, 0x4b, 0xa0}}
-
-	// IID_ICOMTestBoolean is for ICOMTestBoolean interfaces.
-	//
-	// {D530E7A6-4EE8-40D1-8931-3D63B8605001}
-	IID_ICOMTestBoolean = &GUID{0xd530e7a6, 0x4ee8, 0x40d1, [8]byte{0x89, 0x31, 0x3d, 0x63, 0xb8, 0x60, 0x50, 0x10}}
-
-	// IID_ICOMEchoTestObject is for ICOMEchoTestObject interfaces.
-	//
-	// {6485B1EF-D780-4834-A4FE-1EBB51746CA3}
-	IID_ICOMEchoTestObject = &GUID{0x6485b1ef, 0xd780, 0x4834, [8]byte{0xa4, 0xfe, 0x1e, 0xbb, 0x51, 0x74, 0x6c, 0xa3}}
-
-	// IID_ICOMTestTypes is for ICOMTestTypes interfaces.
-	//
-	// {CCA8D7AE-91C0-4277-A8B3-FF4EDF28D3C0}
-	IID_ICOMTestTypes = &GUID{0xcca8d7ae, 0x91c0, 0x4277, [8]byte{0xa8, 0xb3, 0xff, 0x4e, 0xdf, 0x28, 0xd3, 0xc0}}
-
-	// CLSID_COMEchoTestObject is for COMEchoTestObject class.
-	//
-	// {3C24506A-AE9E-4D50-9157-EF317281F1B0}
-	CLSID_COMEchoTestObject = &GUID{0x3c24506a, 0xae9e, 0x4d50, [8]byte{0x91, 0x57, 0xef, 0x31, 0x72, 0x81, 0xf1, 0xb0}}
-
-	// CLSID_COMTestScalarClass is for COMTestScalarClass class.
-	//
-	// {865B85C5-0334-4AC6-9EF6-AACEC8FC5E86}
-	CLSID_COMTestScalarClass = &GUID{0x865b85c5, 0x0334, 0x4ac6, [8]byte{0x9e, 0xf6, 0xaa, 0xce, 0xc8, 0xfc, 0x5e, 0x86}}
-)
-
-// GUID is Windows API specific GUID type.
-//
-// This exists to match Windows GUID type for direct passing for COM.
-// Format is in xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxxxxxx.
-type GUID struct {
-	Data1 uint32
-	Data2 uint16
-	Data3 uint16
-	Data4 [8]byte
-}
-
-// IsEqualGUID compares two GUID.
-//
-// Not constant time comparison.
-func IsEqualGUID(guid1 *GUID, guid2 *GUID) bool {
-	return guid1.Data1 == guid2.Data1 &&
-		guid1.Data2 == guid2.Data2 &&
-		guid1.Data3 == guid2.Data3 &&
-		guid1.Data4[0] == guid2.Data4[0] &&
-		guid1.Data4[1] == guid2.Data4[1] &&
-		guid1.Data4[2] == guid2.Data4[2] &&
-		guid1.Data4[3] == guid2.Data4[3] &&
-		guid1.Data4[4] == guid2.Data4[4] &&
-		guid1.Data4[5] == guid2.Data4[5] &&
-		guid1.Data4[6] == guid2.Data4[6] &&
-		guid1.Data4[7] == guid2.Data4[7]
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint.go
deleted file mode 100644
index 9e6c49f41f..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package ole
-
-import "unsafe"
-
-type IConnectionPoint struct {
-	IUnknown
-}
-
-type IConnectionPointVtbl struct {
-	IUnknownVtbl
-	GetConnectionInterface      uintptr
-	GetConnectionPointContainer uintptr
-	Advise                      uintptr
-	Unadvise                    uintptr
-	EnumConnections             uintptr
-}
-
-func (v *IConnectionPoint) VTable() *IConnectionPointVtbl {
-	return (*IConnectionPointVtbl)(unsafe.Pointer(v.RawVTable))
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_func.go
deleted file mode 100644
index 5414dc3cd3..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_func.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build !windows
-
-package ole
-
-import "unsafe"
-
-func (v *IConnectionPoint) GetConnectionInterface(piid **GUID) int32 {
-	return int32(0)
-}
-
-func (v *IConnectionPoint) Advise(unknown *IUnknown) (uint32, error) {
-	return uint32(0), NewError(E_NOTIMPL)
-}
-
-func (v *IConnectionPoint) Unadvise(cookie uint32) error {
-	return NewError(E_NOTIMPL)
-}
-
-func (v *IConnectionPoint) EnumConnections(p *unsafe.Pointer) (err error) {
-	return NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_windows.go
deleted file mode 100644
index 32bc183248..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpoint_windows.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func (v *IConnectionPoint) GetConnectionInterface(piid **GUID) int32 {
-	// XXX: This doesn't look like it does what it's supposed to
-	return release((*IUnknown)(unsafe.Pointer(v)))
-}
-
-func (v *IConnectionPoint) Advise(unknown *IUnknown) (cookie uint32, err error) {
-	hr, _, _ := syscall.Syscall(
-		v.VTable().Advise,
-		3,
-		uintptr(unsafe.Pointer(v)),
-		uintptr(unsafe.Pointer(unknown)),
-		uintptr(unsafe.Pointer(&cookie)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func (v *IConnectionPoint) Unadvise(cookie uint32) (err error) {
-	hr, _, _ := syscall.Syscall(
-		v.VTable().Unadvise,
-		2,
-		uintptr(unsafe.Pointer(v)),
-		uintptr(cookie),
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func (v *IConnectionPoint) EnumConnections(p *unsafe.Pointer) error {
-	return NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer.go
deleted file mode 100644
index 165860d199..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package ole
-
-import "unsafe"
-
-type IConnectionPointContainer struct {
-	IUnknown
-}
-
-type IConnectionPointContainerVtbl struct {
-	IUnknownVtbl
-	EnumConnectionPoints uintptr
-	FindConnectionPoint  uintptr
-}
-
-func (v *IConnectionPointContainer) VTable() *IConnectionPointContainerVtbl {
-	return (*IConnectionPointContainerVtbl)(unsafe.Pointer(v.RawVTable))
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go
deleted file mode 100644
index 5dfa42aaeb..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_func.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !windows
-
-package ole
-
-func (v *IConnectionPointContainer) EnumConnectionPoints(points interface{}) error {
-	return NewError(E_NOTIMPL)
-}
-
-func (v *IConnectionPointContainer) FindConnectionPoint(iid *GUID, point **IConnectionPoint) error {
-	return NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go
deleted file mode 100644
index ad30d79efc..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iconnectionpointcontainer_windows.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func (v *IConnectionPointContainer) EnumConnectionPoints(points interface{}) error {
-	return NewError(E_NOTIMPL)
-}
-
-func (v *IConnectionPointContainer) FindConnectionPoint(iid *GUID, point **IConnectionPoint) (err error) {
-	hr, _, _ := syscall.Syscall(
-		v.VTable().FindConnectionPoint,
-		3,
-		uintptr(unsafe.Pointer(v)),
-		uintptr(unsafe.Pointer(iid)),
-		uintptr(unsafe.Pointer(point)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch.go
deleted file mode 100644
index d4af124092..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package ole
-
-import "unsafe"
-
-type IDispatch struct {
-	IUnknown
-}
-
-type IDispatchVtbl struct {
-	IUnknownVtbl
-	GetTypeInfoCount uintptr
-	GetTypeInfo      uintptr
-	GetIDsOfNames    uintptr
-	Invoke           uintptr
-}
-
-func (v *IDispatch) VTable() *IDispatchVtbl {
-	return (*IDispatchVtbl)(unsafe.Pointer(v.RawVTable))
-}
-
-func (v *IDispatch) GetIDsOfName(names []string) (dispid []int32, err error) {
-	dispid, err = getIDsOfName(v, names)
-	return
-}
-
-func (v *IDispatch) Invoke(dispid int32, dispatch int16, params ...interface{}) (result *VARIANT, err error) {
-	result, err = invoke(v, dispid, dispatch, params...)
-	return
-}
-
-func (v *IDispatch) GetTypeInfoCount() (c uint32, err error) {
-	c, err = getTypeInfoCount(v)
-	return
-}
-
-func (v *IDispatch) GetTypeInfo() (tinfo *ITypeInfo, err error) {
-	tinfo, err = getTypeInfo(v)
-	return
-}
-
-// GetSingleIDOfName is a helper that returns single display ID for IDispatch name.
-//
-// This replaces the common pattern of attempting to get a single name from the list of available
-// IDs. It gives the first ID, if it is available.
-func (v *IDispatch) GetSingleIDOfName(name string) (displayID int32, err error) {
-	var displayIDs []int32
-	displayIDs, err = v.GetIDsOfName([]string{name})
-	if err != nil {
-		return
-	}
-	displayID = displayIDs[0]
-	return
-}
-
-// InvokeWithOptionalArgs accepts arguments as an array, works like Invoke.
-//
-// Accepts name and will attempt to retrieve Display ID to pass to Invoke.
-//
-// Passing params as an array is a workaround that could be fixed in later versions of Go that
-// prevent passing empty params. During testing it was discovered that this is an acceptable way of
-// getting around not being able to pass params normally.
-func (v *IDispatch) InvokeWithOptionalArgs(name string, dispatch int16, params []interface{}) (result *VARIANT, err error) {
-	displayID, err := v.GetSingleIDOfName(name)
-	if err != nil {
-		return
-	}
-
-	if len(params) < 1 {
-		result, err = v.Invoke(displayID, dispatch)
-	} else {
-		result, err = v.Invoke(displayID, dispatch, params...)
-	}
-
-	return
-}
-
-// CallMethod invokes named function with arguments on object.
-func (v *IDispatch) CallMethod(name string, params ...interface{}) (*VARIANT, error) {
-	return v.InvokeWithOptionalArgs(name, DISPATCH_METHOD, params)
-}
-
-// GetProperty retrieves the property with the name with the ability to pass arguments.
-//
-// Most of the time you will not need to pass arguments as most objects do not allow for this
-// feature. Or at least, should not allow for this feature. Some servers don't follow best practices
-// and this is provided for those edge cases.
-func (v *IDispatch) GetProperty(name string, params ...interface{}) (*VARIANT, error) {
-	return v.InvokeWithOptionalArgs(name, DISPATCH_PROPERTYGET, params)
-}
-
-// PutProperty attempts to mutate a property in the object.
-func (v *IDispatch) PutProperty(name string, params ...interface{}) (*VARIANT, error) {
-	return v.InvokeWithOptionalArgs(name, DISPATCH_PROPERTYPUT, params)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_func.go
deleted file mode 100644
index b8fbbe319f..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_func.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build !windows
-
-package ole
-
-func getIDsOfName(disp *IDispatch, names []string) ([]int32, error) {
-	return []int32{}, NewError(E_NOTIMPL)
-}
-
-func getTypeInfoCount(disp *IDispatch) (uint32, error) {
-	return uint32(0), NewError(E_NOTIMPL)
-}
-
-func getTypeInfo(disp *IDispatch) (*ITypeInfo, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-func invoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{}) (*VARIANT, error) {
-	return nil, NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_windows.go
deleted file mode 100644
index bb73690382..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/idispatch_windows.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"syscall"
-	"time"
-	"unsafe"
-)
-
-func getIDsOfName(disp *IDispatch, names []string) (dispid []int32, err error) {
-	wnames := make([]*uint16, len(names))
-	for i := 0; i < len(names); i++ {
-		wnames[i] = syscall.StringToUTF16Ptr(names[i])
-	}
-	dispid = make([]int32, len(names))
-	namelen := uint32(len(names))
-	hr, _, _ := syscall.Syscall6(
-		disp.VTable().GetIDsOfNames,
-		6,
-		uintptr(unsafe.Pointer(disp)),
-		uintptr(unsafe.Pointer(IID_NULL)),
-		uintptr(unsafe.Pointer(&wnames[0])),
-		uintptr(namelen),
-		uintptr(GetUserDefaultLCID()),
-		uintptr(unsafe.Pointer(&dispid[0])))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func getTypeInfoCount(disp *IDispatch) (c uint32, err error) {
-	hr, _, _ := syscall.Syscall(
-		disp.VTable().GetTypeInfoCount,
-		2,
-		uintptr(unsafe.Pointer(disp)),
-		uintptr(unsafe.Pointer(&c)),
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func getTypeInfo(disp *IDispatch) (tinfo *ITypeInfo, err error) {
-	hr, _, _ := syscall.Syscall(
-		disp.VTable().GetTypeInfo,
-		3,
-		uintptr(unsafe.Pointer(disp)),
-		uintptr(GetUserDefaultLCID()),
-		uintptr(unsafe.Pointer(&tinfo)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func invoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{}) (result *VARIANT, err error) {
-	var dispparams DISPPARAMS
-
-	if dispatch&DISPATCH_PROPERTYPUT != 0 {
-		dispnames := [1]int32{DISPID_PROPERTYPUT}
-		dispparams.rgdispidNamedArgs = uintptr(unsafe.Pointer(&dispnames[0]))
-		dispparams.cNamedArgs = 1
-	}
-	var vargs []VARIANT
-	if len(params) > 0 {
-		vargs = make([]VARIANT, len(params))
-		for i, v := range params {
-			//n := len(params)-i-1
-			n := len(params) - i - 1
-			VariantInit(&vargs[n])
-			switch vv := v.(type) {
-			case bool:
-				if vv {
-					vargs[n] = NewVariant(VT_BOOL, 0xffff)
-				} else {
-					vargs[n] = NewVariant(VT_BOOL, 0)
-				}
-			case *bool:
-				vargs[n] = NewVariant(VT_BOOL|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*bool)))))
-			case uint8:
-				vargs[n] = NewVariant(VT_I1, int64(v.(uint8)))
-			case *uint8:
-				vargs[n] = NewVariant(VT_I1|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint8)))))
-			case int8:
-				vargs[n] = NewVariant(VT_I1, int64(v.(int8)))
-			case *int8:
-				vargs[n] = NewVariant(VT_I1|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint8)))))
-			case int16:
-				vargs[n] = NewVariant(VT_I2, int64(v.(int16)))
-			case *int16:
-				vargs[n] = NewVariant(VT_I2|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int16)))))
-			case uint16:
-				vargs[n] = NewVariant(VT_UI2, int64(v.(uint16)))
-			case *uint16:
-				vargs[n] = NewVariant(VT_UI2|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint16)))))
-			case int32:
-				vargs[n] = NewVariant(VT_I4, int64(v.(int32)))
-			case *int32:
-				vargs[n] = NewVariant(VT_I4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int32)))))
-			case uint32:
-				vargs[n] = NewVariant(VT_UI4, int64(v.(uint32)))
-			case *uint32:
-				vargs[n] = NewVariant(VT_UI4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint32)))))
-			case int64:
-				vargs[n] = NewVariant(VT_I8, int64(v.(int64)))
-			case *int64:
-				vargs[n] = NewVariant(VT_I8|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int64)))))
-			case uint64:
-				vargs[n] = NewVariant(VT_UI8, int64(uintptr(v.(uint64))))
-			case *uint64:
-				vargs[n] = NewVariant(VT_UI8|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint64)))))
-			case int:
-				vargs[n] = NewVariant(VT_I4, int64(v.(int)))
-			case *int:
-				vargs[n] = NewVariant(VT_I4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*int)))))
-			case uint:
-				vargs[n] = NewVariant(VT_UI4, int64(v.(uint)))
-			case *uint:
-				vargs[n] = NewVariant(VT_UI4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*uint)))))
-			case float32:
-				vargs[n] = NewVariant(VT_R4, *(*int64)(unsafe.Pointer(&vv)))
-			case *float32:
-				vargs[n] = NewVariant(VT_R4|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*float32)))))
-			case float64:
-				vargs[n] = NewVariant(VT_R8, *(*int64)(unsafe.Pointer(&vv)))
-			case *float64:
-				vargs[n] = NewVariant(VT_R8|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*float64)))))
-			case string:
-				vargs[n] = NewVariant(VT_BSTR, int64(uintptr(unsafe.Pointer(SysAllocStringLen(v.(string))))))
-			case *string:
-				vargs[n] = NewVariant(VT_BSTR|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*string)))))
-			case time.Time:
-				s := vv.Format("2006-01-02 15:04:05")
-				vargs[n] = NewVariant(VT_BSTR, int64(uintptr(unsafe.Pointer(SysAllocStringLen(s)))))
-			case *time.Time:
-				s := vv.Format("2006-01-02 15:04:05")
-				vargs[n] = NewVariant(VT_BSTR|VT_BYREF, int64(uintptr(unsafe.Pointer(&s))))
-			case *IDispatch:
-				vargs[n] = NewVariant(VT_DISPATCH, int64(uintptr(unsafe.Pointer(v.(*IDispatch)))))
-			case **IDispatch:
-				vargs[n] = NewVariant(VT_DISPATCH|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(**IDispatch)))))
-			case nil:
-				vargs[n] = NewVariant(VT_NULL, 0)
-			case *VARIANT:
-				vargs[n] = NewVariant(VT_VARIANT|VT_BYREF, int64(uintptr(unsafe.Pointer(v.(*VARIANT)))))
-			case []byte:
-				safeByteArray := safeArrayFromByteSlice(v.([]byte))
-				vargs[n] = NewVariant(VT_ARRAY|VT_UI1, int64(uintptr(unsafe.Pointer(safeByteArray))))
-				defer VariantClear(&vargs[n])
-			case []string:
-				safeByteArray := safeArrayFromStringSlice(v.([]string))
-				vargs[n] = NewVariant(VT_ARRAY|VT_BSTR, int64(uintptr(unsafe.Pointer(safeByteArray))))
-				defer VariantClear(&vargs[n])
-			default:
-				panic("unknown type")
-			}
-		}
-		dispparams.rgvarg = uintptr(unsafe.Pointer(&vargs[0]))
-		dispparams.cArgs = uint32(len(params))
-	}
-
-	result = new(VARIANT)
-	var excepInfo EXCEPINFO
-	VariantInit(result)
-	hr, _, _ := syscall.Syscall9(
-		disp.VTable().Invoke,
-		9,
-		uintptr(unsafe.Pointer(disp)),
-		uintptr(dispid),
-		uintptr(unsafe.Pointer(IID_NULL)),
-		uintptr(GetUserDefaultLCID()),
-		uintptr(dispatch),
-		uintptr(unsafe.Pointer(&dispparams)),
-		uintptr(unsafe.Pointer(result)),
-		uintptr(unsafe.Pointer(&excepInfo)),
-		0)
-	if hr != 0 {
-		err = NewErrorWithSubError(hr, BstrToString(excepInfo.bstrDescription), excepInfo)
-	}
-	for i, varg := range vargs {
-		n := len(params) - i - 1
-		if varg.VT == VT_BSTR && varg.Val != 0 {
-			SysFreeString(((*int16)(unsafe.Pointer(uintptr(varg.Val)))))
-		}
-		if varg.VT == (VT_BSTR|VT_BYREF) && varg.Val != 0 {
-			*(params[n].(*string)) = LpOleStrToString(*(**uint16)(unsafe.Pointer(uintptr(varg.Val))))
-		}
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant.go
deleted file mode 100644
index 2433897544..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package ole
-
-import "unsafe"
-
-type IEnumVARIANT struct {
-	IUnknown
-}
-
-type IEnumVARIANTVtbl struct {
-	IUnknownVtbl
-	Next  uintptr
-	Skip  uintptr
-	Reset uintptr
-	Clone uintptr
-}
-
-func (v *IEnumVARIANT) VTable() *IEnumVARIANTVtbl {
-	return (*IEnumVARIANTVtbl)(unsafe.Pointer(v.RawVTable))
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_func.go
deleted file mode 100644
index c14848199c..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_func.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build !windows
-
-package ole
-
-func (enum *IEnumVARIANT) Clone() (*IEnumVARIANT, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-func (enum *IEnumVARIANT) Reset() error {
-	return NewError(E_NOTIMPL)
-}
-
-func (enum *IEnumVARIANT) Skip(celt uint) error {
-	return NewError(E_NOTIMPL)
-}
-
-func (enum *IEnumVARIANT) Next(celt uint) (VARIANT, uint, error) {
-	return NewVariant(VT_NULL, int64(0)), 0, NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_windows.go
deleted file mode 100644
index 4781f3b8b0..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/ienumvariant_windows.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func (enum *IEnumVARIANT) Clone() (cloned *IEnumVARIANT, err error) {
-	hr, _, _ := syscall.Syscall(
-		enum.VTable().Clone,
-		2,
-		uintptr(unsafe.Pointer(enum)),
-		uintptr(unsafe.Pointer(&cloned)),
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func (enum *IEnumVARIANT) Reset() (err error) {
-	hr, _, _ := syscall.Syscall(
-		enum.VTable().Reset,
-		1,
-		uintptr(unsafe.Pointer(enum)),
-		0,
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func (enum *IEnumVARIANT) Skip(celt uint) (err error) {
-	hr, _, _ := syscall.Syscall(
-		enum.VTable().Skip,
-		2,
-		uintptr(unsafe.Pointer(enum)),
-		uintptr(celt),
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func (enum *IEnumVARIANT) Next(celt uint) (array VARIANT, length uint, err error) {
-	hr, _, _ := syscall.Syscall6(
-		enum.VTable().Next,
-		4,
-		uintptr(unsafe.Pointer(enum)),
-		uintptr(celt),
-		uintptr(unsafe.Pointer(&array)),
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable.go
deleted file mode 100644
index f4a19e253a..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package ole
-
-import "unsafe"
-
-type IInspectable struct {
-	IUnknown
-}
-
-type IInspectableVtbl struct {
-	IUnknownVtbl
-	GetIIds             uintptr
-	GetRuntimeClassName uintptr
-	GetTrustLevel       uintptr
-}
-
-func (v *IInspectable) VTable() *IInspectableVtbl {
-	return (*IInspectableVtbl)(unsafe.Pointer(v.RawVTable))
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_func.go
deleted file mode 100644
index 348829bf06..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_func.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build !windows
-
-package ole
-
-func (v *IInspectable) GetIids() ([]*GUID, error) {
-	return []*GUID{}, NewError(E_NOTIMPL)
-}
-
-func (v *IInspectable) GetRuntimeClassName() (string, error) {
-	return "", NewError(E_NOTIMPL)
-}
-
-func (v *IInspectable) GetTrustLevel() (uint32, error) {
-	return uint32(0), NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_windows.go
deleted file mode 100644
index 4519a4aa44..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iinspectable_windows.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"bytes"
-	"encoding/binary"
-	"reflect"
-	"syscall"
-	"unsafe"
-)
-
-func (v *IInspectable) GetIids() (iids []*GUID, err error) {
-	var count uint32
-	var array uintptr
-	hr, _, _ := syscall.Syscall(
-		v.VTable().GetIIds,
-		3,
-		uintptr(unsafe.Pointer(v)),
-		uintptr(unsafe.Pointer(&count)),
-		uintptr(unsafe.Pointer(&array)))
-	if hr != 0 {
-		err = NewError(hr)
-		return
-	}
-	defer CoTaskMemFree(array)
-
-	iids = make([]*GUID, count)
-	byteCount := count * uint32(unsafe.Sizeof(GUID{}))
-	slicehdr := reflect.SliceHeader{Data: array, Len: int(byteCount), Cap: int(byteCount)}
-	byteSlice := *(*[]byte)(unsafe.Pointer(&slicehdr))
-	reader := bytes.NewReader(byteSlice)
-	for i := range iids {
-		guid := GUID{}
-		err = binary.Read(reader, binary.LittleEndian, &guid)
-		if err != nil {
-			return
-		}
-		iids[i] = &guid
-	}
-	return
-}
-
-func (v *IInspectable) GetRuntimeClassName() (s string, err error) {
-	var hstring HString
-	hr, _, _ := syscall.Syscall(
-		v.VTable().GetRuntimeClassName,
-		2,
-		uintptr(unsafe.Pointer(v)),
-		uintptr(unsafe.Pointer(&hstring)),
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-		return
-	}
-	s = hstring.String()
-	DeleteHString(hstring)
-	return
-}
-
-func (v *IInspectable) GetTrustLevel() (level uint32, err error) {
-	hr, _, _ := syscall.Syscall(
-		v.VTable().GetTrustLevel,
-		2,
-		uintptr(unsafe.Pointer(v)),
-		uintptr(unsafe.Pointer(&level)),
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo.go
deleted file mode 100644
index 25f3a6f24a..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package ole
-
-import "unsafe"
-
-type IProvideClassInfo struct {
-	IUnknown
-}
-
-type IProvideClassInfoVtbl struct {
-	IUnknownVtbl
-	GetClassInfo uintptr
-}
-
-func (v *IProvideClassInfo) VTable() *IProvideClassInfoVtbl {
-	return (*IProvideClassInfoVtbl)(unsafe.Pointer(v.RawVTable))
-}
-
-func (v *IProvideClassInfo) GetClassInfo() (cinfo *ITypeInfo, err error) {
-	cinfo, err = getClassInfo(v)
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_func.go
deleted file mode 100644
index 7e3cb63ea7..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_func.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !windows
-
-package ole
-
-func getClassInfo(disp *IProvideClassInfo) (tinfo *ITypeInfo, err error) {
-	return nil, NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_windows.go
deleted file mode 100644
index 2ad0163949..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iprovideclassinfo_windows.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func getClassInfo(disp *IProvideClassInfo) (tinfo *ITypeInfo, err error) {
-	hr, _, _ := syscall.Syscall(
-		disp.VTable().GetClassInfo,
-		2,
-		uintptr(unsafe.Pointer(disp)),
-		uintptr(unsafe.Pointer(&tinfo)),
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo.go
deleted file mode 100644
index dd3c5e21bb..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package ole
-
-import "unsafe"
-
-type ITypeInfo struct {
-	IUnknown
-}
-
-type ITypeInfoVtbl struct {
-	IUnknownVtbl
-	GetTypeAttr          uintptr
-	GetTypeComp          uintptr
-	GetFuncDesc          uintptr
-	GetVarDesc           uintptr
-	GetNames             uintptr
-	GetRefTypeOfImplType uintptr
-	GetImplTypeFlags     uintptr
-	GetIDsOfNames        uintptr
-	Invoke               uintptr
-	GetDocumentation     uintptr
-	GetDllEntry          uintptr
-	GetRefTypeInfo       uintptr
-	AddressOfMember      uintptr
-	CreateInstance       uintptr
-	GetMops              uintptr
-	GetContainingTypeLib uintptr
-	ReleaseTypeAttr      uintptr
-	ReleaseFuncDesc      uintptr
-	ReleaseVarDesc       uintptr
-}
-
-func (v *ITypeInfo) VTable() *ITypeInfoVtbl {
-	return (*ITypeInfoVtbl)(unsafe.Pointer(v.RawVTable))
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_func.go
deleted file mode 100644
index 8364a659ba..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_func.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !windows
-
-package ole
-
-func (v *ITypeInfo) GetTypeAttr() (*TYPEATTR, error) {
-	return nil, NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_windows.go
deleted file mode 100644
index 54782b3da5..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/itypeinfo_windows.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func (v *ITypeInfo) GetTypeAttr() (tattr *TYPEATTR, err error) {
-	hr, _, _ := syscall.Syscall(
-		uintptr(v.VTable().GetTypeAttr),
-		2,
-		uintptr(unsafe.Pointer(v)),
-		uintptr(unsafe.Pointer(&tattr)),
-		0)
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown.go
deleted file mode 100644
index 108f28ea61..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package ole
-
-import "unsafe"
-
-type IUnknown struct {
-	RawVTable *interface{}
-}
-
-type IUnknownVtbl struct {
-	QueryInterface uintptr
-	AddRef         uintptr
-	Release        uintptr
-}
-
-type UnknownLike interface {
-	QueryInterface(iid *GUID) (disp *IDispatch, err error)
-	AddRef() int32
-	Release() int32
-}
-
-func (v *IUnknown) VTable() *IUnknownVtbl {
-	return (*IUnknownVtbl)(unsafe.Pointer(v.RawVTable))
-}
-
-func (v *IUnknown) PutQueryInterface(interfaceID *GUID, obj interface{}) error {
-	return reflectQueryInterface(v, v.VTable().QueryInterface, interfaceID, obj)
-}
-
-func (v *IUnknown) IDispatch(interfaceID *GUID) (dispatch *IDispatch, err error) {
-	err = v.PutQueryInterface(interfaceID, &dispatch)
-	return
-}
-
-func (v *IUnknown) IEnumVARIANT(interfaceID *GUID) (enum *IEnumVARIANT, err error) {
-	err = v.PutQueryInterface(interfaceID, &enum)
-	return
-}
-
-func (v *IUnknown) QueryInterface(iid *GUID) (*IDispatch, error) {
-	return queryInterface(v, iid)
-}
-
-func (v *IUnknown) MustQueryInterface(iid *GUID) (disp *IDispatch) {
-	unk, err := queryInterface(v, iid)
-	if err != nil {
-		panic(err)
-	}
-	return unk
-}
-
-func (v *IUnknown) AddRef() int32 {
-	return addRef(v)
-}
-
-func (v *IUnknown) Release() int32 {
-	return release(v)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_func.go
deleted file mode 100644
index d0a62cfd73..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_func.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build !windows
-
-package ole
-
-func reflectQueryInterface(self interface{}, method uintptr, interfaceID *GUID, obj interface{}) (err error) {
-	return NewError(E_NOTIMPL)
-}
-
-func queryInterface(unk *IUnknown, iid *GUID) (disp *IDispatch, err error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-func addRef(unk *IUnknown) int32 {
-	return 0
-}
-
-func release(unk *IUnknown) int32 {
-	return 0
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_windows.go
deleted file mode 100644
index ede5bb8c17..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/iunknown_windows.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"reflect"
-	"syscall"
-	"unsafe"
-)
-
-func reflectQueryInterface(self interface{}, method uintptr, interfaceID *GUID, obj interface{}) (err error) {
-	selfValue := reflect.ValueOf(self).Elem()
-	objValue := reflect.ValueOf(obj).Elem()
-
-	hr, _, _ := syscall.Syscall(
-		method,
-		3,
-		selfValue.UnsafeAddr(),
-		uintptr(unsafe.Pointer(interfaceID)),
-		objValue.Addr().Pointer())
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func queryInterface(unk *IUnknown, iid *GUID) (disp *IDispatch, err error) {
-	hr, _, _ := syscall.Syscall(
-		unk.VTable().QueryInterface,
-		3,
-		uintptr(unsafe.Pointer(unk)),
-		uintptr(unsafe.Pointer(iid)),
-		uintptr(unsafe.Pointer(&disp)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func addRef(unk *IUnknown) int32 {
-	ret, _, _ := syscall.Syscall(
-		unk.VTable().AddRef,
-		1,
-		uintptr(unsafe.Pointer(unk)),
-		0,
-		0)
-	return int32(ret)
-}
-
-func release(unk *IUnknown) int32 {
-	ret, _, _ := syscall.Syscall(
-		unk.VTable().Release,
-		1,
-		uintptr(unsafe.Pointer(unk)),
-		0,
-		0)
-	return int32(ret)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/ole.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/ole.go
deleted file mode 100644
index b92b4ea189..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/ole.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package ole
-
-import (
-	"fmt"
-	"strings"
-)
-
-// DISPPARAMS are the arguments that passed to methods or property.
-type DISPPARAMS struct {
-	rgvarg            uintptr
-	rgdispidNamedArgs uintptr
-	cArgs             uint32
-	cNamedArgs        uint32
-}
-
-// EXCEPINFO defines exception info.
-type EXCEPINFO struct {
-	wCode             uint16
-	wReserved         uint16
-	bstrSource        *uint16
-	bstrDescription   *uint16
-	bstrHelpFile      *uint16
-	dwHelpContext     uint32
-	pvReserved        uintptr
-	pfnDeferredFillIn uintptr
-	scode             uint32
-}
-
-// String convert EXCEPINFO to string.
-func (e EXCEPINFO) String() string {
-	var src, desc, hlp string
-	if e.bstrSource == nil {
-		src = "<nil>"
-	} else {
-		src = BstrToString(e.bstrSource)
-	}
-
-	if e.bstrDescription == nil {
-		desc = "<nil>"
-	} else {
-		desc = BstrToString(e.bstrDescription)
-	}
-
-	if e.bstrHelpFile == nil {
-		hlp = "<nil>"
-	} else {
-		hlp = BstrToString(e.bstrHelpFile)
-	}
-
-	return fmt.Sprintf(
-		"wCode: %#x, bstrSource: %v, bstrDescription: %v, bstrHelpFile: %v, dwHelpContext: %#x, scode: %#x",
-		e.wCode, src, desc, hlp, e.dwHelpContext, e.scode,
-	)
-}
-
-// Error implements error interface and returns error string.
-func (e EXCEPINFO) Error() string {
-	if e.bstrDescription != nil {
-		return strings.TrimSpace(BstrToString(e.bstrDescription))
-	}
-
-	src := "Unknown"
-	if e.bstrSource != nil {
-		src = BstrToString(e.bstrSource)
-	}
-
-	code := e.scode
-	if e.wCode != 0 {
-		code = uint32(e.wCode)
-	}
-
-	return fmt.Sprintf("%v: %#x", src, code)
-}
-
-// PARAMDATA defines parameter data type.
-type PARAMDATA struct {
-	Name *int16
-	Vt   uint16
-}
-
-// METHODDATA defines method info.
-type METHODDATA struct {
-	Name     *uint16
-	Data     *PARAMDATA
-	Dispid   int32
-	Meth     uint32
-	CC       int32
-	CArgs    uint32
-	Flags    uint16
-	VtReturn uint32
-}
-
-// INTERFACEDATA defines interface info.
-type INTERFACEDATA struct {
-	MethodData *METHODDATA
-	CMembers   uint32
-}
-
-// Point is 2D vector type.
-type Point struct {
-	X int32
-	Y int32
-}
-
-// Msg is message between processes.
-type Msg struct {
-	Hwnd    uint32
-	Message uint32
-	Wparam  int32
-	Lparam  int32
-	Time    uint32
-	Pt      Point
-}
-
-// TYPEDESC defines data type.
-type TYPEDESC struct {
-	Hreftype uint32
-	VT       uint16
-}
-
-// IDLDESC defines IDL info.
-type IDLDESC struct {
-	DwReserved uint32
-	WIDLFlags  uint16
-}
-
-// TYPEATTR defines type info.
-type TYPEATTR struct {
-	Guid             GUID
-	Lcid             uint32
-	dwReserved       uint32
-	MemidConstructor int32
-	MemidDestructor  int32
-	LpstrSchema      *uint16
-	CbSizeInstance   uint32
-	Typekind         int32
-	CFuncs           uint16
-	CVars            uint16
-	CImplTypes       uint16
-	CbSizeVft        uint16
-	CbAlignment      uint16
-	WTypeFlags       uint16
-	WMajorVerNum     uint16
-	WMinorVerNum     uint16
-	TdescAlias       TYPEDESC
-	IdldescType      IDLDESC
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection.go
deleted file mode 100644
index 60df73cda0..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// +build windows
-
-package oleutil
-
-import (
-	"reflect"
-	"unsafe"
-
-	ole "github.com/go-ole/go-ole"
-)
-
-type stdDispatch struct {
-	lpVtbl  *stdDispatchVtbl
-	ref     int32
-	iid     *ole.GUID
-	iface   interface{}
-	funcMap map[string]int32
-}
-
-type stdDispatchVtbl struct {
-	pQueryInterface   uintptr
-	pAddRef           uintptr
-	pRelease          uintptr
-	pGetTypeInfoCount uintptr
-	pGetTypeInfo      uintptr
-	pGetIDsOfNames    uintptr
-	pInvoke           uintptr
-}
-
-func dispQueryInterface(this *ole.IUnknown, iid *ole.GUID, punk **ole.IUnknown) uint32 {
-	pthis := (*stdDispatch)(unsafe.Pointer(this))
-	*punk = nil
-	if ole.IsEqualGUID(iid, ole.IID_IUnknown) ||
-		ole.IsEqualGUID(iid, ole.IID_IDispatch) {
-		dispAddRef(this)
-		*punk = this
-		return ole.S_OK
-	}
-	if ole.IsEqualGUID(iid, pthis.iid) {
-		dispAddRef(this)
-		*punk = this
-		return ole.S_OK
-	}
-	return ole.E_NOINTERFACE
-}
-
-func dispAddRef(this *ole.IUnknown) int32 {
-	pthis := (*stdDispatch)(unsafe.Pointer(this))
-	pthis.ref++
-	return pthis.ref
-}
-
-func dispRelease(this *ole.IUnknown) int32 {
-	pthis := (*stdDispatch)(unsafe.Pointer(this))
-	pthis.ref--
-	return pthis.ref
-}
-
-func dispGetIDsOfNames(this *ole.IUnknown, iid *ole.GUID, wnames []*uint16, namelen int, lcid int, pdisp []int32) uintptr {
-	pthis := (*stdDispatch)(unsafe.Pointer(this))
-	names := make([]string, len(wnames))
-	for i := 0; i < len(names); i++ {
-		names[i] = ole.LpOleStrToString(wnames[i])
-	}
-	for n := 0; n < namelen; n++ {
-		if id, ok := pthis.funcMap[names[n]]; ok {
-			pdisp[n] = id
-		}
-	}
-	return ole.S_OK
-}
-
-func dispGetTypeInfoCount(pcount *int) uintptr {
-	if pcount != nil {
-		*pcount = 0
-	}
-	return ole.S_OK
-}
-
-func dispGetTypeInfo(ptypeif *uintptr) uintptr {
-	return ole.E_NOTIMPL
-}
-
-func dispInvoke(this *ole.IDispatch, dispid int32, riid *ole.GUID, lcid int, flags int16, dispparams *ole.DISPPARAMS, result *ole.VARIANT, pexcepinfo *ole.EXCEPINFO, nerr *uint) uintptr {
-	pthis := (*stdDispatch)(unsafe.Pointer(this))
-	found := ""
-	for name, id := range pthis.funcMap {
-		if id == dispid {
-			found = name
-		}
-	}
-	if found != "" {
-		rv := reflect.ValueOf(pthis.iface).Elem()
-		rm := rv.MethodByName(found)
-		rr := rm.Call([]reflect.Value{})
-		println(len(rr))
-		return ole.S_OK
-	}
-	return ole.E_NOTIMPL
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_func.go
deleted file mode 100644
index 8818fb8275..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_func.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !windows
-
-package oleutil
-
-import ole "github.com/go-ole/go-ole"
-
-// ConnectObject creates a connection point between two services for communication.
-func ConnectObject(disp *ole.IDispatch, iid *ole.GUID, idisp interface{}) (uint32, error) {
-	return 0, ole.NewError(ole.E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_windows.go
deleted file mode 100644
index 6b5c059993..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/connection_windows.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// +build windows
-
-package oleutil
-
-import (
-	"reflect"
-	"syscall"
-	"unsafe"
-
-	ole "github.com/go-ole/go-ole"
-)
-
-// ConnectObject creates a connection point between two services for communication.
-func ConnectObject(disp *ole.IDispatch, iid *ole.GUID, idisp interface{}) (cookie uint32, err error) {
-	unknown, err := disp.QueryInterface(ole.IID_IConnectionPointContainer)
-	if err != nil {
-		return
-	}
-
-	container := (*ole.IConnectionPointContainer)(unsafe.Pointer(unknown))
-	var point *ole.IConnectionPoint
-	err = container.FindConnectionPoint(iid, &point)
-	if err != nil {
-		return
-	}
-	if edisp, ok := idisp.(*ole.IUnknown); ok {
-		cookie, err = point.Advise(edisp)
-		container.Release()
-		if err != nil {
-			return
-		}
-	}
-	rv := reflect.ValueOf(disp).Elem()
-	if rv.Type().Kind() == reflect.Struct {
-		dest := &stdDispatch{}
-		dest.lpVtbl = &stdDispatchVtbl{}
-		dest.lpVtbl.pQueryInterface = syscall.NewCallback(dispQueryInterface)
-		dest.lpVtbl.pAddRef = syscall.NewCallback(dispAddRef)
-		dest.lpVtbl.pRelease = syscall.NewCallback(dispRelease)
-		dest.lpVtbl.pGetTypeInfoCount = syscall.NewCallback(dispGetTypeInfoCount)
-		dest.lpVtbl.pGetTypeInfo = syscall.NewCallback(dispGetTypeInfo)
-		dest.lpVtbl.pGetIDsOfNames = syscall.NewCallback(dispGetIDsOfNames)
-		dest.lpVtbl.pInvoke = syscall.NewCallback(dispInvoke)
-		dest.iface = disp
-		dest.iid = iid
-		cookie, err = point.Advise((*ole.IUnknown)(unsafe.Pointer(dest)))
-		container.Release()
-		if err != nil {
-			point.Release()
-			return
-		}
-	}
-
-	container.Release()
-
-	return 0, ole.NewError(ole.E_INVALIDARG)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/go-get.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/go-get.go
deleted file mode 100644
index 58347628f2..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/go-get.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is here so go get succeeds as without it errors with:
-// no buildable Go source files in ...
-//
-// +build !windows
-
-package oleutil
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/oleutil.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/oleutil.go
deleted file mode 100644
index 55e072a636..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/oleutil/oleutil.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package oleutil
-
-import ole "github.com/go-ole/go-ole"
-
-// ClassIDFrom retrieves class ID whether given is program ID or application string.
-func ClassIDFrom(programID string) (classID *ole.GUID, err error) {
-	return ole.ClassIDFrom(programID)
-}
-
-// CreateObject creates object from programID based on interface type.
-//
-// Only supports IUnknown.
-//
-// Program ID can be either program ID or application string.
-func CreateObject(programID string) (unknown *ole.IUnknown, err error) {
-	classID, err := ole.ClassIDFrom(programID)
-	if err != nil {
-		return
-	}
-
-	unknown, err = ole.CreateInstance(classID, ole.IID_IUnknown)
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-// GetActiveObject retrieves active object for program ID and interface ID based
-// on interface type.
-//
-// Only supports IUnknown.
-//
-// Program ID can be either program ID or application string.
-func GetActiveObject(programID string) (unknown *ole.IUnknown, err error) {
-	classID, err := ole.ClassIDFrom(programID)
-	if err != nil {
-		return
-	}
-
-	unknown, err = ole.GetActiveObject(classID, ole.IID_IUnknown)
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-// CallMethod calls method on IDispatch with parameters.
-func CallMethod(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT, err error) {
-	return disp.InvokeWithOptionalArgs(name, ole.DISPATCH_METHOD, params)
-}
-
-// MustCallMethod calls method on IDispatch with parameters or panics.
-func MustCallMethod(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT) {
-	r, err := CallMethod(disp, name, params...)
-	if err != nil {
-		panic(err.Error())
-	}
-	return r
-}
-
-// GetProperty retrieves property from IDispatch.
-func GetProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT, err error) {
-	return disp.InvokeWithOptionalArgs(name, ole.DISPATCH_PROPERTYGET, params)
-}
-
-// MustGetProperty retrieves property from IDispatch or panics.
-func MustGetProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT) {
-	r, err := GetProperty(disp, name, params...)
-	if err != nil {
-		panic(err.Error())
-	}
-	return r
-}
-
-// PutProperty mutates property.
-func PutProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT, err error) {
-	return disp.InvokeWithOptionalArgs(name, ole.DISPATCH_PROPERTYPUT, params)
-}
-
-// MustPutProperty mutates property or panics.
-func MustPutProperty(disp *ole.IDispatch, name string, params ...interface{}) (result *ole.VARIANT) {
-	r, err := PutProperty(disp, name, params...)
-	if err != nil {
-		panic(err.Error())
-	}
-	return r
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray.go
deleted file mode 100644
index a5201b56c3..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Package is meant to retrieve and process safe array data returned from COM.
-
-package ole
-
-// SafeArrayBound defines the SafeArray boundaries.
-type SafeArrayBound struct {
-	Elements   uint32
-	LowerBound int32
-}
-
-// SafeArray is how COM handles arrays.
-type SafeArray struct {
-	Dimensions   uint16
-	FeaturesFlag uint16
-	ElementsSize uint32
-	LocksAmount  uint32
-	Data         uint32
-	Bounds       [16]byte
-}
-
-// SAFEARRAY is obsolete, exists for backwards compatibility.
-// Use SafeArray
-type SAFEARRAY SafeArray
-
-// SAFEARRAYBOUND is obsolete, exists for backwards compatibility.
-// Use SafeArrayBound
-type SAFEARRAYBOUND SafeArrayBound
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_func.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_func.go
deleted file mode 100644
index 8ff0baa41d..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_func.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// +build !windows
-
-package ole
-
-import (
-	"unsafe"
-)
-
-// safeArrayAccessData returns raw array pointer.
-//
-// AKA: SafeArrayAccessData in Windows API.
-func safeArrayAccessData(safearray *SafeArray) (uintptr, error) {
-	return uintptr(0), NewError(E_NOTIMPL)
-}
-
-// safeArrayUnaccessData releases raw array.
-//
-// AKA: SafeArrayUnaccessData in Windows API.
-func safeArrayUnaccessData(safearray *SafeArray) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayAllocData allocates SafeArray.
-//
-// AKA: SafeArrayAllocData in Windows API.
-func safeArrayAllocData(safearray *SafeArray) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayAllocDescriptor allocates SafeArray.
-//
-// AKA: SafeArrayAllocDescriptor in Windows API.
-func safeArrayAllocDescriptor(dimensions uint32) (*SafeArray, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// safeArrayAllocDescriptorEx allocates SafeArray.
-//
-// AKA: SafeArrayAllocDescriptorEx in Windows API.
-func safeArrayAllocDescriptorEx(variantType VT, dimensions uint32) (*SafeArray, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// safeArrayCopy returns copy of SafeArray.
-//
-// AKA: SafeArrayCopy in Windows API.
-func safeArrayCopy(original *SafeArray) (*SafeArray, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// safeArrayCopyData duplicates SafeArray into another SafeArray object.
-//
-// AKA: SafeArrayCopyData in Windows API.
-func safeArrayCopyData(original *SafeArray, duplicate *SafeArray) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayCreate creates SafeArray.
-//
-// AKA: SafeArrayCreate in Windows API.
-func safeArrayCreate(variantType VT, dimensions uint32, bounds *SafeArrayBound) (*SafeArray, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// safeArrayCreateEx creates SafeArray.
-//
-// AKA: SafeArrayCreateEx in Windows API.
-func safeArrayCreateEx(variantType VT, dimensions uint32, bounds *SafeArrayBound, extra uintptr) (*SafeArray, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// safeArrayCreateVector creates SafeArray.
-//
-// AKA: SafeArrayCreateVector in Windows API.
-func safeArrayCreateVector(variantType VT, lowerBound int32, length uint32) (*SafeArray, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// safeArrayCreateVectorEx creates SafeArray.
-//
-// AKA: SafeArrayCreateVectorEx in Windows API.
-func safeArrayCreateVectorEx(variantType VT, lowerBound int32, length uint32, extra uintptr) (*SafeArray, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// safeArrayDestroy destroys SafeArray object.
-//
-// AKA: SafeArrayDestroy in Windows API.
-func safeArrayDestroy(safearray *SafeArray) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayDestroyData destroys SafeArray object.
-//
-// AKA: SafeArrayDestroyData in Windows API.
-func safeArrayDestroyData(safearray *SafeArray) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayDestroyDescriptor destroys SafeArray object.
-//
-// AKA: SafeArrayDestroyDescriptor in Windows API.
-func safeArrayDestroyDescriptor(safearray *SafeArray) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayGetDim is the amount of dimensions in the SafeArray.
-//
-// SafeArrays may have multiple dimensions. Meaning, it could be
-// multidimensional array.
-//
-// AKA: SafeArrayGetDim in Windows API.
-func safeArrayGetDim(safearray *SafeArray) (*uint32, error) {
-	u := uint32(0)
-	return &u, NewError(E_NOTIMPL)
-}
-
-// safeArrayGetElementSize is the element size in bytes.
-//
-// AKA: SafeArrayGetElemsize in Windows API.
-func safeArrayGetElementSize(safearray *SafeArray) (*uint32, error) {
-	u := uint32(0)
-	return &u, NewError(E_NOTIMPL)
-}
-
-// safeArrayGetElement retrieves element at given index.
-func safeArrayGetElement(safearray *SafeArray, index int64, pv unsafe.Pointer) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayGetElement retrieves element at given index and converts to string.
-func safeArrayGetElementString(safearray *SafeArray, index int64) (string, error) {
-	return "", NewError(E_NOTIMPL)
-}
-
-// safeArrayGetIID is the InterfaceID of the elements in the SafeArray.
-//
-// AKA: SafeArrayGetIID in Windows API.
-func safeArrayGetIID(safearray *SafeArray) (*GUID, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// safeArrayGetLBound returns lower bounds of SafeArray.
-//
-// SafeArrays may have multiple dimensions. Meaning, it could be
-// multidimensional array.
-//
-// AKA: SafeArrayGetLBound in Windows API.
-func safeArrayGetLBound(safearray *SafeArray, dimension uint32) (int64, error) {
-	return int64(0), NewError(E_NOTIMPL)
-}
-
-// safeArrayGetUBound returns upper bounds of SafeArray.
-//
-// SafeArrays may have multiple dimensions. Meaning, it could be
-// multidimensional array.
-//
-// AKA: SafeArrayGetUBound in Windows API.
-func safeArrayGetUBound(safearray *SafeArray, dimension uint32) (int64, error) {
-	return int64(0), NewError(E_NOTIMPL)
-}
-
-// safeArrayGetVartype returns data type of SafeArray.
-//
-// AKA: SafeArrayGetVartype in Windows API.
-func safeArrayGetVartype(safearray *SafeArray) (uint16, error) {
-	return uint16(0), NewError(E_NOTIMPL)
-}
-
-// safeArrayLock locks SafeArray for reading to modify SafeArray.
-//
-// This must be called during some calls to ensure that another process does not
-// read or write to the SafeArray during editing.
-//
-// AKA: SafeArrayLock in Windows API.
-func safeArrayLock(safearray *SafeArray) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayUnlock unlocks SafeArray for reading.
-//
-// AKA: SafeArrayUnlock in Windows API.
-func safeArrayUnlock(safearray *SafeArray) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayPutElement stores the data element at the specified location in the
-// array.
-//
-// AKA: SafeArrayPutElement in Windows API.
-func safeArrayPutElement(safearray *SafeArray, index int64, element uintptr) error {
-	return NewError(E_NOTIMPL)
-}
-
-// safeArrayGetRecordInfo accesses IRecordInfo info for custom types.
-//
-// AKA: SafeArrayGetRecordInfo in Windows API.
-//
-// XXX: Must implement IRecordInfo interface for this to return.
-func safeArrayGetRecordInfo(safearray *SafeArray) (interface{}, error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// safeArraySetRecordInfo mutates IRecordInfo info for custom types.
-//
-// AKA: SafeArraySetRecordInfo in Windows API.
-//
-// XXX: Must implement IRecordInfo interface for this to return.
-func safeArraySetRecordInfo(safearray *SafeArray, recordInfo interface{}) error {
-	return NewError(E_NOTIMPL)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_windows.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_windows.go
deleted file mode 100644
index b27936e24e..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearray_windows.go
+++ /dev/null
@@ -1,337 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"unsafe"
-)
-
-var (
-	procSafeArrayAccessData, _        = modoleaut32.FindProc("SafeArrayAccessData")
-	procSafeArrayAllocData, _         = modoleaut32.FindProc("SafeArrayAllocData")
-	procSafeArrayAllocDescriptor, _   = modoleaut32.FindProc("SafeArrayAllocDescriptor")
-	procSafeArrayAllocDescriptorEx, _ = modoleaut32.FindProc("SafeArrayAllocDescriptorEx")
-	procSafeArrayCopy, _              = modoleaut32.FindProc("SafeArrayCopy")
-	procSafeArrayCopyData, _          = modoleaut32.FindProc("SafeArrayCopyData")
-	procSafeArrayCreate, _            = modoleaut32.FindProc("SafeArrayCreate")
-	procSafeArrayCreateEx, _          = modoleaut32.FindProc("SafeArrayCreateEx")
-	procSafeArrayCreateVector, _      = modoleaut32.FindProc("SafeArrayCreateVector")
-	procSafeArrayCreateVectorEx, _    = modoleaut32.FindProc("SafeArrayCreateVectorEx")
-	procSafeArrayDestroy, _           = modoleaut32.FindProc("SafeArrayDestroy")
-	procSafeArrayDestroyData, _       = modoleaut32.FindProc("SafeArrayDestroyData")
-	procSafeArrayDestroyDescriptor, _ = modoleaut32.FindProc("SafeArrayDestroyDescriptor")
-	procSafeArrayGetDim, _            = modoleaut32.FindProc("SafeArrayGetDim")
-	procSafeArrayGetElement, _        = modoleaut32.FindProc("SafeArrayGetElement")
-	procSafeArrayGetElemsize, _       = modoleaut32.FindProc("SafeArrayGetElemsize")
-	procSafeArrayGetIID, _            = modoleaut32.FindProc("SafeArrayGetIID")
-	procSafeArrayGetLBound, _         = modoleaut32.FindProc("SafeArrayGetLBound")
-	procSafeArrayGetUBound, _         = modoleaut32.FindProc("SafeArrayGetUBound")
-	procSafeArrayGetVartype, _        = modoleaut32.FindProc("SafeArrayGetVartype")
-	procSafeArrayLock, _              = modoleaut32.FindProc("SafeArrayLock")
-	procSafeArrayPtrOfIndex, _        = modoleaut32.FindProc("SafeArrayPtrOfIndex")
-	procSafeArrayUnaccessData, _      = modoleaut32.FindProc("SafeArrayUnaccessData")
-	procSafeArrayUnlock, _            = modoleaut32.FindProc("SafeArrayUnlock")
-	procSafeArrayPutElement, _        = modoleaut32.FindProc("SafeArrayPutElement")
-	//procSafeArrayRedim, _             = modoleaut32.FindProc("SafeArrayRedim") // TODO
-	//procSafeArraySetIID, _            = modoleaut32.FindProc("SafeArraySetIID") // TODO
-	procSafeArrayGetRecordInfo, _ = modoleaut32.FindProc("SafeArrayGetRecordInfo")
-	procSafeArraySetRecordInfo, _ = modoleaut32.FindProc("SafeArraySetRecordInfo")
-)
-
-// safeArrayAccessData returns raw array pointer.
-//
-// AKA: SafeArrayAccessData in Windows API.
-// Todo: Test
-func safeArrayAccessData(safearray *SafeArray) (element uintptr, err error) {
-	err = convertHresultToError(
-		procSafeArrayAccessData.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(unsafe.Pointer(&element))))
-	return
-}
-
-// safeArrayUnaccessData releases raw array.
-//
-// AKA: SafeArrayUnaccessData in Windows API.
-func safeArrayUnaccessData(safearray *SafeArray) (err error) {
-	err = convertHresultToError(procSafeArrayUnaccessData.Call(uintptr(unsafe.Pointer(safearray))))
-	return
-}
-
-// safeArrayAllocData allocates SafeArray.
-//
-// AKA: SafeArrayAllocData in Windows API.
-func safeArrayAllocData(safearray *SafeArray) (err error) {
-	err = convertHresultToError(procSafeArrayAllocData.Call(uintptr(unsafe.Pointer(safearray))))
-	return
-}
-
-// safeArrayAllocDescriptor allocates SafeArray.
-//
-// AKA: SafeArrayAllocDescriptor in Windows API.
-func safeArrayAllocDescriptor(dimensions uint32) (safearray *SafeArray, err error) {
-	err = convertHresultToError(
-		procSafeArrayAllocDescriptor.Call(uintptr(dimensions), uintptr(unsafe.Pointer(&safearray))))
-	return
-}
-
-// safeArrayAllocDescriptorEx allocates SafeArray.
-//
-// AKA: SafeArrayAllocDescriptorEx in Windows API.
-func safeArrayAllocDescriptorEx(variantType VT, dimensions uint32) (safearray *SafeArray, err error) {
-	err = convertHresultToError(
-		procSafeArrayAllocDescriptorEx.Call(
-			uintptr(variantType),
-			uintptr(dimensions),
-			uintptr(unsafe.Pointer(&safearray))))
-	return
-}
-
-// safeArrayCopy returns copy of SafeArray.
-//
-// AKA: SafeArrayCopy in Windows API.
-func safeArrayCopy(original *SafeArray) (safearray *SafeArray, err error) {
-	err = convertHresultToError(
-		procSafeArrayCopy.Call(
-			uintptr(unsafe.Pointer(original)),
-			uintptr(unsafe.Pointer(&safearray))))
-	return
-}
-
-// safeArrayCopyData duplicates SafeArray into another SafeArray object.
-//
-// AKA: SafeArrayCopyData in Windows API.
-func safeArrayCopyData(original *SafeArray, duplicate *SafeArray) (err error) {
-	err = convertHresultToError(
-		procSafeArrayCopyData.Call(
-			uintptr(unsafe.Pointer(original)),
-			uintptr(unsafe.Pointer(duplicate))))
-	return
-}
-
-// safeArrayCreate creates SafeArray.
-//
-// AKA: SafeArrayCreate in Windows API.
-func safeArrayCreate(variantType VT, dimensions uint32, bounds *SafeArrayBound) (safearray *SafeArray, err error) {
-	sa, _, err := procSafeArrayCreate.Call(
-		uintptr(variantType),
-		uintptr(dimensions),
-		uintptr(unsafe.Pointer(bounds)))
-	safearray = (*SafeArray)(unsafe.Pointer(&sa))
-	return
-}
-
-// safeArrayCreateEx creates SafeArray.
-//
-// AKA: SafeArrayCreateEx in Windows API.
-func safeArrayCreateEx(variantType VT, dimensions uint32, bounds *SafeArrayBound, extra uintptr) (safearray *SafeArray, err error) {
-	sa, _, err := procSafeArrayCreateEx.Call(
-		uintptr(variantType),
-		uintptr(dimensions),
-		uintptr(unsafe.Pointer(bounds)),
-		extra)
-	safearray = (*SafeArray)(unsafe.Pointer(sa))
-	return
-}
-
-// safeArrayCreateVector creates SafeArray.
-//
-// AKA: SafeArrayCreateVector in Windows API.
-func safeArrayCreateVector(variantType VT, lowerBound int32, length uint32) (safearray *SafeArray, err error) {
-	sa, _, err := procSafeArrayCreateVector.Call(
-		uintptr(variantType),
-		uintptr(lowerBound),
-		uintptr(length))
-	safearray = (*SafeArray)(unsafe.Pointer(sa))
-	return
-}
-
-// safeArrayCreateVectorEx creates SafeArray.
-//
-// AKA: SafeArrayCreateVectorEx in Windows API.
-func safeArrayCreateVectorEx(variantType VT, lowerBound int32, length uint32, extra uintptr) (safearray *SafeArray, err error) {
-	sa, _, err := procSafeArrayCreateVectorEx.Call(
-		uintptr(variantType),
-		uintptr(lowerBound),
-		uintptr(length),
-		extra)
-	safearray = (*SafeArray)(unsafe.Pointer(sa))
-	return
-}
-
-// safeArrayDestroy destroys SafeArray object.
-//
-// AKA: SafeArrayDestroy in Windows API.
-func safeArrayDestroy(safearray *SafeArray) (err error) {
-	err = convertHresultToError(procSafeArrayDestroy.Call(uintptr(unsafe.Pointer(safearray))))
-	return
-}
-
-// safeArrayDestroyData destroys SafeArray object.
-//
-// AKA: SafeArrayDestroyData in Windows API.
-func safeArrayDestroyData(safearray *SafeArray) (err error) {
-	err = convertHresultToError(procSafeArrayDestroyData.Call(uintptr(unsafe.Pointer(safearray))))
-	return
-}
-
-// safeArrayDestroyDescriptor destroys SafeArray object.
-//
-// AKA: SafeArrayDestroyDescriptor in Windows API.
-func safeArrayDestroyDescriptor(safearray *SafeArray) (err error) {
-	err = convertHresultToError(procSafeArrayDestroyDescriptor.Call(uintptr(unsafe.Pointer(safearray))))
-	return
-}
-
-// safeArrayGetDim is the amount of dimensions in the SafeArray.
-//
-// SafeArrays may have multiple dimensions. Meaning, it could be
-// multidimensional array.
-//
-// AKA: SafeArrayGetDim in Windows API.
-func safeArrayGetDim(safearray *SafeArray) (dimensions *uint32, err error) {
-	l, _, err := procSafeArrayGetDim.Call(uintptr(unsafe.Pointer(safearray)))
-	dimensions = (*uint32)(unsafe.Pointer(l))
-	return
-}
-
-// safeArrayGetElementSize is the element size in bytes.
-//
-// AKA: SafeArrayGetElemsize in Windows API.
-func safeArrayGetElementSize(safearray *SafeArray) (length *uint32, err error) {
-	l, _, err := procSafeArrayGetElemsize.Call(uintptr(unsafe.Pointer(safearray)))
-	length = (*uint32)(unsafe.Pointer(l))
-	return
-}
-
-// safeArrayGetElement retrieves element at given index.
-func safeArrayGetElement(safearray *SafeArray, index int64, pv unsafe.Pointer) error {
-	return convertHresultToError(
-		procSafeArrayGetElement.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(unsafe.Pointer(&index)),
-			uintptr(pv)))
-}
-
-// safeArrayGetElementString retrieves element at given index and converts to string.
-func safeArrayGetElementString(safearray *SafeArray, index int64) (str string, err error) {
-	var element *int16
-	err = convertHresultToError(
-		procSafeArrayGetElement.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(unsafe.Pointer(&index)),
-			uintptr(unsafe.Pointer(&element))))
-	str = BstrToString(*(**uint16)(unsafe.Pointer(&element)))
-	SysFreeString(element)
-	return
-}
-
-// safeArrayGetIID is the InterfaceID of the elements in the SafeArray.
-//
-// AKA: SafeArrayGetIID in Windows API.
-func safeArrayGetIID(safearray *SafeArray) (guid *GUID, err error) {
-	err = convertHresultToError(
-		procSafeArrayGetIID.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(unsafe.Pointer(&guid))))
-	return
-}
-
-// safeArrayGetLBound returns lower bounds of SafeArray.
-//
-// SafeArrays may have multiple dimensions. Meaning, it could be
-// multidimensional array.
-//
-// AKA: SafeArrayGetLBound in Windows API.
-func safeArrayGetLBound(safearray *SafeArray, dimension uint32) (lowerBound int64, err error) {
-	err = convertHresultToError(
-		procSafeArrayGetLBound.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(dimension),
-			uintptr(unsafe.Pointer(&lowerBound))))
-	return
-}
-
-// safeArrayGetUBound returns upper bounds of SafeArray.
-//
-// SafeArrays may have multiple dimensions. Meaning, it could be
-// multidimensional array.
-//
-// AKA: SafeArrayGetUBound in Windows API.
-func safeArrayGetUBound(safearray *SafeArray, dimension uint32) (upperBound int64, err error) {
-	err = convertHresultToError(
-		procSafeArrayGetUBound.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(dimension),
-			uintptr(unsafe.Pointer(&upperBound))))
-	return
-}
-
-// safeArrayGetVartype returns data type of SafeArray.
-//
-// AKA: SafeArrayGetVartype in Windows API.
-func safeArrayGetVartype(safearray *SafeArray) (varType uint16, err error) {
-	err = convertHresultToError(
-		procSafeArrayGetVartype.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(unsafe.Pointer(&varType))))
-	return
-}
-
-// safeArrayLock locks SafeArray for reading to modify SafeArray.
-//
-// This must be called during some calls to ensure that another process does not
-// read or write to the SafeArray during editing.
-//
-// AKA: SafeArrayLock in Windows API.
-func safeArrayLock(safearray *SafeArray) (err error) {
-	err = convertHresultToError(procSafeArrayLock.Call(uintptr(unsafe.Pointer(safearray))))
-	return
-}
-
-// safeArrayUnlock unlocks SafeArray for reading.
-//
-// AKA: SafeArrayUnlock in Windows API.
-func safeArrayUnlock(safearray *SafeArray) (err error) {
-	err = convertHresultToError(procSafeArrayUnlock.Call(uintptr(unsafe.Pointer(safearray))))
-	return
-}
-
-// safeArrayPutElement stores the data element at the specified location in the
-// array.
-//
-// AKA: SafeArrayPutElement in Windows API.
-func safeArrayPutElement(safearray *SafeArray, index int64, element uintptr) (err error) {
-	err = convertHresultToError(
-		procSafeArrayPutElement.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(unsafe.Pointer(&index)),
-			uintptr(unsafe.Pointer(element))))
-	return
-}
-
-// safeArrayGetRecordInfo accesses IRecordInfo info for custom types.
-//
-// AKA: SafeArrayGetRecordInfo in Windows API.
-//
-// XXX: Must implement IRecordInfo interface for this to return.
-func safeArrayGetRecordInfo(safearray *SafeArray) (recordInfo interface{}, err error) {
-	err = convertHresultToError(
-		procSafeArrayGetRecordInfo.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(unsafe.Pointer(&recordInfo))))
-	return
-}
-
-// safeArraySetRecordInfo mutates IRecordInfo info for custom types.
-//
-// AKA: SafeArraySetRecordInfo in Windows API.
-//
-// XXX: Must implement IRecordInfo interface for this to return.
-func safeArraySetRecordInfo(safearray *SafeArray, recordInfo interface{}) (err error) {
-	err = convertHresultToError(
-		procSafeArraySetRecordInfo.Call(
-			uintptr(unsafe.Pointer(safearray)),
-			uintptr(unsafe.Pointer(&recordInfo))))
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayconversion.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayconversion.go
deleted file mode 100644
index ffeb2b97b0..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayconversion.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Helper for converting SafeArray to array of objects.
-
-package ole
-
-import (
-	"unsafe"
-)
-
-type SafeArrayConversion struct {
-	Array *SafeArray
-}
-
-func (sac *SafeArrayConversion) ToStringArray() (strings []string) {
-	totalElements, _ := sac.TotalElements(0)
-	strings = make([]string, totalElements)
-
-	for i := int64(0); i < totalElements; i++ {
-		strings[int32(i)], _ = safeArrayGetElementString(sac.Array, i)
-	}
-
-	return
-}
-
-func (sac *SafeArrayConversion) ToByteArray() (bytes []byte) {
-	totalElements, _ := sac.TotalElements(0)
-	bytes = make([]byte, totalElements)
-
-	for i := int64(0); i < totalElements; i++ {
-		safeArrayGetElement(sac.Array, i, unsafe.Pointer(&bytes[int32(i)]))
-	}
-
-	return
-}
-
-func (sac *SafeArrayConversion) ToValueArray() (values []interface{}) {
-	totalElements, _ := sac.TotalElements(0)
-	values = make([]interface{}, totalElements)
-	vt, _ := safeArrayGetVartype(sac.Array)
-
-	for i := 0; i < int(totalElements); i++ {
-		switch VT(vt) {
-		case VT_BOOL:
-			var v bool
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_I1:
-			var v int8
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_I2:
-			var v int16
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_I4:
-			var v int32
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_I8:
-			var v int64
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_UI1:
-			var v uint8
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_UI2:
-			var v uint16
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_UI4:
-			var v uint32
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_UI8:
-			var v uint64
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_R4:
-			var v float32
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_R8:
-			var v float64
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_BSTR:
-			var v string
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v
-		case VT_VARIANT:
-			var v VARIANT
-			safeArrayGetElement(sac.Array, int64(i), unsafe.Pointer(&v))
-			values[i] = v.Value()
-		default:
-			// TODO
-		}
-	}
-
-	return
-}
-
-func (sac *SafeArrayConversion) GetType() (varType uint16, err error) {
-	return safeArrayGetVartype(sac.Array)
-}
-
-func (sac *SafeArrayConversion) GetDimensions() (dimensions *uint32, err error) {
-	return safeArrayGetDim(sac.Array)
-}
-
-func (sac *SafeArrayConversion) GetSize() (length *uint32, err error) {
-	return safeArrayGetElementSize(sac.Array)
-}
-
-func (sac *SafeArrayConversion) TotalElements(index uint32) (totalElements int64, err error) {
-	if index < 1 {
-		index = 1
-	}
-
-	// Get array bounds
-	var LowerBounds int64
-	var UpperBounds int64
-
-	LowerBounds, err = safeArrayGetLBound(sac.Array, index)
-	if err != nil {
-		return
-	}
-
-	UpperBounds, err = safeArrayGetUBound(sac.Array, index)
-	if err != nil {
-		return
-	}
-
-	totalElements = UpperBounds - LowerBounds + 1
-	return
-}
-
-// Release Safe Array memory
-func (sac *SafeArrayConversion) Release() {
-	safeArrayDestroy(sac.Array)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayslices.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayslices.go
deleted file mode 100644
index a9fa885f1d..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/safearrayslices.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"unsafe"
-)
-
-func safeArrayFromByteSlice(slice []byte) *SafeArray {
-	array, _ := safeArrayCreateVector(VT_UI1, 0, uint32(len(slice)))
-
-	if array == nil {
-		panic("Could not convert []byte to SAFEARRAY")
-	}
-
-	for i, v := range slice {
-		safeArrayPutElement(array, int64(i), uintptr(unsafe.Pointer(&v)))
-	}
-	return array
-}
-
-func safeArrayFromStringSlice(slice []string) *SafeArray {
-	array, _ := safeArrayCreateVector(VT_BSTR, 0, uint32(len(slice)))
-
-	if array == nil {
-		panic("Could not convert []string to SAFEARRAY")
-	}
-	// SysAllocStringLen(s)
-	for i, v := range slice {
-		safeArrayPutElement(array, int64(i), uintptr(unsafe.Pointer(SysAllocStringLen(v))))
-	}
-	return array
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/utility.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/utility.go
deleted file mode 100644
index 99ee82dc34..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/utility.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package ole
-
-import (
-	"unicode/utf16"
-	"unsafe"
-)
-
-// ClassIDFrom retrieves class ID whether given is program ID or application string.
-//
-// Helper that provides check against both Class ID from Program ID and Class ID from string. It is
-// faster, if you know which you are using, to use the individual functions, but this will check
-// against available functions for you.
-func ClassIDFrom(programID string) (classID *GUID, err error) {
-	classID, err = CLSIDFromProgID(programID)
-	if err != nil {
-		classID, err = CLSIDFromString(programID)
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// BytePtrToString converts byte pointer to a Go string.
-func BytePtrToString(p *byte) string {
-	a := (*[10000]uint8)(unsafe.Pointer(p))
-	i := 0
-	for a[i] != 0 {
-		i++
-	}
-	return string(a[:i])
-}
-
-// UTF16PtrToString is alias for LpOleStrToString.
-//
-// Kept for compatibility reasons.
-func UTF16PtrToString(p *uint16) string {
-	return LpOleStrToString(p)
-}
-
-// LpOleStrToString converts COM Unicode to Go string.
-func LpOleStrToString(p *uint16) string {
-	if p == nil {
-		return ""
-	}
-
-	length := lpOleStrLen(p)
-	a := make([]uint16, length)
-
-	ptr := unsafe.Pointer(p)
-
-	for i := 0; i < int(length); i++ {
-		a[i] = *(*uint16)(ptr)
-		ptr = unsafe.Pointer(uintptr(ptr) + 2)
-	}
-
-	return string(utf16.Decode(a))
-}
-
-// BstrToString converts COM binary string to Go string.
-func BstrToString(p *uint16) string {
-	if p == nil {
-		return ""
-	}
-	length := SysStringLen((*int16)(unsafe.Pointer(p)))
-	a := make([]uint16, length)
-
-	ptr := unsafe.Pointer(p)
-
-	for i := 0; i < int(length); i++ {
-		a[i] = *(*uint16)(ptr)
-		ptr = unsafe.Pointer(uintptr(ptr) + 2)
-	}
-	return string(utf16.Decode(a))
-}
-
-// lpOleStrLen returns the length of Unicode string.
-func lpOleStrLen(p *uint16) (length int64) {
-	if p == nil {
-		return 0
-	}
-
-	ptr := unsafe.Pointer(p)
-
-	for i := 0; ; i++ {
-		if 0 == *(*uint16)(ptr) {
-			length = int64(i)
-			break
-		}
-		ptr = unsafe.Pointer(uintptr(ptr) + 2)
-	}
-	return
-}
-
-// convertHresultToError converts syscall to error, if call is unsuccessful.
-func convertHresultToError(hr uintptr, r2 uintptr, ignore error) (err error) {
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/variables.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/variables.go
deleted file mode 100644
index ebe00f1cfc..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/variables.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"syscall"
-)
-
-var (
-	modcombase     = syscall.NewLazyDLL("combase.dll")
-	modkernel32, _ = syscall.LoadDLL("kernel32.dll")
-	modole32, _    = syscall.LoadDLL("ole32.dll")
-	modoleaut32, _ = syscall.LoadDLL("oleaut32.dll")
-	modmsvcrt, _   = syscall.LoadDLL("msvcrt.dll")
-	moduser32, _   = syscall.LoadDLL("user32.dll")
-)
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/variant.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/variant.go
deleted file mode 100644
index 36969725eb..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/variant.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package ole
-
-import "unsafe"
-
-// NewVariant returns new variant based on type and value.
-func NewVariant(vt VT, val int64) VARIANT {
-	return VARIANT{VT: vt, Val: val}
-}
-
-// ToIUnknown converts Variant to Unknown object.
-func (v *VARIANT) ToIUnknown() *IUnknown {
-	if v.VT != VT_UNKNOWN {
-		return nil
-	}
-	return (*IUnknown)(unsafe.Pointer(uintptr(v.Val)))
-}
-
-// ToIDispatch converts variant to dispatch object.
-func (v *VARIANT) ToIDispatch() *IDispatch {
-	if v.VT != VT_DISPATCH {
-		return nil
-	}
-	return (*IDispatch)(unsafe.Pointer(uintptr(v.Val)))
-}
-
-// ToArray converts variant to SafeArray helper.
-func (v *VARIANT) ToArray() *SafeArrayConversion {
-	if v.VT != VT_SAFEARRAY {
-		if v.VT&VT_ARRAY == 0 {
-			return nil
-		}
-	}
-	var safeArray *SafeArray = (*SafeArray)(unsafe.Pointer(uintptr(v.Val)))
-	return &SafeArrayConversion{safeArray}
-}
-
-// ToString converts variant to Go string.
-func (v *VARIANT) ToString() string {
-	if v.VT != VT_BSTR {
-		return ""
-	}
-	return BstrToString(*(**uint16)(unsafe.Pointer(&v.Val)))
-}
-
-// Clear the memory of variant object.
-func (v *VARIANT) Clear() error {
-	return VariantClear(v)
-}
-
-// Value returns variant value based on its type.
-//
-// Currently supported types: 2- and 4-byte integers, strings, bools.
-// Note that 64-bit integers, datetimes, and other types are stored as strings
-// and will be returned as strings.
-//
-// Needs to be further converted, because this returns an interface{}.
-func (v *VARIANT) Value() interface{} {
-	switch v.VT {
-	case VT_I1:
-		return int8(v.Val)
-	case VT_UI1:
-		return uint8(v.Val)
-	case VT_I2:
-		return int16(v.Val)
-	case VT_UI2:
-		return uint16(v.Val)
-	case VT_I4:
-		return int32(v.Val)
-	case VT_UI4:
-		return uint32(v.Val)
-	case VT_I8:
-		return int64(v.Val)
-	case VT_UI8:
-		return uint64(v.Val)
-	case VT_INT:
-		return int(v.Val)
-	case VT_UINT:
-		return uint(v.Val)
-	case VT_INT_PTR:
-		return uintptr(v.Val) // TODO
-	case VT_UINT_PTR:
-		return uintptr(v.Val)
-	case VT_R4:
-		return *(*float32)(unsafe.Pointer(&v.Val))
-	case VT_R8:
-		return *(*float64)(unsafe.Pointer(&v.Val))
-	case VT_BSTR:
-		return v.ToString()
-	case VT_DATE:
-		// VT_DATE type will either return float64 or time.Time.
-		d := float64(v.Val)
-		date, err := GetVariantDate(d)
-		if err != nil {
-			return d
-		}
-		return date
-	case VT_UNKNOWN:
-		return v.ToIUnknown()
-	case VT_DISPATCH:
-		return v.ToIDispatch()
-	case VT_BOOL:
-		return v.Val != 0
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_386.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_386.go
deleted file mode 100644
index e73736bf39..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_386.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build 386
-
-package ole
-
-type VARIANT struct {
-	VT         VT     //  2
-	wReserved1 uint16 //  4
-	wReserved2 uint16 //  6
-	wReserved3 uint16 //  8
-	Val        int64  // 16
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_amd64.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_amd64.go
deleted file mode 100644
index dccdde1323..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/variant_amd64.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build amd64
-
-package ole
-
-type VARIANT struct {
-	VT         VT      //  2
-	wReserved1 uint16  //  4
-	wReserved2 uint16  //  6
-	wReserved3 uint16  //  8
-	Val        int64   // 16
-	_          [8]byte // 24
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/vt_string.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/vt_string.go
deleted file mode 100644
index 729b4a04dd..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/vt_string.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// generated by stringer -output vt_string.go -type VT; DO NOT EDIT
-
-package ole
-
-import "fmt"
-
-const (
-	_VT_name_0 = "VT_EMPTYVT_NULLVT_I2VT_I4VT_R4VT_R8VT_CYVT_DATEVT_BSTRVT_DISPATCHVT_ERRORVT_BOOLVT_VARIANTVT_UNKNOWNVT_DECIMAL"
-	_VT_name_1 = "VT_I1VT_UI1VT_UI2VT_UI4VT_I8VT_UI8VT_INTVT_UINTVT_VOIDVT_HRESULTVT_PTRVT_SAFEARRAYVT_CARRAYVT_USERDEFINEDVT_LPSTRVT_LPWSTR"
-	_VT_name_2 = "VT_RECORDVT_INT_PTRVT_UINT_PTR"
-	_VT_name_3 = "VT_FILETIMEVT_BLOBVT_STREAMVT_STORAGEVT_STREAMED_OBJECTVT_STORED_OBJECTVT_BLOB_OBJECTVT_CFVT_CLSID"
-	_VT_name_4 = "VT_BSTR_BLOBVT_VECTOR"
-	_VT_name_5 = "VT_ARRAY"
-	_VT_name_6 = "VT_BYREF"
-	_VT_name_7 = "VT_RESERVED"
-	_VT_name_8 = "VT_ILLEGAL"
-)
-
-var (
-	_VT_index_0 = [...]uint8{0, 8, 15, 20, 25, 30, 35, 40, 47, 54, 65, 73, 80, 90, 100, 110}
-	_VT_index_1 = [...]uint8{0, 5, 11, 17, 23, 28, 34, 40, 47, 54, 64, 70, 82, 91, 105, 113, 122}
-	_VT_index_2 = [...]uint8{0, 9, 19, 30}
-	_VT_index_3 = [...]uint8{0, 11, 18, 27, 37, 55, 71, 85, 90, 98}
-	_VT_index_4 = [...]uint8{0, 12, 21}
-	_VT_index_5 = [...]uint8{0, 8}
-	_VT_index_6 = [...]uint8{0, 8}
-	_VT_index_7 = [...]uint8{0, 11}
-	_VT_index_8 = [...]uint8{0, 10}
-)
-
-func (i VT) String() string {
-	switch {
-	case 0 <= i && i <= 14:
-		return _VT_name_0[_VT_index_0[i]:_VT_index_0[i+1]]
-	case 16 <= i && i <= 31:
-		i -= 16
-		return _VT_name_1[_VT_index_1[i]:_VT_index_1[i+1]]
-	case 36 <= i && i <= 38:
-		i -= 36
-		return _VT_name_2[_VT_index_2[i]:_VT_index_2[i+1]]
-	case 64 <= i && i <= 72:
-		i -= 64
-		return _VT_name_3[_VT_index_3[i]:_VT_index_3[i+1]]
-	case 4095 <= i && i <= 4096:
-		i -= 4095
-		return _VT_name_4[_VT_index_4[i]:_VT_index_4[i+1]]
-	case i == 8192:
-		return _VT_name_5
-	case i == 16384:
-		return _VT_name_6
-	case i == 32768:
-		return _VT_name_7
-	case i == 65535:
-		return _VT_name_8
-	default:
-		return fmt.Sprintf("VT(%d)", i)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt.go
deleted file mode 100644
index 4e9eca7324..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// +build windows
-
-package ole
-
-import (
-	"reflect"
-	"syscall"
-	"unicode/utf8"
-	"unsafe"
-)
-
-var (
-	procRoInitialize              = modcombase.NewProc("RoInitialize")
-	procRoActivateInstance        = modcombase.NewProc("RoActivateInstance")
-	procRoGetActivationFactory    = modcombase.NewProc("RoGetActivationFactory")
-	procWindowsCreateString       = modcombase.NewProc("WindowsCreateString")
-	procWindowsDeleteString       = modcombase.NewProc("WindowsDeleteString")
-	procWindowsGetStringRawBuffer = modcombase.NewProc("WindowsGetStringRawBuffer")
-)
-
-func RoInitialize(thread_type uint32) (err error) {
-	hr, _, _ := procRoInitialize.Call(uintptr(thread_type))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func RoActivateInstance(clsid string) (ins *IInspectable, err error) {
-	hClsid, err := NewHString(clsid)
-	if err != nil {
-		return nil, err
-	}
-	defer DeleteHString(hClsid)
-
-	hr, _, _ := procRoActivateInstance.Call(
-		uintptr(unsafe.Pointer(hClsid)),
-		uintptr(unsafe.Pointer(&ins)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-func RoGetActivationFactory(clsid string, iid *GUID) (ins *IInspectable, err error) {
-	hClsid, err := NewHString(clsid)
-	if err != nil {
-		return nil, err
-	}
-	defer DeleteHString(hClsid)
-
-	hr, _, _ := procRoGetActivationFactory.Call(
-		uintptr(unsafe.Pointer(hClsid)),
-		uintptr(unsafe.Pointer(iid)),
-		uintptr(unsafe.Pointer(&ins)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// HString is handle string for pointers.
-type HString uintptr
-
-// NewHString returns a new HString for Go string.
-func NewHString(s string) (hstring HString, err error) {
-	u16 := syscall.StringToUTF16Ptr(s)
-	len := uint32(utf8.RuneCountInString(s))
-	hr, _, _ := procWindowsCreateString.Call(
-		uintptr(unsafe.Pointer(u16)),
-		uintptr(len),
-		uintptr(unsafe.Pointer(&hstring)))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// DeleteHString deletes HString.
-func DeleteHString(hstring HString) (err error) {
-	hr, _, _ := procWindowsDeleteString.Call(uintptr(hstring))
-	if hr != 0 {
-		err = NewError(hr)
-	}
-	return
-}
-
-// String returns Go string value of HString.
-func (h HString) String() string {
-	var u16buf uintptr
-	var u16len uint32
-	u16buf, _, _ = procWindowsGetStringRawBuffer.Call(
-		uintptr(h),
-		uintptr(unsafe.Pointer(&u16len)))
-
-	u16hdr := reflect.SliceHeader{Data: u16buf, Len: int(u16len), Cap: int(u16len)}
-	u16 := *(*[]uint16)(unsafe.Pointer(&u16hdr))
-	return syscall.UTF16ToString(u16)
-}
diff --git a/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt_doc.go b/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt_doc.go
deleted file mode 100644
index 52e6d74c9a..0000000000
--- a/Godeps/_workspace/src/github.com/go-ole/go-ole/winrt_doc.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// +build !windows
-
-package ole
-
-// RoInitialize
-func RoInitialize(thread_type uint32) (err error) {
-	return NewError(E_NOTIMPL)
-}
-
-// RoActivateInstance
-func RoActivateInstance(clsid string) (ins *IInspectable, err error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// RoGetActivationFactory
-func RoGetActivationFactory(clsid string, iid *GUID) (ins *IInspectable, err error) {
-	return nil, NewError(E_NOTIMPL)
-}
-
-// HString is handle string for pointers.
-type HString uintptr
-
-// NewHString returns a new HString for Go string.
-func NewHString(s string) (hstring HString, err error) {
-	return HString(uintptr(0)), NewError(E_NOTIMPL)
-}
-
-// DeleteHString deletes HString.
-func DeleteHString(hstring HString) (err error) {
-	return NewError(E_NOTIMPL)
-}
-
-// String returns Go string value of HString.
-func (h HString) String() string {
-	return ""
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/godbus/dbus/CONTRIBUTING.md
deleted file mode 100644
index c88f9b2bdd..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/CONTRIBUTING.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# How to Contribute
-
-## Getting Started
-
-- Fork the repository on GitHub
-- Read the [README](README.markdown) for build and test instructions
-- Play with the project, submit bugs, submit patches!
-
-## Contribution Flow
-
-This is a rough outline of what a contributor's workflow looks like:
-
-- Create a topic branch from where you want to base your work (usually master).
-- Make commits of logical units.
-- Make sure your commit messages are in the proper format (see below).
-- Push your changes to a topic branch in your fork of the repository.
-- Make sure the tests pass, and add any new tests as appropriate.
-- Submit a pull request to the original repository.
-
-Thanks for your contributions!
-
-### Format of the Commit Message
-
-We follow a rough convention for commit messages that is designed to answer two
-questions: what changed and why. The subject line should feature the what and
-the body of the commit should describe the why.
-
-```
-scripts: add the test-cluster command
-
-this uses tmux to setup a test cluster that you can easily kill and
-start for debugging.
-
-Fixes #38
-```
-
-The format can be described more formally as follows:
-
-```
-<subsystem>: <what changed>
-<BLANK LINE>
-<why this change was made>
-<BLANK LINE>
-<footer>
-```
-
-The first line is the subject and should be no longer than 70 characters, the
-second line is always blank, and other lines should be wrapped at 80 characters.
-This allows the message to be easier to read on GitHub as well as in various
-git tools.
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE b/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
deleted file mode 100644
index 670d88fcaa..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>), Google
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/MAINTAINERS b/Godeps/_workspace/src/github.com/godbus/dbus/MAINTAINERS
deleted file mode 100644
index e8968ece7f..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Brandon Philips <brandon@ifup.org> (@philips)
-Brian Waldon <brian@waldon.cc> (@bcwaldon)
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/README.markdown b/Godeps/_workspace/src/github.com/godbus/dbus/README.markdown
deleted file mode 100644
index 0a6e7e5bfb..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/README.markdown
+++ /dev/null
@@ -1,41 +0,0 @@
-dbus
-----
-
-dbus is a simple library that implements native Go client bindings for the
-D-Bus message bus system.
-
-### Features
-
-* Complete native implementation of the D-Bus message protocol
-* Go-like API (channels for signals / asynchronous method calls, Goroutine-safe connections)
-* Subpackages that help with the introspection / property interfaces
-
-### Installation
-
-This packages requires Go 1.1. If you installed it and set up your GOPATH, just run:
-
-```
-go get github.com/godbus/dbus
-```
-
-If you want to use the subpackages, you can install them the same way.
-
-### Usage
-
-The complete package documentation and some simple examples are available at
-[godoc.org](http://godoc.org/github.com/godbus/dbus). Also, the
-[_examples](https://github.com/godbus/dbus/tree/master/_examples) directory
-gives a short overview over the basic usage. 
-
-#### Projects using godbus
-- [notify](https://github.com/esiqveland/notify) provides desktop notifications over dbus into a library.
-
-Please note that the API is considered unstable for now and may change without
-further notice.
-
-### License
-
-go.dbus is available under the Simplified BSD License; see LICENSE for the full
-text.
-
-Nearly all of the credit for this library goes to github.com/guelfey/go.dbus.
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/auth.go b/Godeps/_workspace/src/github.com/godbus/dbus/auth.go
deleted file mode 100644
index 98017b693e..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/auth.go
+++ /dev/null
@@ -1,253 +0,0 @@
-package dbus
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"io"
-	"os"
-	"strconv"
-)
-
-// AuthStatus represents the Status of an authentication mechanism.
-type AuthStatus byte
-
-const (
-	// AuthOk signals that authentication is finished; the next command
-	// from the server should be an OK.
-	AuthOk AuthStatus = iota
-
-	// AuthContinue signals that additional data is needed; the next command
-	// from the server should be a DATA.
-	AuthContinue
-
-	// AuthError signals an error; the server sent invalid data or some
-	// other unexpected thing happened and the current authentication
-	// process should be aborted.
-	AuthError
-)
-
-type authState byte
-
-const (
-	waitingForData authState = iota
-	waitingForOk
-	waitingForReject
-)
-
-// Auth defines the behaviour of an authentication mechanism.
-type Auth interface {
-	// Return the name of the mechnism, the argument to the first AUTH command
-	// and the next status.
-	FirstData() (name, resp []byte, status AuthStatus)
-
-	// Process the given DATA command, and return the argument to the DATA
-	// command and the next status. If len(resp) == 0, no DATA command is sent.
-	HandleData(data []byte) (resp []byte, status AuthStatus)
-}
-
-// Auth authenticates the connection, trying the given list of authentication
-// mechanisms (in that order). If nil is passed, the EXTERNAL and
-// DBUS_COOKIE_SHA1 mechanisms are tried for the current user. For private
-// connections, this method must be called before sending any messages to the
-// bus. Auth must not be called on shared connections.
-func (conn *Conn) Auth(methods []Auth) error {
-	if methods == nil {
-		uid := strconv.Itoa(os.Getuid())
-		methods = []Auth{AuthExternal(uid), AuthCookieSha1(uid, getHomeDir())}
-	}
-	in := bufio.NewReader(conn.transport)
-	err := conn.transport.SendNullByte()
-	if err != nil {
-		return err
-	}
-	err = authWriteLine(conn.transport, []byte("AUTH"))
-	if err != nil {
-		return err
-	}
-	s, err := authReadLine(in)
-	if err != nil {
-		return err
-	}
-	if len(s) < 2 || !bytes.Equal(s[0], []byte("REJECTED")) {
-		return errors.New("dbus: authentication protocol error")
-	}
-	s = s[1:]
-	for _, v := range s {
-		for _, m := range methods {
-			if name, data, status := m.FirstData(); bytes.Equal(v, name) {
-				var ok bool
-				err = authWriteLine(conn.transport, []byte("AUTH"), []byte(v), data)
-				if err != nil {
-					return err
-				}
-				switch status {
-				case AuthOk:
-					err, ok = conn.tryAuth(m, waitingForOk, in)
-				case AuthContinue:
-					err, ok = conn.tryAuth(m, waitingForData, in)
-				default:
-					panic("dbus: invalid authentication status")
-				}
-				if err != nil {
-					return err
-				}
-				if ok {
-					if conn.transport.SupportsUnixFDs() {
-						err = authWriteLine(conn, []byte("NEGOTIATE_UNIX_FD"))
-						if err != nil {
-							return err
-						}
-						line, err := authReadLine(in)
-						if err != nil {
-							return err
-						}
-						switch {
-						case bytes.Equal(line[0], []byte("AGREE_UNIX_FD")):
-							conn.EnableUnixFDs()
-							conn.unixFD = true
-						case bytes.Equal(line[0], []byte("ERROR")):
-						default:
-							return errors.New("dbus: authentication protocol error")
-						}
-					}
-					err = authWriteLine(conn.transport, []byte("BEGIN"))
-					if err != nil {
-						return err
-					}
-					go conn.inWorker()
-					go conn.outWorker()
-					return nil
-				}
-			}
-		}
-	}
-	return errors.New("dbus: authentication failed")
-}
-
-// tryAuth tries to authenticate with m as the mechanism, using state as the
-// initial authState and in for reading input. It returns (nil, true) on
-// success, (nil, false) on a REJECTED and (someErr, false) if some other
-// error occured.
-func (conn *Conn) tryAuth(m Auth, state authState, in *bufio.Reader) (error, bool) {
-	for {
-		s, err := authReadLine(in)
-		if err != nil {
-			return err, false
-		}
-		switch {
-		case state == waitingForData && string(s[0]) == "DATA":
-			if len(s) != 2 {
-				err = authWriteLine(conn.transport, []byte("ERROR"))
-				if err != nil {
-					return err, false
-				}
-				continue
-			}
-			data, status := m.HandleData(s[1])
-			switch status {
-			case AuthOk, AuthContinue:
-				if len(data) != 0 {
-					err = authWriteLine(conn.transport, []byte("DATA"), data)
-					if err != nil {
-						return err, false
-					}
-				}
-				if status == AuthOk {
-					state = waitingForOk
-				}
-			case AuthError:
-				err = authWriteLine(conn.transport, []byte("ERROR"))
-				if err != nil {
-					return err, false
-				}
-			}
-		case state == waitingForData && string(s[0]) == "REJECTED":
-			return nil, false
-		case state == waitingForData && string(s[0]) == "ERROR":
-			err = authWriteLine(conn.transport, []byte("CANCEL"))
-			if err != nil {
-				return err, false
-			}
-			state = waitingForReject
-		case state == waitingForData && string(s[0]) == "OK":
-			if len(s) != 2 {
-				err = authWriteLine(conn.transport, []byte("CANCEL"))
-				if err != nil {
-					return err, false
-				}
-				state = waitingForReject
-			}
-			conn.uuid = string(s[1])
-			return nil, true
-		case state == waitingForData:
-			err = authWriteLine(conn.transport, []byte("ERROR"))
-			if err != nil {
-				return err, false
-			}
-		case state == waitingForOk && string(s[0]) == "OK":
-			if len(s) != 2 {
-				err = authWriteLine(conn.transport, []byte("CANCEL"))
-				if err != nil {
-					return err, false
-				}
-				state = waitingForReject
-			}
-			conn.uuid = string(s[1])
-			return nil, true
-		case state == waitingForOk && string(s[0]) == "REJECTED":
-			return nil, false
-		case state == waitingForOk && (string(s[0]) == "DATA" ||
-			string(s[0]) == "ERROR"):
-
-			err = authWriteLine(conn.transport, []byte("CANCEL"))
-			if err != nil {
-				return err, false
-			}
-			state = waitingForReject
-		case state == waitingForOk:
-			err = authWriteLine(conn.transport, []byte("ERROR"))
-			if err != nil {
-				return err, false
-			}
-		case state == waitingForReject && string(s[0]) == "REJECTED":
-			return nil, false
-		case state == waitingForReject:
-			return errors.New("dbus: authentication protocol error"), false
-		default:
-			panic("dbus: invalid auth state")
-		}
-	}
-}
-
-// authReadLine reads a line and separates it into its fields.
-func authReadLine(in *bufio.Reader) ([][]byte, error) {
-	data, err := in.ReadBytes('\n')
-	if err != nil {
-		return nil, err
-	}
-	data = bytes.TrimSuffix(data, []byte("\r\n"))
-	return bytes.Split(data, []byte{' '}), nil
-}
-
-// authWriteLine writes the given line in the authentication protocol format
-// (elements of data separated by a " " and terminated by "\r\n").
-func authWriteLine(out io.Writer, data ...[]byte) error {
-	buf := make([]byte, 0)
-	for i, v := range data {
-		buf = append(buf, v...)
-		if i != len(data)-1 {
-			buf = append(buf, ' ')
-		}
-	}
-	buf = append(buf, '\r')
-	buf = append(buf, '\n')
-	n, err := out.Write(buf)
-	if err != nil {
-		return err
-	}
-	if n != len(buf) {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/auth_external.go b/Godeps/_workspace/src/github.com/godbus/dbus/auth_external.go
deleted file mode 100644
index 7e376d3ef6..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/auth_external.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package dbus
-
-import (
-	"encoding/hex"
-)
-
-// AuthExternal returns an Auth that authenticates as the given user with the
-// EXTERNAL mechanism.
-func AuthExternal(user string) Auth {
-	return authExternal{user}
-}
-
-// AuthExternal implements the EXTERNAL authentication mechanism.
-type authExternal struct {
-	user string
-}
-
-func (a authExternal) FirstData() ([]byte, []byte, AuthStatus) {
-	b := make([]byte, 2*len(a.user))
-	hex.Encode(b, []byte(a.user))
-	return []byte("EXTERNAL"), b, AuthOk
-}
-
-func (a authExternal) HandleData(b []byte) ([]byte, AuthStatus) {
-	return nil, AuthError
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/auth_sha1.go b/Godeps/_workspace/src/github.com/godbus/dbus/auth_sha1.go
deleted file mode 100644
index df15b46119..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/auth_sha1.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package dbus
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/rand"
-	"crypto/sha1"
-	"encoding/hex"
-	"os"
-)
-
-// AuthCookieSha1 returns an Auth that authenticates as the given user with the
-// DBUS_COOKIE_SHA1 mechanism. The home parameter should specify the home
-// directory of the user.
-func AuthCookieSha1(user, home string) Auth {
-	return authCookieSha1{user, home}
-}
-
-type authCookieSha1 struct {
-	user, home string
-}
-
-func (a authCookieSha1) FirstData() ([]byte, []byte, AuthStatus) {
-	b := make([]byte, 2*len(a.user))
-	hex.Encode(b, []byte(a.user))
-	return []byte("DBUS_COOKIE_SHA1"), b, AuthContinue
-}
-
-func (a authCookieSha1) HandleData(data []byte) ([]byte, AuthStatus) {
-	challenge := make([]byte, len(data)/2)
-	_, err := hex.Decode(challenge, data)
-	if err != nil {
-		return nil, AuthError
-	}
-	b := bytes.Split(challenge, []byte{' '})
-	if len(b) != 3 {
-		return nil, AuthError
-	}
-	context := b[0]
-	id := b[1]
-	svchallenge := b[2]
-	cookie := a.getCookie(context, id)
-	if cookie == nil {
-		return nil, AuthError
-	}
-	clchallenge := a.generateChallenge()
-	if clchallenge == nil {
-		return nil, AuthError
-	}
-	hash := sha1.New()
-	hash.Write(bytes.Join([][]byte{svchallenge, clchallenge, cookie}, []byte{':'}))
-	hexhash := make([]byte, 2*hash.Size())
-	hex.Encode(hexhash, hash.Sum(nil))
-	data = append(clchallenge, ' ')
-	data = append(data, hexhash...)
-	resp := make([]byte, 2*len(data))
-	hex.Encode(resp, data)
-	return resp, AuthOk
-}
-
-// getCookie searches for the cookie identified by id in context and returns
-// the cookie content or nil. (Since HandleData can't return a specific error,
-// but only whether an error occured, this function also doesn't bother to
-// return an error.)
-func (a authCookieSha1) getCookie(context, id []byte) []byte {
-	file, err := os.Open(a.home + "/.dbus-keyrings/" + string(context))
-	if err != nil {
-		return nil
-	}
-	defer file.Close()
-	rd := bufio.NewReader(file)
-	for {
-		line, err := rd.ReadBytes('\n')
-		if err != nil {
-			return nil
-		}
-		line = line[:len(line)-1]
-		b := bytes.Split(line, []byte{' '})
-		if len(b) != 3 {
-			return nil
-		}
-		if bytes.Equal(b[0], id) {
-			return b[2]
-		}
-	}
-}
-
-// generateChallenge returns a random, hex-encoded challenge, or nil on error
-// (see above).
-func (a authCookieSha1) generateChallenge() []byte {
-	b := make([]byte, 16)
-	n, err := rand.Read(b)
-	if err != nil {
-		return nil
-	}
-	if n != 16 {
-		return nil
-	}
-	enc := make([]byte, 32)
-	hex.Encode(enc, b)
-	return enc
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/call.go b/Godeps/_workspace/src/github.com/godbus/dbus/call.go
deleted file mode 100644
index ba6e73f607..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/call.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package dbus
-
-import (
-	"errors"
-)
-
-// Call represents a pending or completed method call.
-type Call struct {
-	Destination string
-	Path        ObjectPath
-	Method      string
-	Args        []interface{}
-
-	// Strobes when the call is complete.
-	Done chan *Call
-
-	// After completion, the error status. If this is non-nil, it may be an
-	// error message from the peer (with Error as its type) or some other error.
-	Err error
-
-	// Holds the response once the call is done.
-	Body []interface{}
-}
-
-var errSignature = errors.New("dbus: mismatched signature")
-
-// Store stores the body of the reply into the provided pointers. It returns
-// an error if the signatures of the body and retvalues don't match, or if
-// the error status is not nil.
-func (c *Call) Store(retvalues ...interface{}) error {
-	if c.Err != nil {
-		return c.Err
-	}
-
-	return Store(c.Body, retvalues...)
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/conn.go b/Godeps/_workspace/src/github.com/godbus/dbus/conn.go
deleted file mode 100644
index a4f5394010..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/conn.go
+++ /dev/null
@@ -1,625 +0,0 @@
-package dbus
-
-import (
-	"errors"
-	"io"
-	"os"
-	"reflect"
-	"strings"
-	"sync"
-)
-
-const defaultSystemBusAddress = "unix:path=/var/run/dbus/system_bus_socket"
-
-var (
-	systemBus     *Conn
-	systemBusLck  sync.Mutex
-	sessionBus    *Conn
-	sessionBusLck sync.Mutex
-)
-
-// ErrClosed is the error returned by calls on a closed connection.
-var ErrClosed = errors.New("dbus: connection closed by user")
-
-// Conn represents a connection to a message bus (usually, the system or
-// session bus).
-//
-// Connections are either shared or private. Shared connections
-// are shared between calls to the functions that return them. As a result,
-// the methods Close, Auth and Hello must not be called on them.
-//
-// Multiple goroutines may invoke methods on a connection simultaneously.
-type Conn struct {
-	transport
-
-	busObj BusObject
-	unixFD bool
-	uuid   string
-
-	names    []string
-	namesLck sync.RWMutex
-
-	serialLck  sync.Mutex
-	nextSerial uint32
-	serialUsed map[uint32]bool
-
-	calls    map[uint32]*Call
-	callsLck sync.RWMutex
-
-	handlers    map[ObjectPath]map[string]exportWithMapping
-	handlersLck sync.RWMutex
-
-	out    chan *Message
-	closed bool
-	outLck sync.RWMutex
-
-	signals    []chan<- *Signal
-	signalsLck sync.Mutex
-
-	eavesdropped    chan<- *Message
-	eavesdroppedLck sync.Mutex
-}
-
-// SessionBus returns a shared connection to the session bus, connecting to it
-// if not already done.
-func SessionBus() (conn *Conn, err error) {
-	sessionBusLck.Lock()
-	defer sessionBusLck.Unlock()
-	if sessionBus != nil {
-		return sessionBus, nil
-	}
-	defer func() {
-		if conn != nil {
-			sessionBus = conn
-		}
-	}()
-	conn, err = SessionBusPrivate()
-	if err != nil {
-		return
-	}
-	if err = conn.Auth(nil); err != nil {
-		conn.Close()
-		conn = nil
-		return
-	}
-	if err = conn.Hello(); err != nil {
-		conn.Close()
-		conn = nil
-	}
-	return
-}
-
-// SessionBusPrivate returns a new private connection to the session bus.
-func SessionBusPrivate() (*Conn, error) {
-	address := os.Getenv("DBUS_SESSION_BUS_ADDRESS")
-	if address != "" && address != "autolaunch:" {
-		return Dial(address)
-	}
-
-	return sessionBusPlatform()
-}
-
-// SystemBus returns a shared connection to the system bus, connecting to it if
-// not already done.
-func SystemBus() (conn *Conn, err error) {
-	systemBusLck.Lock()
-	defer systemBusLck.Unlock()
-	if systemBus != nil {
-		return systemBus, nil
-	}
-	defer func() {
-		if conn != nil {
-			systemBus = conn
-		}
-	}()
-	conn, err = SystemBusPrivate()
-	if err != nil {
-		return
-	}
-	if err = conn.Auth(nil); err != nil {
-		conn.Close()
-		conn = nil
-		return
-	}
-	if err = conn.Hello(); err != nil {
-		conn.Close()
-		conn = nil
-	}
-	return
-}
-
-// SystemBusPrivate returns a new private connection to the system bus.
-func SystemBusPrivate() (*Conn, error) {
-	address := os.Getenv("DBUS_SYSTEM_BUS_ADDRESS")
-	if address != "" {
-		return Dial(address)
-	}
-	return Dial(defaultSystemBusAddress)
-}
-
-// Dial establishes a new private connection to the message bus specified by address.
-func Dial(address string) (*Conn, error) {
-	tr, err := getTransport(address)
-	if err != nil {
-		return nil, err
-	}
-	return newConn(tr)
-}
-
-// NewConn creates a new private *Conn from an already established connection.
-func NewConn(conn io.ReadWriteCloser) (*Conn, error) {
-	return newConn(genericTransport{conn})
-}
-
-// newConn creates a new *Conn from a transport.
-func newConn(tr transport) (*Conn, error) {
-	conn := new(Conn)
-	conn.transport = tr
-	conn.calls = make(map[uint32]*Call)
-	conn.out = make(chan *Message, 10)
-	conn.handlers = make(map[ObjectPath]map[string]exportWithMapping)
-	conn.nextSerial = 1
-	conn.serialUsed = map[uint32]bool{0: true}
-	conn.busObj = conn.Object("org.freedesktop.DBus", "/org/freedesktop/DBus")
-	return conn, nil
-}
-
-// BusObject returns the object owned by the bus daemon which handles
-// administrative requests.
-func (conn *Conn) BusObject() BusObject {
-	return conn.busObj
-}
-
-// Close closes the connection. Any blocked operations will return with errors
-// and the channels passed to Eavesdrop and Signal are closed. This method must
-// not be called on shared connections.
-func (conn *Conn) Close() error {
-	conn.outLck.Lock()
-	if conn.closed {
-		// inWorker calls Close on read error, the read error may
-		// be caused by another caller calling Close to shutdown the
-		// dbus connection, a double-close scenario we prevent here.
-		conn.outLck.Unlock()
-		return nil
-	}
-	close(conn.out)
-	conn.closed = true
-	conn.outLck.Unlock()
-	conn.signalsLck.Lock()
-	for _, ch := range conn.signals {
-		close(ch)
-	}
-	conn.signalsLck.Unlock()
-	conn.eavesdroppedLck.Lock()
-	if conn.eavesdropped != nil {
-		close(conn.eavesdropped)
-	}
-	conn.eavesdroppedLck.Unlock()
-	return conn.transport.Close()
-}
-
-// Eavesdrop causes conn to send all incoming messages to the given channel
-// without further processing. Method replies, errors and signals will not be
-// sent to the appropiate channels and method calls will not be handled. If nil
-// is passed, the normal behaviour is restored.
-//
-// The caller has to make sure that ch is sufficiently buffered;
-// if a message arrives when a write to ch is not possible, the message is
-// discarded.
-func (conn *Conn) Eavesdrop(ch chan<- *Message) {
-	conn.eavesdroppedLck.Lock()
-	conn.eavesdropped = ch
-	conn.eavesdroppedLck.Unlock()
-}
-
-// getSerial returns an unused serial.
-func (conn *Conn) getSerial() uint32 {
-	conn.serialLck.Lock()
-	defer conn.serialLck.Unlock()
-	n := conn.nextSerial
-	for conn.serialUsed[n] {
-		n++
-	}
-	conn.serialUsed[n] = true
-	conn.nextSerial = n + 1
-	return n
-}
-
-// Hello sends the initial org.freedesktop.DBus.Hello call. This method must be
-// called after authentication, but before sending any other messages to the
-// bus. Hello must not be called for shared connections.
-func (conn *Conn) Hello() error {
-	var s string
-	err := conn.busObj.Call("org.freedesktop.DBus.Hello", 0).Store(&s)
-	if err != nil {
-		return err
-	}
-	conn.namesLck.Lock()
-	conn.names = make([]string, 1)
-	conn.names[0] = s
-	conn.namesLck.Unlock()
-	return nil
-}
-
-// inWorker runs in an own goroutine, reading incoming messages from the
-// transport and dispatching them appropiately.
-func (conn *Conn) inWorker() {
-	for {
-		msg, err := conn.ReadMessage()
-		if err == nil {
-			conn.eavesdroppedLck.Lock()
-			if conn.eavesdropped != nil {
-				select {
-				case conn.eavesdropped <- msg:
-				default:
-				}
-				conn.eavesdroppedLck.Unlock()
-				continue
-			}
-			conn.eavesdroppedLck.Unlock()
-			dest, _ := msg.Headers[FieldDestination].value.(string)
-			found := false
-			if dest == "" {
-				found = true
-			} else {
-				conn.namesLck.RLock()
-				if len(conn.names) == 0 {
-					found = true
-				}
-				for _, v := range conn.names {
-					if dest == v {
-						found = true
-						break
-					}
-				}
-				conn.namesLck.RUnlock()
-			}
-			if !found {
-				// Eavesdropped a message, but no channel for it is registered.
-				// Ignore it.
-				continue
-			}
-			switch msg.Type {
-			case TypeMethodReply, TypeError:
-				serial := msg.Headers[FieldReplySerial].value.(uint32)
-				conn.callsLck.Lock()
-				if c, ok := conn.calls[serial]; ok {
-					if msg.Type == TypeError {
-						name, _ := msg.Headers[FieldErrorName].value.(string)
-						c.Err = Error{name, msg.Body}
-					} else {
-						c.Body = msg.Body
-					}
-					c.Done <- c
-					conn.serialLck.Lock()
-					delete(conn.serialUsed, serial)
-					conn.serialLck.Unlock()
-					delete(conn.calls, serial)
-				}
-				conn.callsLck.Unlock()
-			case TypeSignal:
-				iface := msg.Headers[FieldInterface].value.(string)
-				member := msg.Headers[FieldMember].value.(string)
-				// as per http://dbus.freedesktop.org/doc/dbus-specification.html ,
-				// sender is optional for signals.
-				sender, _ := msg.Headers[FieldSender].value.(string)
-				if iface == "org.freedesktop.DBus" && sender == "org.freedesktop.DBus" {
-					if member == "NameLost" {
-						// If we lost the name on the bus, remove it from our
-						// tracking list.
-						name, ok := msg.Body[0].(string)
-						if !ok {
-							panic("Unable to read the lost name")
-						}
-						conn.namesLck.Lock()
-						for i, v := range conn.names {
-							if v == name {
-								conn.names = append(conn.names[:i],
-									conn.names[i+1:]...)
-							}
-						}
-						conn.namesLck.Unlock()
-					} else if member == "NameAcquired" {
-						// If we acquired the name on the bus, add it to our
-						// tracking list.
-						name, ok := msg.Body[0].(string)
-						if !ok {
-							panic("Unable to read the acquired name")
-						}
-						conn.namesLck.Lock()
-						conn.names = append(conn.names, name)
-						conn.namesLck.Unlock()
-					}
-				}
-				signal := &Signal{
-					Sender: sender,
-					Path:   msg.Headers[FieldPath].value.(ObjectPath),
-					Name:   iface + "." + member,
-					Body:   msg.Body,
-				}
-				conn.signalsLck.Lock()
-				for _, ch := range conn.signals {
-					ch <- signal
-				}
-				conn.signalsLck.Unlock()
-			case TypeMethodCall:
-				go conn.handleCall(msg)
-			}
-		} else if _, ok := err.(InvalidMessageError); !ok {
-			// Some read error occured (usually EOF); we can't really do
-			// anything but to shut down all stuff and returns errors to all
-			// pending replies.
-			conn.Close()
-			conn.callsLck.RLock()
-			for _, v := range conn.calls {
-				v.Err = err
-				v.Done <- v
-			}
-			conn.callsLck.RUnlock()
-			return
-		}
-		// invalid messages are ignored
-	}
-}
-
-// Names returns the list of all names that are currently owned by this
-// connection. The slice is always at least one element long, the first element
-// being the unique name of the connection.
-func (conn *Conn) Names() []string {
-	conn.namesLck.RLock()
-	// copy the slice so it can't be modified
-	s := make([]string, len(conn.names))
-	copy(s, conn.names)
-	conn.namesLck.RUnlock()
-	return s
-}
-
-// Object returns the object identified by the given destination name and path.
-func (conn *Conn) Object(dest string, path ObjectPath) BusObject {
-	return &Object{conn, dest, path}
-}
-
-// outWorker runs in an own goroutine, encoding and sending messages that are
-// sent to conn.out.
-func (conn *Conn) outWorker() {
-	for msg := range conn.out {
-		err := conn.SendMessage(msg)
-		conn.callsLck.RLock()
-		if err != nil {
-			if c := conn.calls[msg.serial]; c != nil {
-				c.Err = err
-				c.Done <- c
-			}
-			conn.serialLck.Lock()
-			delete(conn.serialUsed, msg.serial)
-			conn.serialLck.Unlock()
-		} else if msg.Type != TypeMethodCall {
-			conn.serialLck.Lock()
-			delete(conn.serialUsed, msg.serial)
-			conn.serialLck.Unlock()
-		}
-		conn.callsLck.RUnlock()
-	}
-}
-
-// Send sends the given message to the message bus. You usually don't need to
-// use this; use the higher-level equivalents (Call / Go, Emit and Export)
-// instead. If msg is a method call and NoReplyExpected is not set, a non-nil
-// call is returned and the same value is sent to ch (which must be buffered)
-// once the call is complete. Otherwise, ch is ignored and a Call structure is
-// returned of which only the Err member is valid.
-func (conn *Conn) Send(msg *Message, ch chan *Call) *Call {
-	var call *Call
-
-	msg.serial = conn.getSerial()
-	if msg.Type == TypeMethodCall && msg.Flags&FlagNoReplyExpected == 0 {
-		if ch == nil {
-			ch = make(chan *Call, 5)
-		} else if cap(ch) == 0 {
-			panic("dbus: unbuffered channel passed to (*Conn).Send")
-		}
-		call = new(Call)
-		call.Destination, _ = msg.Headers[FieldDestination].value.(string)
-		call.Path, _ = msg.Headers[FieldPath].value.(ObjectPath)
-		iface, _ := msg.Headers[FieldInterface].value.(string)
-		member, _ := msg.Headers[FieldMember].value.(string)
-		call.Method = iface + "." + member
-		call.Args = msg.Body
-		call.Done = ch
-		conn.callsLck.Lock()
-		conn.calls[msg.serial] = call
-		conn.callsLck.Unlock()
-		conn.outLck.RLock()
-		if conn.closed {
-			call.Err = ErrClosed
-			call.Done <- call
-		} else {
-			conn.out <- msg
-		}
-		conn.outLck.RUnlock()
-	} else {
-		conn.outLck.RLock()
-		if conn.closed {
-			call = &Call{Err: ErrClosed}
-		} else {
-			conn.out <- msg
-			call = &Call{Err: nil}
-		}
-		conn.outLck.RUnlock()
-	}
-	return call
-}
-
-// sendError creates an error message corresponding to the parameters and sends
-// it to conn.out.
-func (conn *Conn) sendError(e Error, dest string, serial uint32) {
-	msg := new(Message)
-	msg.Type = TypeError
-	msg.serial = conn.getSerial()
-	msg.Headers = make(map[HeaderField]Variant)
-	if dest != "" {
-		msg.Headers[FieldDestination] = MakeVariant(dest)
-	}
-	msg.Headers[FieldErrorName] = MakeVariant(e.Name)
-	msg.Headers[FieldReplySerial] = MakeVariant(serial)
-	msg.Body = e.Body
-	if len(e.Body) > 0 {
-		msg.Headers[FieldSignature] = MakeVariant(SignatureOf(e.Body...))
-	}
-	conn.outLck.RLock()
-	if !conn.closed {
-		conn.out <- msg
-	}
-	conn.outLck.RUnlock()
-}
-
-// sendReply creates a method reply message corresponding to the parameters and
-// sends it to conn.out.
-func (conn *Conn) sendReply(dest string, serial uint32, values ...interface{}) {
-	msg := new(Message)
-	msg.Type = TypeMethodReply
-	msg.serial = conn.getSerial()
-	msg.Headers = make(map[HeaderField]Variant)
-	if dest != "" {
-		msg.Headers[FieldDestination] = MakeVariant(dest)
-	}
-	msg.Headers[FieldReplySerial] = MakeVariant(serial)
-	msg.Body = values
-	if len(values) > 0 {
-		msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
-	}
-	conn.outLck.RLock()
-	if !conn.closed {
-		conn.out <- msg
-	}
-	conn.outLck.RUnlock()
-}
-
-// Signal registers the given channel to be passed all received signal messages.
-// The caller has to make sure that ch is sufficiently buffered; if a message
-// arrives when a write to c is not possible, it is discarded.
-//
-// Multiple of these channels can be registered at the same time. Passing a
-// channel that already is registered will remove it from the list of the
-// registered channels.
-//
-// These channels are "overwritten" by Eavesdrop; i.e., if there currently is a
-// channel for eavesdropped messages, this channel receives all signals, and
-// none of the channels passed to Signal will receive any signals.
-func (conn *Conn) Signal(ch chan<- *Signal) {
-	conn.signalsLck.Lock()
-	conn.signals = append(conn.signals, ch)
-	conn.signalsLck.Unlock()
-}
-
-// SupportsUnixFDs returns whether the underlying transport supports passing of
-// unix file descriptors. If this is false, method calls containing unix file
-// descriptors will return an error and emitted signals containing them will
-// not be sent.
-func (conn *Conn) SupportsUnixFDs() bool {
-	return conn.unixFD
-}
-
-// Error represents a D-Bus message of type Error.
-type Error struct {
-	Name string
-	Body []interface{}
-}
-
-func NewError(name string, body []interface{}) *Error {
-	return &Error{name, body}
-}
-
-func (e Error) Error() string {
-	if len(e.Body) >= 1 {
-		s, ok := e.Body[0].(string)
-		if ok {
-			return s
-		}
-	}
-	return e.Name
-}
-
-// Signal represents a D-Bus message of type Signal. The name member is given in
-// "interface.member" notation, e.g. org.freedesktop.D-Bus.NameLost.
-type Signal struct {
-	Sender string
-	Path   ObjectPath
-	Name   string
-	Body   []interface{}
-}
-
-// transport is a D-Bus transport.
-type transport interface {
-	// Read and Write raw data (for example, for the authentication protocol).
-	io.ReadWriteCloser
-
-	// Send the initial null byte used for the EXTERNAL mechanism.
-	SendNullByte() error
-
-	// Returns whether this transport supports passing Unix FDs.
-	SupportsUnixFDs() bool
-
-	// Signal the transport that Unix FD passing is enabled for this connection.
-	EnableUnixFDs()
-
-	// Read / send a message, handling things like Unix FDs.
-	ReadMessage() (*Message, error)
-	SendMessage(*Message) error
-}
-
-var (
-	transports = make(map[string]func(string) (transport, error))
-)
-
-func getTransport(address string) (transport, error) {
-	var err error
-	var t transport
-
-	addresses := strings.Split(address, ";")
-	for _, v := range addresses {
-		i := strings.IndexRune(v, ':')
-		if i == -1 {
-			err = errors.New("dbus: invalid bus address (no transport)")
-			continue
-		}
-		f := transports[v[:i]]
-		if f == nil {
-			err = errors.New("dbus: invalid bus address (invalid or unsupported transport)")
-			continue
-		}
-		t, err = f(v[i+1:])
-		if err == nil {
-			return t, nil
-		}
-	}
-	return nil, err
-}
-
-// dereferenceAll returns a slice that, assuming that vs is a slice of pointers
-// of arbitrary types, containes the values that are obtained from dereferencing
-// all elements in vs.
-func dereferenceAll(vs []interface{}) []interface{} {
-	for i := range vs {
-		v := reflect.ValueOf(vs[i])
-		v = v.Elem()
-		vs[i] = v.Interface()
-	}
-	return vs
-}
-
-// getKey gets a key from a the list of keys. Returns "" on error / not found...
-func getKey(s, key string) string {
-	i := strings.Index(s, key)
-	if i == -1 {
-		return ""
-	}
-	if i+len(key)+1 >= len(s) || s[i+len(key)] != '=' {
-		return ""
-	}
-	j := strings.Index(s, ",")
-	if j == -1 {
-		j = len(s)
-	}
-	return s[i+len(key)+1 : j]
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/conn_darwin.go b/Godeps/_workspace/src/github.com/godbus/dbus/conn_darwin.go
deleted file mode 100644
index b67bb1b81d..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/conn_darwin.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package dbus
-
-import (
-	"errors"
-	"os/exec"
-)
-
-func sessionBusPlatform() (*Conn, error) {
-	cmd := exec.Command("launchctl", "getenv", "DBUS_LAUNCHD_SESSION_BUS_SOCKET")
-	b, err := cmd.CombinedOutput()
-
-	if err != nil {
-		return nil, err
-	}
-
-	if len(b) == 0 {
-		return nil, errors.New("dbus: couldn't determine address of session bus")
-	}
-
-	return Dial("unix:path=" + string(b[:len(b)-1]))
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/conn_other.go b/Godeps/_workspace/src/github.com/godbus/dbus/conn_other.go
deleted file mode 100644
index f74b8758d4..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/conn_other.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// +build !darwin
-
-package dbus
-
-import (
-	"bytes"
-	"errors"
-	"os/exec"
-)
-
-func sessionBusPlatform() (*Conn, error) {
-	cmd := exec.Command("dbus-launch")
-	b, err := cmd.CombinedOutput()
-
-	if err != nil {
-		return nil, err
-	}
-
-	i := bytes.IndexByte(b, '=')
-	j := bytes.IndexByte(b, '\n')
-
-	if i == -1 || j == -1 {
-		return nil, errors.New("dbus: couldn't determine address of session bus")
-	}
-
-	return Dial(string(b[i+1 : j]))
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/dbus.go b/Godeps/_workspace/src/github.com/godbus/dbus/dbus.go
deleted file mode 100644
index 2ce68735cd..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/dbus.go
+++ /dev/null
@@ -1,258 +0,0 @@
-package dbus
-
-import (
-	"errors"
-	"reflect"
-	"strings"
-)
-
-var (
-	byteType        = reflect.TypeOf(byte(0))
-	boolType        = reflect.TypeOf(false)
-	uint8Type       = reflect.TypeOf(uint8(0))
-	int16Type       = reflect.TypeOf(int16(0))
-	uint16Type      = reflect.TypeOf(uint16(0))
-	int32Type       = reflect.TypeOf(int32(0))
-	uint32Type      = reflect.TypeOf(uint32(0))
-	int64Type       = reflect.TypeOf(int64(0))
-	uint64Type      = reflect.TypeOf(uint64(0))
-	float64Type     = reflect.TypeOf(float64(0))
-	stringType      = reflect.TypeOf("")
-	signatureType   = reflect.TypeOf(Signature{""})
-	objectPathType  = reflect.TypeOf(ObjectPath(""))
-	variantType     = reflect.TypeOf(Variant{Signature{""}, nil})
-	interfacesType  = reflect.TypeOf([]interface{}{})
-	unixFDType      = reflect.TypeOf(UnixFD(0))
-	unixFDIndexType = reflect.TypeOf(UnixFDIndex(0))
-)
-
-// An InvalidTypeError signals that a value which cannot be represented in the
-// D-Bus wire format was passed to a function.
-type InvalidTypeError struct {
-	Type reflect.Type
-}
-
-func (e InvalidTypeError) Error() string {
-	return "dbus: invalid type " + e.Type.String()
-}
-
-// Store copies the values contained in src to dest, which must be a slice of
-// pointers. It converts slices of interfaces from src to corresponding structs
-// in dest. An error is returned if the lengths of src and dest or the types of
-// their elements don't match.
-func Store(src []interface{}, dest ...interface{}) error {
-	if len(src) != len(dest) {
-		return errors.New("dbus.Store: length mismatch")
-	}
-
-	for i := range src {
-		if err := store(src[i], dest[i]); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func store(src, dest interface{}) error {
-	if reflect.TypeOf(dest).Elem() == reflect.TypeOf(src) {
-		reflect.ValueOf(dest).Elem().Set(reflect.ValueOf(src))
-		return nil
-	} else if hasStruct(dest) {
-		rv := reflect.ValueOf(dest).Elem()
-		switch rv.Kind() {
-		case reflect.Struct:
-			vs, ok := src.([]interface{})
-			if !ok {
-				return errors.New("dbus.Store: type mismatch")
-			}
-			t := rv.Type()
-			ndest := make([]interface{}, 0, rv.NumField())
-			for i := 0; i < rv.NumField(); i++ {
-				field := t.Field(i)
-				if field.PkgPath == "" && field.Tag.Get("dbus") != "-" {
-					ndest = append(ndest, rv.Field(i).Addr().Interface())
-				}
-			}
-			if len(vs) != len(ndest) {
-				return errors.New("dbus.Store: type mismatch")
-			}
-			err := Store(vs, ndest...)
-			if err != nil {
-				return errors.New("dbus.Store: type mismatch")
-			}
-		case reflect.Slice:
-			sv := reflect.ValueOf(src)
-			if sv.Kind() != reflect.Slice {
-				return errors.New("dbus.Store: type mismatch")
-			}
-			rv.Set(reflect.MakeSlice(rv.Type(), sv.Len(), sv.Len()))
-			for i := 0; i < sv.Len(); i++ {
-				if err := store(sv.Index(i).Interface(), rv.Index(i).Addr().Interface()); err != nil {
-					return err
-				}
-			}
-		case reflect.Map:
-			sv := reflect.ValueOf(src)
-			if sv.Kind() != reflect.Map {
-				return errors.New("dbus.Store: type mismatch")
-			}
-			keys := sv.MapKeys()
-			rv.Set(reflect.MakeMap(sv.Type()))
-			for _, key := range keys {
-				v := reflect.New(sv.Type().Elem())
-				if err := store(v, sv.MapIndex(key).Interface()); err != nil {
-					return err
-				}
-				rv.SetMapIndex(key, v.Elem())
-			}
-		default:
-			return errors.New("dbus.Store: type mismatch")
-		}
-		return nil
-	} else {
-		return errors.New("dbus.Store: type mismatch")
-	}
-}
-
-func hasStruct(v interface{}) bool {
-	t := reflect.TypeOf(v)
-	for {
-		switch t.Kind() {
-		case reflect.Struct:
-			return true
-		case reflect.Slice, reflect.Ptr, reflect.Map:
-			t = t.Elem()
-		default:
-			return false
-		}
-	}
-}
-
-// An ObjectPath is an object path as defined by the D-Bus spec.
-type ObjectPath string
-
-// IsValid returns whether the object path is valid.
-func (o ObjectPath) IsValid() bool {
-	s := string(o)
-	if len(s) == 0 {
-		return false
-	}
-	if s[0] != '/' {
-		return false
-	}
-	if s[len(s)-1] == '/' && len(s) != 1 {
-		return false
-	}
-	// probably not used, but technically possible
-	if s == "/" {
-		return true
-	}
-	split := strings.Split(s[1:], "/")
-	for _, v := range split {
-		if len(v) == 0 {
-			return false
-		}
-		for _, c := range v {
-			if !isMemberChar(c) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// A UnixFD is a Unix file descriptor sent over the wire. See the package-level
-// documentation for more information about Unix file descriptor passsing.
-type UnixFD int32
-
-// A UnixFDIndex is the representation of a Unix file descriptor in a message.
-type UnixFDIndex uint32
-
-// alignment returns the alignment of values of type t.
-func alignment(t reflect.Type) int {
-	switch t {
-	case variantType:
-		return 1
-	case objectPathType:
-		return 4
-	case signatureType:
-		return 1
-	case interfacesType: // sometimes used for structs
-		return 8
-	}
-	switch t.Kind() {
-	case reflect.Uint8:
-		return 1
-	case reflect.Uint16, reflect.Int16:
-		return 2
-	case reflect.Uint32, reflect.Int32, reflect.String, reflect.Array, reflect.Slice, reflect.Map:
-		return 4
-	case reflect.Uint64, reflect.Int64, reflect.Float64, reflect.Struct:
-		return 8
-	case reflect.Ptr:
-		return alignment(t.Elem())
-	}
-	return 1
-}
-
-// isKeyType returns whether t is a valid type for a D-Bus dict.
-func isKeyType(t reflect.Type) bool {
-	switch t.Kind() {
-	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
-		reflect.Int16, reflect.Int32, reflect.Int64, reflect.Float64,
-		reflect.String:
-
-		return true
-	}
-	return false
-}
-
-// isValidInterface returns whether s is a valid name for an interface.
-func isValidInterface(s string) bool {
-	if len(s) == 0 || len(s) > 255 || s[0] == '.' {
-		return false
-	}
-	elem := strings.Split(s, ".")
-	if len(elem) < 2 {
-		return false
-	}
-	for _, v := range elem {
-		if len(v) == 0 {
-			return false
-		}
-		if v[0] >= '0' && v[0] <= '9' {
-			return false
-		}
-		for _, c := range v {
-			if !isMemberChar(c) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// isValidMember returns whether s is a valid name for a member.
-func isValidMember(s string) bool {
-	if len(s) == 0 || len(s) > 255 {
-		return false
-	}
-	i := strings.Index(s, ".")
-	if i != -1 {
-		return false
-	}
-	if s[0] >= '0' && s[0] <= '9' {
-		return false
-	}
-	for _, c := range s {
-		if !isMemberChar(c) {
-			return false
-		}
-	}
-	return true
-}
-
-func isMemberChar(c rune) bool {
-	return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') ||
-		(c >= 'a' && c <= 'z') || c == '_'
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/decoder.go b/Godeps/_workspace/src/github.com/godbus/dbus/decoder.go
deleted file mode 100644
index ef50dcab98..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/decoder.go
+++ /dev/null
@@ -1,228 +0,0 @@
-package dbus
-
-import (
-	"encoding/binary"
-	"io"
-	"reflect"
-)
-
-type decoder struct {
-	in    io.Reader
-	order binary.ByteOrder
-	pos   int
-}
-
-// newDecoder returns a new decoder that reads values from in. The input is
-// expected to be in the given byte order.
-func newDecoder(in io.Reader, order binary.ByteOrder) *decoder {
-	dec := new(decoder)
-	dec.in = in
-	dec.order = order
-	return dec
-}
-
-// align aligns the input to the given boundary and panics on error.
-func (dec *decoder) align(n int) {
-	if dec.pos%n != 0 {
-		newpos := (dec.pos + n - 1) & ^(n - 1)
-		empty := make([]byte, newpos-dec.pos)
-		if _, err := io.ReadFull(dec.in, empty); err != nil {
-			panic(err)
-		}
-		dec.pos = newpos
-	}
-}
-
-// Calls binary.Read(dec.in, dec.order, v) and panics on read errors.
-func (dec *decoder) binread(v interface{}) {
-	if err := binary.Read(dec.in, dec.order, v); err != nil {
-		panic(err)
-	}
-}
-
-func (dec *decoder) Decode(sig Signature) (vs []interface{}, err error) {
-	defer func() {
-		var ok bool
-		v := recover()
-		if err, ok = v.(error); ok {
-			if err == io.EOF || err == io.ErrUnexpectedEOF {
-				err = FormatError("unexpected EOF")
-			}
-		}
-	}()
-	vs = make([]interface{}, 0)
-	s := sig.str
-	for s != "" {
-		err, rem := validSingle(s, 0)
-		if err != nil {
-			return nil, err
-		}
-		v := dec.decode(s[:len(s)-len(rem)], 0)
-		vs = append(vs, v)
-		s = rem
-	}
-	return vs, nil
-}
-
-func (dec *decoder) decode(s string, depth int) interface{} {
-	dec.align(alignment(typeFor(s)))
-	switch s[0] {
-	case 'y':
-		var b [1]byte
-		if _, err := dec.in.Read(b[:]); err != nil {
-			panic(err)
-		}
-		dec.pos++
-		return b[0]
-	case 'b':
-		i := dec.decode("u", depth).(uint32)
-		switch {
-		case i == 0:
-			return false
-		case i == 1:
-			return true
-		default:
-			panic(FormatError("invalid value for boolean"))
-		}
-	case 'n':
-		var i int16
-		dec.binread(&i)
-		dec.pos += 2
-		return i
-	case 'i':
-		var i int32
-		dec.binread(&i)
-		dec.pos += 4
-		return i
-	case 'x':
-		var i int64
-		dec.binread(&i)
-		dec.pos += 8
-		return i
-	case 'q':
-		var i uint16
-		dec.binread(&i)
-		dec.pos += 2
-		return i
-	case 'u':
-		var i uint32
-		dec.binread(&i)
-		dec.pos += 4
-		return i
-	case 't':
-		var i uint64
-		dec.binread(&i)
-		dec.pos += 8
-		return i
-	case 'd':
-		var f float64
-		dec.binread(&f)
-		dec.pos += 8
-		return f
-	case 's':
-		length := dec.decode("u", depth).(uint32)
-		b := make([]byte, int(length)+1)
-		if _, err := io.ReadFull(dec.in, b); err != nil {
-			panic(err)
-		}
-		dec.pos += int(length) + 1
-		return string(b[:len(b)-1])
-	case 'o':
-		return ObjectPath(dec.decode("s", depth).(string))
-	case 'g':
-		length := dec.decode("y", depth).(byte)
-		b := make([]byte, int(length)+1)
-		if _, err := io.ReadFull(dec.in, b); err != nil {
-			panic(err)
-		}
-		dec.pos += int(length) + 1
-		sig, err := ParseSignature(string(b[:len(b)-1]))
-		if err != nil {
-			panic(err)
-		}
-		return sig
-	case 'v':
-		if depth >= 64 {
-			panic(FormatError("input exceeds container depth limit"))
-		}
-		var variant Variant
-		sig := dec.decode("g", depth).(Signature)
-		if len(sig.str) == 0 {
-			panic(FormatError("variant signature is empty"))
-		}
-		err, rem := validSingle(sig.str, 0)
-		if err != nil {
-			panic(err)
-		}
-		if rem != "" {
-			panic(FormatError("variant signature has multiple types"))
-		}
-		variant.sig = sig
-		variant.value = dec.decode(sig.str, depth+1)
-		return variant
-	case 'h':
-		return UnixFDIndex(dec.decode("u", depth).(uint32))
-	case 'a':
-		if len(s) > 1 && s[1] == '{' {
-			ksig := s[2:3]
-			vsig := s[3 : len(s)-1]
-			v := reflect.MakeMap(reflect.MapOf(typeFor(ksig), typeFor(vsig)))
-			if depth >= 63 {
-				panic(FormatError("input exceeds container depth limit"))
-			}
-			length := dec.decode("u", depth).(uint32)
-			// Even for empty maps, the correct padding must be included
-			dec.align(8)
-			spos := dec.pos
-			for dec.pos < spos+int(length) {
-				dec.align(8)
-				if !isKeyType(v.Type().Key()) {
-					panic(InvalidTypeError{v.Type()})
-				}
-				kv := dec.decode(ksig, depth+2)
-				vv := dec.decode(vsig, depth+2)
-				v.SetMapIndex(reflect.ValueOf(kv), reflect.ValueOf(vv))
-			}
-			return v.Interface()
-		}
-		if depth >= 64 {
-			panic(FormatError("input exceeds container depth limit"))
-		}
-		length := dec.decode("u", depth).(uint32)
-		v := reflect.MakeSlice(reflect.SliceOf(typeFor(s[1:])), 0, int(length))
-		// Even for empty arrays, the correct padding must be included
-		dec.align(alignment(typeFor(s[1:])))
-		spos := dec.pos
-		for dec.pos < spos+int(length) {
-			ev := dec.decode(s[1:], depth+1)
-			v = reflect.Append(v, reflect.ValueOf(ev))
-		}
-		return v.Interface()
-	case '(':
-		if depth >= 64 {
-			panic(FormatError("input exceeds container depth limit"))
-		}
-		dec.align(8)
-		v := make([]interface{}, 0)
-		s = s[1 : len(s)-1]
-		for s != "" {
-			err, rem := validSingle(s, 0)
-			if err != nil {
-				panic(err)
-			}
-			ev := dec.decode(s[:len(s)-len(rem)], depth+1)
-			v = append(v, ev)
-			s = rem
-		}
-		return v
-	default:
-		panic(SignatureError{Sig: s})
-	}
-}
-
-// A FormatError is an error in the wire format.
-type FormatError string
-
-func (e FormatError) Error() string {
-	return "dbus: wire format error: " + string(e)
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/doc.go b/Godeps/_workspace/src/github.com/godbus/dbus/doc.go
deleted file mode 100644
index deff554a38..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/doc.go
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Package dbus implements bindings to the D-Bus message bus system.
-
-To use the message bus API, you first need to connect to a bus (usually the
-session or system bus). The acquired connection then can be used to call methods
-on remote objects and emit or receive signals. Using the Export method, you can
-arrange D-Bus methods calls to be directly translated to method calls on a Go
-value.
-
-Conversion Rules
-
-For outgoing messages, Go types are automatically converted to the
-corresponding D-Bus types. The following types are directly encoded as their
-respective D-Bus equivalents:
-
-     Go type     | D-Bus type
-     ------------+-----------
-     byte        | BYTE
-     bool        | BOOLEAN
-     int16       | INT16
-     uint16      | UINT16
-     int32       | INT32
-     uint32      | UINT32
-     int64       | INT64
-     uint64      | UINT64
-     float64     | DOUBLE
-     string      | STRING
-     ObjectPath  | OBJECT_PATH
-     Signature   | SIGNATURE
-     Variant     | VARIANT
-     UnixFDIndex | UNIX_FD
-
-Slices and arrays encode as ARRAYs of their element type.
-
-Maps encode as DICTs, provided that their key type can be used as a key for
-a DICT.
-
-Structs other than Variant and Signature encode as a STRUCT containing their
-exported fields. Fields whose tags contain `dbus:"-"` and unexported fields will
-be skipped.
-
-Pointers encode as the value they're pointed to.
-
-Trying to encode any other type or a slice, map or struct containing an
-unsupported type will result in an InvalidTypeError.
-
-For incoming messages, the inverse of these rules are used, with the exception
-of STRUCTs. Incoming STRUCTS are represented as a slice of empty interfaces
-containing the struct fields in the correct order. The Store function can be
-used to convert such values to Go structs.
-
-Unix FD passing
-
-Handling Unix file descriptors deserves special mention. To use them, you should
-first check that they are supported on a connection by calling SupportsUnixFDs.
-If it returns true, all method of Connection will translate messages containing
-UnixFD's to messages that are accompanied by the given file descriptors with the
-UnixFD values being substituted by the correct indices. Similarily, the indices
-of incoming messages are automatically resolved. It shouldn't be necessary to use
-UnixFDIndex.
-
-*/
-package dbus
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/encoder.go b/Godeps/_workspace/src/github.com/godbus/dbus/encoder.go
deleted file mode 100644
index 9f0a9e89ea..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/encoder.go
+++ /dev/null
@@ -1,208 +0,0 @@
-package dbus
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io"
-	"reflect"
-)
-
-// An encoder encodes values to the D-Bus wire format.
-type encoder struct {
-	out   io.Writer
-	order binary.ByteOrder
-	pos   int
-}
-
-// NewEncoder returns a new encoder that writes to out in the given byte order.
-func newEncoder(out io.Writer, order binary.ByteOrder) *encoder {
-	return newEncoderAtOffset(out, 0, order)
-}
-
-// newEncoderAtOffset returns a new encoder that writes to out in the given
-// byte order. Specify the offset to initialize pos for proper alignment
-// computation.
-func newEncoderAtOffset(out io.Writer, offset int, order binary.ByteOrder) *encoder {
-	enc := new(encoder)
-	enc.out = out
-	enc.order = order
-	enc.pos = offset
-	return enc
-}
-
-// Aligns the next output to be on a multiple of n. Panics on write errors.
-func (enc *encoder) align(n int) {
-	pad := enc.padding(0, n)
-	if pad > 0 {
-		empty := make([]byte, pad)
-		if _, err := enc.out.Write(empty); err != nil {
-			panic(err)
-		}
-		enc.pos += pad
-	}
-}
-
-// pad returns the number of bytes of padding, based on current position and additional offset.
-// and alignment.
-func (enc *encoder) padding(offset, algn int) int {
-	abs := enc.pos + offset
-	if abs%algn != 0 {
-		newabs := (abs + algn - 1) & ^(algn - 1)
-		return newabs - abs
-	}
-	return 0
-}
-
-// Calls binary.Write(enc.out, enc.order, v) and panics on write errors.
-func (enc *encoder) binwrite(v interface{}) {
-	if err := binary.Write(enc.out, enc.order, v); err != nil {
-		panic(err)
-	}
-}
-
-// Encode encodes the given values to the underyling reader. All written values
-// are aligned properly as required by the D-Bus spec.
-func (enc *encoder) Encode(vs ...interface{}) (err error) {
-	defer func() {
-		err, _ = recover().(error)
-	}()
-	for _, v := range vs {
-		enc.encode(reflect.ValueOf(v), 0)
-	}
-	return nil
-}
-
-// encode encodes the given value to the writer and panics on error. depth holds
-// the depth of the container nesting.
-func (enc *encoder) encode(v reflect.Value, depth int) {
-	enc.align(alignment(v.Type()))
-	switch v.Kind() {
-	case reflect.Uint8:
-		var b [1]byte
-		b[0] = byte(v.Uint())
-		if _, err := enc.out.Write(b[:]); err != nil {
-			panic(err)
-		}
-		enc.pos++
-	case reflect.Bool:
-		if v.Bool() {
-			enc.encode(reflect.ValueOf(uint32(1)), depth)
-		} else {
-			enc.encode(reflect.ValueOf(uint32(0)), depth)
-		}
-	case reflect.Int16:
-		enc.binwrite(int16(v.Int()))
-		enc.pos += 2
-	case reflect.Uint16:
-		enc.binwrite(uint16(v.Uint()))
-		enc.pos += 2
-	case reflect.Int32:
-		enc.binwrite(int32(v.Int()))
-		enc.pos += 4
-	case reflect.Uint32:
-		enc.binwrite(uint32(v.Uint()))
-		enc.pos += 4
-	case reflect.Int64:
-		enc.binwrite(v.Int())
-		enc.pos += 8
-	case reflect.Uint64:
-		enc.binwrite(v.Uint())
-		enc.pos += 8
-	case reflect.Float64:
-		enc.binwrite(v.Float())
-		enc.pos += 8
-	case reflect.String:
-		enc.encode(reflect.ValueOf(uint32(len(v.String()))), depth)
-		b := make([]byte, v.Len()+1)
-		copy(b, v.String())
-		b[len(b)-1] = 0
-		n, err := enc.out.Write(b)
-		if err != nil {
-			panic(err)
-		}
-		enc.pos += n
-	case reflect.Ptr:
-		enc.encode(v.Elem(), depth)
-	case reflect.Slice, reflect.Array:
-		if depth >= 64 {
-			panic(FormatError("input exceeds container depth limit"))
-		}
-		// Lookahead offset: 4 bytes for uint32 length (with alignment),
-		// plus alignment for elements.
-		n := enc.padding(0, 4) + 4
-		offset := enc.pos + n + enc.padding(n, alignment(v.Type().Elem()))
-
-		var buf bytes.Buffer
-		bufenc := newEncoderAtOffset(&buf, offset, enc.order)
-
-		for i := 0; i < v.Len(); i++ {
-			bufenc.encode(v.Index(i), depth+1)
-		}
-		enc.encode(reflect.ValueOf(uint32(buf.Len())), depth)
-		length := buf.Len()
-		enc.align(alignment(v.Type().Elem()))
-		if _, err := buf.WriteTo(enc.out); err != nil {
-			panic(err)
-		}
-		enc.pos += length
-	case reflect.Struct:
-		if depth >= 64 && v.Type() != signatureType {
-			panic(FormatError("input exceeds container depth limit"))
-		}
-		switch t := v.Type(); t {
-		case signatureType:
-			str := v.Field(0)
-			enc.encode(reflect.ValueOf(byte(str.Len())), depth+1)
-			b := make([]byte, str.Len()+1)
-			copy(b, str.String())
-			b[len(b)-1] = 0
-			n, err := enc.out.Write(b)
-			if err != nil {
-				panic(err)
-			}
-			enc.pos += n
-		case variantType:
-			variant := v.Interface().(Variant)
-			enc.encode(reflect.ValueOf(variant.sig), depth+1)
-			enc.encode(reflect.ValueOf(variant.value), depth+1)
-		default:
-			for i := 0; i < v.Type().NumField(); i++ {
-				field := t.Field(i)
-				if field.PkgPath == "" && field.Tag.Get("dbus") != "-" {
-					enc.encode(v.Field(i), depth+1)
-				}
-			}
-		}
-	case reflect.Map:
-		// Maps are arrays of structures, so they actually increase the depth by
-		// 2.
-		if depth >= 63 {
-			panic(FormatError("input exceeds container depth limit"))
-		}
-		if !isKeyType(v.Type().Key()) {
-			panic(InvalidTypeError{v.Type()})
-		}
-		keys := v.MapKeys()
-		// Lookahead offset: 4 bytes for uint32 length (with alignment),
-		// plus 8-byte alignment
-		n := enc.padding(0, 4) + 4
-		offset := enc.pos + n + enc.padding(n, 8)
-
-		var buf bytes.Buffer
-		bufenc := newEncoderAtOffset(&buf, offset, enc.order)
-		for _, k := range keys {
-			bufenc.align(8)
-			bufenc.encode(k, depth+2)
-			bufenc.encode(v.MapIndex(k), depth+2)
-		}
-		enc.encode(reflect.ValueOf(uint32(buf.Len())), depth)
-		length := buf.Len()
-		enc.align(8)
-		if _, err := buf.WriteTo(enc.out); err != nil {
-			panic(err)
-		}
-		enc.pos += length
-	default:
-		panic(InvalidTypeError{v.Type()})
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/export.go b/Godeps/_workspace/src/github.com/godbus/dbus/export.go
deleted file mode 100644
index c6440a7416..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/export.go
+++ /dev/null
@@ -1,411 +0,0 @@
-package dbus
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-var (
-	errmsgInvalidArg = Error{
-		"org.freedesktop.DBus.Error.InvalidArgs",
-		[]interface{}{"Invalid type / number of args"},
-	}
-	errmsgNoObject = Error{
-		"org.freedesktop.DBus.Error.NoSuchObject",
-		[]interface{}{"No such object"},
-	}
-	errmsgUnknownMethod = Error{
-		"org.freedesktop.DBus.Error.UnknownMethod",
-		[]interface{}{"Unknown / invalid method"},
-	}
-)
-
-// exportWithMapping represents an exported struct along with a method name
-// mapping to allow for exporting lower-case methods, etc.
-type exportWithMapping struct {
-	export interface{}
-
-	// Method name mapping; key -> struct method, value -> dbus method.
-	mapping map[string]string
-
-	// Whether or not this export is for the entire subtree
-	includeSubtree bool
-}
-
-// Sender is a type which can be used in exported methods to receive the message
-// sender.
-type Sender string
-
-func exportedMethod(export exportWithMapping, name string) reflect.Value {
-	if export.export == nil {
-		return reflect.Value{}
-	}
-
-	// If a mapping was included in the export, check the map to see if we
-	// should be looking for a different method in the export.
-	if export.mapping != nil {
-		for key, value := range export.mapping {
-			if value == name {
-				name = key
-				break
-			}
-
-			// Catch the case where a method is aliased but the client is calling
-			// the original, e.g. the "Foo" method was exported mapped to
-			// "foo," and dbus client called the original "Foo."
-			if key == name {
-				return reflect.Value{}
-			}
-		}
-	}
-
-	value := reflect.ValueOf(export.export)
-	m := value.MethodByName(name)
-
-	// Catch the case of attempting to call an unexported method
-	method, ok := value.Type().MethodByName(name)
-
-	if !m.IsValid() || !ok || method.PkgPath != "" {
-		return reflect.Value{}
-	}
-	t := m.Type()
-	if t.NumOut() == 0 ||
-		t.Out(t.NumOut()-1) != reflect.TypeOf(&errmsgInvalidArg) {
-
-		return reflect.Value{}
-	}
-	return m
-}
-
-// searchHandlers will look through all registered handlers looking for one
-// to handle the given path. If a verbatim one isn't found, it will check for
-// a subtree registration for the path as well.
-func (conn *Conn) searchHandlers(path ObjectPath) (map[string]exportWithMapping, bool) {
-	conn.handlersLck.RLock()
-	defer conn.handlersLck.RUnlock()
-
-	handlers, ok := conn.handlers[path]
-	if ok {
-		return handlers, ok
-	}
-
-	// If handlers weren't found for this exact path, look for a matching subtree
-	// registration
-	handlers = make(map[string]exportWithMapping)
-	path = path[:strings.LastIndex(string(path), "/")]
-	for len(path) > 0 {
-		var subtreeHandlers map[string]exportWithMapping
-		subtreeHandlers, ok = conn.handlers[path]
-		if ok {
-			for iface, handler := range subtreeHandlers {
-				// Only include this handler if it registered for the subtree
-				if handler.includeSubtree {
-					handlers[iface] = handler
-				}
-			}
-
-			break
-		}
-
-		path = path[:strings.LastIndex(string(path), "/")]
-	}
-
-	return handlers, ok
-}
-
-// handleCall handles the given method call (i.e. looks if it's one of the
-// pre-implemented ones and searches for a corresponding handler if not).
-func (conn *Conn) handleCall(msg *Message) {
-	name := msg.Headers[FieldMember].value.(string)
-	path := msg.Headers[FieldPath].value.(ObjectPath)
-	ifaceName, hasIface := msg.Headers[FieldInterface].value.(string)
-	sender, hasSender := msg.Headers[FieldSender].value.(string)
-	serial := msg.serial
-	if ifaceName == "org.freedesktop.DBus.Peer" {
-		switch name {
-		case "Ping":
-			conn.sendReply(sender, serial)
-		case "GetMachineId":
-			conn.sendReply(sender, serial, conn.uuid)
-		default:
-			conn.sendError(errmsgUnknownMethod, sender, serial)
-		}
-		return
-	}
-	if len(name) == 0 {
-		conn.sendError(errmsgUnknownMethod, sender, serial)
-	}
-
-	// Find the exported handler (if any) for this path
-	handlers, ok := conn.searchHandlers(path)
-	if !ok {
-		conn.sendError(errmsgNoObject, sender, serial)
-		return
-	}
-
-	var m reflect.Value
-	if hasIface {
-		iface := handlers[ifaceName]
-		m = exportedMethod(iface, name)
-	} else {
-		for _, v := range handlers {
-			m = exportedMethod(v, name)
-			if m.IsValid() {
-				break
-			}
-		}
-	}
-
-	if !m.IsValid() {
-		conn.sendError(errmsgUnknownMethod, sender, serial)
-		return
-	}
-
-	t := m.Type()
-	vs := msg.Body
-	pointers := make([]interface{}, t.NumIn())
-	decode := make([]interface{}, 0, len(vs))
-	for i := 0; i < t.NumIn(); i++ {
-		tp := t.In(i)
-		val := reflect.New(tp)
-		pointers[i] = val.Interface()
-		if tp == reflect.TypeOf((*Sender)(nil)).Elem() {
-			val.Elem().SetString(sender)
-		} else if tp == reflect.TypeOf((*Message)(nil)).Elem() {
-			val.Elem().Set(reflect.ValueOf(*msg))
-		} else {
-			decode = append(decode, pointers[i])
-		}
-	}
-
-	if len(decode) != len(vs) {
-		conn.sendError(errmsgInvalidArg, sender, serial)
-		return
-	}
-
-	if err := Store(vs, decode...); err != nil {
-		conn.sendError(errmsgInvalidArg, sender, serial)
-		return
-	}
-
-	// Extract parameters
-	params := make([]reflect.Value, len(pointers))
-	for i := 0; i < len(pointers); i++ {
-		params[i] = reflect.ValueOf(pointers[i]).Elem()
-	}
-
-	// Call method
-	ret := m.Call(params)
-	if em := ret[t.NumOut()-1].Interface().(*Error); em != nil {
-		conn.sendError(*em, sender, serial)
-		return
-	}
-
-	if msg.Flags&FlagNoReplyExpected == 0 {
-		reply := new(Message)
-		reply.Type = TypeMethodReply
-		reply.serial = conn.getSerial()
-		reply.Headers = make(map[HeaderField]Variant)
-		if hasSender {
-			reply.Headers[FieldDestination] = msg.Headers[FieldSender]
-		}
-		reply.Headers[FieldReplySerial] = MakeVariant(msg.serial)
-		reply.Body = make([]interface{}, len(ret)-1)
-		for i := 0; i < len(ret)-1; i++ {
-			reply.Body[i] = ret[i].Interface()
-		}
-		if len(ret) != 1 {
-			reply.Headers[FieldSignature] = MakeVariant(SignatureOf(reply.Body...))
-		}
-		conn.outLck.RLock()
-		if !conn.closed {
-			conn.out <- reply
-		}
-		conn.outLck.RUnlock()
-	}
-}
-
-// Emit emits the given signal on the message bus. The name parameter must be
-// formatted as "interface.member", e.g., "org.freedesktop.DBus.NameLost".
-func (conn *Conn) Emit(path ObjectPath, name string, values ...interface{}) error {
-	if !path.IsValid() {
-		return errors.New("dbus: invalid object path")
-	}
-	i := strings.LastIndex(name, ".")
-	if i == -1 {
-		return errors.New("dbus: invalid method name")
-	}
-	iface := name[:i]
-	member := name[i+1:]
-	if !isValidMember(member) {
-		return errors.New("dbus: invalid method name")
-	}
-	if !isValidInterface(iface) {
-		return errors.New("dbus: invalid interface name")
-	}
-	msg := new(Message)
-	msg.Type = TypeSignal
-	msg.serial = conn.getSerial()
-	msg.Headers = make(map[HeaderField]Variant)
-	msg.Headers[FieldInterface] = MakeVariant(iface)
-	msg.Headers[FieldMember] = MakeVariant(member)
-	msg.Headers[FieldPath] = MakeVariant(path)
-	msg.Body = values
-	if len(values) > 0 {
-		msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
-	}
-	conn.outLck.RLock()
-	defer conn.outLck.RUnlock()
-	if conn.closed {
-		return ErrClosed
-	}
-	conn.out <- msg
-	return nil
-}
-
-// Export registers the given value to be exported as an object on the
-// message bus.
-//
-// If a method call on the given path and interface is received, an exported
-// method with the same name is called with v as the receiver if the
-// parameters match and the last return value is of type *Error. If this
-// *Error is not nil, it is sent back to the caller as an error.
-// Otherwise, a method reply is sent with the other return values as its body.
-//
-// Any parameters with the special type Sender are set to the sender of the
-// dbus message when the method is called. Parameters of this type do not
-// contribute to the dbus signature of the method (i.e. the method is exposed
-// as if the parameters of type Sender were not there).
-//
-// Similarly, any parameters with the type Message are set to the raw message
-// received on the bus. Again, parameters of this type do not contribute to the
-// dbus signature of the method.
-//
-// Every method call is executed in a new goroutine, so the method may be called
-// in multiple goroutines at once.
-//
-// Method calls on the interface org.freedesktop.DBus.Peer will be automatically
-// handled for every object.
-//
-// Passing nil as the first parameter will cause conn to cease handling calls on
-// the given combination of path and interface.
-//
-// Export returns an error if path is not a valid path name.
-func (conn *Conn) Export(v interface{}, path ObjectPath, iface string) error {
-	return conn.ExportWithMap(v, nil, path, iface)
-}
-
-// ExportWithMap works exactly like Export but provides the ability to remap
-// method names (e.g. export a lower-case method).
-//
-// The keys in the map are the real method names (exported on the struct), and
-// the values are the method names to be exported on DBus.
-func (conn *Conn) ExportWithMap(v interface{}, mapping map[string]string, path ObjectPath, iface string) error {
-	return conn.exportWithMap(v, mapping, path, iface, false)
-}
-
-// ExportSubtree works exactly like Export but registers the given value for
-// an entire subtree rather under the root path provided.
-//
-// In order to make this useful, one parameter in each of the value's exported
-// methods should be a Message, in which case it will contain the raw message
-// (allowing one to get access to the path that caused the method to be called).
-//
-// Note that more specific export paths take precedence over less specific. For
-// example, a method call using the ObjectPath /foo/bar/baz will call a method
-// exported on /foo/bar before a method exported on /foo.
-func (conn *Conn) ExportSubtree(v interface{}, path ObjectPath, iface string) error {
-	return conn.ExportSubtreeWithMap(v, nil, path, iface)
-}
-
-// ExportSubtreeWithMap works exactly like ExportSubtree but provides the
-// ability to remap method names (e.g. export a lower-case method).
-//
-// The keys in the map are the real method names (exported on the struct), and
-// the values are the method names to be exported on DBus.
-func (conn *Conn) ExportSubtreeWithMap(v interface{}, mapping map[string]string, path ObjectPath, iface string) error {
-	return conn.exportWithMap(v, mapping, path, iface, true)
-}
-
-// exportWithMap is the worker function for all exports/registrations.
-func (conn *Conn) exportWithMap(v interface{}, mapping map[string]string, path ObjectPath, iface string, includeSubtree bool) error {
-	if !path.IsValid() {
-		return fmt.Errorf(`dbus: Invalid path name: "%s"`, path)
-	}
-
-	conn.handlersLck.Lock()
-	defer conn.handlersLck.Unlock()
-
-	// Remove a previous export if the interface is nil
-	if v == nil {
-		if _, ok := conn.handlers[path]; ok {
-			delete(conn.handlers[path], iface)
-			if len(conn.handlers[path]) == 0 {
-				delete(conn.handlers, path)
-			}
-		}
-
-		return nil
-	}
-
-	// If this is the first handler for this path, make a new map to hold all
-	// handlers for this path.
-	if _, ok := conn.handlers[path]; !ok {
-		conn.handlers[path] = make(map[string]exportWithMapping)
-	}
-
-	// Finally, save this handler
-	conn.handlers[path][iface] = exportWithMapping{export: v, mapping: mapping, includeSubtree: includeSubtree}
-
-	return nil
-}
-
-// ReleaseName calls org.freedesktop.DBus.ReleaseName and awaits a response.
-func (conn *Conn) ReleaseName(name string) (ReleaseNameReply, error) {
-	var r uint32
-	err := conn.busObj.Call("org.freedesktop.DBus.ReleaseName", 0, name).Store(&r)
-	if err != nil {
-		return 0, err
-	}
-	return ReleaseNameReply(r), nil
-}
-
-// RequestName calls org.freedesktop.DBus.RequestName and awaits a response.
-func (conn *Conn) RequestName(name string, flags RequestNameFlags) (RequestNameReply, error) {
-	var r uint32
-	err := conn.busObj.Call("org.freedesktop.DBus.RequestName", 0, name, flags).Store(&r)
-	if err != nil {
-		return 0, err
-	}
-	return RequestNameReply(r), nil
-}
-
-// ReleaseNameReply is the reply to a ReleaseName call.
-type ReleaseNameReply uint32
-
-const (
-	ReleaseNameReplyReleased ReleaseNameReply = 1 + iota
-	ReleaseNameReplyNonExistent
-	ReleaseNameReplyNotOwner
-)
-
-// RequestNameFlags represents the possible flags for a RequestName call.
-type RequestNameFlags uint32
-
-const (
-	NameFlagAllowReplacement RequestNameFlags = 1 << iota
-	NameFlagReplaceExisting
-	NameFlagDoNotQueue
-)
-
-// RequestNameReply is the reply to a RequestName call.
-type RequestNameReply uint32
-
-const (
-	RequestNameReplyPrimaryOwner RequestNameReply = 1 + iota
-	RequestNameReplyInQueue
-	RequestNameReplyExists
-	RequestNameReplyAlreadyOwner
-)
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/homedir.go b/Godeps/_workspace/src/github.com/godbus/dbus/homedir.go
deleted file mode 100644
index 0b745f9313..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/homedir.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package dbus
-
-import (
-	"os"
-	"sync"
-)
-
-var (
-	homeDir     string
-	homeDirLock sync.Mutex
-)
-
-func getHomeDir() string {
-	homeDirLock.Lock()
-	defer homeDirLock.Unlock()
-
-	if homeDir != "" {
-		return homeDir
-	}
-
-	homeDir = os.Getenv("HOME")
-	if homeDir != "" {
-		return homeDir
-	}
-
-	homeDir = lookupHomeDir()
-	return homeDir
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/homedir_dynamic.go b/Godeps/_workspace/src/github.com/godbus/dbus/homedir_dynamic.go
deleted file mode 100644
index 2732081e73..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/homedir_dynamic.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build !static_build
-
-package dbus
-
-import (
-	"os/user"
-)
-
-func lookupHomeDir() string {
-	u, err := user.Current()
-	if err != nil {
-		return "/"
-	}
-	return u.HomeDir
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/homedir_static.go b/Godeps/_workspace/src/github.com/godbus/dbus/homedir_static.go
deleted file mode 100644
index b9d9cb5525..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/homedir_static.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build static_build
-
-package dbus
-
-import (
-	"bufio"
-	"os"
-	"strconv"
-	"strings"
-)
-
-func lookupHomeDir() string {
-	myUid := os.Getuid()
-
-	f, err := os.Open("/etc/passwd")
-	if err != nil {
-		return "/"
-	}
-	defer f.Close()
-
-	s := bufio.NewScanner(f)
-
-	for s.Scan() {
-		if err := s.Err(); err != nil {
-			break
-		}
-
-		line := strings.TrimSpace(s.Text())
-		if line == "" {
-			continue
-		}
-
-		parts := strings.Split(line, ":")
-
-		if len(parts) >= 6 {
-			uid, err := strconv.Atoi(parts[2])
-			if err == nil && uid == myUid {
-				return parts[5]
-			}
-		}
-	}
-
-	// Default to / if we can't get a better value
-	return "/"
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/introspect/call.go b/Godeps/_workspace/src/github.com/godbus/dbus/introspect/call.go
deleted file mode 100644
index 790a23ec24..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/introspect/call.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package introspect
-
-import (
-	"encoding/xml"
-	"github.com/godbus/dbus"
-	"strings"
-)
-
-// Call calls org.freedesktop.Introspectable.Introspect on a remote object
-// and returns the introspection data.
-func Call(o dbus.BusObject) (*Node, error) {
-	var xmldata string
-	var node Node
-
-	err := o.Call("org.freedesktop.DBus.Introspectable.Introspect", 0).Store(&xmldata)
-	if err != nil {
-		return nil, err
-	}
-	err = xml.NewDecoder(strings.NewReader(xmldata)).Decode(&node)
-	if err != nil {
-		return nil, err
-	}
-	if node.Name == "" {
-		node.Name = string(o.Path())
-	}
-	return &node, nil
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspect.go b/Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspect.go
deleted file mode 100644
index b06c3f1cf2..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspect.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Package introspect provides some utilities for dealing with the DBus
-// introspection format.
-package introspect
-
-import "encoding/xml"
-
-// The introspection data for the org.freedesktop.DBus.Introspectable interface.
-var IntrospectData = Interface{
-	Name: "org.freedesktop.DBus.Introspectable",
-	Methods: []Method{
-		{
-			Name: "Introspect",
-			Args: []Arg{
-				{"out", "s", "out"},
-			},
-		},
-	},
-}
-
-// XML document type declaration of the introspection format version 1.0
-const IntrospectDeclarationString = `
-	<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-	 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-`
-
-// The introspection data for the org.freedesktop.DBus.Introspectable interface,
-// as a string.
-const IntrospectDataString = `
-	<interface name="org.freedesktop.DBus.Introspectable">
-		<method name="Introspect">
-			<arg name="out" direction="out" type="s"/>
-		</method>
-	</interface>
-`
-
-// Node is the root element of an introspection.
-type Node struct {
-	XMLName    xml.Name    `xml:"node"`
-	Name       string      `xml:"name,attr,omitempty"`
-	Interfaces []Interface `xml:"interface"`
-	Children   []Node      `xml:"node,omitempty"`
-}
-
-// Interface describes a DBus interface that is available on the message bus.
-type Interface struct {
-	Name        string       `xml:"name,attr"`
-	Methods     []Method     `xml:"method"`
-	Signals     []Signal     `xml:"signal"`
-	Properties  []Property   `xml:"property"`
-	Annotations []Annotation `xml:"annotation"`
-}
-
-// Method describes a Method on an Interface as retured by an introspection.
-type Method struct {
-	Name        string       `xml:"name,attr"`
-	Args        []Arg        `xml:"arg"`
-	Annotations []Annotation `xml:"annotation"`
-}
-
-// Signal describes a Signal emitted on an Interface.
-type Signal struct {
-	Name        string       `xml:"name,attr"`
-	Args        []Arg        `xml:"arg"`
-	Annotations []Annotation `xml:"annotation"`
-}
-
-// Property describes a property of an Interface.
-type Property struct {
-	Name        string       `xml:"name,attr"`
-	Type        string       `xml:"type,attr"`
-	Access      string       `xml:"access,attr"`
-	Annotations []Annotation `xml:"annotation"`
-}
-
-// Arg represents an argument of a method or a signal.
-type Arg struct {
-	Name      string `xml:"name,attr,omitempty"`
-	Type      string `xml:"type,attr"`
-	Direction string `xml:"direction,attr,omitempty"`
-}
-
-// Annotation is an annotation in the introspection format.
-type Annotation struct {
-	Name  string `xml:"name,attr"`
-	Value string `xml:"value,attr"`
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspectable.go b/Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspectable.go
deleted file mode 100644
index 2f16690b99..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/introspect/introspectable.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package introspect
-
-import (
-	"encoding/xml"
-	"github.com/godbus/dbus"
-	"reflect"
-	"strings"
-)
-
-// Introspectable implements org.freedesktop.Introspectable.
-//
-// You can create it by converting the XML-formatted introspection data from a
-// string to an Introspectable or call NewIntrospectable with a Node. Then,
-// export it as org.freedesktop.Introspectable on you object.
-type Introspectable string
-
-// NewIntrospectable returns an Introspectable that returns the introspection
-// data that corresponds to the given Node. If n.Interfaces doesn't contain the
-// data for org.freedesktop.DBus.Introspectable, it is added automatically.
-func NewIntrospectable(n *Node) Introspectable {
-	found := false
-	for _, v := range n.Interfaces {
-		if v.Name == "org.freedesktop.DBus.Introspectable" {
-			found = true
-			break
-		}
-	}
-	if !found {
-		n.Interfaces = append(n.Interfaces, IntrospectData)
-	}
-	b, err := xml.Marshal(n)
-	if err != nil {
-		panic(err)
-	}
-	return Introspectable(strings.TrimSpace(IntrospectDeclarationString) + string(b))
-}
-
-// Introspect implements org.freedesktop.Introspectable.Introspect.
-func (i Introspectable) Introspect() (string, *dbus.Error) {
-	return string(i), nil
-}
-
-// Methods returns the description of the methods of v. This can be used to
-// create a Node which can be passed to NewIntrospectable.
-func Methods(v interface{}) []Method {
-	t := reflect.TypeOf(v)
-	ms := make([]Method, 0, t.NumMethod())
-	for i := 0; i < t.NumMethod(); i++ {
-		if t.Method(i).PkgPath != "" {
-			continue
-		}
-		mt := t.Method(i).Type
-		if mt.NumOut() == 0 ||
-			mt.Out(mt.NumOut()-1) != reflect.TypeOf(&dbus.Error{}) {
-
-			continue
-		}
-		var m Method
-		m.Name = t.Method(i).Name
-		m.Args = make([]Arg, 0, mt.NumIn()+mt.NumOut()-2)
-		for j := 1; j < mt.NumIn(); j++ {
-			if mt.In(j) != reflect.TypeOf((*dbus.Sender)(nil)).Elem() &&
-				mt.In(j) != reflect.TypeOf((*dbus.Message)(nil)).Elem() {
-				arg := Arg{"", dbus.SignatureOfType(mt.In(j)).String(), "in"}
-				m.Args = append(m.Args, arg)
-			}
-		}
-		for j := 0; j < mt.NumOut()-1; j++ {
-			arg := Arg{"", dbus.SignatureOfType(mt.Out(j)).String(), "out"}
-			m.Args = append(m.Args, arg)
-		}
-		m.Annotations = make([]Annotation, 0)
-		ms = append(ms, m)
-	}
-	return ms
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/message.go b/Godeps/_workspace/src/github.com/godbus/dbus/message.go
deleted file mode 100644
index 075d6e38ba..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/message.go
+++ /dev/null
@@ -1,346 +0,0 @@
-package dbus
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"io"
-	"reflect"
-	"strconv"
-)
-
-const protoVersion byte = 1
-
-// Flags represents the possible flags of a D-Bus message.
-type Flags byte
-
-const (
-	// FlagNoReplyExpected signals that the message is not expected to generate
-	// a reply. If this flag is set on outgoing messages, any possible reply
-	// will be discarded.
-	FlagNoReplyExpected Flags = 1 << iota
-	// FlagNoAutoStart signals that the message bus should not automatically
-	// start an application when handling this message.
-	FlagNoAutoStart
-)
-
-// Type represents the possible types of a D-Bus message.
-type Type byte
-
-const (
-	TypeMethodCall Type = 1 + iota
-	TypeMethodReply
-	TypeError
-	TypeSignal
-	typeMax
-)
-
-func (t Type) String() string {
-	switch t {
-	case TypeMethodCall:
-		return "method call"
-	case TypeMethodReply:
-		return "reply"
-	case TypeError:
-		return "error"
-	case TypeSignal:
-		return "signal"
-	}
-	return "invalid"
-}
-
-// HeaderField represents the possible byte codes for the headers
-// of a D-Bus message.
-type HeaderField byte
-
-const (
-	FieldPath HeaderField = 1 + iota
-	FieldInterface
-	FieldMember
-	FieldErrorName
-	FieldReplySerial
-	FieldDestination
-	FieldSender
-	FieldSignature
-	FieldUnixFDs
-	fieldMax
-)
-
-// An InvalidMessageError describes the reason why a D-Bus message is regarded as
-// invalid.
-type InvalidMessageError string
-
-func (e InvalidMessageError) Error() string {
-	return "dbus: invalid message: " + string(e)
-}
-
-// fieldType are the types of the various header fields.
-var fieldTypes = [fieldMax]reflect.Type{
-	FieldPath:        objectPathType,
-	FieldInterface:   stringType,
-	FieldMember:      stringType,
-	FieldErrorName:   stringType,
-	FieldReplySerial: uint32Type,
-	FieldDestination: stringType,
-	FieldSender:      stringType,
-	FieldSignature:   signatureType,
-	FieldUnixFDs:     uint32Type,
-}
-
-// requiredFields lists the header fields that are required by the different
-// message types.
-var requiredFields = [typeMax][]HeaderField{
-	TypeMethodCall:  {FieldPath, FieldMember},
-	TypeMethodReply: {FieldReplySerial},
-	TypeError:       {FieldErrorName, FieldReplySerial},
-	TypeSignal:      {FieldPath, FieldInterface, FieldMember},
-}
-
-// Message represents a single D-Bus message.
-type Message struct {
-	Type
-	Flags
-	Headers map[HeaderField]Variant
-	Body    []interface{}
-
-	serial uint32
-}
-
-type header struct {
-	Field byte
-	Variant
-}
-
-// DecodeMessage tries to decode a single message in the D-Bus wire format
-// from the given reader. The byte order is figured out from the first byte.
-// The possibly returned error can be an error of the underlying reader, an
-// InvalidMessageError or a FormatError.
-func DecodeMessage(rd io.Reader) (msg *Message, err error) {
-	var order binary.ByteOrder
-	var hlength, length uint32
-	var typ, flags, proto byte
-	var headers []header
-
-	b := make([]byte, 1)
-	_, err = rd.Read(b)
-	if err != nil {
-		return
-	}
-	switch b[0] {
-	case 'l':
-		order = binary.LittleEndian
-	case 'B':
-		order = binary.BigEndian
-	default:
-		return nil, InvalidMessageError("invalid byte order")
-	}
-
-	dec := newDecoder(rd, order)
-	dec.pos = 1
-
-	msg = new(Message)
-	vs, err := dec.Decode(Signature{"yyyuu"})
-	if err != nil {
-		return nil, err
-	}
-	if err = Store(vs, &typ, &flags, &proto, &length, &msg.serial); err != nil {
-		return nil, err
-	}
-	msg.Type = Type(typ)
-	msg.Flags = Flags(flags)
-
-	// get the header length separately because we need it later
-	b = make([]byte, 4)
-	_, err = io.ReadFull(rd, b)
-	if err != nil {
-		return nil, err
-	}
-	binary.Read(bytes.NewBuffer(b), order, &hlength)
-	if hlength+length+16 > 1<<27 {
-		return nil, InvalidMessageError("message is too long")
-	}
-	dec = newDecoder(io.MultiReader(bytes.NewBuffer(b), rd), order)
-	dec.pos = 12
-	vs, err = dec.Decode(Signature{"a(yv)"})
-	if err != nil {
-		return nil, err
-	}
-	if err = Store(vs, &headers); err != nil {
-		return nil, err
-	}
-
-	msg.Headers = make(map[HeaderField]Variant)
-	for _, v := range headers {
-		msg.Headers[HeaderField(v.Field)] = v.Variant
-	}
-
-	dec.align(8)
-	body := make([]byte, int(length))
-	if length != 0 {
-		_, err := io.ReadFull(rd, body)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if err = msg.IsValid(); err != nil {
-		return nil, err
-	}
-	sig, _ := msg.Headers[FieldSignature].value.(Signature)
-	if sig.str != "" {
-		buf := bytes.NewBuffer(body)
-		dec = newDecoder(buf, order)
-		vs, err := dec.Decode(sig)
-		if err != nil {
-			return nil, err
-		}
-		msg.Body = vs
-	}
-
-	return
-}
-
-// EncodeTo encodes and sends a message to the given writer. The byte order must
-// be either binary.LittleEndian or binary.BigEndian. If the message is not
-// valid or an error occurs when writing, an error is returned.
-func (msg *Message) EncodeTo(out io.Writer, order binary.ByteOrder) error {
-	if err := msg.IsValid(); err != nil {
-		return err
-	}
-	var vs [7]interface{}
-	switch order {
-	case binary.LittleEndian:
-		vs[0] = byte('l')
-	case binary.BigEndian:
-		vs[0] = byte('B')
-	default:
-		return errors.New("dbus: invalid byte order")
-	}
-	body := new(bytes.Buffer)
-	enc := newEncoder(body, order)
-	if len(msg.Body) != 0 {
-		enc.Encode(msg.Body...)
-	}
-	vs[1] = msg.Type
-	vs[2] = msg.Flags
-	vs[3] = protoVersion
-	vs[4] = uint32(len(body.Bytes()))
-	vs[5] = msg.serial
-	headers := make([]header, 0, len(msg.Headers))
-	for k, v := range msg.Headers {
-		headers = append(headers, header{byte(k), v})
-	}
-	vs[6] = headers
-	var buf bytes.Buffer
-	enc = newEncoder(&buf, order)
-	enc.Encode(vs[:]...)
-	enc.align(8)
-	body.WriteTo(&buf)
-	if buf.Len() > 1<<27 {
-		return InvalidMessageError("message is too long")
-	}
-	if _, err := buf.WriteTo(out); err != nil {
-		return err
-	}
-	return nil
-}
-
-// IsValid checks whether msg is a valid message and returns an
-// InvalidMessageError if it is not.
-func (msg *Message) IsValid() error {
-	if msg.Flags & ^(FlagNoAutoStart|FlagNoReplyExpected) != 0 {
-		return InvalidMessageError("invalid flags")
-	}
-	if msg.Type == 0 || msg.Type >= typeMax {
-		return InvalidMessageError("invalid message type")
-	}
-	for k, v := range msg.Headers {
-		if k == 0 || k >= fieldMax {
-			return InvalidMessageError("invalid header")
-		}
-		if reflect.TypeOf(v.value) != fieldTypes[k] {
-			return InvalidMessageError("invalid type of header field")
-		}
-	}
-	for _, v := range requiredFields[msg.Type] {
-		if _, ok := msg.Headers[v]; !ok {
-			return InvalidMessageError("missing required header")
-		}
-	}
-	if path, ok := msg.Headers[FieldPath]; ok {
-		if !path.value.(ObjectPath).IsValid() {
-			return InvalidMessageError("invalid path name")
-		}
-	}
-	if iface, ok := msg.Headers[FieldInterface]; ok {
-		if !isValidInterface(iface.value.(string)) {
-			return InvalidMessageError("invalid interface name")
-		}
-	}
-	if member, ok := msg.Headers[FieldMember]; ok {
-		if !isValidMember(member.value.(string)) {
-			return InvalidMessageError("invalid member name")
-		}
-	}
-	if errname, ok := msg.Headers[FieldErrorName]; ok {
-		if !isValidInterface(errname.value.(string)) {
-			return InvalidMessageError("invalid error name")
-		}
-	}
-	if len(msg.Body) != 0 {
-		if _, ok := msg.Headers[FieldSignature]; !ok {
-			return InvalidMessageError("missing signature")
-		}
-	}
-	return nil
-}
-
-// Serial returns the message's serial number. The returned value is only valid
-// for messages received by eavesdropping.
-func (msg *Message) Serial() uint32 {
-	return msg.serial
-}
-
-// String returns a string representation of a message similar to the format of
-// dbus-monitor.
-func (msg *Message) String() string {
-	if err := msg.IsValid(); err != nil {
-		return "<invalid>"
-	}
-	s := msg.Type.String()
-	if v, ok := msg.Headers[FieldSender]; ok {
-		s += " from " + v.value.(string)
-	}
-	if v, ok := msg.Headers[FieldDestination]; ok {
-		s += " to " + v.value.(string)
-	}
-	s += " serial " + strconv.FormatUint(uint64(msg.serial), 10)
-	if v, ok := msg.Headers[FieldReplySerial]; ok {
-		s += " reply_serial " + strconv.FormatUint(uint64(v.value.(uint32)), 10)
-	}
-	if v, ok := msg.Headers[FieldUnixFDs]; ok {
-		s += " unixfds " + strconv.FormatUint(uint64(v.value.(uint32)), 10)
-	}
-	if v, ok := msg.Headers[FieldPath]; ok {
-		s += " path " + string(v.value.(ObjectPath))
-	}
-	if v, ok := msg.Headers[FieldInterface]; ok {
-		s += " interface " + v.value.(string)
-	}
-	if v, ok := msg.Headers[FieldErrorName]; ok {
-		s += " error " + v.value.(string)
-	}
-	if v, ok := msg.Headers[FieldMember]; ok {
-		s += " member " + v.value.(string)
-	}
-	if len(msg.Body) != 0 {
-		s += "\n"
-	}
-	for i, v := range msg.Body {
-		s += "  " + MakeVariant(v).String()
-		if i != len(msg.Body)-1 {
-			s += "\n"
-		}
-	}
-	return s
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/object.go b/Godeps/_workspace/src/github.com/godbus/dbus/object.go
deleted file mode 100644
index 9573b7095a..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/object.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package dbus
-
-import (
-	"errors"
-	"strings"
-)
-
-// BusObject is the interface of a remote object on which methods can be
-// invoked.
-type BusObject interface {
-	Call(method string, flags Flags, args ...interface{}) *Call
-	Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call
-	GetProperty(p string) (Variant, error)
-	Destination() string
-	Path() ObjectPath
-}
-
-// Object represents a remote object on which methods can be invoked.
-type Object struct {
-	conn *Conn
-	dest string
-	path ObjectPath
-}
-
-// Call calls a method with (*Object).Go and waits for its reply.
-func (o *Object) Call(method string, flags Flags, args ...interface{}) *Call {
-	return <-o.Go(method, flags, make(chan *Call, 1), args...).Done
-}
-
-// AddMatchSignal subscribes BusObject to signals from specified interface and
-// method (member).
-func (o *Object) AddMatchSignal(iface, member string) *Call {
-	return o.Call(
-		"org.freedesktop.DBus.AddMatch",
-		0,
-		"type='signal',interface='"+iface+"',member='"+member+"'",
-	)
-}
-
-// Go calls a method with the given arguments asynchronously. It returns a
-// Call structure representing this method call. The passed channel will
-// return the same value once the call is done. If ch is nil, a new channel
-// will be allocated. Otherwise, ch has to be buffered or Go will panic.
-//
-// If the flags include FlagNoReplyExpected, ch is ignored and a Call structure
-// is returned of which only the Err member is valid.
-//
-// If the method parameter contains a dot ('.'), the part before the last dot
-// specifies the interface on which the method is called.
-func (o *Object) Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call {
-	iface := ""
-	i := strings.LastIndex(method, ".")
-	if i != -1 {
-		iface = method[:i]
-	}
-	method = method[i+1:]
-	msg := new(Message)
-	msg.Type = TypeMethodCall
-	msg.serial = o.conn.getSerial()
-	msg.Flags = flags & (FlagNoAutoStart | FlagNoReplyExpected)
-	msg.Headers = make(map[HeaderField]Variant)
-	msg.Headers[FieldPath] = MakeVariant(o.path)
-	msg.Headers[FieldDestination] = MakeVariant(o.dest)
-	msg.Headers[FieldMember] = MakeVariant(method)
-	if iface != "" {
-		msg.Headers[FieldInterface] = MakeVariant(iface)
-	}
-	msg.Body = args
-	if len(args) > 0 {
-		msg.Headers[FieldSignature] = MakeVariant(SignatureOf(args...))
-	}
-	if msg.Flags&FlagNoReplyExpected == 0 {
-		if ch == nil {
-			ch = make(chan *Call, 10)
-		} else if cap(ch) == 0 {
-			panic("dbus: unbuffered channel passed to (*Object).Go")
-		}
-		call := &Call{
-			Destination: o.dest,
-			Path:        o.path,
-			Method:      method,
-			Args:        args,
-			Done:        ch,
-		}
-		o.conn.callsLck.Lock()
-		o.conn.calls[msg.serial] = call
-		o.conn.callsLck.Unlock()
-		o.conn.outLck.RLock()
-		if o.conn.closed {
-			call.Err = ErrClosed
-			call.Done <- call
-		} else {
-			o.conn.out <- msg
-		}
-		o.conn.outLck.RUnlock()
-		return call
-	}
-	o.conn.outLck.RLock()
-	defer o.conn.outLck.RUnlock()
-	if o.conn.closed {
-		return &Call{Err: ErrClosed}
-	}
-	o.conn.out <- msg
-	return &Call{Err: nil}
-}
-
-// GetProperty calls org.freedesktop.DBus.Properties.GetProperty on the given
-// object. The property name must be given in interface.member notation.
-func (o *Object) GetProperty(p string) (Variant, error) {
-	idx := strings.LastIndex(p, ".")
-	if idx == -1 || idx+1 == len(p) {
-		return Variant{}, errors.New("dbus: invalid property " + p)
-	}
-
-	iface := p[:idx]
-	prop := p[idx+1:]
-
-	result := Variant{}
-	err := o.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop).Store(&result)
-
-	if err != nil {
-		return Variant{}, err
-	}
-
-	return result, nil
-}
-
-// Destination returns the destination that calls on o are sent to.
-func (o *Object) Destination() string {
-	return o.dest
-}
-
-// Path returns the path that calls on o are sent to.
-func (o *Object) Path() ObjectPath {
-	return o.path
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/prop/prop.go b/Godeps/_workspace/src/github.com/godbus/dbus/prop/prop.go
deleted file mode 100644
index d3f434ca8d..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/prop/prop.go
+++ /dev/null
@@ -1,264 +0,0 @@
-// Package prop provides the Properties struct which can be used to implement
-// org.freedesktop.DBus.Properties.
-package prop
-
-import (
-	"github.com/godbus/dbus"
-	"github.com/godbus/dbus/introspect"
-	"sync"
-)
-
-// EmitType controls how org.freedesktop.DBus.Properties.PropertiesChanged is
-// emitted for a property. If it is EmitTrue, the signal is emitted. If it is
-// EmitInvalidates, the signal is also emitted, but the new value of the property
-// is not disclosed.
-type EmitType byte
-
-const (
-	EmitFalse EmitType = iota
-	EmitTrue
-	EmitInvalidates
-)
-
-// ErrIfaceNotFound is the error returned to peers who try to access properties
-// on interfaces that aren't found.
-var ErrIfaceNotFound = dbus.NewError("org.freedesktop.DBus.Properties.Error.InterfaceNotFound", nil)
-
-// ErrPropNotFound is the error returned to peers trying to access properties
-// that aren't found.
-var ErrPropNotFound = dbus.NewError("org.freedesktop.DBus.Properties.Error.PropertyNotFound", nil)
-
-// ErrReadOnly is the error returned to peers trying to set a read-only
-// property.
-var ErrReadOnly = dbus.NewError("org.freedesktop.DBus.Properties.Error.ReadOnly", nil)
-
-// ErrInvalidArg is returned to peers if the type of the property that is being
-// changed and the argument don't match.
-var ErrInvalidArg = dbus.NewError("org.freedesktop.DBus.Properties.Error.InvalidArg", nil)
-
-// The introspection data for the org.freedesktop.DBus.Properties interface.
-var IntrospectData = introspect.Interface{
-	Name: "org.freedesktop.DBus.Properties",
-	Methods: []introspect.Method{
-		{
-			Name: "Get",
-			Args: []introspect.Arg{
-				{"interface", "s", "in"},
-				{"property", "s", "in"},
-				{"value", "v", "out"},
-			},
-		},
-		{
-			Name: "GetAll",
-			Args: []introspect.Arg{
-				{"interface", "s", "in"},
-				{"props", "a{sv}", "out"},
-			},
-		},
-		{
-			Name: "Set",
-			Args: []introspect.Arg{
-				{"interface", "s", "in"},
-				{"property", "s", "in"},
-				{"value", "v", "in"},
-			},
-		},
-	},
-	Signals: []introspect.Signal{
-		{
-			Name: "PropertiesChanged",
-			Args: []introspect.Arg{
-				{"interface", "s", "out"},
-				{"changed_properties", "a{sv}", "out"},
-				{"invalidates_properties", "as", "out"},
-			},
-		},
-	},
-}
-
-// The introspection data for the org.freedesktop.DBus.Properties interface, as
-// a string.
-const IntrospectDataString = `
-	<interface name="org.freedesktop.DBus.Properties">
-		<method name="Get">
-			<arg name="interface" direction="in" type="s"/>
-			<arg name="property" direction="in" type="s"/>
-			<arg name="value" direction="out" type="v"/>
-		</method>
-		<method name="GetAll">
-			<arg name="interface" direction="in" type="s"/>
-			<arg name="props" direction="out" type="a{sv}"/>
-		</method>
-		<method name="Set">
-			<arg name="interface" direction="in" type="s"/>
-			<arg name="property" direction="in" type="s"/>
-			<arg name="value" direction="in" type="v"/>
-		</method>
-		<signal name="PropertiesChanged">
-			<arg name="interface" type="s"/>
-			<arg name="changed_properties" type="a{sv}"/>
-			<arg name="invalidates_properties" type="as"/>
-		</signal>
-	</interface>
-`
-
-// Prop represents a single property. It is used for creating a Properties
-// value.
-type Prop struct {
-	// Initial value. Must be a DBus-representable type.
-	Value interface{}
-
-	// If true, the value can be modified by calls to Set.
-	Writable bool
-
-	// Controls how org.freedesktop.DBus.Properties.PropertiesChanged is
-	// emitted if this property changes.
-	Emit EmitType
-
-	// If not nil, anytime this property is changed by Set, this function is
-	// called with an appropiate Change as its argument. If the returned error
-	// is not nil, it is sent back to the caller of Set and the property is not
-	// changed.
-	Callback func(*Change) *dbus.Error
-}
-
-// Change represents a change of a property by a call to Set.
-type Change struct {
-	Props *Properties
-	Iface string
-	Name  string
-	Value interface{}
-}
-
-// Properties is a set of values that can be made available to the message bus
-// using the org.freedesktop.DBus.Properties interface. It is safe for
-// concurrent use by multiple goroutines.
-type Properties struct {
-	m    map[string]map[string]*Prop
-	mut  sync.RWMutex
-	conn *dbus.Conn
-	path dbus.ObjectPath
-}
-
-// New returns a new Properties structure that manages the given properties.
-// The key for the first-level map of props is the name of the interface; the
-// second-level key is the name of the property. The returned structure will be
-// exported as org.freedesktop.DBus.Properties on path.
-func New(conn *dbus.Conn, path dbus.ObjectPath, props map[string]map[string]*Prop) *Properties {
-	p := &Properties{m: props, conn: conn, path: path}
-	conn.Export(p, path, "org.freedesktop.DBus.Properties")
-	return p
-}
-
-// Get implements org.freedesktop.DBus.Properties.Get.
-func (p *Properties) Get(iface, property string) (dbus.Variant, *dbus.Error) {
-	p.mut.RLock()
-	defer p.mut.RUnlock()
-	m, ok := p.m[iface]
-	if !ok {
-		return dbus.Variant{}, ErrIfaceNotFound
-	}
-	prop, ok := m[property]
-	if !ok {
-		return dbus.Variant{}, ErrPropNotFound
-	}
-	return dbus.MakeVariant(prop.Value), nil
-}
-
-// GetAll implements org.freedesktop.DBus.Properties.GetAll.
-func (p *Properties) GetAll(iface string) (map[string]dbus.Variant, *dbus.Error) {
-	p.mut.RLock()
-	defer p.mut.RUnlock()
-	m, ok := p.m[iface]
-	if !ok {
-		return nil, ErrIfaceNotFound
-	}
-	rm := make(map[string]dbus.Variant, len(m))
-	for k, v := range m {
-		rm[k] = dbus.MakeVariant(v.Value)
-	}
-	return rm, nil
-}
-
-// GetMust returns the value of the given property and panics if either the
-// interface or the property name are invalid.
-func (p *Properties) GetMust(iface, property string) interface{} {
-	p.mut.RLock()
-	defer p.mut.RUnlock()
-	return p.m[iface][property].Value
-}
-
-// Introspection returns the introspection data that represents the properties
-// of iface.
-func (p *Properties) Introspection(iface string) []introspect.Property {
-	p.mut.RLock()
-	defer p.mut.RUnlock()
-	m := p.m[iface]
-	s := make([]introspect.Property, 0, len(m))
-	for k, v := range m {
-		p := introspect.Property{Name: k, Type: dbus.SignatureOf(v.Value).String()}
-		if v.Writable {
-			p.Access = "readwrite"
-		} else {
-			p.Access = "read"
-		}
-		s = append(s, p)
-	}
-	return s
-}
-
-// set sets the given property and emits PropertyChanged if appropiate. p.mut
-// must already be locked.
-func (p *Properties) set(iface, property string, v interface{}) {
-	prop := p.m[iface][property]
-	prop.Value = v
-	switch prop.Emit {
-	case EmitFalse:
-		// do nothing
-	case EmitInvalidates:
-		p.conn.Emit(p.path, "org.freedesktop.DBus.Properties.PropertiesChanged",
-			iface, map[string]dbus.Variant{}, []string{property})
-	case EmitTrue:
-		p.conn.Emit(p.path, "org.freedesktop.DBus.Properties.PropertiesChanged",
-			iface, map[string]dbus.Variant{property: dbus.MakeVariant(v)},
-			[]string{})
-	default:
-		panic("invalid value for EmitType")
-	}
-}
-
-// Set implements org.freedesktop.Properties.Set.
-func (p *Properties) Set(iface, property string, newv dbus.Variant) *dbus.Error {
-	p.mut.Lock()
-	defer p.mut.Unlock()
-	m, ok := p.m[iface]
-	if !ok {
-		return ErrIfaceNotFound
-	}
-	prop, ok := m[property]
-	if !ok {
-		return ErrPropNotFound
-	}
-	if !prop.Writable {
-		return ErrReadOnly
-	}
-	if newv.Signature() != dbus.SignatureOf(prop.Value) {
-		return ErrInvalidArg
-	}
-	if prop.Callback != nil {
-		err := prop.Callback(&Change{p, iface, property, newv.Value()})
-		if err != nil {
-			return err
-		}
-	}
-	p.set(iface, property, newv.Value())
-	return nil
-}
-
-// SetMust sets the value of the given property and panics if the interface or
-// the property name are invalid.
-func (p *Properties) SetMust(iface, property string, v interface{}) {
-	p.mut.Lock()
-	p.set(iface, property, v)
-	p.mut.Unlock()
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/sig.go b/Godeps/_workspace/src/github.com/godbus/dbus/sig.go
deleted file mode 100644
index f45b53ce1b..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/sig.go
+++ /dev/null
@@ -1,257 +0,0 @@
-package dbus
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-var sigToType = map[byte]reflect.Type{
-	'y': byteType,
-	'b': boolType,
-	'n': int16Type,
-	'q': uint16Type,
-	'i': int32Type,
-	'u': uint32Type,
-	'x': int64Type,
-	't': uint64Type,
-	'd': float64Type,
-	's': stringType,
-	'g': signatureType,
-	'o': objectPathType,
-	'v': variantType,
-	'h': unixFDIndexType,
-}
-
-// Signature represents a correct type signature as specified by the D-Bus
-// specification. The zero value represents the empty signature, "".
-type Signature struct {
-	str string
-}
-
-// SignatureOf returns the concatenation of all the signatures of the given
-// values. It panics if one of them is not representable in D-Bus.
-func SignatureOf(vs ...interface{}) Signature {
-	var s string
-	for _, v := range vs {
-		s += getSignature(reflect.TypeOf(v))
-	}
-	return Signature{s}
-}
-
-// SignatureOfType returns the signature of the given type. It panics if the
-// type is not representable in D-Bus.
-func SignatureOfType(t reflect.Type) Signature {
-	return Signature{getSignature(t)}
-}
-
-// getSignature returns the signature of the given type and panics on unknown types.
-func getSignature(t reflect.Type) string {
-	// handle simple types first
-	switch t.Kind() {
-	case reflect.Uint8:
-		return "y"
-	case reflect.Bool:
-		return "b"
-	case reflect.Int16:
-		return "n"
-	case reflect.Uint16:
-		return "q"
-	case reflect.Int32:
-		if t == unixFDType {
-			return "h"
-		}
-		return "i"
-	case reflect.Uint32:
-		if t == unixFDIndexType {
-			return "h"
-		}
-		return "u"
-	case reflect.Int64:
-		return "x"
-	case reflect.Uint64:
-		return "t"
-	case reflect.Float64:
-		return "d"
-	case reflect.Ptr:
-		return getSignature(t.Elem())
-	case reflect.String:
-		if t == objectPathType {
-			return "o"
-		}
-		return "s"
-	case reflect.Struct:
-		if t == variantType {
-			return "v"
-		} else if t == signatureType {
-			return "g"
-		}
-		var s string
-		for i := 0; i < t.NumField(); i++ {
-			field := t.Field(i)
-			if field.PkgPath == "" && field.Tag.Get("dbus") != "-" {
-				s += getSignature(t.Field(i).Type)
-			}
-		}
-		return "(" + s + ")"
-	case reflect.Array, reflect.Slice:
-		return "a" + getSignature(t.Elem())
-	case reflect.Map:
-		if !isKeyType(t.Key()) {
-			panic(InvalidTypeError{t})
-		}
-		return "a{" + getSignature(t.Key()) + getSignature(t.Elem()) + "}"
-	}
-	panic(InvalidTypeError{t})
-}
-
-// ParseSignature returns the signature represented by this string, or a
-// SignatureError if the string is not a valid signature.
-func ParseSignature(s string) (sig Signature, err error) {
-	if len(s) == 0 {
-		return
-	}
-	if len(s) > 255 {
-		return Signature{""}, SignatureError{s, "too long"}
-	}
-	sig.str = s
-	for err == nil && len(s) != 0 {
-		err, s = validSingle(s, 0)
-	}
-	if err != nil {
-		sig = Signature{""}
-	}
-
-	return
-}
-
-// ParseSignatureMust behaves like ParseSignature, except that it panics if s
-// is not valid.
-func ParseSignatureMust(s string) Signature {
-	sig, err := ParseSignature(s)
-	if err != nil {
-		panic(err)
-	}
-	return sig
-}
-
-// Empty retruns whether the signature is the empty signature.
-func (s Signature) Empty() bool {
-	return s.str == ""
-}
-
-// Single returns whether the signature represents a single, complete type.
-func (s Signature) Single() bool {
-	err, r := validSingle(s.str, 0)
-	return err != nil && r == ""
-}
-
-// String returns the signature's string representation.
-func (s Signature) String() string {
-	return s.str
-}
-
-// A SignatureError indicates that a signature passed to a function or received
-// on a connection is not a valid signature.
-type SignatureError struct {
-	Sig    string
-	Reason string
-}
-
-func (e SignatureError) Error() string {
-	return fmt.Sprintf("dbus: invalid signature: %q (%s)", e.Sig, e.Reason)
-}
-
-// Try to read a single type from this string. If it was successfull, err is nil
-// and rem is the remaining unparsed part. Otherwise, err is a non-nil
-// SignatureError and rem is "". depth is the current recursion depth which may
-// not be greater than 64 and should be given as 0 on the first call.
-func validSingle(s string, depth int) (err error, rem string) {
-	if s == "" {
-		return SignatureError{Sig: s, Reason: "empty signature"}, ""
-	}
-	if depth > 64 {
-		return SignatureError{Sig: s, Reason: "container nesting too deep"}, ""
-	}
-	switch s[0] {
-	case 'y', 'b', 'n', 'q', 'i', 'u', 'x', 't', 'd', 's', 'g', 'o', 'v', 'h':
-		return nil, s[1:]
-	case 'a':
-		if len(s) > 1 && s[1] == '{' {
-			i := findMatching(s[1:], '{', '}')
-			if i == -1 {
-				return SignatureError{Sig: s, Reason: "unmatched '{'"}, ""
-			}
-			i++
-			rem = s[i+1:]
-			s = s[2:i]
-			if err, _ = validSingle(s[:1], depth+1); err != nil {
-				return err, ""
-			}
-			err, nr := validSingle(s[1:], depth+1)
-			if err != nil {
-				return err, ""
-			}
-			if nr != "" {
-				return SignatureError{Sig: s, Reason: "too many types in dict"}, ""
-			}
-			return nil, rem
-		}
-		return validSingle(s[1:], depth+1)
-	case '(':
-		i := findMatching(s, '(', ')')
-		if i == -1 {
-			return SignatureError{Sig: s, Reason: "unmatched ')'"}, ""
-		}
-		rem = s[i+1:]
-		s = s[1:i]
-		for err == nil && s != "" {
-			err, s = validSingle(s, depth+1)
-		}
-		if err != nil {
-			rem = ""
-		}
-		return
-	}
-	return SignatureError{Sig: s, Reason: "invalid type character"}, ""
-}
-
-func findMatching(s string, left, right rune) int {
-	n := 0
-	for i, v := range s {
-		if v == left {
-			n++
-		} else if v == right {
-			n--
-		}
-		if n == 0 {
-			return i
-		}
-	}
-	return -1
-}
-
-// typeFor returns the type of the given signature. It ignores any left over
-// characters and panics if s doesn't start with a valid type signature.
-func typeFor(s string) (t reflect.Type) {
-	err, _ := validSingle(s, 0)
-	if err != nil {
-		panic(err)
-	}
-
-	if t, ok := sigToType[s[0]]; ok {
-		return t
-	}
-	switch s[0] {
-	case 'a':
-		if s[1] == '{' {
-			i := strings.LastIndex(s, "}")
-			t = reflect.MapOf(sigToType[s[2]], typeFor(s[3:i]))
-		} else {
-			t = reflect.SliceOf(typeFor(s[1:]))
-		}
-	case '(':
-		t = interfacesType
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_darwin.go b/Godeps/_workspace/src/github.com/godbus/dbus/transport_darwin.go
deleted file mode 100644
index 1bba0d6bf7..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/transport_darwin.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package dbus
-
-func (t *unixTransport) SendNullByte() error {
-	_, err := t.Write([]byte{0})
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_generic.go b/Godeps/_workspace/src/github.com/godbus/dbus/transport_generic.go
deleted file mode 100644
index 46f8f49d69..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/transport_generic.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package dbus
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-)
-
-type genericTransport struct {
-	io.ReadWriteCloser
-}
-
-func (t genericTransport) SendNullByte() error {
-	_, err := t.Write([]byte{0})
-	return err
-}
-
-func (t genericTransport) SupportsUnixFDs() bool {
-	return false
-}
-
-func (t genericTransport) EnableUnixFDs() {}
-
-func (t genericTransport) ReadMessage() (*Message, error) {
-	return DecodeMessage(t)
-}
-
-func (t genericTransport) SendMessage(msg *Message) error {
-	for _, v := range msg.Body {
-		if _, ok := v.(UnixFD); ok {
-			return errors.New("dbus: unix fd passing not enabled")
-		}
-	}
-	return msg.EncodeTo(t, binary.LittleEndian)
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unix.go b/Godeps/_workspace/src/github.com/godbus/dbus/transport_unix.go
deleted file mode 100644
index 3fafeabb15..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unix.go
+++ /dev/null
@@ -1,196 +0,0 @@
-//+build !windows
-
-package dbus
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"io"
-	"net"
-	"syscall"
-)
-
-type oobReader struct {
-	conn *net.UnixConn
-	oob  []byte
-	buf  [4096]byte
-}
-
-func (o *oobReader) Read(b []byte) (n int, err error) {
-	n, oobn, flags, _, err := o.conn.ReadMsgUnix(b, o.buf[:])
-	if err != nil {
-		return n, err
-	}
-	if flags&syscall.MSG_CTRUNC != 0 {
-		return n, errors.New("dbus: control data truncated (too many fds received)")
-	}
-	o.oob = append(o.oob, o.buf[:oobn]...)
-	return n, nil
-}
-
-type unixTransport struct {
-	*net.UnixConn
-	hasUnixFDs bool
-}
-
-func newUnixTransport(keys string) (transport, error) {
-	var err error
-
-	t := new(unixTransport)
-	abstract := getKey(keys, "abstract")
-	path := getKey(keys, "path")
-	switch {
-	case abstract == "" && path == "":
-		return nil, errors.New("dbus: invalid address (neither path nor abstract set)")
-	case abstract != "" && path == "":
-		t.UnixConn, err = net.DialUnix("unix", nil, &net.UnixAddr{Name: "@" + abstract, Net: "unix"})
-		if err != nil {
-			return nil, err
-		}
-		return t, nil
-	case abstract == "" && path != "":
-		t.UnixConn, err = net.DialUnix("unix", nil, &net.UnixAddr{Name: path, Net: "unix"})
-		if err != nil {
-			return nil, err
-		}
-		return t, nil
-	default:
-		return nil, errors.New("dbus: invalid address (both path and abstract set)")
-	}
-}
-
-func init() {
-	transports["unix"] = newUnixTransport
-}
-
-func (t *unixTransport) EnableUnixFDs() {
-	t.hasUnixFDs = true
-}
-
-func (t *unixTransport) ReadMessage() (*Message, error) {
-	var (
-		blen, hlen uint32
-		csheader   [16]byte
-		headers    []header
-		order      binary.ByteOrder
-		unixfds    uint32
-	)
-	// To be sure that all bytes of out-of-band data are read, we use a special
-	// reader that uses ReadUnix on the underlying connection instead of Read
-	// and gathers the out-of-band data in a buffer.
-	rd := &oobReader{conn: t.UnixConn}
-	// read the first 16 bytes (the part of the header that has a constant size),
-	// from which we can figure out the length of the rest of the message
-	if _, err := io.ReadFull(rd, csheader[:]); err != nil {
-		return nil, err
-	}
-	switch csheader[0] {
-	case 'l':
-		order = binary.LittleEndian
-	case 'B':
-		order = binary.BigEndian
-	default:
-		return nil, InvalidMessageError("invalid byte order")
-	}
-	// csheader[4:8] -> length of message body, csheader[12:16] -> length of
-	// header fields (without alignment)
-	binary.Read(bytes.NewBuffer(csheader[4:8]), order, &blen)
-	binary.Read(bytes.NewBuffer(csheader[12:]), order, &hlen)
-	if hlen%8 != 0 {
-		hlen += 8 - (hlen % 8)
-	}
-
-	// decode headers and look for unix fds
-	headerdata := make([]byte, hlen+4)
-	copy(headerdata, csheader[12:])
-	if _, err := io.ReadFull(t, headerdata[4:]); err != nil {
-		return nil, err
-	}
-	dec := newDecoder(bytes.NewBuffer(headerdata), order)
-	dec.pos = 12
-	vs, err := dec.Decode(Signature{"a(yv)"})
-	if err != nil {
-		return nil, err
-	}
-	Store(vs, &headers)
-	for _, v := range headers {
-		if v.Field == byte(FieldUnixFDs) {
-			unixfds, _ = v.Variant.value.(uint32)
-		}
-	}
-	all := make([]byte, 16+hlen+blen)
-	copy(all, csheader[:])
-	copy(all[16:], headerdata[4:])
-	if _, err := io.ReadFull(rd, all[16+hlen:]); err != nil {
-		return nil, err
-	}
-	if unixfds != 0 {
-		if !t.hasUnixFDs {
-			return nil, errors.New("dbus: got unix fds on unsupported transport")
-		}
-		// read the fds from the OOB data
-		scms, err := syscall.ParseSocketControlMessage(rd.oob)
-		if err != nil {
-			return nil, err
-		}
-		if len(scms) != 1 {
-			return nil, errors.New("dbus: received more than one socket control message")
-		}
-		fds, err := syscall.ParseUnixRights(&scms[0])
-		if err != nil {
-			return nil, err
-		}
-		msg, err := DecodeMessage(bytes.NewBuffer(all))
-		if err != nil {
-			return nil, err
-		}
-		// substitute the values in the message body (which are indices for the
-		// array receiver via OOB) with the actual values
-		for i, v := range msg.Body {
-			if j, ok := v.(UnixFDIndex); ok {
-				if uint32(j) >= unixfds {
-					return nil, InvalidMessageError("invalid index for unix fd")
-				}
-				msg.Body[i] = UnixFD(fds[j])
-			}
-		}
-		return msg, nil
-	}
-	return DecodeMessage(bytes.NewBuffer(all))
-}
-
-func (t *unixTransport) SendMessage(msg *Message) error {
-	fds := make([]int, 0)
-	for i, v := range msg.Body {
-		if fd, ok := v.(UnixFD); ok {
-			msg.Body[i] = UnixFDIndex(len(fds))
-			fds = append(fds, int(fd))
-		}
-	}
-	if len(fds) != 0 {
-		if !t.hasUnixFDs {
-			return errors.New("dbus: unix fd passing not enabled")
-		}
-		msg.Headers[FieldUnixFDs] = MakeVariant(uint32(len(fds)))
-		oob := syscall.UnixRights(fds...)
-		buf := new(bytes.Buffer)
-		msg.EncodeTo(buf, binary.LittleEndian)
-		n, oobn, err := t.UnixConn.WriteMsgUnix(buf.Bytes(), oob, nil)
-		if err != nil {
-			return err
-		}
-		if n != buf.Len() || oobn != len(oob) {
-			return io.ErrShortWrite
-		}
-	} else {
-		if err := msg.EncodeTo(t, binary.LittleEndian); err != nil {
-			return nil
-		}
-	}
-	return nil
-}
-
-func (t *unixTransport) SupportsUnixFDs() bool {
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_dragonfly.go b/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_dragonfly.go
deleted file mode 100644
index a8cd39395f..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_dragonfly.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// The UnixCredentials system call is currently only implemented on Linux
-// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
-// https://golang.org/s/go1.4-syscall
-// http://code.google.com/p/go/source/browse/unix/sockcmsg_linux.go?repo=sys
-
-// Local implementation of the UnixCredentials system call for DragonFly BSD
-
-package dbus
-
-/*
-#include <sys/ucred.h>
-*/
-import "C"
-
-import (
-	"io"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-// http://golang.org/src/pkg/syscall/ztypes_linux_amd64.go
-// http://golang.org/src/pkg/syscall/ztypes_dragonfly_amd64.go
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-// http://golang.org/src/pkg/syscall/types_linux.go
-// http://golang.org/src/pkg/syscall/types_dragonfly.go
-// https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/ucred.h
-const (
-	SizeofUcred = C.sizeof_struct_ucred
-)
-
-// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
-func cmsgAlignOf(salen int) int {
-	// From http://golang.org/src/pkg/syscall/sockcmsg_unix.go
-	//salign := sizeofPtr
-	// NOTE: It seems like 64-bit Darwin and DragonFly BSD kernels
-	// still require 32-bit aligned access to network subsystem.
-	//if darwin64Bit || dragonfly64Bit {
-	//	salign = 4
-	//}
-	salign := 4
-	return (salen + salign - 1) & ^(salign - 1)
-}
-
-// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
-func cmsgData(h *syscall.Cmsghdr) unsafe.Pointer {
-	return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(syscall.SizeofCmsghdr)))
-}
-
-// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
-// UnixCredentials encodes credentials into a socket control message
-// for sending to another process. This can be used for
-// authentication.
-func UnixCredentials(ucred *Ucred) []byte {
-	b := make([]byte, syscall.CmsgSpace(SizeofUcred))
-	h := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = syscall.SOL_SOCKET
-	h.Type = syscall.SCM_CREDS
-	h.SetLen(syscall.CmsgLen(SizeofUcred))
-	*((*Ucred)(cmsgData(h))) = *ucred
-	return b
-}
-
-// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
-// ParseUnixCredentials decodes a socket control message that contains
-// credentials in a Ucred structure. To receive such a message, the
-// SO_PASSCRED option must be enabled on the socket.
-func ParseUnixCredentials(m *syscall.SocketControlMessage) (*Ucred, error) {
-	if m.Header.Level != syscall.SOL_SOCKET {
-		return nil, syscall.EINVAL
-	}
-	if m.Header.Type != syscall.SCM_CREDS {
-		return nil, syscall.EINVAL
-	}
-	ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
-	return &ucred, nil
-}
-
-func (t *unixTransport) SendNullByte() error {
-	ucred := &Ucred{Pid: int32(os.Getpid()), Uid: uint32(os.Getuid()), Gid: uint32(os.Getgid())}
-	b := UnixCredentials(ucred)
-	_, oobn, err := t.UnixConn.WriteMsgUnix([]byte{0}, b, nil)
-	if err != nil {
-		return err
-	}
-	if oobn != len(b) {
-		return io.ErrShortWrite
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_linux.go b/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_linux.go
deleted file mode 100644
index d9dfdf6982..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/transport_unixcred_linux.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// The UnixCredentials system call is currently only implemented on Linux
-// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
-// https://golang.org/s/go1.4-syscall
-// http://code.google.com/p/go/source/browse/unix/sockcmsg_linux.go?repo=sys
-
-package dbus
-
-import (
-	"io"
-	"os"
-	"syscall"
-)
-
-func (t *unixTransport) SendNullByte() error {
-	ucred := &syscall.Ucred{Pid: int32(os.Getpid()), Uid: uint32(os.Getuid()), Gid: uint32(os.Getgid())}
-	b := syscall.UnixCredentials(ucred)
-	_, oobn, err := t.UnixConn.WriteMsgUnix([]byte{0}, b, nil)
-	if err != nil {
-		return err
-	}
-	if oobn != len(b) {
-		return io.ErrShortWrite
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/variant.go b/Godeps/_workspace/src/github.com/godbus/dbus/variant.go
deleted file mode 100644
index b7b13ae90d..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/variant.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package dbus
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"sort"
-	"strconv"
-)
-
-// Variant represents the D-Bus variant type.
-type Variant struct {
-	sig   Signature
-	value interface{}
-}
-
-// MakeVariant converts the given value to a Variant. It panics if v cannot be
-// represented as a D-Bus type.
-func MakeVariant(v interface{}) Variant {
-	return Variant{SignatureOf(v), v}
-}
-
-// ParseVariant parses the given string as a variant as described at
-// https://developer.gnome.org/glib/unstable/gvariant-text.html. If sig is not
-// empty, it is taken to be the expected signature for the variant.
-func ParseVariant(s string, sig Signature) (Variant, error) {
-	tokens := varLex(s)
-	p := &varParser{tokens: tokens}
-	n, err := varMakeNode(p)
-	if err != nil {
-		return Variant{}, err
-	}
-	if sig.str == "" {
-		sig, err = varInfer(n)
-		if err != nil {
-			return Variant{}, err
-		}
-	}
-	v, err := n.Value(sig)
-	if err != nil {
-		return Variant{}, err
-	}
-	return MakeVariant(v), nil
-}
-
-// format returns a formatted version of v and whether this string can be parsed
-// unambigously.
-func (v Variant) format() (string, bool) {
-	switch v.sig.str[0] {
-	case 'b', 'i':
-		return fmt.Sprint(v.value), true
-	case 'n', 'q', 'u', 'x', 't', 'd', 'h':
-		return fmt.Sprint(v.value), false
-	case 's':
-		return strconv.Quote(v.value.(string)), true
-	case 'o':
-		return strconv.Quote(string(v.value.(ObjectPath))), false
-	case 'g':
-		return strconv.Quote(v.value.(Signature).str), false
-	case 'v':
-		s, unamb := v.value.(Variant).format()
-		if !unamb {
-			return "<@" + v.value.(Variant).sig.str + " " + s + ">", true
-		}
-		return "<" + s + ">", true
-	case 'y':
-		return fmt.Sprintf("%#x", v.value.(byte)), false
-	}
-	rv := reflect.ValueOf(v.value)
-	switch rv.Kind() {
-	case reflect.Slice:
-		if rv.Len() == 0 {
-			return "[]", false
-		}
-		unamb := true
-		buf := bytes.NewBuffer([]byte("["))
-		for i := 0; i < rv.Len(); i++ {
-			// TODO: slooow
-			s, b := MakeVariant(rv.Index(i).Interface()).format()
-			unamb = unamb && b
-			buf.WriteString(s)
-			if i != rv.Len()-1 {
-				buf.WriteString(", ")
-			}
-		}
-		buf.WriteByte(']')
-		return buf.String(), unamb
-	case reflect.Map:
-		if rv.Len() == 0 {
-			return "{}", false
-		}
-		unamb := true
-		var buf bytes.Buffer
-		kvs := make([]string, rv.Len())
-		for i, k := range rv.MapKeys() {
-			s, b := MakeVariant(k.Interface()).format()
-			unamb = unamb && b
-			buf.Reset()
-			buf.WriteString(s)
-			buf.WriteString(": ")
-			s, b = MakeVariant(rv.MapIndex(k).Interface()).format()
-			unamb = unamb && b
-			buf.WriteString(s)
-			kvs[i] = buf.String()
-		}
-		buf.Reset()
-		buf.WriteByte('{')
-		sort.Strings(kvs)
-		for i, kv := range kvs {
-			if i > 0 {
-				buf.WriteString(", ")
-			}
-			buf.WriteString(kv)
-		}
-		buf.WriteByte('}')
-		return buf.String(), unamb
-	}
-	return `"INVALID"`, true
-}
-
-// Signature returns the D-Bus signature of the underlying value of v.
-func (v Variant) Signature() Signature {
-	return v.sig
-}
-
-// String returns the string representation of the underlying value of v as
-// described at https://developer.gnome.org/glib/unstable/gvariant-text.html.
-func (v Variant) String() string {
-	s, unamb := v.format()
-	if !unamb {
-		return "@" + v.sig.str + " " + s
-	}
-	return s
-}
-
-// Value returns the underlying value of v.
-func (v Variant) Value() interface{} {
-	return v.value
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/variant_lexer.go b/Godeps/_workspace/src/github.com/godbus/dbus/variant_lexer.go
deleted file mode 100644
index 332007d6f1..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/variant_lexer.go
+++ /dev/null
@@ -1,284 +0,0 @@
-package dbus
-
-import (
-	"fmt"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-// Heavily inspired by the lexer from text/template.
-
-type varToken struct {
-	typ varTokenType
-	val string
-}
-
-type varTokenType byte
-
-const (
-	tokEOF varTokenType = iota
-	tokError
-	tokNumber
-	tokString
-	tokBool
-	tokArrayStart
-	tokArrayEnd
-	tokDictStart
-	tokDictEnd
-	tokVariantStart
-	tokVariantEnd
-	tokComma
-	tokColon
-	tokType
-	tokByteString
-)
-
-type varLexer struct {
-	input  string
-	start  int
-	pos    int
-	width  int
-	tokens []varToken
-}
-
-type lexState func(*varLexer) lexState
-
-func varLex(s string) []varToken {
-	l := &varLexer{input: s}
-	l.run()
-	return l.tokens
-}
-
-func (l *varLexer) accept(valid string) bool {
-	if strings.IndexRune(valid, l.next()) >= 0 {
-		return true
-	}
-	l.backup()
-	return false
-}
-
-func (l *varLexer) backup() {
-	l.pos -= l.width
-}
-
-func (l *varLexer) emit(t varTokenType) {
-	l.tokens = append(l.tokens, varToken{t, l.input[l.start:l.pos]})
-	l.start = l.pos
-}
-
-func (l *varLexer) errorf(format string, v ...interface{}) lexState {
-	l.tokens = append(l.tokens, varToken{
-		tokError,
-		fmt.Sprintf(format, v...),
-	})
-	return nil
-}
-
-func (l *varLexer) ignore() {
-	l.start = l.pos
-}
-
-func (l *varLexer) next() rune {
-	var r rune
-
-	if l.pos >= len(l.input) {
-		l.width = 0
-		return -1
-	}
-	r, l.width = utf8.DecodeRuneInString(l.input[l.pos:])
-	l.pos += l.width
-	return r
-}
-
-func (l *varLexer) run() {
-	for state := varLexNormal; state != nil; {
-		state = state(l)
-	}
-}
-
-func (l *varLexer) peek() rune {
-	r := l.next()
-	l.backup()
-	return r
-}
-
-func varLexNormal(l *varLexer) lexState {
-	for {
-		r := l.next()
-		switch {
-		case r == -1:
-			l.emit(tokEOF)
-			return nil
-		case r == '[':
-			l.emit(tokArrayStart)
-		case r == ']':
-			l.emit(tokArrayEnd)
-		case r == '{':
-			l.emit(tokDictStart)
-		case r == '}':
-			l.emit(tokDictEnd)
-		case r == '<':
-			l.emit(tokVariantStart)
-		case r == '>':
-			l.emit(tokVariantEnd)
-		case r == ':':
-			l.emit(tokColon)
-		case r == ',':
-			l.emit(tokComma)
-		case r == '\'' || r == '"':
-			l.backup()
-			return varLexString
-		case r == '@':
-			l.backup()
-			return varLexType
-		case unicode.IsSpace(r):
-			l.ignore()
-		case unicode.IsNumber(r) || r == '+' || r == '-':
-			l.backup()
-			return varLexNumber
-		case r == 'b':
-			pos := l.start
-			if n := l.peek(); n == '"' || n == '\'' {
-				return varLexByteString
-			}
-			// not a byte string; try to parse it as a type or bool below
-			l.pos = pos + 1
-			l.width = 1
-			fallthrough
-		default:
-			// either a bool or a type. Try bools first.
-			l.backup()
-			if l.pos+4 <= len(l.input) {
-				if l.input[l.pos:l.pos+4] == "true" {
-					l.pos += 4
-					l.emit(tokBool)
-					continue
-				}
-			}
-			if l.pos+5 <= len(l.input) {
-				if l.input[l.pos:l.pos+5] == "false" {
-					l.pos += 5
-					l.emit(tokBool)
-					continue
-				}
-			}
-			// must be a type.
-			return varLexType
-		}
-	}
-}
-
-var varTypeMap = map[string]string{
-	"boolean":    "b",
-	"byte":       "y",
-	"int16":      "n",
-	"uint16":     "q",
-	"int32":      "i",
-	"uint32":     "u",
-	"int64":      "x",
-	"uint64":     "t",
-	"double":     "f",
-	"string":     "s",
-	"objectpath": "o",
-	"signature":  "g",
-}
-
-func varLexByteString(l *varLexer) lexState {
-	q := l.next()
-Loop:
-	for {
-		switch l.next() {
-		case '\\':
-			if r := l.next(); r != -1 {
-				break
-			}
-			fallthrough
-		case -1:
-			return l.errorf("unterminated bytestring")
-		case q:
-			break Loop
-		}
-	}
-	l.emit(tokByteString)
-	return varLexNormal
-}
-
-func varLexNumber(l *varLexer) lexState {
-	l.accept("+-")
-	digits := "0123456789"
-	if l.accept("0") {
-		if l.accept("x") {
-			digits = "0123456789abcdefABCDEF"
-		} else {
-			digits = "01234567"
-		}
-	}
-	for strings.IndexRune(digits, l.next()) >= 0 {
-	}
-	l.backup()
-	if l.accept(".") {
-		for strings.IndexRune(digits, l.next()) >= 0 {
-		}
-		l.backup()
-	}
-	if l.accept("eE") {
-		l.accept("+-")
-		for strings.IndexRune("0123456789", l.next()) >= 0 {
-		}
-		l.backup()
-	}
-	if r := l.peek(); unicode.IsLetter(r) {
-		l.next()
-		return l.errorf("bad number syntax: %q", l.input[l.start:l.pos])
-	}
-	l.emit(tokNumber)
-	return varLexNormal
-}
-
-func varLexString(l *varLexer) lexState {
-	q := l.next()
-Loop:
-	for {
-		switch l.next() {
-		case '\\':
-			if r := l.next(); r != -1 {
-				break
-			}
-			fallthrough
-		case -1:
-			return l.errorf("unterminated string")
-		case q:
-			break Loop
-		}
-	}
-	l.emit(tokString)
-	return varLexNormal
-}
-
-func varLexType(l *varLexer) lexState {
-	at := l.accept("@")
-	for {
-		r := l.next()
-		if r == -1 {
-			break
-		}
-		if unicode.IsSpace(r) {
-			l.backup()
-			break
-		}
-	}
-	if at {
-		if _, err := ParseSignature(l.input[l.start+1 : l.pos]); err != nil {
-			return l.errorf("%s", err)
-		}
-	} else {
-		if _, ok := varTypeMap[l.input[l.start:l.pos]]; ok {
-			l.emit(tokType)
-			return varLexNormal
-		}
-		return l.errorf("unrecognized type %q", l.input[l.start:l.pos])
-	}
-	l.emit(tokType)
-	return varLexNormal
-}
diff --git a/Godeps/_workspace/src/github.com/godbus/dbus/variant_parser.go b/Godeps/_workspace/src/github.com/godbus/dbus/variant_parser.go
deleted file mode 100644
index d20f5da6dd..0000000000
--- a/Godeps/_workspace/src/github.com/godbus/dbus/variant_parser.go
+++ /dev/null
@@ -1,817 +0,0 @@
-package dbus
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"reflect"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type varParser struct {
-	tokens []varToken
-	i      int
-}
-
-func (p *varParser) backup() {
-	p.i--
-}
-
-func (p *varParser) next() varToken {
-	if p.i < len(p.tokens) {
-		t := p.tokens[p.i]
-		p.i++
-		return t
-	}
-	return varToken{typ: tokEOF}
-}
-
-type varNode interface {
-	Infer() (Signature, error)
-	String() string
-	Sigs() sigSet
-	Value(Signature) (interface{}, error)
-}
-
-func varMakeNode(p *varParser) (varNode, error) {
-	var sig Signature
-
-	for {
-		t := p.next()
-		switch t.typ {
-		case tokEOF:
-			return nil, io.ErrUnexpectedEOF
-		case tokError:
-			return nil, errors.New(t.val)
-		case tokNumber:
-			return varMakeNumNode(t, sig)
-		case tokString:
-			return varMakeStringNode(t, sig)
-		case tokBool:
-			if sig.str != "" && sig.str != "b" {
-				return nil, varTypeError{t.val, sig}
-			}
-			b, err := strconv.ParseBool(t.val)
-			if err != nil {
-				return nil, err
-			}
-			return boolNode(b), nil
-		case tokArrayStart:
-			return varMakeArrayNode(p, sig)
-		case tokVariantStart:
-			return varMakeVariantNode(p, sig)
-		case tokDictStart:
-			return varMakeDictNode(p, sig)
-		case tokType:
-			if sig.str != "" {
-				return nil, errors.New("unexpected type annotation")
-			}
-			if t.val[0] == '@' {
-				sig.str = t.val[1:]
-			} else {
-				sig.str = varTypeMap[t.val]
-			}
-		case tokByteString:
-			if sig.str != "" && sig.str != "ay" {
-				return nil, varTypeError{t.val, sig}
-			}
-			b, err := varParseByteString(t.val)
-			if err != nil {
-				return nil, err
-			}
-			return byteStringNode(b), nil
-		default:
-			return nil, fmt.Errorf("unexpected %q", t.val)
-		}
-	}
-}
-
-type varTypeError struct {
-	val string
-	sig Signature
-}
-
-func (e varTypeError) Error() string {
-	return fmt.Sprintf("dbus: can't parse %q as type %q", e.val, e.sig.str)
-}
-
-type sigSet map[Signature]bool
-
-func (s sigSet) Empty() bool {
-	return len(s) == 0
-}
-
-func (s sigSet) Intersect(s2 sigSet) sigSet {
-	r := make(sigSet)
-	for k := range s {
-		if s2[k] {
-			r[k] = true
-		}
-	}
-	return r
-}
-
-func (s sigSet) Single() (Signature, bool) {
-	if len(s) == 1 {
-		for k := range s {
-			return k, true
-		}
-	}
-	return Signature{}, false
-}
-
-func (s sigSet) ToArray() sigSet {
-	r := make(sigSet, len(s))
-	for k := range s {
-		r[Signature{"a" + k.str}] = true
-	}
-	return r
-}
-
-type numNode struct {
-	sig Signature
-	str string
-	val interface{}
-}
-
-var numSigSet = sigSet{
-	Signature{"y"}: true,
-	Signature{"n"}: true,
-	Signature{"q"}: true,
-	Signature{"i"}: true,
-	Signature{"u"}: true,
-	Signature{"x"}: true,
-	Signature{"t"}: true,
-	Signature{"d"}: true,
-}
-
-func (n numNode) Infer() (Signature, error) {
-	if strings.ContainsAny(n.str, ".e") {
-		return Signature{"d"}, nil
-	}
-	return Signature{"i"}, nil
-}
-
-func (n numNode) String() string {
-	return n.str
-}
-
-func (n numNode) Sigs() sigSet {
-	if n.sig.str != "" {
-		return sigSet{n.sig: true}
-	}
-	if strings.ContainsAny(n.str, ".e") {
-		return sigSet{Signature{"d"}: true}
-	}
-	return numSigSet
-}
-
-func (n numNode) Value(sig Signature) (interface{}, error) {
-	if n.sig.str != "" && n.sig != sig {
-		return nil, varTypeError{n.str, sig}
-	}
-	if n.val != nil {
-		return n.val, nil
-	}
-	return varNumAs(n.str, sig)
-}
-
-func varMakeNumNode(tok varToken, sig Signature) (varNode, error) {
-	if sig.str == "" {
-		return numNode{str: tok.val}, nil
-	}
-	num, err := varNumAs(tok.val, sig)
-	if err != nil {
-		return nil, err
-	}
-	return numNode{sig: sig, val: num}, nil
-}
-
-func varNumAs(s string, sig Signature) (interface{}, error) {
-	isUnsigned := false
-	size := 32
-	switch sig.str {
-	case "n":
-		size = 16
-	case "i":
-	case "x":
-		size = 64
-	case "y":
-		size = 8
-		isUnsigned = true
-	case "q":
-		size = 16
-		isUnsigned = true
-	case "u":
-		isUnsigned = true
-	case "t":
-		size = 64
-		isUnsigned = true
-	case "d":
-		d, err := strconv.ParseFloat(s, 64)
-		if err != nil {
-			return nil, err
-		}
-		return d, nil
-	default:
-		return nil, varTypeError{s, sig}
-	}
-	base := 10
-	if strings.HasPrefix(s, "0x") {
-		base = 16
-		s = s[2:]
-	}
-	if strings.HasPrefix(s, "0") && len(s) != 1 {
-		base = 8
-		s = s[1:]
-	}
-	if isUnsigned {
-		i, err := strconv.ParseUint(s, base, size)
-		if err != nil {
-			return nil, err
-		}
-		var v interface{} = i
-		switch sig.str {
-		case "y":
-			v = byte(i)
-		case "q":
-			v = uint16(i)
-		case "u":
-			v = uint32(i)
-		}
-		return v, nil
-	}
-	i, err := strconv.ParseInt(s, base, size)
-	if err != nil {
-		return nil, err
-	}
-	var v interface{} = i
-	switch sig.str {
-	case "n":
-		v = int16(i)
-	case "i":
-		v = int32(i)
-	}
-	return v, nil
-}
-
-type stringNode struct {
-	sig Signature
-	str string      // parsed
-	val interface{} // has correct type
-}
-
-var stringSigSet = sigSet{
-	Signature{"s"}: true,
-	Signature{"g"}: true,
-	Signature{"o"}: true,
-}
-
-func (n stringNode) Infer() (Signature, error) {
-	return Signature{"s"}, nil
-}
-
-func (n stringNode) String() string {
-	return n.str
-}
-
-func (n stringNode) Sigs() sigSet {
-	if n.sig.str != "" {
-		return sigSet{n.sig: true}
-	}
-	return stringSigSet
-}
-
-func (n stringNode) Value(sig Signature) (interface{}, error) {
-	if n.sig.str != "" && n.sig != sig {
-		return nil, varTypeError{n.str, sig}
-	}
-	if n.val != nil {
-		return n.val, nil
-	}
-	switch {
-	case sig.str == "g":
-		return Signature{n.str}, nil
-	case sig.str == "o":
-		return ObjectPath(n.str), nil
-	case sig.str == "s":
-		return n.str, nil
-	default:
-		return nil, varTypeError{n.str, sig}
-	}
-}
-
-func varMakeStringNode(tok varToken, sig Signature) (varNode, error) {
-	if sig.str != "" && sig.str != "s" && sig.str != "g" && sig.str != "o" {
-		return nil, fmt.Errorf("invalid type %q for string", sig.str)
-	}
-	s, err := varParseString(tok.val)
-	if err != nil {
-		return nil, err
-	}
-	n := stringNode{str: s}
-	if sig.str == "" {
-		return stringNode{str: s}, nil
-	}
-	n.sig = sig
-	switch sig.str {
-	case "o":
-		n.val = ObjectPath(s)
-	case "g":
-		n.val = Signature{s}
-	case "s":
-		n.val = s
-	}
-	return n, nil
-}
-
-func varParseString(s string) (string, error) {
-	// quotes are guaranteed to be there
-	s = s[1 : len(s)-1]
-	buf := new(bytes.Buffer)
-	for len(s) != 0 {
-		r, size := utf8.DecodeRuneInString(s)
-		if r == utf8.RuneError && size == 1 {
-			return "", errors.New("invalid UTF-8")
-		}
-		s = s[size:]
-		if r != '\\' {
-			buf.WriteRune(r)
-			continue
-		}
-		r, size = utf8.DecodeRuneInString(s)
-		if r == utf8.RuneError && size == 1 {
-			return "", errors.New("invalid UTF-8")
-		}
-		s = s[size:]
-		switch r {
-		case 'a':
-			buf.WriteRune(0x7)
-		case 'b':
-			buf.WriteRune(0x8)
-		case 'f':
-			buf.WriteRune(0xc)
-		case 'n':
-			buf.WriteRune('\n')
-		case 'r':
-			buf.WriteRune('\r')
-		case 't':
-			buf.WriteRune('\t')
-		case '\n':
-		case 'u':
-			if len(s) < 4 {
-				return "", errors.New("short unicode escape")
-			}
-			r, err := strconv.ParseUint(s[:4], 16, 32)
-			if err != nil {
-				return "", err
-			}
-			buf.WriteRune(rune(r))
-			s = s[4:]
-		case 'U':
-			if len(s) < 8 {
-				return "", errors.New("short unicode escape")
-			}
-			r, err := strconv.ParseUint(s[:8], 16, 32)
-			if err != nil {
-				return "", err
-			}
-			buf.WriteRune(rune(r))
-			s = s[8:]
-		default:
-			buf.WriteRune(r)
-		}
-	}
-	return buf.String(), nil
-}
-
-var boolSigSet = sigSet{Signature{"b"}: true}
-
-type boolNode bool
-
-func (boolNode) Infer() (Signature, error) {
-	return Signature{"b"}, nil
-}
-
-func (b boolNode) String() string {
-	if b {
-		return "true"
-	}
-	return "false"
-}
-
-func (boolNode) Sigs() sigSet {
-	return boolSigSet
-}
-
-func (b boolNode) Value(sig Signature) (interface{}, error) {
-	if sig.str != "b" {
-		return nil, varTypeError{b.String(), sig}
-	}
-	return bool(b), nil
-}
-
-type arrayNode struct {
-	set      sigSet
-	children []varNode
-	val      interface{}
-}
-
-func (n arrayNode) Infer() (Signature, error) {
-	for _, v := range n.children {
-		csig, err := varInfer(v)
-		if err != nil {
-			continue
-		}
-		return Signature{"a" + csig.str}, nil
-	}
-	return Signature{}, fmt.Errorf("can't infer type for %q", n.String())
-}
-
-func (n arrayNode) String() string {
-	s := "["
-	for i, v := range n.children {
-		s += v.String()
-		if i != len(n.children)-1 {
-			s += ", "
-		}
-	}
-	return s + "]"
-}
-
-func (n arrayNode) Sigs() sigSet {
-	return n.set
-}
-
-func (n arrayNode) Value(sig Signature) (interface{}, error) {
-	if n.set.Empty() {
-		// no type information whatsoever, so this must be an empty slice
-		return reflect.MakeSlice(typeFor(sig.str), 0, 0).Interface(), nil
-	}
-	if !n.set[sig] {
-		return nil, varTypeError{n.String(), sig}
-	}
-	s := reflect.MakeSlice(typeFor(sig.str), len(n.children), len(n.children))
-	for i, v := range n.children {
-		rv, err := v.Value(Signature{sig.str[1:]})
-		if err != nil {
-			return nil, err
-		}
-		s.Index(i).Set(reflect.ValueOf(rv))
-	}
-	return s.Interface(), nil
-}
-
-func varMakeArrayNode(p *varParser, sig Signature) (varNode, error) {
-	var n arrayNode
-	if sig.str != "" {
-		n.set = sigSet{sig: true}
-	}
-	if t := p.next(); t.typ == tokArrayEnd {
-		return n, nil
-	} else {
-		p.backup()
-	}
-Loop:
-	for {
-		t := p.next()
-		switch t.typ {
-		case tokEOF:
-			return nil, io.ErrUnexpectedEOF
-		case tokError:
-			return nil, errors.New(t.val)
-		}
-		p.backup()
-		cn, err := varMakeNode(p)
-		if err != nil {
-			return nil, err
-		}
-		if cset := cn.Sigs(); !cset.Empty() {
-			if n.set.Empty() {
-				n.set = cset.ToArray()
-			} else {
-				nset := cset.ToArray().Intersect(n.set)
-				if nset.Empty() {
-					return nil, fmt.Errorf("can't parse %q with given type information", cn.String())
-				}
-				n.set = nset
-			}
-		}
-		n.children = append(n.children, cn)
-		switch t := p.next(); t.typ {
-		case tokEOF:
-			return nil, io.ErrUnexpectedEOF
-		case tokError:
-			return nil, errors.New(t.val)
-		case tokArrayEnd:
-			break Loop
-		case tokComma:
-			continue
-		default:
-			return nil, fmt.Errorf("unexpected %q", t.val)
-		}
-	}
-	return n, nil
-}
-
-type variantNode struct {
-	n varNode
-}
-
-var variantSet = sigSet{
-	Signature{"v"}: true,
-}
-
-func (variantNode) Infer() (Signature, error) {
-	return Signature{"v"}, nil
-}
-
-func (n variantNode) String() string {
-	return "<" + n.n.String() + ">"
-}
-
-func (variantNode) Sigs() sigSet {
-	return variantSet
-}
-
-func (n variantNode) Value(sig Signature) (interface{}, error) {
-	if sig.str != "v" {
-		return nil, varTypeError{n.String(), sig}
-	}
-	sig, err := varInfer(n.n)
-	if err != nil {
-		return nil, err
-	}
-	v, err := n.n.Value(sig)
-	if err != nil {
-		return nil, err
-	}
-	return MakeVariant(v), nil
-}
-
-func varMakeVariantNode(p *varParser, sig Signature) (varNode, error) {
-	n, err := varMakeNode(p)
-	if err != nil {
-		return nil, err
-	}
-	if t := p.next(); t.typ != tokVariantEnd {
-		return nil, fmt.Errorf("unexpected %q", t.val)
-	}
-	vn := variantNode{n}
-	if sig.str != "" && sig.str != "v" {
-		return nil, varTypeError{vn.String(), sig}
-	}
-	return variantNode{n}, nil
-}
-
-type dictEntry struct {
-	key, val varNode
-}
-
-type dictNode struct {
-	kset, vset sigSet
-	children   []dictEntry
-	val        interface{}
-}
-
-func (n dictNode) Infer() (Signature, error) {
-	for _, v := range n.children {
-		ksig, err := varInfer(v.key)
-		if err != nil {
-			continue
-		}
-		vsig, err := varInfer(v.val)
-		if err != nil {
-			continue
-		}
-		return Signature{"a{" + ksig.str + vsig.str + "}"}, nil
-	}
-	return Signature{}, fmt.Errorf("can't infer type for %q", n.String())
-}
-
-func (n dictNode) String() string {
-	s := "{"
-	for i, v := range n.children {
-		s += v.key.String() + ": " + v.val.String()
-		if i != len(n.children)-1 {
-			s += ", "
-		}
-	}
-	return s + "}"
-}
-
-func (n dictNode) Sigs() sigSet {
-	r := sigSet{}
-	for k := range n.kset {
-		for v := range n.vset {
-			sig := "a{" + k.str + v.str + "}"
-			r[Signature{sig}] = true
-		}
-	}
-	return r
-}
-
-func (n dictNode) Value(sig Signature) (interface{}, error) {
-	set := n.Sigs()
-	if set.Empty() {
-		// no type information -> empty dict
-		return reflect.MakeMap(typeFor(sig.str)).Interface(), nil
-	}
-	if !set[sig] {
-		return nil, varTypeError{n.String(), sig}
-	}
-	m := reflect.MakeMap(typeFor(sig.str))
-	ksig := Signature{sig.str[2:3]}
-	vsig := Signature{sig.str[3 : len(sig.str)-1]}
-	for _, v := range n.children {
-		kv, err := v.key.Value(ksig)
-		if err != nil {
-			return nil, err
-		}
-		vv, err := v.val.Value(vsig)
-		if err != nil {
-			return nil, err
-		}
-		m.SetMapIndex(reflect.ValueOf(kv), reflect.ValueOf(vv))
-	}
-	return m.Interface(), nil
-}
-
-func varMakeDictNode(p *varParser, sig Signature) (varNode, error) {
-	var n dictNode
-
-	if sig.str != "" {
-		if len(sig.str) < 5 {
-			return nil, fmt.Errorf("invalid signature %q for dict type", sig)
-		}
-		ksig := Signature{string(sig.str[2])}
-		vsig := Signature{sig.str[3 : len(sig.str)-1]}
-		n.kset = sigSet{ksig: true}
-		n.vset = sigSet{vsig: true}
-	}
-	if t := p.next(); t.typ == tokDictEnd {
-		return n, nil
-	} else {
-		p.backup()
-	}
-Loop:
-	for {
-		t := p.next()
-		switch t.typ {
-		case tokEOF:
-			return nil, io.ErrUnexpectedEOF
-		case tokError:
-			return nil, errors.New(t.val)
-		}
-		p.backup()
-		kn, err := varMakeNode(p)
-		if err != nil {
-			return nil, err
-		}
-		if kset := kn.Sigs(); !kset.Empty() {
-			if n.kset.Empty() {
-				n.kset = kset
-			} else {
-				n.kset = kset.Intersect(n.kset)
-				if n.kset.Empty() {
-					return nil, fmt.Errorf("can't parse %q with given type information", kn.String())
-				}
-			}
-		}
-		t = p.next()
-		switch t.typ {
-		case tokEOF:
-			return nil, io.ErrUnexpectedEOF
-		case tokError:
-			return nil, errors.New(t.val)
-		case tokColon:
-		default:
-			return nil, fmt.Errorf("unexpected %q", t.val)
-		}
-		t = p.next()
-		switch t.typ {
-		case tokEOF:
-			return nil, io.ErrUnexpectedEOF
-		case tokError:
-			return nil, errors.New(t.val)
-		}
-		p.backup()
-		vn, err := varMakeNode(p)
-		if err != nil {
-			return nil, err
-		}
-		if vset := vn.Sigs(); !vset.Empty() {
-			if n.vset.Empty() {
-				n.vset = vset
-			} else {
-				n.vset = n.vset.Intersect(vset)
-				if n.vset.Empty() {
-					return nil, fmt.Errorf("can't parse %q with given type information", vn.String())
-				}
-			}
-		}
-		n.children = append(n.children, dictEntry{kn, vn})
-		t = p.next()
-		switch t.typ {
-		case tokEOF:
-			return nil, io.ErrUnexpectedEOF
-		case tokError:
-			return nil, errors.New(t.val)
-		case tokDictEnd:
-			break Loop
-		case tokComma:
-			continue
-		default:
-			return nil, fmt.Errorf("unexpected %q", t.val)
-		}
-	}
-	return n, nil
-}
-
-type byteStringNode []byte
-
-var byteStringSet = sigSet{
-	Signature{"ay"}: true,
-}
-
-func (byteStringNode) Infer() (Signature, error) {
-	return Signature{"ay"}, nil
-}
-
-func (b byteStringNode) String() string {
-	return string(b)
-}
-
-func (b byteStringNode) Sigs() sigSet {
-	return byteStringSet
-}
-
-func (b byteStringNode) Value(sig Signature) (interface{}, error) {
-	if sig.str != "ay" {
-		return nil, varTypeError{b.String(), sig}
-	}
-	return []byte(b), nil
-}
-
-func varParseByteString(s string) ([]byte, error) {
-	// quotes and b at start are guaranteed to be there
-	b := make([]byte, 0, 1)
-	s = s[2 : len(s)-1]
-	for len(s) != 0 {
-		c := s[0]
-		s = s[1:]
-		if c != '\\' {
-			b = append(b, c)
-			continue
-		}
-		c = s[0]
-		s = s[1:]
-		switch c {
-		case 'a':
-			b = append(b, 0x7)
-		case 'b':
-			b = append(b, 0x8)
-		case 'f':
-			b = append(b, 0xc)
-		case 'n':
-			b = append(b, '\n')
-		case 'r':
-			b = append(b, '\r')
-		case 't':
-			b = append(b, '\t')
-		case 'x':
-			if len(s) < 2 {
-				return nil, errors.New("short escape")
-			}
-			n, err := strconv.ParseUint(s[:2], 16, 8)
-			if err != nil {
-				return nil, err
-			}
-			b = append(b, byte(n))
-			s = s[2:]
-		case '0':
-			if len(s) < 3 {
-				return nil, errors.New("short escape")
-			}
-			n, err := strconv.ParseUint(s[:3], 8, 8)
-			if err != nil {
-				return nil, err
-			}
-			b = append(b, byte(n))
-			s = s[3:]
-		default:
-			b = append(b, c)
-		}
-	}
-	return append(b, 0), nil
-}
-
-func varInfer(n varNode) (Signature, error) {
-	if sig, ok := n.Sigs().Single(); ok {
-		return sig, nil
-	}
-	return n.Infer()
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE b/Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE
deleted file mode 100644
index 335e38e19b..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/LICENSE
+++ /dev/null
@@ -1,36 +0,0 @@
-Extensions for Protocol Buffers to create more go like structures.
-
-Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-http://github.com/gogo/protobuf/gogoproto
-
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https://github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile
deleted file mode 100644
index 23a6b17344..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-install:
-	go install
-
-test: install generate-test-pbs
-	go test
-
-
-generate-test-pbs:
-	make install
-	make -C testdata
-	protoc-min-version --version="3.0.0" --proto_path=.:../../../../ --gogo_out=. proto3_proto/proto3.proto
-	make
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go
deleted file mode 100644
index 79edb86119..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go
+++ /dev/null
@@ -1,228 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Protocol buffer deep copy and merge.
-// TODO: RawMessage.
-
-package proto
-
-import (
-	"log"
-	"reflect"
-	"strings"
-)
-
-// Clone returns a deep copy of a protocol buffer.
-func Clone(pb Message) Message {
-	in := reflect.ValueOf(pb)
-	if in.IsNil() {
-		return pb
-	}
-
-	out := reflect.New(in.Type().Elem())
-	// out is empty so a merge is a deep copy.
-	mergeStruct(out.Elem(), in.Elem())
-	return out.Interface().(Message)
-}
-
-// Merge merges src into dst.
-// Required and optional fields that are set in src will be set to that value in dst.
-// Elements of repeated fields will be appended.
-// Merge panics if src and dst are not the same type, or if dst is nil.
-func Merge(dst, src Message) {
-	in := reflect.ValueOf(src)
-	out := reflect.ValueOf(dst)
-	if out.IsNil() {
-		panic("proto: nil destination")
-	}
-	if in.Type() != out.Type() {
-		// Explicit test prior to mergeStruct so that mistyped nils will fail
-		panic("proto: type mismatch")
-	}
-	if in.IsNil() {
-		// Merging nil into non-nil is a quiet no-op
-		return
-	}
-	mergeStruct(out.Elem(), in.Elem())
-}
-
-func mergeStruct(out, in reflect.Value) {
-	sprop := GetProperties(in.Type())
-	for i := 0; i < in.NumField(); i++ {
-		f := in.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
-	}
-
-	if emIn, ok := in.Addr().Interface().(extensionsMap); ok {
-		emOut := out.Addr().Interface().(extensionsMap)
-		mergeExtension(emOut.ExtensionMap(), emIn.ExtensionMap())
-	} else if emIn, ok := in.Addr().Interface().(extensionsBytes); ok {
-		emOut := out.Addr().Interface().(extensionsBytes)
-		bIn := emIn.GetExtensions()
-		bOut := emOut.GetExtensions()
-		*bOut = append(*bOut, *bIn...)
-	}
-
-	uf := in.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return
-	}
-	uin := uf.Bytes()
-	if len(uin) > 0 {
-		out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...))
-	}
-}
-
-// mergeAny performs a merge between two values of the same type.
-// viaPtr indicates whether the values were indirected through a pointer (implying proto2).
-// prop is set if this is a struct field (it may be nil).
-func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
-	if in.Type() == protoMessageType {
-		if !in.IsNil() {
-			if out.IsNil() {
-				out.Set(reflect.ValueOf(Clone(in.Interface().(Message))))
-			} else {
-				Merge(out.Interface().(Message), in.Interface().(Message))
-			}
-		}
-		return
-	}
-	switch in.Kind() {
-	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-		reflect.String, reflect.Uint32, reflect.Uint64:
-		if !viaPtr && isProto3Zero(in) {
-			return
-		}
-		out.Set(in)
-	case reflect.Interface:
-		// Probably a oneof field; copy non-nil values.
-		if in.IsNil() {
-			return
-		}
-		// Allocate destination if it is not set, or set to a different type.
-		// Otherwise we will merge as normal.
-		if out.IsNil() || out.Elem().Type() != in.Elem().Type() {
-			out.Set(reflect.New(in.Elem().Elem().Type())) // interface -> *T -> T -> new(T)
-		}
-		mergeAny(out.Elem(), in.Elem(), false, nil)
-	case reflect.Map:
-		if in.Len() == 0 {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.MakeMap(in.Type()))
-		}
-		// For maps with value types of *T or []byte we need to deep copy each value.
-		elemKind := in.Type().Elem().Kind()
-		for _, key := range in.MapKeys() {
-			var val reflect.Value
-			switch elemKind {
-			case reflect.Ptr:
-				val = reflect.New(in.Type().Elem().Elem())
-				mergeAny(val, in.MapIndex(key), false, nil)
-			case reflect.Slice:
-				val = in.MapIndex(key)
-				val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
-			default:
-				val = in.MapIndex(key)
-			}
-			out.SetMapIndex(key, val)
-		}
-	case reflect.Ptr:
-		if in.IsNil() {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.New(in.Elem().Type()))
-		}
-		mergeAny(out.Elem(), in.Elem(), true, nil)
-	case reflect.Slice:
-		if in.IsNil() {
-			return
-		}
-		if in.Type().Elem().Kind() == reflect.Uint8 {
-			// []byte is a scalar bytes field, not a repeated field.
-
-			// Edge case: if this is in a proto3 message, a zero length
-			// bytes field is considered the zero value, and should not
-			// be merged.
-			if prop != nil && prop.proto3 && in.Len() == 0 {
-				return
-			}
-
-			// Make a deep copy.
-			// Append to []byte{} instead of []byte(nil) so that we never end up
-			// with a nil result.
-			out.SetBytes(append([]byte{}, in.Bytes()...))
-			return
-		}
-		n := in.Len()
-		if out.IsNil() {
-			out.Set(reflect.MakeSlice(in.Type(), 0, n))
-		}
-		switch in.Type().Elem().Kind() {
-		case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-			reflect.String, reflect.Uint32, reflect.Uint64:
-			out.Set(reflect.AppendSlice(out, in))
-		default:
-			for i := 0; i < n; i++ {
-				x := reflect.Indirect(reflect.New(in.Type().Elem()))
-				mergeAny(x, in.Index(i), false, nil)
-				out.Set(reflect.Append(out, x))
-			}
-		}
-	case reflect.Struct:
-		mergeStruct(out, in)
-	default:
-		// unknown type, so not a protocol buffer
-		log.Printf("proto: don't know how to copy %v", in)
-	}
-}
-
-func mergeExtension(out, in map[int32]Extension) {
-	for extNum, eIn := range in {
-		eOut := Extension{desc: eIn.desc}
-		if eIn.value != nil {
-			v := reflect.New(reflect.TypeOf(eIn.value)).Elem()
-			mergeAny(v, reflect.ValueOf(eIn.value), false, nil)
-			eOut.value = v.Interface()
-		}
-		if eIn.enc != nil {
-			eOut.enc = make([]byte, len(eIn.enc))
-			copy(eOut.enc, eIn.enc)
-		}
-
-		out[extNum] = eOut
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go
deleted file mode 100644
index cb5b213f9b..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go
+++ /dev/null
@@ -1,872 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for decoding protocol buffer data to construct in-memory representations.
- */
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-)
-
-// errOverflow is returned when an integer is too large to be represented.
-var errOverflow = errors.New("proto: integer overflow")
-
-// ErrInternalBadWireType is returned by generated code when an incorrect
-// wire type is encountered. It does not get returned to user code.
-var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
-
-// The fundamental decoders that interpret bytes on the wire.
-// Those that take integer types all return uint64 and are
-// therefore of type valueDecoder.
-
-// DecodeVarint reads a varint-encoded integer from the slice.
-// It returns the integer and the number of bytes consumed, or
-// zero if there is not enough.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func DecodeVarint(buf []byte) (x uint64, n int) {
-	// x, n already 0
-	for shift := uint(0); shift < 64; shift += 7 {
-		if n >= len(buf) {
-			return 0, 0
-		}
-		b := uint64(buf[n])
-		n++
-		x |= (b & 0x7F) << shift
-		if (b & 0x80) == 0 {
-			return x, n
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	return 0, 0
-}
-
-// DecodeVarint reads a varint-encoded integer from the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) DecodeVarint() (x uint64, err error) {
-	// x, err already 0
-
-	i := p.index
-	l := len(p.buf)
-
-	for shift := uint(0); shift < 64; shift += 7 {
-		if i >= l {
-			err = io.ErrUnexpectedEOF
-			return
-		}
-		b := p.buf[i]
-		i++
-		x |= (uint64(b) & 0x7F) << shift
-		if b < 0x80 {
-			p.index = i
-			return
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	err = errOverflow
-	return
-}
-
-// DecodeFixed64 reads a 64-bit integer from the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) DecodeFixed64() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 8
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-8])
-	x |= uint64(p.buf[i-7]) << 8
-	x |= uint64(p.buf[i-6]) << 16
-	x |= uint64(p.buf[i-5]) << 24
-	x |= uint64(p.buf[i-4]) << 32
-	x |= uint64(p.buf[i-3]) << 40
-	x |= uint64(p.buf[i-2]) << 48
-	x |= uint64(p.buf[i-1]) << 56
-	return
-}
-
-// DecodeFixed32 reads a 32-bit integer from the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) DecodeFixed32() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 4
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-4])
-	x |= uint64(p.buf[i-3]) << 8
-	x |= uint64(p.buf[i-2]) << 16
-	x |= uint64(p.buf[i-1]) << 24
-	return
-}
-
-// DecodeZigzag64 reads a zigzag-encoded 64-bit integer
-// from the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) DecodeZigzag64() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63)
-	return
-}
-
-// DecodeZigzag32 reads a zigzag-encoded 32-bit integer
-// from  the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31))
-	return
-}
-
-// These are not ValueDecoders: they produce an array of bytes or a string.
-// bytes, embedded messages
-
-// DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) {
-	n, err := p.DecodeVarint()
-	if err != nil {
-		return nil, err
-	}
-
-	nb := int(n)
-	if nb < 0 {
-		return nil, fmt.Errorf("proto: bad byte length %d", nb)
-	}
-	end := p.index + nb
-	if end < p.index || end > len(p.buf) {
-		return nil, io.ErrUnexpectedEOF
-	}
-
-	if !alloc {
-		// todo: check if can get more uses of alloc=false
-		buf = p.buf[p.index:end]
-		p.index += nb
-		return
-	}
-
-	buf = make([]byte, nb)
-	copy(buf, p.buf[p.index:])
-	p.index += nb
-	return
-}
-
-// DecodeStringBytes reads an encoded string from the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) DecodeStringBytes() (s string, err error) {
-	buf, err := p.DecodeRawBytes(false)
-	if err != nil {
-		return
-	}
-	return string(buf), nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-// If the protocol buffer has extensions, and the field matches, add it as an extension.
-// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
-func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
-	oi := o.index
-
-	err := o.skip(t, tag, wire)
-	if err != nil {
-		return err
-	}
-
-	if !unrecField.IsValid() {
-		return nil
-	}
-
-	ptr := structPointer_Bytes(base, unrecField)
-
-	// Add the skipped field to struct field
-	obuf := o.buf
-
-	o.buf = *ptr
-	o.EncodeVarint(uint64(tag<<3 | wire))
-	*ptr = append(o.buf, obuf[oi:o.index]...)
-
-	o.buf = obuf
-
-	return nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
-
-	var u uint64
-	var err error
-
-	switch wire {
-	case WireVarint:
-		_, err = o.DecodeVarint()
-	case WireFixed64:
-		_, err = o.DecodeFixed64()
-	case WireBytes:
-		_, err = o.DecodeRawBytes(false)
-	case WireFixed32:
-		_, err = o.DecodeFixed32()
-	case WireStartGroup:
-		for {
-			u, err = o.DecodeVarint()
-			if err != nil {
-				break
-			}
-			fwire := int(u & 0x7)
-			if fwire == WireEndGroup {
-				break
-			}
-			ftag := int(u >> 3)
-			err = o.skip(t, ftag, fwire)
-			if err != nil {
-				break
-			}
-		}
-	default:
-		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
-	}
-	return err
-}
-
-// Unmarshaler is the interface representing objects that can
-// unmarshal themselves.  The method should reset the receiver before
-// decoding starts.  The argument points to data that may be
-// overwritten, so implementations should not keep references to the
-// buffer.
-type Unmarshaler interface {
-	Unmarshal([]byte) error
-}
-
-// Unmarshal parses the protocol buffer representation in buf and places the
-// decoded result in pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// Unmarshal resets pb before starting to unmarshal, so any
-// existing data in pb is always removed. Use UnmarshalMerge
-// to preserve and append to existing data.
-func Unmarshal(buf []byte, pb Message) error {
-	pb.Reset()
-	return UnmarshalMerge(buf, pb)
-}
-
-// UnmarshalMerge parses the protocol buffer representation in buf and
-// writes the decoded result to pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// UnmarshalMerge merges into existing data in pb.
-// Most code should use Unmarshal instead.
-func UnmarshalMerge(buf []byte, pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		return u.Unmarshal(buf)
-	}
-	return NewBuffer(buf).Unmarshal(pb)
-}
-
-// DecodeMessage reads a count-delimited message from the Buffer.
-func (p *Buffer) DecodeMessage(pb Message) error {
-	enc, err := p.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	return NewBuffer(enc).Unmarshal(pb)
-}
-
-// DecodeGroup reads a tag-delimited group from the Buffer.
-func (p *Buffer) DecodeGroup(pb Message) error {
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-	return p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), true, base)
-}
-
-// Unmarshal parses the protocol buffer representation in the
-// Buffer and places the decoded result in pb.  If the struct
-// underlying pb does not match the data in the buffer, the results can be
-// unpredictable.
-func (p *Buffer) Unmarshal(pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		err := u.Unmarshal(p.buf[p.index:])
-		p.index = len(p.buf)
-		return err
-	}
-
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-
-	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
-
-	if collectStats {
-		stats.Decode++
-	}
-
-	return err
-}
-
-// unmarshalType does the work of unmarshaling a structure.
-func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
-	var state errorState
-	required, reqFields := prop.reqCount, uint64(0)
-
-	var err error
-	for err == nil && o.index < len(o.buf) {
-		oi := o.index
-		var u uint64
-		u, err = o.DecodeVarint()
-		if err != nil {
-			break
-		}
-		wire := int(u & 0x7)
-		if wire == WireEndGroup {
-			if is_group {
-				return nil // input is satisfied
-			}
-			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
-		}
-		tag := int(u >> 3)
-		if tag <= 0 {
-			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
-		}
-		fieldnum, ok := prop.decoderTags.get(tag)
-		if !ok {
-			// Maybe it's an extension?
-			if prop.extendable {
-				if e := structPointer_Interface(base, st).(extendableProto); isExtensionField(e, int32(tag)) {
-					if err = o.skip(st, tag, wire); err == nil {
-						if ee, eok := e.(extensionsMap); eok {
-							ext := ee.ExtensionMap()[int32(tag)] // may be missing
-							ext.enc = append(ext.enc, o.buf[oi:o.index]...)
-							ee.ExtensionMap()[int32(tag)] = ext
-						} else if ee, eok := e.(extensionsBytes); eok {
-							ext := ee.GetExtensions()
-							*ext = append(*ext, o.buf[oi:o.index]...)
-						}
-					}
-					continue
-				}
-			}
-			// Maybe it's a oneof?
-			if prop.oneofUnmarshaler != nil {
-				m := structPointer_Interface(base, st).(Message)
-				// First return value indicates whether tag is a oneof field.
-				ok, err = prop.oneofUnmarshaler(m, tag, wire, o)
-				if err == ErrInternalBadWireType {
-					// Map the error to something more descriptive.
-					// Do the formatting here to save generated code space.
-					err = fmt.Errorf("bad wiretype for oneof field in %T", m)
-				}
-				if ok {
-					continue
-				}
-			}
-			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
-			continue
-		}
-		p := prop.Prop[fieldnum]
-
-		if p.dec == nil {
-			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
-			continue
-		}
-		dec := p.dec
-		if wire != WireStartGroup && wire != p.WireType {
-			if wire == WireBytes && p.packedDec != nil {
-				// a packable field
-				dec = p.packedDec
-			} else {
-				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
-				continue
-			}
-		}
-		decErr := dec(o, p, base)
-		if decErr != nil && !state.shouldContinue(decErr, p) {
-			err = decErr
-		}
-		if err == nil && p.Required {
-			// Successfully decoded a required field.
-			if tag <= 64 {
-				// use bitmap for fields 1-64 to catch field reuse.
-				var mask uint64 = 1 << uint64(tag-1)
-				if reqFields&mask == 0 {
-					// new required field
-					reqFields |= mask
-					required--
-				}
-			} else {
-				// This is imprecise. It can be fooled by a required field
-				// with a tag > 64 that is encoded twice; that's very rare.
-				// A fully correct implementation would require allocating
-				// a data structure, which we would like to avoid.
-				required--
-			}
-		}
-	}
-	if err == nil {
-		if is_group {
-			return io.ErrUnexpectedEOF
-		}
-		if state.err != nil {
-			return state.err
-		}
-		if required > 0 {
-			// Not enough information to determine the exact field. If we use extra
-			// CPU, we could determine the field only if the missing required field
-			// has a tag <= 64 and we check reqFields.
-			return &RequiredNotSetError{"{Unknown}"}
-		}
-	}
-	return err
-}
-
-// Individual type decoders
-// For each,
-//	u is the decoded value,
-//	v is a pointer to the field (pointer) in the struct
-
-// Sizes of the pools to allocate inside the Buffer.
-// The goal is modest amortization and allocation
-// on at least 16-byte boundaries.
-const (
-	boolPoolSize   = 16
-	uint32PoolSize = 8
-	uint64PoolSize = 4
-)
-
-// Decode a bool.
-func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	if len(o.bools) == 0 {
-		o.bools = make([]bool, boolPoolSize)
-	}
-	o.bools[0] = u != 0
-	*structPointer_Bool(base, p.field) = &o.bools[0]
-	o.bools = o.bools[1:]
-	return nil
-}
-
-func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	*structPointer_BoolVal(base, p.field) = u != 0
-	return nil
-}
-
-// Decode an int32.
-func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
-	return nil
-}
-
-// Decode an int64.
-func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64_Set(structPointer_Word64(base, p.field), o, u)
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
-	return nil
-}
-
-// Decode a string.
-func (o *Buffer) dec_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_String(base, p.field) = &s
-	return nil
-}
-
-func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_StringVal(base, p.field) = s
-	return nil
-}
-
-// Decode a slice of bytes ([]byte).
-func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	*structPointer_Bytes(base, p.field) = b
-	return nil
-}
-
-// Decode a slice of bools ([]bool).
-func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BoolSlice(base, p.field)
-	*v = append(*v, u != 0)
-	return nil
-}
-
-// Decode a slice of bools ([]bool) in packed format.
-func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
-	v := structPointer_BoolSlice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded bools
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-
-	y := *v
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		y = append(y, u != 0)
-	}
-
-	*v = y
-	return nil
-}
-
-// Decode a slice of int32s ([]int32).
-func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	structPointer_Word32Slice(base, p.field).Append(uint32(u))
-	return nil
-}
-
-// Decode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int32s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(uint32(u))
-	}
-	return nil
-}
-
-// Decode a slice of int64s ([]int64).
-func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-
-	structPointer_Word64Slice(base, p.field).Append(u)
-	return nil
-}
-
-// Decode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int64s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(u)
-	}
-	return nil
-}
-
-// Decode a slice of strings ([]string).
-func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	v := structPointer_StringSlice(base, p.field)
-	*v = append(*v, s)
-	return nil
-}
-
-// Decode a slice of slice of bytes ([][]byte).
-func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BytesSlice(base, p.field)
-	*v = append(*v, b)
-	return nil
-}
-
-// Decode a map field.
-func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	oi := o.index       // index at the end of this map entry
-	o.index -= len(raw) // move buffer back to start of map entry
-
-	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
-	if mptr.Elem().IsNil() {
-		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
-	}
-	v := mptr.Elem() // map[K]V
-
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// See enc_new_map for why.
-	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
-	keybase := toStructPointer(keyptr.Addr())                  // **K
-
-	var valbase structPointer
-	var valptr reflect.Value
-	switch p.mtype.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valptr = reflect.ValueOf(&dummy)  // *[]byte
-		valbase = toStructPointer(valptr) // *[]byte
-	case reflect.Ptr:
-		// message; valptr is **Msg; need to allocate the intermediate pointer
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valptr.Set(reflect.New(valptr.Type().Elem()))
-		valbase = toStructPointer(valptr)
-	default:
-		// everything else
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valbase = toStructPointer(valptr.Addr())                   // **V
-	}
-
-	// Decode.
-	// This parses a restricted wire format, namely the encoding of a message
-	// with two fields. See enc_new_map for the format.
-	for o.index < oi {
-		// tagcode for key and value properties are always a single byte
-		// because they have tags 1 and 2.
-		tagcode := o.buf[o.index]
-		o.index++
-		switch tagcode {
-		case p.mkeyprop.tagcode[0]:
-			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
-				return err
-			}
-		case p.mvalprop.tagcode[0]:
-			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
-				return err
-			}
-		default:
-			// TODO: Should we silently skip this instead?
-			return fmt.Errorf("proto: bad map data tag %d", raw[0])
-		}
-	}
-	keyelem, valelem := keyptr.Elem(), valptr.Elem()
-	if !keyelem.IsValid() || !valelem.IsValid() {
-		// We did not decode the key or the value in the map entry.
-		// Either way, it's an invalid map entry.
-		return fmt.Errorf("proto: bad map data: missing key/val")
-	}
-
-	v.SetMapIndex(keyelem, valelem)
-	return nil
-}
-
-// Decode a group.
-func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-	return o.unmarshalType(p.stype, p.sprop, true, bas)
-}
-
-// Decode an embedded message.
-func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
-	raw, e := o.DecodeRawBytes(false)
-	if e != nil {
-		return e
-	}
-
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := structPointer_Interface(bas, p.stype)
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, false, bas)
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of embedded messages.
-func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, false, base)
-}
-
-// Decode a slice of embedded groups.
-func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, true, base)
-}
-
-// Decode a slice of structs ([]*struct).
-func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
-	v := reflect.New(p.stype)
-	bas := toStructPointer(v)
-	structPointer_StructPointerSlice(base, p.field).Append(bas)
-
-	if is_group {
-		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
-		return err
-	}
-
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := v.Interface()
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
-
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go
deleted file mode 100644
index 6a77aad766..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-import (
-	"reflect"
-)
-
-// Decode a reference to a struct pointer.
-func (o *Buffer) dec_ref_struct_message(p *Properties, base structPointer) (err error) {
-	raw, e := o.DecodeRawBytes(false)
-	if e != nil {
-		return e
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		panic("not supported, since this is a pointer receiver")
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	bas := structPointer_FieldPointer(base, p.field)
-
-	err = o.unmarshalType(p.stype, p.sprop, false, bas)
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of references to struct pointers ([]struct).
-func (o *Buffer) dec_slice_ref_struct(p *Properties, is_group bool, base structPointer) error {
-	newBas := appendStructPointer(base, p.field, p.sstype)
-
-	if is_group {
-		panic("not supported, maybe in future, if requested.")
-	}
-
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		panic("not supported, since this is not a pointer receiver.")
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, is_group, newBas)
-
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of references to struct pointers.
-func (o *Buffer) dec_slice_ref_struct_message(p *Properties, base structPointer) error {
-	return o.dec_slice_ref_struct(p, false, base)
-}
-
-func setPtrCustomType(base structPointer, f field, v interface{}) {
-	if v == nil {
-		return
-	}
-	structPointer_SetStructPointer(base, f, structPointer(reflect.ValueOf(v).Pointer()))
-}
-
-func setCustomType(base structPointer, f field, value interface{}) {
-	if value == nil {
-		return
-	}
-	v := reflect.ValueOf(value).Elem()
-	t := reflect.TypeOf(value).Elem()
-	kind := t.Kind()
-	switch kind {
-	case reflect.Slice:
-		slice := reflect.MakeSlice(t, v.Len(), v.Cap())
-		reflect.Copy(slice, v)
-		oldHeader := structPointer_GetSliceHeader(base, f)
-		oldHeader.Data = slice.Pointer()
-		oldHeader.Len = v.Len()
-		oldHeader.Cap = v.Cap()
-	default:
-		l := 1
-		size := reflect.TypeOf(value).Elem().Size()
-		if kind == reflect.Array {
-			l = reflect.TypeOf(value).Elem().Len()
-			size = reflect.TypeOf(value).Size()
-		}
-		total := int(size) * l
-		structPointer_Copy(toStructPointer(reflect.ValueOf(value)), structPointer_Add(base, f), total)
-	}
-}
-
-func (o *Buffer) dec_custom_bytes(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	i := reflect.New(p.ctype.Elem()).Interface()
-	custom := (i).(Unmarshaler)
-	if err := custom.Unmarshal(b); err != nil {
-		return err
-	}
-	setPtrCustomType(base, p.field, custom)
-	return nil
-}
-
-func (o *Buffer) dec_custom_ref_bytes(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	i := reflect.New(p.ctype).Interface()
-	custom := (i).(Unmarshaler)
-	if err := custom.Unmarshal(b); err != nil {
-		return err
-	}
-	if custom != nil {
-		setCustomType(base, p.field, custom)
-	}
-	return nil
-}
-
-// Decode a slice of bytes ([]byte) into a slice of custom types.
-func (o *Buffer) dec_custom_slice_bytes(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	i := reflect.New(p.ctype.Elem()).Interface()
-	custom := (i).(Unmarshaler)
-	if err := custom.Unmarshal(b); err != nil {
-		return err
-	}
-	newBas := appendStructPointer(base, p.field, p.ctype)
-
-	setCustomType(newBas, 0, custom)
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
deleted file mode 100644
index 231b07401a..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
+++ /dev/null
@@ -1,1325 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// RequiredNotSetError is the error returned if Marshal is called with
-// a protocol buffer struct whose required fields have not
-// all been initialized. It is also the error returned if Unmarshal is
-// called with an encoded protocol buffer that does not include all the
-// required fields.
-//
-// When printed, RequiredNotSetError reports the first unset required field in a
-// message. If the field cannot be precisely determined, it is reported as
-// "{Unknown}".
-type RequiredNotSetError struct {
-	field string
-}
-
-func (e *RequiredNotSetError) Error() string {
-	return fmt.Sprintf("proto: required field %q not set", e.field)
-}
-
-var (
-	// errRepeatedHasNil is the error returned if Marshal is called with
-	// a struct with a repeated field containing a nil element.
-	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
-
-	// ErrNil is the error returned if Marshal is called with nil.
-	ErrNil = errors.New("proto: Marshal called with nil")
-)
-
-// The fundamental encoders that put bytes on the wire.
-// Those that take integer types all accept uint64 and are
-// therefore of type valueEncoder.
-
-const maxVarintBytes = 10 // maximum length of a varint
-
-// EncodeVarint returns the varint encoding of x.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-// Not used by the package itself, but helpful to clients
-// wishing to use the same encoding.
-func EncodeVarint(x uint64) []byte {
-	var buf [maxVarintBytes]byte
-	var n int
-	for n = 0; x > 127; n++ {
-		buf[n] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	buf[n] = uint8(x)
-	n++
-	return buf[0:n]
-}
-
-// EncodeVarint writes a varint-encoded integer to the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) EncodeVarint(x uint64) error {
-	for x >= 1<<7 {
-		p.buf = append(p.buf, uint8(x&0x7f|0x80))
-		x >>= 7
-	}
-	p.buf = append(p.buf, uint8(x))
-	return nil
-}
-
-// SizeVarint returns the varint encoding size of an integer.
-func SizeVarint(x uint64) int {
-	return sizeVarint(x)
-}
-
-func sizeVarint(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
-}
-
-// EncodeFixed64 writes a 64-bit integer to the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) EncodeFixed64(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24),
-		uint8(x>>32),
-		uint8(x>>40),
-		uint8(x>>48),
-		uint8(x>>56))
-	return nil
-}
-
-func sizeFixed64(x uint64) int {
-	return 8
-}
-
-// EncodeFixed32 writes a 32-bit integer to the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) EncodeFixed32(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24))
-	return nil
-}
-
-func sizeFixed32(x uint64) int {
-	return 4
-}
-
-// EncodeZigzag64 writes a zigzag-encoded 64-bit integer
-// to the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) EncodeZigzag64(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-
-func sizeZigzag64(x uint64) int {
-	return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-
-// EncodeZigzag32 writes a zigzag-encoded 32-bit integer
-// to the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) EncodeZigzag32(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-func sizeZigzag32(x uint64) int {
-	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-// EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) EncodeRawBytes(b []byte) error {
-	p.EncodeVarint(uint64(len(b)))
-	p.buf = append(p.buf, b...)
-	return nil
-}
-
-func sizeRawBytes(b []byte) int {
-	return sizeVarint(uint64(len(b))) +
-		len(b)
-}
-
-// EncodeStringBytes writes an encoded string to the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) EncodeStringBytes(s string) error {
-	p.EncodeVarint(uint64(len(s)))
-	p.buf = append(p.buf, s...)
-	return nil
-}
-
-func sizeStringBytes(s string) int {
-	return sizeVarint(uint64(len(s))) +
-		len(s)
-}
-
-// Marshaler is the interface representing objects that can marshal themselves.
-type Marshaler interface {
-	Marshal() ([]byte, error)
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, returning the data.
-func Marshal(pb Message) ([]byte, error) {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		return m.Marshal()
-	}
-	p := NewBuffer(nil)
-	err := p.Marshal(pb)
-	var state errorState
-	if err != nil && !state.shouldContinue(err, nil) {
-		return nil, err
-	}
-	if p.buf == nil && err == nil {
-		// Return a non-nil slice on success.
-		return []byte{}, nil
-	}
-	return p.buf, err
-}
-
-// EncodeMessage writes the protocol buffer to the Buffer,
-// prefixed by a varint-encoded length.
-func (p *Buffer) EncodeMessage(pb Message) error {
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		var state errorState
-		err = p.enc_len_struct(GetProperties(t.Elem()), base, &state)
-	}
-	return err
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, writing the result to the
-// Buffer.
-func (p *Buffer) Marshal(pb Message) error {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		data, err := m.Marshal()
-		if err != nil {
-			return err
-		}
-		p.buf = append(p.buf, data...)
-		return nil
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		err = p.enc_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		stats.Encode++
-	}
-
-	return err
-}
-
-// Size returns the encoded size of a protocol buffer.
-func Size(pb Message) (n int) {
-	// Can the object marshal itself?  If so, Size is slow.
-	// TODO: add Size to Marshaler, or add a Sizer interface.
-	if m, ok := pb.(Marshaler); ok {
-		b, _ := m.Marshal()
-		return len(b)
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return 0
-	}
-	if err == nil {
-		n = size_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		stats.Size++
-	}
-
-	return
-}
-
-// Individual type encoders.
-
-// Encode a bool.
-func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := 0
-	if *v {
-		x = 1
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, 1)
-	return nil
-}
-
-func size_bool(p *Properties, base structPointer) int {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-func size_proto3_bool(p *Properties, base structPointer) int {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v && !p.oneof {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-// Encode an int32.
-func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode a uint32.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := word32_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := word32_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode an int64.
-func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return ErrNil
-	}
-	x := word64_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func size_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return 0
-	}
-	x := word64_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-func size_proto3_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-// Encode a string.
-func (o *Buffer) enc_string(p *Properties, base structPointer) error {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := *v
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(v)
-	return nil
-}
-
-func size_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return 0
-	}
-	x := *v
-	n += len(p.tagcode)
-	n += sizeStringBytes(x)
-	return
-}
-
-func size_proto3_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeStringBytes(v)
-	return
-}
-
-// All protocol buffer fields are nillable, but be careful.
-func isNil(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return v.IsNil()
-	}
-	return false
-}
-
-// Encode a message struct.
-func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return ErrNil
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, err := m.Marshal()
-		if err != nil && !state.shouldContinue(err, nil) {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-		return state.err
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	return o.enc_len_struct(p.sprop, structp, &state)
-}
-
-func size_struct_message(p *Properties, base structPointer) int {
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return 0
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, _ := m.Marshal()
-		n0 := len(p.tagcode)
-		n1 := sizeRawBytes(data)
-		return n0 + n1
-	}
-
-	n0 := len(p.tagcode)
-	n1 := size_struct(p.sprop, structp)
-	n2 := sizeVarint(uint64(n1)) // size of encoded length
-	return n0 + n1 + n2
-}
-
-// Encode a group struct.
-func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return ErrNil
-	}
-
-	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	err := o.enc_struct(p.sprop, b)
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return state.err
-}
-
-func size_struct_group(p *Properties, base structPointer) (n int) {
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return 0
-	}
-
-	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	n += size_struct(p.sprop, b)
-	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return
-}
-
-// Encode a slice of bools ([]bool).
-func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	for _, x := range s {
-		o.buf = append(o.buf, p.tagcode...)
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_bool(p *Properties, base structPointer) int {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
-}
-
-// Encode a slice of bools ([]bool) in packed format.
-func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
-	for _, x := range s {
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(l))
-	n += l // each bool takes exactly one byte
-	return
-}
-
-// Encode a slice of bytes ([]byte).
-func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func size_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-// Encode a slice of int32s ([]int32).
-func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(buf, uint64(x))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		bufSize += p.valSize(uint64(x))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of uint32s ([]uint32).
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := s.Index(i)
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := s.Index(i)
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of uint32s ([]uint32) in packed format.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, uint64(s.Index(i)))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(uint64(s.Index(i)))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of int64s ([]int64).
-func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		p.valEnc(o, s.Index(i))
-	}
-	return nil
-}
-
-func size_slice_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		n += p.valSize(s.Index(i))
-	}
-	return
-}
-
-// Encode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, s.Index(i))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(s.Index(i))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of slice of bytes ([][]byte).
-func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return 0
-	}
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeRawBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of strings ([]string).
-func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeStringBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_string(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeStringBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of message structs ([]*struct).
-func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return errRepeatedHasNil
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, err := m.Marshal()
-			if err != nil && !state.shouldContinue(err, nil) {
-				return err
-			}
-			o.buf = append(o.buf, p.tagcode...)
-			o.EncodeRawBytes(data)
-			continue
-		}
-
-		o.buf = append(o.buf, p.tagcode...)
-		err := o.enc_len_struct(p.sprop, structp, &state)
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-	}
-	return state.err
-}
-
-func size_slice_struct_message(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return // return the size up to this point
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, _ := m.Marshal()
-			n += len(p.tagcode)
-			n += sizeRawBytes(data)
-			continue
-		}
-
-		n0 := size_struct(p.sprop, structp)
-		n1 := sizeVarint(uint64(n0)) // size of encoded length
-		n += n0 + n1
-	}
-	return
-}
-
-// Encode a slice of group structs ([]*struct).
-func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return errRepeatedHasNil
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-
-		err := o.enc_struct(p.sprop, b)
-
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	}
-	return state.err
-}
-
-func size_slice_struct_group(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return // return size up to this point
-		}
-
-		n += size_struct(p.sprop, b)
-	}
-	return
-}
-
-// Encode an extension map.
-func (o *Buffer) enc_map(p *Properties, base structPointer) error {
-	v := *structPointer_ExtMap(base, p.field)
-	if err := encodeExtensionMap(v); err != nil {
-		return err
-	}
-	// Fast-path for common cases: zero or one extensions.
-	if len(v) <= 1 {
-		for _, e := range v {
-			o.buf = append(o.buf, e.enc...)
-		}
-		return nil
-	}
-
-	// Sort keys to provide a deterministic encoding.
-	keys := make([]int, 0, len(v))
-	for k := range v {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-
-	for _, k := range keys {
-		o.buf = append(o.buf, v[int32(k)].enc...)
-	}
-	return nil
-}
-
-func size_map(p *Properties, base structPointer) int {
-	v := *structPointer_ExtMap(base, p.field)
-	return sizeExtensionMap(v)
-}
-
-// Encode a map field.
-func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
-	var state errorState // XXX: or do we need to plumb this through?
-
-	/*
-		A map defined as
-			map<key_type, value_type> map_field = N;
-		is encoded in the same way as
-			message MapFieldEntry {
-				key_type key = 1;
-				value_type value = 2;
-			}
-			repeated MapFieldEntry map_field = N;
-	*/
-
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-	if v.Len() == 0 {
-		return nil
-	}
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	enc := func() error {
-		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
-			return err
-		}
-		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	// Don't sort map keys. It is not required by the spec, and C++ doesn't do it.
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-
-		// The only illegal map entry values are nil message pointers.
-		if val.Kind() == reflect.Ptr && val.IsNil() {
-			return errors.New("proto: map has nil element")
-		}
-
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		o.buf = append(o.buf, p.tagcode...)
-		if err := o.enc_len_thing(enc, &state); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func size_new_map(p *Properties, base structPointer) int {
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	n := 0
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		// Tag codes for key and val are the responsibility of the sub-sizer.
-		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
-		valsize := p.mvalprop.size(p.mvalprop, valbase)
-		entry := keysize + valsize
-		// Add on tag code and length of map entry itself.
-		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
-	}
-	return n
-}
-
-// mapEncodeScratch returns a new reflect.Value matching the map's value type,
-// and a structPointer suitable for passing to an encoder or sizer.
-func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
-
-	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
-	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
-	keyptr.Set(keycopy.Addr())                                  //
-	keybase = toStructPointer(keyptr.Addr())                    // **K
-
-	// Value types are more varied and require special handling.
-	switch mapType.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
-		valbase = toStructPointer(valcopy.Addr())
-	case reflect.Ptr:
-		// message; the generated field type is map[K]*Msg (so V is *Msg),
-		// so we only need one level of indirection.
-		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
-		valbase = toStructPointer(valcopy.Addr())
-	default:
-		// everything else
-		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
-		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
-		valptr.Set(valcopy.Addr())                                  //
-		valbase = toStructPointer(valptr.Addr())                    // **V
-	}
-	return
-}
-
-// Encode a struct.
-func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
-	var state errorState
-	// Encode fields in tag order so that decoders may use optimizations
-	// that depend on the ordering.
-	// https://developers.google.com/protocol-buffers/docs/encoding#order
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.enc != nil {
-			err := p.enc(o, p, base)
-			if err != nil {
-				if err == ErrNil {
-					if p.Required && state.err == nil {
-						state.err = &RequiredNotSetError{p.Name}
-					}
-				} else if err == errRepeatedHasNil {
-					// Give more context to nil values in repeated fields.
-					return errors.New("repeated field " + p.OrigName + " has nil element")
-				} else if !state.shouldContinue(err, p) {
-					return err
-				}
-			}
-		}
-	}
-
-	// Do oneof fields.
-	if prop.oneofMarshaler != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		if err := prop.oneofMarshaler(m, o); err != nil {
-			return err
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		if len(v) > 0 {
-			o.buf = append(o.buf, v...)
-		}
-	}
-
-	return state.err
-}
-
-func size_struct(prop *StructProperties, base structPointer) (n int) {
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.size != nil {
-			n += p.size(p, base)
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		n += len(v)
-	}
-
-	// Factor in any oneof fields.
-	if prop.oneofSizer != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		n += prop.oneofSizer(m)
-	}
-
-	return
-}
-
-var zeroes [20]byte // longer than any conceivable sizeVarint
-
-// Encode a struct, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
-	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
-}
-
-// Encode something, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
-	iLen := len(o.buf)
-	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
-	iMsg := len(o.buf)
-	err := enc()
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	lMsg := len(o.buf) - iMsg
-	lLen := sizeVarint(uint64(lMsg))
-	switch x := lLen - (iMsg - iLen); {
-	case x > 0: // actual length is x bytes larger than the space we reserved
-		// Move msg x bytes right.
-		o.buf = append(o.buf, zeroes[:x]...)
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-	case x < 0: // actual length is x bytes smaller than the space we reserved
-		// Move msg x bytes left.
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-		o.buf = o.buf[:len(o.buf)+x] // x is negative
-	}
-	// Encode the length in the reserved space.
-	o.buf = o.buf[:iLen]
-	o.EncodeVarint(uint64(lMsg))
-	o.buf = o.buf[:len(o.buf)+lMsg]
-	return state.err
-}
-
-// errorState maintains the first error that occurs and updates that error
-// with additional context.
-type errorState struct {
-	err error
-}
-
-// shouldContinue reports whether encoding should continue upon encountering the
-// given error. If the error is RequiredNotSetError, shouldContinue returns true
-// and, if this is the first appearance of that error, remembers it for future
-// reporting.
-//
-// If prop is not nil, it may update any error with additional context about the
-// field with the error.
-func (s *errorState) shouldContinue(err error, prop *Properties) bool {
-	// Ignore unset required fields.
-	reqNotSet, ok := err.(*RequiredNotSetError)
-	if !ok {
-		return false
-	}
-	if s.err == nil {
-		if prop != nil {
-			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
-		}
-		s.err = err
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go
deleted file mode 100644
index f77cfb1eea..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go
+++ /dev/null
@@ -1,354 +0,0 @@
-// Extensions for Protocol Buffers to create more go like structures.
-//
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// http://github.com/golang/protobuf/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-import (
-	"reflect"
-)
-
-func NewRequiredNotSetError(field string) *RequiredNotSetError {
-	return &RequiredNotSetError{field}
-}
-
-type Sizer interface {
-	Size() int
-}
-
-func (o *Buffer) enc_ext_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, s...)
-	return nil
-}
-
-func size_ext_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return 0
-	}
-	n += len(s)
-	return
-}
-
-// Encode a reference to bool pointer.
-func (o *Buffer) enc_ref_bool(p *Properties, base structPointer) error {
-	v := *structPointer_BoolVal(base, p.field)
-	x := 0
-	if v {
-		x = 1
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_ref_bool(p *Properties, base structPointer) int {
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-// Encode a reference to int32 pointer.
-func (o *Buffer) enc_ref_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v))
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_ref_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v))
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func (o *Buffer) enc_ref_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_ref_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode a reference to an int64 pointer.
-func (o *Buffer) enc_ref_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func size_ref_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-// Encode a reference to a string pointer.
-func (o *Buffer) enc_ref_string(p *Properties, base structPointer) error {
-	v := *structPointer_StringVal(base, p.field)
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(v)
-	return nil
-}
-
-func size_ref_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_StringVal(base, p.field)
-	n += len(p.tagcode)
-	n += sizeStringBytes(v)
-	return
-}
-
-// Encode a reference to a message struct.
-func (o *Buffer) enc_ref_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	structp := structPointer_GetRefStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return ErrNil
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, err := m.Marshal()
-		if err != nil && !state.shouldContinue(err, nil) {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-		return nil
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	return o.enc_len_struct(p.sprop, structp, &state)
-}
-
-//TODO this is only copied, please fix this
-func size_ref_struct_message(p *Properties, base structPointer) int {
-	structp := structPointer_GetRefStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return 0
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, _ := m.Marshal()
-		n0 := len(p.tagcode)
-		n1 := sizeRawBytes(data)
-		return n0 + n1
-	}
-
-	n0 := len(p.tagcode)
-	n1 := size_struct(p.sprop, structp)
-	n2 := sizeVarint(uint64(n1)) // size of encoded length
-	return n0 + n1 + n2
-}
-
-// Encode a slice of references to message struct pointers ([]struct).
-func (o *Buffer) enc_slice_ref_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	ss := structPointer_GetStructPointer(base, p.field)
-	ss1 := structPointer_GetRefStructPointer(ss, field(0))
-	size := p.stype.Size()
-	l := structPointer_Len(base, p.field)
-	for i := 0; i < l; i++ {
-		structp := structPointer_Add(ss1, field(uintptr(i)*size))
-		if structPointer_IsNil(structp) {
-			return errRepeatedHasNil
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, err := m.Marshal()
-			if err != nil && !state.shouldContinue(err, nil) {
-				return err
-			}
-			o.buf = append(o.buf, p.tagcode...)
-			o.EncodeRawBytes(data)
-			continue
-		}
-
-		o.buf = append(o.buf, p.tagcode...)
-		err := o.enc_len_struct(p.sprop, structp, &state)
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-
-	}
-	return state.err
-}
-
-//TODO this is only copied, please fix this
-func size_slice_ref_struct_message(p *Properties, base structPointer) (n int) {
-	ss := structPointer_GetStructPointer(base, p.field)
-	ss1 := structPointer_GetRefStructPointer(ss, field(0))
-	size := p.stype.Size()
-	l := structPointer_Len(base, p.field)
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		structp := structPointer_Add(ss1, field(uintptr(i)*size))
-		if structPointer_IsNil(structp) {
-			return // return the size up to this point
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, _ := m.Marshal()
-			n += len(p.tagcode)
-			n += sizeRawBytes(data)
-			continue
-		}
-
-		n0 := size_struct(p.sprop, structp)
-		n1 := sizeVarint(uint64(n0)) // size of encoded length
-		n += n0 + n1
-	}
-	return
-}
-
-func (o *Buffer) enc_custom_bytes(p *Properties, base structPointer) error {
-	i := structPointer_InterfaceRef(base, p.field, p.ctype)
-	if i == nil {
-		return ErrNil
-	}
-	custom := i.(Marshaler)
-	data, err := custom.Marshal()
-	if err != nil {
-		return err
-	}
-	if data == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(data)
-	return nil
-}
-
-func size_custom_bytes(p *Properties, base structPointer) (n int) {
-	n += len(p.tagcode)
-	i := structPointer_InterfaceRef(base, p.field, p.ctype)
-	if i == nil {
-		return 0
-	}
-	custom := i.(Marshaler)
-	data, _ := custom.Marshal()
-	n += sizeRawBytes(data)
-	return
-}
-
-func (o *Buffer) enc_custom_ref_bytes(p *Properties, base structPointer) error {
-	custom := structPointer_InterfaceAt(base, p.field, p.ctype).(Marshaler)
-	data, err := custom.Marshal()
-	if err != nil {
-		return err
-	}
-	if data == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(data)
-	return nil
-}
-
-func size_custom_ref_bytes(p *Properties, base structPointer) (n int) {
-	n += len(p.tagcode)
-	i := structPointer_InterfaceAt(base, p.field, p.ctype)
-	if i == nil {
-		return 0
-	}
-	custom := i.(Marshaler)
-	data, _ := custom.Marshal()
-	n += sizeRawBytes(data)
-	return
-}
-
-func (o *Buffer) enc_custom_slice_bytes(p *Properties, base structPointer) error {
-	inter := structPointer_InterfaceRef(base, p.field, p.ctype)
-	if inter == nil {
-		return ErrNil
-	}
-	slice := reflect.ValueOf(inter)
-	l := slice.Len()
-	for i := 0; i < l; i++ {
-		v := slice.Index(i)
-		custom := v.Interface().(Marshaler)
-		data, err := custom.Marshal()
-		if err != nil {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-	}
-	return nil
-}
-
-func size_custom_slice_bytes(p *Properties, base structPointer) (n int) {
-	inter := structPointer_InterfaceRef(base, p.field, p.ctype)
-	if inter == nil {
-		return 0
-	}
-	slice := reflect.ValueOf(inter)
-	l := slice.Len()
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		v := slice.Index(i)
-		custom := v.Interface().(Marshaler)
-		data, _ := custom.Marshal()
-		n += sizeRawBytes(data)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
deleted file mode 100644
index f5db1def3c..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
+++ /dev/null
@@ -1,276 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Protocol buffer comparison.
-
-package proto
-
-import (
-	"bytes"
-	"log"
-	"reflect"
-	"strings"
-)
-
-/*
-Equal returns true iff protocol buffers a and b are equal.
-The arguments must both be pointers to protocol buffer structs.
-
-Equality is defined in this way:
-  - Two messages are equal iff they are the same type,
-    corresponding fields are equal, unknown field sets
-    are equal, and extensions sets are equal.
-  - Two set scalar fields are equal iff their values are equal.
-    If the fields are of a floating-point type, remember that
-    NaN != x for all x, including NaN. If the message is defined
-    in a proto3 .proto file, fields are not "set"; specifically,
-    zero length proto3 "bytes" fields are equal (nil == {}).
-  - Two repeated fields are equal iff their lengths are the same,
-    and their corresponding elements are equal (a "bytes" field,
-    although represented by []byte, is not a repeated field)
-  - Two unset fields are equal.
-  - Two unknown field sets are equal if their current
-    encoded state is equal.
-  - Two extension sets are equal iff they have corresponding
-    elements that are pairwise equal.
-  - Every other combination of things are not equal.
-
-The return value is undefined if a and b are not protocol buffers.
-*/
-func Equal(a, b Message) bool {
-	if a == nil || b == nil {
-		return a == b
-	}
-	v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	if v1.Kind() == reflect.Ptr {
-		if v1.IsNil() {
-			return v2.IsNil()
-		}
-		if v2.IsNil() {
-			return false
-		}
-		v1, v2 = v1.Elem(), v2.Elem()
-	}
-	if v1.Kind() != reflect.Struct {
-		return false
-	}
-	return equalStruct(v1, v2)
-}
-
-// v1 and v2 are known to have the same type.
-func equalStruct(v1, v2 reflect.Value) bool {
-	sprop := GetProperties(v1.Type())
-	for i := 0; i < v1.NumField(); i++ {
-		f := v1.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		f1, f2 := v1.Field(i), v2.Field(i)
-		if f.Type.Kind() == reflect.Ptr {
-			if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
-				// both unset
-				continue
-			} else if n1 != n2 {
-				// set/unset mismatch
-				return false
-			}
-			b1, ok := f1.Interface().(raw)
-			if ok {
-				b2 := f2.Interface().(raw)
-				// RawMessage
-				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
-					return false
-				}
-				continue
-			}
-			f1, f2 = f1.Elem(), f2.Elem()
-		}
-		if !equalAny(f1, f2, sprop.Prop[i]) {
-			return false
-		}
-	}
-
-	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
-		em2 := v2.FieldByName("XXX_extensions")
-		if !equalExtensions(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
-			return false
-		}
-	}
-
-	uf := v1.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return true
-	}
-
-	u1 := uf.Bytes()
-	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
-	if !bytes.Equal(u1, u2) {
-		return false
-	}
-
-	return true
-}
-
-// v1 and v2 are known to have the same type.
-// prop may be nil.
-func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
-	if v1.Type() == protoMessageType {
-		m1, _ := v1.Interface().(Message)
-		m2, _ := v2.Interface().(Message)
-		return Equal(m1, m2)
-	}
-	switch v1.Kind() {
-	case reflect.Bool:
-		return v1.Bool() == v2.Bool()
-	case reflect.Float32, reflect.Float64:
-		return v1.Float() == v2.Float()
-	case reflect.Int32, reflect.Int64:
-		return v1.Int() == v2.Int()
-	case reflect.Interface:
-		// Probably a oneof field; compare the inner values.
-		n1, n2 := v1.IsNil(), v2.IsNil()
-		if n1 || n2 {
-			return n1 == n2
-		}
-		e1, e2 := v1.Elem(), v2.Elem()
-		if e1.Type() != e2.Type() {
-			return false
-		}
-		return equalAny(e1, e2, nil)
-	case reflect.Map:
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for _, key := range v1.MapKeys() {
-			val2 := v2.MapIndex(key)
-			if !val2.IsValid() {
-				// This key was not found in the second map.
-				return false
-			}
-			if !equalAny(v1.MapIndex(key), val2, nil) {
-				return false
-			}
-		}
-		return true
-	case reflect.Ptr:
-		return equalAny(v1.Elem(), v2.Elem(), prop)
-	case reflect.Slice:
-		if v1.Type().Elem().Kind() == reflect.Uint8 {
-			// short circuit: []byte
-
-			// Edge case: if this is in a proto3 message, a zero length
-			// bytes field is considered the zero value.
-			if prop != nil && prop.proto3 && v1.Len() == 0 && v2.Len() == 0 {
-				return true
-			}
-			if v1.IsNil() != v2.IsNil() {
-				return false
-			}
-			return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
-		}
-
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for i := 0; i < v1.Len(); i++ {
-			if !equalAny(v1.Index(i), v2.Index(i), prop) {
-				return false
-			}
-		}
-		return true
-	case reflect.String:
-		return v1.Interface().(string) == v2.Interface().(string)
-	case reflect.Struct:
-		return equalStruct(v1, v2)
-	case reflect.Uint32, reflect.Uint64:
-		return v1.Uint() == v2.Uint()
-	}
-
-	// unknown type, so not a protocol buffer
-	log.Printf("proto: don't know how to compare %v", v1)
-	return false
-}
-
-// base is the struct type that the extensions are based on.
-// em1 and em2 are extension maps.
-func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
-	if len(em1) != len(em2) {
-		return false
-	}
-
-	for extNum, e1 := range em1 {
-		e2, ok := em2[extNum]
-		if !ok {
-			return false
-		}
-
-		m1, m2 := e1.value, e2.value
-
-		if m1 != nil && m2 != nil {
-			// Both are unencoded.
-			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
-				return false
-			}
-			continue
-		}
-
-		// At least one is encoded. To do a semantically correct comparison
-		// we need to unmarshal them first.
-		var desc *ExtensionDesc
-		if m := extensionMaps[base]; m != nil {
-			desc = m[extNum]
-		}
-		if desc == nil {
-			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
-			continue
-		}
-		var err error
-		if m1 == nil {
-			m1, err = decodeExtension(e1.enc, desc)
-		}
-		if m2 == nil && err == nil {
-			m2, err = decodeExtension(e2.enc, desc)
-		}
-		if err != nil {
-			// The encoded form is invalid.
-			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
-			return false
-		}
-		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
deleted file mode 100644
index 6180347e39..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
+++ /dev/null
@@ -1,518 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Types and routines for supporting protocol buffer extensions.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"sync"
-)
-
-// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
-var ErrMissingExtension = errors.New("proto: missing extension")
-
-// ExtensionRange represents a range of message extensions for a protocol buffer.
-// Used in code generated by the protocol compiler.
-type ExtensionRange struct {
-	Start, End int32 // both inclusive
-}
-
-// extendableProto is an interface implemented by any protocol buffer that may be extended.
-type extendableProto interface {
-	Message
-	ExtensionRangeArray() []ExtensionRange
-}
-
-type extensionsMap interface {
-	extendableProto
-	ExtensionMap() map[int32]Extension
-}
-
-type extensionsBytes interface {
-	extendableProto
-	GetExtensions() *[]byte
-}
-
-var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
-
-// ExtensionDesc represents an extension specification.
-// Used in generated code from the protocol compiler.
-type ExtensionDesc struct {
-	ExtendedType  Message     // nil pointer to the type that is being extended
-	ExtensionType interface{} // nil pointer to the extension type
-	Field         int32       // field number
-	Name          string      // fully-qualified name of extension, for text formatting
-	Tag           string      // protobuf tag style
-}
-
-func (ed *ExtensionDesc) repeated() bool {
-	t := reflect.TypeOf(ed.ExtensionType)
-	return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
-}
-
-// Extension represents an extension in a message.
-type Extension struct {
-	// When an extension is stored in a message using SetExtension
-	// only desc and value are set. When the message is marshaled
-	// enc will be set to the encoded form of the message.
-	//
-	// When a message is unmarshaled and contains extensions, each
-	// extension will have only enc set. When such an extension is
-	// accessed using GetExtension (or GetExtensions) desc and value
-	// will be set.
-	desc  *ExtensionDesc
-	value interface{}
-	enc   []byte
-}
-
-// SetRawExtension is for testing only.
-func SetRawExtension(base extendableProto, id int32, b []byte) {
-	if ebase, ok := base.(extensionsMap); ok {
-		ebase.ExtensionMap()[id] = Extension{enc: b}
-	} else if ebase, ok := base.(extensionsBytes); ok {
-		clearExtension(base, id)
-		ext := ebase.GetExtensions()
-		*ext = append(*ext, b...)
-	} else {
-		panic("unreachable")
-	}
-}
-
-// isExtensionField returns true iff the given field number is in an extension range.
-func isExtensionField(pb extendableProto, field int32) bool {
-	for _, er := range pb.ExtensionRangeArray() {
-		if er.Start <= field && field <= er.End {
-			return true
-		}
-	}
-	return false
-}
-
-// checkExtensionTypes checks that the given extension is valid for pb.
-func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
-	// Check the extended type.
-	if a, b := reflect.TypeOf(pb), reflect.TypeOf(extension.ExtendedType); a != b {
-		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
-	}
-	// Check the range.
-	if !isExtensionField(pb, extension.Field) {
-		return errors.New("proto: bad extension number; not in declared ranges")
-	}
-	return nil
-}
-
-// extPropKey is sufficient to uniquely identify an extension.
-type extPropKey struct {
-	base  reflect.Type
-	field int32
-}
-
-var extProp = struct {
-	sync.RWMutex
-	m map[extPropKey]*Properties
-}{
-	m: make(map[extPropKey]*Properties),
-}
-
-func extensionProperties(ed *ExtensionDesc) *Properties {
-	key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
-
-	extProp.RLock()
-	if prop, ok := extProp.m[key]; ok {
-		extProp.RUnlock()
-		return prop
-	}
-	extProp.RUnlock()
-
-	extProp.Lock()
-	defer extProp.Unlock()
-	// Check again.
-	if prop, ok := extProp.m[key]; ok {
-		return prop
-	}
-
-	prop := new(Properties)
-	prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
-	extProp.m[key] = prop
-	return prop
-}
-
-// encodeExtensionMap encodes any unmarshaled (unencoded) extensions in m.
-func encodeExtensionMap(m map[int32]Extension) error {
-	for k, e := range m {
-		err := encodeExtension(&e)
-		if err != nil {
-			return err
-		}
-		m[k] = e
-	}
-	return nil
-}
-
-func encodeExtension(e *Extension) error {
-	if e.value == nil || e.desc == nil {
-		// Extension is only in its encoded form.
-		return nil
-	}
-	// We don't skip extensions that have an encoded form set,
-	// because the extension value may have been mutated after
-	// the last time this function was called.
-
-	et := reflect.TypeOf(e.desc.ExtensionType)
-	props := extensionProperties(e.desc)
-
-	p := NewBuffer(nil)
-	// If e.value has type T, the encoder expects a *struct{ X T }.
-	// Pass a *T with a zero field and hope it all works out.
-	x := reflect.New(et)
-	x.Elem().Set(reflect.ValueOf(e.value))
-	if err := props.enc(p, props, toStructPointer(x)); err != nil {
-		return err
-	}
-	e.enc = p.buf
-	return nil
-}
-
-func sizeExtensionMap(m map[int32]Extension) (n int) {
-	for _, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			n += len(e.enc)
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		n += props.size(props, toStructPointer(x))
-	}
-	return
-}
-
-// HasExtension returns whether the given extension is present in pb.
-func HasExtension(pb extendableProto, extension *ExtensionDesc) bool {
-	// TODO: Check types, field numbers, etc.?
-	if epb, doki := pb.(extensionsMap); doki {
-		_, ok := epb.ExtensionMap()[extension.Field]
-		return ok
-	} else if epb, doki := pb.(extensionsBytes); doki {
-		ext := epb.GetExtensions()
-		buf := *ext
-		o := 0
-		for o < len(buf) {
-			tag, n := DecodeVarint(buf[o:])
-			fieldNum := int32(tag >> 3)
-			if int32(fieldNum) == extension.Field {
-				return true
-			}
-			wireType := int(tag & 0x7)
-			o += n
-			l, err := size(buf[o:], wireType)
-			if err != nil {
-				return false
-			}
-			o += l
-		}
-		return false
-	}
-	panic("unreachable")
-}
-
-func deleteExtension(pb extensionsBytes, theFieldNum int32, offset int) int {
-	ext := pb.GetExtensions()
-	for offset < len(*ext) {
-		tag, n1 := DecodeVarint((*ext)[offset:])
-		fieldNum := int32(tag >> 3)
-		wireType := int(tag & 0x7)
-		n2, err := size((*ext)[offset+n1:], wireType)
-		if err != nil {
-			panic(err)
-		}
-		newOffset := offset + n1 + n2
-		if fieldNum == theFieldNum {
-			*ext = append((*ext)[:offset], (*ext)[newOffset:]...)
-			return offset
-		}
-		offset = newOffset
-	}
-	return -1
-}
-
-func clearExtension(pb extendableProto, fieldNum int32) {
-	if epb, doki := pb.(extensionsMap); doki {
-		delete(epb.ExtensionMap(), fieldNum)
-	} else if epb, doki := pb.(extensionsBytes); doki {
-		offset := 0
-		for offset != -1 {
-			offset = deleteExtension(epb, fieldNum, offset)
-		}
-	} else {
-		panic("unreachable")
-	}
-}
-
-// ClearExtension removes the given extension from pb.
-func ClearExtension(pb extendableProto, extension *ExtensionDesc) {
-	// TODO: Check types, field numbers, etc.?
-	clearExtension(pb, extension.Field)
-}
-
-// GetExtension parses and returns the given extension of pb.
-// If the extension is not present it returns ErrMissingExtension.
-func GetExtension(pb extendableProto, extension *ExtensionDesc) (interface{}, error) {
-	if err := checkExtensionTypes(pb, extension); err != nil {
-		return nil, err
-	}
-
-	if epb, doki := pb.(extensionsMap); doki {
-		emap := epb.ExtensionMap()
-		e, ok := emap[extension.Field]
-		if !ok {
-			// defaultExtensionValue returns the default value or
-			// ErrMissingExtension if there is no default.
-			return defaultExtensionValue(extension)
-		}
-		if e.value != nil {
-			// Already decoded. Check the descriptor, though.
-			if e.desc != extension {
-				// This shouldn't happen. If it does, it means that
-				// GetExtension was called twice with two different
-				// descriptors with the same field number.
-				return nil, errors.New("proto: descriptor conflict")
-			}
-			return e.value, nil
-		}
-
-		v, err := decodeExtension(e.enc, extension)
-		if err != nil {
-			return nil, err
-		}
-
-		// Remember the decoded version and drop the encoded version.
-		// That way it is safe to mutate what we return.
-		e.value = v
-		e.desc = extension
-		e.enc = nil
-		emap[extension.Field] = e
-		return e.value, nil
-	} else if epb, doki := pb.(extensionsBytes); doki {
-		ext := epb.GetExtensions()
-		o := 0
-		for o < len(*ext) {
-			tag, n := DecodeVarint((*ext)[o:])
-			fieldNum := int32(tag >> 3)
-			wireType := int(tag & 0x7)
-			l, err := size((*ext)[o+n:], wireType)
-			if err != nil {
-				return nil, err
-			}
-			if int32(fieldNum) == extension.Field {
-				v, err := decodeExtension((*ext)[o:o+n+l], extension)
-				if err != nil {
-					return nil, err
-				}
-				return v, nil
-			}
-			o += n + l
-		}
-		return defaultExtensionValue(extension)
-	}
-	panic("unreachable")
-}
-
-// defaultExtensionValue returns the default value for extension.
-// If no default for an extension is defined ErrMissingExtension is returned.
-func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
-	t := reflect.TypeOf(extension.ExtensionType)
-	props := extensionProperties(extension)
-
-	sf, _, err := fieldDefault(t, props)
-	if err != nil {
-		return nil, err
-	}
-
-	if sf == nil || sf.value == nil {
-		// There is no default value.
-		return nil, ErrMissingExtension
-	}
-
-	if t.Kind() != reflect.Ptr {
-		// We do not need to return a Ptr, we can directly return sf.value.
-		return sf.value, nil
-	}
-
-	// We need to return an interface{} that is a pointer to sf.value.
-	value := reflect.New(t).Elem()
-	value.Set(reflect.New(value.Type().Elem()))
-	if sf.kind == reflect.Int32 {
-		// We may have an int32 or an enum, but the underlying data is int32.
-		// Since we can't set an int32 into a non int32 reflect.value directly
-		// set it as a int32.
-		value.Elem().SetInt(int64(sf.value.(int32)))
-	} else {
-		value.Elem().Set(reflect.ValueOf(sf.value))
-	}
-	return value.Interface(), nil
-}
-
-// decodeExtension decodes an extension encoded in b.
-func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
-	o := NewBuffer(b)
-
-	t := reflect.TypeOf(extension.ExtensionType)
-
-	props := extensionProperties(extension)
-
-	// t is a pointer to a struct, pointer to basic type or a slice.
-	// Allocate a "field" to store the pointer/slice itself; the
-	// pointer/slice will be stored here. We pass
-	// the address of this field to props.dec.
-	// This passes a zero field and a *t and lets props.dec
-	// interpret it as a *struct{ x t }.
-	value := reflect.New(t).Elem()
-
-	for {
-		// Discard wire type and field number varint. It isn't needed.
-		if _, err := o.DecodeVarint(); err != nil {
-			return nil, err
-		}
-
-		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
-			return nil, err
-		}
-
-		if o.index >= len(o.buf) {
-			break
-		}
-	}
-	return value.Interface(), nil
-}
-
-// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
-// The returned slice has the same length as es; missing extensions will appear as nil elements.
-func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
-	epb, ok := pb.(extendableProto)
-	if !ok {
-		err = errors.New("proto: not an extendable proto")
-		return
-	}
-	extensions = make([]interface{}, len(es))
-	for i, e := range es {
-		extensions[i], err = GetExtension(epb, e)
-		if err == ErrMissingExtension {
-			err = nil
-		}
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// SetExtension sets the specified extension of pb to the specified value.
-func SetExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
-	if err := checkExtensionTypes(pb, extension); err != nil {
-		return err
-	}
-	typ := reflect.TypeOf(extension.ExtensionType)
-	if typ != reflect.TypeOf(value) {
-		return errors.New("proto: bad extension value type")
-	}
-	// nil extension values need to be caught early, because the
-	// encoder can't distinguish an ErrNil due to a nil extension
-	// from an ErrNil due to a missing field. Extensions are
-	// always optional, so the encoder would just swallow the error
-	// and drop all the extensions from the encoded message.
-	if reflect.ValueOf(value).IsNil() {
-		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
-	}
-	return setExtension(pb, extension, value)
-}
-
-func setExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
-	if epb, doki := pb.(extensionsMap); doki {
-		epb.ExtensionMap()[extension.Field] = Extension{desc: extension, value: value}
-	} else if epb, doki := pb.(extensionsBytes); doki {
-		ClearExtension(pb, extension)
-		ext := epb.GetExtensions()
-		et := reflect.TypeOf(extension.ExtensionType)
-		props := extensionProperties(extension)
-		p := NewBuffer(nil)
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(value))
-		if err := props.enc(p, props, toStructPointer(x)); err != nil {
-			return err
-		}
-		*ext = append(*ext, p.buf...)
-	}
-	return nil
-}
-
-// A global registry of extensions.
-// The generated code will register the generated descriptors by calling RegisterExtension.
-
-var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
-
-// RegisterExtension is called from the generated code.
-func RegisterExtension(desc *ExtensionDesc) {
-	st := reflect.TypeOf(desc.ExtendedType).Elem()
-	m := extensionMaps[st]
-	if m == nil {
-		m = make(map[int32]*ExtensionDesc)
-		extensionMaps[st] = m
-	}
-	if _, ok := m[desc.Field]; ok {
-		panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
-	}
-	m[desc.Field] = desc
-}
-
-// RegisteredExtensions returns a map of the registered extensions of a
-// protocol buffer struct, indexed by the extension number.
-// The argument pb should be a nil pointer to the struct type.
-func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
-	return extensionMaps[reflect.TypeOf(pb).Elem()]
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go
deleted file mode 100644
index bd55fb68b6..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-	"strings"
-)
-
-func GetBoolExtension(pb extendableProto, extension *ExtensionDesc, ifnotset bool) bool {
-	if reflect.ValueOf(pb).IsNil() {
-		return ifnotset
-	}
-	value, err := GetExtension(pb, extension)
-	if err != nil {
-		return ifnotset
-	}
-	if value == nil {
-		return ifnotset
-	}
-	if value.(*bool) == nil {
-		return ifnotset
-	}
-	return *(value.(*bool))
-}
-
-func (this *Extension) Equal(that *Extension) bool {
-	return bytes.Equal(this.enc, that.enc)
-}
-
-func SizeOfExtensionMap(m map[int32]Extension) (n int) {
-	return sizeExtensionMap(m)
-}
-
-type sortableMapElem struct {
-	field int32
-	ext   Extension
-}
-
-func newSortableExtensionsFromMap(m map[int32]Extension) sortableExtensions {
-	s := make(sortableExtensions, 0, len(m))
-	for k, v := range m {
-		s = append(s, &sortableMapElem{field: k, ext: v})
-	}
-	return s
-}
-
-type sortableExtensions []*sortableMapElem
-
-func (this sortableExtensions) Len() int { return len(this) }
-
-func (this sortableExtensions) Swap(i, j int) { this[i], this[j] = this[j], this[i] }
-
-func (this sortableExtensions) Less(i, j int) bool { return this[i].field < this[j].field }
-
-func (this sortableExtensions) String() string {
-	sort.Sort(this)
-	ss := make([]string, len(this))
-	for i := range this {
-		ss[i] = fmt.Sprintf("%d: %v", this[i].field, this[i].ext)
-	}
-	return "map[" + strings.Join(ss, ",") + "]"
-}
-
-func StringFromExtensionsMap(m map[int32]Extension) string {
-	return newSortableExtensionsFromMap(m).String()
-}
-
-func StringFromExtensionsBytes(ext []byte) string {
-	m, err := BytesToExtensionsMap(ext)
-	if err != nil {
-		panic(err)
-	}
-	return StringFromExtensionsMap(m)
-}
-
-func EncodeExtensionMap(m map[int32]Extension, data []byte) (n int, err error) {
-	if err := encodeExtensionMap(m); err != nil {
-		return 0, err
-	}
-	keys := make([]int, 0, len(m))
-	for k := range m {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-	for _, k := range keys {
-		n += copy(data[n:], m[int32(k)].enc)
-	}
-	return n, nil
-}
-
-func GetRawExtension(m map[int32]Extension, id int32) ([]byte, error) {
-	if m[id].value == nil || m[id].desc == nil {
-		return m[id].enc, nil
-	}
-	if err := encodeExtensionMap(m); err != nil {
-		return nil, err
-	}
-	return m[id].enc, nil
-}
-
-func size(buf []byte, wire int) (int, error) {
-	switch wire {
-	case WireVarint:
-		_, n := DecodeVarint(buf)
-		return n, nil
-	case WireFixed64:
-		return 8, nil
-	case WireBytes:
-		v, n := DecodeVarint(buf)
-		return int(v) + n, nil
-	case WireFixed32:
-		return 4, nil
-	case WireStartGroup:
-		offset := 0
-		for {
-			u, n := DecodeVarint(buf[offset:])
-			fwire := int(u & 0x7)
-			offset += n
-			if fwire == WireEndGroup {
-				return offset, nil
-			}
-			s, err := size(buf[offset:], wire)
-			if err != nil {
-				return 0, err
-			}
-			offset += s
-		}
-	}
-	return 0, fmt.Errorf("proto: can't get size for unknown wire type %d", wire)
-}
-
-func BytesToExtensionsMap(buf []byte) (map[int32]Extension, error) {
-	m := make(map[int32]Extension)
-	i := 0
-	for i < len(buf) {
-		tag, n := DecodeVarint(buf[i:])
-		if n <= 0 {
-			return nil, fmt.Errorf("unable to decode varint")
-		}
-		fieldNum := int32(tag >> 3)
-		wireType := int(tag & 0x7)
-		l, err := size(buf[i+n:], wireType)
-		if err != nil {
-			return nil, err
-		}
-		end := i + int(l) + n
-		m[int32(fieldNum)] = Extension{enc: buf[i:end]}
-		i = end
-	}
-	return m, nil
-}
-
-func NewExtension(e []byte) Extension {
-	ee := Extension{enc: make([]byte, len(e))}
-	copy(ee.enc, e)
-	return ee
-}
-
-func (this Extension) GoString() string {
-	if this.enc == nil {
-		if err := encodeExtension(&this); err != nil {
-			panic(err)
-		}
-	}
-	return fmt.Sprintf("proto.NewExtension(%#v)", this.enc)
-}
-
-func SetUnsafeExtension(pb extendableProto, fieldNum int32, value interface{}) error {
-	typ := reflect.TypeOf(pb).Elem()
-	ext, ok := extensionMaps[typ]
-	if !ok {
-		return fmt.Errorf("proto: bad extended type; %s is not extendable", typ.String())
-	}
-	desc, ok := ext[fieldNum]
-	if !ok {
-		return errors.New("proto: bad extension number; not in declared ranges")
-	}
-	return setExtension(pb, desc, value)
-}
-
-func GetUnsafeExtension(pb extendableProto, fieldNum int32) (interface{}, error) {
-	typ := reflect.TypeOf(pb).Elem()
-	ext, ok := extensionMaps[typ]
-	if !ok {
-		return nil, fmt.Errorf("proto: bad extended type; %s is not extendable", typ.String())
-	}
-	desc, ok := ext[fieldNum]
-	if !ok {
-		return nil, fmt.Errorf("unregistered field number %d", fieldNum)
-	}
-	return GetExtension(pb, desc)
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
deleted file mode 100644
index 2e35ae2d2a..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
+++ /dev/null
@@ -1,894 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-Package proto converts data structures to and from the wire format of
-protocol buffers.  It works in concert with the Go source code generated
-for .proto files by the protocol compiler.
-
-A summary of the properties of the protocol buffer interface
-for a protocol buffer variable v:
-
-  - Names are turned from camel_case to CamelCase for export.
-  - There are no methods on v to set fields; just treat
-	them as structure fields.
-  - There are getters that return a field's value if set,
-	and return the field's default value if unset.
-	The getters work even if the receiver is a nil message.
-  - The zero value for a struct is its correct initialization state.
-	All desired fields must be set before marshaling.
-  - A Reset() method will restore a protobuf struct to its zero state.
-  - Non-repeated fields are pointers to the values; nil means unset.
-	That is, optional or required field int32 f becomes F *int32.
-  - Repeated fields are slices.
-  - Helper functions are available to aid the setting of fields.
-	msg.Foo = proto.String("hello") // set field
-  - Constants are defined to hold the default values of all fields that
-	have them.  They have the form Default_StructName_FieldName.
-	Because the getter methods handle defaulted values,
-	direct use of these constants should be rare.
-  - Enums are given type names and maps from names to values.
-	Enum values are prefixed by the enclosing message's name, or by the
-	enum's type name if it is a top-level enum. Enum types have a String
-	method, and a Enum method to assist in message construction.
-  - Nested messages, groups and enums have type names prefixed with the name of
-	the surrounding message type.
-  - Extensions are given descriptor names that start with E_,
-	followed by an underscore-delimited list of the nested messages
-	that contain it (if any) followed by the CamelCased name of the
-	extension field itself.  HasExtension, ClearExtension, GetExtension
-	and SetExtension are functions for manipulating extensions.
-  - Oneof field sets are given a single field in their message,
-	with distinguished wrapper types for each possible field value.
-  - Marshal and Unmarshal are functions to encode and decode the wire format.
-
-When the .proto file specifies `syntax="proto3"`, there are some differences:
-
-  - Non-repeated fields of non-message type are values instead of pointers.
-  - Getters are only generated for message and oneof fields.
-  - Enum types do not get an Enum method.
-
-The simplest way to describe this is to see an example.
-Given file test.proto, containing
-
-	package example;
-
-	enum FOO { X = 17; }
-
-	message Test {
-	  required string label = 1;
-	  optional int32 type = 2 [default=77];
-	  repeated int64 reps = 3;
-	  optional group OptionalGroup = 4 {
-	    required string RequiredField = 5;
-	  }
-	  oneof union {
-	    int32 number = 6;
-	    string name = 7;
-	  }
-	}
-
-The resulting file, test.pb.go, is:
-
-	package example
-
-	import proto "github.com/gogo/protobuf/proto"
-	import math "math"
-
-	type FOO int32
-	const (
-		FOO_X FOO = 17
-	)
-	var FOO_name = map[int32]string{
-		17: "X",
-	}
-	var FOO_value = map[string]int32{
-		"X": 17,
-	}
-
-	func (x FOO) Enum() *FOO {
-		p := new(FOO)
-		*p = x
-		return p
-	}
-	func (x FOO) String() string {
-		return proto.EnumName(FOO_name, int32(x))
-	}
-	func (x *FOO) UnmarshalJSON(data []byte) error {
-		value, err := proto.UnmarshalJSONEnum(FOO_value, data)
-		if err != nil {
-			return err
-		}
-		*x = FOO(value)
-		return nil
-	}
-
-	type Test struct {
-		Label         *string             `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
-		Type          *int32              `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
-		Reps          []int64             `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
-		Optionalgroup *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
-		// Types that are valid to be assigned to Union:
-		//	*Test_Number
-		//	*Test_Name
-		Union            isTest_Union `protobuf_oneof:"union"`
-		XXX_unrecognized []byte       `json:"-"`
-	}
-	func (m *Test) Reset()         { *m = Test{} }
-	func (m *Test) String() string { return proto.CompactTextString(m) }
-	func (*Test) ProtoMessage() {}
-
-	type isTest_Union interface {
-		isTest_Union()
-	}
-
-	type Test_Number struct {
-		Number int32 `protobuf:"varint,6,opt,name=number"`
-	}
-	type Test_Name struct {
-		Name string `protobuf:"bytes,7,opt,name=name"`
-	}
-
-	func (*Test_Number) isTest_Union() {}
-	func (*Test_Name) isTest_Union()   {}
-
-	func (m *Test) GetUnion() isTest_Union {
-		if m != nil {
-			return m.Union
-		}
-		return nil
-	}
-	const Default_Test_Type int32 = 77
-
-	func (m *Test) GetLabel() string {
-		if m != nil && m.Label != nil {
-			return *m.Label
-		}
-		return ""
-	}
-
-	func (m *Test) GetType() int32 {
-		if m != nil && m.Type != nil {
-			return *m.Type
-		}
-		return Default_Test_Type
-	}
-
-	func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
-		if m != nil {
-			return m.Optionalgroup
-		}
-		return nil
-	}
-
-	type Test_OptionalGroup struct {
-		RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
-	}
-	func (m *Test_OptionalGroup) Reset()         { *m = Test_OptionalGroup{} }
-	func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
-
-	func (m *Test_OptionalGroup) GetRequiredField() string {
-		if m != nil && m.RequiredField != nil {
-			return *m.RequiredField
-		}
-		return ""
-	}
-
-	func (m *Test) GetNumber() int32 {
-		if x, ok := m.GetUnion().(*Test_Number); ok {
-			return x.Number
-		}
-		return 0
-	}
-
-	func (m *Test) GetName() string {
-		if x, ok := m.GetUnion().(*Test_Name); ok {
-			return x.Name
-		}
-		return ""
-	}
-
-	func init() {
-		proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
-	}
-
-To create and play with a Test object:
-
-	package main
-
-	import (
-		"log"
-
-		"github.com/gogo/protobuf/proto"
-		pb "./example.pb"
-	)
-
-	func main() {
-		test := &pb.Test{
-			Label: proto.String("hello"),
-			Type:  proto.Int32(17),
-			Reps:  []int64{1, 2, 3},
-			Optionalgroup: &pb.Test_OptionalGroup{
-				RequiredField: proto.String("good bye"),
-			},
-			Union: &pb.Test_Name{"fred"},
-		}
-		data, err := proto.Marshal(test)
-		if err != nil {
-			log.Fatal("marshaling error: ", err)
-		}
-		newTest := &pb.Test{}
-		err = proto.Unmarshal(data, newTest)
-		if err != nil {
-			log.Fatal("unmarshaling error: ", err)
-		}
-		// Now test and newTest contain the same data.
-		if test.GetLabel() != newTest.GetLabel() {
-			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
-		}
-		// Use a type switch to determine which oneof was set.
-		switch u := test.Union.(type) {
-		case *pb.Test_Number: // u.Number contains the number.
-		case *pb.Test_Name: // u.Name contains the string.
-		}
-		// etc.
-	}
-*/
-package proto
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"reflect"
-	"sort"
-	"strconv"
-	"sync"
-)
-
-// Message is implemented by generated protocol buffer messages.
-type Message interface {
-	Reset()
-	String() string
-	ProtoMessage()
-}
-
-// Stats records allocation details about the protocol buffer encoders
-// and decoders.  Useful for tuning the library itself.
-type Stats struct {
-	Emalloc uint64 // mallocs in encode
-	Dmalloc uint64 // mallocs in decode
-	Encode  uint64 // number of encodes
-	Decode  uint64 // number of decodes
-	Chit    uint64 // number of cache hits
-	Cmiss   uint64 // number of cache misses
-	Size    uint64 // number of sizes
-}
-
-// Set to true to enable stats collection.
-const collectStats = false
-
-var stats Stats
-
-// GetStats returns a copy of the global Stats structure.
-func GetStats() Stats { return stats }
-
-// A Buffer is a buffer manager for marshaling and unmarshaling
-// protocol buffers.  It may be reused between invocations to
-// reduce memory usage.  It is not necessary to use a Buffer;
-// the global functions Marshal and Unmarshal create a
-// temporary Buffer and are fine for most applications.
-type Buffer struct {
-	buf   []byte // encode/decode byte stream
-	index int    // write point
-
-	// pools of basic types to amortize allocation.
-	bools   []bool
-	uint32s []uint32
-	uint64s []uint64
-
-	// extra pools, only used with pointer_reflect.go
-	int32s   []int32
-	int64s   []int64
-	float32s []float32
-	float64s []float64
-}
-
-// NewBuffer allocates a new Buffer and initializes its internal data to
-// the contents of the argument slice.
-func NewBuffer(e []byte) *Buffer {
-	return &Buffer{buf: e}
-}
-
-// Reset resets the Buffer, ready for marshaling a new protocol buffer.
-func (p *Buffer) Reset() {
-	p.buf = p.buf[0:0] // for reading/writing
-	p.index = 0        // for reading
-}
-
-// SetBuf replaces the internal buffer with the slice,
-// ready for unmarshaling the contents of the slice.
-func (p *Buffer) SetBuf(s []byte) {
-	p.buf = s
-	p.index = 0
-}
-
-// Bytes returns the contents of the Buffer.
-func (p *Buffer) Bytes() []byte { return p.buf }
-
-/*
- * Helper routines for simplifying the creation of optional fields of basic type.
- */
-
-// Bool is a helper routine that allocates a new bool value
-// to store v and returns a pointer to it.
-func Bool(v bool) *bool {
-	return &v
-}
-
-// Int32 is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it.
-func Int32(v int32) *int32 {
-	return &v
-}
-
-// Int is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it, but unlike Int32
-// its argument value is an int.
-func Int(v int) *int32 {
-	p := new(int32)
-	*p = int32(v)
-	return p
-}
-
-// Int64 is a helper routine that allocates a new int64 value
-// to store v and returns a pointer to it.
-func Int64(v int64) *int64 {
-	return &v
-}
-
-// Float32 is a helper routine that allocates a new float32 value
-// to store v and returns a pointer to it.
-func Float32(v float32) *float32 {
-	return &v
-}
-
-// Float64 is a helper routine that allocates a new float64 value
-// to store v and returns a pointer to it.
-func Float64(v float64) *float64 {
-	return &v
-}
-
-// Uint32 is a helper routine that allocates a new uint32 value
-// to store v and returns a pointer to it.
-func Uint32(v uint32) *uint32 {
-	return &v
-}
-
-// Uint64 is a helper routine that allocates a new uint64 value
-// to store v and returns a pointer to it.
-func Uint64(v uint64) *uint64 {
-	return &v
-}
-
-// String is a helper routine that allocates a new string value
-// to store v and returns a pointer to it.
-func String(v string) *string {
-	return &v
-}
-
-// EnumName is a helper function to simplify printing protocol buffer enums
-// by name.  Given an enum map and a value, it returns a useful string.
-func EnumName(m map[int32]string, v int32) string {
-	s, ok := m[v]
-	if ok {
-		return s
-	}
-	return strconv.Itoa(int(v))
-}
-
-// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
-// from their JSON-encoded representation. Given a map from the enum's symbolic
-// names to its int values, and a byte buffer containing the JSON-encoded
-// value, it returns an int32 that can be cast to the enum type by the caller.
-//
-// The function can deal with both JSON representations, numeric and symbolic.
-func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
-	if data[0] == '"' {
-		// New style: enums are strings.
-		var repr string
-		if err := json.Unmarshal(data, &repr); err != nil {
-			return -1, err
-		}
-		val, ok := m[repr]
-		if !ok {
-			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
-		}
-		return val, nil
-	}
-	// Old style: enums are ints.
-	var val int32
-	if err := json.Unmarshal(data, &val); err != nil {
-		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
-	}
-	return val, nil
-}
-
-// DebugPrint dumps the encoded data in b in a debugging format with a header
-// including the string s. Used in testing but made available for general debugging.
-func (p *Buffer) DebugPrint(s string, b []byte) {
-	var u uint64
-
-	obuf := p.buf
-	sindex := p.index
-	p.buf = b
-	p.index = 0
-	depth := 0
-
-	fmt.Printf("\n--- %s ---\n", s)
-
-out:
-	for {
-		for i := 0; i < depth; i++ {
-			fmt.Print("  ")
-		}
-
-		index := p.index
-		if index == len(p.buf) {
-			break
-		}
-
-		op, err := p.DecodeVarint()
-		if err != nil {
-			fmt.Printf("%3d: fetching op err %v\n", index, err)
-			break out
-		}
-		tag := op >> 3
-		wire := op & 7
-
-		switch wire {
-		default:
-			fmt.Printf("%3d: t=%3d unknown wire=%d\n",
-				index, tag, wire)
-			break out
-
-		case WireBytes:
-			var r []byte
-
-			r, err = p.DecodeRawBytes(false)
-			if err != nil {
-				break out
-			}
-			fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
-			if len(r) <= 6 {
-				for i := 0; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			} else {
-				for i := 0; i < 3; i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-				fmt.Printf(" ..")
-				for i := len(r) - 3; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			}
-			fmt.Printf("\n")
-
-		case WireFixed32:
-			u, err = p.DecodeFixed32()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
-
-		case WireFixed64:
-			u, err = p.DecodeFixed64()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
-
-		case WireVarint:
-			u, err = p.DecodeVarint()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
-
-		case WireStartGroup:
-			fmt.Printf("%3d: t=%3d start\n", index, tag)
-			depth++
-
-		case WireEndGroup:
-			depth--
-			fmt.Printf("%3d: t=%3d end\n", index, tag)
-		}
-	}
-
-	if depth != 0 {
-		fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
-	}
-	fmt.Printf("\n")
-
-	p.buf = obuf
-	p.index = sindex
-}
-
-// SetDefaults sets unset protocol buffer fields to their default values.
-// It only modifies fields that are both unset and have defined defaults.
-// It recursively sets default values in any non-nil sub-messages.
-func SetDefaults(pb Message) {
-	setDefaults(reflect.ValueOf(pb), true, false)
-}
-
-// v is a pointer to a struct.
-func setDefaults(v reflect.Value, recur, zeros bool) {
-	v = v.Elem()
-
-	defaultMu.RLock()
-	dm, ok := defaults[v.Type()]
-	defaultMu.RUnlock()
-	if !ok {
-		dm = buildDefaultMessage(v.Type())
-		defaultMu.Lock()
-		defaults[v.Type()] = dm
-		defaultMu.Unlock()
-	}
-
-	for _, sf := range dm.scalars {
-		f := v.Field(sf.index)
-		if !f.IsNil() {
-			// field already set
-			continue
-		}
-		dv := sf.value
-		if dv == nil && !zeros {
-			// no explicit default, and don't want to set zeros
-			continue
-		}
-		fptr := f.Addr().Interface() // **T
-		// TODO: Consider batching the allocations we do here.
-		switch sf.kind {
-		case reflect.Bool:
-			b := new(bool)
-			if dv != nil {
-				*b = dv.(bool)
-			}
-			*(fptr.(**bool)) = b
-		case reflect.Float32:
-			f := new(float32)
-			if dv != nil {
-				*f = dv.(float32)
-			}
-			*(fptr.(**float32)) = f
-		case reflect.Float64:
-			f := new(float64)
-			if dv != nil {
-				*f = dv.(float64)
-			}
-			*(fptr.(**float64)) = f
-		case reflect.Int32:
-			// might be an enum
-			if ft := f.Type(); ft != int32PtrType {
-				// enum
-				f.Set(reflect.New(ft.Elem()))
-				if dv != nil {
-					f.Elem().SetInt(int64(dv.(int32)))
-				}
-			} else {
-				// int32 field
-				i := new(int32)
-				if dv != nil {
-					*i = dv.(int32)
-				}
-				*(fptr.(**int32)) = i
-			}
-		case reflect.Int64:
-			i := new(int64)
-			if dv != nil {
-				*i = dv.(int64)
-			}
-			*(fptr.(**int64)) = i
-		case reflect.String:
-			s := new(string)
-			if dv != nil {
-				*s = dv.(string)
-			}
-			*(fptr.(**string)) = s
-		case reflect.Uint8:
-			// exceptional case: []byte
-			var b []byte
-			if dv != nil {
-				db := dv.([]byte)
-				b = make([]byte, len(db))
-				copy(b, db)
-			} else {
-				b = []byte{}
-			}
-			*(fptr.(*[]byte)) = b
-		case reflect.Uint32:
-			u := new(uint32)
-			if dv != nil {
-				*u = dv.(uint32)
-			}
-			*(fptr.(**uint32)) = u
-		case reflect.Uint64:
-			u := new(uint64)
-			if dv != nil {
-				*u = dv.(uint64)
-			}
-			*(fptr.(**uint64)) = u
-		default:
-			log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
-		}
-	}
-
-	for _, ni := range dm.nested {
-		f := v.Field(ni)
-		// f is *T or []*T or map[T]*T
-		switch f.Kind() {
-		case reflect.Ptr:
-			if f.IsNil() {
-				continue
-			}
-			setDefaults(f, recur, zeros)
-
-		case reflect.Slice:
-			for i := 0; i < f.Len(); i++ {
-				e := f.Index(i)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-
-		case reflect.Map:
-			for _, k := range f.MapKeys() {
-				e := f.MapIndex(k)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-		}
-	}
-}
-
-var (
-	// defaults maps a protocol buffer struct type to a slice of the fields,
-	// with its scalar fields set to their proto-declared non-zero default values.
-	defaultMu sync.RWMutex
-	defaults  = make(map[reflect.Type]defaultMessage)
-
-	int32PtrType = reflect.TypeOf((*int32)(nil))
-)
-
-// defaultMessage represents information about the default values of a message.
-type defaultMessage struct {
-	scalars []scalarField
-	nested  []int // struct field index of nested messages
-}
-
-type scalarField struct {
-	index int          // struct field index
-	kind  reflect.Kind // element type (the T in *T or []T)
-	value interface{}  // the proto-declared default value, or nil
-}
-
-// t is a struct type.
-func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
-	sprop := GetProperties(t)
-	for _, prop := range sprop.Prop {
-		fi, ok := sprop.decoderTags.get(prop.Tag)
-		if !ok {
-			// XXX_unrecognized
-			continue
-		}
-		ft := t.Field(fi).Type
-
-		sf, nested, err := fieldDefault(ft, prop)
-		switch {
-		case err != nil:
-			log.Print(err)
-		case nested:
-			dm.nested = append(dm.nested, fi)
-		case sf != nil:
-			sf.index = fi
-			dm.scalars = append(dm.scalars, *sf)
-		}
-	}
-
-	return dm
-}
-
-// fieldDefault returns the scalarField for field type ft.
-// sf will be nil if the field can not have a default.
-// nestedMessage will be true if this is a nested message.
-// Note that sf.index is not set on return.
-func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
-	var canHaveDefault bool
-	switch ft.Kind() {
-	case reflect.Ptr:
-		if ft.Elem().Kind() == reflect.Struct {
-			nestedMessage = true
-		} else {
-			canHaveDefault = true // proto2 scalar field
-		}
-
-	case reflect.Slice:
-		switch ft.Elem().Kind() {
-		case reflect.Ptr:
-			nestedMessage = true // repeated message
-		case reflect.Uint8:
-			canHaveDefault = true // bytes field
-		}
-
-	case reflect.Map:
-		if ft.Elem().Kind() == reflect.Ptr {
-			nestedMessage = true // map with message values
-		}
-	}
-
-	if !canHaveDefault {
-		if nestedMessage {
-			return nil, true, nil
-		}
-		return nil, false, nil
-	}
-
-	// We now know that ft is a pointer or slice.
-	sf = &scalarField{kind: ft.Elem().Kind()}
-
-	// scalar fields without defaults
-	if !prop.HasDefault {
-		return sf, false, nil
-	}
-
-	// a scalar field: either *T or []byte
-	switch ft.Elem().Kind() {
-	case reflect.Bool:
-		x, err := strconv.ParseBool(prop.Default)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Float32:
-		x, err := strconv.ParseFloat(prop.Default, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
-		}
-		sf.value = float32(x)
-	case reflect.Float64:
-		x, err := strconv.ParseFloat(prop.Default, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Int32:
-		x, err := strconv.ParseInt(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
-		}
-		sf.value = int32(x)
-	case reflect.Int64:
-		x, err := strconv.ParseInt(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.String:
-		sf.value = prop.Default
-	case reflect.Uint8:
-		// []byte (not *uint8)
-		sf.value = []byte(prop.Default)
-	case reflect.Uint32:
-		x, err := strconv.ParseUint(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
-		}
-		sf.value = uint32(x)
-	case reflect.Uint64:
-		x, err := strconv.ParseUint(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	default:
-		return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
-	}
-
-	return sf, false, nil
-}
-
-// Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-
-func mapKeys(vs []reflect.Value) sort.Interface {
-	s := mapKeySorter{
-		vs: vs,
-		// default Less function: textual comparison
-		less: func(a, b reflect.Value) bool {
-			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
-		},
-	}
-
-	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
-	// numeric keys are sorted numerically.
-	if len(vs) == 0 {
-		return s
-	}
-	switch vs[0].Kind() {
-	case reflect.Int32, reflect.Int64:
-		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
-	case reflect.Uint32, reflect.Uint64:
-		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
-	}
-
-	return s
-}
-
-type mapKeySorter struct {
-	vs   []reflect.Value
-	less func(a, b reflect.Value) bool
-}
-
-func (s mapKeySorter) Len() int      { return len(s.vs) }
-func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
-func (s mapKeySorter) Less(i, j int) bool {
-	return s.less(s.vs[i], s.vs[j])
-}
-
-// isProto3Zero reports whether v is a zero proto3 value.
-func isProto3Zero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint32, reflect.Uint64:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.String:
-		return v.String() == ""
-	}
-	return false
-}
-
-// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const GoGoProtoPackageIsVersion1 = true
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go
deleted file mode 100644
index a6c2c06b23..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-import (
-	"encoding/json"
-	"strconv"
-)
-
-func MarshalJSONEnum(m map[int32]string, value int32) ([]byte, error) {
-	s, ok := m[value]
-	if !ok {
-		s = strconv.Itoa(int(value))
-	}
-	return json.Marshal(s)
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go
deleted file mode 100644
index e25e01e637..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go
+++ /dev/null
@@ -1,280 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Support for message sets.
- */
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
-// A message type ID is required for storing a protocol buffer in a message set.
-var errNoMessageTypeID = errors.New("proto does not have a message type ID")
-
-// The first two types (_MessageSet_Item and messageSet)
-// model what the protocol compiler produces for the following protocol message:
-//   message MessageSet {
-//     repeated group Item = 1 {
-//       required int32 type_id = 2;
-//       required string message = 3;
-//     };
-//   }
-// That is the MessageSet wire format. We can't use a proto to generate these
-// because that would introduce a circular dependency between it and this package.
-
-type _MessageSet_Item struct {
-	TypeId  *int32 `protobuf:"varint,2,req,name=type_id"`
-	Message []byte `protobuf:"bytes,3,req,name=message"`
-}
-
-type messageSet struct {
-	Item             []*_MessageSet_Item `protobuf:"group,1,rep"`
-	XXX_unrecognized []byte
-	// TODO: caching?
-}
-
-// Make sure messageSet is a Message.
-var _ Message = (*messageSet)(nil)
-
-// messageTypeIder is an interface satisfied by a protocol buffer type
-// that may be stored in a MessageSet.
-type messageTypeIder interface {
-	MessageTypeId() int32
-}
-
-func (ms *messageSet) find(pb Message) *_MessageSet_Item {
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return nil
-	}
-	id := mti.MessageTypeId()
-	for _, item := range ms.Item {
-		if *item.TypeId == id {
-			return item
-		}
-	}
-	return nil
-}
-
-func (ms *messageSet) Has(pb Message) bool {
-	if ms.find(pb) != nil {
-		return true
-	}
-	return false
-}
-
-func (ms *messageSet) Unmarshal(pb Message) error {
-	if item := ms.find(pb); item != nil {
-		return Unmarshal(item.Message, pb)
-	}
-	if _, ok := pb.(messageTypeIder); !ok {
-		return errNoMessageTypeID
-	}
-	return nil // TODO: return error instead?
-}
-
-func (ms *messageSet) Marshal(pb Message) error {
-	msg, err := Marshal(pb)
-	if err != nil {
-		return err
-	}
-	if item := ms.find(pb); item != nil {
-		// reuse existing item
-		item.Message = msg
-		return nil
-	}
-
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return errNoMessageTypeID
-	}
-
-	mtid := mti.MessageTypeId()
-	ms.Item = append(ms.Item, &_MessageSet_Item{
-		TypeId:  &mtid,
-		Message: msg,
-	})
-	return nil
-}
-
-func (ms *messageSet) Reset()         { *ms = messageSet{} }
-func (ms *messageSet) String() string { return CompactTextString(ms) }
-func (*messageSet) ProtoMessage()     {}
-
-// Support for the message_set_wire_format message option.
-
-func skipVarint(buf []byte) []byte {
-	i := 0
-	for ; buf[i]&0x80 != 0; i++ {
-	}
-	return buf[i+1:]
-}
-
-// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
-// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSet(m map[int32]Extension) ([]byte, error) {
-	if err := encodeExtensionMap(m); err != nil {
-		return nil, err
-	}
-
-	// Sort extension IDs to provide a deterministic encoding.
-	// See also enc_map in encode.go.
-	ids := make([]int, 0, len(m))
-	for id := range m {
-		ids = append(ids, int(id))
-	}
-	sort.Ints(ids)
-
-	ms := &messageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
-	for _, id := range ids {
-		e := m[int32(id)]
-		// Remove the wire type and field number varint, as well as the length varint.
-		msg := skipVarint(skipVarint(e.enc))
-
-		ms.Item = append(ms.Item, &_MessageSet_Item{
-			TypeId:  Int32(int32(id)),
-			Message: msg,
-		})
-	}
-	return Marshal(ms)
-}
-
-// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
-// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSet(buf []byte, m map[int32]Extension) error {
-	ms := new(messageSet)
-	if err := Unmarshal(buf, ms); err != nil {
-		return err
-	}
-	for _, item := range ms.Item {
-		id := *item.TypeId
-		msg := item.Message
-
-		// Restore wire type and field number varint, plus length varint.
-		// Be careful to preserve duplicate items.
-		b := EncodeVarint(uint64(id)<<3 | WireBytes)
-		if ext, ok := m[id]; ok {
-			// Existing data; rip off the tag and length varint
-			// so we join the new data correctly.
-			// We can assume that ext.enc is set because we are unmarshaling.
-			o := ext.enc[len(b):]   // skip wire type and field number
-			_, n := DecodeVarint(o) // calculate length of length varint
-			o = o[n:]               // skip length varint
-			msg = append(o, msg...) // join old data and new data
-		}
-		b = append(b, EncodeVarint(uint64(len(msg)))...)
-		b = append(b, msg...)
-
-		m[id] = Extension{enc: b}
-	}
-	return nil
-}
-
-// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
-// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSetJSON(m map[int32]Extension) ([]byte, error) {
-	var b bytes.Buffer
-	b.WriteByte('{')
-
-	// Process the map in key order for deterministic output.
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
-
-	for i, id := range ids {
-		ext := m[id]
-		if i > 0 {
-			b.WriteByte(',')
-		}
-
-		msd, ok := messageSetMap[id]
-		if !ok {
-			// Unknown type; we can't render it, so skip it.
-			continue
-		}
-		fmt.Fprintf(&b, `"[%s]":`, msd.name)
-
-		x := ext.value
-		if x == nil {
-			x = reflect.New(msd.t.Elem()).Interface()
-			if err := Unmarshal(ext.enc, x.(Message)); err != nil {
-				return nil, err
-			}
-		}
-		d, err := json.Marshal(x)
-		if err != nil {
-			return nil, err
-		}
-		b.Write(d)
-	}
-	b.WriteByte('}')
-	return b.Bytes(), nil
-}
-
-// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
-// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSetJSON(buf []byte, m map[int32]Extension) error {
-	// Common-case fast path.
-	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
-		return nil
-	}
-
-	// This is fairly tricky, and it's not clear that it is needed.
-	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
-}
-
-// A global registry of types that can be used in a MessageSet.
-
-var messageSetMap = make(map[int32]messageSetDesc)
-
-type messageSetDesc struct {
-	t    reflect.Type // pointer to struct
-	name string
-}
-
-// RegisterMessageSetType is called from the generated code.
-func RegisterMessageSetType(m Message, fieldNum int32, name string) {
-	messageSetMap[fieldNum] = messageSetDesc{
-		t:    reflect.TypeOf(m),
-		name: name,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go
deleted file mode 100644
index 749919d250..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go
+++ /dev/null
@@ -1,479 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build appengine
-
-// This file contains an implementation of proto field accesses using package reflect.
-// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
-// be used on App Engine.
-
-package proto
-
-import (
-	"math"
-	"reflect"
-)
-
-// A structPointer is a pointer to a struct.
-type structPointer struct {
-	v reflect.Value
-}
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-// The reflect value must itself be a pointer to a struct.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer{v}
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p.v.IsNil()
-}
-
-// Interface returns the struct pointer as an interface value.
-func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
-	return p.v.Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by the sequence of field indices
-// passed to reflect's FieldByIndex.
-type field []int
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return f.Index
-}
-
-// invalidField is an invalid field identifier.
-var invalidField = field(nil)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool { return f != nil }
-
-// field returns the given field in the struct as a reflect value.
-func structPointer_field(p structPointer, f field) reflect.Value {
-	// Special case: an extension map entry with a value of type T
-	// passes a *T to the struct-handling code with a zero field,
-	// expecting that it will be treated as equivalent to *struct{ X T },
-	// which has the same memory layout. We have to handle that case
-	// specially, because reflect will panic if we call FieldByIndex on a
-	// non-struct.
-	if f == nil {
-		return p.v.Elem()
-	}
-
-	return p.v.Elem().FieldByIndex(f)
-}
-
-// ifield returns the given field in the struct as an interface value.
-func structPointer_ifield(p structPointer, f field) interface{} {
-	return structPointer_field(p, f).Addr().Interface()
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return structPointer_ifield(p, f).(*[]byte)
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return structPointer_ifield(p, f).(*[][]byte)
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return structPointer_ifield(p, f).(**bool)
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return structPointer_ifield(p, f).(*bool)
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return structPointer_ifield(p, f).(*[]bool)
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return structPointer_ifield(p, f).(**string)
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return structPointer_ifield(p, f).(*string)
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return structPointer_ifield(p, f).(*[]string)
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return structPointer_ifield(p, f).(*map[int32]Extension)
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return structPointer_field(p, f).Addr()
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	structPointer_field(p, f).Set(q.v)
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return structPointer{structPointer_field(p, f)}
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
-	return structPointerSlice{structPointer_field(p, f)}
-}
-
-// A structPointerSlice represents the address of a slice of pointers to structs
-// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
-type structPointerSlice struct {
-	v reflect.Value
-}
-
-func (p structPointerSlice) Len() int                  { return p.v.Len() }
-func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
-func (p structPointerSlice) Append(q structPointer) {
-	p.v.Set(reflect.Append(p.v, q.v))
-}
-
-var (
-	int32Type   = reflect.TypeOf(int32(0))
-	uint32Type  = reflect.TypeOf(uint32(0))
-	float32Type = reflect.TypeOf(float32(0))
-	int64Type   = reflect.TypeOf(int64(0))
-	uint64Type  = reflect.TypeOf(uint64(0))
-	float64Type = reflect.TypeOf(float64(0))
-)
-
-// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
-// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
-type word32 struct {
-	v reflect.Value
-}
-
-// IsNil reports whether p is nil.
-func word32_IsNil(p word32) bool {
-	return p.v.IsNil()
-}
-
-// Set sets p to point at a newly allocated word with bits set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int32Type:
-		if len(o.int32s) == 0 {
-			o.int32s = make([]int32, uint32PoolSize)
-		}
-		o.int32s[0] = int32(x)
-		p.v.Set(reflect.ValueOf(&o.int32s[0]))
-		o.int32s = o.int32s[1:]
-		return
-	case uint32Type:
-		if len(o.uint32s) == 0 {
-			o.uint32s = make([]uint32, uint32PoolSize)
-		}
-		o.uint32s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
-		o.uint32s = o.uint32s[1:]
-		return
-	case float32Type:
-		if len(o.float32s) == 0 {
-			o.float32s = make([]float32, uint32PoolSize)
-		}
-		o.float32s[0] = math.Float32frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float32s[0]))
-		o.float32s = o.float32s[1:]
-		return
-	}
-
-	// must be enum
-	p.v.Set(reflect.New(t))
-	p.v.Elem().SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32_Get(p word32) uint32 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32{structPointer_field(p, f)}
-}
-
-// A word32Val represents a field of type int32, uint32, float32, or enum.
-// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
-type word32Val struct {
-	v reflect.Value
-}
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	switch p.v.Type() {
-	case int32Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint32Type:
-		p.v.SetUint(uint64(x))
-		return
-	case float32Type:
-		p.v.SetFloat(float64(math.Float32frombits(x)))
-		return
-	}
-
-	// must be enum
-	p.v.SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32Val_Get(p word32Val) uint32 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val{structPointer_field(p, f)}
-}
-
-// A word32Slice is a slice of 32-bit values.
-// That is, v.Type() is []int32, []uint32, []float32, or []enum.
-type word32Slice struct {
-	v reflect.Value
-}
-
-func (p word32Slice) Append(x uint32) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int32:
-		elem.SetInt(int64(int32(x)))
-	case reflect.Uint32:
-		elem.SetUint(uint64(x))
-	case reflect.Float32:
-		elem.SetFloat(float64(math.Float32frombits(x)))
-	}
-}
-
-func (p word32Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word32Slice) Index(i int) uint32 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) word32Slice {
-	return word32Slice{structPointer_field(p, f)}
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 struct {
-	v reflect.Value
-}
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int64Type:
-		if len(o.int64s) == 0 {
-			o.int64s = make([]int64, uint64PoolSize)
-		}
-		o.int64s[0] = int64(x)
-		p.v.Set(reflect.ValueOf(&o.int64s[0]))
-		o.int64s = o.int64s[1:]
-		return
-	case uint64Type:
-		if len(o.uint64s) == 0 {
-			o.uint64s = make([]uint64, uint64PoolSize)
-		}
-		o.uint64s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
-		o.uint64s = o.uint64s[1:]
-		return
-	case float64Type:
-		if len(o.float64s) == 0 {
-			o.float64s = make([]float64, uint64PoolSize)
-		}
-		o.float64s[0] = math.Float64frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float64s[0]))
-		o.float64s = o.float64s[1:]
-		return
-	}
-	panic("unreachable")
-}
-
-func word64_IsNil(p word64) bool {
-	return p.v.IsNil()
-}
-
-func word64_Get(p word64) uint64 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64{structPointer_field(p, f)}
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val struct {
-	v reflect.Value
-}
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	switch p.v.Type() {
-	case int64Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint64Type:
-		p.v.SetUint(x)
-		return
-	case float64Type:
-		p.v.SetFloat(math.Float64frombits(x))
-		return
-	}
-	panic("unreachable")
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val{structPointer_field(p, f)}
-}
-
-type word64Slice struct {
-	v reflect.Value
-}
-
-func (p word64Slice) Append(x uint64) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int64:
-		elem.SetInt(int64(int64(x)))
-	case reflect.Uint64:
-		elem.SetUint(uint64(x))
-	case reflect.Float64:
-		elem.SetFloat(float64(math.Float64frombits(x)))
-	}
-}
-
-func (p word64Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word64Slice) Index(i int) uint64 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return uint64(elem.Uint())
-	case reflect.Float64:
-		return math.Float64bits(float64(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Slice(p structPointer, f field) word64Slice {
-	return word64Slice{structPointer_field(p, f)}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go
deleted file mode 100644
index e9be0fe92e..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build !appengine
-
-// This file contains the implementation of the proto field accesses using package unsafe.
-
-package proto
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-// NOTE: These type_Foo functions would more idiomatically be methods,
-// but Go does not allow methods on pointer types, and we must preserve
-// some pointer type for the garbage collector. We use these
-// funcs with clunky names as our poor approximation to methods.
-//
-// An alternative would be
-//	type structPointer struct { p unsafe.Pointer }
-// but that does not registerize as well.
-
-// A structPointer is a pointer to a struct.
-type structPointer unsafe.Pointer
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer(unsafe.Pointer(v.Pointer()))
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p == nil
-}
-
-// Interface returns the struct pointer, assumed to have element type t,
-// as an interface value.
-func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
-	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by its byte offset from the start of the struct.
-type field uintptr
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return field(f.Offset)
-}
-
-// invalidField is an invalid field identifier.
-const invalidField = ^field(0)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool {
-	return f != ^field(0)
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
-	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
-type structPointerSlice []structPointer
-
-func (v *structPointerSlice) Len() int                  { return len(*v) }
-func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
-func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
-
-// A word32 is the address of a "pointer to 32-bit value" field.
-type word32 **uint32
-
-// IsNil reports whether *v is nil.
-func word32_IsNil(p word32) bool {
-	return *p == nil
-}
-
-// Set sets *v to point at a newly allocated word set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	if len(o.uint32s) == 0 {
-		o.uint32s = make([]uint32, uint32PoolSize)
-	}
-	o.uint32s[0] = x
-	*p = &o.uint32s[0]
-	o.uint32s = o.uint32s[1:]
-}
-
-// Get gets the value pointed at by *v.
-func word32_Get(p word32) uint32 {
-	return **p
-}
-
-// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Val is the address of a 32-bit value field.
-type word32Val *uint32
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	*p = x
-}
-
-// Get gets the value pointed at by p.
-func word32Val_Get(p word32Val) uint32 {
-	return *p
-}
-
-// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Slice is a slice of 32-bit values.
-type word32Slice []uint32
-
-func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
-func (v *word32Slice) Len() int           { return len(*v) }
-func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
-
-// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
-	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 **uint64
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	if len(o.uint64s) == 0 {
-		o.uint64s = make([]uint64, uint64PoolSize)
-	}
-	o.uint64s[0] = x
-	*p = &o.uint64s[0]
-	o.uint64s = o.uint64s[1:]
-}
-
-func word64_IsNil(p word64) bool {
-	return *p == nil
-}
-
-func word64_Get(p word64) uint64 {
-	return **p
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val *uint64
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	*p = x
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	return *p
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Slice is like word32Slice but for 64-bit values.
-type word64Slice []uint64
-
-func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
-func (v *word64Slice) Len() int           { return len(*v) }
-func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
-
-func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
-	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
deleted file mode 100644
index 6bc85fa987..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build !appengine
-
-// This file contains the implementation of the proto field accesses using package unsafe.
-
-package proto
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-func structPointer_InterfaceAt(p structPointer, f field, t reflect.Type) interface{} {
-	point := unsafe.Pointer(uintptr(p) + uintptr(f))
-	r := reflect.NewAt(t, point)
-	return r.Interface()
-}
-
-func structPointer_InterfaceRef(p structPointer, f field, t reflect.Type) interface{} {
-	point := unsafe.Pointer(uintptr(p) + uintptr(f))
-	r := reflect.NewAt(t, point)
-	if r.Elem().IsNil() {
-		return nil
-	}
-	return r.Elem().Interface()
-}
-
-func copyUintPtr(oldptr, newptr uintptr, size int) {
-	oldbytes := make([]byte, 0)
-	oldslice := (*reflect.SliceHeader)(unsafe.Pointer(&oldbytes))
-	oldslice.Data = oldptr
-	oldslice.Len = size
-	oldslice.Cap = size
-	newbytes := make([]byte, 0)
-	newslice := (*reflect.SliceHeader)(unsafe.Pointer(&newbytes))
-	newslice.Data = newptr
-	newslice.Len = size
-	newslice.Cap = size
-	copy(newbytes, oldbytes)
-}
-
-func structPointer_Copy(oldptr structPointer, newptr structPointer, size int) {
-	copyUintPtr(uintptr(oldptr), uintptr(newptr), size)
-}
-
-func appendStructPointer(base structPointer, f field, typ reflect.Type) structPointer {
-	size := typ.Elem().Size()
-	oldHeader := structPointer_GetSliceHeader(base, f)
-	newLen := oldHeader.Len + 1
-	slice := reflect.MakeSlice(typ, newLen, newLen)
-	bas := toStructPointer(slice)
-	for i := 0; i < oldHeader.Len; i++ {
-		newElemptr := uintptr(bas) + uintptr(i)*size
-		oldElemptr := oldHeader.Data + uintptr(i)*size
-		copyUintPtr(oldElemptr, newElemptr, int(size))
-	}
-
-	oldHeader.Data = uintptr(bas)
-	oldHeader.Len = newLen
-	oldHeader.Cap = newLen
-
-	return structPointer(unsafe.Pointer(uintptr(unsafe.Pointer(bas)) + uintptr(uintptr(newLen-1)*size)))
-}
-
-func structPointer_FieldPointer(p structPointer, f field) structPointer {
-	return structPointer(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-func structPointer_GetRefStructPointer(p structPointer, f field) structPointer {
-	return structPointer((*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-func structPointer_GetSliceHeader(p structPointer, f field) *reflect.SliceHeader {
-	return (*reflect.SliceHeader)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-func structPointer_Add(p structPointer, size field) structPointer {
-	return structPointer(unsafe.Pointer(uintptr(p) + uintptr(size)))
-}
-
-func structPointer_Len(p structPointer, f field) int {
-	return len(*(*[]interface{})(unsafe.Pointer(structPointer_GetRefStructPointer(p, f))))
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
deleted file mode 100644
index 5e6a0b3ba7..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
+++ /dev/null
@@ -1,923 +0,0 @@
-// Extensions for Protocol Buffers to create more go like structures.
-//
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-)
-
-const debug bool = false
-
-// Constants that identify the encoding of a value on the wire.
-const (
-	WireVarint     = 0
-	WireFixed64    = 1
-	WireBytes      = 2
-	WireStartGroup = 3
-	WireEndGroup   = 4
-	WireFixed32    = 5
-)
-
-const startSize = 10 // initial slice/string sizes
-
-// Encoders are defined in encode.go
-// An encoder outputs the full representation of a field, including its
-// tag and encoder type.
-type encoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueEncoder encodes a single integer in a particular encoding.
-type valueEncoder func(o *Buffer, x uint64) error
-
-// Sizers are defined in encode.go
-// A sizer returns the encoded size of a field, including its tag and encoder
-// type.
-type sizer func(prop *Properties, base structPointer) int
-
-// A valueSizer returns the encoded size of a single integer in a particular
-// encoding.
-type valueSizer func(x uint64) int
-
-// Decoders are defined in decode.go
-// A decoder creates a value from its wire representation.
-// Unrecognized subelements are saved in unrec.
-type decoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueDecoder decodes a single integer in a particular encoding.
-type valueDecoder func(o *Buffer) (x uint64, err error)
-
-// A oneofMarshaler does the marshaling for all oneof fields in a message.
-type oneofMarshaler func(Message, *Buffer) error
-
-// A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
-type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
-
-// A oneofSizer does the sizing for all oneof fields in a message.
-type oneofSizer func(Message) int
-
-// tagMap is an optimization over map[int]int for typical protocol buffer
-// use-cases. Encoded protocol buffers are often in tag order with small tag
-// numbers.
-type tagMap struct {
-	fastTags []int
-	slowTags map[int]int
-}
-
-// tagMapFastLimit is the upper bound on the tag number that will be stored in
-// the tagMap slice rather than its map.
-const tagMapFastLimit = 1024
-
-func (p *tagMap) get(t int) (int, bool) {
-	if t > 0 && t < tagMapFastLimit {
-		if t >= len(p.fastTags) {
-			return 0, false
-		}
-		fi := p.fastTags[t]
-		return fi, fi >= 0
-	}
-	fi, ok := p.slowTags[t]
-	return fi, ok
-}
-
-func (p *tagMap) put(t int, fi int) {
-	if t > 0 && t < tagMapFastLimit {
-		for len(p.fastTags) < t+1 {
-			p.fastTags = append(p.fastTags, -1)
-		}
-		p.fastTags[t] = fi
-		return
-	}
-	if p.slowTags == nil {
-		p.slowTags = make(map[int]int)
-	}
-	p.slowTags[t] = fi
-}
-
-// StructProperties represents properties for all the fields of a struct.
-// decoderTags and decoderOrigNames should only be used by the decoder.
-type StructProperties struct {
-	Prop             []*Properties  // properties for each field
-	reqCount         int            // required count
-	decoderTags      tagMap         // map from proto tag to struct field number
-	decoderOrigNames map[string]int // map from original name to struct field number
-	order            []int          // list of struct field numbers in tag order
-	unrecField       field          // field id of the XXX_unrecognized []byte field
-	extendable       bool           // is this an extendable proto
-
-	oneofMarshaler   oneofMarshaler
-	oneofUnmarshaler oneofUnmarshaler
-	oneofSizer       oneofSizer
-	stype            reflect.Type
-
-	// OneofTypes contains information about the oneof fields in this message.
-	// It is keyed by the original name of a field.
-	OneofTypes map[string]*OneofProperties
-}
-
-// OneofProperties represents information about a specific field in a oneof.
-type OneofProperties struct {
-	Type  reflect.Type // pointer to generated struct type for this oneof field
-	Field int          // struct field number of the containing oneof in the message
-	Prop  *Properties
-}
-
-// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
-// See encode.go, (*Buffer).enc_struct.
-
-func (sp *StructProperties) Len() int { return len(sp.order) }
-func (sp *StructProperties) Less(i, j int) bool {
-	return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
-}
-func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
-
-// Properties represents the protocol-specific behavior of a single struct field.
-type Properties struct {
-	Name     string // name of the field, for error messages
-	OrigName string // original name before protocol compiler (always set)
-	JSONName string // name to use for JSON; determined by protoc
-	Wire     string
-	WireType int
-	Tag      int
-	Required bool
-	Optional bool
-	Repeated bool
-	Packed   bool   // relevant for repeated primitives only
-	Enum     string // set for enum types only
-	proto3   bool   // whether this is known to be a proto3 field; set for []byte only
-	oneof    bool   // whether this is a oneof field
-
-	Default    string // default value
-	HasDefault bool   // whether an explicit default was provided
-	CustomType string
-	def_uint64 uint64
-
-	enc           encoder
-	valEnc        valueEncoder // set for bool and numeric types only
-	field         field
-	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
-	tagbuf        [8]byte
-	stype         reflect.Type      // set for struct types only
-	sstype        reflect.Type      // set for slices of structs types only
-	ctype         reflect.Type      // set for custom types only
-	sprop         *StructProperties // set for struct types only
-	isMarshaler   bool
-	isUnmarshaler bool
-
-	mtype    reflect.Type // set for map types only
-	mkeyprop *Properties  // set for map types only
-	mvalprop *Properties  // set for map types only
-
-	size    sizer
-	valSize valueSizer // set for bool and numeric types only
-
-	dec    decoder
-	valDec valueDecoder // set for bool and numeric types only
-
-	// If this is a packable field, this will be the decoder for the packed version of the field.
-	packedDec decoder
-}
-
-// String formats the properties in the protobuf struct field tag style.
-func (p *Properties) String() string {
-	s := p.Wire
-	s = ","
-	s += strconv.Itoa(p.Tag)
-	if p.Required {
-		s += ",req"
-	}
-	if p.Optional {
-		s += ",opt"
-	}
-	if p.Repeated {
-		s += ",rep"
-	}
-	if p.Packed {
-		s += ",packed"
-	}
-	s += ",name=" + p.OrigName
-	if p.JSONName != p.OrigName {
-		s += ",json=" + p.JSONName
-	}
-	if p.proto3 {
-		s += ",proto3"
-	}
-	if p.oneof {
-		s += ",oneof"
-	}
-	if len(p.Enum) > 0 {
-		s += ",enum=" + p.Enum
-	}
-	if p.HasDefault {
-		s += ",def=" + p.Default
-	}
-	return s
-}
-
-// Parse populates p by parsing a string in the protobuf struct field tag style.
-func (p *Properties) Parse(s string) {
-	// "bytes,49,opt,name=foo,def=hello!"
-	fields := strings.Split(s, ",") // breaks def=, but handled below.
-	if len(fields) < 2 {
-		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
-		return
-	}
-
-	p.Wire = fields[0]
-	switch p.Wire {
-	case "varint":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeVarint
-		p.valDec = (*Buffer).DecodeVarint
-		p.valSize = sizeVarint
-	case "fixed32":
-		p.WireType = WireFixed32
-		p.valEnc = (*Buffer).EncodeFixed32
-		p.valDec = (*Buffer).DecodeFixed32
-		p.valSize = sizeFixed32
-	case "fixed64":
-		p.WireType = WireFixed64
-		p.valEnc = (*Buffer).EncodeFixed64
-		p.valDec = (*Buffer).DecodeFixed64
-		p.valSize = sizeFixed64
-	case "zigzag32":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag32
-		p.valDec = (*Buffer).DecodeZigzag32
-		p.valSize = sizeZigzag32
-	case "zigzag64":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag64
-		p.valDec = (*Buffer).DecodeZigzag64
-		p.valSize = sizeZigzag64
-	case "bytes", "group":
-		p.WireType = WireBytes
-		// no numeric converter for non-numeric types
-	default:
-		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
-		return
-	}
-
-	var err error
-	p.Tag, err = strconv.Atoi(fields[1])
-	if err != nil {
-		return
-	}
-
-	for i := 2; i < len(fields); i++ {
-		f := fields[i]
-		switch {
-		case f == "req":
-			p.Required = true
-		case f == "opt":
-			p.Optional = true
-		case f == "rep":
-			p.Repeated = true
-		case f == "packed":
-			p.Packed = true
-		case strings.HasPrefix(f, "name="):
-			p.OrigName = f[5:]
-		case strings.HasPrefix(f, "json="):
-			p.JSONName = f[5:]
-		case strings.HasPrefix(f, "enum="):
-			p.Enum = f[5:]
-		case f == "proto3":
-			p.proto3 = true
-		case f == "oneof":
-			p.oneof = true
-		case strings.HasPrefix(f, "def="):
-			p.HasDefault = true
-			p.Default = f[4:] // rest of string
-			if i+1 < len(fields) {
-				// Commas aren't escaped, and def is always last.
-				p.Default += "," + strings.Join(fields[i+1:], ",")
-				break
-			}
-		case strings.HasPrefix(f, "embedded="):
-			p.OrigName = strings.Split(f, "=")[1]
-		case strings.HasPrefix(f, "customtype="):
-			p.CustomType = strings.Split(f, "=")[1]
-		}
-	}
-}
-
-func logNoSliceEnc(t1, t2 reflect.Type) {
-	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
-}
-
-var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
-
-// Initialize the fields for encoding and decoding.
-func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
-	p.enc = nil
-	p.dec = nil
-	p.size = nil
-	if len(p.CustomType) > 0 {
-		p.setCustomEncAndDec(typ)
-		p.setTag(lockGetProp)
-		return
-	}
-	switch t1 := typ; t1.Kind() {
-	default:
-		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
-
-	// proto3 scalar types
-
-	case reflect.Bool:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_bool
-			p.dec = (*Buffer).dec_proto3_bool
-			p.size = size_proto3_bool
-		} else {
-			p.enc = (*Buffer).enc_ref_bool
-			p.dec = (*Buffer).dec_proto3_bool
-			p.size = size_ref_bool
-		}
-	case reflect.Int32:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_int32
-			p.dec = (*Buffer).dec_proto3_int32
-			p.size = size_proto3_int32
-		} else {
-			p.enc = (*Buffer).enc_ref_int32
-			p.dec = (*Buffer).dec_proto3_int32
-			p.size = size_ref_int32
-		}
-	case reflect.Uint32:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_uint32
-			p.dec = (*Buffer).dec_proto3_int32 // can reuse
-			p.size = size_proto3_uint32
-		} else {
-			p.enc = (*Buffer).enc_ref_uint32
-			p.dec = (*Buffer).dec_proto3_int32 // can reuse
-			p.size = size_ref_uint32
-		}
-	case reflect.Int64, reflect.Uint64:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_int64
-			p.dec = (*Buffer).dec_proto3_int64
-			p.size = size_proto3_int64
-		} else {
-			p.enc = (*Buffer).enc_ref_int64
-			p.dec = (*Buffer).dec_proto3_int64
-			p.size = size_ref_int64
-		}
-	case reflect.Float32:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_proto3_int32
-			p.size = size_proto3_uint32
-		} else {
-			p.enc = (*Buffer).enc_ref_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_proto3_int32
-			p.size = size_ref_uint32
-		}
-	case reflect.Float64:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_proto3_int64
-			p.size = size_proto3_int64
-		} else {
-			p.enc = (*Buffer).enc_ref_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_proto3_int64
-			p.size = size_ref_int64
-		}
-	case reflect.String:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_string
-			p.dec = (*Buffer).dec_proto3_string
-			p.size = size_proto3_string
-		} else {
-			p.enc = (*Buffer).enc_ref_string
-			p.dec = (*Buffer).dec_proto3_string
-			p.size = size_ref_string
-		}
-	case reflect.Struct:
-		p.stype = typ
-		p.isMarshaler = isMarshaler(typ)
-		p.isUnmarshaler = isUnmarshaler(typ)
-		if p.Wire == "bytes" {
-			p.enc = (*Buffer).enc_ref_struct_message
-			p.dec = (*Buffer).dec_ref_struct_message
-			p.size = size_ref_struct_message
-		} else {
-			fmt.Fprintf(os.Stderr, "proto: no coders for struct %T\n", typ)
-		}
-
-	case reflect.Ptr:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
-			break
-		case reflect.Bool:
-			p.enc = (*Buffer).enc_bool
-			p.dec = (*Buffer).dec_bool
-			p.size = size_bool
-		case reflect.Int32:
-			p.enc = (*Buffer).enc_int32
-			p.dec = (*Buffer).dec_int32
-			p.size = size_int32
-		case reflect.Uint32:
-			p.enc = (*Buffer).enc_uint32
-			p.dec = (*Buffer).dec_int32 // can reuse
-			p.size = size_uint32
-		case reflect.Int64, reflect.Uint64:
-			p.enc = (*Buffer).enc_int64
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.Float32:
-			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_int32
-			p.size = size_uint32
-		case reflect.Float64:
-			p.enc = (*Buffer).enc_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.String:
-			p.enc = (*Buffer).enc_string
-			p.dec = (*Buffer).dec_string
-			p.size = size_string
-		case reflect.Struct:
-			p.stype = t1.Elem()
-			p.isMarshaler = isMarshaler(t1)
-			p.isUnmarshaler = isUnmarshaler(t1)
-			if p.Wire == "bytes" {
-				p.enc = (*Buffer).enc_struct_message
-				p.dec = (*Buffer).dec_struct_message
-				p.size = size_struct_message
-			} else {
-				p.enc = (*Buffer).enc_struct_group
-				p.dec = (*Buffer).dec_struct_group
-				p.size = size_struct_group
-			}
-		}
-
-	case reflect.Slice:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			logNoSliceEnc(t1, t2)
-			break
-		case reflect.Bool:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_bool
-				p.size = size_slice_packed_bool
-			} else {
-				p.enc = (*Buffer).enc_slice_bool
-				p.size = size_slice_bool
-			}
-			p.dec = (*Buffer).dec_slice_bool
-			p.packedDec = (*Buffer).dec_slice_packed_bool
-		case reflect.Int32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int32
-				p.size = size_slice_packed_int32
-			} else {
-				p.enc = (*Buffer).enc_slice_int32
-				p.size = size_slice_int32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Uint32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_uint32
-				p.size = size_slice_packed_uint32
-			} else {
-				p.enc = (*Buffer).enc_slice_uint32
-				p.size = size_slice_uint32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Int64, reflect.Uint64:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int64
-				p.size = size_slice_packed_int64
-			} else {
-				p.enc = (*Buffer).enc_slice_int64
-				p.size = size_slice_int64
-			}
-			p.dec = (*Buffer).dec_slice_int64
-			p.packedDec = (*Buffer).dec_slice_packed_int64
-		case reflect.Uint8:
-			p.enc = (*Buffer).enc_slice_byte
-			p.dec = (*Buffer).dec_slice_byte
-			p.size = size_slice_byte
-			// This is a []byte, which is either a bytes field,
-			// or the value of a map field. In the latter case,
-			// we always encode an empty []byte, so we should not
-			// use the proto3 enc/size funcs.
-			// f == nil iff this is the key/value of a map field.
-			if p.proto3 && f != nil {
-				p.enc = (*Buffer).enc_proto3_slice_byte
-				p.size = size_proto3_slice_byte
-			}
-		case reflect.Float32, reflect.Float64:
-			switch t2.Bits() {
-			case 32:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_uint32
-					p.size = size_slice_packed_uint32
-				} else {
-					p.enc = (*Buffer).enc_slice_uint32
-					p.size = size_slice_uint32
-				}
-				p.dec = (*Buffer).dec_slice_int32
-				p.packedDec = (*Buffer).dec_slice_packed_int32
-			case 64:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_int64
-					p.size = size_slice_packed_int64
-				} else {
-					p.enc = (*Buffer).enc_slice_int64
-					p.size = size_slice_int64
-				}
-				p.dec = (*Buffer).dec_slice_int64
-				p.packedDec = (*Buffer).dec_slice_packed_int64
-			default:
-				logNoSliceEnc(t1, t2)
-				break
-			}
-		case reflect.String:
-			p.enc = (*Buffer).enc_slice_string
-			p.dec = (*Buffer).dec_slice_string
-			p.size = size_slice_string
-		case reflect.Ptr:
-			switch t3 := t2.Elem(); t3.Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
-				break
-			case reflect.Struct:
-				p.stype = t2.Elem()
-				p.isMarshaler = isMarshaler(t2)
-				p.isUnmarshaler = isUnmarshaler(t2)
-				if p.Wire == "bytes" {
-					p.enc = (*Buffer).enc_slice_struct_message
-					p.dec = (*Buffer).dec_slice_struct_message
-					p.size = size_slice_struct_message
-				} else {
-					p.enc = (*Buffer).enc_slice_struct_group
-					p.dec = (*Buffer).dec_slice_struct_group
-					p.size = size_slice_struct_group
-				}
-			}
-		case reflect.Slice:
-			switch t2.Elem().Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
-				break
-			case reflect.Uint8:
-				p.enc = (*Buffer).enc_slice_slice_byte
-				p.dec = (*Buffer).dec_slice_slice_byte
-				p.size = size_slice_slice_byte
-			}
-		case reflect.Struct:
-			p.setSliceOfNonPointerStructs(t1)
-		}
-
-	case reflect.Map:
-		p.enc = (*Buffer).enc_new_map
-		p.dec = (*Buffer).dec_new_map
-		p.size = size_new_map
-
-		p.mtype = t1
-		p.mkeyprop = &Properties{}
-		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
-		p.mvalprop = &Properties{}
-		vtype := p.mtype.Elem()
-		if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
-			// The value type is not a message (*T) or bytes ([]byte),
-			// so we need encoders for the pointer to this type.
-			vtype = reflect.PtrTo(vtype)
-		}
-		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
-	}
-	p.setTag(lockGetProp)
-}
-
-func (p *Properties) setTag(lockGetProp bool) {
-	// precalculate tag code
-	wire := p.WireType
-	if p.Packed {
-		wire = WireBytes
-	}
-	x := uint32(p.Tag)<<3 | uint32(wire)
-	i := 0
-	for i = 0; x > 127; i++ {
-		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	p.tagbuf[i] = uint8(x)
-	p.tagcode = p.tagbuf[0 : i+1]
-
-	if p.stype != nil {
-		if lockGetProp {
-			p.sprop = GetProperties(p.stype)
-		} else {
-			p.sprop = getPropertiesLocked(p.stype)
-		}
-	}
-}
-
-var (
-	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
-	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
-)
-
-// isMarshaler reports whether type t implements Marshaler.
-func isMarshaler(t reflect.Type) bool {
-	return t.Implements(marshalerType)
-}
-
-// isUnmarshaler reports whether type t implements Unmarshaler.
-func isUnmarshaler(t reflect.Type) bool {
-	return t.Implements(unmarshalerType)
-}
-
-// Init populates the properties from a protocol buffer struct tag.
-func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
-	p.init(typ, name, tag, f, true)
-}
-
-func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
-	// "bytes,49,opt,def=hello!"
-	p.Name = name
-	p.OrigName = name
-	if f != nil {
-		p.field = toField(f)
-	}
-	if tag == "" {
-		return
-	}
-	p.Parse(tag)
-	p.setEncAndDec(typ, f, lockGetProp)
-}
-
-var (
-	propertiesMu  sync.RWMutex
-	propertiesMap = make(map[reflect.Type]*StructProperties)
-)
-
-// GetProperties returns the list of properties for the type represented by t.
-// t must represent a generated struct type of a protocol message.
-func GetProperties(t reflect.Type) *StructProperties {
-	if t.Kind() != reflect.Struct {
-		panic("proto: type must have kind struct")
-	}
-
-	// Most calls to GetProperties in a long-running program will be
-	// retrieving details for types we have seen before.
-	propertiesMu.RLock()
-	sprop, ok := propertiesMap[t]
-	propertiesMu.RUnlock()
-	if ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return sprop
-	}
-
-	propertiesMu.Lock()
-	sprop = getPropertiesLocked(t)
-	propertiesMu.Unlock()
-	return sprop
-}
-
-// getPropertiesLocked requires that propertiesMu is held.
-func getPropertiesLocked(t reflect.Type) *StructProperties {
-	if prop, ok := propertiesMap[t]; ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return prop
-	}
-	if collectStats {
-		stats.Cmiss++
-	}
-
-	prop := new(StructProperties)
-	// in case of recursive protos, fill this in now.
-	propertiesMap[t] = prop
-
-	// build properties
-	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType)
-	prop.unrecField = invalidField
-	prop.Prop = make([]*Properties, t.NumField())
-	prop.order = make([]int, t.NumField())
-
-	isOneofMessage := false
-	for i := 0; i < t.NumField(); i++ {
-		f := t.Field(i)
-		p := new(Properties)
-		name := f.Name
-		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
-
-		if f.Name == "XXX_extensions" { // special case
-			if len(f.Tag.Get("protobuf")) > 0 {
-				p.enc = (*Buffer).enc_ext_slice_byte
-				p.dec = nil // not needed
-				p.size = size_ext_slice_byte
-			} else {
-				p.enc = (*Buffer).enc_map
-				p.dec = nil // not needed
-				p.size = size_map
-			}
-		}
-		if f.Name == "XXX_unrecognized" { // special case
-			prop.unrecField = toField(&f)
-		}
-		oneof := f.Tag.Get("protobuf_oneof") != "" // special case
-		if oneof {
-			isOneofMessage = true
-		}
-		prop.Prop[i] = p
-		prop.order[i] = i
-		if debug {
-			print(i, " ", f.Name, " ", t.String(), " ")
-			if p.Tag > 0 {
-				print(p.String())
-			}
-			print("\n")
-		}
-		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && !oneof {
-			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
-		}
-	}
-
-	// Re-order prop.order.
-	sort.Sort(prop)
-
-	type oneofMessage interface {
-		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
-	}
-	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); isOneofMessage && ok {
-		var oots []interface{}
-		prop.oneofMarshaler, prop.oneofUnmarshaler, prop.oneofSizer, oots = om.XXX_OneofFuncs()
-		prop.stype = t
-
-		// Interpret oneof metadata.
-		prop.OneofTypes = make(map[string]*OneofProperties)
-		for _, oot := range oots {
-			oop := &OneofProperties{
-				Type: reflect.ValueOf(oot).Type(), // *T
-				Prop: new(Properties),
-			}
-			sft := oop.Type.Elem().Field(0)
-			oop.Prop.Name = sft.Name
-			oop.Prop.Parse(sft.Tag.Get("protobuf"))
-			// There will be exactly one interface field that
-			// this new value is assignable to.
-			for i := 0; i < t.NumField(); i++ {
-				f := t.Field(i)
-				if f.Type.Kind() != reflect.Interface {
-					continue
-				}
-				if !oop.Type.AssignableTo(f.Type) {
-					continue
-				}
-				oop.Field = i
-				break
-			}
-			prop.OneofTypes[oop.Prop.OrigName] = oop
-		}
-	}
-
-	// build required counts
-	// build tags
-	reqCount := 0
-	prop.decoderOrigNames = make(map[string]int)
-	for i, p := range prop.Prop {
-		if strings.HasPrefix(p.Name, "XXX_") {
-			// Internal fields should not appear in tags/origNames maps.
-			// They are handled specially when encoding and decoding.
-			continue
-		}
-		if p.Required {
-			reqCount++
-		}
-		prop.decoderTags.put(p.Tag, i)
-		prop.decoderOrigNames[p.OrigName] = i
-	}
-	prop.reqCount = reqCount
-
-	return prop
-}
-
-// Return the Properties object for the x[0]'th field of the structure.
-func propByIndex(t reflect.Type, x []int) *Properties {
-	if len(x) != 1 {
-		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
-		return nil
-	}
-	prop := GetProperties(t)
-	return prop.Prop[x[0]]
-}
-
-// Get the address and type of a pointer to a struct from an interface.
-func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
-	if pb == nil {
-		err = ErrNil
-		return
-	}
-	// get the reflect type of the pointer to the struct.
-	t = reflect.TypeOf(pb)
-	// get the address of the struct.
-	value := reflect.ValueOf(pb)
-	b = toStructPointer(value)
-	return
-}
-
-// A global registry of enum types.
-// The generated code will register the generated maps by calling RegisterEnum.
-
-var enumValueMaps = make(map[string]map[string]int32)
-var enumStringMaps = make(map[string]map[int32]string)
-
-// RegisterEnum is called from the generated code to install the enum descriptor
-// maps into the global table to aid parsing text format protocol buffers.
-func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
-	if _, ok := enumValueMaps[typeName]; ok {
-		panic("proto: duplicate enum registered: " + typeName)
-	}
-	enumValueMaps[typeName] = valueMap
-	if _, ok := enumStringMaps[typeName]; ok {
-		panic("proto: duplicate enum registered: " + typeName)
-	}
-	enumStringMaps[typeName] = unusedNameMap
-}
-
-// EnumValueMap returns the mapping from names to integers of the
-// enum type enumType, or a nil if not found.
-func EnumValueMap(enumType string) map[string]int32 {
-	return enumValueMaps[enumType]
-}
-
-// A registry of all linked message types.
-// The string is a fully-qualified proto name ("pkg.Message").
-var (
-	protoTypes    = make(map[string]reflect.Type)
-	revProtoTypes = make(map[reflect.Type]string)
-)
-
-// RegisterType is called from generated code and maps from the fully qualified
-// proto name to the type (pointer to struct) of the protocol buffer.
-func RegisterType(x Message, name string) {
-	if _, ok := protoTypes[name]; ok {
-		// TODO: Some day, make this a panic.
-		log.Printf("proto: duplicate proto type registered: %s", name)
-		return
-	}
-	t := reflect.TypeOf(x)
-	protoTypes[name] = t
-	revProtoTypes[t] = name
-}
-
-// MessageName returns the fully-qualified proto name for the given message type.
-func MessageName(x Message) string { return revProtoTypes[reflect.TypeOf(x)] }
-
-// MessageType returns the message type (pointer to struct) for a named message.
-func MessageType(name string) reflect.Type { return protoTypes[name] }
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go
deleted file mode 100644
index 8daf9f7768..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-import (
-	"fmt"
-	"os"
-	"reflect"
-)
-
-func (p *Properties) setCustomEncAndDec(typ reflect.Type) {
-	p.ctype = typ
-	if p.Repeated {
-		p.enc = (*Buffer).enc_custom_slice_bytes
-		p.dec = (*Buffer).dec_custom_slice_bytes
-		p.size = size_custom_slice_bytes
-	} else if typ.Kind() == reflect.Ptr {
-		p.enc = (*Buffer).enc_custom_bytes
-		p.dec = (*Buffer).dec_custom_bytes
-		p.size = size_custom_bytes
-	} else {
-		p.enc = (*Buffer).enc_custom_ref_bytes
-		p.dec = (*Buffer).dec_custom_ref_bytes
-		p.size = size_custom_ref_bytes
-	}
-}
-
-func (p *Properties) setSliceOfNonPointerStructs(typ reflect.Type) {
-	t2 := typ.Elem()
-	p.sstype = typ
-	p.stype = t2
-	p.isMarshaler = isMarshaler(t2)
-	p.isUnmarshaler = isUnmarshaler(t2)
-	p.enc = (*Buffer).enc_slice_ref_struct_message
-	p.dec = (*Buffer).dec_slice_ref_struct_message
-	p.size = size_slice_ref_struct_message
-	if p.Wire != "bytes" {
-		fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T \n", typ, t2)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go
deleted file mode 100644
index 4fe7e0815c..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-import (
-	"fmt"
-	"io"
-)
-
-func Skip(data []byte) (n int, err error) {
-	l := len(data)
-	index := 0
-	for index < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if index >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := data[index]
-			index++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for {
-				if index >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				index++
-				if data[index-1] < 0x80 {
-					break
-				}
-			}
-			return index, nil
-		case 1:
-			index += 8
-			return index, nil
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if index >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := data[index]
-				index++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			index += length
-			return index, nil
-		case 3:
-			for {
-				var innerWire uint64
-				var start int = index
-				for shift := uint(0); ; shift += 7 {
-					if index >= l {
-						return 0, io.ErrUnexpectedEOF
-					}
-					b := data[index]
-					index++
-					innerWire |= (uint64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				innerWireType := int(innerWire & 0x7)
-				if innerWireType == 4 {
-					break
-				}
-				next, err := Skip(data[start:])
-				if err != nil {
-					return 0, err
-				}
-				index = start + next
-			}
-			return index, nil
-		case 4:
-			return index, nil
-		case 5:
-			index += 4
-			return index, nil
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-	}
-	panic("unreachable")
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
deleted file mode 100644
index e2b99b122d..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
+++ /dev/null
@@ -1,793 +0,0 @@
-// Extensions for Protocol Buffers to create more go like structures.
-//
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-// Functions for writing the text protocol buffer format.
-
-import (
-	"bufio"
-	"bytes"
-	"encoding"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"math"
-	"reflect"
-	"sort"
-	"strings"
-)
-
-var (
-	newline         = []byte("\n")
-	spaces          = []byte("                                        ")
-	gtNewline       = []byte(">\n")
-	endBraceNewline = []byte("}\n")
-	backslashN      = []byte{'\\', 'n'}
-	backslashR      = []byte{'\\', 'r'}
-	backslashT      = []byte{'\\', 't'}
-	backslashDQ     = []byte{'\\', '"'}
-	backslashBS     = []byte{'\\', '\\'}
-	posInf          = []byte("inf")
-	negInf          = []byte("-inf")
-	nan             = []byte("nan")
-)
-
-type writer interface {
-	io.Writer
-	WriteByte(byte) error
-}
-
-// textWriter is an io.Writer that tracks its indentation level.
-type textWriter struct {
-	ind      int
-	complete bool // if the current position is a complete line
-	compact  bool // whether to write out as a one-liner
-	w        writer
-}
-
-func (w *textWriter) WriteString(s string) (n int, err error) {
-	if !strings.Contains(s, "\n") {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		w.complete = false
-		return io.WriteString(w.w, s)
-	}
-	// WriteString is typically called without newlines, so this
-	// codepath and its copy are rare.  We copy to avoid
-	// duplicating all of Write's logic here.
-	return w.Write([]byte(s))
-}
-
-func (w *textWriter) Write(p []byte) (n int, err error) {
-	newlines := bytes.Count(p, newline)
-	if newlines == 0 {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		n, err = w.w.Write(p)
-		w.complete = false
-		return n, err
-	}
-
-	frags := bytes.SplitN(p, newline, newlines+1)
-	if w.compact {
-		for i, frag := range frags {
-			if i > 0 {
-				if err := w.w.WriteByte(' '); err != nil {
-					return n, err
-				}
-				n++
-			}
-			nn, err := w.w.Write(frag)
-			n += nn
-			if err != nil {
-				return n, err
-			}
-		}
-		return n, nil
-	}
-
-	for i, frag := range frags {
-		if w.complete {
-			w.writeIndent()
-		}
-		nn, err := w.w.Write(frag)
-		n += nn
-		if err != nil {
-			return n, err
-		}
-		if i+1 < len(frags) {
-			if err := w.w.WriteByte('\n'); err != nil {
-				return n, err
-			}
-			n++
-		}
-	}
-	w.complete = len(frags[len(frags)-1]) == 0
-	return n, nil
-}
-
-func (w *textWriter) WriteByte(c byte) error {
-	if w.compact && c == '\n' {
-		c = ' '
-	}
-	if !w.compact && w.complete {
-		w.writeIndent()
-	}
-	err := w.w.WriteByte(c)
-	w.complete = c == '\n'
-	return err
-}
-
-func (w *textWriter) indent() { w.ind++ }
-
-func (w *textWriter) unindent() {
-	if w.ind == 0 {
-		log.Printf("proto: textWriter unindented too far")
-		return
-	}
-	w.ind--
-}
-
-func writeName(w *textWriter, props *Properties) error {
-	if _, err := w.WriteString(props.OrigName); err != nil {
-		return err
-	}
-	if props.Wire != "group" {
-		return w.WriteByte(':')
-	}
-	return nil
-}
-
-// raw is the interface satisfied by RawMessage.
-type raw interface {
-	Bytes() []byte
-}
-
-func writeStruct(w *textWriter, sv reflect.Value) error {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < sv.NumField(); i++ {
-		fv := sv.Field(i)
-		props := sprops.Prop[i]
-		name := st.Field(i).Name
-
-		if strings.HasPrefix(name, "XXX_") {
-			// There are two XXX_ fields:
-			//   XXX_unrecognized []byte
-			//   XXX_extensions   map[int32]proto.Extension
-			// The first is handled here;
-			// the second is handled at the bottom of this function.
-			if name == "XXX_unrecognized" && !fv.IsNil() {
-				if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Ptr && fv.IsNil() {
-			// Field not filled in. This could be an optional field or
-			// a required field that wasn't filled in. Either way, there
-			// isn't anything we can show for it.
-			continue
-		}
-		if fv.Kind() == reflect.Slice && fv.IsNil() {
-			// Repeated field that is empty, or a bytes field that is unused.
-			continue
-		}
-
-		if props.Repeated && fv.Kind() == reflect.Slice {
-			// Repeated field.
-			for j := 0; j < fv.Len(); j++ {
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				v := fv.Index(j)
-				if v.Kind() == reflect.Ptr && v.IsNil() {
-					// A nil message in a repeated field is not valid,
-					// but we can handle that more gracefully than panicking.
-					if _, err := w.Write([]byte("<nil>\n")); err != nil {
-						return err
-					}
-					continue
-				}
-				if len(props.Enum) > 0 {
-					if err := writeEnum(w, v, props); err != nil {
-						return err
-					}
-				} else if err := writeAny(w, v, props); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Map {
-			// Map fields are rendered as a repeated struct with key/value fields.
-			keys := fv.MapKeys()
-			sort.Sort(mapKeys(keys))
-			for _, key := range keys {
-				val := fv.MapIndex(key)
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				// open struct
-				if err := w.WriteByte('<'); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				w.indent()
-				// key
-				if _, err := w.WriteString("key:"); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				if err := writeAny(w, key, props.mkeyprop); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-				// nil values aren't legal, but we can avoid panicking because of them.
-				if val.Kind() != reflect.Ptr || !val.IsNil() {
-					// value
-					if _, err := w.WriteString("value:"); err != nil {
-						return err
-					}
-					if !w.compact {
-						if err := w.WriteByte(' '); err != nil {
-							return err
-						}
-					}
-					if err := writeAny(w, val, props.mvalprop); err != nil {
-						return err
-					}
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				// close struct
-				w.unindent()
-				if err := w.WriteByte('>'); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
-			// empty bytes field
-			continue
-		}
-		if props.proto3 && fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
-			// proto3 non-repeated scalar field; skip if zero value
-			if isProto3Zero(fv) {
-				continue
-			}
-		}
-
-		if fv.Kind() == reflect.Interface {
-			// Check if it is a oneof.
-			if st.Field(i).Tag.Get("protobuf_oneof") != "" {
-				// fv is nil, or holds a pointer to generated struct.
-				// That generated struct has exactly one field,
-				// which has a protobuf struct tag.
-				if fv.IsNil() {
-					continue
-				}
-				inner := fv.Elem().Elem() // interface -> *T -> T
-				tag := inner.Type().Field(0).Tag.Get("protobuf")
-				props.Parse(tag) // Overwrite the outer props.
-				// Write the value in the oneof, not the oneof itself.
-				fv = inner.Field(0)
-
-				// Special case to cope with malformed messages gracefully:
-				// If the value in the oneof is a nil pointer, don't panic
-				// in writeAny.
-				if fv.Kind() == reflect.Ptr && fv.IsNil() {
-					// Use errors.New so writeAny won't render quotes.
-					msg := errors.New("/* nil */")
-					fv = reflect.ValueOf(&msg).Elem()
-				}
-			}
-		}
-
-		if err := writeName(w, props); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		if b, ok := fv.Interface().(raw); ok {
-			if err := writeRaw(w, b.Bytes()); err != nil {
-				return err
-			}
-			continue
-		}
-
-		if len(props.Enum) > 0 {
-			if err := writeEnum(w, fv, props); err != nil {
-				return err
-			}
-		} else if err := writeAny(w, fv, props); err != nil {
-			return err
-		}
-
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-
-	// Extensions (the XXX_extensions field).
-	pv := sv
-	if pv.CanAddr() {
-		pv = sv.Addr()
-	} else {
-		pv = reflect.New(sv.Type())
-		pv.Elem().Set(sv)
-	}
-	if pv.Type().Implements(extendableProtoType) {
-		if err := writeExtensions(w, pv); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// writeRaw writes an uninterpreted raw message.
-func writeRaw(w *textWriter, b []byte) error {
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	w.indent()
-	if err := writeUnknownStruct(w, b); err != nil {
-		return err
-	}
-	w.unindent()
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-	return nil
-}
-
-// writeAny writes an arbitrary field.
-func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
-	v = reflect.Indirect(v)
-
-	if props != nil && len(props.CustomType) > 0 {
-		custom, ok := v.Interface().(Marshaler)
-		if ok {
-			data, err := custom.Marshal()
-			if err != nil {
-				return err
-			}
-			if err := writeString(w, string(data)); err != nil {
-				return err
-			}
-			return nil
-		}
-	}
-
-	// Floats have special cases.
-	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
-		x := v.Float()
-		var b []byte
-		switch {
-		case math.IsInf(x, 1):
-			b = posInf
-		case math.IsInf(x, -1):
-			b = negInf
-		case math.IsNaN(x):
-			b = nan
-		}
-		if b != nil {
-			_, err := w.Write(b)
-			return err
-		}
-		// Other values are handled below.
-	}
-
-	// We don't attempt to serialise every possible value type; only those
-	// that can occur in protocol buffers.
-	switch v.Kind() {
-	case reflect.Slice:
-		// Should only be a []byte; repeated fields are handled in writeStruct.
-		if err := writeString(w, string(v.Bytes())); err != nil {
-			return err
-		}
-	case reflect.String:
-		if err := writeString(w, v.String()); err != nil {
-			return err
-		}
-	case reflect.Struct:
-		// Required/optional group/message.
-		var bra, ket byte = '<', '>'
-		if props != nil && props.Wire == "group" {
-			bra, ket = '{', '}'
-		}
-		if err := w.WriteByte(bra); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte('\n'); err != nil {
-				return err
-			}
-		}
-		w.indent()
-		if tm, ok := v.Interface().(encoding.TextMarshaler); ok {
-			text, err := tm.MarshalText()
-			if err != nil {
-				return err
-			}
-			if _, err = w.Write(text); err != nil {
-				return err
-			}
-		} else if err := writeStruct(w, v); err != nil {
-			return err
-		}
-		w.unindent()
-		if err := w.WriteByte(ket); err != nil {
-			return err
-		}
-	default:
-		_, err := fmt.Fprint(w, v.Interface())
-		return err
-	}
-	return nil
-}
-
-// equivalent to C's isprint.
-func isprint(c byte) bool {
-	return c >= 0x20 && c < 0x7f
-}
-
-// writeString writes a string in the protocol buffer text format.
-// It is similar to strconv.Quote except we don't use Go escape sequences,
-// we treat the string as a byte sequence, and we use octal escapes.
-// These differences are to maintain interoperability with the other
-// languages' implementations of the text format.
-func writeString(w *textWriter, s string) error {
-	// use WriteByte here to get any needed indent
-	if err := w.WriteByte('"'); err != nil {
-		return err
-	}
-	// Loop over the bytes, not the runes.
-	for i := 0; i < len(s); i++ {
-		var err error
-		// Divergence from C++: we don't escape apostrophes.
-		// There's no need to escape them, and the C++ parser
-		// copes with a naked apostrophe.
-		switch c := s[i]; c {
-		case '\n':
-			_, err = w.w.Write(backslashN)
-		case '\r':
-			_, err = w.w.Write(backslashR)
-		case '\t':
-			_, err = w.w.Write(backslashT)
-		case '"':
-			_, err = w.w.Write(backslashDQ)
-		case '\\':
-			_, err = w.w.Write(backslashBS)
-		default:
-			if isprint(c) {
-				err = w.w.WriteByte(c)
-			} else {
-				_, err = fmt.Fprintf(w.w, "\\%03o", c)
-			}
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return w.WriteByte('"')
-}
-
-func writeUnknownStruct(w *textWriter, data []byte) (err error) {
-	if !w.compact {
-		if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
-			return err
-		}
-	}
-	b := NewBuffer(data)
-	for b.index < len(b.buf) {
-		x, err := b.DecodeVarint()
-		if err != nil {
-			_, ferr := fmt.Fprintf(w, "/* %v */\n", err)
-			return ferr
-		}
-		wire, tag := x&7, x>>3
-		if wire == WireEndGroup {
-			w.unindent()
-			if _, werr := w.Write(endBraceNewline); werr != nil {
-				return werr
-			}
-			continue
-		}
-		if _, ferr := fmt.Fprint(w, tag); ferr != nil {
-			return ferr
-		}
-		if wire != WireStartGroup {
-			if err = w.WriteByte(':'); err != nil {
-				return err
-			}
-		}
-		if !w.compact || wire == WireStartGroup {
-			if err = w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		switch wire {
-		case WireBytes:
-			buf, e := b.DecodeRawBytes(false)
-			if e == nil {
-				_, err = fmt.Fprintf(w, "%q", buf)
-			} else {
-				_, err = fmt.Fprintf(w, "/* %v */", e)
-			}
-		case WireFixed32:
-			x, err = b.DecodeFixed32()
-			err = writeUnknownInt(w, x, err)
-		case WireFixed64:
-			x, err = b.DecodeFixed64()
-			err = writeUnknownInt(w, x, err)
-		case WireStartGroup:
-			err = w.WriteByte('{')
-			w.indent()
-		case WireVarint:
-			x, err = b.DecodeVarint()
-			err = writeUnknownInt(w, x, err)
-		default:
-			_, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
-		}
-		if err != nil {
-			return err
-		}
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func writeUnknownInt(w *textWriter, x uint64, err error) error {
-	if err == nil {
-		_, err = fmt.Fprint(w, x)
-	} else {
-		_, err = fmt.Fprintf(w, "/* %v */", err)
-	}
-	return err
-}
-
-type int32Slice []int32
-
-func (s int32Slice) Len() int           { return len(s) }
-func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// writeExtensions writes all the extensions in pv.
-// pv is assumed to be a pointer to a protocol message struct that is extendable.
-func writeExtensions(w *textWriter, pv reflect.Value) error {
-	emap := extensionMaps[pv.Type().Elem()]
-	ep := pv.Interface().(extendableProto)
-
-	// Order the extensions by ID.
-	// This isn't strictly necessary, but it will give us
-	// canonical output, which will also make testing easier.
-	var m map[int32]Extension
-	if em, ok := ep.(extensionsMap); ok {
-		m = em.ExtensionMap()
-	} else if em, ok := ep.(extensionsBytes); ok {
-		eb := em.GetExtensions()
-		var err error
-		m, err = BytesToExtensionsMap(*eb)
-		if err != nil {
-			return err
-		}
-	}
-
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids))
-
-	for _, extNum := range ids {
-		ext := m[extNum]
-		var desc *ExtensionDesc
-		if emap != nil {
-			desc = emap[extNum]
-		}
-		if desc == nil {
-			// Unknown extension.
-			if err := writeUnknownStruct(w, ext.enc); err != nil {
-				return err
-			}
-			continue
-		}
-
-		pb, err := GetExtension(ep, desc)
-		if err != nil {
-			return fmt.Errorf("failed getting extension: %v", err)
-		}
-
-		// Repeated extensions will appear as a slice.
-		if !desc.repeated() {
-			if err := writeExtension(w, desc.Name, pb); err != nil {
-				return err
-			}
-		} else {
-			v := reflect.ValueOf(pb)
-			for i := 0; i < v.Len(); i++ {
-				if err := writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func writeExtension(w *textWriter, name string, pb interface{}) error {
-	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte(' '); err != nil {
-			return err
-		}
-	}
-	if err := writeAny(w, reflect.ValueOf(pb), nil); err != nil {
-		return err
-	}
-	if err := w.WriteByte('\n'); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (w *textWriter) writeIndent() {
-	if !w.complete {
-		return
-	}
-	remain := w.ind * 2
-	for remain > 0 {
-		n := remain
-		if n > len(spaces) {
-			n = len(spaces)
-		}
-		w.w.Write(spaces[:n])
-		remain -= n
-	}
-	w.complete = false
-}
-
-func marshalText(w io.Writer, pb Message, compact bool) error {
-	val := reflect.ValueOf(pb)
-	if pb == nil || val.IsNil() {
-		w.Write([]byte("<nil>"))
-		return nil
-	}
-	var bw *bufio.Writer
-	ww, ok := w.(writer)
-	if !ok {
-		bw = bufio.NewWriter(w)
-		ww = bw
-	}
-	aw := &textWriter{
-		w:        ww,
-		complete: true,
-		compact:  compact,
-	}
-
-	if tm, ok := pb.(encoding.TextMarshaler); ok {
-		text, err := tm.MarshalText()
-		if err != nil {
-			return err
-		}
-		if _, err = aw.Write(text); err != nil {
-			return err
-		}
-		if bw != nil {
-			return bw.Flush()
-		}
-		return nil
-	}
-	// Dereference the received pointer so we don't have outer < and >.
-	v := reflect.Indirect(val)
-	if err := writeStruct(aw, v); err != nil {
-		return err
-	}
-	if bw != nil {
-		return bw.Flush()
-	}
-	return nil
-}
-
-// MarshalText writes a given protocol buffer in text format.
-// The only errors returned are from w.
-func MarshalText(w io.Writer, pb Message) error {
-	return marshalText(w, pb, false)
-}
-
-// MarshalTextString is the same as MarshalText, but returns the string directly.
-func MarshalTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, false)
-	return buf.String()
-}
-
-// CompactText writes a given protocol buffer in compact text format (one line).
-func CompactText(w io.Writer, pb Message) error { return marshalText(w, pb, true) }
-
-// CompactTextString is the same as CompactText, but returns the string directly.
-func CompactTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, true)
-	return buf.String()
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go
deleted file mode 100644
index cdb23373c3..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-import (
-	"fmt"
-	"reflect"
-)
-
-func writeEnum(w *textWriter, v reflect.Value, props *Properties) error {
-	m, ok := enumStringMaps[props.Enum]
-	if !ok {
-		if err := writeAny(w, v, props); err != nil {
-			return err
-		}
-	}
-	key := int32(0)
-	if v.Kind() == reflect.Ptr {
-		key = int32(v.Elem().Int())
-	} else {
-		key = int32(v.Int())
-	}
-	s, ok := m[key]
-	if !ok {
-		if err := writeAny(w, v, props); err != nil {
-			return err
-		}
-	}
-	_, err := fmt.Fprint(w, s)
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
deleted file mode 100644
index 61b4bc8cc8..0000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
+++ /dev/null
@@ -1,849 +0,0 @@
-// Extensions for Protocol Buffers to create more go like structures.
-//
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-// Functions for parsing the Text protocol buffer format.
-// TODO: message sets.
-
-import (
-	"encoding"
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type ParseError struct {
-	Message string
-	Line    int // 1-based line number
-	Offset  int // 0-based byte offset from start of input
-}
-
-func (p *ParseError) Error() string {
-	if p.Line == 1 {
-		// show offset only for first line
-		return fmt.Sprintf("line 1.%d: %v", p.Offset, p.Message)
-	}
-	return fmt.Sprintf("line %d: %v", p.Line, p.Message)
-}
-
-type token struct {
-	value    string
-	err      *ParseError
-	line     int    // line number
-	offset   int    // byte number from start of input, not start of line
-	unquoted string // the unquoted version of value, if it was a quoted string
-}
-
-func (t *token) String() string {
-	if t.err == nil {
-		return fmt.Sprintf("%q (line=%d, offset=%d)", t.value, t.line, t.offset)
-	}
-	return fmt.Sprintf("parse error: %v", t.err)
-}
-
-type textParser struct {
-	s            string // remaining input
-	done         bool   // whether the parsing is finished (success or error)
-	backed       bool   // whether back() was called
-	offset, line int
-	cur          token
-}
-
-func newTextParser(s string) *textParser {
-	p := new(textParser)
-	p.s = s
-	p.line = 1
-	p.cur.line = 1
-	return p
-}
-
-func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
-	pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
-	p.cur.err = pe
-	p.done = true
-	return pe
-}
-
-// Numbers and identifiers are matched by [-+._A-Za-z0-9]
-func isIdentOrNumberChar(c byte) bool {
-	switch {
-	case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
-		return true
-	case '0' <= c && c <= '9':
-		return true
-	}
-	switch c {
-	case '-', '+', '.', '_':
-		return true
-	}
-	return false
-}
-
-func isWhitespace(c byte) bool {
-	switch c {
-	case ' ', '\t', '\n', '\r':
-		return true
-	}
-	return false
-}
-
-func isQuote(c byte) bool {
-	switch c {
-	case '"', '\'':
-		return true
-	}
-	return false
-}
-
-func (p *textParser) skipWhitespace() {
-	i := 0
-	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
-		if p.s[i] == '#' {
-			// comment; skip to end of line or input
-			for i < len(p.s) && p.s[i] != '\n' {
-				i++
-			}
-			if i == len(p.s) {
-				break
-			}
-		}
-		if p.s[i] == '\n' {
-			p.line++
-		}
-		i++
-	}
-	p.offset += i
-	p.s = p.s[i:len(p.s)]
-	if len(p.s) == 0 {
-		p.done = true
-	}
-}
-
-func (p *textParser) advance() {
-	// Skip whitespace
-	p.skipWhitespace()
-	if p.done {
-		return
-	}
-
-	// Start of non-whitespace
-	p.cur.err = nil
-	p.cur.offset, p.cur.line = p.offset, p.line
-	p.cur.unquoted = ""
-	switch p.s[0] {
-	case '<', '>', '{', '}', ':', '[', ']', ';', ',':
-		// Single symbol
-		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
-	case '"', '\'':
-		// Quoted string
-		i := 1
-		for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
-			if p.s[i] == '\\' && i+1 < len(p.s) {
-				// skip escaped char
-				i++
-			}
-			i++
-		}
-		if i >= len(p.s) || p.s[i] != p.s[0] {
-			p.errorf("unmatched quote")
-			return
-		}
-		unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
-		if err != nil {
-			p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
-			return
-		}
-		p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
-		p.cur.unquoted = unq
-	default:
-		i := 0
-		for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
-			i++
-		}
-		if i == 0 {
-			p.errorf("unexpected byte %#x", p.s[0])
-			return
-		}
-		p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
-	}
-	p.offset += len(p.cur.value)
-}
-
-var (
-	errBadUTF8 = errors.New("proto: bad UTF-8")
-	errBadHex  = errors.New("proto: bad hexadecimal")
-)
-
-func unquoteC(s string, quote rune) (string, error) {
-	// This is based on C++'s tokenizer.cc.
-	// Despite its name, this is *not* parsing C syntax.
-	// For instance, "\0" is an invalid quoted string.
-
-	// Avoid allocation in trivial cases.
-	simple := true
-	for _, r := range s {
-		if r == '\\' || r == quote {
-			simple = false
-			break
-		}
-	}
-	if simple {
-		return s, nil
-	}
-
-	buf := make([]byte, 0, 3*len(s)/2)
-	for len(s) > 0 {
-		r, n := utf8.DecodeRuneInString(s)
-		if r == utf8.RuneError && n == 1 {
-			return "", errBadUTF8
-		}
-		s = s[n:]
-		if r != '\\' {
-			if r < utf8.RuneSelf {
-				buf = append(buf, byte(r))
-			} else {
-				buf = append(buf, string(r)...)
-			}
-			continue
-		}
-
-		ch, tail, err := unescape(s)
-		if err != nil {
-			return "", err
-		}
-		buf = append(buf, ch...)
-		s = tail
-	}
-	return string(buf), nil
-}
-
-func unescape(s string) (ch string, tail string, err error) {
-	r, n := utf8.DecodeRuneInString(s)
-	if r == utf8.RuneError && n == 1 {
-		return "", "", errBadUTF8
-	}
-	s = s[n:]
-	switch r {
-	case 'a':
-		return "\a", s, nil
-	case 'b':
-		return "\b", s, nil
-	case 'f':
-		return "\f", s, nil
-	case 'n':
-		return "\n", s, nil
-	case 'r':
-		return "\r", s, nil
-	case 't':
-		return "\t", s, nil
-	case 'v':
-		return "\v", s, nil
-	case '?':
-		return "?", s, nil // trigraph workaround
-	case '\'', '"', '\\':
-		return string(r), s, nil
-	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
-		if len(s) < 2 {
-			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
-		}
-		base := 8
-		ss := s[:2]
-		s = s[2:]
-		if r == 'x' || r == 'X' {
-			base = 16
-		} else {
-			ss = string(r) + ss
-		}
-		i, err := strconv.ParseUint(ss, base, 8)
-		if err != nil {
-			return "", "", err
-		}
-		return string([]byte{byte(i)}), s, nil
-	case 'u', 'U':
-		n := 4
-		if r == 'U' {
-			n = 8
-		}
-		if len(s) < n {
-			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
-		}
-
-		bs := make([]byte, n/2)
-		for i := 0; i < n; i += 2 {
-			a, ok1 := unhex(s[i])
-			b, ok2 := unhex(s[i+1])
-			if !ok1 || !ok2 {
-				return "", "", errBadHex
-			}
-			bs[i/2] = a<<4 | b
-		}
-		s = s[n:]
-		return string(bs), s, nil
-	}
-	return "", "", fmt.Errorf(`unknown escape \%c`, r)
-}
-
-// Adapted from src/pkg/strconv/quote.go.
-func unhex(b byte) (v byte, ok bool) {
-	switch {
-	case '0' <= b && b <= '9':
-		return b - '0', true
-	case 'a' <= b && b <= 'f':
-		return b - 'a' + 10, true
-	case 'A' <= b && b <= 'F':
-		return b - 'A' + 10, true
-	}
-	return 0, false
-}
-
-// Back off the parser by one token. Can only be done between calls to next().
-// It makes the next advance() a no-op.
-func (p *textParser) back() { p.backed = true }
-
-// Advances the parser and returns the new current token.
-func (p *textParser) next() *token {
-	if p.backed || p.done {
-		p.backed = false
-		return &p.cur
-	}
-	p.advance()
-	if p.done {
-		p.cur.value = ""
-	} else if len(p.cur.value) > 0 && isQuote(p.cur.value[0]) {
-		// Look for multiple quoted strings separated by whitespace,
-		// and concatenate them.
-		cat := p.cur
-		for {
-			p.skipWhitespace()
-			if p.done || !isQuote(p.s[0]) {
-				break
-			}
-			p.advance()
-			if p.cur.err != nil {
-				return &p.cur
-			}
-			cat.value += " " + p.cur.value
-			cat.unquoted += p.cur.unquoted
-		}
-		p.done = false // parser may have seen EOF, but we want to return cat
-		p.cur = cat
-	}
-	return &p.cur
-}
-
-func (p *textParser) consumeToken(s string) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != s {
-		p.back()
-		return p.errorf("expected %q, found %q", s, tok.value)
-	}
-	return nil
-}
-
-// Return a RequiredNotSetError indicating which required field was not set.
-func (p *textParser) missingRequiredFieldError(sv reflect.Value) *RequiredNotSetError {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < st.NumField(); i++ {
-		if !isNil(sv.Field(i)) {
-			continue
-		}
-
-		props := sprops.Prop[i]
-		if props.Required {
-			return &RequiredNotSetError{fmt.Sprintf("%v.%v", st, props.OrigName)}
-		}
-	}
-	return &RequiredNotSetError{fmt.Sprintf("%v.<unknown field name>", st)} // should not happen
-}
-
-// Returns the index in the struct for the named field, as well as the parsed tag properties.
-func structFieldByName(sprops *StructProperties, name string) (int, *Properties, bool) {
-	i, ok := sprops.decoderOrigNames[name]
-	if ok {
-		return i, sprops.Prop[i], true
-	}
-	return -1, nil, false
-}
-
-// Consume a ':' from the input stream (if the next token is a colon),
-// returning an error if a colon is needed but not present.
-func (p *textParser) checkForColon(props *Properties, typ reflect.Type) *ParseError {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ":" {
-		// Colon is optional when the field is a group or message.
-		needColon := true
-		switch props.Wire {
-		case "group":
-			needColon = false
-		case "bytes":
-			// A "bytes" field is either a message, a string, or a repeated field;
-			// those three become *T, *string and []T respectively, so we can check for
-			// this field being a pointer to a non-string.
-			if typ.Kind() == reflect.Ptr {
-				// *T or *string
-				if typ.Elem().Kind() == reflect.String {
-					break
-				}
-			} else if typ.Kind() == reflect.Slice {
-				// []T or []*T
-				if typ.Elem().Kind() != reflect.Ptr {
-					break
-				}
-			} else if typ.Kind() == reflect.String {
-				// The proto3 exception is for a string field,
-				// which requires a colon.
-				break
-			}
-			needColon = false
-		}
-		if needColon {
-			return p.errorf("expected ':', found %q", tok.value)
-		}
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	reqCount := sprops.reqCount
-	var reqFieldErr error
-	fieldSet := make(map[string]bool)
-	// A struct is a sequence of "name: value", terminated by one of
-	// '>' or '}', or the end of the input.  A name may also be
-	// "[extension]".
-	for {
-		tok := p.next()
-		if tok.err != nil {
-			return tok.err
-		}
-		if tok.value == terminator {
-			break
-		}
-		if tok.value == "[" {
-			// Looks like an extension.
-			//
-			// TODO: Check whether we need to handle
-			// namespace rooted names (e.g. ".something.Foo").
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
-			}
-			var desc *ExtensionDesc
-			// This could be faster, but it's functional.
-			// TODO: Do something smarter than a linear scan.
-			for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
-				if d.Name == tok.value {
-					desc = d
-					break
-				}
-			}
-			if desc == nil {
-				return p.errorf("unrecognized extension %q", tok.value)
-			}
-			// Check the extension terminator.
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
-			}
-			if tok.value != "]" {
-				return p.errorf("unrecognized extension terminator %q", tok.value)
-			}
-
-			props := &Properties{}
-			props.Parse(desc.Tag)
-
-			typ := reflect.TypeOf(desc.ExtensionType)
-			if err := p.checkForColon(props, typ); err != nil {
-				return err
-			}
-
-			rep := desc.repeated()
-
-			// Read the extension structure, and set it in
-			// the value we're constructing.
-			var ext reflect.Value
-			if !rep {
-				ext = reflect.New(typ).Elem()
-			} else {
-				ext = reflect.New(typ.Elem()).Elem()
-			}
-			if err := p.readAny(ext, props); err != nil {
-				if _, ok := err.(*RequiredNotSetError); !ok {
-					return err
-				}
-				reqFieldErr = err
-			}
-			ep := sv.Addr().Interface().(extendableProto)
-			if !rep {
-				SetExtension(ep, desc, ext.Interface())
-			} else {
-				old, err := GetExtension(ep, desc)
-				var sl reflect.Value
-				if err == nil {
-					sl = reflect.ValueOf(old) // existing slice
-				} else {
-					sl = reflect.MakeSlice(typ, 0, 1)
-				}
-				sl = reflect.Append(sl, ext)
-				SetExtension(ep, desc, sl.Interface())
-			}
-			if err := p.consumeOptionalSeparator(); err != nil {
-				return err
-			}
-			continue
-		}
-
-		// This is a normal, non-extension field.
-		name := tok.value
-		var dst reflect.Value
-		fi, props, ok := structFieldByName(sprops, name)
-		if ok {
-			dst = sv.Field(fi)
-		} else if oop, ok := sprops.OneofTypes[name]; ok {
-			// It is a oneof.
-			props = oop.Prop
-			nv := reflect.New(oop.Type.Elem())
-			dst = nv.Elem().Field(0)
-			sv.Field(oop.Field).Set(nv)
-		}
-		if !dst.IsValid() {
-			return p.errorf("unknown field name %q in %v", name, st)
-		}
-
-		if dst.Kind() == reflect.Map {
-			// Consume any colon.
-			if err := p.checkForColon(props, dst.Type()); err != nil {
-				return err
-			}
-
-			// Construct the map if it doesn't already exist.
-			if dst.IsNil() {
-				dst.Set(reflect.MakeMap(dst.Type()))
-			}
-			key := reflect.New(dst.Type().Key()).Elem()
-			val := reflect.New(dst.Type().Elem()).Elem()
-
-			// The map entry should be this sequence of tokens:
-			//	< key : KEY value : VALUE >
-			// Technically the "key" and "value" could come in any order,
-			// but in practice they won't.
-
-			tok := p.next()
-			var terminator string
-			switch tok.value {
-			case "<":
-				terminator = ">"
-			case "{":
-				terminator = "}"
-			default:
-				return p.errorf("expected '{' or '<', found %q", tok.value)
-			}
-			if err := p.consumeToken("key"); err != nil {
-				return err
-			}
-			if err := p.consumeToken(":"); err != nil {
-				return err
-			}
-			if err := p.readAny(key, props.mkeyprop); err != nil {
-				return err
-			}
-			if err := p.consumeOptionalSeparator(); err != nil {
-				return err
-			}
-			if err := p.consumeToken("value"); err != nil {
-				return err
-			}
-			if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
-				return err
-			}
-			if err := p.readAny(val, props.mvalprop); err != nil {
-				return err
-			}
-			if err := p.consumeOptionalSeparator(); err != nil {
-				return err
-			}
-			if err := p.consumeToken(terminator); err != nil {
-				return err
-			}
-
-			dst.SetMapIndex(key, val)
-			continue
-		}
-
-		// Check that it's not already set if it's not a repeated field.
-		if !props.Repeated && fieldSet[name] {
-			return p.errorf("non-repeated field %q was repeated", name)
-		}
-
-		if err := p.checkForColon(props, dst.Type()); err != nil {
-			return err
-		}
-
-		// Parse into the field.
-		fieldSet[name] = true
-		if err := p.readAny(dst, props); err != nil {
-			if _, ok := err.(*RequiredNotSetError); !ok {
-				return err
-			}
-			reqFieldErr = err
-		} else if props.Required {
-			reqCount--
-		}
-
-		if err := p.consumeOptionalSeparator(); err != nil {
-			return err
-		}
-
-	}
-
-	if reqCount > 0 {
-		return p.missingRequiredFieldError(sv)
-	}
-	return reqFieldErr
-}
-
-// consumeOptionalSeparator consumes an optional semicolon or comma.
-// It is used in readStruct to provide backward compatibility.
-func (p *textParser) consumeOptionalSeparator() error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ";" && tok.value != "," {
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readAny(v reflect.Value, props *Properties) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value == "" {
-		return p.errorf("unexpected EOF")
-	}
-	if len(props.CustomType) > 0 {
-		if props.Repeated {
-			t := reflect.TypeOf(v.Interface())
-			if t.Kind() == reflect.Slice {
-				tc := reflect.TypeOf(new(Marshaler))
-				ok := t.Elem().Implements(tc.Elem())
-				if ok {
-					fv := v
-					flen := fv.Len()
-					if flen == fv.Cap() {
-						nav := reflect.MakeSlice(v.Type(), flen, 2*flen+1)
-						reflect.Copy(nav, fv)
-						fv.Set(nav)
-					}
-					fv.SetLen(flen + 1)
-
-					// Read one.
-					p.back()
-					return p.readAny(fv.Index(flen), props)
-				}
-			}
-		}
-		if reflect.TypeOf(v.Interface()).Kind() == reflect.Ptr {
-			custom := reflect.New(props.ctype.Elem()).Interface().(Unmarshaler)
-			err := custom.Unmarshal([]byte(tok.unquoted))
-			if err != nil {
-				return p.errorf("%v %v: %v", err, v.Type(), tok.value)
-			}
-			v.Set(reflect.ValueOf(custom))
-		} else {
-			custom := reflect.New(reflect.TypeOf(v.Interface())).Interface().(Unmarshaler)
-			err := custom.Unmarshal([]byte(tok.unquoted))
-			if err != nil {
-				return p.errorf("%v %v: %v", err, v.Type(), tok.value)
-			}
-			v.Set(reflect.Indirect(reflect.ValueOf(custom)))
-		}
-		return nil
-	}
-	switch fv := v; fv.Kind() {
-	case reflect.Slice:
-		at := v.Type()
-		if at.Elem().Kind() == reflect.Uint8 {
-			// Special case for []byte
-			if tok.value[0] != '"' && tok.value[0] != '\'' {
-				// Deliberately written out here, as the error after
-				// this switch statement would write "invalid []byte: ...",
-				// which is not as user-friendly.
-				return p.errorf("invalid string: %v", tok.value)
-			}
-			bytes := []byte(tok.unquoted)
-			fv.Set(reflect.ValueOf(bytes))
-			return nil
-		}
-		// Repeated field.
-		if tok.value == "[" {
-			// Repeated field with list notation, like [1,2,3].
-			for {
-				fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
-				err := p.readAny(fv.Index(fv.Len()-1), props)
-				if err != nil {
-					return err
-				}
-				ntok := p.next()
-				if ntok.err != nil {
-					return ntok.err
-				}
-				if ntok.value == "]" {
-					break
-				}
-				if ntok.value != "," {
-					return p.errorf("Expected ']' or ',' found %q", ntok.value)
-				}
-			}
-			return nil
-		}
-		// One value of the repeated field.
-		p.back()
-		fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
-		return p.readAny(fv.Index(fv.Len()-1), props)
-	case reflect.Bool:
-		// Either "true", "false", 1 or 0.
-		switch tok.value {
-		case "true", "1":
-			fv.SetBool(true)
-			return nil
-		case "false", "0":
-			fv.SetBool(false)
-			return nil
-		}
-	case reflect.Float32, reflect.Float64:
-		v := tok.value
-		// Ignore 'f' for compatibility with output generated by C++, but don't
-		// remove 'f' when the value is "-inf" or "inf".
-		if strings.HasSuffix(v, "f") && tok.value != "-inf" && tok.value != "inf" {
-			v = v[:len(v)-1]
-		}
-		if f, err := strconv.ParseFloat(v, fv.Type().Bits()); err == nil {
-			fv.SetFloat(f)
-			return nil
-		}
-	case reflect.Int32:
-		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-		if len(props.Enum) == 0 {
-			break
-		}
-		m, ok := enumValueMaps[props.Enum]
-		if !ok {
-			break
-		}
-		x, ok := m[tok.value]
-		if !ok {
-			break
-		}
-		fv.SetInt(int64(x))
-		return nil
-	case reflect.Int64:
-		if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-	case reflect.Ptr:
-		// A basic field (indirected through pointer), or a repeated message/group
-		p.back()
-		fv.Set(reflect.New(fv.Type().Elem()))
-		return p.readAny(fv.Elem(), props)
-	case reflect.String:
-		if tok.value[0] == '"' || tok.value[0] == '\'' {
-			fv.SetString(tok.unquoted)
-			return nil
-		}
-	case reflect.Struct:
-		var terminator string
-		switch tok.value {
-		case "{":
-			terminator = "}"
-		case "<":
-			terminator = ">"
-		default:
-			return p.errorf("expected '{' or '<', found %q", tok.value)
-		}
-		// TODO: Handle nested messages which implement encoding.TextUnmarshaler.
-		return p.readStruct(fv, terminator)
-	case reflect.Uint32:
-		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
-			fv.SetUint(uint64(x))
-			return nil
-		}
-	case reflect.Uint64:
-		if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
-			fv.SetUint(x)
-			return nil
-		}
-	}
-	return p.errorf("invalid %v: %v", v.Type(), tok.value)
-}
-
-// UnmarshalText reads a protocol buffer in Text format. UnmarshalText resets pb
-// before starting to unmarshal, so any existing data in pb is always removed.
-// If a required field is not set and no other error occurs,
-// UnmarshalText returns *RequiredNotSetError.
-func UnmarshalText(s string, pb Message) error {
-	if um, ok := pb.(encoding.TextUnmarshaler); ok {
-		err := um.UnmarshalText([]byte(s))
-		return err
-	}
-	pb.Reset()
-	v := reflect.ValueOf(pb)
-	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
-		return pe
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE b/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
deleted file mode 100644
index 1b1b1921ef..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https://github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile
deleted file mode 100644
index f1f06564a1..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-install:
-	go install
-
-test: install generate-test-pbs
-	go test
-
-
-generate-test-pbs:
-	make install
-	make -C testdata
-	protoc --go_out=Mtestdata/test.proto=github.com/golang/protobuf/proto/testdata:. proto3_proto/proto3.proto
-	make
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go
deleted file mode 100644
index e98ddec981..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go
+++ /dev/null
@@ -1,223 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Protocol buffer deep copy and merge.
-// TODO: RawMessage.
-
-package proto
-
-import (
-	"log"
-	"reflect"
-	"strings"
-)
-
-// Clone returns a deep copy of a protocol buffer.
-func Clone(pb Message) Message {
-	in := reflect.ValueOf(pb)
-	if in.IsNil() {
-		return pb
-	}
-
-	out := reflect.New(in.Type().Elem())
-	// out is empty so a merge is a deep copy.
-	mergeStruct(out.Elem(), in.Elem())
-	return out.Interface().(Message)
-}
-
-// Merge merges src into dst.
-// Required and optional fields that are set in src will be set to that value in dst.
-// Elements of repeated fields will be appended.
-// Merge panics if src and dst are not the same type, or if dst is nil.
-func Merge(dst, src Message) {
-	in := reflect.ValueOf(src)
-	out := reflect.ValueOf(dst)
-	if out.IsNil() {
-		panic("proto: nil destination")
-	}
-	if in.Type() != out.Type() {
-		// Explicit test prior to mergeStruct so that mistyped nils will fail
-		panic("proto: type mismatch")
-	}
-	if in.IsNil() {
-		// Merging nil into non-nil is a quiet no-op
-		return
-	}
-	mergeStruct(out.Elem(), in.Elem())
-}
-
-func mergeStruct(out, in reflect.Value) {
-	sprop := GetProperties(in.Type())
-	for i := 0; i < in.NumField(); i++ {
-		f := in.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
-	}
-
-	if emIn, ok := in.Addr().Interface().(extendableProto); ok {
-		emOut := out.Addr().Interface().(extendableProto)
-		mergeExtension(emOut.ExtensionMap(), emIn.ExtensionMap())
-	}
-
-	uf := in.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return
-	}
-	uin := uf.Bytes()
-	if len(uin) > 0 {
-		out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...))
-	}
-}
-
-// mergeAny performs a merge between two values of the same type.
-// viaPtr indicates whether the values were indirected through a pointer (implying proto2).
-// prop is set if this is a struct field (it may be nil).
-func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
-	if in.Type() == protoMessageType {
-		if !in.IsNil() {
-			if out.IsNil() {
-				out.Set(reflect.ValueOf(Clone(in.Interface().(Message))))
-			} else {
-				Merge(out.Interface().(Message), in.Interface().(Message))
-			}
-		}
-		return
-	}
-	switch in.Kind() {
-	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-		reflect.String, reflect.Uint32, reflect.Uint64:
-		if !viaPtr && isProto3Zero(in) {
-			return
-		}
-		out.Set(in)
-	case reflect.Interface:
-		// Probably a oneof field; copy non-nil values.
-		if in.IsNil() {
-			return
-		}
-		// Allocate destination if it is not set, or set to a different type.
-		// Otherwise we will merge as normal.
-		if out.IsNil() || out.Elem().Type() != in.Elem().Type() {
-			out.Set(reflect.New(in.Elem().Elem().Type())) // interface -> *T -> T -> new(T)
-		}
-		mergeAny(out.Elem(), in.Elem(), false, nil)
-	case reflect.Map:
-		if in.Len() == 0 {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.MakeMap(in.Type()))
-		}
-		// For maps with value types of *T or []byte we need to deep copy each value.
-		elemKind := in.Type().Elem().Kind()
-		for _, key := range in.MapKeys() {
-			var val reflect.Value
-			switch elemKind {
-			case reflect.Ptr:
-				val = reflect.New(in.Type().Elem().Elem())
-				mergeAny(val, in.MapIndex(key), false, nil)
-			case reflect.Slice:
-				val = in.MapIndex(key)
-				val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
-			default:
-				val = in.MapIndex(key)
-			}
-			out.SetMapIndex(key, val)
-		}
-	case reflect.Ptr:
-		if in.IsNil() {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.New(in.Elem().Type()))
-		}
-		mergeAny(out.Elem(), in.Elem(), true, nil)
-	case reflect.Slice:
-		if in.IsNil() {
-			return
-		}
-		if in.Type().Elem().Kind() == reflect.Uint8 {
-			// []byte is a scalar bytes field, not a repeated field.
-
-			// Edge case: if this is in a proto3 message, a zero length
-			// bytes field is considered the zero value, and should not
-			// be merged.
-			if prop != nil && prop.proto3 && in.Len() == 0 {
-				return
-			}
-
-			// Make a deep copy.
-			// Append to []byte{} instead of []byte(nil) so that we never end up
-			// with a nil result.
-			out.SetBytes(append([]byte{}, in.Bytes()...))
-			return
-		}
-		n := in.Len()
-		if out.IsNil() {
-			out.Set(reflect.MakeSlice(in.Type(), 0, n))
-		}
-		switch in.Type().Elem().Kind() {
-		case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-			reflect.String, reflect.Uint32, reflect.Uint64:
-			out.Set(reflect.AppendSlice(out, in))
-		default:
-			for i := 0; i < n; i++ {
-				x := reflect.Indirect(reflect.New(in.Type().Elem()))
-				mergeAny(x, in.Index(i), false, nil)
-				out.Set(reflect.Append(out, x))
-			}
-		}
-	case reflect.Struct:
-		mergeStruct(out, in)
-	default:
-		// unknown type, so not a protocol buffer
-		log.Printf("proto: don't know how to copy %v", in)
-	}
-}
-
-func mergeExtension(out, in map[int32]Extension) {
-	for extNum, eIn := range in {
-		eOut := Extension{desc: eIn.desc}
-		if eIn.value != nil {
-			v := reflect.New(reflect.TypeOf(eIn.value)).Elem()
-			mergeAny(v, reflect.ValueOf(eIn.value), false, nil)
-			eOut.value = v.Interface()
-		}
-		if eIn.enc != nil {
-			eOut.enc = make([]byte, len(eIn.enc))
-			copy(eOut.enc, eIn.enc)
-		}
-
-		out[extNum] = eOut
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go
deleted file mode 100644
index 5810782fd8..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go
+++ /dev/null
@@ -1,867 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for decoding protocol buffer data to construct in-memory representations.
- */
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-)
-
-// errOverflow is returned when an integer is too large to be represented.
-var errOverflow = errors.New("proto: integer overflow")
-
-// ErrInternalBadWireType is returned by generated code when an incorrect
-// wire type is encountered. It does not get returned to user code.
-var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
-
-// The fundamental decoders that interpret bytes on the wire.
-// Those that take integer types all return uint64 and are
-// therefore of type valueDecoder.
-
-// DecodeVarint reads a varint-encoded integer from the slice.
-// It returns the integer and the number of bytes consumed, or
-// zero if there is not enough.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func DecodeVarint(buf []byte) (x uint64, n int) {
-	// x, n already 0
-	for shift := uint(0); shift < 64; shift += 7 {
-		if n >= len(buf) {
-			return 0, 0
-		}
-		b := uint64(buf[n])
-		n++
-		x |= (b & 0x7F) << shift
-		if (b & 0x80) == 0 {
-			return x, n
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	return 0, 0
-}
-
-// DecodeVarint reads a varint-encoded integer from the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) DecodeVarint() (x uint64, err error) {
-	// x, err already 0
-
-	i := p.index
-	l := len(p.buf)
-
-	for shift := uint(0); shift < 64; shift += 7 {
-		if i >= l {
-			err = io.ErrUnexpectedEOF
-			return
-		}
-		b := p.buf[i]
-		i++
-		x |= (uint64(b) & 0x7F) << shift
-		if b < 0x80 {
-			p.index = i
-			return
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	err = errOverflow
-	return
-}
-
-// DecodeFixed64 reads a 64-bit integer from the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) DecodeFixed64() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 8
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-8])
-	x |= uint64(p.buf[i-7]) << 8
-	x |= uint64(p.buf[i-6]) << 16
-	x |= uint64(p.buf[i-5]) << 24
-	x |= uint64(p.buf[i-4]) << 32
-	x |= uint64(p.buf[i-3]) << 40
-	x |= uint64(p.buf[i-2]) << 48
-	x |= uint64(p.buf[i-1]) << 56
-	return
-}
-
-// DecodeFixed32 reads a 32-bit integer from the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) DecodeFixed32() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 4
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-4])
-	x |= uint64(p.buf[i-3]) << 8
-	x |= uint64(p.buf[i-2]) << 16
-	x |= uint64(p.buf[i-1]) << 24
-	return
-}
-
-// DecodeZigzag64 reads a zigzag-encoded 64-bit integer
-// from the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) DecodeZigzag64() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63)
-	return
-}
-
-// DecodeZigzag32 reads a zigzag-encoded 32-bit integer
-// from  the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31))
-	return
-}
-
-// These are not ValueDecoders: they produce an array of bytes or a string.
-// bytes, embedded messages
-
-// DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) {
-	n, err := p.DecodeVarint()
-	if err != nil {
-		return nil, err
-	}
-
-	nb := int(n)
-	if nb < 0 {
-		return nil, fmt.Errorf("proto: bad byte length %d", nb)
-	}
-	end := p.index + nb
-	if end < p.index || end > len(p.buf) {
-		return nil, io.ErrUnexpectedEOF
-	}
-
-	if !alloc {
-		// todo: check if can get more uses of alloc=false
-		buf = p.buf[p.index:end]
-		p.index += nb
-		return
-	}
-
-	buf = make([]byte, nb)
-	copy(buf, p.buf[p.index:])
-	p.index += nb
-	return
-}
-
-// DecodeStringBytes reads an encoded string from the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) DecodeStringBytes() (s string, err error) {
-	buf, err := p.DecodeRawBytes(false)
-	if err != nil {
-		return
-	}
-	return string(buf), nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-// If the protocol buffer has extensions, and the field matches, add it as an extension.
-// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
-func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
-	oi := o.index
-
-	err := o.skip(t, tag, wire)
-	if err != nil {
-		return err
-	}
-
-	if !unrecField.IsValid() {
-		return nil
-	}
-
-	ptr := structPointer_Bytes(base, unrecField)
-
-	// Add the skipped field to struct field
-	obuf := o.buf
-
-	o.buf = *ptr
-	o.EncodeVarint(uint64(tag<<3 | wire))
-	*ptr = append(o.buf, obuf[oi:o.index]...)
-
-	o.buf = obuf
-
-	return nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
-
-	var u uint64
-	var err error
-
-	switch wire {
-	case WireVarint:
-		_, err = o.DecodeVarint()
-	case WireFixed64:
-		_, err = o.DecodeFixed64()
-	case WireBytes:
-		_, err = o.DecodeRawBytes(false)
-	case WireFixed32:
-		_, err = o.DecodeFixed32()
-	case WireStartGroup:
-		for {
-			u, err = o.DecodeVarint()
-			if err != nil {
-				break
-			}
-			fwire := int(u & 0x7)
-			if fwire == WireEndGroup {
-				break
-			}
-			ftag := int(u >> 3)
-			err = o.skip(t, ftag, fwire)
-			if err != nil {
-				break
-			}
-		}
-	default:
-		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
-	}
-	return err
-}
-
-// Unmarshaler is the interface representing objects that can
-// unmarshal themselves.  The method should reset the receiver before
-// decoding starts.  The argument points to data that may be
-// overwritten, so implementations should not keep references to the
-// buffer.
-type Unmarshaler interface {
-	Unmarshal([]byte) error
-}
-
-// Unmarshal parses the protocol buffer representation in buf and places the
-// decoded result in pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// Unmarshal resets pb before starting to unmarshal, so any
-// existing data in pb is always removed. Use UnmarshalMerge
-// to preserve and append to existing data.
-func Unmarshal(buf []byte, pb Message) error {
-	pb.Reset()
-	return UnmarshalMerge(buf, pb)
-}
-
-// UnmarshalMerge parses the protocol buffer representation in buf and
-// writes the decoded result to pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// UnmarshalMerge merges into existing data in pb.
-// Most code should use Unmarshal instead.
-func UnmarshalMerge(buf []byte, pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		return u.Unmarshal(buf)
-	}
-	return NewBuffer(buf).Unmarshal(pb)
-}
-
-// DecodeMessage reads a count-delimited message from the Buffer.
-func (p *Buffer) DecodeMessage(pb Message) error {
-	enc, err := p.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	return NewBuffer(enc).Unmarshal(pb)
-}
-
-// DecodeGroup reads a tag-delimited group from the Buffer.
-func (p *Buffer) DecodeGroup(pb Message) error {
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-	return p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), true, base)
-}
-
-// Unmarshal parses the protocol buffer representation in the
-// Buffer and places the decoded result in pb.  If the struct
-// underlying pb does not match the data in the buffer, the results can be
-// unpredictable.
-func (p *Buffer) Unmarshal(pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		err := u.Unmarshal(p.buf[p.index:])
-		p.index = len(p.buf)
-		return err
-	}
-
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-
-	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
-
-	if collectStats {
-		stats.Decode++
-	}
-
-	return err
-}
-
-// unmarshalType does the work of unmarshaling a structure.
-func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
-	var state errorState
-	required, reqFields := prop.reqCount, uint64(0)
-
-	var err error
-	for err == nil && o.index < len(o.buf) {
-		oi := o.index
-		var u uint64
-		u, err = o.DecodeVarint()
-		if err != nil {
-			break
-		}
-		wire := int(u & 0x7)
-		if wire == WireEndGroup {
-			if is_group {
-				return nil // input is satisfied
-			}
-			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
-		}
-		tag := int(u >> 3)
-		if tag <= 0 {
-			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
-		}
-		fieldnum, ok := prop.decoderTags.get(tag)
-		if !ok {
-			// Maybe it's an extension?
-			if prop.extendable {
-				if e := structPointer_Interface(base, st).(extendableProto); isExtensionField(e, int32(tag)) {
-					if err = o.skip(st, tag, wire); err == nil {
-						ext := e.ExtensionMap()[int32(tag)] // may be missing
-						ext.enc = append(ext.enc, o.buf[oi:o.index]...)
-						e.ExtensionMap()[int32(tag)] = ext
-					}
-					continue
-				}
-			}
-			// Maybe it's a oneof?
-			if prop.oneofUnmarshaler != nil {
-				m := structPointer_Interface(base, st).(Message)
-				// First return value indicates whether tag is a oneof field.
-				ok, err = prop.oneofUnmarshaler(m, tag, wire, o)
-				if err == ErrInternalBadWireType {
-					// Map the error to something more descriptive.
-					// Do the formatting here to save generated code space.
-					err = fmt.Errorf("bad wiretype for oneof field in %T", m)
-				}
-				if ok {
-					continue
-				}
-			}
-			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
-			continue
-		}
-		p := prop.Prop[fieldnum]
-
-		if p.dec == nil {
-			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
-			continue
-		}
-		dec := p.dec
-		if wire != WireStartGroup && wire != p.WireType {
-			if wire == WireBytes && p.packedDec != nil {
-				// a packable field
-				dec = p.packedDec
-			} else {
-				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
-				continue
-			}
-		}
-		decErr := dec(o, p, base)
-		if decErr != nil && !state.shouldContinue(decErr, p) {
-			err = decErr
-		}
-		if err == nil && p.Required {
-			// Successfully decoded a required field.
-			if tag <= 64 {
-				// use bitmap for fields 1-64 to catch field reuse.
-				var mask uint64 = 1 << uint64(tag-1)
-				if reqFields&mask == 0 {
-					// new required field
-					reqFields |= mask
-					required--
-				}
-			} else {
-				// This is imprecise. It can be fooled by a required field
-				// with a tag > 64 that is encoded twice; that's very rare.
-				// A fully correct implementation would require allocating
-				// a data structure, which we would like to avoid.
-				required--
-			}
-		}
-	}
-	if err == nil {
-		if is_group {
-			return io.ErrUnexpectedEOF
-		}
-		if state.err != nil {
-			return state.err
-		}
-		if required > 0 {
-			// Not enough information to determine the exact field. If we use extra
-			// CPU, we could determine the field only if the missing required field
-			// has a tag <= 64 and we check reqFields.
-			return &RequiredNotSetError{"{Unknown}"}
-		}
-	}
-	return err
-}
-
-// Individual type decoders
-// For each,
-//	u is the decoded value,
-//	v is a pointer to the field (pointer) in the struct
-
-// Sizes of the pools to allocate inside the Buffer.
-// The goal is modest amortization and allocation
-// on at least 16-byte boundaries.
-const (
-	boolPoolSize   = 16
-	uint32PoolSize = 8
-	uint64PoolSize = 4
-)
-
-// Decode a bool.
-func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	if len(o.bools) == 0 {
-		o.bools = make([]bool, boolPoolSize)
-	}
-	o.bools[0] = u != 0
-	*structPointer_Bool(base, p.field) = &o.bools[0]
-	o.bools = o.bools[1:]
-	return nil
-}
-
-func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	*structPointer_BoolVal(base, p.field) = u != 0
-	return nil
-}
-
-// Decode an int32.
-func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
-	return nil
-}
-
-// Decode an int64.
-func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64_Set(structPointer_Word64(base, p.field), o, u)
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
-	return nil
-}
-
-// Decode a string.
-func (o *Buffer) dec_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_String(base, p.field) = &s
-	return nil
-}
-
-func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_StringVal(base, p.field) = s
-	return nil
-}
-
-// Decode a slice of bytes ([]byte).
-func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	*structPointer_Bytes(base, p.field) = b
-	return nil
-}
-
-// Decode a slice of bools ([]bool).
-func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BoolSlice(base, p.field)
-	*v = append(*v, u != 0)
-	return nil
-}
-
-// Decode a slice of bools ([]bool) in packed format.
-func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
-	v := structPointer_BoolSlice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded bools
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-
-	y := *v
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		y = append(y, u != 0)
-	}
-
-	*v = y
-	return nil
-}
-
-// Decode a slice of int32s ([]int32).
-func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	structPointer_Word32Slice(base, p.field).Append(uint32(u))
-	return nil
-}
-
-// Decode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int32s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(uint32(u))
-	}
-	return nil
-}
-
-// Decode a slice of int64s ([]int64).
-func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-
-	structPointer_Word64Slice(base, p.field).Append(u)
-	return nil
-}
-
-// Decode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int64s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(u)
-	}
-	return nil
-}
-
-// Decode a slice of strings ([]string).
-func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	v := structPointer_StringSlice(base, p.field)
-	*v = append(*v, s)
-	return nil
-}
-
-// Decode a slice of slice of bytes ([][]byte).
-func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BytesSlice(base, p.field)
-	*v = append(*v, b)
-	return nil
-}
-
-// Decode a map field.
-func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	oi := o.index       // index at the end of this map entry
-	o.index -= len(raw) // move buffer back to start of map entry
-
-	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
-	if mptr.Elem().IsNil() {
-		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
-	}
-	v := mptr.Elem() // map[K]V
-
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// See enc_new_map for why.
-	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
-	keybase := toStructPointer(keyptr.Addr())                  // **K
-
-	var valbase structPointer
-	var valptr reflect.Value
-	switch p.mtype.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valptr = reflect.ValueOf(&dummy)  // *[]byte
-		valbase = toStructPointer(valptr) // *[]byte
-	case reflect.Ptr:
-		// message; valptr is **Msg; need to allocate the intermediate pointer
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valptr.Set(reflect.New(valptr.Type().Elem()))
-		valbase = toStructPointer(valptr)
-	default:
-		// everything else
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valbase = toStructPointer(valptr.Addr())                   // **V
-	}
-
-	// Decode.
-	// This parses a restricted wire format, namely the encoding of a message
-	// with two fields. See enc_new_map for the format.
-	for o.index < oi {
-		// tagcode for key and value properties are always a single byte
-		// because they have tags 1 and 2.
-		tagcode := o.buf[o.index]
-		o.index++
-		switch tagcode {
-		case p.mkeyprop.tagcode[0]:
-			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
-				return err
-			}
-		case p.mvalprop.tagcode[0]:
-			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
-				return err
-			}
-		default:
-			// TODO: Should we silently skip this instead?
-			return fmt.Errorf("proto: bad map data tag %d", raw[0])
-		}
-	}
-	keyelem, valelem := keyptr.Elem(), valptr.Elem()
-	if !keyelem.IsValid() || !valelem.IsValid() {
-		// We did not decode the key or the value in the map entry.
-		// Either way, it's an invalid map entry.
-		return fmt.Errorf("proto: bad map data: missing key/val")
-	}
-
-	v.SetMapIndex(keyelem, valelem)
-	return nil
-}
-
-// Decode a group.
-func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-	return o.unmarshalType(p.stype, p.sprop, true, bas)
-}
-
-// Decode an embedded message.
-func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
-	raw, e := o.DecodeRawBytes(false)
-	if e != nil {
-		return e
-	}
-
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := structPointer_Interface(bas, p.stype)
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, false, bas)
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of embedded messages.
-func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, false, base)
-}
-
-// Decode a slice of embedded groups.
-func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, true, base)
-}
-
-// Decode a slice of structs ([]*struct).
-func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
-	v := reflect.New(p.stype)
-	bas := toStructPointer(v)
-	structPointer_StructPointerSlice(base, p.field).Append(bas)
-
-	if is_group {
-		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
-		return err
-	}
-
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := v.Interface()
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
-
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go
deleted file mode 100644
index 231b07401a..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go
+++ /dev/null
@@ -1,1325 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// RequiredNotSetError is the error returned if Marshal is called with
-// a protocol buffer struct whose required fields have not
-// all been initialized. It is also the error returned if Unmarshal is
-// called with an encoded protocol buffer that does not include all the
-// required fields.
-//
-// When printed, RequiredNotSetError reports the first unset required field in a
-// message. If the field cannot be precisely determined, it is reported as
-// "{Unknown}".
-type RequiredNotSetError struct {
-	field string
-}
-
-func (e *RequiredNotSetError) Error() string {
-	return fmt.Sprintf("proto: required field %q not set", e.field)
-}
-
-var (
-	// errRepeatedHasNil is the error returned if Marshal is called with
-	// a struct with a repeated field containing a nil element.
-	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
-
-	// ErrNil is the error returned if Marshal is called with nil.
-	ErrNil = errors.New("proto: Marshal called with nil")
-)
-
-// The fundamental encoders that put bytes on the wire.
-// Those that take integer types all accept uint64 and are
-// therefore of type valueEncoder.
-
-const maxVarintBytes = 10 // maximum length of a varint
-
-// EncodeVarint returns the varint encoding of x.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-// Not used by the package itself, but helpful to clients
-// wishing to use the same encoding.
-func EncodeVarint(x uint64) []byte {
-	var buf [maxVarintBytes]byte
-	var n int
-	for n = 0; x > 127; n++ {
-		buf[n] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	buf[n] = uint8(x)
-	n++
-	return buf[0:n]
-}
-
-// EncodeVarint writes a varint-encoded integer to the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) EncodeVarint(x uint64) error {
-	for x >= 1<<7 {
-		p.buf = append(p.buf, uint8(x&0x7f|0x80))
-		x >>= 7
-	}
-	p.buf = append(p.buf, uint8(x))
-	return nil
-}
-
-// SizeVarint returns the varint encoding size of an integer.
-func SizeVarint(x uint64) int {
-	return sizeVarint(x)
-}
-
-func sizeVarint(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
-}
-
-// EncodeFixed64 writes a 64-bit integer to the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) EncodeFixed64(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24),
-		uint8(x>>32),
-		uint8(x>>40),
-		uint8(x>>48),
-		uint8(x>>56))
-	return nil
-}
-
-func sizeFixed64(x uint64) int {
-	return 8
-}
-
-// EncodeFixed32 writes a 32-bit integer to the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) EncodeFixed32(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24))
-	return nil
-}
-
-func sizeFixed32(x uint64) int {
-	return 4
-}
-
-// EncodeZigzag64 writes a zigzag-encoded 64-bit integer
-// to the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) EncodeZigzag64(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-
-func sizeZigzag64(x uint64) int {
-	return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-
-// EncodeZigzag32 writes a zigzag-encoded 32-bit integer
-// to the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) EncodeZigzag32(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-func sizeZigzag32(x uint64) int {
-	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-// EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) EncodeRawBytes(b []byte) error {
-	p.EncodeVarint(uint64(len(b)))
-	p.buf = append(p.buf, b...)
-	return nil
-}
-
-func sizeRawBytes(b []byte) int {
-	return sizeVarint(uint64(len(b))) +
-		len(b)
-}
-
-// EncodeStringBytes writes an encoded string to the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) EncodeStringBytes(s string) error {
-	p.EncodeVarint(uint64(len(s)))
-	p.buf = append(p.buf, s...)
-	return nil
-}
-
-func sizeStringBytes(s string) int {
-	return sizeVarint(uint64(len(s))) +
-		len(s)
-}
-
-// Marshaler is the interface representing objects that can marshal themselves.
-type Marshaler interface {
-	Marshal() ([]byte, error)
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, returning the data.
-func Marshal(pb Message) ([]byte, error) {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		return m.Marshal()
-	}
-	p := NewBuffer(nil)
-	err := p.Marshal(pb)
-	var state errorState
-	if err != nil && !state.shouldContinue(err, nil) {
-		return nil, err
-	}
-	if p.buf == nil && err == nil {
-		// Return a non-nil slice on success.
-		return []byte{}, nil
-	}
-	return p.buf, err
-}
-
-// EncodeMessage writes the protocol buffer to the Buffer,
-// prefixed by a varint-encoded length.
-func (p *Buffer) EncodeMessage(pb Message) error {
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		var state errorState
-		err = p.enc_len_struct(GetProperties(t.Elem()), base, &state)
-	}
-	return err
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, writing the result to the
-// Buffer.
-func (p *Buffer) Marshal(pb Message) error {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		data, err := m.Marshal()
-		if err != nil {
-			return err
-		}
-		p.buf = append(p.buf, data...)
-		return nil
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		err = p.enc_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		stats.Encode++
-	}
-
-	return err
-}
-
-// Size returns the encoded size of a protocol buffer.
-func Size(pb Message) (n int) {
-	// Can the object marshal itself?  If so, Size is slow.
-	// TODO: add Size to Marshaler, or add a Sizer interface.
-	if m, ok := pb.(Marshaler); ok {
-		b, _ := m.Marshal()
-		return len(b)
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return 0
-	}
-	if err == nil {
-		n = size_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		stats.Size++
-	}
-
-	return
-}
-
-// Individual type encoders.
-
-// Encode a bool.
-func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := 0
-	if *v {
-		x = 1
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, 1)
-	return nil
-}
-
-func size_bool(p *Properties, base structPointer) int {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-func size_proto3_bool(p *Properties, base structPointer) int {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v && !p.oneof {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-// Encode an int32.
-func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode a uint32.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := word32_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := word32_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode an int64.
-func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return ErrNil
-	}
-	x := word64_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func size_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return 0
-	}
-	x := word64_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-func size_proto3_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-// Encode a string.
-func (o *Buffer) enc_string(p *Properties, base structPointer) error {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := *v
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(v)
-	return nil
-}
-
-func size_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return 0
-	}
-	x := *v
-	n += len(p.tagcode)
-	n += sizeStringBytes(x)
-	return
-}
-
-func size_proto3_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeStringBytes(v)
-	return
-}
-
-// All protocol buffer fields are nillable, but be careful.
-func isNil(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return v.IsNil()
-	}
-	return false
-}
-
-// Encode a message struct.
-func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return ErrNil
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, err := m.Marshal()
-		if err != nil && !state.shouldContinue(err, nil) {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-		return state.err
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	return o.enc_len_struct(p.sprop, structp, &state)
-}
-
-func size_struct_message(p *Properties, base structPointer) int {
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return 0
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, _ := m.Marshal()
-		n0 := len(p.tagcode)
-		n1 := sizeRawBytes(data)
-		return n0 + n1
-	}
-
-	n0 := len(p.tagcode)
-	n1 := size_struct(p.sprop, structp)
-	n2 := sizeVarint(uint64(n1)) // size of encoded length
-	return n0 + n1 + n2
-}
-
-// Encode a group struct.
-func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return ErrNil
-	}
-
-	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	err := o.enc_struct(p.sprop, b)
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return state.err
-}
-
-func size_struct_group(p *Properties, base structPointer) (n int) {
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return 0
-	}
-
-	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	n += size_struct(p.sprop, b)
-	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return
-}
-
-// Encode a slice of bools ([]bool).
-func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	for _, x := range s {
-		o.buf = append(o.buf, p.tagcode...)
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_bool(p *Properties, base structPointer) int {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
-}
-
-// Encode a slice of bools ([]bool) in packed format.
-func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
-	for _, x := range s {
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(l))
-	n += l // each bool takes exactly one byte
-	return
-}
-
-// Encode a slice of bytes ([]byte).
-func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func size_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-// Encode a slice of int32s ([]int32).
-func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(buf, uint64(x))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		bufSize += p.valSize(uint64(x))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of uint32s ([]uint32).
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := s.Index(i)
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := s.Index(i)
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of uint32s ([]uint32) in packed format.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, uint64(s.Index(i)))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(uint64(s.Index(i)))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of int64s ([]int64).
-func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		p.valEnc(o, s.Index(i))
-	}
-	return nil
-}
-
-func size_slice_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		n += p.valSize(s.Index(i))
-	}
-	return
-}
-
-// Encode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, s.Index(i))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(s.Index(i))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of slice of bytes ([][]byte).
-func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return 0
-	}
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeRawBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of strings ([]string).
-func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeStringBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_string(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeStringBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of message structs ([]*struct).
-func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return errRepeatedHasNil
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, err := m.Marshal()
-			if err != nil && !state.shouldContinue(err, nil) {
-				return err
-			}
-			o.buf = append(o.buf, p.tagcode...)
-			o.EncodeRawBytes(data)
-			continue
-		}
-
-		o.buf = append(o.buf, p.tagcode...)
-		err := o.enc_len_struct(p.sprop, structp, &state)
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-	}
-	return state.err
-}
-
-func size_slice_struct_message(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return // return the size up to this point
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, _ := m.Marshal()
-			n += len(p.tagcode)
-			n += sizeRawBytes(data)
-			continue
-		}
-
-		n0 := size_struct(p.sprop, structp)
-		n1 := sizeVarint(uint64(n0)) // size of encoded length
-		n += n0 + n1
-	}
-	return
-}
-
-// Encode a slice of group structs ([]*struct).
-func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return errRepeatedHasNil
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-
-		err := o.enc_struct(p.sprop, b)
-
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	}
-	return state.err
-}
-
-func size_slice_struct_group(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return // return size up to this point
-		}
-
-		n += size_struct(p.sprop, b)
-	}
-	return
-}
-
-// Encode an extension map.
-func (o *Buffer) enc_map(p *Properties, base structPointer) error {
-	v := *structPointer_ExtMap(base, p.field)
-	if err := encodeExtensionMap(v); err != nil {
-		return err
-	}
-	// Fast-path for common cases: zero or one extensions.
-	if len(v) <= 1 {
-		for _, e := range v {
-			o.buf = append(o.buf, e.enc...)
-		}
-		return nil
-	}
-
-	// Sort keys to provide a deterministic encoding.
-	keys := make([]int, 0, len(v))
-	for k := range v {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-
-	for _, k := range keys {
-		o.buf = append(o.buf, v[int32(k)].enc...)
-	}
-	return nil
-}
-
-func size_map(p *Properties, base structPointer) int {
-	v := *structPointer_ExtMap(base, p.field)
-	return sizeExtensionMap(v)
-}
-
-// Encode a map field.
-func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
-	var state errorState // XXX: or do we need to plumb this through?
-
-	/*
-		A map defined as
-			map<key_type, value_type> map_field = N;
-		is encoded in the same way as
-			message MapFieldEntry {
-				key_type key = 1;
-				value_type value = 2;
-			}
-			repeated MapFieldEntry map_field = N;
-	*/
-
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-	if v.Len() == 0 {
-		return nil
-	}
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	enc := func() error {
-		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
-			return err
-		}
-		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	// Don't sort map keys. It is not required by the spec, and C++ doesn't do it.
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-
-		// The only illegal map entry values are nil message pointers.
-		if val.Kind() == reflect.Ptr && val.IsNil() {
-			return errors.New("proto: map has nil element")
-		}
-
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		o.buf = append(o.buf, p.tagcode...)
-		if err := o.enc_len_thing(enc, &state); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func size_new_map(p *Properties, base structPointer) int {
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	n := 0
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		// Tag codes for key and val are the responsibility of the sub-sizer.
-		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
-		valsize := p.mvalprop.size(p.mvalprop, valbase)
-		entry := keysize + valsize
-		// Add on tag code and length of map entry itself.
-		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
-	}
-	return n
-}
-
-// mapEncodeScratch returns a new reflect.Value matching the map's value type,
-// and a structPointer suitable for passing to an encoder or sizer.
-func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
-
-	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
-	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
-	keyptr.Set(keycopy.Addr())                                  //
-	keybase = toStructPointer(keyptr.Addr())                    // **K
-
-	// Value types are more varied and require special handling.
-	switch mapType.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
-		valbase = toStructPointer(valcopy.Addr())
-	case reflect.Ptr:
-		// message; the generated field type is map[K]*Msg (so V is *Msg),
-		// so we only need one level of indirection.
-		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
-		valbase = toStructPointer(valcopy.Addr())
-	default:
-		// everything else
-		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
-		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
-		valptr.Set(valcopy.Addr())                                  //
-		valbase = toStructPointer(valptr.Addr())                    // **V
-	}
-	return
-}
-
-// Encode a struct.
-func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
-	var state errorState
-	// Encode fields in tag order so that decoders may use optimizations
-	// that depend on the ordering.
-	// https://developers.google.com/protocol-buffers/docs/encoding#order
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.enc != nil {
-			err := p.enc(o, p, base)
-			if err != nil {
-				if err == ErrNil {
-					if p.Required && state.err == nil {
-						state.err = &RequiredNotSetError{p.Name}
-					}
-				} else if err == errRepeatedHasNil {
-					// Give more context to nil values in repeated fields.
-					return errors.New("repeated field " + p.OrigName + " has nil element")
-				} else if !state.shouldContinue(err, p) {
-					return err
-				}
-			}
-		}
-	}
-
-	// Do oneof fields.
-	if prop.oneofMarshaler != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		if err := prop.oneofMarshaler(m, o); err != nil {
-			return err
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		if len(v) > 0 {
-			o.buf = append(o.buf, v...)
-		}
-	}
-
-	return state.err
-}
-
-func size_struct(prop *StructProperties, base structPointer) (n int) {
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.size != nil {
-			n += p.size(p, base)
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		n += len(v)
-	}
-
-	// Factor in any oneof fields.
-	if prop.oneofSizer != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		n += prop.oneofSizer(m)
-	}
-
-	return
-}
-
-var zeroes [20]byte // longer than any conceivable sizeVarint
-
-// Encode a struct, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
-	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
-}
-
-// Encode something, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
-	iLen := len(o.buf)
-	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
-	iMsg := len(o.buf)
-	err := enc()
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	lMsg := len(o.buf) - iMsg
-	lLen := sizeVarint(uint64(lMsg))
-	switch x := lLen - (iMsg - iLen); {
-	case x > 0: // actual length is x bytes larger than the space we reserved
-		// Move msg x bytes right.
-		o.buf = append(o.buf, zeroes[:x]...)
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-	case x < 0: // actual length is x bytes smaller than the space we reserved
-		// Move msg x bytes left.
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-		o.buf = o.buf[:len(o.buf)+x] // x is negative
-	}
-	// Encode the length in the reserved space.
-	o.buf = o.buf[:iLen]
-	o.EncodeVarint(uint64(lMsg))
-	o.buf = o.buf[:len(o.buf)+lMsg]
-	return state.err
-}
-
-// errorState maintains the first error that occurs and updates that error
-// with additional context.
-type errorState struct {
-	err error
-}
-
-// shouldContinue reports whether encoding should continue upon encountering the
-// given error. If the error is RequiredNotSetError, shouldContinue returns true
-// and, if this is the first appearance of that error, remembers it for future
-// reporting.
-//
-// If prop is not nil, it may update any error with additional context about the
-// field with the error.
-func (s *errorState) shouldContinue(err error, prop *Properties) bool {
-	// Ignore unset required fields.
-	reqNotSet, ok := err.(*RequiredNotSetError)
-	if !ok {
-		return false
-	}
-	if s.err == nil {
-		if prop != nil {
-			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
-		}
-		s.err = err
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go
deleted file mode 100644
index f5db1def3c..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go
+++ /dev/null
@@ -1,276 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Protocol buffer comparison.
-
-package proto
-
-import (
-	"bytes"
-	"log"
-	"reflect"
-	"strings"
-)
-
-/*
-Equal returns true iff protocol buffers a and b are equal.
-The arguments must both be pointers to protocol buffer structs.
-
-Equality is defined in this way:
-  - Two messages are equal iff they are the same type,
-    corresponding fields are equal, unknown field sets
-    are equal, and extensions sets are equal.
-  - Two set scalar fields are equal iff their values are equal.
-    If the fields are of a floating-point type, remember that
-    NaN != x for all x, including NaN. If the message is defined
-    in a proto3 .proto file, fields are not "set"; specifically,
-    zero length proto3 "bytes" fields are equal (nil == {}).
-  - Two repeated fields are equal iff their lengths are the same,
-    and their corresponding elements are equal (a "bytes" field,
-    although represented by []byte, is not a repeated field)
-  - Two unset fields are equal.
-  - Two unknown field sets are equal if their current
-    encoded state is equal.
-  - Two extension sets are equal iff they have corresponding
-    elements that are pairwise equal.
-  - Every other combination of things are not equal.
-
-The return value is undefined if a and b are not protocol buffers.
-*/
-func Equal(a, b Message) bool {
-	if a == nil || b == nil {
-		return a == b
-	}
-	v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	if v1.Kind() == reflect.Ptr {
-		if v1.IsNil() {
-			return v2.IsNil()
-		}
-		if v2.IsNil() {
-			return false
-		}
-		v1, v2 = v1.Elem(), v2.Elem()
-	}
-	if v1.Kind() != reflect.Struct {
-		return false
-	}
-	return equalStruct(v1, v2)
-}
-
-// v1 and v2 are known to have the same type.
-func equalStruct(v1, v2 reflect.Value) bool {
-	sprop := GetProperties(v1.Type())
-	for i := 0; i < v1.NumField(); i++ {
-		f := v1.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		f1, f2 := v1.Field(i), v2.Field(i)
-		if f.Type.Kind() == reflect.Ptr {
-			if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
-				// both unset
-				continue
-			} else if n1 != n2 {
-				// set/unset mismatch
-				return false
-			}
-			b1, ok := f1.Interface().(raw)
-			if ok {
-				b2 := f2.Interface().(raw)
-				// RawMessage
-				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
-					return false
-				}
-				continue
-			}
-			f1, f2 = f1.Elem(), f2.Elem()
-		}
-		if !equalAny(f1, f2, sprop.Prop[i]) {
-			return false
-		}
-	}
-
-	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
-		em2 := v2.FieldByName("XXX_extensions")
-		if !equalExtensions(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
-			return false
-		}
-	}
-
-	uf := v1.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return true
-	}
-
-	u1 := uf.Bytes()
-	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
-	if !bytes.Equal(u1, u2) {
-		return false
-	}
-
-	return true
-}
-
-// v1 and v2 are known to have the same type.
-// prop may be nil.
-func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
-	if v1.Type() == protoMessageType {
-		m1, _ := v1.Interface().(Message)
-		m2, _ := v2.Interface().(Message)
-		return Equal(m1, m2)
-	}
-	switch v1.Kind() {
-	case reflect.Bool:
-		return v1.Bool() == v2.Bool()
-	case reflect.Float32, reflect.Float64:
-		return v1.Float() == v2.Float()
-	case reflect.Int32, reflect.Int64:
-		return v1.Int() == v2.Int()
-	case reflect.Interface:
-		// Probably a oneof field; compare the inner values.
-		n1, n2 := v1.IsNil(), v2.IsNil()
-		if n1 || n2 {
-			return n1 == n2
-		}
-		e1, e2 := v1.Elem(), v2.Elem()
-		if e1.Type() != e2.Type() {
-			return false
-		}
-		return equalAny(e1, e2, nil)
-	case reflect.Map:
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for _, key := range v1.MapKeys() {
-			val2 := v2.MapIndex(key)
-			if !val2.IsValid() {
-				// This key was not found in the second map.
-				return false
-			}
-			if !equalAny(v1.MapIndex(key), val2, nil) {
-				return false
-			}
-		}
-		return true
-	case reflect.Ptr:
-		return equalAny(v1.Elem(), v2.Elem(), prop)
-	case reflect.Slice:
-		if v1.Type().Elem().Kind() == reflect.Uint8 {
-			// short circuit: []byte
-
-			// Edge case: if this is in a proto3 message, a zero length
-			// bytes field is considered the zero value.
-			if prop != nil && prop.proto3 && v1.Len() == 0 && v2.Len() == 0 {
-				return true
-			}
-			if v1.IsNil() != v2.IsNil() {
-				return false
-			}
-			return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
-		}
-
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for i := 0; i < v1.Len(); i++ {
-			if !equalAny(v1.Index(i), v2.Index(i), prop) {
-				return false
-			}
-		}
-		return true
-	case reflect.String:
-		return v1.Interface().(string) == v2.Interface().(string)
-	case reflect.Struct:
-		return equalStruct(v1, v2)
-	case reflect.Uint32, reflect.Uint64:
-		return v1.Uint() == v2.Uint()
-	}
-
-	// unknown type, so not a protocol buffer
-	log.Printf("proto: don't know how to compare %v", v1)
-	return false
-}
-
-// base is the struct type that the extensions are based on.
-// em1 and em2 are extension maps.
-func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
-	if len(em1) != len(em2) {
-		return false
-	}
-
-	for extNum, e1 := range em1 {
-		e2, ok := em2[extNum]
-		if !ok {
-			return false
-		}
-
-		m1, m2 := e1.value, e2.value
-
-		if m1 != nil && m2 != nil {
-			// Both are unencoded.
-			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
-				return false
-			}
-			continue
-		}
-
-		// At least one is encoded. To do a semantically correct comparison
-		// we need to unmarshal them first.
-		var desc *ExtensionDesc
-		if m := extensionMaps[base]; m != nil {
-			desc = m[extNum]
-		}
-		if desc == nil {
-			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
-			continue
-		}
-		var err error
-		if m1 == nil {
-			m1, err = decodeExtension(e1.enc, desc)
-		}
-		if m2 == nil && err == nil {
-			m2, err = decodeExtension(e2.enc, desc)
-		}
-		if err != nil {
-			// The encoded form is invalid.
-			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
-			return false
-		}
-		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go
deleted file mode 100644
index 054f4f1df7..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go
+++ /dev/null
@@ -1,399 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Types and routines for supporting protocol buffer extensions.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"sync"
-)
-
-// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
-var ErrMissingExtension = errors.New("proto: missing extension")
-
-// ExtensionRange represents a range of message extensions for a protocol buffer.
-// Used in code generated by the protocol compiler.
-type ExtensionRange struct {
-	Start, End int32 // both inclusive
-}
-
-// extendableProto is an interface implemented by any protocol buffer that may be extended.
-type extendableProto interface {
-	Message
-	ExtensionRangeArray() []ExtensionRange
-	ExtensionMap() map[int32]Extension
-}
-
-var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
-
-// ExtensionDesc represents an extension specification.
-// Used in generated code from the protocol compiler.
-type ExtensionDesc struct {
-	ExtendedType  Message     // nil pointer to the type that is being extended
-	ExtensionType interface{} // nil pointer to the extension type
-	Field         int32       // field number
-	Name          string      // fully-qualified name of extension, for text formatting
-	Tag           string      // protobuf tag style
-}
-
-func (ed *ExtensionDesc) repeated() bool {
-	t := reflect.TypeOf(ed.ExtensionType)
-	return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
-}
-
-// Extension represents an extension in a message.
-type Extension struct {
-	// When an extension is stored in a message using SetExtension
-	// only desc and value are set. When the message is marshaled
-	// enc will be set to the encoded form of the message.
-	//
-	// When a message is unmarshaled and contains extensions, each
-	// extension will have only enc set. When such an extension is
-	// accessed using GetExtension (or GetExtensions) desc and value
-	// will be set.
-	desc  *ExtensionDesc
-	value interface{}
-	enc   []byte
-}
-
-// SetRawExtension is for testing only.
-func SetRawExtension(base extendableProto, id int32, b []byte) {
-	base.ExtensionMap()[id] = Extension{enc: b}
-}
-
-// isExtensionField returns true iff the given field number is in an extension range.
-func isExtensionField(pb extendableProto, field int32) bool {
-	for _, er := range pb.ExtensionRangeArray() {
-		if er.Start <= field && field <= er.End {
-			return true
-		}
-	}
-	return false
-}
-
-// checkExtensionTypes checks that the given extension is valid for pb.
-func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
-	// Check the extended type.
-	if a, b := reflect.TypeOf(pb), reflect.TypeOf(extension.ExtendedType); a != b {
-		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
-	}
-	// Check the range.
-	if !isExtensionField(pb, extension.Field) {
-		return errors.New("proto: bad extension number; not in declared ranges")
-	}
-	return nil
-}
-
-// extPropKey is sufficient to uniquely identify an extension.
-type extPropKey struct {
-	base  reflect.Type
-	field int32
-}
-
-var extProp = struct {
-	sync.RWMutex
-	m map[extPropKey]*Properties
-}{
-	m: make(map[extPropKey]*Properties),
-}
-
-func extensionProperties(ed *ExtensionDesc) *Properties {
-	key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
-
-	extProp.RLock()
-	if prop, ok := extProp.m[key]; ok {
-		extProp.RUnlock()
-		return prop
-	}
-	extProp.RUnlock()
-
-	extProp.Lock()
-	defer extProp.Unlock()
-	// Check again.
-	if prop, ok := extProp.m[key]; ok {
-		return prop
-	}
-
-	prop := new(Properties)
-	prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
-	extProp.m[key] = prop
-	return prop
-}
-
-// encodeExtensionMap encodes any unmarshaled (unencoded) extensions in m.
-func encodeExtensionMap(m map[int32]Extension) error {
-	for k, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		p := NewBuffer(nil)
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		if err := props.enc(p, props, toStructPointer(x)); err != nil {
-			return err
-		}
-		e.enc = p.buf
-		m[k] = e
-	}
-	return nil
-}
-
-func sizeExtensionMap(m map[int32]Extension) (n int) {
-	for _, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			n += len(e.enc)
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		n += props.size(props, toStructPointer(x))
-	}
-	return
-}
-
-// HasExtension returns whether the given extension is present in pb.
-func HasExtension(pb extendableProto, extension *ExtensionDesc) bool {
-	// TODO: Check types, field numbers, etc.?
-	_, ok := pb.ExtensionMap()[extension.Field]
-	return ok
-}
-
-// ClearExtension removes the given extension from pb.
-func ClearExtension(pb extendableProto, extension *ExtensionDesc) {
-	// TODO: Check types, field numbers, etc.?
-	delete(pb.ExtensionMap(), extension.Field)
-}
-
-// GetExtension parses and returns the given extension of pb.
-// If the extension is not present and has no default value it returns ErrMissingExtension.
-func GetExtension(pb extendableProto, extension *ExtensionDesc) (interface{}, error) {
-	if err := checkExtensionTypes(pb, extension); err != nil {
-		return nil, err
-	}
-
-	emap := pb.ExtensionMap()
-	e, ok := emap[extension.Field]
-	if !ok {
-		// defaultExtensionValue returns the default value or
-		// ErrMissingExtension if there is no default.
-		return defaultExtensionValue(extension)
-	}
-
-	if e.value != nil {
-		// Already decoded. Check the descriptor, though.
-		if e.desc != extension {
-			// This shouldn't happen. If it does, it means that
-			// GetExtension was called twice with two different
-			// descriptors with the same field number.
-			return nil, errors.New("proto: descriptor conflict")
-		}
-		return e.value, nil
-	}
-
-	v, err := decodeExtension(e.enc, extension)
-	if err != nil {
-		return nil, err
-	}
-
-	// Remember the decoded version and drop the encoded version.
-	// That way it is safe to mutate what we return.
-	e.value = v
-	e.desc = extension
-	e.enc = nil
-	emap[extension.Field] = e
-	return e.value, nil
-}
-
-// defaultExtensionValue returns the default value for extension.
-// If no default for an extension is defined ErrMissingExtension is returned.
-func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
-	t := reflect.TypeOf(extension.ExtensionType)
-	props := extensionProperties(extension)
-
-	sf, _, err := fieldDefault(t, props)
-	if err != nil {
-		return nil, err
-	}
-
-	if sf == nil || sf.value == nil {
-		// There is no default value.
-		return nil, ErrMissingExtension
-	}
-
-	if t.Kind() != reflect.Ptr {
-		// We do not need to return a Ptr, we can directly return sf.value.
-		return sf.value, nil
-	}
-
-	// We need to return an interface{} that is a pointer to sf.value.
-	value := reflect.New(t).Elem()
-	value.Set(reflect.New(value.Type().Elem()))
-	if sf.kind == reflect.Int32 {
-		// We may have an int32 or an enum, but the underlying data is int32.
-		// Since we can't set an int32 into a non int32 reflect.value directly
-		// set it as a int32.
-		value.Elem().SetInt(int64(sf.value.(int32)))
-	} else {
-		value.Elem().Set(reflect.ValueOf(sf.value))
-	}
-	return value.Interface(), nil
-}
-
-// decodeExtension decodes an extension encoded in b.
-func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
-	o := NewBuffer(b)
-
-	t := reflect.TypeOf(extension.ExtensionType)
-
-	props := extensionProperties(extension)
-
-	// t is a pointer to a struct, pointer to basic type or a slice.
-	// Allocate a "field" to store the pointer/slice itself; the
-	// pointer/slice will be stored here. We pass
-	// the address of this field to props.dec.
-	// This passes a zero field and a *t and lets props.dec
-	// interpret it as a *struct{ x t }.
-	value := reflect.New(t).Elem()
-
-	for {
-		// Discard wire type and field number varint. It isn't needed.
-		if _, err := o.DecodeVarint(); err != nil {
-			return nil, err
-		}
-
-		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
-			return nil, err
-		}
-
-		if o.index >= len(o.buf) {
-			break
-		}
-	}
-	return value.Interface(), nil
-}
-
-// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
-// The returned slice has the same length as es; missing extensions will appear as nil elements.
-func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
-	epb, ok := pb.(extendableProto)
-	if !ok {
-		err = errors.New("proto: not an extendable proto")
-		return
-	}
-	extensions = make([]interface{}, len(es))
-	for i, e := range es {
-		extensions[i], err = GetExtension(epb, e)
-		if err == ErrMissingExtension {
-			err = nil
-		}
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// SetExtension sets the specified extension of pb to the specified value.
-func SetExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
-	if err := checkExtensionTypes(pb, extension); err != nil {
-		return err
-	}
-	typ := reflect.TypeOf(extension.ExtensionType)
-	if typ != reflect.TypeOf(value) {
-		return errors.New("proto: bad extension value type")
-	}
-	// nil extension values need to be caught early, because the
-	// encoder can't distinguish an ErrNil due to a nil extension
-	// from an ErrNil due to a missing field. Extensions are
-	// always optional, so the encoder would just swallow the error
-	// and drop all the extensions from the encoded message.
-	if reflect.ValueOf(value).IsNil() {
-		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
-	}
-
-	pb.ExtensionMap()[extension.Field] = Extension{desc: extension, value: value}
-	return nil
-}
-
-// A global registry of extensions.
-// The generated code will register the generated descriptors by calling RegisterExtension.
-
-var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
-
-// RegisterExtension is called from the generated code.
-func RegisterExtension(desc *ExtensionDesc) {
-	st := reflect.TypeOf(desc.ExtendedType).Elem()
-	m := extensionMaps[st]
-	if m == nil {
-		m = make(map[int32]*ExtensionDesc)
-		extensionMaps[st] = m
-	}
-	if _, ok := m[desc.Field]; ok {
-		panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
-	}
-	m[desc.Field] = desc
-}
-
-// RegisteredExtensions returns a map of the registered extensions of a
-// protocol buffer struct, indexed by the extension number.
-// The argument pb should be a nil pointer to the struct type.
-func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
-	return extensionMaps[reflect.TypeOf(pb).Elem()]
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go
deleted file mode 100644
index 42a58c6fd4..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go
+++ /dev/null
@@ -1,893 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-Package proto converts data structures to and from the wire format of
-protocol buffers.  It works in concert with the Go source code generated
-for .proto files by the protocol compiler.
-
-A summary of the properties of the protocol buffer interface
-for a protocol buffer variable v:
-
-  - Names are turned from camel_case to CamelCase for export.
-  - There are no methods on v to set fields; just treat
-	them as structure fields.
-  - There are getters that return a field's value if set,
-	and return the field's default value if unset.
-	The getters work even if the receiver is a nil message.
-  - The zero value for a struct is its correct initialization state.
-	All desired fields must be set before marshaling.
-  - A Reset() method will restore a protobuf struct to its zero state.
-  - Non-repeated fields are pointers to the values; nil means unset.
-	That is, optional or required field int32 f becomes F *int32.
-  - Repeated fields are slices.
-  - Helper functions are available to aid the setting of fields.
-	msg.Foo = proto.String("hello") // set field
-  - Constants are defined to hold the default values of all fields that
-	have them.  They have the form Default_StructName_FieldName.
-	Because the getter methods handle defaulted values,
-	direct use of these constants should be rare.
-  - Enums are given type names and maps from names to values.
-	Enum values are prefixed by the enclosing message's name, or by the
-	enum's type name if it is a top-level enum. Enum types have a String
-	method, and a Enum method to assist in message construction.
-  - Nested messages, groups and enums have type names prefixed with the name of
-	the surrounding message type.
-  - Extensions are given descriptor names that start with E_,
-	followed by an underscore-delimited list of the nested messages
-	that contain it (if any) followed by the CamelCased name of the
-	extension field itself.  HasExtension, ClearExtension, GetExtension
-	and SetExtension are functions for manipulating extensions.
-  - Oneof field sets are given a single field in their message,
-	with distinguished wrapper types for each possible field value.
-  - Marshal and Unmarshal are functions to encode and decode the wire format.
-
-When the .proto file specifies `syntax="proto3"`, there are some differences:
-
-  - Non-repeated fields of non-message type are values instead of pointers.
-  - Getters are only generated for message and oneof fields.
-  - Enum types do not get an Enum method.
-
-The simplest way to describe this is to see an example.
-Given file test.proto, containing
-
-	package example;
-
-	enum FOO { X = 17; }
-
-	message Test {
-	  required string label = 1;
-	  optional int32 type = 2 [default=77];
-	  repeated int64 reps = 3;
-	  optional group OptionalGroup = 4 {
-	    required string RequiredField = 5;
-	  }
-	  oneof union {
-	    int32 number = 6;
-	    string name = 7;
-	  }
-	}
-
-The resulting file, test.pb.go, is:
-
-	package example
-
-	import proto "github.com/golang/protobuf/proto"
-	import math "math"
-
-	type FOO int32
-	const (
-		FOO_X FOO = 17
-	)
-	var FOO_name = map[int32]string{
-		17: "X",
-	}
-	var FOO_value = map[string]int32{
-		"X": 17,
-	}
-
-	func (x FOO) Enum() *FOO {
-		p := new(FOO)
-		*p = x
-		return p
-	}
-	func (x FOO) String() string {
-		return proto.EnumName(FOO_name, int32(x))
-	}
-	func (x *FOO) UnmarshalJSON(data []byte) error {
-		value, err := proto.UnmarshalJSONEnum(FOO_value, data)
-		if err != nil {
-			return err
-		}
-		*x = FOO(value)
-		return nil
-	}
-
-	type Test struct {
-		Label         *string             `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
-		Type          *int32              `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
-		Reps          []int64             `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
-		Optionalgroup *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
-		// Types that are valid to be assigned to Union:
-		//	*Test_Number
-		//	*Test_Name
-		Union            isTest_Union `protobuf_oneof:"union"`
-		XXX_unrecognized []byte       `json:"-"`
-	}
-	func (m *Test) Reset()         { *m = Test{} }
-	func (m *Test) String() string { return proto.CompactTextString(m) }
-	func (*Test) ProtoMessage() {}
-
-	type isTest_Union interface {
-		isTest_Union()
-	}
-
-	type Test_Number struct {
-		Number int32 `protobuf:"varint,6,opt,name=number"`
-	}
-	type Test_Name struct {
-		Name string `protobuf:"bytes,7,opt,name=name"`
-	}
-
-	func (*Test_Number) isTest_Union() {}
-	func (*Test_Name) isTest_Union()   {}
-
-	func (m *Test) GetUnion() isTest_Union {
-		if m != nil {
-			return m.Union
-		}
-		return nil
-	}
-	const Default_Test_Type int32 = 77
-
-	func (m *Test) GetLabel() string {
-		if m != nil && m.Label != nil {
-			return *m.Label
-		}
-		return ""
-	}
-
-	func (m *Test) GetType() int32 {
-		if m != nil && m.Type != nil {
-			return *m.Type
-		}
-		return Default_Test_Type
-	}
-
-	func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
-		if m != nil {
-			return m.Optionalgroup
-		}
-		return nil
-	}
-
-	type Test_OptionalGroup struct {
-		RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
-	}
-	func (m *Test_OptionalGroup) Reset()         { *m = Test_OptionalGroup{} }
-	func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
-
-	func (m *Test_OptionalGroup) GetRequiredField() string {
-		if m != nil && m.RequiredField != nil {
-			return *m.RequiredField
-		}
-		return ""
-	}
-
-	func (m *Test) GetNumber() int32 {
-		if x, ok := m.GetUnion().(*Test_Number); ok {
-			return x.Number
-		}
-		return 0
-	}
-
-	func (m *Test) GetName() string {
-		if x, ok := m.GetUnion().(*Test_Name); ok {
-			return x.Name
-		}
-		return ""
-	}
-
-	func init() {
-		proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
-	}
-
-To create and play with a Test object:
-
-	package main
-
-	import (
-		"log"
-
-		"github.com/golang/protobuf/proto"
-		pb "./example.pb"
-	)
-
-	func main() {
-		test := &pb.Test{
-			Label: proto.String("hello"),
-			Type:  proto.Int32(17),
-			Optionalgroup: &pb.Test_OptionalGroup{
-				RequiredField: proto.String("good bye"),
-			},
-			Union: &pb.Test_Name{"fred"},
-		}
-		data, err := proto.Marshal(test)
-		if err != nil {
-			log.Fatal("marshaling error: ", err)
-		}
-		newTest := &pb.Test{}
-		err = proto.Unmarshal(data, newTest)
-		if err != nil {
-			log.Fatal("unmarshaling error: ", err)
-		}
-		// Now test and newTest contain the same data.
-		if test.GetLabel() != newTest.GetLabel() {
-			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
-		}
-		// Use a type switch to determine which oneof was set.
-		switch u := test.Union.(type) {
-		case *pb.Test_Number: // u.Number contains the number.
-		case *pb.Test_Name: // u.Name contains the string.
-		}
-		// etc.
-	}
-*/
-package proto
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"reflect"
-	"sort"
-	"strconv"
-	"sync"
-)
-
-// Message is implemented by generated protocol buffer messages.
-type Message interface {
-	Reset()
-	String() string
-	ProtoMessage()
-}
-
-// Stats records allocation details about the protocol buffer encoders
-// and decoders.  Useful for tuning the library itself.
-type Stats struct {
-	Emalloc uint64 // mallocs in encode
-	Dmalloc uint64 // mallocs in decode
-	Encode  uint64 // number of encodes
-	Decode  uint64 // number of decodes
-	Chit    uint64 // number of cache hits
-	Cmiss   uint64 // number of cache misses
-	Size    uint64 // number of sizes
-}
-
-// Set to true to enable stats collection.
-const collectStats = false
-
-var stats Stats
-
-// GetStats returns a copy of the global Stats structure.
-func GetStats() Stats { return stats }
-
-// A Buffer is a buffer manager for marshaling and unmarshaling
-// protocol buffers.  It may be reused between invocations to
-// reduce memory usage.  It is not necessary to use a Buffer;
-// the global functions Marshal and Unmarshal create a
-// temporary Buffer and are fine for most applications.
-type Buffer struct {
-	buf   []byte // encode/decode byte stream
-	index int    // write point
-
-	// pools of basic types to amortize allocation.
-	bools   []bool
-	uint32s []uint32
-	uint64s []uint64
-
-	// extra pools, only used with pointer_reflect.go
-	int32s   []int32
-	int64s   []int64
-	float32s []float32
-	float64s []float64
-}
-
-// NewBuffer allocates a new Buffer and initializes its internal data to
-// the contents of the argument slice.
-func NewBuffer(e []byte) *Buffer {
-	return &Buffer{buf: e}
-}
-
-// Reset resets the Buffer, ready for marshaling a new protocol buffer.
-func (p *Buffer) Reset() {
-	p.buf = p.buf[0:0] // for reading/writing
-	p.index = 0        // for reading
-}
-
-// SetBuf replaces the internal buffer with the slice,
-// ready for unmarshaling the contents of the slice.
-func (p *Buffer) SetBuf(s []byte) {
-	p.buf = s
-	p.index = 0
-}
-
-// Bytes returns the contents of the Buffer.
-func (p *Buffer) Bytes() []byte { return p.buf }
-
-/*
- * Helper routines for simplifying the creation of optional fields of basic type.
- */
-
-// Bool is a helper routine that allocates a new bool value
-// to store v and returns a pointer to it.
-func Bool(v bool) *bool {
-	return &v
-}
-
-// Int32 is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it.
-func Int32(v int32) *int32 {
-	return &v
-}
-
-// Int is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it, but unlike Int32
-// its argument value is an int.
-func Int(v int) *int32 {
-	p := new(int32)
-	*p = int32(v)
-	return p
-}
-
-// Int64 is a helper routine that allocates a new int64 value
-// to store v and returns a pointer to it.
-func Int64(v int64) *int64 {
-	return &v
-}
-
-// Float32 is a helper routine that allocates a new float32 value
-// to store v and returns a pointer to it.
-func Float32(v float32) *float32 {
-	return &v
-}
-
-// Float64 is a helper routine that allocates a new float64 value
-// to store v and returns a pointer to it.
-func Float64(v float64) *float64 {
-	return &v
-}
-
-// Uint32 is a helper routine that allocates a new uint32 value
-// to store v and returns a pointer to it.
-func Uint32(v uint32) *uint32 {
-	return &v
-}
-
-// Uint64 is a helper routine that allocates a new uint64 value
-// to store v and returns a pointer to it.
-func Uint64(v uint64) *uint64 {
-	return &v
-}
-
-// String is a helper routine that allocates a new string value
-// to store v and returns a pointer to it.
-func String(v string) *string {
-	return &v
-}
-
-// EnumName is a helper function to simplify printing protocol buffer enums
-// by name.  Given an enum map and a value, it returns a useful string.
-func EnumName(m map[int32]string, v int32) string {
-	s, ok := m[v]
-	if ok {
-		return s
-	}
-	return strconv.Itoa(int(v))
-}
-
-// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
-// from their JSON-encoded representation. Given a map from the enum's symbolic
-// names to its int values, and a byte buffer containing the JSON-encoded
-// value, it returns an int32 that can be cast to the enum type by the caller.
-//
-// The function can deal with both JSON representations, numeric and symbolic.
-func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
-	if data[0] == '"' {
-		// New style: enums are strings.
-		var repr string
-		if err := json.Unmarshal(data, &repr); err != nil {
-			return -1, err
-		}
-		val, ok := m[repr]
-		if !ok {
-			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
-		}
-		return val, nil
-	}
-	// Old style: enums are ints.
-	var val int32
-	if err := json.Unmarshal(data, &val); err != nil {
-		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
-	}
-	return val, nil
-}
-
-// DebugPrint dumps the encoded data in b in a debugging format with a header
-// including the string s. Used in testing but made available for general debugging.
-func (p *Buffer) DebugPrint(s string, b []byte) {
-	var u uint64
-
-	obuf := p.buf
-	index := p.index
-	p.buf = b
-	p.index = 0
-	depth := 0
-
-	fmt.Printf("\n--- %s ---\n", s)
-
-out:
-	for {
-		for i := 0; i < depth; i++ {
-			fmt.Print("  ")
-		}
-
-		index := p.index
-		if index == len(p.buf) {
-			break
-		}
-
-		op, err := p.DecodeVarint()
-		if err != nil {
-			fmt.Printf("%3d: fetching op err %v\n", index, err)
-			break out
-		}
-		tag := op >> 3
-		wire := op & 7
-
-		switch wire {
-		default:
-			fmt.Printf("%3d: t=%3d unknown wire=%d\n",
-				index, tag, wire)
-			break out
-
-		case WireBytes:
-			var r []byte
-
-			r, err = p.DecodeRawBytes(false)
-			if err != nil {
-				break out
-			}
-			fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
-			if len(r) <= 6 {
-				for i := 0; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			} else {
-				for i := 0; i < 3; i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-				fmt.Printf(" ..")
-				for i := len(r) - 3; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			}
-			fmt.Printf("\n")
-
-		case WireFixed32:
-			u, err = p.DecodeFixed32()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
-
-		case WireFixed64:
-			u, err = p.DecodeFixed64()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
-
-		case WireVarint:
-			u, err = p.DecodeVarint()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
-
-		case WireStartGroup:
-			fmt.Printf("%3d: t=%3d start\n", index, tag)
-			depth++
-
-		case WireEndGroup:
-			depth--
-			fmt.Printf("%3d: t=%3d end\n", index, tag)
-		}
-	}
-
-	if depth != 0 {
-		fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
-	}
-	fmt.Printf("\n")
-
-	p.buf = obuf
-	p.index = index
-}
-
-// SetDefaults sets unset protocol buffer fields to their default values.
-// It only modifies fields that are both unset and have defined defaults.
-// It recursively sets default values in any non-nil sub-messages.
-func SetDefaults(pb Message) {
-	setDefaults(reflect.ValueOf(pb), true, false)
-}
-
-// v is a pointer to a struct.
-func setDefaults(v reflect.Value, recur, zeros bool) {
-	v = v.Elem()
-
-	defaultMu.RLock()
-	dm, ok := defaults[v.Type()]
-	defaultMu.RUnlock()
-	if !ok {
-		dm = buildDefaultMessage(v.Type())
-		defaultMu.Lock()
-		defaults[v.Type()] = dm
-		defaultMu.Unlock()
-	}
-
-	for _, sf := range dm.scalars {
-		f := v.Field(sf.index)
-		if !f.IsNil() {
-			// field already set
-			continue
-		}
-		dv := sf.value
-		if dv == nil && !zeros {
-			// no explicit default, and don't want to set zeros
-			continue
-		}
-		fptr := f.Addr().Interface() // **T
-		// TODO: Consider batching the allocations we do here.
-		switch sf.kind {
-		case reflect.Bool:
-			b := new(bool)
-			if dv != nil {
-				*b = dv.(bool)
-			}
-			*(fptr.(**bool)) = b
-		case reflect.Float32:
-			f := new(float32)
-			if dv != nil {
-				*f = dv.(float32)
-			}
-			*(fptr.(**float32)) = f
-		case reflect.Float64:
-			f := new(float64)
-			if dv != nil {
-				*f = dv.(float64)
-			}
-			*(fptr.(**float64)) = f
-		case reflect.Int32:
-			// might be an enum
-			if ft := f.Type(); ft != int32PtrType {
-				// enum
-				f.Set(reflect.New(ft.Elem()))
-				if dv != nil {
-					f.Elem().SetInt(int64(dv.(int32)))
-				}
-			} else {
-				// int32 field
-				i := new(int32)
-				if dv != nil {
-					*i = dv.(int32)
-				}
-				*(fptr.(**int32)) = i
-			}
-		case reflect.Int64:
-			i := new(int64)
-			if dv != nil {
-				*i = dv.(int64)
-			}
-			*(fptr.(**int64)) = i
-		case reflect.String:
-			s := new(string)
-			if dv != nil {
-				*s = dv.(string)
-			}
-			*(fptr.(**string)) = s
-		case reflect.Uint8:
-			// exceptional case: []byte
-			var b []byte
-			if dv != nil {
-				db := dv.([]byte)
-				b = make([]byte, len(db))
-				copy(b, db)
-			} else {
-				b = []byte{}
-			}
-			*(fptr.(*[]byte)) = b
-		case reflect.Uint32:
-			u := new(uint32)
-			if dv != nil {
-				*u = dv.(uint32)
-			}
-			*(fptr.(**uint32)) = u
-		case reflect.Uint64:
-			u := new(uint64)
-			if dv != nil {
-				*u = dv.(uint64)
-			}
-			*(fptr.(**uint64)) = u
-		default:
-			log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
-		}
-	}
-
-	for _, ni := range dm.nested {
-		f := v.Field(ni)
-		// f is *T or []*T or map[T]*T
-		switch f.Kind() {
-		case reflect.Ptr:
-			if f.IsNil() {
-				continue
-			}
-			setDefaults(f, recur, zeros)
-
-		case reflect.Slice:
-			for i := 0; i < f.Len(); i++ {
-				e := f.Index(i)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-
-		case reflect.Map:
-			for _, k := range f.MapKeys() {
-				e := f.MapIndex(k)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-		}
-	}
-}
-
-var (
-	// defaults maps a protocol buffer struct type to a slice of the fields,
-	// with its scalar fields set to their proto-declared non-zero default values.
-	defaultMu sync.RWMutex
-	defaults  = make(map[reflect.Type]defaultMessage)
-
-	int32PtrType = reflect.TypeOf((*int32)(nil))
-)
-
-// defaultMessage represents information about the default values of a message.
-type defaultMessage struct {
-	scalars []scalarField
-	nested  []int // struct field index of nested messages
-}
-
-type scalarField struct {
-	index int          // struct field index
-	kind  reflect.Kind // element type (the T in *T or []T)
-	value interface{}  // the proto-declared default value, or nil
-}
-
-// t is a struct type.
-func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
-	sprop := GetProperties(t)
-	for _, prop := range sprop.Prop {
-		fi, ok := sprop.decoderTags.get(prop.Tag)
-		if !ok {
-			// XXX_unrecognized
-			continue
-		}
-		ft := t.Field(fi).Type
-
-		sf, nested, err := fieldDefault(ft, prop)
-		switch {
-		case err != nil:
-			log.Print(err)
-		case nested:
-			dm.nested = append(dm.nested, fi)
-		case sf != nil:
-			sf.index = fi
-			dm.scalars = append(dm.scalars, *sf)
-		}
-	}
-
-	return dm
-}
-
-// fieldDefault returns the scalarField for field type ft.
-// sf will be nil if the field can not have a default.
-// nestedMessage will be true if this is a nested message.
-// Note that sf.index is not set on return.
-func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
-	var canHaveDefault bool
-	switch ft.Kind() {
-	case reflect.Ptr:
-		if ft.Elem().Kind() == reflect.Struct {
-			nestedMessage = true
-		} else {
-			canHaveDefault = true // proto2 scalar field
-		}
-
-	case reflect.Slice:
-		switch ft.Elem().Kind() {
-		case reflect.Ptr:
-			nestedMessage = true // repeated message
-		case reflect.Uint8:
-			canHaveDefault = true // bytes field
-		}
-
-	case reflect.Map:
-		if ft.Elem().Kind() == reflect.Ptr {
-			nestedMessage = true // map with message values
-		}
-	}
-
-	if !canHaveDefault {
-		if nestedMessage {
-			return nil, true, nil
-		}
-		return nil, false, nil
-	}
-
-	// We now know that ft is a pointer or slice.
-	sf = &scalarField{kind: ft.Elem().Kind()}
-
-	// scalar fields without defaults
-	if !prop.HasDefault {
-		return sf, false, nil
-	}
-
-	// a scalar field: either *T or []byte
-	switch ft.Elem().Kind() {
-	case reflect.Bool:
-		x, err := strconv.ParseBool(prop.Default)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Float32:
-		x, err := strconv.ParseFloat(prop.Default, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
-		}
-		sf.value = float32(x)
-	case reflect.Float64:
-		x, err := strconv.ParseFloat(prop.Default, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Int32:
-		x, err := strconv.ParseInt(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
-		}
-		sf.value = int32(x)
-	case reflect.Int64:
-		x, err := strconv.ParseInt(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.String:
-		sf.value = prop.Default
-	case reflect.Uint8:
-		// []byte (not *uint8)
-		sf.value = []byte(prop.Default)
-	case reflect.Uint32:
-		x, err := strconv.ParseUint(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
-		}
-		sf.value = uint32(x)
-	case reflect.Uint64:
-		x, err := strconv.ParseUint(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	default:
-		return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
-	}
-
-	return sf, false, nil
-}
-
-// Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-
-func mapKeys(vs []reflect.Value) sort.Interface {
-	s := mapKeySorter{
-		vs: vs,
-		// default Less function: textual comparison
-		less: func(a, b reflect.Value) bool {
-			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
-		},
-	}
-
-	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
-	// numeric keys are sorted numerically.
-	if len(vs) == 0 {
-		return s
-	}
-	switch vs[0].Kind() {
-	case reflect.Int32, reflect.Int64:
-		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
-	case reflect.Uint32, reflect.Uint64:
-		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
-	}
-
-	return s
-}
-
-type mapKeySorter struct {
-	vs   []reflect.Value
-	less func(a, b reflect.Value) bool
-}
-
-func (s mapKeySorter) Len() int      { return len(s.vs) }
-func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
-func (s mapKeySorter) Less(i, j int) bool {
-	return s.less(s.vs[i], s.vs[j])
-}
-
-// isProto3Zero reports whether v is a zero proto3 value.
-func isProto3Zero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint32, reflect.Uint64:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.String:
-		return v.String() == ""
-	}
-	return false
-}
-
-// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const ProtoPackageIsVersion1 = true
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go
deleted file mode 100644
index e25e01e637..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go
+++ /dev/null
@@ -1,280 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Support for message sets.
- */
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
-// A message type ID is required for storing a protocol buffer in a message set.
-var errNoMessageTypeID = errors.New("proto does not have a message type ID")
-
-// The first two types (_MessageSet_Item and messageSet)
-// model what the protocol compiler produces for the following protocol message:
-//   message MessageSet {
-//     repeated group Item = 1 {
-//       required int32 type_id = 2;
-//       required string message = 3;
-//     };
-//   }
-// That is the MessageSet wire format. We can't use a proto to generate these
-// because that would introduce a circular dependency between it and this package.
-
-type _MessageSet_Item struct {
-	TypeId  *int32 `protobuf:"varint,2,req,name=type_id"`
-	Message []byte `protobuf:"bytes,3,req,name=message"`
-}
-
-type messageSet struct {
-	Item             []*_MessageSet_Item `protobuf:"group,1,rep"`
-	XXX_unrecognized []byte
-	// TODO: caching?
-}
-
-// Make sure messageSet is a Message.
-var _ Message = (*messageSet)(nil)
-
-// messageTypeIder is an interface satisfied by a protocol buffer type
-// that may be stored in a MessageSet.
-type messageTypeIder interface {
-	MessageTypeId() int32
-}
-
-func (ms *messageSet) find(pb Message) *_MessageSet_Item {
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return nil
-	}
-	id := mti.MessageTypeId()
-	for _, item := range ms.Item {
-		if *item.TypeId == id {
-			return item
-		}
-	}
-	return nil
-}
-
-func (ms *messageSet) Has(pb Message) bool {
-	if ms.find(pb) != nil {
-		return true
-	}
-	return false
-}
-
-func (ms *messageSet) Unmarshal(pb Message) error {
-	if item := ms.find(pb); item != nil {
-		return Unmarshal(item.Message, pb)
-	}
-	if _, ok := pb.(messageTypeIder); !ok {
-		return errNoMessageTypeID
-	}
-	return nil // TODO: return error instead?
-}
-
-func (ms *messageSet) Marshal(pb Message) error {
-	msg, err := Marshal(pb)
-	if err != nil {
-		return err
-	}
-	if item := ms.find(pb); item != nil {
-		// reuse existing item
-		item.Message = msg
-		return nil
-	}
-
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return errNoMessageTypeID
-	}
-
-	mtid := mti.MessageTypeId()
-	ms.Item = append(ms.Item, &_MessageSet_Item{
-		TypeId:  &mtid,
-		Message: msg,
-	})
-	return nil
-}
-
-func (ms *messageSet) Reset()         { *ms = messageSet{} }
-func (ms *messageSet) String() string { return CompactTextString(ms) }
-func (*messageSet) ProtoMessage()     {}
-
-// Support for the message_set_wire_format message option.
-
-func skipVarint(buf []byte) []byte {
-	i := 0
-	for ; buf[i]&0x80 != 0; i++ {
-	}
-	return buf[i+1:]
-}
-
-// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
-// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSet(m map[int32]Extension) ([]byte, error) {
-	if err := encodeExtensionMap(m); err != nil {
-		return nil, err
-	}
-
-	// Sort extension IDs to provide a deterministic encoding.
-	// See also enc_map in encode.go.
-	ids := make([]int, 0, len(m))
-	for id := range m {
-		ids = append(ids, int(id))
-	}
-	sort.Ints(ids)
-
-	ms := &messageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
-	for _, id := range ids {
-		e := m[int32(id)]
-		// Remove the wire type and field number varint, as well as the length varint.
-		msg := skipVarint(skipVarint(e.enc))
-
-		ms.Item = append(ms.Item, &_MessageSet_Item{
-			TypeId:  Int32(int32(id)),
-			Message: msg,
-		})
-	}
-	return Marshal(ms)
-}
-
-// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
-// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSet(buf []byte, m map[int32]Extension) error {
-	ms := new(messageSet)
-	if err := Unmarshal(buf, ms); err != nil {
-		return err
-	}
-	for _, item := range ms.Item {
-		id := *item.TypeId
-		msg := item.Message
-
-		// Restore wire type and field number varint, plus length varint.
-		// Be careful to preserve duplicate items.
-		b := EncodeVarint(uint64(id)<<3 | WireBytes)
-		if ext, ok := m[id]; ok {
-			// Existing data; rip off the tag and length varint
-			// so we join the new data correctly.
-			// We can assume that ext.enc is set because we are unmarshaling.
-			o := ext.enc[len(b):]   // skip wire type and field number
-			_, n := DecodeVarint(o) // calculate length of length varint
-			o = o[n:]               // skip length varint
-			msg = append(o, msg...) // join old data and new data
-		}
-		b = append(b, EncodeVarint(uint64(len(msg)))...)
-		b = append(b, msg...)
-
-		m[id] = Extension{enc: b}
-	}
-	return nil
-}
-
-// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
-// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSetJSON(m map[int32]Extension) ([]byte, error) {
-	var b bytes.Buffer
-	b.WriteByte('{')
-
-	// Process the map in key order for deterministic output.
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
-
-	for i, id := range ids {
-		ext := m[id]
-		if i > 0 {
-			b.WriteByte(',')
-		}
-
-		msd, ok := messageSetMap[id]
-		if !ok {
-			// Unknown type; we can't render it, so skip it.
-			continue
-		}
-		fmt.Fprintf(&b, `"[%s]":`, msd.name)
-
-		x := ext.value
-		if x == nil {
-			x = reflect.New(msd.t.Elem()).Interface()
-			if err := Unmarshal(ext.enc, x.(Message)); err != nil {
-				return nil, err
-			}
-		}
-		d, err := json.Marshal(x)
-		if err != nil {
-			return nil, err
-		}
-		b.Write(d)
-	}
-	b.WriteByte('}')
-	return b.Bytes(), nil
-}
-
-// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
-// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSetJSON(buf []byte, m map[int32]Extension) error {
-	// Common-case fast path.
-	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
-		return nil
-	}
-
-	// This is fairly tricky, and it's not clear that it is needed.
-	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
-}
-
-// A global registry of types that can be used in a MessageSet.
-
-var messageSetMap = make(map[int32]messageSetDesc)
-
-type messageSetDesc struct {
-	t    reflect.Type // pointer to struct
-	name string
-}
-
-// RegisterMessageSetType is called from the generated code.
-func RegisterMessageSetType(m Message, fieldNum int32, name string) {
-	messageSetMap[fieldNum] = messageSetDesc{
-		t:    reflect.TypeOf(m),
-		name: name,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go
deleted file mode 100644
index 749919d250..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go
+++ /dev/null
@@ -1,479 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build appengine
-
-// This file contains an implementation of proto field accesses using package reflect.
-// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
-// be used on App Engine.
-
-package proto
-
-import (
-	"math"
-	"reflect"
-)
-
-// A structPointer is a pointer to a struct.
-type structPointer struct {
-	v reflect.Value
-}
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-// The reflect value must itself be a pointer to a struct.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer{v}
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p.v.IsNil()
-}
-
-// Interface returns the struct pointer as an interface value.
-func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
-	return p.v.Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by the sequence of field indices
-// passed to reflect's FieldByIndex.
-type field []int
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return f.Index
-}
-
-// invalidField is an invalid field identifier.
-var invalidField = field(nil)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool { return f != nil }
-
-// field returns the given field in the struct as a reflect value.
-func structPointer_field(p structPointer, f field) reflect.Value {
-	// Special case: an extension map entry with a value of type T
-	// passes a *T to the struct-handling code with a zero field,
-	// expecting that it will be treated as equivalent to *struct{ X T },
-	// which has the same memory layout. We have to handle that case
-	// specially, because reflect will panic if we call FieldByIndex on a
-	// non-struct.
-	if f == nil {
-		return p.v.Elem()
-	}
-
-	return p.v.Elem().FieldByIndex(f)
-}
-
-// ifield returns the given field in the struct as an interface value.
-func structPointer_ifield(p structPointer, f field) interface{} {
-	return structPointer_field(p, f).Addr().Interface()
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return structPointer_ifield(p, f).(*[]byte)
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return structPointer_ifield(p, f).(*[][]byte)
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return structPointer_ifield(p, f).(**bool)
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return structPointer_ifield(p, f).(*bool)
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return structPointer_ifield(p, f).(*[]bool)
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return structPointer_ifield(p, f).(**string)
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return structPointer_ifield(p, f).(*string)
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return structPointer_ifield(p, f).(*[]string)
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return structPointer_ifield(p, f).(*map[int32]Extension)
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return structPointer_field(p, f).Addr()
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	structPointer_field(p, f).Set(q.v)
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return structPointer{structPointer_field(p, f)}
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
-	return structPointerSlice{structPointer_field(p, f)}
-}
-
-// A structPointerSlice represents the address of a slice of pointers to structs
-// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
-type structPointerSlice struct {
-	v reflect.Value
-}
-
-func (p structPointerSlice) Len() int                  { return p.v.Len() }
-func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
-func (p structPointerSlice) Append(q structPointer) {
-	p.v.Set(reflect.Append(p.v, q.v))
-}
-
-var (
-	int32Type   = reflect.TypeOf(int32(0))
-	uint32Type  = reflect.TypeOf(uint32(0))
-	float32Type = reflect.TypeOf(float32(0))
-	int64Type   = reflect.TypeOf(int64(0))
-	uint64Type  = reflect.TypeOf(uint64(0))
-	float64Type = reflect.TypeOf(float64(0))
-)
-
-// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
-// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
-type word32 struct {
-	v reflect.Value
-}
-
-// IsNil reports whether p is nil.
-func word32_IsNil(p word32) bool {
-	return p.v.IsNil()
-}
-
-// Set sets p to point at a newly allocated word with bits set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int32Type:
-		if len(o.int32s) == 0 {
-			o.int32s = make([]int32, uint32PoolSize)
-		}
-		o.int32s[0] = int32(x)
-		p.v.Set(reflect.ValueOf(&o.int32s[0]))
-		o.int32s = o.int32s[1:]
-		return
-	case uint32Type:
-		if len(o.uint32s) == 0 {
-			o.uint32s = make([]uint32, uint32PoolSize)
-		}
-		o.uint32s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
-		o.uint32s = o.uint32s[1:]
-		return
-	case float32Type:
-		if len(o.float32s) == 0 {
-			o.float32s = make([]float32, uint32PoolSize)
-		}
-		o.float32s[0] = math.Float32frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float32s[0]))
-		o.float32s = o.float32s[1:]
-		return
-	}
-
-	// must be enum
-	p.v.Set(reflect.New(t))
-	p.v.Elem().SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32_Get(p word32) uint32 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32{structPointer_field(p, f)}
-}
-
-// A word32Val represents a field of type int32, uint32, float32, or enum.
-// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
-type word32Val struct {
-	v reflect.Value
-}
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	switch p.v.Type() {
-	case int32Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint32Type:
-		p.v.SetUint(uint64(x))
-		return
-	case float32Type:
-		p.v.SetFloat(float64(math.Float32frombits(x)))
-		return
-	}
-
-	// must be enum
-	p.v.SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32Val_Get(p word32Val) uint32 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val{structPointer_field(p, f)}
-}
-
-// A word32Slice is a slice of 32-bit values.
-// That is, v.Type() is []int32, []uint32, []float32, or []enum.
-type word32Slice struct {
-	v reflect.Value
-}
-
-func (p word32Slice) Append(x uint32) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int32:
-		elem.SetInt(int64(int32(x)))
-	case reflect.Uint32:
-		elem.SetUint(uint64(x))
-	case reflect.Float32:
-		elem.SetFloat(float64(math.Float32frombits(x)))
-	}
-}
-
-func (p word32Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word32Slice) Index(i int) uint32 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) word32Slice {
-	return word32Slice{structPointer_field(p, f)}
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 struct {
-	v reflect.Value
-}
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int64Type:
-		if len(o.int64s) == 0 {
-			o.int64s = make([]int64, uint64PoolSize)
-		}
-		o.int64s[0] = int64(x)
-		p.v.Set(reflect.ValueOf(&o.int64s[0]))
-		o.int64s = o.int64s[1:]
-		return
-	case uint64Type:
-		if len(o.uint64s) == 0 {
-			o.uint64s = make([]uint64, uint64PoolSize)
-		}
-		o.uint64s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
-		o.uint64s = o.uint64s[1:]
-		return
-	case float64Type:
-		if len(o.float64s) == 0 {
-			o.float64s = make([]float64, uint64PoolSize)
-		}
-		o.float64s[0] = math.Float64frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float64s[0]))
-		o.float64s = o.float64s[1:]
-		return
-	}
-	panic("unreachable")
-}
-
-func word64_IsNil(p word64) bool {
-	return p.v.IsNil()
-}
-
-func word64_Get(p word64) uint64 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64{structPointer_field(p, f)}
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val struct {
-	v reflect.Value
-}
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	switch p.v.Type() {
-	case int64Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint64Type:
-		p.v.SetUint(x)
-		return
-	case float64Type:
-		p.v.SetFloat(math.Float64frombits(x))
-		return
-	}
-	panic("unreachable")
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val{structPointer_field(p, f)}
-}
-
-type word64Slice struct {
-	v reflect.Value
-}
-
-func (p word64Slice) Append(x uint64) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int64:
-		elem.SetInt(int64(int64(x)))
-	case reflect.Uint64:
-		elem.SetUint(uint64(x))
-	case reflect.Float64:
-		elem.SetFloat(float64(math.Float64frombits(x)))
-	}
-}
-
-func (p word64Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word64Slice) Index(i int) uint64 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return uint64(elem.Uint())
-	case reflect.Float64:
-		return math.Float64bits(float64(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Slice(p structPointer, f field) word64Slice {
-	return word64Slice{structPointer_field(p, f)}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go
deleted file mode 100644
index e9be0fe92e..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build !appengine
-
-// This file contains the implementation of the proto field accesses using package unsafe.
-
-package proto
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-// NOTE: These type_Foo functions would more idiomatically be methods,
-// but Go does not allow methods on pointer types, and we must preserve
-// some pointer type for the garbage collector. We use these
-// funcs with clunky names as our poor approximation to methods.
-//
-// An alternative would be
-//	type structPointer struct { p unsafe.Pointer }
-// but that does not registerize as well.
-
-// A structPointer is a pointer to a struct.
-type structPointer unsafe.Pointer
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer(unsafe.Pointer(v.Pointer()))
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p == nil
-}
-
-// Interface returns the struct pointer, assumed to have element type t,
-// as an interface value.
-func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
-	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by its byte offset from the start of the struct.
-type field uintptr
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return field(f.Offset)
-}
-
-// invalidField is an invalid field identifier.
-const invalidField = ^field(0)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool {
-	return f != ^field(0)
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
-	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
-type structPointerSlice []structPointer
-
-func (v *structPointerSlice) Len() int                  { return len(*v) }
-func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
-func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
-
-// A word32 is the address of a "pointer to 32-bit value" field.
-type word32 **uint32
-
-// IsNil reports whether *v is nil.
-func word32_IsNil(p word32) bool {
-	return *p == nil
-}
-
-// Set sets *v to point at a newly allocated word set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	if len(o.uint32s) == 0 {
-		o.uint32s = make([]uint32, uint32PoolSize)
-	}
-	o.uint32s[0] = x
-	*p = &o.uint32s[0]
-	o.uint32s = o.uint32s[1:]
-}
-
-// Get gets the value pointed at by *v.
-func word32_Get(p word32) uint32 {
-	return **p
-}
-
-// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Val is the address of a 32-bit value field.
-type word32Val *uint32
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	*p = x
-}
-
-// Get gets the value pointed at by p.
-func word32Val_Get(p word32Val) uint32 {
-	return *p
-}
-
-// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Slice is a slice of 32-bit values.
-type word32Slice []uint32
-
-func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
-func (v *word32Slice) Len() int           { return len(*v) }
-func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
-
-// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
-	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 **uint64
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	if len(o.uint64s) == 0 {
-		o.uint64s = make([]uint64, uint64PoolSize)
-	}
-	o.uint64s[0] = x
-	*p = &o.uint64s[0]
-	o.uint64s = o.uint64s[1:]
-}
-
-func word64_IsNil(p word64) bool {
-	return *p == nil
-}
-
-func word64_Get(p word64) uint64 {
-	return **p
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val *uint64
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	*p = x
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	return *p
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Slice is like word32Slice but for 64-bit values.
-type word64Slice []uint64
-
-func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
-func (v *word64Slice) Len() int           { return len(*v) }
-func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
-
-func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
-	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go
deleted file mode 100644
index d4531c0563..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go
+++ /dev/null
@@ -1,842 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-)
-
-const debug bool = false
-
-// Constants that identify the encoding of a value on the wire.
-const (
-	WireVarint     = 0
-	WireFixed64    = 1
-	WireBytes      = 2
-	WireStartGroup = 3
-	WireEndGroup   = 4
-	WireFixed32    = 5
-)
-
-const startSize = 10 // initial slice/string sizes
-
-// Encoders are defined in encode.go
-// An encoder outputs the full representation of a field, including its
-// tag and encoder type.
-type encoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueEncoder encodes a single integer in a particular encoding.
-type valueEncoder func(o *Buffer, x uint64) error
-
-// Sizers are defined in encode.go
-// A sizer returns the encoded size of a field, including its tag and encoder
-// type.
-type sizer func(prop *Properties, base structPointer) int
-
-// A valueSizer returns the encoded size of a single integer in a particular
-// encoding.
-type valueSizer func(x uint64) int
-
-// Decoders are defined in decode.go
-// A decoder creates a value from its wire representation.
-// Unrecognized subelements are saved in unrec.
-type decoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueDecoder decodes a single integer in a particular encoding.
-type valueDecoder func(o *Buffer) (x uint64, err error)
-
-// A oneofMarshaler does the marshaling for all oneof fields in a message.
-type oneofMarshaler func(Message, *Buffer) error
-
-// A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
-type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
-
-// A oneofSizer does the sizing for all oneof fields in a message.
-type oneofSizer func(Message) int
-
-// tagMap is an optimization over map[int]int for typical protocol buffer
-// use-cases. Encoded protocol buffers are often in tag order with small tag
-// numbers.
-type tagMap struct {
-	fastTags []int
-	slowTags map[int]int
-}
-
-// tagMapFastLimit is the upper bound on the tag number that will be stored in
-// the tagMap slice rather than its map.
-const tagMapFastLimit = 1024
-
-func (p *tagMap) get(t int) (int, bool) {
-	if t > 0 && t < tagMapFastLimit {
-		if t >= len(p.fastTags) {
-			return 0, false
-		}
-		fi := p.fastTags[t]
-		return fi, fi >= 0
-	}
-	fi, ok := p.slowTags[t]
-	return fi, ok
-}
-
-func (p *tagMap) put(t int, fi int) {
-	if t > 0 && t < tagMapFastLimit {
-		for len(p.fastTags) < t+1 {
-			p.fastTags = append(p.fastTags, -1)
-		}
-		p.fastTags[t] = fi
-		return
-	}
-	if p.slowTags == nil {
-		p.slowTags = make(map[int]int)
-	}
-	p.slowTags[t] = fi
-}
-
-// StructProperties represents properties for all the fields of a struct.
-// decoderTags and decoderOrigNames should only be used by the decoder.
-type StructProperties struct {
-	Prop             []*Properties  // properties for each field
-	reqCount         int            // required count
-	decoderTags      tagMap         // map from proto tag to struct field number
-	decoderOrigNames map[string]int // map from original name to struct field number
-	order            []int          // list of struct field numbers in tag order
-	unrecField       field          // field id of the XXX_unrecognized []byte field
-	extendable       bool           // is this an extendable proto
-
-	oneofMarshaler   oneofMarshaler
-	oneofUnmarshaler oneofUnmarshaler
-	oneofSizer       oneofSizer
-	stype            reflect.Type
-
-	// OneofTypes contains information about the oneof fields in this message.
-	// It is keyed by the original name of a field.
-	OneofTypes map[string]*OneofProperties
-}
-
-// OneofProperties represents information about a specific field in a oneof.
-type OneofProperties struct {
-	Type  reflect.Type // pointer to generated struct type for this oneof field
-	Field int          // struct field number of the containing oneof in the message
-	Prop  *Properties
-}
-
-// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
-// See encode.go, (*Buffer).enc_struct.
-
-func (sp *StructProperties) Len() int { return len(sp.order) }
-func (sp *StructProperties) Less(i, j int) bool {
-	return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
-}
-func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
-
-// Properties represents the protocol-specific behavior of a single struct field.
-type Properties struct {
-	Name     string // name of the field, for error messages
-	OrigName string // original name before protocol compiler (always set)
-	Wire     string
-	WireType int
-	Tag      int
-	Required bool
-	Optional bool
-	Repeated bool
-	Packed   bool   // relevant for repeated primitives only
-	Enum     string // set for enum types only
-	proto3   bool   // whether this is known to be a proto3 field; set for []byte only
-	oneof    bool   // whether this is a oneof field
-
-	Default    string // default value
-	HasDefault bool   // whether an explicit default was provided
-	def_uint64 uint64
-
-	enc           encoder
-	valEnc        valueEncoder // set for bool and numeric types only
-	field         field
-	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
-	tagbuf        [8]byte
-	stype         reflect.Type      // set for struct types only
-	sprop         *StructProperties // set for struct types only
-	isMarshaler   bool
-	isUnmarshaler bool
-
-	mtype    reflect.Type // set for map types only
-	mkeyprop *Properties  // set for map types only
-	mvalprop *Properties  // set for map types only
-
-	size    sizer
-	valSize valueSizer // set for bool and numeric types only
-
-	dec    decoder
-	valDec valueDecoder // set for bool and numeric types only
-
-	// If this is a packable field, this will be the decoder for the packed version of the field.
-	packedDec decoder
-}
-
-// String formats the properties in the protobuf struct field tag style.
-func (p *Properties) String() string {
-	s := p.Wire
-	s = ","
-	s += strconv.Itoa(p.Tag)
-	if p.Required {
-		s += ",req"
-	}
-	if p.Optional {
-		s += ",opt"
-	}
-	if p.Repeated {
-		s += ",rep"
-	}
-	if p.Packed {
-		s += ",packed"
-	}
-	if p.OrigName != p.Name {
-		s += ",name=" + p.OrigName
-	}
-	if p.proto3 {
-		s += ",proto3"
-	}
-	if p.oneof {
-		s += ",oneof"
-	}
-	if len(p.Enum) > 0 {
-		s += ",enum=" + p.Enum
-	}
-	if p.HasDefault {
-		s += ",def=" + p.Default
-	}
-	return s
-}
-
-// Parse populates p by parsing a string in the protobuf struct field tag style.
-func (p *Properties) Parse(s string) {
-	// "bytes,49,opt,name=foo,def=hello!"
-	fields := strings.Split(s, ",") // breaks def=, but handled below.
-	if len(fields) < 2 {
-		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
-		return
-	}
-
-	p.Wire = fields[0]
-	switch p.Wire {
-	case "varint":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeVarint
-		p.valDec = (*Buffer).DecodeVarint
-		p.valSize = sizeVarint
-	case "fixed32":
-		p.WireType = WireFixed32
-		p.valEnc = (*Buffer).EncodeFixed32
-		p.valDec = (*Buffer).DecodeFixed32
-		p.valSize = sizeFixed32
-	case "fixed64":
-		p.WireType = WireFixed64
-		p.valEnc = (*Buffer).EncodeFixed64
-		p.valDec = (*Buffer).DecodeFixed64
-		p.valSize = sizeFixed64
-	case "zigzag32":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag32
-		p.valDec = (*Buffer).DecodeZigzag32
-		p.valSize = sizeZigzag32
-	case "zigzag64":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag64
-		p.valDec = (*Buffer).DecodeZigzag64
-		p.valSize = sizeZigzag64
-	case "bytes", "group":
-		p.WireType = WireBytes
-		// no numeric converter for non-numeric types
-	default:
-		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
-		return
-	}
-
-	var err error
-	p.Tag, err = strconv.Atoi(fields[1])
-	if err != nil {
-		return
-	}
-
-	for i := 2; i < len(fields); i++ {
-		f := fields[i]
-		switch {
-		case f == "req":
-			p.Required = true
-		case f == "opt":
-			p.Optional = true
-		case f == "rep":
-			p.Repeated = true
-		case f == "packed":
-			p.Packed = true
-		case strings.HasPrefix(f, "name="):
-			p.OrigName = f[5:]
-		case strings.HasPrefix(f, "enum="):
-			p.Enum = f[5:]
-		case f == "proto3":
-			p.proto3 = true
-		case f == "oneof":
-			p.oneof = true
-		case strings.HasPrefix(f, "def="):
-			p.HasDefault = true
-			p.Default = f[4:] // rest of string
-			if i+1 < len(fields) {
-				// Commas aren't escaped, and def is always last.
-				p.Default += "," + strings.Join(fields[i+1:], ",")
-				break
-			}
-		}
-	}
-}
-
-func logNoSliceEnc(t1, t2 reflect.Type) {
-	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
-}
-
-var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
-
-// Initialize the fields for encoding and decoding.
-func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
-	p.enc = nil
-	p.dec = nil
-	p.size = nil
-
-	switch t1 := typ; t1.Kind() {
-	default:
-		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
-
-	// proto3 scalar types
-
-	case reflect.Bool:
-		p.enc = (*Buffer).enc_proto3_bool
-		p.dec = (*Buffer).dec_proto3_bool
-		p.size = size_proto3_bool
-	case reflect.Int32:
-		p.enc = (*Buffer).enc_proto3_int32
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_int32
-	case reflect.Uint32:
-		p.enc = (*Buffer).enc_proto3_uint32
-		p.dec = (*Buffer).dec_proto3_int32 // can reuse
-		p.size = size_proto3_uint32
-	case reflect.Int64, reflect.Uint64:
-		p.enc = (*Buffer).enc_proto3_int64
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.Float32:
-		p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_uint32
-	case reflect.Float64:
-		p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.String:
-		p.enc = (*Buffer).enc_proto3_string
-		p.dec = (*Buffer).dec_proto3_string
-		p.size = size_proto3_string
-
-	case reflect.Ptr:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
-			break
-		case reflect.Bool:
-			p.enc = (*Buffer).enc_bool
-			p.dec = (*Buffer).dec_bool
-			p.size = size_bool
-		case reflect.Int32:
-			p.enc = (*Buffer).enc_int32
-			p.dec = (*Buffer).dec_int32
-			p.size = size_int32
-		case reflect.Uint32:
-			p.enc = (*Buffer).enc_uint32
-			p.dec = (*Buffer).dec_int32 // can reuse
-			p.size = size_uint32
-		case reflect.Int64, reflect.Uint64:
-			p.enc = (*Buffer).enc_int64
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.Float32:
-			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_int32
-			p.size = size_uint32
-		case reflect.Float64:
-			p.enc = (*Buffer).enc_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.String:
-			p.enc = (*Buffer).enc_string
-			p.dec = (*Buffer).dec_string
-			p.size = size_string
-		case reflect.Struct:
-			p.stype = t1.Elem()
-			p.isMarshaler = isMarshaler(t1)
-			p.isUnmarshaler = isUnmarshaler(t1)
-			if p.Wire == "bytes" {
-				p.enc = (*Buffer).enc_struct_message
-				p.dec = (*Buffer).dec_struct_message
-				p.size = size_struct_message
-			} else {
-				p.enc = (*Buffer).enc_struct_group
-				p.dec = (*Buffer).dec_struct_group
-				p.size = size_struct_group
-			}
-		}
-
-	case reflect.Slice:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			logNoSliceEnc(t1, t2)
-			break
-		case reflect.Bool:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_bool
-				p.size = size_slice_packed_bool
-			} else {
-				p.enc = (*Buffer).enc_slice_bool
-				p.size = size_slice_bool
-			}
-			p.dec = (*Buffer).dec_slice_bool
-			p.packedDec = (*Buffer).dec_slice_packed_bool
-		case reflect.Int32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int32
-				p.size = size_slice_packed_int32
-			} else {
-				p.enc = (*Buffer).enc_slice_int32
-				p.size = size_slice_int32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Uint32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_uint32
-				p.size = size_slice_packed_uint32
-			} else {
-				p.enc = (*Buffer).enc_slice_uint32
-				p.size = size_slice_uint32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Int64, reflect.Uint64:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int64
-				p.size = size_slice_packed_int64
-			} else {
-				p.enc = (*Buffer).enc_slice_int64
-				p.size = size_slice_int64
-			}
-			p.dec = (*Buffer).dec_slice_int64
-			p.packedDec = (*Buffer).dec_slice_packed_int64
-		case reflect.Uint8:
-			p.enc = (*Buffer).enc_slice_byte
-			p.dec = (*Buffer).dec_slice_byte
-			p.size = size_slice_byte
-			// This is a []byte, which is either a bytes field,
-			// or the value of a map field. In the latter case,
-			// we always encode an empty []byte, so we should not
-			// use the proto3 enc/size funcs.
-			// f == nil iff this is the key/value of a map field.
-			if p.proto3 && f != nil {
-				p.enc = (*Buffer).enc_proto3_slice_byte
-				p.size = size_proto3_slice_byte
-			}
-		case reflect.Float32, reflect.Float64:
-			switch t2.Bits() {
-			case 32:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_uint32
-					p.size = size_slice_packed_uint32
-				} else {
-					p.enc = (*Buffer).enc_slice_uint32
-					p.size = size_slice_uint32
-				}
-				p.dec = (*Buffer).dec_slice_int32
-				p.packedDec = (*Buffer).dec_slice_packed_int32
-			case 64:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_int64
-					p.size = size_slice_packed_int64
-				} else {
-					p.enc = (*Buffer).enc_slice_int64
-					p.size = size_slice_int64
-				}
-				p.dec = (*Buffer).dec_slice_int64
-				p.packedDec = (*Buffer).dec_slice_packed_int64
-			default:
-				logNoSliceEnc(t1, t2)
-				break
-			}
-		case reflect.String:
-			p.enc = (*Buffer).enc_slice_string
-			p.dec = (*Buffer).dec_slice_string
-			p.size = size_slice_string
-		case reflect.Ptr:
-			switch t3 := t2.Elem(); t3.Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
-				break
-			case reflect.Struct:
-				p.stype = t2.Elem()
-				p.isMarshaler = isMarshaler(t2)
-				p.isUnmarshaler = isUnmarshaler(t2)
-				if p.Wire == "bytes" {
-					p.enc = (*Buffer).enc_slice_struct_message
-					p.dec = (*Buffer).dec_slice_struct_message
-					p.size = size_slice_struct_message
-				} else {
-					p.enc = (*Buffer).enc_slice_struct_group
-					p.dec = (*Buffer).dec_slice_struct_group
-					p.size = size_slice_struct_group
-				}
-			}
-		case reflect.Slice:
-			switch t2.Elem().Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
-				break
-			case reflect.Uint8:
-				p.enc = (*Buffer).enc_slice_slice_byte
-				p.dec = (*Buffer).dec_slice_slice_byte
-				p.size = size_slice_slice_byte
-			}
-		}
-
-	case reflect.Map:
-		p.enc = (*Buffer).enc_new_map
-		p.dec = (*Buffer).dec_new_map
-		p.size = size_new_map
-
-		p.mtype = t1
-		p.mkeyprop = &Properties{}
-		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
-		p.mvalprop = &Properties{}
-		vtype := p.mtype.Elem()
-		if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
-			// The value type is not a message (*T) or bytes ([]byte),
-			// so we need encoders for the pointer to this type.
-			vtype = reflect.PtrTo(vtype)
-		}
-		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
-	}
-
-	// precalculate tag code
-	wire := p.WireType
-	if p.Packed {
-		wire = WireBytes
-	}
-	x := uint32(p.Tag)<<3 | uint32(wire)
-	i := 0
-	for i = 0; x > 127; i++ {
-		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	p.tagbuf[i] = uint8(x)
-	p.tagcode = p.tagbuf[0 : i+1]
-
-	if p.stype != nil {
-		if lockGetProp {
-			p.sprop = GetProperties(p.stype)
-		} else {
-			p.sprop = getPropertiesLocked(p.stype)
-		}
-	}
-}
-
-var (
-	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
-	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
-)
-
-// isMarshaler reports whether type t implements Marshaler.
-func isMarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isMarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isMarshaler")
-	}
-	return t.Implements(marshalerType)
-}
-
-// isUnmarshaler reports whether type t implements Unmarshaler.
-func isUnmarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isUnmarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isUnmarshaler")
-	}
-	return t.Implements(unmarshalerType)
-}
-
-// Init populates the properties from a protocol buffer struct tag.
-func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
-	p.init(typ, name, tag, f, true)
-}
-
-func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
-	// "bytes,49,opt,def=hello!"
-	p.Name = name
-	p.OrigName = name
-	if f != nil {
-		p.field = toField(f)
-	}
-	if tag == "" {
-		return
-	}
-	p.Parse(tag)
-	p.setEncAndDec(typ, f, lockGetProp)
-}
-
-var (
-	propertiesMu  sync.RWMutex
-	propertiesMap = make(map[reflect.Type]*StructProperties)
-)
-
-// GetProperties returns the list of properties for the type represented by t.
-// t must represent a generated struct type of a protocol message.
-func GetProperties(t reflect.Type) *StructProperties {
-	if t.Kind() != reflect.Struct {
-		panic("proto: type must have kind struct")
-	}
-
-	// Most calls to GetProperties in a long-running program will be
-	// retrieving details for types we have seen before.
-	propertiesMu.RLock()
-	sprop, ok := propertiesMap[t]
-	propertiesMu.RUnlock()
-	if ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return sprop
-	}
-
-	propertiesMu.Lock()
-	sprop = getPropertiesLocked(t)
-	propertiesMu.Unlock()
-	return sprop
-}
-
-// getPropertiesLocked requires that propertiesMu is held.
-func getPropertiesLocked(t reflect.Type) *StructProperties {
-	if prop, ok := propertiesMap[t]; ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return prop
-	}
-	if collectStats {
-		stats.Cmiss++
-	}
-
-	prop := new(StructProperties)
-	// in case of recursive protos, fill this in now.
-	propertiesMap[t] = prop
-
-	// build properties
-	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType)
-	prop.unrecField = invalidField
-	prop.Prop = make([]*Properties, t.NumField())
-	prop.order = make([]int, t.NumField())
-
-	for i := 0; i < t.NumField(); i++ {
-		f := t.Field(i)
-		p := new(Properties)
-		name := f.Name
-		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
-
-		if f.Name == "XXX_extensions" { // special case
-			p.enc = (*Buffer).enc_map
-			p.dec = nil // not needed
-			p.size = size_map
-		}
-		if f.Name == "XXX_unrecognized" { // special case
-			prop.unrecField = toField(&f)
-		}
-		oneof := f.Tag.Get("protobuf_oneof") != "" // special case
-		prop.Prop[i] = p
-		prop.order[i] = i
-		if debug {
-			print(i, " ", f.Name, " ", t.String(), " ")
-			if p.Tag > 0 {
-				print(p.String())
-			}
-			print("\n")
-		}
-		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && !oneof {
-			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
-		}
-	}
-
-	// Re-order prop.order.
-	sort.Sort(prop)
-
-	type oneofMessage interface {
-		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
-	}
-	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
-		var oots []interface{}
-		prop.oneofMarshaler, prop.oneofUnmarshaler, prop.oneofSizer, oots = om.XXX_OneofFuncs()
-		prop.stype = t
-
-		// Interpret oneof metadata.
-		prop.OneofTypes = make(map[string]*OneofProperties)
-		for _, oot := range oots {
-			oop := &OneofProperties{
-				Type: reflect.ValueOf(oot).Type(), // *T
-				Prop: new(Properties),
-			}
-			sft := oop.Type.Elem().Field(0)
-			oop.Prop.Name = sft.Name
-			oop.Prop.Parse(sft.Tag.Get("protobuf"))
-			// There will be exactly one interface field that
-			// this new value is assignable to.
-			for i := 0; i < t.NumField(); i++ {
-				f := t.Field(i)
-				if f.Type.Kind() != reflect.Interface {
-					continue
-				}
-				if !oop.Type.AssignableTo(f.Type) {
-					continue
-				}
-				oop.Field = i
-				break
-			}
-			prop.OneofTypes[oop.Prop.OrigName] = oop
-		}
-	}
-
-	// build required counts
-	// build tags
-	reqCount := 0
-	prop.decoderOrigNames = make(map[string]int)
-	for i, p := range prop.Prop {
-		if strings.HasPrefix(p.Name, "XXX_") {
-			// Internal fields should not appear in tags/origNames maps.
-			// They are handled specially when encoding and decoding.
-			continue
-		}
-		if p.Required {
-			reqCount++
-		}
-		prop.decoderTags.put(p.Tag, i)
-		prop.decoderOrigNames[p.OrigName] = i
-	}
-	prop.reqCount = reqCount
-
-	return prop
-}
-
-// Return the Properties object for the x[0]'th field of the structure.
-func propByIndex(t reflect.Type, x []int) *Properties {
-	if len(x) != 1 {
-		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
-		return nil
-	}
-	prop := GetProperties(t)
-	return prop.Prop[x[0]]
-}
-
-// Get the address and type of a pointer to a struct from an interface.
-func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
-	if pb == nil {
-		err = ErrNil
-		return
-	}
-	// get the reflect type of the pointer to the struct.
-	t = reflect.TypeOf(pb)
-	// get the address of the struct.
-	value := reflect.ValueOf(pb)
-	b = toStructPointer(value)
-	return
-}
-
-// A global registry of enum types.
-// The generated code will register the generated maps by calling RegisterEnum.
-
-var enumValueMaps = make(map[string]map[string]int32)
-
-// RegisterEnum is called from the generated code to install the enum descriptor
-// maps into the global table to aid parsing text format protocol buffers.
-func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
-	if _, ok := enumValueMaps[typeName]; ok {
-		panic("proto: duplicate enum registered: " + typeName)
-	}
-	enumValueMaps[typeName] = valueMap
-}
-
-// EnumValueMap returns the mapping from names to integers of the
-// enum type enumType, or a nil if not found.
-func EnumValueMap(enumType string) map[string]int32 {
-	return enumValueMaps[enumType]
-}
-
-// A registry of all linked message types.
-// The string is a fully-qualified proto name ("pkg.Message").
-var (
-	protoTypes    = make(map[string]reflect.Type)
-	revProtoTypes = make(map[reflect.Type]string)
-)
-
-// RegisterType is called from generated code and maps from the fully qualified
-// proto name to the type (pointer to struct) of the protocol buffer.
-func RegisterType(x Message, name string) {
-	if _, ok := protoTypes[name]; ok {
-		// TODO: Some day, make this a panic.
-		log.Printf("proto: duplicate proto type registered: %s", name)
-		return
-	}
-	t := reflect.TypeOf(x)
-	protoTypes[name] = t
-	revProtoTypes[t] = name
-}
-
-// MessageName returns the fully-qualified proto name for the given message type.
-func MessageName(x Message) string { return revProtoTypes[reflect.TypeOf(x)] }
-
-// MessageType returns the message type (pointer to struct) for a named message.
-func MessageType(name string) reflect.Type { return protoTypes[name] }
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
deleted file mode 100644
index 37c7782092..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: proto3_proto/proto3.proto
-// DO NOT EDIT!
-
-/*
-Package proto3_proto is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3_proto/proto3.proto
-
-It has these top-level messages:
-	Message
-	Nested
-	MessageWithMap
-*/
-package proto3_proto
-
-import proto "github.com/golang/protobuf/proto"
-import testdata "github.com/golang/protobuf/proto/testdata"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-
-type Message_Humour int32
-
-const (
-	Message_UNKNOWN     Message_Humour = 0
-	Message_PUNS        Message_Humour = 1
-	Message_SLAPSTICK   Message_Humour = 2
-	Message_BILL_BAILEY Message_Humour = 3
-)
-
-var Message_Humour_name = map[int32]string{
-	0: "UNKNOWN",
-	1: "PUNS",
-	2: "SLAPSTICK",
-	3: "BILL_BAILEY",
-}
-var Message_Humour_value = map[string]int32{
-	"UNKNOWN":     0,
-	"PUNS":        1,
-	"SLAPSTICK":   2,
-	"BILL_BAILEY": 3,
-}
-
-func (x Message_Humour) String() string {
-	return proto.EnumName(Message_Humour_name, int32(x))
-}
-
-type Message struct {
-	Name         string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Hilarity     Message_Humour                   `protobuf:"varint,2,opt,name=hilarity,enum=proto3_proto.Message_Humour" json:"hilarity,omitempty"`
-	HeightInCm   uint32                           `protobuf:"varint,3,opt,name=height_in_cm" json:"height_in_cm,omitempty"`
-	Data         []byte                           `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
-	ResultCount  int64                            `protobuf:"varint,7,opt,name=result_count" json:"result_count,omitempty"`
-	TrueScotsman bool                             `protobuf:"varint,8,opt,name=true_scotsman" json:"true_scotsman,omitempty"`
-	Score        float32                          `protobuf:"fixed32,9,opt,name=score" json:"score,omitempty"`
-	Key          []uint64                         `protobuf:"varint,5,rep,name=key" json:"key,omitempty"`
-	Nested       *Nested                          `protobuf:"bytes,6,opt,name=nested" json:"nested,omitempty"`
-	Terrain      map[string]*Nested               `protobuf:"bytes,10,rep,name=terrain" json:"terrain,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Proto2Field  *testdata.SubDefaults            `protobuf:"bytes,11,opt,name=proto2_field" json:"proto2_field,omitempty"`
-	Proto2Value  map[string]*testdata.SubDefaults `protobuf:"bytes,13,rep,name=proto2_value" json:"proto2_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-
-func (m *Message) GetNested() *Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *Message) GetTerrain() map[string]*Nested {
-	if m != nil {
-		return m.Terrain
-	}
-	return nil
-}
-
-func (m *Message) GetProto2Field() *testdata.SubDefaults {
-	if m != nil {
-		return m.Proto2Field
-	}
-	return nil
-}
-
-func (m *Message) GetProto2Value() map[string]*testdata.SubDefaults {
-	if m != nil {
-		return m.Proto2Value
-	}
-	return nil
-}
-
-type Nested struct {
-	Bunny string `protobuf:"bytes,1,opt,name=bunny" json:"bunny,omitempty"`
-}
-
-func (m *Nested) Reset()         { *m = Nested{} }
-func (m *Nested) String() string { return proto.CompactTextString(m) }
-func (*Nested) ProtoMessage()    {}
-
-type MessageWithMap struct {
-	ByteMapping map[bool][]byte `protobuf:"bytes,1,rep,name=byte_mapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (m *MessageWithMap) Reset()         { *m = MessageWithMap{} }
-func (m *MessageWithMap) String() string { return proto.CompactTextString(m) }
-func (*MessageWithMap) ProtoMessage()    {}
-
-func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
-	if m != nil {
-		return m.ByteMapping
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("proto3_proto.Message_Humour", Message_Humour_name, Message_Humour_value)
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto b/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
deleted file mode 100644
index e2311d9294..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
+++ /dev/null
@@ -1,68 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-import "testdata/test.proto";
-
-package proto3_proto;
-
-message Message {
-  enum Humour {
-    UNKNOWN = 0;
-    PUNS = 1;
-    SLAPSTICK = 2;
-    BILL_BAILEY = 3;
-  }
-
-  string name = 1;
-  Humour hilarity = 2;
-  uint32 height_in_cm = 3;
-  bytes data = 4;
-  int64 result_count = 7;
-  bool true_scotsman = 8;
-  float score = 9;
-
-  repeated uint64 key = 5;
-  Nested nested = 6;
-
-  map<string, Nested> terrain = 10;
-  testdata.SubDefaults proto2_field = 11;
-  map<string, testdata.SubDefaults> proto2_value = 13;
-}
-
-message Nested {
-  string bunny = 1;
-}
-
-message MessageWithMap {
-  map<bool, bytes> byte_mapping = 1;
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go
deleted file mode 100644
index 2336b144c1..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go
+++ /dev/null
@@ -1,751 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-// Functions for writing the text protocol buffer format.
-
-import (
-	"bufio"
-	"bytes"
-	"encoding"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"math"
-	"reflect"
-	"sort"
-	"strings"
-)
-
-var (
-	newline         = []byte("\n")
-	spaces          = []byte("                                        ")
-	gtNewline       = []byte(">\n")
-	endBraceNewline = []byte("}\n")
-	backslashN      = []byte{'\\', 'n'}
-	backslashR      = []byte{'\\', 'r'}
-	backslashT      = []byte{'\\', 't'}
-	backslashDQ     = []byte{'\\', '"'}
-	backslashBS     = []byte{'\\', '\\'}
-	posInf          = []byte("inf")
-	negInf          = []byte("-inf")
-	nan             = []byte("nan")
-)
-
-type writer interface {
-	io.Writer
-	WriteByte(byte) error
-}
-
-// textWriter is an io.Writer that tracks its indentation level.
-type textWriter struct {
-	ind      int
-	complete bool // if the current position is a complete line
-	compact  bool // whether to write out as a one-liner
-	w        writer
-}
-
-func (w *textWriter) WriteString(s string) (n int, err error) {
-	if !strings.Contains(s, "\n") {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		w.complete = false
-		return io.WriteString(w.w, s)
-	}
-	// WriteString is typically called without newlines, so this
-	// codepath and its copy are rare.  We copy to avoid
-	// duplicating all of Write's logic here.
-	return w.Write([]byte(s))
-}
-
-func (w *textWriter) Write(p []byte) (n int, err error) {
-	newlines := bytes.Count(p, newline)
-	if newlines == 0 {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		n, err = w.w.Write(p)
-		w.complete = false
-		return n, err
-	}
-
-	frags := bytes.SplitN(p, newline, newlines+1)
-	if w.compact {
-		for i, frag := range frags {
-			if i > 0 {
-				if err := w.w.WriteByte(' '); err != nil {
-					return n, err
-				}
-				n++
-			}
-			nn, err := w.w.Write(frag)
-			n += nn
-			if err != nil {
-				return n, err
-			}
-		}
-		return n, nil
-	}
-
-	for i, frag := range frags {
-		if w.complete {
-			w.writeIndent()
-		}
-		nn, err := w.w.Write(frag)
-		n += nn
-		if err != nil {
-			return n, err
-		}
-		if i+1 < len(frags) {
-			if err := w.w.WriteByte('\n'); err != nil {
-				return n, err
-			}
-			n++
-		}
-	}
-	w.complete = len(frags[len(frags)-1]) == 0
-	return n, nil
-}
-
-func (w *textWriter) WriteByte(c byte) error {
-	if w.compact && c == '\n' {
-		c = ' '
-	}
-	if !w.compact && w.complete {
-		w.writeIndent()
-	}
-	err := w.w.WriteByte(c)
-	w.complete = c == '\n'
-	return err
-}
-
-func (w *textWriter) indent() { w.ind++ }
-
-func (w *textWriter) unindent() {
-	if w.ind == 0 {
-		log.Printf("proto: textWriter unindented too far")
-		return
-	}
-	w.ind--
-}
-
-func writeName(w *textWriter, props *Properties) error {
-	if _, err := w.WriteString(props.OrigName); err != nil {
-		return err
-	}
-	if props.Wire != "group" {
-		return w.WriteByte(':')
-	}
-	return nil
-}
-
-// raw is the interface satisfied by RawMessage.
-type raw interface {
-	Bytes() []byte
-}
-
-func writeStruct(w *textWriter, sv reflect.Value) error {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < sv.NumField(); i++ {
-		fv := sv.Field(i)
-		props := sprops.Prop[i]
-		name := st.Field(i).Name
-
-		if strings.HasPrefix(name, "XXX_") {
-			// There are two XXX_ fields:
-			//   XXX_unrecognized []byte
-			//   XXX_extensions   map[int32]proto.Extension
-			// The first is handled here;
-			// the second is handled at the bottom of this function.
-			if name == "XXX_unrecognized" && !fv.IsNil() {
-				if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Ptr && fv.IsNil() {
-			// Field not filled in. This could be an optional field or
-			// a required field that wasn't filled in. Either way, there
-			// isn't anything we can show for it.
-			continue
-		}
-		if fv.Kind() == reflect.Slice && fv.IsNil() {
-			// Repeated field that is empty, or a bytes field that is unused.
-			continue
-		}
-
-		if props.Repeated && fv.Kind() == reflect.Slice {
-			// Repeated field.
-			for j := 0; j < fv.Len(); j++ {
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				v := fv.Index(j)
-				if v.Kind() == reflect.Ptr && v.IsNil() {
-					// A nil message in a repeated field is not valid,
-					// but we can handle that more gracefully than panicking.
-					if _, err := w.Write([]byte("<nil>\n")); err != nil {
-						return err
-					}
-					continue
-				}
-				if err := writeAny(w, v, props); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Map {
-			// Map fields are rendered as a repeated struct with key/value fields.
-			keys := fv.MapKeys()
-			sort.Sort(mapKeys(keys))
-			for _, key := range keys {
-				val := fv.MapIndex(key)
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				// open struct
-				if err := w.WriteByte('<'); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				w.indent()
-				// key
-				if _, err := w.WriteString("key:"); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				if err := writeAny(w, key, props.mkeyprop); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-				// nil values aren't legal, but we can avoid panicking because of them.
-				if val.Kind() != reflect.Ptr || !val.IsNil() {
-					// value
-					if _, err := w.WriteString("value:"); err != nil {
-						return err
-					}
-					if !w.compact {
-						if err := w.WriteByte(' '); err != nil {
-							return err
-						}
-					}
-					if err := writeAny(w, val, props.mvalprop); err != nil {
-						return err
-					}
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				// close struct
-				w.unindent()
-				if err := w.WriteByte('>'); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
-			// empty bytes field
-			continue
-		}
-		if fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
-			// proto3 non-repeated scalar field; skip if zero value
-			if isProto3Zero(fv) {
-				continue
-			}
-		}
-
-		if fv.Kind() == reflect.Interface {
-			// Check if it is a oneof.
-			if st.Field(i).Tag.Get("protobuf_oneof") != "" {
-				// fv is nil, or holds a pointer to generated struct.
-				// That generated struct has exactly one field,
-				// which has a protobuf struct tag.
-				if fv.IsNil() {
-					continue
-				}
-				inner := fv.Elem().Elem() // interface -> *T -> T
-				tag := inner.Type().Field(0).Tag.Get("protobuf")
-				props = new(Properties) // Overwrite the outer props var, but not its pointee.
-				props.Parse(tag)
-				// Write the value in the oneof, not the oneof itself.
-				fv = inner.Field(0)
-
-				// Special case to cope with malformed messages gracefully:
-				// If the value in the oneof is a nil pointer, don't panic
-				// in writeAny.
-				if fv.Kind() == reflect.Ptr && fv.IsNil() {
-					// Use errors.New so writeAny won't render quotes.
-					msg := errors.New("/* nil */")
-					fv = reflect.ValueOf(&msg).Elem()
-				}
-			}
-		}
-
-		if err := writeName(w, props); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		if b, ok := fv.Interface().(raw); ok {
-			if err := writeRaw(w, b.Bytes()); err != nil {
-				return err
-			}
-			continue
-		}
-
-		// Enums have a String method, so writeAny will work fine.
-		if err := writeAny(w, fv, props); err != nil {
-			return err
-		}
-
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-
-	// Extensions (the XXX_extensions field).
-	pv := sv.Addr()
-	if pv.Type().Implements(extendableProtoType) {
-		if err := writeExtensions(w, pv); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// writeRaw writes an uninterpreted raw message.
-func writeRaw(w *textWriter, b []byte) error {
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	w.indent()
-	if err := writeUnknownStruct(w, b); err != nil {
-		return err
-	}
-	w.unindent()
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-	return nil
-}
-
-// writeAny writes an arbitrary field.
-func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
-	v = reflect.Indirect(v)
-
-	// Floats have special cases.
-	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
-		x := v.Float()
-		var b []byte
-		switch {
-		case math.IsInf(x, 1):
-			b = posInf
-		case math.IsInf(x, -1):
-			b = negInf
-		case math.IsNaN(x):
-			b = nan
-		}
-		if b != nil {
-			_, err := w.Write(b)
-			return err
-		}
-		// Other values are handled below.
-	}
-
-	// We don't attempt to serialise every possible value type; only those
-	// that can occur in protocol buffers.
-	switch v.Kind() {
-	case reflect.Slice:
-		// Should only be a []byte; repeated fields are handled in writeStruct.
-		if err := writeString(w, string(v.Interface().([]byte))); err != nil {
-			return err
-		}
-	case reflect.String:
-		if err := writeString(w, v.String()); err != nil {
-			return err
-		}
-	case reflect.Struct:
-		// Required/optional group/message.
-		var bra, ket byte = '<', '>'
-		if props != nil && props.Wire == "group" {
-			bra, ket = '{', '}'
-		}
-		if err := w.WriteByte(bra); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte('\n'); err != nil {
-				return err
-			}
-		}
-		w.indent()
-		if tm, ok := v.Interface().(encoding.TextMarshaler); ok {
-			text, err := tm.MarshalText()
-			if err != nil {
-				return err
-			}
-			if _, err = w.Write(text); err != nil {
-				return err
-			}
-		} else if err := writeStruct(w, v); err != nil {
-			return err
-		}
-		w.unindent()
-		if err := w.WriteByte(ket); err != nil {
-			return err
-		}
-	default:
-		_, err := fmt.Fprint(w, v.Interface())
-		return err
-	}
-	return nil
-}
-
-// equivalent to C's isprint.
-func isprint(c byte) bool {
-	return c >= 0x20 && c < 0x7f
-}
-
-// writeString writes a string in the protocol buffer text format.
-// It is similar to strconv.Quote except we don't use Go escape sequences,
-// we treat the string as a byte sequence, and we use octal escapes.
-// These differences are to maintain interoperability with the other
-// languages' implementations of the text format.
-func writeString(w *textWriter, s string) error {
-	// use WriteByte here to get any needed indent
-	if err := w.WriteByte('"'); err != nil {
-		return err
-	}
-	// Loop over the bytes, not the runes.
-	for i := 0; i < len(s); i++ {
-		var err error
-		// Divergence from C++: we don't escape apostrophes.
-		// There's no need to escape them, and the C++ parser
-		// copes with a naked apostrophe.
-		switch c := s[i]; c {
-		case '\n':
-			_, err = w.w.Write(backslashN)
-		case '\r':
-			_, err = w.w.Write(backslashR)
-		case '\t':
-			_, err = w.w.Write(backslashT)
-		case '"':
-			_, err = w.w.Write(backslashDQ)
-		case '\\':
-			_, err = w.w.Write(backslashBS)
-		default:
-			if isprint(c) {
-				err = w.w.WriteByte(c)
-			} else {
-				_, err = fmt.Fprintf(w.w, "\\%03o", c)
-			}
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return w.WriteByte('"')
-}
-
-func writeUnknownStruct(w *textWriter, data []byte) (err error) {
-	if !w.compact {
-		if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
-			return err
-		}
-	}
-	b := NewBuffer(data)
-	for b.index < len(b.buf) {
-		x, err := b.DecodeVarint()
-		if err != nil {
-			_, err := fmt.Fprintf(w, "/* %v */\n", err)
-			return err
-		}
-		wire, tag := x&7, x>>3
-		if wire == WireEndGroup {
-			w.unindent()
-			if _, err := w.Write(endBraceNewline); err != nil {
-				return err
-			}
-			continue
-		}
-		if _, err := fmt.Fprint(w, tag); err != nil {
-			return err
-		}
-		if wire != WireStartGroup {
-			if err := w.WriteByte(':'); err != nil {
-				return err
-			}
-		}
-		if !w.compact || wire == WireStartGroup {
-			if err := w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		switch wire {
-		case WireBytes:
-			buf, e := b.DecodeRawBytes(false)
-			if e == nil {
-				_, err = fmt.Fprintf(w, "%q", buf)
-			} else {
-				_, err = fmt.Fprintf(w, "/* %v */", e)
-			}
-		case WireFixed32:
-			x, err = b.DecodeFixed32()
-			err = writeUnknownInt(w, x, err)
-		case WireFixed64:
-			x, err = b.DecodeFixed64()
-			err = writeUnknownInt(w, x, err)
-		case WireStartGroup:
-			err = w.WriteByte('{')
-			w.indent()
-		case WireVarint:
-			x, err = b.DecodeVarint()
-			err = writeUnknownInt(w, x, err)
-		default:
-			_, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
-		}
-		if err != nil {
-			return err
-		}
-		if err = w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func writeUnknownInt(w *textWriter, x uint64, err error) error {
-	if err == nil {
-		_, err = fmt.Fprint(w, x)
-	} else {
-		_, err = fmt.Fprintf(w, "/* %v */", err)
-	}
-	return err
-}
-
-type int32Slice []int32
-
-func (s int32Slice) Len() int           { return len(s) }
-func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// writeExtensions writes all the extensions in pv.
-// pv is assumed to be a pointer to a protocol message struct that is extendable.
-func writeExtensions(w *textWriter, pv reflect.Value) error {
-	emap := extensionMaps[pv.Type().Elem()]
-	ep := pv.Interface().(extendableProto)
-
-	// Order the extensions by ID.
-	// This isn't strictly necessary, but it will give us
-	// canonical output, which will also make testing easier.
-	m := ep.ExtensionMap()
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids))
-
-	for _, extNum := range ids {
-		ext := m[extNum]
-		var desc *ExtensionDesc
-		if emap != nil {
-			desc = emap[extNum]
-		}
-		if desc == nil {
-			// Unknown extension.
-			if err := writeUnknownStruct(w, ext.enc); err != nil {
-				return err
-			}
-			continue
-		}
-
-		pb, err := GetExtension(ep, desc)
-		if err != nil {
-			return fmt.Errorf("failed getting extension: %v", err)
-		}
-
-		// Repeated extensions will appear as a slice.
-		if !desc.repeated() {
-			if err := writeExtension(w, desc.Name, pb); err != nil {
-				return err
-			}
-		} else {
-			v := reflect.ValueOf(pb)
-			for i := 0; i < v.Len(); i++ {
-				if err := writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func writeExtension(w *textWriter, name string, pb interface{}) error {
-	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte(' '); err != nil {
-			return err
-		}
-	}
-	if err := writeAny(w, reflect.ValueOf(pb), nil); err != nil {
-		return err
-	}
-	if err := w.WriteByte('\n'); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (w *textWriter) writeIndent() {
-	if !w.complete {
-		return
-	}
-	remain := w.ind * 2
-	for remain > 0 {
-		n := remain
-		if n > len(spaces) {
-			n = len(spaces)
-		}
-		w.w.Write(spaces[:n])
-		remain -= n
-	}
-	w.complete = false
-}
-
-func marshalText(w io.Writer, pb Message, compact bool) error {
-	val := reflect.ValueOf(pb)
-	if pb == nil || val.IsNil() {
-		w.Write([]byte("<nil>"))
-		return nil
-	}
-	var bw *bufio.Writer
-	ww, ok := w.(writer)
-	if !ok {
-		bw = bufio.NewWriter(w)
-		ww = bw
-	}
-	aw := &textWriter{
-		w:        ww,
-		complete: true,
-		compact:  compact,
-	}
-
-	if tm, ok := pb.(encoding.TextMarshaler); ok {
-		text, err := tm.MarshalText()
-		if err != nil {
-			return err
-		}
-		if _, err = aw.Write(text); err != nil {
-			return err
-		}
-		if bw != nil {
-			return bw.Flush()
-		}
-		return nil
-	}
-	// Dereference the received pointer so we don't have outer < and >.
-	v := reflect.Indirect(val)
-	if err := writeStruct(aw, v); err != nil {
-		return err
-	}
-	if bw != nil {
-		return bw.Flush()
-	}
-	return nil
-}
-
-// MarshalText writes a given protocol buffer in text format.
-// The only errors returned are from w.
-func MarshalText(w io.Writer, pb Message) error {
-	return marshalText(w, pb, false)
-}
-
-// MarshalTextString is the same as MarshalText, but returns the string directly.
-func MarshalTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, false)
-	return buf.String()
-}
-
-// CompactText writes a given protocol buffer in compact text format (one line).
-func CompactText(w io.Writer, pb Message) error { return marshalText(w, pb, true) }
-
-// CompactTextString is the same as CompactText, but returns the string directly.
-func CompactTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, true)
-	return buf.String()
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go
deleted file mode 100644
index 6d0cf25894..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go
+++ /dev/null
@@ -1,798 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-// Functions for parsing the Text protocol buffer format.
-// TODO: message sets.
-
-import (
-	"encoding"
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type ParseError struct {
-	Message string
-	Line    int // 1-based line number
-	Offset  int // 0-based byte offset from start of input
-}
-
-func (p *ParseError) Error() string {
-	if p.Line == 1 {
-		// show offset only for first line
-		return fmt.Sprintf("line 1.%d: %v", p.Offset, p.Message)
-	}
-	return fmt.Sprintf("line %d: %v", p.Line, p.Message)
-}
-
-type token struct {
-	value    string
-	err      *ParseError
-	line     int    // line number
-	offset   int    // byte number from start of input, not start of line
-	unquoted string // the unquoted version of value, if it was a quoted string
-}
-
-func (t *token) String() string {
-	if t.err == nil {
-		return fmt.Sprintf("%q (line=%d, offset=%d)", t.value, t.line, t.offset)
-	}
-	return fmt.Sprintf("parse error: %v", t.err)
-}
-
-type textParser struct {
-	s            string // remaining input
-	done         bool   // whether the parsing is finished (success or error)
-	backed       bool   // whether back() was called
-	offset, line int
-	cur          token
-}
-
-func newTextParser(s string) *textParser {
-	p := new(textParser)
-	p.s = s
-	p.line = 1
-	p.cur.line = 1
-	return p
-}
-
-func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
-	pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
-	p.cur.err = pe
-	p.done = true
-	return pe
-}
-
-// Numbers and identifiers are matched by [-+._A-Za-z0-9]
-func isIdentOrNumberChar(c byte) bool {
-	switch {
-	case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
-		return true
-	case '0' <= c && c <= '9':
-		return true
-	}
-	switch c {
-	case '-', '+', '.', '_':
-		return true
-	}
-	return false
-}
-
-func isWhitespace(c byte) bool {
-	switch c {
-	case ' ', '\t', '\n', '\r':
-		return true
-	}
-	return false
-}
-
-func (p *textParser) skipWhitespace() {
-	i := 0
-	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
-		if p.s[i] == '#' {
-			// comment; skip to end of line or input
-			for i < len(p.s) && p.s[i] != '\n' {
-				i++
-			}
-			if i == len(p.s) {
-				break
-			}
-		}
-		if p.s[i] == '\n' {
-			p.line++
-		}
-		i++
-	}
-	p.offset += i
-	p.s = p.s[i:len(p.s)]
-	if len(p.s) == 0 {
-		p.done = true
-	}
-}
-
-func (p *textParser) advance() {
-	// Skip whitespace
-	p.skipWhitespace()
-	if p.done {
-		return
-	}
-
-	// Start of non-whitespace
-	p.cur.err = nil
-	p.cur.offset, p.cur.line = p.offset, p.line
-	p.cur.unquoted = ""
-	switch p.s[0] {
-	case '<', '>', '{', '}', ':', '[', ']', ';', ',':
-		// Single symbol
-		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
-	case '"', '\'':
-		// Quoted string
-		i := 1
-		for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
-			if p.s[i] == '\\' && i+1 < len(p.s) {
-				// skip escaped char
-				i++
-			}
-			i++
-		}
-		if i >= len(p.s) || p.s[i] != p.s[0] {
-			p.errorf("unmatched quote")
-			return
-		}
-		unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
-		if err != nil {
-			p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
-			return
-		}
-		p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
-		p.cur.unquoted = unq
-	default:
-		i := 0
-		for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
-			i++
-		}
-		if i == 0 {
-			p.errorf("unexpected byte %#x", p.s[0])
-			return
-		}
-		p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
-	}
-	p.offset += len(p.cur.value)
-}
-
-var (
-	errBadUTF8 = errors.New("proto: bad UTF-8")
-	errBadHex  = errors.New("proto: bad hexadecimal")
-)
-
-func unquoteC(s string, quote rune) (string, error) {
-	// This is based on C++'s tokenizer.cc.
-	// Despite its name, this is *not* parsing C syntax.
-	// For instance, "\0" is an invalid quoted string.
-
-	// Avoid allocation in trivial cases.
-	simple := true
-	for _, r := range s {
-		if r == '\\' || r == quote {
-			simple = false
-			break
-		}
-	}
-	if simple {
-		return s, nil
-	}
-
-	buf := make([]byte, 0, 3*len(s)/2)
-	for len(s) > 0 {
-		r, n := utf8.DecodeRuneInString(s)
-		if r == utf8.RuneError && n == 1 {
-			return "", errBadUTF8
-		}
-		s = s[n:]
-		if r != '\\' {
-			if r < utf8.RuneSelf {
-				buf = append(buf, byte(r))
-			} else {
-				buf = append(buf, string(r)...)
-			}
-			continue
-		}
-
-		ch, tail, err := unescape(s)
-		if err != nil {
-			return "", err
-		}
-		buf = append(buf, ch...)
-		s = tail
-	}
-	return string(buf), nil
-}
-
-func unescape(s string) (ch string, tail string, err error) {
-	r, n := utf8.DecodeRuneInString(s)
-	if r == utf8.RuneError && n == 1 {
-		return "", "", errBadUTF8
-	}
-	s = s[n:]
-	switch r {
-	case 'a':
-		return "\a", s, nil
-	case 'b':
-		return "\b", s, nil
-	case 'f':
-		return "\f", s, nil
-	case 'n':
-		return "\n", s, nil
-	case 'r':
-		return "\r", s, nil
-	case 't':
-		return "\t", s, nil
-	case 'v':
-		return "\v", s, nil
-	case '?':
-		return "?", s, nil // trigraph workaround
-	case '\'', '"', '\\':
-		return string(r), s, nil
-	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
-		if len(s) < 2 {
-			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
-		}
-		base := 8
-		ss := s[:2]
-		s = s[2:]
-		if r == 'x' || r == 'X' {
-			base = 16
-		} else {
-			ss = string(r) + ss
-		}
-		i, err := strconv.ParseUint(ss, base, 8)
-		if err != nil {
-			return "", "", err
-		}
-		return string([]byte{byte(i)}), s, nil
-	case 'u', 'U':
-		n := 4
-		if r == 'U' {
-			n = 8
-		}
-		if len(s) < n {
-			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
-		}
-
-		bs := make([]byte, n/2)
-		for i := 0; i < n; i += 2 {
-			a, ok1 := unhex(s[i])
-			b, ok2 := unhex(s[i+1])
-			if !ok1 || !ok2 {
-				return "", "", errBadHex
-			}
-			bs[i/2] = a<<4 | b
-		}
-		s = s[n:]
-		return string(bs), s, nil
-	}
-	return "", "", fmt.Errorf(`unknown escape \%c`, r)
-}
-
-// Adapted from src/pkg/strconv/quote.go.
-func unhex(b byte) (v byte, ok bool) {
-	switch {
-	case '0' <= b && b <= '9':
-		return b - '0', true
-	case 'a' <= b && b <= 'f':
-		return b - 'a' + 10, true
-	case 'A' <= b && b <= 'F':
-		return b - 'A' + 10, true
-	}
-	return 0, false
-}
-
-// Back off the parser by one token. Can only be done between calls to next().
-// It makes the next advance() a no-op.
-func (p *textParser) back() { p.backed = true }
-
-// Advances the parser and returns the new current token.
-func (p *textParser) next() *token {
-	if p.backed || p.done {
-		p.backed = false
-		return &p.cur
-	}
-	p.advance()
-	if p.done {
-		p.cur.value = ""
-	} else if len(p.cur.value) > 0 && p.cur.value[0] == '"' {
-		// Look for multiple quoted strings separated by whitespace,
-		// and concatenate them.
-		cat := p.cur
-		for {
-			p.skipWhitespace()
-			if p.done || p.s[0] != '"' {
-				break
-			}
-			p.advance()
-			if p.cur.err != nil {
-				return &p.cur
-			}
-			cat.value += " " + p.cur.value
-			cat.unquoted += p.cur.unquoted
-		}
-		p.done = false // parser may have seen EOF, but we want to return cat
-		p.cur = cat
-	}
-	return &p.cur
-}
-
-func (p *textParser) consumeToken(s string) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != s {
-		p.back()
-		return p.errorf("expected %q, found %q", s, tok.value)
-	}
-	return nil
-}
-
-// Return a RequiredNotSetError indicating which required field was not set.
-func (p *textParser) missingRequiredFieldError(sv reflect.Value) *RequiredNotSetError {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < st.NumField(); i++ {
-		if !isNil(sv.Field(i)) {
-			continue
-		}
-
-		props := sprops.Prop[i]
-		if props.Required {
-			return &RequiredNotSetError{fmt.Sprintf("%v.%v", st, props.OrigName)}
-		}
-	}
-	return &RequiredNotSetError{fmt.Sprintf("%v.<unknown field name>", st)} // should not happen
-}
-
-// Returns the index in the struct for the named field, as well as the parsed tag properties.
-func structFieldByName(sprops *StructProperties, name string) (int, *Properties, bool) {
-	i, ok := sprops.decoderOrigNames[name]
-	if ok {
-		return i, sprops.Prop[i], true
-	}
-	return -1, nil, false
-}
-
-// Consume a ':' from the input stream (if the next token is a colon),
-// returning an error if a colon is needed but not present.
-func (p *textParser) checkForColon(props *Properties, typ reflect.Type) *ParseError {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ":" {
-		// Colon is optional when the field is a group or message.
-		needColon := true
-		switch props.Wire {
-		case "group":
-			needColon = false
-		case "bytes":
-			// A "bytes" field is either a message, a string, or a repeated field;
-			// those three become *T, *string and []T respectively, so we can check for
-			// this field being a pointer to a non-string.
-			if typ.Kind() == reflect.Ptr {
-				// *T or *string
-				if typ.Elem().Kind() == reflect.String {
-					break
-				}
-			} else if typ.Kind() == reflect.Slice {
-				// []T or []*T
-				if typ.Elem().Kind() != reflect.Ptr {
-					break
-				}
-			} else if typ.Kind() == reflect.String {
-				// The proto3 exception is for a string field,
-				// which requires a colon.
-				break
-			}
-			needColon = false
-		}
-		if needColon {
-			return p.errorf("expected ':', found %q", tok.value)
-		}
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	reqCount := sprops.reqCount
-	var reqFieldErr error
-	fieldSet := make(map[string]bool)
-	// A struct is a sequence of "name: value", terminated by one of
-	// '>' or '}', or the end of the input.  A name may also be
-	// "[extension]".
-	for {
-		tok := p.next()
-		if tok.err != nil {
-			return tok.err
-		}
-		if tok.value == terminator {
-			break
-		}
-		if tok.value == "[" {
-			// Looks like an extension.
-			//
-			// TODO: Check whether we need to handle
-			// namespace rooted names (e.g. ".something.Foo").
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
-			}
-			var desc *ExtensionDesc
-			// This could be faster, but it's functional.
-			// TODO: Do something smarter than a linear scan.
-			for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
-				if d.Name == tok.value {
-					desc = d
-					break
-				}
-			}
-			if desc == nil {
-				return p.errorf("unrecognized extension %q", tok.value)
-			}
-			// Check the extension terminator.
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
-			}
-			if tok.value != "]" {
-				return p.errorf("unrecognized extension terminator %q", tok.value)
-			}
-
-			props := &Properties{}
-			props.Parse(desc.Tag)
-
-			typ := reflect.TypeOf(desc.ExtensionType)
-			if err := p.checkForColon(props, typ); err != nil {
-				return err
-			}
-
-			rep := desc.repeated()
-
-			// Read the extension structure, and set it in
-			// the value we're constructing.
-			var ext reflect.Value
-			if !rep {
-				ext = reflect.New(typ).Elem()
-			} else {
-				ext = reflect.New(typ.Elem()).Elem()
-			}
-			if err := p.readAny(ext, props); err != nil {
-				if _, ok := err.(*RequiredNotSetError); !ok {
-					return err
-				}
-				reqFieldErr = err
-			}
-			ep := sv.Addr().Interface().(extendableProto)
-			if !rep {
-				SetExtension(ep, desc, ext.Interface())
-			} else {
-				old, err := GetExtension(ep, desc)
-				var sl reflect.Value
-				if err == nil {
-					sl = reflect.ValueOf(old) // existing slice
-				} else {
-					sl = reflect.MakeSlice(typ, 0, 1)
-				}
-				sl = reflect.Append(sl, ext)
-				SetExtension(ep, desc, sl.Interface())
-			}
-			if err := p.consumeOptionalSeparator(); err != nil {
-				return err
-			}
-			continue
-		}
-
-		// This is a normal, non-extension field.
-		name := tok.value
-		var dst reflect.Value
-		fi, props, ok := structFieldByName(sprops, name)
-		if ok {
-			dst = sv.Field(fi)
-		} else if oop, ok := sprops.OneofTypes[name]; ok {
-			// It is a oneof.
-			props = oop.Prop
-			nv := reflect.New(oop.Type.Elem())
-			dst = nv.Elem().Field(0)
-			sv.Field(oop.Field).Set(nv)
-		}
-		if !dst.IsValid() {
-			return p.errorf("unknown field name %q in %v", name, st)
-		}
-
-		if dst.Kind() == reflect.Map {
-			// Consume any colon.
-			if err := p.checkForColon(props, dst.Type()); err != nil {
-				return err
-			}
-
-			// Construct the map if it doesn't already exist.
-			if dst.IsNil() {
-				dst.Set(reflect.MakeMap(dst.Type()))
-			}
-			key := reflect.New(dst.Type().Key()).Elem()
-			val := reflect.New(dst.Type().Elem()).Elem()
-
-			// The map entry should be this sequence of tokens:
-			//	< key : KEY value : VALUE >
-			// Technically the "key" and "value" could come in any order,
-			// but in practice they won't.
-
-			tok := p.next()
-			var terminator string
-			switch tok.value {
-			case "<":
-				terminator = ">"
-			case "{":
-				terminator = "}"
-			default:
-				return p.errorf("expected '{' or '<', found %q", tok.value)
-			}
-			if err := p.consumeToken("key"); err != nil {
-				return err
-			}
-			if err := p.consumeToken(":"); err != nil {
-				return err
-			}
-			if err := p.readAny(key, props.mkeyprop); err != nil {
-				return err
-			}
-			if err := p.consumeOptionalSeparator(); err != nil {
-				return err
-			}
-			if err := p.consumeToken("value"); err != nil {
-				return err
-			}
-			if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
-				return err
-			}
-			if err := p.readAny(val, props.mvalprop); err != nil {
-				return err
-			}
-			if err := p.consumeOptionalSeparator(); err != nil {
-				return err
-			}
-			if err := p.consumeToken(terminator); err != nil {
-				return err
-			}
-
-			dst.SetMapIndex(key, val)
-			continue
-		}
-
-		// Check that it's not already set if it's not a repeated field.
-		if !props.Repeated && fieldSet[name] {
-			return p.errorf("non-repeated field %q was repeated", name)
-		}
-
-		if err := p.checkForColon(props, dst.Type()); err != nil {
-			return err
-		}
-
-		// Parse into the field.
-		fieldSet[name] = true
-		if err := p.readAny(dst, props); err != nil {
-			if _, ok := err.(*RequiredNotSetError); !ok {
-				return err
-			}
-			reqFieldErr = err
-		} else if props.Required {
-			reqCount--
-		}
-
-		if err := p.consumeOptionalSeparator(); err != nil {
-			return err
-		}
-
-	}
-
-	if reqCount > 0 {
-		return p.missingRequiredFieldError(sv)
-	}
-	return reqFieldErr
-}
-
-// consumeOptionalSeparator consumes an optional semicolon or comma.
-// It is used in readStruct to provide backward compatibility.
-func (p *textParser) consumeOptionalSeparator() error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ";" && tok.value != "," {
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readAny(v reflect.Value, props *Properties) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value == "" {
-		return p.errorf("unexpected EOF")
-	}
-
-	switch fv := v; fv.Kind() {
-	case reflect.Slice:
-		at := v.Type()
-		if at.Elem().Kind() == reflect.Uint8 {
-			// Special case for []byte
-			if tok.value[0] != '"' && tok.value[0] != '\'' {
-				// Deliberately written out here, as the error after
-				// this switch statement would write "invalid []byte: ...",
-				// which is not as user-friendly.
-				return p.errorf("invalid string: %v", tok.value)
-			}
-			bytes := []byte(tok.unquoted)
-			fv.Set(reflect.ValueOf(bytes))
-			return nil
-		}
-		// Repeated field.
-		if tok.value == "[" {
-			// Repeated field with list notation, like [1,2,3].
-			for {
-				fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
-				err := p.readAny(fv.Index(fv.Len()-1), props)
-				if err != nil {
-					return err
-				}
-				tok := p.next()
-				if tok.err != nil {
-					return tok.err
-				}
-				if tok.value == "]" {
-					break
-				}
-				if tok.value != "," {
-					return p.errorf("Expected ']' or ',' found %q", tok.value)
-				}
-			}
-			return nil
-		}
-		// One value of the repeated field.
-		p.back()
-		fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
-		return p.readAny(fv.Index(fv.Len()-1), props)
-	case reflect.Bool:
-		// Either "true", "false", 1 or 0.
-		switch tok.value {
-		case "true", "1":
-			fv.SetBool(true)
-			return nil
-		case "false", "0":
-			fv.SetBool(false)
-			return nil
-		}
-	case reflect.Float32, reflect.Float64:
-		v := tok.value
-		// Ignore 'f' for compatibility with output generated by C++, but don't
-		// remove 'f' when the value is "-inf" or "inf".
-		if strings.HasSuffix(v, "f") && tok.value != "-inf" && tok.value != "inf" {
-			v = v[:len(v)-1]
-		}
-		if f, err := strconv.ParseFloat(v, fv.Type().Bits()); err == nil {
-			fv.SetFloat(f)
-			return nil
-		}
-	case reflect.Int32:
-		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-		if len(props.Enum) == 0 {
-			break
-		}
-		m, ok := enumValueMaps[props.Enum]
-		if !ok {
-			break
-		}
-		x, ok := m[tok.value]
-		if !ok {
-			break
-		}
-		fv.SetInt(int64(x))
-		return nil
-	case reflect.Int64:
-		if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-	case reflect.Ptr:
-		// A basic field (indirected through pointer), or a repeated message/group
-		p.back()
-		fv.Set(reflect.New(fv.Type().Elem()))
-		return p.readAny(fv.Elem(), props)
-	case reflect.String:
-		if tok.value[0] == '"' || tok.value[0] == '\'' {
-			fv.SetString(tok.unquoted)
-			return nil
-		}
-	case reflect.Struct:
-		var terminator string
-		switch tok.value {
-		case "{":
-			terminator = "}"
-		case "<":
-			terminator = ">"
-		default:
-			return p.errorf("expected '{' or '<', found %q", tok.value)
-		}
-		// TODO: Handle nested messages which implement encoding.TextUnmarshaler.
-		return p.readStruct(fv, terminator)
-	case reflect.Uint32:
-		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
-			fv.SetUint(uint64(x))
-			return nil
-		}
-	case reflect.Uint64:
-		if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
-			fv.SetUint(x)
-			return nil
-		}
-	}
-	return p.errorf("invalid %v: %v", v.Type(), tok.value)
-}
-
-// UnmarshalText reads a protocol buffer in Text format. UnmarshalText resets pb
-// before starting to unmarshal, so any existing data in pb is always removed.
-// If a required field is not set and no other error occurs,
-// UnmarshalText returns *RequiredNotSetError.
-func UnmarshalText(s string, pb Message) error {
-	if um, ok := pb.(encoding.TextUnmarshaler); ok {
-		err := um.UnmarshalText([]byte(s))
-		return err
-	}
-	pb.Reset()
-	v := reflect.ValueOf(pb)
-	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
-		return pe
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile
deleted file mode 100644
index a42cc3717f..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-test:
-	cd testdata && make test
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
deleted file mode 100644
index 4942418e32..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Not stored here, but descriptor.proto is in https://github.com/google/protobuf/
-# at src/google/protobuf/descriptor.proto
-regenerate:
-	echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
-	protoc --go_out=. -I$(HOME)/src/protobuf/src $(HOME)/src/protobuf/src/google/protobuf/descriptor.proto && \
-		sed 's,^package google_protobuf,package descriptor,' google/protobuf/descriptor.pb.go > \
-		$(GOPATH)/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go && \
-		rm -f google/protobuf/descriptor.pb.go
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
deleted file mode 100644
index 6a3be28eb6..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
+++ /dev/null
@@ -1,1812 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google/protobuf/descriptor.proto
-// DO NOT EDIT!
-
-/*
-Package google_protobuf is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/descriptor.proto
-
-It has these top-level messages:
-	FileDescriptorSet
-	FileDescriptorProto
-	DescriptorProto
-	FieldDescriptorProto
-	OneofDescriptorProto
-	EnumDescriptorProto
-	EnumValueDescriptorProto
-	ServiceDescriptorProto
-	MethodDescriptorProto
-	FileOptions
-	MessageOptions
-	FieldOptions
-	EnumOptions
-	EnumValueOptions
-	ServiceOptions
-	MethodOptions
-	UninterpretedOption
-	SourceCodeInfo
-*/
-package descriptor
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
-
-type FieldDescriptorProto_Type int32
-
-const (
-	// 0 is reserved for errors.
-	// Order is weird for historical reasons.
-	FieldDescriptorProto_TYPE_DOUBLE FieldDescriptorProto_Type = 1
-	FieldDescriptorProto_TYPE_FLOAT  FieldDescriptorProto_Type = 2
-	// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
-	// negative values are likely.
-	FieldDescriptorProto_TYPE_INT64  FieldDescriptorProto_Type = 3
-	FieldDescriptorProto_TYPE_UINT64 FieldDescriptorProto_Type = 4
-	// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
-	// negative values are likely.
-	FieldDescriptorProto_TYPE_INT32   FieldDescriptorProto_Type = 5
-	FieldDescriptorProto_TYPE_FIXED64 FieldDescriptorProto_Type = 6
-	FieldDescriptorProto_TYPE_FIXED32 FieldDescriptorProto_Type = 7
-	FieldDescriptorProto_TYPE_BOOL    FieldDescriptorProto_Type = 8
-	FieldDescriptorProto_TYPE_STRING  FieldDescriptorProto_Type = 9
-	FieldDescriptorProto_TYPE_GROUP   FieldDescriptorProto_Type = 10
-	FieldDescriptorProto_TYPE_MESSAGE FieldDescriptorProto_Type = 11
-	// New in version 2.
-	FieldDescriptorProto_TYPE_BYTES    FieldDescriptorProto_Type = 12
-	FieldDescriptorProto_TYPE_UINT32   FieldDescriptorProto_Type = 13
-	FieldDescriptorProto_TYPE_ENUM     FieldDescriptorProto_Type = 14
-	FieldDescriptorProto_TYPE_SFIXED32 FieldDescriptorProto_Type = 15
-	FieldDescriptorProto_TYPE_SFIXED64 FieldDescriptorProto_Type = 16
-	FieldDescriptorProto_TYPE_SINT32   FieldDescriptorProto_Type = 17
-	FieldDescriptorProto_TYPE_SINT64   FieldDescriptorProto_Type = 18
-)
-
-var FieldDescriptorProto_Type_name = map[int32]string{
-	1:  "TYPE_DOUBLE",
-	2:  "TYPE_FLOAT",
-	3:  "TYPE_INT64",
-	4:  "TYPE_UINT64",
-	5:  "TYPE_INT32",
-	6:  "TYPE_FIXED64",
-	7:  "TYPE_FIXED32",
-	8:  "TYPE_BOOL",
-	9:  "TYPE_STRING",
-	10: "TYPE_GROUP",
-	11: "TYPE_MESSAGE",
-	12: "TYPE_BYTES",
-	13: "TYPE_UINT32",
-	14: "TYPE_ENUM",
-	15: "TYPE_SFIXED32",
-	16: "TYPE_SFIXED64",
-	17: "TYPE_SINT32",
-	18: "TYPE_SINT64",
-}
-var FieldDescriptorProto_Type_value = map[string]int32{
-	"TYPE_DOUBLE":   1,
-	"TYPE_FLOAT":    2,
-	"TYPE_INT64":    3,
-	"TYPE_UINT64":   4,
-	"TYPE_INT32":    5,
-	"TYPE_FIXED64":  6,
-	"TYPE_FIXED32":  7,
-	"TYPE_BOOL":     8,
-	"TYPE_STRING":   9,
-	"TYPE_GROUP":    10,
-	"TYPE_MESSAGE":  11,
-	"TYPE_BYTES":    12,
-	"TYPE_UINT32":   13,
-	"TYPE_ENUM":     14,
-	"TYPE_SFIXED32": 15,
-	"TYPE_SFIXED64": 16,
-	"TYPE_SINT32":   17,
-	"TYPE_SINT64":   18,
-}
-
-func (x FieldDescriptorProto_Type) Enum() *FieldDescriptorProto_Type {
-	p := new(FieldDescriptorProto_Type)
-	*p = x
-	return p
-}
-func (x FieldDescriptorProto_Type) String() string {
-	return proto.EnumName(FieldDescriptorProto_Type_name, int32(x))
-}
-func (x *FieldDescriptorProto_Type) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Type_value, data, "FieldDescriptorProto_Type")
-	if err != nil {
-		return err
-	}
-	*x = FieldDescriptorProto_Type(value)
-	return nil
-}
-func (FieldDescriptorProto_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 0} }
-
-type FieldDescriptorProto_Label int32
-
-const (
-	// 0 is reserved for errors
-	FieldDescriptorProto_LABEL_OPTIONAL FieldDescriptorProto_Label = 1
-	FieldDescriptorProto_LABEL_REQUIRED FieldDescriptorProto_Label = 2
-	FieldDescriptorProto_LABEL_REPEATED FieldDescriptorProto_Label = 3
-)
-
-var FieldDescriptorProto_Label_name = map[int32]string{
-	1: "LABEL_OPTIONAL",
-	2: "LABEL_REQUIRED",
-	3: "LABEL_REPEATED",
-}
-var FieldDescriptorProto_Label_value = map[string]int32{
-	"LABEL_OPTIONAL": 1,
-	"LABEL_REQUIRED": 2,
-	"LABEL_REPEATED": 3,
-}
-
-func (x FieldDescriptorProto_Label) Enum() *FieldDescriptorProto_Label {
-	p := new(FieldDescriptorProto_Label)
-	*p = x
-	return p
-}
-func (x FieldDescriptorProto_Label) String() string {
-	return proto.EnumName(FieldDescriptorProto_Label_name, int32(x))
-}
-func (x *FieldDescriptorProto_Label) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Label_value, data, "FieldDescriptorProto_Label")
-	if err != nil {
-		return err
-	}
-	*x = FieldDescriptorProto_Label(value)
-	return nil
-}
-func (FieldDescriptorProto_Label) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{3, 1}
-}
-
-// Generated classes can be optimized for speed or code size.
-type FileOptions_OptimizeMode int32
-
-const (
-	FileOptions_SPEED FileOptions_OptimizeMode = 1
-	// etc.
-	FileOptions_CODE_SIZE    FileOptions_OptimizeMode = 2
-	FileOptions_LITE_RUNTIME FileOptions_OptimizeMode = 3
-)
-
-var FileOptions_OptimizeMode_name = map[int32]string{
-	1: "SPEED",
-	2: "CODE_SIZE",
-	3: "LITE_RUNTIME",
-}
-var FileOptions_OptimizeMode_value = map[string]int32{
-	"SPEED":        1,
-	"CODE_SIZE":    2,
-	"LITE_RUNTIME": 3,
-}
-
-func (x FileOptions_OptimizeMode) Enum() *FileOptions_OptimizeMode {
-	p := new(FileOptions_OptimizeMode)
-	*p = x
-	return p
-}
-func (x FileOptions_OptimizeMode) String() string {
-	return proto.EnumName(FileOptions_OptimizeMode_name, int32(x))
-}
-func (x *FileOptions_OptimizeMode) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FileOptions_OptimizeMode_value, data, "FileOptions_OptimizeMode")
-	if err != nil {
-		return err
-	}
-	*x = FileOptions_OptimizeMode(value)
-	return nil
-}
-func (FileOptions_OptimizeMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} }
-
-type FieldOptions_CType int32
-
-const (
-	// Default mode.
-	FieldOptions_STRING       FieldOptions_CType = 0
-	FieldOptions_CORD         FieldOptions_CType = 1
-	FieldOptions_STRING_PIECE FieldOptions_CType = 2
-)
-
-var FieldOptions_CType_name = map[int32]string{
-	0: "STRING",
-	1: "CORD",
-	2: "STRING_PIECE",
-}
-var FieldOptions_CType_value = map[string]int32{
-	"STRING":       0,
-	"CORD":         1,
-	"STRING_PIECE": 2,
-}
-
-func (x FieldOptions_CType) Enum() *FieldOptions_CType {
-	p := new(FieldOptions_CType)
-	*p = x
-	return p
-}
-func (x FieldOptions_CType) String() string {
-	return proto.EnumName(FieldOptions_CType_name, int32(x))
-}
-func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FieldOptions_CType_value, data, "FieldOptions_CType")
-	if err != nil {
-		return err
-	}
-	*x = FieldOptions_CType(value)
-	return nil
-}
-func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{11, 0} }
-
-// The protocol compiler can output a FileDescriptorSet containing the .proto
-// files it parses.
-type FileDescriptorSet struct {
-	File             []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *FileDescriptorSet) Reset()                    { *m = FileDescriptorSet{} }
-func (m *FileDescriptorSet) String() string            { return proto.CompactTextString(m) }
-func (*FileDescriptorSet) ProtoMessage()               {}
-func (*FileDescriptorSet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *FileDescriptorSet) GetFile() []*FileDescriptorProto {
-	if m != nil {
-		return m.File
-	}
-	return nil
-}
-
-// Describes a complete .proto file.
-type FileDescriptorProto struct {
-	Name    *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Package *string `protobuf:"bytes,2,opt,name=package" json:"package,omitempty"`
-	// Names of files imported by this file.
-	Dependency []string `protobuf:"bytes,3,rep,name=dependency" json:"dependency,omitempty"`
-	// Indexes of the public imported files in the dependency list above.
-	PublicDependency []int32 `protobuf:"varint,10,rep,name=public_dependency" json:"public_dependency,omitempty"`
-	// Indexes of the weak imported files in the dependency list.
-	// For Google-internal migration only. Do not use.
-	WeakDependency []int32 `protobuf:"varint,11,rep,name=weak_dependency" json:"weak_dependency,omitempty"`
-	// All top-level definitions in this file.
-	MessageType []*DescriptorProto        `protobuf:"bytes,4,rep,name=message_type" json:"message_type,omitempty"`
-	EnumType    []*EnumDescriptorProto    `protobuf:"bytes,5,rep,name=enum_type" json:"enum_type,omitempty"`
-	Service     []*ServiceDescriptorProto `protobuf:"bytes,6,rep,name=service" json:"service,omitempty"`
-	Extension   []*FieldDescriptorProto   `protobuf:"bytes,7,rep,name=extension" json:"extension,omitempty"`
-	Options     *FileOptions              `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
-	// This field contains optional information about the original source code.
-	// You may safely remove this entire field without harming runtime
-	// functionality of the descriptors -- the information is needed only by
-	// development tools.
-	SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info" json:"source_code_info,omitempty"`
-	// The syntax of the proto file.
-	// The supported values are "proto2" and "proto3".
-	Syntax           *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *FileDescriptorProto) Reset()                    { *m = FileDescriptorProto{} }
-func (m *FileDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*FileDescriptorProto) ProtoMessage()               {}
-func (*FileDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *FileDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *FileDescriptorProto) GetPackage() string {
-	if m != nil && m.Package != nil {
-		return *m.Package
-	}
-	return ""
-}
-
-func (m *FileDescriptorProto) GetDependency() []string {
-	if m != nil {
-		return m.Dependency
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetPublicDependency() []int32 {
-	if m != nil {
-		return m.PublicDependency
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetWeakDependency() []int32 {
-	if m != nil {
-		return m.WeakDependency
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetMessageType() []*DescriptorProto {
-	if m != nil {
-		return m.MessageType
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetEnumType() []*EnumDescriptorProto {
-	if m != nil {
-		return m.EnumType
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetService() []*ServiceDescriptorProto {
-	if m != nil {
-		return m.Service
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetExtension() []*FieldDescriptorProto {
-	if m != nil {
-		return m.Extension
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetOptions() *FileOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetSourceCodeInfo() *SourceCodeInfo {
-	if m != nil {
-		return m.SourceCodeInfo
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetSyntax() string {
-	if m != nil && m.Syntax != nil {
-		return *m.Syntax
-	}
-	return ""
-}
-
-// Describes a message type.
-type DescriptorProto struct {
-	Name             *string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Field            []*FieldDescriptorProto           `protobuf:"bytes,2,rep,name=field" json:"field,omitempty"`
-	Extension        []*FieldDescriptorProto           `protobuf:"bytes,6,rep,name=extension" json:"extension,omitempty"`
-	NestedType       []*DescriptorProto                `protobuf:"bytes,3,rep,name=nested_type" json:"nested_type,omitempty"`
-	EnumType         []*EnumDescriptorProto            `protobuf:"bytes,4,rep,name=enum_type" json:"enum_type,omitempty"`
-	ExtensionRange   []*DescriptorProto_ExtensionRange `protobuf:"bytes,5,rep,name=extension_range" json:"extension_range,omitempty"`
-	OneofDecl        []*OneofDescriptorProto           `protobuf:"bytes,8,rep,name=oneof_decl" json:"oneof_decl,omitempty"`
-	Options          *MessageOptions                   `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                            `json:"-"`
-}
-
-func (m *DescriptorProto) Reset()                    { *m = DescriptorProto{} }
-func (m *DescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*DescriptorProto) ProtoMessage()               {}
-func (*DescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *DescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *DescriptorProto) GetField() []*FieldDescriptorProto {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetExtension() []*FieldDescriptorProto {
-	if m != nil {
-		return m.Extension
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetNestedType() []*DescriptorProto {
-	if m != nil {
-		return m.NestedType
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetEnumType() []*EnumDescriptorProto {
-	if m != nil {
-		return m.EnumType
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetExtensionRange() []*DescriptorProto_ExtensionRange {
-	if m != nil {
-		return m.ExtensionRange
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetOneofDecl() []*OneofDescriptorProto {
-	if m != nil {
-		return m.OneofDecl
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetOptions() *MessageOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-type DescriptorProto_ExtensionRange struct {
-	Start            *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End              *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *DescriptorProto_ExtensionRange) Reset()         { *m = DescriptorProto_ExtensionRange{} }
-func (m *DescriptorProto_ExtensionRange) String() string { return proto.CompactTextString(m) }
-func (*DescriptorProto_ExtensionRange) ProtoMessage()    {}
-func (*DescriptorProto_ExtensionRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 0}
-}
-
-func (m *DescriptorProto_ExtensionRange) GetStart() int32 {
-	if m != nil && m.Start != nil {
-		return *m.Start
-	}
-	return 0
-}
-
-func (m *DescriptorProto_ExtensionRange) GetEnd() int32 {
-	if m != nil && m.End != nil {
-		return *m.End
-	}
-	return 0
-}
-
-// Describes a field within a message.
-type FieldDescriptorProto struct {
-	Name   *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Number *int32                      `protobuf:"varint,3,opt,name=number" json:"number,omitempty"`
-	Label  *FieldDescriptorProto_Label `protobuf:"varint,4,opt,name=label,enum=google.protobuf.FieldDescriptorProto_Label" json:"label,omitempty"`
-	// If type_name is set, this need not be set.  If both this and type_name
-	// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-	Type *FieldDescriptorProto_Type `protobuf:"varint,5,opt,name=type,enum=google.protobuf.FieldDescriptorProto_Type" json:"type,omitempty"`
-	// For message and enum types, this is the name of the type.  If the name
-	// starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-	// rules are used to find the type (i.e. first the nested types within this
-	// message are searched, then within the parent, on up to the root
-	// namespace).
-	TypeName *string `protobuf:"bytes,6,opt,name=type_name" json:"type_name,omitempty"`
-	// For extensions, this is the name of the type being extended.  It is
-	// resolved in the same manner as type_name.
-	Extendee *string `protobuf:"bytes,2,opt,name=extendee" json:"extendee,omitempty"`
-	// For numeric types, contains the original text representation of the value.
-	// For booleans, "true" or "false".
-	// For strings, contains the default text contents (not escaped in any way).
-	// For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-	// TODO(kenton):  Base-64 encode?
-	DefaultValue *string `protobuf:"bytes,7,opt,name=default_value" json:"default_value,omitempty"`
-	// If set, gives the index of a oneof in the containing type's oneof_decl
-	// list.  This field is a member of that oneof.  Extensions of a oneof should
-	// not set this since the oneof to which they belong will be inferred based
-	// on the extension range containing the extension's field number.
-	OneofIndex *int32 `protobuf:"varint,9,opt,name=oneof_index" json:"oneof_index,omitempty"`
-	// JSON name of this field. The value is set by protocol compiler. If the
-	// user has set a "json_name" option on this field, that option's value
-	// will be used. Otherwise, it's deduced from the field's name by converting
-	// it to camelCase.
-	JsonName         *string       `protobuf:"bytes,10,opt,name=json_name" json:"json_name,omitempty"`
-	Options          *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
-}
-
-func (m *FieldDescriptorProto) Reset()                    { *m = FieldDescriptorProto{} }
-func (m *FieldDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*FieldDescriptorProto) ProtoMessage()               {}
-func (*FieldDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *FieldDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetNumber() int32 {
-	if m != nil && m.Number != nil {
-		return *m.Number
-	}
-	return 0
-}
-
-func (m *FieldDescriptorProto) GetLabel() FieldDescriptorProto_Label {
-	if m != nil && m.Label != nil {
-		return *m.Label
-	}
-	return FieldDescriptorProto_LABEL_OPTIONAL
-}
-
-func (m *FieldDescriptorProto) GetType() FieldDescriptorProto_Type {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return FieldDescriptorProto_TYPE_DOUBLE
-}
-
-func (m *FieldDescriptorProto) GetTypeName() string {
-	if m != nil && m.TypeName != nil {
-		return *m.TypeName
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetExtendee() string {
-	if m != nil && m.Extendee != nil {
-		return *m.Extendee
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetDefaultValue() string {
-	if m != nil && m.DefaultValue != nil {
-		return *m.DefaultValue
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetOneofIndex() int32 {
-	if m != nil && m.OneofIndex != nil {
-		return *m.OneofIndex
-	}
-	return 0
-}
-
-func (m *FieldDescriptorProto) GetJsonName() string {
-	if m != nil && m.JsonName != nil {
-		return *m.JsonName
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetOptions() *FieldOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Describes a oneof.
-type OneofDescriptorProto struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *OneofDescriptorProto) Reset()                    { *m = OneofDescriptorProto{} }
-func (m *OneofDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*OneofDescriptorProto) ProtoMessage()               {}
-func (*OneofDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *OneofDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-// Describes an enum type.
-type EnumDescriptorProto struct {
-	Name             *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Value            []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
-	Options          *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                      `json:"-"`
-}
-
-func (m *EnumDescriptorProto) Reset()                    { *m = EnumDescriptorProto{} }
-func (m *EnumDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*EnumDescriptorProto) ProtoMessage()               {}
-func (*EnumDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *EnumDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *EnumDescriptorProto) GetValue() []*EnumValueDescriptorProto {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *EnumDescriptorProto) GetOptions() *EnumOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Describes a value within an enum.
-type EnumValueDescriptorProto struct {
-	Name             *string           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Number           *int32            `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
-	Options          *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *EnumValueDescriptorProto) Reset()                    { *m = EnumValueDescriptorProto{} }
-func (m *EnumValueDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*EnumValueDescriptorProto) ProtoMessage()               {}
-func (*EnumValueDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *EnumValueDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *EnumValueDescriptorProto) GetNumber() int32 {
-	if m != nil && m.Number != nil {
-		return *m.Number
-	}
-	return 0
-}
-
-func (m *EnumValueDescriptorProto) GetOptions() *EnumValueOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Describes a service.
-type ServiceDescriptorProto struct {
-	Name             *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Method           []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
-	Options          *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                   `json:"-"`
-}
-
-func (m *ServiceDescriptorProto) Reset()                    { *m = ServiceDescriptorProto{} }
-func (m *ServiceDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*ServiceDescriptorProto) ProtoMessage()               {}
-func (*ServiceDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-func (m *ServiceDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *ServiceDescriptorProto) GetMethod() []*MethodDescriptorProto {
-	if m != nil {
-		return m.Method
-	}
-	return nil
-}
-
-func (m *ServiceDescriptorProto) GetOptions() *ServiceOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Describes a method of a service.
-type MethodDescriptorProto struct {
-	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Input and output type names.  These are resolved in the same way as
-	// FieldDescriptorProto.type_name, but must refer to a message type.
-	InputType  *string        `protobuf:"bytes,2,opt,name=input_type" json:"input_type,omitempty"`
-	OutputType *string        `protobuf:"bytes,3,opt,name=output_type" json:"output_type,omitempty"`
-	Options    *MethodOptions `protobuf:"bytes,4,opt,name=options" json:"options,omitempty"`
-	// Identifies if client streams multiple client messages
-	ClientStreaming *bool `protobuf:"varint,5,opt,name=client_streaming,def=0" json:"client_streaming,omitempty"`
-	// Identifies if server streams multiple server messages
-	ServerStreaming  *bool  `protobuf:"varint,6,opt,name=server_streaming,def=0" json:"server_streaming,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *MethodDescriptorProto) Reset()                    { *m = MethodDescriptorProto{} }
-func (m *MethodDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*MethodDescriptorProto) ProtoMessage()               {}
-func (*MethodDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-const Default_MethodDescriptorProto_ClientStreaming bool = false
-const Default_MethodDescriptorProto_ServerStreaming bool = false
-
-func (m *MethodDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MethodDescriptorProto) GetInputType() string {
-	if m != nil && m.InputType != nil {
-		return *m.InputType
-	}
-	return ""
-}
-
-func (m *MethodDescriptorProto) GetOutputType() string {
-	if m != nil && m.OutputType != nil {
-		return *m.OutputType
-	}
-	return ""
-}
-
-func (m *MethodDescriptorProto) GetOptions() *MethodOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-func (m *MethodDescriptorProto) GetClientStreaming() bool {
-	if m != nil && m.ClientStreaming != nil {
-		return *m.ClientStreaming
-	}
-	return Default_MethodDescriptorProto_ClientStreaming
-}
-
-func (m *MethodDescriptorProto) GetServerStreaming() bool {
-	if m != nil && m.ServerStreaming != nil {
-		return *m.ServerStreaming
-	}
-	return Default_MethodDescriptorProto_ServerStreaming
-}
-
-type FileOptions struct {
-	// Sets the Java package where classes generated from this .proto will be
-	// placed.  By default, the proto package is used, but this is often
-	// inappropriate because proto packages do not normally start with backwards
-	// domain names.
-	JavaPackage *string `protobuf:"bytes,1,opt,name=java_package" json:"java_package,omitempty"`
-	// If set, all the classes from the .proto file are wrapped in a single
-	// outer class with the given name.  This applies to both Proto1
-	// (equivalent to the old "--one_java_file" option) and Proto2 (where
-	// a .proto always translates to a single class, but you may want to
-	// explicitly choose the class name).
-	JavaOuterClassname *string `protobuf:"bytes,8,opt,name=java_outer_classname" json:"java_outer_classname,omitempty"`
-	// If set true, then the Java code generator will generate a separate .java
-	// file for each top-level message, enum, and service defined in the .proto
-	// file.  Thus, these types will *not* be nested inside the outer class
-	// named by java_outer_classname.  However, the outer class will still be
-	// generated to contain the file's getDescriptor() method as well as any
-	// top-level extensions defined in the file.
-	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,def=0" json:"java_multiple_files,omitempty"`
-	// If set true, then the Java code generator will generate equals() and
-	// hashCode() methods for all messages defined in the .proto file.
-	// - In the full runtime, this is purely a speed optimization, as the
-	// AbstractMessage base class includes reflection-based implementations of
-	// these methods.
-	// - In the lite runtime, setting this option changes the semantics of
-	// equals() and hashCode() to more closely match those of the full runtime;
-	// the generated methods compute their results based on field values rather
-	// than object identity. (Implementations should not assume that hashcodes
-	// will be consistent across runtimes or versions of the protocol compiler.)
-	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,def=0" json:"java_generate_equals_and_hash,omitempty"`
-	// If set true, then the Java2 code generator will generate code that
-	// throws an exception whenever an attempt is made to assign a non-UTF-8
-	// byte sequence to a string field.
-	// Message reflection will do the same.
-	// However, an extension field still accepts non-UTF-8 byte sequences.
-	// This option has no effect on when used with the lite runtime.
-	JavaStringCheckUtf8 *bool                     `protobuf:"varint,27,opt,name=java_string_check_utf8,def=0" json:"java_string_check_utf8,omitempty"`
-	OptimizeFor         *FileOptions_OptimizeMode `protobuf:"varint,9,opt,name=optimize_for,enum=google.protobuf.FileOptions_OptimizeMode,def=1" json:"optimize_for,omitempty"`
-	// Sets the Go package where structs generated from this .proto will be
-	// placed. If omitted, the Go package will be derived from the following:
-	//   - The basename of the package import path, if provided.
-	//   - Otherwise, the package statement in the .proto file, if present.
-	//   - Otherwise, the basename of the .proto file, without extension.
-	GoPackage *string `protobuf:"bytes,11,opt,name=go_package" json:"go_package,omitempty"`
-	// Should generic services be generated in each language?  "Generic" services
-	// are not specific to any particular RPC system.  They are generated by the
-	// main code generators in each language (without additional plugins).
-	// Generic services were the only kind of service generation supported by
-	// early versions of google.protobuf.
-	//
-	// Generic services are now considered deprecated in favor of using plugins
-	// that generate code specific to your particular RPC system.  Therefore,
-	// these default to false.  Old code which depends on generic services should
-	// explicitly set them to true.
-	CcGenericServices   *bool `protobuf:"varint,16,opt,name=cc_generic_services,def=0" json:"cc_generic_services,omitempty"`
-	JavaGenericServices *bool `protobuf:"varint,17,opt,name=java_generic_services,def=0" json:"java_generic_services,omitempty"`
-	PyGenericServices   *bool `protobuf:"varint,18,opt,name=py_generic_services,def=0" json:"py_generic_services,omitempty"`
-	// Is this file deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for everything in the file, or it will be completely ignored; in the very
-	// least, this is a formalization for deprecating files.
-	Deprecated *bool `protobuf:"varint,23,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// Enables the use of arenas for the proto messages in this file. This applies
-	// only to generated classes for C++.
-	CcEnableArenas *bool `protobuf:"varint,31,opt,name=cc_enable_arenas,def=0" json:"cc_enable_arenas,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
-}
-
-func (m *FileOptions) Reset()                    { *m = FileOptions{} }
-func (m *FileOptions) String() string            { return proto.CompactTextString(m) }
-func (*FileOptions) ProtoMessage()               {}
-func (*FileOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
-
-var extRange_FileOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*FileOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_FileOptions
-}
-func (m *FileOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-const Default_FileOptions_JavaMultipleFiles bool = false
-const Default_FileOptions_JavaGenerateEqualsAndHash bool = false
-const Default_FileOptions_JavaStringCheckUtf8 bool = false
-const Default_FileOptions_OptimizeFor FileOptions_OptimizeMode = FileOptions_SPEED
-const Default_FileOptions_CcGenericServices bool = false
-const Default_FileOptions_JavaGenericServices bool = false
-const Default_FileOptions_PyGenericServices bool = false
-const Default_FileOptions_Deprecated bool = false
-const Default_FileOptions_CcEnableArenas bool = false
-
-func (m *FileOptions) GetJavaPackage() string {
-	if m != nil && m.JavaPackage != nil {
-		return *m.JavaPackage
-	}
-	return ""
-}
-
-func (m *FileOptions) GetJavaOuterClassname() string {
-	if m != nil && m.JavaOuterClassname != nil {
-		return *m.JavaOuterClassname
-	}
-	return ""
-}
-
-func (m *FileOptions) GetJavaMultipleFiles() bool {
-	if m != nil && m.JavaMultipleFiles != nil {
-		return *m.JavaMultipleFiles
-	}
-	return Default_FileOptions_JavaMultipleFiles
-}
-
-func (m *FileOptions) GetJavaGenerateEqualsAndHash() bool {
-	if m != nil && m.JavaGenerateEqualsAndHash != nil {
-		return *m.JavaGenerateEqualsAndHash
-	}
-	return Default_FileOptions_JavaGenerateEqualsAndHash
-}
-
-func (m *FileOptions) GetJavaStringCheckUtf8() bool {
-	if m != nil && m.JavaStringCheckUtf8 != nil {
-		return *m.JavaStringCheckUtf8
-	}
-	return Default_FileOptions_JavaStringCheckUtf8
-}
-
-func (m *FileOptions) GetOptimizeFor() FileOptions_OptimizeMode {
-	if m != nil && m.OptimizeFor != nil {
-		return *m.OptimizeFor
-	}
-	return Default_FileOptions_OptimizeFor
-}
-
-func (m *FileOptions) GetGoPackage() string {
-	if m != nil && m.GoPackage != nil {
-		return *m.GoPackage
-	}
-	return ""
-}
-
-func (m *FileOptions) GetCcGenericServices() bool {
-	if m != nil && m.CcGenericServices != nil {
-		return *m.CcGenericServices
-	}
-	return Default_FileOptions_CcGenericServices
-}
-
-func (m *FileOptions) GetJavaGenericServices() bool {
-	if m != nil && m.JavaGenericServices != nil {
-		return *m.JavaGenericServices
-	}
-	return Default_FileOptions_JavaGenericServices
-}
-
-func (m *FileOptions) GetPyGenericServices() bool {
-	if m != nil && m.PyGenericServices != nil {
-		return *m.PyGenericServices
-	}
-	return Default_FileOptions_PyGenericServices
-}
-
-func (m *FileOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_FileOptions_Deprecated
-}
-
-func (m *FileOptions) GetCcEnableArenas() bool {
-	if m != nil && m.CcEnableArenas != nil {
-		return *m.CcEnableArenas
-	}
-	return Default_FileOptions_CcEnableArenas
-}
-
-func (m *FileOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type MessageOptions struct {
-	// Set true to use the old proto1 MessageSet wire format for extensions.
-	// This is provided for backwards-compatibility with the MessageSet wire
-	// format.  You should not use this for any other reason:  It's less
-	// efficient, has fewer features, and is more complicated.
-	//
-	// The message must be defined exactly as follows:
-	//   message Foo {
-	//     option message_set_wire_format = true;
-	//     extensions 4 to max;
-	//   }
-	// Note that the message cannot have any defined fields; MessageSets only
-	// have extensions.
-	//
-	// All extensions of your type must be singular messages; e.g. they cannot
-	// be int32s, enums, or repeated messages.
-	//
-	// Because this is an option, the above two restrictions are not enforced by
-	// the protocol compiler.
-	MessageSetWireFormat *bool `protobuf:"varint,1,opt,name=message_set_wire_format,def=0" json:"message_set_wire_format,omitempty"`
-	// Disables the generation of the standard "descriptor()" accessor, which can
-	// conflict with a field of the same name.  This is meant to make migration
-	// from proto1 easier; new code should avoid fields named "descriptor".
-	NoStandardDescriptorAccessor *bool `protobuf:"varint,2,opt,name=no_standard_descriptor_accessor,def=0" json:"no_standard_descriptor_accessor,omitempty"`
-	// Is this message deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the message, or it will be completely ignored; in the very least,
-	// this is a formalization for deprecating messages.
-	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// Whether the message is an automatically generated map entry type for the
-	// maps field.
-	//
-	// For maps fields:
-	//     map<KeyType, ValueType> map_field = 1;
-	// The parsed descriptor looks like:
-	//     message MapFieldEntry {
-	//         option map_entry = true;
-	//         optional KeyType key = 1;
-	//         optional ValueType value = 2;
-	//     }
-	//     repeated MapFieldEntry map_field = 1;
-	//
-	// Implementations may choose not to generate the map_entry=true message, but
-	// use a native map in the target language to hold the keys and values.
-	// The reflection APIs in such implementions still need to work as
-	// if the field is a repeated message field.
-	//
-	// NOTE: Do not set the option in .proto files. Always use the maps syntax
-	// instead. The option should only be implicitly set by the proto compiler
-	// parser.
-	MapEntry *bool `protobuf:"varint,7,opt,name=map_entry" json:"map_entry,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
-}
-
-func (m *MessageOptions) Reset()                    { *m = MessageOptions{} }
-func (m *MessageOptions) String() string            { return proto.CompactTextString(m) }
-func (*MessageOptions) ProtoMessage()               {}
-func (*MessageOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-var extRange_MessageOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*MessageOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MessageOptions
-}
-func (m *MessageOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-const Default_MessageOptions_MessageSetWireFormat bool = false
-const Default_MessageOptions_NoStandardDescriptorAccessor bool = false
-const Default_MessageOptions_Deprecated bool = false
-
-func (m *MessageOptions) GetMessageSetWireFormat() bool {
-	if m != nil && m.MessageSetWireFormat != nil {
-		return *m.MessageSetWireFormat
-	}
-	return Default_MessageOptions_MessageSetWireFormat
-}
-
-func (m *MessageOptions) GetNoStandardDescriptorAccessor() bool {
-	if m != nil && m.NoStandardDescriptorAccessor != nil {
-		return *m.NoStandardDescriptorAccessor
-	}
-	return Default_MessageOptions_NoStandardDescriptorAccessor
-}
-
-func (m *MessageOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_MessageOptions_Deprecated
-}
-
-func (m *MessageOptions) GetMapEntry() bool {
-	if m != nil && m.MapEntry != nil {
-		return *m.MapEntry
-	}
-	return false
-}
-
-func (m *MessageOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type FieldOptions struct {
-	// The ctype option instructs the C++ code generator to use a different
-	// representation of the field than it normally would.  See the specific
-	// options below.  This option is not yet implemented in the open source
-	// release -- sorry, we'll try to include it in a future version!
-	Ctype *FieldOptions_CType `protobuf:"varint,1,opt,name=ctype,enum=google.protobuf.FieldOptions_CType,def=0" json:"ctype,omitempty"`
-	// The packed option can be enabled for repeated primitive fields to enable
-	// a more efficient representation on the wire. Rather than repeatedly
-	// writing the tag and type for each element, the entire array is encoded as
-	// a single length-delimited blob.
-	Packed *bool `protobuf:"varint,2,opt,name=packed" json:"packed,omitempty"`
-	// Should this field be parsed lazily?  Lazy applies only to message-type
-	// fields.  It means that when the outer message is initially parsed, the
-	// inner message's contents will not be parsed but instead stored in encoded
-	// form.  The inner message will actually be parsed when it is first accessed.
-	//
-	// This is only a hint.  Implementations are free to choose whether to use
-	// eager or lazy parsing regardless of the value of this option.  However,
-	// setting this option true suggests that the protocol author believes that
-	// using lazy parsing on this field is worth the additional bookkeeping
-	// overhead typically needed to implement it.
-	//
-	// This option does not affect the public interface of any generated code;
-	// all method signatures remain the same.  Furthermore, thread-safety of the
-	// interface is not affected by this option; const methods remain safe to
-	// call from multiple threads concurrently, while non-const methods continue
-	// to require exclusive access.
-	//
-	//
-	// Note that implementations may choose not to check required fields within
-	// a lazy sub-message.  That is, calling IsInitialized() on the outher message
-	// may return true even if the inner message has missing required fields.
-	// This is necessary because otherwise the inner message would have to be
-	// parsed in order to perform the check, defeating the purpose of lazy
-	// parsing.  An implementation which chooses not to check required fields
-	// must be consistent about it.  That is, for any particular sub-message, the
-	// implementation must either *always* check its required fields, or *never*
-	// check its required fields, regardless of whether or not the message has
-	// been parsed.
-	Lazy *bool `protobuf:"varint,5,opt,name=lazy,def=0" json:"lazy,omitempty"`
-	// Is this field deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for accessors, or it will be completely ignored; in the very least, this
-	// is a formalization for deprecating fields.
-	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// For Google-internal migration only. Do not use.
-	Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
-}
-
-func (m *FieldOptions) Reset()                    { *m = FieldOptions{} }
-func (m *FieldOptions) String() string            { return proto.CompactTextString(m) }
-func (*FieldOptions) ProtoMessage()               {}
-func (*FieldOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
-
-var extRange_FieldOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*FieldOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_FieldOptions
-}
-func (m *FieldOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-const Default_FieldOptions_Ctype FieldOptions_CType = FieldOptions_STRING
-const Default_FieldOptions_Lazy bool = false
-const Default_FieldOptions_Deprecated bool = false
-const Default_FieldOptions_Weak bool = false
-
-func (m *FieldOptions) GetCtype() FieldOptions_CType {
-	if m != nil && m.Ctype != nil {
-		return *m.Ctype
-	}
-	return Default_FieldOptions_Ctype
-}
-
-func (m *FieldOptions) GetPacked() bool {
-	if m != nil && m.Packed != nil {
-		return *m.Packed
-	}
-	return false
-}
-
-func (m *FieldOptions) GetLazy() bool {
-	if m != nil && m.Lazy != nil {
-		return *m.Lazy
-	}
-	return Default_FieldOptions_Lazy
-}
-
-func (m *FieldOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_FieldOptions_Deprecated
-}
-
-func (m *FieldOptions) GetWeak() bool {
-	if m != nil && m.Weak != nil {
-		return *m.Weak
-	}
-	return Default_FieldOptions_Weak
-}
-
-func (m *FieldOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type EnumOptions struct {
-	// Set this option to true to allow mapping different tag names to the same
-	// value.
-	AllowAlias *bool `protobuf:"varint,2,opt,name=allow_alias" json:"allow_alias,omitempty"`
-	// Is this enum deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the enum, or it will be completely ignored; in the very least, this
-	// is a formalization for deprecating enums.
-	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
-}
-
-func (m *EnumOptions) Reset()                    { *m = EnumOptions{} }
-func (m *EnumOptions) String() string            { return proto.CompactTextString(m) }
-func (*EnumOptions) ProtoMessage()               {}
-func (*EnumOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-var extRange_EnumOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*EnumOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_EnumOptions
-}
-func (m *EnumOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-const Default_EnumOptions_Deprecated bool = false
-
-func (m *EnumOptions) GetAllowAlias() bool {
-	if m != nil && m.AllowAlias != nil {
-		return *m.AllowAlias
-	}
-	return false
-}
-
-func (m *EnumOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_EnumOptions_Deprecated
-}
-
-func (m *EnumOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type EnumValueOptions struct {
-	// Is this enum value deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the enum value, or it will be completely ignored; in the very least,
-	// this is a formalization for deprecating enum values.
-	Deprecated *bool `protobuf:"varint,1,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
-}
-
-func (m *EnumValueOptions) Reset()                    { *m = EnumValueOptions{} }
-func (m *EnumValueOptions) String() string            { return proto.CompactTextString(m) }
-func (*EnumValueOptions) ProtoMessage()               {}
-func (*EnumValueOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
-
-var extRange_EnumValueOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*EnumValueOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_EnumValueOptions
-}
-func (m *EnumValueOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-const Default_EnumValueOptions_Deprecated bool = false
-
-func (m *EnumValueOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_EnumValueOptions_Deprecated
-}
-
-func (m *EnumValueOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type ServiceOptions struct {
-	// Is this service deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the service, or it will be completely ignored; in the very least,
-	// this is a formalization for deprecating services.
-	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
-}
-
-func (m *ServiceOptions) Reset()                    { *m = ServiceOptions{} }
-func (m *ServiceOptions) String() string            { return proto.CompactTextString(m) }
-func (*ServiceOptions) ProtoMessage()               {}
-func (*ServiceOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
-
-var extRange_ServiceOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*ServiceOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_ServiceOptions
-}
-func (m *ServiceOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-const Default_ServiceOptions_Deprecated bool = false
-
-func (m *ServiceOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_ServiceOptions_Deprecated
-}
-
-func (m *ServiceOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type MethodOptions struct {
-	// Is this method deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the method, or it will be completely ignored; in the very least,
-	// this is a formalization for deprecating methods.
-	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
-}
-
-func (m *MethodOptions) Reset()                    { *m = MethodOptions{} }
-func (m *MethodOptions) String() string            { return proto.CompactTextString(m) }
-func (*MethodOptions) ProtoMessage()               {}
-func (*MethodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
-
-var extRange_MethodOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*MethodOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MethodOptions
-}
-func (m *MethodOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-const Default_MethodOptions_Deprecated bool = false
-
-func (m *MethodOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_MethodOptions_Deprecated
-}
-
-func (m *MethodOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-// A message representing a option the parser does not recognize. This only
-// appears in options protos created by the compiler::Parser class.
-// DescriptorPool resolves these when building Descriptor objects. Therefore,
-// options protos in descriptor objects (e.g. returned by Descriptor::options(),
-// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
-// in them.
-type UninterpretedOption struct {
-	Name []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
-	// The value of the uninterpreted option, in whatever type the tokenizer
-	// identified it as during parsing. Exactly one of these should be set.
-	IdentifierValue  *string  `protobuf:"bytes,3,opt,name=identifier_value" json:"identifier_value,omitempty"`
-	PositiveIntValue *uint64  `protobuf:"varint,4,opt,name=positive_int_value" json:"positive_int_value,omitempty"`
-	NegativeIntValue *int64   `protobuf:"varint,5,opt,name=negative_int_value" json:"negative_int_value,omitempty"`
-	DoubleValue      *float64 `protobuf:"fixed64,6,opt,name=double_value" json:"double_value,omitempty"`
-	StringValue      []byte   `protobuf:"bytes,7,opt,name=string_value" json:"string_value,omitempty"`
-	AggregateValue   *string  `protobuf:"bytes,8,opt,name=aggregate_value" json:"aggregate_value,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *UninterpretedOption) Reset()                    { *m = UninterpretedOption{} }
-func (m *UninterpretedOption) String() string            { return proto.CompactTextString(m) }
-func (*UninterpretedOption) ProtoMessage()               {}
-func (*UninterpretedOption) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
-
-func (m *UninterpretedOption) GetName() []*UninterpretedOption_NamePart {
-	if m != nil {
-		return m.Name
-	}
-	return nil
-}
-
-func (m *UninterpretedOption) GetIdentifierValue() string {
-	if m != nil && m.IdentifierValue != nil {
-		return *m.IdentifierValue
-	}
-	return ""
-}
-
-func (m *UninterpretedOption) GetPositiveIntValue() uint64 {
-	if m != nil && m.PositiveIntValue != nil {
-		return *m.PositiveIntValue
-	}
-	return 0
-}
-
-func (m *UninterpretedOption) GetNegativeIntValue() int64 {
-	if m != nil && m.NegativeIntValue != nil {
-		return *m.NegativeIntValue
-	}
-	return 0
-}
-
-func (m *UninterpretedOption) GetDoubleValue() float64 {
-	if m != nil && m.DoubleValue != nil {
-		return *m.DoubleValue
-	}
-	return 0
-}
-
-func (m *UninterpretedOption) GetStringValue() []byte {
-	if m != nil {
-		return m.StringValue
-	}
-	return nil
-}
-
-func (m *UninterpretedOption) GetAggregateValue() string {
-	if m != nil && m.AggregateValue != nil {
-		return *m.AggregateValue
-	}
-	return ""
-}
-
-// The name of the uninterpreted option.  Each string represents a segment in
-// a dot-separated name.  is_extension is true iff a segment represents an
-// extension (denoted with parentheses in options specs in .proto files).
-// E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-// "foo.(bar.baz).qux".
-type UninterpretedOption_NamePart struct {
-	NamePart         *string `protobuf:"bytes,1,req,name=name_part" json:"name_part,omitempty"`
-	IsExtension      *bool   `protobuf:"varint,2,req,name=is_extension" json:"is_extension,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *UninterpretedOption_NamePart) Reset()         { *m = UninterpretedOption_NamePart{} }
-func (m *UninterpretedOption_NamePart) String() string { return proto.CompactTextString(m) }
-func (*UninterpretedOption_NamePart) ProtoMessage()    {}
-func (*UninterpretedOption_NamePart) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{16, 0}
-}
-
-func (m *UninterpretedOption_NamePart) GetNamePart() string {
-	if m != nil && m.NamePart != nil {
-		return *m.NamePart
-	}
-	return ""
-}
-
-func (m *UninterpretedOption_NamePart) GetIsExtension() bool {
-	if m != nil && m.IsExtension != nil {
-		return *m.IsExtension
-	}
-	return false
-}
-
-// Encapsulates information about the original source file from which a
-// FileDescriptorProto was generated.
-type SourceCodeInfo struct {
-	// A Location identifies a piece of source code in a .proto file which
-	// corresponds to a particular definition.  This information is intended
-	// to be useful to IDEs, code indexers, documentation generators, and similar
-	// tools.
-	//
-	// For example, say we have a file like:
-	//   message Foo {
-	//     optional string foo = 1;
-	//   }
-	// Let's look at just the field definition:
-	//   optional string foo = 1;
-	//   ^       ^^     ^^  ^  ^^^
-	//   a       bc     de  f  ghi
-	// We have the following locations:
-	//   span   path               represents
-	//   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-	//   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-	//   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-	//   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-	//   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-	//
-	// Notes:
-	// - A location may refer to a repeated field itself (i.e. not to any
-	//   particular index within it).  This is used whenever a set of elements are
-	//   logically enclosed in a single code segment.  For example, an entire
-	//   extend block (possibly containing multiple extension definitions) will
-	//   have an outer location whose path refers to the "extensions" repeated
-	//   field without an index.
-	// - Multiple locations may have the same path.  This happens when a single
-	//   logical declaration is spread out across multiple places.  The most
-	//   obvious example is the "extend" block again -- there may be multiple
-	//   extend blocks in the same scope, each of which will have the same path.
-	// - A location's span is not always a subset of its parent's span.  For
-	//   example, the "extendee" of an extension declaration appears at the
-	//   beginning of the "extend" block and is shared by all extensions within
-	//   the block.
-	// - Just because a location's span is a subset of some other location's span
-	//   does not mean that it is a descendent.  For example, a "group" defines
-	//   both a type and a field in a single declaration.  Thus, the locations
-	//   corresponding to the type and field and their components will overlap.
-	// - Code which tries to interpret locations should probably be designed to
-	//   ignore those that it doesn't understand, as more types of locations could
-	//   be recorded in the future.
-	Location         []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
-	XXX_unrecognized []byte                     `json:"-"`
-}
-
-func (m *SourceCodeInfo) Reset()                    { *m = SourceCodeInfo{} }
-func (m *SourceCodeInfo) String() string            { return proto.CompactTextString(m) }
-func (*SourceCodeInfo) ProtoMessage()               {}
-func (*SourceCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
-
-func (m *SourceCodeInfo) GetLocation() []*SourceCodeInfo_Location {
-	if m != nil {
-		return m.Location
-	}
-	return nil
-}
-
-type SourceCodeInfo_Location struct {
-	// Identifies which part of the FileDescriptorProto was defined at this
-	// location.
-	//
-	// Each element is a field number or an index.  They form a path from
-	// the root FileDescriptorProto to the place where the definition.  For
-	// example, this path:
-	//   [ 4, 3, 2, 7, 1 ]
-	// refers to:
-	//   file.message_type(3)  // 4, 3
-	//       .field(7)         // 2, 7
-	//       .name()           // 1
-	// This is because FileDescriptorProto.message_type has field number 4:
-	//   repeated DescriptorProto message_type = 4;
-	// and DescriptorProto.field has field number 2:
-	//   repeated FieldDescriptorProto field = 2;
-	// and FieldDescriptorProto.name has field number 1:
-	//   optional string name = 1;
-	//
-	// Thus, the above path gives the location of a field name.  If we removed
-	// the last element:
-	//   [ 4, 3, 2, 7 ]
-	// this path refers to the whole field declaration (from the beginning
-	// of the label to the terminating semicolon).
-	Path []int32 `protobuf:"varint,1,rep,packed,name=path" json:"path,omitempty"`
-	// Always has exactly three or four elements: start line, start column,
-	// end line (optional, otherwise assumed same as start line), end column.
-	// These are packed into a single field for efficiency.  Note that line
-	// and column numbers are zero-based -- typically you will want to add
-	// 1 to each before displaying to a user.
-	Span []int32 `protobuf:"varint,2,rep,packed,name=span" json:"span,omitempty"`
-	// If this SourceCodeInfo represents a complete declaration, these are any
-	// comments appearing before and after the declaration which appear to be
-	// attached to the declaration.
-	//
-	// A series of line comments appearing on consecutive lines, with no other
-	// tokens appearing on those lines, will be treated as a single comment.
-	//
-	// Only the comment content is provided; comment markers (e.g. //) are
-	// stripped out.  For block comments, leading whitespace and an asterisk
-	// will be stripped from the beginning of each line other than the first.
-	// Newlines are included in the output.
-	//
-	// Examples:
-	//
-	//   optional int32 foo = 1;  // Comment attached to foo.
-	//   // Comment attached to bar.
-	//   optional int32 bar = 2;
-	//
-	//   optional string baz = 3;
-	//   // Comment attached to baz.
-	//   // Another line attached to baz.
-	//
-	//   // Comment attached to qux.
-	//   //
-	//   // Another line attached to qux.
-	//   optional double qux = 4;
-	//
-	//   optional string corge = 5;
-	//   /* Block comment attached
-	//    * to corge.  Leading asterisks
-	//    * will be removed. */
-	//   /* Block comment attached to
-	//    * grault. */
-	//   optional int32 grault = 6;
-	LeadingComments  *string `protobuf:"bytes,3,opt,name=leading_comments" json:"leading_comments,omitempty"`
-	TrailingComments *string `protobuf:"bytes,4,opt,name=trailing_comments" json:"trailing_comments,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *SourceCodeInfo_Location) Reset()                    { *m = SourceCodeInfo_Location{} }
-func (m *SourceCodeInfo_Location) String() string            { return proto.CompactTextString(m) }
-func (*SourceCodeInfo_Location) ProtoMessage()               {}
-func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17, 0} }
-
-func (m *SourceCodeInfo_Location) GetPath() []int32 {
-	if m != nil {
-		return m.Path
-	}
-	return nil
-}
-
-func (m *SourceCodeInfo_Location) GetSpan() []int32 {
-	if m != nil {
-		return m.Span
-	}
-	return nil
-}
-
-func (m *SourceCodeInfo_Location) GetLeadingComments() string {
-	if m != nil && m.LeadingComments != nil {
-		return *m.LeadingComments
-	}
-	return ""
-}
-
-func (m *SourceCodeInfo_Location) GetTrailingComments() string {
-	if m != nil && m.TrailingComments != nil {
-		return *m.TrailingComments
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*FileDescriptorSet)(nil), "google.protobuf.FileDescriptorSet")
-	proto.RegisterType((*FileDescriptorProto)(nil), "google.protobuf.FileDescriptorProto")
-	proto.RegisterType((*DescriptorProto)(nil), "google.protobuf.DescriptorProto")
-	proto.RegisterType((*DescriptorProto_ExtensionRange)(nil), "google.protobuf.DescriptorProto.ExtensionRange")
-	proto.RegisterType((*FieldDescriptorProto)(nil), "google.protobuf.FieldDescriptorProto")
-	proto.RegisterType((*OneofDescriptorProto)(nil), "google.protobuf.OneofDescriptorProto")
-	proto.RegisterType((*EnumDescriptorProto)(nil), "google.protobuf.EnumDescriptorProto")
-	proto.RegisterType((*EnumValueDescriptorProto)(nil), "google.protobuf.EnumValueDescriptorProto")
-	proto.RegisterType((*ServiceDescriptorProto)(nil), "google.protobuf.ServiceDescriptorProto")
-	proto.RegisterType((*MethodDescriptorProto)(nil), "google.protobuf.MethodDescriptorProto")
-	proto.RegisterType((*FileOptions)(nil), "google.protobuf.FileOptions")
-	proto.RegisterType((*MessageOptions)(nil), "google.protobuf.MessageOptions")
-	proto.RegisterType((*FieldOptions)(nil), "google.protobuf.FieldOptions")
-	proto.RegisterType((*EnumOptions)(nil), "google.protobuf.EnumOptions")
-	proto.RegisterType((*EnumValueOptions)(nil), "google.protobuf.EnumValueOptions")
-	proto.RegisterType((*ServiceOptions)(nil), "google.protobuf.ServiceOptions")
-	proto.RegisterType((*MethodOptions)(nil), "google.protobuf.MethodOptions")
-	proto.RegisterType((*UninterpretedOption)(nil), "google.protobuf.UninterpretedOption")
-	proto.RegisterType((*UninterpretedOption_NamePart)(nil), "google.protobuf.UninterpretedOption.NamePart")
-	proto.RegisterType((*SourceCodeInfo)(nil), "google.protobuf.SourceCodeInfo")
-	proto.RegisterType((*SourceCodeInfo_Location)(nil), "google.protobuf.SourceCodeInfo.Location")
-	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Type", FieldDescriptorProto_Type_name, FieldDescriptorProto_Type_value)
-	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Label", FieldDescriptorProto_Label_name, FieldDescriptorProto_Label_value)
-	proto.RegisterEnum("google.protobuf.FileOptions_OptimizeMode", FileOptions_OptimizeMode_name, FileOptions_OptimizeMode_value)
-	proto.RegisterEnum("google.protobuf.FieldOptions_CType", FieldOptions_CType_name, FieldOptions_CType_value)
-}
-
-var fileDescriptor0 = []byte{
-	// 1635 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x72, 0xdb, 0xd4,
-	0x17, 0xff, 0xfb, 0x43, 0xfe, 0x38, 0x76, 0x1c, 0x45, 0x49, 0x5b, 0x35, 0xff, 0x96, 0xb4, 0xa6,
-	0x2d, 0x69, 0x69, 0x1d, 0x26, 0x2d, 0xa5, 0x84, 0x55, 0x3e, 0xd4, 0xd4, 0x33, 0x4e, 0x6c, 0x12,
-	0x87, 0xa1, 0x6c, 0x34, 0x37, 0xf2, 0xb5, 0xa3, 0x56, 0x96, 0x8c, 0x24, 0xa7, 0x4d, 0x19, 0x66,
-	0x78, 0x00, 0x98, 0xe1, 0x09, 0x18, 0x5e, 0x81, 0x0d, 0x2b, 0x36, 0xec, 0x79, 0x03, 0xb6, 0x0c,
-	0xf0, 0x18, 0x9c, 0x7b, 0xaf, 0x25, 0x4b, 0x8a, 0x9d, 0xb6, 0x4c, 0x4b, 0x57, 0xee, 0xb9, 0xbf,
-	0x73, 0xce, 0xef, 0x9e, 0xcf, 0xab, 0xc0, 0x95, 0x9e, 0xe3, 0xf4, 0x2c, 0xba, 0x32, 0x70, 0x1d,
-	0xdf, 0x39, 0x1c, 0x76, 0x57, 0x3a, 0xd4, 0x33, 0x5c, 0x73, 0xe0, 0x3b, 0x6e, 0x8d, 0xcb, 0x94,
-	0x59, 0x81, 0xa8, 0x05, 0x88, 0xea, 0x36, 0xcc, 0x3d, 0x34, 0x2d, 0xba, 0x15, 0x02, 0xf7, 0xa9,
-	0xaf, 0xac, 0x42, 0xb6, 0x8b, 0x42, 0x35, 0x75, 0x25, 0xb3, 0x5c, 0x5a, 0xbd, 0x56, 0x4b, 0x28,
-	0xd5, 0xe2, 0x1a, 0x2d, 0x26, 0xae, 0xfe, 0x9e, 0x81, 0xf9, 0x09, 0x72, 0xa5, 0x0c, 0x59, 0x9b,
-	0xf4, 0x99, 0xad, 0xd4, 0x72, 0x51, 0x99, 0x85, 0xfc, 0x80, 0x18, 0x4f, 0x49, 0x8f, 0xaa, 0x69,
-	0x2e, 0x50, 0x00, 0x3a, 0x74, 0x40, 0xed, 0x0e, 0xb5, 0x8d, 0x13, 0x35, 0x83, 0x0e, 0x8b, 0xca,
-	0x45, 0x98, 0x1b, 0x0c, 0x0f, 0x2d, 0xd3, 0xd0, 0x23, 0x47, 0x80, 0x47, 0x92, 0x72, 0x01, 0x66,
-	0x9f, 0x51, 0xf2, 0x34, 0x7a, 0x50, 0xe2, 0x07, 0xf7, 0xa1, 0xdc, 0xa7, 0x9e, 0x87, 0x86, 0x75,
-	0xff, 0x64, 0x40, 0xd5, 0x2c, 0xa7, 0x7e, 0xe5, 0x14, 0xf5, 0x24, 0xbd, 0x8f, 0xa0, 0x48, 0xed,
-	0x61, 0x5f, 0x28, 0x49, 0x53, 0xee, 0xab, 0x21, 0x22, 0xa9, 0xf8, 0x00, 0xf2, 0x1e, 0x75, 0x8f,
-	0x4d, 0x83, 0xaa, 0x39, 0xae, 0xf6, 0xde, 0x29, 0xb5, 0x7d, 0x71, 0x7e, 0x5a, 0xb3, 0x48, 0x9f,
-	0xfb, 0xd4, 0xf6, 0x4c, 0xc7, 0x56, 0xf3, 0x5c, 0xf7, 0xfa, 0x84, 0x10, 0x53, 0xab, 0x93, 0xd4,
-	0xbc, 0x03, 0x79, 0x67, 0xe0, 0xa3, 0x9a, 0xa7, 0x16, 0x30, 0x7a, 0xa5, 0xd5, 0x4b, 0x13, 0x53,
-	0xd3, 0x14, 0x18, 0xe5, 0x63, 0x90, 0x3d, 0x67, 0xe8, 0x1a, 0x54, 0x37, 0x9c, 0x0e, 0xd5, 0x4d,
-	0xbb, 0xeb, 0xa8, 0x45, 0xae, 0xb7, 0x74, 0x9a, 0x2b, 0x07, 0x6e, 0x22, 0xae, 0x8e, 0x30, 0xa5,
-	0x02, 0x39, 0xef, 0xc4, 0xf6, 0xc9, 0x73, 0xb5, 0xcc, 0xd2, 0x54, 0xfd, 0x23, 0x03, 0xb3, 0x67,
-	0x67, 0xf6, 0x1e, 0x48, 0x5d, 0xc6, 0x19, 0xf3, 0xfa, 0x1a, 0x37, 0x8a, 0xc5, 0x22, 0xf7, 0x3a,
-	0x9a, 0x1f, 0x42, 0xc9, 0xa6, 0x9e, 0x4f, 0x3b, 0x22, 0x75, 0x99, 0x7f, 0x93, 0xef, 0xec, 0x6b,
-	0xe4, 0xfb, 0x11, 0xcc, 0x86, 0x4c, 0x75, 0x97, 0xd8, 0xbd, 0xa0, 0x5c, 0x56, 0x5e, 0xe6, 0xb3,
-	0xa6, 0x05, 0x7a, 0x7b, 0x4c, 0x0d, 0xd3, 0x02, 0x8e, 0x4d, 0x9d, 0x2e, 0x16, 0xb1, 0x61, 0x61,
-	0x22, 0x27, 0x5f, 0xba, 0xc9, 0x20, 0x49, 0x12, 0x1f, 0x8c, 0x0b, 0x20, 0x3f, 0x25, 0x91, 0x3b,
-	0xa2, 0x0b, 0x46, 0x35, 0xb0, 0x78, 0x1b, 0x2a, 0x09, 0xf7, 0x33, 0x20, 0x79, 0x3e, 0x71, 0x7d,
-	0x9e, 0x37, 0x49, 0x29, 0x41, 0x06, 0x3b, 0x89, 0x77, 0xa3, 0x54, 0xfd, 0x45, 0x82, 0x85, 0x89,
-	0xd1, 0x8e, 0xe7, 0x1a, 0xab, 0x03, 0x23, 0x74, 0x48, 0x5d, 0x0c, 0x3b, 0xb3, 0xb1, 0x06, 0x92,
-	0x45, 0x0e, 0xa9, 0x85, 0x01, 0x4d, 0x2d, 0x57, 0x56, 0xdf, 0x7f, 0xa5, 0x0c, 0xd6, 0x1a, 0x4c,
-	0x05, 0x2b, 0x20, 0x3b, 0xea, 0x3d, 0xa6, 0x7a, 0xeb, 0xd5, 0x54, 0xdb, 0xa8, 0xa1, 0xcc, 0x41,
-	0x91, 0x69, 0xea, 0x9c, 0x58, 0x8e, 0x13, 0x93, 0xa1, 0xc0, 0x93, 0xd4, 0xa1, 0xc1, 0x7c, 0x39,
-	0x07, 0x33, 0x1d, 0xda, 0x25, 0x43, 0xcb, 0xd7, 0x8f, 0x89, 0x35, 0xa4, 0x3c, 0x6e, 0x45, 0x65,
-	0x1e, 0x4a, 0x22, 0x07, 0x26, 0x62, 0x9f, 0xf3, 0xae, 0x90, 0x98, 0xc1, 0x27, 0x1e, 0x66, 0x97,
-	0x1b, 0x04, 0x8e, 0xab, 0x25, 0x3b, 0xee, 0xf2, 0x64, 0x82, 0xa3, 0x70, 0x57, 0x7f, 0x4e, 0x43,
-	0x96, 0x93, 0x9b, 0x85, 0x52, 0xfb, 0x71, 0x4b, 0xd3, 0xb7, 0x9a, 0x07, 0x1b, 0x0d, 0x4d, 0x4e,
-	0x61, 0xcc, 0x80, 0x0b, 0x1e, 0x36, 0x9a, 0xeb, 0x6d, 0x39, 0x1d, 0xfe, 0xbf, 0xbe, 0xdb, 0xbe,
-	0x7f, 0x4f, 0xce, 0x84, 0x0a, 0x07, 0x42, 0x90, 0x8d, 0x02, 0xee, 0xae, 0xca, 0x12, 0xde, 0xad,
-	0x2c, 0x0c, 0xd4, 0x3f, 0xd7, 0xb6, 0x10, 0x91, 0x8b, 0x4b, 0x10, 0x93, 0xc7, 0xdc, 0x16, 0xb9,
-	0x64, 0xa3, 0xd9, 0x6c, 0xc8, 0x85, 0xd0, 0xe6, 0x7e, 0x7b, 0xaf, 0xbe, 0xbb, 0x2d, 0x17, 0x43,
-	0x9b, 0xdb, 0x7b, 0xcd, 0x83, 0x96, 0x0c, 0xa1, 0x85, 0x1d, 0x6d, 0x7f, 0x7f, 0x7d, 0x5b, 0x93,
-	0x4b, 0x21, 0x62, 0xe3, 0x71, 0x5b, 0xdb, 0x97, 0xcb, 0x31, 0x5a, 0xe8, 0x62, 0x26, 0x74, 0xa1,
-	0xed, 0x1e, 0xec, 0xc8, 0x15, 0x8c, 0xd9, 0x8c, 0x70, 0x11, 0x90, 0x98, 0x4d, 0x88, 0x90, 0xa9,
-	0x3c, 0x26, 0x22, 0xac, 0xcc, 0xc5, 0x04, 0x88, 0x50, 0xaa, 0x9b, 0x20, 0x89, 0x7a, 0x50, 0xa0,
-	0xd2, 0x58, 0xdf, 0xd0, 0x1a, 0x7a, 0xb3, 0xd5, 0xae, 0x37, 0x77, 0xd7, 0x1b, 0x18, 0xbb, 0x50,
-	0xb6, 0xa7, 0x7d, 0x7a, 0x50, 0xdf, 0xd3, 0xb6, 0x30, 0x7e, 0x11, 0x59, 0x4b, 0x5b, 0x6f, 0xa3,
-	0x2c, 0x53, 0xbd, 0x06, 0x0b, 0x13, 0xdb, 0x26, 0x56, 0xbd, 0xd5, 0x6f, 0x53, 0x30, 0x3f, 0xa9,
-	0xc3, 0xe3, 0x35, 0xfe, 0x00, 0x24, 0x51, 0x30, 0x62, 0x9e, 0xdd, 0x9c, 0x38, 0x24, 0x3e, 0x63,
-	0x88, 0x33, 0xa6, 0x74, 0x66, 0xca, 0x94, 0x66, 0xba, 0x41, 0xc9, 0x58, 0xa0, 0x4e, 0x35, 0x35,
-	0xad, 0xed, 0x78, 0xb7, 0xe2, 0x9a, 0x4e, 0x38, 0xba, 0x3a, 0x9d, 0x64, 0xe0, 0xed, 0xfb, 0x14,
-	0x9c, 0x9f, 0xb2, 0x97, 0xe2, 0xce, 0xee, 0x43, 0xae, 0x4f, 0xfd, 0x23, 0x27, 0x18, 0xe8, 0x37,
-	0x26, 0x4c, 0x1a, 0x76, 0x7c, 0xc6, 0x88, 0xca, 0x4c, 0xdb, 0x35, 0xc2, 0x7f, 0x40, 0xe9, 0xd7,
-	0x14, 0x9c, 0x9b, 0x6c, 0x2b, 0xce, 0x08, 0x9f, 0x0a, 0xa6, 0x3d, 0x18, 0xfa, 0x62, 0x76, 0xa7,
-	0xc3, 0x3e, 0x1e, 0xfa, 0xa1, 0x30, 0xc3, 0x85, 0x2b, 0x63, 0x0a, 0x59, 0x4e, 0xe1, 0x9d, 0x29,
-	0xdc, 0x83, 0x45, 0xb9, 0x04, 0xb2, 0x61, 0x99, 0xd4, 0xf6, 0x75, 0xcf, 0x77, 0x29, 0xe9, 0x9b,
-	0x76, 0x8f, 0xcf, 0xa3, 0xc2, 0x9a, 0xd4, 0x25, 0x96, 0x47, 0x19, 0x80, 0x2d, 0x7b, 0xea, 0x46,
-	0x00, 0xb9, 0x08, 0xa0, 0xfa, 0x5b, 0x16, 0x4a, 0xd1, 0xd5, 0xbb, 0x00, 0xe5, 0x27, 0xe4, 0x98,
-	0xe8, 0xc1, 0x63, 0x47, 0xdc, 0xe0, 0x12, 0x2c, 0x70, 0x29, 0x52, 0x46, 0x53, 0x86, 0x45, 0x3c,
-	0x8f, 0xdf, 0xaf, 0xc0, 0x4f, 0xab, 0x30, 0xcf, 0x4f, 0xfb, 0x38, 0xac, 0xcc, 0x81, 0x45, 0x75,
-	0xf6, 0x06, 0xf3, 0xf8, 0x20, 0x0a, 0x89, 0xdc, 0x86, 0xcb, 0x1c, 0xd3, 0xa3, 0x36, 0x75, 0x89,
-	0x4f, 0x75, 0xfa, 0xe5, 0x10, 0x0f, 0x74, 0x62, 0x77, 0xf4, 0x23, 0xe2, 0x1d, 0xa9, 0x0b, 0x51,
-	0xf4, 0x75, 0x38, 0xcf, 0xd1, 0x48, 0x1a, 0x19, 0xeb, 0xc6, 0x11, 0x35, 0x9e, 0xea, 0x43, 0xbf,
-	0xfb, 0x40, 0xfd, 0x7f, 0x14, 0xf6, 0x10, 0xca, 0x2c, 0x5e, 0x7d, 0xf3, 0x05, 0xfa, 0x74, 0x5c,
-	0x3e, 0x0d, 0x2b, 0x13, 0x2a, 0x3e, 0x72, 0xc1, 0x5a, 0x73, 0xa4, 0xb0, 0x83, 0x2f, 0x86, 0x35,
-	0x69, 0xbf, 0xa5, 0x69, 0x5b, 0x2c, 0x41, 0x3d, 0x27, 0xbc, 0x72, 0x29, 0xb8, 0x94, 0x61, 0x08,
-	0xba, 0xf8, 0x9e, 0x1b, 0xbd, 0x98, 0x3c, 0x55, 0x8e, 0xfa, 0xbf, 0x06, 0xe7, 0xc6, 0x97, 0x8a,
-	0xa2, 0xe6, 0xa2, 0x28, 0xb4, 0x34, 0x38, 0x39, 0x8d, 0x51, 0xa2, 0x98, 0x8b, 0xfc, 0x35, 0xe9,
-	0x52, 0x03, 0x43, 0xd3, 0x51, 0x2f, 0x24, 0x52, 0x88, 0x44, 0xa8, 0x4d, 0x0e, 0x31, 0xb2, 0xc4,
-	0xc5, 0x1f, 0x9e, 0xba, 0x14, 0x05, 0x6c, 0xc2, 0xc2, 0xd0, 0x36, 0x6d, 0xcc, 0x0c, 0x1a, 0x60,
-	0xef, 0x0a, 0x51, 0x43, 0xea, 0x5f, 0xf9, 0x29, 0xaf, 0x84, 0x83, 0x28, 0x5a, 0xc4, 0xa5, 0xba,
-	0x06, 0xe5, 0x68, 0x64, 0x94, 0x22, 0x88, 0xd8, 0xe0, 0x10, 0xc3, 0xc1, 0xb9, 0xd9, 0xdc, 0x62,
-	0x23, 0xef, 0x0b, 0x0d, 0xe7, 0x17, 0x8e, 0xde, 0x46, 0xbd, 0xad, 0xe9, 0x7b, 0x07, 0xbb, 0xed,
-	0xfa, 0x8e, 0x26, 0x67, 0x6e, 0x15, 0x0b, 0x7f, 0xe7, 0xe5, 0x6f, 0xf0, 0x5f, 0xba, 0xfa, 0x67,
-	0x0a, 0x2a, 0xf1, 0x45, 0xae, 0xdc, 0x80, 0x0b, 0xc1, 0x03, 0xd7, 0xa3, 0xbe, 0xfe, 0xcc, 0x74,
-	0x79, 0xb2, 0xfa, 0x44, 0x2c, 0xf2, 0xf0, 0x1a, 0x35, 0x58, 0xb2, 0x1d, 0xcc, 0x38, 0x56, 0x04,
-	0x71, 0x3b, 0xfa, 0xf8, 0x0b, 0x40, 0x27, 0x06, 0xc6, 0xcb, 0x73, 0xc4, 0xf4, 0x98, 0x12, 0xb2,
-	0x4c, 0xf4, 0x08, 0xf7, 0x61, 0x9f, 0x0c, 0x30, 0x66, 0xbe, 0x7b, 0xc2, 0xf7, 0x66, 0xe1, 0x8d,
-	0x04, 0x29, 0x7a, 0xd1, 0x1f, 0xd3, 0x50, 0x8e, 0x2e, 0x50, 0xf6, 0x94, 0x30, 0x78, 0x2b, 0xa7,
-	0x78, 0x11, 0xbe, 0x7b, 0xe6, 0xba, 0xad, 0x6d, 0xb2, 0x5d, 0xbb, 0x96, 0x13, 0xfb, 0x8d, 0xcd,
-	0x47, 0x56, 0x7c, 0x54, 0xbc, 0x66, 0x0a, 0x38, 0x1c, 0xb2, 0x16, 0x79, 0x71, 0x12, 0x6f, 0xe5,
-	0x33, 0xee, 0x8b, 0x78, 0xf6, 0x71, 0x11, 0xef, 0xb8, 0x37, 0x52, 0x16, 0x2b, 0x20, 0x71, 0xaa,
-	0xd8, 0x21, 0x23, 0xb2, 0xf2, 0xff, 0x94, 0x02, 0x64, 0x37, 0x9b, 0x7b, 0xac, 0x34, 0xb0, 0x16,
-	0x84, 0x54, 0x6f, 0xd5, 0xb5, 0x4d, 0xac, 0x8e, 0x68, 0x88, 0xbe, 0x4b, 0x41, 0x29, 0xb2, 0x2f,
-	0xd8, 0xc8, 0x23, 0x96, 0xe5, 0x3c, 0xd3, 0x89, 0x65, 0x62, 0x0d, 0x8b, 0xab, 0x9e, 0x71, 0xab,
-	0x37, 0x9d, 0xb2, 0xaf, 0x41, 0x4e, 0x6e, 0x95, 0x84, 0xfb, 0xd4, 0xdb, 0x74, 0xff, 0x15, 0x54,
-	0xe2, 0xfb, 0x23, 0xe1, 0xfc, 0xea, 0xdb, 0x74, 0xfe, 0x02, 0x66, 0xe2, 0x9b, 0xe3, 0x3f, 0xf4,
-	0xfd, 0x43, 0x1a, 0xe6, 0x27, 0x40, 0x94, 0x4f, 0x46, 0x4b, 0x52, 0xac, 0xe9, 0x3b, 0xaf, 0x62,
-	0xb6, 0xb6, 0x8b, 0x0a, 0x2d, 0xfc, 0x06, 0x50, 0x54, 0x90, 0x4d, 0xfc, 0x8c, 0xf6, 0x4d, 0xfc,
-	0x76, 0x73, 0x47, 0x2f, 0x64, 0xb1, 0x44, 0x17, 0x41, 0x19, 0x38, 0x9e, 0xe9, 0x9b, 0xc7, 0xec,
-	0xcb, 0x31, 0x78, 0x3d, 0xb3, 0x7d, 0x9a, 0x65, 0x67, 0x36, 0xed, 0x91, 0xc4, 0x19, 0x6b, 0xb3,
-	0x0c, 0xdb, 0x7c, 0x1d, 0x67, 0xc8, 0x86, 0xac, 0x90, 0xb2, 0x35, 0x99, 0x62, 0xd2, 0xd1, 0x12,
-	0x1a, 0xbf, 0xc2, 0xcb, 0xec, 0x6b, 0x9e, 0xf4, 0x7a, 0x2e, 0x33, 0x15, 0xc0, 0xf9, 0x2a, 0x5c,
-	0xbc, 0x0b, 0x85, 0x90, 0x22, 0x4e, 0x21, 0x76, 0x3f, 0xdc, 0x2b, 0xfc, 0x9b, 0x25, 0x8d, 0xdc,
-	0xd0, 0x9a, 0xe9, 0xe9, 0xe3, 0x0f, 0xc7, 0x34, 0x4a, 0x0b, 0xd5, 0x9f, 0x70, 0x68, 0x26, 0x3e,
-	0x63, 0xd7, 0xa0, 0x60, 0x39, 0x98, 0x1b, 0x06, 0x12, 0x7f, 0xcc, 0x58, 0x7e, 0xc9, 0x97, 0x6f,
-	0xad, 0x31, 0xc2, 0x2f, 0x1a, 0x50, 0x08, 0x7e, 0x63, 0x83, 0x66, 0x07, 0xc4, 0x3f, 0xe2, 0x36,
-	0xa4, 0x8d, 0x34, 0x6f, 0xd9, 0xac, 0x37, 0x20, 0x36, 0x8f, 0xba, 0x90, 0x60, 0x28, 0x2d, 0x4a,
-	0x3a, 0x7c, 0xd1, 0x3a, 0xfd, 0x3e, 0x06, 0xd5, 0x1b, 0x85, 0xf2, 0x22, 0xcc, 0xf9, 0x2e, 0x31,
-	0xad, 0xd8, 0x11, 0x8b, 0x64, 0x71, 0xe3, 0x26, 0xae, 0x47, 0xa7, 0x9f, 0xe4, 0xb4, 0x21, 0x27,
-	0x5e, 0x42, 0xde, 0xa3, 0xd4, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xe5, 0x5c, 0x96, 0xdd,
-	0x11, 0x00, 0x00,
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go
deleted file mode 100644
index 0d6055d610..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/doc.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-	A plugin for the Google protocol buffer compiler to generate Go code.
-	Run it by building this program and putting it in your path with the name
-		protoc-gen-go
-	That word 'go' at the end becomes part of the option string set for the
-	protocol compiler, so once the protocol compiler (protoc) is installed
-	you can run
-		protoc --go_out=output_directory input_directory/file.proto
-	to generate Go bindings for the protocol defined by file.proto.
-	With that input, the output will be written to
-		output_directory/file.pb.go
-
-	The generated code is documented in the package comment for
-	the library.
-
-	See the README and documentation for protocol buffers to learn more:
-		https://developers.google.com/protocol-buffers/
-
-*/
-package documentation
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
deleted file mode 100644
index b5715c3577..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-include $(GOROOT)/src/Make.inc
-
-TARG=github.com/golang/protobuf/compiler/generator
-GOFILES=\
-	generator.go\
-
-DEPS=../descriptor ../plugin ../../proto
-
-include $(GOROOT)/src/Make.pkg
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
deleted file mode 100644
index c2c96bf720..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
+++ /dev/null
@@ -1,2715 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-	The code generator for the plugin for the Google protocol buffer compiler.
-	It generates Go code from the protocol buffer description files read by the
-	main routine.
-*/
-package generator
-
-import (
-	"bufio"
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"go/parser"
-	"go/printer"
-	"go/token"
-	"log"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-
-	"github.com/golang/protobuf/proto"
-
-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
-)
-
-// generatedCodeVersion indicates a version of the generated code.
-// It is incremented whenever an incompatibility between the generated code and
-// proto package is introduced; the generated code references
-// a constant, proto.ProtoPackageIsVersionN (where N is generatedCodeVersion).
-const generatedCodeVersion = 1
-
-// A Plugin provides functionality to add to the output during Go code generation,
-// such as to produce RPC stubs.
-type Plugin interface {
-	// Name identifies the plugin.
-	Name() string
-	// Init is called once after data structures are built but before
-	// code generation begins.
-	Init(g *Generator)
-	// Generate produces the code generated by the plugin for this file,
-	// except for the imports, by calling the generator's methods P, In, and Out.
-	Generate(file *FileDescriptor)
-	// GenerateImports produces the import declarations for this file.
-	// It is called after Generate.
-	GenerateImports(file *FileDescriptor)
-}
-
-var plugins []Plugin
-
-// RegisterPlugin installs a (second-order) plugin to be run when the Go output is generated.
-// It is typically called during initialization.
-func RegisterPlugin(p Plugin) {
-	plugins = append(plugins, p)
-}
-
-// Each type we import as a protocol buffer (other than FileDescriptorProto) needs
-// a pointer to the FileDescriptorProto that represents it.  These types achieve that
-// wrapping by placing each Proto inside a struct with the pointer to its File. The
-// structs have the same names as their contents, with "Proto" removed.
-// FileDescriptor is used to store the things that it points to.
-
-// The file and package name method are common to messages and enums.
-type common struct {
-	file *descriptor.FileDescriptorProto // File this object comes from.
-}
-
-// PackageName is name in the package clause in the generated file.
-func (c *common) PackageName() string { return uniquePackageOf(c.file) }
-
-func (c *common) File() *descriptor.FileDescriptorProto { return c.file }
-
-func fileIsProto3(file *descriptor.FileDescriptorProto) bool {
-	return file.GetSyntax() == "proto3"
-}
-
-func (c *common) proto3() bool { return fileIsProto3(c.file) }
-
-// Descriptor represents a protocol buffer message.
-type Descriptor struct {
-	common
-	*descriptor.DescriptorProto
-	parent   *Descriptor            // The containing message, if any.
-	nested   []*Descriptor          // Inner messages, if any.
-	enums    []*EnumDescriptor      // Inner enums, if any.
-	ext      []*ExtensionDescriptor // Extensions, if any.
-	typename []string               // Cached typename vector.
-	index    int                    // The index into the container, whether the file or another message.
-	path     string                 // The SourceCodeInfo path as comma-separated integers.
-	group    bool
-}
-
-// TypeName returns the elements of the dotted type name.
-// The package name is not part of this name.
-func (d *Descriptor) TypeName() []string {
-	if d.typename != nil {
-		return d.typename
-	}
-	n := 0
-	for parent := d; parent != nil; parent = parent.parent {
-		n++
-	}
-	s := make([]string, n, n)
-	for parent := d; parent != nil; parent = parent.parent {
-		n--
-		s[n] = parent.GetName()
-	}
-	d.typename = s
-	return s
-}
-
-// EnumDescriptor describes an enum. If it's at top level, its parent will be nil.
-// Otherwise it will be the descriptor of the message in which it is defined.
-type EnumDescriptor struct {
-	common
-	*descriptor.EnumDescriptorProto
-	parent   *Descriptor // The containing message, if any.
-	typename []string    // Cached typename vector.
-	index    int         // The index into the container, whether the file or a message.
-	path     string      // The SourceCodeInfo path as comma-separated integers.
-}
-
-// TypeName returns the elements of the dotted type name.
-// The package name is not part of this name.
-func (e *EnumDescriptor) TypeName() (s []string) {
-	if e.typename != nil {
-		return e.typename
-	}
-	name := e.GetName()
-	if e.parent == nil {
-		s = make([]string, 1)
-	} else {
-		pname := e.parent.TypeName()
-		s = make([]string, len(pname)+1)
-		copy(s, pname)
-	}
-	s[len(s)-1] = name
-	e.typename = s
-	return s
-}
-
-// Everything but the last element of the full type name, CamelCased.
-// The values of type Foo.Bar are call Foo_value1... not Foo_Bar_value1... .
-func (e *EnumDescriptor) prefix() string {
-	if e.parent == nil {
-		// If the enum is not part of a message, the prefix is just the type name.
-		return CamelCase(*e.Name) + "_"
-	}
-	typeName := e.TypeName()
-	return CamelCaseSlice(typeName[0:len(typeName)-1]) + "_"
-}
-
-// The integer value of the named constant in this enumerated type.
-func (e *EnumDescriptor) integerValueAsString(name string) string {
-	for _, c := range e.Value {
-		if c.GetName() == name {
-			return fmt.Sprint(c.GetNumber())
-		}
-	}
-	log.Fatal("cannot find value for enum constant")
-	return ""
-}
-
-// ExtensionDescriptor describes an extension. If it's at top level, its parent will be nil.
-// Otherwise it will be the descriptor of the message in which it is defined.
-type ExtensionDescriptor struct {
-	common
-	*descriptor.FieldDescriptorProto
-	parent *Descriptor // The containing message, if any.
-}
-
-// TypeName returns the elements of the dotted type name.
-// The package name is not part of this name.
-func (e *ExtensionDescriptor) TypeName() (s []string) {
-	name := e.GetName()
-	if e.parent == nil {
-		// top-level extension
-		s = make([]string, 1)
-	} else {
-		pname := e.parent.TypeName()
-		s = make([]string, len(pname)+1)
-		copy(s, pname)
-	}
-	s[len(s)-1] = name
-	return s
-}
-
-// DescName returns the variable name used for the generated descriptor.
-func (e *ExtensionDescriptor) DescName() string {
-	// The full type name.
-	typeName := e.TypeName()
-	// Each scope of the extension is individually CamelCased, and all are joined with "_" with an "E_" prefix.
-	for i, s := range typeName {
-		typeName[i] = CamelCase(s)
-	}
-	return "E_" + strings.Join(typeName, "_")
-}
-
-// ImportedDescriptor describes a type that has been publicly imported from another file.
-type ImportedDescriptor struct {
-	common
-	o Object
-}
-
-func (id *ImportedDescriptor) TypeName() []string { return id.o.TypeName() }
-
-// FileDescriptor describes an protocol buffer descriptor file (.proto).
-// It includes slices of all the messages and enums defined within it.
-// Those slices are constructed by WrapTypes.
-type FileDescriptor struct {
-	*descriptor.FileDescriptorProto
-	desc []*Descriptor          // All the messages defined in this file.
-	enum []*EnumDescriptor      // All the enums defined in this file.
-	ext  []*ExtensionDescriptor // All the top-level extensions defined in this file.
-	imp  []*ImportedDescriptor  // All types defined in files publicly imported by this file.
-
-	// Comments, stored as a map of path (comma-separated integers) to the comment.
-	comments map[string]*descriptor.SourceCodeInfo_Location
-
-	// The full list of symbols that are exported,
-	// as a map from the exported object to its symbols.
-	// This is used for supporting public imports.
-	exported map[Object][]symbol
-
-	index int // The index of this file in the list of files to generate code for
-
-	proto3 bool // whether to generate proto3 code for this file
-}
-
-// PackageName is the package name we'll use in the generated code to refer to this file.
-func (d *FileDescriptor) PackageName() string { return uniquePackageOf(d.FileDescriptorProto) }
-
-// goPackageName returns the Go package name to use in the
-// generated Go file.  The result explicit reports whether the name
-// came from an option go_package statement.  If explicit is false,
-// the name was derived from the protocol buffer's package statement
-// or the input file name.
-func (d *FileDescriptor) goPackageName() (name string, explicit bool) {
-	// Does the file have a "go_package" option?
-	if opts := d.Options; opts != nil {
-		if pkg := opts.GetGoPackage(); pkg != "" {
-			return pkg, true
-		}
-	}
-
-	// Does the file have a package clause?
-	if pkg := d.GetPackage(); pkg != "" {
-		return pkg, false
-	}
-	// Use the file base name.
-	return baseName(d.GetName()), false
-}
-
-func (d *FileDescriptor) addExport(obj Object, sym symbol) {
-	d.exported[obj] = append(d.exported[obj], sym)
-}
-
-// symbol is an interface representing an exported Go symbol.
-type symbol interface {
-	// GenerateAlias should generate an appropriate alias
-	// for the symbol from the named package.
-	GenerateAlias(g *Generator, pkg string)
-}
-
-type messageSymbol struct {
-	sym                         string
-	hasExtensions, isMessageSet bool
-	hasOneof                    bool
-	getters                     []getterSymbol
-}
-
-type getterSymbol struct {
-	name     string
-	typ      string
-	typeName string // canonical name in proto world; empty for proto.Message and similar
-	genType  bool   // whether typ contains a generated type (message/group/enum)
-}
-
-func (ms *messageSymbol) GenerateAlias(g *Generator, pkg string) {
-	remoteSym := pkg + "." + ms.sym
-
-	g.P("type ", ms.sym, " ", remoteSym)
-	g.P("func (m *", ms.sym, ") Reset() { (*", remoteSym, ")(m).Reset() }")
-	g.P("func (m *", ms.sym, ") String() string { return (*", remoteSym, ")(m).String() }")
-	g.P("func (*", ms.sym, ") ProtoMessage() {}")
-	if ms.hasExtensions {
-		g.P("func (*", ms.sym, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange ",
-			"{ return (*", remoteSym, ")(nil).ExtensionRangeArray() }")
-		g.P("func (m *", ms.sym, ") ExtensionMap() map[int32]", g.Pkg["proto"], ".Extension ",
-			"{ return (*", remoteSym, ")(m).ExtensionMap() }")
-		if ms.isMessageSet {
-			g.P("func (m *", ms.sym, ") Marshal() ([]byte, error) ",
-				"{ return (*", remoteSym, ")(m).Marshal() }")
-			g.P("func (m *", ms.sym, ") Unmarshal(buf []byte) error ",
-				"{ return (*", remoteSym, ")(m).Unmarshal(buf) }")
-		}
-	}
-	if ms.hasOneof {
-		// Oneofs and public imports do not mix well.
-		// We can make them work okay for the binary format,
-		// but they're going to break weirdly for text/JSON.
-		enc := "_" + ms.sym + "_OneofMarshaler"
-		dec := "_" + ms.sym + "_OneofUnmarshaler"
-		size := "_" + ms.sym + "_OneofSizer"
-		encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error"
-		decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)"
-		sizeSig := "(msg " + g.Pkg["proto"] + ".Message) int"
-		g.P("func (m *", ms.sym, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {")
-		g.P("return ", enc, ", ", dec, ", ", size, ", nil")
-		g.P("}")
-
-		g.P("func ", enc, encSig, " {")
-		g.P("m := msg.(*", ms.sym, ")")
-		g.P("m0 := (*", remoteSym, ")(m)")
-		g.P("enc, _, _, _ := m0.XXX_OneofFuncs()")
-		g.P("return enc(m0, b)")
-		g.P("}")
-
-		g.P("func ", dec, decSig, " {")
-		g.P("m := msg.(*", ms.sym, ")")
-		g.P("m0 := (*", remoteSym, ")(m)")
-		g.P("_, dec, _, _ := m0.XXX_OneofFuncs()")
-		g.P("return dec(m0, tag, wire, b)")
-		g.P("}")
-
-		g.P("func ", size, sizeSig, " {")
-		g.P("m := msg.(*", ms.sym, ")")
-		g.P("m0 := (*", remoteSym, ")(m)")
-		g.P("_, _, size, _ := m0.XXX_OneofFuncs()")
-		g.P("return size(m0)")
-		g.P("}")
-	}
-	for _, get := range ms.getters {
-
-		if get.typeName != "" {
-			g.RecordTypeUse(get.typeName)
-		}
-		typ := get.typ
-		val := "(*" + remoteSym + ")(m)." + get.name + "()"
-		if get.genType {
-			// typ will be "*pkg.T" (message/group) or "pkg.T" (enum)
-			// or "map[t]*pkg.T" (map to message/enum).
-			// The first two of those might have a "[]" prefix if it is repeated.
-			// Drop any package qualifier since we have hoisted the type into this package.
-			rep := strings.HasPrefix(typ, "[]")
-			if rep {
-				typ = typ[2:]
-			}
-			isMap := strings.HasPrefix(typ, "map[")
-			star := typ[0] == '*'
-			if !isMap { // map types handled lower down
-				typ = typ[strings.Index(typ, ".")+1:]
-			}
-			if star {
-				typ = "*" + typ
-			}
-			if rep {
-				// Go does not permit conversion between slice types where both
-				// element types are named. That means we need to generate a bit
-				// of code in this situation.
-				// typ is the element type.
-				// val is the expression to get the slice from the imported type.
-
-				ctyp := typ // conversion type expression; "Foo" or "(*Foo)"
-				if star {
-					ctyp = "(" + typ + ")"
-				}
-
-				g.P("func (m *", ms.sym, ") ", get.name, "() []", typ, " {")
-				g.In()
-				g.P("o := ", val)
-				g.P("if o == nil {")
-				g.In()
-				g.P("return nil")
-				g.Out()
-				g.P("}")
-				g.P("s := make([]", typ, ", len(o))")
-				g.P("for i, x := range o {")
-				g.In()
-				g.P("s[i] = ", ctyp, "(x)")
-				g.Out()
-				g.P("}")
-				g.P("return s")
-				g.Out()
-				g.P("}")
-				continue
-			}
-			if isMap {
-				// Split map[keyTyp]valTyp.
-				bra, ket := strings.Index(typ, "["), strings.Index(typ, "]")
-				keyTyp, valTyp := typ[bra+1:ket], typ[ket+1:]
-				// Drop any package qualifier.
-				// Only the value type may be foreign.
-				star := valTyp[0] == '*'
-				valTyp = valTyp[strings.Index(valTyp, ".")+1:]
-				if star {
-					valTyp = "*" + valTyp
-				}
-
-				typ := "map[" + keyTyp + "]" + valTyp
-				g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " {")
-				g.P("o := ", val)
-				g.P("if o == nil { return nil }")
-				g.P("s := make(", typ, ", len(o))")
-				g.P("for k, v := range o {")
-				g.P("s[k] = (", valTyp, ")(v)")
-				g.P("}")
-				g.P("return s")
-				g.P("}")
-				continue
-			}
-			// Convert imported type into the forwarding type.
-			val = "(" + typ + ")(" + val + ")"
-		}
-
-		g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " { return ", val, " }")
-	}
-
-}
-
-type enumSymbol struct {
-	name   string
-	proto3 bool // Whether this came from a proto3 file.
-}
-
-func (es enumSymbol) GenerateAlias(g *Generator, pkg string) {
-	s := es.name
-	g.P("type ", s, " ", pkg, ".", s)
-	g.P("var ", s, "_name = ", pkg, ".", s, "_name")
-	g.P("var ", s, "_value = ", pkg, ".", s, "_value")
-	g.P("func (x ", s, ") String() string { return (", pkg, ".", s, ")(x).String() }")
-	if !es.proto3 {
-		g.P("func (x ", s, ") Enum() *", s, "{ return (*", s, ")((", pkg, ".", s, ")(x).Enum()) }")
-		g.P("func (x *", s, ") UnmarshalJSON(data []byte) error { return (*", pkg, ".", s, ")(x).UnmarshalJSON(data) }")
-	}
-}
-
-type constOrVarSymbol struct {
-	sym  string
-	typ  string // either "const" or "var"
-	cast string // if non-empty, a type cast is required (used for enums)
-}
-
-func (cs constOrVarSymbol) GenerateAlias(g *Generator, pkg string) {
-	v := pkg + "." + cs.sym
-	if cs.cast != "" {
-		v = cs.cast + "(" + v + ")"
-	}
-	g.P(cs.typ, " ", cs.sym, " = ", v)
-}
-
-// Object is an interface abstracting the abilities shared by enums, messages, extensions and imported objects.
-type Object interface {
-	PackageName() string // The name we use in our output (a_b_c), possibly renamed for uniqueness.
-	TypeName() []string
-	File() *descriptor.FileDescriptorProto
-}
-
-// Each package name we generate must be unique. The package we're generating
-// gets its own name but every other package must have a unique name that does
-// not conflict in the code we generate.  These names are chosen globally (although
-// they don't have to be, it simplifies things to do them globally).
-func uniquePackageOf(fd *descriptor.FileDescriptorProto) string {
-	s, ok := uniquePackageName[fd]
-	if !ok {
-		log.Fatal("internal error: no package name defined for " + fd.GetName())
-	}
-	return s
-}
-
-// Generator is the type whose methods generate the output, stored in the associated response structure.
-type Generator struct {
-	*bytes.Buffer
-
-	Request  *plugin.CodeGeneratorRequest  // The input.
-	Response *plugin.CodeGeneratorResponse // The output.
-
-	Param             map[string]string // Command-line parameters.
-	PackageImportPath string            // Go import path of the package we're generating code for
-	ImportPrefix      string            // String to prefix to imported package file names.
-	ImportMap         map[string]string // Mapping from import name to generated name
-
-	Pkg map[string]string // The names under which we import support packages
-
-	packageName      string                     // What we're calling ourselves.
-	allFiles         []*FileDescriptor          // All files in the tree
-	allFilesByName   map[string]*FileDescriptor // All files by filename.
-	genFiles         []*FileDescriptor          // Those files we will generate output for.
-	file             *FileDescriptor            // The file we are compiling now.
-	usedPackages     map[string]bool            // Names of packages used in current file.
-	typeNameToObject map[string]Object          // Key is a fully-qualified name in input syntax.
-	init             []string                   // Lines to emit in the init function.
-	indent           string
-	writeOutput      bool
-}
-
-// New creates a new generator and allocates the request and response protobufs.
-func New() *Generator {
-	g := new(Generator)
-	g.Buffer = new(bytes.Buffer)
-	g.Request = new(plugin.CodeGeneratorRequest)
-	g.Response = new(plugin.CodeGeneratorResponse)
-	return g
-}
-
-// Error reports a problem, including an error, and exits the program.
-func (g *Generator) Error(err error, msgs ...string) {
-	s := strings.Join(msgs, " ") + ":" + err.Error()
-	log.Print("protoc-gen-go: error:", s)
-	os.Exit(1)
-}
-
-// Fail reports a problem and exits the program.
-func (g *Generator) Fail(msgs ...string) {
-	s := strings.Join(msgs, " ")
-	log.Print("protoc-gen-go: error:", s)
-	os.Exit(1)
-}
-
-// CommandLineParameters breaks the comma-separated list of key=value pairs
-// in the parameter (a member of the request protobuf) into a key/value map.
-// It then sets file name mappings defined by those entries.
-func (g *Generator) CommandLineParameters(parameter string) {
-	g.Param = make(map[string]string)
-	for _, p := range strings.Split(parameter, ",") {
-		if i := strings.Index(p, "="); i < 0 {
-			g.Param[p] = ""
-		} else {
-			g.Param[p[0:i]] = p[i+1:]
-		}
-	}
-
-	g.ImportMap = make(map[string]string)
-	pluginList := "none" // Default list of plugin names to enable (empty means all).
-	for k, v := range g.Param {
-		switch k {
-		case "import_prefix":
-			g.ImportPrefix = v
-		case "import_path":
-			g.PackageImportPath = v
-		case "plugins":
-			pluginList = v
-		default:
-			if len(k) > 0 && k[0] == 'M' {
-				g.ImportMap[k[1:]] = v
-			}
-		}
-	}
-
-	if pluginList != "" {
-		// Amend the set of plugins.
-		enabled := make(map[string]bool)
-		for _, name := range strings.Split(pluginList, "+") {
-			enabled[name] = true
-		}
-		var nplugins []Plugin
-		for _, p := range plugins {
-			if enabled[p.Name()] {
-				nplugins = append(nplugins, p)
-			}
-		}
-		plugins = nplugins
-	}
-}
-
-// DefaultPackageName returns the package name printed for the object.
-// If its file is in a different package, it returns the package name we're using for this file, plus ".".
-// Otherwise it returns the empty string.
-func (g *Generator) DefaultPackageName(obj Object) string {
-	pkg := obj.PackageName()
-	if pkg == g.packageName {
-		return ""
-	}
-	return pkg + "."
-}
-
-// For each input file, the unique package name to use, underscored.
-var uniquePackageName = make(map[*descriptor.FileDescriptorProto]string)
-
-// Package names already registered.  Key is the name from the .proto file;
-// value is the name that appears in the generated code.
-var pkgNamesInUse = make(map[string]bool)
-
-// Create and remember a guaranteed unique package name for this file descriptor.
-// Pkg is the candidate name.  If f is nil, it's a builtin package like "proto" and
-// has no file descriptor.
-func RegisterUniquePackageName(pkg string, f *FileDescriptor) string {
-	// Convert dots to underscores before finding a unique alias.
-	pkg = strings.Map(badToUnderscore, pkg)
-
-	for i, orig := 1, pkg; pkgNamesInUse[pkg]; i++ {
-		// It's a duplicate; must rename.
-		pkg = orig + strconv.Itoa(i)
-	}
-	// Install it.
-	pkgNamesInUse[pkg] = true
-	if f != nil {
-		uniquePackageName[f.FileDescriptorProto] = pkg
-	}
-	return pkg
-}
-
-var isGoKeyword = map[string]bool{
-	"break":       true,
-	"case":        true,
-	"chan":        true,
-	"const":       true,
-	"continue":    true,
-	"default":     true,
-	"else":        true,
-	"defer":       true,
-	"fallthrough": true,
-	"for":         true,
-	"func":        true,
-	"go":          true,
-	"goto":        true,
-	"if":          true,
-	"import":      true,
-	"interface":   true,
-	"map":         true,
-	"package":     true,
-	"range":       true,
-	"return":      true,
-	"select":      true,
-	"struct":      true,
-	"switch":      true,
-	"type":        true,
-	"var":         true,
-}
-
-// defaultGoPackage returns the package name to use,
-// derived from the import path of the package we're building code for.
-func (g *Generator) defaultGoPackage() string {
-	p := g.PackageImportPath
-	if i := strings.LastIndex(p, "/"); i >= 0 {
-		p = p[i+1:]
-	}
-	if p == "" {
-		return ""
-	}
-
-	p = strings.Map(badToUnderscore, p)
-	// Identifier must not be keyword: insert _.
-	if isGoKeyword[p] {
-		p = "_" + p
-	}
-	// Identifier must not begin with digit: insert _.
-	if r, _ := utf8.DecodeRuneInString(p); unicode.IsDigit(r) {
-		p = "_" + p
-	}
-	return p
-}
-
-// SetPackageNames sets the package name for this run.
-// The package name must agree across all files being generated.
-// It also defines unique package names for all imported files.
-func (g *Generator) SetPackageNames() {
-	// Register the name for this package.  It will be the first name
-	// registered so is guaranteed to be unmodified.
-	pkg, explicit := g.genFiles[0].goPackageName()
-
-	// Check all files for an explicit go_package option.
-	for _, f := range g.genFiles {
-		thisPkg, thisExplicit := f.goPackageName()
-		if thisExplicit {
-			if !explicit {
-				// Let this file's go_package option serve for all input files.
-				pkg, explicit = thisPkg, true
-			} else if thisPkg != pkg {
-				g.Fail("inconsistent package names:", thisPkg, pkg)
-			}
-		}
-	}
-
-	// If we don't have an explicit go_package option but we have an
-	// import path, use that.
-	if !explicit {
-		p := g.defaultGoPackage()
-		if p != "" {
-			pkg, explicit = p, true
-		}
-	}
-
-	// If there was no go_package and no import path to use,
-	// double-check that all the inputs have the same implicit
-	// Go package name.
-	if !explicit {
-		for _, f := range g.genFiles {
-			thisPkg, _ := f.goPackageName()
-			if thisPkg != pkg {
-				g.Fail("inconsistent package names:", thisPkg, pkg)
-			}
-		}
-	}
-
-	g.packageName = RegisterUniquePackageName(pkg, g.genFiles[0])
-
-	// Register the support package names. They might collide with the
-	// name of a package we import.
-	g.Pkg = map[string]string{
-		"fmt":   RegisterUniquePackageName("fmt", nil),
-		"math":  RegisterUniquePackageName("math", nil),
-		"proto": RegisterUniquePackageName("proto", nil),
-	}
-
-AllFiles:
-	for _, f := range g.allFiles {
-		for _, genf := range g.genFiles {
-			if f == genf {
-				// In this package already.
-				uniquePackageName[f.FileDescriptorProto] = g.packageName
-				continue AllFiles
-			}
-		}
-		// The file is a dependency, so we want to ignore its go_package option
-		// because that is only relevant for its specific generated output.
-		pkg := f.GetPackage()
-		if pkg == "" {
-			pkg = baseName(*f.Name)
-		}
-		RegisterUniquePackageName(pkg, f)
-	}
-}
-
-// WrapTypes walks the incoming data, wrapping DescriptorProtos, EnumDescriptorProtos
-// and FileDescriptorProtos into file-referenced objects within the Generator.
-// It also creates the list of files to generate and so should be called before GenerateAllFiles.
-func (g *Generator) WrapTypes() {
-	g.allFiles = make([]*FileDescriptor, len(g.Request.ProtoFile))
-	g.allFilesByName = make(map[string]*FileDescriptor, len(g.allFiles))
-	for i, f := range g.Request.ProtoFile {
-		// We must wrap the descriptors before we wrap the enums
-		descs := wrapDescriptors(f)
-		g.buildNestedDescriptors(descs)
-		enums := wrapEnumDescriptors(f, descs)
-		g.buildNestedEnums(descs, enums)
-		exts := wrapExtensions(f)
-		fd := &FileDescriptor{
-			FileDescriptorProto: f,
-			desc:                descs,
-			enum:                enums,
-			ext:                 exts,
-			exported:            make(map[Object][]symbol),
-			proto3:              fileIsProto3(f),
-		}
-		extractComments(fd)
-		g.allFiles[i] = fd
-		g.allFilesByName[f.GetName()] = fd
-	}
-	for _, fd := range g.allFiles {
-		fd.imp = wrapImported(fd.FileDescriptorProto, g)
-	}
-
-	g.genFiles = make([]*FileDescriptor, len(g.Request.FileToGenerate))
-	for i, fileName := range g.Request.FileToGenerate {
-		g.genFiles[i] = g.allFilesByName[fileName]
-		if g.genFiles[i] == nil {
-			g.Fail("could not find file named", fileName)
-		}
-		g.genFiles[i].index = i
-	}
-	g.Response.File = make([]*plugin.CodeGeneratorResponse_File, len(g.genFiles))
-}
-
-// Scan the descriptors in this file.  For each one, build the slice of nested descriptors
-func (g *Generator) buildNestedDescriptors(descs []*Descriptor) {
-	for _, desc := range descs {
-		if len(desc.NestedType) != 0 {
-			for _, nest := range descs {
-				if nest.parent == desc {
-					desc.nested = append(desc.nested, nest)
-				}
-			}
-			if len(desc.nested) != len(desc.NestedType) {
-				g.Fail("internal error: nesting failure for", desc.GetName())
-			}
-		}
-	}
-}
-
-func (g *Generator) buildNestedEnums(descs []*Descriptor, enums []*EnumDescriptor) {
-	for _, desc := range descs {
-		if len(desc.EnumType) != 0 {
-			for _, enum := range enums {
-				if enum.parent == desc {
-					desc.enums = append(desc.enums, enum)
-				}
-			}
-			if len(desc.enums) != len(desc.EnumType) {
-				g.Fail("internal error: enum nesting failure for", desc.GetName())
-			}
-		}
-	}
-}
-
-// Construct the Descriptor
-func newDescriptor(desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *Descriptor {
-	d := &Descriptor{
-		common:          common{file},
-		DescriptorProto: desc,
-		parent:          parent,
-		index:           index,
-	}
-	if parent == nil {
-		d.path = fmt.Sprintf("%d,%d", messagePath, index)
-	} else {
-		d.path = fmt.Sprintf("%s,%d,%d", parent.path, messageMessagePath, index)
-	}
-
-	// The only way to distinguish a group from a message is whether
-	// the containing message has a TYPE_GROUP field that matches.
-	if parent != nil {
-		parts := d.TypeName()
-		if file.Package != nil {
-			parts = append([]string{*file.Package}, parts...)
-		}
-		exp := "." + strings.Join(parts, ".")
-		for _, field := range parent.Field {
-			if field.GetType() == descriptor.FieldDescriptorProto_TYPE_GROUP && field.GetTypeName() == exp {
-				d.group = true
-				break
-			}
-		}
-	}
-
-	d.ext = make([]*ExtensionDescriptor, len(desc.Extension))
-	for i, field := range desc.Extension {
-		d.ext[i] = &ExtensionDescriptor{common{file}, field, d}
-	}
-
-	return d
-}
-
-// Return a slice of all the Descriptors defined within this file
-func wrapDescriptors(file *descriptor.FileDescriptorProto) []*Descriptor {
-	sl := make([]*Descriptor, 0, len(file.MessageType)+10)
-	for i, desc := range file.MessageType {
-		sl = wrapThisDescriptor(sl, desc, nil, file, i)
-	}
-	return sl
-}
-
-// Wrap this Descriptor, recursively
-func wrapThisDescriptor(sl []*Descriptor, desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) []*Descriptor {
-	sl = append(sl, newDescriptor(desc, parent, file, index))
-	me := sl[len(sl)-1]
-	for i, nested := range desc.NestedType {
-		sl = wrapThisDescriptor(sl, nested, me, file, i)
-	}
-	return sl
-}
-
-// Construct the EnumDescriptor
-func newEnumDescriptor(desc *descriptor.EnumDescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *EnumDescriptor {
-	ed := &EnumDescriptor{
-		common:              common{file},
-		EnumDescriptorProto: desc,
-		parent:              parent,
-		index:               index,
-	}
-	if parent == nil {
-		ed.path = fmt.Sprintf("%d,%d", enumPath, index)
-	} else {
-		ed.path = fmt.Sprintf("%s,%d,%d", parent.path, messageEnumPath, index)
-	}
-	return ed
-}
-
-// Return a slice of all the EnumDescriptors defined within this file
-func wrapEnumDescriptors(file *descriptor.FileDescriptorProto, descs []*Descriptor) []*EnumDescriptor {
-	sl := make([]*EnumDescriptor, 0, len(file.EnumType)+10)
-	// Top-level enums.
-	for i, enum := range file.EnumType {
-		sl = append(sl, newEnumDescriptor(enum, nil, file, i))
-	}
-	// Enums within messages. Enums within embedded messages appear in the outer-most message.
-	for _, nested := range descs {
-		for i, enum := range nested.EnumType {
-			sl = append(sl, newEnumDescriptor(enum, nested, file, i))
-		}
-	}
-	return sl
-}
-
-// Return a slice of all the top-level ExtensionDescriptors defined within this file.
-func wrapExtensions(file *descriptor.FileDescriptorProto) []*ExtensionDescriptor {
-	sl := make([]*ExtensionDescriptor, len(file.Extension))
-	for i, field := range file.Extension {
-		sl[i] = &ExtensionDescriptor{common{file}, field, nil}
-	}
-	return sl
-}
-
-// Return a slice of all the types that are publicly imported into this file.
-func wrapImported(file *descriptor.FileDescriptorProto, g *Generator) (sl []*ImportedDescriptor) {
-	for _, index := range file.PublicDependency {
-		df := g.fileByName(file.Dependency[index])
-		for _, d := range df.desc {
-			if d.GetOptions().GetMapEntry() {
-				continue
-			}
-			sl = append(sl, &ImportedDescriptor{common{file}, d})
-		}
-		for _, e := range df.enum {
-			sl = append(sl, &ImportedDescriptor{common{file}, e})
-		}
-		for _, ext := range df.ext {
-			sl = append(sl, &ImportedDescriptor{common{file}, ext})
-		}
-	}
-	return
-}
-
-func extractComments(file *FileDescriptor) {
-	file.comments = make(map[string]*descriptor.SourceCodeInfo_Location)
-	for _, loc := range file.GetSourceCodeInfo().GetLocation() {
-		if loc.LeadingComments == nil {
-			continue
-		}
-		var p []string
-		for _, n := range loc.Path {
-			p = append(p, strconv.Itoa(int(n)))
-		}
-		file.comments[strings.Join(p, ",")] = loc
-	}
-}
-
-// BuildTypeNameMap builds the map from fully qualified type names to objects.
-// The key names for the map come from the input data, which puts a period at the beginning.
-// It should be called after SetPackageNames and before GenerateAllFiles.
-func (g *Generator) BuildTypeNameMap() {
-	g.typeNameToObject = make(map[string]Object)
-	for _, f := range g.allFiles {
-		// The names in this loop are defined by the proto world, not us, so the
-		// package name may be empty.  If so, the dotted package name of X will
-		// be ".X"; otherwise it will be ".pkg.X".
-		dottedPkg := "." + f.GetPackage()
-		if dottedPkg != "." {
-			dottedPkg += "."
-		}
-		for _, enum := range f.enum {
-			name := dottedPkg + dottedSlice(enum.TypeName())
-			g.typeNameToObject[name] = enum
-		}
-		for _, desc := range f.desc {
-			name := dottedPkg + dottedSlice(desc.TypeName())
-			g.typeNameToObject[name] = desc
-		}
-	}
-}
-
-// ObjectNamed, given a fully-qualified input type name as it appears in the input data,
-// returns the descriptor for the message or enum with that name.
-func (g *Generator) ObjectNamed(typeName string) Object {
-	o, ok := g.typeNameToObject[typeName]
-	if !ok {
-		g.Fail("can't find object with type", typeName)
-	}
-
-	// If the file of this object isn't a direct dependency of the current file,
-	// or in the current file, then this object has been publicly imported into
-	// a dependency of the current file.
-	// We should return the ImportedDescriptor object for it instead.
-	direct := *o.File().Name == *g.file.Name
-	if !direct {
-		for _, dep := range g.file.Dependency {
-			if *g.fileByName(dep).Name == *o.File().Name {
-				direct = true
-				break
-			}
-		}
-	}
-	if !direct {
-		found := false
-	Loop:
-		for _, dep := range g.file.Dependency {
-			df := g.fileByName(*g.fileByName(dep).Name)
-			for _, td := range df.imp {
-				if td.o == o {
-					// Found it!
-					o = td
-					found = true
-					break Loop
-				}
-			}
-		}
-		if !found {
-			log.Printf("protoc-gen-go: WARNING: failed finding publicly imported dependency for %v, used in %v", typeName, *g.file.Name)
-		}
-	}
-
-	return o
-}
-
-// P prints the arguments to the generated output.  It handles strings and int32s, plus
-// handling indirections because they may be *string, etc.
-func (g *Generator) P(str ...interface{}) {
-	if !g.writeOutput {
-		return
-	}
-	g.WriteString(g.indent)
-	for _, v := range str {
-		switch s := v.(type) {
-		case string:
-			g.WriteString(s)
-		case *string:
-			g.WriteString(*s)
-		case bool:
-			fmt.Fprintf(g, "%t", s)
-		case *bool:
-			fmt.Fprintf(g, "%t", *s)
-		case int:
-			fmt.Fprintf(g, "%d", s)
-		case *int32:
-			fmt.Fprintf(g, "%d", *s)
-		case *int64:
-			fmt.Fprintf(g, "%d", *s)
-		case float64:
-			fmt.Fprintf(g, "%g", s)
-		case *float64:
-			fmt.Fprintf(g, "%g", *s)
-		default:
-			g.Fail(fmt.Sprintf("unknown type in printer: %T", v))
-		}
-	}
-	g.WriteByte('\n')
-}
-
-// addInitf stores the given statement to be printed inside the file's init function.
-// The statement is given as a format specifier and arguments.
-func (g *Generator) addInitf(stmt string, a ...interface{}) {
-	g.init = append(g.init, fmt.Sprintf(stmt, a...))
-}
-
-// In Indents the output one tab stop.
-func (g *Generator) In() { g.indent += "\t" }
-
-// Out unindents the output one tab stop.
-func (g *Generator) Out() {
-	if len(g.indent) > 0 {
-		g.indent = g.indent[1:]
-	}
-}
-
-// GenerateAllFiles generates the output for all the files we're outputting.
-func (g *Generator) GenerateAllFiles() {
-	// Initialize the plugins
-	for _, p := range plugins {
-		p.Init(g)
-	}
-	// Generate the output. The generator runs for every file, even the files
-	// that we don't generate output for, so that we can collate the full list
-	// of exported symbols to support public imports.
-	genFileMap := make(map[*FileDescriptor]bool, len(g.genFiles))
-	for _, file := range g.genFiles {
-		genFileMap[file] = true
-	}
-	i := 0
-	for _, file := range g.allFiles {
-		g.Reset()
-		g.writeOutput = genFileMap[file]
-		g.generate(file)
-		if !g.writeOutput {
-			continue
-		}
-		g.Response.File[i] = new(plugin.CodeGeneratorResponse_File)
-		g.Response.File[i].Name = proto.String(goFileName(*file.Name))
-		g.Response.File[i].Content = proto.String(g.String())
-		i++
-	}
-}
-
-// Run all the plugins associated with the file.
-func (g *Generator) runPlugins(file *FileDescriptor) {
-	for _, p := range plugins {
-		p.Generate(file)
-	}
-}
-
-// FileOf return the FileDescriptor for this FileDescriptorProto.
-func (g *Generator) FileOf(fd *descriptor.FileDescriptorProto) *FileDescriptor {
-	for _, file := range g.allFiles {
-		if file.FileDescriptorProto == fd {
-			return file
-		}
-	}
-	g.Fail("could not find file in table:", fd.GetName())
-	return nil
-}
-
-// Fill the response protocol buffer with the generated output for all the files we're
-// supposed to generate.
-func (g *Generator) generate(file *FileDescriptor) {
-	g.file = g.FileOf(file.FileDescriptorProto)
-	g.usedPackages = make(map[string]bool)
-
-	if g.file.index == 0 {
-		// For one file in the package, assert version compatibility.
-		g.P("// This is a compile-time assertion to ensure that this generated file")
-		g.P("// is compatible with the proto package it is being compiled against.")
-		g.P("const _ = ", g.Pkg["proto"], ".ProtoPackageIsVersion", generatedCodeVersion)
-		g.P()
-	}
-
-	for _, td := range g.file.imp {
-		g.generateImported(td)
-	}
-	for _, enum := range g.file.enum {
-		g.generateEnum(enum)
-	}
-	for _, desc := range g.file.desc {
-		// Don't generate virtual messages for maps.
-		if desc.GetOptions().GetMapEntry() {
-			continue
-		}
-		g.generateMessage(desc)
-	}
-	for _, ext := range g.file.ext {
-		g.generateExtension(ext)
-	}
-	g.generateInitFunction()
-
-	// Run the plugins before the imports so we know which imports are necessary.
-	g.runPlugins(file)
-
-	g.generateFileDescriptor(file)
-
-	// Generate header and imports last, though they appear first in the output.
-	rem := g.Buffer
-	g.Buffer = new(bytes.Buffer)
-	g.generateHeader()
-	g.generateImports()
-	if !g.writeOutput {
-		return
-	}
-	g.Write(rem.Bytes())
-
-	// Reformat generated code.
-	fset := token.NewFileSet()
-	raw := g.Bytes()
-	ast, err := parser.ParseFile(fset, "", g, parser.ParseComments)
-	if err != nil {
-		// Print out the bad code with line numbers.
-		// This should never happen in practice, but it can while changing generated code,
-		// so consider this a debugging aid.
-		var src bytes.Buffer
-		s := bufio.NewScanner(bytes.NewReader(raw))
-		for line := 1; s.Scan(); line++ {
-			fmt.Fprintf(&src, "%5d\t%s\n", line, s.Bytes())
-		}
-		g.Fail("bad Go source code was generated:", err.Error(), "\n"+src.String())
-	}
-	g.Reset()
-	err = (&printer.Config{Mode: printer.TabIndent | printer.UseSpaces, Tabwidth: 8}).Fprint(g, fset, ast)
-	if err != nil {
-		g.Fail("generated Go source code could not be reformatted:", err.Error())
-	}
-}
-
-// Generate the header, including package definition
-func (g *Generator) generateHeader() {
-	g.P("// Code generated by protoc-gen-go.")
-	g.P("// source: ", g.file.Name)
-	g.P("// DO NOT EDIT!")
-	g.P()
-
-	name := g.file.PackageName()
-
-	if g.file.index == 0 {
-		// Generate package docs for the first file in the package.
-		g.P("/*")
-		g.P("Package ", name, " is a generated protocol buffer package.")
-		g.P()
-		if loc, ok := g.file.comments[strconv.Itoa(packagePath)]; ok {
-			// not using g.PrintComments because this is a /* */ comment block.
-			text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
-			for _, line := range strings.Split(text, "\n") {
-				line = strings.TrimPrefix(line, " ")
-				// ensure we don't escape from the block comment
-				line = strings.Replace(line, "*/", "* /", -1)
-				g.P(line)
-			}
-			g.P()
-		}
-		var topMsgs []string
-		g.P("It is generated from these files:")
-		for _, f := range g.genFiles {
-			g.P("\t", f.Name)
-			for _, msg := range f.desc {
-				if msg.parent != nil {
-					continue
-				}
-				topMsgs = append(topMsgs, CamelCaseSlice(msg.TypeName()))
-			}
-		}
-		g.P()
-		g.P("It has these top-level messages:")
-		for _, msg := range topMsgs {
-			g.P("\t", msg)
-		}
-		g.P("*/")
-	}
-
-	g.P("package ", name)
-	g.P()
-}
-
-// PrintComments prints any comments from the source .proto file.
-// The path is a comma-separated list of integers.
-// It returns an indication of whether any comments were printed.
-// See descriptor.proto for its format.
-func (g *Generator) PrintComments(path string) bool {
-	if !g.writeOutput {
-		return false
-	}
-	if loc, ok := g.file.comments[path]; ok {
-		text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
-		for _, line := range strings.Split(text, "\n") {
-			g.P("// ", strings.TrimPrefix(line, " "))
-		}
-		return true
-	}
-	return false
-}
-
-func (g *Generator) fileByName(filename string) *FileDescriptor {
-	return g.allFilesByName[filename]
-}
-
-// weak returns whether the ith import of the current file is a weak import.
-func (g *Generator) weak(i int32) bool {
-	for _, j := range g.file.WeakDependency {
-		if j == i {
-			return true
-		}
-	}
-	return false
-}
-
-// Generate the imports
-func (g *Generator) generateImports() {
-	// We almost always need a proto import.  Rather than computing when we
-	// do, which is tricky when there's a plugin, just import it and
-	// reference it later. The same argument applies to the fmt and math packages.
-	g.P("import " + g.Pkg["proto"] + " " + strconv.Quote(g.ImportPrefix+"github.com/golang/protobuf/proto"))
-	g.P("import " + g.Pkg["fmt"] + ` "fmt"`)
-	g.P("import " + g.Pkg["math"] + ` "math"`)
-	for i, s := range g.file.Dependency {
-		fd := g.fileByName(s)
-		// Do not import our own package.
-		if fd.PackageName() == g.packageName {
-			continue
-		}
-		filename := goFileName(s)
-		// By default, import path is the dirname of the Go filename.
-		importPath := path.Dir(filename)
-		if substitution, ok := g.ImportMap[s]; ok {
-			importPath = substitution
-		}
-		importPath = g.ImportPrefix + importPath
-		// Skip weak imports.
-		if g.weak(int32(i)) {
-			g.P("// skipping weak import ", fd.PackageName(), " ", strconv.Quote(importPath))
-			continue
-		}
-		// We need to import all the dependencies, even if we don't reference them,
-		// because other code and tools depend on having the full transitive closure
-		// of protocol buffer types in the binary.
-		pname := fd.PackageName()
-		if _, ok := g.usedPackages[pname]; !ok {
-			pname = "_"
-		}
-		g.P("import ", pname, " ", strconv.Quote(importPath))
-	}
-	g.P()
-	// TODO: may need to worry about uniqueness across plugins
-	for _, p := range plugins {
-		p.GenerateImports(g.file)
-		g.P()
-	}
-	g.P("// Reference imports to suppress errors if they are not otherwise used.")
-	g.P("var _ = ", g.Pkg["proto"], ".Marshal")
-	g.P("var _ = ", g.Pkg["fmt"], ".Errorf")
-	g.P("var _ = ", g.Pkg["math"], ".Inf")
-	g.P()
-}
-
-func (g *Generator) generateImported(id *ImportedDescriptor) {
-	// Don't generate public import symbols for files that we are generating
-	// code for, since those symbols will already be in this package.
-	// We can't simply avoid creating the ImportedDescriptor objects,
-	// because g.genFiles isn't populated at that stage.
-	tn := id.TypeName()
-	sn := tn[len(tn)-1]
-	df := g.FileOf(id.o.File())
-	filename := *df.Name
-	for _, fd := range g.genFiles {
-		if *fd.Name == filename {
-			g.P("// Ignoring public import of ", sn, " from ", filename)
-			g.P()
-			return
-		}
-	}
-	g.P("// ", sn, " from public import ", filename)
-	g.usedPackages[df.PackageName()] = true
-
-	for _, sym := range df.exported[id.o] {
-		sym.GenerateAlias(g, df.PackageName())
-	}
-
-	g.P()
-}
-
-// Generate the enum definitions for this EnumDescriptor.
-func (g *Generator) generateEnum(enum *EnumDescriptor) {
-	// The full type name
-	typeName := enum.TypeName()
-	// The full type name, CamelCased.
-	ccTypeName := CamelCaseSlice(typeName)
-	ccPrefix := enum.prefix()
-
-	g.PrintComments(enum.path)
-	g.P("type ", ccTypeName, " int32")
-	g.file.addExport(enum, enumSymbol{ccTypeName, enum.proto3()})
-	g.P("const (")
-	g.In()
-	for i, e := range enum.Value {
-		g.PrintComments(fmt.Sprintf("%s,%d,%d", enum.path, enumValuePath, i))
-
-		name := ccPrefix + *e.Name
-		g.P(name, " ", ccTypeName, " = ", e.Number)
-		g.file.addExport(enum, constOrVarSymbol{name, "const", ccTypeName})
-	}
-	g.Out()
-	g.P(")")
-	g.P("var ", ccTypeName, "_name = map[int32]string{")
-	g.In()
-	generated := make(map[int32]bool) // avoid duplicate values
-	for _, e := range enum.Value {
-		duplicate := ""
-		if _, present := generated[*e.Number]; present {
-			duplicate = "// Duplicate value: "
-		}
-		g.P(duplicate, e.Number, ": ", strconv.Quote(*e.Name), ",")
-		generated[*e.Number] = true
-	}
-	g.Out()
-	g.P("}")
-	g.P("var ", ccTypeName, "_value = map[string]int32{")
-	g.In()
-	for _, e := range enum.Value {
-		g.P(strconv.Quote(*e.Name), ": ", e.Number, ",")
-	}
-	g.Out()
-	g.P("}")
-
-	if !enum.proto3() {
-		g.P("func (x ", ccTypeName, ") Enum() *", ccTypeName, " {")
-		g.In()
-		g.P("p := new(", ccTypeName, ")")
-		g.P("*p = x")
-		g.P("return p")
-		g.Out()
-		g.P("}")
-	}
-
-	g.P("func (x ", ccTypeName, ") String() string {")
-	g.In()
-	g.P("return ", g.Pkg["proto"], ".EnumName(", ccTypeName, "_name, int32(x))")
-	g.Out()
-	g.P("}")
-
-	if !enum.proto3() {
-		g.P("func (x *", ccTypeName, ") UnmarshalJSON(data []byte) error {")
-		g.In()
-		g.P("value, err := ", g.Pkg["proto"], ".UnmarshalJSONEnum(", ccTypeName, `_value, data, "`, ccTypeName, `")`)
-		g.P("if err != nil {")
-		g.In()
-		g.P("return err")
-		g.Out()
-		g.P("}")
-		g.P("*x = ", ccTypeName, "(value)")
-		g.P("return nil")
-		g.Out()
-		g.P("}")
-	}
-
-	var indexes []string
-	for m := enum.parent; m != nil; m = m.parent {
-		// XXX: skip groups?
-		indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
-	}
-	indexes = append(indexes, strconv.Itoa(enum.index))
-	g.P("func (", ccTypeName, ") EnumDescriptor() ([]byte, []int) { return fileDescriptor", g.file.index, ", []int{", strings.Join(indexes, ", "), "} }")
-
-	g.P()
-}
-
-// The tag is a string like "varint,2,opt,name=fieldname,def=7" that
-// identifies details of the field for the protocol buffer marshaling and unmarshaling
-// code.  The fields are:
-//	wire encoding
-//	protocol tag number
-//	opt,req,rep for optional, required, or repeated
-//	packed whether the encoding is "packed" (optional; repeated primitives only)
-//	name= the original declared name
-//	enum= the name of the enum type if it is an enum-typed field.
-//	proto3 if this field is in a proto3 message
-//	def= string representation of the default value, if any.
-// The default value must be in a representation that can be used at run-time
-// to generate the default value. Thus bools become 0 and 1, for instance.
-func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptorProto, wiretype string) string {
-	optrepreq := ""
-	switch {
-	case isOptional(field):
-		optrepreq = "opt"
-	case isRequired(field):
-		optrepreq = "req"
-	case isRepeated(field):
-		optrepreq = "rep"
-	}
-	var defaultValue string
-	if dv := field.DefaultValue; dv != nil { // set means an explicit default
-		defaultValue = *dv
-		// Some types need tweaking.
-		switch *field.Type {
-		case descriptor.FieldDescriptorProto_TYPE_BOOL:
-			if defaultValue == "true" {
-				defaultValue = "1"
-			} else {
-				defaultValue = "0"
-			}
-		case descriptor.FieldDescriptorProto_TYPE_STRING,
-			descriptor.FieldDescriptorProto_TYPE_BYTES:
-			// Nothing to do. Quoting is done for the whole tag.
-		case descriptor.FieldDescriptorProto_TYPE_ENUM:
-			// For enums we need to provide the integer constant.
-			obj := g.ObjectNamed(field.GetTypeName())
-			if id, ok := obj.(*ImportedDescriptor); ok {
-				// It is an enum that was publicly imported.
-				// We need the underlying type.
-				obj = id.o
-			}
-			enum, ok := obj.(*EnumDescriptor)
-			if !ok {
-				log.Printf("obj is a %T", obj)
-				if id, ok := obj.(*ImportedDescriptor); ok {
-					log.Printf("id.o is a %T", id.o)
-				}
-				g.Fail("unknown enum type", CamelCaseSlice(obj.TypeName()))
-			}
-			defaultValue = enum.integerValueAsString(defaultValue)
-		}
-		defaultValue = ",def=" + defaultValue
-	}
-	enum := ""
-	if *field.Type == descriptor.FieldDescriptorProto_TYPE_ENUM {
-		// We avoid using obj.PackageName(), because we want to use the
-		// original (proto-world) package name.
-		obj := g.ObjectNamed(field.GetTypeName())
-		if id, ok := obj.(*ImportedDescriptor); ok {
-			obj = id.o
-		}
-		enum = ",enum="
-		if pkg := obj.File().GetPackage(); pkg != "" {
-			enum += pkg + "."
-		}
-		enum += CamelCaseSlice(obj.TypeName())
-	}
-	packed := ""
-	if field.Options != nil && field.Options.GetPacked() {
-		packed = ",packed"
-	}
-	fieldName := field.GetName()
-	name := fieldName
-	if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
-		// We must use the type name for groups instead of
-		// the field name to preserve capitalization.
-		// type_name in FieldDescriptorProto is fully-qualified,
-		// but we only want the local part.
-		name = *field.TypeName
-		if i := strings.LastIndex(name, "."); i >= 0 {
-			name = name[i+1:]
-		}
-	}
-	name = ",name=" + name
-	if message.proto3() {
-		// We only need the extra tag for []byte fields;
-		// no need to add noise for the others.
-		if *field.Type == descriptor.FieldDescriptorProto_TYPE_BYTES {
-			name += ",proto3"
-		}
-
-	}
-	oneof := ""
-	if field.OneofIndex != nil {
-		oneof = ",oneof"
-	}
-	return strconv.Quote(fmt.Sprintf("%s,%d,%s%s%s%s%s%s",
-		wiretype,
-		field.GetNumber(),
-		optrepreq,
-		packed,
-		name,
-		enum,
-		oneof,
-		defaultValue))
-}
-
-func needsStar(typ descriptor.FieldDescriptorProto_Type) bool {
-	switch typ {
-	case descriptor.FieldDescriptorProto_TYPE_GROUP:
-		return false
-	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-		return false
-	case descriptor.FieldDescriptorProto_TYPE_BYTES:
-		return false
-	}
-	return true
-}
-
-// TypeName is the printed name appropriate for an item. If the object is in the current file,
-// TypeName drops the package name and underscores the rest.
-// Otherwise the object is from another package; and the result is the underscored
-// package name followed by the item name.
-// The result always has an initial capital.
-func (g *Generator) TypeName(obj Object) string {
-	return g.DefaultPackageName(obj) + CamelCaseSlice(obj.TypeName())
-}
-
-// TypeNameWithPackage is like TypeName, but always includes the package
-// name even if the object is in our own package.
-func (g *Generator) TypeNameWithPackage(obj Object) string {
-	return obj.PackageName() + CamelCaseSlice(obj.TypeName())
-}
-
-// GoType returns a string representing the type name, and the wire type
-func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescriptorProto) (typ string, wire string) {
-	// TODO: Options.
-	switch *field.Type {
-	case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-		typ, wire = "float64", "fixed64"
-	case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-		typ, wire = "float32", "fixed32"
-	case descriptor.FieldDescriptorProto_TYPE_INT64:
-		typ, wire = "int64", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_UINT64:
-		typ, wire = "uint64", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_INT32:
-		typ, wire = "int32", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_UINT32:
-		typ, wire = "uint32", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_FIXED64:
-		typ, wire = "uint64", "fixed64"
-	case descriptor.FieldDescriptorProto_TYPE_FIXED32:
-		typ, wire = "uint32", "fixed32"
-	case descriptor.FieldDescriptorProto_TYPE_BOOL:
-		typ, wire = "bool", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_STRING:
-		typ, wire = "string", "bytes"
-	case descriptor.FieldDescriptorProto_TYPE_GROUP:
-		desc := g.ObjectNamed(field.GetTypeName())
-		typ, wire = "*"+g.TypeName(desc), "group"
-	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-		desc := g.ObjectNamed(field.GetTypeName())
-		typ, wire = "*"+g.TypeName(desc), "bytes"
-	case descriptor.FieldDescriptorProto_TYPE_BYTES:
-		typ, wire = "[]byte", "bytes"
-	case descriptor.FieldDescriptorProto_TYPE_ENUM:
-		desc := g.ObjectNamed(field.GetTypeName())
-		typ, wire = g.TypeName(desc), "varint"
-	case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-		typ, wire = "int32", "fixed32"
-	case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-		typ, wire = "int64", "fixed64"
-	case descriptor.FieldDescriptorProto_TYPE_SINT32:
-		typ, wire = "int32", "zigzag32"
-	case descriptor.FieldDescriptorProto_TYPE_SINT64:
-		typ, wire = "int64", "zigzag64"
-	default:
-		g.Fail("unknown type for", field.GetName())
-	}
-	if isRepeated(field) {
-		typ = "[]" + typ
-	} else if message != nil && message.proto3() {
-		return
-	} else if field.OneofIndex != nil && message != nil {
-		return
-	} else if needsStar(*field.Type) {
-		typ = "*" + typ
-	}
-	return
-}
-
-func (g *Generator) RecordTypeUse(t string) {
-	if obj, ok := g.typeNameToObject[t]; ok {
-		// Call ObjectNamed to get the true object to record the use.
-		obj = g.ObjectNamed(t)
-		g.usedPackages[obj.PackageName()] = true
-	}
-}
-
-// Method names that may be generated.  Fields with these names get an
-// underscore appended.
-var methodNames = [...]string{
-	"Reset",
-	"String",
-	"ProtoMessage",
-	"Marshal",
-	"Unmarshal",
-	"ExtensionRangeArray",
-	"ExtensionMap",
-	"Descriptor",
-}
-
-// Generate the type and default constant definitions for this Descriptor.
-func (g *Generator) generateMessage(message *Descriptor) {
-	// The full type name
-	typeName := message.TypeName()
-	// The full type name, CamelCased.
-	ccTypeName := CamelCaseSlice(typeName)
-
-	usedNames := make(map[string]bool)
-	for _, n := range methodNames {
-		usedNames[n] = true
-	}
-	fieldNames := make(map[*descriptor.FieldDescriptorProto]string)
-	fieldGetterNames := make(map[*descriptor.FieldDescriptorProto]string)
-	fieldTypes := make(map[*descriptor.FieldDescriptorProto]string)
-	mapFieldTypes := make(map[*descriptor.FieldDescriptorProto]string)
-
-	oneofFieldName := make(map[int32]string)                           // indexed by oneof_index field of FieldDescriptorProto
-	oneofDisc := make(map[int32]string)                                // name of discriminator method
-	oneofTypeName := make(map[*descriptor.FieldDescriptorProto]string) // without star
-	oneofInsertPoints := make(map[int32]int)                           // oneof_index => offset of g.Buffer
-
-	g.PrintComments(message.path)
-	g.P("type ", ccTypeName, " struct {")
-	g.In()
-
-	// allocNames finds a conflict-free variation of the given strings,
-	// consistently mutating their suffixes.
-	// It returns the same number of strings.
-	allocNames := func(ns ...string) []string {
-	Loop:
-		for {
-			for _, n := range ns {
-				if usedNames[n] {
-					for i := range ns {
-						ns[i] += "_"
-					}
-					continue Loop
-				}
-			}
-			for _, n := range ns {
-				usedNames[n] = true
-			}
-			return ns
-		}
-	}
-
-	for i, field := range message.Field {
-		// Allocate the getter and the field at the same time so name
-		// collisions create field/method consistent names.
-		// TODO: This allocation occurs based on the order of the fields
-		// in the proto file, meaning that a change in the field
-		// ordering can change generated Method/Field names.
-		base := CamelCase(*field.Name)
-		ns := allocNames(base, "Get"+base)
-		fieldName, fieldGetterName := ns[0], ns[1]
-		typename, wiretype := g.GoType(message, field)
-		jsonName := *field.Name
-		tag := fmt.Sprintf("protobuf:%s json:%q", g.goTag(message, field, wiretype), jsonName+",omitempty")
-
-		fieldNames[field] = fieldName
-		fieldGetterNames[field] = fieldGetterName
-
-		oneof := field.OneofIndex != nil
-		if oneof && oneofFieldName[*field.OneofIndex] == "" {
-			odp := message.OneofDecl[int(*field.OneofIndex)]
-			fname := allocNames(CamelCase(odp.GetName()))[0]
-
-			// This is the first field of a oneof we haven't seen before.
-			// Generate the union field.
-			com := g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageOneofPath, *field.OneofIndex))
-			if com {
-				g.P("//")
-			}
-			g.P("// Types that are valid to be assigned to ", fname, ":")
-			// Generate the rest of this comment later,
-			// when we've computed any disambiguation.
-			oneofInsertPoints[*field.OneofIndex] = g.Buffer.Len()
-
-			dname := "is" + ccTypeName + "_" + fname
-			oneofFieldName[*field.OneofIndex] = fname
-			oneofDisc[*field.OneofIndex] = dname
-			tag := `protobuf_oneof:"` + odp.GetName() + `"`
-			g.P(fname, " ", dname, " `", tag, "`")
-		}
-
-		if *field.Type == descriptor.FieldDescriptorProto_TYPE_MESSAGE {
-			desc := g.ObjectNamed(field.GetTypeName())
-			if d, ok := desc.(*Descriptor); ok && d.GetOptions().GetMapEntry() {
-				// Figure out the Go types and tags for the key and value types.
-				keyField, valField := d.Field[0], d.Field[1]
-				keyType, keyWire := g.GoType(d, keyField)
-				valType, valWire := g.GoType(d, valField)
-				keyTag, valTag := g.goTag(d, keyField, keyWire), g.goTag(d, valField, valWire)
-
-				// We don't use stars, except for message-typed values.
-				// Message and enum types are the only two possibly foreign types used in maps,
-				// so record their use. They are not permitted as map keys.
-				keyType = strings.TrimPrefix(keyType, "*")
-				switch *valField.Type {
-				case descriptor.FieldDescriptorProto_TYPE_ENUM:
-					valType = strings.TrimPrefix(valType, "*")
-					g.RecordTypeUse(valField.GetTypeName())
-				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-					g.RecordTypeUse(valField.GetTypeName())
-				default:
-					valType = strings.TrimPrefix(valType, "*")
-				}
-
-				typename = fmt.Sprintf("map[%s]%s", keyType, valType)
-				mapFieldTypes[field] = typename // record for the getter generation
-
-				tag += fmt.Sprintf(" protobuf_key:%s protobuf_val:%s", keyTag, valTag)
-			}
-		}
-
-		fieldTypes[field] = typename
-
-		if oneof {
-			tname := ccTypeName + "_" + fieldName
-			// It is possible for this to collide with a message or enum
-			// nested in this message. Check for collisions.
-			for {
-				ok := true
-				for _, desc := range message.nested {
-					if CamelCaseSlice(desc.TypeName()) == tname {
-						ok = false
-						break
-					}
-				}
-				for _, enum := range message.enums {
-					if CamelCaseSlice(enum.TypeName()) == tname {
-						ok = false
-						break
-					}
-				}
-				if !ok {
-					tname += "_"
-					continue
-				}
-				break
-			}
-
-			oneofTypeName[field] = tname
-			continue
-		}
-
-		g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageFieldPath, i))
-		g.P(fieldName, "\t", typename, "\t`", tag, "`")
-		g.RecordTypeUse(field.GetTypeName())
-	}
-	if len(message.ExtensionRange) > 0 {
-		g.P("XXX_extensions\t\tmap[int32]", g.Pkg["proto"], ".Extension `json:\"-\"`")
-	}
-	if !message.proto3() {
-		g.P("XXX_unrecognized\t[]byte `json:\"-\"`")
-	}
-	g.Out()
-	g.P("}")
-
-	// Update g.Buffer to list valid oneof types.
-	// We do this down here, after we've disambiguated the oneof type names.
-	// We go in reverse order of insertion point to avoid invalidating offsets.
-	for oi := int32(len(message.OneofDecl)); oi >= 0; oi-- {
-		ip := oneofInsertPoints[oi]
-		all := g.Buffer.Bytes()
-		rem := all[ip:]
-		g.Buffer = bytes.NewBuffer(all[:ip:ip]) // set cap so we don't scribble on rem
-		for _, field := range message.Field {
-			if field.OneofIndex == nil || *field.OneofIndex != oi {
-				continue
-			}
-			g.P("//\t*", oneofTypeName[field])
-		}
-		g.Buffer.Write(rem)
-	}
-
-	// Reset, String and ProtoMessage methods.
-	g.P("func (m *", ccTypeName, ") Reset() { *m = ", ccTypeName, "{} }")
-	g.P("func (m *", ccTypeName, ") String() string { return ", g.Pkg["proto"], ".CompactTextString(m) }")
-	g.P("func (*", ccTypeName, ") ProtoMessage() {}")
-	if !message.group {
-		var indexes []string
-		for m := message; m != nil; m = m.parent {
-			// XXX: skip groups?
-			indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
-		}
-		g.P("func (*", ccTypeName, ") Descriptor() ([]byte, []int) { return fileDescriptor", g.file.index, ", []int{", strings.Join(indexes, ", "), "} }")
-	}
-
-	// Extension support methods
-	var hasExtensions, isMessageSet bool
-	if len(message.ExtensionRange) > 0 {
-		hasExtensions = true
-		// message_set_wire_format only makes sense when extensions are defined.
-		if opts := message.Options; opts != nil && opts.GetMessageSetWireFormat() {
-			isMessageSet = true
-			g.P()
-			g.P("func (m *", ccTypeName, ") Marshal() ([]byte, error) {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".MarshalMessageSet(m.ExtensionMap())")
-			g.Out()
-			g.P("}")
-			g.P("func (m *", ccTypeName, ") Unmarshal(buf []byte) error {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSet(buf, m.ExtensionMap())")
-			g.Out()
-			g.P("}")
-			g.P("func (m *", ccTypeName, ") MarshalJSON() ([]byte, error) {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".MarshalMessageSetJSON(m.XXX_extensions)")
-			g.Out()
-			g.P("}")
-			g.P("func (m *", ccTypeName, ") UnmarshalJSON(buf []byte) error {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSetJSON(buf, m.XXX_extensions)")
-			g.Out()
-			g.P("}")
-			g.P("// ensure ", ccTypeName, " satisfies proto.Marshaler and proto.Unmarshaler")
-			g.P("var _ ", g.Pkg["proto"], ".Marshaler = (*", ccTypeName, ")(nil)")
-			g.P("var _ ", g.Pkg["proto"], ".Unmarshaler = (*", ccTypeName, ")(nil)")
-		}
-
-		g.P()
-		g.P("var extRange_", ccTypeName, " = []", g.Pkg["proto"], ".ExtensionRange{")
-		g.In()
-		for _, r := range message.ExtensionRange {
-			end := fmt.Sprint(*r.End - 1) // make range inclusive on both ends
-			g.P("{", r.Start, ", ", end, "},")
-		}
-		g.Out()
-		g.P("}")
-		g.P("func (*", ccTypeName, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange {")
-		g.In()
-		g.P("return extRange_", ccTypeName)
-		g.Out()
-		g.P("}")
-		g.P("func (m *", ccTypeName, ") ExtensionMap() map[int32]", g.Pkg["proto"], ".Extension {")
-		g.In()
-		g.P("if m.XXX_extensions == nil {")
-		g.In()
-		g.P("m.XXX_extensions = make(map[int32]", g.Pkg["proto"], ".Extension)")
-		g.Out()
-		g.P("}")
-		g.P("return m.XXX_extensions")
-		g.Out()
-		g.P("}")
-	}
-
-	// Default constants
-	defNames := make(map[*descriptor.FieldDescriptorProto]string)
-	for _, field := range message.Field {
-		def := field.GetDefaultValue()
-		if def == "" {
-			continue
-		}
-		fieldname := "Default_" + ccTypeName + "_" + CamelCase(*field.Name)
-		defNames[field] = fieldname
-		typename, _ := g.GoType(message, field)
-		if typename[0] == '*' {
-			typename = typename[1:]
-		}
-		kind := "const "
-		switch {
-		case typename == "bool":
-		case typename == "string":
-			def = strconv.Quote(def)
-		case typename == "[]byte":
-			def = "[]byte(" + strconv.Quote(def) + ")"
-			kind = "var "
-		case def == "inf", def == "-inf", def == "nan":
-			// These names are known to, and defined by, the protocol language.
-			switch def {
-			case "inf":
-				def = "math.Inf(1)"
-			case "-inf":
-				def = "math.Inf(-1)"
-			case "nan":
-				def = "math.NaN()"
-			}
-			if *field.Type == descriptor.FieldDescriptorProto_TYPE_FLOAT {
-				def = "float32(" + def + ")"
-			}
-			kind = "var "
-		case *field.Type == descriptor.FieldDescriptorProto_TYPE_ENUM:
-			// Must be an enum.  Need to construct the prefixed name.
-			obj := g.ObjectNamed(field.GetTypeName())
-			var enum *EnumDescriptor
-			if id, ok := obj.(*ImportedDescriptor); ok {
-				// The enum type has been publicly imported.
-				enum, _ = id.o.(*EnumDescriptor)
-			} else {
-				enum, _ = obj.(*EnumDescriptor)
-			}
-			if enum == nil {
-				log.Printf("don't know how to generate constant for %s", fieldname)
-				continue
-			}
-			def = g.DefaultPackageName(obj) + enum.prefix() + def
-		}
-		g.P(kind, fieldname, " ", typename, " = ", def)
-		g.file.addExport(message, constOrVarSymbol{fieldname, kind, ""})
-	}
-	g.P()
-
-	// Oneof per-field types, discriminants and getters.
-	//
-	// Generate unexported named types for the discriminant interfaces.
-	// We shouldn't have to do this, but there was (~19 Aug 2015) a compiler/linker bug
-	// that was triggered by using anonymous interfaces here.
-	// TODO: Revisit this and consider reverting back to anonymous interfaces.
-	for oi := range message.OneofDecl {
-		dname := oneofDisc[int32(oi)]
-		g.P("type ", dname, " interface { ", dname, "() }")
-	}
-	g.P()
-	for _, field := range message.Field {
-		if field.OneofIndex == nil {
-			continue
-		}
-		_, wiretype := g.GoType(message, field)
-		tag := "protobuf:" + g.goTag(message, field, wiretype)
-		g.P("type ", oneofTypeName[field], " struct{ ", fieldNames[field], " ", fieldTypes[field], " `", tag, "` }")
-		g.RecordTypeUse(field.GetTypeName())
-	}
-	g.P()
-	for _, field := range message.Field {
-		if field.OneofIndex == nil {
-			continue
-		}
-		g.P("func (*", oneofTypeName[field], ") ", oneofDisc[*field.OneofIndex], "() {}")
-	}
-	g.P()
-	for oi := range message.OneofDecl {
-		fname := oneofFieldName[int32(oi)]
-		g.P("func (m *", ccTypeName, ") Get", fname, "() ", oneofDisc[int32(oi)], " {")
-		g.P("if m != nil { return m.", fname, " }")
-		g.P("return nil")
-		g.P("}")
-	}
-	g.P()
-
-	// Field getters
-	var getters []getterSymbol
-	for _, field := range message.Field {
-		oneof := field.OneofIndex != nil
-
-		fname := fieldNames[field]
-		typename, _ := g.GoType(message, field)
-		if t, ok := mapFieldTypes[field]; ok {
-			typename = t
-		}
-		mname := fieldGetterNames[field]
-		star := ""
-		if needsStar(*field.Type) && typename[0] == '*' {
-			typename = typename[1:]
-			star = "*"
-		}
-
-		// In proto3, only generate getters for message fields and oneof fields.
-		if message.proto3() && *field.Type != descriptor.FieldDescriptorProto_TYPE_MESSAGE && !oneof {
-			continue
-		}
-
-		// Only export getter symbols for basic types,
-		// and for messages and enums in the same package.
-		// Groups are not exported.
-		// Foreign types can't be hoisted through a public import because
-		// the importer may not already be importing the defining .proto.
-		// As an example, imagine we have an import tree like this:
-		//   A.proto -> B.proto -> C.proto
-		// If A publicly imports B, we need to generate the getters from B in A's output,
-		// but if one such getter returns something from C then we cannot do that
-		// because A is not importing C already.
-		var getter, genType bool
-		switch *field.Type {
-		case descriptor.FieldDescriptorProto_TYPE_GROUP:
-			getter = false
-		case descriptor.FieldDescriptorProto_TYPE_MESSAGE, descriptor.FieldDescriptorProto_TYPE_ENUM:
-			// Only export getter if its return type is in this package.
-			getter = g.ObjectNamed(field.GetTypeName()).PackageName() == message.PackageName()
-			genType = true
-		default:
-			getter = true
-		}
-		if getter {
-			getters = append(getters, getterSymbol{
-				name:     mname,
-				typ:      typename,
-				typeName: field.GetTypeName(),
-				genType:  genType,
-			})
-		}
-
-		g.P("func (m *", ccTypeName, ") "+mname+"() "+typename+" {")
-		g.In()
-		def, hasDef := defNames[field]
-		typeDefaultIsNil := false // whether this field type's default value is a literal nil unless specified
-		switch *field.Type {
-		case descriptor.FieldDescriptorProto_TYPE_BYTES:
-			typeDefaultIsNil = !hasDef
-		case descriptor.FieldDescriptorProto_TYPE_GROUP, descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-			typeDefaultIsNil = true
-		}
-		if isRepeated(field) {
-			typeDefaultIsNil = true
-		}
-		if typeDefaultIsNil && !oneof {
-			// A bytes field with no explicit default needs less generated code,
-			// as does a message or group field, or a repeated field.
-			g.P("if m != nil {")
-			g.In()
-			g.P("return m." + fname)
-			g.Out()
-			g.P("}")
-			g.P("return nil")
-			g.Out()
-			g.P("}")
-			g.P()
-			continue
-		}
-		if !oneof {
-			g.P("if m != nil && m." + fname + " != nil {")
-			g.In()
-			g.P("return " + star + "m." + fname)
-			g.Out()
-			g.P("}")
-		} else {
-			uname := oneofFieldName[*field.OneofIndex]
-			tname := oneofTypeName[field]
-			g.P("if x, ok := m.Get", uname, "().(*", tname, "); ok {")
-			g.P("return x.", fname)
-			g.P("}")
-		}
-		if hasDef {
-			if *field.Type != descriptor.FieldDescriptorProto_TYPE_BYTES {
-				g.P("return " + def)
-			} else {
-				// The default is a []byte var.
-				// Make a copy when returning it to be safe.
-				g.P("return append([]byte(nil), ", def, "...)")
-			}
-		} else {
-			switch *field.Type {
-			case descriptor.FieldDescriptorProto_TYPE_BOOL:
-				g.P("return false")
-			case descriptor.FieldDescriptorProto_TYPE_STRING:
-				g.P(`return ""`)
-			case descriptor.FieldDescriptorProto_TYPE_GROUP,
-				descriptor.FieldDescriptorProto_TYPE_MESSAGE,
-				descriptor.FieldDescriptorProto_TYPE_BYTES:
-				// This is only possible for oneof fields.
-				g.P("return nil")
-			case descriptor.FieldDescriptorProto_TYPE_ENUM:
-				// The default default for an enum is the first value in the enum,
-				// not zero.
-				obj := g.ObjectNamed(field.GetTypeName())
-				var enum *EnumDescriptor
-				if id, ok := obj.(*ImportedDescriptor); ok {
-					// The enum type has been publicly imported.
-					enum, _ = id.o.(*EnumDescriptor)
-				} else {
-					enum, _ = obj.(*EnumDescriptor)
-				}
-				if enum == nil {
-					log.Printf("don't know how to generate getter for %s", field.GetName())
-					continue
-				}
-				if len(enum.Value) == 0 {
-					g.P("return 0 // empty enum")
-				} else {
-					first := enum.Value[0].GetName()
-					g.P("return ", g.DefaultPackageName(obj)+enum.prefix()+first)
-				}
-			default:
-				g.P("return 0")
-			}
-		}
-		g.Out()
-		g.P("}")
-		g.P()
-	}
-
-	if !message.group {
-		ms := &messageSymbol{
-			sym:           ccTypeName,
-			hasExtensions: hasExtensions,
-			isMessageSet:  isMessageSet,
-			hasOneof:      len(message.OneofDecl) > 0,
-			getters:       getters,
-		}
-		g.file.addExport(message, ms)
-	}
-
-	// Oneof functions
-	if len(message.OneofDecl) > 0 {
-		fieldWire := make(map[*descriptor.FieldDescriptorProto]string)
-
-		// method
-		enc := "_" + ccTypeName + "_OneofMarshaler"
-		dec := "_" + ccTypeName + "_OneofUnmarshaler"
-		size := "_" + ccTypeName + "_OneofSizer"
-		encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error"
-		decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)"
-		sizeSig := "(msg " + g.Pkg["proto"] + ".Message) (n int)"
-
-		g.P("// XXX_OneofFuncs is for the internal use of the proto package.")
-		g.P("func (*", ccTypeName, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {")
-		g.P("return ", enc, ", ", dec, ", ", size, ", []interface{}{")
-		for _, field := range message.Field {
-			if field.OneofIndex == nil {
-				continue
-			}
-			g.P("(*", oneofTypeName[field], ")(nil),")
-		}
-		g.P("}")
-		g.P("}")
-		g.P()
-
-		// marshaler
-		g.P("func ", enc, encSig, " {")
-		g.P("m := msg.(*", ccTypeName, ")")
-		for oi, odp := range message.OneofDecl {
-			g.P("// ", odp.GetName())
-			fname := oneofFieldName[int32(oi)]
-			g.P("switch x := m.", fname, ".(type) {")
-			for _, field := range message.Field {
-				if field.OneofIndex == nil || int(*field.OneofIndex) != oi {
-					continue
-				}
-				g.P("case *", oneofTypeName[field], ":")
-				var wire, pre, post string
-				val := "x." + fieldNames[field] // overridden for TYPE_BOOL
-				canFail := false                // only TYPE_MESSAGE and TYPE_GROUP can fail
-				switch *field.Type {
-				case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-					wire = "WireFixed64"
-					pre = "b.EncodeFixed64(" + g.Pkg["math"] + ".Float64bits("
-					post = "))"
-				case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-					wire = "WireFixed32"
-					pre = "b.EncodeFixed32(uint64(" + g.Pkg["math"] + ".Float32bits("
-					post = ")))"
-				case descriptor.FieldDescriptorProto_TYPE_INT64,
-					descriptor.FieldDescriptorProto_TYPE_UINT64:
-					wire = "WireVarint"
-					pre, post = "b.EncodeVarint(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_INT32,
-					descriptor.FieldDescriptorProto_TYPE_UINT32,
-					descriptor.FieldDescriptorProto_TYPE_ENUM:
-					wire = "WireVarint"
-					pre, post = "b.EncodeVarint(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_FIXED64,
-					descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-					wire = "WireFixed64"
-					pre, post = "b.EncodeFixed64(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_FIXED32,
-					descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-					wire = "WireFixed32"
-					pre, post = "b.EncodeFixed32(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_BOOL:
-					// bool needs special handling.
-					g.P("t := uint64(0)")
-					g.P("if ", val, " { t = 1 }")
-					val = "t"
-					wire = "WireVarint"
-					pre, post = "b.EncodeVarint(", ")"
-				case descriptor.FieldDescriptorProto_TYPE_STRING:
-					wire = "WireBytes"
-					pre, post = "b.EncodeStringBytes(", ")"
-				case descriptor.FieldDescriptorProto_TYPE_GROUP:
-					wire = "WireStartGroup"
-					pre, post = "b.Marshal(", ")"
-					canFail = true
-				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-					wire = "WireBytes"
-					pre, post = "b.EncodeMessage(", ")"
-					canFail = true
-				case descriptor.FieldDescriptorProto_TYPE_BYTES:
-					wire = "WireBytes"
-					pre, post = "b.EncodeRawBytes(", ")"
-				case descriptor.FieldDescriptorProto_TYPE_SINT32:
-					wire = "WireVarint"
-					pre, post = "b.EncodeZigzag32(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_SINT64:
-					wire = "WireVarint"
-					pre, post = "b.EncodeZigzag64(uint64(", "))"
-				default:
-					g.Fail("unhandled oneof field type ", field.Type.String())
-				}
-				fieldWire[field] = wire
-				g.P("b.EncodeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".", wire, ")")
-				if !canFail {
-					g.P(pre, val, post)
-				} else {
-					g.P("if err := ", pre, val, post, "; err != nil {")
-					g.P("return err")
-					g.P("}")
-				}
-				if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
-					g.P("b.EncodeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".WireEndGroup)")
-				}
-			}
-			g.P("case nil:")
-			g.P("default: return ", g.Pkg["fmt"], `.Errorf("`, ccTypeName, ".", fname, ` has unexpected type %T", x)`)
-			g.P("}")
-		}
-		g.P("return nil")
-		g.P("}")
-		g.P()
-
-		// unmarshaler
-		g.P("func ", dec, decSig, " {")
-		g.P("m := msg.(*", ccTypeName, ")")
-		g.P("switch tag {")
-		for _, field := range message.Field {
-			if field.OneofIndex == nil {
-				continue
-			}
-			odp := message.OneofDecl[int(*field.OneofIndex)]
-			g.P("case ", field.Number, ": // ", odp.GetName(), ".", *field.Name)
-			g.P("if wire != ", g.Pkg["proto"], ".", fieldWire[field], " {")
-			g.P("return true, ", g.Pkg["proto"], ".ErrInternalBadWireType")
-			g.P("}")
-			lhs := "x, err" // overridden for TYPE_MESSAGE and TYPE_GROUP
-			var dec, cast, cast2 string
-			switch *field.Type {
-			case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-				dec, cast = "b.DecodeFixed64()", g.Pkg["math"]+".Float64frombits"
-			case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-				dec, cast, cast2 = "b.DecodeFixed32()", "uint32", g.Pkg["math"]+".Float32frombits"
-			case descriptor.FieldDescriptorProto_TYPE_INT64:
-				dec, cast = "b.DecodeVarint()", "int64"
-			case descriptor.FieldDescriptorProto_TYPE_UINT64:
-				dec = "b.DecodeVarint()"
-			case descriptor.FieldDescriptorProto_TYPE_INT32:
-				dec, cast = "b.DecodeVarint()", "int32"
-			case descriptor.FieldDescriptorProto_TYPE_FIXED64:
-				dec = "b.DecodeFixed64()"
-			case descriptor.FieldDescriptorProto_TYPE_FIXED32:
-				dec, cast = "b.DecodeFixed32()", "uint32"
-			case descriptor.FieldDescriptorProto_TYPE_BOOL:
-				dec = "b.DecodeVarint()"
-				// handled specially below
-			case descriptor.FieldDescriptorProto_TYPE_STRING:
-				dec = "b.DecodeStringBytes()"
-			case descriptor.FieldDescriptorProto_TYPE_GROUP:
-				g.P("msg := new(", fieldTypes[field][1:], ")") // drop star
-				lhs = "err"
-				dec = "b.DecodeGroup(msg)"
-				// handled specially below
-			case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-				g.P("msg := new(", fieldTypes[field][1:], ")") // drop star
-				lhs = "err"
-				dec = "b.DecodeMessage(msg)"
-				// handled specially below
-			case descriptor.FieldDescriptorProto_TYPE_BYTES:
-				dec = "b.DecodeRawBytes(true)"
-			case descriptor.FieldDescriptorProto_TYPE_UINT32:
-				dec, cast = "b.DecodeVarint()", "uint32"
-			case descriptor.FieldDescriptorProto_TYPE_ENUM:
-				dec, cast = "b.DecodeVarint()", fieldTypes[field]
-			case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-				dec, cast = "b.DecodeFixed32()", "int32"
-			case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-				dec, cast = "b.DecodeFixed64()", "int64"
-			case descriptor.FieldDescriptorProto_TYPE_SINT32:
-				dec, cast = "b.DecodeZigzag32()", "int32"
-			case descriptor.FieldDescriptorProto_TYPE_SINT64:
-				dec, cast = "b.DecodeZigzag64()", "int64"
-			default:
-				g.Fail("unhandled oneof field type ", field.Type.String())
-			}
-			g.P(lhs, " := ", dec)
-			val := "x"
-			if cast != "" {
-				val = cast + "(" + val + ")"
-			}
-			if cast2 != "" {
-				val = cast2 + "(" + val + ")"
-			}
-			switch *field.Type {
-			case descriptor.FieldDescriptorProto_TYPE_BOOL:
-				val += " != 0"
-			case descriptor.FieldDescriptorProto_TYPE_GROUP,
-				descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-				val = "msg"
-			}
-			g.P("m.", oneofFieldName[*field.OneofIndex], " = &", oneofTypeName[field], "{", val, "}")
-			g.P("return true, err")
-		}
-		g.P("default: return false, nil")
-		g.P("}")
-		g.P("}")
-		g.P()
-
-		// sizer
-		g.P("func ", size, sizeSig, " {")
-		g.P("m := msg.(*", ccTypeName, ")")
-		for oi, odp := range message.OneofDecl {
-			g.P("// ", odp.GetName())
-			fname := oneofFieldName[int32(oi)]
-			g.P("switch x := m.", fname, ".(type) {")
-			for _, field := range message.Field {
-				if field.OneofIndex == nil || int(*field.OneofIndex) != oi {
-					continue
-				}
-				g.P("case *", oneofTypeName[field], ":")
-				val := "x." + fieldNames[field]
-				var wire, varint, fixed string
-				switch *field.Type {
-				case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-					wire = "WireFixed64"
-					fixed = "8"
-				case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-					wire = "WireFixed32"
-					fixed = "4"
-				case descriptor.FieldDescriptorProto_TYPE_INT64,
-					descriptor.FieldDescriptorProto_TYPE_UINT64,
-					descriptor.FieldDescriptorProto_TYPE_INT32,
-					descriptor.FieldDescriptorProto_TYPE_UINT32,
-					descriptor.FieldDescriptorProto_TYPE_ENUM:
-					wire = "WireVarint"
-					varint = val
-				case descriptor.FieldDescriptorProto_TYPE_FIXED64,
-					descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-					wire = "WireFixed64"
-					fixed = "8"
-				case descriptor.FieldDescriptorProto_TYPE_FIXED32,
-					descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-					wire = "WireFixed32"
-					fixed = "4"
-				case descriptor.FieldDescriptorProto_TYPE_BOOL:
-					wire = "WireVarint"
-					fixed = "1"
-				case descriptor.FieldDescriptorProto_TYPE_STRING:
-					wire = "WireBytes"
-					fixed = "len(" + val + ")"
-					varint = fixed
-				case descriptor.FieldDescriptorProto_TYPE_GROUP:
-					wire = "WireStartGroup"
-					fixed = g.Pkg["proto"] + ".Size(" + val + ")"
-				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-					wire = "WireBytes"
-					g.P("s := ", g.Pkg["proto"], ".Size(", val, ")")
-					fixed = "s"
-					varint = fixed
-				case descriptor.FieldDescriptorProto_TYPE_BYTES:
-					wire = "WireBytes"
-					fixed = "len(" + val + ")"
-					varint = fixed
-				case descriptor.FieldDescriptorProto_TYPE_SINT32:
-					wire = "WireVarint"
-					varint = "(uint32(" + val + ") << 1) ^ uint32((int32(" + val + ") >> 31))"
-				case descriptor.FieldDescriptorProto_TYPE_SINT64:
-					wire = "WireVarint"
-					varint = "uint64(" + val + " << 1) ^ uint64((int64(" + val + ") >> 63))"
-				default:
-					g.Fail("unhandled oneof field type ", field.Type.String())
-				}
-				g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".", wire, ")")
-				if varint != "" {
-					g.P("n += ", g.Pkg["proto"], ".SizeVarint(uint64(", varint, "))")
-				}
-				if fixed != "" {
-					g.P("n += ", fixed)
-				}
-				if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
-					g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".WireEndGroup)")
-				}
-			}
-			g.P("case nil:")
-			g.P("default:")
-			g.P("panic(", g.Pkg["fmt"], ".Sprintf(\"proto: unexpected type %T in oneof\", x))")
-			g.P("}")
-		}
-		g.P("return n")
-		g.P("}")
-		g.P()
-	}
-
-	for _, ext := range message.ext {
-		g.generateExtension(ext)
-	}
-
-	fullName := strings.Join(message.TypeName(), ".")
-	if g.file.Package != nil {
-		fullName = *g.file.Package + "." + fullName
-	}
-
-	g.addInitf("%s.RegisterType((*%s)(nil), %q)", g.Pkg["proto"], ccTypeName, fullName)
-}
-
-func (g *Generator) generateExtension(ext *ExtensionDescriptor) {
-	ccTypeName := ext.DescName()
-
-	extObj := g.ObjectNamed(*ext.Extendee)
-	var extDesc *Descriptor
-	if id, ok := extObj.(*ImportedDescriptor); ok {
-		// This is extending a publicly imported message.
-		// We need the underlying type for goTag.
-		extDesc = id.o.(*Descriptor)
-	} else {
-		extDesc = extObj.(*Descriptor)
-	}
-	extendedType := "*" + g.TypeName(extObj) // always use the original
-	field := ext.FieldDescriptorProto
-	fieldType, wireType := g.GoType(ext.parent, field)
-	tag := g.goTag(extDesc, field, wireType)
-	g.RecordTypeUse(*ext.Extendee)
-	if n := ext.FieldDescriptorProto.TypeName; n != nil {
-		// foreign extension type
-		g.RecordTypeUse(*n)
-	}
-
-	typeName := ext.TypeName()
-
-	// Special case for proto2 message sets: If this extension is extending
-	// proto2_bridge.MessageSet, and its final name component is "message_set_extension",
-	// then drop that last component.
-	mset := false
-	if extendedType == "*proto2_bridge.MessageSet" && typeName[len(typeName)-1] == "message_set_extension" {
-		typeName = typeName[:len(typeName)-1]
-		mset = true
-	}
-
-	// For text formatting, the package must be exactly what the .proto file declares,
-	// ignoring overrides such as the go_package option, and with no dot/underscore mapping.
-	extName := strings.Join(typeName, ".")
-	if g.file.Package != nil {
-		extName = *g.file.Package + "." + extName
-	}
-
-	g.P("var ", ccTypeName, " = &", g.Pkg["proto"], ".ExtensionDesc{")
-	g.In()
-	g.P("ExtendedType: (", extendedType, ")(nil),")
-	g.P("ExtensionType: (", fieldType, ")(nil),")
-	g.P("Field: ", field.Number, ",")
-	g.P(`Name: "`, extName, `",`)
-	g.P("Tag: ", tag, ",")
-
-	g.Out()
-	g.P("}")
-	g.P()
-
-	if mset {
-		// Generate a bit more code to register with message_set.go.
-		g.addInitf("%s.RegisterMessageSetType((%s)(nil), %d, %q)", g.Pkg["proto"], fieldType, *field.Number, extName)
-	}
-
-	g.file.addExport(ext, constOrVarSymbol{ccTypeName, "var", ""})
-}
-
-func (g *Generator) generateInitFunction() {
-	for _, enum := range g.file.enum {
-		g.generateEnumRegistration(enum)
-	}
-	for _, d := range g.file.desc {
-		for _, ext := range d.ext {
-			g.generateExtensionRegistration(ext)
-		}
-	}
-	for _, ext := range g.file.ext {
-		g.generateExtensionRegistration(ext)
-	}
-	if len(g.init) == 0 {
-		return
-	}
-	g.P("func init() {")
-	g.In()
-	for _, l := range g.init {
-		g.P(l)
-	}
-	g.Out()
-	g.P("}")
-	g.init = nil
-}
-
-func (g *Generator) generateFileDescriptor(file *FileDescriptor) {
-	// Make a copy and trim source_code_info data.
-	// TODO: Trim this more when we know exactly what we need.
-	pb := proto.Clone(file.FileDescriptorProto).(*descriptor.FileDescriptorProto)
-	pb.SourceCodeInfo = nil
-
-	b, err := proto.Marshal(pb)
-	if err != nil {
-		g.Fail(err.Error())
-	}
-
-	var buf bytes.Buffer
-	w, _ := gzip.NewWriterLevel(&buf, gzip.BestCompression)
-	w.Write(b)
-	w.Close()
-	b = buf.Bytes()
-
-	g.P("var fileDescriptor", file.index, " = []byte{")
-	g.In()
-	g.P("// ", len(b), " bytes of a gzipped FileDescriptorProto")
-	for len(b) > 0 {
-		n := 16
-		if n > len(b) {
-			n = len(b)
-		}
-
-		s := ""
-		for _, c := range b[:n] {
-			s += fmt.Sprintf("0x%02x,", c)
-		}
-		g.P(s)
-
-		b = b[n:]
-	}
-	g.Out()
-	g.P("}")
-}
-
-func (g *Generator) generateEnumRegistration(enum *EnumDescriptor) {
-	// // We always print the full (proto-world) package name here.
-	pkg := enum.File().GetPackage()
-	if pkg != "" {
-		pkg += "."
-	}
-	// The full type name
-	typeName := enum.TypeName()
-	// The full type name, CamelCased.
-	ccTypeName := CamelCaseSlice(typeName)
-	g.addInitf("%s.RegisterEnum(%q, %[3]s_name, %[3]s_value)", g.Pkg["proto"], pkg+ccTypeName, ccTypeName)
-}
-
-func (g *Generator) generateExtensionRegistration(ext *ExtensionDescriptor) {
-	g.addInitf("%s.RegisterExtension(%s)", g.Pkg["proto"], ext.DescName())
-}
-
-// And now lots of helper functions.
-
-// Is c an ASCII lower-case letter?
-func isASCIILower(c byte) bool {
-	return 'a' <= c && c <= 'z'
-}
-
-// Is c an ASCII digit?
-func isASCIIDigit(c byte) bool {
-	return '0' <= c && c <= '9'
-}
-
-// CamelCase returns the CamelCased name.
-// If there is an interior underscore followed by a lower case letter,
-// drop the underscore and convert the letter to upper case.
-// There is a remote possibility of this rewrite causing a name collision,
-// but it's so remote we're prepared to pretend it's nonexistent - since the
-// C++ generator lowercases names, it's extremely unlikely to have two fields
-// with different capitalizations.
-// In short, _my_field_name_2 becomes XMyFieldName_2.
-func CamelCase(s string) string {
-	if s == "" {
-		return ""
-	}
-	t := make([]byte, 0, 32)
-	i := 0
-	if s[0] == '_' {
-		// Need a capital letter; drop the '_'.
-		t = append(t, 'X')
-		i++
-	}
-	// Invariant: if the next letter is lower case, it must be converted
-	// to upper case.
-	// That is, we process a word at a time, where words are marked by _ or
-	// upper case letter. Digits are treated as words.
-	for ; i < len(s); i++ {
-		c := s[i]
-		if c == '_' && i+1 < len(s) && isASCIILower(s[i+1]) {
-			continue // Skip the underscore in s.
-		}
-		if isASCIIDigit(c) {
-			t = append(t, c)
-			continue
-		}
-		// Assume we have a letter now - if not, it's a bogus identifier.
-		// The next word is a sequence of characters that must start upper case.
-		if isASCIILower(c) {
-			c ^= ' ' // Make it a capital letter.
-		}
-		t = append(t, c) // Guaranteed not lower case.
-		// Accept lower case sequence that follows.
-		for i+1 < len(s) && isASCIILower(s[i+1]) {
-			i++
-			t = append(t, s[i])
-		}
-	}
-	return string(t)
-}
-
-// CamelCaseSlice is like CamelCase, but the argument is a slice of strings to
-// be joined with "_".
-func CamelCaseSlice(elem []string) string { return CamelCase(strings.Join(elem, "_")) }
-
-// dottedSlice turns a sliced name into a dotted name.
-func dottedSlice(elem []string) string { return strings.Join(elem, ".") }
-
-// Given a .proto file name, return the output name for the generated Go program.
-func goFileName(name string) string {
-	ext := path.Ext(name)
-	if ext == ".proto" || ext == ".protodevel" {
-		name = name[0 : len(name)-len(ext)]
-	}
-	return name + ".pb.go"
-}
-
-// Is this field optional?
-func isOptional(field *descriptor.FieldDescriptorProto) bool {
-	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_OPTIONAL
-}
-
-// Is this field required?
-func isRequired(field *descriptor.FieldDescriptorProto) bool {
-	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_REQUIRED
-}
-
-// Is this field repeated?
-func isRepeated(field *descriptor.FieldDescriptorProto) bool {
-	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_REPEATED
-}
-
-// badToUnderscore is the mapping function used to generate Go names from package names,
-// which can be dotted in the input .proto file.  It replaces non-identifier characters such as
-// dot or dash with underscore.
-func badToUnderscore(r rune) rune {
-	if unicode.IsLetter(r) || unicode.IsDigit(r) || r == '_' {
-		return r
-	}
-	return '_'
-}
-
-// baseName returns the last path element of the name, with the last dotted suffix removed.
-func baseName(name string) string {
-	// First, find the last element
-	if i := strings.LastIndex(name, "/"); i >= 0 {
-		name = name[i+1:]
-	}
-	// Now drop the suffix
-	if i := strings.LastIndex(name, "."); i >= 0 {
-		name = name[0:i]
-	}
-	return name
-}
-
-// The SourceCodeInfo message describes the location of elements of a parsed
-// .proto file by way of a "path", which is a sequence of integers that
-// describe the route from a FileDescriptorProto to the relevant submessage.
-// The path alternates between a field number of a repeated field, and an index
-// into that repeated field. The constants below define the field numbers that
-// are used.
-//
-// See descriptor.proto for more information about this.
-const (
-	// tag numbers in FileDescriptorProto
-	packagePath = 2 // package
-	messagePath = 4 // message_type
-	enumPath    = 5 // enum_type
-	// tag numbers in DescriptorProto
-	messageFieldPath   = 2 // field
-	messageMessagePath = 3 // nested_type
-	messageEnumPath    = 4 // enum_type
-	messageOneofPath   = 8 // oneof_decl
-	// tag numbers in EnumDescriptorProto
-	enumValuePath = 2 // value
-)
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
deleted file mode 100644
index f33f7011bf..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
+++ /dev/null
@@ -1,442 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Package grpc outputs gRPC service descriptions in Go code.
-// It runs as a plugin for the Go protocol buffer compiler plugin.
-// It is linked in to protoc-gen-go.
-package grpc
-
-import (
-	"fmt"
-	"path"
-	"strconv"
-	"strings"
-
-	pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/golang/protobuf/protoc-gen-go/generator"
-)
-
-// Paths for packages used by code generated in this file,
-// relative to the import_prefix of the generator.Generator.
-const (
-	contextPkgPath = "golang.org/x/net/context"
-	grpcPkgPath    = "google.golang.org/grpc"
-)
-
-func init() {
-	generator.RegisterPlugin(new(grpc))
-}
-
-// grpc is an implementation of the Go protocol buffer compiler's
-// plugin architecture.  It generates bindings for gRPC support.
-type grpc struct {
-	gen *generator.Generator
-}
-
-// Name returns the name of this plugin, "grpc".
-func (g *grpc) Name() string {
-	return "grpc"
-}
-
-// The names for packages imported in the generated code.
-// They may vary from the final path component of the import path
-// if the name is used by other packages.
-var (
-	contextPkg string
-	grpcPkg    string
-)
-
-// Init initializes the plugin.
-func (g *grpc) Init(gen *generator.Generator) {
-	g.gen = gen
-	contextPkg = generator.RegisterUniquePackageName("context", nil)
-	grpcPkg = generator.RegisterUniquePackageName("grpc", nil)
-}
-
-// Given a type name defined in a .proto, return its object.
-// Also record that we're using it, to guarantee the associated import.
-func (g *grpc) objectNamed(name string) generator.Object {
-	g.gen.RecordTypeUse(name)
-	return g.gen.ObjectNamed(name)
-}
-
-// Given a type name defined in a .proto, return its name as we will print it.
-func (g *grpc) typeName(str string) string {
-	return g.gen.TypeName(g.objectNamed(str))
-}
-
-// P forwards to g.gen.P.
-func (g *grpc) P(args ...interface{}) { g.gen.P(args...) }
-
-// Generate generates code for the services in the given file.
-func (g *grpc) Generate(file *generator.FileDescriptor) {
-	if len(file.FileDescriptorProto.Service) == 0 {
-		return
-	}
-	g.P("// Reference imports to suppress errors if they are not otherwise used.")
-	g.P("var _ ", contextPkg, ".Context")
-	g.P("var _ ", grpcPkg, ".ClientConn")
-	g.P()
-	for i, service := range file.FileDescriptorProto.Service {
-		g.generateService(file, service, i)
-	}
-}
-
-// GenerateImports generates the import declaration for this file.
-func (g *grpc) GenerateImports(file *generator.FileDescriptor) {
-	if len(file.FileDescriptorProto.Service) == 0 {
-		return
-	}
-	g.P("import (")
-	g.P(contextPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, contextPkgPath)))
-	g.P(grpcPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, grpcPkgPath)))
-	g.P(")")
-	g.P()
-}
-
-// reservedClientName records whether a client name is reserved on the client side.
-var reservedClientName = map[string]bool{
-// TODO: do we need any in gRPC?
-}
-
-func unexport(s string) string { return strings.ToLower(s[:1]) + s[1:] }
-
-// generateService generates all the code for the named service.
-func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.ServiceDescriptorProto, index int) {
-	path := fmt.Sprintf("6,%d", index) // 6 means service.
-
-	origServName := service.GetName()
-	fullServName := origServName
-	if pkg := file.GetPackage(); pkg != "" {
-		fullServName = pkg + "." + fullServName
-	}
-	servName := generator.CamelCase(origServName)
-
-	g.P()
-	g.P("// Client API for ", servName, " service")
-	g.P()
-
-	// Client interface.
-	g.P("type ", servName, "Client interface {")
-	for i, method := range service.Method {
-		g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service.
-		g.P(g.generateClientSignature(servName, method))
-	}
-	g.P("}")
-	g.P()
-
-	// Client structure.
-	g.P("type ", unexport(servName), "Client struct {")
-	g.P("cc *", grpcPkg, ".ClientConn")
-	g.P("}")
-	g.P()
-
-	// NewClient factory.
-	g.P("func New", servName, "Client (cc *", grpcPkg, ".ClientConn) ", servName, "Client {")
-	g.P("return &", unexport(servName), "Client{cc}")
-	g.P("}")
-	g.P()
-
-	var methodIndex, streamIndex int
-	serviceDescVar := "_" + servName + "_serviceDesc"
-	// Client method implementations.
-	for _, method := range service.Method {
-		var descExpr string
-		if !method.GetServerStreaming() && !method.GetClientStreaming() {
-			// Unary RPC method
-			descExpr = fmt.Sprintf("&%s.Methods[%d]", serviceDescVar, methodIndex)
-			methodIndex++
-		} else {
-			// Streaming RPC method
-			descExpr = fmt.Sprintf("&%s.Streams[%d]", serviceDescVar, streamIndex)
-			streamIndex++
-		}
-		g.generateClientMethod(servName, fullServName, serviceDescVar, method, descExpr)
-	}
-
-	g.P("// Server API for ", servName, " service")
-	g.P()
-
-	// Server interface.
-	serverType := servName + "Server"
-	g.P("type ", serverType, " interface {")
-	for i, method := range service.Method {
-		g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service.
-		g.P(g.generateServerSignature(servName, method))
-	}
-	g.P("}")
-	g.P()
-
-	// Server registration.
-	g.P("func Register", servName, "Server(s *", grpcPkg, ".Server, srv ", serverType, ") {")
-	g.P("s.RegisterService(&", serviceDescVar, `, srv)`)
-	g.P("}")
-	g.P()
-
-	// Server handler implementations.
-	var handlerNames []string
-	for _, method := range service.Method {
-		hname := g.generateServerMethod(servName, method)
-		handlerNames = append(handlerNames, hname)
-	}
-
-	// Service descriptor.
-	g.P("var ", serviceDescVar, " = ", grpcPkg, ".ServiceDesc {")
-	g.P("ServiceName: ", strconv.Quote(fullServName), ",")
-	g.P("HandlerType: (*", serverType, ")(nil),")
-	g.P("Methods: []", grpcPkg, ".MethodDesc{")
-	for i, method := range service.Method {
-		if method.GetServerStreaming() || method.GetClientStreaming() {
-			continue
-		}
-		g.P("{")
-		g.P("MethodName: ", strconv.Quote(method.GetName()), ",")
-		g.P("Handler: ", handlerNames[i], ",")
-		g.P("},")
-	}
-	g.P("},")
-	g.P("Streams: []", grpcPkg, ".StreamDesc{")
-	for i, method := range service.Method {
-		if !method.GetServerStreaming() && !method.GetClientStreaming() {
-			continue
-		}
-		g.P("{")
-		g.P("StreamName: ", strconv.Quote(method.GetName()), ",")
-		g.P("Handler: ", handlerNames[i], ",")
-		if method.GetServerStreaming() {
-			g.P("ServerStreams: true,")
-		}
-		if method.GetClientStreaming() {
-			g.P("ClientStreams: true,")
-		}
-		g.P("},")
-	}
-	g.P("},")
-	g.P("}")
-	g.P()
-}
-
-// generateClientSignature returns the client-side signature for a method.
-func (g *grpc) generateClientSignature(servName string, method *pb.MethodDescriptorProto) string {
-	origMethName := method.GetName()
-	methName := generator.CamelCase(origMethName)
-	if reservedClientName[methName] {
-		methName += "_"
-	}
-	reqArg := ", in *" + g.typeName(method.GetInputType())
-	if method.GetClientStreaming() {
-		reqArg = ""
-	}
-	respName := "*" + g.typeName(method.GetOutputType())
-	if method.GetServerStreaming() || method.GetClientStreaming() {
-		respName = servName + "_" + generator.CamelCase(origMethName) + "Client"
-	}
-	return fmt.Sprintf("%s(ctx %s.Context%s, opts ...%s.CallOption) (%s, error)", methName, contextPkg, reqArg, grpcPkg, respName)
-}
-
-func (g *grpc) generateClientMethod(servName, fullServName, serviceDescVar string, method *pb.MethodDescriptorProto, descExpr string) {
-	sname := fmt.Sprintf("/%s/%s", fullServName, method.GetName())
-	methName := generator.CamelCase(method.GetName())
-	inType := g.typeName(method.GetInputType())
-	outType := g.typeName(method.GetOutputType())
-
-	g.P("func (c *", unexport(servName), "Client) ", g.generateClientSignature(servName, method), "{")
-	if !method.GetServerStreaming() && !method.GetClientStreaming() {
-		g.P("out := new(", outType, ")")
-		// TODO: Pass descExpr to Invoke.
-		g.P("err := ", grpcPkg, `.Invoke(ctx, "`, sname, `", in, out, c.cc, opts...)`)
-		g.P("if err != nil { return nil, err }")
-		g.P("return out, nil")
-		g.P("}")
-		g.P()
-		return
-	}
-	streamType := unexport(servName) + methName + "Client"
-	g.P("stream, err := ", grpcPkg, ".NewClientStream(ctx, ", descExpr, `, c.cc, "`, sname, `", opts...)`)
-	g.P("if err != nil { return nil, err }")
-	g.P("x := &", streamType, "{stream}")
-	if !method.GetClientStreaming() {
-		g.P("if err := x.ClientStream.SendMsg(in); err != nil { return nil, err }")
-		g.P("if err := x.ClientStream.CloseSend(); err != nil { return nil, err }")
-	}
-	g.P("return x, nil")
-	g.P("}")
-	g.P()
-
-	genSend := method.GetClientStreaming()
-	genRecv := method.GetServerStreaming()
-	genCloseAndRecv := !method.GetServerStreaming()
-
-	// Stream auxiliary types and methods.
-	g.P("type ", servName, "_", methName, "Client interface {")
-	if genSend {
-		g.P("Send(*", inType, ") error")
-	}
-	if genRecv {
-		g.P("Recv() (*", outType, ", error)")
-	}
-	if genCloseAndRecv {
-		g.P("CloseAndRecv() (*", outType, ", error)")
-	}
-	g.P(grpcPkg, ".ClientStream")
-	g.P("}")
-	g.P()
-
-	g.P("type ", streamType, " struct {")
-	g.P(grpcPkg, ".ClientStream")
-	g.P("}")
-	g.P()
-
-	if genSend {
-		g.P("func (x *", streamType, ") Send(m *", inType, ") error {")
-		g.P("return x.ClientStream.SendMsg(m)")
-		g.P("}")
-		g.P()
-	}
-	if genRecv {
-		g.P("func (x *", streamType, ") Recv() (*", outType, ", error) {")
-		g.P("m := new(", outType, ")")
-		g.P("if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err }")
-		g.P("return m, nil")
-		g.P("}")
-		g.P()
-	}
-	if genCloseAndRecv {
-		g.P("func (x *", streamType, ") CloseAndRecv() (*", outType, ", error) {")
-		g.P("if err := x.ClientStream.CloseSend(); err != nil { return nil, err }")
-		g.P("m := new(", outType, ")")
-		g.P("if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err }")
-		g.P("return m, nil")
-		g.P("}")
-		g.P()
-	}
-}
-
-// generateServerSignature returns the server-side signature for a method.
-func (g *grpc) generateServerSignature(servName string, method *pb.MethodDescriptorProto) string {
-	origMethName := method.GetName()
-	methName := generator.CamelCase(origMethName)
-	if reservedClientName[methName] {
-		methName += "_"
-	}
-
-	var reqArgs []string
-	ret := "error"
-	if !method.GetServerStreaming() && !method.GetClientStreaming() {
-		reqArgs = append(reqArgs, contextPkg+".Context")
-		ret = "(*" + g.typeName(method.GetOutputType()) + ", error)"
-	}
-	if !method.GetClientStreaming() {
-		reqArgs = append(reqArgs, "*"+g.typeName(method.GetInputType()))
-	}
-	if method.GetServerStreaming() || method.GetClientStreaming() {
-		reqArgs = append(reqArgs, servName+"_"+generator.CamelCase(origMethName)+"Server")
-	}
-
-	return methName + "(" + strings.Join(reqArgs, ", ") + ") " + ret
-}
-
-func (g *grpc) generateServerMethod(servName string, method *pb.MethodDescriptorProto) string {
-	methName := generator.CamelCase(method.GetName())
-	hname := fmt.Sprintf("_%s_%s_Handler", servName, methName)
-	inType := g.typeName(method.GetInputType())
-	outType := g.typeName(method.GetOutputType())
-
-	if !method.GetServerStreaming() && !method.GetClientStreaming() {
-		g.P("func ", hname, "(srv interface{}, ctx ", contextPkg, ".Context, dec func(interface{}) error) (interface{}, error) {")
-		g.P("in := new(", inType, ")")
-		g.P("if err := dec(in); err != nil { return nil, err }")
-		g.P("out, err := srv.(", servName, "Server).", methName, "(ctx, in)")
-		g.P("if err != nil { return nil, err }")
-		g.P("return out, nil")
-		g.P("}")
-		g.P()
-		return hname
-	}
-	streamType := unexport(servName) + methName + "Server"
-	g.P("func ", hname, "(srv interface{}, stream ", grpcPkg, ".ServerStream) error {")
-	if !method.GetClientStreaming() {
-		g.P("m := new(", inType, ")")
-		g.P("if err := stream.RecvMsg(m); err != nil { return err }")
-		g.P("return srv.(", servName, "Server).", methName, "(m, &", streamType, "{stream})")
-	} else {
-		g.P("return srv.(", servName, "Server).", methName, "(&", streamType, "{stream})")
-	}
-	g.P("}")
-	g.P()
-
-	genSend := method.GetServerStreaming()
-	genSendAndClose := !method.GetServerStreaming()
-	genRecv := method.GetClientStreaming()
-
-	// Stream auxiliary types and methods.
-	g.P("type ", servName, "_", methName, "Server interface {")
-	if genSend {
-		g.P("Send(*", outType, ") error")
-	}
-	if genSendAndClose {
-		g.P("SendAndClose(*", outType, ") error")
-	}
-	if genRecv {
-		g.P("Recv() (*", inType, ", error)")
-	}
-	g.P(grpcPkg, ".ServerStream")
-	g.P("}")
-	g.P()
-
-	g.P("type ", streamType, " struct {")
-	g.P(grpcPkg, ".ServerStream")
-	g.P("}")
-	g.P()
-
-	if genSend {
-		g.P("func (x *", streamType, ") Send(m *", outType, ") error {")
-		g.P("return x.ServerStream.SendMsg(m)")
-		g.P("}")
-		g.P()
-	}
-	if genSendAndClose {
-		g.P("func (x *", streamType, ") SendAndClose(m *", outType, ") error {")
-		g.P("return x.ServerStream.SendMsg(m)")
-		g.P("}")
-		g.P()
-	}
-	if genRecv {
-		g.P("func (x *", streamType, ") Recv() (*", inType, ", error) {")
-		g.P("m := new(", inType, ")")
-		g.P("if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err }")
-		g.P("return m, nil")
-		g.P("}")
-		g.P()
-	}
-
-	return hname
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
deleted file mode 100644
index 24e490ec4b..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package main
-
-import _ "github.com/golang/protobuf/protoc-gen-go/internal/grpc"
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go
deleted file mode 100644
index 8e2486de0b..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/main.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// protoc-gen-go is a plugin for the Google protocol buffer compiler to generate
-// Go code.  Run it by building this program and putting it in your path with
-// the name
-// 	protoc-gen-go
-// That word 'go' at the end becomes part of the option string set for the
-// protocol compiler, so once the protocol compiler (protoc) is installed
-// you can run
-// 	protoc --go_out=output_directory input_directory/file.proto
-// to generate Go bindings for the protocol defined by file.proto.
-// With that input, the output will be written to
-// 	output_directory/file.pb.go
-//
-// The generated code is documented in the package comment for
-// the library.
-//
-// See the README and documentation for protocol buffers to learn more:
-// 	https://developers.google.com/protocol-buffers/
-package main
-
-import (
-	"io/ioutil"
-	"os"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/protoc-gen-go/generator"
-)
-
-func main() {
-	// Begin by allocating a generator. The request and response structures are stored there
-	// so we can do error handling easily - the response structure contains the field to
-	// report failure.
-	g := generator.New()
-
-	data, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		g.Error(err, "reading input")
-	}
-
-	if err := proto.Unmarshal(data, g.Request); err != nil {
-		g.Error(err, "parsing input proto")
-	}
-
-	if len(g.Request.FileToGenerate) == 0 {
-		g.Fail("no files to generate")
-	}
-
-	g.CommandLineParameters(g.Request.GetParameter())
-
-	// Create a wrapped version of the Descriptors and EnumDescriptors that
-	// point to the file that defines them.
-	g.WrapTypes()
-
-	g.SetPackageNames()
-	g.BuildTypeNameMap()
-
-	g.GenerateAllFiles()
-
-	// Send back the results.
-	data, err = proto.Marshal(g.Response)
-	if err != nil {
-		g.Error(err, "failed to marshal output proto")
-	}
-	_, err = os.Stdout.Write(data)
-	if err != nil {
-		g.Error(err, "failed to write output proto")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
deleted file mode 100644
index eb41f20daa..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Not stored here, but plugin.proto is in https://github.com/google/protobuf/
-# at src/google/protobuf/compiler/plugin.proto
-# Also we need to fix an import.
-regenerate:
-	echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
-	protoc --go_out=Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor:. \
-		-I$(HOME)/src/protobuf/src $(HOME)/src/protobuf/src/google/protobuf/compiler/plugin.proto && \
-		mv google/protobuf/compiler/plugin.pb.go $(GOPATH)/src/github.com/golang/protobuf/protoc-gen-go/plugin
-
-restore:
-	cp plugin.pb.golden plugin.pb.go
-
-preserve:
-	cp plugin.pb.go plugin.pb.golden
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
deleted file mode 100644
index af31f733e9..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
+++ /dev/null
@@ -1,222 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google/protobuf/compiler/plugin.proto
-// DO NOT EDIT!
-
-/*
-Package google_protobuf_compiler is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/compiler/plugin.proto
-
-It has these top-level messages:
-	CodeGeneratorRequest
-	CodeGeneratorResponse
-*/
-package google_protobuf_compiler
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import google_protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
-
-// An encoded CodeGeneratorRequest is written to the plugin's stdin.
-type CodeGeneratorRequest struct {
-	// The .proto files that were explicitly listed on the command-line.  The
-	// code generator should generate code only for these files.  Each file's
-	// descriptor will be included in proto_file, below.
-	FileToGenerate []string `protobuf:"bytes,1,rep,name=file_to_generate" json:"file_to_generate,omitempty"`
-	// The generator parameter passed on the command-line.
-	Parameter *string `protobuf:"bytes,2,opt,name=parameter" json:"parameter,omitempty"`
-	// FileDescriptorProtos for all files in files_to_generate and everything
-	// they import.  The files will appear in topological order, so each file
-	// appears before any file that imports it.
-	//
-	// protoc guarantees that all proto_files will be written after
-	// the fields above, even though this is not technically guaranteed by the
-	// protobuf wire format.  This theoretically could allow a plugin to stream
-	// in the FileDescriptorProtos and handle them one by one rather than read
-	// the entire set into memory at once.  However, as of this writing, this
-	// is not similarly optimized on protoc's end -- it will store all fields in
-	// memory at once before sending them to the plugin.
-	ProtoFile        []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file" json:"proto_file,omitempty"`
-	XXX_unrecognized []byte                                 `json:"-"`
-}
-
-func (m *CodeGeneratorRequest) Reset()                    { *m = CodeGeneratorRequest{} }
-func (m *CodeGeneratorRequest) String() string            { return proto.CompactTextString(m) }
-func (*CodeGeneratorRequest) ProtoMessage()               {}
-func (*CodeGeneratorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *CodeGeneratorRequest) GetFileToGenerate() []string {
-	if m != nil {
-		return m.FileToGenerate
-	}
-	return nil
-}
-
-func (m *CodeGeneratorRequest) GetParameter() string {
-	if m != nil && m.Parameter != nil {
-		return *m.Parameter
-	}
-	return ""
-}
-
-func (m *CodeGeneratorRequest) GetProtoFile() []*google_protobuf.FileDescriptorProto {
-	if m != nil {
-		return m.ProtoFile
-	}
-	return nil
-}
-
-// The plugin writes an encoded CodeGeneratorResponse to stdout.
-type CodeGeneratorResponse struct {
-	// Error message.  If non-empty, code generation failed.  The plugin process
-	// should exit with status code zero even if it reports an error in this way.
-	//
-	// This should be used to indicate errors in .proto files which prevent the
-	// code generator from generating correct code.  Errors which indicate a
-	// problem in protoc itself -- such as the input CodeGeneratorRequest being
-	// unparseable -- should be reported by writing a message to stderr and
-	// exiting with a non-zero status code.
-	Error            *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	File             []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
-	XXX_unrecognized []byte                        `json:"-"`
-}
-
-func (m *CodeGeneratorResponse) Reset()                    { *m = CodeGeneratorResponse{} }
-func (m *CodeGeneratorResponse) String() string            { return proto.CompactTextString(m) }
-func (*CodeGeneratorResponse) ProtoMessage()               {}
-func (*CodeGeneratorResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *CodeGeneratorResponse) GetError() string {
-	if m != nil && m.Error != nil {
-		return *m.Error
-	}
-	return ""
-}
-
-func (m *CodeGeneratorResponse) GetFile() []*CodeGeneratorResponse_File {
-	if m != nil {
-		return m.File
-	}
-	return nil
-}
-
-// Represents a single generated file.
-type CodeGeneratorResponse_File struct {
-	// The file name, relative to the output directory.  The name must not
-	// contain "." or ".." components and must be relative, not be absolute (so,
-	// the file cannot lie outside the output directory).  "/" must be used as
-	// the path separator, not "\".
-	//
-	// If the name is omitted, the content will be appended to the previous
-	// file.  This allows the generator to break large files into small chunks,
-	// and allows the generated text to be streamed back to protoc so that large
-	// files need not reside completely in memory at one time.  Note that as of
-	// this writing protoc does not optimize for this -- it will read the entire
-	// CodeGeneratorResponse before writing files to disk.
-	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// If non-empty, indicates that the named file should already exist, and the
-	// content here is to be inserted into that file at a defined insertion
-	// point.  This feature allows a code generator to extend the output
-	// produced by another code generator.  The original generator may provide
-	// insertion points by placing special annotations in the file that look
-	// like:
-	//   @@protoc_insertion_point(NAME)
-	// The annotation can have arbitrary text before and after it on the line,
-	// which allows it to be placed in a comment.  NAME should be replaced with
-	// an identifier naming the point -- this is what other generators will use
-	// as the insertion_point.  Code inserted at this point will be placed
-	// immediately above the line containing the insertion point (thus multiple
-	// insertions to the same point will come out in the order they were added).
-	// The double-@ is intended to make it unlikely that the generated code
-	// could contain things that look like insertion points by accident.
-	//
-	// For example, the C++ code generator places the following line in the
-	// .pb.h files that it generates:
-	//   // @@protoc_insertion_point(namespace_scope)
-	// This line appears within the scope of the file's package namespace, but
-	// outside of any particular class.  Another plugin can then specify the
-	// insertion_point "namespace_scope" to generate additional classes or
-	// other declarations that should be placed in this scope.
-	//
-	// Note that if the line containing the insertion point begins with
-	// whitespace, the same whitespace will be added to every line of the
-	// inserted text.  This is useful for languages like Python, where
-	// indentation matters.  In these languages, the insertion point comment
-	// should be indented the same amount as any inserted code will need to be
-	// in order to work correctly in that context.
-	//
-	// The code generator that generates the initial file and the one which
-	// inserts into it must both run as part of a single invocation of protoc.
-	// Code generators are executed in the order in which they appear on the
-	// command line.
-	//
-	// If |insertion_point| is present, |name| must also be present.
-	InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point" json:"insertion_point,omitempty"`
-	// The file contents.
-	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *CodeGeneratorResponse_File) Reset()                    { *m = CodeGeneratorResponse_File{} }
-func (m *CodeGeneratorResponse_File) String() string            { return proto.CompactTextString(m) }
-func (*CodeGeneratorResponse_File) ProtoMessage()               {}
-func (*CodeGeneratorResponse_File) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
-
-func (m *CodeGeneratorResponse_File) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *CodeGeneratorResponse_File) GetInsertionPoint() string {
-	if m != nil && m.InsertionPoint != nil {
-		return *m.InsertionPoint
-	}
-	return ""
-}
-
-func (m *CodeGeneratorResponse_File) GetContent() string {
-	if m != nil && m.Content != nil {
-		return *m.Content
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*CodeGeneratorRequest)(nil), "google.protobuf.compiler.CodeGeneratorRequest")
-	proto.RegisterType((*CodeGeneratorResponse)(nil), "google.protobuf.compiler.CodeGeneratorResponse")
-	proto.RegisterType((*CodeGeneratorResponse_File)(nil), "google.protobuf.compiler.CodeGeneratorResponse.File")
-}
-
-var fileDescriptor0 = []byte{
-	// 269 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4a, 0xc3, 0x40,
-	0x10, 0x86, 0xa9, 0x46, 0xa4, 0x63, 0x25, 0x1a, 0x14, 0x43, 0xf1, 0x10, 0x44, 0xc1, 0x83, 0x6c,
-	0x40, 0x3c, 0x78, 0xf2, 0x10, 0x45, 0xaf, 0xc5, 0x17, 0x08, 0x31, 0x9d, 0x86, 0x85, 0x74, 0x67,
-	0x9d, 0xdd, 0x1c, 0x7d, 0x21, 0x9f, 0xd2, 0xc9, 0xa6, 0x15, 0x09, 0xf6, 0x14, 0xf8, 0xe7, 0xcf,
-	0xf7, 0xcd, 0xb0, 0x70, 0xd3, 0x10, 0x35, 0x2d, 0xe6, 0x96, 0xc9, 0xd3, 0x47, 0xb7, 0xca, 0x6b,
-	0x5a, 0x5b, 0xdd, 0x22, 0xe7, 0xb6, 0xed, 0x1a, 0x6d, 0x54, 0x18, 0x24, 0xe9, 0x50, 0x53, 0xdb,
-	0x9a, 0xda, 0xd6, 0xe6, 0xd9, 0x18, 0xb0, 0x44, 0x57, 0xb3, 0xb6, 0x9e, 0x78, 0x68, 0x5f, 0x7d,
-	0xc1, 0xd9, 0x33, 0x2d, 0xf1, 0x0d, 0x0d, 0x72, 0x25, 0xf1, 0x3b, 0x7e, 0x76, 0xe8, 0x7c, 0x92,
-	0xc2, 0xc9, 0x4a, 0x10, 0xa5, 0xa7, 0xb2, 0x19, 0x66, 0x98, 0x4e, 0xb2, 0xfd, 0xdb, 0x69, 0x72,
-	0x0a, 0x53, 0x5b, 0x71, 0xb5, 0x46, 0x8f, 0x9c, 0xee, 0x65, 0x13, 0x89, 0x1e, 0x01, 0x02, 0xad,
-	0xec, 0x7f, 0x49, 0x63, 0xa9, 0x1d, 0xdd, 0x5f, 0xab, 0xf1, 0x56, 0xaf, 0x32, 0x7c, 0xf9, 0xf5,
-	0x2f, 0x82, 0xfe, 0x7b, 0x02, 0xe7, 0x23, 0xbf, 0xb3, 0x64, 0x1c, 0x26, 0xc7, 0x70, 0x80, 0xcc,
-	0xc4, 0x62, 0xed, 0x15, 0x05, 0x44, 0x7f, 0xe0, 0x0f, 0x6a, 0xd7, 0xc9, 0xea, 0x5f, 0x5a, 0x70,
-	0xcf, 0x9f, 0x20, 0xea, 0xbf, 0xc9, 0x0c, 0x22, 0x23, 0xfb, 0x6f, 0xc8, 0x17, 0x10, 0x6b, 0xa9,
-	0xb0, 0xd7, 0x64, 0x4a, 0x4b, 0xda, 0xf8, 0xcd, 0x55, 0x31, 0x1c, 0xd6, 0x64, 0x3c, 0x4a, 0x10,
-	0xf7, 0x41, 0x71, 0x07, 0x97, 0xa2, 0xd9, 0xa9, 0x2e, 0x66, 0x8b, 0xf0, 0x2a, 0xe1, 0x32, 0xf7,
-	0x13, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x18, 0x2a, 0x2a, 0xbd, 0x01, 0x00, 0x00,
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden b/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden
deleted file mode 100644
index 8953d0ff82..0000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden
+++ /dev/null
@@ -1,83 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google/protobuf/compiler/plugin.proto
-// DO NOT EDIT!
-
-package google_protobuf_compiler
-
-import proto "github.com/golang/protobuf/proto"
-import "math"
-import google_protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
-
-// Reference proto and math imports to suppress error if they are not otherwise used.
-var _ = proto.GetString
-var _ = math.Inf
-
-type CodeGeneratorRequest struct {
-	FileToGenerate   []string                               `protobuf:"bytes,1,rep,name=file_to_generate" json:"file_to_generate,omitempty"`
-	Parameter        *string                                `protobuf:"bytes,2,opt,name=parameter" json:"parameter,omitempty"`
-	ProtoFile        []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file" json:"proto_file,omitempty"`
-	XXX_unrecognized []byte                                 `json:"-"`
-}
-
-func (this *CodeGeneratorRequest) Reset()         { *this = CodeGeneratorRequest{} }
-func (this *CodeGeneratorRequest) String() string { return proto.CompactTextString(this) }
-func (*CodeGeneratorRequest) ProtoMessage()       {}
-
-func (this *CodeGeneratorRequest) GetParameter() string {
-	if this != nil && this.Parameter != nil {
-		return *this.Parameter
-	}
-	return ""
-}
-
-type CodeGeneratorResponse struct {
-	Error            *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	File             []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
-	XXX_unrecognized []byte                        `json:"-"`
-}
-
-func (this *CodeGeneratorResponse) Reset()         { *this = CodeGeneratorResponse{} }
-func (this *CodeGeneratorResponse) String() string { return proto.CompactTextString(this) }
-func (*CodeGeneratorResponse) ProtoMessage()       {}
-
-func (this *CodeGeneratorResponse) GetError() string {
-	if this != nil && this.Error != nil {
-		return *this.Error
-	}
-	return ""
-}
-
-type CodeGeneratorResponse_File struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	InsertionPoint   *string `protobuf:"bytes,2,opt,name=insertion_point" json:"insertion_point,omitempty"`
-	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (this *CodeGeneratorResponse_File) Reset()         { *this = CodeGeneratorResponse_File{} }
-func (this *CodeGeneratorResponse_File) String() string { return proto.CompactTextString(this) }
-func (*CodeGeneratorResponse_File) ProtoMessage()       {}
-
-func (this *CodeGeneratorResponse_File) GetName() string {
-	if this != nil && this.Name != nil {
-		return *this.Name
-	}
-	return ""
-}
-
-func (this *CodeGeneratorResponse_File) GetInsertionPoint() string {
-	if this != nil && this.InsertionPoint != nil {
-		return *this.InsertionPoint
-	}
-	return ""
-}
-
-func (this *CodeGeneratorResponse_File) GetContent() string {
-	if this != nil && this.Content != nil {
-		return *this.Content
-	}
-	return ""
-}
-
-func init() {
-}
diff --git a/Godeps/_workspace/src/github.com/google/btree/.travis.yml b/Godeps/_workspace/src/github.com/google/btree/.travis.yml
deleted file mode 100644
index 4f2ee4d973..0000000000
--- a/Godeps/_workspace/src/github.com/google/btree/.travis.yml
+++ /dev/null
@@ -1 +0,0 @@
-language: go
diff --git a/Godeps/_workspace/src/github.com/google/btree/LICENSE b/Godeps/_workspace/src/github.com/google/btree/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/Godeps/_workspace/src/github.com/google/btree/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/google/btree/README.md b/Godeps/_workspace/src/github.com/google/btree/README.md
deleted file mode 100644
index 6062a4dacd..0000000000
--- a/Godeps/_workspace/src/github.com/google/btree/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# BTree implementation for Go
-
-![Travis CI Build Status](https://api.travis-ci.org/google/btree.svg?branch=master)
-
-This package provides an in-memory B-Tree implementation for Go, useful as
-an ordered, mutable data structure.
-
-The API is based off of the wonderful
-http://godoc.org/github.com/petar/GoLLRB/llrb, and is meant to allow btree to
-act as a drop-in replacement for gollrb trees.
-
-See http://godoc.org/github.com/google/btree for documentation.
diff --git a/Godeps/_workspace/src/github.com/google/btree/btree.go b/Godeps/_workspace/src/github.com/google/btree/btree.go
deleted file mode 100644
index eb1f75cda6..0000000000
--- a/Godeps/_workspace/src/github.com/google/btree/btree.go
+++ /dev/null
@@ -1,571 +0,0 @@
-// Copyright 2014 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package btree implements in-memory B-Trees of arbitrary degree.
-//
-// btree implements an in-memory B-Tree for use as an ordered data structure.
-// It is not meant for persistent storage solutions.
-//
-// It has a flatter structure than an equivalent red-black or other binary tree,
-// which in some cases yields better memory usage and/or performance.
-// See some discussion on the matter here:
-//   http://google-opensource.blogspot.com/2013/01/c-containers-that-save-memory-and-time.html
-// Note, though, that this project is in no way related to the C++ B-Tree
-// implmentation written about there.
-//
-// Within this tree, each node contains a slice of items and a (possibly nil)
-// slice of children.  For basic numeric values or raw structs, this can cause
-// efficiency differences when compared to equivalent C++ template code that
-// stores values in arrays within the node:
-//   * Due to the overhead of storing values as interfaces (each
-//     value needs to be stored as the value itself, then 2 words for the
-//     interface pointing to that value and its type), resulting in higher
-//     memory use.
-//   * Since interfaces can point to values anywhere in memory, values are
-//     most likely not stored in contiguous blocks, resulting in a higher
-//     number of cache misses.
-// These issues don't tend to matter, though, when working with strings or other
-// heap-allocated structures, since C++-equivalent structures also must store
-// pointers and also distribute their values across the heap.
-//
-// This implementation is designed to be a drop-in replacement to gollrb.LLRB
-// trees, (http://github.com/petar/gollrb), an excellent and probably the most
-// widely used ordered tree implementation in the Go ecosystem currently.
-// Its functions, therefore, exactly mirror those of
-// llrb.LLRB where possible.  Unlike gollrb, though, we currently don't
-// support storing multiple equivalent values or backwards iteration.
-package btree
-
-import (
-	"fmt"
-	"io"
-	"sort"
-	"strings"
-)
-
-// Item represents a single object in the tree.
-type Item interface {
-	// Less tests whether the current item is less than the given argument.
-	//
-	// This must provide a strict weak ordering.
-	// If !a.Less(b) && !b.Less(a), we treat this to mean a == b (i.e. we can only
-	// hold one of either a or b in the tree).
-	Less(than Item) bool
-}
-
-// ItemIterator allows callers of Ascend* to iterate in-order over portions of
-// the tree.  When this function returns false, iteration will stop and the
-// associated Ascend* function will immediately return.
-type ItemIterator func(i Item) bool
-
-// New creates a new B-Tree with the given degree.
-//
-// New(2), for example, will create a 2-3-4 tree (each node contains 1-3 items
-// and 2-4 children).
-func New(degree int) *BTree {
-	if degree <= 1 {
-		panic("bad degree")
-	}
-	return &BTree{
-		degree:   degree,
-		freelist: make([]*node, 0, 32),
-	}
-}
-
-// items stores items in a node.
-type items []Item
-
-// insertAt inserts a value into the given index, pushing all subsequent values
-// forward.
-func (s *items) insertAt(index int, item Item) {
-	*s = append(*s, nil)
-	if index < len(*s) {
-		copy((*s)[index+1:], (*s)[index:])
-	}
-	(*s)[index] = item
-}
-
-// removeAt removes a value at a given index, pulling all subsequent values
-// back.
-func (s *items) removeAt(index int) Item {
-	item := (*s)[index]
-	copy((*s)[index:], (*s)[index+1:])
-	*s = (*s)[:len(*s)-1]
-	return item
-}
-
-// pop removes and returns the last element in the list.
-func (s *items) pop() (out Item) {
-	index := len(*s) - 1
-	out, *s = (*s)[index], (*s)[:index]
-	return
-}
-
-// find returns the index where the given item should be inserted into this
-// list.  'found' is true if the item already exists in the list at the given
-// index.
-func (s items) find(item Item) (index int, found bool) {
-	i := sort.Search(len(s), func(i int) bool {
-		return item.Less(s[i])
-	})
-	if i > 0 && !s[i-1].Less(item) {
-		return i - 1, true
-	}
-	return i, false
-}
-
-// children stores child nodes in a node.
-type children []*node
-
-// insertAt inserts a value into the given index, pushing all subsequent values
-// forward.
-func (s *children) insertAt(index int, n *node) {
-	*s = append(*s, nil)
-	if index < len(*s) {
-		copy((*s)[index+1:], (*s)[index:])
-	}
-	(*s)[index] = n
-}
-
-// removeAt removes a value at a given index, pulling all subsequent values
-// back.
-func (s *children) removeAt(index int) *node {
-	n := (*s)[index]
-	copy((*s)[index:], (*s)[index+1:])
-	*s = (*s)[:len(*s)-1]
-	return n
-}
-
-// pop removes and returns the last element in the list.
-func (s *children) pop() (out *node) {
-	index := len(*s) - 1
-	out, *s = (*s)[index], (*s)[:index]
-	return
-}
-
-// node is an internal node in a tree.
-//
-// It must at all times maintain the invariant that either
-//   * len(children) == 0, len(items) unconstrained
-//   * len(children) == len(items) + 1
-type node struct {
-	items    items
-	children children
-	t        *BTree
-}
-
-// split splits the given node at the given index.  The current node shrinks,
-// and this function returns the item that existed at that index and a new node
-// containing all items/children after it.
-func (n *node) split(i int) (Item, *node) {
-	item := n.items[i]
-	next := n.t.newNode()
-	next.items = append(next.items, n.items[i+1:]...)
-	n.items = n.items[:i]
-	if len(n.children) > 0 {
-		next.children = append(next.children, n.children[i+1:]...)
-		n.children = n.children[:i+1]
-	}
-	return item, next
-}
-
-// maybeSplitChild checks if a child should be split, and if so splits it.
-// Returns whether or not a split occurred.
-func (n *node) maybeSplitChild(i, maxItems int) bool {
-	if len(n.children[i].items) < maxItems {
-		return false
-	}
-	first := n.children[i]
-	item, second := first.split(maxItems / 2)
-	n.items.insertAt(i, item)
-	n.children.insertAt(i+1, second)
-	return true
-}
-
-// insert inserts an item into the subtree rooted at this node, making sure
-// no nodes in the subtree exceed maxItems items.  Should an equivalent item be
-// be found/replaced by insert, it will be returned.
-func (n *node) insert(item Item, maxItems int) Item {
-	i, found := n.items.find(item)
-	if found {
-		out := n.items[i]
-		n.items[i] = item
-		return out
-	}
-	if len(n.children) == 0 {
-		n.items.insertAt(i, item)
-		return nil
-	}
-	if n.maybeSplitChild(i, maxItems) {
-		inTree := n.items[i]
-		switch {
-		case item.Less(inTree):
-			// no change, we want first split node
-		case inTree.Less(item):
-			i++ // we want second split node
-		default:
-			out := n.items[i]
-			n.items[i] = item
-			return out
-		}
-	}
-	return n.children[i].insert(item, maxItems)
-}
-
-// get finds the given key in the subtree and returns it.
-func (n *node) get(key Item) Item {
-	i, found := n.items.find(key)
-	if found {
-		return n.items[i]
-	} else if len(n.children) > 0 {
-		return n.children[i].get(key)
-	}
-	return nil
-}
-
-// toRemove details what item to remove in a node.remove call.
-type toRemove int
-
-const (
-	removeItem toRemove = iota // removes the given item
-	removeMin                  // removes smallest item in the subtree
-	removeMax                  // removes largest item in the subtree
-)
-
-// remove removes an item from the subtree rooted at this node.
-func (n *node) remove(item Item, minItems int, typ toRemove) Item {
-	var i int
-	var found bool
-	switch typ {
-	case removeMax:
-		if len(n.children) == 0 {
-			return n.items.pop()
-		}
-		i = len(n.items)
-	case removeMin:
-		if len(n.children) == 0 {
-			return n.items.removeAt(0)
-		}
-		i = 0
-	case removeItem:
-		i, found = n.items.find(item)
-		if len(n.children) == 0 {
-			if found {
-				return n.items.removeAt(i)
-			}
-			return nil
-		}
-	default:
-		panic("invalid type")
-	}
-	// If we get to here, we have children.
-	child := n.children[i]
-	if len(child.items) <= minItems {
-		return n.growChildAndRemove(i, item, minItems, typ)
-	}
-	// Either we had enough items to begin with, or we've done some
-	// merging/stealing, because we've got enough now and we're ready to return
-	// stuff.
-	if found {
-		// The item exists at index 'i', and the child we've selected can give us a
-		// predecessor, since if we've gotten here it's got > minItems items in it.
-		out := n.items[i]
-		// We use our special-case 'remove' call with typ=maxItem to pull the
-		// predecessor of item i (the rightmost leaf of our immediate left child)
-		// and set it into where we pulled the item from.
-		n.items[i] = child.remove(nil, minItems, removeMax)
-		return out
-	}
-	// Final recursive call.  Once we're here, we know that the item isn't in this
-	// node and that the child is big enough to remove from.
-	return child.remove(item, minItems, typ)
-}
-
-// growChildAndRemove grows child 'i' to make sure it's possible to remove an
-// item from it while keeping it at minItems, then calls remove to actually
-// remove it.
-//
-// Most documentation says we have to do two sets of special casing:
-//   1) item is in this node
-//   2) item is in child
-// In both cases, we need to handle the two subcases:
-//   A) node has enough values that it can spare one
-//   B) node doesn't have enough values
-// For the latter, we have to check:
-//   a) left sibling has node to spare
-//   b) right sibling has node to spare
-//   c) we must merge
-// To simplify our code here, we handle cases #1 and #2 the same:
-// If a node doesn't have enough items, we make sure it does (using a,b,c).
-// We then simply redo our remove call, and the second time (regardless of
-// whether we're in case 1 or 2), we'll have enough items and can guarantee
-// that we hit case A.
-func (n *node) growChildAndRemove(i int, item Item, minItems int, typ toRemove) Item {
-	child := n.children[i]
-	if i > 0 && len(n.children[i-1].items) > minItems {
-		// Steal from left child
-		stealFrom := n.children[i-1]
-		stolenItem := stealFrom.items.pop()
-		child.items.insertAt(0, n.items[i-1])
-		n.items[i-1] = stolenItem
-		if len(stealFrom.children) > 0 {
-			child.children.insertAt(0, stealFrom.children.pop())
-		}
-	} else if i < len(n.items) && len(n.children[i+1].items) > minItems {
-		// steal from right child
-		stealFrom := n.children[i+1]
-		stolenItem := stealFrom.items.removeAt(0)
-		child.items = append(child.items, n.items[i])
-		n.items[i] = stolenItem
-		if len(stealFrom.children) > 0 {
-			child.children = append(child.children, stealFrom.children.removeAt(0))
-		}
-	} else {
-		if i >= len(n.items) {
-			i--
-			child = n.children[i]
-		}
-		// merge with right child
-		mergeItem := n.items.removeAt(i)
-		mergeChild := n.children.removeAt(i + 1)
-		child.items = append(child.items, mergeItem)
-		child.items = append(child.items, mergeChild.items...)
-		child.children = append(child.children, mergeChild.children...)
-		n.t.freeNode(mergeChild)
-	}
-	return n.remove(item, minItems, typ)
-}
-
-// iterate provides a simple method for iterating over elements in the tree.
-// It could probably use some work to be extra-efficient (it calls from() a
-// little more than it should), but it works pretty well for now.
-//
-// It requires that 'from' and 'to' both return true for values we should hit
-// with the iterator.  It should also be the case that 'from' returns true for
-// values less than or equal to values 'to' returns true for, and 'to'
-// returns true for values greater than or equal to those that 'from'
-// does.
-func (n *node) iterate(from, to func(Item) bool, iter ItemIterator) bool {
-	for i, item := range n.items {
-		if !from(item) {
-			continue
-		}
-		if len(n.children) > 0 && !n.children[i].iterate(from, to, iter) {
-			return false
-		}
-		if !to(item) {
-			return false
-		}
-		if !iter(item) {
-			return false
-		}
-	}
-	if len(n.children) > 0 {
-		return n.children[len(n.children)-1].iterate(from, to, iter)
-	}
-	return true
-}
-
-// Used for testing/debugging purposes.
-func (n *node) print(w io.Writer, level int) {
-	fmt.Fprintf(w, "%sNODE:%v\n", strings.Repeat("  ", level), n.items)
-	for _, c := range n.children {
-		c.print(w, level+1)
-	}
-}
-
-// BTree is an implementation of a B-Tree.
-//
-// BTree stores Item instances in an ordered structure, allowing easy insertion,
-// removal, and iteration.
-//
-// Write operations are not safe for concurrent mutation by multiple
-// goroutines, but Read operations are.
-type BTree struct {
-	degree   int
-	length   int
-	root     *node
-	freelist []*node
-}
-
-// maxItems returns the max number of items to allow per node.
-func (t *BTree) maxItems() int {
-	return t.degree*2 - 1
-}
-
-// minItems returns the min number of items to allow per node (ignored for the
-// root node).
-func (t *BTree) minItems() int {
-	return t.degree - 1
-}
-
-func (t *BTree) newNode() (n *node) {
-	index := len(t.freelist) - 1
-	if index < 0 {
-		return &node{t: t}
-	}
-	t.freelist, n = t.freelist[:index], t.freelist[index]
-	return
-}
-
-func (t *BTree) freeNode(n *node) {
-	if len(t.freelist) < cap(t.freelist) {
-    for i := range n.items {
-      n.items[i] = nil  // clear to allow GC
-    }
-		n.items = n.items[:0]
-    for i := range n.children {
-      n.children[i] = nil  // clear to allow GC
-    }
-		n.children = n.children[:0]
-		t.freelist = append(t.freelist, n)
-	}
-}
-
-// ReplaceOrInsert adds the given item to the tree.  If an item in the tree
-// already equals the given one, it is removed from the tree and returned.
-// Otherwise, nil is returned.
-//
-// nil cannot be added to the tree (will panic).
-func (t *BTree) ReplaceOrInsert(item Item) Item {
-	if item == nil {
-		panic("nil item being added to BTree")
-	}
-	if t.root == nil {
-		t.root = t.newNode()
-		t.root.items = append(t.root.items, item)
-		t.length++
-		return nil
-	} else if len(t.root.items) >= t.maxItems() {
-		item2, second := t.root.split(t.maxItems() / 2)
-		oldroot := t.root
-		t.root = t.newNode()
-		t.root.items = append(t.root.items, item2)
-		t.root.children = append(t.root.children, oldroot, second)
-	}
-	out := t.root.insert(item, t.maxItems())
-	if out == nil {
-		t.length++
-	}
-	return out
-}
-
-// Delete removes an item equal to the passed in item from the tree, returning
-// it.  If no such item exists, returns nil.
-func (t *BTree) Delete(item Item) Item {
-	return t.deleteItem(item, removeItem)
-}
-
-// DeleteMin removes the smallest item in the tree and returns it.
-// If no such item exists, returns nil.
-func (t *BTree) DeleteMin() Item {
-	return t.deleteItem(nil, removeMin)
-}
-
-// DeleteMax removes the largest item in the tree and returns it.
-// If no such item exists, returns nil.
-func (t *BTree) DeleteMax() Item {
-	return t.deleteItem(nil, removeMax)
-}
-
-func (t *BTree) deleteItem(item Item, typ toRemove) Item {
-	if t.root == nil || len(t.root.items) == 0 {
-		return nil
-	}
-	out := t.root.remove(item, t.minItems(), typ)
-	if len(t.root.items) == 0 && len(t.root.children) > 0 {
-		oldroot := t.root
-		t.root = t.root.children[0]
-		t.freeNode(oldroot)
-	}
-	if out != nil {
-		t.length--
-	}
-	return out
-}
-
-// AscendRange calls the iterator for every value in the tree within the range
-// [greaterOrEqual, lessThan), until iterator returns false.
-func (t *BTree) AscendRange(greaterOrEqual, lessThan Item, iterator ItemIterator) {
-	if t.root == nil {
-		return
-	}
-	t.root.iterate(
-		func(a Item) bool { return !a.Less(greaterOrEqual) },
-		func(a Item) bool { return a.Less(lessThan) },
-		iterator)
-}
-
-// AscendLessThan calls the iterator for every value in the tree within the range
-// [first, pivot), until iterator returns false.
-func (t *BTree) AscendLessThan(pivot Item, iterator ItemIterator) {
-	if t.root == nil {
-		return
-	}
-	t.root.iterate(
-		func(a Item) bool { return true },
-		func(a Item) bool { return a.Less(pivot) },
-		iterator)
-}
-
-// AscendGreaterOrEqual calls the iterator for every value in the tree within
-// the range [pivot, last], until iterator returns false.
-func (t *BTree) AscendGreaterOrEqual(pivot Item, iterator ItemIterator) {
-	if t.root == nil {
-		return
-	}
-	t.root.iterate(
-		func(a Item) bool { return !a.Less(pivot) },
-		func(a Item) bool { return true },
-		iterator)
-}
-
-// Ascend calls the iterator for every value in the tree within the range
-// [first, last], until iterator returns false.
-func (t *BTree) Ascend(iterator ItemIterator) {
-	if t.root == nil {
-		return
-	}
-	t.root.iterate(
-		func(a Item) bool { return true },
-		func(a Item) bool { return true },
-		iterator)
-}
-
-// Get looks for the key item in the tree, returning it.  It returns nil if
-// unable to find that item.
-func (t *BTree) Get(key Item) Item {
-	if t.root == nil {
-		return nil
-	}
-	return t.root.get(key)
-}
-
-// Has returns true if the given key is in the tree.
-func (t *BTree) Has(key Item) bool {
-	return t.Get(key) != nil
-}
-
-// Len returns the number of items currently in the tree.
-func (t *BTree) Len() int {
-	return t.length
-}
-
-// Int implements the Item interface for integers.
-type Int int
-
-// Less returns true if int(a) < int(b).
-func (a Int) Less(b Item) bool {
-	return a < b.(Int)
-}
diff --git a/Godeps/_workspace/src/github.com/google/btree/btree_mem.go b/Godeps/_workspace/src/github.com/google/btree/btree_mem.go
deleted file mode 100644
index cb95b7fa1b..0000000000
--- a/Godeps/_workspace/src/github.com/google/btree/btree_mem.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2014 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build ignore
-
-// This binary compares memory usage between btree and gollrb.
-package main
-
-import (
-	"flag"
-	"fmt"
-	"math/rand"
-	"runtime"
-	"time"
-
-	"github.com/google/btree"
-	"github.com/petar/GoLLRB/llrb"
-)
-
-var (
-	size   = flag.Int("size", 1000000, "size of the tree to build")
-	degree = flag.Int("degree", 8, "degree of btree")
-	gollrb = flag.Bool("llrb", false, "use llrb instead of btree")
-)
-
-func main() {
-	flag.Parse()
-	vals := rand.Perm(*size)
-	var t, v interface{}
-	v = vals
-	var stats runtime.MemStats
-	for i := 0; i < 10; i++ {
-		runtime.GC()
-	}
-	fmt.Println("-------- BEFORE ----------")
-	runtime.ReadMemStats(&stats)
-	fmt.Printf("%+v\n", stats)
-	start := time.Now()
-	if *gollrb {
-		tr := llrb.New()
-		for _, v := range vals {
-			tr.ReplaceOrInsert(llrb.Int(v))
-		}
-		t = tr // keep it around
-	} else {
-		tr := btree.New(*degree)
-		for _, v := range vals {
-			tr.ReplaceOrInsert(btree.Int(v))
-		}
-		t = tr // keep it around
-	}
-	fmt.Printf("%v inserts in %v\n", *size, time.Since(start))
-	fmt.Println("-------- AFTER ----------")
-	runtime.ReadMemStats(&stats)
-	fmt.Printf("%+v\n", stats)
-	for i := 0; i < 10; i++ {
-		runtime.GC()
-	}
-	fmt.Println("-------- AFTER GC ----------")
-	runtime.ReadMemStats(&stats)
-	fmt.Printf("%+v\n", stats)
-	if t == v {
-		fmt.Println("to make sure vals and tree aren't GC'd")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gopherjs/gopherjs/LICENSE b/Godeps/_workspace/src/github.com/gopherjs/gopherjs/LICENSE
deleted file mode 100644
index d496fef109..0000000000
--- a/Godeps/_workspace/src/github.com/gopherjs/gopherjs/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2013 Richard Musiol. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/.travis.yml b/Godeps/_workspace/src/github.com/gorilla/context/.travis.yml
deleted file mode 100644
index d87d465768..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/context/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: go
-
-go:
-  - 1.0
-  - 1.1
-  - 1.2
-  - tip
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/LICENSE b/Godeps/_workspace/src/github.com/gorilla/context/LICENSE
deleted file mode 100644
index 0e5fb87280..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/context/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-	 * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-	 * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/README.md b/Godeps/_workspace/src/github.com/gorilla/context/README.md
deleted file mode 100644
index c60a31b053..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/context/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-context
-=======
-[![Build Status](https://travis-ci.org/gorilla/context.png?branch=master)](https://travis-ci.org/gorilla/context)
-
-gorilla/context is a general purpose registry for global request variables.
-
-Read the full documentation here: http://www.gorillatoolkit.org/pkg/context
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/context.go b/Godeps/_workspace/src/github.com/gorilla/context/context.go
deleted file mode 100644
index 81cb128b19..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/context/context.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package context
-
-import (
-	"net/http"
-	"sync"
-	"time"
-)
-
-var (
-	mutex sync.RWMutex
-	data  = make(map[*http.Request]map[interface{}]interface{})
-	datat = make(map[*http.Request]int64)
-)
-
-// Set stores a value for a given key in a given request.
-func Set(r *http.Request, key, val interface{}) {
-	mutex.Lock()
-	if data[r] == nil {
-		data[r] = make(map[interface{}]interface{})
-		datat[r] = time.Now().Unix()
-	}
-	data[r][key] = val
-	mutex.Unlock()
-}
-
-// Get returns a value stored for a given key in a given request.
-func Get(r *http.Request, key interface{}) interface{} {
-	mutex.RLock()
-	if ctx := data[r]; ctx != nil {
-		value := ctx[key]
-		mutex.RUnlock()
-		return value
-	}
-	mutex.RUnlock()
-	return nil
-}
-
-// GetOk returns stored value and presence state like multi-value return of map access.
-func GetOk(r *http.Request, key interface{}) (interface{}, bool) {
-	mutex.RLock()
-	if _, ok := data[r]; ok {
-		value, ok := data[r][key]
-		mutex.RUnlock()
-		return value, ok
-	}
-	mutex.RUnlock()
-	return nil, false
-}
-
-// GetAll returns all stored values for the request as a map. Nil is returned for invalid requests.
-func GetAll(r *http.Request) map[interface{}]interface{} {
-	mutex.RLock()
-	if context, ok := data[r]; ok {
-		result := make(map[interface{}]interface{}, len(context))
-		for k, v := range context {
-			result[k] = v
-		}
-		mutex.RUnlock()
-		return result
-	}
-	mutex.RUnlock()
-	return nil
-}
-
-// GetAllOk returns all stored values for the request as a map and a boolean value that indicates if
-// the request was registered.
-func GetAllOk(r *http.Request) (map[interface{}]interface{}, bool) {
-	mutex.RLock()
-	context, ok := data[r]
-	result := make(map[interface{}]interface{}, len(context))
-	for k, v := range context {
-		result[k] = v
-	}
-	mutex.RUnlock()
-	return result, ok
-}
-
-// Delete removes a value stored for a given key in a given request.
-func Delete(r *http.Request, key interface{}) {
-	mutex.Lock()
-	if data[r] != nil {
-		delete(data[r], key)
-	}
-	mutex.Unlock()
-}
-
-// Clear removes all values stored for a given request.
-//
-// This is usually called by a handler wrapper to clean up request
-// variables at the end of a request lifetime. See ClearHandler().
-func Clear(r *http.Request) {
-	mutex.Lock()
-	clear(r)
-	mutex.Unlock()
-}
-
-// clear is Clear without the lock.
-func clear(r *http.Request) {
-	delete(data, r)
-	delete(datat, r)
-}
-
-// Purge removes request data stored for longer than maxAge, in seconds.
-// It returns the amount of requests removed.
-//
-// If maxAge <= 0, all request data is removed.
-//
-// This is only used for sanity check: in case context cleaning was not
-// properly set some request data can be kept forever, consuming an increasing
-// amount of memory. In case this is detected, Purge() must be called
-// periodically until the problem is fixed.
-func Purge(maxAge int) int {
-	mutex.Lock()
-	count := 0
-	if maxAge <= 0 {
-		count = len(data)
-		data = make(map[*http.Request]map[interface{}]interface{})
-		datat = make(map[*http.Request]int64)
-	} else {
-		min := time.Now().Unix() - int64(maxAge)
-		for r := range data {
-			if datat[r] < min {
-				clear(r)
-				count++
-			}
-		}
-	}
-	mutex.Unlock()
-	return count
-}
-
-// ClearHandler wraps an http.Handler and clears request values at the end
-// of a request lifetime.
-func ClearHandler(h http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		defer Clear(r)
-		h.ServeHTTP(w, r)
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/gorilla/context/doc.go b/Godeps/_workspace/src/github.com/gorilla/context/doc.go
deleted file mode 100644
index 73c7400311..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/context/doc.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package context stores values shared during a request lifetime.
-
-For example, a router can set variables extracted from the URL and later
-application handlers can access those values, or it can be used to store
-sessions values to be saved at the end of a request. There are several
-others common uses.
-
-The idea was posted by Brad Fitzpatrick to the go-nuts mailing list:
-
-	http://groups.google.com/group/golang-nuts/msg/e2d679d303aa5d53
-
-Here's the basic usage: first define the keys that you will need. The key
-type is interface{} so a key can be of any type that supports equality.
-Here we define a key using a custom int type to avoid name collisions:
-
-	package foo
-
-	import (
-		"github.com/gorilla/context"
-	)
-
-	type key int
-
-	const MyKey key = 0
-
-Then set a variable. Variables are bound to an http.Request object, so you
-need a request instance to set a value:
-
-	context.Set(r, MyKey, "bar")
-
-The application can later access the variable using the same key you provided:
-
-	func MyHandler(w http.ResponseWriter, r *http.Request) {
-		// val is "bar".
-		val := context.Get(r, foo.MyKey)
-
-		// returns ("bar", true)
-		val, ok := context.GetOk(r, foo.MyKey)
-		// ...
-	}
-
-And that's all about the basic usage. We discuss some other ideas below.
-
-Any type can be stored in the context. To enforce a given type, make the key
-private and wrap Get() and Set() to accept and return values of a specific
-type:
-
-	type key int
-
-	const mykey key = 0
-
-	// GetMyKey returns a value for this package from the request values.
-	func GetMyKey(r *http.Request) SomeType {
-		if rv := context.Get(r, mykey); rv != nil {
-			return rv.(SomeType)
-		}
-		return nil
-	}
-
-	// SetMyKey sets a value for this package in the request values.
-	func SetMyKey(r *http.Request, val SomeType) {
-		context.Set(r, mykey, val)
-	}
-
-Variables must be cleared at the end of a request, to remove all values
-that were stored. This can be done in an http.Handler, after a request was
-served. Just call Clear() passing the request:
-
-	context.Clear(r)
-
-...or use ClearHandler(), which conveniently wraps an http.Handler to clear
-variables at the end of a request lifetime.
-
-The Routers from the packages gorilla/mux and gorilla/pat call Clear()
-so if you are using either of them you don't need to clear the context manually.
-*/
-package context
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml b/Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml
deleted file mode 100644
index d87d465768..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: go
-
-go:
-  - 1.0
-  - 1.1
-  - 1.2
-  - tip
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE b/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE
deleted file mode 100644
index 0e5fb87280..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-	 * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-	 * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/README.md b/Godeps/_workspace/src/github.com/gorilla/mux/README.md
deleted file mode 100644
index e60301b033..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/mux/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-mux
-===
-[![Build Status](https://travis-ci.org/gorilla/mux.png?branch=master)](https://travis-ci.org/gorilla/mux)
-
-gorilla/mux is a powerful URL router and dispatcher.
-
-Read the full documentation here: http://www.gorillatoolkit.org/pkg/mux
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/doc.go b/Godeps/_workspace/src/github.com/gorilla/mux/doc.go
deleted file mode 100644
index b2deed34c4..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/mux/doc.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package gorilla/mux implements a request router and dispatcher.
-
-The name mux stands for "HTTP request multiplexer". Like the standard
-http.ServeMux, mux.Router matches incoming requests against a list of
-registered routes and calls a handler for the route that matches the URL
-or other conditions. The main features are:
-
-	* Requests can be matched based on URL host, path, path prefix, schemes,
-	  header and query values, HTTP methods or using custom matchers.
-	* URL hosts and paths can have variables with an optional regular
-	  expression.
-	* Registered URLs can be built, or "reversed", which helps maintaining
-	  references to resources.
-	* Routes can be used as subrouters: nested routes are only tested if the
-	  parent route matches. This is useful to define groups of routes that
-	  share common conditions like a host, a path prefix or other repeated
-	  attributes. As a bonus, this optimizes request matching.
-	* It implements the http.Handler interface so it is compatible with the
-	  standard http.ServeMux.
-
-Let's start registering a couple of URL paths and handlers:
-
-	func main() {
-		r := mux.NewRouter()
-		r.HandleFunc("/", HomeHandler)
-		r.HandleFunc("/products", ProductsHandler)
-		r.HandleFunc("/articles", ArticlesHandler)
-		http.Handle("/", r)
-	}
-
-Here we register three routes mapping URL paths to handlers. This is
-equivalent to how http.HandleFunc() works: if an incoming request URL matches
-one of the paths, the corresponding handler is called passing
-(http.ResponseWriter, *http.Request) as parameters.
-
-Paths can have variables. They are defined using the format {name} or
-{name:pattern}. If a regular expression pattern is not defined, the matched
-variable will be anything until the next slash. For example:
-
-	r := mux.NewRouter()
-	r.HandleFunc("/products/{key}", ProductHandler)
-	r.HandleFunc("/articles/{category}/", ArticlesCategoryHandler)
-	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler)
-
-The names are used to create a map of route variables which can be retrieved
-calling mux.Vars():
-
-	vars := mux.Vars(request)
-	category := vars["category"]
-
-And this is all you need to know about the basic usage. More advanced options
-are explained below.
-
-Routes can also be restricted to a domain or subdomain. Just define a host
-pattern to be matched. They can also have variables:
-
-	r := mux.NewRouter()
-	// Only matches if domain is "www.domain.com".
-	r.Host("www.domain.com")
-	// Matches a dynamic subdomain.
-	r.Host("{subdomain:[a-z]+}.domain.com")
-
-There are several other matchers that can be added. To match path prefixes:
-
-	r.PathPrefix("/products/")
-
-...or HTTP methods:
-
-	r.Methods("GET", "POST")
-
-...or URL schemes:
-
-	r.Schemes("https")
-
-...or header values:
-
-	r.Headers("X-Requested-With", "XMLHttpRequest")
-
-...or query values:
-
-	r.Queries("key", "value")
-
-...or to use a custom matcher function:
-
-	r.MatcherFunc(func(r *http.Request, rm *RouteMatch) bool {
-		return r.ProtoMajor == 0
-    })
-
-...and finally, it is possible to combine several matchers in a single route:
-
-	r.HandleFunc("/products", ProductsHandler).
-	  Host("www.domain.com").
-	  Methods("GET").
-	  Schemes("http")
-
-Setting the same matching conditions again and again can be boring, so we have
-a way to group several routes that share the same requirements.
-We call it "subrouting".
-
-For example, let's say we have several URLs that should only match when the
-host is "www.domain.com". Create a route for that host and get a "subrouter"
-from it:
-
-	r := mux.NewRouter()
-	s := r.Host("www.domain.com").Subrouter()
-
-Then register routes in the subrouter:
-
-	s.HandleFunc("/products/", ProductsHandler)
-	s.HandleFunc("/products/{key}", ProductHandler)
-	s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-
-The three URL paths we registered above will only be tested if the domain is
-"www.domain.com", because the subrouter is tested first. This is not
-only convenient, but also optimizes request matching. You can create
-subrouters combining any attribute matchers accepted by a route.
-
-Subrouters can be used to create domain or path "namespaces": you define
-subrouters in a central place and then parts of the app can register its
-paths relatively to a given subrouter.
-
-There's one more thing about subroutes. When a subrouter has a path prefix,
-the inner routes use it as base for their paths:
-
-	r := mux.NewRouter()
-	s := r.PathPrefix("/products").Subrouter()
-	// "/products/"
-	s.HandleFunc("/", ProductsHandler)
-	// "/products/{key}/"
-	s.HandleFunc("/{key}/", ProductHandler)
-	// "/products/{key}/details"
-	s.HandleFunc("/{key}/details", ProductDetailsHandler)
-
-Now let's see how to build registered URLs.
-
-Routes can be named. All routes that define a name can have their URLs built,
-or "reversed". We define a name calling Name() on a route. For example:
-
-	r := mux.NewRouter()
-	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-	  Name("article")
-
-To build a URL, get the route and call the URL() method, passing a sequence of
-key/value pairs for the route variables. For the previous route, we would do:
-
-	url, err := r.Get("article").URL("category", "technology", "id", "42")
-
-...and the result will be a url.URL with the following path:
-
-	"/articles/technology/42"
-
-This also works for host variables:
-
-	r := mux.NewRouter()
-	r.Host("{subdomain}.domain.com").
-	  Path("/articles/{category}/{id:[0-9]+}").
-	  HandlerFunc(ArticleHandler).
-	  Name("article")
-
-	// url.String() will be "http://news.domain.com/articles/technology/42"
-	url, err := r.Get("article").URL("subdomain", "news",
-									 "category", "technology",
-									 "id", "42")
-
-All variables defined in the route are required, and their values must
-conform to the corresponding patterns. These requirements guarantee that a
-generated URL will always match a registered route -- the only exception is
-for explicitly defined "build-only" routes which never match.
-
-There's also a way to build only the URL host or path for a route:
-use the methods URLHost() or URLPath() instead. For the previous route,
-we would do:
-
-	// "http://news.domain.com/"
-	host, err := r.Get("article").URLHost("subdomain", "news")
-
-	// "/articles/technology/42"
-	path, err := r.Get("article").URLPath("category", "technology", "id", "42")
-
-And if you use subrouters, host and path defined separately can be built
-as well:
-
-	r := mux.NewRouter()
-	s := r.Host("{subdomain}.domain.com").Subrouter()
-	s.Path("/articles/{category}/{id:[0-9]+}").
-	  HandlerFunc(ArticleHandler).
-	  Name("article")
-
-	// "http://news.domain.com/articles/technology/42"
-	url, err := r.Get("article").URL("subdomain", "news",
-									 "category", "technology",
-									 "id", "42")
-*/
-package mux
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go b/Godeps/_workspace/src/github.com/gorilla/mux/mux.go
deleted file mode 100644
index 5b5f8e7db5..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
-	"fmt"
-	"net/http"
-	"path"
-
-	"github.com/gorilla/context"
-)
-
-// NewRouter returns a new router instance.
-func NewRouter() *Router {
-	return &Router{namedRoutes: make(map[string]*Route), KeepContext: false}
-}
-
-// Router registers routes to be matched and dispatches a handler.
-//
-// It implements the http.Handler interface, so it can be registered to serve
-// requests:
-//
-//     var router = mux.NewRouter()
-//
-//     func main() {
-//         http.Handle("/", router)
-//     }
-//
-// Or, for Google App Engine, register it in a init() function:
-//
-//     func init() {
-//         http.Handle("/", router)
-//     }
-//
-// This will send all incoming requests to the router.
-type Router struct {
-	// Configurable Handler to be used when no route matches.
-	NotFoundHandler http.Handler
-	// Parent route, if this is a subrouter.
-	parent parentRoute
-	// Routes to be matched, in order.
-	routes []*Route
-	// Routes by name for URL building.
-	namedRoutes map[string]*Route
-	// See Router.StrictSlash(). This defines the flag for new routes.
-	strictSlash bool
-	// If true, do not clear the request context after handling the request
-	KeepContext bool
-}
-
-// Match matches registered routes against the request.
-func (r *Router) Match(req *http.Request, match *RouteMatch) bool {
-	for _, route := range r.routes {
-		if route.Match(req, match) {
-			return true
-		}
-	}
-	return false
-}
-
-// ServeHTTP dispatches the handler registered in the matched route.
-//
-// When there is a match, the route variables can be retrieved calling
-// mux.Vars(request).
-func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	// Clean path to canonical form and redirect.
-	if p := cleanPath(req.URL.Path); p != req.URL.Path {
-
-		// Added 3 lines (Philip Schlump) - It was droping the query string and #whatever from query.
-		// This matches with fix in go 1.2 r.c. 4 for same problem.  Go Issue:
-		// http://code.google.com/p/go/issues/detail?id=5252
-		url := *req.URL
-		url.Path = p
-		p = url.String()
-
-		w.Header().Set("Location", p)
-		w.WriteHeader(http.StatusMovedPermanently)
-		return
-	}
-	var match RouteMatch
-	var handler http.Handler
-	if r.Match(req, &match) {
-		handler = match.Handler
-		setVars(req, match.Vars)
-		setCurrentRoute(req, match.Route)
-	}
-	if handler == nil {
-		handler = r.NotFoundHandler
-		if handler == nil {
-			handler = http.NotFoundHandler()
-		}
-	}
-	if !r.KeepContext {
-		defer context.Clear(req)
-	}
-	handler.ServeHTTP(w, req)
-}
-
-// Get returns a route registered with the given name.
-func (r *Router) Get(name string) *Route {
-	return r.getNamedRoutes()[name]
-}
-
-// GetRoute returns a route registered with the given name. This method
-// was renamed to Get() and remains here for backwards compatibility.
-func (r *Router) GetRoute(name string) *Route {
-	return r.getNamedRoutes()[name]
-}
-
-// StrictSlash defines the trailing slash behavior for new routes. The initial
-// value is false.
-//
-// When true, if the route path is "/path/", accessing "/path" will redirect
-// to the former and vice versa. In other words, your application will always
-// see the path as specified in the route.
-//
-// When false, if the route path is "/path", accessing "/path/" will not match
-// this route and vice versa.
-//
-// Special case: when a route sets a path prefix using the PathPrefix() method,
-// strict slash is ignored for that route because the redirect behavior can't
-// be determined from a prefix alone. However, any subrouters created from that
-// route inherit the original StrictSlash setting.
-func (r *Router) StrictSlash(value bool) *Router {
-	r.strictSlash = value
-	return r
-}
-
-// ----------------------------------------------------------------------------
-// parentRoute
-// ----------------------------------------------------------------------------
-
-// getNamedRoutes returns the map where named routes are registered.
-func (r *Router) getNamedRoutes() map[string]*Route {
-	if r.namedRoutes == nil {
-		if r.parent != nil {
-			r.namedRoutes = r.parent.getNamedRoutes()
-		} else {
-			r.namedRoutes = make(map[string]*Route)
-		}
-	}
-	return r.namedRoutes
-}
-
-// getRegexpGroup returns regexp definitions from the parent route, if any.
-func (r *Router) getRegexpGroup() *routeRegexpGroup {
-	if r.parent != nil {
-		return r.parent.getRegexpGroup()
-	}
-	return nil
-}
-
-// ----------------------------------------------------------------------------
-// Route factories
-// ----------------------------------------------------------------------------
-
-// NewRoute registers an empty route.
-func (r *Router) NewRoute() *Route {
-	route := &Route{parent: r, strictSlash: r.strictSlash}
-	r.routes = append(r.routes, route)
-	return route
-}
-
-// Handle registers a new route with a matcher for the URL path.
-// See Route.Path() and Route.Handler().
-func (r *Router) Handle(path string, handler http.Handler) *Route {
-	return r.NewRoute().Path(path).Handler(handler)
-}
-
-// HandleFunc registers a new route with a matcher for the URL path.
-// See Route.Path() and Route.HandlerFunc().
-func (r *Router) HandleFunc(path string, f func(http.ResponseWriter,
-	*http.Request)) *Route {
-	return r.NewRoute().Path(path).HandlerFunc(f)
-}
-
-// Headers registers a new route with a matcher for request header values.
-// See Route.Headers().
-func (r *Router) Headers(pairs ...string) *Route {
-	return r.NewRoute().Headers(pairs...)
-}
-
-// Host registers a new route with a matcher for the URL host.
-// See Route.Host().
-func (r *Router) Host(tpl string) *Route {
-	return r.NewRoute().Host(tpl)
-}
-
-// MatcherFunc registers a new route with a custom matcher function.
-// See Route.MatcherFunc().
-func (r *Router) MatcherFunc(f MatcherFunc) *Route {
-	return r.NewRoute().MatcherFunc(f)
-}
-
-// Methods registers a new route with a matcher for HTTP methods.
-// See Route.Methods().
-func (r *Router) Methods(methods ...string) *Route {
-	return r.NewRoute().Methods(methods...)
-}
-
-// Path registers a new route with a matcher for the URL path.
-// See Route.Path().
-func (r *Router) Path(tpl string) *Route {
-	return r.NewRoute().Path(tpl)
-}
-
-// PathPrefix registers a new route with a matcher for the URL path prefix.
-// See Route.PathPrefix().
-func (r *Router) PathPrefix(tpl string) *Route {
-	return r.NewRoute().PathPrefix(tpl)
-}
-
-// Queries registers a new route with a matcher for URL query values.
-// See Route.Queries().
-func (r *Router) Queries(pairs ...string) *Route {
-	return r.NewRoute().Queries(pairs...)
-}
-
-// Schemes registers a new route with a matcher for URL schemes.
-// See Route.Schemes().
-func (r *Router) Schemes(schemes ...string) *Route {
-	return r.NewRoute().Schemes(schemes...)
-}
-
-// ----------------------------------------------------------------------------
-// Context
-// ----------------------------------------------------------------------------
-
-// RouteMatch stores information about a matched route.
-type RouteMatch struct {
-	Route   *Route
-	Handler http.Handler
-	Vars    map[string]string
-}
-
-type contextKey int
-
-const (
-	varsKey contextKey = iota
-	routeKey
-)
-
-// Vars returns the route variables for the current request, if any.
-func Vars(r *http.Request) map[string]string {
-	if rv := context.Get(r, varsKey); rv != nil {
-		return rv.(map[string]string)
-	}
-	return nil
-}
-
-// CurrentRoute returns the matched route for the current request, if any.
-func CurrentRoute(r *http.Request) *Route {
-	if rv := context.Get(r, routeKey); rv != nil {
-		return rv.(*Route)
-	}
-	return nil
-}
-
-func setVars(r *http.Request, val interface{}) {
-	context.Set(r, varsKey, val)
-}
-
-func setCurrentRoute(r *http.Request, val interface{}) {
-	context.Set(r, routeKey, val)
-}
-
-// ----------------------------------------------------------------------------
-// Helpers
-// ----------------------------------------------------------------------------
-
-// cleanPath returns the canonical path for p, eliminating . and .. elements.
-// Borrowed from the net/http package.
-func cleanPath(p string) string {
-	if p == "" {
-		return "/"
-	}
-	if p[0] != '/' {
-		p = "/" + p
-	}
-	np := path.Clean(p)
-	// path.Clean removes trailing slash except for root;
-	// put the trailing slash back if necessary.
-	if p[len(p)-1] == '/' && np != "/" {
-		np += "/"
-	}
-	return np
-}
-
-// uniqueVars returns an error if two slices contain duplicated strings.
-func uniqueVars(s1, s2 []string) error {
-	for _, v1 := range s1 {
-		for _, v2 := range s2 {
-			if v1 == v2 {
-				return fmt.Errorf("mux: duplicated route variable %q", v2)
-			}
-		}
-	}
-	return nil
-}
-
-// mapFromPairs converts variadic string parameters to a string map.
-func mapFromPairs(pairs ...string) (map[string]string, error) {
-	length := len(pairs)
-	if length%2 != 0 {
-		return nil, fmt.Errorf(
-			"mux: number of parameters must be multiple of 2, got %v", pairs)
-	}
-	m := make(map[string]string, length/2)
-	for i := 0; i < length; i += 2 {
-		m[pairs[i]] = pairs[i+1]
-	}
-	return m, nil
-}
-
-// matchInArray returns true if the given string value is in the array.
-func matchInArray(arr []string, value string) bool {
-	for _, v := range arr {
-		if v == value {
-			return true
-		}
-	}
-	return false
-}
-
-// matchMap returns true if the given key/value pairs exist in a given map.
-func matchMap(toCheck map[string]string, toMatch map[string][]string,
-	canonicalKey bool) bool {
-	for k, v := range toCheck {
-		// Check if key exists.
-		if canonicalKey {
-			k = http.CanonicalHeaderKey(k)
-		}
-		if values := toMatch[k]; values == nil {
-			return false
-		} else if v != "" {
-			// If value was defined as an empty string we only check that the
-			// key exists. Otherwise we also check for equality.
-			valueExists := false
-			for _, value := range values {
-				if v == value {
-					valueExists = true
-					break
-				}
-			}
-			if !valueExists {
-				return false
-			}
-		}
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/regexp.go b/Godeps/_workspace/src/github.com/gorilla/mux/regexp.go
deleted file mode 100644
index a6305483d5..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/mux/regexp.go
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
-	"bytes"
-	"fmt"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strings"
-)
-
-// newRouteRegexp parses a route template and returns a routeRegexp,
-// used to match a host, a path or a query string.
-//
-// It will extract named variables, assemble a regexp to be matched, create
-// a "reverse" template to build URLs and compile regexps to validate variable
-// values used in URL building.
-//
-// Previously we accepted only Python-like identifiers for variable
-// names ([a-zA-Z_][a-zA-Z0-9_]*), but currently the only restriction is that
-// name and pattern can't be empty, and names can't contain a colon.
-func newRouteRegexp(tpl string, matchHost, matchPrefix, matchQuery, strictSlash bool) (*routeRegexp, error) {
-	// Check if it is well-formed.
-	idxs, errBraces := braceIndices(tpl)
-	if errBraces != nil {
-		return nil, errBraces
-	}
-	// Backup the original.
-	template := tpl
-	// Now let's parse it.
-	defaultPattern := "[^/]+"
-	if matchQuery {
-		defaultPattern = "[^?&]+"
-		matchPrefix = true
-	} else if matchHost {
-		defaultPattern = "[^.]+"
-		matchPrefix = false
-	}
-	// Only match strict slash if not matching
-	if matchPrefix || matchHost || matchQuery {
-		strictSlash = false
-	}
-	// Set a flag for strictSlash.
-	endSlash := false
-	if strictSlash && strings.HasSuffix(tpl, "/") {
-		tpl = tpl[:len(tpl)-1]
-		endSlash = true
-	}
-	varsN := make([]string, len(idxs)/2)
-	varsR := make([]*regexp.Regexp, len(idxs)/2)
-	pattern := bytes.NewBufferString("")
-	if !matchQuery {
-		pattern.WriteByte('^')
-	}
-	reverse := bytes.NewBufferString("")
-	var end int
-	var err error
-	for i := 0; i < len(idxs); i += 2 {
-		// Set all values we are interested in.
-		raw := tpl[end:idxs[i]]
-		end = idxs[i+1]
-		parts := strings.SplitN(tpl[idxs[i]+1:end-1], ":", 2)
-		name := parts[0]
-		patt := defaultPattern
-		if len(parts) == 2 {
-			patt = parts[1]
-		}
-		// Name or pattern can't be empty.
-		if name == "" || patt == "" {
-			return nil, fmt.Errorf("mux: missing name or pattern in %q",
-				tpl[idxs[i]:end])
-		}
-		// Build the regexp pattern.
-		fmt.Fprintf(pattern, "%s(%s)", regexp.QuoteMeta(raw), patt)
-		// Build the reverse template.
-		fmt.Fprintf(reverse, "%s%%s", raw)
-		// Append variable name and compiled pattern.
-		varsN[i/2] = name
-		varsR[i/2], err = regexp.Compile(fmt.Sprintf("^%s$", patt))
-		if err != nil {
-			return nil, err
-		}
-	}
-	// Add the remaining.
-	raw := tpl[end:]
-	pattern.WriteString(regexp.QuoteMeta(raw))
-	if strictSlash {
-		pattern.WriteString("[/]?")
-	}
-	if !matchPrefix {
-		pattern.WriteByte('$')
-	}
-	reverse.WriteString(raw)
-	if endSlash {
-		reverse.WriteByte('/')
-	}
-	// Compile full regexp.
-	reg, errCompile := regexp.Compile(pattern.String())
-	if errCompile != nil {
-		return nil, errCompile
-	}
-	// Done!
-	return &routeRegexp{
-		template:    template,
-		matchHost:   matchHost,
-		matchQuery:  matchQuery,
-		strictSlash: strictSlash,
-		regexp:      reg,
-		reverse:     reverse.String(),
-		varsN:       varsN,
-		varsR:       varsR,
-	}, nil
-}
-
-// routeRegexp stores a regexp to match a host or path and information to
-// collect and validate route variables.
-type routeRegexp struct {
-	// The unmodified template.
-	template string
-	// True for host match, false for path or query string match.
-	matchHost bool
-	// True for query string match, false for path and host match.
-	matchQuery bool
-	// The strictSlash value defined on the route, but disabled if PathPrefix was used.
-	strictSlash bool
-	// Expanded regexp.
-	regexp *regexp.Regexp
-	// Reverse template.
-	reverse string
-	// Variable names.
-	varsN []string
-	// Variable regexps (validators).
-	varsR []*regexp.Regexp
-}
-
-// Match matches the regexp against the URL host or path.
-func (r *routeRegexp) Match(req *http.Request, match *RouteMatch) bool {
-	if !r.matchHost {
-		if r.matchQuery {
-			return r.regexp.MatchString(req.URL.RawQuery)
-		} else {
-			return r.regexp.MatchString(req.URL.Path)
-		}
-	}
-	return r.regexp.MatchString(getHost(req))
-}
-
-// url builds a URL part using the given values.
-func (r *routeRegexp) url(pairs ...string) (string, error) {
-	values, err := mapFromPairs(pairs...)
-	if err != nil {
-		return "", err
-	}
-	urlValues := make([]interface{}, len(r.varsN))
-	for k, v := range r.varsN {
-		value, ok := values[v]
-		if !ok {
-			return "", fmt.Errorf("mux: missing route variable %q", v)
-		}
-		urlValues[k] = value
-	}
-	rv := fmt.Sprintf(r.reverse, urlValues...)
-	if !r.regexp.MatchString(rv) {
-		// The URL is checked against the full regexp, instead of checking
-		// individual variables. This is faster but to provide a good error
-		// message, we check individual regexps if the URL doesn't match.
-		for k, v := range r.varsN {
-			if !r.varsR[k].MatchString(values[v]) {
-				return "", fmt.Errorf(
-					"mux: variable %q doesn't match, expected %q", values[v],
-					r.varsR[k].String())
-			}
-		}
-	}
-	return rv, nil
-}
-
-// braceIndices returns the first level curly brace indices from a string.
-// It returns an error in case of unbalanced braces.
-func braceIndices(s string) ([]int, error) {
-	var level, idx int
-	idxs := make([]int, 0)
-	for i := 0; i < len(s); i++ {
-		switch s[i] {
-		case '{':
-			if level++; level == 1 {
-				idx = i
-			}
-		case '}':
-			if level--; level == 0 {
-				idxs = append(idxs, idx, i+1)
-			} else if level < 0 {
-				return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
-			}
-		}
-	}
-	if level != 0 {
-		return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
-	}
-	return idxs, nil
-}
-
-// ----------------------------------------------------------------------------
-// routeRegexpGroup
-// ----------------------------------------------------------------------------
-
-// routeRegexpGroup groups the route matchers that carry variables.
-type routeRegexpGroup struct {
-	host    *routeRegexp
-	path    *routeRegexp
-	queries []*routeRegexp
-}
-
-// setMatch extracts the variables from the URL once a route matches.
-func (v *routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route) {
-	// Store host variables.
-	if v.host != nil {
-		hostVars := v.host.regexp.FindStringSubmatch(getHost(req))
-		if hostVars != nil {
-			for k, v := range v.host.varsN {
-				m.Vars[v] = hostVars[k+1]
-			}
-		}
-	}
-	// Store path variables.
-	if v.path != nil {
-		pathVars := v.path.regexp.FindStringSubmatch(req.URL.Path)
-		if pathVars != nil {
-			for k, v := range v.path.varsN {
-				m.Vars[v] = pathVars[k+1]
-			}
-			// Check if we should redirect.
-			if v.path.strictSlash {
-				p1 := strings.HasSuffix(req.URL.Path, "/")
-				p2 := strings.HasSuffix(v.path.template, "/")
-				if p1 != p2 {
-					u, _ := url.Parse(req.URL.String())
-					if p1 {
-						u.Path = u.Path[:len(u.Path)-1]
-					} else {
-						u.Path += "/"
-					}
-					m.Handler = http.RedirectHandler(u.String(), 301)
-				}
-			}
-		}
-	}
-	// Store query string variables.
-	rawQuery := req.URL.RawQuery
-	for _, q := range v.queries {
-		queryVars := q.regexp.FindStringSubmatch(rawQuery)
-		if queryVars != nil {
-			for k, v := range q.varsN {
-				m.Vars[v] = queryVars[k+1]
-			}
-		}
-	}
-}
-
-// getHost tries its best to return the request host.
-func getHost(r *http.Request) string {
-	if r.URL.IsAbs() {
-		return r.URL.Host
-	}
-	host := r.Host
-	// Slice off any port information.
-	if i := strings.Index(host, ":"); i != -1 {
-		host = host[:i]
-	}
-	return host
-
-}
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/route.go b/Godeps/_workspace/src/github.com/gorilla/mux/route.go
deleted file mode 100644
index c310e66bc7..0000000000
--- a/Godeps/_workspace/src/github.com/gorilla/mux/route.go
+++ /dev/null
@@ -1,524 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strings"
-)
-
-// Route stores information to match a request and build URLs.
-type Route struct {
-	// Parent where the route was registered (a Router).
-	parent parentRoute
-	// Request handler for the route.
-	handler http.Handler
-	// List of matchers.
-	matchers []matcher
-	// Manager for the variables from host and path.
-	regexp *routeRegexpGroup
-	// If true, when the path pattern is "/path/", accessing "/path" will
-	// redirect to the former and vice versa.
-	strictSlash bool
-	// If true, this route never matches: it is only used to build URLs.
-	buildOnly bool
-	// The name used to build URLs.
-	name string
-	// Error resulted from building a route.
-	err error
-}
-
-// Match matches the route against the request.
-func (r *Route) Match(req *http.Request, match *RouteMatch) bool {
-	if r.buildOnly || r.err != nil {
-		return false
-	}
-	// Match everything.
-	for _, m := range r.matchers {
-		if matched := m.Match(req, match); !matched {
-			return false
-		}
-	}
-	// Yay, we have a match. Let's collect some info about it.
-	if match.Route == nil {
-		match.Route = r
-	}
-	if match.Handler == nil {
-		match.Handler = r.handler
-	}
-	if match.Vars == nil {
-		match.Vars = make(map[string]string)
-	}
-	// Set variables.
-	if r.regexp != nil {
-		r.regexp.setMatch(req, match, r)
-	}
-	return true
-}
-
-// ----------------------------------------------------------------------------
-// Route attributes
-// ----------------------------------------------------------------------------
-
-// GetError returns an error resulted from building the route, if any.
-func (r *Route) GetError() error {
-	return r.err
-}
-
-// BuildOnly sets the route to never match: it is only used to build URLs.
-func (r *Route) BuildOnly() *Route {
-	r.buildOnly = true
-	return r
-}
-
-// Handler --------------------------------------------------------------------
-
-// Handler sets a handler for the route.
-func (r *Route) Handler(handler http.Handler) *Route {
-	if r.err == nil {
-		r.handler = handler
-	}
-	return r
-}
-
-// HandlerFunc sets a handler function for the route.
-func (r *Route) HandlerFunc(f func(http.ResponseWriter, *http.Request)) *Route {
-	return r.Handler(http.HandlerFunc(f))
-}
-
-// GetHandler returns the handler for the route, if any.
-func (r *Route) GetHandler() http.Handler {
-	return r.handler
-}
-
-// Name -----------------------------------------------------------------------
-
-// Name sets the name for the route, used to build URLs.
-// If the name was registered already it will be overwritten.
-func (r *Route) Name(name string) *Route {
-	if r.name != "" {
-		r.err = fmt.Errorf("mux: route already has name %q, can't set %q",
-			r.name, name)
-	}
-	if r.err == nil {
-		r.name = name
-		r.getNamedRoutes()[name] = r
-	}
-	return r
-}
-
-// GetName returns the name for the route, if any.
-func (r *Route) GetName() string {
-	return r.name
-}
-
-// ----------------------------------------------------------------------------
-// Matchers
-// ----------------------------------------------------------------------------
-
-// matcher types try to match a request.
-type matcher interface {
-	Match(*http.Request, *RouteMatch) bool
-}
-
-// addMatcher adds a matcher to the route.
-func (r *Route) addMatcher(m matcher) *Route {
-	if r.err == nil {
-		r.matchers = append(r.matchers, m)
-	}
-	return r
-}
-
-// addRegexpMatcher adds a host or path matcher and builder to a route.
-func (r *Route) addRegexpMatcher(tpl string, matchHost, matchPrefix, matchQuery bool) error {
-	if r.err != nil {
-		return r.err
-	}
-	r.regexp = r.getRegexpGroup()
-	if !matchHost && !matchQuery {
-		if len(tpl) == 0 || tpl[0] != '/' {
-			return fmt.Errorf("mux: path must start with a slash, got %q", tpl)
-		}
-		if r.regexp.path != nil {
-			tpl = strings.TrimRight(r.regexp.path.template, "/") + tpl
-		}
-	}
-	rr, err := newRouteRegexp(tpl, matchHost, matchPrefix, matchQuery, r.strictSlash)
-	if err != nil {
-		return err
-	}
-	for _, q := range r.regexp.queries {
-		if err = uniqueVars(rr.varsN, q.varsN); err != nil {
-			return err
-		}
-	}
-	if matchHost {
-		if r.regexp.path != nil {
-			if err = uniqueVars(rr.varsN, r.regexp.path.varsN); err != nil {
-				return err
-			}
-		}
-		r.regexp.host = rr
-	} else {
-		if r.regexp.host != nil {
-			if err = uniqueVars(rr.varsN, r.regexp.host.varsN); err != nil {
-				return err
-			}
-		}
-		if matchQuery {
-			r.regexp.queries = append(r.regexp.queries, rr)
-		} else {
-			r.regexp.path = rr
-		}
-	}
-	r.addMatcher(rr)
-	return nil
-}
-
-// Headers --------------------------------------------------------------------
-
-// headerMatcher matches the request against header values.
-type headerMatcher map[string]string
-
-func (m headerMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchMap(m, r.Header, true)
-}
-
-// Headers adds a matcher for request header values.
-// It accepts a sequence of key/value pairs to be matched. For example:
-//
-//     r := mux.NewRouter()
-//     r.Headers("Content-Type", "application/json",
-//               "X-Requested-With", "XMLHttpRequest")
-//
-// The above route will only match if both request header values match.
-//
-// It the value is an empty string, it will match any value if the key is set.
-func (r *Route) Headers(pairs ...string) *Route {
-	if r.err == nil {
-		var headers map[string]string
-		headers, r.err = mapFromPairs(pairs...)
-		return r.addMatcher(headerMatcher(headers))
-	}
-	return r
-}
-
-// Host -----------------------------------------------------------------------
-
-// Host adds a matcher for the URL host.
-// It accepts a template with zero or more URL variables enclosed by {}.
-// Variables can define an optional regexp pattern to me matched:
-//
-// - {name} matches anything until the next dot.
-//
-// - {name:pattern} matches the given regexp pattern.
-//
-// For example:
-//
-//     r := mux.NewRouter()
-//     r.Host("www.domain.com")
-//     r.Host("{subdomain}.domain.com")
-//     r.Host("{subdomain:[a-z]+}.domain.com")
-//
-// Variable names must be unique in a given route. They can be retrieved
-// calling mux.Vars(request).
-func (r *Route) Host(tpl string) *Route {
-	r.err = r.addRegexpMatcher(tpl, true, false, false)
-	return r
-}
-
-// MatcherFunc ----------------------------------------------------------------
-
-// MatcherFunc is the function signature used by custom matchers.
-type MatcherFunc func(*http.Request, *RouteMatch) bool
-
-func (m MatcherFunc) Match(r *http.Request, match *RouteMatch) bool {
-	return m(r, match)
-}
-
-// MatcherFunc adds a custom function to be used as request matcher.
-func (r *Route) MatcherFunc(f MatcherFunc) *Route {
-	return r.addMatcher(f)
-}
-
-// Methods --------------------------------------------------------------------
-
-// methodMatcher matches the request against HTTP methods.
-type methodMatcher []string
-
-func (m methodMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchInArray(m, r.Method)
-}
-
-// Methods adds a matcher for HTTP methods.
-// It accepts a sequence of one or more methods to be matched, e.g.:
-// "GET", "POST", "PUT".
-func (r *Route) Methods(methods ...string) *Route {
-	for k, v := range methods {
-		methods[k] = strings.ToUpper(v)
-	}
-	return r.addMatcher(methodMatcher(methods))
-}
-
-// Path -----------------------------------------------------------------------
-
-// Path adds a matcher for the URL path.
-// It accepts a template with zero or more URL variables enclosed by {}. The
-// template must start with a "/".
-// Variables can define an optional regexp pattern to me matched:
-//
-// - {name} matches anything until the next slash.
-//
-// - {name:pattern} matches the given regexp pattern.
-//
-// For example:
-//
-//     r := mux.NewRouter()
-//     r.Path("/products/").Handler(ProductsHandler)
-//     r.Path("/products/{key}").Handler(ProductsHandler)
-//     r.Path("/articles/{category}/{id:[0-9]+}").
-//       Handler(ArticleHandler)
-//
-// Variable names must be unique in a given route. They can be retrieved
-// calling mux.Vars(request).
-func (r *Route) Path(tpl string) *Route {
-	r.err = r.addRegexpMatcher(tpl, false, false, false)
-	return r
-}
-
-// PathPrefix -----------------------------------------------------------------
-
-// PathPrefix adds a matcher for the URL path prefix. This matches if the given
-// template is a prefix of the full URL path. See Route.Path() for details on
-// the tpl argument.
-//
-// Note that it does not treat slashes specially ("/foobar/" will be matched by
-// the prefix "/foo") so you may want to use a trailing slash here.
-//
-// Also note that the setting of Router.StrictSlash() has no effect on routes
-// with a PathPrefix matcher.
-func (r *Route) PathPrefix(tpl string) *Route {
-	r.err = r.addRegexpMatcher(tpl, false, true, false)
-	return r
-}
-
-// Query ----------------------------------------------------------------------
-
-// Queries adds a matcher for URL query values.
-// It accepts a sequence of key/value pairs. Values may define variables.
-// For example:
-//
-//     r := mux.NewRouter()
-//     r.Queries("foo", "bar", "id", "{id:[0-9]+}")
-//
-// The above route will only match if the URL contains the defined queries
-// values, e.g.: ?foo=bar&id=42.
-//
-// It the value is an empty string, it will match any value if the key is set.
-//
-// Variables can define an optional regexp pattern to me matched:
-//
-// - {name} matches anything until the next slash.
-//
-// - {name:pattern} matches the given regexp pattern.
-func (r *Route) Queries(pairs ...string) *Route {
-	length := len(pairs)
-	if length%2 != 0 {
-		r.err = fmt.Errorf(
-			"mux: number of parameters must be multiple of 2, got %v", pairs)
-		return nil
-	}
-	for i := 0; i < length; i += 2 {
-		if r.err = r.addRegexpMatcher(pairs[i]+"="+pairs[i+1], false, true, true); r.err != nil {
-			return r
-		}
-	}
-
-	return r
-}
-
-// Schemes --------------------------------------------------------------------
-
-// schemeMatcher matches the request against URL schemes.
-type schemeMatcher []string
-
-func (m schemeMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchInArray(m, r.URL.Scheme)
-}
-
-// Schemes adds a matcher for URL schemes.
-// It accepts a sequence of schemes to be matched, e.g.: "http", "https".
-func (r *Route) Schemes(schemes ...string) *Route {
-	for k, v := range schemes {
-		schemes[k] = strings.ToLower(v)
-	}
-	return r.addMatcher(schemeMatcher(schemes))
-}
-
-// Subrouter ------------------------------------------------------------------
-
-// Subrouter creates a subrouter for the route.
-//
-// It will test the inner routes only if the parent route matched. For example:
-//
-//     r := mux.NewRouter()
-//     s := r.Host("www.domain.com").Subrouter()
-//     s.HandleFunc("/products/", ProductsHandler)
-//     s.HandleFunc("/products/{key}", ProductHandler)
-//     s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-//
-// Here, the routes registered in the subrouter won't be tested if the host
-// doesn't match.
-func (r *Route) Subrouter() *Router {
-	router := &Router{parent: r, strictSlash: r.strictSlash}
-	r.addMatcher(router)
-	return router
-}
-
-// ----------------------------------------------------------------------------
-// URL building
-// ----------------------------------------------------------------------------
-
-// URL builds a URL for the route.
-//
-// It accepts a sequence of key/value pairs for the route variables. For
-// example, given this route:
-//
-//     r := mux.NewRouter()
-//     r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-//       Name("article")
-//
-// ...a URL for it can be built using:
-//
-//     url, err := r.Get("article").URL("category", "technology", "id", "42")
-//
-// ...which will return an url.URL with the following path:
-//
-//     "/articles/technology/42"
-//
-// This also works for host variables:
-//
-//     r := mux.NewRouter()
-//     r.Host("{subdomain}.domain.com").
-//       HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-//       Name("article")
-//
-//     // url.String() will be "http://news.domain.com/articles/technology/42"
-//     url, err := r.Get("article").URL("subdomain", "news",
-//                                      "category", "technology",
-//                                      "id", "42")
-//
-// All variables defined in the route are required, and their values must
-// conform to the corresponding patterns.
-func (r *Route) URL(pairs ...string) (*url.URL, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	if r.regexp == nil {
-		return nil, errors.New("mux: route doesn't have a host or path")
-	}
-	var scheme, host, path string
-	var err error
-	if r.regexp.host != nil {
-		// Set a default scheme.
-		scheme = "http"
-		if host, err = r.regexp.host.url(pairs...); err != nil {
-			return nil, err
-		}
-	}
-	if r.regexp.path != nil {
-		if path, err = r.regexp.path.url(pairs...); err != nil {
-			return nil, err
-		}
-	}
-	return &url.URL{
-		Scheme: scheme,
-		Host:   host,
-		Path:   path,
-	}, nil
-}
-
-// URLHost builds the host part of the URL for a route. See Route.URL().
-//
-// The route must have a host defined.
-func (r *Route) URLHost(pairs ...string) (*url.URL, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	if r.regexp == nil || r.regexp.host == nil {
-		return nil, errors.New("mux: route doesn't have a host")
-	}
-	host, err := r.regexp.host.url(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	return &url.URL{
-		Scheme: "http",
-		Host:   host,
-	}, nil
-}
-
-// URLPath builds the path part of the URL for a route. See Route.URL().
-//
-// The route must have a path defined.
-func (r *Route) URLPath(pairs ...string) (*url.URL, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	if r.regexp == nil || r.regexp.path == nil {
-		return nil, errors.New("mux: route doesn't have a path")
-	}
-	path, err := r.regexp.path.url(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	return &url.URL{
-		Path: path,
-	}, nil
-}
-
-// ----------------------------------------------------------------------------
-// parentRoute
-// ----------------------------------------------------------------------------
-
-// parentRoute allows routes to know about parent host and path definitions.
-type parentRoute interface {
-	getNamedRoutes() map[string]*Route
-	getRegexpGroup() *routeRegexpGroup
-}
-
-// getNamedRoutes returns the map where named routes are registered.
-func (r *Route) getNamedRoutes() map[string]*Route {
-	if r.parent == nil {
-		// During tests router is not always set.
-		r.parent = NewRouter()
-	}
-	return r.parent.getNamedRoutes()
-}
-
-// getRegexpGroup returns regexp definitions from this route.
-func (r *Route) getRegexpGroup() *routeRegexpGroup {
-	if r.regexp == nil {
-		if r.parent == nil {
-			// During tests router is not always set.
-			r.parent = NewRouter()
-		}
-		regexp := r.parent.getRegexpGroup()
-		if regexp == nil {
-			r.regexp = new(routeRegexpGroup)
-		} else {
-			// Copy.
-			r.regexp = &routeRegexpGroup{
-				host:    regexp.host,
-				path:    regexp.path,
-				queries: regexp.queries,
-			}
-		}
-	}
-	return r.regexp
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/errwrap/LICENSE b/Godeps/_workspace/src/github.com/hashicorp/errwrap/LICENSE
deleted file mode 100644
index c33dcc7c92..0000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/errwrap/LICENSE
+++ /dev/null
@@ -1,354 +0,0 @@
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-
-     means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of version
-        1.1 or earlier of the License, but not also under the terms of a
-        Secondary License.
-
-1.6. “Executable Form”
-
-     means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-
-     means a work that combines Covered Software with other material, in a separate
-     file or files, that is not Covered Software.
-
-1.8. “License”
-
-     means this document.
-
-1.9. “Licensable”
-
-     means having the right to grant, to the maximum extent possible, whether at the
-     time of the initial grant or subsequently, any and all of the rights conveyed by
-     this License.
-
-1.10. “Modifications”
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to, deletion
-        from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-
-      means any patent claim(s), including without limitation, method, process,
-      and apparatus claims, in any patent Licensable by such Contributor that
-      would be infringed, but for the grant of the License, by the making,
-      using, selling, offering for sale, having made, import, or transfer of
-      either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-
-      means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, “You” includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, “control” means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or as
-        part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its Contributions
-        or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution become
-     effective for each Contribution on the date the Contributor first distributes
-     such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under this
-     License. No additional rights or licenses will be implied from the distribution
-     or licensing of Covered Software under this License. Notwithstanding Section
-     2.1(b) above, no patent license is granted by a Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party’s
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of its
-        Contributions.
-
-     This License does not grant any rights in the trademarks, service marks, or
-     logos of any Contributor (except as may be necessary to comply with the
-     notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this License
-     (see Section 10.2) or under the terms of a Secondary License (if permitted
-     under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its Contributions
-     are its original creation(s) or it has sufficient rights to grant the
-     rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under applicable
-     copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under the
-     terms of this License. You must inform recipients that the Source Code Form
-     of the Covered Software is governed by the terms of this License, and how
-     they can obtain a copy of this License. You may not attempt to alter or
-     restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this License,
-        or sublicense it under different terms, provided that the license for
-        the Executable Form does not attempt to limit or alter the recipients’
-        rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for the
-     Covered Software. If the Larger Work is a combination of Covered Software
-     with a work governed by one or more Secondary Licenses, and the Covered
-     Software is not Incompatible With Secondary Licenses, this License permits
-     You to additionally distribute such Covered Software under the terms of
-     such Secondary License(s), so that the recipient of the Larger Work may, at
-     their option, further distribute the Covered Software under the terms of
-     either this License or such Secondary License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices (including
-     copyright notices, patent notices, disclaimers of warranty, or limitations
-     of liability) contained within the Source Code Form of the Covered
-     Software, except that You may alter any license notices to the extent
-     required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on behalf
-     of any Contributor. You must make it absolutely clear that any such
-     warranty, support, indemnity, or liability obligation is offered by You
-     alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute, judicial
-   order, or regulation then You must: (a) comply with the terms of this License
-   to the maximum extent possible; and (b) describe the limitations and the code
-   they affect. Such description must be placed in a text file included with all
-   distributions of the Covered Software under this License. Except to the
-   extent prohibited by statute or regulation, such description must be
-   sufficiently detailed for a recipient of ordinary skill to be able to
-   understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
-     if such Contributor fails to notify You of the non-compliance by some
-     reasonable means prior to 60 days after You have come back into compliance.
-     Moreover, Your grants from a particular Contributor are reinstated on an
-     ongoing basis if such Contributor notifies You of the non-compliance by
-     some reasonable means, this is the first time You have received notice of
-     non-compliance with this License from such Contributor, and You become
-     compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions, counter-claims,
-     and cross-claims) alleging that a Contributor Version directly or
-     indirectly infringes any patent, then the rights granted to You by any and
-     all Contributors for the Covered Software under Section 2.1 of this License
-     shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an “as is” basis, without
-   warranty of any kind, either expressed, implied, or statutory, including,
-   without limitation, warranties that the Covered Software is free of defects,
-   merchantable, fit for a particular purpose or non-infringing. The entire
-   risk as to the quality and performance of the Covered Software is with You.
-   Should any Covered Software prove defective in any respect, You (not any
-   Contributor) assume the cost of any necessary servicing, repair, or
-   correction. This disclaimer of warranty constitutes an essential part of this
-   License. No use of  any Covered Software is authorized under this License
-   except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from such
-   party’s negligence to the extent applicable law prohibits such limitation.
-   Some jurisdictions do not allow the exclusion or limitation of incidental or
-   consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts of
-   a jurisdiction where the defendant maintains its principal place of business
-   and such litigation shall be governed by laws of that jurisdiction, without
-   reference to its conflict-of-law provisions. Nothing in this Section shall
-   prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject matter
-   hereof. If any provision of this License is held to be unenforceable, such
-   provision shall be reformed only to the extent necessary to make it
-   enforceable. Any law or regulation which provides that the language of a
-   contract shall be construed against the drafter shall not be used to construe
-   this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version of
-      the License under which You originally received the Covered Software, or
-      under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a modified
-      version of this License if you rename the license and remove any
-      references to the name of the license steward (except to note that such
-      modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-      If You choose to distribute Source Code Form that is Incompatible With
-      Secondary Licenses under the terms of this version of the License, the
-      notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then
-You may include the notice in a location (such as a LICENSE file in a relevant
-directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-
-      This Source Code Form is “Incompatible
-      With Secondary Licenses”, as defined by
-      the Mozilla Public License, v. 2.0.
-
diff --git a/Godeps/_workspace/src/github.com/hashicorp/errwrap/README.md b/Godeps/_workspace/src/github.com/hashicorp/errwrap/README.md
deleted file mode 100644
index 1c95f59782..0000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/errwrap/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# errwrap
-
-`errwrap` is a package for Go that formalizes the pattern of wrapping errors
-and checking if an error contains another error.
-
-There is a common pattern in Go of taking a returned `error` value and
-then wrapping it (such as with `fmt.Errorf`) before returning it. The problem
-with this pattern is that you completely lose the original `error` structure.
-
-Arguably the _correct_ approach is that you should make a custom structure
-implementing the `error` interface, and have the original error as a field
-on that structure, such [as this example](http://golang.org/pkg/os/#PathError).
-This is a good approach, but you have to know the entire chain of possible
-rewrapping that happens, when you might just care about one.
-
-`errwrap` formalizes this pattern (it doesn't matter what approach you use
-above) by giving a single interface for wrapping errors, checking if a specific
-error is wrapped, and extracting that error.
-
-## Installation and Docs
-
-Install using `go get github.com/hashicorp/errwrap`.
-
-Full documentation is available at
-http://godoc.org/github.com/hashicorp/errwrap
-
-## Usage
-
-#### Basic Usage
-
-Below is a very basic example of its usage:
-
-```go
-// A function that always returns an error, but wraps it, like a real
-// function might.
-func tryOpen() error {
-	_, err := os.Open("/i/dont/exist")
-	if err != nil {
-		return errwrap.Wrapf("Doesn't exist: {{err}}", err)
-	}
-
-	return nil
-}
-
-func main() {
-	err := tryOpen()
-
-	// We can use the Contains helpers to check if an error contains
-	// another error. It is safe to do this with a nil error, or with
-	// an error that doesn't even use the errwrap package.
-	if errwrap.Contains(err, ErrNotExist) {
-		// Do something
-	}
-	if errwrap.ContainsType(err, new(os.PathError)) {
-		// Do something
-	}
-
-	// Or we can use the associated `Get` functions to just extract
-	// a specific error. This would return nil if that specific error doesn't
-	// exist.
-	perr := errwrap.GetType(err, new(os.PathError))
-}
-```
-
-#### Custom Types
-
-If you're already making custom types that properly wrap errors, then
-you can get all the functionality of `errwraps.Contains` and such by
-implementing the `Wrapper` interface with just one function. Example:
-
-```go
-type AppError {
-  Code ErrorCode
-  Err  error
-}
-
-func (e *AppError) WrappedErrors() []error {
-  return []error{e.Err}
-}
-```
-
-Now this works:
-
-```go
-err := &AppError{Err: fmt.Errorf("an error")}
-if errwrap.ContainsType(err, fmt.Errorf("")) {
-	// This will work!
-}
-```
diff --git a/Godeps/_workspace/src/github.com/hashicorp/errwrap/errwrap.go b/Godeps/_workspace/src/github.com/hashicorp/errwrap/errwrap.go
deleted file mode 100644
index a733bef18c..0000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/errwrap/errwrap.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Package errwrap implements methods to formalize error wrapping in Go.
-//
-// All of the top-level functions that take an `error` are built to be able
-// to take any error, not just wrapped errors. This allows you to use errwrap
-// without having to type-check and type-cast everywhere.
-package errwrap
-
-import (
-	"errors"
-	"reflect"
-	"strings"
-)
-
-// WalkFunc is the callback called for Walk.
-type WalkFunc func(error)
-
-// Wrapper is an interface that can be implemented by custom types to
-// have all the Contains, Get, etc. functions in errwrap work.
-//
-// When Walk reaches a Wrapper, it will call the callback for every
-// wrapped error in addition to the wrapper itself. Since all the top-level
-// functions in errwrap use Walk, this means that all those functions work
-// with your custom type.
-type Wrapper interface {
-	WrappedErrors() []error
-}
-
-// Wrap defines that outer wraps inner, returning an error type that
-// can be cleanly used with the other methods in this package, such as
-// Contains, GetAll, etc.
-//
-// This function won't modify the error message at all (the outer message
-// will be used).
-func Wrap(outer, inner error) error {
-	return &wrappedError{
-		Outer: outer,
-		Inner: inner,
-	}
-}
-
-// Wrapf wraps an error with a formatting message. This is similar to using
-// `fmt.Errorf` to wrap an error. If you're using `fmt.Errorf` to wrap
-// errors, you should replace it with this.
-//
-// format is the format of the error message. The string '{{err}}' will
-// be replaced with the original error message.
-func Wrapf(format string, err error) error {
-	outerMsg := "<nil>"
-	if err != nil {
-		outerMsg = err.Error()
-	}
-
-	outer := errors.New(strings.Replace(
-		format, "{{err}}", outerMsg, -1))
-
-	return Wrap(outer, err)
-}
-
-// Contains checks if the given error contains an error with the
-// message msg. If err is not a wrapped error, this will always return
-// false unless the error itself happens to match this msg.
-func Contains(err error, msg string) bool {
-	return len(GetAll(err, msg)) > 0
-}
-
-// ContainsType checks if the given error contains an error with
-// the same concrete type as v. If err is not a wrapped error, this will
-// check the err itself.
-func ContainsType(err error, v interface{}) bool {
-	return len(GetAllType(err, v)) > 0
-}
-
-// Get is the same as GetAll but returns the deepest matching error.
-func Get(err error, msg string) error {
-	es := GetAll(err, msg)
-	if len(es) > 0 {
-		return es[len(es)-1]
-	}
-
-	return nil
-}
-
-// GetType is the same as GetAllType but returns the deepest matching error.
-func GetType(err error, v interface{}) error {
-	es := GetAllType(err, v)
-	if len(es) > 0 {
-		return es[len(es)-1]
-	}
-
-	return nil
-}
-
-// GetAll gets all the errors that might be wrapped in err with the
-// given message. The order of the errors is such that the outermost
-// matching error (the most recent wrap) is index zero, and so on.
-func GetAll(err error, msg string) []error {
-	var result []error
-
-	Walk(err, func(err error) {
-		if err.Error() == msg {
-			result = append(result, err)
-		}
-	})
-
-	return result
-}
-
-// GetAllType gets all the errors that are the same type as v.
-//
-// The order of the return value is the same as described in GetAll.
-func GetAllType(err error, v interface{}) []error {
-	var result []error
-
-	var search string
-	if v != nil {
-		search = reflect.TypeOf(v).String()
-	}
-	Walk(err, func(err error) {
-		var needle string
-		if err != nil {
-			needle = reflect.TypeOf(err).String()
-		}
-
-		if needle == search {
-			result = append(result, err)
-		}
-	})
-
-	return result
-}
-
-// Walk walks all the wrapped errors in err and calls the callback. If
-// err isn't a wrapped error, this will be called once for err. If err
-// is a wrapped error, the callback will be called for both the wrapper
-// that implements error as well as the wrapped error itself.
-func Walk(err error, cb WalkFunc) {
-	if err == nil {
-		return
-	}
-
-	switch e := err.(type) {
-	case *wrappedError:
-		cb(e.Outer)
-		Walk(e.Inner, cb)
-	case Wrapper:
-		cb(err)
-
-		for _, err := range e.WrappedErrors() {
-			Walk(err, cb)
-		}
-	default:
-		cb(err)
-	}
-}
-
-// wrappedError is an implementation of error that has both the
-// outer and inner errors.
-type wrappedError struct {
-	Outer error
-	Inner error
-}
-
-func (w *wrappedError) Error() string {
-	return w.Outer.Error()
-}
-
-func (w *wrappedError) WrappedErrors() []error {
-	return []error{w.Outer, w.Inner}
-}
diff --git a/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/LICENSE b/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/LICENSE
deleted file mode 100644
index efcb2414a3..0000000000
--- a/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/LICENSE
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright (c) 2014, Eric Urban
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/README.md b/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/README.md
deleted file mode 100644
index bf1919325f..0000000000
--- a/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-stoppableListener
-=================
-
-An example of a stoppable TCP listener in Go. This library wraps an existing TCP connection object. A goroutine calling `Accept()`
-is interrupted with `StoppedError` whenever the listener is stopped by a call to `Stop()`. Usage is demonstrated below, and in `example/example.go`.
-
-
-```
-	originalListener, err := net.Listen("tcp", ":8080")
-	if err != nil {
-		panic(err)
-	}
-
-	sl, err := stoppableListener.New(originalListener)
-	if err != nil {
-		panic(err)
-	}
-```
diff --git a/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/example/example.go b/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/example/example.go
deleted file mode 100644
index 1252fb3c04..0000000000
--- a/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/example/example.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/hydrogen18/stoppableListener"
-	"net"
-	"net/http"
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-)
-
-func helloHttp(rw http.ResponseWriter, req *http.Request) {
-	rw.WriteHeader(http.StatusOK)
-	fmt.Fprintf(rw, "Hello HTTP!\n")
-}
-
-func main() {
-	originalListener, err := net.Listen("tcp", ":8080")
-	if err != nil {
-		panic(err)
-	}
-
-	sl, err := stoppableListener.New(originalListener)
-	if err != nil {
-		panic(err)
-	}
-
-	http.HandleFunc("/", helloHttp)
-	server := http.Server{}
-
-	stop := make(chan os.Signal)
-	signal.Notify(stop, syscall.SIGINT)
-	var wg sync.WaitGroup
-	go func() {
-		wg.Add(1)
-		defer wg.Done()
-		server.Serve(sl)
-	}()
-
-	fmt.Printf("Serving HTTP\n")
-	select {
-	case signal := <-stop:
-		fmt.Printf("Got signal:%v\n", signal)
-	}
-	fmt.Printf("Stopping listener\n")
-	sl.Stop()
-	fmt.Printf("Waiting on server\n")
-	wg.Wait()
-
-}
diff --git a/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/listener.go b/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/listener.go
deleted file mode 100644
index 69a9f33cc3..0000000000
--- a/Godeps/_workspace/src/github.com/hydrogen18/stoppableListener/listener.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package stoppableListener
-
-import (
-	"errors"
-	"net"
-	"time"
-)
-
-type StoppableListener struct {
-	*net.TCPListener          //Wrapped listener
-	stop             chan int //Channel used only to indicate listener should shutdown
-}
-
-func New(l net.Listener) (*StoppableListener, error) {
-	tcpL, ok := l.(*net.TCPListener)
-
-	if !ok {
-		return nil, errors.New("Cannot wrap listener")
-	}
-
-	retval := &StoppableListener{}
-	retval.TCPListener = tcpL
-	retval.stop = make(chan int)
-
-	return retval, nil
-}
-
-var StoppedError = errors.New("Listener stopped")
-
-func (sl *StoppableListener) Accept() (net.Conn, error) {
-
-	for {
-		//Wait up to one second for a new connection
-		sl.SetDeadline(time.Now().Add(time.Second))
-
-		newConn, err := sl.TCPListener.Accept()
-
-		//Check for the channel being closed
-		select {
-		case <-sl.stop:
-			return nil, StoppedError
-		default:
-			//If the channel is still open, continue as normal
-		}
-
-		if err != nil {
-			netErr, ok := err.(net.Error)
-
-			//If this is a timeout, then continue to wait for
-			//new connections
-			if ok && netErr.Timeout() && netErr.Temporary() {
-				continue
-			}
-		}
-
-		return newConn, err
-	}
-}
-
-func (sl *StoppableListener) Stop() {
-	close(sl.stop)
-}
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE b/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE
deleted file mode 100644
index 5f0d1fb6a7..0000000000
--- a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2014 Alan Shreve
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/README.md b/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/README.md
deleted file mode 100644
index 7a950d1774..0000000000
--- a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# mousetrap
-
-mousetrap is a tiny library that answers a single question.
-
-On a Windows machine, was the process invoked by someone double clicking on
-the executable file while browsing in explorer?
-
-### Motivation
-
-Windows developers unfamiliar with command line tools will often "double-click"
-the executable for a tool. Because most CLI tools print the help and then exit
-when invoked without arguments, this is often very frustrating for those users.
-
-mousetrap provides a way to detect these invocations so that you can provide
-more helpful behavior and instructions on how to run the CLI tool. To see what
-this looks like, both from an organizational and a technical perspective, see
-https://inconshreveable.com/09-09-2014/sweat-the-small-stuff/
-
-### The interface
-
-The library exposes a single interface:
-
-    func StartedByExplorer() (bool)
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_others.go b/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_others.go
deleted file mode 100644
index 9d2d8a4bab..0000000000
--- a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_others.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build !windows
-
-package mousetrap
-
-// StartedByExplorer returns true if the program was invoked by the user
-// double-clicking on the executable from explorer.exe
-//
-// It is conservative and returns false if any of the internal calls fail.
-// It does not guarantee that the program was run from a terminal. It only can tell you
-// whether it was launched from explorer.exe
-//
-// On non-Windows platforms, it always returns false.
-func StartedByExplorer() bool {
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows.go b/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows.go
deleted file mode 100644
index 336142a5e3..0000000000
--- a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// +build windows
-// +build !go1.4
-
-package mousetrap
-
-import (
-	"fmt"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-const (
-	// defined by the Win32 API
-	th32cs_snapprocess uintptr = 0x2
-)
-
-var (
-	kernel                   = syscall.MustLoadDLL("kernel32.dll")
-	CreateToolhelp32Snapshot = kernel.MustFindProc("CreateToolhelp32Snapshot")
-	Process32First           = kernel.MustFindProc("Process32FirstW")
-	Process32Next            = kernel.MustFindProc("Process32NextW")
-)
-
-// ProcessEntry32 structure defined by the Win32 API
-type processEntry32 struct {
-	dwSize              uint32
-	cntUsage            uint32
-	th32ProcessID       uint32
-	th32DefaultHeapID   int
-	th32ModuleID        uint32
-	cntThreads          uint32
-	th32ParentProcessID uint32
-	pcPriClassBase      int32
-	dwFlags             uint32
-	szExeFile           [syscall.MAX_PATH]uint16
-}
-
-func getProcessEntry(pid int) (pe *processEntry32, err error) {
-	snapshot, _, e1 := CreateToolhelp32Snapshot.Call(th32cs_snapprocess, uintptr(0))
-	if snapshot == uintptr(syscall.InvalidHandle) {
-		err = fmt.Errorf("CreateToolhelp32Snapshot: %v", e1)
-		return
-	}
-	defer syscall.CloseHandle(syscall.Handle(snapshot))
-
-	var processEntry processEntry32
-	processEntry.dwSize = uint32(unsafe.Sizeof(processEntry))
-	ok, _, e1 := Process32First.Call(snapshot, uintptr(unsafe.Pointer(&processEntry)))
-	if ok == 0 {
-		err = fmt.Errorf("Process32First: %v", e1)
-		return
-	}
-
-	for {
-		if processEntry.th32ProcessID == uint32(pid) {
-			pe = &processEntry
-			return
-		}
-
-		ok, _, e1 = Process32Next.Call(snapshot, uintptr(unsafe.Pointer(&processEntry)))
-		if ok == 0 {
-			err = fmt.Errorf("Process32Next: %v", e1)
-			return
-		}
-	}
-}
-
-func getppid() (pid int, err error) {
-	pe, err := getProcessEntry(os.Getpid())
-	if err != nil {
-		return
-	}
-
-	pid = int(pe.th32ParentProcessID)
-	return
-}
-
-// StartedByExplorer returns true if the program was invoked by the user double-clicking
-// on the executable from explorer.exe
-//
-// It is conservative and returns false if any of the internal calls fail.
-// It does not guarantee that the program was run from a terminal. It only can tell you
-// whether it was launched from explorer.exe
-func StartedByExplorer() bool {
-	ppid, err := getppid()
-	if err != nil {
-		return false
-	}
-
-	pe, err := getProcessEntry(ppid)
-	if err != nil {
-		return false
-	}
-
-	name := syscall.UTF16ToString(pe.szExeFile[:])
-	return name == "explorer.exe"
-}
diff --git a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows_1.4.go b/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows_1.4.go
deleted file mode 100644
index 9a28e57c3c..0000000000
--- a/Godeps/_workspace/src/github.com/inconshreveable/mousetrap/trap_windows_1.4.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// +build windows
-// +build go1.4
-
-package mousetrap
-
-import (
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-func getProcessEntry(pid int) (*syscall.ProcessEntry32, error) {
-	snapshot, err := syscall.CreateToolhelp32Snapshot(syscall.TH32CS_SNAPPROCESS, 0)
-	if err != nil {
-		return nil, err
-	}
-	defer syscall.CloseHandle(snapshot)
-	var procEntry syscall.ProcessEntry32
-	procEntry.Size = uint32(unsafe.Sizeof(procEntry))
-	if err = syscall.Process32First(snapshot, &procEntry); err != nil {
-		return nil, err
-	}
-	for {
-		if procEntry.ProcessID == uint32(pid) {
-			return &procEntry, nil
-		}
-		err = syscall.Process32Next(snapshot, &procEntry)
-		if err != nil {
-			return nil, err
-		}
-	}
-}
-
-// StartedByExplorer returns true if the program was invoked by the user double-clicking
-// on the executable from explorer.exe
-//
-// It is conservative and returns false if any of the internal calls fail.
-// It does not guarantee that the program was run from a terminal. It only can tell you
-// whether it was launched from explorer.exe
-func StartedByExplorer() bool {
-	pe, err := getProcessEntry(os.Getppid())
-	if err != nil {
-		return false
-	}
-	return "explorer.exe" == syscall.UTF16ToString(pe.ExeFile[:])
-}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore
deleted file mode 100644
index 531fcc11c7..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-jpgo
-jmespath-fuzz.zip
-cpu.out
-go-jmespath.test
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml
deleted file mode 100644
index 1f98077570..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: go
-
-sudo: false
-
-go:
-  - 1.4
-
-install: go get -v -t ./...
-script: make test
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
deleted file mode 100644
index b03310a91f..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2015 James Saryerwinnie
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile
deleted file mode 100644
index a828d2848f..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-CMD = jpgo
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  test                    to run all the tests"
-	@echo "  build                   to build the library and jp executable"
-	@echo "  generate                to run codegen"
-
-
-generate:
-	go generate ./...
-
-build:
-	rm -f $(CMD)
-	go build ./...
-	rm -f cmd/$(CMD)/$(CMD) && cd cmd/$(CMD)/ && go build ./...
-	mv cmd/$(CMD)/$(CMD) .
-
-test:
-	go test -v ./...
-
-check:
-	go vet ./...
-	@echo "golint ./..."
-	@lint=`golint ./...`; \
-	lint=`echo "$$lint" | grep -v "astnodetype_string.go" | grep -v "toktype_string.go"`; \
-	echo "$$lint"; \
-	if [ "$$lint" != "" ]; then exit 1; fi
-
-htmlc:
-	go test -coverprofile="/tmp/jpcov"  && go tool cover -html="/tmp/jpcov" && unlink /tmp/jpcov
-
-buildfuzz:
-	go-fuzz-build github.com/jmespath/go-jmespath/fuzz
-
-fuzz: buildfuzz
-	go-fuzz -bin=./jmespath-fuzz.zip -workdir=fuzz/testdata
-
-bench:
-	go test -bench . -cpuprofile cpu.out
-
-pprof-cpu:
-	go tool pprof ./go-jmespath.test ./cpu.out
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md
deleted file mode 100644
index 187ef676dc..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# go-jmespath - A JMESPath implementation in Go
-
-[![Build Status](https://img.shields.io/travis/jmespath/go-jmespath.svg)](https://travis-ci.org/jmespath/go-jmespath)
-
-
-
-See http://jmespath.org for more info.
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go
deleted file mode 100644
index 9cfa988bc5..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/api.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package jmespath
-
-import "strconv"
-
-// JmesPath is the epresentation of a compiled JMES path query. A JmesPath is
-// safe for concurrent use by multiple goroutines.
-type JMESPath struct {
-	ast  ASTNode
-	intr *treeInterpreter
-}
-
-// Compile parses a JMESPath expression and returns, if successful, a JMESPath
-// object that can be used to match against data.
-func Compile(expression string) (*JMESPath, error) {
-	parser := NewParser()
-	ast, err := parser.Parse(expression)
-	if err != nil {
-		return nil, err
-	}
-	jmespath := &JMESPath{ast: ast, intr: newInterpreter()}
-	return jmespath, nil
-}
-
-// MustCompile is like Compile but panics if the expression cannot be parsed.
-// It simplifies safe initialization of global variables holding compiled
-// JMESPaths.
-func MustCompile(expression string) *JMESPath {
-	jmespath, err := Compile(expression)
-	if err != nil {
-		panic(`jmespath: Compile(` + strconv.Quote(expression) + `): ` + err.Error())
-	}
-	return jmespath
-}
-
-// Search evaluates a JMESPath expression against input data and returns the result.
-func (jp *JMESPath) Search(data interface{}) (interface{}, error) {
-	return jp.intr.Execute(jp.ast, data)
-}
-
-// Search evaluates a JMESPath expression against input data and returns the result.
-func Search(expression string, data interface{}) (interface{}, error) {
-	intr := newInterpreter()
-	parser := NewParser()
-	ast, err := parser.Parse(expression)
-	if err != nil {
-		return nil, err
-	}
-	return intr.Execute(ast, data)
-}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go
deleted file mode 100644
index 1cd2d239c9..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/astnodetype_string.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by stringer -type astNodeType; DO NOT EDIT
-
-package jmespath
-
-import "fmt"
-
-const _astNodeType_name = "ASTEmptyASTComparatorASTCurrentNodeASTExpRefASTFunctionExpressionASTFieldASTFilterProjectionASTFlattenASTIdentityASTIndexASTIndexExpressionASTKeyValPairASTLiteralASTMultiSelectHashASTMultiSelectListASTOrExpressionASTAndExpressionASTNotExpressionASTPipeASTProjectionASTSubexpressionASTSliceASTValueProjection"
-
-var _astNodeType_index = [...]uint16{0, 8, 21, 35, 44, 65, 73, 92, 102, 113, 121, 139, 152, 162, 180, 198, 213, 229, 245, 252, 265, 281, 289, 307}
-
-func (i astNodeType) String() string {
-	if i < 0 || i >= astNodeType(len(_astNodeType_index)-1) {
-		return fmt.Sprintf("astNodeType(%d)", i)
-	}
-	return _astNodeType_name[_astNodeType_index[i]:_astNodeType_index[i+1]]
-}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go
deleted file mode 100644
index 9b7cd89b4b..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/functions.go
+++ /dev/null
@@ -1,842 +0,0 @@
-package jmespath
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"math"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type jpFunction func(arguments []interface{}) (interface{}, error)
-
-type jpType string
-
-const (
-	jpUnknown     jpType = "unknown"
-	jpNumber      jpType = "number"
-	jpString      jpType = "string"
-	jpArray       jpType = "array"
-	jpObject      jpType = "object"
-	jpArrayNumber jpType = "array[number]"
-	jpArrayString jpType = "array[string]"
-	jpExpref      jpType = "expref"
-	jpAny         jpType = "any"
-)
-
-type functionEntry struct {
-	name      string
-	arguments []argSpec
-	handler   jpFunction
-	hasExpRef bool
-}
-
-type argSpec struct {
-	types    []jpType
-	variadic bool
-}
-
-type byExprString struct {
-	intr     *treeInterpreter
-	node     ASTNode
-	items    []interface{}
-	hasError bool
-}
-
-func (a *byExprString) Len() int {
-	return len(a.items)
-}
-func (a *byExprString) Swap(i, j int) {
-	a.items[i], a.items[j] = a.items[j], a.items[i]
-}
-func (a *byExprString) Less(i, j int) bool {
-	first, err := a.intr.Execute(a.node, a.items[i])
-	if err != nil {
-		a.hasError = true
-		// Return a dummy value.
-		return true
-	}
-	ith, ok := first.(string)
-	if !ok {
-		a.hasError = true
-		return true
-	}
-	second, err := a.intr.Execute(a.node, a.items[j])
-	if err != nil {
-		a.hasError = true
-		// Return a dummy value.
-		return true
-	}
-	jth, ok := second.(string)
-	if !ok {
-		a.hasError = true
-		return true
-	}
-	return ith < jth
-}
-
-type byExprFloat struct {
-	intr     *treeInterpreter
-	node     ASTNode
-	items    []interface{}
-	hasError bool
-}
-
-func (a *byExprFloat) Len() int {
-	return len(a.items)
-}
-func (a *byExprFloat) Swap(i, j int) {
-	a.items[i], a.items[j] = a.items[j], a.items[i]
-}
-func (a *byExprFloat) Less(i, j int) bool {
-	first, err := a.intr.Execute(a.node, a.items[i])
-	if err != nil {
-		a.hasError = true
-		// Return a dummy value.
-		return true
-	}
-	ith, ok := first.(float64)
-	if !ok {
-		a.hasError = true
-		return true
-	}
-	second, err := a.intr.Execute(a.node, a.items[j])
-	if err != nil {
-		a.hasError = true
-		// Return a dummy value.
-		return true
-	}
-	jth, ok := second.(float64)
-	if !ok {
-		a.hasError = true
-		return true
-	}
-	return ith < jth
-}
-
-type functionCaller struct {
-	functionTable map[string]functionEntry
-}
-
-func newFunctionCaller() *functionCaller {
-	caller := &functionCaller{}
-	caller.functionTable = map[string]functionEntry{
-		"length": {
-			name: "length",
-			arguments: []argSpec{
-				{types: []jpType{jpString, jpArray, jpObject}},
-			},
-			handler: jpfLength,
-		},
-		"starts_with": {
-			name: "starts_with",
-			arguments: []argSpec{
-				{types: []jpType{jpString}},
-				{types: []jpType{jpString}},
-			},
-			handler: jpfStartsWith,
-		},
-		"abs": {
-			name: "abs",
-			arguments: []argSpec{
-				{types: []jpType{jpNumber}},
-			},
-			handler: jpfAbs,
-		},
-		"avg": {
-			name: "avg",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayNumber}},
-			},
-			handler: jpfAvg,
-		},
-		"ceil": {
-			name: "ceil",
-			arguments: []argSpec{
-				{types: []jpType{jpNumber}},
-			},
-			handler: jpfCeil,
-		},
-		"contains": {
-			name: "contains",
-			arguments: []argSpec{
-				{types: []jpType{jpArray, jpString}},
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfContains,
-		},
-		"ends_with": {
-			name: "ends_with",
-			arguments: []argSpec{
-				{types: []jpType{jpString}},
-				{types: []jpType{jpString}},
-			},
-			handler: jpfEndsWith,
-		},
-		"floor": {
-			name: "floor",
-			arguments: []argSpec{
-				{types: []jpType{jpNumber}},
-			},
-			handler: jpfFloor,
-		},
-		"map": {
-			name: "amp",
-			arguments: []argSpec{
-				{types: []jpType{jpExpref}},
-				{types: []jpType{jpArray}},
-			},
-			handler:   jpfMap,
-			hasExpRef: true,
-		},
-		"max": {
-			name: "max",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayNumber, jpArrayString}},
-			},
-			handler: jpfMax,
-		},
-		"merge": {
-			name: "merge",
-			arguments: []argSpec{
-				{types: []jpType{jpObject}, variadic: true},
-			},
-			handler: jpfMerge,
-		},
-		"max_by": {
-			name: "max_by",
-			arguments: []argSpec{
-				{types: []jpType{jpArray}},
-				{types: []jpType{jpExpref}},
-			},
-			handler:   jpfMaxBy,
-			hasExpRef: true,
-		},
-		"sum": {
-			name: "sum",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayNumber}},
-			},
-			handler: jpfSum,
-		},
-		"min": {
-			name: "min",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayNumber, jpArrayString}},
-			},
-			handler: jpfMin,
-		},
-		"min_by": {
-			name: "min_by",
-			arguments: []argSpec{
-				{types: []jpType{jpArray}},
-				{types: []jpType{jpExpref}},
-			},
-			handler:   jpfMinBy,
-			hasExpRef: true,
-		},
-		"type": {
-			name: "type",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfType,
-		},
-		"keys": {
-			name: "keys",
-			arguments: []argSpec{
-				{types: []jpType{jpObject}},
-			},
-			handler: jpfKeys,
-		},
-		"values": {
-			name: "values",
-			arguments: []argSpec{
-				{types: []jpType{jpObject}},
-			},
-			handler: jpfValues,
-		},
-		"sort": {
-			name: "sort",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayString, jpArrayNumber}},
-			},
-			handler: jpfSort,
-		},
-		"sort_by": {
-			name: "sort_by",
-			arguments: []argSpec{
-				{types: []jpType{jpArray}},
-				{types: []jpType{jpExpref}},
-			},
-			handler:   jpfSortBy,
-			hasExpRef: true,
-		},
-		"join": {
-			name: "join",
-			arguments: []argSpec{
-				{types: []jpType{jpString}},
-				{types: []jpType{jpArrayString}},
-			},
-			handler: jpfJoin,
-		},
-		"reverse": {
-			name: "reverse",
-			arguments: []argSpec{
-				{types: []jpType{jpArray, jpString}},
-			},
-			handler: jpfReverse,
-		},
-		"to_array": {
-			name: "to_array",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfToArray,
-		},
-		"to_string": {
-			name: "to_string",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfToString,
-		},
-		"to_number": {
-			name: "to_number",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfToNumber,
-		},
-		"not_null": {
-			name: "not_null",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}, variadic: true},
-			},
-			handler: jpfNotNull,
-		},
-	}
-	return caller
-}
-
-func (e *functionEntry) resolveArgs(arguments []interface{}) ([]interface{}, error) {
-	if len(e.arguments) == 0 {
-		return arguments, nil
-	}
-	if !e.arguments[len(e.arguments)-1].variadic {
-		if len(e.arguments) != len(arguments) {
-			return nil, errors.New("incorrect number of args")
-		}
-		for i, spec := range e.arguments {
-			userArg := arguments[i]
-			err := spec.typeCheck(userArg)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return arguments, nil
-	}
-	if len(arguments) < len(e.arguments) {
-		return nil, errors.New("Invalid arity.")
-	}
-	return arguments, nil
-}
-
-func (a *argSpec) typeCheck(arg interface{}) error {
-	for _, t := range a.types {
-		switch t {
-		case jpNumber:
-			if _, ok := arg.(float64); ok {
-				return nil
-			}
-		case jpString:
-			if _, ok := arg.(string); ok {
-				return nil
-			}
-		case jpArray:
-			if isSliceType(arg) {
-				return nil
-			}
-		case jpObject:
-			if _, ok := arg.(map[string]interface{}); ok {
-				return nil
-			}
-		case jpArrayNumber:
-			if _, ok := toArrayNum(arg); ok {
-				return nil
-			}
-		case jpArrayString:
-			if _, ok := toArrayStr(arg); ok {
-				return nil
-			}
-		case jpAny:
-			return nil
-		case jpExpref:
-			if _, ok := arg.(expRef); ok {
-				return nil
-			}
-		}
-	}
-	return fmt.Errorf("Invalid type for: %v, expected: %#v", arg, a.types)
-}
-
-func (f *functionCaller) CallFunction(name string, arguments []interface{}, intr *treeInterpreter) (interface{}, error) {
-	entry, ok := f.functionTable[name]
-	if !ok {
-		return nil, errors.New("unknown function: " + name)
-	}
-	resolvedArgs, err := entry.resolveArgs(arguments)
-	if err != nil {
-		return nil, err
-	}
-	if entry.hasExpRef {
-		var extra []interface{}
-		extra = append(extra, intr)
-		resolvedArgs = append(extra, resolvedArgs...)
-	}
-	return entry.handler(resolvedArgs)
-}
-
-func jpfAbs(arguments []interface{}) (interface{}, error) {
-	num := arguments[0].(float64)
-	return math.Abs(num), nil
-}
-
-func jpfLength(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0]
-	if c, ok := arg.(string); ok {
-		return float64(utf8.RuneCountInString(c)), nil
-	} else if isSliceType(arg) {
-		v := reflect.ValueOf(arg)
-		return float64(v.Len()), nil
-	} else if c, ok := arg.(map[string]interface{}); ok {
-		return float64(len(c)), nil
-	}
-	return nil, errors.New("could not compute length()")
-}
-
-func jpfStartsWith(arguments []interface{}) (interface{}, error) {
-	search := arguments[0].(string)
-	prefix := arguments[1].(string)
-	return strings.HasPrefix(search, prefix), nil
-}
-
-func jpfAvg(arguments []interface{}) (interface{}, error) {
-	// We've already type checked the value so we can safely use
-	// type assertions.
-	args := arguments[0].([]interface{})
-	length := float64(len(args))
-	numerator := 0.0
-	for _, n := range args {
-		numerator += n.(float64)
-	}
-	return numerator / length, nil
-}
-func jpfCeil(arguments []interface{}) (interface{}, error) {
-	val := arguments[0].(float64)
-	return math.Ceil(val), nil
-}
-func jpfContains(arguments []interface{}) (interface{}, error) {
-	search := arguments[0]
-	el := arguments[1]
-	if searchStr, ok := search.(string); ok {
-		if elStr, ok := el.(string); ok {
-			return strings.Index(searchStr, elStr) != -1, nil
-		}
-		return false, nil
-	}
-	// Otherwise this is a generic contains for []interface{}
-	general := search.([]interface{})
-	for _, item := range general {
-		if item == el {
-			return true, nil
-		}
-	}
-	return false, nil
-}
-func jpfEndsWith(arguments []interface{}) (interface{}, error) {
-	search := arguments[0].(string)
-	suffix := arguments[1].(string)
-	return strings.HasSuffix(search, suffix), nil
-}
-func jpfFloor(arguments []interface{}) (interface{}, error) {
-	val := arguments[0].(float64)
-	return math.Floor(val), nil
-}
-func jpfMap(arguments []interface{}) (interface{}, error) {
-	intr := arguments[0].(*treeInterpreter)
-	exp := arguments[1].(expRef)
-	node := exp.ref
-	arr := arguments[2].([]interface{})
-	mapped := make([]interface{}, 0, len(arr))
-	for _, value := range arr {
-		current, err := intr.Execute(node, value)
-		if err != nil {
-			return nil, err
-		}
-		mapped = append(mapped, current)
-	}
-	return mapped, nil
-}
-func jpfMax(arguments []interface{}) (interface{}, error) {
-	if items, ok := toArrayNum(arguments[0]); ok {
-		if len(items) == 0 {
-			return nil, nil
-		}
-		if len(items) == 1 {
-			return items[0], nil
-		}
-		best := items[0]
-		for _, item := range items[1:] {
-			if item > best {
-				best = item
-			}
-		}
-		return best, nil
-	}
-	// Otherwise we're dealing with a max() of strings.
-	items, _ := toArrayStr(arguments[0])
-	if len(items) == 0 {
-		return nil, nil
-	}
-	if len(items) == 1 {
-		return items[0], nil
-	}
-	best := items[0]
-	for _, item := range items[1:] {
-		if item > best {
-			best = item
-		}
-	}
-	return best, nil
-}
-func jpfMerge(arguments []interface{}) (interface{}, error) {
-	final := make(map[string]interface{})
-	for _, m := range arguments {
-		mapped := m.(map[string]interface{})
-		for key, value := range mapped {
-			final[key] = value
-		}
-	}
-	return final, nil
-}
-func jpfMaxBy(arguments []interface{}) (interface{}, error) {
-	intr := arguments[0].(*treeInterpreter)
-	arr := arguments[1].([]interface{})
-	exp := arguments[2].(expRef)
-	node := exp.ref
-	if len(arr) == 0 {
-		return nil, nil
-	} else if len(arr) == 1 {
-		return arr[0], nil
-	}
-	start, err := intr.Execute(node, arr[0])
-	if err != nil {
-		return nil, err
-	}
-	switch t := start.(type) {
-	case float64:
-		bestVal := t
-		bestItem := arr[0]
-		for _, item := range arr[1:] {
-			result, err := intr.Execute(node, item)
-			if err != nil {
-				return nil, err
-			}
-			current, ok := result.(float64)
-			if !ok {
-				return nil, errors.New("invalid type, must be number")
-			}
-			if current > bestVal {
-				bestVal = current
-				bestItem = item
-			}
-		}
-		return bestItem, nil
-	case string:
-		bestVal := t
-		bestItem := arr[0]
-		for _, item := range arr[1:] {
-			result, err := intr.Execute(node, item)
-			if err != nil {
-				return nil, err
-			}
-			current, ok := result.(string)
-			if !ok {
-				return nil, errors.New("invalid type, must be string")
-			}
-			if current > bestVal {
-				bestVal = current
-				bestItem = item
-			}
-		}
-		return bestItem, nil
-	default:
-		return nil, errors.New("invalid type, must be number of string")
-	}
-}
-func jpfSum(arguments []interface{}) (interface{}, error) {
-	items, _ := toArrayNum(arguments[0])
-	sum := 0.0
-	for _, item := range items {
-		sum += item
-	}
-	return sum, nil
-}
-
-func jpfMin(arguments []interface{}) (interface{}, error) {
-	if items, ok := toArrayNum(arguments[0]); ok {
-		if len(items) == 0 {
-			return nil, nil
-		}
-		if len(items) == 1 {
-			return items[0], nil
-		}
-		best := items[0]
-		for _, item := range items[1:] {
-			if item < best {
-				best = item
-			}
-		}
-		return best, nil
-	}
-	items, _ := toArrayStr(arguments[0])
-	if len(items) == 0 {
-		return nil, nil
-	}
-	if len(items) == 1 {
-		return items[0], nil
-	}
-	best := items[0]
-	for _, item := range items[1:] {
-		if item < best {
-			best = item
-		}
-	}
-	return best, nil
-}
-
-func jpfMinBy(arguments []interface{}) (interface{}, error) {
-	intr := arguments[0].(*treeInterpreter)
-	arr := arguments[1].([]interface{})
-	exp := arguments[2].(expRef)
-	node := exp.ref
-	if len(arr) == 0 {
-		return nil, nil
-	} else if len(arr) == 1 {
-		return arr[0], nil
-	}
-	start, err := intr.Execute(node, arr[0])
-	if err != nil {
-		return nil, err
-	}
-	if t, ok := start.(float64); ok {
-		bestVal := t
-		bestItem := arr[0]
-		for _, item := range arr[1:] {
-			result, err := intr.Execute(node, item)
-			if err != nil {
-				return nil, err
-			}
-			current, ok := result.(float64)
-			if !ok {
-				return nil, errors.New("invalid type, must be number")
-			}
-			if current < bestVal {
-				bestVal = current
-				bestItem = item
-			}
-		}
-		return bestItem, nil
-	} else if t, ok := start.(string); ok {
-		bestVal := t
-		bestItem := arr[0]
-		for _, item := range arr[1:] {
-			result, err := intr.Execute(node, item)
-			if err != nil {
-				return nil, err
-			}
-			current, ok := result.(string)
-			if !ok {
-				return nil, errors.New("invalid type, must be string")
-			}
-			if current < bestVal {
-				bestVal = current
-				bestItem = item
-			}
-		}
-		return bestItem, nil
-	} else {
-		return nil, errors.New("invalid type, must be number of string")
-	}
-}
-func jpfType(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0]
-	if _, ok := arg.(float64); ok {
-		return "number", nil
-	}
-	if _, ok := arg.(string); ok {
-		return "string", nil
-	}
-	if _, ok := arg.([]interface{}); ok {
-		return "array", nil
-	}
-	if _, ok := arg.(map[string]interface{}); ok {
-		return "object", nil
-	}
-	if arg == nil {
-		return "null", nil
-	}
-	if arg == true || arg == false {
-		return "boolean", nil
-	}
-	return nil, errors.New("unknown type")
-}
-func jpfKeys(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0].(map[string]interface{})
-	collected := make([]interface{}, 0, len(arg))
-	for key := range arg {
-		collected = append(collected, key)
-	}
-	return collected, nil
-}
-func jpfValues(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0].(map[string]interface{})
-	collected := make([]interface{}, 0, len(arg))
-	for _, value := range arg {
-		collected = append(collected, value)
-	}
-	return collected, nil
-}
-func jpfSort(arguments []interface{}) (interface{}, error) {
-	if items, ok := toArrayNum(arguments[0]); ok {
-		d := sort.Float64Slice(items)
-		sort.Stable(d)
-		final := make([]interface{}, len(d))
-		for i, val := range d {
-			final[i] = val
-		}
-		return final, nil
-	}
-	// Otherwise we're dealing with sort()'ing strings.
-	items, _ := toArrayStr(arguments[0])
-	d := sort.StringSlice(items)
-	sort.Stable(d)
-	final := make([]interface{}, len(d))
-	for i, val := range d {
-		final[i] = val
-	}
-	return final, nil
-}
-func jpfSortBy(arguments []interface{}) (interface{}, error) {
-	intr := arguments[0].(*treeInterpreter)
-	arr := arguments[1].([]interface{})
-	exp := arguments[2].(expRef)
-	node := exp.ref
-	if len(arr) == 0 {
-		return arr, nil
-	} else if len(arr) == 1 {
-		return arr, nil
-	}
-	start, err := intr.Execute(node, arr[0])
-	if err != nil {
-		return nil, err
-	}
-	if _, ok := start.(float64); ok {
-		sortable := &byExprFloat{intr, node, arr, false}
-		sort.Stable(sortable)
-		if sortable.hasError {
-			return nil, errors.New("error in sort_by comparison")
-		}
-		return arr, nil
-	} else if _, ok := start.(string); ok {
-		sortable := &byExprString{intr, node, arr, false}
-		sort.Stable(sortable)
-		if sortable.hasError {
-			return nil, errors.New("error in sort_by comparison")
-		}
-		return arr, nil
-	} else {
-		return nil, errors.New("invalid type, must be number of string")
-	}
-}
-func jpfJoin(arguments []interface{}) (interface{}, error) {
-	sep := arguments[0].(string)
-	// We can't just do arguments[1].([]string), we have to
-	// manually convert each item to a string.
-	arrayStr := []string{}
-	for _, item := range arguments[1].([]interface{}) {
-		arrayStr = append(arrayStr, item.(string))
-	}
-	return strings.Join(arrayStr, sep), nil
-}
-func jpfReverse(arguments []interface{}) (interface{}, error) {
-	if s, ok := arguments[0].(string); ok {
-		r := []rune(s)
-		for i, j := 0, len(r)-1; i < len(r)/2; i, j = i+1, j-1 {
-			r[i], r[j] = r[j], r[i]
-		}
-		return string(r), nil
-	}
-	items := arguments[0].([]interface{})
-	length := len(items)
-	reversed := make([]interface{}, length)
-	for i, item := range items {
-		reversed[length-(i+1)] = item
-	}
-	return reversed, nil
-}
-func jpfToArray(arguments []interface{}) (interface{}, error) {
-	if _, ok := arguments[0].([]interface{}); ok {
-		return arguments[0], nil
-	}
-	return arguments[:1:1], nil
-}
-func jpfToString(arguments []interface{}) (interface{}, error) {
-	if v, ok := arguments[0].(string); ok {
-		return v, nil
-	}
-	result, err := json.Marshal(arguments[0])
-	if err != nil {
-		return nil, err
-	}
-	return string(result), nil
-}
-func jpfToNumber(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0]
-	if v, ok := arg.(float64); ok {
-		return v, nil
-	}
-	if v, ok := arg.(string); ok {
-		conv, err := strconv.ParseFloat(v, 64)
-		if err != nil {
-			return nil, nil
-		}
-		return conv, nil
-	}
-	if _, ok := arg.([]interface{}); ok {
-		return nil, nil
-	}
-	if _, ok := arg.(map[string]interface{}); ok {
-		return nil, nil
-	}
-	if arg == nil {
-		return nil, nil
-	}
-	if arg == true || arg == false {
-		return nil, nil
-	}
-	return nil, errors.New("unknown type")
-}
-func jpfNotNull(arguments []interface{}) (interface{}, error) {
-	for _, arg := range arguments {
-		if arg != nil {
-			return arg, nil
-		}
-	}
-	return nil, nil
-}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go
deleted file mode 100644
index 13c74604c2..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/interpreter.go
+++ /dev/null
@@ -1,418 +0,0 @@
-package jmespath
-
-import (
-	"errors"
-	"reflect"
-	"unicode"
-	"unicode/utf8"
-)
-
-/* This is a tree based interpreter.  It walks the AST and directly
-   interprets the AST to search through a JSON document.
-*/
-
-type treeInterpreter struct {
-	fCall *functionCaller
-}
-
-func newInterpreter() *treeInterpreter {
-	interpreter := treeInterpreter{}
-	interpreter.fCall = newFunctionCaller()
-	return &interpreter
-}
-
-type expRef struct {
-	ref ASTNode
-}
-
-// Execute takes an ASTNode and input data and interprets the AST directly.
-// It will produce the result of applying the JMESPath expression associated
-// with the ASTNode to the input data "value".
-func (intr *treeInterpreter) Execute(node ASTNode, value interface{}) (interface{}, error) {
-	switch node.nodeType {
-	case ASTComparator:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		right, err := intr.Execute(node.children[1], value)
-		if err != nil {
-			return nil, err
-		}
-		switch node.value {
-		case tEQ:
-			return objsEqual(left, right), nil
-		case tNE:
-			return !objsEqual(left, right), nil
-		}
-		leftNum, ok := left.(float64)
-		if !ok {
-			return nil, nil
-		}
-		rightNum, ok := right.(float64)
-		if !ok {
-			return nil, nil
-		}
-		switch node.value {
-		case tGT:
-			return leftNum > rightNum, nil
-		case tGTE:
-			return leftNum >= rightNum, nil
-		case tLT:
-			return leftNum < rightNum, nil
-		case tLTE:
-			return leftNum <= rightNum, nil
-		}
-	case ASTExpRef:
-		return expRef{ref: node.children[0]}, nil
-	case ASTFunctionExpression:
-		resolvedArgs := []interface{}{}
-		for _, arg := range node.children {
-			current, err := intr.Execute(arg, value)
-			if err != nil {
-				return nil, err
-			}
-			resolvedArgs = append(resolvedArgs, current)
-		}
-		return intr.fCall.CallFunction(node.value.(string), resolvedArgs, intr)
-	case ASTField:
-		if m, ok := value.(map[string]interface{}); ok {
-			key := node.value.(string)
-			return m[key], nil
-		}
-		return intr.fieldFromStruct(node.value.(string), value)
-	case ASTFilterProjection:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, nil
-		}
-		sliceType, ok := left.([]interface{})
-		if !ok {
-			if isSliceType(left) {
-				return intr.filterProjectionWithReflection(node, left)
-			}
-			return nil, nil
-		}
-		compareNode := node.children[2]
-		collected := []interface{}{}
-		for _, element := range sliceType {
-			result, err := intr.Execute(compareNode, element)
-			if err != nil {
-				return nil, err
-			}
-			if !isFalse(result) {
-				current, err := intr.Execute(node.children[1], element)
-				if err != nil {
-					return nil, err
-				}
-				if current != nil {
-					collected = append(collected, current)
-				}
-			}
-		}
-		return collected, nil
-	case ASTFlatten:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, nil
-		}
-		sliceType, ok := left.([]interface{})
-		if !ok {
-			// If we can't type convert to []interface{}, there's
-			// a chance this could still work via reflection if we're
-			// dealing with user provided types.
-			if isSliceType(left) {
-				return intr.flattenWithReflection(left)
-			}
-			return nil, nil
-		}
-		flattened := []interface{}{}
-		for _, element := range sliceType {
-			if elementSlice, ok := element.([]interface{}); ok {
-				flattened = append(flattened, elementSlice...)
-			} else if isSliceType(element) {
-				reflectFlat := []interface{}{}
-				v := reflect.ValueOf(element)
-				for i := 0; i < v.Len(); i++ {
-					reflectFlat = append(reflectFlat, v.Index(i).Interface())
-				}
-				flattened = append(flattened, reflectFlat...)
-			} else {
-				flattened = append(flattened, element)
-			}
-		}
-		return flattened, nil
-	case ASTIdentity, ASTCurrentNode:
-		return value, nil
-	case ASTIndex:
-		if sliceType, ok := value.([]interface{}); ok {
-			index := node.value.(int)
-			if index < 0 {
-				index += len(sliceType)
-			}
-			if index < len(sliceType) && index >= 0 {
-				return sliceType[index], nil
-			}
-			return nil, nil
-		}
-		// Otherwise try via reflection.
-		rv := reflect.ValueOf(value)
-		if rv.Kind() == reflect.Slice {
-			index := node.value.(int)
-			if index < 0 {
-				index += rv.Len()
-			}
-			if index < rv.Len() && index >= 0 {
-				v := rv.Index(index)
-				return v.Interface(), nil
-			}
-		}
-		return nil, nil
-	case ASTKeyValPair:
-		return intr.Execute(node.children[0], value)
-	case ASTLiteral:
-		return node.value, nil
-	case ASTMultiSelectHash:
-		if value == nil {
-			return nil, nil
-		}
-		collected := make(map[string]interface{})
-		for _, child := range node.children {
-			current, err := intr.Execute(child, value)
-			if err != nil {
-				return nil, err
-			}
-			key := child.value.(string)
-			collected[key] = current
-		}
-		return collected, nil
-	case ASTMultiSelectList:
-		if value == nil {
-			return nil, nil
-		}
-		collected := []interface{}{}
-		for _, child := range node.children {
-			current, err := intr.Execute(child, value)
-			if err != nil {
-				return nil, err
-			}
-			collected = append(collected, current)
-		}
-		return collected, nil
-	case ASTOrExpression:
-		matched, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		if isFalse(matched) {
-			matched, err = intr.Execute(node.children[1], value)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return matched, nil
-	case ASTAndExpression:
-		matched, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		if isFalse(matched) {
-			return matched, nil
-		}
-		return intr.Execute(node.children[1], value)
-	case ASTNotExpression:
-		matched, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		if isFalse(matched) {
-			return true, nil
-		}
-		return false, nil
-	case ASTPipe:
-		result := value
-		var err error
-		for _, child := range node.children {
-			result, err = intr.Execute(child, result)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return result, nil
-	case ASTProjection:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		sliceType, ok := left.([]interface{})
-		if !ok {
-			if isSliceType(left) {
-				return intr.projectWithReflection(node, left)
-			}
-			return nil, nil
-		}
-		collected := []interface{}{}
-		var current interface{}
-		for _, element := range sliceType {
-			current, err = intr.Execute(node.children[1], element)
-			if err != nil {
-				return nil, err
-			}
-			if current != nil {
-				collected = append(collected, current)
-			}
-		}
-		return collected, nil
-	case ASTSubexpression, ASTIndexExpression:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		return intr.Execute(node.children[1], left)
-	case ASTSlice:
-		sliceType, ok := value.([]interface{})
-		if !ok {
-			if isSliceType(value) {
-				return intr.sliceWithReflection(node, value)
-			}
-			return nil, nil
-		}
-		parts := node.value.([]*int)
-		sliceParams := make([]sliceParam, 3)
-		for i, part := range parts {
-			if part != nil {
-				sliceParams[i].Specified = true
-				sliceParams[i].N = *part
-			}
-		}
-		return slice(sliceType, sliceParams)
-	case ASTValueProjection:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, nil
-		}
-		mapType, ok := left.(map[string]interface{})
-		if !ok {
-			return nil, nil
-		}
-		values := make([]interface{}, len(mapType))
-		for _, value := range mapType {
-			values = append(values, value)
-		}
-		collected := []interface{}{}
-		for _, element := range values {
-			current, err := intr.Execute(node.children[1], element)
-			if err != nil {
-				return nil, err
-			}
-			if current != nil {
-				collected = append(collected, current)
-			}
-		}
-		return collected, nil
-	}
-	return nil, errors.New("Unknown AST node: " + node.nodeType.String())
-}
-
-func (intr *treeInterpreter) fieldFromStruct(key string, value interface{}) (interface{}, error) {
-	rv := reflect.ValueOf(value)
-	first, n := utf8.DecodeRuneInString(key)
-	fieldName := string(unicode.ToUpper(first)) + key[n:]
-	if rv.Kind() == reflect.Struct {
-		v := rv.FieldByName(fieldName)
-		if !v.IsValid() {
-			return nil, nil
-		}
-		return v.Interface(), nil
-	} else if rv.Kind() == reflect.Ptr {
-		// Handle multiple levels of indirection?
-		if rv.IsNil() {
-			return nil, nil
-		}
-		rv = rv.Elem()
-		v := rv.FieldByName(fieldName)
-		if !v.IsValid() {
-			return nil, nil
-		}
-		return v.Interface(), nil
-	}
-	return nil, nil
-}
-
-func (intr *treeInterpreter) flattenWithReflection(value interface{}) (interface{}, error) {
-	v := reflect.ValueOf(value)
-	flattened := []interface{}{}
-	for i := 0; i < v.Len(); i++ {
-		element := v.Index(i).Interface()
-		if reflect.TypeOf(element).Kind() == reflect.Slice {
-			// Then insert the contents of the element
-			// slice into the flattened slice,
-			// i.e flattened = append(flattened, mySlice...)
-			elementV := reflect.ValueOf(element)
-			for j := 0; j < elementV.Len(); j++ {
-				flattened = append(
-					flattened, elementV.Index(j).Interface())
-			}
-		} else {
-			flattened = append(flattened, element)
-		}
-	}
-	return flattened, nil
-}
-
-func (intr *treeInterpreter) sliceWithReflection(node ASTNode, value interface{}) (interface{}, error) {
-	v := reflect.ValueOf(value)
-	parts := node.value.([]*int)
-	sliceParams := make([]sliceParam, 3)
-	for i, part := range parts {
-		if part != nil {
-			sliceParams[i].Specified = true
-			sliceParams[i].N = *part
-		}
-	}
-	final := []interface{}{}
-	for i := 0; i < v.Len(); i++ {
-		element := v.Index(i).Interface()
-		final = append(final, element)
-	}
-	return slice(final, sliceParams)
-}
-
-func (intr *treeInterpreter) filterProjectionWithReflection(node ASTNode, value interface{}) (interface{}, error) {
-	compareNode := node.children[2]
-	collected := []interface{}{}
-	v := reflect.ValueOf(value)
-	for i := 0; i < v.Len(); i++ {
-		element := v.Index(i).Interface()
-		result, err := intr.Execute(compareNode, element)
-		if err != nil {
-			return nil, err
-		}
-		if !isFalse(result) {
-			current, err := intr.Execute(node.children[1], element)
-			if err != nil {
-				return nil, err
-			}
-			if current != nil {
-				collected = append(collected, current)
-			}
-		}
-	}
-	return collected, nil
-}
-
-func (intr *treeInterpreter) projectWithReflection(node ASTNode, value interface{}) (interface{}, error) {
-	collected := []interface{}{}
-	v := reflect.ValueOf(value)
-	for i := 0; i < v.Len(); i++ {
-		element := v.Index(i).Interface()
-		result, err := intr.Execute(node.children[1], element)
-		if err != nil {
-			return nil, err
-		}
-		if result != nil {
-			collected = append(collected, result)
-		}
-	}
-	return collected, nil
-}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go
deleted file mode 100644
index 817900c8f5..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/lexer.go
+++ /dev/null
@@ -1,420 +0,0 @@
-package jmespath
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type token struct {
-	tokenType tokType
-	value     string
-	position  int
-	length    int
-}
-
-type tokType int
-
-const eof = -1
-
-// Lexer contains information about the expression being tokenized.
-type Lexer struct {
-	expression string       // The expression provided by the user.
-	currentPos int          // The current position in the string.
-	lastWidth  int          // The width of the current rune.  This
-	buf        bytes.Buffer // Internal buffer used for building up values.
-}
-
-// SyntaxError is the main error used whenever a lexing or parsing error occurs.
-type SyntaxError struct {
-	msg        string // Error message displayed to user
-	Expression string // Expression that generated a SyntaxError
-	Offset     int    // The location in the string where the error occurred
-}
-
-func (e SyntaxError) Error() string {
-	// In the future, it would be good to underline the specific
-	// location where the error occurred.
-	return "SyntaxError: " + e.msg
-}
-
-// HighlightLocation will show where the syntax error occurred.
-// It will place a "^" character on a line below the expression
-// at the point where the syntax error occurred.
-func (e SyntaxError) HighlightLocation() string {
-	return e.Expression + "\n" + strings.Repeat(" ", e.Offset) + "^"
-}
-
-//go:generate stringer -type=tokType
-const (
-	tUnknown tokType = iota
-	tStar
-	tDot
-	tFilter
-	tFlatten
-	tLparen
-	tRparen
-	tLbracket
-	tRbracket
-	tLbrace
-	tRbrace
-	tOr
-	tPipe
-	tNumber
-	tUnquotedIdentifier
-	tQuotedIdentifier
-	tComma
-	tColon
-	tLT
-	tLTE
-	tGT
-	tGTE
-	tEQ
-	tNE
-	tJSONLiteral
-	tStringLiteral
-	tCurrent
-	tExpref
-	tAnd
-	tNot
-	tEOF
-)
-
-var basicTokens = map[rune]tokType{
-	'.': tDot,
-	'*': tStar,
-	',': tComma,
-	':': tColon,
-	'{': tLbrace,
-	'}': tRbrace,
-	']': tRbracket, // tLbracket not included because it could be "[]"
-	'(': tLparen,
-	')': tRparen,
-	'@': tCurrent,
-}
-
-// Bit mask for [a-zA-Z_] shifted down 64 bits to fit in a single uint64.
-// When using this bitmask just be sure to shift the rune down 64 bits
-// before checking against identifierStartBits.
-const identifierStartBits uint64 = 576460745995190270
-
-// Bit mask for [a-zA-Z0-9], 128 bits -> 2 uint64s.
-var identifierTrailingBits = [2]uint64{287948901175001088, 576460745995190270}
-
-var whiteSpace = map[rune]bool{
-	' ': true, '\t': true, '\n': true, '\r': true,
-}
-
-func (t token) String() string {
-	return fmt.Sprintf("Token{%+v, %s, %d, %d}",
-		t.tokenType, t.value, t.position, t.length)
-}
-
-// NewLexer creates a new JMESPath lexer.
-func NewLexer() *Lexer {
-	lexer := Lexer{}
-	return &lexer
-}
-
-func (lexer *Lexer) next() rune {
-	if lexer.currentPos >= len(lexer.expression) {
-		lexer.lastWidth = 0
-		return eof
-	}
-	r, w := utf8.DecodeRuneInString(lexer.expression[lexer.currentPos:])
-	lexer.lastWidth = w
-	lexer.currentPos += w
-	return r
-}
-
-func (lexer *Lexer) back() {
-	lexer.currentPos -= lexer.lastWidth
-}
-
-func (lexer *Lexer) peek() rune {
-	t := lexer.next()
-	lexer.back()
-	return t
-}
-
-// tokenize takes an expression and returns corresponding tokens.
-func (lexer *Lexer) tokenize(expression string) ([]token, error) {
-	var tokens []token
-	lexer.expression = expression
-	lexer.currentPos = 0
-	lexer.lastWidth = 0
-loop:
-	for {
-		r := lexer.next()
-		if identifierStartBits&(1<<(uint64(r)-64)) > 0 {
-			t := lexer.consumeUnquotedIdentifier()
-			tokens = append(tokens, t)
-		} else if val, ok := basicTokens[r]; ok {
-			// Basic single char token.
-			t := token{
-				tokenType: val,
-				value:     string(r),
-				position:  lexer.currentPos - lexer.lastWidth,
-				length:    1,
-			}
-			tokens = append(tokens, t)
-		} else if r == '-' || (r >= '0' && r <= '9') {
-			t := lexer.consumeNumber()
-			tokens = append(tokens, t)
-		} else if r == '[' {
-			t := lexer.consumeLBracket()
-			tokens = append(tokens, t)
-		} else if r == '"' {
-			t, err := lexer.consumeQuotedIdentifier()
-			if err != nil {
-				return tokens, err
-			}
-			tokens = append(tokens, t)
-		} else if r == '\'' {
-			t, err := lexer.consumeRawStringLiteral()
-			if err != nil {
-				return tokens, err
-			}
-			tokens = append(tokens, t)
-		} else if r == '`' {
-			t, err := lexer.consumeLiteral()
-			if err != nil {
-				return tokens, err
-			}
-			tokens = append(tokens, t)
-		} else if r == '|' {
-			t := lexer.matchOrElse(r, '|', tOr, tPipe)
-			tokens = append(tokens, t)
-		} else if r == '<' {
-			t := lexer.matchOrElse(r, '=', tLTE, tLT)
-			tokens = append(tokens, t)
-		} else if r == '>' {
-			t := lexer.matchOrElse(r, '=', tGTE, tGT)
-			tokens = append(tokens, t)
-		} else if r == '!' {
-			t := lexer.matchOrElse(r, '=', tNE, tNot)
-			tokens = append(tokens, t)
-		} else if r == '=' {
-			t := lexer.matchOrElse(r, '=', tEQ, tUnknown)
-			tokens = append(tokens, t)
-		} else if r == '&' {
-			t := lexer.matchOrElse(r, '&', tAnd, tExpref)
-			tokens = append(tokens, t)
-		} else if r == eof {
-			break loop
-		} else if _, ok := whiteSpace[r]; ok {
-			// Ignore whitespace
-		} else {
-			return tokens, lexer.syntaxError(fmt.Sprintf("Unknown char: %s", strconv.QuoteRuneToASCII(r)))
-		}
-	}
-	tokens = append(tokens, token{tEOF, "", len(lexer.expression), 0})
-	return tokens, nil
-}
-
-// Consume characters until the ending rune "r" is reached.
-// If the end of the expression is reached before seeing the
-// terminating rune "r", then an error is returned.
-// If no error occurs then the matching substring is returned.
-// The returned string will not include the ending rune.
-func (lexer *Lexer) consumeUntil(end rune) (string, error) {
-	start := lexer.currentPos
-	current := lexer.next()
-	for current != end && current != eof {
-		if current == '\\' && lexer.peek() != eof {
-			lexer.next()
-		}
-		current = lexer.next()
-	}
-	if lexer.lastWidth == 0 {
-		// Then we hit an EOF so we never reached the closing
-		// delimiter.
-		return "", SyntaxError{
-			msg:        "Unclosed delimiter: " + string(end),
-			Expression: lexer.expression,
-			Offset:     len(lexer.expression),
-		}
-	}
-	return lexer.expression[start : lexer.currentPos-lexer.lastWidth], nil
-}
-
-func (lexer *Lexer) consumeLiteral() (token, error) {
-	start := lexer.currentPos
-	value, err := lexer.consumeUntil('`')
-	if err != nil {
-		return token{}, err
-	}
-	value = strings.Replace(value, "\\`", "`", -1)
-	return token{
-		tokenType: tJSONLiteral,
-		value:     value,
-		position:  start,
-		length:    len(value),
-	}, nil
-}
-
-func (lexer *Lexer) consumeRawStringLiteral() (token, error) {
-	start := lexer.currentPos
-	currentIndex := start
-	current := lexer.next()
-	for current != '\'' && lexer.peek() != eof {
-		if current == '\\' && lexer.peek() == '\'' {
-			chunk := lexer.expression[currentIndex : lexer.currentPos-1]
-			lexer.buf.WriteString(chunk)
-			lexer.buf.WriteString("'")
-			lexer.next()
-			currentIndex = lexer.currentPos
-		}
-		current = lexer.next()
-	}
-	if lexer.lastWidth == 0 {
-		// Then we hit an EOF so we never reached the closing
-		// delimiter.
-		return token{}, SyntaxError{
-			msg:        "Unclosed delimiter: '",
-			Expression: lexer.expression,
-			Offset:     len(lexer.expression),
-		}
-	}
-	if currentIndex < lexer.currentPos {
-		lexer.buf.WriteString(lexer.expression[currentIndex : lexer.currentPos-1])
-	}
-	value := lexer.buf.String()
-	// Reset the buffer so it can reused again.
-	lexer.buf.Reset()
-	return token{
-		tokenType: tStringLiteral,
-		value:     value,
-		position:  start,
-		length:    len(value),
-	}, nil
-}
-
-func (lexer *Lexer) syntaxError(msg string) SyntaxError {
-	return SyntaxError{
-		msg:        msg,
-		Expression: lexer.expression,
-		Offset:     lexer.currentPos - 1,
-	}
-}
-
-// Checks for a two char token, otherwise matches a single character
-// token. This is used whenever a two char token overlaps a single
-// char token, e.g. "||" -> tPipe, "|" -> tOr.
-func (lexer *Lexer) matchOrElse(first rune, second rune, matchedType tokType, singleCharType tokType) token {
-	start := lexer.currentPos - lexer.lastWidth
-	nextRune := lexer.next()
-	var t token
-	if nextRune == second {
-		t = token{
-			tokenType: matchedType,
-			value:     string(first) + string(second),
-			position:  start,
-			length:    2,
-		}
-	} else {
-		lexer.back()
-		t = token{
-			tokenType: singleCharType,
-			value:     string(first),
-			position:  start,
-			length:    1,
-		}
-	}
-	return t
-}
-
-func (lexer *Lexer) consumeLBracket() token {
-	// There's three options here:
-	// 1. A filter expression "[?"
-	// 2. A flatten operator "[]"
-	// 3. A bare rbracket "["
-	start := lexer.currentPos - lexer.lastWidth
-	nextRune := lexer.next()
-	var t token
-	if nextRune == '?' {
-		t = token{
-			tokenType: tFilter,
-			value:     "[?",
-			position:  start,
-			length:    2,
-		}
-	} else if nextRune == ']' {
-		t = token{
-			tokenType: tFlatten,
-			value:     "[]",
-			position:  start,
-			length:    2,
-		}
-	} else {
-		t = token{
-			tokenType: tLbracket,
-			value:     "[",
-			position:  start,
-			length:    1,
-		}
-		lexer.back()
-	}
-	return t
-}
-
-func (lexer *Lexer) consumeQuotedIdentifier() (token, error) {
-	start := lexer.currentPos
-	value, err := lexer.consumeUntil('"')
-	if err != nil {
-		return token{}, err
-	}
-	var decoded string
-	asJSON := []byte("\"" + value + "\"")
-	if err := json.Unmarshal([]byte(asJSON), &decoded); err != nil {
-		return token{}, err
-	}
-	return token{
-		tokenType: tQuotedIdentifier,
-		value:     decoded,
-		position:  start - 1,
-		length:    len(decoded),
-	}, nil
-}
-
-func (lexer *Lexer) consumeUnquotedIdentifier() token {
-	// Consume runes until we reach the end of an unquoted
-	// identifier.
-	start := lexer.currentPos - lexer.lastWidth
-	for {
-		r := lexer.next()
-		if r < 0 || r > 128 || identifierTrailingBits[uint64(r)/64]&(1<<(uint64(r)%64)) == 0 {
-			lexer.back()
-			break
-		}
-	}
-	value := lexer.expression[start:lexer.currentPos]
-	return token{
-		tokenType: tUnquotedIdentifier,
-		value:     value,
-		position:  start,
-		length:    lexer.currentPos - start,
-	}
-}
-
-func (lexer *Lexer) consumeNumber() token {
-	// Consume runes until we reach something that's not a number.
-	start := lexer.currentPos - lexer.lastWidth
-	for {
-		r := lexer.next()
-		if r < '0' || r > '9' {
-			lexer.back()
-			break
-		}
-	}
-	value := lexer.expression[start:lexer.currentPos]
-	return token{
-		tokenType: tNumber,
-		value:     value,
-		position:  start,
-		length:    lexer.currentPos - start,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go
deleted file mode 100644
index 1240a17552..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/parser.go
+++ /dev/null
@@ -1,603 +0,0 @@
-package jmespath
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-type astNodeType int
-
-//go:generate stringer -type astNodeType
-const (
-	ASTEmpty astNodeType = iota
-	ASTComparator
-	ASTCurrentNode
-	ASTExpRef
-	ASTFunctionExpression
-	ASTField
-	ASTFilterProjection
-	ASTFlatten
-	ASTIdentity
-	ASTIndex
-	ASTIndexExpression
-	ASTKeyValPair
-	ASTLiteral
-	ASTMultiSelectHash
-	ASTMultiSelectList
-	ASTOrExpression
-	ASTAndExpression
-	ASTNotExpression
-	ASTPipe
-	ASTProjection
-	ASTSubexpression
-	ASTSlice
-	ASTValueProjection
-)
-
-// ASTNode represents the abstract syntax tree of a JMESPath expression.
-type ASTNode struct {
-	nodeType astNodeType
-	value    interface{}
-	children []ASTNode
-}
-
-func (node ASTNode) String() string {
-	return node.PrettyPrint(0)
-}
-
-// PrettyPrint will pretty print the parsed AST.
-// The AST is an implementation detail and this pretty print
-// function is provided as a convenience method to help with
-// debugging.  You should not rely on its output as the internal
-// structure of the AST may change at any time.
-func (node ASTNode) PrettyPrint(indent int) string {
-	spaces := strings.Repeat(" ", indent)
-	output := fmt.Sprintf("%s%s {\n", spaces, node.nodeType)
-	nextIndent := indent + 2
-	if node.value != nil {
-		if converted, ok := node.value.(fmt.Stringer); ok {
-			// Account for things like comparator nodes
-			// that are enums with a String() method.
-			output += fmt.Sprintf("%svalue: %s\n", strings.Repeat(" ", nextIndent), converted.String())
-		} else {
-			output += fmt.Sprintf("%svalue: %#v\n", strings.Repeat(" ", nextIndent), node.value)
-		}
-	}
-	lastIndex := len(node.children)
-	if lastIndex > 0 {
-		output += fmt.Sprintf("%schildren: {\n", strings.Repeat(" ", nextIndent))
-		childIndent := nextIndent + 2
-		for _, elem := range node.children {
-			output += elem.PrettyPrint(childIndent)
-		}
-	}
-	output += fmt.Sprintf("%s}\n", spaces)
-	return output
-}
-
-var bindingPowers = map[tokType]int{
-	tEOF:                0,
-	tUnquotedIdentifier: 0,
-	tQuotedIdentifier:   0,
-	tRbracket:           0,
-	tRparen:             0,
-	tComma:              0,
-	tRbrace:             0,
-	tNumber:             0,
-	tCurrent:            0,
-	tExpref:             0,
-	tColon:              0,
-	tPipe:               1,
-	tOr:                 2,
-	tAnd:                3,
-	tEQ:                 5,
-	tLT:                 5,
-	tLTE:                5,
-	tGT:                 5,
-	tGTE:                5,
-	tNE:                 5,
-	tFlatten:            9,
-	tStar:               20,
-	tFilter:             21,
-	tDot:                40,
-	tNot:                45,
-	tLbrace:             50,
-	tLbracket:           55,
-	tLparen:             60,
-}
-
-// Parser holds state about the current expression being parsed.
-type Parser struct {
-	expression string
-	tokens     []token
-	index      int
-}
-
-// NewParser creates a new JMESPath parser.
-func NewParser() *Parser {
-	p := Parser{}
-	return &p
-}
-
-// Parse will compile a JMESPath expression.
-func (p *Parser) Parse(expression string) (ASTNode, error) {
-	lexer := NewLexer()
-	p.expression = expression
-	p.index = 0
-	tokens, err := lexer.tokenize(expression)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	p.tokens = tokens
-	parsed, err := p.parseExpression(0)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	if p.current() != tEOF {
-		return ASTNode{}, p.syntaxError(fmt.Sprintf(
-			"Unexpected token at the end of the expresssion: %s", p.current()))
-	}
-	return parsed, nil
-}
-
-func (p *Parser) parseExpression(bindingPower int) (ASTNode, error) {
-	var err error
-	leftToken := p.lookaheadToken(0)
-	p.advance()
-	leftNode, err := p.nud(leftToken)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	currentToken := p.current()
-	for bindingPower < bindingPowers[currentToken] {
-		p.advance()
-		leftNode, err = p.led(currentToken, leftNode)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		currentToken = p.current()
-	}
-	return leftNode, nil
-}
-
-func (p *Parser) parseIndexExpression() (ASTNode, error) {
-	if p.lookahead(0) == tColon || p.lookahead(1) == tColon {
-		return p.parseSliceExpression()
-	}
-	indexStr := p.lookaheadToken(0).value
-	parsedInt, err := strconv.Atoi(indexStr)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	indexNode := ASTNode{nodeType: ASTIndex, value: parsedInt}
-	p.advance()
-	if err := p.match(tRbracket); err != nil {
-		return ASTNode{}, err
-	}
-	return indexNode, nil
-}
-
-func (p *Parser) parseSliceExpression() (ASTNode, error) {
-	parts := []*int{nil, nil, nil}
-	index := 0
-	current := p.current()
-	for current != tRbracket && index < 3 {
-		if current == tColon {
-			index++
-			p.advance()
-		} else if current == tNumber {
-			parsedInt, err := strconv.Atoi(p.lookaheadToken(0).value)
-			if err != nil {
-				return ASTNode{}, err
-			}
-			parts[index] = &parsedInt
-			p.advance()
-		} else {
-			return ASTNode{}, p.syntaxError(
-				"Expected tColon or tNumber" + ", received: " + p.current().String())
-		}
-		current = p.current()
-	}
-	if err := p.match(tRbracket); err != nil {
-		return ASTNode{}, err
-	}
-	return ASTNode{
-		nodeType: ASTSlice,
-		value:    parts,
-	}, nil
-}
-
-func (p *Parser) match(tokenType tokType) error {
-	if p.current() == tokenType {
-		p.advance()
-		return nil
-	}
-	return p.syntaxError("Expected " + tokenType.String() + ", received: " + p.current().String())
-}
-
-func (p *Parser) led(tokenType tokType, node ASTNode) (ASTNode, error) {
-	switch tokenType {
-	case tDot:
-		if p.current() != tStar {
-			right, err := p.parseDotRHS(bindingPowers[tDot])
-			return ASTNode{
-				nodeType: ASTSubexpression,
-				children: []ASTNode{node, right},
-			}, err
-		}
-		p.advance()
-		right, err := p.parseProjectionRHS(bindingPowers[tDot])
-		return ASTNode{
-			nodeType: ASTValueProjection,
-			children: []ASTNode{node, right},
-		}, err
-	case tPipe:
-		right, err := p.parseExpression(bindingPowers[tPipe])
-		return ASTNode{nodeType: ASTPipe, children: []ASTNode{node, right}}, err
-	case tOr:
-		right, err := p.parseExpression(bindingPowers[tOr])
-		return ASTNode{nodeType: ASTOrExpression, children: []ASTNode{node, right}}, err
-	case tAnd:
-		right, err := p.parseExpression(bindingPowers[tAnd])
-		return ASTNode{nodeType: ASTAndExpression, children: []ASTNode{node, right}}, err
-	case tLparen:
-		name := node.value
-		var args []ASTNode
-		for p.current() != tRparen {
-			expression, err := p.parseExpression(0)
-			if err != nil {
-				return ASTNode{}, err
-			}
-			if p.current() == tComma {
-				if err := p.match(tComma); err != nil {
-					return ASTNode{}, err
-				}
-			}
-			args = append(args, expression)
-		}
-		if err := p.match(tRparen); err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{
-			nodeType: ASTFunctionExpression,
-			value:    name,
-			children: args,
-		}, nil
-	case tFilter:
-		return p.parseFilter(node)
-	case tFlatten:
-		left := ASTNode{nodeType: ASTFlatten, children: []ASTNode{node}}
-		right, err := p.parseProjectionRHS(bindingPowers[tFlatten])
-		return ASTNode{
-			nodeType: ASTProjection,
-			children: []ASTNode{left, right},
-		}, err
-	case tEQ, tNE, tGT, tGTE, tLT, tLTE:
-		right, err := p.parseExpression(bindingPowers[tokenType])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{
-			nodeType: ASTComparator,
-			value:    tokenType,
-			children: []ASTNode{node, right},
-		}, nil
-	case tLbracket:
-		tokenType := p.current()
-		var right ASTNode
-		var err error
-		if tokenType == tNumber || tokenType == tColon {
-			right, err = p.parseIndexExpression()
-			if err != nil {
-				return ASTNode{}, err
-			}
-			return p.projectIfSlice(node, right)
-		}
-		// Otherwise this is a projection.
-		if err := p.match(tStar); err != nil {
-			return ASTNode{}, err
-		}
-		if err := p.match(tRbracket); err != nil {
-			return ASTNode{}, err
-		}
-		right, err = p.parseProjectionRHS(bindingPowers[tStar])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{
-			nodeType: ASTProjection,
-			children: []ASTNode{node, right},
-		}, nil
-	}
-	return ASTNode{}, p.syntaxError("Unexpected token: " + tokenType.String())
-}
-
-func (p *Parser) nud(token token) (ASTNode, error) {
-	switch token.tokenType {
-	case tJSONLiteral:
-		var parsed interface{}
-		err := json.Unmarshal([]byte(token.value), &parsed)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{nodeType: ASTLiteral, value: parsed}, nil
-	case tStringLiteral:
-		return ASTNode{nodeType: ASTLiteral, value: token.value}, nil
-	case tUnquotedIdentifier:
-		return ASTNode{
-			nodeType: ASTField,
-			value:    token.value,
-		}, nil
-	case tQuotedIdentifier:
-		node := ASTNode{nodeType: ASTField, value: token.value}
-		if p.current() == tLparen {
-			return ASTNode{}, p.syntaxErrorToken("Can't have quoted identifier as function name.", token)
-		}
-		return node, nil
-	case tStar:
-		left := ASTNode{nodeType: ASTIdentity}
-		var right ASTNode
-		var err error
-		if p.current() == tRbracket {
-			right = ASTNode{nodeType: ASTIdentity}
-		} else {
-			right, err = p.parseProjectionRHS(bindingPowers[tStar])
-		}
-		return ASTNode{nodeType: ASTValueProjection, children: []ASTNode{left, right}}, err
-	case tFilter:
-		return p.parseFilter(ASTNode{nodeType: ASTIdentity})
-	case tLbrace:
-		return p.parseMultiSelectHash()
-	case tFlatten:
-		left := ASTNode{
-			nodeType: ASTFlatten,
-			children: []ASTNode{{nodeType: ASTIdentity}},
-		}
-		right, err := p.parseProjectionRHS(bindingPowers[tFlatten])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{nodeType: ASTProjection, children: []ASTNode{left, right}}, nil
-	case tLbracket:
-		tokenType := p.current()
-		//var right ASTNode
-		if tokenType == tNumber || tokenType == tColon {
-			right, err := p.parseIndexExpression()
-			if err != nil {
-				return ASTNode{}, nil
-			}
-			return p.projectIfSlice(ASTNode{nodeType: ASTIdentity}, right)
-		} else if tokenType == tStar && p.lookahead(1) == tRbracket {
-			p.advance()
-			p.advance()
-			right, err := p.parseProjectionRHS(bindingPowers[tStar])
-			if err != nil {
-				return ASTNode{}, err
-			}
-			return ASTNode{
-				nodeType: ASTProjection,
-				children: []ASTNode{{nodeType: ASTIdentity}, right},
-			}, nil
-		} else {
-			return p.parseMultiSelectList()
-		}
-	case tCurrent:
-		return ASTNode{nodeType: ASTCurrentNode}, nil
-	case tExpref:
-		expression, err := p.parseExpression(bindingPowers[tExpref])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{nodeType: ASTExpRef, children: []ASTNode{expression}}, nil
-	case tNot:
-		expression, err := p.parseExpression(bindingPowers[tNot])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{nodeType: ASTNotExpression, children: []ASTNode{expression}}, nil
-	case tLparen:
-		expression, err := p.parseExpression(0)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		if err := p.match(tRparen); err != nil {
-			return ASTNode{}, err
-		}
-		return expression, nil
-	case tEOF:
-		return ASTNode{}, p.syntaxErrorToken("Incomplete expression", token)
-	}
-
-	return ASTNode{}, p.syntaxErrorToken("Invalid token: "+token.tokenType.String(), token)
-}
-
-func (p *Parser) parseMultiSelectList() (ASTNode, error) {
-	var expressions []ASTNode
-	for {
-		expression, err := p.parseExpression(0)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		expressions = append(expressions, expression)
-		if p.current() == tRbracket {
-			break
-		}
-		err = p.match(tComma)
-		if err != nil {
-			return ASTNode{}, err
-		}
-	}
-	err := p.match(tRbracket)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	return ASTNode{
-		nodeType: ASTMultiSelectList,
-		children: expressions,
-	}, nil
-}
-
-func (p *Parser) parseMultiSelectHash() (ASTNode, error) {
-	var children []ASTNode
-	for {
-		keyToken := p.lookaheadToken(0)
-		if err := p.match(tUnquotedIdentifier); err != nil {
-			if err := p.match(tQuotedIdentifier); err != nil {
-				return ASTNode{}, p.syntaxError("Expected tQuotedIdentifier or tUnquotedIdentifier")
-			}
-		}
-		keyName := keyToken.value
-		err := p.match(tColon)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		value, err := p.parseExpression(0)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		node := ASTNode{
-			nodeType: ASTKeyValPair,
-			value:    keyName,
-			children: []ASTNode{value},
-		}
-		children = append(children, node)
-		if p.current() == tComma {
-			err := p.match(tComma)
-			if err != nil {
-				return ASTNode{}, nil
-			}
-		} else if p.current() == tRbrace {
-			err := p.match(tRbrace)
-			if err != nil {
-				return ASTNode{}, nil
-			}
-			break
-		}
-	}
-	return ASTNode{
-		nodeType: ASTMultiSelectHash,
-		children: children,
-	}, nil
-}
-
-func (p *Parser) projectIfSlice(left ASTNode, right ASTNode) (ASTNode, error) {
-	indexExpr := ASTNode{
-		nodeType: ASTIndexExpression,
-		children: []ASTNode{left, right},
-	}
-	if right.nodeType == ASTSlice {
-		right, err := p.parseProjectionRHS(bindingPowers[tStar])
-		return ASTNode{
-			nodeType: ASTProjection,
-			children: []ASTNode{indexExpr, right},
-		}, err
-	}
-	return indexExpr, nil
-}
-func (p *Parser) parseFilter(node ASTNode) (ASTNode, error) {
-	var right, condition ASTNode
-	var err error
-	condition, err = p.parseExpression(0)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	if err := p.match(tRbracket); err != nil {
-		return ASTNode{}, err
-	}
-	if p.current() == tFlatten {
-		right = ASTNode{nodeType: ASTIdentity}
-	} else {
-		right, err = p.parseProjectionRHS(bindingPowers[tFilter])
-		if err != nil {
-			return ASTNode{}, err
-		}
-	}
-
-	return ASTNode{
-		nodeType: ASTFilterProjection,
-		children: []ASTNode{node, right, condition},
-	}, nil
-}
-
-func (p *Parser) parseDotRHS(bindingPower int) (ASTNode, error) {
-	lookahead := p.current()
-	if tokensOneOf([]tokType{tQuotedIdentifier, tUnquotedIdentifier, tStar}, lookahead) {
-		return p.parseExpression(bindingPower)
-	} else if lookahead == tLbracket {
-		if err := p.match(tLbracket); err != nil {
-			return ASTNode{}, err
-		}
-		return p.parseMultiSelectList()
-	} else if lookahead == tLbrace {
-		if err := p.match(tLbrace); err != nil {
-			return ASTNode{}, err
-		}
-		return p.parseMultiSelectHash()
-	}
-	return ASTNode{}, p.syntaxError("Expected identifier, lbracket, or lbrace")
-}
-
-func (p *Parser) parseProjectionRHS(bindingPower int) (ASTNode, error) {
-	current := p.current()
-	if bindingPowers[current] < 10 {
-		return ASTNode{nodeType: ASTIdentity}, nil
-	} else if current == tLbracket {
-		return p.parseExpression(bindingPower)
-	} else if current == tFilter {
-		return p.parseExpression(bindingPower)
-	} else if current == tDot {
-		err := p.match(tDot)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return p.parseDotRHS(bindingPower)
-	} else {
-		return ASTNode{}, p.syntaxError("Error")
-	}
-}
-
-func (p *Parser) lookahead(number int) tokType {
-	return p.lookaheadToken(number).tokenType
-}
-
-func (p *Parser) current() tokType {
-	return p.lookahead(0)
-}
-
-func (p *Parser) lookaheadToken(number int) token {
-	return p.tokens[p.index+number]
-}
-
-func (p *Parser) advance() {
-	p.index++
-}
-
-func tokensOneOf(elements []tokType, token tokType) bool {
-	for _, elem := range elements {
-		if elem == token {
-			return true
-		}
-	}
-	return false
-}
-
-func (p *Parser) syntaxError(msg string) SyntaxError {
-	return SyntaxError{
-		msg:        msg,
-		Expression: p.expression,
-		Offset:     p.lookaheadToken(0).position,
-	}
-}
-
-// Create a SyntaxError based on the provided token.
-// This differs from syntaxError() which creates a SyntaxError
-// based on the current lookahead token.
-func (p *Parser) syntaxErrorToken(msg string, t token) SyntaxError {
-	return SyntaxError{
-		msg:        msg,
-		Expression: p.expression,
-		Offset:     t.position,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go
deleted file mode 100644
index dae79cbdf3..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/toktype_string.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by stringer -type=tokType; DO NOT EDIT
-
-package jmespath
-
-import "fmt"
-
-const _tokType_name = "tUnknowntStartDottFiltertFlattentLparentRparentLbrackettRbrackettLbracetRbracetOrtPipetNumbertUnquotedIdentifiertQuotedIdentifiertCommatColontLTtLTEtGTtGTEtEQtNEtJSONLiteraltStringLiteraltCurrenttExpreftAndtNottEOF"
-
-var _tokType_index = [...]uint8{0, 8, 13, 17, 24, 32, 39, 46, 55, 64, 71, 78, 81, 86, 93, 112, 129, 135, 141, 144, 148, 151, 155, 158, 161, 173, 187, 195, 202, 206, 210, 214}
-
-func (i tokType) String() string {
-	if i < 0 || i >= tokType(len(_tokType_index)-1) {
-		return fmt.Sprintf("tokType(%d)", i)
-	}
-	return _tokType_name[_tokType_index[i]:_tokType_index[i+1]]
-}
diff --git a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go b/Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go
deleted file mode 100644
index ddc1b7d7d4..0000000000
--- a/Godeps/_workspace/src/github.com/jmespath/go-jmespath/util.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package jmespath
-
-import (
-	"errors"
-	"reflect"
-)
-
-// IsFalse determines if an object is false based on the JMESPath spec.
-// JMESPath defines false values to be any of:
-// - An empty string array, or hash.
-// - The boolean value false.
-// - nil
-func isFalse(value interface{}) bool {
-	switch v := value.(type) {
-	case bool:
-		return !v
-	case []interface{}:
-		return len(v) == 0
-	case map[string]interface{}:
-		return len(v) == 0
-	case string:
-		return len(v) == 0
-	case nil:
-		return true
-	}
-	// Try the reflection cases before returning false.
-	rv := reflect.ValueOf(value)
-	switch rv.Kind() {
-	case reflect.Struct:
-		// A struct type will never be false, even if
-		// all of its values are the zero type.
-		return false
-	case reflect.Slice, reflect.Map:
-		return rv.Len() == 0
-	case reflect.Ptr:
-		if rv.IsNil() {
-			return true
-		}
-		// If it's a pointer type, we'll try to deref the pointer
-		// and evaluate the pointer value for isFalse.
-		element := rv.Elem()
-		return isFalse(element.Interface())
-	}
-	return false
-}
-
-// ObjsEqual is a generic object equality check.
-// It will take two arbitrary objects and recursively determine
-// if they are equal.
-func objsEqual(left interface{}, right interface{}) bool {
-	return reflect.DeepEqual(left, right)
-}
-
-// SliceParam refers to a single part of a slice.
-// A slice consists of a start, a stop, and a step, similar to
-// python slices.
-type sliceParam struct {
-	N         int
-	Specified bool
-}
-
-// Slice supports [start:stop:step] style slicing that's supported in JMESPath.
-func slice(slice []interface{}, parts []sliceParam) ([]interface{}, error) {
-	computed, err := computeSliceParams(len(slice), parts)
-	if err != nil {
-		return nil, err
-	}
-	start, stop, step := computed[0], computed[1], computed[2]
-	result := []interface{}{}
-	if step > 0 {
-		for i := start; i < stop; i += step {
-			result = append(result, slice[i])
-		}
-	} else {
-		for i := start; i > stop; i += step {
-			result = append(result, slice[i])
-		}
-	}
-	return result, nil
-}
-
-func computeSliceParams(length int, parts []sliceParam) ([]int, error) {
-	var start, stop, step int
-	if !parts[2].Specified {
-		step = 1
-	} else if parts[2].N == 0 {
-		return nil, errors.New("Invalid slice, step cannot be 0")
-	} else {
-		step = parts[2].N
-	}
-	var stepValueNegative bool
-	if step < 0 {
-		stepValueNegative = true
-	} else {
-		stepValueNegative = false
-	}
-
-	if !parts[0].Specified {
-		if stepValueNegative {
-			start = length - 1
-		} else {
-			start = 0
-		}
-	} else {
-		start = capSlice(length, parts[0].N, step)
-	}
-
-	if !parts[1].Specified {
-		if stepValueNegative {
-			stop = -1
-		} else {
-			stop = length
-		}
-	} else {
-		stop = capSlice(length, parts[1].N, step)
-	}
-	return []int{start, stop, step}, nil
-}
-
-func capSlice(length int, actual int, step int) int {
-	if actual < 0 {
-		actual += length
-		if actual < 0 {
-			if step < 0 {
-				actual = -1
-			} else {
-				actual = 0
-			}
-		}
-	} else if actual >= length {
-		if step < 0 {
-			actual = length - 1
-		} else {
-			actual = length
-		}
-	}
-	return actual
-}
-
-// ToArrayNum converts an empty interface type to a slice of float64.
-// If any element in the array cannot be converted, then nil is returned
-// along with a second value of false.
-func toArrayNum(data interface{}) ([]float64, bool) {
-	// Is there a better way to do this with reflect?
-	if d, ok := data.([]interface{}); ok {
-		result := make([]float64, len(d))
-		for i, el := range d {
-			item, ok := el.(float64)
-			if !ok {
-				return nil, false
-			}
-			result[i] = item
-		}
-		return result, true
-	}
-	return nil, false
-}
-
-// ToArrayStr converts an empty interface type to a slice of strings.
-// If any element in the array cannot be converted, then nil is returned
-// along with a second value of false.  If the input data could be entirely
-// converted, then the converted data, along with a second value of true,
-// will be returned.
-func toArrayStr(data interface{}) ([]string, bool) {
-	// Is there a better way to do this with reflect?
-	if d, ok := data.([]interface{}); ok {
-		result := make([]string, len(d))
-		for i, el := range d {
-			item, ok := el.(string)
-			if !ok {
-				return nil, false
-			}
-			result[i] = item
-		}
-		return result, true
-	}
-	return nil, false
-}
-
-func isSliceType(v interface{}) bool {
-	if v == nil {
-		return false
-	}
-	return reflect.TypeOf(v).Kind() == reflect.Slice
-}
diff --git a/Godeps/_workspace/src/github.com/kballard/go-shellquote/LICENSE b/Godeps/_workspace/src/github.com/kballard/go-shellquote/LICENSE
deleted file mode 100644
index a6d77312e1..0000000000
--- a/Godeps/_workspace/src/github.com/kballard/go-shellquote/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2014 Kevin Ballard
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/kballard/go-shellquote/README b/Godeps/_workspace/src/github.com/kballard/go-shellquote/README
deleted file mode 100644
index 4d34e87afc..0000000000
--- a/Godeps/_workspace/src/github.com/kballard/go-shellquote/README
+++ /dev/null
@@ -1,36 +0,0 @@
-PACKAGE
-
-package shellquote
-    import "github.com/kballard/go-shellquote"
-
-    Shellquote provides utilities for joining/splitting strings using sh's
-    word-splitting rules.
-
-VARIABLES
-
-var (
-    UnterminatedSingleQuoteError = errors.New("Unterminated single-quoted string")
-    UnterminatedDoubleQuoteError = errors.New("Unterminated double-quoted string")
-    UnterminatedEscapeError      = errors.New("Unterminated backslash-escape")
-)
-
-
-FUNCTIONS
-
-func Join(args ...string) string
-    Join quotes each argument and joins them with a space. If passed to
-    /bin/sh, the resulting string will be split back into the original
-    arguments.
-
-func Split(input string) (words []string, err error)
-    Split splits a string according to /bin/sh's word-splitting rules. It
-    supports backslash-escapes, single-quotes, and double-quotes. Notably it
-    does not support the $'' style of quoting. It also doesn't attempt to
-    perform any other sort of expansion, including brace expansion, shell
-    expansion, or pathname expansion.
-
-    If the given input has an unterminated quoted string or ends in a
-    backslash-escape, one of UnterminatedSingleQuoteError,
-    UnterminatedDoubleQuoteError, or UnterminatedEscapeError is returned.
-
-
diff --git a/Godeps/_workspace/src/github.com/kballard/go-shellquote/doc.go b/Godeps/_workspace/src/github.com/kballard/go-shellquote/doc.go
deleted file mode 100644
index 9445fa4ad9..0000000000
--- a/Godeps/_workspace/src/github.com/kballard/go-shellquote/doc.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// Shellquote provides utilities for joining/splitting strings using sh's
-// word-splitting rules.
-package shellquote
diff --git a/Godeps/_workspace/src/github.com/kballard/go-shellquote/quote.go b/Godeps/_workspace/src/github.com/kballard/go-shellquote/quote.go
deleted file mode 100644
index f6cacee0f9..0000000000
--- a/Godeps/_workspace/src/github.com/kballard/go-shellquote/quote.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package shellquote
-
-import (
-	"bytes"
-	"strings"
-	"unicode/utf8"
-)
-
-// Join quotes each argument and joins them with a space.
-// If passed to /bin/sh, the resulting string will be split back into the
-// original arguments.
-func Join(args ...string) string {
-	var buf bytes.Buffer
-	for i, arg := range args {
-		if i != 0 {
-			buf.WriteByte(' ')
-		}
-		quote(arg, &buf)
-	}
-	return buf.String()
-}
-
-const (
-	specialChars      = "\\'\"`${[|&;<>()*?!"
-	extraSpecialChars = " \t\n"
-	prefixChars       = "~"
-)
-
-func quote(word string, buf *bytes.Buffer) {
-	// We want to try to produce a "nice" output. As such, we will
-	// backslash-escape most characters, but if we encounter a space, or if we
-	// encounter an extra-special char (which doesn't work with
-	// backslash-escaping) we switch over to quoting the whole word. We do this
-	// with a space because it's typically easier for people to read multi-word
-	// arguments when quoted with a space rather than with ugly backslashes
-	// everywhere.
-	origLen := buf.Len()
-
-	if len(word) == 0 {
-		// oops, no content
-		buf.WriteString("''")
-		return
-	}
-
-	cur, prev := word, word
-	atStart := true
-	for len(cur) > 0 {
-		c, l := utf8.DecodeRuneInString(cur)
-		cur = cur[l:]
-		if strings.ContainsRune(specialChars, c) || (atStart && strings.ContainsRune(prefixChars, c)) {
-			// copy the non-special chars up to this point
-			if len(cur) < len(prev) {
-				buf.WriteString(word[0 : len(prev)-len(cur)-l])
-			}
-			buf.WriteByte('\\')
-			buf.WriteRune(c)
-			prev = cur
-		} else if strings.ContainsRune(extraSpecialChars, c) {
-			// start over in quote mode
-			buf.Truncate(origLen)
-			goto quote
-		}
-		atStart = false
-	}
-	if len(prev) > 0 {
-		buf.WriteString(prev)
-	}
-	return
-
-quote:
-	// quote mode
-	// Use single-quotes, but if we find a single-quote in the word, we need
-	// to terminate the string, emit an escaped quote, and start the string up
-	// again
-	inQuote := false
-	for len(word) > 0 {
-		i := strings.IndexRune(word, '\'')
-		if i == -1 {
-			break
-		}
-		if i > 0 {
-			if !inQuote {
-				buf.WriteByte('\'')
-				inQuote = true
-			}
-			buf.WriteString(word[0:i])
-			word = word[i+1:]
-		}
-		if inQuote {
-			buf.WriteByte('\'')
-			inQuote = false
-		}
-		buf.WriteString("\\'")
-	}
-	if len(word) > 0 {
-		if !inQuote {
-			buf.WriteByte('\'')
-		}
-		buf.WriteString(word)
-		buf.WriteByte('\'')
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/kballard/go-shellquote/unquote.go b/Godeps/_workspace/src/github.com/kballard/go-shellquote/unquote.go
deleted file mode 100644
index ba3a0f2271..0000000000
--- a/Godeps/_workspace/src/github.com/kballard/go-shellquote/unquote.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package shellquote
-
-import (
-	"bytes"
-	"errors"
-	"strings"
-	"unicode/utf8"
-)
-
-var (
-	UnterminatedSingleQuoteError = errors.New("Unterminated single-quoted string")
-	UnterminatedDoubleQuoteError = errors.New("Unterminated double-quoted string")
-	UnterminatedEscapeError      = errors.New("Unterminated backslash-escape")
-)
-
-var (
-	splitChars        = " \n\t"
-	singleChar        = '\''
-	doubleChar        = '"'
-	escapeChar        = '\\'
-	doubleEscapeChars = "$`\"\n\\"
-)
-
-// Split splits a string according to /bin/sh's word-splitting rules. It
-// supports backslash-escapes, single-quotes, and double-quotes. Notably it does
-// not support the $'' style of quoting. It also doesn't attempt to perform any
-// other sort of expansion, including brace expansion, shell expansion, or
-// pathname expansion.
-//
-// If the given input has an unterminated quoted string or ends in a
-// backslash-escape, one of UnterminatedSingleQuoteError,
-// UnterminatedDoubleQuoteError, or UnterminatedEscapeError is returned.
-func Split(input string) (words []string, err error) {
-	var buf bytes.Buffer
-	words = make([]string, 0)
-
-	for len(input) > 0 {
-		// skip any splitChars at the start
-		c, l := utf8.DecodeRuneInString(input)
-		if strings.ContainsRune(splitChars, c) {
-			input = input[l:]
-			continue
-		}
-
-		var word string
-		word, input, err = splitWord(input, &buf)
-		if err != nil {
-			return
-		}
-		words = append(words, word)
-	}
-	return
-}
-
-func splitWord(input string, buf *bytes.Buffer) (word string, remainder string, err error) {
-	buf.Reset()
-
-raw:
-	{
-		cur := input
-		for len(cur) > 0 {
-			c, l := utf8.DecodeRuneInString(cur)
-			cur = cur[l:]
-			if c == singleChar {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				input = cur
-				goto single
-			} else if c == doubleChar {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				input = cur
-				goto double
-			} else if c == escapeChar {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				input = cur
-				goto escape
-			} else if strings.ContainsRune(splitChars, c) {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				return buf.String(), cur, nil
-			}
-		}
-		if len(input) > 0 {
-			buf.WriteString(input)
-			input = ""
-		}
-		goto done
-	}
-
-escape:
-	{
-		if len(input) == 0 {
-			return "", "", UnterminatedEscapeError
-		}
-		c, l := utf8.DecodeRuneInString(input)
-		if c == '\n' {
-			// a backslash-escaped newline is elided from the output entirely
-		} else {
-			buf.WriteString(input[:l])
-		}
-		input = input[l:]
-	}
-	goto raw
-
-single:
-	{
-		i := strings.IndexRune(input, singleChar)
-		if i == -1 {
-			return "", "", UnterminatedSingleQuoteError
-		}
-		buf.WriteString(input[0:i])
-		input = input[i+1:]
-		goto raw
-	}
-
-double:
-	{
-		cur := input
-		for len(cur) > 0 {
-			c, l := utf8.DecodeRuneInString(cur)
-			cur = cur[l:]
-			if c == doubleChar {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				input = cur
-				goto raw
-			} else if c == escapeChar {
-				// bash only supports certain escapes in double-quoted strings
-				c2, l2 := utf8.DecodeRuneInString(cur)
-				cur = cur[l2:]
-				if strings.ContainsRune(doubleEscapeChars, c2) {
-					buf.WriteString(input[0 : len(input)-len(cur)-l-l2])
-					if c2 == '\n' {
-						// newline is special, skip the backslash entirely
-					} else {
-						buf.WriteRune(c2)
-					}
-					input = cur
-				}
-			}
-		}
-		return "", "", UnterminatedDoubleQuoteError
-	}
-
-done:
-	return buf.String(), input, nil
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/LICENSE b/Godeps/_workspace/src/github.com/klauspost/compress/LICENSE
deleted file mode 100644
index 7448756763..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/copy.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/copy.go
deleted file mode 100644
index a3200a8f49..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/copy.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package flate
-
-// forwardCopy is like the built-in copy function except that it always goes
-// forward from the start, even if the dst and src overlap.
-// It is equivalent to:
-//   for i := 0; i < n; i++ {
-//     mem[dst+i] = mem[src+i]
-//   }
-func forwardCopy(mem []byte, dst, src, n int) {
-	if dst <= src {
-		copy(mem[dst:dst+n], mem[src:src+n])
-		return
-	}
-	for {
-		if dst >= src+n {
-			copy(mem[dst:dst+n], mem[src:src+n])
-			return
-		}
-		// There is some forward overlap.  The destination
-		// will be filled with a repeated pattern of mem[src:src+k].
-		// We copy one instance of the pattern here, then repeat.
-		// Each time around this loop k will double.
-		k := dst - src
-		copy(mem[dst:dst+k], mem[src:src+k])
-		n -= k
-		dst += k
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.go
deleted file mode 100644
index 45d52f629c..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.go
+++ /dev/null
@@ -1,39 +0,0 @@
-//+build !noasm
-//+build !appengine
-
-// Copyright 2015, Klaus Post, see LICENSE for details.
-
-package flate
-
-import (
-	"github.com/klauspost/cpuid"
-)
-
-// crc32sse returns a hash for the first 4 bytes of the slice
-// len(a) must be >= 4.
-//go:noescape
-func crc32sse(a []byte) hash
-
-// crc32sseAll calculates hashes for each 4-byte set in a.
-// dst must be east len(a) - 4 in size.
-// The size is not checked by the assembly.
-//go:noescape
-func crc32sseAll(a []byte, dst []hash)
-
-// matchLenSSE4 returns the number of matching bytes in a and b
-// up to length 'max'. Both slices must be at least 'max'
-// bytes in size.
-// It uses the PCMPESTRI SSE 4.2 instruction.
-//go:noescape
-func matchLenSSE4(a, b []byte, max int) int
-
-// histogram accumulates a histogram of b in h.
-// h must be at least 256 entries in length,
-// and must be cleared before calling this function.
-//go:noescape
-func histogram(b []byte, h []int32)
-
-// Detect SSE 4.2 feature.
-func init() {
-	useSSE42 = cpuid.CPU.SSE42()
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.s b/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.s
deleted file mode 100644
index 0212360d66..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_amd64.s
+++ /dev/null
@@ -1,218 +0,0 @@
-//+build !noasm !appengine
-
-// Copyright 2015, Klaus Post, see LICENSE for details.
-
-// func crc32sse(a []byte) hash
-TEXT ·crc32sse(SB), 7, $0
-	MOVQ a+0(FP), R10
-	XORQ BX, BX
-
-	// CRC32   dword (R10), EBX
-	BYTE $0xF2; BYTE $0x41; BYTE $0x0f
-	BYTE $0x38; BYTE $0xf1; BYTE $0x1a
-
-	MOVL BX, ret+24(FP)
-	RET
-
-// func crc32sseAll(a []byte, dst []hash)
-TEXT ·crc32sseAll(SB), 7, $0
-	MOVQ  a+0(FP), R8      // R8: src
-	MOVQ  a_len+8(FP), R10 // input length
-	MOVQ  dst+24(FP), R9   // R9: dst
-	SUBQ  $4, R10
-	JS    end
-	JZ    one_crc
-	MOVQ  R10, R13
-	SHRQ  $2, R10          // len/4
-	ANDQ  $3, R13          // len&3
-	XORQ  BX, BX
-	ADDQ  $1, R13
-	TESTQ R10, R10
-	JZ    rem_loop
-
-crc_loop:
-	MOVQ (R8), R11
-	XORQ BX, BX
-	XORQ DX, DX
-	XORQ DI, DI
-	MOVQ R11, R12
-	SHRQ $8, R11
-	MOVQ R12, AX
-	MOVQ R11, CX
-	SHRQ $16, R12
-	SHRQ $16, R11
-	MOVQ R12, SI
-
-	// CRC32   EAX, EBX
-	BYTE $0xF2; BYTE $0x0f
-	BYTE $0x38; BYTE $0xf1; BYTE $0xd8
-
-	// CRC32   ECX, EDX
-	BYTE $0xF2; BYTE $0x0f
-	BYTE $0x38; BYTE $0xf1; BYTE $0xd1
-
-	// CRC32   ESI, EDI
-	BYTE $0xF2; BYTE $0x0f
-	BYTE $0x38; BYTE $0xf1; BYTE $0xfe
-	MOVL BX, (R9)
-	MOVL DX, 4(R9)
-	MOVL DI, 8(R9)
-
-	XORQ BX, BX
-	MOVL R11, AX
-
-	// CRC32   EAX, EBX
-	BYTE $0xF2; BYTE $0x0f
-	BYTE $0x38; BYTE $0xf1; BYTE $0xd8
-	MOVL BX, 12(R9)
-
-	ADDQ $16, R9
-	ADDQ $4, R8
-	XORQ BX, BX
-	SUBQ $1, R10
-	JNZ  crc_loop
-
-rem_loop:
-	MOVL (R8), AX
-
-	// CRC32   EAX, EBX
-	BYTE $0xF2; BYTE $0x0f
-	BYTE $0x38; BYTE $0xf1; BYTE $0xd8
-
-	MOVL BX, (R9)
-	ADDQ $4, R9
-	ADDQ $1, R8
-	XORQ BX, BX
-	SUBQ $1, R13
-	JNZ  rem_loop
-
-end:
-	RET
-
-one_crc:
-	MOVQ $1, R13
-	XORQ BX, BX
-	JMP  rem_loop
-
-// func matchLenSSE4(a, b []byte, max int) int
-TEXT ·matchLenSSE4(SB), 7, $0
-	MOVQ  a+0(FP), SI        // RSI: &a
-	MOVQ  b+24(FP), DI       // RDI: &b
-	MOVQ  max+48(FP), R10    // R10: max
-	XORQ  R11, R11           // R11: match length
-	MOVQ  R10, R12           // R12: Remainder
-	SHRQ  $4, R10            // max / 16
-	MOVQ  $16, AX            // Set length for PCMPESTRI
-	MOVQ  $16, DX            // Set length for PCMPESTRI
-	ANDQ  $15, R12           // max & 15
-	TESTQ R10, R10
-	JZ    matchlen_verysmall
-
-loopback_matchlen:
-	MOVOU (SI), X0 // a[x]
-	MOVOU (DI), X1 // b[x]
-
-	// PCMPESTRI $0x18, X1, X0
-	// 0x18 = _SIDD_UBYTE_OPS (0x0) | _SIDD_CMP_EQUAL_EACH (0x8) | _SIDD_NEGATIVE_POLARITY (0x10)
-	BYTE $0x66; BYTE $0x0f; BYTE $0x3a
-	BYTE $0x61; BYTE $0xc1; BYTE $0x18
-
-	JC match_ended
-
-	ADDQ $16, SI
-	ADDQ $16, DI
-	ADDQ $16, R11
-
-	SUBQ $1, R10
-	JNZ  loopback_matchlen
-
-	// Check the remainder using REP CMPSB
-matchlen_verysmall:
-	TESTQ R12, R12
-	JZ    done_matchlen
-	MOVQ  R12, CX
-	ADDQ  R12, R11
-
-	// Compare CX bytes at [SI] [DI]
-	// Subtract one from CX for every match.
-	// Terminates when CX is zero (checked pre-compare)
-	CLD
-	REP; CMPSB
-
-	// Check if last was a match.
-	JZ done_matchlen
-
-	// Subtract remanding bytes.
-	SUBQ CX, R11
-	SUBQ $1, R11
-	MOVQ R11, ret+56(FP)
-	RET
-
-match_ended:
-	ADDQ CX, R11
-
-done_matchlen:
-	MOVQ R11, ret+56(FP)
-	RET
-
-// func histogram(b []byte, h []int32)
-TEXT ·histogram(SB), 7, $0
-	MOVQ b+0(FP), SI     // SI: &b
-	MOVQ b_len+8(FP), R9 // R9: len(b)
-	MOVQ h+24(FP), DI    // DI: Histogram
-	MOVQ R9, R8
-	SHRQ $3, R8
-	JZ   hist1
-	XORQ R11, R11
-
-loop_hist8:
-	MOVQ (SI), R10
-
-	MOVB R10, R11
-	INCL (DI)(R11*4)
-	SHRQ $8, R10
-
-	MOVB R10, R11
-	INCL (DI)(R11*4)
-	SHRQ $8, R10
-
-	MOVB R10, R11
-	INCL (DI)(R11*4)
-	SHRQ $8, R10
-
-	MOVB R10, R11
-	INCL (DI)(R11*4)
-	SHRQ $8, R10
-
-	MOVB R10, R11
-	INCL (DI)(R11*4)
-	SHRQ $8, R10
-
-	MOVB R10, R11
-	INCL (DI)(R11*4)
-	SHRQ $8, R10
-
-	MOVB R10, R11
-	INCL (DI)(R11*4)
-	SHRQ $8, R10
-
-	INCL (DI)(R10*4)
-
-	ADDQ $8, SI
-	DECQ R8
-	JNZ  loop_hist8
-
-hist1:
-	ANDQ $7, R9
-	JZ   end_hist
-	XORQ R10, R10
-
-loop_hist1:
-	MOVB (SI), R10
-	INCL (DI)(R10*4)
-	INCQ SI
-	DECQ R9
-	JNZ  loop_hist1
-
-end_hist:
-	RET
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_noasm.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_noasm.go
deleted file mode 100644
index 1c6d23eed6..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/crc32_noasm.go
+++ /dev/null
@@ -1,34 +0,0 @@
-//+build !amd64 noasm appengine
-
-// Copyright 2015, Klaus Post, see LICENSE for details.
-
-package flate
-
-func init() {
-	useSSE42 = false
-}
-
-// crc32sse should never be called.
-func crc32sse(a []byte) hash {
-	panic("no assembler")
-}
-
-// crc32sseAll should never be called.
-func crc32sseAll(a []byte, dst []hash) {
-	panic("no assembler")
-}
-
-// matchLenSSE4 should never be called.
-func matchLenSSE4(a, b []byte, max int) int {
-	panic("no assembler")
-	return 0
-}
-
-// histogram accumulates a histogram of b in h.
-// h must be at least 256 entries in length,
-// and must be cleared before calling this function.
-func histogram(b []byte, h []int32) {
-	for _, t := range b {
-		h[t]++
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/deflate.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/deflate.go
deleted file mode 100644
index b1efa677a5..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/deflate.go
+++ /dev/null
@@ -1,1358 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Copyright (c) 2015 Klaus Post
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package flate
-
-import (
-	"fmt"
-	"io"
-	"math"
-)
-
-const (
-	NoCompression       = 0
-	BestSpeed           = 1
-	BestCompression     = 9
-	DefaultCompression  = -1
-	ConstantCompression = -2 // Does only Huffman encoding
-	logWindowSize       = 15
-	windowSize          = 1 << logWindowSize
-	windowMask          = windowSize - 1
-	logMaxOffsetSize    = 15  // Standard DEFLATE
-	minMatchLength      = 4   // The smallest match that the compressor looks for
-	maxMatchLength      = 258 // The longest match for the compressor
-	minOffsetSize       = 1   // The shortest offset that makes any sense
-
-	// The maximum number of tokens we put into a single flat block, just too
-	// stop things from getting too large.
-	maxFlateBlockTokens = 1 << 14
-	maxStoreBlockSize   = 65535
-	hashBits            = 17 // After 17 performance degrades
-	hashSize            = 1 << hashBits
-	hashMask            = (1 << hashBits) - 1
-	hashShift           = (hashBits + minMatchLength - 1) / minMatchLength
-	maxHashOffset       = 1 << 24
-
-	skipNever = math.MaxInt32
-)
-
-var useSSE42 bool
-
-type compressionLevel struct {
-	good, lazy, nice, chain, fastSkipHashing, level int
-}
-
-// Compression levels have been rebalanced from zlib deflate defaults
-// to give a bigger spread in speed and compression.
-// See https://blog.klauspost.com/rebalancing-deflate-compression-levels/
-var levels = []compressionLevel{
-	{}, // 0
-	// Level 1+2 uses snappy algorithm - values not used
-	{0, 0, 0, 0, 0, 1},
-	{0, 0, 0, 0, 0, 2},
-	// For levels 3-6 we don't bother trying with lazy matches.
-	// Lazy matching is at least 30% slower, with 1.5% increase.
-	{4, 0, 8, 4, 4, 3},
-	{4, 0, 12, 6, 5, 4},
-	{6, 0, 24, 16, 6, 5},
-	{8, 0, 32, 32, 7, 6},
-	// Levels 7-9 use increasingly more lazy matching
-	// and increasingly stringent conditions for "good enough".
-	{4, 8, 16, 16, skipNever, 7},
-	{6, 16, 32, 64, skipNever, 8},
-	{32, 258, 258, 4096, skipNever, 9},
-}
-
-type hashid uint32
-
-type compressor struct {
-	compressionLevel
-
-	w          *huffmanBitWriter
-	bulkHasher func([]byte, []hash)
-
-	// compression algorithm
-	fill func(*compressor, []byte) int // copy data to window
-	step func(*compressor)             // process window
-	sync bool                          // requesting flush
-
-	// Input hash chains
-	// hashHead[hashValue] contains the largest inputIndex with the specified hash value
-	// If hashHead[hashValue] is within the current window, then
-	// hashPrev[hashHead[hashValue] & windowMask] contains the previous index
-	// with the same hash value.
-	chainHead  int
-	hashHead   []hashid
-	hashPrev   []hashid
-	hashOffset int
-
-	// input window: unprocessed data is window[index:windowEnd]
-	index         int
-	window        []byte
-	windowEnd     int
-	blockStart    int  // window index where current tokens start
-	byteAvailable bool // if true, still need to process window[index-1].
-
-	// queued output tokens
-	tokens tokens
-
-	// deflate state
-	length         int
-	offset         int
-	hash           hash
-	maxInsertIndex int
-	err            error
-	ii             uint16 // position of last match, intended to overflow to reset.
-
-	snap      snappyEnc
-	hashMatch [maxMatchLength + minMatchLength]hash
-}
-
-type hash int32
-
-func (d *compressor) fillDeflate(b []byte) int {
-	if d.index >= 2*windowSize-(minMatchLength+maxMatchLength) {
-		// shift the window by windowSize
-		copy(d.window, d.window[windowSize:2*windowSize])
-		d.index -= windowSize
-		d.windowEnd -= windowSize
-		if d.blockStart >= windowSize {
-			d.blockStart -= windowSize
-		} else {
-			d.blockStart = math.MaxInt32
-		}
-		d.hashOffset += windowSize
-		if d.hashOffset > maxHashOffset {
-			delta := d.hashOffset - 1
-			d.hashOffset -= delta
-			d.chainHead -= delta
-			for i, v := range d.hashPrev {
-				if int(v) > delta {
-					d.hashPrev[i] = hashid(int(v) - delta)
-				} else {
-					d.hashPrev[i] = 0
-				}
-			}
-			for i, v := range d.hashHead {
-				if int(v) > delta {
-					d.hashHead[i] = hashid(int(v) - delta)
-				} else {
-					d.hashHead[i] = 0
-				}
-			}
-		}
-	}
-	n := copy(d.window[d.windowEnd:], b)
-	d.windowEnd += n
-	return n
-}
-
-func (d *compressor) writeBlock(tok tokens, index int, eof bool) error {
-	if index > 0 || eof {
-		var window []byte
-		if d.blockStart <= index {
-			window = d.window[d.blockStart:index]
-		}
-		d.blockStart = index
-		d.w.writeBlock(tok, eof, window)
-		return d.w.err
-	}
-	return nil
-}
-
-// writeBlockSkip writes the current block and uses the number of tokens
-// to determine if the block should be stored on no matches, or
-// only huffman encoded.
-func (d *compressor) writeBlockSkip(tok tokens, index int, eof bool) error {
-	if index > 0 || eof {
-		if d.blockStart <= index {
-			window := d.window[d.blockStart:index]
-			if tok.n == len(window) && !eof {
-				d.writeStoredBlock(window)
-				// If we removed less than 10 literals, huffman compress the block.
-			} else if tok.n > len(window)-10 {
-				d.w.writeBlockHuff(eof, window)
-			} else {
-				// Write a dynamic huffman block.
-				d.w.writeBlockDynamic(tok, eof, window)
-			}
-		} else {
-			d.w.writeBlock(tok, eof, nil)
-		}
-		d.blockStart = index
-		return d.w.err
-	}
-	return nil
-}
-
-// fillWindow will fill the current window with the supplied
-// dictionary and calculate all hashes.
-// This is much faster than doing a full encode.
-// Should only be used after a start/reset.
-func (d *compressor) fillWindow(b []byte) {
-	// Do not fill window if we are in store-only mode,
-	// use constant or Snappy compression.
-	switch d.compressionLevel.level {
-	case 0, 1, 2:
-		return
-	}
-	// If we are given too much, cut it.
-	if len(b) > windowSize {
-		b = b[len(b)-windowSize:]
-	}
-	// Add all to window.
-	n := copy(d.window[d.windowEnd:], b)
-
-	// Calculate 256 hashes at the time (more L1 cache hits)
-	loops := (n + 256 - minMatchLength) / 256
-	for j := 0; j < loops; j++ {
-		startindex := j * 256
-		end := startindex + 256 + minMatchLength - 1
-		if end > n {
-			end = n
-		}
-		tocheck := d.window[startindex:end]
-		dstSize := len(tocheck) - minMatchLength + 1
-
-		if dstSize <= 0 {
-			continue
-		}
-
-		dst := d.hashMatch[:dstSize]
-		d.bulkHasher(tocheck, dst)
-		var newH hash
-		for i, val := range dst {
-			di := i + startindex
-			newH = val & hashMask
-			// Get previous value with the same hash.
-			// Our chain should point to the previous value.
-			d.hashPrev[di&windowMask] = d.hashHead[newH]
-			// Set the head of the hash chain to us.
-			d.hashHead[newH] = hashid(di + d.hashOffset)
-		}
-		d.hash = newH
-	}
-	// Update window information.
-	d.windowEnd += n
-	d.index = n
-}
-
-// Try to find a match starting at index whose length is greater than prevSize.
-// We only look at chainCount possibilities before giving up.
-// pos = d.index, prevHead = d.chainHead-d.hashOffset, prevLength=minMatchLength-1, lookahead
-func (d *compressor) findMatch(pos int, prevHead int, prevLength int, lookahead int) (length, offset int, ok bool) {
-	minMatchLook := maxMatchLength
-	if lookahead < minMatchLook {
-		minMatchLook = lookahead
-	}
-
-	win := d.window[0 : pos+minMatchLook]
-
-	// We quit when we get a match that's at least nice long
-	nice := len(win) - pos
-	if d.nice < nice {
-		nice = d.nice
-	}
-
-	// If we've got a match that's good enough, only look in 1/4 the chain.
-	tries := d.chain
-	length = prevLength
-	if length >= d.good {
-		tries >>= 2
-	}
-
-	wEnd := win[pos+length]
-	wPos := win[pos:]
-	minIndex := pos - windowSize
-
-	for i := prevHead; tries > 0; tries-- {
-		if wEnd == win[i+length] {
-			n := matchLen(win[i:], wPos, minMatchLook)
-
-			if n > length && (n > minMatchLength || pos-i <= 4096) {
-				length = n
-				offset = pos - i
-				ok = true
-				if n >= nice {
-					// The match is good enough that we don't try to find a better one.
-					break
-				}
-				wEnd = win[pos+n]
-			}
-		}
-		if i == minIndex {
-			// hashPrev[i & windowMask] has already been overwritten, so stop now.
-			break
-		}
-		i = int(d.hashPrev[i&windowMask]) - d.hashOffset
-		if i < minIndex || i < 0 {
-			break
-		}
-	}
-	return
-}
-
-// Try to find a match starting at index whose length is greater than prevSize.
-// We only look at chainCount possibilities before giving up.
-// pos = d.index, prevHead = d.chainHead-d.hashOffset, prevLength=minMatchLength-1, lookahead
-func (d *compressor) findMatchSSE(pos int, prevHead int, prevLength int, lookahead int) (length, offset int, ok bool) {
-	minMatchLook := maxMatchLength
-	if lookahead < minMatchLook {
-		minMatchLook = lookahead
-	}
-
-	win := d.window[0 : pos+minMatchLook]
-
-	// We quit when we get a match that's at least nice long
-	nice := len(win) - pos
-	if d.nice < nice {
-		nice = d.nice
-	}
-
-	// If we've got a match that's good enough, only look in 1/4 the chain.
-	tries := d.chain
-	length = prevLength
-	if length >= d.good {
-		tries >>= 2
-	}
-
-	wEnd := win[pos+length]
-	wPos := win[pos:]
-	minIndex := pos - windowSize
-
-	for i := prevHead; tries > 0; tries-- {
-		if wEnd == win[i+length] {
-			n := matchLenSSE4(win[i:], wPos, minMatchLook)
-
-			if n > length && (n > minMatchLength || pos-i <= 4096) {
-				length = n
-				offset = pos - i
-				ok = true
-				if n >= nice {
-					// The match is good enough that we don't try to find a better one.
-					break
-				}
-				wEnd = win[pos+n]
-			}
-		}
-		if i == minIndex {
-			// hashPrev[i & windowMask] has already been overwritten, so stop now.
-			break
-		}
-		i = int(d.hashPrev[i&windowMask]) - d.hashOffset
-		if i < minIndex || i < 0 {
-			break
-		}
-	}
-	return
-}
-
-func (d *compressor) writeStoredBlock(buf []byte) error {
-	if d.w.writeStoredHeader(len(buf), false); d.w.err != nil {
-		return d.w.err
-	}
-	d.w.writeBytes(buf)
-	return d.w.err
-}
-
-// oldHash is the hash function used when no native crc32 calculation
-// or similar is present.
-func oldHash(b []byte) hash {
-	return hash(b[0])<<(hashShift*3) + hash(b[1])<<(hashShift*2) + hash(b[2])<<hashShift + hash(b[3])
-}
-
-// oldBulkHash will compute hashes using the same
-// algorithm as oldHash
-func oldBulkHash(b []byte, dst []hash) {
-	if len(b) < minMatchLength {
-		return
-	}
-	h := oldHash(b)
-	dst[0] = h
-	i := 1
-	end := len(b) - minMatchLength + 1
-	for ; i < end; i++ {
-		h = (h << hashShift) + hash(b[i+3])
-		dst[i] = h
-	}
-}
-
-// matchLen returns the number of matching bytes in a and b
-// up to length 'max'. Both slices must be at least 'max'
-// bytes in size.
-func matchLen(a, b []byte, max int) int {
-	a = a[:max]
-	for i, av := range a {
-		if b[i] != av {
-			return i
-		}
-	}
-	return max
-}
-
-func (d *compressor) initDeflate() {
-	d.hashHead = make([]hashid, hashSize)
-	d.hashPrev = make([]hashid, windowSize)
-	d.window = make([]byte, 2*windowSize)
-	d.hashOffset = 1
-	d.tokens.tokens = make([]token, maxFlateBlockTokens+1)
-	d.length = minMatchLength - 1
-	d.offset = 0
-	d.byteAvailable = false
-	d.index = 0
-	d.hash = 0
-	d.chainHead = -1
-	d.bulkHasher = oldBulkHash
-	if useSSE42 {
-		d.bulkHasher = crc32sseAll
-	}
-}
-
-// Assumes that d.fastSkipHashing != skipNever,
-// otherwise use deflateLazy
-func (d *compressor) deflate() {
-
-	// Sanity enables additional runtime tests.
-	// It's intended to be used during development
-	// to supplement the currently ad-hoc unit tests.
-	const sanity = false
-
-	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
-		return
-	}
-
-	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
-	if d.index < d.maxInsertIndex {
-		d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
-	}
-
-	for {
-		if sanity && d.index > d.windowEnd {
-			panic("index > windowEnd")
-		}
-		lookahead := d.windowEnd - d.index
-		if lookahead < minMatchLength+maxMatchLength {
-			if !d.sync {
-				return
-			}
-			if sanity && d.index > d.windowEnd {
-				panic("index > windowEnd")
-			}
-			if lookahead == 0 {
-				if d.tokens.n > 0 {
-					if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
-						return
-					}
-					d.tokens.n = 0
-				}
-				return
-			}
-		}
-		if d.index < d.maxInsertIndex {
-			// Update the hash
-			d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
-			ch := d.hashHead[d.hash]
-			d.chainHead = int(ch)
-			d.hashPrev[d.index&windowMask] = ch
-			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
-		}
-		d.length = minMatchLength - 1
-		d.offset = 0
-		minIndex := d.index - windowSize
-		if minIndex < 0 {
-			minIndex = 0
-		}
-
-		if d.chainHead-d.hashOffset >= minIndex && lookahead > minMatchLength-1 {
-			if newLength, newOffset, ok := d.findMatch(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
-				d.length = newLength
-				d.offset = newOffset
-			}
-		}
-		if d.length >= minMatchLength {
-			d.ii = 0
-			// There was a match at the previous step, and the current match is
-			// not better. Output the previous match.
-			// "d.length-3" should NOT be "d.length-minMatchLength", since the format always assume 3
-			d.tokens.tokens[d.tokens.n] = matchToken(uint32(d.length-3), uint32(d.offset-minOffsetSize))
-			d.tokens.n++
-			// Insert in the hash table all strings up to the end of the match.
-			// index and index-1 are already inserted. If there is not enough
-			// lookahead, the last two strings are not inserted into the hash
-			// table.
-			if d.length <= d.fastSkipHashing {
-				var newIndex int
-				newIndex = d.index + d.length
-				// Calculate missing hashes
-				end := newIndex
-				if end > d.maxInsertIndex {
-					end = d.maxInsertIndex
-				}
-				end += minMatchLength - 1
-				startindex := d.index + 1
-				if startindex > d.maxInsertIndex {
-					startindex = d.maxInsertIndex
-				}
-				tocheck := d.window[startindex:end]
-				dstSize := len(tocheck) - minMatchLength + 1
-				if dstSize > 0 {
-					dst := d.hashMatch[:dstSize]
-					oldBulkHash(tocheck, dst)
-					var newH hash
-					for i, val := range dst {
-						di := i + startindex
-						newH = val & hashMask
-						// Get previous value with the same hash.
-						// Our chain should point to the previous value.
-						d.hashPrev[di&windowMask] = d.hashHead[newH]
-						// Set the head of the hash chain to us.
-						d.hashHead[newH] = hashid(di + d.hashOffset)
-					}
-					d.hash = newH
-				}
-				d.index = newIndex
-			} else {
-				// For matches this long, we don't bother inserting each individual
-				// item into the table.
-				d.index += d.length
-				if d.index < d.maxInsertIndex {
-					d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
-				}
-			}
-			if d.tokens.n == maxFlateBlockTokens {
-				// The block includes the current character
-				if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
-					return
-				}
-				d.tokens.n = 0
-			}
-		} else {
-			d.ii++
-			end := d.index + int(d.ii>>uint(d.fastSkipHashing)) + 1
-			if end > d.windowEnd {
-				end = d.windowEnd
-			}
-			for i := d.index; i < end; i++ {
-				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[i]))
-				d.tokens.n++
-				if d.tokens.n == maxFlateBlockTokens {
-					if d.err = d.writeBlockSkip(d.tokens, i+1, false); d.err != nil {
-						return
-					}
-					d.tokens.n = 0
-				}
-			}
-			d.index = end
-		}
-	}
-}
-
-// deflateLazy is the same as deflate, but with d.fastSkipHashing == skipNever,
-// meaning it always has lazy matching on.
-func (d *compressor) deflateLazy() {
-	// Sanity enables additional runtime tests.
-	// It's intended to be used during development
-	// to supplement the currently ad-hoc unit tests.
-	const sanity = false
-
-	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
-		return
-	}
-
-	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
-	if d.index < d.maxInsertIndex {
-		d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
-	}
-
-	for {
-		if sanity && d.index > d.windowEnd {
-			panic("index > windowEnd")
-		}
-		lookahead := d.windowEnd - d.index
-		if lookahead < minMatchLength+maxMatchLength {
-			if !d.sync {
-				return
-			}
-			if sanity && d.index > d.windowEnd {
-				panic("index > windowEnd")
-			}
-			if lookahead == 0 {
-				// Flush current output block if any.
-				if d.byteAvailable {
-					// There is still one pending token that needs to be flushed
-					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
-					d.tokens.n++
-					d.byteAvailable = false
-				}
-				if d.tokens.n > 0 {
-					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-						return
-					}
-					d.tokens.n = 0
-				}
-				return
-			}
-		}
-		if d.index < d.maxInsertIndex {
-			// Update the hash
-			d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
-			ch := d.hashHead[d.hash]
-			d.chainHead = int(ch)
-			d.hashPrev[d.index&windowMask] = ch
-			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
-		}
-		prevLength := d.length
-		prevOffset := d.offset
-		d.length = minMatchLength - 1
-		d.offset = 0
-		minIndex := d.index - windowSize
-		if minIndex < 0 {
-			minIndex = 0
-		}
-
-		if d.chainHead-d.hashOffset >= minIndex && lookahead > prevLength && prevLength < d.lazy {
-			if newLength, newOffset, ok := d.findMatch(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
-				d.length = newLength
-				d.offset = newOffset
-			}
-		}
-		if prevLength >= minMatchLength && d.length <= prevLength {
-			// There was a match at the previous step, and the current match is
-			// not better. Output the previous match.
-			d.tokens.tokens[d.tokens.n] = matchToken(uint32(prevLength-3), uint32(prevOffset-minOffsetSize))
-			d.tokens.n++
-
-			// Insert in the hash table all strings up to the end of the match.
-			// index and index-1 are already inserted. If there is not enough
-			// lookahead, the last two strings are not inserted into the hash
-			// table.
-			var newIndex int
-			newIndex = d.index + prevLength - 1
-			// Calculate missing hashes
-			end := newIndex
-			if end > d.maxInsertIndex {
-				end = d.maxInsertIndex
-			}
-			end += minMatchLength - 1
-			startindex := d.index + 1
-			if startindex > d.maxInsertIndex {
-				startindex = d.maxInsertIndex
-			}
-			tocheck := d.window[startindex:end]
-			dstSize := len(tocheck) - minMatchLength + 1
-			if dstSize > 0 {
-				dst := d.hashMatch[:dstSize]
-				oldBulkHash(tocheck, dst)
-				var newH hash
-				for i, val := range dst {
-					di := i + startindex
-					newH = val & hashMask
-					// Get previous value with the same hash.
-					// Our chain should point to the previous value.
-					d.hashPrev[di&windowMask] = d.hashHead[newH]
-					// Set the head of the hash chain to us.
-					d.hashHead[newH] = hashid(di + d.hashOffset)
-				}
-				d.hash = newH
-			}
-
-			d.index = newIndex
-			d.byteAvailable = false
-			d.length = minMatchLength - 1
-			if d.tokens.n == maxFlateBlockTokens {
-				// The block includes the current character
-				if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-					return
-				}
-				d.tokens.n = 0
-			}
-		} else {
-			// Reset, if we got a match this run.
-			if d.length >= minMatchLength {
-				d.ii = 0
-			}
-			// We have a byte waiting. Emit it.
-			if d.byteAvailable {
-				d.ii++
-				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
-				d.tokens.n++
-				if d.tokens.n == maxFlateBlockTokens {
-					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-						return
-					}
-					d.tokens.n = 0
-				}
-				d.index++
-
-				// If we have a long run of no matches, skip additional bytes
-				// Resets when d.ii overflows after 64KB.
-				if d.ii > 31 {
-					n := int(d.ii >> 6)
-					for j := 0; j < n; j++ {
-						if d.index >= d.windowEnd-1 {
-							break
-						}
-
-						d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
-						d.tokens.n++
-						if d.tokens.n == maxFlateBlockTokens {
-							if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-								return
-							}
-							d.tokens.n = 0
-						}
-						d.index++
-					}
-					// Flush last byte
-					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
-					d.tokens.n++
-					d.byteAvailable = false
-					// d.length = minMatchLength - 1 // not needed, since d.ii is reset above, so it should never be > minMatchLength
-					if d.tokens.n == maxFlateBlockTokens {
-						if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-							return
-						}
-						d.tokens.n = 0
-					}
-				}
-			} else {
-				d.index++
-				d.byteAvailable = true
-			}
-		}
-	}
-}
-
-// Assumes that d.fastSkipHashing != skipNever,
-// otherwise use deflateLazySSE
-func (d *compressor) deflateSSE() {
-
-	// Sanity enables additional runtime tests.
-	// It's intended to be used during development
-	// to supplement the currently ad-hoc unit tests.
-	const sanity = false
-
-	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
-		return
-	}
-
-	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
-	if d.index < d.maxInsertIndex {
-		d.hash = oldHash(d.window[d.index:d.index+minMatchLength]) & hashMask
-	}
-
-	for {
-		if sanity && d.index > d.windowEnd {
-			panic("index > windowEnd")
-		}
-		lookahead := d.windowEnd - d.index
-		if lookahead < minMatchLength+maxMatchLength {
-			if !d.sync {
-				return
-			}
-			if sanity && d.index > d.windowEnd {
-				panic("index > windowEnd")
-			}
-			if lookahead == 0 {
-				if d.tokens.n > 0 {
-					if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
-						return
-					}
-					d.tokens.n = 0
-				}
-				return
-			}
-		}
-		if d.index < d.maxInsertIndex {
-			// Update the hash
-			d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
-			ch := d.hashHead[d.hash]
-			d.chainHead = int(ch)
-			d.hashPrev[d.index&windowMask] = ch
-			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
-		}
-		d.length = minMatchLength - 1
-		d.offset = 0
-		minIndex := d.index - windowSize
-		if minIndex < 0 {
-			minIndex = 0
-		}
-
-		if d.chainHead-d.hashOffset >= minIndex && lookahead > minMatchLength-1 {
-			if newLength, newOffset, ok := d.findMatchSSE(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
-				d.length = newLength
-				d.offset = newOffset
-			}
-		}
-		if d.length >= minMatchLength {
-			d.ii = 0
-			// There was a match at the previous step, and the current match is
-			// not better. Output the previous match.
-			// "d.length-3" should NOT be "d.length-minMatchLength", since the format always assume 3
-			d.tokens.tokens[d.tokens.n] = matchToken(uint32(d.length-3), uint32(d.offset-minOffsetSize))
-			d.tokens.n++
-			// Insert in the hash table all strings up to the end of the match.
-			// index and index-1 are already inserted. If there is not enough
-			// lookahead, the last two strings are not inserted into the hash
-			// table.
-			if d.length <= d.fastSkipHashing {
-				var newIndex int
-				newIndex = d.index + d.length
-				// Calculate missing hashes
-				end := newIndex
-				if end > d.maxInsertIndex {
-					end = d.maxInsertIndex
-				}
-				end += minMatchLength - 1
-				startindex := d.index + 1
-				if startindex > d.maxInsertIndex {
-					startindex = d.maxInsertIndex
-				}
-				tocheck := d.window[startindex:end]
-				dstSize := len(tocheck) - minMatchLength + 1
-				if dstSize > 0 {
-					dst := d.hashMatch[:dstSize]
-
-					crc32sseAll(tocheck, dst)
-					var newH hash
-					for i, val := range dst {
-						di := i + startindex
-						newH = val & hashMask
-						// Get previous value with the same hash.
-						// Our chain should point to the previous value.
-						d.hashPrev[di&windowMask] = d.hashHead[newH]
-						// Set the head of the hash chain to us.
-						d.hashHead[newH] = hashid(di + d.hashOffset)
-					}
-					d.hash = newH
-				}
-				d.index = newIndex
-			} else {
-				// For matches this long, we don't bother inserting each individual
-				// item into the table.
-				d.index += d.length
-				if d.index < d.maxInsertIndex {
-					d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
-				}
-			}
-			if d.tokens.n == maxFlateBlockTokens {
-				// The block includes the current character
-				if d.err = d.writeBlockSkip(d.tokens, d.index, false); d.err != nil {
-					return
-				}
-				d.tokens.n = 0
-			}
-		} else {
-			d.ii++
-			end := d.index + int(d.ii>>uint(d.fastSkipHashing)) + 1
-			if end > d.windowEnd {
-				end = d.windowEnd
-			}
-			for i := d.index; i < end; i++ {
-				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[i]))
-				d.tokens.n++
-				if d.tokens.n == maxFlateBlockTokens {
-					if d.err = d.writeBlockSkip(d.tokens, i+1, false); d.err != nil {
-						return
-					}
-					d.tokens.n = 0
-				}
-			}
-			d.index = end
-		}
-	}
-}
-
-// deflateLazy is the same as deflate, but with d.fastSkipHashing == skipNever,
-// meaning it always has lazy matching on.
-func (d *compressor) deflateLazySSE() {
-	// Sanity enables additional runtime tests.
-	// It's intended to be used during development
-	// to supplement the currently ad-hoc unit tests.
-	const sanity = false
-
-	if d.windowEnd-d.index < minMatchLength+maxMatchLength && !d.sync {
-		return
-	}
-
-	d.maxInsertIndex = d.windowEnd - (minMatchLength - 1)
-	if d.index < d.maxInsertIndex {
-		d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
-	}
-
-	for {
-		if sanity && d.index > d.windowEnd {
-			panic("index > windowEnd")
-		}
-		lookahead := d.windowEnd - d.index
-		if lookahead < minMatchLength+maxMatchLength {
-			if !d.sync {
-				return
-			}
-			if sanity && d.index > d.windowEnd {
-				panic("index > windowEnd")
-			}
-			if lookahead == 0 {
-				// Flush current output block if any.
-				if d.byteAvailable {
-					// There is still one pending token that needs to be flushed
-					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
-					d.tokens.n++
-					d.byteAvailable = false
-				}
-				if d.tokens.n > 0 {
-					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-						return
-					}
-					d.tokens.n = 0
-				}
-				return
-			}
-		}
-		if d.index < d.maxInsertIndex {
-			// Update the hash
-			d.hash = crc32sse(d.window[d.index:d.index+minMatchLength]) & hashMask
-			ch := d.hashHead[d.hash]
-			d.chainHead = int(ch)
-			d.hashPrev[d.index&windowMask] = ch
-			d.hashHead[d.hash] = hashid(d.index + d.hashOffset)
-		}
-		prevLength := d.length
-		prevOffset := d.offset
-		d.length = minMatchLength - 1
-		d.offset = 0
-		minIndex := d.index - windowSize
-		if minIndex < 0 {
-			minIndex = 0
-		}
-
-		if d.chainHead-d.hashOffset >= minIndex && lookahead > prevLength && prevLength < d.lazy {
-			if newLength, newOffset, ok := d.findMatchSSE(d.index, d.chainHead-d.hashOffset, minMatchLength-1, lookahead); ok {
-				d.length = newLength
-				d.offset = newOffset
-			}
-		}
-		if prevLength >= minMatchLength && d.length <= prevLength {
-			// There was a match at the previous step, and the current match is
-			// not better. Output the previous match.
-			d.tokens.tokens[d.tokens.n] = matchToken(uint32(prevLength-3), uint32(prevOffset-minOffsetSize))
-			d.tokens.n++
-
-			// Insert in the hash table all strings up to the end of the match.
-			// index and index-1 are already inserted. If there is not enough
-			// lookahead, the last two strings are not inserted into the hash
-			// table.
-			var newIndex int
-			newIndex = d.index + prevLength - 1
-			// Calculate missing hashes
-			end := newIndex
-			if end > d.maxInsertIndex {
-				end = d.maxInsertIndex
-			}
-			end += minMatchLength - 1
-			startindex := d.index + 1
-			if startindex > d.maxInsertIndex {
-				startindex = d.maxInsertIndex
-			}
-			tocheck := d.window[startindex:end]
-			dstSize := len(tocheck) - minMatchLength + 1
-			if dstSize > 0 {
-				dst := d.hashMatch[:dstSize]
-				crc32sseAll(tocheck, dst)
-				var newH hash
-				for i, val := range dst {
-					di := i + startindex
-					newH = val & hashMask
-					// Get previous value with the same hash.
-					// Our chain should point to the previous value.
-					d.hashPrev[di&windowMask] = d.hashHead[newH]
-					// Set the head of the hash chain to us.
-					d.hashHead[newH] = hashid(di + d.hashOffset)
-				}
-				d.hash = newH
-			}
-
-			d.index = newIndex
-			d.byteAvailable = false
-			d.length = minMatchLength - 1
-			if d.tokens.n == maxFlateBlockTokens {
-				// The block includes the current character
-				if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-					return
-				}
-				d.tokens.n = 0
-			}
-		} else {
-			// Reset, if we got a match this run.
-			if d.length >= minMatchLength {
-				d.ii = 0
-			}
-			// We have a byte waiting. Emit it.
-			if d.byteAvailable {
-				d.ii++
-				d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
-				d.tokens.n++
-				if d.tokens.n == maxFlateBlockTokens {
-					if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-						return
-					}
-					d.tokens.n = 0
-				}
-				d.index++
-
-				// If we have a long run of no matches, skip additional bytes
-				// Resets when d.ii overflows after 64KB.
-				if d.ii > 31 {
-					n := int(d.ii >> 6)
-					for j := 0; j < n; j++ {
-						if d.index >= d.windowEnd-1 {
-							break
-						}
-
-						d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
-						d.tokens.n++
-						if d.tokens.n == maxFlateBlockTokens {
-							if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-								return
-							}
-							d.tokens.n = 0
-						}
-						d.index++
-					}
-					// Flush last byte
-					d.tokens.tokens[d.tokens.n] = literalToken(uint32(d.window[d.index-1]))
-					d.tokens.n++
-					d.byteAvailable = false
-					// d.length = minMatchLength - 1 // not needed, since d.ii is reset above, so it should never be > minMatchLength
-					if d.tokens.n == maxFlateBlockTokens {
-						if d.err = d.writeBlock(d.tokens, d.index, false); d.err != nil {
-							return
-						}
-						d.tokens.n = 0
-					}
-				}
-			} else {
-				d.index++
-				d.byteAvailable = true
-			}
-		}
-	}
-}
-
-func (d *compressor) fillStore(b []byte) int {
-	n := copy(d.window[d.windowEnd:], b)
-	d.windowEnd += n
-	return n
-}
-
-func (d *compressor) store() {
-	if d.windowEnd > 0 {
-		d.err = d.writeStoredBlock(d.window[:d.windowEnd])
-	}
-	d.windowEnd = 0
-}
-
-// fillHuff will fill the buffer with data for huffman-only compression.
-// The number of bytes copied is returned.
-func (d *compressor) fillHuff(b []byte) int {
-	n := copy(d.window[d.windowEnd:], b)
-	d.windowEnd += n
-	return n
-}
-
-// storeHuff will compress and store the currently added data,
-// if enough has been accumulated or we at the end of the stream.
-// Any error that occurred will be in d.err
-func (d *compressor) storeHuff() {
-	// We only compress if we have maxStoreBlockSize or we are at end-of-stream
-	if d.windowEnd < maxStoreBlockSize && !d.sync {
-		return
-	}
-	if d.windowEnd == 0 {
-		return
-	}
-	d.w.writeBlockHuff(false, d.window[:d.windowEnd])
-	d.err = d.w.err
-	d.windowEnd = 0
-}
-
-// storeHuff will compress and store the currently added data,
-// if enough has been accumulated or we at the end of the stream.
-// Any error that occurred will be in d.err
-func (d *compressor) storeSnappy() {
-	// We only compress if we have maxStoreBlockSize.
-	if d.windowEnd < maxStoreBlockSize {
-		if !d.sync {
-			return
-		}
-		// Handle extremely small sizes.
-		if d.windowEnd < 128 {
-			if d.windowEnd == 0 {
-				return
-			}
-			if d.windowEnd <= 32 {
-				d.err = d.writeStoredBlock(d.window[:d.windowEnd])
-				d.tokens.n = 0
-				d.windowEnd = 0
-			} else {
-				d.w.writeBlockHuff(false, d.window[:d.windowEnd])
-				d.err = d.w.err
-			}
-			d.tokens.n = 0
-			d.windowEnd = 0
-			return
-		}
-	}
-
-	d.snap.Encode(&d.tokens, d.window[:d.windowEnd])
-	// If we made zero matches, store the block as is.
-	if d.tokens.n == d.windowEnd {
-		d.err = d.writeStoredBlock(d.window[:d.windowEnd])
-		// If we removed less than 1/16th, huffman compress the block.
-	} else if d.tokens.n > d.windowEnd-(d.windowEnd>>4) {
-		d.w.writeBlockHuff(false, d.window[:d.windowEnd])
-		d.err = d.w.err
-	} else {
-		d.w.writeBlockDynamic(d.tokens, false, d.window[:d.windowEnd])
-		d.err = d.w.err
-	}
-	d.tokens.n = 0
-	d.windowEnd = 0
-}
-
-// write will add input byte to the stream.
-// Unless an error occurs all bytes will be consumed.
-func (d *compressor) write(b []byte) (n int, err error) {
-	if d.err != nil {
-		return 0, d.err
-	}
-	n = len(b)
-	for len(b) > 0 {
-		d.step(d)
-		b = b[d.fill(d, b):]
-		if d.err != nil {
-			return 0, d.err
-		}
-	}
-	return n, d.err
-}
-
-func (d *compressor) syncFlush() error {
-	d.sync = true
-	if d.err != nil {
-		return d.err
-	}
-	d.step(d)
-	if d.err == nil {
-		d.w.writeStoredHeader(0, false)
-		d.w.flush()
-		d.err = d.w.err
-	}
-	d.sync = false
-	return d.err
-}
-
-func (d *compressor) init(w io.Writer, level int) (err error) {
-	d.w = newHuffmanBitWriter(w)
-
-	switch {
-	case level == NoCompression:
-		d.window = make([]byte, maxStoreBlockSize)
-		d.fill = (*compressor).fillStore
-		d.step = (*compressor).store
-	case level == ConstantCompression:
-		d.window = make([]byte, maxStoreBlockSize)
-		d.fill = (*compressor).fillHuff
-		d.step = (*compressor).storeHuff
-	case level >= 1 && level <= 3:
-		d.snap = newSnappy(level)
-		d.window = make([]byte, maxStoreBlockSize)
-		d.fill = (*compressor).fillHuff
-		d.step = (*compressor).storeSnappy
-		d.tokens.tokens = make([]token, maxStoreBlockSize+1)
-	case level == DefaultCompression:
-		level = 5
-		fallthrough
-	case 4 <= level && level <= 9:
-		d.compressionLevel = levels[level]
-		d.initDeflate()
-		d.fill = (*compressor).fillDeflate
-		if d.fastSkipHashing == skipNever {
-			if useSSE42 {
-				d.step = (*compressor).deflateLazySSE
-			} else {
-				d.step = (*compressor).deflateLazy
-			}
-		} else {
-			if useSSE42 {
-				d.step = (*compressor).deflateSSE
-			} else {
-				d.step = (*compressor).deflate
-
-			}
-		}
-	default:
-		return fmt.Errorf("flate: invalid compression level %d: want value in range [-2, 9]", level)
-	}
-	return nil
-}
-
-// Used for zeroing the hash slice
-var hzeroes [256]hashid
-
-// reset the state of the compressor.
-func (d *compressor) reset(w io.Writer) {
-	d.w.reset(w)
-	d.sync = false
-	d.err = nil
-	// We only need to reset a few things for Snappy.
-	if d.snap != nil {
-		d.snap.Reset()
-		d.windowEnd = 0
-		d.tokens.n = 0
-		return
-	}
-	switch d.compressionLevel.chain {
-	case 0:
-		// level was NoCompression or ConstantCompresssion.
-		d.windowEnd = 0
-	default:
-		d.chainHead = -1
-		for s := d.hashHead; len(s) > 0; {
-			n := copy(s, hzeroes[:])
-			s = s[n:]
-		}
-		for s := d.hashPrev; len(s) > 0; s = s[len(hzeroes):] {
-			copy(s, hzeroes[:])
-		}
-		d.hashOffset = 1
-
-		d.index, d.windowEnd = 0, 0
-		d.blockStart, d.byteAvailable = 0, false
-
-		d.tokens.n = 0
-		d.length = minMatchLength - 1
-		d.offset = 0
-		d.hash = 0
-		d.ii = 0
-		d.maxInsertIndex = 0
-	}
-}
-
-func (d *compressor) close() error {
-	if d.err != nil {
-		return d.err
-	}
-	d.sync = true
-	d.step(d)
-	if d.err != nil {
-		return d.err
-	}
-	if d.w.writeStoredHeader(0, true); d.w.err != nil {
-		return d.w.err
-	}
-	d.w.flush()
-	return d.w.err
-}
-
-// NewWriter returns a new Writer compressing data at the given level.
-// Following zlib, levels range from 1 (BestSpeed) to 9 (BestCompression);
-// higher levels typically run slower but compress more.
-// Level 0 (NoCompression) does not attempt any compression; it only adds the
-// necessary DEFLATE framing.
-// Level -1 (DefaultCompression) uses the default compression level.
-// Level -2 (ConstantCompression) will use Huffman compression only, giving
-// a very fast compression for all types of input, but sacrificing considerable
-// compression efficiency.
-//
-// If level is in the range [-2, 9] then the error returned will be nil.
-// Otherwise the error returned will be non-nil.
-func NewWriter(w io.Writer, level int) (*Writer, error) {
-	var dw Writer
-	if err := dw.d.init(w, level); err != nil {
-		return nil, err
-	}
-	return &dw, nil
-}
-
-// NewWriterDict is like NewWriter but initializes the new
-// Writer with a preset dictionary.  The returned Writer behaves
-// as if the dictionary had been written to it without producing
-// any compressed output.  The compressed data written to w
-// can only be decompressed by a Reader initialized with the
-// same dictionary.
-func NewWriterDict(w io.Writer, level int, dict []byte) (*Writer, error) {
-	dw := &dictWriter{w}
-	zw, err := NewWriter(dw, level)
-	if err != nil {
-		return nil, err
-	}
-	zw.d.fillWindow(dict)
-	zw.dict = append(zw.dict, dict...) // duplicate dictionary for Reset method.
-	return zw, err
-}
-
-type dictWriter struct {
-	w io.Writer
-}
-
-func (w *dictWriter) Write(b []byte) (n int, err error) {
-	return w.w.Write(b)
-}
-
-// A Writer takes data written to it and writes the compressed
-// form of that data to an underlying writer (see NewWriter).
-type Writer struct {
-	d    compressor
-	dict []byte
-}
-
-// Write writes data to w, which will eventually write the
-// compressed form of data to its underlying writer.
-func (w *Writer) Write(data []byte) (n int, err error) {
-	return w.d.write(data)
-}
-
-// Flush flushes any pending compressed data to the underlying writer.
-// It is useful mainly in compressed network protocols, to ensure that
-// a remote reader has enough data to reconstruct a packet.
-// Flush does not return until the data has been written.
-// If the underlying writer returns an error, Flush returns that error.
-//
-// In the terminology of the zlib library, Flush is equivalent to Z_SYNC_FLUSH.
-func (w *Writer) Flush() error {
-	// For more about flushing:
-	// http://www.bolet.org/~pornin/deflate-flush.html
-	return w.d.syncFlush()
-}
-
-// Close flushes and closes the writer.
-func (w *Writer) Close() error {
-	return w.d.close()
-}
-
-// Reset discards the writer's state and makes it equivalent to
-// the result of NewWriter or NewWriterDict called with dst
-// and w's level and dictionary.
-func (w *Writer) Reset(dst io.Writer) {
-	if dw, ok := w.d.w.w.(*dictWriter); ok {
-		// w was created with NewWriterDict
-		dw.w = dst
-		w.d.reset(dw)
-		w.d.fillWindow(w.dict)
-	} else {
-		// w was created with NewWriter
-		w.d.reset(dst)
-	}
-}
-
-// ResetDict discards the writer's state and makes it equivalent to
-// the result of NewWriter or NewWriterDict called with dst
-// and w's level, but sets a specific dictionary.
-func (w *Writer) ResetDict(dst io.Writer, dict []byte) {
-	w.dict = dict
-	w.d.reset(dst)
-	w.d.fillWindow(w.dict)
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/fixedhuff.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/fixedhuff.go
deleted file mode 100644
index 7df8b9a293..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/fixedhuff.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package flate
-
-// autogenerated by go run gen.go -output fixedhuff.go, DO NOT EDIT
-
-var fixedHuffmanDecoder = huffmanDecoder{
-	7,
-	[huffmanNumChunks]uint32{
-		0x1007, 0x0508, 0x0108, 0x1188, 0x1107, 0x0708, 0x0308, 0x0c09,
-		0x1087, 0x0608, 0x0208, 0x0a09, 0x0008, 0x0808, 0x0408, 0x0e09,
-		0x1047, 0x0588, 0x0188, 0x0909, 0x1147, 0x0788, 0x0388, 0x0d09,
-		0x10c7, 0x0688, 0x0288, 0x0b09, 0x0088, 0x0888, 0x0488, 0x0f09,
-		0x1027, 0x0548, 0x0148, 0x11c8, 0x1127, 0x0748, 0x0348, 0x0c89,
-		0x10a7, 0x0648, 0x0248, 0x0a89, 0x0048, 0x0848, 0x0448, 0x0e89,
-		0x1067, 0x05c8, 0x01c8, 0x0989, 0x1167, 0x07c8, 0x03c8, 0x0d89,
-		0x10e7, 0x06c8, 0x02c8, 0x0b89, 0x00c8, 0x08c8, 0x04c8, 0x0f89,
-		0x1017, 0x0528, 0x0128, 0x11a8, 0x1117, 0x0728, 0x0328, 0x0c49,
-		0x1097, 0x0628, 0x0228, 0x0a49, 0x0028, 0x0828, 0x0428, 0x0e49,
-		0x1057, 0x05a8, 0x01a8, 0x0949, 0x1157, 0x07a8, 0x03a8, 0x0d49,
-		0x10d7, 0x06a8, 0x02a8, 0x0b49, 0x00a8, 0x08a8, 0x04a8, 0x0f49,
-		0x1037, 0x0568, 0x0168, 0x11e8, 0x1137, 0x0768, 0x0368, 0x0cc9,
-		0x10b7, 0x0668, 0x0268, 0x0ac9, 0x0068, 0x0868, 0x0468, 0x0ec9,
-		0x1077, 0x05e8, 0x01e8, 0x09c9, 0x1177, 0x07e8, 0x03e8, 0x0dc9,
-		0x10f7, 0x06e8, 0x02e8, 0x0bc9, 0x00e8, 0x08e8, 0x04e8, 0x0fc9,
-		0x1007, 0x0518, 0x0118, 0x1198, 0x1107, 0x0718, 0x0318, 0x0c29,
-		0x1087, 0x0618, 0x0218, 0x0a29, 0x0018, 0x0818, 0x0418, 0x0e29,
-		0x1047, 0x0598, 0x0198, 0x0929, 0x1147, 0x0798, 0x0398, 0x0d29,
-		0x10c7, 0x0698, 0x0298, 0x0b29, 0x0098, 0x0898, 0x0498, 0x0f29,
-		0x1027, 0x0558, 0x0158, 0x11d8, 0x1127, 0x0758, 0x0358, 0x0ca9,
-		0x10a7, 0x0658, 0x0258, 0x0aa9, 0x0058, 0x0858, 0x0458, 0x0ea9,
-		0x1067, 0x05d8, 0x01d8, 0x09a9, 0x1167, 0x07d8, 0x03d8, 0x0da9,
-		0x10e7, 0x06d8, 0x02d8, 0x0ba9, 0x00d8, 0x08d8, 0x04d8, 0x0fa9,
-		0x1017, 0x0538, 0x0138, 0x11b8, 0x1117, 0x0738, 0x0338, 0x0c69,
-		0x1097, 0x0638, 0x0238, 0x0a69, 0x0038, 0x0838, 0x0438, 0x0e69,
-		0x1057, 0x05b8, 0x01b8, 0x0969, 0x1157, 0x07b8, 0x03b8, 0x0d69,
-		0x10d7, 0x06b8, 0x02b8, 0x0b69, 0x00b8, 0x08b8, 0x04b8, 0x0f69,
-		0x1037, 0x0578, 0x0178, 0x11f8, 0x1137, 0x0778, 0x0378, 0x0ce9,
-		0x10b7, 0x0678, 0x0278, 0x0ae9, 0x0078, 0x0878, 0x0478, 0x0ee9,
-		0x1077, 0x05f8, 0x01f8, 0x09e9, 0x1177, 0x07f8, 0x03f8, 0x0de9,
-		0x10f7, 0x06f8, 0x02f8, 0x0be9, 0x00f8, 0x08f8, 0x04f8, 0x0fe9,
-		0x1007, 0x0508, 0x0108, 0x1188, 0x1107, 0x0708, 0x0308, 0x0c19,
-		0x1087, 0x0608, 0x0208, 0x0a19, 0x0008, 0x0808, 0x0408, 0x0e19,
-		0x1047, 0x0588, 0x0188, 0x0919, 0x1147, 0x0788, 0x0388, 0x0d19,
-		0x10c7, 0x0688, 0x0288, 0x0b19, 0x0088, 0x0888, 0x0488, 0x0f19,
-		0x1027, 0x0548, 0x0148, 0x11c8, 0x1127, 0x0748, 0x0348, 0x0c99,
-		0x10a7, 0x0648, 0x0248, 0x0a99, 0x0048, 0x0848, 0x0448, 0x0e99,
-		0x1067, 0x05c8, 0x01c8, 0x0999, 0x1167, 0x07c8, 0x03c8, 0x0d99,
-		0x10e7, 0x06c8, 0x02c8, 0x0b99, 0x00c8, 0x08c8, 0x04c8, 0x0f99,
-		0x1017, 0x0528, 0x0128, 0x11a8, 0x1117, 0x0728, 0x0328, 0x0c59,
-		0x1097, 0x0628, 0x0228, 0x0a59, 0x0028, 0x0828, 0x0428, 0x0e59,
-		0x1057, 0x05a8, 0x01a8, 0x0959, 0x1157, 0x07a8, 0x03a8, 0x0d59,
-		0x10d7, 0x06a8, 0x02a8, 0x0b59, 0x00a8, 0x08a8, 0x04a8, 0x0f59,
-		0x1037, 0x0568, 0x0168, 0x11e8, 0x1137, 0x0768, 0x0368, 0x0cd9,
-		0x10b7, 0x0668, 0x0268, 0x0ad9, 0x0068, 0x0868, 0x0468, 0x0ed9,
-		0x1077, 0x05e8, 0x01e8, 0x09d9, 0x1177, 0x07e8, 0x03e8, 0x0dd9,
-		0x10f7, 0x06e8, 0x02e8, 0x0bd9, 0x00e8, 0x08e8, 0x04e8, 0x0fd9,
-		0x1007, 0x0518, 0x0118, 0x1198, 0x1107, 0x0718, 0x0318, 0x0c39,
-		0x1087, 0x0618, 0x0218, 0x0a39, 0x0018, 0x0818, 0x0418, 0x0e39,
-		0x1047, 0x0598, 0x0198, 0x0939, 0x1147, 0x0798, 0x0398, 0x0d39,
-		0x10c7, 0x0698, 0x0298, 0x0b39, 0x0098, 0x0898, 0x0498, 0x0f39,
-		0x1027, 0x0558, 0x0158, 0x11d8, 0x1127, 0x0758, 0x0358, 0x0cb9,
-		0x10a7, 0x0658, 0x0258, 0x0ab9, 0x0058, 0x0858, 0x0458, 0x0eb9,
-		0x1067, 0x05d8, 0x01d8, 0x09b9, 0x1167, 0x07d8, 0x03d8, 0x0db9,
-		0x10e7, 0x06d8, 0x02d8, 0x0bb9, 0x00d8, 0x08d8, 0x04d8, 0x0fb9,
-		0x1017, 0x0538, 0x0138, 0x11b8, 0x1117, 0x0738, 0x0338, 0x0c79,
-		0x1097, 0x0638, 0x0238, 0x0a79, 0x0038, 0x0838, 0x0438, 0x0e79,
-		0x1057, 0x05b8, 0x01b8, 0x0979, 0x1157, 0x07b8, 0x03b8, 0x0d79,
-		0x10d7, 0x06b8, 0x02b8, 0x0b79, 0x00b8, 0x08b8, 0x04b8, 0x0f79,
-		0x1037, 0x0578, 0x0178, 0x11f8, 0x1137, 0x0778, 0x0378, 0x0cf9,
-		0x10b7, 0x0678, 0x0278, 0x0af9, 0x0078, 0x0878, 0x0478, 0x0ef9,
-		0x1077, 0x05f8, 0x01f8, 0x09f9, 0x1177, 0x07f8, 0x03f8, 0x0df9,
-		0x10f7, 0x06f8, 0x02f8, 0x0bf9, 0x00f8, 0x08f8, 0x04f8, 0x0ff9,
-	},
-	nil, 0,
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/gen.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/gen.go
deleted file mode 100644
index 154c89a488..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/gen.go
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// This program generates fixedhuff.go
-// Invoke as
-//
-//	go run gen.go -output fixedhuff.go
-
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/format"
-	"io/ioutil"
-	"log"
-)
-
-var filename = flag.String("output", "fixedhuff.go", "output file name")
-
-const maxCodeLen = 16
-
-// Note: the definition of the huffmanDecoder struct is copied from
-// inflate.go, as it is private to the implementation.
-
-// chunk & 15 is number of bits
-// chunk >> 4 is value, including table link
-
-const (
-	huffmanChunkBits  = 9
-	huffmanNumChunks  = 1 << huffmanChunkBits
-	huffmanCountMask  = 15
-	huffmanValueShift = 4
-)
-
-type huffmanDecoder struct {
-	min      int                      // the minimum code length
-	chunks   [huffmanNumChunks]uint32 // chunks as described above
-	links    [][]uint32               // overflow links
-	linkMask uint32                   // mask the width of the link table
-}
-
-// Initialize Huffman decoding tables from array of code lengths.
-// Following this function, h is guaranteed to be initialized into a complete
-// tree (i.e., neither over-subscribed nor under-subscribed). The exception is a
-// degenerate case where the tree has only a single symbol with length 1. Empty
-// trees are permitted.
-func (h *huffmanDecoder) init(bits []int) bool {
-	// Sanity enables additional runtime tests during Huffman
-	// table construction.  It's intended to be used during
-	// development to supplement the currently ad-hoc unit tests.
-	const sanity = false
-
-	if h.min != 0 {
-		*h = huffmanDecoder{}
-	}
-
-	// Count number of codes of each length,
-	// compute min and max length.
-	var count [maxCodeLen]int
-	var min, max int
-	for _, n := range bits {
-		if n == 0 {
-			continue
-		}
-		if min == 0 || n < min {
-			min = n
-		}
-		if n > max {
-			max = n
-		}
-		count[n]++
-	}
-
-	// Empty tree. The decompressor.huffSym function will fail later if the tree
-	// is used. Technically, an empty tree is only valid for the HDIST tree and
-	// not the HCLEN and HLIT tree. However, a stream with an empty HCLEN tree
-	// is guaranteed to fail since it will attempt to use the tree to decode the
-	// codes for the HLIT and HDIST trees. Similarly, an empty HLIT tree is
-	// guaranteed to fail later since the compressed data section must be
-	// composed of at least one symbol (the end-of-block marker).
-	if max == 0 {
-		return true
-	}
-
-	code := 0
-	var nextcode [maxCodeLen]int
-	for i := min; i <= max; i++ {
-		code <<= 1
-		nextcode[i] = code
-		code += count[i]
-	}
-
-	// Check that the coding is complete (i.e., that we've
-	// assigned all 2-to-the-max possible bit sequences).
-	// Exception: To be compatible with zlib, we also need to
-	// accept degenerate single-code codings.  See also
-	// TestDegenerateHuffmanCoding.
-	if code != 1<<uint(max) && !(code == 1 && max == 1) {
-		return false
-	}
-
-	h.min = min
-	if max > huffmanChunkBits {
-		numLinks := 1 << (uint(max) - huffmanChunkBits)
-		h.linkMask = uint32(numLinks - 1)
-
-		// create link tables
-		link := nextcode[huffmanChunkBits+1] >> 1
-		h.links = make([][]uint32, huffmanNumChunks-link)
-		for j := uint(link); j < huffmanNumChunks; j++ {
-			reverse := int(reverseByte[j>>8]) | int(reverseByte[j&0xff])<<8
-			reverse >>= uint(16 - huffmanChunkBits)
-			off := j - uint(link)
-			if sanity && h.chunks[reverse] != 0 {
-				panic("impossible: overwriting existing chunk")
-			}
-			h.chunks[reverse] = uint32(off<<huffmanValueShift | (huffmanChunkBits + 1))
-			h.links[off] = make([]uint32, numLinks)
-		}
-	}
-
-	for i, n := range bits {
-		if n == 0 {
-			continue
-		}
-		code := nextcode[n]
-		nextcode[n]++
-		chunk := uint32(i<<huffmanValueShift | n)
-		reverse := int(reverseByte[code>>8]) | int(reverseByte[code&0xff])<<8
-		reverse >>= uint(16 - n)
-		if n <= huffmanChunkBits {
-			for off := reverse; off < len(h.chunks); off += 1 << uint(n) {
-				// We should never need to overwrite
-				// an existing chunk.  Also, 0 is
-				// never a valid chunk, because the
-				// lower 4 "count" bits should be
-				// between 1 and 15.
-				if sanity && h.chunks[off] != 0 {
-					panic("impossible: overwriting existing chunk")
-				}
-				h.chunks[off] = chunk
-			}
-		} else {
-			j := reverse & (huffmanNumChunks - 1)
-			if sanity && h.chunks[j]&huffmanCountMask != huffmanChunkBits+1 {
-				// Longer codes should have been
-				// associated with a link table above.
-				panic("impossible: not an indirect chunk")
-			}
-			value := h.chunks[j] >> huffmanValueShift
-			linktab := h.links[value]
-			reverse >>= huffmanChunkBits
-			for off := reverse; off < len(linktab); off += 1 << uint(n-huffmanChunkBits) {
-				if sanity && linktab[off] != 0 {
-					panic("impossible: overwriting existing chunk")
-				}
-				linktab[off] = chunk
-			}
-		}
-	}
-
-	if sanity {
-		// Above we've sanity checked that we never overwrote
-		// an existing entry.  Here we additionally check that
-		// we filled the tables completely.
-		for i, chunk := range h.chunks {
-			if chunk == 0 {
-				// As an exception, in the degenerate
-				// single-code case, we allow odd
-				// chunks to be missing.
-				if code == 1 && i%2 == 1 {
-					continue
-				}
-				panic("impossible: missing chunk")
-			}
-		}
-		for _, linktab := range h.links {
-			for _, chunk := range linktab {
-				if chunk == 0 {
-					panic("impossible: missing chunk")
-				}
-			}
-		}
-	}
-
-	return true
-}
-
-func main() {
-	flag.Parse()
-
-	var h huffmanDecoder
-	var bits [288]int
-	initReverseByte()
-	for i := 0; i < 144; i++ {
-		bits[i] = 8
-	}
-	for i := 144; i < 256; i++ {
-		bits[i] = 9
-	}
-	for i := 256; i < 280; i++ {
-		bits[i] = 7
-	}
-	for i := 280; i < 288; i++ {
-		bits[i] = 8
-	}
-	h.init(bits[:])
-	if h.links != nil {
-		log.Fatal("Unexpected links table in fixed Huffman decoder")
-	}
-
-	var buf bytes.Buffer
-
-	fmt.Fprintf(&buf, `// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.`+"\n\n")
-
-	fmt.Fprintln(&buf, "package flate")
-	fmt.Fprintln(&buf)
-	fmt.Fprintln(&buf, "// autogenerated by go run gen.go -output fixedhuff.go, DO NOT EDIT")
-	fmt.Fprintln(&buf)
-	fmt.Fprintln(&buf, "var fixedHuffmanDecoder = huffmanDecoder{")
-	fmt.Fprintf(&buf, "\t%d,\n", h.min)
-	fmt.Fprintln(&buf, "\t[huffmanNumChunks]uint32{")
-	for i := 0; i < huffmanNumChunks; i++ {
-		if i&7 == 0 {
-			fmt.Fprintf(&buf, "\t\t")
-		} else {
-			fmt.Fprintf(&buf, " ")
-		}
-		fmt.Fprintf(&buf, "0x%04x,", h.chunks[i])
-		if i&7 == 7 {
-			fmt.Fprintln(&buf)
-		}
-	}
-	fmt.Fprintln(&buf, "\t},")
-	fmt.Fprintln(&buf, "\tnil, 0,")
-	fmt.Fprintln(&buf, "}")
-
-	data, err := format.Source(buf.Bytes())
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = ioutil.WriteFile(*filename, data, 0644)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-var reverseByte [256]byte
-
-func initReverseByte() {
-	for x := 0; x < 256; x++ {
-		var result byte
-		for i := uint(0); i < 8; i++ {
-			result |= byte(((x >> i) & 1) << (7 - i))
-		}
-		reverseByte[x] = result
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_bit_writer.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_bit_writer.go
deleted file mode 100644
index 5f7ffdd2e6..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_bit_writer.go
+++ /dev/null
@@ -1,717 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package flate
-
-import (
-	"io"
-	"math"
-)
-
-const (
-	// The largest offset code.
-	offsetCodeCount = 30
-
-	// The special code used to mark the end of a block.
-	endBlockMarker = 256
-
-	// The first length code.
-	lengthCodesStart = 257
-
-	// The number of codegen codes.
-	codegenCodeCount = 19
-	badCode          = 255
-
-	// Output byte buffer size
-	// Must be multiple of 6 (48 bits) + 8
-	bufferSize = 240 + 8
-)
-
-// The number of extra bits needed by length code X - LENGTH_CODES_START.
-var lengthExtraBits = []int8{
-	/* 257 */ 0, 0, 0,
-	/* 260 */ 0, 0, 0, 0, 0, 1, 1, 1, 1, 2,
-	/* 270 */ 2, 2, 2, 3, 3, 3, 3, 4, 4, 4,
-	/* 280 */ 4, 5, 5, 5, 5, 0,
-}
-
-// The length indicated by length code X - LENGTH_CODES_START.
-var lengthBase = []uint32{
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 10,
-	12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-	64, 80, 96, 112, 128, 160, 192, 224, 255,
-}
-
-// offset code word extra bits.
-var offsetExtraBits = []int8{
-	0, 0, 0, 0, 1, 1, 2, 2, 3, 3,
-	4, 4, 5, 5, 6, 6, 7, 7, 8, 8,
-	9, 9, 10, 10, 11, 11, 12, 12, 13, 13,
-	/* extended window */
-	14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20,
-}
-
-var offsetBase = []uint32{
-	/* normal deflate */
-	0x000000, 0x000001, 0x000002, 0x000003, 0x000004,
-	0x000006, 0x000008, 0x00000c, 0x000010, 0x000018,
-	0x000020, 0x000030, 0x000040, 0x000060, 0x000080,
-	0x0000c0, 0x000100, 0x000180, 0x000200, 0x000300,
-	0x000400, 0x000600, 0x000800, 0x000c00, 0x001000,
-	0x001800, 0x002000, 0x003000, 0x004000, 0x006000,
-
-	/* extended window */
-	0x008000, 0x00c000, 0x010000, 0x018000, 0x020000,
-	0x030000, 0x040000, 0x060000, 0x080000, 0x0c0000,
-	0x100000, 0x180000, 0x200000, 0x300000,
-}
-
-// The odd order in which the codegen code sizes are written.
-var codegenOrder = []uint32{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}
-
-type huffmanBitWriter struct {
-	w io.Writer
-	// Data waiting to be written is bytes[0:nbytes]
-	// and then the low nbits of bits.
-	bits            uint64
-	nbits           uint
-	bytes           [bufferSize]byte
-	nbytes          int
-	literalFreq     []int32
-	offsetFreq      []int32
-	codegen         []uint8
-	codegenFreq     []int32
-	literalEncoding *huffmanEncoder
-	offsetEncoding  *huffmanEncoder
-	codegenEncoding *huffmanEncoder
-	err             error
-}
-
-func newHuffmanBitWriter(w io.Writer) *huffmanBitWriter {
-	return &huffmanBitWriter{
-		w:               w,
-		literalFreq:     make([]int32, maxNumLit),
-		offsetFreq:      make([]int32, offsetCodeCount),
-		codegen:         make([]uint8, maxNumLit+offsetCodeCount+1),
-		codegenFreq:     make([]int32, codegenCodeCount),
-		literalEncoding: newHuffmanEncoder(maxNumLit),
-		codegenEncoding: newHuffmanEncoder(codegenCodeCount),
-		offsetEncoding:  newHuffmanEncoder(offsetCodeCount),
-	}
-}
-
-func (w *huffmanBitWriter) reset(writer io.Writer) {
-	w.w = writer
-	w.bits, w.nbits, w.nbytes, w.err = 0, 0, 0, nil
-	w.bytes = [bufferSize]byte{}
-}
-
-func (w *huffmanBitWriter) flush() {
-	if w.err != nil {
-		w.nbits = 0
-		return
-	}
-	n := w.nbytes
-	for w.nbits != 0 {
-		w.bytes[n] = byte(w.bits)
-		w.bits >>= 8
-		if w.nbits > 8 { // Avoid underflow
-			w.nbits -= 8
-		} else {
-			w.nbits = 0
-		}
-		n++
-	}
-	w.bits = 0
-	_, w.err = w.w.Write(w.bytes[0:n])
-	w.nbytes = 0
-}
-
-func (w *huffmanBitWriter) writeBits(b int32, nb uint) {
-	w.bits |= uint64(b) << w.nbits
-	w.nbits += nb
-	if w.nbits >= 48 {
-		bits := w.bits
-		w.bits >>= 48
-		w.nbits -= 48
-		n := w.nbytes
-		w.bytes[n] = byte(bits)
-		w.bytes[n+1] = byte(bits >> 8)
-		w.bytes[n+2] = byte(bits >> 16)
-		w.bytes[n+3] = byte(bits >> 24)
-		w.bytes[n+4] = byte(bits >> 32)
-		w.bytes[n+5] = byte(bits >> 40)
-		n += 6
-		if n >= bufferSize-8 {
-			_, w.err = w.w.Write(w.bytes[:bufferSize-8])
-			n = 0
-		}
-		w.nbytes = n
-	}
-}
-
-func (w *huffmanBitWriter) writeBytes(bytes []byte) {
-	if w.err != nil {
-		return
-	}
-	n := w.nbytes
-	for w.nbits != 0 {
-		w.bytes[n] = byte(w.bits)
-		w.bits >>= 8
-		w.nbits -= 8
-		n++
-	}
-	if w.nbits != 0 {
-		w.err = InternalError("writeBytes with unfinished bits")
-		return
-	}
-	if n != 0 {
-		_, w.err = w.w.Write(w.bytes[0:n])
-		if w.err != nil {
-			return
-		}
-	}
-	w.nbytes = 0
-	_, w.err = w.w.Write(bytes)
-}
-
-// RFC 1951 3.2.7 specifies a special run-length encoding for specifying
-// the literal and offset lengths arrays (which are concatenated into a single
-// array).  This method generates that run-length encoding.
-//
-// The result is written into the codegen array, and the frequencies
-// of each code is written into the codegenFreq array.
-// Codes 0-15 are single byte codes. Codes 16-18 are followed by additional
-// information.  Code badCode is an end marker
-//
-//  numLiterals      The number of literals in literalEncoding
-//  numOffsets       The number of offsets in offsetEncoding
-func (w *huffmanBitWriter) generateCodegen(numLiterals int, numOffsets int, offenc *huffmanEncoder) {
-	for i := range w.codegenFreq {
-		w.codegenFreq[i] = 0
-	}
-	// Note that we are using codegen both as a temporary variable for holding
-	// a copy of the frequencies, and as the place where we put the result.
-	// This is fine because the output is always shorter than the input used
-	// so far.
-	codegen := w.codegen // cache
-	// Copy the concatenated code sizes to codegen.  Put a marker at the end.
-	cgnl := codegen[0:numLiterals]
-	for i := range cgnl {
-		cgnl[i] = uint8(w.literalEncoding.codes[i].bits())
-	}
-
-	cgnl = codegen[numLiterals : numLiterals+numOffsets]
-	for i := range cgnl {
-		cgnl[i] = uint8(offenc.codes[i].bits())
-	}
-	codegen[numLiterals+numOffsets] = badCode
-
-	size := codegen[0]
-	count := 1
-	outIndex := 0
-	for inIndex := 1; size != badCode; inIndex++ {
-		// INVARIANT: We have seen "count" copies of size that have not yet
-		// had output generated for them.
-		nextSize := codegen[inIndex]
-		if nextSize == size {
-			count++
-			continue
-		}
-		// We need to generate codegen indicating "count" of size.
-		if size != 0 {
-			codegen[outIndex] = size
-			outIndex++
-			w.codegenFreq[size]++
-			count--
-			for count >= 3 {
-				n := 6
-				if n > count {
-					n = count
-				}
-				codegen[outIndex] = 16
-				outIndex++
-				codegen[outIndex] = uint8(n - 3)
-				outIndex++
-				w.codegenFreq[16]++
-				count -= n
-			}
-		} else {
-			for count >= 11 {
-				n := 138
-				if n > count {
-					n = count
-				}
-				codegen[outIndex] = 18
-				outIndex++
-				codegen[outIndex] = uint8(n - 11)
-				outIndex++
-				w.codegenFreq[18]++
-				count -= n
-			}
-			if count >= 3 {
-				// count >= 3 && count <= 10
-				codegen[outIndex] = 17
-				outIndex++
-				codegen[outIndex] = uint8(count - 3)
-				outIndex++
-				w.codegenFreq[17]++
-				count = 0
-			}
-		}
-		count--
-		for ; count >= 0; count-- {
-			codegen[outIndex] = size
-			outIndex++
-			w.codegenFreq[size]++
-		}
-		// Set up invariant for next time through the loop.
-		size = nextSize
-		count = 1
-	}
-	// Marker indicating the end of the codegen.
-	codegen[outIndex] = badCode
-}
-
-func (w *huffmanBitWriter) writeCode(c hcode) {
-	if w.err != nil {
-		return
-	}
-	w.bits |= uint64(c.code()) << w.nbits
-	w.nbits += c.bits()
-	if w.nbits >= 48 {
-		bits := w.bits
-		w.bits >>= 48
-		w.nbits -= 48
-		n := w.nbytes
-		w.bytes[n] = byte(bits)
-		w.bytes[n+1] = byte(bits >> 8)
-		w.bytes[n+2] = byte(bits >> 16)
-		w.bytes[n+3] = byte(bits >> 24)
-		w.bytes[n+4] = byte(bits >> 32)
-		w.bytes[n+5] = byte(bits >> 40)
-		n += 6
-		if n >= bufferSize-8 {
-			_, w.err = w.w.Write(w.bytes[:bufferSize-8])
-			n = 0
-		}
-		w.nbytes = n
-	}
-
-}
-
-// Write the header of a dynamic Huffman block to the output stream.
-//
-//  numLiterals  The number of literals specified in codegen
-//  numOffsets   The number of offsets specified in codegen
-//  numCodegens  The number of codegens used in codegen
-func (w *huffmanBitWriter) writeDynamicHeader(numLiterals int, numOffsets int, numCodegens int, isEof bool) {
-	if w.err != nil {
-		return
-	}
-	var firstBits int32 = 4
-	if isEof {
-		firstBits = 5
-	}
-	w.writeBits(firstBits, 3)
-	w.writeBits(int32(numLiterals-257), 5)
-	w.writeBits(int32(numOffsets-1), 5)
-	w.writeBits(int32(numCodegens-4), 4)
-
-	for i := 0; i < numCodegens; i++ {
-		value := w.codegenEncoding.codes[codegenOrder[i]].bits()
-		w.writeBits(int32(value), 3)
-	}
-
-	i := 0
-	for {
-		var codeWord int = int(w.codegen[i])
-		i++
-		if codeWord == badCode {
-			break
-		}
-		// The low byte contains the actual code to generate.
-		w.writeCode(w.codegenEncoding.codes[uint32(codeWord)])
-
-		switch codeWord {
-		case 16:
-			w.writeBits(int32(w.codegen[i]), 2)
-			i++
-			break
-		case 17:
-			w.writeBits(int32(w.codegen[i]), 3)
-			i++
-			break
-		case 18:
-			w.writeBits(int32(w.codegen[i]), 7)
-			i++
-			break
-		}
-	}
-}
-
-func (w *huffmanBitWriter) writeStoredHeader(length int, isEof bool) {
-	if w.err != nil {
-		return
-	}
-	var flag int32
-	if isEof {
-		flag = 1
-	}
-	w.writeBits(flag, 3)
-	w.flush()
-	w.writeBits(int32(length), 16)
-	w.writeBits(int32(^uint16(length)), 16)
-}
-
-func (w *huffmanBitWriter) writeFixedHeader(isEof bool) {
-	if w.err != nil {
-		return
-	}
-	// Indicate that we are a fixed Huffman block
-	var value int32 = 2
-	if isEof {
-		value = 3
-	}
-	w.writeBits(value, 3)
-}
-
-func (w *huffmanBitWriter) writeBlock(tok tokens, eof bool, input []byte) {
-	if w.err != nil {
-		return
-	}
-	for i := range w.literalFreq {
-		w.literalFreq[i] = 0
-	}
-	for i := range w.offsetFreq {
-		w.offsetFreq[i] = 0
-	}
-
-	tok.tokens[tok.n] = endBlockMarker
-	tokens := tok.tokens[0 : tok.n+1]
-
-	for _, t := range tokens {
-		if t < matchType {
-			w.literalFreq[t.literal()]++
-		} else {
-			length := t.length()
-			offset := t.offset()
-			w.literalFreq[lengthCodesStart+lengthCode(length)]++
-			w.offsetFreq[offsetCode(offset)]++
-		}
-	}
-
-	// get the number of literals
-	numLiterals := len(w.literalFreq)
-	for w.literalFreq[numLiterals-1] == 0 {
-		numLiterals--
-	}
-	// get the number of offsets
-	numOffsets := len(w.offsetFreq)
-	for numOffsets > 0 && w.offsetFreq[numOffsets-1] == 0 {
-		numOffsets--
-	}
-	if numOffsets == 0 {
-		// We haven't found a single match. If we want to go with the dynamic encoding,
-		// we should count at least one offset to be sure that the offset huffman tree could be encoded.
-		w.offsetFreq[0] = 1
-		numOffsets = 1
-	}
-
-	w.literalEncoding.generate(w.literalFreq, 15)
-	w.offsetEncoding.generate(w.offsetFreq, 15)
-
-	storedBytes := 0
-	if input != nil {
-		storedBytes = len(input)
-	}
-	var extraBits int64
-	var storedSize int64 = math.MaxInt64
-	if storedBytes <= maxStoreBlockSize && input != nil {
-		storedSize = int64((storedBytes + 5) * 8)
-		// We only bother calculating the costs of the extra bits required by
-		// the length of offset fields (which will be the same for both fixed
-		// and dynamic encoding), if we need to compare those two encodings
-		// against stored encoding.
-		for lengthCode := lengthCodesStart + 8; lengthCode < numLiterals; lengthCode++ {
-			// First eight length codes have extra size = 0.
-			extraBits += int64(w.literalFreq[lengthCode]) * int64(lengthExtraBits[lengthCode-lengthCodesStart])
-		}
-		for offsetCode := 4; offsetCode < numOffsets; offsetCode++ {
-			// First four offset codes have extra size = 0.
-			extraBits += int64(w.offsetFreq[offsetCode]) * int64(offsetExtraBits[offsetCode])
-		}
-	}
-
-	// Figure out smallest code.
-	// Fixed Huffman baseline.
-	var size = int64(3) +
-		fixedLiteralEncoding.bitLength(w.literalFreq) +
-		fixedOffsetEncoding.bitLength(w.offsetFreq) +
-		extraBits
-	var literalEncoding = fixedLiteralEncoding
-	var offsetEncoding = fixedOffsetEncoding
-
-	// Dynamic Huffman?
-	var numCodegens int
-
-	// Generate codegen and codegenFrequencies, which indicates how to encode
-	// the literalEncoding and the offsetEncoding.
-	w.generateCodegen(numLiterals, numOffsets, w.offsetEncoding)
-	w.codegenEncoding.generate(w.codegenFreq, 7)
-	numCodegens = len(w.codegenFreq)
-	for numCodegens > 4 && w.codegenFreq[codegenOrder[numCodegens-1]] == 0 {
-		numCodegens--
-	}
-	dynamicHeader := int64(3+5+5+4+(3*numCodegens)) +
-		w.codegenEncoding.bitLength(w.codegenFreq) +
-		int64(extraBits) +
-		int64(w.codegenFreq[16]*2) +
-		int64(w.codegenFreq[17]*3) +
-		int64(w.codegenFreq[18]*7)
-	dynamicSize := dynamicHeader +
-		w.literalEncoding.bitLength(w.literalFreq) +
-		w.offsetEncoding.bitLength(w.offsetFreq)
-
-	if dynamicSize < size {
-		size = dynamicSize
-		literalEncoding = w.literalEncoding
-		offsetEncoding = w.offsetEncoding
-	}
-
-	// Stored bytes?
-	if storedSize < size {
-		w.writeStoredHeader(storedBytes, eof)
-		w.writeBytes(input[0:storedBytes])
-		return
-	}
-
-	// Huffman.
-	if literalEncoding == fixedLiteralEncoding {
-		w.writeFixedHeader(eof)
-	} else {
-		w.writeDynamicHeader(numLiterals, numOffsets, numCodegens, eof)
-	}
-
-	leCodes := literalEncoding.codes
-	oeCodes := offsetEncoding.codes
-	for _, t := range tokens {
-		if t < matchType {
-			w.writeCode(leCodes[t.literal()])
-		} else {
-			// Write the length
-			length := t.length()
-			lengthCode := lengthCode(length)
-			w.writeCode(leCodes[lengthCode+lengthCodesStart])
-			extraLengthBits := uint(lengthExtraBits[lengthCode])
-			if extraLengthBits > 0 {
-				extraLength := int32(length - lengthBase[lengthCode])
-				w.writeBits(extraLength, extraLengthBits)
-			}
-			// Write the offset
-			offset := t.offset()
-			offsetCode := offsetCode(offset)
-			w.writeCode(oeCodes[offsetCode])
-			extraOffsetBits := uint(offsetExtraBits[offsetCode])
-			if extraOffsetBits > 0 {
-				extraOffset := int32(offset - offsetBase[offsetCode])
-				w.writeBits(extraOffset, extraOffsetBits)
-			}
-		}
-	}
-}
-
-// writeBlockDynamic will write a block as dynamic Huffman table
-// compressed. This should be used, if the caller has a reasonable expectation
-// that this block contains compressible data.
-func (w *huffmanBitWriter) writeBlockDynamic(tok tokens, eof bool, input []byte) {
-	if w.err != nil {
-		return
-	}
-	for i := range w.literalFreq {
-		w.literalFreq[i] = 0
-	}
-	for i := range w.offsetFreq {
-		w.offsetFreq[i] = 0
-	}
-
-	tok.tokens[tok.n] = endBlockMarker
-	tokens := tok.tokens[0 : tok.n+1]
-
-	for _, t := range tokens {
-		if t < matchType {
-			w.literalFreq[t.literal()]++
-		} else {
-			length := t.length()
-			offset := t.offset()
-			w.literalFreq[lengthCodesStart+lengthCode(length)]++
-			w.offsetFreq[offsetCode(offset)]++
-		}
-	}
-
-	// get the number of literals
-	numLiterals := len(w.literalFreq)
-	for w.literalFreq[numLiterals-1] == 0 {
-		numLiterals--
-	}
-	// get the number of offsets
-	numOffsets := len(w.offsetFreq)
-	for numOffsets > 0 && w.offsetFreq[numOffsets-1] == 0 {
-		numOffsets--
-	}
-	if numOffsets == 0 {
-		// We haven't found a single match. If we want to go with the dynamic encoding,
-		// we should count at least one offset to be sure that the offset huffman tree could be encoded.
-		w.offsetFreq[0] = 1
-		numOffsets = 1
-	}
-
-	w.literalEncoding.generate(w.literalFreq, 15)
-	w.offsetEncoding.generate(w.offsetFreq, 15)
-
-	var numCodegens int
-
-	// Generate codegen and codegenFrequencies, which indicates how to encode
-	// the literalEncoding and the offsetEncoding.
-	w.generateCodegen(numLiterals, numOffsets, w.offsetEncoding)
-	w.codegenEncoding.generate(w.codegenFreq, 7)
-	numCodegens = len(w.codegenFreq)
-	for numCodegens > 4 && w.codegenFreq[codegenOrder[numCodegens-1]] == 0 {
-		numCodegens--
-	}
-	var literalEncoding = w.literalEncoding
-	var offsetEncoding = w.offsetEncoding
-
-	// Write Huffman table.
-	w.writeDynamicHeader(numLiterals, numOffsets, numCodegens, eof)
-	leCodes := literalEncoding.codes
-	oeCodes := offsetEncoding.codes
-
-	for _, t := range tokens {
-		if t < matchType {
-			w.writeCode(leCodes[t.literal()])
-		} else {
-			// Write the length
-			length := t.length()
-			lengthCode := lengthCode(length)
-			w.writeCode(leCodes[lengthCode+lengthCodesStart])
-			extraLengthBits := uint(lengthExtraBits[lengthCode])
-			if extraLengthBits > 0 {
-				extraLength := int32(length - lengthBase[lengthCode])
-				w.writeBits(extraLength, extraLengthBits)
-			}
-			// Write the offset
-			offset := t.offset()
-			offsetCode := offsetCode(offset)
-			w.writeCode(oeCodes[offsetCode])
-			extraOffsetBits := uint(offsetExtraBits[offsetCode])
-			if extraOffsetBits > 0 {
-				extraOffset := int32(offset - offsetBase[offsetCode])
-				w.writeBits(extraOffset, extraOffsetBits)
-			}
-		}
-	}
-}
-
-// static offset encoder used for huffman only encoding.
-var huffOffset *huffmanEncoder
-
-func init() {
-	var w = newHuffmanBitWriter(nil)
-	w.offsetFreq[0] = 1
-	huffOffset = newHuffmanEncoder(offsetCodeCount)
-	huffOffset.generate(w.offsetFreq, 15)
-}
-
-// writeBlockHuff will write a block of bytes as either
-// Huffman encoded literals or uncompressed bytes if the
-// results only gains very little from compression.
-func (w *huffmanBitWriter) writeBlockHuff(eof bool, input []byte) {
-	if w.err != nil {
-		return
-	}
-
-	// Clear histogram
-	for i := range w.literalFreq {
-		w.literalFreq[i] = 0
-	}
-
-	// Add everything as literals
-	histogram(input, w.literalFreq)
-
-	w.literalFreq[endBlockMarker] = 1
-
-	const numLiterals = endBlockMarker + 1
-	const numOffsets = 1
-
-	w.literalEncoding.generate(w.literalFreq, 15)
-
-	// Figure out smallest code.
-	// Always use dynamic Huffman or Store
-	var numCodegens int
-
-	// Generate codegen and codegenFrequencies, which indicates how to encode
-	// the literalEncoding and the offsetEncoding.
-	w.generateCodegen(numLiterals, numOffsets, huffOffset)
-	w.codegenEncoding.generate(w.codegenFreq, 7)
-	numCodegens = len(w.codegenFreq)
-	for numCodegens > 4 && w.codegenFreq[codegenOrder[numCodegens-1]] == 0 {
-		numCodegens--
-	}
-	headerSize := int64(3+5+5+4+(3*numCodegens)) +
-		w.codegenEncoding.bitLength(w.codegenFreq) +
-		int64(w.codegenFreq[16]*2) +
-		int64(w.codegenFreq[17]*3) +
-		int64(w.codegenFreq[18]*7)
-
-	// Includes EOB marker
-	size := headerSize + w.literalEncoding.bitLength(w.literalFreq)
-
-	// Calculate stored size
-	var storedSize int64 = math.MaxInt64
-	var storedBytes = len(input)
-	if storedBytes <= maxStoreBlockSize {
-		storedSize = int64(storedBytes+5) * 8
-	}
-
-	// Store bytes, if we don't get a reasonable improvement.
-	if storedSize < (size + size>>4) {
-		w.writeStoredHeader(storedBytes, eof)
-		w.writeBytes(input)
-		return
-	}
-
-	// Huffman.
-	w.writeDynamicHeader(numLiterals, numOffsets, numCodegens, eof)
-	encoding := w.literalEncoding.codes
-	for _, t := range input {
-		// Bitwriting inlined, ~30% speedup
-		c := encoding[t]
-		w.bits |= uint64(c.code()) << w.nbits
-		w.nbits += c.bits()
-		if w.nbits >= 48 {
-			bits := w.bits
-			w.bits >>= 48
-			w.nbits -= 48
-			n := w.nbytes
-			w.bytes[n] = byte(bits)
-			w.bytes[n+1] = byte(bits >> 8)
-			w.bytes[n+2] = byte(bits >> 16)
-			w.bytes[n+3] = byte(bits >> 24)
-			w.bytes[n+4] = byte(bits >> 32)
-			w.bytes[n+5] = byte(bits >> 40)
-			n += 6
-			if n >= bufferSize-8 {
-				_, w.err = w.w.Write(w.bytes[:bufferSize-8])
-				if w.err != nil {
-					return
-				}
-				w.nbytes = 0
-			} else {
-				w.nbytes = n
-			}
-		}
-	}
-	w.writeCode(encoding[endBlockMarker])
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_code.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_code.go
deleted file mode 100644
index 9dba0faf33..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/huffman_code.go
+++ /dev/null
@@ -1,363 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package flate
-
-import (
-	"math"
-	"sort"
-)
-
-type hcode uint32
-
-type huffmanEncoder struct {
-	codes     []hcode
-	freqcache []literalNode
-	bitCount  [17]int32
-	lns       literalNodeSorter
-	lfs       literalFreqSorter
-}
-
-type literalNode struct {
-	literal uint16
-	freq    int32
-}
-
-// A levelInfo describes the state of the constructed tree for a given depth.
-type levelInfo struct {
-	// Our level.  for better printing
-	level int32
-
-	// The frequency of the last node at this level
-	lastFreq int32
-
-	// The frequency of the next character to add to this level
-	nextCharFreq int32
-
-	// The frequency of the next pair (from level below) to add to this level.
-	// Only valid if the "needed" value of the next lower level is 0.
-	nextPairFreq int32
-
-	// The number of chains remaining to generate for this level before moving
-	// up to the next level
-	needed int32
-}
-
-func (h hcode) codeBits() (code uint16, bits uint8) {
-	return uint16(h), uint8(h >> 16)
-}
-
-func (h *hcode) set(code uint16, bits uint8) {
-	*h = hcode(code) | hcode(uint32(bits)<<16)
-}
-
-func (h *hcode) setBits(bits uint8) {
-	*h = hcode(*h&0xffff) | hcode(uint32(bits)<<16)
-}
-
-func toCode(code uint16, bits uint8) hcode {
-	return hcode(code) | hcode(uint32(bits)<<16)
-}
-
-func (h hcode) code() (code uint16) {
-	return uint16(h)
-}
-
-func (h hcode) bits() (bits uint) {
-	return uint(h >> 16)
-}
-
-func maxNode() literalNode { return literalNode{math.MaxUint16, math.MaxInt32} }
-
-func newHuffmanEncoder(size int) *huffmanEncoder {
-	return &huffmanEncoder{codes: make([]hcode, size), freqcache: nil}
-}
-
-// Generates a HuffmanCode corresponding to the fixed literal table
-func generateFixedLiteralEncoding() *huffmanEncoder {
-	h := newHuffmanEncoder(maxNumLit)
-	codes := h.codes
-	var ch uint16
-	for ch = 0; ch < maxNumLit; ch++ {
-		var bits uint16
-		var size uint8
-		switch {
-		case ch < 144:
-			// size 8, 000110000  .. 10111111
-			bits = ch + 48
-			size = 8
-			break
-		case ch < 256:
-			// size 9, 110010000 .. 111111111
-			bits = ch + 400 - 144
-			size = 9
-			break
-		case ch < 280:
-			// size 7, 0000000 .. 0010111
-			bits = ch - 256
-			size = 7
-			break
-		default:
-			// size 8, 11000000 .. 11000111
-			bits = ch + 192 - 280
-			size = 8
-		}
-		codes[ch] = toCode(reverseBits(bits, size), size)
-	}
-	return h
-}
-
-func generateFixedOffsetEncoding() *huffmanEncoder {
-	h := newHuffmanEncoder(30)
-	codes := h.codes
-	for ch := uint16(0); ch < 30; ch++ {
-		codes[ch] = toCode(reverseBits(ch, 5), 5)
-	}
-	return h
-}
-
-var fixedLiteralEncoding *huffmanEncoder = generateFixedLiteralEncoding()
-var fixedOffsetEncoding *huffmanEncoder = generateFixedOffsetEncoding()
-
-func (h *huffmanEncoder) bitLength(freq []int32) int64 {
-	var total int64
-	for i, f := range freq {
-		if f != 0 {
-			total += int64(f) * int64(h.codes[i].bits())
-		}
-	}
-	return total
-}
-
-const maxBitsLimit = 16
-
-// Return the number of literals assigned to each bit size in the Huffman encoding
-//
-// This method is only called when list.length >= 3
-// The cases of 0, 1, and 2 literals are handled by special case code.
-//
-// list  An array of the literals with non-zero frequencies
-//             and their associated frequencies.  The array is in order of increasing
-//             frequency, and has as its last element a special element with frequency
-//             MaxInt32
-// maxBits     The maximum number of bits that should be used to encode any literal.
-//             Must be less than 16.
-// return      An integer array in which array[i] indicates the number of literals
-//             that should be encoded in i bits.
-func (h *huffmanEncoder) bitCounts(list []literalNode, maxBits int32) []int32 {
-	if maxBits >= maxBitsLimit {
-		panic("flate: maxBits too large")
-	}
-	n := int32(len(list))
-	list = list[0 : n+1]
-	list[n] = maxNode()
-
-	// The tree can't have greater depth than n - 1, no matter what.  This
-	// saves a little bit of work in some small cases
-	if maxBits > n-1 {
-		maxBits = n - 1
-	}
-
-	// Create information about each of the levels.
-	// A bogus "Level 0" whose sole purpose is so that
-	// level1.prev.needed==0.  This makes level1.nextPairFreq
-	// be a legitimate value that never gets chosen.
-	var levels [maxBitsLimit]levelInfo
-	// leafCounts[i] counts the number of literals at the left
-	// of ancestors of the rightmost node at level i.
-	// leafCounts[i][j] is the number of literals at the left
-	// of the level j ancestor.
-	var leafCounts [maxBitsLimit][maxBitsLimit]int32
-
-	for level := int32(1); level <= maxBits; level++ {
-		// For every level, the first two items are the first two characters.
-		// We initialize the levels as if we had already figured this out.
-		levels[level] = levelInfo{
-			level:        level,
-			lastFreq:     list[1].freq,
-			nextCharFreq: list[2].freq,
-			nextPairFreq: list[0].freq + list[1].freq,
-		}
-		leafCounts[level][level] = 2
-		if level == 1 {
-			levels[level].nextPairFreq = math.MaxInt32
-		}
-	}
-
-	// We need a total of 2*n - 2 items at top level and have already generated 2.
-	levels[maxBits].needed = 2*n - 4
-
-	level := maxBits
-	for {
-		l := &levels[level]
-		if l.nextPairFreq == math.MaxInt32 && l.nextCharFreq == math.MaxInt32 {
-			// We've run out of both leafs and pairs.
-			// End all calculations for this level.
-			// To make sure we never come back to this level or any lower level,
-			// set nextPairFreq impossibly large.
-			l.needed = 0
-			levels[level+1].nextPairFreq = math.MaxInt32
-			level++
-			continue
-		}
-
-		prevFreq := l.lastFreq
-		if l.nextCharFreq < l.nextPairFreq {
-			// The next item on this row is a leaf node.
-			n := leafCounts[level][level] + 1
-			l.lastFreq = l.nextCharFreq
-			// Lower leafCounts are the same of the previous node.
-			leafCounts[level][level] = n
-			l.nextCharFreq = list[n].freq
-		} else {
-			// The next item on this row is a pair from the previous row.
-			// nextPairFreq isn't valid until we generate two
-			// more values in the level below
-			l.lastFreq = l.nextPairFreq
-			// Take leaf counts from the lower level, except counts[level] remains the same.
-			copy(leafCounts[level][:level], leafCounts[level-1][:level])
-			levels[l.level-1].needed = 2
-		}
-
-		if l.needed--; l.needed == 0 {
-			// We've done everything we need to do for this level.
-			// Continue calculating one level up.  Fill in nextPairFreq
-			// of that level with the sum of the two nodes we've just calculated on
-			// this level.
-			if l.level == maxBits {
-				// All done!
-				break
-			}
-			levels[l.level+1].nextPairFreq = prevFreq + l.lastFreq
-			level++
-		} else {
-			// If we stole from below, move down temporarily to replenish it.
-			for levels[level-1].needed > 0 {
-				level--
-			}
-		}
-	}
-
-	// Somethings is wrong if at the end, the top level is null or hasn't used
-	// all of the leaves.
-	if leafCounts[maxBits][maxBits] != n {
-		panic("leafCounts[maxBits][maxBits] != n")
-	}
-
-	bitCount := h.bitCount[:maxBits+1]
-	//make([]int32, maxBits+1)
-	bits := 1
-	counts := &leafCounts[maxBits]
-	for level := maxBits; level > 0; level-- {
-		// chain.leafCount gives the number of literals requiring at least "bits"
-		// bits to encode.
-		bitCount[bits] = counts[level] - counts[level-1]
-		bits++
-	}
-	return bitCount
-}
-
-// Look at the leaves and assign them a bit count and an encoding as specified
-// in RFC 1951 3.2.2
-func (h *huffmanEncoder) assignEncodingAndSize(bitCount []int32, list []literalNode) {
-	code := uint16(0)
-	for n, bits := range bitCount {
-		code <<= 1
-		if n == 0 || bits == 0 {
-			continue
-		}
-		// The literals list[len(list)-bits] .. list[len(list)-bits]
-		// are encoded using "bits" bits, and get the values
-		// code, code + 1, ....  The code values are
-		// assigned in literal order (not frequency order).
-		chunk := list[len(list)-int(bits):]
-
-		h.lns.Sort(chunk)
-		for _, node := range chunk {
-			h.codes[node.literal] = toCode(reverseBits(code, uint8(n)), uint8(n))
-			code++
-		}
-		list = list[0 : len(list)-int(bits)]
-	}
-}
-
-// Update this Huffman Code object to be the minimum code for the specified frequency count.
-//
-// freq  An array of frequencies, in which frequency[i] gives the frequency of literal i.
-// maxBits  The maximum number of bits to use for any literal.
-func (h *huffmanEncoder) generate(freq []int32, maxBits int32) {
-	if h.freqcache == nil {
-		h.freqcache = make([]literalNode, 300)
-	}
-	list := h.freqcache[:len(freq)+1]
-	// Number of non-zero literals
-	count := 0
-	// Set list to be the set of all non-zero literals and their frequencies
-	for i, f := range freq {
-		if f != 0 {
-			list[count] = literalNode{uint16(i), f}
-			count++
-		} else {
-			list[count] = literalNode{}
-			//h.codeBits[i] = 0
-			h.codes[i].setBits(0)
-		}
-	}
-	list[len(freq)] = literalNode{}
-	// If freq[] is shorter than codeBits[], fill rest of codeBits[] with zeros
-	// FIXME: Doesn't do what it says on the tin (klauspost)
-	//h.codeBits = h.codeBits[0:len(freq)]
-
-	list = list[0:count]
-	if count <= 2 {
-		// Handle the small cases here, because they are awkward for the general case code.  With
-		// two or fewer literals, everything has bit length 1.
-		for i, node := range list {
-			// "list" is in order of increasing literal value.
-			h.codes[node.literal].set(uint16(i), 1)
-			//h.codeBits[node.literal] = 1
-			//h.code[node.literal] = uint16(i)
-		}
-		return
-	}
-	h.lfs.Sort(list)
-
-	// Get the number of literals for each bit count
-	bitCount := h.bitCounts(list, maxBits)
-	// And do the assignment
-	h.assignEncodingAndSize(bitCount, list)
-}
-
-type literalNodeSorter []literalNode
-
-func (s *literalNodeSorter) Sort(a []literalNode) {
-	*s = literalNodeSorter(a)
-	sort.Sort(s)
-}
-
-func (s literalNodeSorter) Len() int { return len(s) }
-
-func (s literalNodeSorter) Less(i, j int) bool {
-	return s[i].literal < s[j].literal
-}
-
-func (s literalNodeSorter) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-
-type literalFreqSorter []literalNode
-
-func (s *literalFreqSorter) Sort(a []literalNode) {
-	*s = literalFreqSorter(a)
-	sort.Sort(s)
-}
-
-func (s literalFreqSorter) Len() int { return len(s) }
-
-func (s literalFreqSorter) Less(i, j int) bool {
-	if s[i].freq == s[j].freq {
-		return s[i].literal < s[j].literal
-	}
-	return s[i].freq < s[j].freq
-}
-
-func (s literalFreqSorter) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/inflate.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/inflate.go
deleted file mode 100644
index 91e27e7e28..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/inflate.go
+++ /dev/null
@@ -1,846 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run gen.go -output fixedhuff.go
-
-// Package flate implements the DEFLATE compressed data format, described in
-// RFC 1951.  The gzip and zlib packages implement access to DEFLATE-based file
-// formats.
-package flate
-
-import (
-	"bufio"
-	"io"
-	"strconv"
-)
-
-const (
-	maxCodeLen = 16    // max length of Huffman code
-	maxHist    = 32768 // max history required
-	// The next three numbers come from the RFC section 3.2.7, with the
-	// additional proviso in section 3.2.5 which implies that distance codes
-	// 30 and 31 should never occur in compressed data.
-	maxNumLit  = 286
-	maxNumDist = 30
-	numCodes   = 19 // number of codes in Huffman meta-code
-)
-
-// A CorruptInputError reports the presence of corrupt input at a given offset.
-type CorruptInputError int64
-
-func (e CorruptInputError) Error() string {
-	return "flate: corrupt input before offset " + strconv.FormatInt(int64(e), 10)
-}
-
-// An InternalError reports an error in the flate code itself.
-type InternalError string
-
-func (e InternalError) Error() string { return "flate: internal error: " + string(e) }
-
-// A ReadError reports an error encountered while reading input.
-type ReadError struct {
-	Offset int64 // byte offset where error occurred
-	Err    error // error returned by underlying Read
-}
-
-func (e *ReadError) Error() string {
-	return "flate: read error at offset " + strconv.FormatInt(e.Offset, 10) + ": " + e.Err.Error()
-}
-
-// A WriteError reports an error encountered while writing output.
-type WriteError struct {
-	Offset int64 // byte offset where error occurred
-	Err    error // error returned by underlying Write
-}
-
-func (e *WriteError) Error() string {
-	return "flate: write error at offset " + strconv.FormatInt(e.Offset, 10) + ": " + e.Err.Error()
-}
-
-// Resetter resets a ReadCloser returned by NewReader or NewReaderDict to
-// to switch to a new underlying Reader. This permits reusing a ReadCloser
-// instead of allocating a new one.
-type Resetter interface {
-	// Reset discards any buffered data and resets the Resetter as if it was
-	// newly initialized with the given reader.
-	Reset(r io.Reader, dict []byte) error
-}
-
-// Note that much of the implementation of huffmanDecoder is also copied
-// into gen.go (in package main) for the purpose of precomputing the
-// fixed huffman tables so they can be included statically.
-
-// The data structure for decoding Huffman tables is based on that of
-// zlib. There is a lookup table of a fixed bit width (huffmanChunkBits),
-// For codes smaller than the table width, there are multiple entries
-// (each combination of trailing bits has the same value). For codes
-// larger than the table width, the table contains a link to an overflow
-// table. The width of each entry in the link table is the maximum code
-// size minus the chunk width.
-
-// Note that you can do a lookup in the table even without all bits
-// filled. Since the extra bits are zero, and the DEFLATE Huffman codes
-// have the property that shorter codes come before longer ones, the
-// bit length estimate in the result is a lower bound on the actual
-// number of bits.
-
-// chunk & 15 is number of bits
-// chunk >> 4 is value, including table link
-
-const (
-	huffmanChunkBits  = 9
-	huffmanNumChunks  = 1 << huffmanChunkBits
-	huffmanCountMask  = 15
-	huffmanValueShift = 4
-)
-
-type huffmanDecoder struct {
-	min      int                      // the minimum code length
-	chunks   [huffmanNumChunks]uint32 // chunks as described above
-	links    [][]uint32               // overflow links
-	linkMask uint32                   // mask the width of the link table
-}
-
-// Initialize Huffman decoding tables from array of code lengths.
-// Following this function, h is guaranteed to be initialized into a complete
-// tree (i.e., neither over-subscribed nor under-subscribed). The exception is a
-// degenerate case where the tree has only a single symbol with length 1. Empty
-// trees are permitted.
-func (h *huffmanDecoder) init(bits []int) bool {
-	// Sanity enables additional runtime tests during Huffman
-	// table construction.  It's intended to be used during
-	// development to supplement the currently ad-hoc unit tests.
-	const sanity = false
-
-	if h.min != 0 {
-		*h = huffmanDecoder{}
-	}
-
-	// Count number of codes of each length,
-	// compute min and max length.
-	var count [maxCodeLen]int
-	var min, max int
-	for _, n := range bits {
-		if n == 0 {
-			continue
-		}
-		if min == 0 || n < min {
-			min = n
-		}
-		if n > max {
-			max = n
-		}
-		count[n]++
-	}
-
-	// Empty tree. The decompressor.huffSym function will fail later if the tree
-	// is used. Technically, an empty tree is only valid for the HDIST tree and
-	// not the HCLEN and HLIT tree. However, a stream with an empty HCLEN tree
-	// is guaranteed to fail since it will attempt to use the tree to decode the
-	// codes for the HLIT and HDIST trees. Similarly, an empty HLIT tree is
-	// guaranteed to fail later since the compressed data section must be
-	// composed of at least one symbol (the end-of-block marker).
-	if max == 0 {
-		return true
-	}
-
-	code := 0
-	var nextcode [maxCodeLen]int
-	for i := min; i <= max; i++ {
-		code <<= 1
-		nextcode[i] = code
-		code += count[i]
-	}
-
-	// Check that the coding is complete (i.e., that we've
-	// assigned all 2-to-the-max possible bit sequences).
-	// Exception: To be compatible with zlib, we also need to
-	// accept degenerate single-code codings.  See also
-	// TestDegenerateHuffmanCoding.
-	if code != 1<<uint(max) && !(code == 1 && max == 1) {
-		return false
-	}
-
-	h.min = min
-	if max > huffmanChunkBits {
-		numLinks := 1 << (uint(max) - huffmanChunkBits)
-		h.linkMask = uint32(numLinks - 1)
-
-		// create link tables
-		link := nextcode[huffmanChunkBits+1] >> 1
-		h.links = make([][]uint32, huffmanNumChunks-link)
-		for j := uint(link); j < huffmanNumChunks; j++ {
-			reverse := int(reverseByte[j>>8]) | int(reverseByte[j&0xff])<<8
-			reverse >>= uint(16 - huffmanChunkBits)
-			off := j - uint(link)
-			if sanity && h.chunks[reverse] != 0 {
-				panic("impossible: overwriting existing chunk")
-			}
-			h.chunks[reverse] = uint32(off<<huffmanValueShift | (huffmanChunkBits + 1))
-			h.links[off] = make([]uint32, numLinks)
-		}
-	}
-
-	for i, n := range bits {
-		if n == 0 {
-			continue
-		}
-		code := nextcode[n]
-		nextcode[n]++
-		chunk := uint32(i<<huffmanValueShift | n)
-		reverse := int(reverseByte[code>>8]) | int(reverseByte[code&0xff])<<8
-		reverse >>= uint(16 - n)
-		if n <= huffmanChunkBits {
-			for off := reverse; off < len(h.chunks); off += 1 << uint(n) {
-				// We should never need to overwrite
-				// an existing chunk.  Also, 0 is
-				// never a valid chunk, because the
-				// lower 4 "count" bits should be
-				// between 1 and 15.
-				if sanity && h.chunks[off] != 0 {
-					panic("impossible: overwriting existing chunk")
-				}
-				h.chunks[off] = chunk
-			}
-		} else {
-			j := reverse & (huffmanNumChunks - 1)
-			if sanity && h.chunks[j]&huffmanCountMask != huffmanChunkBits+1 {
-				// Longer codes should have been
-				// associated with a link table above.
-				panic("impossible: not an indirect chunk")
-			}
-			value := h.chunks[j] >> huffmanValueShift
-			linktab := h.links[value]
-			reverse >>= huffmanChunkBits
-			for off := reverse; off < len(linktab); off += 1 << uint(n-huffmanChunkBits) {
-				if sanity && linktab[off] != 0 {
-					panic("impossible: overwriting existing chunk")
-				}
-				linktab[off] = chunk
-			}
-		}
-	}
-
-	if sanity {
-		// Above we've sanity checked that we never overwrote
-		// an existing entry.  Here we additionally check that
-		// we filled the tables completely.
-		for i, chunk := range h.chunks {
-			if chunk == 0 {
-				// As an exception, in the degenerate
-				// single-code case, we allow odd
-				// chunks to be missing.
-				if code == 1 && i%2 == 1 {
-					continue
-				}
-				panic("impossible: missing chunk")
-			}
-		}
-		for _, linktab := range h.links {
-			for _, chunk := range linktab {
-				if chunk == 0 {
-					panic("impossible: missing chunk")
-				}
-			}
-		}
-	}
-
-	return true
-}
-
-// The actual read interface needed by NewReader.
-// If the passed in io.Reader does not also have ReadByte,
-// the NewReader will introduce its own buffering.
-type Reader interface {
-	io.Reader
-	io.ByteReader
-}
-
-// Decompress state.
-type decompressor struct {
-	// Input source.
-	r       Reader
-	roffset int64
-	woffset int64
-
-	// Input bits, in top of b.
-	b  uint32
-	nb uint
-
-	// Huffman decoders for literal/length, distance.
-	h1, h2 huffmanDecoder
-
-	// Length arrays used to define Huffman codes.
-	bits     *[maxNumLit + maxNumDist]int
-	codebits *[numCodes]int
-
-	// Output history, buffer.
-	hist  *[maxHist]byte
-	hp    int  // current output position in buffer
-	hw    int  // have written hist[0:hw] already
-	hfull bool // buffer has filled at least once
-
-	// Temporary buffer (avoids repeated allocation).
-	buf [4]byte
-
-	// Next step in the decompression,
-	// and decompression state.
-	step     func(*decompressor)
-	final    bool
-	err      error
-	toRead   []byte
-	hl, hd   *huffmanDecoder
-	copyLen  int
-	copyDist int
-}
-
-func (f *decompressor) nextBlock() {
-	if f.final {
-		if f.hw != f.hp {
-			f.flush((*decompressor).nextBlock)
-			return
-		}
-		f.err = io.EOF
-		return
-	}
-	for f.nb < 1+2 {
-		if f.err = f.moreBits(); f.err != nil {
-			return
-		}
-	}
-	f.final = f.b&1 == 1
-	f.b >>= 1
-	typ := f.b & 3
-	f.b >>= 2
-	f.nb -= 1 + 2
-	switch typ {
-	case 0:
-		f.dataBlock()
-	case 1:
-		// compressed, fixed Huffman tables
-		f.hl = &fixedHuffmanDecoder
-		f.hd = nil
-		f.huffmanBlock()
-	case 2:
-		// compressed, dynamic Huffman tables
-		if f.err = f.readHuffman(); f.err != nil {
-			break
-		}
-		f.hl = &f.h1
-		f.hd = &f.h2
-		f.huffmanBlock()
-	default:
-		// 3 is reserved.
-		f.err = CorruptInputError(f.roffset)
-	}
-}
-
-func (f *decompressor) Read(b []byte) (int, error) {
-	for {
-		if len(f.toRead) > 0 {
-			n := copy(b, f.toRead)
-			f.toRead = f.toRead[n:]
-			return n, nil
-		}
-		if f.err != nil {
-			return 0, f.err
-		}
-		f.step(f)
-	}
-}
-
-// Support the io.WriteTo interface for io.Copy and friends.
-func (f *decompressor) WriteTo(w io.Writer) (int64, error) {
-	total := int64(0)
-	for {
-		if f.err != nil {
-			if f.err == io.EOF {
-				return total, nil
-			}
-			return total, f.err
-		}
-		if len(f.toRead) > 0 {
-			var n int
-			n, f.err = w.Write(f.toRead)
-			if f.err != nil {
-				return total, f.err
-			}
-			if n != len(f.toRead) {
-				return total, io.ErrShortWrite
-			}
-			f.toRead = f.toRead[:0]
-			total += int64(n)
-		}
-		f.step(f)
-	}
-}
-
-func (f *decompressor) Close() error {
-	if f.err == io.EOF {
-		return nil
-	}
-	return f.err
-}
-
-// RFC 1951 section 3.2.7.
-// Compression with dynamic Huffman codes
-
-var codeOrder = [...]int{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}
-
-func (f *decompressor) readHuffman() error {
-	// HLIT[5], HDIST[5], HCLEN[4].
-	for f.nb < 5+5+4 {
-		if err := f.moreBits(); err != nil {
-			return err
-		}
-	}
-	nlit := int(f.b&0x1F) + 257
-	if nlit > maxNumLit {
-		return CorruptInputError(f.roffset)
-	}
-	f.b >>= 5
-	ndist := int(f.b&0x1F) + 1
-	if ndist > maxNumDist {
-		return CorruptInputError(f.roffset)
-	}
-	f.b >>= 5
-	nclen := int(f.b&0xF) + 4
-	// numCodes is 19, so nclen is always valid.
-	f.b >>= 4
-	f.nb -= 5 + 5 + 4
-
-	// (HCLEN+4)*3 bits: code lengths in the magic codeOrder order.
-	for i := 0; i < nclen; i++ {
-		for f.nb < 3 {
-			if err := f.moreBits(); err != nil {
-				return err
-			}
-		}
-		f.codebits[codeOrder[i]] = int(f.b & 0x7)
-		f.b >>= 3
-		f.nb -= 3
-	}
-	for i := nclen; i < len(codeOrder); i++ {
-		f.codebits[codeOrder[i]] = 0
-	}
-	if !f.h1.init(f.codebits[0:]) {
-		return CorruptInputError(f.roffset)
-	}
-
-	// HLIT + 257 code lengths, HDIST + 1 code lengths,
-	// using the code length Huffman code.
-	for i, n := 0, nlit+ndist; i < n; {
-		x, err := f.huffSym(&f.h1)
-		if err != nil {
-			return err
-		}
-		if x < 16 {
-			// Actual length.
-			f.bits[i] = x
-			i++
-			continue
-		}
-		// Repeat previous length or zero.
-		var rep int
-		var nb uint
-		var b int
-		switch x {
-		default:
-			return InternalError("unexpected length code")
-		case 16:
-			rep = 3
-			nb = 2
-			if i == 0 {
-				return CorruptInputError(f.roffset)
-			}
-			b = f.bits[i-1]
-		case 17:
-			rep = 3
-			nb = 3
-			b = 0
-		case 18:
-			rep = 11
-			nb = 7
-			b = 0
-		}
-		for f.nb < nb {
-			if err := f.moreBits(); err != nil {
-				return err
-			}
-		}
-		rep += int(f.b & uint32(1<<nb-1))
-		f.b >>= nb
-		f.nb -= nb
-		if i+rep > n {
-			return CorruptInputError(f.roffset)
-		}
-		for j := 0; j < rep; j++ {
-			f.bits[i] = b
-			i++
-		}
-	}
-
-	if !f.h1.init(f.bits[0:nlit]) || !f.h2.init(f.bits[nlit:nlit+ndist]) {
-		return CorruptInputError(f.roffset)
-	}
-
-	// In order to preserve the property that we never read any extra bytes
-	// after the end of the DEFLATE stream, huffSym conservatively reads min
-	// bits at a time until it decodes the symbol. However, since every block
-	// must end with an EOB marker, we can use that as the minimum number of
-	// bits to read and guarantee we never read past the end of the stream.
-	if f.bits[endBlockMarker] > 0 {
-		f.h1.min = f.bits[endBlockMarker] // Length of EOB marker
-	}
-
-	return nil
-}
-
-// Decode a single Huffman block from f.
-// hl and hd are the Huffman states for the lit/length values
-// and the distance values, respectively.  If hd == nil, using the
-// fixed distance encoding associated with fixed Huffman blocks.
-func (f *decompressor) huffmanBlock() {
-	for {
-		v, err := f.huffSym(f.hl)
-		if err != nil {
-			f.err = err
-			return
-		}
-		var n uint // number of bits extra
-		var length int
-		switch {
-		case v < 256:
-			f.hist[f.hp] = byte(v)
-			f.hp++
-			if f.hp == len(f.hist) {
-				// After the flush, continue this loop.
-				f.flush((*decompressor).huffmanBlock)
-				return
-			}
-			continue
-		case v == 256:
-			// Done with huffman block; read next block.
-			f.step = (*decompressor).nextBlock
-			return
-		// otherwise, reference to older data
-		case v < 265:
-			length = v - (257 - 3)
-			n = 0
-		case v < 269:
-			length = v*2 - (265*2 - 11)
-			n = 1
-		case v < 273:
-			length = v*4 - (269*4 - 19)
-			n = 2
-		case v < 277:
-			length = v*8 - (273*8 - 35)
-			n = 3
-		case v < 281:
-			length = v*16 - (277*16 - 67)
-			n = 4
-		case v < 285:
-			length = v*32 - (281*32 - 131)
-			n = 5
-		case v < maxNumLit:
-			length = 258
-			n = 0
-		default:
-			f.err = CorruptInputError(f.roffset)
-			return
-		}
-		if n > 0 {
-			for f.nb < n {
-				if err = f.moreBits(); err != nil {
-					f.err = err
-					return
-				}
-			}
-			length += int(f.b & uint32(1<<n-1))
-			f.b >>= n
-			f.nb -= n
-		}
-
-		var dist int
-		if f.hd == nil {
-			for f.nb < 5 {
-				if err = f.moreBits(); err != nil {
-					f.err = err
-					return
-				}
-			}
-			dist = int(reverseByte[(f.b&0x1F)<<3])
-			f.b >>= 5
-			f.nb -= 5
-		} else {
-			if dist, err = f.huffSym(f.hd); err != nil {
-				f.err = err
-				return
-			}
-		}
-
-		switch {
-		case dist < 4:
-			dist++
-		case dist < maxNumDist:
-			nb := uint(dist-2) >> 1
-			// have 1 bit in bottom of dist, need nb more.
-			extra := (dist & 1) << nb
-			for f.nb < nb {
-				if err = f.moreBits(); err != nil {
-					f.err = err
-					return
-				}
-			}
-			extra |= int(f.b & uint32(1<<nb-1))
-			f.b >>= nb
-			f.nb -= nb
-			dist = 1<<(nb+1) + 1 + extra
-		default:
-			f.err = CorruptInputError(f.roffset)
-			return
-		}
-
-		// Copy history[-dist:-dist+length] into output.
-		if dist > len(f.hist) {
-			f.err = InternalError("bad history distance")
-			return
-		}
-
-		// No check on length; encoding can be prescient.
-		if !f.hfull && dist > f.hp {
-			f.err = CorruptInputError(f.roffset)
-			return
-		}
-
-		f.copyLen, f.copyDist = length, dist
-		if f.copyHist() {
-			return
-		}
-	}
-}
-
-// copyHist copies f.copyLen bytes from f.hist (f.copyDist bytes ago) to itself.
-// It reports whether the f.hist buffer is full.
-func (f *decompressor) copyHist() bool {
-	p := f.hp - f.copyDist
-	if p < 0 {
-		p += len(f.hist)
-	}
-	for f.copyLen > 0 {
-		n := f.copyLen
-		if x := len(f.hist) - f.hp; n > x {
-			n = x
-		}
-		if x := len(f.hist) - p; n > x {
-			n = x
-		}
-		forwardCopy(f.hist[:], f.hp, p, n)
-		p += n
-		f.hp += n
-		f.copyLen -= n
-		if f.hp == len(f.hist) {
-			// After flush continue copying out of history.
-			f.flush((*decompressor).copyHuff)
-			return true
-		}
-		if p == len(f.hist) {
-			p = 0
-		}
-	}
-	return false
-}
-
-func (f *decompressor) copyHuff() {
-	if f.copyHist() {
-		return
-	}
-	f.huffmanBlock()
-}
-
-// Copy a single uncompressed data block from input to output.
-func (f *decompressor) dataBlock() {
-	// Uncompressed.
-	// Discard current half-byte.
-	f.nb = 0
-	f.b = 0
-
-	// Length then ones-complement of length.
-	nr, err := io.ReadFull(f.r, f.buf[0:4])
-	f.roffset += int64(nr)
-	if err != nil {
-		f.err = &ReadError{f.roffset, err}
-		return
-	}
-	n := int(f.buf[0]) | int(f.buf[1])<<8
-	nn := int(f.buf[2]) | int(f.buf[3])<<8
-	if uint16(nn) != uint16(^n) {
-		f.err = CorruptInputError(f.roffset)
-		return
-	}
-
-	if n == 0 {
-		// 0-length block means sync
-		f.flush((*decompressor).nextBlock)
-		return
-	}
-
-	f.copyLen = n
-	f.copyData()
-}
-
-// copyData copies f.copyLen bytes from the underlying reader into f.hist.
-// It pauses for reads when f.hist is full.
-func (f *decompressor) copyData() {
-	n := f.copyLen
-	for n > 0 {
-		m := len(f.hist) - f.hp
-		if m > n {
-			m = n
-		}
-		m, err := io.ReadFull(f.r, f.hist[f.hp:f.hp+m])
-		f.roffset += int64(m)
-		if err != nil {
-			f.err = &ReadError{f.roffset, err}
-			return
-		}
-		n -= m
-		f.hp += m
-		if f.hp == len(f.hist) {
-			f.copyLen = n
-			f.flush((*decompressor).copyData)
-			return
-		}
-	}
-	f.step = (*decompressor).nextBlock
-}
-
-func (f *decompressor) setDict(dict []byte) {
-	if len(dict) > len(f.hist) {
-		// Will only remember the tail.
-		dict = dict[len(dict)-len(f.hist):]
-	}
-
-	f.hp = copy(f.hist[:], dict)
-	if f.hp == len(f.hist) {
-		f.hp = 0
-		f.hfull = true
-	}
-	f.hw = f.hp
-}
-
-func (f *decompressor) moreBits() error {
-	c, err := f.r.ReadByte()
-	if err != nil {
-		if err == io.EOF {
-			err = io.ErrUnexpectedEOF
-		}
-		return err
-	}
-	f.roffset++
-	f.b |= uint32(c) << f.nb
-	f.nb += 8
-	return nil
-}
-
-// Read the next Huffman-encoded symbol from f according to h.
-func (f *decompressor) huffSym(h *huffmanDecoder) (int, error) {
-	// Since a huffmanDecoder can be empty or be composed of a degenerate tree
-	// with single element, huffSym must error on these two edge cases. In both
-	// cases, the chunks slice will be 0 for the invalid sequence, leading it
-	// satisfy the n == 0 check below.
-	n := uint(h.min)
-	for {
-		for f.nb < n {
-			if err := f.moreBits(); err != nil {
-				return 0, err
-			}
-		}
-		chunk := h.chunks[f.b&(huffmanNumChunks-1)]
-		n = uint(chunk & huffmanCountMask)
-		if n > huffmanChunkBits {
-			chunk = h.links[chunk>>huffmanValueShift][(f.b>>huffmanChunkBits)&h.linkMask]
-			n = uint(chunk & huffmanCountMask)
-		}
-		if n <= f.nb {
-			if n == 0 {
-				f.err = CorruptInputError(f.roffset)
-				return 0, f.err
-			}
-			f.b >>= n
-			f.nb -= n
-			return int(chunk >> huffmanValueShift), nil
-		}
-	}
-}
-
-// Flush any buffered output to the underlying writer.
-func (f *decompressor) flush(step func(*decompressor)) {
-	f.toRead = f.hist[f.hw:f.hp]
-	f.woffset += int64(f.hp - f.hw)
-	f.hw = f.hp
-	if f.hp == len(f.hist) {
-		f.hp = 0
-		f.hw = 0
-		f.hfull = true
-	}
-	f.step = step
-}
-
-func makeReader(r io.Reader) Reader {
-	if rr, ok := r.(Reader); ok {
-		return rr
-	}
-	return bufio.NewReader(r)
-}
-
-func (f *decompressor) Reset(r io.Reader, dict []byte) error {
-	*f = decompressor{
-		r:        makeReader(r),
-		bits:     f.bits,
-		codebits: f.codebits,
-		hist:     f.hist,
-		step:     (*decompressor).nextBlock,
-	}
-	if dict != nil {
-		f.setDict(dict)
-	}
-	return nil
-}
-
-// NewReader returns a new ReadCloser that can be used
-// to read the uncompressed version of r.
-// If r does not also implement io.ByteReader,
-// the decompressor may read more data than necessary from r.
-// It is the caller's responsibility to call Close on the ReadCloser
-// when finished reading.
-//
-// The ReadCloser returned by NewReader also implements Resetter.
-func NewReader(r io.Reader) io.ReadCloser {
-	var f decompressor
-	f.bits = new([maxNumLit + maxNumDist]int)
-	f.codebits = new([numCodes]int)
-	f.r = makeReader(r)
-	f.hist = new([maxHist]byte)
-	f.step = (*decompressor).nextBlock
-	return &f
-}
-
-// NewReaderDict is like NewReader but initializes the reader
-// with a preset dictionary.  The returned Reader behaves as if
-// the uncompressed data stream started with the given dictionary,
-// which has already been read.  NewReaderDict is typically used
-// to read data compressed by NewWriterDict.
-//
-// The ReadCloser returned by NewReader also implements Resetter.
-func NewReaderDict(r io.Reader, dict []byte) io.ReadCloser {
-	var f decompressor
-	f.r = makeReader(r)
-	f.hist = new([maxHist]byte)
-	f.bits = new([maxNumLit + maxNumDist]int)
-	f.codebits = new([numCodes]int)
-	f.step = (*decompressor).nextBlock
-	f.setDict(dict)
-	return &f
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/reverse_bits.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/reverse_bits.go
deleted file mode 100644
index c1a02720d1..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/reverse_bits.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package flate
-
-var reverseByte = [256]byte{
-	0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-	0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-	0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-	0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-	0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-	0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-	0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-	0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-	0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-	0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-	0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-	0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-	0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-	0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-	0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-	0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-	0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-	0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-	0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-	0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-	0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-	0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-	0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-	0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-	0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-	0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-	0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-	0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-	0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-	0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-	0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-	0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
-}
-
-func reverseUint16(v uint16) uint16 {
-	return uint16(reverseByte[v>>8]) | uint16(reverseByte[v&0xFF])<<8
-}
-
-func reverseBits(number uint16, bitLength byte) uint16 {
-	return reverseUint16(number << uint8(16-bitLength))
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/snappy.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/snappy.go
deleted file mode 100644
index a7cbf351d0..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/snappy.go
+++ /dev/null
@@ -1,768 +0,0 @@
-// Copyright 2011 The Snappy-Go Authors. All rights reserved.
-// Modified for deflate by Klaus Post (c) 2015.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package flate
-
-// We limit how far copy back-references can go, the same as the C++ code.
-const maxOffset = 1 << 15
-
-// emitLiteral writes a literal chunk and returns the number of bytes written.
-func emitLiteral(dst *tokens, lit []byte) {
-	ol := dst.n
-	for i, v := range lit {
-		dst.tokens[i+ol] = token(v)
-	}
-	dst.n += len(lit)
-}
-
-// emitCopy writes a copy chunk and returns the number of bytes written.
-func emitCopy(dst *tokens, offset, length int) {
-	dst.tokens[dst.n] = matchToken(uint32(length-3), uint32(offset-minOffsetSize))
-	dst.n++
-}
-
-type snappyEnc interface {
-	Encode(dst *tokens, src []byte)
-	Reset()
-}
-
-func newSnappy(level int) snappyEnc {
-	if useSSE42 {
-		e := &snappySSE4{}
-		switch level {
-		case 3:
-			e.enc = e.encodeL3
-			return e
-		}
-	}
-	e := &snappyGen{}
-	switch level {
-	case 1:
-		e.enc = e.encodeL1
-	case 2:
-		e.enc = e.encodeL2
-	case 3:
-		e.enc = e.encodeL3
-	default:
-		panic("invalid level specified")
-	}
-	return e
-}
-
-const tableBits = 14             // Bits used in the table
-const tableSize = 1 << tableBits // Size of the table
-
-// snappyGen maintains the table for matches,
-// and the previous byte block for level 2.
-// This is the generic implementation.
-type snappyGen struct {
-	table [tableSize]int64
-	block [maxStoreBlockSize]byte
-	prev  []byte
-	cur   int
-	enc   func(dst *tokens, src []byte)
-}
-
-func (e *snappyGen) Encode(dst *tokens, src []byte) {
-	e.enc(dst, src)
-}
-
-// EncodeL1 uses Snappy-like compression, but stores as Huffman
-// blocks.
-func (e *snappyGen) encodeL1(dst *tokens, src []byte) {
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			emitLiteral(dst, src)
-		}
-		e.cur += 4
-		return
-	}
-
-	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
-	if e.cur > 1<<30 {
-		e.cur = 0
-	}
-
-	// Iterate over the source bytes.
-	var (
-		s   int // The iterator position.
-		t   int // The last position with the same hash as s.
-		lit int // The start position of any pending literal bytes.
-	)
-
-	for s+3 < len(src) {
-		// Update the hash table.
-		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
-		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
-		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
-		// We need to to store values in [-1, inf) in table. To save
-		// some initialization time, (re)use the table's zero value
-		// and shift the values against this zero: add 1 on writes,
-		// subtract 1 on reads.
-		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
-
-		offset := uint(s - t - 1)
-
-		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-		if t < 0 || offset >= (maxOffset-1) || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
-			// Skip 1 byte for 16 consecutive missed.
-			s += 1 + ((s - lit) >> 4)
-			continue
-		}
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			emitLiteral(dst, src[lit:s])
-		}
-		// Extend the match to be as long as possible.
-		s0 := s
-		s1 := s + maxMatchLength
-		if s1 > len(src) {
-			s1 = len(src)
-		}
-		s, t = s+4, t+4
-		for s < s1 && src[s] == src[t] {
-			s++
-			t++
-		}
-		// Emit the copied bytes.
-		// inlined: emitCopy(dst, s-t, s-s0)
-
-		dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
-		dst.n++
-		lit = s
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		emitLiteral(dst, src[lit:])
-	}
-	e.cur += len(src)
-}
-
-// EncodeL2 uses a similar algorithm to level 1, but is capable
-// of matching across blocks giving better compression at a small slowdown.
-func (e *snappyGen) encodeL2(dst *tokens, src []byte) {
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			emitLiteral(dst, src)
-		}
-		e.prev = nil
-		e.cur += len(src)
-		return
-	}
-
-	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
-	if e.cur > 1<<30 {
-		e.cur = 0
-	}
-
-	// Iterate over the source bytes.
-	var (
-		s   int // The iterator position.
-		t   int // The last position with the same hash as s.
-		lit int // The start position of any pending literal bytes.
-	)
-
-	for s+3 < len(src) {
-		// Update the hash table.
-		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
-		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
-		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
-		// We need to to store values in [-1, inf) in table. To save
-		// some initialization time, (re)use the table's zero value
-		// and shift the values against this zero: add 1 on writes,
-		// subtract 1 on reads.
-		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
-
-		// If t is positive, the match starts in the current block
-		if t >= 0 {
-
-			offset := uint(s - t - 1)
-			// Check that the offset is valid and that we match at least 4 bytes
-			if offset >= (maxOffset-1) || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
-				// Skip 1 byte for 32 consecutive missed.
-				s += 1 + ((s - lit) >> 5)
-				continue
-			}
-			// Otherwise, we have a match. First, emit any pending literal bytes.
-			if lit != s {
-				emitLiteral(dst, src[lit:s])
-			}
-			// Extend the match to be as long as possible.
-			s0 := s
-			s1 := s + maxMatchLength
-			if s1 > len(src) {
-				s1 = len(src)
-			}
-			s, t = s+4, t+4
-			for s < s1 && src[s] == src[t] {
-				s++
-				t++
-			}
-			// Emit the copied bytes.
-			// inlined: emitCopy(dst, s-t, s-s0)
-			dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
-			dst.n++
-			lit = s
-			continue
-		}
-		// We found a match in the previous block.
-		tp := len(e.prev) + t
-		if tp < 0 || t > -5 || s-t >= maxOffset || b0 != e.prev[tp] || b1 != e.prev[tp+1] || b2 != e.prev[tp+2] || b3 != e.prev[tp+3] {
-			// Skip 1 byte for 32 consecutive missed.
-			s += 1 + ((s - lit) >> 5)
-			continue
-		}
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			emitLiteral(dst, src[lit:s])
-		}
-		// Extend the match to be as long as possible.
-		s0 := s
-		s1 := s + maxMatchLength
-		if s1 > len(src) {
-			s1 = len(src)
-		}
-		s, tp = s+4, tp+4
-		for s < s1 && src[s] == e.prev[tp] {
-			s++
-			tp++
-			if tp == len(e.prev) {
-				t = 0
-				// continue in current buffer
-				for s < s1 && src[s] == src[t] {
-					s++
-					t++
-				}
-				goto l
-			}
-		}
-	l:
-		// Emit the copied bytes.
-		if t < 0 {
-			t = tp - len(e.prev)
-		}
-		dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
-		dst.n++
-		lit = s
-
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		emitLiteral(dst, src[lit:])
-	}
-	e.cur += len(src)
-	// Store this block, if it was full length.
-	if len(src) == maxStoreBlockSize {
-		copy(e.block[:], src)
-		e.prev = e.block[:len(src)]
-	} else {
-		e.prev = nil
-	}
-}
-
-// EncodeL3 uses a similar algorithm to level 2, but is capable
-// will keep two matches per hash.
-// Both hashes are checked if the first isn't ok, and the longest is selected.
-func (e *snappyGen) encodeL3(dst *tokens, src []byte) {
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			emitLiteral(dst, src)
-		}
-		e.prev = nil
-		e.cur += len(src)
-		return
-	}
-
-	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
-	if e.cur > 1<<30 {
-		e.cur = 0
-	}
-
-	// Iterate over the source bytes.
-	var (
-		s   int // The iterator position.
-		lit int // The start position of any pending literal bytes.
-	)
-
-	for s+3 < len(src) {
-		// Update the hash table.
-		h := uint32(src[s]) | uint32(src[s+1])<<8 | uint32(src[s+2])<<16 | uint32(src[s+3])<<24
-		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
-		tmp := *p
-		p1 := int(tmp & 0xffffffff) // Closest match position
-		p2 := int(tmp >> 32)        // Furthest match position
-
-		// We need to to store values in [-1, inf) in table. To save
-		// some initialization time, (re)use the table's zero value
-		// and shift the values against this zero: add 1 on writes,
-		// subtract 1 on reads.
-		t1 := p1 - 1 - e.cur
-
-		var l2 int
-		var t2 int
-		l1 := e.matchlen(s, t1, src)
-		// If fist match was ok, don't do the second.
-		if l1 < 16 {
-			t2 = p2 - 1 - e.cur
-			l2 = e.matchlen(s, t2, src)
-
-			// If both are short, continue
-			if l1 < 4 && l2 < 4 {
-				// Update hash table
-				*p = int64(s+1+e.cur) | (int64(p1) << 32)
-				// Skip 1 byte for 32 consecutive missed.
-				s += 1 + ((s - lit) >> 5)
-				continue
-			}
-		}
-
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			emitLiteral(dst, src[lit:s])
-		}
-		// Update hash table
-		*p = int64(s+1+e.cur) | (int64(p1) << 32)
-
-		// Store the longest match l1 will be closest, so we prefer that if equal length
-		if l1 >= l2 {
-			dst.tokens[dst.n] = matchToken(uint32(l1-3), uint32(s-t1-minOffsetSize))
-			s += l1
-		} else {
-			dst.tokens[dst.n] = matchToken(uint32(l2-3), uint32(s-t2-minOffsetSize))
-			s += l2
-		}
-		dst.n++
-		lit = s
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		emitLiteral(dst, src[lit:])
-	}
-	e.cur += len(src)
-	// Store this block, if it was full length.
-	if len(src) == maxStoreBlockSize {
-		copy(e.block[:], src)
-		e.prev = e.block[:len(src)]
-	} else {
-		e.prev = nil
-	}
-}
-
-func (e *snappyGen) matchlen(s, t int, src []byte) int {
-	// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-	offset := uint(s - t - 1)
-
-	// If we are inside the current block
-	if t >= 0 {
-		if offset >= (maxOffset-1) ||
-			src[s] != src[t] || src[s+1] != src[t+1] ||
-			src[s+2] != src[t+2] || src[s+3] != src[t+3] {
-			return 0
-		}
-		// Extend the match to be as long as possible.
-		s0 := s
-		s1 := s + maxMatchLength
-		if s1 > len(src) {
-			s1 = len(src)
-		}
-		s, t = s+4, t+4
-		for s < s1 && src[s] == src[t] {
-			s++
-			t++
-		}
-		return s - s0
-	}
-
-	// We found a match in the previous block.
-	tp := len(e.prev) + t
-	if tp < 0 || offset >= (maxOffset-1) || t > -5 ||
-		src[s] != e.prev[tp] || src[s+1] != e.prev[tp+1] ||
-		src[s+2] != e.prev[tp+2] || src[s+3] != e.prev[tp+3] {
-		return 0
-	}
-
-	// Extend the match to be as long as possible.
-	s0 := s
-	s1 := s + maxMatchLength
-	if s1 > len(src) {
-		s1 = len(src)
-	}
-	s, tp = s+4, tp+4
-	for s < s1 && src[s] == e.prev[tp] {
-		s++
-		tp++
-		if tp == len(e.prev) {
-			t = 0
-			// continue in current buffer
-			for s < s1 && src[s] == src[t] {
-				s++
-				t++
-			}
-			return s - s0
-		}
-	}
-	return s - s0
-}
-
-// Reset the encoding table.
-func (e *snappyGen) Reset() {
-	e.prev = nil
-}
-
-// snappySSE4 extends snappyGen.
-// This implementation can use SSE 4.2 for length matching.
-type snappySSE4 struct {
-	snappyGen
-}
-
-/*
-// EncodeL1 uses Snappy-like compression, but stores as Huffman
-// blocks.
-func (e *snappySSE4) encodeL1(dst *tokens, src []byte) {
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			emitLiteral(dst, src)
-		}
-		e.cur += 4
-		return
-	}
-
-	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
-	if e.cur > 1<<30 {
-		e.cur = 0
-	}
-
-	// Iterate over the source bytes.
-	var (
-		s   int // The iterator position.
-		t   int // The last position with the same hash as s.
-		lit int // The start position of any pending literal bytes.
-	)
-
-	for s+3 < len(src) {
-		// Update the hash table.
-		h := uint32(src[s]) | uint32(src[s+1])<<8 | uint32(src[s+2])<<16 | uint32(src[s+3])<<24
-		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
-		// We need to to store values in [-1, inf) in table. To save
-		// some initialization time, (re)use the table's zero value
-		// and shift the values against this zero: add 1 on writes,
-		// subtract 1 on reads.
-		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
-
-		offset := uint(s - t - 1)
-
-		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-		if t < 0 || offset >= (maxOffset-1) {
-			// Skip 1 byte for 16 consecutive missed.
-			s += 1 + ((s - lit) >> 4)
-			continue
-		}
-
-		length := len(src) - s
-		if length > maxMatchLength {
-			length = maxMatchLength
-		}
-		// Extend the match to be as long as possible.
-		match := matchLenSSE4(src[t:], src[s:], length)
-
-		// Return if short.
-		if match < 4 {
-			s += 1 + (s-lit)>>4
-			continue
-		}
-
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			emitLiteral(dst, src[lit:s])
-		}
-
-		dst.tokens[dst.n] = matchToken(uint32(match-3), uint32(offset))
-		dst.n++
-		s += match
-		lit = s
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		emitLiteral(dst, src[lit:])
-	}
-	e.cur += len(src)
-}
-
-// EncodeL2 uses a similar algorithm to level 1, but is capable
-// of matching across blocks giving better compression at a small slowdown.
-func (e *snappySSE4) encodeL2(dst *tokens, src []byte) {
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			emitLiteral(dst, src)
-		}
-		e.prev = nil
-		e.cur += len(src)
-		return
-	}
-
-	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
-	if e.cur > 1<<30 {
-		e.cur = 0
-	}
-
-	// Iterate over the source bytes.
-	var (
-		s   int // The iterator position.
-		t   int // The last position with the same hash as s.
-		lit int // The start position of any pending literal bytes.
-	)
-
-	for s+3 < len(src) {
-		// Update the hash table.
-		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
-		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
-		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
-		// We need to to store values in [-1, inf) in table. To save
-		// some initialization time, (re)use the table's zero value
-		// and shift the values against this zero: add 1 on writes,
-		// subtract 1 on reads.
-		t, *p = int(*p)-1-e.cur, int64(s+1+e.cur)
-
-		// If t is positive, the match starts in the current block
-		if t >= 0 {
-			offset := uint(s - t - 1)
-
-			// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-			if t < 0 || offset >= (maxOffset-1) {
-				// Skip 1 byte for 16 consecutive missed.
-				s += 1 + ((s - lit) >> 5)
-				continue
-			}
-
-			length := maxMatchLength
-			if length > len(src)-s {
-				length = len(src) - s
-			}
-			// Extend the match to be as long as possible.
-			match := matchLenSSE4(src[t:], src[s:], length)
-
-			// Return if short.
-			if match < 4 {
-				s += 1 + (s-lit)>>5
-				continue
-			}
-
-			// Otherwise, we have a match. First, emit any pending literal bytes.
-			if lit != s {
-				emitLiteral(dst, src[lit:s])
-			}
-
-			dst.tokens[dst.n] = matchToken(uint32(match-3), uint32(offset))
-			s += match
-			dst.n++
-			lit = s
-			continue
-		}
-
-		// We found a match in the previous block.
-		tp := len(e.prev) + t
-		if tp < 0 || t > -5 || s-t >= maxOffset || b0 != e.prev[tp] || b1 != e.prev[tp+1] || b2 != e.prev[tp+2] || b3 != e.prev[tp+3] {
-			// Skip 1 byte for 32 consecutive missed.
-			s += 1 + ((s - lit) >> 5)
-			continue
-		}
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			emitLiteral(dst, src[lit:s])
-		}
-		// Extend the match to be as long as possible.
-		s0 := s
-		s1 := s + maxMatchLength
-		if s1 > len(src) {
-			s1 = len(src)
-		}
-		s, tp = s+4, tp+4
-		for s < s1 && src[s] == e.prev[tp] {
-			s++
-			tp++
-			if tp == len(e.prev) {
-				t = 0
-				// continue in current buffer
-				for s < s1 && src[s] == src[t] {
-					s++
-					t++
-				}
-				goto l
-			}
-		}
-	l:
-		// Emit the copied bytes.
-		// inlined: emitCopy(dst, s-t, s-s0)
-		if t < 0 {
-			t = tp - len(e.prev)
-		}
-		dst.tokens[dst.n] = matchToken(uint32(s-s0-3), uint32(s-t-minOffsetSize))
-		dst.n++
-		lit = s
-		continue
-
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		emitLiteral(dst, src[lit:])
-	}
-	e.cur += len(src)
-	// Store this block, if it was full length.
-	if len(src) == maxStoreBlockSize {
-		copy(e.block[:], src)
-		e.prev = e.block[:len(src)]
-	} else {
-		e.prev = nil
-	}
-}
-*/
-
-// EncodeL3 uses a similar algorithm to level 2,
-// but will keep two matches per hash.
-// Both hashes are checked if the first isn't ok, and the longest is selected.
-func (e *snappySSE4) encodeL3(dst *tokens, src []byte) {
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			emitLiteral(dst, src)
-		}
-		e.prev = nil
-		e.cur += len(src)
-		return
-	}
-
-	// Ensure that e.cur doesn't wrap, mainly an issue on 32 bits.
-	if e.cur > 1<<30 {
-		e.cur = 0
-	}
-
-	// Iterate over the source bytes.
-	var (
-		s   int // The iterator position.
-		lit int // The start position of any pending literal bytes.
-	)
-
-	for s+3 < len(src) {
-		// Load potential matches from hash table.
-		h := uint32(src[s]) | uint32(src[s+1])<<8 | uint32(src[s+2])<<16 | uint32(src[s+3])<<24
-		p := &e.table[(h*0x1e35a7bd)>>(32-tableBits)]
-		tmp := *p
-		p1 := int(tmp & 0xffffffff) // Closest match position
-		p2 := int(tmp >> 32)        // Furthest match position
-
-		// We need to to store values in [-1, inf) in table. To save
-		// some initialization time, (re)use the table's zero value
-		// and shift the values against this zero: add 1 on writes,
-		// subtract 1 on reads.
-		t1 := int(p1) - 1 - e.cur
-
-		var l2 int
-		var t2 int
-		l1 := e.matchlen(s, t1, src)
-		// If fist match was ok, don't do the second.
-		if l1 < 16 {
-			t2 = int(p2) - 1 - e.cur
-			l2 = e.matchlen(s, t2, src)
-
-			// If both are short, continue
-			if l1 < 4 && l2 < 4 {
-				// Update hash table
-				*p = int64(s+1+e.cur) | (int64(p1) << 32)
-				// Skip 1 byte for 32 consecutive missed.
-				s += 1 + ((s - lit) >> 5)
-				continue
-			}
-		}
-
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			emitLiteral(dst, src[lit:s])
-		}
-		// Update hash table
-		*p = int64(s+1+e.cur) | (int64(p1) << 32)
-
-		// Store the longest match l1 will be closest, so we prefer that if equal length
-		if l1 >= l2 {
-			dst.tokens[dst.n] = matchToken(uint32(l1-3), uint32(s-t1-minOffsetSize))
-			s += l1
-		} else {
-			dst.tokens[dst.n] = matchToken(uint32(l2-3), uint32(s-t2-minOffsetSize))
-			s += l2
-		}
-		dst.n++
-		lit = s
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		emitLiteral(dst, src[lit:])
-	}
-	e.cur += len(src)
-	// Store this block, if it was full length.
-	if len(src) == maxStoreBlockSize {
-		copy(e.block[:], src)
-		e.prev = e.block[:len(src)]
-	} else {
-		e.prev = nil
-	}
-}
-
-func (e *snappySSE4) matchlen(s, t int, src []byte) int {
-	// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-	offset := uint(s - t - 1)
-
-	// If we are inside the current block
-	if t >= 0 {
-		if offset >= (maxOffset - 1) {
-			return 0
-		}
-		length := len(src) - s
-		if length > maxMatchLength {
-			length = maxMatchLength
-		}
-		// Extend the match to be as long as possible.
-		return matchLenSSE4(src[t:], src[s:], length)
-	}
-
-	// We found a match in the previous block.
-	tp := len(e.prev) + t
-	if tp < 0 || offset >= (maxOffset-1) || t > -5 ||
-		src[s] != e.prev[tp] || src[s+1] != e.prev[tp+1] ||
-		src[s+2] != e.prev[tp+2] || src[s+3] != e.prev[tp+3] {
-		return 0
-	}
-
-	// Extend the match to be as long as possible.
-	s0 := s
-	s1 := s + maxMatchLength
-	if s1 > len(src) {
-		s1 = len(src)
-	}
-	s, tp = s+4, tp+4
-	for s < s1 && src[s] == e.prev[tp] {
-		s++
-		tp++
-		if tp == len(e.prev) {
-			t = 0
-			// continue in current buffer
-			for s < s1 && src[s] == src[t] {
-				s++
-				t++
-			}
-			return s - s0
-		}
-	}
-	return s - s0
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/compress/flate/token.go b/Godeps/_workspace/src/github.com/klauspost/compress/flate/token.go
deleted file mode 100644
index 94fa5eb93a..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/compress/flate/token.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package flate
-
-const (
-	// 2 bits:   type   0 = literal  1=EOF  2=Match   3=Unused
-	// 8 bits:   xlength = length - MIN_MATCH_LENGTH
-	// 22 bits   xoffset = offset - MIN_OFFSET_SIZE, or literal
-	lengthShift = 22
-	offsetMask  = 1<<lengthShift - 1
-	typeMask    = 3 << 30
-	literalType = 0 << 30
-	matchType   = 1 << 30
-)
-
-// The length code for length X (MIN_MATCH_LENGTH <= X <= MAX_MATCH_LENGTH)
-// is lengthCodes[length - MIN_MATCH_LENGTH]
-var lengthCodes = [...]uint32{
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 8,
-	9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
-	13, 13, 13, 13, 14, 14, 14, 14, 15, 15,
-	15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-	17, 17, 17, 17, 17, 17, 17, 17, 18, 18,
-	18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-	19, 19, 19, 19, 20, 20, 20, 20, 20, 20,
-	20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-	21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-	22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-	22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-	23, 23, 23, 23, 23, 23, 23, 23, 24, 24,
-	24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-	25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-	26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-	26, 26, 26, 26, 27, 27, 27, 27, 27, 27,
-	27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-	27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-	27, 27, 27, 27, 27, 28,
-}
-
-var offsetCodes = [...]uint32{
-	0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7,
-	8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-	10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-	11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-	12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-	12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-	13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-	13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-	14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-	15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-}
-
-type token uint32
-
-type tokens struct {
-	tokens []token
-	n      int
-}
-
-// Convert a literal into a literal token.
-func literalToken(literal uint32) token { return token(literalType + literal) }
-
-// Convert a < xlength, xoffset > pair into a match token.
-func matchToken(xlength uint32, xoffset uint32) token {
-	return token(matchType + xlength<<lengthShift + xoffset)
-}
-
-// Returns the type of a token
-func (t token) typ() uint32 { return uint32(t) & typeMask }
-
-// Returns the literal of a literal token
-func (t token) literal() uint32 { return uint32(t - literalType) }
-
-// Returns the extra offset of a match token
-func (t token) offset() uint32 { return uint32(t) & offsetMask }
-
-func (t token) length() uint32 { return uint32((t - matchType) >> lengthShift) }
-
-func lengthCode(len uint32) uint32 { return lengthCodes[len] }
-
-// Returns the offset code corresponding to a specific offset
-func offsetCode(off uint32) uint32 {
-	if off < uint32(len(offsetCodes)) {
-		return offsetCodes[off]
-	} else if off>>7 < uint32(len(offsetCodes)) {
-		return offsetCodes[off>>7] + 14
-	} else {
-		return offsetCodes[off>>14] + 28
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/.gitignore b/Godeps/_workspace/src/github.com/klauspost/cpuid/.gitignore
deleted file mode 100644
index daf913b1b3..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/.travis.yml b/Godeps/_workspace/src/github.com/klauspost/cpuid/.travis.yml
deleted file mode 100644
index bde823d8ab..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/.travis.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-language: go
-
-go:
-  - 1.3
-  - 1.4
-  - 1.5
-  - 1.6
-  - tip
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/LICENSE b/Godeps/_workspace/src/github.com/klauspost/cpuid/LICENSE
deleted file mode 100644
index 5cec7ee949..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Klaus Post
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/README.md b/Godeps/_workspace/src/github.com/klauspost/cpuid/README.md
deleted file mode 100644
index b2b6bee879..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/README.md
+++ /dev/null
@@ -1,145 +0,0 @@
-# cpuid
-Package cpuid provides information about the CPU running the current program.
-
-CPU features are detected on startup, and kept for fast access through the life of the application.
-Currently x86 / x64 (AMD64) is supported, and no external C (cgo) code is used, which should make the library very easy to use.
-
-You can access the CPU information by accessing the shared CPU variable of the cpuid library.
-
-Package home: https://github.com/klauspost/cpuid
-
-[![GoDoc][1]][2] [![Build Status][3]][4]
-
-[1]: https://godoc.org/github.com/klauspost/cpuid?status.svg
-[2]: https://godoc.org/github.com/klauspost/cpuid
-[3]: https://travis-ci.org/klauspost/cpuid.svg
-[4]: https://travis-ci.org/klauspost/cpuid
-
-# features
-## CPU Instructions
-*  **CMOV** (i686 CMOV)
-*  **NX** (NX (No-Execute) bit)
-*  **AMD3DNOW** (AMD 3DNOW)
-*  **AMD3DNOWEXT** (AMD 3DNowExt)
-*  **MMX** (standard MMX)
-*  **MMXEXT** (SSE integer functions or AMD MMX ext)
-*  **SSE** (SSE functions)
-*  **SSE2** (P4 SSE functions)
-*  **SSE3** (Prescott SSE3 functions)
-*  **SSSE3** (Conroe SSSE3 functions)
-*  **SSE4** (Penryn SSE4.1 functions)
-*  **SSE4A** (AMD Barcelona microarchitecture SSE4a instructions)
-*  **SSE42** (Nehalem SSE4.2 functions)
-*  **AVX** (AVX functions)
-*  **AVX2** (AVX2 functions)
-*  **FMA3** (Intel FMA 3)
-*  **FMA4** (Bulldozer FMA4 functions)
-*  **XOP** (Bulldozer XOP functions)
-*  **F16C** (Half-precision floating-point conversion)
-*  **BMI1** (Bit Manipulation Instruction Set 1)
-*  **BMI2** (Bit Manipulation Instruction Set 2)
-*  **TBM** (AMD Trailing Bit Manipulation)
-*  **LZCNT** (LZCNT instruction)
-*  **POPCNT** (POPCNT instruction)
-*  **AESNI** (Advanced Encryption Standard New Instructions)
-*  **CLMUL** (Carry-less Multiplication)
-*  **HTT** (Hyperthreading (enabled))
-*  **HLE** (Hardware Lock Elision)
-*  **RTM** (Restricted Transactional Memory)
-*  **RDRAND** (RDRAND instruction is available)
-*  **RDSEED** (RDSEED instruction is available)
-*  **ADX** (Intel ADX (Multi-Precision Add-Carry Instruction Extensions))
-*  **SHA** (Intel SHA Extensions)
-*  **AVX512F** (AVX-512 Foundation)
-*  **AVX512DQ** (AVX-512 Doubleword and Quadword Instructions)
-*  **AVX512IFMA** (AVX-512 Integer Fused Multiply-Add Instructions)
-*  **AVX512PF** (AVX-512 Prefetch Instructions)
-*  **AVX512ER** (AVX-512 Exponential and Reciprocal Instructions)
-*  **AVX512CD** (AVX-512 Conflict Detection Instructions)
-*  **AVX512BW** (AVX-512 Byte and Word Instructions)
-*  **AVX512VL** (AVX-512 Vector Length Extensions)
-*  **AVX512VBMI** (AVX-512 Vector Bit Manipulation Instructions)
-*  **MPX** (Intel MPX (Memory Protection Extensions))
-*  **ERMS** (Enhanced REP MOVSB/STOSB)
-*  **RDTSCP** (RDTSCP Instruction)
-*  **CX16** (CMPXCHG16B Instruction)
-*  **SGX** (Software Guard Extensions, with activation details)
-
-## Performance
-*  **RDTSCP()** Returns current cycle count. Can be used for benchmarking.
-*  **SSE2SLOW** (SSE2 is supported, but usually not faster)
-*  **SSE3SLOW** (SSE3 is supported, but usually not faster)
-*  **ATOM** (Atom processor, some SSSE3 instructions are slower)
-*  **Cache line** (Probable size of a cache line).
-*  **L1, L2, L3 Cache size** on newer Intel/AMD CPUs.
-
-## Cpu Vendor/VM
-* **Intel**
-* **AMD**
-* **VIA**
-* **Transmeta**
-* **NSC**
-* **KVM**  (Kernel-based Virtual Machine)
-* **MSVM** (Microsoft Hyper-V or Windows Virtual PC)
-* **VMware**
-* **XenHVM**
-
-# installing
-
-```go get github.com/klauspost/cpuid```
-
-# example
-
-```Go
-package main
-
-import (
-	"fmt"
-	"github.com/klauspost/cpuid"
-)
-
-func main() {
-	// Print basic CPU information:
-	fmt.Println("Name:", cpuid.CPU.BrandName)
-	fmt.Println("PhysicalCores:", cpuid.CPU.PhysicalCores)
-	fmt.Println("ThreadsPerCore:", cpuid.CPU.ThreadsPerCore)
-	fmt.Println("LogicalCores:", cpuid.CPU.LogicalCores)
-	fmt.Println("Family", cpuid.CPU.Family, "Model:", cpuid.CPU.Model)
-	fmt.Println("Features:", cpuid.CPU.Features)
-	fmt.Println("Cacheline bytes:", cpuid.CPU.CacheLine)
-	fmt.Println("L1 Data Cache:", cpuid.CPU.Cache.L1D, "bytes")
-	fmt.Println("L1 Instruction Cache:", cpuid.CPU.Cache.L1D, "bytes")
-	fmt.Println("L2 Cache:", cpuid.CPU.Cache.L2, "bytes")
-	fmt.Println("L3 Cache:", cpuid.CPU.Cache.L3, "bytes")
-
-	// Test if we have a specific feature:
-	if cpuid.CPU.SSE() {
-		fmt.Println("We have Streaming SIMD Extensions")
-	}
-}
-```
-
-Sample output:
-```
->go run main.go
-Name: Intel(R) Core(TM) i5-2540M CPU @ 2.60GHz
-PhysicalCores: 2
-ThreadsPerCore: 2
-LogicalCores: 4
-Family 6 Model: 42
-Features: CMOV,MMX,MMXEXT,SSE,SSE2,SSE3,SSSE3,SSE4.1,SSE4.2,AVX,AESNI,CLMUL
-Cacheline bytes: 64
-We have Streaming SIMD Extensions
-```
-
-# private package
-
-In the "private" folder you can find an autogenerated version of the library you can include in your own packages.
-
-For this purpose all exports are removed, and functions and constants are lowercased.
-
-This is not a recommended way of using the library, but provided for convenience, if it is difficult for you to use external packages.
-
-# license
-
-This code is published under an MIT license. See LICENSE file for more information.
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid.go
deleted file mode 100644
index 9230ca5628..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid.go
+++ /dev/null
@@ -1,1022 +0,0 @@
-// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
-
-// Package cpuid provides information about the CPU running the current program.
-//
-// CPU features are detected on startup, and kept for fast access through the life of the application.
-// Currently x86 / x64 (AMD64) is supported.
-//
-// You can access the CPU information by accessing the shared CPU variable of the cpuid library.
-//
-// Package home: https://github.com/klauspost/cpuid
-package cpuid
-
-import "strings"
-
-// Vendor is a representation of a CPU vendor.
-type Vendor int
-
-const (
-	Other Vendor = iota
-	Intel
-	AMD
-	VIA
-	Transmeta
-	NSC
-	KVM  // Kernel-based Virtual Machine
-	MSVM // Microsoft Hyper-V or Windows Virtual PC
-	VMware
-	XenHVM
-)
-
-const (
-	CMOV        = 1 << iota // i686 CMOV
-	NX                      // NX (No-Execute) bit
-	AMD3DNOW                // AMD 3DNOW
-	AMD3DNOWEXT             // AMD 3DNowExt
-	MMX                     // standard MMX
-	MMXEXT                  // SSE integer functions or AMD MMX ext
-	SSE                     // SSE functions
-	SSE2                    // P4 SSE functions
-	SSE3                    // Prescott SSE3 functions
-	SSSE3                   // Conroe SSSE3 functions
-	SSE4                    // Penryn SSE4.1 functions
-	SSE4A                   // AMD Barcelona microarchitecture SSE4a instructions
-	SSE42                   // Nehalem SSE4.2 functions
-	AVX                     // AVX functions
-	AVX2                    // AVX2 functions
-	FMA3                    // Intel FMA 3
-	FMA4                    // Bulldozer FMA4 functions
-	XOP                     // Bulldozer XOP functions
-	F16C                    // Half-precision floating-point conversion
-	BMI1                    // Bit Manipulation Instruction Set 1
-	BMI2                    // Bit Manipulation Instruction Set 2
-	TBM                     // AMD Trailing Bit Manipulation
-	LZCNT                   // LZCNT instruction
-	POPCNT                  // POPCNT instruction
-	AESNI                   // Advanced Encryption Standard New Instructions
-	CLMUL                   // Carry-less Multiplication
-	HTT                     // Hyperthreading (enabled)
-	HLE                     // Hardware Lock Elision
-	RTM                     // Restricted Transactional Memory
-	RDRAND                  // RDRAND instruction is available
-	RDSEED                  // RDSEED instruction is available
-	ADX                     // Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
-	SHA                     // Intel SHA Extensions
-	AVX512F                 // AVX-512 Foundation
-	AVX512DQ                // AVX-512 Doubleword and Quadword Instructions
-	AVX512IFMA              // AVX-512 Integer Fused Multiply-Add Instructions
-	AVX512PF                // AVX-512 Prefetch Instructions
-	AVX512ER                // AVX-512 Exponential and Reciprocal Instructions
-	AVX512CD                // AVX-512 Conflict Detection Instructions
-	AVX512BW                // AVX-512 Byte and Word Instructions
-	AVX512VL                // AVX-512 Vector Length Extensions
-	AVX512VBMI              // AVX-512 Vector Bit Manipulation Instructions
-	MPX                     // Intel MPX (Memory Protection Extensions)
-	ERMS                    // Enhanced REP MOVSB/STOSB
-	RDTSCP                  // RDTSCP Instruction
-	CX16                    // CMPXCHG16B Instruction
-	SGX                     // Software Guard Extensions
-
-	// Performance indicators
-	SSE2SLOW // SSE2 is supported, but usually not faster
-	SSE3SLOW // SSE3 is supported, but usually not faster
-	ATOM     // Atom processor, some SSSE3 instructions are slower
-)
-
-var flagNames = map[Flags]string{
-	CMOV:        "CMOV",        // i686 CMOV
-	NX:          "NX",          // NX (No-Execute) bit
-	AMD3DNOW:    "AMD3DNOW",    // AMD 3DNOW
-	AMD3DNOWEXT: "AMD3DNOWEXT", // AMD 3DNowExt
-	MMX:         "MMX",         // Standard MMX
-	MMXEXT:      "MMXEXT",      // SSE integer functions or AMD MMX ext
-	SSE:         "SSE",         // SSE functions
-	SSE2:        "SSE2",        // P4 SSE2 functions
-	SSE3:        "SSE3",        // Prescott SSE3 functions
-	SSSE3:       "SSSE3",       // Conroe SSSE3 functions
-	SSE4:        "SSE4.1",      // Penryn SSE4.1 functions
-	SSE4A:       "SSE4A",       // AMD Barcelona microarchitecture SSE4a instructions
-	SSE42:       "SSE4.2",      // Nehalem SSE4.2 functions
-	AVX:         "AVX",         // AVX functions
-	AVX2:        "AVX2",        // AVX functions
-	FMA3:        "FMA3",        // Intel FMA 3
-	FMA4:        "FMA4",        // Bulldozer FMA4 functions
-	XOP:         "XOP",         // Bulldozer XOP functions
-	F16C:        "F16C",        // Half-precision floating-point conversion
-	BMI1:        "BMI1",        // Bit Manipulation Instruction Set 1
-	BMI2:        "BMI2",        // Bit Manipulation Instruction Set 2
-	TBM:         "TBM",         // AMD Trailing Bit Manipulation
-	LZCNT:       "LZCNT",       // LZCNT instruction
-	POPCNT:      "POPCNT",      // POPCNT instruction
-	AESNI:       "AESNI",       // Advanced Encryption Standard New Instructions
-	CLMUL:       "CLMUL",       // Carry-less Multiplication
-	HTT:         "HTT",         // Hyperthreading (enabled)
-	HLE:         "HLE",         // Hardware Lock Elision
-	RTM:         "RTM",         // Restricted Transactional Memory
-	RDRAND:      "RDRAND",      // RDRAND instruction is available
-	RDSEED:      "RDSEED",      // RDSEED instruction is available
-	ADX:         "ADX",         // Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
-	SHA:         "SHA",         // Intel SHA Extensions
-	AVX512F:     "AVX512F",     // AVX-512 Foundation
-	AVX512DQ:    "AVX512DQ",    // AVX-512 Doubleword and Quadword Instructions
-	AVX512IFMA:  "AVX512IFMA",  // AVX-512 Integer Fused Multiply-Add Instructions
-	AVX512PF:    "AVX512PF",    // AVX-512 Prefetch Instructions
-	AVX512ER:    "AVX512ER",    // AVX-512 Exponential and Reciprocal Instructions
-	AVX512CD:    "AVX512CD",    // AVX-512 Conflict Detection Instructions
-	AVX512BW:    "AVX512BW",    // AVX-512 Byte and Word Instructions
-	AVX512VL:    "AVX512VL",    // AVX-512 Vector Length Extensions
-	AVX512VBMI:  "AVX512VBMI",  // AVX-512 Vector Bit Manipulation Instructions
-	MPX:         "MPX",         // Intel MPX (Memory Protection Extensions)
-	ERMS:        "ERMS",        // Enhanced REP MOVSB/STOSB
-	RDTSCP:      "RDTSCP",      // RDTSCP Instruction
-	CX16:        "CX16",        // CMPXCHG16B Instruction
-	SGX:         "SGX",         // Software Guard Extensions
-
-	// Performance indicators
-	SSE2SLOW: "SSE2SLOW", // SSE2 supported, but usually not faster
-	SSE3SLOW: "SSE3SLOW", // SSE3 supported, but usually not faster
-	ATOM:     "ATOM",     // Atom processor, some SSSE3 instructions are slower
-
-}
-
-// CPUInfo contains information about the detected system CPU.
-type CPUInfo struct {
-	BrandName      string // Brand name reported by the CPU
-	VendorID       Vendor // Comparable CPU vendor ID
-	Features       Flags  // Features of the CPU
-	PhysicalCores  int    // Number of physical processor cores in your CPU. Will be 0 if undetectable.
-	ThreadsPerCore int    // Number of threads per physical core. Will be 1 if undetectable.
-	LogicalCores   int    // Number of physical cores times threads that can run on each core through the use of hyperthreading. Will be 0 if undetectable.
-	Family         int    // CPU family number
-	Model          int    // CPU model number
-	CacheLine      int    // Cache line size in bytes. Will be 0 if undetectable.
-	Cache          struct {
-		L1I int // L1 Instruction Cache (per core or shared). Will be -1 if undetected
-		L1D int // L1 Data Cache (per core or shared). Will be -1 if undetected
-		L2  int // L2 Cache (per core or shared). Will be -1 if undetected
-		L3  int // L3 Instruction Cache (per core or shared). Will be -1 if undetected
-	}
-	SGX       SGXSupport
-	maxFunc   uint32
-	maxExFunc uint32
-}
-
-var cpuid func(op uint32) (eax, ebx, ecx, edx uint32)
-var cpuidex func(op, op2 uint32) (eax, ebx, ecx, edx uint32)
-var xgetbv func(index uint32) (eax, edx uint32)
-var rdtscpAsm func() (eax, ebx, ecx, edx uint32)
-
-// CPU contains information about the CPU as detected on startup,
-// or when Detect last was called.
-//
-// Use this as the primary entry point to you data,
-// this way queries are
-var CPU CPUInfo
-
-func init() {
-	initCPU()
-	Detect()
-}
-
-// Detect will re-detect current CPU info.
-// This will replace the content of the exported CPU variable.
-//
-// Unless you expect the CPU to change while you are running your program
-// you should not need to call this function.
-// If you call this, you must ensure that no other goroutine is accessing the
-// exported CPU variable.
-func Detect() {
-	CPU.maxFunc = maxFunctionID()
-	CPU.maxExFunc = maxExtendedFunction()
-	CPU.BrandName = brandName()
-	CPU.CacheLine = cacheLine()
-	CPU.Family, CPU.Model = familyModel()
-	CPU.Features = support()
-	CPU.SGX = sgx(CPU.Features&SGX != 0)
-	CPU.ThreadsPerCore = threadsPerCore()
-	CPU.LogicalCores = logicalCores()
-	CPU.PhysicalCores = physicalCores()
-	CPU.VendorID = vendorID()
-	CPU.cacheSize()
-}
-
-// Generated here: http://play.golang.org/p/BxFH2Gdc0G
-
-// Cmov indicates support of CMOV instructions
-func (c CPUInfo) Cmov() bool {
-	return c.Features&CMOV != 0
-}
-
-// Amd3dnow indicates support of AMD 3DNOW! instructions
-func (c CPUInfo) Amd3dnow() bool {
-	return c.Features&AMD3DNOW != 0
-}
-
-// Amd3dnowExt indicates support of AMD 3DNOW! Extended instructions
-func (c CPUInfo) Amd3dnowExt() bool {
-	return c.Features&AMD3DNOWEXT != 0
-}
-
-// MMX indicates support of MMX instructions
-func (c CPUInfo) MMX() bool {
-	return c.Features&MMX != 0
-}
-
-// MMXExt indicates support of MMXEXT instructions
-// (SSE integer functions or AMD MMX ext)
-func (c CPUInfo) MMXExt() bool {
-	return c.Features&MMXEXT != 0
-}
-
-// SSE indicates support of SSE instructions
-func (c CPUInfo) SSE() bool {
-	return c.Features&SSE != 0
-}
-
-// SSE2 indicates support of SSE 2 instructions
-func (c CPUInfo) SSE2() bool {
-	return c.Features&SSE2 != 0
-}
-
-// SSE3 indicates support of SSE 3 instructions
-func (c CPUInfo) SSE3() bool {
-	return c.Features&SSE3 != 0
-}
-
-// SSSE3 indicates support of SSSE 3 instructions
-func (c CPUInfo) SSSE3() bool {
-	return c.Features&SSSE3 != 0
-}
-
-// SSE4 indicates support of SSE 4 (also called SSE 4.1) instructions
-func (c CPUInfo) SSE4() bool {
-	return c.Features&SSE4 != 0
-}
-
-// SSE42 indicates support of SSE4.2 instructions
-func (c CPUInfo) SSE42() bool {
-	return c.Features&SSE42 != 0
-}
-
-// AVX indicates support of AVX instructions
-// and operating system support of AVX instructions
-func (c CPUInfo) AVX() bool {
-	return c.Features&AVX != 0
-}
-
-// AVX2 indicates support of AVX2 instructions
-func (c CPUInfo) AVX2() bool {
-	return c.Features&AVX2 != 0
-}
-
-// FMA3 indicates support of FMA3 instructions
-func (c CPUInfo) FMA3() bool {
-	return c.Features&FMA3 != 0
-}
-
-// FMA4 indicates support of FMA4 instructions
-func (c CPUInfo) FMA4() bool {
-	return c.Features&FMA4 != 0
-}
-
-// XOP indicates support of XOP instructions
-func (c CPUInfo) XOP() bool {
-	return c.Features&XOP != 0
-}
-
-// F16C indicates support of F16C instructions
-func (c CPUInfo) F16C() bool {
-	return c.Features&F16C != 0
-}
-
-// BMI1 indicates support of BMI1 instructions
-func (c CPUInfo) BMI1() bool {
-	return c.Features&BMI1 != 0
-}
-
-// BMI2 indicates support of BMI2 instructions
-func (c CPUInfo) BMI2() bool {
-	return c.Features&BMI2 != 0
-}
-
-// TBM indicates support of TBM instructions
-// (AMD Trailing Bit Manipulation)
-func (c CPUInfo) TBM() bool {
-	return c.Features&TBM != 0
-}
-
-// Lzcnt indicates support of LZCNT instruction
-func (c CPUInfo) Lzcnt() bool {
-	return c.Features&LZCNT != 0
-}
-
-// Popcnt indicates support of POPCNT instruction
-func (c CPUInfo) Popcnt() bool {
-	return c.Features&POPCNT != 0
-}
-
-// HTT indicates the processor has Hyperthreading enabled
-func (c CPUInfo) HTT() bool {
-	return c.Features&HTT != 0
-}
-
-// SSE2Slow indicates that SSE2 may be slow on this processor
-func (c CPUInfo) SSE2Slow() bool {
-	return c.Features&SSE2SLOW != 0
-}
-
-// SSE3Slow indicates that SSE3 may be slow on this processor
-func (c CPUInfo) SSE3Slow() bool {
-	return c.Features&SSE3SLOW != 0
-}
-
-// AesNi indicates support of AES-NI instructions
-// (Advanced Encryption Standard New Instructions)
-func (c CPUInfo) AesNi() bool {
-	return c.Features&AESNI != 0
-}
-
-// Clmul indicates support of CLMUL instructions
-// (Carry-less Multiplication)
-func (c CPUInfo) Clmul() bool {
-	return c.Features&CLMUL != 0
-}
-
-// NX indicates support of NX (No-Execute) bit
-func (c CPUInfo) NX() bool {
-	return c.Features&NX != 0
-}
-
-// SSE4A indicates support of AMD Barcelona microarchitecture SSE4a instructions
-func (c CPUInfo) SSE4A() bool {
-	return c.Features&SSE4A != 0
-}
-
-// HLE indicates support of Hardware Lock Elision
-func (c CPUInfo) HLE() bool {
-	return c.Features&HLE != 0
-}
-
-// RTM indicates support of Restricted Transactional Memory
-func (c CPUInfo) RTM() bool {
-	return c.Features&RTM != 0
-}
-
-// Rdrand indicates support of RDRAND instruction is available
-func (c CPUInfo) Rdrand() bool {
-	return c.Features&RDRAND != 0
-}
-
-// Rdseed indicates support of RDSEED instruction is available
-func (c CPUInfo) Rdseed() bool {
-	return c.Features&RDSEED != 0
-}
-
-// ADX indicates support of Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
-func (c CPUInfo) ADX() bool {
-	return c.Features&ADX != 0
-}
-
-// SHA indicates support of Intel SHA Extensions
-func (c CPUInfo) SHA() bool {
-	return c.Features&SHA != 0
-}
-
-// AVX512F indicates support of AVX-512 Foundation
-func (c CPUInfo) AVX512F() bool {
-	return c.Features&AVX512F != 0
-}
-
-// AVX512DQ indicates support of AVX-512 Doubleword and Quadword Instructions
-func (c CPUInfo) AVX512DQ() bool {
-	return c.Features&AVX512DQ != 0
-}
-
-// AVX512IFMA indicates support of AVX-512 Integer Fused Multiply-Add Instructions
-func (c CPUInfo) AVX512IFMA() bool {
-	return c.Features&AVX512IFMA != 0
-}
-
-// AVX512PF indicates support of AVX-512 Prefetch Instructions
-func (c CPUInfo) AVX512PF() bool {
-	return c.Features&AVX512PF != 0
-}
-
-// AVX512ER indicates support of AVX-512 Exponential and Reciprocal Instructions
-func (c CPUInfo) AVX512ER() bool {
-	return c.Features&AVX512ER != 0
-}
-
-// AVX512CD indicates support of AVX-512 Conflict Detection Instructions
-func (c CPUInfo) AVX512CD() bool {
-	return c.Features&AVX512CD != 0
-}
-
-// AVX512BW indicates support of AVX-512 Byte and Word Instructions
-func (c CPUInfo) AVX512BW() bool {
-	return c.Features&AVX512BW != 0
-}
-
-// AVX512VL indicates support of AVX-512 Vector Length Extensions
-func (c CPUInfo) AVX512VL() bool {
-	return c.Features&AVX512VL != 0
-}
-
-// AVX512VBMI indicates support of AVX-512 Vector Bit Manipulation Instructions
-func (c CPUInfo) AVX512VBMI() bool {
-	return c.Features&AVX512VBMI != 0
-}
-
-// MPX indicates support of Intel MPX (Memory Protection Extensions)
-func (c CPUInfo) MPX() bool {
-	return c.Features&MPX != 0
-}
-
-// ERMS indicates support of Enhanced REP MOVSB/STOSB
-func (c CPUInfo) ERMS() bool {
-	return c.Features&ERMS != 0
-}
-
-func (c CPUInfo) RDTSCP() bool {
-	return c.Features&RDTSCP != 0
-}
-
-func (c CPUInfo) CX16() bool {
-	return c.Features&CX16 != 0
-}
-
-// Atom indicates an Atom processor
-func (c CPUInfo) Atom() bool {
-	return c.Features&ATOM != 0
-}
-
-// Intel returns true if vendor is recognized as Intel
-func (c CPUInfo) Intel() bool {
-	return c.VendorID == Intel
-}
-
-// AMD returns true if vendor is recognized as AMD
-func (c CPUInfo) AMD() bool {
-	return c.VendorID == AMD
-}
-
-// Transmeta returns true if vendor is recognized as Transmeta
-func (c CPUInfo) Transmeta() bool {
-	return c.VendorID == Transmeta
-}
-
-// NSC returns true if vendor is recognized as National Semiconductor
-func (c CPUInfo) NSC() bool {
-	return c.VendorID == NSC
-}
-
-// VIA returns true if vendor is recognized as VIA
-func (c CPUInfo) VIA() bool {
-	return c.VendorID == VIA
-}
-
-// RTCounter returns the 64-bit time-stamp counter
-// Uses the RDTSCP instruction. The value 0 is returned
-// if the CPU does not support the instruction.
-func (c CPUInfo) RTCounter() uint64 {
-	if !c.RDTSCP() {
-		return 0
-	}
-	a, _, _, d := rdtscpAsm()
-	return uint64(a) | (uint64(d) << 32)
-}
-
-// Ia32TscAux returns the IA32_TSC_AUX part of the RDTSCP.
-// This variable is OS dependent, but on Linux contains information
-// about the current cpu/core the code is running on.
-// If the RDTSCP instruction isn't supported on the CPU, the value 0 is returned.
-func (c CPUInfo) Ia32TscAux() uint32 {
-	if !c.RDTSCP() {
-		return 0
-	}
-	_, _, ecx, _ := rdtscpAsm()
-	return ecx
-}
-
-// LogicalCPU will return the Logical CPU the code is currently executing on.
-// This is likely to change when the OS re-schedules the running thread
-// to another CPU.
-// If the current core cannot be detected, -1 will be returned.
-func (c CPUInfo) LogicalCPU() int {
-	if c.maxFunc < 1 {
-		return -1
-	}
-	_, ebx, _, _ := cpuid(1)
-	return int(ebx >> 24)
-}
-
-// VM Will return true if the cpu id indicates we are in
-// a virtual machine. This is only a hint, and will very likely
-// have many false negatives.
-func (c CPUInfo) VM() bool {
-	switch c.VendorID {
-	case MSVM, KVM, VMware, XenHVM:
-		return true
-	}
-	return false
-}
-
-// Flags contains detected cpu features and caracteristics
-type Flags uint64
-
-// String returns a string representation of the detected
-// CPU features.
-func (f Flags) String() string {
-	return strings.Join(f.Strings(), ",")
-}
-
-// Strings returns and array of the detected features.
-func (f Flags) Strings() []string {
-	s := support()
-	r := make([]string, 0, 20)
-	for i := uint(0); i < 64; i++ {
-		key := Flags(1 << i)
-		val := flagNames[key]
-		if s&key != 0 {
-			r = append(r, val)
-		}
-	}
-	return r
-}
-
-func maxExtendedFunction() uint32 {
-	eax, _, _, _ := cpuid(0x80000000)
-	return eax
-}
-
-func maxFunctionID() uint32 {
-	a, _, _, _ := cpuid(0)
-	return a
-}
-
-func brandName() string {
-	if maxExtendedFunction() >= 0x80000004 {
-		v := make([]uint32, 0, 48)
-		for i := uint32(0); i < 3; i++ {
-			a, b, c, d := cpuid(0x80000002 + i)
-			v = append(v, a, b, c, d)
-		}
-		return strings.Trim(string(valAsString(v...)), " ")
-	}
-	return "unknown"
-}
-
-func threadsPerCore() int {
-	mfi := maxFunctionID()
-	if mfi < 0x4 || vendorID() != Intel {
-		return 1
-	}
-
-	if mfi < 0xb {
-		_, b, _, d := cpuid(1)
-		if (d & (1 << 28)) != 0 {
-			// v will contain logical core count
-			v := (b >> 16) & 255
-			if v > 1 {
-				a4, _, _, _ := cpuid(4)
-				// physical cores
-				v2 := (a4 >> 26) + 1
-				if v2 > 0 {
-					return int(v) / int(v2)
-				}
-			}
-		}
-		return 1
-	}
-	_, b, _, _ := cpuidex(0xb, 0)
-	if b&0xffff == 0 {
-		return 1
-	}
-	return int(b & 0xffff)
-}
-
-func logicalCores() int {
-	mfi := maxFunctionID()
-	switch vendorID() {
-	case Intel:
-		// Use this on old Intel processors
-		if mfi < 0xb {
-			if mfi < 1 {
-				return 0
-			}
-			// CPUID.1:EBX[23:16] represents the maximum number of addressable IDs (initial APIC ID)
-			// that can be assigned to logical processors in a physical package.
-			// The value may not be the same as the number of logical processors that are present in the hardware of a physical package.
-			_, ebx, _, _ := cpuid(1)
-			logical := (ebx >> 16) & 0xff
-			return int(logical)
-		}
-		_, b, _, _ := cpuidex(0xb, 1)
-		return int(b & 0xffff)
-	case AMD:
-		_, b, _, _ := cpuid(1)
-		return int((b >> 16) & 0xff)
-	default:
-		return 0
-	}
-}
-
-func familyModel() (int, int) {
-	if maxFunctionID() < 0x1 {
-		return 0, 0
-	}
-	eax, _, _, _ := cpuid(1)
-	family := ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff)
-	model := ((eax >> 4) & 0xf) + ((eax >> 12) & 0xf0)
-	return int(family), int(model)
-}
-
-func physicalCores() int {
-	switch vendorID() {
-	case Intel:
-		return logicalCores() / threadsPerCore()
-	case AMD:
-		if maxExtendedFunction() >= 0x80000008 {
-			_, _, c, _ := cpuid(0x80000008)
-			return int(c&0xff) + 1
-		}
-	}
-	return 0
-}
-
-// Except from http://en.wikipedia.org/wiki/CPUID#EAX.3D0:_Get_vendor_ID
-var vendorMapping = map[string]Vendor{
-	"AMDisbetter!": AMD,
-	"AuthenticAMD": AMD,
-	"CentaurHauls": VIA,
-	"GenuineIntel": Intel,
-	"TransmetaCPU": Transmeta,
-	"GenuineTMx86": Transmeta,
-	"Geode by NSC": NSC,
-	"VIA VIA VIA ": VIA,
-	"KVMKVMKVMKVM": KVM,
-	"Microsoft Hv": MSVM,
-	"VMwareVMware": VMware,
-	"XenVMMXenVMM": XenHVM,
-}
-
-func vendorID() Vendor {
-	_, b, c, d := cpuid(0)
-	v := valAsString(b, d, c)
-	vend, ok := vendorMapping[string(v)]
-	if !ok {
-		return Other
-	}
-	return vend
-}
-
-func cacheLine() int {
-	if maxFunctionID() < 0x1 {
-		return 0
-	}
-
-	_, ebx, _, _ := cpuid(1)
-	cache := (ebx & 0xff00) >> 5 // cflush size
-	if cache == 0 && maxExtendedFunction() >= 0x80000006 {
-		_, _, ecx, _ := cpuid(0x80000006)
-		cache = ecx & 0xff // cacheline size
-	}
-	// TODO: Read from Cache and TLB Information
-	return int(cache)
-}
-
-func (c *CPUInfo) cacheSize() {
-	c.Cache.L1D = -1
-	c.Cache.L1I = -1
-	c.Cache.L2 = -1
-	c.Cache.L3 = -1
-	vendor := vendorID()
-	switch vendor {
-	case Intel:
-		if maxFunctionID() < 4 {
-			return
-		}
-		for i := uint32(0); ; i++ {
-			eax, ebx, ecx, _ := cpuidex(4, i)
-			cacheType := eax & 15
-			if cacheType == 0 {
-				break
-			}
-			cacheLevel := (eax >> 5) & 7
-			coherency := int(ebx&0xfff) + 1
-			partitions := int((ebx>>12)&0x3ff) + 1
-			associativity := int((ebx>>22)&0x3ff) + 1
-			sets := int(ecx) + 1
-			size := associativity * partitions * coherency * sets
-			switch cacheLevel {
-			case 1:
-				if cacheType == 1 {
-					// 1 = Data Cache
-					c.Cache.L1D = size
-				} else if cacheType == 2 {
-					// 2 = Instruction Cache
-					c.Cache.L1I = size
-				} else {
-					if c.Cache.L1D < 0 {
-						c.Cache.L1I = size
-					}
-					if c.Cache.L1I < 0 {
-						c.Cache.L1I = size
-					}
-				}
-			case 2:
-				c.Cache.L2 = size
-			case 3:
-				c.Cache.L3 = size
-			}
-		}
-	case AMD:
-		// Untested.
-		if maxExtendedFunction() < 0x80000005 {
-			return
-		}
-		_, _, ecx, edx := cpuid(0x80000005)
-		c.Cache.L1D = int(((ecx >> 24) & 0xFF) * 1024)
-		c.Cache.L1I = int(((edx >> 24) & 0xFF) * 1024)
-
-		if maxExtendedFunction() < 0x80000006 {
-			return
-		}
-		_, _, ecx, _ = cpuid(0x80000006)
-		c.Cache.L2 = int(((ecx >> 16) & 0xFFFF) * 1024)
-	}
-
-	return
-}
-
-type SGXSupport struct {
-	Available           bool
-	SGX1Supported       bool
-	SGX2Supported       bool
-	MaxEnclaveSizeNot64 int64
-	MaxEnclaveSize64    int64
-}
-
-func sgx(available bool) (rval SGXSupport) {
-	rval.Available = available
-
-	if !available {
-		return
-	}
-
-	a, _, _, d := cpuidex(0x12, 0)
-	rval.SGX1Supported = a&0x01 != 0
-	rval.SGX2Supported = a&0x02 != 0
-	rval.MaxEnclaveSizeNot64 = 1 << (d & 0xFF)     // pow 2
-	rval.MaxEnclaveSize64 = 1 << ((d >> 8) & 0xFF) // pow 2
-
-	return
-}
-
-func support() Flags {
-	mfi := maxFunctionID()
-	vend := vendorID()
-	if mfi < 0x1 {
-		return 0
-	}
-	rval := uint64(0)
-	_, _, c, d := cpuid(1)
-	if (d & (1 << 15)) != 0 {
-		rval |= CMOV
-	}
-	if (d & (1 << 23)) != 0 {
-		rval |= MMX
-	}
-	if (d & (1 << 25)) != 0 {
-		rval |= MMXEXT
-	}
-	if (d & (1 << 25)) != 0 {
-		rval |= SSE
-	}
-	if (d & (1 << 26)) != 0 {
-		rval |= SSE2
-	}
-	if (c & 1) != 0 {
-		rval |= SSE3
-	}
-	if (c & 0x00000200) != 0 {
-		rval |= SSSE3
-	}
-	if (c & 0x00080000) != 0 {
-		rval |= SSE4
-	}
-	if (c & 0x00100000) != 0 {
-		rval |= SSE42
-	}
-	if (c & (1 << 25)) != 0 {
-		rval |= AESNI
-	}
-	if (c & (1 << 1)) != 0 {
-		rval |= CLMUL
-	}
-	if c&(1<<23) != 0 {
-		rval |= POPCNT
-	}
-	if c&(1<<30) != 0 {
-		rval |= RDRAND
-	}
-	if c&(1<<29) != 0 {
-		rval |= F16C
-	}
-	if c&(1<<13) != 0 {
-		rval |= CX16
-	}
-	if vend == Intel && (d&(1<<28)) != 0 && mfi >= 4 {
-		if threadsPerCore() > 1 {
-			rval |= HTT
-		}
-	}
-
-	// Check XGETBV, OXSAVE and AVX bits
-	if c&(1<<26) != 0 && c&(1<<27) != 0 && c&(1<<28) != 0 {
-		// Check for OS support
-		eax, _ := xgetbv(0)
-		if (eax & 0x6) == 0x6 {
-			rval |= AVX
-			if (c & 0x00001000) != 0 {
-				rval |= FMA3
-			}
-		}
-	}
-
-	// Check AVX2, AVX2 requires OS support, but BMI1/2 don't.
-	if mfi >= 7 {
-		_, ebx, ecx, _ := cpuidex(7, 0)
-		if (rval&AVX) != 0 && (ebx&0x00000020) != 0 {
-			rval |= AVX2
-		}
-		if (ebx & 0x00000008) != 0 {
-			rval |= BMI1
-			if (ebx & 0x00000100) != 0 {
-				rval |= BMI2
-			}
-		}
-		if ebx&(1<<2) != 0 {
-			rval |= SGX
-		}
-		if ebx&(1<<4) != 0 {
-			rval |= HLE
-		}
-		if ebx&(1<<9) != 0 {
-			rval |= ERMS
-		}
-		if ebx&(1<<11) != 0 {
-			rval |= RTM
-		}
-		if ebx&(1<<14) != 0 {
-			rval |= MPX
-		}
-		if ebx&(1<<18) != 0 {
-			rval |= RDSEED
-		}
-		if ebx&(1<<19) != 0 {
-			rval |= ADX
-		}
-		if ebx&(1<<29) != 0 {
-			rval |= SHA
-		}
-
-		// Only detect AVX-512 features if XGETBV is supported
-		if c&((1<<26)|(1<<27)) == (1<<26)|(1<<27) {
-			// Check for OS support
-			eax, _ := xgetbv(0)
-
-			// Verify that XCR0[7:5] = ‘111b’ (OPMASK state, upper 256-bit of ZMM0-ZMM15 and
-			// ZMM16-ZMM31 state are enabled by OS)
-			/// and that XCR0[2:1] = ‘11b’ (XMM state and YMM state are enabled by OS).
-			if (eax>>5)&7 == 7 && (eax>>1)&3 == 3 {
-				if ebx&(1<<16) != 0 {
-					rval |= AVX512F
-				}
-				if ebx&(1<<17) != 0 {
-					rval |= AVX512DQ
-				}
-				if ebx&(1<<21) != 0 {
-					rval |= AVX512IFMA
-				}
-				if ebx&(1<<26) != 0 {
-					rval |= AVX512PF
-				}
-				if ebx&(1<<27) != 0 {
-					rval |= AVX512ER
-				}
-				if ebx&(1<<28) != 0 {
-					rval |= AVX512CD
-				}
-				if ebx&(1<<30) != 0 {
-					rval |= AVX512BW
-				}
-				if ebx&(1<<31) != 0 {
-					rval |= AVX512VL
-				}
-				// ecx
-				if ecx&(1<<1) != 0 {
-					rval |= AVX512VBMI
-				}
-			}
-		}
-	}
-
-	if maxExtendedFunction() >= 0x80000001 {
-		_, _, c, d := cpuid(0x80000001)
-		if (c & (1 << 5)) != 0 {
-			rval |= LZCNT
-			rval |= POPCNT
-		}
-		if (d & (1 << 31)) != 0 {
-			rval |= AMD3DNOW
-		}
-		if (d & (1 << 30)) != 0 {
-			rval |= AMD3DNOWEXT
-		}
-		if (d & (1 << 23)) != 0 {
-			rval |= MMX
-		}
-		if (d & (1 << 22)) != 0 {
-			rval |= MMXEXT
-		}
-		if (c & (1 << 6)) != 0 {
-			rval |= SSE4A
-		}
-		if d&(1<<20) != 0 {
-			rval |= NX
-		}
-		if d&(1<<27) != 0 {
-			rval |= RDTSCP
-		}
-
-		/* Allow for selectively disabling SSE2 functions on AMD processors
-		   with SSE2 support but not SSE4a. This includes Athlon64, some
-		   Opteron, and some Sempron processors. MMX, SSE, or 3DNow! are faster
-		   than SSE2 often enough to utilize this special-case flag.
-		   AV_CPU_FLAG_SSE2 and AV_CPU_FLAG_SSE2SLOW are both set in this case
-		   so that SSE2 is used unless explicitly disabled by checking
-		   AV_CPU_FLAG_SSE2SLOW. */
-		if vendorID() != Intel &&
-			rval&SSE2 != 0 && (c&0x00000040) == 0 {
-			rval |= SSE2SLOW
-		}
-
-		/* XOP and FMA4 use the AVX instruction coding scheme, so they can't be
-		 * used unless the OS has AVX support. */
-		if (rval & AVX) != 0 {
-			if (c & 0x00000800) != 0 {
-				rval |= XOP
-			}
-			if (c & 0x00010000) != 0 {
-				rval |= FMA4
-			}
-		}
-
-		if vendorID() == Intel {
-			family, model := familyModel()
-			if family == 6 && (model == 9 || model == 13 || model == 14) {
-				/* 6/9 (pentium-m "banias"), 6/13 (pentium-m "dothan"), and
-				 * 6/14 (core1 "yonah") theoretically support sse2, but it's
-				 * usually slower than mmx. */
-				if (rval & SSE2) != 0 {
-					rval |= SSE2SLOW
-				}
-				if (rval & SSE3) != 0 {
-					rval |= SSE3SLOW
-				}
-			}
-			/* The Atom processor has SSSE3 support, which is useful in many cases,
-			 * but sometimes the SSSE3 version is slower than the SSE2 equivalent
-			 * on the Atom, but is generally faster on other processors supporting
-			 * SSSE3. This flag allows for selectively disabling certain SSSE3
-			 * functions on the Atom. */
-			if family == 6 && model == 28 {
-				rval |= ATOM
-			}
-		}
-	}
-	return Flags(rval)
-}
-
-func valAsString(values ...uint32) []byte {
-	r := make([]byte, 4*len(values))
-	for i, v := range values {
-		dst := r[i*4:]
-		dst[0] = byte(v & 0xff)
-		dst[1] = byte((v >> 8) & 0xff)
-		dst[2] = byte((v >> 16) & 0xff)
-		dst[3] = byte((v >> 24) & 0xff)
-		switch {
-		case dst[0] == 0:
-			return r[:i*4]
-		case dst[1] == 0:
-			return r[:i*4+1]
-		case dst[2] == 0:
-			return r[:i*4+2]
-		case dst[3] == 0:
-			return r[:i*4+3]
-		}
-	}
-	return r
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_386.s b/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_386.s
deleted file mode 100644
index 4d731711e4..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_386.s
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
-
-// +build 386,!gccgo
-
-// func asmCpuid(op uint32) (eax, ebx, ecx, edx uint32)
-TEXT ·asmCpuid(SB), 7, $0
-	XORL CX, CX
-	MOVL op+0(FP), AX
-	CPUID
-	MOVL AX, eax+4(FP)
-	MOVL BX, ebx+8(FP)
-	MOVL CX, ecx+12(FP)
-	MOVL DX, edx+16(FP)
-	RET
-
-// func asmCpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
-TEXT ·asmCpuidex(SB), 7, $0
-	MOVL op+0(FP), AX
-	MOVL op2+4(FP), CX
-	CPUID
-	MOVL AX, eax+8(FP)
-	MOVL BX, ebx+12(FP)
-	MOVL CX, ecx+16(FP)
-	MOVL DX, edx+20(FP)
-	RET
-
-// func xgetbv(index uint32) (eax, edx uint32)
-TEXT ·asmXgetbv(SB), 7, $0
-	MOVL index+0(FP), CX
-	BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
-	MOVL AX, eax+4(FP)
-	MOVL DX, edx+8(FP)
-	RET
-
-// func asmRdtscpAsm() (eax, ebx, ecx, edx uint32)
-TEXT ·asmRdtscpAsm(SB), 7, $0
-	BYTE $0x0F; BYTE $0x01; BYTE $0xF9 // RDTSCP
-	MOVL AX, eax+0(FP)
-	MOVL BX, ebx+4(FP)
-	MOVL CX, ecx+8(FP)
-	MOVL DX, edx+12(FP)
-	RET
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_amd64.s b/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_amd64.s
deleted file mode 100644
index 3c1d60e422..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/cpuid_amd64.s
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
-
-//+build amd64,!gccgo
-
-// func asmCpuid(op uint32) (eax, ebx, ecx, edx uint32)
-TEXT ·asmCpuid(SB), 7, $0
-	XORQ CX, CX
-	MOVL op+0(FP), AX
-	CPUID
-	MOVL AX, eax+8(FP)
-	MOVL BX, ebx+12(FP)
-	MOVL CX, ecx+16(FP)
-	MOVL DX, edx+20(FP)
-	RET
-
-// func asmCpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
-TEXT ·asmCpuidex(SB), 7, $0
-	MOVL op+0(FP), AX
-	MOVL op2+4(FP), CX
-	CPUID
-	MOVL AX, eax+8(FP)
-	MOVL BX, ebx+12(FP)
-	MOVL CX, ecx+16(FP)
-	MOVL DX, edx+20(FP)
-	RET
-
-// func asmXgetbv(index uint32) (eax, edx uint32)
-TEXT ·asmXgetbv(SB), 7, $0
-	MOVL index+0(FP), CX
-	BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
-	MOVL AX, eax+8(FP)
-	MOVL DX, edx+12(FP)
-	RET
-
-// func asmRdtscpAsm() (eax, ebx, ecx, edx uint32)
-TEXT ·asmRdtscpAsm(SB), 7, $0
-	BYTE $0x0F; BYTE $0x01; BYTE $0xF9 // RDTSCP
-	MOVL AX, eax+0(FP)
-	MOVL BX, ebx+4(FP)
-	MOVL CX, ecx+8(FP)
-	MOVL DX, edx+12(FP)
-	RET
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_intel.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_intel.go
deleted file mode 100644
index a5f04dd6d0..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_intel.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
-
-// +build 386,!gccgo amd64,!gccgo
-
-package cpuid
-
-func asmCpuid(op uint32) (eax, ebx, ecx, edx uint32)
-func asmCpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
-func asmXgetbv(index uint32) (eax, edx uint32)
-func asmRdtscpAsm() (eax, ebx, ecx, edx uint32)
-
-func initCPU() {
-	cpuid = asmCpuid
-	cpuidex = asmCpuidex
-	xgetbv = asmXgetbv
-	rdtscpAsm = asmRdtscpAsm
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_ref.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_ref.go
deleted file mode 100644
index 909c5d9a7a..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/detect_ref.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
-
-// +build !amd64,!386 gccgo
-
-package cpuid
-
-func initCPU() {
-	cpuid = func(op uint32) (eax, ebx, ecx, edx uint32) {
-		return 0, 0, 0, 0
-	}
-
-	cpuidex = func(op, op2 uint32) (eax, ebx, ecx, edx uint32) {
-		return 0, 0, 0, 0
-	}
-
-	xgetbv = func(index uint32) (eax, edx uint32) {
-		return 0, 0
-	}
-
-	rdtscpAsm = func() (eax, ebx, ecx, edx uint32) {
-		return 0, 0, 0, 0
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/generate.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/generate.go
deleted file mode 100644
index c060b8165e..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/generate.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package cpuid
-
-//go:generate go run private-gen.go
diff --git a/Godeps/_workspace/src/github.com/klauspost/cpuid/private-gen.go b/Godeps/_workspace/src/github.com/klauspost/cpuid/private-gen.go
deleted file mode 100644
index 437333d292..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/cpuid/private-gen.go
+++ /dev/null
@@ -1,476 +0,0 @@
-// +build ignore
-
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/printer"
-	"go/token"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"reflect"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-var inFiles = []string{"cpuid.go", "cpuid_test.go"}
-var copyFiles = []string{"cpuid_amd64.s", "cpuid_386.s", "detect_ref.go", "detect_intel.go"}
-var fileSet = token.NewFileSet()
-var reWrites = []rewrite{
-	initRewrite("CPUInfo -> cpuInfo"),
-	initRewrite("Vendor -> vendor"),
-	initRewrite("Flags -> flags"),
-	initRewrite("Detect -> detect"),
-	initRewrite("CPU -> cpu"),
-}
-var excludeNames = map[string]bool{"string": true, "join": true, "trim": true,
-	// cpuid_test.go
-	"t": true, "println": true, "logf": true, "log": true, "fatalf": true, "fatal": true,
-}
-
-var excludePrefixes = []string{"test", "benchmark"}
-
-func main() {
-	Package := "private"
-	parserMode := parser.ParseComments
-	exported := make(map[string]rewrite)
-	for _, file := range inFiles {
-		in, err := os.Open(file)
-		if err != nil {
-			log.Fatalf("opening input", err)
-		}
-
-		src, err := ioutil.ReadAll(in)
-		if err != nil {
-			log.Fatalf("reading input", err)
-		}
-
-		astfile, err := parser.ParseFile(fileSet, file, src, parserMode)
-		if err != nil {
-			log.Fatalf("parsing input", err)
-		}
-
-		for _, rw := range reWrites {
-			astfile = rw(astfile)
-		}
-
-		// Inspect the AST and print all identifiers and literals.
-		var startDecl token.Pos
-		var endDecl token.Pos
-		ast.Inspect(astfile, func(n ast.Node) bool {
-			var s string
-			switch x := n.(type) {
-			case *ast.Ident:
-				if x.IsExported() {
-					t := strings.ToLower(x.Name)
-					for _, pre := range excludePrefixes {
-						if strings.HasPrefix(t, pre) {
-							return true
-						}
-					}
-					if excludeNames[t] != true {
-						//if x.Pos() > startDecl && x.Pos() < endDecl {
-						exported[x.Name] = initRewrite(x.Name + " -> " + t)
-					}
-				}
-
-			case *ast.GenDecl:
-				if x.Tok == token.CONST && x.Lparen > 0 {
-					startDecl = x.Lparen
-					endDecl = x.Rparen
-					// fmt.Printf("Decl:%s -> %s\n", fileSet.Position(startDecl), fileSet.Position(endDecl))
-				}
-			}
-			if s != "" {
-				fmt.Printf("%s:\t%s\n", fileSet.Position(n.Pos()), s)
-			}
-			return true
-		})
-
-		for _, rw := range exported {
-			astfile = rw(astfile)
-		}
-
-		var buf bytes.Buffer
-
-		printer.Fprint(&buf, fileSet, astfile)
-
-		// Remove package documentation and insert information
-		s := buf.String()
-		ind := strings.Index(buf.String(), "\npackage cpuid")
-		s = s[ind:]
-		s = "// Generated, DO NOT EDIT,\n" +
-			"// but copy it to your own project and rename the package.\n" +
-			"// See more at http://github.com/klauspost/cpuid\n" +
-			s
-
-		outputName := Package + string(os.PathSeparator) + file
-
-		err = ioutil.WriteFile(outputName, []byte(s), 0644)
-		if err != nil {
-			log.Fatalf("writing output: %s", err)
-		}
-		log.Println("Generated", outputName)
-	}
-
-	for _, file := range copyFiles {
-		dst := ""
-		if strings.HasPrefix(file, "cpuid") {
-			dst = Package + string(os.PathSeparator) + file
-		} else {
-			dst = Package + string(os.PathSeparator) + "cpuid_" + file
-		}
-		err := copyFile(file, dst)
-		if err != nil {
-			log.Fatalf("copying file: %s", err)
-		}
-		log.Println("Copied", dst)
-	}
-}
-
-// CopyFile copies a file from src to dst. If src and dst files exist, and are
-// the same, then return success. Copy the file contents from src to dst.
-func copyFile(src, dst string) (err error) {
-	sfi, err := os.Stat(src)
-	if err != nil {
-		return
-	}
-	if !sfi.Mode().IsRegular() {
-		// cannot copy non-regular files (e.g., directories,
-		// symlinks, devices, etc.)
-		return fmt.Errorf("CopyFile: non-regular source file %s (%q)", sfi.Name(), sfi.Mode().String())
-	}
-	dfi, err := os.Stat(dst)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return
-		}
-	} else {
-		if !(dfi.Mode().IsRegular()) {
-			return fmt.Errorf("CopyFile: non-regular destination file %s (%q)", dfi.Name(), dfi.Mode().String())
-		}
-		if os.SameFile(sfi, dfi) {
-			return
-		}
-	}
-	err = copyFileContents(src, dst)
-	return
-}
-
-// copyFileContents copies the contents of the file named src to the file named
-// by dst. The file will be created if it does not already exist. If the
-// destination file exists, all it's contents will be replaced by the contents
-// of the source file.
-func copyFileContents(src, dst string) (err error) {
-	in, err := os.Open(src)
-	if err != nil {
-		return
-	}
-	defer in.Close()
-	out, err := os.Create(dst)
-	if err != nil {
-		return
-	}
-	defer func() {
-		cerr := out.Close()
-		if err == nil {
-			err = cerr
-		}
-	}()
-	if _, err = io.Copy(out, in); err != nil {
-		return
-	}
-	err = out.Sync()
-	return
-}
-
-type rewrite func(*ast.File) *ast.File
-
-// Mostly copied from gofmt
-func initRewrite(rewriteRule string) rewrite {
-	f := strings.Split(rewriteRule, "->")
-	if len(f) != 2 {
-		fmt.Fprintf(os.Stderr, "rewrite rule must be of the form 'pattern -> replacement'\n")
-		os.Exit(2)
-	}
-	pattern := parseExpr(f[0], "pattern")
-	replace := parseExpr(f[1], "replacement")
-	return func(p *ast.File) *ast.File { return rewriteFile(pattern, replace, p) }
-}
-
-// parseExpr parses s as an expression.
-// It might make sense to expand this to allow statement patterns,
-// but there are problems with preserving formatting and also
-// with what a wildcard for a statement looks like.
-func parseExpr(s, what string) ast.Expr {
-	x, err := parser.ParseExpr(s)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "parsing %s %s at %s\n", what, s, err)
-		os.Exit(2)
-	}
-	return x
-}
-
-// Keep this function for debugging.
-/*
-func dump(msg string, val reflect.Value) {
-	fmt.Printf("%s:\n", msg)
-	ast.Print(fileSet, val.Interface())
-	fmt.Println()
-}
-*/
-
-// rewriteFile applies the rewrite rule 'pattern -> replace' to an entire file.
-func rewriteFile(pattern, replace ast.Expr, p *ast.File) *ast.File {
-	cmap := ast.NewCommentMap(fileSet, p, p.Comments)
-	m := make(map[string]reflect.Value)
-	pat := reflect.ValueOf(pattern)
-	repl := reflect.ValueOf(replace)
-
-	var rewriteVal func(val reflect.Value) reflect.Value
-	rewriteVal = func(val reflect.Value) reflect.Value {
-		// don't bother if val is invalid to start with
-		if !val.IsValid() {
-			return reflect.Value{}
-		}
-		for k := range m {
-			delete(m, k)
-		}
-		val = apply(rewriteVal, val)
-		if match(m, pat, val) {
-			val = subst(m, repl, reflect.ValueOf(val.Interface().(ast.Node).Pos()))
-		}
-		return val
-	}
-
-	r := apply(rewriteVal, reflect.ValueOf(p)).Interface().(*ast.File)
-	r.Comments = cmap.Filter(r).Comments() // recreate comments list
-	return r
-}
-
-// set is a wrapper for x.Set(y); it protects the caller from panics if x cannot be changed to y.
-func set(x, y reflect.Value) {
-	// don't bother if x cannot be set or y is invalid
-	if !x.CanSet() || !y.IsValid() {
-		return
-	}
-	defer func() {
-		if x := recover(); x != nil {
-			if s, ok := x.(string); ok &&
-				(strings.Contains(s, "type mismatch") || strings.Contains(s, "not assignable")) {
-				// x cannot be set to y - ignore this rewrite
-				return
-			}
-			panic(x)
-		}
-	}()
-	x.Set(y)
-}
-
-// Values/types for special cases.
-var (
-	objectPtrNil = reflect.ValueOf((*ast.Object)(nil))
-	scopePtrNil  = reflect.ValueOf((*ast.Scope)(nil))
-
-	identType     = reflect.TypeOf((*ast.Ident)(nil))
-	objectPtrType = reflect.TypeOf((*ast.Object)(nil))
-	positionType  = reflect.TypeOf(token.NoPos)
-	callExprType  = reflect.TypeOf((*ast.CallExpr)(nil))
-	scopePtrType  = reflect.TypeOf((*ast.Scope)(nil))
-)
-
-// apply replaces each AST field x in val with f(x), returning val.
-// To avoid extra conversions, f operates on the reflect.Value form.
-func apply(f func(reflect.Value) reflect.Value, val reflect.Value) reflect.Value {
-	if !val.IsValid() {
-		return reflect.Value{}
-	}
-
-	// *ast.Objects introduce cycles and are likely incorrect after
-	// rewrite; don't follow them but replace with nil instead
-	if val.Type() == objectPtrType {
-		return objectPtrNil
-	}
-
-	// similarly for scopes: they are likely incorrect after a rewrite;
-	// replace them with nil
-	if val.Type() == scopePtrType {
-		return scopePtrNil
-	}
-
-	switch v := reflect.Indirect(val); v.Kind() {
-	case reflect.Slice:
-		for i := 0; i < v.Len(); i++ {
-			e := v.Index(i)
-			set(e, f(e))
-		}
-	case reflect.Struct:
-		for i := 0; i < v.NumField(); i++ {
-			e := v.Field(i)
-			set(e, f(e))
-		}
-	case reflect.Interface:
-		e := v.Elem()
-		set(v, f(e))
-	}
-	return val
-}
-
-func isWildcard(s string) bool {
-	rune, size := utf8.DecodeRuneInString(s)
-	return size == len(s) && unicode.IsLower(rune)
-}
-
-// match returns true if pattern matches val,
-// recording wildcard submatches in m.
-// If m == nil, match checks whether pattern == val.
-func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
-	// Wildcard matches any expression.  If it appears multiple
-	// times in the pattern, it must match the same expression
-	// each time.
-	if m != nil && pattern.IsValid() && pattern.Type() == identType {
-		name := pattern.Interface().(*ast.Ident).Name
-		if isWildcard(name) && val.IsValid() {
-			// wildcards only match valid (non-nil) expressions.
-			if _, ok := val.Interface().(ast.Expr); ok && !val.IsNil() {
-				if old, ok := m[name]; ok {
-					return match(nil, old, val)
-				}
-				m[name] = val
-				return true
-			}
-		}
-	}
-
-	// Otherwise, pattern and val must match recursively.
-	if !pattern.IsValid() || !val.IsValid() {
-		return !pattern.IsValid() && !val.IsValid()
-	}
-	if pattern.Type() != val.Type() {
-		return false
-	}
-
-	// Special cases.
-	switch pattern.Type() {
-	case identType:
-		// For identifiers, only the names need to match
-		// (and none of the other *ast.Object information).
-		// This is a common case, handle it all here instead
-		// of recursing down any further via reflection.
-		p := pattern.Interface().(*ast.Ident)
-		v := val.Interface().(*ast.Ident)
-		return p == nil && v == nil || p != nil && v != nil && p.Name == v.Name
-	case objectPtrType, positionType:
-		// object pointers and token positions always match
-		return true
-	case callExprType:
-		// For calls, the Ellipsis fields (token.Position) must
-		// match since that is how f(x) and f(x...) are different.
-		// Check them here but fall through for the remaining fields.
-		p := pattern.Interface().(*ast.CallExpr)
-		v := val.Interface().(*ast.CallExpr)
-		if p.Ellipsis.IsValid() != v.Ellipsis.IsValid() {
-			return false
-		}
-	}
-
-	p := reflect.Indirect(pattern)
-	v := reflect.Indirect(val)
-	if !p.IsValid() || !v.IsValid() {
-		return !p.IsValid() && !v.IsValid()
-	}
-
-	switch p.Kind() {
-	case reflect.Slice:
-		if p.Len() != v.Len() {
-			return false
-		}
-		for i := 0; i < p.Len(); i++ {
-			if !match(m, p.Index(i), v.Index(i)) {
-				return false
-			}
-		}
-		return true
-
-	case reflect.Struct:
-		for i := 0; i < p.NumField(); i++ {
-			if !match(m, p.Field(i), v.Field(i)) {
-				return false
-			}
-		}
-		return true
-
-	case reflect.Interface:
-		return match(m, p.Elem(), v.Elem())
-	}
-
-	// Handle token integers, etc.
-	return p.Interface() == v.Interface()
-}
-
-// subst returns a copy of pattern with values from m substituted in place
-// of wildcards and pos used as the position of tokens from the pattern.
-// if m == nil, subst returns a copy of pattern and doesn't change the line
-// number information.
-func subst(m map[string]reflect.Value, pattern reflect.Value, pos reflect.Value) reflect.Value {
-	if !pattern.IsValid() {
-		return reflect.Value{}
-	}
-
-	// Wildcard gets replaced with map value.
-	if m != nil && pattern.Type() == identType {
-		name := pattern.Interface().(*ast.Ident).Name
-		if isWildcard(name) {
-			if old, ok := m[name]; ok {
-				return subst(nil, old, reflect.Value{})
-			}
-		}
-	}
-
-	if pos.IsValid() && pattern.Type() == positionType {
-		// use new position only if old position was valid in the first place
-		if old := pattern.Interface().(token.Pos); !old.IsValid() {
-			return pattern
-		}
-		return pos
-	}
-
-	// Otherwise copy.
-	switch p := pattern; p.Kind() {
-	case reflect.Slice:
-		v := reflect.MakeSlice(p.Type(), p.Len(), p.Len())
-		for i := 0; i < p.Len(); i++ {
-			v.Index(i).Set(subst(m, p.Index(i), pos))
-		}
-		return v
-
-	case reflect.Struct:
-		v := reflect.New(p.Type()).Elem()
-		for i := 0; i < p.NumField(); i++ {
-			v.Field(i).Set(subst(m, p.Field(i), pos))
-		}
-		return v
-
-	case reflect.Ptr:
-		v := reflect.New(p.Type()).Elem()
-		if elem := p.Elem(); elem.IsValid() {
-			v.Set(subst(m, elem, pos).Addr())
-		}
-		return v
-
-	case reflect.Interface:
-		v := reflect.New(p.Type()).Elem()
-		if elem := p.Elem(); elem.IsValid() {
-			v.Set(subst(m, elem, pos))
-		}
-		return v
-	}
-
-	return pattern
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore b/Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore
deleted file mode 100644
index daf913b1b3..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml b/Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml
deleted file mode 100644
index 977179953d..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-language: go
-
-go:
-  - 1.3
-  - 1.4
-  - 1.5
-  - 1.6
-  - tip
-
-script: 
- - go test -v .
- - go test -v -race .
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE b/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE
deleted file mode 100644
index 4fd5963e39..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-Copyright (c) 2015 Klaus Post
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/README.md b/Godeps/_workspace/src/github.com/klauspost/crc32/README.md
deleted file mode 100644
index 440541c7ff..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# crc32
-CRC32 hash with x64 optimizations
-
-This package is a drop-in replacement for the standard library `hash/crc32` package, that features SSE 4.2 optimizations on x64 platforms, for a 10x speedup.
-
-[![Build Status](https://travis-ci.org/klauspost/crc32.svg?branch=master)](https://travis-ci.org/klauspost/crc32)
-
-# usage
-
-Install using `go get github.com/klauspost/crc32`. This library is based on Go 1.5 code and requires Go 1.3 or newer.
-
-Replace `import "hash/crc32"` with `import "github.com/klauspost/crc32"` and you are good to go.
-
-# changes
-
-* Dec 4, 2015: Uses the "slice-by-8" trick more extensively, which gives a 1.5 to 2.5x speedup if assembler is unavailable.
-
-
-# performance
-
-For IEEE tables (the most common), there is approximately a factor 10 speedup with "CLMUL" (Carryless multiplication) instruction:
-```
-benchmark            old ns/op     new ns/op     delta
-BenchmarkCrc32KB     99955         10258         -89.74%
-
-benchmark            old MB/s     new MB/s     speedup
-BenchmarkCrc32KB     327.83       3194.20      9.74x
-```
-
-For other tables and "CLMUL"  capable machines the performance is the same as the standard library.
-
-Here are some detailed benchmarks, comparing to go 1.5 standard library with and without assembler enabled.
-
-```
-Std:   Standard Go 1.5 library
-Crc:   Indicates IEEE type CRC.
-40B:   Size of each slice encoded.
-NoAsm: Assembler was disabled (ie. not an AMD64 or SSE 4.2+ capable machine).
-Castagnoli: Castagnoli CRC type.
-
-BenchmarkStdCrc40B-4            10000000               158 ns/op         252.88 MB/s
-BenchmarkCrc40BNoAsm-4          20000000               105 ns/op         377.38 MB/s (slice8)
-BenchmarkCrc40B-4               20000000               105 ns/op         378.77 MB/s (slice8)
-
-BenchmarkStdCrc1KB-4              500000              3604 ns/op         284.10 MB/s
-BenchmarkCrc1KBNoAsm-4           1000000              1463 ns/op         699.79 MB/s (slice8)
-BenchmarkCrc1KB-4                3000000               396 ns/op        2583.69 MB/s (asm)
-
-BenchmarkStdCrc8KB-4              200000             11417 ns/op         717.48 MB/s (slice8)
-BenchmarkCrc8KBNoAsm-4            200000             11317 ns/op         723.85 MB/s (slice8)
-BenchmarkCrc8KB-4                 500000              2919 ns/op        2805.73 MB/s (asm)
-
-BenchmarkStdCrc32KB-4              30000             45749 ns/op         716.24 MB/s (slice8)
-BenchmarkCrc32KBNoAsm-4            30000             45109 ns/op         726.42 MB/s (slice8)
-BenchmarkCrc32KB-4                100000             11497 ns/op        2850.09 MB/s (asm)
-
-BenchmarkStdNoAsmCastagnol40B-4 10000000               161 ns/op         246.94 MB/s
-BenchmarkStdCastagnoli40B-4     50000000              28.4 ns/op        1410.69 MB/s (asm)
-BenchmarkCastagnoli40BNoAsm-4   20000000               100 ns/op         398.01 MB/s (slice8)
-BenchmarkCastagnoli40B-4        50000000              28.2 ns/op        1419.54 MB/s (asm)
-
-BenchmarkStdNoAsmCastagnoli1KB-4  500000              3622 ns/op        282.67 MB/s
-BenchmarkStdCastagnoli1KB-4     10000000               144 ns/op        7099.78 MB/s (asm)
-BenchmarkCastagnoli1KBNoAsm-4    1000000              1475 ns/op         694.14 MB/s (slice8)
-BenchmarkCastagnoli1KB-4        10000000               146 ns/op        6993.35 MB/s (asm)
-
-BenchmarkStdNoAsmCastagnoli8KB-4  50000              28781 ns/op         284.63 MB/s
-BenchmarkStdCastagnoli8KB-4      1000000              1029 ns/op        7957.89 MB/s (asm)
-BenchmarkCastagnoli8KBNoAsm-4     200000             11410 ns/op         717.94 MB/s (slice8)
-BenchmarkCastagnoli8KB-4         1000000              1000 ns/op        8188.71 MB/s (asm)
-
-BenchmarkStdNoAsmCastagnoli32KB-4  10000            115426 ns/op         283.89 MB/s
-BenchmarkStdCastagnoli32KB-4      300000              4065 ns/op        8059.13 MB/s (asm)
-BenchmarkCastagnoli32KBNoAsm-4     30000             45171 ns/op         725.41 MB/s (slice8)
-BenchmarkCastagnoli32KB-4         500000              4077 ns/op        8035.89 MB/s (asm)
-```
-
-The IEEE assembler optimizations has been submitted and will be part of the Go 1.6 standard library.
-
-However, the improved use of slice-by-8 has not, but will probably be submitted for Go 1.7.
-
-# license
-
-Standard Go license. Changes are Copyright (c) 2015 Klaus Post under same conditions.
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go
deleted file mode 100644
index 8d6ba5d3dc..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package crc32 implements the 32-bit cyclic redundancy check, or CRC-32,
-// checksum. See http://en.wikipedia.org/wiki/Cyclic_redundancy_check for
-// information.
-//
-// Polynomials are represented in LSB-first form also known as reversed representation.
-//
-// See http://en.wikipedia.org/wiki/Mathematics_of_cyclic_redundancy_checks#Reversed_representations_and_reciprocal_polynomials
-// for information.
-package crc32
-
-import (
-	"hash"
-	"sync"
-)
-
-// The size of a CRC-32 checksum in bytes.
-const Size = 4
-
-// Predefined polynomials.
-const (
-	// IEEE is by far and away the most common CRC-32 polynomial.
-	// Used by ethernet (IEEE 802.3), v.42, fddi, gzip, zip, png, ...
-	IEEE = 0xedb88320
-
-	// Castagnoli's polynomial, used in iSCSI.
-	// Has better error detection characteristics than IEEE.
-	// http://dx.doi.org/10.1109/26.231911
-	Castagnoli = 0x82f63b78
-
-	// Koopman's polynomial.
-	// Also has better error detection characteristics than IEEE.
-	// http://dx.doi.org/10.1109/DSN.2002.1028931
-	Koopman = 0xeb31d82e
-)
-
-// Table is a 256-word table representing the polynomial for efficient processing.
-type Table [256]uint32
-
-// castagnoliTable points to a lazily initialized Table for the Castagnoli
-// polynomial. MakeTable will always return this value when asked to make a
-// Castagnoli table so we can compare against it to find when the caller is
-// using this polynomial.
-var castagnoliTable *Table
-var castagnoliTable8 *slicing8Table
-var castagnoliOnce sync.Once
-
-func castagnoliInit() {
-	castagnoliTable = makeTable(Castagnoli)
-	castagnoliTable8 = makeTable8(Castagnoli)
-}
-
-// IEEETable is the table for the IEEE polynomial.
-var IEEETable = makeTable(IEEE)
-
-// slicing8Table is array of 8 Tables
-type slicing8Table [8]Table
-
-// ieeeTable8 is the slicing8Table for IEEE
-var ieeeTable8 *slicing8Table
-var ieeeTable8Once sync.Once
-
-// MakeTable returns a Table constructed from the specified polynomial.
-// The contents of this Table must not be modified.
-func MakeTable(poly uint32) *Table {
-	switch poly {
-	case IEEE:
-		return IEEETable
-	case Castagnoli:
-		castagnoliOnce.Do(castagnoliInit)
-		return castagnoliTable
-	}
-	return makeTable(poly)
-}
-
-// makeTable returns the Table constructed from the specified polynomial.
-func makeTable(poly uint32) *Table {
-	t := new(Table)
-	for i := 0; i < 256; i++ {
-		crc := uint32(i)
-		for j := 0; j < 8; j++ {
-			if crc&1 == 1 {
-				crc = (crc >> 1) ^ poly
-			} else {
-				crc >>= 1
-			}
-		}
-		t[i] = crc
-	}
-	return t
-}
-
-// makeTable8 returns slicing8Table constructed from the specified polynomial.
-func makeTable8(poly uint32) *slicing8Table {
-	t := new(slicing8Table)
-	t[0] = *makeTable(poly)
-	for i := 0; i < 256; i++ {
-		crc := t[0][i]
-		for j := 1; j < 8; j++ {
-			crc = t[0][crc&0xFF] ^ (crc >> 8)
-			t[j][i] = crc
-		}
-	}
-	return t
-}
-
-// digest represents the partial evaluation of a checksum.
-type digest struct {
-	crc uint32
-	tab *Table
-}
-
-// New creates a new hash.Hash32 computing the CRC-32 checksum
-// using the polynomial represented by the Table.
-// Its Sum method will lay the value out in big-endian byte order.
-func New(tab *Table) hash.Hash32 { return &digest{0, tab} }
-
-// NewIEEE creates a new hash.Hash32 computing the CRC-32 checksum
-// using the IEEE polynomial.
-// Its Sum method will lay the value out in big-endian byte order.
-func NewIEEE() hash.Hash32 { return New(IEEETable) }
-
-func (d *digest) Size() int { return Size }
-
-func (d *digest) BlockSize() int { return 1 }
-
-func (d *digest) Reset() { d.crc = 0 }
-
-func update(crc uint32, tab *Table, p []byte) uint32 {
-	crc = ^crc
-	for _, v := range p {
-		crc = tab[byte(crc)^v] ^ (crc >> 8)
-	}
-	return ^crc
-}
-
-// updateSlicingBy8 updates CRC using Slicing-by-8
-func updateSlicingBy8(crc uint32, tab *slicing8Table, p []byte) uint32 {
-	crc = ^crc
-	for len(p) > 8 {
-		crc ^= uint32(p[0]) | uint32(p[1])<<8 | uint32(p[2])<<16 | uint32(p[3])<<24
-		crc = tab[0][p[7]] ^ tab[1][p[6]] ^ tab[2][p[5]] ^ tab[3][p[4]] ^
-			tab[4][crc>>24] ^ tab[5][(crc>>16)&0xFF] ^
-			tab[6][(crc>>8)&0xFF] ^ tab[7][crc&0xFF]
-		p = p[8:]
-	}
-	crc = ^crc
-	if len(p) == 0 {
-		return crc
-	}
-	return update(crc, &tab[0], p)
-}
-
-// Update returns the result of adding the bytes in p to the crc.
-func Update(crc uint32, tab *Table, p []byte) uint32 {
-	if tab == castagnoliTable {
-		return updateCastagnoli(crc, p)
-	}
-	if tab == IEEETable {
-		return updateIEEE(crc, p)
-	}
-	return update(crc, tab, p)
-}
-
-func (d *digest) Write(p []byte) (n int, err error) {
-	d.crc = Update(d.crc, d.tab, p)
-	return len(p), nil
-}
-
-func (d *digest) Sum32() uint32 { return d.crc }
-
-func (d *digest) Sum(in []byte) []byte {
-	s := d.Sum32()
-	return append(in, byte(s>>24), byte(s>>16), byte(s>>8), byte(s))
-}
-
-// Checksum returns the CRC-32 checksum of data
-// using the polynomial represented by the Table.
-func Checksum(data []byte, tab *Table) uint32 { return Update(0, tab, data) }
-
-// ChecksumIEEE returns the CRC-32 checksum of data
-// using the IEEE polynomial.
-func ChecksumIEEE(data []byte) uint32 { return updateIEEE(0, data) }
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go
deleted file mode 100644
index 4827128ea0..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine,!gccgo
-
-package crc32
-
-// This file contains the code to call the SSE 4.2 version of the Castagnoli
-// and IEEE CRC.
-
-// haveSSE41/haveSSE42/haveCLMUL are defined in crc_amd64.s and use
-// CPUID to test for SSE 4.1, 4.2 and CLMUL support.
-func haveSSE41() bool
-func haveSSE42() bool
-func haveCLMUL() bool
-
-// castagnoliSSE42 is defined in crc_amd64.s and uses the SSE4.2 CRC32
-// instruction.
-//go:noescape
-func castagnoliSSE42(crc uint32, p []byte) uint32
-
-// ieeeCLMUL is defined in crc_amd64.s and uses the PCLMULQDQ
-// instruction as well as SSE 4.1.
-//go:noescape
-func ieeeCLMUL(crc uint32, p []byte) uint32
-
-var sse42 = haveSSE42()
-var useFastIEEE = haveCLMUL() && haveSSE41()
-
-func updateCastagnoli(crc uint32, p []byte) uint32 {
-	if sse42 {
-		return castagnoliSSE42(crc, p)
-	}
-	// only use slicing-by-8 when input is >= 16 Bytes
-	if len(p) >= 16 {
-		return updateSlicingBy8(crc, castagnoliTable8, p)
-	}
-	return update(crc, castagnoliTable, p)
-}
-
-func updateIEEE(crc uint32, p []byte) uint32 {
-	if useFastIEEE && len(p) >= 64 {
-		left := len(p) & 15
-		do := len(p) - left
-		crc = ^ieeeCLMUL(^crc, p[:do])
-		if left > 0 {
-			crc = update(crc, IEEETable, p[do:])
-		}
-		return crc
-	}
-
-	// only use slicing-by-8 when input is >= 16 Bytes
-	if len(p) >= 16 {
-		ieeeTable8Once.Do(func() {
-			ieeeTable8 = makeTable8(IEEE)
-		})
-		return updateSlicingBy8(crc, ieeeTable8, p)
-	}
-
-	return update(crc, IEEETable, p)
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s
deleted file mode 100644
index 9bf05d89b8..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64.s
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gc
-
-#define NOSPLIT 4
-#define RODATA 8
-
-// func castagnoliSSE42(crc uint32, p []byte) uint32
-TEXT ·castagnoliSSE42(SB), NOSPLIT, $0
-	MOVL crc+0(FP), AX    // CRC value
-	MOVQ p+8(FP), SI      // data pointer
-	MOVQ p_len+16(FP), CX // len(p)
-
-	NOTL AX
-
-	// If there's less than 8 bytes to process, we do it byte-by-byte.
-	CMPQ CX, $8
-	JL   cleanup
-
-	// Process individual bytes until the input is 8-byte aligned.
-startup:
-	MOVQ SI, BX
-	ANDQ $7, BX
-	JZ   aligned
-
-	CRC32B (SI), AX
-	DECQ   CX
-	INCQ   SI
-	JMP    startup
-
-aligned:
-	// The input is now 8-byte aligned and we can process 8-byte chunks.
-	CMPQ CX, $8
-	JL   cleanup
-
-	CRC32Q (SI), AX
-	ADDQ   $8, SI
-	SUBQ   $8, CX
-	JMP    aligned
-
-cleanup:
-	// We may have some bytes left over that we process one at a time.
-	CMPQ CX, $0
-	JE   done
-
-	CRC32B (SI), AX
-	INCQ   SI
-	DECQ   CX
-	JMP    cleanup
-
-done:
-	NOTL AX
-	MOVL AX, ret+32(FP)
-	RET
-
-// func haveSSE42() bool
-TEXT ·haveSSE42(SB), NOSPLIT, $0
-	XORQ AX, AX
-	INCL AX
-	CPUID
-	SHRQ $20, CX
-	ANDQ $1, CX
-	MOVB CX, ret+0(FP)
-	RET
-
-// func haveCLMUL() bool
-TEXT ·haveCLMUL(SB), NOSPLIT, $0
-	XORQ AX, AX
-	INCL AX
-	CPUID
-	SHRQ $1, CX
-	ANDQ $1, CX
-	MOVB CX, ret+0(FP)
-	RET
-
-// func haveSSE41() bool
-TEXT ·haveSSE41(SB), NOSPLIT, $0
-	XORQ AX, AX
-	INCL AX
-	CPUID
-	SHRQ $19, CX
-	ANDQ $1, CX
-	MOVB CX, ret+0(FP)
-	RET
-
-// CRC32 polynomial data
-//
-// These constants are lifted from the
-// Linux kernel, since they avoid the costly
-// PSHUFB 16 byte reversal proposed in the
-// original Intel paper.
-DATA r2r1kp<>+0(SB)/8, $0x154442bd4
-DATA r2r1kp<>+8(SB)/8, $0x1c6e41596
-DATA r4r3kp<>+0(SB)/8, $0x1751997d0
-DATA r4r3kp<>+8(SB)/8, $0x0ccaa009e
-DATA rupolykp<>+0(SB)/8, $0x1db710641
-DATA rupolykp<>+8(SB)/8, $0x1f7011641
-DATA r5kp<>+0(SB)/8, $0x163cd6124
-
-GLOBL r2r1kp<>(SB), RODATA, $16
-GLOBL r4r3kp<>(SB), RODATA, $16
-GLOBL rupolykp<>(SB), RODATA, $16
-GLOBL r5kp<>(SB), RODATA, $8
-
-// Based on http://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
-// len(p) must be at least 64, and must be a multiple of 16.
-
-// func ieeeCLMUL(crc uint32, p []byte) uint32
-TEXT ·ieeeCLMUL(SB), NOSPLIT, $0
-	MOVL crc+0(FP), X0    // Initial CRC value
-	MOVQ p+8(FP), SI      // data pointer
-	MOVQ p_len+16(FP), CX // len(p)
-
-	MOVOU (SI), X1
-	MOVOU 16(SI), X2
-	MOVOU 32(SI), X3
-	MOVOU 48(SI), X4
-	PXOR  X0, X1
-	ADDQ  $64, SI    // buf+=64
-	SUBQ  $64, CX    // len-=64
-	CMPQ  CX, $64    // Less than 64 bytes left
-	JB    remain64
-
-	MOVOA r2r1kp<>+0(SB), X0
-
-loopback64:
-	MOVOA X1, X5
-	MOVOA X2, X6
-	MOVOA X3, X7
-	MOVOA X4, X8
-
-	PCLMULQDQ $0, X0, X1
-	PCLMULQDQ $0, X0, X2
-	PCLMULQDQ $0, X0, X3
-	PCLMULQDQ $0, X0, X4
-
-	// Load next early
-	MOVOU (SI), X11
-	MOVOU 16(SI), X12
-	MOVOU 32(SI), X13
-	MOVOU 48(SI), X14
-
-	PCLMULQDQ $0x11, X0, X5
-	PCLMULQDQ $0x11, X0, X6
-	PCLMULQDQ $0x11, X0, X7
-	PCLMULQDQ $0x11, X0, X8
-
-	PXOR X5, X1
-	PXOR X6, X2
-	PXOR X7, X3
-	PXOR X8, X4
-
-	PXOR X11, X1
-	PXOR X12, X2
-	PXOR X13, X3
-	PXOR X14, X4
-
-	ADDQ $0x40, DI
-	ADDQ $64, SI    // buf+=64
-	SUBQ $64, CX    // len-=64
-	CMPQ CX, $64    // Less than 64 bytes left?
-	JGE  loopback64
-
-	// Fold result into a single register (X1)
-remain64:
-	MOVOA r4r3kp<>+0(SB), X0
-
-	MOVOA     X1, X5
-	PCLMULQDQ $0, X0, X1
-	PCLMULQDQ $0x11, X0, X5
-	PXOR      X5, X1
-	PXOR      X2, X1
-
-	MOVOA     X1, X5
-	PCLMULQDQ $0, X0, X1
-	PCLMULQDQ $0x11, X0, X5
-	PXOR      X5, X1
-	PXOR      X3, X1
-
-	MOVOA     X1, X5
-	PCLMULQDQ $0, X0, X1
-	PCLMULQDQ $0x11, X0, X5
-	PXOR      X5, X1
-	PXOR      X4, X1
-
-	// More than 16 bytes left?
-	CMPQ CX, $16
-	JB   finish
-
-	// Encode 16 bytes
-remain16:
-	MOVOU     (SI), X10
-	MOVOA     X1, X5
-	PCLMULQDQ $0, X0, X1
-	PCLMULQDQ $0x11, X0, X5
-	PXOR      X5, X1
-	PXOR      X10, X1
-	SUBQ      $16, CX
-	ADDQ      $16, SI
-	CMPQ      CX, $16
-	JGE       remain16
-
-finish:
-	// Fold final result into 32 bits and return it
-	PCMPEQB   X3, X3
-	PCLMULQDQ $1, X1, X0
-	PSRLDQ    $8, X1
-	PXOR      X0, X1
-
-	MOVOA X1, X2
-	MOVQ  r5kp<>+0(SB), X0
-
-	// Creates 32 bit mask. Note that we don't care about upper half.
-	PSRLQ $32, X3
-
-	PSRLDQ    $4, X2
-	PAND      X3, X1
-	PCLMULQDQ $0, X0, X1
-	PXOR      X2, X1
-
-	MOVOA rupolykp<>+0(SB), X0
-
-	MOVOA     X1, X2
-	PAND      X3, X1
-	PCLMULQDQ $0x10, X0, X1
-	PAND      X3, X1
-	PCLMULQDQ $0, X0, X1
-	PXOR      X2, X1
-
-	// PEXTRD   $1, X1, AX  (SSE 4.1)
-	BYTE $0x66; BYTE $0x0f; BYTE $0x3a
-	BYTE $0x16; BYTE $0xc8; BYTE $0x01
-	MOVL AX, ret+32(FP)
-
-	RET
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go
deleted file mode 100644
index 926473e7c0..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine,!gccgo
-
-package crc32
-
-// This file contains the code to call the SSE 4.2 version of the Castagnoli
-// CRC.
-
-// haveSSE42 is defined in crc_amd64p32.s and uses CPUID to test for SSE 4.2
-// support.
-func haveSSE42() bool
-
-// castagnoliSSE42 is defined in crc_amd64.s and uses the SSE4.2 CRC32
-// instruction.
-//go:noescape
-func castagnoliSSE42(crc uint32, p []byte) uint32
-
-var sse42 = haveSSE42()
-
-func updateCastagnoli(crc uint32, p []byte) uint32 {
-	if sse42 {
-		return castagnoliSSE42(crc, p)
-	}
-	return update(crc, castagnoliTable, p)
-}
-
-func updateIEEE(crc uint32, p []byte) uint32 {
-	// only use slicing-by-8 when input is >= 4KB
-	if len(p) >= 4096 {
-		ieeeTable8Once.Do(func() {
-			ieeeTable8 = makeTable8(IEEE)
-		})
-		return updateSlicingBy8(crc, ieeeTable8, p)
-	}
-
-	return update(crc, IEEETable, p)
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s
deleted file mode 100644
index a578d685cc..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_amd64p32.s
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gc
-
-#define NOSPLIT 4
-#define RODATA 8
-
-// func castagnoliSSE42(crc uint32, p []byte) uint32
-TEXT ·castagnoliSSE42(SB), NOSPLIT, $0
-	MOVL crc+0(FP), AX   // CRC value
-	MOVL p+4(FP), SI     // data pointer
-	MOVL p_len+8(FP), CX // len(p)
-
-	NOTL AX
-
-	// If there's less than 8 bytes to process, we do it byte-by-byte.
-	CMPQ CX, $8
-	JL   cleanup
-
-	// Process individual bytes until the input is 8-byte aligned.
-startup:
-	MOVQ SI, BX
-	ANDQ $7, BX
-	JZ   aligned
-
-	CRC32B (SI), AX
-	DECQ   CX
-	INCQ   SI
-	JMP    startup
-
-aligned:
-	// The input is now 8-byte aligned and we can process 8-byte chunks.
-	CMPQ CX, $8
-	JL   cleanup
-
-	CRC32Q (SI), AX
-	ADDQ   $8, SI
-	SUBQ   $8, CX
-	JMP    aligned
-
-cleanup:
-	// We may have some bytes left over that we process one at a time.
-	CMPQ CX, $0
-	JE   done
-
-	CRC32B (SI), AX
-	INCQ   SI
-	DECQ   CX
-	JMP    cleanup
-
-done:
-	NOTL AX
-	MOVL AX, ret+16(FP)
-	RET
-
-// func haveSSE42() bool
-TEXT ·haveSSE42(SB), NOSPLIT, $0
-	XORQ AX, AX
-	INCL AX
-	CPUID
-	SHRQ $20, CX
-	ANDQ $1, CX
-	MOVB CX, ret+0(FP)
-	RET
-
diff --git a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go b/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go
deleted file mode 100644
index a53cf96a00..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/crc32/crc32_generic.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !amd64,!amd64p32 appengine gccgo
-
-package crc32
-
-// This file contains the generic version of updateCastagnoli which does
-// slicing-by-8, or uses the fallback for very small sizes.
-
-func updateCastagnoli(crc uint32, p []byte) uint32 {
-	// only use slicing-by-8 when input is >= 16 Bytes
-	if len(p) >= 16 {
-		return updateSlicingBy8(crc, castagnoliTable8, p)
-	}
-	return update(crc, castagnoliTable, p)
-}
-
-func updateIEEE(crc uint32, p []byte) uint32 {
-	// only use slicing-by-8 when input is >= 16 Bytes
-	if len(p) >= 16 {
-		ieeeTable8Once.Do(func() {
-			ieeeTable8 = makeTable8(IEEE)
-		})
-		return updateSlicingBy8(crc, ieeeTable8, p)
-	}
-	return update(crc, IEEETable, p)
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/.gitignore b/Godeps/_workspace/src/github.com/klauspost/pgzip/.gitignore
deleted file mode 100644
index daf913b1b3..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/pgzip/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/.travis.yml b/Godeps/_workspace/src/github.com/klauspost/pgzip/.travis.yml
deleted file mode 100644
index 6284168510..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/pgzip/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: go
-
-sudo: false
-
-os:
-  - linux
-  - osx
-
-go:
-  - 1.3
-  - 1.4
-  - 1.5
-  - 1.6
-  - tip
-
-script: 
- - go test -v -cpu=1,2,4 .
- - go test -v -cpu=2 -race -short .
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/GO_LICENSE b/Godeps/_workspace/src/github.com/klauspost/pgzip/GO_LICENSE
deleted file mode 100644
index 7448756763..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/pgzip/GO_LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/LICENSE b/Godeps/_workspace/src/github.com/klauspost/pgzip/LICENSE
deleted file mode 100644
index 2bdc0d7517..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/pgzip/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Klaus Post
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/README.md b/Godeps/_workspace/src/github.com/klauspost/pgzip/README.md
deleted file mode 100644
index c312f53f73..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/pgzip/README.md
+++ /dev/null
@@ -1,115 +0,0 @@
-pgzip
-=====
-
-Go parallel gzip compression/decompression. This is a fully gzip compatible drop in replacement for "compress/gzip".
-
-This will split compression into blocks that are compressed in parallel. This can be useful for compressing big amounts of data. The output is a standard gzip file.
-
-The gzip decompression is modified so it decompresses ahead of the current reader. This means that reads will be non-blocking if the decompressor can keep ahead of your code reading from it. CRC calculation also takes place in a separate goroutine.
-
-You should only use this if you are (de)compressing big amounts of data, say **more than 1MB** at the time, otherwise you will not see any benefit, and it will likely be faster to use the internal gzip library.
-
-It is important to note that this library creates and reads *standard gzip files*. You do not have to match the compressor/decompressor to get the described speedups, and the gzip files are fully compatible with other gzip readers/writers.
-
-A golang variant of this is [bgzf](https://godoc.org/github.com/biogo/hts/bgzf), which has the same feature, as well as seeking in the resulting file. The only drawback is a slightly bigger overhead compared to this and pure gzip. See a comparison below.
-
-[![GoDoc][1]][2] [![Build Status][3]][4]
-
-[1]: https://godoc.org/github.com/klauspost/pgzip?status.svg
-[2]: https://godoc.org/github.com/klauspost/pgzip
-[3]: https://travis-ci.org/klauspost/pgzip.svg
-[4]: https://travis-ci.org/klauspost/pgzip
-
-Installation
-====
-```go get github.com/klauspost/pgzip```
-
-Usage
-====
-[Godoc Doumentation](https://godoc.org/github.com/klauspost/pgzip)
-
-To use as a replacement for gzip, exchange 
-
-```import "compress/gzip"``` 
-with 
-```import gzip "github.com/klauspost/pgzip"```.
-
-# Changes
-
-* Dec 8, 2015: Decoder now supports the io.WriterTo interface, giving a speedup and less GC pressure.
-* Oct 9, 2015: Reduced allocations by ~35 by using sync.Pool. ~15% overall speedup.
-
-Changes in [github.com/klauspost/compress](https://github.com/klauspost/compress#changelog) are also carried over, so see that for more changes.
-
-## Compression
-The simplest way to use this is to simply do the same as you would when using [compress/gzip](http://golang.org/pkg/compress/gzip). 
-
-To change the block size, use the added (*pgzip.Writer).SetConcurrency(blockSize, blocks int) function. With this you can control the approximate size of your blocks, as well as how many you want to be processing in parallel. Default values for this is SetConcurrency(250000, 16), meaning blocks are split at 250000 bytes and up to 16 blocks can be processing at once before the writer blocks.
-
-
-Example:
-```
-var b bytes.Buffer
-w := gzip.NewWriter(&b)
-w.SetConcurrency(100000, 10)
-w.Write([]byte("hello, world\n"))
-w.Close()
-```
-
-To get any performance gains, you should at least be compressing more than 1 megabyte of data at the time.
-
-You should at least have a block size of 100k and at least a number of blocks that match the number of cores your would like to utilize, but about twice the number of blocks would be the best.
-
-Another side effect of this is, that it is likely to speed up your other code, since writes to the compressor only blocks if the compressor is already compressing the number of blocks you have specified. This also means you don't have worry about buffering input to the compressor.
-
-## Decompression
-
-Decompression works similar to compression. That means that you simply call pgzip the same way as you would call [compress/gzip](http://golang.org/pkg/compress/gzip). 
-
-The only difference is that if you want to specify your own readahead, you have to use `pgzip.NewReaderN(r io.Reader, blockSize, blocks int)` to get a reader with your custom blocksizes. The `blockSize` is the size of each block decoded, and `blocks` is the maximum number of blocks that is decoded ahead.
-
-See [Example on playground](http://play.golang.org/p/uHv1B5NbDh)
-
-Performance
-====
-## Compression
-
-See my blog post in [Benchmarks of Golang Gzip](https://blog.klauspost.com/go-gzipdeflate-benchmarks/).
-
-Compression cost is usually about 0.2% with default settings with a block size of 250k.
-
-Example with GOMAXPROC set to 8 (quad core with 8 hyperthreads)
-
-Content is [Matt Mahoneys 10GB corpus](http://mattmahoney.net/dc/10gb.html). Compression level 6.
-
-Compressor  | MB/sec   | speedup | size | size overhead (lower=better)
-------------|----------|---------|------|---------
-[gzip](http://golang.org/pkg/compress/gzip) (golang) | 7.21MB/s | 1.0x | 4786608902 | 0%
-[gzip](http://github.com/klauspost/compress/gzip) (klauspost) | 10.98MB/s | 1.52x | 4781331645 | -0.11%
-[pgzip](https://github.com/klauspost/pgzip) (klauspost) | 50.76MB/s|7.04x | 4784121440 | -0.052%
-[bgzf](https://godoc.org/github.com/biogo/hts/bgzf) (biogo) | 38.65MB/s | 5.36x | 4924899484 | 2.889%
-[pargzip](https://godoc.org/github.com/golang/build/pargzip) (builder) | 32.00MB/s | 4.44x | 4791226567 | 0.096%
-
-pgzip also contains a [linear time compression](https://github.com/klauspost/compress#linear-time-compression) mode, that will allow compression at ~150MB per core per second, independent of the content.
-
-See the [complete sheet](https://docs.google.com/spreadsheets/d/1nuNE2nPfuINCZJRMt6wFWhKpToF95I47XjSsc-1rbPQ/edit?usp=sharing) for different content types and compression settings.
-
-## Decompression
-
-The decompression speedup is there because it allows you to do other work while the decompression is taking place.
-
-In the example above, the numbers are as follows on a 4 CPU machine:
-
-Decompressor | Time | Speedup
--------------|------|--------
-[gzip](http://golang.org/pkg/compress/gzip) (golang) | 1m28.85s | 0%
-[pgzip](https://github.com/klauspost/pgzip) (golang) | 43.48s | 104%
-
-But wait, since gzip decompression is inherently singlethreaded (aside from CRC calculation) how can it be more than 100% faster?  Because pgzip due to its design also acts as a buffer. When using ubuffered gzip, you are also waiting for io when you are decompressing. If the gzip decoder can keep up, it will always have data ready for your reader, and you will not be waiting for input to the gzip decompressor to complete.
-
-This is pretty much an optimal situation for pgzip, but it reflects most common usecases for CPU intensive gzip usage.
-
-I haven't included [bgzf](https://godoc.org/github.com/biogo/hts/bgzf) in this comparision, since it only can decompress files created by a compatible encoder, and therefore cannot be considered a generic gzip decompressor. But if you are able to compress your files with a bgzf compatible program, you can expect it to scale beyond 100%.
-
-#License
-This contains large portions of code from the go repository - see GO_LICENSE for more information. The changes are released under MIT License. See LICENSE for more information.
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/circle.yml b/Godeps/_workspace/src/github.com/klauspost/pgzip/circle.yml
deleted file mode 100644
index 67b2b1628f..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/pgzip/circle.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test:
-  pre:
-    - go vet ./...
-
-  override:
-    - go test -v -cpu=1,2,4 .
-    - go test -v -cpu=2 -race -short .
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/gunzip.go b/Godeps/_workspace/src/github.com/klauspost/pgzip/gunzip.go
deleted file mode 100644
index 45b846e020..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/pgzip/gunzip.go
+++ /dev/null
@@ -1,564 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package pgzip implements reading and writing of gzip format compressed files,
-// as specified in RFC 1952.
-//
-// This is a drop in replacement for "compress/gzip".
-// This will split compression into blocks that are compressed in parallel.
-// This can be useful for compressing big amounts of data.
-// The gzip decompression has not been modified, but remains in the package,
-// so you can use it as a complete replacement for "compress/gzip".
-//
-// See more at https://github.com/klauspost/pgzip
-package pgzip
-
-import (
-	"bufio"
-	"errors"
-	"hash"
-	"io"
-	"sync"
-	"time"
-
-	"github.com/klauspost/compress/flate"
-	"github.com/klauspost/crc32"
-)
-
-const (
-	gzipID1     = 0x1f
-	gzipID2     = 0x8b
-	gzipDeflate = 8
-	flagText    = 1 << 0
-	flagHdrCrc  = 1 << 1
-	flagExtra   = 1 << 2
-	flagName    = 1 << 3
-	flagComment = 1 << 4
-)
-
-func makeReader(r io.Reader) flate.Reader {
-	if rr, ok := r.(flate.Reader); ok {
-		return rr
-	}
-	return bufio.NewReader(r)
-}
-
-var (
-	// ErrChecksum is returned when reading GZIP data that has an invalid checksum.
-	ErrChecksum = errors.New("gzip: invalid checksum")
-	// ErrHeader is returned when reading GZIP data that has an invalid header.
-	ErrHeader = errors.New("gzip: invalid header")
-)
-
-// The gzip file stores a header giving metadata about the compressed file.
-// That header is exposed as the fields of the Writer and Reader structs.
-type Header struct {
-	Comment string    // comment
-	Extra   []byte    // "extra data"
-	ModTime time.Time // modification time
-	Name    string    // file name
-	OS      byte      // operating system type
-}
-
-// A Reader is an io.Reader that can be read to retrieve
-// uncompressed data from a gzip-format compressed file.
-//
-// In general, a gzip file can be a concatenation of gzip files,
-// each with its own header.  Reads from the Reader
-// return the concatenation of the uncompressed data of each.
-// Only the first header is recorded in the Reader fields.
-//
-// Gzip files store a length and checksum of the uncompressed data.
-// The Reader will return a ErrChecksum when Read
-// reaches the end of the uncompressed data if it does not
-// have the expected length or checksum.  Clients should treat data
-// returned by Read as tentative until they receive the io.EOF
-// marking the end of the data.
-type Reader struct {
-	Header
-	r            flate.Reader
-	decompressor io.ReadCloser
-	digest       hash.Hash32
-	size         uint32
-	flg          byte
-	buf          [512]byte
-	err          error
-	closeErr     chan error
-	multistream  bool
-
-	readAhead   chan read
-	roff        int // read offset
-	current     []byte
-	closeReader chan struct{}
-	lastBlock   bool
-	blockSize   int
-	blocks      int
-
-	activeRA bool       // Indication if readahead is active
-	mu       sync.Mutex // Lock for above
-
-	blockPool chan []byte
-}
-
-type read struct {
-	b   []byte
-	err error
-}
-
-// NewReader creates a new Reader reading the given reader.
-// The implementation buffers input and may read more data than necessary from r.
-// It is the caller's responsibility to call Close on the Reader when done.
-func NewReader(r io.Reader) (*Reader, error) {
-	z := new(Reader)
-	z.blocks = defaultBlocks
-	z.blockSize = defaultBlockSize
-	z.r = makeReader(r)
-	z.digest = crc32.NewIEEE()
-	z.multistream = true
-	z.blockPool = make(chan []byte, z.blocks)
-	for i := 0; i < z.blocks; i++ {
-		z.blockPool <- make([]byte, z.blockSize)
-	}
-	if err := z.readHeader(true); err != nil {
-		return nil, err
-	}
-	return z, nil
-}
-
-// NewReaderN creates a new Reader reading the given reader.
-// The implementation buffers input and may read more data than necessary from r.
-// It is the caller's responsibility to call Close on the Reader when done.
-//
-// With this you can control the approximate size of your blocks,
-// as well as how many blocks you want to have prefetched.
-//
-// Default values for this is blockSize = 250000, blocks = 16,
-// meaning up to 16 blocks of maximum 250000 bytes will be
-// prefetched.
-func NewReaderN(r io.Reader, blockSize, blocks int) (*Reader, error) {
-	z := new(Reader)
-	z.blocks = blocks
-	z.blockSize = blockSize
-	z.r = makeReader(r)
-	z.digest = crc32.NewIEEE()
-	z.multistream = true
-
-	// Account for too small values
-	if z.blocks <= 0 {
-		z.blocks = defaultBlocks
-	}
-	if z.blockSize <= 512 {
-		z.blockSize = defaultBlockSize
-	}
-	z.blockPool = make(chan []byte, z.blocks)
-	for i := 0; i < z.blocks; i++ {
-		z.blockPool <- make([]byte, z.blockSize)
-	}
-	if err := z.readHeader(true); err != nil {
-		return nil, err
-	}
-	return z, nil
-}
-
-// Reset discards the Reader z's state and makes it equivalent to the
-// result of its original state from NewReader, but reading from r instead.
-// This permits reusing a Reader rather than allocating a new one.
-func (z *Reader) Reset(r io.Reader) error {
-	z.killReadAhead()
-	z.r = makeReader(r)
-	z.digest = crc32.NewIEEE()
-	z.size = 0
-	z.err = nil
-	z.multistream = true
-
-	// Account for uninitialized values
-	if z.blocks <= 0 {
-		z.blocks = defaultBlocks
-	}
-	if z.blockSize <= 512 {
-		z.blockSize = defaultBlockSize
-	}
-
-	if z.blockPool == nil {
-		z.blockPool = make(chan []byte, z.blocks)
-		for i := 0; i < z.blocks; i++ {
-			z.blockPool <- make([]byte, z.blockSize)
-		}
-	}
-
-	return z.readHeader(true)
-}
-
-// Multistream controls whether the reader supports multistream files.
-//
-// If enabled (the default), the Reader expects the input to be a sequence
-// of individually gzipped data streams, each with its own header and
-// trailer, ending at EOF. The effect is that the concatenation of a sequence
-// of gzipped files is treated as equivalent to the gzip of the concatenation
-// of the sequence. This is standard behavior for gzip readers.
-//
-// Calling Multistream(false) disables this behavior; disabling the behavior
-// can be useful when reading file formats that distinguish individual gzip
-// data streams or mix gzip data streams with other data streams.
-// In this mode, when the Reader reaches the end of the data stream,
-// Read returns io.EOF. If the underlying reader implements io.ByteReader,
-// it will be left positioned just after the gzip stream.
-// To start the next stream, call z.Reset(r) followed by z.Multistream(false).
-// If there is no next stream, z.Reset(r) will return io.EOF.
-func (z *Reader) Multistream(ok bool) {
-	z.multistream = ok
-}
-
-// GZIP (RFC 1952) is little-endian, unlike ZLIB (RFC 1950).
-func get4(p []byte) uint32 {
-	return uint32(p[0]) | uint32(p[1])<<8 | uint32(p[2])<<16 | uint32(p[3])<<24
-}
-
-func (z *Reader) readString() (string, error) {
-	var err error
-	needconv := false
-	for i := 0; ; i++ {
-		if i >= len(z.buf) {
-			return "", ErrHeader
-		}
-		z.buf[i], err = z.r.ReadByte()
-		if err != nil {
-			return "", err
-		}
-		if z.buf[i] > 0x7f {
-			needconv = true
-		}
-		if z.buf[i] == 0 {
-			// GZIP (RFC 1952) specifies that strings are NUL-terminated ISO 8859-1 (Latin-1).
-			if needconv {
-				s := make([]rune, 0, i)
-				for _, v := range z.buf[0:i] {
-					s = append(s, rune(v))
-				}
-				return string(s), nil
-			}
-			return string(z.buf[0:i]), nil
-		}
-	}
-}
-
-func (z *Reader) read2() (uint32, error) {
-	_, err := io.ReadFull(z.r, z.buf[0:2])
-	if err != nil {
-		return 0, err
-	}
-	return uint32(z.buf[0]) | uint32(z.buf[1])<<8, nil
-}
-
-func (z *Reader) readHeader(save bool) error {
-	z.killReadAhead()
-
-	_, err := io.ReadFull(z.r, z.buf[0:10])
-	if err != nil {
-		return err
-	}
-	if z.buf[0] != gzipID1 || z.buf[1] != gzipID2 || z.buf[2] != gzipDeflate {
-		return ErrHeader
-	}
-	z.flg = z.buf[3]
-	if save {
-		z.ModTime = time.Unix(int64(get4(z.buf[4:8])), 0)
-		// z.buf[8] is xfl, ignored
-		z.OS = z.buf[9]
-	}
-	z.digest.Reset()
-	z.digest.Write(z.buf[0:10])
-
-	if z.flg&flagExtra != 0 {
-		n, err := z.read2()
-		if err != nil {
-			return err
-		}
-		data := make([]byte, n)
-		if _, err = io.ReadFull(z.r, data); err != nil {
-			return err
-		}
-		if save {
-			z.Extra = data
-		}
-	}
-
-	var s string
-	if z.flg&flagName != 0 {
-		if s, err = z.readString(); err != nil {
-			return err
-		}
-		if save {
-			z.Name = s
-		}
-	}
-
-	if z.flg&flagComment != 0 {
-		if s, err = z.readString(); err != nil {
-			return err
-		}
-		if save {
-			z.Comment = s
-		}
-	}
-
-	if z.flg&flagHdrCrc != 0 {
-		n, err := z.read2()
-		if err != nil {
-			return err
-		}
-		sum := z.digest.Sum32() & 0xFFFF
-		if n != sum {
-			return ErrHeader
-		}
-	}
-
-	z.digest.Reset()
-	z.decompressor = flate.NewReader(z.r)
-	z.doReadAhead()
-	return nil
-}
-
-func (z *Reader) killReadAhead() error {
-	z.mu.Lock()
-	defer z.mu.Unlock()
-	if z.activeRA {
-		if z.closeReader != nil {
-			close(z.closeReader)
-		}
-
-		// Wait for decompressor to be closed and return error, if any.
-		e, ok := <-z.closeErr
-		z.activeRA = false
-		if !ok {
-			// Channel is closed, so if there was any error it has already been returned.
-			return nil
-		}
-		return e
-	}
-	return nil
-}
-
-// Starts readahead.
-// Will return on error (including io.EOF)
-// or when z.closeReader is closed.
-func (z *Reader) doReadAhead() {
-	z.mu.Lock()
-	defer z.mu.Unlock()
-	z.activeRA = true
-
-	if z.blocks <= 0 {
-		z.blocks = defaultBlocks
-	}
-	if z.blockSize <= 512 {
-		z.blockSize = defaultBlockSize
-	}
-	ra := make(chan read, z.blocks)
-	z.readAhead = ra
-	closeReader := make(chan struct{}, 0)
-	z.closeReader = closeReader
-	z.lastBlock = false
-	closeErr := make(chan error, 1)
-	z.closeErr = closeErr
-	z.size = 0
-	z.roff = 0
-	z.current = nil
-	decomp := z.decompressor
-
-	go func() {
-		defer func() {
-			closeErr <- decomp.Close()
-			close(closeErr)
-			close(ra)
-		}()
-
-		// We hold a local reference to digest, since
-		// it way be changed by reset.
-		digest := z.digest
-		var wg sync.WaitGroup
-		for {
-			var buf []byte
-			select {
-			case buf = <-z.blockPool:
-			case <-closeReader:
-				return
-			}
-			buf = buf[0:z.blockSize]
-			// Try to fill the buffer
-			n, err := io.ReadFull(decomp, buf)
-			if err == io.ErrUnexpectedEOF {
-				err = nil
-			}
-			if n < len(buf) {
-				buf = buf[0:n]
-			}
-			wg.Wait()
-			wg.Add(1)
-			go func() {
-				digest.Write(buf)
-				wg.Done()
-			}()
-			z.size += uint32(n)
-
-			// If we return any error, out digest must be ready
-			if err != nil {
-				wg.Wait()
-			}
-			select {
-			case z.readAhead <- read{b: buf, err: err}:
-			case <-closeReader:
-				// Sent on close, we don't care about the next results
-				return
-			}
-			if err != nil {
-				return
-			}
-		}
-	}()
-}
-
-func (z *Reader) Read(p []byte) (n int, err error) {
-	if z.err != nil {
-		return 0, z.err
-	}
-	if len(p) == 0 {
-		return 0, nil
-	}
-
-	for {
-		if len(z.current) == 0 && !z.lastBlock {
-			read := <-z.readAhead
-
-			if read.err != nil {
-				// If not nil, the reader will have exited
-				z.closeReader = nil
-
-				if read.err != io.EOF {
-					z.err = read.err
-					return
-				}
-				if read.err == io.EOF {
-					z.lastBlock = true
-					err = nil
-				}
-			}
-			z.current = read.b
-			z.roff = 0
-		}
-		avail := z.current[z.roff:]
-		if len(p) >= len(avail) {
-			// If len(p) >= len(current), return all content of current
-			n = copy(p, avail)
-			z.blockPool <- z.current
-			z.current = nil
-			if z.lastBlock {
-				err = io.EOF
-				break
-			}
-		} else {
-			// We copy as much as there is space for
-			n = copy(p, avail)
-			z.roff += n
-		}
-		return
-	}
-
-	// Finished file; check checksum + size.
-	if _, err := io.ReadFull(z.r, z.buf[0:8]); err != nil {
-		z.err = err
-		return 0, err
-	}
-	crc32, isize := get4(z.buf[0:4]), get4(z.buf[4:8])
-	sum := z.digest.Sum32()
-	if sum != crc32 || isize != z.size {
-		z.err = ErrChecksum
-		return 0, z.err
-	}
-
-	// File is ok; should we attempt reading one more?
-	if !z.multistream {
-		return 0, io.EOF
-	}
-
-	// Is there another?
-	if err = z.readHeader(false); err != nil {
-		z.err = err
-		return
-	}
-
-	// Yes.  Reset and read from it.
-	return z.Read(p)
-}
-
-func (z *Reader) WriteTo(w io.Writer) (n int64, err error) {
-	total := int64(0)
-	for {
-		if z.err != nil {
-			return total, z.err
-		}
-		// We write both to output and digest.
-		for {
-			// Read from input
-			read := <-z.readAhead
-			if read.err != nil {
-				// If not nil, the reader will have exited
-				z.closeReader = nil
-
-				if read.err != io.EOF {
-					z.err = read.err
-					return total, z.err
-				}
-				if read.err == io.EOF {
-					z.lastBlock = true
-					err = nil
-				}
-			}
-			// Write what we got
-			n, err := w.Write(read.b)
-			if n != len(read.b) {
-				return total, io.ErrShortWrite
-			}
-			total += int64(n)
-			if err != nil {
-				return total, err
-			}
-			// Put block back
-			z.blockPool <- read.b
-			if z.lastBlock {
-				break
-			}
-		}
-
-		// Finished file; check checksum + size.
-		if _, err := io.ReadFull(z.r, z.buf[0:8]); err != nil {
-			z.err = err
-			return total, err
-		}
-		crc32, isize := get4(z.buf[0:4]), get4(z.buf[4:8])
-		sum := z.digest.Sum32()
-		if sum != crc32 || isize != z.size {
-			z.err = ErrChecksum
-			return total, z.err
-		}
-		// File is ok; should we attempt reading one more?
-		if !z.multistream {
-			return total, nil
-		}
-
-		// Is there another?
-		err = z.readHeader(false)
-		if err == io.EOF {
-			return total, nil
-		}
-		if err != nil {
-			z.err = err
-			return total, err
-		}
-	}
-}
-
-// Close closes the Reader. It does not close the underlying io.Reader.
-func (z *Reader) Close() error {
-	return z.killReadAhead()
-}
diff --git a/Godeps/_workspace/src/github.com/klauspost/pgzip/gzip.go b/Godeps/_workspace/src/github.com/klauspost/pgzip/gzip.go
deleted file mode 100644
index 872afe7eb0..0000000000
--- a/Godeps/_workspace/src/github.com/klauspost/pgzip/gzip.go
+++ /dev/null
@@ -1,485 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pgzip
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"hash"
-	"io"
-	"sync"
-
-	"github.com/klauspost/compress/flate"
-	"github.com/klauspost/crc32"
-)
-
-const (
-	defaultBlockSize = 250000
-	tailSize         = 16384
-	defaultBlocks    = 16
-)
-
-// These constants are copied from the flate package, so that code that imports
-// "compress/gzip" does not also have to import "compress/flate".
-const (
-	NoCompression       = flate.NoCompression
-	BestSpeed           = flate.BestSpeed
-	BestCompression     = flate.BestCompression
-	DefaultCompression  = flate.DefaultCompression
-	ConstantCompression = flate.ConstantCompression
-)
-
-// A Writer is an io.WriteCloser.
-// Writes to a Writer are compressed and written to w.
-type Writer struct {
-	Header
-	w             io.Writer
-	level         int
-	wroteHeader   bool
-	blockSize     int
-	blocks        int
-	currentBuffer []byte
-	prevTail      []byte
-	digest        hash.Hash32
-	size          int
-	closed        bool
-	buf           [10]byte
-	err           error
-	pushedErr     chan error
-	results       chan result
-	dictFlatePool *sync.Pool
-	dstPool       *sync.Pool
-}
-
-type result struct {
-	result        chan []byte
-	notifyWritten chan struct{}
-}
-
-// Use SetConcurrency to finetune the concurrency level if needed.
-//
-// With this you can control the approximate size of your blocks,
-// as well as how many you want to be processing in parallel.
-//
-// Default values for this is SetConcurrency(250000, 16),
-// meaning blocks are split at 250000 bytes and up to 16 blocks
-// can be processing at once before the writer blocks.
-func (z *Writer) SetConcurrency(blockSize, blocks int) error {
-	if blockSize <= tailSize {
-		return fmt.Errorf("gzip: block size cannot be less than or equal to %d", tailSize)
-	}
-	if blocks <= 0 {
-		return errors.New("gzip: blocks cannot be zero or less")
-	}
-	z.blockSize = blockSize
-	z.results = make(chan result, blocks)
-	z.blocks = blocks
-	return nil
-}
-
-// NewWriter returns a new Writer.
-// Writes to the returned writer are compressed and written to w.
-//
-// It is the caller's responsibility to call Close on the WriteCloser when done.
-// Writes may be buffered and not flushed until Close.
-//
-// Callers that wish to set the fields in Writer.Header must do so before
-// the first call to Write or Close. The Comment and Name header fields are
-// UTF-8 strings in Go, but the underlying format requires NUL-terminated ISO
-// 8859-1 (Latin-1). NUL or non-Latin-1 runes in those strings will lead to an
-// error on Write.
-func NewWriter(w io.Writer) *Writer {
-	z, _ := NewWriterLevel(w, DefaultCompression)
-	return z
-}
-
-// NewWriterLevel is like NewWriter but specifies the compression level instead
-// of assuming DefaultCompression.
-//
-// The compression level can be DefaultCompression, NoCompression, or any
-// integer value between BestSpeed and BestCompression inclusive. The error
-// returned will be nil if the level is valid.
-func NewWriterLevel(w io.Writer, level int) (*Writer, error) {
-	if level < ConstantCompression || level > BestCompression {
-		return nil, fmt.Errorf("gzip: invalid compression level: %d", level)
-	}
-	z := new(Writer)
-	z.SetConcurrency(defaultBlockSize, defaultBlocks)
-	z.init(w, level)
-	return z, nil
-}
-
-// This function must be used by goroutines to set an
-// error condition, since z.err access is restricted
-// to the callers goruotine.
-func (z *Writer) pushError(err error) {
-	z.pushedErr <- err
-	close(z.pushedErr)
-}
-
-func (z *Writer) init(w io.Writer, level int) {
-	digest := z.digest
-	if digest != nil {
-		digest.Reset()
-	} else {
-		digest = crc32.NewIEEE()
-	}
-
-	*z = Writer{
-		Header: Header{
-			OS: 255, // unknown
-		},
-		w:         w,
-		level:     level,
-		digest:    digest,
-		pushedErr: make(chan error, 1),
-		results:   make(chan result, z.blocks),
-		blockSize: z.blockSize,
-		blocks:    z.blocks,
-	}
-	z.dictFlatePool = &sync.Pool{
-		New: func() interface{} {
-			f, _ := flate.NewWriterDict(w, level, nil)
-			return f
-		},
-	}
-	z.dstPool = &sync.Pool{New: func() interface{} { return make([]byte, 0, z.blockSize) }}
-
-}
-
-// Reset discards the Writer z's state and makes it equivalent to the
-// result of its original state from NewWriter or NewWriterLevel, but
-// writing to w instead. This permits reusing a Writer rather than
-// allocating a new one.
-func (z *Writer) Reset(w io.Writer) {
-	if z.results != nil && !z.closed {
-		close(z.results)
-	}
-	z.SetConcurrency(defaultBlockSize, defaultBlocks)
-	z.init(w, z.level)
-}
-
-// GZIP (RFC 1952) is little-endian, unlike ZLIB (RFC 1950).
-func put2(p []byte, v uint16) {
-	p[0] = uint8(v >> 0)
-	p[1] = uint8(v >> 8)
-}
-
-func put4(p []byte, v uint32) {
-	p[0] = uint8(v >> 0)
-	p[1] = uint8(v >> 8)
-	p[2] = uint8(v >> 16)
-	p[3] = uint8(v >> 24)
-}
-
-// writeBytes writes a length-prefixed byte slice to z.w.
-func (z *Writer) writeBytes(b []byte) error {
-	if len(b) > 0xffff {
-		return errors.New("gzip.Write: Extra data is too large")
-	}
-	put2(z.buf[0:2], uint16(len(b)))
-	_, err := z.w.Write(z.buf[0:2])
-	if err != nil {
-		return err
-	}
-	_, err = z.w.Write(b)
-	return err
-}
-
-// writeString writes a UTF-8 string s in GZIP's format to z.w.
-// GZIP (RFC 1952) specifies that strings are NUL-terminated ISO 8859-1 (Latin-1).
-func (z *Writer) writeString(s string) (err error) {
-	// GZIP stores Latin-1 strings; error if non-Latin-1; convert if non-ASCII.
-	needconv := false
-	for _, v := range s {
-		if v == 0 || v > 0xff {
-			return errors.New("gzip.Write: non-Latin-1 header string")
-		}
-		if v > 0x7f {
-			needconv = true
-		}
-	}
-	if needconv {
-		b := make([]byte, 0, len(s))
-		for _, v := range s {
-			b = append(b, byte(v))
-		}
-		_, err = z.w.Write(b)
-	} else {
-		_, err = io.WriteString(z.w, s)
-	}
-	if err != nil {
-		return err
-	}
-	// GZIP strings are NUL-terminated.
-	z.buf[0] = 0
-	_, err = z.w.Write(z.buf[0:1])
-	return err
-}
-
-// compressCurrent will compress the data currently buffered
-// This should only be called from the main writer/flush/closer
-func (z *Writer) compressCurrent(flush bool) {
-	r := result{}
-	r.result = make(chan []byte, 1)
-	r.notifyWritten = make(chan struct{}, 0)
-	z.results <- r
-
-	// If block given is more than twice the block size, split it.
-	c := z.currentBuffer
-	if len(c) > z.blockSize*2 {
-		c = c[:z.blockSize]
-		go compressBlock(c, z.prevTail, *z, r)
-		z.prevTail = c[len(c)-tailSize:]
-		z.currentBuffer = z.currentBuffer[z.blockSize:]
-		z.compressCurrent(flush)
-		// Last one flushes if needed
-		return
-	}
-
-	go compressBlock(c, z.prevTail, *z, r)
-	if len(c) > tailSize {
-		z.prevTail = c[len(c)-tailSize:]
-	} else {
-		z.prevTail = nil
-	}
-	z.currentBuffer = make([]byte, 0, z.blockSize+(z.blockSize/4))
-
-	// Wait if flushing
-	if flush {
-		_ = <-r.notifyWritten
-	}
-}
-
-// Returns an error if it has been set.
-// Cannot be used by functions that are from internal goroutines.
-func (z *Writer) checkError() error {
-	if z.err != nil {
-		return z.err
-	}
-	select {
-	case err := <-z.pushedErr:
-		z.err = err
-	default:
-	}
-	return z.err
-}
-
-// Write writes a compressed form of p to the underlying io.Writer. The
-// compressed bytes are not necessarily flushed to output until
-// the Writer is closed or Flush() is called.
-//
-// The function will return quickly, if there are unused buffers.
-// The sent slice (p) is copied, and the caller is free to re-use the buffer
-// when the function returns.
-//
-// Errors that occur during compression will be reported later, and a nil error
-// does not signify that the compression succeeded (since it is most likely still running)
-// That means that the call that returns an error may not be the call that caused it.
-// Only Flush and Close functions are guaranteed to return any errors up to that point.
-func (z *Writer) Write(p []byte) (int, error) {
-	if z.checkError() != nil {
-		return 0, z.err
-	}
-	// Write the GZIP header lazily.
-	if !z.wroteHeader {
-		z.wroteHeader = true
-		z.buf[0] = gzipID1
-		z.buf[1] = gzipID2
-		z.buf[2] = gzipDeflate
-		z.buf[3] = 0
-		if z.Extra != nil {
-			z.buf[3] |= 0x04
-		}
-		if z.Name != "" {
-			z.buf[3] |= 0x08
-		}
-		if z.Comment != "" {
-			z.buf[3] |= 0x10
-		}
-		put4(z.buf[4:8], uint32(z.ModTime.Unix()))
-		if z.level == BestCompression {
-			z.buf[8] = 2
-		} else if z.level == BestSpeed {
-			z.buf[8] = 4
-		} else {
-			z.buf[8] = 0
-		}
-		z.buf[9] = z.OS
-		var n int
-		n, z.err = z.w.Write(z.buf[0:10])
-		if z.err != nil {
-			return n, z.err
-		}
-		if z.Extra != nil {
-			z.err = z.writeBytes(z.Extra)
-			if z.err != nil {
-				return n, z.err
-			}
-		}
-		if z.Name != "" {
-			z.err = z.writeString(z.Name)
-			if z.err != nil {
-				return n, z.err
-			}
-		}
-		if z.Comment != "" {
-			z.err = z.writeString(z.Comment)
-			if z.err != nil {
-				return n, z.err
-			}
-		}
-		// Start receiving data from compressors
-		go func() {
-			listen := z.results
-			for {
-				r, ok := <-listen
-				// If closed, we are finished.
-				if !ok {
-					return
-				}
-				buf := <-r.result
-				n, err := z.w.Write(buf)
-				if err != nil {
-					z.pushError(err)
-					close(r.notifyWritten)
-					return
-				}
-				if n != len(buf) {
-					z.pushError(fmt.Errorf("gzip: short write %d should be %d", n, len(buf)))
-					close(r.notifyWritten)
-					return
-				}
-				z.dstPool.Put(buf)
-				close(r.notifyWritten)
-			}
-		}()
-		z.currentBuffer = make([]byte, 0, z.blockSize+(z.blockSize/4))
-	}
-	// Handle very large writes in a loop
-	if len(p) > z.blockSize*z.blocks {
-		q := p
-		for len(q) > 0 {
-			length := len(q)
-			if length > z.blockSize {
-				length = z.blockSize
-			}
-			z.digest.Write(q[:length])
-			z.currentBuffer = append(z.currentBuffer, q[:length]...)
-			if len(z.currentBuffer) >= z.blockSize {
-				z.compressCurrent(false)
-				if z.err != nil {
-					return len(p) - len(q) - length, z.err
-				}
-			}
-			z.size += length
-			q = q[length:]
-		}
-		return len(p), z.err
-	} else {
-		z.size += len(p)
-		z.digest.Write(p)
-		z.currentBuffer = append(z.currentBuffer, p...)
-		if len(z.currentBuffer) >= z.blockSize {
-			z.compressCurrent(false)
-		}
-		return len(p), z.err
-	}
-}
-
-// Step 1: compresses buffer to buffer
-// Step 2: send writer to channel
-// Step 3: Close result channel to indicate we are done
-func compressBlock(p, prevTail []byte, z Writer, r result) {
-	defer close(r.result)
-	buf := z.dstPool.Get().([]byte)
-	dest := bytes.NewBuffer(buf[:0])
-
-	compressor := z.dictFlatePool.Get().(*flate.Writer)
-	compressor.ResetDict(dest, prevTail)
-	compressor.Write(p)
-
-	err := compressor.Flush()
-	if err != nil {
-		z.pushError(err)
-		return
-	}
-	if z.closed {
-		err = compressor.Close()
-		if err != nil {
-			z.pushError(err)
-			return
-		}
-	}
-	z.dictFlatePool.Put(compressor)
-	// Read back buffer
-	buf = dest.Bytes()
-	r.result <- buf
-}
-
-// Flush flushes any pending compressed data to the underlying writer.
-//
-// It is useful mainly in compressed network protocols, to ensure that
-// a remote reader has enough data to reconstruct a packet. Flush does
-// not return until the data has been written. If the underlying
-// writer returns an error, Flush returns that error.
-//
-// In the terminology of the zlib library, Flush is equivalent to Z_SYNC_FLUSH.
-func (z *Writer) Flush() error {
-	if z.checkError() != nil {
-		return z.err
-	}
-	if z.closed {
-		return nil
-	}
-	if !z.wroteHeader {
-		_, err := z.Write(nil)
-		if err != nil {
-			return err
-		}
-	}
-	// We send current block to compression
-	z.compressCurrent(true)
-	if z.checkError() != nil {
-		return z.err
-	}
-
-	return nil
-}
-
-// UncompressedSize will return the number of bytes written.
-// pgzip only, not a function in the official gzip package.
-func (z Writer) UncompressedSize() int {
-	return z.size
-}
-
-// Close closes the Writer, flushing any unwritten data to the underlying
-// io.Writer, but does not close the underlying io.Writer.
-func (z *Writer) Close() error {
-	if z.checkError() != nil {
-		return z.err
-	}
-	if z.closed {
-		return nil
-	}
-
-	z.closed = true
-	if !z.wroteHeader {
-		z.Write(nil)
-		if z.err != nil {
-			return z.err
-		}
-	}
-	z.compressCurrent(true)
-	if z.checkError() != nil {
-		return z.err
-	}
-	close(z.results)
-	put4(z.buf[0:4], z.digest.Sum32())
-	put4(z.buf[4:8], uint32(z.size))
-	_, z.err = z.w.Write(z.buf[0:8])
-	return z.err
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/.gitignore b/Godeps/_workspace/src/github.com/kr/pty/.gitignore
deleted file mode 100644
index 1f0a99f2f2..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-[568].out
-_go*
-_test*
-_obj
diff --git a/Godeps/_workspace/src/github.com/kr/pty/License b/Godeps/_workspace/src/github.com/kr/pty/License
deleted file mode 100644
index 6b7558b6b4..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/License
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2011 Keith Rarick
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall
-be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/kr/pty/README.md b/Godeps/_workspace/src/github.com/kr/pty/README.md
deleted file mode 100644
index 7b7900c3ae..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# pty
-
-Pty is a Go package for using unix pseudo-terminals.
-
-## Install
-
-    go get github.com/kr/pty
-
-## Example
-
-```go
-package main
-
-import (
-	"github.com/kr/pty"
-	"io"
-	"os"
-	"os/exec"
-)
-
-func main() {
-	c := exec.Command("grep", "--color=auto", "bar")
-	f, err := pty.Start(c)
-	if err != nil {
-		panic(err)
-	}
-
-	go func() {
-		f.Write([]byte("foo\n"))
-		f.Write([]byte("bar\n"))
-		f.Write([]byte("baz\n"))
-		f.Write([]byte{4}) // EOT
-	}()
-	io.Copy(os.Stdout, f)
-}
-```
diff --git a/Godeps/_workspace/src/github.com/kr/pty/doc.go b/Godeps/_workspace/src/github.com/kr/pty/doc.go
deleted file mode 100644
index 190cfbea92..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/doc.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Package pty provides functions for working with Unix terminals.
-package pty
-
-import (
-	"errors"
-	"os"
-)
-
-// ErrUnsupported is returned if a function is not
-// available on the current platform.
-var ErrUnsupported = errors.New("unsupported")
-
-// Opens a pty and its corresponding tty.
-func Open() (pty, tty *os.File, err error) {
-	return open()
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ioctl.go b/Godeps/_workspace/src/github.com/kr/pty/ioctl.go
deleted file mode 100644
index 5b856e8711..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ioctl.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package pty
-
-import "syscall"
-
-func ioctl(fd, cmd, ptr uintptr) error {
-	_, _, e := syscall.Syscall(syscall.SYS_IOCTL, fd, cmd, ptr)
-	if e != 0 {
-		return e
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ioctl_bsd.go b/Godeps/_workspace/src/github.com/kr/pty/ioctl_bsd.go
deleted file mode 100644
index 73b12c53cf..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ioctl_bsd.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package pty
-
-// from <sys/ioccom.h>
-const (
-	_IOC_VOID    uintptr = 0x20000000
-	_IOC_OUT     uintptr = 0x40000000
-	_IOC_IN      uintptr = 0x80000000
-	_IOC_IN_OUT  uintptr = _IOC_OUT | _IOC_IN
-	_IOC_DIRMASK         = _IOC_VOID | _IOC_OUT | _IOC_IN
-
-	_IOC_PARAM_SHIFT = 13
-	_IOC_PARAM_MASK  = (1 << _IOC_PARAM_SHIFT) - 1
-)
-
-func _IOC_PARM_LEN(ioctl uintptr) uintptr {
-	return (ioctl >> 16) & _IOC_PARAM_MASK
-}
-
-func _IOC(inout uintptr, group byte, ioctl_num uintptr, param_len uintptr) uintptr {
-	return inout | (param_len&_IOC_PARAM_MASK)<<16 | uintptr(group)<<8 | ioctl_num
-}
-
-func _IO(group byte, ioctl_num uintptr) uintptr {
-	return _IOC(_IOC_VOID, group, ioctl_num, 0)
-}
-
-func _IOR(group byte, ioctl_num uintptr, param_len uintptr) uintptr {
-	return _IOC(_IOC_OUT, group, ioctl_num, param_len)
-}
-
-func _IOW(group byte, ioctl_num uintptr, param_len uintptr) uintptr {
-	return _IOC(_IOC_IN, group, ioctl_num, param_len)
-}
-
-func _IOWR(group byte, ioctl_num uintptr, param_len uintptr) uintptr {
-	return _IOC(_IOC_IN_OUT, group, ioctl_num, param_len)
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/mktypes.bash b/Godeps/_workspace/src/github.com/kr/pty/mktypes.bash
deleted file mode 100644
index 9952c88838..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/mktypes.bash
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-GOOSARCH="${GOOS}_${GOARCH}"
-case "$GOOSARCH" in
-_* | *_ | _)
-	echo 'undefined $GOOS_$GOARCH:' "$GOOSARCH" 1>&2
-	exit 1
-	;;
-esac
-
-GODEFS="go tool cgo -godefs"
-
-$GODEFS types.go |gofmt > ztypes_$GOARCH.go
-
-case $GOOS in
-freebsd)
-	$GODEFS types_$GOOS.go |gofmt > ztypes_$GOOSARCH.go
-	;;
-esac
diff --git a/Godeps/_workspace/src/github.com/kr/pty/pty_darwin.go b/Godeps/_workspace/src/github.com/kr/pty/pty_darwin.go
deleted file mode 100644
index 4f4d5ca26e..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/pty_darwin.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package pty
-
-import (
-	"errors"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-func open() (pty, tty *os.File, err error) {
-	p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	sname, err := ptsname(p)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	err = grantpt(p)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	err = unlockpt(p)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t, err := os.OpenFile(sname, os.O_RDWR, 0)
-	if err != nil {
-		return nil, nil, err
-	}
-	return p, t, nil
-}
-
-func ptsname(f *os.File) (string, error) {
-	n := make([]byte, _IOC_PARM_LEN(syscall.TIOCPTYGNAME))
-
-	err := ioctl(f.Fd(), syscall.TIOCPTYGNAME, uintptr(unsafe.Pointer(&n[0])))
-	if err != nil {
-		return "", err
-	}
-
-	for i, c := range n {
-		if c == 0 {
-			return string(n[:i]), nil
-		}
-	}
-	return "", errors.New("TIOCPTYGNAME string not NUL-terminated")
-}
-
-func grantpt(f *os.File) error {
-	return ioctl(f.Fd(), syscall.TIOCPTYGRANT, 0)
-}
-
-func unlockpt(f *os.File) error {
-	return ioctl(f.Fd(), syscall.TIOCPTYUNLK, 0)
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/pty_freebsd.go b/Godeps/_workspace/src/github.com/kr/pty/pty_freebsd.go
deleted file mode 100644
index b341babd05..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/pty_freebsd.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package pty
-
-import (
-	"errors"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-func posix_openpt(oflag int) (fd int, err error) {
-	r0, _, e1 := syscall.Syscall(syscall.SYS_POSIX_OPENPT, uintptr(oflag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func open() (pty, tty *os.File, err error) {
-	fd, err := posix_openpt(syscall.O_RDWR | syscall.O_CLOEXEC)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	p := os.NewFile(uintptr(fd), "/dev/pts")
-	sname, err := ptsname(p)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t, err := os.OpenFile("/dev/"+sname, os.O_RDWR, 0)
-	if err != nil {
-		return nil, nil, err
-	}
-	return p, t, nil
-}
-
-func isptmaster(fd uintptr) (bool, error) {
-	err := ioctl(fd, syscall.TIOCPTMASTER, 0)
-	return err == nil, err
-}
-
-var (
-	emptyFiodgnameArg fiodgnameArg
-	ioctl_FIODGNAME   = _IOW('f', 120, unsafe.Sizeof(emptyFiodgnameArg))
-)
-
-func ptsname(f *os.File) (string, error) {
-	master, err := isptmaster(f.Fd())
-	if err != nil {
-		return "", err
-	}
-	if !master {
-		return "", syscall.EINVAL
-	}
-
-	const n = _C_SPECNAMELEN + 1
-	var (
-		buf = make([]byte, n)
-		arg = fiodgnameArg{Len: n, Buf: (*byte)(unsafe.Pointer(&buf[0]))}
-	)
-	err = ioctl(f.Fd(), ioctl_FIODGNAME, uintptr(unsafe.Pointer(&arg)))
-	if err != nil {
-		return "", err
-	}
-
-	for i, c := range buf {
-		if c == 0 {
-			return string(buf[:i]), nil
-		}
-	}
-	return "", errors.New("FIODGNAME string not NUL-terminated")
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/pty_linux.go b/Godeps/_workspace/src/github.com/kr/pty/pty_linux.go
deleted file mode 100644
index cb901a21e0..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/pty_linux.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package pty
-
-import (
-	"os"
-	"strconv"
-	"syscall"
-	"unsafe"
-)
-
-func open() (pty, tty *os.File, err error) {
-	p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	sname, err := ptsname(p)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	err = unlockpt(p)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t, err := os.OpenFile(sname, os.O_RDWR|syscall.O_NOCTTY, 0)
-	if err != nil {
-		return nil, nil, err
-	}
-	return p, t, nil
-}
-
-func ptsname(f *os.File) (string, error) {
-	var n _C_uint
-	err := ioctl(f.Fd(), syscall.TIOCGPTN, uintptr(unsafe.Pointer(&n)))
-	if err != nil {
-		return "", err
-	}
-	return "/dev/pts/" + strconv.Itoa(int(n)), nil
-}
-
-func unlockpt(f *os.File) error {
-	var u _C_int
-	// use TIOCSPTLCK with a zero valued arg to clear the slave pty lock
-	return ioctl(f.Fd(), syscall.TIOCSPTLCK, uintptr(unsafe.Pointer(&u)))
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/pty_unsupported.go b/Godeps/_workspace/src/github.com/kr/pty/pty_unsupported.go
deleted file mode 100644
index 898c7303c4..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/pty_unsupported.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !linux,!darwin,!freebsd
-
-package pty
-
-import (
-	"os"
-)
-
-func open() (pty, tty *os.File, err error) {
-	return nil, nil, ErrUnsupported
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/run.go b/Godeps/_workspace/src/github.com/kr/pty/run.go
deleted file mode 100644
index c2bc48878c..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/run.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package pty
-
-import (
-	"os"
-	"os/exec"
-	"syscall"
-)
-
-// Start assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout,
-// and c.Stderr, calls c.Start, and returns the File of the tty's
-// corresponding pty.
-func Start(c *exec.Cmd) (pty *os.File, err error) {
-	pty, tty, err := Open()
-	if err != nil {
-		return nil, err
-	}
-	defer tty.Close()
-	c.Stdout = tty
-	c.Stdin = tty
-	c.Stderr = tty
-	if c.SysProcAttr == nil {
-		c.SysProcAttr = &syscall.SysProcAttr{}
-	}
-	c.SysProcAttr.Setctty = true
-	c.SysProcAttr.Setsid = true
-	err = c.Start()
-	if err != nil {
-		pty.Close()
-		return nil, err
-	}
-	return pty, err
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/types.go b/Godeps/_workspace/src/github.com/kr/pty/types.go
deleted file mode 100644
index 5aecb6bcdc..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/types.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build ignore
-
-package pty
-
-import "C"
-
-type (
-	_C_int  C.int
-	_C_uint C.uint
-)
diff --git a/Godeps/_workspace/src/github.com/kr/pty/types_freebsd.go b/Godeps/_workspace/src/github.com/kr/pty/types_freebsd.go
deleted file mode 100644
index ce3eb95181..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/types_freebsd.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build ignore
-
-package pty
-
-/*
-#include <sys/param.h>
-#include <sys/filio.h>
-*/
-import "C"
-
-const (
-	_C_SPECNAMELEN = C.SPECNAMELEN /* max length of devicename */
-)
-
-type fiodgnameArg C.struct_fiodgname_arg
diff --git a/Godeps/_workspace/src/github.com/kr/pty/util.go b/Godeps/_workspace/src/github.com/kr/pty/util.go
deleted file mode 100644
index 67c52d06cd..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/util.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package pty
-
-import (
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-// Getsize returns the number of rows (lines) and cols (positions
-// in each line) in terminal t.
-func Getsize(t *os.File) (rows, cols int, err error) {
-	var ws winsize
-	err = windowrect(&ws, t.Fd())
-	return int(ws.ws_row), int(ws.ws_col), err
-}
-
-type winsize struct {
-	ws_row    uint16
-	ws_col    uint16
-	ws_xpixel uint16
-	ws_ypixel uint16
-}
-
-func windowrect(ws *winsize, fd uintptr) error {
-	_, _, errno := syscall.Syscall(
-		syscall.SYS_IOCTL,
-		fd,
-		syscall.TIOCGWINSZ,
-		uintptr(unsafe.Pointer(ws)),
-	)
-	if errno != 0 {
-		return syscall.Errno(errno)
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_386.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_386.go
deleted file mode 100644
index ff0b8fd838..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_386.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types.go
-
-package pty
-
-type (
-	_C_int  int32
-	_C_uint uint32
-)
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_amd64.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_amd64.go
deleted file mode 100644
index ff0b8fd838..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_amd64.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types.go
-
-package pty
-
-type (
-	_C_int  int32
-	_C_uint uint32
-)
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm.go
deleted file mode 100644
index ff0b8fd838..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types.go
-
-package pty
-
-type (
-	_C_int  int32
-	_C_uint uint32
-)
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go
deleted file mode 100644
index 6c29a4b918..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types.go
-
-// +build arm64
-
-package pty
-
-type (
-	_C_int  int32
-	_C_uint uint32
-)
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_386.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_386.go
deleted file mode 100644
index d9975374e3..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_386.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package pty
-
-const (
-	_C_SPECNAMELEN = 0x3f
-)
-
-type fiodgnameArg struct {
-	Len int32
-	Buf *byte
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_amd64.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_amd64.go
deleted file mode 100644
index 5fa102fcdf..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_amd64.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package pty
-
-const (
-	_C_SPECNAMELEN = 0x3f
-)
-
-type fiodgnameArg struct {
-	Len       int32
-	Pad_cgo_0 [4]byte
-	Buf       *byte
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_arm.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_arm.go
deleted file mode 100644
index d9975374e3..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_freebsd_arm.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package pty
-
-const (
-	_C_SPECNAMELEN = 0x3f
-)
-
-type fiodgnameArg struct {
-	Len int32
-	Buf *byte
-}
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64.go
deleted file mode 100644
index 4e1af84312..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build ppc64
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types.go
-
-package pty
-
-type (
-	_C_int  int32
-	_C_uint uint32
-)
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64le.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64le.go
deleted file mode 100644
index e6780f4e23..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_ppc64le.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build ppc64le
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types.go
-
-package pty
-
-type (
-	_C_int  int32
-	_C_uint uint32
-)
diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_s390x.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_s390x.go
deleted file mode 100644
index a7452b61cb..0000000000
--- a/Godeps/_workspace/src/github.com/kr/pty/ztypes_s390x.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build s390x
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types.go
-
-package pty
-
-type (
-	_C_int  int32
-	_C_uint uint32
-)
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS b/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS
deleted file mode 100644
index b382a04eda..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS
+++ /dev/null
@@ -1 +0,0 @@
-Paul Borman <borman@google.com>
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE b/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
deleted file mode 100644
index 5dc68268d9..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009,2014 Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/dce.go b/Godeps/_workspace/src/github.com/pborman/uuid/dce.go
deleted file mode 100644
index 50a0f2d099..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/dce.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2011 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"encoding/binary"
-	"fmt"
-	"os"
-)
-
-// A Domain represents a Version 2 domain
-type Domain byte
-
-// Domain constants for DCE Security (Version 2) UUIDs.
-const (
-	Person = Domain(0)
-	Group  = Domain(1)
-	Org    = Domain(2)
-)
-
-// NewDCESecurity returns a DCE Security (Version 2) UUID.
-//
-// The domain should be one of Person, Group or Org.
-// On a POSIX system the id should be the users UID for the Person
-// domain and the users GID for the Group.  The meaning of id for
-// the domain Org or on non-POSIX systems is site defined.
-//
-// For a given domain/id pair the same token may be returned for up to
-// 7 minutes and 10 seconds.
-func NewDCESecurity(domain Domain, id uint32) UUID {
-	uuid := NewUUID()
-	if uuid != nil {
-		uuid[6] = (uuid[6] & 0x0f) | 0x20 // Version 2
-		uuid[9] = byte(domain)
-		binary.BigEndian.PutUint32(uuid[0:], id)
-	}
-	return uuid
-}
-
-// NewDCEPerson returns a DCE Security (Version 2) UUID in the person
-// domain with the id returned by os.Getuid.
-//
-//  NewDCEPerson(Person, uint32(os.Getuid()))
-func NewDCEPerson() UUID {
-	return NewDCESecurity(Person, uint32(os.Getuid()))
-}
-
-// NewDCEGroup returns a DCE Security (Version 2) UUID in the group
-// domain with the id returned by os.Getgid.
-//
-//  NewDCEGroup(Group, uint32(os.Getgid()))
-func NewDCEGroup() UUID {
-	return NewDCESecurity(Group, uint32(os.Getgid()))
-}
-
-// Domain returns the domain for a Version 2 UUID or false.
-func (uuid UUID) Domain() (Domain, bool) {
-	if v, _ := uuid.Version(); v != 2 {
-		return 0, false
-	}
-	return Domain(uuid[9]), true
-}
-
-// Id returns the id for a Version 2 UUID or false.
-func (uuid UUID) Id() (uint32, bool) {
-	if v, _ := uuid.Version(); v != 2 {
-		return 0, false
-	}
-	return binary.BigEndian.Uint32(uuid[0:4]), true
-}
-
-func (d Domain) String() string {
-	switch d {
-	case Person:
-		return "Person"
-	case Group:
-		return "Group"
-	case Org:
-		return "Org"
-	}
-	return fmt.Sprintf("Domain%d", int(d))
-}
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/doc.go b/Godeps/_workspace/src/github.com/pborman/uuid/doc.go
deleted file mode 100644
index d8bd013e68..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/doc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2011 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The uuid package generates and inspects UUIDs.
-//
-// UUIDs are based on RFC 4122 and DCE 1.1: Authentication and Security Services.
-package uuid
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/hash.go b/Godeps/_workspace/src/github.com/pborman/uuid/hash.go
deleted file mode 100644
index cdd4192fd9..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/hash.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2011 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"crypto/md5"
-	"crypto/sha1"
-	"hash"
-)
-
-// Well known Name Space IDs and UUIDs
-var (
-	NameSpace_DNS  = Parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
-	NameSpace_URL  = Parse("6ba7b811-9dad-11d1-80b4-00c04fd430c8")
-	NameSpace_OID  = Parse("6ba7b812-9dad-11d1-80b4-00c04fd430c8")
-	NameSpace_X500 = Parse("6ba7b814-9dad-11d1-80b4-00c04fd430c8")
-	NIL            = Parse("00000000-0000-0000-0000-000000000000")
-)
-
-// NewHash returns a new UUID dervied from the hash of space concatenated with
-// data generated by h.  The hash should be at least 16 byte in length.  The
-// first 16 bytes of the hash are used to form the UUID.  The version of the
-// UUID will be the lower 4 bits of version.  NewHash is used to implement
-// NewMD5 and NewSHA1.
-func NewHash(h hash.Hash, space UUID, data []byte, version int) UUID {
-	h.Reset()
-	h.Write(space)
-	h.Write([]byte(data))
-	s := h.Sum(nil)
-	uuid := make([]byte, 16)
-	copy(uuid, s)
-	uuid[6] = (uuid[6] & 0x0f) | uint8((version&0xf)<<4)
-	uuid[8] = (uuid[8] & 0x3f) | 0x80 // RFC 4122 variant
-	return uuid
-}
-
-// NewMD5 returns a new MD5 (Version 3) UUID based on the
-// supplied name space and data.
-//
-//  NewHash(md5.New(), space, data, 3)
-func NewMD5(space UUID, data []byte) UUID {
-	return NewHash(md5.New(), space, data, 3)
-}
-
-// NewSHA1 returns a new SHA1 (Version 5) UUID based on the
-// supplied name space and data.
-//
-//  NewHash(sha1.New(), space, data, 5)
-func NewSHA1(space UUID, data []byte) UUID {
-	return NewHash(sha1.New(), space, data, 5)
-}
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/json.go b/Godeps/_workspace/src/github.com/pborman/uuid/json.go
deleted file mode 100644
index 760580a504..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/json.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import "errors"
-
-func (u UUID) MarshalJSON() ([]byte, error) {
-	if len(u) == 0 {
-		return []byte(`""`), nil
-	}
-	return []byte(`"` + u.String() + `"`), nil
-}
-
-func (u *UUID) UnmarshalJSON(data []byte) error {
-	if len(data) == 0 || string(data) == `""` {
-		return nil
-	}
-	if len(data) < 2 || data[0] != '"' || data[len(data)-1] != '"' {
-		return errors.New("invalid UUID format")
-	}
-	data = data[1 : len(data)-1]
-	uu := Parse(string(data))
-	if uu == nil {
-		return errors.New("invalid UUID format")
-	}
-	*u = uu
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/node.go b/Godeps/_workspace/src/github.com/pborman/uuid/node.go
deleted file mode 100644
index dd0a8ac189..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/node.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2011 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import "net"
-
-var (
-	interfaces []net.Interface // cached list of interfaces
-	ifname     string          // name of interface being used
-	nodeID     []byte          // hardware for version 1 UUIDs
-)
-
-// NodeInterface returns the name of the interface from which the NodeID was
-// derived.  The interface "user" is returned if the NodeID was set by
-// SetNodeID.
-func NodeInterface() string {
-	return ifname
-}
-
-// SetNodeInterface selects the hardware address to be used for Version 1 UUIDs.
-// If name is "" then the first usable interface found will be used or a random
-// Node ID will be generated.  If a named interface cannot be found then false
-// is returned.
-//
-// SetNodeInterface never fails when name is "".
-func SetNodeInterface(name string) bool {
-	if interfaces == nil {
-		var err error
-		interfaces, err = net.Interfaces()
-		if err != nil && name != "" {
-			return false
-		}
-	}
-
-	for _, ifs := range interfaces {
-		if len(ifs.HardwareAddr) >= 6 && (name == "" || name == ifs.Name) {
-			if setNodeID(ifs.HardwareAddr) {
-				ifname = ifs.Name
-				return true
-			}
-		}
-	}
-
-	// We found no interfaces with a valid hardware address.  If name
-	// does not specify a specific interface generate a random Node ID
-	// (section 4.1.6)
-	if name == "" {
-		if nodeID == nil {
-			nodeID = make([]byte, 6)
-		}
-		randomBits(nodeID)
-		return true
-	}
-	return false
-}
-
-// NodeID returns a slice of a copy of the current Node ID, setting the Node ID
-// if not already set.
-func NodeID() []byte {
-	if nodeID == nil {
-		SetNodeInterface("")
-	}
-	nid := make([]byte, 6)
-	copy(nid, nodeID)
-	return nid
-}
-
-// SetNodeID sets the Node ID to be used for Version 1 UUIDs.  The first 6 bytes
-// of id are used.  If id is less than 6 bytes then false is returned and the
-// Node ID is not set.
-func SetNodeID(id []byte) bool {
-	if setNodeID(id) {
-		ifname = "user"
-		return true
-	}
-	return false
-}
-
-func setNodeID(id []byte) bool {
-	if len(id) < 6 {
-		return false
-	}
-	if nodeID == nil {
-		nodeID = make([]byte, 6)
-	}
-	copy(nodeID, id)
-	return true
-}
-
-// NodeID returns the 6 byte node id encoded in uuid.  It returns nil if uuid is
-// not valid.  The NodeID is only well defined for version 1 and 2 UUIDs.
-func (uuid UUID) NodeID() []byte {
-	if len(uuid) != 16 {
-		return nil
-	}
-	node := make([]byte, 6)
-	copy(node, uuid[10:])
-	return node
-}
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/sql.go b/Godeps/_workspace/src/github.com/pborman/uuid/sql.go
deleted file mode 100644
index 2d7679e2af..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/sql.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"errors"
-	"fmt"
-)
-
-// Scan implements sql.Scanner so UUIDs can be read from databases transparently
-// Currently, database types that map to string and []byte are supported. Please
-// consult database-specific driver documentation for matching types.
-func (uuid *UUID) Scan(src interface{}) error {
-	switch src.(type) {
-	case string:
-		// see uuid.Parse for required string format
-		parsed := Parse(src.(string))
-
-		if parsed == nil {
-			return errors.New("Scan: invalid UUID format")
-		}
-
-		*uuid = parsed
-	case []byte:
-		// assumes a simple slice of bytes, just check validity and store
-		u := UUID(src.([]byte))
-
-		if u.Variant() == Invalid {
-			return errors.New("Scan: invalid UUID format")
-		}
-
-		*uuid = u
-	default:
-		return fmt.Errorf("Scan: unable to scan type %T into UUID", src)
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/time.go b/Godeps/_workspace/src/github.com/pborman/uuid/time.go
deleted file mode 100644
index 7ebc9bef10..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/time.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2014 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"encoding/binary"
-	"sync"
-	"time"
-)
-
-// A Time represents a time as the number of 100's of nanoseconds since 15 Oct
-// 1582.
-type Time int64
-
-const (
-	lillian    = 2299160          // Julian day of 15 Oct 1582
-	unix       = 2440587          // Julian day of 1 Jan 1970
-	epoch      = unix - lillian   // Days between epochs
-	g1582      = epoch * 86400    // seconds between epochs
-	g1582ns100 = g1582 * 10000000 // 100s of a nanoseconds between epochs
-)
-
-var (
-	mu        sync.Mutex
-	lasttime  uint64 // last time we returned
-	clock_seq uint16 // clock sequence for this run
-
-	timeNow = time.Now // for testing
-)
-
-// UnixTime converts t the number of seconds and nanoseconds using the Unix
-// epoch of 1 Jan 1970.
-func (t Time) UnixTime() (sec, nsec int64) {
-	sec = int64(t - g1582ns100)
-	nsec = (sec % 10000000) * 100
-	sec /= 10000000
-	return sec, nsec
-}
-
-// GetTime returns the current Time (100s of nanoseconds since 15 Oct 1582) and
-// clock sequence as well as adjusting the clock sequence as needed.  An error
-// is returned if the current time cannot be determined.
-func GetTime() (Time, uint16, error) {
-	defer mu.Unlock()
-	mu.Lock()
-	return getTime()
-}
-
-func getTime() (Time, uint16, error) {
-	t := timeNow()
-
-	// If we don't have a clock sequence already, set one.
-	if clock_seq == 0 {
-		setClockSequence(-1)
-	}
-	now := uint64(t.UnixNano()/100) + g1582ns100
-
-	// If time has gone backwards with this clock sequence then we
-	// increment the clock sequence
-	if now <= lasttime {
-		clock_seq = ((clock_seq + 1) & 0x3fff) | 0x8000
-	}
-	lasttime = now
-	return Time(now), clock_seq, nil
-}
-
-// ClockSequence returns the current clock sequence, generating one if not
-// already set.  The clock sequence is only used for Version 1 UUIDs.
-//
-// The uuid package does not use global static storage for the clock sequence or
-// the last time a UUID was generated.  Unless SetClockSequence a new random
-// clock sequence is generated the first time a clock sequence is requested by
-// ClockSequence, GetTime, or NewUUID.  (section 4.2.1.1) sequence is generated
-// for
-func ClockSequence() int {
-	defer mu.Unlock()
-	mu.Lock()
-	return clockSequence()
-}
-
-func clockSequence() int {
-	if clock_seq == 0 {
-		setClockSequence(-1)
-	}
-	return int(clock_seq & 0x3fff)
-}
-
-// SetClockSeq sets the clock sequence to the lower 14 bits of seq.  Setting to
-// -1 causes a new sequence to be generated.
-func SetClockSequence(seq int) {
-	defer mu.Unlock()
-	mu.Lock()
-	setClockSequence(seq)
-}
-
-func setClockSequence(seq int) {
-	if seq == -1 {
-		var b [2]byte
-		randomBits(b[:]) // clock sequence
-		seq = int(b[0])<<8 | int(b[1])
-	}
-	old_seq := clock_seq
-	clock_seq = uint16(seq&0x3fff) | 0x8000 // Set our variant
-	if old_seq != clock_seq {
-		lasttime = 0
-	}
-}
-
-// Time returns the time in 100s of nanoseconds since 15 Oct 1582 encoded in
-// uuid.  It returns false if uuid is not valid.  The time is only well defined
-// for version 1 and 2 UUIDs.
-func (uuid UUID) Time() (Time, bool) {
-	if len(uuid) != 16 {
-		return 0, false
-	}
-	time := int64(binary.BigEndian.Uint32(uuid[0:4]))
-	time |= int64(binary.BigEndian.Uint16(uuid[4:6])) << 32
-	time |= int64(binary.BigEndian.Uint16(uuid[6:8])&0xfff) << 48
-	return Time(time), true
-}
-
-// ClockSequence returns the clock sequence encoded in uuid.  It returns false
-// if uuid is not valid.  The clock sequence is only well defined for version 1
-// and 2 UUIDs.
-func (uuid UUID) ClockSequence() (int, bool) {
-	if len(uuid) != 16 {
-		return 0, false
-	}
-	return int(binary.BigEndian.Uint16(uuid[8:10])) & 0x3fff, true
-}
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/util.go b/Godeps/_workspace/src/github.com/pborman/uuid/util.go
deleted file mode 100644
index de40b102c4..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/util.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2011 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"io"
-)
-
-// randomBits completely fills slice b with random data.
-func randomBits(b []byte) {
-	if _, err := io.ReadFull(rander, b); err != nil {
-		panic(err.Error()) // rand should never fail
-	}
-}
-
-// xvalues returns the value of a byte as a hexadecimal digit or 255.
-var xvalues = []byte{
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 255, 255, 255, 255, 255, 255,
-	255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-}
-
-// xtob converts the the first two hex bytes of x into a byte.
-func xtob(x string) (byte, bool) {
-	b1 := xvalues[x[0]]
-	b2 := xvalues[x[1]]
-	return (b1 << 4) | b2, b1 != 255 && b2 != 255
-}
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go b/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go
deleted file mode 100644
index 2920fae632..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2011 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"bytes"
-	"crypto/rand"
-	"fmt"
-	"io"
-	"strings"
-)
-
-// A UUID is a 128 bit (16 byte) Universal Unique IDentifier as defined in RFC
-// 4122.
-type UUID []byte
-
-// A Version represents a UUIDs version.
-type Version byte
-
-// A Variant represents a UUIDs variant.
-type Variant byte
-
-// Constants returned by Variant.
-const (
-	Invalid   = Variant(iota) // Invalid UUID
-	RFC4122                   // The variant specified in RFC4122
-	Reserved                  // Reserved, NCS backward compatibility.
-	Microsoft                 // Reserved, Microsoft Corporation backward compatibility.
-	Future                    // Reserved for future definition.
-)
-
-var rander = rand.Reader // random function
-
-// New returns a new random (version 4) UUID as a string.  It is a convenience
-// function for NewRandom().String().
-func New() string {
-	return NewRandom().String()
-}
-
-// Parse decodes s into a UUID or returns nil.  Both the UUID form of
-// xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx and
-// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx are decoded.
-func Parse(s string) UUID {
-	if len(s) == 36+9 {
-		if strings.ToLower(s[:9]) != "urn:uuid:" {
-			return nil
-		}
-		s = s[9:]
-	} else if len(s) != 36 {
-		return nil
-	}
-	if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' {
-		return nil
-	}
-	uuid := make([]byte, 16)
-	for i, x := range []int{
-		0, 2, 4, 6,
-		9, 11,
-		14, 16,
-		19, 21,
-		24, 26, 28, 30, 32, 34} {
-		if v, ok := xtob(s[x:]); !ok {
-			return nil
-		} else {
-			uuid[i] = v
-		}
-	}
-	return uuid
-}
-
-// Equal returns true if uuid1 and uuid2 are equal.
-func Equal(uuid1, uuid2 UUID) bool {
-	return bytes.Equal(uuid1, uuid2)
-}
-
-// String returns the string form of uuid, xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-// , or "" if uuid is invalid.
-func (uuid UUID) String() string {
-	if uuid == nil || len(uuid) != 16 {
-		return ""
-	}
-	b := []byte(uuid)
-	return fmt.Sprintf("%08x-%04x-%04x-%04x-%012x",
-		b[:4], b[4:6], b[6:8], b[8:10], b[10:])
-}
-
-// URN returns the RFC 2141 URN form of uuid,
-// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx,  or "" if uuid is invalid.
-func (uuid UUID) URN() string {
-	if uuid == nil || len(uuid) != 16 {
-		return ""
-	}
-	b := []byte(uuid)
-	return fmt.Sprintf("urn:uuid:%08x-%04x-%04x-%04x-%012x",
-		b[:4], b[4:6], b[6:8], b[8:10], b[10:])
-}
-
-// Variant returns the variant encoded in uuid.  It returns Invalid if
-// uuid is invalid.
-func (uuid UUID) Variant() Variant {
-	if len(uuid) != 16 {
-		return Invalid
-	}
-	switch {
-	case (uuid[8] & 0xc0) == 0x80:
-		return RFC4122
-	case (uuid[8] & 0xe0) == 0xc0:
-		return Microsoft
-	case (uuid[8] & 0xe0) == 0xe0:
-		return Future
-	default:
-		return Reserved
-	}
-	panic("unreachable")
-}
-
-// Version returns the verison of uuid.  It returns false if uuid is not
-// valid.
-func (uuid UUID) Version() (Version, bool) {
-	if len(uuid) != 16 {
-		return 0, false
-	}
-	return Version(uuid[6] >> 4), true
-}
-
-func (v Version) String() string {
-	if v > 15 {
-		return fmt.Sprintf("BAD_VERSION_%d", v)
-	}
-	return fmt.Sprintf("VERSION_%d", v)
-}
-
-func (v Variant) String() string {
-	switch v {
-	case RFC4122:
-		return "RFC4122"
-	case Reserved:
-		return "Reserved"
-	case Microsoft:
-		return "Microsoft"
-	case Future:
-		return "Future"
-	case Invalid:
-		return "Invalid"
-	}
-	return fmt.Sprintf("BadVariant%d", int(v))
-}
-
-// SetRand sets the random number generator to r, which implents io.Reader.
-// If r.Read returns an error when the package requests random data then
-// a panic will be issued.
-//
-// Calling SetRand with nil sets the random number generator to the default
-// generator.
-func SetRand(r io.Reader) {
-	if r == nil {
-		rander = rand.Reader
-		return
-	}
-	rander = r
-}
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/version1.go b/Godeps/_workspace/src/github.com/pborman/uuid/version1.go
deleted file mode 100644
index 0127eacfab..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/version1.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2011 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"encoding/binary"
-)
-
-// NewUUID returns a Version 1 UUID based on the current NodeID and clock
-// sequence, and the current time.  If the NodeID has not been set by SetNodeID
-// or SetNodeInterface then it will be set automatically.  If the NodeID cannot
-// be set NewUUID returns nil.  If clock sequence has not been set by
-// SetClockSequence then it will be set automatically.  If GetTime fails to
-// return the current NewUUID returns nil.
-func NewUUID() UUID {
-	if nodeID == nil {
-		SetNodeInterface("")
-	}
-
-	now, seq, err := GetTime()
-	if err != nil {
-		return nil
-	}
-
-	uuid := make([]byte, 16)
-
-	time_low := uint32(now & 0xffffffff)
-	time_mid := uint16((now >> 32) & 0xffff)
-	time_hi := uint16((now >> 48) & 0x0fff)
-	time_hi |= 0x1000 // Version 1
-
-	binary.BigEndian.PutUint32(uuid[0:], time_low)
-	binary.BigEndian.PutUint16(uuid[4:], time_mid)
-	binary.BigEndian.PutUint16(uuid[6:], time_hi)
-	binary.BigEndian.PutUint16(uuid[8:], seq)
-	copy(uuid[10:], nodeID)
-
-	return uuid
-}
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/version4.go b/Godeps/_workspace/src/github.com/pborman/uuid/version4.go
deleted file mode 100644
index b3d4a368dd..0000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/version4.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2011 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-// Random returns a Random (Version 4) UUID or panics.
-//
-// The strength of the UUIDs is based on the strength of the crypto/rand
-// package.
-//
-// A note about uniqueness derived from from the UUID Wikipedia entry:
-//
-//  Randomly generated UUIDs have 122 random bits.  One's annual risk of being
-//  hit by a meteorite is estimated to be one chance in 17 billion, that
-//  means the probability is about 0.00000000006 (6 × 10−11),
-//  equivalent to the odds of creating a few tens of trillions of UUIDs in a
-//  year and having one duplicate.
-func NewRandom() UUID {
-	uuid := make([]byte, 16)
-	randomBits([]byte(uuid))
-	uuid[6] = (uuid[6] & 0x0f) | 0x40 // Version 4
-	uuid[8] = (uuid[8] & 0x3f) | 0x80 // Variant is 10
-	return uuid
-}
diff --git a/Godeps/_workspace/src/github.com/petar/GoLLRB/LICENSE b/Godeps/_workspace/src/github.com/petar/GoLLRB/LICENSE
deleted file mode 100644
index b75312c787..0000000000
--- a/Godeps/_workspace/src/github.com/petar/GoLLRB/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2010, Petar Maymounkov
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-(*) Redistributions of source code must retain the above copyright notice, this list
-of conditions and the following disclaimer.
-
-(*) Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-(*) Neither the name of Petar Maymounkov nor the names of its contributors may be
-used to endorse or promote products derived from this software without specific
-prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/LICENSE b/Godeps/_workspace/src/github.com/peterbourgon/diskv/LICENSE
deleted file mode 100644
index 41ce7f16e1..0000000000
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011-2012 Peter Bourgon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/README.md b/Godeps/_workspace/src/github.com/peterbourgon/diskv/README.md
deleted file mode 100644
index ed59b7bfb6..0000000000
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/README.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# What is diskv?
-
-Diskv (disk-vee) is a simple, persistent key-value store written in the Go
-language. It starts with an incredibly simple API for storing arbitrary data on
-a filesystem by key, and builds several layers of performance-enhancing
-abstraction on top.  The end result is a conceptually simple, but highly
-performant, disk-backed storage system.
-
-[![Build Status][1]][2]
-
-[1]: https://drone.io/github.com/peterbourgon/diskv/status.png
-[2]: https://drone.io/github.com/peterbourgon/diskv/latest
-
-
-# Installing
-
-Install [Go 1][3], either [from source][4] or [with a prepackaged binary][5].
-Then,
-
-```bash
-$ go get github.com/peterbourgon/diskv
-```
-
-[3]: http://golang.org
-[4]: http://golang.org/doc/install/source
-[5]: http://golang.org/doc/install
-
-
-# Usage
-
-```go
-package main
-
-import (
-	"fmt"
-	"github.com/peterbourgon/diskv"
-)
-
-func main() {
-	// Simplest transform function: put all the data files into the base dir.
-	flatTransform := func(s string) []string { return []string{} }
-
-	// Initialize a new diskv store, rooted at "my-data-dir", with a 1MB cache.
-	d := diskv.New(diskv.Options{
-		BasePath:     "my-data-dir",
-		Transform:    flatTransform,
-		CacheSizeMax: 1024 * 1024,
-	})
-
-	// Write three bytes to the key "alpha".
-	key := "alpha"
-	d.Write(key, []byte{'1', '2', '3'})
-
-	// Read the value back out of the store.
-	value, _ := d.Read(key)
-	fmt.Printf("%v\n", value)
-
-	// Erase the key+value from the store (and the disk).
-	d.Erase(key)
-}
-```
-
-More complex examples can be found in the "examples" subdirectory.
-
-
-# Theory
-
-## Basic idea
-
-At its core, diskv is a map of a key (`string`) to arbitrary data (`[]byte`).
-The data is written to a single file on disk, with the same name as the key.
-The key determines where that file will be stored, via a user-provided
-`TransformFunc`, which takes a key and returns a slice (`[]string`)
-corresponding to a path list where the key file will be stored. The simplest
-TransformFunc,
-
-```go
-func SimpleTransform (key string) []string {
-    return []string{}
-}
-```
-
-will place all keys in the same, base directory. The design is inspired by
-[Redis diskstore][6]; a TransformFunc which emulates the default diskstore
-behavior is available in the content-addressable-storage example.
-
-[6]: http://groups.google.com/group/redis-db/browse_thread/thread/d444bc786689bde9?pli=1
-
-**Note** that your TransformFunc should ensure that one valid key doesn't
-transform to a subset of another valid key. That is, it shouldn't be possible
-to construct valid keys that resolve to directory names. As a concrete example,
-if your TransformFunc splits on every 3 characters, then
-
-```go
-d.Write("abcabc", val) // OK: written to <base>/abc/abc/abcabc
-d.Write("abc", val)    // Error: attempted write to <base>/abc/abc, but it's a directory
-```
-
-This will be addressed in an upcoming version of diskv.
-
-Probably the most important design principle behind diskv is that your data is
-always flatly available on the disk. diskv will never do anything that would
-prevent you from accessing, copying, backing up, or otherwise interacting with
-your data via common UNIX commandline tools.
-
-## Adding a cache
-
-An in-memory caching layer is provided by combining the BasicStore
-functionality with a simple map structure, and keeping it up-to-date as
-appropriate. Since the map structure in Go is not threadsafe, it's combined
-with a RWMutex to provide safe concurrent access.
-
-## Adding order
-
-diskv is a key-value store and therefore inherently unordered. An ordering
-system can be injected into the store by passing something which satisfies the
-diskv.Index interface. (A default implementation, using Petar Maymounkov's
-[LLRB tree][7], is provided.) Basically, diskv keeps an ordered (by a
-user-provided Less function) index of the keys, which can be queried.
-
-[7]: https://github.com/petar/GoLLRB
-
-## Adding compression
-
-Something which implements the diskv.Compression interface may be passed
-during store creation, so that all Writes and Reads are filtered through
-a compression/decompression pipeline. Several default implementations,
-using stdlib compression algorithms, are provided. Note that data is cached
-compressed; the cost of decompression is borne with each Read.
-
-## Streaming
-
-diskv also now provides ReadStream and WriteStream methods, to allow very large
-data to be handled efficiently.
-
-
-# Future plans
-
- * Needs plenty of robust testing: huge datasets, etc...
- * More thorough benchmarking
- * Your suggestions for use-cases I haven't thought of
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/compression.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/compression.go
deleted file mode 100644
index 5192b02733..0000000000
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/compression.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package diskv
-
-import (
-	"compress/flate"
-	"compress/gzip"
-	"compress/zlib"
-	"io"
-)
-
-// Compression is an interface that Diskv uses to implement compression of
-// data. Writer takes a destination io.Writer and returns a WriteCloser that
-// compresses all data written through it. Reader takes a source io.Reader and
-// returns a ReadCloser that decompresses all data read through it. You may
-// define these methods on your own type, or use one of the NewCompression
-// helpers.
-type Compression interface {
-	Writer(dst io.Writer) (io.WriteCloser, error)
-	Reader(src io.Reader) (io.ReadCloser, error)
-}
-
-// NewGzipCompression returns a Gzip-based Compression.
-func NewGzipCompression() Compression {
-	return NewGzipCompressionLevel(flate.DefaultCompression)
-}
-
-// NewGzipCompressionLevel returns a Gzip-based Compression with the given level.
-func NewGzipCompressionLevel(level int) Compression {
-	return &genericCompression{
-		wf: func(w io.Writer) (io.WriteCloser, error) { return gzip.NewWriterLevel(w, level) },
-		rf: func(r io.Reader) (io.ReadCloser, error) { return gzip.NewReader(r) },
-	}
-}
-
-// NewZlibCompression returns a Zlib-based Compression.
-func NewZlibCompression() Compression {
-	return NewZlibCompressionLevel(flate.DefaultCompression)
-}
-
-// NewZlibCompressionLevel returns a Zlib-based Compression with the given level.
-func NewZlibCompressionLevel(level int) Compression {
-	return NewZlibCompressionLevelDict(level, nil)
-}
-
-// NewZlibCompressionLevelDict returns a Zlib-based Compression with the given
-// level, based on the given dictionary.
-func NewZlibCompressionLevelDict(level int, dict []byte) Compression {
-	return &genericCompression{
-		func(w io.Writer) (io.WriteCloser, error) { return zlib.NewWriterLevelDict(w, level, dict) },
-		func(r io.Reader) (io.ReadCloser, error) { return zlib.NewReaderDict(r, dict) },
-	}
-}
-
-type genericCompression struct {
-	wf func(w io.Writer) (io.WriteCloser, error)
-	rf func(r io.Reader) (io.ReadCloser, error)
-}
-
-func (g *genericCompression) Writer(dst io.Writer) (io.WriteCloser, error) {
-	return g.wf(dst)
-}
-
-func (g *genericCompression) Reader(src io.Reader) (io.ReadCloser, error) {
-	return g.rf(src)
-}
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/diskv.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/diskv.go
deleted file mode 100644
index ea05842cbd..0000000000
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/diskv.go
+++ /dev/null
@@ -1,578 +0,0 @@
-// Diskv (disk-vee) is a simple, persistent, key-value store.
-// It stores all data flatly on the filesystem.
-
-package diskv
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"syscall"
-)
-
-const (
-	defaultBasePath             = "diskv"
-	defaultFilePerm os.FileMode = 0666
-	defaultPathPerm os.FileMode = 0777
-)
-
-var (
-	defaultTransform   = func(s string) []string { return []string{} }
-	errCanceled        = errors.New("canceled")
-	errEmptyKey        = errors.New("empty key")
-	errBadKey          = errors.New("bad key")
-	errImportDirectory = errors.New("can't import a directory")
-)
-
-// TransformFunction transforms a key into a slice of strings, with each
-// element in the slice representing a directory in the file path where the
-// key's entry will eventually be stored.
-//
-// For example, if TransformFunc transforms "abcdef" to ["ab", "cde", "f"],
-// the final location of the data file will be <basedir>/ab/cde/f/abcdef
-type TransformFunction func(s string) []string
-
-// Options define a set of properties that dictate Diskv behavior.
-// All values are optional.
-type Options struct {
-	BasePath     string
-	Transform    TransformFunction
-	CacheSizeMax uint64 // bytes
-	PathPerm     os.FileMode
-	FilePerm     os.FileMode
-
-	Index     Index
-	IndexLess LessFunction
-
-	Compression Compression
-}
-
-// Diskv implements the Diskv interface. You shouldn't construct Diskv
-// structures directly; instead, use the New constructor.
-type Diskv struct {
-	Options
-	mu        sync.RWMutex
-	cache     map[string][]byte
-	cacheSize uint64
-}
-
-// New returns an initialized Diskv structure, ready to use.
-// If the path identified by baseDir already contains data,
-// it will be accessible, but not yet cached.
-func New(o Options) *Diskv {
-	if o.BasePath == "" {
-		o.BasePath = defaultBasePath
-	}
-	if o.Transform == nil {
-		o.Transform = defaultTransform
-	}
-	if o.PathPerm == 0 {
-		o.PathPerm = defaultPathPerm
-	}
-	if o.FilePerm == 0 {
-		o.FilePerm = defaultFilePerm
-	}
-
-	d := &Diskv{
-		Options:   o,
-		cache:     map[string][]byte{},
-		cacheSize: 0,
-	}
-
-	if d.Index != nil && d.IndexLess != nil {
-		d.Index.Initialize(d.IndexLess, d.Keys(nil))
-	}
-
-	return d
-}
-
-// Write synchronously writes the key-value pair to disk, making it immediately
-// available for reads. Write relies on the filesystem to perform an eventual
-// sync to physical media. If you need stronger guarantees, see WriteStream.
-func (d *Diskv) Write(key string, val []byte) error {
-	return d.WriteStream(key, bytes.NewBuffer(val), false)
-}
-
-// WriteStream writes the data represented by the io.Reader to the disk, under
-// the provided key. If sync is true, WriteStream performs an explicit sync on
-// the file as soon as it's written.
-//
-// bytes.Buffer provides io.Reader semantics for basic data types.
-func (d *Diskv) WriteStream(key string, r io.Reader, sync bool) error {
-	if len(key) <= 0 {
-		return errEmptyKey
-	}
-
-	d.mu.Lock()
-	defer d.mu.Unlock()
-
-	return d.writeStreamWithLock(key, r, sync)
-}
-
-// writeStream does no input validation checking.
-// TODO: use atomic FS ops.
-func (d *Diskv) writeStreamWithLock(key string, r io.Reader, sync bool) error {
-	if err := d.ensurePathWithLock(key); err != nil {
-		return fmt.Errorf("ensure path: %s", err)
-	}
-
-	mode := os.O_WRONLY | os.O_CREATE | os.O_TRUNC // overwrite if exists
-	f, err := os.OpenFile(d.completeFilename(key), mode, d.FilePerm)
-	if err != nil {
-		return fmt.Errorf("open file: %s", err)
-	}
-
-	wc := io.WriteCloser(&nopWriteCloser{f})
-	if d.Compression != nil {
-		wc, err = d.Compression.Writer(f)
-		if err != nil {
-			f.Close() // error deliberately ignored
-			return fmt.Errorf("compression writer: %s", err)
-		}
-	}
-
-	if _, err := io.Copy(wc, r); err != nil {
-		f.Close() // error deliberately ignored
-		return fmt.Errorf("i/o copy: %s", err)
-	}
-
-	if err := wc.Close(); err != nil {
-		f.Close() // error deliberately ignored
-		return fmt.Errorf("compression close: %s", err)
-	}
-
-	if sync {
-		if err := f.Sync(); err != nil {
-			f.Close() // error deliberately ignored
-			return fmt.Errorf("file sync: %s", err)
-		}
-	}
-
-	if err := f.Close(); err != nil {
-		return fmt.Errorf("file close: %s", err)
-	}
-
-	if d.Index != nil {
-		d.Index.Insert(key)
-	}
-
-	d.bustCacheWithLock(key) // cache only on read
-
-	return nil
-}
-
-// Import imports the source file into diskv under the destination key. If the
-// destination key already exists, it's overwritten. If move is true, the
-// source file is removed after a successful import.
-func (d *Diskv) Import(srcFilename, dstKey string, move bool) (err error) {
-	if dstKey == "" {
-		return errEmptyKey
-	}
-
-	if fi, err := os.Stat(srcFilename); err != nil {
-		return err
-	} else if fi.IsDir() {
-		return errImportDirectory
-	}
-
-	d.mu.Lock()
-	defer d.mu.Unlock()
-
-	if err := d.ensurePathWithLock(dstKey); err != nil {
-		return fmt.Errorf("ensure path: %s", err)
-	}
-
-	if move {
-		if err := syscall.Rename(srcFilename, d.completeFilename(dstKey)); err == nil {
-			d.bustCacheWithLock(dstKey)
-			return nil
-		} else if err != syscall.EXDEV {
-			// If it failed due to being on a different device, fall back to copying
-			return err
-		}
-	}
-
-	f, err := os.Open(srcFilename)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	err = d.writeStreamWithLock(dstKey, f, false)
-	if err == nil && move {
-		err = os.Remove(srcFilename)
-	}
-	return err
-}
-
-// Read reads the key and returns the value.
-// If the key is available in the cache, Read won't touch the disk.
-// If the key is not in the cache, Read will have the side-effect of
-// lazily caching the value.
-func (d *Diskv) Read(key string) ([]byte, error) {
-	rc, err := d.ReadStream(key, false)
-	if err != nil {
-		return []byte{}, err
-	}
-	defer rc.Close()
-	return ioutil.ReadAll(rc)
-}
-
-// ReadStream reads the key and returns the value (data) as an io.ReadCloser.
-// If the value is cached from a previous read, and direct is false,
-// ReadStream will use the cached value. Otherwise, it will return a handle to
-// the file on disk, and cache the data on read.
-//
-// If direct is true, ReadStream will lazily delete any cached value for the
-// key, and return a direct handle to the file on disk.
-//
-// If compression is enabled, ReadStream taps into the io.Reader stream prior
-// to decompression, and caches the compressed data.
-func (d *Diskv) ReadStream(key string, direct bool) (io.ReadCloser, error) {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if val, ok := d.cache[key]; ok {
-		if !direct {
-			buf := bytes.NewBuffer(val)
-			if d.Compression != nil {
-				return d.Compression.Reader(buf)
-			}
-			return ioutil.NopCloser(buf), nil
-		}
-
-		go func() {
-			d.mu.Lock()
-			defer d.mu.Unlock()
-			d.uncacheWithLock(key, uint64(len(val)))
-		}()
-	}
-
-	return d.readWithRLock(key)
-}
-
-// read ignores the cache, and returns an io.ReadCloser representing the
-// decompressed data for the given key, streamed from the disk. Clients should
-// acquire a read lock on the Diskv and check the cache themselves before
-// calling read.
-func (d *Diskv) readWithRLock(key string) (io.ReadCloser, error) {
-	filename := d.completeFilename(key)
-
-	fi, err := os.Stat(filename)
-	if err != nil {
-		return nil, err
-	}
-	if fi.IsDir() {
-		return nil, os.ErrNotExist
-	}
-
-	f, err := os.Open(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	var r io.Reader
-	if d.CacheSizeMax > 0 {
-		r = newSiphon(f, d, key)
-	} else {
-		r = &closingReader{f}
-	}
-
-	var rc = io.ReadCloser(ioutil.NopCloser(r))
-	if d.Compression != nil {
-		rc, err = d.Compression.Reader(r)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return rc, nil
-}
-
-// closingReader provides a Reader that automatically closes the
-// embedded ReadCloser when it reaches EOF
-type closingReader struct {
-	rc io.ReadCloser
-}
-
-func (cr closingReader) Read(p []byte) (int, error) {
-	n, err := cr.rc.Read(p)
-	if err == io.EOF {
-		if closeErr := cr.rc.Close(); closeErr != nil {
-			return n, closeErr // close must succeed for Read to succeed
-		}
-	}
-	return n, err
-}
-
-// siphon is like a TeeReader: it copies all data read through it to an
-// internal buffer, and moves that buffer to the cache at EOF.
-type siphon struct {
-	f   *os.File
-	d   *Diskv
-	key string
-	buf *bytes.Buffer
-}
-
-// newSiphon constructs a siphoning reader that represents the passed file.
-// When a successful series of reads ends in an EOF, the siphon will write
-// the buffered data to Diskv's cache under the given key.
-func newSiphon(f *os.File, d *Diskv, key string) io.Reader {
-	return &siphon{
-		f:   f,
-		d:   d,
-		key: key,
-		buf: &bytes.Buffer{},
-	}
-}
-
-// Read implements the io.Reader interface for siphon.
-func (s *siphon) Read(p []byte) (int, error) {
-	n, err := s.f.Read(p)
-
-	if err == nil {
-		return s.buf.Write(p[0:n]) // Write must succeed for Read to succeed
-	}
-
-	if err == io.EOF {
-		s.d.cacheWithoutLock(s.key, s.buf.Bytes()) // cache may fail
-		if closeErr := s.f.Close(); closeErr != nil {
-			return n, closeErr // close must succeed for Read to succeed
-		}
-		return n, err
-	}
-
-	return n, err
-}
-
-// Erase synchronously erases the given key from the disk and the cache.
-func (d *Diskv) Erase(key string) error {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-
-	d.bustCacheWithLock(key)
-
-	// erase from index
-	if d.Index != nil {
-		d.Index.Delete(key)
-	}
-
-	// erase from disk
-	filename := d.completeFilename(key)
-	if s, err := os.Stat(filename); err == nil {
-		if s.IsDir() {
-			return errBadKey
-		}
-		if err = os.Remove(filename); err != nil {
-			return err
-		}
-	} else {
-		// Return err as-is so caller can do os.IsNotExist(err).
-		return err
-	}
-
-	// clean up and return
-	d.pruneDirsWithLock(key)
-	return nil
-}
-
-// EraseAll will delete all of the data from the store, both in the cache and on
-// the disk. Note that EraseAll doesn't distinguish diskv-related data from non-
-// diskv-related data. Care should be taken to always specify a diskv base
-// directory that is exclusively for diskv data.
-func (d *Diskv) EraseAll() error {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-	d.cache = make(map[string][]byte)
-	d.cacheSize = 0
-	return os.RemoveAll(d.BasePath)
-}
-
-// Has returns true if the given key exists.
-func (d *Diskv) Has(key string) bool {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-
-	if _, ok := d.cache[key]; ok {
-		return true
-	}
-
-	filename := d.completeFilename(key)
-	s, err := os.Stat(filename)
-	if err != nil {
-		return false
-	}
-	if s.IsDir() {
-		return false
-	}
-
-	return true
-}
-
-// Keys returns a channel that will yield every key accessible by the store,
-// in undefined order. If a cancel channel is provided, closing it will
-// terminate and close the keys channel.
-func (d *Diskv) Keys(cancel <-chan struct{}) <-chan string {
-	return d.KeysPrefix("", cancel)
-}
-
-// KeysPrefix returns a channel that will yield every key accessible by the
-// store with the given prefix, in undefined order. If a cancel channel is
-// provided, closing it will terminate and close the keys channel. If the
-// provided prefix is the empty string, all keys will be yielded.
-func (d *Diskv) KeysPrefix(prefix string, cancel <-chan struct{}) <-chan string {
-	var prepath string
-	if prefix == "" {
-		prepath = d.BasePath
-	} else {
-		prepath = d.pathFor(prefix)
-	}
-	c := make(chan string)
-	go func() {
-		filepath.Walk(prepath, walker(c, prefix, cancel))
-		close(c)
-	}()
-	return c
-}
-
-// walker returns a function which satisfies the filepath.WalkFunc interface.
-// It sends every non-directory file entry down the channel c.
-func walker(c chan<- string, prefix string, cancel <-chan struct{}) filepath.WalkFunc {
-	return func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if info.IsDir() || !strings.HasPrefix(info.Name(), prefix) {
-			return nil // "pass"
-		}
-
-		select {
-		case c <- info.Name():
-		case <-cancel:
-			return errCanceled
-		}
-
-		return nil
-	}
-}
-
-// pathFor returns the absolute path for location on the filesystem where the
-// data for the given key will be stored.
-func (d *Diskv) pathFor(key string) string {
-	return filepath.Join(d.BasePath, filepath.Join(d.Transform(key)...))
-}
-
-// ensurePathWithLock is a helper function that generates all necessary
-// directories on the filesystem for the given key.
-func (d *Diskv) ensurePathWithLock(key string) error {
-	return os.MkdirAll(d.pathFor(key), d.PathPerm)
-}
-
-// completeFilename returns the absolute path to the file for the given key.
-func (d *Diskv) completeFilename(key string) string {
-	return filepath.Join(d.pathFor(key), key)
-}
-
-// cacheWithLock attempts to cache the given key-value pair in the store's
-// cache. It can fail if the value is larger than the cache's maximum size.
-func (d *Diskv) cacheWithLock(key string, val []byte) error {
-	valueSize := uint64(len(val))
-	if err := d.ensureCacheSpaceWithLock(valueSize); err != nil {
-		return fmt.Errorf("%s; not caching", err)
-	}
-
-	// be very strict about memory guarantees
-	if (d.cacheSize + valueSize) > d.CacheSizeMax {
-		panic(fmt.Sprintf("failed to make room for value (%d/%d)", valueSize, d.CacheSizeMax))
-	}
-
-	d.cache[key] = val
-	d.cacheSize += valueSize
-	return nil
-}
-
-// cacheWithoutLock acquires the store's (write) mutex and calls cacheWithLock.
-func (d *Diskv) cacheWithoutLock(key string, val []byte) error {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-	return d.cacheWithLock(key, val)
-}
-
-func (d *Diskv) bustCacheWithLock(key string) {
-	if val, ok := d.cache[key]; ok {
-		d.uncacheWithLock(key, uint64(len(val)))
-	}
-}
-
-func (d *Diskv) uncacheWithLock(key string, sz uint64) {
-	d.cacheSize -= sz
-	delete(d.cache, key)
-}
-
-// pruneDirsWithLock deletes empty directories in the path walk leading to the
-// key k. Typically this function is called after an Erase is made.
-func (d *Diskv) pruneDirsWithLock(key string) error {
-	pathlist := d.Transform(key)
-	for i := range pathlist {
-		dir := filepath.Join(d.BasePath, filepath.Join(pathlist[:len(pathlist)-i]...))
-
-		// thanks to Steven Blenkinsop for this snippet
-		switch fi, err := os.Stat(dir); true {
-		case err != nil:
-			return err
-		case !fi.IsDir():
-			panic(fmt.Sprintf("corrupt dirstate at %s", dir))
-		}
-
-		nlinks, err := filepath.Glob(filepath.Join(dir, "*"))
-		if err != nil {
-			return err
-		} else if len(nlinks) > 0 {
-			return nil // has subdirs -- do not prune
-		}
-		if err = os.Remove(dir); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ensureCacheSpaceWithLock deletes entries from the cache in arbitrary order
-// until the cache has at least valueSize bytes available.
-func (d *Diskv) ensureCacheSpaceWithLock(valueSize uint64) error {
-	if valueSize > d.CacheSizeMax {
-		return fmt.Errorf("value size (%d bytes) too large for cache (%d bytes)", valueSize, d.CacheSizeMax)
-	}
-
-	safe := func() bool { return (d.cacheSize + valueSize) <= d.CacheSizeMax }
-
-	for key, val := range d.cache {
-		if safe() {
-			break
-		}
-
-		d.uncacheWithLock(key, uint64(len(val)))
-	}
-
-	if !safe() {
-		panic(fmt.Sprintf("%d bytes still won't fit in the cache! (max %d bytes)", valueSize, d.CacheSizeMax))
-	}
-
-	return nil
-}
-
-// nopWriteCloser wraps an io.Writer and provides a no-op Close method to
-// satisfy the io.WriteCloser interface.
-type nopWriteCloser struct {
-	io.Writer
-}
-
-func (wc *nopWriteCloser) Write(p []byte) (int, error) { return wc.Writer.Write(p) }
-func (wc *nopWriteCloser) Close() error                { return nil }
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go
deleted file mode 100644
index 96fee5152b..0000000000
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package diskv
-
-import (
-	"sync"
-
-	"github.com/google/btree"
-)
-
-// Index is a generic interface for things that can
-// provide an ordered list of keys.
-type Index interface {
-	Initialize(less LessFunction, keys <-chan string)
-	Insert(key string)
-	Delete(key string)
-	Keys(from string, n int) []string
-}
-
-// LessFunction is used to initialize an Index of keys in a specific order.
-type LessFunction func(string, string) bool
-
-// btreeString is a custom data type that satisfies the BTree Less interface,
-// making the strings it wraps sortable by the BTree package.
-type btreeString struct {
-	s string
-	l LessFunction
-}
-
-// Less satisfies the BTree.Less interface using the btreeString's LessFunction.
-func (s btreeString) Less(i btree.Item) bool {
-	return s.l(s.s, i.(btreeString).s)
-}
-
-// BTreeIndex is an implementation of the Index interface using google/btree.
-type BTreeIndex struct {
-	sync.RWMutex
-	LessFunction
-	*btree.BTree
-}
-
-// Initialize populates the BTree tree with data from the keys channel,
-// according to the passed less function. It's destructive to the BTreeIndex.
-func (i *BTreeIndex) Initialize(less LessFunction, keys <-chan string) {
-	i.Lock()
-	defer i.Unlock()
-	i.LessFunction = less
-	i.BTree = rebuild(less, keys)
-}
-
-// Insert inserts the given key (only) into the BTree tree.
-func (i *BTreeIndex) Insert(key string) {
-	i.Lock()
-	defer i.Unlock()
-	if i.BTree == nil || i.LessFunction == nil {
-		panic("uninitialized index")
-	}
-	i.BTree.ReplaceOrInsert(btreeString{s: key, l: i.LessFunction})
-}
-
-// Delete removes the given key (only) from the BTree tree.
-func (i *BTreeIndex) Delete(key string) {
-	i.Lock()
-	defer i.Unlock()
-	if i.BTree == nil || i.LessFunction == nil {
-		panic("uninitialized index")
-	}
-	i.BTree.Delete(btreeString{s: key, l: i.LessFunction})
-}
-
-// Keys yields a maximum of n keys in order. If the passed 'from' key is empty,
-// Keys will return the first n keys. If the passed 'from' key is non-empty, the
-// first key in the returned slice will be the key that immediately follows the
-// passed key, in key order.
-func (i *BTreeIndex) Keys(from string, n int) []string {
-	i.RLock()
-	defer i.RUnlock()
-
-	if i.BTree == nil || i.LessFunction == nil {
-		panic("uninitialized index")
-	}
-
-	if i.BTree.Len() <= 0 {
-		return []string{}
-	}
-
-	btreeFrom := btreeString{s: from, l: i.LessFunction}
-	skipFirst := true
-	if len(from) <= 0 || !i.BTree.Has(btreeFrom) {
-		// no such key, so fabricate an always-smallest item
-		btreeFrom = btreeString{s: "", l: func(string, string) bool { return true }}
-		skipFirst = false
-	}
-
-	keys := []string{}
-	iterator := func(i btree.Item) bool {
-		keys = append(keys, i.(btreeString).s)
-		return len(keys) < n
-	}
-	i.BTree.AscendGreaterOrEqual(btreeFrom, iterator)
-
-	if skipFirst && len(keys) > 0 {
-		keys = keys[1:]
-	}
-
-	return keys
-}
-
-// rebuildIndex does the work of regenerating the index
-// with the given keys.
-func rebuild(less LessFunction, keys <-chan string) *btree.BTree {
-	tree := btree.New(2)
-	for key := range keys {
-		tree.ReplaceOrInsert(btreeString{s: key, l: less})
-	}
-	return tree
-}
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/.gitignore b/Godeps/_workspace/src/github.com/russross/blackfriday/.gitignore
deleted file mode 100644
index 75623dcccb..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.out
-*.swp
-*.8
-*.6
-_obj
-_test*
-markdown
-tags
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/.travis.yml b/Godeps/_workspace/src/github.com/russross/blackfriday/.travis.yml
deleted file mode 100644
index 208fd25bcd..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Travis CI (http://travis-ci.org/) is a continuous integration service for
-# open source projects. This file configures it to run unit tests for
-# blackfriday.
-
-language: go
-
-go:
-    - 1.2
-    - 1.3
-    - 1.4
-    - 1.5
-
-install:
-    - go get -d -t -v ./...
-    - go build -v ./...
-
-script:
-    - go test -v ./...
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/LICENSE.txt b/Godeps/_workspace/src/github.com/russross/blackfriday/LICENSE.txt
deleted file mode 100644
index 2885af3602..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/LICENSE.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Blackfriday is distributed under the Simplified BSD License:
-
-> Copyright © 2011 Russ Ross
-> All rights reserved.
->
-> Redistribution and use in source and binary forms, with or without
-> modification, are permitted provided that the following conditions
-> are met:
->
-> 1.  Redistributions of source code must retain the above copyright
->     notice, this list of conditions and the following disclaimer.
->
-> 2.  Redistributions in binary form must reproduce the above
->     copyright notice, this list of conditions and the following
->     disclaimer in the documentation and/or other materials provided with
->     the distribution.
->
-> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-> "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-> FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-> COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-> INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-> BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-> LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-> ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-> POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/README.md b/Godeps/_workspace/src/github.com/russross/blackfriday/README.md
deleted file mode 100644
index dd8eb161e6..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/README.md
+++ /dev/null
@@ -1,267 +0,0 @@
-Blackfriday [![Build Status](https://travis-ci.org/russross/blackfriday.svg?branch=master)](https://travis-ci.org/russross/blackfriday)
-===========
-
-Blackfriday is a [Markdown][1] processor implemented in [Go][2]. It
-is paranoid about its input (so you can safely feed it user-supplied
-data), it is fast, it supports common extensions (tables, smart
-punctuation substitutions, etc.), and it is safe for all utf-8
-(unicode) input.
-
-HTML output is currently supported, along with Smartypants
-extensions. An experimental LaTeX output engine is also included.
-
-It started as a translation from C of [Sundown][3].
-
-
-Installation
-------------
-
-Blackfriday is compatible with Go 1. If you are using an older
-release of Go, consider using v1.1 of blackfriday, which was based
-on the last stable release of Go prior to Go 1. You can find it as a
-tagged commit on github.
-
-With Go 1 and git installed:
-
-    go get github.com/russross/blackfriday
-
-will download, compile, and install the package into your `$GOPATH`
-directory hierarchy. Alternatively, you can achieve the same if you
-import it into a project:
-
-    import "github.com/russross/blackfriday"
-
-and `go get` without parameters.
-
-Usage
------
-
-For basic usage, it is as simple as getting your input into a byte
-slice and calling:
-
-    output := blackfriday.MarkdownBasic(input)
-
-This renders it with no extensions enabled. To get a more useful
-feature set, use this instead:
-
-    output := blackfriday.MarkdownCommon(input)
-
-### Sanitize untrusted content
-
-Blackfriday itself does nothing to protect against malicious content. If you are
-dealing with user-supplied markdown, we recommend running blackfriday's output
-through HTML sanitizer such as
-[Bluemonday](https://github.com/microcosm-cc/bluemonday).
-
-Here's an example of simple usage of blackfriday together with bluemonday:
-
-``` go
-import (
-    "github.com/microcosm-cc/bluemonday"
-    "github.com/russross/blackfriday"
-)
-
-// ...
-unsafe := blackfriday.MarkdownCommon(input)
-html := bluemonday.UGCPolicy().SanitizeBytes(unsafe)
-```
-
-### Custom options
-
-If you want to customize the set of options, first get a renderer
-(currently either the HTML or LaTeX output engines), then use it to
-call the more general `Markdown` function. For examples, see the
-implementations of `MarkdownBasic` and `MarkdownCommon` in
-`markdown.go`.
-
-You can also check out `blackfriday-tool` for a more complete example
-of how to use it. Download and install it using:
-
-    go get github.com/russross/blackfriday-tool
-
-This is a simple command-line tool that allows you to process a
-markdown file using a standalone program.  You can also browse the
-source directly on github if you are just looking for some example
-code:
-
-* <http://github.com/russross/blackfriday-tool>
-
-Note that if you have not already done so, installing
-`blackfriday-tool` will be sufficient to download and install
-blackfriday in addition to the tool itself. The tool binary will be
-installed in `$GOPATH/bin`.  This is a statically-linked binary that
-can be copied to wherever you need it without worrying about
-dependencies and library versions.
-
-
-Features
---------
-
-All features of Sundown are supported, including:
-
-*   **Compatibility**. The Markdown v1.0.3 test suite passes with
-    the `--tidy` option.  Without `--tidy`, the differences are
-    mostly in whitespace and entity escaping, where blackfriday is
-    more consistent and cleaner.
-
-*   **Common extensions**, including table support, fenced code
-    blocks, autolinks, strikethroughs, non-strict emphasis, etc.
-
-*   **Safety**. Blackfriday is paranoid when parsing, making it safe
-    to feed untrusted user input without fear of bad things
-    happening. The test suite stress tests this and there are no
-    known inputs that make it crash.  If you find one, please let me
-    know and send me the input that does it.
-
-    NOTE: "safety" in this context means *runtime safety only*. In order to
-    protect yourself agains JavaScript injection in untrusted content, see
-    [this example](https://github.com/russross/blackfriday#sanitize-untrusted-content).
-
-*   **Fast processing**. It is fast enough to render on-demand in
-    most web applications without having to cache the output.
-
-*   **Thread safety**. You can run multiple parsers in different
-    goroutines without ill effect. There is no dependence on global
-    shared state.
-
-*   **Minimal dependencies**. Blackfriday only depends on standard
-    library packages in Go. The source code is pretty
-    self-contained, so it is easy to add to any project, including
-    Google App Engine projects.
-
-*   **Standards compliant**. Output successfully validates using the
-    W3C validation tool for HTML 4.01 and XHTML 1.0 Transitional.
-
-
-Extensions
-----------
-
-In addition to the standard markdown syntax, this package
-implements the following extensions:
-
-*   **Intra-word emphasis supression**. The `_` character is
-    commonly used inside words when discussing code, so having
-    markdown interpret it as an emphasis command is usually the
-    wrong thing. Blackfriday lets you treat all emphasis markers as
-    normal characters when they occur inside a word.
-
-*   **Tables**. Tables can be created by drawing them in the input
-    using a simple syntax:
-
-    ```
-    Name    | Age
-    --------|------
-    Bob     | 27
-    Alice   | 23
-    ```
-
-*   **Fenced code blocks**. In addition to the normal 4-space
-    indentation to mark code blocks, you can explicitly mark them
-    and supply a language (to make syntax highlighting simple). Just
-    mark it like this:
-
-        ``` go
-        func getTrue() bool {
-            return true
-        }
-        ```
-
-    You can use 3 or more backticks to mark the beginning of the
-    block, and the same number to mark the end of the block.
-
-*   **Definition lists**. A simple definition list is made of a single-line
-    term followed by a colon and the definition for that term.
-
-        Cat
-        : Fluffy animal everyone likes
-        
-        Internet
-        : Vector of transmission for pictures of cats
-
-    Terms must be separated from the previous definition by a blank line.
-
-*   **Footnotes**. A marker in the text that will become a superscript number;
-    a footnote definition that will be placed in a list of footnotes at the
-    end of the document. A footnote looks like this:
-
-        This is a footnote.[^1]
-        
-        [^1]: the footnote text.
-
-*   **Autolinking**. Blackfriday can find URLs that have not been
-    explicitly marked as links and turn them into links.
-
-*   **Strikethrough**. Use two tildes (`~~`) to mark text that
-    should be crossed out.
-
-*   **Hard line breaks**. With this extension enabled (it is off by
-    default in the `MarkdownBasic` and `MarkdownCommon` convenience
-    functions), newlines in the input translate into line breaks in
-    the output.
-
-*   **Smart quotes**. Smartypants-style punctuation substitution is
-    supported, turning normal double- and single-quote marks into
-    curly quotes, etc.
-
-*   **LaTeX-style dash parsing** is an additional option, where `--`
-    is translated into `&ndash;`, and `---` is translated into
-    `&mdash;`. This differs from most smartypants processors, which
-    turn a single hyphen into an ndash and a double hyphen into an
-    mdash.
-
-*   **Smart fractions**, where anything that looks like a fraction
-    is translated into suitable HTML (instead of just a few special
-    cases like most smartypant processors). For example, `4/5`
-    becomes `<sup>4</sup>&frasl;<sub>5</sub>`, which renders as
-    <sup>4</sup>&frasl;<sub>5</sub>.
-
-
-Other renderers
----------------
-
-Blackfriday is structured to allow alternative rendering engines. Here
-are a few of note:
-
-*   [github_flavored_markdown](https://godoc.org/github.com/shurcooL/github_flavored_markdown):
-    provides a GitHub Flavored Markdown renderer with fenced code block
-    highlighting, clickable header anchor links.
-
-    It's not customizable, and its goal is to produce HTML output
-    equivalent to the [GitHub Markdown API endpoint](https://developer.github.com/v3/markdown/#render-a-markdown-document-in-raw-mode),
-    except the rendering is performed locally.
-
-*   [markdownfmt](https://github.com/shurcooL/markdownfmt): like gofmt,
-    but for markdown.
-
-*   LaTeX output: renders output as LaTeX. This is currently part of the
-    main Blackfriday repository, but may be split into its own project
-    in the future. If you are interested in owning and maintaining the
-    LaTeX output component, please be in touch.
-
-    It renders some basic documents, but is only experimental at this
-    point. In particular, it does not do any inline escaping, so input
-    that happens to look like LaTeX code will be passed through without
-    modification.
-    
-*   [Md2Vim](https://github.com/FooSoft/md2vim): transforms markdown files into vimdoc format.
-
-
-Todo
-----
-
-*   More unit testing
-*   Improve unicode support. It does not understand all unicode
-    rules (about what constitutes a letter, a punctuation symbol,
-    etc.), so it may fail to detect word boundaries correctly in
-    some instances. It is safe on all utf-8 input.
-
-
-License
--------
-
-[Blackfriday is distributed under the Simplified BSD License](LICENSE.txt)
-
-
-   [1]: http://daringfireball.net/projects/markdown/ "Markdown"
-   [2]: http://golang.org/ "Go Language"
-   [3]: https://github.com/vmg/sundown "Sundown"
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/block.go b/Godeps/_workspace/src/github.com/russross/blackfriday/block.go
deleted file mode 100644
index b5b084117c..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/block.go
+++ /dev/null
@@ -1,1398 +0,0 @@
-//
-// Blackfriday Markdown Processor
-// Available at http://github.com/russross/blackfriday
-//
-// Copyright © 2011 Russ Ross <russ@russross.com>.
-// Distributed under the Simplified BSD License.
-// See README.md for details.
-//
-
-//
-// Functions to parse block-level elements.
-//
-
-package blackfriday
-
-import (
-	"bytes"
-
-	"github.com/shurcooL/sanitized_anchor_name"
-)
-
-// Parse block-level data.
-// Note: this function and many that it calls assume that
-// the input buffer ends with a newline.
-func (p *parser) block(out *bytes.Buffer, data []byte) {
-	if len(data) == 0 || data[len(data)-1] != '\n' {
-		panic("block input is missing terminating newline")
-	}
-
-	// this is called recursively: enforce a maximum depth
-	if p.nesting >= p.maxNesting {
-		return
-	}
-	p.nesting++
-
-	// parse out one block-level construct at a time
-	for len(data) > 0 {
-		// prefixed header:
-		//
-		// # Header 1
-		// ## Header 2
-		// ...
-		// ###### Header 6
-		if p.isPrefixHeader(data) {
-			data = data[p.prefixHeader(out, data):]
-			continue
-		}
-
-		// block of preformatted HTML:
-		//
-		// <div>
-		//     ...
-		// </div>
-		if data[0] == '<' {
-			if i := p.html(out, data, true); i > 0 {
-				data = data[i:]
-				continue
-			}
-		}
-
-		// title block
-		//
-		// % stuff
-		// % more stuff
-		// % even more stuff
-		if p.flags&EXTENSION_TITLEBLOCK != 0 {
-			if data[0] == '%' {
-				if i := p.titleBlock(out, data, true); i > 0 {
-					data = data[i:]
-					continue
-				}
-			}
-		}
-
-		// blank lines.  note: returns the # of bytes to skip
-		if i := p.isEmpty(data); i > 0 {
-			data = data[i:]
-			continue
-		}
-
-		// indented code block:
-		//
-		//     func max(a, b int) int {
-		//         if a > b {
-		//             return a
-		//         }
-		//         return b
-		//      }
-		if p.codePrefix(data) > 0 {
-			data = data[p.code(out, data):]
-			continue
-		}
-
-		// fenced code block:
-		//
-		// ``` go
-		// func fact(n int) int {
-		//     if n <= 1 {
-		//         return n
-		//     }
-		//     return n * fact(n-1)
-		// }
-		// ```
-		if p.flags&EXTENSION_FENCED_CODE != 0 {
-			if i := p.fencedCode(out, data, true); i > 0 {
-				data = data[i:]
-				continue
-			}
-		}
-
-		// horizontal rule:
-		//
-		// ------
-		// or
-		// ******
-		// or
-		// ______
-		if p.isHRule(data) {
-			p.r.HRule(out)
-			var i int
-			for i = 0; data[i] != '\n'; i++ {
-			}
-			data = data[i:]
-			continue
-		}
-
-		// block quote:
-		//
-		// > A big quote I found somewhere
-		// > on the web
-		if p.quotePrefix(data) > 0 {
-			data = data[p.quote(out, data):]
-			continue
-		}
-
-		// table:
-		//
-		// Name  | Age | Phone
-		// ------|-----|---------
-		// Bob   | 31  | 555-1234
-		// Alice | 27  | 555-4321
-		if p.flags&EXTENSION_TABLES != 0 {
-			if i := p.table(out, data); i > 0 {
-				data = data[i:]
-				continue
-			}
-		}
-
-		// an itemized/unordered list:
-		//
-		// * Item 1
-		// * Item 2
-		//
-		// also works with + or -
-		if p.uliPrefix(data) > 0 {
-			data = data[p.list(out, data, 0):]
-			continue
-		}
-
-		// a numbered/ordered list:
-		//
-		// 1. Item 1
-		// 2. Item 2
-		if p.oliPrefix(data) > 0 {
-			data = data[p.list(out, data, LIST_TYPE_ORDERED):]
-			continue
-		}
-
-		// definition lists:
-		//
-		// Term 1
-		// :   Definition a
-		// :   Definition b
-		//
-		// Term 2
-		// :   Definition c
-		if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
-			if p.dliPrefix(data) > 0 {
-				data = data[p.list(out, data, LIST_TYPE_DEFINITION):]
-				continue
-			}
-		}
-
-		// anything else must look like a normal paragraph
-		// note: this finds underlined headers, too
-		data = data[p.paragraph(out, data):]
-	}
-
-	p.nesting--
-}
-
-func (p *parser) isPrefixHeader(data []byte) bool {
-	if data[0] != '#' {
-		return false
-	}
-
-	if p.flags&EXTENSION_SPACE_HEADERS != 0 {
-		level := 0
-		for level < 6 && data[level] == '#' {
-			level++
-		}
-		if data[level] != ' ' {
-			return false
-		}
-	}
-	return true
-}
-
-func (p *parser) prefixHeader(out *bytes.Buffer, data []byte) int {
-	level := 0
-	for level < 6 && data[level] == '#' {
-		level++
-	}
-	i := skipChar(data, level, ' ')
-	end := skipUntilChar(data, i, '\n')
-	skip := end
-	id := ""
-	if p.flags&EXTENSION_HEADER_IDS != 0 {
-		j, k := 0, 0
-		// find start/end of header id
-		for j = i; j < end-1 && (data[j] != '{' || data[j+1] != '#'); j++ {
-		}
-		for k = j + 1; k < end && data[k] != '}'; k++ {
-		}
-		// extract header id iff found
-		if j < end && k < end {
-			id = string(data[j+2 : k])
-			end = j
-			skip = k + 1
-			for end > 0 && data[end-1] == ' ' {
-				end--
-			}
-		}
-	}
-	for end > 0 && data[end-1] == '#' {
-		if isBackslashEscaped(data, end-1) {
-			break
-		}
-		end--
-	}
-	for end > 0 && data[end-1] == ' ' {
-		end--
-	}
-	if end > i {
-		if id == "" && p.flags&EXTENSION_AUTO_HEADER_IDS != 0 {
-			id = sanitized_anchor_name.Create(string(data[i:end]))
-		}
-		work := func() bool {
-			p.inline(out, data[i:end])
-			return true
-		}
-		p.r.Header(out, work, level, id)
-	}
-	return skip
-}
-
-func (p *parser) isUnderlinedHeader(data []byte) int {
-	// test of level 1 header
-	if data[0] == '=' {
-		i := skipChar(data, 1, '=')
-		i = skipChar(data, i, ' ')
-		if data[i] == '\n' {
-			return 1
-		} else {
-			return 0
-		}
-	}
-
-	// test of level 2 header
-	if data[0] == '-' {
-		i := skipChar(data, 1, '-')
-		i = skipChar(data, i, ' ')
-		if data[i] == '\n' {
-			return 2
-		} else {
-			return 0
-		}
-	}
-
-	return 0
-}
-
-func (p *parser) titleBlock(out *bytes.Buffer, data []byte, doRender bool) int {
-	if data[0] != '%' {
-		return 0
-	}
-	splitData := bytes.Split(data, []byte("\n"))
-	var i int
-	for idx, b := range splitData {
-		if !bytes.HasPrefix(b, []byte("%")) {
-			i = idx // - 1
-			break
-		}
-	}
-
-	data = bytes.Join(splitData[0:i], []byte("\n"))
-	p.r.TitleBlock(out, data)
-
-	return len(data)
-}
-
-func (p *parser) html(out *bytes.Buffer, data []byte, doRender bool) int {
-	var i, j int
-
-	// identify the opening tag
-	if data[0] != '<' {
-		return 0
-	}
-	curtag, tagfound := p.htmlFindTag(data[1:])
-
-	// handle special cases
-	if !tagfound {
-		// check for an HTML comment
-		if size := p.htmlComment(out, data, doRender); size > 0 {
-			return size
-		}
-
-		// check for an <hr> tag
-		if size := p.htmlHr(out, data, doRender); size > 0 {
-			return size
-		}
-
-		// no special case recognized
-		return 0
-	}
-
-	// look for an unindented matching closing tag
-	// followed by a blank line
-	found := false
-	/*
-		closetag := []byte("\n</" + curtag + ">")
-		j = len(curtag) + 1
-		for !found {
-			// scan for a closing tag at the beginning of a line
-			if skip := bytes.Index(data[j:], closetag); skip >= 0 {
-				j += skip + len(closetag)
-			} else {
-				break
-			}
-
-			// see if it is the only thing on the line
-			if skip := p.isEmpty(data[j:]); skip > 0 {
-				// see if it is followed by a blank line/eof
-				j += skip
-				if j >= len(data) {
-					found = true
-					i = j
-				} else {
-					if skip := p.isEmpty(data[j:]); skip > 0 {
-						j += skip
-						found = true
-						i = j
-					}
-				}
-			}
-		}
-	*/
-
-	// if not found, try a second pass looking for indented match
-	// but not if tag is "ins" or "del" (following original Markdown.pl)
-	if !found && curtag != "ins" && curtag != "del" {
-		i = 1
-		for i < len(data) {
-			i++
-			for i < len(data) && !(data[i-1] == '<' && data[i] == '/') {
-				i++
-			}
-
-			if i+2+len(curtag) >= len(data) {
-				break
-			}
-
-			j = p.htmlFindEnd(curtag, data[i-1:])
-
-			if j > 0 {
-				i += j - 1
-				found = true
-				break
-			}
-		}
-	}
-
-	if !found {
-		return 0
-	}
-
-	// the end of the block has been found
-	if doRender {
-		// trim newlines
-		end := i
-		for end > 0 && data[end-1] == '\n' {
-			end--
-		}
-		p.r.BlockHtml(out, data[:end])
-	}
-
-	return i
-}
-
-// HTML comment, lax form
-func (p *parser) htmlComment(out *bytes.Buffer, data []byte, doRender bool) int {
-	i := p.inlineHtmlComment(out, data)
-	// needs to end with a blank line
-	if j := p.isEmpty(data[i:]); j > 0 {
-		size := i + j
-		if doRender {
-			// trim trailing newlines
-			end := size
-			for end > 0 && data[end-1] == '\n' {
-				end--
-			}
-			p.r.BlockHtml(out, data[:end])
-		}
-		return size
-	}
-	return 0
-}
-
-// HR, which is the only self-closing block tag considered
-func (p *parser) htmlHr(out *bytes.Buffer, data []byte, doRender bool) int {
-	if data[0] != '<' || (data[1] != 'h' && data[1] != 'H') || (data[2] != 'r' && data[2] != 'R') {
-		return 0
-	}
-	if data[3] != ' ' && data[3] != '/' && data[3] != '>' {
-		// not an <hr> tag after all; at least not a valid one
-		return 0
-	}
-
-	i := 3
-	for data[i] != '>' && data[i] != '\n' {
-		i++
-	}
-
-	if data[i] == '>' {
-		i++
-		if j := p.isEmpty(data[i:]); j > 0 {
-			size := i + j
-			if doRender {
-				// trim newlines
-				end := size
-				for end > 0 && data[end-1] == '\n' {
-					end--
-				}
-				p.r.BlockHtml(out, data[:end])
-			}
-			return size
-		}
-	}
-
-	return 0
-}
-
-func (p *parser) htmlFindTag(data []byte) (string, bool) {
-	i := 0
-	for isalnum(data[i]) {
-		i++
-	}
-	key := string(data[:i])
-	if _, ok := blockTags[key]; ok {
-		return key, true
-	}
-	return "", false
-}
-
-func (p *parser) htmlFindEnd(tag string, data []byte) int {
-	// assume data[0] == '<' && data[1] == '/' already tested
-
-	// check if tag is a match
-	closetag := []byte("</" + tag + ">")
-	if !bytes.HasPrefix(data, closetag) {
-		return 0
-	}
-	i := len(closetag)
-
-	// check that the rest of the line is blank
-	skip := 0
-	if skip = p.isEmpty(data[i:]); skip == 0 {
-		return 0
-	}
-	i += skip
-	skip = 0
-
-	if i >= len(data) {
-		return i
-	}
-
-	if p.flags&EXTENSION_LAX_HTML_BLOCKS != 0 {
-		return i
-	}
-	if skip = p.isEmpty(data[i:]); skip == 0 {
-		// following line must be blank
-		return 0
-	}
-
-	return i + skip
-}
-
-func (p *parser) isEmpty(data []byte) int {
-	// it is okay to call isEmpty on an empty buffer
-	if len(data) == 0 {
-		return 0
-	}
-
-	var i int
-	for i = 0; i < len(data) && data[i] != '\n'; i++ {
-		if data[i] != ' ' && data[i] != '\t' {
-			return 0
-		}
-	}
-	return i + 1
-}
-
-func (p *parser) isHRule(data []byte) bool {
-	i := 0
-
-	// skip up to three spaces
-	for i < 3 && data[i] == ' ' {
-		i++
-	}
-
-	// look at the hrule char
-	if data[i] != '*' && data[i] != '-' && data[i] != '_' {
-		return false
-	}
-	c := data[i]
-
-	// the whole line must be the char or whitespace
-	n := 0
-	for data[i] != '\n' {
-		switch {
-		case data[i] == c:
-			n++
-		case data[i] != ' ':
-			return false
-		}
-		i++
-	}
-
-	return n >= 3
-}
-
-func (p *parser) isFencedCode(data []byte, syntax **string, oldmarker string) (skip int, marker string) {
-	i, size := 0, 0
-	skip = 0
-
-	// skip up to three spaces
-	for i < len(data) && i < 3 && data[i] == ' ' {
-		i++
-	}
-	if i >= len(data) {
-		return
-	}
-
-	// check for the marker characters: ~ or `
-	if data[i] != '~' && data[i] != '`' {
-		return
-	}
-
-	c := data[i]
-
-	// the whole line must be the same char or whitespace
-	for i < len(data) && data[i] == c {
-		size++
-		i++
-	}
-
-	if i >= len(data) {
-		return
-	}
-
-	// the marker char must occur at least 3 times
-	if size < 3 {
-		return
-	}
-	marker = string(data[i-size : i])
-
-	// if this is the end marker, it must match the beginning marker
-	if oldmarker != "" && marker != oldmarker {
-		return
-	}
-
-	if syntax != nil {
-		syn := 0
-		i = skipChar(data, i, ' ')
-
-		if i >= len(data) {
-			return
-		}
-
-		syntaxStart := i
-
-		if data[i] == '{' {
-			i++
-			syntaxStart++
-
-			for i < len(data) && data[i] != '}' && data[i] != '\n' {
-				syn++
-				i++
-			}
-
-			if i >= len(data) || data[i] != '}' {
-				return
-			}
-
-			// strip all whitespace at the beginning and the end
-			// of the {} block
-			for syn > 0 && isspace(data[syntaxStart]) {
-				syntaxStart++
-				syn--
-			}
-
-			for syn > 0 && isspace(data[syntaxStart+syn-1]) {
-				syn--
-			}
-
-			i++
-		} else {
-			for i < len(data) && !isspace(data[i]) {
-				syn++
-				i++
-			}
-		}
-
-		language := string(data[syntaxStart : syntaxStart+syn])
-		*syntax = &language
-	}
-
-	i = skipChar(data, i, ' ')
-	if i >= len(data) || data[i] != '\n' {
-		return
-	}
-
-	skip = i + 1
-	return
-}
-
-func (p *parser) fencedCode(out *bytes.Buffer, data []byte, doRender bool) int {
-	var lang *string
-	beg, marker := p.isFencedCode(data, &lang, "")
-	if beg == 0 || beg >= len(data) {
-		return 0
-	}
-
-	var work bytes.Buffer
-
-	for {
-		// safe to assume beg < len(data)
-
-		// check for the end of the code block
-		fenceEnd, _ := p.isFencedCode(data[beg:], nil, marker)
-		if fenceEnd != 0 {
-			beg += fenceEnd
-			break
-		}
-
-		// copy the current line
-		end := skipUntilChar(data, beg, '\n') + 1
-
-		// did we reach the end of the buffer without a closing marker?
-		if end >= len(data) {
-			return 0
-		}
-
-		// verbatim copy to the working buffer
-		if doRender {
-			work.Write(data[beg:end])
-		}
-		beg = end
-	}
-
-	syntax := ""
-	if lang != nil {
-		syntax = *lang
-	}
-
-	if doRender {
-		p.r.BlockCode(out, work.Bytes(), syntax)
-	}
-
-	return beg
-}
-
-func (p *parser) table(out *bytes.Buffer, data []byte) int {
-	var header bytes.Buffer
-	i, columns := p.tableHeader(&header, data)
-	if i == 0 {
-		return 0
-	}
-
-	var body bytes.Buffer
-
-	for i < len(data) {
-		pipes, rowStart := 0, i
-		for ; data[i] != '\n'; i++ {
-			if data[i] == '|' {
-				pipes++
-			}
-		}
-
-		if pipes == 0 {
-			i = rowStart
-			break
-		}
-
-		// include the newline in data sent to tableRow
-		i++
-		p.tableRow(&body, data[rowStart:i], columns, false)
-	}
-
-	p.r.Table(out, header.Bytes(), body.Bytes(), columns)
-
-	return i
-}
-
-// check if the specified position is preceded by an odd number of backslashes
-func isBackslashEscaped(data []byte, i int) bool {
-	backslashes := 0
-	for i-backslashes-1 >= 0 && data[i-backslashes-1] == '\\' {
-		backslashes++
-	}
-	return backslashes&1 == 1
-}
-
-func (p *parser) tableHeader(out *bytes.Buffer, data []byte) (size int, columns []int) {
-	i := 0
-	colCount := 1
-	for i = 0; data[i] != '\n'; i++ {
-		if data[i] == '|' && !isBackslashEscaped(data, i) {
-			colCount++
-		}
-	}
-
-	// doesn't look like a table header
-	if colCount == 1 {
-		return
-	}
-
-	// include the newline in the data sent to tableRow
-	header := data[:i+1]
-
-	// column count ignores pipes at beginning or end of line
-	if data[0] == '|' {
-		colCount--
-	}
-	if i > 2 && data[i-1] == '|' && !isBackslashEscaped(data, i-1) {
-		colCount--
-	}
-
-	columns = make([]int, colCount)
-
-	// move on to the header underline
-	i++
-	if i >= len(data) {
-		return
-	}
-
-	if data[i] == '|' && !isBackslashEscaped(data, i) {
-		i++
-	}
-	i = skipChar(data, i, ' ')
-
-	// each column header is of form: / *:?-+:? *|/ with # dashes + # colons >= 3
-	// and trailing | optional on last column
-	col := 0
-	for data[i] != '\n' {
-		dashes := 0
-
-		if data[i] == ':' {
-			i++
-			columns[col] |= TABLE_ALIGNMENT_LEFT
-			dashes++
-		}
-		for data[i] == '-' {
-			i++
-			dashes++
-		}
-		if data[i] == ':' {
-			i++
-			columns[col] |= TABLE_ALIGNMENT_RIGHT
-			dashes++
-		}
-		for data[i] == ' ' {
-			i++
-		}
-
-		// end of column test is messy
-		switch {
-		case dashes < 3:
-			// not a valid column
-			return
-
-		case data[i] == '|' && !isBackslashEscaped(data, i):
-			// marker found, now skip past trailing whitespace
-			col++
-			i++
-			for data[i] == ' ' {
-				i++
-			}
-
-			// trailing junk found after last column
-			if col >= colCount && data[i] != '\n' {
-				return
-			}
-
-		case (data[i] != '|' || isBackslashEscaped(data, i)) && col+1 < colCount:
-			// something else found where marker was required
-			return
-
-		case data[i] == '\n':
-			// marker is optional for the last column
-			col++
-
-		default:
-			// trailing junk found after last column
-			return
-		}
-	}
-	if col != colCount {
-		return
-	}
-
-	p.tableRow(out, header, columns, true)
-	size = i + 1
-	return
-}
-
-func (p *parser) tableRow(out *bytes.Buffer, data []byte, columns []int, header bool) {
-	i, col := 0, 0
-	var rowWork bytes.Buffer
-
-	if data[i] == '|' && !isBackslashEscaped(data, i) {
-		i++
-	}
-
-	for col = 0; col < len(columns) && i < len(data); col++ {
-		for data[i] == ' ' {
-			i++
-		}
-
-		cellStart := i
-
-		for (data[i] != '|' || isBackslashEscaped(data, i)) && data[i] != '\n' {
-			i++
-		}
-
-		cellEnd := i
-
-		// skip the end-of-cell marker, possibly taking us past end of buffer
-		i++
-
-		for cellEnd > cellStart && data[cellEnd-1] == ' ' {
-			cellEnd--
-		}
-
-		var cellWork bytes.Buffer
-		p.inline(&cellWork, data[cellStart:cellEnd])
-
-		if header {
-			p.r.TableHeaderCell(&rowWork, cellWork.Bytes(), columns[col])
-		} else {
-			p.r.TableCell(&rowWork, cellWork.Bytes(), columns[col])
-		}
-	}
-
-	// pad it out with empty columns to get the right number
-	for ; col < len(columns); col++ {
-		if header {
-			p.r.TableHeaderCell(&rowWork, nil, columns[col])
-		} else {
-			p.r.TableCell(&rowWork, nil, columns[col])
-		}
-	}
-
-	// silently ignore rows with too many cells
-
-	p.r.TableRow(out, rowWork.Bytes())
-}
-
-// returns blockquote prefix length
-func (p *parser) quotePrefix(data []byte) int {
-	i := 0
-	for i < 3 && data[i] == ' ' {
-		i++
-	}
-	if data[i] == '>' {
-		if data[i+1] == ' ' {
-			return i + 2
-		}
-		return i + 1
-	}
-	return 0
-}
-
-// blockquote ends with at least one blank line
-// followed by something without a blockquote prefix
-func (p *parser) terminateBlockquote(data []byte, beg, end int) bool {
-	if p.isEmpty(data[beg:]) <= 0 {
-		return false
-	}
-	if end >= len(data) {
-		return true
-	}
-	return p.quotePrefix(data[end:]) == 0 && p.isEmpty(data[end:]) == 0
-}
-
-// parse a blockquote fragment
-func (p *parser) quote(out *bytes.Buffer, data []byte) int {
-	var raw bytes.Buffer
-	beg, end := 0, 0
-	for beg < len(data) {
-		end = beg
-		// Step over whole lines, collecting them. While doing that, check for
-		// fenced code and if one's found, incorporate it altogether,
-		// irregardless of any contents inside it
-		for data[end] != '\n' {
-			if p.flags&EXTENSION_FENCED_CODE != 0 {
-				if i := p.fencedCode(out, data[end:], false); i > 0 {
-					// -1 to compensate for the extra end++ after the loop:
-					end += i - 1
-					break
-				}
-			}
-			end++
-		}
-		end++
-
-		if pre := p.quotePrefix(data[beg:]); pre > 0 {
-			// skip the prefix
-			beg += pre
-		} else if p.terminateBlockquote(data, beg, end) {
-			break
-		}
-
-		// this line is part of the blockquote
-		raw.Write(data[beg:end])
-		beg = end
-	}
-
-	var cooked bytes.Buffer
-	p.block(&cooked, raw.Bytes())
-	p.r.BlockQuote(out, cooked.Bytes())
-	return end
-}
-
-// returns prefix length for block code
-func (p *parser) codePrefix(data []byte) int {
-	if data[0] == ' ' && data[1] == ' ' && data[2] == ' ' && data[3] == ' ' {
-		return 4
-	}
-	return 0
-}
-
-func (p *parser) code(out *bytes.Buffer, data []byte) int {
-	var work bytes.Buffer
-
-	i := 0
-	for i < len(data) {
-		beg := i
-		for data[i] != '\n' {
-			i++
-		}
-		i++
-
-		blankline := p.isEmpty(data[beg:i]) > 0
-		if pre := p.codePrefix(data[beg:i]); pre > 0 {
-			beg += pre
-		} else if !blankline {
-			// non-empty, non-prefixed line breaks the pre
-			i = beg
-			break
-		}
-
-		// verbatim copy to the working buffeu
-		if blankline {
-			work.WriteByte('\n')
-		} else {
-			work.Write(data[beg:i])
-		}
-	}
-
-	// trim all the \n off the end of work
-	workbytes := work.Bytes()
-	eol := len(workbytes)
-	for eol > 0 && workbytes[eol-1] == '\n' {
-		eol--
-	}
-	if eol != len(workbytes) {
-		work.Truncate(eol)
-	}
-
-	work.WriteByte('\n')
-
-	p.r.BlockCode(out, work.Bytes(), "")
-
-	return i
-}
-
-// returns unordered list item prefix
-func (p *parser) uliPrefix(data []byte) int {
-	i := 0
-
-	// start with up to 3 spaces
-	for i < 3 && data[i] == ' ' {
-		i++
-	}
-
-	// need a *, +, or - followed by a space
-	if (data[i] != '*' && data[i] != '+' && data[i] != '-') ||
-		data[i+1] != ' ' {
-		return 0
-	}
-	return i + 2
-}
-
-// returns ordered list item prefix
-func (p *parser) oliPrefix(data []byte) int {
-	i := 0
-
-	// start with up to 3 spaces
-	for i < 3 && data[i] == ' ' {
-		i++
-	}
-
-	// count the digits
-	start := i
-	for data[i] >= '0' && data[i] <= '9' {
-		i++
-	}
-
-	// we need >= 1 digits followed by a dot and a space
-	if start == i || data[i] != '.' || data[i+1] != ' ' {
-		return 0
-	}
-	return i + 2
-}
-
-// returns definition list item prefix
-func (p *parser) dliPrefix(data []byte) int {
-	i := 0
-
-	// need a : followed by a spaces
-	if data[i] != ':' || data[i+1] != ' ' {
-		return 0
-	}
-	for data[i] == ' ' {
-		i++
-	}
-	return i + 2
-}
-
-// parse ordered or unordered list block
-func (p *parser) list(out *bytes.Buffer, data []byte, flags int) int {
-	i := 0
-	flags |= LIST_ITEM_BEGINNING_OF_LIST
-	work := func() bool {
-		for i < len(data) {
-			skip := p.listItem(out, data[i:], &flags)
-			i += skip
-
-			if skip == 0 || flags&LIST_ITEM_END_OF_LIST != 0 {
-				break
-			}
-			flags &= ^LIST_ITEM_BEGINNING_OF_LIST
-		}
-		return true
-	}
-
-	p.r.List(out, work, flags)
-	return i
-}
-
-// Parse a single list item.
-// Assumes initial prefix is already removed if this is a sublist.
-func (p *parser) listItem(out *bytes.Buffer, data []byte, flags *int) int {
-	// keep track of the indentation of the first line
-	itemIndent := 0
-	for itemIndent < 3 && data[itemIndent] == ' ' {
-		itemIndent++
-	}
-
-	i := p.uliPrefix(data)
-	if i == 0 {
-		i = p.oliPrefix(data)
-	}
-	if i == 0 {
-		i = p.dliPrefix(data)
-		// reset definition term flag
-		if i > 0 {
-			*flags &= ^LIST_TYPE_TERM
-		}
-	}
-	if i == 0 {
-		// if in defnition list, set term flag and continue
-		if *flags&LIST_TYPE_DEFINITION != 0 {
-			*flags |= LIST_TYPE_TERM
-		} else {
-			return 0
-		}
-	}
-
-	// skip leading whitespace on first line
-	for data[i] == ' ' {
-		i++
-	}
-
-	// find the end of the line
-	line := i
-	for i > 0 && data[i-1] != '\n' {
-		i++
-	}
-
-	// get working buffer
-	var raw bytes.Buffer
-
-	// put the first line into the working buffer
-	raw.Write(data[line:i])
-	line = i
-
-	// process the following lines
-	containsBlankLine := false
-	sublist := 0
-
-gatherlines:
-	for line < len(data) {
-		i++
-
-		// find the end of this line
-		for data[i-1] != '\n' {
-			i++
-		}
-
-		// if it is an empty line, guess that it is part of this item
-		// and move on to the next line
-		if p.isEmpty(data[line:i]) > 0 {
-			containsBlankLine = true
-			line = i
-			continue
-		}
-
-		// calculate the indentation
-		indent := 0
-		for indent < 4 && line+indent < i && data[line+indent] == ' ' {
-			indent++
-		}
-
-		chunk := data[line+indent : i]
-
-		// evaluate how this line fits in
-		switch {
-		// is this a nested list item?
-		case (p.uliPrefix(chunk) > 0 && !p.isHRule(chunk)) ||
-			p.oliPrefix(chunk) > 0 ||
-			p.dliPrefix(chunk) > 0:
-
-			if containsBlankLine {
-				*flags |= LIST_ITEM_CONTAINS_BLOCK
-			}
-
-			// to be a nested list, it must be indented more
-			// if not, it is the next item in the same list
-			if indent <= itemIndent {
-				break gatherlines
-			}
-
-			// is this the first item in the nested list?
-			if sublist == 0 {
-				sublist = raw.Len()
-			}
-
-		// is this a nested prefix header?
-		case p.isPrefixHeader(chunk):
-			// if the header is not indented, it is not nested in the list
-			// and thus ends the list
-			if containsBlankLine && indent < 4 {
-				*flags |= LIST_ITEM_END_OF_LIST
-				break gatherlines
-			}
-			*flags |= LIST_ITEM_CONTAINS_BLOCK
-
-		// anything following an empty line is only part
-		// of this item if it is indented 4 spaces
-		// (regardless of the indentation of the beginning of the item)
-		case containsBlankLine && indent < 4:
-			if *flags&LIST_TYPE_DEFINITION != 0 && i < len(data)-1 {
-				// is the next item still a part of this list?
-				next := i
-				for data[next] != '\n' {
-					next++
-				}
-				for next < len(data)-1 && data[next] == '\n' {
-					next++
-				}
-				if i < len(data)-1 && data[i] != ':' && data[next] != ':' {
-					*flags |= LIST_ITEM_END_OF_LIST
-				}
-			} else {
-				*flags |= LIST_ITEM_END_OF_LIST
-			}
-			break gatherlines
-
-		// a blank line means this should be parsed as a block
-		case containsBlankLine:
-			raw.WriteByte('\n')
-			*flags |= LIST_ITEM_CONTAINS_BLOCK
-		}
-
-		// if this line was preceeded by one or more blanks,
-		// re-introduce the blank into the buffer
-		if containsBlankLine {
-			containsBlankLine = false
-			raw.WriteByte('\n')
-
-		}
-
-		// add the line into the working buffer without prefix
-		raw.Write(data[line+indent : i])
-
-		line = i
-	}
-
-	rawBytes := raw.Bytes()
-
-	// render the contents of the list item
-	var cooked bytes.Buffer
-	if *flags&LIST_ITEM_CONTAINS_BLOCK != 0 && *flags&LIST_TYPE_TERM == 0 {
-		// intermediate render of block item, except for definition term
-		if sublist > 0 {
-			p.block(&cooked, rawBytes[:sublist])
-			p.block(&cooked, rawBytes[sublist:])
-		} else {
-			p.block(&cooked, rawBytes)
-		}
-	} else {
-		// intermediate render of inline item
-		if sublist > 0 {
-			p.inline(&cooked, rawBytes[:sublist])
-			p.block(&cooked, rawBytes[sublist:])
-		} else {
-			p.inline(&cooked, rawBytes)
-		}
-	}
-
-	// render the actual list item
-	cookedBytes := cooked.Bytes()
-	parsedEnd := len(cookedBytes)
-
-	// strip trailing newlines
-	for parsedEnd > 0 && cookedBytes[parsedEnd-1] == '\n' {
-		parsedEnd--
-	}
-	p.r.ListItem(out, cookedBytes[:parsedEnd], *flags)
-
-	return line
-}
-
-// render a single paragraph that has already been parsed out
-func (p *parser) renderParagraph(out *bytes.Buffer, data []byte) {
-	if len(data) == 0 {
-		return
-	}
-
-	// trim leading spaces
-	beg := 0
-	for data[beg] == ' ' {
-		beg++
-	}
-
-	// trim trailing newline
-	end := len(data) - 1
-
-	// trim trailing spaces
-	for end > beg && data[end-1] == ' ' {
-		end--
-	}
-
-	work := func() bool {
-		p.inline(out, data[beg:end])
-		return true
-	}
-	p.r.Paragraph(out, work)
-}
-
-func (p *parser) paragraph(out *bytes.Buffer, data []byte) int {
-	// prev: index of 1st char of previous line
-	// line: index of 1st char of current line
-	// i: index of cursor/end of current line
-	var prev, line, i int
-
-	// keep going until we find something to mark the end of the paragraph
-	for i < len(data) {
-		// mark the beginning of the current line
-		prev = line
-		current := data[i:]
-		line = i
-
-		// did we find a blank line marking the end of the paragraph?
-		if n := p.isEmpty(current); n > 0 {
-			// did this blank line followed by a definition list item?
-			if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
-				if i < len(data)-1 && data[i+1] == ':' {
-					return p.list(out, data[prev:], LIST_TYPE_DEFINITION)
-				}
-			}
-
-			p.renderParagraph(out, data[:i])
-			return i + n
-		}
-
-		// an underline under some text marks a header, so our paragraph ended on prev line
-		if i > 0 {
-			if level := p.isUnderlinedHeader(current); level > 0 {
-				// render the paragraph
-				p.renderParagraph(out, data[:prev])
-
-				// ignore leading and trailing whitespace
-				eol := i - 1
-				for prev < eol && data[prev] == ' ' {
-					prev++
-				}
-				for eol > prev && data[eol-1] == ' ' {
-					eol--
-				}
-
-				// render the header
-				// this ugly double closure avoids forcing variables onto the heap
-				work := func(o *bytes.Buffer, pp *parser, d []byte) func() bool {
-					return func() bool {
-						pp.inline(o, d)
-						return true
-					}
-				}(out, p, data[prev:eol])
-
-				id := ""
-				if p.flags&EXTENSION_AUTO_HEADER_IDS != 0 {
-					id = sanitized_anchor_name.Create(string(data[prev:eol]))
-				}
-
-				p.r.Header(out, work, level, id)
-
-				// find the end of the underline
-				for data[i] != '\n' {
-					i++
-				}
-				return i
-			}
-		}
-
-		// if the next line starts a block of HTML, then the paragraph ends here
-		if p.flags&EXTENSION_LAX_HTML_BLOCKS != 0 {
-			if data[i] == '<' && p.html(out, current, false) > 0 {
-				// rewind to before the HTML block
-				p.renderParagraph(out, data[:i])
-				return i
-			}
-		}
-
-		// if there's a prefixed header or a horizontal rule after this, paragraph is over
-		if p.isPrefixHeader(current) || p.isHRule(current) {
-			p.renderParagraph(out, data[:i])
-			return i
-		}
-
-		// if there's a fenced code block, paragraph is over
-		if p.flags&EXTENSION_FENCED_CODE != 0 {
-			if p.fencedCode(out, current, false) > 0 {
-				p.renderParagraph(out, data[:i])
-				return i
-			}
-		}
-
-		// if there's a definition list item, prev line is a definition term
-		if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
-			if p.dliPrefix(current) != 0 {
-				return p.list(out, data[prev:], LIST_TYPE_DEFINITION)
-			}
-		}
-
-		// if there's a list after this, paragraph is over
-		if p.flags&EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK != 0 {
-			if p.uliPrefix(current) != 0 ||
-				p.oliPrefix(current) != 0 ||
-				p.quotePrefix(current) != 0 ||
-				p.codePrefix(current) != 0 {
-				p.renderParagraph(out, data[:i])
-				return i
-			}
-		}
-
-		// otherwise, scan to the beginning of the next line
-		for data[i] != '\n' {
-			i++
-		}
-		i++
-	}
-
-	p.renderParagraph(out, data[:i])
-	return i
-}
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/html.go b/Godeps/_workspace/src/github.com/russross/blackfriday/html.go
deleted file mode 100644
index 74e67ee82b..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/html.go
+++ /dev/null
@@ -1,949 +0,0 @@
-//
-// Blackfriday Markdown Processor
-// Available at http://github.com/russross/blackfriday
-//
-// Copyright © 2011 Russ Ross <russ@russross.com>.
-// Distributed under the Simplified BSD License.
-// See README.md for details.
-//
-
-//
-//
-// HTML rendering backend
-//
-//
-
-package blackfriday
-
-import (
-	"bytes"
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// Html renderer configuration options.
-const (
-	HTML_SKIP_HTML                 = 1 << iota // skip preformatted HTML blocks
-	HTML_SKIP_STYLE                            // skip embedded <style> elements
-	HTML_SKIP_IMAGES                           // skip embedded images
-	HTML_SKIP_LINKS                            // skip all links
-	HTML_SAFELINK                              // only link to trusted protocols
-	HTML_NOFOLLOW_LINKS                        // only link with rel="nofollow"
-	HTML_NOREFERRER_LINKS                      // only link with rel="noreferrer"
-	HTML_HREF_TARGET_BLANK                     // add a blank target
-	HTML_TOC                                   // generate a table of contents
-	HTML_OMIT_CONTENTS                         // skip the main contents (for a standalone table of contents)
-	HTML_COMPLETE_PAGE                         // generate a complete HTML page
-	HTML_USE_XHTML                             // generate XHTML output instead of HTML
-	HTML_USE_SMARTYPANTS                       // enable smart punctuation substitutions
-	HTML_SMARTYPANTS_FRACTIONS                 // enable smart fractions (with HTML_USE_SMARTYPANTS)
-	HTML_SMARTYPANTS_DASHES                    // enable smart dashes (with HTML_USE_SMARTYPANTS)
-	HTML_SMARTYPANTS_LATEX_DASHES              // enable LaTeX-style dashes (with HTML_USE_SMARTYPANTS and HTML_SMARTYPANTS_DASHES)
-	HTML_SMARTYPANTS_ANGLED_QUOTES             // enable angled double quotes (with HTML_USE_SMARTYPANTS) for double quotes rendering
-	HTML_FOOTNOTE_RETURN_LINKS                 // generate a link at the end of a footnote to return to the source
-)
-
-var (
-	alignments = []string{
-		"left",
-		"right",
-		"center",
-	}
-
-	// TODO: improve this regexp to catch all possible entities:
-	htmlEntity = regexp.MustCompile(`&[a-z]{2,5};`)
-)
-
-type HtmlRendererParameters struct {
-	// Prepend this text to each relative URL.
-	AbsolutePrefix string
-	// Add this text to each footnote anchor, to ensure uniqueness.
-	FootnoteAnchorPrefix string
-	// Show this text inside the <a> tag for a footnote return link, if the
-	// HTML_FOOTNOTE_RETURN_LINKS flag is enabled. If blank, the string
-	// <sup>[return]</sup> is used.
-	FootnoteReturnLinkContents string
-	// If set, add this text to the front of each Header ID, to ensure
-	// uniqueness.
-	HeaderIDPrefix string
-	// If set, add this text to the back of each Header ID, to ensure uniqueness.
-	HeaderIDSuffix string
-}
-
-// Html is a type that implements the Renderer interface for HTML output.
-//
-// Do not create this directly, instead use the HtmlRenderer function.
-type Html struct {
-	flags    int    // HTML_* options
-	closeTag string // how to end singleton tags: either " />" or ">"
-	title    string // document title
-	css      string // optional css file url (used with HTML_COMPLETE_PAGE)
-
-	parameters HtmlRendererParameters
-
-	// table of contents data
-	tocMarker    int
-	headerCount  int
-	currentLevel int
-	toc          *bytes.Buffer
-
-	// Track header IDs to prevent ID collision in a single generation.
-	headerIDs map[string]int
-
-	smartypants *smartypantsRenderer
-}
-
-const (
-	xhtmlClose = " />"
-	htmlClose  = ">"
-)
-
-// HtmlRenderer creates and configures an Html object, which
-// satisfies the Renderer interface.
-//
-// flags is a set of HTML_* options ORed together.
-// title is the title of the document, and css is a URL for the document's
-// stylesheet.
-// title and css are only used when HTML_COMPLETE_PAGE is selected.
-func HtmlRenderer(flags int, title string, css string) Renderer {
-	return HtmlRendererWithParameters(flags, title, css, HtmlRendererParameters{})
-}
-
-func HtmlRendererWithParameters(flags int, title string,
-	css string, renderParameters HtmlRendererParameters) Renderer {
-	// configure the rendering engine
-	closeTag := htmlClose
-	if flags&HTML_USE_XHTML != 0 {
-		closeTag = xhtmlClose
-	}
-
-	if renderParameters.FootnoteReturnLinkContents == "" {
-		renderParameters.FootnoteReturnLinkContents = `<sup>[return]</sup>`
-	}
-
-	return &Html{
-		flags:      flags,
-		closeTag:   closeTag,
-		title:      title,
-		css:        css,
-		parameters: renderParameters,
-
-		headerCount:  0,
-		currentLevel: 0,
-		toc:          new(bytes.Buffer),
-
-		headerIDs: make(map[string]int),
-
-		smartypants: smartypants(flags),
-	}
-}
-
-// Using if statements is a bit faster than a switch statement. As the compiler
-// improves, this should be unnecessary this is only worthwhile because
-// attrEscape is the single largest CPU user in normal use.
-// Also tried using map, but that gave a ~3x slowdown.
-func escapeSingleChar(char byte) (string, bool) {
-	if char == '"' {
-		return "&quot;", true
-	}
-	if char == '&' {
-		return "&amp;", true
-	}
-	if char == '<' {
-		return "&lt;", true
-	}
-	if char == '>' {
-		return "&gt;", true
-	}
-	return "", false
-}
-
-func attrEscape(out *bytes.Buffer, src []byte) {
-	org := 0
-	for i, ch := range src {
-		if entity, ok := escapeSingleChar(ch); ok {
-			if i > org {
-				// copy all the normal characters since the last escape
-				out.Write(src[org:i])
-			}
-			org = i + 1
-			out.WriteString(entity)
-		}
-	}
-	if org < len(src) {
-		out.Write(src[org:])
-	}
-}
-
-func entityEscapeWithSkip(out *bytes.Buffer, src []byte, skipRanges [][]int) {
-	end := 0
-	for _, rang := range skipRanges {
-		attrEscape(out, src[end:rang[0]])
-		out.Write(src[rang[0]:rang[1]])
-		end = rang[1]
-	}
-	attrEscape(out, src[end:])
-}
-
-func (options *Html) GetFlags() int {
-	return options.flags
-}
-
-func (options *Html) TitleBlock(out *bytes.Buffer, text []byte) {
-	text = bytes.TrimPrefix(text, []byte("% "))
-	text = bytes.Replace(text, []byte("\n% "), []byte("\n"), -1)
-	out.WriteString("<h1 class=\"title\">")
-	out.Write(text)
-	out.WriteString("\n</h1>")
-}
-
-func (options *Html) Header(out *bytes.Buffer, text func() bool, level int, id string) {
-	marker := out.Len()
-	doubleSpace(out)
-
-	if id == "" && options.flags&HTML_TOC != 0 {
-		id = fmt.Sprintf("toc_%d", options.headerCount)
-	}
-
-	if id != "" {
-		id = options.ensureUniqueHeaderID(id)
-
-		if options.parameters.HeaderIDPrefix != "" {
-			id = options.parameters.HeaderIDPrefix + id
-		}
-
-		if options.parameters.HeaderIDSuffix != "" {
-			id = id + options.parameters.HeaderIDSuffix
-		}
-
-		out.WriteString(fmt.Sprintf("<h%d id=\"%s\">", level, id))
-	} else {
-		out.WriteString(fmt.Sprintf("<h%d>", level))
-	}
-
-	tocMarker := out.Len()
-	if !text() {
-		out.Truncate(marker)
-		return
-	}
-
-	// are we building a table of contents?
-	if options.flags&HTML_TOC != 0 {
-		options.TocHeaderWithAnchor(out.Bytes()[tocMarker:], level, id)
-	}
-
-	out.WriteString(fmt.Sprintf("</h%d>\n", level))
-}
-
-func (options *Html) BlockHtml(out *bytes.Buffer, text []byte) {
-	if options.flags&HTML_SKIP_HTML != 0 {
-		return
-	}
-
-	doubleSpace(out)
-	out.Write(text)
-	out.WriteByte('\n')
-}
-
-func (options *Html) HRule(out *bytes.Buffer) {
-	doubleSpace(out)
-	out.WriteString("<hr")
-	out.WriteString(options.closeTag)
-	out.WriteByte('\n')
-}
-
-func (options *Html) BlockCode(out *bytes.Buffer, text []byte, lang string) {
-	doubleSpace(out)
-
-	// parse out the language names/classes
-	count := 0
-	for _, elt := range strings.Fields(lang) {
-		if elt[0] == '.' {
-			elt = elt[1:]
-		}
-		if len(elt) == 0 {
-			continue
-		}
-		if count == 0 {
-			out.WriteString("<pre><code class=\"language-")
-		} else {
-			out.WriteByte(' ')
-		}
-		attrEscape(out, []byte(elt))
-		count++
-	}
-
-	if count == 0 {
-		out.WriteString("<pre><code>")
-	} else {
-		out.WriteString("\">")
-	}
-
-	attrEscape(out, text)
-	out.WriteString("</code></pre>\n")
-}
-
-func (options *Html) BlockQuote(out *bytes.Buffer, text []byte) {
-	doubleSpace(out)
-	out.WriteString("<blockquote>\n")
-	out.Write(text)
-	out.WriteString("</blockquote>\n")
-}
-
-func (options *Html) Table(out *bytes.Buffer, header []byte, body []byte, columnData []int) {
-	doubleSpace(out)
-	out.WriteString("<table>\n<thead>\n")
-	out.Write(header)
-	out.WriteString("</thead>\n\n<tbody>\n")
-	out.Write(body)
-	out.WriteString("</tbody>\n</table>\n")
-}
-
-func (options *Html) TableRow(out *bytes.Buffer, text []byte) {
-	doubleSpace(out)
-	out.WriteString("<tr>\n")
-	out.Write(text)
-	out.WriteString("\n</tr>\n")
-}
-
-func (options *Html) TableHeaderCell(out *bytes.Buffer, text []byte, align int) {
-	doubleSpace(out)
-	switch align {
-	case TABLE_ALIGNMENT_LEFT:
-		out.WriteString("<th align=\"left\">")
-	case TABLE_ALIGNMENT_RIGHT:
-		out.WriteString("<th align=\"right\">")
-	case TABLE_ALIGNMENT_CENTER:
-		out.WriteString("<th align=\"center\">")
-	default:
-		out.WriteString("<th>")
-	}
-
-	out.Write(text)
-	out.WriteString("</th>")
-}
-
-func (options *Html) TableCell(out *bytes.Buffer, text []byte, align int) {
-	doubleSpace(out)
-	switch align {
-	case TABLE_ALIGNMENT_LEFT:
-		out.WriteString("<td align=\"left\">")
-	case TABLE_ALIGNMENT_RIGHT:
-		out.WriteString("<td align=\"right\">")
-	case TABLE_ALIGNMENT_CENTER:
-		out.WriteString("<td align=\"center\">")
-	default:
-		out.WriteString("<td>")
-	}
-
-	out.Write(text)
-	out.WriteString("</td>")
-}
-
-func (options *Html) Footnotes(out *bytes.Buffer, text func() bool) {
-	out.WriteString("<div class=\"footnotes\">\n")
-	options.HRule(out)
-	options.List(out, text, LIST_TYPE_ORDERED)
-	out.WriteString("</div>\n")
-}
-
-func (options *Html) FootnoteItem(out *bytes.Buffer, name, text []byte, flags int) {
-	if flags&LIST_ITEM_CONTAINS_BLOCK != 0 || flags&LIST_ITEM_BEGINNING_OF_LIST != 0 {
-		doubleSpace(out)
-	}
-	slug := slugify(name)
-	out.WriteString(`<li id="`)
-	out.WriteString(`fn:`)
-	out.WriteString(options.parameters.FootnoteAnchorPrefix)
-	out.Write(slug)
-	out.WriteString(`">`)
-	out.Write(text)
-	if options.flags&HTML_FOOTNOTE_RETURN_LINKS != 0 {
-		out.WriteString(` <a class="footnote-return" href="#`)
-		out.WriteString(`fnref:`)
-		out.WriteString(options.parameters.FootnoteAnchorPrefix)
-		out.Write(slug)
-		out.WriteString(`">`)
-		out.WriteString(options.parameters.FootnoteReturnLinkContents)
-		out.WriteString(`</a>`)
-	}
-	out.WriteString("</li>\n")
-}
-
-func (options *Html) List(out *bytes.Buffer, text func() bool, flags int) {
-	marker := out.Len()
-	doubleSpace(out)
-
-	if flags&LIST_TYPE_DEFINITION != 0 {
-		out.WriteString("<dl>")
-	} else if flags&LIST_TYPE_ORDERED != 0 {
-		out.WriteString("<ol>")
-	} else {
-		out.WriteString("<ul>")
-	}
-	if !text() {
-		out.Truncate(marker)
-		return
-	}
-	if flags&LIST_TYPE_DEFINITION != 0 {
-		out.WriteString("</dl>\n")
-	} else if flags&LIST_TYPE_ORDERED != 0 {
-		out.WriteString("</ol>\n")
-	} else {
-		out.WriteString("</ul>\n")
-	}
-}
-
-func (options *Html) ListItem(out *bytes.Buffer, text []byte, flags int) {
-	if (flags&LIST_ITEM_CONTAINS_BLOCK != 0 && flags&LIST_TYPE_DEFINITION == 0) ||
-		flags&LIST_ITEM_BEGINNING_OF_LIST != 0 {
-		doubleSpace(out)
-	}
-	if flags&LIST_TYPE_TERM != 0 {
-		out.WriteString("<dt>")
-	} else if flags&LIST_TYPE_DEFINITION != 0 {
-		out.WriteString("<dd>")
-	} else {
-		out.WriteString("<li>")
-	}
-	out.Write(text)
-	if flags&LIST_TYPE_TERM != 0 {
-		out.WriteString("</dt>\n")
-	} else if flags&LIST_TYPE_DEFINITION != 0 {
-		out.WriteString("</dd>\n")
-	} else {
-		out.WriteString("</li>\n")
-	}
-}
-
-func (options *Html) Paragraph(out *bytes.Buffer, text func() bool) {
-	marker := out.Len()
-	doubleSpace(out)
-
-	out.WriteString("<p>")
-	if !text() {
-		out.Truncate(marker)
-		return
-	}
-	out.WriteString("</p>\n")
-}
-
-func (options *Html) AutoLink(out *bytes.Buffer, link []byte, kind int) {
-	skipRanges := htmlEntity.FindAllIndex(link, -1)
-	if options.flags&HTML_SAFELINK != 0 && !isSafeLink(link) && kind != LINK_TYPE_EMAIL {
-		// mark it but don't link it if it is not a safe link: no smartypants
-		out.WriteString("<tt>")
-		entityEscapeWithSkip(out, link, skipRanges)
-		out.WriteString("</tt>")
-		return
-	}
-
-	out.WriteString("<a href=\"")
-	if kind == LINK_TYPE_EMAIL {
-		out.WriteString("mailto:")
-	} else {
-		options.maybeWriteAbsolutePrefix(out, link)
-	}
-
-	entityEscapeWithSkip(out, link, skipRanges)
-
-	var relAttrs []string
-	if options.flags&HTML_NOFOLLOW_LINKS != 0 && !isRelativeLink(link) {
-		relAttrs = append(relAttrs, "nofollow")
-	}
-	if options.flags&HTML_NOREFERRER_LINKS != 0 && !isRelativeLink(link) {
-		relAttrs = append(relAttrs, "noreferrer")
-	}
-	if len(relAttrs) > 0 {
-		out.WriteString(fmt.Sprintf("\" rel=\"%s", strings.Join(relAttrs, " ")))
-	}
-
-	// blank target only add to external link
-	if options.flags&HTML_HREF_TARGET_BLANK != 0 && !isRelativeLink(link) {
-		out.WriteString("\" target=\"_blank")
-	}
-
-	out.WriteString("\">")
-
-	// Pretty print: if we get an email address as
-	// an actual URI, e.g. `mailto:foo@bar.com`, we don't
-	// want to print the `mailto:` prefix
-	switch {
-	case bytes.HasPrefix(link, []byte("mailto://")):
-		attrEscape(out, link[len("mailto://"):])
-	case bytes.HasPrefix(link, []byte("mailto:")):
-		attrEscape(out, link[len("mailto:"):])
-	default:
-		entityEscapeWithSkip(out, link, skipRanges)
-	}
-
-	out.WriteString("</a>")
-}
-
-func (options *Html) CodeSpan(out *bytes.Buffer, text []byte) {
-	out.WriteString("<code>")
-	attrEscape(out, text)
-	out.WriteString("</code>")
-}
-
-func (options *Html) DoubleEmphasis(out *bytes.Buffer, text []byte) {
-	out.WriteString("<strong>")
-	out.Write(text)
-	out.WriteString("</strong>")
-}
-
-func (options *Html) Emphasis(out *bytes.Buffer, text []byte) {
-	if len(text) == 0 {
-		return
-	}
-	out.WriteString("<em>")
-	out.Write(text)
-	out.WriteString("</em>")
-}
-
-func (options *Html) maybeWriteAbsolutePrefix(out *bytes.Buffer, link []byte) {
-	if options.parameters.AbsolutePrefix != "" && isRelativeLink(link) && link[0] != '.' {
-		out.WriteString(options.parameters.AbsolutePrefix)
-		if link[0] != '/' {
-			out.WriteByte('/')
-		}
-	}
-}
-
-func (options *Html) Image(out *bytes.Buffer, link []byte, title []byte, alt []byte) {
-	if options.flags&HTML_SKIP_IMAGES != 0 {
-		return
-	}
-
-	out.WriteString("<img src=\"")
-	options.maybeWriteAbsolutePrefix(out, link)
-	attrEscape(out, link)
-	out.WriteString("\" alt=\"")
-	if len(alt) > 0 {
-		attrEscape(out, alt)
-	}
-	if len(title) > 0 {
-		out.WriteString("\" title=\"")
-		attrEscape(out, title)
-	}
-
-	out.WriteByte('"')
-	out.WriteString(options.closeTag)
-}
-
-func (options *Html) LineBreak(out *bytes.Buffer) {
-	out.WriteString("<br")
-	out.WriteString(options.closeTag)
-	out.WriteByte('\n')
-}
-
-func (options *Html) Link(out *bytes.Buffer, link []byte, title []byte, content []byte) {
-	if options.flags&HTML_SKIP_LINKS != 0 {
-		// write the link text out but don't link it, just mark it with typewriter font
-		out.WriteString("<tt>")
-		attrEscape(out, content)
-		out.WriteString("</tt>")
-		return
-	}
-
-	if options.flags&HTML_SAFELINK != 0 && !isSafeLink(link) {
-		// write the link text out but don't link it, just mark it with typewriter font
-		out.WriteString("<tt>")
-		attrEscape(out, content)
-		out.WriteString("</tt>")
-		return
-	}
-
-	out.WriteString("<a href=\"")
-	options.maybeWriteAbsolutePrefix(out, link)
-	attrEscape(out, link)
-	if len(title) > 0 {
-		out.WriteString("\" title=\"")
-		attrEscape(out, title)
-	}
-	var relAttrs []string
-	if options.flags&HTML_NOFOLLOW_LINKS != 0 && !isRelativeLink(link) {
-		relAttrs = append(relAttrs, "nofollow")
-	}
-	if options.flags&HTML_NOREFERRER_LINKS != 0 && !isRelativeLink(link) {
-		relAttrs = append(relAttrs, "noreferrer")
-	}
-	if len(relAttrs) > 0 {
-		out.WriteString(fmt.Sprintf("\" rel=\"%s", strings.Join(relAttrs, " ")))
-	}
-
-	// blank target only add to external link
-	if options.flags&HTML_HREF_TARGET_BLANK != 0 && !isRelativeLink(link) {
-		out.WriteString("\" target=\"_blank")
-	}
-
-	out.WriteString("\">")
-	out.Write(content)
-	out.WriteString("</a>")
-	return
-}
-
-func (options *Html) RawHtmlTag(out *bytes.Buffer, text []byte) {
-	if options.flags&HTML_SKIP_HTML != 0 {
-		return
-	}
-	if options.flags&HTML_SKIP_STYLE != 0 && isHtmlTag(text, "style") {
-		return
-	}
-	if options.flags&HTML_SKIP_LINKS != 0 && isHtmlTag(text, "a") {
-		return
-	}
-	if options.flags&HTML_SKIP_IMAGES != 0 && isHtmlTag(text, "img") {
-		return
-	}
-	out.Write(text)
-}
-
-func (options *Html) TripleEmphasis(out *bytes.Buffer, text []byte) {
-	out.WriteString("<strong><em>")
-	out.Write(text)
-	out.WriteString("</em></strong>")
-}
-
-func (options *Html) StrikeThrough(out *bytes.Buffer, text []byte) {
-	out.WriteString("<del>")
-	out.Write(text)
-	out.WriteString("</del>")
-}
-
-func (options *Html) FootnoteRef(out *bytes.Buffer, ref []byte, id int) {
-	slug := slugify(ref)
-	out.WriteString(`<sup class="footnote-ref" id="`)
-	out.WriteString(`fnref:`)
-	out.WriteString(options.parameters.FootnoteAnchorPrefix)
-	out.Write(slug)
-	out.WriteString(`"><a rel="footnote" href="#`)
-	out.WriteString(`fn:`)
-	out.WriteString(options.parameters.FootnoteAnchorPrefix)
-	out.Write(slug)
-	out.WriteString(`">`)
-	out.WriteString(strconv.Itoa(id))
-	out.WriteString(`</a></sup>`)
-}
-
-func (options *Html) Entity(out *bytes.Buffer, entity []byte) {
-	out.Write(entity)
-}
-
-func (options *Html) NormalText(out *bytes.Buffer, text []byte) {
-	if options.flags&HTML_USE_SMARTYPANTS != 0 {
-		options.Smartypants(out, text)
-	} else {
-		attrEscape(out, text)
-	}
-}
-
-func (options *Html) Smartypants(out *bytes.Buffer, text []byte) {
-	smrt := smartypantsData{false, false}
-
-	// first do normal entity escaping
-	var escaped bytes.Buffer
-	attrEscape(&escaped, text)
-	text = escaped.Bytes()
-
-	mark := 0
-	for i := 0; i < len(text); i++ {
-		if action := options.smartypants[text[i]]; action != nil {
-			if i > mark {
-				out.Write(text[mark:i])
-			}
-
-			previousChar := byte(0)
-			if i > 0 {
-				previousChar = text[i-1]
-			}
-			i += action(out, &smrt, previousChar, text[i:])
-			mark = i + 1
-		}
-	}
-
-	if mark < len(text) {
-		out.Write(text[mark:])
-	}
-}
-
-func (options *Html) DocumentHeader(out *bytes.Buffer) {
-	if options.flags&HTML_COMPLETE_PAGE == 0 {
-		return
-	}
-
-	ending := ""
-	if options.flags&HTML_USE_XHTML != 0 {
-		out.WriteString("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" ")
-		out.WriteString("\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n")
-		out.WriteString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n")
-		ending = " /"
-	} else {
-		out.WriteString("<!DOCTYPE html>\n")
-		out.WriteString("<html>\n")
-	}
-	out.WriteString("<head>\n")
-	out.WriteString("  <title>")
-	options.NormalText(out, []byte(options.title))
-	out.WriteString("</title>\n")
-	out.WriteString("  <meta name=\"GENERATOR\" content=\"Blackfriday Markdown Processor v")
-	out.WriteString(VERSION)
-	out.WriteString("\"")
-	out.WriteString(ending)
-	out.WriteString(">\n")
-	out.WriteString("  <meta charset=\"utf-8\"")
-	out.WriteString(ending)
-	out.WriteString(">\n")
-	if options.css != "" {
-		out.WriteString("  <link rel=\"stylesheet\" type=\"text/css\" href=\"")
-		attrEscape(out, []byte(options.css))
-		out.WriteString("\"")
-		out.WriteString(ending)
-		out.WriteString(">\n")
-	}
-	out.WriteString("</head>\n")
-	out.WriteString("<body>\n")
-
-	options.tocMarker = out.Len()
-}
-
-func (options *Html) DocumentFooter(out *bytes.Buffer) {
-	// finalize and insert the table of contents
-	if options.flags&HTML_TOC != 0 {
-		options.TocFinalize()
-
-		// now we have to insert the table of contents into the document
-		var temp bytes.Buffer
-
-		// start by making a copy of everything after the document header
-		temp.Write(out.Bytes()[options.tocMarker:])
-
-		// now clear the copied material from the main output buffer
-		out.Truncate(options.tocMarker)
-
-		// corner case spacing issue
-		if options.flags&HTML_COMPLETE_PAGE != 0 {
-			out.WriteByte('\n')
-		}
-
-		// insert the table of contents
-		out.WriteString("<nav>\n")
-		out.Write(options.toc.Bytes())
-		out.WriteString("</nav>\n")
-
-		// corner case spacing issue
-		if options.flags&HTML_COMPLETE_PAGE == 0 && options.flags&HTML_OMIT_CONTENTS == 0 {
-			out.WriteByte('\n')
-		}
-
-		// write out everything that came after it
-		if options.flags&HTML_OMIT_CONTENTS == 0 {
-			out.Write(temp.Bytes())
-		}
-	}
-
-	if options.flags&HTML_COMPLETE_PAGE != 0 {
-		out.WriteString("\n</body>\n")
-		out.WriteString("</html>\n")
-	}
-
-}
-
-func (options *Html) TocHeaderWithAnchor(text []byte, level int, anchor string) {
-	for level > options.currentLevel {
-		switch {
-		case bytes.HasSuffix(options.toc.Bytes(), []byte("</li>\n")):
-			// this sublist can nest underneath a header
-			size := options.toc.Len()
-			options.toc.Truncate(size - len("</li>\n"))
-
-		case options.currentLevel > 0:
-			options.toc.WriteString("<li>")
-		}
-		if options.toc.Len() > 0 {
-			options.toc.WriteByte('\n')
-		}
-		options.toc.WriteString("<ul>\n")
-		options.currentLevel++
-	}
-
-	for level < options.currentLevel {
-		options.toc.WriteString("</ul>")
-		if options.currentLevel > 1 {
-			options.toc.WriteString("</li>\n")
-		}
-		options.currentLevel--
-	}
-
-	options.toc.WriteString("<li><a href=\"#")
-	if anchor != "" {
-		options.toc.WriteString(anchor)
-	} else {
-		options.toc.WriteString("toc_")
-		options.toc.WriteString(strconv.Itoa(options.headerCount))
-	}
-	options.toc.WriteString("\">")
-	options.headerCount++
-
-	options.toc.Write(text)
-
-	options.toc.WriteString("</a></li>\n")
-}
-
-func (options *Html) TocHeader(text []byte, level int) {
-	options.TocHeaderWithAnchor(text, level, "")
-}
-
-func (options *Html) TocFinalize() {
-	for options.currentLevel > 1 {
-		options.toc.WriteString("</ul></li>\n")
-		options.currentLevel--
-	}
-
-	if options.currentLevel > 0 {
-		options.toc.WriteString("</ul>\n")
-	}
-}
-
-func isHtmlTag(tag []byte, tagname string) bool {
-	found, _ := findHtmlTagPos(tag, tagname)
-	return found
-}
-
-// Look for a character, but ignore it when it's in any kind of quotes, it
-// might be JavaScript
-func skipUntilCharIgnoreQuotes(html []byte, start int, char byte) int {
-	inSingleQuote := false
-	inDoubleQuote := false
-	inGraveQuote := false
-	i := start
-	for i < len(html) {
-		switch {
-		case html[i] == char && !inSingleQuote && !inDoubleQuote && !inGraveQuote:
-			return i
-		case html[i] == '\'':
-			inSingleQuote = !inSingleQuote
-		case html[i] == '"':
-			inDoubleQuote = !inDoubleQuote
-		case html[i] == '`':
-			inGraveQuote = !inGraveQuote
-		}
-		i++
-	}
-	return start
-}
-
-func findHtmlTagPos(tag []byte, tagname string) (bool, int) {
-	i := 0
-	if i < len(tag) && tag[0] != '<' {
-		return false, -1
-	}
-	i++
-	i = skipSpace(tag, i)
-
-	if i < len(tag) && tag[i] == '/' {
-		i++
-	}
-
-	i = skipSpace(tag, i)
-	j := 0
-	for ; i < len(tag); i, j = i+1, j+1 {
-		if j >= len(tagname) {
-			break
-		}
-
-		if strings.ToLower(string(tag[i]))[0] != tagname[j] {
-			return false, -1
-		}
-	}
-
-	if i == len(tag) {
-		return false, -1
-	}
-
-	rightAngle := skipUntilCharIgnoreQuotes(tag, i, '>')
-	if rightAngle > i {
-		return true, rightAngle
-	}
-
-	return false, -1
-}
-
-func skipUntilChar(text []byte, start int, char byte) int {
-	i := start
-	for i < len(text) && text[i] != char {
-		i++
-	}
-	return i
-}
-
-func skipSpace(tag []byte, i int) int {
-	for i < len(tag) && isspace(tag[i]) {
-		i++
-	}
-	return i
-}
-
-func skipChar(data []byte, start int, char byte) int {
-	i := start
-	for i < len(data) && data[i] == char {
-		i++
-	}
-	return i
-}
-
-func doubleSpace(out *bytes.Buffer) {
-	if out.Len() > 0 {
-		out.WriteByte('\n')
-	}
-}
-
-func isRelativeLink(link []byte) (yes bool) {
-	// a tag begin with '#'
-	if link[0] == '#' {
-		return true
-	}
-
-	// link begin with '/' but not '//', the second maybe a protocol relative link
-	if len(link) >= 2 && link[0] == '/' && link[1] != '/' {
-		return true
-	}
-
-	// only the root '/'
-	if len(link) == 1 && link[0] == '/' {
-		return true
-	}
-
-	// current directory : begin with "./"
-	if bytes.HasPrefix(link, []byte("./")) {
-		return true
-	}
-
-	// parent directory : begin with "../"
-	if bytes.HasPrefix(link, []byte("../")) {
-		return true
-	}
-
-	return false
-}
-
-func (options *Html) ensureUniqueHeaderID(id string) string {
-	for count, found := options.headerIDs[id]; found; count, found = options.headerIDs[id] {
-		tmp := fmt.Sprintf("%s-%d", id, count+1)
-
-		if _, tmpFound := options.headerIDs[tmp]; !tmpFound {
-			options.headerIDs[id] = count + 1
-			id = tmp
-		} else {
-			id = id + "-1"
-		}
-	}
-
-	if _, found := options.headerIDs[id]; !found {
-		options.headerIDs[id] = 0
-	}
-
-	return id
-}
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/inline.go b/Godeps/_workspace/src/github.com/russross/blackfriday/inline.go
deleted file mode 100644
index a28bb660d4..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/inline.go
+++ /dev/null
@@ -1,1133 +0,0 @@
-//
-// Blackfriday Markdown Processor
-// Available at http://github.com/russross/blackfriday
-//
-// Copyright © 2011 Russ Ross <russ@russross.com>.
-// Distributed under the Simplified BSD License.
-// See README.md for details.
-//
-
-//
-// Functions to parse inline elements.
-//
-
-package blackfriday
-
-import (
-	"bytes"
-	"regexp"
-	"strconv"
-)
-
-var (
-	urlRe    = `((https?|ftp):\/\/|\/)[-A-Za-z0-9+&@#\/%?=~_|!:,.;\(\)]+`
-	anchorRe = regexp.MustCompile(`^(<a\shref="` + urlRe + `"(\stitle="[^"<>]+")?\s?>` + urlRe + `<\/a>)`)
-)
-
-// Functions to parse text within a block
-// Each function returns the number of chars taken care of
-// data is the complete block being rendered
-// offset is the number of valid chars before the current cursor
-
-func (p *parser) inline(out *bytes.Buffer, data []byte) {
-	// this is called recursively: enforce a maximum depth
-	if p.nesting >= p.maxNesting {
-		return
-	}
-	p.nesting++
-
-	i, end := 0, 0
-	for i < len(data) {
-		// copy inactive chars into the output
-		for end < len(data) && p.inlineCallback[data[end]] == nil {
-			end++
-		}
-
-		p.r.NormalText(out, data[i:end])
-
-		if end >= len(data) {
-			break
-		}
-		i = end
-
-		// call the trigger
-		handler := p.inlineCallback[data[end]]
-		if consumed := handler(p, out, data, i); consumed == 0 {
-			// no action from the callback; buffer the byte for later
-			end = i + 1
-		} else {
-			// skip past whatever the callback used
-			i += consumed
-			end = i
-		}
-	}
-
-	p.nesting--
-}
-
-// single and double emphasis parsing
-func emphasis(p *parser, out *bytes.Buffer, data []byte, offset int) int {
-	data = data[offset:]
-	c := data[0]
-	ret := 0
-
-	if len(data) > 2 && data[1] != c {
-		// whitespace cannot follow an opening emphasis;
-		// strikethrough only takes two characters '~~'
-		if c == '~' || isspace(data[1]) {
-			return 0
-		}
-		if ret = helperEmphasis(p, out, data[1:], c); ret == 0 {
-			return 0
-		}
-
-		return ret + 1
-	}
-
-	if len(data) > 3 && data[1] == c && data[2] != c {
-		if isspace(data[2]) {
-			return 0
-		}
-		if ret = helperDoubleEmphasis(p, out, data[2:], c); ret == 0 {
-			return 0
-		}
-
-		return ret + 2
-	}
-
-	if len(data) > 4 && data[1] == c && data[2] == c && data[3] != c {
-		if c == '~' || isspace(data[3]) {
-			return 0
-		}
-		if ret = helperTripleEmphasis(p, out, data, 3, c); ret == 0 {
-			return 0
-		}
-
-		return ret + 3
-	}
-
-	return 0
-}
-
-func codeSpan(p *parser, out *bytes.Buffer, data []byte, offset int) int {
-	data = data[offset:]
-
-	nb := 0
-
-	// count the number of backticks in the delimiter
-	for nb < len(data) && data[nb] == '`' {
-		nb++
-	}
-
-	// find the next delimiter
-	i, end := 0, 0
-	for end = nb; end < len(data) && i < nb; end++ {
-		if data[end] == '`' {
-			i++
-		} else {
-			i = 0
-		}
-	}
-
-	// no matching delimiter?
-	if i < nb && end >= len(data) {
-		return 0
-	}
-
-	// trim outside whitespace
-	fBegin := nb
-	for fBegin < end && data[fBegin] == ' ' {
-		fBegin++
-	}
-
-	fEnd := end - nb
-	for fEnd > fBegin && data[fEnd-1] == ' ' {
-		fEnd--
-	}
-
-	// render the code span
-	if fBegin != fEnd {
-		p.r.CodeSpan(out, data[fBegin:fEnd])
-	}
-
-	return end
-
-}
-
-// newline preceded by two spaces becomes <br>
-// newline without two spaces works when EXTENSION_HARD_LINE_BREAK is enabled
-func lineBreak(p *parser, out *bytes.Buffer, data []byte, offset int) int {
-	// remove trailing spaces from out
-	outBytes := out.Bytes()
-	end := len(outBytes)
-	eol := end
-	for eol > 0 && outBytes[eol-1] == ' ' {
-		eol--
-	}
-	out.Truncate(eol)
-
-	precededByTwoSpaces := offset >= 2 && data[offset-2] == ' ' && data[offset-1] == ' '
-	precededByBackslash := offset >= 1 && data[offset-1] == '\\' // see http://spec.commonmark.org/0.18/#example-527
-	precededByBackslash = precededByBackslash && p.flags&EXTENSION_BACKSLASH_LINE_BREAK != 0
-
-	// should there be a hard line break here?
-	if p.flags&EXTENSION_HARD_LINE_BREAK == 0 && !precededByTwoSpaces && !precededByBackslash {
-		return 0
-	}
-
-	if precededByBackslash && eol > 0 {
-		out.Truncate(eol - 1)
-	}
-	p.r.LineBreak(out)
-	return 1
-}
-
-type linkType int
-
-const (
-	linkNormal linkType = iota
-	linkImg
-	linkDeferredFootnote
-	linkInlineFootnote
-)
-
-func isReferenceStyleLink(data []byte, pos int, t linkType) bool {
-	if t == linkDeferredFootnote {
-		return false
-	}
-	return pos < len(data)-1 && data[pos] == '[' && data[pos+1] != '^'
-}
-
-// '[': parse a link or an image or a footnote
-func link(p *parser, out *bytes.Buffer, data []byte, offset int) int {
-	// no links allowed inside regular links, footnote, and deferred footnotes
-	if p.insideLink && (offset > 0 && data[offset-1] == '[' || len(data)-1 > offset && data[offset+1] == '^') {
-		return 0
-	}
-
-	var t linkType
-	switch {
-	// special case: ![^text] == deferred footnote (that follows something with
-	// an exclamation point)
-	case p.flags&EXTENSION_FOOTNOTES != 0 && len(data)-1 > offset && data[offset+1] == '^':
-		t = linkDeferredFootnote
-	// ![alt] == image
-	case offset > 0 && data[offset-1] == '!':
-		t = linkImg
-	// ^[text] == inline footnote
-	// [^refId] == deferred footnote
-	case p.flags&EXTENSION_FOOTNOTES != 0:
-		if offset > 0 && data[offset-1] == '^' {
-			t = linkInlineFootnote
-		} else if len(data)-1 > offset && data[offset+1] == '^' {
-			t = linkDeferredFootnote
-		}
-	// [text] == regular link
-	default:
-		t = linkNormal
-	}
-
-	data = data[offset:]
-
-	var (
-		i                       = 1
-		noteId                  int
-		title, link, altContent []byte
-		textHasNl               = false
-	)
-
-	if t == linkDeferredFootnote {
-		i++
-	}
-
-	// look for the matching closing bracket
-	for level := 1; level > 0 && i < len(data); i++ {
-		switch {
-		case data[i] == '\n':
-			textHasNl = true
-
-		case data[i-1] == '\\':
-			continue
-
-		case data[i] == '[':
-			level++
-
-		case data[i] == ']':
-			level--
-			if level <= 0 {
-				i-- // compensate for extra i++ in for loop
-			}
-		}
-	}
-
-	if i >= len(data) {
-		return 0
-	}
-
-	txtE := i
-	i++
-
-	// skip any amount of whitespace or newline
-	// (this is much more lax than original markdown syntax)
-	for i < len(data) && isspace(data[i]) {
-		i++
-	}
-
-	// inline style link
-	switch {
-	case i < len(data) && data[i] == '(':
-		// skip initial whitespace
-		i++
-
-		for i < len(data) && isspace(data[i]) {
-			i++
-		}
-
-		linkB := i
-
-		// look for link end: ' " )
-	findlinkend:
-		for i < len(data) {
-			switch {
-			case data[i] == '\\':
-				i += 2
-
-			case data[i] == ')' || data[i] == '\'' || data[i] == '"':
-				break findlinkend
-
-			default:
-				i++
-			}
-		}
-
-		if i >= len(data) {
-			return 0
-		}
-		linkE := i
-
-		// look for title end if present
-		titleB, titleE := 0, 0
-		if data[i] == '\'' || data[i] == '"' {
-			i++
-			titleB = i
-
-		findtitleend:
-			for i < len(data) {
-				switch {
-				case data[i] == '\\':
-					i += 2
-
-				case data[i] == ')':
-					break findtitleend
-
-				default:
-					i++
-				}
-			}
-
-			if i >= len(data) {
-				return 0
-			}
-
-			// skip whitespace after title
-			titleE = i - 1
-			for titleE > titleB && isspace(data[titleE]) {
-				titleE--
-			}
-
-			// check for closing quote presence
-			if data[titleE] != '\'' && data[titleE] != '"' {
-				titleB, titleE = 0, 0
-				linkE = i
-			}
-		}
-
-		// remove whitespace at the end of the link
-		for linkE > linkB && isspace(data[linkE-1]) {
-			linkE--
-		}
-
-		// remove optional angle brackets around the link
-		if data[linkB] == '<' {
-			linkB++
-		}
-		if data[linkE-1] == '>' {
-			linkE--
-		}
-
-		// build escaped link and title
-		if linkE > linkB {
-			link = data[linkB:linkE]
-		}
-
-		if titleE > titleB {
-			title = data[titleB:titleE]
-		}
-
-		i++
-
-	// reference style link
-	case isReferenceStyleLink(data, i, t):
-		var id []byte
-		altContentConsidered := false
-
-		// look for the id
-		i++
-		linkB := i
-		for i < len(data) && data[i] != ']' {
-			i++
-		}
-		if i >= len(data) {
-			return 0
-		}
-		linkE := i
-
-		// find the reference
-		if linkB == linkE {
-			if textHasNl {
-				var b bytes.Buffer
-
-				for j := 1; j < txtE; j++ {
-					switch {
-					case data[j] != '\n':
-						b.WriteByte(data[j])
-					case data[j-1] != ' ':
-						b.WriteByte(' ')
-					}
-				}
-
-				id = b.Bytes()
-			} else {
-				id = data[1:txtE]
-				altContentConsidered = true
-			}
-		} else {
-			id = data[linkB:linkE]
-		}
-
-		// find the reference with matching id
-		lr, ok := p.getRef(string(id))
-		if !ok {
-			return 0
-		}
-
-		// keep link and title from reference
-		link = lr.link
-		title = lr.title
-		if altContentConsidered {
-			altContent = lr.text
-		}
-		i++
-
-	// shortcut reference style link or reference or inline footnote
-	default:
-		var id []byte
-
-		// craft the id
-		if textHasNl {
-			var b bytes.Buffer
-
-			for j := 1; j < txtE; j++ {
-				switch {
-				case data[j] != '\n':
-					b.WriteByte(data[j])
-				case data[j-1] != ' ':
-					b.WriteByte(' ')
-				}
-			}
-
-			id = b.Bytes()
-		} else {
-			if t == linkDeferredFootnote {
-				id = data[2:txtE] // get rid of the ^
-			} else {
-				id = data[1:txtE]
-			}
-		}
-
-		if t == linkInlineFootnote {
-			// create a new reference
-			noteId = len(p.notes) + 1
-
-			var fragment []byte
-			if len(id) > 0 {
-				if len(id) < 16 {
-					fragment = make([]byte, len(id))
-				} else {
-					fragment = make([]byte, 16)
-				}
-				copy(fragment, slugify(id))
-			} else {
-				fragment = append([]byte("footnote-"), []byte(strconv.Itoa(noteId))...)
-			}
-
-			ref := &reference{
-				noteId:   noteId,
-				hasBlock: false,
-				link:     fragment,
-				title:    id,
-			}
-
-			p.notes = append(p.notes, ref)
-
-			link = ref.link
-			title = ref.title
-		} else {
-			// find the reference with matching id
-			lr, ok := p.getRef(string(id))
-			if !ok {
-				return 0
-			}
-
-			if t == linkDeferredFootnote {
-				lr.noteId = len(p.notes) + 1
-				p.notes = append(p.notes, lr)
-			}
-
-			// keep link and title from reference
-			link = lr.link
-			// if inline footnote, title == footnote contents
-			title = lr.title
-			noteId = lr.noteId
-		}
-
-		// rewind the whitespace
-		i = txtE + 1
-	}
-
-	// build content: img alt is escaped, link content is parsed
-	var content bytes.Buffer
-	if txtE > 1 {
-		if t == linkImg {
-			content.Write(data[1:txtE])
-		} else {
-			// links cannot contain other links, so turn off link parsing temporarily
-			insideLink := p.insideLink
-			p.insideLink = true
-			p.inline(&content, data[1:txtE])
-			p.insideLink = insideLink
-		}
-	}
-
-	var uLink []byte
-	if t == linkNormal || t == linkImg {
-		if len(link) > 0 {
-			var uLinkBuf bytes.Buffer
-			unescapeText(&uLinkBuf, link)
-			uLink = uLinkBuf.Bytes()
-		}
-
-		// links need something to click on and somewhere to go
-		if len(uLink) == 0 || (t == linkNormal && content.Len() == 0) {
-			return 0
-		}
-	}
-
-	// call the relevant rendering function
-	switch t {
-	case linkNormal:
-		if len(altContent) > 0 {
-			p.r.Link(out, uLink, title, altContent)
-		} else {
-			p.r.Link(out, uLink, title, content.Bytes())
-		}
-
-	case linkImg:
-		outSize := out.Len()
-		outBytes := out.Bytes()
-		if outSize > 0 && outBytes[outSize-1] == '!' {
-			out.Truncate(outSize - 1)
-		}
-
-		p.r.Image(out, uLink, title, content.Bytes())
-
-	case linkInlineFootnote:
-		outSize := out.Len()
-		outBytes := out.Bytes()
-		if outSize > 0 && outBytes[outSize-1] == '^' {
-			out.Truncate(outSize - 1)
-		}
-
-		p.r.FootnoteRef(out, link, noteId)
-
-	case linkDeferredFootnote:
-		p.r.FootnoteRef(out, link, noteId)
-
-	default:
-		return 0
-	}
-
-	return i
-}
-
-func (p *parser) inlineHtmlComment(out *bytes.Buffer, data []byte) int {
-	if len(data) < 5 {
-		return 0
-	}
-	if data[0] != '<' || data[1] != '!' || data[2] != '-' || data[3] != '-' {
-		return 0
-	}
-	i := 5
-	// scan for an end-of-comment marker, across lines if necessary
-	for i < len(data) && !(data[i-2] == '-' && data[i-1] == '-' && data[i] == '>') {
-		i++
-	}
-	// no end-of-comment marker
-	if i >= len(data) {
-		return 0
-	}
-	return i + 1
-}
-
-// '<' when tags or autolinks are allowed
-func leftAngle(p *parser, out *bytes.Buffer, data []byte, offset int) int {
-	data = data[offset:]
-	altype := LINK_TYPE_NOT_AUTOLINK
-	end := tagLength(data, &altype)
-	if size := p.inlineHtmlComment(out, data); size > 0 {
-		end = size
-	}
-	if end > 2 {
-		if altype != LINK_TYPE_NOT_AUTOLINK {
-			var uLink bytes.Buffer
-			unescapeText(&uLink, data[1:end+1-2])
-			if uLink.Len() > 0 {
-				p.r.AutoLink(out, uLink.Bytes(), altype)
-			}
-		} else {
-			p.r.RawHtmlTag(out, data[:end])
-		}
-	}
-
-	return end
-}
-
-// '\\' backslash escape
-var escapeChars = []byte("\\`*_{}[]()#+-.!:|&<>~")
-
-func escape(p *parser, out *bytes.Buffer, data []byte, offset int) int {
-	data = data[offset:]
-
-	if len(data) > 1 {
-		if bytes.IndexByte(escapeChars, data[1]) < 0 {
-			return 0
-		}
-
-		p.r.NormalText(out, data[1:2])
-	}
-
-	return 2
-}
-
-func unescapeText(ob *bytes.Buffer, src []byte) {
-	i := 0
-	for i < len(src) {
-		org := i
-		for i < len(src) && src[i] != '\\' {
-			i++
-		}
-
-		if i > org {
-			ob.Write(src[org:i])
-		}
-
-		if i+1 >= len(src) {
-			break
-		}
-
-		ob.WriteByte(src[i+1])
-		i += 2
-	}
-}
-
-// '&' escaped when it doesn't belong to an entity
-// valid entities are assumed to be anything matching &#?[A-Za-z0-9]+;
-func entity(p *parser, out *bytes.Buffer, data []byte, offset int) int {
-	data = data[offset:]
-
-	end := 1
-
-	if end < len(data) && data[end] == '#' {
-		end++
-	}
-
-	for end < len(data) && isalnum(data[end]) {
-		end++
-	}
-
-	if end < len(data) && data[end] == ';' {
-		end++ // real entity
-	} else {
-		return 0 // lone '&'
-	}
-
-	p.r.Entity(out, data[:end])
-
-	return end
-}
-
-func linkEndsWithEntity(data []byte, linkEnd int) bool {
-	entityRanges := htmlEntity.FindAllIndex(data[:linkEnd], -1)
-	return entityRanges != nil && entityRanges[len(entityRanges)-1][1] == linkEnd
-}
-
-func autoLink(p *parser, out *bytes.Buffer, data []byte, offset int) int {
-	// quick check to rule out most false hits on ':'
-	if p.insideLink || len(data) < offset+3 || data[offset+1] != '/' || data[offset+2] != '/' {
-		return 0
-	}
-
-	// Now a more expensive check to see if we're not inside an anchor element
-	anchorStart := offset
-	offsetFromAnchor := 0
-	for anchorStart > 0 && data[anchorStart] != '<' {
-		anchorStart--
-		offsetFromAnchor++
-	}
-
-	anchorStr := anchorRe.Find(data[anchorStart:])
-	if anchorStr != nil {
-		out.Write(anchorStr[offsetFromAnchor:])
-		return len(anchorStr) - offsetFromAnchor
-	}
-
-	// scan backward for a word boundary
-	rewind := 0
-	for offset-rewind > 0 && rewind <= 7 && isletter(data[offset-rewind-1]) {
-		rewind++
-	}
-	if rewind > 6 { // longest supported protocol is "mailto" which has 6 letters
-		return 0
-	}
-
-	origData := data
-	data = data[offset-rewind:]
-
-	if !isSafeLink(data) {
-		return 0
-	}
-
-	linkEnd := 0
-	for linkEnd < len(data) && !isEndOfLink(data[linkEnd]) {
-		linkEnd++
-	}
-
-	// Skip punctuation at the end of the link
-	if (data[linkEnd-1] == '.' || data[linkEnd-1] == ',') && data[linkEnd-2] != '\\' {
-		linkEnd--
-	}
-
-	// But don't skip semicolon if it's a part of escaped entity:
-	if data[linkEnd-1] == ';' && data[linkEnd-2] != '\\' && !linkEndsWithEntity(data, linkEnd) {
-		linkEnd--
-	}
-
-	// See if the link finishes with a punctuation sign that can be closed.
-	var copen byte
-	switch data[linkEnd-1] {
-	case '"':
-		copen = '"'
-	case '\'':
-		copen = '\''
-	case ')':
-		copen = '('
-	case ']':
-		copen = '['
-	case '}':
-		copen = '{'
-	default:
-		copen = 0
-	}
-
-	if copen != 0 {
-		bufEnd := offset - rewind + linkEnd - 2
-
-		openDelim := 1
-
-		/* Try to close the final punctuation sign in this same line;
-		 * if we managed to close it outside of the URL, that means that it's
-		 * not part of the URL. If it closes inside the URL, that means it
-		 * is part of the URL.
-		 *
-		 * Examples:
-		 *
-		 *      foo http://www.pokemon.com/Pikachu_(Electric) bar
-		 *              => http://www.pokemon.com/Pikachu_(Electric)
-		 *
-		 *      foo (http://www.pokemon.com/Pikachu_(Electric)) bar
-		 *              => http://www.pokemon.com/Pikachu_(Electric)
-		 *
-		 *      foo http://www.pokemon.com/Pikachu_(Electric)) bar
-		 *              => http://www.pokemon.com/Pikachu_(Electric))
-		 *
-		 *      (foo http://www.pokemon.com/Pikachu_(Electric)) bar
-		 *              => foo http://www.pokemon.com/Pikachu_(Electric)
-		 */
-
-		for bufEnd >= 0 && origData[bufEnd] != '\n' && openDelim != 0 {
-			if origData[bufEnd] == data[linkEnd-1] {
-				openDelim++
-			}
-
-			if origData[bufEnd] == copen {
-				openDelim--
-			}
-
-			bufEnd--
-		}
-
-		if openDelim == 0 {
-			linkEnd--
-		}
-	}
-
-	// we were triggered on the ':', so we need to rewind the output a bit
-	if out.Len() >= rewind {
-		out.Truncate(len(out.Bytes()) - rewind)
-	}
-
-	var uLink bytes.Buffer
-	unescapeText(&uLink, data[:linkEnd])
-
-	if uLink.Len() > 0 {
-		p.r.AutoLink(out, uLink.Bytes(), LINK_TYPE_NORMAL)
-	}
-
-	return linkEnd - rewind
-}
-
-func isEndOfLink(char byte) bool {
-	return isspace(char) || char == '<'
-}
-
-var validUris = [][]byte{[]byte("http://"), []byte("https://"), []byte("ftp://"), []byte("mailto://")}
-var validPaths = [][]byte{[]byte("/"), []byte("./"), []byte("../")}
-
-func isSafeLink(link []byte) bool {
-	for _, path := range validPaths {
-		if len(link) >= len(path) && bytes.Equal(link[:len(path)], path) {
-			if len(link) == len(path) {
-				return true
-			} else if isalnum(link[len(path)]) {
-				return true
-			}
-		}
-	}
-
-	for _, prefix := range validUris {
-		// TODO: handle unicode here
-		// case-insensitive prefix test
-		if len(link) > len(prefix) && bytes.Equal(bytes.ToLower(link[:len(prefix)]), prefix) && isalnum(link[len(prefix)]) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// return the length of the given tag, or 0 is it's not valid
-func tagLength(data []byte, autolink *int) int {
-	var i, j int
-
-	// a valid tag can't be shorter than 3 chars
-	if len(data) < 3 {
-		return 0
-	}
-
-	// begins with a '<' optionally followed by '/', followed by letter or number
-	if data[0] != '<' {
-		return 0
-	}
-	if data[1] == '/' {
-		i = 2
-	} else {
-		i = 1
-	}
-
-	if !isalnum(data[i]) {
-		return 0
-	}
-
-	// scheme test
-	*autolink = LINK_TYPE_NOT_AUTOLINK
-
-	// try to find the beginning of an URI
-	for i < len(data) && (isalnum(data[i]) || data[i] == '.' || data[i] == '+' || data[i] == '-') {
-		i++
-	}
-
-	if i > 1 && i < len(data) && data[i] == '@' {
-		if j = isMailtoAutoLink(data[i:]); j != 0 {
-			*autolink = LINK_TYPE_EMAIL
-			return i + j
-		}
-	}
-
-	if i > 2 && i < len(data) && data[i] == ':' {
-		*autolink = LINK_TYPE_NORMAL
-		i++
-	}
-
-	// complete autolink test: no whitespace or ' or "
-	switch {
-	case i >= len(data):
-		*autolink = LINK_TYPE_NOT_AUTOLINK
-	case *autolink != 0:
-		j = i
-
-		for i < len(data) {
-			if data[i] == '\\' {
-				i += 2
-			} else if data[i] == '>' || data[i] == '\'' || data[i] == '"' || isspace(data[i]) {
-				break
-			} else {
-				i++
-			}
-
-		}
-
-		if i >= len(data) {
-			return 0
-		}
-		if i > j && data[i] == '>' {
-			return i + 1
-		}
-
-		// one of the forbidden chars has been found
-		*autolink = LINK_TYPE_NOT_AUTOLINK
-	}
-
-	// look for something looking like a tag end
-	for i < len(data) && data[i] != '>' {
-		i++
-	}
-	if i >= len(data) {
-		return 0
-	}
-	return i + 1
-}
-
-// look for the address part of a mail autolink and '>'
-// this is less strict than the original markdown e-mail address matching
-func isMailtoAutoLink(data []byte) int {
-	nb := 0
-
-	// address is assumed to be: [-@._a-zA-Z0-9]+ with exactly one '@'
-	for i := 0; i < len(data); i++ {
-		if isalnum(data[i]) {
-			continue
-		}
-
-		switch data[i] {
-		case '@':
-			nb++
-
-		case '-', '.', '_':
-			break
-
-		case '>':
-			if nb == 1 {
-				return i + 1
-			} else {
-				return 0
-			}
-		default:
-			return 0
-		}
-	}
-
-	return 0
-}
-
-// look for the next emph char, skipping other constructs
-func helperFindEmphChar(data []byte, c byte) int {
-	i := 0
-
-	for i < len(data) {
-		for i < len(data) && data[i] != c && data[i] != '`' && data[i] != '[' {
-			i++
-		}
-		if i >= len(data) {
-			return 0
-		}
-		// do not count escaped chars
-		if i != 0 && data[i-1] == '\\' {
-			i++
-			continue
-		}
-		if data[i] == c {
-			return i
-		}
-
-		if data[i] == '`' {
-			// skip a code span
-			tmpI := 0
-			i++
-			for i < len(data) && data[i] != '`' {
-				if tmpI == 0 && data[i] == c {
-					tmpI = i
-				}
-				i++
-			}
-			if i >= len(data) {
-				return tmpI
-			}
-			i++
-		} else if data[i] == '[' {
-			// skip a link
-			tmpI := 0
-			i++
-			for i < len(data) && data[i] != ']' {
-				if tmpI == 0 && data[i] == c {
-					tmpI = i
-				}
-				i++
-			}
-			i++
-			for i < len(data) && (data[i] == ' ' || data[i] == '\n') {
-				i++
-			}
-			if i >= len(data) {
-				return tmpI
-			}
-			if data[i] != '[' && data[i] != '(' { // not a link
-				if tmpI > 0 {
-					return tmpI
-				} else {
-					continue
-				}
-			}
-			cc := data[i]
-			i++
-			for i < len(data) && data[i] != cc {
-				if tmpI == 0 && data[i] == c {
-					return i
-				}
-				i++
-			}
-			if i >= len(data) {
-				return tmpI
-			}
-			i++
-		}
-	}
-	return 0
-}
-
-func helperEmphasis(p *parser, out *bytes.Buffer, data []byte, c byte) int {
-	i := 0
-
-	// skip one symbol if coming from emph3
-	if len(data) > 1 && data[0] == c && data[1] == c {
-		i = 1
-	}
-
-	for i < len(data) {
-		length := helperFindEmphChar(data[i:], c)
-		if length == 0 {
-			return 0
-		}
-		i += length
-		if i >= len(data) {
-			return 0
-		}
-
-		if i+1 < len(data) && data[i+1] == c {
-			i++
-			continue
-		}
-
-		if data[i] == c && !isspace(data[i-1]) {
-
-			if p.flags&EXTENSION_NO_INTRA_EMPHASIS != 0 {
-				if !(i+1 == len(data) || isspace(data[i+1]) || ispunct(data[i+1])) {
-					continue
-				}
-			}
-
-			var work bytes.Buffer
-			p.inline(&work, data[:i])
-			p.r.Emphasis(out, work.Bytes())
-			return i + 1
-		}
-	}
-
-	return 0
-}
-
-func helperDoubleEmphasis(p *parser, out *bytes.Buffer, data []byte, c byte) int {
-	i := 0
-
-	for i < len(data) {
-		length := helperFindEmphChar(data[i:], c)
-		if length == 0 {
-			return 0
-		}
-		i += length
-
-		if i+1 < len(data) && data[i] == c && data[i+1] == c && i > 0 && !isspace(data[i-1]) {
-			var work bytes.Buffer
-			p.inline(&work, data[:i])
-
-			if work.Len() > 0 {
-				// pick the right renderer
-				if c == '~' {
-					p.r.StrikeThrough(out, work.Bytes())
-				} else {
-					p.r.DoubleEmphasis(out, work.Bytes())
-				}
-			}
-			return i + 2
-		}
-		i++
-	}
-	return 0
-}
-
-func helperTripleEmphasis(p *parser, out *bytes.Buffer, data []byte, offset int, c byte) int {
-	i := 0
-	origData := data
-	data = data[offset:]
-
-	for i < len(data) {
-		length := helperFindEmphChar(data[i:], c)
-		if length == 0 {
-			return 0
-		}
-		i += length
-
-		// skip whitespace preceded symbols
-		if data[i] != c || isspace(data[i-1]) {
-			continue
-		}
-
-		switch {
-		case i+2 < len(data) && data[i+1] == c && data[i+2] == c:
-			// triple symbol found
-			var work bytes.Buffer
-
-			p.inline(&work, data[:i])
-			if work.Len() > 0 {
-				p.r.TripleEmphasis(out, work.Bytes())
-			}
-			return i + 3
-		case (i+1 < len(data) && data[i+1] == c):
-			// double symbol found, hand over to emph1
-			length = helperEmphasis(p, out, origData[offset-2:], c)
-			if length == 0 {
-				return 0
-			} else {
-				return length - 2
-			}
-		default:
-			// single symbol found, hand over to emph2
-			length = helperDoubleEmphasis(p, out, origData[offset-1:], c)
-			if length == 0 {
-				return 0
-			} else {
-				return length - 1
-			}
-		}
-	}
-	return 0
-}
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/latex.go b/Godeps/_workspace/src/github.com/russross/blackfriday/latex.go
deleted file mode 100644
index 70705aa9c1..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/latex.go
+++ /dev/null
@@ -1,332 +0,0 @@
-//
-// Blackfriday Markdown Processor
-// Available at http://github.com/russross/blackfriday
-//
-// Copyright © 2011 Russ Ross <russ@russross.com>.
-// Distributed under the Simplified BSD License.
-// See README.md for details.
-//
-
-//
-//
-// LaTeX rendering backend
-//
-//
-
-package blackfriday
-
-import (
-	"bytes"
-)
-
-// Latex is a type that implements the Renderer interface for LaTeX output.
-//
-// Do not create this directly, instead use the LatexRenderer function.
-type Latex struct {
-}
-
-// LatexRenderer creates and configures a Latex object, which
-// satisfies the Renderer interface.
-//
-// flags is a set of LATEX_* options ORed together (currently no such options
-// are defined).
-func LatexRenderer(flags int) Renderer {
-	return &Latex{}
-}
-
-func (options *Latex) GetFlags() int {
-	return 0
-}
-
-// render code chunks using verbatim, or listings if we have a language
-func (options *Latex) BlockCode(out *bytes.Buffer, text []byte, lang string) {
-	if lang == "" {
-		out.WriteString("\n\\begin{verbatim}\n")
-	} else {
-		out.WriteString("\n\\begin{lstlisting}[language=")
-		out.WriteString(lang)
-		out.WriteString("]\n")
-	}
-	out.Write(text)
-	if lang == "" {
-		out.WriteString("\n\\end{verbatim}\n")
-	} else {
-		out.WriteString("\n\\end{lstlisting}\n")
-	}
-}
-
-func (options *Latex) TitleBlock(out *bytes.Buffer, text []byte) {
-
-}
-
-func (options *Latex) BlockQuote(out *bytes.Buffer, text []byte) {
-	out.WriteString("\n\\begin{quotation}\n")
-	out.Write(text)
-	out.WriteString("\n\\end{quotation}\n")
-}
-
-func (options *Latex) BlockHtml(out *bytes.Buffer, text []byte) {
-	// a pretty lame thing to do...
-	out.WriteString("\n\\begin{verbatim}\n")
-	out.Write(text)
-	out.WriteString("\n\\end{verbatim}\n")
-}
-
-func (options *Latex) Header(out *bytes.Buffer, text func() bool, level int, id string) {
-	marker := out.Len()
-
-	switch level {
-	case 1:
-		out.WriteString("\n\\section{")
-	case 2:
-		out.WriteString("\n\\subsection{")
-	case 3:
-		out.WriteString("\n\\subsubsection{")
-	case 4:
-		out.WriteString("\n\\paragraph{")
-	case 5:
-		out.WriteString("\n\\subparagraph{")
-	case 6:
-		out.WriteString("\n\\textbf{")
-	}
-	if !text() {
-		out.Truncate(marker)
-		return
-	}
-	out.WriteString("}\n")
-}
-
-func (options *Latex) HRule(out *bytes.Buffer) {
-	out.WriteString("\n\\HRule\n")
-}
-
-func (options *Latex) List(out *bytes.Buffer, text func() bool, flags int) {
-	marker := out.Len()
-	if flags&LIST_TYPE_ORDERED != 0 {
-		out.WriteString("\n\\begin{enumerate}\n")
-	} else {
-		out.WriteString("\n\\begin{itemize}\n")
-	}
-	if !text() {
-		out.Truncate(marker)
-		return
-	}
-	if flags&LIST_TYPE_ORDERED != 0 {
-		out.WriteString("\n\\end{enumerate}\n")
-	} else {
-		out.WriteString("\n\\end{itemize}\n")
-	}
-}
-
-func (options *Latex) ListItem(out *bytes.Buffer, text []byte, flags int) {
-	out.WriteString("\n\\item ")
-	out.Write(text)
-}
-
-func (options *Latex) Paragraph(out *bytes.Buffer, text func() bool) {
-	marker := out.Len()
-	out.WriteString("\n")
-	if !text() {
-		out.Truncate(marker)
-		return
-	}
-	out.WriteString("\n")
-}
-
-func (options *Latex) Table(out *bytes.Buffer, header []byte, body []byte, columnData []int) {
-	out.WriteString("\n\\begin{tabular}{")
-	for _, elt := range columnData {
-		switch elt {
-		case TABLE_ALIGNMENT_LEFT:
-			out.WriteByte('l')
-		case TABLE_ALIGNMENT_RIGHT:
-			out.WriteByte('r')
-		default:
-			out.WriteByte('c')
-		}
-	}
-	out.WriteString("}\n")
-	out.Write(header)
-	out.WriteString(" \\\\\n\\hline\n")
-	out.Write(body)
-	out.WriteString("\n\\end{tabular}\n")
-}
-
-func (options *Latex) TableRow(out *bytes.Buffer, text []byte) {
-	if out.Len() > 0 {
-		out.WriteString(" \\\\\n")
-	}
-	out.Write(text)
-}
-
-func (options *Latex) TableHeaderCell(out *bytes.Buffer, text []byte, align int) {
-	if out.Len() > 0 {
-		out.WriteString(" & ")
-	}
-	out.Write(text)
-}
-
-func (options *Latex) TableCell(out *bytes.Buffer, text []byte, align int) {
-	if out.Len() > 0 {
-		out.WriteString(" & ")
-	}
-	out.Write(text)
-}
-
-// TODO: this
-func (options *Latex) Footnotes(out *bytes.Buffer, text func() bool) {
-
-}
-
-func (options *Latex) FootnoteItem(out *bytes.Buffer, name, text []byte, flags int) {
-
-}
-
-func (options *Latex) AutoLink(out *bytes.Buffer, link []byte, kind int) {
-	out.WriteString("\\href{")
-	if kind == LINK_TYPE_EMAIL {
-		out.WriteString("mailto:")
-	}
-	out.Write(link)
-	out.WriteString("}{")
-	out.Write(link)
-	out.WriteString("}")
-}
-
-func (options *Latex) CodeSpan(out *bytes.Buffer, text []byte) {
-	out.WriteString("\\texttt{")
-	escapeSpecialChars(out, text)
-	out.WriteString("}")
-}
-
-func (options *Latex) DoubleEmphasis(out *bytes.Buffer, text []byte) {
-	out.WriteString("\\textbf{")
-	out.Write(text)
-	out.WriteString("}")
-}
-
-func (options *Latex) Emphasis(out *bytes.Buffer, text []byte) {
-	out.WriteString("\\textit{")
-	out.Write(text)
-	out.WriteString("}")
-}
-
-func (options *Latex) Image(out *bytes.Buffer, link []byte, title []byte, alt []byte) {
-	if bytes.HasPrefix(link, []byte("http://")) || bytes.HasPrefix(link, []byte("https://")) {
-		// treat it like a link
-		out.WriteString("\\href{")
-		out.Write(link)
-		out.WriteString("}{")
-		out.Write(alt)
-		out.WriteString("}")
-	} else {
-		out.WriteString("\\includegraphics{")
-		out.Write(link)
-		out.WriteString("}")
-	}
-}
-
-func (options *Latex) LineBreak(out *bytes.Buffer) {
-	out.WriteString(" \\\\\n")
-}
-
-func (options *Latex) Link(out *bytes.Buffer, link []byte, title []byte, content []byte) {
-	out.WriteString("\\href{")
-	out.Write(link)
-	out.WriteString("}{")
-	out.Write(content)
-	out.WriteString("}")
-}
-
-func (options *Latex) RawHtmlTag(out *bytes.Buffer, tag []byte) {
-}
-
-func (options *Latex) TripleEmphasis(out *bytes.Buffer, text []byte) {
-	out.WriteString("\\textbf{\\textit{")
-	out.Write(text)
-	out.WriteString("}}")
-}
-
-func (options *Latex) StrikeThrough(out *bytes.Buffer, text []byte) {
-	out.WriteString("\\sout{")
-	out.Write(text)
-	out.WriteString("}")
-}
-
-// TODO: this
-func (options *Latex) FootnoteRef(out *bytes.Buffer, ref []byte, id int) {
-
-}
-
-func needsBackslash(c byte) bool {
-	for _, r := range []byte("_{}%$&\\~#") {
-		if c == r {
-			return true
-		}
-	}
-	return false
-}
-
-func escapeSpecialChars(out *bytes.Buffer, text []byte) {
-	for i := 0; i < len(text); i++ {
-		// directly copy normal characters
-		org := i
-
-		for i < len(text) && !needsBackslash(text[i]) {
-			i++
-		}
-		if i > org {
-			out.Write(text[org:i])
-		}
-
-		// escape a character
-		if i >= len(text) {
-			break
-		}
-		out.WriteByte('\\')
-		out.WriteByte(text[i])
-	}
-}
-
-func (options *Latex) Entity(out *bytes.Buffer, entity []byte) {
-	// TODO: convert this into a unicode character or something
-	out.Write(entity)
-}
-
-func (options *Latex) NormalText(out *bytes.Buffer, text []byte) {
-	escapeSpecialChars(out, text)
-}
-
-// header and footer
-func (options *Latex) DocumentHeader(out *bytes.Buffer) {
-	out.WriteString("\\documentclass{article}\n")
-	out.WriteString("\n")
-	out.WriteString("\\usepackage{graphicx}\n")
-	out.WriteString("\\usepackage{listings}\n")
-	out.WriteString("\\usepackage[margin=1in]{geometry}\n")
-	out.WriteString("\\usepackage[utf8]{inputenc}\n")
-	out.WriteString("\\usepackage{verbatim}\n")
-	out.WriteString("\\usepackage[normalem]{ulem}\n")
-	out.WriteString("\\usepackage{hyperref}\n")
-	out.WriteString("\n")
-	out.WriteString("\\hypersetup{colorlinks,%\n")
-	out.WriteString("  citecolor=black,%\n")
-	out.WriteString("  filecolor=black,%\n")
-	out.WriteString("  linkcolor=black,%\n")
-	out.WriteString("  urlcolor=black,%\n")
-	out.WriteString("  pdfstartview=FitH,%\n")
-	out.WriteString("  breaklinks=true,%\n")
-	out.WriteString("  pdfauthor={Blackfriday Markdown Processor v")
-	out.WriteString(VERSION)
-	out.WriteString("}}\n")
-	out.WriteString("\n")
-	out.WriteString("\\newcommand{\\HRule}{\\rule{\\linewidth}{0.5mm}}\n")
-	out.WriteString("\\addtolength{\\parskip}{0.5\\baselineskip}\n")
-	out.WriteString("\\parindent=0pt\n")
-	out.WriteString("\n")
-	out.WriteString("\\begin{document}\n")
-}
-
-func (options *Latex) DocumentFooter(out *bytes.Buffer) {
-	out.WriteString("\n\\end{document}\n")
-}
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/markdown.go b/Godeps/_workspace/src/github.com/russross/blackfriday/markdown.go
deleted file mode 100644
index 746905bf35..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/markdown.go
+++ /dev/null
@@ -1,926 +0,0 @@
-//
-// Blackfriday Markdown Processor
-// Available at http://github.com/russross/blackfriday
-//
-// Copyright © 2011 Russ Ross <russ@russross.com>.
-// Distributed under the Simplified BSD License.
-// See README.md for details.
-//
-
-//
-//
-// Markdown parsing and processing
-//
-//
-
-// Blackfriday markdown processor.
-//
-// Translates plain text with simple formatting rules into HTML or LaTeX.
-package blackfriday
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"unicode/utf8"
-)
-
-const VERSION = "1.4"
-
-// These are the supported markdown parsing extensions.
-// OR these values together to select multiple extensions.
-const (
-	EXTENSION_NO_INTRA_EMPHASIS          = 1 << iota // ignore emphasis markers inside words
-	EXTENSION_TABLES                                 // render tables
-	EXTENSION_FENCED_CODE                            // render fenced code blocks
-	EXTENSION_AUTOLINK                               // detect embedded URLs that are not explicitly marked
-	EXTENSION_STRIKETHROUGH                          // strikethrough text using ~~test~~
-	EXTENSION_LAX_HTML_BLOCKS                        // loosen up HTML block parsing rules
-	EXTENSION_SPACE_HEADERS                          // be strict about prefix header rules
-	EXTENSION_HARD_LINE_BREAK                        // translate newlines into line breaks
-	EXTENSION_TAB_SIZE_EIGHT                         // expand tabs to eight spaces instead of four
-	EXTENSION_FOOTNOTES                              // Pandoc-style footnotes
-	EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK             // No need to insert an empty line to start a (code, quote, ordered list, unordered list) block
-	EXTENSION_HEADER_IDS                             // specify header IDs  with {#id}
-	EXTENSION_TITLEBLOCK                             // Titleblock ala pandoc
-	EXTENSION_AUTO_HEADER_IDS                        // Create the header ID from the text
-	EXTENSION_BACKSLASH_LINE_BREAK                   // translate trailing backslashes into line breaks
-	EXTENSION_DEFINITION_LISTS                       // render definition lists
-
-	commonHtmlFlags = 0 |
-		HTML_USE_XHTML |
-		HTML_USE_SMARTYPANTS |
-		HTML_SMARTYPANTS_FRACTIONS |
-		HTML_SMARTYPANTS_DASHES |
-		HTML_SMARTYPANTS_LATEX_DASHES
-
-	commonExtensions = 0 |
-		EXTENSION_NO_INTRA_EMPHASIS |
-		EXTENSION_TABLES |
-		EXTENSION_FENCED_CODE |
-		EXTENSION_AUTOLINK |
-		EXTENSION_STRIKETHROUGH |
-		EXTENSION_SPACE_HEADERS |
-		EXTENSION_HEADER_IDS |
-		EXTENSION_BACKSLASH_LINE_BREAK |
-		EXTENSION_DEFINITION_LISTS
-)
-
-// These are the possible flag values for the link renderer.
-// Only a single one of these values will be used; they are not ORed together.
-// These are mostly of interest if you are writing a new output format.
-const (
-	LINK_TYPE_NOT_AUTOLINK = iota
-	LINK_TYPE_NORMAL
-	LINK_TYPE_EMAIL
-)
-
-// These are the possible flag values for the ListItem renderer.
-// Multiple flag values may be ORed together.
-// These are mostly of interest if you are writing a new output format.
-const (
-	LIST_TYPE_ORDERED = 1 << iota
-	LIST_TYPE_DEFINITION
-	LIST_TYPE_TERM
-	LIST_ITEM_CONTAINS_BLOCK
-	LIST_ITEM_BEGINNING_OF_LIST
-	LIST_ITEM_END_OF_LIST
-)
-
-// These are the possible flag values for the table cell renderer.
-// Only a single one of these values will be used; they are not ORed together.
-// These are mostly of interest if you are writing a new output format.
-const (
-	TABLE_ALIGNMENT_LEFT = 1 << iota
-	TABLE_ALIGNMENT_RIGHT
-	TABLE_ALIGNMENT_CENTER = (TABLE_ALIGNMENT_LEFT | TABLE_ALIGNMENT_RIGHT)
-)
-
-// The size of a tab stop.
-const (
-	TAB_SIZE_DEFAULT = 4
-	TAB_SIZE_EIGHT   = 8
-)
-
-// blockTags is a set of tags that are recognized as HTML block tags.
-// Any of these can be included in markdown text without special escaping.
-var blockTags = map[string]struct{}{
-	"blockquote": struct{}{},
-	"del":        struct{}{},
-	"div":        struct{}{},
-	"dl":         struct{}{},
-	"fieldset":   struct{}{},
-	"form":       struct{}{},
-	"h1":         struct{}{},
-	"h2":         struct{}{},
-	"h3":         struct{}{},
-	"h4":         struct{}{},
-	"h5":         struct{}{},
-	"h6":         struct{}{},
-	"iframe":     struct{}{},
-	"ins":        struct{}{},
-	"math":       struct{}{},
-	"noscript":   struct{}{},
-	"ol":         struct{}{},
-	"pre":        struct{}{},
-	"p":          struct{}{},
-	"script":     struct{}{},
-	"style":      struct{}{},
-	"table":      struct{}{},
-	"ul":         struct{}{},
-
-	// HTML5
-	"address":    struct{}{},
-	"article":    struct{}{},
-	"aside":      struct{}{},
-	"canvas":     struct{}{},
-	"figcaption": struct{}{},
-	"figure":     struct{}{},
-	"footer":     struct{}{},
-	"header":     struct{}{},
-	"hgroup":     struct{}{},
-	"main":       struct{}{},
-	"nav":        struct{}{},
-	"output":     struct{}{},
-	"progress":   struct{}{},
-	"section":    struct{}{},
-	"video":      struct{}{},
-}
-
-// Renderer is the rendering interface.
-// This is mostly of interest if you are implementing a new rendering format.
-//
-// When a byte slice is provided, it contains the (rendered) contents of the
-// element.
-//
-// When a callback is provided instead, it will write the contents of the
-// respective element directly to the output buffer and return true on success.
-// If the callback returns false, the rendering function should reset the
-// output buffer as though it had never been called.
-//
-// Currently Html and Latex implementations are provided
-type Renderer interface {
-	// block-level callbacks
-	BlockCode(out *bytes.Buffer, text []byte, lang string)
-	BlockQuote(out *bytes.Buffer, text []byte)
-	BlockHtml(out *bytes.Buffer, text []byte)
-	Header(out *bytes.Buffer, text func() bool, level int, id string)
-	HRule(out *bytes.Buffer)
-	List(out *bytes.Buffer, text func() bool, flags int)
-	ListItem(out *bytes.Buffer, text []byte, flags int)
-	Paragraph(out *bytes.Buffer, text func() bool)
-	Table(out *bytes.Buffer, header []byte, body []byte, columnData []int)
-	TableRow(out *bytes.Buffer, text []byte)
-	TableHeaderCell(out *bytes.Buffer, text []byte, flags int)
-	TableCell(out *bytes.Buffer, text []byte, flags int)
-	Footnotes(out *bytes.Buffer, text func() bool)
-	FootnoteItem(out *bytes.Buffer, name, text []byte, flags int)
-	TitleBlock(out *bytes.Buffer, text []byte)
-
-	// Span-level callbacks
-	AutoLink(out *bytes.Buffer, link []byte, kind int)
-	CodeSpan(out *bytes.Buffer, text []byte)
-	DoubleEmphasis(out *bytes.Buffer, text []byte)
-	Emphasis(out *bytes.Buffer, text []byte)
-	Image(out *bytes.Buffer, link []byte, title []byte, alt []byte)
-	LineBreak(out *bytes.Buffer)
-	Link(out *bytes.Buffer, link []byte, title []byte, content []byte)
-	RawHtmlTag(out *bytes.Buffer, tag []byte)
-	TripleEmphasis(out *bytes.Buffer, text []byte)
-	StrikeThrough(out *bytes.Buffer, text []byte)
-	FootnoteRef(out *bytes.Buffer, ref []byte, id int)
-
-	// Low-level callbacks
-	Entity(out *bytes.Buffer, entity []byte)
-	NormalText(out *bytes.Buffer, text []byte)
-
-	// Header and footer
-	DocumentHeader(out *bytes.Buffer)
-	DocumentFooter(out *bytes.Buffer)
-
-	GetFlags() int
-}
-
-// Callback functions for inline parsing. One such function is defined
-// for each character that triggers a response when parsing inline data.
-type inlineParser func(p *parser, out *bytes.Buffer, data []byte, offset int) int
-
-// Parser holds runtime state used by the parser.
-// This is constructed by the Markdown function.
-type parser struct {
-	r              Renderer
-	refOverride    ReferenceOverrideFunc
-	refs           map[string]*reference
-	inlineCallback [256]inlineParser
-	flags          int
-	nesting        int
-	maxNesting     int
-	insideLink     bool
-
-	// Footnotes need to be ordered as well as available to quickly check for
-	// presence. If a ref is also a footnote, it's stored both in refs and here
-	// in notes. Slice is nil if footnotes not enabled.
-	notes []*reference
-}
-
-func (p *parser) getRef(refid string) (ref *reference, found bool) {
-	if p.refOverride != nil {
-		r, overridden := p.refOverride(refid)
-		if overridden {
-			if r == nil {
-				return nil, false
-			}
-			return &reference{
-				link:     []byte(r.Link),
-				title:    []byte(r.Title),
-				noteId:   0,
-				hasBlock: false,
-				text:     []byte(r.Text)}, true
-		}
-	}
-	// refs are case insensitive
-	ref, found = p.refs[strings.ToLower(refid)]
-	return ref, found
-}
-
-//
-//
-// Public interface
-//
-//
-
-// Reference represents the details of a link.
-// See the documentation in Options for more details on use-case.
-type Reference struct {
-	// Link is usually the URL the reference points to.
-	Link string
-	// Title is the alternate text describing the link in more detail.
-	Title string
-	// Text is the optional text to override the ref with if the syntax used was
-	// [refid][]
-	Text string
-}
-
-// ReferenceOverrideFunc is expected to be called with a reference string and
-// return either a valid Reference type that the reference string maps to or
-// nil. If overridden is false, the default reference logic will be executed.
-// See the documentation in Options for more details on use-case.
-type ReferenceOverrideFunc func(reference string) (ref *Reference, overridden bool)
-
-// Options represents configurable overrides and callbacks (in addition to the
-// extension flag set) for configuring a Markdown parse.
-type Options struct {
-	// Extensions is a flag set of bit-wise ORed extension bits. See the
-	// EXTENSION_* flags defined in this package.
-	Extensions int
-
-	// ReferenceOverride is an optional function callback that is called every
-	// time a reference is resolved.
-	//
-	// In Markdown, the link reference syntax can be made to resolve a link to
-	// a reference instead of an inline URL, in one of the following ways:
-	//
-	//  * [link text][refid]
-	//  * [refid][]
-	//
-	// Usually, the refid is defined at the bottom of the Markdown document. If
-	// this override function is provided, the refid is passed to the override
-	// function first, before consulting the defined refids at the bottom. If
-	// the override function indicates an override did not occur, the refids at
-	// the bottom will be used to fill in the link details.
-	ReferenceOverride ReferenceOverrideFunc
-}
-
-// MarkdownBasic is a convenience function for simple rendering.
-// It processes markdown input with no extensions enabled.
-func MarkdownBasic(input []byte) []byte {
-	// set up the HTML renderer
-	htmlFlags := HTML_USE_XHTML
-	renderer := HtmlRenderer(htmlFlags, "", "")
-
-	// set up the parser
-	return MarkdownOptions(input, renderer, Options{Extensions: 0})
-}
-
-// Call Markdown with most useful extensions enabled
-// MarkdownCommon is a convenience function for simple rendering.
-// It processes markdown input with common extensions enabled, including:
-//
-// * Smartypants processing with smart fractions and LaTeX dashes
-//
-// * Intra-word emphasis suppression
-//
-// * Tables
-//
-// * Fenced code blocks
-//
-// * Autolinking
-//
-// * Strikethrough support
-//
-// * Strict header parsing
-//
-// * Custom Header IDs
-func MarkdownCommon(input []byte) []byte {
-	// set up the HTML renderer
-	renderer := HtmlRenderer(commonHtmlFlags, "", "")
-	return MarkdownOptions(input, renderer, Options{
-		Extensions: commonExtensions})
-}
-
-// Markdown is the main rendering function.
-// It parses and renders a block of markdown-encoded text.
-// The supplied Renderer is used to format the output, and extensions dictates
-// which non-standard extensions are enabled.
-//
-// To use the supplied Html or LaTeX renderers, see HtmlRenderer and
-// LatexRenderer, respectively.
-func Markdown(input []byte, renderer Renderer, extensions int) []byte {
-	return MarkdownOptions(input, renderer, Options{
-		Extensions: extensions})
-}
-
-// MarkdownOptions is just like Markdown but takes additional options through
-// the Options struct.
-func MarkdownOptions(input []byte, renderer Renderer, opts Options) []byte {
-	// no point in parsing if we can't render
-	if renderer == nil {
-		return nil
-	}
-
-	extensions := opts.Extensions
-
-	// fill in the render structure
-	p := new(parser)
-	p.r = renderer
-	p.flags = extensions
-	p.refOverride = opts.ReferenceOverride
-	p.refs = make(map[string]*reference)
-	p.maxNesting = 16
-	p.insideLink = false
-
-	// register inline parsers
-	p.inlineCallback['*'] = emphasis
-	p.inlineCallback['_'] = emphasis
-	if extensions&EXTENSION_STRIKETHROUGH != 0 {
-		p.inlineCallback['~'] = emphasis
-	}
-	p.inlineCallback['`'] = codeSpan
-	p.inlineCallback['\n'] = lineBreak
-	p.inlineCallback['['] = link
-	p.inlineCallback['<'] = leftAngle
-	p.inlineCallback['\\'] = escape
-	p.inlineCallback['&'] = entity
-
-	if extensions&EXTENSION_AUTOLINK != 0 {
-		p.inlineCallback[':'] = autoLink
-	}
-
-	if extensions&EXTENSION_FOOTNOTES != 0 {
-		p.notes = make([]*reference, 0)
-	}
-
-	first := firstPass(p, input)
-	second := secondPass(p, first)
-	return second
-}
-
-// first pass:
-// - extract references
-// - expand tabs
-// - normalize newlines
-// - copy everything else
-func firstPass(p *parser, input []byte) []byte {
-	var out bytes.Buffer
-	tabSize := TAB_SIZE_DEFAULT
-	if p.flags&EXTENSION_TAB_SIZE_EIGHT != 0 {
-		tabSize = TAB_SIZE_EIGHT
-	}
-	beg, end := 0, 0
-	lastFencedCodeBlockEnd := 0
-	for beg < len(input) { // iterate over lines
-		if end = isReference(p, input[beg:], tabSize); end > 0 {
-			beg += end
-		} else { // skip to the next line
-			end = beg
-			for end < len(input) && input[end] != '\n' && input[end] != '\r' {
-				end++
-			}
-
-			if p.flags&EXTENSION_FENCED_CODE != 0 {
-				// track fenced code block boundaries to suppress tab expansion
-				// inside them:
-				if beg >= lastFencedCodeBlockEnd {
-					if i := p.fencedCode(&out, input[beg:], false); i > 0 {
-						lastFencedCodeBlockEnd = beg + i
-					}
-				}
-			}
-
-			// add the line body if present
-			if end > beg {
-				if end < lastFencedCodeBlockEnd { // Do not expand tabs while inside fenced code blocks.
-					out.Write(input[beg:end])
-				} else {
-					expandTabs(&out, input[beg:end], tabSize)
-				}
-			}
-			out.WriteByte('\n')
-
-			if end < len(input) && input[end] == '\r' {
-				end++
-			}
-			if end < len(input) && input[end] == '\n' {
-				end++
-			}
-
-			beg = end
-		}
-	}
-
-	// empty input?
-	if out.Len() == 0 {
-		out.WriteByte('\n')
-	}
-
-	return out.Bytes()
-}
-
-// second pass: actual rendering
-func secondPass(p *parser, input []byte) []byte {
-	var output bytes.Buffer
-
-	p.r.DocumentHeader(&output)
-	p.block(&output, input)
-
-	if p.flags&EXTENSION_FOOTNOTES != 0 && len(p.notes) > 0 {
-		p.r.Footnotes(&output, func() bool {
-			flags := LIST_ITEM_BEGINNING_OF_LIST
-			for i := 0; i < len(p.notes); i += 1 {
-				ref := p.notes[i]
-				var buf bytes.Buffer
-				if ref.hasBlock {
-					flags |= LIST_ITEM_CONTAINS_BLOCK
-					p.block(&buf, ref.title)
-				} else {
-					p.inline(&buf, ref.title)
-				}
-				p.r.FootnoteItem(&output, ref.link, buf.Bytes(), flags)
-				flags &^= LIST_ITEM_BEGINNING_OF_LIST | LIST_ITEM_CONTAINS_BLOCK
-			}
-
-			return true
-		})
-	}
-
-	p.r.DocumentFooter(&output)
-
-	if p.nesting != 0 {
-		panic("Nesting level did not end at zero")
-	}
-
-	return output.Bytes()
-}
-
-//
-// Link references
-//
-// This section implements support for references that (usually) appear
-// as footnotes in a document, and can be referenced anywhere in the document.
-// The basic format is:
-//
-//    [1]: http://www.google.com/ "Google"
-//    [2]: http://www.github.com/ "Github"
-//
-// Anywhere in the document, the reference can be linked by referring to its
-// label, i.e., 1 and 2 in this example, as in:
-//
-//    This library is hosted on [Github][2], a git hosting site.
-//
-// Actual footnotes as specified in Pandoc and supported by some other Markdown
-// libraries such as php-markdown are also taken care of. They look like this:
-//
-//    This sentence needs a bit of further explanation.[^note]
-//
-//    [^note]: This is the explanation.
-//
-// Footnotes should be placed at the end of the document in an ordered list.
-// Inline footnotes such as:
-//
-//    Inline footnotes^[Not supported.] also exist.
-//
-// are not yet supported.
-
-// References are parsed and stored in this struct.
-type reference struct {
-	link     []byte
-	title    []byte
-	noteId   int // 0 if not a footnote ref
-	hasBlock bool
-	text     []byte
-}
-
-func (r *reference) String() string {
-	return fmt.Sprintf("{link: %q, title: %q, text: %q, noteId: %d, hasBlock: %v}",
-		r.link, r.title, r.text, r.noteId, r.hasBlock)
-}
-
-// Check whether or not data starts with a reference link.
-// If so, it is parsed and stored in the list of references
-// (in the render struct).
-// Returns the number of bytes to skip to move past it,
-// or zero if the first line is not a reference.
-func isReference(p *parser, data []byte, tabSize int) int {
-	// up to 3 optional leading spaces
-	if len(data) < 4 {
-		return 0
-	}
-	i := 0
-	for i < 3 && data[i] == ' ' {
-		i++
-	}
-
-	noteId := 0
-
-	// id part: anything but a newline between brackets
-	if data[i] != '[' {
-		return 0
-	}
-	i++
-	if p.flags&EXTENSION_FOOTNOTES != 0 {
-		if i < len(data) && data[i] == '^' {
-			// we can set it to anything here because the proper noteIds will
-			// be assigned later during the second pass. It just has to be != 0
-			noteId = 1
-			i++
-		}
-	}
-	idOffset := i
-	for i < len(data) && data[i] != '\n' && data[i] != '\r' && data[i] != ']' {
-		i++
-	}
-	if i >= len(data) || data[i] != ']' {
-		return 0
-	}
-	idEnd := i
-
-	// spacer: colon (space | tab)* newline? (space | tab)*
-	i++
-	if i >= len(data) || data[i] != ':' {
-		return 0
-	}
-	i++
-	for i < len(data) && (data[i] == ' ' || data[i] == '\t') {
-		i++
-	}
-	if i < len(data) && (data[i] == '\n' || data[i] == '\r') {
-		i++
-		if i < len(data) && data[i] == '\n' && data[i-1] == '\r' {
-			i++
-		}
-	}
-	for i < len(data) && (data[i] == ' ' || data[i] == '\t') {
-		i++
-	}
-	if i >= len(data) {
-		return 0
-	}
-
-	var (
-		linkOffset, linkEnd   int
-		titleOffset, titleEnd int
-		lineEnd               int
-		raw                   []byte
-		hasBlock              bool
-	)
-
-	if p.flags&EXTENSION_FOOTNOTES != 0 && noteId != 0 {
-		linkOffset, linkEnd, raw, hasBlock = scanFootnote(p, data, i, tabSize)
-		lineEnd = linkEnd
-	} else {
-		linkOffset, linkEnd, titleOffset, titleEnd, lineEnd = scanLinkRef(p, data, i)
-	}
-	if lineEnd == 0 {
-		return 0
-	}
-
-	// a valid ref has been found
-
-	ref := &reference{
-		noteId:   noteId,
-		hasBlock: hasBlock,
-	}
-
-	if noteId > 0 {
-		// reusing the link field for the id since footnotes don't have links
-		ref.link = data[idOffset:idEnd]
-		// if footnote, it's not really a title, it's the contained text
-		ref.title = raw
-	} else {
-		ref.link = data[linkOffset:linkEnd]
-		ref.title = data[titleOffset:titleEnd]
-	}
-
-	// id matches are case-insensitive
-	id := string(bytes.ToLower(data[idOffset:idEnd]))
-
-	p.refs[id] = ref
-
-	return lineEnd
-}
-
-func scanLinkRef(p *parser, data []byte, i int) (linkOffset, linkEnd, titleOffset, titleEnd, lineEnd int) {
-	// link: whitespace-free sequence, optionally between angle brackets
-	if data[i] == '<' {
-		i++
-	}
-	linkOffset = i
-	for i < len(data) && data[i] != ' ' && data[i] != '\t' && data[i] != '\n' && data[i] != '\r' {
-		i++
-	}
-	if i == len(data) {
-		return
-	}
-	linkEnd = i
-	if data[linkOffset] == '<' && data[linkEnd-1] == '>' {
-		linkOffset++
-		linkEnd--
-	}
-
-	// optional spacer: (space | tab)* (newline | '\'' | '"' | '(' )
-	for i < len(data) && (data[i] == ' ' || data[i] == '\t') {
-		i++
-	}
-	if i < len(data) && data[i] != '\n' && data[i] != '\r' && data[i] != '\'' && data[i] != '"' && data[i] != '(' {
-		return
-	}
-
-	// compute end-of-line
-	if i >= len(data) || data[i] == '\r' || data[i] == '\n' {
-		lineEnd = i
-	}
-	if i+1 < len(data) && data[i] == '\r' && data[i+1] == '\n' {
-		lineEnd++
-	}
-
-	// optional (space|tab)* spacer after a newline
-	if lineEnd > 0 {
-		i = lineEnd + 1
-		for i < len(data) && (data[i] == ' ' || data[i] == '\t') {
-			i++
-		}
-	}
-
-	// optional title: any non-newline sequence enclosed in '"() alone on its line
-	if i+1 < len(data) && (data[i] == '\'' || data[i] == '"' || data[i] == '(') {
-		i++
-		titleOffset = i
-
-		// look for EOL
-		for i < len(data) && data[i] != '\n' && data[i] != '\r' {
-			i++
-		}
-		if i+1 < len(data) && data[i] == '\n' && data[i+1] == '\r' {
-			titleEnd = i + 1
-		} else {
-			titleEnd = i
-		}
-
-		// step back
-		i--
-		for i > titleOffset && (data[i] == ' ' || data[i] == '\t') {
-			i--
-		}
-		if i > titleOffset && (data[i] == '\'' || data[i] == '"' || data[i] == ')') {
-			lineEnd = titleEnd
-			titleEnd = i
-		}
-	}
-
-	return
-}
-
-// The first bit of this logic is the same as (*parser).listItem, but the rest
-// is much simpler. This function simply finds the entire block and shifts it
-// over by one tab if it is indeed a block (just returns the line if it's not).
-// blockEnd is the end of the section in the input buffer, and contents is the
-// extracted text that was shifted over one tab. It will need to be rendered at
-// the end of the document.
-func scanFootnote(p *parser, data []byte, i, indentSize int) (blockStart, blockEnd int, contents []byte, hasBlock bool) {
-	if i == 0 || len(data) == 0 {
-		return
-	}
-
-	// skip leading whitespace on first line
-	for i < len(data) && data[i] == ' ' {
-		i++
-	}
-
-	blockStart = i
-
-	// find the end of the line
-	blockEnd = i
-	for i < len(data) && data[i-1] != '\n' {
-		i++
-	}
-
-	// get working buffer
-	var raw bytes.Buffer
-
-	// put the first line into the working buffer
-	raw.Write(data[blockEnd:i])
-	blockEnd = i
-
-	// process the following lines
-	containsBlankLine := false
-
-gatherLines:
-	for blockEnd < len(data) {
-		i++
-
-		// find the end of this line
-		for i < len(data) && data[i-1] != '\n' {
-			i++
-		}
-
-		// if it is an empty line, guess that it is part of this item
-		// and move on to the next line
-		if p.isEmpty(data[blockEnd:i]) > 0 {
-			containsBlankLine = true
-			blockEnd = i
-			continue
-		}
-
-		n := 0
-		if n = isIndented(data[blockEnd:i], indentSize); n == 0 {
-			// this is the end of the block.
-			// we don't want to include this last line in the index.
-			break gatherLines
-		}
-
-		// if there were blank lines before this one, insert a new one now
-		if containsBlankLine {
-			raw.WriteByte('\n')
-			containsBlankLine = false
-		}
-
-		// get rid of that first tab, write to buffer
-		raw.Write(data[blockEnd+n : i])
-		hasBlock = true
-
-		blockEnd = i
-	}
-
-	if data[blockEnd-1] != '\n' {
-		raw.WriteByte('\n')
-	}
-
-	contents = raw.Bytes()
-
-	return
-}
-
-//
-//
-// Miscellaneous helper functions
-//
-//
-
-// Test if a character is a punctuation symbol.
-// Taken from a private function in regexp in the stdlib.
-func ispunct(c byte) bool {
-	for _, r := range []byte("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~") {
-		if c == r {
-			return true
-		}
-	}
-	return false
-}
-
-// Test if a character is a whitespace character.
-func isspace(c byte) bool {
-	return c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v'
-}
-
-// Test if a character is letter.
-func isletter(c byte) bool {
-	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
-}
-
-// Test if a character is a letter or a digit.
-// TODO: check when this is looking for ASCII alnum and when it should use unicode
-func isalnum(c byte) bool {
-	return (c >= '0' && c <= '9') || isletter(c)
-}
-
-// Replace tab characters with spaces, aligning to the next TAB_SIZE column.
-// always ends output with a newline
-func expandTabs(out *bytes.Buffer, line []byte, tabSize int) {
-	// first, check for common cases: no tabs, or only tabs at beginning of line
-	i, prefix := 0, 0
-	slowcase := false
-	for i = 0; i < len(line); i++ {
-		if line[i] == '\t' {
-			if prefix == i {
-				prefix++
-			} else {
-				slowcase = true
-				break
-			}
-		}
-	}
-
-	// no need to decode runes if all tabs are at the beginning of the line
-	if !slowcase {
-		for i = 0; i < prefix*tabSize; i++ {
-			out.WriteByte(' ')
-		}
-		out.Write(line[prefix:])
-		return
-	}
-
-	// the slow case: we need to count runes to figure out how
-	// many spaces to insert for each tab
-	column := 0
-	i = 0
-	for i < len(line) {
-		start := i
-		for i < len(line) && line[i] != '\t' {
-			_, size := utf8.DecodeRune(line[i:])
-			i += size
-			column++
-		}
-
-		if i > start {
-			out.Write(line[start:i])
-		}
-
-		if i >= len(line) {
-			break
-		}
-
-		for {
-			out.WriteByte(' ')
-			column++
-			if column%tabSize == 0 {
-				break
-			}
-		}
-
-		i++
-	}
-}
-
-// Find if a line counts as indented or not.
-// Returns number of characters the indent is (0 = not indented).
-func isIndented(data []byte, indentSize int) int {
-	if len(data) == 0 {
-		return 0
-	}
-	if data[0] == '\t' {
-		return 1
-	}
-	if len(data) < indentSize {
-		return 0
-	}
-	for i := 0; i < indentSize; i++ {
-		if data[i] != ' ' {
-			return 0
-		}
-	}
-	return indentSize
-}
-
-// Create a url-safe slug for fragments
-func slugify(in []byte) []byte {
-	if len(in) == 0 {
-		return in
-	}
-	out := make([]byte, 0, len(in))
-	sym := false
-
-	for _, ch := range in {
-		if isalnum(ch) {
-			sym = false
-			out = append(out, ch)
-		} else if sym {
-			continue
-		} else {
-			out = append(out, '-')
-			sym = true
-		}
-	}
-	var a, b int
-	var ch byte
-	for a, ch = range out {
-		if ch != '-' {
-			break
-		}
-	}
-	for b = len(out) - 1; b > 0; b-- {
-		if out[b] != '-' {
-			break
-		}
-	}
-	return out[a : b+1]
-}
diff --git a/Godeps/_workspace/src/github.com/russross/blackfriday/smartypants.go b/Godeps/_workspace/src/github.com/russross/blackfriday/smartypants.go
deleted file mode 100644
index eeffa5e1e1..0000000000
--- a/Godeps/_workspace/src/github.com/russross/blackfriday/smartypants.go
+++ /dev/null
@@ -1,400 +0,0 @@
-//
-// Blackfriday Markdown Processor
-// Available at http://github.com/russross/blackfriday
-//
-// Copyright © 2011 Russ Ross <russ@russross.com>.
-// Distributed under the Simplified BSD License.
-// See README.md for details.
-//
-
-//
-//
-// SmartyPants rendering
-//
-//
-
-package blackfriday
-
-import (
-	"bytes"
-)
-
-type smartypantsData struct {
-	inSingleQuote bool
-	inDoubleQuote bool
-}
-
-func wordBoundary(c byte) bool {
-	return c == 0 || isspace(c) || ispunct(c)
-}
-
-func tolower(c byte) byte {
-	if c >= 'A' && c <= 'Z' {
-		return c - 'A' + 'a'
-	}
-	return c
-}
-
-func isdigit(c byte) bool {
-	return c >= '0' && c <= '9'
-}
-
-func smartQuoteHelper(out *bytes.Buffer, previousChar byte, nextChar byte, quote byte, isOpen *bool) bool {
-	// edge of the buffer is likely to be a tag that we don't get to see,
-	// so we treat it like text sometimes
-
-	// enumerate all sixteen possibilities for (previousChar, nextChar)
-	// each can be one of {0, space, punct, other}
-	switch {
-	case previousChar == 0 && nextChar == 0:
-		// context is not any help here, so toggle
-		*isOpen = !*isOpen
-	case isspace(previousChar) && nextChar == 0:
-		// [ "] might be [ "<code>foo...]
-		*isOpen = true
-	case ispunct(previousChar) && nextChar == 0:
-		// [!"] hmm... could be [Run!"] or [("<code>...]
-		*isOpen = false
-	case /* isnormal(previousChar) && */ nextChar == 0:
-		// [a"] is probably a close
-		*isOpen = false
-	case previousChar == 0 && isspace(nextChar):
-		// [" ] might be [...foo</code>" ]
-		*isOpen = false
-	case isspace(previousChar) && isspace(nextChar):
-		// [ " ] context is not any help here, so toggle
-		*isOpen = !*isOpen
-	case ispunct(previousChar) && isspace(nextChar):
-		// [!" ] is probably a close
-		*isOpen = false
-	case /* isnormal(previousChar) && */ isspace(nextChar):
-		// [a" ] this is one of the easy cases
-		*isOpen = false
-	case previousChar == 0 && ispunct(nextChar):
-		// ["!] hmm... could be ["$1.95] or [</code>"!...]
-		*isOpen = false
-	case isspace(previousChar) && ispunct(nextChar):
-		// [ "!] looks more like [ "$1.95]
-		*isOpen = true
-	case ispunct(previousChar) && ispunct(nextChar):
-		// [!"!] context is not any help here, so toggle
-		*isOpen = !*isOpen
-	case /* isnormal(previousChar) && */ ispunct(nextChar):
-		// [a"!] is probably a close
-		*isOpen = false
-	case previousChar == 0 /* && isnormal(nextChar) */ :
-		// ["a] is probably an open
-		*isOpen = true
-	case isspace(previousChar) /* && isnormal(nextChar) */ :
-		// [ "a] this is one of the easy cases
-		*isOpen = true
-	case ispunct(previousChar) /* && isnormal(nextChar) */ :
-		// [!"a] is probably an open
-		*isOpen = true
-	default:
-		// [a'b] maybe a contraction?
-		*isOpen = false
-	}
-
-	out.WriteByte('&')
-	if *isOpen {
-		out.WriteByte('l')
-	} else {
-		out.WriteByte('r')
-	}
-	out.WriteByte(quote)
-	out.WriteString("quo;")
-	return true
-}
-
-func smartSingleQuote(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	if len(text) >= 2 {
-		t1 := tolower(text[1])
-
-		if t1 == '\'' {
-			nextChar := byte(0)
-			if len(text) >= 3 {
-				nextChar = text[2]
-			}
-			if smartQuoteHelper(out, previousChar, nextChar, 'd', &smrt.inDoubleQuote) {
-				return 1
-			}
-		}
-
-		if (t1 == 's' || t1 == 't' || t1 == 'm' || t1 == 'd') && (len(text) < 3 || wordBoundary(text[2])) {
-			out.WriteString("&rsquo;")
-			return 0
-		}
-
-		if len(text) >= 3 {
-			t2 := tolower(text[2])
-
-			if ((t1 == 'r' && t2 == 'e') || (t1 == 'l' && t2 == 'l') || (t1 == 'v' && t2 == 'e')) &&
-				(len(text) < 4 || wordBoundary(text[3])) {
-				out.WriteString("&rsquo;")
-				return 0
-			}
-		}
-	}
-
-	nextChar := byte(0)
-	if len(text) > 1 {
-		nextChar = text[1]
-	}
-	if smartQuoteHelper(out, previousChar, nextChar, 's', &smrt.inSingleQuote) {
-		return 0
-	}
-
-	out.WriteByte(text[0])
-	return 0
-}
-
-func smartParens(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	if len(text) >= 3 {
-		t1 := tolower(text[1])
-		t2 := tolower(text[2])
-
-		if t1 == 'c' && t2 == ')' {
-			out.WriteString("&copy;")
-			return 2
-		}
-
-		if t1 == 'r' && t2 == ')' {
-			out.WriteString("&reg;")
-			return 2
-		}
-
-		if len(text) >= 4 && t1 == 't' && t2 == 'm' && text[3] == ')' {
-			out.WriteString("&trade;")
-			return 3
-		}
-	}
-
-	out.WriteByte(text[0])
-	return 0
-}
-
-func smartDash(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	if len(text) >= 2 {
-		if text[1] == '-' {
-			out.WriteString("&mdash;")
-			return 1
-		}
-
-		if wordBoundary(previousChar) && wordBoundary(text[1]) {
-			out.WriteString("&ndash;")
-			return 0
-		}
-	}
-
-	out.WriteByte(text[0])
-	return 0
-}
-
-func smartDashLatex(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	if len(text) >= 3 && text[1] == '-' && text[2] == '-' {
-		out.WriteString("&mdash;")
-		return 2
-	}
-	if len(text) >= 2 && text[1] == '-' {
-		out.WriteString("&ndash;")
-		return 1
-	}
-
-	out.WriteByte(text[0])
-	return 0
-}
-
-func smartAmpVariant(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte, quote byte) int {
-	if bytes.HasPrefix(text, []byte("&quot;")) {
-		nextChar := byte(0)
-		if len(text) >= 7 {
-			nextChar = text[6]
-		}
-		if smartQuoteHelper(out, previousChar, nextChar, quote, &smrt.inDoubleQuote) {
-			return 5
-		}
-	}
-
-	if bytes.HasPrefix(text, []byte("&#0;")) {
-		return 3
-	}
-
-	out.WriteByte('&')
-	return 0
-}
-
-func smartAmp(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	return smartAmpVariant(out, smrt, previousChar, text, 'd')
-}
-
-func smartAmpAngledQuote(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	return smartAmpVariant(out, smrt, previousChar, text, 'a')
-}
-
-func smartPeriod(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	if len(text) >= 3 && text[1] == '.' && text[2] == '.' {
-		out.WriteString("&hellip;")
-		return 2
-	}
-
-	if len(text) >= 5 && text[1] == ' ' && text[2] == '.' && text[3] == ' ' && text[4] == '.' {
-		out.WriteString("&hellip;")
-		return 4
-	}
-
-	out.WriteByte(text[0])
-	return 0
-}
-
-func smartBacktick(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	if len(text) >= 2 && text[1] == '`' {
-		nextChar := byte(0)
-		if len(text) >= 3 {
-			nextChar = text[2]
-		}
-		if smartQuoteHelper(out, previousChar, nextChar, 'd', &smrt.inDoubleQuote) {
-			return 1
-		}
-	}
-
-	out.WriteByte(text[0])
-	return 0
-}
-
-func smartNumberGeneric(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	if wordBoundary(previousChar) && previousChar != '/' && len(text) >= 3 {
-		// is it of the form digits/digits(word boundary)?, i.e., \d+/\d+\b
-		// note: check for regular slash (/) or fraction slash (⁄, 0x2044, or 0xe2 81 84 in utf-8)
-		//       and avoid changing dates like 1/23/2005 into fractions.
-		numEnd := 0
-		for len(text) > numEnd && isdigit(text[numEnd]) {
-			numEnd++
-		}
-		if numEnd == 0 {
-			out.WriteByte(text[0])
-			return 0
-		}
-		denStart := numEnd + 1
-		if len(text) > numEnd+3 && text[numEnd] == 0xe2 && text[numEnd+1] == 0x81 && text[numEnd+2] == 0x84 {
-			denStart = numEnd + 3
-		} else if len(text) < numEnd+2 || text[numEnd] != '/' {
-			out.WriteByte(text[0])
-			return 0
-		}
-		denEnd := denStart
-		for len(text) > denEnd && isdigit(text[denEnd]) {
-			denEnd++
-		}
-		if denEnd == denStart {
-			out.WriteByte(text[0])
-			return 0
-		}
-		if len(text) == denEnd || wordBoundary(text[denEnd]) && text[denEnd] != '/' {
-			out.WriteString("<sup>")
-			out.Write(text[:numEnd])
-			out.WriteString("</sup>&frasl;<sub>")
-			out.Write(text[denStart:denEnd])
-			out.WriteString("</sub>")
-			return denEnd - 1
-		}
-	}
-
-	out.WriteByte(text[0])
-	return 0
-}
-
-func smartNumber(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	if wordBoundary(previousChar) && previousChar != '/' && len(text) >= 3 {
-		if text[0] == '1' && text[1] == '/' && text[2] == '2' {
-			if len(text) < 4 || wordBoundary(text[3]) && text[3] != '/' {
-				out.WriteString("&frac12;")
-				return 2
-			}
-		}
-
-		if text[0] == '1' && text[1] == '/' && text[2] == '4' {
-			if len(text) < 4 || wordBoundary(text[3]) && text[3] != '/' || (len(text) >= 5 && tolower(text[3]) == 't' && tolower(text[4]) == 'h') {
-				out.WriteString("&frac14;")
-				return 2
-			}
-		}
-
-		if text[0] == '3' && text[1] == '/' && text[2] == '4' {
-			if len(text) < 4 || wordBoundary(text[3]) && text[3] != '/' || (len(text) >= 6 && tolower(text[3]) == 't' && tolower(text[4]) == 'h' && tolower(text[5]) == 's') {
-				out.WriteString("&frac34;")
-				return 2
-			}
-		}
-	}
-
-	out.WriteByte(text[0])
-	return 0
-}
-
-func smartDoubleQuoteVariant(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte, quote byte) int {
-	nextChar := byte(0)
-	if len(text) > 1 {
-		nextChar = text[1]
-	}
-	if !smartQuoteHelper(out, previousChar, nextChar, quote, &smrt.inDoubleQuote) {
-		out.WriteString("&quot;")
-	}
-
-	return 0
-}
-
-func smartDoubleQuote(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	return smartDoubleQuoteVariant(out, smrt, previousChar, text, 'd')
-}
-
-func smartAngledDoubleQuote(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	return smartDoubleQuoteVariant(out, smrt, previousChar, text, 'a')
-}
-
-func smartLeftAngle(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int {
-	i := 0
-
-	for i < len(text) && text[i] != '>' {
-		i++
-	}
-
-	out.Write(text[:i+1])
-	return i
-}
-
-type smartCallback func(out *bytes.Buffer, smrt *smartypantsData, previousChar byte, text []byte) int
-
-type smartypantsRenderer [256]smartCallback
-
-func smartypants(flags int) *smartypantsRenderer {
-	r := new(smartypantsRenderer)
-	if flags&HTML_SMARTYPANTS_ANGLED_QUOTES == 0 {
-		r['"'] = smartDoubleQuote
-		r['&'] = smartAmp
-	} else {
-		r['"'] = smartAngledDoubleQuote
-		r['&'] = smartAmpAngledQuote
-	}
-	r['\''] = smartSingleQuote
-	r['('] = smartParens
-	if flags&HTML_SMARTYPANTS_DASHES != 0 {
-		if flags&HTML_SMARTYPANTS_LATEX_DASHES == 0 {
-			r['-'] = smartDash
-		} else {
-			r['-'] = smartDashLatex
-		}
-	}
-	r['.'] = smartPeriod
-	if flags&HTML_SMARTYPANTS_FRACTIONS == 0 {
-		r['1'] = smartNumber
-		r['3'] = smartNumber
-	} else {
-		for ch := '1'; ch <= '9'; ch++ {
-			r[ch] = smartNumberGeneric
-		}
-	}
-	r['<'] = smartLeftAngle
-	r['`'] = smartBacktick
-	return r
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/LICENSE b/Godeps/_workspace/src/github.com/shirou/gopsutil/LICENSE
deleted file mode 100644
index 602b2c098e..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-gopsutil is distributed under BSD license reproduced below.
-
-Copyright (c) 2014, WAKAYAMA Shirou
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- * Neither the name of the gopsutil authors nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go
deleted file mode 100644
index 71535094d4..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package cpu
-
-import (
-	"encoding/json"
-	"runtime"
-	"strconv"
-	"strings"
-)
-
-type TimesStat struct {
-	CPU       string  `json:"cpu"`
-	User      float64 `json:"user"`
-	System    float64 `json:"system"`
-	Idle      float64 `json:"idle"`
-	Nice      float64 `json:"nice"`
-	Iowait    float64 `json:"iowait"`
-	Irq       float64 `json:"irq"`
-	Softirq   float64 `json:"softirq"`
-	Steal     float64 `json:"steal"`
-	Guest     float64 `json:"guest"`
-	GuestNice float64 `json:"guestNice"`
-	Stolen    float64 `json:"stolen"`
-}
-
-type InfoStat struct {
-	CPU        int32    `json:"cpu"`
-	VendorID   string   `json:"vendorId"`
-	Family     string   `json:"family"`
-	Model      string   `json:"model"`
-	Stepping   int32    `json:"stepping"`
-	PhysicalID string   `json:"physicalId"`
-	CoreID     string   `json:"coreId"`
-	Cores      int32    `json:"cores"`
-	ModelName  string   `json:"modelName"`
-	Mhz        float64  `json:"mhz"`
-	CacheSize  int32    `json:"cacheSize"`
-	Flags      []string `json:"flags"`
-}
-
-var lastCPUTimes []TimesStat
-var lastPerCPUTimes []TimesStat
-
-func Counts(logical bool) (int, error) {
-	return runtime.NumCPU(), nil
-}
-
-func (c TimesStat) String() string {
-	v := []string{
-		`"cpu":"` + c.CPU + `"`,
-		`"user":` + strconv.FormatFloat(c.User, 'f', 1, 64),
-		`"system":` + strconv.FormatFloat(c.System, 'f', 1, 64),
-		`"idle":` + strconv.FormatFloat(c.Idle, 'f', 1, 64),
-		`"nice":` + strconv.FormatFloat(c.Nice, 'f', 1, 64),
-		`"iowait":` + strconv.FormatFloat(c.Iowait, 'f', 1, 64),
-		`"irq":` + strconv.FormatFloat(c.Irq, 'f', 1, 64),
-		`"softirq":` + strconv.FormatFloat(c.Softirq, 'f', 1, 64),
-		`"steal":` + strconv.FormatFloat(c.Steal, 'f', 1, 64),
-		`"guest":` + strconv.FormatFloat(c.Guest, 'f', 1, 64),
-		`"guestNice":` + strconv.FormatFloat(c.GuestNice, 'f', 1, 64),
-		`"stolen":` + strconv.FormatFloat(c.Stolen, 'f', 1, 64),
-	}
-
-	return `{` + strings.Join(v, ",") + `}`
-}
-
-// Total returns the total number of seconds in a CPUTimesStat
-func (c TimesStat) Total() float64 {
-	total := c.User + c.System + c.Nice + c.Iowait + c.Irq + c.Softirq + c.Steal +
-		c.Guest + c.GuestNice + c.Idle + c.Stolen
-	return total
-}
-
-func (c InfoStat) String() string {
-	s, _ := json.Marshal(c)
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go
deleted file mode 100644
index fbb74a821f..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// +build darwin
-
-package cpu
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-)
-
-// sys/resource.h
-const (
-	CPUser    = 0
-	CPNice    = 1
-	CPSys     = 2
-	CPIntr    = 3
-	CPIdle    = 4
-	CPUStates = 5
-)
-
-// default value. from time.h
-var ClocksPerSec = float64(128)
-
-func Times(percpu bool) ([]TimesStat, error) {
-	if percpu {
-		return perCPUTimes()
-	}
-
-	return allCPUTimes()
-}
-
-// Returns only one CPUInfoStat on FreeBSD
-func Info() ([]InfoStat, error) {
-	var ret []InfoStat
-	sysctl, err := exec.LookPath("/usr/sbin/sysctl")
-	if err != nil {
-		return ret, err
-	}
-	out, err := exec.Command(sysctl, "machdep.cpu").Output()
-	if err != nil {
-		return ret, err
-	}
-
-	c := InfoStat{}
-	for _, line := range strings.Split(string(out), "\n") {
-		values := strings.Fields(line)
-		if len(values) < 1 {
-			continue
-		}
-
-		t, err := strconv.ParseInt(values[1], 10, 64)
-		// err is not checked here because some value is string.
-		if strings.HasPrefix(line, "machdep.cpu.brand_string") {
-			c.ModelName = strings.Join(values[1:], " ")
-		} else if strings.HasPrefix(line, "machdep.cpu.family") {
-			c.Family = values[1]
-		} else if strings.HasPrefix(line, "machdep.cpu.model") {
-			c.Model = values[1]
-		} else if strings.HasPrefix(line, "machdep.cpu.stepping") {
-			if err != nil {
-				return ret, err
-			}
-			c.Stepping = int32(t)
-		} else if strings.HasPrefix(line, "machdep.cpu.features") {
-			for _, v := range values[1:] {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if strings.HasPrefix(line, "machdep.cpu.leaf7_features") {
-			for _, v := range values[1:] {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if strings.HasPrefix(line, "machdep.cpu.extfeatures") {
-			for _, v := range values[1:] {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if strings.HasPrefix(line, "machdep.cpu.core_count") {
-			if err != nil {
-				return ret, err
-			}
-			c.Cores = int32(t)
-		} else if strings.HasPrefix(line, "machdep.cpu.cache.size") {
-			if err != nil {
-				return ret, err
-			}
-			c.CacheSize = int32(t)
-		} else if strings.HasPrefix(line, "machdep.cpu.vendor") {
-			c.VendorID = values[1]
-		}
-	}
-
-	// Use the rated frequency of the CPU. This is a static value and does not
-	// account for low power or Turbo Boost modes.
-	out, err = exec.Command(sysctl, "hw.cpufrequency").Output()
-	if err != nil {
-		return ret, err
-	}
-
-	values := strings.Fields(string(out))
-	mhz, err := strconv.ParseFloat(values[1], 64)
-	if err != nil {
-		return ret, err
-	}
-	c.Mhz = mhz / 1000000.0
-
-	return append(ret, c), nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
deleted file mode 100644
index ee59fefc06..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// +build darwin
-// +build cgo
-
-package cpu
-
-/*
-#include <stdlib.h>
-#include <sys/sysctl.h>
-#include <sys/mount.h>
-#include <mach/mach_init.h>
-#include <mach/mach_host.h>
-#include <mach/host_info.h>
-#include <libproc.h>
-#include <mach/processor_info.h>
-#include <mach/vm_map.h>
-*/
-import "C"
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"unsafe"
-)
-
-// these CPU times for darwin is borrowed from influxdb/telegraf.
-
-func perCPUTimes() ([]TimesStat, error) {
-	var (
-		count   C.mach_msg_type_number_t
-		cpuload *C.processor_cpu_load_info_data_t
-		ncpu    C.natural_t
-	)
-
-	status := C.host_processor_info(C.host_t(C.mach_host_self()),
-		C.PROCESSOR_CPU_LOAD_INFO,
-		&ncpu,
-		(*C.processor_info_array_t)(unsafe.Pointer(&cpuload)),
-		&count)
-
-	if status != C.KERN_SUCCESS {
-		return nil, fmt.Errorf("host_processor_info error=%d", status)
-	}
-
-	// jump through some cgo casting hoops and ensure we properly free
-	// the memory that cpuload points to
-	target := C.vm_map_t(C.mach_task_self_)
-	address := C.vm_address_t(uintptr(unsafe.Pointer(cpuload)))
-	defer C.vm_deallocate(target, address, C.vm_size_t(ncpu))
-
-	// the body of struct processor_cpu_load_info
-	// aka processor_cpu_load_info_data_t
-	var cpu_ticks [C.CPU_STATE_MAX]uint32
-
-	// copy the cpuload array to a []byte buffer
-	// where we can binary.Read the data
-	size := int(ncpu) * binary.Size(cpu_ticks)
-	buf := C.GoBytes(unsafe.Pointer(cpuload), C.int(size))
-
-	bbuf := bytes.NewBuffer(buf)
-
-	var ret []TimesStat
-
-	for i := 0; i < int(ncpu); i++ {
-		err := binary.Read(bbuf, binary.LittleEndian, &cpu_ticks)
-		if err != nil {
-			return nil, err
-		}
-
-		c := TimesStat{
-			CPU:    fmt.Sprintf("cpu%d", i),
-			User:   float64(cpu_ticks[C.CPU_STATE_USER]) / ClocksPerSec,
-			System: float64(cpu_ticks[C.CPU_STATE_SYSTEM]) / ClocksPerSec,
-			Nice:   float64(cpu_ticks[C.CPU_STATE_NICE]) / ClocksPerSec,
-			Idle:   float64(cpu_ticks[C.CPU_STATE_IDLE]) / ClocksPerSec,
-		}
-
-		ret = append(ret, c)
-	}
-
-	return ret, nil
-}
-
-func allCPUTimes() ([]TimesStat, error) {
-	var count C.mach_msg_type_number_t = C.HOST_CPU_LOAD_INFO_COUNT
-	var cpuload C.host_cpu_load_info_data_t
-
-	status := C.host_statistics(C.host_t(C.mach_host_self()),
-		C.HOST_CPU_LOAD_INFO,
-		C.host_info_t(unsafe.Pointer(&cpuload)),
-		&count)
-
-	if status != C.KERN_SUCCESS {
-		return nil, fmt.Errorf("host_statistics error=%d", status)
-	}
-
-	c := TimesStat{
-		CPU:    "cpu-total",
-		User:   float64(cpuload.cpu_ticks[C.CPU_STATE_USER]) / ClocksPerSec,
-		System: float64(cpuload.cpu_ticks[C.CPU_STATE_SYSTEM]) / ClocksPerSec,
-		Nice:   float64(cpuload.cpu_ticks[C.CPU_STATE_NICE]) / ClocksPerSec,
-		Idle:   float64(cpuload.cpu_ticks[C.CPU_STATE_IDLE]) / ClocksPerSec,
-	}
-
-	return []TimesStat{c}, nil
-
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
deleted file mode 100644
index 242b4a8e79..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build darwin
-// +build !cgo
-
-package cpu
-
-import "github.com/shirou/gopsutil/internal/common"
-
-func perCPUTimes() ([]TimesStat, error) {
-	return []TimesStat{}, common.ErrNotImplementedError
-}
-
-func allCPUTimes() ([]TimesStat, error) {
-	return []TimesStat{}, common.ErrNotImplementedError
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
deleted file mode 100644
index ce1adf3c16..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// +build freebsd
-
-package cpu
-
-import (
-	"fmt"
-	"os/exec"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// sys/resource.h
-const (
-	CPUser    = 0
-	CPNice    = 1
-	CPSys     = 2
-	CPIntr    = 3
-	CPIdle    = 4
-	CPUStates = 5
-)
-
-var ClocksPerSec = float64(128)
-
-func init() {
-	getconf, err := exec.LookPath("/usr/bin/getconf")
-	if err != nil {
-		return
-	}
-	out, err := exec.Command(getconf, "CLK_TCK").Output()
-	// ignore errors
-	if err == nil {
-		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
-		if err == nil {
-			ClocksPerSec = float64(i)
-		}
-	}
-}
-
-func Times(percpu bool) ([]TimesStat, error) {
-	var ret []TimesStat
-
-	var sysctlCall string
-	var ncpu int
-	if percpu {
-		sysctlCall = "kern.cp_times"
-		ncpu, _ = Counts(true)
-	} else {
-		sysctlCall = "kern.cp_time"
-		ncpu = 1
-	}
-
-	cpuTimes, err := common.DoSysctrl(sysctlCall)
-	if err != nil {
-		return ret, err
-	}
-
-	for i := 0; i < ncpu; i++ {
-		offset := CPUStates * i
-		user, err := strconv.ParseFloat(cpuTimes[CPUser+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-		nice, err := strconv.ParseFloat(cpuTimes[CPNice+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-		sys, err := strconv.ParseFloat(cpuTimes[CPSys+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-		idle, err := strconv.ParseFloat(cpuTimes[CPIdle+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-		intr, err := strconv.ParseFloat(cpuTimes[CPIntr+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-
-		c := TimesStat{
-			User:   float64(user / ClocksPerSec),
-			Nice:   float64(nice / ClocksPerSec),
-			System: float64(sys / ClocksPerSec),
-			Idle:   float64(idle / ClocksPerSec),
-			Irq:    float64(intr / ClocksPerSec),
-		}
-		if !percpu {
-			c.CPU = "cpu-total"
-		} else {
-			c.CPU = fmt.Sprintf("cpu%d", i)
-		}
-
-		ret = append(ret, c)
-	}
-
-	return ret, nil
-}
-
-// Returns only one CPUInfoStat on FreeBSD
-func Info() ([]InfoStat, error) {
-	filename := "/var/run/dmesg.boot"
-	lines, _ := common.ReadLines(filename)
-
-	var ret []InfoStat
-
-	c := InfoStat{}
-	for _, line := range lines {
-		if matches := regexp.MustCompile(`CPU:\s+(.+) \(([\d.]+).+\)`).FindStringSubmatch(line); matches != nil {
-			c.ModelName = matches[1]
-			t, err := strconv.ParseFloat(matches[2], 64)
-			if err != nil {
-				return ret, nil
-			}
-			c.Mhz = t
-		} else if matches := regexp.MustCompile(`Origin = "(.+)"  Id = (.+)  Family = (.+)  Model = (.+)  Stepping = (.+)`).FindStringSubmatch(line); matches != nil {
-			c.VendorID = matches[1]
-			c.Family = matches[3]
-			c.Model = matches[4]
-			t, err := strconv.ParseInt(matches[5], 10, 32)
-			if err != nil {
-				return ret, nil
-			}
-			c.Stepping = int32(t)
-		} else if matches := regexp.MustCompile(`Features=.+<(.+)>`).FindStringSubmatch(line); matches != nil {
-			for _, v := range strings.Split(matches[1], ",") {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if matches := regexp.MustCompile(`Features2=[a-f\dx]+<(.+)>`).FindStringSubmatch(line); matches != nil {
-			for _, v := range strings.Split(matches[1], ",") {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if matches := regexp.MustCompile(`Logical CPUs per core: (\d+)`).FindStringSubmatch(line); matches != nil {
-			// FIXME: no this line?
-			t, err := strconv.ParseInt(matches[1], 10, 32)
-			if err != nil {
-				return ret, nil
-			}
-			c.Cores = int32(t)
-		}
-
-	}
-
-	return append(ret, c), nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
deleted file mode 100644
index f7cf4c3649..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
+++ /dev/null
@@ -1,244 +0,0 @@
-// +build linux
-
-package cpu
-
-import (
-	"errors"
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var cpu_tick = float64(100)
-
-func init() {
-	getconf, err := exec.LookPath("/usr/bin/getconf")
-	if err != nil {
-		return
-	}
-	out, err := exec.Command(getconf, "CLK_TCK").Output()
-	// ignore errors
-	if err == nil {
-		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
-		if err == nil {
-			cpu_tick = float64(i)
-		}
-	}
-}
-
-func Times(percpu bool) ([]TimesStat, error) {
-	filename := common.HostProc("stat")
-	var lines = []string{}
-	if percpu {
-		var startIdx uint = 1
-		for {
-			linen, _ := common.ReadLinesOffsetN(filename, startIdx, 1)
-			line := linen[0]
-			if !strings.HasPrefix(line, "cpu") {
-				break
-			}
-			lines = append(lines, line)
-			startIdx++
-		}
-	} else {
-		lines, _ = common.ReadLinesOffsetN(filename, 0, 1)
-	}
-
-	ret := make([]TimesStat, 0, len(lines))
-
-	for _, line := range lines {
-		ct, err := parseStatLine(line)
-		if err != nil {
-			continue
-		}
-		ret = append(ret, *ct)
-
-	}
-	return ret, nil
-}
-
-func sysCPUPath(cpu int32, relPath string) string {
-	return common.HostSys(fmt.Sprintf("devices/system/cpu/cpu%d", cpu), relPath)
-}
-
-func finishCPUInfo(c *InfoStat) error {
-	if c.Mhz == 0 {
-		lines, err := common.ReadLines(sysCPUPath(c.CPU, "cpufreq/cpuinfo_max_freq"))
-		if err == nil {
-			value, err := strconv.ParseFloat(lines[0], 64)
-			if err != nil {
-				return err
-			}
-			c.Mhz = value
-		}
-	}
-	if len(c.CoreID) == 0 {
-		lines, err := common.ReadLines(sysCPUPath(c.CPU, "topology/coreId"))
-		if err == nil {
-			c.CoreID = lines[0]
-		}
-	}
-	return nil
-}
-
-// CPUInfo on linux will return 1 item per physical thread.
-//
-// CPUs have three levels of counting: sockets, cores, threads.
-// Cores with HyperThreading count as having 2 threads per core.
-// Sockets often come with many physical CPU cores.
-// For example a single socket board with two cores each with HT will
-// return 4 CPUInfoStat structs on Linux and the "Cores" field set to 1.
-func Info() ([]InfoStat, error) {
-	filename := common.HostProc("cpuinfo")
-	lines, _ := common.ReadLines(filename)
-
-	var ret []InfoStat
-
-	c := InfoStat{CPU: -1, Cores: 1}
-	for _, line := range lines {
-		fields := strings.Split(line, ":")
-		if len(fields) < 2 {
-			continue
-		}
-		key := strings.TrimSpace(fields[0])
-		value := strings.TrimSpace(fields[1])
-
-		switch key {
-		case "processor":
-			if c.CPU >= 0 {
-				err := finishCPUInfo(&c)
-				if err != nil {
-					return ret, err
-				}
-				ret = append(ret, c)
-			}
-			c = InfoStat{Cores: 1}
-			t, err := strconv.ParseInt(value, 10, 64)
-			if err != nil {
-				return ret, err
-			}
-			c.CPU = int32(t)
-		case "vendorId":
-			c.VendorID = value
-		case "cpu family":
-			c.Family = value
-		case "model":
-			c.Model = value
-		case "model name":
-			c.ModelName = value
-		case "stepping":
-			t, err := strconv.ParseInt(value, 10, 64)
-			if err != nil {
-				return ret, err
-			}
-			c.Stepping = int32(t)
-		case "cpu MHz":
-			t, err := strconv.ParseFloat(value, 64)
-			if err != nil {
-				return ret, err
-			}
-			c.Mhz = t
-		case "cache size":
-			t, err := strconv.ParseInt(strings.Replace(value, " KB", "", 1), 10, 64)
-			if err != nil {
-				return ret, err
-			}
-			c.CacheSize = int32(t)
-		case "physical id":
-			c.PhysicalID = value
-		case "core id":
-			c.CoreID = value
-		case "flags", "Features":
-			c.Flags = strings.FieldsFunc(value, func(r rune) bool {
-				return r == ',' || r == ' '
-			})
-		}
-	}
-	if c.CPU >= 0 {
-		err := finishCPUInfo(&c)
-		if err != nil {
-			return ret, err
-		}
-		ret = append(ret, c)
-	}
-	return ret, nil
-}
-
-func parseStatLine(line string) (*TimesStat, error) {
-	fields := strings.Fields(line)
-
-	if strings.HasPrefix(fields[0], "cpu") == false {
-		//		return CPUTimesStat{}, e
-		return nil, errors.New("not contain cpu")
-	}
-
-	cpu := fields[0]
-	if cpu == "cpu" {
-		cpu = "cpu-total"
-	}
-	user, err := strconv.ParseFloat(fields[1], 64)
-	if err != nil {
-		return nil, err
-	}
-	nice, err := strconv.ParseFloat(fields[2], 64)
-	if err != nil {
-		return nil, err
-	}
-	system, err := strconv.ParseFloat(fields[3], 64)
-	if err != nil {
-		return nil, err
-	}
-	idle, err := strconv.ParseFloat(fields[4], 64)
-	if err != nil {
-		return nil, err
-	}
-	iowait, err := strconv.ParseFloat(fields[5], 64)
-	if err != nil {
-		return nil, err
-	}
-	irq, err := strconv.ParseFloat(fields[6], 64)
-	if err != nil {
-		return nil, err
-	}
-	softirq, err := strconv.ParseFloat(fields[7], 64)
-	if err != nil {
-		return nil, err
-	}
-
-	ct := &TimesStat{
-		CPU:     cpu,
-		User:    float64(user) / cpu_tick,
-		Nice:    float64(nice) / cpu_tick,
-		System:  float64(system) / cpu_tick,
-		Idle:    float64(idle) / cpu_tick,
-		Iowait:  float64(iowait) / cpu_tick,
-		Irq:     float64(irq) / cpu_tick,
-		Softirq: float64(softirq) / cpu_tick,
-	}
-	if len(fields) > 8 { // Linux >= 2.6.11
-		steal, err := strconv.ParseFloat(fields[8], 64)
-		if err != nil {
-			return nil, err
-		}
-		ct.Steal = float64(steal) / cpu_tick
-	}
-	if len(fields) > 9 { // Linux >= 2.6.24
-		guest, err := strconv.ParseFloat(fields[9], 64)
-		if err != nil {
-			return nil, err
-		}
-		ct.Guest = float64(guest) / cpu_tick
-	}
-	if len(fields) > 10 { // Linux >= 3.2.0
-		guestNice, err := strconv.ParseFloat(fields[10], 64)
-		if err != nil {
-			return nil, err
-		}
-		ct.GuestNice = float64(guestNice) / cpu_tick
-	}
-
-	return ct, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go
deleted file mode 100644
index 9f1ea4d772..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// +build linux freebsd darwin
-
-package cpu
-
-import (
-	"fmt"
-	"time"
-)
-
-func Percent(interval time.Duration, percpu bool) ([]float64, error) {
-	getAllBusy := func(t TimesStat) (float64, float64) {
-		busy := t.User + t.System + t.Nice + t.Iowait + t.Irq +
-			t.Softirq + t.Steal + t.Guest + t.GuestNice + t.Stolen
-		return busy + t.Idle, busy
-	}
-
-	calculate := func(t1, t2 TimesStat) float64 {
-		t1All, t1Busy := getAllBusy(t1)
-		t2All, t2Busy := getAllBusy(t2)
-
-		if t2Busy <= t1Busy {
-			return 0
-		}
-		if t2All <= t1All {
-			return 1
-		}
-		return (t2Busy - t1Busy) / (t2All - t1All) * 100
-	}
-
-	// Get CPU usage at the start of the interval.
-	cpuTimes1, err := Times(percpu)
-	if err != nil {
-		return nil, err
-	}
-
-	if interval > 0 {
-		time.Sleep(interval)
-	}
-
-	// And at the end of the interval.
-	cpuTimes2, err := Times(percpu)
-	if err != nil {
-		return nil, err
-	}
-
-	// Make sure the CPU measurements have the same length.
-	if len(cpuTimes1) != len(cpuTimes2) {
-		return nil, fmt.Errorf(
-			"received two CPU counts: %d != %d",
-			len(cpuTimes1), len(cpuTimes2),
-		)
-	}
-
-	ret := make([]float64, len(cpuTimes1))
-	for i, t := range cpuTimes2 {
-		ret[i] = calculate(cpuTimes1[i], t)
-	}
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go
deleted file mode 100644
index fbd25e6057..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// +build windows
-
-package cpu
-
-import (
-	"fmt"
-	"syscall"
-	"time"
-	"unsafe"
-
-	"github.com/StackExchange/wmi"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-type Win32_Processor struct {
-	LoadPercentage            *uint16
-	Family                    uint16
-	Manufacturer              string
-	Name                      string
-	NumberOfLogicalProcessors uint32
-	ProcessorID               *string
-	Stepping                  *string
-	MaxClockSpeed             uint32
-}
-
-// TODO: Get percpu
-func Times(percpu bool) ([]TimesStat, error) {
-	var ret []TimesStat
-
-	var lpIdleTime common.FILETIME
-	var lpKernelTime common.FILETIME
-	var lpUserTime common.FILETIME
-	r, _, _ := common.ProcGetSystemTimes.Call(
-		uintptr(unsafe.Pointer(&lpIdleTime)),
-		uintptr(unsafe.Pointer(&lpKernelTime)),
-		uintptr(unsafe.Pointer(&lpUserTime)))
-	if r == 0 {
-		return ret, syscall.GetLastError()
-	}
-
-	LOT := float64(0.0000001)
-	HIT := (LOT * 4294967296.0)
-	idle := ((HIT * float64(lpIdleTime.DwHighDateTime)) + (LOT * float64(lpIdleTime.DwLowDateTime)))
-	user := ((HIT * float64(lpUserTime.DwHighDateTime)) + (LOT * float64(lpUserTime.DwLowDateTime)))
-	kernel := ((HIT * float64(lpKernelTime.DwHighDateTime)) + (LOT * float64(lpKernelTime.DwLowDateTime)))
-	system := (kernel - idle)
-
-	ret = append(ret, TimesStat{
-		Idle:   float64(idle),
-		User:   float64(user),
-		System: float64(system),
-	})
-	return ret, nil
-}
-
-func Info() ([]InfoStat, error) {
-	var ret []InfoStat
-	var dst []Win32_Processor
-	q := wmi.CreateQuery(&dst, "")
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return ret, err
-	}
-
-	var procID string
-	for i, l := range dst {
-		procID = ""
-		if l.ProcessorID != nil {
-			procID = *l.ProcessorID
-		}
-
-		cpu := InfoStat{
-			CPU:        int32(i),
-			Family:     fmt.Sprintf("%d", l.Family),
-			VendorID:   l.Manufacturer,
-			ModelName:  l.Name,
-			Cores:      int32(l.NumberOfLogicalProcessors),
-			PhysicalID: procID,
-			Mhz:        float64(l.MaxClockSpeed),
-			Flags:      []string{},
-		}
-		ret = append(ret, cpu)
-	}
-
-	return ret, nil
-}
-
-func Percent(interval time.Duration, percpu bool) ([]float64, error) {
-	var ret []float64
-	var dst []Win32_Processor
-	q := wmi.CreateQuery(&dst, "")
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return ret, err
-	}
-	for _, l := range dst {
-		// use range but windows can only get one percent.
-		if l.LoadPercentage == nil {
-			continue
-		}
-		ret = append(ret, float64(*l.LoadPercentage))
-	}
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go
deleted file mode 100644
index 150eb60a7d..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package host
-
-import (
-	"encoding/json"
-)
-
-// A HostInfoStat describes the host status.
-// This is not in the psutil but it useful.
-type InfoStat struct {
-	Hostname             string `json:"hostname"`
-	Uptime               uint64 `json:"uptime"`
-	BootTime             uint64 `json:"bootTime"`
-	Procs                uint64 `json:"procs"`           // number of processes
-	OS                   string `json:"os"`              // ex: freebsd, linux
-	Platform             string `json:"platform"`        // ex: ubuntu, linuxmint
-	PlatformFamily       string `json:"platformFamily"` // ex: debian, rhel
-	PlatformVersion      string `json:"platformVersion"`
-	VirtualizationSystem string `json:"virtualizationSystem"`
-	VirtualizationRole   string `json:"virtualizationRole"` // guest or host
-
-}
-
-type UserStat struct {
-	User     string `json:"user"`
-	Terminal string `json:"terminal"`
-	Host     string `json:"host"`
-	Started  int    `json:"started"`
-}
-
-func (h InfoStat) String() string {
-	s, _ := json.Marshal(h)
-	return string(s)
-}
-
-func (u UserStat) String() string {
-	s, _ := json.Marshal(u)
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go
deleted file mode 100644
index f4a8c36a26..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// +build darwin
-
-package host
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// from utmpx.h
-const USER_PROCESS = 7
-
-func Info() (*InfoStat, error) {
-	ret := &InfoStat{
-		OS:             runtime.GOOS,
-		PlatformFamily: "darwin",
-	}
-
-	hostname, err := os.Hostname()
-	if err == nil {
-		ret.Hostname = hostname
-	}
-
-	platform, family, version, err := PlatformInformation()
-	if err == nil {
-		ret.Platform = platform
-		ret.PlatformFamily = family
-		ret.PlatformVersion = version
-	}
-	system, role, err := Virtualization()
-	if err == nil {
-		ret.VirtualizationSystem = system
-		ret.VirtualizationRole = role
-	}
-
-	boot, err := BootTime()
-	if err == nil {
-		ret.BootTime = boot
-		ret.Uptime = uptime(boot)
-	}
-
-	return ret, nil
-}
-
-func BootTime() (uint64, error) {
-	values, err := common.DoSysctrl("kern.boottime")
-	if err != nil {
-		return 0, err
-	}
-	// ex: { sec = 1392261637, usec = 627534 } Thu Feb 13 12:20:37 2014
-	v := strings.Replace(values[2], ",", "", 1)
-	boottime, err := strconv.ParseInt(v, 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return uint64(boottime), nil
-}
-
-func uptime(boot uint64) uint64 {
-	return uint64(time.Now().Unix()) - boot
-}
-
-func Uptime() (uint64, error) {
-	boot, err := BootTime()
-	if err != nil {
-		return 0, err
-	}
-	return uptime(boot), nil
-}
-
-func Users() ([]UserStat, error) {
-	utmpfile := "/var/run/utmpx"
-	var ret []UserStat
-
-	file, err := os.Open(utmpfile)
-	if err != nil {
-		return ret, err
-	}
-
-	buf, err := ioutil.ReadAll(file)
-	if err != nil {
-		return ret, err
-	}
-
-	u := Utmpx{}
-	entrySize := int(unsafe.Sizeof(u))
-	count := len(buf) / entrySize
-
-	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
-
-		var u Utmpx
-		br := bytes.NewReader(b)
-		err := binary.Read(br, binary.LittleEndian, &u)
-		if err != nil {
-			continue
-		}
-		if u.Type != USER_PROCESS {
-			continue
-		}
-		user := UserStat{
-			User:     common.IntToString(u.User[:]),
-			Terminal: common.IntToString(u.Line[:]),
-			Host:     common.IntToString(u.Host[:]),
-			Started:  int(u.Tv.Sec),
-		}
-		ret = append(ret, user)
-	}
-
-	return ret, nil
-
-}
-
-func PlatformInformation() (string, string, string, error) {
-	platform := ""
-	family := ""
-	version := ""
-
-	uname, err := exec.LookPath("uname")
-	if err != nil {
-		return "", "", "", err
-	}
-	out, err := exec.Command(uname, "-s").Output()
-	if err == nil {
-		platform = strings.ToLower(strings.TrimSpace(string(out)))
-	}
-
-	out, err = exec.Command(uname, "-r").Output()
-	if err == nil {
-		version = strings.ToLower(strings.TrimSpace(string(out)))
-	}
-
-	return platform, family, version, nil
-}
-
-func Virtualization() (string, string, error) {
-	system := ""
-	role := ""
-
-	return system, role, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go
deleted file mode 100644
index c3596f9f5e..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package host
-
-type Utmpx struct {
-	User      [256]int8
-	ID        [4]int8
-	Line      [32]int8
-	Pid       int32
-	Type      int16
-	Pad_cgo_0 [6]byte
-	Tv        Timeval
-	Host      [256]int8
-	Pad       [16]uint32
-}
-type Timeval struct {
-	Sec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go
deleted file mode 100644
index 06142e1c80..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go
+++ /dev/null
@@ -1,196 +0,0 @@
-// +build freebsd
-
-package host
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-const (
-	UTNameSize = 16 /* see MAXLOGNAME in <sys/param.h> */
-	UTLineSize = 8
-	UTHostSize = 16
-)
-
-func Info() (*InfoStat, error) {
-	ret := &InfoStat{
-		OS:             runtime.GOOS,
-		PlatformFamily: "freebsd",
-	}
-
-	hostname, err := os.Hostname()
-	if err == nil {
-		ret.Hostname = hostname
-	}
-
-	platform, family, version, err := PlatformInformation()
-	if err == nil {
-		ret.Platform = platform
-		ret.PlatformFamily = family
-		ret.PlatformVersion = version
-	}
-	system, role, err := Virtualization()
-	if err == nil {
-		ret.VirtualizationSystem = system
-		ret.VirtualizationRole = role
-	}
-
-	boot, err := BootTime()
-	if err == nil {
-		ret.BootTime = boot
-		ret.Uptime = uptime(boot)
-	}
-
-	return ret, nil
-}
-
-func BootTime() (uint64, error) {
-	values, err := common.DoSysctrl("kern.boottime")
-	if err != nil {
-		return 0, err
-	}
-	// ex: { sec = 1392261637, usec = 627534 } Thu Feb 13 12:20:37 2014
-	v := strings.Replace(values[2], ",", "", 1)
-
-	boottime, err := strconv.ParseUint(v, 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return boottime, nil
-}
-
-func uptime(boot uint64) uint64 {
-	return uint64(time.Now().Unix()) - boot
-}
-
-func Uptime() (uint64, error) {
-	boot, err := BootTime()
-	if err != nil {
-		return 0, err
-	}
-	return uptime(boot), nil
-}
-
-func Users() ([]UserStat, error) {
-	utmpfile := "/var/run/utx.active"
-	if !common.PathExists(utmpfile) {
-		utmpfile = "/var/run/utmp" // before 9.0
-		return getUsersFromUtmp(utmpfile)
-	}
-
-	var ret []UserStat
-	file, err := os.Open(utmpfile)
-	if err != nil {
-		return ret, err
-	}
-
-	buf, err := ioutil.ReadAll(file)
-	if err != nil {
-		return ret, err
-	}
-
-	u := Utmpx{}
-	entrySize := int(unsafe.Sizeof(u)) - 3
-	entrySize = 197 // TODO: why should 197
-	count := len(buf) / entrySize
-
-	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
-		var u Utmpx
-		br := bytes.NewReader(b)
-		err := binary.Read(br, binary.LittleEndian, &u)
-		if err != nil || u.Type != 4 {
-			continue
-		}
-		sec := (binary.LittleEndian.Uint32(u.Tv.Sec[:])) / 2 // TODO:
-		user := UserStat{
-			User:     common.IntToString(u.User[:]),
-			Terminal: common.IntToString(u.Line[:]),
-			Host:     common.IntToString(u.Host[:]),
-			Started:  int(sec),
-		}
-
-		ret = append(ret, user)
-	}
-
-	return ret, nil
-
-}
-
-func PlatformInformation() (string, string, string, error) {
-	platform := ""
-	family := ""
-	version := ""
-	uname, err := exec.LookPath("uname")
-	if err != nil {
-		return "", "", "", err
-	}
-
-	out, err := exec.Command(uname, "-s").Output()
-	if err == nil {
-		platform = strings.ToLower(strings.TrimSpace(string(out)))
-	}
-
-	out, err = exec.Command(uname, "-r").Output()
-	if err == nil {
-		version = strings.ToLower(strings.TrimSpace(string(out)))
-	}
-
-	return platform, family, version, nil
-}
-
-func Virtualization() (string, string, error) {
-	system := ""
-	role := ""
-
-	return system, role, nil
-}
-
-// before 9.0
-func getUsersFromUtmp(utmpfile string) ([]UserStat, error) {
-	var ret []UserStat
-	file, err := os.Open(utmpfile)
-	if err != nil {
-		return ret, err
-	}
-	buf, err := ioutil.ReadAll(file)
-	if err != nil {
-		return ret, err
-	}
-
-	u := Utmp{}
-	entrySize := int(unsafe.Sizeof(u))
-	count := len(buf) / entrySize
-
-	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
-		var u Utmp
-		br := bytes.NewReader(b)
-		err := binary.Read(br, binary.LittleEndian, &u)
-		if err != nil || u.Time == 0 {
-			continue
-		}
-		user := UserStat{
-			User:     common.IntToString(u.Name[:]),
-			Terminal: common.IntToString(u.Line[:]),
-			Host:     common.IntToString(u.Host[:]),
-			Started:  int(u.Time),
-		}
-
-		ret = append(ret, user)
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
deleted file mode 100644
index 9a4c0a47ac..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package host
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Utmp struct {
-	Line [8]int8
-	Name [16]int8
-	Host [16]int8
-	Time int32
-}
-type Utmpx struct {
-	Type int16
-	Tv   Timeval
-	ID   [8]int8
-	Pid  int32
-	User [32]int8
-	Line [16]int8
-	Host [125]int8
-	//	Host [128]int8
-	//	X__ut_spare [64]int8
-}
-type Timeval struct {
-	Sec  [4]byte
-	Usec [3]byte
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go
deleted file mode 100644
index f56906c28f..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go
+++ /dev/null
@@ -1,431 +0,0 @@
-// +build linux
-
-package host
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-type LSB struct {
-	ID          string
-	Release     string
-	Codename    string
-	Description string
-}
-
-// from utmp.h
-const USER_PROCESS = 7
-
-func Info() (*InfoStat, error) {
-	ret := &InfoStat{
-		OS: runtime.GOOS,
-	}
-
-	hostname, err := os.Hostname()
-	if err == nil {
-		ret.Hostname = hostname
-	}
-
-	platform, family, version, err := PlatformInformation()
-	if err == nil {
-		ret.Platform = platform
-		ret.PlatformFamily = family
-		ret.PlatformVersion = version
-	}
-	system, role, err := Virtualization()
-	if err == nil {
-		ret.VirtualizationSystem = system
-		ret.VirtualizationRole = role
-	}
-	boot, err := BootTime()
-	if err == nil {
-		ret.BootTime = boot
-		ret.Uptime = uptime(boot)
-	}
-
-	return ret, nil
-}
-
-// BootTime returns the system boot time expressed in seconds since the epoch.
-func BootTime() (uint64, error) {
-	filename := common.HostProc("stat")
-	lines, err := common.ReadLines(filename)
-	if err != nil {
-		return 0, err
-	}
-	for _, line := range lines {
-		if strings.HasPrefix(line, "btime") {
-			f := strings.Fields(line)
-			if len(f) != 2 {
-				return 0, fmt.Errorf("wrong btime format")
-			}
-			b, err := strconv.ParseInt(f[1], 10, 64)
-			if err != nil {
-				return 0, err
-			}
-			return uint64(b), nil
-		}
-	}
-
-	return 0, fmt.Errorf("could not find btime")
-}
-
-func uptime(boot uint64) uint64 {
-	return uint64(time.Now().Unix()) - boot
-}
-
-func Uptime() (uint64, error) {
-	boot, err := BootTime()
-	if err != nil {
-		return 0, err
-	}
-	return uptime(boot), nil
-}
-
-func Users() ([]UserStat, error) {
-	utmpfile := "/var/run/utmp"
-
-	file, err := os.Open(utmpfile)
-	if err != nil {
-		return nil, err
-	}
-
-	buf, err := ioutil.ReadAll(file)
-	if err != nil {
-		return nil, err
-	}
-
-	u := utmp{}
-	entrySize := int(unsafe.Sizeof(u))
-	count := len(buf) / entrySize
-
-	ret := make([]UserStat, 0, count)
-
-	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
-
-		var u utmp
-		br := bytes.NewReader(b)
-		err := binary.Read(br, binary.LittleEndian, &u)
-		if err != nil {
-			continue
-		}
-		if u.Type != USER_PROCESS {
-			continue
-		}
-		user := UserStat{
-			User:     common.IntToString(u.User[:]),
-			Terminal: common.IntToString(u.Line[:]),
-			Host:     common.IntToString(u.Host[:]),
-			Started:  int(u.Tv.TvSec),
-		}
-		ret = append(ret, user)
-	}
-
-	return ret, nil
-
-}
-
-func getLSB() (*LSB, error) {
-	ret := &LSB{}
-	if common.PathExists(common.HostEtc("lsb-release")) {
-		contents, err := common.ReadLines(common.HostEtc("lsb-release"))
-		if err != nil {
-			return ret, err // return empty
-		}
-		for _, line := range contents {
-			field := strings.Split(line, "=")
-			if len(field) < 2 {
-				continue
-			}
-			switch field[0] {
-			case "DISTRIB_ID":
-				ret.ID = field[1]
-			case "DISTRIB_RELEASE":
-				ret.Release = field[1]
-			case "DISTRIB_CODENAME":
-				ret.Codename = field[1]
-			case "DISTRIB_DESCRIPTION":
-				ret.Description = field[1]
-			}
-		}
-	} else if common.PathExists("/usr/bin/lsb_release") {
-		lsb_release, err := exec.LookPath("/usr/bin/lsb_release")
-		if err != nil {
-			return ret, err
-		}
-		out, err := exec.Command(lsb_release).Output()
-		if err != nil {
-			return ret, err
-		}
-		for _, line := range strings.Split(string(out), "\n") {
-			field := strings.Split(line, ":")
-			if len(field) < 2 {
-				continue
-			}
-			switch field[0] {
-			case "Distributor ID":
-				ret.ID = field[1]
-			case "Release":
-				ret.Release = field[1]
-			case "Codename":
-				ret.Codename = field[1]
-			case "Description":
-				ret.Description = field[1]
-			}
-		}
-
-	}
-
-	return ret, nil
-}
-
-func PlatformInformation() (platform string, family string, version string, err error) {
-
-	lsb, err := getLSB()
-	if err != nil {
-		lsb = &LSB{}
-	}
-
-	if common.PathExists(common.HostEtc("oracle-release")) {
-		platform = "oracle"
-		contents, err := common.ReadLines(common.HostEtc("oracle-release"))
-		if err == nil {
-			version = getRedhatishVersion(contents)
-		}
-
-	} else if common.PathExists(common.HostEtc("enterprise-release")) {
-		platform = "oracle"
-		contents, err := common.ReadLines(common.HostEtc("enterprise-release"))
-		if err == nil {
-			version = getRedhatishVersion(contents)
-		}
-	} else if common.PathExists(common.HostEtc("debian_version")) {
-		if lsb.ID == "Ubuntu" {
-			platform = "ubuntu"
-			version = lsb.Release
-		} else if lsb.ID == "LinuxMint" {
-			platform = "linuxmint"
-			version = lsb.Release
-		} else {
-			if common.PathExists("/usr/bin/raspi-config") {
-				platform = "raspbian"
-			} else {
-				platform = "debian"
-			}
-			contents, err := common.ReadLines(common.HostEtc("debian_version"))
-			if err == nil {
-				version = contents[0]
-			}
-		}
-	} else if common.PathExists(common.HostEtc("redhat-release")) {
-		contents, err := common.ReadLines(common.HostEtc("redhat-release"))
-		if err == nil {
-			version = getRedhatishVersion(contents)
-			platform = getRedhatishPlatform(contents)
-		}
-	} else if common.PathExists(common.HostEtc("system-release")) {
-		contents, err := common.ReadLines(common.HostEtc("system-release"))
-		if err == nil {
-			version = getRedhatishVersion(contents)
-			platform = getRedhatishPlatform(contents)
-		}
-	} else if common.PathExists(common.HostEtc("gentoo-release")) {
-		platform = "gentoo"
-		contents, err := common.ReadLines(common.HostEtc("gentoo-release"))
-		if err == nil {
-			version = getRedhatishVersion(contents)
-		}
-	} else if common.PathExists(common.HostEtc("SuSE-release")) {
-		contents, err := common.ReadLines(common.HostEtc("SuSE-release"))
-		if err == nil {
-			version = getSuseVersion(contents)
-			platform = getSusePlatform(contents)
-		}
-		// TODO: slackware detecion
-	} else if common.PathExists(common.HostEtc("arch-release")) {
-		platform = "arch"
-		version = lsb.Release
-	} else if lsb.ID == "RedHat" {
-		platform = "redhat"
-		version = lsb.Release
-	} else if lsb.ID == "Amazon" {
-		platform = "amazon"
-		version = lsb.Release
-	} else if lsb.ID == "ScientificSL" {
-		platform = "scientific"
-		version = lsb.Release
-	} else if lsb.ID == "XenServer" {
-		platform = "xenserver"
-		version = lsb.Release
-	} else if lsb.ID != "" {
-		platform = strings.ToLower(lsb.ID)
-		version = lsb.Release
-	}
-
-	switch platform {
-	case "debian", "ubuntu", "linuxmint", "raspbian":
-		family = "debian"
-	case "fedora":
-		family = "fedora"
-	case "oracle", "centos", "redhat", "scientific", "enterpriseenterprise", "amazon", "xenserver", "cloudlinux", "ibm_powerkvm":
-		family = "rhel"
-	case "suse", "opensuse":
-		family = "suse"
-	case "gentoo":
-		family = "gentoo"
-	case "slackware":
-		family = "slackware"
-	case "arch":
-		family = "arch"
-	case "exherbo":
-		family = "exherbo"
-	}
-
-	return platform, family, version, nil
-
-}
-
-func getRedhatishVersion(contents []string) string {
-	c := strings.ToLower(strings.Join(contents, ""))
-
-	if strings.Contains(c, "rawhide") {
-		return "rawhide"
-	}
-	if matches := regexp.MustCompile(`release (\d[\d.]*)`).FindStringSubmatch(c); matches != nil {
-		return matches[1]
-	}
-	return ""
-}
-
-func getRedhatishPlatform(contents []string) string {
-	c := strings.ToLower(strings.Join(contents, ""))
-
-	if strings.Contains(c, "red hat") {
-		return "redhat"
-	}
-	f := strings.Split(c, " ")
-
-	return f[0]
-}
-
-func getSuseVersion(contents []string) string {
-	version := ""
-	for _, line := range contents {
-		if matches := regexp.MustCompile(`VERSION = ([\d.]+)`).FindStringSubmatch(line); matches != nil {
-			version = matches[1]
-		} else if matches := regexp.MustCompile(`PATCHLEVEL = ([\d]+)`).FindStringSubmatch(line); matches != nil {
-			version = version + "." + matches[1]
-		}
-	}
-	return version
-}
-
-func getSusePlatform(contents []string) string {
-	c := strings.ToLower(strings.Join(contents, ""))
-	if strings.Contains(c, "opensuse") {
-		return "opensuse"
-	}
-	return "suse"
-}
-
-func Virtualization() (string, string, error) {
-	var system string
-	var role string
-
-	filename := common.HostProc("xen")
-	if common.PathExists(filename) {
-		system = "xen"
-		role = "guest" // assume guest
-
-		if common.PathExists(filename + "/capabilities") {
-			contents, err := common.ReadLines(filename + "/capabilities")
-			if err == nil {
-				if common.StringsHas(contents, "control_d") {
-					role = "host"
-				}
-			}
-		}
-	}
-
-	filename = common.HostProc("modules")
-	if common.PathExists(filename) {
-		contents, err := common.ReadLines(filename)
-		if err == nil {
-			if common.StringsContains(contents, "kvm") {
-				system = "kvm"
-				role = "host"
-			} else if common.StringsContains(contents, "vboxdrv") {
-				system = "vbox"
-				role = "host"
-			} else if common.StringsContains(contents, "vboxguest") {
-				system = "vbox"
-				role = "guest"
-			}
-		}
-	}
-
-	filename = common.HostProc("cpuinfo")
-	if common.PathExists(filename) {
-		contents, err := common.ReadLines(filename)
-		if err == nil {
-			if common.StringsHas(contents, "QEMU Virtual CPU") ||
-				common.StringsHas(contents, "Common KVM processor") ||
-				common.StringsHas(contents, "Common 32-bit KVM processor") {
-				system = "kvm"
-				role = "guest"
-			}
-		}
-	}
-
-	filename = common.HostProc()
-	if common.PathExists(filename + "/bc/0") {
-		system = "openvz"
-		role = "host"
-	} else if common.PathExists(filename + "/vz") {
-		system = "openvz"
-		role = "guest"
-	}
-
-	// not use dmidecode because it requires root
-	if common.PathExists(filename + "/self/status") {
-		contents, err := common.ReadLines(filename + "/self/status")
-		if err == nil {
-
-			if common.StringsHas(contents, "s_context:") ||
-				common.StringsHas(contents, "VxID:") {
-				system = "linux-vserver"
-			}
-			// TODO: guest or host
-		}
-	}
-
-	if common.PathExists(filename + "/self/cgroup") {
-		contents, err := common.ReadLines(filename + "/self/cgroup")
-		if err == nil {
-			if common.StringsHas(contents, "lxc") ||
-				common.StringsHas(contents, "docker") {
-				system = "lxc"
-				role = "guest"
-			} else if common.PathExists("/usr/bin/lxc-version") { // TODO: which
-				system = "lxc"
-				role = "host"
-			}
-		}
-	}
-
-	return system, role, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go
deleted file mode 100644
index cab9feed41..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// ATTENTION - FILE MANUAL FIXED AFTER CGO.
-// Fixed line: Tv		_Ctype_struct_timeval -> Tv		UtTv
-// Created by cgo -godefs, MANUAL FIXED
-// cgo -godefs types_linux.go
-
-package host
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type utmp struct {
-	Type      int16
-	Pad_cgo_0 [2]byte
-	Pid       int32
-	Line      [32]int8
-	ID        [4]int8
-	User      [32]int8
-	Host      [256]int8
-	Exit      exit_status
-	Session   int32
-	Tv        UtTv
-	Addr_v6   [4]int32
-	X__unused [20]int8
-}
-type exit_status struct {
-	Termination int16
-	Exit        int16
-}
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go
deleted file mode 100644
index 180394bbf4..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
-
-package host
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type utmp struct {
-	Type              int16
-	Pad_cgo_0         [2]byte
-	Pid               int32
-	Line              [32]int8
-	ID                [4]int8
-	User              [32]int8
-	Host              [256]int8
-	Exit              exit_status
-	Session           int32
-	Tv                UtTv
-	Addr_v6           [4]int32
-	X__glibc_reserved [20]int8
-}
-type exit_status struct {
-	Termination int16
-	Exit        int16
-}
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go
deleted file mode 100644
index 5f7e168b61..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// +build linux
-// +build arm
-
-package host
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type utmp struct {
-	Type              int16
-	Pad_cgo_0         [2]byte
-	Pid               int32
-	Line              [32]int8
-	ID                [4]int8
-	User              [32]int8
-	Host              [256]int8
-	Exit              exit_status
-	Session           int32
-	Tv                UtTv
-	Addr_v6           [4]int32
-	X__glibc_reserved [20]int8
-}
-type exit_status struct {
-	Termination int16
-	Exit        int16
-}
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go
deleted file mode 100644
index 29f900c6e2..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// +build windows
-
-package host
-
-import (
-	"fmt"
-	"os"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/StackExchange/wmi"
-
-	"github.com/shirou/gopsutil/internal/common"
-	process "github.com/shirou/gopsutil/process"
-)
-
-var (
-	procGetSystemTimeAsFileTime = common.Modkernel32.NewProc("GetSystemTimeAsFileTime")
-	osInfo                      *Win32_OperatingSystem
-)
-
-type Win32_OperatingSystem struct {
-	Version        string
-	Caption        string
-	ProductType    uint32
-	BuildNumber    string
-	LastBootUpTime time.Time
-}
-
-func Info() (*InfoStat, error) {
-	ret := &InfoStat{
-		OS: runtime.GOOS,
-	}
-
-	hostname, err := os.Hostname()
-	if err == nil {
-		ret.Hostname = hostname
-	}
-
-	platform, family, version, err := PlatformInformation()
-	if err == nil {
-		ret.Platform = platform
-		ret.PlatformFamily = family
-		ret.PlatformVersion = version
-	} else {
-		return ret, err
-	}
-
-	boot, err := BootTime()
-	if err == nil {
-		ret.BootTime = boot
-		ret.Uptime = uptime(boot)
-	}
-
-	procs, err := process.Pids()
-	if err != nil {
-		return ret, err
-	}
-
-	ret.Procs = uint64(len(procs))
-
-	return ret, nil
-}
-
-func GetOSInfo() (Win32_OperatingSystem, error) {
-	var dst []Win32_OperatingSystem
-	q := wmi.CreateQuery(&dst, "")
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return Win32_OperatingSystem{}, err
-	}
-
-	osInfo = &dst[0]
-
-	return dst[0], nil
-}
-
-func BootTime() (uint64, error) {
-	if osInfo == nil {
-		_, err := GetOSInfo()
-		if err != nil {
-			return 0, err
-		}
-	}
-	now := time.Now()
-	t := osInfo.LastBootUpTime.Local()
-	return uint64(now.Sub(t).Seconds()), nil
-}
-
-func uptime(boot uint64) uint64 {
-	return uint64(time.Now().Unix()) - boot
-}
-
-func Uptime() (uint64, error) {
-	boot, err := BootTime()
-	if err != nil {
-		return 0, err
-	}
-	return uptime(boot), nil
-}
-
-func PlatformInformation() (platform string, family string, version string, err error) {
-	if osInfo == nil {
-		_, err = GetOSInfo()
-		if err != nil {
-			return
-		}
-	}
-
-	// Platform
-	platform = strings.Trim(osInfo.Caption, " ")
-
-	// PlatformFamily
-	switch osInfo.ProductType {
-	case 1:
-		family = "Standalone Workstation"
-	case 2:
-		family = "Server (Domain Controller)"
-	case 3:
-		family = "Server"
-	}
-
-	// Platform Version
-	version = fmt.Sprintf("%s Build %s", osInfo.Version, osInfo.BuildNumber)
-
-	return
-}
-
-func Users() ([]UserStat, error) {
-
-	var ret []UserStat
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go
deleted file mode 100644
index b858227885..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build ignore
-// plus hand editing about timeval
-
-/*
-Input to cgo -godefs.
-*/
-
-package host
-
-/*
-#include <sys/time.h>
-#include <utmpx.h>
-*/
-import "C"
-
-type Utmpx C.struct_utmpx
-type Timeval C.struct_timeval
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go
deleted file mode 100644
index 113b22eeaf..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// +build ignore
-
-/*
-Input to cgo -godefs.
-*/
-
-package host
-
-/*
-#define KERNEL
-#include <sys/types.h>
-#include <sys/time.h>
-#include <utmpx.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-type Utmp C.struct_utmp
-type Utmpx C.struct_utmpx
-type Timeval C.struct_timeval
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go
deleted file mode 100644
index 928545515c..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build ignore
-
-/*
-Input to cgo -godefs.
-*/
-
-package host
-
-/*
-#define KERNEL
-#include <sys/types.h>
-#include <utmp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-type utmp C.struct_utmp
-type exit_status C.struct_exit_status
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/binary.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/binary.go
deleted file mode 100644
index 9b5dc55b49..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/binary.go
+++ /dev/null
@@ -1,634 +0,0 @@
-package common
-
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package binary implements simple translation between numbers and byte
-// sequences and encoding and decoding of varints.
-//
-// Numbers are translated by reading and writing fixed-size values.
-// A fixed-size value is either a fixed-size arithmetic
-// type (int8, uint8, int16, float32, complex64, ...)
-// or an array or struct containing only fixed-size values.
-//
-// The varint functions encode and decode single integer values using
-// a variable-length encoding; smaller values require fewer bytes.
-// For a specification, see
-// http://code.google.com/apis/protocolbuffers/docs/encoding.html.
-//
-// This package favors simplicity over efficiency. Clients that require
-// high-performance serialization, especially for large data structures,
-// should look at more advanced solutions such as the encoding/gob
-// package or protocol buffers.
-import (
-	"errors"
-	"io"
-	"math"
-	"reflect"
-)
-
-// A ByteOrder specifies how to convert byte sequences into
-// 16-, 32-, or 64-bit unsigned integers.
-type ByteOrder interface {
-	Uint16([]byte) uint16
-	Uint32([]byte) uint32
-	Uint64([]byte) uint64
-	PutUint16([]byte, uint16)
-	PutUint32([]byte, uint32)
-	PutUint64([]byte, uint64)
-	String() string
-}
-
-// LittleEndian is the little-endian implementation of ByteOrder.
-var LittleEndian littleEndian
-
-// BigEndian is the big-endian implementation of ByteOrder.
-var BigEndian bigEndian
-
-type littleEndian struct{}
-
-func (littleEndian) Uint16(b []byte) uint16 { return uint16(b[0]) | uint16(b[1])<<8 }
-
-func (littleEndian) PutUint16(b []byte, v uint16) {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-}
-
-func (littleEndian) Uint32(b []byte) uint32 {
-	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
-}
-
-func (littleEndian) PutUint32(b []byte, v uint32) {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-}
-
-func (littleEndian) Uint64(b []byte) uint64 {
-	return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
-		uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
-}
-
-func (littleEndian) PutUint64(b []byte, v uint64) {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-	b[4] = byte(v >> 32)
-	b[5] = byte(v >> 40)
-	b[6] = byte(v >> 48)
-	b[7] = byte(v >> 56)
-}
-
-func (littleEndian) String() string { return "LittleEndian" }
-
-func (littleEndian) GoString() string { return "binary.LittleEndian" }
-
-type bigEndian struct{}
-
-func (bigEndian) Uint16(b []byte) uint16 { return uint16(b[1]) | uint16(b[0])<<8 }
-
-func (bigEndian) PutUint16(b []byte, v uint16) {
-	b[0] = byte(v >> 8)
-	b[1] = byte(v)
-}
-
-func (bigEndian) Uint32(b []byte) uint32 {
-	return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
-}
-
-func (bigEndian) PutUint32(b []byte, v uint32) {
-	b[0] = byte(v >> 24)
-	b[1] = byte(v >> 16)
-	b[2] = byte(v >> 8)
-	b[3] = byte(v)
-}
-
-func (bigEndian) Uint64(b []byte) uint64 {
-	return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
-		uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
-}
-
-func (bigEndian) PutUint64(b []byte, v uint64) {
-	b[0] = byte(v >> 56)
-	b[1] = byte(v >> 48)
-	b[2] = byte(v >> 40)
-	b[3] = byte(v >> 32)
-	b[4] = byte(v >> 24)
-	b[5] = byte(v >> 16)
-	b[6] = byte(v >> 8)
-	b[7] = byte(v)
-}
-
-func (bigEndian) String() string { return "BigEndian" }
-
-func (bigEndian) GoString() string { return "binary.BigEndian" }
-
-// Read reads structured binary data from r into data.
-// Data must be a pointer to a fixed-size value or a slice
-// of fixed-size values.
-// Bytes read from r are decoded using the specified byte order
-// and written to successive fields of the data.
-// When reading into structs, the field data for fields with
-// blank (_) field names is skipped; i.e., blank field names
-// may be used for padding.
-// When reading into a struct, all non-blank fields must be exported.
-func Read(r io.Reader, order ByteOrder, data interface{}) error {
-	// Fast path for basic types and slices.
-	if n := intDataSize(data); n != 0 {
-		var b [8]byte
-		var bs []byte
-		if n > len(b) {
-			bs = make([]byte, n)
-		} else {
-			bs = b[:n]
-		}
-		if _, err := io.ReadFull(r, bs); err != nil {
-			return err
-		}
-		switch data := data.(type) {
-		case *int8:
-			*data = int8(b[0])
-		case *uint8:
-			*data = b[0]
-		case *int16:
-			*data = int16(order.Uint16(bs))
-		case *uint16:
-			*data = order.Uint16(bs)
-		case *int32:
-			*data = int32(order.Uint32(bs))
-		case *uint32:
-			*data = order.Uint32(bs)
-		case *int64:
-			*data = int64(order.Uint64(bs))
-		case *uint64:
-			*data = order.Uint64(bs)
-		case []int8:
-			for i, x := range bs { // Easier to loop over the input for 8-bit values.
-				data[i] = int8(x)
-			}
-		case []uint8:
-			copy(data, bs)
-		case []int16:
-			for i := range data {
-				data[i] = int16(order.Uint16(bs[2*i:]))
-			}
-		case []uint16:
-			for i := range data {
-				data[i] = order.Uint16(bs[2*i:])
-			}
-		case []int32:
-			for i := range data {
-				data[i] = int32(order.Uint32(bs[4*i:]))
-			}
-		case []uint32:
-			for i := range data {
-				data[i] = order.Uint32(bs[4*i:])
-			}
-		case []int64:
-			for i := range data {
-				data[i] = int64(order.Uint64(bs[8*i:]))
-			}
-		case []uint64:
-			for i := range data {
-				data[i] = order.Uint64(bs[8*i:])
-			}
-		}
-		return nil
-	}
-
-	// Fallback to reflect-based decoding.
-	v := reflect.ValueOf(data)
-	size := -1
-	switch v.Kind() {
-	case reflect.Ptr:
-		v = v.Elem()
-		size = dataSize(v)
-	case reflect.Slice:
-		size = dataSize(v)
-	}
-	if size < 0 {
-		return errors.New("binary.Read: invalid type " + reflect.TypeOf(data).String())
-	}
-	d := &decoder{order: order, buf: make([]byte, size)}
-	if _, err := io.ReadFull(r, d.buf); err != nil {
-		return err
-	}
-	d.value(v)
-	return nil
-}
-
-// Write writes the binary representation of data into w.
-// Data must be a fixed-size value or a slice of fixed-size
-// values, or a pointer to such data.
-// Bytes written to w are encoded using the specified byte order
-// and read from successive fields of the data.
-// When writing structs, zero values are written for fields
-// with blank (_) field names.
-func Write(w io.Writer, order ByteOrder, data interface{}) error {
-	// Fast path for basic types and slices.
-	if n := intDataSize(data); n != 0 {
-		var b [8]byte
-		var bs []byte
-		if n > len(b) {
-			bs = make([]byte, n)
-		} else {
-			bs = b[:n]
-		}
-		switch v := data.(type) {
-		case *int8:
-			bs = b[:1]
-			b[0] = byte(*v)
-		case int8:
-			bs = b[:1]
-			b[0] = byte(v)
-		case []int8:
-			for i, x := range v {
-				bs[i] = byte(x)
-			}
-		case *uint8:
-			bs = b[:1]
-			b[0] = *v
-		case uint8:
-			bs = b[:1]
-			b[0] = byte(v)
-		case []uint8:
-			bs = v
-		case *int16:
-			bs = b[:2]
-			order.PutUint16(bs, uint16(*v))
-		case int16:
-			bs = b[:2]
-			order.PutUint16(bs, uint16(v))
-		case []int16:
-			for i, x := range v {
-				order.PutUint16(bs[2*i:], uint16(x))
-			}
-		case *uint16:
-			bs = b[:2]
-			order.PutUint16(bs, *v)
-		case uint16:
-			bs = b[:2]
-			order.PutUint16(bs, v)
-		case []uint16:
-			for i, x := range v {
-				order.PutUint16(bs[2*i:], x)
-			}
-		case *int32:
-			bs = b[:4]
-			order.PutUint32(bs, uint32(*v))
-		case int32:
-			bs = b[:4]
-			order.PutUint32(bs, uint32(v))
-		case []int32:
-			for i, x := range v {
-				order.PutUint32(bs[4*i:], uint32(x))
-			}
-		case *uint32:
-			bs = b[:4]
-			order.PutUint32(bs, *v)
-		case uint32:
-			bs = b[:4]
-			order.PutUint32(bs, v)
-		case []uint32:
-			for i, x := range v {
-				order.PutUint32(bs[4*i:], x)
-			}
-		case *int64:
-			bs = b[:8]
-			order.PutUint64(bs, uint64(*v))
-		case int64:
-			bs = b[:8]
-			order.PutUint64(bs, uint64(v))
-		case []int64:
-			for i, x := range v {
-				order.PutUint64(bs[8*i:], uint64(x))
-			}
-		case *uint64:
-			bs = b[:8]
-			order.PutUint64(bs, *v)
-		case uint64:
-			bs = b[:8]
-			order.PutUint64(bs, v)
-		case []uint64:
-			for i, x := range v {
-				order.PutUint64(bs[8*i:], x)
-			}
-		}
-		_, err := w.Write(bs)
-		return err
-	}
-
-	// Fallback to reflect-based encoding.
-	v := reflect.Indirect(reflect.ValueOf(data))
-	size := dataSize(v)
-	if size < 0 {
-		return errors.New("binary.Write: invalid type " + reflect.TypeOf(data).String())
-	}
-	buf := make([]byte, size)
-	e := &encoder{order: order, buf: buf}
-	e.value(v)
-	_, err := w.Write(buf)
-	return err
-}
-
-// Size returns how many bytes Write would generate to encode the value v, which
-// must be a fixed-size value or a slice of fixed-size values, or a pointer to such data.
-// If v is neither of these, Size returns -1.
-func Size(v interface{}) int {
-	return dataSize(reflect.Indirect(reflect.ValueOf(v)))
-}
-
-// dataSize returns the number of bytes the actual data represented by v occupies in memory.
-// For compound structures, it sums the sizes of the elements. Thus, for instance, for a slice
-// it returns the length of the slice times the element size and does not count the memory
-// occupied by the header. If the type of v is not acceptable, dataSize returns -1.
-func dataSize(v reflect.Value) int {
-	if v.Kind() == reflect.Slice {
-		if s := sizeof(v.Type().Elem()); s >= 0 {
-			return s * v.Len()
-		}
-		return -1
-	}
-	return sizeof(v.Type())
-}
-
-// sizeof returns the size >= 0 of variables for the given type or -1 if the type is not acceptable.
-func sizeof(t reflect.Type) int {
-	switch t.Kind() {
-	case reflect.Array:
-		if s := sizeof(t.Elem()); s >= 0 {
-			return s * t.Len()
-		}
-
-	case reflect.Struct:
-		sum := 0
-		for i, n := 0, t.NumField(); i < n; i++ {
-			s := sizeof(t.Field(i).Type)
-			if s < 0 {
-				return -1
-			}
-			sum += s
-		}
-		return sum
-
-	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
-		reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
-		reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128, reflect.Ptr:
-		return int(t.Size())
-	}
-
-	return -1
-}
-
-type coder struct {
-	order ByteOrder
-	buf   []byte
-}
-
-type decoder coder
-type encoder coder
-
-func (d *decoder) uint8() uint8 {
-	x := d.buf[0]
-	d.buf = d.buf[1:]
-	return x
-}
-
-func (e *encoder) uint8(x uint8) {
-	e.buf[0] = x
-	e.buf = e.buf[1:]
-}
-
-func (d *decoder) uint16() uint16 {
-	x := d.order.Uint16(d.buf[0:2])
-	d.buf = d.buf[2:]
-	return x
-}
-
-func (e *encoder) uint16(x uint16) {
-	e.order.PutUint16(e.buf[0:2], x)
-	e.buf = e.buf[2:]
-}
-
-func (d *decoder) uint32() uint32 {
-	x := d.order.Uint32(d.buf[0:4])
-	d.buf = d.buf[4:]
-	return x
-}
-
-func (e *encoder) uint32(x uint32) {
-	e.order.PutUint32(e.buf[0:4], x)
-	e.buf = e.buf[4:]
-}
-
-func (d *decoder) uint64() uint64 {
-	x := d.order.Uint64(d.buf[0:8])
-	d.buf = d.buf[8:]
-	return x
-}
-
-func (e *encoder) uint64(x uint64) {
-	e.order.PutUint64(e.buf[0:8], x)
-	e.buf = e.buf[8:]
-}
-
-func (d *decoder) int8() int8 { return int8(d.uint8()) }
-
-func (e *encoder) int8(x int8) { e.uint8(uint8(x)) }
-
-func (d *decoder) int16() int16 { return int16(d.uint16()) }
-
-func (e *encoder) int16(x int16) { e.uint16(uint16(x)) }
-
-func (d *decoder) int32() int32 { return int32(d.uint32()) }
-
-func (e *encoder) int32(x int32) { e.uint32(uint32(x)) }
-
-func (d *decoder) int64() int64 { return int64(d.uint64()) }
-
-func (e *encoder) int64(x int64) { e.uint64(uint64(x)) }
-
-func (d *decoder) value(v reflect.Value) {
-	switch v.Kind() {
-	case reflect.Array:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			d.value(v.Index(i))
-		}
-
-	case reflect.Struct:
-		t := v.Type()
-		l := v.NumField()
-		for i := 0; i < l; i++ {
-			// Note: Calling v.CanSet() below is an optimization.
-			// It would be sufficient to check the field name,
-			// but creating the StructField info for each field is
-			// costly (run "go test -bench=ReadStruct" and compare
-			// results when making changes to this code).
-			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
-				d.value(v)
-			} else {
-				d.skip(v)
-			}
-		}
-
-	case reflect.Slice:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			d.value(v.Index(i))
-		}
-
-	case reflect.Int8:
-		v.SetInt(int64(d.int8()))
-	case reflect.Int16:
-		v.SetInt(int64(d.int16()))
-	case reflect.Int32:
-		v.SetInt(int64(d.int32()))
-	case reflect.Int64:
-		v.SetInt(d.int64())
-
-	case reflect.Uint8:
-		v.SetUint(uint64(d.uint8()))
-	case reflect.Uint16:
-		v.SetUint(uint64(d.uint16()))
-	case reflect.Uint32:
-		v.SetUint(uint64(d.uint32()))
-	case reflect.Uint64:
-		v.SetUint(d.uint64())
-
-	case reflect.Float32:
-		v.SetFloat(float64(math.Float32frombits(d.uint32())))
-	case reflect.Float64:
-		v.SetFloat(math.Float64frombits(d.uint64()))
-
-	case reflect.Complex64:
-		v.SetComplex(complex(
-			float64(math.Float32frombits(d.uint32())),
-			float64(math.Float32frombits(d.uint32())),
-		))
-	case reflect.Complex128:
-		v.SetComplex(complex(
-			math.Float64frombits(d.uint64()),
-			math.Float64frombits(d.uint64()),
-		))
-	}
-}
-
-func (e *encoder) value(v reflect.Value) {
-	switch v.Kind() {
-	case reflect.Array:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			e.value(v.Index(i))
-		}
-
-	case reflect.Struct:
-		t := v.Type()
-		l := v.NumField()
-		for i := 0; i < l; i++ {
-			// see comment for corresponding code in decoder.value()
-			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
-				e.value(v)
-			} else {
-				e.skip(v)
-			}
-		}
-
-	case reflect.Slice:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			e.value(v.Index(i))
-		}
-
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch v.Type().Kind() {
-		case reflect.Int8:
-			e.int8(int8(v.Int()))
-		case reflect.Int16:
-			e.int16(int16(v.Int()))
-		case reflect.Int32:
-			e.int32(int32(v.Int()))
-		case reflect.Int64:
-			e.int64(v.Int())
-		}
-
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch v.Type().Kind() {
-		case reflect.Uint8:
-			e.uint8(uint8(v.Uint()))
-		case reflect.Uint16:
-			e.uint16(uint16(v.Uint()))
-		case reflect.Uint32:
-			e.uint32(uint32(v.Uint()))
-		case reflect.Uint64:
-			e.uint64(v.Uint())
-		}
-
-	case reflect.Float32, reflect.Float64:
-		switch v.Type().Kind() {
-		case reflect.Float32:
-			e.uint32(math.Float32bits(float32(v.Float())))
-		case reflect.Float64:
-			e.uint64(math.Float64bits(v.Float()))
-		}
-
-	case reflect.Complex64, reflect.Complex128:
-		switch v.Type().Kind() {
-		case reflect.Complex64:
-			x := v.Complex()
-			e.uint32(math.Float32bits(float32(real(x))))
-			e.uint32(math.Float32bits(float32(imag(x))))
-		case reflect.Complex128:
-			x := v.Complex()
-			e.uint64(math.Float64bits(real(x)))
-			e.uint64(math.Float64bits(imag(x)))
-		}
-	}
-}
-
-func (d *decoder) skip(v reflect.Value) {
-	d.buf = d.buf[dataSize(v):]
-}
-
-func (e *encoder) skip(v reflect.Value) {
-	n := dataSize(v)
-	for i := range e.buf[0:n] {
-		e.buf[i] = 0
-	}
-	e.buf = e.buf[n:]
-}
-
-// intDataSize returns the size of the data required to represent the data when encoded.
-// It returns zero if the type cannot be implemented by the fast path in Read or Write.
-func intDataSize(data interface{}) int {
-	switch data := data.(type) {
-	case int8, *int8, *uint8:
-		return 1
-	case []int8:
-		return len(data)
-	case []uint8:
-		return len(data)
-	case int16, *int16, *uint16:
-		return 2
-	case []int16:
-		return 2 * len(data)
-	case []uint16:
-		return 2 * len(data)
-	case int32, *int32, *uint32:
-		return 4
-	case []int32:
-		return 4 * len(data)
-	case []uint32:
-		return 4 * len(data)
-	case int64, *int64, *uint64:
-		return 8
-	case []int64:
-		return 8 * len(data)
-	case []uint64:
-		return 8 * len(data)
-	}
-	return 0
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common.go
deleted file mode 100644
index d9dce5cac3..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common.go
+++ /dev/null
@@ -1,279 +0,0 @@
-package common
-
-//
-// gopsutil is a port of psutil(http://pythonhosted.org/psutil/).
-// This covers these architectures.
-//  - linux (amd64, arm)
-//  - freebsd (amd64)
-//  - windows (amd64)
-import (
-	"bufio"
-	"errors"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strconv"
-	"strings"
-)
-
-type Invoker interface {
-	Command(string, ...string) ([]byte, error)
-}
-
-type Invoke struct{}
-
-func (i Invoke) Command(name string, arg ...string) ([]byte, error) {
-	return exec.Command(name, arg...).Output()
-}
-
-type FakeInvoke struct {
-	CommandExpectedDir string // CommandExpectedDir specifies dir which includes expected outputs.
-	Suffix             string // Suffix species expected file name suffix such as "fail"
-	Error              error  // If Error specfied, return the error.
-}
-
-// Command in FakeInvoke returns from expected file if exists.
-func (i FakeInvoke) Command(name string, arg ...string) ([]byte, error) {
-	if i.Error != nil {
-		return []byte{}, i.Error
-	}
-
-	arch := runtime.GOOS
-
-	fname := strings.Join(append([]string{name}, arg...), "")
-	fname = url.QueryEscape(fname)
-	var dir string
-	if i.CommandExpectedDir == "" {
-		dir = "expected"
-	} else {
-		dir = i.CommandExpectedDir
-	}
-	fpath := path.Join(dir, arch, fname)
-	if i.Suffix != "" {
-		fpath += "_" + i.Suffix
-	}
-	if PathExists(fpath) {
-		return ioutil.ReadFile(fpath)
-	}
-	return exec.Command(name, arg...).Output()
-}
-
-var ErrNotImplementedError = errors.New("not implemented yet")
-
-// ReadLines reads contents from a file and splits them by new lines.
-// A convenience wrapper to ReadLinesOffsetN(filename, 0, -1).
-func ReadLines(filename string) ([]string, error) {
-	return ReadLinesOffsetN(filename, 0, -1)
-}
-
-// ReadLines reads contents from file and splits them by new line.
-// The offset tells at which line number to start.
-// The count determines the number of lines to read (starting from offset):
-//   n >= 0: at most n lines
-//   n < 0: whole file
-func ReadLinesOffsetN(filename string, offset uint, n int) ([]string, error) {
-	f, err := os.Open(filename)
-	if err != nil {
-		return []string{""}, err
-	}
-	defer f.Close()
-
-	var ret []string
-
-	r := bufio.NewReader(f)
-	for i := 0; i < n+int(offset) || n < 0; i++ {
-		line, err := r.ReadString('\n')
-		if err != nil {
-			break
-		}
-		if i < int(offset) {
-			continue
-		}
-		ret = append(ret, strings.Trim(line, "\n"))
-	}
-
-	return ret, nil
-}
-
-func IntToString(orig []int8) string {
-	ret := make([]byte, len(orig))
-	size := -1
-	for i, o := range orig {
-		if o == 0 {
-			size = i
-			break
-		}
-		ret[i] = byte(o)
-	}
-	if size == -1 {
-		size = len(orig)
-	}
-
-	return string(ret[0:size])
-}
-
-func ByteToString(orig []byte) string {
-	n := -1
-	l := -1
-	for i, b := range orig {
-		// skip left side null
-		if l == -1 && b == 0 {
-			continue
-		}
-		if l == -1 {
-			l = i
-		}
-
-		if b == 0 {
-			break
-		}
-		n = i + 1
-	}
-	if n == -1 {
-		return string(orig)
-	}
-	return string(orig[l:n])
-}
-
-// ReadInts reads contents from single line file and returns them as []int32.
-func ReadInts(filename string) ([]int64, error) {
-	f, err := os.Open(filename)
-	if err != nil {
-		return []int64{}, err
-	}
-	defer f.Close()
-
-	var ret []int64
-
-	r := bufio.NewReader(f)
-
-	// The int files that this is concerned with should only be one liners.
-	line, err := r.ReadString('\n')
-	if err != nil {
-		return []int64{}, err
-	}
-
-	i, err := strconv.ParseInt(strings.Trim(line, "\n"), 10, 32)
-	if err != nil {
-		return []int64{}, err
-	}
-	ret = append(ret, i)
-
-	return ret, nil
-}
-
-// Parse to int32 without error
-func mustParseInt32(val string) int32 {
-	vv, _ := strconv.ParseInt(val, 10, 32)
-	return int32(vv)
-}
-
-// Parse to uint64 without error
-func mustParseUint64(val string) uint64 {
-	vv, _ := strconv.ParseInt(val, 10, 64)
-	return uint64(vv)
-}
-
-// Parse to Float64 without error
-func mustParseFloat64(val string) float64 {
-	vv, _ := strconv.ParseFloat(val, 64)
-	return vv
-}
-
-// StringsHas checks the target string slice contains src or not
-func StringsHas(target []string, src string) bool {
-	for _, t := range target {
-		if strings.TrimSpace(t) == src {
-			return true
-		}
-	}
-	return false
-}
-
-// StringsContains checks the src in any string of the target string slice
-func StringsContains(target []string, src string) bool {
-	for _, t := range target {
-		if strings.Contains(t, src) {
-			return true
-		}
-	}
-	return false
-}
-
-// IntContains checks the src in any int of the target int slice.
-func IntContains(target []int, src int) bool {
-	for _, t := range target {
-		if src == t {
-			return true
-		}
-	}
-	return false
-}
-
-// get struct attributes.
-// This method is used only for debugging platform dependent code.
-func attributes(m interface{}) map[string]reflect.Type {
-	typ := reflect.TypeOf(m)
-	if typ.Kind() == reflect.Ptr {
-		typ = typ.Elem()
-	}
-
-	attrs := make(map[string]reflect.Type)
-	if typ.Kind() != reflect.Struct {
-		return nil
-	}
-
-	for i := 0; i < typ.NumField(); i++ {
-		p := typ.Field(i)
-		if !p.Anonymous {
-			attrs[p.Name] = p.Type
-		}
-	}
-
-	return attrs
-}
-
-func PathExists(filename string) bool {
-	if _, err := os.Stat(filename); err == nil {
-		return true
-	}
-	return false
-}
-
-//GetEnv retrieves the environment variable key. If it does not exist it returns the default.
-func GetEnv(key string, dfault string, combineWith ...string) string {
-	value := os.Getenv(key)
-	if value == "" {
-		value = dfault
-	}
-
-	switch len(combineWith) {
-	case 0:
-		return value
-	case 1:
-		return filepath.Join(value, combineWith[0])
-	default:
-		all := make([]string, len(combineWith)+1)
-		all[0] = value
-		copy(all[1:], combineWith)
-		return filepath.Join(all...)
-	}
-	panic("invalid switch case")
-}
-
-func HostProc(combineWith ...string) string {
-	return GetEnv("HOST_PROC", "/proc", combineWith...)
-}
-
-func HostSys(combineWith ...string) string {
-	return GetEnv("HOST_SYS", "/sys", combineWith...)
-}
-
-func HostEtc(combineWith ...string) string {
-	return GetEnv("HOST_ETC", "/etc", combineWith...)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_darwin.go
deleted file mode 100644
index 2e1552aeee..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_darwin.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// +build darwin
-
-package common
-
-import (
-	"os"
-	"os/exec"
-	"strings"
-	"syscall"
-	"unsafe"
-)
-
-func DoSysctrl(mib string) ([]string, error) {
-	err := os.Setenv("LC_ALL", "C")
-	if err != nil {
-		return []string{}, err
-	}
-
-	sysctl, err := exec.LookPath("/usr/sbin/sysctl")
-	if err != nil {
-		return []string{}, err
-	}
-	out, err := exec.Command(sysctl, "-n", mib).Output()
-	if err != nil {
-		return []string{}, err
-	}
-	v := strings.Replace(string(out), "{ ", "", 1)
-	v = strings.Replace(string(v), " }", "", 1)
-	values := strings.Fields(string(v))
-
-	return values, nil
-}
-
-func CallSyscall(mib []int32) ([]byte, uint64, error) {
-	miblen := uint64(len(mib))
-
-	// get required buffer size
-	length := uint64(0)
-	_, _, err := syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(unsafe.Pointer(&mib[0])),
-		uintptr(miblen),
-		0,
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if err != 0 {
-		var b []byte
-		return b, length, err
-	}
-	if length == 0 {
-		var b []byte
-		return b, length, err
-	}
-	// get proc info itself
-	buf := make([]byte, length)
-	_, _, err = syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(unsafe.Pointer(&mib[0])),
-		uintptr(miblen),
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if err != 0 {
-		return buf, length, err
-	}
-
-	return buf, length, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_freebsd.go
deleted file mode 100644
index dfdcebd8d7..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_freebsd.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// +build freebsd
-
-package common
-
-import (
-	"os"
-	"os/exec"
-	"strings"
-	"syscall"
-	"unsafe"
-)
-
-func DoSysctrl(mib string) ([]string, error) {
-	err := os.Setenv("LC_ALL", "C")
-	if err != nil {
-		return []string{}, err
-	}
-	sysctl, err := exec.LookPath("/sbin/sysctl")
-	if err != nil {
-		return []string{}, err
-	}
-	out, err := exec.Command(sysctl, "-n", mib).Output()
-	if err != nil {
-		return []string{}, err
-	}
-	v := strings.Replace(string(out), "{ ", "", 1)
-	v = strings.Replace(string(v), " }", "", 1)
-	values := strings.Fields(string(v))
-
-	return values, nil
-}
-
-func CallSyscall(mib []int32) ([]byte, uint64, error) {
-	mibptr := unsafe.Pointer(&mib[0])
-	miblen := uint64(len(mib))
-
-	// get required buffer size
-	length := uint64(0)
-	_, _, err := syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(mibptr),
-		uintptr(miblen),
-		0,
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if err != 0 {
-		var b []byte
-		return b, length, err
-	}
-	if length == 0 {
-		var b []byte
-		return b, length, err
-	}
-	// get proc info itself
-	buf := make([]byte, length)
-	_, _, err = syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(mibptr),
-		uintptr(miblen),
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if err != 0 {
-		return buf, length, err
-	}
-
-	return buf, length, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_linux.go
deleted file mode 100644
index 0a122e9d6a..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_linux.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build linux
-
-package common
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_unix.go
deleted file mode 100644
index 6622eecc2e..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_unix.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// +build linux freebsd darwin
-
-package common
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-)
-
-func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
-	var cmd []string
-	if pid == 0 { // will get from all processes.
-		cmd = []string{"-a", "-n", "-P"}
-	} else {
-		cmd = []string{"-a", "-n", "-P", "-p", strconv.Itoa(int(pid))}
-	}
-	cmd = append(cmd, args...)
-	lsof, err := exec.LookPath("lsof")
-	if err != nil {
-		return []string{}, err
-	}
-	out, err := invoke.Command(lsof, cmd...)
-	if err != nil {
-		// if no pid found, lsof returnes code 1.
-		if err.Error() == "exit status 1" && len(out) == 0 {
-			return []string{}, nil
-		}
-	}
-	lines := strings.Split(string(out), "\n")
-
-	var ret []string
-	for _, l := range lines[1:] {
-		if len(l) == 0 {
-			continue
-		}
-		ret = append(ret, l)
-	}
-	return ret, nil
-}
-
-func CallPgrep(invoke Invoker, pid int32) ([]int32, error) {
-	var cmd []string
-	cmd = []string{"-P", strconv.Itoa(int(pid))}
-	pgrep, err := exec.LookPath("pgrep")
-	if err != nil {
-		return []int32{}, err
-	}
-	out, err := invoke.Command(pgrep, cmd...)
-	if err != nil {
-		return []int32{}, err
-	}
-	lines := strings.Split(string(out), "\n")
-	ret := make([]int32, 0, len(lines))
-	for _, l := range lines {
-		if len(l) == 0 {
-			continue
-		}
-		i, err := strconv.Atoi(l)
-		if err != nil {
-			continue
-		}
-		ret = append(ret, int32(i))
-	}
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_windows.go
deleted file mode 100644
index d727378cbe..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/internal/common/common_windows.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// +build windows
-
-package common
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// for double values
-type PDH_FMT_COUNTERVALUE_DOUBLE struct {
-	CStatus     uint32
-	DoubleValue float64
-}
-
-// for 64 bit integer values
-type PDH_FMT_COUNTERVALUE_LARGE struct {
-	CStatus    uint32
-	LargeValue int64
-}
-
-// for long values
-type PDH_FMT_COUNTERVALUE_LONG struct {
-	CStatus   uint32
-	LongValue int32
-	padding   [4]byte
-}
-
-// windows system const
-const (
-	ERROR_SUCCESS        = 0
-	ERROR_FILE_NOT_FOUND = 2
-	DRIVE_REMOVABLE      = 2
-	DRIVE_FIXED          = 3
-	HKEY_LOCAL_MACHINE   = 0x80000002
-	RRF_RT_REG_SZ        = 0x00000002
-	RRF_RT_REG_DWORD     = 0x00000010
-	PDH_FMT_LONG         = 0x00000100
-	PDH_FMT_DOUBLE       = 0x00000200
-	PDH_FMT_LARGE        = 0x00000400
-	PDH_INVALID_DATA     = 0xc0000bc6
-	PDH_INVALID_HANDLE   = 0xC0000bbc
-	PDH_NO_DATA          = 0x800007d5
-)
-
-var (
-	Modkernel32 = syscall.NewLazyDLL("kernel32.dll")
-	ModNt       = syscall.NewLazyDLL("ntdll.dll")
-	ModPdh      = syscall.NewLazyDLL("pdh.dll")
-
-	ProcGetSystemTimes           = Modkernel32.NewProc("GetSystemTimes")
-	ProcNtQuerySystemInformation = ModNt.NewProc("NtQuerySystemInformation")
-	PdhOpenQuery                 = ModPdh.NewProc("PdhOpenQuery")
-	PdhAddCounter                = ModPdh.NewProc("PdhAddCounterW")
-	PdhCollectQueryData          = ModPdh.NewProc("PdhCollectQueryData")
-	PdhGetFormattedCounterValue  = ModPdh.NewProc("PdhGetFormattedCounterValue")
-	PdhCloseQuery                = ModPdh.NewProc("PdhCloseQuery")
-)
-
-type FILETIME struct {
-	DwLowDateTime  uint32
-	DwHighDateTime uint32
-}
-
-// borrowed from net/interface_windows.go
-func BytePtrToString(p *uint8) string {
-	a := (*[10000]uint8)(unsafe.Pointer(p))
-	i := 0
-	for a[i] != 0 {
-		i++
-	}
-	return string(a[:i])
-}
-
-// CounterInfo
-// copied from https://github.com/mackerelio/mackerel-agent/
-type CounterInfo struct {
-	PostName    string
-	CounterName string
-	Counter     syscall.Handle
-}
-
-// CreateQuery XXX
-// copied from https://github.com/mackerelio/mackerel-agent/
-func CreateQuery() (syscall.Handle, error) {
-	var query syscall.Handle
-	r, _, err := PdhOpenQuery.Call(0, 0, uintptr(unsafe.Pointer(&query)))
-	if r != 0 {
-		return 0, err
-	}
-	return query, nil
-}
-
-// CreateCounter XXX
-func CreateCounter(query syscall.Handle, pname, cname string) (*CounterInfo, error) {
-	var counter syscall.Handle
-	r, _, err := PdhAddCounter.Call(
-		uintptr(query),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(cname))),
-		0,
-		uintptr(unsafe.Pointer(&counter)))
-	if r != 0 {
-		return nil, err
-	}
-	return &CounterInfo{
-		PostName:    pname,
-		CounterName: cname,
-		Counter:     counter,
-	}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go
deleted file mode 100644
index dfe32a1e81..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package load
-
-import (
-	"encoding/json"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var invoke common.Invoker
-
-func init() {
-	invoke = common.Invoke{}
-}
-
-type AvgStat struct {
-	Load1  float64 `json:"load1"`
-	Load5  float64 `json:"load5"`
-	Load15 float64 `json:"load15"`
-}
-
-func (l AvgStat) String() string {
-	s, _ := json.Marshal(l)
-	return string(s)
-}
-
-type MiscStat struct {
-	ProcsRunning int `json:"procsRunning"`
-	ProcsBlocked int `json:"procsBlocked"`
-	Ctxt         int `json:"ctxt"`
-}
-
-func (m MiscStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go
deleted file mode 100644
index 34e0653aed..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// +build darwin
-
-package load
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func Avg() (*AvgStat, error) {
-	values, err := common.DoSysctrl("vm.loadavg")
-	if err != nil {
-		return nil, err
-	}
-
-	load1, err := strconv.ParseFloat(values[0], 64)
-	if err != nil {
-		return nil, err
-	}
-	load5, err := strconv.ParseFloat(values[1], 64)
-	if err != nil {
-		return nil, err
-	}
-	load15, err := strconv.ParseFloat(values[2], 64)
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &AvgStat{
-		Load1:  float64(load1),
-		Load5:  float64(load5),
-		Load15: float64(load15),
-	}
-
-	return ret, nil
-}
-
-// Misc returnes miscellaneous host-wide statistics.
-// darwin use ps command to get process running/blocked count.
-// Almost same as FreeBSD implementation, but state is different.
-// U means 'Uninterruptible Sleep'.
-func Misc() (*MiscStat, error) {
-	bin, err := exec.LookPath("ps")
-	if err != nil {
-		return nil, err
-	}
-	out, err := invoke.Command(bin, "axo", "state")
-	if err != nil {
-		return nil, err
-	}
-	lines := strings.Split(string(out), "\n")
-
-	ret := MiscStat{}
-	for _, l := range lines {
-		if strings.Contains(l, "R") {
-			ret.ProcsRunning++
-		} else if strings.Contains(l, "U") {
-			// uninterruptible sleep == blocked
-			ret.ProcsBlocked++
-		}
-	}
-
-	return &ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go
deleted file mode 100644
index 6d3a0bafab..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// +build freebsd
-
-package load
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func Avg() (*AvgStat, error) {
-	values, err := common.DoSysctrl("vm.loadavg")
-	if err != nil {
-		return nil, err
-	}
-
-	load1, err := strconv.ParseFloat(values[0], 64)
-	if err != nil {
-		return nil, err
-	}
-	load5, err := strconv.ParseFloat(values[1], 64)
-	if err != nil {
-		return nil, err
-	}
-	load15, err := strconv.ParseFloat(values[2], 64)
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &AvgStat{
-		Load1:  float64(load1),
-		Load5:  float64(load5),
-		Load15: float64(load15),
-	}
-
-	return ret, nil
-}
-
-// Misc returnes miscellaneous host-wide statistics.
-// darwin use ps command to get process running/blocked count.
-// Almost same as Darwin implementation, but state is different.
-func Misc() (*MiscStat, error) {
-	bin, err := exec.LookPath("ps")
-	if err != nil {
-		return nil, err
-	}
-	out, err := invoke.Command(bin, "axo", "state")
-	if err != nil {
-		return nil, err
-	}
-	lines := strings.Split(string(out), "\n")
-
-	ret := MiscStat{}
-	for _, l := range lines {
-		if strings.Contains(l, "R") {
-			ret.ProcsRunning++
-		} else if strings.Contains(l, "D") {
-			ret.ProcsBlocked++
-		}
-	}
-
-	return &ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go
deleted file mode 100644
index c455397bf8..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// +build linux
-
-package load
-
-import (
-	"io/ioutil"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func Avg() (*AvgStat, error) {
-	filename := common.HostProc("loadavg")
-	line, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	values := strings.Fields(string(line))
-
-	load1, err := strconv.ParseFloat(values[0], 64)
-	if err != nil {
-		return nil, err
-	}
-	load5, err := strconv.ParseFloat(values[1], 64)
-	if err != nil {
-		return nil, err
-	}
-	load15, err := strconv.ParseFloat(values[2], 64)
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &AvgStat{
-		Load1:  load1,
-		Load5:  load5,
-		Load15: load15,
-	}
-
-	return ret, nil
-}
-
-// Misc returnes miscellaneous host-wide statistics.
-// Note: the name should be changed near future.
-func Misc() (*MiscStat, error) {
-	filename := common.HostProc("stat")
-	out, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &MiscStat{}
-	lines := strings.Split(string(out), "\n")
-	for _, line := range lines {
-		fields := strings.Fields(line)
-		if len(fields) != 2 {
-			continue
-		}
-		v, err := strconv.ParseInt(fields[1], 10, 64)
-		if err != nil {
-			continue
-		}
-		switch fields[0] {
-		case "procs_running":
-			ret.ProcsRunning = int(v)
-		case "procs_blocked":
-			ret.ProcsBlocked = int(v)
-		case "ctxt":
-			ret.Ctxt = int(v)
-		default:
-			continue
-		}
-
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go
deleted file mode 100644
index c45c15442c..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build windows
-
-package load
-
-import (
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func Avg() (*AvgStat, error) {
-	ret := AvgStat{}
-
-	return &ret, common.ErrNotImplementedError
-}
-
-func Misc() (*MiscStat, error) {
-	ret := MiscStat{}
-
-	return &ret, common.ErrNotImplementedError
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go
deleted file mode 100644
index 5f122d11b1..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package mem
-
-import (
-	"encoding/json"
-)
-
-// Memory usage statistics. Total, Available and Used contain numbers of bytes
-// for human consumption.
-//
-// The other fields in this struct contain kernel specific values.
-type VirtualMemoryStat struct {
-	// Total amount of RAM on this system
-	Total uint64 `json:"total"`
-
-	// RAM available for programs to allocate
-	//
-	// This value is computed from the kernel specific values.
-	Available uint64 `json:"available"`
-
-	// RAM used by programs
-	//
-	// This value is computed from the kernel specific values.
-	Used uint64 `json:"used"`
-
-	// Percentage of RAM used by programs
-	//
-	// This value is computed from the kernel specific values.
-	UsedPercent float64 `json:"usedPercent"`
-
-	// This is the kernel's notion of free memory; RAM chips whose bits nobody
-	// cares about the value of right now. For a human consumable number,
-	// Available is what you really want.
-	Free uint64 `json:"free"`
-
-	// OS X / BSD specific numbers:
-	// http://www.macyourself.com/2010/02/17/what-is-free-wired-active-and-inactive-system-memory-ram/
-	Active   uint64 `json:"active"`
-	Inactive uint64 `json:"inactive"`
-	Wired    uint64 `json:"wired"`
-
-	// Linux specific numbers
-	// https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s2-proc-meminfo.html
-	Buffers uint64 `json:"buffers"`
-	Cached  uint64 `json:"cached"`
-}
-
-type SwapMemoryStat struct {
-	Total       uint64  `json:"total"`
-	Used        uint64  `json:"used"`
-	Free        uint64  `json:"free"`
-	UsedPercent float64 `json:"usedPercent"`
-	Sin         uint64  `json:"sin"`
-	Sout        uint64  `json:"sout"`
-}
-
-func (m VirtualMemoryStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
-
-func (m SwapMemoryStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go
deleted file mode 100644
index 922b05cb4f..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// +build darwin
-
-package mem
-
-import (
-	"encoding/binary"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func getHwMemsize() (uint64, error) {
-	totalString, err := syscall.Sysctl("hw.memsize")
-	if err != nil {
-		return 0, err
-	}
-
-	// syscall.sysctl() helpfully assumes the result is a null-terminated string and
-	// removes the last byte of the result if it's 0 :/
-	totalString += "\x00"
-
-	total := uint64(binary.LittleEndian.Uint64([]byte(totalString)))
-
-	return total, nil
-}
-
-// SwapMemory returns swapinfo.
-func SwapMemory() (*SwapMemoryStat, error) {
-	var ret *SwapMemoryStat
-
-	swapUsage, err := common.DoSysctrl("vm.swapusage")
-	if err != nil {
-		return ret, err
-	}
-
-	total := strings.Replace(swapUsage[2], "M", "", 1)
-	used := strings.Replace(swapUsage[5], "M", "", 1)
-	free := strings.Replace(swapUsage[8], "M", "", 1)
-
-	total_v, err := strconv.ParseFloat(total, 64)
-	if err != nil {
-		return nil, err
-	}
-	used_v, err := strconv.ParseFloat(used, 64)
-	if err != nil {
-		return nil, err
-	}
-	free_v, err := strconv.ParseFloat(free, 64)
-	if err != nil {
-		return nil, err
-	}
-
-	u := float64(0)
-	if total_v != 0 {
-		u = ((total_v - free_v) / total_v) * 100.0
-	}
-
-	// vm.swapusage shows "M", multiply 1000
-	ret = &SwapMemoryStat{
-		Total:       uint64(total_v * 1000),
-		Used:        uint64(used_v * 1000),
-		Free:        uint64(free_v * 1000),
-		UsedPercent: u,
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go
deleted file mode 100644
index 461631976e..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_cgo.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// +build darwin
-// +build cgo
-
-package mem
-
-/*
-#include <mach/mach_host.h>
-*/
-import "C"
-
-import (
-	"fmt"
-	"syscall"
-	"unsafe"
-)
-
-// VirtualMemory returns VirtualmemoryStat.
-func VirtualMemory() (*VirtualMemoryStat, error) {
-	count := C.mach_msg_type_number_t(C.HOST_VM_INFO_COUNT)
-	var vmstat C.vm_statistics_data_t
-
-	status := C.host_statistics(C.host_t(C.mach_host_self()),
-		C.HOST_VM_INFO,
-		C.host_info_t(unsafe.Pointer(&vmstat)),
-		&count)
-
-	if status != C.KERN_SUCCESS {
-		return nil, fmt.Errorf("host_statistics error=%d", status)
-	}
-
-	pageSize := uint64(syscall.Getpagesize())
-	total, err := getHwMemsize()
-	if err != nil {
-		return nil, err
-	}
-	totalCount := C.natural_t(total / pageSize)
-
-	availableCount := vmstat.inactive_count + vmstat.free_count
-	usedPercent := 100 * float64(totalCount-availableCount) / float64(totalCount)
-
-	usedCount := totalCount - availableCount
-
-	return &VirtualMemoryStat{
-		Total:       total,
-		Available:   pageSize * uint64(availableCount),
-		Used:        pageSize * uint64(usedCount),
-		UsedPercent: usedPercent,
-		Free:        pageSize * uint64(vmstat.free_count),
-		Active:      pageSize * uint64(vmstat.active_count),
-		Inactive:    pageSize * uint64(vmstat.inactive_count),
-		Wired:       pageSize * uint64(vmstat.wire_count),
-	}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
deleted file mode 100644
index 7094802d9a..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// +build darwin
-// +build !cgo
-
-package mem
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-// Runs vm_stat and returns Free and inactive pages
-func getVMStat(vms *VirtualMemoryStat) error {
-	vm_stat, err := exec.LookPath("vm_stat")
-	if err != nil {
-		return err
-	}
-	out, err := exec.Command(vm_stat).Output()
-	if err != nil {
-		return err
-	}
-	return parseVMStat(string(out), vms)
-}
-
-func parseVMStat(out string, vms *VirtualMemoryStat) error {
-	var err error
-
-	lines := strings.Split(out, "\n")
-	pagesize := uint64(syscall.Getpagesize())
-	for _, line := range lines {
-		fields := strings.Split(line, ":")
-		if len(fields) < 2 {
-			continue
-		}
-		key := strings.TrimSpace(fields[0])
-		value := strings.Trim(fields[1], " .")
-		switch key {
-		case "Pages free":
-			free, e := strconv.ParseUint(value, 10, 64)
-			if e != nil {
-				err = e
-			}
-			vms.Free = free * pagesize
-		case "Pages inactive":
-			inactive, e := strconv.ParseUint(value, 10, 64)
-			if e != nil {
-				err = e
-			}
-			vms.Inactive = inactive * pagesize
-		case "Pages active":
-			active, e := strconv.ParseUint(value, 10, 64)
-			if e != nil {
-				err = e
-			}
-			vms.Active = active * pagesize
-		case "Pages wired down":
-			wired, e := strconv.ParseUint(value, 10, 64)
-			if e != nil {
-				err = e
-			}
-			vms.Wired = wired * pagesize
-		}
-	}
-	return err
-}
-
-// VirtualMemory returns VirtualmemoryStat.
-func VirtualMemory() (*VirtualMemoryStat, error) {
-	ret := &VirtualMemoryStat{}
-
-	total, err := getHwMemsize()
-	if err != nil {
-		return nil, err
-	}
-	err = getVMStat(ret)
-	if err != nil {
-		return nil, err
-	}
-
-	ret.Available = ret.Free + ret.Inactive
-	ret.Total = total
-
-	ret.Used = ret.Total - ret.Available
-	ret.UsedPercent = 100 * float64(ret.Used) / float64(ret.Total)
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go
deleted file mode 100644
index 7194057674..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// +build freebsd
-
-package mem
-
-import (
-	"errors"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func VirtualMemory() (*VirtualMemoryStat, error) {
-	pageSize, err := common.DoSysctrl("vm.stats.vm.v_page_size")
-	if err != nil {
-		return nil, err
-	}
-	p, err := strconv.ParseUint(pageSize[0], 10, 64)
-	if err != nil {
-		return nil, err
-	}
-
-	pageCount, err := common.DoSysctrl("vm.stats.vm.v_page_count")
-	if err != nil {
-		return nil, err
-	}
-	free, err := common.DoSysctrl("vm.stats.vm.v_free_count")
-	if err != nil {
-		return nil, err
-	}
-	active, err := common.DoSysctrl("vm.stats.vm.v_active_count")
-	if err != nil {
-		return nil, err
-	}
-	inactive, err := common.DoSysctrl("vm.stats.vm.v_inactive_count")
-	if err != nil {
-		return nil, err
-	}
-	cache, err := common.DoSysctrl("vm.stats.vm.v_cache_count")
-	if err != nil {
-		return nil, err
-	}
-	buffer, err := common.DoSysctrl("vfs.bufspace")
-	if err != nil {
-		return nil, err
-	}
-	wired, err := common.DoSysctrl("vm.stats.vm.v_wire_count")
-	if err != nil {
-		return nil, err
-	}
-
-	parsed := make([]uint64, 0, 7)
-	vv := []string{
-		pageCount[0],
-		free[0],
-		active[0],
-		inactive[0],
-		cache[0],
-		buffer[0],
-		wired[0],
-	}
-	for _, target := range vv {
-		t, err := strconv.ParseUint(target, 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		parsed = append(parsed, t)
-	}
-
-	ret := &VirtualMemoryStat{
-		Total:    parsed[0] * p,
-		Free:     parsed[1] * p,
-		Active:   parsed[2] * p,
-		Inactive: parsed[3] * p,
-		Cached:   parsed[4] * p,
-		Buffers:  parsed[5],
-		Wired:    parsed[6] * p,
-	}
-
-	ret.Available = ret.Inactive + ret.Cached + ret.Free
-	ret.Used = ret.Total - ret.Available
-	ret.UsedPercent = float64(ret.Used) / float64(ret.Total) * 100.0
-
-	return ret, nil
-}
-
-// Return swapinfo
-// FreeBSD can have multiple swap devices. but use only first device
-func SwapMemory() (*SwapMemoryStat, error) {
-	swapinfo, err := exec.LookPath("swapinfo")
-	if err != nil {
-		return nil, err
-	}
-
-	out, err := exec.Command(swapinfo).Output()
-	if err != nil {
-		return nil, err
-	}
-	for _, line := range strings.Split(string(out), "\n") {
-		values := strings.Fields(line)
-		// skip title line
-		if len(values) == 0 || values[0] == "Device" {
-			continue
-		}
-
-		u := strings.Replace(values[4], "%", "", 1)
-		total_v, err := strconv.ParseUint(values[1], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		used_v, err := strconv.ParseUint(values[2], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		free_v, err := strconv.ParseUint(values[3], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		up_v, err := strconv.ParseFloat(u, 64)
-		if err != nil {
-			return nil, err
-		}
-
-		return &SwapMemoryStat{
-			Total:       total_v,
-			Used:        used_v,
-			Free:        free_v,
-			UsedPercent: up_v,
-		}, nil
-	}
-
-	return nil, errors.New("no swap devices found")
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go
deleted file mode 100644
index 899da83dff..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// +build linux
-
-package mem
-
-import (
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func VirtualMemory() (*VirtualMemoryStat, error) {
-	filename := common.HostProc("meminfo")
-	lines, _ := common.ReadLines(filename)
-	// flag if MemAvailable is in /proc/meminfo (kernel 3.14+)
-	memavail := false
-
-	ret := &VirtualMemoryStat{}
-	for _, line := range lines {
-		fields := strings.Split(line, ":")
-		if len(fields) != 2 {
-			continue
-		}
-		key := strings.TrimSpace(fields[0])
-		value := strings.TrimSpace(fields[1])
-		value = strings.Replace(value, " kB", "", -1)
-
-		t, err := strconv.ParseUint(value, 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		switch key {
-		case "MemTotal":
-			ret.Total = t * 1024
-		case "MemFree":
-			ret.Free = t * 1024
-		case "MemAvailable":
-			memavail = true
-			ret.Available = t * 1024
-		case "Buffers":
-			ret.Buffers = t * 1024
-		case "Cached":
-			ret.Cached = t * 1024
-		case "Active":
-			ret.Active = t * 1024
-		case "Inactive":
-			ret.Inactive = t * 1024
-		}
-	}
-	if !memavail {
-		ret.Available = ret.Free + ret.Buffers + ret.Cached
-	}
-	ret.Used = ret.Total - ret.Available
-	ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0
-
-	return ret, nil
-}
-
-func SwapMemory() (*SwapMemoryStat, error) {
-	sysinfo := &syscall.Sysinfo_t{}
-
-	if err := syscall.Sysinfo(sysinfo); err != nil {
-		return nil, err
-	}
-	ret := &SwapMemoryStat{
-		Total: uint64(sysinfo.Totalswap),
-		Free:  uint64(sysinfo.Freeswap),
-	}
-	ret.Used = ret.Total - ret.Free
-	//check Infinity
-	if ret.Total != 0 {
-		ret.UsedPercent = float64(ret.Total-ret.Free) / float64(ret.Total) * 100.0
-	} else {
-		ret.UsedPercent = 0
-	}
-	filename := common.HostProc("vmstat")
-	lines, _ := common.ReadLines(filename)
-	for _, l := range lines {
-		fields := strings.Fields(l)
-		if len(fields) < 2 {
-			continue
-		}
-		switch fields[0] {
-		case "pswpin":
-			value, err := strconv.ParseUint(fields[1], 10, 64)
-			if err != nil {
-				continue
-			}
-			ret.Sin = value * 4 * 1024
-		case "pswpout":
-			value, err := strconv.ParseUint(fields[1], 10, 64)
-			if err != nil {
-				continue
-			}
-			ret.Sout = value * 4 * 1024
-		}
-	}
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go
deleted file mode 100644
index 045af49e39..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// +build windows
-
-package mem
-
-import (
-	"syscall"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var (
-	procGlobalMemoryStatusEx = common.Modkernel32.NewProc("GlobalMemoryStatusEx")
-)
-
-type memoryStatusEx struct {
-	cbSize                  uint32
-	dwMemoryLoad            uint32
-	ullTotalPhys            uint64 // in bytes
-	ullAvailPhys            uint64
-	ullTotalPageFile        uint64
-	ullAvailPageFile        uint64
-	ullTotalVirtual         uint64
-	ullAvailVirtual         uint64
-	ullAvailExtendedVirtual uint64
-}
-
-func VirtualMemory() (*VirtualMemoryStat, error) {
-	var memInfo memoryStatusEx
-	memInfo.cbSize = uint32(unsafe.Sizeof(memInfo))
-	mem, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(&memInfo)))
-	if mem == 0 {
-		return nil, syscall.GetLastError()
-	}
-
-	ret := &VirtualMemoryStat{
-		Total:       memInfo.ullTotalPhys,
-		Available:   memInfo.ullAvailPhys,
-		UsedPercent: float64(memInfo.dwMemoryLoad),
-	}
-
-	ret.Used = ret.Total - ret.Available
-	return ret, nil
-}
-
-func SwapMemory() (*SwapMemoryStat, error) {
-	ret := &SwapMemoryStat{}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go
deleted file mode 100644
index 60f1069c85..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go
+++ /dev/null
@@ -1,243 +0,0 @@
-package net
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var invoke common.Invoker
-
-func init() {
-	invoke = common.Invoke{}
-}
-
-type IOCountersStat struct {
-	Name        string `json:"name"`         // interface name
-	BytesSent   uint64 `json:"bytesSent"`   // number of bytes sent
-	BytesRecv   uint64 `json:"bytesRecv"`   // number of bytes received
-	PacketsSent uint64 `json:"packetsSent"` // number of packets sent
-	PacketsRecv uint64 `json:"packetsRecv"` // number of packets received
-	Errin       uint64 `json:"errin"`        // total number of errors while receiving
-	Errout      uint64 `json:"errout"`       // total number of errors while sending
-	Dropin      uint64 `json:"dropin"`       // total number of incoming packets which were dropped
-	Dropout     uint64 `json:"dropout"`      // total number of outgoing packets which were dropped (always 0 on OSX and BSD)
-}
-
-// Addr is implemented compatibility to psutil
-type Addr struct {
-	IP   string `json:"ip"`
-	Port uint32 `json:"port"`
-}
-
-type ConnectionStat struct {
-	Fd     uint32 `json:"fd"`
-	Family uint32 `json:"family"`
-	Type   uint32 `json:"type"`
-	Laddr  Addr   `json:"localaddr"`
-	Raddr  Addr   `json:"remoteaddr"`
-	Status string `json:"status"`
-	Pid    int32  `json:"pid"`
-}
-
-// System wide stats about different network protocols
-type ProtoCountersStat struct {
-	Protocol string           `json:"protocol"`
-	Stats    map[string]int64 `json:"stats"`
-}
-
-// NetInterfaceAddr is designed for represent interface addresses
-type InterfaceAddr struct {
-	Addr string `json:"addr"`
-}
-
-type InterfaceStat struct {
-	MTU          int             `json:"mtu"`          // maximum transmission unit
-	Name         string          `json:"name"`         // e.g., "en0", "lo0", "eth0.100"
-	HardwareAddr string          `json:"hardwareaddr"` // IEEE MAC-48, EUI-48 and EUI-64 form
-	Flags        []string        `json:"flags"`        // e.g., FlagUp, FlagLoopback, FlagMulticast
-	Addrs        []InterfaceAddr `json:"addrs"`
-}
-
-type FilterStat struct {
-	ConnTrackCount int64 `json:"conntrackCount"`
-	ConnTrackMax   int64 `json:"conntrackMax"`
-}
-
-var constMap = map[string]int{
-	"TCP":  syscall.SOCK_STREAM,
-	"UDP":  syscall.SOCK_DGRAM,
-	"IPv4": syscall.AF_INET,
-	"IPv6": syscall.AF_INET6,
-}
-
-func (n IOCountersStat) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func (n ConnectionStat) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func (n ProtoCountersStat) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func (a Addr) String() string {
-	s, _ := json.Marshal(a)
-	return string(s)
-}
-
-func (n InterfaceStat) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func (n InterfaceAddr) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func Interfaces() ([]InterfaceStat, error) {
-	is, err := net.Interfaces()
-	if err != nil {
-		return nil, err
-	}
-	ret := make([]InterfaceStat, 0, len(is))
-	for _, ifi := range is {
-
-		var flags []string
-		if ifi.Flags&net.FlagUp != 0 {
-			flags = append(flags, "up")
-		}
-		if ifi.Flags&net.FlagBroadcast != 0 {
-			flags = append(flags, "broadcast")
-		}
-		if ifi.Flags&net.FlagLoopback != 0 {
-			flags = append(flags, "loopback")
-		}
-		if ifi.Flags&net.FlagPointToPoint != 0 {
-			flags = append(flags, "pointtopoint")
-		}
-		if ifi.Flags&net.FlagMulticast != 0 {
-			flags = append(flags, "multicast")
-		}
-
-		r := InterfaceStat{
-			Name:         ifi.Name,
-			MTU:          ifi.MTU,
-			HardwareAddr: ifi.HardwareAddr.String(),
-			Flags:        flags,
-		}
-		addrs, err := ifi.Addrs()
-		if err == nil {
-			r.Addrs = make([]InterfaceAddr, 0, len(addrs))
-			for _, addr := range addrs {
-				r.Addrs = append(r.Addrs, InterfaceAddr{
-					Addr: addr.String(),
-				})
-			}
-
-		}
-		ret = append(ret, r)
-	}
-
-	return ret, nil
-}
-
-func getIOCountersAll(n []IOCountersStat) ([]IOCountersStat, error) {
-	r := IOCountersStat{
-		Name: "all",
-	}
-	for _, nic := range n {
-		r.BytesRecv += nic.BytesRecv
-		r.PacketsRecv += nic.PacketsRecv
-		r.Errin += nic.Errin
-		r.Dropin += nic.Dropin
-		r.BytesSent += nic.BytesSent
-		r.PacketsSent += nic.PacketsSent
-		r.Errout += nic.Errout
-		r.Dropout += nic.Dropout
-	}
-
-	return []IOCountersStat{r}, nil
-}
-
-func parseNetLine(line string) (ConnectionStat, error) {
-	f := strings.Fields(line)
-	if len(f) < 9 {
-		return ConnectionStat{}, fmt.Errorf("wrong line,%s", line)
-	}
-
-	pid, err := strconv.Atoi(f[1])
-	if err != nil {
-		return ConnectionStat{}, err
-	}
-	fd, err := strconv.Atoi(strings.Trim(f[3], "u"))
-	if err != nil {
-		return ConnectionStat{}, fmt.Errorf("unknown fd, %s", f[3])
-	}
-	netFamily, ok := constMap[f[4]]
-	if !ok {
-		return ConnectionStat{}, fmt.Errorf("unknown family, %s", f[4])
-	}
-	netType, ok := constMap[f[7]]
-	if !ok {
-		return ConnectionStat{}, fmt.Errorf("unknown type, %s", f[7])
-	}
-
-	laddr, raddr, err := parseNetAddr(f[8])
-	if err != nil {
-		return ConnectionStat{}, fmt.Errorf("failed to parse netaddr, %s", f[8])
-	}
-
-	n := ConnectionStat{
-		Fd:     uint32(fd),
-		Family: uint32(netFamily),
-		Type:   uint32(netType),
-		Laddr:  laddr,
-		Raddr:  raddr,
-		Pid:    int32(pid),
-	}
-	if len(f) == 10 {
-		n.Status = strings.Trim(f[9], "()")
-	}
-
-	return n, nil
-}
-
-func parseNetAddr(line string) (laddr Addr, raddr Addr, err error) {
-	parse := func(l string) (Addr, error) {
-		host, port, err := net.SplitHostPort(l)
-		if err != nil {
-			return Addr{}, fmt.Errorf("wrong addr, %s", l)
-		}
-		lport, err := strconv.Atoi(port)
-		if err != nil {
-			return Addr{}, err
-		}
-		return Addr{IP: host, Port: uint32(lport)}, nil
-	}
-
-	addrs := strings.Split(line, "->")
-	if len(addrs) == 0 {
-		return laddr, raddr, fmt.Errorf("wrong netaddr, %s", line)
-	}
-	laddr, err = parse(addrs[0])
-	if len(addrs) == 2 { // remote addr exists
-		raddr, err = parse(addrs[1])
-		if err != nil {
-			return laddr, raddr, err
-		}
-	}
-
-	return laddr, raddr, err
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go
deleted file mode 100644
index 4fa358a38c..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// +build darwin
-
-package net
-
-import (
-	"errors"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// example of netstat -idbn output on yosemite
-// Name  Mtu   Network       Address            Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
-// lo0   16384 <Link#1>                        869107     0  169411755   869107     0  169411755     0   0
-// lo0   16384 ::1/128     ::1                 869107     -  169411755   869107     -  169411755     -   -
-// lo0   16384 127           127.0.0.1         869107     -  169411755   869107     -  169411755     -   -
-func IOCounters(pernic bool) ([]IOCountersStat, error) {
-	netstat, err := exec.LookPath("/usr/sbin/netstat")
-	if err != nil {
-		return nil, err
-	}
-	out, err := exec.Command(netstat, "-ibdnW").Output()
-	if err != nil {
-		return nil, err
-	}
-
-	lines := strings.Split(string(out), "\n")
-	ret := make([]IOCountersStat, 0, len(lines)-1)
-	exists := make([]string, 0, len(ret))
-
-	for _, line := range lines {
-		values := strings.Fields(line)
-		if len(values) < 1 || values[0] == "Name" {
-			// skip first line
-			continue
-		}
-		if common.StringsHas(exists, values[0]) {
-			// skip if already get
-			continue
-		}
-		exists = append(exists, values[0])
-
-		base := 1
-		// sometimes Address is ommitted
-		if len(values) < 11 {
-			base = 0
-		}
-
-		parsed := make([]uint64, 0, 7)
-		vv := []string{
-			values[base+3], // Ipkts == PacketsRecv
-			values[base+4], // Ierrs == Errin
-			values[base+5], // Ibytes == BytesRecv
-			values[base+6], // Opkts == PacketsSent
-			values[base+7], // Oerrs == Errout
-			values[base+8], // Obytes == BytesSent
-		}
-		if len(values) == 12 {
-			vv = append(vv, values[base+10])
-		}
-
-		for _, target := range vv {
-			if target == "-" {
-				parsed = append(parsed, 0)
-				continue
-			}
-
-			t, err := strconv.ParseUint(target, 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			parsed = append(parsed, t)
-		}
-
-		n := IOCountersStat{
-			Name:        values[0],
-			PacketsRecv: parsed[0],
-			Errin:       parsed[1],
-			BytesRecv:   parsed[2],
-			PacketsSent: parsed[3],
-			Errout:      parsed[4],
-			BytesSent:   parsed[5],
-		}
-		if len(parsed) == 7 {
-			n.Dropout = parsed[6]
-		}
-		ret = append(ret, n)
-	}
-
-	if pernic == false {
-		return getIOCountersAll(ret)
-	}
-
-	return ret, nil
-}
-
-// NetIOCountersByFile is an method which is added just a compatibility for linux.
-func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
-	return IOCounters(pernic)
-}
-
-func FilterCounters() ([]FilterStat, error) {
-	return nil, errors.New("NetFilterCounters not implemented for darwin")
-}
-
-// NetProtoCounters returns network statistics for the entire system
-// If protocols is empty then all protocols are returned, otherwise
-// just the protocols in the list are returned.
-// Not Implemented for Darwin
-func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
-	return nil, errors.New("NetProtoCounters not implemented for darwin")
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go
deleted file mode 100644
index 3a67b4af4a..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// +build freebsd
-
-package net
-
-import (
-	"errors"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func IOCounters(pernic bool) ([]IOCountersStat, error) {
-	netstat, err := exec.LookPath("/usr/bin/netstat")
-	if err != nil {
-		return nil, err
-	}
-	out, err := exec.Command(netstat, "-ibdnW").Output()
-	if err != nil {
-		return nil, err
-	}
-
-	lines := strings.Split(string(out), "\n")
-	ret := make([]IOCountersStat, 0, len(lines)-1)
-	exists := make([]string, 0, len(ret))
-
-	for _, line := range lines {
-		values := strings.Fields(line)
-		if len(values) < 1 || values[0] == "Name" {
-			continue
-		}
-		if common.StringsHas(exists, values[0]) {
-			// skip if already get
-			continue
-		}
-		exists = append(exists, values[0])
-
-		if len(values) < 12 {
-			continue
-		}
-		base := 1
-		// sometimes Address is ommitted
-		if len(values) < 13 {
-			base = 0
-		}
-
-		parsed := make([]uint64, 0, 8)
-		vv := []string{
-			values[base+3],  // PacketsRecv
-			values[base+4],  // Errin
-			values[base+5],  // Dropin
-			values[base+6],  // BytesRecvn
-			values[base+7],  // PacketSent
-			values[base+8],  // Errout
-			values[base+9],  // BytesSent
-			values[base+11], // Dropout
-		}
-		for _, target := range vv {
-			if target == "-" {
-				parsed = append(parsed, 0)
-				continue
-			}
-
-			t, err := strconv.ParseUint(target, 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			parsed = append(parsed, t)
-		}
-
-		n := IOCountersStat{
-			Name:        values[0],
-			PacketsRecv: parsed[0],
-			Errin:       parsed[1],
-			Dropin:      parsed[2],
-			BytesRecv:   parsed[3],
-			PacketsSent: parsed[4],
-			Errout:      parsed[5],
-			BytesSent:   parsed[6],
-			Dropout:     parsed[7],
-		}
-		ret = append(ret, n)
-	}
-
-	if pernic == false {
-		return getIOCountersAll(ret)
-	}
-
-	return ret, nil
-}
-
-// NetIOCountersByFile is an method which is added just a compatibility for linux.
-func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
-	return IOCounters(pernic)
-}
-
-func FilterCounters() ([]FilterStat, error) {
-	return nil, errors.New("NetFilterCounters not implemented for freebsd")
-}
-
-// NetProtoCounters returns network statistics for the entire system
-// If protocols is empty then all protocols are returned, otherwise
-// just the protocols in the list are returned.
-// Not Implemented for FreeBSD
-func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
-	return nil, errors.New("NetProtoCounters not implemented for freebsd")
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go
deleted file mode 100644
index e0247714fe..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go
+++ /dev/null
@@ -1,620 +0,0 @@
-// +build linux
-
-package net
-
-import (
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// NetIOCounters returnes network I/O statistics for every network
-// interface installed on the system.  If pernic argument is false,
-// return only sum of all information (which name is 'all'). If true,
-// every network interface installed on the system is returned
-// separately.
-func IOCounters(pernic bool) ([]IOCountersStat, error) {
-	filename := common.HostProc("net/dev")
-	return IOCountersByFile(pernic, filename)
-}
-
-func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
-	lines, err := common.ReadLines(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	statlen := len(lines) - 1
-
-	ret := make([]IOCountersStat, 0, statlen)
-
-	for _, line := range lines[2:] {
-		parts := strings.SplitN(line, ":", 2)
-		if len(parts) != 2 {
-			continue
-		}
-		interfaceName := strings.TrimSpace(parts[0])
-		if interfaceName == "" {
-			continue
-		}
-
-		fields := strings.Fields(strings.TrimSpace(parts[1]))
-		bytesRecv, err := strconv.ParseUint(fields[0], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		packetsRecv, err := strconv.ParseUint(fields[1], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		errIn, err := strconv.ParseUint(fields[2], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		dropIn, err := strconv.ParseUint(fields[3], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		bytesSent, err := strconv.ParseUint(fields[8], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		packetsSent, err := strconv.ParseUint(fields[9], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		errOut, err := strconv.ParseUint(fields[10], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		dropOut, err := strconv.ParseUint(fields[13], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-
-		nic := IOCountersStat{
-			Name:        interfaceName,
-			BytesRecv:   bytesRecv,
-			PacketsRecv: packetsRecv,
-			Errin:       errIn,
-			Dropin:      dropIn,
-			BytesSent:   bytesSent,
-			PacketsSent: packetsSent,
-			Errout:      errOut,
-			Dropout:     dropOut,
-		}
-		ret = append(ret, nic)
-	}
-
-	if pernic == false {
-		return getIOCountersAll(ret)
-	}
-
-	return ret, nil
-}
-
-var netProtocols = []string{
-	"ip",
-	"icmp",
-	"icmpmsg",
-	"tcp",
-	"udp",
-	"udplite",
-}
-
-// NetProtoCounters returns network statistics for the entire system
-// If protocols is empty then all protocols are returned, otherwise
-// just the protocols in the list are returned.
-// Available protocols:
-//   ip,icmp,icmpmsg,tcp,udp,udplite
-func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
-	if len(protocols) == 0 {
-		protocols = netProtocols
-	}
-
-	stats := make([]ProtoCountersStat, 0, len(protocols))
-	protos := make(map[string]bool, len(protocols))
-	for _, p := range protocols {
-		protos[p] = true
-	}
-
-	filename := common.HostProc("net/snmp")
-	lines, err := common.ReadLines(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	linecount := len(lines)
-	for i := 0; i < linecount; i++ {
-		line := lines[i]
-		r := strings.IndexRune(line, ':')
-		if r == -1 {
-			return nil, errors.New(filename + " is not fomatted correctly, expected ':'.")
-		}
-		proto := strings.ToLower(line[:r])
-		if !protos[proto] {
-			// skip protocol and data line
-			i++
-			continue
-		}
-
-		// Read header line
-		statNames := strings.Split(line[r+2:], " ")
-
-		// Read data line
-		i++
-		statValues := strings.Split(lines[i][r+2:], " ")
-		if len(statNames) != len(statValues) {
-			return nil, errors.New(filename + " is not fomatted correctly, expected same number of columns.")
-		}
-		stat := ProtoCountersStat{
-			Protocol: proto,
-			Stats:    make(map[string]int64, len(statNames)),
-		}
-		for j := range statNames {
-			value, err := strconv.ParseInt(statValues[j], 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			stat.Stats[statNames[j]] = value
-		}
-		stats = append(stats, stat)
-	}
-	return stats, nil
-}
-
-// NetFilterCounters returns iptables conntrack statistics
-// the currently in use conntrack count and the max.
-// If the file does not exist or is invalid it will return nil.
-func FilterCounters() ([]FilterStat, error) {
-	countfile := common.HostProc("sys/net/netfilter/nf_conntrackCount")
-	maxfile := common.HostProc("sys/net/netfilter/nf_conntrackMax")
-
-	count, err := common.ReadInts(countfile)
-
-	if err != nil {
-		return nil, err
-	}
-	stats := make([]FilterStat, 0, 1)
-
-	max, err := common.ReadInts(maxfile)
-	if err != nil {
-		return nil, err
-	}
-
-	payload := FilterStat{
-		ConnTrackCount: count[0],
-		ConnTrackMax:   max[0],
-	}
-
-	stats = append(stats, payload)
-	return stats, nil
-}
-
-// http://students.mimuw.edu.pl/lxr/source/include/net/tcp_states.h
-var TCPStatuses = map[string]string{
-	"01": "ESTABLISHED",
-	"02": "SYN_SENT",
-	"03": "SYN_RECV",
-	"04": "FIN_WAIT1",
-	"05": "FIN_WAIT2",
-	"06": "TIME_WAIT",
-	"07": "CLOSE",
-	"08": "CLOSE_WAIT",
-	"09": "LAST_ACK",
-	"0A": "LISTEN",
-	"0B": "CLOSING",
-}
-
-type netConnectionKindType struct {
-	family   uint32
-	sockType uint32
-	filename string
-}
-
-var kindTCP4 = netConnectionKindType{
-	family:   syscall.AF_INET,
-	sockType: syscall.SOCK_STREAM,
-	filename: "tcp",
-}
-var kindTCP6 = netConnectionKindType{
-	family:   syscall.AF_INET6,
-	sockType: syscall.SOCK_STREAM,
-	filename: "tcp6",
-}
-var kindUDP4 = netConnectionKindType{
-	family:   syscall.AF_INET,
-	sockType: syscall.SOCK_DGRAM,
-	filename: "udp",
-}
-var kindUDP6 = netConnectionKindType{
-	family:   syscall.AF_INET6,
-	sockType: syscall.SOCK_DGRAM,
-	filename: "udp6",
-}
-var kindUNIX = netConnectionKindType{
-	family:   syscall.AF_UNIX,
-	filename: "unix",
-}
-
-var netConnectionKindMap = map[string][]netConnectionKindType{
-	"all":   []netConnectionKindType{kindTCP4, kindTCP6, kindUDP4, kindUDP6, kindUNIX},
-	"tcp":   []netConnectionKindType{kindTCP4, kindTCP6},
-	"tcp4":  []netConnectionKindType{kindTCP4},
-	"tcp6":  []netConnectionKindType{kindTCP6},
-	"udp":   []netConnectionKindType{kindUDP4, kindUDP6},
-	"udp4":  []netConnectionKindType{kindUDP4},
-	"udp6":  []netConnectionKindType{kindUDP6},
-	"unix":  []netConnectionKindType{kindUNIX},
-	"inet":  []netConnectionKindType{kindTCP4, kindTCP6, kindUDP4, kindUDP6},
-	"inet4": []netConnectionKindType{kindTCP4, kindUDP4},
-	"inet6": []netConnectionKindType{kindTCP6, kindUDP6},
-}
-
-type inodeMap struct {
-	pid int32
-	fd  uint32
-}
-
-type connTmp struct {
-	fd       uint32
-	family   uint32
-	sockType uint32
-	laddr    Addr
-	raddr    Addr
-	status   string
-	pid      int32
-	boundPid int32
-	path     string
-}
-
-// Return a list of network connections opened.
-func Connections(kind string) ([]ConnectionStat, error) {
-	return ConnectionsPid(kind, 0)
-}
-
-// Return a list of network connections opened by a process.
-func ConnectionsPid(kind string, pid int32) ([]ConnectionStat, error) {
-	tmap, ok := netConnectionKindMap[kind]
-	if !ok {
-		return nil, fmt.Errorf("invalid kind, %s", kind)
-	}
-	root := common.HostProc()
-	var err error
-	var inodes map[string][]inodeMap
-	if pid == 0 {
-		inodes, err = getProcInodesAll(root)
-	} else {
-		inodes, err = getProcInodes(root, pid)
-		if len(inodes) == 0 {
-			// no connection for the pid
-			return []ConnectionStat{}, nil
-		}
-	}
-	if err != nil {
-		return nil, fmt.Errorf("cound not get pid(s), %d", pid)
-	}
-
-	dupCheckMap := make(map[string]bool)
-	var ret []ConnectionStat
-
-	for _, t := range tmap {
-		var path string
-		var ls []connTmp
-		path = fmt.Sprintf("%s/net/%s", root, t.filename)
-		switch t.family {
-		case syscall.AF_INET:
-			fallthrough
-		case syscall.AF_INET6:
-			ls, err = processInet(path, t, inodes, pid)
-		case syscall.AF_UNIX:
-			ls, err = processUnix(path, t, inodes, pid)
-		}
-		if err != nil {
-			return nil, err
-		}
-		for _, c := range ls {
-			conn := ConnectionStat{
-				Fd:     c.fd,
-				Family: c.family,
-				Type:   c.sockType,
-				Laddr:  c.laddr,
-				Raddr:  c.raddr,
-				Status: c.status,
-				Pid:    c.pid,
-			}
-			if c.pid == 0 {
-				conn.Pid = c.boundPid
-			} else {
-				conn.Pid = c.pid
-			}
-			// check duplicate using JSON format
-			json := conn.String()
-			_, exists := dupCheckMap[json]
-			if !exists {
-				ret = append(ret, conn)
-				dupCheckMap[json] = true
-			}
-		}
-
-	}
-
-	return ret, nil
-}
-
-// getProcInodes returnes fd of the pid.
-func getProcInodes(root string, pid int32) (map[string][]inodeMap, error) {
-	ret := make(map[string][]inodeMap)
-
-	dir := fmt.Sprintf("%s/%d/fd", root, pid)
-	files, err := ioutil.ReadDir(dir)
-	if err != nil {
-		return ret, nil
-	}
-	for _, fd := range files {
-		inodePath := fmt.Sprintf("%s/%d/fd/%s", root, pid, fd.Name())
-
-		inode, err := os.Readlink(inodePath)
-		if err != nil {
-			continue
-		}
-		if !strings.HasPrefix(inode, "socket:[") {
-			continue
-		}
-		// the process is using a socket
-		l := len(inode)
-		inode = inode[8 : l-1]
-		_, ok := ret[inode]
-		if !ok {
-			ret[inode] = make([]inodeMap, 0)
-		}
-		fd, err := strconv.Atoi(fd.Name())
-		if err != nil {
-			continue
-		}
-
-		i := inodeMap{
-			pid: pid,
-			fd:  uint32(fd),
-		}
-		ret[inode] = append(ret[inode], i)
-	}
-	return ret, nil
-}
-
-// Pids retunres all pids.
-// Note: this is a copy of process_linux.Pids()
-// FIXME: Import process occures import cycle.
-// move to common made other platform breaking. Need consider.
-func Pids() ([]int32, error) {
-	var ret []int32
-
-	d, err := os.Open(common.HostProc())
-	if err != nil {
-		return nil, err
-	}
-	defer d.Close()
-
-	fnames, err := d.Readdirnames(-1)
-	if err != nil {
-		return nil, err
-	}
-	for _, fname := range fnames {
-		pid, err := strconv.ParseInt(fname, 10, 32)
-		if err != nil {
-			// if not numeric name, just skip
-			continue
-		}
-		ret = append(ret, int32(pid))
-	}
-
-	return ret, nil
-}
-
-func getProcInodesAll(root string) (map[string][]inodeMap, error) {
-	pids, err := Pids()
-	if err != nil {
-		return nil, err
-	}
-	ret := make(map[string][]inodeMap)
-
-	for _, pid := range pids {
-		t, err := getProcInodes(root, pid)
-		if err != nil {
-			return ret, err
-		}
-		if len(t) == 0 {
-			continue
-		}
-		// TODO: update ret.
-		ret = updateMap(ret, t)
-	}
-	return ret, nil
-}
-
-// decodeAddress decode addresse represents addr in proc/net/*
-// ex:
-// "0500000A:0016" -> "10.0.0.5", 22
-// "0085002452100113070057A13F025401:0035" -> "2400:8500:1301:1052:a157:7:154:23f", 53
-func decodeAddress(family uint32, src string) (Addr, error) {
-	t := strings.Split(src, ":")
-	if len(t) != 2 {
-		return Addr{}, fmt.Errorf("does not contain port, %s", src)
-	}
-	addr := t[0]
-	port, err := strconv.ParseInt("0x"+t[1], 0, 64)
-	if err != nil {
-		return Addr{}, fmt.Errorf("invalid port, %s", src)
-	}
-	decoded, err := hex.DecodeString(addr)
-	if err != nil {
-		return Addr{}, fmt.Errorf("decode error, %s", err)
-	}
-	var ip net.IP
-	// Assumes this is little_endian
-	if family == syscall.AF_INET {
-		ip = net.IP(Reverse(decoded))
-	} else { // IPv6
-		ip, err = parseIPv6HexString(decoded)
-		if err != nil {
-			return Addr{}, err
-		}
-	}
-	return Addr{
-		IP:   ip.String(),
-		Port: uint32(port),
-	}, nil
-}
-
-// Reverse reverses array of bytes.
-func Reverse(s []byte) []byte {
-	for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 {
-		s[i], s[j] = s[j], s[i]
-	}
-	return s
-}
-
-// parseIPv6HexString parse array of bytes to IPv6 string
-func parseIPv6HexString(src []byte) (net.IP, error) {
-	if len(src) != 16 {
-		return nil, fmt.Errorf("invalid IPv6 string")
-	}
-
-	buf := make([]byte, 0, 16)
-	for i := 0; i < len(src); i += 4 {
-		r := Reverse(src[i : i+4])
-		buf = append(buf, r...)
-	}
-	return net.IP(buf), nil
-}
-
-func processInet(file string, kind netConnectionKindType, inodes map[string][]inodeMap, filterPid int32) ([]connTmp, error) {
-
-	if strings.HasSuffix(file, "6") && !common.PathExists(file) {
-		// IPv6 not supported, return empty.
-		return []connTmp{}, nil
-	}
-	lines, err := common.ReadLines(file)
-	if err != nil {
-		return nil, err
-	}
-	var ret []connTmp
-	// skip first line
-	for _, line := range lines[1:] {
-		l := strings.Fields(line)
-		if len(l) < 10 {
-			continue
-		}
-		laddr := l[1]
-		raddr := l[2]
-		status := l[3]
-		inode := l[9]
-		pid := int32(0)
-		fd := uint32(0)
-		i, exists := inodes[inode]
-		if exists {
-			pid = i[0].pid
-			fd = i[0].fd
-		}
-		if filterPid > 0 && filterPid != pid {
-			continue
-		}
-		if kind.sockType == syscall.SOCK_STREAM {
-			status = TCPStatuses[status]
-		} else {
-			status = "NONE"
-		}
-		la, err := decodeAddress(kind.family, laddr)
-		if err != nil {
-			continue
-		}
-		ra, err := decodeAddress(kind.family, raddr)
-		if err != nil {
-			continue
-		}
-
-		ret = append(ret, connTmp{
-			fd:       fd,
-			family:   kind.family,
-			sockType: kind.sockType,
-			laddr:    la,
-			raddr:    ra,
-			status:   status,
-			pid:      pid,
-		})
-	}
-
-	return ret, nil
-}
-
-func processUnix(file string, kind netConnectionKindType, inodes map[string][]inodeMap, filterPid int32) ([]connTmp, error) {
-	lines, err := common.ReadLines(file)
-	if err != nil {
-		return nil, err
-	}
-
-	var ret []connTmp
-	// skip first line
-	for _, line := range lines[1:] {
-		tokens := strings.Fields(line)
-		if len(tokens) < 6 {
-			continue
-		}
-		st, err := strconv.Atoi(tokens[4])
-		if err != nil {
-			return nil, err
-		}
-
-		inode := tokens[6]
-
-		var pairs []inodeMap
-		pairs, exists := inodes[inode]
-		if !exists {
-			pairs = []inodeMap{
-				inodeMap{},
-			}
-		}
-		for _, pair := range pairs {
-			if filterPid > 0 && filterPid != pair.pid {
-				continue
-			}
-			var path string
-			if len(tokens) == 8 {
-				path = tokens[len(tokens)-1]
-			}
-			ret = append(ret, connTmp{
-				fd:       pair.fd,
-				family:   kind.family,
-				sockType: uint32(st),
-				laddr: Addr{
-					IP: path,
-				},
-				pid:    pair.pid,
-				status: "NONE",
-				path:   path,
-			})
-		}
-	}
-
-	return ret, nil
-}
-
-func updateMap(src map[string][]inodeMap, add map[string][]inodeMap) map[string][]inodeMap {
-	for key, value := range add {
-		a, exists := src[key]
-		if !exists {
-			src[key] = value
-			continue
-		}
-		src[key] = append(a, value...)
-	}
-	return src
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go
deleted file mode 100644
index 45de6b17de..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// +build freebsd darwin
-
-package net
-
-import (
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// Return a list of network connections opened.
-func Connections(kind string) ([]ConnectionStat, error) {
-	return ConnectionsPid(kind, 0)
-}
-
-// Return a list of network connections opened by a process.
-func ConnectionsPid(kind string, pid int32) ([]ConnectionStat, error) {
-	var ret []ConnectionStat
-
-	args := []string{"-i"}
-	switch strings.ToLower(kind) {
-	default:
-		fallthrough
-	case "":
-		fallthrough
-	case "all":
-		fallthrough
-	case "inet":
-		args = append(args, "tcp", "-i", "udp")
-	case "inet4":
-		args = append(args, "4")
-	case "inet6":
-		args = append(args, "6")
-	case "tcp":
-		args = append(args, "tcp")
-	case "tcp4":
-		args = append(args, "4tcp")
-	case "tcp6":
-		args = append(args, "6tcp")
-	case "udp":
-		args = append(args, "udp")
-	case "udp4":
-		args = append(args, "6udp")
-	case "udp6":
-		args = append(args, "6udp")
-	case "unix":
-		return ret, common.ErrNotImplementedError
-	}
-
-	r, err := common.CallLsof(invoke, pid, args...)
-	if err != nil {
-		return nil, err
-	}
-	for _, rr := range r {
-		if strings.HasPrefix(rr, "COMMAND") {
-			continue
-		}
-		n, err := parseNetLine(rr)
-		if err != nil {
-
-			continue
-		}
-
-		ret = append(ret, n)
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go
deleted file mode 100644
index f125260c4d..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// +build windows
-
-package net
-
-import (
-	"errors"
-	"net"
-	"os"
-	"syscall"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var (
-	modiphlpapi             = syscall.NewLazyDLL("iphlpapi.dll")
-	procGetExtendedTCPTable = modiphlpapi.NewProc("GetExtendedTcpTable")
-	procGetExtendedUDPTable = modiphlpapi.NewProc("GetExtendedUdpTable")
-)
-
-const (
-	TCPTableBasicListener = iota
-	TCPTableBasicConnections
-	TCPTableBasicAll
-	TCPTableOwnerPIDListener
-	TCPTableOwnerPIDConnections
-	TCPTableOwnerPIDAll
-	TCPTableOwnerModuleListener
-	TCPTableOwnerModuleConnections
-	TCPTableOwnerModuleAll
-)
-
-func IOCounters(pernic bool) ([]IOCountersStat, error) {
-	ifs, err := net.Interfaces()
-	if err != nil {
-		return nil, err
-	}
-
-	ai, err := getAdapterList()
-	if err != nil {
-		return nil, err
-	}
-	var ret []IOCountersStat
-
-	for _, ifi := range ifs {
-		name := ifi.Name
-		for ; ai != nil; ai = ai.Next {
-			name = common.BytePtrToString(&ai.Description[0])
-			c := IOCountersStat{
-				Name: name,
-			}
-
-			row := syscall.MibIfRow{Index: ai.Index}
-			e := syscall.GetIfEntry(&row)
-			if e != nil {
-				return nil, os.NewSyscallError("GetIfEntry", e)
-			}
-			c.BytesSent = uint64(row.OutOctets)
-			c.BytesRecv = uint64(row.InOctets)
-			c.PacketsSent = uint64(row.OutUcastPkts)
-			c.PacketsRecv = uint64(row.InUcastPkts)
-			c.Errin = uint64(row.InErrors)
-			c.Errout = uint64(row.OutErrors)
-			c.Dropin = uint64(row.InDiscards)
-			c.Dropout = uint64(row.OutDiscards)
-
-			ret = append(ret, c)
-		}
-	}
-
-	if pernic == false {
-		return getIOCountersAll(ret)
-	}
-	return ret, nil
-}
-
-// NetIOCountersByFile is an method which is added just a compatibility for linux.
-func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
-	return IOCounters(pernic)
-}
-
-// Return a list of network connections opened by a process
-func Connections(kind string) ([]ConnectionStat, error) {
-	var ret []ConnectionStat
-
-	return ret, common.ErrNotImplementedError
-}
-
-// borrowed from src/pkg/net/interface_windows.go
-func getAdapterList() (*syscall.IpAdapterInfo, error) {
-	b := make([]byte, 1000)
-	l := uint32(len(b))
-	a := (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
-	err := syscall.GetAdaptersInfo(a, &l)
-	if err == syscall.ERROR_BUFFER_OVERFLOW {
-		b = make([]byte, l)
-		a = (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
-		err = syscall.GetAdaptersInfo(a, &l)
-	}
-	if err != nil {
-		return nil, os.NewSyscallError("GetAdaptersInfo", err)
-	}
-	return a, nil
-}
-
-func FilterCounters() ([]FilterStat, error) {
-	return nil, errors.New("NetFilterCounters not implemented for windows")
-}
-
-// NetProtoCounters returns network statistics for the entire system
-// If protocols is empty then all protocols are returned, otherwise
-// just the protocols in the list are returned.
-// Not Implemented for Windows
-func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
-	return nil, errors.New("NetProtoCounters not implemented for windows")
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
deleted file mode 100644
index 2b9d6854ee..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
+++ /dev/null
@@ -1,166 +0,0 @@
-package process
-
-import (
-	"encoding/json"
-	"runtime"
-	"time"
-
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/mem"
-)
-
-var invoke common.Invoker
-
-func init() {
-	invoke = common.Invoke{}
-}
-
-type Process struct {
-	Pid            int32 `json:"pid"`
-	name           string
-	status         string
-	numCtxSwitches *NumCtxSwitchesStat
-	uids           []int32
-	gids           []int32
-	numThreads     int32
-	memInfo        *MemoryInfoStat
-
-	lastCPUTimes *cpu.TimesStat
-	lastCPUTime  time.Time
-}
-
-type OpenFilesStat struct {
-	Path string `json:"path"`
-	Fd   uint64 `json:"fd"`
-}
-
-type MemoryInfoStat struct {
-	RSS  uint64 `json:"rss"`  // bytes
-	VMS  uint64 `json:"vms"`  // bytes
-	Swap uint64 `json:"swap"` // bytes
-}
-
-type RlimitStat struct {
-	Resource int32 `json:"resource"`
-	Soft     int32 `json:"soft"`
-	Hard     int32 `json:"hard"`
-}
-
-type IOCountersStat struct {
-	ReadCount  uint64 `json:"readCount"`
-	WriteCount uint64 `json:"writeCount"`
-	ReadBytes  uint64 `json:"readBytes"`
-	WriteBytes uint64 `json:"writeBytes"`
-}
-
-type NumCtxSwitchesStat struct {
-	Voluntary   int64 `json:"voluntary"`
-	Involuntary int64 `json:"involuntary"`
-}
-
-func (p Process) String() string {
-	s, _ := json.Marshal(p)
-	return string(s)
-}
-
-func (o OpenFilesStat) String() string {
-	s, _ := json.Marshal(o)
-	return string(s)
-}
-
-func (m MemoryInfoStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
-
-func (r RlimitStat) String() string {
-	s, _ := json.Marshal(r)
-	return string(s)
-}
-
-func (i IOCountersStat) String() string {
-	s, _ := json.Marshal(i)
-	return string(s)
-}
-
-func (p NumCtxSwitchesStat) String() string {
-	s, _ := json.Marshal(p)
-	return string(s)
-}
-
-func PidExists(pid int32) (bool, error) {
-	pids, err := Pids()
-	if err != nil {
-		return false, err
-	}
-
-	for _, i := range pids {
-		if i == pid {
-			return true, err
-		}
-	}
-
-	return false, err
-}
-
-// If interval is 0, return difference from last call(non-blocking).
-// If interval > 0, wait interval sec and return diffrence between start and end.
-func (p *Process) Percent(interval time.Duration) (float64, error) {
-	cpuTimes, err := p.Times()
-	if err != nil {
-		return 0, err
-	}
-	now := time.Now()
-
-	if interval > 0 {
-		p.lastCPUTimes = cpuTimes
-		p.lastCPUTime = now
-		time.Sleep(interval)
-		cpuTimes, err = p.Times()
-		now = time.Now()
-		if err != nil {
-			return 0, err
-		}
-	} else {
-		if p.lastCPUTimes == nil {
-			// invoked first time
-			p.lastCPUTimes = cpuTimes
-			p.lastCPUTime = now
-			return 0, nil
-		}
-	}
-
-	numcpu := runtime.NumCPU()
-	delta := (now.Sub(p.lastCPUTime).Seconds()) * float64(numcpu)
-	ret := calculatePercent(p.lastCPUTimes, cpuTimes, delta, numcpu)
-	p.lastCPUTimes = cpuTimes
-	p.lastCPUTime = now
-	return ret, nil
-}
-
-func calculatePercent(t1, t2 *cpu.TimesStat, delta float64, numcpu int) float64 {
-	if delta == 0 {
-		return 0
-	}
-	delta_proc := t2.Total() - t1.Total()
-	overall_percent := ((delta_proc / delta) * 100) * float64(numcpu)
-	return overall_percent
-}
-
-// MemoryPercent returns how many percent of the total RAM this process uses
-func (p *Process) MemoryPercent() (float32, error) {
-	machineMemory, err := mem.VirtualMemory()
-	if err != nil {
-		return 0, err
-	}
-	total := machineMemory.Total
-
-	processMemory, err := p.MemoryInfo()
-	if err != nil {
-		return 0, err
-	}
-	used := processMemory.RSS
-
-	return (100 * float32(used) / float32(total)), nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go
deleted file mode 100644
index cea0803e6d..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go
+++ /dev/null
@@ -1,451 +0,0 @@
-// +build darwin
-
-package process
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-	"syscall"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/net"
-)
-
-// copied from sys/sysctl.h
-const (
-	CTLKern          = 1  // "high kernel": proc, limits
-	KernProc         = 14 // struct: process entries
-	KernProcPID      = 1  // by process id
-	KernProcProc     = 8  // only return procs
-	KernProcAll      = 0  // everything
-	KernProcPathname = 12 // path to executable
-)
-
-const (
-	ClockTicks = 100 // C.sysconf(C._SC_CLK_TCK)
-)
-
-type _Ctype_struct___0 struct {
-	Pad uint64
-}
-
-// MemoryInfoExStat is different between OSes
-type MemoryInfoExStat struct {
-}
-
-type MemoryMapsStat struct {
-}
-
-func Pids() ([]int32, error) {
-	var ret []int32
-
-	pids, err := callPs("pid", 0, false)
-	if err != nil {
-		return ret, err
-	}
-
-	for _, pid := range pids {
-		v, err := strconv.Atoi(pid[0])
-		if err != nil {
-			return ret, err
-		}
-		ret = append(ret, int32(v))
-	}
-
-	return ret, nil
-}
-
-func (p *Process) Ppid() (int32, error) {
-	r, err := callPs("ppid", p.Pid, false)
-	v, err := strconv.Atoi(r[0][0])
-	if err != nil {
-		return 0, err
-	}
-
-	return int32(v), err
-}
-func (p *Process) Name() (string, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return "", err
-	}
-
-	return common.IntToString(k.Proc.P_comm[:]), nil
-}
-func (p *Process) Exe() (string, error) {
-	return "", common.ErrNotImplementedError
-}
-
-// Cmdline returns the command line arguments of the process as a string with
-// each argument separated by 0x20 ascii character.
-func (p *Process) Cmdline() (string, error) {
-	r, err := callPs("command", p.Pid, false)
-	if err != nil {
-		return "", err
-	}
-	return strings.Join(r[0], " "), err
-}
-
-// CmdlineSlice returns the command line arguments of the process as a slice with each
-// element being an argument. Because of current deficiencies in the way that the command
-// line arguments are found, single arguments that have spaces in the will actually be
-// reported as two separate items. In order to do something better CGO would be needed
-// to use the native darwin functions.
-func (p *Process) CmdlineSlice() ([]string, error) {
-	r, err := callPs("command", p.Pid, false)
-	if err != nil {
-		return nil, err
-	}
-	return r[0], err
-}
-func (p *Process) CreateTime() (int64, error) {
-	return 0, common.ErrNotImplementedError
-}
-func (p *Process) Cwd() (string, error) {
-	return "", common.ErrNotImplementedError
-}
-func (p *Process) Parent() (*Process, error) {
-	rr, err := common.CallLsof(invoke, p.Pid, "-FR")
-	if err != nil {
-		return nil, err
-	}
-	for _, r := range rr {
-		if strings.HasPrefix(r, "p") { // skip if process
-			continue
-		}
-		l := string(r)
-		v, err := strconv.Atoi(strings.Replace(l, "R", "", 1))
-		if err != nil {
-			return nil, err
-		}
-		return NewProcess(int32(v))
-	}
-	return nil, fmt.Errorf("could not find parent line")
-}
-func (p *Process) Status() (string, error) {
-	r, err := callPs("state", p.Pid, false)
-	if err != nil {
-		return "", err
-	}
-
-	return r[0][0], err
-}
-func (p *Process) Uids() ([]int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-
-	// See: http://unix.superglobalmegacorp.com/Net2/newsrc/sys/ucred.h.html
-	userEffectiveUID := int32(k.Eproc.Ucred.UID)
-
-	return []int32{userEffectiveUID}, nil
-}
-func (p *Process) Gids() ([]int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-
-	gids := make([]int32, 0, 3)
-	gids = append(gids, int32(k.Eproc.Pcred.P_rgid), int32(k.Eproc.Ucred.Ngroups), int32(k.Eproc.Pcred.P_svgid))
-
-	return gids, nil
-}
-func (p *Process) Terminal() (string, error) {
-	return "", common.ErrNotImplementedError
-	/*
-		k, err := p.getKProc()
-		if err != nil {
-			return "", err
-		}
-
-		ttyNr := uint64(k.Eproc.Tdev)
-		termmap, err := getTerminalMap()
-		if err != nil {
-			return "", err
-		}
-
-		return termmap[ttyNr], nil
-	*/
-}
-func (p *Process) Nice() (int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return 0, err
-	}
-	return int32(k.Proc.P_nice), nil
-}
-func (p *Process) IOnice() (int32, error) {
-	return 0, common.ErrNotImplementedError
-}
-func (p *Process) Rlimit() ([]RlimitStat, error) {
-	var rlimit []RlimitStat
-	return rlimit, common.ErrNotImplementedError
-}
-func (p *Process) IOCounters() (*IOCountersStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) NumFDs() (int32, error) {
-	return 0, common.ErrNotImplementedError
-}
-func (p *Process) NumThreads() (int32, error) {
-	r, err := callPs("utime,stime", p.Pid, true)
-	if err != nil {
-		return 0, err
-	}
-	return int32(len(r)), nil
-}
-func (p *Process) Threads() (map[string]string, error) {
-	ret := make(map[string]string, 0)
-	return ret, common.ErrNotImplementedError
-}
-
-func convertCPUTimes(s string) (ret float64, err error) {
-	var t int
-	var _tmp string
-	if strings.Contains(s, ":") {
-		_t := strings.Split(s, ":")
-		hour, err := strconv.Atoi(_t[0])
-		if err != nil {
-			return ret, err
-		}
-		t += hour * 60 * 100
-		_tmp = _t[1]
-	} else {
-		_tmp = s
-	}
-
-	_t := strings.Split(_tmp, ".")
-	if err != nil {
-		return ret, err
-	}
-	h, err := strconv.Atoi(_t[0])
-	t += h * 100
-	h, err = strconv.Atoi(_t[1])
-	t += h
-	return float64(t) / ClockTicks, nil
-}
-func (p *Process) Times() (*cpu.TimesStat, error) {
-	r, err := callPs("utime,stime", p.Pid, false)
-
-	if err != nil {
-		return nil, err
-	}
-
-	utime, err := convertCPUTimes(r[0][0])
-	if err != nil {
-		return nil, err
-	}
-	stime, err := convertCPUTimes(r[0][1])
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &cpu.TimesStat{
-		CPU:    "cpu",
-		User:   utime,
-		System: stime,
-	}
-	return ret, nil
-}
-func (p *Process) CPUAffinity() ([]int32, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
-	r, err := callPs("rss,vsize,pagein", p.Pid, false)
-	if err != nil {
-		return nil, err
-	}
-	rss, err := strconv.Atoi(r[0][0])
-	if err != nil {
-		return nil, err
-	}
-	vms, err := strconv.Atoi(r[0][1])
-	if err != nil {
-		return nil, err
-	}
-	pagein, err := strconv.Atoi(r[0][2])
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &MemoryInfoStat{
-		RSS:  uint64(rss) * 1024,
-		VMS:  uint64(vms) * 1024,
-		Swap: uint64(pagein),
-	}
-
-	return ret, nil
-}
-func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) Children() ([]*Process, error) {
-	pids, err := common.CallPgrep(invoke, p.Pid)
-	if err != nil {
-		return nil, err
-	}
-	ret := make([]*Process, 0, len(pids))
-	for _, pid := range pids {
-		np, err := NewProcess(pid)
-		if err != nil {
-			return nil, err
-		}
-		ret = append(ret, np)
-	}
-	return ret, nil
-}
-
-func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) Connections() ([]net.ConnectionStat, error) {
-	return net.ConnectionsPid("all", p.Pid)
-}
-
-func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) IsRunning() (bool, error) {
-	return true, common.ErrNotImplementedError
-}
-func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
-	var ret []MemoryMapsStat
-	return &ret, common.ErrNotImplementedError
-}
-
-func processes() ([]Process, error) {
-	results := make([]Process, 0, 50)
-
-	mib := []int32{CTLKern, KernProc, KernProcAll, 0}
-	buf, length, err := common.CallSyscall(mib)
-	if err != nil {
-		return results, err
-	}
-
-	// get kinfo_proc size
-	k := KinfoProc{}
-	procinfoLen := int(unsafe.Sizeof(k))
-	count := int(length / uint64(procinfoLen))
-	/*
-		fmt.Println(length, procinfoLen, count)
-		b := buf[0*procinfoLen : 0*procinfoLen+procinfoLen]
-		fmt.Println(b)
-		kk, err := parseKinfoProc(b)
-		fmt.Printf("%#v", kk)
-	*/
-
-	// parse buf to procs
-	for i := 0; i < count; i++ {
-		b := buf[i*procinfoLen : i*procinfoLen+procinfoLen]
-		k, err := parseKinfoProc(b)
-		if err != nil {
-			continue
-		}
-		p, err := NewProcess(int32(k.Proc.P_pid))
-		if err != nil {
-			continue
-		}
-		results = append(results, *p)
-	}
-
-	return results, nil
-}
-
-func parseKinfoProc(buf []byte) (KinfoProc, error) {
-	var k KinfoProc
-	br := bytes.NewReader(buf)
-
-	err := common.Read(br, binary.LittleEndian, &k)
-	if err != nil {
-		return k, err
-	}
-
-	return k, nil
-}
-
-// Returns a proc as defined here:
-// http://unix.superglobalmegacorp.com/Net2/newsrc/sys/kinfo_proc.h.html
-func (p *Process) getKProc() (*KinfoProc, error) {
-	mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid}
-	procK := KinfoProc{}
-	length := uint64(unsafe.Sizeof(procK))
-	buf := make([]byte, length)
-	_, _, syserr := syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(unsafe.Pointer(&mib[0])),
-		uintptr(len(mib)),
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if syserr != 0 {
-		return nil, syserr
-	}
-	k, err := parseKinfoProc(buf)
-	if err != nil {
-		return nil, err
-	}
-
-	return &k, nil
-}
-
-func NewProcess(pid int32) (*Process, error) {
-	p := &Process{Pid: pid}
-
-	return p, nil
-}
-
-// call ps command.
-// Return value deletes Header line(you must not input wrong arg).
-// And splited by Space. Caller have responsibility to manage.
-// If passed arg pid is 0, get information from all process.
-func callPs(arg string, pid int32, threadOption bool) ([][]string, error) {
-	bin, err := exec.LookPath("ps")
-	if err != nil {
-		return [][]string{}, err
-	}
-
-	var cmd []string
-	if pid == 0 { // will get from all processes.
-		cmd = []string{"-ax", "-o", arg}
-	} else if threadOption {
-		cmd = []string{"-x", "-o", arg, "-M", "-p", strconv.Itoa(int(pid))}
-	} else {
-		cmd = []string{"-x", "-o", arg, "-p", strconv.Itoa(int(pid))}
-	}
-	out, err := invoke.Command(bin, cmd...)
-	if err != nil {
-		return [][]string{}, err
-	}
-	lines := strings.Split(string(out), "\n")
-
-	var ret [][]string
-	for _, l := range lines[1:] {
-		var lr []string
-		for _, r := range strings.Split(l, " ") {
-			if r == "" {
-				continue
-			}
-			lr = append(lr, strings.TrimSpace(r))
-		}
-		if len(lr) != 0 {
-			ret = append(ret, lr)
-		}
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go
deleted file mode 100644
index f8e922385b..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go
+++ /dev/null
@@ -1,234 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package process
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type UGid_t uint32
-
-type KinfoProc struct {
-	Proc  ExternProc
-	Eproc Eproc
-}
-
-type Eproc struct {
-	Paddr     *uint64
-	Sess      *Session
-	Pcred     Upcred
-	Ucred     Uucred
-	Pad_cgo_0 [4]byte
-	Vm        Vmspace
-	Ppid      int32
-	Pgid      int32
-	Jobc      int16
-	Pad_cgo_1 [2]byte
-	Tdev      int32
-	Tpgid     int32
-	Pad_cgo_2 [4]byte
-	Tsess     *Session
-	Wmesg     [8]int8
-	Xsize     int32
-	Xrssize   int16
-	Xccount   int16
-	Xswrss    int16
-	Pad_cgo_3 [2]byte
-	Flag      int32
-	Login     [12]int8
-	Spare     [4]int32
-	Pad_cgo_4 [4]byte
-}
-
-type Proc struct{}
-
-type Session struct{}
-
-type ucred struct {
-	Link  _Ctype_struct___0
-	Ref   uint64
-	Posix Posix_cred
-	Label *Label
-	Audit Au_session
-}
-
-type Uucred struct {
-	Ref       int32
-	UID       uint32
-	Ngroups   int16
-	Pad_cgo_0 [2]byte
-	Groups    [16]uint32
-}
-
-type Upcred struct {
-	Pc_lock   [72]int8
-	Pc_ucred  *ucred
-	P_ruid    uint32
-	P_svuid   uint32
-	P_rgid    uint32
-	P_svgid   uint32
-	P_refcnt  int32
-	Pad_cgo_0 [4]byte
-}
-
-type Vmspace struct {
-	Dummy     int32
-	Pad_cgo_0 [4]byte
-	Dummy2    *int8
-	Dummy3    [5]int32
-	Pad_cgo_1 [4]byte
-	Dummy4    [3]*int8
-}
-
-type Sigacts struct{}
-
-type ExternProc struct {
-	P_un        [16]byte
-	P_vmspace   uint64
-	P_sigacts   uint64
-	Pad_cgo_0   [3]byte
-	P_flag      int32
-	P_stat      int8
-	P_pid       int32
-	P_oppid     int32
-	P_dupfd     int32
-	Pad_cgo_1   [4]byte
-	User_stack  uint64
-	Exit_thread uint64
-	P_debugger  int32
-	Sigwait     int32
-	P_estcpu    uint32
-	P_cpticks   int32
-	P_pctcpu    uint32
-	Pad_cgo_2   [4]byte
-	P_wchan     uint64
-	P_wmesg     uint64
-	P_swtime    uint32
-	P_slptime   uint32
-	P_realtimer Itimerval
-	P_rtime     Timeval
-	P_uticks    uint64
-	P_sticks    uint64
-	P_iticks    uint64
-	P_traceflag int32
-	Pad_cgo_3   [4]byte
-	P_tracep    uint64
-	P_siglist   int32
-	Pad_cgo_4   [4]byte
-	P_textvp    uint64
-	P_holdcnt   int32
-	P_sigmask   uint32
-	P_sigignore uint32
-	P_sigcatch  uint32
-	P_priority  uint8
-	P_usrpri    uint8
-	P_nice      int8
-	P_comm      [17]int8
-	Pad_cgo_5   [4]byte
-	P_pgrp      uint64
-	P_addr      uint64
-	P_xstat     uint16
-	P_acflag    uint16
-	Pad_cgo_6   [4]byte
-	P_ru        uint64
-}
-
-type Itimerval struct {
-	Interval Timeval
-	Value    Timeval
-}
-
-type Vnode struct{}
-
-type Pgrp struct{}
-
-type UserStruct struct{}
-
-type Au_session struct {
-	Aia_p *AuditinfoAddr
-	Mask  AuMask
-}
-
-type Posix_cred struct {
-	UID       uint32
-	Ruid      uint32
-	Svuid     uint32
-	Ngroups   int16
-	Pad_cgo_0 [2]byte
-	Groups    [16]uint32
-	Rgid      uint32
-	Svgid     uint32
-	Gmuid     uint32
-	Flags     int32
-}
-
-type Label struct{}
-
-type AuditinfoAddr struct {
-	Auid   uint32
-	Mask   AuMask
-	Termid AuTidAddr
-	Asid   int32
-	Flags  uint64
-}
-type AuMask struct {
-	Success uint32
-	Failure uint32
-}
-type AuTidAddr struct {
-	Port int32
-	Type uint32
-	Addr [4]uint32
-}
-
-type UcredQueue struct {
-	Next *ucred
-	Prev **ucred
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go
deleted file mode 100644
index 5362128e6e..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go
+++ /dev/null
@@ -1,336 +0,0 @@
-// +build freebsd
-
-package process
-
-import (
-	"bytes"
-	"encoding/binary"
-	"strings"
-	"syscall"
-
-	cpu "github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	net "github.com/shirou/gopsutil/net"
-)
-
-// MemoryInfoExStat is different between OSes
-type MemoryInfoExStat struct {
-}
-
-type MemoryMapsStat struct {
-}
-
-func Pids() ([]int32, error) {
-	var ret []int32
-	procs, err := processes()
-	if err != nil {
-		return ret, nil
-	}
-
-	for _, p := range procs {
-		ret = append(ret, p.Pid)
-	}
-
-	return ret, nil
-}
-
-func (p *Process) Ppid() (int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return 0, err
-	}
-
-	return k.Ppid, nil
-}
-func (p *Process) Name() (string, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return "", err
-	}
-
-	return common.IntToString(k.Comm[:]), nil
-}
-func (p *Process) Exe() (string, error) {
-	return "", common.ErrNotImplementedError
-}
-
-func (p *Process) Cmdline() (string, error) {
-	mib := []int32{CTLKern, KernProc, KernProcArgs, p.Pid}
-	buf, _, err := common.CallSyscall(mib)
-	if err != nil {
-		return "", err
-	}
-	ret := strings.FieldsFunc(string(buf), func(r rune) bool {
-		if r == '\u0000' {
-			return true
-		}
-		return false
-	})
-
-	return strings.Join(ret, " "), nil
-}
-
-func (p *Process) CmdlineSlice() ([]string, error) {
-	mib := []int32{CTLKern, KernProc, KernProcArgs, p.Pid}
-	buf, _, err := common.CallSyscall(mib)
-	if err != nil {
-		return nil, err
-	}
-	if len(buf) == 0 {
-		return nil, nil
-	}
-	if buf[len(buf)-1] == 0 {
-		buf = buf[:len(buf)-1]
-	}
-	parts := bytes.Split(buf, []byte{0})
-	var strParts []string
-	for _, p := range parts {
-		strParts = append(strParts, string(p))
-	}
-
-	return strParts, nil
-}
-func (p *Process) CreateTime() (int64, error) {
-	return 0, common.ErrNotImplementedError
-}
-func (p *Process) Cwd() (string, error) {
-	return "", common.ErrNotImplementedError
-}
-func (p *Process) Parent() (*Process, error) {
-	return p, common.ErrNotImplementedError
-}
-func (p *Process) Status() (string, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return "", err
-	}
-	var s string
-	switch k.Stat {
-	case SIDL:
-		s = "I"
-	case SRUN:
-		s = "R"
-	case SSLEEP:
-		s = "S"
-	case SSTOP:
-		s = "T"
-	case SZOMB:
-		s = "Z"
-	case SWAIT:
-		s = "W"
-	case SLOCK:
-		s = "L"
-	}
-
-	return s, nil
-}
-func (p *Process) Uids() ([]int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-
-	uids := make([]int32, 0, 3)
-
-	uids = append(uids, int32(k.Ruid), int32(k.Uid), int32(k.Svuid))
-
-	return uids, nil
-}
-func (p *Process) Gids() ([]int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-
-	gids := make([]int32, 0, 3)
-	gids = append(gids, int32(k.Rgid), int32(k.Ngroups), int32(k.Svgid))
-
-	return gids, nil
-}
-func (p *Process) Terminal() (string, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return "", err
-	}
-
-	ttyNr := uint64(k.Tdev)
-
-	termmap, err := getTerminalMap()
-	if err != nil {
-		return "", err
-	}
-
-	return termmap[ttyNr], nil
-}
-func (p *Process) Nice() (int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return 0, err
-	}
-	return int32(k.Nice), nil
-}
-func (p *Process) IOnice() (int32, error) {
-	return 0, common.ErrNotImplementedError
-}
-func (p *Process) Rlimit() ([]RlimitStat, error) {
-	var rlimit []RlimitStat
-	return rlimit, common.ErrNotImplementedError
-}
-func (p *Process) IOCounters() (*IOCountersStat, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-	return &IOCountersStat{
-		ReadCount:  uint64(k.Rusage.Inblock),
-		WriteCount: uint64(k.Rusage.Oublock),
-	}, nil
-}
-func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) NumFDs() (int32, error) {
-	return 0, common.ErrNotImplementedError
-}
-func (p *Process) NumThreads() (int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return 0, err
-	}
-
-	return k.Numthreads, nil
-}
-func (p *Process) Threads() (map[string]string, error) {
-	ret := make(map[string]string, 0)
-	return ret, common.ErrNotImplementedError
-}
-func (p *Process) Times() (*cpu.TimesStat, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-	return &cpu.TimesStat{
-		CPU:    "cpu",
-		User:   float64(k.Rusage.Utime.Sec) + float64(k.Rusage.Utime.Usec)/1000000,
-		System: float64(k.Rusage.Stime.Sec) + float64(k.Rusage.Stime.Usec)/1000000,
-	}, nil
-}
-func (p *Process) CPUAffinity() ([]int32, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-	v, err := syscall.Sysctl("vm.stats.vm.v_page_size")
-	if err != nil {
-		return nil, err
-	}
-	pageSize := common.LittleEndian.Uint16([]byte(v))
-
-	return &MemoryInfoStat{
-		RSS: uint64(k.Rssize) * uint64(pageSize),
-		VMS: uint64(k.Size),
-	}, nil
-}
-func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) Children() ([]*Process, error) {
-	pids, err := common.CallPgrep(invoke, p.Pid)
-	if err != nil {
-		return nil, err
-	}
-	ret := make([]*Process, 0, len(pids))
-	for _, pid := range pids {
-		np, err := NewProcess(pid)
-		if err != nil {
-			return nil, err
-		}
-		ret = append(ret, np)
-	}
-	return ret, nil
-}
-
-func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) Connections() ([]net.ConnectionStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) IsRunning() (bool, error) {
-	return true, common.ErrNotImplementedError
-}
-func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
-	var ret []MemoryMapsStat
-	return &ret, common.ErrNotImplementedError
-}
-
-func processes() ([]Process, error) {
-	results := make([]Process, 0, 50)
-
-	mib := []int32{CTLKern, KernProc, KernProcProc, 0}
-	buf, length, err := common.CallSyscall(mib)
-	if err != nil {
-		return results, err
-	}
-
-	// get kinfo_proc size
-	count := int(length / uint64(sizeOfKinfoProc))
-
-	// parse buf to procs
-	for i := 0; i < count; i++ {
-		b := buf[i*sizeOfKinfoProc : (i+1)*sizeOfKinfoProc]
-		k, err := parseKinfoProc(b)
-		if err != nil {
-			continue
-		}
-		p, err := NewProcess(int32(k.Pid))
-		if err != nil {
-			continue
-		}
-
-		results = append(results, *p)
-	}
-
-	return results, nil
-}
-
-func parseKinfoProc(buf []byte) (KinfoProc, error) {
-	var k KinfoProc
-	br := bytes.NewReader(buf)
-	err := common.Read(br, binary.LittleEndian, &k)
-	return k, err
-}
-
-func (p *Process) getKProc() (*KinfoProc, error) {
-	mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid}
-
-	buf, length, err := common.CallSyscall(mib)
-	if err != nil {
-		return nil, err
-	}
-	if length != sizeOfKinfoProc {
-		return nil, err
-	}
-
-	k, err := parseKinfoProc(buf)
-	if err != nil {
-		return nil, err
-	}
-	return &k, nil
-}
-
-func NewProcess(pid int32) (*Process, error) {
-	p := &Process{Pid: pid}
-
-	return p, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go
deleted file mode 100644
index 201f714601..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// +build freebsd
-// +build 386
-
-package process
-
-// copied from sys/sysctl.h
-const (
-	CTLKern          = 1  // "high kernel": proc, limits
-	KernProc         = 14 // struct: process entries
-	KernProcPID      = 1  // by process id
-	KernProcProc     = 8  // only return procs
-	KernProcPathname = 12 // path to executable
-	KernProcArgs     = 7  // get/set arguments/proctitle
-)
-
-const (
-	SIDL   = 1
-	SRUN   = 2
-	SSLEEP = 3
-	SSTOP  = 4
-	SZOMB  = 5
-	SWAIT  = 6
-	SLOCK  = 7
-)
-
-const (
-	sizeOfKinfoVmentry = 0x244 // TODO: really?
-	sizeOfKinfoProc    = 0x220
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-// copied from sys/user.h
-type KinfoProc struct {
-	Structsize   int32
-	Layout       int32
-	Args         int32
-	Paddr        int32
-	Addr         int32
-	Tracep       int32
-	Textvp       int32
-	Fd           int32
-	Vmspace      int32
-	Wchan        int32
-	Pid          int32
-	Ppid         int32
-	Pgid         int32
-	Tpgid        int32
-	Sid          int32
-	Tsid         int32
-	Jobc         [2]byte
-	SpareShort1  [2]byte
-	Tdev         int32
-	Siglist      [16]byte
-	Sigmask      [16]byte
-	Sigignore    [16]byte
-	Sigcatch     [16]byte
-	Uid          int32
-	Ruid         int32
-	Svuid        int32
-	Rgid         int32
-	Svgid        int32
-	Ngroups      int16
-	SpareShort2  [2]byte
-	Groups       [64]byte
-	Size         int32
-	Rssize       int32
-	Swrss        int32
-	Tsize        int32
-	Dsize        int32
-	Ssize        int32
-	Xstat        [2]byte
-	Acflag       [2]byte
-	Pctcpu       int32
-	Estcpu       int32
-	Slptime      int32
-	Swtime       int32
-	Cow          int32
-	Runtime      int64
-	Start        [8]byte
-	Childtime    [8]byte
-	Flag         int32
-	Kflag        int32
-	Traceflag    int32
-	Stat         int8
-	Nice         [1]byte
-	Lock         [1]byte
-	Rqindex      [1]byte
-	Oncpu        [1]byte
-	Lastcpu      [1]byte
-	Ocomm        [17]byte
-	Wmesg        [9]byte
-	Login        [18]byte
-	Lockname     [9]byte
-	Comm         [20]int8
-	Emul         [17]byte
-	Sparestrings [68]byte
-	Spareints    [36]byte
-	CrFlags      int32
-	Jid          int32
-	Numthreads   int32
-	Tid          int32
-	Pri          int32
-	Rusage       Rusage
-	RusageCh     [72]byte
-	Pcb          int32
-	Kstack       int32
-	Udata        int32
-	Tdaddr       int32
-	Spareptrs    [24]byte
-	Spareint64s  [48]byte
-	Sflag        int32
-	Tdflags      int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
deleted file mode 100644
index 79e2ba8816..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package process
-
-const (
-	CTLKern			= 1
-	KernProc		= 14
-	KernProcPID		= 1
-	KernProcProc		= 8
-	KernProcPathname	= 12
-	KernProcArgs		= 7
-)
-
-const (
-	sizeofPtr	= 0x8
-	sizeofShort	= 0x2
-	sizeofInt	= 0x4
-	sizeofLong	= 0x8
-	sizeofLongLong	= 0x8
-)
-
-const (
-	sizeOfKinfoVmentry	= 0x488
-	sizeOfKinfoProc		= 0x440
-)
-
-const (
-	SIDL	= 1
-	SRUN	= 2
-	SSLEEP	= 3
-	SSTOP	= 4
-	SZOMB	= 5
-	SWAIT	= 6
-	SLOCK	= 7
-)
-
-type (
-	_C_short	int16
-	_C_int		int32
-	_C_long		int64
-	_C_long_long	int64
-)
-
-type Timespec struct {
-	Sec	int64
-	Nsec	int64
-}
-
-type Timeval struct {
-	Sec	int64
-	Usec	int64
-}
-
-type Rusage struct {
-	Utime		Timeval
-	Stime		Timeval
-	Maxrss		int64
-	Ixrss		int64
-	Idrss		int64
-	Isrss		int64
-	Minflt		int64
-	Majflt		int64
-	Nswap		int64
-	Inblock		int64
-	Oublock		int64
-	Msgsnd		int64
-	Msgrcv		int64
-	Nsignals	int64
-	Nvcsw		int64
-	Nivcsw		int64
-}
-
-type Rlimit struct {
-	Cur	int64
-	Max	int64
-}
-
-type KinfoProc struct {
-	Structsize	int32
-	Layout		int32
-	Args		int64 /* pargs */
-	Paddr		int64 /* proc */
-	Addr		int64 /* user */
-	Tracep		int64 /* vnode */
-	Textvp		int64 /* vnode */
-	Fd		int64 /* filedesc */
-	Vmspace		int64 /* vmspace */
-	Wchan		int64
-	Pid		int32
-	Ppid		int32
-	Pgid		int32
-	Tpgid		int32
-	Sid		int32
-	Tsid		int32
-	Jobc		int16
-	Spare_short1	int16
-	Tdev		uint32
-	Siglist		[16]byte /* sigset */
-	Sigmask		[16]byte /* sigset */
-	Sigignore	[16]byte /* sigset */
-	Sigcatch	[16]byte /* sigset */
-	Uid		uint32
-	Ruid		uint32
-	Svuid		uint32
-	Rgid		uint32
-	Svgid		uint32
-	Ngroups		int16
-	Spare_short2	int16
-	Groups		[16]uint32
-	Size		uint64
-	Rssize		int64
-	Swrss		int64
-	Tsize		int64
-	Dsize		int64
-	Ssize		int64
-	Xstat		uint16
-	Acflag		uint16
-	Pctcpu		uint32
-	Estcpu		uint32
-	Slptime		uint32
-	Swtime		uint32
-	Cow		uint32
-	Runtime		uint64
-	Start		Timeval
-	Childtime	Timeval
-	Flag		int64
-	Kiflag		int64
-	Traceflag	int32
-	Stat		int8
-	Nice		int8
-	Lock		int8
-	Rqindex		int8
-	Oncpu		uint8
-	Lastcpu		uint8
-	Tdname		[17]int8
-	Wmesg		[9]int8
-	Login		[18]int8
-	Lockname	[9]int8
-	Comm		[20]int8
-	Emul		[17]int8
-	Loginclass	[18]int8
-	Sparestrings	[50]int8
-	Spareints	[7]int32
-	Flag2		int32
-	Fibnum		int32
-	Cr_flags	uint32
-	Jid		int32
-	Numthreads	int32
-	Tid		int32
-	Pri		Priority
-	Rusage		Rusage
-	Rusage_ch	Rusage
-	Pcb		int64 /* pcb */
-	Kstack		int64
-	Udata		int64
-	Tdaddr		int64 /* thread */
-	Spareptrs	[6]int64
-	Sparelongs	[12]int64
-	Sflag		int64
-	Tdflags		int64
-}
-
-type Priority struct {
-	Class	uint8
-	Level	uint8
-	Native	uint8
-	User	uint8
-}
-
-type KinfoVmentry struct {
-	Structsize		int32
-	Type			int32
-	Start			uint64
-	End			uint64
-	Offset			uint64
-	Vn_fileid		uint64
-	Vn_fsid			uint32
-	Flags			int32
-	Resident		int32
-	Private_resident	int32
-	Protection		int32
-	Ref_count		int32
-	Shadow_count		int32
-	Vn_type			int32
-	Vn_size			uint64
-	Vn_rdev			uint32
-	Vn_mode			uint16
-	Status			uint16
-	X_kve_ispare		[12]int32
-	Path			[1024]int8
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
deleted file mode 100644
index e79ba36edd..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
+++ /dev/null
@@ -1,733 +0,0 @@
-// +build linux
-
-package process
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/host"
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/net"
-)
-
-var ErrorNoChildren = errors.New("process does not have children")
-
-const (
-	PrioProcess = 0 // linux/resource.h
-)
-
-// MemoryInfoExStat is different between OSes
-type MemoryInfoExStat struct {
-	RSS    uint64 `json:"rss"`    // bytes
-	VMS    uint64 `json:"vms"`    // bytes
-	Shared uint64 `json:"shared"` // bytes
-	Text   uint64 `json:"text"`   // bytes
-	Lib    uint64 `json:"lib"`    // bytes
-	Data   uint64 `json:"data"`   // bytes
-	Dirty  uint64 `json:"dirty"`  // bytes
-}
-
-func (m MemoryInfoExStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
-
-type MemoryMapsStat struct {
-	Path         string `json:"path"`
-	Rss          uint64 `json:"rss"`
-	Size         uint64 `json:"size"`
-	Pss          uint64 `json:"pss"`
-	SharedClean  uint64 `json:"sharedClean"`
-	SharedDirty  uint64 `json:"sharedDirty"`
-	PrivateClean uint64 `json:"privateClean"`
-	PrivateDirty uint64 `json:"privateDirty"`
-	Referenced   uint64 `json:"referenced"`
-	Anonymous    uint64 `json:"anonymous"`
-	Swap         uint64 `json:"swap"`
-}
-
-func (m MemoryMapsStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
-
-// NewProcess creates a new Process instance, it only stores the pid and
-// checks that the process exists. Other method on Process can be used
-// to get more information about the process. An error will be returned
-// if the process does not exist.
-func NewProcess(pid int32) (*Process, error) {
-	p := &Process{
-		Pid: int32(pid),
-	}
-	file, err := os.Open(common.HostProc(strconv.Itoa(int(p.Pid))))
-	defer file.Close()
-	return p, err
-}
-
-func (p *Process) Ppid() (int32, error) {
-	_, ppid, _, _, _, err := p.fillFromStat()
-	if err != nil {
-		return -1, err
-	}
-	return ppid, nil
-}
-func (p *Process) Name() (string, error) {
-	if p.name == "" {
-		if err := p.fillFromStatus(); err != nil {
-			return "", err
-		}
-	}
-	return p.name, nil
-}
-func (p *Process) Exe() (string, error) {
-	return p.fillFromExe()
-}
-
-// Cmdline returns the command line arguments of the process as a string with
-// each argument separated by 0x20 ascii character.
-func (p *Process) Cmdline() (string, error) {
-	return p.fillFromCmdline()
-}
-
-// CmdlineSlice returns the command line arguments of the process as a slice with each
-// element being an argument.
-func (p *Process) CmdlineSlice() ([]string, error) {
-	return p.fillSliceFromCmdline()
-}
-
-func (p *Process) CreateTime() (int64, error) {
-	_, _, _, createTime, _, err := p.fillFromStat()
-	if err != nil {
-		return 0, err
-	}
-	return createTime, nil
-}
-
-func (p *Process) Cwd() (string, error) {
-	return p.fillFromCwd()
-}
-func (p *Process) Parent() (*Process, error) {
-	r, err := callLsof("R", p.Pid)
-	if err != nil {
-		return nil, err
-	}
-	if len(r) != 1 { // TODO: pid 1
-		return nil, fmt.Errorf("wrong number of parents")
-	}
-	v, err := strconv.Atoi(r[0])
-	if err != nil {
-		return nil, err
-	}
-	return NewProcess(int32(v))
-}
-func (p *Process) Status() (string, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return "", err
-	}
-	return p.status, nil
-}
-func (p *Process) Uids() ([]int32, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return []int32{}, err
-	}
-	return p.uids, nil
-}
-func (p *Process) Gids() ([]int32, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return []int32{}, err
-	}
-	return p.gids, nil
-}
-func (p *Process) Terminal() (string, error) {
-	terminal, _, _, _, _, err := p.fillFromStat()
-	if err != nil {
-		return "", err
-	}
-	return terminal, nil
-}
-func (p *Process) Nice() (int32, error) {
-	_, _, _, _, nice, err := p.fillFromStat()
-	if err != nil {
-		return 0, err
-	}
-	return nice, nil
-}
-func (p *Process) IOnice() (int32, error) {
-	return 0, common.ErrNotImplementedError
-}
-func (p *Process) Rlimit() ([]RlimitStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) IOCounters() (*IOCountersStat, error) {
-	return p.fillFromIO()
-}
-func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return nil, err
-	}
-	return p.numCtxSwitches, nil
-}
-func (p *Process) NumFDs() (int32, error) {
-	numFds, _, err := p.fillFromfd()
-	return numFds, err
-}
-func (p *Process) NumThreads() (int32, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return 0, err
-	}
-	return p.numThreads, nil
-}
-func (p *Process) Threads() (map[string]string, error) {
-	ret := make(map[string]string, 0)
-	return ret, nil
-}
-func (p *Process) Times() (*cpu.TimesStat, error) {
-	_, _, cpuTimes, _, _, err := p.fillFromStat()
-	if err != nil {
-		return nil, err
-	}
-	return cpuTimes, nil
-}
-func (p *Process) CPUAffinity() ([]int32, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
-	meminfo, _, err := p.fillFromStatm()
-	if err != nil {
-		return nil, err
-	}
-	return meminfo, nil
-}
-func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
-	_, memInfoEx, err := p.fillFromStatm()
-	if err != nil {
-		return nil, err
-	}
-	return memInfoEx, nil
-}
-
-func (p *Process) Children() ([]*Process, error) {
-	pids, err := common.CallPgrep(invoke, p.Pid)
-	if err != nil {
-		if pids == nil || len(pids) == 0 {
-			return nil, ErrorNoChildren
-		}
-		return nil, err
-	}
-	ret := make([]*Process, 0, len(pids))
-	for _, pid := range pids {
-		np, err := NewProcess(pid)
-		if err != nil {
-			return nil, err
-		}
-		ret = append(ret, np)
-	}
-	return ret, nil
-}
-
-func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
-	_, ofs, err := p.fillFromfd()
-	if err != nil {
-		return nil, err
-	}
-	ret := make([]OpenFilesStat, len(ofs))
-	for i, o := range ofs {
-		ret[i] = *o
-	}
-
-	return ret, nil
-}
-
-func (p *Process) Connections() ([]net.ConnectionStat, error) {
-	return net.ConnectionsPid("all", p.Pid)
-}
-
-func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
-	filename := common.HostProc(strconv.Itoa(int(p.Pid)), "net/dev")
-	return net.IOCountersByFile(pernic, filename)
-}
-
-func (p *Process) IsRunning() (bool, error) {
-	return true, common.ErrNotImplementedError
-}
-
-// MemoryMaps get memory maps from /proc/(pid)/smaps
-func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
-	pid := p.Pid
-	var ret []MemoryMapsStat
-	smapsPath := common.HostProc(strconv.Itoa(int(pid)), "smaps")
-	contents, err := ioutil.ReadFile(smapsPath)
-	if err != nil {
-		return nil, err
-	}
-	lines := strings.Split(string(contents), "\n")
-
-	// function of parsing a block
-	getBlock := func(first_line []string, block []string) (MemoryMapsStat, error) {
-		m := MemoryMapsStat{}
-		m.Path = first_line[len(first_line)-1]
-
-		for _, line := range block {
-			if strings.Contains(line, "VmFlags") {
-				continue
-			}
-			field := strings.Split(line, ":")
-			if len(field) < 2 {
-				continue
-			}
-			v := strings.Trim(field[1], " kB") // remove last "kB"
-			t, err := strconv.ParseUint(v, 10, 64)
-			if err != nil {
-				return m, err
-			}
-
-			switch field[0] {
-			case "Size":
-				m.Size = t
-			case "Rss":
-				m.Rss = t
-			case "Pss":
-				m.Pss = t
-			case "Shared_Clean":
-				m.SharedClean = t
-			case "Shared_Dirty":
-				m.SharedDirty = t
-			case "Private_Clean":
-				m.PrivateClean = t
-			case "Private_Dirty":
-				m.PrivateDirty = t
-			case "Referenced":
-				m.Referenced = t
-			case "Anonymous":
-				m.Anonymous = t
-			case "Swap":
-				m.Swap = t
-			}
-		}
-		return m, nil
-	}
-
-	blocks := make([]string, 16)
-	for _, line := range lines {
-		field := strings.Split(line, " ")
-		if strings.HasSuffix(field[0], ":") == false {
-			// new block section
-			if len(blocks) > 0 {
-				g, err := getBlock(field, blocks)
-				if err != nil {
-					return &ret, err
-				}
-				ret = append(ret, g)
-			}
-			// starts new block
-			blocks = make([]string, 16)
-		} else {
-			blocks = append(blocks, line)
-		}
-	}
-
-	return &ret, nil
-}
-
-/**
-** Internal functions
-**/
-
-// Get num_fds from /proc/(pid)/fd
-func (p *Process) fillFromfd() (int32, []*OpenFilesStat, error) {
-	pid := p.Pid
-	statPath := common.HostProc(strconv.Itoa(int(pid)), "fd")
-	d, err := os.Open(statPath)
-	if err != nil {
-		return 0, nil, err
-	}
-	defer d.Close()
-	fnames, err := d.Readdirnames(-1)
-	numFDs := int32(len(fnames))
-
-	var openfiles []*OpenFilesStat
-	for _, fd := range fnames {
-		fpath := filepath.Join(statPath, fd)
-		filepath, err := os.Readlink(fpath)
-		if err != nil {
-			continue
-		}
-		t, err := strconv.ParseUint(fd, 10, 64)
-		if err != nil {
-			return numFDs, openfiles, err
-		}
-		o := &OpenFilesStat{
-			Path: filepath,
-			Fd:   t,
-		}
-		openfiles = append(openfiles, o)
-	}
-
-	return numFDs, openfiles, nil
-}
-
-// Get cwd from /proc/(pid)/cwd
-func (p *Process) fillFromCwd() (string, error) {
-	pid := p.Pid
-	cwdPath := common.HostProc(strconv.Itoa(int(pid)), "cwd")
-	cwd, err := os.Readlink(cwdPath)
-	if err != nil {
-		return "", err
-	}
-	return string(cwd), nil
-}
-
-// Get exe from /proc/(pid)/exe
-func (p *Process) fillFromExe() (string, error) {
-	pid := p.Pid
-	exePath := common.HostProc(strconv.Itoa(int(pid)), "exe")
-	exe, err := os.Readlink(exePath)
-	if err != nil {
-		return "", err
-	}
-	return string(exe), nil
-}
-
-// Get cmdline from /proc/(pid)/cmdline
-func (p *Process) fillFromCmdline() (string, error) {
-	pid := p.Pid
-	cmdPath := common.HostProc(strconv.Itoa(int(pid)), "cmdline")
-	cmdline, err := ioutil.ReadFile(cmdPath)
-	if err != nil {
-		return "", err
-	}
-	ret := strings.FieldsFunc(string(cmdline), func(r rune) bool {
-		if r == '\u0000' {
-			return true
-		}
-		return false
-	})
-
-	return strings.Join(ret, " "), nil
-}
-
-func (p *Process) fillSliceFromCmdline() ([]string, error) {
-	pid := p.Pid
-	cmdPath := common.HostProc(strconv.Itoa(int(pid)), "cmdline")
-	cmdline, err := ioutil.ReadFile(cmdPath)
-	if err != nil {
-		return nil, err
-	}
-	if len(cmdline) == 0 {
-		return nil, nil
-	}
-	if cmdline[len(cmdline)-1] == 0 {
-		cmdline = cmdline[:len(cmdline)-1]
-	}
-	parts := bytes.Split(cmdline, []byte{0})
-	var strParts []string
-	for _, p := range parts {
-		strParts = append(strParts, string(p))
-	}
-
-	return strParts, nil
-}
-
-// Get IO status from /proc/(pid)/io
-func (p *Process) fillFromIO() (*IOCountersStat, error) {
-	pid := p.Pid
-	ioPath := common.HostProc(strconv.Itoa(int(pid)), "io")
-	ioline, err := ioutil.ReadFile(ioPath)
-	if err != nil {
-		return nil, err
-	}
-	lines := strings.Split(string(ioline), "\n")
-	ret := &IOCountersStat{}
-
-	for _, line := range lines {
-		field := strings.Fields(line)
-		if len(field) < 2 {
-			continue
-		}
-		t, err := strconv.ParseUint(field[1], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		param := field[0]
-		if strings.HasSuffix(param, ":") {
-			param = param[:len(param)-1]
-		}
-		switch param {
-		case "syscr":
-			ret.ReadCount = t
-		case "syscw":
-			ret.WriteCount = t
-		case "readBytes":
-			ret.ReadBytes = t
-		case "writeBytes":
-			ret.WriteBytes = t
-		}
-	}
-
-	return ret, nil
-}
-
-// Get memory info from /proc/(pid)/statm
-func (p *Process) fillFromStatm() (*MemoryInfoStat, *MemoryInfoExStat, error) {
-	pid := p.Pid
-	memPath := common.HostProc(strconv.Itoa(int(pid)), "statm")
-	contents, err := ioutil.ReadFile(memPath)
-	if err != nil {
-		return nil, nil, err
-	}
-	fields := strings.Split(string(contents), " ")
-
-	vms, err := strconv.ParseUint(fields[0], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	rss, err := strconv.ParseUint(fields[1], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	memInfo := &MemoryInfoStat{
-		RSS: rss * PageSize,
-		VMS: vms * PageSize,
-	}
-
-	shared, err := strconv.ParseUint(fields[2], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	text, err := strconv.ParseUint(fields[3], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	lib, err := strconv.ParseUint(fields[4], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	dirty, err := strconv.ParseUint(fields[5], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	memInfoEx := &MemoryInfoExStat{
-		RSS:    rss * PageSize,
-		VMS:    vms * PageSize,
-		Shared: shared * PageSize,
-		Text:   text * PageSize,
-		Lib:    lib * PageSize,
-		Dirty:  dirty * PageSize,
-	}
-
-	return memInfo, memInfoEx, nil
-}
-
-// Get various status from /proc/(pid)/status
-func (p *Process) fillFromStatus() error {
-	pid := p.Pid
-	statPath := common.HostProc(strconv.Itoa(int(pid)), "status")
-	contents, err := ioutil.ReadFile(statPath)
-	if err != nil {
-		return err
-	}
-	lines := strings.Split(string(contents), "\n")
-	p.numCtxSwitches = &NumCtxSwitchesStat{}
-	p.memInfo = &MemoryInfoStat{}
-	for _, line := range lines {
-		tabParts := strings.SplitN(line, "\t", 2)
-		if len(tabParts) < 2 {
-			continue
-		}
-		value := tabParts[1]
-		switch strings.TrimRight(tabParts[0], ":") {
-		case "Name":
-			p.name = strings.Trim(value, " \t")
-		case "State":
-			p.status = value[0:1]
-		case "Uid":
-			p.uids = make([]int32, 0, 4)
-			for _, i := range strings.Split(value, "\t") {
-				v, err := strconv.ParseInt(i, 10, 32)
-				if err != nil {
-					return err
-				}
-				p.uids = append(p.uids, int32(v))
-			}
-		case "Gid":
-			p.gids = make([]int32, 0, 4)
-			for _, i := range strings.Split(value, "\t") {
-				v, err := strconv.ParseInt(i, 10, 32)
-				if err != nil {
-					return err
-				}
-				p.gids = append(p.gids, int32(v))
-			}
-		case "Threads":
-			v, err := strconv.ParseInt(value, 10, 32)
-			if err != nil {
-				return err
-			}
-			p.numThreads = int32(v)
-		case "voluntary_ctxt_switches":
-			v, err := strconv.ParseInt(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.numCtxSwitches.Voluntary = v
-		case "nonvoluntary_ctxt_switches":
-			v, err := strconv.ParseInt(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.numCtxSwitches.Involuntary = v
-		case "VmRSS":
-			value := strings.Trim(value, " kB") // remove last "kB"
-			v, err := strconv.ParseUint(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.memInfo.RSS = v * 1024
-		case "VmSize":
-			value := strings.Trim(value, " kB") // remove last "kB"
-			v, err := strconv.ParseUint(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.memInfo.VMS = v * 1024
-		case "VmSwap":
-			value := strings.Trim(value, " kB") // remove last "kB"
-			v, err := strconv.ParseUint(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.memInfo.Swap = v * 1024
-		}
-
-	}
-	return nil
-}
-
-func (p *Process) fillFromStat() (string, int32, *cpu.TimesStat, int64, int32, error) {
-	pid := p.Pid
-	statPath := common.HostProc(strconv.Itoa(int(pid)), "stat")
-	contents, err := ioutil.ReadFile(statPath)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-	fields := strings.Fields(string(contents))
-
-	i := 1
-	for !strings.HasSuffix(fields[i], ")") {
-		i++
-	}
-
-	termmap, err := getTerminalMap()
-	terminal := ""
-	if err == nil {
-		t, err := strconv.ParseUint(fields[i+5], 10, 64)
-		if err != nil {
-			return "", 0, nil, 0, 0, err
-		}
-		terminal = termmap[t]
-	}
-
-	ppid, err := strconv.ParseInt(fields[i+2], 10, 32)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-	utime, err := strconv.ParseFloat(fields[i+12], 64)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-
-	stime, err := strconv.ParseFloat(fields[i+13], 64)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-
-	cpuTimes := &cpu.TimesStat{
-		CPU:    "cpu",
-		User:   float64(utime / ClockTicks),
-		System: float64(stime / ClockTicks),
-	}
-
-	bootTime, _ := host.BootTime()
-	t, err := strconv.ParseUint(fields[i+20], 10, 64)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-	ctime := (t / uint64(ClockTicks)) + uint64(bootTime)
-	createTime := int64(ctime * 1000)
-
-	//	p.Nice = mustParseInt32(fields[18])
-	// use syscall instead of parse Stat file
-	snice, _ := syscall.Getpriority(PrioProcess, int(pid))
-	nice := int32(snice) // FIXME: is this true?
-
-	return terminal, int32(ppid), cpuTimes, createTime, nice, nil
-}
-
-func Pids() ([]int32, error) {
-	var ret []int32
-
-	d, err := os.Open(common.HostProc())
-	if err != nil {
-		return nil, err
-	}
-	defer d.Close()
-
-	fnames, err := d.Readdirnames(-1)
-	if err != nil {
-		return nil, err
-	}
-	for _, fname := range fnames {
-		pid, err := strconv.ParseInt(fname, 10, 32)
-		if err != nil {
-			// if not numeric name, just skip
-			continue
-		}
-		ret = append(ret, int32(pid))
-	}
-
-	return ret, nil
-}
-
-func callLsof(arg string, pid int32) ([]string, error) {
-	var cmd []string
-	if pid == 0 { // will get from all processes.
-		cmd = []string{"-F" + arg}
-	} else {
-		cmd = []string{"-a", "-F" + arg, "-p", strconv.Itoa(int(pid))}
-	}
-	lsof, err := exec.LookPath("lsof")
-	if err != nil {
-		return []string{}, err
-	}
-	out, err := invoke.Command(lsof, cmd...)
-	if err != nil {
-		return []string{}, err
-	}
-	lines := strings.Split(string(out), "\n")
-
-	var ret []string
-	for _, l := range lines[1:] {
-		if strings.HasPrefix(l, arg) {
-			ret = append(ret, l[1:]) // delete first char
-		}
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go
deleted file mode 100644
index 541b854c75..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build 386
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go
deleted file mode 100644
index b4a4ce8b7c..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build amd64
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go
deleted file mode 100644
index c6123a4891..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build arm
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
deleted file mode 100644
index 92353b8c5d..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// +build linux freebsd darwin
-
-package process
-
-import (
-	"os"
-	"os/exec"
-	"os/user"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-// POSIX
-func getTerminalMap() (map[uint64]string, error) {
-	ret := make(map[uint64]string)
-	var termfiles []string
-
-	d, err := os.Open("/dev")
-	if err != nil {
-		return nil, err
-	}
-	defer d.Close()
-
-	devnames, err := d.Readdirnames(-1)
-	for _, devname := range devnames {
-		if strings.HasPrefix(devname, "/dev/tty") {
-			termfiles = append(termfiles, "/dev/tty/"+devname)
-		}
-	}
-
-	ptsd, err := os.Open("/dev/pts")
-	if err != nil {
-		return nil, err
-	}
-	defer ptsd.Close()
-
-	ptsnames, err := ptsd.Readdirnames(-1)
-	for _, ptsname := range ptsnames {
-		termfiles = append(termfiles, "/dev/pts/"+ptsname)
-	}
-
-	for _, name := range termfiles {
-		stat := syscall.Stat_t{}
-		if err = syscall.Stat(name, &stat); err != nil {
-			return nil, err
-		}
-		rdev := uint64(stat.Rdev)
-		ret[rdev] = strings.Replace(name, "/dev", "", -1)
-	}
-	return ret, nil
-}
-
-func (p *Process) SendSignal(sig syscall.Signal) error {
-	sigAsStr := "INT"
-	switch sig {
-	case syscall.SIGSTOP:
-		sigAsStr = "STOP"
-	case syscall.SIGCONT:
-		sigAsStr = "CONT"
-	case syscall.SIGTERM:
-		sigAsStr = "TERM"
-	case syscall.SIGKILL:
-		sigAsStr = "KILL"
-	}
-
-	kill, err := exec.LookPath("kill")
-	if err != nil {
-		return err
-	}
-	cmd := exec.Command(kill, "-s", sigAsStr, strconv.Itoa(int(p.Pid)))
-	cmd.Stderr = os.Stderr
-	err = cmd.Run()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (p *Process) Suspend() error {
-	return p.SendSignal(syscall.SIGSTOP)
-}
-func (p *Process) Resume() error {
-	return p.SendSignal(syscall.SIGCONT)
-}
-func (p *Process) Terminate() error {
-	return p.SendSignal(syscall.SIGTERM)
-}
-func (p *Process) Kill() error {
-	return p.SendSignal(syscall.SIGKILL)
-}
-func (p *Process) Username() (string, error) {
-	uids, err := p.Uids()
-	if err != nil {
-		return "", err
-	}
-	if len(uids) > 0 {
-		u, err := user.LookupId(strconv.Itoa(int(uids[0])))
-		if err != nil {
-			return "", err
-		}
-		return u.Username, nil
-	}
-	return "", nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go
deleted file mode 100644
index 3176cde05a..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go
+++ /dev/null
@@ -1,357 +0,0 @@
-// +build windows
-
-package process
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-	"syscall"
-	"time"
-	"unsafe"
-
-	"github.com/StackExchange/wmi"
-	"github.com/shirou/w32"
-
-	cpu "github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	net "github.com/shirou/gopsutil/net"
-)
-
-const (
-	NoMoreFiles   = 0x12
-	MaxPathLength = 260
-)
-
-type SystemProcessInformation struct {
-	NextEntryOffset   uint64
-	NumberOfThreads   uint64
-	Reserved1         [48]byte
-	Reserved2         [3]byte
-	UniqueProcessID   uintptr
-	Reserved3         uintptr
-	HandleCount       uint64
-	Reserved4         [4]byte
-	Reserved5         [11]byte
-	PeakPagefileUsage uint64
-	PrivatePageCount  uint64
-	Reserved6         [6]uint64
-}
-
-// Memory_info_ex is different between OSes
-type MemoryInfoExStat struct {
-}
-
-type MemoryMapsStat struct {
-}
-
-type Win32_Process struct {
-	Name           string
-	ExecutablePath *string
-	CommandLine    *string
-	Priority       uint32
-	CreationDate   *time.Time
-	ProcessID      uint32
-	ThreadCount    uint32
-
-	/*
-		CSCreationClassName   string
-		CSName                string
-		Caption               *string
-		CreationClassName     string
-		Description           *string
-		ExecutionState        *uint16
-		HandleCount           uint32
-		KernelModeTime        uint64
-		MaximumWorkingSetSize *uint32
-		MinimumWorkingSetSize *uint32
-		OSCreationClassName   string
-		OSName                string
-		OtherOperationCount   uint64
-		OtherTransferCount    uint64
-		PageFaults            uint32
-		PageFileUsage         uint32
-		ParentProcessID       uint32
-		PeakPageFileUsage     uint32
-		PeakVirtualSize       uint64
-		PeakWorkingSetSize    uint32
-		PrivatePageCount      uint64
-		ReadOperationCount    uint64
-		ReadTransferCount     uint64
-		Status                *string
-		TerminationDate       *time.Time
-		UserModeTime          uint64
-		WorkingSetSize        uint64
-		WriteOperationCount   uint64
-		WriteTransferCount    uint64
-	*/
-}
-
-func Pids() ([]int32, error) {
-	var ret []int32
-
-	procs, err := processes()
-	if err != nil {
-		return ret, nil
-	}
-
-	for _, proc := range procs {
-		ret = append(ret, proc.Pid)
-	}
-
-	return ret, nil
-}
-
-func (p *Process) Ppid() (int32, error) {
-	ret, _, _, err := p.getFromSnapProcess(p.Pid)
-	if err != nil {
-		return 0, err
-	}
-	return ret, nil
-}
-
-func GetWin32Proc(pid int32) ([]Win32_Process, error) {
-	var dst []Win32_Process
-	query := fmt.Sprintf("WHERE ProcessId = %d", pid)
-	q := wmi.CreateQuery(&dst, query)
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return []Win32_Process{}, fmt.Errorf("could not get win32Proc: %s", err)
-	}
-	if len(dst) != 1 {
-		return []Win32_Process{}, fmt.Errorf("could not get win32Proc: empty")
-	}
-	return dst, nil
-}
-
-func (p *Process) Name() (string, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return "", fmt.Errorf("could not get Name: %s", err)
-	}
-	return dst[0].Name, nil
-}
-func (p *Process) Exe() (string, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return "", fmt.Errorf("could not get ExecutablePath: %s", err)
-	}
-	return *dst[0].ExecutablePath, nil
-}
-func (p *Process) Cmdline() (string, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return "", fmt.Errorf("could not get CommandLine: %s", err)
-	}
-	return *dst[0].CommandLine, nil
-}
-
-// CmdlineSlice returns the command line arguments of the process as a slice with each
-// element being an argument. This merely returns the CommandLine informations passed
-// to the process split on the 0x20 ASCII character.
-func (p *Process) CmdlineSlice() ([]string, error) {
-	cmdline, err := p.Cmdline()
-	if err != nil {
-		return nil, err
-	}
-	return strings.Split(cmdline, " "), nil
-}
-
-func (p *Process) CreateTime() (int64, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return 0, fmt.Errorf("could not get CreationDate: %s", err)
-	}
-	date := *dst[0].CreationDate
-	return date.Unix(), nil
-}
-
-func (p *Process) Cwd() (string, error) {
-	return "", common.ErrNotImplementedError
-}
-func (p *Process) Parent() (*Process, error) {
-	return p, common.ErrNotImplementedError
-}
-func (p *Process) Status() (string, error) {
-	return "", common.ErrNotImplementedError
-}
-func (p *Process) Username() (string, error) {
-	return "", common.ErrNotImplementedError
-}
-func (p *Process) Uids() ([]int32, error) {
-	var uids []int32
-
-	return uids, common.ErrNotImplementedError
-}
-func (p *Process) Gids() ([]int32, error) {
-	var gids []int32
-	return gids, common.ErrNotImplementedError
-}
-func (p *Process) Terminal() (string, error) {
-	return "", common.ErrNotImplementedError
-}
-
-// Nice returnes priority in Windows
-func (p *Process) Nice() (int32, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return 0, fmt.Errorf("could not get Priority: %s", err)
-	}
-	return int32(dst[0].Priority), nil
-}
-func (p *Process) IOnice() (int32, error) {
-	return 0, common.ErrNotImplementedError
-}
-func (p *Process) Rlimit() ([]RlimitStat, error) {
-	var rlimit []RlimitStat
-
-	return rlimit, common.ErrNotImplementedError
-}
-func (p *Process) IOCounters() (*IOCountersStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) NumFDs() (int32, error) {
-	return 0, common.ErrNotImplementedError
-}
-func (p *Process) NumThreads() (int32, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return 0, fmt.Errorf("could not get ThreadCount: %s", err)
-	}
-	return int32(dst[0].ThreadCount), nil
-}
-func (p *Process) Threads() (map[string]string, error) {
-	ret := make(map[string]string, 0)
-	return ret, common.ErrNotImplementedError
-}
-func (p *Process) Times() (*cpu.TimesStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) CPUAffinity() ([]int32, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) Children() ([]*Process, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) Connections() ([]net.ConnectionStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
-func (p *Process) IsRunning() (bool, error) {
-	return true, common.ErrNotImplementedError
-}
-
-func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
-	var ret []MemoryMapsStat
-	return &ret, common.ErrNotImplementedError
-}
-
-func NewProcess(pid int32) (*Process, error) {
-	p := &Process{Pid: pid}
-
-	return p, nil
-}
-
-func (p *Process) SendSignal(sig syscall.Signal) error {
-	return common.ErrNotImplementedError
-}
-
-func (p *Process) Suspend() error {
-	return common.ErrNotImplementedError
-}
-func (p *Process) Resume() error {
-	return common.ErrNotImplementedError
-}
-func (p *Process) Terminate() error {
-	return common.ErrNotImplementedError
-}
-func (p *Process) Kill() error {
-	return common.ErrNotImplementedError
-}
-
-func (p *Process) getFromSnapProcess(pid int32) (int32, int32, string, error) {
-	snap := w32.CreateToolhelp32Snapshot(w32.TH32CS_SNAPPROCESS, uint32(pid))
-	if snap == 0 {
-		return 0, 0, "", syscall.GetLastError()
-	}
-	defer w32.CloseHandle(snap)
-	var pe32 w32.PROCESSENTRY32
-	pe32.DwSize = uint32(unsafe.Sizeof(pe32))
-	if w32.Process32First(snap, &pe32) == false {
-		return 0, 0, "", syscall.GetLastError()
-	}
-
-	if pe32.Th32ProcessID == uint32(pid) {
-		szexe := syscall.UTF16ToString(pe32.SzExeFile[:])
-		return int32(pe32.Th32ParentProcessID), int32(pe32.CntThreads), szexe, nil
-	}
-
-	for w32.Process32Next(snap, &pe32) {
-		if pe32.Th32ProcessID == uint32(pid) {
-			szexe := syscall.UTF16ToString(pe32.SzExeFile[:])
-			return int32(pe32.Th32ParentProcessID), int32(pe32.CntThreads), szexe, nil
-		}
-	}
-	return 0, 0, "", errors.New("Couldn't find pid:" + string(pid))
-}
-
-// Get processes
-func processes() ([]*Process, error) {
-
-	var dst []Win32_Process
-	q := wmi.CreateQuery(&dst, "")
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return []*Process{}, err
-	}
-	if len(dst) == 0 {
-		return []*Process{}, fmt.Errorf("could not get Process")
-	}
-	results := make([]*Process, 0, len(dst))
-	for _, proc := range dst {
-		p, err := NewProcess(int32(proc.ProcessID))
-		if err != nil {
-			continue
-		}
-		results = append(results, p)
-	}
-
-	return results, nil
-}
-
-func getProcInfo(pid int32) (*SystemProcessInformation, error) {
-	initialBufferSize := uint64(0x4000)
-	bufferSize := initialBufferSize
-	buffer := make([]byte, bufferSize)
-
-	var sysProcInfo SystemProcessInformation
-	ret, _, _ := common.ProcNtQuerySystemInformation.Call(
-		uintptr(unsafe.Pointer(&sysProcInfo)),
-		uintptr(unsafe.Pointer(&buffer[0])),
-		uintptr(unsafe.Pointer(&bufferSize)),
-		uintptr(unsafe.Pointer(&bufferSize)))
-	if ret != 0 {
-		return nil, syscall.GetLastError()
-	}
-
-	return &sysProcInfo, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go
deleted file mode 100644
index 21216cd09a..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Hand Writing
-// - all pointer in ExternProc to uint64
-
-// +build ignore
-
-/*
-Input to cgo -godefs.
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-// +godefs map struct_ [16]byte /* in6_addr */
-
-package process
-
-/*
-#define __DARWIN_UNIX03 0
-#define KERNEL
-#define _DARWIN_USE_64_BIT_INODE
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <unistd.h>
-#include <mach/mach.h>
-#include <mach/message.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <net/bpf.h>
-#include <net/if_dl.h>
-#include <net/if_var.h>
-#include <net/route.h>
-#include <netinet/in.h>
-
-#include <sys/sysctl.h>
-#include <sys/ucred.h>
-#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/_types/_timeval.h>
-#include <sys/appleapiopts.h>
-#include <sys/cdefs.h>
-#include <sys/param.h>
-#include <bsm/audit.h>
-#include <sys/queue.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-struct ucred_queue {
-        struct ucred *tqe_next;
-        struct ucred **tqe_prev;
-        TRACEBUF
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type UGid_t C.gid_t
-
-type KinfoProc C.struct_kinfo_proc
-
-type Eproc C.struct_eproc
-
-type Proc C.struct_proc
-
-type Session C.struct_session
-
-type ucred C.struct_ucred
-
-type Uucred C.struct__ucred
-
-type Upcred C.struct__pcred
-
-type Vmspace C.struct_vmspace
-
-type Sigacts C.struct_sigacts
-
-type ExternProc C.struct_extern_proc
-
-type Itimerval C.struct_itimerval
-
-type Vnode C.struct_vnode
-
-type Pgrp C.struct_pgrp
-
-type UserStruct C.struct_user
-
-type Au_session C.struct_au_session
-
-type Posix_cred C.struct_posix_cred
-
-type Label C.struct_label
-
-type AuditinfoAddr C.struct_auditinfo_addr
-type AuMask C.struct_au_mask
-type AuTidAddr C.struct_au_tid_addr
-
-// TAILQ(ucred)
-type UcredQueue C.struct_ucred_queue
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_freebsd.go
deleted file mode 100644
index aa7b3462de..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_freebsd.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// +build ignore
-
-// We still need editing by hands.
-// go tool cgo -godefs types_freebsd.go | sed 's/\*int64/int64/' | sed 's/\*byte/int64/'  > process_freebsd_amd64.go
-
-/*
-Input to cgo -godefs.
-*/
-
-// +godefs map struct_pargs int64 /* pargs */
-// +godefs map struct_proc int64 /* proc */
-// +godefs map struct_user int64 /* user */
-// +godefs map struct_vnode int64 /* vnode */
-// +godefs map struct_vnode int64 /* vnode */
-// +godefs map struct_filedesc int64 /* filedesc */
-// +godefs map struct_vmspace int64 /* vmspace */
-// +godefs map struct_pcb int64 /* pcb */
-// +godefs map struct_thread int64 /* thread */
-// +godefs map struct___sigset [16]byte /* sigset */
-
-package process
-
-/*
-#include <sys/types.h>
-#include <sys/user.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	CTLKern          = 1  // "high kernel": proc, limits
-	KernProc         = 14 // struct: process entries
-	KernProcPID      = 1  // by process id
-	KernProcProc     = 8  // only return procs
-	KernProcPathname = 12 // path to executable
-	KernProcArgs     = 7  // get/set arguments/proctitle
-)
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-const (
-	sizeOfKinfoVmentry = C.sizeof_struct_kinfo_vmentry
-	sizeOfKinfoProc    = C.sizeof_struct_kinfo_proc
-)
-
-// from sys/proc.h
-const (
-	SIDL   = 1 /* Process being created by fork. */
-	SRUN   = 2 /* Currently runnable. */
-	SSLEEP = 3 /* Sleeping on an address. */
-	SSTOP  = 4 /* Process debugging or suspension. */
-	SZOMB  = 5 /* Awaiting collection by parent. */
-	SWAIT  = 6 /* Waiting for interrupt. */
-	SLOCK  = 7 /* Blocked on a lock. */
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type KinfoProc C.struct_kinfo_proc
-
-type Priority C.struct_priority
-
-type KinfoVmentry C.struct_kinfo_vmentry
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/AUTHORS b/Godeps/_workspace/src/github.com/shirou/w32/AUTHORS
deleted file mode 100644
index c0785e8203..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/AUTHORS
+++ /dev/null
@@ -1,16 +0,0 @@
-# This is the official list of 'w32' authors for copyright purposes.
-
-# Names should be added to this file as
-#   Name or Organization <email address>
-# The email address is not required for organizations.
-
-# Please keep the list sorted.
-
-# Contributors
-# ============
-
-Allen Dang <allengnr@gmail.com>
-Benny Siegert <bsiegert@gmail.com>
-Bruno Bigras <bigras.bruno@gmail.com>
-Gerald Rosenberg <gerald.rosenberg@gmail.com>
-Michael Henke
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/LICENSE b/Godeps/_workspace/src/github.com/shirou/w32/LICENSE
deleted file mode 100644
index 9f36608c87..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2010-2012 The w32 Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/README.md b/Godeps/_workspace/src/github.com/shirou/w32/README.md
deleted file mode 100644
index ed196e7661..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-About w32
-==========
-
-w32 is a wrapper of windows apis for the Go Programming Language.
-
-It wraps win32 apis to "Go style" to make them easier to use.
-
-Setup
-=====
-
-1. Make sure you have a working Go installation and build environment, 
-   see this go-nuts post for details:
-   http://groups.google.com/group/golang-nuts/msg/5c87630a84f4fd0c
-   
-   Updated versions of the Windows Go build are available here:
-   http://code.google.com/p/gomingw/downloads/list
-   
-2. Create a "gopath" directory if you do not have one yet and set the
-   GOPATH variable accordingly. For example:
-   mkdir -p go-externals/src
-   export GOPATH=${PWD}/go-externals
-
-3. go get github.com/AllenDang/w32
-
-4. go install github.com/AllenDang/w32...
-
-Contribute
-==========
-
-Contributions in form of design, code, documentation, bug reporting or other
-ways you see fit are very welcome.
-
-Thank You!
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/advapi32.go b/Godeps/_workspace/src/github.com/shirou/w32/advapi32.go
deleted file mode 100644
index 2f8a4fe010..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/advapi32.go
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"errors"
-	"fmt"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modadvapi32 = syscall.NewLazyDLL("advapi32.dll")
-
-	procRegCreateKeyEx = modadvapi32.NewProc("RegCreateKeyExW")
-	procRegOpenKeyEx   = modadvapi32.NewProc("RegOpenKeyExW")
-	procRegCloseKey    = modadvapi32.NewProc("RegCloseKey")
-	procRegGetValue    = modadvapi32.NewProc("RegGetValueW")
-	procRegEnumKeyEx   = modadvapi32.NewProc("RegEnumKeyExW")
-	//	procRegSetKeyValue     = modadvapi32.NewProc("RegSetKeyValueW")
-	procRegSetValueEx      = modadvapi32.NewProc("RegSetValueExW")
-	procOpenEventLog       = modadvapi32.NewProc("OpenEventLogW")
-	procReadEventLog       = modadvapi32.NewProc("ReadEventLogW")
-	procCloseEventLog      = modadvapi32.NewProc("CloseEventLog")
-	procOpenSCManager      = modadvapi32.NewProc("OpenSCManagerW")
-	procCloseServiceHandle = modadvapi32.NewProc("CloseServiceHandle")
-	procOpenService        = modadvapi32.NewProc("OpenServiceW")
-	procStartService       = modadvapi32.NewProc("StartServiceW")
-	procControlService     = modadvapi32.NewProc("ControlService")
-)
-
-func RegCreateKey(hKey HKEY, subKey string) HKEY {
-	var result HKEY
-	ret, _, _ := procRegCreateKeyEx.Call(
-		uintptr(hKey),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
-		uintptr(0),
-		uintptr(0),
-		uintptr(0),
-		uintptr(KEY_ALL_ACCESS),
-		uintptr(0),
-		uintptr(unsafe.Pointer(&result)),
-		uintptr(0))
-	_ = ret
-	return result
-}
-
-func RegOpenKeyEx(hKey HKEY, subKey string, samDesired uint32) HKEY {
-	var result HKEY
-	ret, _, _ := procRegOpenKeyEx.Call(
-		uintptr(hKey),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
-		uintptr(0),
-		uintptr(samDesired),
-		uintptr(unsafe.Pointer(&result)))
-
-	if ret != ERROR_SUCCESS {
-		panic(fmt.Sprintf("RegOpenKeyEx(%d, %s, %d) failed", hKey, subKey, samDesired))
-	}
-	return result
-}
-
-func RegCloseKey(hKey HKEY) error {
-	var err error
-	ret, _, _ := procRegCloseKey.Call(
-		uintptr(hKey))
-
-	if ret != ERROR_SUCCESS {
-		err = errors.New("RegCloseKey failed")
-	}
-	return err
-}
-
-func RegGetRaw(hKey HKEY, subKey string, value string) []byte {
-	var bufLen uint32
-	var valptr unsafe.Pointer
-	if len(value) > 0 {
-		valptr = unsafe.Pointer(syscall.StringToUTF16Ptr(value))
-	}
-	procRegGetValue.Call(
-		uintptr(hKey),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
-		uintptr(valptr),
-		uintptr(RRF_RT_ANY),
-		0,
-		0,
-		uintptr(unsafe.Pointer(&bufLen)))
-
-	if bufLen == 0 {
-		return nil
-	}
-
-	buf := make([]byte, bufLen)
-	ret, _, _ := procRegGetValue.Call(
-		uintptr(hKey),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
-		uintptr(valptr),
-		uintptr(RRF_RT_ANY),
-		0,
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(&bufLen)))
-
-	if ret != ERROR_SUCCESS {
-		return nil
-	}
-
-	return buf
-}
-
-func RegSetBinary(hKey HKEY, subKey string, value []byte) (errno int) {
-	var lptr, vptr unsafe.Pointer
-	if len(subKey) > 0 {
-		lptr = unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))
-	}
-	if len(value) > 0 {
-		vptr = unsafe.Pointer(&value[0])
-	}
-	ret, _, _ := procRegSetValueEx.Call(
-		uintptr(hKey),
-		uintptr(lptr),
-		uintptr(0),
-		uintptr(REG_BINARY),
-		uintptr(vptr),
-		uintptr(len(value)))
-
-	return int(ret)
-}
-
-func RegGetString(hKey HKEY, subKey string, value string) string {
-	var bufLen uint32
-	procRegGetValue.Call(
-		uintptr(hKey),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(value))),
-		uintptr(RRF_RT_REG_SZ),
-		0,
-		0,
-		uintptr(unsafe.Pointer(&bufLen)))
-
-	if bufLen == 0 {
-		return ""
-	}
-
-	buf := make([]uint16, bufLen)
-	ret, _, _ := procRegGetValue.Call(
-		uintptr(hKey),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(value))),
-		uintptr(RRF_RT_REG_SZ),
-		0,
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(&bufLen)))
-
-	if ret != ERROR_SUCCESS {
-		return ""
-	}
-
-	return syscall.UTF16ToString(buf)
-}
-
-/*
-func RegSetKeyValue(hKey HKEY, subKey string, valueName string, dwType uint32, data uintptr, cbData uint16) (errno int) {
-	ret, _, _ := procRegSetKeyValue.Call(
-		uintptr(hKey),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(subKey))),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(valueName))),
-		uintptr(dwType),
-		data,
-		uintptr(cbData))
-
-	return int(ret)
-}
-*/
-
-func RegEnumKeyEx(hKey HKEY, index uint32) string {
-	var bufLen uint32 = 255
-	buf := make([]uint16, bufLen)
-	procRegEnumKeyEx.Call(
-		uintptr(hKey),
-		uintptr(index),
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(&bufLen)),
-		0,
-		0,
-		0,
-		0)
-	return syscall.UTF16ToString(buf)
-}
-
-func OpenEventLog(servername string, sourcename string) HANDLE {
-	ret, _, _ := procOpenEventLog.Call(
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(servername))),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(sourcename))))
-
-	return HANDLE(ret)
-}
-
-func ReadEventLog(eventlog HANDLE, readflags, recordoffset uint32, buffer []byte, numberofbytestoread uint32, bytesread, minnumberofbytesneeded *uint32) bool {
-	ret, _, _ := procReadEventLog.Call(
-		uintptr(eventlog),
-		uintptr(readflags),
-		uintptr(recordoffset),
-		uintptr(unsafe.Pointer(&buffer[0])),
-		uintptr(numberofbytestoread),
-		uintptr(unsafe.Pointer(bytesread)),
-		uintptr(unsafe.Pointer(minnumberofbytesneeded)))
-
-	return ret != 0
-}
-
-func CloseEventLog(eventlog HANDLE) bool {
-	ret, _, _ := procCloseEventLog.Call(
-		uintptr(eventlog))
-
-	return ret != 0
-}
-
-func OpenSCManager(lpMachineName, lpDatabaseName string, dwDesiredAccess uint32) (HANDLE, error) {
-	var p1, p2 uintptr
-	if len(lpMachineName) > 0 {
-		p1 = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpMachineName)))
-	}
-	if len(lpDatabaseName) > 0 {
-		p2 = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpDatabaseName)))
-	}
-	ret, _, _ := procOpenSCManager.Call(
-		p1,
-		p2,
-		uintptr(dwDesiredAccess))
-
-	if ret == 0 {
-		return 0, syscall.GetLastError()
-	}
-
-	return HANDLE(ret), nil
-}
-
-func CloseServiceHandle(hSCObject HANDLE) error {
-	ret, _, _ := procCloseServiceHandle.Call(uintptr(hSCObject))
-	if ret == 0 {
-		return syscall.GetLastError()
-	}
-	return nil
-}
-
-func OpenService(hSCManager HANDLE, lpServiceName string, dwDesiredAccess uint32) (HANDLE, error) {
-	ret, _, _ := procOpenService.Call(
-		uintptr(hSCManager),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpServiceName))),
-		uintptr(dwDesiredAccess))
-
-	if ret == 0 {
-		return 0, syscall.GetLastError()
-	}
-
-	return HANDLE(ret), nil
-}
-
-func StartService(hService HANDLE, lpServiceArgVectors []string) error {
-	l := len(lpServiceArgVectors)
-	var ret uintptr
-	if l == 0 {
-		ret, _, _ = procStartService.Call(
-			uintptr(hService),
-			0,
-			0)
-	} else {
-		lpArgs := make([]uintptr, l)
-		for i := 0; i < l; i++ {
-			lpArgs[i] = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpServiceArgVectors[i])))
-		}
-
-		ret, _, _ = procStartService.Call(
-			uintptr(hService),
-			uintptr(l),
-			uintptr(unsafe.Pointer(&lpArgs[0])))
-	}
-
-	if ret == 0 {
-		return syscall.GetLastError()
-	}
-
-	return nil
-}
-
-func ControlService(hService HANDLE, dwControl uint32, lpServiceStatus *SERVICE_STATUS) bool {
-	if lpServiceStatus == nil {
-		panic("ControlService:lpServiceStatus cannot be nil")
-	}
-
-	ret, _, _ := procControlService.Call(
-		uintptr(hService),
-		uintptr(dwControl),
-		uintptr(unsafe.Pointer(lpServiceStatus)))
-
-	return ret != 0
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/comctl32.go b/Godeps/_workspace/src/github.com/shirou/w32/comctl32.go
deleted file mode 100644
index 4f4e6b53a5..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/comctl32.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modcomctl32 = syscall.NewLazyDLL("comctl32.dll")
-
-	procInitCommonControlsEx    = modcomctl32.NewProc("InitCommonControlsEx")
-	procImageList_Create        = modcomctl32.NewProc("ImageList_Create")
-	procImageList_Destroy       = modcomctl32.NewProc("ImageList_Destroy")
-	procImageList_GetImageCount = modcomctl32.NewProc("ImageList_GetImageCount")
-	procImageList_SetImageCount = modcomctl32.NewProc("ImageList_SetImageCount")
-	procImageList_Add           = modcomctl32.NewProc("ImageList_Add")
-	procImageList_ReplaceIcon   = modcomctl32.NewProc("ImageList_ReplaceIcon")
-	procImageList_Remove        = modcomctl32.NewProc("ImageList_Remove")
-	procTrackMouseEvent         = modcomctl32.NewProc("_TrackMouseEvent")
-)
-
-func InitCommonControlsEx(lpInitCtrls *INITCOMMONCONTROLSEX) bool {
-	ret, _, _ := procInitCommonControlsEx.Call(
-		uintptr(unsafe.Pointer(lpInitCtrls)))
-
-	return ret != 0
-}
-
-func ImageList_Create(cx, cy int, flags uint, cInitial, cGrow int) HIMAGELIST {
-	ret, _, _ := procImageList_Create.Call(
-		uintptr(cx),
-		uintptr(cy),
-		uintptr(flags),
-		uintptr(cInitial),
-		uintptr(cGrow))
-
-	if ret == 0 {
-		panic("Create image list failed")
-	}
-
-	return HIMAGELIST(ret)
-}
-
-func ImageList_Destroy(himl HIMAGELIST) bool {
-	ret, _, _ := procImageList_Destroy.Call(
-		uintptr(himl))
-
-	return ret != 0
-}
-
-func ImageList_GetImageCount(himl HIMAGELIST) int {
-	ret, _, _ := procImageList_GetImageCount.Call(
-		uintptr(himl))
-
-	return int(ret)
-}
-
-func ImageList_SetImageCount(himl HIMAGELIST, uNewCount uint) bool {
-	ret, _, _ := procImageList_SetImageCount.Call(
-		uintptr(himl),
-		uintptr(uNewCount))
-
-	return ret != 0
-}
-
-func ImageList_Add(himl HIMAGELIST, hbmImage, hbmMask HBITMAP) int {
-	ret, _, _ := procImageList_Add.Call(
-		uintptr(himl),
-		uintptr(hbmImage),
-		uintptr(hbmMask))
-
-	return int(ret)
-}
-
-func ImageList_ReplaceIcon(himl HIMAGELIST, i int, hicon HICON) int {
-	ret, _, _ := procImageList_ReplaceIcon.Call(
-		uintptr(himl),
-		uintptr(i),
-		uintptr(hicon))
-
-	return int(ret)
-}
-
-func ImageList_AddIcon(himl HIMAGELIST, hicon HICON) int {
-	return ImageList_ReplaceIcon(himl, -1, hicon)
-}
-
-func ImageList_Remove(himl HIMAGELIST, i int) bool {
-	ret, _, _ := procImageList_Remove.Call(
-		uintptr(himl),
-		uintptr(i))
-
-	return ret != 0
-}
-
-func ImageList_RemoveAll(himl HIMAGELIST) bool {
-	return ImageList_Remove(himl, -1)
-}
-
-func TrackMouseEvent(tme *TRACKMOUSEEVENT) bool {
-	ret, _, _ := procTrackMouseEvent.Call(
-		uintptr(unsafe.Pointer(tme)))
-
-	return ret != 0
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/comdlg32.go b/Godeps/_workspace/src/github.com/shirou/w32/comdlg32.go
deleted file mode 100644
index 37bc98581d..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/comdlg32.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modcomdlg32 = syscall.NewLazyDLL("comdlg32.dll")
-
-	procGetSaveFileName      = modcomdlg32.NewProc("GetSaveFileNameW")
-	procGetOpenFileName      = modcomdlg32.NewProc("GetOpenFileNameW")
-	procCommDlgExtendedError = modcomdlg32.NewProc("CommDlgExtendedError")
-)
-
-func GetOpenFileName(ofn *OPENFILENAME) bool {
-	ret, _, _ := procGetOpenFileName.Call(
-		uintptr(unsafe.Pointer(ofn)))
-
-	return ret != 0
-}
-
-func GetSaveFileName(ofn *OPENFILENAME) bool {
-	ret, _, _ := procGetSaveFileName.Call(
-		uintptr(unsafe.Pointer(ofn)))
-
-	return ret != 0
-}
-
-func CommDlgExtendedError() uint {
-	ret, _, _ := procCommDlgExtendedError.Call()
-
-	return uint(ret)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/constants.go b/Godeps/_workspace/src/github.com/shirou/w32/constants.go
deleted file mode 100644
index 62d2d4b318..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/constants.go
+++ /dev/null
@@ -1,2661 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-const (
-	FALSE = 0
-	TRUE  = 1
-)
-
-const (
-	NO_ERROR                         = 0
-	ERROR_SUCCESS                    = 0
-	ERROR_FILE_NOT_FOUND             = 2
-	ERROR_PATH_NOT_FOUND             = 3
-	ERROR_ACCESS_DENIED              = 5
-	ERROR_INVALID_HANDLE             = 6
-	ERROR_BAD_FORMAT                 = 11
-	ERROR_INVALID_NAME               = 123
-	ERROR_MORE_DATA                  = 234
-	ERROR_NO_MORE_ITEMS              = 259
-	ERROR_INVALID_SERVICE_CONTROL    = 1052
-	ERROR_SERVICE_REQUEST_TIMEOUT    = 1053
-	ERROR_SERVICE_NO_THREAD          = 1054
-	ERROR_SERVICE_DATABASE_LOCKED    = 1055
-	ERROR_SERVICE_ALREADY_RUNNING    = 1056
-	ERROR_SERVICE_DISABLED           = 1058
-	ERROR_SERVICE_DOES_NOT_EXIST     = 1060
-	ERROR_SERVICE_CANNOT_ACCEPT_CTRL = 1061
-	ERROR_SERVICE_NOT_ACTIVE         = 1062
-	ERROR_DATABASE_DOES_NOT_EXIST    = 1065
-	ERROR_SERVICE_DEPENDENCY_FAIL    = 1068
-	ERROR_SERVICE_LOGON_FAILED       = 1069
-	ERROR_SERVICE_MARKED_FOR_DELETE  = 1072
-	ERROR_SERVICE_DEPENDENCY_DELETED = 1075
-)
-
-const (
-	SE_ERR_FNF             = 2
-	SE_ERR_PNF             = 3
-	SE_ERR_ACCESSDENIED    = 5
-	SE_ERR_OOM             = 8
-	SE_ERR_DLLNOTFOUND     = 32
-	SE_ERR_SHARE           = 26
-	SE_ERR_ASSOCINCOMPLETE = 27
-	SE_ERR_DDETIMEOUT      = 28
-	SE_ERR_DDEFAIL         = 29
-	SE_ERR_DDEBUSY         = 30
-	SE_ERR_NOASSOC         = 31
-)
-
-const (
-	CW_USEDEFAULT = ^0x7fffffff
-)
-
-// ShowWindow constants
-const (
-	SW_HIDE            = 0
-	SW_NORMAL          = 1
-	SW_SHOWNORMAL      = 1
-	SW_SHOWMINIMIZED   = 2
-	SW_MAXIMIZE        = 3
-	SW_SHOWMAXIMIZED   = 3
-	SW_SHOWNOACTIVATE  = 4
-	SW_SHOW            = 5
-	SW_MINIMIZE        = 6
-	SW_SHOWMINNOACTIVE = 7
-	SW_SHOWNA          = 8
-	SW_RESTORE         = 9
-	SW_SHOWDEFAULT     = 10
-	SW_FORCEMINIMIZE   = 11
-)
-
-// Window class styles
-const (
-	CS_VREDRAW         = 0x00000001
-	CS_HREDRAW         = 0x00000002
-	CS_KEYCVTWINDOW    = 0x00000004
-	CS_DBLCLKS         = 0x00000008
-	CS_OWNDC           = 0x00000020
-	CS_CLASSDC         = 0x00000040
-	CS_PARENTDC        = 0x00000080
-	CS_NOKEYCVT        = 0x00000100
-	CS_NOCLOSE         = 0x00000200
-	CS_SAVEBITS        = 0x00000800
-	CS_BYTEALIGNCLIENT = 0x00001000
-	CS_BYTEALIGNWINDOW = 0x00002000
-	CS_GLOBALCLASS     = 0x00004000
-	CS_IME             = 0x00010000
-	CS_DROPSHADOW      = 0x00020000
-)
-
-// Predefined cursor constants
-const (
-	IDC_ARROW       = 32512
-	IDC_IBEAM       = 32513
-	IDC_WAIT        = 32514
-	IDC_CROSS       = 32515
-	IDC_UPARROW     = 32516
-	IDC_SIZENWSE    = 32642
-	IDC_SIZENESW    = 32643
-	IDC_SIZEWE      = 32644
-	IDC_SIZENS      = 32645
-	IDC_SIZEALL     = 32646
-	IDC_NO          = 32648
-	IDC_HAND        = 32649
-	IDC_APPSTARTING = 32650
-	IDC_HELP        = 32651
-	IDC_ICON        = 32641
-	IDC_SIZE        = 32640
-)
-
-// Predefined icon constants
-const (
-	IDI_APPLICATION = 32512
-	IDI_HAND        = 32513
-	IDI_QUESTION    = 32514
-	IDI_EXCLAMATION = 32515
-	IDI_ASTERISK    = 32516
-	IDI_WINLOGO     = 32517
-	IDI_WARNING     = IDI_EXCLAMATION
-	IDI_ERROR       = IDI_HAND
-	IDI_INFORMATION = IDI_ASTERISK
-)
-
-// Button style constants
-const (
-	BS_3STATE          = 5
-	BS_AUTO3STATE      = 6
-	BS_AUTOCHECKBOX    = 3
-	BS_AUTORADIOBUTTON = 9
-	BS_BITMAP          = 128
-	BS_BOTTOM          = 0X800
-	BS_CENTER          = 0X300
-	BS_CHECKBOX        = 2
-	BS_DEFPUSHBUTTON   = 1
-	BS_GROUPBOX        = 7
-	BS_ICON            = 64
-	BS_LEFT            = 256
-	BS_LEFTTEXT        = 32
-	BS_MULTILINE       = 0X2000
-	BS_NOTIFY          = 0X4000
-	BS_OWNERDRAW       = 0XB
-	BS_PUSHBUTTON      = 0
-	BS_PUSHLIKE        = 4096
-	BS_RADIOBUTTON     = 4
-	BS_RIGHT           = 512
-	BS_RIGHTBUTTON     = 32
-	BS_TEXT            = 0
-	BS_TOP             = 0X400
-	BS_USERBUTTON      = 8
-	BS_VCENTER         = 0XC00
-	BS_FLAT            = 0X8000
-)
-
-// Button state constants
-const (
-	BST_CHECKED       = 1
-	BST_INDETERMINATE = 2
-	BST_UNCHECKED     = 0
-	BST_FOCUS         = 8
-	BST_PUSHED        = 4
-)
-
-// Predefined brushes constants
-const (
-	COLOR_3DDKSHADOW              = 21
-	COLOR_3DFACE                  = 15
-	COLOR_3DHILIGHT               = 20
-	COLOR_3DHIGHLIGHT             = 20
-	COLOR_3DLIGHT                 = 22
-	COLOR_BTNHILIGHT              = 20
-	COLOR_3DSHADOW                = 16
-	COLOR_ACTIVEBORDER            = 10
-	COLOR_ACTIVECAPTION           = 2
-	COLOR_APPWORKSPACE            = 12
-	COLOR_BACKGROUND              = 1
-	COLOR_DESKTOP                 = 1
-	COLOR_BTNFACE                 = 15
-	COLOR_BTNHIGHLIGHT            = 20
-	COLOR_BTNSHADOW               = 16
-	COLOR_BTNTEXT                 = 18
-	COLOR_CAPTIONTEXT             = 9
-	COLOR_GRAYTEXT                = 17
-	COLOR_HIGHLIGHT               = 13
-	COLOR_HIGHLIGHTTEXT           = 14
-	COLOR_INACTIVEBORDER          = 11
-	COLOR_INACTIVECAPTION         = 3
-	COLOR_INACTIVECAPTIONTEXT     = 19
-	COLOR_INFOBK                  = 24
-	COLOR_INFOTEXT                = 23
-	COLOR_MENU                    = 4
-	COLOR_MENUTEXT                = 7
-	COLOR_SCROLLBAR               = 0
-	COLOR_WINDOW                  = 5
-	COLOR_WINDOWFRAME             = 6
-	COLOR_WINDOWTEXT              = 8
-	COLOR_HOTLIGHT                = 26
-	COLOR_GRADIENTACTIVECAPTION   = 27
-	COLOR_GRADIENTINACTIVECAPTION = 28
-)
-
-// Button message constants
-const (
-	BM_CLICK    = 245
-	BM_GETCHECK = 240
-	BM_GETIMAGE = 246
-	BM_GETSTATE = 242
-	BM_SETCHECK = 241
-	BM_SETIMAGE = 247
-	BM_SETSTATE = 243
-	BM_SETSTYLE = 244
-)
-
-// Button notifications
-const (
-	BN_CLICKED       = 0
-	BN_PAINT         = 1
-	BN_HILITE        = 2
-	BN_PUSHED        = BN_HILITE
-	BN_UNHILITE      = 3
-	BN_UNPUSHED      = BN_UNHILITE
-	BN_DISABLE       = 4
-	BN_DOUBLECLICKED = 5
-	BN_DBLCLK        = BN_DOUBLECLICKED
-	BN_SETFOCUS      = 6
-	BN_KILLFOCUS     = 7
-)
-
-// GetWindowLong and GetWindowLongPtr constants
-const (
-	GWL_EXSTYLE     = -20
-	GWL_STYLE       = -16
-	GWL_WNDPROC     = -4
-	GWLP_WNDPROC    = -4
-	GWL_HINSTANCE   = -6
-	GWLP_HINSTANCE  = -6
-	GWL_HWNDPARENT  = -8
-	GWLP_HWNDPARENT = -8
-	GWL_ID          = -12
-	GWLP_ID         = -12
-	GWL_USERDATA    = -21
-	GWLP_USERDATA   = -21
-)
-
-// Window style constants
-const (
-	WS_OVERLAPPED       = 0X00000000
-	WS_POPUP            = 0X80000000
-	WS_CHILD            = 0X40000000
-	WS_MINIMIZE         = 0X20000000
-	WS_VISIBLE          = 0X10000000
-	WS_DISABLED         = 0X08000000
-	WS_CLIPSIBLINGS     = 0X04000000
-	WS_CLIPCHILDREN     = 0X02000000
-	WS_MAXIMIZE         = 0X01000000
-	WS_CAPTION          = 0X00C00000
-	WS_BORDER           = 0X00800000
-	WS_DLGFRAME         = 0X00400000
-	WS_VSCROLL          = 0X00200000
-	WS_HSCROLL          = 0X00100000
-	WS_SYSMENU          = 0X00080000
-	WS_THICKFRAME       = 0X00040000
-	WS_GROUP            = 0X00020000
-	WS_TABSTOP          = 0X00010000
-	WS_MINIMIZEBOX      = 0X00020000
-	WS_MAXIMIZEBOX      = 0X00010000
-	WS_TILED            = 0X00000000
-	WS_ICONIC           = 0X20000000
-	WS_SIZEBOX          = 0X00040000
-	WS_OVERLAPPEDWINDOW = 0X00000000 | 0X00C00000 | 0X00080000 | 0X00040000 | 0X00020000 | 0X00010000
-	WS_POPUPWINDOW      = 0X80000000 | 0X00800000 | 0X00080000
-	WS_CHILDWINDOW      = 0X40000000
-)
-
-// Extended window style constants
-const (
-	WS_EX_DLGMODALFRAME    = 0X00000001
-	WS_EX_NOPARENTNOTIFY   = 0X00000004
-	WS_EX_TOPMOST          = 0X00000008
-	WS_EX_ACCEPTFILES      = 0X00000010
-	WS_EX_TRANSPARENT      = 0X00000020
-	WS_EX_MDICHILD         = 0X00000040
-	WS_EX_TOOLWINDOW       = 0X00000080
-	WS_EX_WINDOWEDGE       = 0X00000100
-	WS_EX_CLIENTEDGE       = 0X00000200
-	WS_EX_CONTEXTHELP      = 0X00000400
-	WS_EX_RIGHT            = 0X00001000
-	WS_EX_LEFT             = 0X00000000
-	WS_EX_RTLREADING       = 0X00002000
-	WS_EX_LTRREADING       = 0X00000000
-	WS_EX_LEFTSCROLLBAR    = 0X00004000
-	WS_EX_RIGHTSCROLLBAR   = 0X00000000
-	WS_EX_CONTROLPARENT    = 0X00010000
-	WS_EX_STATICEDGE       = 0X00020000
-	WS_EX_APPWINDOW        = 0X00040000
-	WS_EX_OVERLAPPEDWINDOW = 0X00000100 | 0X00000200
-	WS_EX_PALETTEWINDOW    = 0X00000100 | 0X00000080 | 0X00000008
-	WS_EX_LAYERED          = 0X00080000
-	WS_EX_NOINHERITLAYOUT  = 0X00100000
-	WS_EX_LAYOUTRTL        = 0X00400000
-	WS_EX_NOACTIVATE       = 0X08000000
-)
-
-// Window message constants
-const (
-	WM_APP                    = 32768
-	WM_ACTIVATE               = 6
-	WM_ACTIVATEAPP            = 28
-	WM_AFXFIRST               = 864
-	WM_AFXLAST                = 895
-	WM_ASKCBFORMATNAME        = 780
-	WM_CANCELJOURNAL          = 75
-	WM_CANCELMODE             = 31
-	WM_CAPTURECHANGED         = 533
-	WM_CHANGECBCHAIN          = 781
-	WM_CHAR                   = 258
-	WM_CHARTOITEM             = 47
-	WM_CHILDACTIVATE          = 34
-	WM_CLEAR                  = 771
-	WM_CLOSE                  = 16
-	WM_COMMAND                = 273
-	WM_COMMNOTIFY             = 68 /* OBSOLETE */
-	WM_COMPACTING             = 65
-	WM_COMPAREITEM            = 57
-	WM_CONTEXTMENU            = 123
-	WM_COPY                   = 769
-	WM_COPYDATA               = 74
-	WM_CREATE                 = 1
-	WM_CTLCOLORBTN            = 309
-	WM_CTLCOLORDLG            = 310
-	WM_CTLCOLOREDIT           = 307
-	WM_CTLCOLORLISTBOX        = 308
-	WM_CTLCOLORMSGBOX         = 306
-	WM_CTLCOLORSCROLLBAR      = 311
-	WM_CTLCOLORSTATIC         = 312
-	WM_CUT                    = 768
-	WM_DEADCHAR               = 259
-	WM_DELETEITEM             = 45
-	WM_DESTROY                = 2
-	WM_DESTROYCLIPBOARD       = 775
-	WM_DEVICECHANGE           = 537
-	WM_DEVMODECHANGE          = 27
-	WM_DISPLAYCHANGE          = 126
-	WM_DRAWCLIPBOARD          = 776
-	WM_DRAWITEM               = 43
-	WM_DROPFILES              = 563
-	WM_ENABLE                 = 10
-	WM_ENDSESSION             = 22
-	WM_ENTERIDLE              = 289
-	WM_ENTERMENULOOP          = 529
-	WM_ENTERSIZEMOVE          = 561
-	WM_ERASEBKGND             = 20
-	WM_EXITMENULOOP           = 530
-	WM_EXITSIZEMOVE           = 562
-	WM_FONTCHANGE             = 29
-	WM_GETDLGCODE             = 135
-	WM_GETFONT                = 49
-	WM_GETHOTKEY              = 51
-	WM_GETICON                = 127
-	WM_GETMINMAXINFO          = 36
-	WM_GETTEXT                = 13
-	WM_GETTEXTLENGTH          = 14
-	WM_HANDHELDFIRST          = 856
-	WM_HANDHELDLAST           = 863
-	WM_HELP                   = 83
-	WM_HOTKEY                 = 786
-	WM_HSCROLL                = 276
-	WM_HSCROLLCLIPBOARD       = 782
-	WM_ICONERASEBKGND         = 39
-	WM_INITDIALOG             = 272
-	WM_INITMENU               = 278
-	WM_INITMENUPOPUP          = 279
-	WM_INPUT                  = 0X00FF
-	WM_INPUTLANGCHANGE        = 81
-	WM_INPUTLANGCHANGEREQUEST = 80
-	WM_KEYDOWN                = 256
-	WM_KEYUP                  = 257
-	WM_KILLFOCUS              = 8
-	WM_MDIACTIVATE            = 546
-	WM_MDICASCADE             = 551
-	WM_MDICREATE              = 544
-	WM_MDIDESTROY             = 545
-	WM_MDIGETACTIVE           = 553
-	WM_MDIICONARRANGE         = 552
-	WM_MDIMAXIMIZE            = 549
-	WM_MDINEXT                = 548
-	WM_MDIREFRESHMENU         = 564
-	WM_MDIRESTORE             = 547
-	WM_MDISETMENU             = 560
-	WM_MDITILE                = 550
-	WM_MEASUREITEM            = 44
-	WM_GETOBJECT              = 0X003D
-	WM_CHANGEUISTATE          = 0X0127
-	WM_UPDATEUISTATE          = 0X0128
-	WM_QUERYUISTATE           = 0X0129
-	WM_UNINITMENUPOPUP        = 0X0125
-	WM_MENURBUTTONUP          = 290
-	WM_MENUCOMMAND            = 0X0126
-	WM_MENUGETOBJECT          = 0X0124
-	WM_MENUDRAG               = 0X0123
-	WM_APPCOMMAND             = 0X0319
-	WM_MENUCHAR               = 288
-	WM_MENUSELECT             = 287
-	WM_MOVE                   = 3
-	WM_MOVING                 = 534
-	WM_NCACTIVATE             = 134
-	WM_NCCALCSIZE             = 131
-	WM_NCCREATE               = 129
-	WM_NCDESTROY              = 130
-	WM_NCHITTEST              = 132
-	WM_NCLBUTTONDBLCLK        = 163
-	WM_NCLBUTTONDOWN          = 161
-	WM_NCLBUTTONUP            = 162
-	WM_NCMBUTTONDBLCLK        = 169
-	WM_NCMBUTTONDOWN          = 167
-	WM_NCMBUTTONUP            = 168
-	WM_NCXBUTTONDOWN          = 171
-	WM_NCXBUTTONUP            = 172
-	WM_NCXBUTTONDBLCLK        = 173
-	WM_NCMOUSEHOVER           = 0X02A0
-	WM_NCMOUSELEAVE           = 0X02A2
-	WM_NCMOUSEMOVE            = 160
-	WM_NCPAINT                = 133
-	WM_NCRBUTTONDBLCLK        = 166
-	WM_NCRBUTTONDOWN          = 164
-	WM_NCRBUTTONUP            = 165
-	WM_NEXTDLGCTL             = 40
-	WM_NEXTMENU               = 531
-	WM_NOTIFY                 = 78
-	WM_NOTIFYFORMAT           = 85
-	WM_NULL                   = 0
-	WM_PAINT                  = 15
-	WM_PAINTCLIPBOARD         = 777
-	WM_PAINTICON              = 38
-	WM_PALETTECHANGED         = 785
-	WM_PALETTEISCHANGING      = 784
-	WM_PARENTNOTIFY           = 528
-	WM_PASTE                  = 770
-	WM_PENWINFIRST            = 896
-	WM_PENWINLAST             = 911
-	WM_POWER                  = 72
-	WM_POWERBROADCAST         = 536
-	WM_PRINT                  = 791
-	WM_PRINTCLIENT            = 792
-	WM_QUERYDRAGICON          = 55
-	WM_QUERYENDSESSION        = 17
-	WM_QUERYNEWPALETTE        = 783
-	WM_QUERYOPEN              = 19
-	WM_QUEUESYNC              = 35
-	WM_QUIT                   = 18
-	WM_RENDERALLFORMATS       = 774
-	WM_RENDERFORMAT           = 773
-	WM_SETCURSOR              = 32
-	WM_SETFOCUS               = 7
-	WM_SETFONT                = 48
-	WM_SETHOTKEY              = 50
-	WM_SETICON                = 128
-	WM_SETREDRAW              = 11
-	WM_SETTEXT                = 12
-	WM_SETTINGCHANGE          = 26
-	WM_SHOWWINDOW             = 24
-	WM_SIZE                   = 5
-	WM_SIZECLIPBOARD          = 779
-	WM_SIZING                 = 532
-	WM_SPOOLERSTATUS          = 42
-	WM_STYLECHANGED           = 125
-	WM_STYLECHANGING          = 124
-	WM_SYSCHAR                = 262
-	WM_SYSCOLORCHANGE         = 21
-	WM_SYSCOMMAND             = 274
-	WM_SYSDEADCHAR            = 263
-	WM_SYSKEYDOWN             = 260
-	WM_SYSKEYUP               = 261
-	WM_TCARD                  = 82
-	WM_THEMECHANGED           = 794
-	WM_TIMECHANGE             = 30
-	WM_TIMER                  = 275
-	WM_UNDO                   = 772
-	WM_USER                   = 1024
-	WM_USERCHANGED            = 84
-	WM_VKEYTOITEM             = 46
-	WM_VSCROLL                = 277
-	WM_VSCROLLCLIPBOARD       = 778
-	WM_WINDOWPOSCHANGED       = 71
-	WM_WINDOWPOSCHANGING      = 70
-	WM_WININICHANGE           = 26
-	WM_KEYFIRST               = 256
-	WM_KEYLAST                = 264
-	WM_SYNCPAINT              = 136
-	WM_MOUSEACTIVATE          = 33
-	WM_MOUSEMOVE              = 512
-	WM_LBUTTONDOWN            = 513
-	WM_LBUTTONUP              = 514
-	WM_LBUTTONDBLCLK          = 515
-	WM_RBUTTONDOWN            = 516
-	WM_RBUTTONUP              = 517
-	WM_RBUTTONDBLCLK          = 518
-	WM_MBUTTONDOWN            = 519
-	WM_MBUTTONUP              = 520
-	WM_MBUTTONDBLCLK          = 521
-	WM_MOUSEWHEEL             = 522
-	WM_MOUSEFIRST             = 512
-	WM_XBUTTONDOWN            = 523
-	WM_XBUTTONUP              = 524
-	WM_XBUTTONDBLCLK          = 525
-	WM_MOUSELAST              = 525
-	WM_MOUSEHOVER             = 0X2A1
-	WM_MOUSELEAVE             = 0X2A3
-	WM_CLIPBOARDUPDATE        = 0x031D
-)
-
-// WM_ACTIVATE
-const (
-	WA_INACTIVE    = 0
-	WA_ACTIVE      = 1
-	WA_CLICKACTIVE = 2
-)
-
-const LF_FACESIZE = 32
-
-// Font weight constants
-const (
-	FW_DONTCARE   = 0
-	FW_THIN       = 100
-	FW_EXTRALIGHT = 200
-	FW_ULTRALIGHT = FW_EXTRALIGHT
-	FW_LIGHT      = 300
-	FW_NORMAL     = 400
-	FW_REGULAR    = 400
-	FW_MEDIUM     = 500
-	FW_SEMIBOLD   = 600
-	FW_DEMIBOLD   = FW_SEMIBOLD
-	FW_BOLD       = 700
-	FW_EXTRABOLD  = 800
-	FW_ULTRABOLD  = FW_EXTRABOLD
-	FW_HEAVY      = 900
-	FW_BLACK      = FW_HEAVY
-)
-
-// Charset constants
-const (
-	ANSI_CHARSET        = 0
-	DEFAULT_CHARSET     = 1
-	SYMBOL_CHARSET      = 2
-	SHIFTJIS_CHARSET    = 128
-	HANGEUL_CHARSET     = 129
-	HANGUL_CHARSET      = 129
-	GB2312_CHARSET      = 134
-	CHINESEBIG5_CHARSET = 136
-	GREEK_CHARSET       = 161
-	TURKISH_CHARSET     = 162
-	HEBREW_CHARSET      = 177
-	ARABIC_CHARSET      = 178
-	BALTIC_CHARSET      = 186
-	RUSSIAN_CHARSET     = 204
-	THAI_CHARSET        = 222
-	EASTEUROPE_CHARSET  = 238
-	OEM_CHARSET         = 255
-	JOHAB_CHARSET       = 130
-	VIETNAMESE_CHARSET  = 163
-	MAC_CHARSET         = 77
-)
-
-// Font output precision constants
-const (
-	OUT_DEFAULT_PRECIS   = 0
-	OUT_STRING_PRECIS    = 1
-	OUT_CHARACTER_PRECIS = 2
-	OUT_STROKE_PRECIS    = 3
-	OUT_TT_PRECIS        = 4
-	OUT_DEVICE_PRECIS    = 5
-	OUT_RASTER_PRECIS    = 6
-	OUT_TT_ONLY_PRECIS   = 7
-	OUT_OUTLINE_PRECIS   = 8
-	OUT_PS_ONLY_PRECIS   = 10
-)
-
-// Font clipping precision constants
-const (
-	CLIP_DEFAULT_PRECIS   = 0
-	CLIP_CHARACTER_PRECIS = 1
-	CLIP_STROKE_PRECIS    = 2
-	CLIP_MASK             = 15
-	CLIP_LH_ANGLES        = 16
-	CLIP_TT_ALWAYS        = 32
-	CLIP_EMBEDDED         = 128
-)
-
-// Font output quality constants
-const (
-	DEFAULT_QUALITY        = 0
-	DRAFT_QUALITY          = 1
-	PROOF_QUALITY          = 2
-	NONANTIALIASED_QUALITY = 3
-	ANTIALIASED_QUALITY    = 4
-	CLEARTYPE_QUALITY      = 5
-)
-
-// Font pitch constants
-const (
-	DEFAULT_PITCH  = 0
-	FIXED_PITCH    = 1
-	VARIABLE_PITCH = 2
-)
-
-// Font family constants
-const (
-	FF_DECORATIVE = 80
-	FF_DONTCARE   = 0
-	FF_MODERN     = 48
-	FF_ROMAN      = 16
-	FF_SCRIPT     = 64
-	FF_SWISS      = 32
-)
-
-// DeviceCapabilities capabilities
-const (
-	DC_FIELDS            = 1
-	DC_PAPERS            = 2
-	DC_PAPERSIZE         = 3
-	DC_MINEXTENT         = 4
-	DC_MAXEXTENT         = 5
-	DC_BINS              = 6
-	DC_DUPLEX            = 7
-	DC_SIZE              = 8
-	DC_EXTRA             = 9
-	DC_VERSION           = 10
-	DC_DRIVER            = 11
-	DC_BINNAMES          = 12
-	DC_ENUMRESOLUTIONS   = 13
-	DC_FILEDEPENDENCIES  = 14
-	DC_TRUETYPE          = 15
-	DC_PAPERNAMES        = 16
-	DC_ORIENTATION       = 17
-	DC_COPIES            = 18
-	DC_BINADJUST         = 19
-	DC_EMF_COMPLIANT     = 20
-	DC_DATATYPE_PRODUCED = 21
-	DC_COLLATE           = 22
-	DC_MANUFACTURER      = 23
-	DC_MODEL             = 24
-	DC_PERSONALITY       = 25
-	DC_PRINTRATE         = 26
-	DC_PRINTRATEUNIT     = 27
-	DC_PRINTERMEM        = 28
-	DC_MEDIAREADY        = 29
-	DC_STAPLE            = 30
-	DC_PRINTRATEPPM      = 31
-	DC_COLORDEVICE       = 32
-	DC_NUP               = 33
-	DC_MEDIATYPENAMES    = 34
-	DC_MEDIATYPES        = 35
-)
-
-// GetDeviceCaps index constants
-const (
-	DRIVERVERSION   = 0
-	TECHNOLOGY      = 2
-	HORZSIZE        = 4
-	VERTSIZE        = 6
-	HORZRES         = 8
-	VERTRES         = 10
-	LOGPIXELSX      = 88
-	LOGPIXELSY      = 90
-	BITSPIXEL       = 12
-	PLANES          = 14
-	NUMBRUSHES      = 16
-	NUMPENS         = 18
-	NUMFONTS        = 22
-	NUMCOLORS       = 24
-	NUMMARKERS      = 20
-	ASPECTX         = 40
-	ASPECTY         = 42
-	ASPECTXY        = 44
-	PDEVICESIZE     = 26
-	CLIPCAPS        = 36
-	SIZEPALETTE     = 104
-	NUMRESERVED     = 106
-	COLORRES        = 108
-	PHYSICALWIDTH   = 110
-	PHYSICALHEIGHT  = 111
-	PHYSICALOFFSETX = 112
-	PHYSICALOFFSETY = 113
-	SCALINGFACTORX  = 114
-	SCALINGFACTORY  = 115
-	VREFRESH        = 116
-	DESKTOPHORZRES  = 118
-	DESKTOPVERTRES  = 117
-	BLTALIGNMENT    = 119
-	SHADEBLENDCAPS  = 120
-	COLORMGMTCAPS   = 121
-	RASTERCAPS      = 38
-	CURVECAPS       = 28
-	LINECAPS        = 30
-	POLYGONALCAPS   = 32
-	TEXTCAPS        = 34
-)
-
-// GetDeviceCaps TECHNOLOGY constants
-const (
-	DT_PLOTTER    = 0
-	DT_RASDISPLAY = 1
-	DT_RASPRINTER = 2
-	DT_RASCAMERA  = 3
-	DT_CHARSTREAM = 4
-	DT_METAFILE   = 5
-	DT_DISPFILE   = 6
-)
-
-// GetDeviceCaps SHADEBLENDCAPS constants
-const (
-	SB_NONE          = 0x00
-	SB_CONST_ALPHA   = 0x01
-	SB_PIXEL_ALPHA   = 0x02
-	SB_PREMULT_ALPHA = 0x04
-	SB_GRAD_RECT     = 0x10
-	SB_GRAD_TRI      = 0x20
-)
-
-// GetDeviceCaps COLORMGMTCAPS constants
-const (
-	CM_NONE       = 0x00
-	CM_DEVICE_ICM = 0x01
-	CM_GAMMA_RAMP = 0x02
-	CM_CMYK_COLOR = 0x04
-)
-
-// GetDeviceCaps RASTERCAPS constants
-const (
-	RC_BANDING      = 2
-	RC_BITBLT       = 1
-	RC_BITMAP64     = 8
-	RC_DI_BITMAP    = 128
-	RC_DIBTODEV     = 512
-	RC_FLOODFILL    = 4096
-	RC_GDI20_OUTPUT = 16
-	RC_PALETTE      = 256
-	RC_SCALING      = 4
-	RC_STRETCHBLT   = 2048
-	RC_STRETCHDIB   = 8192
-	RC_DEVBITS      = 0x8000
-	RC_OP_DX_OUTPUT = 0x4000
-)
-
-// GetDeviceCaps CURVECAPS constants
-const (
-	CC_NONE       = 0
-	CC_CIRCLES    = 1
-	CC_PIE        = 2
-	CC_CHORD      = 4
-	CC_ELLIPSES   = 8
-	CC_WIDE       = 16
-	CC_STYLED     = 32
-	CC_WIDESTYLED = 64
-	CC_INTERIORS  = 128
-	CC_ROUNDRECT  = 256
-)
-
-// GetDeviceCaps LINECAPS constants
-const (
-	LC_NONE       = 0
-	LC_POLYLINE   = 2
-	LC_MARKER     = 4
-	LC_POLYMARKER = 8
-	LC_WIDE       = 16
-	LC_STYLED     = 32
-	LC_WIDESTYLED = 64
-	LC_INTERIORS  = 128
-)
-
-// GetDeviceCaps POLYGONALCAPS constants
-const (
-	PC_NONE        = 0
-	PC_POLYGON     = 1
-	PC_POLYPOLYGON = 256
-	PC_PATHS       = 512
-	PC_RECTANGLE   = 2
-	PC_WINDPOLYGON = 4
-	PC_SCANLINE    = 8
-	PC_TRAPEZOID   = 4
-	PC_WIDE        = 16
-	PC_STYLED      = 32
-	PC_WIDESTYLED  = 64
-	PC_INTERIORS   = 128
-)
-
-// GetDeviceCaps TEXTCAPS constants
-const (
-	TC_OP_CHARACTER = 1
-	TC_OP_STROKE    = 2
-	TC_CP_STROKE    = 4
-	TC_CR_90        = 8
-	TC_CR_ANY       = 16
-	TC_SF_X_YINDEP  = 32
-	TC_SA_DOUBLE    = 64
-	TC_SA_INTEGER   = 128
-	TC_SA_CONTIN    = 256
-	TC_EA_DOUBLE    = 512
-	TC_IA_ABLE      = 1024
-	TC_UA_ABLE      = 2048
-	TC_SO_ABLE      = 4096
-	TC_RA_ABLE      = 8192
-	TC_VA_ABLE      = 16384
-	TC_RESERVED     = 32768
-	TC_SCROLLBLT    = 65536
-)
-
-// Static control styles
-const (
-	SS_BITMAP          = 14
-	SS_BLACKFRAME      = 7
-	SS_BLACKRECT       = 4
-	SS_CENTER          = 1
-	SS_CENTERIMAGE     = 512
-	SS_EDITCONTROL     = 0x2000
-	SS_ENHMETAFILE     = 15
-	SS_ETCHEDFRAME     = 18
-	SS_ETCHEDHORZ      = 16
-	SS_ETCHEDVERT      = 17
-	SS_GRAYFRAME       = 8
-	SS_GRAYRECT        = 5
-	SS_ICON            = 3
-	SS_LEFT            = 0
-	SS_LEFTNOWORDWRAP  = 0xc
-	SS_NOPREFIX        = 128
-	SS_NOTIFY          = 256
-	SS_OWNERDRAW       = 0xd
-	SS_REALSIZECONTROL = 0x040
-	SS_REALSIZEIMAGE   = 0x800
-	SS_RIGHT           = 2
-	SS_RIGHTJUST       = 0x400
-	SS_SIMPLE          = 11
-	SS_SUNKEN          = 4096
-	SS_WHITEFRAME      = 9
-	SS_WHITERECT       = 6
-	SS_USERITEM        = 10
-	SS_TYPEMASK        = 0x0000001F
-	SS_ENDELLIPSIS     = 0x00004000
-	SS_PATHELLIPSIS    = 0x00008000
-	SS_WORDELLIPSIS    = 0x0000C000
-	SS_ELLIPSISMASK    = 0x0000C000
-)
-
-// Edit styles
-const (
-	ES_LEFT        = 0x0000
-	ES_CENTER      = 0x0001
-	ES_RIGHT       = 0x0002
-	ES_MULTILINE   = 0x0004
-	ES_UPPERCASE   = 0x0008
-	ES_LOWERCASE   = 0x0010
-	ES_PASSWORD    = 0x0020
-	ES_AUTOVSCROLL = 0x0040
-	ES_AUTOHSCROLL = 0x0080
-	ES_NOHIDESEL   = 0x0100
-	ES_OEMCONVERT  = 0x0400
-	ES_READONLY    = 0x0800
-	ES_WANTRETURN  = 0x1000
-	ES_NUMBER      = 0x2000
-)
-
-// Edit notifications
-const (
-	EN_SETFOCUS     = 0x0100
-	EN_KILLFOCUS    = 0x0200
-	EN_CHANGE       = 0x0300
-	EN_UPDATE       = 0x0400
-	EN_ERRSPACE     = 0x0500
-	EN_MAXTEXT      = 0x0501
-	EN_HSCROLL      = 0x0601
-	EN_VSCROLL      = 0x0602
-	EN_ALIGN_LTR_EC = 0x0700
-	EN_ALIGN_RTL_EC = 0x0701
-)
-
-// Edit messages
-const (
-	EM_GETSEL              = 0x00B0
-	EM_SETSEL              = 0x00B1
-	EM_GETRECT             = 0x00B2
-	EM_SETRECT             = 0x00B3
-	EM_SETRECTNP           = 0x00B4
-	EM_SCROLL              = 0x00B5
-	EM_LINESCROLL          = 0x00B6
-	EM_SCROLLCARET         = 0x00B7
-	EM_GETMODIFY           = 0x00B8
-	EM_SETMODIFY           = 0x00B9
-	EM_GETLINECOUNT        = 0x00BA
-	EM_LINEINDEX           = 0x00BB
-	EM_SETHANDLE           = 0x00BC
-	EM_GETHANDLE           = 0x00BD
-	EM_GETTHUMB            = 0x00BE
-	EM_LINELENGTH          = 0x00C1
-	EM_REPLACESEL          = 0x00C2
-	EM_GETLINE             = 0x00C4
-	EM_LIMITTEXT           = 0x00C5
-	EM_CANUNDO             = 0x00C6
-	EM_UNDO                = 0x00C7
-	EM_FMTLINES            = 0x00C8
-	EM_LINEFROMCHAR        = 0x00C9
-	EM_SETTABSTOPS         = 0x00CB
-	EM_SETPASSWORDCHAR     = 0x00CC
-	EM_EMPTYUNDOBUFFER     = 0x00CD
-	EM_GETFIRSTVISIBLELINE = 0x00CE
-	EM_SETREADONLY         = 0x00CF
-	EM_SETWORDBREAKPROC    = 0x00D0
-	EM_GETWORDBREAKPROC    = 0x00D1
-	EM_GETPASSWORDCHAR     = 0x00D2
-	EM_SETMARGINS          = 0x00D3
-	EM_GETMARGINS          = 0x00D4
-	EM_SETLIMITTEXT        = EM_LIMITTEXT
-	EM_GETLIMITTEXT        = 0x00D5
-	EM_POSFROMCHAR         = 0x00D6
-	EM_CHARFROMPOS         = 0x00D7
-	EM_SETIMESTATUS        = 0x00D8
-	EM_GETIMESTATUS        = 0x00D9
-	EM_SETCUEBANNER        = 0x1501
-	EM_GETCUEBANNER        = 0x1502
-)
-
-const (
-	CCM_FIRST            = 0x2000
-	CCM_LAST             = CCM_FIRST + 0x200
-	CCM_SETBKCOLOR       = 8193
-	CCM_SETCOLORSCHEME   = 8194
-	CCM_GETCOLORSCHEME   = 8195
-	CCM_GETDROPTARGET    = 8196
-	CCM_SETUNICODEFORMAT = 8197
-	CCM_GETUNICODEFORMAT = 8198
-	CCM_SETVERSION       = 0x2007
-	CCM_GETVERSION       = 0x2008
-	CCM_SETNOTIFYWINDOW  = 0x2009
-	CCM_SETWINDOWTHEME   = 0x200b
-	CCM_DPISCALE         = 0x200c
-)
-
-// Common controls styles
-const (
-	CCS_TOP           = 1
-	CCS_NOMOVEY       = 2
-	CCS_BOTTOM        = 3
-	CCS_NORESIZE      = 4
-	CCS_NOPARENTALIGN = 8
-	CCS_ADJUSTABLE    = 32
-	CCS_NODIVIDER     = 64
-	CCS_VERT          = 128
-	CCS_LEFT          = 129
-	CCS_NOMOVEX       = 130
-	CCS_RIGHT         = 131
-)
-
-// ProgressBar messages
-const (
-	PROGRESS_CLASS  = "msctls_progress32"
-	PBM_SETPOS      = WM_USER + 2
-	PBM_DELTAPOS    = WM_USER + 3
-	PBM_SETSTEP     = WM_USER + 4
-	PBM_STEPIT      = WM_USER + 5
-	PBM_SETRANGE32  = 1030
-	PBM_GETRANGE    = 1031
-	PBM_GETPOS      = 1032
-	PBM_SETBARCOLOR = 1033
-	PBM_SETBKCOLOR  = CCM_SETBKCOLOR
-	PBS_SMOOTH      = 1
-	PBS_VERTICAL    = 4
-)
-
-// GetOpenFileName and GetSaveFileName extended flags
-const (
-	OFN_EX_NOPLACESBAR = 0x00000001
-)
-
-// GetOpenFileName and GetSaveFileName flags
-const (
-	OFN_ALLOWMULTISELECT     = 0x00000200
-	OFN_CREATEPROMPT         = 0x00002000
-	OFN_DONTADDTORECENT      = 0x02000000
-	OFN_ENABLEHOOK           = 0x00000020
-	OFN_ENABLEINCLUDENOTIFY  = 0x00400000
-	OFN_ENABLESIZING         = 0x00800000
-	OFN_ENABLETEMPLATE       = 0x00000040
-	OFN_ENABLETEMPLATEHANDLE = 0x00000080
-	OFN_EXPLORER             = 0x00080000
-	OFN_EXTENSIONDIFFERENT   = 0x00000400
-	OFN_FILEMUSTEXIST        = 0x00001000
-	OFN_FORCESHOWHIDDEN      = 0x10000000
-	OFN_HIDEREADONLY         = 0x00000004
-	OFN_LONGNAMES            = 0x00200000
-	OFN_NOCHANGEDIR          = 0x00000008
-	OFN_NODEREFERENCELINKS   = 0x00100000
-	OFN_NOLONGNAMES          = 0x00040000
-	OFN_NONETWORKBUTTON      = 0x00020000
-	OFN_NOREADONLYRETURN     = 0x00008000
-	OFN_NOTESTFILECREATE     = 0x00010000
-	OFN_NOVALIDATE           = 0x00000100
-	OFN_OVERWRITEPROMPT      = 0x00000002
-	OFN_PATHMUSTEXIST        = 0x00000800
-	OFN_READONLY             = 0x00000001
-	OFN_SHAREAWARE           = 0x00004000
-	OFN_SHOWHELP             = 0x00000010
-)
-
-//SHBrowseForFolder flags
-const (
-	BIF_RETURNONLYFSDIRS    = 0x00000001
-	BIF_DONTGOBELOWDOMAIN   = 0x00000002
-	BIF_STATUSTEXT          = 0x00000004
-	BIF_RETURNFSANCESTORS   = 0x00000008
-	BIF_EDITBOX             = 0x00000010
-	BIF_VALIDATE            = 0x00000020
-	BIF_NEWDIALOGSTYLE      = 0x00000040
-	BIF_BROWSEINCLUDEURLS   = 0x00000080
-	BIF_USENEWUI            = BIF_EDITBOX | BIF_NEWDIALOGSTYLE
-	BIF_UAHINT              = 0x00000100
-	BIF_NONEWFOLDERBUTTON   = 0x00000200
-	BIF_NOTRANSLATETARGETS  = 0x00000400
-	BIF_BROWSEFORCOMPUTER   = 0x00001000
-	BIF_BROWSEFORPRINTER    = 0x00002000
-	BIF_BROWSEINCLUDEFILES  = 0x00004000
-	BIF_SHAREABLE           = 0x00008000
-	BIF_BROWSEFILEJUNCTIONS = 0x00010000
-)
-
-//MessageBox flags
-const (
-	MB_OK                = 0x00000000
-	MB_OKCANCEL          = 0x00000001
-	MB_ABORTRETRYIGNORE  = 0x00000002
-	MB_YESNOCANCEL       = 0x00000003
-	MB_YESNO             = 0x00000004
-	MB_RETRYCANCEL       = 0x00000005
-	MB_CANCELTRYCONTINUE = 0x00000006
-	MB_ICONHAND          = 0x00000010
-	MB_ICONQUESTION      = 0x00000020
-	MB_ICONEXCLAMATION   = 0x00000030
-	MB_ICONASTERISK      = 0x00000040
-	MB_USERICON          = 0x00000080
-	MB_ICONWARNING       = MB_ICONEXCLAMATION
-	MB_ICONERROR         = MB_ICONHAND
-	MB_ICONINFORMATION   = MB_ICONASTERISK
-	MB_ICONSTOP          = MB_ICONHAND
-	MB_DEFBUTTON1        = 0x00000000
-	MB_DEFBUTTON2        = 0x00000100
-	MB_DEFBUTTON3        = 0x00000200
-	MB_DEFBUTTON4        = 0x00000300
-)
-
-//COM
-const (
-	E_INVALIDARG  = 0x80070057
-	E_OUTOFMEMORY = 0x8007000E
-	E_UNEXPECTED  = 0x8000FFFF
-)
-
-const (
-	S_OK               = 0
-	S_FALSE            = 0x0001
-	RPC_E_CHANGED_MODE = 0x80010106
-)
-
-// GetSystemMetrics constants
-const (
-	SM_CXSCREEN             = 0
-	SM_CYSCREEN             = 1
-	SM_CXVSCROLL            = 2
-	SM_CYHSCROLL            = 3
-	SM_CYCAPTION            = 4
-	SM_CXBORDER             = 5
-	SM_CYBORDER             = 6
-	SM_CXDLGFRAME           = 7
-	SM_CYDLGFRAME           = 8
-	SM_CYVTHUMB             = 9
-	SM_CXHTHUMB             = 10
-	SM_CXICON               = 11
-	SM_CYICON               = 12
-	SM_CXCURSOR             = 13
-	SM_CYCURSOR             = 14
-	SM_CYMENU               = 15
-	SM_CXFULLSCREEN         = 16
-	SM_CYFULLSCREEN         = 17
-	SM_CYKANJIWINDOW        = 18
-	SM_MOUSEPRESENT         = 19
-	SM_CYVSCROLL            = 20
-	SM_CXHSCROLL            = 21
-	SM_DEBUG                = 22
-	SM_SWAPBUTTON           = 23
-	SM_RESERVED1            = 24
-	SM_RESERVED2            = 25
-	SM_RESERVED3            = 26
-	SM_RESERVED4            = 27
-	SM_CXMIN                = 28
-	SM_CYMIN                = 29
-	SM_CXSIZE               = 30
-	SM_CYSIZE               = 31
-	SM_CXFRAME              = 32
-	SM_CYFRAME              = 33
-	SM_CXMINTRACK           = 34
-	SM_CYMINTRACK           = 35
-	SM_CXDOUBLECLK          = 36
-	SM_CYDOUBLECLK          = 37
-	SM_CXICONSPACING        = 38
-	SM_CYICONSPACING        = 39
-	SM_MENUDROPALIGNMENT    = 40
-	SM_PENWINDOWS           = 41
-	SM_DBCSENABLED          = 42
-	SM_CMOUSEBUTTONS        = 43
-	SM_CXFIXEDFRAME         = SM_CXDLGFRAME
-	SM_CYFIXEDFRAME         = SM_CYDLGFRAME
-	SM_CXSIZEFRAME          = SM_CXFRAME
-	SM_CYSIZEFRAME          = SM_CYFRAME
-	SM_SECURE               = 44
-	SM_CXEDGE               = 45
-	SM_CYEDGE               = 46
-	SM_CXMINSPACING         = 47
-	SM_CYMINSPACING         = 48
-	SM_CXSMICON             = 49
-	SM_CYSMICON             = 50
-	SM_CYSMCAPTION          = 51
-	SM_CXSMSIZE             = 52
-	SM_CYSMSIZE             = 53
-	SM_CXMENUSIZE           = 54
-	SM_CYMENUSIZE           = 55
-	SM_ARRANGE              = 56
-	SM_CXMINIMIZED          = 57
-	SM_CYMINIMIZED          = 58
-	SM_CXMAXTRACK           = 59
-	SM_CYMAXTRACK           = 60
-	SM_CXMAXIMIZED          = 61
-	SM_CYMAXIMIZED          = 62
-	SM_NETWORK              = 63
-	SM_CLEANBOOT            = 67
-	SM_CXDRAG               = 68
-	SM_CYDRAG               = 69
-	SM_SHOWSOUNDS           = 70
-	SM_CXMENUCHECK          = 71
-	SM_CYMENUCHECK          = 72
-	SM_SLOWMACHINE          = 73
-	SM_MIDEASTENABLED       = 74
-	SM_MOUSEWHEELPRESENT    = 75
-	SM_XVIRTUALSCREEN       = 76
-	SM_YVIRTUALSCREEN       = 77
-	SM_CXVIRTUALSCREEN      = 78
-	SM_CYVIRTUALSCREEN      = 79
-	SM_CMONITORS            = 80
-	SM_SAMEDISPLAYFORMAT    = 81
-	SM_IMMENABLED           = 82
-	SM_CXFOCUSBORDER        = 83
-	SM_CYFOCUSBORDER        = 84
-	SM_TABLETPC             = 86
-	SM_MEDIACENTER          = 87
-	SM_STARTER              = 88
-	SM_SERVERR2             = 89
-	SM_CMETRICS             = 91
-	SM_REMOTESESSION        = 0x1000
-	SM_SHUTTINGDOWN         = 0x2000
-	SM_REMOTECONTROL        = 0x2001
-	SM_CARETBLINKINGENABLED = 0x2002
-)
-
-const (
-	CLSCTX_INPROC_SERVER   = 1
-	CLSCTX_INPROC_HANDLER  = 2
-	CLSCTX_LOCAL_SERVER    = 4
-	CLSCTX_INPROC_SERVER16 = 8
-	CLSCTX_REMOTE_SERVER   = 16
-	CLSCTX_ALL             = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER
-	CLSCTX_INPROC          = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER
-	CLSCTX_SERVER          = CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER
-)
-
-const (
-	COINIT_APARTMENTTHREADED = 0x2
-	COINIT_MULTITHREADED     = 0x0
-	COINIT_DISABLE_OLE1DDE   = 0x4
-	COINIT_SPEED_OVER_MEMORY = 0x8
-)
-
-const (
-	DISPATCH_METHOD         = 1
-	DISPATCH_PROPERTYGET    = 2
-	DISPATCH_PROPERTYPUT    = 4
-	DISPATCH_PROPERTYPUTREF = 8
-)
-
-const (
-	CC_FASTCALL = iota
-	CC_CDECL
-	CC_MSCPASCAL
-	CC_PASCAL = CC_MSCPASCAL
-	CC_MACPASCAL
-	CC_STDCALL
-	CC_FPFASTCALL
-	CC_SYSCALL
-	CC_MPWCDECL
-	CC_MPWPASCAL
-	CC_MAX = CC_MPWPASCAL
-)
-
-const (
-	VT_EMPTY           = 0x0
-	VT_NULL            = 0x1
-	VT_I2              = 0x2
-	VT_I4              = 0x3
-	VT_R4              = 0x4
-	VT_R8              = 0x5
-	VT_CY              = 0x6
-	VT_DATE            = 0x7
-	VT_BSTR            = 0x8
-	VT_DISPATCH        = 0x9
-	VT_ERROR           = 0xa
-	VT_BOOL            = 0xb
-	VT_VARIANT         = 0xc
-	VT_UNKNOWN         = 0xd
-	VT_DECIMAL         = 0xe
-	VT_I1              = 0x10
-	VT_UI1             = 0x11
-	VT_UI2             = 0x12
-	VT_UI4             = 0x13
-	VT_I8              = 0x14
-	VT_UI8             = 0x15
-	VT_INT             = 0x16
-	VT_UINT            = 0x17
-	VT_VOID            = 0x18
-	VT_HRESULT         = 0x19
-	VT_PTR             = 0x1a
-	VT_SAFEARRAY       = 0x1b
-	VT_CARRAY          = 0x1c
-	VT_USERDEFINED     = 0x1d
-	VT_LPSTR           = 0x1e
-	VT_LPWSTR          = 0x1f
-	VT_RECORD          = 0x24
-	VT_INT_PTR         = 0x25
-	VT_UINT_PTR        = 0x26
-	VT_FILETIME        = 0x40
-	VT_BLOB            = 0x41
-	VT_STREAM          = 0x42
-	VT_STORAGE         = 0x43
-	VT_STREAMED_OBJECT = 0x44
-	VT_STORED_OBJECT   = 0x45
-	VT_BLOB_OBJECT     = 0x46
-	VT_CF              = 0x47
-	VT_CLSID           = 0x48
-	VT_BSTR_BLOB       = 0xfff
-	VT_VECTOR          = 0x1000
-	VT_ARRAY           = 0x2000
-	VT_BYREF           = 0x4000
-	VT_RESERVED        = 0x8000
-	VT_ILLEGAL         = 0xffff
-	VT_ILLEGALMASKED   = 0xfff
-	VT_TYPEMASK        = 0xfff
-)
-
-const (
-	DISPID_UNKNOWN     = -1
-	DISPID_VALUE       = 0
-	DISPID_PROPERTYPUT = -3
-	DISPID_NEWENUM     = -4
-	DISPID_EVALUATE    = -5
-	DISPID_CONSTRUCTOR = -6
-	DISPID_DESTRUCTOR  = -7
-	DISPID_COLLECT     = -8
-)
-
-const (
-	MONITOR_DEFAULTTONULL    = 0x00000000
-	MONITOR_DEFAULTTOPRIMARY = 0x00000001
-	MONITOR_DEFAULTTONEAREST = 0x00000002
-
-	MONITORINFOF_PRIMARY = 0x00000001
-)
-
-const (
-	CCHDEVICENAME = 32
-	CCHFORMNAME   = 32
-)
-
-const (
-	IDOK       = 1
-	IDCANCEL   = 2
-	IDABORT    = 3
-	IDRETRY    = 4
-	IDIGNORE   = 5
-	IDYES      = 6
-	IDNO       = 7
-	IDCLOSE    = 8
-	IDHELP     = 9
-	IDTRYAGAIN = 10
-	IDCONTINUE = 11
-	IDTIMEOUT  = 32000
-)
-
-// Generic WM_NOTIFY notification codes
-const (
-	NM_FIRST           = 0
-	NM_OUTOFMEMORY     = NM_FIRST - 1
-	NM_CLICK           = NM_FIRST - 2
-	NM_DBLCLK          = NM_FIRST - 3
-	NM_RETURN          = NM_FIRST - 4
-	NM_RCLICK          = NM_FIRST - 5
-	NM_RDBLCLK         = NM_FIRST - 6
-	NM_SETFOCUS        = NM_FIRST - 7
-	NM_KILLFOCUS       = NM_FIRST - 8
-	NM_CUSTOMDRAW      = NM_FIRST - 12
-	NM_HOVER           = NM_FIRST - 13
-	NM_NCHITTEST       = NM_FIRST - 14
-	NM_KEYDOWN         = NM_FIRST - 15
-	NM_RELEASEDCAPTURE = NM_FIRST - 16
-	NM_SETCURSOR       = NM_FIRST - 17
-	NM_CHAR            = NM_FIRST - 18
-	NM_TOOLTIPSCREATED = NM_FIRST - 19
-	NM_LAST            = NM_FIRST - 99
-)
-
-// ListView messages
-const (
-	LVM_FIRST                    = 0x1000
-	LVM_GETITEMCOUNT             = LVM_FIRST + 4
-	LVM_SETIMAGELIST             = LVM_FIRST + 3
-	LVM_GETIMAGELIST             = LVM_FIRST + 2
-	LVM_GETITEM                  = LVM_FIRST + 75
-	LVM_SETITEM                  = LVM_FIRST + 76
-	LVM_INSERTITEM               = LVM_FIRST + 77
-	LVM_DELETEITEM               = LVM_FIRST + 8
-	LVM_DELETEALLITEMS           = LVM_FIRST + 9
-	LVM_GETCALLBACKMASK          = LVM_FIRST + 10
-	LVM_SETCALLBACKMASK          = LVM_FIRST + 11
-	LVM_SETUNICODEFORMAT         = CCM_SETUNICODEFORMAT
-	LVM_GETNEXTITEM              = LVM_FIRST + 12
-	LVM_FINDITEM                 = LVM_FIRST + 83
-	LVM_GETITEMRECT              = LVM_FIRST + 14
-	LVM_GETSTRINGWIDTH           = LVM_FIRST + 87
-	LVM_HITTEST                  = LVM_FIRST + 18
-	LVM_ENSUREVISIBLE            = LVM_FIRST + 19
-	LVM_SCROLL                   = LVM_FIRST + 20
-	LVM_REDRAWITEMS              = LVM_FIRST + 21
-	LVM_ARRANGE                  = LVM_FIRST + 22
-	LVM_EDITLABEL                = LVM_FIRST + 118
-	LVM_GETEDITCONTROL           = LVM_FIRST + 24
-	LVM_GETCOLUMN                = LVM_FIRST + 95
-	LVM_SETCOLUMN                = LVM_FIRST + 96
-	LVM_INSERTCOLUMN             = LVM_FIRST + 97
-	LVM_DELETECOLUMN             = LVM_FIRST + 28
-	LVM_GETCOLUMNWIDTH           = LVM_FIRST + 29
-	LVM_SETCOLUMNWIDTH           = LVM_FIRST + 30
-	LVM_GETHEADER                = LVM_FIRST + 31
-	LVM_CREATEDRAGIMAGE          = LVM_FIRST + 33
-	LVM_GETVIEWRECT              = LVM_FIRST + 34
-	LVM_GETTEXTCOLOR             = LVM_FIRST + 35
-	LVM_SETTEXTCOLOR             = LVM_FIRST + 36
-	LVM_GETTEXTBKCOLOR           = LVM_FIRST + 37
-	LVM_SETTEXTBKCOLOR           = LVM_FIRST + 38
-	LVM_GETTOPINDEX              = LVM_FIRST + 39
-	LVM_GETCOUNTPERPAGE          = LVM_FIRST + 40
-	LVM_GETORIGIN                = LVM_FIRST + 41
-	LVM_UPDATE                   = LVM_FIRST + 42
-	LVM_SETITEMSTATE             = LVM_FIRST + 43
-	LVM_GETITEMSTATE             = LVM_FIRST + 44
-	LVM_GETITEMTEXT              = LVM_FIRST + 115
-	LVM_SETITEMTEXT              = LVM_FIRST + 116
-	LVM_SETITEMCOUNT             = LVM_FIRST + 47
-	LVM_SORTITEMS                = LVM_FIRST + 48
-	LVM_SETITEMPOSITION32        = LVM_FIRST + 49
-	LVM_GETSELECTEDCOUNT         = LVM_FIRST + 50
-	LVM_GETITEMSPACING           = LVM_FIRST + 51
-	LVM_GETISEARCHSTRING         = LVM_FIRST + 117
-	LVM_SETICONSPACING           = LVM_FIRST + 53
-	LVM_SETEXTENDEDLISTVIEWSTYLE = LVM_FIRST + 54
-	LVM_GETEXTENDEDLISTVIEWSTYLE = LVM_FIRST + 55
-	LVM_GETSUBITEMRECT           = LVM_FIRST + 56
-	LVM_SUBITEMHITTEST           = LVM_FIRST + 57
-	LVM_SETCOLUMNORDERARRAY      = LVM_FIRST + 58
-	LVM_GETCOLUMNORDERARRAY      = LVM_FIRST + 59
-	LVM_SETHOTITEM               = LVM_FIRST + 60
-	LVM_GETHOTITEM               = LVM_FIRST + 61
-	LVM_SETHOTCURSOR             = LVM_FIRST + 62
-	LVM_GETHOTCURSOR             = LVM_FIRST + 63
-	LVM_APPROXIMATEVIEWRECT      = LVM_FIRST + 64
-	LVM_SETWORKAREAS             = LVM_FIRST + 65
-	LVM_GETWORKAREAS             = LVM_FIRST + 70
-	LVM_GETNUMBEROFWORKAREAS     = LVM_FIRST + 73
-	LVM_GETSELECTIONMARK         = LVM_FIRST + 66
-	LVM_SETSELECTIONMARK         = LVM_FIRST + 67
-	LVM_SETHOVERTIME             = LVM_FIRST + 71
-	LVM_GETHOVERTIME             = LVM_FIRST + 72
-	LVM_SETTOOLTIPS              = LVM_FIRST + 74
-	LVM_GETTOOLTIPS              = LVM_FIRST + 78
-	LVM_SORTITEMSEX              = LVM_FIRST + 81
-	LVM_SETBKIMAGE               = LVM_FIRST + 138
-	LVM_GETBKIMAGE               = LVM_FIRST + 139
-	LVM_SETSELECTEDCOLUMN        = LVM_FIRST + 140
-	LVM_SETVIEW                  = LVM_FIRST + 142
-	LVM_GETVIEW                  = LVM_FIRST + 143
-	LVM_INSERTGROUP              = LVM_FIRST + 145
-	LVM_SETGROUPINFO             = LVM_FIRST + 147
-	LVM_GETGROUPINFO             = LVM_FIRST + 149
-	LVM_REMOVEGROUP              = LVM_FIRST + 150
-	LVM_MOVEGROUP                = LVM_FIRST + 151
-	LVM_GETGROUPCOUNT            = LVM_FIRST + 152
-	LVM_GETGROUPINFOBYINDEX      = LVM_FIRST + 153
-	LVM_MOVEITEMTOGROUP          = LVM_FIRST + 154
-	LVM_GETGROUPRECT             = LVM_FIRST + 98
-	LVM_SETGROUPMETRICS          = LVM_FIRST + 155
-	LVM_GETGROUPMETRICS          = LVM_FIRST + 156
-	LVM_ENABLEGROUPVIEW          = LVM_FIRST + 157
-	LVM_SORTGROUPS               = LVM_FIRST + 158
-	LVM_INSERTGROUPSORTED        = LVM_FIRST + 159
-	LVM_REMOVEALLGROUPS          = LVM_FIRST + 160
-	LVM_HASGROUP                 = LVM_FIRST + 161
-	LVM_GETGROUPSTATE            = LVM_FIRST + 92
-	LVM_GETFOCUSEDGROUP          = LVM_FIRST + 93
-	LVM_SETTILEVIEWINFO          = LVM_FIRST + 162
-	LVM_GETTILEVIEWINFO          = LVM_FIRST + 163
-	LVM_SETTILEINFO              = LVM_FIRST + 164
-	LVM_GETTILEINFO              = LVM_FIRST + 165
-	LVM_SETINSERTMARK            = LVM_FIRST + 166
-	LVM_GETINSERTMARK            = LVM_FIRST + 167
-	LVM_INSERTMARKHITTEST        = LVM_FIRST + 168
-	LVM_GETINSERTMARKRECT        = LVM_FIRST + 169
-	LVM_SETINSERTMARKCOLOR       = LVM_FIRST + 170
-	LVM_GETINSERTMARKCOLOR       = LVM_FIRST + 171
-	LVM_SETINFOTIP               = LVM_FIRST + 173
-	LVM_GETSELECTEDCOLUMN        = LVM_FIRST + 174
-	LVM_ISGROUPVIEWENABLED       = LVM_FIRST + 175
-	LVM_GETOUTLINECOLOR          = LVM_FIRST + 176
-	LVM_SETOUTLINECOLOR          = LVM_FIRST + 177
-	LVM_CANCELEDITLABEL          = LVM_FIRST + 179
-	LVM_MAPINDEXTOID             = LVM_FIRST + 180
-	LVM_MAPIDTOINDEX             = LVM_FIRST + 181
-	LVM_ISITEMVISIBLE            = LVM_FIRST + 182
-	LVM_GETNEXTITEMINDEX         = LVM_FIRST + 211
-)
-
-// ListView notifications
-const (
-	LVN_FIRST = -100
-
-	LVN_ITEMCHANGING      = LVN_FIRST - 0
-	LVN_ITEMCHANGED       = LVN_FIRST - 1
-	LVN_INSERTITEM        = LVN_FIRST - 2
-	LVN_DELETEITEM        = LVN_FIRST - 3
-	LVN_DELETEALLITEMS    = LVN_FIRST - 4
-	LVN_BEGINLABELEDITA   = LVN_FIRST - 5
-	LVN_BEGINLABELEDITW   = LVN_FIRST - 75
-	LVN_ENDLABELEDITA     = LVN_FIRST - 6
-	LVN_ENDLABELEDITW     = LVN_FIRST - 76
-	LVN_COLUMNCLICK       = LVN_FIRST - 8
-	LVN_BEGINDRAG         = LVN_FIRST - 9
-	LVN_BEGINRDRAG        = LVN_FIRST - 11
-	LVN_ODCACHEHINT       = LVN_FIRST - 13
-	LVN_ODFINDITEMA       = LVN_FIRST - 52
-	LVN_ODFINDITEMW       = LVN_FIRST - 79
-	LVN_ITEMACTIVATE      = LVN_FIRST - 14
-	LVN_ODSTATECHANGED    = LVN_FIRST - 15
-	LVN_HOTTRACK          = LVN_FIRST - 21
-	LVN_GETDISPINFO       = LVN_FIRST - 77
-	LVN_SETDISPINFO       = LVN_FIRST - 78
-	LVN_KEYDOWN           = LVN_FIRST - 55
-	LVN_MARQUEEBEGIN      = LVN_FIRST - 56
-	LVN_GETINFOTIP        = LVN_FIRST - 58
-	LVN_INCREMENTALSEARCH = LVN_FIRST - 63
-	LVN_BEGINSCROLL       = LVN_FIRST - 80
-	LVN_ENDSCROLL         = LVN_FIRST - 81
-)
-
-// ListView LVNI constants
-const (
-	LVNI_ALL         = 0
-	LVNI_FOCUSED     = 1
-	LVNI_SELECTED    = 2
-	LVNI_CUT         = 4
-	LVNI_DROPHILITED = 8
-	LVNI_ABOVE       = 256
-	LVNI_BELOW       = 512
-	LVNI_TOLEFT      = 1024
-	LVNI_TORIGHT     = 2048
-)
-
-// ListView styles
-const (
-	LVS_ICON            = 0x0000
-	LVS_REPORT          = 0x0001
-	LVS_SMALLICON       = 0x0002
-	LVS_LIST            = 0x0003
-	LVS_TYPEMASK        = 0x0003
-	LVS_SINGLESEL       = 0x0004
-	LVS_SHOWSELALWAYS   = 0x0008
-	LVS_SORTASCENDING   = 0x0010
-	LVS_SORTDESCENDING  = 0x0020
-	LVS_SHAREIMAGELISTS = 0x0040
-	LVS_NOLABELWRAP     = 0x0080
-	LVS_AUTOARRANGE     = 0x0100
-	LVS_EDITLABELS      = 0x0200
-	LVS_OWNERDATA       = 0x1000
-	LVS_NOSCROLL        = 0x2000
-	LVS_TYPESTYLEMASK   = 0xfc00
-	LVS_ALIGNTOP        = 0x0000
-	LVS_ALIGNLEFT       = 0x0800
-	LVS_ALIGNMASK       = 0x0c00
-	LVS_OWNERDRAWFIXED  = 0x0400
-	LVS_NOCOLUMNHEADER  = 0x4000
-	LVS_NOSORTHEADER    = 0x8000
-)
-
-// ListView extended styles
-const (
-	LVS_EX_GRIDLINES        = 0x00000001
-	LVS_EX_SUBITEMIMAGES    = 0x00000002
-	LVS_EX_CHECKBOXES       = 0x00000004
-	LVS_EX_TRACKSELECT      = 0x00000008
-	LVS_EX_HEADERDRAGDROP   = 0x00000010
-	LVS_EX_FULLROWSELECT    = 0x00000020
-	LVS_EX_ONECLICKACTIVATE = 0x00000040
-	LVS_EX_TWOCLICKACTIVATE = 0x00000080
-	LVS_EX_FLATSB           = 0x00000100
-	LVS_EX_REGIONAL         = 0x00000200
-	LVS_EX_INFOTIP          = 0x00000400
-	LVS_EX_UNDERLINEHOT     = 0x00000800
-	LVS_EX_UNDERLINECOLD    = 0x00001000
-	LVS_EX_MULTIWORKAREAS   = 0x00002000
-	LVS_EX_LABELTIP         = 0x00004000
-	LVS_EX_BORDERSELECT     = 0x00008000
-	LVS_EX_DOUBLEBUFFER     = 0x00010000
-	LVS_EX_HIDELABELS       = 0x00020000
-	LVS_EX_SINGLEROW        = 0x00040000
-	LVS_EX_SNAPTOGRID       = 0x00080000
-	LVS_EX_SIMPLESELECT     = 0x00100000
-)
-
-// ListView column flags
-const (
-	LVCF_FMT     = 0x0001
-	LVCF_WIDTH   = 0x0002
-	LVCF_TEXT    = 0x0004
-	LVCF_SUBITEM = 0x0008
-	LVCF_IMAGE   = 0x0010
-	LVCF_ORDER   = 0x0020
-)
-
-// ListView column format constants
-const (
-	LVCFMT_LEFT            = 0x0000
-	LVCFMT_RIGHT           = 0x0001
-	LVCFMT_CENTER          = 0x0002
-	LVCFMT_JUSTIFYMASK     = 0x0003
-	LVCFMT_IMAGE           = 0x0800
-	LVCFMT_BITMAP_ON_RIGHT = 0x1000
-	LVCFMT_COL_HAS_IMAGES  = 0x8000
-)
-
-// ListView item flags
-const (
-	LVIF_TEXT        = 0x00000001
-	LVIF_IMAGE       = 0x00000002
-	LVIF_PARAM       = 0x00000004
-	LVIF_STATE       = 0x00000008
-	LVIF_INDENT      = 0x00000010
-	LVIF_NORECOMPUTE = 0x00000800
-	LVIF_GROUPID     = 0x00000100
-	LVIF_COLUMNS     = 0x00000200
-)
-
-// ListView item states
-const (
-	LVIS_FOCUSED        = 1
-	LVIS_SELECTED       = 2
-	LVIS_CUT            = 4
-	LVIS_DROPHILITED    = 8
-	LVIS_OVERLAYMASK    = 0xF00
-	LVIS_STATEIMAGEMASK = 0xF000
-)
-
-// ListView hit test constants
-const (
-	LVHT_NOWHERE         = 0x00000001
-	LVHT_ONITEMICON      = 0x00000002
-	LVHT_ONITEMLABEL     = 0x00000004
-	LVHT_ONITEMSTATEICON = 0x00000008
-	LVHT_ONITEM          = LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON
-
-	LVHT_ABOVE   = 0x00000008
-	LVHT_BELOW   = 0x00000010
-	LVHT_TORIGHT = 0x00000020
-	LVHT_TOLEFT  = 0x00000040
-)
-
-// ListView image list types
-const (
-	LVSIL_NORMAL      = 0
-	LVSIL_SMALL       = 1
-	LVSIL_STATE       = 2
-	LVSIL_GROUPHEADER = 3
-)
-
-// InitCommonControlsEx flags
-const (
-	ICC_LISTVIEW_CLASSES   = 1
-	ICC_TREEVIEW_CLASSES   = 2
-	ICC_BAR_CLASSES        = 4
-	ICC_TAB_CLASSES        = 8
-	ICC_UPDOWN_CLASS       = 16
-	ICC_PROGRESS_CLASS     = 32
-	ICC_HOTKEY_CLASS       = 64
-	ICC_ANIMATE_CLASS      = 128
-	ICC_WIN95_CLASSES      = 255
-	ICC_DATE_CLASSES       = 256
-	ICC_USEREX_CLASSES     = 512
-	ICC_COOL_CLASSES       = 1024
-	ICC_INTERNET_CLASSES   = 2048
-	ICC_PAGESCROLLER_CLASS = 4096
-	ICC_NATIVEFNTCTL_CLASS = 8192
-	INFOTIPSIZE            = 1024
-	ICC_STANDARD_CLASSES   = 0x00004000
-	ICC_LINK_CLASS         = 0x00008000
-)
-
-// Dialog Codes
-const (
-	DLGC_WANTARROWS      = 0x0001
-	DLGC_WANTTAB         = 0x0002
-	DLGC_WANTALLKEYS     = 0x0004
-	DLGC_WANTMESSAGE     = 0x0004
-	DLGC_HASSETSEL       = 0x0008
-	DLGC_DEFPUSHBUTTON   = 0x0010
-	DLGC_UNDEFPUSHBUTTON = 0x0020
-	DLGC_RADIOBUTTON     = 0x0040
-	DLGC_WANTCHARS       = 0x0080
-	DLGC_STATIC          = 0x0100
-	DLGC_BUTTON          = 0x2000
-)
-
-// Get/SetWindowWord/Long offsets for use with WC_DIALOG windows
-const (
-	DWL_MSGRESULT = 0
-	DWL_DLGPROC   = 4
-	DWL_USER      = 8
-)
-
-// Registry predefined keys
-const (
-	HKEY_CLASSES_ROOT     HKEY = 0x80000000
-	HKEY_CURRENT_USER     HKEY = 0x80000001
-	HKEY_LOCAL_MACHINE    HKEY = 0x80000002
-	HKEY_USERS            HKEY = 0x80000003
-	HKEY_PERFORMANCE_DATA HKEY = 0x80000004
-	HKEY_CURRENT_CONFIG   HKEY = 0x80000005
-	HKEY_DYN_DATA         HKEY = 0x80000006
-)
-
-// Registry Key Security and Access Rights
-const (
-	KEY_ALL_ACCESS         = 0xF003F
-	KEY_CREATE_SUB_KEY     = 0x0004
-	KEY_ENUMERATE_SUB_KEYS = 0x0008
-	KEY_NOTIFY             = 0x0010
-	KEY_QUERY_VALUE        = 0x0001
-	KEY_SET_VALUE          = 0x0002
-	KEY_READ               = 0x20019
-	KEY_WRITE              = 0x20006
-)
-
-const (
-	NFR_ANSI    = 1
-	NFR_UNICODE = 2
-	NF_QUERY    = 3
-	NF_REQUERY  = 4
-)
-
-// Registry value types
-const (
-	RRF_RT_REG_NONE         = 0x00000001
-	RRF_RT_REG_SZ           = 0x00000002
-	RRF_RT_REG_EXPAND_SZ    = 0x00000004
-	RRF_RT_REG_BINARY       = 0x00000008
-	RRF_RT_REG_DWORD        = 0x00000010
-	RRF_RT_REG_MULTI_SZ     = 0x00000020
-	RRF_RT_REG_QWORD        = 0x00000040
-	RRF_RT_DWORD            = (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD)
-	RRF_RT_QWORD            = (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD)
-	RRF_RT_ANY              = 0x0000ffff
-	RRF_NOEXPAND            = 0x10000000
-	RRF_ZEROONFAILURE       = 0x20000000
-	REG_PROCESS_APPKEY      = 0x00000001
-	REG_MUI_STRING_TRUNCATE = 0x00000001
-)
-
-// PeekMessage wRemoveMsg value
-const (
-	PM_NOREMOVE = 0x000
-	PM_REMOVE   = 0x001
-	PM_NOYIELD  = 0x002
-)
-
-// ImageList flags
-const (
-	ILC_MASK             = 0x00000001
-	ILC_COLOR            = 0x00000000
-	ILC_COLORDDB         = 0x000000FE
-	ILC_COLOR4           = 0x00000004
-	ILC_COLOR8           = 0x00000008
-	ILC_COLOR16          = 0x00000010
-	ILC_COLOR24          = 0x00000018
-	ILC_COLOR32          = 0x00000020
-	ILC_PALETTE          = 0x00000800
-	ILC_MIRROR           = 0x00002000
-	ILC_PERITEMMIRROR    = 0x00008000
-	ILC_ORIGINALSIZE     = 0x00010000
-	ILC_HIGHQUALITYSCALE = 0x00020000
-)
-
-// Keystroke Message Flags
-const (
-	KF_EXTENDED = 0x0100
-	KF_DLGMODE  = 0x0800
-	KF_MENUMODE = 0x1000
-	KF_ALTDOWN  = 0x2000
-	KF_REPEAT   = 0x4000
-	KF_UP       = 0x8000
-)
-
-// Virtual-Key Codes
-const (
-	VK_LBUTTON             = 0x01
-	VK_RBUTTON             = 0x02
-	VK_CANCEL              = 0x03
-	VK_MBUTTON             = 0x04
-	VK_XBUTTON1            = 0x05
-	VK_XBUTTON2            = 0x06
-	VK_BACK                = 0x08
-	VK_TAB                 = 0x09
-	VK_CLEAR               = 0x0C
-	VK_RETURN              = 0x0D
-	VK_SHIFT               = 0x10
-	VK_CONTROL             = 0x11
-	VK_MENU                = 0x12
-	VK_PAUSE               = 0x13
-	VK_CAPITAL             = 0x14
-	VK_KANA                = 0x15
-	VK_HANGEUL             = 0x15
-	VK_HANGUL              = 0x15
-	VK_JUNJA               = 0x17
-	VK_FINAL               = 0x18
-	VK_HANJA               = 0x19
-	VK_KANJI               = 0x19
-	VK_ESCAPE              = 0x1B
-	VK_CONVERT             = 0x1C
-	VK_NONCONVERT          = 0x1D
-	VK_ACCEPT              = 0x1E
-	VK_MODECHANGE          = 0x1F
-	VK_SPACE               = 0x20
-	VK_PRIOR               = 0x21
-	VK_NEXT                = 0x22
-	VK_END                 = 0x23
-	VK_HOME                = 0x24
-	VK_LEFT                = 0x25
-	VK_UP                  = 0x26
-	VK_RIGHT               = 0x27
-	VK_DOWN                = 0x28
-	VK_SELECT              = 0x29
-	VK_PRINT               = 0x2A
-	VK_EXECUTE             = 0x2B
-	VK_SNAPSHOT            = 0x2C
-	VK_INSERT              = 0x2D
-	VK_DELETE              = 0x2E
-	VK_HELP                = 0x2F
-	VK_LWIN                = 0x5B
-	VK_RWIN                = 0x5C
-	VK_APPS                = 0x5D
-	VK_SLEEP               = 0x5F
-	VK_NUMPAD0             = 0x60
-	VK_NUMPAD1             = 0x61
-	VK_NUMPAD2             = 0x62
-	VK_NUMPAD3             = 0x63
-	VK_NUMPAD4             = 0x64
-	VK_NUMPAD5             = 0x65
-	VK_NUMPAD6             = 0x66
-	VK_NUMPAD7             = 0x67
-	VK_NUMPAD8             = 0x68
-	VK_NUMPAD9             = 0x69
-	VK_MULTIPLY            = 0x6A
-	VK_ADD                 = 0x6B
-	VK_SEPARATOR           = 0x6C
-	VK_SUBTRACT            = 0x6D
-	VK_DECIMAL             = 0x6E
-	VK_DIVIDE              = 0x6F
-	VK_F1                  = 0x70
-	VK_F2                  = 0x71
-	VK_F3                  = 0x72
-	VK_F4                  = 0x73
-	VK_F5                  = 0x74
-	VK_F6                  = 0x75
-	VK_F7                  = 0x76
-	VK_F8                  = 0x77
-	VK_F9                  = 0x78
-	VK_F10                 = 0x79
-	VK_F11                 = 0x7A
-	VK_F12                 = 0x7B
-	VK_F13                 = 0x7C
-	VK_F14                 = 0x7D
-	VK_F15                 = 0x7E
-	VK_F16                 = 0x7F
-	VK_F17                 = 0x80
-	VK_F18                 = 0x81
-	VK_F19                 = 0x82
-	VK_F20                 = 0x83
-	VK_F21                 = 0x84
-	VK_F22                 = 0x85
-	VK_F23                 = 0x86
-	VK_F24                 = 0x87
-	VK_NUMLOCK             = 0x90
-	VK_SCROLL              = 0x91
-	VK_OEM_NEC_EQUAL       = 0x92
-	VK_OEM_FJ_JISHO        = 0x92
-	VK_OEM_FJ_MASSHOU      = 0x93
-	VK_OEM_FJ_TOUROKU      = 0x94
-	VK_OEM_FJ_LOYA         = 0x95
-	VK_OEM_FJ_ROYA         = 0x96
-	VK_LSHIFT              = 0xA0
-	VK_RSHIFT              = 0xA1
-	VK_LCONTROL            = 0xA2
-	VK_RCONTROL            = 0xA3
-	VK_LMENU               = 0xA4
-	VK_RMENU               = 0xA5
-	VK_BROWSER_BACK        = 0xA6
-	VK_BROWSER_FORWARD     = 0xA7
-	VK_BROWSER_REFRESH     = 0xA8
-	VK_BROWSER_STOP        = 0xA9
-	VK_BROWSER_SEARCH      = 0xAA
-	VK_BROWSER_FAVORITES   = 0xAB
-	VK_BROWSER_HOME        = 0xAC
-	VK_VOLUME_MUTE         = 0xAD
-	VK_VOLUME_DOWN         = 0xAE
-	VK_VOLUME_UP           = 0xAF
-	VK_MEDIA_NEXT_TRACK    = 0xB0
-	VK_MEDIA_PREV_TRACK    = 0xB1
-	VK_MEDIA_STOP          = 0xB2
-	VK_MEDIA_PLAY_PAUSE    = 0xB3
-	VK_LAUNCH_MAIL         = 0xB4
-	VK_LAUNCH_MEDIA_SELECT = 0xB5
-	VK_LAUNCH_APP1         = 0xB6
-	VK_LAUNCH_APP2         = 0xB7
-	VK_OEM_1               = 0xBA
-	VK_OEM_PLUS            = 0xBB
-	VK_OEM_COMMA           = 0xBC
-	VK_OEM_MINUS           = 0xBD
-	VK_OEM_PERIOD          = 0xBE
-	VK_OEM_2               = 0xBF
-	VK_OEM_3               = 0xC0
-	VK_OEM_4               = 0xDB
-	VK_OEM_5               = 0xDC
-	VK_OEM_6               = 0xDD
-	VK_OEM_7               = 0xDE
-	VK_OEM_8               = 0xDF
-	VK_OEM_AX              = 0xE1
-	VK_OEM_102             = 0xE2
-	VK_ICO_HELP            = 0xE3
-	VK_ICO_00              = 0xE4
-	VK_PROCESSKEY          = 0xE5
-	VK_ICO_CLEAR           = 0xE6
-	VK_OEM_RESET           = 0xE9
-	VK_OEM_JUMP            = 0xEA
-	VK_OEM_PA1             = 0xEB
-	VK_OEM_PA2             = 0xEC
-	VK_OEM_PA3             = 0xED
-	VK_OEM_WSCTRL          = 0xEE
-	VK_OEM_CUSEL           = 0xEF
-	VK_OEM_ATTN            = 0xF0
-	VK_OEM_FINISH          = 0xF1
-	VK_OEM_COPY            = 0xF2
-	VK_OEM_AUTO            = 0xF3
-	VK_OEM_ENLW            = 0xF4
-	VK_OEM_BACKTAB         = 0xF5
-	VK_ATTN                = 0xF6
-	VK_CRSEL               = 0xF7
-	VK_EXSEL               = 0xF8
-	VK_EREOF               = 0xF9
-	VK_PLAY                = 0xFA
-	VK_ZOOM                = 0xFB
-	VK_NONAME              = 0xFC
-	VK_PA1                 = 0xFD
-	VK_OEM_CLEAR           = 0xFE
-)
-
-// Registry Value Types
-const (
-	REG_NONE                       = 0
-	REG_SZ                         = 1
-	REG_EXPAND_SZ                  = 2
-	REG_BINARY                     = 3
-	REG_DWORD                      = 4
-	REG_DWORD_LITTLE_ENDIAN        = 4
-	REG_DWORD_BIG_ENDIAN           = 5
-	REG_LINK                       = 6
-	REG_MULTI_SZ                   = 7
-	REG_RESOURCE_LIST              = 8
-	REG_FULL_RESOURCE_DESCRIPTOR   = 9
-	REG_RESOURCE_REQUIREMENTS_LIST = 10
-	REG_QWORD                      = 11
-	REG_QWORD_LITTLE_ENDIAN        = 11
-)
-
-// Tooltip styles
-const (
-	TTS_ALWAYSTIP      = 0x01
-	TTS_NOPREFIX       = 0x02
-	TTS_NOANIMATE      = 0x10
-	TTS_NOFADE         = 0x20
-	TTS_BALLOON        = 0x40
-	TTS_CLOSE          = 0x80
-	TTS_USEVISUALSTYLE = 0x100
-)
-
-// Tooltip messages
-const (
-	TTM_ACTIVATE        = (WM_USER + 1)
-	TTM_SETDELAYTIME    = (WM_USER + 3)
-	TTM_ADDTOOL         = (WM_USER + 50)
-	TTM_DELTOOL         = (WM_USER + 51)
-	TTM_NEWTOOLRECT     = (WM_USER + 52)
-	TTM_RELAYEVENT      = (WM_USER + 7)
-	TTM_GETTOOLINFO     = (WM_USER + 53)
-	TTM_SETTOOLINFO     = (WM_USER + 54)
-	TTM_HITTEST         = (WM_USER + 55)
-	TTM_GETTEXT         = (WM_USER + 56)
-	TTM_UPDATETIPTEXT   = (WM_USER + 57)
-	TTM_GETTOOLCOUNT    = (WM_USER + 13)
-	TTM_ENUMTOOLS       = (WM_USER + 58)
-	TTM_GETCURRENTTOOL  = (WM_USER + 59)
-	TTM_WINDOWFROMPOINT = (WM_USER + 16)
-	TTM_TRACKACTIVATE   = (WM_USER + 17)
-	TTM_TRACKPOSITION   = (WM_USER + 18)
-	TTM_SETTIPBKCOLOR   = (WM_USER + 19)
-	TTM_SETTIPTEXTCOLOR = (WM_USER + 20)
-	TTM_GETDELAYTIME    = (WM_USER + 21)
-	TTM_GETTIPBKCOLOR   = (WM_USER + 22)
-	TTM_GETTIPTEXTCOLOR = (WM_USER + 23)
-	TTM_SETMAXTIPWIDTH  = (WM_USER + 24)
-	TTM_GETMAXTIPWIDTH  = (WM_USER + 25)
-	TTM_SETMARGIN       = (WM_USER + 26)
-	TTM_GETMARGIN       = (WM_USER + 27)
-	TTM_POP             = (WM_USER + 28)
-	TTM_UPDATE          = (WM_USER + 29)
-	TTM_GETBUBBLESIZE   = (WM_USER + 30)
-	TTM_ADJUSTRECT      = (WM_USER + 31)
-	TTM_SETTITLE        = (WM_USER + 33)
-	TTM_POPUP           = (WM_USER + 34)
-	TTM_GETTITLE        = (WM_USER + 35)
-)
-
-// Tooltip icons
-const (
-	TTI_NONE          = 0
-	TTI_INFO          = 1
-	TTI_WARNING       = 2
-	TTI_ERROR         = 3
-	TTI_INFO_LARGE    = 4
-	TTI_WARNING_LARGE = 5
-	TTI_ERROR_LARGE   = 6
-)
-
-// Tooltip notifications
-const (
-	TTN_FIRST       = -520
-	TTN_LAST        = -549
-	TTN_GETDISPINFO = (TTN_FIRST - 10)
-	TTN_SHOW        = (TTN_FIRST - 1)
-	TTN_POP         = (TTN_FIRST - 2)
-	TTN_LINKCLICK   = (TTN_FIRST - 3)
-	TTN_NEEDTEXT    = TTN_GETDISPINFO
-)
-
-const (
-	TTF_IDISHWND    = 0x0001
-	TTF_CENTERTIP   = 0x0002
-	TTF_RTLREADING  = 0x0004
-	TTF_SUBCLASS    = 0x0010
-	TTF_TRACK       = 0x0020
-	TTF_ABSOLUTE    = 0x0080
-	TTF_TRANSPARENT = 0x0100
-	TTF_PARSELINKS  = 0x1000
-	TTF_DI_SETITEM  = 0x8000
-)
-
-const (
-	SWP_NOSIZE         = 0x0001
-	SWP_NOMOVE         = 0x0002
-	SWP_NOZORDER       = 0x0004
-	SWP_NOREDRAW       = 0x0008
-	SWP_NOACTIVATE     = 0x0010
-	SWP_FRAMECHANGED   = 0x0020
-	SWP_SHOWWINDOW     = 0x0040
-	SWP_HIDEWINDOW     = 0x0080
-	SWP_NOCOPYBITS     = 0x0100
-	SWP_NOOWNERZORDER  = 0x0200
-	SWP_NOSENDCHANGING = 0x0400
-	SWP_DRAWFRAME      = SWP_FRAMECHANGED
-	SWP_NOREPOSITION   = SWP_NOOWNERZORDER
-	SWP_DEFERERASE     = 0x2000
-	SWP_ASYNCWINDOWPOS = 0x4000
-)
-
-// Predefined window handles
-const (
-	HWND_BROADCAST = HWND(0xFFFF)
-	HWND_BOTTOM    = HWND(1)
-	HWND_NOTOPMOST = ^HWND(1) // -2
-	HWND_TOP       = HWND(0)
-	HWND_TOPMOST   = ^HWND(0) // -1
-	HWND_DESKTOP   = HWND(0)
-	HWND_MESSAGE   = ^HWND(2) // -3
-)
-
-// Pen types
-const (
-	PS_COSMETIC  = 0x00000000
-	PS_GEOMETRIC = 0x00010000
-	PS_TYPE_MASK = 0x000F0000
-)
-
-// Pen styles
-const (
-	PS_SOLID       = 0
-	PS_DASH        = 1
-	PS_DOT         = 2
-	PS_DASHDOT     = 3
-	PS_DASHDOTDOT  = 4
-	PS_NULL        = 5
-	PS_INSIDEFRAME = 6
-	PS_USERSTYLE   = 7
-	PS_ALTERNATE   = 8
-	PS_STYLE_MASK  = 0x0000000F
-)
-
-// Pen cap types
-const (
-	PS_ENDCAP_ROUND  = 0x00000000
-	PS_ENDCAP_SQUARE = 0x00000100
-	PS_ENDCAP_FLAT   = 0x00000200
-	PS_ENDCAP_MASK   = 0x00000F00
-)
-
-// Pen join types
-const (
-	PS_JOIN_ROUND = 0x00000000
-	PS_JOIN_BEVEL = 0x00001000
-	PS_JOIN_MITER = 0x00002000
-	PS_JOIN_MASK  = 0x0000F000
-)
-
-// Hatch styles
-const (
-	HS_HORIZONTAL = 0
-	HS_VERTICAL   = 1
-	HS_FDIAGONAL  = 2
-	HS_BDIAGONAL  = 3
-	HS_CROSS      = 4
-	HS_DIAGCROSS  = 5
-)
-
-// Stock Logical Objects
-const (
-	WHITE_BRUSH         = 0
-	LTGRAY_BRUSH        = 1
-	GRAY_BRUSH          = 2
-	DKGRAY_BRUSH        = 3
-	BLACK_BRUSH         = 4
-	NULL_BRUSH          = 5
-	HOLLOW_BRUSH        = NULL_BRUSH
-	WHITE_PEN           = 6
-	BLACK_PEN           = 7
-	NULL_PEN            = 8
-	OEM_FIXED_FONT      = 10
-	ANSI_FIXED_FONT     = 11
-	ANSI_VAR_FONT       = 12
-	SYSTEM_FONT         = 13
-	DEVICE_DEFAULT_FONT = 14
-	DEFAULT_PALETTE     = 15
-	SYSTEM_FIXED_FONT   = 16
-	DEFAULT_GUI_FONT    = 17
-	DC_BRUSH            = 18
-	DC_PEN              = 19
-)
-
-// Brush styles
-const (
-	BS_SOLID         = 0
-	BS_NULL          = 1
-	BS_HOLLOW        = BS_NULL
-	BS_HATCHED       = 2
-	BS_PATTERN       = 3
-	BS_INDEXED       = 4
-	BS_DIBPATTERN    = 5
-	BS_DIBPATTERNPT  = 6
-	BS_PATTERN8X8    = 7
-	BS_DIBPATTERN8X8 = 8
-	BS_MONOPATTERN   = 9
-)
-
-// TRACKMOUSEEVENT flags
-const (
-	TME_HOVER     = 0x00000001
-	TME_LEAVE     = 0x00000002
-	TME_NONCLIENT = 0x00000010
-	TME_QUERY     = 0x40000000
-	TME_CANCEL    = 0x80000000
-
-	HOVER_DEFAULT = 0xFFFFFFFF
-)
-
-// WM_NCHITTEST and MOUSEHOOKSTRUCT Mouse Position Codes
-const (
-	HTERROR       = (-2)
-	HTTRANSPARENT = (-1)
-	HTNOWHERE     = 0
-	HTCLIENT      = 1
-	HTCAPTION     = 2
-	HTSYSMENU     = 3
-	HTGROWBOX     = 4
-	HTSIZE        = HTGROWBOX
-	HTMENU        = 5
-	HTHSCROLL     = 6
-	HTVSCROLL     = 7
-	HTMINBUTTON   = 8
-	HTMAXBUTTON   = 9
-	HTLEFT        = 10
-	HTRIGHT       = 11
-	HTTOP         = 12
-	HTTOPLEFT     = 13
-	HTTOPRIGHT    = 14
-	HTBOTTOM      = 15
-	HTBOTTOMLEFT  = 16
-	HTBOTTOMRIGHT = 17
-	HTBORDER      = 18
-	HTREDUCE      = HTMINBUTTON
-	HTZOOM        = HTMAXBUTTON
-	HTSIZEFIRST   = HTLEFT
-	HTSIZELAST    = HTBOTTOMRIGHT
-	HTOBJECT      = 19
-	HTCLOSE       = 20
-	HTHELP        = 21
-)
-
-// DrawText[Ex] format flags
-const (
-	DT_TOP                  = 0x00000000
-	DT_LEFT                 = 0x00000000
-	DT_CENTER               = 0x00000001
-	DT_RIGHT                = 0x00000002
-	DT_VCENTER              = 0x00000004
-	DT_BOTTOM               = 0x00000008
-	DT_WORDBREAK            = 0x00000010
-	DT_SINGLELINE           = 0x00000020
-	DT_EXPANDTABS           = 0x00000040
-	DT_TABSTOP              = 0x00000080
-	DT_NOCLIP               = 0x00000100
-	DT_EXTERNALLEADING      = 0x00000200
-	DT_CALCRECT             = 0x00000400
-	DT_NOPREFIX             = 0x00000800
-	DT_INTERNAL             = 0x00001000
-	DT_EDITCONTROL          = 0x00002000
-	DT_PATH_ELLIPSIS        = 0x00004000
-	DT_END_ELLIPSIS         = 0x00008000
-	DT_MODIFYSTRING         = 0x00010000
-	DT_RTLREADING           = 0x00020000
-	DT_WORD_ELLIPSIS        = 0x00040000
-	DT_NOFULLWIDTHCHARBREAK = 0x00080000
-	DT_HIDEPREFIX           = 0x00100000
-	DT_PREFIXONLY           = 0x00200000
-)
-
-const CLR_INVALID = 0xFFFFFFFF
-
-// Background Modes
-const (
-	TRANSPARENT = 1
-	OPAQUE      = 2
-	BKMODE_LAST = 2
-)
-
-// Global Memory Flags
-const (
-	GMEM_FIXED          = 0x0000
-	GMEM_MOVEABLE       = 0x0002
-	GMEM_NOCOMPACT      = 0x0010
-	GMEM_NODISCARD      = 0x0020
-	GMEM_ZEROINIT       = 0x0040
-	GMEM_MODIFY         = 0x0080
-	GMEM_DISCARDABLE    = 0x0100
-	GMEM_NOT_BANKED     = 0x1000
-	GMEM_SHARE          = 0x2000
-	GMEM_DDESHARE       = 0x2000
-	GMEM_NOTIFY         = 0x4000
-	GMEM_LOWER          = GMEM_NOT_BANKED
-	GMEM_VALID_FLAGS    = 0x7F72
-	GMEM_INVALID_HANDLE = 0x8000
-	GHND                = (GMEM_MOVEABLE | GMEM_ZEROINIT)
-	GPTR                = (GMEM_FIXED | GMEM_ZEROINIT)
-)
-
-// Ternary raster operations
-const (
-	SRCCOPY        = 0x00CC0020
-	SRCPAINT       = 0x00EE0086
-	SRCAND         = 0x008800C6
-	SRCINVERT      = 0x00660046
-	SRCERASE       = 0x00440328
-	NOTSRCCOPY     = 0x00330008
-	NOTSRCERASE    = 0x001100A6
-	MERGECOPY      = 0x00C000CA
-	MERGEPAINT     = 0x00BB0226
-	PATCOPY        = 0x00F00021
-	PATPAINT       = 0x00FB0A09
-	PATINVERT      = 0x005A0049
-	DSTINVERT      = 0x00550009
-	BLACKNESS      = 0x00000042
-	WHITENESS      = 0x00FF0062
-	NOMIRRORBITMAP = 0x80000000
-	CAPTUREBLT     = 0x40000000
-)
-
-// Clipboard formats
-const (
-	CF_TEXT            = 1
-	CF_BITMAP          = 2
-	CF_METAFILEPICT    = 3
-	CF_SYLK            = 4
-	CF_DIF             = 5
-	CF_TIFF            = 6
-	CF_OEMTEXT         = 7
-	CF_DIB             = 8
-	CF_PALETTE         = 9
-	CF_PENDATA         = 10
-	CF_RIFF            = 11
-	CF_WAVE            = 12
-	CF_UNICODETEXT     = 13
-	CF_ENHMETAFILE     = 14
-	CF_HDROP           = 15
-	CF_LOCALE          = 16
-	CF_DIBV5           = 17
-	CF_MAX             = 18
-	CF_OWNERDISPLAY    = 0x0080
-	CF_DSPTEXT         = 0x0081
-	CF_DSPBITMAP       = 0x0082
-	CF_DSPMETAFILEPICT = 0x0083
-	CF_DSPENHMETAFILE  = 0x008E
-	CF_PRIVATEFIRST    = 0x0200
-	CF_PRIVATELAST     = 0x02FF
-	CF_GDIOBJFIRST     = 0x0300
-	CF_GDIOBJLAST      = 0x03FF
-)
-
-// Bitmap compression formats
-const (
-	BI_RGB       = 0
-	BI_RLE8      = 1
-	BI_RLE4      = 2
-	BI_BITFIELDS = 3
-	BI_JPEG      = 4
-	BI_PNG       = 5
-)
-
-// SetDIBitsToDevice fuColorUse
-const (
-	DIB_PAL_COLORS = 1
-	DIB_RGB_COLORS = 0
-)
-
-const (
-	STANDARD_RIGHTS_REQUIRED = 0x000F
-)
-
-// Service Control Manager object specific access types
-const (
-	SC_MANAGER_CONNECT            = 0x0001
-	SC_MANAGER_CREATE_SERVICE     = 0x0002
-	SC_MANAGER_ENUMERATE_SERVICE  = 0x0004
-	SC_MANAGER_LOCK               = 0x0008
-	SC_MANAGER_QUERY_LOCK_STATUS  = 0x0010
-	SC_MANAGER_MODIFY_BOOT_CONFIG = 0x0020
-	SC_MANAGER_ALL_ACCESS         = STANDARD_RIGHTS_REQUIRED | SC_MANAGER_CONNECT | SC_MANAGER_CREATE_SERVICE | SC_MANAGER_ENUMERATE_SERVICE | SC_MANAGER_LOCK | SC_MANAGER_QUERY_LOCK_STATUS | SC_MANAGER_MODIFY_BOOT_CONFIG
-)
-
-// Service Types (Bit Mask)
-const (
-	SERVICE_KERNEL_DRIVER       = 0x00000001
-	SERVICE_FILE_SYSTEM_DRIVER  = 0x00000002
-	SERVICE_ADAPTER             = 0x00000004
-	SERVICE_RECOGNIZER_DRIVER   = 0x00000008
-	SERVICE_DRIVER              = SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_RECOGNIZER_DRIVER
-	SERVICE_WIN32_OWN_PROCESS   = 0x00000010
-	SERVICE_WIN32_SHARE_PROCESS = 0x00000020
-	SERVICE_WIN32               = SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS
-	SERVICE_INTERACTIVE_PROCESS = 0x00000100
-	SERVICE_TYPE_ALL            = SERVICE_WIN32 | SERVICE_ADAPTER | SERVICE_DRIVER | SERVICE_INTERACTIVE_PROCESS
-)
-
-// Service State -- for CurrentState
-const (
-	SERVICE_STOPPED          = 0x00000001
-	SERVICE_START_PENDING    = 0x00000002
-	SERVICE_STOP_PENDING     = 0x00000003
-	SERVICE_RUNNING          = 0x00000004
-	SERVICE_CONTINUE_PENDING = 0x00000005
-	SERVICE_PAUSE_PENDING    = 0x00000006
-	SERVICE_PAUSED           = 0x00000007
-)
-
-// Controls Accepted  (Bit Mask)
-const (
-	SERVICE_ACCEPT_STOP                  = 0x00000001
-	SERVICE_ACCEPT_PAUSE_CONTINUE        = 0x00000002
-	SERVICE_ACCEPT_SHUTDOWN              = 0x00000004
-	SERVICE_ACCEPT_PARAMCHANGE           = 0x00000008
-	SERVICE_ACCEPT_NETBINDCHANGE         = 0x00000010
-	SERVICE_ACCEPT_HARDWAREPROFILECHANGE = 0x00000020
-	SERVICE_ACCEPT_POWEREVENT            = 0x00000040
-	SERVICE_ACCEPT_SESSIONCHANGE         = 0x00000080
-	SERVICE_ACCEPT_PRESHUTDOWN           = 0x00000100
-	SERVICE_ACCEPT_TIMECHANGE            = 0x00000200
-	SERVICE_ACCEPT_TRIGGEREVENT          = 0x00000400
-)
-
-// Service object specific access type
-const (
-	SERVICE_QUERY_CONFIG         = 0x0001
-	SERVICE_CHANGE_CONFIG        = 0x0002
-	SERVICE_QUERY_STATUS         = 0x0004
-	SERVICE_ENUMERATE_DEPENDENTS = 0x0008
-	SERVICE_START                = 0x0010
-	SERVICE_STOP                 = 0x0020
-	SERVICE_PAUSE_CONTINUE       = 0x0040
-	SERVICE_INTERROGATE          = 0x0080
-	SERVICE_USER_DEFINED_CONTROL = 0x0100
-
-	SERVICE_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED |
-		SERVICE_QUERY_CONFIG |
-		SERVICE_CHANGE_CONFIG |
-		SERVICE_QUERY_STATUS |
-		SERVICE_ENUMERATE_DEPENDENTS |
-		SERVICE_START |
-		SERVICE_STOP |
-		SERVICE_PAUSE_CONTINUE |
-		SERVICE_INTERROGATE |
-		SERVICE_USER_DEFINED_CONTROL
-)
-
-// MapVirtualKey maptypes
-const (
-	MAPVK_VK_TO_CHAR   = 2
-	MAPVK_VK_TO_VSC    = 0
-	MAPVK_VSC_TO_VK    = 1
-	MAPVK_VSC_TO_VK_EX = 3
-)
-
-// ReadEventLog Flags
-const (
-	EVENTLOG_SEEK_READ       = 0x0002
-	EVENTLOG_SEQUENTIAL_READ = 0x0001
-	EVENTLOG_FORWARDS_READ   = 0x0004
-	EVENTLOG_BACKWARDS_READ  = 0x0008
-)
-
-// CreateToolhelp32Snapshot flags
-const (
-	TH32CS_SNAPHEAPLIST = 0x00000001
-	TH32CS_SNAPPROCESS  = 0x00000002
-	TH32CS_SNAPTHREAD   = 0x00000004
-	TH32CS_SNAPMODULE   = 0x00000008
-	TH32CS_SNAPMODULE32 = 0x00000010
-	TH32CS_INHERIT      = 0x80000000
-	TH32CS_SNAPALL      = TH32CS_SNAPHEAPLIST | TH32CS_SNAPMODULE | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD
-)
-
-const (
-	MAX_MODULE_NAME32 = 255
-	MAX_PATH          = 260
-)
-
-const (
-	FOREGROUND_BLUE            = 0x0001
-	FOREGROUND_GREEN           = 0x0002
-	FOREGROUND_RED             = 0x0004
-	FOREGROUND_INTENSITY       = 0x0008
-	BACKGROUND_BLUE            = 0x0010
-	BACKGROUND_GREEN           = 0x0020
-	BACKGROUND_RED             = 0x0040
-	BACKGROUND_INTENSITY       = 0x0080
-	COMMON_LVB_LEADING_BYTE    = 0x0100
-	COMMON_LVB_TRAILING_BYTE   = 0x0200
-	COMMON_LVB_GRID_HORIZONTAL = 0x0400
-	COMMON_LVB_GRID_LVERTICAL  = 0x0800
-	COMMON_LVB_GRID_RVERTICAL  = 0x1000
-	COMMON_LVB_REVERSE_VIDEO   = 0x4000
-	COMMON_LVB_UNDERSCORE      = 0x8000
-)
-
-// Flags used by the DWM_BLURBEHIND structure to indicate
-// which of its members contain valid information.
-const (
-	DWM_BB_ENABLE                = 0x00000001 //     A value for the fEnable member has been specified.
-	DWM_BB_BLURREGION            = 0x00000002 //     A value for the hRgnBlur member has been specified.
-	DWM_BB_TRANSITIONONMAXIMIZED = 0x00000004 //     A value for the fTransitionOnMaximized member has been specified.
-)
-
-// Flags used by the DwmEnableComposition  function
-// to change the state of Desktop Window Manager (DWM) composition.
-const (
-	DWM_EC_DISABLECOMPOSITION = 0 //     Disable composition
-	DWM_EC_ENABLECOMPOSITION  = 1 //     Enable composition
-)
-
-// enum-lite implementation for the following constant structure
-type DWM_SHOWCONTACT int32
-
-const (
-	DWMSC_DOWN      = 0x00000001
-	DWMSC_UP        = 0x00000002
-	DWMSC_DRAG      = 0x00000004
-	DWMSC_HOLD      = 0x00000008
-	DWMSC_PENBARREL = 0x00000010
-	DWMSC_NONE      = 0x00000000
-	DWMSC_ALL       = 0xFFFFFFFF
-)
-
-// enum-lite implementation for the following constant structure
-type DWM_SOURCE_FRAME_SAMPLING int32
-
-// TODO: need to verify this construction
-// Flags used by the DwmSetPresentParameters function
-// to specify the frame sampling type
-const (
-	DWM_SOURCE_FRAME_SAMPLING_POINT = iota + 1
-	DWM_SOURCE_FRAME_SAMPLING_COVERAGE
-	DWM_SOURCE_FRAME_SAMPLING_LAST
-)
-
-// Flags used by the DWM_THUMBNAIL_PROPERTIES structure to
-// indicate which of its members contain valid information.
-const (
-	DWM_TNP_RECTDESTINATION      = 0x00000001 //    A value for the rcDestination member has been specified
-	DWM_TNP_RECTSOURCE           = 0x00000002 //    A value for the rcSource member has been specified
-	DWM_TNP_OPACITY              = 0x00000004 //    A value for the opacity member has been specified
-	DWM_TNP_VISIBLE              = 0x00000008 //    A value for the fVisible member has been specified
-	DWM_TNP_SOURCECLIENTAREAONLY = 0x00000010 //    A value for the fSourceClientAreaOnly member has been specified
-)
-
-// enum-lite implementation for the following constant structure
-type DWMFLIP3DWINDOWPOLICY int32
-
-// TODO: need to verify this construction
-// Flags used by the DwmSetWindowAttribute function
-// to specify the Flip3D window policy
-const (
-	DWMFLIP3D_DEFAULT = iota + 1
-	DWMFLIP3D_EXCLUDEBELOW
-	DWMFLIP3D_EXCLUDEABOVE
-	DWMFLIP3D_LAST
-)
-
-// enum-lite implementation for the following constant structure
-type DWMNCRENDERINGPOLICY int32
-
-// TODO: need to verify this construction
-// Flags used by the DwmSetWindowAttribute function
-// to specify the non-client area rendering policy
-const (
-	DWMNCRP_USEWINDOWSTYLE = iota + 1
-	DWMNCRP_DISABLED
-	DWMNCRP_ENABLED
-	DWMNCRP_LAST
-)
-
-// enum-lite implementation for the following constant structure
-type DWMTRANSITION_OWNEDWINDOW_TARGET int32
-
-const (
-	DWMTRANSITION_OWNEDWINDOW_NULL       = -1
-	DWMTRANSITION_OWNEDWINDOW_REPOSITION = 0
-)
-
-// enum-lite implementation for the following constant structure
-type DWMWINDOWATTRIBUTE int32
-
-// TODO: need to verify this construction
-// Flags used by the DwmGetWindowAttribute and DwmSetWindowAttribute functions
-// to specify window attributes for non-client rendering
-const (
-	DWMWA_NCRENDERING_ENABLED = iota + 1
-	DWMWA_NCRENDERING_POLICY
-	DWMWA_TRANSITIONS_FORCEDISABLED
-	DWMWA_ALLOW_NCPAINT
-	DWMWA_CAPTION_BUTTON_BOUNDS
-	DWMWA_NONCLIENT_RTL_LAYOUT
-	DWMWA_FORCE_ICONIC_REPRESENTATION
-	DWMWA_FLIP3D_POLICY
-	DWMWA_EXTENDED_FRAME_BOUNDS
-	DWMWA_HAS_ICONIC_BITMAP
-	DWMWA_DISALLOW_PEEK
-	DWMWA_EXCLUDED_FROM_PEEK
-	DWMWA_CLOAK
-	DWMWA_CLOAKED
-	DWMWA_FREEZE_REPRESENTATION
-	DWMWA_LAST
-)
-
-// enum-lite implementation for the following constant structure
-type GESTURE_TYPE int32
-
-// TODO: use iota?
-// Identifies the gesture type
-const (
-	GT_PEN_TAP                 = 0
-	GT_PEN_DOUBLETAP           = 1
-	GT_PEN_RIGHTTAP            = 2
-	GT_PEN_PRESSANDHOLD        = 3
-	GT_PEN_PRESSANDHOLDABORT   = 4
-	GT_TOUCH_TAP               = 5
-	GT_TOUCH_DOUBLETAP         = 6
-	GT_TOUCH_RIGHTTAP          = 7
-	GT_TOUCH_PRESSANDHOLD      = 8
-	GT_TOUCH_PRESSANDHOLDABORT = 9
-	GT_TOUCH_PRESSANDTAP       = 10
-)
-
-// Icons
-const (
-	ICON_SMALL  = 0
-	ICON_BIG    = 1
-	ICON_SMALL2 = 2
-)
-
-const (
-	SIZE_RESTORED  = 0
-	SIZE_MINIMIZED = 1
-	SIZE_MAXIMIZED = 2
-	SIZE_MAXSHOW   = 3
-	SIZE_MAXHIDE   = 4
-)
-
-// XButton values
-const (
-	XBUTTON1 = 1
-	XBUTTON2 = 2
-)
-
-// Devmode
-const (
-	DM_SPECVERSION = 0x0401
-
-	DM_ORIENTATION        = 0x00000001
-	DM_PAPERSIZE          = 0x00000002
-	DM_PAPERLENGTH        = 0x00000004
-	DM_PAPERWIDTH         = 0x00000008
-	DM_SCALE              = 0x00000010
-	DM_POSITION           = 0x00000020
-	DM_NUP                = 0x00000040
-	DM_DISPLAYORIENTATION = 0x00000080
-	DM_COPIES             = 0x00000100
-	DM_DEFAULTSOURCE      = 0x00000200
-	DM_PRINTQUALITY       = 0x00000400
-	DM_COLOR              = 0x00000800
-	DM_DUPLEX             = 0x00001000
-	DM_YRESOLUTION        = 0x00002000
-	DM_TTOPTION           = 0x00004000
-	DM_COLLATE            = 0x00008000
-	DM_FORMNAME           = 0x00010000
-	DM_LOGPIXELS          = 0x00020000
-	DM_BITSPERPEL         = 0x00040000
-	DM_PELSWIDTH          = 0x00080000
-	DM_PELSHEIGHT         = 0x00100000
-	DM_DISPLAYFLAGS       = 0x00200000
-	DM_DISPLAYFREQUENCY   = 0x00400000
-	DM_ICMMETHOD          = 0x00800000
-	DM_ICMINTENT          = 0x01000000
-	DM_MEDIATYPE          = 0x02000000
-	DM_DITHERTYPE         = 0x04000000
-	DM_PANNINGWIDTH       = 0x08000000
-	DM_PANNINGHEIGHT      = 0x10000000
-	DM_DISPLAYFIXEDOUTPUT = 0x20000000
-)
-
-// ChangeDisplaySettings
-const (
-	CDS_UPDATEREGISTRY  = 0x00000001
-	CDS_TEST            = 0x00000002
-	CDS_FULLSCREEN      = 0x00000004
-	CDS_GLOBAL          = 0x00000008
-	CDS_SET_PRIMARY     = 0x00000010
-	CDS_VIDEOPARAMETERS = 0x00000020
-	CDS_RESET           = 0x40000000
-	CDS_NORESET         = 0x10000000
-
-	DISP_CHANGE_SUCCESSFUL  = 0
-	DISP_CHANGE_RESTART     = 1
-	DISP_CHANGE_FAILED      = -1
-	DISP_CHANGE_BADMODE     = -2
-	DISP_CHANGE_NOTUPDATED  = -3
-	DISP_CHANGE_BADFLAGS    = -4
-	DISP_CHANGE_BADPARAM    = -5
-	DISP_CHANGE_BADDUALVIEW = -6
-)
-
-const (
-	ENUM_CURRENT_SETTINGS  = 0xFFFFFFFF
-	ENUM_REGISTRY_SETTINGS = 0xFFFFFFFE
-)
-
-// PIXELFORMATDESCRIPTOR
-const (
-	PFD_TYPE_RGBA       = 0
-	PFD_TYPE_COLORINDEX = 1
-
-	PFD_MAIN_PLANE     = 0
-	PFD_OVERLAY_PLANE  = 1
-	PFD_UNDERLAY_PLANE = -1
-
-	PFD_DOUBLEBUFFER         = 0x00000001
-	PFD_STEREO               = 0x00000002
-	PFD_DRAW_TO_WINDOW       = 0x00000004
-	PFD_DRAW_TO_BITMAP       = 0x00000008
-	PFD_SUPPORT_GDI          = 0x00000010
-	PFD_SUPPORT_OPENGL       = 0x00000020
-	PFD_GENERIC_FORMAT       = 0x00000040
-	PFD_NEED_PALETTE         = 0x00000080
-	PFD_NEED_SYSTEM_PALETTE  = 0x00000100
-	PFD_SWAP_EXCHANGE        = 0x00000200
-	PFD_SWAP_COPY            = 0x00000400
-	PFD_SWAP_LAYER_BUFFERS   = 0x00000800
-	PFD_GENERIC_ACCELERATED  = 0x00001000
-	PFD_SUPPORT_DIRECTDRAW   = 0x00002000
-	PFD_DIRECT3D_ACCELERATED = 0x00004000
-	PFD_SUPPORT_COMPOSITION  = 0x00008000
-
-	PFD_DEPTH_DONTCARE        = 0x20000000
-	PFD_DOUBLEBUFFER_DONTCARE = 0x40000000
-	PFD_STEREO_DONTCARE       = 0x80000000
-)
-
-const (
-	INPUT_MOUSE    = 0
-	INPUT_KEYBOARD = 1
-	INPUT_HARDWARE = 2
-)
-
-const (
-	MOUSEEVENTF_ABSOLUTE        = 0x8000
-	MOUSEEVENTF_HWHEEL          = 0x01000
-	MOUSEEVENTF_MOVE            = 0x0001
-	MOUSEEVENTF_MOVE_NOCOALESCE = 0x2000
-	MOUSEEVENTF_LEFTDOWN        = 0x0002
-	MOUSEEVENTF_LEFTUP          = 0x0004
-	MOUSEEVENTF_RIGHTDOWN       = 0x0008
-	MOUSEEVENTF_RIGHTUP         = 0x0010
-	MOUSEEVENTF_MIDDLEDOWN      = 0x0020
-	MOUSEEVENTF_MIDDLEUP        = 0x0040
-	MOUSEEVENTF_VIRTUALDESK     = 0x4000
-	MOUSEEVENTF_WHEEL           = 0x0800
-	MOUSEEVENTF_XDOWN           = 0x0080
-	MOUSEEVENTF_XUP             = 0x0100
-)
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/dwmapi.go b/Godeps/_workspace/src/github.com/shirou/w32/dwmapi.go
deleted file mode 100644
index eb656d1874..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/dwmapi.go
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"fmt"
-	"syscall"
-	"unsafe"
-)
-
-// DEFINED IN THE DWM API BUT NOT IMPLEMENTED BY MS:
-// DwmAttachMilContent
-// DwmDetachMilContent
-// DwmEnableComposition
-// DwmGetGraphicsStreamClient
-// DwmGetGraphicsStreamTransformHint
-
-var (
-	moddwmapi = syscall.NewLazyDLL("dwmapi.dll")
-
-	procDwmDefWindowProc                 = moddwmapi.NewProc("DwmDefWindowProc")
-	procDwmEnableBlurBehindWindow        = moddwmapi.NewProc("DwmEnableBlurBehindWindow")
-	procDwmEnableMMCSS                   = moddwmapi.NewProc("DwmEnableMMCSS")
-	procDwmExtendFrameIntoClientArea     = moddwmapi.NewProc("DwmExtendFrameIntoClientArea")
-	procDwmFlush                         = moddwmapi.NewProc("DwmFlush")
-	procDwmGetColorizationColor          = moddwmapi.NewProc("DwmGetColorizationColor")
-	procDwmGetCompositionTimingInfo      = moddwmapi.NewProc("DwmGetCompositionTimingInfo")
-	procDwmGetTransportAttributes        = moddwmapi.NewProc("DwmGetTransportAttributes")
-	procDwmGetWindowAttribute            = moddwmapi.NewProc("DwmGetWindowAttribute")
-	procDwmInvalidateIconicBitmaps       = moddwmapi.NewProc("DwmInvalidateIconicBitmaps")
-	procDwmIsCompositionEnabled          = moddwmapi.NewProc("DwmIsCompositionEnabled")
-	procDwmModifyPreviousDxFrameDuration = moddwmapi.NewProc("DwmModifyPreviousDxFrameDuration")
-	procDwmQueryThumbnailSourceSize      = moddwmapi.NewProc("DwmQueryThumbnailSourceSize")
-	procDwmRegisterThumbnail             = moddwmapi.NewProc("DwmRegisterThumbnail")
-	procDwmRenderGesture                 = moddwmapi.NewProc("DwmRenderGesture")
-	procDwmSetDxFrameDuration            = moddwmapi.NewProc("DwmSetDxFrameDuration")
-	procDwmSetIconicLivePreviewBitmap    = moddwmapi.NewProc("DwmSetIconicLivePreviewBitmap")
-	procDwmSetIconicThumbnail            = moddwmapi.NewProc("DwmSetIconicThumbnail")
-	procDwmSetPresentParameters          = moddwmapi.NewProc("DwmSetPresentParameters")
-	procDwmSetWindowAttribute            = moddwmapi.NewProc("DwmSetWindowAttribute")
-	procDwmShowContact                   = moddwmapi.NewProc("DwmShowContact")
-	procDwmTetherContact                 = moddwmapi.NewProc("DwmTetherContact")
-	procDwmTransitionOwnedWindow         = moddwmapi.NewProc("DwmTransitionOwnedWindow")
-	procDwmUnregisterThumbnail           = moddwmapi.NewProc("DwmUnregisterThumbnail")
-	procDwmUpdateThumbnailProperties     = moddwmapi.NewProc("DwmUpdateThumbnailProperties")
-)
-
-func DwmDefWindowProc(hWnd HWND, msg uint, wParam, lParam uintptr) (bool, uint) {
-	var result uint
-	ret, _, _ := procDwmDefWindowProc.Call(
-		uintptr(hWnd),
-		uintptr(msg),
-		wParam,
-		lParam,
-		uintptr(unsafe.Pointer(&result)))
-	return ret != 0, result
-}
-
-func DwmEnableBlurBehindWindow(hWnd HWND, pBlurBehind *DWM_BLURBEHIND) HRESULT {
-	ret, _, _ := procDwmEnableBlurBehindWindow.Call(
-		uintptr(hWnd),
-		uintptr(unsafe.Pointer(pBlurBehind)))
-	return HRESULT(ret)
-}
-
-func DwmEnableMMCSS(fEnableMMCSS bool) HRESULT {
-	ret, _, _ := procDwmEnableMMCSS.Call(
-		uintptr(BoolToBOOL(fEnableMMCSS)))
-	return HRESULT(ret)
-}
-
-func DwmExtendFrameIntoClientArea(hWnd HWND, pMarInset *MARGINS) HRESULT {
-	ret, _, _ := procDwmExtendFrameIntoClientArea.Call(
-		uintptr(hWnd),
-		uintptr(unsafe.Pointer(pMarInset)))
-	return HRESULT(ret)
-}
-
-func DwmFlush() HRESULT {
-	ret, _, _ := procDwmFlush.Call()
-	return HRESULT(ret)
-}
-
-func DwmGetColorizationColor(pcrColorization *uint32, pfOpaqueBlend *BOOL) HRESULT {
-	ret, _, _ := procDwmGetColorizationColor.Call(
-		uintptr(unsafe.Pointer(pcrColorization)),
-		uintptr(unsafe.Pointer(pfOpaqueBlend)))
-	return HRESULT(ret)
-}
-
-func DwmGetCompositionTimingInfo(hWnd HWND, pTimingInfo *DWM_TIMING_INFO) HRESULT {
-	ret, _, _ := procDwmGetCompositionTimingInfo.Call(
-		uintptr(hWnd),
-		uintptr(unsafe.Pointer(pTimingInfo)))
-	return HRESULT(ret)
-}
-
-func DwmGetTransportAttributes(pfIsRemoting *BOOL, pfIsConnected *BOOL, pDwGeneration *uint32) HRESULT {
-	ret, _, _ := procDwmGetTransportAttributes.Call(
-		uintptr(unsafe.Pointer(pfIsRemoting)),
-		uintptr(unsafe.Pointer(pfIsConnected)),
-		uintptr(unsafe.Pointer(pDwGeneration)))
-	return HRESULT(ret)
-}
-
-// TODO: verify handling of variable arguments
-func DwmGetWindowAttribute(hWnd HWND, dwAttribute uint32) (pAttribute interface{}, result HRESULT) {
-	var pvAttribute, pvAttrSize uintptr
-	switch dwAttribute {
-	case DWMWA_NCRENDERING_ENABLED:
-		v := new(BOOL)
-		pAttribute = v
-		pvAttribute = uintptr(unsafe.Pointer(v))
-		pvAttrSize = unsafe.Sizeof(*v)
-	case DWMWA_CAPTION_BUTTON_BOUNDS, DWMWA_EXTENDED_FRAME_BOUNDS:
-		v := new(RECT)
-		pAttribute = v
-		pvAttribute = uintptr(unsafe.Pointer(v))
-		pvAttrSize = unsafe.Sizeof(*v)
-	case DWMWA_CLOAKED:
-		panic(fmt.Sprintf("DwmGetWindowAttribute(%d) is not currently supported.", dwAttribute))
-	default:
-		panic(fmt.Sprintf("DwmGetWindowAttribute(%d) is not valid.", dwAttribute))
-	}
-
-	ret, _, _ := procDwmGetWindowAttribute.Call(
-		uintptr(hWnd),
-		uintptr(dwAttribute),
-		pvAttribute,
-		pvAttrSize)
-	result = HRESULT(ret)
-	return
-}
-
-func DwmInvalidateIconicBitmaps(hWnd HWND) HRESULT {
-	ret, _, _ := procDwmInvalidateIconicBitmaps.Call(
-		uintptr(hWnd))
-	return HRESULT(ret)
-}
-
-func DwmIsCompositionEnabled(pfEnabled *BOOL) HRESULT {
-	ret, _, _ := procDwmIsCompositionEnabled.Call(
-		uintptr(unsafe.Pointer(pfEnabled)))
-	return HRESULT(ret)
-}
-
-func DwmModifyPreviousDxFrameDuration(hWnd HWND, cRefreshes int, fRelative bool) HRESULT {
-	ret, _, _ := procDwmModifyPreviousDxFrameDuration.Call(
-		uintptr(hWnd),
-		uintptr(cRefreshes),
-		uintptr(BoolToBOOL(fRelative)))
-	return HRESULT(ret)
-}
-
-func DwmQueryThumbnailSourceSize(hThumbnail HTHUMBNAIL, pSize *SIZE) HRESULT {
-	ret, _, _ := procDwmQueryThumbnailSourceSize.Call(
-		uintptr(hThumbnail),
-		uintptr(unsafe.Pointer(pSize)))
-	return HRESULT(ret)
-}
-
-func DwmRegisterThumbnail(hWndDestination HWND, hWndSource HWND, phThumbnailId *HTHUMBNAIL) HRESULT {
-	ret, _, _ := procDwmRegisterThumbnail.Call(
-		uintptr(hWndDestination),
-		uintptr(hWndSource),
-		uintptr(unsafe.Pointer(phThumbnailId)))
-	return HRESULT(ret)
-}
-
-func DwmRenderGesture(gt GESTURE_TYPE, cContacts uint, pdwPointerID *uint32, pPoints *POINT) {
-	procDwmRenderGesture.Call(
-		uintptr(gt),
-		uintptr(cContacts),
-		uintptr(unsafe.Pointer(pdwPointerID)),
-		uintptr(unsafe.Pointer(pPoints)))
-	return
-}
-
-func DwmSetDxFrameDuration(hWnd HWND, cRefreshes int) HRESULT {
-	ret, _, _ := procDwmSetDxFrameDuration.Call(
-		uintptr(hWnd),
-		uintptr(cRefreshes))
-	return HRESULT(ret)
-}
-
-func DwmSetIconicLivePreviewBitmap(hWnd HWND, hbmp HBITMAP, pptClient *POINT, dwSITFlags uint32) HRESULT {
-	ret, _, _ := procDwmSetIconicLivePreviewBitmap.Call(
-		uintptr(hWnd),
-		uintptr(hbmp),
-		uintptr(unsafe.Pointer(pptClient)),
-		uintptr(dwSITFlags))
-	return HRESULT(ret)
-}
-
-func DwmSetIconicThumbnail(hWnd HWND, hbmp HBITMAP, dwSITFlags uint32) HRESULT {
-	ret, _, _ := procDwmSetIconicThumbnail.Call(
-		uintptr(hWnd),
-		uintptr(hbmp),
-		uintptr(dwSITFlags))
-	return HRESULT(ret)
-}
-
-func DwmSetPresentParameters(hWnd HWND, pPresentParams *DWM_PRESENT_PARAMETERS) HRESULT {
-	ret, _, _ := procDwmSetPresentParameters.Call(
-		uintptr(hWnd),
-		uintptr(unsafe.Pointer(pPresentParams)))
-	return HRESULT(ret)
-}
-
-func DwmSetWindowAttribute(hWnd HWND, dwAttribute uint32, pvAttribute LPCVOID, cbAttribute uint32) HRESULT {
-	ret, _, _ := procDwmSetWindowAttribute.Call(
-		uintptr(hWnd),
-		uintptr(dwAttribute),
-		uintptr(pvAttribute),
-		uintptr(cbAttribute))
-	return HRESULT(ret)
-}
-
-func DwmShowContact(dwPointerID uint32, eShowContact DWM_SHOWCONTACT) {
-	procDwmShowContact.Call(
-		uintptr(dwPointerID),
-		uintptr(eShowContact))
-	return
-}
-
-func DwmTetherContact(dwPointerID uint32, fEnable bool, ptTether POINT) {
-	procDwmTetherContact.Call(
-		uintptr(dwPointerID),
-		uintptr(BoolToBOOL(fEnable)),
-		uintptr(unsafe.Pointer(&ptTether)))
-	return
-}
-
-func DwmTransitionOwnedWindow(hWnd HWND, target DWMTRANSITION_OWNEDWINDOW_TARGET) {
-	procDwmTransitionOwnedWindow.Call(
-		uintptr(hWnd),
-		uintptr(target))
-	return
-}
-
-func DwmUnregisterThumbnail(hThumbnailId HTHUMBNAIL) HRESULT {
-	ret, _, _ := procDwmUnregisterThumbnail.Call(
-		uintptr(hThumbnailId))
-	return HRESULT(ret)
-}
-
-func DwmUpdateThumbnailProperties(hThumbnailId HTHUMBNAIL, ptnProperties *DWM_THUMBNAIL_PROPERTIES) HRESULT {
-	ret, _, _ := procDwmUpdateThumbnailProperties.Call(
-		uintptr(hThumbnailId),
-		uintptr(unsafe.Pointer(ptnProperties)))
-	return HRESULT(ret)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/gdi32.go b/Godeps/_workspace/src/github.com/shirou/w32/gdi32.go
deleted file mode 100644
index 6f377e8e4c..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/gdi32.go
+++ /dev/null
@@ -1,509 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modgdi32 = syscall.NewLazyDLL("gdi32.dll")
-
-	procGetDeviceCaps             = modgdi32.NewProc("GetDeviceCaps")
-	procDeleteObject              = modgdi32.NewProc("DeleteObject")
-	procCreateFontIndirect        = modgdi32.NewProc("CreateFontIndirectW")
-	procAbortDoc                  = modgdi32.NewProc("AbortDoc")
-	procBitBlt                    = modgdi32.NewProc("BitBlt")
-	procCloseEnhMetaFile          = modgdi32.NewProc("CloseEnhMetaFile")
-	procCopyEnhMetaFile           = modgdi32.NewProc("CopyEnhMetaFileW")
-	procCreateBrushIndirect       = modgdi32.NewProc("CreateBrushIndirect")
-	procCreateCompatibleDC        = modgdi32.NewProc("CreateCompatibleDC")
-	procCreateDC                  = modgdi32.NewProc("CreateDCW")
-	procCreateDIBSection          = modgdi32.NewProc("CreateDIBSection")
-	procCreateEnhMetaFile         = modgdi32.NewProc("CreateEnhMetaFileW")
-	procCreateIC                  = modgdi32.NewProc("CreateICW")
-	procDeleteDC                  = modgdi32.NewProc("DeleteDC")
-	procDeleteEnhMetaFile         = modgdi32.NewProc("DeleteEnhMetaFile")
-	procEllipse                   = modgdi32.NewProc("Ellipse")
-	procEndDoc                    = modgdi32.NewProc("EndDoc")
-	procEndPage                   = modgdi32.NewProc("EndPage")
-	procExtCreatePen              = modgdi32.NewProc("ExtCreatePen")
-	procGetEnhMetaFile            = modgdi32.NewProc("GetEnhMetaFileW")
-	procGetEnhMetaFileHeader      = modgdi32.NewProc("GetEnhMetaFileHeader")
-	procGetObject                 = modgdi32.NewProc("GetObjectW")
-	procGetStockObject            = modgdi32.NewProc("GetStockObject")
-	procGetTextExtentExPoint      = modgdi32.NewProc("GetTextExtentExPointW")
-	procGetTextExtentPoint32      = modgdi32.NewProc("GetTextExtentPoint32W")
-	procGetTextMetrics            = modgdi32.NewProc("GetTextMetricsW")
-	procLineTo                    = modgdi32.NewProc("LineTo")
-	procMoveToEx                  = modgdi32.NewProc("MoveToEx")
-	procPlayEnhMetaFile           = modgdi32.NewProc("PlayEnhMetaFile")
-	procRectangle                 = modgdi32.NewProc("Rectangle")
-	procResetDC                   = modgdi32.NewProc("ResetDCW")
-	procSelectObject              = modgdi32.NewProc("SelectObject")
-	procSetBkMode                 = modgdi32.NewProc("SetBkMode")
-	procSetBrushOrgEx             = modgdi32.NewProc("SetBrushOrgEx")
-	procSetStretchBltMode         = modgdi32.NewProc("SetStretchBltMode")
-	procSetTextColor              = modgdi32.NewProc("SetTextColor")
-	procSetBkColor                = modgdi32.NewProc("SetBkColor")
-	procStartDoc                  = modgdi32.NewProc("StartDocW")
-	procStartPage                 = modgdi32.NewProc("StartPage")
-	procStretchBlt                = modgdi32.NewProc("StretchBlt")
-	procSetDIBitsToDevice         = modgdi32.NewProc("SetDIBitsToDevice")
-	procChoosePixelFormat         = modgdi32.NewProc("ChoosePixelFormat")
-	procDescribePixelFormat       = modgdi32.NewProc("DescribePixelFormat")
-	procGetEnhMetaFilePixelFormat = modgdi32.NewProc("GetEnhMetaFilePixelFormat")
-	procGetPixelFormat            = modgdi32.NewProc("GetPixelFormat")
-	procSetPixelFormat            = modgdi32.NewProc("SetPixelFormat")
-	procSwapBuffers               = modgdi32.NewProc("SwapBuffers")
-)
-
-func GetDeviceCaps(hdc HDC, index int) int {
-	ret, _, _ := procGetDeviceCaps.Call(
-		uintptr(hdc),
-		uintptr(index))
-
-	return int(ret)
-}
-
-func DeleteObject(hObject HGDIOBJ) bool {
-	ret, _, _ := procDeleteObject.Call(
-		uintptr(hObject))
-
-	return ret != 0
-}
-
-func CreateFontIndirect(logFont *LOGFONT) HFONT {
-	ret, _, _ := procCreateFontIndirect.Call(
-		uintptr(unsafe.Pointer(logFont)))
-
-	return HFONT(ret)
-}
-
-func AbortDoc(hdc HDC) int {
-	ret, _, _ := procAbortDoc.Call(
-		uintptr(hdc))
-
-	return int(ret)
-}
-
-func BitBlt(hdcDest HDC, nXDest, nYDest, nWidth, nHeight int, hdcSrc HDC, nXSrc, nYSrc int, dwRop uint) {
-	ret, _, _ := procBitBlt.Call(
-		uintptr(hdcDest),
-		uintptr(nXDest),
-		uintptr(nYDest),
-		uintptr(nWidth),
-		uintptr(nHeight),
-		uintptr(hdcSrc),
-		uintptr(nXSrc),
-		uintptr(nYSrc),
-		uintptr(dwRop))
-
-	if ret == 0 {
-		panic("BitBlt failed")
-	}
-}
-
-func CloseEnhMetaFile(hdc HDC) HENHMETAFILE {
-	ret, _, _ := procCloseEnhMetaFile.Call(
-		uintptr(hdc))
-
-	return HENHMETAFILE(ret)
-}
-
-func CopyEnhMetaFile(hemfSrc HENHMETAFILE, lpszFile *uint16) HENHMETAFILE {
-	ret, _, _ := procCopyEnhMetaFile.Call(
-		uintptr(hemfSrc),
-		uintptr(unsafe.Pointer(lpszFile)))
-
-	return HENHMETAFILE(ret)
-}
-
-func CreateBrushIndirect(lplb *LOGBRUSH) HBRUSH {
-	ret, _, _ := procCreateBrushIndirect.Call(
-		uintptr(unsafe.Pointer(lplb)))
-
-	return HBRUSH(ret)
-}
-
-func CreateCompatibleDC(hdc HDC) HDC {
-	ret, _, _ := procCreateCompatibleDC.Call(
-		uintptr(hdc))
-
-	if ret == 0 {
-		panic("Create compatible DC failed")
-	}
-
-	return HDC(ret)
-}
-
-func CreateDC(lpszDriver, lpszDevice, lpszOutput *uint16, lpInitData *DEVMODE) HDC {
-	ret, _, _ := procCreateDC.Call(
-		uintptr(unsafe.Pointer(lpszDriver)),
-		uintptr(unsafe.Pointer(lpszDevice)),
-		uintptr(unsafe.Pointer(lpszOutput)),
-		uintptr(unsafe.Pointer(lpInitData)))
-
-	return HDC(ret)
-}
-
-func CreateDIBSection(hdc HDC, pbmi *BITMAPINFO, iUsage uint, ppvBits *unsafe.Pointer, hSection HANDLE, dwOffset uint) HBITMAP {
-	ret, _, _ := procCreateDIBSection.Call(
-		uintptr(hdc),
-		uintptr(unsafe.Pointer(pbmi)),
-		uintptr(iUsage),
-		uintptr(unsafe.Pointer(ppvBits)),
-		uintptr(hSection),
-		uintptr(dwOffset))
-
-	return HBITMAP(ret)
-}
-
-func CreateEnhMetaFile(hdcRef HDC, lpFilename *uint16, lpRect *RECT, lpDescription *uint16) HDC {
-	ret, _, _ := procCreateEnhMetaFile.Call(
-		uintptr(hdcRef),
-		uintptr(unsafe.Pointer(lpFilename)),
-		uintptr(unsafe.Pointer(lpRect)),
-		uintptr(unsafe.Pointer(lpDescription)))
-
-	return HDC(ret)
-}
-
-func CreateIC(lpszDriver, lpszDevice, lpszOutput *uint16, lpdvmInit *DEVMODE) HDC {
-	ret, _, _ := procCreateIC.Call(
-		uintptr(unsafe.Pointer(lpszDriver)),
-		uintptr(unsafe.Pointer(lpszDevice)),
-		uintptr(unsafe.Pointer(lpszOutput)),
-		uintptr(unsafe.Pointer(lpdvmInit)))
-
-	return HDC(ret)
-}
-
-func DeleteDC(hdc HDC) bool {
-	ret, _, _ := procDeleteDC.Call(
-		uintptr(hdc))
-
-	return ret != 0
-}
-
-func DeleteEnhMetaFile(hemf HENHMETAFILE) bool {
-	ret, _, _ := procDeleteEnhMetaFile.Call(
-		uintptr(hemf))
-
-	return ret != 0
-}
-
-func Ellipse(hdc HDC, nLeftRect, nTopRect, nRightRect, nBottomRect int) bool {
-	ret, _, _ := procEllipse.Call(
-		uintptr(hdc),
-		uintptr(nLeftRect),
-		uintptr(nTopRect),
-		uintptr(nRightRect),
-		uintptr(nBottomRect))
-
-	return ret != 0
-}
-
-func EndDoc(hdc HDC) int {
-	ret, _, _ := procEndDoc.Call(
-		uintptr(hdc))
-
-	return int(ret)
-}
-
-func EndPage(hdc HDC) int {
-	ret, _, _ := procEndPage.Call(
-		uintptr(hdc))
-
-	return int(ret)
-}
-
-func ExtCreatePen(dwPenStyle, dwWidth uint, lplb *LOGBRUSH, dwStyleCount uint, lpStyle *uint) HPEN {
-	ret, _, _ := procExtCreatePen.Call(
-		uintptr(dwPenStyle),
-		uintptr(dwWidth),
-		uintptr(unsafe.Pointer(lplb)),
-		uintptr(dwStyleCount),
-		uintptr(unsafe.Pointer(lpStyle)))
-
-	return HPEN(ret)
-}
-
-func GetEnhMetaFile(lpszMetaFile *uint16) HENHMETAFILE {
-	ret, _, _ := procGetEnhMetaFile.Call(
-		uintptr(unsafe.Pointer(lpszMetaFile)))
-
-	return HENHMETAFILE(ret)
-}
-
-func GetEnhMetaFileHeader(hemf HENHMETAFILE, cbBuffer uint, lpemh *ENHMETAHEADER) uint {
-	ret, _, _ := procGetEnhMetaFileHeader.Call(
-		uintptr(hemf),
-		uintptr(cbBuffer),
-		uintptr(unsafe.Pointer(lpemh)))
-
-	return uint(ret)
-}
-
-func GetObject(hgdiobj HGDIOBJ, cbBuffer uintptr, lpvObject unsafe.Pointer) int {
-	ret, _, _ := procGetObject.Call(
-		uintptr(hgdiobj),
-		uintptr(cbBuffer),
-		uintptr(lpvObject))
-
-	return int(ret)
-}
-
-func GetStockObject(fnObject int) HGDIOBJ {
-	ret, _, _ := procGetDeviceCaps.Call(
-		uintptr(fnObject))
-
-	return HGDIOBJ(ret)
-}
-
-func GetTextExtentExPoint(hdc HDC, lpszStr *uint16, cchString, nMaxExtent int, lpnFit, alpDx *int, lpSize *SIZE) bool {
-	ret, _, _ := procGetTextExtentExPoint.Call(
-		uintptr(hdc),
-		uintptr(unsafe.Pointer(lpszStr)),
-		uintptr(cchString),
-		uintptr(nMaxExtent),
-		uintptr(unsafe.Pointer(lpnFit)),
-		uintptr(unsafe.Pointer(alpDx)),
-		uintptr(unsafe.Pointer(lpSize)))
-
-	return ret != 0
-}
-
-func GetTextExtentPoint32(hdc HDC, lpString *uint16, c int, lpSize *SIZE) bool {
-	ret, _, _ := procGetTextExtentPoint32.Call(
-		uintptr(hdc),
-		uintptr(unsafe.Pointer(lpString)),
-		uintptr(c),
-		uintptr(unsafe.Pointer(lpSize)))
-
-	return ret != 0
-}
-
-func GetTextMetrics(hdc HDC, lptm *TEXTMETRIC) bool {
-	ret, _, _ := procGetTextMetrics.Call(
-		uintptr(hdc),
-		uintptr(unsafe.Pointer(lptm)))
-
-	return ret != 0
-}
-
-func LineTo(hdc HDC, nXEnd, nYEnd int) bool {
-	ret, _, _ := procLineTo.Call(
-		uintptr(hdc),
-		uintptr(nXEnd),
-		uintptr(nYEnd))
-
-	return ret != 0
-}
-
-func MoveToEx(hdc HDC, x, y int, lpPoint *POINT) bool {
-	ret, _, _ := procMoveToEx.Call(
-		uintptr(hdc),
-		uintptr(x),
-		uintptr(y),
-		uintptr(unsafe.Pointer(lpPoint)))
-
-	return ret != 0
-}
-
-func PlayEnhMetaFile(hdc HDC, hemf HENHMETAFILE, lpRect *RECT) bool {
-	ret, _, _ := procPlayEnhMetaFile.Call(
-		uintptr(hdc),
-		uintptr(hemf),
-		uintptr(unsafe.Pointer(lpRect)))
-
-	return ret != 0
-}
-
-func Rectangle(hdc HDC, nLeftRect, nTopRect, nRightRect, nBottomRect int) bool {
-	ret, _, _ := procRectangle.Call(
-		uintptr(hdc),
-		uintptr(nLeftRect),
-		uintptr(nTopRect),
-		uintptr(nRightRect),
-		uintptr(nBottomRect))
-
-	return ret != 0
-}
-
-func ResetDC(hdc HDC, lpInitData *DEVMODE) HDC {
-	ret, _, _ := procResetDC.Call(
-		uintptr(hdc),
-		uintptr(unsafe.Pointer(lpInitData)))
-
-	return HDC(ret)
-}
-
-func SelectObject(hdc HDC, hgdiobj HGDIOBJ) HGDIOBJ {
-	ret, _, _ := procSelectObject.Call(
-		uintptr(hdc),
-		uintptr(hgdiobj))
-
-	if ret == 0 {
-		panic("SelectObject failed")
-	}
-
-	return HGDIOBJ(ret)
-}
-
-func SetBkMode(hdc HDC, iBkMode int) int {
-	ret, _, _ := procSetBkMode.Call(
-		uintptr(hdc),
-		uintptr(iBkMode))
-
-	if ret == 0 {
-		panic("SetBkMode failed")
-	}
-
-	return int(ret)
-}
-
-func SetBrushOrgEx(hdc HDC, nXOrg, nYOrg int, lppt *POINT) bool {
-	ret, _, _ := procSetBrushOrgEx.Call(
-		uintptr(hdc),
-		uintptr(nXOrg),
-		uintptr(nYOrg),
-		uintptr(unsafe.Pointer(lppt)))
-
-	return ret != 0
-}
-
-func SetStretchBltMode(hdc HDC, iStretchMode int) int {
-	ret, _, _ := procSetStretchBltMode.Call(
-		uintptr(hdc),
-		uintptr(iStretchMode))
-
-	return int(ret)
-}
-
-func SetTextColor(hdc HDC, crColor COLORREF) COLORREF {
-	ret, _, _ := procSetTextColor.Call(
-		uintptr(hdc),
-		uintptr(crColor))
-
-	if ret == CLR_INVALID {
-		panic("SetTextColor failed")
-	}
-
-	return COLORREF(ret)
-}
-
-func SetBkColor(hdc HDC, crColor COLORREF) COLORREF {
-	ret, _, _ := procSetBkColor.Call(
-		uintptr(hdc),
-		uintptr(crColor))
-
-	if ret == CLR_INVALID {
-		panic("SetBkColor failed")
-	}
-
-	return COLORREF(ret)
-}
-
-func StartDoc(hdc HDC, lpdi *DOCINFO) int {
-	ret, _, _ := procStartDoc.Call(
-		uintptr(hdc),
-		uintptr(unsafe.Pointer(lpdi)))
-
-	return int(ret)
-}
-
-func StartPage(hdc HDC) int {
-	ret, _, _ := procStartPage.Call(
-		uintptr(hdc))
-
-	return int(ret)
-}
-
-func StretchBlt(hdcDest HDC, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest int, hdcSrc HDC, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc int, dwRop uint) {
-	ret, _, _ := procStretchBlt.Call(
-		uintptr(hdcDest),
-		uintptr(nXOriginDest),
-		uintptr(nYOriginDest),
-		uintptr(nWidthDest),
-		uintptr(nHeightDest),
-		uintptr(hdcSrc),
-		uintptr(nXOriginSrc),
-		uintptr(nYOriginSrc),
-		uintptr(nWidthSrc),
-		uintptr(nHeightSrc),
-		uintptr(dwRop))
-
-	if ret == 0 {
-		panic("StretchBlt failed")
-	}
-}
-
-func SetDIBitsToDevice(hdc HDC, xDest, yDest, dwWidth, dwHeight, xSrc, ySrc int, uStartScan, cScanLines uint, lpvBits []byte, lpbmi *BITMAPINFO, fuColorUse uint) int {
-	ret, _, _ := procSetDIBitsToDevice.Call(
-		uintptr(hdc),
-		uintptr(xDest),
-		uintptr(yDest),
-		uintptr(dwWidth),
-		uintptr(dwHeight),
-		uintptr(xSrc),
-		uintptr(ySrc),
-		uintptr(uStartScan),
-		uintptr(cScanLines),
-		uintptr(unsafe.Pointer(&lpvBits[0])),
-		uintptr(unsafe.Pointer(lpbmi)),
-		uintptr(fuColorUse))
-
-	return int(ret)
-}
-
-func ChoosePixelFormat(hdc HDC, pfd *PIXELFORMATDESCRIPTOR) int {
-	ret, _, _ := procChoosePixelFormat.Call(
-		uintptr(hdc),
-		uintptr(unsafe.Pointer(pfd)),
-	)
-	return int(ret)
-}
-
-func DescribePixelFormat(hdc HDC, iPixelFormat int, nBytes uint, pfd *PIXELFORMATDESCRIPTOR) int {
-	ret, _, _ := procDescribePixelFormat.Call(
-		uintptr(hdc),
-		uintptr(iPixelFormat),
-		uintptr(nBytes),
-		uintptr(unsafe.Pointer(pfd)),
-	)
-	return int(ret)
-}
-
-func GetEnhMetaFilePixelFormat(hemf HENHMETAFILE, cbBuffer uint32, pfd *PIXELFORMATDESCRIPTOR) uint {
-	ret, _, _ := procGetEnhMetaFilePixelFormat.Call(
-		uintptr(hemf),
-		uintptr(cbBuffer),
-		uintptr(unsafe.Pointer(pfd)),
-	)
-	return uint(ret)
-}
-
-func GetPixelFormat(hdc HDC) int {
-	ret, _, _ := procGetPixelFormat.Call(
-		uintptr(hdc),
-	)
-	return int(ret)
-}
-
-func SetPixelFormat(hdc HDC, iPixelFormat int, pfd *PIXELFORMATDESCRIPTOR) bool {
-	ret, _, _ := procSetPixelFormat.Call(
-		uintptr(hdc),
-		uintptr(iPixelFormat),
-		uintptr(unsafe.Pointer(pfd)),
-	)
-	return ret == TRUE
-}
-
-func SwapBuffers(hdc HDC) bool {
-	ret, _, _ := procSwapBuffers.Call(uintptr(hdc))
-	return ret == TRUE
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/gdiplus.go b/Godeps/_workspace/src/github.com/shirou/w32/gdiplus.go
deleted file mode 100644
index f3a8fca4d1..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/gdiplus.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"errors"
-	"fmt"
-	"syscall"
-	"unsafe"
-)
-
-const (
-	Ok                        = 0
-	GenericError              = 1
-	InvalidParameter          = 2
-	OutOfMemory               = 3
-	ObjectBusy                = 4
-	InsufficientBuffer        = 5
-	NotImplemented            = 6
-	Win32Error                = 7
-	WrongState                = 8
-	Aborted                   = 9
-	FileNotFound              = 10
-	ValueOverflow             = 11
-	AccessDenied              = 12
-	UnknownImageFormat        = 13
-	FontFamilyNotFound        = 14
-	FontStyleNotFound         = 15
-	NotTrueTypeFont           = 16
-	UnsupportedGdiplusVersion = 17
-	GdiplusNotInitialized     = 18
-	PropertyNotFound          = 19
-	PropertyNotSupported      = 20
-	ProfileNotFound           = 21
-)
-
-func GetGpStatus(s int32) string {
-	switch s {
-	case Ok:
-		return "Ok"
-	case GenericError:
-		return "GenericError"
-	case InvalidParameter:
-		return "InvalidParameter"
-	case OutOfMemory:
-		return "OutOfMemory"
-	case ObjectBusy:
-		return "ObjectBusy"
-	case InsufficientBuffer:
-		return "InsufficientBuffer"
-	case NotImplemented:
-		return "NotImplemented"
-	case Win32Error:
-		return "Win32Error"
-	case WrongState:
-		return "WrongState"
-	case Aborted:
-		return "Aborted"
-	case FileNotFound:
-		return "FileNotFound"
-	case ValueOverflow:
-		return "ValueOverflow"
-	case AccessDenied:
-		return "AccessDenied"
-	case UnknownImageFormat:
-		return "UnknownImageFormat"
-	case FontFamilyNotFound:
-		return "FontFamilyNotFound"
-	case FontStyleNotFound:
-		return "FontStyleNotFound"
-	case NotTrueTypeFont:
-		return "NotTrueTypeFont"
-	case UnsupportedGdiplusVersion:
-		return "UnsupportedGdiplusVersion"
-	case GdiplusNotInitialized:
-		return "GdiplusNotInitialized"
-	case PropertyNotFound:
-		return "PropertyNotFound"
-	case PropertyNotSupported:
-		return "PropertyNotSupported"
-	case ProfileNotFound:
-		return "ProfileNotFound"
-	}
-	return "Unknown Status Value"
-}
-
-var (
-	token uintptr
-
-	modgdiplus = syscall.NewLazyDLL("gdiplus.dll")
-
-	procGdipCreateBitmapFromFile     = modgdiplus.NewProc("GdipCreateBitmapFromFile")
-	procGdipCreateBitmapFromHBITMAP  = modgdiplus.NewProc("GdipCreateBitmapFromHBITMAP")
-	procGdipCreateHBITMAPFromBitmap  = modgdiplus.NewProc("GdipCreateHBITMAPFromBitmap")
-	procGdipCreateBitmapFromResource = modgdiplus.NewProc("GdipCreateBitmapFromResource")
-	procGdipCreateBitmapFromStream   = modgdiplus.NewProc("GdipCreateBitmapFromStream")
-	procGdipDisposeImage             = modgdiplus.NewProc("GdipDisposeImage")
-	procGdiplusShutdown              = modgdiplus.NewProc("GdiplusShutdown")
-	procGdiplusStartup               = modgdiplus.NewProc("GdiplusStartup")
-)
-
-func GdipCreateBitmapFromFile(filename string) (*uintptr, error) {
-	var bitmap *uintptr
-	ret, _, _ := procGdipCreateBitmapFromFile.Call(
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(filename))),
-		uintptr(unsafe.Pointer(&bitmap)))
-
-	if ret != Ok {
-		return nil, errors.New(fmt.Sprintf("GdipCreateBitmapFromFile failed with status '%s' for file '%s'", GetGpStatus(int32(ret)), filename))
-	}
-
-	return bitmap, nil
-}
-
-func GdipCreateBitmapFromResource(instance HINSTANCE, resId *uint16) (*uintptr, error) {
-	var bitmap *uintptr
-	ret, _, _ := procGdipCreateBitmapFromResource.Call(
-		uintptr(instance),
-		uintptr(unsafe.Pointer(resId)),
-		uintptr(unsafe.Pointer(&bitmap)))
-
-	if ret != Ok {
-		return nil, errors.New(fmt.Sprintf("GdiCreateBitmapFromResource failed with status '%s'", GetGpStatus(int32(ret))))
-	}
-
-	return bitmap, nil
-}
-
-func GdipCreateBitmapFromStream(stream *IStream) (*uintptr, error) {
-	var bitmap *uintptr
-	ret, _, _ := procGdipCreateBitmapFromStream.Call(
-		uintptr(unsafe.Pointer(stream)),
-		uintptr(unsafe.Pointer(&bitmap)))
-
-	if ret != Ok {
-		return nil, errors.New(fmt.Sprintf("GdipCreateBitmapFromStream failed with status '%s'", GetGpStatus(int32(ret))))
-	}
-
-	return bitmap, nil
-}
-
-func GdipCreateHBITMAPFromBitmap(bitmap *uintptr, background uint32) (HBITMAP, error) {
-	var hbitmap HBITMAP
-	ret, _, _ := procGdipCreateHBITMAPFromBitmap.Call(
-		uintptr(unsafe.Pointer(bitmap)),
-		uintptr(unsafe.Pointer(&hbitmap)),
-		uintptr(background))
-
-	if ret != Ok {
-		return 0, errors.New(fmt.Sprintf("GdipCreateHBITMAPFromBitmap failed with status '%s'", GetGpStatus(int32(ret))))
-	}
-
-	return hbitmap, nil
-}
-
-func GdipDisposeImage(image *uintptr) {
-	procGdipDisposeImage.Call(uintptr(unsafe.Pointer(image)))
-}
-
-func GdiplusShutdown() {
-	procGdiplusShutdown.Call(token)
-}
-
-func GdiplusStartup(input *GdiplusStartupInput, output *GdiplusStartupOutput) {
-	ret, _, _ := procGdiplusStartup.Call(
-		uintptr(unsafe.Pointer(&token)),
-		uintptr(unsafe.Pointer(input)),
-		uintptr(unsafe.Pointer(output)))
-
-	if ret != Ok {
-		panic("GdiplusStartup failed with status " + GetGpStatus(int32(ret)))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/idispatch.go b/Godeps/_workspace/src/github.com/shirou/w32/idispatch.go
deleted file mode 100644
index 41634a6488..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/idispatch.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"unsafe"
-)
-
-type pIDispatchVtbl struct {
-	pQueryInterface   uintptr
-	pAddRef           uintptr
-	pRelease          uintptr
-	pGetTypeInfoCount uintptr
-	pGetTypeInfo      uintptr
-	pGetIDsOfNames    uintptr
-	pInvoke           uintptr
-}
-
-type IDispatch struct {
-	lpVtbl *pIDispatchVtbl
-}
-
-func (this *IDispatch) QueryInterface(id *GUID) *IDispatch {
-	return ComQueryInterface((*IUnknown)(unsafe.Pointer(this)), id)
-}
-
-func (this *IDispatch) AddRef() int32 {
-	return ComAddRef((*IUnknown)(unsafe.Pointer(this)))
-}
-
-func (this *IDispatch) Release() int32 {
-	return ComRelease((*IUnknown)(unsafe.Pointer(this)))
-}
-
-func (this *IDispatch) GetIDsOfName(names []string) []int32 {
-	return ComGetIDsOfName(this, names)
-}
-
-func (this *IDispatch) Invoke(dispid int32, dispatch int16, params ...interface{}) *VARIANT {
-	return ComInvoke(this, dispid, dispatch, params...)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/istream.go b/Godeps/_workspace/src/github.com/shirou/w32/istream.go
deleted file mode 100644
index 2b840c3b09..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/istream.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"unsafe"
-)
-
-type pIStreamVtbl struct {
-	pQueryInterface uintptr
-	pAddRef         uintptr
-	pRelease        uintptr
-}
-
-type IStream struct {
-	lpVtbl *pIStreamVtbl
-}
-
-func (this *IStream) QueryInterface(id *GUID) *IDispatch {
-	return ComQueryInterface((*IUnknown)(unsafe.Pointer(this)), id)
-}
-
-func (this *IStream) AddRef() int32 {
-	return ComAddRef((*IUnknown)(unsafe.Pointer(this)))
-}
-
-func (this *IStream) Release() int32 {
-	return ComRelease((*IUnknown)(unsafe.Pointer(this)))
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/iunknown.go b/Godeps/_workspace/src/github.com/shirou/w32/iunknown.go
deleted file mode 100644
index d63ff1bbca..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/iunknown.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-type pIUnknownVtbl struct {
-	pQueryInterface uintptr
-	pAddRef         uintptr
-	pRelease        uintptr
-}
-
-type IUnknown struct {
-	lpVtbl *pIUnknownVtbl
-}
-
-func (this *IUnknown) QueryInterface(id *GUID) *IDispatch {
-	return ComQueryInterface(this, id)
-}
-
-func (this *IUnknown) AddRef() int32 {
-	return ComAddRef(this)
-}
-
-func (this *IUnknown) Release() int32 {
-	return ComRelease(this)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/kernel32.go b/Godeps/_workspace/src/github.com/shirou/w32/kernel32.go
deleted file mode 100644
index 891ec1578b..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/kernel32.go
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modkernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-	procGetModuleHandle            = modkernel32.NewProc("GetModuleHandleW")
-	procMulDiv                     = modkernel32.NewProc("MulDiv")
-	procGetConsoleWindow           = modkernel32.NewProc("GetConsoleWindow")
-	procGetCurrentThread           = modkernel32.NewProc("GetCurrentThread")
-	procGetLogicalDrives           = modkernel32.NewProc("GetLogicalDrives")
-	procGetUserDefaultLCID         = modkernel32.NewProc("GetUserDefaultLCID")
-	procLstrlen                    = modkernel32.NewProc("lstrlenW")
-	procLstrcpy                    = modkernel32.NewProc("lstrcpyW")
-	procGlobalAlloc                = modkernel32.NewProc("GlobalAlloc")
-	procGlobalFree                 = modkernel32.NewProc("GlobalFree")
-	procGlobalLock                 = modkernel32.NewProc("GlobalLock")
-	procGlobalUnlock               = modkernel32.NewProc("GlobalUnlock")
-	procMoveMemory                 = modkernel32.NewProc("RtlMoveMemory")
-	procFindResource               = modkernel32.NewProc("FindResourceW")
-	procSizeofResource             = modkernel32.NewProc("SizeofResource")
-	procLockResource               = modkernel32.NewProc("LockResource")
-	procLoadResource               = modkernel32.NewProc("LoadResource")
-	procGetLastError               = modkernel32.NewProc("GetLastError")
-	procOpenProcess                = modkernel32.NewProc("OpenProcess")
-	procTerminateProcess           = modkernel32.NewProc("TerminateProcess")
-	procCloseHandle                = modkernel32.NewProc("CloseHandle")
-	procCreateToolhelp32Snapshot   = modkernel32.NewProc("CreateToolhelp32Snapshot")
-	procModule32First              = modkernel32.NewProc("Module32FirstW")
-	procModule32Next               = modkernel32.NewProc("Module32NextW")
-	procProcess32First             = modkernel32.NewProc("Process32FirstW")
-	procProcess32Next              = modkernel32.NewProc("Process32NextW")
-	procGetSystemTimes             = modkernel32.NewProc("GetSystemTimes")
-	procGetConsoleScreenBufferInfo = modkernel32.NewProc("GetConsoleScreenBufferInfo")
-	procSetConsoleTextAttribute    = modkernel32.NewProc("SetConsoleTextAttribute")
-	procGetDiskFreeSpaceEx         = modkernel32.NewProc("GetDiskFreeSpaceExW")
-	procGetProcessTimes            = modkernel32.NewProc("GetProcessTimes")
-)
-
-func GetModuleHandle(modulename string) HINSTANCE {
-	var mn uintptr
-	if modulename == "" {
-		mn = 0
-	} else {
-		mn = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(modulename)))
-	}
-	ret, _, _ := procGetModuleHandle.Call(mn)
-	return HINSTANCE(ret)
-}
-
-func MulDiv(number, numerator, denominator int) int {
-	ret, _, _ := procMulDiv.Call(
-		uintptr(number),
-		uintptr(numerator),
-		uintptr(denominator))
-
-	return int(ret)
-}
-
-func GetConsoleWindow() HWND {
-	ret, _, _ := procGetConsoleWindow.Call()
-
-	return HWND(ret)
-}
-
-func GetCurrentThread() HANDLE {
-	ret, _, _ := procGetCurrentThread.Call()
-
-	return HANDLE(ret)
-}
-
-func GetLogicalDrives() uint32 {
-	ret, _, _ := procGetLogicalDrives.Call()
-
-	return uint32(ret)
-}
-
-func GetUserDefaultLCID() uint32 {
-	ret, _, _ := procGetUserDefaultLCID.Call()
-
-	return uint32(ret)
-}
-
-func Lstrlen(lpString *uint16) int {
-	ret, _, _ := procLstrlen.Call(uintptr(unsafe.Pointer(lpString)))
-
-	return int(ret)
-}
-
-func Lstrcpy(buf []uint16, lpString *uint16) {
-	procLstrcpy.Call(
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(lpString)))
-}
-
-func GlobalAlloc(uFlags uint, dwBytes uint32) HGLOBAL {
-	ret, _, _ := procGlobalAlloc.Call(
-		uintptr(uFlags),
-		uintptr(dwBytes))
-
-	if ret == 0 {
-		panic("GlobalAlloc failed")
-	}
-
-	return HGLOBAL(ret)
-}
-
-func GlobalFree(hMem HGLOBAL) {
-	ret, _, _ := procGlobalFree.Call(uintptr(hMem))
-
-	if ret != 0 {
-		panic("GlobalFree failed")
-	}
-}
-
-func GlobalLock(hMem HGLOBAL) unsafe.Pointer {
-	ret, _, _ := procGlobalLock.Call(uintptr(hMem))
-
-	if ret == 0 {
-		panic("GlobalLock failed")
-	}
-
-	return unsafe.Pointer(ret)
-}
-
-func GlobalUnlock(hMem HGLOBAL) bool {
-	ret, _, _ := procGlobalUnlock.Call(uintptr(hMem))
-
-	return ret != 0
-}
-
-func MoveMemory(destination, source unsafe.Pointer, length uint32) {
-	procMoveMemory.Call(
-		uintptr(unsafe.Pointer(destination)),
-		uintptr(source),
-		uintptr(length))
-}
-
-func FindResource(hModule HMODULE, lpName, lpType *uint16) (HRSRC, error) {
-	ret, _, _ := procFindResource.Call(
-		uintptr(hModule),
-		uintptr(unsafe.Pointer(lpName)),
-		uintptr(unsafe.Pointer(lpType)))
-
-	if ret == 0 {
-		return 0, syscall.GetLastError()
-	}
-
-	return HRSRC(ret), nil
-}
-
-func SizeofResource(hModule HMODULE, hResInfo HRSRC) uint32 {
-	ret, _, _ := procSizeofResource.Call(
-		uintptr(hModule),
-		uintptr(hResInfo))
-
-	if ret == 0 {
-		panic("SizeofResource failed")
-	}
-
-	return uint32(ret)
-}
-
-func LockResource(hResData HGLOBAL) unsafe.Pointer {
-	ret, _, _ := procLockResource.Call(uintptr(hResData))
-
-	if ret == 0 {
-		panic("LockResource failed")
-	}
-
-	return unsafe.Pointer(ret)
-}
-
-func LoadResource(hModule HMODULE, hResInfo HRSRC) HGLOBAL {
-	ret, _, _ := procLoadResource.Call(
-		uintptr(hModule),
-		uintptr(hResInfo))
-
-	if ret == 0 {
-		panic("LoadResource failed")
-	}
-
-	return HGLOBAL(ret)
-}
-
-func GetLastError() uint32 {
-	ret, _, _ := procGetLastError.Call()
-	return uint32(ret)
-}
-
-func OpenProcess(desiredAccess uint32, inheritHandle bool, processId uint32) HANDLE {
-	inherit := 0
-	if inheritHandle {
-		inherit = 1
-	}
-
-	ret, _, _ := procOpenProcess.Call(
-		uintptr(desiredAccess),
-		uintptr(inherit),
-		uintptr(processId))
-	return HANDLE(ret)
-}
-
-func TerminateProcess(hProcess HANDLE, uExitCode uint) bool {
-	ret, _, _ := procTerminateProcess.Call(
-		uintptr(hProcess),
-		uintptr(uExitCode))
-	return ret != 0
-}
-
-func CloseHandle(object HANDLE) bool {
-	ret, _, _ := procCloseHandle.Call(
-		uintptr(object))
-	return ret != 0
-}
-
-func CreateToolhelp32Snapshot(flags, processId uint32) HANDLE {
-	ret, _, _ := procCreateToolhelp32Snapshot.Call(
-		uintptr(flags),
-		uintptr(processId))
-
-	if ret <= 0 {
-		return HANDLE(0)
-	}
-
-	return HANDLE(ret)
-}
-
-func Module32First(snapshot HANDLE, me *MODULEENTRY32) bool {
-	ret, _, _ := procModule32First.Call(
-		uintptr(snapshot),
-		uintptr(unsafe.Pointer(me)))
-
-	return ret != 0
-}
-
-func Module32Next(snapshot HANDLE, me *MODULEENTRY32) bool {
-	ret, _, _ := procModule32Next.Call(
-		uintptr(snapshot),
-		uintptr(unsafe.Pointer(me)))
-
-	return ret != 0
-}
-func Process32First(snapshot HANDLE, pe *PROCESSENTRY32) bool {
-	ret, _, _ := procProcess32First.Call(
-		uintptr(snapshot),
-		uintptr(unsafe.Pointer(pe)))
-
-	return ret != 0
-}
-
-func Process32Next(snapshot HANDLE, pe *PROCESSENTRY32) bool {
-	ret, _, _ := procProcess32Next.Call(
-		uintptr(snapshot),
-		uintptr(unsafe.Pointer(pe)))
-
-	return ret != 0
-}
-func GetSystemTimes(lpIdleTime, lpKernelTime, lpUserTime *FILETIME) bool {
-	ret, _, _ := procGetSystemTimes.Call(
-		uintptr(unsafe.Pointer(lpIdleTime)),
-		uintptr(unsafe.Pointer(lpKernelTime)),
-		uintptr(unsafe.Pointer(lpUserTime)))
-
-	return ret != 0
-}
-
-func GetProcessTimes(hProcess HANDLE, lpCreationTime, lpExitTime, lpKernelTime, lpUserTime *FILETIME) bool {
-	ret, _, _ := procGetProcessTimes.Call(
-		uintptr(hProcess),
-		uintptr(unsafe.Pointer(lpCreationTime)),
-		uintptr(unsafe.Pointer(lpExitTime)),
-		uintptr(unsafe.Pointer(lpKernelTime)),
-		uintptr(unsafe.Pointer(lpUserTime)))
-
-	return ret != 0
-}
-
-func GetConsoleScreenBufferInfo(hConsoleOutput HANDLE) *CONSOLE_SCREEN_BUFFER_INFO {
-	var csbi CONSOLE_SCREEN_BUFFER_INFO
-	ret, _, _ := procGetConsoleScreenBufferInfo.Call(
-		uintptr(hConsoleOutput),
-		uintptr(unsafe.Pointer(&csbi)))
-	if ret == 0 {
-		return nil
-	}
-	return &csbi
-}
-
-func SetConsoleTextAttribute(hConsoleOutput HANDLE, wAttributes uint16) bool {
-	ret, _, _ := procSetConsoleTextAttribute.Call(
-		uintptr(hConsoleOutput),
-		uintptr(wAttributes))
-	return ret != 0
-}
-
-func GetDiskFreeSpaceEx(dirName string) (r bool,
-	freeBytesAvailable, totalNumberOfBytes, totalNumberOfFreeBytes uint64) {
-	ret, _, _ := procGetDiskFreeSpaceEx.Call(
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(dirName))),
-		uintptr(unsafe.Pointer(&freeBytesAvailable)),
-		uintptr(unsafe.Pointer(&totalNumberOfBytes)),
-		uintptr(unsafe.Pointer(&totalNumberOfFreeBytes)))
-	return ret != 0,
-		freeBytesAvailable, totalNumberOfBytes, totalNumberOfFreeBytes
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/ole32.go b/Godeps/_workspace/src/github.com/shirou/w32/ole32.go
deleted file mode 100644
index a7f79b550d..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/ole32.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modole32 = syscall.NewLazyDLL("ole32.dll")
-
-	procCoInitializeEx        = modole32.NewProc("CoInitializeEx")
-	procCoInitialize          = modole32.NewProc("CoInitialize")
-	procCoUninitialize        = modole32.NewProc("CoUninitialize")
-	procCreateStreamOnHGlobal = modole32.NewProc("CreateStreamOnHGlobal")
-)
-
-func CoInitializeEx(coInit uintptr) HRESULT {
-	ret, _, _ := procCoInitializeEx.Call(
-		0,
-		coInit)
-
-	switch uint32(ret) {
-	case E_INVALIDARG:
-		panic("CoInitializeEx failed with E_INVALIDARG")
-	case E_OUTOFMEMORY:
-		panic("CoInitializeEx failed with E_OUTOFMEMORY")
-	case E_UNEXPECTED:
-		panic("CoInitializeEx failed with E_UNEXPECTED")
-	}
-
-	return HRESULT(ret)
-}
-
-func CoInitialize() {
-	procCoInitialize.Call(0)
-}
-
-func CoUninitialize() {
-	procCoUninitialize.Call()
-}
-
-func CreateStreamOnHGlobal(hGlobal HGLOBAL, fDeleteOnRelease bool) *IStream {
-	stream := new(IStream)
-	ret, _, _ := procCreateStreamOnHGlobal.Call(
-		uintptr(hGlobal),
-		uintptr(BoolToBOOL(fDeleteOnRelease)),
-		uintptr(unsafe.Pointer(&stream)))
-
-	switch uint32(ret) {
-	case E_INVALIDARG:
-		panic("CreateStreamOnHGlobal failed with E_INVALIDARG")
-	case E_OUTOFMEMORY:
-		panic("CreateStreamOnHGlobal failed with E_OUTOFMEMORY")
-	case E_UNEXPECTED:
-		panic("CreateStreamOnHGlobal failed with E_UNEXPECTED")
-	}
-
-	return stream
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/oleaut32.go b/Godeps/_workspace/src/github.com/shirou/w32/oleaut32.go
deleted file mode 100644
index 0eeeab7246..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/oleaut32.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modoleaut32 = syscall.NewLazyDLL("oleaut32")
-
-	procVariantInit        = modoleaut32.NewProc("VariantInit")
-	procSysAllocString     = modoleaut32.NewProc("SysAllocString")
-	procSysFreeString      = modoleaut32.NewProc("SysFreeString")
-	procSysStringLen       = modoleaut32.NewProc("SysStringLen")
-	procCreateDispTypeInfo = modoleaut32.NewProc("CreateDispTypeInfo")
-	procCreateStdDispatch  = modoleaut32.NewProc("CreateStdDispatch")
-)
-
-func VariantInit(v *VARIANT) {
-	hr, _, _ := procVariantInit.Call(uintptr(unsafe.Pointer(v)))
-	if hr != 0 {
-		panic("Invoke VariantInit error.")
-	}
-	return
-}
-
-func SysAllocString(v string) (ss *int16) {
-	pss, _, _ := procSysAllocString.Call(uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(v))))
-	ss = (*int16)(unsafe.Pointer(pss))
-	return
-}
-
-func SysFreeString(v *int16) {
-	hr, _, _ := procSysFreeString.Call(uintptr(unsafe.Pointer(v)))
-	if hr != 0 {
-		panic("Invoke SysFreeString error.")
-	}
-	return
-}
-
-func SysStringLen(v *int16) uint {
-	l, _, _ := procSysStringLen.Call(uintptr(unsafe.Pointer(v)))
-	return uint(l)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/opengl32.go b/Godeps/_workspace/src/github.com/shirou/w32/opengl32.go
deleted file mode 100644
index 7363bb10ad..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/opengl32.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modopengl32 = syscall.NewLazyDLL("opengl32.dll")
-
-	procwglCreateContext      = modopengl32.NewProc("wglCreateContext")
-	procwglCreateLayerContext = modopengl32.NewProc("wglCreateLayerContext")
-	procwglDeleteContext      = modopengl32.NewProc("wglDeleteContext")
-	procwglGetProcAddress     = modopengl32.NewProc("wglGetProcAddress")
-	procwglMakeCurrent        = modopengl32.NewProc("wglMakeCurrent")
-	procwglShareLists         = modopengl32.NewProc("wglShareLists")
-)
-
-func WglCreateContext(hdc HDC) HGLRC {
-	ret, _, _ := procwglCreateContext.Call(
-		uintptr(hdc),
-	)
-
-	return HGLRC(ret)
-}
-
-func WglCreateLayerContext(hdc HDC, iLayerPlane int) HGLRC {
-	ret, _, _ := procwglCreateLayerContext.Call(
-		uintptr(hdc),
-		uintptr(iLayerPlane),
-	)
-
-	return HGLRC(ret)
-}
-
-func WglDeleteContext(hglrc HGLRC) bool {
-	ret, _, _ := procwglDeleteContext.Call(
-		uintptr(hglrc),
-	)
-
-	return ret == TRUE
-}
-
-func WglGetProcAddress(szProc string) uintptr {
-	ret, _, _ := procwglGetProcAddress.Call(
-		uintptr(unsafe.Pointer(syscall.StringBytePtr(szProc))),
-	)
-
-	return ret
-}
-
-func WglMakeCurrent(hdc HDC, hglrc HGLRC) bool {
-	ret, _, _ := procwglMakeCurrent.Call(
-		uintptr(hdc),
-		uintptr(hglrc),
-	)
-
-	return ret == TRUE
-}
-
-func WglShareLists(hglrc1, hglrc2 HGLRC) bool {
-	ret, _, _ := procwglShareLists.Call(
-		uintptr(hglrc1),
-		uintptr(hglrc2),
-	)
-
-	return ret == TRUE
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/psapi.go b/Godeps/_workspace/src/github.com/shirou/w32/psapi.go
deleted file mode 100644
index bd1e12627c..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/psapi.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modpsapi = syscall.NewLazyDLL("psapi.dll")
-
-	procEnumProcesses = modpsapi.NewProc("EnumProcesses")
-)
-
-func EnumProcesses(processIds []uint32, cb uint32, bytesReturned *uint32) bool {
-	ret, _, _ := procEnumProcesses.Call(
-		uintptr(unsafe.Pointer(&processIds[0])),
-		uintptr(cb),
-		uintptr(unsafe.Pointer(bytesReturned)))
-
-	return ret != 0
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/shell32.go b/Godeps/_workspace/src/github.com/shirou/w32/shell32.go
deleted file mode 100644
index 0923b8b61d..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/shell32.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"errors"
-	"fmt"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modshell32 = syscall.NewLazyDLL("shell32.dll")
-
-	procSHBrowseForFolder   = modshell32.NewProc("SHBrowseForFolderW")
-	procSHGetPathFromIDList = modshell32.NewProc("SHGetPathFromIDListW")
-	procDragAcceptFiles     = modshell32.NewProc("DragAcceptFiles")
-	procDragQueryFile       = modshell32.NewProc("DragQueryFileW")
-	procDragQueryPoint      = modshell32.NewProc("DragQueryPoint")
-	procDragFinish          = modshell32.NewProc("DragFinish")
-	procShellExecute        = modshell32.NewProc("ShellExecuteW")
-	procExtractIcon         = modshell32.NewProc("ExtractIconW")
-)
-
-func SHBrowseForFolder(bi *BROWSEINFO) uintptr {
-	ret, _, _ := procSHBrowseForFolder.Call(uintptr(unsafe.Pointer(bi)))
-
-	return ret
-}
-
-func SHGetPathFromIDList(idl uintptr) string {
-	buf := make([]uint16, 1024)
-	procSHGetPathFromIDList.Call(
-		idl,
-		uintptr(unsafe.Pointer(&buf[0])))
-
-	return syscall.UTF16ToString(buf)
-}
-
-func DragAcceptFiles(hwnd HWND, accept bool) {
-	procDragAcceptFiles.Call(
-		uintptr(hwnd),
-		uintptr(BoolToBOOL(accept)))
-}
-
-func DragQueryFile(hDrop HDROP, iFile uint) (fileName string, fileCount uint) {
-	ret, _, _ := procDragQueryFile.Call(
-		uintptr(hDrop),
-		uintptr(iFile),
-		0,
-		0)
-
-	fileCount = uint(ret)
-
-	if iFile != 0xFFFFFFFF {
-		buf := make([]uint16, fileCount+1)
-
-		ret, _, _ := procDragQueryFile.Call(
-			uintptr(hDrop),
-			uintptr(iFile),
-			uintptr(unsafe.Pointer(&buf[0])),
-			uintptr(fileCount+1))
-
-		if ret == 0 {
-			panic("Invoke DragQueryFile error.")
-		}
-
-		fileName = syscall.UTF16ToString(buf)
-	}
-
-	return
-}
-
-func DragQueryPoint(hDrop HDROP) (x, y int, isClientArea bool) {
-	var pt POINT
-	ret, _, _ := procDragQueryPoint.Call(
-		uintptr(hDrop),
-		uintptr(unsafe.Pointer(&pt)))
-
-	return int(pt.X), int(pt.Y), (ret == 1)
-}
-
-func DragFinish(hDrop HDROP) {
-	procDragFinish.Call(uintptr(hDrop))
-}
-
-func ShellExecute(hwnd HWND, lpOperation, lpFile, lpParameters, lpDirectory string, nShowCmd int) error {
-	var op, param, directory uintptr
-	if len(lpOperation) != 0 {
-		op = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpOperation)))
-	}
-	if len(lpParameters) != 0 {
-		param = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpParameters)))
-	}
-	if len(lpDirectory) != 0 {
-		directory = uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpDirectory)))
-	}
-
-	ret, _, _ := procShellExecute.Call(
-		uintptr(hwnd),
-		op,
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpFile))),
-		param,
-		directory,
-		uintptr(nShowCmd))
-
-	errorMsg := ""
-	if ret != 0 && ret <= 32 {
-		switch int(ret) {
-		case ERROR_FILE_NOT_FOUND:
-			errorMsg = "The specified file was not found."
-		case ERROR_PATH_NOT_FOUND:
-			errorMsg = "The specified path was not found."
-		case ERROR_BAD_FORMAT:
-			errorMsg = "The .exe file is invalid (non-Win32 .exe or error in .exe image)."
-		case SE_ERR_ACCESSDENIED:
-			errorMsg = "The operating system denied access to the specified file."
-		case SE_ERR_ASSOCINCOMPLETE:
-			errorMsg = "The file name association is incomplete or invalid."
-		case SE_ERR_DDEBUSY:
-			errorMsg = "The DDE transaction could not be completed because other DDE transactions were being processed."
-		case SE_ERR_DDEFAIL:
-			errorMsg = "The DDE transaction failed."
-		case SE_ERR_DDETIMEOUT:
-			errorMsg = "The DDE transaction could not be completed because the request timed out."
-		case SE_ERR_DLLNOTFOUND:
-			errorMsg = "The specified DLL was not found."
-		case SE_ERR_NOASSOC:
-			errorMsg = "There is no application associated with the given file name extension. This error will also be returned if you attempt to print a file that is not printable."
-		case SE_ERR_OOM:
-			errorMsg = "There was not enough memory to complete the operation."
-		case SE_ERR_SHARE:
-			errorMsg = "A sharing violation occurred."
-		default:
-			errorMsg = fmt.Sprintf("Unknown error occurred with error code %v", ret)
-		}
-	} else {
-		return nil
-	}
-
-	return errors.New(errorMsg)
-}
-
-func ExtractIcon(lpszExeFileName string, nIconIndex int) HICON {
-	ret, _, _ := procExtractIcon.Call(
-		0,
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(lpszExeFileName))),
-		uintptr(nIconIndex))
-
-	return HICON(ret)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/typedef.go b/Godeps/_workspace/src/github.com/shirou/w32/typedef.go
deleted file mode 100644
index 65f5111292..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/typedef.go
+++ /dev/null
@@ -1,901 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"unsafe"
-)
-
-// From MSDN: Windows Data Types
-// http://msdn.microsoft.com/en-us/library/s3f49ktz.aspx
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa383751.aspx
-// ATOM                  WORD
-// BOOL                  int32
-// BOOLEAN               byte
-// BYTE                  byte
-// CCHAR                 int8
-// CHAR                  int8
-// COLORREF              DWORD
-// DWORD                 uint32
-// DWORDLONG             ULONGLONG
-// DWORD_PTR             ULONG_PTR
-// DWORD32               uint32
-// DWORD64               uint64
-// FLOAT                 float32
-// HACCEL                HANDLE
-// HALF_PTR              struct{} // ???
-// HANDLE                PVOID
-// HBITMAP               HANDLE
-// HBRUSH                HANDLE
-// HCOLORSPACE           HANDLE
-// HCONV                 HANDLE
-// HCONVLIST             HANDLE
-// HCURSOR               HANDLE
-// HDC                   HANDLE
-// HDDEDATA              HANDLE
-// HDESK                 HANDLE
-// HDROP                 HANDLE
-// HDWP                  HANDLE
-// HENHMETAFILE          HANDLE
-// HFILE                 HANDLE
-// HFONT                 HANDLE
-// HGDIOBJ               HANDLE
-// HGLOBAL               HANDLE
-// HHOOK                 HANDLE
-// HICON                 HANDLE
-// HINSTANCE             HANDLE
-// HKEY                  HANDLE
-// HKL                   HANDLE
-// HLOCAL                HANDLE
-// HMENU                 HANDLE
-// HMETAFILE             HANDLE
-// HMODULE               HANDLE
-// HPALETTE              HANDLE
-// HPEN                  HANDLE
-// HRESULT               int32
-// HRGN                  HANDLE
-// HSZ                   HANDLE
-// HWINSTA               HANDLE
-// HWND                  HANDLE
-// INT                   int32
-// INT_PTR               uintptr
-// INT8                  int8
-// INT16                 int16
-// INT32                 int32
-// INT64                 int64
-// LANGID                WORD
-// LCID                  DWORD
-// LCTYPE                DWORD
-// LGRPID                DWORD
-// LONG                  int32
-// LONGLONG              int64
-// LONG_PTR              uintptr
-// LONG32                int32
-// LONG64                int64
-// LPARAM                LONG_PTR
-// LPBOOL                *BOOL
-// LPBYTE                *BYTE
-// LPCOLORREF            *COLORREF
-// LPCSTR                *int8
-// LPCTSTR               LPCWSTR
-// LPCVOID               unsafe.Pointer
-// LPCWSTR               *WCHAR
-// LPDWORD               *DWORD
-// LPHANDLE              *HANDLE
-// LPINT                 *INT
-// LPLONG                *LONG
-// LPSTR                 *CHAR
-// LPTSTR                LPWSTR
-// LPVOID                unsafe.Pointer
-// LPWORD                *WORD
-// LPWSTR                *WCHAR
-// LRESULT               LONG_PTR
-// PBOOL                 *BOOL
-// PBOOLEAN              *BOOLEAN
-// PBYTE                 *BYTE
-// PCHAR                 *CHAR
-// PCSTR                 *CHAR
-// PCTSTR                PCWSTR
-// PCWSTR                *WCHAR
-// PDWORD                *DWORD
-// PDWORDLONG            *DWORDLONG
-// PDWORD_PTR            *DWORD_PTR
-// PDWORD32              *DWORD32
-// PDWORD64              *DWORD64
-// PFLOAT                *FLOAT
-// PHALF_PTR             *HALF_PTR
-// PHANDLE               *HANDLE
-// PHKEY                 *HKEY
-// PINT_PTR              *INT_PTR
-// PINT8                 *INT8
-// PINT16                *INT16
-// PINT32                *INT32
-// PINT64                *INT64
-// PLCID                 *LCID
-// PLONG                 *LONG
-// PLONGLONG             *LONGLONG
-// PLONG_PTR             *LONG_PTR
-// PLONG32               *LONG32
-// PLONG64               *LONG64
-// POINTER_32            struct{} // ???
-// POINTER_64            struct{} // ???
-// POINTER_SIGNED        uintptr
-// POINTER_UNSIGNED      uintptr
-// PSHORT                *SHORT
-// PSIZE_T               *SIZE_T
-// PSSIZE_T              *SSIZE_T
-// PSTR                  *CHAR
-// PTBYTE                *TBYTE
-// PTCHAR                *TCHAR
-// PTSTR                 PWSTR
-// PUCHAR                *UCHAR
-// PUHALF_PTR            *UHALF_PTR
-// PUINT                 *UINT
-// PUINT_PTR             *UINT_PTR
-// PUINT8                *UINT8
-// PUINT16               *UINT16
-// PUINT32               *UINT32
-// PUINT64               *UINT64
-// PULONG                *ULONG
-// PULONGLONG            *ULONGLONG
-// PULONG_PTR            *ULONG_PTR
-// PULONG32              *ULONG32
-// PULONG64              *ULONG64
-// PUSHORT               *USHORT
-// PVOID                 unsafe.Pointer
-// PWCHAR                *WCHAR
-// PWORD                 *WORD
-// PWSTR                 *WCHAR
-// QWORD                 uint64
-// SC_HANDLE             HANDLE
-// SC_LOCK               LPVOID
-// SERVICE_STATUS_HANDLE HANDLE
-// SHORT                 int16
-// SIZE_T                ULONG_PTR
-// SSIZE_T               LONG_PTR
-// TBYTE                 WCHAR
-// TCHAR                 WCHAR
-// UCHAR                 uint8
-// UHALF_PTR             struct{} // ???
-// UINT                  uint32
-// UINT_PTR              uintptr
-// UINT8                 uint8
-// UINT16                uint16
-// UINT32                uint32
-// UINT64                uint64
-// ULONG                 uint32
-// ULONGLONG             uint64
-// ULONG_PTR             uintptr
-// ULONG32               uint32
-// ULONG64               uint64
-// USHORT                uint16
-// USN                   LONGLONG
-// WCHAR                 uint16
-// WORD                  uint16
-// WPARAM                UINT_PTR
-type (
-	ATOM            uint16
-	BOOL            int32
-	COLORREF        uint32
-	DWM_FRAME_COUNT uint64
-	HACCEL          HANDLE
-	HANDLE          uintptr
-	HBITMAP         HANDLE
-	HBRUSH          HANDLE
-	HCURSOR         HANDLE
-	HDC             HANDLE
-	HDROP           HANDLE
-	HDWP            HANDLE
-	HENHMETAFILE    HANDLE
-	HFONT           HANDLE
-	HGDIOBJ         HANDLE
-	HGLOBAL         HANDLE
-	HGLRC           HANDLE
-	HICON           HANDLE
-	HIMAGELIST      HANDLE
-	HINSTANCE       HANDLE
-	HKEY            HANDLE
-	HKL             HANDLE
-	HMENU           HANDLE
-	HMODULE         HANDLE
-	HMONITOR        HANDLE
-	HPEN            HANDLE
-	HRESULT         int32
-	HRGN            HANDLE
-	HRSRC           HANDLE
-	HTHUMBNAIL      HANDLE
-	HWND            HANDLE
-	LPCVOID         unsafe.Pointer
-	PVOID           unsafe.Pointer
-	QPC_TIME        uint64
-)
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162805.aspx
-type POINT struct {
-	X, Y int32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162897.aspx
-type RECT struct {
-	Left, Top, Right, Bottom int32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms633577.aspx
-type WNDCLASSEX struct {
-	Size       uint32
-	Style      uint32
-	WndProc    uintptr
-	ClsExtra   int32
-	WndExtra   int32
-	Instance   HINSTANCE
-	Icon       HICON
-	Cursor     HCURSOR
-	Background HBRUSH
-	MenuName   *uint16
-	ClassName  *uint16
-	IconSm     HICON
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms644958.aspx
-type MSG struct {
-	Hwnd    HWND
-	Message uint32
-	WParam  uintptr
-	LParam  uintptr
-	Time    uint32
-	Pt      POINT
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145037.aspx
-type LOGFONT struct {
-	Height         int32
-	Width          int32
-	Escapement     int32
-	Orientation    int32
-	Weight         int32
-	Italic         byte
-	Underline      byte
-	StrikeOut      byte
-	CharSet        byte
-	OutPrecision   byte
-	ClipPrecision  byte
-	Quality        byte
-	PitchAndFamily byte
-	FaceName       [LF_FACESIZE]uint16
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646839.aspx
-type OPENFILENAME struct {
-	StructSize      uint32
-	Owner           HWND
-	Instance        HINSTANCE
-	Filter          *uint16
-	CustomFilter    *uint16
-	MaxCustomFilter uint32
-	FilterIndex     uint32
-	File            *uint16
-	MaxFile         uint32
-	FileTitle       *uint16
-	MaxFileTitle    uint32
-	InitialDir      *uint16
-	Title           *uint16
-	Flags           uint32
-	FileOffset      uint16
-	FileExtension   uint16
-	DefExt          *uint16
-	CustData        uintptr
-	FnHook          uintptr
-	TemplateName    *uint16
-	PvReserved      unsafe.Pointer
-	DwReserved      uint32
-	FlagsEx         uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773205.aspx
-type BROWSEINFO struct {
-	Owner        HWND
-	Root         *uint16
-	DisplayName  *uint16
-	Title        *uint16
-	Flags        uint32
-	CallbackFunc uintptr
-	LParam       uintptr
-	Image        int32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa373931.aspx
-type GUID struct {
-	Data1 uint32
-	Data2 uint16
-	Data3 uint16
-	Data4 [8]byte
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms221627.aspx
-type VARIANT struct {
-	VT         uint16 //  2
-	WReserved1 uint16 //  4
-	WReserved2 uint16 //  6
-	WReserved3 uint16 //  8
-	Val        int64  // 16
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms221416.aspx
-type DISPPARAMS struct {
-	Rgvarg            uintptr
-	RgdispidNamedArgs uintptr
-	CArgs             uint32
-	CNamedArgs        uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms221133.aspx
-type EXCEPINFO struct {
-	WCode             uint16
-	WReserved         uint16
-	BstrSource        *uint16
-	BstrDescription   *uint16
-	BstrHelpFile      *uint16
-	DwHelpContext     uint32
-	PvReserved        uintptr
-	PfnDeferredFillIn uintptr
-	Scode             int32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145035.aspx
-type LOGBRUSH struct {
-	LbStyle uint32
-	LbColor COLORREF
-	LbHatch uintptr
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183565.aspx
-type DEVMODE struct {
-	DmDeviceName       [CCHDEVICENAME]uint16
-	DmSpecVersion      uint16
-	DmDriverVersion    uint16
-	DmSize             uint16
-	DmDriverExtra      uint16
-	DmFields           uint32
-	DmOrientation      int16
-	DmPaperSize        int16
-	DmPaperLength      int16
-	DmPaperWidth       int16
-	DmScale            int16
-	DmCopies           int16
-	DmDefaultSource    int16
-	DmPrintQuality     int16
-	DmColor            int16
-	DmDuplex           int16
-	DmYResolution      int16
-	DmTTOption         int16
-	DmCollate          int16
-	DmFormName         [CCHFORMNAME]uint16
-	DmLogPixels        uint16
-	DmBitsPerPel       uint32
-	DmPelsWidth        uint32
-	DmPelsHeight       uint32
-	DmDisplayFlags     uint32
-	DmDisplayFrequency uint32
-	DmICMMethod        uint32
-	DmICMIntent        uint32
-	DmMediaType        uint32
-	DmDitherType       uint32
-	DmReserved1        uint32
-	DmReserved2        uint32
-	DmPanningWidth     uint32
-	DmPanningHeight    uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183376.aspx
-type BITMAPINFOHEADER struct {
-	BiSize          uint32
-	BiWidth         int32
-	BiHeight        int32
-	BiPlanes        uint16
-	BiBitCount      uint16
-	BiCompression   uint32
-	BiSizeImage     uint32
-	BiXPelsPerMeter int32
-	BiYPelsPerMeter int32
-	BiClrUsed       uint32
-	BiClrImportant  uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162938.aspx
-type RGBQUAD struct {
-	RgbBlue     byte
-	RgbGreen    byte
-	RgbRed      byte
-	RgbReserved byte
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183375.aspx
-type BITMAPINFO struct {
-	BmiHeader BITMAPINFOHEADER
-	BmiColors *RGBQUAD
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183371.aspx
-type BITMAP struct {
-	BmType       int32
-	BmWidth      int32
-	BmHeight     int32
-	BmWidthBytes int32
-	BmPlanes     uint16
-	BmBitsPixel  uint16
-	BmBits       unsafe.Pointer
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183567.aspx
-type DIBSECTION struct {
-	DsBm        BITMAP
-	DsBmih      BITMAPINFOHEADER
-	DsBitfields [3]uint32
-	DshSection  HANDLE
-	DsOffset    uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162607.aspx
-type ENHMETAHEADER struct {
-	IType          uint32
-	NSize          uint32
-	RclBounds      RECT
-	RclFrame       RECT
-	DSignature     uint32
-	NVersion       uint32
-	NBytes         uint32
-	NRecords       uint32
-	NHandles       uint16
-	SReserved      uint16
-	NDescription   uint32
-	OffDescription uint32
-	NPalEntries    uint32
-	SzlDevice      SIZE
-	SzlMillimeters SIZE
-	CbPixelFormat  uint32
-	OffPixelFormat uint32
-	BOpenGL        uint32
-	SzlMicrometers SIZE
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145106.aspx
-type SIZE struct {
-	CX, CY int32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145132.aspx
-type TEXTMETRIC struct {
-	TmHeight           int32
-	TmAscent           int32
-	TmDescent          int32
-	TmInternalLeading  int32
-	TmExternalLeading  int32
-	TmAveCharWidth     int32
-	TmMaxCharWidth     int32
-	TmWeight           int32
-	TmOverhang         int32
-	TmDigitizedAspectX int32
-	TmDigitizedAspectY int32
-	TmFirstChar        uint16
-	TmLastChar         uint16
-	TmDefaultChar      uint16
-	TmBreakChar        uint16
-	TmItalic           byte
-	TmUnderlined       byte
-	TmStruckOut        byte
-	TmPitchAndFamily   byte
-	TmCharSet          byte
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183574.aspx
-type DOCINFO struct {
-	CbSize       int32
-	LpszDocName  *uint16
-	LpszOutput   *uint16
-	LpszDatatype *uint16
-	FwType       uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb775514.aspx
-type NMHDR struct {
-	HwndFrom HWND
-	IdFrom   uintptr
-	Code     uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774743.aspx
-type LVCOLUMN struct {
-	Mask       uint32
-	Fmt        int32
-	Cx         int32
-	PszText    *uint16
-	CchTextMax int32
-	ISubItem   int32
-	IImage     int32
-	IOrder     int32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774760.aspx
-type LVITEM struct {
-	Mask       uint32
-	IItem      int32
-	ISubItem   int32
-	State      uint32
-	StateMask  uint32
-	PszText    *uint16
-	CchTextMax int32
-	IImage     int32
-	LParam     uintptr
-	IIndent    int32
-	IGroupId   int32
-	CColumns   uint32
-	PuColumns  uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774754.aspx
-type LVHITTESTINFO struct {
-	Pt       POINT
-	Flags    uint32
-	IItem    int32
-	ISubItem int32
-	IGroup   int32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774771.aspx
-type NMITEMACTIVATE struct {
-	Hdr       NMHDR
-	IItem     int32
-	ISubItem  int32
-	UNewState uint32
-	UOldState uint32
-	UChanged  uint32
-	PtAction  POINT
-	LParam    uintptr
-	UKeyFlags uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774773.aspx
-type NMLISTVIEW struct {
-	Hdr       NMHDR
-	IItem     int32
-	ISubItem  int32
-	UNewState uint32
-	UOldState uint32
-	UChanged  uint32
-	PtAction  POINT
-	LParam    uintptr
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb774780.aspx
-type NMLVDISPINFO struct {
-	Hdr  NMHDR
-	Item LVITEM
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb775507.aspx
-type INITCOMMONCONTROLSEX struct {
-	DwSize uint32
-	DwICC  uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb760256.aspx
-type TOOLINFO struct {
-	CbSize     uint32
-	UFlags     uint32
-	Hwnd       HWND
-	UId        uintptr
-	Rect       RECT
-	Hinst      HINSTANCE
-	LpszText   *uint16
-	LParam     uintptr
-	LpReserved unsafe.Pointer
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms645604.aspx
-type TRACKMOUSEEVENT struct {
-	CbSize      uint32
-	DwFlags     uint32
-	HwndTrack   HWND
-	DwHoverTime uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms534067.aspx
-type GdiplusStartupInput struct {
-	GdiplusVersion           uint32
-	DebugEventCallback       uintptr
-	SuppressBackgroundThread BOOL
-	SuppressExternalCodecs   BOOL
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms534068.aspx
-type GdiplusStartupOutput struct {
-	NotificationHook   uintptr
-	NotificationUnhook uintptr
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd162768.aspx
-type PAINTSTRUCT struct {
-	Hdc         HDC
-	FErase      BOOL
-	RcPaint     RECT
-	FRestore    BOOL
-	FIncUpdate  BOOL
-	RgbReserved [32]byte
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa363646.aspx
-type EVENTLOGRECORD struct {
-	Length              uint32
-	Reserved            uint32
-	RecordNumber        uint32
-	TimeGenerated       uint32
-	TimeWritten         uint32
-	EventID             uint32
-	EventType           uint16
-	NumStrings          uint16
-	EventCategory       uint16
-	ReservedFlags       uint16
-	ClosingRecordNumber uint32
-	StringOffset        uint32
-	UserSidLength       uint32
-	UserSidOffset       uint32
-	DataLength          uint32
-	DataOffset          uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms685996.aspx
-type SERVICE_STATUS struct {
-	DwServiceType             uint32
-	DwCurrentState            uint32
-	DwControlsAccepted        uint32
-	DwWin32ExitCode           uint32
-	DwServiceSpecificExitCode uint32
-	DwCheckPoint              uint32
-	DwWaitHint                uint32
-}
-type PROCESSENTRY32 struct {
-	DwSize              uint32
-	CntUsage            uint32
-	Th32ProcessID       uint32
-	Th32DefaultHeapID   uintptr
-	Th32ModuleID        uint32
-	CntThreads          uint32
-	Th32ParentProcessID uint32
-	PcPriClassBase      int32
-	DwFlags             uint32
-	SzExeFile           [MAX_PATH]uint16
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms684225.aspx
-type MODULEENTRY32 struct {
-	Size         uint32
-	ModuleID     uint32
-	ProcessID    uint32
-	GlblcntUsage uint32
-	ProccntUsage uint32
-	ModBaseAddr  *uint8
-	ModBaseSize  uint32
-	HModule      HMODULE
-	SzModule     [MAX_MODULE_NAME32 + 1]uint16
-	SzExePath    [MAX_PATH]uint16
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms724284.aspx
-type FILETIME struct {
-	DwLowDateTime  uint32
-	DwHighDateTime uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682119.aspx
-type COORD struct {
-	X, Y int16
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms686311.aspx
-type SMALL_RECT struct {
-	Left, Top, Right, Bottom int16
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682093.aspx
-type CONSOLE_SCREEN_BUFFER_INFO struct {
-	DwSize              COORD
-	DwCursorPosition    COORD
-	WAttributes         uint16
-	SrWindow            SMALL_RECT
-	DwMaximumWindowSize COORD
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773244.aspx
-type MARGINS struct {
-	CxLeftWidth, CxRightWidth, CyTopHeight, CyBottomHeight int32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969500.aspx
-type DWM_BLURBEHIND struct {
-	DwFlags                uint32
-	fEnable                BOOL
-	hRgnBlur               HRGN
-	fTransitionOnMaximized BOOL
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969501.aspx
-type DWM_PRESENT_PARAMETERS struct {
-	cbSize             uint32
-	fQueue             BOOL
-	cRefreshStart      DWM_FRAME_COUNT
-	cBuffer            uint32
-	fUseSourceRate     BOOL
-	rateSource         UNSIGNED_RATIO
-	cRefreshesPerFrame uint32
-	eSampling          DWM_SOURCE_FRAME_SAMPLING
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969502.aspx
-type DWM_THUMBNAIL_PROPERTIES struct {
-	dwFlags               uint32
-	rcDestination         RECT
-	rcSource              RECT
-	opacity               byte
-	fVisible              BOOL
-	fSourceClientAreaOnly BOOL
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969503.aspx
-type DWM_TIMING_INFO struct {
-	cbSize                 uint32
-	rateRefresh            UNSIGNED_RATIO
-	qpcRefreshPeriod       QPC_TIME
-	rateCompose            UNSIGNED_RATIO
-	qpcVBlank              QPC_TIME
-	cRefresh               DWM_FRAME_COUNT
-	cDXRefresh             uint32
-	qpcCompose             QPC_TIME
-	cFrame                 DWM_FRAME_COUNT
-	cDXPresent             uint32
-	cRefreshFrame          DWM_FRAME_COUNT
-	cFrameSubmitted        DWM_FRAME_COUNT
-	cDXPresentSubmitted    uint32
-	cFrameConfirmed        DWM_FRAME_COUNT
-	cDXPresentConfirmed    uint32
-	cRefreshConfirmed      DWM_FRAME_COUNT
-	cDXRefreshConfirmed    uint32
-	cFramesLate            DWM_FRAME_COUNT
-	cFramesOutstanding     uint32
-	cFrameDisplayed        DWM_FRAME_COUNT
-	qpcFrameDisplayed      QPC_TIME
-	cRefreshFrameDisplayed DWM_FRAME_COUNT
-	cFrameComplete         DWM_FRAME_COUNT
-	qpcFrameComplete       QPC_TIME
-	cFramePending          DWM_FRAME_COUNT
-	qpcFramePending        QPC_TIME
-	cFramesDisplayed       DWM_FRAME_COUNT
-	cFramesComplete        DWM_FRAME_COUNT
-	cFramesPending         DWM_FRAME_COUNT
-	cFramesAvailable       DWM_FRAME_COUNT
-	cFramesDropped         DWM_FRAME_COUNT
-	cFramesMissed          DWM_FRAME_COUNT
-	cRefreshNextDisplayed  DWM_FRAME_COUNT
-	cRefreshNextPresented  DWM_FRAME_COUNT
-	cRefreshesDisplayed    DWM_FRAME_COUNT
-	cRefreshesPresented    DWM_FRAME_COUNT
-	cRefreshStarted        DWM_FRAME_COUNT
-	cPixelsReceived        uint64
-	cPixelsDrawn           uint64
-	cBuffersEmpty          DWM_FRAME_COUNT
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd389402.aspx
-type MilMatrix3x2D struct {
-	S_11, S_12, S_21, S_22 float64
-	DX, DY                 float64
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa969505.aspx
-type UNSIGNED_RATIO struct {
-	uiNumerator   uint32
-	uiDenominator uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms632603.aspx
-type CREATESTRUCT struct {
-	CreateParams uintptr
-	Instance     HINSTANCE
-	Menu         HMENU
-	Parent       HWND
-	Cy, Cx       int32
-	Y, X         int32
-	Style        int32
-	Name         *uint16
-	Class        *uint16
-	dwExStyle    uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145065.aspx
-type MONITORINFO struct {
-	CbSize    uint32
-	RcMonitor RECT
-	RcWork    RECT
-	DwFlags   uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd145066.aspx
-type MONITORINFOEX struct {
-	MONITORINFO
-	SzDevice [CCHDEVICENAME]uint16
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/dd368826.aspx
-type PIXELFORMATDESCRIPTOR struct {
-	Size                   uint16
-	Version                uint16
-	DwFlags                uint32
-	IPixelType             byte
-	ColorBits              byte
-	RedBits, RedShift      byte
-	GreenBits, GreenShift  byte
-	BlueBits, BlueShift    byte
-	AlphaBits, AlphaShift  byte
-	AccumBits              byte
-	AccumRedBits           byte
-	AccumGreenBits         byte
-	AccumBlueBits          byte
-	AccumAlphaBits         byte
-	DepthBits, StencilBits byte
-	AuxBuffers             byte
-	ILayerType             byte
-	Reserved               byte
-	DwLayerMask            uint32
-	DwVisibleMask          uint32
-	DwDamageMask           uint32
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646270(v=vs.85).aspx
-type INPUT struct {
-	Type uint32
-	Mi   MOUSEINPUT
-	Ki   KEYBDINPUT
-	Hi   HARDWAREINPUT
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646273(v=vs.85).aspx
-type MOUSEINPUT struct {
-	Dx          int32
-	Dy          int32
-	MouseData   uint32
-	DwFlags     uint32
-	Time        uint32
-	DwExtraInfo uintptr
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646271(v=vs.85).aspx
-type KEYBDINPUT struct {
-	WVk         uint16
-	WScan       uint16
-	DwFlags     uint32
-	Time        uint32
-	DwExtraInfo uintptr
-}
-
-// http://msdn.microsoft.com/en-us/library/windows/desktop/ms646269(v=vs.85).aspx
-type HARDWAREINPUT struct {
-	UMsg    uint32
-	WParamL uint16
-	WParamH uint16
-}
-
-type KbdInput struct {
-	typ uint32
-	ki  KEYBDINPUT
-}
-
-type MouseInput struct {
-	typ uint32
-	mi  MOUSEINPUT
-}
-
-type HardwareInput struct {
-	typ uint32
-	hi  HARDWAREINPUT
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/user32.go b/Godeps/_workspace/src/github.com/shirou/w32/user32.go
deleted file mode 100644
index 44b87726d1..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/user32.go
+++ /dev/null
@@ -1,948 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"fmt"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	moduser32 = syscall.NewLazyDLL("user32.dll")
-
-	procRegisterClassEx               = moduser32.NewProc("RegisterClassExW")
-	procLoadIcon                      = moduser32.NewProc("LoadIconW")
-	procLoadCursor                    = moduser32.NewProc("LoadCursorW")
-	procShowWindow                    = moduser32.NewProc("ShowWindow")
-	procUpdateWindow                  = moduser32.NewProc("UpdateWindow")
-	procCreateWindowEx                = moduser32.NewProc("CreateWindowExW")
-	procAdjustWindowRect              = moduser32.NewProc("AdjustWindowRect")
-	procAdjustWindowRectEx            = moduser32.NewProc("AdjustWindowRectEx")
-	procDestroyWindow                 = moduser32.NewProc("DestroyWindow")
-	procDefWindowProc                 = moduser32.NewProc("DefWindowProcW")
-	procDefDlgProc                    = moduser32.NewProc("DefDlgProcW")
-	procPostQuitMessage               = moduser32.NewProc("PostQuitMessage")
-	procGetMessage                    = moduser32.NewProc("GetMessageW")
-	procTranslateMessage              = moduser32.NewProc("TranslateMessage")
-	procDispatchMessage               = moduser32.NewProc("DispatchMessageW")
-	procSendMessage                   = moduser32.NewProc("SendMessageW")
-	procPostMessage                   = moduser32.NewProc("PostMessageW")
-	procWaitMessage                   = moduser32.NewProc("WaitMessage")
-	procSetWindowText                 = moduser32.NewProc("SetWindowTextW")
-	procGetWindowTextLength           = moduser32.NewProc("GetWindowTextLengthW")
-	procGetWindowText                 = moduser32.NewProc("GetWindowTextW")
-	procGetWindowRect                 = moduser32.NewProc("GetWindowRect")
-	procMoveWindow                    = moduser32.NewProc("MoveWindow")
-	procScreenToClient                = moduser32.NewProc("ScreenToClient")
-	procCallWindowProc                = moduser32.NewProc("CallWindowProcW")
-	procSetWindowLong                 = moduser32.NewProc("SetWindowLongW")
-	procSetWindowLongPtr              = moduser32.NewProc("SetWindowLongW")
-	procGetWindowLong                 = moduser32.NewProc("GetWindowLongW")
-	procGetWindowLongPtr              = moduser32.NewProc("GetWindowLongW")
-	procEnableWindow                  = moduser32.NewProc("EnableWindow")
-	procIsWindowEnabled               = moduser32.NewProc("IsWindowEnabled")
-	procIsWindowVisible               = moduser32.NewProc("IsWindowVisible")
-	procSetFocus                      = moduser32.NewProc("SetFocus")
-	procInvalidateRect                = moduser32.NewProc("InvalidateRect")
-	procGetClientRect                 = moduser32.NewProc("GetClientRect")
-	procGetDC                         = moduser32.NewProc("GetDC")
-	procReleaseDC                     = moduser32.NewProc("ReleaseDC")
-	procSetCapture                    = moduser32.NewProc("SetCapture")
-	procReleaseCapture                = moduser32.NewProc("ReleaseCapture")
-	procGetWindowThreadProcessId      = moduser32.NewProc("GetWindowThreadProcessId")
-	procMessageBox                    = moduser32.NewProc("MessageBoxW")
-	procGetSystemMetrics              = moduser32.NewProc("GetSystemMetrics")
-	procCopyRect                      = moduser32.NewProc("CopyRect")
-	procEqualRect                     = moduser32.NewProc("EqualRect")
-	procInflateRect                   = moduser32.NewProc("InflateRect")
-	procIntersectRect                 = moduser32.NewProc("IntersectRect")
-	procIsRectEmpty                   = moduser32.NewProc("IsRectEmpty")
-	procOffsetRect                    = moduser32.NewProc("OffsetRect")
-	procPtInRect                      = moduser32.NewProc("PtInRect")
-	procSetRect                       = moduser32.NewProc("SetRect")
-	procSetRectEmpty                  = moduser32.NewProc("SetRectEmpty")
-	procSubtractRect                  = moduser32.NewProc("SubtractRect")
-	procUnionRect                     = moduser32.NewProc("UnionRect")
-	procCreateDialogParam             = moduser32.NewProc("CreateDialogParamW")
-	procDialogBoxParam                = moduser32.NewProc("DialogBoxParamW")
-	procGetDlgItem                    = moduser32.NewProc("GetDlgItem")
-	procDrawIcon                      = moduser32.NewProc("DrawIcon")
-	procClientToScreen                = moduser32.NewProc("ClientToScreen")
-	procIsDialogMessage               = moduser32.NewProc("IsDialogMessageW")
-	procIsWindow                      = moduser32.NewProc("IsWindow")
-	procEndDialog                     = moduser32.NewProc("EndDialog")
-	procPeekMessage                   = moduser32.NewProc("PeekMessageW")
-	procTranslateAccelerator          = moduser32.NewProc("TranslateAcceleratorW")
-	procSetWindowPos                  = moduser32.NewProc("SetWindowPos")
-	procFillRect                      = moduser32.NewProc("FillRect")
-	procDrawText                      = moduser32.NewProc("DrawTextW")
-	procAddClipboardFormatListener    = moduser32.NewProc("AddClipboardFormatListener")
-	procRemoveClipboardFormatListener = moduser32.NewProc("RemoveClipboardFormatListener")
-	procOpenClipboard                 = moduser32.NewProc("OpenClipboard")
-	procCloseClipboard                = moduser32.NewProc("CloseClipboard")
-	procEnumClipboardFormats          = moduser32.NewProc("EnumClipboardFormats")
-	procGetClipboardData              = moduser32.NewProc("GetClipboardData")
-	procSetClipboardData              = moduser32.NewProc("SetClipboardData")
-	procEmptyClipboard                = moduser32.NewProc("EmptyClipboard")
-	procGetClipboardFormatName        = moduser32.NewProc("GetClipboardFormatNameW")
-	procIsClipboardFormatAvailable    = moduser32.NewProc("IsClipboardFormatAvailable")
-	procBeginPaint                    = moduser32.NewProc("BeginPaint")
-	procEndPaint                      = moduser32.NewProc("EndPaint")
-	procGetKeyboardState              = moduser32.NewProc("GetKeyboardState")
-	procMapVirtualKey                 = moduser32.NewProc("MapVirtualKeyExW")
-	procGetAsyncKeyState              = moduser32.NewProc("GetAsyncKeyState")
-	procToAscii                       = moduser32.NewProc("ToAscii")
-	procSwapMouseButton               = moduser32.NewProc("SwapMouseButton")
-	procGetCursorPos                  = moduser32.NewProc("GetCursorPos")
-	procSetCursorPos                  = moduser32.NewProc("SetCursorPos")
-	procSetCursor                     = moduser32.NewProc("SetCursor")
-	procCreateIcon                    = moduser32.NewProc("CreateIcon")
-	procDestroyIcon                   = moduser32.NewProc("DestroyIcon")
-	procMonitorFromPoint              = moduser32.NewProc("MonitorFromPoint")
-	procMonitorFromRect               = moduser32.NewProc("MonitorFromRect")
-	procMonitorFromWindow             = moduser32.NewProc("MonitorFromWindow")
-	procGetMonitorInfo                = moduser32.NewProc("GetMonitorInfoW")
-	procEnumDisplayMonitors           = moduser32.NewProc("EnumDisplayMonitors")
-	procEnumDisplaySettingsEx         = moduser32.NewProc("EnumDisplaySettingsExW")
-	procChangeDisplaySettingsEx       = moduser32.NewProc("ChangeDisplaySettingsExW")
-	procSendInput                     = moduser32.NewProc("SendInput")
-)
-
-func RegisterClassEx(wndClassEx *WNDCLASSEX) ATOM {
-	ret, _, _ := procRegisterClassEx.Call(uintptr(unsafe.Pointer(wndClassEx)))
-	return ATOM(ret)
-}
-
-func LoadIcon(instance HINSTANCE, iconName *uint16) HICON {
-	ret, _, _ := procLoadIcon.Call(
-		uintptr(instance),
-		uintptr(unsafe.Pointer(iconName)))
-
-	return HICON(ret)
-
-}
-
-func LoadCursor(instance HINSTANCE, cursorName *uint16) HCURSOR {
-	ret, _, _ := procLoadCursor.Call(
-		uintptr(instance),
-		uintptr(unsafe.Pointer(cursorName)))
-
-	return HCURSOR(ret)
-
-}
-
-func ShowWindow(hwnd HWND, cmdshow int) bool {
-	ret, _, _ := procShowWindow.Call(
-		uintptr(hwnd),
-		uintptr(cmdshow))
-
-	return ret != 0
-
-}
-
-func UpdateWindow(hwnd HWND) bool {
-	ret, _, _ := procUpdateWindow.Call(
-		uintptr(hwnd))
-	return ret != 0
-}
-
-func CreateWindowEx(exStyle uint, className, windowName *uint16,
-	style uint, x, y, width, height int, parent HWND, menu HMENU,
-	instance HINSTANCE, param unsafe.Pointer) HWND {
-	ret, _, _ := procCreateWindowEx.Call(
-		uintptr(exStyle),
-		uintptr(unsafe.Pointer(className)),
-		uintptr(unsafe.Pointer(windowName)),
-		uintptr(style),
-		uintptr(x),
-		uintptr(y),
-		uintptr(width),
-		uintptr(height),
-		uintptr(parent),
-		uintptr(menu),
-		uintptr(instance),
-		uintptr(param))
-
-	return HWND(ret)
-}
-
-func AdjustWindowRectEx(rect *RECT, style uint, menu bool, exStyle uint) bool {
-	ret, _, _ := procAdjustWindowRectEx.Call(
-		uintptr(unsafe.Pointer(rect)),
-		uintptr(style),
-		uintptr(BoolToBOOL(menu)),
-		uintptr(exStyle))
-
-	return ret != 0
-}
-
-func AdjustWindowRect(rect *RECT, style uint, menu bool) bool {
-	ret, _, _ := procAdjustWindowRect.Call(
-		uintptr(unsafe.Pointer(rect)),
-		uintptr(style),
-		uintptr(BoolToBOOL(menu)))
-
-	return ret != 0
-}
-
-func DestroyWindow(hwnd HWND) bool {
-	ret, _, _ := procDestroyWindow.Call(
-		uintptr(hwnd))
-
-	return ret != 0
-}
-
-func DefWindowProc(hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
-	ret, _, _ := procDefWindowProc.Call(
-		uintptr(hwnd),
-		uintptr(msg),
-		wParam,
-		lParam)
-
-	return ret
-}
-
-func DefDlgProc(hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
-	ret, _, _ := procDefDlgProc.Call(
-		uintptr(hwnd),
-		uintptr(msg),
-		wParam,
-		lParam)
-
-	return ret
-}
-
-func PostQuitMessage(exitCode int) {
-	procPostQuitMessage.Call(
-		uintptr(exitCode))
-}
-
-func GetMessage(msg *MSG, hwnd HWND, msgFilterMin, msgFilterMax uint32) int {
-	ret, _, _ := procGetMessage.Call(
-		uintptr(unsafe.Pointer(msg)),
-		uintptr(hwnd),
-		uintptr(msgFilterMin),
-		uintptr(msgFilterMax))
-
-	return int(ret)
-}
-
-func TranslateMessage(msg *MSG) bool {
-	ret, _, _ := procTranslateMessage.Call(
-		uintptr(unsafe.Pointer(msg)))
-
-	return ret != 0
-
-}
-
-func DispatchMessage(msg *MSG) uintptr {
-	ret, _, _ := procDispatchMessage.Call(
-		uintptr(unsafe.Pointer(msg)))
-
-	return ret
-
-}
-
-func SendMessage(hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
-	ret, _, _ := procSendMessage.Call(
-		uintptr(hwnd),
-		uintptr(msg),
-		wParam,
-		lParam)
-
-	return ret
-}
-
-func PostMessage(hwnd HWND, msg uint32, wParam, lParam uintptr) bool {
-	ret, _, _ := procPostMessage.Call(
-		uintptr(hwnd),
-		uintptr(msg),
-		wParam,
-		lParam)
-
-	return ret != 0
-}
-
-func WaitMessage() bool {
-	ret, _, _ := procWaitMessage.Call()
-	return ret != 0
-}
-
-func SetWindowText(hwnd HWND, text string) {
-	procSetWindowText.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(text))))
-}
-
-func GetWindowTextLength(hwnd HWND) int {
-	ret, _, _ := procGetWindowTextLength.Call(
-		uintptr(hwnd))
-
-	return int(ret)
-}
-
-func GetWindowText(hwnd HWND) string {
-	textLen := GetWindowTextLength(hwnd) + 1
-
-	buf := make([]uint16, textLen)
-	procGetWindowText.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(textLen))
-
-	return syscall.UTF16ToString(buf)
-}
-
-func GetWindowRect(hwnd HWND) *RECT {
-	var rect RECT
-	procGetWindowRect.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(&rect)))
-
-	return &rect
-}
-
-func MoveWindow(hwnd HWND, x, y, width, height int, repaint bool) bool {
-	ret, _, _ := procMoveWindow.Call(
-		uintptr(hwnd),
-		uintptr(x),
-		uintptr(y),
-		uintptr(width),
-		uintptr(height),
-		uintptr(BoolToBOOL(repaint)))
-
-	return ret != 0
-
-}
-
-func ScreenToClient(hwnd HWND, x, y int) (X, Y int, ok bool) {
-	pt := POINT{X: int32(x), Y: int32(y)}
-	ret, _, _ := procScreenToClient.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(&pt)))
-
-	return int(pt.X), int(pt.Y), ret != 0
-}
-
-func CallWindowProc(preWndProc uintptr, hwnd HWND, msg uint32, wParam, lParam uintptr) uintptr {
-	ret, _, _ := procCallWindowProc.Call(
-		preWndProc,
-		uintptr(hwnd),
-		uintptr(msg),
-		wParam,
-		lParam)
-
-	return ret
-}
-
-func SetWindowLong(hwnd HWND, index int, value uint32) uint32 {
-	ret, _, _ := procSetWindowLong.Call(
-		uintptr(hwnd),
-		uintptr(index),
-		uintptr(value))
-
-	return uint32(ret)
-}
-
-func SetWindowLongPtr(hwnd HWND, index int, value uintptr) uintptr {
-	ret, _, _ := procSetWindowLongPtr.Call(
-		uintptr(hwnd),
-		uintptr(index),
-		value)
-
-	return ret
-}
-
-func GetWindowLong(hwnd HWND, index int) int32 {
-	ret, _, _ := procGetWindowLong.Call(
-		uintptr(hwnd),
-		uintptr(index))
-
-	return int32(ret)
-}
-
-func GetWindowLongPtr(hwnd HWND, index int) uintptr {
-	ret, _, _ := procGetWindowLongPtr.Call(
-		uintptr(hwnd),
-		uintptr(index))
-
-	return ret
-}
-
-func EnableWindow(hwnd HWND, b bool) bool {
-	ret, _, _ := procEnableWindow.Call(
-		uintptr(hwnd),
-		uintptr(BoolToBOOL(b)))
-	return ret != 0
-}
-
-func IsWindowEnabled(hwnd HWND) bool {
-	ret, _, _ := procIsWindowEnabled.Call(
-		uintptr(hwnd))
-
-	return ret != 0
-}
-
-func IsWindowVisible(hwnd HWND) bool {
-	ret, _, _ := procIsWindowVisible.Call(
-		uintptr(hwnd))
-
-	return ret != 0
-}
-
-func SetFocus(hwnd HWND) HWND {
-	ret, _, _ := procSetFocus.Call(
-		uintptr(hwnd))
-
-	return HWND(ret)
-}
-
-func InvalidateRect(hwnd HWND, rect *RECT, erase bool) bool {
-	ret, _, _ := procInvalidateRect.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(rect)),
-		uintptr(BoolToBOOL(erase)))
-
-	return ret != 0
-}
-
-func GetClientRect(hwnd HWND) *RECT {
-	var rect RECT
-	ret, _, _ := procGetClientRect.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(&rect)))
-
-	if ret == 0 {
-		panic(fmt.Sprintf("GetClientRect(%d) failed", hwnd))
-	}
-
-	return &rect
-}
-
-func GetDC(hwnd HWND) HDC {
-	ret, _, _ := procGetDC.Call(
-		uintptr(hwnd))
-
-	return HDC(ret)
-}
-
-func ReleaseDC(hwnd HWND, hDC HDC) bool {
-	ret, _, _ := procReleaseDC.Call(
-		uintptr(hwnd),
-		uintptr(hDC))
-
-	return ret != 0
-}
-
-func SetCapture(hwnd HWND) HWND {
-	ret, _, _ := procSetCapture.Call(
-		uintptr(hwnd))
-
-	return HWND(ret)
-}
-
-func ReleaseCapture() bool {
-	ret, _, _ := procReleaseCapture.Call()
-
-	return ret != 0
-}
-
-func GetWindowThreadProcessId(hwnd HWND) (HANDLE, int) {
-	var processId int
-	ret, _, _ := procGetWindowThreadProcessId.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(&processId)))
-
-	return HANDLE(ret), processId
-}
-
-func MessageBox(hwnd HWND, title, caption string, flags uint) int {
-	ret, _, _ := procMessageBox.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(title))),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(caption))),
-		uintptr(flags))
-
-	return int(ret)
-}
-
-func GetSystemMetrics(index int) int {
-	ret, _, _ := procGetSystemMetrics.Call(
-		uintptr(index))
-
-	return int(ret)
-}
-
-func CopyRect(dst, src *RECT) bool {
-	ret, _, _ := procCopyRect.Call(
-		uintptr(unsafe.Pointer(dst)),
-		uintptr(unsafe.Pointer(src)))
-
-	return ret != 0
-}
-
-func EqualRect(rect1, rect2 *RECT) bool {
-	ret, _, _ := procEqualRect.Call(
-		uintptr(unsafe.Pointer(rect1)),
-		uintptr(unsafe.Pointer(rect2)))
-
-	return ret != 0
-}
-
-func InflateRect(rect *RECT, dx, dy int) bool {
-	ret, _, _ := procInflateRect.Call(
-		uintptr(unsafe.Pointer(rect)),
-		uintptr(dx),
-		uintptr(dy))
-
-	return ret != 0
-}
-
-func IntersectRect(dst, src1, src2 *RECT) bool {
-	ret, _, _ := procIntersectRect.Call(
-		uintptr(unsafe.Pointer(dst)),
-		uintptr(unsafe.Pointer(src1)),
-		uintptr(unsafe.Pointer(src2)))
-
-	return ret != 0
-}
-
-func IsRectEmpty(rect *RECT) bool {
-	ret, _, _ := procIsRectEmpty.Call(
-		uintptr(unsafe.Pointer(rect)))
-
-	return ret != 0
-}
-
-func OffsetRect(rect *RECT, dx, dy int) bool {
-	ret, _, _ := procOffsetRect.Call(
-		uintptr(unsafe.Pointer(rect)),
-		uintptr(dx),
-		uintptr(dy))
-
-	return ret != 0
-}
-
-func PtInRect(rect *RECT, x, y int) bool {
-	pt := POINT{X: int32(x), Y: int32(y)}
-	ret, _, _ := procPtInRect.Call(
-		uintptr(unsafe.Pointer(rect)),
-		uintptr(unsafe.Pointer(&pt)))
-
-	return ret != 0
-}
-
-func SetRect(rect *RECT, left, top, right, bottom int) bool {
-	ret, _, _ := procSetRect.Call(
-		uintptr(unsafe.Pointer(rect)),
-		uintptr(left),
-		uintptr(top),
-		uintptr(right),
-		uintptr(bottom))
-
-	return ret != 0
-}
-
-func SetRectEmpty(rect *RECT) bool {
-	ret, _, _ := procSetRectEmpty.Call(
-		uintptr(unsafe.Pointer(rect)))
-
-	return ret != 0
-}
-
-func SubtractRect(dst, src1, src2 *RECT) bool {
-	ret, _, _ := procSubtractRect.Call(
-		uintptr(unsafe.Pointer(dst)),
-		uintptr(unsafe.Pointer(src1)),
-		uintptr(unsafe.Pointer(src2)))
-
-	return ret != 0
-}
-
-func UnionRect(dst, src1, src2 *RECT) bool {
-	ret, _, _ := procUnionRect.Call(
-		uintptr(unsafe.Pointer(dst)),
-		uintptr(unsafe.Pointer(src1)),
-		uintptr(unsafe.Pointer(src2)))
-
-	return ret != 0
-}
-
-func CreateDialog(hInstance HINSTANCE, lpTemplate *uint16, hWndParent HWND, lpDialogProc uintptr) HWND {
-	ret, _, _ := procCreateDialogParam.Call(
-		uintptr(hInstance),
-		uintptr(unsafe.Pointer(lpTemplate)),
-		uintptr(hWndParent),
-		lpDialogProc,
-		0)
-
-	return HWND(ret)
-}
-
-func DialogBox(hInstance HINSTANCE, lpTemplateName *uint16, hWndParent HWND, lpDialogProc uintptr) int {
-	ret, _, _ := procDialogBoxParam.Call(
-		uintptr(hInstance),
-		uintptr(unsafe.Pointer(lpTemplateName)),
-		uintptr(hWndParent),
-		lpDialogProc,
-		0)
-
-	return int(ret)
-}
-
-func GetDlgItem(hDlg HWND, nIDDlgItem int) HWND {
-	ret, _, _ := procGetDlgItem.Call(
-		uintptr(unsafe.Pointer(hDlg)),
-		uintptr(nIDDlgItem))
-
-	return HWND(ret)
-}
-
-func DrawIcon(hDC HDC, x, y int, hIcon HICON) bool {
-	ret, _, _ := procDrawIcon.Call(
-		uintptr(unsafe.Pointer(hDC)),
-		uintptr(x),
-		uintptr(y),
-		uintptr(unsafe.Pointer(hIcon)))
-
-	return ret != 0
-}
-
-func ClientToScreen(hwnd HWND, x, y int) (int, int) {
-	pt := POINT{X: int32(x), Y: int32(y)}
-
-	procClientToScreen.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(&pt)))
-
-	return int(pt.X), int(pt.Y)
-}
-
-func IsDialogMessage(hwnd HWND, msg *MSG) bool {
-	ret, _, _ := procIsDialogMessage.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(msg)))
-
-	return ret != 0
-}
-
-func IsWindow(hwnd HWND) bool {
-	ret, _, _ := procIsWindow.Call(
-		uintptr(hwnd))
-
-	return ret != 0
-}
-
-func EndDialog(hwnd HWND, nResult uintptr) bool {
-	ret, _, _ := procEndDialog.Call(
-		uintptr(hwnd),
-		nResult)
-
-	return ret != 0
-}
-
-func PeekMessage(lpMsg *MSG, hwnd HWND, wMsgFilterMin, wMsgFilterMax, wRemoveMsg uint32) bool {
-	ret, _, _ := procPeekMessage.Call(
-		uintptr(unsafe.Pointer(lpMsg)),
-		uintptr(hwnd),
-		uintptr(wMsgFilterMin),
-		uintptr(wMsgFilterMax),
-		uintptr(wRemoveMsg))
-
-	return ret != 0
-}
-
-func TranslateAccelerator(hwnd HWND, hAccTable HACCEL, lpMsg *MSG) bool {
-	ret, _, _ := procTranslateMessage.Call(
-		uintptr(hwnd),
-		uintptr(hAccTable),
-		uintptr(unsafe.Pointer(lpMsg)))
-
-	return ret != 0
-}
-
-func SetWindowPos(hwnd, hWndInsertAfter HWND, x, y, cx, cy int, uFlags uint) bool {
-	ret, _, _ := procSetWindowPos.Call(
-		uintptr(hwnd),
-		uintptr(hWndInsertAfter),
-		uintptr(x),
-		uintptr(y),
-		uintptr(cx),
-		uintptr(cy),
-		uintptr(uFlags))
-
-	return ret != 0
-}
-
-func FillRect(hDC HDC, lprc *RECT, hbr HBRUSH) bool {
-	ret, _, _ := procFillRect.Call(
-		uintptr(hDC),
-		uintptr(unsafe.Pointer(lprc)),
-		uintptr(hbr))
-
-	return ret != 0
-}
-
-func DrawText(hDC HDC, text string, uCount int, lpRect *RECT, uFormat uint) int {
-	ret, _, _ := procDrawText.Call(
-		uintptr(hDC),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(text))),
-		uintptr(uCount),
-		uintptr(unsafe.Pointer(lpRect)),
-		uintptr(uFormat))
-
-	return int(ret)
-}
-
-func AddClipboardFormatListener(hwnd HWND) bool {
-	ret, _, _ := procAddClipboardFormatListener.Call(
-		uintptr(hwnd))
-	return ret != 0
-}
-
-func RemoveClipboardFormatListener(hwnd HWND) bool {
-	ret, _, _ := procRemoveClipboardFormatListener.Call(
-		uintptr(hwnd))
-	return ret != 0
-}
-
-func OpenClipboard(hWndNewOwner HWND) bool {
-	ret, _, _ := procOpenClipboard.Call(
-		uintptr(hWndNewOwner))
-	return ret != 0
-}
-
-func CloseClipboard() bool {
-	ret, _, _ := procCloseClipboard.Call()
-	return ret != 0
-}
-
-func EnumClipboardFormats(format uint) uint {
-	ret, _, _ := procEnumClipboardFormats.Call(
-		uintptr(format))
-	return uint(ret)
-}
-
-func GetClipboardData(uFormat uint) HANDLE {
-	ret, _, _ := procGetClipboardData.Call(
-		uintptr(uFormat))
-	return HANDLE(ret)
-}
-
-func SetClipboardData(uFormat uint, hMem HANDLE) HANDLE {
-	ret, _, _ := procSetClipboardData.Call(
-		uintptr(uFormat),
-		uintptr(hMem))
-	return HANDLE(ret)
-}
-
-func EmptyClipboard() bool {
-	ret, _, _ := procEmptyClipboard.Call()
-	return ret != 0
-}
-
-func GetClipboardFormatName(format uint) (string, bool) {
-	cchMaxCount := 255
-	buf := make([]uint16, cchMaxCount)
-	ret, _, _ := procGetClipboardFormatName.Call(
-		uintptr(format),
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(cchMaxCount))
-
-	if ret > 0 {
-		return syscall.UTF16ToString(buf), true
-	}
-
-	return "Requested format does not exist or is predefined", false
-}
-
-func IsClipboardFormatAvailable(format uint) bool {
-	ret, _, _ := procIsClipboardFormatAvailable.Call(uintptr(format))
-	return ret != 0
-}
-
-func BeginPaint(hwnd HWND, paint *PAINTSTRUCT) HDC {
-	ret, _, _ := procBeginPaint.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(paint)))
-	return HDC(ret)
-}
-
-func EndPaint(hwnd HWND, paint *PAINTSTRUCT) {
-	procBeginPaint.Call(
-		uintptr(hwnd),
-		uintptr(unsafe.Pointer(paint)))
-}
-
-func GetKeyboardState(lpKeyState *[]byte) bool {
-	ret, _, _ := procGetKeyboardState.Call(
-		uintptr(unsafe.Pointer(&(*lpKeyState)[0])))
-	return ret != 0
-}
-
-func MapVirtualKeyEx(uCode, uMapType uint, dwhkl HKL) uint {
-	ret, _, _ := procMapVirtualKey.Call(
-		uintptr(uCode),
-		uintptr(uMapType),
-		uintptr(dwhkl))
-	return uint(ret)
-}
-
-func GetAsyncKeyState(vKey int) uint16 {
-	ret, _, _ := procGetAsyncKeyState.Call(uintptr(vKey))
-	return uint16(ret)
-}
-
-func ToAscii(uVirtKey, uScanCode uint, lpKeyState *byte, lpChar *uint16, uFlags uint) int {
-	ret, _, _ := procToAscii.Call(
-		uintptr(uVirtKey),
-		uintptr(uScanCode),
-		uintptr(unsafe.Pointer(lpKeyState)),
-		uintptr(unsafe.Pointer(lpChar)),
-		uintptr(uFlags))
-	return int(ret)
-}
-
-func SwapMouseButton(fSwap bool) bool {
-	ret, _, _ := procSwapMouseButton.Call(
-		uintptr(BoolToBOOL(fSwap)))
-	return ret != 0
-}
-
-func GetCursorPos() (x, y int, ok bool) {
-	pt := POINT{}
-	ret, _, _ := procGetCursorPos.Call(uintptr(unsafe.Pointer(&pt)))
-	return int(pt.X), int(pt.Y), ret != 0
-}
-
-func SetCursorPos(x, y int) bool {
-	ret, _, _ := procSetCursorPos.Call(
-		uintptr(x),
-		uintptr(y),
-	)
-	return ret != 0
-}
-
-func SetCursor(cursor HCURSOR) HCURSOR {
-	ret, _, _ := procSetCursor.Call(
-		uintptr(cursor),
-	)
-	return HCURSOR(ret)
-}
-
-func CreateIcon(instance HINSTANCE, nWidth, nHeight int, cPlanes, cBitsPerPixel byte, ANDbits, XORbits *byte) HICON {
-	ret, _, _ := procCreateIcon.Call(
-		uintptr(instance),
-		uintptr(nWidth),
-		uintptr(nHeight),
-		uintptr(cPlanes),
-		uintptr(cBitsPerPixel),
-		uintptr(unsafe.Pointer(ANDbits)),
-		uintptr(unsafe.Pointer(XORbits)),
-	)
-	return HICON(ret)
-}
-
-func DestroyIcon(icon HICON) bool {
-	ret, _, _ := procDestroyIcon.Call(
-		uintptr(icon),
-	)
-	return ret != 0
-}
-
-func MonitorFromPoint(x, y int, dwFlags uint32) HMONITOR {
-	ret, _, _ := procMonitorFromPoint.Call(
-		uintptr(x),
-		uintptr(y),
-		uintptr(dwFlags),
-	)
-	return HMONITOR(ret)
-}
-
-func MonitorFromRect(rc *RECT, dwFlags uint32) HMONITOR {
-	ret, _, _ := procMonitorFromRect.Call(
-		uintptr(unsafe.Pointer(rc)),
-		uintptr(dwFlags),
-	)
-	return HMONITOR(ret)
-}
-
-func MonitorFromWindow(hwnd HWND, dwFlags uint32) HMONITOR {
-	ret, _, _ := procMonitorFromWindow.Call(
-		uintptr(hwnd),
-		uintptr(dwFlags),
-	)
-	return HMONITOR(ret)
-}
-
-func GetMonitorInfo(hMonitor HMONITOR, lmpi *MONITORINFO) bool {
-	ret, _, _ := procGetMonitorInfo.Call(
-		uintptr(hMonitor),
-		uintptr(unsafe.Pointer(lmpi)),
-	)
-	return ret != 0
-}
-
-func EnumDisplayMonitors(hdc HDC, clip *RECT, fnEnum, dwData uintptr) bool {
-	ret, _, _ := procEnumDisplayMonitors.Call(
-		uintptr(hdc),
-		uintptr(unsafe.Pointer(clip)),
-		fnEnum,
-		dwData,
-	)
-	return ret != 0
-}
-
-func EnumDisplaySettingsEx(szDeviceName *uint16, iModeNum uint32, devMode *DEVMODE, dwFlags uint32) bool {
-	ret, _, _ := procEnumDisplaySettingsEx.Call(
-		uintptr(unsafe.Pointer(szDeviceName)),
-		uintptr(iModeNum),
-		uintptr(unsafe.Pointer(devMode)),
-		uintptr(dwFlags),
-	)
-	return ret != 0
-}
-
-func ChangeDisplaySettingsEx(szDeviceName *uint16, devMode *DEVMODE, hwnd HWND, dwFlags uint32, lParam uintptr) int32 {
-	ret, _, _ := procChangeDisplaySettingsEx.Call(
-		uintptr(unsafe.Pointer(szDeviceName)),
-		uintptr(unsafe.Pointer(devMode)),
-		uintptr(hwnd),
-		uintptr(dwFlags),
-		lParam,
-	)
-	return int32(ret)
-}
-
-/* remove to build without cgo
-func SendInput(inputs []INPUT) uint32 {
-	var validInputs []C.INPUT
-
-	for _, oneInput := range inputs {
-		input := C.INPUT{_type: C.DWORD(oneInput.Type)}
-
-		switch oneInput.Type {
-		case INPUT_MOUSE:
-			(*MouseInput)(unsafe.Pointer(&input)).mi = oneInput.Mi
-		case INPUT_KEYBOARD:
-			(*KbdInput)(unsafe.Pointer(&input)).ki = oneInput.Ki
-		case INPUT_HARDWARE:
-			(*HardwareInput)(unsafe.Pointer(&input)).hi = oneInput.Hi
-		default:
-			panic("unkown type")
-		}
-
-		validInputs = append(validInputs, input)
-	}
-
-	ret, _, _ := procSendInput.Call(
-		uintptr(len(validInputs)),
-		uintptr(unsafe.Pointer(&validInputs[0])),
-		uintptr(unsafe.Sizeof(C.INPUT{})),
-	)
-	return uint32(ret)
-}
-*/
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/utils.go b/Godeps/_workspace/src/github.com/shirou/w32/utils.go
deleted file mode 100644
index 4fb5b6c2c1..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/utils.go
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-import (
-	"syscall"
-	"unicode/utf16"
-	"unsafe"
-)
-
-func MakeIntResource(id uint16) *uint16 {
-	return (*uint16)(unsafe.Pointer(uintptr(id)))
-}
-
-func LOWORD(dw uint32) uint16 {
-	return uint16(dw)
-}
-
-func HIWORD(dw uint32) uint16 {
-	return uint16(dw >> 16 & 0xffff)
-}
-
-func BoolToBOOL(value bool) BOOL {
-	if value {
-		return 1
-	}
-
-	return 0
-}
-
-func UTF16PtrToString(cstr *uint16) string {
-	if cstr != nil {
-		us := make([]uint16, 0, 256)
-		for p := uintptr(unsafe.Pointer(cstr)); ; p += 2 {
-			u := *(*uint16)(unsafe.Pointer(p))
-			if u == 0 {
-				return string(utf16.Decode(us))
-			}
-			us = append(us, u)
-		}
-	}
-
-	return ""
-}
-
-func ComAddRef(unknown *IUnknown) int32 {
-	ret, _, _ := syscall.Syscall(unknown.lpVtbl.pAddRef, 1,
-		uintptr(unsafe.Pointer(unknown)),
-		0,
-		0)
-	return int32(ret)
-}
-
-func ComRelease(unknown *IUnknown) int32 {
-	ret, _, _ := syscall.Syscall(unknown.lpVtbl.pRelease, 1,
-		uintptr(unsafe.Pointer(unknown)),
-		0,
-		0)
-	return int32(ret)
-}
-
-func ComQueryInterface(unknown *IUnknown, id *GUID) *IDispatch {
-	var disp *IDispatch
-	hr, _, _ := syscall.Syscall(unknown.lpVtbl.pQueryInterface, 3,
-		uintptr(unsafe.Pointer(unknown)),
-		uintptr(unsafe.Pointer(id)),
-		uintptr(unsafe.Pointer(&disp)))
-	if hr != 0 {
-		panic("Invoke QieryInterface error.")
-	}
-	return disp
-}
-
-func ComGetIDsOfName(disp *IDispatch, names []string) []int32 {
-	wnames := make([]*uint16, len(names))
-	dispid := make([]int32, len(names))
-	for i := 0; i < len(names); i++ {
-		wnames[i] = syscall.StringToUTF16Ptr(names[i])
-	}
-	hr, _, _ := syscall.Syscall6(disp.lpVtbl.pGetIDsOfNames, 6,
-		uintptr(unsafe.Pointer(disp)),
-		uintptr(unsafe.Pointer(IID_NULL)),
-		uintptr(unsafe.Pointer(&wnames[0])),
-		uintptr(len(names)),
-		uintptr(GetUserDefaultLCID()),
-		uintptr(unsafe.Pointer(&dispid[0])))
-	if hr != 0 {
-		panic("Invoke GetIDsOfName error.")
-	}
-	return dispid
-}
-
-func ComInvoke(disp *IDispatch, dispid int32, dispatch int16, params ...interface{}) (result *VARIANT) {
-	var dispparams DISPPARAMS
-
-	if dispatch&DISPATCH_PROPERTYPUT != 0 {
-		dispnames := [1]int32{DISPID_PROPERTYPUT}
-		dispparams.RgdispidNamedArgs = uintptr(unsafe.Pointer(&dispnames[0]))
-		dispparams.CNamedArgs = 1
-	}
-	var vargs []VARIANT
-	if len(params) > 0 {
-		vargs = make([]VARIANT, len(params))
-		for i, v := range params {
-			//n := len(params)-i-1
-			n := len(params) - i - 1
-			VariantInit(&vargs[n])
-			switch v.(type) {
-			case bool:
-				if v.(bool) {
-					vargs[n] = VARIANT{VT_BOOL, 0, 0, 0, 0xffff}
-				} else {
-					vargs[n] = VARIANT{VT_BOOL, 0, 0, 0, 0}
-				}
-			case *bool:
-				vargs[n] = VARIANT{VT_BOOL | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*bool))))}
-			case byte:
-				vargs[n] = VARIANT{VT_I1, 0, 0, 0, int64(v.(byte))}
-			case *byte:
-				vargs[n] = VARIANT{VT_I1 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*byte))))}
-			case int16:
-				vargs[n] = VARIANT{VT_I2, 0, 0, 0, int64(v.(int16))}
-			case *int16:
-				vargs[n] = VARIANT{VT_I2 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*int16))))}
-			case uint16:
-				vargs[n] = VARIANT{VT_UI2, 0, 0, 0, int64(v.(int16))}
-			case *uint16:
-				vargs[n] = VARIANT{VT_UI2 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*uint16))))}
-			case int, int32:
-				vargs[n] = VARIANT{VT_UI4, 0, 0, 0, int64(v.(int))}
-			case *int, *int32:
-				vargs[n] = VARIANT{VT_I4 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*int))))}
-			case uint, uint32:
-				vargs[n] = VARIANT{VT_UI4, 0, 0, 0, int64(v.(uint))}
-			case *uint, *uint32:
-				vargs[n] = VARIANT{VT_UI4 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*uint))))}
-			case int64:
-				vargs[n] = VARIANT{VT_I8, 0, 0, 0, v.(int64)}
-			case *int64:
-				vargs[n] = VARIANT{VT_I8 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*int64))))}
-			case uint64:
-				vargs[n] = VARIANT{VT_UI8, 0, 0, 0, int64(v.(uint64))}
-			case *uint64:
-				vargs[n] = VARIANT{VT_UI8 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*uint64))))}
-			case float32:
-				vargs[n] = VARIANT{VT_R4, 0, 0, 0, int64(v.(float32))}
-			case *float32:
-				vargs[n] = VARIANT{VT_R4 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*float32))))}
-			case float64:
-				vargs[n] = VARIANT{VT_R8, 0, 0, 0, int64(v.(float64))}
-			case *float64:
-				vargs[n] = VARIANT{VT_R8 | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*float64))))}
-			case string:
-				vargs[n] = VARIANT{VT_BSTR, 0, 0, 0, int64(uintptr(unsafe.Pointer(SysAllocString(v.(string)))))}
-			case *string:
-				vargs[n] = VARIANT{VT_BSTR | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*string))))}
-			case *IDispatch:
-				vargs[n] = VARIANT{VT_DISPATCH, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*IDispatch))))}
-			case **IDispatch:
-				vargs[n] = VARIANT{VT_DISPATCH | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(**IDispatch))))}
-			case nil:
-				vargs[n] = VARIANT{VT_NULL, 0, 0, 0, 0}
-			case *VARIANT:
-				vargs[n] = VARIANT{VT_VARIANT | VT_BYREF, 0, 0, 0, int64(uintptr(unsafe.Pointer(v.(*VARIANT))))}
-			default:
-				panic("unknown type")
-			}
-		}
-		dispparams.Rgvarg = uintptr(unsafe.Pointer(&vargs[0]))
-		dispparams.CArgs = uint32(len(params))
-	}
-
-	var ret VARIANT
-	var excepInfo EXCEPINFO
-	VariantInit(&ret)
-	hr, _, _ := syscall.Syscall9(disp.lpVtbl.pInvoke, 8,
-		uintptr(unsafe.Pointer(disp)),
-		uintptr(dispid),
-		uintptr(unsafe.Pointer(IID_NULL)),
-		uintptr(GetUserDefaultLCID()),
-		uintptr(dispatch),
-		uintptr(unsafe.Pointer(&dispparams)),
-		uintptr(unsafe.Pointer(&ret)),
-		uintptr(unsafe.Pointer(&excepInfo)),
-		0)
-	if hr != 0 {
-		if excepInfo.BstrDescription != nil {
-			bs := UTF16PtrToString(excepInfo.BstrDescription)
-			panic(bs)
-		}
-	}
-	for _, varg := range vargs {
-		if varg.VT == VT_BSTR && varg.Val != 0 {
-			SysFreeString(((*int16)(unsafe.Pointer(uintptr(varg.Val)))))
-		}
-	}
-	result = &ret
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/w32/vars.go b/Godeps/_workspace/src/github.com/shirou/w32/vars.go
deleted file mode 100644
index 2dab2e3963..0000000000
--- a/Godeps/_workspace/src/github.com/shirou/w32/vars.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2010-2012 The W32 Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package w32
-
-var (
-	IID_NULL                      = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
-	IID_IUnknown                  = &GUID{0x00000000, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
-	IID_IDispatch                 = &GUID{0x00020400, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
-	IID_IConnectionPointContainer = &GUID{0xB196B284, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
-	IID_IConnectionPoint          = &GUID{0xB196B286, 0xBAB4, 0x101A, [8]byte{0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}
-)
diff --git a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/.travis.yml b/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/.travis.yml
deleted file mode 100644
index bcf9f8276c..0000000000
--- a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: go
-go:
-  - 1.5
-install:
-  - go get golang.org/x/tools/cmd/vet
-script:
-  - go get -t -v ./...
-  - diff -u <(echo -n) <(gofmt -d -s .)
-  - go tool vet .
-  - go test -v -race ./...
diff --git a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/LICENSE b/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/LICENSE
deleted file mode 100644
index 5f4e3ed57a..0000000000
--- a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 Dmitri Shuralyov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/README.md b/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/README.md
deleted file mode 100644
index cb76fe1a8c..0000000000
--- a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# sanitized_anchor_name [![Build Status](https://travis-ci.org/shurcooL/sanitized_anchor_name.svg?branch=master)](https://travis-ci.org/shurcooL/sanitized_anchor_name) [![GoDoc](https://godoc.org/github.com/shurcooL/sanitized_anchor_name?status.svg)](https://godoc.org/github.com/shurcooL/sanitized_anchor_name)
-
-Package sanitized_anchor_name provides a func to create sanitized anchor names.
-
-Its logic can be reused by multiple packages to create interoperable anchor names and links to those anchors.
-
-At this time, it does not try to ensure that generated anchor names are unique, that responsibility falls on the caller.
-
-Installation
-------------
-
-```bash
-go get -u github.com/shurcooL/sanitized_anchor_name
-```
-
-Example
--------
-
-```Go
-anchorName := sanitized_anchor_name.Create("This is a header")
-
-fmt.Println(anchorName)
-
-// Output:
-// this-is-a-header
-```
-
-License
--------
-
-- [MIT License](LICENSE)
diff --git a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/main.go b/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/main.go
deleted file mode 100644
index 6baae23b50..0000000000
--- a/Godeps/_workspace/src/github.com/shurcooL/sanitized_anchor_name/main.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Package sanitized_anchor_name provides a func to create sanitized anchor names.
-//
-// Its logic can be reused by multiple packages to create interoperable anchor names
-// and links to those anchors.
-//
-// At this time, it does not try to ensure that generated anchor names
-// are unique, that responsibility falls on the caller.
-package sanitized_anchor_name
-
-import "unicode"
-
-// Create returns a sanitized anchor name for the given text.
-func Create(text string) string {
-	var anchorName []rune
-	var futureDash = false
-	for _, r := range []rune(text) {
-		switch {
-		case unicode.IsLetter(r) || unicode.IsNumber(r):
-			if futureDash && len(anchorName) > 0 {
-				anchorName = append(anchorName, '-')
-			}
-			futureDash = false
-			anchorName = append(anchorName, unicode.ToLower(r))
-		default:
-			futureDash = true
-		}
-	}
-	return string(anchorName)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore b/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore
deleted file mode 100644
index 36d1a84d39..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-
-cobra.test
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.mailmap b/Godeps/_workspace/src/github.com/spf13/cobra/.mailmap
deleted file mode 100644
index 94ec53068a..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/.mailmap
+++ /dev/null
@@ -1,3 +0,0 @@
-Steve Francia <steve.francia@gmail.com>
-Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
-Fabiano Franz <ffranz@redhat.com>                   <contact@fabianofranz.com>
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml b/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml
deleted file mode 100644
index 7a6cb7fdbe..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: go
-go:
-  - 1.3.3
-  - 1.4.2
-  - 1.5.1
-  - tip
-script:
-  - go test -v ./...
-  - go build
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt b/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
deleted file mode 100644
index 298f0e2665..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/LICENSE.txt
+++ /dev/null
@@ -1,174 +0,0 @@
-                                Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/README.md b/Godeps/_workspace/src/github.com/spf13/cobra/README.md
deleted file mode 100644
index caeebb9dc6..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/README.md
+++ /dev/null
@@ -1,869 +0,0 @@
-![cobra logo](https://cloud.githubusercontent.com/assets/173412/10886352/ad566232-814f-11e5-9cd0-aa101788c117.png)
-
-Cobra is both a library for creating powerful modern CLI applications as well as a program to generate applications and command files.
-
-Many of the most widely used Go projects are built using Cobra including:
-
-* [Kubernetes](http://kubernetes.io/)
-* [Hugo](http://gohugo.io)
-* [rkt](https://github.com/coreos/rkt)
-* [Docker (distribution)](https://github.com/docker/distribution)
-* [OpenShift](https://www.openshift.com/)
-* [Delve](https://github.com/derekparker/delve)
-* [GopherJS](http://www.gopherjs.org/)
-* [CockroachDB](http://www.cockroachlabs.com/)
-* [Bleve](http://www.blevesearch.com/)
-* [ProjectAtomic (enterprise)](http://www.projectatomic.io/)
-* [Parse (CLI)](https://parse.com/)
-
-
-[![Build Status](https://travis-ci.org/spf13/cobra.svg "Travis CI status")](https://travis-ci.org/spf13/cobra) 
-[![CircleCI status](https://circleci.com/gh/spf13/cobra.png?circle-token=:circle-token "CircleCI status")](https://circleci.com/gh/spf13/cobra)
-
-![cobra](https://cloud.githubusercontent.com/assets/173412/10911369/84832a8e-8212-11e5-9f82-cc96660a4794.gif)
-
-# Overview
-
-Cobra is a library providing a simple interface to create powerful modern CLI
-interfaces similar to git & go tools.
-
-Cobra is also an application that will generate your application scaffolding to rapidly
-develop a Cobra-based application.
-
-Cobra provides:
-* Easy subcommand-based CLIs: `app server`, `app fetch`, etc.
-* Fully POSIX-compliant flags (including short & long versions)
-* Nested subcommands
-* Global, local and cascading flags
-* Easy generation of applications & commands with `cobra create appname` & `cobra add cmdname`
-* Intelligent suggestions (`app srver`... did you mean `app server`?)
-* Automatic help generation for commands and flags
-* Automatic detailed help for `app help [command]`
-* Automatic help flag recognition of `-h`, `--help`, etc.
-* Automatically generated bash autocomplete for your application
-* Automatically generated man pages for your application
-* Command aliases so you can change things without breaking them
-* The flexibilty to define your own help, usage, etc.
-* Optional tight integration with [viper](http://github.com/spf13/viper) for 12-factor apps
-
-Cobra has an exceptionally clean interface and simple design without needless
-constructors or initialization methods.
-
-Applications built with Cobra commands are designed to be as user-friendly as
-possible. Flags can be placed before or after the command (as long as a
-confusing space isn’t provided). Both short and long flags can be used. A
-command need not even be fully typed.  Help is automatically generated and
-available for the application or for a specific command using either the help
-command or the `--help` flag.
-
-# Concepts
-
-Cobra is built on a structure of commands, arguments & flags.
-
-**Commands** represent actions, **Args** are things and **Flags** are modifiers for those actions.
-
-The best applications will read like sentences when used. Users will know how
-to use the application because they will natively understand how to use it.
-
-The pattern to follow is 
-`APPNAME VERB NOUN --ADJECTIVE.`
-    or
-`APPNAME COMMAND ARG --FLAG`
-
-A few good real world examples may better illustrate this point.
-
-In the following example, 'server' is a command, and 'port' is a flag:
-
-    > hugo serve --port=1313
-
-In this command we are telling Git to clone the url bare.
-
-    > git clone URL --bare
-
-## Commands
-
-Command is the central point of the application. Each interaction that
-the application supports will be contained in a Command. A command can
-have children commands and optionally run an action.
-
-In the example above, 'server' is the command.
-
-A Command has the following structure:
-
-```go
-type Command struct {
-    Use string // The one-line usage message.
-    Short string // The short description shown in the 'help' output.
-    Long string // The long message shown in the 'help <this-command>' output.
-    Run func(cmd *Command, args []string) // Run runs the command.
-}
-```
-
-## Flags
-
-A Flag is a way to modify the behavior of a command. Cobra supports
-fully POSIX-compliant flags as well as the Go [flag package](https://golang.org/pkg/flag/).
-A Cobra command can define flags that persist through to children commands
-and flags that are only available to that command.
-
-In the example above, 'port' is the flag.
-
-Flag functionality is provided by the [pflag
-library](https://github.com/ogier/pflag), a fork of the flag standard library
-which maintains the same interface while adding POSIX compliance.
-
-## Usage
-
-Cobra works by creating a set of commands and then organizing them into a tree.
-The tree defines the structure of the application.
-
-Once each command is defined with its corresponding flags, then the
-tree is assigned to the commander which is finally executed.
-
-# Installing
-Using Cobra is easy. First, use `go get` to install the latest version
-of the library. This command will install the `cobra` generator executible
-along with the library:
-
-    > go get -v github.com/spf13/cobra/cobra
-
-Next, include Cobra in your application:
-
-```go
-import "github.com/spf13/cobra"
-```
-
-# Getting Started
-
-While you are welcome to provide your own organization, typically a Cobra based
-application will follow the following organizational structure.
-
-```
-  ▾ appName/
-    ▾ cmd/
-        add.go
-        your.go
-        commands.go
-        here.go
-      main.go
-```
-
-In a Cobra app, typically the main.go file is very bare. It serves, one purpose, to initialize Cobra.
-
-```go
-package main
-
-import "{pathToYourApp}/cmd"
-
-func main() {
-	if err := cmd.RootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(-1)
-	}
-}
-```
-
-## Using the Cobra Generator
-
-Cobra provides its own program that will create your application and add any
-commands you want. It's the easiest way to incorporate Cobra into your application.
-
-### cobra init
-
-The `cobra init [yourApp]` command will create your initial application code
-for you. It is a very powerful application that will populate your program with
-the right structure so you can immediately enjoy all the benefits of Cobra. It
-will also automatically apply the license you specify to your application.
-
-Cobra init is pretty smart. You can provide it a full path, or simply a path
-similar to what is expected in the import.
-
-```
-cobra init github.com/spf13/newAppName
-```
-
-### cobra add
-
-Once an application is initialized Cobra can create additional commands for you.
-Let's say you created an app and you wanted the following commands for it:
-
-* app serve
-* app config
-* app config create
-
-In your project directory (where your main.go file is) you would run the following:
-
-```
-cobra add serve
-cobra add config
-cobra add create -p 'configCmd'
-```
-
-Once you have run these four commands you would have an app structure that would look like:
-
-```
-  ▾ app/
-    ▾ cmd/
-        serve.go
-        config.go
-        create.go
-      main.go
-```
-
-at this point you can run `go run main.go` and it would run your app. `go run
-main.go serve`, `go run main.go config`, `go run main.go config create` along
-with `go run main.go help serve`, etc would all work.
-
-Obviously you haven't added your own code to these yet, the commands are ready
-for you to give them their tasks. Have fun.
-
-### Configuring the cobra generator
-
-The cobra generator will be easier to use if you provide a simple configuration
-file which will help you eliminate providing a bunch of repeated information in
-flags over and over.
-
-an example ~/.cobra.yaml file:
-
-```yaml
-author: Steve Francia <spf@spf13.com>
-license: MIT
-```
-
-## Manually implementing Cobra
-
-To manually implement cobra you need to create a bare main.go file and a RootCmd file.
-You will optionally provide additional commands as you see fit.
-
-### Create the root command
-
-The root command represents your binary itself.
-
-
-#### Manually create rootCmd
-
-Cobra doesn't require any special constructors. Simply create your commands.
-
-Ideally you place this in app/cmd/root.go:
-
-```go
-var RootCmd = &cobra.Command{
-	Use:   "hugo",
-	Short: "Hugo is a very fast static site generator",
-	Long: `A Fast and Flexible Static Site Generator built with
-                love by spf13 and friends in Go.
-                Complete documentation is available at http://hugo.spf13.com`,
-	Run: func(cmd *cobra.Command, args []string) {
-		// Do Stuff Here
-	},
-}
-```
-
-You will additionally define flags and handle configuration in your init() function.
-
-for example cmd/root.go:
-
-```go
-func init() {
-	cobra.OnInitialize(initConfig)
-	RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cobra.yaml)")
-	RootCmd.PersistentFlags().StringVarP(&projectBase, "projectbase", "b", "", "base project directory eg. github.com/spf13/")
-	RootCmd.PersistentFlags().StringP("author", "a", "YOUR NAME", "Author name for copyright attribution")
-	RootCmd.PersistentFlags().StringVarP(&userLicense, "license", "l", "", "Name of license for the project (can provide `licensetext` in config)")
-	RootCmd.PersistentFlags().Bool("viper", true, "Use Viper for configuration")
-	viper.BindPFlag("author", RootCmd.PersistentFlags().Lookup("author"))
-	viper.BindPFlag("projectbase", RootCmd.PersistentFlags().Lookup("projectbase"))
-	viper.BindPFlag("useViper", RootCmd.PersistentFlags().Lookup("viper"))
-	viper.SetDefault("author", "NAME HERE <EMAIL ADDRESS>")
-	viper.SetDefault("license", "apache")
-}
-```
-
-### Create your main.go
-
-With the root command you need to have your main function execute it.
-Execute should be run on the root for clarity, though it can be called on any command.
-
-In a Cobra app, typically the main.go file is very bare. It serves, one purpose, to initialize Cobra.
-
-```go
-package main
-
-import "{pathToYourApp}/cmd"
-
-func main() {
-	if err := cmd.RootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(-1)
-	}
-}
-```
-
-
-### Create additional commands
-
-Additional commands can be defined and typically are each given their own file
-inside of the cmd/ directory.
-
-If you wanted to create a version command you would create cmd/version.go and
-populate it with the following:
-
-```go
-package cmd
-
-import (
-	"github.com/spf13/cobra"
-)
-
-func init() {
-	RootCmd.AddCommand(versionCmd)
-}
-
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Print the version number of Hugo",
-	Long:  `All software has versions. This is Hugo's`,
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("Hugo Static Site Generator v0.9 -- HEAD")
-	},
-}
-```
-
-### Attach command to its parent 
-
-
-If you notice in the above example we attach the command to its parent. In
-this case the parent is the rootCmd. In this example we are attaching it to the
-root, but commands can be attached at any level.
-
-```go
-RootCmd.AddCommand(versionCmd)
-```
-
-### Remove a command from its parent
-
-Removing a command is not a common action in simple programs, but it allows 3rd
-parties to customize an existing command tree.
-
-In this example, we remove the existing `VersionCmd` command of an existing
-root command, and we replace it with our own version:
-
-```go
-mainlib.RootCmd.RemoveCommand(mainlib.VersionCmd)
-mainlib.RootCmd.AddCommand(versionCmd)
-```
-
-## Working with Flags
-
-Flags provide modifiers to control how the action command operates.
-
-### Assign flags to a command
-
-Since the flags are defined and used in different locations, we need to
-define a variable outside with the correct scope to assign the flag to
-work with.
-
-```go
-var Verbose bool
-var Source string
-```
-
-There are two different approaches to assign a flag.
-
-### Persistent Flags
-
-A flag can be 'persistent' meaning that this flag will be available to the
-command it's assigned to as well as every command under that command. For
-global flags, assign a flag as a persistent flag on the root.
-
-```go
-RootCmd.PersistentFlags().BoolVarP(&Verbose, "verbose", "v", false, "verbose output")
-```
-
-### Local Flags
-
-A flag can also be assigned locally which will only apply to that specific command.
-
-```go
-RootCmd.Flags().StringVarP(&Source, "source", "s", "", "Source directory to read from")
-```
-
-
-## Example
-
-In the example below, we have defined three commands. Two are at the top level
-and one (cmdTimes) is a child of one of the top commands. In this case the root
-is not executable meaning that a subcommand is required. This is accomplished
-by not providing a 'Run' for the 'rootCmd'.
-
-We have only defined one flag for a single command.
-
-More documentation about flags is available at https://github.com/spf13/pflag
-
-```go
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/spf13/cobra"
-)
-
-func main() {
-
-	var echoTimes int
-
-	var cmdPrint = &cobra.Command{
-		Use:   "print [string to print]",
-		Short: "Print anything to the screen",
-		Long: `print is for printing anything back to the screen.
-            For many years people have printed back to the screen.
-            `,
-		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Println("Print: " + strings.Join(args, " "))
-		},
-	}
-
-	var cmdEcho = &cobra.Command{
-		Use:   "echo [string to echo]",
-		Short: "Echo anything to the screen",
-		Long: `echo is for echoing anything back.
-            Echo works a lot like print, except it has a child command.
-            `,
-		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Println("Print: " + strings.Join(args, " "))
-		},
-	}
-
-	var cmdTimes = &cobra.Command{
-		Use:   "times [# times] [string to echo]",
-		Short: "Echo anything to the screen more times",
-		Long: `echo things multiple times back to the user by providing
-            a count and a string.`,
-		Run: func(cmd *cobra.Command, args []string) {
-			for i := 0; i < echoTimes; i++ {
-				fmt.Println("Echo: " + strings.Join(args, " "))
-			}
-		},
-	}
-
-	cmdTimes.Flags().IntVarP(&echoTimes, "times", "t", 1, "times to echo the input")
-
-	var rootCmd = &cobra.Command{Use: "app"}
-	rootCmd.AddCommand(cmdPrint, cmdEcho)
-	cmdEcho.AddCommand(cmdTimes)
-	rootCmd.Execute()
-}
-```
-
-For a more complete example of a larger application, please checkout [Hugo](http://gohugo.io/).
-
-## The Help Command
-
-Cobra automatically adds a help command to your application when you have subcommands.
-This will be called when a user runs 'app help'. Additionally, help will also
-support all other commands as input. Say, for instance, you have a command called
-'create' without any additional configuration; Cobra will work when 'app help
-create' is called.  Every command will automatically have the '--help' flag added.
-
-### Example
-
-The following output is automatically generated by Cobra. Nothing beyond the
-command and flag definitions are needed.
-
-    > hugo help
-    
-    hugo is the main command, used to build your Hugo site.
-    
-    Hugo is a Fast and Flexible Static Site Generator
-    built with love by spf13 and friends in Go.
-    
-    Complete documentation is available at http://gohugo.io/.
-    
-    Usage:
-      hugo [flags]
-      hugo [command]
-    
-    Available Commands:
-      server          Hugo runs its own webserver to render the files
-      version         Print the version number of Hugo
-      config          Print the site configuration
-      check           Check content in the source directory
-      benchmark       Benchmark hugo by building a site a number of times.
-      convert         Convert your content to different formats
-      new             Create new content for your site
-      list            Listing out various types of content
-      undraft         Undraft changes the content's draft status from 'True' to 'False'
-      genautocomplete Generate shell autocompletion script for Hugo
-      gendoc          Generate Markdown documentation for the Hugo CLI.
-      genman          Generate man page for Hugo
-      import          Import your site from others.
-    
-    Flags:
-      -b, --baseURL="": hostname (and path) to the root, e.g. http://spf13.com/
-      -D, --buildDrafts[=false]: include content marked as draft
-      -F, --buildFuture[=false]: include content with publishdate in the future
-          --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-          --canonifyURLs[=false]: if true, all relative URLs will be canonicalized using baseURL
-          --config="": config file (default is path/config.yaml|json|toml)
-      -d, --destination="": filesystem path to write files to
-          --disableRSS[=false]: Do not build RSS files
-          --disableSitemap[=false]: Do not build Sitemap file
-          --editor="": edit new content with this editor, if provided
-          --ignoreCache[=false]: Ignores the cache directory for reading but still writes to it
-          --log[=false]: Enable Logging
-          --logFile="": Log File path (if set, logging enabled automatically)
-          --noTimes[=false]: Don't sync modification time of files
-          --pluralizeListTitles[=true]: Pluralize titles in lists using inflect
-          --preserveTaxonomyNames[=false]: Preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
-      -s, --source="": filesystem path to read files relative from
-          --stepAnalysis[=false]: display memory and timing of different steps of the program
-      -t, --theme="": theme to use (located in /themes/THEMENAME/)
-          --uglyURLs[=false]: if true, use /filename.html instead of /filename/
-      -v, --verbose[=false]: verbose output
-          --verboseLog[=false]: verbose logging
-      -w, --watch[=false]: watch filesystem for changes and recreate as needed
-    
-    Use "hugo [command] --help" for more information about a command.
-
-
-Help is just a command like any other. There is no special logic or behavior
-around it. In fact, you can provide your own if you want.
-
-### Defining your own help
-
-You can provide your own Help command or you own template for the default command to use.
-
-The default help command is
-
-```go
-func (c *Command) initHelp() {
-	if c.helpCommand == nil {
-		c.helpCommand = &Command{
-			Use:   "help [command]",
-			Short: "Help about any command",
-			Long: `Help provides help for any command in the application.
-        Simply type ` + c.Name() + ` help [path to command] for full details.`,
-			Run: c.HelpFunc(),
-		}
-	}
-	c.AddCommand(c.helpCommand)
-}
-```
-
-You can provide your own command, function or template through the following methods:
-
-```go
-command.SetHelpCommand(cmd *Command)
-
-command.SetHelpFunc(f func(*Command, []string))
-
-command.SetHelpTemplate(s string)
-```
-
-The latter two will also apply to any children commands.
-
-## Usage
-
-When the user provides an invalid flag or invalid command, Cobra responds by
-showing the user the 'usage'.
-
-### Example
-You may recognize this from the help above. That's because the default help
-embeds the usage as part of its output.
-
-    Usage:
-      hugo [flags]
-      hugo [command]
-    
-    Available Commands:
-      server          Hugo runs its own webserver to render the files
-      version         Print the version number of Hugo
-      config          Print the site configuration
-      check           Check content in the source directory
-      benchmark       Benchmark hugo by building a site a number of times.
-      convert         Convert your content to different formats
-      new             Create new content for your site
-      list            Listing out various types of content
-      undraft         Undraft changes the content's draft status from 'True' to 'False'
-      genautocomplete Generate shell autocompletion script for Hugo
-      gendoc          Generate Markdown documentation for the Hugo CLI.
-      genman          Generate man page for Hugo
-      import          Import your site from others.
-    
-    Flags:
-      -b, --baseURL="": hostname (and path) to the root, e.g. http://spf13.com/
-      -D, --buildDrafts[=false]: include content marked as draft
-      -F, --buildFuture[=false]: include content with publishdate in the future
-          --cacheDir="": filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/
-          --canonifyURLs[=false]: if true, all relative URLs will be canonicalized using baseURL
-          --config="": config file (default is path/config.yaml|json|toml)
-      -d, --destination="": filesystem path to write files to
-          --disableRSS[=false]: Do not build RSS files
-          --disableSitemap[=false]: Do not build Sitemap file
-          --editor="": edit new content with this editor, if provided
-          --ignoreCache[=false]: Ignores the cache directory for reading but still writes to it
-          --log[=false]: Enable Logging
-          --logFile="": Log File path (if set, logging enabled automatically)
-          --noTimes[=false]: Don't sync modification time of files
-          --pluralizeListTitles[=true]: Pluralize titles in lists using inflect
-          --preserveTaxonomyNames[=false]: Preserve taxonomy names as written ("Gérard Depardieu" vs "gerard-depardieu")
-      -s, --source="": filesystem path to read files relative from
-          --stepAnalysis[=false]: display memory and timing of different steps of the program
-      -t, --theme="": theme to use (located in /themes/THEMENAME/)
-          --uglyURLs[=false]: if true, use /filename.html instead of /filename/
-      -v, --verbose[=false]: verbose output
-          --verboseLog[=false]: verbose logging
-      -w, --watch[=false]: watch filesystem for changes and recreate as needed
-
-### Defining your own usage
-You can provide your own usage function or template for Cobra to use.
-
-The default usage function is:
-
-```go
-return func(c *Command) error {
-	err := tmpl(c.Out(), c.UsageTemplate(), c)
-	return err
-}
-```
-
-Like help, the function and template are overridable through public methods:
-
-```go
-command.SetUsageFunc(f func(*Command) error)
-
-command.SetUsageTemplate(s string)
-```
-
-## PreRun or PostRun Hooks
-
-It is possible to run functions before or after the main `Run` function of your command. The `PersistentPreRun` and `PreRun` functions will be executed before `Run`. `PersistentPostRun` and `PostRun` will be executed after `Run`.  The `Persistent*Run` functions will be inherrited by children if they do not declare their own.  These function are run in the following order:
-
-- `PersistentPreRun`
-- `PreRun`
-- `Run`
-- `PostRun`
-- `PersistentPostRun`
-
-An example of two commands which use all of these features is below.  When the subcommand is executed, it will run the root command's `PersistentPreRun` but not the root command's `PersistentPostRun`:
-
-```go
-package main
-
-import (
-	"fmt"
-
-	"github.com/spf13/cobra"
-)
-
-func main() {
-
-	var rootCmd = &cobra.Command{
-		Use:   "root [sub]",
-		Short: "My root command",
-		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("Inside rootCmd PersistentPreRun with args: %v\n", args)
-		},
-		PreRun: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("Inside rootCmd PreRun with args: %v\n", args)
-		},
-		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("Inside rootCmd Run with args: %v\n", args)
-		},
-		PostRun: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("Inside rootCmd PostRun with args: %v\n", args)
-		},
-		PersistentPostRun: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("Inside rootCmd PersistentPostRun with args: %v\n", args)
-		},
-	}
-
-	var subCmd = &cobra.Command{
-		Use:   "sub [no options!]",
-		Short: "My subcommand",
-		PreRun: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("Inside subCmd PreRun with args: %v\n", args)
-		},
-		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("Inside subCmd Run with args: %v\n", args)
-		},
-		PostRun: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("Inside subCmd PostRun with args: %v\n", args)
-		},
-		PersistentPostRun: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("Inside subCmd PersistentPostRun with args: %v\n", args)
-		},
-	}
-
-	rootCmd.AddCommand(subCmd)
-
-	rootCmd.SetArgs([]string{""})
-	_ = rootCmd.Execute()
-	fmt.Print("\n")
-	rootCmd.SetArgs([]string{"sub", "arg1", "arg2"})
-	_ = rootCmd.Execute()
-}
-```
-
-
-## Alternative Error Handling
-
-Cobra also has functions where the return signature is an error. This allows for errors to bubble up to the top, providing a way to handle the errors in one location. The current list of functions that return an error is:
-
-* PersistentPreRunE
-* PreRunE
-* RunE
-* PostRunE
-* PersistentPostRunE
-
-**Example Usage using RunE:**
-
-```go
-package main
-
-import (
-	"errors"
-	"log"
-
-	"github.com/spf13/cobra"
-)
-
-func main() {
-	var rootCmd = &cobra.Command{
-		Use:   "hugo",
-		Short: "Hugo is a very fast static site generator",
-		Long: `A Fast and Flexible Static Site Generator built with
-                love by spf13 and friends in Go.
-                Complete documentation is available at http://hugo.spf13.com`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			// Do Stuff Here
-			return errors.New("some random error")
-		},
-	}
-
-	if err := rootCmd.Execute(); err != nil {
-		log.Fatal(err)
-	}
-}
-```
-
-## Suggestions when "unknown command" happens
-
-Cobra will print automatic suggestions when "unknown command" errors happen. This allows Cobra to behave similarly to the `git` command when a typo happens. For example:
-
-```
-$ hugo srever
-Error: unknown command "srever" for "hugo"
-
-Did you mean this?
-        server
-
-Run 'hugo --help' for usage.
-```
-
-Suggestions are automatic based on every subcommand registered and use an implementation of [Levenshtein distance](http://en.wikipedia.org/wiki/Levenshtein_distance). Every registered command that matches a minimum distance of 2 (ignoring case) will be displayed as a suggestion.
-
-If you need to disable suggestions or tweak the string distance in your command, use:
-
-```go
-command.DisableSuggestions = true
-```
-
-or
-
-```go
-command.SuggestionsMinimumDistance = 1
-```
-
-You can also explicitly set names for which a given command will be suggested using the `SuggestFor` attribute. This allows suggestions for strings that are not close in terms of string distance, but makes sense in your set of commands and for some which you don't want aliases. Example:
-
-```
-$ kubectl remove
-Error: unknown command "remove" for "kubectl"
-
-Did you mean this?
-        delete
-
-Run 'kubectl help' for usage.
-```
-
-## Generating Markdown-formatted documentation for your command
-
-Cobra can generate a Markdown-formatted document based on the subcommands, flags, etc. A simple example of how to do this for your command can be found in [Markdown Docs](md_docs.md).
-
-## Generating man pages for your command
-
-Cobra can generate a man page based on the subcommands, flags, etc. A simple example of how to do this for your command can be found in [Man Docs](man_docs.md).
-
-## Generating bash completions for your command
-
-Cobra can generate a bash-completion file. If you add more information to your command, these completions can be amazingly powerful and flexible.  Read more about it in [Bash Completions](bash_completions.md).
-
-## Debugging
-
-Cobra provides a ‘DebugFlags’ method on a command which, when called, will print
-out everything Cobra knows about the flags for each command.
-
-### Example
-
-```go
-command.DebugFlags()
-```
-
-## Release Notes
-* **0.9.0** June 17, 2014
-  * flags can appears anywhere in the args (provided they are unambiguous)
-  * --help prints usage screen for app or command
-  * Prefix matching for commands
-  * Cleaner looking help and usage output
-  * Extensive test suite
-* **0.8.0** Nov 5, 2013
-  * Reworked interface to remove commander completely
-  * Command now primary structure
-  * No initialization needed
-  * Usage & Help templates & functions definable at any level
-  * Updated Readme
-* **0.7.0** Sept 24, 2013
-  * Needs more eyes
-  * Test suite
-  * Support for automatic error messages
-  * Support for help command
-  * Support for printing to any io.Writer instead of os.Stderr
-  * Support for persistent flags which cascade down tree
-  * Ready for integration into Hugo
-* **0.1.0** Sept 3, 2013
-  * Implement first draft
-
-## Extensions
-
-Libraries for extending Cobra:
-
-* [cmdns](https://github.com/gosuri/cmdns): Enables name spacing a command's immediate children. It provides an alternative way to structure subcommands, similar to `heroku apps:create` and `ovrclk clusters:launch`.
-
-## ToDo
-* Launch proper documentation site
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## Contributors
-
-Names in no particular order:
-
-* [spf13](https://github.com/spf13), 
-[eparis](https://github.com/eparis), 
-[bep](https://github.com/bep), and many more!
-
-## License
-
-Cobra is released under the Apache 2.0 license. See [LICENSE.txt](https://github.com/spf13/cobra/blob/master/LICENSE.txt)
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/spf13/cobra/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.go b/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.go
deleted file mode 100644
index 965bfdb036..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.go
+++ /dev/null
@@ -1,425 +0,0 @@
-package cobra
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"sort"
-	"strings"
-
-	"github.com/spf13/pflag"
-)
-
-const (
-	BashCompFilenameExt     = "cobra_annotation_bash_completion_filename_extentions"
-	BashCompOneRequiredFlag = "cobra_annotation_bash_completion_one_required_flag"
-	BashCompSubdirsInDir    = "cobra_annotation_bash_completion_subdirs_in_dir"
-)
-
-func preamble(out *bytes.Buffer) {
-	fmt.Fprintf(out, `#!/bin/bash
-
-__debug()
-{
-    if [[ -n ${BASH_COMP_DEBUG_FILE} ]]; then
-        echo "$*" >> "${BASH_COMP_DEBUG_FILE}"
-    fi
-}
-
-# Homebrew on Macs have version 1.3 of bash-completion which doesn't include
-# _init_completion. This is a very minimal version of that function.
-__my_init_completion()
-{
-    COMPREPLY=()
-    _get_comp_words_by_ref cur prev words cword
-}
-
-__index_of_word()
-{
-    local w word=$1
-    shift
-    index=0
-    for w in "$@"; do
-        [[ $w = "$word" ]] && return
-        index=$((index+1))
-    done
-    index=-1
-}
-
-__contains_word()
-{
-    local w word=$1; shift
-    for w in "$@"; do
-        [[ $w = "$word" ]] && return
-    done
-    return 1
-}
-
-__handle_reply()
-{
-    __debug "${FUNCNAME}"
-    case $cur in
-        -*)
-            if [[ $(type -t compopt) = "builtin" ]]; then
-                compopt -o nospace
-            fi
-            local allflags
-            if [ ${#must_have_one_flag[@]} -ne 0 ]; then
-                allflags=("${must_have_one_flag[@]}")
-            else
-                allflags=("${flags[*]} ${two_word_flags[*]}")
-            fi
-            COMPREPLY=( $(compgen -W "${allflags[*]}" -- "$cur") )
-            if [[ $(type -t compopt) = "builtin" ]]; then
-                [[ $COMPREPLY == *= ]] || compopt +o nospace
-            fi
-            return 0;
-            ;;
-    esac
-
-    # check if we are handling a flag with special work handling
-    local index
-    __index_of_word "${prev}" "${flags_with_completion[@]}"
-    if [[ ${index} -ge 0 ]]; then
-        ${flags_completion[${index}]}
-        return
-    fi
-
-    # we are parsing a flag and don't have a special handler, no completion
-    if [[ ${cur} != "${words[cword]}" ]]; then
-        return
-    fi
-
-    local completions
-    if [[ ${#must_have_one_flag[@]} -ne 0 ]]; then
-        completions=("${must_have_one_flag[@]}")
-    elif [[ ${#must_have_one_noun[@]} -ne 0 ]]; then
-        completions=("${must_have_one_noun[@]}")
-    else
-        completions=("${commands[@]}")
-    fi
-    COMPREPLY=( $(compgen -W "${completions[*]}" -- "$cur") )
-
-    if [[ ${#COMPREPLY[@]} -eq 0 ]]; then
-        declare -F __custom_func >/dev/null && __custom_func
-    fi
-}
-
-# The arguments should be in the form "ext1|ext2|extn"
-__handle_filename_extension_flag()
-{
-    local ext="$1"
-    _filedir "@(${ext})"
-}
-
-__handle_subdirs_in_dir_flag()
-{
-    local dir="$1"
-    pushd "${dir}" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1
-}
-
-__handle_flag()
-{
-    __debug "${FUNCNAME}: c is $c words[c] is ${words[c]}"
-
-    # if a command required a flag, and we found it, unset must_have_one_flag()
-    local flagname=${words[c]}
-    # if the word contained an =
-    if [[ ${words[c]} == *"="* ]]; then
-        flagname=${flagname%%=*} # strip everything after the =
-        flagname="${flagname}=" # but put the = back
-    fi
-    __debug "${FUNCNAME}: looking for ${flagname}"
-    if __contains_word "${flagname}" "${must_have_one_flag[@]}"; then
-        must_have_one_flag=()
-    fi
-
-    # skip the argument to a two word flag
-    if __contains_word "${words[c]}" "${two_word_flags[@]}"; then
-        c=$((c+1))
-        # if we are looking for a flags value, don't show commands
-        if [[ $c -eq $cword ]]; then
-            commands=()
-        fi
-    fi
-
-    # skip the flag itself
-    c=$((c+1))
-
-}
-
-__handle_noun()
-{
-    __debug "${FUNCNAME}: c is $c words[c] is ${words[c]}"
-
-    if __contains_word "${words[c]}" "${must_have_one_noun[@]}"; then
-        must_have_one_noun=()
-    fi
-
-    nouns+=("${words[c]}")
-    c=$((c+1))
-}
-
-__handle_command()
-{
-    __debug "${FUNCNAME}: c is $c words[c] is ${words[c]}"
-
-    local next_command
-    if [[ -n ${last_command} ]]; then
-        next_command="_${last_command}_${words[c]}"
-    else
-        next_command="_${words[c]}"
-    fi
-    c=$((c+1))
-    __debug "${FUNCNAME}: looking for ${next_command}"
-    declare -F $next_command >/dev/null && $next_command
-}
-
-__handle_word()
-{
-    if [[ $c -ge $cword ]]; then
-        __handle_reply
-        return
-    fi
-    __debug "${FUNCNAME}: c is $c words[c] is ${words[c]}"
-    if [[ "${words[c]}" == -* ]]; then
-        __handle_flag
-    elif __contains_word "${words[c]}" "${commands[@]}"; then
-        __handle_command
-    else
-        __handle_noun
-    fi
-    __handle_word
-}
-
-`)
-}
-
-func postscript(out *bytes.Buffer, name string) {
-	fmt.Fprintf(out, "__start_%s()\n", name)
-	fmt.Fprintf(out, `{
-    local cur prev words cword
-    if declare -F _init_completion >/dev/null 2>&1; then
-        _init_completion -s || return
-    else
-        __my_init_completion || return
-    fi
-
-    local c=0
-    local flags=()
-    local two_word_flags=()
-    local flags_with_completion=()
-    local flags_completion=()
-    local commands=("%s")
-    local must_have_one_flag=()
-    local must_have_one_noun=()
-    local last_command
-    local nouns=()
-
-    __handle_word
-}
-
-`, name)
-	fmt.Fprintf(out, `if [[ $(type -t compopt) = "builtin" ]]; then
-    complete -F __start_%s %s
-else
-    complete -o nospace -F __start_%s %s
-fi
-
-`, name, name, name, name)
-	fmt.Fprintf(out, "# ex: ts=4 sw=4 et filetype=sh\n")
-}
-
-func writeCommands(cmd *Command, out *bytes.Buffer) {
-	fmt.Fprintf(out, "    commands=()\n")
-	for _, c := range cmd.Commands() {
-		if !c.IsAvailableCommand() || c == cmd.helpCommand {
-			continue
-		}
-		fmt.Fprintf(out, "    commands+=(%q)\n", c.Name())
-	}
-	fmt.Fprintf(out, "\n")
-}
-
-func writeFlagHandler(name string, annotations map[string][]string, out *bytes.Buffer) {
-	for key, value := range annotations {
-		switch key {
-		case BashCompFilenameExt:
-			fmt.Fprintf(out, "    flags_with_completion+=(%q)\n", name)
-
-			if len(value) > 0 {
-				ext := "__handle_filename_extension_flag " + strings.Join(value, "|")
-				fmt.Fprintf(out, "    flags_completion+=(%q)\n", ext)
-			} else {
-				ext := "_filedir"
-				fmt.Fprintf(out, "    flags_completion+=(%q)\n", ext)
-			}
-		case BashCompSubdirsInDir:
-			fmt.Fprintf(out, "    flags_with_completion+=(%q)\n", name)
-
-			if len(value) == 1 {
-				ext := "__handle_subdirs_in_dir_flag " + value[0]
-				fmt.Fprintf(out, "    flags_completion+=(%q)\n", ext)
-			} else {
-				ext := "_filedir -d"
-				fmt.Fprintf(out, "    flags_completion+=(%q)\n", ext)
-			}
-		}
-	}
-}
-
-func writeShortFlag(flag *pflag.Flag, out *bytes.Buffer) {
-	b := (flag.Value.Type() == "bool")
-	name := flag.Shorthand
-	format := "    "
-	if !b {
-		format += "two_word_"
-	}
-	format += "flags+=(\"-%s\")\n"
-	fmt.Fprintf(out, format, name)
-	writeFlagHandler("-"+name, flag.Annotations, out)
-}
-
-func writeFlag(flag *pflag.Flag, out *bytes.Buffer) {
-	b := (flag.Value.Type() == "bool")
-	name := flag.Name
-	format := "    flags+=(\"--%s"
-	if !b {
-		format += "="
-	}
-	format += "\")\n"
-	fmt.Fprintf(out, format, name)
-	writeFlagHandler("--"+name, flag.Annotations, out)
-}
-
-func writeFlags(cmd *Command, out *bytes.Buffer) {
-	fmt.Fprintf(out, `    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-`)
-	cmd.NonInheritedFlags().VisitAll(func(flag *pflag.Flag) {
-		writeFlag(flag, out)
-		if len(flag.Shorthand) > 0 {
-			writeShortFlag(flag, out)
-		}
-	})
-	cmd.InheritedFlags().VisitAll(func(flag *pflag.Flag) {
-		writeFlag(flag, out)
-		if len(flag.Shorthand) > 0 {
-			writeShortFlag(flag, out)
-		}
-	})
-
-	fmt.Fprintf(out, "\n")
-}
-
-func writeRequiredFlag(cmd *Command, out *bytes.Buffer) {
-	fmt.Fprintf(out, "    must_have_one_flag=()\n")
-	flags := cmd.NonInheritedFlags()
-	flags.VisitAll(func(flag *pflag.Flag) {
-		for key := range flag.Annotations {
-			switch key {
-			case BashCompOneRequiredFlag:
-				format := "    must_have_one_flag+=(\"--%s"
-				b := (flag.Value.Type() == "bool")
-				if !b {
-					format += "="
-				}
-				format += "\")\n"
-				fmt.Fprintf(out, format, flag.Name)
-
-				if len(flag.Shorthand) > 0 {
-					fmt.Fprintf(out, "    must_have_one_flag+=(\"-%s\")\n", flag.Shorthand)
-				}
-			}
-		}
-	})
-}
-
-func writeRequiredNoun(cmd *Command, out *bytes.Buffer) {
-	fmt.Fprintf(out, "    must_have_one_noun=()\n")
-	sort.Sort(sort.StringSlice(cmd.ValidArgs))
-	for _, value := range cmd.ValidArgs {
-		fmt.Fprintf(out, "    must_have_one_noun+=(%q)\n", value)
-	}
-}
-
-func gen(cmd *Command, out *bytes.Buffer) {
-	for _, c := range cmd.Commands() {
-		if !c.IsAvailableCommand() || c == cmd.helpCommand {
-			continue
-		}
-		gen(c, out)
-	}
-	commandName := cmd.CommandPath()
-	commandName = strings.Replace(commandName, " ", "_", -1)
-	fmt.Fprintf(out, "_%s()\n{\n", commandName)
-	fmt.Fprintf(out, "    last_command=%q\n", commandName)
-	writeCommands(cmd, out)
-	writeFlags(cmd, out)
-	writeRequiredFlag(cmd, out)
-	writeRequiredNoun(cmd, out)
-	fmt.Fprintf(out, "}\n\n")
-}
-
-func (cmd *Command) GenBashCompletion(out *bytes.Buffer) {
-	preamble(out)
-	if len(cmd.BashCompletionFunction) > 0 {
-		fmt.Fprintf(out, "%s\n", cmd.BashCompletionFunction)
-	}
-	gen(cmd, out)
-	postscript(out, cmd.Name())
-}
-
-func (cmd *Command) GenBashCompletionFile(filename string) error {
-	out := new(bytes.Buffer)
-
-	cmd.GenBashCompletion(out)
-
-	outFile, err := os.Create(filename)
-	if err != nil {
-		return err
-	}
-	defer outFile.Close()
-
-	_, err = outFile.Write(out.Bytes())
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// MarkFlagRequired adds the BashCompOneRequiredFlag annotation to the named flag, if it exists.
-func (cmd *Command) MarkFlagRequired(name string) error {
-	return MarkFlagRequired(cmd.Flags(), name)
-}
-
-// MarkPersistentFlagRequired adds the BashCompOneRequiredFlag annotation to the named persistent flag, if it exists.
-func (cmd *Command) MarkPersistentFlagRequired(name string) error {
-	return MarkFlagRequired(cmd.PersistentFlags(), name)
-}
-
-// MarkFlagRequired adds the BashCompOneRequiredFlag annotation to the named flag in the flag set, if it exists.
-func MarkFlagRequired(flags *pflag.FlagSet, name string) error {
-	return flags.SetAnnotation(name, BashCompOneRequiredFlag, []string{"true"})
-}
-
-// MarkFlagFilename adds the BashCompFilenameExt annotation to the named flag, if it exists.
-// Generated bash autocompletion will select filenames for the flag, limiting to named extensions if provided.
-func (cmd *Command) MarkFlagFilename(name string, extensions ...string) error {
-	return MarkFlagFilename(cmd.Flags(), name, extensions...)
-}
-
-// MarkPersistentFlagFilename adds the BashCompFilenameExt annotation to the named persistent flag, if it exists.
-// Generated bash autocompletion will select filenames for the flag, limiting to named extensions if provided.
-func (cmd *Command) MarkPersistentFlagFilename(name string, extensions ...string) error {
-	return MarkFlagFilename(cmd.PersistentFlags(), name, extensions...)
-}
-
-// MarkFlagFilename adds the BashCompFilenameExt annotation to the named flag in the flag set, if it exists.
-// Generated bash autocompletion will select filenames for the flag, limiting to named extensions if provided.
-func MarkFlagFilename(flags *pflag.FlagSet, name string, extensions ...string) error {
-	return flags.SetAnnotation(name, BashCompFilenameExt, extensions)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.md b/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.md
deleted file mode 100644
index 204704efc1..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/bash_completions.md
+++ /dev/null
@@ -1,149 +0,0 @@
-# Generating Bash Completions For Your Own cobra.Command
-
-Generating bash completions from a cobra command is incredibly easy. An actual program which does so for the kubernetes kubectl binary is as follows:
-
-```go
-package main
-
-import (
-        "io/ioutil"
-        "os"
-
-        "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd"
-)
-
-func main() {
-        kubectl := cmd.NewFactory(nil).NewKubectlCommand(os.Stdin, ioutil.Discard, ioutil.Discard)
-        kubectl.GenBashCompletionFile("out.sh")
-}
-```
-
-That will get you completions of subcommands and flags. If you make additional annotations to your code, you can get even more intelligent and flexible behavior.
-
-## Creating your own custom functions
-
-Some more actual code that works in kubernetes:
-
-```bash
-const (
-        bash_completion_func = `__kubectl_parse_get()
-{
-    local kubectl_output out
-    if kubectl_output=$(kubectl get --no-headers "$1" 2>/dev/null); then
-        out=($(echo "${kubectl_output}" | awk '{print $1}'))
-        COMPREPLY=( $( compgen -W "${out[*]}" -- "$cur" ) )
-    fi
-}
-
-__kubectl_get_resource()
-{
-    if [[ ${#nouns[@]} -eq 0 ]]; then
-        return 1
-    fi
-    __kubectl_parse_get ${nouns[${#nouns[@]} -1]}
-    if [[ $? -eq 0 ]]; then
-        return 0
-    fi
-}
-
-__custom_func() {
-    case ${last_command} in
-        kubectl_get | kubectl_describe | kubectl_delete | kubectl_stop)
-            __kubectl_get_resource
-            return
-            ;;
-        *)
-            ;;
-    esac
-}
-`)
-```
-
-And then I set that in my command definition:
-
-```go
-cmds := &cobra.Command{
-	Use:   "kubectl",
-	Short: "kubectl controls the Kubernetes cluster manager",
-	Long: `kubectl controls the Kubernetes cluster manager.
-
-Find more information at https://github.com/GoogleCloudPlatform/kubernetes.`,
-	Run: runHelp,
-	BashCompletionFunction: bash_completion_func,
-}
-```
-
-The `BashCompletionFunction` option is really only valid/useful on the root command. Doing the above will cause `__custom_func()` to be called when the built in processor was unable to find a solution. In the case of kubernetes a valid command might look something like `kubectl get pod [mypod]`. If you type `kubectl get pod [tab][tab]` the `__customc_func()` will run because the cobra.Command only understood "kubectl" and "get." `__custom_func()` will see that the cobra.Command is "kubectl_get" and will thus call another helper `__kubectl_get_resource()`.  `__kubectl_get_resource` will look at the 'nouns' collected. In our example the only noun will be `pod`.  So it will call `__kubectl_parse_get pod`.  `__kubectl_parse_get` will actually call out to kubernetes and get any pods.  It will then set `COMPREPLY` to valid pods!
-
-## Have the completions code complete your 'nouns'
-
-In the above example "pod" was assumed to already be typed. But if you want `kubectl get [tab][tab]` to show a list of valid "nouns" you have to set them. Simplified code from `kubectl get` looks like:
-
-```go
-validArgs []string = { "pods", "nodes", "services", "replicationControllers" }
-
-cmd := &cobra.Command{
-	Use:     "get [(-o|--output=)json|yaml|template|...] (RESOURCE [NAME] | RESOURCE/NAME ...)",
-	Short:   "Display one or many resources",
-	Long:    get_long,
-	Example: get_example,
-	Run: func(cmd *cobra.Command, args []string) {
-		err := RunGet(f, out, cmd, args)
-		util.CheckErr(err)
-	},
-	ValidArgs: validArgs,
-}
-```
-
-Notice we put the "ValidArgs" on the "get" subcommand. Doing so will give results like
-
-```bash
-# kubectl get [tab][tab]
-nodes                 pods                    replicationControllers  services
-```
-
-## Mark flags as required
-
-Most of the time completions will only show subcommands. But if a flag is required to make a subcommand work, you probably want it to show up when the user types [tab][tab].  Marking a flag as 'Required' is incredibly easy.
-
-```go
-cmd.MarkFlagRequired("pod")
-cmd.MarkFlagRequired("container")
-```
-
-and you'll get something like
-
-```bash
-# kubectl exec [tab][tab][tab]
--c            --container=  -p            --pod=  
-```
-
-# Specify valid filename extensions for flags that take a filename
-
-In this example we use --filename= and expect to get a json or yaml file as the argument. To make this easier we annotate the --filename flag with valid filename extensions.
-
-```go
-	annotations := []string{"json", "yaml", "yml"}
-	annotation := make(map[string][]string)
-	annotation[cobra.BashCompFilenameExt] = annotations
-
-	flag := &pflag.Flag{
-		Name:        "filename",
-		Shorthand:   "f",
-		Usage:       usage,
-		Value:       value,
-		DefValue:    value.String(),
-		Annotations: annotation,
-	}
-	cmd.Flags().AddFlag(flag)
-```
-
-Now when you run a command with this filename flag you'll get something like
-
-```bash
-# kubectl create -f 
-test/                         example/                      rpmbuild/
-hello.yml                     test.json
-```
-
-So while there are many other files in the CWD it only shows me subdirs and those with valid extensions.
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go
deleted file mode 100644
index 20957cdd1f..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Commands similar to git, go tools and other modern CLI tools
-// inspired by go, go-Commander, gh and subcommand
-
-package cobra
-
-import (
-	"fmt"
-	"io"
-	"reflect"
-	"strconv"
-	"strings"
-	"text/template"
-	"unicode"
-)
-
-var templateFuncs template.FuncMap = template.FuncMap{
-	"trim":           strings.TrimSpace,
-	"trimRightSpace": trimRightSpace,
-	"rpad":           rpad,
-	"gt":             Gt,
-	"eq":             Eq,
-}
-
-var initializers []func()
-
-// automatic prefix matching can be a dangerous thing to automatically enable in CLI tools.
-// Set this to true to enable it
-var EnablePrefixMatching bool = false
-
-// enables an information splash screen on Windows if the CLI is started from explorer.exe.
-var EnableWindowsMouseTrap bool = true
-
-var MousetrapHelpText string = `This is a command line tool
-
-You need to open cmd.exe and run it from there.
-`
-
-//AddTemplateFunc adds a template function that's available to Usage and Help
-//template generation.
-func AddTemplateFunc(name string, tmplFunc interface{}) {
-	templateFuncs[name] = tmplFunc
-}
-
-//AddTemplateFuncs adds multiple template functions availalble to Usage and
-//Help template generation.
-func AddTemplateFuncs(tmplFuncs template.FuncMap) {
-	for k, v := range tmplFuncs {
-		templateFuncs[k] = v
-	}
-}
-
-//OnInitialize takes a series of func() arguments and appends them to a slice of func().
-func OnInitialize(y ...func()) {
-	for _, x := range y {
-		initializers = append(initializers, x)
-	}
-}
-
-//Gt takes two types and checks whether the first type is greater than the second. In case of types Arrays, Chans,
-//Maps and Slices, Gt will compare their lengths. Ints are compared directly while strings are first parsed as
-//ints and then compared.
-func Gt(a interface{}, b interface{}) bool {
-	var left, right int64
-	av := reflect.ValueOf(a)
-
-	switch av.Kind() {
-	case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
-		left = int64(av.Len())
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		left = av.Int()
-	case reflect.String:
-		left, _ = strconv.ParseInt(av.String(), 10, 64)
-	}
-
-	bv := reflect.ValueOf(b)
-
-	switch bv.Kind() {
-	case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
-		right = int64(bv.Len())
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		right = bv.Int()
-	case reflect.String:
-		right, _ = strconv.ParseInt(bv.String(), 10, 64)
-	}
-
-	return left > right
-}
-
-//Eq takes two types and checks whether they are equal. Supported types are int and string. Unsupported types will panic.
-func Eq(a interface{}, b interface{}) bool {
-	av := reflect.ValueOf(a)
-	bv := reflect.ValueOf(b)
-
-	switch av.Kind() {
-	case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
-		panic("Eq called on unsupported type")
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return av.Int() == bv.Int()
-	case reflect.String:
-		return av.String() == bv.String()
-	}
-	return false
-}
-
-func trimRightSpace(s string) string {
-	return strings.TrimRightFunc(s, unicode.IsSpace)
-}
-
-//rpad adds padding to the right of a string
-func rpad(s string, padding int) string {
-	template := fmt.Sprintf("%%-%ds", padding)
-	return fmt.Sprintf(template, s)
-}
-
-// tmpl executes the given template text on data, writing the result to w.
-func tmpl(w io.Writer, text string, data interface{}) error {
-	t := template.New("top")
-	t.Funcs(templateFuncs)
-	template.Must(t.Parse(text))
-	return t.Execute(w, data)
-}
-
-// ld compares two strings and returns the levenshtein distance between them
-func ld(s, t string, ignoreCase bool) int {
-	if ignoreCase {
-		s = strings.ToLower(s)
-		t = strings.ToLower(t)
-	}
-	d := make([][]int, len(s)+1)
-	for i := range d {
-		d[i] = make([]int, len(t)+1)
-	}
-	for i := range d {
-		d[i][0] = i
-	}
-	for j := range d[0] {
-		d[0][j] = j
-	}
-	for j := 1; j <= len(t); j++ {
-		for i := 1; i <= len(s); i++ {
-			if s[i-1] == t[j-1] {
-				d[i][j] = d[i-1][j-1]
-			} else {
-				min := d[i-1][j]
-				if d[i][j-1] < min {
-					min = d[i][j-1]
-				}
-				if d[i-1][j-1] < min {
-					min = d[i-1][j-1]
-				}
-				d[i][j] = min + 1
-			}
-		}
-
-	}
-	return d[len(s)][len(t)]
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/add.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/add.go
deleted file mode 100644
index b89d4c4741..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/add.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright © 2015 Steve Francia <spf@spf13.com>.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cmd
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-func init() {
-	RootCmd.AddCommand(addCmd)
-}
-
-var pName string
-
-// initialize Command
-var addCmd = &cobra.Command{
-	Use:     "add [command name]",
-	Aliases: []string{"command"},
-	Short:   "Add a command to a Cobra Application",
-	Long: `Add (cobra add) will create a new command, with a license and
-the appropriate structure for a Cobra-based CLI application,
-and register it to its parent (default RootCmd).
-
-If you want your command to be public, pass in the command name
-with an initial uppercase letter.
-
-Example: cobra add server  -> resulting in a new cmd/server.go
-  `,
-
-	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) != 1 {
-			er("add needs a name for the command")
-		}
-		guessProjectPath()
-		createCmdFile(args[0])
-	},
-}
-
-func init() {
-	addCmd.Flags().StringVarP(&pName, "parent", "p", "RootCmd", "name of parent command for this command")
-}
-
-func parentName() string {
-	if !strings.HasSuffix(strings.ToLower(pName), "cmd") {
-		return pName + "Cmd"
-	}
-
-	return pName
-}
-
-func createCmdFile(cmdName string) {
-	lic := getLicense()
-
-	template := `{{ comment .copyright }}
-{{ comment .license }}
-
-package cmd
-
-import (
-	"fmt"
-
-	"github.com/spf13/cobra"
-)
-
-// {{.cmdName}}Cmd represents the {{.cmdName}} command
-var {{ .cmdName }}Cmd = &cobra.Command{
-	Use:   "{{ .cmdName }}",
-	Short: "A brief description of your command",
-	Long: ` + "`" + `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.` + "`" + `,
-	Run: func(cmd *cobra.Command, args []string) {
-		// TODO: Work your own magic here
-		fmt.Println("{{ .cmdName }} called")
-	},
-}
-
-func init() {
-	{{ .parentName }}.AddCommand({{ .cmdName }}Cmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// {{.cmdName}}Cmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// {{.cmdName}}Cmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-
-}
-`
-
-	var data map[string]interface{}
-	data = make(map[string]interface{})
-
-	data["copyright"] = copyrightLine()
-	data["license"] = lic.Header
-	data["appName"] = projectName()
-	data["viper"] = viper.GetBool("useViper")
-	data["parentName"] = parentName()
-	data["cmdName"] = cmdName
-
-	err := writeTemplateToFile(filepath.Join(ProjectPath(), guessCmdDir()), cmdName+".go", template, data)
-	if err != nil {
-		er(err)
-	}
-	fmt.Println(cmdName, "created at", filepath.Join(ProjectPath(), guessCmdDir(), cmdName+".go"))
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/helpers.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/helpers.go
deleted file mode 100644
index 3f6357f0ea..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/helpers.go
+++ /dev/null
@@ -1,347 +0,0 @@
-// Copyright © 2015 Steve Francia <spf@spf13.com>.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cmd
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"text/template"
-	"time"
-
-	"github.com/spf13/viper"
-)
-
-// var BaseDir = ""
-// var AppName = ""
-// var CommandDir = ""
-
-var funcMap template.FuncMap
-var projectPath = ""
-var inputPath = ""
-var projectBase = ""
-
-// for testing only
-var testWd = ""
-
-var cmdDirs = []string{"cmd", "cmds", "command", "commands"}
-
-func init() {
-	funcMap = template.FuncMap{
-		"comment": commentifyString,
-	}
-}
-
-func er(msg interface{}) {
-	fmt.Println("Error:", msg)
-	os.Exit(-1)
-}
-
-// Check if a file or directory exists.
-func exists(path string) (bool, error) {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true, nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}
-
-func ProjectPath() string {
-	if projectPath == "" {
-		guessProjectPath()
-	}
-
-	return projectPath
-}
-
-// wrapper of the os package so we can test better
-func getWd() (string, error) {
-	if testWd == "" {
-		return os.Getwd()
-	}
-	return testWd, nil
-}
-
-func guessCmdDir() string {
-	guessProjectPath()
-	if b, _ := isEmpty(projectPath); b {
-		return "cmd"
-	}
-
-	files, _ := filepath.Glob(projectPath + string(os.PathSeparator) + "c*")
-	for _, f := range files {
-		for _, c := range cmdDirs {
-			if f == c {
-				return c
-			}
-		}
-	}
-
-	return "cmd"
-}
-
-func guessImportPath() string {
-	guessProjectPath()
-
-	if !strings.HasPrefix(projectPath, getSrcPath()) {
-		er("Cobra only supports project within $GOPATH")
-	}
-
-	return filepath.Clean(strings.TrimPrefix(projectPath, getSrcPath()))
-}
-
-func getSrcPath() string {
-	return filepath.Join(os.Getenv("GOPATH"), "src") + string(os.PathSeparator)
-}
-
-func projectName() string {
-	return filepath.Base(ProjectPath())
-}
-
-func guessProjectPath() {
-	// if no path is provided... assume CWD.
-	if inputPath == "" {
-		x, err := getWd()
-		if err != nil {
-			er(err)
-		}
-
-		// inspect CWD
-		base := filepath.Base(x)
-
-		// if we are in the cmd directory.. back up
-		for _, c := range cmdDirs {
-			if base == c {
-				projectPath = filepath.Dir(x)
-				return
-			}
-		}
-
-		if projectPath == "" {
-			projectPath = filepath.Clean(x)
-			return
-		}
-	}
-
-	srcPath := getSrcPath()
-	// if provided, inspect for logical locations
-	if strings.ContainsRune(inputPath, os.PathSeparator) {
-		if filepath.IsAbs(inputPath) {
-			// if Absolute, use it
-			projectPath = filepath.Clean(inputPath)
-			return
-		}
-		// If not absolute but contains slashes,
-		// assuming it means create it from $GOPATH
-		count := strings.Count(inputPath, string(os.PathSeparator))
-
-		switch count {
-		// If only one directory deep, assume "github.com"
-		case 1:
-			projectPath = filepath.Join(srcPath, "github.com", inputPath)
-			return
-		case 2:
-			projectPath = filepath.Join(srcPath, inputPath)
-			return
-		default:
-			er("Unknown directory")
-		}
-	} else {
-		// hardest case.. just a word.
-		if projectBase == "" {
-			x, err := getWd()
-			if err == nil {
-				projectPath = filepath.Join(x, inputPath)
-				return
-			}
-			er(err)
-		} else {
-			projectPath = filepath.Join(srcPath, projectBase, inputPath)
-			return
-		}
-	}
-}
-
-// isEmpty checks if a given path is empty.
-func isEmpty(path string) (bool, error) {
-	if b, _ := exists(path); !b {
-		return false, fmt.Errorf("%q path does not exist", path)
-	}
-	fi, err := os.Stat(path)
-	if err != nil {
-		return false, err
-	}
-	if fi.IsDir() {
-		f, err := os.Open(path)
-		// FIX: Resource leak - f.close() should be called here by defer or is missed
-		// if the err != nil branch is taken.
-		defer f.Close()
-		if err != nil {
-			return false, err
-		}
-		list, err := f.Readdir(-1)
-		// f.Close() - see bug fix above
-		return len(list) == 0, nil
-	}
-	return fi.Size() == 0, nil
-}
-
-// isDir checks if a given path is a directory.
-func isDir(path string) (bool, error) {
-	fi, err := os.Stat(path)
-	if err != nil {
-		return false, err
-	}
-	return fi.IsDir(), nil
-}
-
-// dirExists checks if a path exists and is a directory.
-func dirExists(path string) (bool, error) {
-	fi, err := os.Stat(path)
-	if err == nil && fi.IsDir() {
-		return true, nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}
-
-func writeTemplateToFile(path string, file string, template string, data interface{}) error {
-	filename := filepath.Join(path, file)
-
-	r, err := templateToReader(template, data)
-
-	if err != nil {
-		return err
-	}
-
-	err = safeWriteToDisk(filename, r)
-
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func writeStringToFile(path, file, text string) error {
-	filename := filepath.Join(path, file)
-
-	r := strings.NewReader(text)
-	err := safeWriteToDisk(filename, r)
-
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func templateToReader(tpl string, data interface{}) (io.Reader, error) {
-	tmpl := template.New("")
-	tmpl.Funcs(funcMap)
-	tmpl, err := tmpl.Parse(tpl)
-
-	if err != nil {
-		return nil, err
-	}
-	buf := new(bytes.Buffer)
-	err = tmpl.Execute(buf, data)
-
-	return buf, err
-}
-
-// Same as WriteToDisk but checks to see if file/directory already exists.
-func safeWriteToDisk(inpath string, r io.Reader) (err error) {
-	dir, _ := filepath.Split(inpath)
-	ospath := filepath.FromSlash(dir)
-
-	if ospath != "" {
-		err = os.MkdirAll(ospath, 0777) // rwx, rw, r
-		if err != nil {
-			return
-		}
-	}
-
-	ex, err := exists(inpath)
-	if err != nil {
-		return
-	}
-	if ex {
-		return fmt.Errorf("%v already exists", inpath)
-	}
-
-	file, err := os.Create(inpath)
-	if err != nil {
-		return
-	}
-	defer file.Close()
-
-	_, err = io.Copy(file, r)
-	return
-}
-
-func getLicense() License {
-	l := whichLicense()
-	if l != "" {
-		if x, ok := Licenses[l]; ok {
-			return x
-		}
-	}
-
-	return Licenses["apache"]
-}
-
-func whichLicense() string {
-	// if explicitly flagged, use that
-	if userLicense != "" {
-		return matchLicense(userLicense)
-	}
-
-	// if already present in the project, use that
-	// TODO: Inspect project for existing license
-
-	// default to viper's setting
-
-	return matchLicense(viper.GetString("license"))
-}
-
-func copyrightLine() string {
-	author := viper.GetString("author")
-	year := time.Now().Format("2006")
-
-	return "Copyright © " + year + " " + author
-}
-
-func commentifyString(in string) string {
-	var newlines []string
-	lines := strings.Split(in, "\n")
-	for _, x := range lines {
-		if !strings.HasPrefix(x, "//") {
-			if x != "" {
-				newlines = append(newlines, "// "+x)
-			} else {
-				newlines = append(newlines, "//")
-			}
-		} else {
-			newlines = append(newlines, x)
-		}
-	}
-	return strings.Join(newlines, "\n")
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/init.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/init.go
deleted file mode 100644
index e3c0b45f07..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/init.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright © 2015 Steve Francia <spf@spf13.com>.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cmd
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-func init() {
-	RootCmd.AddCommand(initCmd)
-}
-
-// initialize Command
-var initCmd = &cobra.Command{
-	Use:     "init [name]",
-	Aliases: []string{"initialize", "initalise", "create"},
-	Short:   "Initalize a Cobra Application",
-	Long: `Initialize (cobra init) will create a new application, with a license
-and the appropriate structure for a Cobra-based CLI application.
-
-  * If a name is provided, it will be created in the current directory;
-  * If no name is provided, the current directory will be assumed;
-  * If a relative path is provided, it will be created inside $GOPATH
-    (e.g. github.com/spf13/hugo);
-  * If an absolute path is provided, it will be created;
-  * If the directory already exists but is empty, it will be used.
-
-Init will not use an exiting directory with contents.`,
-
-	Run: func(cmd *cobra.Command, args []string) {
-		switch len(args) {
-		case 0:
-			inputPath = ""
-
-		case 1:
-			inputPath = args[0]
-
-		default:
-			er("init doesn't support more than 1 parameter")
-		}
-		guessProjectPath()
-		initalizePath(projectPath)
-	},
-}
-
-func initalizePath(path string) {
-	b, err := exists(path)
-	if err != nil {
-		er(err)
-	}
-
-	if !b { // If path doesn't yet exist, create it
-		err := os.MkdirAll(path, os.ModePerm)
-		if err != nil {
-			er(err)
-		}
-	} else { // If path exists and is not empty don't use it
-		empty, err := exists(path)
-		if err != nil {
-			er(err)
-		}
-		if !empty {
-			er("Cobra will not create a new project in a non empty directory")
-		}
-	}
-	// We have a directory and it's empty.. Time to initialize it.
-
-	createLicenseFile()
-	createMainFile()
-	createRootCmdFile()
-}
-
-func createLicenseFile() {
-	lic := getLicense()
-
-	template := lic.Text
-
-	var data map[string]interface{}
-	data = make(map[string]interface{})
-
-	// Try to remove the email address, if any
-	data["copyright"] = strings.Split(copyrightLine(), " <")[0]
-
-	err := writeTemplateToFile(ProjectPath(), "LICENSE", template, data)
-	_ = err
-	// if err != nil {
-	// 	er(err)
-	// }
-}
-
-func createMainFile() {
-	lic := getLicense()
-
-	template := `{{ comment .copyright }}
-{{ comment .license }}
-
-package main
-
-import "{{ .importpath }}"
-
-func main() {
-	cmd.Execute()
-}
-`
-	var data map[string]interface{}
-	data = make(map[string]interface{})
-
-	data["copyright"] = copyrightLine()
-	data["license"] = lic.Header
-	data["importpath"] = guessImportPath() + "/" + guessCmdDir()
-
-	err := writeTemplateToFile(ProjectPath(), "main.go", template, data)
-	_ = err
-	// if err != nil {
-	// 	er(err)
-	// }
-}
-
-func createRootCmdFile() {
-	lic := getLicense()
-
-	template := `{{ comment .copyright }}
-{{ comment .license }}
-
-package cmd
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/spf13/cobra"
-{{ if .viper }}	"github.com/spf13/viper"
-{{ end }})
-{{if .viper}}
-var cfgFile string
-{{ end }}
-// This represents the base command when called without any subcommands
-var RootCmd = &cobra.Command{
-	Use:   "{{ .appName }}",
-	Short: "A brief description of your application",
-	Long: ` + "`" + `A longer description that spans multiple lines and likely contains
-examples and usage of using your application. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.` + "`" + `,
-// Uncomment the following line if your bare application
-// has an action associated with it:
-//	Run: func(cmd *cobra.Command, args []string) { },
-}
-
-// Execute adds all child commands to the root command sets flags appropriately.
-// This is called by main.main(). It only needs to happen once to the rootCmd.
-func Execute() {
-	if err := RootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(-1)
-	}
-}
-
-func init() {
-{{ if .viper }}	cobra.OnInitialize(initConfig)
-
-{{ end }}	// Here you will define your flags and configuration settings.
-	// Cobra supports Persistent Flags, which, if defined here,
-	// will be global for your application.
-{{ if .viper }}
-	RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.{{ .appName }}.yaml)")
-{{ else }}
-	// RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.{{ .appName }}.yaml)")
-{{ end }}	// Cobra also supports local flags, which will only run
-	// when this action is called directly.
-	RootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-}
-{{ if .viper }}
-// initConfig reads in config file and ENV variables if set.
-func initConfig() {
-	if cfgFile != "" { // enable ability to specify config file via flag
-		viper.SetConfigFile(cfgFile)
-	}
-
-	viper.SetConfigName(".{{ .appName }}") // name of config file (without extension)
-	viper.AddConfigPath("$HOME")  // adding home directory as first search path
-	viper.AutomaticEnv()          // read in environment variables that match
-
-	// If a config file is found, read it in.
-	if err := viper.ReadInConfig(); err == nil {
-		fmt.Println("Using config file:", viper.ConfigFileUsed())
-	}
-}
-{{ end }}`
-
-	var data map[string]interface{}
-	data = make(map[string]interface{})
-
-	data["copyright"] = copyrightLine()
-	data["license"] = lic.Header
-	data["appName"] = projectName()
-	data["viper"] = viper.GetBool("useViper")
-
-	err := writeTemplateToFile(ProjectPath()+string(os.PathSeparator)+guessCmdDir(), "root.go", template, data)
-	if err != nil {
-		er(err)
-	}
-
-	fmt.Println("Your Cobra application is ready at")
-	fmt.Println(ProjectPath())
-	fmt.Println("Give it a try by going there and running `go run main.go`")
-	fmt.Println("Add commands to it by running `cobra add [cmdname]`")
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/licenses.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/licenses.go
deleted file mode 100644
index 5ad9c96ef1..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/licenses.go
+++ /dev/null
@@ -1,1133 +0,0 @@
-// Copyright © 2015 Steve Francia <spf@spf13.com>.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Parts inspired by https://github.com/ryanuber/go-license
-
-package cmd
-
-import "strings"
-
-//Licenses contains all possible licenses a user can chose from
-var Licenses map[string]License
-
-//License represents a software license agreement, containing the Name of
-// the license, its possible matches (on the command line as given to cobra)
-// the header to be used with each file on the file's creating, and the text
-// of the license
-type License struct {
-	Name            string   // The type of license in use
-	PossibleMatches []string // Similar names to guess
-	Text            string   // License text data
-	Header          string   // License header for source files
-}
-
-// given a license name (in), try to match the license indicated
-func matchLicense(in string) string {
-	for key, lic := range Licenses {
-		for _, match := range lic.PossibleMatches {
-			if strings.EqualFold(in, match) {
-				return key
-			}
-		}
-	}
-	return ""
-}
-
-func init() {
-	Licenses = make(map[string]License)
-
-	Licenses["apache"] = License{
-		Name:            "Apache 2.0",
-		PossibleMatches: []string{"apache", "apache20", "apache 2.0", "apache2.0", "apache-2.0"},
-		Header: `
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.`,
-		Text: `
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-`,
-	}
-
-	Licenses["mit"] = License{
-		Name:            "Mit",
-		PossibleMatches: []string{"mit"},
-		Header: `
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.`,
-		Text: `The MIT License (MIT)
-
-{{ .copyright }}
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-`,
-	}
-
-	Licenses["bsd"] = License{
-		Name:            "NewBSD",
-		PossibleMatches: []string{"bsd", "newbsd", "3 clause bsd"},
-		Header: `
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.`,
-		Text: `{{ .copyright }}
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-`,
-	}
-
-	Licenses["freebsd"] = License{
-		Name:            "Simplified BSD License",
-		PossibleMatches: []string{"freebsd", "simpbsd", "simple bsd", "2 clause bsd"},
-		Header: `
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.`,
-		Text: `{{ .copyright }}
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-`,
-	}
-
-	Licenses["gpl3"] = License{
-		Name:            "GNU General Public License 3.0",
-		PossibleMatches: []string{"gpl3", "gpl", "gnu gpl3", "gnu gpl"},
-		Header: `{{ .copyright }}
-
- This file is part of {{ .appName }}.
-
- {{ .appName }} is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- {{ .appName }} is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with {{ .appName }}. If not, see <http://www.gnu.org/licenses/>.
-	   `,
-		Text: `                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type 'show c' for details.
-
-The hypothetical commands 'show w' and 'show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-`,
-	}
-
-	// Licenses["apache20"] = License{
-	// 	Name:            "Apache 2.0",
-	// 	PossibleMatches: []string{"apache", "apache20", ""},
-	//   Header: `
-	//   `,
-	// 	Text: `
-	//   `,
-	// }
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/root.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/root.go
deleted file mode 100644
index 610386ad76..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/cmd/root.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright © 2015 Steve Francia <spf@spf13.com>.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cmd
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var cfgFile string
-var userLicense string
-
-// This represents the base command when called without any subcommands
-var RootCmd = &cobra.Command{
-	Use:   "cobra",
-	Short: "A generator for Cobra based Applications",
-	Long: `Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
-}
-
-//Execute adds all child commands to the root command sets flags appropriately.
-func Execute() {
-	if err := RootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(-1)
-	}
-}
-
-func init() {
-	cobra.OnInitialize(initConfig)
-	RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cobra.yaml)")
-	RootCmd.PersistentFlags().StringVarP(&projectBase, "projectbase", "b", "", "base project directory, e.g. github.com/spf13/")
-	RootCmd.PersistentFlags().StringP("author", "a", "YOUR NAME", "Author name for copyright attribution")
-	RootCmd.PersistentFlags().StringVarP(&userLicense, "license", "l", "", "Name of license for the project (can provide `licensetext` in config)")
-	RootCmd.PersistentFlags().Bool("viper", true, "Use Viper for configuration")
-	viper.BindPFlag("author", RootCmd.PersistentFlags().Lookup("author"))
-	viper.BindPFlag("projectbase", RootCmd.PersistentFlags().Lookup("projectbase"))
-	viper.BindPFlag("useViper", RootCmd.PersistentFlags().Lookup("viper"))
-	viper.SetDefault("author", "NAME HERE <EMAIL ADDRESS>")
-	viper.SetDefault("license", "apache")
-	viper.SetDefault("licenseText", `
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-`)
-}
-
-// Read in config file and ENV variables if set.
-func initConfig() {
-	if cfgFile != "" { // enable ability to specify config file via flag
-		viper.SetConfigFile(cfgFile)
-	}
-
-	viper.SetConfigName(".cobra") // name of config file (without extension)
-	viper.AddConfigPath("$HOME")  // adding home directory as first search path
-	viper.AutomaticEnv()          // read in environment variables that match
-
-	// If a config file is found, read it in.
-	if err := viper.ReadInConfig(); err == nil {
-		fmt.Println("Using config file:", viper.ConfigFileUsed())
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/main.go b/Godeps/_workspace/src/github.com/spf13/cobra/cobra/main.go
deleted file mode 100644
index c3a9d9cb04..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/cobra/main.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright © 2015 Steve Francia <spf@spf13.com>.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import "github.com/spf13/cobra/cobra/cmd"
-
-func main() {
-	cmd.Execute()
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/command.go b/Godeps/_workspace/src/github.com/spf13/cobra/command.go
deleted file mode 100644
index f5fa34e2af..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/command.go
+++ /dev/null
@@ -1,1200 +0,0 @@
-// Copyright © 2013 Steve Francia <spf@spf13.com>.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//Package cobra is a commander providing a simple interface to create powerful modern CLI interfaces.
-//In addition to providing an interface, Cobra simultaneously provides a controller to organize your application code.
-package cobra
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/inconshreveable/mousetrap"
-	flag "github.com/spf13/pflag"
-)
-
-// Command is just that, a command for your application.
-// eg.  'go run' ... 'run' is the command. Cobra requires
-// you to define the usage and description as part of your command
-// definition to ensure usability.
-type Command struct {
-	// Name is the command name, usually the executable's name.
-	name string
-	// The one-line usage message.
-	Use string
-	// An array of aliases that can be used instead of the first word in Use.
-	Aliases []string
-	// An array of command names for which this command will be suggested - similar to aliases but only suggests.
-	SuggestFor []string
-	// The short description shown in the 'help' output.
-	Short string
-	// The long message shown in the 'help <this-command>' output.
-	Long string
-	// Examples of how to use the command
-	Example string
-	// List of all valid non-flag arguments, used for bash completions *TODO* actually validate these
-	ValidArgs []string
-	// Custom functions used by the bash autocompletion generator
-	BashCompletionFunction string
-	// Is this command deprecated and should print this string when used?
-	Deprecated string
-	// Is this command hidden and should NOT show up in the list of available commands?
-	Hidden bool
-	// Full set of flags
-	flags *flag.FlagSet
-	// Set of flags childrens of this command will inherit
-	pflags *flag.FlagSet
-	// Flags that are declared specifically by this command (not inherited).
-	lflags *flag.FlagSet
-	// SilenceErrors is an option to quiet errors down stream
-	SilenceErrors bool
-	// Silence Usage is an option to silence usage when an error occurs.
-	SilenceUsage bool
-	// The *Run functions are executed in the following order:
-	//   * PersistentPreRun()
-	//   * PreRun()
-	//   * Run()
-	//   * PostRun()
-	//   * PersistentPostRun()
-	// All functions get the same args, the arguments after the command name
-	// PersistentPreRun: children of this command will inherit and execute
-	PersistentPreRun func(cmd *Command, args []string)
-	// PersistentPreRunE: PersistentPreRun but returns an error
-	PersistentPreRunE func(cmd *Command, args []string) error
-	// PreRun: children of this command will not inherit.
-	PreRun func(cmd *Command, args []string)
-	// PreRunE: PreRun but returns an error
-	PreRunE func(cmd *Command, args []string) error
-	// Run: Typically the actual work function. Most commands will only implement this
-	Run func(cmd *Command, args []string)
-	// RunE: Run but returns an error
-	RunE func(cmd *Command, args []string) error
-	// PostRun: run after the Run command.
-	PostRun func(cmd *Command, args []string)
-	// PostRunE: PostRun but returns an error
-	PostRunE func(cmd *Command, args []string) error
-	// PersistentPostRun: children of this command will inherit and execute after PostRun
-	PersistentPostRun func(cmd *Command, args []string)
-	// PersistentPostRunE: PersistentPostRun but returns an error
-	PersistentPostRunE func(cmd *Command, args []string) error
-	// DisableAutoGenTag remove
-	DisableAutoGenTag bool
-	// Commands is the list of commands supported by this program.
-	commands []*Command
-	// Parent Command for this command
-	parent *Command
-	// max lengths of commands' string lengths for use in padding
-	commandsMaxUseLen         int
-	commandsMaxCommandPathLen int
-	commandsMaxNameLen        int
-
-	flagErrorBuf *bytes.Buffer
-
-	args          []string                 // actual args parsed from flags
-	output        *io.Writer               // nil means stderr; use Out() method instead
-	usageFunc     func(*Command) error     // Usage can be defined by application
-	usageTemplate string                   // Can be defined by Application
-	helpTemplate  string                   // Can be defined by Application
-	helpFunc      func(*Command, []string) // Help can be defined by application
-	helpCommand   *Command                 // The help command
-	// The global normalization function that we can use on every pFlag set and children commands
-	globNormFunc func(f *flag.FlagSet, name string) flag.NormalizedName
-
-	// Disable the suggestions based on Levenshtein distance that go along with 'unknown command' messages
-	DisableSuggestions bool
-	// If displaying suggestions, allows to set the minimum levenshtein distance to display, must be > 0
-	SuggestionsMinimumDistance int
-}
-
-// os.Args[1:] by default, if desired, can be overridden
-// particularly useful when testing.
-func (c *Command) SetArgs(a []string) {
-	c.args = a
-}
-
-func (c *Command) getOut(def io.Writer) io.Writer {
-	if c.output != nil {
-		return *c.output
-	}
-
-	if c.HasParent() {
-		return c.parent.Out()
-	} else {
-		return def
-	}
-}
-
-func (c *Command) Out() io.Writer {
-	return c.getOut(os.Stderr)
-}
-
-func (c *Command) getOutOrStdout() io.Writer {
-	return c.getOut(os.Stdout)
-}
-
-// SetOutput sets the destination for usage and error messages.
-// If output is nil, os.Stderr is used.
-func (c *Command) SetOutput(output io.Writer) {
-	c.output = &output
-}
-
-// Usage can be defined by application
-func (c *Command) SetUsageFunc(f func(*Command) error) {
-	c.usageFunc = f
-}
-
-// Can be defined by Application
-func (c *Command) SetUsageTemplate(s string) {
-	c.usageTemplate = s
-}
-
-// Can be defined by Application
-func (c *Command) SetHelpFunc(f func(*Command, []string)) {
-	c.helpFunc = f
-}
-
-func (c *Command) SetHelpCommand(cmd *Command) {
-	c.helpCommand = cmd
-}
-
-// Can be defined by Application
-func (c *Command) SetHelpTemplate(s string) {
-	c.helpTemplate = s
-}
-
-// SetGlobalNormalizationFunc sets a normalization function to all flag sets and also to child commands.
-// The user should not have a cyclic dependency on commands.
-func (c *Command) SetGlobalNormalizationFunc(n func(f *flag.FlagSet, name string) flag.NormalizedName) {
-	c.Flags().SetNormalizeFunc(n)
-	c.PersistentFlags().SetNormalizeFunc(n)
-	c.globNormFunc = n
-
-	for _, command := range c.commands {
-		command.SetGlobalNormalizationFunc(n)
-	}
-}
-
-func (c *Command) UsageFunc() (f func(*Command) error) {
-	if c.usageFunc != nil {
-		return c.usageFunc
-	}
-
-	if c.HasParent() {
-		return c.parent.UsageFunc()
-	} else {
-		return func(c *Command) error {
-			err := tmpl(c.Out(), c.UsageTemplate(), c)
-			if err != nil {
-				fmt.Print(err)
-			}
-			return err
-		}
-	}
-}
-
-// HelpFunc returns either the function set by SetHelpFunc for this command
-// or a parent, or it returns a function which calls c.Help()
-func (c *Command) HelpFunc() func(*Command, []string) {
-	cmd := c
-	for cmd != nil {
-		if cmd.helpFunc != nil {
-			return cmd.helpFunc
-		}
-		cmd = cmd.parent
-	}
-	return func(*Command, []string) {
-		err := c.Help()
-		if err != nil {
-			c.Println(err)
-		}
-	}
-}
-
-var minUsagePadding int = 25
-
-func (c *Command) UsagePadding() int {
-	if c.parent == nil || minUsagePadding > c.parent.commandsMaxUseLen {
-		return minUsagePadding
-	} else {
-		return c.parent.commandsMaxUseLen
-	}
-}
-
-var minCommandPathPadding int = 11
-
-//
-func (c *Command) CommandPathPadding() int {
-	if c.parent == nil || minCommandPathPadding > c.parent.commandsMaxCommandPathLen {
-		return minCommandPathPadding
-	} else {
-		return c.parent.commandsMaxCommandPathLen
-	}
-}
-
-var minNamePadding int = 11
-
-func (c *Command) NamePadding() int {
-	if c.parent == nil || minNamePadding > c.parent.commandsMaxNameLen {
-		return minNamePadding
-	} else {
-		return c.parent.commandsMaxNameLen
-	}
-}
-
-func (c *Command) UsageTemplate() string {
-	if c.usageTemplate != "" {
-		return c.usageTemplate
-	}
-
-	if c.HasParent() {
-		return c.parent.UsageTemplate()
-	} else {
-		return `Usage:{{if .Runnable}}
-  {{.UseLine}}{{if .HasFlags}} [flags]{{end}}{{end}}{{if .HasSubCommands}}
-  {{ .CommandPath}} [command]{{end}}{{if gt .Aliases 0}}
-
-Aliases:
-  {{.NameAndAliases}}
-{{end}}{{if .HasExample}}
-
-Examples:
-{{ .Example }}{{end}}{{ if .HasAvailableSubCommands}}
-
-Available Commands:{{range .Commands}}{{if .IsAvailableCommand}}
-  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{ if .HasLocalFlags}}
-
-Flags:
-{{.LocalFlags.FlagUsages | trimRightSpace}}{{end}}{{ if .HasInheritedFlags}}
-
-Global Flags:
-{{.InheritedFlags.FlagUsages | trimRightSpace}}{{end}}{{if .HasHelpSubCommands}}
-
-Additional help topics:{{range .Commands}}{{if .IsHelpCommand}}
-  {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{ if .HasSubCommands }}
-
-Use "{{.CommandPath}} [command] --help" for more information about a command.{{end}}
-`
-	}
-}
-
-func (c *Command) HelpTemplate() string {
-	if c.helpTemplate != "" {
-		return c.helpTemplate
-	}
-
-	if c.HasParent() {
-		return c.parent.HelpTemplate()
-	} else {
-		return `{{with or .Long .Short }}{{. | trim}}
-
-{{end}}{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
-	}
-}
-
-// Really only used when casting a command to a commander
-func (c *Command) resetChildrensParents() {
-	for _, x := range c.commands {
-		x.parent = c
-	}
-}
-
-// Test if the named flag is a boolean flag.
-func isBooleanFlag(name string, f *flag.FlagSet) bool {
-	flag := f.Lookup(name)
-	if flag == nil {
-		return false
-	}
-	return flag.Value.Type() == "bool"
-}
-
-// Test if the named flag is a boolean flag.
-func isBooleanShortFlag(name string, f *flag.FlagSet) bool {
-	result := false
-	f.VisitAll(func(f *flag.Flag) {
-		if f.Shorthand == name && f.Value.Type() == "bool" {
-			result = true
-		}
-	})
-	return result
-}
-
-func stripFlags(args []string, c *Command) []string {
-	if len(args) < 1 {
-		return args
-	}
-	c.mergePersistentFlags()
-
-	commands := []string{}
-
-	inQuote := false
-	inFlag := false
-	for _, y := range args {
-		if !inQuote {
-			switch {
-			case strings.HasPrefix(y, "\""):
-				inQuote = true
-			case strings.Contains(y, "=\""):
-				inQuote = true
-			case strings.HasPrefix(y, "--") && !strings.Contains(y, "="):
-				// TODO: this isn't quite right, we should really check ahead for 'true' or 'false'
-				inFlag = !isBooleanFlag(y[2:], c.Flags())
-			case strings.HasPrefix(y, "-") && !strings.Contains(y, "=") && len(y) == 2 && !isBooleanShortFlag(y[1:], c.Flags()):
-				inFlag = true
-			case inFlag:
-				inFlag = false
-			case y == "":
-				// strip empty commands, as the go tests expect this to be ok....
-			case !strings.HasPrefix(y, "-"):
-				commands = append(commands, y)
-				inFlag = false
-			}
-		}
-
-		if strings.HasSuffix(y, "\"") && !strings.HasSuffix(y, "\\\"") {
-			inQuote = false
-		}
-	}
-
-	return commands
-}
-
-// argsMinusFirstX removes only the first x from args.  Otherwise, commands that look like
-// openshift admin policy add-role-to-user admin my-user, lose the admin argument (arg[4]).
-func argsMinusFirstX(args []string, x string) []string {
-	for i, y := range args {
-		if x == y {
-			ret := []string{}
-			ret = append(ret, args[:i]...)
-			ret = append(ret, args[i+1:]...)
-			return ret
-		}
-	}
-	return args
-}
-
-// find the target command given the args and command tree
-// Meant to be run on the highest node. Only searches down.
-func (c *Command) Find(args []string) (*Command, []string, error) {
-	if c == nil {
-		return nil, nil, fmt.Errorf("Called find() on a nil Command")
-	}
-
-	var innerfind func(*Command, []string) (*Command, []string)
-
-	innerfind = func(c *Command, innerArgs []string) (*Command, []string) {
-		argsWOflags := stripFlags(innerArgs, c)
-		if len(argsWOflags) == 0 {
-			return c, innerArgs
-		}
-		nextSubCmd := argsWOflags[0]
-		matches := make([]*Command, 0)
-		for _, cmd := range c.commands {
-			if cmd.Name() == nextSubCmd || cmd.HasAlias(nextSubCmd) { // exact name or alias match
-				return innerfind(cmd, argsMinusFirstX(innerArgs, nextSubCmd))
-			}
-			if EnablePrefixMatching {
-				if strings.HasPrefix(cmd.Name(), nextSubCmd) { // prefix match
-					matches = append(matches, cmd)
-				}
-				for _, x := range cmd.Aliases {
-					if strings.HasPrefix(x, nextSubCmd) {
-						matches = append(matches, cmd)
-					}
-				}
-			}
-		}
-
-		// only accept a single prefix match - multiple matches would be ambiguous
-		if len(matches) == 1 {
-			return innerfind(matches[0], argsMinusFirstX(innerArgs, argsWOflags[0]))
-		}
-
-		return c, innerArgs
-	}
-
-	commandFound, a := innerfind(c, args)
-	argsWOflags := stripFlags(a, commandFound)
-
-	// no subcommand, always take args
-	if !commandFound.HasSubCommands() {
-		return commandFound, a, nil
-	}
-
-	// root command with subcommands, do subcommand checking
-	if commandFound == c && len(argsWOflags) > 0 {
-		suggestionsString := ""
-		if !c.DisableSuggestions {
-			if c.SuggestionsMinimumDistance <= 0 {
-				c.SuggestionsMinimumDistance = 2
-			}
-			if suggestions := c.SuggestionsFor(argsWOflags[0]); len(suggestions) > 0 {
-				suggestionsString += "\n\nDid you mean this?\n"
-				for _, s := range suggestions {
-					suggestionsString += fmt.Sprintf("\t%v\n", s)
-				}
-			}
-		}
-		return commandFound, a, fmt.Errorf("unknown command %q for %q%s", argsWOflags[0], commandFound.CommandPath(), suggestionsString)
-	}
-
-	return commandFound, a, nil
-}
-
-func (c *Command) SuggestionsFor(typedName string) []string {
-	suggestions := []string{}
-	for _, cmd := range c.commands {
-		if cmd.IsAvailableCommand() {
-			levenshteinDistance := ld(typedName, cmd.Name(), true)
-			suggestByLevenshtein := levenshteinDistance <= c.SuggestionsMinimumDistance
-			suggestByPrefix := strings.HasPrefix(strings.ToLower(cmd.Name()), strings.ToLower(typedName))
-			if suggestByLevenshtein || suggestByPrefix {
-				suggestions = append(suggestions, cmd.Name())
-			}
-			for _, explicitSuggestion := range cmd.SuggestFor {
-				if strings.EqualFold(typedName, explicitSuggestion) {
-					suggestions = append(suggestions, cmd.Name())
-				}
-			}
-		}
-	}
-	return suggestions
-}
-
-func (c *Command) VisitParents(fn func(*Command)) {
-	var traverse func(*Command) *Command
-
-	traverse = func(x *Command) *Command {
-		if x != c {
-			fn(x)
-		}
-		if x.HasParent() {
-			return traverse(x.parent)
-		}
-		return x
-	}
-	traverse(c)
-}
-
-func (c *Command) Root() *Command {
-	var findRoot func(*Command) *Command
-
-	findRoot = func(x *Command) *Command {
-		if x.HasParent() {
-			return findRoot(x.parent)
-		}
-		return x
-	}
-
-	return findRoot(c)
-}
-
-// ArgsLenAtDash will return the length of f.Args at the moment when a -- was
-// found during arg parsing. This allows your program to know which args were
-// before the -- and which came after. (Description from
-// https://godoc.org/github.com/spf13/pflag#FlagSet.ArgsLenAtDash).
-func (c *Command) ArgsLenAtDash() int {
-	return c.Flags().ArgsLenAtDash()
-}
-
-func (c *Command) execute(a []string) (err error) {
-	if c == nil {
-		return fmt.Errorf("Called Execute() on a nil Command")
-	}
-
-	if len(c.Deprecated) > 0 {
-		c.Printf("Command %q is deprecated, %s\n", c.Name(), c.Deprecated)
-	}
-
-	// initialize help flag as the last point possible to allow for user
-	// overriding
-	c.initHelpFlag()
-
-	err = c.ParseFlags(a)
-	if err != nil {
-		return err
-	}
-	// If help is called, regardless of other flags, return we want help
-	// Also say we need help if the command isn't runnable.
-	helpVal, err := c.Flags().GetBool("help")
-	if err != nil {
-		// should be impossible to get here as we always declare a help
-		// flag in initHelpFlag()
-		c.Println("\"help\" flag declared as non-bool. Please correct your code")
-		return err
-	}
-	if helpVal || !c.Runnable() {
-		return flag.ErrHelp
-	}
-
-	c.preRun()
-	argWoFlags := c.Flags().Args()
-
-	for p := c; p != nil; p = p.Parent() {
-		if p.PersistentPreRunE != nil {
-			if err := p.PersistentPreRunE(c, argWoFlags); err != nil {
-				return err
-			}
-			break
-		} else if p.PersistentPreRun != nil {
-			p.PersistentPreRun(c, argWoFlags)
-			break
-		}
-	}
-	if c.PreRunE != nil {
-		if err := c.PreRunE(c, argWoFlags); err != nil {
-			return err
-		}
-	} else if c.PreRun != nil {
-		c.PreRun(c, argWoFlags)
-	}
-
-	if c.RunE != nil {
-		if err := c.RunE(c, argWoFlags); err != nil {
-			return err
-		}
-	} else {
-		c.Run(c, argWoFlags)
-	}
-	if c.PostRunE != nil {
-		if err := c.PostRunE(c, argWoFlags); err != nil {
-			return err
-		}
-	} else if c.PostRun != nil {
-		c.PostRun(c, argWoFlags)
-	}
-	for p := c; p != nil; p = p.Parent() {
-		if p.PersistentPostRunE != nil {
-			if err := p.PersistentPostRunE(c, argWoFlags); err != nil {
-				return err
-			}
-			break
-		} else if p.PersistentPostRun != nil {
-			p.PersistentPostRun(c, argWoFlags)
-			break
-		}
-	}
-
-	return nil
-}
-
-func (c *Command) preRun() {
-	for _, x := range initializers {
-		x()
-	}
-}
-
-func (c *Command) errorMsgFromParse() string {
-	s := c.flagErrorBuf.String()
-
-	x := strings.Split(s, "\n")
-
-	if len(x) > 0 {
-		return x[0]
-	} else {
-		return ""
-	}
-}
-
-// Call execute to use the args (os.Args[1:] by default)
-// and run through the command tree finding appropriate matches
-// for commands and then corresponding flags.
-func (c *Command) Execute() error {
-	_, err := c.ExecuteC()
-	return err
-}
-
-func (c *Command) ExecuteC() (cmd *Command, err error) {
-
-	// Regardless of what command execute is called on, run on Root only
-	if c.HasParent() {
-		return c.Root().ExecuteC()
-	}
-
-	if EnableWindowsMouseTrap && runtime.GOOS == "windows" {
-		if mousetrap.StartedByExplorer() {
-			c.Print(MousetrapHelpText)
-			time.Sleep(5 * time.Second)
-			os.Exit(1)
-		}
-	}
-
-	// initialize help as the last point possible to allow for user
-	// overriding
-	c.initHelpCmd()
-
-	var args []string
-
-	// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
-	if len(c.args) == 0 && filepath.Base(os.Args[0]) != "cobra.test" {
-		args = os.Args[1:]
-	} else {
-		args = c.args
-	}
-
-	cmd, flags, err := c.Find(args)
-	if err != nil {
-		// If found parse to a subcommand and then failed, talk about the subcommand
-		if cmd != nil {
-			c = cmd
-		}
-		if !c.SilenceErrors {
-			c.Println("Error:", err.Error())
-			c.Printf("Run '%v --help' for usage.\n", c.CommandPath())
-		}
-		return c, err
-	}
-	err = cmd.execute(flags)
-	if err != nil {
-		// If root command has SilentErrors flagged,
-		// all subcommands should respect it
-		if !cmd.SilenceErrors && !c.SilenceErrors {
-			if err == flag.ErrHelp {
-				cmd.HelpFunc()(cmd, args)
-				return cmd, nil
-			}
-			c.Println("Error:", err.Error())
-		}
-
-		// If root command has SilentUsage flagged,
-		// all subcommands should respect it
-		if !cmd.SilenceUsage && !c.SilenceUsage {
-			c.Println(cmd.UsageString())
-		}
-		return cmd, err
-	}
-	return cmd, nil
-}
-
-func (c *Command) initHelpFlag() {
-	if c.Flags().Lookup("help") == nil {
-		c.Flags().BoolP("help", "h", false, "help for "+c.Name())
-	}
-}
-
-func (c *Command) initHelpCmd() {
-	if c.helpCommand == nil {
-		if !c.HasSubCommands() {
-			return
-		}
-
-		c.helpCommand = &Command{
-			Use:   "help [command]",
-			Short: "Help about any command",
-			Long: `Help provides help for any command in the application.
-    Simply type ` + c.Name() + ` help [path to command] for full details.`,
-			PersistentPreRun:  func(cmd *Command, args []string) {},
-			PersistentPostRun: func(cmd *Command, args []string) {},
-
-			Run: func(c *Command, args []string) {
-				cmd, _, e := c.Root().Find(args)
-				if cmd == nil || e != nil {
-					c.Printf("Unknown help topic %#q.", args)
-					c.Root().Usage()
-				} else {
-					helpFunc := cmd.HelpFunc()
-					helpFunc(cmd, args)
-				}
-			},
-		}
-	}
-	c.AddCommand(c.helpCommand)
-}
-
-// Used for testing
-func (c *Command) ResetCommands() {
-	c.commands = nil
-	c.helpCommand = nil
-}
-
-//Commands returns a slice of child commands.
-func (c *Command) Commands() []*Command {
-	return c.commands
-}
-
-// AddCommand adds one or more commands to this parent command.
-func (c *Command) AddCommand(cmds ...*Command) {
-	for i, x := range cmds {
-		if cmds[i] == c {
-			panic("Command can't be a child of itself")
-		}
-		cmds[i].parent = c
-		// update max lengths
-		usageLen := len(x.Use)
-		if usageLen > c.commandsMaxUseLen {
-			c.commandsMaxUseLen = usageLen
-		}
-		commandPathLen := len(x.CommandPath())
-		if commandPathLen > c.commandsMaxCommandPathLen {
-			c.commandsMaxCommandPathLen = commandPathLen
-		}
-		nameLen := len(x.Name())
-		if nameLen > c.commandsMaxNameLen {
-			c.commandsMaxNameLen = nameLen
-		}
-		// If glabal normalization function exists, update all children
-		if c.globNormFunc != nil {
-			x.SetGlobalNormalizationFunc(c.globNormFunc)
-		}
-		c.commands = append(c.commands, x)
-	}
-}
-
-// AddCommand removes one or more commands from a parent command.
-func (c *Command) RemoveCommand(cmds ...*Command) {
-	commands := []*Command{}
-main:
-	for _, command := range c.commands {
-		for _, cmd := range cmds {
-			if command == cmd {
-				command.parent = nil
-				continue main
-			}
-		}
-		commands = append(commands, command)
-	}
-	c.commands = commands
-	// recompute all lengths
-	c.commandsMaxUseLen = 0
-	c.commandsMaxCommandPathLen = 0
-	c.commandsMaxNameLen = 0
-	for _, command := range c.commands {
-		usageLen := len(command.Use)
-		if usageLen > c.commandsMaxUseLen {
-			c.commandsMaxUseLen = usageLen
-		}
-		commandPathLen := len(command.CommandPath())
-		if commandPathLen > c.commandsMaxCommandPathLen {
-			c.commandsMaxCommandPathLen = commandPathLen
-		}
-		nameLen := len(command.Name())
-		if nameLen > c.commandsMaxNameLen {
-			c.commandsMaxNameLen = nameLen
-		}
-	}
-}
-
-// Convenience method to Print to the defined output
-func (c *Command) Print(i ...interface{}) {
-	fmt.Fprint(c.Out(), i...)
-}
-
-// Convenience method to Println to the defined output
-func (c *Command) Println(i ...interface{}) {
-	str := fmt.Sprintln(i...)
-	c.Print(str)
-}
-
-// Convenience method to Printf to the defined output
-func (c *Command) Printf(format string, i ...interface{}) {
-	str := fmt.Sprintf(format, i...)
-	c.Print(str)
-}
-
-// Output the usage for the command
-// Used when a user provides invalid input
-// Can be defined by user by overriding UsageFunc
-func (c *Command) Usage() error {
-	c.mergePersistentFlags()
-	err := c.UsageFunc()(c)
-	return err
-}
-
-// Output the help for the command
-// Used when a user calls help [command]
-// by the default HelpFunc in the commander
-func (c *Command) Help() error {
-	c.mergePersistentFlags()
-	err := tmpl(c.getOutOrStdout(), c.HelpTemplate(), c)
-	return err
-}
-
-func (c *Command) UsageString() string {
-	tmpOutput := c.output
-	bb := new(bytes.Buffer)
-	c.SetOutput(bb)
-	c.Usage()
-	c.output = tmpOutput
-	return bb.String()
-}
-
-// CommandPath returns the full path to this command.
-func (c *Command) CommandPath() string {
-	str := c.Name()
-	x := c
-	for x.HasParent() {
-		str = x.parent.Name() + " " + str
-		x = x.parent
-	}
-	return str
-}
-
-//The full usage for a given command (including parents)
-func (c *Command) UseLine() string {
-	str := ""
-	if c.HasParent() {
-		str = c.parent.CommandPath() + " "
-	}
-	return str + c.Use
-}
-
-// For use in determining which flags have been assigned to which commands
-// and which persist
-func (c *Command) DebugFlags() {
-	c.Println("DebugFlags called on", c.Name())
-	var debugflags func(*Command)
-
-	debugflags = func(x *Command) {
-		if x.HasFlags() || x.HasPersistentFlags() {
-			c.Println(x.Name())
-		}
-		if x.HasFlags() {
-			x.flags.VisitAll(func(f *flag.Flag) {
-				if x.HasPersistentFlags() {
-					if x.persistentFlag(f.Name) == nil {
-						c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [L]")
-					} else {
-						c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [LP]")
-					}
-				} else {
-					c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [L]")
-				}
-			})
-		}
-		if x.HasPersistentFlags() {
-			x.pflags.VisitAll(func(f *flag.Flag) {
-				if x.HasFlags() {
-					if x.flags.Lookup(f.Name) == nil {
-						c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [P]")
-					}
-				} else {
-					c.Println("  -"+f.Shorthand+",", "--"+f.Name, "["+f.DefValue+"]", "", f.Value, "  [P]")
-				}
-			})
-		}
-		c.Println(x.flagErrorBuf)
-		if x.HasSubCommands() {
-			for _, y := range x.commands {
-				debugflags(y)
-			}
-		}
-	}
-
-	debugflags(c)
-}
-
-// Name returns the command's name: the first word in the use line.
-func (c *Command) Name() string {
-	if c.name != "" {
-		return c.name
-	}
-	name := c.Use
-	i := strings.Index(name, " ")
-	if i >= 0 {
-		name = name[:i]
-	}
-	return name
-}
-
-// Determine if a given string is an alias of the command.
-func (c *Command) HasAlias(s string) bool {
-	for _, a := range c.Aliases {
-		if a == s {
-			return true
-		}
-	}
-	return false
-}
-
-func (c *Command) NameAndAliases() string {
-	return strings.Join(append([]string{c.Name()}, c.Aliases...), ", ")
-}
-
-func (c *Command) HasExample() bool {
-	return len(c.Example) > 0
-}
-
-// Determine if the command is itself runnable
-func (c *Command) Runnable() bool {
-	return c.Run != nil || c.RunE != nil
-}
-
-// Determine if the command has children commands
-func (c *Command) HasSubCommands() bool {
-	return len(c.commands) > 0
-}
-
-// IsAvailableCommand determines if a command is available as a non-help command
-// (this includes all non deprecated/hidden commands)
-func (c *Command) IsAvailableCommand() bool {
-	if len(c.Deprecated) != 0 || c.Hidden {
-		return false
-	}
-
-	if c.HasParent() && c.Parent().helpCommand == c {
-		return false
-	}
-
-	if c.Runnable() || c.HasAvailableSubCommands() {
-		return true
-	}
-
-	return false
-}
-
-// IsHelpCommand determines if a command is a 'help' command; a help command is
-// determined by the fact that it is NOT runnable/hidden/deprecated, and has no
-// sub commands that are runnable/hidden/deprecated
-func (c *Command) IsHelpCommand() bool {
-
-	// if a command is runnable, deprecated, or hidden it is not a 'help' command
-	if c.Runnable() || len(c.Deprecated) != 0 || c.Hidden {
-		return false
-	}
-
-	// if any non-help sub commands are found, the command is not a 'help' command
-	for _, sub := range c.commands {
-		if !sub.IsHelpCommand() {
-			return false
-		}
-	}
-
-	// the command either has no sub commands, or no non-help sub commands
-	return true
-}
-
-// HasHelpSubCommands determines if a command has any avilable 'help' sub commands
-// that need to be shown in the usage/help default template under 'additional help
-// topics'
-func (c *Command) HasHelpSubCommands() bool {
-
-	// return true on the first found available 'help' sub command
-	for _, sub := range c.commands {
-		if sub.IsHelpCommand() {
-			return true
-		}
-	}
-
-	// the command either has no sub commands, or no available 'help' sub commands
-	return false
-}
-
-// HasAvailableSubCommands determines if a command has available sub commands that
-// need to be shown in the usage/help default template under 'available commands'
-func (c *Command) HasAvailableSubCommands() bool {
-
-	// return true on the first found available (non deprecated/help/hidden)
-	// sub command
-	for _, sub := range c.commands {
-		if sub.IsAvailableCommand() {
-			return true
-		}
-	}
-
-	// the command either has no sub comamnds, or no available (non deprecated/help/hidden)
-	// sub commands
-	return false
-}
-
-// Determine if the command is a child command
-func (c *Command) HasParent() bool {
-	return c.parent != nil
-}
-
-// GlobalNormalizationFunc returns the global normalization function or nil if doesn't exists
-func (c *Command) GlobalNormalizationFunc() func(f *flag.FlagSet, name string) flag.NormalizedName {
-	return c.globNormFunc
-}
-
-// Get the complete FlagSet that applies to this command (local and persistent declared here and by all parents)
-func (c *Command) Flags() *flag.FlagSet {
-	if c.flags == nil {
-		c.flags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-		if c.flagErrorBuf == nil {
-			c.flagErrorBuf = new(bytes.Buffer)
-		}
-		c.flags.SetOutput(c.flagErrorBuf)
-	}
-	return c.flags
-}
-
-// Get the local FlagSet specifically set in the current command
-func (c *Command) LocalFlags() *flag.FlagSet {
-	c.mergePersistentFlags()
-
-	local := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-	c.lflags.VisitAll(func(f *flag.Flag) {
-		local.AddFlag(f)
-	})
-	if !c.HasParent() {
-		flag.CommandLine.VisitAll(func(f *flag.Flag) {
-			if local.Lookup(f.Name) == nil {
-				local.AddFlag(f)
-			}
-		})
-	}
-	return local
-}
-
-// All Flags which were inherited from parents commands
-func (c *Command) InheritedFlags() *flag.FlagSet {
-	c.mergePersistentFlags()
-
-	inherited := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-	local := c.LocalFlags()
-
-	var rmerge func(x *Command)
-
-	rmerge = func(x *Command) {
-		if x.HasPersistentFlags() {
-			x.PersistentFlags().VisitAll(func(f *flag.Flag) {
-				if inherited.Lookup(f.Name) == nil && local.Lookup(f.Name) == nil {
-					inherited.AddFlag(f)
-				}
-			})
-		}
-		if x.HasParent() {
-			rmerge(x.parent)
-		}
-	}
-
-	if c.HasParent() {
-		rmerge(c.parent)
-	}
-
-	return inherited
-}
-
-// All Flags which were not inherited from parent commands
-func (c *Command) NonInheritedFlags() *flag.FlagSet {
-	return c.LocalFlags()
-}
-
-// Get the Persistent FlagSet specifically set in the current command
-func (c *Command) PersistentFlags() *flag.FlagSet {
-	if c.pflags == nil {
-		c.pflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-		if c.flagErrorBuf == nil {
-			c.flagErrorBuf = new(bytes.Buffer)
-		}
-		c.pflags.SetOutput(c.flagErrorBuf)
-	}
-	return c.pflags
-}
-
-// For use in testing
-func (c *Command) ResetFlags() {
-	c.flagErrorBuf = new(bytes.Buffer)
-	c.flagErrorBuf.Reset()
-	c.flags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-	c.flags.SetOutput(c.flagErrorBuf)
-	c.pflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-	c.pflags.SetOutput(c.flagErrorBuf)
-}
-
-// Does the command contain any flags (local plus persistent from the entire structure)
-func (c *Command) HasFlags() bool {
-	return c.Flags().HasFlags()
-}
-
-// Does the command contain persistent flags
-func (c *Command) HasPersistentFlags() bool {
-	return c.PersistentFlags().HasFlags()
-}
-
-// Does the command has flags specifically declared locally
-func (c *Command) HasLocalFlags() bool {
-	return c.LocalFlags().HasFlags()
-}
-
-func (c *Command) HasInheritedFlags() bool {
-	return c.InheritedFlags().HasFlags()
-}
-
-// Climbs up the command tree looking for matching flag
-func (c *Command) Flag(name string) (flag *flag.Flag) {
-	flag = c.Flags().Lookup(name)
-
-	if flag == nil {
-		flag = c.persistentFlag(name)
-	}
-
-	return
-}
-
-// recursively find matching persistent flag
-func (c *Command) persistentFlag(name string) (flag *flag.Flag) {
-	if c.HasPersistentFlags() {
-		flag = c.PersistentFlags().Lookup(name)
-	}
-
-	if flag == nil && c.HasParent() {
-		flag = c.parent.persistentFlag(name)
-	}
-	return
-}
-
-// Parses persistent flag tree & local flags
-func (c *Command) ParseFlags(args []string) (err error) {
-	c.mergePersistentFlags()
-	err = c.Flags().Parse(args)
-	return
-}
-
-func (c *Command) Parent() *Command {
-	return c.parent
-}
-
-func (c *Command) mergePersistentFlags() {
-	var rmerge func(x *Command)
-
-	// Save the set of local flags
-	if c.lflags == nil {
-		c.lflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError)
-		if c.flagErrorBuf == nil {
-			c.flagErrorBuf = new(bytes.Buffer)
-		}
-		c.lflags.SetOutput(c.flagErrorBuf)
-		addtolocal := func(f *flag.Flag) {
-			c.lflags.AddFlag(f)
-		}
-		c.Flags().VisitAll(addtolocal)
-		c.PersistentFlags().VisitAll(addtolocal)
-	}
-	rmerge = func(x *Command) {
-		if !x.HasParent() {
-			flag.CommandLine.VisitAll(func(f *flag.Flag) {
-				if x.PersistentFlags().Lookup(f.Name) == nil {
-					x.PersistentFlags().AddFlag(f)
-				}
-			})
-		}
-		if x.HasPersistentFlags() {
-			x.PersistentFlags().VisitAll(func(f *flag.Flag) {
-				if c.Flags().Lookup(f.Name) == nil {
-					c.Flags().AddFlag(f)
-				}
-			})
-		}
-		if x.HasParent() {
-			rmerge(x.parent)
-		}
-	}
-
-	rmerge(c)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go b/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go
deleted file mode 100644
index a98674bf3a..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2015 Red Hat Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package doc
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"time"
-
-	mangen "github.com/cpuguy83/go-md2man/md2man"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-// GenManTree will generate a man page for this command and all decendants
-// in the directory given. The header may be nil. This function may not work
-// correctly if your command names have - in them. If you have `cmd` with two
-// subcmds, `sub` and `sub-third`. And `sub` has a subcommand called `third`
-// it is undefined which help output will be in the file `cmd-sub-third.1`.
-func GenManTree(cmd *cobra.Command, header *GenManHeader, dir string) error {
-	if header == nil {
-		header = &GenManHeader{}
-	}
-	for _, c := range cmd.Commands() {
-		if !c.IsAvailableCommand() || c.IsHelpCommand() {
-			continue
-		}
-		if err := GenManTree(c, header, dir); err != nil {
-			return err
-		}
-	}
-	needToResetTitle := header.Title == ""
-
-	basename := strings.Replace(cmd.CommandPath(), " ", "_", -1) + ".1"
-	filename := filepath.Join(dir, basename)
-	f, err := os.Create(filename)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	if err := GenMan(cmd, header, f); err != nil {
-		return err
-	}
-
-	if needToResetTitle {
-		header.Title = ""
-	}
-	return nil
-}
-
-// GenManHeader is a lot like the .TH header at the start of man pages. These
-// include the title, section, date, source, and manual. We will use the
-// current time if Date if unset and will use "Auto generated by spf13/cobra"
-// if the Source is unset.
-type GenManHeader struct {
-	Title   string
-	Section string
-	Date    *time.Time
-	date    string
-	Source  string
-	Manual  string
-}
-
-// GenMan will generate a man page for the given command and write it to
-// w. The header argument may be nil, however obviously w may not.
-func GenMan(cmd *cobra.Command, header *GenManHeader, w io.Writer) error {
-	if header == nil {
-		header = &GenManHeader{}
-	}
-	b := genMan(cmd, header)
-	final := mangen.Render(b)
-	_, err := w.Write(final)
-	return err
-}
-
-func fillHeader(header *GenManHeader, name string) {
-	if header.Title == "" {
-		header.Title = strings.ToUpper(strings.Replace(name, " ", "\\-", -1))
-	}
-	if header.Section == "" {
-		header.Section = "1"
-	}
-	if header.Date == nil {
-		now := time.Now()
-		header.Date = &now
-	}
-	header.date = (*header.Date).Format("Jan 2006")
-	if header.Source == "" {
-		header.Source = "Auto generated by spf13/cobra"
-	}
-}
-
-func manPreamble(out io.Writer, header *GenManHeader, name, short, long string) {
-	dashName := strings.Replace(name, " ", "-", -1)
-	fmt.Fprintf(out, `%% %s(%s)%s
-%% %s
-%% %s
-# NAME
-`, header.Title, header.Section, header.date, header.Source, header.Manual)
-	fmt.Fprintf(out, "%s \\- %s\n\n", dashName, short)
-	fmt.Fprintf(out, "# SYNOPSIS\n")
-	fmt.Fprintf(out, "**%s** [OPTIONS]\n\n", name)
-	fmt.Fprintf(out, "# DESCRIPTION\n")
-	fmt.Fprintf(out, "%s\n\n", long)
-}
-
-func manPrintFlags(out io.Writer, flags *pflag.FlagSet) {
-	flags.VisitAll(func(flag *pflag.Flag) {
-		if len(flag.Deprecated) > 0 || flag.Hidden {
-			return
-		}
-		format := ""
-		if len(flag.Shorthand) > 0 {
-			format = "**-%s**, **--%s**"
-		} else {
-			format = "%s**--%s**"
-		}
-		if len(flag.NoOptDefVal) > 0 {
-			format = format + "["
-		}
-		if flag.Value.Type() == "string" {
-			// put quotes on the value
-			format = format + "=%q"
-		} else {
-			format = format + "=%s"
-		}
-		if len(flag.NoOptDefVal) > 0 {
-			format = format + "]"
-		}
-		format = format + "\n\t%s\n\n"
-		fmt.Fprintf(out, format, flag.Shorthand, flag.Name, flag.DefValue, flag.Usage)
-	})
-}
-
-func manPrintOptions(out io.Writer, command *cobra.Command) {
-	flags := command.NonInheritedFlags()
-	if flags.HasFlags() {
-		fmt.Fprintf(out, "# OPTIONS\n")
-		manPrintFlags(out, flags)
-		fmt.Fprintf(out, "\n")
-	}
-	flags = command.InheritedFlags()
-	if flags.HasFlags() {
-		fmt.Fprintf(out, "# OPTIONS INHERITED FROM PARENT COMMANDS\n")
-		manPrintFlags(out, flags)
-		fmt.Fprintf(out, "\n")
-	}
-}
-
-func genMan(cmd *cobra.Command, header *GenManHeader) []byte {
-	// something like `rootcmd subcmd1 subcmd2`
-	commandName := cmd.CommandPath()
-	// something like `rootcmd-subcmd1-subcmd2`
-	dashCommandName := strings.Replace(commandName, " ", "-", -1)
-
-	fillHeader(header, commandName)
-
-	buf := new(bytes.Buffer)
-
-	short := cmd.Short
-	long := cmd.Long
-	if len(long) == 0 {
-		long = short
-	}
-
-	manPreamble(buf, header, commandName, short, long)
-	manPrintOptions(buf, cmd)
-	if len(cmd.Example) > 0 {
-		fmt.Fprintf(buf, "# EXAMPLE\n")
-		fmt.Fprintf(buf, "```\n%s\n```\n", cmd.Example)
-	}
-	if hasSeeAlso(cmd) {
-		fmt.Fprintf(buf, "# SEE ALSO\n")
-		seealsos := make([]string, 0)
-		if cmd.HasParent() {
-			parentPath := cmd.Parent().CommandPath()
-			dashParentPath := strings.Replace(parentPath, " ", "-", -1)
-			seealso := fmt.Sprintf("**%s(%s)**", dashParentPath, header.Section)
-			seealsos = append(seealsos, seealso)
-			cmd.VisitParents(func(c *cobra.Command) {
-				if c.DisableAutoGenTag {
-					cmd.DisableAutoGenTag = c.DisableAutoGenTag
-				}
-			})
-		}
-		children := cmd.Commands()
-		sort.Sort(byName(children))
-		for _, c := range children {
-			if !c.IsAvailableCommand() || c.IsHelpCommand() {
-				continue
-			}
-			seealso := fmt.Sprintf("**%s-%s(%s)**", dashCommandName, c.Name(), header.Section)
-			seealsos = append(seealsos, seealso)
-		}
-		fmt.Fprintf(buf, "%s\n", strings.Join(seealsos, ", "))
-	}
-	if !cmd.DisableAutoGenTag {
-		fmt.Fprintf(buf, "# HISTORY\n%s Auto generated by spf13/cobra\n", header.Date.Format("2-Jan-2006"))
-	}
-	return buf.Bytes()
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md b/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md
deleted file mode 100644
index 5fe957a355..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/doc/man_docs.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Generating Man Pages For Your Own cobra.Command
-
-Generating man pages from a cobra command is incredibly easy. An example is as follows:
-
-```go
-package main
-
-import (
-	"github.com/spf13/cobra"
-	"github.com/spf13/cobra/doc"
-)
-
-func main() {
-	cmd := &cobra.Command{
-		Use:   "test",
-		Short: "my test program",
-	}
-	header := &cobra.GenManHeader{
-		Title: "MINE",
-		Section: "3",
-	}
-	doc.GenManTree(cmd, header, "/tmp")
-}
-```
-
-That will get you a man page `/tmp/test.1`
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go b/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go
deleted file mode 100644
index fa13631804..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.go
+++ /dev/null
@@ -1,175 +0,0 @@
-//Copyright 2015 Red Hat Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package doc
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/spf13/cobra"
-)
-
-func printOptions(w io.Writer, cmd *cobra.Command, name string) error {
-	flags := cmd.NonInheritedFlags()
-	flags.SetOutput(w)
-	if flags.HasFlags() {
-		if _, err := fmt.Fprintf(w, "### Options\n\n```\n"); err != nil {
-			return err
-		}
-		flags.PrintDefaults()
-		if _, err := fmt.Fprintf(w, "```\n\n"); err != nil {
-			return err
-		}
-	}
-
-	parentFlags := cmd.InheritedFlags()
-	parentFlags.SetOutput(w)
-	if parentFlags.HasFlags() {
-		if _, err := fmt.Fprintf(w, "### Options inherited from parent commands\n\n```\n"); err != nil {
-			return err
-		}
-		parentFlags.PrintDefaults()
-		if _, err := fmt.Fprintf(w, "```\n\n"); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func GenMarkdown(cmd *cobra.Command, w io.Writer) error {
-	return GenMarkdownCustom(cmd, w, func(s string) string { return s })
-}
-
-func GenMarkdownCustom(cmd *cobra.Command, w io.Writer, linkHandler func(string) string) error {
-	name := cmd.CommandPath()
-
-	short := cmd.Short
-	long := cmd.Long
-	if len(long) == 0 {
-		long = short
-	}
-
-	if _, err := fmt.Fprintf(w, "## %s\n\n", name); err != nil {
-		return err
-	}
-	if _, err := fmt.Fprintf(w, "%s\n\n", short); err != nil {
-		return err
-	}
-	if _, err := fmt.Fprintf(w, "### Synopsis\n\n"); err != nil {
-		return err
-	}
-	if _, err := fmt.Fprintf(w, "\n%s\n\n", long); err != nil {
-		return err
-	}
-
-	if cmd.Runnable() {
-		if _, err := fmt.Fprintf(w, "```\n%s\n```\n\n", cmd.UseLine()); err != nil {
-			return err
-		}
-	}
-
-	if len(cmd.Example) > 0 {
-		if _, err := fmt.Fprintf(w, "### Examples\n\n"); err != nil {
-			return err
-		}
-		if _, err := fmt.Fprintf(w, "```\n%s\n```\n\n", cmd.Example); err != nil {
-			return err
-		}
-	}
-
-	if err := printOptions(w, cmd, name); err != nil {
-		return err
-	}
-	if hasSeeAlso(cmd) {
-		if _, err := fmt.Fprintf(w, "### SEE ALSO\n"); err != nil {
-			return err
-		}
-		if cmd.HasParent() {
-			parent := cmd.Parent()
-			pname := parent.CommandPath()
-			link := pname + ".md"
-			link = strings.Replace(link, " ", "_", -1)
-			if _, err := fmt.Fprintf(w, "* [%s](%s)\t - %s\n", pname, linkHandler(link), parent.Short); err != nil {
-				return err
-			}
-			cmd.VisitParents(func(c *cobra.Command) {
-				if c.DisableAutoGenTag {
-					cmd.DisableAutoGenTag = c.DisableAutoGenTag
-				}
-			})
-		}
-
-		children := cmd.Commands()
-		sort.Sort(byName(children))
-
-		for _, child := range children {
-			if !child.IsAvailableCommand() || child.IsHelpCommand() {
-				continue
-			}
-			cname := name + " " + child.Name()
-			link := cname + ".md"
-			link = strings.Replace(link, " ", "_", -1)
-			if _, err := fmt.Fprintf(w, "* [%s](%s)\t - %s\n", cname, linkHandler(link), child.Short); err != nil {
-				return err
-			}
-		}
-		if _, err := fmt.Fprintf(w, "\n"); err != nil {
-			return err
-		}
-	}
-	if !cmd.DisableAutoGenTag {
-		if _, err := fmt.Fprintf(w, "###### Auto generated by spf13/cobra on %s\n", time.Now().Format("2-Jan-2006")); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func GenMarkdownTree(cmd *cobra.Command, dir string) error {
-	identity := func(s string) string { return s }
-	emptyStr := func(s string) string { return "" }
-	return GenMarkdownTreeCustom(cmd, dir, emptyStr, identity)
-}
-
-func GenMarkdownTreeCustom(cmd *cobra.Command, dir string, filePrepender, linkHandler func(string) string) error {
-	for _, c := range cmd.Commands() {
-		if !c.IsAvailableCommand() || c.IsHelpCommand() {
-			continue
-		}
-		if err := GenMarkdownTreeCustom(c, dir, filePrepender, linkHandler); err != nil {
-			return err
-		}
-	}
-
-	basename := strings.Replace(cmd.CommandPath(), " ", "_", -1) + ".md"
-	filename := filepath.Join(dir, basename)
-	f, err := os.Create(filename)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	if _, err := io.WriteString(f, filePrepender(filename)); err != nil {
-		return err
-	}
-	if err := GenMarkdownCustom(cmd, f, linkHandler); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md b/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md
deleted file mode 100644
index 0c3b96e271..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/doc/md_docs.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generating Markdown Docs For Your Own cobra.Command
-
-Generating man pages from a cobra command is incredibly easy. An example is as follows:
-
-```go
-package main
-
-import (
-	"github.com/spf13/cobra"
-	"github.com/spf13/cobra/doc"
-)
-
-func main() {
-	cmd := &cobra.Command{
-		Use:   "test",
-		Short: "my test program",
-	}
-	doc.GenMarkdownTree(cmd, "/tmp")
-}
-```
-
-That will get you a Markdown document `/tmp/test.md`
-
-## Generate markdown docs for the entire command tree
-
-This program can actually generate docs for the kubectl command in the kubernetes project
-
-```go
-package main
-
-import (
-	"io/ioutil"
-	"os"
-
-	kubectlcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-
-	"github.com/spf13/cobra/doc"
-)
-
-func main() {
-	cmd := kubectlcmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, ioutil.Discard, ioutil.Discard)
-	doc.GenMarkdownTree(cmd, "./")
-}
-```
-
-This will generate a whole series of files, one for each command in the tree, in the directory specified (in this case "./")
-
-## Generate markdown docs for a single command
-
-You may wish to have more control over the output, or only generate for a single command, instead of the entire command tree. If this is the case you may prefer to `GenMarkdown` instead of `GenMarkdownTree`
-
-```go
-	out := new(bytes.Buffer)
-	doc.GenMarkdown(cmd, out)
-```
-
-This will write the markdown doc for ONLY "cmd" into the out, buffer.
-
-## Customize the output
-
-Both `GenMarkdown` and `GenMarkdownTree` have alternate versions with callbacks to get some control of the output:
-
-```go
-func GenMarkdownTreeCustom(cmd *Command, dir string, filePrepender, linkHandler func(string) string) error {
-	//...
-}
-```
-
-```go
-func GenMarkdownCustom(cmd *Command, out *bytes.Buffer, linkHandler func(string) string) error {
-	//...
-}
-```
-
-The `filePrepender` will prepend the return value given the full filepath to the rendered Markdown file. A common use case is to add front matter to use the generated documentation with [Hugo](http://gohugo.io/):
-
-```go
-const fmTemplate = `---
-date: %s
-title: "%s"
-slug: %s
-url: %s
----
-`
-
-filePrepender := func(filename string) string {
-	now := time.Now().Format(time.RFC3339)
-	name := filepath.Base(filename)
-	base := strings.TrimSuffix(name, path.Ext(name))
-	url := "/commands/" + strings.ToLower(base) + "/"
-	return fmt.Sprintf(fmTemplate, now, strings.Replace(base, "_", " ", -1), base, url)
-}
-```
-
-The `linkHandler` can be used to customize the rendered internal links to the commands, given a filename:
-
-```go
-linkHandler := func(name string) string {
-	base := strings.TrimSuffix(name, path.Ext(name))
-	return "/commands/" + strings.ToLower(base) + "/"
-}
-```
-
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go b/Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go
deleted file mode 100644
index a1c6b89ba6..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/doc/util.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015 Red Hat Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package doc
-
-import "github.com/spf13/cobra"
-
-// Test to see if we have a reason to print See Also information in docs
-// Basically this is a test for a parent commend or a subcommand which is
-// both not deprecated and not the autogenerated help command.
-func hasSeeAlso(cmd *cobra.Command) bool {
-	if cmd.HasParent() {
-		return true
-	}
-	for _, c := range cmd.Commands() {
-		if !c.IsAvailableCommand() || c.IsHelpCommand() {
-			continue
-		}
-		return true
-	}
-	return false
-}
-
-type byName []*cobra.Command
-
-func (s byName) Len() int           { return len(s) }
-func (s byName) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s byName) Less(i, j int) bool { return s[i].Name() < s[j].Name() }
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/doc_util.go b/Godeps/_workspace/src/github.com/spf13/cobra/doc_util.go
deleted file mode 100644
index e248216284..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/doc_util.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015 Red Hat Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cobra
-
-// Test to see if we have a reason to print See Also information in docs
-// Basically this is a test for a parent commend or a subcommand which is
-// both not deprecated and not the autogenerated help command.
-func (cmd *Command) hasSeeAlso() bool {
-	if cmd.HasParent() {
-		return true
-	}
-	children := cmd.Commands()
-	if len(children) == 0 {
-		return false
-	}
-	for _, c := range children {
-		if !c.IsAvailableCommand() || c == cmd.helpCommand {
-			continue
-		}
-		return true
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/man_docs.go b/Godeps/_workspace/src/github.com/spf13/cobra/man_docs.go
deleted file mode 100644
index c168b62874..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/man_docs.go
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright 2015 Red Hat Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cobra
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"sort"
-	"strings"
-	"time"
-
-	mangen "github.com/cpuguy83/go-md2man/md2man"
-	"github.com/spf13/pflag"
-)
-
-// GenManTree will call cmd.GenManTree(header, dir)
-func GenManTree(cmd *Command, header *GenManHeader, dir string) {
-	cmd.GenManTree(header, dir)
-}
-
-// GenManTree will generate a man page for this command and all decendants
-// in the directory given. The header may be nil. This function may not work
-// correctly if your command names have - in them. If you have `cmd` with two
-// subcmds, `sub` and `sub-third`. And `sub` has a subcommand called `third`
-// it is undefined which help output will be in the file `cmd-sub-third.1`.
-func (cmd *Command) GenManTree(header *GenManHeader, dir string) {
-	if header == nil {
-		header = &GenManHeader{}
-	}
-	for _, c := range cmd.Commands() {
-		if !c.IsAvailableCommand() || c == cmd.helpCommand {
-			continue
-		}
-		GenManTree(c, header, dir)
-	}
-	out := new(bytes.Buffer)
-
-	needToResetTitle := header.Title == ""
-
-	cmd.GenMan(header, out)
-
-	if needToResetTitle {
-		header.Title = ""
-	}
-
-	filename := cmd.CommandPath()
-	filename = dir + strings.Replace(filename, " ", "-", -1) + ".1"
-	outFile, err := os.Create(filename)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-	defer outFile.Close()
-	_, err = outFile.Write(out.Bytes())
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}
-
-// GenManHeader is a lot like the .TH header at the start of man pages. These
-// include the title, section, date, source, and manual. We will use the
-// current time if Date if unset and will use "Auto generated by spf13/cobra"
-// if the Source is unset.
-type GenManHeader struct {
-	Title   string
-	Section string
-	Date    *time.Time
-	date    string
-	Source  string
-	Manual  string
-}
-
-// GenMan will call cmd.GenMan(header, out)
-func GenMan(cmd *Command, header *GenManHeader, out *bytes.Buffer) {
-	cmd.GenMan(header, out)
-}
-
-// GenMan will generate a man page for the given command in the out buffer.
-// The header argument may be nil, however obviously out may not.
-func (cmd *Command) GenMan(header *GenManHeader, out *bytes.Buffer) {
-	if header == nil {
-		header = &GenManHeader{}
-	}
-	buf := genMarkdown(cmd, header)
-	final := mangen.Render(buf)
-	out.Write(final)
-}
-
-func fillHeader(header *GenManHeader, name string) {
-	if header.Title == "" {
-		header.Title = strings.ToUpper(strings.Replace(name, " ", "\\-", -1))
-	}
-	if header.Section == "" {
-		header.Section = "1"
-	}
-	if header.Date == nil {
-		now := time.Now()
-		header.Date = &now
-	}
-	header.date = (*header.Date).Format("Jan 2006")
-	if header.Source == "" {
-		header.Source = "Auto generated by spf13/cobra"
-	}
-}
-
-func manPreamble(out *bytes.Buffer, header *GenManHeader, name, short, long string) {
-	dashName := strings.Replace(name, " ", "-", -1)
-	fmt.Fprintf(out, `%% %s(%s)%s
-%% %s
-%% %s
-# NAME
-`, header.Title, header.Section, header.date, header.Source, header.Manual)
-	fmt.Fprintf(out, "%s \\- %s\n\n", dashName, short)
-	fmt.Fprintf(out, "# SYNOPSIS\n")
-	fmt.Fprintf(out, "**%s** [OPTIONS]\n\n", name)
-	fmt.Fprintf(out, "# DESCRIPTION\n")
-	fmt.Fprintf(out, "%s\n\n", long)
-}
-
-func manPrintFlags(out *bytes.Buffer, flags *pflag.FlagSet) {
-	flags.VisitAll(func(flag *pflag.Flag) {
-		if len(flag.Deprecated) > 0 || flag.Hidden {
-			return
-		}
-		format := ""
-		if len(flag.Shorthand) > 0 {
-			format = "**-%s**, **--%s**"
-		} else {
-			format = "%s**--%s**"
-		}
-		if len(flag.NoOptDefVal) > 0 {
-			format = format + "["
-		}
-		if flag.Value.Type() == "string" {
-			// put quotes on the value
-			format = format + "=%q"
-		} else {
-			format = format + "=%s"
-		}
-		if len(flag.NoOptDefVal) > 0 {
-			format = format + "]"
-		}
-		format = format + "\n\t%s\n\n"
-		fmt.Fprintf(out, format, flag.Shorthand, flag.Name, flag.DefValue, flag.Usage)
-	})
-}
-
-func manPrintOptions(out *bytes.Buffer, command *Command) {
-	flags := command.NonInheritedFlags()
-	if flags.HasFlags() {
-		fmt.Fprintf(out, "# OPTIONS\n")
-		manPrintFlags(out, flags)
-		fmt.Fprintf(out, "\n")
-	}
-	flags = command.InheritedFlags()
-	if flags.HasFlags() {
-		fmt.Fprintf(out, "# OPTIONS INHERITED FROM PARENT COMMANDS\n")
-		manPrintFlags(out, flags)
-		fmt.Fprintf(out, "\n")
-	}
-}
-
-func genMarkdown(cmd *Command, header *GenManHeader) []byte {
-	// something like `rootcmd subcmd1 subcmd2`
-	commandName := cmd.CommandPath()
-	// something like `rootcmd-subcmd1-subcmd2`
-	dashCommandName := strings.Replace(commandName, " ", "-", -1)
-
-	fillHeader(header, commandName)
-
-	buf := new(bytes.Buffer)
-
-	short := cmd.Short
-	long := cmd.Long
-	if len(long) == 0 {
-		long = short
-	}
-
-	manPreamble(buf, header, commandName, short, long)
-	manPrintOptions(buf, cmd)
-	if len(cmd.Example) > 0 {
-		fmt.Fprintf(buf, "# EXAMPLE\n")
-		fmt.Fprintf(buf, "```\n%s\n```\n", cmd.Example)
-	}
-	if cmd.hasSeeAlso() {
-		fmt.Fprintf(buf, "# SEE ALSO\n")
-		if cmd.HasParent() {
-			parentPath := cmd.Parent().CommandPath()
-			dashParentPath := strings.Replace(parentPath, " ", "-", -1)
-			fmt.Fprintf(buf, "**%s(%s)**", dashParentPath, header.Section)
-			cmd.VisitParents(func(c *Command) {
-				if c.DisableAutoGenTag {
-					cmd.DisableAutoGenTag = c.DisableAutoGenTag
-				}
-			})
-		}
-		children := cmd.Commands()
-		sort.Sort(byName(children))
-		for i, c := range children {
-			if !c.IsAvailableCommand() || c == cmd.helpCommand {
-				continue
-			}
-			if cmd.HasParent() || i > 0 {
-				fmt.Fprintf(buf, ", ")
-			}
-			fmt.Fprintf(buf, "**%s-%s(%s)**", dashCommandName, c.Name(), header.Section)
-		}
-		fmt.Fprintf(buf, "\n")
-	}
-	if !cmd.DisableAutoGenTag {
-		fmt.Fprintf(buf, "# HISTORY\n%s Auto generated by spf13/cobra\n", header.Date.Format("2-Jan-2006"))
-	}
-	return buf.Bytes()
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/man_docs.md b/Godeps/_workspace/src/github.com/spf13/cobra/man_docs.md
deleted file mode 100644
index 3408c30115..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/man_docs.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generating Man Pages For Your Own cobra.Command
-
-Generating man pages from a cobra command is incredibly easy. An example is as follows:
-
-```go
-package main
-
-import (
-	"github.com/spf13/cobra"
-)
-
-func main() {
-	cmd := &cobra.Command{
-		Use:   "test",
-		Short: "my test program",
-	}
-	header := &cobra.GenManHeader{
-		Title: "MINE",
-		Section: "3",
-	}
-	cmd.GenManTree(header, "/tmp")
-}
-```
-
-That will get you a man page `/tmp/test.1`
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/md_docs.go b/Godeps/_workspace/src/github.com/spf13/cobra/md_docs.go
deleted file mode 100644
index e940ba160a..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/md_docs.go
+++ /dev/null
@@ -1,162 +0,0 @@
-//Copyright 2015 Red Hat Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cobra
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"sort"
-	"strings"
-	"time"
-)
-
-func printOptions(out *bytes.Buffer, cmd *Command, name string) {
-	flags := cmd.NonInheritedFlags()
-	flags.SetOutput(out)
-	if flags.HasFlags() {
-		fmt.Fprintf(out, "### Options\n\n```\n")
-		flags.PrintDefaults()
-		fmt.Fprintf(out, "```\n\n")
-	}
-
-	parentFlags := cmd.InheritedFlags()
-	parentFlags.SetOutput(out)
-	if parentFlags.HasFlags() {
-		fmt.Fprintf(out, "### Options inherited from parent commands\n\n```\n")
-		parentFlags.PrintDefaults()
-		fmt.Fprintf(out, "```\n\n")
-	}
-}
-
-type byName []*Command
-
-func (s byName) Len() int           { return len(s) }
-func (s byName) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s byName) Less(i, j int) bool { return s[i].Name() < s[j].Name() }
-
-func GenMarkdown(cmd *Command, out *bytes.Buffer) {
-	cmd.GenMarkdown(out)
-}
-
-func (cmd *Command) GenMarkdown(out *bytes.Buffer) {
-	cmd.GenMarkdownCustom(out, func(s string) string { return s })
-}
-
-func GenMarkdownCustom(cmd *Command, out *bytes.Buffer, linkHandler func(string) string) {
-	cmd.GenMarkdownCustom(out, linkHandler)
-}
-
-func (cmd *Command) GenMarkdownCustom(out *bytes.Buffer, linkHandler func(string) string) {
-	name := cmd.CommandPath()
-
-	short := cmd.Short
-	long := cmd.Long
-	if len(long) == 0 {
-		long = short
-	}
-
-	fmt.Fprintf(out, "## %s\n\n", name)
-	fmt.Fprintf(out, "%s\n\n", short)
-	fmt.Fprintf(out, "### Synopsis\n\n")
-	fmt.Fprintf(out, "\n%s\n\n", long)
-
-	if cmd.Runnable() {
-		fmt.Fprintf(out, "```\n%s\n```\n\n", cmd.UseLine())
-	}
-
-	if len(cmd.Example) > 0 {
-		fmt.Fprintf(out, "### Examples\n\n")
-		fmt.Fprintf(out, "```\n%s\n```\n\n", cmd.Example)
-	}
-
-	printOptions(out, cmd, name)
-	if cmd.hasSeeAlso() {
-		fmt.Fprintf(out, "### SEE ALSO\n")
-		if cmd.HasParent() {
-			parent := cmd.Parent()
-			pname := parent.CommandPath()
-			link := pname + ".md"
-			link = strings.Replace(link, " ", "_", -1)
-			fmt.Fprintf(out, "* [%s](%s)\t - %s\n", pname, linkHandler(link), parent.Short)
-			cmd.VisitParents(func(c *Command) {
-				if c.DisableAutoGenTag {
-					cmd.DisableAutoGenTag = c.DisableAutoGenTag
-				}
-			})
-		}
-
-		children := cmd.Commands()
-		sort.Sort(byName(children))
-
-		for _, child := range children {
-			if !child.IsAvailableCommand() || child == cmd.helpCommand {
-				continue
-			}
-			cname := name + " " + child.Name()
-			link := cname + ".md"
-			link = strings.Replace(link, " ", "_", -1)
-			fmt.Fprintf(out, "* [%s](%s)\t - %s\n", cname, linkHandler(link), child.Short)
-		}
-		fmt.Fprintf(out, "\n")
-	}
-	if !cmd.DisableAutoGenTag {
-		fmt.Fprintf(out, "###### Auto generated by spf13/cobra on %s\n", time.Now().Format("2-Jan-2006"))
-	}
-}
-
-func GenMarkdownTree(cmd *Command, dir string) {
-	cmd.GenMarkdownTree(dir)
-}
-
-func (cmd *Command) GenMarkdownTree(dir string) {
-	identity := func(s string) string { return s }
-	emptyStr := func(s string) string { return "" }
-	cmd.GenMarkdownTreeCustom(dir, emptyStr, identity)
-}
-
-func GenMarkdownTreeCustom(cmd *Command, dir string, filePrepender func(string) string, linkHandler func(string) string) {
-	cmd.GenMarkdownTreeCustom(dir, filePrepender, linkHandler)
-}
-
-func (cmd *Command) GenMarkdownTreeCustom(dir string, filePrepender func(string) string, linkHandler func(string) string) {
-	for _, c := range cmd.Commands() {
-		if !c.IsAvailableCommand() || c == cmd.helpCommand {
-			continue
-		}
-		c.GenMarkdownTreeCustom(dir, filePrepender, linkHandler)
-	}
-	out := new(bytes.Buffer)
-
-	cmd.GenMarkdownCustom(out, linkHandler)
-
-	filename := cmd.CommandPath()
-	filename = dir + strings.Replace(filename, " ", "_", -1) + ".md"
-	outFile, err := os.Create(filename)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-	defer outFile.Close()
-	_, err = outFile.WriteString(filePrepender(filename))
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-	_, err = outFile.Write(out.Bytes())
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/cobra/md_docs.md b/Godeps/_workspace/src/github.com/spf13/cobra/md_docs.md
deleted file mode 100644
index 3a0d55ab90..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/cobra/md_docs.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# Generating Markdown Docs For Your Own cobra.Command
-
-## Generate markdown docs for the entire command tree
-
-This program can actually generate docs for the kubectl command in the kubernetes project
-
-```go
-package main
-
-import (
-	"io/ioutil"
-	"os"
-
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd"
-	"github.com/spf13/cobra"
-)
-
-func main() {
-	kubectl := cmd.NewFactory(nil).NewKubectlCommand(os.Stdin, ioutil.Discard, ioutil.Discard)
-	cobra.GenMarkdownTree(kubectl, "./")
-}
-```
-
-This will generate a whole series of files, one for each command in the tree, in the directory specified (in this case "./")
-
-## Generate markdown docs for a single command
-
-You may wish to have more control over the output, or only generate for a single command, instead of the entire command tree. If this is the case you may prefer to `GenMarkdown` instead of `GenMarkdownTree`
-
-```go
-	out := new(bytes.Buffer)
-	cobra.GenMarkdown(cmd, out)
-```
-
-This will write the markdown doc for ONLY "cmd" into the out, buffer.
-
-## Customize the output
-
-Both `GenMarkdown` and `GenMarkdownTree` have alternate versions with callbacks to get some control of the output:
-
-```go
-func GenMarkdownTreeCustom(cmd *Command, dir string, filePrepender func(string) string, linkHandler func(string) string) {
-    //...
-}
-```
-
-```go
-func GenMarkdownCustom(cmd *Command, out *bytes.Buffer, linkHandler func(string) string) {
-    //...
-}
-```
-
-The `filePrepender` will prepend the return value given the full filepath to the rendered Markdown file. A common use case is to add front matter to use the generated documentation with [Hugo](http://gohugo.io/):
-
-```go
-const fmTemplate = `---
-date: %s
-title: "%s"
-slug: %s
-url: %s
----
-`
-
-filePrepender := func(filename string) string {
-	now := time.Now().Format(time.RFC3339)
-	name := filepath.Base(filename)
-	base := strings.TrimSuffix(name, path.Ext(name))
-	url := "/commands/" + strings.ToLower(base) + "/"
-	return fmt.Sprintf(fmTemplate, now, strings.Replace(base, "_", " ", -1), base, url)
-}
-```
-
-The `linkHandler` can be used to customize the rendered internal links to the commands, given a filename:
-
-```go
-linkHandler := func(name string) string {
-	base := strings.TrimSuffix(name, path.Ext(name))
-	return "/commands/" + strings.ToLower(base) + "/"
-}
-```
- 
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml b/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml
deleted file mode 100644
index df435a03fd..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-sudo: false
-
-language: go
-
-go:
-        - 1.3
-        - 1.4
-        - 1.5
-        - tip
-
-install:
-        - go get github.com/golang/lint/golint
-        - export PATH=$GOPATH/bin:$PATH
-        - go install ./...
-
-script:
-        - verify/all.sh
-        - go test ./...
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE b/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
deleted file mode 100644
index 63ed1cfea1..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2012 Alex Ogier. All rights reserved.
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/README.md b/Godeps/_workspace/src/github.com/spf13/pflag/README.md
deleted file mode 100644
index e74dd50b41..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/README.md
+++ /dev/null
@@ -1,256 +0,0 @@
-[![Build Status](https://travis-ci.org/spf13/pflag.svg?branch=master)](https://travis-ci.org/spf13/pflag)
-
-## Description
-
-pflag is a drop-in replacement for Go's flag package, implementing
-POSIX/GNU-style --flags.
-
-pflag is compatible with the [GNU extensions to the POSIX recommendations
-for command-line options][1]. For a more precise description, see the
-"Command-line flag syntax" section below.
-
-[1]: http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
-
-pflag is available under the same style of BSD license as the Go language,
-which can be found in the LICENSE file.
-
-## Installation
-
-pflag is available using the standard `go get` command.
-
-Install by running:
-
-    go get github.com/spf13/pflag
-
-Run tests by running:
-
-    go test github.com/spf13/pflag
-
-## Usage
-
-pflag is a drop-in replacement of Go's native flag package. If you import
-pflag under the name "flag" then all code should continue to function
-with no changes.
-
-``` go
-import flag "github.com/spf13/pflag"
-```
-
-There is one exception to this: if you directly instantiate the Flag struct
-there is one more field "Shorthand" that you will need to set.
-Most code never instantiates this struct directly, and instead uses
-functions such as String(), BoolVar(), and Var(), and is therefore
-unaffected.
-
-Define flags using flag.String(), Bool(), Int(), etc.
-
-This declares an integer flag, -flagname, stored in the pointer ip, with type *int.
-
-``` go
-var ip *int = flag.Int("flagname", 1234, "help message for flagname")
-```
-
-If you like, you can bind the flag to a variable using the Var() functions.
-
-``` go
-var flagvar int
-func init() {
-    flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname")
-}
-```
-
-Or you can create custom flags that satisfy the Value interface (with
-pointer receivers) and couple them to flag parsing by
-
-``` go
-flag.Var(&flagVal, "name", "help message for flagname")
-```
-
-For such flags, the default value is just the initial value of the variable.
-
-After all flags are defined, call
-
-``` go
-flag.Parse()
-```
-
-to parse the command line into the defined flags.
-
-Flags may then be used directly. If you're using the flags themselves,
-they are all pointers; if you bind to variables, they're values.
-
-``` go
-fmt.Println("ip has value ", *ip)
-fmt.Println("flagvar has value ", flagvar)
-```
-
-There are helpers function to get values later if you have the FlagSet but
-it was difficult to keep up with all of the the flag pointers in your code.
-If you have a pflag.FlagSet with a flag called 'flagname' of type int you
-can use GetInt() to get the int value. But notice that 'flagname' must exist
-and it must be an int. GetString("flagname") will fail.
-
-``` go
-i, err := flagset.GetInt("flagname")
-```
-
-After parsing, the arguments after the flag are available as the
-slice flag.Args() or individually as flag.Arg(i).
-The arguments are indexed from 0 through flag.NArg()-1.
-
-The pflag package also defines some new functions that are not in flag,
-that give one-letter shorthands for flags. You can use these by appending
-'P' to the name of any function that defines a flag.
-
-``` go
-var ip = flag.IntP("flagname", "f", 1234, "help message")
-var flagvar bool
-func init() {
-    flag.BoolVarP("boolname", "b", true, "help message")
-}
-flag.VarP(&flagVar, "varname", "v", 1234, "help message")
-```
-
-Shorthand letters can be used with single dashes on the command line.
-Boolean shorthand flags can be combined with other shorthand flags.
-
-The default set of command-line flags is controlled by
-top-level functions.  The FlagSet type allows one to define
-independent sets of flags, such as to implement subcommands
-in a command-line interface. The methods of FlagSet are
-analogous to the top-level functions for the command-line
-flag set.
-
-## Setting no option default values for flags
-
-After you create a flag it is possible to set the pflag.NoOptDefVal for
-the given flag. Doing this changes the meaning of the flag slightly. If
-a flag has a NoOptDefVal and the flag is set on the command line without
-an option the flag will be set to the NoOptDefVal. For example given:
-
-``` go
-var ip = flag.IntP("flagname", "f", 1234, "help message")
-flag.Lookup("flagname").NoOptDefVal = "4321"
-```
-
-Would result in something like
-
-| Parsed Arguments | Resulting Value |
-| -------------    | -------------   |
-| --flagname=1357  | ip=1357         |
-| --flagname       | ip=4321         |
-| [nothing]        | ip=1234         |
-
-## Command line flag syntax
-
-```
---flag    // boolean flags, or flags with no option default values
---flag x  // only on flags without a default value
---flag=x
-```
-
-Unlike the flag package, a single dash before an option means something
-different than a double dash. Single dashes signify a series of shorthand
-letters for flags. All but the last shorthand letter must be boolean flags
-or a flag with a default value
-
-```
-// boolean or flags where the 'no option default value' is set
--f
--f=true
--abc
-but
--b true is INVALID
-
-// non-boolean and flags without a 'no option default value'
--n 1234
--n=1234
--n1234
-
-// mixed
--abcs "hello"
--absd="hello"
--abcs1234
-```
-
-Flag parsing stops after the terminator "--". Unlike the flag package,
-flags can be interspersed with arguments anywhere on the command line
-before this terminator.
-
-Integer flags accept 1234, 0664, 0x1234 and may be negative.
-Boolean flags (in their long form) accept 1, 0, t, f, true, false,
-TRUE, FALSE, True, False.
-Duration flags accept any input valid for time.ParseDuration.
-
-## Mutating or "Normalizing" Flag names
-
-It is possible to set a custom flag name 'normalization function.' It allows flag names to be mutated both when created in the code and when used on the command line to some 'normalized' form. The 'normalized' form is used for comparison. Two examples of using the custom normalization func follow.
-
-**Example #1**: You want -, _, and . in flags to compare the same. aka --my-flag == --my_flag == --my.flag
-
-``` go
-func wordSepNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName {
-	from := []string{"-", "_"}
-	to := "."
-	for _, sep := range from {
-		name = strings.Replace(name, sep, to, -1)
-	}
-	return pflag.NormalizedName(name)
-}
-
-myFlagSet.SetNormalizeFunc(wordSepNormalizeFunc)
-```
-
-**Example #2**: You want to alias two flags. aka --old-flag-name == --new-flag-name
-
-``` go
-func aliasNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName {
-	switch name {
-	case "old-flag-name":
-		name = "new-flag-name"
-		break
-	}
-	return pflag.NormalizedName(name)
-}
-
-myFlagSet.SetNormalizeFunc(aliasNormalizeFunc)
-```
-
-## Deprecating a flag or its shorthand
-It is possible to deprecate a flag, or just its shorthand. Deprecating a flag/shorthand hides it from help text and prints a usage message when the deprecated flag/shorthand is used.
-
-**Example #1**: You want to deprecate a flag named "badflag" as well as inform the users what flag they should use instead.
-```go
-// deprecate a flag by specifying its name and a usage message
-flags.MarkDeprecated("badflag", "please use --good-flag instead")
-```
-This hides "badflag" from help text, and prints `Flag --badflag has been deprecated, please use --good-flag instead` when "badflag" is used.
-
-**Example #2**: You want to keep a flag name "noshorthandflag" but deprecate its shortname "n".
-```go
-// deprecate a flag shorthand by specifying its flag name and a usage message
-flags.MarkShorthandDeprecated("noshorthandflag", "please use --noshorthandflag only")
-```
-This hides the shortname "n" from help text, and prints `Flag shorthand -n has been deprecated, please use --noshorthandflag only` when the shorthand "n" is used.
-
-Note that usage message is essential here, and it should not be empty.
-
-## Hidden flags
-It is possible to mark a flag as hidden, meaning it will still function as normal, however will not show up in usage/help text.
-
-**Example**: You have a flag named "secretFlag" that you need for internal use only and don't want it showing up in help text, or for its usage text to be available.
-```go
-// hide a flag by specifying its name
-flags.MarkHidden("secretFlag")
-```
-
-## More info
-
-You can see the full reference documentation of the pflag package
-[at godoc.org][3], or through go's standard documentation system by
-running `godoc -http=:6060` and browsing to
-[http://localhost:6060/pkg/github.com/ogier/pflag][2] after
-installation.
-
-[2]: http://localhost:6060/pkg/github.com/ogier/pflag
-[3]: http://godoc.org/github.com/ogier/pflag
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/bool.go b/Godeps/_workspace/src/github.com/spf13/pflag/bool.go
deleted file mode 100644
index d272e40bdd..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/bool.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// optional interface to indicate boolean flags that can be
-// supplied without "=value" text
-type boolFlag interface {
-	Value
-	IsBoolFlag() bool
-}
-
-// -- bool Value
-type boolValue bool
-
-func newBoolValue(val bool, p *bool) *boolValue {
-	*p = val
-	return (*boolValue)(p)
-}
-
-func (b *boolValue) Set(s string) error {
-	v, err := strconv.ParseBool(s)
-	*b = boolValue(v)
-	return err
-}
-
-func (b *boolValue) Type() string {
-	return "bool"
-}
-
-func (b *boolValue) String() string { return fmt.Sprintf("%v", *b) }
-
-func (b *boolValue) IsBoolFlag() bool { return true }
-
-func boolConv(sval string) (interface{}, error) {
-	return strconv.ParseBool(sval)
-}
-
-// GetBool return the bool value of a flag with the given name
-func (f *FlagSet) GetBool(name string) (bool, error) {
-	val, err := f.getFlagType(name, "bool", boolConv)
-	if err != nil {
-		return false, err
-	}
-	return val.(bool), nil
-}
-
-// BoolVar defines a bool flag with specified name, default value, and usage string.
-// The argument p points to a bool variable in which to store the value of the flag.
-func (f *FlagSet) BoolVar(p *bool, name string, value bool, usage string) {
-	f.BoolVarP(p, name, "", value, usage)
-}
-
-// BoolVarP is like BoolVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) BoolVarP(p *bool, name, shorthand string, value bool, usage string) {
-	flag := f.VarPF(newBoolValue(value, p), name, shorthand, usage)
-	flag.NoOptDefVal = "true"
-}
-
-// BoolVar defines a bool flag with specified name, default value, and usage string.
-// The argument p points to a bool variable in which to store the value of the flag.
-func BoolVar(p *bool, name string, value bool, usage string) {
-	BoolVarP(p, name, "", value, usage)
-}
-
-// BoolVarP is like BoolVar, but accepts a shorthand letter that can be used after a single dash.
-func BoolVarP(p *bool, name, shorthand string, value bool, usage string) {
-	flag := CommandLine.VarPF(newBoolValue(value, p), name, shorthand, usage)
-	flag.NoOptDefVal = "true"
-}
-
-// Bool defines a bool flag with specified name, default value, and usage string.
-// The return value is the address of a bool variable that stores the value of the flag.
-func (f *FlagSet) Bool(name string, value bool, usage string) *bool {
-	return f.BoolP(name, "", value, usage)
-}
-
-// BoolP is like Bool, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) BoolP(name, shorthand string, value bool, usage string) *bool {
-	p := new(bool)
-	f.BoolVarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Bool defines a bool flag with specified name, default value, and usage string.
-// The return value is the address of a bool variable that stores the value of the flag.
-func Bool(name string, value bool, usage string) *bool {
-	return BoolP(name, "", value, usage)
-}
-
-// BoolP is like Bool, but accepts a shorthand letter that can be used after a single dash.
-func BoolP(name, shorthand string, value bool, usage string) *bool {
-	b := CommandLine.BoolP(name, shorthand, value, usage)
-	return b
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/count.go b/Godeps/_workspace/src/github.com/spf13/pflag/count.go
deleted file mode 100644
index 7b1f142e78..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/count.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- count Value
-type countValue int
-
-func newCountValue(val int, p *int) *countValue {
-	*p = val
-	return (*countValue)(p)
-}
-
-func (i *countValue) Set(s string) error {
-	v, err := strconv.ParseInt(s, 0, 64)
-	// -1 means that no specific value was passed, so increment
-	if v == -1 {
-		*i = countValue(*i + 1)
-	} else {
-		*i = countValue(v)
-	}
-	return err
-}
-
-func (i *countValue) Type() string {
-	return "count"
-}
-
-func (i *countValue) String() string { return fmt.Sprintf("%v", *i) }
-
-func countConv(sval string) (interface{}, error) {
-	i, err := strconv.Atoi(sval)
-	if err != nil {
-		return nil, err
-	}
-	return i, nil
-}
-
-// GetCount return the int value of a flag with the given name
-func (f *FlagSet) GetCount(name string) (int, error) {
-	val, err := f.getFlagType(name, "count", countConv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(int), nil
-}
-
-// CountVar defines a count flag with specified name, default value, and usage string.
-// The argument p points to an int variable in which to store the value of the flag.
-// A count flag will add 1 to its value evey time it is found on the command line
-func (f *FlagSet) CountVar(p *int, name string, usage string) {
-	f.CountVarP(p, name, "", usage)
-}
-
-// CountVarP is like CountVar only take a shorthand for the flag name.
-func (f *FlagSet) CountVarP(p *int, name, shorthand string, usage string) {
-	flag := f.VarPF(newCountValue(0, p), name, shorthand, usage)
-	flag.NoOptDefVal = "-1"
-}
-
-// CountVar like CountVar only the flag is placed on the CommandLine instead of a given flag set
-func CountVar(p *int, name string, usage string) {
-	CommandLine.CountVar(p, name, usage)
-}
-
-// CountVarP is like CountVar only take a shorthand for the flag name.
-func CountVarP(p *int, name, shorthand string, usage string) {
-	CommandLine.CountVarP(p, name, shorthand, usage)
-}
-
-// Count defines a count flag with specified name, default value, and usage string.
-// The return value is the address of an int variable that stores the value of the flag.
-// A count flag will add 1 to its value evey time it is found on the command line
-func (f *FlagSet) Count(name string, usage string) *int {
-	p := new(int)
-	f.CountVarP(p, name, "", usage)
-	return p
-}
-
-// CountP is like Count only takes a shorthand for the flag name.
-func (f *FlagSet) CountP(name, shorthand string, usage string) *int {
-	p := new(int)
-	f.CountVarP(p, name, shorthand, usage)
-	return p
-}
-
-// Count like Count only the flag is placed on the CommandLine isntead of a given flag set
-func Count(name string, usage string) *int {
-	return CommandLine.CountP(name, "", usage)
-}
-
-// CountP is like Count only takes a shorthand for the flag name.
-func CountP(name, shorthand string, usage string) *int {
-	return CommandLine.CountP(name, shorthand, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/duration.go b/Godeps/_workspace/src/github.com/spf13/pflag/duration.go
deleted file mode 100644
index e9debef88e..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/duration.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package pflag
-
-import (
-	"time"
-)
-
-// -- time.Duration Value
-type durationValue time.Duration
-
-func newDurationValue(val time.Duration, p *time.Duration) *durationValue {
-	*p = val
-	return (*durationValue)(p)
-}
-
-func (d *durationValue) Set(s string) error {
-	v, err := time.ParseDuration(s)
-	*d = durationValue(v)
-	return err
-}
-
-func (d *durationValue) Type() string {
-	return "duration"
-}
-
-func (d *durationValue) String() string { return (*time.Duration)(d).String() }
-
-func durationConv(sval string) (interface{}, error) {
-	return time.ParseDuration(sval)
-}
-
-// GetDuration return the duration value of a flag with the given name
-func (f *FlagSet) GetDuration(name string) (time.Duration, error) {
-	val, err := f.getFlagType(name, "duration", durationConv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(time.Duration), nil
-}
-
-// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
-// The argument p points to a time.Duration variable in which to store the value of the flag.
-func (f *FlagSet) DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
-	f.VarP(newDurationValue(value, p), name, "", usage)
-}
-
-// DurationVarP is like DurationVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) DurationVarP(p *time.Duration, name, shorthand string, value time.Duration, usage string) {
-	f.VarP(newDurationValue(value, p), name, shorthand, usage)
-}
-
-// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
-// The argument p points to a time.Duration variable in which to store the value of the flag.
-func DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
-	CommandLine.VarP(newDurationValue(value, p), name, "", usage)
-}
-
-// DurationVarP is like DurationVar, but accepts a shorthand letter that can be used after a single dash.
-func DurationVarP(p *time.Duration, name, shorthand string, value time.Duration, usage string) {
-	CommandLine.VarP(newDurationValue(value, p), name, shorthand, usage)
-}
-
-// Duration defines a time.Duration flag with specified name, default value, and usage string.
-// The return value is the address of a time.Duration variable that stores the value of the flag.
-func (f *FlagSet) Duration(name string, value time.Duration, usage string) *time.Duration {
-	p := new(time.Duration)
-	f.DurationVarP(p, name, "", value, usage)
-	return p
-}
-
-// DurationP is like Duration, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) DurationP(name, shorthand string, value time.Duration, usage string) *time.Duration {
-	p := new(time.Duration)
-	f.DurationVarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Duration defines a time.Duration flag with specified name, default value, and usage string.
-// The return value is the address of a time.Duration variable that stores the value of the flag.
-func Duration(name string, value time.Duration, usage string) *time.Duration {
-	return CommandLine.DurationP(name, "", value, usage)
-}
-
-// DurationP is like Duration, but accepts a shorthand letter that can be used after a single dash.
-func DurationP(name, shorthand string, value time.Duration, usage string) *time.Duration {
-	return CommandLine.DurationP(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag.go b/Godeps/_workspace/src/github.com/spf13/pflag/flag.go
deleted file mode 100644
index fd91440341..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/flag.go
+++ /dev/null
@@ -1,836 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package pflag is a drop-in replacement for Go's flag package, implementing
-POSIX/GNU-style --flags.
-
-pflag is compatible with the GNU extensions to the POSIX recommendations
-for command-line options. See
-http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
-
-Usage:
-
-pflag is a drop-in replacement of Go's native flag package. If you import
-pflag under the name "flag" then all code should continue to function
-with no changes.
-
-	import flag "github.com/ogier/pflag"
-
-	There is one exception to this: if you directly instantiate the Flag struct
-there is one more field "Shorthand" that you will need to set.
-Most code never instantiates this struct directly, and instead uses
-functions such as String(), BoolVar(), and Var(), and is therefore
-unaffected.
-
-Define flags using flag.String(), Bool(), Int(), etc.
-
-This declares an integer flag, -flagname, stored in the pointer ip, with type *int.
-	var ip = flag.Int("flagname", 1234, "help message for flagname")
-If you like, you can bind the flag to a variable using the Var() functions.
-	var flagvar int
-	func init() {
-		flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname")
-	}
-Or you can create custom flags that satisfy the Value interface (with
-pointer receivers) and couple them to flag parsing by
-	flag.Var(&flagVal, "name", "help message for flagname")
-For such flags, the default value is just the initial value of the variable.
-
-After all flags are defined, call
-	flag.Parse()
-to parse the command line into the defined flags.
-
-Flags may then be used directly. If you're using the flags themselves,
-they are all pointers; if you bind to variables, they're values.
-	fmt.Println("ip has value ", *ip)
-	fmt.Println("flagvar has value ", flagvar)
-
-After parsing, the arguments after the flag are available as the
-slice flag.Args() or individually as flag.Arg(i).
-The arguments are indexed from 0 through flag.NArg()-1.
-
-The pflag package also defines some new functions that are not in flag,
-that give one-letter shorthands for flags. You can use these by appending
-'P' to the name of any function that defines a flag.
-	var ip = flag.IntP("flagname", "f", 1234, "help message")
-	var flagvar bool
-	func init() {
-		flag.BoolVarP("boolname", "b", true, "help message")
-	}
-	flag.VarP(&flagVar, "varname", "v", 1234, "help message")
-Shorthand letters can be used with single dashes on the command line.
-Boolean shorthand flags can be combined with other shorthand flags.
-
-Command line flag syntax:
-	--flag    // boolean flags only
-	--flag=x
-
-Unlike the flag package, a single dash before an option means something
-different than a double dash. Single dashes signify a series of shorthand
-letters for flags. All but the last shorthand letter must be boolean flags.
-	// boolean flags
-	-f
-	-abc
-	// non-boolean flags
-	-n 1234
-	-Ifile
-	// mixed
-	-abcs "hello"
-	-abcn1234
-
-Flag parsing stops after the terminator "--". Unlike the flag package,
-flags can be interspersed with arguments anywhere on the command line
-before this terminator.
-
-Integer flags accept 1234, 0664, 0x1234 and may be negative.
-Boolean flags (in their long form) accept 1, 0, t, f, true, false,
-TRUE, FALSE, True, False.
-Duration flags accept any input valid for time.ParseDuration.
-
-The default set of command-line flags is controlled by
-top-level functions.  The FlagSet type allows one to define
-independent sets of flags, such as to implement subcommands
-in a command-line interface. The methods of FlagSet are
-analogous to the top-level functions for the command-line
-flag set.
-*/
-package pflag
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"sort"
-	"strings"
-)
-
-// ErrHelp is the error returned if the flag -help is invoked but no such flag is defined.
-var ErrHelp = errors.New("pflag: help requested")
-
-// ErrorHandling defines how to handle flag parsing errors.
-type ErrorHandling int
-
-const (
-	// ContinueOnError will return an err from Parse() if an error is found
-	ContinueOnError ErrorHandling = iota
-	// ExitOnError will call os.Exit(2) if an error is found when parsing
-	ExitOnError
-	// PanicOnError will panic() if an error is found when parsing flags
-	PanicOnError
-)
-
-// NormalizedName is a flag name that has been normalized according to rules
-// for the FlagSet (e.g. making '-' and '_' equivalent).
-type NormalizedName string
-
-// A FlagSet represents a set of defined flags.
-type FlagSet struct {
-	// Usage is the function called when an error occurs while parsing flags.
-	// The field is a function (not a method) that may be changed to point to
-	// a custom error handler.
-	Usage func()
-
-	name              string
-	parsed            bool
-	actual            map[NormalizedName]*Flag
-	formal            map[NormalizedName]*Flag
-	shorthands        map[byte]*Flag
-	args              []string // arguments after flags
-	argsLenAtDash     int      // len(args) when a '--' was located when parsing, or -1 if no --
-	exitOnError       bool     // does the program exit if there's an error?
-	errorHandling     ErrorHandling
-	output            io.Writer // nil means stderr; use out() accessor
-	interspersed      bool      // allow interspersed option/non-option args
-	normalizeNameFunc func(f *FlagSet, name string) NormalizedName
-}
-
-// A Flag represents the state of a flag.
-type Flag struct {
-	Name                string              // name as it appears on command line
-	Shorthand           string              // one-letter abbreviated flag
-	Usage               string              // help message
-	Value               Value               // value as set
-	DefValue            string              // default value (as text); for usage message
-	Changed             bool                // If the user set the value (or if left to default)
-	NoOptDefVal         string              //default value (as text); if the flag is on the command line without any options
-	Deprecated          string              // If this flag is deprecated, this string is the new or now thing to use
-	Hidden              bool                // used by cobra.Command to allow flags to be hidden from help/usage text
-	ShorthandDeprecated string              // If the shorthand of this flag is deprecated, this string is the new or now thing to use
-	Annotations         map[string][]string // used by cobra.Command bash autocomple code
-}
-
-// Value is the interface to the dynamic value stored in a flag.
-// (The default value is represented as a string.)
-type Value interface {
-	String() string
-	Set(string) error
-	Type() string
-}
-
-// sortFlags returns the flags as a slice in lexicographical sorted order.
-func sortFlags(flags map[NormalizedName]*Flag) []*Flag {
-	list := make(sort.StringSlice, len(flags))
-	i := 0
-	for k := range flags {
-		list[i] = string(k)
-		i++
-	}
-	list.Sort()
-	result := make([]*Flag, len(list))
-	for i, name := range list {
-		result[i] = flags[NormalizedName(name)]
-	}
-	return result
-}
-
-// SetNormalizeFunc allows you to add a function which can translate flag names.
-// Flags added to the FlagSet will be translated and then when anything tries to
-// look up the flag that will also be translated. So it would be possible to create
-// a flag named "getURL" and have it translated to "geturl".  A user could then pass
-// "--getUrl" which may also be translated to "geturl" and everything will work.
-func (f *FlagSet) SetNormalizeFunc(n func(f *FlagSet, name string) NormalizedName) {
-	f.normalizeNameFunc = n
-	for k, v := range f.formal {
-		delete(f.formal, k)
-		nname := f.normalizeFlagName(string(k))
-		f.formal[nname] = v
-		v.Name = string(nname)
-	}
-}
-
-// GetNormalizeFunc returns the previously set NormalizeFunc of a function which
-// does no translation, if not set previously.
-func (f *FlagSet) GetNormalizeFunc() func(f *FlagSet, name string) NormalizedName {
-	if f.normalizeNameFunc != nil {
-		return f.normalizeNameFunc
-	}
-	return func(f *FlagSet, name string) NormalizedName { return NormalizedName(name) }
-}
-
-func (f *FlagSet) normalizeFlagName(name string) NormalizedName {
-	n := f.GetNormalizeFunc()
-	return n(f, name)
-}
-
-func (f *FlagSet) out() io.Writer {
-	if f.output == nil {
-		return os.Stderr
-	}
-	return f.output
-}
-
-// SetOutput sets the destination for usage and error messages.
-// If output is nil, os.Stderr is used.
-func (f *FlagSet) SetOutput(output io.Writer) {
-	f.output = output
-}
-
-// VisitAll visits the flags in lexicographical order, calling fn for each.
-// It visits all flags, even those not set.
-func (f *FlagSet) VisitAll(fn func(*Flag)) {
-	for _, flag := range sortFlags(f.formal) {
-		fn(flag)
-	}
-}
-
-// HasFlags returns a bool to indicate if the FlagSet has any flags definied.
-func (f *FlagSet) HasFlags() bool {
-	return len(f.formal) > 0
-}
-
-// VisitAll visits the command-line flags in lexicographical order, calling
-// fn for each.  It visits all flags, even those not set.
-func VisitAll(fn func(*Flag)) {
-	CommandLine.VisitAll(fn)
-}
-
-// Visit visits the flags in lexicographical order, calling fn for each.
-// It visits only those flags that have been set.
-func (f *FlagSet) Visit(fn func(*Flag)) {
-	for _, flag := range sortFlags(f.actual) {
-		fn(flag)
-	}
-}
-
-// Visit visits the command-line flags in lexicographical order, calling fn
-// for each.  It visits only those flags that have been set.
-func Visit(fn func(*Flag)) {
-	CommandLine.Visit(fn)
-}
-
-// Lookup returns the Flag structure of the named flag, returning nil if none exists.
-func (f *FlagSet) Lookup(name string) *Flag {
-	return f.lookup(f.normalizeFlagName(name))
-}
-
-// lookup returns the Flag structure of the named flag, returning nil if none exists.
-func (f *FlagSet) lookup(name NormalizedName) *Flag {
-	return f.formal[name]
-}
-
-// func to return a given type for a given flag name
-func (f *FlagSet) getFlagType(name string, ftype string, convFunc func(sval string) (interface{}, error)) (interface{}, error) {
-	flag := f.Lookup(name)
-	if flag == nil {
-		err := fmt.Errorf("flag accessed but not defined: %s", name)
-		return nil, err
-	}
-
-	if flag.Value.Type() != ftype {
-		err := fmt.Errorf("trying to get %s value of flag of type %s", ftype, flag.Value.Type())
-		return nil, err
-	}
-
-	sval := flag.Value.String()
-	result, err := convFunc(sval)
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// ArgsLenAtDash will return the length of f.Args at the moment when a -- was
-// found during arg parsing. This allows your program to know which args were
-// before the -- and which came after.
-func (f *FlagSet) ArgsLenAtDash() int {
-	return f.argsLenAtDash
-}
-
-// MarkDeprecated indicated that a flag is deprecated in your program. It will
-// continue to function but will not show up in help or usage messages. Using
-// this flag will also print the given usageMessage.
-func (f *FlagSet) MarkDeprecated(name string, usageMessage string) error {
-	flag := f.Lookup(name)
-	if flag == nil {
-		return fmt.Errorf("flag %q does not exist", name)
-	}
-	if len(usageMessage) == 0 {
-		return fmt.Errorf("deprecated message for flag %q must be set", name)
-	}
-	flag.Deprecated = usageMessage
-	return nil
-}
-
-// MarkShorthandDeprecated will mark the shorthand of a flag deprecated in your
-// program. It will continue to function but will not show up in help or usage
-// messages. Using this flag will also print the given usageMessage.
-func (f *FlagSet) MarkShorthandDeprecated(name string, usageMessage string) error {
-	flag := f.Lookup(name)
-	if flag == nil {
-		return fmt.Errorf("flag %q does not exist", name)
-	}
-	if len(usageMessage) == 0 {
-		return fmt.Errorf("deprecated message for flag %q must be set", name)
-	}
-	flag.ShorthandDeprecated = usageMessage
-	return nil
-}
-
-// MarkHidden sets a flag to 'hidden' in your program. It will continue to
-// function but will not show up in help or usage messages.
-func (f *FlagSet) MarkHidden(name string) error {
-	flag := f.Lookup(name)
-	if flag == nil {
-		return fmt.Errorf("flag %q does not exist", name)
-	}
-	flag.Hidden = true
-	return nil
-}
-
-// Lookup returns the Flag structure of the named command-line flag,
-// returning nil if none exists.
-func Lookup(name string) *Flag {
-	return CommandLine.Lookup(name)
-}
-
-// Set sets the value of the named flag.
-func (f *FlagSet) Set(name, value string) error {
-	normalName := f.normalizeFlagName(name)
-	flag, ok := f.formal[normalName]
-	if !ok {
-		return fmt.Errorf("no such flag -%v", name)
-	}
-	err := flag.Value.Set(value)
-	if err != nil {
-		return err
-	}
-	if f.actual == nil {
-		f.actual = make(map[NormalizedName]*Flag)
-	}
-	f.actual[normalName] = flag
-	flag.Changed = true
-	if len(flag.Deprecated) > 0 {
-		fmt.Fprintf(os.Stderr, "Flag --%s has been deprecated, %s\n", flag.Name, flag.Deprecated)
-	}
-	return nil
-}
-
-// SetAnnotation allows one to set arbitrary annotations on a flag in the FlagSet.
-// This is sometimes used by spf13/cobra programs which want to generate additional
-// bash completion information.
-func (f *FlagSet) SetAnnotation(name, key string, values []string) error {
-	normalName := f.normalizeFlagName(name)
-	flag, ok := f.formal[normalName]
-	if !ok {
-		return fmt.Errorf("no such flag -%v", name)
-	}
-	if flag.Annotations == nil {
-		flag.Annotations = map[string][]string{}
-	}
-	flag.Annotations[key] = values
-	return nil
-}
-
-// Changed returns true if the flag was explicitly set during Parse() and false
-// otherwise
-func (f *FlagSet) Changed(name string) bool {
-	flag := f.Lookup(name)
-	// If a flag doesn't exist, it wasn't changed....
-	if flag == nil {
-		return false
-	}
-	return flag.Changed
-}
-
-// Set sets the value of the named command-line flag.
-func Set(name, value string) error {
-	return CommandLine.Set(name, value)
-}
-
-// PrintDefaults prints, to standard error unless configured
-// otherwise, the default values of all defined flags in the set.
-func (f *FlagSet) PrintDefaults() {
-	usages := f.FlagUsages()
-	fmt.Fprintf(f.out(), "%s", usages)
-}
-
-// FlagUsages Returns a string containing the usage information for all flags in
-// the FlagSet
-func (f *FlagSet) FlagUsages() string {
-	x := new(bytes.Buffer)
-
-	f.VisitAll(func(flag *Flag) {
-		if len(flag.Deprecated) > 0 || flag.Hidden {
-			return
-		}
-		format := ""
-		if len(flag.Shorthand) > 0 && len(flag.ShorthandDeprecated) == 0 {
-			format = "  -%s, --%s"
-		} else {
-			format = "   %s   --%s"
-		}
-		if len(flag.NoOptDefVal) > 0 {
-			format = format + "["
-		}
-		if flag.Value.Type() == "string" {
-			// put quotes on the value
-			format = format + "=%q"
-		} else {
-			format = format + "=%s"
-		}
-		if len(flag.NoOptDefVal) > 0 {
-			format = format + "]"
-		}
-		format = format + ": %s\n"
-		shorthand := flag.Shorthand
-		if len(flag.ShorthandDeprecated) > 0 {
-			shorthand = ""
-		}
-		fmt.Fprintf(x, format, shorthand, flag.Name, flag.DefValue, flag.Usage)
-	})
-
-	return x.String()
-}
-
-// PrintDefaults prints to standard error the default values of all defined command-line flags.
-func PrintDefaults() {
-	CommandLine.PrintDefaults()
-}
-
-// defaultUsage is the default function to print a usage message.
-func defaultUsage(f *FlagSet) {
-	fmt.Fprintf(f.out(), "Usage of %s:\n", f.name)
-	f.PrintDefaults()
-}
-
-// NOTE: Usage is not just defaultUsage(CommandLine)
-// because it serves (via godoc flag Usage) as the example
-// for how to write your own usage function.
-
-// Usage prints to standard error a usage message documenting all defined command-line flags.
-// The function is a variable that may be changed to point to a custom function.
-var Usage = func() {
-	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
-	PrintDefaults()
-}
-
-// NFlag returns the number of flags that have been set.
-func (f *FlagSet) NFlag() int { return len(f.actual) }
-
-// NFlag returns the number of command-line flags that have been set.
-func NFlag() int { return len(CommandLine.actual) }
-
-// Arg returns the i'th argument.  Arg(0) is the first remaining argument
-// after flags have been processed.
-func (f *FlagSet) Arg(i int) string {
-	if i < 0 || i >= len(f.args) {
-		return ""
-	}
-	return f.args[i]
-}
-
-// Arg returns the i'th command-line argument.  Arg(0) is the first remaining argument
-// after flags have been processed.
-func Arg(i int) string {
-	return CommandLine.Arg(i)
-}
-
-// NArg is the number of arguments remaining after flags have been processed.
-func (f *FlagSet) NArg() int { return len(f.args) }
-
-// NArg is the number of arguments remaining after flags have been processed.
-func NArg() int { return len(CommandLine.args) }
-
-// Args returns the non-flag arguments.
-func (f *FlagSet) Args() []string { return f.args }
-
-// Args returns the non-flag command-line arguments.
-func Args() []string { return CommandLine.args }
-
-// Var defines a flag with the specified name and usage string. The type and
-// value of the flag are represented by the first argument, of type Value, which
-// typically holds a user-defined implementation of Value. For instance, the
-// caller could create a flag that turns a comma-separated string into a slice
-// of strings by giving the slice the methods of Value; in particular, Set would
-// decompose the comma-separated string into the slice.
-func (f *FlagSet) Var(value Value, name string, usage string) {
-	f.VarP(value, name, "", usage)
-}
-
-// VarPF is like VarP, but returns the flag created
-func (f *FlagSet) VarPF(value Value, name, shorthand, usage string) *Flag {
-	// Remember the default value as a string; it won't change.
-	flag := &Flag{
-		Name:      name,
-		Shorthand: shorthand,
-		Usage:     usage,
-		Value:     value,
-		DefValue:  value.String(),
-	}
-	f.AddFlag(flag)
-	return flag
-}
-
-// VarP is like Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) VarP(value Value, name, shorthand, usage string) {
-	_ = f.VarPF(value, name, shorthand, usage)
-}
-
-// AddFlag will add the flag to the FlagSet
-func (f *FlagSet) AddFlag(flag *Flag) {
-	// Call normalizeFlagName function only once
-	normalizedFlagName := f.normalizeFlagName(flag.Name)
-
-	_, alreadythere := f.formal[normalizedFlagName]
-	if alreadythere {
-		msg := fmt.Sprintf("%s flag redefined: %s", f.name, flag.Name)
-		fmt.Fprintln(f.out(), msg)
-		panic(msg) // Happens only if flags are declared with identical names
-	}
-	if f.formal == nil {
-		f.formal = make(map[NormalizedName]*Flag)
-	}
-
-	flag.Name = string(normalizedFlagName)
-	f.formal[normalizedFlagName] = flag
-
-	if len(flag.Shorthand) == 0 {
-		return
-	}
-	if len(flag.Shorthand) > 1 {
-		fmt.Fprintf(f.out(), "%s shorthand more than ASCII character: %s\n", f.name, flag.Shorthand)
-		panic("shorthand is more than one character")
-	}
-	if f.shorthands == nil {
-		f.shorthands = make(map[byte]*Flag)
-	}
-	c := flag.Shorthand[0]
-	old, alreadythere := f.shorthands[c]
-	if alreadythere {
-		fmt.Fprintf(f.out(), "%s shorthand reused: %q for %s already used for %s\n", f.name, c, flag.Name, old.Name)
-		panic("shorthand redefinition")
-	}
-	f.shorthands[c] = flag
-}
-
-// AddFlagSet adds one FlagSet to another. If a flag is already present in f
-// the flag from newSet will be ignored
-func (f *FlagSet) AddFlagSet(newSet *FlagSet) {
-	if newSet == nil {
-		return
-	}
-	newSet.VisitAll(func(flag *Flag) {
-		if f.Lookup(flag.Name) == nil {
-			f.AddFlag(flag)
-		}
-	})
-}
-
-// Var defines a flag with the specified name and usage string. The type and
-// value of the flag are represented by the first argument, of type Value, which
-// typically holds a user-defined implementation of Value. For instance, the
-// caller could create a flag that turns a comma-separated string into a slice
-// of strings by giving the slice the methods of Value; in particular, Set would
-// decompose the comma-separated string into the slice.
-func Var(value Value, name string, usage string) {
-	CommandLine.VarP(value, name, "", usage)
-}
-
-// VarP is like Var, but accepts a shorthand letter that can be used after a single dash.
-func VarP(value Value, name, shorthand, usage string) {
-	CommandLine.VarP(value, name, shorthand, usage)
-}
-
-// failf prints to standard error a formatted error and usage message and
-// returns the error.
-func (f *FlagSet) failf(format string, a ...interface{}) error {
-	err := fmt.Errorf(format, a...)
-	fmt.Fprintln(f.out(), err)
-	f.usage()
-	return err
-}
-
-// usage calls the Usage method for the flag set, or the usage function if
-// the flag set is CommandLine.
-func (f *FlagSet) usage() {
-	if f == CommandLine {
-		Usage()
-	} else if f.Usage == nil {
-		defaultUsage(f)
-	} else {
-		f.Usage()
-	}
-}
-
-func (f *FlagSet) setFlag(flag *Flag, value string, origArg string) error {
-	if err := flag.Value.Set(value); err != nil {
-		return f.failf("invalid argument %q for %s: %v", value, origArg, err)
-	}
-	// mark as visited for Visit()
-	if f.actual == nil {
-		f.actual = make(map[NormalizedName]*Flag)
-	}
-	f.actual[f.normalizeFlagName(flag.Name)] = flag
-	flag.Changed = true
-	if len(flag.Deprecated) > 0 {
-		fmt.Fprintf(os.Stderr, "Flag --%s has been deprecated, %s\n", flag.Name, flag.Deprecated)
-	}
-	if len(flag.ShorthandDeprecated) > 0 && containsShorthand(origArg, flag.Shorthand) {
-		fmt.Fprintf(os.Stderr, "Flag shorthand -%s has been deprecated, %s\n", flag.Shorthand, flag.ShorthandDeprecated)
-	}
-	return nil
-}
-
-func containsShorthand(arg, shorthand string) bool {
-	// filter out flags --<flag_name>
-	if strings.HasPrefix(arg, "-") {
-		return false
-	}
-	arg = strings.SplitN(arg, "=", 2)[0]
-	return strings.Contains(arg, shorthand)
-}
-
-func (f *FlagSet) parseLongArg(s string, args []string) (a []string, err error) {
-	a = args
-	name := s[2:]
-	if len(name) == 0 || name[0] == '-' || name[0] == '=' {
-		err = f.failf("bad flag syntax: %s", s)
-		return
-	}
-	split := strings.SplitN(name, "=", 2)
-	name = split[0]
-	flag, alreadythere := f.formal[f.normalizeFlagName(name)]
-	if !alreadythere {
-		if name == "help" { // special case for nice help message.
-			f.usage()
-			return a, ErrHelp
-		}
-		err = f.failf("unknown flag: --%s", name)
-		return
-	}
-	var value string
-	if len(split) == 2 {
-		// '--flag=arg'
-		value = split[1]
-	} else if len(flag.NoOptDefVal) > 0 {
-		// '--flag' (arg was optional)
-		value = flag.NoOptDefVal
-	} else if len(a) > 0 {
-		// '--flag arg'
-		value = a[0]
-		a = a[1:]
-	} else {
-		// '--flag' (arg was required)
-		err = f.failf("flag needs an argument: %s", s)
-		return
-	}
-	err = f.setFlag(flag, value, s)
-	return
-}
-
-func (f *FlagSet) parseSingleShortArg(shorthands string, args []string) (outShorts string, outArgs []string, err error) {
-	outArgs = args
-	outShorts = shorthands[1:]
-	c := shorthands[0]
-
-	flag, alreadythere := f.shorthands[c]
-	if !alreadythere {
-		if c == 'h' { // special case for nice help message.
-			f.usage()
-			err = ErrHelp
-			return
-		}
-		//TODO continue on error
-		err = f.failf("unknown shorthand flag: %q in -%s", c, shorthands)
-		return
-	}
-	var value string
-	if len(shorthands) > 2 && shorthands[1] == '=' {
-		value = shorthands[2:]
-		outShorts = ""
-	} else if len(flag.NoOptDefVal) > 0 {
-		value = flag.NoOptDefVal
-	} else if len(shorthands) > 1 {
-		value = shorthands[1:]
-		outShorts = ""
-	} else if len(args) > 0 {
-		value = args[0]
-		outArgs = args[1:]
-	} else {
-		err = f.failf("flag needs an argument: %q in -%s", c, shorthands)
-		return
-	}
-	err = f.setFlag(flag, value, shorthands)
-	return
-}
-
-func (f *FlagSet) parseShortArg(s string, args []string) (a []string, err error) {
-	a = args
-	shorthands := s[1:]
-
-	for len(shorthands) > 0 {
-		shorthands, a, err = f.parseSingleShortArg(shorthands, args)
-		if err != nil {
-			return
-		}
-	}
-
-	return
-}
-
-func (f *FlagSet) parseArgs(args []string) (err error) {
-	for len(args) > 0 {
-		s := args[0]
-		args = args[1:]
-		if len(s) == 0 || s[0] != '-' || len(s) == 1 {
-			if !f.interspersed {
-				f.args = append(f.args, s)
-				f.args = append(f.args, args...)
-				return nil
-			}
-			f.args = append(f.args, s)
-			continue
-		}
-
-		if s[1] == '-' {
-			if len(s) == 2 { // "--" terminates the flags
-				f.argsLenAtDash = len(f.args)
-				f.args = append(f.args, args...)
-				break
-			}
-			args, err = f.parseLongArg(s, args)
-		} else {
-			args, err = f.parseShortArg(s, args)
-		}
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// Parse parses flag definitions from the argument list, which should not
-// include the command name.  Must be called after all flags in the FlagSet
-// are defined and before flags are accessed by the program.
-// The return value will be ErrHelp if -help was set but not defined.
-func (f *FlagSet) Parse(arguments []string) error {
-	f.parsed = true
-	f.args = make([]string, 0, len(arguments))
-	err := f.parseArgs(arguments)
-	if err != nil {
-		switch f.errorHandling {
-		case ContinueOnError:
-			return err
-		case ExitOnError:
-			os.Exit(2)
-		case PanicOnError:
-			panic(err)
-		}
-	}
-	return nil
-}
-
-// Parsed reports whether f.Parse has been called.
-func (f *FlagSet) Parsed() bool {
-	return f.parsed
-}
-
-// Parse parses the command-line flags from os.Args[1:].  Must be called
-// after all flags are defined and before flags are accessed by the program.
-func Parse() {
-	// Ignore errors; CommandLine is set for ExitOnError.
-	CommandLine.Parse(os.Args[1:])
-}
-
-// SetInterspersed sets whether to support interspersed option/non-option arguments.
-func SetInterspersed(interspersed bool) {
-	CommandLine.SetInterspersed(interspersed)
-}
-
-// Parsed returns true if the command-line flags have been parsed.
-func Parsed() bool {
-	return CommandLine.Parsed()
-}
-
-// The default set of command-line flags, parsed from os.Args.
-var CommandLine = NewFlagSet(os.Args[0], ExitOnError)
-
-// NewFlagSet returns a new, empty flag set with the specified name and
-// error handling property.
-func NewFlagSet(name string, errorHandling ErrorHandling) *FlagSet {
-	f := &FlagSet{
-		name:          name,
-		errorHandling: errorHandling,
-		argsLenAtDash: -1,
-		interspersed:  true,
-	}
-	return f
-}
-
-// SetInterspersed sets whether to support interspersed option/non-option arguments.
-func (f *FlagSet) SetInterspersed(interspersed bool) {
-	f.interspersed = interspersed
-}
-
-// Init sets the name and error handling property for a flag set.
-// By default, the zero FlagSet uses an empty name and the
-// ContinueOnError error handling policy.
-func (f *FlagSet) Init(name string, errorHandling ErrorHandling) {
-	f.name = name
-	f.errorHandling = errorHandling
-	f.argsLenAtDash = -1
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float32.go b/Godeps/_workspace/src/github.com/spf13/pflag/float32.go
deleted file mode 100644
index 7683fae1b1..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/float32.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- float32 Value
-type float32Value float32
-
-func newFloat32Value(val float32, p *float32) *float32Value {
-	*p = val
-	return (*float32Value)(p)
-}
-
-func (f *float32Value) Set(s string) error {
-	v, err := strconv.ParseFloat(s, 32)
-	*f = float32Value(v)
-	return err
-}
-
-func (f *float32Value) Type() string {
-	return "float32"
-}
-
-func (f *float32Value) String() string { return fmt.Sprintf("%v", *f) }
-
-func float32Conv(sval string) (interface{}, error) {
-	v, err := strconv.ParseFloat(sval, 32)
-	if err != nil {
-		return 0, err
-	}
-	return float32(v), nil
-}
-
-// GetFloat32 return the float32 value of a flag with the given name
-func (f *FlagSet) GetFloat32(name string) (float32, error) {
-	val, err := f.getFlagType(name, "float32", float32Conv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(float32), nil
-}
-
-// Float32Var defines a float32 flag with specified name, default value, and usage string.
-// The argument p points to a float32 variable in which to store the value of the flag.
-func (f *FlagSet) Float32Var(p *float32, name string, value float32, usage string) {
-	f.VarP(newFloat32Value(value, p), name, "", usage)
-}
-
-// Float32VarP is like Float32Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Float32VarP(p *float32, name, shorthand string, value float32, usage string) {
-	f.VarP(newFloat32Value(value, p), name, shorthand, usage)
-}
-
-// Float32Var defines a float32 flag with specified name, default value, and usage string.
-// The argument p points to a float32 variable in which to store the value of the flag.
-func Float32Var(p *float32, name string, value float32, usage string) {
-	CommandLine.VarP(newFloat32Value(value, p), name, "", usage)
-}
-
-// Float32VarP is like Float32Var, but accepts a shorthand letter that can be used after a single dash.
-func Float32VarP(p *float32, name, shorthand string, value float32, usage string) {
-	CommandLine.VarP(newFloat32Value(value, p), name, shorthand, usage)
-}
-
-// Float32 defines a float32 flag with specified name, default value, and usage string.
-// The return value is the address of a float32 variable that stores the value of the flag.
-func (f *FlagSet) Float32(name string, value float32, usage string) *float32 {
-	p := new(float32)
-	f.Float32VarP(p, name, "", value, usage)
-	return p
-}
-
-// Float32P is like Float32, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Float32P(name, shorthand string, value float32, usage string) *float32 {
-	p := new(float32)
-	f.Float32VarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Float32 defines a float32 flag with specified name, default value, and usage string.
-// The return value is the address of a float32 variable that stores the value of the flag.
-func Float32(name string, value float32, usage string) *float32 {
-	return CommandLine.Float32P(name, "", value, usage)
-}
-
-// Float32P is like Float32, but accepts a shorthand letter that can be used after a single dash.
-func Float32P(name, shorthand string, value float32, usage string) *float32 {
-	return CommandLine.Float32P(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/float64.go b/Godeps/_workspace/src/github.com/spf13/pflag/float64.go
deleted file mode 100644
index 50fbf8cc1a..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/float64.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- float64 Value
-type float64Value float64
-
-func newFloat64Value(val float64, p *float64) *float64Value {
-	*p = val
-	return (*float64Value)(p)
-}
-
-func (f *float64Value) Set(s string) error {
-	v, err := strconv.ParseFloat(s, 64)
-	*f = float64Value(v)
-	return err
-}
-
-func (f *float64Value) Type() string {
-	return "float64"
-}
-
-func (f *float64Value) String() string { return fmt.Sprintf("%v", *f) }
-
-func float64Conv(sval string) (interface{}, error) {
-	return strconv.ParseFloat(sval, 64)
-}
-
-// GetFloat64 return the float64 value of a flag with the given name
-func (f *FlagSet) GetFloat64(name string) (float64, error) {
-	val, err := f.getFlagType(name, "float64", float64Conv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(float64), nil
-}
-
-// Float64Var defines a float64 flag with specified name, default value, and usage string.
-// The argument p points to a float64 variable in which to store the value of the flag.
-func (f *FlagSet) Float64Var(p *float64, name string, value float64, usage string) {
-	f.VarP(newFloat64Value(value, p), name, "", usage)
-}
-
-// Float64VarP is like Float64Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Float64VarP(p *float64, name, shorthand string, value float64, usage string) {
-	f.VarP(newFloat64Value(value, p), name, shorthand, usage)
-}
-
-// Float64Var defines a float64 flag with specified name, default value, and usage string.
-// The argument p points to a float64 variable in which to store the value of the flag.
-func Float64Var(p *float64, name string, value float64, usage string) {
-	CommandLine.VarP(newFloat64Value(value, p), name, "", usage)
-}
-
-// Float64VarP is like Float64Var, but accepts a shorthand letter that can be used after a single dash.
-func Float64VarP(p *float64, name, shorthand string, value float64, usage string) {
-	CommandLine.VarP(newFloat64Value(value, p), name, shorthand, usage)
-}
-
-// Float64 defines a float64 flag with specified name, default value, and usage string.
-// The return value is the address of a float64 variable that stores the value of the flag.
-func (f *FlagSet) Float64(name string, value float64, usage string) *float64 {
-	p := new(float64)
-	f.Float64VarP(p, name, "", value, usage)
-	return p
-}
-
-// Float64P is like Float64, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Float64P(name, shorthand string, value float64, usage string) *float64 {
-	p := new(float64)
-	f.Float64VarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Float64 defines a float64 flag with specified name, default value, and usage string.
-// The return value is the address of a float64 variable that stores the value of the flag.
-func Float64(name string, value float64, usage string) *float64 {
-	return CommandLine.Float64P(name, "", value, usage)
-}
-
-// Float64P is like Float64, but accepts a shorthand letter that can be used after a single dash.
-func Float64P(name, shorthand string, value float64, usage string) *float64 {
-	return CommandLine.Float64P(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/golangflag.go b/Godeps/_workspace/src/github.com/spf13/pflag/golangflag.go
deleted file mode 100644
index a8c24efb64..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/golangflag.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pflag
-
-import (
-	goflag "flag"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-var _ = fmt.Print
-
-// flagValueWrapper implements pflag.Value around a flag.Value.  The main
-// difference here is the addition of the Type method that returns a string
-// name of the type.  As this is generally unknown, we approximate that with
-// reflection.
-type flagValueWrapper struct {
-	inner    goflag.Value
-	flagType string
-}
-
-// We are just copying the boolFlag interface out of goflag as that is what
-// they use to decide if a flag should get "true" when no arg is given.
-type goBoolFlag interface {
-	goflag.Value
-	IsBoolFlag() bool
-}
-
-func wrapFlagValue(v goflag.Value) Value {
-	// If the flag.Value happens to also be a pflag.Value, just use it directly.
-	if pv, ok := v.(Value); ok {
-		return pv
-	}
-
-	pv := &flagValueWrapper{
-		inner: v,
-	}
-
-	t := reflect.TypeOf(v)
-	if t.Kind() == reflect.Interface || t.Kind() == reflect.Ptr {
-		t = t.Elem()
-	}
-
-	pv.flagType = strings.TrimSuffix(t.Name(), "Value")
-	return pv
-}
-
-func (v *flagValueWrapper) String() string {
-	return v.inner.String()
-}
-
-func (v *flagValueWrapper) Set(s string) error {
-	return v.inner.Set(s)
-}
-
-func (v *flagValueWrapper) Type() string {
-	return v.flagType
-}
-
-// PFlagFromGoFlag will return a *pflag.Flag given a *flag.Flag
-func PFlagFromGoFlag(goflag *goflag.Flag) *Flag {
-	// Remember the default value as a string; it won't change.
-	flag := &Flag{
-		Name:  goflag.Name,
-		Usage: goflag.Usage,
-		Value: wrapFlagValue(goflag.Value),
-		// Looks like golang flags don't set DefValue correctly  :-(
-		//DefValue: goflag.DefValue,
-		DefValue: goflag.Value.String(),
-	}
-	if fv, ok := goflag.Value.(goBoolFlag); ok && fv.IsBoolFlag() {
-		flag.NoOptDefVal = "true"
-	}
-	return flag
-}
-
-// AddGoFlag will add the given *flag.Flag to the pflag.FlagSet
-func (f *FlagSet) AddGoFlag(goflag *goflag.Flag) {
-	if f.Lookup(goflag.Name) != nil {
-		return
-	}
-	newflag := PFlagFromGoFlag(goflag)
-	f.AddFlag(newflag)
-}
-
-// AddGoFlagSet will add the given *flag.FlagSet to the pflag.FlagSet
-func (f *FlagSet) AddGoFlagSet(newSet *goflag.FlagSet) {
-	if newSet == nil {
-		return
-	}
-	newSet.VisitAll(func(goflag *goflag.Flag) {
-		f.AddGoFlag(goflag)
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int.go b/Godeps/_workspace/src/github.com/spf13/pflag/int.go
deleted file mode 100644
index b6560368a9..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/int.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- int Value
-type intValue int
-
-func newIntValue(val int, p *int) *intValue {
-	*p = val
-	return (*intValue)(p)
-}
-
-func (i *intValue) Set(s string) error {
-	v, err := strconv.ParseInt(s, 0, 64)
-	*i = intValue(v)
-	return err
-}
-
-func (i *intValue) Type() string {
-	return "int"
-}
-
-func (i *intValue) String() string { return fmt.Sprintf("%v", *i) }
-
-func intConv(sval string) (interface{}, error) {
-	return strconv.Atoi(sval)
-}
-
-// GetInt return the int value of a flag with the given name
-func (f *FlagSet) GetInt(name string) (int, error) {
-	val, err := f.getFlagType(name, "int", intConv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(int), nil
-}
-
-// IntVar defines an int flag with specified name, default value, and usage string.
-// The argument p points to an int variable in which to store the value of the flag.
-func (f *FlagSet) IntVar(p *int, name string, value int, usage string) {
-	f.VarP(newIntValue(value, p), name, "", usage)
-}
-
-// IntVarP is like IntVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IntVarP(p *int, name, shorthand string, value int, usage string) {
-	f.VarP(newIntValue(value, p), name, shorthand, usage)
-}
-
-// IntVar defines an int flag with specified name, default value, and usage string.
-// The argument p points to an int variable in which to store the value of the flag.
-func IntVar(p *int, name string, value int, usage string) {
-	CommandLine.VarP(newIntValue(value, p), name, "", usage)
-}
-
-// IntVarP is like IntVar, but accepts a shorthand letter that can be used after a single dash.
-func IntVarP(p *int, name, shorthand string, value int, usage string) {
-	CommandLine.VarP(newIntValue(value, p), name, shorthand, usage)
-}
-
-// Int defines an int flag with specified name, default value, and usage string.
-// The return value is the address of an int variable that stores the value of the flag.
-func (f *FlagSet) Int(name string, value int, usage string) *int {
-	p := new(int)
-	f.IntVarP(p, name, "", value, usage)
-	return p
-}
-
-// IntP is like Int, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IntP(name, shorthand string, value int, usage string) *int {
-	p := new(int)
-	f.IntVarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Int defines an int flag with specified name, default value, and usage string.
-// The return value is the address of an int variable that stores the value of the flag.
-func Int(name string, value int, usage string) *int {
-	return CommandLine.IntP(name, "", value, usage)
-}
-
-// IntP is like Int, but accepts a shorthand letter that can be used after a single dash.
-func IntP(name, shorthand string, value int, usage string) *int {
-	return CommandLine.IntP(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int32.go b/Godeps/_workspace/src/github.com/spf13/pflag/int32.go
deleted file mode 100644
index 41659a9aff..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/int32.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- int32 Value
-type int32Value int32
-
-func newInt32Value(val int32, p *int32) *int32Value {
-	*p = val
-	return (*int32Value)(p)
-}
-
-func (i *int32Value) Set(s string) error {
-	v, err := strconv.ParseInt(s, 0, 32)
-	*i = int32Value(v)
-	return err
-}
-
-func (i *int32Value) Type() string {
-	return "int32"
-}
-
-func (i *int32Value) String() string { return fmt.Sprintf("%v", *i) }
-
-func int32Conv(sval string) (interface{}, error) {
-	v, err := strconv.ParseInt(sval, 0, 32)
-	if err != nil {
-		return 0, err
-	}
-	return int32(v), nil
-}
-
-// GetInt32 return the int32 value of a flag with the given name
-func (f *FlagSet) GetInt32(name string) (int32, error) {
-	val, err := f.getFlagType(name, "int32", int32Conv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(int32), nil
-}
-
-// Int32Var defines an int32 flag with specified name, default value, and usage string.
-// The argument p points to an int32 variable in which to store the value of the flag.
-func (f *FlagSet) Int32Var(p *int32, name string, value int32, usage string) {
-	f.VarP(newInt32Value(value, p), name, "", usage)
-}
-
-// Int32VarP is like Int32Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Int32VarP(p *int32, name, shorthand string, value int32, usage string) {
-	f.VarP(newInt32Value(value, p), name, shorthand, usage)
-}
-
-// Int32Var defines an int32 flag with specified name, default value, and usage string.
-// The argument p points to an int32 variable in which to store the value of the flag.
-func Int32Var(p *int32, name string, value int32, usage string) {
-	CommandLine.VarP(newInt32Value(value, p), name, "", usage)
-}
-
-// Int32VarP is like Int32Var, but accepts a shorthand letter that can be used after a single dash.
-func Int32VarP(p *int32, name, shorthand string, value int32, usage string) {
-	CommandLine.VarP(newInt32Value(value, p), name, shorthand, usage)
-}
-
-// Int32 defines an int32 flag with specified name, default value, and usage string.
-// The return value is the address of an int32 variable that stores the value of the flag.
-func (f *FlagSet) Int32(name string, value int32, usage string) *int32 {
-	p := new(int32)
-	f.Int32VarP(p, name, "", value, usage)
-	return p
-}
-
-// Int32P is like Int32, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Int32P(name, shorthand string, value int32, usage string) *int32 {
-	p := new(int32)
-	f.Int32VarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Int32 defines an int32 flag with specified name, default value, and usage string.
-// The return value is the address of an int32 variable that stores the value of the flag.
-func Int32(name string, value int32, usage string) *int32 {
-	return CommandLine.Int32P(name, "", value, usage)
-}
-
-// Int32P is like Int32, but accepts a shorthand letter that can be used after a single dash.
-func Int32P(name, shorthand string, value int32, usage string) *int32 {
-	return CommandLine.Int32P(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int64.go b/Godeps/_workspace/src/github.com/spf13/pflag/int64.go
deleted file mode 100644
index 6e67e380f4..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/int64.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- int64 Value
-type int64Value int64
-
-func newInt64Value(val int64, p *int64) *int64Value {
-	*p = val
-	return (*int64Value)(p)
-}
-
-func (i *int64Value) Set(s string) error {
-	v, err := strconv.ParseInt(s, 0, 64)
-	*i = int64Value(v)
-	return err
-}
-
-func (i *int64Value) Type() string {
-	return "int64"
-}
-
-func (i *int64Value) String() string { return fmt.Sprintf("%v", *i) }
-
-func int64Conv(sval string) (interface{}, error) {
-	return strconv.ParseInt(sval, 0, 64)
-}
-
-// GetInt64 return the int64 value of a flag with the given name
-func (f *FlagSet) GetInt64(name string) (int64, error) {
-	val, err := f.getFlagType(name, "int64", int64Conv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(int64), nil
-}
-
-// Int64Var defines an int64 flag with specified name, default value, and usage string.
-// The argument p points to an int64 variable in which to store the value of the flag.
-func (f *FlagSet) Int64Var(p *int64, name string, value int64, usage string) {
-	f.VarP(newInt64Value(value, p), name, "", usage)
-}
-
-// Int64VarP is like Int64Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Int64VarP(p *int64, name, shorthand string, value int64, usage string) {
-	f.VarP(newInt64Value(value, p), name, shorthand, usage)
-}
-
-// Int64Var defines an int64 flag with specified name, default value, and usage string.
-// The argument p points to an int64 variable in which to store the value of the flag.
-func Int64Var(p *int64, name string, value int64, usage string) {
-	CommandLine.VarP(newInt64Value(value, p), name, "", usage)
-}
-
-// Int64VarP is like Int64Var, but accepts a shorthand letter that can be used after a single dash.
-func Int64VarP(p *int64, name, shorthand string, value int64, usage string) {
-	CommandLine.VarP(newInt64Value(value, p), name, shorthand, usage)
-}
-
-// Int64 defines an int64 flag with specified name, default value, and usage string.
-// The return value is the address of an int64 variable that stores the value of the flag.
-func (f *FlagSet) Int64(name string, value int64, usage string) *int64 {
-	p := new(int64)
-	f.Int64VarP(p, name, "", value, usage)
-	return p
-}
-
-// Int64P is like Int64, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Int64P(name, shorthand string, value int64, usage string) *int64 {
-	p := new(int64)
-	f.Int64VarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Int64 defines an int64 flag with specified name, default value, and usage string.
-// The return value is the address of an int64 variable that stores the value of the flag.
-func Int64(name string, value int64, usage string) *int64 {
-	return CommandLine.Int64P(name, "", value, usage)
-}
-
-// Int64P is like Int64, but accepts a shorthand letter that can be used after a single dash.
-func Int64P(name, shorthand string, value int64, usage string) *int64 {
-	return CommandLine.Int64P(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int8.go b/Godeps/_workspace/src/github.com/spf13/pflag/int8.go
deleted file mode 100644
index 400db21f5e..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/int8.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- int8 Value
-type int8Value int8
-
-func newInt8Value(val int8, p *int8) *int8Value {
-	*p = val
-	return (*int8Value)(p)
-}
-
-func (i *int8Value) Set(s string) error {
-	v, err := strconv.ParseInt(s, 0, 8)
-	*i = int8Value(v)
-	return err
-}
-
-func (i *int8Value) Type() string {
-	return "int8"
-}
-
-func (i *int8Value) String() string { return fmt.Sprintf("%v", *i) }
-
-func int8Conv(sval string) (interface{}, error) {
-	v, err := strconv.ParseInt(sval, 0, 8)
-	if err != nil {
-		return 0, err
-	}
-	return int8(v), nil
-}
-
-// GetInt8 return the int8 value of a flag with the given name
-func (f *FlagSet) GetInt8(name string) (int8, error) {
-	val, err := f.getFlagType(name, "int8", int8Conv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(int8), nil
-}
-
-// Int8Var defines an int8 flag with specified name, default value, and usage string.
-// The argument p points to an int8 variable in which to store the value of the flag.
-func (f *FlagSet) Int8Var(p *int8, name string, value int8, usage string) {
-	f.VarP(newInt8Value(value, p), name, "", usage)
-}
-
-// Int8VarP is like Int8Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Int8VarP(p *int8, name, shorthand string, value int8, usage string) {
-	f.VarP(newInt8Value(value, p), name, shorthand, usage)
-}
-
-// Int8Var defines an int8 flag with specified name, default value, and usage string.
-// The argument p points to an int8 variable in which to store the value of the flag.
-func Int8Var(p *int8, name string, value int8, usage string) {
-	CommandLine.VarP(newInt8Value(value, p), name, "", usage)
-}
-
-// Int8VarP is like Int8Var, but accepts a shorthand letter that can be used after a single dash.
-func Int8VarP(p *int8, name, shorthand string, value int8, usage string) {
-	CommandLine.VarP(newInt8Value(value, p), name, shorthand, usage)
-}
-
-// Int8 defines an int8 flag with specified name, default value, and usage string.
-// The return value is the address of an int8 variable that stores the value of the flag.
-func (f *FlagSet) Int8(name string, value int8, usage string) *int8 {
-	p := new(int8)
-	f.Int8VarP(p, name, "", value, usage)
-	return p
-}
-
-// Int8P is like Int8, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Int8P(name, shorthand string, value int8, usage string) *int8 {
-	p := new(int8)
-	f.Int8VarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Int8 defines an int8 flag with specified name, default value, and usage string.
-// The return value is the address of an int8 variable that stores the value of the flag.
-func Int8(name string, value int8, usage string) *int8 {
-	return CommandLine.Int8P(name, "", value, usage)
-}
-
-// Int8P is like Int8, but accepts a shorthand letter that can be used after a single dash.
-func Int8P(name, shorthand string, value int8, usage string) *int8 {
-	return CommandLine.Int8P(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/int_slice.go b/Godeps/_workspace/src/github.com/spf13/pflag/int_slice.go
deleted file mode 100644
index 1e7c9edde9..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/int_slice.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// -- intSlice Value
-type intSliceValue struct {
-	value   *[]int
-	changed bool
-}
-
-func newIntSliceValue(val []int, p *[]int) *intSliceValue {
-	isv := new(intSliceValue)
-	isv.value = p
-	*isv.value = val
-	return isv
-}
-
-func (s *intSliceValue) Set(val string) error {
-	ss := strings.Split(val, ",")
-	out := make([]int, len(ss))
-	for i, d := range ss {
-		var err error
-		out[i], err = strconv.Atoi(d)
-		if err != nil {
-			return err
-		}
-
-	}
-	if !s.changed {
-		*s.value = out
-	} else {
-		*s.value = append(*s.value, out...)
-	}
-	s.changed = true
-	return nil
-}
-
-func (s *intSliceValue) Type() string {
-	return "intSlice"
-}
-
-func (s *intSliceValue) String() string {
-	out := make([]string, len(*s.value))
-	for i, d := range *s.value {
-		out[i] = fmt.Sprintf("%d", d)
-	}
-	return "[" + strings.Join(out, ",") + "]"
-}
-
-func intSliceConv(val string) (interface{}, error) {
-	val = strings.Trim(val, "[]")
-	// Empty string would cause a slice with one (empty) entry
-	if len(val) == 0 {
-		return []int{}, nil
-	}
-	ss := strings.Split(val, ",")
-	out := make([]int, len(ss))
-	for i, d := range ss {
-		var err error
-		out[i], err = strconv.Atoi(d)
-		if err != nil {
-			return nil, err
-		}
-
-	}
-	return out, nil
-}
-
-// GetIntSlice return the []int value of a flag with the given name
-func (f *FlagSet) GetIntSlice(name string) ([]int, error) {
-	val, err := f.getFlagType(name, "intSlice", intSliceConv)
-	if err != nil {
-		return []int{}, err
-	}
-	return val.([]int), nil
-}
-
-// IntSliceVar defines a intSlice flag with specified name, default value, and usage string.
-// The argument p points to a []int variable in which to store the value of the flag.
-func (f *FlagSet) IntSliceVar(p *[]int, name string, value []int, usage string) {
-	f.VarP(newIntSliceValue(value, p), name, "", usage)
-}
-
-// IntSliceVarP is like IntSliceVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IntSliceVarP(p *[]int, name, shorthand string, value []int, usage string) {
-	f.VarP(newIntSliceValue(value, p), name, shorthand, usage)
-}
-
-// IntSliceVar defines a int[] flag with specified name, default value, and usage string.
-// The argument p points to a int[] variable in which to store the value of the flag.
-func IntSliceVar(p *[]int, name string, value []int, usage string) {
-	CommandLine.VarP(newIntSliceValue(value, p), name, "", usage)
-}
-
-// IntSliceVarP is like IntSliceVar, but accepts a shorthand letter that can be used after a single dash.
-func IntSliceVarP(p *[]int, name, shorthand string, value []int, usage string) {
-	CommandLine.VarP(newIntSliceValue(value, p), name, shorthand, usage)
-}
-
-// IntSlice defines a []int flag with specified name, default value, and usage string.
-// The return value is the address of a []int variable that stores the value of the flag.
-func (f *FlagSet) IntSlice(name string, value []int, usage string) *[]int {
-	p := []int{}
-	f.IntSliceVarP(&p, name, "", value, usage)
-	return &p
-}
-
-// IntSliceP is like IntSlice, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IntSliceP(name, shorthand string, value []int, usage string) *[]int {
-	p := []int{}
-	f.IntSliceVarP(&p, name, shorthand, value, usage)
-	return &p
-}
-
-// IntSlice defines a []int flag with specified name, default value, and usage string.
-// The return value is the address of a []int variable that stores the value of the flag.
-func IntSlice(name string, value []int, usage string) *[]int {
-	return CommandLine.IntSliceP(name, "", value, usage)
-}
-
-// IntSliceP is like IntSlice, but accepts a shorthand letter that can be used after a single dash.
-func IntSliceP(name, shorthand string, value []int, usage string) *[]int {
-	return CommandLine.IntSliceP(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ip.go b/Godeps/_workspace/src/github.com/spf13/pflag/ip.go
deleted file mode 100644
index 88a17430a0..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/ip.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"net"
-	"strings"
-)
-
-var _ = strings.TrimSpace
-
-// -- net.IP value
-type ipValue net.IP
-
-func newIPValue(val net.IP, p *net.IP) *ipValue {
-	*p = val
-	return (*ipValue)(p)
-}
-
-func (i *ipValue) String() string { return net.IP(*i).String() }
-func (i *ipValue) Set(s string) error {
-	ip := net.ParseIP(strings.TrimSpace(s))
-	if ip == nil {
-		return fmt.Errorf("failed to parse IP: %q", s)
-	}
-	*i = ipValue(ip)
-	return nil
-}
-
-func (i *ipValue) Type() string {
-	return "ip"
-}
-
-func ipConv(sval string) (interface{}, error) {
-	ip := net.ParseIP(sval)
-	if ip != nil {
-		return ip, nil
-	}
-	return nil, fmt.Errorf("invalid string being converted to IP address: %s", sval)
-}
-
-// GetIP return the net.IP value of a flag with the given name
-func (f *FlagSet) GetIP(name string) (net.IP, error) {
-	val, err := f.getFlagType(name, "ip", ipConv)
-	if err != nil {
-		return nil, err
-	}
-	return val.(net.IP), nil
-}
-
-// IPVar defines an net.IP flag with specified name, default value, and usage string.
-// The argument p points to an net.IP variable in which to store the value of the flag.
-func (f *FlagSet) IPVar(p *net.IP, name string, value net.IP, usage string) {
-	f.VarP(newIPValue(value, p), name, "", usage)
-}
-
-// IPVarP is like IPVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IPVarP(p *net.IP, name, shorthand string, value net.IP, usage string) {
-	f.VarP(newIPValue(value, p), name, shorthand, usage)
-}
-
-// IPVar defines an net.IP flag with specified name, default value, and usage string.
-// The argument p points to an net.IP variable in which to store the value of the flag.
-func IPVar(p *net.IP, name string, value net.IP, usage string) {
-	CommandLine.VarP(newIPValue(value, p), name, "", usage)
-}
-
-// IPVarP is like IPVar, but accepts a shorthand letter that can be used after a single dash.
-func IPVarP(p *net.IP, name, shorthand string, value net.IP, usage string) {
-	CommandLine.VarP(newIPValue(value, p), name, shorthand, usage)
-}
-
-// IP defines an net.IP flag with specified name, default value, and usage string.
-// The return value is the address of an net.IP variable that stores the value of the flag.
-func (f *FlagSet) IP(name string, value net.IP, usage string) *net.IP {
-	p := new(net.IP)
-	f.IPVarP(p, name, "", value, usage)
-	return p
-}
-
-// IPP is like IP, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IPP(name, shorthand string, value net.IP, usage string) *net.IP {
-	p := new(net.IP)
-	f.IPVarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// IP defines an net.IP flag with specified name, default value, and usage string.
-// The return value is the address of an net.IP variable that stores the value of the flag.
-func IP(name string, value net.IP, usage string) *net.IP {
-	return CommandLine.IPP(name, "", value, usage)
-}
-
-// IPP is like IP, but accepts a shorthand letter that can be used after a single dash.
-func IPP(name, shorthand string, value net.IP, usage string) *net.IP {
-	return CommandLine.IPP(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go b/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go
deleted file mode 100644
index 5bd44bd21d..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/ipmask.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"net"
-	"strconv"
-)
-
-// -- net.IPMask value
-type ipMaskValue net.IPMask
-
-func newIPMaskValue(val net.IPMask, p *net.IPMask) *ipMaskValue {
-	*p = val
-	return (*ipMaskValue)(p)
-}
-
-func (i *ipMaskValue) String() string { return net.IPMask(*i).String() }
-func (i *ipMaskValue) Set(s string) error {
-	ip := ParseIPv4Mask(s)
-	if ip == nil {
-		return fmt.Errorf("failed to parse IP mask: %q", s)
-	}
-	*i = ipMaskValue(ip)
-	return nil
-}
-
-func (i *ipMaskValue) Type() string {
-	return "ipMask"
-}
-
-// ParseIPv4Mask written in IP form (e.g. 255.255.255.0).
-// This function should really belong to the net package.
-func ParseIPv4Mask(s string) net.IPMask {
-	mask := net.ParseIP(s)
-	if mask == nil {
-		if len(s) != 8 {
-			return nil
-		}
-		// net.IPMask.String() actually outputs things like ffffff00
-		// so write a horrible parser for that as well  :-(
-		m := []int{}
-		for i := 0; i < 4; i++ {
-			b := "0x" + s[2*i:2*i+2]
-			d, err := strconv.ParseInt(b, 0, 0)
-			if err != nil {
-				return nil
-			}
-			m = append(m, int(d))
-		}
-		s := fmt.Sprintf("%d.%d.%d.%d", m[0], m[1], m[2], m[3])
-		mask = net.ParseIP(s)
-		if mask == nil {
-			return nil
-		}
-	}
-	return net.IPv4Mask(mask[12], mask[13], mask[14], mask[15])
-}
-
-func parseIPv4Mask(sval string) (interface{}, error) {
-	mask := ParseIPv4Mask(sval)
-	if mask == nil {
-		return nil, fmt.Errorf("unable to parse %s as net.IPMask", sval)
-	}
-	return mask, nil
-}
-
-// GetIPv4Mask return the net.IPv4Mask value of a flag with the given name
-func (f *FlagSet) GetIPv4Mask(name string) (net.IPMask, error) {
-	val, err := f.getFlagType(name, "ipMask", parseIPv4Mask)
-	if err != nil {
-		return nil, err
-	}
-	return val.(net.IPMask), nil
-}
-
-// IPMaskVar defines an net.IPMask flag with specified name, default value, and usage string.
-// The argument p points to an net.IPMask variable in which to store the value of the flag.
-func (f *FlagSet) IPMaskVar(p *net.IPMask, name string, value net.IPMask, usage string) {
-	f.VarP(newIPMaskValue(value, p), name, "", usage)
-}
-
-// IPMaskVarP is like IPMaskVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IPMaskVarP(p *net.IPMask, name, shorthand string, value net.IPMask, usage string) {
-	f.VarP(newIPMaskValue(value, p), name, shorthand, usage)
-}
-
-// IPMaskVar defines an net.IPMask flag with specified name, default value, and usage string.
-// The argument p points to an net.IPMask variable in which to store the value of the flag.
-func IPMaskVar(p *net.IPMask, name string, value net.IPMask, usage string) {
-	CommandLine.VarP(newIPMaskValue(value, p), name, "", usage)
-}
-
-// IPMaskVarP is like IPMaskVar, but accepts a shorthand letter that can be used after a single dash.
-func IPMaskVarP(p *net.IPMask, name, shorthand string, value net.IPMask, usage string) {
-	CommandLine.VarP(newIPMaskValue(value, p), name, shorthand, usage)
-}
-
-// IPMask defines an net.IPMask flag with specified name, default value, and usage string.
-// The return value is the address of an net.IPMask variable that stores the value of the flag.
-func (f *FlagSet) IPMask(name string, value net.IPMask, usage string) *net.IPMask {
-	p := new(net.IPMask)
-	f.IPMaskVarP(p, name, "", value, usage)
-	return p
-}
-
-// IPMaskP is like IPMask, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IPMaskP(name, shorthand string, value net.IPMask, usage string) *net.IPMask {
-	p := new(net.IPMask)
-	f.IPMaskVarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// IPMask defines an net.IPMask flag with specified name, default value, and usage string.
-// The return value is the address of an net.IPMask variable that stores the value of the flag.
-func IPMask(name string, value net.IPMask, usage string) *net.IPMask {
-	return CommandLine.IPMaskP(name, "", value, usage)
-}
-
-// IPMaskP is like IP, but accepts a shorthand letter that can be used after a single dash.
-func IPMaskP(name, shorthand string, value net.IPMask, usage string) *net.IPMask {
-	return CommandLine.IPMaskP(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/ipnet.go b/Godeps/_workspace/src/github.com/spf13/pflag/ipnet.go
deleted file mode 100644
index 149b764b1e..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/ipnet.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"net"
-	"strings"
-)
-
-// IPNet adapts net.IPNet for use as a flag.
-type ipNetValue net.IPNet
-
-func (ipnet ipNetValue) String() string {
-	n := net.IPNet(ipnet)
-	return n.String()
-}
-
-func (ipnet *ipNetValue) Set(value string) error {
-	_, n, err := net.ParseCIDR(strings.TrimSpace(value))
-	if err != nil {
-		return err
-	}
-	*ipnet = ipNetValue(*n)
-	return nil
-}
-
-func (*ipNetValue) Type() string {
-	return "ipNet"
-}
-
-var _ = strings.TrimSpace
-
-func newIPNetValue(val net.IPNet, p *net.IPNet) *ipNetValue {
-	*p = val
-	return (*ipNetValue)(p)
-}
-
-func ipNetConv(sval string) (interface{}, error) {
-	_, n, err := net.ParseCIDR(strings.TrimSpace(sval))
-	if err == nil {
-		return *n, nil
-	}
-	return nil, fmt.Errorf("invalid string being converted to IPNet: %s", sval)
-}
-
-// GetIPNet return the net.IPNet value of a flag with the given name
-func (f *FlagSet) GetIPNet(name string) (net.IPNet, error) {
-	val, err := f.getFlagType(name, "ipNet", ipNetConv)
-	if err != nil {
-		return net.IPNet{}, err
-	}
-	return val.(net.IPNet), nil
-}
-
-// IPNetVar defines an net.IPNet flag with specified name, default value, and usage string.
-// The argument p points to an net.IPNet variable in which to store the value of the flag.
-func (f *FlagSet) IPNetVar(p *net.IPNet, name string, value net.IPNet, usage string) {
-	f.VarP(newIPNetValue(value, p), name, "", usage)
-}
-
-// IPNetVarP is like IPNetVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IPNetVarP(p *net.IPNet, name, shorthand string, value net.IPNet, usage string) {
-	f.VarP(newIPNetValue(value, p), name, shorthand, usage)
-}
-
-// IPNetVar defines an net.IPNet flag with specified name, default value, and usage string.
-// The argument p points to an net.IPNet variable in which to store the value of the flag.
-func IPNetVar(p *net.IPNet, name string, value net.IPNet, usage string) {
-	CommandLine.VarP(newIPNetValue(value, p), name, "", usage)
-}
-
-// IPNetVarP is like IPNetVar, but accepts a shorthand letter that can be used after a single dash.
-func IPNetVarP(p *net.IPNet, name, shorthand string, value net.IPNet, usage string) {
-	CommandLine.VarP(newIPNetValue(value, p), name, shorthand, usage)
-}
-
-// IPNet defines an net.IPNet flag with specified name, default value, and usage string.
-// The return value is the address of an net.IPNet variable that stores the value of the flag.
-func (f *FlagSet) IPNet(name string, value net.IPNet, usage string) *net.IPNet {
-	p := new(net.IPNet)
-	f.IPNetVarP(p, name, "", value, usage)
-	return p
-}
-
-// IPNetP is like IPNet, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) IPNetP(name, shorthand string, value net.IPNet, usage string) *net.IPNet {
-	p := new(net.IPNet)
-	f.IPNetVarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// IPNet defines an net.IPNet flag with specified name, default value, and usage string.
-// The return value is the address of an net.IPNet variable that stores the value of the flag.
-func IPNet(name string, value net.IPNet, usage string) *net.IPNet {
-	return CommandLine.IPNetP(name, "", value, usage)
-}
-
-// IPNetP is like IPNet, but accepts a shorthand letter that can be used after a single dash.
-func IPNetP(name, shorthand string, value net.IPNet, usage string) *net.IPNet {
-	return CommandLine.IPNetP(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/string.go b/Godeps/_workspace/src/github.com/spf13/pflag/string.go
deleted file mode 100644
index e296136e5b..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/string.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package pflag
-
-import "fmt"
-
-// -- string Value
-type stringValue string
-
-func newStringValue(val string, p *string) *stringValue {
-	*p = val
-	return (*stringValue)(p)
-}
-
-func (s *stringValue) Set(val string) error {
-	*s = stringValue(val)
-	return nil
-}
-func (s *stringValue) Type() string {
-	return "string"
-}
-
-func (s *stringValue) String() string { return fmt.Sprintf("%s", *s) }
-
-func stringConv(sval string) (interface{}, error) {
-	return sval, nil
-}
-
-// GetString return the string value of a flag with the given name
-func (f *FlagSet) GetString(name string) (string, error) {
-	val, err := f.getFlagType(name, "string", stringConv)
-	if err != nil {
-		return "", err
-	}
-	return val.(string), nil
-}
-
-// StringVar defines a string flag with specified name, default value, and usage string.
-// The argument p points to a string variable in which to store the value of the flag.
-func (f *FlagSet) StringVar(p *string, name string, value string, usage string) {
-	f.VarP(newStringValue(value, p), name, "", usage)
-}
-
-// StringVarP is like StringVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) StringVarP(p *string, name, shorthand string, value string, usage string) {
-	f.VarP(newStringValue(value, p), name, shorthand, usage)
-}
-
-// StringVar defines a string flag with specified name, default value, and usage string.
-// The argument p points to a string variable in which to store the value of the flag.
-func StringVar(p *string, name string, value string, usage string) {
-	CommandLine.VarP(newStringValue(value, p), name, "", usage)
-}
-
-// StringVarP is like StringVar, but accepts a shorthand letter that can be used after a single dash.
-func StringVarP(p *string, name, shorthand string, value string, usage string) {
-	CommandLine.VarP(newStringValue(value, p), name, shorthand, usage)
-}
-
-// String defines a string flag with specified name, default value, and usage string.
-// The return value is the address of a string variable that stores the value of the flag.
-func (f *FlagSet) String(name string, value string, usage string) *string {
-	p := new(string)
-	f.StringVarP(p, name, "", value, usage)
-	return p
-}
-
-// StringP is like String, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) StringP(name, shorthand string, value string, usage string) *string {
-	p := new(string)
-	f.StringVarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// String defines a string flag with specified name, default value, and usage string.
-// The return value is the address of a string variable that stores the value of the flag.
-func String(name string, value string, usage string) *string {
-	return CommandLine.StringP(name, "", value, usage)
-}
-
-// StringP is like String, but accepts a shorthand letter that can be used after a single dash.
-func StringP(name, shorthand string, value string, usage string) *string {
-	return CommandLine.StringP(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go b/Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go
deleted file mode 100644
index b53648b2e5..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/string_slice.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package pflag
-
-import (
-	"encoding/csv"
-	"fmt"
-	"strings"
-)
-
-var _ = fmt.Fprint
-
-// -- stringSlice Value
-type stringSliceValue struct {
-	value   *[]string
-	changed bool
-}
-
-func newStringSliceValue(val []string, p *[]string) *stringSliceValue {
-	ssv := new(stringSliceValue)
-	ssv.value = p
-	*ssv.value = val
-	return ssv
-}
-
-func (s *stringSliceValue) Set(val string) error {
-	stringReader := strings.NewReader(val)
-	csvReader := csv.NewReader(stringReader)
-	v, err := csvReader.Read()
-	if err != nil {
-		return err
-	}
-	if !s.changed {
-		*s.value = v
-	} else {
-		*s.value = append(*s.value, v...)
-	}
-	s.changed = true
-	return nil
-}
-
-func (s *stringSliceValue) Type() string {
-	return "stringSlice"
-}
-
-func (s *stringSliceValue) String() string { return "[" + strings.Join(*s.value, ",") + "]" }
-
-func stringSliceConv(sval string) (interface{}, error) {
-	sval = strings.Trim(sval, "[]")
-	// An empty string would cause a slice with one (empty) string
-	if len(sval) == 0 {
-		return []string{}, nil
-	}
-	v := strings.Split(sval, ",")
-	return v, nil
-}
-
-// GetStringSlice return the []string value of a flag with the given name
-func (f *FlagSet) GetStringSlice(name string) ([]string, error) {
-	val, err := f.getFlagType(name, "stringSlice", stringSliceConv)
-	if err != nil {
-		return []string{}, err
-	}
-	return val.([]string), nil
-}
-
-// StringSliceVar defines a string flag with specified name, default value, and usage string.
-// The argument p points to a []string variable in which to store the value of the flag.
-func (f *FlagSet) StringSliceVar(p *[]string, name string, value []string, usage string) {
-	f.VarP(newStringSliceValue(value, p), name, "", usage)
-}
-
-// StringSliceVarP is like StringSliceVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) StringSliceVarP(p *[]string, name, shorthand string, value []string, usage string) {
-	f.VarP(newStringSliceValue(value, p), name, shorthand, usage)
-}
-
-// StringSliceVar defines a string flag with specified name, default value, and usage string.
-// The argument p points to a []string variable in which to store the value of the flag.
-func StringSliceVar(p *[]string, name string, value []string, usage string) {
-	CommandLine.VarP(newStringSliceValue(value, p), name, "", usage)
-}
-
-// StringSliceVarP is like StringSliceVar, but accepts a shorthand letter that can be used after a single dash.
-func StringSliceVarP(p *[]string, name, shorthand string, value []string, usage string) {
-	CommandLine.VarP(newStringSliceValue(value, p), name, shorthand, usage)
-}
-
-// StringSlice defines a string flag with specified name, default value, and usage string.
-// The return value is the address of a []string variable that stores the value of the flag.
-func (f *FlagSet) StringSlice(name string, value []string, usage string) *[]string {
-	p := []string{}
-	f.StringSliceVarP(&p, name, "", value, usage)
-	return &p
-}
-
-// StringSliceP is like StringSlice, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) StringSliceP(name, shorthand string, value []string, usage string) *[]string {
-	p := []string{}
-	f.StringSliceVarP(&p, name, shorthand, value, usage)
-	return &p
-}
-
-// StringSlice defines a string flag with specified name, default value, and usage string.
-// The return value is the address of a []string variable that stores the value of the flag.
-func StringSlice(name string, value []string, usage string) *[]string {
-	return CommandLine.StringSliceP(name, "", value, usage)
-}
-
-// StringSliceP is like StringSlice, but accepts a shorthand letter that can be used after a single dash.
-func StringSliceP(name, shorthand string, value []string, usage string) *[]string {
-	return CommandLine.StringSliceP(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint.go
deleted file mode 100644
index e142b49964..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- uint Value
-type uintValue uint
-
-func newUintValue(val uint, p *uint) *uintValue {
-	*p = val
-	return (*uintValue)(p)
-}
-
-func (i *uintValue) Set(s string) error {
-	v, err := strconv.ParseUint(s, 0, 64)
-	*i = uintValue(v)
-	return err
-}
-
-func (i *uintValue) Type() string {
-	return "uint"
-}
-
-func (i *uintValue) String() string { return fmt.Sprintf("%v", *i) }
-
-func uintConv(sval string) (interface{}, error) {
-	v, err := strconv.ParseUint(sval, 0, 0)
-	if err != nil {
-		return 0, err
-	}
-	return uint(v), nil
-}
-
-// GetUint return the uint value of a flag with the given name
-func (f *FlagSet) GetUint(name string) (uint, error) {
-	val, err := f.getFlagType(name, "uint", uintConv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(uint), nil
-}
-
-// UintVar defines a uint flag with specified name, default value, and usage string.
-// The argument p points to a uint variable in which to store the value of the flag.
-func (f *FlagSet) UintVar(p *uint, name string, value uint, usage string) {
-	f.VarP(newUintValue(value, p), name, "", usage)
-}
-
-// UintVarP is like UintVar, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) UintVarP(p *uint, name, shorthand string, value uint, usage string) {
-	f.VarP(newUintValue(value, p), name, shorthand, usage)
-}
-
-// UintVar defines a uint flag with specified name, default value, and usage string.
-// The argument p points to a uint  variable in which to store the value of the flag.
-func UintVar(p *uint, name string, value uint, usage string) {
-	CommandLine.VarP(newUintValue(value, p), name, "", usage)
-}
-
-// UintVarP is like UintVar, but accepts a shorthand letter that can be used after a single dash.
-func UintVarP(p *uint, name, shorthand string, value uint, usage string) {
-	CommandLine.VarP(newUintValue(value, p), name, shorthand, usage)
-}
-
-// Uint defines a uint flag with specified name, default value, and usage string.
-// The return value is the address of a uint  variable that stores the value of the flag.
-func (f *FlagSet) Uint(name string, value uint, usage string) *uint {
-	p := new(uint)
-	f.UintVarP(p, name, "", value, usage)
-	return p
-}
-
-// UintP is like Uint, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) UintP(name, shorthand string, value uint, usage string) *uint {
-	p := new(uint)
-	f.UintVarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Uint defines a uint flag with specified name, default value, and usage string.
-// The return value is the address of a uint  variable that stores the value of the flag.
-func Uint(name string, value uint, usage string) *uint {
-	return CommandLine.UintP(name, "", value, usage)
-}
-
-// UintP is like Uint, but accepts a shorthand letter that can be used after a single dash.
-func UintP(name, shorthand string, value uint, usage string) *uint {
-	return CommandLine.UintP(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go
deleted file mode 100644
index 5c96c19dcf..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint16.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- uint16 value
-type uint16Value uint16
-
-func newUint16Value(val uint16, p *uint16) *uint16Value {
-	*p = val
-	return (*uint16Value)(p)
-}
-func (i *uint16Value) String() string { return fmt.Sprintf("%d", *i) }
-func (i *uint16Value) Set(s string) error {
-	v, err := strconv.ParseUint(s, 0, 16)
-	*i = uint16Value(v)
-	return err
-}
-
-func (i *uint16Value) Type() string {
-	return "uint16"
-}
-
-func uint16Conv(sval string) (interface{}, error) {
-	v, err := strconv.ParseUint(sval, 0, 16)
-	if err != nil {
-		return 0, err
-	}
-	return uint16(v), nil
-}
-
-// GetUint16 return the uint16 value of a flag with the given name
-func (f *FlagSet) GetUint16(name string) (uint16, error) {
-	val, err := f.getFlagType(name, "uint16", uint16Conv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(uint16), nil
-}
-
-// Uint16Var defines a uint flag with specified name, default value, and usage string.
-// The argument p points to a uint variable in which to store the value of the flag.
-func (f *FlagSet) Uint16Var(p *uint16, name string, value uint16, usage string) {
-	f.VarP(newUint16Value(value, p), name, "", usage)
-}
-
-// Uint16VarP is like Uint16Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Uint16VarP(p *uint16, name, shorthand string, value uint16, usage string) {
-	f.VarP(newUint16Value(value, p), name, shorthand, usage)
-}
-
-// Uint16Var defines a uint flag with specified name, default value, and usage string.
-// The argument p points to a uint  variable in which to store the value of the flag.
-func Uint16Var(p *uint16, name string, value uint16, usage string) {
-	CommandLine.VarP(newUint16Value(value, p), name, "", usage)
-}
-
-// Uint16VarP is like Uint16Var, but accepts a shorthand letter that can be used after a single dash.
-func Uint16VarP(p *uint16, name, shorthand string, value uint16, usage string) {
-	CommandLine.VarP(newUint16Value(value, p), name, shorthand, usage)
-}
-
-// Uint16 defines a uint flag with specified name, default value, and usage string.
-// The return value is the address of a uint  variable that stores the value of the flag.
-func (f *FlagSet) Uint16(name string, value uint16, usage string) *uint16 {
-	p := new(uint16)
-	f.Uint16VarP(p, name, "", value, usage)
-	return p
-}
-
-// Uint16P is like Uint16, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Uint16P(name, shorthand string, value uint16, usage string) *uint16 {
-	p := new(uint16)
-	f.Uint16VarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Uint16 defines a uint flag with specified name, default value, and usage string.
-// The return value is the address of a uint  variable that stores the value of the flag.
-func Uint16(name string, value uint16, usage string) *uint16 {
-	return CommandLine.Uint16P(name, "", value, usage)
-}
-
-// Uint16P is like Uint16, but accepts a shorthand letter that can be used after a single dash.
-func Uint16P(name, shorthand string, value uint16, usage string) *uint16 {
-	return CommandLine.Uint16P(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go
deleted file mode 100644
index 294fcaa32d..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint32.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- uint16 value
-type uint32Value uint32
-
-func newUint32Value(val uint32, p *uint32) *uint32Value {
-	*p = val
-	return (*uint32Value)(p)
-}
-func (i *uint32Value) String() string { return fmt.Sprintf("%d", *i) }
-func (i *uint32Value) Set(s string) error {
-	v, err := strconv.ParseUint(s, 0, 32)
-	*i = uint32Value(v)
-	return err
-}
-
-func (i *uint32Value) Type() string {
-	return "uint32"
-}
-
-func uint32Conv(sval string) (interface{}, error) {
-	v, err := strconv.ParseUint(sval, 0, 32)
-	if err != nil {
-		return 0, err
-	}
-	return uint32(v), nil
-}
-
-// GetUint32 return the uint32 value of a flag with the given name
-func (f *FlagSet) GetUint32(name string) (uint32, error) {
-	val, err := f.getFlagType(name, "uint32", uint32Conv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(uint32), nil
-}
-
-// Uint32Var defines a uint32 flag with specified name, default value, and usage string.
-// The argument p points to a uint32 variable in which to store the value of the flag.
-func (f *FlagSet) Uint32Var(p *uint32, name string, value uint32, usage string) {
-	f.VarP(newUint32Value(value, p), name, "", usage)
-}
-
-// Uint32VarP is like Uint32Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Uint32VarP(p *uint32, name, shorthand string, value uint32, usage string) {
-	f.VarP(newUint32Value(value, p), name, shorthand, usage)
-}
-
-// Uint32Var defines a uint32 flag with specified name, default value, and usage string.
-// The argument p points to a uint32  variable in which to store the value of the flag.
-func Uint32Var(p *uint32, name string, value uint32, usage string) {
-	CommandLine.VarP(newUint32Value(value, p), name, "", usage)
-}
-
-// Uint32VarP is like Uint32Var, but accepts a shorthand letter that can be used after a single dash.
-func Uint32VarP(p *uint32, name, shorthand string, value uint32, usage string) {
-	CommandLine.VarP(newUint32Value(value, p), name, shorthand, usage)
-}
-
-// Uint32 defines a uint32 flag with specified name, default value, and usage string.
-// The return value is the address of a uint32  variable that stores the value of the flag.
-func (f *FlagSet) Uint32(name string, value uint32, usage string) *uint32 {
-	p := new(uint32)
-	f.Uint32VarP(p, name, "", value, usage)
-	return p
-}
-
-// Uint32P is like Uint32, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Uint32P(name, shorthand string, value uint32, usage string) *uint32 {
-	p := new(uint32)
-	f.Uint32VarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Uint32 defines a uint32 flag with specified name, default value, and usage string.
-// The return value is the address of a uint32  variable that stores the value of the flag.
-func Uint32(name string, value uint32, usage string) *uint32 {
-	return CommandLine.Uint32P(name, "", value, usage)
-}
-
-// Uint32P is like Uint32, but accepts a shorthand letter that can be used after a single dash.
-func Uint32P(name, shorthand string, value uint32, usage string) *uint32 {
-	return CommandLine.Uint32P(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go
deleted file mode 100644
index c68188505a..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint64.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- uint64 Value
-type uint64Value uint64
-
-func newUint64Value(val uint64, p *uint64) *uint64Value {
-	*p = val
-	return (*uint64Value)(p)
-}
-
-func (i *uint64Value) Set(s string) error {
-	v, err := strconv.ParseUint(s, 0, 64)
-	*i = uint64Value(v)
-	return err
-}
-
-func (i *uint64Value) Type() string {
-	return "uint64"
-}
-
-func (i *uint64Value) String() string { return fmt.Sprintf("%v", *i) }
-
-func uint64Conv(sval string) (interface{}, error) {
-	v, err := strconv.ParseUint(sval, 0, 64)
-	if err != nil {
-		return 0, err
-	}
-	return uint64(v), nil
-}
-
-// GetUint64 return the uint64 value of a flag with the given name
-func (f *FlagSet) GetUint64(name string) (uint64, error) {
-	val, err := f.getFlagType(name, "uint64", uint64Conv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(uint64), nil
-}
-
-// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
-// The argument p points to a uint64 variable in which to store the value of the flag.
-func (f *FlagSet) Uint64Var(p *uint64, name string, value uint64, usage string) {
-	f.VarP(newUint64Value(value, p), name, "", usage)
-}
-
-// Uint64VarP is like Uint64Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Uint64VarP(p *uint64, name, shorthand string, value uint64, usage string) {
-	f.VarP(newUint64Value(value, p), name, shorthand, usage)
-}
-
-// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
-// The argument p points to a uint64 variable in which to store the value of the flag.
-func Uint64Var(p *uint64, name string, value uint64, usage string) {
-	CommandLine.VarP(newUint64Value(value, p), name, "", usage)
-}
-
-// Uint64VarP is like Uint64Var, but accepts a shorthand letter that can be used after a single dash.
-func Uint64VarP(p *uint64, name, shorthand string, value uint64, usage string) {
-	CommandLine.VarP(newUint64Value(value, p), name, shorthand, usage)
-}
-
-// Uint64 defines a uint64 flag with specified name, default value, and usage string.
-// The return value is the address of a uint64 variable that stores the value of the flag.
-func (f *FlagSet) Uint64(name string, value uint64, usage string) *uint64 {
-	p := new(uint64)
-	f.Uint64VarP(p, name, "", value, usage)
-	return p
-}
-
-// Uint64P is like Uint64, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Uint64P(name, shorthand string, value uint64, usage string) *uint64 {
-	p := new(uint64)
-	f.Uint64VarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Uint64 defines a uint64 flag with specified name, default value, and usage string.
-// The return value is the address of a uint64 variable that stores the value of the flag.
-func Uint64(name string, value uint64, usage string) *uint64 {
-	return CommandLine.Uint64P(name, "", value, usage)
-}
-
-// Uint64P is like Uint64, but accepts a shorthand letter that can be used after a single dash.
-func Uint64P(name, shorthand string, value uint64, usage string) *uint64 {
-	return CommandLine.Uint64P(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go b/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go
deleted file mode 100644
index 26db418adf..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/uint8.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// -- uint8 Value
-type uint8Value uint8
-
-func newUint8Value(val uint8, p *uint8) *uint8Value {
-	*p = val
-	return (*uint8Value)(p)
-}
-
-func (i *uint8Value) Set(s string) error {
-	v, err := strconv.ParseUint(s, 0, 8)
-	*i = uint8Value(v)
-	return err
-}
-
-func (i *uint8Value) Type() string {
-	return "uint8"
-}
-
-func (i *uint8Value) String() string { return fmt.Sprintf("%v", *i) }
-
-func uint8Conv(sval string) (interface{}, error) {
-	v, err := strconv.ParseUint(sval, 0, 8)
-	if err != nil {
-		return 0, err
-	}
-	return uint8(v), nil
-}
-
-// GetUint8 return the uint8 value of a flag with the given name
-func (f *FlagSet) GetUint8(name string) (uint8, error) {
-	val, err := f.getFlagType(name, "uint8", uint8Conv)
-	if err != nil {
-		return 0, err
-	}
-	return val.(uint8), nil
-}
-
-// Uint8Var defines a uint8 flag with specified name, default value, and usage string.
-// The argument p points to a uint8 variable in which to store the value of the flag.
-func (f *FlagSet) Uint8Var(p *uint8, name string, value uint8, usage string) {
-	f.VarP(newUint8Value(value, p), name, "", usage)
-}
-
-// Uint8VarP is like Uint8Var, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Uint8VarP(p *uint8, name, shorthand string, value uint8, usage string) {
-	f.VarP(newUint8Value(value, p), name, shorthand, usage)
-}
-
-// Uint8Var defines a uint8 flag with specified name, default value, and usage string.
-// The argument p points to a uint8 variable in which to store the value of the flag.
-func Uint8Var(p *uint8, name string, value uint8, usage string) {
-	CommandLine.VarP(newUint8Value(value, p), name, "", usage)
-}
-
-// Uint8VarP is like Uint8Var, but accepts a shorthand letter that can be used after a single dash.
-func Uint8VarP(p *uint8, name, shorthand string, value uint8, usage string) {
-	CommandLine.VarP(newUint8Value(value, p), name, shorthand, usage)
-}
-
-// Uint8 defines a uint8 flag with specified name, default value, and usage string.
-// The return value is the address of a uint8 variable that stores the value of the flag.
-func (f *FlagSet) Uint8(name string, value uint8, usage string) *uint8 {
-	p := new(uint8)
-	f.Uint8VarP(p, name, "", value, usage)
-	return p
-}
-
-// Uint8P is like Uint8, but accepts a shorthand letter that can be used after a single dash.
-func (f *FlagSet) Uint8P(name, shorthand string, value uint8, usage string) *uint8 {
-	p := new(uint8)
-	f.Uint8VarP(p, name, shorthand, value, usage)
-	return p
-}
-
-// Uint8 defines a uint8 flag with specified name, default value, and usage string.
-// The return value is the address of a uint8 variable that stores the value of the flag.
-func Uint8(name string, value uint8, usage string) *uint8 {
-	return CommandLine.Uint8P(name, "", value, usage)
-}
-
-// Uint8P is like Uint8, but accepts a shorthand letter that can be used after a single dash.
-func Uint8P(name, shorthand string, value uint8, usage string) *uint8 {
-	return CommandLine.Uint8P(name, shorthand, value, usage)
-}
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/verify/all.sh b/Godeps/_workspace/src/github.com/spf13/pflag/verify/all.sh
deleted file mode 100644
index 739f89c0b4..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/verify/all.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-ROOT=$(dirname "${BASH_SOURCE}")/..
-
-# Some useful colors.
-if [[ -z "${color_start-}" ]]; then
-  declare -r color_start="\033["
-  declare -r color_red="${color_start}0;31m"
-  declare -r color_yellow="${color_start}0;33m"
-  declare -r color_green="${color_start}0;32m"
-  declare -r color_norm="${color_start}0m"
-fi
-
-SILENT=true
-
-function is-excluded {
-  for e in $EXCLUDE; do
-    if [[ $1 -ef ${BASH_SOURCE} ]]; then
-      return
-    fi
-    if [[ $1 -ef "$ROOT/hack/$e" ]]; then
-      return
-    fi
-  done
-  return 1
-}
-
-while getopts ":v" opt; do
-  case $opt in
-    v)
-      SILENT=false
-      ;;
-    \?)
-      echo "Invalid flag: -$OPTARG" >&2
-      exit 1
-      ;;
-  esac
-done
-
-if $SILENT ; then
-  echo "Running in the silent mode, run with -v if you want to see script logs."
-fi
-
-EXCLUDE="all.sh"
-
-ret=0
-for t in `ls $ROOT/verify/*.sh`
-do
-  if is-excluded $t ; then
-    echo "Skipping $t"
-    continue
-  fi
-  if $SILENT ; then
-    echo -e "Verifying $t"
-    if bash "$t" &> /dev/null; then
-      echo -e "${color_green}SUCCESS${color_norm}"
-    else
-      echo -e "${color_red}FAILED${color_norm}"
-      ret=1
-    fi
-  else
-    bash "$t" || ret=1
-  fi
-done
-exit $ret
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/verify/gofmt.sh b/Godeps/_workspace/src/github.com/spf13/pflag/verify/gofmt.sh
deleted file mode 100644
index f66acf803b..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/verify/gofmt.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-ROOT=$(dirname "${BASH_SOURCE}")/..
-
-pushd "${ROOT}" > /dev/null
-
-GOFMT=${GOFMT:-"gofmt"}
-bad_files=$(find . -name '*.go' | xargs $GOFMT -s -l)
-if [[ -n "${bad_files}" ]]; then
-  echo "!!! '$GOFMT' needs to be run on the following files: "
-  echo "${bad_files}"
-  exit 1
-fi
-
-# ex: ts=2 sw=2 et filetype=sh
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/verify/golint.sh b/Godeps/_workspace/src/github.com/spf13/pflag/verify/golint.sh
deleted file mode 100644
index 685c1778e5..0000000000
--- a/Godeps/_workspace/src/github.com/spf13/pflag/verify/golint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-ROOT=$(dirname "${BASH_SOURCE}")/..
-GOLINT=${GOLINT:-"golint"}
-
-pushd "${ROOT}" > /dev/null
-  bad_files=$($GOLINT -min_confidence=0.9 ./...)
-  if [[ -n "${bad_files}" ]]; then
-    echo "!!! '$GOLINT' problems: "
-    echo "${bad_files}"
-    exit 1
-  fi
-popd > /dev/null
-
-# ex: ts=2 sw=2 et filetype=sh
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE b/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
deleted file mode 100644
index 80dd96de77..0000000000
--- a/Godeps/_workspace/src/github.com/syndtr/gocapability/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright 2013 Suryandaru Triandana <syndtr@gmail.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability.go b/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability.go
deleted file mode 100644
index c13f4e52a9..0000000000
--- a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package capability provides utilities for manipulating POSIX capabilities.
-package capability
-
-type Capabilities interface {
-	// Get check whether a capability present in the given
-	// capabilities set. The 'which' value should be one of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
-	Get(which CapType, what Cap) bool
-
-	// Empty check whether all capability bits of the given capabilities
-	// set are zero. The 'which' value should be one of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
-	Empty(which CapType) bool
-
-	// Full check whether all capability bits of the given capabilities
-	// set are one. The 'which' value should be one of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
-	Full(which CapType) bool
-
-	// Set sets capabilities of the given capabilities sets. The
-	// 'which' value should be one or combination (OR'ed) of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
-	Set(which CapType, caps ...Cap)
-
-	// Unset unsets capabilities of the given capabilities sets. The
-	// 'which' value should be one or combination (OR'ed) of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
-	Unset(which CapType, caps ...Cap)
-
-	// Fill sets all bits of the given capabilities kind to one. The
-	// 'kind' value should be one or combination (OR'ed) of CAPS or
-	// BOUNDS.
-	Fill(kind CapType)
-
-	// Clear sets all bits of the given capabilities kind to zero. The
-	// 'kind' value should be one or combination (OR'ed) of CAPS or
-	// BOUNDS.
-	Clear(kind CapType)
-
-	// String return current capabilities state of the given capabilities
-	// set as string. The 'which' value should be one of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
-	StringCap(which CapType) string
-
-	// String return current capabilities state as string.
-	String() string
-
-	// Load load actual capabilities value. This will overwrite all
-	// outstanding changes.
-	Load() error
-
-	// Apply apply the capabilities settings, so all changes will take
-	// effect.
-	Apply(kind CapType) error
-}
-
-// NewPid create new initialized Capabilities object for given pid when it
-// is nonzero, or for the current pid if pid is 0
-func NewPid(pid int) (Capabilities, error) {
-	return newPid(pid)
-}
-
-// NewFile create new initialized Capabilities object for given named file.
-func NewFile(name string) (Capabilities, error) {
-	return newFile(name)
-}
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_linux.go b/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_linux.go
deleted file mode 100644
index 3dfcd398dc..0000000000
--- a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_linux.go
+++ /dev/null
@@ -1,608 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package capability
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"syscall"
-)
-
-var errUnknownVers = errors.New("unknown capability version")
-
-const (
-	linuxCapVer1 = 0x19980330
-	linuxCapVer2 = 0x20071026
-	linuxCapVer3 = 0x20080522
-)
-
-var (
-	capVers    uint32
-	capLastCap Cap
-)
-
-func init() {
-	var hdr capHeader
-	capget(&hdr, nil)
-	capVers = hdr.version
-
-	if initLastCap() == nil {
-		CAP_LAST_CAP = capLastCap
-		if capLastCap > 31 {
-			capUpperMask = (uint32(1) << (uint(capLastCap) - 31)) - 1
-		} else {
-			capUpperMask = 0
-		}
-	}
-}
-
-func initLastCap() error {
-	if capLastCap != 0 {
-		return nil
-	}
-
-	f, err := os.Open("/proc/sys/kernel/cap_last_cap")
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	var b []byte = make([]byte, 11)
-	_, err = f.Read(b)
-	if err != nil {
-		return err
-	}
-
-	fmt.Sscanf(string(b), "%d", &capLastCap)
-
-	return nil
-}
-
-func mkStringCap(c Capabilities, which CapType) (ret string) {
-	for i, first := Cap(0), true; i <= CAP_LAST_CAP; i++ {
-		if !c.Get(which, i) {
-			continue
-		}
-		if first {
-			first = false
-		} else {
-			ret += ", "
-		}
-		ret += i.String()
-	}
-	return
-}
-
-func mkString(c Capabilities, max CapType) (ret string) {
-	ret = "{"
-	for i := CapType(1); i <= max; i <<= 1 {
-		ret += " " + i.String() + "=\""
-		if c.Empty(i) {
-			ret += "empty"
-		} else if c.Full(i) {
-			ret += "full"
-		} else {
-			ret += c.StringCap(i)
-		}
-		ret += "\""
-	}
-	ret += " }"
-	return
-}
-
-func newPid(pid int) (c Capabilities, err error) {
-	switch capVers {
-	case linuxCapVer1:
-		p := new(capsV1)
-		p.hdr.version = capVers
-		p.hdr.pid = pid
-		c = p
-	case linuxCapVer2, linuxCapVer3:
-		p := new(capsV3)
-		p.hdr.version = capVers
-		p.hdr.pid = pid
-		c = p
-	default:
-		err = errUnknownVers
-		return
-	}
-	err = c.Load()
-	if err != nil {
-		c = nil
-	}
-	return
-}
-
-type capsV1 struct {
-	hdr  capHeader
-	data capData
-}
-
-func (c *capsV1) Get(which CapType, what Cap) bool {
-	if what > 32 {
-		return false
-	}
-
-	switch which {
-	case EFFECTIVE:
-		return (1<<uint(what))&c.data.effective != 0
-	case PERMITTED:
-		return (1<<uint(what))&c.data.permitted != 0
-	case INHERITABLE:
-		return (1<<uint(what))&c.data.inheritable != 0
-	}
-
-	return false
-}
-
-func (c *capsV1) getData(which CapType) (ret uint32) {
-	switch which {
-	case EFFECTIVE:
-		ret = c.data.effective
-	case PERMITTED:
-		ret = c.data.permitted
-	case INHERITABLE:
-		ret = c.data.inheritable
-	}
-	return
-}
-
-func (c *capsV1) Empty(which CapType) bool {
-	return c.getData(which) == 0
-}
-
-func (c *capsV1) Full(which CapType) bool {
-	return (c.getData(which) & 0x7fffffff) == 0x7fffffff
-}
-
-func (c *capsV1) Set(which CapType, caps ...Cap) {
-	for _, what := range caps {
-		if what > 32 {
-			continue
-		}
-
-		if which&EFFECTIVE != 0 {
-			c.data.effective |= 1 << uint(what)
-		}
-		if which&PERMITTED != 0 {
-			c.data.permitted |= 1 << uint(what)
-		}
-		if which&INHERITABLE != 0 {
-			c.data.inheritable |= 1 << uint(what)
-		}
-	}
-}
-
-func (c *capsV1) Unset(which CapType, caps ...Cap) {
-	for _, what := range caps {
-		if what > 32 {
-			continue
-		}
-
-		if which&EFFECTIVE != 0 {
-			c.data.effective &= ^(1 << uint(what))
-		}
-		if which&PERMITTED != 0 {
-			c.data.permitted &= ^(1 << uint(what))
-		}
-		if which&INHERITABLE != 0 {
-			c.data.inheritable &= ^(1 << uint(what))
-		}
-	}
-}
-
-func (c *capsV1) Fill(kind CapType) {
-	if kind&CAPS == CAPS {
-		c.data.effective = 0x7fffffff
-		c.data.permitted = 0x7fffffff
-		c.data.inheritable = 0
-	}
-}
-
-func (c *capsV1) Clear(kind CapType) {
-	if kind&CAPS == CAPS {
-		c.data.effective = 0
-		c.data.permitted = 0
-		c.data.inheritable = 0
-	}
-}
-
-func (c *capsV1) StringCap(which CapType) (ret string) {
-	return mkStringCap(c, which)
-}
-
-func (c *capsV1) String() (ret string) {
-	return mkString(c, BOUNDING)
-}
-
-func (c *capsV1) Load() (err error) {
-	return capget(&c.hdr, &c.data)
-}
-
-func (c *capsV1) Apply(kind CapType) error {
-	if kind&CAPS == CAPS {
-		return capset(&c.hdr, &c.data)
-	}
-	return nil
-}
-
-type capsV3 struct {
-	hdr    capHeader
-	data   [2]capData
-	bounds [2]uint32
-}
-
-func (c *capsV3) Get(which CapType, what Cap) bool {
-	var i uint
-	if what > 31 {
-		i = uint(what) >> 5
-		what %= 32
-	}
-
-	switch which {
-	case EFFECTIVE:
-		return (1<<uint(what))&c.data[i].effective != 0
-	case PERMITTED:
-		return (1<<uint(what))&c.data[i].permitted != 0
-	case INHERITABLE:
-		return (1<<uint(what))&c.data[i].inheritable != 0
-	case BOUNDING:
-		return (1<<uint(what))&c.bounds[i] != 0
-	}
-
-	return false
-}
-
-func (c *capsV3) getData(which CapType, dest []uint32) {
-	switch which {
-	case EFFECTIVE:
-		dest[0] = c.data[0].effective
-		dest[1] = c.data[1].effective
-	case PERMITTED:
-		dest[0] = c.data[0].permitted
-		dest[1] = c.data[1].permitted
-	case INHERITABLE:
-		dest[0] = c.data[0].inheritable
-		dest[1] = c.data[1].inheritable
-	case BOUNDING:
-		dest[0] = c.bounds[0]
-		dest[1] = c.bounds[1]
-	}
-}
-
-func (c *capsV3) Empty(which CapType) bool {
-	var data [2]uint32
-	c.getData(which, data[:])
-	return data[0] == 0 && data[1] == 0
-}
-
-func (c *capsV3) Full(which CapType) bool {
-	var data [2]uint32
-	c.getData(which, data[:])
-	if (data[0] & 0xffffffff) != 0xffffffff {
-		return false
-	}
-	return (data[1] & capUpperMask) == capUpperMask
-}
-
-func (c *capsV3) Set(which CapType, caps ...Cap) {
-	for _, what := range caps {
-		var i uint
-		if what > 31 {
-			i = uint(what) >> 5
-			what %= 32
-		}
-
-		if which&EFFECTIVE != 0 {
-			c.data[i].effective |= 1 << uint(what)
-		}
-		if which&PERMITTED != 0 {
-			c.data[i].permitted |= 1 << uint(what)
-		}
-		if which&INHERITABLE != 0 {
-			c.data[i].inheritable |= 1 << uint(what)
-		}
-		if which&BOUNDING != 0 {
-			c.bounds[i] |= 1 << uint(what)
-		}
-	}
-}
-
-func (c *capsV3) Unset(which CapType, caps ...Cap) {
-	for _, what := range caps {
-		var i uint
-		if what > 31 {
-			i = uint(what) >> 5
-			what %= 32
-		}
-
-		if which&EFFECTIVE != 0 {
-			c.data[i].effective &= ^(1 << uint(what))
-		}
-		if which&PERMITTED != 0 {
-			c.data[i].permitted &= ^(1 << uint(what))
-		}
-		if which&INHERITABLE != 0 {
-			c.data[i].inheritable &= ^(1 << uint(what))
-		}
-		if which&BOUNDING != 0 {
-			c.bounds[i] &= ^(1 << uint(what))
-		}
-	}
-}
-
-func (c *capsV3) Fill(kind CapType) {
-	if kind&CAPS == CAPS {
-		c.data[0].effective = 0xffffffff
-		c.data[0].permitted = 0xffffffff
-		c.data[0].inheritable = 0
-		c.data[1].effective = 0xffffffff
-		c.data[1].permitted = 0xffffffff
-		c.data[1].inheritable = 0
-	}
-
-	if kind&BOUNDS == BOUNDS {
-		c.bounds[0] = 0xffffffff
-		c.bounds[1] = 0xffffffff
-	}
-}
-
-func (c *capsV3) Clear(kind CapType) {
-	if kind&CAPS == CAPS {
-		c.data[0].effective = 0
-		c.data[0].permitted = 0
-		c.data[0].inheritable = 0
-		c.data[1].effective = 0
-		c.data[1].permitted = 0
-		c.data[1].inheritable = 0
-	}
-
-	if kind&BOUNDS == BOUNDS {
-		c.bounds[0] = 0
-		c.bounds[1] = 0
-	}
-}
-
-func (c *capsV3) StringCap(which CapType) (ret string) {
-	return mkStringCap(c, which)
-}
-
-func (c *capsV3) String() (ret string) {
-	return mkString(c, BOUNDING)
-}
-
-func (c *capsV3) Load() (err error) {
-	err = capget(&c.hdr, &c.data[0])
-	if err != nil {
-		return
-	}
-
-	var status_path string
-
-	if c.hdr.pid == 0 {
-		status_path = fmt.Sprintf("/proc/self/status")
-	} else {
-		status_path = fmt.Sprintf("/proc/%d/status", c.hdr.pid)
-	}
-
-	f, err := os.Open(status_path)
-	if err != nil {
-		return
-	}
-	b := bufio.NewReader(f)
-	for {
-		line, e := b.ReadString('\n')
-		if e != nil {
-			if e != io.EOF {
-				err = e
-			}
-			break
-		}
-		if strings.HasPrefix(line, "CapB") {
-			fmt.Sscanf(line[4:], "nd:  %08x%08x", &c.bounds[1], &c.bounds[0])
-			break
-		}
-	}
-	f.Close()
-
-	return
-}
-
-func (c *capsV3) Apply(kind CapType) (err error) {
-	if kind&BOUNDS == BOUNDS {
-		var data [2]capData
-		err = capget(&c.hdr, &data[0])
-		if err != nil {
-			return
-		}
-		if (1<<uint(CAP_SETPCAP))&data[0].effective != 0 {
-			for i := Cap(0); i <= CAP_LAST_CAP; i++ {
-				if c.Get(BOUNDING, i) {
-					continue
-				}
-				err = prctl(syscall.PR_CAPBSET_DROP, uintptr(i), 0, 0, 0)
-				if err != nil {
-					// Ignore EINVAL since the capability may not be supported in this system.
-					if errno, ok := err.(syscall.Errno); ok && errno == syscall.EINVAL {
-						err = nil
-						continue
-					}
-					return
-				}
-			}
-		}
-	}
-
-	if kind&CAPS == CAPS {
-		return capset(&c.hdr, &c.data[0])
-	}
-
-	return
-}
-
-func newFile(path string) (c Capabilities, err error) {
-	c = &capsFile{path: path}
-	err = c.Load()
-	if err != nil {
-		c = nil
-	}
-	return
-}
-
-type capsFile struct {
-	path string
-	data vfscapData
-}
-
-func (c *capsFile) Get(which CapType, what Cap) bool {
-	var i uint
-	if what > 31 {
-		if c.data.version == 1 {
-			return false
-		}
-		i = uint(what) >> 5
-		what %= 32
-	}
-
-	switch which {
-	case EFFECTIVE:
-		return (1<<uint(what))&c.data.effective[i] != 0
-	case PERMITTED:
-		return (1<<uint(what))&c.data.data[i].permitted != 0
-	case INHERITABLE:
-		return (1<<uint(what))&c.data.data[i].inheritable != 0
-	}
-
-	return false
-}
-
-func (c *capsFile) getData(which CapType, dest []uint32) {
-	switch which {
-	case EFFECTIVE:
-		dest[0] = c.data.effective[0]
-		dest[1] = c.data.effective[1]
-	case PERMITTED:
-		dest[0] = c.data.data[0].permitted
-		dest[1] = c.data.data[1].permitted
-	case INHERITABLE:
-		dest[0] = c.data.data[0].inheritable
-		dest[1] = c.data.data[1].inheritable
-	}
-}
-
-func (c *capsFile) Empty(which CapType) bool {
-	var data [2]uint32
-	c.getData(which, data[:])
-	return data[0] == 0 && data[1] == 0
-}
-
-func (c *capsFile) Full(which CapType) bool {
-	var data [2]uint32
-	c.getData(which, data[:])
-	if c.data.version == 0 {
-		return (data[0] & 0x7fffffff) == 0x7fffffff
-	}
-	if (data[0] & 0xffffffff) != 0xffffffff {
-		return false
-	}
-	return (data[1] & capUpperMask) == capUpperMask
-}
-
-func (c *capsFile) Set(which CapType, caps ...Cap) {
-	for _, what := range caps {
-		var i uint
-		if what > 31 {
-			if c.data.version == 1 {
-				continue
-			}
-			i = uint(what) >> 5
-			what %= 32
-		}
-
-		if which&EFFECTIVE != 0 {
-			c.data.effective[i] |= 1 << uint(what)
-		}
-		if which&PERMITTED != 0 {
-			c.data.data[i].permitted |= 1 << uint(what)
-		}
-		if which&INHERITABLE != 0 {
-			c.data.data[i].inheritable |= 1 << uint(what)
-		}
-	}
-}
-
-func (c *capsFile) Unset(which CapType, caps ...Cap) {
-	for _, what := range caps {
-		var i uint
-		if what > 31 {
-			if c.data.version == 1 {
-				continue
-			}
-			i = uint(what) >> 5
-			what %= 32
-		}
-
-		if which&EFFECTIVE != 0 {
-			c.data.effective[i] &= ^(1 << uint(what))
-		}
-		if which&PERMITTED != 0 {
-			c.data.data[i].permitted &= ^(1 << uint(what))
-		}
-		if which&INHERITABLE != 0 {
-			c.data.data[i].inheritable &= ^(1 << uint(what))
-		}
-	}
-}
-
-func (c *capsFile) Fill(kind CapType) {
-	if kind&CAPS == CAPS {
-		c.data.effective[0] = 0xffffffff
-		c.data.data[0].permitted = 0xffffffff
-		c.data.data[0].inheritable = 0
-		if c.data.version == 2 {
-			c.data.effective[1] = 0xffffffff
-			c.data.data[1].permitted = 0xffffffff
-			c.data.data[1].inheritable = 0
-		}
-	}
-}
-
-func (c *capsFile) Clear(kind CapType) {
-	if kind&CAPS == CAPS {
-		c.data.effective[0] = 0
-		c.data.data[0].permitted = 0
-		c.data.data[0].inheritable = 0
-		if c.data.version == 2 {
-			c.data.effective[1] = 0
-			c.data.data[1].permitted = 0
-			c.data.data[1].inheritable = 0
-		}
-	}
-}
-
-func (c *capsFile) StringCap(which CapType) (ret string) {
-	return mkStringCap(c, which)
-}
-
-func (c *capsFile) String() (ret string) {
-	return mkString(c, INHERITABLE)
-}
-
-func (c *capsFile) Load() (err error) {
-	return getVfsCap(c.path, &c.data)
-}
-
-func (c *capsFile) Apply(kind CapType) (err error) {
-	if kind&CAPS == CAPS {
-		return setVfsCap(c.path, &c.data)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_noop.go b/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_noop.go
deleted file mode 100644
index 9bb3070c5e..0000000000
--- a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_noop.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build !linux
-
-package capability
-
-import "errors"
-
-func newPid(pid int) (Capabilities, error) {
-	return nil, errors.New("not supported")
-}
-
-func newFile(path string) (Capabilities, error) {
-	return nil, errors.New("not supported")
-}
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum.go b/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum.go
deleted file mode 100644
index bff756a5ce..0000000000
--- a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum.go
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package capability
-
-type CapType uint
-
-func (c CapType) String() string {
-	switch c {
-	case EFFECTIVE:
-		return "effective"
-	case PERMITTED:
-		return "permitted"
-	case INHERITABLE:
-		return "inheritable"
-	case BOUNDING:
-		return "bounding"
-	case CAPS:
-		return "caps"
-	}
-	return "unknown"
-}
-
-const (
-	EFFECTIVE CapType = 1 << iota
-	PERMITTED
-	INHERITABLE
-	BOUNDING
-
-	CAPS   = EFFECTIVE | PERMITTED | INHERITABLE
-	BOUNDS = BOUNDING
-)
-
-type Cap int
-
-func (c Cap) String() string {
-	switch c {
-	case CAP_CHOWN:
-		return "chown"
-	case CAP_DAC_OVERRIDE:
-		return "dac_override"
-	case CAP_DAC_READ_SEARCH:
-		return "dac_read_search"
-	case CAP_FOWNER:
-		return "fowner"
-	case CAP_FSETID:
-		return "fsetid"
-	case CAP_KILL:
-		return "kill"
-	case CAP_SETGID:
-		return "setgid"
-	case CAP_SETUID:
-		return "setuid"
-	case CAP_SETPCAP:
-		return "setpcap"
-	case CAP_LINUX_IMMUTABLE:
-		return "linux_immutable"
-	case CAP_NET_BIND_SERVICE:
-		return "net_bind_service"
-	case CAP_NET_BROADCAST:
-		return "net_broadcast"
-	case CAP_NET_ADMIN:
-		return "net_admin"
-	case CAP_NET_RAW:
-		return "net_raw"
-	case CAP_IPC_LOCK:
-		return "ipc_lock"
-	case CAP_IPC_OWNER:
-		return "ipc_owner"
-	case CAP_SYS_MODULE:
-		return "sys_module"
-	case CAP_SYS_RAWIO:
-		return "sys_rawio"
-	case CAP_SYS_CHROOT:
-		return "sys_chroot"
-	case CAP_SYS_PTRACE:
-		return "sys_ptrace"
-	case CAP_SYS_PACCT:
-		return "sys_psacct"
-	case CAP_SYS_ADMIN:
-		return "sys_admin"
-	case CAP_SYS_BOOT:
-		return "sys_boot"
-	case CAP_SYS_NICE:
-		return "sys_nice"
-	case CAP_SYS_RESOURCE:
-		return "sys_resource"
-	case CAP_SYS_TIME:
-		return "sys_time"
-	case CAP_SYS_TTY_CONFIG:
-		return "sys_tty_config"
-	case CAP_MKNOD:
-		return "mknod"
-	case CAP_LEASE:
-		return "lease"
-	case CAP_AUDIT_WRITE:
-		return "audit_write"
-	case CAP_AUDIT_CONTROL:
-		return "audit_control"
-	case CAP_SETFCAP:
-		return "setfcap"
-	case CAP_MAC_OVERRIDE:
-		return "mac_override"
-	case CAP_MAC_ADMIN:
-		return "mac_admin"
-	case CAP_SYSLOG:
-		return "syslog"
-	case CAP_WAKE_ALARM:
-		return "wake_alarm"
-	case CAP_BLOCK_SUSPEND:
-		return "block_suspend"
-	case CAP_AUDIT_READ:
-		return "audit_read"
-	}
-	return "unknown"
-}
-
-// POSIX-draft defined capabilities.
-const (
-	// In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, this
-	// overrides the restriction of changing file ownership and group
-	// ownership.
-	CAP_CHOWN = Cap(0)
-
-	// Override all DAC access, including ACL execute access if
-	// [_POSIX_ACL] is defined. Excluding DAC access covered by
-	// CAP_LINUX_IMMUTABLE.
-	CAP_DAC_OVERRIDE = Cap(1)
-
-	// Overrides all DAC restrictions regarding read and search on files
-	// and directories, including ACL restrictions if [_POSIX_ACL] is
-	// defined. Excluding DAC access covered by CAP_LINUX_IMMUTABLE.
-	CAP_DAC_READ_SEARCH = Cap(2)
-
-	// Overrides all restrictions about allowed operations on files, where
-	// file owner ID must be equal to the user ID, except where CAP_FSETID
-	// is applicable. It doesn't override MAC and DAC restrictions.
-	CAP_FOWNER = Cap(3)
-
-	// Overrides the following restrictions that the effective user ID
-	// shall match the file owner ID when setting the S_ISUID and S_ISGID
-	// bits on that file; that the effective group ID (or one of the
-	// supplementary group IDs) shall match the file owner ID when setting
-	// the S_ISGID bit on that file; that the S_ISUID and S_ISGID bits are
-	// cleared on successful return from chown(2) (not implemented).
-	CAP_FSETID = Cap(4)
-
-	// Overrides the restriction that the real or effective user ID of a
-	// process sending a signal must match the real or effective user ID
-	// of the process receiving the signal.
-	CAP_KILL = Cap(5)
-
-	// Allows setgid(2) manipulation
-	// Allows setgroups(2)
-	// Allows forged gids on socket credentials passing.
-	CAP_SETGID = Cap(6)
-
-	// Allows set*uid(2) manipulation (including fsuid).
-	// Allows forged pids on socket credentials passing.
-	CAP_SETUID = Cap(7)
-
-	// Linux-specific capabilities
-
-	// Without VFS support for capabilities:
-	//   Transfer any capability in your permitted set to any pid,
-	//   remove any capability in your permitted set from any pid
-	// With VFS support for capabilities (neither of above, but)
-	//   Add any capability from current's capability bounding set
-	//     to the current process' inheritable set
-	//   Allow taking bits out of capability bounding set
-	//   Allow modification of the securebits for a process
-	CAP_SETPCAP = Cap(8)
-
-	// Allow modification of S_IMMUTABLE and S_APPEND file attributes
-	CAP_LINUX_IMMUTABLE = Cap(9)
-
-	// Allows binding to TCP/UDP sockets below 1024
-	// Allows binding to ATM VCIs below 32
-	CAP_NET_BIND_SERVICE = Cap(10)
-
-	// Allow broadcasting, listen to multicast
-	CAP_NET_BROADCAST = Cap(11)
-
-	// Allow interface configuration
-	// Allow administration of IP firewall, masquerading and accounting
-	// Allow setting debug option on sockets
-	// Allow modification of routing tables
-	// Allow setting arbitrary process / process group ownership on
-	// sockets
-	// Allow binding to any address for transparent proxying (also via NET_RAW)
-	// Allow setting TOS (type of service)
-	// Allow setting promiscuous mode
-	// Allow clearing driver statistics
-	// Allow multicasting
-	// Allow read/write of device-specific registers
-	// Allow activation of ATM control sockets
-	CAP_NET_ADMIN = Cap(12)
-
-	// Allow use of RAW sockets
-	// Allow use of PACKET sockets
-	// Allow binding to any address for transparent proxying (also via NET_ADMIN)
-	CAP_NET_RAW = Cap(13)
-
-	// Allow locking of shared memory segments
-	// Allow mlock and mlockall (which doesn't really have anything to do
-	// with IPC)
-	CAP_IPC_LOCK = Cap(14)
-
-	// Override IPC ownership checks
-	CAP_IPC_OWNER = Cap(15)
-
-	// Insert and remove kernel modules - modify kernel without limit
-	CAP_SYS_MODULE = Cap(16)
-
-	// Allow ioperm/iopl access
-	// Allow sending USB messages to any device via /proc/bus/usb
-	CAP_SYS_RAWIO = Cap(17)
-
-	// Allow use of chroot()
-	CAP_SYS_CHROOT = Cap(18)
-
-	// Allow ptrace() of any process
-	CAP_SYS_PTRACE = Cap(19)
-
-	// Allow configuration of process accounting
-	CAP_SYS_PACCT = Cap(20)
-
-	// Allow configuration of the secure attention key
-	// Allow administration of the random device
-	// Allow examination and configuration of disk quotas
-	// Allow setting the domainname
-	// Allow setting the hostname
-	// Allow calling bdflush()
-	// Allow mount() and umount(), setting up new smb connection
-	// Allow some autofs root ioctls
-	// Allow nfsservctl
-	// Allow VM86_REQUEST_IRQ
-	// Allow to read/write pci config on alpha
-	// Allow irix_prctl on mips (setstacksize)
-	// Allow flushing all cache on m68k (sys_cacheflush)
-	// Allow removing semaphores
-	// Used instead of CAP_CHOWN to "chown" IPC message queues, semaphores
-	// and shared memory
-	// Allow locking/unlocking of shared memory segment
-	// Allow turning swap on/off
-	// Allow forged pids on socket credentials passing
-	// Allow setting readahead and flushing buffers on block devices
-	// Allow setting geometry in floppy driver
-	// Allow turning DMA on/off in xd driver
-	// Allow administration of md devices (mostly the above, but some
-	// extra ioctls)
-	// Allow tuning the ide driver
-	// Allow access to the nvram device
-	// Allow administration of apm_bios, serial and bttv (TV) device
-	// Allow manufacturer commands in isdn CAPI support driver
-	// Allow reading non-standardized portions of pci configuration space
-	// Allow DDI debug ioctl on sbpcd driver
-	// Allow setting up serial ports
-	// Allow sending raw qic-117 commands
-	// Allow enabling/disabling tagged queuing on SCSI controllers and sending
-	// arbitrary SCSI commands
-	// Allow setting encryption key on loopback filesystem
-	// Allow setting zone reclaim policy
-	CAP_SYS_ADMIN = Cap(21)
-
-	// Allow use of reboot()
-	CAP_SYS_BOOT = Cap(22)
-
-	// Allow raising priority and setting priority on other (different
-	// UID) processes
-	// Allow use of FIFO and round-robin (realtime) scheduling on own
-	// processes and setting the scheduling algorithm used by another
-	// process.
-	// Allow setting cpu affinity on other processes
-	CAP_SYS_NICE = Cap(23)
-
-	// Override resource limits. Set resource limits.
-	// Override quota limits.
-	// Override reserved space on ext2 filesystem
-	// Modify data journaling mode on ext3 filesystem (uses journaling
-	// resources)
-	// NOTE: ext2 honors fsuid when checking for resource overrides, so
-	// you can override using fsuid too
-	// Override size restrictions on IPC message queues
-	// Allow more than 64hz interrupts from the real-time clock
-	// Override max number of consoles on console allocation
-	// Override max number of keymaps
-	CAP_SYS_RESOURCE = Cap(24)
-
-	// Allow manipulation of system clock
-	// Allow irix_stime on mips
-	// Allow setting the real-time clock
-	CAP_SYS_TIME = Cap(25)
-
-	// Allow configuration of tty devices
-	// Allow vhangup() of tty
-	CAP_SYS_TTY_CONFIG = Cap(26)
-
-	// Allow the privileged aspects of mknod()
-	CAP_MKNOD = Cap(27)
-
-	// Allow taking of leases on files
-	CAP_LEASE = Cap(28)
-
-	CAP_AUDIT_WRITE   = Cap(29)
-	CAP_AUDIT_CONTROL = Cap(30)
-	CAP_SETFCAP       = Cap(31)
-
-	// Override MAC access.
-	// The base kernel enforces no MAC policy.
-	// An LSM may enforce a MAC policy, and if it does and it chooses
-	// to implement capability based overrides of that policy, this is
-	// the capability it should use to do so.
-	CAP_MAC_OVERRIDE = Cap(32)
-
-	// Allow MAC configuration or state changes.
-	// The base kernel requires no MAC configuration.
-	// An LSM may enforce a MAC policy, and if it does and it chooses
-	// to implement capability based checks on modifications to that
-	// policy or the data required to maintain it, this is the
-	// capability it should use to do so.
-	CAP_MAC_ADMIN = Cap(33)
-
-	// Allow configuring the kernel's syslog (printk behaviour)
-	CAP_SYSLOG = Cap(34)
-
-	// Allow triggering something that will wake the system
-	CAP_WAKE_ALARM = Cap(35)
-
-	// Allow preventing system suspends
-	CAP_BLOCK_SUSPEND = Cap(36)
-
-	// Allow reading audit messages from the kernel
-	CAP_AUDIT_READ = Cap(37)
-)
-
-var (
-	// Highest valid capability of the running kernel.
-	CAP_LAST_CAP = Cap(63)
-
-	capUpperMask = ^uint32(0)
-)
diff --git a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/syscall_linux.go b/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/syscall_linux.go
deleted file mode 100644
index c18e6f6918..0000000000
--- a/Godeps/_workspace/src/github.com/syndtr/gocapability/capability/syscall_linux.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package capability
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-type capHeader struct {
-	version uint32
-	pid     int
-}
-
-type capData struct {
-	effective   uint32
-	permitted   uint32
-	inheritable uint32
-}
-
-func capget(hdr *capHeader, data *capData) (err error) {
-	_, _, e1 := syscall.Syscall(syscall.SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func capset(hdr *capHeader, data *capData) (err error) {
-	_, _, e1 := syscall.Syscall(syscall.SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func prctl(option int, arg2, arg3, arg4, arg5 uintptr) (err error) {
-	_, _, e1 := syscall.Syscall6(syscall.SYS_PRCTL, uintptr(option), arg2, arg3, arg4, arg5, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-const (
-	vfsXattrName = "security.capability"
-
-	vfsCapVerMask = 0xff000000
-	vfsCapVer1    = 0x01000000
-	vfsCapVer2    = 0x02000000
-
-	vfsCapFlagMask      = ^vfsCapVerMask
-	vfsCapFlageffective = 0x000001
-
-	vfscapDataSizeV1 = 4 * (1 + 2*1)
-	vfscapDataSizeV2 = 4 * (1 + 2*2)
-)
-
-type vfscapData struct {
-	magic uint32
-	data  [2]struct {
-		permitted   uint32
-		inheritable uint32
-	}
-	effective [2]uint32
-	version   int8
-}
-
-var (
-	_vfsXattrName *byte
-)
-
-func init() {
-	_vfsXattrName, _ = syscall.BytePtrFromString(vfsXattrName)
-}
-
-func getVfsCap(path string, dest *vfscapData) (err error) {
-	var _p0 *byte
-	_p0, err = syscall.BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := syscall.Syscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(dest)), vfscapDataSizeV2, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	switch dest.magic & vfsCapVerMask {
-	case vfsCapVer1:
-		dest.version = 1
-		if r0 != vfscapDataSizeV1 {
-			return syscall.EINVAL
-		}
-		dest.data[1].permitted = 0
-		dest.data[1].inheritable = 0
-	case vfsCapVer2:
-		dest.version = 2
-		if r0 != vfscapDataSizeV2 {
-			return syscall.EINVAL
-		}
-	default:
-		return syscall.EINVAL
-	}
-	if dest.magic&vfsCapFlageffective != 0 {
-		dest.effective[0] = dest.data[0].permitted | dest.data[0].inheritable
-		dest.effective[1] = dest.data[1].permitted | dest.data[1].inheritable
-	} else {
-		dest.effective[0] = 0
-		dest.effective[1] = 0
-	}
-	return
-}
-
-func setVfsCap(path string, data *vfscapData) (err error) {
-	var _p0 *byte
-	_p0, err = syscall.BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var size uintptr
-	if data.version == 1 {
-		data.magic = vfsCapVer1
-		size = vfscapDataSizeV1
-	} else if data.version == 2 {
-		data.magic = vfsCapVer2
-		if data.effective[0] != 0 || data.effective[1] != 0 {
-			data.magic |= vfsCapFlageffective
-			data.data[0].permitted |= data.effective[0]
-			data.data[1].permitted |= data.effective[1]
-		}
-		size = vfscapDataSizeV2
-	} else {
-		return syscall.EINVAL
-	}
-	_, _, e1 := syscall.Syscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(data)), size, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml b/Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml
deleted file mode 100644
index 1970069d51..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/.travis.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-language: go
-install:
-      - go get github.com/vishvananda/netns
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE b/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
deleted file mode 100644
index 9f64db8582..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/LICENSE
+++ /dev/null
@@ -1,192 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2014 Vishvananda Ishaya.
-   Copyright 2014 Docker, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile b/Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile
deleted file mode 100644
index b3250185f4..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-DIRS := \
-	. \
-	nl
-
-DEPS = \
-	github.com/vishvananda/netns
-
-uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
-testdirs = $(call uniq,$(foreach d,$(1),$(dir $(wildcard $(d)/*_test.go))))
-goroot = $(addprefix ../../../,$(1))
-unroot = $(subst ../../../,,$(1))
-fmt = $(addprefix fmt-,$(1))
-
-all: fmt
-
-$(call goroot,$(DEPS)):
-	go get $(call unroot,$@)
-
-.PHONY: $(call testdirs,$(DIRS))
-$(call testdirs,$(DIRS)):
-	sudo -E go test -v github.com/vishvananda/netlink/$@
-
-$(call fmt,$(call testdirs,$(DIRS))):
-	! gofmt -l $(subst fmt-,,$@)/*.go | grep ''
-
-.PHONY: fmt
-fmt: $(call fmt,$(call testdirs,$(DIRS)))
-
-test: fmt $(call goroot,$(DEPS)) $(call testdirs,$(DIRS))
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/README.md b/Godeps/_workspace/src/github.com/vishvananda/netlink/README.md
deleted file mode 100644
index 8cd50a93b6..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# netlink - netlink library for go #
-
-[![Build Status](https://travis-ci.org/vishvananda/netlink.png?branch=master)](https://travis-ci.org/vishvananda/netlink) [![GoDoc](https://godoc.org/github.com/vishvananda/netlink?status.svg)](https://godoc.org/github.com/vishvananda/netlink)
-
-The netlink package provides a simple netlink library for go. Netlink
-is the interface a user-space program in linux uses to communicate with
-the kernel. It can be used to add and remove interfaces, set ip addresses
-and routes, and configure ipsec. Netlink communication requires elevated
-privileges, so in most cases this code needs to be run as root. Since
-low-level netlink messages are inscrutable at best, the library attempts
-to provide an api that is loosely modeled on the CLI provied by iproute2.
-Actions like `ip link add` will be accomplished via a similarly named
-function like AddLink(). This library began its life as a fork of the
-netlink functionality in
-[docker/libcontainer](https://github.com/docker/libcontainer) but was
-heavily rewritten to improve testability, performance, and to add new
-functionality like ipsec xfrm handling.
-
-## Local Build and Test ##
-
-You can use go get command:
-
-    go get github.com/vishvananda/netlink
-
-Testing dependencies:
-
-    go get github.com/vishvananda/netns
-
-Testing (requires root):
-
-    sudo -E go test github.com/vishvananda/netlink
-
-## Examples ##
-
-Add a new bridge and add eth1 into it:
-
-```go
-package main
-
-import (
-    "net"
-    "github.com/vishvananda/netlink"
-)
-
-func main() {
-    la := netlink.NewLinkAttrs()
-    la.Name = "foo"
-    mybridge := &netlink.Bridge{la}}
-    _ := netlink.LinkAdd(mybridge)
-    eth1, _ := netlink.LinkByName("eth1")
-    netlink.LinkSetMaster(eth1, mybridge)
-}
-
-```
-Note `NewLinkAttrs` constructor, it sets default values in structure. For now
-it sets only `TxQLen` to `-1`, so kernel will set default by itself. If you're
-using simple initialization(`LinkAttrs{Name: "foo"}`) `TxQLen` will be set to
-`0` unless you specify it like `LinkAttrs{Name: "foo", TxQLen: 1000}`.
-
-Add a new ip address to loopback:
-
-```go
-package main
-
-import (
-    "net"
-    "github.com/vishvananda/netlink"
-)
-
-func main() {
-    lo, _ := netlink.LinkByName("lo")
-    addr, _ := netlink.ParseAddr("169.254.169.254/32")
-    netlink.AddrAdd(lo, addr)
-}
-
-```
-
-## Future Work ##
-
-Many pieces of netlink are not yet fully supported in the high-level
-interface. Aspects of virtually all of the high-level objects don't exist.
-Many of the underlying primitives are there, so its a matter of putting
-the right fields into the high-level objects and making sure that they
-are serialized and deserialized correctly in the Add and List methods.
-
-There are also a few pieces of low level netlink functionality that still
-need to be implemented. Routing rules are not in place and some of the
-more advanced link types. Hopefully there is decent structure and testing
-in place to make these fairly straightforward to add.
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go
deleted file mode 100644
index 9bbaf508e0..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"net"
-	"strings"
-)
-
-// Addr represents an IP address from netlink. Netlink ip addresses
-// include a mask, so it stores the address as a net.IPNet.
-type Addr struct {
-	*net.IPNet
-	Label string
-}
-
-// String returns $ip/$netmask $label
-func (a Addr) String() string {
-	return fmt.Sprintf("%s %s", a.IPNet, a.Label)
-}
-
-// ParseAddr parses the string representation of an address in the
-// form $ip/$netmask $label. The label portion is optional
-func ParseAddr(s string) (*Addr, error) {
-	label := ""
-	parts := strings.Split(s, " ")
-	if len(parts) > 1 {
-		s = parts[0]
-		label = parts[1]
-	}
-	m, err := ParseIPNet(s)
-	if err != nil {
-		return nil, err
-	}
-	return &Addr{IPNet: m, Label: label}, nil
-}
-
-// Equal returns true if both Addrs have the same net.IPNet value.
-func (a Addr) Equal(x Addr) bool {
-	sizea, _ := a.Mask.Size()
-	sizeb, _ := x.Mask.Size()
-	// ignore label for comparison
-	return a.IP.Equal(x.IP) && sizea == sizeb
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
deleted file mode 100644
index 19aac0fb97..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"net"
-	"strings"
-	"syscall"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-// AddrAdd will add an IP address to a link device.
-// Equivalent to: `ip addr add $addr dev $link`
-func AddrAdd(link Link, addr *Addr) error {
-
-	req := nl.NewNetlinkRequest(syscall.RTM_NEWADDR, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
-	return addrHandle(link, addr, req)
-}
-
-// AddrDel will delete an IP address from a link device.
-// Equivalent to: `ip addr del $addr dev $link`
-func AddrDel(link Link, addr *Addr) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_DELADDR, syscall.NLM_F_ACK)
-	return addrHandle(link, addr, req)
-}
-
-func addrHandle(link Link, addr *Addr, req *nl.NetlinkRequest) error {
-	base := link.Attrs()
-	if addr.Label != "" && !strings.HasPrefix(addr.Label, base.Name) {
-		return fmt.Errorf("label must begin with interface name")
-	}
-	ensureIndex(base)
-
-	family := nl.GetIPFamily(addr.IP)
-
-	msg := nl.NewIfAddrmsg(family)
-	msg.Index = uint32(base.Index)
-	prefixlen, _ := addr.Mask.Size()
-	msg.Prefixlen = uint8(prefixlen)
-	req.AddData(msg)
-
-	var addrData []byte
-	if family == FAMILY_V4 {
-		addrData = addr.IP.To4()
-	} else {
-		addrData = addr.IP.To16()
-	}
-
-	localData := nl.NewRtAttr(syscall.IFA_LOCAL, addrData)
-	req.AddData(localData)
-
-	addressData := nl.NewRtAttr(syscall.IFA_ADDRESS, addrData)
-	req.AddData(addressData)
-
-	if addr.Label != "" {
-		labelData := nl.NewRtAttr(syscall.IFA_LABEL, nl.ZeroTerminated(addr.Label))
-		req.AddData(labelData)
-	}
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// AddrList gets a list of IP addresses in the system.
-// Equivalent to: `ip addr show`.
-// The list can be filtered by link and ip family.
-func AddrList(link Link, family int) ([]Addr, error) {
-	req := nl.NewNetlinkRequest(syscall.RTM_GETADDR, syscall.NLM_F_DUMP)
-	msg := nl.NewIfInfomsg(family)
-	req.AddData(msg)
-
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWADDR)
-	if err != nil {
-		return nil, err
-	}
-
-	index := 0
-	if link != nil {
-		base := link.Attrs()
-		ensureIndex(base)
-		index = base.Index
-	}
-
-	var res []Addr
-	for _, m := range msgs {
-		msg := nl.DeserializeIfAddrmsg(m)
-
-		if link != nil && msg.Index != uint32(index) {
-			// Ignore messages from other interfaces
-			continue
-		}
-
-		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
-		if err != nil {
-			return nil, err
-		}
-
-		var local, dst *net.IPNet
-		var addr Addr
-		for _, attr := range attrs {
-			switch attr.Attr.Type {
-			case syscall.IFA_ADDRESS:
-				dst = &net.IPNet{
-					IP:   attr.Value,
-					Mask: net.CIDRMask(int(msg.Prefixlen), 8*len(attr.Value)),
-				}
-			case syscall.IFA_LOCAL:
-				local = &net.IPNet{
-					IP:   attr.Value,
-					Mask: net.CIDRMask(int(msg.Prefixlen), 8*len(attr.Value)),
-				}
-			case syscall.IFA_LABEL:
-				addr.Label = string(attr.Value[:len(attr.Value)-1])
-			}
-		}
-
-		// IFA_LOCAL should be there but if not, fall back to IFA_ADDRESS
-		if local != nil {
-			addr.IPNet = local
-		} else {
-			addr.IPNet = dst
-		}
-
-		res = append(res, addr)
-	}
-
-	return res, nil
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/class.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/class.go
deleted file mode 100644
index 35bdb33100..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/class.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-)
-
-type Class interface {
-	Attrs() *ClassAttrs
-	Type() string
-}
-
-// Class represents a netlink class. A filter is associated with a link,
-// has a handle and a parent. The root filter of a device should have a
-// parent == HANDLE_ROOT.
-type ClassAttrs struct {
-	LinkIndex int
-	Handle    uint32
-	Parent    uint32
-	Leaf      uint32
-}
-
-func (q ClassAttrs) String() string {
-	return fmt.Sprintf("{LinkIndex: %d, Handle: %s, Parent: %s, Leaf: %s}", q.LinkIndex, HandleStr(q.Handle), HandleStr(q.Parent), q.Leaf)
-}
-
-type HtbClassAttrs struct {
-	// TODO handle all attributes
-	Rate    uint64
-	Ceil    uint64
-	Buffer  uint32
-	Cbuffer uint32
-	Quantum uint32
-	Level   uint32
-	Prio    uint32
-}
-
-func (q HtbClassAttrs) String() string {
-	return fmt.Sprintf("{Rate: %d, Ceil: %d, Buffer: %d, Cbuffer: %d}", q.Rate, q.Ceil, q.Buffer, q.Cbuffer)
-}
-
-// Htb class
-type HtbClass struct {
-	ClassAttrs
-	Rate    uint64
-	Ceil    uint64
-	Buffer  uint32
-	Cbuffer uint32
-	Quantum uint32
-	Level   uint32
-	Prio    uint32
-}
-
-func NewHtbClass(attrs ClassAttrs, cattrs HtbClassAttrs) *HtbClass {
-	mtu := 1600
-	rate := cattrs.Rate / 8
-	ceil := cattrs.Ceil / 8
-	buffer := cattrs.Buffer
-	cbuffer := cattrs.Cbuffer
-	if ceil == 0 {
-		ceil = rate
-	}
-
-	if buffer == 0 {
-		buffer = uint32(float64(rate)/Hz() + float64(mtu))
-	}
-	buffer = uint32(Xmittime(rate, buffer))
-
-	if cbuffer == 0 {
-		cbuffer = uint32(float64(ceil)/Hz() + float64(mtu))
-	}
-	cbuffer = uint32(Xmittime(ceil, cbuffer))
-
-	return &HtbClass{
-		ClassAttrs: attrs,
-		Rate:       rate,
-		Ceil:       ceil,
-		Buffer:     buffer,
-		Cbuffer:    cbuffer,
-		Quantum:    10,
-		Level:      0,
-		Prio:       0,
-	}
-}
-
-func (q HtbClass) String() string {
-	return fmt.Sprintf("{Rate: %d, Ceil: %d, Buffer: %d, Cbuffer: %d}", q.Rate, q.Ceil, q.Buffer, q.Cbuffer)
-}
-
-func (class *HtbClass) Attrs() *ClassAttrs {
-	return &class.ClassAttrs
-}
-
-func (class *HtbClass) Type() string {
-	return "htb"
-}
-
-// GenericClass classes represent types that are not currently understood
-// by this netlink library.
-type GenericClass struct {
-	ClassAttrs
-	ClassType string
-}
-
-func (class *GenericClass) Attrs() *ClassAttrs {
-	return &class.ClassAttrs
-}
-
-func (class *GenericClass) Type() string {
-	return class.ClassType
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/class_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/class_linux.go
deleted file mode 100644
index 3dcc542bfe..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/class_linux.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package netlink
-
-import (
-	"syscall"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-// ClassDel will delete a class from the system.
-// Equivalent to: `tc class del $class`
-func ClassDel(class Class) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_DELTCLASS, syscall.NLM_F_ACK)
-	base := class.Attrs()
-	msg := &nl.TcMsg{
-		Family:  nl.FAMILY_ALL,
-		Ifindex: int32(base.LinkIndex),
-		Handle:  base.Handle,
-		Parent:  base.Parent,
-	}
-	req.AddData(msg)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// ClassAdd will add a class to the system.
-// Equivalent to: `tc class add $class`
-func ClassAdd(class Class) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_NEWTCLASS, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
-	base := class.Attrs()
-	msg := &nl.TcMsg{
-		Family:  nl.FAMILY_ALL,
-		Ifindex: int32(base.LinkIndex),
-		Handle:  base.Handle,
-		Parent:  base.Parent,
-	}
-	req.AddData(msg)
-	req.AddData(nl.NewRtAttr(nl.TCA_KIND, nl.ZeroTerminated(class.Type())))
-
-	options := nl.NewRtAttr(nl.TCA_OPTIONS, nil)
-	if htb, ok := class.(*HtbClass); ok {
-		opt := nl.TcHtbCopt{}
-		opt.Rate.Rate = uint32(htb.Rate)
-		opt.Ceil.Rate = uint32(htb.Ceil)
-		opt.Buffer = htb.Buffer
-		opt.Cbuffer = htb.Cbuffer
-		opt.Quantum = htb.Quantum
-		opt.Level = htb.Level
-		opt.Prio = htb.Prio
-		// TODO: Handle Debug properly. For now default to 0
-		nl.NewRtAttrChild(options, nl.TCA_HTB_PARMS, opt.Serialize())
-	}
-	req.AddData(options)
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// ClassList gets a list of classes in the system.
-// Equivalent to: `tc class show`.
-// Generally retunrs nothing if link and parent are not specified.
-func ClassList(link Link, parent uint32) ([]Class, error) {
-	req := nl.NewNetlinkRequest(syscall.RTM_GETTCLASS, syscall.NLM_F_DUMP)
-	msg := &nl.TcMsg{
-		Family: nl.FAMILY_ALL,
-		Parent: parent,
-	}
-	if link != nil {
-		base := link.Attrs()
-		ensureIndex(base)
-		msg.Ifindex = int32(base.Index)
-	}
-	req.AddData(msg)
-
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWTCLASS)
-	if err != nil {
-		return nil, err
-	}
-
-	var res []Class
-	for _, m := range msgs {
-		msg := nl.DeserializeTcMsg(m)
-
-		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
-		if err != nil {
-			return nil, err
-		}
-
-		base := ClassAttrs{
-			LinkIndex: int(msg.Ifindex),
-			Handle:    msg.Handle,
-			Parent:    msg.Parent,
-		}
-
-		var class Class
-		classType := ""
-		for _, attr := range attrs {
-			switch attr.Attr.Type {
-			case nl.TCA_KIND:
-				classType = string(attr.Value[:len(attr.Value)-1])
-				switch classType {
-				case "htb":
-					class = &HtbClass{}
-				default:
-					class = &GenericClass{ClassType: classType}
-				}
-			case nl.TCA_OPTIONS:
-				switch classType {
-				case "htb":
-					data, err := nl.ParseRouteAttr(attr.Value)
-					if err != nil {
-						return nil, err
-					}
-					_, err = parseHtbClassData(class, data)
-					if err != nil {
-						return nil, err
-					}
-				}
-			}
-		}
-		*class.Attrs() = base
-		res = append(res, class)
-	}
-
-	return res, nil
-}
-
-func parseHtbClassData(class Class, data []syscall.NetlinkRouteAttr) (bool, error) {
-	htb := class.(*HtbClass)
-	detailed := false
-	for _, datum := range data {
-		switch datum.Attr.Type {
-		case nl.TCA_HTB_PARMS:
-			opt := nl.DeserializeTcHtbCopt(datum.Value)
-			htb.Rate = uint64(opt.Rate.Rate)
-			htb.Ceil = uint64(opt.Ceil.Rate)
-			htb.Buffer = opt.Buffer
-			htb.Cbuffer = opt.Cbuffer
-			htb.Quantum = opt.Quantum
-			htb.Level = opt.Level
-			htb.Prio = opt.Prio
-		}
-	}
-	return detailed, nil
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go
deleted file mode 100644
index 83ad7007b9..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-)
-
-type Filter interface {
-	Attrs() *FilterAttrs
-	Type() string
-}
-
-// Filter represents a netlink filter. A filter is associated with a link,
-// has a handle and a parent. The root filter of a device should have a
-// parent == HANDLE_ROOT.
-type FilterAttrs struct {
-	LinkIndex int
-	Handle    uint32
-	Parent    uint32
-	Priority  uint16 // lower is higher priority
-	Protocol  uint16 // syscall.ETH_P_*
-}
-
-func (q FilterAttrs) String() string {
-	return fmt.Sprintf("{LinkIndex: %d, Handle: %s, Parent: %s, Priority: %d, Protocol: %d}", q.LinkIndex, HandleStr(q.Handle), HandleStr(q.Parent), q.Priority, q.Protocol)
-}
-
-// U32 filters on many packet related properties
-type U32 struct {
-	FilterAttrs
-	// Currently only supports redirecting to another interface
-	RedirIndex int
-}
-
-func (filter *U32) Attrs() *FilterAttrs {
-	return &filter.FilterAttrs
-}
-
-func (filter *U32) Type() string {
-	return "u32"
-}
-
-// GenericFilter filters represent types that are not currently understood
-// by this netlink library.
-type GenericFilter struct {
-	FilterAttrs
-	FilterType string
-}
-
-func (filter *GenericFilter) Attrs() *FilterAttrs {
-	return &filter.FilterAttrs
-}
-
-func (filter *GenericFilter) Type() string {
-	return filter.FilterType
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go
deleted file mode 100644
index 1ec6987028..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/filter_linux.go
+++ /dev/null
@@ -1,191 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"syscall"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-// FilterDel will delete a filter from the system.
-// Equivalent to: `tc filter del $filter`
-func FilterDel(filter Filter) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_DELTFILTER, syscall.NLM_F_ACK)
-	base := filter.Attrs()
-	msg := &nl.TcMsg{
-		Family:  nl.FAMILY_ALL,
-		Ifindex: int32(base.LinkIndex),
-		Handle:  base.Handle,
-		Parent:  base.Parent,
-		Info:    MakeHandle(base.Priority, nl.Swap16(base.Protocol)),
-	}
-	req.AddData(msg)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// FilterAdd will add a filter to the system.
-// Equivalent to: `tc filter add $filter`
-func FilterAdd(filter Filter) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_NEWTFILTER, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
-	base := filter.Attrs()
-	msg := &nl.TcMsg{
-		Family:  nl.FAMILY_ALL,
-		Ifindex: int32(base.LinkIndex),
-		Handle:  base.Handle,
-		Parent:  base.Parent,
-		Info:    MakeHandle(base.Priority, nl.Swap16(base.Protocol)),
-	}
-	req.AddData(msg)
-	req.AddData(nl.NewRtAttr(nl.TCA_KIND, nl.ZeroTerminated(filter.Type())))
-
-	options := nl.NewRtAttr(nl.TCA_OPTIONS, nil)
-	if u32, ok := filter.(*U32); ok {
-		// match all
-		sel := nl.TcU32Sel{
-			Nkeys: 1,
-			Flags: nl.TC_U32_TERMINAL,
-		}
-		sel.Keys = append(sel.Keys, nl.TcU32Key{})
-		nl.NewRtAttrChild(options, nl.TCA_U32_SEL, sel.Serialize())
-		actions := nl.NewRtAttrChild(options, nl.TCA_U32_ACT, nil)
-		table := nl.NewRtAttrChild(actions, nl.TCA_ACT_TAB, nil)
-		nl.NewRtAttrChild(table, nl.TCA_KIND, nl.ZeroTerminated("mirred"))
-		// redirect to other interface
-		mir := nl.TcMirred{
-			Action:  nl.TC_ACT_STOLEN,
-			Eaction: nl.TCA_EGRESS_REDIR,
-			Ifindex: uint32(u32.RedirIndex),
-		}
-		aopts := nl.NewRtAttrChild(table, nl.TCA_OPTIONS, nil)
-		nl.NewRtAttrChild(aopts, nl.TCA_MIRRED_PARMS, mir.Serialize())
-	}
-	req.AddData(options)
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// FilterList gets a list of filters in the system.
-// Equivalent to: `tc filter show`.
-// Generally retunrs nothing if link and parent are not specified.
-func FilterList(link Link, parent uint32) ([]Filter, error) {
-	req := nl.NewNetlinkRequest(syscall.RTM_GETTFILTER, syscall.NLM_F_DUMP)
-	msg := &nl.TcMsg{
-		Family: nl.FAMILY_ALL,
-		Parent: parent,
-	}
-	if link != nil {
-		base := link.Attrs()
-		ensureIndex(base)
-		msg.Ifindex = int32(base.Index)
-	}
-	req.AddData(msg)
-
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWTFILTER)
-	if err != nil {
-		return nil, err
-	}
-
-	var res []Filter
-	for _, m := range msgs {
-		msg := nl.DeserializeTcMsg(m)
-
-		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
-		if err != nil {
-			return nil, err
-		}
-
-		base := FilterAttrs{
-			LinkIndex: int(msg.Ifindex),
-			Handle:    msg.Handle,
-			Parent:    msg.Parent,
-		}
-		base.Priority, base.Protocol = MajorMinor(msg.Info)
-		base.Protocol = nl.Swap16(base.Protocol)
-
-		var filter Filter
-		filterType := ""
-		detailed := false
-		for _, attr := range attrs {
-			switch attr.Attr.Type {
-			case nl.TCA_KIND:
-				filterType = string(attr.Value[:len(attr.Value)-1])
-				switch filterType {
-				case "u32":
-					filter = &U32{}
-				default:
-					filter = &GenericFilter{FilterType: filterType}
-				}
-			case nl.TCA_OPTIONS:
-				switch filterType {
-				case "u32":
-					data, err := nl.ParseRouteAttr(attr.Value)
-					if err != nil {
-						return nil, err
-					}
-					detailed, err = parseU32Data(filter, data)
-					if err != nil {
-						return nil, err
-					}
-				}
-			}
-		}
-		// only return the detailed version of the filter
-		if detailed {
-			*filter.Attrs() = base
-			res = append(res, filter)
-		}
-	}
-
-	return res, nil
-}
-
-func parseU32Data(filter Filter, data []syscall.NetlinkRouteAttr) (bool, error) {
-	native = nl.NativeEndian()
-	u32 := filter.(*U32)
-	detailed := false
-	for _, datum := range data {
-		switch datum.Attr.Type {
-		case nl.TCA_U32_SEL:
-			detailed = true
-			sel := nl.DeserializeTcU32Sel(datum.Value)
-			// only parse if we have a very basic redirect
-			if sel.Flags&nl.TC_U32_TERMINAL == 0 || sel.Nkeys != 1 {
-				return detailed, nil
-			}
-		case nl.TCA_U32_ACT:
-			table, err := nl.ParseRouteAttr(datum.Value)
-			if err != nil {
-				return detailed, err
-			}
-			if len(table) != 1 || table[0].Attr.Type != nl.TCA_ACT_TAB {
-				return detailed, fmt.Errorf("Action table not formed properly")
-			}
-			aattrs, err := nl.ParseRouteAttr(table[0].Value)
-			for _, aattr := range aattrs {
-				switch aattr.Attr.Type {
-				case nl.TCA_KIND:
-					actionType := string(aattr.Value[:len(aattr.Value)-1])
-					// only parse if the action is mirred
-					if actionType != "mirred" {
-						return detailed, nil
-					}
-				case nl.TCA_OPTIONS:
-					adata, err := nl.ParseRouteAttr(aattr.Value)
-					if err != nil {
-						return detailed, err
-					}
-					for _, adatum := range adata {
-						switch adatum.Attr.Type {
-						case nl.TCA_MIRRED_PARMS:
-							mir := nl.DeserializeTcMirred(adatum.Value)
-							u32.RedirIndex = int(mir.Ifindex)
-						}
-					}
-				}
-			}
-		}
-	}
-	return detailed, nil
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/link.go
deleted file mode 100644
index 18fd1759ad..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/link.go
+++ /dev/null
@@ -1,223 +0,0 @@
-package netlink
-
-import "net"
-
-// Link represents a link device from netlink. Shared link attributes
-// like name may be retrieved using the Attrs() method. Unique data
-// can be retrieved by casting the object to the proper type.
-type Link interface {
-	Attrs() *LinkAttrs
-	Type() string
-}
-
-type (
-	NsPid int
-	NsFd  int
-)
-
-// LinkAttrs represents data shared by most link types
-type LinkAttrs struct {
-	Index        int
-	MTU          int
-	TxQLen       int // Transmit Queue Length
-	Name         string
-	HardwareAddr net.HardwareAddr
-	Flags        net.Flags
-	ParentIndex  int         // index of the parent link device
-	MasterIndex  int         // must be the index of a bridge
-	Namespace    interface{} // nil | NsPid | NsFd
-}
-
-// NewLinkAttrs returns LinkAttrs structure filled with default values
-func NewLinkAttrs() LinkAttrs {
-	return LinkAttrs{
-		TxQLen: -1,
-	}
-}
-
-// Device links cannot be created via netlink. These links
-// are links created by udev like 'lo' and 'etho0'
-type Device struct {
-	LinkAttrs
-}
-
-func (device *Device) Attrs() *LinkAttrs {
-	return &device.LinkAttrs
-}
-
-func (device *Device) Type() string {
-	return "device"
-}
-
-// Dummy links are dummy ethernet devices
-type Dummy struct {
-	LinkAttrs
-}
-
-func (dummy *Dummy) Attrs() *LinkAttrs {
-	return &dummy.LinkAttrs
-}
-
-func (dummy *Dummy) Type() string {
-	return "dummy"
-}
-
-// Ifb links are advanced dummy devices for packet filtering
-type Ifb struct {
-	LinkAttrs
-}
-
-func (ifb *Ifb) Attrs() *LinkAttrs {
-	return &ifb.LinkAttrs
-}
-
-func (ifb *Ifb) Type() string {
-	return "ifb"
-}
-
-// Bridge links are simple linux bridges
-type Bridge struct {
-	LinkAttrs
-}
-
-func (bridge *Bridge) Attrs() *LinkAttrs {
-	return &bridge.LinkAttrs
-}
-
-func (bridge *Bridge) Type() string {
-	return "bridge"
-}
-
-// Vlan links have ParentIndex set in their Attrs()
-type Vlan struct {
-	LinkAttrs
-	VlanId int
-}
-
-func (vlan *Vlan) Attrs() *LinkAttrs {
-	return &vlan.LinkAttrs
-}
-
-func (vlan *Vlan) Type() string {
-	return "vlan"
-}
-
-type MacvlanMode uint16
-
-const (
-	MACVLAN_MODE_DEFAULT MacvlanMode = iota
-	MACVLAN_MODE_PRIVATE
-	MACVLAN_MODE_VEPA
-	MACVLAN_MODE_BRIDGE
-	MACVLAN_MODE_PASSTHRU
-	MACVLAN_MODE_SOURCE
-)
-
-// Macvlan links have ParentIndex set in their Attrs()
-type Macvlan struct {
-	LinkAttrs
-	Mode MacvlanMode
-}
-
-func (macvlan *Macvlan) Attrs() *LinkAttrs {
-	return &macvlan.LinkAttrs
-}
-
-func (macvlan *Macvlan) Type() string {
-	return "macvlan"
-}
-
-// Macvtap - macvtap is a virtual interfaces based on macvlan
-type Macvtap struct {
-	Macvlan
-}
-
-func (macvtap Macvtap) Type() string {
-	return "macvtap"
-}
-
-// Veth devices must specify PeerName on create
-type Veth struct {
-	LinkAttrs
-	PeerName string // veth on create only
-}
-
-func (veth *Veth) Attrs() *LinkAttrs {
-	return &veth.LinkAttrs
-}
-
-func (veth *Veth) Type() string {
-	return "veth"
-}
-
-// GenericLink links represent types that are not currently understood
-// by this netlink library.
-type GenericLink struct {
-	LinkAttrs
-	LinkType string
-}
-
-func (generic *GenericLink) Attrs() *LinkAttrs {
-	return &generic.LinkAttrs
-}
-
-func (generic *GenericLink) Type() string {
-	return generic.LinkType
-}
-
-type Vxlan struct {
-	LinkAttrs
-	VxlanId      int
-	VtepDevIndex int
-	SrcAddr      net.IP
-	Group        net.IP
-	TTL          int
-	TOS          int
-	Learning     bool
-	Proxy        bool
-	RSC          bool
-	L2miss       bool
-	L3miss       bool
-	NoAge        bool
-	GBP          bool
-	Age          int
-	Limit        int
-	Port         int
-	PortLow      int
-	PortHigh     int
-}
-
-func (vxlan *Vxlan) Attrs() *LinkAttrs {
-	return &vxlan.LinkAttrs
-}
-
-func (vxlan *Vxlan) Type() string {
-	return "vxlan"
-}
-
-type IPVlanMode uint16
-
-const (
-	IPVLAN_MODE_L2 IPVlanMode = iota
-	IPVLAN_MODE_L3
-	IPVLAN_MODE_MAX
-)
-
-type IPVlan struct {
-	LinkAttrs
-	Mode IPVlanMode
-}
-
-func (ipvlan *IPVlan) Attrs() *LinkAttrs {
-	return &ipvlan.LinkAttrs
-}
-
-func (ipvlan *IPVlan) Type() string {
-	return "ipvlan"
-}
-
-// iproute2 supported devices;
-// vlan | veth | vcan | dummy | ifb | macvlan | macvtap |
-// bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |
-// gre | gretap | ip6gre | ip6gretap | vti | nlmon |
-// bond_slave | ipvlan
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
deleted file mode 100644
index 842a21f3d2..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
+++ /dev/null
@@ -1,790 +0,0 @@
-package netlink
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"net"
-	"syscall"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-var native = nl.NativeEndian()
-var lookupByDump = false
-
-var macvlanModes = [...]uint32{
-	0,
-	nl.MACVLAN_MODE_PRIVATE,
-	nl.MACVLAN_MODE_VEPA,
-	nl.MACVLAN_MODE_BRIDGE,
-	nl.MACVLAN_MODE_PASSTHRU,
-	nl.MACVLAN_MODE_SOURCE,
-}
-
-func ensureIndex(link *LinkAttrs) {
-	if link != nil && link.Index == 0 {
-		newlink, _ := LinkByName(link.Name)
-		if newlink != nil {
-			link.Index = newlink.Attrs().Index
-		}
-	}
-}
-
-// LinkSetUp enables the link device.
-// Equivalent to: `ip link set $link up`
-func LinkSetUp(link Link) error {
-	base := link.Attrs()
-	ensureIndex(base)
-	req := nl.NewNetlinkRequest(syscall.RTM_NEWLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Change = syscall.IFF_UP
-	msg.Flags = syscall.IFF_UP
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// LinkSetDown disables link device.
-// Equivalent to: `ip link set $link down`
-func LinkSetDown(link Link) error {
-	base := link.Attrs()
-	ensureIndex(base)
-	req := nl.NewNetlinkRequest(syscall.RTM_NEWLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Change = syscall.IFF_UP
-	msg.Flags = 0 & ^syscall.IFF_UP
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// LinkSetMTU sets the mtu of the link device.
-// Equivalent to: `ip link set $link mtu $mtu`
-func LinkSetMTU(link Link, mtu int) error {
-	base := link.Attrs()
-	ensureIndex(base)
-	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	b := make([]byte, 4)
-	native.PutUint32(b, uint32(mtu))
-
-	data := nl.NewRtAttr(syscall.IFLA_MTU, b)
-	req.AddData(data)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// LinkSetName sets the name of the link device.
-// Equivalent to: `ip link set $link name $name`
-func LinkSetName(link Link, name string) error {
-	base := link.Attrs()
-	ensureIndex(base)
-	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	data := nl.NewRtAttr(syscall.IFLA_IFNAME, []byte(name))
-	req.AddData(data)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// LinkSetHardwareAddr sets the hardware address of the link device.
-// Equivalent to: `ip link set $link address $hwaddr`
-func LinkSetHardwareAddr(link Link, hwaddr net.HardwareAddr) error {
-	base := link.Attrs()
-	ensureIndex(base)
-	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	data := nl.NewRtAttr(syscall.IFLA_ADDRESS, []byte(hwaddr))
-	req.AddData(data)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// LinkSetMaster sets the master of the link device.
-// Equivalent to: `ip link set $link master $master`
-func LinkSetMaster(link Link, master *Bridge) error {
-	index := 0
-	if master != nil {
-		masterBase := master.Attrs()
-		ensureIndex(masterBase)
-		index = masterBase.Index
-	}
-	return LinkSetMasterByIndex(link, index)
-}
-
-// LinkSetMasterByIndex sets the master of the link device.
-// Equivalent to: `ip link set $link master $master`
-func LinkSetMasterByIndex(link Link, masterIndex int) error {
-	base := link.Attrs()
-	ensureIndex(base)
-	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	b := make([]byte, 4)
-	native.PutUint32(b, uint32(masterIndex))
-
-	data := nl.NewRtAttr(syscall.IFLA_MASTER, b)
-	req.AddData(data)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// LinkSetNsPid puts the device into a new network namespace. The
-// pid must be a pid of a running process.
-// Equivalent to: `ip link set $link netns $pid`
-func LinkSetNsPid(link Link, nspid int) error {
-	base := link.Attrs()
-	ensureIndex(base)
-	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	b := make([]byte, 4)
-	native.PutUint32(b, uint32(nspid))
-
-	data := nl.NewRtAttr(syscall.IFLA_NET_NS_PID, b)
-	req.AddData(data)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// LinkSetNsFd puts the device into a new network namespace. The
-// fd must be an open file descriptor to a network namespace.
-// Similar to: `ip link set $link netns $ns`
-func LinkSetNsFd(link Link, fd int) error {
-	base := link.Attrs()
-	ensureIndex(base)
-	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	b := make([]byte, 4)
-	native.PutUint32(b, uint32(fd))
-
-	data := nl.NewRtAttr(nl.IFLA_NET_NS_FD, b)
-	req.AddData(data)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-func boolAttr(val bool) []byte {
-	var v uint8
-	if val {
-		v = 1
-	}
-	return nl.Uint8Attr(v)
-}
-
-type vxlanPortRange struct {
-	Lo, Hi uint16
-}
-
-func addVxlanAttrs(vxlan *Vxlan, linkInfo *nl.RtAttr) {
-	data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
-	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_ID, nl.Uint32Attr(uint32(vxlan.VxlanId)))
-	if vxlan.VtepDevIndex != 0 {
-		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LINK, nl.Uint32Attr(uint32(vxlan.VtepDevIndex)))
-	}
-	if vxlan.SrcAddr != nil {
-		ip := vxlan.SrcAddr.To4()
-		if ip != nil {
-			nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LOCAL, []byte(ip))
-		} else {
-			ip = vxlan.SrcAddr.To16()
-			if ip != nil {
-				nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LOCAL6, []byte(ip))
-			}
-		}
-	}
-	if vxlan.Group != nil {
-		group := vxlan.Group.To4()
-		if group != nil {
-			nl.NewRtAttrChild(data, nl.IFLA_VXLAN_GROUP, []byte(group))
-		} else {
-			group = vxlan.Group.To16()
-			if group != nil {
-				nl.NewRtAttrChild(data, nl.IFLA_VXLAN_GROUP6, []byte(group))
-			}
-		}
-	}
-
-	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_TTL, nl.Uint8Attr(uint8(vxlan.TTL)))
-	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_TOS, nl.Uint8Attr(uint8(vxlan.TOS)))
-	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LEARNING, boolAttr(vxlan.Learning))
-	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_PROXY, boolAttr(vxlan.Proxy))
-	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_RSC, boolAttr(vxlan.RSC))
-	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_L2MISS, boolAttr(vxlan.L2miss))
-	nl.NewRtAttrChild(data, nl.IFLA_VXLAN_L3MISS, boolAttr(vxlan.L3miss))
-
-	if vxlan.GBP {
-		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_GBP, boolAttr(vxlan.GBP))
-	}
-
-	if vxlan.NoAge {
-		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_AGEING, nl.Uint32Attr(0))
-	} else if vxlan.Age > 0 {
-		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_AGEING, nl.Uint32Attr(uint32(vxlan.Age)))
-	}
-	if vxlan.Limit > 0 {
-		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_LIMIT, nl.Uint32Attr(uint32(vxlan.Limit)))
-	}
-	if vxlan.Port > 0 {
-		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_PORT, nl.Uint16Attr(uint16(vxlan.Port)))
-	}
-	if vxlan.PortLow > 0 || vxlan.PortHigh > 0 {
-		pr := vxlanPortRange{uint16(vxlan.PortLow), uint16(vxlan.PortHigh)}
-
-		buf := new(bytes.Buffer)
-		binary.Write(buf, binary.BigEndian, &pr)
-
-		nl.NewRtAttrChild(data, nl.IFLA_VXLAN_PORT_RANGE, buf.Bytes())
-	}
-}
-
-// LinkAdd adds a new link device. The type and features of the device
-// are taken fromt the parameters in the link object.
-// Equivalent to: `ip link add $link`
-func LinkAdd(link Link) error {
-	// TODO: set mtu and hardware address
-	// TODO: support extra data for macvlan
-	base := link.Attrs()
-
-	if base.Name == "" {
-		return fmt.Errorf("LinkAttrs.Name cannot be empty!")
-	}
-
-	req := nl.NewNetlinkRequest(syscall.RTM_NEWLINK, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	req.AddData(msg)
-
-	if base.ParentIndex != 0 {
-		b := make([]byte, 4)
-		native.PutUint32(b, uint32(base.ParentIndex))
-		data := nl.NewRtAttr(syscall.IFLA_LINK, b)
-		req.AddData(data)
-	} else if link.Type() == "ipvlan" {
-		return fmt.Errorf("Can't create ipvlan link without ParentIndex")
-	}
-
-	nameData := nl.NewRtAttr(syscall.IFLA_IFNAME, nl.ZeroTerminated(base.Name))
-	req.AddData(nameData)
-
-	if base.MTU > 0 {
-		mtu := nl.NewRtAttr(syscall.IFLA_MTU, nl.Uint32Attr(uint32(base.MTU)))
-		req.AddData(mtu)
-	}
-
-	if base.TxQLen >= 0 {
-		qlen := nl.NewRtAttr(syscall.IFLA_TXQLEN, nl.Uint32Attr(uint32(base.TxQLen)))
-		req.AddData(qlen)
-	}
-
-	if base.Namespace != nil {
-		var attr *nl.RtAttr
-		switch base.Namespace.(type) {
-		case NsPid:
-			val := nl.Uint32Attr(uint32(base.Namespace.(NsPid)))
-			attr = nl.NewRtAttr(syscall.IFLA_NET_NS_PID, val)
-		case NsFd:
-			val := nl.Uint32Attr(uint32(base.Namespace.(NsFd)))
-			attr = nl.NewRtAttr(nl.IFLA_NET_NS_FD, val)
-		}
-
-		req.AddData(attr)
-	}
-
-	linkInfo := nl.NewRtAttr(syscall.IFLA_LINKINFO, nil)
-	nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_KIND, nl.NonZeroTerminated(link.Type()))
-
-	if vlan, ok := link.(*Vlan); ok {
-		b := make([]byte, 2)
-		native.PutUint16(b, uint16(vlan.VlanId))
-		data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
-		nl.NewRtAttrChild(data, nl.IFLA_VLAN_ID, b)
-	} else if veth, ok := link.(*Veth); ok {
-		data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
-		peer := nl.NewRtAttrChild(data, nl.VETH_INFO_PEER, nil)
-		nl.NewIfInfomsgChild(peer, syscall.AF_UNSPEC)
-		nl.NewRtAttrChild(peer, syscall.IFLA_IFNAME, nl.ZeroTerminated(veth.PeerName))
-		if base.TxQLen >= 0 {
-			nl.NewRtAttrChild(peer, syscall.IFLA_TXQLEN, nl.Uint32Attr(uint32(base.TxQLen)))
-		}
-		if base.MTU > 0 {
-			nl.NewRtAttrChild(peer, syscall.IFLA_MTU, nl.Uint32Attr(uint32(base.MTU)))
-		}
-
-	} else if vxlan, ok := link.(*Vxlan); ok {
-		addVxlanAttrs(vxlan, linkInfo)
-	} else if ipv, ok := link.(*IPVlan); ok {
-		data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
-		nl.NewRtAttrChild(data, nl.IFLA_IPVLAN_MODE, nl.Uint16Attr(uint16(ipv.Mode)))
-	} else if macv, ok := link.(*Macvlan); ok {
-		if macv.Mode != MACVLAN_MODE_DEFAULT {
-			data := nl.NewRtAttrChild(linkInfo, nl.IFLA_INFO_DATA, nil)
-			nl.NewRtAttrChild(data, nl.IFLA_MACVLAN_MODE, nl.Uint32Attr(macvlanModes[macv.Mode]))
-		}
-	}
-
-	req.AddData(linkInfo)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	if err != nil {
-		return err
-	}
-
-	ensureIndex(base)
-
-	// can't set master during create, so set it afterwards
-	if base.MasterIndex != 0 {
-		// TODO: verify MasterIndex is actually a bridge?
-		return LinkSetMasterByIndex(link, base.MasterIndex)
-	}
-	return nil
-}
-
-// LinkDel deletes link device. Either Index or Name must be set in
-// the link object for it to be deleted. The other values are ignored.
-// Equivalent to: `ip link del $link`
-func LinkDel(link Link) error {
-	base := link.Attrs()
-
-	ensureIndex(base)
-
-	req := nl.NewNetlinkRequest(syscall.RTM_DELLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-func linkByNameDump(name string) (Link, error) {
-	links, err := LinkList()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, link := range links {
-		if link.Attrs().Name == name {
-			return link, nil
-		}
-	}
-	return nil, fmt.Errorf("Link %s not found", name)
-}
-
-// LinkByName finds a link by name and returns a pointer to the object.
-func LinkByName(name string) (Link, error) {
-	if lookupByDump {
-		return linkByNameDump(name)
-	}
-
-	req := nl.NewNetlinkRequest(syscall.RTM_GETLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	req.AddData(msg)
-
-	nameData := nl.NewRtAttr(syscall.IFLA_IFNAME, nl.ZeroTerminated(name))
-	req.AddData(nameData)
-
-	link, err := execGetLink(req)
-	if err == syscall.EINVAL {
-		// older kernels don't support looking up via IFLA_IFNAME
-		// so fall back to dumping all links
-		lookupByDump = true
-		return linkByNameDump(name)
-	}
-
-	return link, err
-}
-
-// LinkByIndex finds a link by index and returns a pointer to the object.
-func LinkByIndex(index int) (Link, error) {
-	req := nl.NewNetlinkRequest(syscall.RTM_GETLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	msg.Index = int32(index)
-	req.AddData(msg)
-
-	return execGetLink(req)
-}
-
-func execGetLink(req *nl.NetlinkRequest) (Link, error) {
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	if err != nil {
-		if errno, ok := err.(syscall.Errno); ok {
-			if errno == syscall.ENODEV {
-				return nil, fmt.Errorf("Link not found")
-			}
-		}
-		return nil, err
-	}
-
-	switch {
-	case len(msgs) == 0:
-		return nil, fmt.Errorf("Link not found")
-
-	case len(msgs) == 1:
-		return linkDeserialize(msgs[0])
-
-	default:
-		return nil, fmt.Errorf("More than one link found")
-	}
-}
-
-// linkDeserialize deserializes a raw message received from netlink into
-// a link object.
-func linkDeserialize(m []byte) (Link, error) {
-	msg := nl.DeserializeIfInfomsg(m)
-
-	attrs, err := nl.ParseRouteAttr(m[msg.Len():])
-	if err != nil {
-		return nil, err
-	}
-
-	base := LinkAttrs{Index: int(msg.Index), Flags: linkFlags(msg.Flags)}
-	var link Link
-	linkType := ""
-	for _, attr := range attrs {
-		switch attr.Attr.Type {
-		case syscall.IFLA_LINKINFO:
-			infos, err := nl.ParseRouteAttr(attr.Value)
-			if err != nil {
-				return nil, err
-			}
-			for _, info := range infos {
-				switch info.Attr.Type {
-				case nl.IFLA_INFO_KIND:
-					linkType = string(info.Value[:len(info.Value)-1])
-					switch linkType {
-					case "dummy":
-						link = &Dummy{}
-					case "ifb":
-						link = &Ifb{}
-					case "bridge":
-						link = &Bridge{}
-					case "vlan":
-						link = &Vlan{}
-					case "veth":
-						link = &Veth{}
-					case "vxlan":
-						link = &Vxlan{}
-					case "ipvlan":
-						link = &IPVlan{}
-					case "macvlan":
-						link = &Macvlan{}
-					case "macvtap":
-						link = &Macvtap{}
-					default:
-						link = &GenericLink{LinkType: linkType}
-					}
-				case nl.IFLA_INFO_DATA:
-					data, err := nl.ParseRouteAttr(info.Value)
-					if err != nil {
-						return nil, err
-					}
-					switch linkType {
-					case "vlan":
-						parseVlanData(link, data)
-					case "vxlan":
-						parseVxlanData(link, data)
-					case "ipvlan":
-						parseIPVlanData(link, data)
-					case "macvlan":
-						parseMacvlanData(link, data)
-					case "macvtap":
-						parseMacvtapData(link, data)
-					}
-				}
-			}
-		case syscall.IFLA_ADDRESS:
-			var nonzero bool
-			for _, b := range attr.Value {
-				if b != 0 {
-					nonzero = true
-				}
-			}
-			if nonzero {
-				base.HardwareAddr = attr.Value[:]
-			}
-		case syscall.IFLA_IFNAME:
-			base.Name = string(attr.Value[:len(attr.Value)-1])
-		case syscall.IFLA_MTU:
-			base.MTU = int(native.Uint32(attr.Value[0:4]))
-		case syscall.IFLA_LINK:
-			base.ParentIndex = int(native.Uint32(attr.Value[0:4]))
-		case syscall.IFLA_MASTER:
-			base.MasterIndex = int(native.Uint32(attr.Value[0:4]))
-		case syscall.IFLA_TXQLEN:
-			base.TxQLen = int(native.Uint32(attr.Value[0:4]))
-		}
-	}
-	// Links that don't have IFLA_INFO_KIND are hardware devices
-	if link == nil {
-		link = &Device{}
-	}
-	*link.Attrs() = base
-
-	return link, nil
-}
-
-// LinkList gets a list of link devices.
-// Equivalent to: `ip link show`
-func LinkList() ([]Link, error) {
-	// NOTE(vish): This duplicates functionality in net/iface_linux.go, but we need
-	//             to get the message ourselves to parse link type.
-	req := nl.NewNetlinkRequest(syscall.RTM_GETLINK, syscall.NLM_F_DUMP)
-
-	msg := nl.NewIfInfomsg(syscall.AF_UNSPEC)
-	req.AddData(msg)
-
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWLINK)
-	if err != nil {
-		return nil, err
-	}
-
-	var res []Link
-	for _, m := range msgs {
-		link, err := linkDeserialize(m)
-		if err != nil {
-			return nil, err
-		}
-		res = append(res, link)
-	}
-
-	return res, nil
-}
-
-// LinkUpdate is used to pass information back from LinkSubscribe()
-type LinkUpdate struct {
-	nl.IfInfomsg
-	Link
-}
-
-// LinkSubscribe takes a chan down which notifications will be sent
-// when links change.  Close the 'done' chan to stop subscription.
-func LinkSubscribe(ch chan<- LinkUpdate, done <-chan struct{}) error {
-	s, err := nl.Subscribe(syscall.NETLINK_ROUTE, syscall.RTNLGRP_LINK)
-	if err != nil {
-		return err
-	}
-	if done != nil {
-		go func() {
-			<-done
-			s.Close()
-		}()
-	}
-	go func() {
-		defer close(ch)
-		for {
-			msgs, err := s.Receive()
-			if err != nil {
-				return
-			}
-			for _, m := range msgs {
-				ifmsg := nl.DeserializeIfInfomsg(m.Data)
-				link, err := linkDeserialize(m.Data)
-				if err != nil {
-					return
-				}
-				ch <- LinkUpdate{IfInfomsg: *ifmsg, Link: link}
-			}
-		}
-	}()
-
-	return nil
-}
-
-func LinkSetHairpin(link Link, mode bool) error {
-	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_MODE)
-}
-
-func LinkSetGuard(link Link, mode bool) error {
-	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_GUARD)
-}
-
-func LinkSetFastLeave(link Link, mode bool) error {
-	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_FAST_LEAVE)
-}
-
-func LinkSetLearning(link Link, mode bool) error {
-	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_LEARNING)
-}
-
-func LinkSetRootBlock(link Link, mode bool) error {
-	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_PROTECT)
-}
-
-func LinkSetFlood(link Link, mode bool) error {
-	return setProtinfoAttr(link, mode, nl.IFLA_BRPORT_UNICAST_FLOOD)
-}
-
-func setProtinfoAttr(link Link, mode bool, attr int) error {
-	base := link.Attrs()
-	ensureIndex(base)
-	req := nl.NewNetlinkRequest(syscall.RTM_SETLINK, syscall.NLM_F_ACK)
-
-	msg := nl.NewIfInfomsg(syscall.AF_BRIDGE)
-	msg.Index = int32(base.Index)
-	req.AddData(msg)
-
-	br := nl.NewRtAttr(syscall.IFLA_PROTINFO|syscall.NLA_F_NESTED, nil)
-	nl.NewRtAttrChild(br, attr, boolToByte(mode))
-	req.AddData(br)
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func parseVlanData(link Link, data []syscall.NetlinkRouteAttr) {
-	vlan := link.(*Vlan)
-	for _, datum := range data {
-		switch datum.Attr.Type {
-		case nl.IFLA_VLAN_ID:
-			vlan.VlanId = int(native.Uint16(datum.Value[0:2]))
-		}
-	}
-}
-
-func parseVxlanData(link Link, data []syscall.NetlinkRouteAttr) {
-	vxlan := link.(*Vxlan)
-	for _, datum := range data {
-		switch datum.Attr.Type {
-		case nl.IFLA_VXLAN_ID:
-			vxlan.VxlanId = int(native.Uint32(datum.Value[0:4]))
-		case nl.IFLA_VXLAN_LINK:
-			vxlan.VtepDevIndex = int(native.Uint32(datum.Value[0:4]))
-		case nl.IFLA_VXLAN_LOCAL:
-			vxlan.SrcAddr = net.IP(datum.Value[0:4])
-		case nl.IFLA_VXLAN_LOCAL6:
-			vxlan.SrcAddr = net.IP(datum.Value[0:16])
-		case nl.IFLA_VXLAN_GROUP:
-			vxlan.Group = net.IP(datum.Value[0:4])
-		case nl.IFLA_VXLAN_GROUP6:
-			vxlan.Group = net.IP(datum.Value[0:16])
-		case nl.IFLA_VXLAN_TTL:
-			vxlan.TTL = int(datum.Value[0])
-		case nl.IFLA_VXLAN_TOS:
-			vxlan.TOS = int(datum.Value[0])
-		case nl.IFLA_VXLAN_LEARNING:
-			vxlan.Learning = int8(datum.Value[0]) != 0
-		case nl.IFLA_VXLAN_PROXY:
-			vxlan.Proxy = int8(datum.Value[0]) != 0
-		case nl.IFLA_VXLAN_RSC:
-			vxlan.RSC = int8(datum.Value[0]) != 0
-		case nl.IFLA_VXLAN_L2MISS:
-			vxlan.L2miss = int8(datum.Value[0]) != 0
-		case nl.IFLA_VXLAN_L3MISS:
-			vxlan.L3miss = int8(datum.Value[0]) != 0
-		case nl.IFLA_VXLAN_GBP:
-			vxlan.GBP = int8(datum.Value[0]) != 0
-		case nl.IFLA_VXLAN_AGEING:
-			vxlan.Age = int(native.Uint32(datum.Value[0:4]))
-			vxlan.NoAge = vxlan.Age == 0
-		case nl.IFLA_VXLAN_LIMIT:
-			vxlan.Limit = int(native.Uint32(datum.Value[0:4]))
-		case nl.IFLA_VXLAN_PORT:
-			vxlan.Port = int(native.Uint16(datum.Value[0:2]))
-		case nl.IFLA_VXLAN_PORT_RANGE:
-			buf := bytes.NewBuffer(datum.Value[0:4])
-			var pr vxlanPortRange
-			if binary.Read(buf, binary.BigEndian, &pr) != nil {
-				vxlan.PortLow = int(pr.Lo)
-				vxlan.PortHigh = int(pr.Hi)
-			}
-		}
-	}
-}
-
-func parseIPVlanData(link Link, data []syscall.NetlinkRouteAttr) {
-	ipv := link.(*IPVlan)
-	for _, datum := range data {
-		if datum.Attr.Type == nl.IFLA_IPVLAN_MODE {
-			ipv.Mode = IPVlanMode(native.Uint32(datum.Value[0:4]))
-			return
-		}
-	}
-}
-
-func parseMacvtapData(link Link, data []syscall.NetlinkRouteAttr) {
-	macv := link.(*Macvtap)
-	parseMacvlanData(&macv.Macvlan, data)
-}
-
-func parseMacvlanData(link Link, data []syscall.NetlinkRouteAttr) {
-	macv := link.(*Macvlan)
-	for _, datum := range data {
-		if datum.Attr.Type == nl.IFLA_MACVLAN_MODE {
-			switch native.Uint32(datum.Value[0:4]) {
-			case nl.MACVLAN_MODE_PRIVATE:
-				macv.Mode = MACVLAN_MODE_PRIVATE
-			case nl.MACVLAN_MODE_VEPA:
-				macv.Mode = MACVLAN_MODE_VEPA
-			case nl.MACVLAN_MODE_BRIDGE:
-				macv.Mode = MACVLAN_MODE_BRIDGE
-			case nl.MACVLAN_MODE_PASSTHRU:
-				macv.Mode = MACVLAN_MODE_PASSTHRU
-			case nl.MACVLAN_MODE_SOURCE:
-				macv.Mode = MACVLAN_MODE_SOURCE
-			}
-			return
-		}
-	}
-}
-
-// copied from pkg/net_linux.go
-func linkFlags(rawFlags uint32) net.Flags {
-	var f net.Flags
-	if rawFlags&syscall.IFF_UP != 0 {
-		f |= net.FlagUp
-	}
-	if rawFlags&syscall.IFF_BROADCAST != 0 {
-		f |= net.FlagBroadcast
-	}
-	if rawFlags&syscall.IFF_LOOPBACK != 0 {
-		f |= net.FlagLoopback
-	}
-	if rawFlags&syscall.IFF_POINTOPOINT != 0 {
-		f |= net.FlagPointToPoint
-	}
-	if rawFlags&syscall.IFF_MULTICAST != 0 {
-		f |= net.FlagMulticast
-	}
-	return f
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go
deleted file mode 100644
index 0e5eb90c9e..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"net"
-)
-
-// Neigh represents a link layer neighbor from netlink.
-type Neigh struct {
-	LinkIndex    int
-	Family       int
-	State        int
-	Type         int
-	Flags        int
-	IP           net.IP
-	HardwareAddr net.HardwareAddr
-}
-
-// String returns $ip/$hwaddr $label
-func (neigh *Neigh) String() string {
-	return fmt.Sprintf("%s %s", neigh.IP, neigh.HardwareAddr)
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
deleted file mode 100644
index 620a0ee708..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
+++ /dev/null
@@ -1,189 +0,0 @@
-package netlink
-
-import (
-	"net"
-	"syscall"
-	"unsafe"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-const (
-	NDA_UNSPEC = iota
-	NDA_DST
-	NDA_LLADDR
-	NDA_CACHEINFO
-	NDA_PROBES
-	NDA_VLAN
-	NDA_PORT
-	NDA_VNI
-	NDA_IFINDEX
-	NDA_MAX = NDA_IFINDEX
-)
-
-// Neighbor Cache Entry States.
-const (
-	NUD_NONE       = 0x00
-	NUD_INCOMPLETE = 0x01
-	NUD_REACHABLE  = 0x02
-	NUD_STALE      = 0x04
-	NUD_DELAY      = 0x08
-	NUD_PROBE      = 0x10
-	NUD_FAILED     = 0x20
-	NUD_NOARP      = 0x40
-	NUD_PERMANENT  = 0x80
-)
-
-// Neighbor Flags
-const (
-	NTF_USE    = 0x01
-	NTF_SELF   = 0x02
-	NTF_MASTER = 0x04
-	NTF_PROXY  = 0x08
-	NTF_ROUTER = 0x80
-)
-
-type Ndmsg struct {
-	Family uint8
-	Index  uint32
-	State  uint16
-	Flags  uint8
-	Type   uint8
-}
-
-func deserializeNdmsg(b []byte) *Ndmsg {
-	var dummy Ndmsg
-	return (*Ndmsg)(unsafe.Pointer(&b[0:unsafe.Sizeof(dummy)][0]))
-}
-
-func (msg *Ndmsg) Serialize() []byte {
-	return (*(*[unsafe.Sizeof(*msg)]byte)(unsafe.Pointer(msg)))[:]
-}
-
-func (msg *Ndmsg) Len() int {
-	return int(unsafe.Sizeof(*msg))
-}
-
-// NeighAdd will add an IP to MAC mapping to the ARP table
-// Equivalent to: `ip neigh add ....`
-func NeighAdd(neigh *Neigh) error {
-	return neighAdd(neigh, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL)
-}
-
-// NeighAdd will add or replace an IP to MAC mapping to the ARP table
-// Equivalent to: `ip neigh replace....`
-func NeighSet(neigh *Neigh) error {
-	return neighAdd(neigh, syscall.NLM_F_CREATE)
-}
-
-// NeighAppend will append an entry to FDB
-// Equivalent to: `bridge fdb append...`
-func NeighAppend(neigh *Neigh) error {
-	return neighAdd(neigh, syscall.NLM_F_CREATE|syscall.NLM_F_APPEND)
-}
-
-func neighAdd(neigh *Neigh, mode int) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_NEWNEIGH, mode|syscall.NLM_F_ACK)
-	return neighHandle(neigh, req)
-}
-
-// NeighDel will delete an IP address from a link device.
-// Equivalent to: `ip addr del $addr dev $link`
-func NeighDel(neigh *Neigh) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_DELNEIGH, syscall.NLM_F_ACK)
-	return neighHandle(neigh, req)
-}
-
-func neighHandle(neigh *Neigh, req *nl.NetlinkRequest) error {
-	var family int
-	if neigh.Family > 0 {
-		family = neigh.Family
-	} else {
-		family = nl.GetIPFamily(neigh.IP)
-	}
-
-	msg := Ndmsg{
-		Family: uint8(family),
-		Index:  uint32(neigh.LinkIndex),
-		State:  uint16(neigh.State),
-		Type:   uint8(neigh.Type),
-		Flags:  uint8(neigh.Flags),
-	}
-	req.AddData(&msg)
-
-	ipData := neigh.IP.To4()
-	if ipData == nil {
-		ipData = neigh.IP.To16()
-	}
-
-	dstData := nl.NewRtAttr(NDA_DST, ipData)
-	req.AddData(dstData)
-
-	hwData := nl.NewRtAttr(NDA_LLADDR, []byte(neigh.HardwareAddr))
-	req.AddData(hwData)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// NeighList gets a list of IP-MAC mappings in the system (ARP table).
-// Equivalent to: `ip neighbor show`.
-// The list can be filtered by link and ip family.
-func NeighList(linkIndex, family int) ([]Neigh, error) {
-	req := nl.NewNetlinkRequest(syscall.RTM_GETNEIGH, syscall.NLM_F_DUMP)
-	msg := Ndmsg{
-		Family: uint8(family),
-	}
-	req.AddData(&msg)
-
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWNEIGH)
-	if err != nil {
-		return nil, err
-	}
-
-	var res []Neigh
-	for _, m := range msgs {
-		ndm := deserializeNdmsg(m)
-		if linkIndex != 0 && int(ndm.Index) != linkIndex {
-			// Ignore messages from other interfaces
-			continue
-		}
-
-		neigh, err := NeighDeserialize(m)
-		if err != nil {
-			continue
-		}
-
-		res = append(res, *neigh)
-	}
-
-	return res, nil
-}
-
-func NeighDeserialize(m []byte) (*Neigh, error) {
-	msg := deserializeNdmsg(m)
-
-	neigh := Neigh{
-		LinkIndex: int(msg.Index),
-		Family:    int(msg.Family),
-		State:     int(msg.State),
-		Type:      int(msg.Type),
-		Flags:     int(msg.Flags),
-	}
-
-	attrs, err := nl.ParseRouteAttr(m[msg.Len():])
-	if err != nil {
-		return nil, err
-	}
-
-	for _, attr := range attrs {
-		switch attr.Attr.Type {
-		case NDA_DST:
-			neigh.IP = net.IP(attr.Value)
-		case NDA_LLADDR:
-			neigh.HardwareAddr = net.HardwareAddr(attr.Value)
-		}
-	}
-
-	return &neigh, nil
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
deleted file mode 100644
index 41ebdb11f1..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Package netlink provides a simple library for netlink. Netlink is
-// the interface a user-space program in linux uses to communicate with
-// the kernel. It can be used to add and remove interfaces, set up ip
-// addresses and routes, and confiugre ipsec. Netlink communication
-// requires elevated privileges, so in most cases this code needs to
-// be run as root. The low level primitives for netlink are contained
-// in the nl subpackage. This package attempts to provide a high-level
-// interface that is loosly modeled on the iproute2 cli.
-package netlink
-
-import (
-	"net"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-const (
-	// Family type definitions
-	FAMILY_ALL = nl.FAMILY_ALL
-	FAMILY_V4  = nl.FAMILY_V4
-	FAMILY_V6  = nl.FAMILY_V6
-)
-
-// ParseIPNet parses a string in ip/net format and returns a net.IPNet.
-// This is valuable because addresses in netlink are often IPNets and
-// ParseCIDR returns an IPNet with the IP part set to the base IP of the
-// range.
-func ParseIPNet(s string) (*net.IPNet, error) {
-	ip, ipNet, err := net.ParseCIDR(s)
-	if err != nil {
-		return nil, err
-	}
-	return &net.IPNet{IP: ip, Mask: ipNet.Mask}, nil
-}
-
-// NewIPNet generates an IPNet from an ip address using a netmask of 32.
-func NewIPNet(ip net.IP) *net.IPNet {
-	return &net.IPNet{IP: ip, Mask: net.CIDRMask(32, 32)}
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go
deleted file mode 100644
index 10c49c1bfc..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink_unspecified.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// +build !linux
-
-package netlink
-
-import (
-	"errors"
-)
-
-var (
-	ErrNotImplemented = errors.New("not implemented")
-)
-
-func LinkSetUp(link *Link) error {
-	return ErrNotImplemented
-}
-
-func LinkSetDown(link *Link) error {
-	return ErrNotImplemented
-}
-
-func LinkSetMTU(link *Link, mtu int) error {
-	return ErrNotImplemented
-}
-
-func LinkSetMaster(link *Link, master *Link) error {
-	return ErrNotImplemented
-}
-
-func LinkSetNsPid(link *Link, nspid int) error {
-	return ErrNotImplemented
-}
-
-func LinkSetNsFd(link *Link, fd int) error {
-	return ErrNotImplemented
-}
-
-func LinkAdd(link *Link) error {
-	return ErrNotImplemented
-}
-
-func LinkDel(link *Link) error {
-	return ErrNotImplemented
-}
-
-func SetHairpin(link Link, mode bool) error {
-	return ErrNotImplemented
-}
-
-func SetGuard(link Link, mode bool) error {
-	return ErrNotImplemented
-}
-
-func SetFastLeave(link Link, mode bool) error {
-	return ErrNotImplemented
-}
-
-func SetLearning(link Link, mode bool) error {
-	return ErrNotImplemented
-}
-
-func SetRootBlock(link Link, mode bool) error {
-	return ErrNotImplemented
-}
-
-func SetFlood(link Link, mode bool) error {
-	return ErrNotImplemented
-}
-
-func LinkList() ([]Link, error) {
-	return nil, ErrNotImplemented
-}
-
-func AddrAdd(link *Link, addr *Addr) error {
-	return ErrNotImplemented
-}
-
-func AddrDel(link *Link, addr *Addr) error {
-	return ErrNotImplemented
-}
-
-func AddrList(link *Link, family int) ([]Addr, error) {
-	return nil, ErrNotImplemented
-}
-
-func RouteAdd(route *Route) error {
-	return ErrNotImplemented
-}
-
-func RouteDel(route *Route) error {
-	return ErrNotImplemented
-}
-
-func RouteList(link *Link, family int) ([]Route, error) {
-	return nil, ErrNotImplemented
-}
-
-func XfrmPolicyAdd(policy *XfrmPolicy) error {
-	return ErrNotImplemented
-}
-
-func XfrmPolicyDel(policy *XfrmPolicy) error {
-	return ErrNotImplemented
-}
-
-func XfrmPolicyList(family int) ([]XfrmPolicy, error) {
-	return nil, ErrNotImplemented
-}
-
-func XfrmStateAdd(policy *XfrmState) error {
-	return ErrNotImplemented
-}
-
-func XfrmStateDel(policy *XfrmState) error {
-	return ErrNotImplemented
-}
-
-func XfrmStateList(family int) ([]XfrmState, error) {
-	return nil, ErrNotImplemented
-}
-
-func NeighAdd(neigh *Neigh) error {
-	return ErrNotImplemented
-}
-
-func NeighSet(neigh *Neigh) error {
-	return ErrNotImplemented
-}
-
-func NeighAppend(neigh *Neigh) error {
-	return ErrNotImplemented
-}
-
-func NeighDel(neigh *Neigh) error {
-	return ErrNotImplemented
-}
-
-func NeighList(linkIndex, family int) ([]Neigh, error) {
-	return nil, ErrNotImplemented
-}
-
-func NeighDeserialize(m []byte) (*Ndmsg, *Neigh, error) {
-	return nil, nil, ErrNotImplemented
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go
deleted file mode 100644
index 17088fa0c0..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/addr_linux.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package nl
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-type IfAddrmsg struct {
-	syscall.IfAddrmsg
-}
-
-func NewIfAddrmsg(family int) *IfAddrmsg {
-	return &IfAddrmsg{
-		IfAddrmsg: syscall.IfAddrmsg{
-			Family: uint8(family),
-		},
-	}
-}
-
-// struct ifaddrmsg {
-//   __u8    ifa_family;
-//   __u8    ifa_prefixlen;  /* The prefix length    */
-//   __u8    ifa_flags;  /* Flags      */
-//   __u8    ifa_scope;  /* Address scope    */
-//   __u32   ifa_index;  /* Link index     */
-// };
-
-// type IfAddrmsg struct {
-// 	Family    uint8
-// 	Prefixlen uint8
-// 	Flags     uint8
-// 	Scope     uint8
-// 	Index     uint32
-// }
-// SizeofIfAddrmsg     = 0x8
-
-func DeserializeIfAddrmsg(b []byte) *IfAddrmsg {
-	return (*IfAddrmsg)(unsafe.Pointer(&b[0:syscall.SizeofIfAddrmsg][0]))
-}
-
-func (msg *IfAddrmsg) Serialize() []byte {
-	return (*(*[syscall.SizeofIfAddrmsg]byte)(unsafe.Pointer(msg)))[:]
-}
-
-func (msg *IfAddrmsg) Len() int {
-	return syscall.SizeofIfAddrmsg
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go
deleted file mode 100644
index 1f9ab088f0..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/link_linux.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package nl
-
-const (
-	DEFAULT_CHANGE = 0xFFFFFFFF
-)
-
-const (
-	IFLA_INFO_UNSPEC = iota
-	IFLA_INFO_KIND
-	IFLA_INFO_DATA
-	IFLA_INFO_XSTATS
-	IFLA_INFO_MAX = IFLA_INFO_XSTATS
-)
-
-const (
-	IFLA_VLAN_UNSPEC = iota
-	IFLA_VLAN_ID
-	IFLA_VLAN_FLAGS
-	IFLA_VLAN_EGRESS_QOS
-	IFLA_VLAN_INGRESS_QOS
-	IFLA_VLAN_PROTOCOL
-	IFLA_VLAN_MAX = IFLA_VLAN_PROTOCOL
-)
-
-const (
-	VETH_INFO_UNSPEC = iota
-	VETH_INFO_PEER
-	VETH_INFO_MAX = VETH_INFO_PEER
-)
-
-const (
-	IFLA_VXLAN_UNSPEC = iota
-	IFLA_VXLAN_ID
-	IFLA_VXLAN_GROUP
-	IFLA_VXLAN_LINK
-	IFLA_VXLAN_LOCAL
-	IFLA_VXLAN_TTL
-	IFLA_VXLAN_TOS
-	IFLA_VXLAN_LEARNING
-	IFLA_VXLAN_AGEING
-	IFLA_VXLAN_LIMIT
-	IFLA_VXLAN_PORT_RANGE
-	IFLA_VXLAN_PROXY
-	IFLA_VXLAN_RSC
-	IFLA_VXLAN_L2MISS
-	IFLA_VXLAN_L3MISS
-	IFLA_VXLAN_PORT
-	IFLA_VXLAN_GROUP6
-	IFLA_VXLAN_LOCAL6
-	IFLA_VXLAN_UDP_CSUM
-	IFLA_VXLAN_UDP_ZERO_CSUM6_TX
-	IFLA_VXLAN_UDP_ZERO_CSUM6_RX
-	IFLA_VXLAN_REMCSUM_TX
-	IFLA_VXLAN_REMCSUM_RX
-	IFLA_VXLAN_GBP
-	IFLA_VXLAN_REMCSUM_NOPARTIAL
-	IFLA_VXLAN_FLOWBASED
-	IFLA_VXLAN_MAX = IFLA_VXLAN_FLOWBASED
-)
-
-const (
-	BRIDGE_MODE_UNSPEC = iota
-	BRIDGE_MODE_HAIRPIN
-)
-
-const (
-	IFLA_BRPORT_UNSPEC = iota
-	IFLA_BRPORT_STATE
-	IFLA_BRPORT_PRIORITY
-	IFLA_BRPORT_COST
-	IFLA_BRPORT_MODE
-	IFLA_BRPORT_GUARD
-	IFLA_BRPORT_PROTECT
-	IFLA_BRPORT_FAST_LEAVE
-	IFLA_BRPORT_LEARNING
-	IFLA_BRPORT_UNICAST_FLOOD
-	IFLA_BRPORT_MAX = IFLA_BRPORT_UNICAST_FLOOD
-)
-
-const (
-	IFLA_IPVLAN_UNSPEC = iota
-	IFLA_IPVLAN_MODE
-	IFLA_IPVLAN_MAX = IFLA_IPVLAN_MODE
-)
-
-const (
-	// not defined in syscall
-	IFLA_NET_NS_FD = 28
-)
-
-const (
-	IFLA_MACVLAN_UNSPEC = iota
-	IFLA_MACVLAN_MODE
-	IFLA_MACVLAN_FLAGS
-	IFLA_MACVLAN_MAX = IFLA_MACVLAN_FLAGS
-)
-
-const (
-	MACVLAN_MODE_PRIVATE  = 1
-	MACVLAN_MODE_VEPA     = 2
-	MACVLAN_MODE_BRIDGE   = 4
-	MACVLAN_MODE_PASSTHRU = 8
-	MACVLAN_MODE_SOURCE   = 16
-)
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go
deleted file mode 100644
index 8dbd92b819..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/nl_linux.go
+++ /dev/null
@@ -1,418 +0,0 @@
-// Package nl has low level primitives for making Netlink calls.
-package nl
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"net"
-	"sync/atomic"
-	"syscall"
-	"unsafe"
-)
-
-const (
-	// Family type definitions
-	FAMILY_ALL = syscall.AF_UNSPEC
-	FAMILY_V4  = syscall.AF_INET
-	FAMILY_V6  = syscall.AF_INET6
-)
-
-var nextSeqNr uint32
-
-// GetIPFamily returns the family type of a net.IP.
-func GetIPFamily(ip net.IP) int {
-	if len(ip) <= net.IPv4len {
-		return FAMILY_V4
-	}
-	if ip.To4() != nil {
-		return FAMILY_V4
-	}
-	return FAMILY_V6
-}
-
-var nativeEndian binary.ByteOrder
-
-// Get native endianness for the system
-func NativeEndian() binary.ByteOrder {
-	if nativeEndian == nil {
-		var x uint32 = 0x01020304
-		if *(*byte)(unsafe.Pointer(&x)) == 0x01 {
-			nativeEndian = binary.BigEndian
-		} else {
-			nativeEndian = binary.LittleEndian
-		}
-	}
-	return nativeEndian
-}
-
-// Byte swap a 16 bit value if we aren't big endian
-func Swap16(i uint16) uint16 {
-	if NativeEndian() == binary.BigEndian {
-		return i
-	}
-	return (i&0xff00)>>8 | (i&0xff)<<8
-}
-
-// Byte swap a 32 bit value if aren't big endian
-func Swap32(i uint32) uint32 {
-	if NativeEndian() == binary.BigEndian {
-		return i
-	}
-	return (i&0xff000000)>>24 | (i&0xff0000)>>8 | (i&0xff00)<<8 | (i&0xff)<<24
-}
-
-type NetlinkRequestData interface {
-	Len() int
-	Serialize() []byte
-}
-
-// IfInfomsg is related to links, but it is used for list requests as well
-type IfInfomsg struct {
-	syscall.IfInfomsg
-}
-
-// Create an IfInfomsg with family specified
-func NewIfInfomsg(family int) *IfInfomsg {
-	return &IfInfomsg{
-		IfInfomsg: syscall.IfInfomsg{
-			Family: uint8(family),
-		},
-	}
-}
-
-func DeserializeIfInfomsg(b []byte) *IfInfomsg {
-	return (*IfInfomsg)(unsafe.Pointer(&b[0:syscall.SizeofIfInfomsg][0]))
-}
-
-func (msg *IfInfomsg) Serialize() []byte {
-	return (*(*[syscall.SizeofIfInfomsg]byte)(unsafe.Pointer(msg)))[:]
-}
-
-func (msg *IfInfomsg) Len() int {
-	return syscall.SizeofIfInfomsg
-}
-
-func rtaAlignOf(attrlen int) int {
-	return (attrlen + syscall.RTA_ALIGNTO - 1) & ^(syscall.RTA_ALIGNTO - 1)
-}
-
-func NewIfInfomsgChild(parent *RtAttr, family int) *IfInfomsg {
-	msg := NewIfInfomsg(family)
-	parent.children = append(parent.children, msg)
-	return msg
-}
-
-// Extend RtAttr to handle data and children
-type RtAttr struct {
-	syscall.RtAttr
-	Data     []byte
-	children []NetlinkRequestData
-}
-
-// Create a new Extended RtAttr object
-func NewRtAttr(attrType int, data []byte) *RtAttr {
-	return &RtAttr{
-		RtAttr: syscall.RtAttr{
-			Type: uint16(attrType),
-		},
-		children: []NetlinkRequestData{},
-		Data:     data,
-	}
-}
-
-// Create a new RtAttr obj anc add it as a child of an existing object
-func NewRtAttrChild(parent *RtAttr, attrType int, data []byte) *RtAttr {
-	attr := NewRtAttr(attrType, data)
-	parent.children = append(parent.children, attr)
-	return attr
-}
-
-func (a *RtAttr) Len() int {
-	if len(a.children) == 0 {
-		return (syscall.SizeofRtAttr + len(a.Data))
-	}
-
-	l := 0
-	for _, child := range a.children {
-		l += rtaAlignOf(child.Len())
-	}
-	l += syscall.SizeofRtAttr
-	return rtaAlignOf(l + len(a.Data))
-}
-
-// Serialize the RtAttr into a byte array
-// This can't just unsafe.cast because it must iterate through children.
-func (a *RtAttr) Serialize() []byte {
-	native := NativeEndian()
-
-	length := a.Len()
-	buf := make([]byte, rtaAlignOf(length))
-
-	if a.Data != nil {
-		copy(buf[4:], a.Data)
-	} else {
-		next := 4
-		for _, child := range a.children {
-			childBuf := child.Serialize()
-			copy(buf[next:], childBuf)
-			next += rtaAlignOf(len(childBuf))
-		}
-	}
-
-	if l := uint16(length); l != 0 {
-		native.PutUint16(buf[0:2], l)
-	}
-	native.PutUint16(buf[2:4], a.Type)
-	return buf
-}
-
-type NetlinkRequest struct {
-	syscall.NlMsghdr
-	Data []NetlinkRequestData
-}
-
-// Serialize the Netlink Request into a byte array
-func (req *NetlinkRequest) Serialize() []byte {
-	length := syscall.SizeofNlMsghdr
-	dataBytes := make([][]byte, len(req.Data))
-	for i, data := range req.Data {
-		dataBytes[i] = data.Serialize()
-		length = length + len(dataBytes[i])
-	}
-	req.Len = uint32(length)
-	b := make([]byte, length)
-	hdr := (*(*[syscall.SizeofNlMsghdr]byte)(unsafe.Pointer(req)))[:]
-	next := syscall.SizeofNlMsghdr
-	copy(b[0:next], hdr)
-	for _, data := range dataBytes {
-		for _, dataByte := range data {
-			b[next] = dataByte
-			next = next + 1
-		}
-	}
-	return b
-}
-
-func (req *NetlinkRequest) AddData(data NetlinkRequestData) {
-	if data != nil {
-		req.Data = append(req.Data, data)
-	}
-}
-
-// Execute the request against a the given sockType.
-// Returns a list of netlink messages in seriaized format, optionally filtered
-// by resType.
-func (req *NetlinkRequest) Execute(sockType int, resType uint16) ([][]byte, error) {
-	s, err := getNetlinkSocket(sockType)
-	if err != nil {
-		return nil, err
-	}
-	defer s.Close()
-
-	if err := s.Send(req); err != nil {
-		return nil, err
-	}
-
-	pid, err := s.GetPid()
-	if err != nil {
-		return nil, err
-	}
-
-	var res [][]byte
-
-done:
-	for {
-		msgs, err := s.Receive()
-		if err != nil {
-			return nil, err
-		}
-		for _, m := range msgs {
-			if m.Header.Seq != req.Seq {
-				return nil, fmt.Errorf("Wrong Seq nr %d, expected 1", m.Header.Seq)
-			}
-			if m.Header.Pid != pid {
-				return nil, fmt.Errorf("Wrong pid %d, expected %d", m.Header.Pid, pid)
-			}
-			if m.Header.Type == syscall.NLMSG_DONE {
-				break done
-			}
-			if m.Header.Type == syscall.NLMSG_ERROR {
-				native := NativeEndian()
-				error := int32(native.Uint32(m.Data[0:4]))
-				if error == 0 {
-					break done
-				}
-				return nil, syscall.Errno(-error)
-			}
-			if resType != 0 && m.Header.Type != resType {
-				continue
-			}
-			res = append(res, m.Data)
-			if m.Header.Flags&syscall.NLM_F_MULTI == 0 {
-				break done
-			}
-		}
-	}
-	return res, nil
-}
-
-// Create a new netlink request from proto and flags
-// Note the Len value will be inaccurate once data is added until
-// the message is serialized
-func NewNetlinkRequest(proto, flags int) *NetlinkRequest {
-	return &NetlinkRequest{
-		NlMsghdr: syscall.NlMsghdr{
-			Len:   uint32(syscall.SizeofNlMsghdr),
-			Type:  uint16(proto),
-			Flags: syscall.NLM_F_REQUEST | uint16(flags),
-			Seq:   atomic.AddUint32(&nextSeqNr, 1),
-		},
-	}
-}
-
-type NetlinkSocket struct {
-	fd  int
-	lsa syscall.SockaddrNetlink
-}
-
-func getNetlinkSocket(protocol int) (*NetlinkSocket, error) {
-	fd, err := syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, protocol)
-	if err != nil {
-		return nil, err
-	}
-	s := &NetlinkSocket{
-		fd: fd,
-	}
-	s.lsa.Family = syscall.AF_NETLINK
-	if err := syscall.Bind(fd, &s.lsa); err != nil {
-		syscall.Close(fd)
-		return nil, err
-	}
-
-	return s, nil
-}
-
-// Create a netlink socket with a given protocol (e.g. NETLINK_ROUTE)
-// and subscribe it to multicast groups passed in variable argument list.
-// Returns the netlink socket on which Receive() method can be called
-// to retrieve the messages from the kernel.
-func Subscribe(protocol int, groups ...uint) (*NetlinkSocket, error) {
-	fd, err := syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, protocol)
-	if err != nil {
-		return nil, err
-	}
-	s := &NetlinkSocket{
-		fd: fd,
-	}
-	s.lsa.Family = syscall.AF_NETLINK
-
-	for _, g := range groups {
-		s.lsa.Groups |= (1 << (g - 1))
-	}
-
-	if err := syscall.Bind(fd, &s.lsa); err != nil {
-		syscall.Close(fd)
-		return nil, err
-	}
-
-	return s, nil
-}
-
-func (s *NetlinkSocket) Close() {
-	syscall.Close(s.fd)
-}
-
-func (s *NetlinkSocket) Send(request *NetlinkRequest) error {
-	if err := syscall.Sendto(s.fd, request.Serialize(), 0, &s.lsa); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *NetlinkSocket) Receive() ([]syscall.NetlinkMessage, error) {
-	rb := make([]byte, syscall.Getpagesize())
-	nr, _, err := syscall.Recvfrom(s.fd, rb, 0)
-	if err != nil {
-		return nil, err
-	}
-	if nr < syscall.NLMSG_HDRLEN {
-		return nil, fmt.Errorf("Got short response from netlink")
-	}
-	rb = rb[:nr]
-	return syscall.ParseNetlinkMessage(rb)
-}
-
-func (s *NetlinkSocket) GetPid() (uint32, error) {
-	lsa, err := syscall.Getsockname(s.fd)
-	if err != nil {
-		return 0, err
-	}
-	switch v := lsa.(type) {
-	case *syscall.SockaddrNetlink:
-		return v.Pid, nil
-	}
-	return 0, fmt.Errorf("Wrong socket type")
-}
-
-func ZeroTerminated(s string) []byte {
-	bytes := make([]byte, len(s)+1)
-	for i := 0; i < len(s); i++ {
-		bytes[i] = s[i]
-	}
-	bytes[len(s)] = 0
-	return bytes
-}
-
-func NonZeroTerminated(s string) []byte {
-	bytes := make([]byte, len(s))
-	for i := 0; i < len(s); i++ {
-		bytes[i] = s[i]
-	}
-	return bytes
-}
-
-func BytesToString(b []byte) string {
-	n := bytes.Index(b, []byte{0})
-	return string(b[:n])
-}
-
-func Uint8Attr(v uint8) []byte {
-	return []byte{byte(v)}
-}
-
-func Uint16Attr(v uint16) []byte {
-	native := NativeEndian()
-	bytes := make([]byte, 2)
-	native.PutUint16(bytes, v)
-	return bytes
-}
-
-func Uint32Attr(v uint32) []byte {
-	native := NativeEndian()
-	bytes := make([]byte, 4)
-	native.PutUint32(bytes, v)
-	return bytes
-}
-
-func ParseRouteAttr(b []byte) ([]syscall.NetlinkRouteAttr, error) {
-	var attrs []syscall.NetlinkRouteAttr
-	for len(b) >= syscall.SizeofRtAttr {
-		a, vbuf, alen, err := netlinkRouteAttrAndValue(b)
-		if err != nil {
-			return nil, err
-		}
-		ra := syscall.NetlinkRouteAttr{Attr: *a, Value: vbuf[:int(a.Len)-syscall.SizeofRtAttr]}
-		attrs = append(attrs, ra)
-		b = b[alen:]
-	}
-	return attrs, nil
-}
-
-func netlinkRouteAttrAndValue(b []byte) (*syscall.RtAttr, []byte, int, error) {
-	a := (*syscall.RtAttr)(unsafe.Pointer(&b[0]))
-	if int(a.Len) < syscall.SizeofRtAttr || int(a.Len) > len(b) {
-		return nil, nil, 0, syscall.EINVAL
-	}
-	return a, b[syscall.SizeofRtAttr:], rtaAlignOf(int(a.Len)), nil
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go
deleted file mode 100644
index 447e83e5ae..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/route_linux.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package nl
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-type RtMsg struct {
-	syscall.RtMsg
-}
-
-func NewRtMsg() *RtMsg {
-	return &RtMsg{
-		RtMsg: syscall.RtMsg{
-			Table:    syscall.RT_TABLE_MAIN,
-			Scope:    syscall.RT_SCOPE_UNIVERSE,
-			Protocol: syscall.RTPROT_BOOT,
-			Type:     syscall.RTN_UNICAST,
-		},
-	}
-}
-
-func NewRtDelMsg() *RtMsg {
-	return &RtMsg{
-		RtMsg: syscall.RtMsg{
-			Table: syscall.RT_TABLE_MAIN,
-			Scope: syscall.RT_SCOPE_NOWHERE,
-		},
-	}
-}
-
-func (msg *RtMsg) Len() int {
-	return syscall.SizeofRtMsg
-}
-
-func DeserializeRtMsg(b []byte) *RtMsg {
-	return (*RtMsg)(unsafe.Pointer(&b[0:syscall.SizeofRtMsg][0]))
-}
-
-func (msg *RtMsg) Serialize() []byte {
-	return (*(*[syscall.SizeofRtMsg]byte)(unsafe.Pointer(msg)))[:]
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go
deleted file mode 100644
index 890979e037..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/tc_linux.go
+++ /dev/null
@@ -1,425 +0,0 @@
-package nl
-
-import (
-	"unsafe"
-)
-
-// Message types
-const (
-	TCA_UNSPEC = iota
-	TCA_KIND
-	TCA_OPTIONS
-	TCA_STATS
-	TCA_XSTATS
-	TCA_RATE
-	TCA_FCNT
-	TCA_STATS2
-	TCA_STAB
-	TCA_MAX = TCA_STAB
-)
-
-const (
-	TCA_ACT_TAB = 1
-	TCAA_MAX    = 1
-)
-
-const (
-	TCA_PRIO_UNSPEC = iota
-	TCA_PRIO_MQ
-	TCA_PRIO_MAX = TCA_PRIO_MQ
-)
-
-const (
-	SizeofTcMsg       = 0x14
-	SizeofTcActionMsg = 0x04
-	SizeofTcPrioMap   = 0x14
-	SizeofTcRateSpec  = 0x0c
-	SizeofTcTbfQopt   = 2*SizeofTcRateSpec + 0x0c
-	SizeofTcHtbCopt   = 2*SizeofTcRateSpec + 0x14
-	SizeofTcHtbGlob   = 0x14
-	SizeofTcU32Key    = 0x10
-	SizeofTcU32Sel    = 0x10 // without keys
-	SizeofTcMirred    = 0x1c
-)
-
-// struct tcmsg {
-//   unsigned char tcm_family;
-//   unsigned char tcm__pad1;
-//   unsigned short  tcm__pad2;
-//   int   tcm_ifindex;
-//   __u32   tcm_handle;
-//   __u32   tcm_parent;
-//   __u32   tcm_info;
-// };
-
-type TcMsg struct {
-	Family  uint8
-	Pad     [3]byte
-	Ifindex int32
-	Handle  uint32
-	Parent  uint32
-	Info    uint32
-}
-
-func (msg *TcMsg) Len() int {
-	return SizeofTcMsg
-}
-
-func DeserializeTcMsg(b []byte) *TcMsg {
-	return (*TcMsg)(unsafe.Pointer(&b[0:SizeofTcMsg][0]))
-}
-
-func (x *TcMsg) Serialize() []byte {
-	return (*(*[SizeofTcMsg]byte)(unsafe.Pointer(x)))[:]
-}
-
-// struct tcamsg {
-//   unsigned char tca_family;
-//   unsigned char tca__pad1;
-//   unsigned short  tca__pad2;
-// };
-
-type TcActionMsg struct {
-	Family uint8
-	Pad    [3]byte
-}
-
-func (msg *TcActionMsg) Len() int {
-	return SizeofTcActionMsg
-}
-
-func DeserializeTcActionMsg(b []byte) *TcActionMsg {
-	return (*TcActionMsg)(unsafe.Pointer(&b[0:SizeofTcActionMsg][0]))
-}
-
-func (x *TcActionMsg) Serialize() []byte {
-	return (*(*[SizeofTcActionMsg]byte)(unsafe.Pointer(x)))[:]
-}
-
-const (
-	TC_PRIO_MAX = 15
-)
-
-// struct tc_prio_qopt {
-// 	int bands;      /* Number of bands */
-// 	__u8  priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */
-// };
-
-type TcPrioMap struct {
-	Bands   int32
-	Priomap [TC_PRIO_MAX + 1]uint8
-}
-
-func (msg *TcPrioMap) Len() int {
-	return SizeofTcPrioMap
-}
-
-func DeserializeTcPrioMap(b []byte) *TcPrioMap {
-	return (*TcPrioMap)(unsafe.Pointer(&b[0:SizeofTcPrioMap][0]))
-}
-
-func (x *TcPrioMap) Serialize() []byte {
-	return (*(*[SizeofTcPrioMap]byte)(unsafe.Pointer(x)))[:]
-}
-
-const (
-	TCA_TBF_UNSPEC = iota
-	TCA_TBF_PARMS
-	TCA_TBF_RTAB
-	TCA_TBF_PTAB
-	TCA_TBF_RATE64
-	TCA_TBF_PRATE64
-	TCA_TBF_BURST
-	TCA_TBF_PBURST
-	TCA_TBF_MAX = TCA_TBF_PBURST
-)
-
-// struct tc_ratespec {
-//   unsigned char cell_log;
-//   __u8    linklayer; /* lower 4 bits */
-//   unsigned short  overhead;
-//   short   cell_align;
-//   unsigned short  mpu;
-//   __u32   rate;
-// };
-
-type TcRateSpec struct {
-	CellLog   uint8
-	Linklayer uint8
-	Overhead  uint16
-	CellAlign int16
-	Mpu       uint16
-	Rate      uint32
-}
-
-func (msg *TcRateSpec) Len() int {
-	return SizeofTcRateSpec
-}
-
-func DeserializeTcRateSpec(b []byte) *TcRateSpec {
-	return (*TcRateSpec)(unsafe.Pointer(&b[0:SizeofTcRateSpec][0]))
-}
-
-func (x *TcRateSpec) Serialize() []byte {
-	return (*(*[SizeofTcRateSpec]byte)(unsafe.Pointer(x)))[:]
-}
-
-// struct tc_tbf_qopt {
-//   struct tc_ratespec rate;
-//   struct tc_ratespec peakrate;
-//   __u32   limit;
-//   __u32   buffer;
-//   __u32   mtu;
-// };
-
-type TcTbfQopt struct {
-	Rate     TcRateSpec
-	Peakrate TcRateSpec
-	Limit    uint32
-	Buffer   uint32
-	Mtu      uint32
-}
-
-func (msg *TcTbfQopt) Len() int {
-	return SizeofTcTbfQopt
-}
-
-func DeserializeTcTbfQopt(b []byte) *TcTbfQopt {
-	return (*TcTbfQopt)(unsafe.Pointer(&b[0:SizeofTcTbfQopt][0]))
-}
-
-func (x *TcTbfQopt) Serialize() []byte {
-	return (*(*[SizeofTcTbfQopt]byte)(unsafe.Pointer(x)))[:]
-}
-
-const (
-	TCA_HTB_UNSPEC = iota
-	TCA_HTB_PARMS
-	TCA_HTB_INIT
-	TCA_HTB_CTAB
-	TCA_HTB_RTAB
-	TCA_HTB_DIRECT_QLEN
-	TCA_HTB_RATE64
-	TCA_HTB_CEIL64
-	TCA_HTB_MAX = TCA_HTB_CEIL64
-)
-
-//struct tc_htb_opt {
-//	struct tc_ratespec	rate;
-//	struct tc_ratespec	ceil;
-//	__u32	buffer;
-//	__u32	cbuffer;
-//	__u32	quantum;
-//	__u32	level;		/* out only */
-//	__u32	prio;
-//};
-
-type TcHtbCopt struct {
-	Rate    TcRateSpec
-	Ceil    TcRateSpec
-	Buffer  uint32
-	Cbuffer uint32
-	Quantum uint32
-	Level   uint32
-	Prio    uint32
-}
-
-func (msg *TcHtbCopt) Len() int {
-	return SizeofTcHtbCopt
-}
-
-func DeserializeTcHtbCopt(b []byte) *TcHtbCopt {
-	return (*TcHtbCopt)(unsafe.Pointer(&b[0:SizeofTcHtbCopt][0]))
-}
-
-func (x *TcHtbCopt) Serialize() []byte {
-	return (*(*[SizeofTcHtbCopt]byte)(unsafe.Pointer(x)))[:]
-}
-
-type TcHtbGlob struct {
-	Version      uint32
-	Rate2Quantum uint32
-	Defcls       uint32
-	Debug        uint32
-	DirectPkts   uint32
-}
-
-func (msg *TcHtbGlob) Len() int {
-	return SizeofTcHtbGlob
-}
-
-func DeserializeTcHtbGlob(b []byte) *TcHtbGlob {
-	return (*TcHtbGlob)(unsafe.Pointer(&b[0:SizeofTcHtbGlob][0]))
-}
-
-func (x *TcHtbGlob) Serialize() []byte {
-	return (*(*[SizeofTcHtbGlob]byte)(unsafe.Pointer(x)))[:]
-}
-
-const (
-	TCA_U32_UNSPEC = iota
-	TCA_U32_CLASSID
-	TCA_U32_HASH
-	TCA_U32_LINK
-	TCA_U32_DIVISOR
-	TCA_U32_SEL
-	TCA_U32_POLICE
-	TCA_U32_ACT
-	TCA_U32_INDEV
-	TCA_U32_PCNT
-	TCA_U32_MARK
-	TCA_U32_MAX = TCA_U32_MARK
-)
-
-// struct tc_u32_key {
-//   __be32    mask;
-//   __be32    val;
-//   int   off;
-//   int   offmask;
-// };
-
-type TcU32Key struct {
-	Mask    uint32 // big endian
-	Val     uint32 // big endian
-	Off     int32
-	OffMask int32
-}
-
-func (msg *TcU32Key) Len() int {
-	return SizeofTcU32Key
-}
-
-func DeserializeTcU32Key(b []byte) *TcU32Key {
-	return (*TcU32Key)(unsafe.Pointer(&b[0:SizeofTcU32Key][0]))
-}
-
-func (x *TcU32Key) Serialize() []byte {
-	return (*(*[SizeofTcU32Key]byte)(unsafe.Pointer(x)))[:]
-}
-
-// struct tc_u32_sel {
-//   unsigned char   flags;
-//   unsigned char   offshift;
-//   unsigned char   nkeys;
-//
-//   __be16      offmask;
-//   __u16     off;
-//   short     offoff;
-//
-//   short     hoff;
-//   __be32      hmask;
-//   struct tc_u32_key keys[0];
-// };
-
-const (
-	TC_U32_TERMINAL  = 1 << iota
-	TC_U32_OFFSET    = 1 << iota
-	TC_U32_VAROFFSET = 1 << iota
-	TC_U32_EAT       = 1 << iota
-)
-
-type TcU32Sel struct {
-	Flags    uint8
-	Offshift uint8
-	Nkeys    uint8
-	Pad      uint8
-	Offmask  uint16 // big endian
-	Off      uint16
-	Offoff   int16
-	Hoff     int16
-	Hmask    uint32 // big endian
-	Keys     []TcU32Key
-}
-
-func (msg *TcU32Sel) Len() int {
-	return SizeofTcU32Sel + int(msg.Nkeys)*SizeofTcU32Key
-}
-
-func DeserializeTcU32Sel(b []byte) *TcU32Sel {
-	x := &TcU32Sel{}
-	copy((*(*[SizeofTcU32Sel]byte)(unsafe.Pointer(x)))[:], b)
-	next := SizeofTcU32Sel
-	var i uint8
-	for i = 0; i < x.Nkeys; i++ {
-		x.Keys = append(x.Keys, *DeserializeTcU32Key(b[next:]))
-		next += SizeofTcU32Key
-	}
-	return x
-}
-
-func (x *TcU32Sel) Serialize() []byte {
-	// This can't just unsafe.cast because it must iterate through keys.
-	buf := make([]byte, x.Len())
-	copy(buf, (*(*[SizeofTcU32Sel]byte)(unsafe.Pointer(x)))[:])
-	next := SizeofTcU32Sel
-	for _, key := range x.Keys {
-		keyBuf := key.Serialize()
-		copy(buf[next:], keyBuf)
-		next += SizeofTcU32Key
-	}
-	return buf
-}
-
-const (
-	TCA_ACT_MIRRED = 8
-)
-
-const (
-	TCA_MIRRED_UNSPEC = iota
-	TCA_MIRRED_TM
-	TCA_MIRRED_PARMS
-	TCA_MIRRED_MAX = TCA_MIRRED_PARMS
-)
-
-const (
-	TCA_EGRESS_REDIR   = 1 /* packet redirect to EGRESS*/
-	TCA_EGRESS_MIRROR  = 2 /* mirror packet to EGRESS */
-	TCA_INGRESS_REDIR  = 3 /* packet redirect to INGRESS*/
-	TCA_INGRESS_MIRROR = 4 /* mirror packet to INGRESS */
-)
-
-const (
-	TC_ACT_UNSPEC     = int32(-1)
-	TC_ACT_OK         = 0
-	TC_ACT_RECLASSIFY = 1
-	TC_ACT_SHOT       = 2
-	TC_ACT_PIPE       = 3
-	TC_ACT_STOLEN     = 4
-	TC_ACT_QUEUED     = 5
-	TC_ACT_REPEAT     = 6
-	TC_ACT_JUMP       = 0x10000000
-)
-
-// #define tc_gen \
-//   __u32                 index; \
-//   __u32                 capab; \
-//   int                   action; \
-//   int                   refcnt; \
-//   int                   bindcnt
-// struct tc_mirred {
-// 	tc_gen;
-// 	int                     eaction;   /* one of IN/EGRESS_MIRROR/REDIR */
-// 	__u32                   ifindex;  /* ifindex of egress port */
-// };
-
-type TcMirred struct {
-	Index   uint32
-	Capab   uint32
-	Action  int32
-	Refcnt  int32
-	Bindcnt int32
-	Eaction int32
-	Ifindex uint32
-}
-
-func (msg *TcMirred) Len() int {
-	return SizeofTcMirred
-}
-
-func DeserializeTcMirred(b []byte) *TcMirred {
-	return (*TcMirred)(unsafe.Pointer(&b[0:SizeofTcMirred][0]))
-}
-
-func (x *TcMirred) Serialize() []byte {
-	return (*(*[SizeofTcMirred]byte)(unsafe.Pointer(x)))[:]
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go
deleted file mode 100644
index d24637d278..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_linux.go
+++ /dev/null
@@ -1,258 +0,0 @@
-package nl
-
-import (
-	"bytes"
-	"net"
-	"unsafe"
-)
-
-// Infinity for packet and byte counts
-const (
-	XFRM_INF = ^uint64(0)
-)
-
-// Message Types
-const (
-	XFRM_MSG_BASE        = 0x10
-	XFRM_MSG_NEWSA       = 0x10
-	XFRM_MSG_DELSA       = 0x11
-	XFRM_MSG_GETSA       = 0x12
-	XFRM_MSG_NEWPOLICY   = 0x13
-	XFRM_MSG_DELPOLICY   = 0x14
-	XFRM_MSG_GETPOLICY   = 0x15
-	XFRM_MSG_ALLOCSPI    = 0x16
-	XFRM_MSG_ACQUIRE     = 0x17
-	XFRM_MSG_EXPIRE      = 0x18
-	XFRM_MSG_UPDPOLICY   = 0x19
-	XFRM_MSG_UPDSA       = 0x1a
-	XFRM_MSG_POLEXPIRE   = 0x1b
-	XFRM_MSG_FLUSHSA     = 0x1c
-	XFRM_MSG_FLUSHPOLICY = 0x1d
-	XFRM_MSG_NEWAE       = 0x1e
-	XFRM_MSG_GETAE       = 0x1f
-	XFRM_MSG_REPORT      = 0x20
-	XFRM_MSG_MIGRATE     = 0x21
-	XFRM_MSG_NEWSADINFO  = 0x22
-	XFRM_MSG_GETSADINFO  = 0x23
-	XFRM_MSG_NEWSPDINFO  = 0x24
-	XFRM_MSG_GETSPDINFO  = 0x25
-	XFRM_MSG_MAPPING     = 0x26
-	XFRM_MSG_MAX         = 0x26
-	XFRM_NR_MSGTYPES     = 0x17
-)
-
-// Attribute types
-const (
-	/* Netlink message attributes.  */
-	XFRMA_UNSPEC         = 0x00
-	XFRMA_ALG_AUTH       = 0x01 /* struct xfrm_algo */
-	XFRMA_ALG_CRYPT      = 0x02 /* struct xfrm_algo */
-	XFRMA_ALG_COMP       = 0x03 /* struct xfrm_algo */
-	XFRMA_ENCAP          = 0x04 /* struct xfrm_algo + struct xfrm_encap_tmpl */
-	XFRMA_TMPL           = 0x05 /* 1 or more struct xfrm_user_tmpl */
-	XFRMA_SA             = 0x06 /* struct xfrm_usersa_info  */
-	XFRMA_POLICY         = 0x07 /* struct xfrm_userpolicy_info */
-	XFRMA_SEC_CTX        = 0x08 /* struct xfrm_sec_ctx */
-	XFRMA_LTIME_VAL      = 0x09
-	XFRMA_REPLAY_VAL     = 0x0a
-	XFRMA_REPLAY_THRESH  = 0x0b
-	XFRMA_ETIMER_THRESH  = 0x0c
-	XFRMA_SRCADDR        = 0x0d /* xfrm_address_t */
-	XFRMA_COADDR         = 0x0e /* xfrm_address_t */
-	XFRMA_LASTUSED       = 0x0f /* unsigned long  */
-	XFRMA_POLICY_TYPE    = 0x10 /* struct xfrm_userpolicy_type */
-	XFRMA_MIGRATE        = 0x11
-	XFRMA_ALG_AEAD       = 0x12 /* struct xfrm_algo_aead */
-	XFRMA_KMADDRESS      = 0x13 /* struct xfrm_user_kmaddress */
-	XFRMA_ALG_AUTH_TRUNC = 0x14 /* struct xfrm_algo_auth */
-	XFRMA_MARK           = 0x15 /* struct xfrm_mark */
-	XFRMA_TFCPAD         = 0x16 /* __u32 */
-	XFRMA_REPLAY_ESN_VAL = 0x17 /* struct xfrm_replay_esn */
-	XFRMA_SA_EXTRA_FLAGS = 0x18 /* __u32 */
-	XFRMA_MAX            = 0x18
-)
-
-const (
-	SizeofXfrmAddress     = 0x10
-	SizeofXfrmSelector    = 0x38
-	SizeofXfrmLifetimeCfg = 0x40
-	SizeofXfrmLifetimeCur = 0x20
-	SizeofXfrmId          = 0x18
-)
-
-// typedef union {
-//   __be32    a4;
-//   __be32    a6[4];
-// } xfrm_address_t;
-
-type XfrmAddress [SizeofXfrmAddress]byte
-
-func (x *XfrmAddress) ToIP() net.IP {
-	var empty = [12]byte{}
-	ip := make(net.IP, net.IPv6len)
-	if bytes.Equal(x[4:16], empty[:]) {
-		ip[10] = 0xff
-		ip[11] = 0xff
-		copy(ip[12:16], x[0:4])
-	} else {
-		copy(ip[:], x[:])
-	}
-	return ip
-}
-
-func (x *XfrmAddress) ToIPNet(prefixlen uint8) *net.IPNet {
-	ip := x.ToIP()
-	if GetIPFamily(ip) == FAMILY_V4 {
-		return &net.IPNet{IP: ip, Mask: net.CIDRMask(int(prefixlen), 32)}
-	}
-	return &net.IPNet{IP: ip, Mask: net.CIDRMask(int(prefixlen), 128)}
-}
-
-func (x *XfrmAddress) FromIP(ip net.IP) {
-	var empty = [16]byte{}
-	if len(ip) < net.IPv4len {
-		copy(x[4:16], empty[:])
-	} else if GetIPFamily(ip) == FAMILY_V4 {
-		copy(x[0:4], ip.To4()[0:4])
-		copy(x[4:16], empty[:12])
-	} else {
-		copy(x[0:16], ip.To16()[0:16])
-	}
-}
-
-func DeserializeXfrmAddress(b []byte) *XfrmAddress {
-	return (*XfrmAddress)(unsafe.Pointer(&b[0:SizeofXfrmAddress][0]))
-}
-
-func (x *XfrmAddress) Serialize() []byte {
-	return (*(*[SizeofXfrmAddress]byte)(unsafe.Pointer(x)))[:]
-}
-
-// struct xfrm_selector {
-//   xfrm_address_t  daddr;
-//   xfrm_address_t  saddr;
-//   __be16  dport;
-//   __be16  dport_mask;
-//   __be16  sport;
-//   __be16  sport_mask;
-//   __u16 family;
-//   __u8  prefixlen_d;
-//   __u8  prefixlen_s;
-//   __u8  proto;
-//   int ifindex;
-//   __kernel_uid32_t  user;
-// };
-
-type XfrmSelector struct {
-	Daddr      XfrmAddress
-	Saddr      XfrmAddress
-	Dport      uint16 // big endian
-	DportMask  uint16 // big endian
-	Sport      uint16 // big endian
-	SportMask  uint16 // big endian
-	Family     uint16
-	PrefixlenD uint8
-	PrefixlenS uint8
-	Proto      uint8
-	Pad        [3]byte
-	Ifindex    int32
-	User       uint32
-}
-
-func (msg *XfrmSelector) Len() int {
-	return SizeofXfrmSelector
-}
-
-func DeserializeXfrmSelector(b []byte) *XfrmSelector {
-	return (*XfrmSelector)(unsafe.Pointer(&b[0:SizeofXfrmSelector][0]))
-}
-
-func (msg *XfrmSelector) Serialize() []byte {
-	return (*(*[SizeofXfrmSelector]byte)(unsafe.Pointer(msg)))[:]
-}
-
-// struct xfrm_lifetime_cfg {
-//   __u64 soft_byte_limit;
-//   __u64 hard_byte_limit;
-//   __u64 soft_packet_limit;
-//   __u64 hard_packet_limit;
-//   __u64 soft_add_expires_seconds;
-//   __u64 hard_add_expires_seconds;
-//   __u64 soft_use_expires_seconds;
-//   __u64 hard_use_expires_seconds;
-// };
-//
-
-type XfrmLifetimeCfg struct {
-	SoftByteLimit         uint64
-	HardByteLimit         uint64
-	SoftPacketLimit       uint64
-	HardPacketLimit       uint64
-	SoftAddExpiresSeconds uint64
-	HardAddExpiresSeconds uint64
-	SoftUseExpiresSeconds uint64
-	HardUseExpiresSeconds uint64
-}
-
-func (msg *XfrmLifetimeCfg) Len() int {
-	return SizeofXfrmLifetimeCfg
-}
-
-func DeserializeXfrmLifetimeCfg(b []byte) *XfrmLifetimeCfg {
-	return (*XfrmLifetimeCfg)(unsafe.Pointer(&b[0:SizeofXfrmLifetimeCfg][0]))
-}
-
-func (msg *XfrmLifetimeCfg) Serialize() []byte {
-	return (*(*[SizeofXfrmLifetimeCfg]byte)(unsafe.Pointer(msg)))[:]
-}
-
-// struct xfrm_lifetime_cur {
-//   __u64 bytes;
-//   __u64 packets;
-//   __u64 add_time;
-//   __u64 use_time;
-// };
-
-type XfrmLifetimeCur struct {
-	Bytes   uint64
-	Packets uint64
-	AddTime uint64
-	UseTime uint64
-}
-
-func (msg *XfrmLifetimeCur) Len() int {
-	return SizeofXfrmLifetimeCur
-}
-
-func DeserializeXfrmLifetimeCur(b []byte) *XfrmLifetimeCur {
-	return (*XfrmLifetimeCur)(unsafe.Pointer(&b[0:SizeofXfrmLifetimeCur][0]))
-}
-
-func (msg *XfrmLifetimeCur) Serialize() []byte {
-	return (*(*[SizeofXfrmLifetimeCur]byte)(unsafe.Pointer(msg)))[:]
-}
-
-// struct xfrm_id {
-//   xfrm_address_t  daddr;
-//   __be32    spi;
-//   __u8    proto;
-// };
-
-type XfrmId struct {
-	Daddr XfrmAddress
-	Spi   uint32 // big endian
-	Proto uint8
-	Pad   [3]byte
-}
-
-func (msg *XfrmId) Len() int {
-	return SizeofXfrmId
-}
-
-func DeserializeXfrmId(b []byte) *XfrmId {
-	return (*XfrmId)(unsafe.Pointer(&b[0:SizeofXfrmId][0]))
-}
-
-func (msg *XfrmId) Serialize() []byte {
-	return (*(*[SizeofXfrmId]byte)(unsafe.Pointer(msg)))[:]
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
deleted file mode 100644
index 66f7e03d2d..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_policy_linux.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package nl
-
-import (
-	"unsafe"
-)
-
-const (
-	SizeofXfrmUserpolicyId   = 0x40
-	SizeofXfrmUserpolicyInfo = 0xa8
-	SizeofXfrmUserTmpl       = 0x40
-)
-
-// struct xfrm_userpolicy_id {
-//   struct xfrm_selector    sel;
-//   __u32       index;
-//   __u8        dir;
-// };
-//
-
-type XfrmUserpolicyId struct {
-	Sel   XfrmSelector
-	Index uint32
-	Dir   uint8
-	Pad   [3]byte
-}
-
-func (msg *XfrmUserpolicyId) Len() int {
-	return SizeofXfrmUserpolicyId
-}
-
-func DeserializeXfrmUserpolicyId(b []byte) *XfrmUserpolicyId {
-	return (*XfrmUserpolicyId)(unsafe.Pointer(&b[0:SizeofXfrmUserpolicyId][0]))
-}
-
-func (msg *XfrmUserpolicyId) Serialize() []byte {
-	return (*(*[SizeofXfrmUserpolicyId]byte)(unsafe.Pointer(msg)))[:]
-}
-
-// struct xfrm_userpolicy_info {
-//   struct xfrm_selector    sel;
-//   struct xfrm_lifetime_cfg  lft;
-//   struct xfrm_lifetime_cur  curlft;
-//   __u32       priority;
-//   __u32       index;
-//   __u8        dir;
-//   __u8        action;
-// #define XFRM_POLICY_ALLOW 0
-// #define XFRM_POLICY_BLOCK 1
-//   __u8        flags;
-// #define XFRM_POLICY_LOCALOK 1 /* Allow user to override global policy */
-//   /* Automatically expand selector to include matching ICMP payloads. */
-// #define XFRM_POLICY_ICMP  2
-//   __u8        share;
-// };
-
-type XfrmUserpolicyInfo struct {
-	Sel      XfrmSelector
-	Lft      XfrmLifetimeCfg
-	Curlft   XfrmLifetimeCur
-	Priority uint32
-	Index    uint32
-	Dir      uint8
-	Action   uint8
-	Flags    uint8
-	Share    uint8
-	Pad      [4]byte
-}
-
-func (msg *XfrmUserpolicyInfo) Len() int {
-	return SizeofXfrmUserpolicyInfo
-}
-
-func DeserializeXfrmUserpolicyInfo(b []byte) *XfrmUserpolicyInfo {
-	return (*XfrmUserpolicyInfo)(unsafe.Pointer(&b[0:SizeofXfrmUserpolicyInfo][0]))
-}
-
-func (msg *XfrmUserpolicyInfo) Serialize() []byte {
-	return (*(*[SizeofXfrmUserpolicyInfo]byte)(unsafe.Pointer(msg)))[:]
-}
-
-// struct xfrm_user_tmpl {
-//   struct xfrm_id    id;
-//   __u16     family;
-//   xfrm_address_t    saddr;
-//   __u32     reqid;
-//   __u8      mode;
-//   __u8      share;
-//   __u8      optional;
-//   __u32     aalgos;
-//   __u32     ealgos;
-//   __u32     calgos;
-// }
-
-type XfrmUserTmpl struct {
-	XfrmId   XfrmId
-	Family   uint16
-	Pad1     [2]byte
-	Saddr    XfrmAddress
-	Reqid    uint32
-	Mode     uint8
-	Share    uint8
-	Optional uint8
-	Pad2     byte
-	Aalgos   uint32
-	Ealgos   uint32
-	Calgos   uint32
-}
-
-func (msg *XfrmUserTmpl) Len() int {
-	return SizeofXfrmUserTmpl
-}
-
-func DeserializeXfrmUserTmpl(b []byte) *XfrmUserTmpl {
-	return (*XfrmUserTmpl)(unsafe.Pointer(&b[0:SizeofXfrmUserTmpl][0]))
-}
-
-func (msg *XfrmUserTmpl) Serialize() []byte {
-	return (*(*[SizeofXfrmUserTmpl]byte)(unsafe.Pointer(msg)))[:]
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
deleted file mode 100644
index 4876ce4583..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/nl/xfrm_state_linux.go
+++ /dev/null
@@ -1,221 +0,0 @@
-package nl
-
-import (
-	"unsafe"
-)
-
-const (
-	SizeofXfrmUsersaId   = 0x18
-	SizeofXfrmStats      = 0x0c
-	SizeofXfrmUsersaInfo = 0xe0
-	SizeofXfrmAlgo       = 0x44
-	SizeofXfrmAlgoAuth   = 0x48
-	SizeofXfrmEncapTmpl  = 0x18
-)
-
-// struct xfrm_usersa_id {
-//   xfrm_address_t      daddr;
-//   __be32        spi;
-//   __u16       family;
-//   __u8        proto;
-// };
-
-type XfrmUsersaId struct {
-	Daddr  XfrmAddress
-	Spi    uint32 // big endian
-	Family uint16
-	Proto  uint8
-	Pad    byte
-}
-
-func (msg *XfrmUsersaId) Len() int {
-	return SizeofXfrmUsersaId
-}
-
-func DeserializeXfrmUsersaId(b []byte) *XfrmUsersaId {
-	return (*XfrmUsersaId)(unsafe.Pointer(&b[0:SizeofXfrmUsersaId][0]))
-}
-
-func (msg *XfrmUsersaId) Serialize() []byte {
-	return (*(*[SizeofXfrmUsersaId]byte)(unsafe.Pointer(msg)))[:]
-}
-
-// struct xfrm_stats {
-//   __u32 replay_window;
-//   __u32 replay;
-//   __u32 integrity_failed;
-// };
-
-type XfrmStats struct {
-	ReplayWindow    uint32
-	Replay          uint32
-	IntegrityFailed uint32
-}
-
-func (msg *XfrmStats) Len() int {
-	return SizeofXfrmStats
-}
-
-func DeserializeXfrmStats(b []byte) *XfrmStats {
-	return (*XfrmStats)(unsafe.Pointer(&b[0:SizeofXfrmStats][0]))
-}
-
-func (msg *XfrmStats) Serialize() []byte {
-	return (*(*[SizeofXfrmStats]byte)(unsafe.Pointer(msg)))[:]
-}
-
-// struct xfrm_usersa_info {
-//   struct xfrm_selector    sel;
-//   struct xfrm_id      id;
-//   xfrm_address_t      saddr;
-//   struct xfrm_lifetime_cfg  lft;
-//   struct xfrm_lifetime_cur  curlft;
-//   struct xfrm_stats   stats;
-//   __u32       seq;
-//   __u32       reqid;
-//   __u16       family;
-//   __u8        mode;   /* XFRM_MODE_xxx */
-//   __u8        replay_window;
-//   __u8        flags;
-// #define XFRM_STATE_NOECN  1
-// #define XFRM_STATE_DECAP_DSCP 2
-// #define XFRM_STATE_NOPMTUDISC 4
-// #define XFRM_STATE_WILDRECV 8
-// #define XFRM_STATE_ICMP   16
-// #define XFRM_STATE_AF_UNSPEC  32
-// #define XFRM_STATE_ALIGN4 64
-// #define XFRM_STATE_ESN    128
-// };
-//
-// #define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1
-//
-
-type XfrmUsersaInfo struct {
-	Sel          XfrmSelector
-	Id           XfrmId
-	Saddr        XfrmAddress
-	Lft          XfrmLifetimeCfg
-	Curlft       XfrmLifetimeCur
-	Stats        XfrmStats
-	Seq          uint32
-	Reqid        uint32
-	Family       uint16
-	Mode         uint8
-	ReplayWindow uint8
-	Flags        uint8
-	Pad          [7]byte
-}
-
-func (msg *XfrmUsersaInfo) Len() int {
-	return SizeofXfrmUsersaInfo
-}
-
-func DeserializeXfrmUsersaInfo(b []byte) *XfrmUsersaInfo {
-	return (*XfrmUsersaInfo)(unsafe.Pointer(&b[0:SizeofXfrmUsersaInfo][0]))
-}
-
-func (msg *XfrmUsersaInfo) Serialize() []byte {
-	return (*(*[SizeofXfrmUsersaInfo]byte)(unsafe.Pointer(msg)))[:]
-}
-
-// struct xfrm_algo {
-//   char    alg_name[64];
-//   unsigned int  alg_key_len;    /* in bits */
-//   char    alg_key[0];
-// };
-
-type XfrmAlgo struct {
-	AlgName   [64]byte
-	AlgKeyLen uint32
-	AlgKey    []byte
-}
-
-func (msg *XfrmAlgo) Len() int {
-	return SizeofXfrmAlgo + int(msg.AlgKeyLen/8)
-}
-
-func DeserializeXfrmAlgo(b []byte) *XfrmAlgo {
-	ret := XfrmAlgo{}
-	copy(ret.AlgName[:], b[0:64])
-	ret.AlgKeyLen = *(*uint32)(unsafe.Pointer(&b[64]))
-	ret.AlgKey = b[68:ret.Len()]
-	return &ret
-}
-
-func (msg *XfrmAlgo) Serialize() []byte {
-	b := make([]byte, msg.Len())
-	copy(b[0:64], msg.AlgName[:])
-	copy(b[64:68], (*(*[4]byte)(unsafe.Pointer(&msg.AlgKeyLen)))[:])
-	copy(b[68:msg.Len()], msg.AlgKey[:])
-	return b
-}
-
-// struct xfrm_algo_auth {
-//   char    alg_name[64];
-//   unsigned int  alg_key_len;    /* in bits */
-//   unsigned int  alg_trunc_len;  /* in bits */
-//   char    alg_key[0];
-// };
-
-type XfrmAlgoAuth struct {
-	AlgName     [64]byte
-	AlgKeyLen   uint32
-	AlgTruncLen uint32
-	AlgKey      []byte
-}
-
-func (msg *XfrmAlgoAuth) Len() int {
-	return SizeofXfrmAlgoAuth + int(msg.AlgKeyLen/8)
-}
-
-func DeserializeXfrmAlgoAuth(b []byte) *XfrmAlgoAuth {
-	ret := XfrmAlgoAuth{}
-	copy(ret.AlgName[:], b[0:64])
-	ret.AlgKeyLen = *(*uint32)(unsafe.Pointer(&b[64]))
-	ret.AlgTruncLen = *(*uint32)(unsafe.Pointer(&b[68]))
-	ret.AlgKey = b[72:ret.Len()]
-	return &ret
-}
-
-func (msg *XfrmAlgoAuth) Serialize() []byte {
-	b := make([]byte, msg.Len())
-	copy(b[0:64], msg.AlgName[:])
-	copy(b[64:68], (*(*[4]byte)(unsafe.Pointer(&msg.AlgKeyLen)))[:])
-	copy(b[68:72], (*(*[4]byte)(unsafe.Pointer(&msg.AlgTruncLen)))[:])
-	copy(b[72:msg.Len()], msg.AlgKey[:])
-	return b
-}
-
-// struct xfrm_algo_aead {
-//   char    alg_name[64];
-//   unsigned int  alg_key_len;  /* in bits */
-//   unsigned int  alg_icv_len;  /* in bits */
-//   char    alg_key[0];
-// }
-
-// struct xfrm_encap_tmpl {
-//   __u16   encap_type;
-//   __be16    encap_sport;
-//   __be16    encap_dport;
-//   xfrm_address_t  encap_oa;
-// };
-
-type XfrmEncapTmpl struct {
-	EncapType  uint16
-	EncapSport uint16 // big endian
-	EncapDport uint16 // big endian
-	Pad        [2]byte
-	EncapOa    XfrmAddress
-}
-
-func (msg *XfrmEncapTmpl) Len() int {
-	return SizeofXfrmEncapTmpl
-}
-
-func DeserializeXfrmEncapTmpl(b []byte) *XfrmEncapTmpl {
-	return (*XfrmEncapTmpl)(unsafe.Pointer(&b[0:SizeofXfrmEncapTmpl][0]))
-}
-
-func (msg *XfrmEncapTmpl) Serialize() []byte {
-	return (*(*[SizeofXfrmEncapTmpl]byte)(unsafe.Pointer(msg)))[:]
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go
deleted file mode 100644
index f39ab8f4e8..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package netlink
-
-import (
-	"strings"
-)
-
-// Protinfo represents bridge flags from netlink.
-type Protinfo struct {
-	Hairpin   bool
-	Guard     bool
-	FastLeave bool
-	RootBlock bool
-	Learning  bool
-	Flood     bool
-}
-
-// String returns a list of enabled flags
-func (prot *Protinfo) String() string {
-	var boolStrings []string
-	if prot.Hairpin {
-		boolStrings = append(boolStrings, "Hairpin")
-	}
-	if prot.Guard {
-		boolStrings = append(boolStrings, "Guard")
-	}
-	if prot.FastLeave {
-		boolStrings = append(boolStrings, "FastLeave")
-	}
-	if prot.RootBlock {
-		boolStrings = append(boolStrings, "RootBlock")
-	}
-	if prot.Learning {
-		boolStrings = append(boolStrings, "Learning")
-	}
-	if prot.Flood {
-		boolStrings = append(boolStrings, "Flood")
-	}
-	return strings.Join(boolStrings, " ")
-}
-
-func boolToByte(x bool) []byte {
-	if x {
-		return []byte{1}
-	}
-	return []byte{0}
-}
-
-func byteToBool(x byte) bool {
-	if uint8(x) != 0 {
-		return true
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
deleted file mode 100644
index 7181eba100..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"syscall"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-func LinkGetProtinfo(link Link) (Protinfo, error) {
-	base := link.Attrs()
-	ensureIndex(base)
-	var pi Protinfo
-	req := nl.NewNetlinkRequest(syscall.RTM_GETLINK, syscall.NLM_F_DUMP)
-	msg := nl.NewIfInfomsg(syscall.AF_BRIDGE)
-	req.AddData(msg)
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	if err != nil {
-		return pi, err
-	}
-
-	for _, m := range msgs {
-		ans := nl.DeserializeIfInfomsg(m)
-		if int(ans.Index) != base.Index {
-			continue
-		}
-		attrs, err := nl.ParseRouteAttr(m[ans.Len():])
-		if err != nil {
-			return pi, err
-		}
-		for _, attr := range attrs {
-			if attr.Attr.Type != syscall.IFLA_PROTINFO|syscall.NLA_F_NESTED {
-				continue
-			}
-			infos, err := nl.ParseRouteAttr(attr.Value)
-			if err != nil {
-				return pi, err
-			}
-			var pi Protinfo
-			for _, info := range infos {
-				switch info.Attr.Type {
-				case nl.IFLA_BRPORT_MODE:
-					pi.Hairpin = byteToBool(info.Value[0])
-				case nl.IFLA_BRPORT_GUARD:
-					pi.Guard = byteToBool(info.Value[0])
-				case nl.IFLA_BRPORT_FAST_LEAVE:
-					pi.FastLeave = byteToBool(info.Value[0])
-				case nl.IFLA_BRPORT_PROTECT:
-					pi.RootBlock = byteToBool(info.Value[0])
-				case nl.IFLA_BRPORT_LEARNING:
-					pi.Learning = byteToBool(info.Value[0])
-				case nl.IFLA_BRPORT_UNICAST_FLOOD:
-					pi.Flood = byteToBool(info.Value[0])
-				}
-			}
-			return pi, nil
-		}
-	}
-	return pi, fmt.Errorf("Device with index %d not found", base.Index)
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go
deleted file mode 100644
index 41a4aa8e3e..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-)
-
-const (
-	HANDLE_NONE      = 0
-	HANDLE_INGRESS   = 0xFFFFFFF1
-	HANDLE_ROOT      = 0xFFFFFFFF
-	PRIORITY_MAP_LEN = 16
-)
-
-type Qdisc interface {
-	Attrs() *QdiscAttrs
-	Type() string
-}
-
-// Qdisc represents a netlink qdisc. A qdisc is associated with a link,
-// has a handle, a parent and a refcnt. The root qdisc of a device should
-// have parent == HANDLE_ROOT.
-type QdiscAttrs struct {
-	LinkIndex int
-	Handle    uint32
-	Parent    uint32
-	Refcnt    uint32 // read only
-}
-
-func (q QdiscAttrs) String() string {
-	return fmt.Sprintf("{LinkIndex: %d, Handle: %s, Parent: %s, Refcnt: %s}", q.LinkIndex, HandleStr(q.Handle), HandleStr(q.Parent), q.Refcnt)
-}
-
-func MakeHandle(major, minor uint16) uint32 {
-	return (uint32(major) << 16) | uint32(minor)
-}
-
-func MajorMinor(handle uint32) (uint16, uint16) {
-	return uint16((handle & 0xFFFF0000) >> 16), uint16(handle & 0x0000FFFFF)
-}
-
-func HandleStr(handle uint32) string {
-	switch handle {
-	case HANDLE_NONE:
-		return "none"
-	case HANDLE_INGRESS:
-		return "ingress"
-	case HANDLE_ROOT:
-		return "root"
-	default:
-		major, minor := MajorMinor(handle)
-		return fmt.Sprintf("%x:%x", major, minor)
-	}
-}
-
-// PfifoFast is the default qdisc created by the kernel if one has not
-// been defined for the interface
-type PfifoFast struct {
-	QdiscAttrs
-	Bands       uint8
-	PriorityMap [PRIORITY_MAP_LEN]uint8
-}
-
-func (qdisc *PfifoFast) Attrs() *QdiscAttrs {
-	return &qdisc.QdiscAttrs
-}
-
-func (qdisc *PfifoFast) Type() string {
-	return "pfifo_fast"
-}
-
-// Prio is a basic qdisc that works just like PfifoFast
-type Prio struct {
-	QdiscAttrs
-	Bands       uint8
-	PriorityMap [PRIORITY_MAP_LEN]uint8
-}
-
-func NewPrio(attrs QdiscAttrs) *Prio {
-	return &Prio{
-		QdiscAttrs:  attrs,
-		Bands:       3,
-		PriorityMap: [PRIORITY_MAP_LEN]uint8{1, 2, 2, 2, 1, 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1},
-	}
-}
-
-func (qdisc *Prio) Attrs() *QdiscAttrs {
-	return &qdisc.QdiscAttrs
-}
-
-func (qdisc *Prio) Type() string {
-	return "prio"
-}
-
-// Htb is a classful qdisc that rate limits based on tokens
-type Htb struct {
-	QdiscAttrs
-	Version      uint32
-	Rate2Quantum uint32
-	Defcls       uint32
-	Debug        uint32
-	DirectPkts   uint32
-}
-
-func NewHtb(attrs QdiscAttrs) *Htb {
-	return &Htb{
-		QdiscAttrs:   attrs,
-		Version:      3,
-		Defcls:       0,
-		Rate2Quantum: 10,
-		Debug:        0,
-		DirectPkts:   0,
-	}
-}
-
-func (qdisc *Htb) Attrs() *QdiscAttrs {
-	return &qdisc.QdiscAttrs
-}
-
-func (qdisc *Htb) Type() string {
-	return "htb"
-}
-
-// Tbf is a classless qdisc that rate limits based on tokens
-type Tbf struct {
-	QdiscAttrs
-	// TODO: handle 64bit rate properly
-	Rate   uint64
-	Limit  uint32
-	Buffer uint32
-	// TODO: handle other settings
-}
-
-func (qdisc *Tbf) Attrs() *QdiscAttrs {
-	return &qdisc.QdiscAttrs
-}
-
-func (qdisc *Tbf) Type() string {
-	return "tbf"
-}
-
-// Ingress is a qdisc for adding ingress filters
-type Ingress struct {
-	QdiscAttrs
-}
-
-func (qdisc *Ingress) Attrs() *QdiscAttrs {
-	return &qdisc.QdiscAttrs
-}
-
-func (qdisc *Ingress) Type() string {
-	return "ingress"
-}
-
-// GenericQdisc qdiscs represent types that are not currently understood
-// by this netlink library.
-type GenericQdisc struct {
-	QdiscAttrs
-	QdiscType string
-}
-
-func (qdisc *GenericQdisc) Attrs() *QdiscAttrs {
-	return &qdisc.QdiscAttrs
-}
-
-func (qdisc *GenericQdisc) Type() string {
-	return qdisc.QdiscType
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go
deleted file mode 100644
index a16eb99b34..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/qdisc_linux.go
+++ /dev/null
@@ -1,316 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"io/ioutil"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-// QdiscDel will delete a qdisc from the system.
-// Equivalent to: `tc qdisc del $qdisc`
-func QdiscDel(qdisc Qdisc) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_DELQDISC, syscall.NLM_F_ACK)
-	base := qdisc.Attrs()
-	msg := &nl.TcMsg{
-		Family:  nl.FAMILY_ALL,
-		Ifindex: int32(base.LinkIndex),
-		Handle:  base.Handle,
-		Parent:  base.Parent,
-	}
-	req.AddData(msg)
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// QdiscAdd will add a qdisc to the system.
-// Equivalent to: `tc qdisc add $qdisc`
-func QdiscAdd(qdisc Qdisc) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_NEWQDISC, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
-	base := qdisc.Attrs()
-	msg := &nl.TcMsg{
-		Family:  nl.FAMILY_ALL,
-		Ifindex: int32(base.LinkIndex),
-		Handle:  base.Handle,
-		Parent:  base.Parent,
-	}
-	req.AddData(msg)
-	req.AddData(nl.NewRtAttr(nl.TCA_KIND, nl.ZeroTerminated(qdisc.Type())))
-
-	options := nl.NewRtAttr(nl.TCA_OPTIONS, nil)
-	if prio, ok := qdisc.(*Prio); ok {
-		tcmap := nl.TcPrioMap{
-			Bands:   int32(prio.Bands),
-			Priomap: prio.PriorityMap,
-		}
-		options = nl.NewRtAttr(nl.TCA_OPTIONS, tcmap.Serialize())
-	} else if tbf, ok := qdisc.(*Tbf); ok {
-		opt := nl.TcTbfQopt{}
-		// TODO: handle rate > uint32
-		opt.Rate.Rate = uint32(tbf.Rate)
-		opt.Limit = tbf.Limit
-		opt.Buffer = tbf.Buffer
-		nl.NewRtAttrChild(options, nl.TCA_TBF_PARMS, opt.Serialize())
-	} else if htb, ok := qdisc.(*Htb); ok {
-		opt := nl.TcHtbGlob{}
-		opt.Version = htb.Version
-		opt.Rate2Quantum = htb.Rate2Quantum
-		opt.Defcls = htb.Defcls
-		// TODO: Handle Debug properly. For now default to 0
-		opt.Debug = htb.Debug
-		opt.DirectPkts = htb.DirectPkts
-		nl.NewRtAttrChild(options, nl.TCA_HTB_INIT, opt.Serialize())
-		// nl.NewRtAttrChild(options, nl.TCA_HTB_DIRECT_QLEN, opt.Serialize())
-	} else if _, ok := qdisc.(*Ingress); ok {
-		// ingress filters must use the proper handle
-		if msg.Parent != HANDLE_INGRESS {
-			return fmt.Errorf("Ingress filters must set Parent to HANDLE_INGRESS")
-		}
-	}
-	req.AddData(options)
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// QdiscList gets a list of qdiscs in the system.
-// Equivalent to: `tc qdisc show`.
-// The list can be filtered by link.
-func QdiscList(link Link) ([]Qdisc, error) {
-	req := nl.NewNetlinkRequest(syscall.RTM_GETQDISC, syscall.NLM_F_DUMP)
-	index := int32(0)
-	if link != nil {
-		base := link.Attrs()
-		ensureIndex(base)
-		index = int32(base.Index)
-	}
-	msg := &nl.TcMsg{
-		Family:  nl.FAMILY_ALL,
-		Ifindex: index,
-	}
-	req.AddData(msg)
-
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWQDISC)
-	if err != nil {
-		return nil, err
-	}
-
-	var res []Qdisc
-	for _, m := range msgs {
-		msg := nl.DeserializeTcMsg(m)
-
-		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
-		if err != nil {
-			return nil, err
-		}
-
-		// skip qdiscs from other interfaces
-		if link != nil && msg.Ifindex != index {
-			continue
-		}
-
-		base := QdiscAttrs{
-			LinkIndex: int(msg.Ifindex),
-			Handle:    msg.Handle,
-			Parent:    msg.Parent,
-			Refcnt:    msg.Info,
-		}
-		var qdisc Qdisc
-		qdiscType := ""
-		for _, attr := range attrs {
-			switch attr.Attr.Type {
-			case nl.TCA_KIND:
-				qdiscType = string(attr.Value[:len(attr.Value)-1])
-				switch qdiscType {
-				case "pfifo_fast":
-					qdisc = &PfifoFast{}
-				case "prio":
-					qdisc = &Prio{}
-				case "tbf":
-					qdisc = &Tbf{}
-				case "ingress":
-					qdisc = &Ingress{}
-				case "htb":
-					qdisc = &Htb{}
-				default:
-					qdisc = &GenericQdisc{QdiscType: qdiscType}
-				}
-			case nl.TCA_OPTIONS:
-				switch qdiscType {
-				case "pfifo_fast":
-					// pfifo returns TcPrioMap directly without wrapping it in rtattr
-					if err := parsePfifoFastData(qdisc, attr.Value); err != nil {
-						return nil, err
-					}
-				case "prio":
-					// prio returns TcPrioMap directly without wrapping it in rtattr
-					if err := parsePrioData(qdisc, attr.Value); err != nil {
-						return nil, err
-					}
-				case "tbf":
-					data, err := nl.ParseRouteAttr(attr.Value)
-					if err != nil {
-						return nil, err
-					}
-					if err := parseTbfData(qdisc, data); err != nil {
-						return nil, err
-					}
-				case "htb":
-					data, err := nl.ParseRouteAttr(attr.Value)
-					if err != nil {
-						return nil, err
-					}
-					if err := parseHtbData(qdisc, data); err != nil {
-						return nil, err
-					}
-
-					// no options for ingress
-				}
-			}
-		}
-		*qdisc.Attrs() = base
-		res = append(res, qdisc)
-	}
-
-	return res, nil
-}
-
-func parsePfifoFastData(qdisc Qdisc, value []byte) error {
-	pfifo := qdisc.(*PfifoFast)
-	tcmap := nl.DeserializeTcPrioMap(value)
-	pfifo.PriorityMap = tcmap.Priomap
-	pfifo.Bands = uint8(tcmap.Bands)
-	return nil
-}
-
-func parsePrioData(qdisc Qdisc, value []byte) error {
-	prio := qdisc.(*Prio)
-	tcmap := nl.DeserializeTcPrioMap(value)
-	prio.PriorityMap = tcmap.Priomap
-	prio.Bands = uint8(tcmap.Bands)
-	return nil
-}
-
-func parseHtbData(qdisc Qdisc, data []syscall.NetlinkRouteAttr) error {
-	native = nl.NativeEndian()
-	htb := qdisc.(*Htb)
-	for _, datum := range data {
-		switch datum.Attr.Type {
-		case nl.TCA_HTB_INIT:
-			opt := nl.DeserializeTcHtbGlob(datum.Value)
-			htb.Version = opt.Version
-			htb.Rate2Quantum = opt.Rate2Quantum
-			htb.Defcls = opt.Defcls
-			htb.Debug = opt.Debug
-			htb.DirectPkts = opt.DirectPkts
-		case nl.TCA_HTB_DIRECT_QLEN:
-			// TODO
-			//htb.DirectQlen = native.uint32(datum.Value)
-		}
-	}
-	return nil
-}
-func parseTbfData(qdisc Qdisc, data []syscall.NetlinkRouteAttr) error {
-	native = nl.NativeEndian()
-	tbf := qdisc.(*Tbf)
-	for _, datum := range data {
-		switch datum.Attr.Type {
-		case nl.TCA_TBF_PARMS:
-			opt := nl.DeserializeTcTbfQopt(datum.Value)
-			tbf.Rate = uint64(opt.Rate.Rate)
-			tbf.Limit = opt.Limit
-			tbf.Buffer = opt.Buffer
-		case nl.TCA_TBF_RATE64:
-			tbf.Rate = native.Uint64(datum.Value[0:4])
-		}
-	}
-	return nil
-}
-
-const (
-	TIME_UNITS_PER_SEC = 1000000
-)
-
-var (
-	tickInUsec  float64 = 0.0
-	clockFactor float64 = 0.0
-	hz          float64 = 0.0
-)
-
-func initClock() {
-	data, err := ioutil.ReadFile("/proc/net/psched")
-	if err != nil {
-		return
-	}
-	parts := strings.Split(strings.TrimSpace(string(data)), " ")
-	if len(parts) < 3 {
-		return
-	}
-	var vals [3]uint64
-	for i := range vals {
-		val, err := strconv.ParseUint(parts[i], 16, 32)
-		if err != nil {
-			return
-		}
-		vals[i] = val
-	}
-	// compatibility
-	if vals[2] == 1000000000 {
-		vals[0] = vals[1]
-	}
-	clockFactor = float64(vals[2]) / TIME_UNITS_PER_SEC
-	tickInUsec = float64(vals[0]) / float64(vals[1]) * clockFactor
-	hz = float64(vals[0])
-}
-
-func TickInUsec() float64 {
-	if tickInUsec == 0.0 {
-		initClock()
-	}
-	return tickInUsec
-}
-
-func ClockFactor() float64 {
-	if clockFactor == 0.0 {
-		initClock()
-	}
-	return clockFactor
-}
-
-func Hz() float64 {
-	if hz == 0.0 {
-		initClock()
-	}
-	return hz
-}
-
-func time2Tick(time uint32) uint32 {
-	return uint32(float64(time) * TickInUsec())
-}
-
-func tick2Time(tick uint32) uint32 {
-	return uint32(float64(tick) / TickInUsec())
-}
-
-func time2Ktime(time uint32) uint32 {
-	return uint32(float64(time) * ClockFactor())
-}
-
-func ktime2Time(ktime uint32) uint32 {
-	return uint32(float64(ktime) / ClockFactor())
-}
-
-func burst(rate uint64, buffer uint32) uint32 {
-	return uint32(float64(rate) * float64(tick2Time(buffer)) / TIME_UNITS_PER_SEC)
-}
-
-func latency(rate uint64, limit, buffer uint32) float64 {
-	return TIME_UNITS_PER_SEC*(float64(limit)/float64(rate)) - float64(tick2Time(buffer))
-}
-
-func Xmittime(rate uint64, size uint32) float64 {
-	return TickInUsec() * TIME_UNITS_PER_SEC * (float64(size) / float64(rate))
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/route.go
deleted file mode 100644
index 578270fb98..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/route.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"net"
-	"syscall"
-)
-
-// Scope is an enum representing a route scope.
-type Scope uint8
-
-const (
-	SCOPE_UNIVERSE Scope = syscall.RT_SCOPE_UNIVERSE
-	SCOPE_SITE     Scope = syscall.RT_SCOPE_SITE
-	SCOPE_LINK     Scope = syscall.RT_SCOPE_LINK
-	SCOPE_HOST     Scope = syscall.RT_SCOPE_HOST
-	SCOPE_NOWHERE  Scope = syscall.RT_SCOPE_NOWHERE
-)
-
-// Route represents a netlink route. A route is associated with a link,
-// has a destination network, an optional source ip, and optional
-// gateway. Advanced route parameters and non-main routing tables are
-// currently not supported.
-type Route struct {
-	LinkIndex int
-	Scope     Scope
-	Dst       *net.IPNet
-	Src       net.IP
-	Gw        net.IP
-}
-
-func (r Route) String() string {
-	return fmt.Sprintf("{Ifindex: %d Dst: %s Src: %s Gw: %s}", r.LinkIndex, r.Dst,
-		r.Src, r.Gw)
-}
-
-// RouteUpdate is sent when a route changes - type is RTM_NEWROUTE or RTM_DELROUTE
-type RouteUpdate struct {
-	Type uint16
-	Route
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
deleted file mode 100644
index 693e6cbc95..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
+++ /dev/null
@@ -1,249 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"net"
-	"syscall"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-// RtAttr is shared so it is in netlink_linux.go
-
-// RouteAdd will add a route to the system.
-// Equivalent to: `ip route add $route`
-func RouteAdd(route *Route) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_NEWROUTE, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
-	return routeHandle(route, req, nl.NewRtMsg())
-}
-
-// RouteDel will delete a route from the system.
-// Equivalent to: `ip route del $route`
-func RouteDel(route *Route) error {
-	req := nl.NewNetlinkRequest(syscall.RTM_DELROUTE, syscall.NLM_F_ACK)
-	return routeHandle(route, req, nl.NewRtDelMsg())
-}
-
-func routeHandle(route *Route, req *nl.NetlinkRequest, msg *nl.RtMsg) error {
-	if (route.Dst == nil || route.Dst.IP == nil) && route.Src == nil && route.Gw == nil {
-		return fmt.Errorf("one of Dst.IP, Src, or Gw must not be nil")
-	}
-
-	msg.Scope = uint8(route.Scope)
-	family := -1
-	var rtAttrs []*nl.RtAttr
-
-	if route.Dst != nil && route.Dst.IP != nil {
-		dstLen, _ := route.Dst.Mask.Size()
-		msg.Dst_len = uint8(dstLen)
-		dstFamily := nl.GetIPFamily(route.Dst.IP)
-		family = dstFamily
-		var dstData []byte
-		if dstFamily == FAMILY_V4 {
-			dstData = route.Dst.IP.To4()
-		} else {
-			dstData = route.Dst.IP.To16()
-		}
-		rtAttrs = append(rtAttrs, nl.NewRtAttr(syscall.RTA_DST, dstData))
-	}
-
-	if route.Src != nil {
-		srcFamily := nl.GetIPFamily(route.Src)
-		if family != -1 && family != srcFamily {
-			return fmt.Errorf("source and destination ip are not the same IP family")
-		}
-		family = srcFamily
-		var srcData []byte
-		if srcFamily == FAMILY_V4 {
-			srcData = route.Src.To4()
-		} else {
-			srcData = route.Src.To16()
-		}
-		// The commonly used src ip for routes is actually PREFSRC
-		rtAttrs = append(rtAttrs, nl.NewRtAttr(syscall.RTA_PREFSRC, srcData))
-	}
-
-	if route.Gw != nil {
-		gwFamily := nl.GetIPFamily(route.Gw)
-		if family != -1 && family != gwFamily {
-			return fmt.Errorf("gateway, source, and destination ip are not the same IP family")
-		}
-		family = gwFamily
-		var gwData []byte
-		if gwFamily == FAMILY_V4 {
-			gwData = route.Gw.To4()
-		} else {
-			gwData = route.Gw.To16()
-		}
-		rtAttrs = append(rtAttrs, nl.NewRtAttr(syscall.RTA_GATEWAY, gwData))
-	}
-
-	msg.Family = uint8(family)
-
-	req.AddData(msg)
-	for _, attr := range rtAttrs {
-		req.AddData(attr)
-	}
-
-	var (
-		b      = make([]byte, 4)
-		native = nl.NativeEndian()
-	)
-	native.PutUint32(b, uint32(route.LinkIndex))
-
-	req.AddData(nl.NewRtAttr(syscall.RTA_OIF, b))
-
-	_, err := req.Execute(syscall.NETLINK_ROUTE, 0)
-	return err
-}
-
-// RouteList gets a list of routes in the system.
-// Equivalent to: `ip route show`.
-// The list can be filtered by link and ip family.
-func RouteList(link Link, family int) ([]Route, error) {
-	req := nl.NewNetlinkRequest(syscall.RTM_GETROUTE, syscall.NLM_F_DUMP)
-	msg := nl.NewIfInfomsg(family)
-	req.AddData(msg)
-
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWROUTE)
-	if err != nil {
-		return nil, err
-	}
-
-	index := 0
-	if link != nil {
-		base := link.Attrs()
-		ensureIndex(base)
-		index = base.Index
-	}
-
-	var res []Route
-	for _, m := range msgs {
-		msg := nl.DeserializeRtMsg(m)
-
-		if msg.Flags&syscall.RTM_F_CLONED != 0 {
-			// Ignore cloned routes
-			continue
-		}
-
-		if msg.Table != syscall.RT_TABLE_MAIN {
-			// Ignore non-main tables
-			continue
-		}
-
-		route, err := deserializeRoute(m)
-		if err != nil {
-			return nil, err
-		}
-
-		if link != nil && route.LinkIndex != index {
-			// Ignore routes from other interfaces
-			continue
-		}
-		res = append(res, route)
-	}
-
-	return res, nil
-}
-
-// deserializeRoute decodes a binary netlink message into a Route struct
-func deserializeRoute(m []byte) (Route, error) {
-	route := Route{}
-	msg := nl.DeserializeRtMsg(m)
-	attrs, err := nl.ParseRouteAttr(m[msg.Len():])
-	if err != nil {
-		return route, err
-	}
-	route.Scope = Scope(msg.Scope)
-
-	native := nl.NativeEndian()
-	for _, attr := range attrs {
-		switch attr.Attr.Type {
-		case syscall.RTA_GATEWAY:
-			route.Gw = net.IP(attr.Value)
-		case syscall.RTA_PREFSRC:
-			route.Src = net.IP(attr.Value)
-		case syscall.RTA_DST:
-			route.Dst = &net.IPNet{
-				IP:   attr.Value,
-				Mask: net.CIDRMask(int(msg.Dst_len), 8*len(attr.Value)),
-			}
-		case syscall.RTA_OIF:
-			routeIndex := int(native.Uint32(attr.Value[0:4]))
-			route.LinkIndex = routeIndex
-		}
-	}
-	return route, nil
-}
-
-// RouteGet gets a route to a specific destination from the host system.
-// Equivalent to: 'ip route get'.
-func RouteGet(destination net.IP) ([]Route, error) {
-	req := nl.NewNetlinkRequest(syscall.RTM_GETROUTE, syscall.NLM_F_REQUEST)
-	family := nl.GetIPFamily(destination)
-	var destinationData []byte
-	var bitlen uint8
-	if family == FAMILY_V4 {
-		destinationData = destination.To4()
-		bitlen = 32
-	} else {
-		destinationData = destination.To16()
-		bitlen = 128
-	}
-	msg := &nl.RtMsg{}
-	msg.Family = uint8(family)
-	msg.Dst_len = bitlen
-	req.AddData(msg)
-
-	rtaDst := nl.NewRtAttr(syscall.RTA_DST, destinationData)
-	req.AddData(rtaDst)
-
-	msgs, err := req.Execute(syscall.NETLINK_ROUTE, syscall.RTM_NEWROUTE)
-	if err != nil {
-		return nil, err
-	}
-
-	var res []Route
-	for _, m := range msgs {
-		route, err := deserializeRoute(m)
-		if err != nil {
-			return nil, err
-		}
-		res = append(res, route)
-	}
-	return res, nil
-
-}
-
-// RouteSubscribe takes a chan down which notifications will be sent
-// when routes are added or deleted. Close the 'done' chan to stop subscription.
-func RouteSubscribe(ch chan<- RouteUpdate, done <-chan struct{}) error {
-	s, err := nl.Subscribe(syscall.NETLINK_ROUTE, syscall.RTNLGRP_IPV4_ROUTE, syscall.RTNLGRP_IPV6_ROUTE)
-	if err != nil {
-		return err
-	}
-	if done != nil {
-		go func() {
-			<-done
-			s.Close()
-		}()
-	}
-	go func() {
-		defer close(ch)
-		for {
-			msgs, err := s.Receive()
-			if err != nil {
-				return
-			}
-			for _, m := range msgs {
-				route, err := deserializeRoute(m.Data)
-				if err != nil {
-					return
-				}
-				ch <- RouteUpdate{Type: m.Header.Type, Route: route}
-			}
-		}
-	}()
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go
deleted file mode 100644
index 621ffb6c68..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"syscall"
-)
-
-// Proto is an enum representing an ipsec protocol.
-type Proto uint8
-
-const (
-	XFRM_PROTO_ROUTE2    Proto = syscall.IPPROTO_ROUTING
-	XFRM_PROTO_ESP       Proto = syscall.IPPROTO_ESP
-	XFRM_PROTO_AH        Proto = syscall.IPPROTO_AH
-	XFRM_PROTO_HAO       Proto = syscall.IPPROTO_DSTOPTS
-	XFRM_PROTO_COMP      Proto = syscall.IPPROTO_COMP
-	XFRM_PROTO_IPSEC_ANY Proto = syscall.IPPROTO_RAW
-)
-
-func (p Proto) String() string {
-	switch p {
-	case XFRM_PROTO_ROUTE2:
-		return "route2"
-	case XFRM_PROTO_ESP:
-		return "esp"
-	case XFRM_PROTO_AH:
-		return "ah"
-	case XFRM_PROTO_HAO:
-		return "hao"
-	case XFRM_PROTO_COMP:
-		return "comp"
-	case XFRM_PROTO_IPSEC_ANY:
-		return "ipsec-any"
-	}
-	return fmt.Sprintf("%d", p)
-}
-
-// Mode is an enum representing an ipsec transport.
-type Mode uint8
-
-const (
-	XFRM_MODE_TRANSPORT Mode = iota
-	XFRM_MODE_TUNNEL
-	XFRM_MODE_ROUTEOPTIMIZATION
-	XFRM_MODE_IN_TRIGGER
-	XFRM_MODE_BEET
-	XFRM_MODE_MAX
-)
-
-func (m Mode) String() string {
-	switch m {
-	case XFRM_MODE_TRANSPORT:
-		return "transport"
-	case XFRM_MODE_TUNNEL:
-		return "tunnel"
-	case XFRM_MODE_ROUTEOPTIMIZATION:
-		return "ro"
-	case XFRM_MODE_IN_TRIGGER:
-		return "in_trigger"
-	case XFRM_MODE_BEET:
-		return "beet"
-	}
-	return fmt.Sprintf("%d", m)
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go
deleted file mode 100644
index d85c65d2d2..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"net"
-)
-
-// Dir is an enum representing an ipsec template direction.
-type Dir uint8
-
-const (
-	XFRM_DIR_IN Dir = iota
-	XFRM_DIR_OUT
-	XFRM_DIR_FWD
-	XFRM_SOCKET_IN
-	XFRM_SOCKET_OUT
-	XFRM_SOCKET_FWD
-)
-
-func (d Dir) String() string {
-	switch d {
-	case XFRM_DIR_IN:
-		return "dir in"
-	case XFRM_DIR_OUT:
-		return "dir out"
-	case XFRM_DIR_FWD:
-		return "dir fwd"
-	case XFRM_SOCKET_IN:
-		return "socket in"
-	case XFRM_SOCKET_OUT:
-		return "socket out"
-	case XFRM_SOCKET_FWD:
-		return "socket fwd"
-	}
-	return fmt.Sprintf("socket %d", d-XFRM_SOCKET_IN)
-}
-
-// XfrmPolicyTmpl encapsulates a rule for the base addresses of an ipsec
-// policy. These rules are matched with XfrmState to determine encryption
-// and authentication algorithms.
-type XfrmPolicyTmpl struct {
-	Dst   net.IP
-	Src   net.IP
-	Proto Proto
-	Mode  Mode
-	Reqid int
-}
-
-// XfrmPolicy represents an ipsec policy. It represents the overlay network
-// and has a list of XfrmPolicyTmpls representing the base addresses of
-// the policy.
-type XfrmPolicy struct {
-	Dst      *net.IPNet
-	Src      *net.IPNet
-	Dir      Dir
-	Priority int
-	Index    int
-	Tmpls    []XfrmPolicyTmpl
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
deleted file mode 100644
index 2daf6dc8b3..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
+++ /dev/null
@@ -1,127 +0,0 @@
-package netlink
-
-import (
-	"syscall"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-func selFromPolicy(sel *nl.XfrmSelector, policy *XfrmPolicy) {
-	sel.Family = uint16(nl.GetIPFamily(policy.Dst.IP))
-	sel.Daddr.FromIP(policy.Dst.IP)
-	sel.Saddr.FromIP(policy.Src.IP)
-	prefixlenD, _ := policy.Dst.Mask.Size()
-	sel.PrefixlenD = uint8(prefixlenD)
-	prefixlenS, _ := policy.Src.Mask.Size()
-	sel.PrefixlenS = uint8(prefixlenS)
-}
-
-// XfrmPolicyAdd will add an xfrm policy to the system.
-// Equivalent to: `ip xfrm policy add $policy`
-func XfrmPolicyAdd(policy *XfrmPolicy) error {
-	req := nl.NewNetlinkRequest(nl.XFRM_MSG_NEWPOLICY, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
-
-	msg := &nl.XfrmUserpolicyInfo{}
-	selFromPolicy(&msg.Sel, policy)
-	msg.Priority = uint32(policy.Priority)
-	msg.Index = uint32(policy.Index)
-	msg.Dir = uint8(policy.Dir)
-	msg.Lft.SoftByteLimit = nl.XFRM_INF
-	msg.Lft.HardByteLimit = nl.XFRM_INF
-	msg.Lft.SoftPacketLimit = nl.XFRM_INF
-	msg.Lft.HardPacketLimit = nl.XFRM_INF
-	req.AddData(msg)
-
-	tmplData := make([]byte, nl.SizeofXfrmUserTmpl*len(policy.Tmpls))
-	for i, tmpl := range policy.Tmpls {
-		start := i * nl.SizeofXfrmUserTmpl
-		userTmpl := nl.DeserializeXfrmUserTmpl(tmplData[start : start+nl.SizeofXfrmUserTmpl])
-		userTmpl.XfrmId.Daddr.FromIP(tmpl.Dst)
-		userTmpl.Saddr.FromIP(tmpl.Src)
-		userTmpl.XfrmId.Proto = uint8(tmpl.Proto)
-		userTmpl.Mode = uint8(tmpl.Mode)
-		userTmpl.Reqid = uint32(tmpl.Reqid)
-		userTmpl.Aalgos = ^uint32(0)
-		userTmpl.Ealgos = ^uint32(0)
-		userTmpl.Calgos = ^uint32(0)
-	}
-	if len(tmplData) > 0 {
-		tmpls := nl.NewRtAttr(nl.XFRMA_TMPL, tmplData)
-		req.AddData(tmpls)
-	}
-
-	_, err := req.Execute(syscall.NETLINK_XFRM, 0)
-	return err
-}
-
-// XfrmPolicyDel will delete an xfrm policy from the system. Note that
-// the Tmpls are ignored when matching the policy to delete.
-// Equivalent to: `ip xfrm policy del $policy`
-func XfrmPolicyDel(policy *XfrmPolicy) error {
-	req := nl.NewNetlinkRequest(nl.XFRM_MSG_DELPOLICY, syscall.NLM_F_ACK)
-
-	msg := &nl.XfrmUserpolicyId{}
-	selFromPolicy(&msg.Sel, policy)
-	msg.Index = uint32(policy.Index)
-	msg.Dir = uint8(policy.Dir)
-	req.AddData(msg)
-
-	_, err := req.Execute(syscall.NETLINK_XFRM, 0)
-	return err
-}
-
-// XfrmPolicyList gets a list of xfrm policies in the system.
-// Equivalent to: `ip xfrm policy show`.
-// The list can be filtered by ip family.
-func XfrmPolicyList(family int) ([]XfrmPolicy, error) {
-	req := nl.NewNetlinkRequest(nl.XFRM_MSG_GETPOLICY, syscall.NLM_F_DUMP)
-
-	msg := nl.NewIfInfomsg(family)
-	req.AddData(msg)
-
-	msgs, err := req.Execute(syscall.NETLINK_XFRM, nl.XFRM_MSG_NEWPOLICY)
-	if err != nil {
-		return nil, err
-	}
-
-	var res []XfrmPolicy
-	for _, m := range msgs {
-		msg := nl.DeserializeXfrmUserpolicyInfo(m)
-
-		if family != FAMILY_ALL && family != int(msg.Sel.Family) {
-			continue
-		}
-
-		var policy XfrmPolicy
-
-		policy.Dst = msg.Sel.Daddr.ToIPNet(msg.Sel.PrefixlenD)
-		policy.Src = msg.Sel.Saddr.ToIPNet(msg.Sel.PrefixlenS)
-		policy.Priority = int(msg.Priority)
-		policy.Index = int(msg.Index)
-		policy.Dir = Dir(msg.Dir)
-
-		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
-		if err != nil {
-			return nil, err
-		}
-
-		for _, attr := range attrs {
-			switch attr.Attr.Type {
-			case nl.XFRMA_TMPL:
-				max := len(attr.Value)
-				for i := 0; i < max; i += nl.SizeofXfrmUserTmpl {
-					var resTmpl XfrmPolicyTmpl
-					tmpl := nl.DeserializeXfrmUserTmpl(attr.Value[i : i+nl.SizeofXfrmUserTmpl])
-					resTmpl.Dst = tmpl.XfrmId.Daddr.ToIP()
-					resTmpl.Src = tmpl.Saddr.ToIP()
-					resTmpl.Proto = Proto(tmpl.XfrmId.Proto)
-					resTmpl.Mode = Mode(tmpl.Mode)
-					resTmpl.Reqid = int(tmpl.Reqid)
-					policy.Tmpls = append(policy.Tmpls, resTmpl)
-				}
-			}
-		}
-		res = append(res, policy)
-	}
-	return res, nil
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go
deleted file mode 100644
index 5b8f2df708..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package netlink
-
-import (
-	"net"
-)
-
-// XfrmStateAlgo represents the algorithm to use for the ipsec encryption.
-type XfrmStateAlgo struct {
-	Name        string
-	Key         []byte
-	TruncateLen int // Auth only
-}
-
-// EncapType is an enum representing an ipsec template direction.
-type EncapType uint8
-
-const (
-	XFRM_ENCAP_ESPINUDP_NONIKE EncapType = iota + 1
-	XFRM_ENCAP_ESPINUDP
-)
-
-func (e EncapType) String() string {
-	switch e {
-	case XFRM_ENCAP_ESPINUDP_NONIKE:
-		return "espinudp-nonike"
-	case XFRM_ENCAP_ESPINUDP:
-		return "espinudp"
-	}
-	return "unknown"
-}
-
-// XfrmEncap represents the encapsulation to use for the ipsec encryption.
-type XfrmStateEncap struct {
-	Type            EncapType
-	SrcPort         int
-	DstPort         int
-	OriginalAddress net.IP
-}
-
-// XfrmState represents the state of an ipsec policy. It optionally
-// contains an XfrmStateAlgo for encryption and one for authentication.
-type XfrmState struct {
-	Dst          net.IP
-	Src          net.IP
-	Proto        Proto
-	Mode         Mode
-	Spi          int
-	Reqid        int
-	ReplayWindow int
-	Auth         *XfrmStateAlgo
-	Crypt        *XfrmStateAlgo
-	Encap        *XfrmStateEncap
-}
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
deleted file mode 100644
index 5f44ec8525..0000000000
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
+++ /dev/null
@@ -1,181 +0,0 @@
-package netlink
-
-import (
-	"fmt"
-	"syscall"
-
-	"github.com/vishvananda/netlink/nl"
-)
-
-func writeStateAlgo(a *XfrmStateAlgo) []byte {
-	algo := nl.XfrmAlgo{
-		AlgKeyLen: uint32(len(a.Key) * 8),
-		AlgKey:    a.Key,
-	}
-	end := len(a.Name)
-	if end > 64 {
-		end = 64
-	}
-	copy(algo.AlgName[:end], a.Name)
-	return algo.Serialize()
-}
-
-func writeStateAlgoAuth(a *XfrmStateAlgo) []byte {
-	algo := nl.XfrmAlgoAuth{
-		AlgKeyLen:   uint32(len(a.Key) * 8),
-		AlgTruncLen: uint32(a.TruncateLen),
-		AlgKey:      a.Key,
-	}
-	end := len(a.Name)
-	if end > 64 {
-		end = 64
-	}
-	copy(algo.AlgName[:end], a.Name)
-	return algo.Serialize()
-}
-
-// XfrmStateAdd will add an xfrm state to the system.
-// Equivalent to: `ip xfrm state add $state`
-func XfrmStateAdd(state *XfrmState) error {
-	// A state with spi 0 can't be deleted so don't allow it to be set
-	if state.Spi == 0 {
-		return fmt.Errorf("Spi must be set when adding xfrm state.")
-	}
-	req := nl.NewNetlinkRequest(nl.XFRM_MSG_NEWSA, syscall.NLM_F_CREATE|syscall.NLM_F_EXCL|syscall.NLM_F_ACK)
-
-	msg := &nl.XfrmUsersaInfo{}
-	msg.Family = uint16(nl.GetIPFamily(state.Dst))
-	msg.Id.Daddr.FromIP(state.Dst)
-	msg.Saddr.FromIP(state.Src)
-	msg.Id.Proto = uint8(state.Proto)
-	msg.Mode = uint8(state.Mode)
-	msg.Id.Spi = nl.Swap32(uint32(state.Spi))
-	msg.Reqid = uint32(state.Reqid)
-	msg.ReplayWindow = uint8(state.ReplayWindow)
-	msg.Lft.SoftByteLimit = nl.XFRM_INF
-	msg.Lft.HardByteLimit = nl.XFRM_INF
-	msg.Lft.SoftPacketLimit = nl.XFRM_INF
-	msg.Lft.HardPacketLimit = nl.XFRM_INF
-	req.AddData(msg)
-
-	if state.Auth != nil {
-		out := nl.NewRtAttr(nl.XFRMA_ALG_AUTH_TRUNC, writeStateAlgoAuth(state.Auth))
-		req.AddData(out)
-	}
-	if state.Crypt != nil {
-		out := nl.NewRtAttr(nl.XFRMA_ALG_CRYPT, writeStateAlgo(state.Crypt))
-		req.AddData(out)
-	}
-	if state.Encap != nil {
-		encapData := make([]byte, nl.SizeofXfrmEncapTmpl)
-		encap := nl.DeserializeXfrmEncapTmpl(encapData)
-		encap.EncapType = uint16(state.Encap.Type)
-		encap.EncapSport = nl.Swap16(uint16(state.Encap.SrcPort))
-		encap.EncapDport = nl.Swap16(uint16(state.Encap.DstPort))
-		encap.EncapOa.FromIP(state.Encap.OriginalAddress)
-		out := nl.NewRtAttr(nl.XFRMA_ENCAP, encapData)
-		req.AddData(out)
-	}
-
-	_, err := req.Execute(syscall.NETLINK_XFRM, 0)
-	return err
-}
-
-// XfrmStateDel will delete an xfrm state from the system. Note that
-// the Algos are ignored when matching the state to delete.
-// Equivalent to: `ip xfrm state del $state`
-func XfrmStateDel(state *XfrmState) error {
-	req := nl.NewNetlinkRequest(nl.XFRM_MSG_DELSA, syscall.NLM_F_ACK)
-
-	msg := &nl.XfrmUsersaId{}
-	msg.Daddr.FromIP(state.Dst)
-	msg.Family = uint16(nl.GetIPFamily(state.Dst))
-	msg.Proto = uint8(state.Proto)
-	msg.Spi = nl.Swap32(uint32(state.Spi))
-	req.AddData(msg)
-
-	saddr := nl.XfrmAddress{}
-	saddr.FromIP(state.Src)
-	srcdata := nl.NewRtAttr(nl.XFRMA_SRCADDR, saddr.Serialize())
-
-	req.AddData(srcdata)
-
-	_, err := req.Execute(syscall.NETLINK_XFRM, 0)
-	return err
-}
-
-// XfrmStateList gets a list of xfrm states in the system.
-// Equivalent to: `ip xfrm state show`.
-// The list can be filtered by ip family.
-func XfrmStateList(family int) ([]XfrmState, error) {
-	req := nl.NewNetlinkRequest(nl.XFRM_MSG_GETSA, syscall.NLM_F_DUMP)
-
-	msg := nl.NewIfInfomsg(family)
-	req.AddData(msg)
-
-	msgs, err := req.Execute(syscall.NETLINK_XFRM, nl.XFRM_MSG_NEWSA)
-	if err != nil {
-		return nil, err
-	}
-
-	var res []XfrmState
-	for _, m := range msgs {
-		msg := nl.DeserializeXfrmUsersaInfo(m)
-
-		if family != FAMILY_ALL && family != int(msg.Family) {
-			continue
-		}
-
-		var state XfrmState
-
-		state.Dst = msg.Id.Daddr.ToIP()
-		state.Src = msg.Saddr.ToIP()
-		state.Proto = Proto(msg.Id.Proto)
-		state.Mode = Mode(msg.Mode)
-		state.Spi = int(nl.Swap32(msg.Id.Spi))
-		state.Reqid = int(msg.Reqid)
-		state.ReplayWindow = int(msg.ReplayWindow)
-
-		attrs, err := nl.ParseRouteAttr(m[msg.Len():])
-		if err != nil {
-			return nil, err
-		}
-
-		for _, attr := range attrs {
-			switch attr.Attr.Type {
-			case nl.XFRMA_ALG_AUTH, nl.XFRMA_ALG_CRYPT:
-				var resAlgo *XfrmStateAlgo
-				if attr.Attr.Type == nl.XFRMA_ALG_AUTH {
-					if state.Auth == nil {
-						state.Auth = new(XfrmStateAlgo)
-					}
-					resAlgo = state.Auth
-				} else {
-					state.Crypt = new(XfrmStateAlgo)
-					resAlgo = state.Crypt
-				}
-				algo := nl.DeserializeXfrmAlgo(attr.Value[:])
-				(*resAlgo).Name = nl.BytesToString(algo.AlgName[:])
-				(*resAlgo).Key = algo.AlgKey
-			case nl.XFRMA_ALG_AUTH_TRUNC:
-				if state.Auth == nil {
-					state.Auth = new(XfrmStateAlgo)
-				}
-				algo := nl.DeserializeXfrmAlgoAuth(attr.Value[:])
-				state.Auth.Name = nl.BytesToString(algo.AlgName[:])
-				state.Auth.Key = algo.AlgKey
-				state.Auth.TruncateLen = int(algo.AlgTruncLen)
-			case nl.XFRMA_ENCAP:
-				encap := nl.DeserializeXfrmEncapTmpl(attr.Value[:])
-				state.Encap = new(XfrmStateEncap)
-				state.Encap.Type = EncapType(encap.EncapType)
-				state.Encap.SrcPort = int(nl.Swap16(encap.EncapSport))
-				state.Encap.DstPort = int(nl.Swap16(encap.EncapDport))
-				state.Encap.OriginalAddress = encap.EncapOa.ToIP()
-			}
-
-		}
-		res = append(res, state)
-	}
-	return res, nil
-}
diff --git a/Godeps/_workspace/src/go4.org/LICENSE b/Godeps/_workspace/src/go4.org/LICENSE
deleted file mode 100644
index 8f71f43fee..0000000000
--- a/Godeps/_workspace/src/go4.org/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/Godeps/_workspace/src/go4.org/errorutil/highlight.go b/Godeps/_workspace/src/go4.org/errorutil/highlight.go
deleted file mode 100644
index aace6a46cc..0000000000
--- a/Godeps/_workspace/src/go4.org/errorutil/highlight.go
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright 2011 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package errorutil helps make better error messages.
-package errorutil
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"strings"
-)
-
-// HighlightBytePosition takes a reader and the location in bytes of a parse
-// error (for instance, from json.SyntaxError.Offset) and returns the line, column,
-// and pretty-printed context around the error with an arrow indicating the exact
-// position of the syntax error.
-func HighlightBytePosition(f io.Reader, pos int64) (line, col int, highlight string) {
-	line = 1
-	br := bufio.NewReader(f)
-	lastLine := ""
-	thisLine := new(bytes.Buffer)
-	for n := int64(0); n < pos; n++ {
-		b, err := br.ReadByte()
-		if err != nil {
-			break
-		}
-		if b == '\n' {
-			lastLine = thisLine.String()
-			thisLine.Reset()
-			line++
-			col = 1
-		} else {
-			col++
-			thisLine.WriteByte(b)
-		}
-	}
-	if line > 1 {
-		highlight += fmt.Sprintf("%5d: %s\n", line-1, lastLine)
-	}
-	highlight += fmt.Sprintf("%5d: %s\n", line, thisLine.String())
-	highlight += fmt.Sprintf("%s^\n", strings.Repeat(" ", col+5))
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/LICENSE b/Godeps/_workspace/src/golang.org/x/crypto/LICENSE
deleted file mode 100644
index 6a66aea5ea..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/PATENTS b/Godeps/_workspace/src/golang.org/x/crypto/PATENTS
deleted file mode 100644
index 733099041f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/cast5/cast5.go b/Godeps/_workspace/src/golang.org/x/crypto/cast5/cast5.go
deleted file mode 100644
index 8c1b299bf2..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/cast5/cast5.go
+++ /dev/null
@@ -1,526 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cast5 implements CAST5, as defined in RFC 2144. CAST5 is a common
-// OpenPGP cipher.
-package cast5
-
-import "errors"
-
-const BlockSize = 8
-const KeySize = 16
-
-type Cipher struct {
-	masking [16]uint32
-	rotate  [16]uint8
-}
-
-func NewCipher(key []byte) (c *Cipher, err error) {
-	if len(key) != KeySize {
-		return nil, errors.New("CAST5: keys must be 16 bytes")
-	}
-
-	c = new(Cipher)
-	c.keySchedule(key)
-	return
-}
-
-func (c *Cipher) BlockSize() int {
-	return BlockSize
-}
-
-func (c *Cipher) Encrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-
-	l, r = r, l^f1(r, c.masking[0], c.rotate[0])
-	l, r = r, l^f2(r, c.masking[1], c.rotate[1])
-	l, r = r, l^f3(r, c.masking[2], c.rotate[2])
-	l, r = r, l^f1(r, c.masking[3], c.rotate[3])
-
-	l, r = r, l^f2(r, c.masking[4], c.rotate[4])
-	l, r = r, l^f3(r, c.masking[5], c.rotate[5])
-	l, r = r, l^f1(r, c.masking[6], c.rotate[6])
-	l, r = r, l^f2(r, c.masking[7], c.rotate[7])
-
-	l, r = r, l^f3(r, c.masking[8], c.rotate[8])
-	l, r = r, l^f1(r, c.masking[9], c.rotate[9])
-	l, r = r, l^f2(r, c.masking[10], c.rotate[10])
-	l, r = r, l^f3(r, c.masking[11], c.rotate[11])
-
-	l, r = r, l^f1(r, c.masking[12], c.rotate[12])
-	l, r = r, l^f2(r, c.masking[13], c.rotate[13])
-	l, r = r, l^f3(r, c.masking[14], c.rotate[14])
-	l, r = r, l^f1(r, c.masking[15], c.rotate[15])
-
-	dst[0] = uint8(r >> 24)
-	dst[1] = uint8(r >> 16)
-	dst[2] = uint8(r >> 8)
-	dst[3] = uint8(r)
-	dst[4] = uint8(l >> 24)
-	dst[5] = uint8(l >> 16)
-	dst[6] = uint8(l >> 8)
-	dst[7] = uint8(l)
-}
-
-func (c *Cipher) Decrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-
-	l, r = r, l^f1(r, c.masking[15], c.rotate[15])
-	l, r = r, l^f3(r, c.masking[14], c.rotate[14])
-	l, r = r, l^f2(r, c.masking[13], c.rotate[13])
-	l, r = r, l^f1(r, c.masking[12], c.rotate[12])
-
-	l, r = r, l^f3(r, c.masking[11], c.rotate[11])
-	l, r = r, l^f2(r, c.masking[10], c.rotate[10])
-	l, r = r, l^f1(r, c.masking[9], c.rotate[9])
-	l, r = r, l^f3(r, c.masking[8], c.rotate[8])
-
-	l, r = r, l^f2(r, c.masking[7], c.rotate[7])
-	l, r = r, l^f1(r, c.masking[6], c.rotate[6])
-	l, r = r, l^f3(r, c.masking[5], c.rotate[5])
-	l, r = r, l^f2(r, c.masking[4], c.rotate[4])
-
-	l, r = r, l^f1(r, c.masking[3], c.rotate[3])
-	l, r = r, l^f3(r, c.masking[2], c.rotate[2])
-	l, r = r, l^f2(r, c.masking[1], c.rotate[1])
-	l, r = r, l^f1(r, c.masking[0], c.rotate[0])
-
-	dst[0] = uint8(r >> 24)
-	dst[1] = uint8(r >> 16)
-	dst[2] = uint8(r >> 8)
-	dst[3] = uint8(r)
-	dst[4] = uint8(l >> 24)
-	dst[5] = uint8(l >> 16)
-	dst[6] = uint8(l >> 8)
-	dst[7] = uint8(l)
-}
-
-type keyScheduleA [4][7]uint8
-type keyScheduleB [4][5]uint8
-
-// keyScheduleRound contains the magic values for a round of the key schedule.
-// The keyScheduleA deals with the lines like:
-//   z0z1z2z3 = x0x1x2x3 ^ S5[xD] ^ S6[xF] ^ S7[xC] ^ S8[xE] ^ S7[x8]
-// Conceptually, both x and z are in the same array, x first. The first
-// element describes which word of this array gets written to and the
-// second, which word gets read. So, for the line above, it's "4, 0", because
-// it's writing to the first word of z, which, being after x, is word 4, and
-// reading from the first word of x: word 0.
-//
-// Next are the indexes into the S-boxes. Now the array is treated as bytes. So
-// "xD" is 0xd. The first byte of z is written as "16 + 0", just to be clear
-// that it's z that we're indexing.
-//
-// keyScheduleB deals with lines like:
-//   K1 = S5[z8] ^ S6[z9] ^ S7[z7] ^ S8[z6] ^ S5[z2]
-// "K1" is ignored because key words are always written in order. So the five
-// elements are the S-box indexes. They use the same form as in keyScheduleA,
-// above.
-
-type keyScheduleRound struct{}
-type keySchedule []keyScheduleRound
-
-var schedule = []struct {
-	a keyScheduleA
-	b keyScheduleB
-}{
-	{
-		keyScheduleA{
-			{4, 0, 0xd, 0xf, 0xc, 0xe, 0x8},
-			{5, 2, 16 + 0, 16 + 2, 16 + 1, 16 + 3, 0xa},
-			{6, 3, 16 + 7, 16 + 6, 16 + 5, 16 + 4, 9},
-			{7, 1, 16 + 0xa, 16 + 9, 16 + 0xb, 16 + 8, 0xb},
-		},
-		keyScheduleB{
-			{16 + 8, 16 + 9, 16 + 7, 16 + 6, 16 + 2},
-			{16 + 0xa, 16 + 0xb, 16 + 5, 16 + 4, 16 + 6},
-			{16 + 0xc, 16 + 0xd, 16 + 3, 16 + 2, 16 + 9},
-			{16 + 0xe, 16 + 0xf, 16 + 1, 16 + 0, 16 + 0xc},
-		},
-	},
-	{
-		keyScheduleA{
-			{0, 6, 16 + 5, 16 + 7, 16 + 4, 16 + 6, 16 + 0},
-			{1, 4, 0, 2, 1, 3, 16 + 2},
-			{2, 5, 7, 6, 5, 4, 16 + 1},
-			{3, 7, 0xa, 9, 0xb, 8, 16 + 3},
-		},
-		keyScheduleB{
-			{3, 2, 0xc, 0xd, 8},
-			{1, 0, 0xe, 0xf, 0xd},
-			{7, 6, 8, 9, 3},
-			{5, 4, 0xa, 0xb, 7},
-		},
-	},
-	{
-		keyScheduleA{
-			{4, 0, 0xd, 0xf, 0xc, 0xe, 8},
-			{5, 2, 16 + 0, 16 + 2, 16 + 1, 16 + 3, 0xa},
-			{6, 3, 16 + 7, 16 + 6, 16 + 5, 16 + 4, 9},
-			{7, 1, 16 + 0xa, 16 + 9, 16 + 0xb, 16 + 8, 0xb},
-		},
-		keyScheduleB{
-			{16 + 3, 16 + 2, 16 + 0xc, 16 + 0xd, 16 + 9},
-			{16 + 1, 16 + 0, 16 + 0xe, 16 + 0xf, 16 + 0xc},
-			{16 + 7, 16 + 6, 16 + 8, 16 + 9, 16 + 2},
-			{16 + 5, 16 + 4, 16 + 0xa, 16 + 0xb, 16 + 6},
-		},
-	},
-	{
-		keyScheduleA{
-			{0, 6, 16 + 5, 16 + 7, 16 + 4, 16 + 6, 16 + 0},
-			{1, 4, 0, 2, 1, 3, 16 + 2},
-			{2, 5, 7, 6, 5, 4, 16 + 1},
-			{3, 7, 0xa, 9, 0xb, 8, 16 + 3},
-		},
-		keyScheduleB{
-			{8, 9, 7, 6, 3},
-			{0xa, 0xb, 5, 4, 7},
-			{0xc, 0xd, 3, 2, 8},
-			{0xe, 0xf, 1, 0, 0xd},
-		},
-	},
-}
-
-func (c *Cipher) keySchedule(in []byte) {
-	var t [8]uint32
-	var k [32]uint32
-
-	for i := 0; i < 4; i++ {
-		j := i * 4
-		t[i] = uint32(in[j])<<24 | uint32(in[j+1])<<16 | uint32(in[j+2])<<8 | uint32(in[j+3])
-	}
-
-	x := []byte{6, 7, 4, 5}
-	ki := 0
-
-	for half := 0; half < 2; half++ {
-		for _, round := range schedule {
-			for j := 0; j < 4; j++ {
-				var a [7]uint8
-				copy(a[:], round.a[j][:])
-				w := t[a[1]]
-				w ^= sBox[4][(t[a[2]>>2]>>(24-8*(a[2]&3)))&0xff]
-				w ^= sBox[5][(t[a[3]>>2]>>(24-8*(a[3]&3)))&0xff]
-				w ^= sBox[6][(t[a[4]>>2]>>(24-8*(a[4]&3)))&0xff]
-				w ^= sBox[7][(t[a[5]>>2]>>(24-8*(a[5]&3)))&0xff]
-				w ^= sBox[x[j]][(t[a[6]>>2]>>(24-8*(a[6]&3)))&0xff]
-				t[a[0]] = w
-			}
-
-			for j := 0; j < 4; j++ {
-				var b [5]uint8
-				copy(b[:], round.b[j][:])
-				w := sBox[4][(t[b[0]>>2]>>(24-8*(b[0]&3)))&0xff]
-				w ^= sBox[5][(t[b[1]>>2]>>(24-8*(b[1]&3)))&0xff]
-				w ^= sBox[6][(t[b[2]>>2]>>(24-8*(b[2]&3)))&0xff]
-				w ^= sBox[7][(t[b[3]>>2]>>(24-8*(b[3]&3)))&0xff]
-				w ^= sBox[4+j][(t[b[4]>>2]>>(24-8*(b[4]&3)))&0xff]
-				k[ki] = w
-				ki++
-			}
-		}
-	}
-
-	for i := 0; i < 16; i++ {
-		c.masking[i] = k[i]
-		c.rotate[i] = uint8(k[16+i] & 0x1f)
-	}
-}
-
-// These are the three 'f' functions. See RFC 2144, section 2.2.
-func f1(d, m uint32, r uint8) uint32 {
-	t := m + d
-	I := (t << r) | (t >> (32 - r))
-	return ((sBox[0][I>>24] ^ sBox[1][(I>>16)&0xff]) - sBox[2][(I>>8)&0xff]) + sBox[3][I&0xff]
-}
-
-func f2(d, m uint32, r uint8) uint32 {
-	t := m ^ d
-	I := (t << r) | (t >> (32 - r))
-	return ((sBox[0][I>>24] - sBox[1][(I>>16)&0xff]) + sBox[2][(I>>8)&0xff]) ^ sBox[3][I&0xff]
-}
-
-func f3(d, m uint32, r uint8) uint32 {
-	t := m - d
-	I := (t << r) | (t >> (32 - r))
-	return ((sBox[0][I>>24] + sBox[1][(I>>16)&0xff]) ^ sBox[2][(I>>8)&0xff]) - sBox[3][I&0xff]
-}
-
-var sBox = [8][256]uint32{
-	{
-		0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949,
-		0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e,
-		0x28683b6f, 0xc07fd059, 0xff2379c8, 0x775f50e2, 0x43c340d3, 0xdf2f8656, 0x887ca41a, 0xa2d2bd2d,
-		0xa1c9e0d6, 0x346c4819, 0x61b76d87, 0x22540f2f, 0x2abe32e1, 0xaa54166b, 0x22568e3a, 0xa2d341d0,
-		0x66db40c8, 0xa784392f, 0x004dff2f, 0x2db9d2de, 0x97943fac, 0x4a97c1d8, 0x527644b7, 0xb5f437a7,
-		0xb82cbaef, 0xd751d159, 0x6ff7f0ed, 0x5a097a1f, 0x827b68d0, 0x90ecf52e, 0x22b0c054, 0xbc8e5935,
-		0x4b6d2f7f, 0x50bb64a2, 0xd2664910, 0xbee5812d, 0xb7332290, 0xe93b159f, 0xb48ee411, 0x4bff345d,
-		0xfd45c240, 0xad31973f, 0xc4f6d02e, 0x55fc8165, 0xd5b1caad, 0xa1ac2dae, 0xa2d4b76d, 0xc19b0c50,
-		0x882240f2, 0x0c6e4f38, 0xa4e4bfd7, 0x4f5ba272, 0x564c1d2f, 0xc59c5319, 0xb949e354, 0xb04669fe,
-		0xb1b6ab8a, 0xc71358dd, 0x6385c545, 0x110f935d, 0x57538ad5, 0x6a390493, 0xe63d37e0, 0x2a54f6b3,
-		0x3a787d5f, 0x6276a0b5, 0x19a6fcdf, 0x7a42206a, 0x29f9d4d5, 0xf61b1891, 0xbb72275e, 0xaa508167,
-		0x38901091, 0xc6b505eb, 0x84c7cb8c, 0x2ad75a0f, 0x874a1427, 0xa2d1936b, 0x2ad286af, 0xaa56d291,
-		0xd7894360, 0x425c750d, 0x93b39e26, 0x187184c9, 0x6c00b32d, 0x73e2bb14, 0xa0bebc3c, 0x54623779,
-		0x64459eab, 0x3f328b82, 0x7718cf82, 0x59a2cea6, 0x04ee002e, 0x89fe78e6, 0x3fab0950, 0x325ff6c2,
-		0x81383f05, 0x6963c5c8, 0x76cb5ad6, 0xd49974c9, 0xca180dcf, 0x380782d5, 0xc7fa5cf6, 0x8ac31511,
-		0x35e79e13, 0x47da91d0, 0xf40f9086, 0xa7e2419e, 0x31366241, 0x051ef495, 0xaa573b04, 0x4a805d8d,
-		0x548300d0, 0x00322a3c, 0xbf64cddf, 0xba57a68e, 0x75c6372b, 0x50afd341, 0xa7c13275, 0x915a0bf5,
-		0x6b54bfab, 0x2b0b1426, 0xab4cc9d7, 0x449ccd82, 0xf7fbf265, 0xab85c5f3, 0x1b55db94, 0xaad4e324,
-		0xcfa4bd3f, 0x2deaa3e2, 0x9e204d02, 0xc8bd25ac, 0xeadf55b3, 0xd5bd9e98, 0xe31231b2, 0x2ad5ad6c,
-		0x954329de, 0xadbe4528, 0xd8710f69, 0xaa51c90f, 0xaa786bf6, 0x22513f1e, 0xaa51a79b, 0x2ad344cc,
-		0x7b5a41f0, 0xd37cfbad, 0x1b069505, 0x41ece491, 0xb4c332e6, 0x032268d4, 0xc9600acc, 0xce387e6d,
-		0xbf6bb16c, 0x6a70fb78, 0x0d03d9c9, 0xd4df39de, 0xe01063da, 0x4736f464, 0x5ad328d8, 0xb347cc96,
-		0x75bb0fc3, 0x98511bfb, 0x4ffbcc35, 0xb58bcf6a, 0xe11f0abc, 0xbfc5fe4a, 0xa70aec10, 0xac39570a,
-		0x3f04442f, 0x6188b153, 0xe0397a2e, 0x5727cb79, 0x9ceb418f, 0x1cacd68d, 0x2ad37c96, 0x0175cb9d,
-		0xc69dff09, 0xc75b65f0, 0xd9db40d8, 0xec0e7779, 0x4744ead4, 0xb11c3274, 0xdd24cb9e, 0x7e1c54bd,
-		0xf01144f9, 0xd2240eb1, 0x9675b3fd, 0xa3ac3755, 0xd47c27af, 0x51c85f4d, 0x56907596, 0xa5bb15e6,
-		0x580304f0, 0xca042cf1, 0x011a37ea, 0x8dbfaadb, 0x35ba3e4a, 0x3526ffa0, 0xc37b4d09, 0xbc306ed9,
-		0x98a52666, 0x5648f725, 0xff5e569d, 0x0ced63d0, 0x7c63b2cf, 0x700b45e1, 0xd5ea50f1, 0x85a92872,
-		0xaf1fbda7, 0xd4234870, 0xa7870bf3, 0x2d3b4d79, 0x42e04198, 0x0cd0ede7, 0x26470db8, 0xf881814c,
-		0x474d6ad7, 0x7c0c5e5c, 0xd1231959, 0x381b7298, 0xf5d2f4db, 0xab838653, 0x6e2f1e23, 0x83719c9e,
-		0xbd91e046, 0x9a56456e, 0xdc39200c, 0x20c8c571, 0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9,
-		0x1a69e783, 0x02cc4843, 0xa2f7c579, 0x429ef47d, 0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf,
-	},
-	{
-		0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651,
-		0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3,
-		0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909, 0xdc440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb,
-		0xd1da4181, 0x3b092ab1, 0xf997f1c1, 0xa5e6cf7b, 0x01420ddb, 0xe4e7ef5b, 0x25a1ff41, 0xe180f806,
-		0x1fc41080, 0x179bee7a, 0xd37ac6a9, 0xfe5830a4, 0x98de8b7f, 0x77e83f4e, 0x79929269, 0x24fa9f7b,
-		0xe113c85b, 0xacc40083, 0xd7503525, 0xf7ea615f, 0x62143154, 0x0d554b63, 0x5d681121, 0xc866c359,
-		0x3d63cf73, 0xcee234c0, 0xd4d87e87, 0x5c672b21, 0x071f6181, 0x39f7627f, 0x361e3084, 0xe4eb573b,
-		0x602f64a4, 0xd63acd9c, 0x1bbc4635, 0x9e81032d, 0x2701f50c, 0x99847ab4, 0xa0e3df79, 0xba6cf38c,
-		0x10843094, 0x2537a95e, 0xf46f6ffe, 0xa1ff3b1f, 0x208cfb6a, 0x8f458c74, 0xd9e0a227, 0x4ec73a34,
-		0xfc884f69, 0x3e4de8df, 0xef0e0088, 0x3559648d, 0x8a45388c, 0x1d804366, 0x721d9bfd, 0xa58684bb,
-		0xe8256333, 0x844e8212, 0x128d8098, 0xfed33fb4, 0xce280ae1, 0x27e19ba5, 0xd5a6c252, 0xe49754bd,
-		0xc5d655dd, 0xeb667064, 0x77840b4d, 0xa1b6a801, 0x84db26a9, 0xe0b56714, 0x21f043b7, 0xe5d05860,
-		0x54f03084, 0x066ff472, 0xa31aa153, 0xdadc4755, 0xb5625dbf, 0x68561be6, 0x83ca6b94, 0x2d6ed23b,
-		0xeccf01db, 0xa6d3d0ba, 0xb6803d5c, 0xaf77a709, 0x33b4a34c, 0x397bc8d6, 0x5ee22b95, 0x5f0e5304,
-		0x81ed6f61, 0x20e74364, 0xb45e1378, 0xde18639b, 0x881ca122, 0xb96726d1, 0x8049a7e8, 0x22b7da7b,
-		0x5e552d25, 0x5272d237, 0x79d2951c, 0xc60d894c, 0x488cb402, 0x1ba4fe5b, 0xa4b09f6b, 0x1ca815cf,
-		0xa20c3005, 0x8871df63, 0xb9de2fcb, 0x0cc6c9e9, 0x0beeff53, 0xe3214517, 0xb4542835, 0x9f63293c,
-		0xee41e729, 0x6e1d2d7c, 0x50045286, 0x1e6685f3, 0xf33401c6, 0x30a22c95, 0x31a70850, 0x60930f13,
-		0x73f98417, 0xa1269859, 0xec645c44, 0x52c877a9, 0xcdff33a6, 0xa02b1741, 0x7cbad9a2, 0x2180036f,
-		0x50d99c08, 0xcb3f4861, 0xc26bd765, 0x64a3f6ab, 0x80342676, 0x25a75e7b, 0xe4e6d1fc, 0x20c710e6,
-		0xcdf0b680, 0x17844d3b, 0x31eef84d, 0x7e0824e4, 0x2ccb49eb, 0x846a3bae, 0x8ff77888, 0xee5d60f6,
-		0x7af75673, 0x2fdd5cdb, 0xa11631c1, 0x30f66f43, 0xb3faec54, 0x157fd7fa, 0xef8579cc, 0xd152de58,
-		0xdb2ffd5e, 0x8f32ce19, 0x306af97a, 0x02f03ef8, 0x99319ad5, 0xc242fa0f, 0xa7e3ebb0, 0xc68e4906,
-		0xb8da230c, 0x80823028, 0xdcdef3c8, 0xd35fb171, 0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d,
-		0xc72feffa, 0x22822e99, 0x82c570b4, 0xd8d94e89, 0x8b1c34bc, 0x301e16e6, 0x273be979, 0xb0ffeaa6,
-		0x61d9b8c6, 0x00b24869, 0xb7ffce3f, 0x08dc283b, 0x43daf65a, 0xf7e19798, 0x7619b72f, 0x8f1c9ba4,
-		0xdc8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb, 0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6,
-		0x2d6a77ab, 0x3527ed4b, 0x821fd216, 0x095c6e2e, 0xdb92f2fb, 0x5eea29cb, 0x145892f5, 0x91584f7f,
-		0x5483697b, 0x2667a8cc, 0x85196048, 0x8c4bacea, 0x833860d4, 0x0d23e0f9, 0x6c387e8a, 0x0ae6d249,
-		0xb284600c, 0xd835731d, 0xdcb1c647, 0xac4c56ea, 0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa,
-		0x8f5ea2b3, 0xfc184642, 0x0a036b7a, 0x4fb089bd, 0x649da589, 0xa345415e, 0x5c038323, 0x3e5d3bb9,
-		0x43d79572, 0x7e6dd07c, 0x06dfdf1e, 0x6c6cc4ef, 0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1,
-	},
-	{
-		0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907, 0x47607fff, 0x369fe44b, 0x8c1fc644, 0xaececa90,
-		0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae, 0x920e8806, 0xf0ad0548, 0xe13c8d83, 0x927010d5,
-		0x11107d9f, 0x07647db9, 0xb2e3e4d4, 0x3d4f285e, 0xb9afa820, 0xfade82e0, 0xa067268b, 0x8272792e,
-		0x553fb2c0, 0x489ae22b, 0xd4ef9794, 0x125e3fbc, 0x21fffcee, 0x825b1bfd, 0x9255c5ed, 0x1257a240,
-		0x4e1a8302, 0xbae07fff, 0x528246e7, 0x8e57140e, 0x3373f7bf, 0x8c9f8188, 0xa6fc4ee8, 0xc982b5a5,
-		0xa8c01db7, 0x579fc264, 0x67094f31, 0xf2bd3f5f, 0x40fff7c1, 0x1fb78dfc, 0x8e6bd2c1, 0x437be59b,
-		0x99b03dbf, 0xb5dbc64b, 0x638dc0e6, 0x55819d99, 0xa197c81c, 0x4a012d6e, 0xc5884a28, 0xccc36f71,
-		0xb843c213, 0x6c0743f1, 0x8309893c, 0x0feddd5f, 0x2f7fe850, 0xd7c07f7e, 0x02507fbf, 0x5afb9a04,
-		0xa747d2d0, 0x1651192e, 0xaf70bf3e, 0x58c31380, 0x5f98302e, 0x727cc3c4, 0x0a0fb402, 0x0f7fef82,
-		0x8c96fdad, 0x5d2c2aae, 0x8ee99a49, 0x50da88b8, 0x8427f4a0, 0x1eac5790, 0x796fb449, 0x8252dc15,
-		0xefbd7d9b, 0xa672597d, 0xada840d8, 0x45f54504, 0xfa5d7403, 0xe83ec305, 0x4f91751a, 0x925669c2,
-		0x23efe941, 0xa903f12e, 0x60270df2, 0x0276e4b6, 0x94fd6574, 0x927985b2, 0x8276dbcb, 0x02778176,
-		0xf8af918d, 0x4e48f79e, 0x8f616ddf, 0xe29d840e, 0x842f7d83, 0x340ce5c8, 0x96bbb682, 0x93b4b148,
-		0xef303cab, 0x984faf28, 0x779faf9b, 0x92dc560d, 0x224d1e20, 0x8437aa88, 0x7d29dc96, 0x2756d3dc,
-		0x8b907cee, 0xb51fd240, 0xe7c07ce3, 0xe566b4a1, 0xc3e9615e, 0x3cf8209d, 0x6094d1e3, 0xcd9ca341,
-		0x5c76460e, 0x00ea983b, 0xd4d67881, 0xfd47572c, 0xf76cedd9, 0xbda8229c, 0x127dadaa, 0x438a074e,
-		0x1f97c090, 0x081bdb8a, 0x93a07ebe, 0xb938ca15, 0x97b03cff, 0x3dc2c0f8, 0x8d1ab2ec, 0x64380e51,
-		0x68cc7bfb, 0xd90f2788, 0x12490181, 0x5de5ffd4, 0xdd7ef86a, 0x76a2e214, 0xb9a40368, 0x925d958f,
-		0x4b39fffa, 0xba39aee9, 0xa4ffd30b, 0xfaf7933b, 0x6d498623, 0x193cbcfa, 0x27627545, 0x825cf47a,
-		0x61bd8ba0, 0xd11e42d1, 0xcead04f4, 0x127ea392, 0x10428db7, 0x8272a972, 0x9270c4a8, 0x127de50b,
-		0x285ba1c8, 0x3c62f44f, 0x35c0eaa5, 0xe805d231, 0x428929fb, 0xb4fcdf82, 0x4fb66a53, 0x0e7dc15b,
-		0x1f081fab, 0x108618ae, 0xfcfd086d, 0xf9ff2889, 0x694bcc11, 0x236a5cae, 0x12deca4d, 0x2c3f8cc5,
-		0xd2d02dfe, 0xf8ef5896, 0xe4cf52da, 0x95155b67, 0x494a488c, 0xb9b6a80c, 0x5c8f82bc, 0x89d36b45,
-		0x3a609437, 0xec00c9a9, 0x44715253, 0x0a874b49, 0xd773bc40, 0x7c34671c, 0x02717ef6, 0x4feb5536,
-		0xa2d02fff, 0xd2bf60c4, 0xd43f03c0, 0x50b4ef6d, 0x07478cd1, 0x006e1888, 0xa2e53f55, 0xb9e6d4bc,
-		0xa2048016, 0x97573833, 0xd7207d67, 0xde0f8f3d, 0x72f87b33, 0xabcc4f33, 0x7688c55d, 0x7b00a6b0,
-		0x947b0001, 0x570075d2, 0xf9bb88f8, 0x8942019e, 0x4264a5ff, 0x856302e0, 0x72dbd92b, 0xee971b69,
-		0x6ea22fde, 0x5f08ae2b, 0xaf7a616d, 0xe5c98767, 0xcf1febd2, 0x61efc8c2, 0xf1ac2571, 0xcc8239c2,
-		0x67214cb8, 0xb1e583d1, 0xb7dc3e62, 0x7f10bdce, 0xf90a5c38, 0x0ff0443d, 0x606e6dc6, 0x60543a49,
-		0x5727c148, 0x2be98a1d, 0x8ab41738, 0x20e1be24, 0xaf96da0f, 0x68458425, 0x99833be5, 0x600d457d,
-		0x282f9350, 0x8334b362, 0xd91d1120, 0x2b6d8da0, 0x642b1e31, 0x9c305a00, 0x52bce688, 0x1b03588a,
-		0xf7baefd5, 0x4142ed9c, 0xa4315c11, 0x83323ec5, 0xdfef4636, 0xa133c501, 0xe9d3531c, 0xee353783,
-	},
-	{
-		0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298, 0x4a4f7bdb, 0x64ad8c57, 0x85510443, 0xfa020ed1,
-		0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120, 0xfd059d43, 0x6497b7b1, 0xf3641f63, 0x241e4adf,
-		0x28147f5f, 0x4fa2b8cd, 0xc9430040, 0x0cc32220, 0xfdd30b30, 0xc0a5374f, 0x1d2d00d9, 0x24147b15,
-		0xee4d111a, 0x0fca5167, 0x71ff904c, 0x2d195ffe, 0x1a05645f, 0x0c13fefe, 0x081b08ca, 0x05170121,
-		0x80530100, 0xe83e5efe, 0xac9af4f8, 0x7fe72701, 0xd2b8ee5f, 0x06df4261, 0xbb9e9b8a, 0x7293ea25,
-		0xce84ffdf, 0xf5718801, 0x3dd64b04, 0xa26f263b, 0x7ed48400, 0x547eebe6, 0x446d4ca0, 0x6cf3d6f5,
-		0x2649abdf, 0xaea0c7f5, 0x36338cc1, 0x503f7e93, 0xd3772061, 0x11b638e1, 0x72500e03, 0xf80eb2bb,
-		0xabe0502e, 0xec8d77de, 0x57971e81, 0xe14f6746, 0xc9335400, 0x6920318f, 0x081dbb99, 0xffc304a5,
-		0x4d351805, 0x7f3d5ce3, 0xa6c866c6, 0x5d5bcca9, 0xdaec6fea, 0x9f926f91, 0x9f46222f, 0x3991467d,
-		0xa5bf6d8e, 0x1143c44f, 0x43958302, 0xd0214eeb, 0x022083b8, 0x3fb6180c, 0x18f8931e, 0x281658e6,
-		0x26486e3e, 0x8bd78a70, 0x7477e4c1, 0xb506e07c, 0xf32d0a25, 0x79098b02, 0xe4eabb81, 0x28123b23,
-		0x69dead38, 0x1574ca16, 0xdf871b62, 0x211c40b7, 0xa51a9ef9, 0x0014377b, 0x041e8ac8, 0x09114003,
-		0xbd59e4d2, 0xe3d156d5, 0x4fe876d5, 0x2f91a340, 0x557be8de, 0x00eae4a7, 0x0ce5c2ec, 0x4db4bba6,
-		0xe756bdff, 0xdd3369ac, 0xec17b035, 0x06572327, 0x99afc8b0, 0x56c8c391, 0x6b65811c, 0x5e146119,
-		0x6e85cb75, 0xbe07c002, 0xc2325577, 0x893ff4ec, 0x5bbfc92d, 0xd0ec3b25, 0xb7801ab7, 0x8d6d3b24,
-		0x20c763ef, 0xc366a5fc, 0x9c382880, 0x0ace3205, 0xaac9548a, 0xeca1d7c7, 0x041afa32, 0x1d16625a,
-		0x6701902c, 0x9b757a54, 0x31d477f7, 0x9126b031, 0x36cc6fdb, 0xc70b8b46, 0xd9e66a48, 0x56e55a79,
-		0x026a4ceb, 0x52437eff, 0x2f8f76b4, 0x0df980a5, 0x8674cde3, 0xedda04eb, 0x17a9be04, 0x2c18f4df,
-		0xb7747f9d, 0xab2af7b4, 0xefc34d20, 0x2e096b7c, 0x1741a254, 0xe5b6a035, 0x213d42f6, 0x2c1c7c26,
-		0x61c2f50f, 0x6552daf9, 0xd2c231f8, 0x25130f69, 0xd8167fa2, 0x0418f2c8, 0x001a96a6, 0x0d1526ab,
-		0x63315c21, 0x5e0a72ec, 0x49bafefd, 0x187908d9, 0x8d0dbd86, 0x311170a7, 0x3e9b640c, 0xcc3e10d7,
-		0xd5cad3b6, 0x0caec388, 0xf73001e1, 0x6c728aff, 0x71eae2a1, 0x1f9af36e, 0xcfcbd12f, 0xc1de8417,
-		0xac07be6b, 0xcb44a1d8, 0x8b9b0f56, 0x013988c3, 0xb1c52fca, 0xb4be31cd, 0xd8782806, 0x12a3a4e2,
-		0x6f7de532, 0x58fd7eb6, 0xd01ee900, 0x24adffc2, 0xf4990fc5, 0x9711aac5, 0x001d7b95, 0x82e5e7d2,
-		0x109873f6, 0x00613096, 0xc32d9521, 0xada121ff, 0x29908415, 0x7fbb977f, 0xaf9eb3db, 0x29c9ed2a,
-		0x5ce2a465, 0xa730f32c, 0xd0aa3fe8, 0x8a5cc091, 0xd49e2ce7, 0x0ce454a9, 0xd60acd86, 0x015f1919,
-		0x77079103, 0xdea03af6, 0x78a8565e, 0xdee356df, 0x21f05cbe, 0x8b75e387, 0xb3c50651, 0xb8a5c3ef,
-		0xd8eeb6d2, 0xe523be77, 0xc2154529, 0x2f69efdf, 0xafe67afb, 0xf470c4b2, 0xf3e0eb5b, 0xd6cc9876,
-		0x39e4460c, 0x1fda8538, 0x1987832f, 0xca007367, 0xa99144f8, 0x296b299e, 0x492fc295, 0x9266beab,
-		0xb5676e69, 0x9bd3ddda, 0xdf7e052f, 0xdb25701c, 0x1b5e51ee, 0xf65324e6, 0x6afce36c, 0x0316cc04,
-		0x8644213e, 0xb7dc59d0, 0x7965291f, 0xccd6fd43, 0x41823979, 0x932bcdf6, 0xb657c34d, 0x4edfd282,
-		0x7ae5290c, 0x3cb9536b, 0x851e20fe, 0x9833557e, 0x13ecf0b0, 0xd3ffb372, 0x3f85c5c1, 0x0aef7ed2,
-	},
-	{
-		0x7ec90c04, 0x2c6e74b9, 0x9b0e66df, 0xa6337911, 0xb86a7fff, 0x1dd358f5, 0x44dd9d44, 0x1731167f,
-		0x08fbf1fa, 0xe7f511cc, 0xd2051b00, 0x735aba00, 0x2ab722d8, 0x386381cb, 0xacf6243a, 0x69befd7a,
-		0xe6a2e77f, 0xf0c720cd, 0xc4494816, 0xccf5c180, 0x38851640, 0x15b0a848, 0xe68b18cb, 0x4caadeff,
-		0x5f480a01, 0x0412b2aa, 0x259814fc, 0x41d0efe2, 0x4e40b48d, 0x248eb6fb, 0x8dba1cfe, 0x41a99b02,
-		0x1a550a04, 0xba8f65cb, 0x7251f4e7, 0x95a51725, 0xc106ecd7, 0x97a5980a, 0xc539b9aa, 0x4d79fe6a,
-		0xf2f3f763, 0x68af8040, 0xed0c9e56, 0x11b4958b, 0xe1eb5a88, 0x8709e6b0, 0xd7e07156, 0x4e29fea7,
-		0x6366e52d, 0x02d1c000, 0xc4ac8e05, 0x9377f571, 0x0c05372a, 0x578535f2, 0x2261be02, 0xd642a0c9,
-		0xdf13a280, 0x74b55bd2, 0x682199c0, 0xd421e5ec, 0x53fb3ce8, 0xc8adedb3, 0x28a87fc9, 0x3d959981,
-		0x5c1ff900, 0xfe38d399, 0x0c4eff0b, 0x062407ea, 0xaa2f4fb1, 0x4fb96976, 0x90c79505, 0xb0a8a774,
-		0xef55a1ff, 0xe59ca2c2, 0xa6b62d27, 0xe66a4263, 0xdf65001f, 0x0ec50966, 0xdfdd55bc, 0x29de0655,
-		0x911e739a, 0x17af8975, 0x32c7911c, 0x89f89468, 0x0d01e980, 0x524755f4, 0x03b63cc9, 0x0cc844b2,
-		0xbcf3f0aa, 0x87ac36e9, 0xe53a7426, 0x01b3d82b, 0x1a9e7449, 0x64ee2d7e, 0xcddbb1da, 0x01c94910,
-		0xb868bf80, 0x0d26f3fd, 0x9342ede7, 0x04a5c284, 0x636737b6, 0x50f5b616, 0xf24766e3, 0x8eca36c1,
-		0x136e05db, 0xfef18391, 0xfb887a37, 0xd6e7f7d4, 0xc7fb7dc9, 0x3063fcdf, 0xb6f589de, 0xec2941da,
-		0x26e46695, 0xb7566419, 0xf654efc5, 0xd08d58b7, 0x48925401, 0xc1bacb7f, 0xe5ff550f, 0xb6083049,
-		0x5bb5d0e8, 0x87d72e5a, 0xab6a6ee1, 0x223a66ce, 0xc62bf3cd, 0x9e0885f9, 0x68cb3e47, 0x086c010f,
-		0xa21de820, 0xd18b69de, 0xf3f65777, 0xfa02c3f6, 0x407edac3, 0xcbb3d550, 0x1793084d, 0xb0d70eba,
-		0x0ab378d5, 0xd951fb0c, 0xded7da56, 0x4124bbe4, 0x94ca0b56, 0x0f5755d1, 0xe0e1e56e, 0x6184b5be,
-		0x580a249f, 0x94f74bc0, 0xe327888e, 0x9f7b5561, 0xc3dc0280, 0x05687715, 0x646c6bd7, 0x44904db3,
-		0x66b4f0a3, 0xc0f1648a, 0x697ed5af, 0x49e92ff6, 0x309e374f, 0x2cb6356a, 0x85808573, 0x4991f840,
-		0x76f0ae02, 0x083be84d, 0x28421c9a, 0x44489406, 0x736e4cb8, 0xc1092910, 0x8bc95fc6, 0x7d869cf4,
-		0x134f616f, 0x2e77118d, 0xb31b2be1, 0xaa90b472, 0x3ca5d717, 0x7d161bba, 0x9cad9010, 0xaf462ba2,
-		0x9fe459d2, 0x45d34559, 0xd9f2da13, 0xdbc65487, 0xf3e4f94e, 0x176d486f, 0x097c13ea, 0x631da5c7,
-		0x445f7382, 0x175683f4, 0xcdc66a97, 0x70be0288, 0xb3cdcf72, 0x6e5dd2f3, 0x20936079, 0x459b80a5,
-		0xbe60e2db, 0xa9c23101, 0xeba5315c, 0x224e42f2, 0x1c5c1572, 0xf6721b2c, 0x1ad2fff3, 0x8c25404e,
-		0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78, 0xdc0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e,
-		0x44094f85, 0x3f481d87, 0xfcfeae7b, 0x77b5ff76, 0x8c2302bf, 0xaaf47556, 0x5f46b02a, 0x2b092801,
-		0x3d38f5f7, 0x0ca81f36, 0x52af4a8a, 0x66d5e7c0, 0xdf3b0874, 0x95055110, 0x1b5ad7a8, 0xf61ed5ad,
-		0x6cf6e479, 0x20758184, 0xd0cefa65, 0x88f7be58, 0x4a046826, 0x0ff6f8f3, 0xa09c7f70, 0x5346aba0,
-		0x5ce96c28, 0xe176eda3, 0x6bac307f, 0x376829d2, 0x85360fa9, 0x17e3fe2a, 0x24b79767, 0xf5a96b20,
-		0xd6cd2595, 0x68ff1ebf, 0x7555442c, 0xf19f06be, 0xf9e0659a, 0xeeb9491d, 0x34010718, 0xbb30cab8,
-		0xe822fe15, 0x88570983, 0x750e6249, 0xda627e55, 0x5e76ffa8, 0xb1534546, 0x6d47de08, 0xefe9e7d4,
-	},
-	{
-		0xf6fa8f9d, 0x2cac6ce1, 0x4ca34867, 0xe2337f7c, 0x95db08e7, 0x016843b4, 0xeced5cbc, 0x325553ac,
-		0xbf9f0960, 0xdfa1e2ed, 0x83f0579d, 0x63ed86b9, 0x1ab6a6b8, 0xde5ebe39, 0xf38ff732, 0x8989b138,
-		0x33f14961, 0xc01937bd, 0xf506c6da, 0xe4625e7e, 0xa308ea99, 0x4e23e33c, 0x79cbd7cc, 0x48a14367,
-		0xa3149619, 0xfec94bd5, 0xa114174a, 0xeaa01866, 0xa084db2d, 0x09a8486f, 0xa888614a, 0x2900af98,
-		0x01665991, 0xe1992863, 0xc8f30c60, 0x2e78ef3c, 0xd0d51932, 0xcf0fec14, 0xf7ca07d2, 0xd0a82072,
-		0xfd41197e, 0x9305a6b0, 0xe86be3da, 0x74bed3cd, 0x372da53c, 0x4c7f4448, 0xdab5d440, 0x6dba0ec3,
-		0x083919a7, 0x9fbaeed9, 0x49dbcfb0, 0x4e670c53, 0x5c3d9c01, 0x64bdb941, 0x2c0e636a, 0xba7dd9cd,
-		0xea6f7388, 0xe70bc762, 0x35f29adb, 0x5c4cdd8d, 0xf0d48d8c, 0xb88153e2, 0x08a19866, 0x1ae2eac8,
-		0x284caf89, 0xaa928223, 0x9334be53, 0x3b3a21bf, 0x16434be3, 0x9aea3906, 0xefe8c36e, 0xf890cdd9,
-		0x80226dae, 0xc340a4a3, 0xdf7e9c09, 0xa694a807, 0x5b7c5ecc, 0x221db3a6, 0x9a69a02f, 0x68818a54,
-		0xceb2296f, 0x53c0843a, 0xfe893655, 0x25bfe68a, 0xb4628abc, 0xcf222ebf, 0x25ac6f48, 0xa9a99387,
-		0x53bddb65, 0xe76ffbe7, 0xe967fd78, 0x0ba93563, 0x8e342bc1, 0xe8a11be9, 0x4980740d, 0xc8087dfc,
-		0x8de4bf99, 0xa11101a0, 0x7fd37975, 0xda5a26c0, 0xe81f994f, 0x9528cd89, 0xfd339fed, 0xb87834bf,
-		0x5f04456d, 0x22258698, 0xc9c4c83b, 0x2dc156be, 0x4f628daa, 0x57f55ec5, 0xe2220abe, 0xd2916ebf,
-		0x4ec75b95, 0x24f2c3c0, 0x42d15d99, 0xcd0d7fa0, 0x7b6e27ff, 0xa8dc8af0, 0x7345c106, 0xf41e232f,
-		0x35162386, 0xe6ea8926, 0x3333b094, 0x157ec6f2, 0x372b74af, 0x692573e4, 0xe9a9d848, 0xf3160289,
-		0x3a62ef1d, 0xa787e238, 0xf3a5f676, 0x74364853, 0x20951063, 0x4576698d, 0xb6fad407, 0x592af950,
-		0x36f73523, 0x4cfb6e87, 0x7da4cec0, 0x6c152daa, 0xcb0396a8, 0xc50dfe5d, 0xfcd707ab, 0x0921c42f,
-		0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9, 0x2b05d08d, 0x48b9d585, 0xdc049441, 0xc8098f9b,
-		0x7dede786, 0xc39a3373, 0x42410005, 0x6a091751, 0x0ef3c8a6, 0x890072d6, 0x28207682, 0xa9a9f7be,
-		0xbf32679d, 0xd45b5b75, 0xb353fd00, 0xcbb0e358, 0x830f220a, 0x1f8fb214, 0xd372cf08, 0xcc3c4a13,
-		0x8cf63166, 0x061c87be, 0x88c98f88, 0x6062e397, 0x47cf8e7a, 0xb6c85283, 0x3cc2acfb, 0x3fc06976,
-		0x4e8f0252, 0x64d8314d, 0xda3870e3, 0x1e665459, 0xc10908f0, 0x513021a5, 0x6c5b68b7, 0x822f8aa0,
-		0x3007cd3e, 0x74719eef, 0xdc872681, 0x073340d4, 0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891,
-		0x08a930f6, 0x957ef305, 0xb7fbffbd, 0xc266e96f, 0x6fe4ac98, 0xb173ecc0, 0xbc60b42a, 0x953498da,
-		0xfba1ae12, 0x2d4bd736, 0x0f25faab, 0xa4f3fceb, 0xe2969123, 0x257f0c3d, 0x9348af49, 0x361400bc,
-		0xe8816f4a, 0x3814f200, 0xa3f94043, 0x9c7a54c2, 0xbc704f57, 0xda41e7f9, 0xc25ad33a, 0x54f4a084,
-		0xb17f5505, 0x59357cbe, 0xedbd15c8, 0x7f97c5ab, 0xba5ac7b5, 0xb6f6deaf, 0x3a479c3a, 0x5302da25,
-		0x653d7e6a, 0x54268d49, 0x51a477ea, 0x5017d55b, 0xd7d25d88, 0x44136c76, 0x0404a8c8, 0xb8e5a121,
-		0xb81a928a, 0x60ed5869, 0x97c55b96, 0xeaec991b, 0x29935913, 0x01fdb7f1, 0x088e8dfa, 0x9ab6f6f5,
-		0x3b4cbf9f, 0x4a5de3ab, 0xe6051d35, 0xa0e1d855, 0xd36b4cf1, 0xf544edeb, 0xb0e93524, 0xbebb8fbd,
-		0xa2d762cf, 0x49c92f54, 0x38b5f331, 0x7128a454, 0x48392905, 0xa65b1db8, 0x851c97bd, 0xd675cf2f,
-	},
-	{
-		0x85e04019, 0x332bf567, 0x662dbfff, 0xcfc65693, 0x2a8d7f6f, 0xab9bc912, 0xde6008a1, 0x2028da1f,
-		0x0227bce7, 0x4d642916, 0x18fac300, 0x50f18b82, 0x2cb2cb11, 0xb232e75c, 0x4b3695f2, 0xb28707de,
-		0xa05fbcf6, 0xcd4181e9, 0xe150210c, 0xe24ef1bd, 0xb168c381, 0xfde4e789, 0x5c79b0d8, 0x1e8bfd43,
-		0x4d495001, 0x38be4341, 0x913cee1d, 0x92a79c3f, 0x089766be, 0xbaeeadf4, 0x1286becf, 0xb6eacb19,
-		0x2660c200, 0x7565bde4, 0x64241f7a, 0x8248dca9, 0xc3b3ad66, 0x28136086, 0x0bd8dfa8, 0x356d1cf2,
-		0x107789be, 0xb3b2e9ce, 0x0502aa8f, 0x0bc0351e, 0x166bf52a, 0xeb12ff82, 0xe3486911, 0xd34d7516,
-		0x4e7b3aff, 0x5f43671b, 0x9cf6e037, 0x4981ac83, 0x334266ce, 0x8c9341b7, 0xd0d854c0, 0xcb3a6c88,
-		0x47bc2829, 0x4725ba37, 0xa66ad22b, 0x7ad61f1e, 0x0c5cbafa, 0x4437f107, 0xb6e79962, 0x42d2d816,
-		0x0a961288, 0xe1a5c06e, 0x13749e67, 0x72fc081a, 0xb1d139f7, 0xf9583745, 0xcf19df58, 0xbec3f756,
-		0xc06eba30, 0x07211b24, 0x45c28829, 0xc95e317f, 0xbc8ec511, 0x38bc46e9, 0xc6e6fa14, 0xbae8584a,
-		0xad4ebc46, 0x468f508b, 0x7829435f, 0xf124183b, 0x821dba9f, 0xaff60ff4, 0xea2c4e6d, 0x16e39264,
-		0x92544a8b, 0x009b4fc3, 0xaba68ced, 0x9ac96f78, 0x06a5b79a, 0xb2856e6e, 0x1aec3ca9, 0xbe838688,
-		0x0e0804e9, 0x55f1be56, 0xe7e5363b, 0xb3a1f25d, 0xf7debb85, 0x61fe033c, 0x16746233, 0x3c034c28,
-		0xda6d0c74, 0x79aac56c, 0x3ce4e1ad, 0x51f0c802, 0x98f8f35a, 0x1626a49f, 0xeed82b29, 0x1d382fe3,
-		0x0c4fb99a, 0xbb325778, 0x3ec6d97b, 0x6e77a6a9, 0xcb658b5c, 0xd45230c7, 0x2bd1408b, 0x60c03eb7,
-		0xb9068d78, 0xa33754f4, 0xf430c87d, 0xc8a71302, 0xb96d8c32, 0xebd4e7be, 0xbe8b9d2d, 0x7979fb06,
-		0xe7225308, 0x8b75cf77, 0x11ef8da4, 0xe083c858, 0x8d6b786f, 0x5a6317a6, 0xfa5cf7a0, 0x5dda0033,
-		0xf28ebfb0, 0xf5b9c310, 0xa0eac280, 0x08b9767a, 0xa3d9d2b0, 0x79d34217, 0x021a718d, 0x9ac6336a,
-		0x2711fd60, 0x438050e3, 0x069908a8, 0x3d7fedc4, 0x826d2bef, 0x4eeb8476, 0x488dcf25, 0x36c9d566,
-		0x28e74e41, 0xc2610aca, 0x3d49a9cf, 0xbae3b9df, 0xb65f8de6, 0x92aeaf64, 0x3ac7d5e6, 0x9ea80509,
-		0xf22b017d, 0xa4173f70, 0xdd1e16c3, 0x15e0d7f9, 0x50b1b887, 0x2b9f4fd5, 0x625aba82, 0x6a017962,
-		0x2ec01b9c, 0x15488aa9, 0xd716e740, 0x40055a2c, 0x93d29a22, 0xe32dbf9a, 0x058745b9, 0x3453dc1e,
-		0xd699296e, 0x496cff6f, 0x1c9f4986, 0xdfe2ed07, 0xb87242d1, 0x19de7eae, 0x053e561a, 0x15ad6f8c,
-		0x66626c1c, 0x7154c24c, 0xea082b2a, 0x93eb2939, 0x17dcb0f0, 0x58d4f2ae, 0x9ea294fb, 0x52cf564c,
-		0x9883fe66, 0x2ec40581, 0x763953c3, 0x01d6692e, 0xd3a0c108, 0xa1e7160e, 0xe4f2dfa6, 0x693ed285,
-		0x74904698, 0x4c2b0edd, 0x4f757656, 0x5d393378, 0xa132234f, 0x3d321c5d, 0xc3f5e194, 0x4b269301,
-		0xc79f022f, 0x3c997e7e, 0x5e4f9504, 0x3ffafbbd, 0x76f7ad0e, 0x296693f4, 0x3d1fce6f, 0xc61e45be,
-		0xd3b5ab34, 0xf72bf9b7, 0x1b0434c0, 0x4e72b567, 0x5592a33d, 0xb5229301, 0xcfd2a87f, 0x60aeb767,
-		0x1814386b, 0x30bcc33d, 0x38a0c07d, 0xfd1606f2, 0xc363519b, 0x589dd390, 0x5479f8e6, 0x1cb8d647,
-		0x97fd61a9, 0xea7759f4, 0x2d57539d, 0x569a58cf, 0xe84e63ad, 0x462e1b78, 0x6580f87e, 0xf3817914,
-		0x91da55f4, 0x40a230f3, 0xd1988f35, 0xb6e318d2, 0x3ffa50bc, 0x3d40f021, 0xc3c0bdae, 0x4958c24c,
-		0x518f36b2, 0x84b1d370, 0x0fedce83, 0x878ddada, 0xf2a279c7, 0x94e01be8, 0x90716f4b, 0x954b8aa3,
-	},
-	{
-		0xe216300d, 0xbbddfffc, 0xa7ebdabd, 0x35648095, 0x7789f8b7, 0xe6c1121b, 0x0e241600, 0x052ce8b5,
-		0x11a9cfb0, 0xe5952f11, 0xece7990a, 0x9386d174, 0x2a42931c, 0x76e38111, 0xb12def3a, 0x37ddddfc,
-		0xde9adeb1, 0x0a0cc32c, 0xbe197029, 0x84a00940, 0xbb243a0f, 0xb4d137cf, 0xb44e79f0, 0x049eedfd,
-		0x0b15a15d, 0x480d3168, 0x8bbbde5a, 0x669ded42, 0xc7ece831, 0x3f8f95e7, 0x72df191b, 0x7580330d,
-		0x94074251, 0x5c7dcdfa, 0xabbe6d63, 0xaa402164, 0xb301d40a, 0x02e7d1ca, 0x53571dae, 0x7a3182a2,
-		0x12a8ddec, 0xfdaa335d, 0x176f43e8, 0x71fb46d4, 0x38129022, 0xce949ad4, 0xb84769ad, 0x965bd862,
-		0x82f3d055, 0x66fb9767, 0x15b80b4e, 0x1d5b47a0, 0x4cfde06f, 0xc28ec4b8, 0x57e8726e, 0x647a78fc,
-		0x99865d44, 0x608bd593, 0x6c200e03, 0x39dc5ff6, 0x5d0b00a3, 0xae63aff2, 0x7e8bd632, 0x70108c0c,
-		0xbbd35049, 0x2998df04, 0x980cf42a, 0x9b6df491, 0x9e7edd53, 0x06918548, 0x58cb7e07, 0x3b74ef2e,
-		0x522fffb1, 0xd24708cc, 0x1c7e27cd, 0xa4eb215b, 0x3cf1d2e2, 0x19b47a38, 0x424f7618, 0x35856039,
-		0x9d17dee7, 0x27eb35e6, 0xc9aff67b, 0x36baf5b8, 0x09c467cd, 0xc18910b1, 0xe11dbf7b, 0x06cd1af8,
-		0x7170c608, 0x2d5e3354, 0xd4de495a, 0x64c6d006, 0xbcc0c62c, 0x3dd00db3, 0x708f8f34, 0x77d51b42,
-		0x264f620f, 0x24b8d2bf, 0x15c1b79e, 0x46a52564, 0xf8d7e54e, 0x3e378160, 0x7895cda5, 0x859c15a5,
-		0xe6459788, 0xc37bc75f, 0xdb07ba0c, 0x0676a3ab, 0x7f229b1e, 0x31842e7b, 0x24259fd7, 0xf8bef472,
-		0x835ffcb8, 0x6df4c1f2, 0x96f5b195, 0xfd0af0fc, 0xb0fe134c, 0xe2506d3d, 0x4f9b12ea, 0xf215f225,
-		0xa223736f, 0x9fb4c428, 0x25d04979, 0x34c713f8, 0xc4618187, 0xea7a6e98, 0x7cd16efc, 0x1436876c,
-		0xf1544107, 0xbedeee14, 0x56e9af27, 0xa04aa441, 0x3cf7c899, 0x92ecbae6, 0xdd67016d, 0x151682eb,
-		0xa842eedf, 0xfdba60b4, 0xf1907b75, 0x20e3030f, 0x24d8c29e, 0xe139673b, 0xefa63fb8, 0x71873054,
-		0xb6f2cf3b, 0x9f326442, 0xcb15a4cc, 0xb01a4504, 0xf1e47d8d, 0x844a1be5, 0xbae7dfdc, 0x42cbda70,
-		0xcd7dae0a, 0x57e85b7a, 0xd53f5af6, 0x20cf4d8c, 0xcea4d428, 0x79d130a4, 0x3486ebfb, 0x33d3cddc,
-		0x77853b53, 0x37effcb5, 0xc5068778, 0xe580b3e6, 0x4e68b8f4, 0xc5c8b37e, 0x0d809ea2, 0x398feb7c,
-		0x132a4f94, 0x43b7950e, 0x2fee7d1c, 0x223613bd, 0xdd06caa2, 0x37df932b, 0xc4248289, 0xacf3ebc3,
-		0x5715f6b7, 0xef3478dd, 0xf267616f, 0xc148cbe4, 0x9052815e, 0x5e410fab, 0xb48a2465, 0x2eda7fa4,
-		0xe87b40e4, 0xe98ea084, 0x5889e9e1, 0xefd390fc, 0xdd07d35b, 0xdb485694, 0x38d7e5b2, 0x57720101,
-		0x730edebc, 0x5b643113, 0x94917e4f, 0x503c2fba, 0x646f1282, 0x7523d24a, 0xe0779695, 0xf9c17a8f,
-		0x7a5b2121, 0xd187b896, 0x29263a4d, 0xba510cdf, 0x81f47c9f, 0xad1163ed, 0xea7b5965, 0x1a00726e,
-		0x11403092, 0x00da6d77, 0x4a0cdd61, 0xad1f4603, 0x605bdfb0, 0x9eedc364, 0x22ebe6a8, 0xcee7d28a,
-		0xa0e736a0, 0x5564a6b9, 0x10853209, 0xc7eb8f37, 0x2de705ca, 0x8951570f, 0xdf09822b, 0xbd691a6c,
-		0xaa12e4f2, 0x87451c0f, 0xe0f6a27a, 0x3ada4819, 0x4cf1764f, 0x0d771c2b, 0x67cdb156, 0x350d8384,
-		0x5938fa0f, 0x42399ef3, 0x36997b07, 0x0e84093d, 0x4aa93e61, 0x8360d87b, 0x1fa98b0c, 0x1149382c,
-		0xe97625a5, 0x0614d1b7, 0x0e25244b, 0x0c768347, 0x589e8d82, 0x0d2059d1, 0xa466bb1e, 0xf8da0a82,
-		0x04f19130, 0xba6e4ec0, 0x99265164, 0x1ee7230d, 0x50b2ad80, 0xeaee6801, 0x8db2a283, 0xea8bf59e,
-	},
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/armor.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/armor.go
deleted file mode 100644
index e8df91af08..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/armor.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package armor implements OpenPGP ASCII Armor, see RFC 4880. OpenPGP Armor is
-// very similar to PEM except that it has an additional CRC checksum.
-package armor
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/base64"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-)
-
-// A Block represents an OpenPGP armored structure.
-//
-// The encoded form is:
-//    -----BEGIN Type-----
-//    Headers
-//
-//    base64-encoded Bytes
-//    '=' base64 encoded checksum
-//    -----END Type-----
-// where Headers is a possibly empty sequence of Key: Value lines.
-//
-// Since the armored data can be very large, this package presents a streaming
-// interface.
-type Block struct {
-	Type    string            // The type, taken from the preamble (i.e. "PGP SIGNATURE").
-	Header  map[string]string // Optional headers.
-	Body    io.Reader         // A Reader from which the contents can be read
-	lReader lineReader
-	oReader openpgpReader
-}
-
-var ArmorCorrupt error = errors.StructuralError("armor invalid")
-
-const crc24Init = 0xb704ce
-const crc24Poly = 0x1864cfb
-const crc24Mask = 0xffffff
-
-// crc24 calculates the OpenPGP checksum as specified in RFC 4880, section 6.1
-func crc24(crc uint32, d []byte) uint32 {
-	for _, b := range d {
-		crc ^= uint32(b) << 16
-		for i := 0; i < 8; i++ {
-			crc <<= 1
-			if crc&0x1000000 != 0 {
-				crc ^= crc24Poly
-			}
-		}
-	}
-	return crc
-}
-
-var armorStart = []byte("-----BEGIN ")
-var armorEnd = []byte("-----END ")
-var armorEndOfLine = []byte("-----")
-
-// lineReader wraps a line based reader. It watches for the end of an armor
-// block and records the expected CRC value.
-type lineReader struct {
-	in  *bufio.Reader
-	buf []byte
-	eof bool
-	crc uint32
-}
-
-func (l *lineReader) Read(p []byte) (n int, err error) {
-	if l.eof {
-		return 0, io.EOF
-	}
-
-	if len(l.buf) > 0 {
-		n = copy(p, l.buf)
-		l.buf = l.buf[n:]
-		return
-	}
-
-	line, isPrefix, err := l.in.ReadLine()
-	if err != nil {
-		return
-	}
-	if isPrefix {
-		return 0, ArmorCorrupt
-	}
-
-	if len(line) == 5 && line[0] == '=' {
-		// This is the checksum line
-		var expectedBytes [3]byte
-		var m int
-		m, err = base64.StdEncoding.Decode(expectedBytes[0:], line[1:])
-		if m != 3 || err != nil {
-			return
-		}
-		l.crc = uint32(expectedBytes[0])<<16 |
-			uint32(expectedBytes[1])<<8 |
-			uint32(expectedBytes[2])
-
-		line, _, err = l.in.ReadLine()
-		if err != nil && err != io.EOF {
-			return
-		}
-		if !bytes.HasPrefix(line, armorEnd) {
-			return 0, ArmorCorrupt
-		}
-
-		l.eof = true
-		return 0, io.EOF
-	}
-
-	if len(line) > 96 {
-		return 0, ArmorCorrupt
-	}
-
-	n = copy(p, line)
-	bytesToSave := len(line) - n
-	if bytesToSave > 0 {
-		if cap(l.buf) < bytesToSave {
-			l.buf = make([]byte, 0, bytesToSave)
-		}
-		l.buf = l.buf[0:bytesToSave]
-		copy(l.buf, line[n:])
-	}
-
-	return
-}
-
-// openpgpReader passes Read calls to the underlying base64 decoder, but keeps
-// a running CRC of the resulting data and checks the CRC against the value
-// found by the lineReader at EOF.
-type openpgpReader struct {
-	lReader    *lineReader
-	b64Reader  io.Reader
-	currentCRC uint32
-}
-
-func (r *openpgpReader) Read(p []byte) (n int, err error) {
-	n, err = r.b64Reader.Read(p)
-	r.currentCRC = crc24(r.currentCRC, p[:n])
-
-	if err == io.EOF {
-		if r.lReader.crc != uint32(r.currentCRC&crc24Mask) {
-			return 0, ArmorCorrupt
-		}
-	}
-
-	return
-}
-
-// Decode reads a PGP armored block from the given Reader. It will ignore
-// leading garbage. If it doesn't find a block, it will return nil, io.EOF. The
-// given Reader is not usable after calling this function: an arbitrary amount
-// of data may have been read past the end of the block.
-func Decode(in io.Reader) (p *Block, err error) {
-	r := bufio.NewReaderSize(in, 100)
-	var line []byte
-	ignoreNext := false
-
-TryNextBlock:
-	p = nil
-
-	// Skip leading garbage
-	for {
-		ignoreThis := ignoreNext
-		line, ignoreNext, err = r.ReadLine()
-		if err != nil {
-			return
-		}
-		if ignoreNext || ignoreThis {
-			continue
-		}
-		line = bytes.TrimSpace(line)
-		if len(line) > len(armorStart)+len(armorEndOfLine) && bytes.HasPrefix(line, armorStart) {
-			break
-		}
-	}
-
-	p = new(Block)
-	p.Type = string(line[len(armorStart) : len(line)-len(armorEndOfLine)])
-	p.Header = make(map[string]string)
-	nextIsContinuation := false
-	var lastKey string
-
-	// Read headers
-	for {
-		isContinuation := nextIsContinuation
-		line, nextIsContinuation, err = r.ReadLine()
-		if err != nil {
-			p = nil
-			return
-		}
-		if isContinuation {
-			p.Header[lastKey] += string(line)
-			continue
-		}
-		line = bytes.TrimSpace(line)
-		if len(line) == 0 {
-			break
-		}
-
-		i := bytes.Index(line, []byte(": "))
-		if i == -1 {
-			goto TryNextBlock
-		}
-		lastKey = string(line[:i])
-		p.Header[lastKey] = string(line[i+2:])
-	}
-
-	p.lReader.in = r
-	p.oReader.currentCRC = crc24Init
-	p.oReader.lReader = &p.lReader
-	p.oReader.b64Reader = base64.NewDecoder(base64.StdEncoding, &p.lReader)
-	p.Body = &p.oReader
-
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/encode.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/encode.go
deleted file mode 100644
index 6f07582c37..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/encode.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package armor
-
-import (
-	"encoding/base64"
-	"io"
-)
-
-var armorHeaderSep = []byte(": ")
-var blockEnd = []byte("\n=")
-var newline = []byte("\n")
-var armorEndOfLineOut = []byte("-----\n")
-
-// writeSlices writes its arguments to the given Writer.
-func writeSlices(out io.Writer, slices ...[]byte) (err error) {
-	for _, s := range slices {
-		_, err = out.Write(s)
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// lineBreaker breaks data across several lines, all of the same byte length
-// (except possibly the last). Lines are broken with a single '\n'.
-type lineBreaker struct {
-	lineLength  int
-	line        []byte
-	used        int
-	out         io.Writer
-	haveWritten bool
-}
-
-func newLineBreaker(out io.Writer, lineLength int) *lineBreaker {
-	return &lineBreaker{
-		lineLength: lineLength,
-		line:       make([]byte, lineLength),
-		used:       0,
-		out:        out,
-	}
-}
-
-func (l *lineBreaker) Write(b []byte) (n int, err error) {
-	n = len(b)
-
-	if n == 0 {
-		return
-	}
-
-	if l.used == 0 && l.haveWritten {
-		_, err = l.out.Write([]byte{'\n'})
-		if err != nil {
-			return
-		}
-	}
-
-	if l.used+len(b) < l.lineLength {
-		l.used += copy(l.line[l.used:], b)
-		return
-	}
-
-	l.haveWritten = true
-	_, err = l.out.Write(l.line[0:l.used])
-	if err != nil {
-		return
-	}
-	excess := l.lineLength - l.used
-	l.used = 0
-
-	_, err = l.out.Write(b[0:excess])
-	if err != nil {
-		return
-	}
-
-	_, err = l.Write(b[excess:])
-	return
-}
-
-func (l *lineBreaker) Close() (err error) {
-	if l.used > 0 {
-		_, err = l.out.Write(l.line[0:l.used])
-		if err != nil {
-			return
-		}
-	}
-
-	return
-}
-
-// encoding keeps track of a running CRC24 over the data which has been written
-// to it and outputs a OpenPGP checksum when closed, followed by an armor
-// trailer.
-//
-// It's built into a stack of io.Writers:
-//    encoding -> base64 encoder -> lineBreaker -> out
-type encoding struct {
-	out       io.Writer
-	breaker   *lineBreaker
-	b64       io.WriteCloser
-	crc       uint32
-	blockType []byte
-}
-
-func (e *encoding) Write(data []byte) (n int, err error) {
-	e.crc = crc24(e.crc, data)
-	return e.b64.Write(data)
-}
-
-func (e *encoding) Close() (err error) {
-	err = e.b64.Close()
-	if err != nil {
-		return
-	}
-	e.breaker.Close()
-
-	var checksumBytes [3]byte
-	checksumBytes[0] = byte(e.crc >> 16)
-	checksumBytes[1] = byte(e.crc >> 8)
-	checksumBytes[2] = byte(e.crc)
-
-	var b64ChecksumBytes [4]byte
-	base64.StdEncoding.Encode(b64ChecksumBytes[:], checksumBytes[:])
-
-	return writeSlices(e.out, blockEnd, b64ChecksumBytes[:], newline, armorEnd, e.blockType, armorEndOfLine)
-}
-
-// Encode returns a WriteCloser which will encode the data written to it in
-// OpenPGP armor.
-func Encode(out io.Writer, blockType string, headers map[string]string) (w io.WriteCloser, err error) {
-	bType := []byte(blockType)
-	err = writeSlices(out, armorStart, bType, armorEndOfLineOut)
-	if err != nil {
-		return
-	}
-
-	for k, v := range headers {
-		err = writeSlices(out, []byte(k), armorHeaderSep, []byte(v), newline)
-		if err != nil {
-			return
-		}
-	}
-
-	_, err = out.Write(newline)
-	if err != nil {
-		return
-	}
-
-	e := &encoding{
-		out:       out,
-		breaker:   newLineBreaker(out, 64),
-		crc:       crc24Init,
-		blockType: bType,
-	}
-	e.b64 = base64.NewEncoder(base64.StdEncoding, e.breaker)
-	return e, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/canonical_text.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/canonical_text.go
deleted file mode 100644
index e601e389f1..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/canonical_text.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import "hash"
-
-// NewCanonicalTextHash reformats text written to it into the canonical
-// form and then applies the hash h.  See RFC 4880, section 5.2.1.
-func NewCanonicalTextHash(h hash.Hash) hash.Hash {
-	return &canonicalTextHash{h, 0}
-}
-
-type canonicalTextHash struct {
-	h hash.Hash
-	s int
-}
-
-var newline = []byte{'\r', '\n'}
-
-func (cth *canonicalTextHash) Write(buf []byte) (int, error) {
-	start := 0
-
-	for i, c := range buf {
-		switch cth.s {
-		case 0:
-			if c == '\r' {
-				cth.s = 1
-			} else if c == '\n' {
-				cth.h.Write(buf[start:i])
-				cth.h.Write(newline)
-				start = i + 1
-			}
-		case 1:
-			cth.s = 0
-		}
-	}
-
-	cth.h.Write(buf[start:])
-	return len(buf), nil
-}
-
-func (cth *canonicalTextHash) Sum(in []byte) []byte {
-	return cth.h.Sum(in)
-}
-
-func (cth *canonicalTextHash) Reset() {
-	cth.h.Reset()
-	cth.s = 0
-}
-
-func (cth *canonicalTextHash) Size() int {
-	return cth.h.Size()
-}
-
-func (cth *canonicalTextHash) BlockSize() int {
-	return cth.h.BlockSize()
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign.go
deleted file mode 100644
index 41a4e4341f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign.go
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package clearsign generates and processes OpenPGP, clear-signed data. See
-// RFC 4880, section 7.
-//
-// Clearsigned messages are cryptographically signed, but the contents of the
-// message are kept in plaintext so that it can be read without special tools.
-package clearsign
-
-import (
-	"bufio"
-	"bytes"
-	"crypto"
-	"hash"
-	"io"
-	"net/textproto"
-	"strconv"
-
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
-)
-
-// A Block represents a clearsigned message. A signature on a Block can
-// be checked by passing Bytes into openpgp.CheckDetachedSignature.
-type Block struct {
-	Headers          textproto.MIMEHeader // Optional message headers
-	Plaintext        []byte               // The original message text
-	Bytes            []byte               // The signed message
-	ArmoredSignature *armor.Block         // The signature block
-}
-
-// start is the marker which denotes the beginning of a clearsigned message.
-var start = []byte("\n-----BEGIN PGP SIGNED MESSAGE-----")
-
-// dashEscape is prefixed to any lines that begin with a hypen so that they
-// can't be confused with endText.
-var dashEscape = []byte("- ")
-
-// endText is a marker which denotes the end of the message and the start of
-// an armored signature.
-var endText = []byte("-----BEGIN PGP SIGNATURE-----")
-
-// end is a marker which denotes the end of the armored signature.
-var end = []byte("\n-----END PGP SIGNATURE-----")
-
-var crlf = []byte("\r\n")
-var lf = byte('\n')
-
-// getLine returns the first \r\n or \n delineated line from the given byte
-// array. The line does not include the \r\n or \n. The remainder of the byte
-// array (also not including the new line bytes) is also returned and this will
-// always be smaller than the original argument.
-func getLine(data []byte) (line, rest []byte) {
-	i := bytes.Index(data, []byte{'\n'})
-	var j int
-	if i < 0 {
-		i = len(data)
-		j = i
-	} else {
-		j = i + 1
-		if i > 0 && data[i-1] == '\r' {
-			i--
-		}
-	}
-	return data[0:i], data[j:]
-}
-
-// Decode finds the first clearsigned message in data and returns it, as well
-// as the suffix of data which remains after the message.
-func Decode(data []byte) (b *Block, rest []byte) {
-	// start begins with a newline. However, at the very beginning of
-	// the byte array, we'll accept the start string without it.
-	rest = data
-	if bytes.HasPrefix(data, start[1:]) {
-		rest = rest[len(start)-1:]
-	} else if i := bytes.Index(data, start); i >= 0 {
-		rest = rest[i+len(start):]
-	} else {
-		return nil, data
-	}
-
-	// Consume the start line.
-	_, rest = getLine(rest)
-
-	var line []byte
-	b = &Block{
-		Headers: make(textproto.MIMEHeader),
-	}
-
-	// Next come a series of header lines.
-	for {
-		// This loop terminates because getLine's second result is
-		// always smaller than its argument.
-		if len(rest) == 0 {
-			return nil, data
-		}
-		// An empty line marks the end of the headers.
-		if line, rest = getLine(rest); len(line) == 0 {
-			break
-		}
-
-		i := bytes.Index(line, []byte{':'})
-		if i == -1 {
-			return nil, data
-		}
-
-		key, val := line[0:i], line[i+1:]
-		key = bytes.TrimSpace(key)
-		val = bytes.TrimSpace(val)
-		b.Headers.Add(string(key), string(val))
-	}
-
-	firstLine := true
-	for {
-		start := rest
-
-		line, rest = getLine(rest)
-		if bytes.Equal(line, endText) {
-			// Back up to the start of the line because armor expects to see the
-			// header line.
-			rest = start
-			break
-		}
-
-		// The final CRLF isn't included in the hash so we don't write it until
-		// we've seen the next line.
-		if firstLine {
-			firstLine = false
-		} else {
-			b.Bytes = append(b.Bytes, crlf...)
-		}
-
-		if bytes.HasPrefix(line, dashEscape) {
-			line = line[2:]
-		}
-		line = bytes.TrimRight(line, " \t")
-		b.Bytes = append(b.Bytes, line...)
-
-		b.Plaintext = append(b.Plaintext, line...)
-		b.Plaintext = append(b.Plaintext, lf)
-	}
-
-	// We want to find the extent of the armored data (including any newlines at
-	// the end).
-	i := bytes.Index(rest, end)
-	if i == -1 {
-		return nil, data
-	}
-	i += len(end)
-	for i < len(rest) && (rest[i] == '\r' || rest[i] == '\n') {
-		i++
-	}
-	armored := rest[:i]
-	rest = rest[i:]
-
-	var err error
-	b.ArmoredSignature, err = armor.Decode(bytes.NewBuffer(armored))
-	if err != nil {
-		return nil, data
-	}
-
-	return b, rest
-}
-
-// A dashEscaper is an io.WriteCloser which processes the body of a clear-signed
-// message. The clear-signed message is written to buffered and a hash, suitable
-// for signing, is maintained in h.
-//
-// When closed, an armored signature is created and written to complete the
-// message.
-type dashEscaper struct {
-	buffered *bufio.Writer
-	h        hash.Hash
-	hashType crypto.Hash
-
-	atBeginningOfLine bool
-	isFirstLine       bool
-
-	whitespace []byte
-	byteBuf    []byte // a one byte buffer to save allocations
-
-	privateKey *packet.PrivateKey
-	config     *packet.Config
-}
-
-func (d *dashEscaper) Write(data []byte) (n int, err error) {
-	for _, b := range data {
-		d.byteBuf[0] = b
-
-		if d.atBeginningOfLine {
-			// The final CRLF isn't included in the hash so we have to wait
-			// until this point (the start of the next line) before writing it.
-			if !d.isFirstLine {
-				d.h.Write(crlf)
-			}
-			d.isFirstLine = false
-
-			// At the beginning of a line, hyphens have to be escaped.
-			if b == '-' {
-				// The signature isn't calculated over the dash-escaped text so
-				// the escape is only written to buffered.
-				if _, err = d.buffered.Write(dashEscape); err != nil {
-					return
-				}
-				d.h.Write(d.byteBuf)
-				d.atBeginningOfLine = false
-			} else if b == '\n' {
-				// Nothing to do because we dely writing CRLF to the hash.
-			} else {
-				d.h.Write(d.byteBuf)
-				d.atBeginningOfLine = false
-			}
-			if err = d.buffered.WriteByte(b); err != nil {
-				return
-			}
-		} else {
-			// Any whitespace at the end of the line has to be removed so we
-			// buffer it until we find out whether there's more on this line.
-			if b == ' ' || b == '\t' || b == '\r' {
-				d.whitespace = append(d.whitespace, b)
-			} else if b == '\n' {
-				// We got a raw \n. Drop any trailing whitespace and write a
-				// CRLF.
-				d.whitespace = d.whitespace[:0]
-				// We dely writing CRLF to the hash until the start of the
-				// next line.
-				if err = d.buffered.WriteByte(b); err != nil {
-					return
-				}
-				d.atBeginningOfLine = true
-			} else {
-				// Any buffered whitespace wasn't at the end of the line so
-				// we need to write it out.
-				if len(d.whitespace) > 0 {
-					d.h.Write(d.whitespace)
-					if _, err = d.buffered.Write(d.whitespace); err != nil {
-						return
-					}
-					d.whitespace = d.whitespace[:0]
-				}
-				d.h.Write(d.byteBuf)
-				if err = d.buffered.WriteByte(b); err != nil {
-					return
-				}
-			}
-		}
-	}
-
-	n = len(data)
-	return
-}
-
-func (d *dashEscaper) Close() (err error) {
-	if !d.atBeginningOfLine {
-		if err = d.buffered.WriteByte(lf); err != nil {
-			return
-		}
-	}
-	sig := new(packet.Signature)
-	sig.SigType = packet.SigTypeText
-	sig.PubKeyAlgo = d.privateKey.PubKeyAlgo
-	sig.Hash = d.hashType
-	sig.CreationTime = d.config.Now()
-	sig.IssuerKeyId = &d.privateKey.KeyId
-
-	if err = sig.Sign(d.h, d.privateKey, d.config); err != nil {
-		return
-	}
-
-	out, err := armor.Encode(d.buffered, "PGP SIGNATURE", nil)
-	if err != nil {
-		return
-	}
-
-	if err = sig.Serialize(out); err != nil {
-		return
-	}
-	if err = out.Close(); err != nil {
-		return
-	}
-	if err = d.buffered.Flush(); err != nil {
-		return
-	}
-	return
-}
-
-// Encode returns a WriteCloser which will clear-sign a message with privateKey
-// and write it to w. If config is nil, sensible defaults are used.
-func Encode(w io.Writer, privateKey *packet.PrivateKey, config *packet.Config) (plaintext io.WriteCloser, err error) {
-	if privateKey.Encrypted {
-		return nil, errors.InvalidArgumentError("signing key is encrypted")
-	}
-
-	hashType := config.Hash()
-	name := nameOfHash(hashType)
-	if len(name) == 0 {
-		return nil, errors.UnsupportedError("unknown hash type: " + strconv.Itoa(int(hashType)))
-	}
-
-	if !hashType.Available() {
-		return nil, errors.UnsupportedError("unsupported hash type: " + strconv.Itoa(int(hashType)))
-	}
-	h := hashType.New()
-
-	buffered := bufio.NewWriter(w)
-	// start has a \n at the beginning that we don't want here.
-	if _, err = buffered.Write(start[1:]); err != nil {
-		return
-	}
-	if err = buffered.WriteByte(lf); err != nil {
-		return
-	}
-	if _, err = buffered.WriteString("Hash: "); err != nil {
-		return
-	}
-	if _, err = buffered.WriteString(name); err != nil {
-		return
-	}
-	if err = buffered.WriteByte(lf); err != nil {
-		return
-	}
-	if err = buffered.WriteByte(lf); err != nil {
-		return
-	}
-
-	plaintext = &dashEscaper{
-		buffered: buffered,
-		h:        h,
-		hashType: hashType,
-
-		atBeginningOfLine: true,
-		isFirstLine:       true,
-
-		byteBuf: make([]byte, 1),
-
-		privateKey: privateKey,
-		config:     config,
-	}
-
-	return
-}
-
-// nameOfHash returns the OpenPGP name for the given hash, or the empty string
-// if the name isn't known. See RFC 4880, section 9.4.
-func nameOfHash(h crypto.Hash) string {
-	switch h {
-	case crypto.MD5:
-		return "MD5"
-	case crypto.SHA1:
-		return "SHA1"
-	case crypto.RIPEMD160:
-		return "RIPEMD160"
-	case crypto.SHA224:
-		return "SHA224"
-	case crypto.SHA256:
-		return "SHA256"
-	case crypto.SHA384:
-		return "SHA384"
-	case crypto.SHA512:
-		return "SHA512"
-	}
-	return ""
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal/elgamal.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal/elgamal.go
deleted file mode 100644
index a553bdee8d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal/elgamal.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package elgamal implements ElGamal encryption, suitable for OpenPGP,
-// as specified in "A Public-Key Cryptosystem and a Signature Scheme Based on
-// Discrete Logarithms," IEEE Transactions on Information Theory, v. IT-31,
-// n. 4, 1985, pp. 469-472.
-//
-// This form of ElGamal embeds PKCS#1 v1.5 padding, which may make it
-// unsuitable for other protocols. RSA should be used in preference in any
-// case.
-package elgamal
-
-import (
-	"crypto/rand"
-	"crypto/subtle"
-	"errors"
-	"io"
-	"math/big"
-)
-
-// PublicKey represents an ElGamal public key.
-type PublicKey struct {
-	G, P, Y *big.Int
-}
-
-// PrivateKey represents an ElGamal private key.
-type PrivateKey struct {
-	PublicKey
-	X *big.Int
-}
-
-// Encrypt encrypts the given message to the given public key. The result is a
-// pair of integers. Errors can result from reading random, or because msg is
-// too large to be encrypted to the public key.
-func Encrypt(random io.Reader, pub *PublicKey, msg []byte) (c1, c2 *big.Int, err error) {
-	pLen := (pub.P.BitLen() + 7) / 8
-	if len(msg) > pLen-11 {
-		err = errors.New("elgamal: message too long")
-		return
-	}
-
-	// EM = 0x02 || PS || 0x00 || M
-	em := make([]byte, pLen-1)
-	em[0] = 2
-	ps, mm := em[1:len(em)-len(msg)-1], em[len(em)-len(msg):]
-	err = nonZeroRandomBytes(ps, random)
-	if err != nil {
-		return
-	}
-	em[len(em)-len(msg)-1] = 0
-	copy(mm, msg)
-
-	m := new(big.Int).SetBytes(em)
-
-	k, err := rand.Int(random, pub.P)
-	if err != nil {
-		return
-	}
-
-	c1 = new(big.Int).Exp(pub.G, k, pub.P)
-	s := new(big.Int).Exp(pub.Y, k, pub.P)
-	c2 = s.Mul(s, m)
-	c2.Mod(c2, pub.P)
-
-	return
-}
-
-// Decrypt takes two integers, resulting from an ElGamal encryption, and
-// returns the plaintext of the message. An error can result only if the
-// ciphertext is invalid. Users should keep in mind that this is a padding
-// oracle and thus, if exposed to an adaptive chosen ciphertext attack, can
-// be used to break the cryptosystem.  See ``Chosen Ciphertext Attacks
-// Against Protocols Based on the RSA Encryption Standard PKCS #1'', Daniel
-// Bleichenbacher, Advances in Cryptology (Crypto '98),
-func Decrypt(priv *PrivateKey, c1, c2 *big.Int) (msg []byte, err error) {
-	s := new(big.Int).Exp(c1, priv.X, priv.P)
-	s.ModInverse(s, priv.P)
-	s.Mul(s, c2)
-	s.Mod(s, priv.P)
-	em := s.Bytes()
-
-	firstByteIsTwo := subtle.ConstantTimeByteEq(em[0], 2)
-
-	// The remainder of the plaintext must be a string of non-zero random
-	// octets, followed by a 0, followed by the message.
-	//   lookingForIndex: 1 iff we are still looking for the zero.
-	//   index: the offset of the first zero byte.
-	var lookingForIndex, index int
-	lookingForIndex = 1
-
-	for i := 1; i < len(em); i++ {
-		equals0 := subtle.ConstantTimeByteEq(em[i], 0)
-		index = subtle.ConstantTimeSelect(lookingForIndex&equals0, i, index)
-		lookingForIndex = subtle.ConstantTimeSelect(equals0, 0, lookingForIndex)
-	}
-
-	if firstByteIsTwo != 1 || lookingForIndex != 0 || index < 9 {
-		return nil, errors.New("elgamal: decryption error")
-	}
-	return em[index+1:], nil
-}
-
-// nonZeroRandomBytes fills the given slice with non-zero random octets.
-func nonZeroRandomBytes(s []byte, rand io.Reader) (err error) {
-	_, err = io.ReadFull(rand, s)
-	if err != nil {
-		return
-	}
-
-	for i := 0; i < len(s); i++ {
-		for s[i] == 0 {
-			_, err = io.ReadFull(rand, s[i:i+1])
-			if err != nil {
-				return
-			}
-		}
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors/errors.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors/errors.go
deleted file mode 100644
index 6c4c2f1769..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors/errors.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package errors contains common error types for the OpenPGP packages.
-package errors
-
-import (
-	"strconv"
-)
-
-// A StructuralError is returned when OpenPGP data is found to be syntactically
-// invalid.
-type StructuralError string
-
-func (s StructuralError) Error() string {
-	return "openpgp: invalid data: " + string(s)
-}
-
-// UnsupportedError indicates that, although the OpenPGP data is valid, it
-// makes use of currently unimplemented features.
-type UnsupportedError string
-
-func (s UnsupportedError) Error() string {
-	return "openpgp: unsupported feature: " + string(s)
-}
-
-// InvalidArgumentError indicates that the caller is in error and passed an
-// incorrect value.
-type InvalidArgumentError string
-
-func (i InvalidArgumentError) Error() string {
-	return "openpgp: invalid argument: " + string(i)
-}
-
-// SignatureError indicates that a syntactically valid signature failed to
-// validate.
-type SignatureError string
-
-func (b SignatureError) Error() string {
-	return "openpgp: invalid signature: " + string(b)
-}
-
-type keyIncorrectError int
-
-func (ki keyIncorrectError) Error() string {
-	return "openpgp: incorrect key"
-}
-
-var ErrKeyIncorrect error = keyIncorrectError(0)
-
-type unknownIssuerError int
-
-func (unknownIssuerError) Error() string {
-	return "openpgp: signature made by unknown entity"
-}
-
-var ErrUnknownIssuer error = unknownIssuerError(0)
-
-type keyRevokedError int
-
-func (keyRevokedError) Error() string {
-	return "openpgp: signature made by revoked key"
-}
-
-var ErrKeyRevoked error = keyRevokedError(0)
-
-type UnknownPacketTypeError uint8
-
-func (upte UnknownPacketTypeError) Error() string {
-	return "openpgp: unknown packet type: " + strconv.Itoa(int(upte))
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys.go
deleted file mode 100644
index c4a6640fb8..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys.go
+++ /dev/null
@@ -1,624 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import (
-	"crypto/rsa"
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
-	"io"
-	"time"
-)
-
-// PublicKeyType is the armor type for a PGP public key.
-var PublicKeyType = "PGP PUBLIC KEY BLOCK"
-
-// PrivateKeyType is the armor type for a PGP private key.
-var PrivateKeyType = "PGP PRIVATE KEY BLOCK"
-
-// An Entity represents the components of an OpenPGP key: a primary public key
-// (which must be a signing key), one or more identities claimed by that key,
-// and zero or more subkeys, which may be encryption keys.
-type Entity struct {
-	PrimaryKey  *packet.PublicKey
-	PrivateKey  *packet.PrivateKey
-	Identities  map[string]*Identity // indexed by Identity.Name
-	Revocations []*packet.Signature
-	Subkeys     []Subkey
-}
-
-// An Identity represents an identity claimed by an Entity and zero or more
-// assertions by other entities about that claim.
-type Identity struct {
-	Name          string // by convention, has the form "Full Name (comment) <email@example.com>"
-	UserId        *packet.UserId
-	SelfSignature *packet.Signature
-	Signatures    []*packet.Signature
-}
-
-// A Subkey is an additional public key in an Entity. Subkeys can be used for
-// encryption.
-type Subkey struct {
-	PublicKey  *packet.PublicKey
-	PrivateKey *packet.PrivateKey
-	Sig        *packet.Signature
-}
-
-// A Key identifies a specific public key in an Entity. This is either the
-// Entity's primary key or a subkey.
-type Key struct {
-	Entity        *Entity
-	PublicKey     *packet.PublicKey
-	PrivateKey    *packet.PrivateKey
-	SelfSignature *packet.Signature
-}
-
-// A KeyRing provides access to public and private keys.
-type KeyRing interface {
-	// KeysById returns the set of keys that have the given key id.
-	KeysById(id uint64) []Key
-	// KeysByIdAndUsage returns the set of keys with the given id
-	// that also meet the key usage given by requiredUsage.
-	// The requiredUsage is expressed as the bitwise-OR of
-	// packet.KeyFlag* values.
-	KeysByIdUsage(id uint64, requiredUsage byte) []Key
-	// DecryptionKeys returns all private keys that are valid for
-	// decryption.
-	DecryptionKeys() []Key
-}
-
-// primaryIdentity returns the Identity marked as primary or the first identity
-// if none are so marked.
-func (e *Entity) primaryIdentity() *Identity {
-	var firstIdentity *Identity
-	for _, ident := range e.Identities {
-		if firstIdentity == nil {
-			firstIdentity = ident
-		}
-		if ident.SelfSignature.IsPrimaryId != nil && *ident.SelfSignature.IsPrimaryId {
-			return ident
-		}
-	}
-	return firstIdentity
-}
-
-// encryptionKey returns the best candidate Key for encrypting a message to the
-// given Entity.
-func (e *Entity) encryptionKey(now time.Time) (Key, bool) {
-	candidateSubkey := -1
-
-	for i, subkey := range e.Subkeys {
-		if subkey.Sig.FlagsValid &&
-			subkey.Sig.FlagEncryptCommunications &&
-			subkey.PublicKey.PubKeyAlgo.CanEncrypt() &&
-			!subkey.Sig.KeyExpired(now) {
-			candidateSubkey = i
-			break
-		}
-	}
-
-	if candidateSubkey != -1 {
-		subkey := e.Subkeys[candidateSubkey]
-		return Key{e, subkey.PublicKey, subkey.PrivateKey, subkey.Sig}, true
-	}
-
-	// If we don't have any candidate subkeys for encryption and
-	// the primary key doesn't have any usage metadata then we
-	// assume that the primary key is ok. Or, if the primary key is
-	// marked as ok to encrypt to, then we can obviously use it.
-	i := e.primaryIdentity()
-	if !i.SelfSignature.FlagsValid || i.SelfSignature.FlagEncryptCommunications &&
-		e.PrimaryKey.PubKeyAlgo.CanEncrypt() &&
-		!i.SelfSignature.KeyExpired(now) {
-		return Key{e, e.PrimaryKey, e.PrivateKey, i.SelfSignature}, true
-	}
-
-	// This Entity appears to be signing only.
-	return Key{}, false
-}
-
-// signingKey return the best candidate Key for signing a message with this
-// Entity.
-func (e *Entity) signingKey(now time.Time) (Key, bool) {
-	candidateSubkey := -1
-
-	for i, subkey := range e.Subkeys {
-		if subkey.Sig.FlagsValid &&
-			subkey.Sig.FlagSign &&
-			subkey.PublicKey.PubKeyAlgo.CanSign() &&
-			!subkey.Sig.KeyExpired(now) {
-			candidateSubkey = i
-			break
-		}
-	}
-
-	if candidateSubkey != -1 {
-		subkey := e.Subkeys[candidateSubkey]
-		return Key{e, subkey.PublicKey, subkey.PrivateKey, subkey.Sig}, true
-	}
-
-	// If we have no candidate subkey then we assume that it's ok to sign
-	// with the primary key.
-	i := e.primaryIdentity()
-	if !i.SelfSignature.FlagsValid || i.SelfSignature.FlagSign &&
-		!i.SelfSignature.KeyExpired(now) {
-		return Key{e, e.PrimaryKey, e.PrivateKey, i.SelfSignature}, true
-	}
-
-	return Key{}, false
-}
-
-// An EntityList contains one or more Entities.
-type EntityList []*Entity
-
-// KeysById returns the set of keys that have the given key id.
-func (el EntityList) KeysById(id uint64) (keys []Key) {
-	for _, e := range el {
-		if e.PrimaryKey.KeyId == id {
-			var selfSig *packet.Signature
-			for _, ident := range e.Identities {
-				if selfSig == nil {
-					selfSig = ident.SelfSignature
-				} else if ident.SelfSignature.IsPrimaryId != nil && *ident.SelfSignature.IsPrimaryId {
-					selfSig = ident.SelfSignature
-					break
-				}
-			}
-			keys = append(keys, Key{e, e.PrimaryKey, e.PrivateKey, selfSig})
-		}
-
-		for _, subKey := range e.Subkeys {
-			if subKey.PublicKey.KeyId == id {
-				keys = append(keys, Key{e, subKey.PublicKey, subKey.PrivateKey, subKey.Sig})
-			}
-		}
-	}
-	return
-}
-
-// KeysByIdAndUsage returns the set of keys with the given id that also meet
-// the key usage given by requiredUsage.  The requiredUsage is expressed as
-// the bitwise-OR of packet.KeyFlag* values.
-func (el EntityList) KeysByIdUsage(id uint64, requiredUsage byte) (keys []Key) {
-	for _, key := range el.KeysById(id) {
-		if len(key.Entity.Revocations) > 0 {
-			continue
-		}
-
-		if key.SelfSignature.RevocationReason != nil {
-			continue
-		}
-
-		if key.SelfSignature.FlagsValid && requiredUsage != 0 {
-			var usage byte
-			if key.SelfSignature.FlagCertify {
-				usage |= packet.KeyFlagCertify
-			}
-			if key.SelfSignature.FlagSign {
-				usage |= packet.KeyFlagSign
-			}
-			if key.SelfSignature.FlagEncryptCommunications {
-				usage |= packet.KeyFlagEncryptCommunications
-			}
-			if key.SelfSignature.FlagEncryptStorage {
-				usage |= packet.KeyFlagEncryptStorage
-			}
-			if usage&requiredUsage != requiredUsage {
-				continue
-			}
-		}
-
-		keys = append(keys, key)
-	}
-	return
-}
-
-// DecryptionKeys returns all private keys that are valid for decryption.
-func (el EntityList) DecryptionKeys() (keys []Key) {
-	for _, e := range el {
-		for _, subKey := range e.Subkeys {
-			if subKey.PrivateKey != nil && (!subKey.Sig.FlagsValid || subKey.Sig.FlagEncryptStorage || subKey.Sig.FlagEncryptCommunications) {
-				keys = append(keys, Key{e, subKey.PublicKey, subKey.PrivateKey, subKey.Sig})
-			}
-		}
-	}
-	return
-}
-
-// ReadArmoredKeyRing reads one or more public/private keys from an armor keyring file.
-func ReadArmoredKeyRing(r io.Reader) (EntityList, error) {
-	block, err := armor.Decode(r)
-	if err == io.EOF {
-		return nil, errors.InvalidArgumentError("no armored data found")
-	}
-	if err != nil {
-		return nil, err
-	}
-	if block.Type != PublicKeyType && block.Type != PrivateKeyType {
-		return nil, errors.InvalidArgumentError("expected public or private key block, got: " + block.Type)
-	}
-
-	return ReadKeyRing(block.Body)
-}
-
-// ReadKeyRing reads one or more public/private keys. Unsupported keys are
-// ignored as long as at least a single valid key is found.
-func ReadKeyRing(r io.Reader) (el EntityList, err error) {
-	packets := packet.NewReader(r)
-	var lastUnsupportedError error
-
-	for {
-		var e *Entity
-		e, err = ReadEntity(packets)
-		if err != nil {
-			// TODO: warn about skipped unsupported/unreadable keys
-			if _, ok := err.(errors.UnsupportedError); ok {
-				lastUnsupportedError = err
-				err = readToNextPublicKey(packets)
-			} else if _, ok := err.(errors.StructuralError); ok {
-				// Skip unreadable, badly-formatted keys
-				lastUnsupportedError = err
-				err = readToNextPublicKey(packets)
-			}
-			if err == io.EOF {
-				err = nil
-				break
-			}
-			if err != nil {
-				el = nil
-				break
-			}
-		} else {
-			el = append(el, e)
-		}
-	}
-
-	if len(el) == 0 && err == nil {
-		err = lastUnsupportedError
-	}
-	return
-}
-
-// readToNextPublicKey reads packets until the start of the entity and leaves
-// the first packet of the new entity in the Reader.
-func readToNextPublicKey(packets *packet.Reader) (err error) {
-	var p packet.Packet
-	for {
-		p, err = packets.Next()
-		if err == io.EOF {
-			return
-		} else if err != nil {
-			if _, ok := err.(errors.UnsupportedError); ok {
-				err = nil
-				continue
-			}
-			return
-		}
-
-		if pk, ok := p.(*packet.PublicKey); ok && !pk.IsSubkey {
-			packets.Unread(p)
-			return
-		}
-	}
-
-	panic("unreachable")
-}
-
-// ReadEntity reads an entity (public key, identities, subkeys etc) from the
-// given Reader.
-func ReadEntity(packets *packet.Reader) (*Entity, error) {
-	e := new(Entity)
-	e.Identities = make(map[string]*Identity)
-
-	p, err := packets.Next()
-	if err != nil {
-		return nil, err
-	}
-
-	var ok bool
-	if e.PrimaryKey, ok = p.(*packet.PublicKey); !ok {
-		if e.PrivateKey, ok = p.(*packet.PrivateKey); !ok {
-			packets.Unread(p)
-			return nil, errors.StructuralError("first packet was not a public/private key")
-		} else {
-			e.PrimaryKey = &e.PrivateKey.PublicKey
-		}
-	}
-
-	if !e.PrimaryKey.PubKeyAlgo.CanSign() {
-		return nil, errors.StructuralError("primary key cannot be used for signatures")
-	}
-
-	var current *Identity
-	var revocations []*packet.Signature
-EachPacket:
-	for {
-		p, err := packets.Next()
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			return nil, err
-		}
-
-		switch pkt := p.(type) {
-		case *packet.UserId:
-			current = new(Identity)
-			current.Name = pkt.Id
-			current.UserId = pkt
-			e.Identities[pkt.Id] = current
-
-			for {
-				p, err = packets.Next()
-				if err == io.EOF {
-					return nil, io.ErrUnexpectedEOF
-				} else if err != nil {
-					return nil, err
-				}
-
-				sig, ok := p.(*packet.Signature)
-				if !ok {
-					return nil, errors.StructuralError("user ID packet not followed by self-signature")
-				}
-
-				if (sig.SigType == packet.SigTypePositiveCert || sig.SigType == packet.SigTypeGenericCert) && sig.IssuerKeyId != nil && *sig.IssuerKeyId == e.PrimaryKey.KeyId {
-					if err = e.PrimaryKey.VerifyUserIdSignature(pkt.Id, e.PrimaryKey, sig); err != nil {
-						return nil, errors.StructuralError("user ID self-signature invalid: " + err.Error())
-					}
-					current.SelfSignature = sig
-					break
-				}
-				current.Signatures = append(current.Signatures, sig)
-			}
-		case *packet.Signature:
-			if pkt.SigType == packet.SigTypeKeyRevocation {
-				revocations = append(revocations, pkt)
-			} else if pkt.SigType == packet.SigTypeDirectSignature {
-				// TODO: RFC4880 5.2.1 permits signatures
-				// directly on keys (eg. to bind additional
-				// revocation keys).
-			} else if current == nil {
-				return nil, errors.StructuralError("signature packet found before user id packet")
-			} else {
-				current.Signatures = append(current.Signatures, pkt)
-			}
-		case *packet.PrivateKey:
-			if pkt.IsSubkey == false {
-				packets.Unread(p)
-				break EachPacket
-			}
-			err = addSubkey(e, packets, &pkt.PublicKey, pkt)
-			if err != nil {
-				return nil, err
-			}
-		case *packet.PublicKey:
-			if pkt.IsSubkey == false {
-				packets.Unread(p)
-				break EachPacket
-			}
-			err = addSubkey(e, packets, pkt, nil)
-			if err != nil {
-				return nil, err
-			}
-		default:
-			// we ignore unknown packets
-		}
-	}
-
-	if len(e.Identities) == 0 {
-		return nil, errors.StructuralError("entity without any identities")
-	}
-
-	for _, revocation := range revocations {
-		err = e.PrimaryKey.VerifyRevocationSignature(revocation)
-		if err == nil {
-			e.Revocations = append(e.Revocations, revocation)
-		} else {
-			// TODO: RFC 4880 5.2.3.15 defines revocation keys.
-			return nil, errors.StructuralError("revocation signature signed by alternate key")
-		}
-	}
-
-	return e, nil
-}
-
-func addSubkey(e *Entity, packets *packet.Reader, pub *packet.PublicKey, priv *packet.PrivateKey) error {
-	var subKey Subkey
-	subKey.PublicKey = pub
-	subKey.PrivateKey = priv
-	p, err := packets.Next()
-	if err == io.EOF {
-		return io.ErrUnexpectedEOF
-	}
-	if err != nil {
-		return errors.StructuralError("subkey signature invalid: " + err.Error())
-	}
-	var ok bool
-	subKey.Sig, ok = p.(*packet.Signature)
-	if !ok {
-		return errors.StructuralError("subkey packet not followed by signature")
-	}
-	if subKey.Sig.SigType != packet.SigTypeSubkeyBinding && subKey.Sig.SigType != packet.SigTypeSubkeyRevocation {
-		return errors.StructuralError("subkey signature with wrong type")
-	}
-	err = e.PrimaryKey.VerifyKeySignature(subKey.PublicKey, subKey.Sig)
-	if err != nil {
-		return errors.StructuralError("subkey signature invalid: " + err.Error())
-	}
-	e.Subkeys = append(e.Subkeys, subKey)
-	return nil
-}
-
-const defaultRSAKeyBits = 2048
-
-// NewEntity returns an Entity that contains a fresh RSA/RSA keypair with a
-// single identity composed of the given full name, comment and email, any of
-// which may be empty but must not contain any of "()<>\x00".
-// If config is nil, sensible defaults will be used.
-func NewEntity(name, comment, email string, config *packet.Config) (*Entity, error) {
-	currentTime := config.Now()
-
-	uid := packet.NewUserId(name, comment, email)
-	if uid == nil {
-		return nil, errors.InvalidArgumentError("user id field contained invalid characters")
-	}
-	signingPriv, err := rsa.GenerateKey(config.Random(), defaultRSAKeyBits)
-	if err != nil {
-		return nil, err
-	}
-	encryptingPriv, err := rsa.GenerateKey(config.Random(), defaultRSAKeyBits)
-	if err != nil {
-		return nil, err
-	}
-
-	e := &Entity{
-		PrimaryKey: packet.NewRSAPublicKey(currentTime, &signingPriv.PublicKey),
-		PrivateKey: packet.NewRSAPrivateKey(currentTime, signingPriv),
-		Identities: make(map[string]*Identity),
-	}
-	isPrimaryId := true
-	e.Identities[uid.Id] = &Identity{
-		Name:   uid.Name,
-		UserId: uid,
-		SelfSignature: &packet.Signature{
-			CreationTime: currentTime,
-			SigType:      packet.SigTypePositiveCert,
-			PubKeyAlgo:   packet.PubKeyAlgoRSA,
-			Hash:         config.Hash(),
-			IsPrimaryId:  &isPrimaryId,
-			FlagsValid:   true,
-			FlagSign:     true,
-			FlagCertify:  true,
-			IssuerKeyId:  &e.PrimaryKey.KeyId,
-		},
-	}
-
-	e.Subkeys = make([]Subkey, 1)
-	e.Subkeys[0] = Subkey{
-		PublicKey:  packet.NewRSAPublicKey(currentTime, &encryptingPriv.PublicKey),
-		PrivateKey: packet.NewRSAPrivateKey(currentTime, encryptingPriv),
-		Sig: &packet.Signature{
-			CreationTime:              currentTime,
-			SigType:                   packet.SigTypeSubkeyBinding,
-			PubKeyAlgo:                packet.PubKeyAlgoRSA,
-			Hash:                      config.Hash(),
-			FlagsValid:                true,
-			FlagEncryptStorage:        true,
-			FlagEncryptCommunications: true,
-			IssuerKeyId:               &e.PrimaryKey.KeyId,
-		},
-	}
-	e.Subkeys[0].PublicKey.IsSubkey = true
-	e.Subkeys[0].PrivateKey.IsSubkey = true
-
-	return e, nil
-}
-
-// SerializePrivate serializes an Entity, including private key material, to
-// the given Writer. For now, it must only be used on an Entity returned from
-// NewEntity.
-// If config is nil, sensible defaults will be used.
-func (e *Entity) SerializePrivate(w io.Writer, config *packet.Config) (err error) {
-	err = e.PrivateKey.Serialize(w)
-	if err != nil {
-		return
-	}
-	for _, ident := range e.Identities {
-		err = ident.UserId.Serialize(w)
-		if err != nil {
-			return
-		}
-		err = ident.SelfSignature.SignUserId(ident.UserId.Id, e.PrimaryKey, e.PrivateKey, config)
-		if err != nil {
-			return
-		}
-		err = ident.SelfSignature.Serialize(w)
-		if err != nil {
-			return
-		}
-	}
-	for _, subkey := range e.Subkeys {
-		err = subkey.PrivateKey.Serialize(w)
-		if err != nil {
-			return
-		}
-		err = subkey.Sig.SignKey(subkey.PublicKey, e.PrivateKey, config)
-		if err != nil {
-			return
-		}
-		err = subkey.Sig.Serialize(w)
-		if err != nil {
-			return
-		}
-	}
-	return nil
-}
-
-// Serialize writes the public part of the given Entity to w. (No private
-// key material will be output).
-func (e *Entity) Serialize(w io.Writer) error {
-	err := e.PrimaryKey.Serialize(w)
-	if err != nil {
-		return err
-	}
-	for _, ident := range e.Identities {
-		err = ident.UserId.Serialize(w)
-		if err != nil {
-			return err
-		}
-		err = ident.SelfSignature.Serialize(w)
-		if err != nil {
-			return err
-		}
-		for _, sig := range ident.Signatures {
-			err = sig.Serialize(w)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	for _, subkey := range e.Subkeys {
-		err = subkey.PublicKey.Serialize(w)
-		if err != nil {
-			return err
-		}
-		err = subkey.Sig.Serialize(w)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// SignIdentity adds a signature to e, from signer, attesting that identity is
-// associated with e. The provided identity must already be an element of
-// e.Identities and the private key of signer must have been decrypted if
-// necessary.
-// If config is nil, sensible defaults will be used.
-func (e *Entity) SignIdentity(identity string, signer *Entity, config *packet.Config) error {
-	if signer.PrivateKey == nil {
-		return errors.InvalidArgumentError("signing Entity must have a private key")
-	}
-	if signer.PrivateKey.Encrypted {
-		return errors.InvalidArgumentError("signing Entity's private key must be decrypted")
-	}
-	ident, ok := e.Identities[identity]
-	if !ok {
-		return errors.InvalidArgumentError("given identity string not found in Entity")
-	}
-
-	sig := &packet.Signature{
-		SigType:      packet.SigTypeGenericCert,
-		PubKeyAlgo:   signer.PrivateKey.PubKeyAlgo,
-		Hash:         config.Hash(),
-		CreationTime: config.Now(),
-		IssuerKeyId:  &signer.PrivateKey.KeyId,
-	}
-	if err := sig.SignUserId(identity, e.PrimaryKey, signer.PrivateKey, config); err != nil {
-		return err
-	}
-	ident.Signatures = append(ident.Signatures, sig)
-	return nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/compressed.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/compressed.go
deleted file mode 100644
index e8f0b5caa7..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/compressed.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"compress/bzip2"
-	"compress/flate"
-	"compress/zlib"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-	"strconv"
-)
-
-// Compressed represents a compressed OpenPGP packet. The decompressed contents
-// will contain more OpenPGP packets. See RFC 4880, section 5.6.
-type Compressed struct {
-	Body io.Reader
-}
-
-const (
-	NoCompression      = flate.NoCompression
-	BestSpeed          = flate.BestSpeed
-	BestCompression    = flate.BestCompression
-	DefaultCompression = flate.DefaultCompression
-)
-
-// CompressionConfig contains compressor configuration settings.
-type CompressionConfig struct {
-	// Level is the compression level to use. It must be set to
-	// between -1 and 9, with -1 causing the compressor to use the
-	// default compression level, 0 causing the compressor to use
-	// no compression and 1 to 9 representing increasing (better,
-	// slower) compression levels. If Level is less than -1 or
-	// more then 9, a non-nil error will be returned during
-	// encryption. See the constants above for convenient common
-	// settings for Level.
-	Level int
-}
-
-func (c *Compressed) parse(r io.Reader) error {
-	var buf [1]byte
-	_, err := readFull(r, buf[:])
-	if err != nil {
-		return err
-	}
-
-	switch buf[0] {
-	case 1:
-		c.Body = flate.NewReader(r)
-	case 2:
-		c.Body, err = zlib.NewReader(r)
-	case 3:
-		c.Body = bzip2.NewReader(r)
-	default:
-		err = errors.UnsupportedError("unknown compression algorithm: " + strconv.Itoa(int(buf[0])))
-	}
-
-	return err
-}
-
-// compressedWriterCloser represents the serialized compression stream
-// header and the compressor. Its Close() method ensures that both the
-// compressor and serialized stream header are closed. Its Write()
-// method writes to the compressor.
-type compressedWriteCloser struct {
-	sh io.Closer      // Stream Header
-	c  io.WriteCloser // Compressor
-}
-
-func (cwc compressedWriteCloser) Write(p []byte) (int, error) {
-	return cwc.c.Write(p)
-}
-
-func (cwc compressedWriteCloser) Close() (err error) {
-	err = cwc.c.Close()
-	if err != nil {
-		return err
-	}
-
-	return cwc.sh.Close()
-}
-
-// SerializeCompressed serializes a compressed data packet to w and
-// returns a WriteCloser to which the literal data packets themselves
-// can be written and which MUST be closed on completion. If cc is
-// nil, sensible defaults will be used to configure the compression
-// algorithm.
-func SerializeCompressed(w io.WriteCloser, algo CompressionAlgo, cc *CompressionConfig) (literaldata io.WriteCloser, err error) {
-	compressed, err := serializeStreamHeader(w, packetTypeCompressed)
-	if err != nil {
-		return
-	}
-
-	_, err = compressed.Write([]byte{uint8(algo)})
-	if err != nil {
-		return
-	}
-
-	level := DefaultCompression
-	if cc != nil {
-		level = cc.Level
-	}
-
-	var compressor io.WriteCloser
-	switch algo {
-	case CompressionZIP:
-		compressor, err = flate.NewWriter(compressed, level)
-	case CompressionZLIB:
-		compressor, err = zlib.NewWriterLevel(compressed, level)
-	default:
-		s := strconv.Itoa(int(algo))
-		err = errors.UnsupportedError("Unsupported compression algorithm: " + s)
-	}
-	if err != nil {
-		return
-	}
-
-	literaldata = compressedWriteCloser{compressed, compressor}
-
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/config.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/config.go
deleted file mode 100644
index d977cde63f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/config.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto"
-	"crypto/rand"
-	"io"
-	"time"
-)
-
-// Config collects a number of parameters along with sensible defaults.
-// A nil *Config is valid and results in all default values.
-type Config struct {
-	// Rand provides the source of entropy.
-	// If nil, the crypto/rand Reader is used.
-	Rand io.Reader
-	// DefaultHash is the default hash function to be used.
-	// If zero, SHA-256 is used.
-	DefaultHash crypto.Hash
-	// DefaultCipher is the cipher to be used.
-	// If zero, AES-128 is used.
-	DefaultCipher CipherFunction
-	// Time returns the current time as the number of seconds since the
-	// epoch. If Time is nil, time.Now is used.
-	Time func() time.Time
-	// DefaultCompressionAlgo is the compression algorithm to be
-	// applied to the plaintext before encryption. If zero, no
-	// compression is done.
-	DefaultCompressionAlgo CompressionAlgo
-	// CompressionConfig configures the compression settings.
-	CompressionConfig *CompressionConfig
-	// S2KCount is only used for symmetric encryption. It
-	// determines the strength of the passphrase stretching when
-	// the said passphrase is hashed to produce a key. S2KCount
-	// should be between 1024 and 65011712, inclusive. If Config
-	// is nil or S2KCount is 0, the value 65536 used. Not all
-	// values in the above range can be represented. S2KCount will
-	// be rounded up to the next representable value if it cannot
-	// be encoded exactly. When set, it is strongly encrouraged to
-	// use a value that is at least 65536. See RFC 4880 Section
-	// 3.7.1.3.
-	S2KCount int
-}
-
-func (c *Config) Random() io.Reader {
-	if c == nil || c.Rand == nil {
-		return rand.Reader
-	}
-	return c.Rand
-}
-
-func (c *Config) Hash() crypto.Hash {
-	if c == nil || uint(c.DefaultHash) == 0 {
-		return crypto.SHA256
-	}
-	return c.DefaultHash
-}
-
-func (c *Config) Cipher() CipherFunction {
-	if c == nil || uint8(c.DefaultCipher) == 0 {
-		return CipherAES128
-	}
-	return c.DefaultCipher
-}
-
-func (c *Config) Now() time.Time {
-	if c == nil || c.Time == nil {
-		return time.Now()
-	}
-	return c.Time()
-}
-
-func (c *Config) Compression() CompressionAlgo {
-	if c == nil {
-		return CompressionNone
-	}
-	return c.DefaultCompressionAlgo
-}
-
-func (c *Config) PasswordHashIterations() int {
-	if c == nil || c.S2KCount == 0 {
-		return 0
-	}
-	return c.S2KCount
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/encrypted_key.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/encrypted_key.go
deleted file mode 100644
index b43522cd50..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/encrypted_key.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto/rsa"
-	"encoding/binary"
-	"golang.org/x/crypto/openpgp/elgamal"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-	"math/big"
-	"strconv"
-)
-
-const encryptedKeyVersion = 3
-
-// EncryptedKey represents a public-key encrypted session key. See RFC 4880,
-// section 5.1.
-type EncryptedKey struct {
-	KeyId      uint64
-	Algo       PublicKeyAlgorithm
-	CipherFunc CipherFunction // only valid after a successful Decrypt
-	Key        []byte         // only valid after a successful Decrypt
-
-	encryptedMPI1, encryptedMPI2 []byte
-}
-
-func (e *EncryptedKey) parse(r io.Reader) (err error) {
-	var buf [10]byte
-	_, err = readFull(r, buf[:])
-	if err != nil {
-		return
-	}
-	if buf[0] != encryptedKeyVersion {
-		return errors.UnsupportedError("unknown EncryptedKey version " + strconv.Itoa(int(buf[0])))
-	}
-	e.KeyId = binary.BigEndian.Uint64(buf[1:9])
-	e.Algo = PublicKeyAlgorithm(buf[9])
-	switch e.Algo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
-		e.encryptedMPI1, _, err = readMPI(r)
-	case PubKeyAlgoElGamal:
-		e.encryptedMPI1, _, err = readMPI(r)
-		if err != nil {
-			return
-		}
-		e.encryptedMPI2, _, err = readMPI(r)
-	}
-	_, err = consumeAll(r)
-	return
-}
-
-func checksumKeyMaterial(key []byte) uint16 {
-	var checksum uint16
-	for _, v := range key {
-		checksum += uint16(v)
-	}
-	return checksum
-}
-
-// Decrypt decrypts an encrypted session key with the given private key. The
-// private key must have been decrypted first.
-// If config is nil, sensible defaults will be used.
-func (e *EncryptedKey) Decrypt(priv *PrivateKey, config *Config) error {
-	var err error
-	var b []byte
-
-	// TODO(agl): use session key decryption routines here to avoid
-	// padding oracle attacks.
-	switch priv.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
-		b, err = rsa.DecryptPKCS1v15(config.Random(), priv.PrivateKey.(*rsa.PrivateKey), e.encryptedMPI1)
-	case PubKeyAlgoElGamal:
-		c1 := new(big.Int).SetBytes(e.encryptedMPI1)
-		c2 := new(big.Int).SetBytes(e.encryptedMPI2)
-		b, err = elgamal.Decrypt(priv.PrivateKey.(*elgamal.PrivateKey), c1, c2)
-	default:
-		err = errors.InvalidArgumentError("cannot decrypted encrypted session key with private key of type " + strconv.Itoa(int(priv.PubKeyAlgo)))
-	}
-
-	if err != nil {
-		return err
-	}
-
-	e.CipherFunc = CipherFunction(b[0])
-	e.Key = b[1 : len(b)-2]
-	expectedChecksum := uint16(b[len(b)-2])<<8 | uint16(b[len(b)-1])
-	checksum := checksumKeyMaterial(e.Key)
-	if checksum != expectedChecksum {
-		return errors.StructuralError("EncryptedKey checksum incorrect")
-	}
-
-	return nil
-}
-
-// SerializeEncryptedKey serializes an encrypted key packet to w that contains
-// key, encrypted to pub.
-// If config is nil, sensible defaults will be used.
-func SerializeEncryptedKey(w io.Writer, pub *PublicKey, cipherFunc CipherFunction, key []byte, config *Config) error {
-	var buf [10]byte
-	buf[0] = encryptedKeyVersion
-	binary.BigEndian.PutUint64(buf[1:9], pub.KeyId)
-	buf[9] = byte(pub.PubKeyAlgo)
-
-	keyBlock := make([]byte, 1 /* cipher type */ +len(key)+2 /* checksum */)
-	keyBlock[0] = byte(cipherFunc)
-	copy(keyBlock[1:], key)
-	checksum := checksumKeyMaterial(key)
-	keyBlock[1+len(key)] = byte(checksum >> 8)
-	keyBlock[1+len(key)+1] = byte(checksum)
-
-	switch pub.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
-		return serializeEncryptedKeyRSA(w, config.Random(), buf, pub.PublicKey.(*rsa.PublicKey), keyBlock)
-	case PubKeyAlgoElGamal:
-		return serializeEncryptedKeyElGamal(w, config.Random(), buf, pub.PublicKey.(*elgamal.PublicKey), keyBlock)
-	case PubKeyAlgoDSA, PubKeyAlgoRSASignOnly:
-		return errors.InvalidArgumentError("cannot encrypt to public key of type " + strconv.Itoa(int(pub.PubKeyAlgo)))
-	}
-
-	return errors.UnsupportedError("encrypting a key to public key of type " + strconv.Itoa(int(pub.PubKeyAlgo)))
-}
-
-func serializeEncryptedKeyRSA(w io.Writer, rand io.Reader, header [10]byte, pub *rsa.PublicKey, keyBlock []byte) error {
-	cipherText, err := rsa.EncryptPKCS1v15(rand, pub, keyBlock)
-	if err != nil {
-		return errors.InvalidArgumentError("RSA encryption failed: " + err.Error())
-	}
-
-	packetLen := 10 /* header length */ + 2 /* mpi size */ + len(cipherText)
-
-	err = serializeHeader(w, packetTypeEncryptedKey, packetLen)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(header[:])
-	if err != nil {
-		return err
-	}
-	return writeMPI(w, 8*uint16(len(cipherText)), cipherText)
-}
-
-func serializeEncryptedKeyElGamal(w io.Writer, rand io.Reader, header [10]byte, pub *elgamal.PublicKey, keyBlock []byte) error {
-	c1, c2, err := elgamal.Encrypt(rand, pub, keyBlock)
-	if err != nil {
-		return errors.InvalidArgumentError("ElGamal encryption failed: " + err.Error())
-	}
-
-	packetLen := 10 /* header length */
-	packetLen += 2 /* mpi size */ + (c1.BitLen()+7)/8
-	packetLen += 2 /* mpi size */ + (c2.BitLen()+7)/8
-
-	err = serializeHeader(w, packetTypeEncryptedKey, packetLen)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(header[:])
-	if err != nil {
-		return err
-	}
-	err = writeBig(w, c1)
-	if err != nil {
-		return err
-	}
-	return writeBig(w, c2)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/literal.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/literal.go
deleted file mode 100644
index 1a9ec6e51e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/literal.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"encoding/binary"
-	"io"
-)
-
-// LiteralData represents an encrypted file. See RFC 4880, section 5.9.
-type LiteralData struct {
-	IsBinary bool
-	FileName string
-	Time     uint32 // Unix epoch time. Either creation time or modification time. 0 means undefined.
-	Body     io.Reader
-}
-
-// ForEyesOnly returns whether the contents of the LiteralData have been marked
-// as especially sensitive.
-func (l *LiteralData) ForEyesOnly() bool {
-	return l.FileName == "_CONSOLE"
-}
-
-func (l *LiteralData) parse(r io.Reader) (err error) {
-	var buf [256]byte
-
-	_, err = readFull(r, buf[:2])
-	if err != nil {
-		return
-	}
-
-	l.IsBinary = buf[0] == 'b'
-	fileNameLen := int(buf[1])
-
-	_, err = readFull(r, buf[:fileNameLen])
-	if err != nil {
-		return
-	}
-
-	l.FileName = string(buf[:fileNameLen])
-
-	_, err = readFull(r, buf[:4])
-	if err != nil {
-		return
-	}
-
-	l.Time = binary.BigEndian.Uint32(buf[:4])
-	l.Body = r
-	return
-}
-
-// SerializeLiteral serializes a literal data packet to w and returns a
-// WriteCloser to which the data itself can be written and which MUST be closed
-// on completion. The fileName is truncated to 255 bytes.
-func SerializeLiteral(w io.WriteCloser, isBinary bool, fileName string, time uint32) (plaintext io.WriteCloser, err error) {
-	var buf [4]byte
-	buf[0] = 't'
-	if isBinary {
-		buf[0] = 'b'
-	}
-	if len(fileName) > 255 {
-		fileName = fileName[:255]
-	}
-	buf[1] = byte(len(fileName))
-
-	inner, err := serializeStreamHeader(w, packetTypeLiteralData)
-	if err != nil {
-		return
-	}
-
-	_, err = inner.Write(buf[:2])
-	if err != nil {
-		return
-	}
-	_, err = inner.Write([]byte(fileName))
-	if err != nil {
-		return
-	}
-	binary.BigEndian.PutUint32(buf[:], time)
-	_, err = inner.Write(buf[:])
-	if err != nil {
-		return
-	}
-
-	plaintext = inner
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/ocfb.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/ocfb.go
deleted file mode 100644
index ce2a33a547..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/ocfb.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// OpenPGP CFB Mode. http://tools.ietf.org/html/rfc4880#section-13.9
-
-package packet
-
-import (
-	"crypto/cipher"
-)
-
-type ocfbEncrypter struct {
-	b       cipher.Block
-	fre     []byte
-	outUsed int
-}
-
-// An OCFBResyncOption determines if the "resynchronization step" of OCFB is
-// performed.
-type OCFBResyncOption bool
-
-const (
-	OCFBResync   OCFBResyncOption = true
-	OCFBNoResync OCFBResyncOption = false
-)
-
-// NewOCFBEncrypter returns a cipher.Stream which encrypts data with OpenPGP's
-// cipher feedback mode using the given cipher.Block, and an initial amount of
-// ciphertext.  randData must be random bytes and be the same length as the
-// cipher.Block's block size. Resync determines if the "resynchronization step"
-// from RFC 4880, 13.9 step 7 is performed. Different parts of OpenPGP vary on
-// this point.
-func NewOCFBEncrypter(block cipher.Block, randData []byte, resync OCFBResyncOption) (cipher.Stream, []byte) {
-	blockSize := block.BlockSize()
-	if len(randData) != blockSize {
-		return nil, nil
-	}
-
-	x := &ocfbEncrypter{
-		b:       block,
-		fre:     make([]byte, blockSize),
-		outUsed: 0,
-	}
-	prefix := make([]byte, blockSize+2)
-
-	block.Encrypt(x.fre, x.fre)
-	for i := 0; i < blockSize; i++ {
-		prefix[i] = randData[i] ^ x.fre[i]
-	}
-
-	block.Encrypt(x.fre, prefix[:blockSize])
-	prefix[blockSize] = x.fre[0] ^ randData[blockSize-2]
-	prefix[blockSize+1] = x.fre[1] ^ randData[blockSize-1]
-
-	if resync {
-		block.Encrypt(x.fre, prefix[2:])
-	} else {
-		x.fre[0] = prefix[blockSize]
-		x.fre[1] = prefix[blockSize+1]
-		x.outUsed = 2
-	}
-	return x, prefix
-}
-
-func (x *ocfbEncrypter) XORKeyStream(dst, src []byte) {
-	for i := 0; i < len(src); i++ {
-		if x.outUsed == len(x.fre) {
-			x.b.Encrypt(x.fre, x.fre)
-			x.outUsed = 0
-		}
-
-		x.fre[x.outUsed] ^= src[i]
-		dst[i] = x.fre[x.outUsed]
-		x.outUsed++
-	}
-}
-
-type ocfbDecrypter struct {
-	b       cipher.Block
-	fre     []byte
-	outUsed int
-}
-
-// NewOCFBDecrypter returns a cipher.Stream which decrypts data with OpenPGP's
-// cipher feedback mode using the given cipher.Block. Prefix must be the first
-// blockSize + 2 bytes of the ciphertext, where blockSize is the cipher.Block's
-// block size. If an incorrect key is detected then nil is returned. On
-// successful exit, blockSize+2 bytes of decrypted data are written into
-// prefix. Resync determines if the "resynchronization step" from RFC 4880,
-// 13.9 step 7 is performed. Different parts of OpenPGP vary on this point.
-func NewOCFBDecrypter(block cipher.Block, prefix []byte, resync OCFBResyncOption) cipher.Stream {
-	blockSize := block.BlockSize()
-	if len(prefix) != blockSize+2 {
-		return nil
-	}
-
-	x := &ocfbDecrypter{
-		b:       block,
-		fre:     make([]byte, blockSize),
-		outUsed: 0,
-	}
-	prefixCopy := make([]byte, len(prefix))
-	copy(prefixCopy, prefix)
-
-	block.Encrypt(x.fre, x.fre)
-	for i := 0; i < blockSize; i++ {
-		prefixCopy[i] ^= x.fre[i]
-	}
-
-	block.Encrypt(x.fre, prefix[:blockSize])
-	prefixCopy[blockSize] ^= x.fre[0]
-	prefixCopy[blockSize+1] ^= x.fre[1]
-
-	if prefixCopy[blockSize-2] != prefixCopy[blockSize] ||
-		prefixCopy[blockSize-1] != prefixCopy[blockSize+1] {
-		return nil
-	}
-
-	if resync {
-		block.Encrypt(x.fre, prefix[2:])
-	} else {
-		x.fre[0] = prefix[blockSize]
-		x.fre[1] = prefix[blockSize+1]
-		x.outUsed = 2
-	}
-	copy(prefix, prefixCopy)
-	return x
-}
-
-func (x *ocfbDecrypter) XORKeyStream(dst, src []byte) {
-	for i := 0; i < len(src); i++ {
-		if x.outUsed == len(x.fre) {
-			x.b.Encrypt(x.fre, x.fre)
-			x.outUsed = 0
-		}
-
-		c := src[i]
-		dst[i] = x.fre[x.outUsed] ^ src[i]
-		x.fre[x.outUsed] = c
-		x.outUsed++
-	}
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/one_pass_signature.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
deleted file mode 100644
index 1713503395..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto"
-	"encoding/binary"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-	"io"
-	"strconv"
-)
-
-// OnePassSignature represents a one-pass signature packet. See RFC 4880,
-// section 5.4.
-type OnePassSignature struct {
-	SigType    SignatureType
-	Hash       crypto.Hash
-	PubKeyAlgo PublicKeyAlgorithm
-	KeyId      uint64
-	IsLast     bool
-}
-
-const onePassSignatureVersion = 3
-
-func (ops *OnePassSignature) parse(r io.Reader) (err error) {
-	var buf [13]byte
-
-	_, err = readFull(r, buf[:])
-	if err != nil {
-		return
-	}
-	if buf[0] != onePassSignatureVersion {
-		err = errors.UnsupportedError("one-pass-signature packet version " + strconv.Itoa(int(buf[0])))
-	}
-
-	var ok bool
-	ops.Hash, ok = s2k.HashIdToHash(buf[2])
-	if !ok {
-		return errors.UnsupportedError("hash function: " + strconv.Itoa(int(buf[2])))
-	}
-
-	ops.SigType = SignatureType(buf[1])
-	ops.PubKeyAlgo = PublicKeyAlgorithm(buf[3])
-	ops.KeyId = binary.BigEndian.Uint64(buf[4:12])
-	ops.IsLast = buf[12] != 0
-	return
-}
-
-// Serialize marshals the given OnePassSignature to w.
-func (ops *OnePassSignature) Serialize(w io.Writer) error {
-	var buf [13]byte
-	buf[0] = onePassSignatureVersion
-	buf[1] = uint8(ops.SigType)
-	var ok bool
-	buf[2], ok = s2k.HashToHashId(ops.Hash)
-	if !ok {
-		return errors.UnsupportedError("hash type: " + strconv.Itoa(int(ops.Hash)))
-	}
-	buf[3] = uint8(ops.PubKeyAlgo)
-	binary.BigEndian.PutUint64(buf[4:12], ops.KeyId)
-	if ops.IsLast {
-		buf[12] = 1
-	}
-
-	if err := serializeHeader(w, packetTypeOnePassSignature, len(buf)); err != nil {
-		return err
-	}
-	_, err := w.Write(buf[:])
-	return err
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/opaque.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/opaque.go
deleted file mode 100644
index f2e00b9827..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/opaque.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-	"io/ioutil"
-)
-
-// OpaquePacket represents an OpenPGP packet as raw, unparsed data. This is
-// useful for splitting and storing the original packet contents separately,
-// handling unsupported packet types or accessing parts of the packet not yet
-// implemented by this package.
-type OpaquePacket struct {
-	// Packet type
-	Tag uint8
-	// Reason why the packet was parsed opaquely
-	Reason error
-	// Binary contents of the packet data
-	Contents []byte
-}
-
-func (op *OpaquePacket) parse(r io.Reader) (err error) {
-	op.Contents, err = ioutil.ReadAll(r)
-	return
-}
-
-// Serialize marshals the packet to a writer in its original form, including
-// the packet header.
-func (op *OpaquePacket) Serialize(w io.Writer) (err error) {
-	err = serializeHeader(w, packetType(op.Tag), len(op.Contents))
-	if err == nil {
-		_, err = w.Write(op.Contents)
-	}
-	return
-}
-
-// Parse attempts to parse the opaque contents into a structure supported by
-// this package. If the packet is not known then the result will be another
-// OpaquePacket.
-func (op *OpaquePacket) Parse() (p Packet, err error) {
-	hdr := bytes.NewBuffer(nil)
-	err = serializeHeader(hdr, packetType(op.Tag), len(op.Contents))
-	if err != nil {
-		op.Reason = err
-		return op, err
-	}
-	p, err = Read(io.MultiReader(hdr, bytes.NewBuffer(op.Contents)))
-	if err != nil {
-		op.Reason = err
-		p = op
-	}
-	return
-}
-
-// OpaqueReader reads OpaquePackets from an io.Reader.
-type OpaqueReader struct {
-	r io.Reader
-}
-
-func NewOpaqueReader(r io.Reader) *OpaqueReader {
-	return &OpaqueReader{r: r}
-}
-
-// Read the next OpaquePacket.
-func (or *OpaqueReader) Next() (op *OpaquePacket, err error) {
-	tag, _, contents, err := readHeader(or.r)
-	if err != nil {
-		return
-	}
-	op = &OpaquePacket{Tag: uint8(tag), Reason: err}
-	err = op.parse(contents)
-	if err != nil {
-		consumeAll(contents)
-	}
-	return
-}
-
-// OpaqueSubpacket represents an unparsed OpenPGP subpacket,
-// as found in signature and user attribute packets.
-type OpaqueSubpacket struct {
-	SubType  uint8
-	Contents []byte
-}
-
-// OpaqueSubpackets extracts opaque, unparsed OpenPGP subpackets from
-// their byte representation.
-func OpaqueSubpackets(contents []byte) (result []*OpaqueSubpacket, err error) {
-	var (
-		subHeaderLen int
-		subPacket    *OpaqueSubpacket
-	)
-	for len(contents) > 0 {
-		subHeaderLen, subPacket, err = nextSubpacket(contents)
-		if err != nil {
-			break
-		}
-		result = append(result, subPacket)
-		contents = contents[subHeaderLen+len(subPacket.Contents):]
-	}
-	return
-}
-
-func nextSubpacket(contents []byte) (subHeaderLen int, subPacket *OpaqueSubpacket, err error) {
-	// RFC 4880, section 5.2.3.1
-	var subLen uint32
-	if len(contents) < 1 {
-		goto Truncated
-	}
-	subPacket = &OpaqueSubpacket{}
-	switch {
-	case contents[0] < 192:
-		subHeaderLen = 2 // 1 length byte, 1 subtype byte
-		if len(contents) < subHeaderLen {
-			goto Truncated
-		}
-		subLen = uint32(contents[0])
-		contents = contents[1:]
-	case contents[0] < 255:
-		subHeaderLen = 3 // 2 length bytes, 1 subtype
-		if len(contents) < subHeaderLen {
-			goto Truncated
-		}
-		subLen = uint32(contents[0]-192)<<8 + uint32(contents[1]) + 192
-		contents = contents[2:]
-	default:
-		subHeaderLen = 6 // 5 length bytes, 1 subtype
-		if len(contents) < subHeaderLen {
-			goto Truncated
-		}
-		subLen = uint32(contents[1])<<24 |
-			uint32(contents[2])<<16 |
-			uint32(contents[3])<<8 |
-			uint32(contents[4])
-		contents = contents[5:]
-	}
-	if subLen > uint32(len(contents)) {
-		goto Truncated
-	}
-	subPacket.SubType = contents[0]
-	subPacket.Contents = contents[1:subLen]
-	return
-Truncated:
-	err = errors.StructuralError("subpacket truncated")
-	return
-}
-
-func (osp *OpaqueSubpacket) Serialize(w io.Writer) (err error) {
-	buf := make([]byte, 6)
-	n := serializeSubpacketLength(buf, len(osp.Contents)+1)
-	buf[n] = osp.SubType
-	if _, err = w.Write(buf[:n+1]); err != nil {
-		return
-	}
-	_, err = w.Write(osp.Contents)
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet.go
deleted file mode 100644
index b1e7a7f0ba..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet.go
+++ /dev/null
@@ -1,538 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package packet implements parsing and serialization of OpenPGP packets, as
-// specified in RFC 4880.
-package packet
-
-import (
-	"bufio"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/des"
-	"golang.org/x/crypto/cast5"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-	"math/big"
-)
-
-// readFull is the same as io.ReadFull except that reading zero bytes returns
-// ErrUnexpectedEOF rather than EOF.
-func readFull(r io.Reader, buf []byte) (n int, err error) {
-	n, err = io.ReadFull(r, buf)
-	if err == io.EOF {
-		err = io.ErrUnexpectedEOF
-	}
-	return
-}
-
-// readLength reads an OpenPGP length from r. See RFC 4880, section 4.2.2.
-func readLength(r io.Reader) (length int64, isPartial bool, err error) {
-	var buf [4]byte
-	_, err = readFull(r, buf[:1])
-	if err != nil {
-		return
-	}
-	switch {
-	case buf[0] < 192:
-		length = int64(buf[0])
-	case buf[0] < 224:
-		length = int64(buf[0]-192) << 8
-		_, err = readFull(r, buf[0:1])
-		if err != nil {
-			return
-		}
-		length += int64(buf[0]) + 192
-	case buf[0] < 255:
-		length = int64(1) << (buf[0] & 0x1f)
-		isPartial = true
-	default:
-		_, err = readFull(r, buf[0:4])
-		if err != nil {
-			return
-		}
-		length = int64(buf[0])<<24 |
-			int64(buf[1])<<16 |
-			int64(buf[2])<<8 |
-			int64(buf[3])
-	}
-	return
-}
-
-// partialLengthReader wraps an io.Reader and handles OpenPGP partial lengths.
-// The continuation lengths are parsed and removed from the stream and EOF is
-// returned at the end of the packet. See RFC 4880, section 4.2.2.4.
-type partialLengthReader struct {
-	r         io.Reader
-	remaining int64
-	isPartial bool
-}
-
-func (r *partialLengthReader) Read(p []byte) (n int, err error) {
-	for r.remaining == 0 {
-		if !r.isPartial {
-			return 0, io.EOF
-		}
-		r.remaining, r.isPartial, err = readLength(r.r)
-		if err != nil {
-			return 0, err
-		}
-	}
-
-	toRead := int64(len(p))
-	if toRead > r.remaining {
-		toRead = r.remaining
-	}
-
-	n, err = r.r.Read(p[:int(toRead)])
-	r.remaining -= int64(n)
-	if n < int(toRead) && err == io.EOF {
-		err = io.ErrUnexpectedEOF
-	}
-	return
-}
-
-// partialLengthWriter writes a stream of data using OpenPGP partial lengths.
-// See RFC 4880, section 4.2.2.4.
-type partialLengthWriter struct {
-	w          io.WriteCloser
-	lengthByte [1]byte
-}
-
-func (w *partialLengthWriter) Write(p []byte) (n int, err error) {
-	for len(p) > 0 {
-		for power := uint(14); power < 32; power-- {
-			l := 1 << power
-			if len(p) >= l {
-				w.lengthByte[0] = 224 + uint8(power)
-				_, err = w.w.Write(w.lengthByte[:])
-				if err != nil {
-					return
-				}
-				var m int
-				m, err = w.w.Write(p[:l])
-				n += m
-				if err != nil {
-					return
-				}
-				p = p[l:]
-				break
-			}
-		}
-	}
-	return
-}
-
-func (w *partialLengthWriter) Close() error {
-	w.lengthByte[0] = 0
-	_, err := w.w.Write(w.lengthByte[:])
-	if err != nil {
-		return err
-	}
-	return w.w.Close()
-}
-
-// A spanReader is an io.LimitReader, but it returns ErrUnexpectedEOF if the
-// underlying Reader returns EOF before the limit has been reached.
-type spanReader struct {
-	r io.Reader
-	n int64
-}
-
-func (l *spanReader) Read(p []byte) (n int, err error) {
-	if l.n <= 0 {
-		return 0, io.EOF
-	}
-	if int64(len(p)) > l.n {
-		p = p[0:l.n]
-	}
-	n, err = l.r.Read(p)
-	l.n -= int64(n)
-	if l.n > 0 && err == io.EOF {
-		err = io.ErrUnexpectedEOF
-	}
-	return
-}
-
-// readHeader parses a packet header and returns an io.Reader which will return
-// the contents of the packet. See RFC 4880, section 4.2.
-func readHeader(r io.Reader) (tag packetType, length int64, contents io.Reader, err error) {
-	var buf [4]byte
-	_, err = io.ReadFull(r, buf[:1])
-	if err != nil {
-		return
-	}
-	if buf[0]&0x80 == 0 {
-		err = errors.StructuralError("tag byte does not have MSB set")
-		return
-	}
-	if buf[0]&0x40 == 0 {
-		// Old format packet
-		tag = packetType((buf[0] & 0x3f) >> 2)
-		lengthType := buf[0] & 3
-		if lengthType == 3 {
-			length = -1
-			contents = r
-			return
-		}
-		lengthBytes := 1 << lengthType
-		_, err = readFull(r, buf[0:lengthBytes])
-		if err != nil {
-			return
-		}
-		for i := 0; i < lengthBytes; i++ {
-			length <<= 8
-			length |= int64(buf[i])
-		}
-		contents = &spanReader{r, length}
-		return
-	}
-
-	// New format packet
-	tag = packetType(buf[0] & 0x3f)
-	length, isPartial, err := readLength(r)
-	if err != nil {
-		return
-	}
-	if isPartial {
-		contents = &partialLengthReader{
-			remaining: length,
-			isPartial: true,
-			r:         r,
-		}
-		length = -1
-	} else {
-		contents = &spanReader{r, length}
-	}
-	return
-}
-
-// serializeHeader writes an OpenPGP packet header to w. See RFC 4880, section
-// 4.2.
-func serializeHeader(w io.Writer, ptype packetType, length int) (err error) {
-	var buf [6]byte
-	var n int
-
-	buf[0] = 0x80 | 0x40 | byte(ptype)
-	if length < 192 {
-		buf[1] = byte(length)
-		n = 2
-	} else if length < 8384 {
-		length -= 192
-		buf[1] = 192 + byte(length>>8)
-		buf[2] = byte(length)
-		n = 3
-	} else {
-		buf[1] = 255
-		buf[2] = byte(length >> 24)
-		buf[3] = byte(length >> 16)
-		buf[4] = byte(length >> 8)
-		buf[5] = byte(length)
-		n = 6
-	}
-
-	_, err = w.Write(buf[:n])
-	return
-}
-
-// serializeStreamHeader writes an OpenPGP packet header to w where the
-// length of the packet is unknown. It returns a io.WriteCloser which can be
-// used to write the contents of the packet. See RFC 4880, section 4.2.
-func serializeStreamHeader(w io.WriteCloser, ptype packetType) (out io.WriteCloser, err error) {
-	var buf [1]byte
-	buf[0] = 0x80 | 0x40 | byte(ptype)
-	_, err = w.Write(buf[:])
-	if err != nil {
-		return
-	}
-	out = &partialLengthWriter{w: w}
-	return
-}
-
-// Packet represents an OpenPGP packet. Users are expected to try casting
-// instances of this interface to specific packet types.
-type Packet interface {
-	parse(io.Reader) error
-}
-
-// consumeAll reads from the given Reader until error, returning the number of
-// bytes read.
-func consumeAll(r io.Reader) (n int64, err error) {
-	var m int
-	var buf [1024]byte
-
-	for {
-		m, err = r.Read(buf[:])
-		n += int64(m)
-		if err == io.EOF {
-			err = nil
-			return
-		}
-		if err != nil {
-			return
-		}
-	}
-
-	panic("unreachable")
-}
-
-// packetType represents the numeric ids of the different OpenPGP packet types. See
-// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-2
-type packetType uint8
-
-const (
-	packetTypeEncryptedKey              packetType = 1
-	packetTypeSignature                 packetType = 2
-	packetTypeSymmetricKeyEncrypted     packetType = 3
-	packetTypeOnePassSignature          packetType = 4
-	packetTypePrivateKey                packetType = 5
-	packetTypePublicKey                 packetType = 6
-	packetTypePrivateSubkey             packetType = 7
-	packetTypeCompressed                packetType = 8
-	packetTypeSymmetricallyEncrypted    packetType = 9
-	packetTypeLiteralData               packetType = 11
-	packetTypeUserId                    packetType = 13
-	packetTypePublicSubkey              packetType = 14
-	packetTypeUserAttribute             packetType = 17
-	packetTypeSymmetricallyEncryptedMDC packetType = 18
-)
-
-// peekVersion detects the version of a public key packet about to
-// be read. A bufio.Reader at the original position of the io.Reader
-// is returned.
-func peekVersion(r io.Reader) (bufr *bufio.Reader, ver byte, err error) {
-	bufr = bufio.NewReader(r)
-	var verBuf []byte
-	if verBuf, err = bufr.Peek(1); err != nil {
-		return
-	}
-	ver = verBuf[0]
-	return
-}
-
-// Read reads a single OpenPGP packet from the given io.Reader. If there is an
-// error parsing a packet, the whole packet is consumed from the input.
-func Read(r io.Reader) (p Packet, err error) {
-	tag, _, contents, err := readHeader(r)
-	if err != nil {
-		return
-	}
-
-	switch tag {
-	case packetTypeEncryptedKey:
-		p = new(EncryptedKey)
-	case packetTypeSignature:
-		var version byte
-		// Detect signature version
-		if contents, version, err = peekVersion(contents); err != nil {
-			return
-		}
-		if version < 4 {
-			p = new(SignatureV3)
-		} else {
-			p = new(Signature)
-		}
-	case packetTypeSymmetricKeyEncrypted:
-		p = new(SymmetricKeyEncrypted)
-	case packetTypeOnePassSignature:
-		p = new(OnePassSignature)
-	case packetTypePrivateKey, packetTypePrivateSubkey:
-		pk := new(PrivateKey)
-		if tag == packetTypePrivateSubkey {
-			pk.IsSubkey = true
-		}
-		p = pk
-	case packetTypePublicKey, packetTypePublicSubkey:
-		var version byte
-		if contents, version, err = peekVersion(contents); err != nil {
-			return
-		}
-		isSubkey := tag == packetTypePublicSubkey
-		if version < 4 {
-			p = &PublicKeyV3{IsSubkey: isSubkey}
-		} else {
-			p = &PublicKey{IsSubkey: isSubkey}
-		}
-	case packetTypeCompressed:
-		p = new(Compressed)
-	case packetTypeSymmetricallyEncrypted:
-		p = new(SymmetricallyEncrypted)
-	case packetTypeLiteralData:
-		p = new(LiteralData)
-	case packetTypeUserId:
-		p = new(UserId)
-	case packetTypeUserAttribute:
-		p = new(UserAttribute)
-	case packetTypeSymmetricallyEncryptedMDC:
-		se := new(SymmetricallyEncrypted)
-		se.MDC = true
-		p = se
-	default:
-		err = errors.UnknownPacketTypeError(tag)
-	}
-	if p != nil {
-		err = p.parse(contents)
-	}
-	if err != nil {
-		consumeAll(contents)
-	}
-	return
-}
-
-// SignatureType represents the different semantic meanings of an OpenPGP
-// signature. See RFC 4880, section 5.2.1.
-type SignatureType uint8
-
-const (
-	SigTypeBinary           SignatureType = 0
-	SigTypeText                           = 1
-	SigTypeGenericCert                    = 0x10
-	SigTypePersonaCert                    = 0x11
-	SigTypeCasualCert                     = 0x12
-	SigTypePositiveCert                   = 0x13
-	SigTypeSubkeyBinding                  = 0x18
-	SigTypeDirectSignature                = 0x1F
-	SigTypeKeyRevocation                  = 0x20
-	SigTypeSubkeyRevocation               = 0x28
-)
-
-// PublicKeyAlgorithm represents the different public key system specified for
-// OpenPGP. See
-// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-12
-type PublicKeyAlgorithm uint8
-
-const (
-	PubKeyAlgoRSA            PublicKeyAlgorithm = 1
-	PubKeyAlgoRSAEncryptOnly PublicKeyAlgorithm = 2
-	PubKeyAlgoRSASignOnly    PublicKeyAlgorithm = 3
-	PubKeyAlgoElGamal        PublicKeyAlgorithm = 16
-	PubKeyAlgoDSA            PublicKeyAlgorithm = 17
-	// RFC 6637, Section 5.
-	PubKeyAlgoECDH  PublicKeyAlgorithm = 18
-	PubKeyAlgoECDSA PublicKeyAlgorithm = 19
-)
-
-// CanEncrypt returns true if it's possible to encrypt a message to a public
-// key of the given type.
-func (pka PublicKeyAlgorithm) CanEncrypt() bool {
-	switch pka {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoElGamal:
-		return true
-	}
-	return false
-}
-
-// CanSign returns true if it's possible for a public key of the given type to
-// sign a message.
-func (pka PublicKeyAlgorithm) CanSign() bool {
-	switch pka {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA:
-		return true
-	}
-	return false
-}
-
-// CipherFunction represents the different block ciphers specified for OpenPGP. See
-// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-13
-type CipherFunction uint8
-
-const (
-	Cipher3DES   CipherFunction = 2
-	CipherCAST5  CipherFunction = 3
-	CipherAES128 CipherFunction = 7
-	CipherAES192 CipherFunction = 8
-	CipherAES256 CipherFunction = 9
-)
-
-// KeySize returns the key size, in bytes, of cipher.
-func (cipher CipherFunction) KeySize() int {
-	switch cipher {
-	case Cipher3DES:
-		return 24
-	case CipherCAST5:
-		return cast5.KeySize
-	case CipherAES128:
-		return 16
-	case CipherAES192:
-		return 24
-	case CipherAES256:
-		return 32
-	}
-	return 0
-}
-
-// blockSize returns the block size, in bytes, of cipher.
-func (cipher CipherFunction) blockSize() int {
-	switch cipher {
-	case Cipher3DES:
-		return des.BlockSize
-	case CipherCAST5:
-		return 8
-	case CipherAES128, CipherAES192, CipherAES256:
-		return 16
-	}
-	return 0
-}
-
-// new returns a fresh instance of the given cipher.
-func (cipher CipherFunction) new(key []byte) (block cipher.Block) {
-	switch cipher {
-	case Cipher3DES:
-		block, _ = des.NewTripleDESCipher(key)
-	case CipherCAST5:
-		block, _ = cast5.NewCipher(key)
-	case CipherAES128, CipherAES192, CipherAES256:
-		block, _ = aes.NewCipher(key)
-	}
-	return
-}
-
-// readMPI reads a big integer from r. The bit length returned is the bit
-// length that was specified in r. This is preserved so that the integer can be
-// reserialized exactly.
-func readMPI(r io.Reader) (mpi []byte, bitLength uint16, err error) {
-	var buf [2]byte
-	_, err = readFull(r, buf[0:])
-	if err != nil {
-		return
-	}
-	bitLength = uint16(buf[0])<<8 | uint16(buf[1])
-	numBytes := (int(bitLength) + 7) / 8
-	mpi = make([]byte, numBytes)
-	_, err = readFull(r, mpi)
-	return
-}
-
-// mpiLength returns the length of the given *big.Int when serialized as an
-// MPI.
-func mpiLength(n *big.Int) (mpiLengthInBytes int) {
-	mpiLengthInBytes = 2 /* MPI length */
-	mpiLengthInBytes += (n.BitLen() + 7) / 8
-	return
-}
-
-// writeMPI serializes a big integer to w.
-func writeMPI(w io.Writer, bitLength uint16, mpiBytes []byte) (err error) {
-	_, err = w.Write([]byte{byte(bitLength >> 8), byte(bitLength)})
-	if err == nil {
-		_, err = w.Write(mpiBytes)
-	}
-	return
-}
-
-// writeBig serializes a *big.Int to w.
-func writeBig(w io.Writer, i *big.Int) error {
-	return writeMPI(w, uint16(i.BitLen()), i.Bytes())
-}
-
-// CompressionAlgo Represents the different compression algorithms
-// supported by OpenPGP (except for BZIP2, which is not currently
-// supported). See Section 9.3 of RFC 4880.
-type CompressionAlgo uint8
-
-const (
-	CompressionNone CompressionAlgo = 0
-	CompressionZIP  CompressionAlgo = 1
-	CompressionZLIB CompressionAlgo = 2
-)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/private_key.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/private_key.go
deleted file mode 100644
index 9685a342c4..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/private_key.go
+++ /dev/null
@@ -1,310 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto/cipher"
-	"crypto/dsa"
-	"crypto/rsa"
-	"crypto/sha1"
-	"golang.org/x/crypto/openpgp/elgamal"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-	"io"
-	"io/ioutil"
-	"math/big"
-	"strconv"
-	"time"
-)
-
-// PrivateKey represents a possibly encrypted private key. See RFC 4880,
-// section 5.5.3.
-type PrivateKey struct {
-	PublicKey
-	Encrypted     bool // if true then the private key is unavailable until Decrypt has been called.
-	encryptedData []byte
-	cipher        CipherFunction
-	s2k           func(out, in []byte)
-	PrivateKey    interface{} // An *rsa.PrivateKey or *dsa.PrivateKey.
-	sha1Checksum  bool
-	iv            []byte
-}
-
-func NewRSAPrivateKey(currentTime time.Time, priv *rsa.PrivateKey) *PrivateKey {
-	pk := new(PrivateKey)
-	pk.PublicKey = *NewRSAPublicKey(currentTime, &priv.PublicKey)
-	pk.PrivateKey = priv
-	return pk
-}
-
-func NewDSAPrivateKey(currentTime time.Time, priv *dsa.PrivateKey) *PrivateKey {
-	pk := new(PrivateKey)
-	pk.PublicKey = *NewDSAPublicKey(currentTime, &priv.PublicKey)
-	pk.PrivateKey = priv
-	return pk
-}
-
-func (pk *PrivateKey) parse(r io.Reader) (err error) {
-	err = (&pk.PublicKey).parse(r)
-	if err != nil {
-		return
-	}
-	var buf [1]byte
-	_, err = readFull(r, buf[:])
-	if err != nil {
-		return
-	}
-
-	s2kType := buf[0]
-
-	switch s2kType {
-	case 0:
-		pk.s2k = nil
-		pk.Encrypted = false
-	case 254, 255:
-		_, err = readFull(r, buf[:])
-		if err != nil {
-			return
-		}
-		pk.cipher = CipherFunction(buf[0])
-		pk.Encrypted = true
-		pk.s2k, err = s2k.Parse(r)
-		if err != nil {
-			return
-		}
-		if s2kType == 254 {
-			pk.sha1Checksum = true
-		}
-	default:
-		return errors.UnsupportedError("deprecated s2k function in private key")
-	}
-
-	if pk.Encrypted {
-		blockSize := pk.cipher.blockSize()
-		if blockSize == 0 {
-			return errors.UnsupportedError("unsupported cipher in private key: " + strconv.Itoa(int(pk.cipher)))
-		}
-		pk.iv = make([]byte, blockSize)
-		_, err = readFull(r, pk.iv)
-		if err != nil {
-			return
-		}
-	}
-
-	pk.encryptedData, err = ioutil.ReadAll(r)
-	if err != nil {
-		return
-	}
-
-	if !pk.Encrypted {
-		return pk.parsePrivateKey(pk.encryptedData)
-	}
-
-	return
-}
-
-func mod64kHash(d []byte) uint16 {
-	var h uint16
-	for _, b := range d {
-		h += uint16(b)
-	}
-	return h
-}
-
-func (pk *PrivateKey) Serialize(w io.Writer) (err error) {
-	// TODO(agl): support encrypted private keys
-	buf := bytes.NewBuffer(nil)
-	err = pk.PublicKey.serializeWithoutHeaders(buf)
-	if err != nil {
-		return
-	}
-	buf.WriteByte(0 /* no encryption */)
-
-	privateKeyBuf := bytes.NewBuffer(nil)
-
-	switch priv := pk.PrivateKey.(type) {
-	case *rsa.PrivateKey:
-		err = serializeRSAPrivateKey(privateKeyBuf, priv)
-	case *dsa.PrivateKey:
-		err = serializeDSAPrivateKey(privateKeyBuf, priv)
-	default:
-		err = errors.InvalidArgumentError("unknown private key type")
-	}
-	if err != nil {
-		return
-	}
-
-	ptype := packetTypePrivateKey
-	contents := buf.Bytes()
-	privateKeyBytes := privateKeyBuf.Bytes()
-	if pk.IsSubkey {
-		ptype = packetTypePrivateSubkey
-	}
-	err = serializeHeader(w, ptype, len(contents)+len(privateKeyBytes)+2)
-	if err != nil {
-		return
-	}
-	_, err = w.Write(contents)
-	if err != nil {
-		return
-	}
-	_, err = w.Write(privateKeyBytes)
-	if err != nil {
-		return
-	}
-
-	checksum := mod64kHash(privateKeyBytes)
-	var checksumBytes [2]byte
-	checksumBytes[0] = byte(checksum >> 8)
-	checksumBytes[1] = byte(checksum)
-	_, err = w.Write(checksumBytes[:])
-
-	return
-}
-
-func serializeRSAPrivateKey(w io.Writer, priv *rsa.PrivateKey) error {
-	err := writeBig(w, priv.D)
-	if err != nil {
-		return err
-	}
-	err = writeBig(w, priv.Primes[1])
-	if err != nil {
-		return err
-	}
-	err = writeBig(w, priv.Primes[0])
-	if err != nil {
-		return err
-	}
-	return writeBig(w, priv.Precomputed.Qinv)
-}
-
-func serializeDSAPrivateKey(w io.Writer, priv *dsa.PrivateKey) error {
-	return writeBig(w, priv.X)
-}
-
-// Decrypt decrypts an encrypted private key using a passphrase.
-func (pk *PrivateKey) Decrypt(passphrase []byte) error {
-	if !pk.Encrypted {
-		return nil
-	}
-
-	key := make([]byte, pk.cipher.KeySize())
-	pk.s2k(key, passphrase)
-	block := pk.cipher.new(key)
-	cfb := cipher.NewCFBDecrypter(block, pk.iv)
-
-	data := make([]byte, len(pk.encryptedData))
-	cfb.XORKeyStream(data, pk.encryptedData)
-
-	if pk.sha1Checksum {
-		if len(data) < sha1.Size {
-			return errors.StructuralError("truncated private key data")
-		}
-		h := sha1.New()
-		h.Write(data[:len(data)-sha1.Size])
-		sum := h.Sum(nil)
-		if !bytes.Equal(sum, data[len(data)-sha1.Size:]) {
-			return errors.StructuralError("private key checksum failure")
-		}
-		data = data[:len(data)-sha1.Size]
-	} else {
-		if len(data) < 2 {
-			return errors.StructuralError("truncated private key data")
-		}
-		var sum uint16
-		for i := 0; i < len(data)-2; i++ {
-			sum += uint16(data[i])
-		}
-		if data[len(data)-2] != uint8(sum>>8) ||
-			data[len(data)-1] != uint8(sum) {
-			return errors.StructuralError("private key checksum failure")
-		}
-		data = data[:len(data)-2]
-	}
-
-	return pk.parsePrivateKey(data)
-}
-
-func (pk *PrivateKey) parsePrivateKey(data []byte) (err error) {
-	switch pk.PublicKey.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoRSAEncryptOnly:
-		return pk.parseRSAPrivateKey(data)
-	case PubKeyAlgoDSA:
-		return pk.parseDSAPrivateKey(data)
-	case PubKeyAlgoElGamal:
-		return pk.parseElGamalPrivateKey(data)
-	}
-	panic("impossible")
-}
-
-func (pk *PrivateKey) parseRSAPrivateKey(data []byte) (err error) {
-	rsaPub := pk.PublicKey.PublicKey.(*rsa.PublicKey)
-	rsaPriv := new(rsa.PrivateKey)
-	rsaPriv.PublicKey = *rsaPub
-
-	buf := bytes.NewBuffer(data)
-	d, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-	p, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-	q, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-
-	rsaPriv.D = new(big.Int).SetBytes(d)
-	rsaPriv.Primes = make([]*big.Int, 2)
-	rsaPriv.Primes[0] = new(big.Int).SetBytes(p)
-	rsaPriv.Primes[1] = new(big.Int).SetBytes(q)
-	rsaPriv.Precompute()
-	pk.PrivateKey = rsaPriv
-	pk.Encrypted = false
-	pk.encryptedData = nil
-
-	return nil
-}
-
-func (pk *PrivateKey) parseDSAPrivateKey(data []byte) (err error) {
-	dsaPub := pk.PublicKey.PublicKey.(*dsa.PublicKey)
-	dsaPriv := new(dsa.PrivateKey)
-	dsaPriv.PublicKey = *dsaPub
-
-	buf := bytes.NewBuffer(data)
-	x, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-
-	dsaPriv.X = new(big.Int).SetBytes(x)
-	pk.PrivateKey = dsaPriv
-	pk.Encrypted = false
-	pk.encryptedData = nil
-
-	return nil
-}
-
-func (pk *PrivateKey) parseElGamalPrivateKey(data []byte) (err error) {
-	pub := pk.PublicKey.PublicKey.(*elgamal.PublicKey)
-	priv := new(elgamal.PrivateKey)
-	priv.PublicKey = *pub
-
-	buf := bytes.NewBuffer(data)
-	x, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-
-	priv.X = new(big.Int).SetBytes(x)
-	pk.PrivateKey = priv
-	pk.Encrypted = false
-	pk.encryptedData = nil
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key.go
deleted file mode 100644
index 26bd9ccdd2..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key.go
+++ /dev/null
@@ -1,687 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rsa"
-	"crypto/sha1"
-	_ "crypto/sha256"
-	_ "crypto/sha512"
-	"encoding/binary"
-	"fmt"
-	"golang.org/x/crypto/openpgp/elgamal"
-	"golang.org/x/crypto/openpgp/errors"
-	"hash"
-	"io"
-	"math/big"
-	"strconv"
-	"time"
-)
-
-var (
-	// NIST curve P-256
-	oidCurveP256 []byte = []byte{0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07}
-	// NIST curve P-384
-	oidCurveP384 []byte = []byte{0x2B, 0x81, 0x04, 0x00, 0x22}
-	// NIST curve P-521
-	oidCurveP521 []byte = []byte{0x2B, 0x81, 0x04, 0x00, 0x23}
-)
-
-const maxOIDLength = 8
-
-// ecdsaKey stores the algorithm-specific fields for ECDSA keys.
-// as defined in RFC 6637, Section 9.
-type ecdsaKey struct {
-	// oid contains the OID byte sequence identifying the elliptic curve used
-	oid []byte
-	// p contains the elliptic curve point that represents the public key
-	p parsedMPI
-}
-
-// parseOID reads the OID for the curve as defined in RFC 6637, Section 9.
-func parseOID(r io.Reader) (oid []byte, err error) {
-	buf := make([]byte, maxOIDLength)
-	if _, err = readFull(r, buf[:1]); err != nil {
-		return
-	}
-	oidLen := buf[0]
-	if int(oidLen) > len(buf) {
-		err = errors.UnsupportedError("invalid oid length: " + strconv.Itoa(int(oidLen)))
-		return
-	}
-	oid = buf[:oidLen]
-	_, err = readFull(r, oid)
-	return
-}
-
-func (f *ecdsaKey) parse(r io.Reader) (err error) {
-	if f.oid, err = parseOID(r); err != nil {
-		return err
-	}
-	f.p.bytes, f.p.bitLength, err = readMPI(r)
-	return
-}
-
-func (f *ecdsaKey) serialize(w io.Writer) (err error) {
-	buf := make([]byte, maxOIDLength+1)
-	buf[0] = byte(len(f.oid))
-	copy(buf[1:], f.oid)
-	if _, err = w.Write(buf[:len(f.oid)+1]); err != nil {
-		return
-	}
-	return writeMPIs(w, f.p)
-}
-
-func (f *ecdsaKey) newECDSA() (*ecdsa.PublicKey, error) {
-	var c elliptic.Curve
-	if bytes.Equal(f.oid, oidCurveP256) {
-		c = elliptic.P256()
-	} else if bytes.Equal(f.oid, oidCurveP384) {
-		c = elliptic.P384()
-	} else if bytes.Equal(f.oid, oidCurveP521) {
-		c = elliptic.P521()
-	} else {
-		return nil, errors.UnsupportedError(fmt.Sprintf("unsupported oid: %x", f.oid))
-	}
-	x, y := elliptic.Unmarshal(c, f.p.bytes)
-	if x == nil {
-		return nil, errors.UnsupportedError("failed to parse EC point")
-	}
-	return &ecdsa.PublicKey{Curve: c, X: x, Y: y}, nil
-}
-
-func (f *ecdsaKey) byteLen() int {
-	return 1 + len(f.oid) + 2 + len(f.p.bytes)
-}
-
-type kdfHashFunction byte
-type kdfAlgorithm byte
-
-// ecdhKdf stores key derivation function parameters
-// used for ECDH encryption. See RFC 6637, Section 9.
-type ecdhKdf struct {
-	KdfHash kdfHashFunction
-	KdfAlgo kdfAlgorithm
-}
-
-func (f *ecdhKdf) parse(r io.Reader) (err error) {
-	buf := make([]byte, 1)
-	if _, err = readFull(r, buf); err != nil {
-		return
-	}
-	kdfLen := int(buf[0])
-	if kdfLen < 3 {
-		return errors.UnsupportedError("Unsupported ECDH KDF length: " + strconv.Itoa(kdfLen))
-	}
-	buf = make([]byte, kdfLen)
-	if _, err = readFull(r, buf); err != nil {
-		return
-	}
-	reserved := int(buf[0])
-	f.KdfHash = kdfHashFunction(buf[1])
-	f.KdfAlgo = kdfAlgorithm(buf[2])
-	if reserved != 0x01 {
-		return errors.UnsupportedError("Unsupported KDF reserved field: " + strconv.Itoa(reserved))
-	}
-	return
-}
-
-func (f *ecdhKdf) serialize(w io.Writer) (err error) {
-	buf := make([]byte, 4)
-	// See RFC 6637, Section 9, Algorithm-Specific Fields for ECDH keys.
-	buf[0] = byte(0x03) // Length of the following fields
-	buf[1] = byte(0x01) // Reserved for future extensions, must be 1 for now
-	buf[2] = byte(f.KdfHash)
-	buf[3] = byte(f.KdfAlgo)
-	_, err = w.Write(buf[:])
-	return
-}
-
-func (f *ecdhKdf) byteLen() int {
-	return 4
-}
-
-// PublicKey represents an OpenPGP public key. See RFC 4880, section 5.5.2.
-type PublicKey struct {
-	CreationTime time.Time
-	PubKeyAlgo   PublicKeyAlgorithm
-	PublicKey    interface{} // *rsa.PublicKey, *dsa.PublicKey or *ecdsa.PublicKey
-	Fingerprint  [20]byte
-	KeyId        uint64
-	IsSubkey     bool
-
-	n, e, p, q, g, y parsedMPI
-
-	// RFC 6637 fields
-	ec   *ecdsaKey
-	ecdh *ecdhKdf
-}
-
-// signingKey provides a convenient abstraction over signature verification
-// for v3 and v4 public keys.
-type signingKey interface {
-	SerializeSignaturePrefix(io.Writer)
-	serializeWithoutHeaders(io.Writer) error
-}
-
-func fromBig(n *big.Int) parsedMPI {
-	return parsedMPI{
-		bytes:     n.Bytes(),
-		bitLength: uint16(n.BitLen()),
-	}
-}
-
-// NewRSAPublicKey returns a PublicKey that wraps the given rsa.PublicKey.
-func NewRSAPublicKey(creationTime time.Time, pub *rsa.PublicKey) *PublicKey {
-	pk := &PublicKey{
-		CreationTime: creationTime,
-		PubKeyAlgo:   PubKeyAlgoRSA,
-		PublicKey:    pub,
-		n:            fromBig(pub.N),
-		e:            fromBig(big.NewInt(int64(pub.E))),
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return pk
-}
-
-// NewDSAPublicKey returns a PublicKey that wraps the given rsa.PublicKey.
-func NewDSAPublicKey(creationTime time.Time, pub *dsa.PublicKey) *PublicKey {
-	pk := &PublicKey{
-		CreationTime: creationTime,
-		PubKeyAlgo:   PubKeyAlgoDSA,
-		PublicKey:    pub,
-		p:            fromBig(pub.P),
-		q:            fromBig(pub.Q),
-		g:            fromBig(pub.G),
-		y:            fromBig(pub.Y),
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return pk
-}
-
-func (pk *PublicKey) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.5.2
-	var buf [6]byte
-	_, err = readFull(r, buf[:])
-	if err != nil {
-		return
-	}
-	if buf[0] != 4 {
-		return errors.UnsupportedError("public key version")
-	}
-	pk.CreationTime = time.Unix(int64(uint32(buf[1])<<24|uint32(buf[2])<<16|uint32(buf[3])<<8|uint32(buf[4])), 0)
-	pk.PubKeyAlgo = PublicKeyAlgorithm(buf[5])
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		err = pk.parseRSA(r)
-	case PubKeyAlgoDSA:
-		err = pk.parseDSA(r)
-	case PubKeyAlgoElGamal:
-		err = pk.parseElGamal(r)
-	case PubKeyAlgoECDSA:
-		pk.ec = new(ecdsaKey)
-		if err = pk.ec.parse(r); err != nil {
-			return err
-		}
-		pk.PublicKey, err = pk.ec.newECDSA()
-	case PubKeyAlgoECDH:
-		pk.ec = new(ecdsaKey)
-		if err = pk.ec.parse(r); err != nil {
-			return
-		}
-		pk.ecdh = new(ecdhKdf)
-		if err = pk.ecdh.parse(r); err != nil {
-			return
-		}
-		// The ECDH key is stored in an ecdsa.PublicKey for convenience.
-		pk.PublicKey, err = pk.ec.newECDSA()
-	default:
-		err = errors.UnsupportedError("public key type: " + strconv.Itoa(int(pk.PubKeyAlgo)))
-	}
-	if err != nil {
-		return
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return
-}
-
-func (pk *PublicKey) setFingerPrintAndKeyId() {
-	// RFC 4880, section 12.2
-	fingerPrint := sha1.New()
-	pk.SerializeSignaturePrefix(fingerPrint)
-	pk.serializeWithoutHeaders(fingerPrint)
-	copy(pk.Fingerprint[:], fingerPrint.Sum(nil))
-	pk.KeyId = binary.BigEndian.Uint64(pk.Fingerprint[12:20])
-}
-
-// parseRSA parses RSA public key material from the given Reader. See RFC 4880,
-// section 5.5.2.
-func (pk *PublicKey) parseRSA(r io.Reader) (err error) {
-	pk.n.bytes, pk.n.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.e.bytes, pk.e.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-
-	if len(pk.e.bytes) > 3 {
-		err = errors.UnsupportedError("large public exponent")
-		return
-	}
-	rsa := &rsa.PublicKey{
-		N: new(big.Int).SetBytes(pk.n.bytes),
-		E: 0,
-	}
-	for i := 0; i < len(pk.e.bytes); i++ {
-		rsa.E <<= 8
-		rsa.E |= int(pk.e.bytes[i])
-	}
-	pk.PublicKey = rsa
-	return
-}
-
-// parseDSA parses DSA public key material from the given Reader. See RFC 4880,
-// section 5.5.2.
-func (pk *PublicKey) parseDSA(r io.Reader) (err error) {
-	pk.p.bytes, pk.p.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.q.bytes, pk.q.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.g.bytes, pk.g.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.y.bytes, pk.y.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-
-	dsa := new(dsa.PublicKey)
-	dsa.P = new(big.Int).SetBytes(pk.p.bytes)
-	dsa.Q = new(big.Int).SetBytes(pk.q.bytes)
-	dsa.G = new(big.Int).SetBytes(pk.g.bytes)
-	dsa.Y = new(big.Int).SetBytes(pk.y.bytes)
-	pk.PublicKey = dsa
-	return
-}
-
-// parseElGamal parses ElGamal public key material from the given Reader. See
-// RFC 4880, section 5.5.2.
-func (pk *PublicKey) parseElGamal(r io.Reader) (err error) {
-	pk.p.bytes, pk.p.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.g.bytes, pk.g.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.y.bytes, pk.y.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-
-	elgamal := new(elgamal.PublicKey)
-	elgamal.P = new(big.Int).SetBytes(pk.p.bytes)
-	elgamal.G = new(big.Int).SetBytes(pk.g.bytes)
-	elgamal.Y = new(big.Int).SetBytes(pk.y.bytes)
-	pk.PublicKey = elgamal
-	return
-}
-
-// SerializeSignaturePrefix writes the prefix for this public key to the given Writer.
-// The prefix is used when calculating a signature over this public key. See
-// RFC 4880, section 5.2.4.
-func (pk *PublicKey) SerializeSignaturePrefix(h io.Writer) {
-	var pLength uint16
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		pLength += 2 + uint16(len(pk.n.bytes))
-		pLength += 2 + uint16(len(pk.e.bytes))
-	case PubKeyAlgoDSA:
-		pLength += 2 + uint16(len(pk.p.bytes))
-		pLength += 2 + uint16(len(pk.q.bytes))
-		pLength += 2 + uint16(len(pk.g.bytes))
-		pLength += 2 + uint16(len(pk.y.bytes))
-	case PubKeyAlgoElGamal:
-		pLength += 2 + uint16(len(pk.p.bytes))
-		pLength += 2 + uint16(len(pk.g.bytes))
-		pLength += 2 + uint16(len(pk.y.bytes))
-	case PubKeyAlgoECDSA:
-		pLength += uint16(pk.ec.byteLen())
-	case PubKeyAlgoECDH:
-		pLength += uint16(pk.ec.byteLen())
-		pLength += uint16(pk.ecdh.byteLen())
-	default:
-		panic("unknown public key algorithm")
-	}
-	pLength += 6
-	h.Write([]byte{0x99, byte(pLength >> 8), byte(pLength)})
-	return
-}
-
-func (pk *PublicKey) Serialize(w io.Writer) (err error) {
-	length := 6 // 6 byte header
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		length += 2 + len(pk.n.bytes)
-		length += 2 + len(pk.e.bytes)
-	case PubKeyAlgoDSA:
-		length += 2 + len(pk.p.bytes)
-		length += 2 + len(pk.q.bytes)
-		length += 2 + len(pk.g.bytes)
-		length += 2 + len(pk.y.bytes)
-	case PubKeyAlgoElGamal:
-		length += 2 + len(pk.p.bytes)
-		length += 2 + len(pk.g.bytes)
-		length += 2 + len(pk.y.bytes)
-	case PubKeyAlgoECDSA:
-		length += pk.ec.byteLen()
-	case PubKeyAlgoECDH:
-		length += pk.ec.byteLen()
-		length += pk.ecdh.byteLen()
-	default:
-		panic("unknown public key algorithm")
-	}
-
-	packetType := packetTypePublicKey
-	if pk.IsSubkey {
-		packetType = packetTypePublicSubkey
-	}
-	err = serializeHeader(w, packetType, length)
-	if err != nil {
-		return
-	}
-	return pk.serializeWithoutHeaders(w)
-}
-
-// serializeWithoutHeaders marshals the PublicKey to w in the form of an
-// OpenPGP public key packet, not including the packet header.
-func (pk *PublicKey) serializeWithoutHeaders(w io.Writer) (err error) {
-	var buf [6]byte
-	buf[0] = 4
-	t := uint32(pk.CreationTime.Unix())
-	buf[1] = byte(t >> 24)
-	buf[2] = byte(t >> 16)
-	buf[3] = byte(t >> 8)
-	buf[4] = byte(t)
-	buf[5] = byte(pk.PubKeyAlgo)
-
-	_, err = w.Write(buf[:])
-	if err != nil {
-		return
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		return writeMPIs(w, pk.n, pk.e)
-	case PubKeyAlgoDSA:
-		return writeMPIs(w, pk.p, pk.q, pk.g, pk.y)
-	case PubKeyAlgoElGamal:
-		return writeMPIs(w, pk.p, pk.g, pk.y)
-	case PubKeyAlgoECDSA:
-		return pk.ec.serialize(w)
-	case PubKeyAlgoECDH:
-		if err = pk.ec.serialize(w); err != nil {
-			return
-		}
-		return pk.ecdh.serialize(w)
-	}
-	return errors.InvalidArgumentError("bad public-key algorithm")
-}
-
-// CanSign returns true iff this public key can generate signatures
-func (pk *PublicKey) CanSign() bool {
-	return pk.PubKeyAlgo != PubKeyAlgoRSAEncryptOnly && pk.PubKeyAlgo != PubKeyAlgoElGamal
-}
-
-// VerifySignature returns nil iff sig is a valid signature, made by this
-// public key, of the data hashed into signed. signed is mutated by this call.
-func (pk *PublicKey) VerifySignature(signed hash.Hash, sig *Signature) (err error) {
-	if !pk.CanSign() {
-		return errors.InvalidArgumentError("public key cannot generate signatures")
-	}
-
-	signed.Write(sig.HashSuffix)
-	hashBytes := signed.Sum(nil)
-
-	if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] {
-		return errors.SignatureError("hash tag doesn't match")
-	}
-
-	if pk.PubKeyAlgo != sig.PubKeyAlgo {
-		return errors.InvalidArgumentError("public key and signature use different algorithms")
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		rsaPublicKey, _ := pk.PublicKey.(*rsa.PublicKey)
-		err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes)
-		if err != nil {
-			return errors.SignatureError("RSA verification failure")
-		}
-		return nil
-	case PubKeyAlgoDSA:
-		dsaPublicKey, _ := pk.PublicKey.(*dsa.PublicKey)
-		// Need to truncate hashBytes to match FIPS 186-3 section 4.6.
-		subgroupSize := (dsaPublicKey.Q.BitLen() + 7) / 8
-		if len(hashBytes) > subgroupSize {
-			hashBytes = hashBytes[:subgroupSize]
-		}
-		if !dsa.Verify(dsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.DSASigR.bytes), new(big.Int).SetBytes(sig.DSASigS.bytes)) {
-			return errors.SignatureError("DSA verification failure")
-		}
-		return nil
-	case PubKeyAlgoECDSA:
-		ecdsaPublicKey := pk.PublicKey.(*ecdsa.PublicKey)
-		if !ecdsa.Verify(ecdsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.ECDSASigR.bytes), new(big.Int).SetBytes(sig.ECDSASigS.bytes)) {
-			return errors.SignatureError("ECDSA verification failure")
-		}
-		return nil
-	default:
-		return errors.SignatureError("Unsupported public key algorithm used in signature")
-	}
-	panic("unreachable")
-}
-
-// VerifySignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, of the data hashed into signed. signed is mutated by this call.
-func (pk *PublicKey) VerifySignatureV3(signed hash.Hash, sig *SignatureV3) (err error) {
-	if !pk.CanSign() {
-		return errors.InvalidArgumentError("public key cannot generate signatures")
-	}
-
-	suffix := make([]byte, 5)
-	suffix[0] = byte(sig.SigType)
-	binary.BigEndian.PutUint32(suffix[1:], uint32(sig.CreationTime.Unix()))
-	signed.Write(suffix)
-	hashBytes := signed.Sum(nil)
-
-	if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] {
-		return errors.SignatureError("hash tag doesn't match")
-	}
-
-	if pk.PubKeyAlgo != sig.PubKeyAlgo {
-		return errors.InvalidArgumentError("public key and signature use different algorithms")
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		rsaPublicKey := pk.PublicKey.(*rsa.PublicKey)
-		if err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes); err != nil {
-			return errors.SignatureError("RSA verification failure")
-		}
-		return
-	case PubKeyAlgoDSA:
-		dsaPublicKey := pk.PublicKey.(*dsa.PublicKey)
-		// Need to truncate hashBytes to match FIPS 186-3 section 4.6.
-		subgroupSize := (dsaPublicKey.Q.BitLen() + 7) / 8
-		if len(hashBytes) > subgroupSize {
-			hashBytes = hashBytes[:subgroupSize]
-		}
-		if !dsa.Verify(dsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.DSASigR.bytes), new(big.Int).SetBytes(sig.DSASigS.bytes)) {
-			return errors.SignatureError("DSA verification failure")
-		}
-		return nil
-	default:
-		panic("shouldn't happen")
-	}
-	panic("unreachable")
-}
-
-// keySignatureHash returns a Hash of the message that needs to be signed for
-// pk to assert a subkey relationship to signed.
-func keySignatureHash(pk, signed signingKey, hashFunc crypto.Hash) (h hash.Hash, err error) {
-	if !hashFunc.Available() {
-		return nil, errors.UnsupportedError("hash function")
-	}
-	h = hashFunc.New()
-
-	// RFC 4880, section 5.2.4
-	pk.SerializeSignaturePrefix(h)
-	pk.serializeWithoutHeaders(h)
-	signed.SerializeSignaturePrefix(h)
-	signed.serializeWithoutHeaders(h)
-	return
-}
-
-// VerifyKeySignature returns nil iff sig is a valid signature, made by this
-// public key, of signed.
-func (pk *PublicKey) VerifyKeySignature(signed *PublicKey, sig *Signature) (err error) {
-	h, err := keySignatureHash(pk, signed, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignature(h, sig)
-}
-
-func keyRevocationHash(pk signingKey, hashFunc crypto.Hash) (h hash.Hash, err error) {
-	if !hashFunc.Available() {
-		return nil, errors.UnsupportedError("hash function")
-	}
-	h = hashFunc.New()
-
-	// RFC 4880, section 5.2.4
-	pk.SerializeSignaturePrefix(h)
-	pk.serializeWithoutHeaders(h)
-
-	return
-}
-
-// VerifyRevocationSignature returns nil iff sig is a valid signature, made by this
-// public key.
-func (pk *PublicKey) VerifyRevocationSignature(sig *Signature) (err error) {
-	h, err := keyRevocationHash(pk, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignature(h, sig)
-}
-
-// userIdSignatureHash returns a Hash of the message that needs to be signed
-// to assert that pk is a valid key for id.
-func userIdSignatureHash(id string, pk *PublicKey, hashFunc crypto.Hash) (h hash.Hash, err error) {
-	if !hashFunc.Available() {
-		return nil, errors.UnsupportedError("hash function")
-	}
-	h = hashFunc.New()
-
-	// RFC 4880, section 5.2.4
-	pk.SerializeSignaturePrefix(h)
-	pk.serializeWithoutHeaders(h)
-
-	var buf [5]byte
-	buf[0] = 0xb4
-	buf[1] = byte(len(id) >> 24)
-	buf[2] = byte(len(id) >> 16)
-	buf[3] = byte(len(id) >> 8)
-	buf[4] = byte(len(id))
-	h.Write(buf[:])
-	h.Write([]byte(id))
-
-	return
-}
-
-// VerifyUserIdSignature returns nil iff sig is a valid signature, made by this
-// public key, that id is the identity of pub.
-func (pk *PublicKey) VerifyUserIdSignature(id string, pub *PublicKey, sig *Signature) (err error) {
-	h, err := userIdSignatureHash(id, pub, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignature(h, sig)
-}
-
-// VerifyUserIdSignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, that id is the identity of pub.
-func (pk *PublicKey) VerifyUserIdSignatureV3(id string, pub *PublicKey, sig *SignatureV3) (err error) {
-	h, err := userIdSignatureV3Hash(id, pub, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignatureV3(h, sig)
-}
-
-// KeyIdString returns the public key's fingerprint in capital hex
-// (e.g. "6C7EE1B8621CC013").
-func (pk *PublicKey) KeyIdString() string {
-	return fmt.Sprintf("%X", pk.Fingerprint[12:20])
-}
-
-// KeyIdShortString returns the short form of public key's fingerprint
-// in capital hex, as shown by gpg --list-keys (e.g. "621CC013").
-func (pk *PublicKey) KeyIdShortString() string {
-	return fmt.Sprintf("%X", pk.Fingerprint[16:20])
-}
-
-// A parsedMPI is used to store the contents of a big integer, along with the
-// bit length that was specified in the original input. This allows the MPI to
-// be reserialized exactly.
-type parsedMPI struct {
-	bytes     []byte
-	bitLength uint16
-}
-
-// writeMPIs is a utility function for serializing several big integers to the
-// given Writer.
-func writeMPIs(w io.Writer, mpis ...parsedMPI) (err error) {
-	for _, mpi := range mpis {
-		err = writeMPI(w, mpi.bitLength, mpi.bytes)
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// BitLength returns the bit length for the given public key.
-func (pk *PublicKey) BitLength() (bitLength uint16, err error) {
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		bitLength = pk.n.bitLength
-	case PubKeyAlgoDSA:
-		bitLength = pk.p.bitLength
-	case PubKeyAlgoElGamal:
-		bitLength = pk.p.bitLength
-	default:
-		err = errors.InvalidArgumentError("bad public-key algorithm")
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key_v3.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key_v3.go
deleted file mode 100644
index 164124807b..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key_v3.go
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto"
-	"crypto/md5"
-	"crypto/rsa"
-	"encoding/binary"
-	"fmt"
-	"hash"
-	"io"
-	"math/big"
-	"strconv"
-	"time"
-
-	"golang.org/x/crypto/openpgp/errors"
-)
-
-// PublicKeyV3 represents older, version 3 public keys. These keys are less secure and
-// should not be used for signing or encrypting. They are supported here only for
-// parsing version 3 key material and validating signatures.
-// See RFC 4880, section 5.5.2.
-type PublicKeyV3 struct {
-	CreationTime time.Time
-	DaysToExpire uint16
-	PubKeyAlgo   PublicKeyAlgorithm
-	PublicKey    *rsa.PublicKey
-	Fingerprint  [16]byte
-	KeyId        uint64
-	IsSubkey     bool
-
-	n, e parsedMPI
-}
-
-// newRSAPublicKeyV3 returns a PublicKey that wraps the given rsa.PublicKey.
-// Included here for testing purposes only. RFC 4880, section 5.5.2:
-// "an implementation MUST NOT generate a V3 key, but MAY accept it."
-func newRSAPublicKeyV3(creationTime time.Time, pub *rsa.PublicKey) *PublicKeyV3 {
-	pk := &PublicKeyV3{
-		CreationTime: creationTime,
-		PublicKey:    pub,
-		n:            fromBig(pub.N),
-		e:            fromBig(big.NewInt(int64(pub.E))),
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return pk
-}
-
-func (pk *PublicKeyV3) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.5.2
-	var buf [8]byte
-	if _, err = readFull(r, buf[:]); err != nil {
-		return
-	}
-	if buf[0] < 2 || buf[0] > 3 {
-		return errors.UnsupportedError("public key version")
-	}
-	pk.CreationTime = time.Unix(int64(uint32(buf[1])<<24|uint32(buf[2])<<16|uint32(buf[3])<<8|uint32(buf[4])), 0)
-	pk.DaysToExpire = binary.BigEndian.Uint16(buf[5:7])
-	pk.PubKeyAlgo = PublicKeyAlgorithm(buf[7])
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		err = pk.parseRSA(r)
-	default:
-		err = errors.UnsupportedError("public key type: " + strconv.Itoa(int(pk.PubKeyAlgo)))
-	}
-	if err != nil {
-		return
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return
-}
-
-func (pk *PublicKeyV3) setFingerPrintAndKeyId() {
-	// RFC 4880, section 12.2
-	fingerPrint := md5.New()
-	fingerPrint.Write(pk.n.bytes)
-	fingerPrint.Write(pk.e.bytes)
-	fingerPrint.Sum(pk.Fingerprint[:0])
-	pk.KeyId = binary.BigEndian.Uint64(pk.n.bytes[len(pk.n.bytes)-8:])
-}
-
-// parseRSA parses RSA public key material from the given Reader. See RFC 4880,
-// section 5.5.2.
-func (pk *PublicKeyV3) parseRSA(r io.Reader) (err error) {
-	if pk.n.bytes, pk.n.bitLength, err = readMPI(r); err != nil {
-		return
-	}
-	if pk.e.bytes, pk.e.bitLength, err = readMPI(r); err != nil {
-		return
-	}
-
-	if len(pk.e.bytes) > 3 {
-		err = errors.UnsupportedError("large public exponent")
-		return
-	}
-	rsa := &rsa.PublicKey{N: new(big.Int).SetBytes(pk.n.bytes)}
-	for i := 0; i < len(pk.e.bytes); i++ {
-		rsa.E <<= 8
-		rsa.E |= int(pk.e.bytes[i])
-	}
-	pk.PublicKey = rsa
-	return
-}
-
-// SerializeSignaturePrefix writes the prefix for this public key to the given Writer.
-// The prefix is used when calculating a signature over this public key. See
-// RFC 4880, section 5.2.4.
-func (pk *PublicKeyV3) SerializeSignaturePrefix(w io.Writer) {
-	var pLength uint16
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		pLength += 2 + uint16(len(pk.n.bytes))
-		pLength += 2 + uint16(len(pk.e.bytes))
-	default:
-		panic("unknown public key algorithm")
-	}
-	pLength += 6
-	w.Write([]byte{0x99, byte(pLength >> 8), byte(pLength)})
-	return
-}
-
-func (pk *PublicKeyV3) Serialize(w io.Writer) (err error) {
-	length := 8 // 8 byte header
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		length += 2 + len(pk.n.bytes)
-		length += 2 + len(pk.e.bytes)
-	default:
-		panic("unknown public key algorithm")
-	}
-
-	packetType := packetTypePublicKey
-	if pk.IsSubkey {
-		packetType = packetTypePublicSubkey
-	}
-	if err = serializeHeader(w, packetType, length); err != nil {
-		return
-	}
-	return pk.serializeWithoutHeaders(w)
-}
-
-// serializeWithoutHeaders marshals the PublicKey to w in the form of an
-// OpenPGP public key packet, not including the packet header.
-func (pk *PublicKeyV3) serializeWithoutHeaders(w io.Writer) (err error) {
-	var buf [8]byte
-	// Version 3
-	buf[0] = 3
-	// Creation time
-	t := uint32(pk.CreationTime.Unix())
-	buf[1] = byte(t >> 24)
-	buf[2] = byte(t >> 16)
-	buf[3] = byte(t >> 8)
-	buf[4] = byte(t)
-	// Days to expire
-	buf[5] = byte(pk.DaysToExpire >> 8)
-	buf[6] = byte(pk.DaysToExpire)
-	// Public key algorithm
-	buf[7] = byte(pk.PubKeyAlgo)
-
-	if _, err = w.Write(buf[:]); err != nil {
-		return
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		return writeMPIs(w, pk.n, pk.e)
-	}
-	return errors.InvalidArgumentError("bad public-key algorithm")
-}
-
-// CanSign returns true iff this public key can generate signatures
-func (pk *PublicKeyV3) CanSign() bool {
-	return pk.PubKeyAlgo != PubKeyAlgoRSAEncryptOnly
-}
-
-// VerifySignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, of the data hashed into signed. signed is mutated by this call.
-func (pk *PublicKeyV3) VerifySignatureV3(signed hash.Hash, sig *SignatureV3) (err error) {
-	if !pk.CanSign() {
-		return errors.InvalidArgumentError("public key cannot generate signatures")
-	}
-
-	suffix := make([]byte, 5)
-	suffix[0] = byte(sig.SigType)
-	binary.BigEndian.PutUint32(suffix[1:], uint32(sig.CreationTime.Unix()))
-	signed.Write(suffix)
-	hashBytes := signed.Sum(nil)
-
-	if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] {
-		return errors.SignatureError("hash tag doesn't match")
-	}
-
-	if pk.PubKeyAlgo != sig.PubKeyAlgo {
-		return errors.InvalidArgumentError("public key and signature use different algorithms")
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		if err = rsa.VerifyPKCS1v15(pk.PublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes); err != nil {
-			return errors.SignatureError("RSA verification failure")
-		}
-		return
-	default:
-		// V3 public keys only support RSA.
-		panic("shouldn't happen")
-	}
-	panic("unreachable")
-}
-
-// VerifyUserIdSignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, that id is the identity of pub.
-func (pk *PublicKeyV3) VerifyUserIdSignatureV3(id string, pub *PublicKeyV3, sig *SignatureV3) (err error) {
-	h, err := userIdSignatureV3Hash(id, pk, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignatureV3(h, sig)
-}
-
-// VerifyKeySignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, of signed.
-func (pk *PublicKeyV3) VerifyKeySignatureV3(signed *PublicKeyV3, sig *SignatureV3) (err error) {
-	h, err := keySignatureHash(pk, signed, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignatureV3(h, sig)
-}
-
-// userIdSignatureV3Hash returns a Hash of the message that needs to be signed
-// to assert that pk is a valid key for id.
-func userIdSignatureV3Hash(id string, pk signingKey, hfn crypto.Hash) (h hash.Hash, err error) {
-	if !hfn.Available() {
-		return nil, errors.UnsupportedError("hash function")
-	}
-	h = hfn.New()
-
-	// RFC 4880, section 5.2.4
-	pk.SerializeSignaturePrefix(h)
-	pk.serializeWithoutHeaders(h)
-
-	h.Write([]byte(id))
-
-	return
-}
-
-// KeyIdString returns the public key's fingerprint in capital hex
-// (e.g. "6C7EE1B8621CC013").
-func (pk *PublicKeyV3) KeyIdString() string {
-	return fmt.Sprintf("%X", pk.KeyId)
-}
-
-// KeyIdShortString returns the short form of public key's fingerprint
-// in capital hex, as shown by gpg --list-keys (e.g. "621CC013").
-func (pk *PublicKeyV3) KeyIdShortString() string {
-	return fmt.Sprintf("%X", pk.KeyId&0xFFFFFFFF)
-}
-
-// BitLength returns the bit length for the given public key.
-func (pk *PublicKeyV3) BitLength() (bitLength uint16, err error) {
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		bitLength = pk.n.bitLength
-	default:
-		err = errors.InvalidArgumentError("bad public-key algorithm")
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/reader.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/reader.go
deleted file mode 100644
index 753bf8f660..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/reader.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-)
-
-// Reader reads packets from an io.Reader and allows packets to be 'unread' so
-// that they result from the next call to Next.
-type Reader struct {
-	q       []Packet
-	readers []io.Reader
-}
-
-// Next returns the most recently unread Packet, or reads another packet from
-// the top-most io.Reader. Unknown packet types are skipped.
-func (r *Reader) Next() (p Packet, err error) {
-	if len(r.q) > 0 {
-		p = r.q[len(r.q)-1]
-		r.q = r.q[:len(r.q)-1]
-		return
-	}
-
-	for len(r.readers) > 0 {
-		p, err = Read(r.readers[len(r.readers)-1])
-		if err == nil {
-			return
-		}
-		if err == io.EOF {
-			r.readers = r.readers[:len(r.readers)-1]
-			continue
-		}
-		if _, ok := err.(errors.UnknownPacketTypeError); !ok {
-			return nil, err
-		}
-	}
-
-	return nil, io.EOF
-}
-
-// Push causes the Reader to start reading from a new io.Reader. When an EOF
-// error is seen from the new io.Reader, it is popped and the Reader continues
-// to read from the next most recent io.Reader.
-func (r *Reader) Push(reader io.Reader) {
-	r.readers = append(r.readers, reader)
-}
-
-// Unread causes the given Packet to be returned from the next call to Next.
-func (r *Reader) Unread(p Packet) {
-	r.q = append(r.q, p)
-}
-
-func NewReader(r io.Reader) *Reader {
-	return &Reader{
-		q:       nil,
-		readers: []io.Reader{r},
-	}
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature.go
deleted file mode 100644
index 79cf993f57..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature.go
+++ /dev/null
@@ -1,663 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto"
-	"crypto/dsa"
-	"crypto/rsa"
-	"encoding/binary"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-	"hash"
-	"io"
-	"strconv"
-	"time"
-)
-
-const (
-	// See RFC 4880, section 5.2.3.21 for details.
-	KeyFlagCertify = 1 << iota
-	KeyFlagSign
-	KeyFlagEncryptCommunications
-	KeyFlagEncryptStorage
-)
-
-// Signature represents a signature. See RFC 4880, section 5.2.
-type Signature struct {
-	SigType    SignatureType
-	PubKeyAlgo PublicKeyAlgorithm
-	Hash       crypto.Hash
-
-	// HashSuffix is extra data that is hashed in after the signed data.
-	HashSuffix []byte
-	// HashTag contains the first two bytes of the hash for fast rejection
-	// of bad signed data.
-	HashTag      [2]byte
-	CreationTime time.Time
-
-	RSASignature         parsedMPI
-	DSASigR, DSASigS     parsedMPI
-	ECDSASigR, ECDSASigS parsedMPI
-
-	// rawSubpackets contains the unparsed subpackets, in order.
-	rawSubpackets []outputSubpacket
-
-	// The following are optional so are nil when not included in the
-	// signature.
-
-	SigLifetimeSecs, KeyLifetimeSecs                        *uint32
-	PreferredSymmetric, PreferredHash, PreferredCompression []uint8
-	IssuerKeyId                                             *uint64
-	IsPrimaryId                                             *bool
-
-	// FlagsValid is set if any flags were given. See RFC 4880, section
-	// 5.2.3.21 for details.
-	FlagsValid                                                           bool
-	FlagCertify, FlagSign, FlagEncryptCommunications, FlagEncryptStorage bool
-
-	// RevocationReason is set if this signature has been revoked.
-	// See RFC 4880, section 5.2.3.23 for details.
-	RevocationReason     *uint8
-	RevocationReasonText string
-
-	outSubpackets []outputSubpacket
-}
-
-func (sig *Signature) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.2.3
-	var buf [5]byte
-	_, err = readFull(r, buf[:1])
-	if err != nil {
-		return
-	}
-	if buf[0] != 4 {
-		err = errors.UnsupportedError("signature packet version " + strconv.Itoa(int(buf[0])))
-		return
-	}
-
-	_, err = readFull(r, buf[:5])
-	if err != nil {
-		return
-	}
-	sig.SigType = SignatureType(buf[0])
-	sig.PubKeyAlgo = PublicKeyAlgorithm(buf[1])
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA, PubKeyAlgoECDSA:
-	default:
-		err = errors.UnsupportedError("public key algorithm " + strconv.Itoa(int(sig.PubKeyAlgo)))
-		return
-	}
-
-	var ok bool
-	sig.Hash, ok = s2k.HashIdToHash(buf[2])
-	if !ok {
-		return errors.UnsupportedError("hash function " + strconv.Itoa(int(buf[2])))
-	}
-
-	hashedSubpacketsLength := int(buf[3])<<8 | int(buf[4])
-	l := 6 + hashedSubpacketsLength
-	sig.HashSuffix = make([]byte, l+6)
-	sig.HashSuffix[0] = 4
-	copy(sig.HashSuffix[1:], buf[:5])
-	hashedSubpackets := sig.HashSuffix[6:l]
-	_, err = readFull(r, hashedSubpackets)
-	if err != nil {
-		return
-	}
-	// See RFC 4880, section 5.2.4
-	trailer := sig.HashSuffix[l:]
-	trailer[0] = 4
-	trailer[1] = 0xff
-	trailer[2] = uint8(l >> 24)
-	trailer[3] = uint8(l >> 16)
-	trailer[4] = uint8(l >> 8)
-	trailer[5] = uint8(l)
-
-	err = parseSignatureSubpackets(sig, hashedSubpackets, true)
-	if err != nil {
-		return
-	}
-
-	_, err = readFull(r, buf[:2])
-	if err != nil {
-		return
-	}
-	unhashedSubpacketsLength := int(buf[0])<<8 | int(buf[1])
-	unhashedSubpackets := make([]byte, unhashedSubpacketsLength)
-	_, err = readFull(r, unhashedSubpackets)
-	if err != nil {
-		return
-	}
-	err = parseSignatureSubpackets(sig, unhashedSubpackets, false)
-	if err != nil {
-		return
-	}
-
-	_, err = readFull(r, sig.HashTag[:2])
-	if err != nil {
-		return
-	}
-
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		sig.RSASignature.bytes, sig.RSASignature.bitLength, err = readMPI(r)
-	case PubKeyAlgoDSA:
-		sig.DSASigR.bytes, sig.DSASigR.bitLength, err = readMPI(r)
-		if err == nil {
-			sig.DSASigS.bytes, sig.DSASigS.bitLength, err = readMPI(r)
-		}
-	case PubKeyAlgoECDSA:
-		sig.ECDSASigR.bytes, sig.ECDSASigR.bitLength, err = readMPI(r)
-		if err == nil {
-			sig.ECDSASigS.bytes, sig.ECDSASigS.bitLength, err = readMPI(r)
-		}
-	default:
-		panic("unreachable")
-	}
-	return
-}
-
-// parseSignatureSubpackets parses subpackets of the main signature packet. See
-// RFC 4880, section 5.2.3.1.
-func parseSignatureSubpackets(sig *Signature, subpackets []byte, isHashed bool) (err error) {
-	for len(subpackets) > 0 {
-		subpackets, err = parseSignatureSubpacket(sig, subpackets, isHashed)
-		if err != nil {
-			return
-		}
-	}
-
-	if sig.CreationTime.IsZero() {
-		err = errors.StructuralError("no creation time in signature")
-	}
-
-	return
-}
-
-type signatureSubpacketType uint8
-
-const (
-	creationTimeSubpacket        signatureSubpacketType = 2
-	signatureExpirationSubpacket signatureSubpacketType = 3
-	keyExpirationSubpacket       signatureSubpacketType = 9
-	prefSymmetricAlgosSubpacket  signatureSubpacketType = 11
-	issuerSubpacket              signatureSubpacketType = 16
-	prefHashAlgosSubpacket       signatureSubpacketType = 21
-	prefCompressionSubpacket     signatureSubpacketType = 22
-	primaryUserIdSubpacket       signatureSubpacketType = 25
-	keyFlagsSubpacket            signatureSubpacketType = 27
-	reasonForRevocationSubpacket signatureSubpacketType = 29
-)
-
-// parseSignatureSubpacket parses a single subpacket. len(subpacket) is >= 1.
-func parseSignatureSubpacket(sig *Signature, subpacket []byte, isHashed bool) (rest []byte, err error) {
-	// RFC 4880, section 5.2.3.1
-	var (
-		length     uint32
-		packetType signatureSubpacketType
-		isCritical bool
-	)
-	switch {
-	case subpacket[0] < 192:
-		length = uint32(subpacket[0])
-		subpacket = subpacket[1:]
-	case subpacket[0] < 255:
-		if len(subpacket) < 2 {
-			goto Truncated
-		}
-		length = uint32(subpacket[0]-192)<<8 + uint32(subpacket[1]) + 192
-		subpacket = subpacket[2:]
-	default:
-		if len(subpacket) < 5 {
-			goto Truncated
-		}
-		length = uint32(subpacket[1])<<24 |
-			uint32(subpacket[2])<<16 |
-			uint32(subpacket[3])<<8 |
-			uint32(subpacket[4])
-		subpacket = subpacket[5:]
-	}
-	if length > uint32(len(subpacket)) {
-		goto Truncated
-	}
-	rest = subpacket[length:]
-	subpacket = subpacket[:length]
-	if len(subpacket) == 0 {
-		err = errors.StructuralError("zero length signature subpacket")
-		return
-	}
-	packetType = signatureSubpacketType(subpacket[0] & 0x7f)
-	isCritical = subpacket[0]&0x80 == 0x80
-	subpacket = subpacket[1:]
-	sig.rawSubpackets = append(sig.rawSubpackets, outputSubpacket{isHashed, packetType, isCritical, subpacket})
-	switch packetType {
-	case creationTimeSubpacket:
-		if !isHashed {
-			err = errors.StructuralError("signature creation time in non-hashed area")
-			return
-		}
-		if len(subpacket) != 4 {
-			err = errors.StructuralError("signature creation time not four bytes")
-			return
-		}
-		t := binary.BigEndian.Uint32(subpacket)
-		sig.CreationTime = time.Unix(int64(t), 0)
-	case signatureExpirationSubpacket:
-		// Signature expiration time, section 5.2.3.10
-		if !isHashed {
-			return
-		}
-		if len(subpacket) != 4 {
-			err = errors.StructuralError("expiration subpacket with bad length")
-			return
-		}
-		sig.SigLifetimeSecs = new(uint32)
-		*sig.SigLifetimeSecs = binary.BigEndian.Uint32(subpacket)
-	case keyExpirationSubpacket:
-		// Key expiration time, section 5.2.3.6
-		if !isHashed {
-			return
-		}
-		if len(subpacket) != 4 {
-			err = errors.StructuralError("key expiration subpacket with bad length")
-			return
-		}
-		sig.KeyLifetimeSecs = new(uint32)
-		*sig.KeyLifetimeSecs = binary.BigEndian.Uint32(subpacket)
-	case prefSymmetricAlgosSubpacket:
-		// Preferred symmetric algorithms, section 5.2.3.7
-		if !isHashed {
-			return
-		}
-		sig.PreferredSymmetric = make([]byte, len(subpacket))
-		copy(sig.PreferredSymmetric, subpacket)
-	case issuerSubpacket:
-		// Issuer, section 5.2.3.5
-		if len(subpacket) != 8 {
-			err = errors.StructuralError("issuer subpacket with bad length")
-			return
-		}
-		sig.IssuerKeyId = new(uint64)
-		*sig.IssuerKeyId = binary.BigEndian.Uint64(subpacket)
-	case prefHashAlgosSubpacket:
-		// Preferred hash algorithms, section 5.2.3.8
-		if !isHashed {
-			return
-		}
-		sig.PreferredHash = make([]byte, len(subpacket))
-		copy(sig.PreferredHash, subpacket)
-	case prefCompressionSubpacket:
-		// Preferred compression algorithms, section 5.2.3.9
-		if !isHashed {
-			return
-		}
-		sig.PreferredCompression = make([]byte, len(subpacket))
-		copy(sig.PreferredCompression, subpacket)
-	case primaryUserIdSubpacket:
-		// Primary User ID, section 5.2.3.19
-		if !isHashed {
-			return
-		}
-		if len(subpacket) != 1 {
-			err = errors.StructuralError("primary user id subpacket with bad length")
-			return
-		}
-		sig.IsPrimaryId = new(bool)
-		if subpacket[0] > 0 {
-			*sig.IsPrimaryId = true
-		}
-	case keyFlagsSubpacket:
-		// Key flags, section 5.2.3.21
-		if !isHashed {
-			return
-		}
-		if len(subpacket) == 0 {
-			err = errors.StructuralError("empty key flags subpacket")
-			return
-		}
-		sig.FlagsValid = true
-		if subpacket[0]&KeyFlagCertify != 0 {
-			sig.FlagCertify = true
-		}
-		if subpacket[0]&KeyFlagSign != 0 {
-			sig.FlagSign = true
-		}
-		if subpacket[0]&KeyFlagEncryptCommunications != 0 {
-			sig.FlagEncryptCommunications = true
-		}
-		if subpacket[0]&KeyFlagEncryptStorage != 0 {
-			sig.FlagEncryptStorage = true
-		}
-	case reasonForRevocationSubpacket:
-		// Reason For Revocation, section 5.2.3.23
-		if !isHashed {
-			return
-		}
-		if len(subpacket) == 0 {
-			err = errors.StructuralError("empty revocation reason subpacket")
-			return
-		}
-		sig.RevocationReason = new(uint8)
-		*sig.RevocationReason = subpacket[0]
-		sig.RevocationReasonText = string(subpacket[1:])
-
-	default:
-		if isCritical {
-			err = errors.UnsupportedError("unknown critical signature subpacket type " + strconv.Itoa(int(packetType)))
-			return
-		}
-	}
-	return
-
-Truncated:
-	err = errors.StructuralError("signature subpacket truncated")
-	return
-}
-
-// subpacketLengthLength returns the length, in bytes, of an encoded length value.
-func subpacketLengthLength(length int) int {
-	if length < 192 {
-		return 1
-	}
-	if length < 16320 {
-		return 2
-	}
-	return 5
-}
-
-// serializeSubpacketLength marshals the given length into to.
-func serializeSubpacketLength(to []byte, length int) int {
-	// RFC 4880, Section 4.2.2.
-	if length < 192 {
-		to[0] = byte(length)
-		return 1
-	}
-	if length < 16320 {
-		length -= 192
-		to[0] = byte((length >> 8) + 192)
-		to[1] = byte(length)
-		return 2
-	}
-	to[0] = 255
-	to[1] = byte(length >> 24)
-	to[2] = byte(length >> 16)
-	to[3] = byte(length >> 8)
-	to[4] = byte(length)
-	return 5
-}
-
-// subpacketsLength returns the serialized length, in bytes, of the given
-// subpackets.
-func subpacketsLength(subpackets []outputSubpacket, hashed bool) (length int) {
-	for _, subpacket := range subpackets {
-		if subpacket.hashed == hashed {
-			length += subpacketLengthLength(len(subpacket.contents) + 1)
-			length += 1 // type byte
-			length += len(subpacket.contents)
-		}
-	}
-	return
-}
-
-// serializeSubpackets marshals the given subpackets into to.
-func serializeSubpackets(to []byte, subpackets []outputSubpacket, hashed bool) {
-	for _, subpacket := range subpackets {
-		if subpacket.hashed == hashed {
-			n := serializeSubpacketLength(to, len(subpacket.contents)+1)
-			to[n] = byte(subpacket.subpacketType)
-			to = to[1+n:]
-			n = copy(to, subpacket.contents)
-			to = to[n:]
-		}
-	}
-	return
-}
-
-// KeyExpired returns whether sig is a self-signature of a key that has
-// expired.
-func (sig *Signature) KeyExpired(currentTime time.Time) bool {
-	if sig.KeyLifetimeSecs == nil {
-		return false
-	}
-	expiry := sig.CreationTime.Add(time.Duration(*sig.KeyLifetimeSecs) * time.Second)
-	return currentTime.After(expiry)
-}
-
-// buildHashSuffix constructs the HashSuffix member of sig in preparation for signing.
-func (sig *Signature) buildHashSuffix() (err error) {
-	hashedSubpacketsLen := subpacketsLength(sig.outSubpackets, true)
-
-	var ok bool
-	l := 6 + hashedSubpacketsLen
-	sig.HashSuffix = make([]byte, l+6)
-	sig.HashSuffix[0] = 4
-	sig.HashSuffix[1] = uint8(sig.SigType)
-	sig.HashSuffix[2] = uint8(sig.PubKeyAlgo)
-	sig.HashSuffix[3], ok = s2k.HashToHashId(sig.Hash)
-	if !ok {
-		sig.HashSuffix = nil
-		return errors.InvalidArgumentError("hash cannot be represented in OpenPGP: " + strconv.Itoa(int(sig.Hash)))
-	}
-	sig.HashSuffix[4] = byte(hashedSubpacketsLen >> 8)
-	sig.HashSuffix[5] = byte(hashedSubpacketsLen)
-	serializeSubpackets(sig.HashSuffix[6:l], sig.outSubpackets, true)
-	trailer := sig.HashSuffix[l:]
-	trailer[0] = 4
-	trailer[1] = 0xff
-	trailer[2] = byte(l >> 24)
-	trailer[3] = byte(l >> 16)
-	trailer[4] = byte(l >> 8)
-	trailer[5] = byte(l)
-	return
-}
-
-func (sig *Signature) signPrepareHash(h hash.Hash) (digest []byte, err error) {
-	err = sig.buildHashSuffix()
-	if err != nil {
-		return
-	}
-
-	h.Write(sig.HashSuffix)
-	digest = h.Sum(nil)
-	copy(sig.HashTag[:], digest)
-	return
-}
-
-// Sign signs a message with a private key. The hash, h, must contain
-// the hash of the message to be signed and will be mutated by this function.
-// On success, the signature is stored in sig. Call Serialize to write it out.
-// If config is nil, sensible defaults will be used.
-func (sig *Signature) Sign(h hash.Hash, priv *PrivateKey, config *Config) (err error) {
-	sig.outSubpackets = sig.buildSubpackets()
-	digest, err := sig.signPrepareHash(h)
-	if err != nil {
-		return
-	}
-
-	switch priv.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		sig.RSASignature.bytes, err = rsa.SignPKCS1v15(config.Random(), priv.PrivateKey.(*rsa.PrivateKey), sig.Hash, digest)
-		sig.RSASignature.bitLength = uint16(8 * len(sig.RSASignature.bytes))
-	case PubKeyAlgoDSA:
-		dsaPriv := priv.PrivateKey.(*dsa.PrivateKey)
-
-		// Need to truncate hashBytes to match FIPS 186-3 section 4.6.
-		subgroupSize := (dsaPriv.Q.BitLen() + 7) / 8
-		if len(digest) > subgroupSize {
-			digest = digest[:subgroupSize]
-		}
-		r, s, err := dsa.Sign(config.Random(), dsaPriv, digest)
-		if err == nil {
-			sig.DSASigR.bytes = r.Bytes()
-			sig.DSASigR.bitLength = uint16(8 * len(sig.DSASigR.bytes))
-			sig.DSASigS.bytes = s.Bytes()
-			sig.DSASigS.bitLength = uint16(8 * len(sig.DSASigS.bytes))
-		}
-	default:
-		err = errors.UnsupportedError("public key algorithm: " + strconv.Itoa(int(sig.PubKeyAlgo)))
-	}
-
-	return
-}
-
-// SignUserId computes a signature from priv, asserting that pub is a valid
-// key for the identity id.  On success, the signature is stored in sig. Call
-// Serialize to write it out.
-// If config is nil, sensible defaults will be used.
-func (sig *Signature) SignUserId(id string, pub *PublicKey, priv *PrivateKey, config *Config) error {
-	h, err := userIdSignatureHash(id, pub, sig.Hash)
-	if err != nil {
-		return nil
-	}
-	return sig.Sign(h, priv, config)
-}
-
-// SignKey computes a signature from priv, asserting that pub is a subkey. On
-// success, the signature is stored in sig. Call Serialize to write it out.
-// If config is nil, sensible defaults will be used.
-func (sig *Signature) SignKey(pub *PublicKey, priv *PrivateKey, config *Config) error {
-	h, err := keySignatureHash(&priv.PublicKey, pub, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return sig.Sign(h, priv, config)
-}
-
-// Serialize marshals sig to w. Sign, SignUserId or SignKey must have been
-// called first.
-func (sig *Signature) Serialize(w io.Writer) (err error) {
-	if len(sig.outSubpackets) == 0 {
-		sig.outSubpackets = sig.rawSubpackets
-	}
-	if sig.RSASignature.bytes == nil && sig.DSASigR.bytes == nil && sig.ECDSASigR.bytes == nil {
-		return errors.InvalidArgumentError("Signature: need to call Sign, SignUserId or SignKey before Serialize")
-	}
-
-	sigLength := 0
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		sigLength = 2 + len(sig.RSASignature.bytes)
-	case PubKeyAlgoDSA:
-		sigLength = 2 + len(sig.DSASigR.bytes)
-		sigLength += 2 + len(sig.DSASigS.bytes)
-	case PubKeyAlgoECDSA:
-		sigLength = 2 + len(sig.ECDSASigR.bytes)
-		sigLength += 2 + len(sig.ECDSASigS.bytes)
-	default:
-		panic("impossible")
-	}
-
-	unhashedSubpacketsLen := subpacketsLength(sig.outSubpackets, false)
-	length := len(sig.HashSuffix) - 6 /* trailer not included */ +
-		2 /* length of unhashed subpackets */ + unhashedSubpacketsLen +
-		2 /* hash tag */ + sigLength
-	err = serializeHeader(w, packetTypeSignature, length)
-	if err != nil {
-		return
-	}
-
-	_, err = w.Write(sig.HashSuffix[:len(sig.HashSuffix)-6])
-	if err != nil {
-		return
-	}
-
-	unhashedSubpackets := make([]byte, 2+unhashedSubpacketsLen)
-	unhashedSubpackets[0] = byte(unhashedSubpacketsLen >> 8)
-	unhashedSubpackets[1] = byte(unhashedSubpacketsLen)
-	serializeSubpackets(unhashedSubpackets[2:], sig.outSubpackets, false)
-
-	_, err = w.Write(unhashedSubpackets)
-	if err != nil {
-		return
-	}
-	_, err = w.Write(sig.HashTag[:])
-	if err != nil {
-		return
-	}
-
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		err = writeMPIs(w, sig.RSASignature)
-	case PubKeyAlgoDSA:
-		err = writeMPIs(w, sig.DSASigR, sig.DSASigS)
-	case PubKeyAlgoECDSA:
-		err = writeMPIs(w, sig.ECDSASigR, sig.ECDSASigS)
-	default:
-		panic("impossible")
-	}
-	return
-}
-
-// outputSubpacket represents a subpacket to be marshaled.
-type outputSubpacket struct {
-	hashed        bool // true if this subpacket is in the hashed area.
-	subpacketType signatureSubpacketType
-	isCritical    bool
-	contents      []byte
-}
-
-func (sig *Signature) buildSubpackets() (subpackets []outputSubpacket) {
-	creationTime := make([]byte, 4)
-	binary.BigEndian.PutUint32(creationTime, uint32(sig.CreationTime.Unix()))
-	subpackets = append(subpackets, outputSubpacket{true, creationTimeSubpacket, false, creationTime})
-
-	if sig.IssuerKeyId != nil {
-		keyId := make([]byte, 8)
-		binary.BigEndian.PutUint64(keyId, *sig.IssuerKeyId)
-		subpackets = append(subpackets, outputSubpacket{true, issuerSubpacket, false, keyId})
-	}
-
-	if sig.SigLifetimeSecs != nil && *sig.SigLifetimeSecs != 0 {
-		sigLifetime := make([]byte, 4)
-		binary.BigEndian.PutUint32(sigLifetime, *sig.SigLifetimeSecs)
-		subpackets = append(subpackets, outputSubpacket{true, signatureExpirationSubpacket, true, sigLifetime})
-	}
-
-	// Key flags may only appear in self-signatures or certification signatures.
-
-	if sig.FlagsValid {
-		var flags byte
-		if sig.FlagCertify {
-			flags |= KeyFlagCertify
-		}
-		if sig.FlagSign {
-			flags |= KeyFlagSign
-		}
-		if sig.FlagEncryptCommunications {
-			flags |= KeyFlagEncryptCommunications
-		}
-		if sig.FlagEncryptStorage {
-			flags |= KeyFlagEncryptStorage
-		}
-		subpackets = append(subpackets, outputSubpacket{true, keyFlagsSubpacket, false, []byte{flags}})
-	}
-
-	// The following subpackets may only appear in self-signatures
-
-	if sig.KeyLifetimeSecs != nil && *sig.KeyLifetimeSecs != 0 {
-		keyLifetime := make([]byte, 4)
-		binary.BigEndian.PutUint32(keyLifetime, *sig.KeyLifetimeSecs)
-		subpackets = append(subpackets, outputSubpacket{true, keyExpirationSubpacket, true, keyLifetime})
-	}
-
-	if sig.IsPrimaryId != nil && *sig.IsPrimaryId {
-		subpackets = append(subpackets, outputSubpacket{true, primaryUserIdSubpacket, false, []byte{1}})
-	}
-
-	if len(sig.PreferredSymmetric) > 0 {
-		subpackets = append(subpackets, outputSubpacket{true, prefSymmetricAlgosSubpacket, false, sig.PreferredSymmetric})
-	}
-
-	if len(sig.PreferredHash) > 0 {
-		subpackets = append(subpackets, outputSubpacket{true, prefHashAlgosSubpacket, false, sig.PreferredHash})
-	}
-
-	if len(sig.PreferredCompression) > 0 {
-		subpackets = append(subpackets, outputSubpacket{true, prefCompressionSubpacket, false, sig.PreferredCompression})
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3.go
deleted file mode 100644
index 6edff88934..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-)
-
-// SignatureV3 represents older version 3 signatures. These signatures are less secure
-// than version 4 and should not be used to create new signatures. They are included
-// here for backwards compatibility to read and validate with older key material.
-// See RFC 4880, section 5.2.2.
-type SignatureV3 struct {
-	SigType      SignatureType
-	CreationTime time.Time
-	IssuerKeyId  uint64
-	PubKeyAlgo   PublicKeyAlgorithm
-	Hash         crypto.Hash
-	HashTag      [2]byte
-
-	RSASignature     parsedMPI
-	DSASigR, DSASigS parsedMPI
-}
-
-func (sig *SignatureV3) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.2.2
-	var buf [8]byte
-	if _, err = readFull(r, buf[:1]); err != nil {
-		return
-	}
-	if buf[0] < 2 || buf[0] > 3 {
-		err = errors.UnsupportedError("signature packet version " + strconv.Itoa(int(buf[0])))
-		return
-	}
-	if _, err = readFull(r, buf[:1]); err != nil {
-		return
-	}
-	if buf[0] != 5 {
-		err = errors.UnsupportedError(
-			"invalid hashed material length " + strconv.Itoa(int(buf[0])))
-		return
-	}
-
-	// Read hashed material: signature type + creation time
-	if _, err = readFull(r, buf[:5]); err != nil {
-		return
-	}
-	sig.SigType = SignatureType(buf[0])
-	t := binary.BigEndian.Uint32(buf[1:5])
-	sig.CreationTime = time.Unix(int64(t), 0)
-
-	// Eight-octet Key ID of signer.
-	if _, err = readFull(r, buf[:8]); err != nil {
-		return
-	}
-	sig.IssuerKeyId = binary.BigEndian.Uint64(buf[:])
-
-	// Public-key and hash algorithm
-	if _, err = readFull(r, buf[:2]); err != nil {
-		return
-	}
-	sig.PubKeyAlgo = PublicKeyAlgorithm(buf[0])
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA:
-	default:
-		err = errors.UnsupportedError("public key algorithm " + strconv.Itoa(int(sig.PubKeyAlgo)))
-		return
-	}
-	var ok bool
-	if sig.Hash, ok = s2k.HashIdToHash(buf[1]); !ok {
-		return errors.UnsupportedError("hash function " + strconv.Itoa(int(buf[2])))
-	}
-
-	// Two-octet field holding left 16 bits of signed hash value.
-	if _, err = readFull(r, sig.HashTag[:2]); err != nil {
-		return
-	}
-
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		sig.RSASignature.bytes, sig.RSASignature.bitLength, err = readMPI(r)
-	case PubKeyAlgoDSA:
-		if sig.DSASigR.bytes, sig.DSASigR.bitLength, err = readMPI(r); err != nil {
-			return
-		}
-		sig.DSASigS.bytes, sig.DSASigS.bitLength, err = readMPI(r)
-	default:
-		panic("unreachable")
-	}
-	return
-}
-
-// Serialize marshals sig to w. Sign, SignUserId or SignKey must have been
-// called first.
-func (sig *SignatureV3) Serialize(w io.Writer) (err error) {
-	buf := make([]byte, 8)
-
-	// Write the sig type and creation time
-	buf[0] = byte(sig.SigType)
-	binary.BigEndian.PutUint32(buf[1:5], uint32(sig.CreationTime.Unix()))
-	if _, err = w.Write(buf[:5]); err != nil {
-		return
-	}
-
-	// Write the issuer long key ID
-	binary.BigEndian.PutUint64(buf[:8], sig.IssuerKeyId)
-	if _, err = w.Write(buf[:8]); err != nil {
-		return
-	}
-
-	// Write public key algorithm, hash ID, and hash value
-	buf[0] = byte(sig.PubKeyAlgo)
-	hashId, ok := s2k.HashToHashId(sig.Hash)
-	if !ok {
-		return errors.UnsupportedError(fmt.Sprintf("hash function %v", sig.Hash))
-	}
-	buf[1] = hashId
-	copy(buf[2:4], sig.HashTag[:])
-	if _, err = w.Write(buf[:4]); err != nil {
-		return
-	}
-
-	if sig.RSASignature.bytes == nil && sig.DSASigR.bytes == nil {
-		return errors.InvalidArgumentError("Signature: need to call Sign, SignUserId or SignKey before Serialize")
-	}
-
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		err = writeMPIs(w, sig.RSASignature)
-	case PubKeyAlgoDSA:
-		err = writeMPIs(w, sig.DSASigR, sig.DSASigS)
-	default:
-		panic("impossible")
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
deleted file mode 100644
index 7dff655221..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto/cipher"
-	"io"
-	"strconv"
-
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-)
-
-// This is the largest session key that we'll support. Since no 512-bit cipher
-// has even been seriously used, this is comfortably large.
-const maxSessionKeySizeInBytes = 64
-
-// SymmetricKeyEncrypted represents a passphrase protected session key. See RFC
-// 4880, section 5.3.
-type SymmetricKeyEncrypted struct {
-	CipherFunc   CipherFunction
-	Encrypted    bool
-	Key          []byte // Empty unless Encrypted is false.
-	s2k          func(out, in []byte)
-	encryptedKey []byte
-}
-
-const symmetricKeyEncryptedVersion = 4
-
-func (ske *SymmetricKeyEncrypted) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.3.
-	var buf [2]byte
-	_, err = readFull(r, buf[:])
-	if err != nil {
-		return
-	}
-	if buf[0] != symmetricKeyEncryptedVersion {
-		return errors.UnsupportedError("SymmetricKeyEncrypted version")
-	}
-	ske.CipherFunc = CipherFunction(buf[1])
-
-	if ske.CipherFunc.KeySize() == 0 {
-		return errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(buf[1])))
-	}
-
-	ske.s2k, err = s2k.Parse(r)
-	if err != nil {
-		return
-	}
-
-	encryptedKey := make([]byte, maxSessionKeySizeInBytes)
-	// The session key may follow. We just have to try and read to find
-	// out. If it exists then we limit it to maxSessionKeySizeInBytes.
-	n, err := readFull(r, encryptedKey)
-	if err != nil && err != io.ErrUnexpectedEOF {
-		return
-	}
-	err = nil
-	if n != 0 {
-		if n == maxSessionKeySizeInBytes {
-			return errors.UnsupportedError("oversized encrypted session key")
-		}
-		ske.encryptedKey = encryptedKey[:n]
-	}
-
-	ske.Encrypted = true
-
-	return
-}
-
-// Decrypt attempts to decrypt an encrypted session key. If it returns nil,
-// ske.Key will contain the session key.
-func (ske *SymmetricKeyEncrypted) Decrypt(passphrase []byte) error {
-	if !ske.Encrypted {
-		return nil
-	}
-
-	key := make([]byte, ske.CipherFunc.KeySize())
-	ske.s2k(key, passphrase)
-
-	if len(ske.encryptedKey) == 0 {
-		ske.Key = key
-	} else {
-		// the IV is all zeros
-		iv := make([]byte, ske.CipherFunc.blockSize())
-		c := cipher.NewCFBDecrypter(ske.CipherFunc.new(key), iv)
-		c.XORKeyStream(ske.encryptedKey, ske.encryptedKey)
-		ske.CipherFunc = CipherFunction(ske.encryptedKey[0])
-		if ske.CipherFunc.blockSize() == 0 {
-			return errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(ske.CipherFunc)))
-		}
-		ske.CipherFunc = CipherFunction(ske.encryptedKey[0])
-		ske.Key = ske.encryptedKey[1:]
-		if len(ske.Key)%ske.CipherFunc.blockSize() != 0 {
-			ske.Key = nil
-			return errors.StructuralError("length of decrypted key not a multiple of block size")
-		}
-	}
-
-	ske.Encrypted = false
-	return nil
-}
-
-// SerializeSymmetricKeyEncrypted serializes a symmetric key packet to w. The
-// packet contains a random session key, encrypted by a key derived from the
-// given passphrase. The session key is returned and must be passed to
-// SerializeSymmetricallyEncrypted.
-// If config is nil, sensible defaults will be used.
-func SerializeSymmetricKeyEncrypted(w io.Writer, passphrase []byte, config *Config) (key []byte, err error) {
-	cipherFunc := config.Cipher()
-	keySize := cipherFunc.KeySize()
-	if keySize == 0 {
-		return nil, errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(cipherFunc)))
-	}
-
-	s2kBuf := new(bytes.Buffer)
-	keyEncryptingKey := make([]byte, keySize)
-	// s2k.Serialize salts and stretches the passphrase, and writes the
-	// resulting key to keyEncryptingKey and the s2k descriptor to s2kBuf.
-	err = s2k.Serialize(s2kBuf, keyEncryptingKey, config.Random(), passphrase, &s2k.Config{Hash: config.Hash(), S2KCount: config.PasswordHashIterations()})
-	if err != nil {
-		return
-	}
-	s2kBytes := s2kBuf.Bytes()
-
-	packetLength := 2 /* header */ + len(s2kBytes) + 1 /* cipher type */ + keySize
-	err = serializeHeader(w, packetTypeSymmetricKeyEncrypted, packetLength)
-	if err != nil {
-		return
-	}
-
-	var buf [2]byte
-	buf[0] = symmetricKeyEncryptedVersion
-	buf[1] = byte(cipherFunc)
-	_, err = w.Write(buf[:])
-	if err != nil {
-		return
-	}
-	_, err = w.Write(s2kBytes)
-	if err != nil {
-		return
-	}
-
-	sessionKey := make([]byte, keySize)
-	_, err = io.ReadFull(config.Random(), sessionKey)
-	if err != nil {
-		return
-	}
-	iv := make([]byte, cipherFunc.blockSize())
-	c := cipher.NewCFBEncrypter(cipherFunc.new(keyEncryptingKey), iv)
-	encryptedCipherAndKey := make([]byte, keySize+1)
-	c.XORKeyStream(encryptedCipherAndKey, buf[1:])
-	c.XORKeyStream(encryptedCipherAndKey[1:], sessionKey)
-	_, err = w.Write(encryptedCipherAndKey)
-	if err != nil {
-		return
-	}
-
-	key = sessionKey
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
deleted file mode 100644
index 6126030eb9..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto/cipher"
-	"crypto/sha1"
-	"crypto/subtle"
-	"golang.org/x/crypto/openpgp/errors"
-	"hash"
-	"io"
-	"strconv"
-)
-
-// SymmetricallyEncrypted represents a symmetrically encrypted byte string. The
-// encrypted contents will consist of more OpenPGP packets. See RFC 4880,
-// sections 5.7 and 5.13.
-type SymmetricallyEncrypted struct {
-	MDC      bool // true iff this is a type 18 packet and thus has an embedded MAC.
-	contents io.Reader
-	prefix   []byte
-}
-
-const symmetricallyEncryptedVersion = 1
-
-func (se *SymmetricallyEncrypted) parse(r io.Reader) error {
-	if se.MDC {
-		// See RFC 4880, section 5.13.
-		var buf [1]byte
-		_, err := readFull(r, buf[:])
-		if err != nil {
-			return err
-		}
-		if buf[0] != symmetricallyEncryptedVersion {
-			return errors.UnsupportedError("unknown SymmetricallyEncrypted version")
-		}
-	}
-	se.contents = r
-	return nil
-}
-
-// Decrypt returns a ReadCloser, from which the decrypted contents of the
-// packet can be read. An incorrect key can, with high probability, be detected
-// immediately and this will result in a KeyIncorrect error being returned.
-func (se *SymmetricallyEncrypted) Decrypt(c CipherFunction, key []byte) (io.ReadCloser, error) {
-	keySize := c.KeySize()
-	if keySize == 0 {
-		return nil, errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(c)))
-	}
-	if len(key) != keySize {
-		return nil, errors.InvalidArgumentError("SymmetricallyEncrypted: incorrect key length")
-	}
-
-	if se.prefix == nil {
-		se.prefix = make([]byte, c.blockSize()+2)
-		_, err := readFull(se.contents, se.prefix)
-		if err != nil {
-			return nil, err
-		}
-	} else if len(se.prefix) != c.blockSize()+2 {
-		return nil, errors.InvalidArgumentError("can't try ciphers with different block lengths")
-	}
-
-	ocfbResync := OCFBResync
-	if se.MDC {
-		// MDC packets use a different form of OCFB mode.
-		ocfbResync = OCFBNoResync
-	}
-
-	s := NewOCFBDecrypter(c.new(key), se.prefix, ocfbResync)
-	if s == nil {
-		return nil, errors.ErrKeyIncorrect
-	}
-
-	plaintext := cipher.StreamReader{S: s, R: se.contents}
-
-	if se.MDC {
-		// MDC packets have an embedded hash that we need to check.
-		h := sha1.New()
-		h.Write(se.prefix)
-		return &seMDCReader{in: plaintext, h: h}, nil
-	}
-
-	// Otherwise, we just need to wrap plaintext so that it's a valid ReadCloser.
-	return seReader{plaintext}, nil
-}
-
-// seReader wraps an io.Reader with a no-op Close method.
-type seReader struct {
-	in io.Reader
-}
-
-func (ser seReader) Read(buf []byte) (int, error) {
-	return ser.in.Read(buf)
-}
-
-func (ser seReader) Close() error {
-	return nil
-}
-
-const mdcTrailerSize = 1 /* tag byte */ + 1 /* length byte */ + sha1.Size
-
-// An seMDCReader wraps an io.Reader, maintains a running hash and keeps hold
-// of the most recent 22 bytes (mdcTrailerSize). Upon EOF, those bytes form an
-// MDC packet containing a hash of the previous contents which is checked
-// against the running hash. See RFC 4880, section 5.13.
-type seMDCReader struct {
-	in          io.Reader
-	h           hash.Hash
-	trailer     [mdcTrailerSize]byte
-	scratch     [mdcTrailerSize]byte
-	trailerUsed int
-	error       bool
-	eof         bool
-}
-
-func (ser *seMDCReader) Read(buf []byte) (n int, err error) {
-	if ser.error {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	if ser.eof {
-		err = io.EOF
-		return
-	}
-
-	// If we haven't yet filled the trailer buffer then we must do that
-	// first.
-	for ser.trailerUsed < mdcTrailerSize {
-		n, err = ser.in.Read(ser.trailer[ser.trailerUsed:])
-		ser.trailerUsed += n
-		if err == io.EOF {
-			if ser.trailerUsed != mdcTrailerSize {
-				n = 0
-				err = io.ErrUnexpectedEOF
-				ser.error = true
-				return
-			}
-			ser.eof = true
-			n = 0
-			return
-		}
-
-		if err != nil {
-			n = 0
-			return
-		}
-	}
-
-	// If it's a short read then we read into a temporary buffer and shift
-	// the data into the caller's buffer.
-	if len(buf) <= mdcTrailerSize {
-		n, err = readFull(ser.in, ser.scratch[:len(buf)])
-		copy(buf, ser.trailer[:n])
-		ser.h.Write(buf[:n])
-		copy(ser.trailer[:], ser.trailer[n:])
-		copy(ser.trailer[mdcTrailerSize-n:], ser.scratch[:])
-		if n < len(buf) {
-			ser.eof = true
-			err = io.EOF
-		}
-		return
-	}
-
-	n, err = ser.in.Read(buf[mdcTrailerSize:])
-	copy(buf, ser.trailer[:])
-	ser.h.Write(buf[:n])
-	copy(ser.trailer[:], buf[n:])
-
-	if err == io.EOF {
-		ser.eof = true
-	}
-	return
-}
-
-// This is a new-format packet tag byte for a type 19 (MDC) packet.
-const mdcPacketTagByte = byte(0x80) | 0x40 | 19
-
-func (ser *seMDCReader) Close() error {
-	if ser.error {
-		return errors.SignatureError("error during reading")
-	}
-
-	for !ser.eof {
-		// We haven't seen EOF so we need to read to the end
-		var buf [1024]byte
-		_, err := ser.Read(buf[:])
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return errors.SignatureError("error during reading")
-		}
-	}
-
-	if ser.trailer[0] != mdcPacketTagByte || ser.trailer[1] != sha1.Size {
-		return errors.SignatureError("MDC packet not found")
-	}
-	ser.h.Write(ser.trailer[:2])
-
-	final := ser.h.Sum(nil)
-	if subtle.ConstantTimeCompare(final, ser.trailer[2:]) != 1 {
-		return errors.SignatureError("hash mismatch")
-	}
-	return nil
-}
-
-// An seMDCWriter writes through to an io.WriteCloser while maintains a running
-// hash of the data written. On close, it emits an MDC packet containing the
-// running hash.
-type seMDCWriter struct {
-	w io.WriteCloser
-	h hash.Hash
-}
-
-func (w *seMDCWriter) Write(buf []byte) (n int, err error) {
-	w.h.Write(buf)
-	return w.w.Write(buf)
-}
-
-func (w *seMDCWriter) Close() (err error) {
-	var buf [mdcTrailerSize]byte
-
-	buf[0] = mdcPacketTagByte
-	buf[1] = sha1.Size
-	w.h.Write(buf[:2])
-	digest := w.h.Sum(nil)
-	copy(buf[2:], digest)
-
-	_, err = w.w.Write(buf[:])
-	if err != nil {
-		return
-	}
-	return w.w.Close()
-}
-
-// noOpCloser is like an ioutil.NopCloser, but for an io.Writer.
-type noOpCloser struct {
-	w io.Writer
-}
-
-func (c noOpCloser) Write(data []byte) (n int, err error) {
-	return c.w.Write(data)
-}
-
-func (c noOpCloser) Close() error {
-	return nil
-}
-
-// SerializeSymmetricallyEncrypted serializes a symmetrically encrypted packet
-// to w and returns a WriteCloser to which the to-be-encrypted packets can be
-// written.
-// If config is nil, sensible defaults will be used.
-func SerializeSymmetricallyEncrypted(w io.Writer, c CipherFunction, key []byte, config *Config) (contents io.WriteCloser, err error) {
-	if c.KeySize() != len(key) {
-		return nil, errors.InvalidArgumentError("SymmetricallyEncrypted.Serialize: bad key length")
-	}
-	writeCloser := noOpCloser{w}
-	ciphertext, err := serializeStreamHeader(writeCloser, packetTypeSymmetricallyEncryptedMDC)
-	if err != nil {
-		return
-	}
-
-	_, err = ciphertext.Write([]byte{symmetricallyEncryptedVersion})
-	if err != nil {
-		return
-	}
-
-	block := c.new(key)
-	blockSize := block.BlockSize()
-	iv := make([]byte, blockSize)
-	_, err = config.Random().Read(iv)
-	if err != nil {
-		return
-	}
-	s, prefix := NewOCFBEncrypter(block, iv, OCFBNoResync)
-	_, err = ciphertext.Write(prefix)
-	if err != nil {
-		return
-	}
-	plaintext := cipher.StreamWriter{S: s, W: ciphertext}
-
-	h := sha1.New()
-	h.Write(iv)
-	h.Write(iv[blockSize-2:])
-	contents = &seMDCWriter{w: plaintext, h: h}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/userattribute.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/userattribute.go
deleted file mode 100644
index 96a2b382a1..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/userattribute.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"image"
-	"image/jpeg"
-	"io"
-	"io/ioutil"
-)
-
-const UserAttrImageSubpacket = 1
-
-// UserAttribute is capable of storing other types of data about a user
-// beyond name, email and a text comment. In practice, user attributes are typically used
-// to store a signed thumbnail photo JPEG image of the user.
-// See RFC 4880, section 5.12.
-type UserAttribute struct {
-	Contents []*OpaqueSubpacket
-}
-
-// NewUserAttributePhoto creates a user attribute packet
-// containing the given images.
-func NewUserAttributePhoto(photos ...image.Image) (uat *UserAttribute, err error) {
-	uat = new(UserAttribute)
-	for _, photo := range photos {
-		var buf bytes.Buffer
-		// RFC 4880, Section 5.12.1.
-		data := []byte{
-			0x10, 0x00, // Little-endian image header length (16 bytes)
-			0x01,       // Image header version 1
-			0x01,       // JPEG
-			0, 0, 0, 0, // 12 reserved octets, must be all zero.
-			0, 0, 0, 0,
-			0, 0, 0, 0}
-		if _, err = buf.Write(data); err != nil {
-			return
-		}
-		if err = jpeg.Encode(&buf, photo, nil); err != nil {
-			return
-		}
-		uat.Contents = append(uat.Contents, &OpaqueSubpacket{
-			SubType:  UserAttrImageSubpacket,
-			Contents: buf.Bytes()})
-	}
-	return
-}
-
-// NewUserAttribute creates a new user attribute packet containing the given subpackets.
-func NewUserAttribute(contents ...*OpaqueSubpacket) *UserAttribute {
-	return &UserAttribute{Contents: contents}
-}
-
-func (uat *UserAttribute) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.13
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		return
-	}
-	uat.Contents, err = OpaqueSubpackets(b)
-	return
-}
-
-// Serialize marshals the user attribute to w in the form of an OpenPGP packet, including
-// header.
-func (uat *UserAttribute) Serialize(w io.Writer) (err error) {
-	var buf bytes.Buffer
-	for _, sp := range uat.Contents {
-		sp.Serialize(&buf)
-	}
-	if err = serializeHeader(w, packetTypeUserAttribute, buf.Len()); err != nil {
-		return err
-	}
-	_, err = w.Write(buf.Bytes())
-	return
-}
-
-// ImageData returns zero or more byte slices, each containing
-// JPEG File Interchange Format (JFIF), for each photo in the
-// the user attribute packet.
-func (uat *UserAttribute) ImageData() (imageData [][]byte) {
-	for _, sp := range uat.Contents {
-		if sp.SubType == UserAttrImageSubpacket && len(sp.Contents) > 16 {
-			imageData = append(imageData, sp.Contents[16:])
-		}
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/userid.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/userid.go
deleted file mode 100644
index d6bea7d4ac..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/userid.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"io"
-	"io/ioutil"
-	"strings"
-)
-
-// UserId contains text that is intended to represent the name and email
-// address of the key holder. See RFC 4880, section 5.11. By convention, this
-// takes the form "Full Name (Comment) <email@example.com>"
-type UserId struct {
-	Id string // By convention, this takes the form "Full Name (Comment) <email@example.com>" which is split out in the fields below.
-
-	Name, Comment, Email string
-}
-
-func hasInvalidCharacters(s string) bool {
-	for _, c := range s {
-		switch c {
-		case '(', ')', '<', '>', 0:
-			return true
-		}
-	}
-	return false
-}
-
-// NewUserId returns a UserId or nil if any of the arguments contain invalid
-// characters. The invalid characters are '\x00', '(', ')', '<' and '>'
-func NewUserId(name, comment, email string) *UserId {
-	// RFC 4880 doesn't deal with the structure of userid strings; the
-	// name, comment and email form is just a convention. However, there's
-	// no convention about escaping the metacharacters and GPG just refuses
-	// to create user ids where, say, the name contains a '('. We mirror
-	// this behaviour.
-
-	if hasInvalidCharacters(name) || hasInvalidCharacters(comment) || hasInvalidCharacters(email) {
-		return nil
-	}
-
-	uid := new(UserId)
-	uid.Name, uid.Comment, uid.Email = name, comment, email
-	uid.Id = name
-	if len(comment) > 0 {
-		if len(uid.Id) > 0 {
-			uid.Id += " "
-		}
-		uid.Id += "("
-		uid.Id += comment
-		uid.Id += ")"
-	}
-	if len(email) > 0 {
-		if len(uid.Id) > 0 {
-			uid.Id += " "
-		}
-		uid.Id += "<"
-		uid.Id += email
-		uid.Id += ">"
-	}
-	return uid
-}
-
-func (uid *UserId) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.11
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		return
-	}
-	uid.Id = string(b)
-	uid.Name, uid.Comment, uid.Email = parseUserId(uid.Id)
-	return
-}
-
-// Serialize marshals uid to w in the form of an OpenPGP packet, including
-// header.
-func (uid *UserId) Serialize(w io.Writer) error {
-	err := serializeHeader(w, packetTypeUserId, len(uid.Id))
-	if err != nil {
-		return err
-	}
-	_, err = w.Write([]byte(uid.Id))
-	return err
-}
-
-// parseUserId extracts the name, comment and email from a user id string that
-// is formatted as "Full Name (Comment) <email@example.com>".
-func parseUserId(id string) (name, comment, email string) {
-	var n, c, e struct {
-		start, end int
-	}
-	var state int
-
-	for offset, rune := range id {
-		switch state {
-		case 0:
-			// Entering name
-			n.start = offset
-			state = 1
-			fallthrough
-		case 1:
-			// In name
-			if rune == '(' {
-				state = 2
-				n.end = offset
-			} else if rune == '<' {
-				state = 5
-				n.end = offset
-			}
-		case 2:
-			// Entering comment
-			c.start = offset
-			state = 3
-			fallthrough
-		case 3:
-			// In comment
-			if rune == ')' {
-				state = 4
-				c.end = offset
-			}
-		case 4:
-			// Between comment and email
-			if rune == '<' {
-				state = 5
-			}
-		case 5:
-			// Entering email
-			e.start = offset
-			state = 6
-			fallthrough
-		case 6:
-			// In email
-			if rune == '>' {
-				state = 7
-				e.end = offset
-			}
-		default:
-			// After email
-		}
-	}
-	switch state {
-	case 1:
-		// ended in the name
-		n.end = len(id)
-	case 3:
-		// ended in comment
-		c.end = len(id)
-	case 6:
-		// ended in email
-		e.end = len(id)
-	}
-
-	name = strings.TrimSpace(id[n.start:n.end])
-	comment = strings.TrimSpace(id[c.start:c.end])
-	email = strings.TrimSpace(id[e.start:e.end])
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read.go
deleted file mode 100644
index 08129d7071..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read.go
+++ /dev/null
@@ -1,423 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package openpgp implements high level operations on OpenPGP messages.
-package openpgp
-
-import (
-	"crypto"
-	_ "crypto/sha256"
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
-	"hash"
-	"io"
-	"strconv"
-)
-
-// SignatureType is the armor type for a PGP signature.
-var SignatureType = "PGP SIGNATURE"
-
-// readArmored reads an armored block with the given type.
-func readArmored(r io.Reader, expectedType string) (body io.Reader, err error) {
-	block, err := armor.Decode(r)
-	if err != nil {
-		return
-	}
-
-	if block.Type != expectedType {
-		return nil, errors.InvalidArgumentError("expected '" + expectedType + "', got: " + block.Type)
-	}
-
-	return block.Body, nil
-}
-
-// MessageDetails contains the result of parsing an OpenPGP encrypted and/or
-// signed message.
-type MessageDetails struct {
-	IsEncrypted              bool                // true if the message was encrypted.
-	EncryptedToKeyIds        []uint64            // the list of recipient key ids.
-	IsSymmetricallyEncrypted bool                // true if a passphrase could have decrypted the message.
-	DecryptedWith            Key                 // the private key used to decrypt the message, if any.
-	IsSigned                 bool                // true if the message is signed.
-	SignedByKeyId            uint64              // the key id of the signer, if any.
-	SignedBy                 *Key                // the key of the signer, if available.
-	LiteralData              *packet.LiteralData // the metadata of the contents
-	UnverifiedBody           io.Reader           // the contents of the message.
-
-	// If IsSigned is true and SignedBy is non-zero then the signature will
-	// be verified as UnverifiedBody is read. The signature cannot be
-	// checked until the whole of UnverifiedBody is read so UnverifiedBody
-	// must be consumed until EOF before the data can trusted. Even if a
-	// message isn't signed (or the signer is unknown) the data may contain
-	// an authentication code that is only checked once UnverifiedBody has
-	// been consumed. Once EOF has been seen, the following fields are
-	// valid. (An authentication code failure is reported as a
-	// SignatureError error when reading from UnverifiedBody.)
-	SignatureError error             // nil if the signature is good.
-	Signature      *packet.Signature // the signature packet itself.
-
-	decrypted io.ReadCloser
-}
-
-// A PromptFunction is used as a callback by functions that may need to decrypt
-// a private key, or prompt for a passphrase. It is called with a list of
-// acceptable, encrypted private keys and a boolean that indicates whether a
-// passphrase is usable. It should either decrypt a private key or return a
-// passphrase to try. If the decrypted private key or given passphrase isn't
-// correct, the function will be called again, forever. Any error returned will
-// be passed up.
-type PromptFunction func(keys []Key, symmetric bool) ([]byte, error)
-
-// A keyEnvelopePair is used to store a private key with the envelope that
-// contains a symmetric key, encrypted with that key.
-type keyEnvelopePair struct {
-	key          Key
-	encryptedKey *packet.EncryptedKey
-}
-
-// ReadMessage parses an OpenPGP message that may be signed and/or encrypted.
-// The given KeyRing should contain both public keys (for signature
-// verification) and, possibly encrypted, private keys for decrypting.
-// If config is nil, sensible defaults will be used.
-func ReadMessage(r io.Reader, keyring KeyRing, prompt PromptFunction, config *packet.Config) (md *MessageDetails, err error) {
-	var p packet.Packet
-
-	var symKeys []*packet.SymmetricKeyEncrypted
-	var pubKeys []keyEnvelopePair
-	var se *packet.SymmetricallyEncrypted
-
-	packets := packet.NewReader(r)
-	md = new(MessageDetails)
-	md.IsEncrypted = true
-
-	// The message, if encrypted, starts with a number of packets
-	// containing an encrypted decryption key. The decryption key is either
-	// encrypted to a public key, or with a passphrase. This loop
-	// collects these packets.
-ParsePackets:
-	for {
-		p, err = packets.Next()
-		if err != nil {
-			return nil, err
-		}
-		switch p := p.(type) {
-		case *packet.SymmetricKeyEncrypted:
-			// This packet contains the decryption key encrypted with a passphrase.
-			md.IsSymmetricallyEncrypted = true
-			symKeys = append(symKeys, p)
-		case *packet.EncryptedKey:
-			// This packet contains the decryption key encrypted to a public key.
-			md.EncryptedToKeyIds = append(md.EncryptedToKeyIds, p.KeyId)
-			switch p.Algo {
-			case packet.PubKeyAlgoRSA, packet.PubKeyAlgoRSAEncryptOnly, packet.PubKeyAlgoElGamal:
-				break
-			default:
-				continue
-			}
-			var keys []Key
-			if p.KeyId == 0 {
-				keys = keyring.DecryptionKeys()
-			} else {
-				keys = keyring.KeysById(p.KeyId)
-			}
-			for _, k := range keys {
-				pubKeys = append(pubKeys, keyEnvelopePair{k, p})
-			}
-		case *packet.SymmetricallyEncrypted:
-			se = p
-			break ParsePackets
-		case *packet.Compressed, *packet.LiteralData, *packet.OnePassSignature:
-			// This message isn't encrypted.
-			if len(symKeys) != 0 || len(pubKeys) != 0 {
-				return nil, errors.StructuralError("key material not followed by encrypted message")
-			}
-			packets.Unread(p)
-			return readSignedMessage(packets, nil, keyring)
-		}
-	}
-
-	var candidates []Key
-	var decrypted io.ReadCloser
-
-	// Now that we have the list of encrypted keys we need to decrypt at
-	// least one of them or, if we cannot, we need to call the prompt
-	// function so that it can decrypt a key or give us a passphrase.
-FindKey:
-	for {
-		// See if any of the keys already have a private key available
-		candidates = candidates[:0]
-		candidateFingerprints := make(map[string]bool)
-
-		for _, pk := range pubKeys {
-			if pk.key.PrivateKey == nil {
-				continue
-			}
-			if !pk.key.PrivateKey.Encrypted {
-				if len(pk.encryptedKey.Key) == 0 {
-					pk.encryptedKey.Decrypt(pk.key.PrivateKey, config)
-				}
-				if len(pk.encryptedKey.Key) == 0 {
-					continue
-				}
-				decrypted, err = se.Decrypt(pk.encryptedKey.CipherFunc, pk.encryptedKey.Key)
-				if err != nil && err != errors.ErrKeyIncorrect {
-					return nil, err
-				}
-				if decrypted != nil {
-					md.DecryptedWith = pk.key
-					break FindKey
-				}
-			} else {
-				fpr := string(pk.key.PublicKey.Fingerprint[:])
-				if v := candidateFingerprints[fpr]; v {
-					continue
-				}
-				candidates = append(candidates, pk.key)
-				candidateFingerprints[fpr] = true
-			}
-		}
-
-		if len(candidates) == 0 && len(symKeys) == 0 {
-			return nil, errors.ErrKeyIncorrect
-		}
-
-		if prompt == nil {
-			return nil, errors.ErrKeyIncorrect
-		}
-
-		passphrase, err := prompt(candidates, len(symKeys) != 0)
-		if err != nil {
-			return nil, err
-		}
-
-		// Try the symmetric passphrase first
-		if len(symKeys) != 0 && passphrase != nil {
-			for _, s := range symKeys {
-				err = s.Decrypt(passphrase)
-				if err == nil && !s.Encrypted {
-					decrypted, err = se.Decrypt(s.CipherFunc, s.Key)
-					if err != nil && err != errors.ErrKeyIncorrect {
-						return nil, err
-					}
-					if decrypted != nil {
-						break FindKey
-					}
-				}
-
-			}
-		}
-	}
-
-	md.decrypted = decrypted
-	packets.Push(decrypted)
-	return readSignedMessage(packets, md, keyring)
-}
-
-// readSignedMessage reads a possibly signed message if mdin is non-zero then
-// that structure is updated and returned. Otherwise a fresh MessageDetails is
-// used.
-func readSignedMessage(packets *packet.Reader, mdin *MessageDetails, keyring KeyRing) (md *MessageDetails, err error) {
-	if mdin == nil {
-		mdin = new(MessageDetails)
-	}
-	md = mdin
-
-	var p packet.Packet
-	var h hash.Hash
-	var wrappedHash hash.Hash
-FindLiteralData:
-	for {
-		p, err = packets.Next()
-		if err != nil {
-			return nil, err
-		}
-		switch p := p.(type) {
-		case *packet.Compressed:
-			packets.Push(p.Body)
-		case *packet.OnePassSignature:
-			if !p.IsLast {
-				return nil, errors.UnsupportedError("nested signatures")
-			}
-
-			h, wrappedHash, err = hashForSignature(p.Hash, p.SigType)
-			if err != nil {
-				md = nil
-				return
-			}
-
-			md.IsSigned = true
-			md.SignedByKeyId = p.KeyId
-			keys := keyring.KeysByIdUsage(p.KeyId, packet.KeyFlagSign)
-			if len(keys) > 0 {
-				md.SignedBy = &keys[0]
-			}
-		case *packet.LiteralData:
-			md.LiteralData = p
-			break FindLiteralData
-		}
-	}
-
-	if md.SignedBy != nil {
-		md.UnverifiedBody = &signatureCheckReader{packets, h, wrappedHash, md}
-	} else if md.decrypted != nil {
-		md.UnverifiedBody = checkReader{md}
-	} else {
-		md.UnverifiedBody = md.LiteralData.Body
-	}
-
-	return md, nil
-}
-
-// hashForSignature returns a pair of hashes that can be used to verify a
-// signature. The signature may specify that the contents of the signed message
-// should be preprocessed (i.e. to normalize line endings). Thus this function
-// returns two hashes. The second should be used to hash the message itself and
-// performs any needed preprocessing.
-func hashForSignature(hashId crypto.Hash, sigType packet.SignatureType) (hash.Hash, hash.Hash, error) {
-	if !hashId.Available() {
-		return nil, nil, errors.UnsupportedError("hash not available: " + strconv.Itoa(int(hashId)))
-	}
-	h := hashId.New()
-
-	switch sigType {
-	case packet.SigTypeBinary:
-		return h, h, nil
-	case packet.SigTypeText:
-		return h, NewCanonicalTextHash(h), nil
-	}
-
-	return nil, nil, errors.UnsupportedError("unsupported signature type: " + strconv.Itoa(int(sigType)))
-}
-
-// checkReader wraps an io.Reader from a LiteralData packet. When it sees EOF
-// it closes the ReadCloser from any SymmetricallyEncrypted packet to trigger
-// MDC checks.
-type checkReader struct {
-	md *MessageDetails
-}
-
-func (cr checkReader) Read(buf []byte) (n int, err error) {
-	n, err = cr.md.LiteralData.Body.Read(buf)
-	if err == io.EOF {
-		mdcErr := cr.md.decrypted.Close()
-		if mdcErr != nil {
-			err = mdcErr
-		}
-	}
-	return
-}
-
-// signatureCheckReader wraps an io.Reader from a LiteralData packet and hashes
-// the data as it is read. When it sees an EOF from the underlying io.Reader
-// it parses and checks a trailing Signature packet and triggers any MDC checks.
-type signatureCheckReader struct {
-	packets        *packet.Reader
-	h, wrappedHash hash.Hash
-	md             *MessageDetails
-}
-
-func (scr *signatureCheckReader) Read(buf []byte) (n int, err error) {
-	n, err = scr.md.LiteralData.Body.Read(buf)
-	scr.wrappedHash.Write(buf[:n])
-	if err == io.EOF {
-		var p packet.Packet
-		p, scr.md.SignatureError = scr.packets.Next()
-		if scr.md.SignatureError != nil {
-			return
-		}
-
-		var ok bool
-		if scr.md.Signature, ok = p.(*packet.Signature); !ok {
-			scr.md.SignatureError = errors.StructuralError("LiteralData not followed by Signature")
-			return
-		}
-
-		scr.md.SignatureError = scr.md.SignedBy.PublicKey.VerifySignature(scr.h, scr.md.Signature)
-
-		// The SymmetricallyEncrypted packet, if any, might have an
-		// unsigned hash of its own. In order to check this we need to
-		// close that Reader.
-		if scr.md.decrypted != nil {
-			mdcErr := scr.md.decrypted.Close()
-			if mdcErr != nil {
-				err = mdcErr
-			}
-		}
-	}
-	return
-}
-
-// CheckDetachedSignature takes a signed file and a detached signature and
-// returns the signer if the signature is valid. If the signer isn't known,
-// ErrUnknownIssuer is returned.
-func CheckDetachedSignature(keyring KeyRing, signed, signature io.Reader) (signer *Entity, err error) {
-	p, err := packet.Read(signature)
-	if err != nil {
-		return
-	}
-
-	var issuerKeyId uint64
-	var hashFunc crypto.Hash
-	var sigType packet.SignatureType
-
-	switch sig := p.(type) {
-	case *packet.Signature:
-		if sig.IssuerKeyId == nil {
-			return nil, errors.StructuralError("signature doesn't have an issuer")
-		}
-		issuerKeyId = *sig.IssuerKeyId
-		hashFunc = sig.Hash
-		sigType = sig.SigType
-	case *packet.SignatureV3:
-		issuerKeyId = sig.IssuerKeyId
-		hashFunc = sig.Hash
-		sigType = sig.SigType
-	default:
-		return nil, errors.StructuralError("non signature packet found")
-	}
-
-	h, wrappedHash, err := hashForSignature(hashFunc, sigType)
-	if err != nil {
-		return
-	}
-
-	_, err = io.Copy(wrappedHash, signed)
-	if err != nil && err != io.EOF {
-		return
-	}
-
-	keys := keyring.KeysByIdUsage(issuerKeyId, packet.KeyFlagSign)
-	if len(keys) == 0 {
-		return nil, errors.ErrUnknownIssuer
-	}
-
-	for _, key := range keys {
-		switch sig := p.(type) {
-		case *packet.Signature:
-			err = key.PublicKey.VerifySignature(h, sig)
-		case *packet.SignatureV3:
-			err = key.PublicKey.VerifySignatureV3(h, sig)
-		}
-		if err == nil {
-			return key.Entity, nil
-		}
-	}
-
-	if err == nil {
-		err = errors.ErrUnknownIssuer
-	}
-	return nil, err
-}
-
-// CheckArmoredDetachedSignature performs the same actions as
-// CheckDetachedSignature but expects the signature to be armored.
-func CheckArmoredDetachedSignature(keyring KeyRing, signed, signature io.Reader) (signer *Entity, err error) {
-	body, err := readArmored(signature, SignatureType)
-	if err != nil {
-		return
-	}
-
-	return CheckDetachedSignature(keyring, signed, body)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k/s2k.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k/s2k.go
deleted file mode 100644
index 5416421479..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k/s2k.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package s2k implements the various OpenPGP string-to-key transforms as
-// specified in RFC 4800 section 3.7.1.
-package s2k
-
-import (
-	"crypto"
-	"hash"
-	"io"
-	"strconv"
-
-	"golang.org/x/crypto/openpgp/errors"
-)
-
-// Config collects configuration parameters for s2k key-stretching
-// transformatioms. A nil *Config is valid and results in all default
-// values. Currently, Config is used only by the Serialize function in
-// this package.
-type Config struct {
-	// Hash is the default hash function to be used. If
-	// nil, SHA1 is used.
-	Hash crypto.Hash
-	// S2KCount is only used for symmetric encryption. It
-	// determines the strength of the passphrase stretching when
-	// the said passphrase is hashed to produce a key. S2KCount
-	// should be between 1024 and 65011712, inclusive. If Config
-	// is nil or S2KCount is 0, the value 65536 used. Not all
-	// values in the above range can be represented. S2KCount will
-	// be rounded up to the next representable value if it cannot
-	// be encoded exactly. When set, it is strongly encrouraged to
-	// use a value that is at least 65536. See RFC 4880 Section
-	// 3.7.1.3.
-	S2KCount int
-}
-
-func (c *Config) hash() crypto.Hash {
-	if c == nil || uint(c.Hash) == 0 {
-		// SHA1 is the historical default in this package.
-		return crypto.SHA1
-	}
-
-	return c.Hash
-}
-
-func (c *Config) encodedCount() uint8 {
-	if c == nil || c.S2KCount == 0 {
-		return 96 // The common case. Correspoding to 65536
-	}
-
-	i := c.S2KCount
-	switch {
-	// Behave like GPG. Should we make 65536 the lowest value used?
-	case i < 1024:
-		i = 1024
-	case i > 65011712:
-		i = 65011712
-	}
-
-	return encodeCount(i)
-}
-
-// encodeCount converts an iterative "count" in the range 1024 to
-// 65011712, inclusive, to an encoded count. The return value is the
-// octet that is actually stored in the GPG file. encodeCount panics
-// if i is not in the above range (encodedCount above takes care to
-// pass i in the correct range). See RFC 4880 Section 3.7.7.1.
-func encodeCount(i int) uint8 {
-	if i < 1024 || i > 65011712 {
-		panic("count arg i outside the required range")
-	}
-
-	for encoded := 0; encoded < 256; encoded++ {
-		count := decodeCount(uint8(encoded))
-		if count >= i {
-			return uint8(encoded)
-		}
-	}
-
-	return 255
-}
-
-// decodeCount returns the s2k mode 3 iterative "count" corresponding to
-// the encoded octet c.
-func decodeCount(c uint8) int {
-	return (16 + int(c&15)) << (uint32(c>>4) + 6)
-}
-
-// Simple writes to out the result of computing the Simple S2K function (RFC
-// 4880, section 3.7.1.1) using the given hash and input passphrase.
-func Simple(out []byte, h hash.Hash, in []byte) {
-	Salted(out, h, in, nil)
-}
-
-var zero [1]byte
-
-// Salted writes to out the result of computing the Salted S2K function (RFC
-// 4880, section 3.7.1.2) using the given hash, input passphrase and salt.
-func Salted(out []byte, h hash.Hash, in []byte, salt []byte) {
-	done := 0
-	var digest []byte
-
-	for i := 0; done < len(out); i++ {
-		h.Reset()
-		for j := 0; j < i; j++ {
-			h.Write(zero[:])
-		}
-		h.Write(salt)
-		h.Write(in)
-		digest = h.Sum(digest[:0])
-		n := copy(out[done:], digest)
-		done += n
-	}
-}
-
-// Iterated writes to out the result of computing the Iterated and Salted S2K
-// function (RFC 4880, section 3.7.1.3) using the given hash, input passphrase,
-// salt and iteration count.
-func Iterated(out []byte, h hash.Hash, in []byte, salt []byte, count int) {
-	combined := make([]byte, len(in)+len(salt))
-	copy(combined, salt)
-	copy(combined[len(salt):], in)
-
-	if count < len(combined) {
-		count = len(combined)
-	}
-
-	done := 0
-	var digest []byte
-	for i := 0; done < len(out); i++ {
-		h.Reset()
-		for j := 0; j < i; j++ {
-			h.Write(zero[:])
-		}
-		written := 0
-		for written < count {
-			if written+len(combined) > count {
-				todo := count - written
-				h.Write(combined[:todo])
-				written = count
-			} else {
-				h.Write(combined)
-				written += len(combined)
-			}
-		}
-		digest = h.Sum(digest[:0])
-		n := copy(out[done:], digest)
-		done += n
-	}
-}
-
-// Parse reads a binary specification for a string-to-key transformation from r
-// and returns a function which performs that transform.
-func Parse(r io.Reader) (f func(out, in []byte), err error) {
-	var buf [9]byte
-
-	_, err = io.ReadFull(r, buf[:2])
-	if err != nil {
-		return
-	}
-
-	hash, ok := HashIdToHash(buf[1])
-	if !ok {
-		return nil, errors.UnsupportedError("hash for S2K function: " + strconv.Itoa(int(buf[1])))
-	}
-	if !hash.Available() {
-		return nil, errors.UnsupportedError("hash not available: " + strconv.Itoa(int(hash)))
-	}
-	h := hash.New()
-
-	switch buf[0] {
-	case 0:
-		f := func(out, in []byte) {
-			Simple(out, h, in)
-		}
-		return f, nil
-	case 1:
-		_, err = io.ReadFull(r, buf[:8])
-		if err != nil {
-			return
-		}
-		f := func(out, in []byte) {
-			Salted(out, h, in, buf[:8])
-		}
-		return f, nil
-	case 3:
-		_, err = io.ReadFull(r, buf[:9])
-		if err != nil {
-			return
-		}
-		count := decodeCount(buf[8])
-		f := func(out, in []byte) {
-			Iterated(out, h, in, buf[:8], count)
-		}
-		return f, nil
-	}
-
-	return nil, errors.UnsupportedError("S2K function")
-}
-
-// Serialize salts and stretches the given passphrase and writes the
-// resulting key into key. It also serializes an S2K descriptor to
-// w. The key stretching can be configured with c, which may be
-// nil. In that case, sensible defaults will be used.
-func Serialize(w io.Writer, key []byte, rand io.Reader, passphrase []byte, c *Config) error {
-	var buf [11]byte
-	buf[0] = 3 /* iterated and salted */
-	buf[1], _ = HashToHashId(c.hash())
-	salt := buf[2:10]
-	if _, err := io.ReadFull(rand, salt); err != nil {
-		return err
-	}
-	encodedCount := c.encodedCount()
-	count := decodeCount(encodedCount)
-	buf[10] = encodedCount
-	if _, err := w.Write(buf[:]); err != nil {
-		return err
-	}
-
-	Iterated(key, c.hash().New(), passphrase, salt, count)
-	return nil
-}
-
-// hashToHashIdMapping contains pairs relating OpenPGP's hash identifier with
-// Go's crypto.Hash type. See RFC 4880, section 9.4.
-var hashToHashIdMapping = []struct {
-	id   byte
-	hash crypto.Hash
-	name string
-}{
-	{1, crypto.MD5, "MD5"},
-	{2, crypto.SHA1, "SHA1"},
-	{3, crypto.RIPEMD160, "RIPEMD160"},
-	{8, crypto.SHA256, "SHA256"},
-	{9, crypto.SHA384, "SHA384"},
-	{10, crypto.SHA512, "SHA512"},
-	{11, crypto.SHA224, "SHA224"},
-}
-
-// HashIdToHash returns a crypto.Hash which corresponds to the given OpenPGP
-// hash id.
-func HashIdToHash(id byte) (h crypto.Hash, ok bool) {
-	for _, m := range hashToHashIdMapping {
-		if m.id == id {
-			return m.hash, true
-		}
-	}
-	return 0, false
-}
-
-// HashIdToString returns the name of the hash function corresponding to the
-// given OpenPGP hash id, or panics if id is unknown.
-func HashIdToString(id byte) (name string, ok bool) {
-	for _, m := range hashToHashIdMapping {
-		if m.id == id {
-			return m.name, true
-		}
-	}
-
-	return "", false
-}
-
-// HashIdToHash returns an OpenPGP hash id which corresponds the given Hash.
-func HashToHashId(h crypto.Hash) (id byte, ok bool) {
-	for _, m := range hashToHashIdMapping {
-		if m.hash == h {
-			return m.id, true
-		}
-	}
-	return 0, false
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/write.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/write.go
deleted file mode 100644
index e471174684..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/write.go
+++ /dev/null
@@ -1,374 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import (
-	"crypto"
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
-	"golang.org/x/crypto/openpgp/s2k"
-	"hash"
-	"io"
-	"strconv"
-	"time"
-)
-
-// DetachSign signs message with the private key from signer (which must
-// already have been decrypted) and writes the signature to w.
-// If config is nil, sensible defaults will be used.
-func DetachSign(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error {
-	return detachSign(w, signer, message, packet.SigTypeBinary, config)
-}
-
-// ArmoredDetachSign signs message with the private key from signer (which
-// must already have been decrypted) and writes an armored signature to w.
-// If config is nil, sensible defaults will be used.
-func ArmoredDetachSign(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) (err error) {
-	return armoredDetachSign(w, signer, message, packet.SigTypeBinary, config)
-}
-
-// DetachSignText signs message (after canonicalising the line endings) with
-// the private key from signer (which must already have been decrypted) and
-// writes the signature to w.
-// If config is nil, sensible defaults will be used.
-func DetachSignText(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error {
-	return detachSign(w, signer, message, packet.SigTypeText, config)
-}
-
-// ArmoredDetachSignText signs message (after canonicalising the line endings)
-// with the private key from signer (which must already have been decrypted)
-// and writes an armored signature to w.
-// If config is nil, sensible defaults will be used.
-func ArmoredDetachSignText(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error {
-	return armoredDetachSign(w, signer, message, packet.SigTypeText, config)
-}
-
-func armoredDetachSign(w io.Writer, signer *Entity, message io.Reader, sigType packet.SignatureType, config *packet.Config) (err error) {
-	out, err := armor.Encode(w, SignatureType, nil)
-	if err != nil {
-		return
-	}
-	err = detachSign(out, signer, message, sigType, config)
-	if err != nil {
-		return
-	}
-	return out.Close()
-}
-
-func detachSign(w io.Writer, signer *Entity, message io.Reader, sigType packet.SignatureType, config *packet.Config) (err error) {
-	if signer.PrivateKey == nil {
-		return errors.InvalidArgumentError("signing key doesn't have a private key")
-	}
-	if signer.PrivateKey.Encrypted {
-		return errors.InvalidArgumentError("signing key is encrypted")
-	}
-
-	sig := new(packet.Signature)
-	sig.SigType = sigType
-	sig.PubKeyAlgo = signer.PrivateKey.PubKeyAlgo
-	sig.Hash = config.Hash()
-	sig.CreationTime = config.Now()
-	sig.IssuerKeyId = &signer.PrivateKey.KeyId
-
-	h, wrappedHash, err := hashForSignature(sig.Hash, sig.SigType)
-	if err != nil {
-		return
-	}
-	io.Copy(wrappedHash, message)
-
-	err = sig.Sign(h, signer.PrivateKey, config)
-	if err != nil {
-		return
-	}
-
-	return sig.Serialize(w)
-}
-
-// FileHints contains metadata about encrypted files. This metadata is, itself,
-// encrypted.
-type FileHints struct {
-	// IsBinary can be set to hint that the contents are binary data.
-	IsBinary bool
-	// FileName hints at the name of the file that should be written. It's
-	// truncated to 255 bytes if longer. It may be empty to suggest that the
-	// file should not be written to disk. It may be equal to "_CONSOLE" to
-	// suggest the data should not be written to disk.
-	FileName string
-	// ModTime contains the modification time of the file, or the zero time if not applicable.
-	ModTime time.Time
-}
-
-// SymmetricallyEncrypt acts like gpg -c: it encrypts a file with a passphrase.
-// The resulting WriteCloser must be closed after the contents of the file have
-// been written.
-// If config is nil, sensible defaults will be used.
-func SymmetricallyEncrypt(ciphertext io.Writer, passphrase []byte, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) {
-	if hints == nil {
-		hints = &FileHints{}
-	}
-
-	key, err := packet.SerializeSymmetricKeyEncrypted(ciphertext, passphrase, config)
-	if err != nil {
-		return
-	}
-	w, err := packet.SerializeSymmetricallyEncrypted(ciphertext, config.Cipher(), key, config)
-	if err != nil {
-		return
-	}
-
-	literaldata := w
-	if algo := config.Compression(); algo != packet.CompressionNone {
-		var compConfig *packet.CompressionConfig
-		if config != nil {
-			compConfig = config.CompressionConfig
-		}
-		literaldata, err = packet.SerializeCompressed(w, algo, compConfig)
-		if err != nil {
-			return
-		}
-	}
-
-	var epochSeconds uint32
-	if !hints.ModTime.IsZero() {
-		epochSeconds = uint32(hints.ModTime.Unix())
-	}
-	return packet.SerializeLiteral(literaldata, hints.IsBinary, hints.FileName, epochSeconds)
-}
-
-// intersectPreferences mutates and returns a prefix of a that contains only
-// the values in the intersection of a and b. The order of a is preserved.
-func intersectPreferences(a []uint8, b []uint8) (intersection []uint8) {
-	var j int
-	for _, v := range a {
-		for _, v2 := range b {
-			if v == v2 {
-				a[j] = v
-				j++
-				break
-			}
-		}
-	}
-
-	return a[:j]
-}
-
-func hashToHashId(h crypto.Hash) uint8 {
-	v, ok := s2k.HashToHashId(h)
-	if !ok {
-		panic("tried to convert unknown hash")
-	}
-	return v
-}
-
-// Encrypt encrypts a message to a number of recipients and, optionally, signs
-// it. hints contains optional information, that is also encrypted, that aids
-// the recipients in processing the message. The resulting WriteCloser must
-// be closed after the contents of the file have been written.
-// If config is nil, sensible defaults will be used.
-func Encrypt(ciphertext io.Writer, to []*Entity, signed *Entity, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) {
-	var signer *packet.PrivateKey
-	if signed != nil {
-		signKey, ok := signed.signingKey(config.Now())
-		if !ok {
-			return nil, errors.InvalidArgumentError("no valid signing keys")
-		}
-		signer = signKey.PrivateKey
-		if signer.Encrypted {
-			return nil, errors.InvalidArgumentError("signing key must be decrypted")
-		}
-	}
-
-	// These are the possible ciphers that we'll use for the message.
-	candidateCiphers := []uint8{
-		uint8(packet.CipherAES128),
-		uint8(packet.CipherAES256),
-		uint8(packet.CipherCAST5),
-	}
-	// These are the possible hash functions that we'll use for the signature.
-	candidateHashes := []uint8{
-		hashToHashId(crypto.SHA256),
-		hashToHashId(crypto.SHA512),
-		hashToHashId(crypto.SHA1),
-		hashToHashId(crypto.RIPEMD160),
-	}
-	// In the event that a recipient doesn't specify any supported ciphers
-	// or hash functions, these are the ones that we assume that every
-	// implementation supports.
-	defaultCiphers := candidateCiphers[len(candidateCiphers)-1:]
-	defaultHashes := candidateHashes[len(candidateHashes)-1:]
-
-	encryptKeys := make([]Key, len(to))
-	for i := range to {
-		var ok bool
-		encryptKeys[i], ok = to[i].encryptionKey(config.Now())
-		if !ok {
-			return nil, errors.InvalidArgumentError("cannot encrypt a message to key id " + strconv.FormatUint(to[i].PrimaryKey.KeyId, 16) + " because it has no encryption keys")
-		}
-
-		sig := to[i].primaryIdentity().SelfSignature
-
-		preferredSymmetric := sig.PreferredSymmetric
-		if len(preferredSymmetric) == 0 {
-			preferredSymmetric = defaultCiphers
-		}
-		preferredHashes := sig.PreferredHash
-		if len(preferredHashes) == 0 {
-			preferredHashes = defaultHashes
-		}
-		candidateCiphers = intersectPreferences(candidateCiphers, preferredSymmetric)
-		candidateHashes = intersectPreferences(candidateHashes, preferredHashes)
-	}
-
-	if len(candidateCiphers) == 0 || len(candidateHashes) == 0 {
-		return nil, errors.InvalidArgumentError("cannot encrypt because recipient set shares no common algorithms")
-	}
-
-	cipher := packet.CipherFunction(candidateCiphers[0])
-	// If the cipher specifed by config is a candidate, we'll use that.
-	configuredCipher := config.Cipher()
-	for _, c := range candidateCiphers {
-		cipherFunc := packet.CipherFunction(c)
-		if cipherFunc == configuredCipher {
-			cipher = cipherFunc
-			break
-		}
-	}
-
-	var hash crypto.Hash
-	for _, hashId := range candidateHashes {
-		if h, ok := s2k.HashIdToHash(hashId); ok && h.Available() {
-			hash = h
-			break
-		}
-	}
-
-	// If the hash specified by config is a candidate, we'll use that.
-	if configuredHash := config.Hash(); configuredHash.Available() {
-		for _, hashId := range candidateHashes {
-			if h, ok := s2k.HashIdToHash(hashId); ok && h == configuredHash {
-				hash = h
-				break
-			}
-		}
-	}
-
-	if hash == 0 {
-		hashId := candidateHashes[0]
-		name, ok := s2k.HashIdToString(hashId)
-		if !ok {
-			name = "#" + strconv.Itoa(int(hashId))
-		}
-		return nil, errors.InvalidArgumentError("cannot encrypt because no candidate hash functions are compiled in. (Wanted " + name + " in this case.)")
-	}
-
-	symKey := make([]byte, cipher.KeySize())
-	if _, err := io.ReadFull(config.Random(), symKey); err != nil {
-		return nil, err
-	}
-
-	for _, key := range encryptKeys {
-		if err := packet.SerializeEncryptedKey(ciphertext, key.PublicKey, cipher, symKey, config); err != nil {
-			return nil, err
-		}
-	}
-
-	encryptedData, err := packet.SerializeSymmetricallyEncrypted(ciphertext, cipher, symKey, config)
-	if err != nil {
-		return
-	}
-
-	if signer != nil {
-		ops := &packet.OnePassSignature{
-			SigType:    packet.SigTypeBinary,
-			Hash:       hash,
-			PubKeyAlgo: signer.PubKeyAlgo,
-			KeyId:      signer.KeyId,
-			IsLast:     true,
-		}
-		if err := ops.Serialize(encryptedData); err != nil {
-			return nil, err
-		}
-	}
-
-	if hints == nil {
-		hints = &FileHints{}
-	}
-
-	w := encryptedData
-	if signer != nil {
-		// If we need to write a signature packet after the literal
-		// data then we need to stop literalData from closing
-		// encryptedData.
-		w = noOpCloser{encryptedData}
-
-	}
-	var epochSeconds uint32
-	if !hints.ModTime.IsZero() {
-		epochSeconds = uint32(hints.ModTime.Unix())
-	}
-	literalData, err := packet.SerializeLiteral(w, hints.IsBinary, hints.FileName, epochSeconds)
-	if err != nil {
-		return nil, err
-	}
-
-	if signer != nil {
-		return signatureWriter{encryptedData, literalData, hash, hash.New(), signer, config}, nil
-	}
-	return literalData, nil
-}
-
-// signatureWriter hashes the contents of a message while passing it along to
-// literalData. When closed, it closes literalData, writes a signature packet
-// to encryptedData and then also closes encryptedData.
-type signatureWriter struct {
-	encryptedData io.WriteCloser
-	literalData   io.WriteCloser
-	hashType      crypto.Hash
-	h             hash.Hash
-	signer        *packet.PrivateKey
-	config        *packet.Config
-}
-
-func (s signatureWriter) Write(data []byte) (int, error) {
-	s.h.Write(data)
-	return s.literalData.Write(data)
-}
-
-func (s signatureWriter) Close() error {
-	sig := &packet.Signature{
-		SigType:      packet.SigTypeBinary,
-		PubKeyAlgo:   s.signer.PubKeyAlgo,
-		Hash:         s.hashType,
-		CreationTime: s.config.Now(),
-		IssuerKeyId:  &s.signer.KeyId,
-	}
-
-	if err := sig.Sign(s.h, s.signer, s.config); err != nil {
-		return err
-	}
-	if err := s.literalData.Close(); err != nil {
-		return err
-	}
-	if err := sig.Serialize(s.encryptedData); err != nil {
-		return err
-	}
-	return s.encryptedData.Close()
-}
-
-// noOpCloser is like an ioutil.NopCloser, but for an io.Writer.
-// TODO: we have two of these in OpenPGP packages alone. This probably needs
-// to be promoted somewhere more common.
-type noOpCloser struct {
-	w io.Writer
-}
-
-func (c noOpCloser) Write(data []byte) (n int, err error) {
-	return c.w.Write(data)
-}
-
-func (c noOpCloser) Close() error {
-	return nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go
deleted file mode 100644
index 741eeb13f0..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go
+++ /dev/null
@@ -1,892 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package terminal
-
-import (
-	"bytes"
-	"io"
-	"sync"
-	"unicode/utf8"
-)
-
-// EscapeCodes contains escape sequences that can be written to the terminal in
-// order to achieve different styles of text.
-type EscapeCodes struct {
-	// Foreground colors
-	Black, Red, Green, Yellow, Blue, Magenta, Cyan, White []byte
-
-	// Reset all attributes
-	Reset []byte
-}
-
-var vt100EscapeCodes = EscapeCodes{
-	Black:   []byte{keyEscape, '[', '3', '0', 'm'},
-	Red:     []byte{keyEscape, '[', '3', '1', 'm'},
-	Green:   []byte{keyEscape, '[', '3', '2', 'm'},
-	Yellow:  []byte{keyEscape, '[', '3', '3', 'm'},
-	Blue:    []byte{keyEscape, '[', '3', '4', 'm'},
-	Magenta: []byte{keyEscape, '[', '3', '5', 'm'},
-	Cyan:    []byte{keyEscape, '[', '3', '6', 'm'},
-	White:   []byte{keyEscape, '[', '3', '7', 'm'},
-
-	Reset: []byte{keyEscape, '[', '0', 'm'},
-}
-
-// Terminal contains the state for running a VT100 terminal that is capable of
-// reading lines of input.
-type Terminal struct {
-	// AutoCompleteCallback, if non-null, is called for each keypress with
-	// the full input line and the current position of the cursor (in
-	// bytes, as an index into |line|). If it returns ok=false, the key
-	// press is processed normally. Otherwise it returns a replacement line
-	// and the new cursor position.
-	AutoCompleteCallback func(line string, pos int, key rune) (newLine string, newPos int, ok bool)
-
-	// Escape contains a pointer to the escape codes for this terminal.
-	// It's always a valid pointer, although the escape codes themselves
-	// may be empty if the terminal doesn't support them.
-	Escape *EscapeCodes
-
-	// lock protects the terminal and the state in this object from
-	// concurrent processing of a key press and a Write() call.
-	lock sync.Mutex
-
-	c      io.ReadWriter
-	prompt []rune
-
-	// line is the current line being entered.
-	line []rune
-	// pos is the logical position of the cursor in line
-	pos int
-	// echo is true if local echo is enabled
-	echo bool
-	// pasteActive is true iff there is a bracketed paste operation in
-	// progress.
-	pasteActive bool
-
-	// cursorX contains the current X value of the cursor where the left
-	// edge is 0. cursorY contains the row number where the first row of
-	// the current line is 0.
-	cursorX, cursorY int
-	// maxLine is the greatest value of cursorY so far.
-	maxLine int
-
-	termWidth, termHeight int
-
-	// outBuf contains the terminal data to be sent.
-	outBuf []byte
-	// remainder contains the remainder of any partial key sequences after
-	// a read. It aliases into inBuf.
-	remainder []byte
-	inBuf     [256]byte
-
-	// history contains previously entered commands so that they can be
-	// accessed with the up and down keys.
-	history stRingBuffer
-	// historyIndex stores the currently accessed history entry, where zero
-	// means the immediately previous entry.
-	historyIndex int
-	// When navigating up and down the history it's possible to return to
-	// the incomplete, initial line. That value is stored in
-	// historyPending.
-	historyPending string
-}
-
-// NewTerminal runs a VT100 terminal on the given ReadWriter. If the ReadWriter is
-// a local terminal, that terminal must first have been put into raw mode.
-// prompt is a string that is written at the start of each input line (i.e.
-// "> ").
-func NewTerminal(c io.ReadWriter, prompt string) *Terminal {
-	return &Terminal{
-		Escape:       &vt100EscapeCodes,
-		c:            c,
-		prompt:       []rune(prompt),
-		termWidth:    80,
-		termHeight:   24,
-		echo:         true,
-		historyIndex: -1,
-	}
-}
-
-const (
-	keyCtrlD     = 4
-	keyCtrlU     = 21
-	keyEnter     = '\r'
-	keyEscape    = 27
-	keyBackspace = 127
-	keyUnknown   = 0xd800 /* UTF-16 surrogate area */ + iota
-	keyUp
-	keyDown
-	keyLeft
-	keyRight
-	keyAltLeft
-	keyAltRight
-	keyHome
-	keyEnd
-	keyDeleteWord
-	keyDeleteLine
-	keyClearScreen
-	keyPasteStart
-	keyPasteEnd
-)
-
-var pasteStart = []byte{keyEscape, '[', '2', '0', '0', '~'}
-var pasteEnd = []byte{keyEscape, '[', '2', '0', '1', '~'}
-
-// bytesToKey tries to parse a key sequence from b. If successful, it returns
-// the key and the remainder of the input. Otherwise it returns utf8.RuneError.
-func bytesToKey(b []byte, pasteActive bool) (rune, []byte) {
-	if len(b) == 0 {
-		return utf8.RuneError, nil
-	}
-
-	if !pasteActive {
-		switch b[0] {
-		case 1: // ^A
-			return keyHome, b[1:]
-		case 5: // ^E
-			return keyEnd, b[1:]
-		case 8: // ^H
-			return keyBackspace, b[1:]
-		case 11: // ^K
-			return keyDeleteLine, b[1:]
-		case 12: // ^L
-			return keyClearScreen, b[1:]
-		case 23: // ^W
-			return keyDeleteWord, b[1:]
-		}
-	}
-
-	if b[0] != keyEscape {
-		if !utf8.FullRune(b) {
-			return utf8.RuneError, b
-		}
-		r, l := utf8.DecodeRune(b)
-		return r, b[l:]
-	}
-
-	if !pasteActive && len(b) >= 3 && b[0] == keyEscape && b[1] == '[' {
-		switch b[2] {
-		case 'A':
-			return keyUp, b[3:]
-		case 'B':
-			return keyDown, b[3:]
-		case 'C':
-			return keyRight, b[3:]
-		case 'D':
-			return keyLeft, b[3:]
-		case 'H':
-			return keyHome, b[3:]
-		case 'F':
-			return keyEnd, b[3:]
-		}
-	}
-
-	if !pasteActive && len(b) >= 6 && b[0] == keyEscape && b[1] == '[' && b[2] == '1' && b[3] == ';' && b[4] == '3' {
-		switch b[5] {
-		case 'C':
-			return keyAltRight, b[6:]
-		case 'D':
-			return keyAltLeft, b[6:]
-		}
-	}
-
-	if !pasteActive && len(b) >= 6 && bytes.Equal(b[:6], pasteStart) {
-		return keyPasteStart, b[6:]
-	}
-
-	if pasteActive && len(b) >= 6 && bytes.Equal(b[:6], pasteEnd) {
-		return keyPasteEnd, b[6:]
-	}
-
-	// If we get here then we have a key that we don't recognise, or a
-	// partial sequence. It's not clear how one should find the end of a
-	// sequence without knowing them all, but it seems that [a-zA-Z~] only
-	// appears at the end of a sequence.
-	for i, c := range b[0:] {
-		if c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c == '~' {
-			return keyUnknown, b[i+1:]
-		}
-	}
-
-	return utf8.RuneError, b
-}
-
-// queue appends data to the end of t.outBuf
-func (t *Terminal) queue(data []rune) {
-	t.outBuf = append(t.outBuf, []byte(string(data))...)
-}
-
-var eraseUnderCursor = []rune{' ', keyEscape, '[', 'D'}
-var space = []rune{' '}
-
-func isPrintable(key rune) bool {
-	isInSurrogateArea := key >= 0xd800 && key <= 0xdbff
-	return key >= 32 && !isInSurrogateArea
-}
-
-// moveCursorToPos appends data to t.outBuf which will move the cursor to the
-// given, logical position in the text.
-func (t *Terminal) moveCursorToPos(pos int) {
-	if !t.echo {
-		return
-	}
-
-	x := visualLength(t.prompt) + pos
-	y := x / t.termWidth
-	x = x % t.termWidth
-
-	up := 0
-	if y < t.cursorY {
-		up = t.cursorY - y
-	}
-
-	down := 0
-	if y > t.cursorY {
-		down = y - t.cursorY
-	}
-
-	left := 0
-	if x < t.cursorX {
-		left = t.cursorX - x
-	}
-
-	right := 0
-	if x > t.cursorX {
-		right = x - t.cursorX
-	}
-
-	t.cursorX = x
-	t.cursorY = y
-	t.move(up, down, left, right)
-}
-
-func (t *Terminal) move(up, down, left, right int) {
-	movement := make([]rune, 3*(up+down+left+right))
-	m := movement
-	for i := 0; i < up; i++ {
-		m[0] = keyEscape
-		m[1] = '['
-		m[2] = 'A'
-		m = m[3:]
-	}
-	for i := 0; i < down; i++ {
-		m[0] = keyEscape
-		m[1] = '['
-		m[2] = 'B'
-		m = m[3:]
-	}
-	for i := 0; i < left; i++ {
-		m[0] = keyEscape
-		m[1] = '['
-		m[2] = 'D'
-		m = m[3:]
-	}
-	for i := 0; i < right; i++ {
-		m[0] = keyEscape
-		m[1] = '['
-		m[2] = 'C'
-		m = m[3:]
-	}
-
-	t.queue(movement)
-}
-
-func (t *Terminal) clearLineToRight() {
-	op := []rune{keyEscape, '[', 'K'}
-	t.queue(op)
-}
-
-const maxLineLength = 4096
-
-func (t *Terminal) setLine(newLine []rune, newPos int) {
-	if t.echo {
-		t.moveCursorToPos(0)
-		t.writeLine(newLine)
-		for i := len(newLine); i < len(t.line); i++ {
-			t.writeLine(space)
-		}
-		t.moveCursorToPos(newPos)
-	}
-	t.line = newLine
-	t.pos = newPos
-}
-
-func (t *Terminal) advanceCursor(places int) {
-	t.cursorX += places
-	t.cursorY += t.cursorX / t.termWidth
-	if t.cursorY > t.maxLine {
-		t.maxLine = t.cursorY
-	}
-	t.cursorX = t.cursorX % t.termWidth
-
-	if places > 0 && t.cursorX == 0 {
-		// Normally terminals will advance the current position
-		// when writing a character. But that doesn't happen
-		// for the last character in a line. However, when
-		// writing a character (except a new line) that causes
-		// a line wrap, the position will be advanced two
-		// places.
-		//
-		// So, if we are stopping at the end of a line, we
-		// need to write a newline so that our cursor can be
-		// advanced to the next line.
-		t.outBuf = append(t.outBuf, '\n')
-	}
-}
-
-func (t *Terminal) eraseNPreviousChars(n int) {
-	if n == 0 {
-		return
-	}
-
-	if t.pos < n {
-		n = t.pos
-	}
-	t.pos -= n
-	t.moveCursorToPos(t.pos)
-
-	copy(t.line[t.pos:], t.line[n+t.pos:])
-	t.line = t.line[:len(t.line)-n]
-	if t.echo {
-		t.writeLine(t.line[t.pos:])
-		for i := 0; i < n; i++ {
-			t.queue(space)
-		}
-		t.advanceCursor(n)
-		t.moveCursorToPos(t.pos)
-	}
-}
-
-// countToLeftWord returns then number of characters from the cursor to the
-// start of the previous word.
-func (t *Terminal) countToLeftWord() int {
-	if t.pos == 0 {
-		return 0
-	}
-
-	pos := t.pos - 1
-	for pos > 0 {
-		if t.line[pos] != ' ' {
-			break
-		}
-		pos--
-	}
-	for pos > 0 {
-		if t.line[pos] == ' ' {
-			pos++
-			break
-		}
-		pos--
-	}
-
-	return t.pos - pos
-}
-
-// countToRightWord returns then number of characters from the cursor to the
-// start of the next word.
-func (t *Terminal) countToRightWord() int {
-	pos := t.pos
-	for pos < len(t.line) {
-		if t.line[pos] == ' ' {
-			break
-		}
-		pos++
-	}
-	for pos < len(t.line) {
-		if t.line[pos] != ' ' {
-			break
-		}
-		pos++
-	}
-	return pos - t.pos
-}
-
-// visualLength returns the number of visible glyphs in s.
-func visualLength(runes []rune) int {
-	inEscapeSeq := false
-	length := 0
-
-	for _, r := range runes {
-		switch {
-		case inEscapeSeq:
-			if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') {
-				inEscapeSeq = false
-			}
-		case r == '\x1b':
-			inEscapeSeq = true
-		default:
-			length++
-		}
-	}
-
-	return length
-}
-
-// handleKey processes the given key and, optionally, returns a line of text
-// that the user has entered.
-func (t *Terminal) handleKey(key rune) (line string, ok bool) {
-	if t.pasteActive && key != keyEnter {
-		t.addKeyToLine(key)
-		return
-	}
-
-	switch key {
-	case keyBackspace:
-		if t.pos == 0 {
-			return
-		}
-		t.eraseNPreviousChars(1)
-	case keyAltLeft:
-		// move left by a word.
-		t.pos -= t.countToLeftWord()
-		t.moveCursorToPos(t.pos)
-	case keyAltRight:
-		// move right by a word.
-		t.pos += t.countToRightWord()
-		t.moveCursorToPos(t.pos)
-	case keyLeft:
-		if t.pos == 0 {
-			return
-		}
-		t.pos--
-		t.moveCursorToPos(t.pos)
-	case keyRight:
-		if t.pos == len(t.line) {
-			return
-		}
-		t.pos++
-		t.moveCursorToPos(t.pos)
-	case keyHome:
-		if t.pos == 0 {
-			return
-		}
-		t.pos = 0
-		t.moveCursorToPos(t.pos)
-	case keyEnd:
-		if t.pos == len(t.line) {
-			return
-		}
-		t.pos = len(t.line)
-		t.moveCursorToPos(t.pos)
-	case keyUp:
-		entry, ok := t.history.NthPreviousEntry(t.historyIndex + 1)
-		if !ok {
-			return "", false
-		}
-		if t.historyIndex == -1 {
-			t.historyPending = string(t.line)
-		}
-		t.historyIndex++
-		runes := []rune(entry)
-		t.setLine(runes, len(runes))
-	case keyDown:
-		switch t.historyIndex {
-		case -1:
-			return
-		case 0:
-			runes := []rune(t.historyPending)
-			t.setLine(runes, len(runes))
-			t.historyIndex--
-		default:
-			entry, ok := t.history.NthPreviousEntry(t.historyIndex - 1)
-			if ok {
-				t.historyIndex--
-				runes := []rune(entry)
-				t.setLine(runes, len(runes))
-			}
-		}
-	case keyEnter:
-		t.moveCursorToPos(len(t.line))
-		t.queue([]rune("\r\n"))
-		line = string(t.line)
-		ok = true
-		t.line = t.line[:0]
-		t.pos = 0
-		t.cursorX = 0
-		t.cursorY = 0
-		t.maxLine = 0
-	case keyDeleteWord:
-		// Delete zero or more spaces and then one or more characters.
-		t.eraseNPreviousChars(t.countToLeftWord())
-	case keyDeleteLine:
-		// Delete everything from the current cursor position to the
-		// end of line.
-		for i := t.pos; i < len(t.line); i++ {
-			t.queue(space)
-			t.advanceCursor(1)
-		}
-		t.line = t.line[:t.pos]
-		t.moveCursorToPos(t.pos)
-	case keyCtrlD:
-		// Erase the character under the current position.
-		// The EOF case when the line is empty is handled in
-		// readLine().
-		if t.pos < len(t.line) {
-			t.pos++
-			t.eraseNPreviousChars(1)
-		}
-	case keyCtrlU:
-		t.eraseNPreviousChars(t.pos)
-	case keyClearScreen:
-		// Erases the screen and moves the cursor to the home position.
-		t.queue([]rune("\x1b[2J\x1b[H"))
-		t.queue(t.prompt)
-		t.cursorX, t.cursorY = 0, 0
-		t.advanceCursor(visualLength(t.prompt))
-		t.setLine(t.line, t.pos)
-	default:
-		if t.AutoCompleteCallback != nil {
-			prefix := string(t.line[:t.pos])
-			suffix := string(t.line[t.pos:])
-
-			t.lock.Unlock()
-			newLine, newPos, completeOk := t.AutoCompleteCallback(prefix+suffix, len(prefix), key)
-			t.lock.Lock()
-
-			if completeOk {
-				t.setLine([]rune(newLine), utf8.RuneCount([]byte(newLine)[:newPos]))
-				return
-			}
-		}
-		if !isPrintable(key) {
-			return
-		}
-		if len(t.line) == maxLineLength {
-			return
-		}
-		t.addKeyToLine(key)
-	}
-	return
-}
-
-// addKeyToLine inserts the given key at the current position in the current
-// line.
-func (t *Terminal) addKeyToLine(key rune) {
-	if len(t.line) == cap(t.line) {
-		newLine := make([]rune, len(t.line), 2*(1+len(t.line)))
-		copy(newLine, t.line)
-		t.line = newLine
-	}
-	t.line = t.line[:len(t.line)+1]
-	copy(t.line[t.pos+1:], t.line[t.pos:])
-	t.line[t.pos] = key
-	if t.echo {
-		t.writeLine(t.line[t.pos:])
-	}
-	t.pos++
-	t.moveCursorToPos(t.pos)
-}
-
-func (t *Terminal) writeLine(line []rune) {
-	for len(line) != 0 {
-		remainingOnLine := t.termWidth - t.cursorX
-		todo := len(line)
-		if todo > remainingOnLine {
-			todo = remainingOnLine
-		}
-		t.queue(line[:todo])
-		t.advanceCursor(visualLength(line[:todo]))
-		line = line[todo:]
-	}
-}
-
-func (t *Terminal) Write(buf []byte) (n int, err error) {
-	t.lock.Lock()
-	defer t.lock.Unlock()
-
-	if t.cursorX == 0 && t.cursorY == 0 {
-		// This is the easy case: there's nothing on the screen that we
-		// have to move out of the way.
-		return t.c.Write(buf)
-	}
-
-	// We have a prompt and possibly user input on the screen. We
-	// have to clear it first.
-	t.move(0 /* up */, 0 /* down */, t.cursorX /* left */, 0 /* right */)
-	t.cursorX = 0
-	t.clearLineToRight()
-
-	for t.cursorY > 0 {
-		t.move(1 /* up */, 0, 0, 0)
-		t.cursorY--
-		t.clearLineToRight()
-	}
-
-	if _, err = t.c.Write(t.outBuf); err != nil {
-		return
-	}
-	t.outBuf = t.outBuf[:0]
-
-	if n, err = t.c.Write(buf); err != nil {
-		return
-	}
-
-	t.writeLine(t.prompt)
-	if t.echo {
-		t.writeLine(t.line)
-	}
-
-	t.moveCursorToPos(t.pos)
-
-	if _, err = t.c.Write(t.outBuf); err != nil {
-		return
-	}
-	t.outBuf = t.outBuf[:0]
-	return
-}
-
-// ReadPassword temporarily changes the prompt and reads a password, without
-// echo, from the terminal.
-func (t *Terminal) ReadPassword(prompt string) (line string, err error) {
-	t.lock.Lock()
-	defer t.lock.Unlock()
-
-	oldPrompt := t.prompt
-	t.prompt = []rune(prompt)
-	t.echo = false
-
-	line, err = t.readLine()
-
-	t.prompt = oldPrompt
-	t.echo = true
-
-	return
-}
-
-// ReadLine returns a line of input from the terminal.
-func (t *Terminal) ReadLine() (line string, err error) {
-	t.lock.Lock()
-	defer t.lock.Unlock()
-
-	return t.readLine()
-}
-
-func (t *Terminal) readLine() (line string, err error) {
-	// t.lock must be held at this point
-
-	if t.cursorX == 0 && t.cursorY == 0 {
-		t.writeLine(t.prompt)
-		t.c.Write(t.outBuf)
-		t.outBuf = t.outBuf[:0]
-	}
-
-	lineIsPasted := t.pasteActive
-
-	for {
-		rest := t.remainder
-		lineOk := false
-		for !lineOk {
-			var key rune
-			key, rest = bytesToKey(rest, t.pasteActive)
-			if key == utf8.RuneError {
-				break
-			}
-			if !t.pasteActive {
-				if key == keyCtrlD {
-					if len(t.line) == 0 {
-						return "", io.EOF
-					}
-				}
-				if key == keyPasteStart {
-					t.pasteActive = true
-					if len(t.line) == 0 {
-						lineIsPasted = true
-					}
-					continue
-				}
-			} else if key == keyPasteEnd {
-				t.pasteActive = false
-				continue
-			}
-			if !t.pasteActive {
-				lineIsPasted = false
-			}
-			line, lineOk = t.handleKey(key)
-		}
-		if len(rest) > 0 {
-			n := copy(t.inBuf[:], rest)
-			t.remainder = t.inBuf[:n]
-		} else {
-			t.remainder = nil
-		}
-		t.c.Write(t.outBuf)
-		t.outBuf = t.outBuf[:0]
-		if lineOk {
-			if t.echo {
-				t.historyIndex = -1
-				t.history.Add(line)
-			}
-			if lineIsPasted {
-				err = ErrPasteIndicator
-			}
-			return
-		}
-
-		// t.remainder is a slice at the beginning of t.inBuf
-		// containing a partial key sequence
-		readBuf := t.inBuf[len(t.remainder):]
-		var n int
-
-		t.lock.Unlock()
-		n, err = t.c.Read(readBuf)
-		t.lock.Lock()
-
-		if err != nil {
-			return
-		}
-
-		t.remainder = t.inBuf[:n+len(t.remainder)]
-	}
-
-	panic("unreachable") // for Go 1.0.
-}
-
-// SetPrompt sets the prompt to be used when reading subsequent lines.
-func (t *Terminal) SetPrompt(prompt string) {
-	t.lock.Lock()
-	defer t.lock.Unlock()
-
-	t.prompt = []rune(prompt)
-}
-
-func (t *Terminal) clearAndRepaintLinePlusNPrevious(numPrevLines int) {
-	// Move cursor to column zero at the start of the line.
-	t.move(t.cursorY, 0, t.cursorX, 0)
-	t.cursorX, t.cursorY = 0, 0
-	t.clearLineToRight()
-	for t.cursorY < numPrevLines {
-		// Move down a line
-		t.move(0, 1, 0, 0)
-		t.cursorY++
-		t.clearLineToRight()
-	}
-	// Move back to beginning.
-	t.move(t.cursorY, 0, 0, 0)
-	t.cursorX, t.cursorY = 0, 0
-
-	t.queue(t.prompt)
-	t.advanceCursor(visualLength(t.prompt))
-	t.writeLine(t.line)
-	t.moveCursorToPos(t.pos)
-}
-
-func (t *Terminal) SetSize(width, height int) error {
-	t.lock.Lock()
-	defer t.lock.Unlock()
-
-	if width == 0 {
-		width = 1
-	}
-
-	oldWidth := t.termWidth
-	t.termWidth, t.termHeight = width, height
-
-	switch {
-	case width == oldWidth:
-		// If the width didn't change then nothing else needs to be
-		// done.
-		return nil
-	case len(t.line) == 0 && t.cursorX == 0 && t.cursorY == 0:
-		// If there is nothing on current line and no prompt printed,
-		// just do nothing
-		return nil
-	case width < oldWidth:
-		// Some terminals (e.g. xterm) will truncate lines that were
-		// too long when shinking. Others, (e.g. gnome-terminal) will
-		// attempt to wrap them. For the former, repainting t.maxLine
-		// works great, but that behaviour goes badly wrong in the case
-		// of the latter because they have doubled every full line.
-
-		// We assume that we are working on a terminal that wraps lines
-		// and adjust the cursor position based on every previous line
-		// wrapping and turning into two. This causes the prompt on
-		// xterms to move upwards, which isn't great, but it avoids a
-		// huge mess with gnome-terminal.
-		if t.cursorX >= t.termWidth {
-			t.cursorX = t.termWidth - 1
-		}
-		t.cursorY *= 2
-		t.clearAndRepaintLinePlusNPrevious(t.maxLine * 2)
-	case width > oldWidth:
-		// If the terminal expands then our position calculations will
-		// be wrong in the future because we think the cursor is
-		// |t.pos| chars into the string, but there will be a gap at
-		// the end of any wrapped line.
-		//
-		// But the position will actually be correct until we move, so
-		// we can move back to the beginning and repaint everything.
-		t.clearAndRepaintLinePlusNPrevious(t.maxLine)
-	}
-
-	_, err := t.c.Write(t.outBuf)
-	t.outBuf = t.outBuf[:0]
-	return err
-}
-
-type pasteIndicatorError struct{}
-
-func (pasteIndicatorError) Error() string {
-	return "terminal: ErrPasteIndicator not correctly handled"
-}
-
-// ErrPasteIndicator may be returned from ReadLine as the error, in addition
-// to valid line data. It indicates that bracketed paste mode is enabled and
-// that the returned line consists only of pasted data. Programs may wish to
-// interpret pasted data more literally than typed data.
-var ErrPasteIndicator = pasteIndicatorError{}
-
-// SetBracketedPasteMode requests that the terminal bracket paste operations
-// with markers. Not all terminals support this but, if it is supported, then
-// enabling this mode will stop any autocomplete callback from running due to
-// pastes. Additionally, any lines that are completely pasted will be returned
-// from ReadLine with the error set to ErrPasteIndicator.
-func (t *Terminal) SetBracketedPasteMode(on bool) {
-	if on {
-		io.WriteString(t.c, "\x1b[?2004h")
-	} else {
-		io.WriteString(t.c, "\x1b[?2004l")
-	}
-}
-
-// stRingBuffer is a ring buffer of strings.
-type stRingBuffer struct {
-	// entries contains max elements.
-	entries []string
-	max     int
-	// head contains the index of the element most recently added to the ring.
-	head int
-	// size contains the number of elements in the ring.
-	size int
-}
-
-func (s *stRingBuffer) Add(a string) {
-	if s.entries == nil {
-		const defaultNumEntries = 100
-		s.entries = make([]string, defaultNumEntries)
-		s.max = defaultNumEntries
-	}
-
-	s.head = (s.head + 1) % s.max
-	s.entries[s.head] = a
-	if s.size < s.max {
-		s.size++
-	}
-}
-
-// NthPreviousEntry returns the value passed to the nth previous call to Add.
-// If n is zero then the immediately prior value is returned, if one, then the
-// next most recent, and so on. If such an element doesn't exist then ok is
-// false.
-func (s *stRingBuffer) NthPreviousEntry(n int) (value string, ok bool) {
-	if n >= s.size {
-		return "", false
-	}
-	index := s.head - n
-	if index < 0 {
-		index += s.max
-	}
-	return s.entries[index], true
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go
deleted file mode 100644
index 0763c9a978..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux,!appengine netbsd openbsd
-
-// Package terminal provides support functions for dealing with terminals, as
-// commonly found on UNIX systems.
-//
-// Putting a terminal into raw mode is the most common requirement:
-//
-// 	oldState, err := terminal.MakeRaw(0)
-// 	if err != nil {
-// 	        panic(err)
-// 	}
-// 	defer terminal.Restore(0, oldState)
-package terminal
-
-import (
-	"io"
-	"syscall"
-	"unsafe"
-)
-
-// State contains the state of a terminal.
-type State struct {
-	termios syscall.Termios
-}
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(fd int) bool {
-	var termios syscall.Termios
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-	return err == 0
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd int) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-	newState.Iflag &^= syscall.ISTRIP | syscall.INLCR | syscall.ICRNL | syscall.IGNCR | syscall.IXON | syscall.IXOFF
-	newState.Lflag &^= syscall.ECHO | syscall.ICANON | syscall.ISIG
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
-
-// GetState returns the current state of a terminal which may be useful to
-// restore the terminal after a signal.
-func GetState(fd int) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
-
-// Restore restores the terminal connected to the given file descriptor to a
-// previous state.
-func Restore(fd int, state *State) error {
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0)
-	return err
-}
-
-// GetSize returns the dimensions of the given terminal.
-func GetSize(fd int) (width, height int, err error) {
-	var dimensions [4]uint16
-
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(&dimensions)), 0, 0, 0); err != 0 {
-		return -1, -1, err
-	}
-	return int(dimensions[1]), int(dimensions[0]), nil
-}
-
-// ReadPassword reads a line of input from a terminal without local echo.  This
-// is commonly used for inputting passwords and other sensitive data. The slice
-// returned does not include the \n.
-func ReadPassword(fd int) ([]byte, error) {
-	var oldState syscall.Termios
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState
-	newState.Lflag &^= syscall.ECHO
-	newState.Lflag |= syscall.ICANON | syscall.ISIG
-	newState.Iflag |= syscall.ICRNL
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
-		return nil, err
-	}
-
-	defer func() {
-		syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0)
-	}()
-
-	var buf [16]byte
-	var ret []byte
-	for {
-		n, err := syscall.Read(fd, buf[:])
-		if err != nil {
-			return nil, err
-		}
-		if n == 0 {
-			if len(ret) == 0 {
-				return nil, io.EOF
-			}
-			break
-		}
-		if buf[n-1] == '\n' {
-			n--
-		}
-		ret = append(ret, buf[:n]...)
-		if n < len(buf) {
-			break
-		}
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go
deleted file mode 100644
index 9c1ffd145a..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package terminal
-
-import "syscall"
-
-const ioctlReadTermios = syscall.TIOCGETA
-const ioctlWriteTermios = syscall.TIOCSETA
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go
deleted file mode 100644
index 5883b22d78..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package terminal
-
-// These constants are declared here, rather than importing
-// them from the syscall package as some syscall packages, even
-// on linux, for example gccgo, do not declare them.
-const ioctlReadTermios = 0x5401  // syscall.TCGETS
-const ioctlWriteTermios = 0x5402 // syscall.TCSETS
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go
deleted file mode 100644
index 2dd6c3d978..0000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// Package terminal provides support functions for dealing with terminals, as
-// commonly found on UNIX systems.
-//
-// Putting a terminal into raw mode is the most common requirement:
-//
-// 	oldState, err := terminal.MakeRaw(0)
-// 	if err != nil {
-// 	        panic(err)
-// 	}
-// 	defer terminal.Restore(0, oldState)
-package terminal
-
-import (
-	"io"
-	"syscall"
-	"unsafe"
-)
-
-const (
-	enableLineInput       = 2
-	enableEchoInput       = 4
-	enableProcessedInput  = 1
-	enableWindowInput     = 8
-	enableMouseInput      = 16
-	enableInsertMode      = 32
-	enableQuickEditMode   = 64
-	enableExtendedFlags   = 128
-	enableAutoPosition    = 256
-	enableProcessedOutput = 1
-	enableWrapAtEolOutput = 2
-)
-
-var kernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-var (
-	procGetConsoleMode             = kernel32.NewProc("GetConsoleMode")
-	procSetConsoleMode             = kernel32.NewProc("SetConsoleMode")
-	procGetConsoleScreenBufferInfo = kernel32.NewProc("GetConsoleScreenBufferInfo")
-)
-
-type (
-	short int16
-	word  uint16
-
-	coord struct {
-		x short
-		y short
-	}
-	smallRect struct {
-		left   short
-		top    short
-		right  short
-		bottom short
-	}
-	consoleScreenBufferInfo struct {
-		size              coord
-		cursorPosition    coord
-		attributes        word
-		window            smallRect
-		maximumWindowSize coord
-	}
-)
-
-type State struct {
-	mode uint32
-}
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(fd int) bool {
-	var st uint32
-	r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
-	return r != 0 && e == 0
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd int) (*State, error) {
-	var st uint32
-	_, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
-	if e != 0 {
-		return nil, error(e)
-	}
-	st &^= (enableEchoInput | enableProcessedInput | enableLineInput | enableProcessedOutput)
-	_, _, e = syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(st), 0)
-	if e != 0 {
-		return nil, error(e)
-	}
-	return &State{st}, nil
-}
-
-// GetState returns the current state of a terminal which may be useful to
-// restore the terminal after a signal.
-func GetState(fd int) (*State, error) {
-	var st uint32
-	_, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
-	if e != 0 {
-		return nil, error(e)
-	}
-	return &State{st}, nil
-}
-
-// Restore restores the terminal connected to the given file descriptor to a
-// previous state.
-func Restore(fd int, state *State) error {
-	_, _, err := syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(state.mode), 0)
-	return err
-}
-
-// GetSize returns the dimensions of the given terminal.
-func GetSize(fd int) (width, height int, err error) {
-	var info consoleScreenBufferInfo
-	_, _, e := syscall.Syscall(procGetConsoleScreenBufferInfo.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&info)), 0)
-	if e != 0 {
-		return 0, 0, error(e)
-	}
-	return int(info.size.x), int(info.size.y), nil
-}
-
-// ReadPassword reads a line of input from a terminal without local echo.  This
-// is commonly used for inputting passwords and other sensitive data. The slice
-// returned does not include the \n.
-func ReadPassword(fd int) ([]byte, error) {
-	var st uint32
-	_, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
-	if e != 0 {
-		return nil, error(e)
-	}
-	old := st
-
-	st &^= (enableEchoInput)
-	st |= (enableProcessedInput | enableLineInput | enableProcessedOutput)
-	_, _, e = syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(st), 0)
-	if e != 0 {
-		return nil, error(e)
-	}
-
-	defer func() {
-		syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(old), 0)
-	}()
-
-	var buf [16]byte
-	var ret []byte
-	for {
-		n, err := syscall.Read(syscall.Handle(fd), buf[:])
-		if err != nil {
-			return nil, err
-		}
-		if n == 0 {
-			if len(ret) == 0 {
-				return nil, io.EOF
-			}
-			break
-		}
-		if buf[n-1] == '\n' {
-			n--
-		}
-		if n > 0 && buf[n-1] == '\r' {
-			n--
-		}
-		ret = append(ret, buf[:n]...)
-		if n < len(buf) {
-			break
-		}
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/LICENSE b/Godeps/_workspace/src/golang.org/x/net/LICENSE
deleted file mode 100644
index 6a66aea5ea..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/golang.org/x/net/PATENTS b/Godeps/_workspace/src/golang.org/x/net/PATENTS
deleted file mode 100644
index 733099041f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/context.go b/Godeps/_workspace/src/golang.org/x/net/context/context.go
deleted file mode 100644
index ef2f3e86fe..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/context/context.go
+++ /dev/null
@@ -1,447 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package context defines the Context type, which carries deadlines,
-// cancelation signals, and other request-scoped values across API boundaries
-// and between processes.
-//
-// Incoming requests to a server should create a Context, and outgoing calls to
-// servers should accept a Context.  The chain of function calls between must
-// propagate the Context, optionally replacing it with a modified copy created
-// using WithDeadline, WithTimeout, WithCancel, or WithValue.
-//
-// Programs that use Contexts should follow these rules to keep interfaces
-// consistent across packages and enable static analysis tools to check context
-// propagation:
-//
-// Do not store Contexts inside a struct type; instead, pass a Context
-// explicitly to each function that needs it.  The Context should be the first
-// parameter, typically named ctx:
-//
-// 	func DoSomething(ctx context.Context, arg Arg) error {
-// 		// ... use ctx ...
-// 	}
-//
-// Do not pass a nil Context, even if a function permits it.  Pass context.TODO
-// if you are unsure about which Context to use.
-//
-// Use context Values only for request-scoped data that transits processes and
-// APIs, not for passing optional parameters to functions.
-//
-// The same Context may be passed to functions running in different goroutines;
-// Contexts are safe for simultaneous use by multiple goroutines.
-//
-// See http://blog.golang.org/context for example code for a server that uses
-// Contexts.
-package context
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-)
-
-// A Context carries a deadline, a cancelation signal, and other values across
-// API boundaries.
-//
-// Context's methods may be called by multiple goroutines simultaneously.
-type Context interface {
-	// Deadline returns the time when work done on behalf of this context
-	// should be canceled.  Deadline returns ok==false when no deadline is
-	// set.  Successive calls to Deadline return the same results.
-	Deadline() (deadline time.Time, ok bool)
-
-	// Done returns a channel that's closed when work done on behalf of this
-	// context should be canceled.  Done may return nil if this context can
-	// never be canceled.  Successive calls to Done return the same value.
-	//
-	// WithCancel arranges for Done to be closed when cancel is called;
-	// WithDeadline arranges for Done to be closed when the deadline
-	// expires; WithTimeout arranges for Done to be closed when the timeout
-	// elapses.
-	//
-	// Done is provided for use in select statements:
-	//
-	//  // Stream generates values with DoSomething and sends them to out
-	//  // until DoSomething returns an error or ctx.Done is closed.
-	//  func Stream(ctx context.Context, out <-chan Value) error {
-	//  	for {
-	//  		v, err := DoSomething(ctx)
-	//  		if err != nil {
-	//  			return err
-	//  		}
-	//  		select {
-	//  		case <-ctx.Done():
-	//  			return ctx.Err()
-	//  		case out <- v:
-	//  		}
-	//  	}
-	//  }
-	//
-	// See http://blog.golang.org/pipelines for more examples of how to use
-	// a Done channel for cancelation.
-	Done() <-chan struct{}
-
-	// Err returns a non-nil error value after Done is closed.  Err returns
-	// Canceled if the context was canceled or DeadlineExceeded if the
-	// context's deadline passed.  No other values for Err are defined.
-	// After Done is closed, successive calls to Err return the same value.
-	Err() error
-
-	// Value returns the value associated with this context for key, or nil
-	// if no value is associated with key.  Successive calls to Value with
-	// the same key returns the same result.
-	//
-	// Use context values only for request-scoped data that transits
-	// processes and API boundaries, not for passing optional parameters to
-	// functions.
-	//
-	// A key identifies a specific value in a Context.  Functions that wish
-	// to store values in Context typically allocate a key in a global
-	// variable then use that key as the argument to context.WithValue and
-	// Context.Value.  A key can be any type that supports equality;
-	// packages should define keys as an unexported type to avoid
-	// collisions.
-	//
-	// Packages that define a Context key should provide type-safe accessors
-	// for the values stores using that key:
-	//
-	// 	// Package user defines a User type that's stored in Contexts.
-	// 	package user
-	//
-	// 	import "golang.org/x/net/context"
-	//
-	// 	// User is the type of value stored in the Contexts.
-	// 	type User struct {...}
-	//
-	// 	// key is an unexported type for keys defined in this package.
-	// 	// This prevents collisions with keys defined in other packages.
-	// 	type key int
-	//
-	// 	// userKey is the key for user.User values in Contexts.  It is
-	// 	// unexported; clients use user.NewContext and user.FromContext
-	// 	// instead of using this key directly.
-	// 	var userKey key = 0
-	//
-	// 	// NewContext returns a new Context that carries value u.
-	// 	func NewContext(ctx context.Context, u *User) context.Context {
-	// 		return context.WithValue(ctx, userKey, u)
-	// 	}
-	//
-	// 	// FromContext returns the User value stored in ctx, if any.
-	// 	func FromContext(ctx context.Context) (*User, bool) {
-	// 		u, ok := ctx.Value(userKey).(*User)
-	// 		return u, ok
-	// 	}
-	Value(key interface{}) interface{}
-}
-
-// Canceled is the error returned by Context.Err when the context is canceled.
-var Canceled = errors.New("context canceled")
-
-// DeadlineExceeded is the error returned by Context.Err when the context's
-// deadline passes.
-var DeadlineExceeded = errors.New("context deadline exceeded")
-
-// An emptyCtx is never canceled, has no values, and has no deadline.  It is not
-// struct{}, since vars of this type must have distinct addresses.
-type emptyCtx int
-
-func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
-	return
-}
-
-func (*emptyCtx) Done() <-chan struct{} {
-	return nil
-}
-
-func (*emptyCtx) Err() error {
-	return nil
-}
-
-func (*emptyCtx) Value(key interface{}) interface{} {
-	return nil
-}
-
-func (e *emptyCtx) String() string {
-	switch e {
-	case background:
-		return "context.Background"
-	case todo:
-		return "context.TODO"
-	}
-	return "unknown empty Context"
-}
-
-var (
-	background = new(emptyCtx)
-	todo       = new(emptyCtx)
-)
-
-// Background returns a non-nil, empty Context. It is never canceled, has no
-// values, and has no deadline.  It is typically used by the main function,
-// initialization, and tests, and as the top-level Context for incoming
-// requests.
-func Background() Context {
-	return background
-}
-
-// TODO returns a non-nil, empty Context.  Code should use context.TODO when
-// it's unclear which Context to use or it's is not yet available (because the
-// surrounding function has not yet been extended to accept a Context
-// parameter).  TODO is recognized by static analysis tools that determine
-// whether Contexts are propagated correctly in a program.
-func TODO() Context {
-	return todo
-}
-
-// A CancelFunc tells an operation to abandon its work.
-// A CancelFunc does not wait for the work to stop.
-// After the first call, subsequent calls to a CancelFunc do nothing.
-type CancelFunc func()
-
-// WithCancel returns a copy of parent with a new Done channel. The returned
-// context's Done channel is closed when the returned cancel function is called
-// or when the parent context's Done channel is closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete.
-func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
-	c := newCancelCtx(parent)
-	propagateCancel(parent, &c)
-	return &c, func() { c.cancel(true, Canceled) }
-}
-
-// newCancelCtx returns an initialized cancelCtx.
-func newCancelCtx(parent Context) cancelCtx {
-	return cancelCtx{
-		Context: parent,
-		done:    make(chan struct{}),
-	}
-}
-
-// propagateCancel arranges for child to be canceled when parent is.
-func propagateCancel(parent Context, child canceler) {
-	if parent.Done() == nil {
-		return // parent is never canceled
-	}
-	if p, ok := parentCancelCtx(parent); ok {
-		p.mu.Lock()
-		if p.err != nil {
-			// parent has already been canceled
-			child.cancel(false, p.err)
-		} else {
-			if p.children == nil {
-				p.children = make(map[canceler]bool)
-			}
-			p.children[child] = true
-		}
-		p.mu.Unlock()
-	} else {
-		go func() {
-			select {
-			case <-parent.Done():
-				child.cancel(false, parent.Err())
-			case <-child.Done():
-			}
-		}()
-	}
-}
-
-// parentCancelCtx follows a chain of parent references until it finds a
-// *cancelCtx.  This function understands how each of the concrete types in this
-// package represents its parent.
-func parentCancelCtx(parent Context) (*cancelCtx, bool) {
-	for {
-		switch c := parent.(type) {
-		case *cancelCtx:
-			return c, true
-		case *timerCtx:
-			return &c.cancelCtx, true
-		case *valueCtx:
-			parent = c.Context
-		default:
-			return nil, false
-		}
-	}
-}
-
-// removeChild removes a context from its parent.
-func removeChild(parent Context, child canceler) {
-	p, ok := parentCancelCtx(parent)
-	if !ok {
-		return
-	}
-	p.mu.Lock()
-	if p.children != nil {
-		delete(p.children, child)
-	}
-	p.mu.Unlock()
-}
-
-// A canceler is a context type that can be canceled directly.  The
-// implementations are *cancelCtx and *timerCtx.
-type canceler interface {
-	cancel(removeFromParent bool, err error)
-	Done() <-chan struct{}
-}
-
-// A cancelCtx can be canceled.  When canceled, it also cancels any children
-// that implement canceler.
-type cancelCtx struct {
-	Context
-
-	done chan struct{} // closed by the first cancel call.
-
-	mu       sync.Mutex
-	children map[canceler]bool // set to nil by the first cancel call
-	err      error             // set to non-nil by the first cancel call
-}
-
-func (c *cancelCtx) Done() <-chan struct{} {
-	return c.done
-}
-
-func (c *cancelCtx) Err() error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	return c.err
-}
-
-func (c *cancelCtx) String() string {
-	return fmt.Sprintf("%v.WithCancel", c.Context)
-}
-
-// cancel closes c.done, cancels each of c's children, and, if
-// removeFromParent is true, removes c from its parent's children.
-func (c *cancelCtx) cancel(removeFromParent bool, err error) {
-	if err == nil {
-		panic("context: internal error: missing cancel error")
-	}
-	c.mu.Lock()
-	if c.err != nil {
-		c.mu.Unlock()
-		return // already canceled
-	}
-	c.err = err
-	close(c.done)
-	for child := range c.children {
-		// NOTE: acquiring the child's lock while holding parent's lock.
-		child.cancel(false, err)
-	}
-	c.children = nil
-	c.mu.Unlock()
-
-	if removeFromParent {
-		removeChild(c.Context, c)
-	}
-}
-
-// WithDeadline returns a copy of the parent context with the deadline adjusted
-// to be no later than d.  If the parent's deadline is already earlier than d,
-// WithDeadline(parent, d) is semantically equivalent to parent.  The returned
-// context's Done channel is closed when the deadline expires, when the returned
-// cancel function is called, or when the parent context's Done channel is
-// closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete.
-func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
-	if cur, ok := parent.Deadline(); ok && cur.Before(deadline) {
-		// The current deadline is already sooner than the new one.
-		return WithCancel(parent)
-	}
-	c := &timerCtx{
-		cancelCtx: newCancelCtx(parent),
-		deadline:  deadline,
-	}
-	propagateCancel(parent, c)
-	d := deadline.Sub(time.Now())
-	if d <= 0 {
-		c.cancel(true, DeadlineExceeded) // deadline has already passed
-		return c, func() { c.cancel(true, Canceled) }
-	}
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if c.err == nil {
-		c.timer = time.AfterFunc(d, func() {
-			c.cancel(true, DeadlineExceeded)
-		})
-	}
-	return c, func() { c.cancel(true, Canceled) }
-}
-
-// A timerCtx carries a timer and a deadline.  It embeds a cancelCtx to
-// implement Done and Err.  It implements cancel by stopping its timer then
-// delegating to cancelCtx.cancel.
-type timerCtx struct {
-	cancelCtx
-	timer *time.Timer // Under cancelCtx.mu.
-
-	deadline time.Time
-}
-
-func (c *timerCtx) Deadline() (deadline time.Time, ok bool) {
-	return c.deadline, true
-}
-
-func (c *timerCtx) String() string {
-	return fmt.Sprintf("%v.WithDeadline(%s [%s])", c.cancelCtx.Context, c.deadline, c.deadline.Sub(time.Now()))
-}
-
-func (c *timerCtx) cancel(removeFromParent bool, err error) {
-	c.cancelCtx.cancel(false, err)
-	if removeFromParent {
-		// Remove this timerCtx from its parent cancelCtx's children.
-		removeChild(c.cancelCtx.Context, c)
-	}
-	c.mu.Lock()
-	if c.timer != nil {
-		c.timer.Stop()
-		c.timer = nil
-	}
-	c.mu.Unlock()
-}
-
-// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete:
-//
-// 	func slowOperationWithTimeout(ctx context.Context) (Result, error) {
-// 		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
-// 		defer cancel()  // releases resources if slowOperation completes before timeout elapses
-// 		return slowOperation(ctx)
-// 	}
-func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
-	return WithDeadline(parent, time.Now().Add(timeout))
-}
-
-// WithValue returns a copy of parent in which the value associated with key is
-// val.
-//
-// Use context Values only for request-scoped data that transits processes and
-// APIs, not for passing optional parameters to functions.
-func WithValue(parent Context, key interface{}, val interface{}) Context {
-	return &valueCtx{parent, key, val}
-}
-
-// A valueCtx carries a key-value pair.  It implements Value for that key and
-// delegates all other calls to the embedded Context.
-type valueCtx struct {
-	Context
-	key, val interface{}
-}
-
-func (c *valueCtx) String() string {
-	return fmt.Sprintf("%v.WithValue(%#v, %#v)", c.Context, c.key, c.val)
-}
-
-func (c *valueCtx) Value(key interface{}) interface{} {
-	if c.key == key {
-		return c.val
-	}
-	return c.Context.Value(key)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq.go b/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq.go
deleted file mode 100644
index 48610e3627..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.5
-
-package ctxhttp
-
-import "net/http"
-
-func canceler(client *http.Client, req *http.Request) func() {
-	ch := make(chan struct{})
-	req.Cancel = ch
-
-	return func() {
-		close(ch)
-	}
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go b/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
deleted file mode 100644
index 56bcbadb85..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/cancelreq_go14.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.5
-
-package ctxhttp
-
-import "net/http"
-
-type requestCanceler interface {
-	CancelRequest(*http.Request)
-}
-
-func canceler(client *http.Client, req *http.Request) func() {
-	rc, ok := client.Transport.(requestCanceler)
-	if !ok {
-		return func() {}
-	}
-	return func() {
-		rc.CancelRequest(req)
-	}
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp.go b/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp.go
deleted file mode 100644
index 9f34888132..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/context/ctxhttp/ctxhttp.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ctxhttp provides helper functions for performing context-aware HTTP requests.
-package ctxhttp
-
-import (
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"golang.org/x/net/context"
-)
-
-// Do sends an HTTP request with the provided http.Client and returns an HTTP response.
-// If the client is nil, http.DefaultClient is used.
-// If the context is canceled or times out, ctx.Err() will be returned.
-func Do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
-	if client == nil {
-		client = http.DefaultClient
-	}
-
-	// Request cancelation changed in Go 1.5, see cancelreq.go and cancelreq_go14.go.
-	cancel := canceler(client, req)
-
-	type responseAndError struct {
-		resp *http.Response
-		err  error
-	}
-	result := make(chan responseAndError, 1)
-
-	go func() {
-		resp, err := client.Do(req)
-		result <- responseAndError{resp, err}
-	}()
-
-	select {
-	case <-ctx.Done():
-		cancel()
-		return nil, ctx.Err()
-	case r := <-result:
-		return r.resp, r.err
-	}
-}
-
-// Get issues a GET request via the Do function.
-func Get(ctx context.Context, client *http.Client, url string) (*http.Response, error) {
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return Do(ctx, client, req)
-}
-
-// Head issues a HEAD request via the Do function.
-func Head(ctx context.Context, client *http.Client, url string) (*http.Response, error) {
-	req, err := http.NewRequest("HEAD", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return Do(ctx, client, req)
-}
-
-// Post issues a POST request via the Do function.
-func Post(ctx context.Context, client *http.Client, url string, bodyType string, body io.Reader) (*http.Response, error) {
-	req, err := http.NewRequest("POST", url, body)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", bodyType)
-	return Do(ctx, client, req)
-}
-
-// PostForm issues a POST request via the Do function.
-func PostForm(ctx context.Context, client *http.Client, url string, data url.Values) (*http.Response, error) {
-	return Post(ctx, client, url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
deleted file mode 100644
index 227404bdaf..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package atom provides integer codes (also known as atoms) for a fixed set of
-// frequently occurring HTML strings: tag names and attribute keys such as "p"
-// and "id".
-//
-// Sharing an atom's name between all elements with the same tag can result in
-// fewer string allocations when tokenizing and parsing HTML. Integer
-// comparisons are also generally faster than string comparisons.
-//
-// The value of an atom's particular code is not guaranteed to stay the same
-// between versions of this package. Neither is any ordering guaranteed:
-// whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to
-// be dense. The only guarantees are that e.g. looking up "div" will yield
-// atom.Div, calling atom.Div.String will return "div", and atom.Div != 0.
-package atom
-
-// Atom is an integer code for a string. The zero value maps to "".
-type Atom uint32
-
-// String returns the atom's name.
-func (a Atom) String() string {
-	start := uint32(a >> 8)
-	n := uint32(a & 0xff)
-	if start+n > uint32(len(atomText)) {
-		return ""
-	}
-	return atomText[start : start+n]
-}
-
-func (a Atom) string() string {
-	return atomText[a>>8 : a>>8+a&0xff]
-}
-
-// fnv computes the FNV hash with an arbitrary starting value h.
-func fnv(h uint32, s []byte) uint32 {
-	for i := range s {
-		h ^= uint32(s[i])
-		h *= 16777619
-	}
-	return h
-}
-
-func match(s string, t []byte) bool {
-	for i, c := range t {
-		if s[i] != c {
-			return false
-		}
-	}
-	return true
-}
-
-// Lookup returns the atom whose name is s. It returns zero if there is no
-// such atom. The lookup is case sensitive.
-func Lookup(s []byte) Atom {
-	if len(s) == 0 || len(s) > maxAtomLen {
-		return 0
-	}
-	h := fnv(hash0, s)
-	if a := table[h&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
-		return a
-	}
-	if a := table[(h>>16)&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
-		return a
-	}
-	return 0
-}
-
-// String returns a string whose contents are equal to s. In that sense, it is
-// equivalent to string(s) but may be more efficient.
-func String(s []byte) string {
-	if a := Lookup(s); a != 0 {
-		return a.String()
-	}
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
deleted file mode 100644
index 6bfa866019..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
+++ /dev/null
@@ -1,648 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-// This program generates table.go and table_test.go.
-// Invoke as
-//
-//	go run gen.go |gofmt >table.go
-//	go run gen.go -test |gofmt >table_test.go
-
-import (
-	"flag"
-	"fmt"
-	"math/rand"
-	"os"
-	"sort"
-	"strings"
-)
-
-// identifier converts s to a Go exported identifier.
-// It converts "div" to "Div" and "accept-charset" to "AcceptCharset".
-func identifier(s string) string {
-	b := make([]byte, 0, len(s))
-	cap := true
-	for _, c := range s {
-		if c == '-' {
-			cap = true
-			continue
-		}
-		if cap && 'a' <= c && c <= 'z' {
-			c -= 'a' - 'A'
-		}
-		cap = false
-		b = append(b, byte(c))
-	}
-	return string(b)
-}
-
-var test = flag.Bool("test", false, "generate table_test.go")
-
-func main() {
-	flag.Parse()
-
-	var all []string
-	all = append(all, elements...)
-	all = append(all, attributes...)
-	all = append(all, eventHandlers...)
-	all = append(all, extra...)
-	sort.Strings(all)
-
-	if *test {
-		fmt.Printf("// generated by go run gen.go -test; DO NOT EDIT\n\n")
-		fmt.Printf("package atom\n\n")
-		fmt.Printf("var testAtomList = []string{\n")
-		for _, s := range all {
-			fmt.Printf("\t%q,\n", s)
-		}
-		fmt.Printf("}\n")
-		return
-	}
-
-	// uniq - lists have dups
-	// compute max len too
-	maxLen := 0
-	w := 0
-	for _, s := range all {
-		if w == 0 || all[w-1] != s {
-			if maxLen < len(s) {
-				maxLen = len(s)
-			}
-			all[w] = s
-			w++
-		}
-	}
-	all = all[:w]
-
-	// Find hash that minimizes table size.
-	var best *table
-	for i := 0; i < 1000000; i++ {
-		if best != nil && 1<<(best.k-1) < len(all) {
-			break
-		}
-		h := rand.Uint32()
-		for k := uint(0); k <= 16; k++ {
-			if best != nil && k >= best.k {
-				break
-			}
-			var t table
-			if t.init(h, k, all) {
-				best = &t
-				break
-			}
-		}
-	}
-	if best == nil {
-		fmt.Fprintf(os.Stderr, "failed to construct string table\n")
-		os.Exit(1)
-	}
-
-	// Lay out strings, using overlaps when possible.
-	layout := append([]string{}, all...)
-
-	// Remove strings that are substrings of other strings
-	for changed := true; changed; {
-		changed = false
-		for i, s := range layout {
-			if s == "" {
-				continue
-			}
-			for j, t := range layout {
-				if i != j && t != "" && strings.Contains(s, t) {
-					changed = true
-					layout[j] = ""
-				}
-			}
-		}
-	}
-
-	// Join strings where one suffix matches another prefix.
-	for {
-		// Find best i, j, k such that layout[i][len-k:] == layout[j][:k],
-		// maximizing overlap length k.
-		besti := -1
-		bestj := -1
-		bestk := 0
-		for i, s := range layout {
-			if s == "" {
-				continue
-			}
-			for j, t := range layout {
-				if i == j {
-					continue
-				}
-				for k := bestk + 1; k <= len(s) && k <= len(t); k++ {
-					if s[len(s)-k:] == t[:k] {
-						besti = i
-						bestj = j
-						bestk = k
-					}
-				}
-			}
-		}
-		if bestk > 0 {
-			layout[besti] += layout[bestj][bestk:]
-			layout[bestj] = ""
-			continue
-		}
-		break
-	}
-
-	text := strings.Join(layout, "")
-
-	atom := map[string]uint32{}
-	for _, s := range all {
-		off := strings.Index(text, s)
-		if off < 0 {
-			panic("lost string " + s)
-		}
-		atom[s] = uint32(off<<8 | len(s))
-	}
-
-	// Generate the Go code.
-	fmt.Printf("// generated by go run gen.go; DO NOT EDIT\n\n")
-	fmt.Printf("package atom\n\nconst (\n")
-	for _, s := range all {
-		fmt.Printf("\t%s Atom = %#x\n", identifier(s), atom[s])
-	}
-	fmt.Printf(")\n\n")
-
-	fmt.Printf("const hash0 = %#x\n\n", best.h0)
-	fmt.Printf("const maxAtomLen = %d\n\n", maxLen)
-
-	fmt.Printf("var table = [1<<%d]Atom{\n", best.k)
-	for i, s := range best.tab {
-		if s == "" {
-			continue
-		}
-		fmt.Printf("\t%#x: %#x, // %s\n", i, atom[s], s)
-	}
-	fmt.Printf("}\n")
-	datasize := (1 << best.k) * 4
-
-	fmt.Printf("const atomText =\n")
-	textsize := len(text)
-	for len(text) > 60 {
-		fmt.Printf("\t%q +\n", text[:60])
-		text = text[60:]
-	}
-	fmt.Printf("\t%q\n\n", text)
-
-	fmt.Fprintf(os.Stderr, "%d atoms; %d string bytes + %d tables = %d total data\n", len(all), textsize, datasize, textsize+datasize)
-}
-
-type byLen []string
-
-func (x byLen) Less(i, j int) bool { return len(x[i]) > len(x[j]) }
-func (x byLen) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
-func (x byLen) Len() int           { return len(x) }
-
-// fnv computes the FNV hash with an arbitrary starting value h.
-func fnv(h uint32, s string) uint32 {
-	for i := 0; i < len(s); i++ {
-		h ^= uint32(s[i])
-		h *= 16777619
-	}
-	return h
-}
-
-// A table represents an attempt at constructing the lookup table.
-// The lookup table uses cuckoo hashing, meaning that each string
-// can be found in one of two positions.
-type table struct {
-	h0   uint32
-	k    uint
-	mask uint32
-	tab  []string
-}
-
-// hash returns the two hashes for s.
-func (t *table) hash(s string) (h1, h2 uint32) {
-	h := fnv(t.h0, s)
-	h1 = h & t.mask
-	h2 = (h >> 16) & t.mask
-	return
-}
-
-// init initializes the table with the given parameters.
-// h0 is the initial hash value,
-// k is the number of bits of hash value to use, and
-// x is the list of strings to store in the table.
-// init returns false if the table cannot be constructed.
-func (t *table) init(h0 uint32, k uint, x []string) bool {
-	t.h0 = h0
-	t.k = k
-	t.tab = make([]string, 1<<k)
-	t.mask = 1<<k - 1
-	for _, s := range x {
-		if !t.insert(s) {
-			return false
-		}
-	}
-	return true
-}
-
-// insert inserts s in the table.
-func (t *table) insert(s string) bool {
-	h1, h2 := t.hash(s)
-	if t.tab[h1] == "" {
-		t.tab[h1] = s
-		return true
-	}
-	if t.tab[h2] == "" {
-		t.tab[h2] = s
-		return true
-	}
-	if t.push(h1, 0) {
-		t.tab[h1] = s
-		return true
-	}
-	if t.push(h2, 0) {
-		t.tab[h2] = s
-		return true
-	}
-	return false
-}
-
-// push attempts to push aside the entry in slot i.
-func (t *table) push(i uint32, depth int) bool {
-	if depth > len(t.tab) {
-		return false
-	}
-	s := t.tab[i]
-	h1, h2 := t.hash(s)
-	j := h1 + h2 - i
-	if t.tab[j] != "" && !t.push(j, depth+1) {
-		return false
-	}
-	t.tab[j] = s
-	return true
-}
-
-// The lists of element names and attribute keys were taken from
-// https://html.spec.whatwg.org/multipage/indices.html#index
-// as of the "HTML Living Standard - Last Updated 21 February 2015" version.
-
-var elements = []string{
-	"a",
-	"abbr",
-	"address",
-	"area",
-	"article",
-	"aside",
-	"audio",
-	"b",
-	"base",
-	"bdi",
-	"bdo",
-	"blockquote",
-	"body",
-	"br",
-	"button",
-	"canvas",
-	"caption",
-	"cite",
-	"code",
-	"col",
-	"colgroup",
-	"command",
-	"data",
-	"datalist",
-	"dd",
-	"del",
-	"details",
-	"dfn",
-	"dialog",
-	"div",
-	"dl",
-	"dt",
-	"em",
-	"embed",
-	"fieldset",
-	"figcaption",
-	"figure",
-	"footer",
-	"form",
-	"h1",
-	"h2",
-	"h3",
-	"h4",
-	"h5",
-	"h6",
-	"head",
-	"header",
-	"hgroup",
-	"hr",
-	"html",
-	"i",
-	"iframe",
-	"img",
-	"input",
-	"ins",
-	"kbd",
-	"keygen",
-	"label",
-	"legend",
-	"li",
-	"link",
-	"map",
-	"mark",
-	"menu",
-	"menuitem",
-	"meta",
-	"meter",
-	"nav",
-	"noscript",
-	"object",
-	"ol",
-	"optgroup",
-	"option",
-	"output",
-	"p",
-	"param",
-	"pre",
-	"progress",
-	"q",
-	"rp",
-	"rt",
-	"ruby",
-	"s",
-	"samp",
-	"script",
-	"section",
-	"select",
-	"small",
-	"source",
-	"span",
-	"strong",
-	"style",
-	"sub",
-	"summary",
-	"sup",
-	"table",
-	"tbody",
-	"td",
-	"template",
-	"textarea",
-	"tfoot",
-	"th",
-	"thead",
-	"time",
-	"title",
-	"tr",
-	"track",
-	"u",
-	"ul",
-	"var",
-	"video",
-	"wbr",
-}
-
-// https://html.spec.whatwg.org/multipage/indices.html#attributes-3
-
-var attributes = []string{
-	"abbr",
-	"accept",
-	"accept-charset",
-	"accesskey",
-	"action",
-	"alt",
-	"async",
-	"autocomplete",
-	"autofocus",
-	"autoplay",
-	"challenge",
-	"charset",
-	"checked",
-	"cite",
-	"class",
-	"cols",
-	"colspan",
-	"command",
-	"content",
-	"contenteditable",
-	"contextmenu",
-	"controls",
-	"coords",
-	"crossorigin",
-	"data",
-	"datetime",
-	"default",
-	"defer",
-	"dir",
-	"dirname",
-	"disabled",
-	"download",
-	"draggable",
-	"dropzone",
-	"enctype",
-	"for",
-	"form",
-	"formaction",
-	"formenctype",
-	"formmethod",
-	"formnovalidate",
-	"formtarget",
-	"headers",
-	"height",
-	"hidden",
-	"high",
-	"href",
-	"hreflang",
-	"http-equiv",
-	"icon",
-	"id",
-	"inputmode",
-	"ismap",
-	"itemid",
-	"itemprop",
-	"itemref",
-	"itemscope",
-	"itemtype",
-	"keytype",
-	"kind",
-	"label",
-	"lang",
-	"list",
-	"loop",
-	"low",
-	"manifest",
-	"max",
-	"maxlength",
-	"media",
-	"mediagroup",
-	"method",
-	"min",
-	"minlength",
-	"multiple",
-	"muted",
-	"name",
-	"novalidate",
-	"open",
-	"optimum",
-	"pattern",
-	"ping",
-	"placeholder",
-	"poster",
-	"preload",
-	"radiogroup",
-	"readonly",
-	"rel",
-	"required",
-	"reversed",
-	"rows",
-	"rowspan",
-	"sandbox",
-	"spellcheck",
-	"scope",
-	"scoped",
-	"seamless",
-	"selected",
-	"shape",
-	"size",
-	"sizes",
-	"sortable",
-	"sorted",
-	"span",
-	"src",
-	"srcdoc",
-	"srclang",
-	"start",
-	"step",
-	"style",
-	"tabindex",
-	"target",
-	"title",
-	"translate",
-	"type",
-	"typemustmatch",
-	"usemap",
-	"value",
-	"width",
-	"wrap",
-}
-
-var eventHandlers = []string{
-	"onabort",
-	"onautocomplete",
-	"onautocompleteerror",
-	"onafterprint",
-	"onbeforeprint",
-	"onbeforeunload",
-	"onblur",
-	"oncancel",
-	"oncanplay",
-	"oncanplaythrough",
-	"onchange",
-	"onclick",
-	"onclose",
-	"oncontextmenu",
-	"oncuechange",
-	"ondblclick",
-	"ondrag",
-	"ondragend",
-	"ondragenter",
-	"ondragleave",
-	"ondragover",
-	"ondragstart",
-	"ondrop",
-	"ondurationchange",
-	"onemptied",
-	"onended",
-	"onerror",
-	"onfocus",
-	"onhashchange",
-	"oninput",
-	"oninvalid",
-	"onkeydown",
-	"onkeypress",
-	"onkeyup",
-	"onlanguagechange",
-	"onload",
-	"onloadeddata",
-	"onloadedmetadata",
-	"onloadstart",
-	"onmessage",
-	"onmousedown",
-	"onmousemove",
-	"onmouseout",
-	"onmouseover",
-	"onmouseup",
-	"onmousewheel",
-	"onoffline",
-	"ononline",
-	"onpagehide",
-	"onpageshow",
-	"onpause",
-	"onplay",
-	"onplaying",
-	"onpopstate",
-	"onprogress",
-	"onratechange",
-	"onreset",
-	"onresize",
-	"onscroll",
-	"onseeked",
-	"onseeking",
-	"onselect",
-	"onshow",
-	"onsort",
-	"onstalled",
-	"onstorage",
-	"onsubmit",
-	"onsuspend",
-	"ontimeupdate",
-	"ontoggle",
-	"onunload",
-	"onvolumechange",
-	"onwaiting",
-}
-
-// extra are ad-hoc values not covered by any of the lists above.
-var extra = []string{
-	"align",
-	"annotation",
-	"annotation-xml",
-	"applet",
-	"basefont",
-	"bgsound",
-	"big",
-	"blink",
-	"center",
-	"color",
-	"desc",
-	"face",
-	"font",
-	"foreignObject", // HTML is case-insensitive, but SVG-embedded-in-HTML is case-sensitive.
-	"foreignobject",
-	"frame",
-	"frameset",
-	"image",
-	"isindex",
-	"listing",
-	"malignmark",
-	"marquee",
-	"math",
-	"mglyph",
-	"mi",
-	"mn",
-	"mo",
-	"ms",
-	"mtext",
-	"nobr",
-	"noembed",
-	"noframes",
-	"plaintext",
-	"prompt",
-	"public",
-	"spacer",
-	"strike",
-	"svg",
-	"system",
-	"tt",
-	"xmp",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
deleted file mode 100644
index 2605ba3102..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
+++ /dev/null
@@ -1,713 +0,0 @@
-// generated by go run gen.go; DO NOT EDIT
-
-package atom
-
-const (
-	A                   Atom = 0x1
-	Abbr                Atom = 0x4
-	Accept              Atom = 0x2106
-	AcceptCharset       Atom = 0x210e
-	Accesskey           Atom = 0x3309
-	Action              Atom = 0x1f606
-	Address             Atom = 0x4f307
-	Align               Atom = 0x1105
-	Alt                 Atom = 0x4503
-	Annotation          Atom = 0x1670a
-	AnnotationXml       Atom = 0x1670e
-	Applet              Atom = 0x2b306
-	Area                Atom = 0x2fa04
-	Article             Atom = 0x38807
-	Aside               Atom = 0x8305
-	Async               Atom = 0x7b05
-	Audio               Atom = 0xa605
-	Autocomplete        Atom = 0x1fc0c
-	Autofocus           Atom = 0xb309
-	Autoplay            Atom = 0xce08
-	B                   Atom = 0x101
-	Base                Atom = 0xd604
-	Basefont            Atom = 0xd608
-	Bdi                 Atom = 0x1a03
-	Bdo                 Atom = 0xe703
-	Bgsound             Atom = 0x11807
-	Big                 Atom = 0x12403
-	Blink               Atom = 0x12705
-	Blockquote          Atom = 0x12c0a
-	Body                Atom = 0x2f04
-	Br                  Atom = 0x202
-	Button              Atom = 0x13606
-	Canvas              Atom = 0x7f06
-	Caption             Atom = 0x1bb07
-	Center              Atom = 0x5b506
-	Challenge           Atom = 0x21f09
-	Charset             Atom = 0x2807
-	Checked             Atom = 0x32807
-	Cite                Atom = 0x3c804
-	Class               Atom = 0x4de05
-	Code                Atom = 0x14904
-	Col                 Atom = 0x15003
-	Colgroup            Atom = 0x15008
-	Color               Atom = 0x15d05
-	Cols                Atom = 0x16204
-	Colspan             Atom = 0x16207
-	Command             Atom = 0x17507
-	Content             Atom = 0x42307
-	Contenteditable     Atom = 0x4230f
-	Contextmenu         Atom = 0x3310b
-	Controls            Atom = 0x18808
-	Coords              Atom = 0x19406
-	Crossorigin         Atom = 0x19f0b
-	Data                Atom = 0x44a04
-	Datalist            Atom = 0x44a08
-	Datetime            Atom = 0x23c08
-	Dd                  Atom = 0x26702
-	Default             Atom = 0x8607
-	Defer               Atom = 0x14b05
-	Del                 Atom = 0x3ef03
-	Desc                Atom = 0x4db04
-	Details             Atom = 0x4807
-	Dfn                 Atom = 0x6103
-	Dialog              Atom = 0x1b06
-	Dir                 Atom = 0x6903
-	Dirname             Atom = 0x6907
-	Disabled            Atom = 0x10c08
-	Div                 Atom = 0x11303
-	Dl                  Atom = 0x11e02
-	Download            Atom = 0x40008
-	Draggable           Atom = 0x17b09
-	Dropzone            Atom = 0x39108
-	Dt                  Atom = 0x50902
-	Em                  Atom = 0x6502
-	Embed               Atom = 0x6505
-	Enctype             Atom = 0x21107
-	Face                Atom = 0x5b304
-	Fieldset            Atom = 0x1b008
-	Figcaption          Atom = 0x1b80a
-	Figure              Atom = 0x1cc06
-	Font                Atom = 0xda04
-	Footer              Atom = 0x8d06
-	For                 Atom = 0x1d803
-	ForeignObject       Atom = 0x1d80d
-	Foreignobject       Atom = 0x1e50d
-	Form                Atom = 0x1f204
-	Formaction          Atom = 0x1f20a
-	Formenctype         Atom = 0x20d0b
-	Formmethod          Atom = 0x2280a
-	Formnovalidate      Atom = 0x2320e
-	Formtarget          Atom = 0x2470a
-	Frame               Atom = 0x9a05
-	Frameset            Atom = 0x9a08
-	H1                  Atom = 0x26e02
-	H2                  Atom = 0x29402
-	H3                  Atom = 0x2a702
-	H4                  Atom = 0x2e902
-	H5                  Atom = 0x2f302
-	H6                  Atom = 0x50b02
-	Head                Atom = 0x2d504
-	Header              Atom = 0x2d506
-	Headers             Atom = 0x2d507
-	Height              Atom = 0x25106
-	Hgroup              Atom = 0x25906
-	Hidden              Atom = 0x26506
-	High                Atom = 0x26b04
-	Hr                  Atom = 0x27002
-	Href                Atom = 0x27004
-	Hreflang            Atom = 0x27008
-	Html                Atom = 0x25504
-	HttpEquiv           Atom = 0x2780a
-	I                   Atom = 0x601
-	Icon                Atom = 0x42204
-	Id                  Atom = 0x8502
-	Iframe              Atom = 0x29606
-	Image               Atom = 0x29c05
-	Img                 Atom = 0x2a103
-	Input               Atom = 0x3e805
-	Inputmode           Atom = 0x3e809
-	Ins                 Atom = 0x1a803
-	Isindex             Atom = 0x2a907
-	Ismap               Atom = 0x2b005
-	Itemid              Atom = 0x33c06
-	Itemprop            Atom = 0x3c908
-	Itemref             Atom = 0x5ad07
-	Itemscope           Atom = 0x2b909
-	Itemtype            Atom = 0x2c308
-	Kbd                 Atom = 0x1903
-	Keygen              Atom = 0x3906
-	Keytype             Atom = 0x53707
-	Kind                Atom = 0x10904
-	Label               Atom = 0xf005
-	Lang                Atom = 0x27404
-	Legend              Atom = 0x18206
-	Li                  Atom = 0x1202
-	Link                Atom = 0x12804
-	List                Atom = 0x44e04
-	Listing             Atom = 0x44e07
-	Loop                Atom = 0xf404
-	Low                 Atom = 0x11f03
-	Malignmark          Atom = 0x100a
-	Manifest            Atom = 0x5f108
-	Map                 Atom = 0x2b203
-	Mark                Atom = 0x1604
-	Marquee             Atom = 0x2cb07
-	Math                Atom = 0x2d204
-	Max                 Atom = 0x2e103
-	Maxlength           Atom = 0x2e109
-	Media               Atom = 0x6e05
-	Mediagroup          Atom = 0x6e0a
-	Menu                Atom = 0x33804
-	Menuitem            Atom = 0x33808
-	Meta                Atom = 0x45d04
-	Meter               Atom = 0x24205
-	Method              Atom = 0x22c06
-	Mglyph              Atom = 0x2a206
-	Mi                  Atom = 0x2eb02
-	Min                 Atom = 0x2eb03
-	Minlength           Atom = 0x2eb09
-	Mn                  Atom = 0x23502
-	Mo                  Atom = 0x3ed02
-	Ms                  Atom = 0x2bc02
-	Mtext               Atom = 0x2f505
-	Multiple            Atom = 0x30308
-	Muted               Atom = 0x30b05
-	Name                Atom = 0x6c04
-	Nav                 Atom = 0x3e03
-	Nobr                Atom = 0x5704
-	Noembed             Atom = 0x6307
-	Noframes            Atom = 0x9808
-	Noscript            Atom = 0x3d208
-	Novalidate          Atom = 0x2360a
-	Object              Atom = 0x1ec06
-	Ol                  Atom = 0xc902
-	Onabort             Atom = 0x13a07
-	Onafterprint        Atom = 0x1c00c
-	Onautocomplete      Atom = 0x1fa0e
-	Onautocompleteerror Atom = 0x1fa13
-	Onbeforeprint       Atom = 0x6040d
-	Onbeforeunload      Atom = 0x4e70e
-	Onblur              Atom = 0xaa06
-	Oncancel            Atom = 0xe908
-	Oncanplay           Atom = 0x28509
-	Oncanplaythrough    Atom = 0x28510
-	Onchange            Atom = 0x3a708
-	Onclick             Atom = 0x31007
-	Onclose             Atom = 0x31707
-	Oncontextmenu       Atom = 0x32f0d
-	Oncuechange         Atom = 0x3420b
-	Ondblclick          Atom = 0x34d0a
-	Ondrag              Atom = 0x35706
-	Ondragend           Atom = 0x35709
-	Ondragenter         Atom = 0x3600b
-	Ondragleave         Atom = 0x36b0b
-	Ondragover          Atom = 0x3760a
-	Ondragstart         Atom = 0x3800b
-	Ondrop              Atom = 0x38f06
-	Ondurationchange    Atom = 0x39f10
-	Onemptied           Atom = 0x39609
-	Onended             Atom = 0x3af07
-	Onerror             Atom = 0x3b607
-	Onfocus             Atom = 0x3bd07
-	Onhashchange        Atom = 0x3da0c
-	Oninput             Atom = 0x3e607
-	Oninvalid           Atom = 0x3f209
-	Onkeydown           Atom = 0x3fb09
-	Onkeypress          Atom = 0x4080a
-	Onkeyup             Atom = 0x41807
-	Onlanguagechange    Atom = 0x43210
-	Onload              Atom = 0x44206
-	Onloadeddata        Atom = 0x4420c
-	Onloadedmetadata    Atom = 0x45510
-	Onloadstart         Atom = 0x46b0b
-	Onmessage           Atom = 0x47609
-	Onmousedown         Atom = 0x47f0b
-	Onmousemove         Atom = 0x48a0b
-	Onmouseout          Atom = 0x4950a
-	Onmouseover         Atom = 0x4a20b
-	Onmouseup           Atom = 0x4ad09
-	Onmousewheel        Atom = 0x4b60c
-	Onoffline           Atom = 0x4c209
-	Ononline            Atom = 0x4cb08
-	Onpagehide          Atom = 0x4d30a
-	Onpageshow          Atom = 0x4fe0a
-	Onpause             Atom = 0x50d07
-	Onplay              Atom = 0x51706
-	Onplaying           Atom = 0x51709
-	Onpopstate          Atom = 0x5200a
-	Onprogress          Atom = 0x52a0a
-	Onratechange        Atom = 0x53e0c
-	Onreset             Atom = 0x54a07
-	Onresize            Atom = 0x55108
-	Onscroll            Atom = 0x55f08
-	Onseeked            Atom = 0x56708
-	Onseeking           Atom = 0x56f09
-	Onselect            Atom = 0x57808
-	Onshow              Atom = 0x58206
-	Onsort              Atom = 0x58b06
-	Onstalled           Atom = 0x59509
-	Onstorage           Atom = 0x59e09
-	Onsubmit            Atom = 0x5a708
-	Onsuspend           Atom = 0x5bb09
-	Ontimeupdate        Atom = 0xdb0c
-	Ontoggle            Atom = 0x5c408
-	Onunload            Atom = 0x5cc08
-	Onvolumechange      Atom = 0x5d40e
-	Onwaiting           Atom = 0x5e209
-	Open                Atom = 0x3cf04
-	Optgroup            Atom = 0xf608
-	Optimum             Atom = 0x5eb07
-	Option              Atom = 0x60006
-	Output              Atom = 0x49c06
-	P                   Atom = 0xc01
-	Param               Atom = 0xc05
-	Pattern             Atom = 0x5107
-	Ping                Atom = 0x7704
-	Placeholder         Atom = 0xc30b
-	Plaintext           Atom = 0xfd09
-	Poster              Atom = 0x15706
-	Pre                 Atom = 0x25e03
-	Preload             Atom = 0x25e07
-	Progress            Atom = 0x52c08
-	Prompt              Atom = 0x5fa06
-	Public              Atom = 0x41e06
-	Q                   Atom = 0x13101
-	Radiogroup          Atom = 0x30a
-	Readonly            Atom = 0x2fb08
-	Rel                 Atom = 0x25f03
-	Required            Atom = 0x1d008
-	Reversed            Atom = 0x5a08
-	Rows                Atom = 0x9204
-	Rowspan             Atom = 0x9207
-	Rp                  Atom = 0x1c602
-	Rt                  Atom = 0x13f02
-	Ruby                Atom = 0xaf04
-	S                   Atom = 0x2c01
-	Samp                Atom = 0x4e04
-	Sandbox             Atom = 0xbb07
-	Scope               Atom = 0x2bd05
-	Scoped              Atom = 0x2bd06
-	Script              Atom = 0x3d406
-	Seamless            Atom = 0x31c08
-	Section             Atom = 0x4e207
-	Select              Atom = 0x57a06
-	Selected            Atom = 0x57a08
-	Shape               Atom = 0x4f905
-	Size                Atom = 0x55504
-	Sizes               Atom = 0x55505
-	Small               Atom = 0x18f05
-	Sortable            Atom = 0x58d08
-	Sorted              Atom = 0x19906
-	Source              Atom = 0x1aa06
-	Spacer              Atom = 0x2db06
-	Span                Atom = 0x9504
-	Spellcheck          Atom = 0x3230a
-	Src                 Atom = 0x3c303
-	Srcdoc              Atom = 0x3c306
-	Srclang             Atom = 0x41107
-	Start               Atom = 0x38605
-	Step                Atom = 0x5f704
-	Strike              Atom = 0x53306
-	Strong              Atom = 0x55906
-	Style               Atom = 0x61105
-	Sub                 Atom = 0x5a903
-	Summary             Atom = 0x61607
-	Sup                 Atom = 0x61d03
-	Svg                 Atom = 0x62003
-	System              Atom = 0x62306
-	Tabindex            Atom = 0x46308
-	Table               Atom = 0x42d05
-	Target              Atom = 0x24b06
-	Tbody               Atom = 0x2e05
-	Td                  Atom = 0x4702
-	Template            Atom = 0x62608
-	Textarea            Atom = 0x2f608
-	Tfoot               Atom = 0x8c05
-	Th                  Atom = 0x22e02
-	Thead               Atom = 0x2d405
-	Time                Atom = 0xdd04
-	Title               Atom = 0xa105
-	Tr                  Atom = 0x10502
-	Track               Atom = 0x10505
-	Translate           Atom = 0x14009
-	Tt                  Atom = 0x5302
-	Type                Atom = 0x21404
-	Typemustmatch       Atom = 0x2140d
-	U                   Atom = 0xb01
-	Ul                  Atom = 0x8a02
-	Usemap              Atom = 0x51106
-	Value               Atom = 0x4005
-	Var                 Atom = 0x11503
-	Video               Atom = 0x28105
-	Wbr                 Atom = 0x12103
-	Width               Atom = 0x50705
-	Wrap                Atom = 0x58704
-	Xmp                 Atom = 0xc103
-)
-
-const hash0 = 0xc17da63e
-
-const maxAtomLen = 19
-
-var table = [1 << 9]Atom{
-	0x1:   0x48a0b, // onmousemove
-	0x2:   0x5e209, // onwaiting
-	0x3:   0x1fa13, // onautocompleteerror
-	0x4:   0x5fa06, // prompt
-	0x7:   0x5eb07, // optimum
-	0x8:   0x1604,  // mark
-	0xa:   0x5ad07, // itemref
-	0xb:   0x4fe0a, // onpageshow
-	0xc:   0x57a06, // select
-	0xd:   0x17b09, // draggable
-	0xe:   0x3e03,  // nav
-	0xf:   0x17507, // command
-	0x11:  0xb01,   // u
-	0x14:  0x2d507, // headers
-	0x15:  0x44a08, // datalist
-	0x17:  0x4e04,  // samp
-	0x1a:  0x3fb09, // onkeydown
-	0x1b:  0x55f08, // onscroll
-	0x1c:  0x15003, // col
-	0x20:  0x3c908, // itemprop
-	0x21:  0x2780a, // http-equiv
-	0x22:  0x61d03, // sup
-	0x24:  0x1d008, // required
-	0x2b:  0x25e07, // preload
-	0x2c:  0x6040d, // onbeforeprint
-	0x2d:  0x3600b, // ondragenter
-	0x2e:  0x50902, // dt
-	0x2f:  0x5a708, // onsubmit
-	0x30:  0x27002, // hr
-	0x31:  0x32f0d, // oncontextmenu
-	0x33:  0x29c05, // image
-	0x34:  0x50d07, // onpause
-	0x35:  0x25906, // hgroup
-	0x36:  0x7704,  // ping
-	0x37:  0x57808, // onselect
-	0x3a:  0x11303, // div
-	0x3b:  0x1fa0e, // onautocomplete
-	0x40:  0x2eb02, // mi
-	0x41:  0x31c08, // seamless
-	0x42:  0x2807,  // charset
-	0x43:  0x8502,  // id
-	0x44:  0x5200a, // onpopstate
-	0x45:  0x3ef03, // del
-	0x46:  0x2cb07, // marquee
-	0x47:  0x3309,  // accesskey
-	0x49:  0x8d06,  // footer
-	0x4a:  0x44e04, // list
-	0x4b:  0x2b005, // ismap
-	0x51:  0x33804, // menu
-	0x52:  0x2f04,  // body
-	0x55:  0x9a08,  // frameset
-	0x56:  0x54a07, // onreset
-	0x57:  0x12705, // blink
-	0x58:  0xa105,  // title
-	0x59:  0x38807, // article
-	0x5b:  0x22e02, // th
-	0x5d:  0x13101, // q
-	0x5e:  0x3cf04, // open
-	0x5f:  0x2fa04, // area
-	0x61:  0x44206, // onload
-	0x62:  0xda04,  // font
-	0x63:  0xd604,  // base
-	0x64:  0x16207, // colspan
-	0x65:  0x53707, // keytype
-	0x66:  0x11e02, // dl
-	0x68:  0x1b008, // fieldset
-	0x6a:  0x2eb03, // min
-	0x6b:  0x11503, // var
-	0x6f:  0x2d506, // header
-	0x70:  0x13f02, // rt
-	0x71:  0x15008, // colgroup
-	0x72:  0x23502, // mn
-	0x74:  0x13a07, // onabort
-	0x75:  0x3906,  // keygen
-	0x76:  0x4c209, // onoffline
-	0x77:  0x21f09, // challenge
-	0x78:  0x2b203, // map
-	0x7a:  0x2e902, // h4
-	0x7b:  0x3b607, // onerror
-	0x7c:  0x2e109, // maxlength
-	0x7d:  0x2f505, // mtext
-	0x7e:  0xbb07,  // sandbox
-	0x7f:  0x58b06, // onsort
-	0x80:  0x100a,  // malignmark
-	0x81:  0x45d04, // meta
-	0x82:  0x7b05,  // async
-	0x83:  0x2a702, // h3
-	0x84:  0x26702, // dd
-	0x85:  0x27004, // href
-	0x86:  0x6e0a,  // mediagroup
-	0x87:  0x19406, // coords
-	0x88:  0x41107, // srclang
-	0x89:  0x34d0a, // ondblclick
-	0x8a:  0x4005,  // value
-	0x8c:  0xe908,  // oncancel
-	0x8e:  0x3230a, // spellcheck
-	0x8f:  0x9a05,  // frame
-	0x91:  0x12403, // big
-	0x94:  0x1f606, // action
-	0x95:  0x6903,  // dir
-	0x97:  0x2fb08, // readonly
-	0x99:  0x42d05, // table
-	0x9a:  0x61607, // summary
-	0x9b:  0x12103, // wbr
-	0x9c:  0x30a,   // radiogroup
-	0x9d:  0x6c04,  // name
-	0x9f:  0x62306, // system
-	0xa1:  0x15d05, // color
-	0xa2:  0x7f06,  // canvas
-	0xa3:  0x25504, // html
-	0xa5:  0x56f09, // onseeking
-	0xac:  0x4f905, // shape
-	0xad:  0x25f03, // rel
-	0xae:  0x28510, // oncanplaythrough
-	0xaf:  0x3760a, // ondragover
-	0xb0:  0x62608, // template
-	0xb1:  0x1d80d, // foreignObject
-	0xb3:  0x9204,  // rows
-	0xb6:  0x44e07, // listing
-	0xb7:  0x49c06, // output
-	0xb9:  0x3310b, // contextmenu
-	0xbb:  0x11f03, // low
-	0xbc:  0x1c602, // rp
-	0xbd:  0x5bb09, // onsuspend
-	0xbe:  0x13606, // button
-	0xbf:  0x4db04, // desc
-	0xc1:  0x4e207, // section
-	0xc2:  0x52a0a, // onprogress
-	0xc3:  0x59e09, // onstorage
-	0xc4:  0x2d204, // math
-	0xc5:  0x4503,  // alt
-	0xc7:  0x8a02,  // ul
-	0xc8:  0x5107,  // pattern
-	0xc9:  0x4b60c, // onmousewheel
-	0xca:  0x35709, // ondragend
-	0xcb:  0xaf04,  // ruby
-	0xcc:  0xc01,   // p
-	0xcd:  0x31707, // onclose
-	0xce:  0x24205, // meter
-	0xcf:  0x11807, // bgsound
-	0xd2:  0x25106, // height
-	0xd4:  0x101,   // b
-	0xd5:  0x2c308, // itemtype
-	0xd8:  0x1bb07, // caption
-	0xd9:  0x10c08, // disabled
-	0xdb:  0x33808, // menuitem
-	0xdc:  0x62003, // svg
-	0xdd:  0x18f05, // small
-	0xde:  0x44a04, // data
-	0xe0:  0x4cb08, // ononline
-	0xe1:  0x2a206, // mglyph
-	0xe3:  0x6505,  // embed
-	0xe4:  0x10502, // tr
-	0xe5:  0x46b0b, // onloadstart
-	0xe7:  0x3c306, // srcdoc
-	0xeb:  0x5c408, // ontoggle
-	0xed:  0xe703,  // bdo
-	0xee:  0x4702,  // td
-	0xef:  0x8305,  // aside
-	0xf0:  0x29402, // h2
-	0xf1:  0x52c08, // progress
-	0xf2:  0x12c0a, // blockquote
-	0xf4:  0xf005,  // label
-	0xf5:  0x601,   // i
-	0xf7:  0x9207,  // rowspan
-	0xfb:  0x51709, // onplaying
-	0xfd:  0x2a103, // img
-	0xfe:  0xf608,  // optgroup
-	0xff:  0x42307, // content
-	0x101: 0x53e0c, // onratechange
-	0x103: 0x3da0c, // onhashchange
-	0x104: 0x4807,  // details
-	0x106: 0x40008, // download
-	0x109: 0x14009, // translate
-	0x10b: 0x4230f, // contenteditable
-	0x10d: 0x36b0b, // ondragleave
-	0x10e: 0x2106,  // accept
-	0x10f: 0x57a08, // selected
-	0x112: 0x1f20a, // formaction
-	0x113: 0x5b506, // center
-	0x115: 0x45510, // onloadedmetadata
-	0x116: 0x12804, // link
-	0x117: 0xdd04,  // time
-	0x118: 0x19f0b, // crossorigin
-	0x119: 0x3bd07, // onfocus
-	0x11a: 0x58704, // wrap
-	0x11b: 0x42204, // icon
-	0x11d: 0x28105, // video
-	0x11e: 0x4de05, // class
-	0x121: 0x5d40e, // onvolumechange
-	0x122: 0xaa06,  // onblur
-	0x123: 0x2b909, // itemscope
-	0x124: 0x61105, // style
-	0x127: 0x41e06, // public
-	0x129: 0x2320e, // formnovalidate
-	0x12a: 0x58206, // onshow
-	0x12c: 0x51706, // onplay
-	0x12d: 0x3c804, // cite
-	0x12e: 0x2bc02, // ms
-	0x12f: 0xdb0c,  // ontimeupdate
-	0x130: 0x10904, // kind
-	0x131: 0x2470a, // formtarget
-	0x135: 0x3af07, // onended
-	0x136: 0x26506, // hidden
-	0x137: 0x2c01,  // s
-	0x139: 0x2280a, // formmethod
-	0x13a: 0x3e805, // input
-	0x13c: 0x50b02, // h6
-	0x13d: 0xc902,  // ol
-	0x13e: 0x3420b, // oncuechange
-	0x13f: 0x1e50d, // foreignobject
-	0x143: 0x4e70e, // onbeforeunload
-	0x144: 0x2bd05, // scope
-	0x145: 0x39609, // onemptied
-	0x146: 0x14b05, // defer
-	0x147: 0xc103,  // xmp
-	0x148: 0x39f10, // ondurationchange
-	0x149: 0x1903,  // kbd
-	0x14c: 0x47609, // onmessage
-	0x14d: 0x60006, // option
-	0x14e: 0x2eb09, // minlength
-	0x14f: 0x32807, // checked
-	0x150: 0xce08,  // autoplay
-	0x152: 0x202,   // br
-	0x153: 0x2360a, // novalidate
-	0x156: 0x6307,  // noembed
-	0x159: 0x31007, // onclick
-	0x15a: 0x47f0b, // onmousedown
-	0x15b: 0x3a708, // onchange
-	0x15e: 0x3f209, // oninvalid
-	0x15f: 0x2bd06, // scoped
-	0x160: 0x18808, // controls
-	0x161: 0x30b05, // muted
-	0x162: 0x58d08, // sortable
-	0x163: 0x51106, // usemap
-	0x164: 0x1b80a, // figcaption
-	0x165: 0x35706, // ondrag
-	0x166: 0x26b04, // high
-	0x168: 0x3c303, // src
-	0x169: 0x15706, // poster
-	0x16b: 0x1670e, // annotation-xml
-	0x16c: 0x5f704, // step
-	0x16d: 0x4,     // abbr
-	0x16e: 0x1b06,  // dialog
-	0x170: 0x1202,  // li
-	0x172: 0x3ed02, // mo
-	0x175: 0x1d803, // for
-	0x176: 0x1a803, // ins
-	0x178: 0x55504, // size
-	0x179: 0x43210, // onlanguagechange
-	0x17a: 0x8607,  // default
-	0x17b: 0x1a03,  // bdi
-	0x17c: 0x4d30a, // onpagehide
-	0x17d: 0x6907,  // dirname
-	0x17e: 0x21404, // type
-	0x17f: 0x1f204, // form
-	0x181: 0x28509, // oncanplay
-	0x182: 0x6103,  // dfn
-	0x183: 0x46308, // tabindex
-	0x186: 0x6502,  // em
-	0x187: 0x27404, // lang
-	0x189: 0x39108, // dropzone
-	0x18a: 0x4080a, // onkeypress
-	0x18b: 0x23c08, // datetime
-	0x18c: 0x16204, // cols
-	0x18d: 0x1,     // a
-	0x18e: 0x4420c, // onloadeddata
-	0x190: 0xa605,  // audio
-	0x192: 0x2e05,  // tbody
-	0x193: 0x22c06, // method
-	0x195: 0xf404,  // loop
-	0x196: 0x29606, // iframe
-	0x198: 0x2d504, // head
-	0x19e: 0x5f108, // manifest
-	0x19f: 0xb309,  // autofocus
-	0x1a0: 0x14904, // code
-	0x1a1: 0x55906, // strong
-	0x1a2: 0x30308, // multiple
-	0x1a3: 0xc05,   // param
-	0x1a6: 0x21107, // enctype
-	0x1a7: 0x5b304, // face
-	0x1a8: 0xfd09,  // plaintext
-	0x1a9: 0x26e02, // h1
-	0x1aa: 0x59509, // onstalled
-	0x1ad: 0x3d406, // script
-	0x1ae: 0x2db06, // spacer
-	0x1af: 0x55108, // onresize
-	0x1b0: 0x4a20b, // onmouseover
-	0x1b1: 0x5cc08, // onunload
-	0x1b2: 0x56708, // onseeked
-	0x1b4: 0x2140d, // typemustmatch
-	0x1b5: 0x1cc06, // figure
-	0x1b6: 0x4950a, // onmouseout
-	0x1b7: 0x25e03, // pre
-	0x1b8: 0x50705, // width
-	0x1b9: 0x19906, // sorted
-	0x1bb: 0x5704,  // nobr
-	0x1be: 0x5302,  // tt
-	0x1bf: 0x1105,  // align
-	0x1c0: 0x3e607, // oninput
-	0x1c3: 0x41807, // onkeyup
-	0x1c6: 0x1c00c, // onafterprint
-	0x1c7: 0x210e,  // accept-charset
-	0x1c8: 0x33c06, // itemid
-	0x1c9: 0x3e809, // inputmode
-	0x1cb: 0x53306, // strike
-	0x1cc: 0x5a903, // sub
-	0x1cd: 0x10505, // track
-	0x1ce: 0x38605, // start
-	0x1d0: 0xd608,  // basefont
-	0x1d6: 0x1aa06, // source
-	0x1d7: 0x18206, // legend
-	0x1d8: 0x2d405, // thead
-	0x1da: 0x8c05,  // tfoot
-	0x1dd: 0x1ec06, // object
-	0x1de: 0x6e05,  // media
-	0x1df: 0x1670a, // annotation
-	0x1e0: 0x20d0b, // formenctype
-	0x1e2: 0x3d208, // noscript
-	0x1e4: 0x55505, // sizes
-	0x1e5: 0x1fc0c, // autocomplete
-	0x1e6: 0x9504,  // span
-	0x1e7: 0x9808,  // noframes
-	0x1e8: 0x24b06, // target
-	0x1e9: 0x38f06, // ondrop
-	0x1ea: 0x2b306, // applet
-	0x1ec: 0x5a08,  // reversed
-	0x1f0: 0x2a907, // isindex
-	0x1f3: 0x27008, // hreflang
-	0x1f5: 0x2f302, // h5
-	0x1f6: 0x4f307, // address
-	0x1fa: 0x2e103, // max
-	0x1fb: 0xc30b,  // placeholder
-	0x1fc: 0x2f608, // textarea
-	0x1fe: 0x4ad09, // onmouseup
-	0x1ff: 0x3800b, // ondragstart
-}
-
-const atomText = "abbradiogrouparamalignmarkbdialogaccept-charsetbodyaccesskey" +
-	"genavaluealtdetailsampatternobreversedfnoembedirnamediagroup" +
-	"ingasyncanvasidefaultfooterowspanoframesetitleaudionblurubya" +
-	"utofocusandboxmplaceholderautoplaybasefontimeupdatebdoncance" +
-	"labelooptgrouplaintextrackindisabledivarbgsoundlowbrbigblink" +
-	"blockquotebuttonabortranslatecodefercolgroupostercolorcolspa" +
-	"nnotation-xmlcommandraggablegendcontrolsmallcoordsortedcross" +
-	"originsourcefieldsetfigcaptionafterprintfigurequiredforeignO" +
-	"bjectforeignobjectformactionautocompleteerrorformenctypemust" +
-	"matchallengeformmethodformnovalidatetimeterformtargetheightm" +
-	"lhgroupreloadhiddenhigh1hreflanghttp-equivideoncanplaythroug" +
-	"h2iframeimageimglyph3isindexismappletitemscopeditemtypemarqu" +
-	"eematheaderspacermaxlength4minlength5mtextareadonlymultiplem" +
-	"utedonclickoncloseamlesspellcheckedoncontextmenuitemidoncuec" +
-	"hangeondblclickondragendondragenterondragleaveondragoverondr" +
-	"agstarticleondropzonemptiedondurationchangeonendedonerroronf" +
-	"ocusrcdocitempropenoscriptonhashchangeoninputmodeloninvalido" +
-	"nkeydownloadonkeypressrclangonkeyupublicontenteditableonlang" +
-	"uagechangeonloadeddatalistingonloadedmetadatabindexonloadsta" +
-	"rtonmessageonmousedownonmousemoveonmouseoutputonmouseoveronm" +
-	"ouseuponmousewheelonofflineononlineonpagehidesclassectionbef" +
-	"oreunloaddresshapeonpageshowidth6onpausemaponplayingonpopsta" +
-	"teonprogresstrikeytypeonratechangeonresetonresizestrongonscr" +
-	"ollonseekedonseekingonselectedonshowraponsortableonstalledon" +
-	"storageonsubmitemrefacenteronsuspendontoggleonunloadonvolume" +
-	"changeonwaitingoptimumanifestepromptoptionbeforeprintstylesu" +
-	"mmarysupsvgsystemplate"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
deleted file mode 100644
index fd7eb585d8..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package charset provides common text encodings for HTML documents.
-//
-// The mapping from encoding labels to encodings is defined at
-// https://encoding.spec.whatwg.org/.
-package charset
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"mime"
-	"strings"
-	"unicode/utf8"
-
-	"golang.org/x/net/html"
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/charmap"
-	"golang.org/x/text/transform"
-)
-
-// Lookup returns the encoding with the specified label, and its canonical
-// name. It returns nil and the empty string if label is not one of the
-// standard encodings for HTML. Matching is case-insensitive and ignores
-// leading and trailing whitespace.
-func Lookup(label string) (e encoding.Encoding, name string) {
-	label = strings.ToLower(strings.Trim(label, "\t\n\r\f "))
-	enc := encodings[label]
-	return enc.e, enc.name
-}
-
-// DetermineEncoding determines the encoding of an HTML document by examining
-// up to the first 1024 bytes of content and the declared Content-Type.
-//
-// See http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#determining-the-character-encoding
-func DetermineEncoding(content []byte, contentType string) (e encoding.Encoding, name string, certain bool) {
-	if len(content) > 1024 {
-		content = content[:1024]
-	}
-
-	for _, b := range boms {
-		if bytes.HasPrefix(content, b.bom) {
-			e, name = Lookup(b.enc)
-			return e, name, true
-		}
-	}
-
-	if _, params, err := mime.ParseMediaType(contentType); err == nil {
-		if cs, ok := params["charset"]; ok {
-			if e, name = Lookup(cs); e != nil {
-				return e, name, true
-			}
-		}
-	}
-
-	if len(content) > 0 {
-		e, name = prescan(content)
-		if e != nil {
-			return e, name, false
-		}
-	}
-
-	// Try to detect UTF-8.
-	// First eliminate any partial rune at the end.
-	for i := len(content) - 1; i >= 0 && i > len(content)-4; i-- {
-		b := content[i]
-		if b < 0x80 {
-			break
-		}
-		if utf8.RuneStart(b) {
-			content = content[:i]
-			break
-		}
-	}
-	hasHighBit := false
-	for _, c := range content {
-		if c >= 0x80 {
-			hasHighBit = true
-			break
-		}
-	}
-	if hasHighBit && utf8.Valid(content) {
-		return encoding.Nop, "utf-8", false
-	}
-
-	// TODO: change default depending on user's locale?
-	return charmap.Windows1252, "windows-1252", false
-}
-
-// NewReader returns an io.Reader that converts the content of r to UTF-8.
-// It calls DetermineEncoding to find out what r's encoding is.
-func NewReader(r io.Reader, contentType string) (io.Reader, error) {
-	preview := make([]byte, 1024)
-	n, err := io.ReadFull(r, preview)
-	switch {
-	case err == io.ErrUnexpectedEOF:
-		preview = preview[:n]
-		r = bytes.NewReader(preview)
-	case err != nil:
-		return nil, err
-	default:
-		r = io.MultiReader(bytes.NewReader(preview), r)
-	}
-
-	if e, _, _ := DetermineEncoding(preview, contentType); e != encoding.Nop {
-		r = transform.NewReader(r, e.NewDecoder())
-	}
-	return r, nil
-}
-
-// NewReaderLabel returns a reader that converts from the specified charset to
-// UTF-8. It uses Lookup to find the encoding that corresponds to label, and
-// returns an error if Lookup returns nil. It is suitable for use as
-// encoding/xml.Decoder's CharsetReader function.
-func NewReaderLabel(label string, input io.Reader) (io.Reader, error) {
-	e, _ := Lookup(label)
-	if e == nil {
-		return nil, fmt.Errorf("unsupported charset: %q", label)
-	}
-	return transform.NewReader(input, e.NewDecoder()), nil
-}
-
-func prescan(content []byte) (e encoding.Encoding, name string) {
-	z := html.NewTokenizer(bytes.NewReader(content))
-	for {
-		switch z.Next() {
-		case html.ErrorToken:
-			return nil, ""
-
-		case html.StartTagToken, html.SelfClosingTagToken:
-			tagName, hasAttr := z.TagName()
-			if !bytes.Equal(tagName, []byte("meta")) {
-				continue
-			}
-			attrList := make(map[string]bool)
-			gotPragma := false
-
-			const (
-				dontKnow = iota
-				doNeedPragma
-				doNotNeedPragma
-			)
-			needPragma := dontKnow
-
-			name = ""
-			e = nil
-			for hasAttr {
-				var key, val []byte
-				key, val, hasAttr = z.TagAttr()
-				ks := string(key)
-				if attrList[ks] {
-					continue
-				}
-				attrList[ks] = true
-				for i, c := range val {
-					if 'A' <= c && c <= 'Z' {
-						val[i] = c + 0x20
-					}
-				}
-
-				switch ks {
-				case "http-equiv":
-					if bytes.Equal(val, []byte("content-type")) {
-						gotPragma = true
-					}
-
-				case "content":
-					if e == nil {
-						name = fromMetaElement(string(val))
-						if name != "" {
-							e, name = Lookup(name)
-							if e != nil {
-								needPragma = doNeedPragma
-							}
-						}
-					}
-
-				case "charset":
-					e, name = Lookup(string(val))
-					needPragma = doNotNeedPragma
-				}
-			}
-
-			if needPragma == dontKnow || needPragma == doNeedPragma && !gotPragma {
-				continue
-			}
-
-			if strings.HasPrefix(name, "utf-16") {
-				name = "utf-8"
-				e = encoding.Nop
-			}
-
-			if e != nil {
-				return e, name
-			}
-		}
-	}
-}
-
-func fromMetaElement(s string) string {
-	for s != "" {
-		csLoc := strings.Index(s, "charset")
-		if csLoc == -1 {
-			return ""
-		}
-		s = s[csLoc+len("charset"):]
-		s = strings.TrimLeft(s, " \t\n\f\r")
-		if !strings.HasPrefix(s, "=") {
-			continue
-		}
-		s = s[1:]
-		s = strings.TrimLeft(s, " \t\n\f\r")
-		if s == "" {
-			return ""
-		}
-		if q := s[0]; q == '"' || q == '\'' {
-			s = s[1:]
-			closeQuote := strings.IndexRune(s, rune(q))
-			if closeQuote == -1 {
-				return ""
-			}
-			return s[:closeQuote]
-		}
-
-		end := strings.IndexAny(s, "; \t\n\f\r")
-		if end == -1 {
-			end = len(s)
-		}
-		return s[:end]
-	}
-	return ""
-}
-
-var boms = []struct {
-	bom []byte
-	enc string
-}{
-	{[]byte{0xfe, 0xff}, "utf-16be"},
-	{[]byte{0xff, 0xfe}, "utf-16le"},
-	{[]byte{0xef, 0xbb, 0xbf}, "utf-8"},
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
deleted file mode 100644
index 828347f4ae..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-// Download https://encoding.spec.whatwg.org/encodings.json and use it to
-// generate table.go.
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"strings"
-)
-
-type enc struct {
-	Name   string
-	Labels []string
-}
-
-type group struct {
-	Encodings []enc
-	Heading   string
-}
-
-const specURL = "https://encoding.spec.whatwg.org/encodings.json"
-
-func main() {
-	resp, err := http.Get(specURL)
-	if err != nil {
-		log.Fatalf("error fetching %s: %s", specURL, err)
-	}
-	if resp.StatusCode != 200 {
-		log.Fatalf("error fetching %s: HTTP status %s", specURL, resp.Status)
-	}
-	defer resp.Body.Close()
-
-	var groups []group
-	d := json.NewDecoder(resp.Body)
-	err = d.Decode(&groups)
-	if err != nil {
-		log.Fatalf("error reading encodings.json: %s", err)
-	}
-
-	fmt.Println("// generated by go run gen.go; DO NOT EDIT")
-	fmt.Println()
-	fmt.Println("package charset")
-	fmt.Println()
-
-	fmt.Println("import (")
-	fmt.Println(`"golang.org/x/text/encoding"`)
-	for _, pkg := range []string{"charmap", "japanese", "korean", "simplifiedchinese", "traditionalchinese", "unicode"} {
-		fmt.Printf("\"golang.org/x/text/encoding/%s\"\n", pkg)
-	}
-	fmt.Println(")")
-	fmt.Println()
-
-	fmt.Println("var encodings = map[string]struct{e encoding.Encoding; name string} {")
-	for _, g := range groups {
-		for _, e := range g.Encodings {
-			goName, ok := miscNames[e.Name]
-			if !ok {
-				for k, v := range prefixes {
-					if strings.HasPrefix(e.Name, k) {
-						goName = v + e.Name[len(k):]
-						break
-					}
-				}
-				if goName == "" {
-					log.Fatalf("unrecognized encoding name: %s", e.Name)
-				}
-			}
-
-			for _, label := range e.Labels {
-				fmt.Printf("%q: {%s, %q},\n", label, goName, e.Name)
-			}
-		}
-	}
-	fmt.Println("}")
-}
-
-var prefixes = map[string]string{
-	"iso-8859-": "charmap.ISO8859_",
-	"windows-":  "charmap.Windows",
-}
-
-var miscNames = map[string]string{
-	"utf-8":          "encoding.Nop",
-	"ibm866":         "charmap.CodePage866",
-	"iso-8859-8-i":   "charmap.ISO8859_8",
-	"koi8-r":         "charmap.KOI8R",
-	"koi8-u":         "charmap.KOI8U",
-	"macintosh":      "charmap.Macintosh",
-	"x-mac-cyrillic": "charmap.MacintoshCyrillic",
-	"gbk":            "simplifiedchinese.GBK",
-	"gb18030":        "simplifiedchinese.GB18030",
-	"hz-gb-2312":     "simplifiedchinese.HZGB2312",
-	"big5":           "traditionalchinese.Big5",
-	"euc-jp":         "japanese.EUCJP",
-	"iso-2022-jp":    "japanese.ISO2022JP",
-	"shift_jis":      "japanese.ShiftJIS",
-	"euc-kr":         "korean.EUCKR",
-	"replacement":    "encoding.Replacement",
-	"utf-16be":       "unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM)",
-	"utf-16le":       "unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM)",
-	"x-user-defined": "charmap.XUserDefined",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
deleted file mode 100644
index aa0d948407..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
+++ /dev/null
@@ -1,235 +0,0 @@
-// generated by go run gen.go; DO NOT EDIT
-
-package charset
-
-import (
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/charmap"
-	"golang.org/x/text/encoding/japanese"
-	"golang.org/x/text/encoding/korean"
-	"golang.org/x/text/encoding/simplifiedchinese"
-	"golang.org/x/text/encoding/traditionalchinese"
-	"golang.org/x/text/encoding/unicode"
-)
-
-var encodings = map[string]struct {
-	e    encoding.Encoding
-	name string
-}{
-	"unicode-1-1-utf-8":   {encoding.Nop, "utf-8"},
-	"utf-8":               {encoding.Nop, "utf-8"},
-	"utf8":                {encoding.Nop, "utf-8"},
-	"866":                 {charmap.CodePage866, "ibm866"},
-	"cp866":               {charmap.CodePage866, "ibm866"},
-	"csibm866":            {charmap.CodePage866, "ibm866"},
-	"ibm866":              {charmap.CodePage866, "ibm866"},
-	"csisolatin2":         {charmap.ISO8859_2, "iso-8859-2"},
-	"iso-8859-2":          {charmap.ISO8859_2, "iso-8859-2"},
-	"iso-ir-101":          {charmap.ISO8859_2, "iso-8859-2"},
-	"iso8859-2":           {charmap.ISO8859_2, "iso-8859-2"},
-	"iso88592":            {charmap.ISO8859_2, "iso-8859-2"},
-	"iso_8859-2":          {charmap.ISO8859_2, "iso-8859-2"},
-	"iso_8859-2:1987":     {charmap.ISO8859_2, "iso-8859-2"},
-	"l2":                  {charmap.ISO8859_2, "iso-8859-2"},
-	"latin2":              {charmap.ISO8859_2, "iso-8859-2"},
-	"csisolatin3":         {charmap.ISO8859_3, "iso-8859-3"},
-	"iso-8859-3":          {charmap.ISO8859_3, "iso-8859-3"},
-	"iso-ir-109":          {charmap.ISO8859_3, "iso-8859-3"},
-	"iso8859-3":           {charmap.ISO8859_3, "iso-8859-3"},
-	"iso88593":            {charmap.ISO8859_3, "iso-8859-3"},
-	"iso_8859-3":          {charmap.ISO8859_3, "iso-8859-3"},
-	"iso_8859-3:1988":     {charmap.ISO8859_3, "iso-8859-3"},
-	"l3":                  {charmap.ISO8859_3, "iso-8859-3"},
-	"latin3":              {charmap.ISO8859_3, "iso-8859-3"},
-	"csisolatin4":         {charmap.ISO8859_4, "iso-8859-4"},
-	"iso-8859-4":          {charmap.ISO8859_4, "iso-8859-4"},
-	"iso-ir-110":          {charmap.ISO8859_4, "iso-8859-4"},
-	"iso8859-4":           {charmap.ISO8859_4, "iso-8859-4"},
-	"iso88594":            {charmap.ISO8859_4, "iso-8859-4"},
-	"iso_8859-4":          {charmap.ISO8859_4, "iso-8859-4"},
-	"iso_8859-4:1988":     {charmap.ISO8859_4, "iso-8859-4"},
-	"l4":                  {charmap.ISO8859_4, "iso-8859-4"},
-	"latin4":              {charmap.ISO8859_4, "iso-8859-4"},
-	"csisolatincyrillic":  {charmap.ISO8859_5, "iso-8859-5"},
-	"cyrillic":            {charmap.ISO8859_5, "iso-8859-5"},
-	"iso-8859-5":          {charmap.ISO8859_5, "iso-8859-5"},
-	"iso-ir-144":          {charmap.ISO8859_5, "iso-8859-5"},
-	"iso8859-5":           {charmap.ISO8859_5, "iso-8859-5"},
-	"iso88595":            {charmap.ISO8859_5, "iso-8859-5"},
-	"iso_8859-5":          {charmap.ISO8859_5, "iso-8859-5"},
-	"iso_8859-5:1988":     {charmap.ISO8859_5, "iso-8859-5"},
-	"arabic":              {charmap.ISO8859_6, "iso-8859-6"},
-	"asmo-708":            {charmap.ISO8859_6, "iso-8859-6"},
-	"csiso88596e":         {charmap.ISO8859_6, "iso-8859-6"},
-	"csiso88596i":         {charmap.ISO8859_6, "iso-8859-6"},
-	"csisolatinarabic":    {charmap.ISO8859_6, "iso-8859-6"},
-	"ecma-114":            {charmap.ISO8859_6, "iso-8859-6"},
-	"iso-8859-6":          {charmap.ISO8859_6, "iso-8859-6"},
-	"iso-8859-6-e":        {charmap.ISO8859_6, "iso-8859-6"},
-	"iso-8859-6-i":        {charmap.ISO8859_6, "iso-8859-6"},
-	"iso-ir-127":          {charmap.ISO8859_6, "iso-8859-6"},
-	"iso8859-6":           {charmap.ISO8859_6, "iso-8859-6"},
-	"iso88596":            {charmap.ISO8859_6, "iso-8859-6"},
-	"iso_8859-6":          {charmap.ISO8859_6, "iso-8859-6"},
-	"iso_8859-6:1987":     {charmap.ISO8859_6, "iso-8859-6"},
-	"csisolatingreek":     {charmap.ISO8859_7, "iso-8859-7"},
-	"ecma-118":            {charmap.ISO8859_7, "iso-8859-7"},
-	"elot_928":            {charmap.ISO8859_7, "iso-8859-7"},
-	"greek":               {charmap.ISO8859_7, "iso-8859-7"},
-	"greek8":              {charmap.ISO8859_7, "iso-8859-7"},
-	"iso-8859-7":          {charmap.ISO8859_7, "iso-8859-7"},
-	"iso-ir-126":          {charmap.ISO8859_7, "iso-8859-7"},
-	"iso8859-7":           {charmap.ISO8859_7, "iso-8859-7"},
-	"iso88597":            {charmap.ISO8859_7, "iso-8859-7"},
-	"iso_8859-7":          {charmap.ISO8859_7, "iso-8859-7"},
-	"iso_8859-7:1987":     {charmap.ISO8859_7, "iso-8859-7"},
-	"sun_eu_greek":        {charmap.ISO8859_7, "iso-8859-7"},
-	"csiso88598e":         {charmap.ISO8859_8, "iso-8859-8"},
-	"csisolatinhebrew":    {charmap.ISO8859_8, "iso-8859-8"},
-	"hebrew":              {charmap.ISO8859_8, "iso-8859-8"},
-	"iso-8859-8":          {charmap.ISO8859_8, "iso-8859-8"},
-	"iso-8859-8-e":        {charmap.ISO8859_8, "iso-8859-8"},
-	"iso-ir-138":          {charmap.ISO8859_8, "iso-8859-8"},
-	"iso8859-8":           {charmap.ISO8859_8, "iso-8859-8"},
-	"iso88598":            {charmap.ISO8859_8, "iso-8859-8"},
-	"iso_8859-8":          {charmap.ISO8859_8, "iso-8859-8"},
-	"iso_8859-8:1988":     {charmap.ISO8859_8, "iso-8859-8"},
-	"visual":              {charmap.ISO8859_8, "iso-8859-8"},
-	"csiso88598i":         {charmap.ISO8859_8, "iso-8859-8-i"},
-	"iso-8859-8-i":        {charmap.ISO8859_8, "iso-8859-8-i"},
-	"logical":             {charmap.ISO8859_8, "iso-8859-8-i"},
-	"csisolatin6":         {charmap.ISO8859_10, "iso-8859-10"},
-	"iso-8859-10":         {charmap.ISO8859_10, "iso-8859-10"},
-	"iso-ir-157":          {charmap.ISO8859_10, "iso-8859-10"},
-	"iso8859-10":          {charmap.ISO8859_10, "iso-8859-10"},
-	"iso885910":           {charmap.ISO8859_10, "iso-8859-10"},
-	"l6":                  {charmap.ISO8859_10, "iso-8859-10"},
-	"latin6":              {charmap.ISO8859_10, "iso-8859-10"},
-	"iso-8859-13":         {charmap.ISO8859_13, "iso-8859-13"},
-	"iso8859-13":          {charmap.ISO8859_13, "iso-8859-13"},
-	"iso885913":           {charmap.ISO8859_13, "iso-8859-13"},
-	"iso-8859-14":         {charmap.ISO8859_14, "iso-8859-14"},
-	"iso8859-14":          {charmap.ISO8859_14, "iso-8859-14"},
-	"iso885914":           {charmap.ISO8859_14, "iso-8859-14"},
-	"csisolatin9":         {charmap.ISO8859_15, "iso-8859-15"},
-	"iso-8859-15":         {charmap.ISO8859_15, "iso-8859-15"},
-	"iso8859-15":          {charmap.ISO8859_15, "iso-8859-15"},
-	"iso885915":           {charmap.ISO8859_15, "iso-8859-15"},
-	"iso_8859-15":         {charmap.ISO8859_15, "iso-8859-15"},
-	"l9":                  {charmap.ISO8859_15, "iso-8859-15"},
-	"iso-8859-16":         {charmap.ISO8859_16, "iso-8859-16"},
-	"cskoi8r":             {charmap.KOI8R, "koi8-r"},
-	"koi":                 {charmap.KOI8R, "koi8-r"},
-	"koi8":                {charmap.KOI8R, "koi8-r"},
-	"koi8-r":              {charmap.KOI8R, "koi8-r"},
-	"koi8_r":              {charmap.KOI8R, "koi8-r"},
-	"koi8-u":              {charmap.KOI8U, "koi8-u"},
-	"csmacintosh":         {charmap.Macintosh, "macintosh"},
-	"mac":                 {charmap.Macintosh, "macintosh"},
-	"macintosh":           {charmap.Macintosh, "macintosh"},
-	"x-mac-roman":         {charmap.Macintosh, "macintosh"},
-	"dos-874":             {charmap.Windows874, "windows-874"},
-	"iso-8859-11":         {charmap.Windows874, "windows-874"},
-	"iso8859-11":          {charmap.Windows874, "windows-874"},
-	"iso885911":           {charmap.Windows874, "windows-874"},
-	"tis-620":             {charmap.Windows874, "windows-874"},
-	"windows-874":         {charmap.Windows874, "windows-874"},
-	"cp1250":              {charmap.Windows1250, "windows-1250"},
-	"windows-1250":        {charmap.Windows1250, "windows-1250"},
-	"x-cp1250":            {charmap.Windows1250, "windows-1250"},
-	"cp1251":              {charmap.Windows1251, "windows-1251"},
-	"windows-1251":        {charmap.Windows1251, "windows-1251"},
-	"x-cp1251":            {charmap.Windows1251, "windows-1251"},
-	"ansi_x3.4-1968":      {charmap.Windows1252, "windows-1252"},
-	"ascii":               {charmap.Windows1252, "windows-1252"},
-	"cp1252":              {charmap.Windows1252, "windows-1252"},
-	"cp819":               {charmap.Windows1252, "windows-1252"},
-	"csisolatin1":         {charmap.Windows1252, "windows-1252"},
-	"ibm819":              {charmap.Windows1252, "windows-1252"},
-	"iso-8859-1":          {charmap.Windows1252, "windows-1252"},
-	"iso-ir-100":          {charmap.Windows1252, "windows-1252"},
-	"iso8859-1":           {charmap.Windows1252, "windows-1252"},
-	"iso88591":            {charmap.Windows1252, "windows-1252"},
-	"iso_8859-1":          {charmap.Windows1252, "windows-1252"},
-	"iso_8859-1:1987":     {charmap.Windows1252, "windows-1252"},
-	"l1":                  {charmap.Windows1252, "windows-1252"},
-	"latin1":              {charmap.Windows1252, "windows-1252"},
-	"us-ascii":            {charmap.Windows1252, "windows-1252"},
-	"windows-1252":        {charmap.Windows1252, "windows-1252"},
-	"x-cp1252":            {charmap.Windows1252, "windows-1252"},
-	"cp1253":              {charmap.Windows1253, "windows-1253"},
-	"windows-1253":        {charmap.Windows1253, "windows-1253"},
-	"x-cp1253":            {charmap.Windows1253, "windows-1253"},
-	"cp1254":              {charmap.Windows1254, "windows-1254"},
-	"csisolatin5":         {charmap.Windows1254, "windows-1254"},
-	"iso-8859-9":          {charmap.Windows1254, "windows-1254"},
-	"iso-ir-148":          {charmap.Windows1254, "windows-1254"},
-	"iso8859-9":           {charmap.Windows1254, "windows-1254"},
-	"iso88599":            {charmap.Windows1254, "windows-1254"},
-	"iso_8859-9":          {charmap.Windows1254, "windows-1254"},
-	"iso_8859-9:1989":     {charmap.Windows1254, "windows-1254"},
-	"l5":                  {charmap.Windows1254, "windows-1254"},
-	"latin5":              {charmap.Windows1254, "windows-1254"},
-	"windows-1254":        {charmap.Windows1254, "windows-1254"},
-	"x-cp1254":            {charmap.Windows1254, "windows-1254"},
-	"cp1255":              {charmap.Windows1255, "windows-1255"},
-	"windows-1255":        {charmap.Windows1255, "windows-1255"},
-	"x-cp1255":            {charmap.Windows1255, "windows-1255"},
-	"cp1256":              {charmap.Windows1256, "windows-1256"},
-	"windows-1256":        {charmap.Windows1256, "windows-1256"},
-	"x-cp1256":            {charmap.Windows1256, "windows-1256"},
-	"cp1257":              {charmap.Windows1257, "windows-1257"},
-	"windows-1257":        {charmap.Windows1257, "windows-1257"},
-	"x-cp1257":            {charmap.Windows1257, "windows-1257"},
-	"cp1258":              {charmap.Windows1258, "windows-1258"},
-	"windows-1258":        {charmap.Windows1258, "windows-1258"},
-	"x-cp1258":            {charmap.Windows1258, "windows-1258"},
-	"x-mac-cyrillic":      {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
-	"x-mac-ukrainian":     {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
-	"chinese":             {simplifiedchinese.GBK, "gbk"},
-	"csgb2312":            {simplifiedchinese.GBK, "gbk"},
-	"csiso58gb231280":     {simplifiedchinese.GBK, "gbk"},
-	"gb2312":              {simplifiedchinese.GBK, "gbk"},
-	"gb_2312":             {simplifiedchinese.GBK, "gbk"},
-	"gb_2312-80":          {simplifiedchinese.GBK, "gbk"},
-	"gbk":                 {simplifiedchinese.GBK, "gbk"},
-	"iso-ir-58":           {simplifiedchinese.GBK, "gbk"},
-	"x-gbk":               {simplifiedchinese.GBK, "gbk"},
-	"gb18030":             {simplifiedchinese.GB18030, "gb18030"},
-	"hz-gb-2312":          {simplifiedchinese.HZGB2312, "hz-gb-2312"},
-	"big5":                {traditionalchinese.Big5, "big5"},
-	"big5-hkscs":          {traditionalchinese.Big5, "big5"},
-	"cn-big5":             {traditionalchinese.Big5, "big5"},
-	"csbig5":              {traditionalchinese.Big5, "big5"},
-	"x-x-big5":            {traditionalchinese.Big5, "big5"},
-	"cseucpkdfmtjapanese": {japanese.EUCJP, "euc-jp"},
-	"euc-jp":              {japanese.EUCJP, "euc-jp"},
-	"x-euc-jp":            {japanese.EUCJP, "euc-jp"},
-	"csiso2022jp":         {japanese.ISO2022JP, "iso-2022-jp"},
-	"iso-2022-jp":         {japanese.ISO2022JP, "iso-2022-jp"},
-	"csshiftjis":          {japanese.ShiftJIS, "shift_jis"},
-	"ms_kanji":            {japanese.ShiftJIS, "shift_jis"},
-	"shift-jis":           {japanese.ShiftJIS, "shift_jis"},
-	"shift_jis":           {japanese.ShiftJIS, "shift_jis"},
-	"sjis":                {japanese.ShiftJIS, "shift_jis"},
-	"windows-31j":         {japanese.ShiftJIS, "shift_jis"},
-	"x-sjis":              {japanese.ShiftJIS, "shift_jis"},
-	"cseuckr":             {korean.EUCKR, "euc-kr"},
-	"csksc56011987":       {korean.EUCKR, "euc-kr"},
-	"euc-kr":              {korean.EUCKR, "euc-kr"},
-	"iso-ir-149":          {korean.EUCKR, "euc-kr"},
-	"korean":              {korean.EUCKR, "euc-kr"},
-	"ks_c_5601-1987":      {korean.EUCKR, "euc-kr"},
-	"ks_c_5601-1989":      {korean.EUCKR, "euc-kr"},
-	"ksc5601":             {korean.EUCKR, "euc-kr"},
-	"ksc_5601":            {korean.EUCKR, "euc-kr"},
-	"windows-949":         {korean.EUCKR, "euc-kr"},
-	"csiso2022kr":         {encoding.Replacement, "replacement"},
-	"iso-2022-kr":         {encoding.Replacement, "replacement"},
-	"iso-2022-cn":         {encoding.Replacement, "replacement"},
-	"iso-2022-cn-ext":     {encoding.Replacement, "replacement"},
-	"utf-16be":            {unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM), "utf-16be"},
-	"utf-16":              {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
-	"utf-16le":            {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
-	"x-user-defined":      {charmap.XUserDefined, "x-user-defined"},
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/const.go b/Godeps/_workspace/src/golang.org/x/net/html/const.go
deleted file mode 100644
index 52f651ff6d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/const.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-// Section 12.2.3.2 of the HTML5 specification says "The following elements
-// have varying levels of special parsing rules".
-// https://html.spec.whatwg.org/multipage/syntax.html#the-stack-of-open-elements
-var isSpecialElementMap = map[string]bool{
-	"address":    true,
-	"applet":     true,
-	"area":       true,
-	"article":    true,
-	"aside":      true,
-	"base":       true,
-	"basefont":   true,
-	"bgsound":    true,
-	"blockquote": true,
-	"body":       true,
-	"br":         true,
-	"button":     true,
-	"caption":    true,
-	"center":     true,
-	"col":        true,
-	"colgroup":   true,
-	"dd":         true,
-	"details":    true,
-	"dir":        true,
-	"div":        true,
-	"dl":         true,
-	"dt":         true,
-	"embed":      true,
-	"fieldset":   true,
-	"figcaption": true,
-	"figure":     true,
-	"footer":     true,
-	"form":       true,
-	"frame":      true,
-	"frameset":   true,
-	"h1":         true,
-	"h2":         true,
-	"h3":         true,
-	"h4":         true,
-	"h5":         true,
-	"h6":         true,
-	"head":       true,
-	"header":     true,
-	"hgroup":     true,
-	"hr":         true,
-	"html":       true,
-	"iframe":     true,
-	"img":        true,
-	"input":      true,
-	"isindex":    true,
-	"li":         true,
-	"link":       true,
-	"listing":    true,
-	"marquee":    true,
-	"menu":       true,
-	"meta":       true,
-	"nav":        true,
-	"noembed":    true,
-	"noframes":   true,
-	"noscript":   true,
-	"object":     true,
-	"ol":         true,
-	"p":          true,
-	"param":      true,
-	"plaintext":  true,
-	"pre":        true,
-	"script":     true,
-	"section":    true,
-	"select":     true,
-	"source":     true,
-	"style":      true,
-	"summary":    true,
-	"table":      true,
-	"tbody":      true,
-	"td":         true,
-	"template":   true,
-	"textarea":   true,
-	"tfoot":      true,
-	"th":         true,
-	"thead":      true,
-	"title":      true,
-	"tr":         true,
-	"track":      true,
-	"ul":         true,
-	"wbr":        true,
-	"xmp":        true,
-}
-
-func isSpecialElement(element *Node) bool {
-	switch element.Namespace {
-	case "", "html":
-		return isSpecialElementMap[element.Data]
-	case "svg":
-		return element.Data == "foreignObject"
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/doc.go b/Godeps/_workspace/src/golang.org/x/net/html/doc.go
deleted file mode 100644
index b453fe1e4c..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/doc.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package html implements an HTML5-compliant tokenizer and parser.
-
-Tokenization is done by creating a Tokenizer for an io.Reader r. It is the
-caller's responsibility to ensure that r provides UTF-8 encoded HTML.
-
-	z := html.NewTokenizer(r)
-
-Given a Tokenizer z, the HTML is tokenized by repeatedly calling z.Next(),
-which parses the next token and returns its type, or an error:
-
-	for {
-		tt := z.Next()
-		if tt == html.ErrorToken {
-			// ...
-			return ...
-		}
-		// Process the current token.
-	}
-
-There are two APIs for retrieving the current token. The high-level API is to
-call Token; the low-level API is to call Text or TagName / TagAttr. Both APIs
-allow optionally calling Raw after Next but before Token, Text, TagName, or
-TagAttr. In EBNF notation, the valid call sequence per token is:
-
-	Next {Raw} [ Token | Text | TagName {TagAttr} ]
-
-Token returns an independent data structure that completely describes a token.
-Entities (such as "&lt;") are unescaped, tag names and attribute keys are
-lower-cased, and attributes are collected into a []Attribute. For example:
-
-	for {
-		if z.Next() == html.ErrorToken {
-			// Returning io.EOF indicates success.
-			return z.Err()
-		}
-		emitToken(z.Token())
-	}
-
-The low-level API performs fewer allocations and copies, but the contents of
-the []byte values returned by Text, TagName and TagAttr may change on the next
-call to Next. For example, to extract an HTML page's anchor text:
-
-	depth := 0
-	for {
-		tt := z.Next()
-		switch tt {
-		case ErrorToken:
-			return z.Err()
-		case TextToken:
-			if depth > 0 {
-				// emitBytes should copy the []byte it receives,
-				// if it doesn't process it immediately.
-				emitBytes(z.Text())
-			}
-		case StartTagToken, EndTagToken:
-			tn, _ := z.TagName()
-			if len(tn) == 1 && tn[0] == 'a' {
-				if tt == StartTagToken {
-					depth++
-				} else {
-					depth--
-				}
-			}
-		}
-	}
-
-Parsing is done by calling Parse with an io.Reader, which returns the root of
-the parse tree (the document element) as a *Node. It is the caller's
-responsibility to ensure that the Reader provides UTF-8 encoded HTML. For
-example, to process each anchor node in depth-first order:
-
-	doc, err := html.Parse(r)
-	if err != nil {
-		// ...
-	}
-	var f func(*html.Node)
-	f = func(n *html.Node) {
-		if n.Type == html.ElementNode && n.Data == "a" {
-			// Do something with n...
-		}
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			f(c)
-		}
-	}
-	f(doc)
-
-The relevant specifications include:
-https://html.spec.whatwg.org/multipage/syntax.html and
-https://html.spec.whatwg.org/multipage/syntax.html#tokenization
-*/
-package html
-
-// The tokenization algorithm implemented by this package is not a line-by-line
-// transliteration of the relatively verbose state-machine in the WHATWG
-// specification. A more direct approach is used instead, where the program
-// counter implies the state, such as whether it is tokenizing a tag or a text
-// node. Specification compliance is verified by checking expected and actual
-// outputs over a test suite rather than aiming for algorithmic fidelity.
-
-// TODO(nigeltao): Does a DOM API belong in this package or a separate one?
-// TODO(nigeltao): How does parsing interact with a JavaScript engine?
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/doctype.go b/Godeps/_workspace/src/golang.org/x/net/html/doctype.go
deleted file mode 100644
index c484e5a94f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/doctype.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"strings"
-)
-
-// parseDoctype parses the data from a DoctypeToken into a name,
-// public identifier, and system identifier. It returns a Node whose Type
-// is DoctypeNode, whose Data is the name, and which has attributes
-// named "system" and "public" for the two identifiers if they were present.
-// quirks is whether the document should be parsed in "quirks mode".
-func parseDoctype(s string) (n *Node, quirks bool) {
-	n = &Node{Type: DoctypeNode}
-
-	// Find the name.
-	space := strings.IndexAny(s, whitespace)
-	if space == -1 {
-		space = len(s)
-	}
-	n.Data = s[:space]
-	// The comparison to "html" is case-sensitive.
-	if n.Data != "html" {
-		quirks = true
-	}
-	n.Data = strings.ToLower(n.Data)
-	s = strings.TrimLeft(s[space:], whitespace)
-
-	if len(s) < 6 {
-		// It can't start with "PUBLIC" or "SYSTEM".
-		// Ignore the rest of the string.
-		return n, quirks || s != ""
-	}
-
-	key := strings.ToLower(s[:6])
-	s = s[6:]
-	for key == "public" || key == "system" {
-		s = strings.TrimLeft(s, whitespace)
-		if s == "" {
-			break
-		}
-		quote := s[0]
-		if quote != '"' && quote != '\'' {
-			break
-		}
-		s = s[1:]
-		q := strings.IndexRune(s, rune(quote))
-		var id string
-		if q == -1 {
-			id = s
-			s = ""
-		} else {
-			id = s[:q]
-			s = s[q+1:]
-		}
-		n.Attr = append(n.Attr, Attribute{Key: key, Val: id})
-		if key == "public" {
-			key = "system"
-		} else {
-			key = ""
-		}
-	}
-
-	if key != "" || s != "" {
-		quirks = true
-	} else if len(n.Attr) > 0 {
-		if n.Attr[0].Key == "public" {
-			public := strings.ToLower(n.Attr[0].Val)
-			switch public {
-			case "-//w3o//dtd w3 html strict 3.0//en//", "-/w3d/dtd html 4.0 transitional/en", "html":
-				quirks = true
-			default:
-				for _, q := range quirkyIDs {
-					if strings.HasPrefix(public, q) {
-						quirks = true
-						break
-					}
-				}
-			}
-			// The following two public IDs only cause quirks mode if there is no system ID.
-			if len(n.Attr) == 1 && (strings.HasPrefix(public, "-//w3c//dtd html 4.01 frameset//") ||
-				strings.HasPrefix(public, "-//w3c//dtd html 4.01 transitional//")) {
-				quirks = true
-			}
-		}
-		if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" &&
-			strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" {
-			quirks = true
-		}
-	}
-
-	return n, quirks
-}
-
-// quirkyIDs is a list of public doctype identifiers that cause a document
-// to be interpreted in quirks mode. The identifiers should be in lower case.
-var quirkyIDs = []string{
-	"+//silmaril//dtd html pro v0r11 19970101//",
-	"-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
-	"-//as//dtd html 3.0 aswedit + extensions//",
-	"-//ietf//dtd html 2.0 level 1//",
-	"-//ietf//dtd html 2.0 level 2//",
-	"-//ietf//dtd html 2.0 strict level 1//",
-	"-//ietf//dtd html 2.0 strict level 2//",
-	"-//ietf//dtd html 2.0 strict//",
-	"-//ietf//dtd html 2.0//",
-	"-//ietf//dtd html 2.1e//",
-	"-//ietf//dtd html 3.0//",
-	"-//ietf//dtd html 3.2 final//",
-	"-//ietf//dtd html 3.2//",
-	"-//ietf//dtd html 3//",
-	"-//ietf//dtd html level 0//",
-	"-//ietf//dtd html level 1//",
-	"-//ietf//dtd html level 2//",
-	"-//ietf//dtd html level 3//",
-	"-//ietf//dtd html strict level 0//",
-	"-//ietf//dtd html strict level 1//",
-	"-//ietf//dtd html strict level 2//",
-	"-//ietf//dtd html strict level 3//",
-	"-//ietf//dtd html strict//",
-	"-//ietf//dtd html//",
-	"-//metrius//dtd metrius presentational//",
-	"-//microsoft//dtd internet explorer 2.0 html strict//",
-	"-//microsoft//dtd internet explorer 2.0 html//",
-	"-//microsoft//dtd internet explorer 2.0 tables//",
-	"-//microsoft//dtd internet explorer 3.0 html strict//",
-	"-//microsoft//dtd internet explorer 3.0 html//",
-	"-//microsoft//dtd internet explorer 3.0 tables//",
-	"-//netscape comm. corp.//dtd html//",
-	"-//netscape comm. corp.//dtd strict html//",
-	"-//o'reilly and associates//dtd html 2.0//",
-	"-//o'reilly and associates//dtd html extended 1.0//",
-	"-//o'reilly and associates//dtd html extended relaxed 1.0//",
-	"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
-	"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
-	"-//spyglass//dtd html 2.0 extended//",
-	"-//sq//dtd html 2.0 hotmetal + extensions//",
-	"-//sun microsystems corp.//dtd hotjava html//",
-	"-//sun microsystems corp.//dtd hotjava strict html//",
-	"-//w3c//dtd html 3 1995-03-24//",
-	"-//w3c//dtd html 3.2 draft//",
-	"-//w3c//dtd html 3.2 final//",
-	"-//w3c//dtd html 3.2//",
-	"-//w3c//dtd html 3.2s draft//",
-	"-//w3c//dtd html 4.0 frameset//",
-	"-//w3c//dtd html 4.0 transitional//",
-	"-//w3c//dtd html experimental 19960712//",
-	"-//w3c//dtd html experimental 970421//",
-	"-//w3c//dtd w3 html//",
-	"-//w3o//dtd w3 html 3.0//",
-	"-//webtechs//dtd mozilla html 2.0//",
-	"-//webtechs//dtd mozilla html//",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/entity.go b/Godeps/_workspace/src/golang.org/x/net/html/entity.go
deleted file mode 100644
index a50c04c60e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/entity.go
+++ /dev/null
@@ -1,2253 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-// All entities that do not end with ';' are 6 or fewer bytes long.
-const longestEntityWithoutSemicolon = 6
-
-// entity is a map from HTML entity names to their values. The semicolon matters:
-// https://html.spec.whatwg.org/multipage/syntax.html#named-character-references
-// lists both "amp" and "amp;" as two separate entries.
-//
-// Note that the HTML5 list is larger than the HTML4 list at
-// http://www.w3.org/TR/html4/sgml/entities.html
-var entity = map[string]rune{
-	"AElig;":                           '\U000000C6',
-	"AMP;":                             '\U00000026',
-	"Aacute;":                          '\U000000C1',
-	"Abreve;":                          '\U00000102',
-	"Acirc;":                           '\U000000C2',
-	"Acy;":                             '\U00000410',
-	"Afr;":                             '\U0001D504',
-	"Agrave;":                          '\U000000C0',
-	"Alpha;":                           '\U00000391',
-	"Amacr;":                           '\U00000100',
-	"And;":                             '\U00002A53',
-	"Aogon;":                           '\U00000104',
-	"Aopf;":                            '\U0001D538',
-	"ApplyFunction;":                   '\U00002061',
-	"Aring;":                           '\U000000C5',
-	"Ascr;":                            '\U0001D49C',
-	"Assign;":                          '\U00002254',
-	"Atilde;":                          '\U000000C3',
-	"Auml;":                            '\U000000C4',
-	"Backslash;":                       '\U00002216',
-	"Barv;":                            '\U00002AE7',
-	"Barwed;":                          '\U00002306',
-	"Bcy;":                             '\U00000411',
-	"Because;":                         '\U00002235',
-	"Bernoullis;":                      '\U0000212C',
-	"Beta;":                            '\U00000392',
-	"Bfr;":                             '\U0001D505',
-	"Bopf;":                            '\U0001D539',
-	"Breve;":                           '\U000002D8',
-	"Bscr;":                            '\U0000212C',
-	"Bumpeq;":                          '\U0000224E',
-	"CHcy;":                            '\U00000427',
-	"COPY;":                            '\U000000A9',
-	"Cacute;":                          '\U00000106',
-	"Cap;":                             '\U000022D2',
-	"CapitalDifferentialD;":            '\U00002145',
-	"Cayleys;":                         '\U0000212D',
-	"Ccaron;":                          '\U0000010C',
-	"Ccedil;":                          '\U000000C7',
-	"Ccirc;":                           '\U00000108',
-	"Cconint;":                         '\U00002230',
-	"Cdot;":                            '\U0000010A',
-	"Cedilla;":                         '\U000000B8',
-	"CenterDot;":                       '\U000000B7',
-	"Cfr;":                             '\U0000212D',
-	"Chi;":                             '\U000003A7',
-	"CircleDot;":                       '\U00002299',
-	"CircleMinus;":                     '\U00002296',
-	"CirclePlus;":                      '\U00002295',
-	"CircleTimes;":                     '\U00002297',
-	"ClockwiseContourIntegral;":        '\U00002232',
-	"CloseCurlyDoubleQuote;":           '\U0000201D',
-	"CloseCurlyQuote;":                 '\U00002019',
-	"Colon;":                           '\U00002237',
-	"Colone;":                          '\U00002A74',
-	"Congruent;":                       '\U00002261',
-	"Conint;":                          '\U0000222F',
-	"ContourIntegral;":                 '\U0000222E',
-	"Copf;":                            '\U00002102',
-	"Coproduct;":                       '\U00002210',
-	"CounterClockwiseContourIntegral;": '\U00002233',
-	"Cross;":                    '\U00002A2F',
-	"Cscr;":                     '\U0001D49E',
-	"Cup;":                      '\U000022D3',
-	"CupCap;":                   '\U0000224D',
-	"DD;":                       '\U00002145',
-	"DDotrahd;":                 '\U00002911',
-	"DJcy;":                     '\U00000402',
-	"DScy;":                     '\U00000405',
-	"DZcy;":                     '\U0000040F',
-	"Dagger;":                   '\U00002021',
-	"Darr;":                     '\U000021A1',
-	"Dashv;":                    '\U00002AE4',
-	"Dcaron;":                   '\U0000010E',
-	"Dcy;":                      '\U00000414',
-	"Del;":                      '\U00002207',
-	"Delta;":                    '\U00000394',
-	"Dfr;":                      '\U0001D507',
-	"DiacriticalAcute;":         '\U000000B4',
-	"DiacriticalDot;":           '\U000002D9',
-	"DiacriticalDoubleAcute;":   '\U000002DD',
-	"DiacriticalGrave;":         '\U00000060',
-	"DiacriticalTilde;":         '\U000002DC',
-	"Diamond;":                  '\U000022C4',
-	"DifferentialD;":            '\U00002146',
-	"Dopf;":                     '\U0001D53B',
-	"Dot;":                      '\U000000A8',
-	"DotDot;":                   '\U000020DC',
-	"DotEqual;":                 '\U00002250',
-	"DoubleContourIntegral;":    '\U0000222F',
-	"DoubleDot;":                '\U000000A8',
-	"DoubleDownArrow;":          '\U000021D3',
-	"DoubleLeftArrow;":          '\U000021D0',
-	"DoubleLeftRightArrow;":     '\U000021D4',
-	"DoubleLeftTee;":            '\U00002AE4',
-	"DoubleLongLeftArrow;":      '\U000027F8',
-	"DoubleLongLeftRightArrow;": '\U000027FA',
-	"DoubleLongRightArrow;":     '\U000027F9',
-	"DoubleRightArrow;":         '\U000021D2',
-	"DoubleRightTee;":           '\U000022A8',
-	"DoubleUpArrow;":            '\U000021D1',
-	"DoubleUpDownArrow;":        '\U000021D5',
-	"DoubleVerticalBar;":        '\U00002225',
-	"DownArrow;":                '\U00002193',
-	"DownArrowBar;":             '\U00002913',
-	"DownArrowUpArrow;":         '\U000021F5',
-	"DownBreve;":                '\U00000311',
-	"DownLeftRightVector;":      '\U00002950',
-	"DownLeftTeeVector;":        '\U0000295E',
-	"DownLeftVector;":           '\U000021BD',
-	"DownLeftVectorBar;":        '\U00002956',
-	"DownRightTeeVector;":       '\U0000295F',
-	"DownRightVector;":          '\U000021C1',
-	"DownRightVectorBar;":       '\U00002957',
-	"DownTee;":                  '\U000022A4',
-	"DownTeeArrow;":             '\U000021A7',
-	"Downarrow;":                '\U000021D3',
-	"Dscr;":                     '\U0001D49F',
-	"Dstrok;":                   '\U00000110',
-	"ENG;":                      '\U0000014A',
-	"ETH;":                      '\U000000D0',
-	"Eacute;":                   '\U000000C9',
-	"Ecaron;":                   '\U0000011A',
-	"Ecirc;":                    '\U000000CA',
-	"Ecy;":                      '\U0000042D',
-	"Edot;":                     '\U00000116',
-	"Efr;":                      '\U0001D508',
-	"Egrave;":                   '\U000000C8',
-	"Element;":                  '\U00002208',
-	"Emacr;":                    '\U00000112',
-	"EmptySmallSquare;":         '\U000025FB',
-	"EmptyVerySmallSquare;":     '\U000025AB',
-	"Eogon;":                    '\U00000118',
-	"Eopf;":                     '\U0001D53C',
-	"Epsilon;":                  '\U00000395',
-	"Equal;":                    '\U00002A75',
-	"EqualTilde;":               '\U00002242',
-	"Equilibrium;":              '\U000021CC',
-	"Escr;":                     '\U00002130',
-	"Esim;":                     '\U00002A73',
-	"Eta;":                      '\U00000397',
-	"Euml;":                     '\U000000CB',
-	"Exists;":                   '\U00002203',
-	"ExponentialE;":             '\U00002147',
-	"Fcy;":                      '\U00000424',
-	"Ffr;":                      '\U0001D509',
-	"FilledSmallSquare;":        '\U000025FC',
-	"FilledVerySmallSquare;":    '\U000025AA',
-	"Fopf;":                     '\U0001D53D',
-	"ForAll;":                   '\U00002200',
-	"Fouriertrf;":               '\U00002131',
-	"Fscr;":                     '\U00002131',
-	"GJcy;":                     '\U00000403',
-	"GT;":                       '\U0000003E',
-	"Gamma;":                    '\U00000393',
-	"Gammad;":                   '\U000003DC',
-	"Gbreve;":                   '\U0000011E',
-	"Gcedil;":                   '\U00000122',
-	"Gcirc;":                    '\U0000011C',
-	"Gcy;":                      '\U00000413',
-	"Gdot;":                     '\U00000120',
-	"Gfr;":                      '\U0001D50A',
-	"Gg;":                       '\U000022D9',
-	"Gopf;":                     '\U0001D53E',
-	"GreaterEqual;":             '\U00002265',
-	"GreaterEqualLess;":         '\U000022DB',
-	"GreaterFullEqual;":         '\U00002267',
-	"GreaterGreater;":           '\U00002AA2',
-	"GreaterLess;":              '\U00002277',
-	"GreaterSlantEqual;":        '\U00002A7E',
-	"GreaterTilde;":             '\U00002273',
-	"Gscr;":                     '\U0001D4A2',
-	"Gt;":                       '\U0000226B',
-	"HARDcy;":                   '\U0000042A',
-	"Hacek;":                    '\U000002C7',
-	"Hat;":                      '\U0000005E',
-	"Hcirc;":                    '\U00000124',
-	"Hfr;":                      '\U0000210C',
-	"HilbertSpace;":             '\U0000210B',
-	"Hopf;":                     '\U0000210D',
-	"HorizontalLine;":           '\U00002500',
-	"Hscr;":                     '\U0000210B',
-	"Hstrok;":                   '\U00000126',
-	"HumpDownHump;":             '\U0000224E',
-	"HumpEqual;":                '\U0000224F',
-	"IEcy;":                     '\U00000415',
-	"IJlig;":                    '\U00000132',
-	"IOcy;":                     '\U00000401',
-	"Iacute;":                   '\U000000CD',
-	"Icirc;":                    '\U000000CE',
-	"Icy;":                      '\U00000418',
-	"Idot;":                     '\U00000130',
-	"Ifr;":                      '\U00002111',
-	"Igrave;":                   '\U000000CC',
-	"Im;":                       '\U00002111',
-	"Imacr;":                    '\U0000012A',
-	"ImaginaryI;":               '\U00002148',
-	"Implies;":                  '\U000021D2',
-	"Int;":                      '\U0000222C',
-	"Integral;":                 '\U0000222B',
-	"Intersection;":             '\U000022C2',
-	"InvisibleComma;":           '\U00002063',
-	"InvisibleTimes;":           '\U00002062',
-	"Iogon;":                    '\U0000012E',
-	"Iopf;":                     '\U0001D540',
-	"Iota;":                     '\U00000399',
-	"Iscr;":                     '\U00002110',
-	"Itilde;":                   '\U00000128',
-	"Iukcy;":                    '\U00000406',
-	"Iuml;":                     '\U000000CF',
-	"Jcirc;":                    '\U00000134',
-	"Jcy;":                      '\U00000419',
-	"Jfr;":                      '\U0001D50D',
-	"Jopf;":                     '\U0001D541',
-	"Jscr;":                     '\U0001D4A5',
-	"Jsercy;":                   '\U00000408',
-	"Jukcy;":                    '\U00000404',
-	"KHcy;":                     '\U00000425',
-	"KJcy;":                     '\U0000040C',
-	"Kappa;":                    '\U0000039A',
-	"Kcedil;":                   '\U00000136',
-	"Kcy;":                      '\U0000041A',
-	"Kfr;":                      '\U0001D50E',
-	"Kopf;":                     '\U0001D542',
-	"Kscr;":                     '\U0001D4A6',
-	"LJcy;":                     '\U00000409',
-	"LT;":                       '\U0000003C',
-	"Lacute;":                   '\U00000139',
-	"Lambda;":                   '\U0000039B',
-	"Lang;":                     '\U000027EA',
-	"Laplacetrf;":               '\U00002112',
-	"Larr;":                     '\U0000219E',
-	"Lcaron;":                   '\U0000013D',
-	"Lcedil;":                   '\U0000013B',
-	"Lcy;":                      '\U0000041B',
-	"LeftAngleBracket;":         '\U000027E8',
-	"LeftArrow;":                '\U00002190',
-	"LeftArrowBar;":             '\U000021E4',
-	"LeftArrowRightArrow;":      '\U000021C6',
-	"LeftCeiling;":              '\U00002308',
-	"LeftDoubleBracket;":        '\U000027E6',
-	"LeftDownTeeVector;":        '\U00002961',
-	"LeftDownVector;":           '\U000021C3',
-	"LeftDownVectorBar;":        '\U00002959',
-	"LeftFloor;":                '\U0000230A',
-	"LeftRightArrow;":           '\U00002194',
-	"LeftRightVector;":          '\U0000294E',
-	"LeftTee;":                  '\U000022A3',
-	"LeftTeeArrow;":             '\U000021A4',
-	"LeftTeeVector;":            '\U0000295A',
-	"LeftTriangle;":             '\U000022B2',
-	"LeftTriangleBar;":          '\U000029CF',
-	"LeftTriangleEqual;":        '\U000022B4',
-	"LeftUpDownVector;":         '\U00002951',
-	"LeftUpTeeVector;":          '\U00002960',
-	"LeftUpVector;":             '\U000021BF',
-	"LeftUpVectorBar;":          '\U00002958',
-	"LeftVector;":               '\U000021BC',
-	"LeftVectorBar;":            '\U00002952',
-	"Leftarrow;":                '\U000021D0',
-	"Leftrightarrow;":           '\U000021D4',
-	"LessEqualGreater;":         '\U000022DA',
-	"LessFullEqual;":            '\U00002266',
-	"LessGreater;":              '\U00002276',
-	"LessLess;":                 '\U00002AA1',
-	"LessSlantEqual;":           '\U00002A7D',
-	"LessTilde;":                '\U00002272',
-	"Lfr;":                      '\U0001D50F',
-	"Ll;":                       '\U000022D8',
-	"Lleftarrow;":               '\U000021DA',
-	"Lmidot;":                   '\U0000013F',
-	"LongLeftArrow;":            '\U000027F5',
-	"LongLeftRightArrow;":       '\U000027F7',
-	"LongRightArrow;":           '\U000027F6',
-	"Longleftarrow;":            '\U000027F8',
-	"Longleftrightarrow;":       '\U000027FA',
-	"Longrightarrow;":           '\U000027F9',
-	"Lopf;":                     '\U0001D543',
-	"LowerLeftArrow;":           '\U00002199',
-	"LowerRightArrow;":          '\U00002198',
-	"Lscr;":                     '\U00002112',
-	"Lsh;":                      '\U000021B0',
-	"Lstrok;":                   '\U00000141',
-	"Lt;":                       '\U0000226A',
-	"Map;":                      '\U00002905',
-	"Mcy;":                      '\U0000041C',
-	"MediumSpace;":              '\U0000205F',
-	"Mellintrf;":                '\U00002133',
-	"Mfr;":                      '\U0001D510',
-	"MinusPlus;":                '\U00002213',
-	"Mopf;":                     '\U0001D544',
-	"Mscr;":                     '\U00002133',
-	"Mu;":                       '\U0000039C',
-	"NJcy;":                     '\U0000040A',
-	"Nacute;":                   '\U00000143',
-	"Ncaron;":                   '\U00000147',
-	"Ncedil;":                   '\U00000145',
-	"Ncy;":                      '\U0000041D',
-	"NegativeMediumSpace;":      '\U0000200B',
-	"NegativeThickSpace;":       '\U0000200B',
-	"NegativeThinSpace;":        '\U0000200B',
-	"NegativeVeryThinSpace;":    '\U0000200B',
-	"NestedGreaterGreater;":     '\U0000226B',
-	"NestedLessLess;":           '\U0000226A',
-	"NewLine;":                  '\U0000000A',
-	"Nfr;":                      '\U0001D511',
-	"NoBreak;":                  '\U00002060',
-	"NonBreakingSpace;":         '\U000000A0',
-	"Nopf;":                     '\U00002115',
-	"Not;":                      '\U00002AEC',
-	"NotCongruent;":             '\U00002262',
-	"NotCupCap;":                '\U0000226D',
-	"NotDoubleVerticalBar;":     '\U00002226',
-	"NotElement;":               '\U00002209',
-	"NotEqual;":                 '\U00002260',
-	"NotExists;":                '\U00002204',
-	"NotGreater;":               '\U0000226F',
-	"NotGreaterEqual;":          '\U00002271',
-	"NotGreaterLess;":           '\U00002279',
-	"NotGreaterTilde;":          '\U00002275',
-	"NotLeftTriangle;":          '\U000022EA',
-	"NotLeftTriangleEqual;":     '\U000022EC',
-	"NotLess;":                  '\U0000226E',
-	"NotLessEqual;":             '\U00002270',
-	"NotLessGreater;":           '\U00002278',
-	"NotLessTilde;":             '\U00002274',
-	"NotPrecedes;":              '\U00002280',
-	"NotPrecedesSlantEqual;":    '\U000022E0',
-	"NotReverseElement;":        '\U0000220C',
-	"NotRightTriangle;":         '\U000022EB',
-	"NotRightTriangleEqual;":    '\U000022ED',
-	"NotSquareSubsetEqual;":     '\U000022E2',
-	"NotSquareSupersetEqual;":   '\U000022E3',
-	"NotSubsetEqual;":           '\U00002288',
-	"NotSucceeds;":              '\U00002281',
-	"NotSucceedsSlantEqual;":    '\U000022E1',
-	"NotSupersetEqual;":         '\U00002289',
-	"NotTilde;":                 '\U00002241',
-	"NotTildeEqual;":            '\U00002244',
-	"NotTildeFullEqual;":        '\U00002247',
-	"NotTildeTilde;":            '\U00002249',
-	"NotVerticalBar;":           '\U00002224',
-	"Nscr;":                     '\U0001D4A9',
-	"Ntilde;":                   '\U000000D1',
-	"Nu;":                       '\U0000039D',
-	"OElig;":                    '\U00000152',
-	"Oacute;":                   '\U000000D3',
-	"Ocirc;":                    '\U000000D4',
-	"Ocy;":                      '\U0000041E',
-	"Odblac;":                   '\U00000150',
-	"Ofr;":                      '\U0001D512',
-	"Ograve;":                   '\U000000D2',
-	"Omacr;":                    '\U0000014C',
-	"Omega;":                    '\U000003A9',
-	"Omicron;":                  '\U0000039F',
-	"Oopf;":                     '\U0001D546',
-	"OpenCurlyDoubleQuote;":     '\U0000201C',
-	"OpenCurlyQuote;":           '\U00002018',
-	"Or;":                       '\U00002A54',
-	"Oscr;":                     '\U0001D4AA',
-	"Oslash;":                   '\U000000D8',
-	"Otilde;":                   '\U000000D5',
-	"Otimes;":                   '\U00002A37',
-	"Ouml;":                     '\U000000D6',
-	"OverBar;":                  '\U0000203E',
-	"OverBrace;":                '\U000023DE',
-	"OverBracket;":              '\U000023B4',
-	"OverParenthesis;":          '\U000023DC',
-	"PartialD;":                 '\U00002202',
-	"Pcy;":                      '\U0000041F',
-	"Pfr;":                      '\U0001D513',
-	"Phi;":                      '\U000003A6',
-	"Pi;":                       '\U000003A0',
-	"PlusMinus;":                '\U000000B1',
-	"Poincareplane;":            '\U0000210C',
-	"Popf;":                     '\U00002119',
-	"Pr;":                       '\U00002ABB',
-	"Precedes;":                 '\U0000227A',
-	"PrecedesEqual;":            '\U00002AAF',
-	"PrecedesSlantEqual;":       '\U0000227C',
-	"PrecedesTilde;":            '\U0000227E',
-	"Prime;":                    '\U00002033',
-	"Product;":                  '\U0000220F',
-	"Proportion;":               '\U00002237',
-	"Proportional;":             '\U0000221D',
-	"Pscr;":                     '\U0001D4AB',
-	"Psi;":                      '\U000003A8',
-	"QUOT;":                     '\U00000022',
-	"Qfr;":                      '\U0001D514',
-	"Qopf;":                     '\U0000211A',
-	"Qscr;":                     '\U0001D4AC',
-	"RBarr;":                    '\U00002910',
-	"REG;":                      '\U000000AE',
-	"Racute;":                   '\U00000154',
-	"Rang;":                     '\U000027EB',
-	"Rarr;":                     '\U000021A0',
-	"Rarrtl;":                   '\U00002916',
-	"Rcaron;":                   '\U00000158',
-	"Rcedil;":                   '\U00000156',
-	"Rcy;":                      '\U00000420',
-	"Re;":                       '\U0000211C',
-	"ReverseElement;":           '\U0000220B',
-	"ReverseEquilibrium;":       '\U000021CB',
-	"ReverseUpEquilibrium;":     '\U0000296F',
-	"Rfr;":                      '\U0000211C',
-	"Rho;":                      '\U000003A1',
-	"RightAngleBracket;":        '\U000027E9',
-	"RightArrow;":               '\U00002192',
-	"RightArrowBar;":            '\U000021E5',
-	"RightArrowLeftArrow;":      '\U000021C4',
-	"RightCeiling;":             '\U00002309',
-	"RightDoubleBracket;":       '\U000027E7',
-	"RightDownTeeVector;":       '\U0000295D',
-	"RightDownVector;":          '\U000021C2',
-	"RightDownVectorBar;":       '\U00002955',
-	"RightFloor;":               '\U0000230B',
-	"RightTee;":                 '\U000022A2',
-	"RightTeeArrow;":            '\U000021A6',
-	"RightTeeVector;":           '\U0000295B',
-	"RightTriangle;":            '\U000022B3',
-	"RightTriangleBar;":         '\U000029D0',
-	"RightTriangleEqual;":       '\U000022B5',
-	"RightUpDownVector;":        '\U0000294F',
-	"RightUpTeeVector;":         '\U0000295C',
-	"RightUpVector;":            '\U000021BE',
-	"RightUpVectorBar;":         '\U00002954',
-	"RightVector;":              '\U000021C0',
-	"RightVectorBar;":           '\U00002953',
-	"Rightarrow;":               '\U000021D2',
-	"Ropf;":                     '\U0000211D',
-	"RoundImplies;":             '\U00002970',
-	"Rrightarrow;":              '\U000021DB',
-	"Rscr;":                     '\U0000211B',
-	"Rsh;":                      '\U000021B1',
-	"RuleDelayed;":              '\U000029F4',
-	"SHCHcy;":                   '\U00000429',
-	"SHcy;":                     '\U00000428',
-	"SOFTcy;":                   '\U0000042C',
-	"Sacute;":                   '\U0000015A',
-	"Sc;":                       '\U00002ABC',
-	"Scaron;":                   '\U00000160',
-	"Scedil;":                   '\U0000015E',
-	"Scirc;":                    '\U0000015C',
-	"Scy;":                      '\U00000421',
-	"Sfr;":                      '\U0001D516',
-	"ShortDownArrow;":           '\U00002193',
-	"ShortLeftArrow;":           '\U00002190',
-	"ShortRightArrow;":          '\U00002192',
-	"ShortUpArrow;":             '\U00002191',
-	"Sigma;":                    '\U000003A3',
-	"SmallCircle;":              '\U00002218',
-	"Sopf;":                     '\U0001D54A',
-	"Sqrt;":                     '\U0000221A',
-	"Square;":                   '\U000025A1',
-	"SquareIntersection;":       '\U00002293',
-	"SquareSubset;":             '\U0000228F',
-	"SquareSubsetEqual;":        '\U00002291',
-	"SquareSuperset;":           '\U00002290',
-	"SquareSupersetEqual;":      '\U00002292',
-	"SquareUnion;":              '\U00002294',
-	"Sscr;":                     '\U0001D4AE',
-	"Star;":                     '\U000022C6',
-	"Sub;":                      '\U000022D0',
-	"Subset;":                   '\U000022D0',
-	"SubsetEqual;":              '\U00002286',
-	"Succeeds;":                 '\U0000227B',
-	"SucceedsEqual;":            '\U00002AB0',
-	"SucceedsSlantEqual;":       '\U0000227D',
-	"SucceedsTilde;":            '\U0000227F',
-	"SuchThat;":                 '\U0000220B',
-	"Sum;":                      '\U00002211',
-	"Sup;":                      '\U000022D1',
-	"Superset;":                 '\U00002283',
-	"SupersetEqual;":            '\U00002287',
-	"Supset;":                   '\U000022D1',
-	"THORN;":                    '\U000000DE',
-	"TRADE;":                    '\U00002122',
-	"TSHcy;":                    '\U0000040B',
-	"TScy;":                     '\U00000426',
-	"Tab;":                      '\U00000009',
-	"Tau;":                      '\U000003A4',
-	"Tcaron;":                   '\U00000164',
-	"Tcedil;":                   '\U00000162',
-	"Tcy;":                      '\U00000422',
-	"Tfr;":                      '\U0001D517',
-	"Therefore;":                '\U00002234',
-	"Theta;":                    '\U00000398',
-	"ThinSpace;":                '\U00002009',
-	"Tilde;":                    '\U0000223C',
-	"TildeEqual;":               '\U00002243',
-	"TildeFullEqual;":           '\U00002245',
-	"TildeTilde;":               '\U00002248',
-	"Topf;":                     '\U0001D54B',
-	"TripleDot;":                '\U000020DB',
-	"Tscr;":                     '\U0001D4AF',
-	"Tstrok;":                   '\U00000166',
-	"Uacute;":                   '\U000000DA',
-	"Uarr;":                     '\U0000219F',
-	"Uarrocir;":                 '\U00002949',
-	"Ubrcy;":                    '\U0000040E',
-	"Ubreve;":                   '\U0000016C',
-	"Ucirc;":                    '\U000000DB',
-	"Ucy;":                      '\U00000423',
-	"Udblac;":                   '\U00000170',
-	"Ufr;":                      '\U0001D518',
-	"Ugrave;":                   '\U000000D9',
-	"Umacr;":                    '\U0000016A',
-	"UnderBar;":                 '\U0000005F',
-	"UnderBrace;":               '\U000023DF',
-	"UnderBracket;":             '\U000023B5',
-	"UnderParenthesis;":         '\U000023DD',
-	"Union;":                    '\U000022C3',
-	"UnionPlus;":                '\U0000228E',
-	"Uogon;":                    '\U00000172',
-	"Uopf;":                     '\U0001D54C',
-	"UpArrow;":                  '\U00002191',
-	"UpArrowBar;":               '\U00002912',
-	"UpArrowDownArrow;":         '\U000021C5',
-	"UpDownArrow;":              '\U00002195',
-	"UpEquilibrium;":            '\U0000296E',
-	"UpTee;":                    '\U000022A5',
-	"UpTeeArrow;":               '\U000021A5',
-	"Uparrow;":                  '\U000021D1',
-	"Updownarrow;":              '\U000021D5',
-	"UpperLeftArrow;":           '\U00002196',
-	"UpperRightArrow;":          '\U00002197',
-	"Upsi;":                     '\U000003D2',
-	"Upsilon;":                  '\U000003A5',
-	"Uring;":                    '\U0000016E',
-	"Uscr;":                     '\U0001D4B0',
-	"Utilde;":                   '\U00000168',
-	"Uuml;":                     '\U000000DC',
-	"VDash;":                    '\U000022AB',
-	"Vbar;":                     '\U00002AEB',
-	"Vcy;":                      '\U00000412',
-	"Vdash;":                    '\U000022A9',
-	"Vdashl;":                   '\U00002AE6',
-	"Vee;":                      '\U000022C1',
-	"Verbar;":                   '\U00002016',
-	"Vert;":                     '\U00002016',
-	"VerticalBar;":              '\U00002223',
-	"VerticalLine;":             '\U0000007C',
-	"VerticalSeparator;":        '\U00002758',
-	"VerticalTilde;":            '\U00002240',
-	"VeryThinSpace;":            '\U0000200A',
-	"Vfr;":                      '\U0001D519',
-	"Vopf;":                     '\U0001D54D',
-	"Vscr;":                     '\U0001D4B1',
-	"Vvdash;":                   '\U000022AA',
-	"Wcirc;":                    '\U00000174',
-	"Wedge;":                    '\U000022C0',
-	"Wfr;":                      '\U0001D51A',
-	"Wopf;":                     '\U0001D54E',
-	"Wscr;":                     '\U0001D4B2',
-	"Xfr;":                      '\U0001D51B',
-	"Xi;":                       '\U0000039E',
-	"Xopf;":                     '\U0001D54F',
-	"Xscr;":                     '\U0001D4B3',
-	"YAcy;":                     '\U0000042F',
-	"YIcy;":                     '\U00000407',
-	"YUcy;":                     '\U0000042E',
-	"Yacute;":                   '\U000000DD',
-	"Ycirc;":                    '\U00000176',
-	"Ycy;":                      '\U0000042B',
-	"Yfr;":                      '\U0001D51C',
-	"Yopf;":                     '\U0001D550',
-	"Yscr;":                     '\U0001D4B4',
-	"Yuml;":                     '\U00000178',
-	"ZHcy;":                     '\U00000416',
-	"Zacute;":                   '\U00000179',
-	"Zcaron;":                   '\U0000017D',
-	"Zcy;":                      '\U00000417',
-	"Zdot;":                     '\U0000017B',
-	"ZeroWidthSpace;":           '\U0000200B',
-	"Zeta;":                     '\U00000396',
-	"Zfr;":                      '\U00002128',
-	"Zopf;":                     '\U00002124',
-	"Zscr;":                     '\U0001D4B5',
-	"aacute;":                   '\U000000E1',
-	"abreve;":                   '\U00000103',
-	"ac;":                       '\U0000223E',
-	"acd;":                      '\U0000223F',
-	"acirc;":                    '\U000000E2',
-	"acute;":                    '\U000000B4',
-	"acy;":                      '\U00000430',
-	"aelig;":                    '\U000000E6',
-	"af;":                       '\U00002061',
-	"afr;":                      '\U0001D51E',
-	"agrave;":                   '\U000000E0',
-	"alefsym;":                  '\U00002135',
-	"aleph;":                    '\U00002135',
-	"alpha;":                    '\U000003B1',
-	"amacr;":                    '\U00000101',
-	"amalg;":                    '\U00002A3F',
-	"amp;":                      '\U00000026',
-	"and;":                      '\U00002227',
-	"andand;":                   '\U00002A55',
-	"andd;":                     '\U00002A5C',
-	"andslope;":                 '\U00002A58',
-	"andv;":                     '\U00002A5A',
-	"ang;":                      '\U00002220',
-	"ange;":                     '\U000029A4',
-	"angle;":                    '\U00002220',
-	"angmsd;":                   '\U00002221',
-	"angmsdaa;":                 '\U000029A8',
-	"angmsdab;":                 '\U000029A9',
-	"angmsdac;":                 '\U000029AA',
-	"angmsdad;":                 '\U000029AB',
-	"angmsdae;":                 '\U000029AC',
-	"angmsdaf;":                 '\U000029AD',
-	"angmsdag;":                 '\U000029AE',
-	"angmsdah;":                 '\U000029AF',
-	"angrt;":                    '\U0000221F',
-	"angrtvb;":                  '\U000022BE',
-	"angrtvbd;":                 '\U0000299D',
-	"angsph;":                   '\U00002222',
-	"angst;":                    '\U000000C5',
-	"angzarr;":                  '\U0000237C',
-	"aogon;":                    '\U00000105',
-	"aopf;":                     '\U0001D552',
-	"ap;":                       '\U00002248',
-	"apE;":                      '\U00002A70',
-	"apacir;":                   '\U00002A6F',
-	"ape;":                      '\U0000224A',
-	"apid;":                     '\U0000224B',
-	"apos;":                     '\U00000027',
-	"approx;":                   '\U00002248',
-	"approxeq;":                 '\U0000224A',
-	"aring;":                    '\U000000E5',
-	"ascr;":                     '\U0001D4B6',
-	"ast;":                      '\U0000002A',
-	"asymp;":                    '\U00002248',
-	"asympeq;":                  '\U0000224D',
-	"atilde;":                   '\U000000E3',
-	"auml;":                     '\U000000E4',
-	"awconint;":                 '\U00002233',
-	"awint;":                    '\U00002A11',
-	"bNot;":                     '\U00002AED',
-	"backcong;":                 '\U0000224C',
-	"backepsilon;":              '\U000003F6',
-	"backprime;":                '\U00002035',
-	"backsim;":                  '\U0000223D',
-	"backsimeq;":                '\U000022CD',
-	"barvee;":                   '\U000022BD',
-	"barwed;":                   '\U00002305',
-	"barwedge;":                 '\U00002305',
-	"bbrk;":                     '\U000023B5',
-	"bbrktbrk;":                 '\U000023B6',
-	"bcong;":                    '\U0000224C',
-	"bcy;":                      '\U00000431',
-	"bdquo;":                    '\U0000201E',
-	"becaus;":                   '\U00002235',
-	"because;":                  '\U00002235',
-	"bemptyv;":                  '\U000029B0',
-	"bepsi;":                    '\U000003F6',
-	"bernou;":                   '\U0000212C',
-	"beta;":                     '\U000003B2',
-	"beth;":                     '\U00002136',
-	"between;":                  '\U0000226C',
-	"bfr;":                      '\U0001D51F',
-	"bigcap;":                   '\U000022C2',
-	"bigcirc;":                  '\U000025EF',
-	"bigcup;":                   '\U000022C3',
-	"bigodot;":                  '\U00002A00',
-	"bigoplus;":                 '\U00002A01',
-	"bigotimes;":                '\U00002A02',
-	"bigsqcup;":                 '\U00002A06',
-	"bigstar;":                  '\U00002605',
-	"bigtriangledown;":          '\U000025BD',
-	"bigtriangleup;":            '\U000025B3',
-	"biguplus;":                 '\U00002A04',
-	"bigvee;":                   '\U000022C1',
-	"bigwedge;":                 '\U000022C0',
-	"bkarow;":                   '\U0000290D',
-	"blacklozenge;":             '\U000029EB',
-	"blacksquare;":              '\U000025AA',
-	"blacktriangle;":            '\U000025B4',
-	"blacktriangledown;":        '\U000025BE',
-	"blacktriangleleft;":        '\U000025C2',
-	"blacktriangleright;":       '\U000025B8',
-	"blank;":                    '\U00002423',
-	"blk12;":                    '\U00002592',
-	"blk14;":                    '\U00002591',
-	"blk34;":                    '\U00002593',
-	"block;":                    '\U00002588',
-	"bnot;":                     '\U00002310',
-	"bopf;":                     '\U0001D553',
-	"bot;":                      '\U000022A5',
-	"bottom;":                   '\U000022A5',
-	"bowtie;":                   '\U000022C8',
-	"boxDL;":                    '\U00002557',
-	"boxDR;":                    '\U00002554',
-	"boxDl;":                    '\U00002556',
-	"boxDr;":                    '\U00002553',
-	"boxH;":                     '\U00002550',
-	"boxHD;":                    '\U00002566',
-	"boxHU;":                    '\U00002569',
-	"boxHd;":                    '\U00002564',
-	"boxHu;":                    '\U00002567',
-	"boxUL;":                    '\U0000255D',
-	"boxUR;":                    '\U0000255A',
-	"boxUl;":                    '\U0000255C',
-	"boxUr;":                    '\U00002559',
-	"boxV;":                     '\U00002551',
-	"boxVH;":                    '\U0000256C',
-	"boxVL;":                    '\U00002563',
-	"boxVR;":                    '\U00002560',
-	"boxVh;":                    '\U0000256B',
-	"boxVl;":                    '\U00002562',
-	"boxVr;":                    '\U0000255F',
-	"boxbox;":                   '\U000029C9',
-	"boxdL;":                    '\U00002555',
-	"boxdR;":                    '\U00002552',
-	"boxdl;":                    '\U00002510',
-	"boxdr;":                    '\U0000250C',
-	"boxh;":                     '\U00002500',
-	"boxhD;":                    '\U00002565',
-	"boxhU;":                    '\U00002568',
-	"boxhd;":                    '\U0000252C',
-	"boxhu;":                    '\U00002534',
-	"boxminus;":                 '\U0000229F',
-	"boxplus;":                  '\U0000229E',
-	"boxtimes;":                 '\U000022A0',
-	"boxuL;":                    '\U0000255B',
-	"boxuR;":                    '\U00002558',
-	"boxul;":                    '\U00002518',
-	"boxur;":                    '\U00002514',
-	"boxv;":                     '\U00002502',
-	"boxvH;":                    '\U0000256A',
-	"boxvL;":                    '\U00002561',
-	"boxvR;":                    '\U0000255E',
-	"boxvh;":                    '\U0000253C',
-	"boxvl;":                    '\U00002524',
-	"boxvr;":                    '\U0000251C',
-	"bprime;":                   '\U00002035',
-	"breve;":                    '\U000002D8',
-	"brvbar;":                   '\U000000A6',
-	"bscr;":                     '\U0001D4B7',
-	"bsemi;":                    '\U0000204F',
-	"bsim;":                     '\U0000223D',
-	"bsime;":                    '\U000022CD',
-	"bsol;":                     '\U0000005C',
-	"bsolb;":                    '\U000029C5',
-	"bsolhsub;":                 '\U000027C8',
-	"bull;":                     '\U00002022',
-	"bullet;":                   '\U00002022',
-	"bump;":                     '\U0000224E',
-	"bumpE;":                    '\U00002AAE',
-	"bumpe;":                    '\U0000224F',
-	"bumpeq;":                   '\U0000224F',
-	"cacute;":                   '\U00000107',
-	"cap;":                      '\U00002229',
-	"capand;":                   '\U00002A44',
-	"capbrcup;":                 '\U00002A49',
-	"capcap;":                   '\U00002A4B',
-	"capcup;":                   '\U00002A47',
-	"capdot;":                   '\U00002A40',
-	"caret;":                    '\U00002041',
-	"caron;":                    '\U000002C7',
-	"ccaps;":                    '\U00002A4D',
-	"ccaron;":                   '\U0000010D',
-	"ccedil;":                   '\U000000E7',
-	"ccirc;":                    '\U00000109',
-	"ccups;":                    '\U00002A4C',
-	"ccupssm;":                  '\U00002A50',
-	"cdot;":                     '\U0000010B',
-	"cedil;":                    '\U000000B8',
-	"cemptyv;":                  '\U000029B2',
-	"cent;":                     '\U000000A2',
-	"centerdot;":                '\U000000B7',
-	"cfr;":                      '\U0001D520',
-	"chcy;":                     '\U00000447',
-	"check;":                    '\U00002713',
-	"checkmark;":                '\U00002713',
-	"chi;":                      '\U000003C7',
-	"cir;":                      '\U000025CB',
-	"cirE;":                     '\U000029C3',
-	"circ;":                     '\U000002C6',
-	"circeq;":                   '\U00002257',
-	"circlearrowleft;":          '\U000021BA',
-	"circlearrowright;":         '\U000021BB',
-	"circledR;":                 '\U000000AE',
-	"circledS;":                 '\U000024C8',
-	"circledast;":               '\U0000229B',
-	"circledcirc;":              '\U0000229A',
-	"circleddash;":              '\U0000229D',
-	"cire;":                     '\U00002257',
-	"cirfnint;":                 '\U00002A10',
-	"cirmid;":                   '\U00002AEF',
-	"cirscir;":                  '\U000029C2',
-	"clubs;":                    '\U00002663',
-	"clubsuit;":                 '\U00002663',
-	"colon;":                    '\U0000003A',
-	"colone;":                   '\U00002254',
-	"coloneq;":                  '\U00002254',
-	"comma;":                    '\U0000002C',
-	"commat;":                   '\U00000040',
-	"comp;":                     '\U00002201',
-	"compfn;":                   '\U00002218',
-	"complement;":               '\U00002201',
-	"complexes;":                '\U00002102',
-	"cong;":                     '\U00002245',
-	"congdot;":                  '\U00002A6D',
-	"conint;":                   '\U0000222E',
-	"copf;":                     '\U0001D554',
-	"coprod;":                   '\U00002210',
-	"copy;":                     '\U000000A9',
-	"copysr;":                   '\U00002117',
-	"crarr;":                    '\U000021B5',
-	"cross;":                    '\U00002717',
-	"cscr;":                     '\U0001D4B8',
-	"csub;":                     '\U00002ACF',
-	"csube;":                    '\U00002AD1',
-	"csup;":                     '\U00002AD0',
-	"csupe;":                    '\U00002AD2',
-	"ctdot;":                    '\U000022EF',
-	"cudarrl;":                  '\U00002938',
-	"cudarrr;":                  '\U00002935',
-	"cuepr;":                    '\U000022DE',
-	"cuesc;":                    '\U000022DF',
-	"cularr;":                   '\U000021B6',
-	"cularrp;":                  '\U0000293D',
-	"cup;":                      '\U0000222A',
-	"cupbrcap;":                 '\U00002A48',
-	"cupcap;":                   '\U00002A46',
-	"cupcup;":                   '\U00002A4A',
-	"cupdot;":                   '\U0000228D',
-	"cupor;":                    '\U00002A45',
-	"curarr;":                   '\U000021B7',
-	"curarrm;":                  '\U0000293C',
-	"curlyeqprec;":              '\U000022DE',
-	"curlyeqsucc;":              '\U000022DF',
-	"curlyvee;":                 '\U000022CE',
-	"curlywedge;":               '\U000022CF',
-	"curren;":                   '\U000000A4',
-	"curvearrowleft;":           '\U000021B6',
-	"curvearrowright;":          '\U000021B7',
-	"cuvee;":                    '\U000022CE',
-	"cuwed;":                    '\U000022CF',
-	"cwconint;":                 '\U00002232',
-	"cwint;":                    '\U00002231',
-	"cylcty;":                   '\U0000232D',
-	"dArr;":                     '\U000021D3',
-	"dHar;":                     '\U00002965',
-	"dagger;":                   '\U00002020',
-	"daleth;":                   '\U00002138',
-	"darr;":                     '\U00002193',
-	"dash;":                     '\U00002010',
-	"dashv;":                    '\U000022A3',
-	"dbkarow;":                  '\U0000290F',
-	"dblac;":                    '\U000002DD',
-	"dcaron;":                   '\U0000010F',
-	"dcy;":                      '\U00000434',
-	"dd;":                       '\U00002146',
-	"ddagger;":                  '\U00002021',
-	"ddarr;":                    '\U000021CA',
-	"ddotseq;":                  '\U00002A77',
-	"deg;":                      '\U000000B0',
-	"delta;":                    '\U000003B4',
-	"demptyv;":                  '\U000029B1',
-	"dfisht;":                   '\U0000297F',
-	"dfr;":                      '\U0001D521',
-	"dharl;":                    '\U000021C3',
-	"dharr;":                    '\U000021C2',
-	"diam;":                     '\U000022C4',
-	"diamond;":                  '\U000022C4',
-	"diamondsuit;":              '\U00002666',
-	"diams;":                    '\U00002666',
-	"die;":                      '\U000000A8',
-	"digamma;":                  '\U000003DD',
-	"disin;":                    '\U000022F2',
-	"div;":                      '\U000000F7',
-	"divide;":                   '\U000000F7',
-	"divideontimes;":            '\U000022C7',
-	"divonx;":                   '\U000022C7',
-	"djcy;":                     '\U00000452',
-	"dlcorn;":                   '\U0000231E',
-	"dlcrop;":                   '\U0000230D',
-	"dollar;":                   '\U00000024',
-	"dopf;":                     '\U0001D555',
-	"dot;":                      '\U000002D9',
-	"doteq;":                    '\U00002250',
-	"doteqdot;":                 '\U00002251',
-	"dotminus;":                 '\U00002238',
-	"dotplus;":                  '\U00002214',
-	"dotsquare;":                '\U000022A1',
-	"doublebarwedge;":           '\U00002306',
-	"downarrow;":                '\U00002193',
-	"downdownarrows;":           '\U000021CA',
-	"downharpoonleft;":          '\U000021C3',
-	"downharpoonright;":         '\U000021C2',
-	"drbkarow;":                 '\U00002910',
-	"drcorn;":                   '\U0000231F',
-	"drcrop;":                   '\U0000230C',
-	"dscr;":                     '\U0001D4B9',
-	"dscy;":                     '\U00000455',
-	"dsol;":                     '\U000029F6',
-	"dstrok;":                   '\U00000111',
-	"dtdot;":                    '\U000022F1',
-	"dtri;":                     '\U000025BF',
-	"dtrif;":                    '\U000025BE',
-	"duarr;":                    '\U000021F5',
-	"duhar;":                    '\U0000296F',
-	"dwangle;":                  '\U000029A6',
-	"dzcy;":                     '\U0000045F',
-	"dzigrarr;":                 '\U000027FF',
-	"eDDot;":                    '\U00002A77',
-	"eDot;":                     '\U00002251',
-	"eacute;":                   '\U000000E9',
-	"easter;":                   '\U00002A6E',
-	"ecaron;":                   '\U0000011B',
-	"ecir;":                     '\U00002256',
-	"ecirc;":                    '\U000000EA',
-	"ecolon;":                   '\U00002255',
-	"ecy;":                      '\U0000044D',
-	"edot;":                     '\U00000117',
-	"ee;":                       '\U00002147',
-	"efDot;":                    '\U00002252',
-	"efr;":                      '\U0001D522',
-	"eg;":                       '\U00002A9A',
-	"egrave;":                   '\U000000E8',
-	"egs;":                      '\U00002A96',
-	"egsdot;":                   '\U00002A98',
-	"el;":                       '\U00002A99',
-	"elinters;":                 '\U000023E7',
-	"ell;":                      '\U00002113',
-	"els;":                      '\U00002A95',
-	"elsdot;":                   '\U00002A97',
-	"emacr;":                    '\U00000113',
-	"empty;":                    '\U00002205',
-	"emptyset;":                 '\U00002205',
-	"emptyv;":                   '\U00002205',
-	"emsp;":                     '\U00002003',
-	"emsp13;":                   '\U00002004',
-	"emsp14;":                   '\U00002005',
-	"eng;":                      '\U0000014B',
-	"ensp;":                     '\U00002002',
-	"eogon;":                    '\U00000119',
-	"eopf;":                     '\U0001D556',
-	"epar;":                     '\U000022D5',
-	"eparsl;":                   '\U000029E3',
-	"eplus;":                    '\U00002A71',
-	"epsi;":                     '\U000003B5',
-	"epsilon;":                  '\U000003B5',
-	"epsiv;":                    '\U000003F5',
-	"eqcirc;":                   '\U00002256',
-	"eqcolon;":                  '\U00002255',
-	"eqsim;":                    '\U00002242',
-	"eqslantgtr;":               '\U00002A96',
-	"eqslantless;":              '\U00002A95',
-	"equals;":                   '\U0000003D',
-	"equest;":                   '\U0000225F',
-	"equiv;":                    '\U00002261',
-	"equivDD;":                  '\U00002A78',
-	"eqvparsl;":                 '\U000029E5',
-	"erDot;":                    '\U00002253',
-	"erarr;":                    '\U00002971',
-	"escr;":                     '\U0000212F',
-	"esdot;":                    '\U00002250',
-	"esim;":                     '\U00002242',
-	"eta;":                      '\U000003B7',
-	"eth;":                      '\U000000F0',
-	"euml;":                     '\U000000EB',
-	"euro;":                     '\U000020AC',
-	"excl;":                     '\U00000021',
-	"exist;":                    '\U00002203',
-	"expectation;":              '\U00002130',
-	"exponentiale;":             '\U00002147',
-	"fallingdotseq;":            '\U00002252',
-	"fcy;":                      '\U00000444',
-	"female;":                   '\U00002640',
-	"ffilig;":                   '\U0000FB03',
-	"fflig;":                    '\U0000FB00',
-	"ffllig;":                   '\U0000FB04',
-	"ffr;":                      '\U0001D523',
-	"filig;":                    '\U0000FB01',
-	"flat;":                     '\U0000266D',
-	"fllig;":                    '\U0000FB02',
-	"fltns;":                    '\U000025B1',
-	"fnof;":                     '\U00000192',
-	"fopf;":                     '\U0001D557',
-	"forall;":                   '\U00002200',
-	"fork;":                     '\U000022D4',
-	"forkv;":                    '\U00002AD9',
-	"fpartint;":                 '\U00002A0D',
-	"frac12;":                   '\U000000BD',
-	"frac13;":                   '\U00002153',
-	"frac14;":                   '\U000000BC',
-	"frac15;":                   '\U00002155',
-	"frac16;":                   '\U00002159',
-	"frac18;":                   '\U0000215B',
-	"frac23;":                   '\U00002154',
-	"frac25;":                   '\U00002156',
-	"frac34;":                   '\U000000BE',
-	"frac35;":                   '\U00002157',
-	"frac38;":                   '\U0000215C',
-	"frac45;":                   '\U00002158',
-	"frac56;":                   '\U0000215A',
-	"frac58;":                   '\U0000215D',
-	"frac78;":                   '\U0000215E',
-	"frasl;":                    '\U00002044',
-	"frown;":                    '\U00002322',
-	"fscr;":                     '\U0001D4BB',
-	"gE;":                       '\U00002267',
-	"gEl;":                      '\U00002A8C',
-	"gacute;":                   '\U000001F5',
-	"gamma;":                    '\U000003B3',
-	"gammad;":                   '\U000003DD',
-	"gap;":                      '\U00002A86',
-	"gbreve;":                   '\U0000011F',
-	"gcirc;":                    '\U0000011D',
-	"gcy;":                      '\U00000433',
-	"gdot;":                     '\U00000121',
-	"ge;":                       '\U00002265',
-	"gel;":                      '\U000022DB',
-	"geq;":                      '\U00002265',
-	"geqq;":                     '\U00002267',
-	"geqslant;":                 '\U00002A7E',
-	"ges;":                      '\U00002A7E',
-	"gescc;":                    '\U00002AA9',
-	"gesdot;":                   '\U00002A80',
-	"gesdoto;":                  '\U00002A82',
-	"gesdotol;":                 '\U00002A84',
-	"gesles;":                   '\U00002A94',
-	"gfr;":                      '\U0001D524',
-	"gg;":                       '\U0000226B',
-	"ggg;":                      '\U000022D9',
-	"gimel;":                    '\U00002137',
-	"gjcy;":                     '\U00000453',
-	"gl;":                       '\U00002277',
-	"glE;":                      '\U00002A92',
-	"gla;":                      '\U00002AA5',
-	"glj;":                      '\U00002AA4',
-	"gnE;":                      '\U00002269',
-	"gnap;":                     '\U00002A8A',
-	"gnapprox;":                 '\U00002A8A',
-	"gne;":                      '\U00002A88',
-	"gneq;":                     '\U00002A88',
-	"gneqq;":                    '\U00002269',
-	"gnsim;":                    '\U000022E7',
-	"gopf;":                     '\U0001D558',
-	"grave;":                    '\U00000060',
-	"gscr;":                     '\U0000210A',
-	"gsim;":                     '\U00002273',
-	"gsime;":                    '\U00002A8E',
-	"gsiml;":                    '\U00002A90',
-	"gt;":                       '\U0000003E',
-	"gtcc;":                     '\U00002AA7',
-	"gtcir;":                    '\U00002A7A',
-	"gtdot;":                    '\U000022D7',
-	"gtlPar;":                   '\U00002995',
-	"gtquest;":                  '\U00002A7C',
-	"gtrapprox;":                '\U00002A86',
-	"gtrarr;":                   '\U00002978',
-	"gtrdot;":                   '\U000022D7',
-	"gtreqless;":                '\U000022DB',
-	"gtreqqless;":               '\U00002A8C',
-	"gtrless;":                  '\U00002277',
-	"gtrsim;":                   '\U00002273',
-	"hArr;":                     '\U000021D4',
-	"hairsp;":                   '\U0000200A',
-	"half;":                     '\U000000BD',
-	"hamilt;":                   '\U0000210B',
-	"hardcy;":                   '\U0000044A',
-	"harr;":                     '\U00002194',
-	"harrcir;":                  '\U00002948',
-	"harrw;":                    '\U000021AD',
-	"hbar;":                     '\U0000210F',
-	"hcirc;":                    '\U00000125',
-	"hearts;":                   '\U00002665',
-	"heartsuit;":                '\U00002665',
-	"hellip;":                   '\U00002026',
-	"hercon;":                   '\U000022B9',
-	"hfr;":                      '\U0001D525',
-	"hksearow;":                 '\U00002925',
-	"hkswarow;":                 '\U00002926',
-	"hoarr;":                    '\U000021FF',
-	"homtht;":                   '\U0000223B',
-	"hookleftarrow;":            '\U000021A9',
-	"hookrightarrow;":           '\U000021AA',
-	"hopf;":                     '\U0001D559',
-	"horbar;":                   '\U00002015',
-	"hscr;":                     '\U0001D4BD',
-	"hslash;":                   '\U0000210F',
-	"hstrok;":                   '\U00000127',
-	"hybull;":                   '\U00002043',
-	"hyphen;":                   '\U00002010',
-	"iacute;":                   '\U000000ED',
-	"ic;":                       '\U00002063',
-	"icirc;":                    '\U000000EE',
-	"icy;":                      '\U00000438',
-	"iecy;":                     '\U00000435',
-	"iexcl;":                    '\U000000A1',
-	"iff;":                      '\U000021D4',
-	"ifr;":                      '\U0001D526',
-	"igrave;":                   '\U000000EC',
-	"ii;":                       '\U00002148',
-	"iiiint;":                   '\U00002A0C',
-	"iiint;":                    '\U0000222D',
-	"iinfin;":                   '\U000029DC',
-	"iiota;":                    '\U00002129',
-	"ijlig;":                    '\U00000133',
-	"imacr;":                    '\U0000012B',
-	"image;":                    '\U00002111',
-	"imagline;":                 '\U00002110',
-	"imagpart;":                 '\U00002111',
-	"imath;":                    '\U00000131',
-	"imof;":                     '\U000022B7',
-	"imped;":                    '\U000001B5',
-	"in;":                       '\U00002208',
-	"incare;":                   '\U00002105',
-	"infin;":                    '\U0000221E',
-	"infintie;":                 '\U000029DD',
-	"inodot;":                   '\U00000131',
-	"int;":                      '\U0000222B',
-	"intcal;":                   '\U000022BA',
-	"integers;":                 '\U00002124',
-	"intercal;":                 '\U000022BA',
-	"intlarhk;":                 '\U00002A17',
-	"intprod;":                  '\U00002A3C',
-	"iocy;":                     '\U00000451',
-	"iogon;":                    '\U0000012F',
-	"iopf;":                     '\U0001D55A',
-	"iota;":                     '\U000003B9',
-	"iprod;":                    '\U00002A3C',
-	"iquest;":                   '\U000000BF',
-	"iscr;":                     '\U0001D4BE',
-	"isin;":                     '\U00002208',
-	"isinE;":                    '\U000022F9',
-	"isindot;":                  '\U000022F5',
-	"isins;":                    '\U000022F4',
-	"isinsv;":                   '\U000022F3',
-	"isinv;":                    '\U00002208',
-	"it;":                       '\U00002062',
-	"itilde;":                   '\U00000129',
-	"iukcy;":                    '\U00000456',
-	"iuml;":                     '\U000000EF',
-	"jcirc;":                    '\U00000135',
-	"jcy;":                      '\U00000439',
-	"jfr;":                      '\U0001D527',
-	"jmath;":                    '\U00000237',
-	"jopf;":                     '\U0001D55B',
-	"jscr;":                     '\U0001D4BF',
-	"jsercy;":                   '\U00000458',
-	"jukcy;":                    '\U00000454',
-	"kappa;":                    '\U000003BA',
-	"kappav;":                   '\U000003F0',
-	"kcedil;":                   '\U00000137',
-	"kcy;":                      '\U0000043A',
-	"kfr;":                      '\U0001D528',
-	"kgreen;":                   '\U00000138',
-	"khcy;":                     '\U00000445',
-	"kjcy;":                     '\U0000045C',
-	"kopf;":                     '\U0001D55C',
-	"kscr;":                     '\U0001D4C0',
-	"lAarr;":                    '\U000021DA',
-	"lArr;":                     '\U000021D0',
-	"lAtail;":                   '\U0000291B',
-	"lBarr;":                    '\U0000290E',
-	"lE;":                       '\U00002266',
-	"lEg;":                      '\U00002A8B',
-	"lHar;":                     '\U00002962',
-	"lacute;":                   '\U0000013A',
-	"laemptyv;":                 '\U000029B4',
-	"lagran;":                   '\U00002112',
-	"lambda;":                   '\U000003BB',
-	"lang;":                     '\U000027E8',
-	"langd;":                    '\U00002991',
-	"langle;":                   '\U000027E8',
-	"lap;":                      '\U00002A85',
-	"laquo;":                    '\U000000AB',
-	"larr;":                     '\U00002190',
-	"larrb;":                    '\U000021E4',
-	"larrbfs;":                  '\U0000291F',
-	"larrfs;":                   '\U0000291D',
-	"larrhk;":                   '\U000021A9',
-	"larrlp;":                   '\U000021AB',
-	"larrpl;":                   '\U00002939',
-	"larrsim;":                  '\U00002973',
-	"larrtl;":                   '\U000021A2',
-	"lat;":                      '\U00002AAB',
-	"latail;":                   '\U00002919',
-	"late;":                     '\U00002AAD',
-	"lbarr;":                    '\U0000290C',
-	"lbbrk;":                    '\U00002772',
-	"lbrace;":                   '\U0000007B',
-	"lbrack;":                   '\U0000005B',
-	"lbrke;":                    '\U0000298B',
-	"lbrksld;":                  '\U0000298F',
-	"lbrkslu;":                  '\U0000298D',
-	"lcaron;":                   '\U0000013E',
-	"lcedil;":                   '\U0000013C',
-	"lceil;":                    '\U00002308',
-	"lcub;":                     '\U0000007B',
-	"lcy;":                      '\U0000043B',
-	"ldca;":                     '\U00002936',
-	"ldquo;":                    '\U0000201C',
-	"ldquor;":                   '\U0000201E',
-	"ldrdhar;":                  '\U00002967',
-	"ldrushar;":                 '\U0000294B',
-	"ldsh;":                     '\U000021B2',
-	"le;":                       '\U00002264',
-	"leftarrow;":                '\U00002190',
-	"leftarrowtail;":            '\U000021A2',
-	"leftharpoondown;":          '\U000021BD',
-	"leftharpoonup;":            '\U000021BC',
-	"leftleftarrows;":           '\U000021C7',
-	"leftrightarrow;":           '\U00002194',
-	"leftrightarrows;":          '\U000021C6',
-	"leftrightharpoons;":        '\U000021CB',
-	"leftrightsquigarrow;":      '\U000021AD',
-	"leftthreetimes;":           '\U000022CB',
-	"leg;":                      '\U000022DA',
-	"leq;":                      '\U00002264',
-	"leqq;":                     '\U00002266',
-	"leqslant;":                 '\U00002A7D',
-	"les;":                      '\U00002A7D',
-	"lescc;":                    '\U00002AA8',
-	"lesdot;":                   '\U00002A7F',
-	"lesdoto;":                  '\U00002A81',
-	"lesdotor;":                 '\U00002A83',
-	"lesges;":                   '\U00002A93',
-	"lessapprox;":               '\U00002A85',
-	"lessdot;":                  '\U000022D6',
-	"lesseqgtr;":                '\U000022DA',
-	"lesseqqgtr;":               '\U00002A8B',
-	"lessgtr;":                  '\U00002276',
-	"lesssim;":                  '\U00002272',
-	"lfisht;":                   '\U0000297C',
-	"lfloor;":                   '\U0000230A',
-	"lfr;":                      '\U0001D529',
-	"lg;":                       '\U00002276',
-	"lgE;":                      '\U00002A91',
-	"lhard;":                    '\U000021BD',
-	"lharu;":                    '\U000021BC',
-	"lharul;":                   '\U0000296A',
-	"lhblk;":                    '\U00002584',
-	"ljcy;":                     '\U00000459',
-	"ll;":                       '\U0000226A',
-	"llarr;":                    '\U000021C7',
-	"llcorner;":                 '\U0000231E',
-	"llhard;":                   '\U0000296B',
-	"lltri;":                    '\U000025FA',
-	"lmidot;":                   '\U00000140',
-	"lmoust;":                   '\U000023B0',
-	"lmoustache;":               '\U000023B0',
-	"lnE;":                      '\U00002268',
-	"lnap;":                     '\U00002A89',
-	"lnapprox;":                 '\U00002A89',
-	"lne;":                      '\U00002A87',
-	"lneq;":                     '\U00002A87',
-	"lneqq;":                    '\U00002268',
-	"lnsim;":                    '\U000022E6',
-	"loang;":                    '\U000027EC',
-	"loarr;":                    '\U000021FD',
-	"lobrk;":                    '\U000027E6',
-	"longleftarrow;":            '\U000027F5',
-	"longleftrightarrow;":       '\U000027F7',
-	"longmapsto;":               '\U000027FC',
-	"longrightarrow;":           '\U000027F6',
-	"looparrowleft;":            '\U000021AB',
-	"looparrowright;":           '\U000021AC',
-	"lopar;":                    '\U00002985',
-	"lopf;":                     '\U0001D55D',
-	"loplus;":                   '\U00002A2D',
-	"lotimes;":                  '\U00002A34',
-	"lowast;":                   '\U00002217',
-	"lowbar;":                   '\U0000005F',
-	"loz;":                      '\U000025CA',
-	"lozenge;":                  '\U000025CA',
-	"lozf;":                     '\U000029EB',
-	"lpar;":                     '\U00000028',
-	"lparlt;":                   '\U00002993',
-	"lrarr;":                    '\U000021C6',
-	"lrcorner;":                 '\U0000231F',
-	"lrhar;":                    '\U000021CB',
-	"lrhard;":                   '\U0000296D',
-	"lrm;":                      '\U0000200E',
-	"lrtri;":                    '\U000022BF',
-	"lsaquo;":                   '\U00002039',
-	"lscr;":                     '\U0001D4C1',
-	"lsh;":                      '\U000021B0',
-	"lsim;":                     '\U00002272',
-	"lsime;":                    '\U00002A8D',
-	"lsimg;":                    '\U00002A8F',
-	"lsqb;":                     '\U0000005B',
-	"lsquo;":                    '\U00002018',
-	"lsquor;":                   '\U0000201A',
-	"lstrok;":                   '\U00000142',
-	"lt;":                       '\U0000003C',
-	"ltcc;":                     '\U00002AA6',
-	"ltcir;":                    '\U00002A79',
-	"ltdot;":                    '\U000022D6',
-	"lthree;":                   '\U000022CB',
-	"ltimes;":                   '\U000022C9',
-	"ltlarr;":                   '\U00002976',
-	"ltquest;":                  '\U00002A7B',
-	"ltrPar;":                   '\U00002996',
-	"ltri;":                     '\U000025C3',
-	"ltrie;":                    '\U000022B4',
-	"ltrif;":                    '\U000025C2',
-	"lurdshar;":                 '\U0000294A',
-	"luruhar;":                  '\U00002966',
-	"mDDot;":                    '\U0000223A',
-	"macr;":                     '\U000000AF',
-	"male;":                     '\U00002642',
-	"malt;":                     '\U00002720',
-	"maltese;":                  '\U00002720',
-	"map;":                      '\U000021A6',
-	"mapsto;":                   '\U000021A6',
-	"mapstodown;":               '\U000021A7',
-	"mapstoleft;":               '\U000021A4',
-	"mapstoup;":                 '\U000021A5',
-	"marker;":                   '\U000025AE',
-	"mcomma;":                   '\U00002A29',
-	"mcy;":                      '\U0000043C',
-	"mdash;":                    '\U00002014',
-	"measuredangle;":            '\U00002221',
-	"mfr;":                      '\U0001D52A',
-	"mho;":                      '\U00002127',
-	"micro;":                    '\U000000B5',
-	"mid;":                      '\U00002223',
-	"midast;":                   '\U0000002A',
-	"midcir;":                   '\U00002AF0',
-	"middot;":                   '\U000000B7',
-	"minus;":                    '\U00002212',
-	"minusb;":                   '\U0000229F',
-	"minusd;":                   '\U00002238',
-	"minusdu;":                  '\U00002A2A',
-	"mlcp;":                     '\U00002ADB',
-	"mldr;":                     '\U00002026',
-	"mnplus;":                   '\U00002213',
-	"models;":                   '\U000022A7',
-	"mopf;":                     '\U0001D55E',
-	"mp;":                       '\U00002213',
-	"mscr;":                     '\U0001D4C2',
-	"mstpos;":                   '\U0000223E',
-	"mu;":                       '\U000003BC',
-	"multimap;":                 '\U000022B8',
-	"mumap;":                    '\U000022B8',
-	"nLeftarrow;":               '\U000021CD',
-	"nLeftrightarrow;":          '\U000021CE',
-	"nRightarrow;":              '\U000021CF',
-	"nVDash;":                   '\U000022AF',
-	"nVdash;":                   '\U000022AE',
-	"nabla;":                    '\U00002207',
-	"nacute;":                   '\U00000144',
-	"nap;":                      '\U00002249',
-	"napos;":                    '\U00000149',
-	"napprox;":                  '\U00002249',
-	"natur;":                    '\U0000266E',
-	"natural;":                  '\U0000266E',
-	"naturals;":                 '\U00002115',
-	"nbsp;":                     '\U000000A0',
-	"ncap;":                     '\U00002A43',
-	"ncaron;":                   '\U00000148',
-	"ncedil;":                   '\U00000146',
-	"ncong;":                    '\U00002247',
-	"ncup;":                     '\U00002A42',
-	"ncy;":                      '\U0000043D',
-	"ndash;":                    '\U00002013',
-	"ne;":                       '\U00002260',
-	"neArr;":                    '\U000021D7',
-	"nearhk;":                   '\U00002924',
-	"nearr;":                    '\U00002197',
-	"nearrow;":                  '\U00002197',
-	"nequiv;":                   '\U00002262',
-	"nesear;":                   '\U00002928',
-	"nexist;":                   '\U00002204',
-	"nexists;":                  '\U00002204',
-	"nfr;":                      '\U0001D52B',
-	"nge;":                      '\U00002271',
-	"ngeq;":                     '\U00002271',
-	"ngsim;":                    '\U00002275',
-	"ngt;":                      '\U0000226F',
-	"ngtr;":                     '\U0000226F',
-	"nhArr;":                    '\U000021CE',
-	"nharr;":                    '\U000021AE',
-	"nhpar;":                    '\U00002AF2',
-	"ni;":                       '\U0000220B',
-	"nis;":                      '\U000022FC',
-	"nisd;":                     '\U000022FA',
-	"niv;":                      '\U0000220B',
-	"njcy;":                     '\U0000045A',
-	"nlArr;":                    '\U000021CD',
-	"nlarr;":                    '\U0000219A',
-	"nldr;":                     '\U00002025',
-	"nle;":                      '\U00002270',
-	"nleftarrow;":               '\U0000219A',
-	"nleftrightarrow;":          '\U000021AE',
-	"nleq;":                     '\U00002270',
-	"nless;":                    '\U0000226E',
-	"nlsim;":                    '\U00002274',
-	"nlt;":                      '\U0000226E',
-	"nltri;":                    '\U000022EA',
-	"nltrie;":                   '\U000022EC',
-	"nmid;":                     '\U00002224',
-	"nopf;":                     '\U0001D55F',
-	"not;":                      '\U000000AC',
-	"notin;":                    '\U00002209',
-	"notinva;":                  '\U00002209',
-	"notinvb;":                  '\U000022F7',
-	"notinvc;":                  '\U000022F6',
-	"notni;":                    '\U0000220C',
-	"notniva;":                  '\U0000220C',
-	"notnivb;":                  '\U000022FE',
-	"notnivc;":                  '\U000022FD',
-	"npar;":                     '\U00002226',
-	"nparallel;":                '\U00002226',
-	"npolint;":                  '\U00002A14',
-	"npr;":                      '\U00002280',
-	"nprcue;":                   '\U000022E0',
-	"nprec;":                    '\U00002280',
-	"nrArr;":                    '\U000021CF',
-	"nrarr;":                    '\U0000219B',
-	"nrightarrow;":              '\U0000219B',
-	"nrtri;":                    '\U000022EB',
-	"nrtrie;":                   '\U000022ED',
-	"nsc;":                      '\U00002281',
-	"nsccue;":                   '\U000022E1',
-	"nscr;":                     '\U0001D4C3',
-	"nshortmid;":                '\U00002224',
-	"nshortparallel;":           '\U00002226',
-	"nsim;":                     '\U00002241',
-	"nsime;":                    '\U00002244',
-	"nsimeq;":                   '\U00002244',
-	"nsmid;":                    '\U00002224',
-	"nspar;":                    '\U00002226',
-	"nsqsube;":                  '\U000022E2',
-	"nsqsupe;":                  '\U000022E3',
-	"nsub;":                     '\U00002284',
-	"nsube;":                    '\U00002288',
-	"nsubseteq;":                '\U00002288',
-	"nsucc;":                    '\U00002281',
-	"nsup;":                     '\U00002285',
-	"nsupe;":                    '\U00002289',
-	"nsupseteq;":                '\U00002289',
-	"ntgl;":                     '\U00002279',
-	"ntilde;":                   '\U000000F1',
-	"ntlg;":                     '\U00002278',
-	"ntriangleleft;":            '\U000022EA',
-	"ntrianglelefteq;":          '\U000022EC',
-	"ntriangleright;":           '\U000022EB',
-	"ntrianglerighteq;":         '\U000022ED',
-	"nu;":                       '\U000003BD',
-	"num;":                      '\U00000023',
-	"numero;":                   '\U00002116',
-	"numsp;":                    '\U00002007',
-	"nvDash;":                   '\U000022AD',
-	"nvHarr;":                   '\U00002904',
-	"nvdash;":                   '\U000022AC',
-	"nvinfin;":                  '\U000029DE',
-	"nvlArr;":                   '\U00002902',
-	"nvrArr;":                   '\U00002903',
-	"nwArr;":                    '\U000021D6',
-	"nwarhk;":                   '\U00002923',
-	"nwarr;":                    '\U00002196',
-	"nwarrow;":                  '\U00002196',
-	"nwnear;":                   '\U00002927',
-	"oS;":                       '\U000024C8',
-	"oacute;":                   '\U000000F3',
-	"oast;":                     '\U0000229B',
-	"ocir;":                     '\U0000229A',
-	"ocirc;":                    '\U000000F4',
-	"ocy;":                      '\U0000043E',
-	"odash;":                    '\U0000229D',
-	"odblac;":                   '\U00000151',
-	"odiv;":                     '\U00002A38',
-	"odot;":                     '\U00002299',
-	"odsold;":                   '\U000029BC',
-	"oelig;":                    '\U00000153',
-	"ofcir;":                    '\U000029BF',
-	"ofr;":                      '\U0001D52C',
-	"ogon;":                     '\U000002DB',
-	"ograve;":                   '\U000000F2',
-	"ogt;":                      '\U000029C1',
-	"ohbar;":                    '\U000029B5',
-	"ohm;":                      '\U000003A9',
-	"oint;":                     '\U0000222E',
-	"olarr;":                    '\U000021BA',
-	"olcir;":                    '\U000029BE',
-	"olcross;":                  '\U000029BB',
-	"oline;":                    '\U0000203E',
-	"olt;":                      '\U000029C0',
-	"omacr;":                    '\U0000014D',
-	"omega;":                    '\U000003C9',
-	"omicron;":                  '\U000003BF',
-	"omid;":                     '\U000029B6',
-	"ominus;":                   '\U00002296',
-	"oopf;":                     '\U0001D560',
-	"opar;":                     '\U000029B7',
-	"operp;":                    '\U000029B9',
-	"oplus;":                    '\U00002295',
-	"or;":                       '\U00002228',
-	"orarr;":                    '\U000021BB',
-	"ord;":                      '\U00002A5D',
-	"order;":                    '\U00002134',
-	"orderof;":                  '\U00002134',
-	"ordf;":                     '\U000000AA',
-	"ordm;":                     '\U000000BA',
-	"origof;":                   '\U000022B6',
-	"oror;":                     '\U00002A56',
-	"orslope;":                  '\U00002A57',
-	"orv;":                      '\U00002A5B',
-	"oscr;":                     '\U00002134',
-	"oslash;":                   '\U000000F8',
-	"osol;":                     '\U00002298',
-	"otilde;":                   '\U000000F5',
-	"otimes;":                   '\U00002297',
-	"otimesas;":                 '\U00002A36',
-	"ouml;":                     '\U000000F6',
-	"ovbar;":                    '\U0000233D',
-	"par;":                      '\U00002225',
-	"para;":                     '\U000000B6',
-	"parallel;":                 '\U00002225',
-	"parsim;":                   '\U00002AF3',
-	"parsl;":                    '\U00002AFD',
-	"part;":                     '\U00002202',
-	"pcy;":                      '\U0000043F',
-	"percnt;":                   '\U00000025',
-	"period;":                   '\U0000002E',
-	"permil;":                   '\U00002030',
-	"perp;":                     '\U000022A5',
-	"pertenk;":                  '\U00002031',
-	"pfr;":                      '\U0001D52D',
-	"phi;":                      '\U000003C6',
-	"phiv;":                     '\U000003D5',
-	"phmmat;":                   '\U00002133',
-	"phone;":                    '\U0000260E',
-	"pi;":                       '\U000003C0',
-	"pitchfork;":                '\U000022D4',
-	"piv;":                      '\U000003D6',
-	"planck;":                   '\U0000210F',
-	"planckh;":                  '\U0000210E',
-	"plankv;":                   '\U0000210F',
-	"plus;":                     '\U0000002B',
-	"plusacir;":                 '\U00002A23',
-	"plusb;":                    '\U0000229E',
-	"pluscir;":                  '\U00002A22',
-	"plusdo;":                   '\U00002214',
-	"plusdu;":                   '\U00002A25',
-	"pluse;":                    '\U00002A72',
-	"plusmn;":                   '\U000000B1',
-	"plussim;":                  '\U00002A26',
-	"plustwo;":                  '\U00002A27',
-	"pm;":                       '\U000000B1',
-	"pointint;":                 '\U00002A15',
-	"popf;":                     '\U0001D561',
-	"pound;":                    '\U000000A3',
-	"pr;":                       '\U0000227A',
-	"prE;":                      '\U00002AB3',
-	"prap;":                     '\U00002AB7',
-	"prcue;":                    '\U0000227C',
-	"pre;":                      '\U00002AAF',
-	"prec;":                     '\U0000227A',
-	"precapprox;":               '\U00002AB7',
-	"preccurlyeq;":              '\U0000227C',
-	"preceq;":                   '\U00002AAF',
-	"precnapprox;":              '\U00002AB9',
-	"precneqq;":                 '\U00002AB5',
-	"precnsim;":                 '\U000022E8',
-	"precsim;":                  '\U0000227E',
-	"prime;":                    '\U00002032',
-	"primes;":                   '\U00002119',
-	"prnE;":                     '\U00002AB5',
-	"prnap;":                    '\U00002AB9',
-	"prnsim;":                   '\U000022E8',
-	"prod;":                     '\U0000220F',
-	"profalar;":                 '\U0000232E',
-	"profline;":                 '\U00002312',
-	"profsurf;":                 '\U00002313',
-	"prop;":                     '\U0000221D',
-	"propto;":                   '\U0000221D',
-	"prsim;":                    '\U0000227E',
-	"prurel;":                   '\U000022B0',
-	"pscr;":                     '\U0001D4C5',
-	"psi;":                      '\U000003C8',
-	"puncsp;":                   '\U00002008',
-	"qfr;":                      '\U0001D52E',
-	"qint;":                     '\U00002A0C',
-	"qopf;":                     '\U0001D562',
-	"qprime;":                   '\U00002057',
-	"qscr;":                     '\U0001D4C6',
-	"quaternions;":              '\U0000210D',
-	"quatint;":                  '\U00002A16',
-	"quest;":                    '\U0000003F',
-	"questeq;":                  '\U0000225F',
-	"quot;":                     '\U00000022',
-	"rAarr;":                    '\U000021DB',
-	"rArr;":                     '\U000021D2',
-	"rAtail;":                   '\U0000291C',
-	"rBarr;":                    '\U0000290F',
-	"rHar;":                     '\U00002964',
-	"racute;":                   '\U00000155',
-	"radic;":                    '\U0000221A',
-	"raemptyv;":                 '\U000029B3',
-	"rang;":                     '\U000027E9',
-	"rangd;":                    '\U00002992',
-	"range;":                    '\U000029A5',
-	"rangle;":                   '\U000027E9',
-	"raquo;":                    '\U000000BB',
-	"rarr;":                     '\U00002192',
-	"rarrap;":                   '\U00002975',
-	"rarrb;":                    '\U000021E5',
-	"rarrbfs;":                  '\U00002920',
-	"rarrc;":                    '\U00002933',
-	"rarrfs;":                   '\U0000291E',
-	"rarrhk;":                   '\U000021AA',
-	"rarrlp;":                   '\U000021AC',
-	"rarrpl;":                   '\U00002945',
-	"rarrsim;":                  '\U00002974',
-	"rarrtl;":                   '\U000021A3',
-	"rarrw;":                    '\U0000219D',
-	"ratail;":                   '\U0000291A',
-	"ratio;":                    '\U00002236',
-	"rationals;":                '\U0000211A',
-	"rbarr;":                    '\U0000290D',
-	"rbbrk;":                    '\U00002773',
-	"rbrace;":                   '\U0000007D',
-	"rbrack;":                   '\U0000005D',
-	"rbrke;":                    '\U0000298C',
-	"rbrksld;":                  '\U0000298E',
-	"rbrkslu;":                  '\U00002990',
-	"rcaron;":                   '\U00000159',
-	"rcedil;":                   '\U00000157',
-	"rceil;":                    '\U00002309',
-	"rcub;":                     '\U0000007D',
-	"rcy;":                      '\U00000440',
-	"rdca;":                     '\U00002937',
-	"rdldhar;":                  '\U00002969',
-	"rdquo;":                    '\U0000201D',
-	"rdquor;":                   '\U0000201D',
-	"rdsh;":                     '\U000021B3',
-	"real;":                     '\U0000211C',
-	"realine;":                  '\U0000211B',
-	"realpart;":                 '\U0000211C',
-	"reals;":                    '\U0000211D',
-	"rect;":                     '\U000025AD',
-	"reg;":                      '\U000000AE',
-	"rfisht;":                   '\U0000297D',
-	"rfloor;":                   '\U0000230B',
-	"rfr;":                      '\U0001D52F',
-	"rhard;":                    '\U000021C1',
-	"rharu;":                    '\U000021C0',
-	"rharul;":                   '\U0000296C',
-	"rho;":                      '\U000003C1',
-	"rhov;":                     '\U000003F1',
-	"rightarrow;":               '\U00002192',
-	"rightarrowtail;":           '\U000021A3',
-	"rightharpoondown;":         '\U000021C1',
-	"rightharpoonup;":           '\U000021C0',
-	"rightleftarrows;":          '\U000021C4',
-	"rightleftharpoons;":        '\U000021CC',
-	"rightrightarrows;":         '\U000021C9',
-	"rightsquigarrow;":          '\U0000219D',
-	"rightthreetimes;":          '\U000022CC',
-	"ring;":                     '\U000002DA',
-	"risingdotseq;":             '\U00002253',
-	"rlarr;":                    '\U000021C4',
-	"rlhar;":                    '\U000021CC',
-	"rlm;":                      '\U0000200F',
-	"rmoust;":                   '\U000023B1',
-	"rmoustache;":               '\U000023B1',
-	"rnmid;":                    '\U00002AEE',
-	"roang;":                    '\U000027ED',
-	"roarr;":                    '\U000021FE',
-	"robrk;":                    '\U000027E7',
-	"ropar;":                    '\U00002986',
-	"ropf;":                     '\U0001D563',
-	"roplus;":                   '\U00002A2E',
-	"rotimes;":                  '\U00002A35',
-	"rpar;":                     '\U00000029',
-	"rpargt;":                   '\U00002994',
-	"rppolint;":                 '\U00002A12',
-	"rrarr;":                    '\U000021C9',
-	"rsaquo;":                   '\U0000203A',
-	"rscr;":                     '\U0001D4C7',
-	"rsh;":                      '\U000021B1',
-	"rsqb;":                     '\U0000005D',
-	"rsquo;":                    '\U00002019',
-	"rsquor;":                   '\U00002019',
-	"rthree;":                   '\U000022CC',
-	"rtimes;":                   '\U000022CA',
-	"rtri;":                     '\U000025B9',
-	"rtrie;":                    '\U000022B5',
-	"rtrif;":                    '\U000025B8',
-	"rtriltri;":                 '\U000029CE',
-	"ruluhar;":                  '\U00002968',
-	"rx;":                       '\U0000211E',
-	"sacute;":                   '\U0000015B',
-	"sbquo;":                    '\U0000201A',
-	"sc;":                       '\U0000227B',
-	"scE;":                      '\U00002AB4',
-	"scap;":                     '\U00002AB8',
-	"scaron;":                   '\U00000161',
-	"sccue;":                    '\U0000227D',
-	"sce;":                      '\U00002AB0',
-	"scedil;":                   '\U0000015F',
-	"scirc;":                    '\U0000015D',
-	"scnE;":                     '\U00002AB6',
-	"scnap;":                    '\U00002ABA',
-	"scnsim;":                   '\U000022E9',
-	"scpolint;":                 '\U00002A13',
-	"scsim;":                    '\U0000227F',
-	"scy;":                      '\U00000441',
-	"sdot;":                     '\U000022C5',
-	"sdotb;":                    '\U000022A1',
-	"sdote;":                    '\U00002A66',
-	"seArr;":                    '\U000021D8',
-	"searhk;":                   '\U00002925',
-	"searr;":                    '\U00002198',
-	"searrow;":                  '\U00002198',
-	"sect;":                     '\U000000A7',
-	"semi;":                     '\U0000003B',
-	"seswar;":                   '\U00002929',
-	"setminus;":                 '\U00002216',
-	"setmn;":                    '\U00002216',
-	"sext;":                     '\U00002736',
-	"sfr;":                      '\U0001D530',
-	"sfrown;":                   '\U00002322',
-	"sharp;":                    '\U0000266F',
-	"shchcy;":                   '\U00000449',
-	"shcy;":                     '\U00000448',
-	"shortmid;":                 '\U00002223',
-	"shortparallel;":            '\U00002225',
-	"shy;":                      '\U000000AD',
-	"sigma;":                    '\U000003C3',
-	"sigmaf;":                   '\U000003C2',
-	"sigmav;":                   '\U000003C2',
-	"sim;":                      '\U0000223C',
-	"simdot;":                   '\U00002A6A',
-	"sime;":                     '\U00002243',
-	"simeq;":                    '\U00002243',
-	"simg;":                     '\U00002A9E',
-	"simgE;":                    '\U00002AA0',
-	"siml;":                     '\U00002A9D',
-	"simlE;":                    '\U00002A9F',
-	"simne;":                    '\U00002246',
-	"simplus;":                  '\U00002A24',
-	"simrarr;":                  '\U00002972',
-	"slarr;":                    '\U00002190',
-	"smallsetminus;":            '\U00002216',
-	"smashp;":                   '\U00002A33',
-	"smeparsl;":                 '\U000029E4',
-	"smid;":                     '\U00002223',
-	"smile;":                    '\U00002323',
-	"smt;":                      '\U00002AAA',
-	"smte;":                     '\U00002AAC',
-	"softcy;":                   '\U0000044C',
-	"sol;":                      '\U0000002F',
-	"solb;":                     '\U000029C4',
-	"solbar;":                   '\U0000233F',
-	"sopf;":                     '\U0001D564',
-	"spades;":                   '\U00002660',
-	"spadesuit;":                '\U00002660',
-	"spar;":                     '\U00002225',
-	"sqcap;":                    '\U00002293',
-	"sqcup;":                    '\U00002294',
-	"sqsub;":                    '\U0000228F',
-	"sqsube;":                   '\U00002291',
-	"sqsubset;":                 '\U0000228F',
-	"sqsubseteq;":               '\U00002291',
-	"sqsup;":                    '\U00002290',
-	"sqsupe;":                   '\U00002292',
-	"sqsupset;":                 '\U00002290',
-	"sqsupseteq;":               '\U00002292',
-	"squ;":                      '\U000025A1',
-	"square;":                   '\U000025A1',
-	"squarf;":                   '\U000025AA',
-	"squf;":                     '\U000025AA',
-	"srarr;":                    '\U00002192',
-	"sscr;":                     '\U0001D4C8',
-	"ssetmn;":                   '\U00002216',
-	"ssmile;":                   '\U00002323',
-	"sstarf;":                   '\U000022C6',
-	"star;":                     '\U00002606',
-	"starf;":                    '\U00002605',
-	"straightepsilon;":          '\U000003F5',
-	"straightphi;":              '\U000003D5',
-	"strns;":                    '\U000000AF',
-	"sub;":                      '\U00002282',
-	"subE;":                     '\U00002AC5',
-	"subdot;":                   '\U00002ABD',
-	"sube;":                     '\U00002286',
-	"subedot;":                  '\U00002AC3',
-	"submult;":                  '\U00002AC1',
-	"subnE;":                    '\U00002ACB',
-	"subne;":                    '\U0000228A',
-	"subplus;":                  '\U00002ABF',
-	"subrarr;":                  '\U00002979',
-	"subset;":                   '\U00002282',
-	"subseteq;":                 '\U00002286',
-	"subseteqq;":                '\U00002AC5',
-	"subsetneq;":                '\U0000228A',
-	"subsetneqq;":               '\U00002ACB',
-	"subsim;":                   '\U00002AC7',
-	"subsub;":                   '\U00002AD5',
-	"subsup;":                   '\U00002AD3',
-	"succ;":                     '\U0000227B',
-	"succapprox;":               '\U00002AB8',
-	"succcurlyeq;":              '\U0000227D',
-	"succeq;":                   '\U00002AB0',
-	"succnapprox;":              '\U00002ABA',
-	"succneqq;":                 '\U00002AB6',
-	"succnsim;":                 '\U000022E9',
-	"succsim;":                  '\U0000227F',
-	"sum;":                      '\U00002211',
-	"sung;":                     '\U0000266A',
-	"sup;":                      '\U00002283',
-	"sup1;":                     '\U000000B9',
-	"sup2;":                     '\U000000B2',
-	"sup3;":                     '\U000000B3',
-	"supE;":                     '\U00002AC6',
-	"supdot;":                   '\U00002ABE',
-	"supdsub;":                  '\U00002AD8',
-	"supe;":                     '\U00002287',
-	"supedot;":                  '\U00002AC4',
-	"suphsol;":                  '\U000027C9',
-	"suphsub;":                  '\U00002AD7',
-	"suplarr;":                  '\U0000297B',
-	"supmult;":                  '\U00002AC2',
-	"supnE;":                    '\U00002ACC',
-	"supne;":                    '\U0000228B',
-	"supplus;":                  '\U00002AC0',
-	"supset;":                   '\U00002283',
-	"supseteq;":                 '\U00002287',
-	"supseteqq;":                '\U00002AC6',
-	"supsetneq;":                '\U0000228B',
-	"supsetneqq;":               '\U00002ACC',
-	"supsim;":                   '\U00002AC8',
-	"supsub;":                   '\U00002AD4',
-	"supsup;":                   '\U00002AD6',
-	"swArr;":                    '\U000021D9',
-	"swarhk;":                   '\U00002926',
-	"swarr;":                    '\U00002199',
-	"swarrow;":                  '\U00002199',
-	"swnwar;":                   '\U0000292A',
-	"szlig;":                    '\U000000DF',
-	"target;":                   '\U00002316',
-	"tau;":                      '\U000003C4',
-	"tbrk;":                     '\U000023B4',
-	"tcaron;":                   '\U00000165',
-	"tcedil;":                   '\U00000163',
-	"tcy;":                      '\U00000442',
-	"tdot;":                     '\U000020DB',
-	"telrec;":                   '\U00002315',
-	"tfr;":                      '\U0001D531',
-	"there4;":                   '\U00002234',
-	"therefore;":                '\U00002234',
-	"theta;":                    '\U000003B8',
-	"thetasym;":                 '\U000003D1',
-	"thetav;":                   '\U000003D1',
-	"thickapprox;":              '\U00002248',
-	"thicksim;":                 '\U0000223C',
-	"thinsp;":                   '\U00002009',
-	"thkap;":                    '\U00002248',
-	"thksim;":                   '\U0000223C',
-	"thorn;":                    '\U000000FE',
-	"tilde;":                    '\U000002DC',
-	"times;":                    '\U000000D7',
-	"timesb;":                   '\U000022A0',
-	"timesbar;":                 '\U00002A31',
-	"timesd;":                   '\U00002A30',
-	"tint;":                     '\U0000222D',
-	"toea;":                     '\U00002928',
-	"top;":                      '\U000022A4',
-	"topbot;":                   '\U00002336',
-	"topcir;":                   '\U00002AF1',
-	"topf;":                     '\U0001D565',
-	"topfork;":                  '\U00002ADA',
-	"tosa;":                     '\U00002929',
-	"tprime;":                   '\U00002034',
-	"trade;":                    '\U00002122',
-	"triangle;":                 '\U000025B5',
-	"triangledown;":             '\U000025BF',
-	"triangleleft;":             '\U000025C3',
-	"trianglelefteq;":           '\U000022B4',
-	"triangleq;":                '\U0000225C',
-	"triangleright;":            '\U000025B9',
-	"trianglerighteq;":          '\U000022B5',
-	"tridot;":                   '\U000025EC',
-	"trie;":                     '\U0000225C',
-	"triminus;":                 '\U00002A3A',
-	"triplus;":                  '\U00002A39',
-	"trisb;":                    '\U000029CD',
-	"tritime;":                  '\U00002A3B',
-	"trpezium;":                 '\U000023E2',
-	"tscr;":                     '\U0001D4C9',
-	"tscy;":                     '\U00000446',
-	"tshcy;":                    '\U0000045B',
-	"tstrok;":                   '\U00000167',
-	"twixt;":                    '\U0000226C',
-	"twoheadleftarrow;":         '\U0000219E',
-	"twoheadrightarrow;":        '\U000021A0',
-	"uArr;":                     '\U000021D1',
-	"uHar;":                     '\U00002963',
-	"uacute;":                   '\U000000FA',
-	"uarr;":                     '\U00002191',
-	"ubrcy;":                    '\U0000045E',
-	"ubreve;":                   '\U0000016D',
-	"ucirc;":                    '\U000000FB',
-	"ucy;":                      '\U00000443',
-	"udarr;":                    '\U000021C5',
-	"udblac;":                   '\U00000171',
-	"udhar;":                    '\U0000296E',
-	"ufisht;":                   '\U0000297E',
-	"ufr;":                      '\U0001D532',
-	"ugrave;":                   '\U000000F9',
-	"uharl;":                    '\U000021BF',
-	"uharr;":                    '\U000021BE',
-	"uhblk;":                    '\U00002580',
-	"ulcorn;":                   '\U0000231C',
-	"ulcorner;":                 '\U0000231C',
-	"ulcrop;":                   '\U0000230F',
-	"ultri;":                    '\U000025F8',
-	"umacr;":                    '\U0000016B',
-	"uml;":                      '\U000000A8',
-	"uogon;":                    '\U00000173',
-	"uopf;":                     '\U0001D566',
-	"uparrow;":                  '\U00002191',
-	"updownarrow;":              '\U00002195',
-	"upharpoonleft;":            '\U000021BF',
-	"upharpoonright;":           '\U000021BE',
-	"uplus;":                    '\U0000228E',
-	"upsi;":                     '\U000003C5',
-	"upsih;":                    '\U000003D2',
-	"upsilon;":                  '\U000003C5',
-	"upuparrows;":               '\U000021C8',
-	"urcorn;":                   '\U0000231D',
-	"urcorner;":                 '\U0000231D',
-	"urcrop;":                   '\U0000230E',
-	"uring;":                    '\U0000016F',
-	"urtri;":                    '\U000025F9',
-	"uscr;":                     '\U0001D4CA',
-	"utdot;":                    '\U000022F0',
-	"utilde;":                   '\U00000169',
-	"utri;":                     '\U000025B5',
-	"utrif;":                    '\U000025B4',
-	"uuarr;":                    '\U000021C8',
-	"uuml;":                     '\U000000FC',
-	"uwangle;":                  '\U000029A7',
-	"vArr;":                     '\U000021D5',
-	"vBar;":                     '\U00002AE8',
-	"vBarv;":                    '\U00002AE9',
-	"vDash;":                    '\U000022A8',
-	"vangrt;":                   '\U0000299C',
-	"varepsilon;":               '\U000003F5',
-	"varkappa;":                 '\U000003F0',
-	"varnothing;":               '\U00002205',
-	"varphi;":                   '\U000003D5',
-	"varpi;":                    '\U000003D6',
-	"varpropto;":                '\U0000221D',
-	"varr;":                     '\U00002195',
-	"varrho;":                   '\U000003F1',
-	"varsigma;":                 '\U000003C2',
-	"vartheta;":                 '\U000003D1',
-	"vartriangleleft;":          '\U000022B2',
-	"vartriangleright;":         '\U000022B3',
-	"vcy;":                      '\U00000432',
-	"vdash;":                    '\U000022A2',
-	"vee;":                      '\U00002228',
-	"veebar;":                   '\U000022BB',
-	"veeeq;":                    '\U0000225A',
-	"vellip;":                   '\U000022EE',
-	"verbar;":                   '\U0000007C',
-	"vert;":                     '\U0000007C',
-	"vfr;":                      '\U0001D533',
-	"vltri;":                    '\U000022B2',
-	"vopf;":                     '\U0001D567',
-	"vprop;":                    '\U0000221D',
-	"vrtri;":                    '\U000022B3',
-	"vscr;":                     '\U0001D4CB',
-	"vzigzag;":                  '\U0000299A',
-	"wcirc;":                    '\U00000175',
-	"wedbar;":                   '\U00002A5F',
-	"wedge;":                    '\U00002227',
-	"wedgeq;":                   '\U00002259',
-	"weierp;":                   '\U00002118',
-	"wfr;":                      '\U0001D534',
-	"wopf;":                     '\U0001D568',
-	"wp;":                       '\U00002118',
-	"wr;":                       '\U00002240',
-	"wreath;":                   '\U00002240',
-	"wscr;":                     '\U0001D4CC',
-	"xcap;":                     '\U000022C2',
-	"xcirc;":                    '\U000025EF',
-	"xcup;":                     '\U000022C3',
-	"xdtri;":                    '\U000025BD',
-	"xfr;":                      '\U0001D535',
-	"xhArr;":                    '\U000027FA',
-	"xharr;":                    '\U000027F7',
-	"xi;":                       '\U000003BE',
-	"xlArr;":                    '\U000027F8',
-	"xlarr;":                    '\U000027F5',
-	"xmap;":                     '\U000027FC',
-	"xnis;":                     '\U000022FB',
-	"xodot;":                    '\U00002A00',
-	"xopf;":                     '\U0001D569',
-	"xoplus;":                   '\U00002A01',
-	"xotime;":                   '\U00002A02',
-	"xrArr;":                    '\U000027F9',
-	"xrarr;":                    '\U000027F6',
-	"xscr;":                     '\U0001D4CD',
-	"xsqcup;":                   '\U00002A06',
-	"xuplus;":                   '\U00002A04',
-	"xutri;":                    '\U000025B3',
-	"xvee;":                     '\U000022C1',
-	"xwedge;":                   '\U000022C0',
-	"yacute;":                   '\U000000FD',
-	"yacy;":                     '\U0000044F',
-	"ycirc;":                    '\U00000177',
-	"ycy;":                      '\U0000044B',
-	"yen;":                      '\U000000A5',
-	"yfr;":                      '\U0001D536',
-	"yicy;":                     '\U00000457',
-	"yopf;":                     '\U0001D56A',
-	"yscr;":                     '\U0001D4CE',
-	"yucy;":                     '\U0000044E',
-	"yuml;":                     '\U000000FF',
-	"zacute;":                   '\U0000017A',
-	"zcaron;":                   '\U0000017E',
-	"zcy;":                      '\U00000437',
-	"zdot;":                     '\U0000017C',
-	"zeetrf;":                   '\U00002128',
-	"zeta;":                     '\U000003B6',
-	"zfr;":                      '\U0001D537',
-	"zhcy;":                     '\U00000436',
-	"zigrarr;":                  '\U000021DD',
-	"zopf;":                     '\U0001D56B',
-	"zscr;":                     '\U0001D4CF',
-	"zwj;":                      '\U0000200D',
-	"zwnj;":                     '\U0000200C',
-	"AElig":                     '\U000000C6',
-	"AMP":                       '\U00000026',
-	"Aacute":                    '\U000000C1',
-	"Acirc":                     '\U000000C2',
-	"Agrave":                    '\U000000C0',
-	"Aring":                     '\U000000C5',
-	"Atilde":                    '\U000000C3',
-	"Auml":                      '\U000000C4',
-	"COPY":                      '\U000000A9',
-	"Ccedil":                    '\U000000C7',
-	"ETH":                       '\U000000D0',
-	"Eacute":                    '\U000000C9',
-	"Ecirc":                     '\U000000CA',
-	"Egrave":                    '\U000000C8',
-	"Euml":                      '\U000000CB',
-	"GT":                        '\U0000003E',
-	"Iacute":                    '\U000000CD',
-	"Icirc":                     '\U000000CE',
-	"Igrave":                    '\U000000CC',
-	"Iuml":                      '\U000000CF',
-	"LT":                        '\U0000003C',
-	"Ntilde":                    '\U000000D1',
-	"Oacute":                    '\U000000D3',
-	"Ocirc":                     '\U000000D4',
-	"Ograve":                    '\U000000D2',
-	"Oslash":                    '\U000000D8',
-	"Otilde":                    '\U000000D5',
-	"Ouml":                      '\U000000D6',
-	"QUOT":                      '\U00000022',
-	"REG":                       '\U000000AE',
-	"THORN":                     '\U000000DE',
-	"Uacute":                    '\U000000DA',
-	"Ucirc":                     '\U000000DB',
-	"Ugrave":                    '\U000000D9',
-	"Uuml":                      '\U000000DC',
-	"Yacute":                    '\U000000DD',
-	"aacute":                    '\U000000E1',
-	"acirc":                     '\U000000E2',
-	"acute":                     '\U000000B4',
-	"aelig":                     '\U000000E6',
-	"agrave":                    '\U000000E0',
-	"amp":                       '\U00000026',
-	"aring":                     '\U000000E5',
-	"atilde":                    '\U000000E3',
-	"auml":                      '\U000000E4',
-	"brvbar":                    '\U000000A6',
-	"ccedil":                    '\U000000E7',
-	"cedil":                     '\U000000B8',
-	"cent":                      '\U000000A2',
-	"copy":                      '\U000000A9',
-	"curren":                    '\U000000A4',
-	"deg":                       '\U000000B0',
-	"divide":                    '\U000000F7',
-	"eacute":                    '\U000000E9',
-	"ecirc":                     '\U000000EA',
-	"egrave":                    '\U000000E8',
-	"eth":                       '\U000000F0',
-	"euml":                      '\U000000EB',
-	"frac12":                    '\U000000BD',
-	"frac14":                    '\U000000BC',
-	"frac34":                    '\U000000BE',
-	"gt":                        '\U0000003E',
-	"iacute":                    '\U000000ED',
-	"icirc":                     '\U000000EE',
-	"iexcl":                     '\U000000A1',
-	"igrave":                    '\U000000EC',
-	"iquest":                    '\U000000BF',
-	"iuml":                      '\U000000EF',
-	"laquo":                     '\U000000AB',
-	"lt":                        '\U0000003C',
-	"macr":                      '\U000000AF',
-	"micro":                     '\U000000B5',
-	"middot":                    '\U000000B7',
-	"nbsp":                      '\U000000A0',
-	"not":                       '\U000000AC',
-	"ntilde":                    '\U000000F1',
-	"oacute":                    '\U000000F3',
-	"ocirc":                     '\U000000F4',
-	"ograve":                    '\U000000F2',
-	"ordf":                      '\U000000AA',
-	"ordm":                      '\U000000BA',
-	"oslash":                    '\U000000F8',
-	"otilde":                    '\U000000F5',
-	"ouml":                      '\U000000F6',
-	"para":                      '\U000000B6',
-	"plusmn":                    '\U000000B1',
-	"pound":                     '\U000000A3',
-	"quot":                      '\U00000022',
-	"raquo":                     '\U000000BB',
-	"reg":                       '\U000000AE',
-	"sect":                      '\U000000A7',
-	"shy":                       '\U000000AD',
-	"sup1":                      '\U000000B9',
-	"sup2":                      '\U000000B2',
-	"sup3":                      '\U000000B3',
-	"szlig":                     '\U000000DF',
-	"thorn":                     '\U000000FE',
-	"times":                     '\U000000D7',
-	"uacute":                    '\U000000FA',
-	"ucirc":                     '\U000000FB',
-	"ugrave":                    '\U000000F9',
-	"uml":                       '\U000000A8',
-	"uuml":                      '\U000000FC',
-	"yacute":                    '\U000000FD',
-	"yen":                       '\U000000A5',
-	"yuml":                      '\U000000FF',
-}
-
-// HTML entities that are two unicode codepoints.
-var entity2 = map[string][2]rune{
-	// TODO(nigeltao): Handle replacements that are wider than their names.
-	// "nLt;":                     {'\u226A', '\u20D2'},
-	// "nGt;":                     {'\u226B', '\u20D2'},
-	"NotEqualTilde;":           {'\u2242', '\u0338'},
-	"NotGreaterFullEqual;":     {'\u2267', '\u0338'},
-	"NotGreaterGreater;":       {'\u226B', '\u0338'},
-	"NotGreaterSlantEqual;":    {'\u2A7E', '\u0338'},
-	"NotHumpDownHump;":         {'\u224E', '\u0338'},
-	"NotHumpEqual;":            {'\u224F', '\u0338'},
-	"NotLeftTriangleBar;":      {'\u29CF', '\u0338'},
-	"NotLessLess;":             {'\u226A', '\u0338'},
-	"NotLessSlantEqual;":       {'\u2A7D', '\u0338'},
-	"NotNestedGreaterGreater;": {'\u2AA2', '\u0338'},
-	"NotNestedLessLess;":       {'\u2AA1', '\u0338'},
-	"NotPrecedesEqual;":        {'\u2AAF', '\u0338'},
-	"NotRightTriangleBar;":     {'\u29D0', '\u0338'},
-	"NotSquareSubset;":         {'\u228F', '\u0338'},
-	"NotSquareSuperset;":       {'\u2290', '\u0338'},
-	"NotSubset;":               {'\u2282', '\u20D2'},
-	"NotSucceedsEqual;":        {'\u2AB0', '\u0338'},
-	"NotSucceedsTilde;":        {'\u227F', '\u0338'},
-	"NotSuperset;":             {'\u2283', '\u20D2'},
-	"ThickSpace;":              {'\u205F', '\u200A'},
-	"acE;":                     {'\u223E', '\u0333'},
-	"bne;":                     {'\u003D', '\u20E5'},
-	"bnequiv;":                 {'\u2261', '\u20E5'},
-	"caps;":                    {'\u2229', '\uFE00'},
-	"cups;":                    {'\u222A', '\uFE00'},
-	"fjlig;":                   {'\u0066', '\u006A'},
-	"gesl;":                    {'\u22DB', '\uFE00'},
-	"gvertneqq;":               {'\u2269', '\uFE00'},
-	"gvnE;":                    {'\u2269', '\uFE00'},
-	"lates;":                   {'\u2AAD', '\uFE00'},
-	"lesg;":                    {'\u22DA', '\uFE00'},
-	"lvertneqq;":               {'\u2268', '\uFE00'},
-	"lvnE;":                    {'\u2268', '\uFE00'},
-	"nGg;":                     {'\u22D9', '\u0338'},
-	"nGtv;":                    {'\u226B', '\u0338'},
-	"nLl;":                     {'\u22D8', '\u0338'},
-	"nLtv;":                    {'\u226A', '\u0338'},
-	"nang;":                    {'\u2220', '\u20D2'},
-	"napE;":                    {'\u2A70', '\u0338'},
-	"napid;":                   {'\u224B', '\u0338'},
-	"nbump;":                   {'\u224E', '\u0338'},
-	"nbumpe;":                  {'\u224F', '\u0338'},
-	"ncongdot;":                {'\u2A6D', '\u0338'},
-	"nedot;":                   {'\u2250', '\u0338'},
-	"nesim;":                   {'\u2242', '\u0338'},
-	"ngE;":                     {'\u2267', '\u0338'},
-	"ngeqq;":                   {'\u2267', '\u0338'},
-	"ngeqslant;":               {'\u2A7E', '\u0338'},
-	"nges;":                    {'\u2A7E', '\u0338'},
-	"nlE;":                     {'\u2266', '\u0338'},
-	"nleqq;":                   {'\u2266', '\u0338'},
-	"nleqslant;":               {'\u2A7D', '\u0338'},
-	"nles;":                    {'\u2A7D', '\u0338'},
-	"notinE;":                  {'\u22F9', '\u0338'},
-	"notindot;":                {'\u22F5', '\u0338'},
-	"nparsl;":                  {'\u2AFD', '\u20E5'},
-	"npart;":                   {'\u2202', '\u0338'},
-	"npre;":                    {'\u2AAF', '\u0338'},
-	"npreceq;":                 {'\u2AAF', '\u0338'},
-	"nrarrc;":                  {'\u2933', '\u0338'},
-	"nrarrw;":                  {'\u219D', '\u0338'},
-	"nsce;":                    {'\u2AB0', '\u0338'},
-	"nsubE;":                   {'\u2AC5', '\u0338'},
-	"nsubset;":                 {'\u2282', '\u20D2'},
-	"nsubseteqq;":              {'\u2AC5', '\u0338'},
-	"nsucceq;":                 {'\u2AB0', '\u0338'},
-	"nsupE;":                   {'\u2AC6', '\u0338'},
-	"nsupset;":                 {'\u2283', '\u20D2'},
-	"nsupseteqq;":              {'\u2AC6', '\u0338'},
-	"nvap;":                    {'\u224D', '\u20D2'},
-	"nvge;":                    {'\u2265', '\u20D2'},
-	"nvgt;":                    {'\u003E', '\u20D2'},
-	"nvle;":                    {'\u2264', '\u20D2'},
-	"nvlt;":                    {'\u003C', '\u20D2'},
-	"nvltrie;":                 {'\u22B4', '\u20D2'},
-	"nvrtrie;":                 {'\u22B5', '\u20D2'},
-	"nvsim;":                   {'\u223C', '\u20D2'},
-	"race;":                    {'\u223D', '\u0331'},
-	"smtes;":                   {'\u2AAC', '\uFE00'},
-	"sqcaps;":                  {'\u2293', '\uFE00'},
-	"sqcups;":                  {'\u2294', '\uFE00'},
-	"varsubsetneq;":            {'\u228A', '\uFE00'},
-	"varsubsetneqq;":           {'\u2ACB', '\uFE00'},
-	"varsupsetneq;":            {'\u228B', '\uFE00'},
-	"varsupsetneqq;":           {'\u2ACC', '\uFE00'},
-	"vnsub;":                   {'\u2282', '\u20D2'},
-	"vnsup;":                   {'\u2283', '\u20D2'},
-	"vsubnE;":                  {'\u2ACB', '\uFE00'},
-	"vsubne;":                  {'\u228A', '\uFE00'},
-	"vsupnE;":                  {'\u2ACC', '\uFE00'},
-	"vsupne;":                  {'\u228B', '\uFE00'},
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/escape.go b/Godeps/_workspace/src/golang.org/x/net/html/escape.go
deleted file mode 100644
index d856139620..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/escape.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bytes"
-	"strings"
-	"unicode/utf8"
-)
-
-// These replacements permit compatibility with old numeric entities that
-// assumed Windows-1252 encoding.
-// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
-var replacementTable = [...]rune{
-	'\u20AC', // First entry is what 0x80 should be replaced with.
-	'\u0081',
-	'\u201A',
-	'\u0192',
-	'\u201E',
-	'\u2026',
-	'\u2020',
-	'\u2021',
-	'\u02C6',
-	'\u2030',
-	'\u0160',
-	'\u2039',
-	'\u0152',
-	'\u008D',
-	'\u017D',
-	'\u008F',
-	'\u0090',
-	'\u2018',
-	'\u2019',
-	'\u201C',
-	'\u201D',
-	'\u2022',
-	'\u2013',
-	'\u2014',
-	'\u02DC',
-	'\u2122',
-	'\u0161',
-	'\u203A',
-	'\u0153',
-	'\u009D',
-	'\u017E',
-	'\u0178', // Last entry is 0x9F.
-	// 0x00->'\uFFFD' is handled programmatically.
-	// 0x0D->'\u000D' is a no-op.
-}
-
-// unescapeEntity reads an entity like "&lt;" from b[src:] and writes the
-// corresponding "<" to b[dst:], returning the incremented dst and src cursors.
-// Precondition: b[src] == '&' && dst <= src.
-// attribute should be true if parsing an attribute value.
-func unescapeEntity(b []byte, dst, src int, attribute bool) (dst1, src1 int) {
-	// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
-
-	// i starts at 1 because we already know that s[0] == '&'.
-	i, s := 1, b[src:]
-
-	if len(s) <= 1 {
-		b[dst] = b[src]
-		return dst + 1, src + 1
-	}
-
-	if s[i] == '#' {
-		if len(s) <= 3 { // We need to have at least "&#.".
-			b[dst] = b[src]
-			return dst + 1, src + 1
-		}
-		i++
-		c := s[i]
-		hex := false
-		if c == 'x' || c == 'X' {
-			hex = true
-			i++
-		}
-
-		x := '\x00'
-		for i < len(s) {
-			c = s[i]
-			i++
-			if hex {
-				if '0' <= c && c <= '9' {
-					x = 16*x + rune(c) - '0'
-					continue
-				} else if 'a' <= c && c <= 'f' {
-					x = 16*x + rune(c) - 'a' + 10
-					continue
-				} else if 'A' <= c && c <= 'F' {
-					x = 16*x + rune(c) - 'A' + 10
-					continue
-				}
-			} else if '0' <= c && c <= '9' {
-				x = 10*x + rune(c) - '0'
-				continue
-			}
-			if c != ';' {
-				i--
-			}
-			break
-		}
-
-		if i <= 3 { // No characters matched.
-			b[dst] = b[src]
-			return dst + 1, src + 1
-		}
-
-		if 0x80 <= x && x <= 0x9F {
-			// Replace characters from Windows-1252 with UTF-8 equivalents.
-			x = replacementTable[x-0x80]
-		} else if x == 0 || (0xD800 <= x && x <= 0xDFFF) || x > 0x10FFFF {
-			// Replace invalid characters with the replacement character.
-			x = '\uFFFD'
-		}
-
-		return dst + utf8.EncodeRune(b[dst:], x), src + i
-	}
-
-	// Consume the maximum number of characters possible, with the
-	// consumed characters matching one of the named references.
-
-	for i < len(s) {
-		c := s[i]
-		i++
-		// Lower-cased characters are more common in entities, so we check for them first.
-		if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' {
-			continue
-		}
-		if c != ';' {
-			i--
-		}
-		break
-	}
-
-	entityName := string(s[1:i])
-	if entityName == "" {
-		// No-op.
-	} else if attribute && entityName[len(entityName)-1] != ';' && len(s) > i && s[i] == '=' {
-		// No-op.
-	} else if x := entity[entityName]; x != 0 {
-		return dst + utf8.EncodeRune(b[dst:], x), src + i
-	} else if x := entity2[entityName]; x[0] != 0 {
-		dst1 := dst + utf8.EncodeRune(b[dst:], x[0])
-		return dst1 + utf8.EncodeRune(b[dst1:], x[1]), src + i
-	} else if !attribute {
-		maxLen := len(entityName) - 1
-		if maxLen > longestEntityWithoutSemicolon {
-			maxLen = longestEntityWithoutSemicolon
-		}
-		for j := maxLen; j > 1; j-- {
-			if x := entity[entityName[:j]]; x != 0 {
-				return dst + utf8.EncodeRune(b[dst:], x), src + j + 1
-			}
-		}
-	}
-
-	dst1, src1 = dst+i, src+i
-	copy(b[dst:dst1], b[src:src1])
-	return dst1, src1
-}
-
-// unescape unescapes b's entities in-place, so that "a&lt;b" becomes "a<b".
-// attribute should be true if parsing an attribute value.
-func unescape(b []byte, attribute bool) []byte {
-	for i, c := range b {
-		if c == '&' {
-			dst, src := unescapeEntity(b, i, i, attribute)
-			for src < len(b) {
-				c := b[src]
-				if c == '&' {
-					dst, src = unescapeEntity(b, dst, src, attribute)
-				} else {
-					b[dst] = c
-					dst, src = dst+1, src+1
-				}
-			}
-			return b[0:dst]
-		}
-	}
-	return b
-}
-
-// lower lower-cases the A-Z bytes in b in-place, so that "aBc" becomes "abc".
-func lower(b []byte) []byte {
-	for i, c := range b {
-		if 'A' <= c && c <= 'Z' {
-			b[i] = c + 'a' - 'A'
-		}
-	}
-	return b
-}
-
-const escapedChars = "&'<>\"\r"
-
-func escape(w writer, s string) error {
-	i := strings.IndexAny(s, escapedChars)
-	for i != -1 {
-		if _, err := w.WriteString(s[:i]); err != nil {
-			return err
-		}
-		var esc string
-		switch s[i] {
-		case '&':
-			esc = "&amp;"
-		case '\'':
-			// "&#39;" is shorter than "&apos;" and apos was not in HTML until HTML5.
-			esc = "&#39;"
-		case '<':
-			esc = "&lt;"
-		case '>':
-			esc = "&gt;"
-		case '"':
-			// "&#34;" is shorter than "&quot;".
-			esc = "&#34;"
-		case '\r':
-			esc = "&#13;"
-		default:
-			panic("unrecognized escape character")
-		}
-		s = s[i+1:]
-		if _, err := w.WriteString(esc); err != nil {
-			return err
-		}
-		i = strings.IndexAny(s, escapedChars)
-	}
-	_, err := w.WriteString(s)
-	return err
-}
-
-// EscapeString escapes special characters like "<" to become "&lt;". It
-// escapes only five such characters: <, >, &, ' and ".
-// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
-// always true.
-func EscapeString(s string) string {
-	if strings.IndexAny(s, escapedChars) == -1 {
-		return s
-	}
-	var buf bytes.Buffer
-	escape(&buf, s)
-	return buf.String()
-}
-
-// UnescapeString unescapes entities like "&lt;" to become "<". It unescapes a
-// larger range of entities than EscapeString escapes. For example, "&aacute;"
-// unescapes to "á", as does "&#225;" and "&xE1;".
-// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
-// always true.
-func UnescapeString(s string) string {
-	for _, c := range s {
-		if c == '&' {
-			return string(unescape([]byte(s), false))
-		}
-	}
-	return s
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/foreign.go b/Godeps/_workspace/src/golang.org/x/net/html/foreign.go
deleted file mode 100644
index d3b3844099..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/foreign.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"strings"
-)
-
-func adjustAttributeNames(aa []Attribute, nameMap map[string]string) {
-	for i := range aa {
-		if newName, ok := nameMap[aa[i].Key]; ok {
-			aa[i].Key = newName
-		}
-	}
-}
-
-func adjustForeignAttributes(aa []Attribute) {
-	for i, a := range aa {
-		if a.Key == "" || a.Key[0] != 'x' {
-			continue
-		}
-		switch a.Key {
-		case "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show",
-			"xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "xmlns:xlink":
-			j := strings.Index(a.Key, ":")
-			aa[i].Namespace = a.Key[:j]
-			aa[i].Key = a.Key[j+1:]
-		}
-	}
-}
-
-func htmlIntegrationPoint(n *Node) bool {
-	if n.Type != ElementNode {
-		return false
-	}
-	switch n.Namespace {
-	case "math":
-		if n.Data == "annotation-xml" {
-			for _, a := range n.Attr {
-				if a.Key == "encoding" {
-					val := strings.ToLower(a.Val)
-					if val == "text/html" || val == "application/xhtml+xml" {
-						return true
-					}
-				}
-			}
-		}
-	case "svg":
-		switch n.Data {
-		case "desc", "foreignObject", "title":
-			return true
-		}
-	}
-	return false
-}
-
-func mathMLTextIntegrationPoint(n *Node) bool {
-	if n.Namespace != "math" {
-		return false
-	}
-	switch n.Data {
-	case "mi", "mo", "mn", "ms", "mtext":
-		return true
-	}
-	return false
-}
-
-// Section 12.2.5.5.
-var breakout = map[string]bool{
-	"b":          true,
-	"big":        true,
-	"blockquote": true,
-	"body":       true,
-	"br":         true,
-	"center":     true,
-	"code":       true,
-	"dd":         true,
-	"div":        true,
-	"dl":         true,
-	"dt":         true,
-	"em":         true,
-	"embed":      true,
-	"h1":         true,
-	"h2":         true,
-	"h3":         true,
-	"h4":         true,
-	"h5":         true,
-	"h6":         true,
-	"head":       true,
-	"hr":         true,
-	"i":          true,
-	"img":        true,
-	"li":         true,
-	"listing":    true,
-	"menu":       true,
-	"meta":       true,
-	"nobr":       true,
-	"ol":         true,
-	"p":          true,
-	"pre":        true,
-	"ruby":       true,
-	"s":          true,
-	"small":      true,
-	"span":       true,
-	"strong":     true,
-	"strike":     true,
-	"sub":        true,
-	"sup":        true,
-	"table":      true,
-	"tt":         true,
-	"u":          true,
-	"ul":         true,
-	"var":        true,
-}
-
-// Section 12.2.5.5.
-var svgTagNameAdjustments = map[string]string{
-	"altglyph":            "altGlyph",
-	"altglyphdef":         "altGlyphDef",
-	"altglyphitem":        "altGlyphItem",
-	"animatecolor":        "animateColor",
-	"animatemotion":       "animateMotion",
-	"animatetransform":    "animateTransform",
-	"clippath":            "clipPath",
-	"feblend":             "feBlend",
-	"fecolormatrix":       "feColorMatrix",
-	"fecomponenttransfer": "feComponentTransfer",
-	"fecomposite":         "feComposite",
-	"feconvolvematrix":    "feConvolveMatrix",
-	"fediffuselighting":   "feDiffuseLighting",
-	"fedisplacementmap":   "feDisplacementMap",
-	"fedistantlight":      "feDistantLight",
-	"feflood":             "feFlood",
-	"fefunca":             "feFuncA",
-	"fefuncb":             "feFuncB",
-	"fefuncg":             "feFuncG",
-	"fefuncr":             "feFuncR",
-	"fegaussianblur":      "feGaussianBlur",
-	"feimage":             "feImage",
-	"femerge":             "feMerge",
-	"femergenode":         "feMergeNode",
-	"femorphology":        "feMorphology",
-	"feoffset":            "feOffset",
-	"fepointlight":        "fePointLight",
-	"fespecularlighting":  "feSpecularLighting",
-	"fespotlight":         "feSpotLight",
-	"fetile":              "feTile",
-	"feturbulence":        "feTurbulence",
-	"foreignobject":       "foreignObject",
-	"glyphref":            "glyphRef",
-	"lineargradient":      "linearGradient",
-	"radialgradient":      "radialGradient",
-	"textpath":            "textPath",
-}
-
-// Section 12.2.5.1
-var mathMLAttributeAdjustments = map[string]string{
-	"definitionurl": "definitionURL",
-}
-
-var svgAttributeAdjustments = map[string]string{
-	"attributename":             "attributeName",
-	"attributetype":             "attributeType",
-	"basefrequency":             "baseFrequency",
-	"baseprofile":               "baseProfile",
-	"calcmode":                  "calcMode",
-	"clippathunits":             "clipPathUnits",
-	"contentscripttype":         "contentScriptType",
-	"contentstyletype":          "contentStyleType",
-	"diffuseconstant":           "diffuseConstant",
-	"edgemode":                  "edgeMode",
-	"externalresourcesrequired": "externalResourcesRequired",
-	"filterres":                 "filterRes",
-	"filterunits":               "filterUnits",
-	"glyphref":                  "glyphRef",
-	"gradienttransform":         "gradientTransform",
-	"gradientunits":             "gradientUnits",
-	"kernelmatrix":              "kernelMatrix",
-	"kernelunitlength":          "kernelUnitLength",
-	"keypoints":                 "keyPoints",
-	"keysplines":                "keySplines",
-	"keytimes":                  "keyTimes",
-	"lengthadjust":              "lengthAdjust",
-	"limitingconeangle":         "limitingConeAngle",
-	"markerheight":              "markerHeight",
-	"markerunits":               "markerUnits",
-	"markerwidth":               "markerWidth",
-	"maskcontentunits":          "maskContentUnits",
-	"maskunits":                 "maskUnits",
-	"numoctaves":                "numOctaves",
-	"pathlength":                "pathLength",
-	"patterncontentunits":       "patternContentUnits",
-	"patterntransform":          "patternTransform",
-	"patternunits":              "patternUnits",
-	"pointsatx":                 "pointsAtX",
-	"pointsaty":                 "pointsAtY",
-	"pointsatz":                 "pointsAtZ",
-	"preservealpha":             "preserveAlpha",
-	"preserveaspectratio":       "preserveAspectRatio",
-	"primitiveunits":            "primitiveUnits",
-	"refx":                      "refX",
-	"refy":                      "refY",
-	"repeatcount":               "repeatCount",
-	"repeatdur":                 "repeatDur",
-	"requiredextensions":        "requiredExtensions",
-	"requiredfeatures":          "requiredFeatures",
-	"specularconstant":          "specularConstant",
-	"specularexponent":          "specularExponent",
-	"spreadmethod":              "spreadMethod",
-	"startoffset":               "startOffset",
-	"stddeviation":              "stdDeviation",
-	"stitchtiles":               "stitchTiles",
-	"surfacescale":              "surfaceScale",
-	"systemlanguage":            "systemLanguage",
-	"tablevalues":               "tableValues",
-	"targetx":                   "targetX",
-	"targety":                   "targetY",
-	"textlength":                "textLength",
-	"viewbox":                   "viewBox",
-	"viewtarget":                "viewTarget",
-	"xchannelselector":          "xChannelSelector",
-	"ychannelselector":          "yChannelSelector",
-	"zoomandpan":                "zoomAndPan",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/node.go b/Godeps/_workspace/src/golang.org/x/net/html/node.go
deleted file mode 100644
index 26b657aec8..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/node.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"golang.org/x/net/html/atom"
-)
-
-// A NodeType is the type of a Node.
-type NodeType uint32
-
-const (
-	ErrorNode NodeType = iota
-	TextNode
-	DocumentNode
-	ElementNode
-	CommentNode
-	DoctypeNode
-	scopeMarkerNode
-)
-
-// Section 12.2.3.3 says "scope markers are inserted when entering applet
-// elements, buttons, object elements, marquees, table cells, and table
-// captions, and are used to prevent formatting from 'leaking'".
-var scopeMarker = Node{Type: scopeMarkerNode}
-
-// A Node consists of a NodeType and some Data (tag name for element nodes,
-// content for text) and are part of a tree of Nodes. Element nodes may also
-// have a Namespace and contain a slice of Attributes. Data is unescaped, so
-// that it looks like "a<b" rather than "a&lt;b". For element nodes, DataAtom
-// is the atom for Data, or zero if Data is not a known tag name.
-//
-// An empty Namespace implies a "http://www.w3.org/1999/xhtml" namespace.
-// Similarly, "math" is short for "http://www.w3.org/1998/Math/MathML", and
-// "svg" is short for "http://www.w3.org/2000/svg".
-type Node struct {
-	Parent, FirstChild, LastChild, PrevSibling, NextSibling *Node
-
-	Type      NodeType
-	DataAtom  atom.Atom
-	Data      string
-	Namespace string
-	Attr      []Attribute
-}
-
-// InsertBefore inserts newChild as a child of n, immediately before oldChild
-// in the sequence of n's children. oldChild may be nil, in which case newChild
-// is appended to the end of n's children.
-//
-// It will panic if newChild already has a parent or siblings.
-func (n *Node) InsertBefore(newChild, oldChild *Node) {
-	if newChild.Parent != nil || newChild.PrevSibling != nil || newChild.NextSibling != nil {
-		panic("html: InsertBefore called for an attached child Node")
-	}
-	var prev, next *Node
-	if oldChild != nil {
-		prev, next = oldChild.PrevSibling, oldChild
-	} else {
-		prev = n.LastChild
-	}
-	if prev != nil {
-		prev.NextSibling = newChild
-	} else {
-		n.FirstChild = newChild
-	}
-	if next != nil {
-		next.PrevSibling = newChild
-	} else {
-		n.LastChild = newChild
-	}
-	newChild.Parent = n
-	newChild.PrevSibling = prev
-	newChild.NextSibling = next
-}
-
-// AppendChild adds a node c as a child of n.
-//
-// It will panic if c already has a parent or siblings.
-func (n *Node) AppendChild(c *Node) {
-	if c.Parent != nil || c.PrevSibling != nil || c.NextSibling != nil {
-		panic("html: AppendChild called for an attached child Node")
-	}
-	last := n.LastChild
-	if last != nil {
-		last.NextSibling = c
-	} else {
-		n.FirstChild = c
-	}
-	n.LastChild = c
-	c.Parent = n
-	c.PrevSibling = last
-}
-
-// RemoveChild removes a node c that is a child of n. Afterwards, c will have
-// no parent and no siblings.
-//
-// It will panic if c's parent is not n.
-func (n *Node) RemoveChild(c *Node) {
-	if c.Parent != n {
-		panic("html: RemoveChild called for a non-child Node")
-	}
-	if n.FirstChild == c {
-		n.FirstChild = c.NextSibling
-	}
-	if c.NextSibling != nil {
-		c.NextSibling.PrevSibling = c.PrevSibling
-	}
-	if n.LastChild == c {
-		n.LastChild = c.PrevSibling
-	}
-	if c.PrevSibling != nil {
-		c.PrevSibling.NextSibling = c.NextSibling
-	}
-	c.Parent = nil
-	c.PrevSibling = nil
-	c.NextSibling = nil
-}
-
-// reparentChildren reparents all of src's child nodes to dst.
-func reparentChildren(dst, src *Node) {
-	for {
-		child := src.FirstChild
-		if child == nil {
-			break
-		}
-		src.RemoveChild(child)
-		dst.AppendChild(child)
-	}
-}
-
-// clone returns a new node with the same type, data and attributes.
-// The clone has no parent, no siblings and no children.
-func (n *Node) clone() *Node {
-	m := &Node{
-		Type:     n.Type,
-		DataAtom: n.DataAtom,
-		Data:     n.Data,
-		Attr:     make([]Attribute, len(n.Attr)),
-	}
-	copy(m.Attr, n.Attr)
-	return m
-}
-
-// nodeStack is a stack of nodes.
-type nodeStack []*Node
-
-// pop pops the stack. It will panic if s is empty.
-func (s *nodeStack) pop() *Node {
-	i := len(*s)
-	n := (*s)[i-1]
-	*s = (*s)[:i-1]
-	return n
-}
-
-// top returns the most recently pushed node, or nil if s is empty.
-func (s *nodeStack) top() *Node {
-	if i := len(*s); i > 0 {
-		return (*s)[i-1]
-	}
-	return nil
-}
-
-// index returns the index of the top-most occurrence of n in the stack, or -1
-// if n is not present.
-func (s *nodeStack) index(n *Node) int {
-	for i := len(*s) - 1; i >= 0; i-- {
-		if (*s)[i] == n {
-			return i
-		}
-	}
-	return -1
-}
-
-// insert inserts a node at the given index.
-func (s *nodeStack) insert(i int, n *Node) {
-	(*s) = append(*s, nil)
-	copy((*s)[i+1:], (*s)[i:])
-	(*s)[i] = n
-}
-
-// remove removes a node from the stack. It is a no-op if n is not present.
-func (s *nodeStack) remove(n *Node) {
-	i := s.index(n)
-	if i == -1 {
-		return
-	}
-	copy((*s)[i:], (*s)[i+1:])
-	j := len(*s) - 1
-	(*s)[j] = nil
-	*s = (*s)[:j]
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/parse.go b/Godeps/_workspace/src/golang.org/x/net/html/parse.go
deleted file mode 100644
index be4b2bf5aa..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/parse.go
+++ /dev/null
@@ -1,2094 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-
-	a "golang.org/x/net/html/atom"
-)
-
-// A parser implements the HTML5 parsing algorithm:
-// https://html.spec.whatwg.org/multipage/syntax.html#tree-construction
-type parser struct {
-	// tokenizer provides the tokens for the parser.
-	tokenizer *Tokenizer
-	// tok is the most recently read token.
-	tok Token
-	// Self-closing tags like <hr/> are treated as start tags, except that
-	// hasSelfClosingToken is set while they are being processed.
-	hasSelfClosingToken bool
-	// doc is the document root element.
-	doc *Node
-	// The stack of open elements (section 12.2.3.2) and active formatting
-	// elements (section 12.2.3.3).
-	oe, afe nodeStack
-	// Element pointers (section 12.2.3.4).
-	head, form *Node
-	// Other parsing state flags (section 12.2.3.5).
-	scripting, framesetOK bool
-	// im is the current insertion mode.
-	im insertionMode
-	// originalIM is the insertion mode to go back to after completing a text
-	// or inTableText insertion mode.
-	originalIM insertionMode
-	// fosterParenting is whether new elements should be inserted according to
-	// the foster parenting rules (section 12.2.5.3).
-	fosterParenting bool
-	// quirks is whether the parser is operating in "quirks mode."
-	quirks bool
-	// fragment is whether the parser is parsing an HTML fragment.
-	fragment bool
-	// context is the context element when parsing an HTML fragment
-	// (section 12.4).
-	context *Node
-}
-
-func (p *parser) top() *Node {
-	if n := p.oe.top(); n != nil {
-		return n
-	}
-	return p.doc
-}
-
-// Stop tags for use in popUntil. These come from section 12.2.3.2.
-var (
-	defaultScopeStopTags = map[string][]a.Atom{
-		"":     {a.Applet, a.Caption, a.Html, a.Table, a.Td, a.Th, a.Marquee, a.Object, a.Template},
-		"math": {a.AnnotationXml, a.Mi, a.Mn, a.Mo, a.Ms, a.Mtext},
-		"svg":  {a.Desc, a.ForeignObject, a.Title},
-	}
-)
-
-type scope int
-
-const (
-	defaultScope scope = iota
-	listItemScope
-	buttonScope
-	tableScope
-	tableRowScope
-	tableBodyScope
-	selectScope
-)
-
-// popUntil pops the stack of open elements at the highest element whose tag
-// is in matchTags, provided there is no higher element in the scope's stop
-// tags (as defined in section 12.2.3.2). It returns whether or not there was
-// such an element. If there was not, popUntil leaves the stack unchanged.
-//
-// For example, the set of stop tags for table scope is: "html", "table". If
-// the stack was:
-// ["html", "body", "font", "table", "b", "i", "u"]
-// then popUntil(tableScope, "font") would return false, but
-// popUntil(tableScope, "i") would return true and the stack would become:
-// ["html", "body", "font", "table", "b"]
-//
-// If an element's tag is in both the stop tags and matchTags, then the stack
-// will be popped and the function returns true (provided, of course, there was
-// no higher element in the stack that was also in the stop tags). For example,
-// popUntil(tableScope, "table") returns true and leaves:
-// ["html", "body", "font"]
-func (p *parser) popUntil(s scope, matchTags ...a.Atom) bool {
-	if i := p.indexOfElementInScope(s, matchTags...); i != -1 {
-		p.oe = p.oe[:i]
-		return true
-	}
-	return false
-}
-
-// indexOfElementInScope returns the index in p.oe of the highest element whose
-// tag is in matchTags that is in scope. If no matching element is in scope, it
-// returns -1.
-func (p *parser) indexOfElementInScope(s scope, matchTags ...a.Atom) int {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		tagAtom := p.oe[i].DataAtom
-		if p.oe[i].Namespace == "" {
-			for _, t := range matchTags {
-				if t == tagAtom {
-					return i
-				}
-			}
-			switch s {
-			case defaultScope:
-				// No-op.
-			case listItemScope:
-				if tagAtom == a.Ol || tagAtom == a.Ul {
-					return -1
-				}
-			case buttonScope:
-				if tagAtom == a.Button {
-					return -1
-				}
-			case tableScope:
-				if tagAtom == a.Html || tagAtom == a.Table {
-					return -1
-				}
-			case selectScope:
-				if tagAtom != a.Optgroup && tagAtom != a.Option {
-					return -1
-				}
-			default:
-				panic("unreachable")
-			}
-		}
-		switch s {
-		case defaultScope, listItemScope, buttonScope:
-			for _, t := range defaultScopeStopTags[p.oe[i].Namespace] {
-				if t == tagAtom {
-					return -1
-				}
-			}
-		}
-	}
-	return -1
-}
-
-// elementInScope is like popUntil, except that it doesn't modify the stack of
-// open elements.
-func (p *parser) elementInScope(s scope, matchTags ...a.Atom) bool {
-	return p.indexOfElementInScope(s, matchTags...) != -1
-}
-
-// clearStackToContext pops elements off the stack of open elements until a
-// scope-defined element is found.
-func (p *parser) clearStackToContext(s scope) {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		tagAtom := p.oe[i].DataAtom
-		switch s {
-		case tableScope:
-			if tagAtom == a.Html || tagAtom == a.Table {
-				p.oe = p.oe[:i+1]
-				return
-			}
-		case tableRowScope:
-			if tagAtom == a.Html || tagAtom == a.Tr {
-				p.oe = p.oe[:i+1]
-				return
-			}
-		case tableBodyScope:
-			if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead {
-				p.oe = p.oe[:i+1]
-				return
-			}
-		default:
-			panic("unreachable")
-		}
-	}
-}
-
-// generateImpliedEndTags pops nodes off the stack of open elements as long as
-// the top node has a tag name of dd, dt, li, option, optgroup, p, rp, or rt.
-// If exceptions are specified, nodes with that name will not be popped off.
-func (p *parser) generateImpliedEndTags(exceptions ...string) {
-	var i int
-loop:
-	for i = len(p.oe) - 1; i >= 0; i-- {
-		n := p.oe[i]
-		if n.Type == ElementNode {
-			switch n.DataAtom {
-			case a.Dd, a.Dt, a.Li, a.Option, a.Optgroup, a.P, a.Rp, a.Rt:
-				for _, except := range exceptions {
-					if n.Data == except {
-						break loop
-					}
-				}
-				continue
-			}
-		}
-		break
-	}
-
-	p.oe = p.oe[:i+1]
-}
-
-// addChild adds a child node n to the top element, and pushes n onto the stack
-// of open elements if it is an element node.
-func (p *parser) addChild(n *Node) {
-	if p.shouldFosterParent() {
-		p.fosterParent(n)
-	} else {
-		p.top().AppendChild(n)
-	}
-
-	if n.Type == ElementNode {
-		p.oe = append(p.oe, n)
-	}
-}
-
-// shouldFosterParent returns whether the next node to be added should be
-// foster parented.
-func (p *parser) shouldFosterParent() bool {
-	if p.fosterParenting {
-		switch p.top().DataAtom {
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			return true
-		}
-	}
-	return false
-}
-
-// fosterParent adds a child node according to the foster parenting rules.
-// Section 12.2.5.3, "foster parenting".
-func (p *parser) fosterParent(n *Node) {
-	var table, parent, prev *Node
-	var i int
-	for i = len(p.oe) - 1; i >= 0; i-- {
-		if p.oe[i].DataAtom == a.Table {
-			table = p.oe[i]
-			break
-		}
-	}
-
-	if table == nil {
-		// The foster parent is the html element.
-		parent = p.oe[0]
-	} else {
-		parent = table.Parent
-	}
-	if parent == nil {
-		parent = p.oe[i-1]
-	}
-
-	if table != nil {
-		prev = table.PrevSibling
-	} else {
-		prev = parent.LastChild
-	}
-	if prev != nil && prev.Type == TextNode && n.Type == TextNode {
-		prev.Data += n.Data
-		return
-	}
-
-	parent.InsertBefore(n, table)
-}
-
-// addText adds text to the preceding node if it is a text node, or else it
-// calls addChild with a new text node.
-func (p *parser) addText(text string) {
-	if text == "" {
-		return
-	}
-
-	if p.shouldFosterParent() {
-		p.fosterParent(&Node{
-			Type: TextNode,
-			Data: text,
-		})
-		return
-	}
-
-	t := p.top()
-	if n := t.LastChild; n != nil && n.Type == TextNode {
-		n.Data += text
-		return
-	}
-	p.addChild(&Node{
-		Type: TextNode,
-		Data: text,
-	})
-}
-
-// addElement adds a child element based on the current token.
-func (p *parser) addElement() {
-	p.addChild(&Node{
-		Type:     ElementNode,
-		DataAtom: p.tok.DataAtom,
-		Data:     p.tok.Data,
-		Attr:     p.tok.Attr,
-	})
-}
-
-// Section 12.2.3.3.
-func (p *parser) addFormattingElement() {
-	tagAtom, attr := p.tok.DataAtom, p.tok.Attr
-	p.addElement()
-
-	// Implement the Noah's Ark clause, but with three per family instead of two.
-	identicalElements := 0
-findIdenticalElements:
-	for i := len(p.afe) - 1; i >= 0; i-- {
-		n := p.afe[i]
-		if n.Type == scopeMarkerNode {
-			break
-		}
-		if n.Type != ElementNode {
-			continue
-		}
-		if n.Namespace != "" {
-			continue
-		}
-		if n.DataAtom != tagAtom {
-			continue
-		}
-		if len(n.Attr) != len(attr) {
-			continue
-		}
-	compareAttributes:
-		for _, t0 := range n.Attr {
-			for _, t1 := range attr {
-				if t0.Key == t1.Key && t0.Namespace == t1.Namespace && t0.Val == t1.Val {
-					// Found a match for this attribute, continue with the next attribute.
-					continue compareAttributes
-				}
-			}
-			// If we get here, there is no attribute that matches a.
-			// Therefore the element is not identical to the new one.
-			continue findIdenticalElements
-		}
-
-		identicalElements++
-		if identicalElements >= 3 {
-			p.afe.remove(n)
-		}
-	}
-
-	p.afe = append(p.afe, p.top())
-}
-
-// Section 12.2.3.3.
-func (p *parser) clearActiveFormattingElements() {
-	for {
-		n := p.afe.pop()
-		if len(p.afe) == 0 || n.Type == scopeMarkerNode {
-			return
-		}
-	}
-}
-
-// Section 12.2.3.3.
-func (p *parser) reconstructActiveFormattingElements() {
-	n := p.afe.top()
-	if n == nil {
-		return
-	}
-	if n.Type == scopeMarkerNode || p.oe.index(n) != -1 {
-		return
-	}
-	i := len(p.afe) - 1
-	for n.Type != scopeMarkerNode && p.oe.index(n) == -1 {
-		if i == 0 {
-			i = -1
-			break
-		}
-		i--
-		n = p.afe[i]
-	}
-	for {
-		i++
-		clone := p.afe[i].clone()
-		p.addChild(clone)
-		p.afe[i] = clone
-		if i == len(p.afe)-1 {
-			break
-		}
-	}
-}
-
-// Section 12.2.4.
-func (p *parser) acknowledgeSelfClosingTag() {
-	p.hasSelfClosingToken = false
-}
-
-// An insertion mode (section 12.2.3.1) is the state transition function from
-// a particular state in the HTML5 parser's state machine. It updates the
-// parser's fields depending on parser.tok (where ErrorToken means EOF).
-// It returns whether the token was consumed.
-type insertionMode func(*parser) bool
-
-// setOriginalIM sets the insertion mode to return to after completing a text or
-// inTableText insertion mode.
-// Section 12.2.3.1, "using the rules for".
-func (p *parser) setOriginalIM() {
-	if p.originalIM != nil {
-		panic("html: bad parser state: originalIM was set twice")
-	}
-	p.originalIM = p.im
-}
-
-// Section 12.2.3.1, "reset the insertion mode".
-func (p *parser) resetInsertionMode() {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		n := p.oe[i]
-		if i == 0 && p.context != nil {
-			n = p.context
-		}
-
-		switch n.DataAtom {
-		case a.Select:
-			p.im = inSelectIM
-		case a.Td, a.Th:
-			p.im = inCellIM
-		case a.Tr:
-			p.im = inRowIM
-		case a.Tbody, a.Thead, a.Tfoot:
-			p.im = inTableBodyIM
-		case a.Caption:
-			p.im = inCaptionIM
-		case a.Colgroup:
-			p.im = inColumnGroupIM
-		case a.Table:
-			p.im = inTableIM
-		case a.Head:
-			p.im = inBodyIM
-		case a.Body:
-			p.im = inBodyIM
-		case a.Frameset:
-			p.im = inFramesetIM
-		case a.Html:
-			p.im = beforeHeadIM
-		default:
-			continue
-		}
-		return
-	}
-	p.im = inBodyIM
-}
-
-const whitespace = " \t\r\n\f"
-
-// Section 12.2.5.4.1.
-func initialIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-		if len(p.tok.Data) == 0 {
-			// It was all whitespace, so ignore it.
-			return true
-		}
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		n, quirks := parseDoctype(p.tok.Data)
-		p.doc.AppendChild(n)
-		p.quirks = quirks
-		p.im = beforeHTMLIM
-		return true
-	}
-	p.quirks = true
-	p.im = beforeHTMLIM
-	return false
-}
-
-// Section 12.2.5.4.2.
-func beforeHTMLIM(p *parser) bool {
-	switch p.tok.Type {
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	case TextToken:
-		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-		if len(p.tok.Data) == 0 {
-			// It was all whitespace, so ignore it.
-			return true
-		}
-	case StartTagToken:
-		if p.tok.DataAtom == a.Html {
-			p.addElement()
-			p.im = beforeHeadIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Head, a.Body, a.Html, a.Br:
-			p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
-			return false
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	}
-	p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
-	return false
-}
-
-// Section 12.2.5.4.3.
-func beforeHeadIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-		if len(p.tok.Data) == 0 {
-			// It was all whitespace, so ignore it.
-			return true
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Head:
-			p.addElement()
-			p.head = p.top()
-			p.im = inHeadIM
-			return true
-		case a.Html:
-			return inBodyIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Head, a.Body, a.Html, a.Br:
-			p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
-			return false
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
-	return false
-}
-
-// Section 12.2.5.4.4.
-func inHeadIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) < len(p.tok.Data) {
-			// Add the initial whitespace to the current node.
-			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-			if s == "" {
-				return true
-			}
-			p.tok.Data = s
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			return true
-		case a.Script, a.Title, a.Noscript, a.Noframes, a.Style:
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-			return true
-		case a.Head:
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Head:
-			n := p.oe.pop()
-			if n.DataAtom != a.Head {
-				panic("html: bad parser state: <head> element not found, in the in-head insertion mode")
-			}
-			p.im = afterHeadIM
-			return true
-		case a.Body, a.Html, a.Br:
-			p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
-			return false
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
-	return false
-}
-
-// Section 12.2.5.4.6.
-func afterHeadIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) < len(p.tok.Data) {
-			// Add the initial whitespace to the current node.
-			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-			if s == "" {
-				return true
-			}
-			p.tok.Data = s
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Body:
-			p.addElement()
-			p.framesetOK = false
-			p.im = inBodyIM
-			return true
-		case a.Frameset:
-			p.addElement()
-			p.im = inFramesetIM
-			return true
-		case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
-			p.oe = append(p.oe, p.head)
-			defer p.oe.remove(p.head)
-			return inHeadIM(p)
-		case a.Head:
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Body, a.Html, a.Br:
-			// Drop down to creating an implied <body> tag.
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.parseImpliedToken(StartTagToken, a.Body, a.Body.String())
-	p.framesetOK = true
-	return false
-}
-
-// copyAttributes copies attributes of src not found on dst to dst.
-func copyAttributes(dst *Node, src Token) {
-	if len(src.Attr) == 0 {
-		return
-	}
-	attr := map[string]string{}
-	for _, t := range dst.Attr {
-		attr[t.Key] = t.Val
-	}
-	for _, t := range src.Attr {
-		if _, ok := attr[t.Key]; !ok {
-			dst.Attr = append(dst.Attr, t)
-			attr[t.Key] = t.Val
-		}
-	}
-}
-
-// Section 12.2.5.4.7.
-func inBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		d := p.tok.Data
-		switch n := p.oe.top(); n.DataAtom {
-		case a.Pre, a.Listing:
-			if n.FirstChild == nil {
-				// Ignore a newline at the start of a <pre> block.
-				if d != "" && d[0] == '\r' {
-					d = d[1:]
-				}
-				if d != "" && d[0] == '\n' {
-					d = d[1:]
-				}
-			}
-		}
-		d = strings.Replace(d, "\x00", "", -1)
-		if d == "" {
-			return true
-		}
-		p.reconstructActiveFormattingElements()
-		p.addText(d)
-		if p.framesetOK && strings.TrimLeft(d, whitespace) != "" {
-			// There were non-whitespace characters inserted.
-			p.framesetOK = false
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			copyAttributes(p.oe[0], p.tok)
-		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
-			return inHeadIM(p)
-		case a.Body:
-			if len(p.oe) >= 2 {
-				body := p.oe[1]
-				if body.Type == ElementNode && body.DataAtom == a.Body {
-					p.framesetOK = false
-					copyAttributes(body, p.tok)
-				}
-			}
-		case a.Frameset:
-			if !p.framesetOK || len(p.oe) < 2 || p.oe[1].DataAtom != a.Body {
-				// Ignore the token.
-				return true
-			}
-			body := p.oe[1]
-			if body.Parent != nil {
-				body.Parent.RemoveChild(body)
-			}
-			p.oe = p.oe[:1]
-			p.addElement()
-			p.im = inFramesetIM
-			return true
-		case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-			p.popUntil(buttonScope, a.P)
-			switch n := p.top(); n.DataAtom {
-			case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-				p.oe.pop()
-			}
-			p.addElement()
-		case a.Pre, a.Listing:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-			// The newline, if any, will be dealt with by the TextToken case.
-			p.framesetOK = false
-		case a.Form:
-			if p.form == nil {
-				p.popUntil(buttonScope, a.P)
-				p.addElement()
-				p.form = p.top()
-			}
-		case a.Li:
-			p.framesetOK = false
-			for i := len(p.oe) - 1; i >= 0; i-- {
-				node := p.oe[i]
-				switch node.DataAtom {
-				case a.Li:
-					p.oe = p.oe[:i]
-				case a.Address, a.Div, a.P:
-					continue
-				default:
-					if !isSpecialElement(node) {
-						continue
-					}
-				}
-				break
-			}
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.Dd, a.Dt:
-			p.framesetOK = false
-			for i := len(p.oe) - 1; i >= 0; i-- {
-				node := p.oe[i]
-				switch node.DataAtom {
-				case a.Dd, a.Dt:
-					p.oe = p.oe[:i]
-				case a.Address, a.Div, a.P:
-					continue
-				default:
-					if !isSpecialElement(node) {
-						continue
-					}
-				}
-				break
-			}
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.Plaintext:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.Button:
-			p.popUntil(defaultScope, a.Button)
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-		case a.A:
-			for i := len(p.afe) - 1; i >= 0 && p.afe[i].Type != scopeMarkerNode; i-- {
-				if n := p.afe[i]; n.Type == ElementNode && n.DataAtom == a.A {
-					p.inBodyEndTagFormatting(a.A)
-					p.oe.remove(n)
-					p.afe.remove(n)
-					break
-				}
-			}
-			p.reconstructActiveFormattingElements()
-			p.addFormattingElement()
-		case a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
-			p.reconstructActiveFormattingElements()
-			p.addFormattingElement()
-		case a.Nobr:
-			p.reconstructActiveFormattingElements()
-			if p.elementInScope(defaultScope, a.Nobr) {
-				p.inBodyEndTagFormatting(a.Nobr)
-				p.reconstructActiveFormattingElements()
-			}
-			p.addFormattingElement()
-		case a.Applet, a.Marquee, a.Object:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.afe = append(p.afe, &scopeMarker)
-			p.framesetOK = false
-		case a.Table:
-			if !p.quirks {
-				p.popUntil(buttonScope, a.P)
-			}
-			p.addElement()
-			p.framesetOK = false
-			p.im = inTableIM
-			return true
-		case a.Area, a.Br, a.Embed, a.Img, a.Input, a.Keygen, a.Wbr:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			if p.tok.DataAtom == a.Input {
-				for _, t := range p.tok.Attr {
-					if t.Key == "type" {
-						if strings.ToLower(t.Val) == "hidden" {
-							// Skip setting framesetOK = false
-							return true
-						}
-					}
-				}
-			}
-			p.framesetOK = false
-		case a.Param, a.Source, a.Track:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-		case a.Hr:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			p.framesetOK = false
-		case a.Image:
-			p.tok.DataAtom = a.Img
-			p.tok.Data = a.Img.String()
-			return false
-		case a.Isindex:
-			if p.form != nil {
-				// Ignore the token.
-				return true
-			}
-			action := ""
-			prompt := "This is a searchable index. Enter search keywords: "
-			attr := []Attribute{{Key: "name", Val: "isindex"}}
-			for _, t := range p.tok.Attr {
-				switch t.Key {
-				case "action":
-					action = t.Val
-				case "name":
-					// Ignore the attribute.
-				case "prompt":
-					prompt = t.Val
-				default:
-					attr = append(attr, t)
-				}
-			}
-			p.acknowledgeSelfClosingTag()
-			p.popUntil(buttonScope, a.P)
-			p.parseImpliedToken(StartTagToken, a.Form, a.Form.String())
-			if action != "" {
-				p.form.Attr = []Attribute{{Key: "action", Val: action}}
-			}
-			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
-			p.parseImpliedToken(StartTagToken, a.Label, a.Label.String())
-			p.addText(prompt)
-			p.addChild(&Node{
-				Type:     ElementNode,
-				DataAtom: a.Input,
-				Data:     a.Input.String(),
-				Attr:     attr,
-			})
-			p.oe.pop()
-			p.parseImpliedToken(EndTagToken, a.Label, a.Label.String())
-			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
-			p.parseImpliedToken(EndTagToken, a.Form, a.Form.String())
-		case a.Textarea:
-			p.addElement()
-			p.setOriginalIM()
-			p.framesetOK = false
-			p.im = textIM
-		case a.Xmp:
-			p.popUntil(buttonScope, a.P)
-			p.reconstructActiveFormattingElements()
-			p.framesetOK = false
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-		case a.Iframe:
-			p.framesetOK = false
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-		case a.Noembed, a.Noscript:
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-			p.im = inSelectIM
-			return true
-		case a.Optgroup, a.Option:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-		case a.Rp, a.Rt:
-			if p.elementInScope(defaultScope, a.Ruby) {
-				p.generateImpliedEndTags()
-			}
-			p.addElement()
-		case a.Math, a.Svg:
-			p.reconstructActiveFormattingElements()
-			if p.tok.DataAtom == a.Math {
-				adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
-			} else {
-				adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
-			}
-			adjustForeignAttributes(p.tok.Attr)
-			p.addElement()
-			p.top().Namespace = p.tok.Data
-			if p.hasSelfClosingToken {
-				p.oe.pop()
-				p.acknowledgeSelfClosingTag()
-			}
-			return true
-		case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			// Ignore the token.
-		default:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Body:
-			if p.elementInScope(defaultScope, a.Body) {
-				p.im = afterBodyIM
-			}
-		case a.Html:
-			if p.elementInScope(defaultScope, a.Body) {
-				p.parseImpliedToken(EndTagToken, a.Body, a.Body.String())
-				return false
-			}
-			return true
-		case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul:
-			p.popUntil(defaultScope, p.tok.DataAtom)
-		case a.Form:
-			node := p.form
-			p.form = nil
-			i := p.indexOfElementInScope(defaultScope, a.Form)
-			if node == nil || i == -1 || p.oe[i] != node {
-				// Ignore the token.
-				return true
-			}
-			p.generateImpliedEndTags()
-			p.oe.remove(node)
-		case a.P:
-			if !p.elementInScope(buttonScope, a.P) {
-				p.parseImpliedToken(StartTagToken, a.P, a.P.String())
-			}
-			p.popUntil(buttonScope, a.P)
-		case a.Li:
-			p.popUntil(listItemScope, a.Li)
-		case a.Dd, a.Dt:
-			p.popUntil(defaultScope, p.tok.DataAtom)
-		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-			p.popUntil(defaultScope, a.H1, a.H2, a.H3, a.H4, a.H5, a.H6)
-		case a.A, a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.Nobr, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
-			p.inBodyEndTagFormatting(p.tok.DataAtom)
-		case a.Applet, a.Marquee, a.Object:
-			if p.popUntil(defaultScope, p.tok.DataAtom) {
-				p.clearActiveFormattingElements()
-			}
-		case a.Br:
-			p.tok.Type = StartTagToken
-			return false
-		default:
-			p.inBodyEndTagOther(p.tok.DataAtom)
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	}
-
-	return true
-}
-
-func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) {
-	// This is the "adoption agency" algorithm, described at
-	// https://html.spec.whatwg.org/multipage/syntax.html#adoptionAgency
-
-	// TODO: this is a fairly literal line-by-line translation of that algorithm.
-	// Once the code successfully parses the comprehensive test suite, we should
-	// refactor this code to be more idiomatic.
-
-	// Steps 1-4. The outer loop.
-	for i := 0; i < 8; i++ {
-		// Step 5. Find the formatting element.
-		var formattingElement *Node
-		for j := len(p.afe) - 1; j >= 0; j-- {
-			if p.afe[j].Type == scopeMarkerNode {
-				break
-			}
-			if p.afe[j].DataAtom == tagAtom {
-				formattingElement = p.afe[j]
-				break
-			}
-		}
-		if formattingElement == nil {
-			p.inBodyEndTagOther(tagAtom)
-			return
-		}
-		feIndex := p.oe.index(formattingElement)
-		if feIndex == -1 {
-			p.afe.remove(formattingElement)
-			return
-		}
-		if !p.elementInScope(defaultScope, tagAtom) {
-			// Ignore the tag.
-			return
-		}
-
-		// Steps 9-10. Find the furthest block.
-		var furthestBlock *Node
-		for _, e := range p.oe[feIndex:] {
-			if isSpecialElement(e) {
-				furthestBlock = e
-				break
-			}
-		}
-		if furthestBlock == nil {
-			e := p.oe.pop()
-			for e != formattingElement {
-				e = p.oe.pop()
-			}
-			p.afe.remove(e)
-			return
-		}
-
-		// Steps 11-12. Find the common ancestor and bookmark node.
-		commonAncestor := p.oe[feIndex-1]
-		bookmark := p.afe.index(formattingElement)
-
-		// Step 13. The inner loop. Find the lastNode to reparent.
-		lastNode := furthestBlock
-		node := furthestBlock
-		x := p.oe.index(node)
-		// Steps 13.1-13.2
-		for j := 0; j < 3; j++ {
-			// Step 13.3.
-			x--
-			node = p.oe[x]
-			// Step 13.4 - 13.5.
-			if p.afe.index(node) == -1 {
-				p.oe.remove(node)
-				continue
-			}
-			// Step 13.6.
-			if node == formattingElement {
-				break
-			}
-			// Step 13.7.
-			clone := node.clone()
-			p.afe[p.afe.index(node)] = clone
-			p.oe[p.oe.index(node)] = clone
-			node = clone
-			// Step 13.8.
-			if lastNode == furthestBlock {
-				bookmark = p.afe.index(node) + 1
-			}
-			// Step 13.9.
-			if lastNode.Parent != nil {
-				lastNode.Parent.RemoveChild(lastNode)
-			}
-			node.AppendChild(lastNode)
-			// Step 13.10.
-			lastNode = node
-		}
-
-		// Step 14. Reparent lastNode to the common ancestor,
-		// or for misnested table nodes, to the foster parent.
-		if lastNode.Parent != nil {
-			lastNode.Parent.RemoveChild(lastNode)
-		}
-		switch commonAncestor.DataAtom {
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			p.fosterParent(lastNode)
-		default:
-			commonAncestor.AppendChild(lastNode)
-		}
-
-		// Steps 15-17. Reparent nodes from the furthest block's children
-		// to a clone of the formatting element.
-		clone := formattingElement.clone()
-		reparentChildren(clone, furthestBlock)
-		furthestBlock.AppendChild(clone)
-
-		// Step 18. Fix up the list of active formatting elements.
-		if oldLoc := p.afe.index(formattingElement); oldLoc != -1 && oldLoc < bookmark {
-			// Move the bookmark with the rest of the list.
-			bookmark--
-		}
-		p.afe.remove(formattingElement)
-		p.afe.insert(bookmark, clone)
-
-		// Step 19. Fix up the stack of open elements.
-		p.oe.remove(formattingElement)
-		p.oe.insert(p.oe.index(furthestBlock)+1, clone)
-	}
-}
-
-// inBodyEndTagOther performs the "any other end tag" algorithm for inBodyIM.
-// "Any other end tag" handling from 12.2.5.5 The rules for parsing tokens in foreign content
-// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inforeign
-func (p *parser) inBodyEndTagOther(tagAtom a.Atom) {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		if p.oe[i].DataAtom == tagAtom {
-			p.oe = p.oe[:i]
-			break
-		}
-		if isSpecialElement(p.oe[i]) {
-			break
-		}
-	}
-}
-
-// Section 12.2.5.4.8.
-func textIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		p.oe.pop()
-	case TextToken:
-		d := p.tok.Data
-		if n := p.oe.top(); n.DataAtom == a.Textarea && n.FirstChild == nil {
-			// Ignore a newline at the start of a <textarea> block.
-			if d != "" && d[0] == '\r' {
-				d = d[1:]
-			}
-			if d != "" && d[0] == '\n' {
-				d = d[1:]
-			}
-		}
-		if d == "" {
-			return true
-		}
-		p.addText(d)
-		return true
-	case EndTagToken:
-		p.oe.pop()
-	}
-	p.im = p.originalIM
-	p.originalIM = nil
-	return p.tok.Type == EndTagToken
-}
-
-// Section 12.2.5.4.9.
-func inTableIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "", -1)
-		switch p.oe.top().DataAtom {
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			if strings.Trim(p.tok.Data, whitespace) == "" {
-				p.addText(p.tok.Data)
-				return true
-			}
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption:
-			p.clearStackToContext(tableScope)
-			p.afe = append(p.afe, &scopeMarker)
-			p.addElement()
-			p.im = inCaptionIM
-			return true
-		case a.Colgroup:
-			p.clearStackToContext(tableScope)
-			p.addElement()
-			p.im = inColumnGroupIM
-			return true
-		case a.Col:
-			p.parseImpliedToken(StartTagToken, a.Colgroup, a.Colgroup.String())
-			return false
-		case a.Tbody, a.Tfoot, a.Thead:
-			p.clearStackToContext(tableScope)
-			p.addElement()
-			p.im = inTableBodyIM
-			return true
-		case a.Td, a.Th, a.Tr:
-			p.parseImpliedToken(StartTagToken, a.Tbody, a.Tbody.String())
-			return false
-		case a.Table:
-			if p.popUntil(tableScope, a.Table) {
-				p.resetInsertionMode()
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Style, a.Script:
-			return inHeadIM(p)
-		case a.Input:
-			for _, t := range p.tok.Attr {
-				if t.Key == "type" && strings.ToLower(t.Val) == "hidden" {
-					p.addElement()
-					p.oe.pop()
-					return true
-				}
-			}
-			// Otherwise drop down to the default action.
-		case a.Form:
-			if p.form != nil {
-				// Ignore the token.
-				return true
-			}
-			p.addElement()
-			p.form = p.oe.pop()
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			switch p.top().DataAtom {
-			case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-				p.fosterParenting = true
-			}
-			p.addElement()
-			p.fosterParenting = false
-			p.framesetOK = false
-			p.im = inSelectInTableIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Table:
-			if p.popUntil(tableScope, a.Table) {
-				p.resetInsertionMode()
-				return true
-			}
-			// Ignore the token.
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.fosterParenting = true
-	defer func() { p.fosterParenting = false }()
-
-	return inBodyIM(p)
-}
-
-// Section 12.2.5.4.11.
-func inCaptionIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Thead, a.Tr:
-			if p.popUntil(tableScope, a.Caption) {
-				p.clearActiveFormattingElements()
-				p.im = inTableIM
-				return false
-			} else {
-				// Ignore the token.
-				return true
-			}
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-			p.im = inSelectInTableIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption:
-			if p.popUntil(tableScope, a.Caption) {
-				p.clearActiveFormattingElements()
-				p.im = inTableIM
-			}
-			return true
-		case a.Table:
-			if p.popUntil(tableScope, a.Caption) {
-				p.clearActiveFormattingElements()
-				p.im = inTableIM
-				return false
-			} else {
-				// Ignore the token.
-				return true
-			}
-		case a.Body, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			// Ignore the token.
-			return true
-		}
-	}
-	return inBodyIM(p)
-}
-
-// Section 12.2.5.4.12.
-func inColumnGroupIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) < len(p.tok.Data) {
-			// Add the initial whitespace to the current node.
-			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-			if s == "" {
-				return true
-			}
-			p.tok.Data = s
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Col:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Colgroup:
-			if p.oe.top().DataAtom != a.Html {
-				p.oe.pop()
-				p.im = inTableIM
-			}
-			return true
-		case a.Col:
-			// Ignore the token.
-			return true
-		}
-	}
-	if p.oe.top().DataAtom != a.Html {
-		p.oe.pop()
-		p.im = inTableIM
-		return false
-	}
-	return true
-}
-
-// Section 12.2.5.4.13.
-func inTableBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Tr:
-			p.clearStackToContext(tableBodyScope)
-			p.addElement()
-			p.im = inRowIM
-			return true
-		case a.Td, a.Th:
-			p.parseImpliedToken(StartTagToken, a.Tr, a.Tr.String())
-			return false
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead:
-			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
-				p.im = inTableIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Tbody, a.Tfoot, a.Thead:
-			if p.elementInScope(tableScope, p.tok.DataAtom) {
-				p.clearStackToContext(tableBodyScope)
-				p.oe.pop()
-				p.im = inTableIM
-			}
-			return true
-		case a.Table:
-			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
-				p.im = inTableIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th, a.Tr:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	}
-
-	return inTableIM(p)
-}
-
-// Section 12.2.5.4.14.
-func inRowIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Td, a.Th:
-			p.clearStackToContext(tableRowScope)
-			p.addElement()
-			p.afe = append(p.afe, &scopeMarker)
-			p.im = inCellIM
-			return true
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			if p.popUntil(tableScope, a.Tr) {
-				p.im = inTableBodyIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Tr:
-			if p.popUntil(tableScope, a.Tr) {
-				p.im = inTableBodyIM
-				return true
-			}
-			// Ignore the token.
-			return true
-		case a.Table:
-			if p.popUntil(tableScope, a.Tr) {
-				p.im = inTableBodyIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Tbody, a.Tfoot, a.Thead:
-			if p.elementInScope(tableScope, p.tok.DataAtom) {
-				p.parseImpliedToken(EndTagToken, a.Tr, a.Tr.String())
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th:
-			// Ignore the token.
-			return true
-		}
-	}
-
-	return inTableIM(p)
-}
-
-// Section 12.2.5.4.15.
-func inCellIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			if p.popUntil(tableScope, a.Td, a.Th) {
-				// Close the cell and reprocess.
-				p.clearActiveFormattingElements()
-				p.im = inRowIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-			p.im = inSelectInTableIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Td, a.Th:
-			if !p.popUntil(tableScope, p.tok.DataAtom) {
-				// Ignore the token.
-				return true
-			}
-			p.clearActiveFormattingElements()
-			p.im = inRowIM
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html:
-			// Ignore the token.
-			return true
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			if !p.elementInScope(tableScope, p.tok.DataAtom) {
-				// Ignore the token.
-				return true
-			}
-			// Close the cell and reprocess.
-			p.popUntil(tableScope, a.Td, a.Th)
-			p.clearActiveFormattingElements()
-			p.im = inRowIM
-			return false
-		}
-	}
-	return inBodyIM(p)
-}
-
-// Section 12.2.5.4.16.
-func inSelectIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		p.addText(strings.Replace(p.tok.Data, "\x00", "", -1))
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Option:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-			p.addElement()
-		case a.Optgroup:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-			if p.top().DataAtom == a.Optgroup {
-				p.oe.pop()
-			}
-			p.addElement()
-		case a.Select:
-			p.tok.Type = EndTagToken
-			return false
-		case a.Input, a.Keygen, a.Textarea:
-			if p.elementInScope(selectScope, a.Select) {
-				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
-				return false
-			}
-			// In order to properly ignore <textarea>, we need to change the tokenizer mode.
-			p.tokenizer.NextIsNotRawText()
-			// Ignore the token.
-			return true
-		case a.Script:
-			return inHeadIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Option:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-		case a.Optgroup:
-			i := len(p.oe) - 1
-			if p.oe[i].DataAtom == a.Option {
-				i--
-			}
-			if p.oe[i].DataAtom == a.Optgroup {
-				p.oe = p.oe[:i]
-			}
-		case a.Select:
-			if p.popUntil(selectScope, a.Select) {
-				p.resetInsertionMode()
-			}
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	return true
-}
-
-// Section 12.2.5.4.17.
-func inSelectInTableIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken, EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption, a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr, a.Td, a.Th:
-			if p.tok.Type == StartTagToken || p.elementInScope(tableScope, p.tok.DataAtom) {
-				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
-				return false
-			} else {
-				// Ignore the token.
-				return true
-			}
-		}
-	}
-	return inSelectIM(p)
-}
-
-// Section 12.2.5.4.18.
-func afterBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) == 0 {
-			// It was all whitespace.
-			return inBodyIM(p)
-		}
-	case StartTagToken:
-		if p.tok.DataAtom == a.Html {
-			return inBodyIM(p)
-		}
-	case EndTagToken:
-		if p.tok.DataAtom == a.Html {
-			if !p.fragment {
-				p.im = afterAfterBodyIM
-			}
-			return true
-		}
-	case CommentToken:
-		// The comment is attached to the <html> element.
-		if len(p.oe) < 1 || p.oe[0].DataAtom != a.Html {
-			panic("html: bad parser state: <html> element not found, in the after-body insertion mode")
-		}
-		p.oe[0].AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	}
-	p.im = inBodyIM
-	return false
-}
-
-// Section 12.2.5.4.19.
-func inFramesetIM(p *parser) bool {
-	switch p.tok.Type {
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case TextToken:
-		// Ignore all text but whitespace.
-		s := strings.Map(func(c rune) rune {
-			switch c {
-			case ' ', '\t', '\n', '\f', '\r':
-				return c
-			}
-			return -1
-		}, p.tok.Data)
-		if s != "" {
-			p.addText(s)
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Frameset:
-			p.addElement()
-		case a.Frame:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-		case a.Noframes:
-			return inHeadIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Frameset:
-			if p.oe.top().DataAtom != a.Html {
-				p.oe.pop()
-				if p.oe.top().DataAtom != a.Frameset {
-					p.im = afterFramesetIM
-					return true
-				}
-			}
-		}
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-// Section 12.2.5.4.20.
-func afterFramesetIM(p *parser) bool {
-	switch p.tok.Type {
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case TextToken:
-		// Ignore all text but whitespace.
-		s := strings.Map(func(c rune) rune {
-			switch c {
-			case ' ', '\t', '\n', '\f', '\r':
-				return c
-			}
-			return -1
-		}, p.tok.Data)
-		if s != "" {
-			p.addText(s)
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Noframes:
-			return inHeadIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			p.im = afterAfterFramesetIM
-			return true
-		}
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-// Section 12.2.5.4.21.
-func afterAfterBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) == 0 {
-			// It was all whitespace.
-			return inBodyIM(p)
-		}
-	case StartTagToken:
-		if p.tok.DataAtom == a.Html {
-			return inBodyIM(p)
-		}
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		return inBodyIM(p)
-	}
-	p.im = inBodyIM
-	return false
-}
-
-// Section 12.2.5.4.22.
-func afterAfterFramesetIM(p *parser) bool {
-	switch p.tok.Type {
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case TextToken:
-		// Ignore all text but whitespace.
-		s := strings.Map(func(c rune) rune {
-			switch c {
-			case ' ', '\t', '\n', '\f', '\r':
-				return c
-			}
-			return -1
-		}, p.tok.Data)
-		if s != "" {
-			p.tok.Data = s
-			return inBodyIM(p)
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Noframes:
-			return inHeadIM(p)
-		}
-	case DoctypeToken:
-		return inBodyIM(p)
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-const whitespaceOrNUL = whitespace + "\x00"
-
-// Section 12.2.5.5.
-func parseForeignContent(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		if p.framesetOK {
-			p.framesetOK = strings.TrimLeft(p.tok.Data, whitespaceOrNUL) == ""
-		}
-		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "\ufffd", -1)
-		p.addText(p.tok.Data)
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case StartTagToken:
-		b := breakout[p.tok.Data]
-		if p.tok.DataAtom == a.Font {
-		loop:
-			for _, attr := range p.tok.Attr {
-				switch attr.Key {
-				case "color", "face", "size":
-					b = true
-					break loop
-				}
-			}
-		}
-		if b {
-			for i := len(p.oe) - 1; i >= 0; i-- {
-				n := p.oe[i]
-				if n.Namespace == "" || htmlIntegrationPoint(n) || mathMLTextIntegrationPoint(n) {
-					p.oe = p.oe[:i+1]
-					break
-				}
-			}
-			return false
-		}
-		switch p.top().Namespace {
-		case "math":
-			adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
-		case "svg":
-			// Adjust SVG tag names. The tokenizer lower-cases tag names, but
-			// SVG wants e.g. "foreignObject" with a capital second "O".
-			if x := svgTagNameAdjustments[p.tok.Data]; x != "" {
-				p.tok.DataAtom = a.Lookup([]byte(x))
-				p.tok.Data = x
-			}
-			adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
-		default:
-			panic("html: bad parser state: unexpected namespace")
-		}
-		adjustForeignAttributes(p.tok.Attr)
-		namespace := p.top().Namespace
-		p.addElement()
-		p.top().Namespace = namespace
-		if namespace != "" {
-			// Don't let the tokenizer go into raw text mode in foreign content
-			// (e.g. in an SVG <title> tag).
-			p.tokenizer.NextIsNotRawText()
-		}
-		if p.hasSelfClosingToken {
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-		}
-	case EndTagToken:
-		for i := len(p.oe) - 1; i >= 0; i-- {
-			if p.oe[i].Namespace == "" {
-				return p.im(p)
-			}
-			if strings.EqualFold(p.oe[i].Data, p.tok.Data) {
-				p.oe = p.oe[:i]
-				break
-			}
-		}
-		return true
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-// Section 12.2.5.
-func (p *parser) inForeignContent() bool {
-	if len(p.oe) == 0 {
-		return false
-	}
-	n := p.oe[len(p.oe)-1]
-	if n.Namespace == "" {
-		return false
-	}
-	if mathMLTextIntegrationPoint(n) {
-		if p.tok.Type == StartTagToken && p.tok.DataAtom != a.Mglyph && p.tok.DataAtom != a.Malignmark {
-			return false
-		}
-		if p.tok.Type == TextToken {
-			return false
-		}
-	}
-	if n.Namespace == "math" && n.DataAtom == a.AnnotationXml && p.tok.Type == StartTagToken && p.tok.DataAtom == a.Svg {
-		return false
-	}
-	if htmlIntegrationPoint(n) && (p.tok.Type == StartTagToken || p.tok.Type == TextToken) {
-		return false
-	}
-	if p.tok.Type == ErrorToken {
-		return false
-	}
-	return true
-}
-
-// parseImpliedToken parses a token as though it had appeared in the parser's
-// input.
-func (p *parser) parseImpliedToken(t TokenType, dataAtom a.Atom, data string) {
-	realToken, selfClosing := p.tok, p.hasSelfClosingToken
-	p.tok = Token{
-		Type:     t,
-		DataAtom: dataAtom,
-		Data:     data,
-	}
-	p.hasSelfClosingToken = false
-	p.parseCurrentToken()
-	p.tok, p.hasSelfClosingToken = realToken, selfClosing
-}
-
-// parseCurrentToken runs the current token through the parsing routines
-// until it is consumed.
-func (p *parser) parseCurrentToken() {
-	if p.tok.Type == SelfClosingTagToken {
-		p.hasSelfClosingToken = true
-		p.tok.Type = StartTagToken
-	}
-
-	consumed := false
-	for !consumed {
-		if p.inForeignContent() {
-			consumed = parseForeignContent(p)
-		} else {
-			consumed = p.im(p)
-		}
-	}
-
-	if p.hasSelfClosingToken {
-		// This is a parse error, but ignore it.
-		p.hasSelfClosingToken = false
-	}
-}
-
-func (p *parser) parse() error {
-	// Iterate until EOF. Any other error will cause an early return.
-	var err error
-	for err != io.EOF {
-		// CDATA sections are allowed only in foreign content.
-		n := p.oe.top()
-		p.tokenizer.AllowCDATA(n != nil && n.Namespace != "")
-		// Read and parse the next token.
-		p.tokenizer.Next()
-		p.tok = p.tokenizer.Token()
-		if p.tok.Type == ErrorToken {
-			err = p.tokenizer.Err()
-			if err != nil && err != io.EOF {
-				return err
-			}
-		}
-		p.parseCurrentToken()
-	}
-	return nil
-}
-
-// Parse returns the parse tree for the HTML from the given Reader.
-// The input is assumed to be UTF-8 encoded.
-func Parse(r io.Reader) (*Node, error) {
-	p := &parser{
-		tokenizer: NewTokenizer(r),
-		doc: &Node{
-			Type: DocumentNode,
-		},
-		scripting:  true,
-		framesetOK: true,
-		im:         initialIM,
-	}
-	err := p.parse()
-	if err != nil {
-		return nil, err
-	}
-	return p.doc, nil
-}
-
-// ParseFragment parses a fragment of HTML and returns the nodes that were
-// found. If the fragment is the InnerHTML for an existing element, pass that
-// element in context.
-func ParseFragment(r io.Reader, context *Node) ([]*Node, error) {
-	contextTag := ""
-	if context != nil {
-		if context.Type != ElementNode {
-			return nil, errors.New("html: ParseFragment of non-element Node")
-		}
-		// The next check isn't just context.DataAtom.String() == context.Data because
-		// it is valid to pass an element whose tag isn't a known atom. For example,
-		// DataAtom == 0 and Data = "tagfromthefuture" is perfectly consistent.
-		if context.DataAtom != a.Lookup([]byte(context.Data)) {
-			return nil, fmt.Errorf("html: inconsistent Node: DataAtom=%q, Data=%q", context.DataAtom, context.Data)
-		}
-		contextTag = context.DataAtom.String()
-	}
-	p := &parser{
-		tokenizer: NewTokenizerFragment(r, contextTag),
-		doc: &Node{
-			Type: DocumentNode,
-		},
-		scripting: true,
-		fragment:  true,
-		context:   context,
-	}
-
-	root := &Node{
-		Type:     ElementNode,
-		DataAtom: a.Html,
-		Data:     a.Html.String(),
-	}
-	p.doc.AppendChild(root)
-	p.oe = nodeStack{root}
-	p.resetInsertionMode()
-
-	for n := context; n != nil; n = n.Parent {
-		if n.Type == ElementNode && n.DataAtom == a.Form {
-			p.form = n
-			break
-		}
-	}
-
-	err := p.parse()
-	if err != nil {
-		return nil, err
-	}
-
-	parent := p.doc
-	if context != nil {
-		parent = root
-	}
-
-	var result []*Node
-	for c := parent.FirstChild; c != nil; {
-		next := c.NextSibling
-		parent.RemoveChild(c)
-		result = append(result, c)
-		c = next
-	}
-	return result, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/render.go b/Godeps/_workspace/src/golang.org/x/net/html/render.go
deleted file mode 100644
index d34564f49d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/render.go
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-)
-
-type writer interface {
-	io.Writer
-	io.ByteWriter
-	WriteString(string) (int, error)
-}
-
-// Render renders the parse tree n to the given writer.
-//
-// Rendering is done on a 'best effort' basis: calling Parse on the output of
-// Render will always result in something similar to the original tree, but it
-// is not necessarily an exact clone unless the original tree was 'well-formed'.
-// 'Well-formed' is not easily specified; the HTML5 specification is
-// complicated.
-//
-// Calling Parse on arbitrary input typically results in a 'well-formed' parse
-// tree. However, it is possible for Parse to yield a 'badly-formed' parse tree.
-// For example, in a 'well-formed' parse tree, no <a> element is a child of
-// another <a> element: parsing "<a><a>" results in two sibling elements.
-// Similarly, in a 'well-formed' parse tree, no <a> element is a child of a
-// <table> element: parsing "<p><table><a>" results in a <p> with two sibling
-// children; the <a> is reparented to the <table>'s parent. However, calling
-// Parse on "<a><table><a>" does not return an error, but the result has an <a>
-// element with an <a> child, and is therefore not 'well-formed'.
-//
-// Programmatically constructed trees are typically also 'well-formed', but it
-// is possible to construct a tree that looks innocuous but, when rendered and
-// re-parsed, results in a different tree. A simple example is that a solitary
-// text node would become a tree containing <html>, <head> and <body> elements.
-// Another example is that the programmatic equivalent of "a<head>b</head>c"
-// becomes "<html><head><head/><body>abc</body></html>".
-func Render(w io.Writer, n *Node) error {
-	if x, ok := w.(writer); ok {
-		return render(x, n)
-	}
-	buf := bufio.NewWriter(w)
-	if err := render(buf, n); err != nil {
-		return err
-	}
-	return buf.Flush()
-}
-
-// plaintextAbort is returned from render1 when a <plaintext> element
-// has been rendered. No more end tags should be rendered after that.
-var plaintextAbort = errors.New("html: internal error (plaintext abort)")
-
-func render(w writer, n *Node) error {
-	err := render1(w, n)
-	if err == plaintextAbort {
-		err = nil
-	}
-	return err
-}
-
-func render1(w writer, n *Node) error {
-	// Render non-element nodes; these are the easy cases.
-	switch n.Type {
-	case ErrorNode:
-		return errors.New("html: cannot render an ErrorNode node")
-	case TextNode:
-		return escape(w, n.Data)
-	case DocumentNode:
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			if err := render1(w, c); err != nil {
-				return err
-			}
-		}
-		return nil
-	case ElementNode:
-		// No-op.
-	case CommentNode:
-		if _, err := w.WriteString("<!--"); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(n.Data); err != nil {
-			return err
-		}
-		if _, err := w.WriteString("-->"); err != nil {
-			return err
-		}
-		return nil
-	case DoctypeNode:
-		if _, err := w.WriteString("<!DOCTYPE "); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(n.Data); err != nil {
-			return err
-		}
-		if n.Attr != nil {
-			var p, s string
-			for _, a := range n.Attr {
-				switch a.Key {
-				case "public":
-					p = a.Val
-				case "system":
-					s = a.Val
-				}
-			}
-			if p != "" {
-				if _, err := w.WriteString(" PUBLIC "); err != nil {
-					return err
-				}
-				if err := writeQuoted(w, p); err != nil {
-					return err
-				}
-				if s != "" {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-					if err := writeQuoted(w, s); err != nil {
-						return err
-					}
-				}
-			} else if s != "" {
-				if _, err := w.WriteString(" SYSTEM "); err != nil {
-					return err
-				}
-				if err := writeQuoted(w, s); err != nil {
-					return err
-				}
-			}
-		}
-		return w.WriteByte('>')
-	default:
-		return errors.New("html: unknown node type")
-	}
-
-	// Render the <xxx> opening tag.
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if _, err := w.WriteString(n.Data); err != nil {
-		return err
-	}
-	for _, a := range n.Attr {
-		if err := w.WriteByte(' '); err != nil {
-			return err
-		}
-		if a.Namespace != "" {
-			if _, err := w.WriteString(a.Namespace); err != nil {
-				return err
-			}
-			if err := w.WriteByte(':'); err != nil {
-				return err
-			}
-		}
-		if _, err := w.WriteString(a.Key); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(`="`); err != nil {
-			return err
-		}
-		if err := escape(w, a.Val); err != nil {
-			return err
-		}
-		if err := w.WriteByte('"'); err != nil {
-			return err
-		}
-	}
-	if voidElements[n.Data] {
-		if n.FirstChild != nil {
-			return fmt.Errorf("html: void element <%s> has child nodes", n.Data)
-		}
-		_, err := w.WriteString("/>")
-		return err
-	}
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-
-	// Add initial newline where there is danger of a newline beging ignored.
-	if c := n.FirstChild; c != nil && c.Type == TextNode && strings.HasPrefix(c.Data, "\n") {
-		switch n.Data {
-		case "pre", "listing", "textarea":
-			if err := w.WriteByte('\n'); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Render any child nodes.
-	switch n.Data {
-	case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			if c.Type == TextNode {
-				if _, err := w.WriteString(c.Data); err != nil {
-					return err
-				}
-			} else {
-				if err := render1(w, c); err != nil {
-					return err
-				}
-			}
-		}
-		if n.Data == "plaintext" {
-			// Don't render anything else. <plaintext> must be the
-			// last element in the file, with no closing tag.
-			return plaintextAbort
-		}
-	default:
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			if err := render1(w, c); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Render the </xxx> closing tag.
-	if _, err := w.WriteString("</"); err != nil {
-		return err
-	}
-	if _, err := w.WriteString(n.Data); err != nil {
-		return err
-	}
-	return w.WriteByte('>')
-}
-
-// writeQuoted writes s to w surrounded by quotes. Normally it will use double
-// quotes, but if s contains a double quote, it will use single quotes.
-// It is used for writing the identifiers in a doctype declaration.
-// In valid HTML, they can't contain both types of quotes.
-func writeQuoted(w writer, s string) error {
-	var q byte = '"'
-	if strings.Contains(s, `"`) {
-		q = '\''
-	}
-	if err := w.WriteByte(q); err != nil {
-		return err
-	}
-	if _, err := w.WriteString(s); err != nil {
-		return err
-	}
-	if err := w.WriteByte(q); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Section 12.1.2, "Elements", gives this list of void elements. Void elements
-// are those that can't have any contents.
-var voidElements = map[string]bool{
-	"area":    true,
-	"base":    true,
-	"br":      true,
-	"col":     true,
-	"command": true,
-	"embed":   true,
-	"hr":      true,
-	"img":     true,
-	"input":   true,
-	"keygen":  true,
-	"link":    true,
-	"meta":    true,
-	"param":   true,
-	"source":  true,
-	"track":   true,
-	"wbr":     true,
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/token.go b/Godeps/_workspace/src/golang.org/x/net/html/token.go
deleted file mode 100644
index 893e272a9e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/html/token.go
+++ /dev/null
@@ -1,1219 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"strconv"
-	"strings"
-
-	"golang.org/x/net/html/atom"
-)
-
-// A TokenType is the type of a Token.
-type TokenType uint32
-
-const (
-	// ErrorToken means that an error occurred during tokenization.
-	ErrorToken TokenType = iota
-	// TextToken means a text node.
-	TextToken
-	// A StartTagToken looks like <a>.
-	StartTagToken
-	// An EndTagToken looks like </a>.
-	EndTagToken
-	// A SelfClosingTagToken tag looks like <br/>.
-	SelfClosingTagToken
-	// A CommentToken looks like <!--x-->.
-	CommentToken
-	// A DoctypeToken looks like <!DOCTYPE x>
-	DoctypeToken
-)
-
-// ErrBufferExceeded means that the buffering limit was exceeded.
-var ErrBufferExceeded = errors.New("max buffer exceeded")
-
-// String returns a string representation of the TokenType.
-func (t TokenType) String() string {
-	switch t {
-	case ErrorToken:
-		return "Error"
-	case TextToken:
-		return "Text"
-	case StartTagToken:
-		return "StartTag"
-	case EndTagToken:
-		return "EndTag"
-	case SelfClosingTagToken:
-		return "SelfClosingTag"
-	case CommentToken:
-		return "Comment"
-	case DoctypeToken:
-		return "Doctype"
-	}
-	return "Invalid(" + strconv.Itoa(int(t)) + ")"
-}
-
-// An Attribute is an attribute namespace-key-value triple. Namespace is
-// non-empty for foreign attributes like xlink, Key is alphabetic (and hence
-// does not contain escapable characters like '&', '<' or '>'), and Val is
-// unescaped (it looks like "a<b" rather than "a&lt;b").
-//
-// Namespace is only used by the parser, not the tokenizer.
-type Attribute struct {
-	Namespace, Key, Val string
-}
-
-// A Token consists of a TokenType and some Data (tag name for start and end
-// tags, content for text, comments and doctypes). A tag Token may also contain
-// a slice of Attributes. Data is unescaped for all Tokens (it looks like "a<b"
-// rather than "a&lt;b"). For tag Tokens, DataAtom is the atom for Data, or
-// zero if Data is not a known tag name.
-type Token struct {
-	Type     TokenType
-	DataAtom atom.Atom
-	Data     string
-	Attr     []Attribute
-}
-
-// tagString returns a string representation of a tag Token's Data and Attr.
-func (t Token) tagString() string {
-	if len(t.Attr) == 0 {
-		return t.Data
-	}
-	buf := bytes.NewBufferString(t.Data)
-	for _, a := range t.Attr {
-		buf.WriteByte(' ')
-		buf.WriteString(a.Key)
-		buf.WriteString(`="`)
-		escape(buf, a.Val)
-		buf.WriteByte('"')
-	}
-	return buf.String()
-}
-
-// String returns a string representation of the Token.
-func (t Token) String() string {
-	switch t.Type {
-	case ErrorToken:
-		return ""
-	case TextToken:
-		return EscapeString(t.Data)
-	case StartTagToken:
-		return "<" + t.tagString() + ">"
-	case EndTagToken:
-		return "</" + t.tagString() + ">"
-	case SelfClosingTagToken:
-		return "<" + t.tagString() + "/>"
-	case CommentToken:
-		return "<!--" + t.Data + "-->"
-	case DoctypeToken:
-		return "<!DOCTYPE " + t.Data + ">"
-	}
-	return "Invalid(" + strconv.Itoa(int(t.Type)) + ")"
-}
-
-// span is a range of bytes in a Tokenizer's buffer. The start is inclusive,
-// the end is exclusive.
-type span struct {
-	start, end int
-}
-
-// A Tokenizer returns a stream of HTML Tokens.
-type Tokenizer struct {
-	// r is the source of the HTML text.
-	r io.Reader
-	// tt is the TokenType of the current token.
-	tt TokenType
-	// err is the first error encountered during tokenization. It is possible
-	// for tt != Error && err != nil to hold: this means that Next returned a
-	// valid token but the subsequent Next call will return an error token.
-	// For example, if the HTML text input was just "plain", then the first
-	// Next call would set z.err to io.EOF but return a TextToken, and all
-	// subsequent Next calls would return an ErrorToken.
-	// err is never reset. Once it becomes non-nil, it stays non-nil.
-	err error
-	// readErr is the error returned by the io.Reader r. It is separate from
-	// err because it is valid for an io.Reader to return (n int, err1 error)
-	// such that n > 0 && err1 != nil, and callers should always process the
-	// n > 0 bytes before considering the error err1.
-	readErr error
-	// buf[raw.start:raw.end] holds the raw bytes of the current token.
-	// buf[raw.end:] is buffered input that will yield future tokens.
-	raw span
-	buf []byte
-	// maxBuf limits the data buffered in buf. A value of 0 means unlimited.
-	maxBuf int
-	// buf[data.start:data.end] holds the raw bytes of the current token's data:
-	// a text token's text, a tag token's tag name, etc.
-	data span
-	// pendingAttr is the attribute key and value currently being tokenized.
-	// When complete, pendingAttr is pushed onto attr. nAttrReturned is
-	// incremented on each call to TagAttr.
-	pendingAttr   [2]span
-	attr          [][2]span
-	nAttrReturned int
-	// rawTag is the "script" in "</script>" that closes the next token. If
-	// non-empty, the subsequent call to Next will return a raw or RCDATA text
-	// token: one that treats "<p>" as text instead of an element.
-	// rawTag's contents are lower-cased.
-	rawTag string
-	// textIsRaw is whether the current text token's data is not escaped.
-	textIsRaw bool
-	// convertNUL is whether NUL bytes in the current token's data should
-	// be converted into \ufffd replacement characters.
-	convertNUL bool
-	// allowCDATA is whether CDATA sections are allowed in the current context.
-	allowCDATA bool
-}
-
-// AllowCDATA sets whether or not the tokenizer recognizes <![CDATA[foo]]> as
-// the text "foo". The default value is false, which means to recognize it as
-// a bogus comment "<!-- [CDATA[foo]] -->" instead.
-//
-// Strictly speaking, an HTML5 compliant tokenizer should allow CDATA if and
-// only if tokenizing foreign content, such as MathML and SVG. However,
-// tracking foreign-contentness is difficult to do purely in the tokenizer,
-// as opposed to the parser, due to HTML integration points: an <svg> element
-// can contain a <foreignObject> that is foreign-to-SVG but not foreign-to-
-// HTML. For strict compliance with the HTML5 tokenization algorithm, it is the
-// responsibility of the user of a tokenizer to call AllowCDATA as appropriate.
-// In practice, if using the tokenizer without caring whether MathML or SVG
-// CDATA is text or comments, such as tokenizing HTML to find all the anchor
-// text, it is acceptable to ignore this responsibility.
-func (z *Tokenizer) AllowCDATA(allowCDATA bool) {
-	z.allowCDATA = allowCDATA
-}
-
-// NextIsNotRawText instructs the tokenizer that the next token should not be
-// considered as 'raw text'. Some elements, such as script and title elements,
-// normally require the next token after the opening tag to be 'raw text' that
-// has no child elements. For example, tokenizing "<title>a<b>c</b>d</title>"
-// yields a start tag token for "<title>", a text token for "a<b>c</b>d", and
-// an end tag token for "</title>". There are no distinct start tag or end tag
-// tokens for the "<b>" and "</b>".
-//
-// This tokenizer implementation will generally look for raw text at the right
-// times. Strictly speaking, an HTML5 compliant tokenizer should not look for
-// raw text if in foreign content: <title> generally needs raw text, but a
-// <title> inside an <svg> does not. Another example is that a <textarea>
-// generally needs raw text, but a <textarea> is not allowed as an immediate
-// child of a <select>; in normal parsing, a <textarea> implies </select>, but
-// one cannot close the implicit element when parsing a <select>'s InnerHTML.
-// Similarly to AllowCDATA, tracking the correct moment to override raw-text-
-// ness is difficult to do purely in the tokenizer, as opposed to the parser.
-// For strict compliance with the HTML5 tokenization algorithm, it is the
-// responsibility of the user of a tokenizer to call NextIsNotRawText as
-// appropriate. In practice, like AllowCDATA, it is acceptable to ignore this
-// responsibility for basic usage.
-//
-// Note that this 'raw text' concept is different from the one offered by the
-// Tokenizer.Raw method.
-func (z *Tokenizer) NextIsNotRawText() {
-	z.rawTag = ""
-}
-
-// Err returns the error associated with the most recent ErrorToken token.
-// This is typically io.EOF, meaning the end of tokenization.
-func (z *Tokenizer) Err() error {
-	if z.tt != ErrorToken {
-		return nil
-	}
-	return z.err
-}
-
-// readByte returns the next byte from the input stream, doing a buffered read
-// from z.r into z.buf if necessary. z.buf[z.raw.start:z.raw.end] remains a contiguous byte
-// slice that holds all the bytes read so far for the current token.
-// It sets z.err if the underlying reader returns an error.
-// Pre-condition: z.err == nil.
-func (z *Tokenizer) readByte() byte {
-	if z.raw.end >= len(z.buf) {
-		// Our buffer is exhausted and we have to read from z.r. Check if the
-		// previous read resulted in an error.
-		if z.readErr != nil {
-			z.err = z.readErr
-			return 0
-		}
-		// We copy z.buf[z.raw.start:z.raw.end] to the beginning of z.buf. If the length
-		// z.raw.end - z.raw.start is more than half the capacity of z.buf, then we
-		// allocate a new buffer before the copy.
-		c := cap(z.buf)
-		d := z.raw.end - z.raw.start
-		var buf1 []byte
-		if 2*d > c {
-			buf1 = make([]byte, d, 2*c)
-		} else {
-			buf1 = z.buf[:d]
-		}
-		copy(buf1, z.buf[z.raw.start:z.raw.end])
-		if x := z.raw.start; x != 0 {
-			// Adjust the data/attr spans to refer to the same contents after the copy.
-			z.data.start -= x
-			z.data.end -= x
-			z.pendingAttr[0].start -= x
-			z.pendingAttr[0].end -= x
-			z.pendingAttr[1].start -= x
-			z.pendingAttr[1].end -= x
-			for i := range z.attr {
-				z.attr[i][0].start -= x
-				z.attr[i][0].end -= x
-				z.attr[i][1].start -= x
-				z.attr[i][1].end -= x
-			}
-		}
-		z.raw.start, z.raw.end, z.buf = 0, d, buf1[:d]
-		// Now that we have copied the live bytes to the start of the buffer,
-		// we read from z.r into the remainder.
-		var n int
-		n, z.readErr = readAtLeastOneByte(z.r, buf1[d:cap(buf1)])
-		if n == 0 {
-			z.err = z.readErr
-			return 0
-		}
-		z.buf = buf1[:d+n]
-	}
-	x := z.buf[z.raw.end]
-	z.raw.end++
-	if z.maxBuf > 0 && z.raw.end-z.raw.start >= z.maxBuf {
-		z.err = ErrBufferExceeded
-		return 0
-	}
-	return x
-}
-
-// Buffered returns a slice containing data buffered but not yet tokenized.
-func (z *Tokenizer) Buffered() []byte {
-	return z.buf[z.raw.end:]
-}
-
-// readAtLeastOneByte wraps an io.Reader so that reading cannot return (0, nil).
-// It returns io.ErrNoProgress if the underlying r.Read method returns (0, nil)
-// too many times in succession.
-func readAtLeastOneByte(r io.Reader, b []byte) (int, error) {
-	for i := 0; i < 100; i++ {
-		n, err := r.Read(b)
-		if n != 0 || err != nil {
-			return n, err
-		}
-	}
-	return 0, io.ErrNoProgress
-}
-
-// skipWhiteSpace skips past any white space.
-func (z *Tokenizer) skipWhiteSpace() {
-	if z.err != nil {
-		return
-	}
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			return
-		}
-		switch c {
-		case ' ', '\n', '\r', '\t', '\f':
-			// No-op.
-		default:
-			z.raw.end--
-			return
-		}
-	}
-}
-
-// readRawOrRCDATA reads until the next "</foo>", where "foo" is z.rawTag and
-// is typically something like "script" or "textarea".
-func (z *Tokenizer) readRawOrRCDATA() {
-	if z.rawTag == "script" {
-		z.readScript()
-		z.textIsRaw = true
-		z.rawTag = ""
-		return
-	}
-loop:
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		if c != '<' {
-			continue loop
-		}
-		c = z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		if c != '/' {
-			continue loop
-		}
-		if z.readRawEndTag() || z.err != nil {
-			break loop
-		}
-	}
-	z.data.end = z.raw.end
-	// A textarea's or title's RCDATA can contain escaped entities.
-	z.textIsRaw = z.rawTag != "textarea" && z.rawTag != "title"
-	z.rawTag = ""
-}
-
-// readRawEndTag attempts to read a tag like "</foo>", where "foo" is z.rawTag.
-// If it succeeds, it backs up the input position to reconsume the tag and
-// returns true. Otherwise it returns false. The opening "</" has already been
-// consumed.
-func (z *Tokenizer) readRawEndTag() bool {
-	for i := 0; i < len(z.rawTag); i++ {
-		c := z.readByte()
-		if z.err != nil {
-			return false
-		}
-		if c != z.rawTag[i] && c != z.rawTag[i]-('a'-'A') {
-			z.raw.end--
-			return false
-		}
-	}
-	c := z.readByte()
-	if z.err != nil {
-		return false
-	}
-	switch c {
-	case ' ', '\n', '\r', '\t', '\f', '/', '>':
-		// The 3 is 2 for the leading "</" plus 1 for the trailing character c.
-		z.raw.end -= 3 + len(z.rawTag)
-		return true
-	}
-	z.raw.end--
-	return false
-}
-
-// readScript reads until the next </script> tag, following the byzantine
-// rules for escaping/hiding the closing tag.
-func (z *Tokenizer) readScript() {
-	defer func() {
-		z.data.end = z.raw.end
-	}()
-	var c byte
-
-scriptData:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '<' {
-		goto scriptDataLessThanSign
-	}
-	goto scriptData
-
-scriptDataLessThanSign:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '/':
-		goto scriptDataEndTagOpen
-	case '!':
-		goto scriptDataEscapeStart
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEndTagOpen:
-	if z.readRawEndTag() || z.err != nil {
-		return
-	}
-	goto scriptData
-
-scriptDataEscapeStart:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '-' {
-		goto scriptDataEscapeStartDash
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEscapeStartDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '-' {
-		goto scriptDataEscapedDashDash
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEscaped:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataEscapedDash
-	case '<':
-		goto scriptDataEscapedLessThanSign
-	}
-	goto scriptDataEscaped
-
-scriptDataEscapedDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataEscapedDashDash
-	case '<':
-		goto scriptDataEscapedLessThanSign
-	}
-	goto scriptDataEscaped
-
-scriptDataEscapedDashDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataEscapedDashDash
-	case '<':
-		goto scriptDataEscapedLessThanSign
-	case '>':
-		goto scriptData
-	}
-	goto scriptDataEscaped
-
-scriptDataEscapedLessThanSign:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '/' {
-		goto scriptDataEscapedEndTagOpen
-	}
-	if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
-		goto scriptDataDoubleEscapeStart
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEscapedEndTagOpen:
-	if z.readRawEndTag() || z.err != nil {
-		return
-	}
-	goto scriptDataEscaped
-
-scriptDataDoubleEscapeStart:
-	z.raw.end--
-	for i := 0; i < len("script"); i++ {
-		c = z.readByte()
-		if z.err != nil {
-			return
-		}
-		if c != "script"[i] && c != "SCRIPT"[i] {
-			z.raw.end--
-			goto scriptDataEscaped
-		}
-	}
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case ' ', '\n', '\r', '\t', '\f', '/', '>':
-		goto scriptDataDoubleEscaped
-	}
-	z.raw.end--
-	goto scriptDataEscaped
-
-scriptDataDoubleEscaped:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataDoubleEscapedDash
-	case '<':
-		goto scriptDataDoubleEscapedLessThanSign
-	}
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapedDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataDoubleEscapedDashDash
-	case '<':
-		goto scriptDataDoubleEscapedLessThanSign
-	}
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapedDashDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataDoubleEscapedDashDash
-	case '<':
-		goto scriptDataDoubleEscapedLessThanSign
-	case '>':
-		goto scriptData
-	}
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapedLessThanSign:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '/' {
-		goto scriptDataDoubleEscapeEnd
-	}
-	z.raw.end--
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapeEnd:
-	if z.readRawEndTag() {
-		z.raw.end += len("</script>")
-		goto scriptDataEscaped
-	}
-	if z.err != nil {
-		return
-	}
-	goto scriptDataDoubleEscaped
-}
-
-// readComment reads the next comment token starting with "<!--". The opening
-// "<!--" has already been consumed.
-func (z *Tokenizer) readComment() {
-	z.data.start = z.raw.end
-	defer func() {
-		if z.data.end < z.data.start {
-			// It's a comment with no data, like <!-->.
-			z.data.end = z.data.start
-		}
-	}()
-	for dashCount := 2; ; {
-		c := z.readByte()
-		if z.err != nil {
-			// Ignore up to two dashes at EOF.
-			if dashCount > 2 {
-				dashCount = 2
-			}
-			z.data.end = z.raw.end - dashCount
-			return
-		}
-		switch c {
-		case '-':
-			dashCount++
-			continue
-		case '>':
-			if dashCount >= 2 {
-				z.data.end = z.raw.end - len("-->")
-				return
-			}
-		case '!':
-			if dashCount >= 2 {
-				c = z.readByte()
-				if z.err != nil {
-					z.data.end = z.raw.end
-					return
-				}
-				if c == '>' {
-					z.data.end = z.raw.end - len("--!>")
-					return
-				}
-			}
-		}
-		dashCount = 0
-	}
-}
-
-// readUntilCloseAngle reads until the next ">".
-func (z *Tokenizer) readUntilCloseAngle() {
-	z.data.start = z.raw.end
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return
-		}
-		if c == '>' {
-			z.data.end = z.raw.end - len(">")
-			return
-		}
-	}
-}
-
-// readMarkupDeclaration reads the next token starting with "<!". It might be
-// a "<!--comment-->", a "<!DOCTYPE foo>", a "<![CDATA[section]]>" or
-// "<!a bogus comment". The opening "<!" has already been consumed.
-func (z *Tokenizer) readMarkupDeclaration() TokenType {
-	z.data.start = z.raw.end
-	var c [2]byte
-	for i := 0; i < 2; i++ {
-		c[i] = z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return CommentToken
-		}
-	}
-	if c[0] == '-' && c[1] == '-' {
-		z.readComment()
-		return CommentToken
-	}
-	z.raw.end -= 2
-	if z.readDoctype() {
-		return DoctypeToken
-	}
-	if z.allowCDATA && z.readCDATA() {
-		z.convertNUL = true
-		return TextToken
-	}
-	// It's a bogus comment.
-	z.readUntilCloseAngle()
-	return CommentToken
-}
-
-// readDoctype attempts to read a doctype declaration and returns true if
-// successful. The opening "<!" has already been consumed.
-func (z *Tokenizer) readDoctype() bool {
-	const s = "DOCTYPE"
-	for i := 0; i < len(s); i++ {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return false
-		}
-		if c != s[i] && c != s[i]+('a'-'A') {
-			// Back up to read the fragment of "DOCTYPE" again.
-			z.raw.end = z.data.start
-			return false
-		}
-	}
-	if z.skipWhiteSpace(); z.err != nil {
-		z.data.start = z.raw.end
-		z.data.end = z.raw.end
-		return true
-	}
-	z.readUntilCloseAngle()
-	return true
-}
-
-// readCDATA attempts to read a CDATA section and returns true if
-// successful. The opening "<!" has already been consumed.
-func (z *Tokenizer) readCDATA() bool {
-	const s = "[CDATA["
-	for i := 0; i < len(s); i++ {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return false
-		}
-		if c != s[i] {
-			// Back up to read the fragment of "[CDATA[" again.
-			z.raw.end = z.data.start
-			return false
-		}
-	}
-	z.data.start = z.raw.end
-	brackets := 0
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return true
-		}
-		switch c {
-		case ']':
-			brackets++
-		case '>':
-			if brackets >= 2 {
-				z.data.end = z.raw.end - len("]]>")
-				return true
-			}
-			brackets = 0
-		default:
-			brackets = 0
-		}
-	}
-}
-
-// startTagIn returns whether the start tag in z.buf[z.data.start:z.data.end]
-// case-insensitively matches any element of ss.
-func (z *Tokenizer) startTagIn(ss ...string) bool {
-loop:
-	for _, s := range ss {
-		if z.data.end-z.data.start != len(s) {
-			continue loop
-		}
-		for i := 0; i < len(s); i++ {
-			c := z.buf[z.data.start+i]
-			if 'A' <= c && c <= 'Z' {
-				c += 'a' - 'A'
-			}
-			if c != s[i] {
-				continue loop
-			}
-		}
-		return true
-	}
-	return false
-}
-
-// readStartTag reads the next start tag token. The opening "<a" has already
-// been consumed, where 'a' means anything in [A-Za-z].
-func (z *Tokenizer) readStartTag() TokenType {
-	z.readTag(true)
-	if z.err != nil {
-		return ErrorToken
-	}
-	// Several tags flag the tokenizer's next token as raw.
-	c, raw := z.buf[z.data.start], false
-	if 'A' <= c && c <= 'Z' {
-		c += 'a' - 'A'
-	}
-	switch c {
-	case 'i':
-		raw = z.startTagIn("iframe")
-	case 'n':
-		raw = z.startTagIn("noembed", "noframes", "noscript")
-	case 'p':
-		raw = z.startTagIn("plaintext")
-	case 's':
-		raw = z.startTagIn("script", "style")
-	case 't':
-		raw = z.startTagIn("textarea", "title")
-	case 'x':
-		raw = z.startTagIn("xmp")
-	}
-	if raw {
-		z.rawTag = strings.ToLower(string(z.buf[z.data.start:z.data.end]))
-	}
-	// Look for a self-closing token like "<br/>".
-	if z.err == nil && z.buf[z.raw.end-2] == '/' {
-		return SelfClosingTagToken
-	}
-	return StartTagToken
-}
-
-// readTag reads the next tag token and its attributes. If saveAttr, those
-// attributes are saved in z.attr, otherwise z.attr is set to an empty slice.
-// The opening "<a" or "</a" has already been consumed, where 'a' means anything
-// in [A-Za-z].
-func (z *Tokenizer) readTag(saveAttr bool) {
-	z.attr = z.attr[:0]
-	z.nAttrReturned = 0
-	// Read the tag name and attribute key/value pairs.
-	z.readTagName()
-	if z.skipWhiteSpace(); z.err != nil {
-		return
-	}
-	for {
-		c := z.readByte()
-		if z.err != nil || c == '>' {
-			break
-		}
-		z.raw.end--
-		z.readTagAttrKey()
-		z.readTagAttrVal()
-		// Save pendingAttr if saveAttr and that attribute has a non-empty key.
-		if saveAttr && z.pendingAttr[0].start != z.pendingAttr[0].end {
-			z.attr = append(z.attr, z.pendingAttr)
-		}
-		if z.skipWhiteSpace(); z.err != nil {
-			break
-		}
-	}
-}
-
-// readTagName sets z.data to the "div" in "<div k=v>". The reader (z.raw.end)
-// is positioned such that the first byte of the tag name (the "d" in "<div")
-// has already been consumed.
-func (z *Tokenizer) readTagName() {
-	z.data.start = z.raw.end - 1
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return
-		}
-		switch c {
-		case ' ', '\n', '\r', '\t', '\f':
-			z.data.end = z.raw.end - 1
-			return
-		case '/', '>':
-			z.raw.end--
-			z.data.end = z.raw.end
-			return
-		}
-	}
-}
-
-// readTagAttrKey sets z.pendingAttr[0] to the "k" in "<div k=v>".
-// Precondition: z.err == nil.
-func (z *Tokenizer) readTagAttrKey() {
-	z.pendingAttr[0].start = z.raw.end
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.pendingAttr[0].end = z.raw.end
-			return
-		}
-		switch c {
-		case ' ', '\n', '\r', '\t', '\f', '/':
-			z.pendingAttr[0].end = z.raw.end - 1
-			return
-		case '=', '>':
-			z.raw.end--
-			z.pendingAttr[0].end = z.raw.end
-			return
-		}
-	}
-}
-
-// readTagAttrVal sets z.pendingAttr[1] to the "v" in "<div k=v>".
-func (z *Tokenizer) readTagAttrVal() {
-	z.pendingAttr[1].start = z.raw.end
-	z.pendingAttr[1].end = z.raw.end
-	if z.skipWhiteSpace(); z.err != nil {
-		return
-	}
-	c := z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c != '=' {
-		z.raw.end--
-		return
-	}
-	if z.skipWhiteSpace(); z.err != nil {
-		return
-	}
-	quote := z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch quote {
-	case '>':
-		z.raw.end--
-		return
-
-	case '\'', '"':
-		z.pendingAttr[1].start = z.raw.end
-		for {
-			c := z.readByte()
-			if z.err != nil {
-				z.pendingAttr[1].end = z.raw.end
-				return
-			}
-			if c == quote {
-				z.pendingAttr[1].end = z.raw.end - 1
-				return
-			}
-		}
-
-	default:
-		z.pendingAttr[1].start = z.raw.end - 1
-		for {
-			c := z.readByte()
-			if z.err != nil {
-				z.pendingAttr[1].end = z.raw.end
-				return
-			}
-			switch c {
-			case ' ', '\n', '\r', '\t', '\f':
-				z.pendingAttr[1].end = z.raw.end - 1
-				return
-			case '>':
-				z.raw.end--
-				z.pendingAttr[1].end = z.raw.end
-				return
-			}
-		}
-	}
-}
-
-// Next scans the next token and returns its type.
-func (z *Tokenizer) Next() TokenType {
-	z.raw.start = z.raw.end
-	z.data.start = z.raw.end
-	z.data.end = z.raw.end
-	if z.err != nil {
-		z.tt = ErrorToken
-		return z.tt
-	}
-	if z.rawTag != "" {
-		if z.rawTag == "plaintext" {
-			// Read everything up to EOF.
-			for z.err == nil {
-				z.readByte()
-			}
-			z.data.end = z.raw.end
-			z.textIsRaw = true
-		} else {
-			z.readRawOrRCDATA()
-		}
-		if z.data.end > z.data.start {
-			z.tt = TextToken
-			z.convertNUL = true
-			return z.tt
-		}
-	}
-	z.textIsRaw = false
-	z.convertNUL = false
-
-loop:
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		if c != '<' {
-			continue loop
-		}
-
-		// Check if the '<' we have just read is part of a tag, comment
-		// or doctype. If not, it's part of the accumulated text token.
-		c = z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		var tokenType TokenType
-		switch {
-		case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z':
-			tokenType = StartTagToken
-		case c == '/':
-			tokenType = EndTagToken
-		case c == '!' || c == '?':
-			// We use CommentToken to mean any of "<!--actual comments-->",
-			// "<!DOCTYPE declarations>" and "<?xml processing instructions?>".
-			tokenType = CommentToken
-		default:
-			// Reconsume the current character.
-			z.raw.end--
-			continue
-		}
-
-		// We have a non-text token, but we might have accumulated some text
-		// before that. If so, we return the text first, and return the non-
-		// text token on the subsequent call to Next.
-		if x := z.raw.end - len("<a"); z.raw.start < x {
-			z.raw.end = x
-			z.data.end = x
-			z.tt = TextToken
-			return z.tt
-		}
-		switch tokenType {
-		case StartTagToken:
-			z.tt = z.readStartTag()
-			return z.tt
-		case EndTagToken:
-			c = z.readByte()
-			if z.err != nil {
-				break loop
-			}
-			if c == '>' {
-				// "</>" does not generate a token at all. Generate an empty comment
-				// to allow passthrough clients to pick up the data using Raw.
-				// Reset the tokenizer state and start again.
-				z.tt = CommentToken
-				return z.tt
-			}
-			if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
-				z.readTag(false)
-				if z.err != nil {
-					z.tt = ErrorToken
-				} else {
-					z.tt = EndTagToken
-				}
-				return z.tt
-			}
-			z.raw.end--
-			z.readUntilCloseAngle()
-			z.tt = CommentToken
-			return z.tt
-		case CommentToken:
-			if c == '!' {
-				z.tt = z.readMarkupDeclaration()
-				return z.tt
-			}
-			z.raw.end--
-			z.readUntilCloseAngle()
-			z.tt = CommentToken
-			return z.tt
-		}
-	}
-	if z.raw.start < z.raw.end {
-		z.data.end = z.raw.end
-		z.tt = TextToken
-		return z.tt
-	}
-	z.tt = ErrorToken
-	return z.tt
-}
-
-// Raw returns the unmodified text of the current token. Calling Next, Token,
-// Text, TagName or TagAttr may change the contents of the returned slice.
-func (z *Tokenizer) Raw() []byte {
-	return z.buf[z.raw.start:z.raw.end]
-}
-
-// convertNewlines converts "\r" and "\r\n" in s to "\n".
-// The conversion happens in place, but the resulting slice may be shorter.
-func convertNewlines(s []byte) []byte {
-	for i, c := range s {
-		if c != '\r' {
-			continue
-		}
-
-		src := i + 1
-		if src >= len(s) || s[src] != '\n' {
-			s[i] = '\n'
-			continue
-		}
-
-		dst := i
-		for src < len(s) {
-			if s[src] == '\r' {
-				if src+1 < len(s) && s[src+1] == '\n' {
-					src++
-				}
-				s[dst] = '\n'
-			} else {
-				s[dst] = s[src]
-			}
-			src++
-			dst++
-		}
-		return s[:dst]
-	}
-	return s
-}
-
-var (
-	nul         = []byte("\x00")
-	replacement = []byte("\ufffd")
-)
-
-// Text returns the unescaped text of a text, comment or doctype token. The
-// contents of the returned slice may change on the next call to Next.
-func (z *Tokenizer) Text() []byte {
-	switch z.tt {
-	case TextToken, CommentToken, DoctypeToken:
-		s := z.buf[z.data.start:z.data.end]
-		z.data.start = z.raw.end
-		z.data.end = z.raw.end
-		s = convertNewlines(s)
-		if (z.convertNUL || z.tt == CommentToken) && bytes.Contains(s, nul) {
-			s = bytes.Replace(s, nul, replacement, -1)
-		}
-		if !z.textIsRaw {
-			s = unescape(s, false)
-		}
-		return s
-	}
-	return nil
-}
-
-// TagName returns the lower-cased name of a tag token (the `img` out of
-// `<IMG SRC="foo">`) and whether the tag has attributes.
-// The contents of the returned slice may change on the next call to Next.
-func (z *Tokenizer) TagName() (name []byte, hasAttr bool) {
-	if z.data.start < z.data.end {
-		switch z.tt {
-		case StartTagToken, EndTagToken, SelfClosingTagToken:
-			s := z.buf[z.data.start:z.data.end]
-			z.data.start = z.raw.end
-			z.data.end = z.raw.end
-			return lower(s), z.nAttrReturned < len(z.attr)
-		}
-	}
-	return nil, false
-}
-
-// TagAttr returns the lower-cased key and unescaped value of the next unparsed
-// attribute for the current tag token and whether there are more attributes.
-// The contents of the returned slices may change on the next call to Next.
-func (z *Tokenizer) TagAttr() (key, val []byte, moreAttr bool) {
-	if z.nAttrReturned < len(z.attr) {
-		switch z.tt {
-		case StartTagToken, SelfClosingTagToken:
-			x := z.attr[z.nAttrReturned]
-			z.nAttrReturned++
-			key = z.buf[x[0].start:x[0].end]
-			val = z.buf[x[1].start:x[1].end]
-			return lower(key), unescape(convertNewlines(val), true), z.nAttrReturned < len(z.attr)
-		}
-	}
-	return nil, nil, false
-}
-
-// Token returns the next Token. The result's Data and Attr values remain valid
-// after subsequent Next calls.
-func (z *Tokenizer) Token() Token {
-	t := Token{Type: z.tt}
-	switch z.tt {
-	case TextToken, CommentToken, DoctypeToken:
-		t.Data = string(z.Text())
-	case StartTagToken, SelfClosingTagToken, EndTagToken:
-		name, moreAttr := z.TagName()
-		for moreAttr {
-			var key, val []byte
-			key, val, moreAttr = z.TagAttr()
-			t.Attr = append(t.Attr, Attribute{"", atom.String(key), string(val)})
-		}
-		if a := atom.Lookup(name); a != 0 {
-			t.DataAtom, t.Data = a, a.String()
-		} else {
-			t.DataAtom, t.Data = 0, string(name)
-		}
-	}
-	return t
-}
-
-// SetMaxBuf sets a limit on the amount of data buffered during tokenization.
-// A value of 0 means unlimited.
-func (z *Tokenizer) SetMaxBuf(n int) {
-	z.maxBuf = n
-}
-
-// NewTokenizer returns a new HTML Tokenizer for the given Reader.
-// The input is assumed to be UTF-8 encoded.
-func NewTokenizer(r io.Reader) *Tokenizer {
-	return NewTokenizerFragment(r, "")
-}
-
-// NewTokenizerFragment returns a new HTML Tokenizer for the given Reader, for
-// tokenizing an existing element's InnerHTML fragment. contextTag is that
-// element's tag, such as "div" or "iframe".
-//
-// For example, how the InnerHTML "a<b" is tokenized depends on whether it is
-// for a <p> tag or a <script> tag.
-//
-// The input is assumed to be UTF-8 encoded.
-func NewTokenizerFragment(r io.Reader, contextTag string) *Tokenizer {
-	z := &Tokenizer{
-		r:   r,
-		buf: make([]byte, 0, 4096),
-	}
-	if contextTag != "" {
-		switch s := strings.ToLower(contextTag); s {
-		case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "title", "textarea", "xmp":
-			z.rawTag = s
-		}
-	}
-	return z
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/.gitignore b/Godeps/_workspace/src/golang.org/x/net/http2/.gitignore
deleted file mode 100644
index 190f12234a..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-h2i/h2i
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/Dockerfile b/Godeps/_workspace/src/golang.org/x/net/http2/Dockerfile
deleted file mode 100644
index b4e14d55a5..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# This Dockerfile builds a recent curl with HTTP/2 client support, using
-# a recent nghttp2 build.
-#
-# See the Makefile for how to tag it. If Docker and that image is found, the
-# Go tests use this curl binary for integration tests.
-#
-
-FROM ubuntu:trusty
-
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y git-core build-essential wget
-
-RUN apt-get install -y --no-install-recommends \
-       autotools-dev libtool pkg-config zlib1g-dev \
-       libcunit1-dev libssl-dev libxml2-dev libevent-dev \
-       automake autoconf
-
-# Note: setting NGHTTP2_VER before the git clone, so an old git clone isn't cached:
-ENV NGHTTP2_VER af24f8394e43f4
-RUN cd /root && git clone https://github.com/tatsuhiro-t/nghttp2.git
-
-WORKDIR /root/nghttp2
-RUN git reset --hard $NGHTTP2_VER
-RUN autoreconf -i
-RUN automake
-RUN autoconf
-RUN ./configure
-RUN make
-RUN make install
-
-WORKDIR /root
-RUN wget http://curl.haxx.se/download/curl-7.40.0.tar.gz
-RUN tar -zxvf curl-7.40.0.tar.gz
-WORKDIR /root/curl-7.40.0
-RUN ./configure --with-ssl --with-nghttp2=/usr/local
-RUN make
-RUN make install
-RUN ldconfig
-
-CMD ["-h"]
-ENTRYPOINT ["/usr/local/bin/curl"]
-
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/Makefile b/Godeps/_workspace/src/golang.org/x/net/http2/Makefile
deleted file mode 100644
index 55fd826f77..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-curlimage:
-	docker build -t gohttp2/curl .
-
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/README b/Godeps/_workspace/src/golang.org/x/net/http2/README
deleted file mode 100644
index aba8ae5ef6..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/README
+++ /dev/null
@@ -1,20 +0,0 @@
-This is a work-in-progress HTTP/2 implementation for Go.
-
-It will eventually live in the Go standard library and won't require
-any changes to your code to use.  It will just be automatic.
-
-Status:
-
-* The server support is pretty good. A few things are missing
-  but are being worked on.
-* The client work has just started but shares a lot of code
-  is coming along much quicker.
-
-Docs are at https://godoc.org/golang.org/x/net/http2
-
-Demo test server at https://http2.golang.org/
-
-Help & bug reports welcome!
-
-Contributing: https://golang.org/doc/contribute.html
-Bugs:         https://github.com/golang/go/issues/new?title=x/net/http2:+
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/buffer.go b/Godeps/_workspace/src/golang.org/x/net/http2/buffer.go
deleted file mode 100644
index c43954cf04..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/buffer.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package http2
-
-import (
-	"errors"
-)
-
-// buffer is an io.ReadWriteCloser backed by a fixed size buffer.
-// It never allocates, but moves old data as new data is written.
-type buffer struct {
-	buf    []byte
-	r, w   int
-	closed bool
-	err    error // err to return to reader
-}
-
-var (
-	errReadEmpty   = errors.New("read from empty buffer")
-	errWriteClosed = errors.New("write on closed buffer")
-	errWriteFull   = errors.New("write on full buffer")
-)
-
-// Read copies bytes from the buffer into p.
-// It is an error to read when no data is available.
-func (b *buffer) Read(p []byte) (n int, err error) {
-	n = copy(p, b.buf[b.r:b.w])
-	b.r += n
-	if b.closed && b.r == b.w {
-		err = b.err
-	} else if b.r == b.w && n == 0 {
-		err = errReadEmpty
-	}
-	return n, err
-}
-
-// Len returns the number of bytes of the unread portion of the buffer.
-func (b *buffer) Len() int {
-	return b.w - b.r
-}
-
-// Write copies bytes from p into the buffer.
-// It is an error to write more data than the buffer can hold.
-func (b *buffer) Write(p []byte) (n int, err error) {
-	if b.closed {
-		return 0, errWriteClosed
-	}
-
-	// Slide existing data to beginning.
-	if b.r > 0 && len(p) > len(b.buf)-b.w {
-		copy(b.buf, b.buf[b.r:b.w])
-		b.w -= b.r
-		b.r = 0
-	}
-
-	// Write new data.
-	n = copy(b.buf[b.w:], p)
-	b.w += n
-	if n < len(p) {
-		err = errWriteFull
-	}
-	return n, err
-}
-
-// Close marks the buffer as closed. Future calls to Write will
-// return an error. Future calls to Read, once the buffer is
-// empty, will return err.
-func (b *buffer) Close(err error) {
-	if !b.closed {
-		b.closed = true
-		b.err = err
-	}
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/errors.go b/Godeps/_workspace/src/golang.org/x/net/http2/errors.go
deleted file mode 100644
index c885328a82..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/errors.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package http2
-
-import "fmt"
-
-// An ErrCode is an unsigned 32-bit error code as defined in the HTTP/2 spec.
-type ErrCode uint32
-
-const (
-	ErrCodeNo                 ErrCode = 0x0
-	ErrCodeProtocol           ErrCode = 0x1
-	ErrCodeInternal           ErrCode = 0x2
-	ErrCodeFlowControl        ErrCode = 0x3
-	ErrCodeSettingsTimeout    ErrCode = 0x4
-	ErrCodeStreamClosed       ErrCode = 0x5
-	ErrCodeFrameSize          ErrCode = 0x6
-	ErrCodeRefusedStream      ErrCode = 0x7
-	ErrCodeCancel             ErrCode = 0x8
-	ErrCodeCompression        ErrCode = 0x9
-	ErrCodeConnect            ErrCode = 0xa
-	ErrCodeEnhanceYourCalm    ErrCode = 0xb
-	ErrCodeInadequateSecurity ErrCode = 0xc
-	ErrCodeHTTP11Required     ErrCode = 0xd
-)
-
-var errCodeName = map[ErrCode]string{
-	ErrCodeNo:                 "NO_ERROR",
-	ErrCodeProtocol:           "PROTOCOL_ERROR",
-	ErrCodeInternal:           "INTERNAL_ERROR",
-	ErrCodeFlowControl:        "FLOW_CONTROL_ERROR",
-	ErrCodeSettingsTimeout:    "SETTINGS_TIMEOUT",
-	ErrCodeStreamClosed:       "STREAM_CLOSED",
-	ErrCodeFrameSize:          "FRAME_SIZE_ERROR",
-	ErrCodeRefusedStream:      "REFUSED_STREAM",
-	ErrCodeCancel:             "CANCEL",
-	ErrCodeCompression:        "COMPRESSION_ERROR",
-	ErrCodeConnect:            "CONNECT_ERROR",
-	ErrCodeEnhanceYourCalm:    "ENHANCE_YOUR_CALM",
-	ErrCodeInadequateSecurity: "INADEQUATE_SECURITY",
-	ErrCodeHTTP11Required:     "HTTP_1_1_REQUIRED",
-}
-
-func (e ErrCode) String() string {
-	if s, ok := errCodeName[e]; ok {
-		return s
-	}
-	return fmt.Sprintf("unknown error code 0x%x", uint32(e))
-}
-
-// ConnectionError is an error that results in the termination of the
-// entire connection.
-type ConnectionError ErrCode
-
-func (e ConnectionError) Error() string { return fmt.Sprintf("connection error: %s", ErrCode(e)) }
-
-// StreamError is an error that only affects one stream within an
-// HTTP/2 connection.
-type StreamError struct {
-	StreamID uint32
-	Code     ErrCode
-}
-
-func (e StreamError) Error() string {
-	return fmt.Sprintf("stream error: stream ID %d; %v", e.StreamID, e.Code)
-}
-
-// 6.9.1 The Flow Control Window
-// "If a sender receives a WINDOW_UPDATE that causes a flow control
-// window to exceed this maximum it MUST terminate either the stream
-// or the connection, as appropriate. For streams, [...]; for the
-// connection, a GOAWAY frame with a FLOW_CONTROL_ERROR code."
-type goAwayFlowError struct{}
-
-func (goAwayFlowError) Error() string { return "connection exceeded flow control window size" }
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/flow.go b/Godeps/_workspace/src/golang.org/x/net/http2/flow.go
deleted file mode 100644
index 540fc4283e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/flow.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-// Flow control
-
-package http2
-
-// flow is the flow control window's size.
-type flow struct {
-	// n is the number of DATA bytes we're allowed to send.
-	// A flow is kept both on a conn and a per-stream.
-	n int32
-
-	// conn points to the shared connection-level flow that is
-	// shared by all streams on that conn. It is nil for the flow
-	// that's on the conn directly.
-	conn *flow
-}
-
-func (f *flow) setConnFlow(cf *flow) { f.conn = cf }
-
-func (f *flow) available() int32 {
-	n := f.n
-	if f.conn != nil && f.conn.n < n {
-		n = f.conn.n
-	}
-	return n
-}
-
-func (f *flow) take(n int32) {
-	if n > f.available() {
-		panic("internal error: took too much")
-	}
-	f.n -= n
-	if f.conn != nil {
-		f.conn.n -= n
-	}
-}
-
-// add adds n bytes (positive or negative) to the flow control window.
-// It returns false if the sum would exceed 2^31-1.
-func (f *flow) add(n int32) bool {
-	remain := (1<<31 - 1) - f.n
-	if n > remain {
-		return false
-	}
-	f.n += n
-	return true
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/frame.go b/Godeps/_workspace/src/golang.org/x/net/http2/frame.go
deleted file mode 100644
index e8b872a19b..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/frame.go
+++ /dev/null
@@ -1,1113 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package http2
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"sync"
-)
-
-const frameHeaderLen = 9
-
-var padZeros = make([]byte, 255) // zeros for padding
-
-// A FrameType is a registered frame type as defined in
-// http://http2.github.io/http2-spec/#rfc.section.11.2
-type FrameType uint8
-
-const (
-	FrameData         FrameType = 0x0
-	FrameHeaders      FrameType = 0x1
-	FramePriority     FrameType = 0x2
-	FrameRSTStream    FrameType = 0x3
-	FrameSettings     FrameType = 0x4
-	FramePushPromise  FrameType = 0x5
-	FramePing         FrameType = 0x6
-	FrameGoAway       FrameType = 0x7
-	FrameWindowUpdate FrameType = 0x8
-	FrameContinuation FrameType = 0x9
-)
-
-var frameName = map[FrameType]string{
-	FrameData:         "DATA",
-	FrameHeaders:      "HEADERS",
-	FramePriority:     "PRIORITY",
-	FrameRSTStream:    "RST_STREAM",
-	FrameSettings:     "SETTINGS",
-	FramePushPromise:  "PUSH_PROMISE",
-	FramePing:         "PING",
-	FrameGoAway:       "GOAWAY",
-	FrameWindowUpdate: "WINDOW_UPDATE",
-	FrameContinuation: "CONTINUATION",
-}
-
-func (t FrameType) String() string {
-	if s, ok := frameName[t]; ok {
-		return s
-	}
-	return fmt.Sprintf("UNKNOWN_FRAME_TYPE_%d", uint8(t))
-}
-
-// Flags is a bitmask of HTTP/2 flags.
-// The meaning of flags varies depending on the frame type.
-type Flags uint8
-
-// Has reports whether f contains all (0 or more) flags in v.
-func (f Flags) Has(v Flags) bool {
-	return (f & v) == v
-}
-
-// Frame-specific FrameHeader flag bits.
-const (
-	// Data Frame
-	FlagDataEndStream Flags = 0x1
-	FlagDataPadded    Flags = 0x8
-
-	// Headers Frame
-	FlagHeadersEndStream  Flags = 0x1
-	FlagHeadersEndHeaders Flags = 0x4
-	FlagHeadersPadded     Flags = 0x8
-	FlagHeadersPriority   Flags = 0x20
-
-	// Settings Frame
-	FlagSettingsAck Flags = 0x1
-
-	// Ping Frame
-	FlagPingAck Flags = 0x1
-
-	// Continuation Frame
-	FlagContinuationEndHeaders Flags = 0x4
-
-	FlagPushPromiseEndHeaders Flags = 0x4
-	FlagPushPromisePadded     Flags = 0x8
-)
-
-var flagName = map[FrameType]map[Flags]string{
-	FrameData: {
-		FlagDataEndStream: "END_STREAM",
-		FlagDataPadded:    "PADDED",
-	},
-	FrameHeaders: {
-		FlagHeadersEndStream:  "END_STREAM",
-		FlagHeadersEndHeaders: "END_HEADERS",
-		FlagHeadersPadded:     "PADDED",
-		FlagHeadersPriority:   "PRIORITY",
-	},
-	FrameSettings: {
-		FlagSettingsAck: "ACK",
-	},
-	FramePing: {
-		FlagPingAck: "ACK",
-	},
-	FrameContinuation: {
-		FlagContinuationEndHeaders: "END_HEADERS",
-	},
-	FramePushPromise: {
-		FlagPushPromiseEndHeaders: "END_HEADERS",
-		FlagPushPromisePadded:     "PADDED",
-	},
-}
-
-// a frameParser parses a frame given its FrameHeader and payload
-// bytes. The length of payload will always equal fh.Length (which
-// might be 0).
-type frameParser func(fh FrameHeader, payload []byte) (Frame, error)
-
-var frameParsers = map[FrameType]frameParser{
-	FrameData:         parseDataFrame,
-	FrameHeaders:      parseHeadersFrame,
-	FramePriority:     parsePriorityFrame,
-	FrameRSTStream:    parseRSTStreamFrame,
-	FrameSettings:     parseSettingsFrame,
-	FramePushPromise:  parsePushPromise,
-	FramePing:         parsePingFrame,
-	FrameGoAway:       parseGoAwayFrame,
-	FrameWindowUpdate: parseWindowUpdateFrame,
-	FrameContinuation: parseContinuationFrame,
-}
-
-func typeFrameParser(t FrameType) frameParser {
-	if f := frameParsers[t]; f != nil {
-		return f
-	}
-	return parseUnknownFrame
-}
-
-// A FrameHeader is the 9 byte header of all HTTP/2 frames.
-//
-// See http://http2.github.io/http2-spec/#FrameHeader
-type FrameHeader struct {
-	valid bool // caller can access []byte fields in the Frame
-
-	// Type is the 1 byte frame type. There are ten standard frame
-	// types, but extension frame types may be written by WriteRawFrame
-	// and will be returned by ReadFrame (as UnknownFrame).
-	Type FrameType
-
-	// Flags are the 1 byte of 8 potential bit flags per frame.
-	// They are specific to the frame type.
-	Flags Flags
-
-	// Length is the length of the frame, not including the 9 byte header.
-	// The maximum size is one byte less than 16MB (uint24), but only
-	// frames up to 16KB are allowed without peer agreement.
-	Length uint32
-
-	// StreamID is which stream this frame is for. Certain frames
-	// are not stream-specific, in which case this field is 0.
-	StreamID uint32
-}
-
-// Header returns h. It exists so FrameHeaders can be embedded in other
-// specific frame types and implement the Frame interface.
-func (h FrameHeader) Header() FrameHeader { return h }
-
-func (h FrameHeader) String() string {
-	var buf bytes.Buffer
-	buf.WriteString("[FrameHeader ")
-	buf.WriteString(h.Type.String())
-	if h.Flags != 0 {
-		buf.WriteString(" flags=")
-		set := 0
-		for i := uint8(0); i < 8; i++ {
-			if h.Flags&(1<<i) == 0 {
-				continue
-			}
-			set++
-			if set > 1 {
-				buf.WriteByte('|')
-			}
-			name := flagName[h.Type][Flags(1<<i)]
-			if name != "" {
-				buf.WriteString(name)
-			} else {
-				fmt.Fprintf(&buf, "0x%x", 1<<i)
-			}
-		}
-	}
-	if h.StreamID != 0 {
-		fmt.Fprintf(&buf, " stream=%d", h.StreamID)
-	}
-	fmt.Fprintf(&buf, " len=%d]", h.Length)
-	return buf.String()
-}
-
-func (h *FrameHeader) checkValid() {
-	if !h.valid {
-		panic("Frame accessor called on non-owned Frame")
-	}
-}
-
-func (h *FrameHeader) invalidate() { h.valid = false }
-
-// frame header bytes.
-// Used only by ReadFrameHeader.
-var fhBytes = sync.Pool{
-	New: func() interface{} {
-		buf := make([]byte, frameHeaderLen)
-		return &buf
-	},
-}
-
-// ReadFrameHeader reads 9 bytes from r and returns a FrameHeader.
-// Most users should use Framer.ReadFrame instead.
-func ReadFrameHeader(r io.Reader) (FrameHeader, error) {
-	bufp := fhBytes.Get().(*[]byte)
-	defer fhBytes.Put(bufp)
-	return readFrameHeader(*bufp, r)
-}
-
-func readFrameHeader(buf []byte, r io.Reader) (FrameHeader, error) {
-	_, err := io.ReadFull(r, buf[:frameHeaderLen])
-	if err != nil {
-		return FrameHeader{}, err
-	}
-	return FrameHeader{
-		Length:   (uint32(buf[0])<<16 | uint32(buf[1])<<8 | uint32(buf[2])),
-		Type:     FrameType(buf[3]),
-		Flags:    Flags(buf[4]),
-		StreamID: binary.BigEndian.Uint32(buf[5:]) & (1<<31 - 1),
-		valid:    true,
-	}, nil
-}
-
-// A Frame is the base interface implemented by all frame types.
-// Callers will generally type-assert the specific frame type:
-// *HeadersFrame, *SettingsFrame, *WindowUpdateFrame, etc.
-//
-// Frames are only valid until the next call to Framer.ReadFrame.
-type Frame interface {
-	Header() FrameHeader
-
-	// invalidate is called by Framer.ReadFrame to make this
-	// frame's buffers as being invalid, since the subsequent
-	// frame will reuse them.
-	invalidate()
-}
-
-// A Framer reads and writes Frames.
-type Framer struct {
-	r         io.Reader
-	lastFrame Frame
-
-	maxReadSize uint32
-	headerBuf   [frameHeaderLen]byte
-
-	// TODO: let getReadBuf be configurable, and use a less memory-pinning
-	// allocator in server.go to minimize memory pinned for many idle conns.
-	// Will probably also need to make frame invalidation have a hook too.
-	getReadBuf func(size uint32) []byte
-	readBuf    []byte // cache for default getReadBuf
-
-	maxWriteSize uint32 // zero means unlimited; TODO: implement
-
-	w    io.Writer
-	wbuf []byte
-
-	// AllowIllegalWrites permits the Framer's Write methods to
-	// write frames that do not conform to the HTTP/2 spec.  This
-	// permits using the Framer to test other HTTP/2
-	// implementations' conformance to the spec.
-	// If false, the Write methods will prefer to return an error
-	// rather than comply.
-	AllowIllegalWrites bool
-
-	// TODO: track which type of frame & with which flags was sent
-	// last.  Then return an error (unless AllowIllegalWrites) if
-	// we're in the middle of a header block and a
-	// non-Continuation or Continuation on a different stream is
-	// attempted to be written.
-}
-
-func (f *Framer) startWrite(ftype FrameType, flags Flags, streamID uint32) {
-	// Write the FrameHeader.
-	f.wbuf = append(f.wbuf[:0],
-		0, // 3 bytes of length, filled in in endWrite
-		0,
-		0,
-		byte(ftype),
-		byte(flags),
-		byte(streamID>>24),
-		byte(streamID>>16),
-		byte(streamID>>8),
-		byte(streamID))
-}
-
-func (f *Framer) endWrite() error {
-	// Now that we know the final size, fill in the FrameHeader in
-	// the space previously reserved for it. Abuse append.
-	length := len(f.wbuf) - frameHeaderLen
-	if length >= (1 << 24) {
-		return ErrFrameTooLarge
-	}
-	_ = append(f.wbuf[:0],
-		byte(length>>16),
-		byte(length>>8),
-		byte(length))
-	n, err := f.w.Write(f.wbuf)
-	if err == nil && n != len(f.wbuf) {
-		err = io.ErrShortWrite
-	}
-	return err
-}
-
-func (f *Framer) writeByte(v byte)     { f.wbuf = append(f.wbuf, v) }
-func (f *Framer) writeBytes(v []byte)  { f.wbuf = append(f.wbuf, v...) }
-func (f *Framer) writeUint16(v uint16) { f.wbuf = append(f.wbuf, byte(v>>8), byte(v)) }
-func (f *Framer) writeUint32(v uint32) {
-	f.wbuf = append(f.wbuf, byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
-}
-
-const (
-	minMaxFrameSize = 1 << 14
-	maxFrameSize    = 1<<24 - 1
-)
-
-// NewFramer returns a Framer that writes frames to w and reads them from r.
-func NewFramer(w io.Writer, r io.Reader) *Framer {
-	fr := &Framer{
-		w: w,
-		r: r,
-	}
-	fr.getReadBuf = func(size uint32) []byte {
-		if cap(fr.readBuf) >= int(size) {
-			return fr.readBuf[:size]
-		}
-		fr.readBuf = make([]byte, size)
-		return fr.readBuf
-	}
-	fr.SetMaxReadFrameSize(maxFrameSize)
-	return fr
-}
-
-// SetMaxReadFrameSize sets the maximum size of a frame
-// that will be read by a subsequent call to ReadFrame.
-// It is the caller's responsibility to advertise this
-// limit with a SETTINGS frame.
-func (fr *Framer) SetMaxReadFrameSize(v uint32) {
-	if v > maxFrameSize {
-		v = maxFrameSize
-	}
-	fr.maxReadSize = v
-}
-
-// ErrFrameTooLarge is returned from Framer.ReadFrame when the peer
-// sends a frame that is larger than declared with SetMaxReadFrameSize.
-var ErrFrameTooLarge = errors.New("http2: frame too large")
-
-// ReadFrame reads a single frame. The returned Frame is only valid
-// until the next call to ReadFrame.
-// If the frame is larger than previously set with SetMaxReadFrameSize,
-// the returned error is ErrFrameTooLarge.
-func (fr *Framer) ReadFrame() (Frame, error) {
-	if fr.lastFrame != nil {
-		fr.lastFrame.invalidate()
-	}
-	fh, err := readFrameHeader(fr.headerBuf[:], fr.r)
-	if err != nil {
-		return nil, err
-	}
-	if fh.Length > fr.maxReadSize {
-		return nil, ErrFrameTooLarge
-	}
-	payload := fr.getReadBuf(fh.Length)
-	if _, err := io.ReadFull(fr.r, payload); err != nil {
-		return nil, err
-	}
-	f, err := typeFrameParser(fh.Type)(fh, payload)
-	if err != nil {
-		return nil, err
-	}
-	fr.lastFrame = f
-	return f, nil
-}
-
-// A DataFrame conveys arbitrary, variable-length sequences of octets
-// associated with a stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.1
-type DataFrame struct {
-	FrameHeader
-	data []byte
-}
-
-func (f *DataFrame) StreamEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagDataEndStream)
-}
-
-// Data returns the frame's data octets, not including any padding
-// size byte or padding suffix bytes.
-// The caller must not retain the returned memory past the next
-// call to ReadFrame.
-func (f *DataFrame) Data() []byte {
-	f.checkValid()
-	return f.data
-}
-
-func parseDataFrame(fh FrameHeader, payload []byte) (Frame, error) {
-	if fh.StreamID == 0 {
-		// DATA frames MUST be associated with a stream. If a
-		// DATA frame is received whose stream identifier
-		// field is 0x0, the recipient MUST respond with a
-		// connection error (Section 5.4.1) of type
-		// PROTOCOL_ERROR.
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	f := &DataFrame{
-		FrameHeader: fh,
-	}
-	var padSize byte
-	if fh.Flags.Has(FlagDataPadded) {
-		var err error
-		payload, padSize, err = readByte(payload)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if int(padSize) > len(payload) {
-		// If the length of the padding is greater than the
-		// length of the frame payload, the recipient MUST
-		// treat this as a connection error.
-		// Filed: https://github.com/http2/http2-spec/issues/610
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	f.data = payload[:len(payload)-int(padSize)]
-	return f, nil
-}
-
-var errStreamID = errors.New("invalid streamid")
-
-func validStreamID(streamID uint32) bool {
-	return streamID != 0 && streamID&(1<<31) == 0
-}
-
-// WriteData writes a DATA frame.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteData(streamID uint32, endStream bool, data []byte) error {
-	// TODO: ignoring padding for now. will add when somebody cares.
-	if !validStreamID(streamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	var flags Flags
-	if endStream {
-		flags |= FlagDataEndStream
-	}
-	f.startWrite(FrameData, flags, streamID)
-	f.wbuf = append(f.wbuf, data...)
-	return f.endWrite()
-}
-
-// A SettingsFrame conveys configuration parameters that affect how
-// endpoints communicate, such as preferences and constraints on peer
-// behavior.
-//
-// See http://http2.github.io/http2-spec/#SETTINGS
-type SettingsFrame struct {
-	FrameHeader
-	p []byte
-}
-
-func parseSettingsFrame(fh FrameHeader, p []byte) (Frame, error) {
-	if fh.Flags.Has(FlagSettingsAck) && fh.Length > 0 {
-		// When this (ACK 0x1) bit is set, the payload of the
-		// SETTINGS frame MUST be empty.  Receipt of a
-		// SETTINGS frame with the ACK flag set and a length
-		// field value other than 0 MUST be treated as a
-		// connection error (Section 5.4.1) of type
-		// FRAME_SIZE_ERROR.
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	if fh.StreamID != 0 {
-		// SETTINGS frames always apply to a connection,
-		// never a single stream.  The stream identifier for a
-		// SETTINGS frame MUST be zero (0x0).  If an endpoint
-		// receives a SETTINGS frame whose stream identifier
-		// field is anything other than 0x0, the endpoint MUST
-		// respond with a connection error (Section 5.4.1) of
-		// type PROTOCOL_ERROR.
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	if len(p)%6 != 0 {
-		// Expecting even number of 6 byte settings.
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	f := &SettingsFrame{FrameHeader: fh, p: p}
-	if v, ok := f.Value(SettingInitialWindowSize); ok && v > (1<<31)-1 {
-		// Values above the maximum flow control window size of 2^31 - 1 MUST
-		// be treated as a connection error (Section 5.4.1) of type
-		// FLOW_CONTROL_ERROR.
-		return nil, ConnectionError(ErrCodeFlowControl)
-	}
-	return f, nil
-}
-
-func (f *SettingsFrame) IsAck() bool {
-	return f.FrameHeader.Flags.Has(FlagSettingsAck)
-}
-
-func (f *SettingsFrame) Value(s SettingID) (v uint32, ok bool) {
-	f.checkValid()
-	buf := f.p
-	for len(buf) > 0 {
-		settingID := SettingID(binary.BigEndian.Uint16(buf[:2]))
-		if settingID == s {
-			return binary.BigEndian.Uint32(buf[2:6]), true
-		}
-		buf = buf[6:]
-	}
-	return 0, false
-}
-
-// ForeachSetting runs fn for each setting.
-// It stops and returns the first error.
-func (f *SettingsFrame) ForeachSetting(fn func(Setting) error) error {
-	f.checkValid()
-	buf := f.p
-	for len(buf) > 0 {
-		if err := fn(Setting{
-			SettingID(binary.BigEndian.Uint16(buf[:2])),
-			binary.BigEndian.Uint32(buf[2:6]),
-		}); err != nil {
-			return err
-		}
-		buf = buf[6:]
-	}
-	return nil
-}
-
-// WriteSettings writes a SETTINGS frame with zero or more settings
-// specified and the ACK bit not set.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteSettings(settings ...Setting) error {
-	f.startWrite(FrameSettings, 0, 0)
-	for _, s := range settings {
-		f.writeUint16(uint16(s.ID))
-		f.writeUint32(s.Val)
-	}
-	return f.endWrite()
-}
-
-// WriteSettings writes an empty SETTINGS frame with the ACK bit set.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteSettingsAck() error {
-	f.startWrite(FrameSettings, FlagSettingsAck, 0)
-	return f.endWrite()
-}
-
-// A PingFrame is a mechanism for measuring a minimal round trip time
-// from the sender, as well as determining whether an idle connection
-// is still functional.
-// See http://http2.github.io/http2-spec/#rfc.section.6.7
-type PingFrame struct {
-	FrameHeader
-	Data [8]byte
-}
-
-func parsePingFrame(fh FrameHeader, payload []byte) (Frame, error) {
-	if len(payload) != 8 {
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	if fh.StreamID != 0 {
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	f := &PingFrame{FrameHeader: fh}
-	copy(f.Data[:], payload)
-	return f, nil
-}
-
-func (f *Framer) WritePing(ack bool, data [8]byte) error {
-	var flags Flags
-	if ack {
-		flags = FlagPingAck
-	}
-	f.startWrite(FramePing, flags, 0)
-	f.writeBytes(data[:])
-	return f.endWrite()
-}
-
-// A GoAwayFrame informs the remote peer to stop creating streams on this connection.
-// See http://http2.github.io/http2-spec/#rfc.section.6.8
-type GoAwayFrame struct {
-	FrameHeader
-	LastStreamID uint32
-	ErrCode      ErrCode
-	debugData    []byte
-}
-
-// DebugData returns any debug data in the GOAWAY frame. Its contents
-// are not defined.
-// The caller must not retain the returned memory past the next
-// call to ReadFrame.
-func (f *GoAwayFrame) DebugData() []byte {
-	f.checkValid()
-	return f.debugData
-}
-
-func parseGoAwayFrame(fh FrameHeader, p []byte) (Frame, error) {
-	if fh.StreamID != 0 {
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	if len(p) < 8 {
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	return &GoAwayFrame{
-		FrameHeader:  fh,
-		LastStreamID: binary.BigEndian.Uint32(p[:4]) & (1<<31 - 1),
-		ErrCode:      ErrCode(binary.BigEndian.Uint32(p[4:8])),
-		debugData:    p[8:],
-	}, nil
-}
-
-func (f *Framer) WriteGoAway(maxStreamID uint32, code ErrCode, debugData []byte) error {
-	f.startWrite(FrameGoAway, 0, 0)
-	f.writeUint32(maxStreamID & (1<<31 - 1))
-	f.writeUint32(uint32(code))
-	f.writeBytes(debugData)
-	return f.endWrite()
-}
-
-// An UnknownFrame is the frame type returned when the frame type is unknown
-// or no specific frame type parser exists.
-type UnknownFrame struct {
-	FrameHeader
-	p []byte
-}
-
-// Payload returns the frame's payload (after the header).  It is not
-// valid to call this method after a subsequent call to
-// Framer.ReadFrame, nor is it valid to retain the returned slice.
-// The memory is owned by the Framer and is invalidated when the next
-// frame is read.
-func (f *UnknownFrame) Payload() []byte {
-	f.checkValid()
-	return f.p
-}
-
-func parseUnknownFrame(fh FrameHeader, p []byte) (Frame, error) {
-	return &UnknownFrame{fh, p}, nil
-}
-
-// A WindowUpdateFrame is used to implement flow control.
-// See http://http2.github.io/http2-spec/#rfc.section.6.9
-type WindowUpdateFrame struct {
-	FrameHeader
-	Increment uint32
-}
-
-func parseWindowUpdateFrame(fh FrameHeader, p []byte) (Frame, error) {
-	if len(p) != 4 {
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	inc := binary.BigEndian.Uint32(p[:4]) & 0x7fffffff // mask off high reserved bit
-	if inc == 0 {
-		// A receiver MUST treat the receipt of a
-		// WINDOW_UPDATE frame with an flow control window
-		// increment of 0 as a stream error (Section 5.4.2) of
-		// type PROTOCOL_ERROR; errors on the connection flow
-		// control window MUST be treated as a connection
-		// error (Section 5.4.1).
-		if fh.StreamID == 0 {
-			return nil, ConnectionError(ErrCodeProtocol)
-		}
-		return nil, StreamError{fh.StreamID, ErrCodeProtocol}
-	}
-	return &WindowUpdateFrame{
-		FrameHeader: fh,
-		Increment:   inc,
-	}, nil
-}
-
-// WriteWindowUpdate writes a WINDOW_UPDATE frame.
-// The increment value must be between 1 and 2,147,483,647, inclusive.
-// If the Stream ID is zero, the window update applies to the
-// connection as a whole.
-func (f *Framer) WriteWindowUpdate(streamID, incr uint32) error {
-	// "The legal range for the increment to the flow control window is 1 to 2^31-1 (2,147,483,647) octets."
-	if (incr < 1 || incr > 2147483647) && !f.AllowIllegalWrites {
-		return errors.New("illegal window increment value")
-	}
-	f.startWrite(FrameWindowUpdate, 0, streamID)
-	f.writeUint32(incr)
-	return f.endWrite()
-}
-
-// A HeadersFrame is used to open a stream and additionally carries a
-// header block fragment.
-type HeadersFrame struct {
-	FrameHeader
-
-	// Priority is set if FlagHeadersPriority is set in the FrameHeader.
-	Priority PriorityParam
-
-	headerFragBuf []byte // not owned
-}
-
-func (f *HeadersFrame) HeaderBlockFragment() []byte {
-	f.checkValid()
-	return f.headerFragBuf
-}
-
-func (f *HeadersFrame) HeadersEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagHeadersEndHeaders)
-}
-
-func (f *HeadersFrame) StreamEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagHeadersEndStream)
-}
-
-func (f *HeadersFrame) HasPriority() bool {
-	return f.FrameHeader.Flags.Has(FlagHeadersPriority)
-}
-
-func parseHeadersFrame(fh FrameHeader, p []byte) (_ Frame, err error) {
-	hf := &HeadersFrame{
-		FrameHeader: fh,
-	}
-	if fh.StreamID == 0 {
-		// HEADERS frames MUST be associated with a stream.  If a HEADERS frame
-		// is received whose stream identifier field is 0x0, the recipient MUST
-		// respond with a connection error (Section 5.4.1) of type
-		// PROTOCOL_ERROR.
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	var padLength uint8
-	if fh.Flags.Has(FlagHeadersPadded) {
-		if p, padLength, err = readByte(p); err != nil {
-			return
-		}
-	}
-	if fh.Flags.Has(FlagHeadersPriority) {
-		var v uint32
-		p, v, err = readUint32(p)
-		if err != nil {
-			return nil, err
-		}
-		hf.Priority.StreamDep = v & 0x7fffffff
-		hf.Priority.Exclusive = (v != hf.Priority.StreamDep) // high bit was set
-		p, hf.Priority.Weight, err = readByte(p)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if len(p)-int(padLength) <= 0 {
-		return nil, StreamError{fh.StreamID, ErrCodeProtocol}
-	}
-	hf.headerFragBuf = p[:len(p)-int(padLength)]
-	return hf, nil
-}
-
-// HeadersFrameParam are the parameters for writing a HEADERS frame.
-type HeadersFrameParam struct {
-	// StreamID is the required Stream ID to initiate.
-	StreamID uint32
-	// BlockFragment is part (or all) of a Header Block.
-	BlockFragment []byte
-
-	// EndStream indicates that the header block is the last that
-	// the endpoint will send for the identified stream. Setting
-	// this flag causes the stream to enter one of "half closed"
-	// states.
-	EndStream bool
-
-	// EndHeaders indicates that this frame contains an entire
-	// header block and is not followed by any
-	// CONTINUATION frames.
-	EndHeaders bool
-
-	// PadLength is the optional number of bytes of zeros to add
-	// to this frame.
-	PadLength uint8
-
-	// Priority, if non-zero, includes stream priority information
-	// in the HEADER frame.
-	Priority PriorityParam
-}
-
-// WriteHeaders writes a single HEADERS frame.
-//
-// This is a low-level header writing method. Encoding headers and
-// splitting them into any necessary CONTINUATION frames is handled
-// elsewhere.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteHeaders(p HeadersFrameParam) error {
-	if !validStreamID(p.StreamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	var flags Flags
-	if p.PadLength != 0 {
-		flags |= FlagHeadersPadded
-	}
-	if p.EndStream {
-		flags |= FlagHeadersEndStream
-	}
-	if p.EndHeaders {
-		flags |= FlagHeadersEndHeaders
-	}
-	if !p.Priority.IsZero() {
-		flags |= FlagHeadersPriority
-	}
-	f.startWrite(FrameHeaders, flags, p.StreamID)
-	if p.PadLength != 0 {
-		f.writeByte(p.PadLength)
-	}
-	if !p.Priority.IsZero() {
-		v := p.Priority.StreamDep
-		if !validStreamID(v) && !f.AllowIllegalWrites {
-			return errors.New("invalid dependent stream id")
-		}
-		if p.Priority.Exclusive {
-			v |= 1 << 31
-		}
-		f.writeUint32(v)
-		f.writeByte(p.Priority.Weight)
-	}
-	f.wbuf = append(f.wbuf, p.BlockFragment...)
-	f.wbuf = append(f.wbuf, padZeros[:p.PadLength]...)
-	return f.endWrite()
-}
-
-// A PriorityFrame specifies the sender-advised priority of a stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.3
-type PriorityFrame struct {
-	FrameHeader
-	PriorityParam
-}
-
-// PriorityParam are the stream prioritzation parameters.
-type PriorityParam struct {
-	// StreamDep is a 31-bit stream identifier for the
-	// stream that this stream depends on. Zero means no
-	// dependency.
-	StreamDep uint32
-
-	// Exclusive is whether the dependency is exclusive.
-	Exclusive bool
-
-	// Weight is the stream's zero-indexed weight. It should be
-	// set together with StreamDep, or neither should be set.  Per
-	// the spec, "Add one to the value to obtain a weight between
-	// 1 and 256."
-	Weight uint8
-}
-
-func (p PriorityParam) IsZero() bool {
-	return p == PriorityParam{}
-}
-
-func parsePriorityFrame(fh FrameHeader, payload []byte) (Frame, error) {
-	if fh.StreamID == 0 {
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	if len(payload) != 5 {
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	v := binary.BigEndian.Uint32(payload[:4])
-	streamID := v & 0x7fffffff // mask off high bit
-	return &PriorityFrame{
-		FrameHeader: fh,
-		PriorityParam: PriorityParam{
-			Weight:    payload[4],
-			StreamDep: streamID,
-			Exclusive: streamID != v, // was high bit set?
-		},
-	}, nil
-}
-
-// WritePriority writes a PRIORITY frame.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WritePriority(streamID uint32, p PriorityParam) error {
-	if !validStreamID(streamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	f.startWrite(FramePriority, 0, streamID)
-	v := p.StreamDep
-	if p.Exclusive {
-		v |= 1 << 31
-	}
-	f.writeUint32(v)
-	f.writeByte(p.Weight)
-	return f.endWrite()
-}
-
-// A RSTStreamFrame allows for abnormal termination of a stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.4
-type RSTStreamFrame struct {
-	FrameHeader
-	ErrCode ErrCode
-}
-
-func parseRSTStreamFrame(fh FrameHeader, p []byte) (Frame, error) {
-	if len(p) != 4 {
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	if fh.StreamID == 0 {
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	return &RSTStreamFrame{fh, ErrCode(binary.BigEndian.Uint32(p[:4]))}, nil
-}
-
-// WriteRSTStream writes a RST_STREAM frame.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteRSTStream(streamID uint32, code ErrCode) error {
-	if !validStreamID(streamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	f.startWrite(FrameRSTStream, 0, streamID)
-	f.writeUint32(uint32(code))
-	return f.endWrite()
-}
-
-// A ContinuationFrame is used to continue a sequence of header block fragments.
-// See http://http2.github.io/http2-spec/#rfc.section.6.10
-type ContinuationFrame struct {
-	FrameHeader
-	headerFragBuf []byte
-}
-
-func parseContinuationFrame(fh FrameHeader, p []byte) (Frame, error) {
-	return &ContinuationFrame{fh, p}, nil
-}
-
-func (f *ContinuationFrame) StreamEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagDataEndStream)
-}
-
-func (f *ContinuationFrame) HeaderBlockFragment() []byte {
-	f.checkValid()
-	return f.headerFragBuf
-}
-
-func (f *ContinuationFrame) HeadersEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagContinuationEndHeaders)
-}
-
-// WriteContinuation writes a CONTINUATION frame.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteContinuation(streamID uint32, endHeaders bool, headerBlockFragment []byte) error {
-	if !validStreamID(streamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	var flags Flags
-	if endHeaders {
-		flags |= FlagContinuationEndHeaders
-	}
-	f.startWrite(FrameContinuation, flags, streamID)
-	f.wbuf = append(f.wbuf, headerBlockFragment...)
-	return f.endWrite()
-}
-
-// A PushPromiseFrame is used to initiate a server stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.6
-type PushPromiseFrame struct {
-	FrameHeader
-	PromiseID     uint32
-	headerFragBuf []byte // not owned
-}
-
-func (f *PushPromiseFrame) HeaderBlockFragment() []byte {
-	f.checkValid()
-	return f.headerFragBuf
-}
-
-func (f *PushPromiseFrame) HeadersEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagPushPromiseEndHeaders)
-}
-
-func parsePushPromise(fh FrameHeader, p []byte) (_ Frame, err error) {
-	pp := &PushPromiseFrame{
-		FrameHeader: fh,
-	}
-	if pp.StreamID == 0 {
-		// PUSH_PROMISE frames MUST be associated with an existing,
-		// peer-initiated stream. The stream identifier of a
-		// PUSH_PROMISE frame indicates the stream it is associated
-		// with. If the stream identifier field specifies the value
-		// 0x0, a recipient MUST respond with a connection error
-		// (Section 5.4.1) of type PROTOCOL_ERROR.
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	// The PUSH_PROMISE frame includes optional padding.
-	// Padding fields and flags are identical to those defined for DATA frames
-	var padLength uint8
-	if fh.Flags.Has(FlagPushPromisePadded) {
-		if p, padLength, err = readByte(p); err != nil {
-			return
-		}
-	}
-
-	p, pp.PromiseID, err = readUint32(p)
-	if err != nil {
-		return
-	}
-	pp.PromiseID = pp.PromiseID & (1<<31 - 1)
-
-	if int(padLength) > len(p) {
-		// like the DATA frame, error out if padding is longer than the body.
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	pp.headerFragBuf = p[:len(p)-int(padLength)]
-	return pp, nil
-}
-
-// PushPromiseParam are the parameters for writing a PUSH_PROMISE frame.
-type PushPromiseParam struct {
-	// StreamID is the required Stream ID to initiate.
-	StreamID uint32
-
-	// PromiseID is the required Stream ID which this
-	// Push Promises
-	PromiseID uint32
-
-	// BlockFragment is part (or all) of a Header Block.
-	BlockFragment []byte
-
-	// EndHeaders indicates that this frame contains an entire
-	// header block and is not followed by any
-	// CONTINUATION frames.
-	EndHeaders bool
-
-	// PadLength is the optional number of bytes of zeros to add
-	// to this frame.
-	PadLength uint8
-}
-
-// WritePushPromise writes a single PushPromise Frame.
-//
-// As with Header Frames, This is the low level call for writing
-// individual frames. Continuation frames are handled elsewhere.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WritePushPromise(p PushPromiseParam) error {
-	if !validStreamID(p.StreamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	var flags Flags
-	if p.PadLength != 0 {
-		flags |= FlagPushPromisePadded
-	}
-	if p.EndHeaders {
-		flags |= FlagPushPromiseEndHeaders
-	}
-	f.startWrite(FramePushPromise, flags, p.StreamID)
-	if p.PadLength != 0 {
-		f.writeByte(p.PadLength)
-	}
-	if !validStreamID(p.PromiseID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	f.writeUint32(p.PromiseID)
-	f.wbuf = append(f.wbuf, p.BlockFragment...)
-	f.wbuf = append(f.wbuf, padZeros[:p.PadLength]...)
-	return f.endWrite()
-}
-
-// WriteRawFrame writes a raw frame. This can be used to write
-// extension frames unknown to this package.
-func (f *Framer) WriteRawFrame(t FrameType, flags Flags, streamID uint32, payload []byte) error {
-	f.startWrite(t, flags, streamID)
-	f.writeBytes(payload)
-	return f.endWrite()
-}
-
-func readByte(p []byte) (remain []byte, b byte, err error) {
-	if len(p) == 0 {
-		return nil, 0, io.ErrUnexpectedEOF
-	}
-	return p[1:], p[0], nil
-}
-
-func readUint32(p []byte) (remain []byte, v uint32, err error) {
-	if len(p) < 4 {
-		return nil, 0, io.ErrUnexpectedEOF
-	}
-	return p[4:], binary.BigEndian.Uint32(p[:4]), nil
-}
-
-type streamEnder interface {
-	StreamEnded() bool
-}
-
-type headersEnder interface {
-	HeadersEnded() bool
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/gotrack.go b/Godeps/_workspace/src/golang.org/x/net/http2/gotrack.go
deleted file mode 100644
index 7dc2ef90db..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/gotrack.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-// Defensive debug-only utility to track that functions run on the
-// goroutine that they're supposed to.
-
-package http2
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"os"
-	"runtime"
-	"strconv"
-	"sync"
-)
-
-var DebugGoroutines = os.Getenv("DEBUG_HTTP2_GOROUTINES") == "1"
-
-type goroutineLock uint64
-
-func newGoroutineLock() goroutineLock {
-	if !DebugGoroutines {
-		return 0
-	}
-	return goroutineLock(curGoroutineID())
-}
-
-func (g goroutineLock) check() {
-	if !DebugGoroutines {
-		return
-	}
-	if curGoroutineID() != uint64(g) {
-		panic("running on the wrong goroutine")
-	}
-}
-
-func (g goroutineLock) checkNotOn() {
-	if !DebugGoroutines {
-		return
-	}
-	if curGoroutineID() == uint64(g) {
-		panic("running on the wrong goroutine")
-	}
-}
-
-var goroutineSpace = []byte("goroutine ")
-
-func curGoroutineID() uint64 {
-	bp := littleBuf.Get().(*[]byte)
-	defer littleBuf.Put(bp)
-	b := *bp
-	b = b[:runtime.Stack(b, false)]
-	// Parse the 4707 out of "goroutine 4707 ["
-	b = bytes.TrimPrefix(b, goroutineSpace)
-	i := bytes.IndexByte(b, ' ')
-	if i < 0 {
-		panic(fmt.Sprintf("No space found in %q", b))
-	}
-	b = b[:i]
-	n, err := parseUintBytes(b, 10, 64)
-	if err != nil {
-		panic(fmt.Sprintf("Failed to parse goroutine ID out of %q: %v", b, err))
-	}
-	return n
-}
-
-var littleBuf = sync.Pool{
-	New: func() interface{} {
-		buf := make([]byte, 64)
-		return &buf
-	},
-}
-
-// parseUintBytes is like strconv.ParseUint, but using a []byte.
-func parseUintBytes(s []byte, base int, bitSize int) (n uint64, err error) {
-	var cutoff, maxVal uint64
-
-	if bitSize == 0 {
-		bitSize = int(strconv.IntSize)
-	}
-
-	s0 := s
-	switch {
-	case len(s) < 1:
-		err = strconv.ErrSyntax
-		goto Error
-
-	case 2 <= base && base <= 36:
-		// valid base; nothing to do
-
-	case base == 0:
-		// Look for octal, hex prefix.
-		switch {
-		case s[0] == '0' && len(s) > 1 && (s[1] == 'x' || s[1] == 'X'):
-			base = 16
-			s = s[2:]
-			if len(s) < 1 {
-				err = strconv.ErrSyntax
-				goto Error
-			}
-		case s[0] == '0':
-			base = 8
-		default:
-			base = 10
-		}
-
-	default:
-		err = errors.New("invalid base " + strconv.Itoa(base))
-		goto Error
-	}
-
-	n = 0
-	cutoff = cutoff64(base)
-	maxVal = 1<<uint(bitSize) - 1
-
-	for i := 0; i < len(s); i++ {
-		var v byte
-		d := s[i]
-		switch {
-		case '0' <= d && d <= '9':
-			v = d - '0'
-		case 'a' <= d && d <= 'z':
-			v = d - 'a' + 10
-		case 'A' <= d && d <= 'Z':
-			v = d - 'A' + 10
-		default:
-			n = 0
-			err = strconv.ErrSyntax
-			goto Error
-		}
-		if int(v) >= base {
-			n = 0
-			err = strconv.ErrSyntax
-			goto Error
-		}
-
-		if n >= cutoff {
-			// n*base overflows
-			n = 1<<64 - 1
-			err = strconv.ErrRange
-			goto Error
-		}
-		n *= uint64(base)
-
-		n1 := n + uint64(v)
-		if n1 < n || n1 > maxVal {
-			// n+v overflows
-			n = 1<<64 - 1
-			err = strconv.ErrRange
-			goto Error
-		}
-		n = n1
-	}
-
-	return n, nil
-
-Error:
-	return n, &strconv.NumError{Func: "ParseUint", Num: string(s0), Err: err}
-}
-
-// Return the first number n such that n*base >= 1<<64.
-func cutoff64(base int) uint64 {
-	if base < 2 {
-		return 0
-	}
-	return (1<<64-1)/uint64(base) + 1
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/.gitignore b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/.gitignore
deleted file mode 100644
index 0de86ddbc5..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-h2demo
-h2demo.linux
-client-id.dat
-client-secret.dat
-token.dat
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/Makefile b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/Makefile
deleted file mode 100644
index 3a77cf073c..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-h2demo.linux: h2demo.go
-	GOOS=linux go build --tags=h2demo -o h2demo.linux .
-
-upload: h2demo.linux
-	cat h2demo.linux | go run launch.go --write_object=http2-demo-server-tls/h2demo --write_object_is_public
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/README b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/README
deleted file mode 100644
index 212a96f383..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/README
+++ /dev/null
@@ -1,16 +0,0 @@
-
-Client:
- -- Firefox nightly with about:config network.http.spdy.enabled.http2draft set true
- -- Chrome: go to chrome://flags/#enable-spdy4, save and restart (button at bottom)
-
-Make CA:
-$ openssl genrsa -out rootCA.key 2048
-$ openssl req -x509 -new -nodes -key rootCA.key -days 1024 -out rootCA.pem
-... install that to Firefox
-
-Make cert:
-$ openssl genrsa -out server.key 2048
-$ openssl req -new -key server.key -out server.csr
-$ openssl x509 -req -in server.csr -CA rootCA.pem -CAkey rootCA.key -CAcreateserial -out server.crt -days 500
-
-
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/h2demo.go b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/h2demo.go
deleted file mode 100644
index 9429a72545..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/h2demo.go
+++ /dev/null
@@ -1,435 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-// +build h2demo
-
-package main
-
-import (
-	"bytes"
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"hash/crc32"
-	"image"
-	"image/jpeg"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"os/exec"
-	"path"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"camlistore.org/pkg/googlestorage"
-	"camlistore.org/pkg/singleflight"
-	"golang.org/x/net/http2"
-)
-
-var (
-	openFirefox = flag.Bool("openff", false, "Open Firefox")
-	addr        = flag.String("addr", "localhost:4430", "TLS address to listen on")
-	httpAddr    = flag.String("httpaddr", "", "If non-empty, address to listen for regular HTTP on")
-	prod        = flag.Bool("prod", false, "Whether to configure itself to be the production http2.golang.org server.")
-)
-
-func homeOldHTTP(w http.ResponseWriter, r *http.Request) {
-	io.WriteString(w, `<html>
-<body>
-<h1>Go + HTTP/2</h1>
-<p>Welcome to <a href="https://golang.org/">the Go language</a>'s <a href="https://http2.github.io/">HTTP/2</a> demo & interop server.</p>
-<p>Unfortunately, you're <b>not</b> using HTTP/2 right now. To do so:</p>
-<ul>
-   <li>Use Firefox Nightly or go to <b>about:config</b> and enable "network.http.spdy.enabled.http2draft"</li>
-   <li>Use Google Chrome Canary and/or go to <b>chrome://flags/#enable-spdy4</b> to <i>Enable SPDY/4</i> (Chrome's name for HTTP/2)</li>
-</ul>
-<p>See code & instructions for connecting at <a href="https://github.com/golang/net/tree/master/http2">https://github.com/golang/net/tree/master/http2</a>.</p>
-
-</body></html>`)
-}
-
-func home(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path != "/" {
-		http.NotFound(w, r)
-		return
-	}
-	io.WriteString(w, `<html>
-<body>
-<h1>Go + HTTP/2</h1>
-
-<p>Welcome to <a href="https://golang.org/">the Go language</a>'s <a
-href="https://http2.github.io/">HTTP/2</a> demo & interop server.</p>
-
-<p>Congratulations, <b>you're using HTTP/2 right now</b>.</p>
-
-<p>This server exists for others in the HTTP/2 community to test their HTTP/2 client implementations and point out flaws in our server.</p>
-
-<p> The code is currently at <a
-href="https://golang.org/x/net/http2">github.com/bradfitz/http2</a>
-but will move to the Go standard library at some point in the future
-(enabled by default, without users needing to change their code).</p>
-
-<p>Contact info: <i>bradfitz@golang.org</i>, or <a
-href="https://golang.org/x/net/http2/issues">file a bug</a>.</p>
-
-<h2>Handlers for testing</h2>
-<ul>
-  <li>GET <a href="/reqinfo">/reqinfo</a> to dump the request + headers received</li>
-  <li>GET <a href="/clockstream">/clockstream</a> streams the current time every second</li>
-  <li>GET <a href="/gophertiles">/gophertiles</a> to see a page with a bunch of images</li>
-  <li>GET <a href="/file/gopher.png">/file/gopher.png</a> for a small file (does If-Modified-Since, Content-Range, etc)</li>
-  <li>GET <a href="/file/go.src.tar.gz">/file/go.src.tar.gz</a> for a larger file (~10 MB)</li>
-  <li>GET <a href="/redirect">/redirect</a> to redirect back to / (this page)</li>
-  <li>GET <a href="/goroutines">/goroutines</a> to see all active goroutines in this server</li>
-  <li>PUT something to <a href="/crc32">/crc32</a> to get a count of number of bytes and its CRC-32</li>
-</ul>
-
-</body></html>`)
-}
-
-func reqInfoHandler(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "text/plain")
-	fmt.Fprintf(w, "Method: %s\n", r.Method)
-	fmt.Fprintf(w, "Protocol: %s\n", r.Proto)
-	fmt.Fprintf(w, "Host: %s\n", r.Host)
-	fmt.Fprintf(w, "RemoteAddr: %s\n", r.RemoteAddr)
-	fmt.Fprintf(w, "RequestURI: %q\n", r.RequestURI)
-	fmt.Fprintf(w, "URL: %#v\n", r.URL)
-	fmt.Fprintf(w, "Body.ContentLength: %d (-1 means unknown)\n", r.ContentLength)
-	fmt.Fprintf(w, "Close: %v (relevant for HTTP/1 only)\n", r.Close)
-	fmt.Fprintf(w, "TLS: %#v\n", r.TLS)
-	fmt.Fprintf(w, "\nHeaders:\n")
-	r.Header.Write(w)
-}
-
-func crcHandler(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "PUT" {
-		http.Error(w, "PUT required.", 400)
-		return
-	}
-	crc := crc32.NewIEEE()
-	n, err := io.Copy(crc, r.Body)
-	if err == nil {
-		w.Header().Set("Content-Type", "text/plain")
-		fmt.Fprintf(w, "bytes=%d, CRC32=%x", n, crc.Sum(nil))
-	}
-}
-
-var (
-	fsGrp   singleflight.Group
-	fsMu    sync.Mutex // guards fsCache
-	fsCache = map[string]http.Handler{}
-)
-
-// fileServer returns a file-serving handler that proxies URL.
-// It lazily fetches URL on the first access and caches its contents forever.
-func fileServer(url string) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		hi, err := fsGrp.Do(url, func() (interface{}, error) {
-			fsMu.Lock()
-			if h, ok := fsCache[url]; ok {
-				fsMu.Unlock()
-				return h, nil
-			}
-			fsMu.Unlock()
-
-			res, err := http.Get(url)
-			if err != nil {
-				return nil, err
-			}
-			defer res.Body.Close()
-			slurp, err := ioutil.ReadAll(res.Body)
-			if err != nil {
-				return nil, err
-			}
-
-			modTime := time.Now()
-			var h http.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				http.ServeContent(w, r, path.Base(url), modTime, bytes.NewReader(slurp))
-			})
-			fsMu.Lock()
-			fsCache[url] = h
-			fsMu.Unlock()
-			return h, nil
-		})
-		if err != nil {
-			http.Error(w, err.Error(), 500)
-			return
-		}
-		hi.(http.Handler).ServeHTTP(w, r)
-	})
-}
-
-func clockStreamHandler(w http.ResponseWriter, r *http.Request) {
-	clientGone := w.(http.CloseNotifier).CloseNotify()
-	w.Header().Set("Content-Type", "text/plain")
-	ticker := time.NewTicker(1 * time.Second)
-	defer ticker.Stop()
-	fmt.Fprintf(w, "# ~1KB of junk to force browsers to start rendering immediately: \n")
-	io.WriteString(w, strings.Repeat("# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n", 13))
-
-	for {
-		fmt.Fprintf(w, "%v\n", time.Now())
-		w.(http.Flusher).Flush()
-		select {
-		case <-ticker.C:
-		case <-clientGone:
-			log.Printf("Client %v disconnected from the clock", r.RemoteAddr)
-			return
-		}
-	}
-}
-
-func registerHandlers() {
-	tiles := newGopherTilesHandler()
-
-	mux2 := http.NewServeMux()
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		if r.TLS == nil {
-			if r.URL.Path == "/gophertiles" {
-				tiles.ServeHTTP(w, r)
-				return
-			}
-			http.Redirect(w, r, "https://http2.golang.org/", http.StatusFound)
-			return
-		}
-		if r.ProtoMajor == 1 {
-			if r.URL.Path == "/reqinfo" {
-				reqInfoHandler(w, r)
-				return
-			}
-			homeOldHTTP(w, r)
-			return
-		}
-		mux2.ServeHTTP(w, r)
-	})
-	mux2.HandleFunc("/", home)
-	mux2.Handle("/file/gopher.png", fileServer("https://golang.org/doc/gopher/frontpage.png"))
-	mux2.Handle("/file/go.src.tar.gz", fileServer("https://storage.googleapis.com/golang/go1.4.1.src.tar.gz"))
-	mux2.HandleFunc("/reqinfo", reqInfoHandler)
-	mux2.HandleFunc("/crc32", crcHandler)
-	mux2.HandleFunc("/clockstream", clockStreamHandler)
-	mux2.Handle("/gophertiles", tiles)
-	mux2.HandleFunc("/redirect", func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, "/", http.StatusFound)
-	})
-	stripHomedir := regexp.MustCompile(`/(Users|home)/\w+`)
-	mux2.HandleFunc("/goroutines", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
-		buf := make([]byte, 2<<20)
-		w.Write(stripHomedir.ReplaceAll(buf[:runtime.Stack(buf, true)], nil))
-	})
-}
-
-func newGopherTilesHandler() http.Handler {
-	const gopherURL = "https://blog.golang.org/go-programming-language-turns-two_gophers.jpg"
-	res, err := http.Get(gopherURL)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if res.StatusCode != 200 {
-		log.Fatalf("Error fetching %s: %v", gopherURL, res.Status)
-	}
-	slurp, err := ioutil.ReadAll(res.Body)
-	res.Body.Close()
-	if err != nil {
-		log.Fatal(err)
-	}
-	im, err := jpeg.Decode(bytes.NewReader(slurp))
-	if err != nil {
-		if len(slurp) > 1024 {
-			slurp = slurp[:1024]
-		}
-		log.Fatalf("Failed to decode gopher image: %v (got %q)", err, slurp)
-	}
-
-	type subImager interface {
-		SubImage(image.Rectangle) image.Image
-	}
-	const tileSize = 32
-	xt := im.Bounds().Max.X / tileSize
-	yt := im.Bounds().Max.Y / tileSize
-	var tile [][][]byte // y -> x -> jpeg bytes
-	for yi := 0; yi < yt; yi++ {
-		var row [][]byte
-		for xi := 0; xi < xt; xi++ {
-			si := im.(subImager).SubImage(image.Rectangle{
-				Min: image.Point{xi * tileSize, yi * tileSize},
-				Max: image.Point{(xi + 1) * tileSize, (yi + 1) * tileSize},
-			})
-			buf := new(bytes.Buffer)
-			if err := jpeg.Encode(buf, si, &jpeg.Options{Quality: 90}); err != nil {
-				log.Fatal(err)
-			}
-			row = append(row, buf.Bytes())
-		}
-		tile = append(tile, row)
-	}
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ms, _ := strconv.Atoi(r.FormValue("latency"))
-		const nanosPerMilli = 1e6
-		if r.FormValue("x") != "" {
-			x, _ := strconv.Atoi(r.FormValue("x"))
-			y, _ := strconv.Atoi(r.FormValue("y"))
-			if ms <= 1000 {
-				time.Sleep(time.Duration(ms) * nanosPerMilli)
-			}
-			if x >= 0 && x < xt && y >= 0 && y < yt {
-				http.ServeContent(w, r, "", time.Time{}, bytes.NewReader(tile[y][x]))
-				return
-			}
-		}
-		io.WriteString(w, "<html><body onload='showtimes()'>")
-		fmt.Fprintf(w, "A grid of %d tiled images is below. Compare:<p>", xt*yt)
-		for _, ms := range []int{0, 30, 200, 1000} {
-			d := time.Duration(ms) * nanosPerMilli
-			fmt.Fprintf(w, "[<a href='https://%s/gophertiles?latency=%d'>HTTP/2, %v latency</a>] [<a href='http://%s/gophertiles?latency=%d'>HTTP/1, %v latency</a>]<br>\n",
-				httpsHost(), ms, d,
-				httpHost(), ms, d,
-			)
-		}
-		io.WriteString(w, "<p>\n")
-		cacheBust := time.Now().UnixNano()
-		for y := 0; y < yt; y++ {
-			for x := 0; x < xt; x++ {
-				fmt.Fprintf(w, "<img width=%d height=%d src='/gophertiles?x=%d&y=%d&cachebust=%d&latency=%d'>",
-					tileSize, tileSize, x, y, cacheBust, ms)
-			}
-			io.WriteString(w, "<br/>\n")
-		}
-		io.WriteString(w, `<p><div id='loadtimes'></div></p>
-<script>
-function showtimes() {
-	var times = 'Times from connection start:<br>'
-	times += 'DOM loaded: ' + (window.performance.timing.domContentLoadedEventEnd - window.performance.timing.connectStart) + 'ms<br>'
-	times += 'DOM complete (images loaded): ' + (window.performance.timing.domComplete - window.performance.timing.connectStart) + 'ms<br>'
-	document.getElementById('loadtimes').innerHTML = times
-}
-</script>
-<hr><a href='/'>&lt;&lt Back to Go HTTP/2 demo server</a></body></html>`)
-	})
-}
-
-func httpsHost() string {
-	if *prod {
-		return "http2.golang.org"
-	}
-	if v := *addr; strings.HasPrefix(v, ":") {
-		return "localhost" + v
-	} else {
-		return v
-	}
-}
-
-func httpHost() string {
-	if *prod {
-		return "http2.golang.org"
-	}
-	if v := *httpAddr; strings.HasPrefix(v, ":") {
-		return "localhost" + v
-	} else {
-		return v
-	}
-}
-
-func serveProdTLS() error {
-	c, err := googlestorage.NewServiceClient()
-	if err != nil {
-		return err
-	}
-	slurp := func(key string) ([]byte, error) {
-		const bucket = "http2-demo-server-tls"
-		rc, _, err := c.GetObject(&googlestorage.Object{
-			Bucket: bucket,
-			Key:    key,
-		})
-		if err != nil {
-			return nil, fmt.Errorf("Error fetching GCS object %q in bucket %q: %v", key, bucket, err)
-		}
-		defer rc.Close()
-		return ioutil.ReadAll(rc)
-	}
-	certPem, err := slurp("http2.golang.org.chained.pem")
-	if err != nil {
-		return err
-	}
-	keyPem, err := slurp("http2.golang.org.key")
-	if err != nil {
-		return err
-	}
-	cert, err := tls.X509KeyPair(certPem, keyPem)
-	if err != nil {
-		return err
-	}
-	srv := &http.Server{
-		TLSConfig: &tls.Config{
-			Certificates: []tls.Certificate{cert},
-		},
-	}
-	http2.ConfigureServer(srv, &http2.Server{})
-	ln, err := net.Listen("tcp", ":443")
-	if err != nil {
-		return err
-	}
-	return srv.Serve(tls.NewListener(tcpKeepAliveListener{ln.(*net.TCPListener)}, srv.TLSConfig))
-}
-
-type tcpKeepAliveListener struct {
-	*net.TCPListener
-}
-
-func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {
-	tc, err := ln.AcceptTCP()
-	if err != nil {
-		return
-	}
-	tc.SetKeepAlive(true)
-	tc.SetKeepAlivePeriod(3 * time.Minute)
-	return tc, nil
-}
-
-func serveProd() error {
-	errc := make(chan error, 2)
-	go func() { errc <- http.ListenAndServe(":80", nil) }()
-	go func() { errc <- serveProdTLS() }()
-	return <-errc
-}
-
-func main() {
-	var srv http.Server
-	flag.BoolVar(&http2.VerboseLogs, "verbose", false, "Verbose HTTP/2 debugging.")
-	flag.Parse()
-	srv.Addr = *addr
-
-	registerHandlers()
-
-	if *prod {
-		*httpAddr = "http2.golang.org"
-		log.Fatal(serveProd())
-	}
-
-	url := "https://" + *addr + "/"
-	log.Printf("Listening on " + url)
-	http2.ConfigureServer(&srv, &http2.Server{})
-
-	if *httpAddr != "" {
-		go func() { log.Fatal(http.ListenAndServe(*httpAddr, nil)) }()
-	}
-
-	go func() {
-		log.Fatal(srv.ListenAndServeTLS("server.crt", "server.key"))
-	}()
-	if *openFirefox && runtime.GOOS == "darwin" {
-		time.Sleep(250 * time.Millisecond)
-		exec.Command("open", "-b", "org.mozilla.nightly", "https://localhost:4430/").Run()
-	}
-	select {}
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/launch.go b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/launch.go
deleted file mode 100644
index 746661543e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/launch.go
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/google"
-	compute "google.golang.org/api/compute/v1"
-)
-
-var (
-	proj     = flag.String("project", "symbolic-datum-552", "name of Project")
-	zone     = flag.String("zone", "us-central1-a", "GCE zone")
-	mach     = flag.String("machinetype", "n1-standard-1", "Machine type")
-	instName = flag.String("instance_name", "http2-demo", "Name of VM instance.")
-	sshPub   = flag.String("ssh_public_key", "", "ssh public key file to authorize. Can modify later in Google's web UI anyway.")
-	staticIP = flag.String("static_ip", "130.211.116.44", "Static IP to use. If empty, automatic.")
-
-	writeObject  = flag.String("write_object", "", "If non-empty, a VM isn't created and the flag value is Google Cloud Storage bucket/object to write. The contents from stdin.")
-	publicObject = flag.Bool("write_object_is_public", false, "Whether the object created by --write_object should be public.")
-)
-
-func readFile(v string) string {
-	slurp, err := ioutil.ReadFile(v)
-	if err != nil {
-		log.Fatalf("Error reading %s: %v", v, err)
-	}
-	return strings.TrimSpace(string(slurp))
-}
-
-var config = &oauth2.Config{
-	// The client-id and secret should be for an "Installed Application" when using
-	// the CLI. Later we'll use a web application with a callback.
-	ClientID:     readFile("client-id.dat"),
-	ClientSecret: readFile("client-secret.dat"),
-	Endpoint:     google.Endpoint,
-	Scopes: []string{
-		compute.DevstorageFull_controlScope,
-		compute.ComputeScope,
-		"https://www.googleapis.com/auth/sqlservice",
-		"https://www.googleapis.com/auth/sqlservice.admin",
-	},
-	RedirectURL: "urn:ietf:wg:oauth:2.0:oob",
-}
-
-const baseConfig = `#cloud-config
-coreos:
-  units:
-    - name: h2demo.service
-      command: start
-      content: |
-        [Unit]
-        Description=HTTP2 Demo
-        
-        [Service]
-        ExecStartPre=/bin/bash -c 'mkdir -p /opt/bin && curl -s -o /opt/bin/h2demo http://storage.googleapis.com/http2-demo-server-tls/h2demo && chmod +x /opt/bin/h2demo'
-        ExecStart=/opt/bin/h2demo --prod
-        RestartSec=5s
-        Restart=always
-        Type=simple
-        
-        [Install]
-        WantedBy=multi-user.target
-`
-
-func main() {
-	flag.Parse()
-	if *proj == "" {
-		log.Fatalf("Missing --project flag")
-	}
-	prefix := "https://www.googleapis.com/compute/v1/projects/" + *proj
-	machType := prefix + "/zones/" + *zone + "/machineTypes/" + *mach
-
-	const tokenFileName = "token.dat"
-	tokenFile := tokenCacheFile(tokenFileName)
-	tokenSource := oauth2.ReuseTokenSource(nil, tokenFile)
-	token, err := tokenSource.Token()
-	if err != nil {
-		if *writeObject != "" {
-			log.Fatalf("Can't use --write_object without a valid token.dat file already cached.")
-		}
-		log.Printf("Error getting token from %s: %v", tokenFileName, err)
-		log.Printf("Get auth code from %v", config.AuthCodeURL("my-state"))
-		fmt.Print("\nEnter auth code: ")
-		sc := bufio.NewScanner(os.Stdin)
-		sc.Scan()
-		authCode := strings.TrimSpace(sc.Text())
-		token, err = config.Exchange(oauth2.NoContext, authCode)
-		if err != nil {
-			log.Fatalf("Error exchanging auth code for a token: %v", err)
-		}
-		if err := tokenFile.WriteToken(token); err != nil {
-			log.Fatalf("Error writing to %s: %v", tokenFileName, err)
-		}
-		tokenSource = oauth2.ReuseTokenSource(token, nil)
-	}
-
-	oauthClient := oauth2.NewClient(oauth2.NoContext, tokenSource)
-
-	if *writeObject != "" {
-		writeCloudStorageObject(oauthClient)
-		return
-	}
-
-	computeService, _ := compute.New(oauthClient)
-
-	natIP := *staticIP
-	if natIP == "" {
-		// Try to find it by name.
-		aggAddrList, err := computeService.Addresses.AggregatedList(*proj).Do()
-		if err != nil {
-			log.Fatal(err)
-		}
-		// http://godoc.org/code.google.com/p/google-api-go-client/compute/v1#AddressAggregatedList
-	IPLoop:
-		for _, asl := range aggAddrList.Items {
-			for _, addr := range asl.Addresses {
-				if addr.Name == *instName+"-ip" && addr.Status == "RESERVED" {
-					natIP = addr.Address
-					break IPLoop
-				}
-			}
-		}
-	}
-
-	cloudConfig := baseConfig
-	if *sshPub != "" {
-		key := strings.TrimSpace(readFile(*sshPub))
-		cloudConfig += fmt.Sprintf("\nssh_authorized_keys:\n    - %s\n", key)
-	}
-	if os.Getenv("USER") == "bradfitz" {
-		cloudConfig += fmt.Sprintf("\nssh_authorized_keys:\n    - %s\n", "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwks9dwWKlRC+73gRbvYtVg0vdCwDSuIlyt4z6xa/YU/jTDynM4R4W10hm2tPjy8iR1k8XhDv4/qdxe6m07NjG/By1tkmGpm1mGwho4Pr5kbAAy/Qg+NLCSdAYnnE00FQEcFOC15GFVMOW2AzDGKisReohwH9eIzHPzdYQNPRWXE= bradfitz@papag.bradfitz.com")
-	}
-	const maxCloudConfig = 32 << 10 // per compute API docs
-	if len(cloudConfig) > maxCloudConfig {
-		log.Fatalf("cloud config length of %d bytes is over %d byte limit", len(cloudConfig), maxCloudConfig)
-	}
-
-	instance := &compute.Instance{
-		Name:        *instName,
-		Description: "Go Builder",
-		MachineType: machType,
-		Disks:       []*compute.AttachedDisk{instanceDisk(computeService)},
-		Tags: &compute.Tags{
-			Items: []string{"http-server", "https-server"},
-		},
-		Metadata: &compute.Metadata{
-			Items: []*compute.MetadataItems{
-				{
-					Key:   "user-data",
-					Value: cloudConfig,
-				},
-			},
-		},
-		NetworkInterfaces: []*compute.NetworkInterface{
-			&compute.NetworkInterface{
-				AccessConfigs: []*compute.AccessConfig{
-					&compute.AccessConfig{
-						Type:  "ONE_TO_ONE_NAT",
-						Name:  "External NAT",
-						NatIP: natIP,
-					},
-				},
-				Network: prefix + "/global/networks/default",
-			},
-		},
-		ServiceAccounts: []*compute.ServiceAccount{
-			{
-				Email: "default",
-				Scopes: []string{
-					compute.DevstorageFull_controlScope,
-					compute.ComputeScope,
-				},
-			},
-		},
-	}
-
-	log.Printf("Creating instance...")
-	op, err := computeService.Instances.Insert(*proj, *zone, instance).Do()
-	if err != nil {
-		log.Fatalf("Failed to create instance: %v", err)
-	}
-	opName := op.Name
-	log.Printf("Created. Waiting on operation %v", opName)
-OpLoop:
-	for {
-		time.Sleep(2 * time.Second)
-		op, err := computeService.ZoneOperations.Get(*proj, *zone, opName).Do()
-		if err != nil {
-			log.Fatalf("Failed to get op %s: %v", opName, err)
-		}
-		switch op.Status {
-		case "PENDING", "RUNNING":
-			log.Printf("Waiting on operation %v", opName)
-			continue
-		case "DONE":
-			if op.Error != nil {
-				for _, operr := range op.Error.Errors {
-					log.Printf("Error: %+v", operr)
-				}
-				log.Fatalf("Failed to start.")
-			}
-			log.Printf("Success. %+v", op)
-			break OpLoop
-		default:
-			log.Fatalf("Unknown status %q: %+v", op.Status, op)
-		}
-	}
-
-	inst, err := computeService.Instances.Get(*proj, *zone, *instName).Do()
-	if err != nil {
-		log.Fatalf("Error getting instance after creation: %v", err)
-	}
-	ij, _ := json.MarshalIndent(inst, "", "    ")
-	log.Printf("Instance: %s", ij)
-}
-
-func instanceDisk(svc *compute.Service) *compute.AttachedDisk {
-	const imageURL = "https://www.googleapis.com/compute/v1/projects/coreos-cloud/global/images/coreos-stable-444-5-0-v20141016"
-	diskName := *instName + "-disk"
-
-	return &compute.AttachedDisk{
-		AutoDelete: true,
-		Boot:       true,
-		Type:       "PERSISTENT",
-		InitializeParams: &compute.AttachedDiskInitializeParams{
-			DiskName:    diskName,
-			SourceImage: imageURL,
-			DiskSizeGb:  50,
-		},
-	}
-}
-
-func writeCloudStorageObject(httpClient *http.Client) {
-	content := os.Stdin
-	const maxSlurp = 1 << 20
-	var buf bytes.Buffer
-	n, err := io.CopyN(&buf, content, maxSlurp)
-	if err != nil && err != io.EOF {
-		log.Fatalf("Error reading from stdin: %v, %v", n, err)
-	}
-	contentType := http.DetectContentType(buf.Bytes())
-
-	req, err := http.NewRequest("PUT", "https://storage.googleapis.com/"+*writeObject, io.MultiReader(&buf, content))
-	if err != nil {
-		log.Fatal(err)
-	}
-	req.Header.Set("x-goog-api-version", "2")
-	if *publicObject {
-		req.Header.Set("x-goog-acl", "public-read")
-	}
-	req.Header.Set("Content-Type", contentType)
-	res, err := httpClient.Do(req)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if res.StatusCode != 200 {
-		res.Write(os.Stderr)
-		log.Fatalf("Failed.")
-	}
-	log.Printf("Success.")
-	os.Exit(0)
-}
-
-type tokenCacheFile string
-
-func (f tokenCacheFile) Token() (*oauth2.Token, error) {
-	slurp, err := ioutil.ReadFile(string(f))
-	if err != nil {
-		return nil, err
-	}
-	t := new(oauth2.Token)
-	if err := json.Unmarshal(slurp, t); err != nil {
-		return nil, err
-	}
-	return t, nil
-}
-
-func (f tokenCacheFile) WriteToken(t *oauth2.Token) error {
-	jt, err := json.Marshal(t)
-	if err != nil {
-		return err
-	}
-	return ioutil.WriteFile(string(f), jt, 0600)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.key b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.key
deleted file mode 100644
index a15a6abaf7..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAt5fAjp4fTcekWUTfzsp0kyih1OYbsGL0KX1eRbSSR8Od0+9Q
-62Hyny+GFwMTb4A/KU8mssoHvcceSAAbwfbxFK/+s51TobqUnORZrOoTZjkUygby
-XDSK99YBbcR1Pip8vwMTm4XKuLtCigeBBdjjAQdgUO28LENGlsMnmeYkJfODVGnV
-mr5Ltb9ANA8IKyTfsnHJ4iOCS/PlPbUj2q7YnoVLposUBMlgUb/CykX3mOoLb4yJ
-JQyA/iST6ZxiIEj36D4yWZ5lg7YJl+UiiBQHGCnPdGyipqV06ex0heYWcaiW8LWZ
-SUQ93jQ+WVCH8hT7DQO1dmsvUmXlq/JeAlwQ/QIDAQABAoIBAFFHV7JMAqPWnMYA
-nezY6J81v9+XN+7xABNWM2Q8uv4WdksbigGLTXR3/680Z2hXqJ7LMeC5XJACFT/e
-/Gr0vmpgOCygnCPfjGehGKpavtfksXV3edikUlnCXsOP1C//c1bFL+sMYmFCVgTx
-qYdDK8yKzXNGrKYT6q5YG7IglyRNV1rsQa8lM/5taFYiD1Ck/3tQi3YIq8Lcuser
-hrxsMABcQ6mi+EIvG6Xr4mfJug0dGJMHG4RG1UGFQn6RXrQq2+q53fC8ZbVUSi0j
-NQ918aKFzktwv+DouKU0ME4I9toks03gM860bAL7zCbKGmwR3hfgX/TqzVCWpG9E
-LDVfvekCgYEA8fk9N53jbBRmULUGEf4qWypcLGiZnNU0OeXWpbPV9aa3H0VDytA7
-8fCN2dPAVDPqlthMDdVe983NCNwp2Yo8ZimDgowyIAKhdC25s1kejuaiH9OAPj3c
-0f8KbriYX4n8zNHxFwK6Ae3pQ6EqOLJVCUsziUaZX9nyKY5aZlyX6xcCgYEAwjws
-K62PjC64U5wYddNLp+kNdJ4edx+a7qBb3mEgPvSFT2RO3/xafJyG8kQB30Mfstjd
-bRxyUV6N0vtX1zA7VQtRUAvfGCecpMo+VQZzcHXKzoRTnQ7eZg4Lmj5fQ9tOAKAo
-QCVBoSW/DI4PZL26CAMDcAba4Pa22ooLapoRIQsCgYA6pIfkkbxLNkpxpt2YwLtt
-Kr/590O7UaR9n6k8sW/aQBRDXNsILR1KDl2ifAIxpf9lnXgZJiwE7HiTfCAcW7c1
-nzwDCI0hWuHcMTS/NYsFYPnLsstyyjVZI3FY0h4DkYKV9Q9z3zJLQ2hz/nwoD3gy
-b2pHC7giFcTts1VPV4Nt8wKBgHeFn4ihHJweg76vZz3Z78w7VNRWGFklUalVdDK7
-gaQ7w2y/ROn/146mo0OhJaXFIFRlrpvdzVrU3GDf2YXJYDlM5ZRkObwbZADjksev
-WInzcgDy3KDg7WnPasRXbTfMU4t/AkW2p1QKbi3DnSVYuokDkbH2Beo45vxDxhKr
-C69RAoGBAIyo3+OJenoZmoNzNJl2WPW5MeBUzSh8T/bgyjFTdqFHF5WiYRD/lfHj
-x9Glyw2nutuT4hlOqHvKhgTYdDMsF2oQ72fe3v8Q5FU7FuKndNPEAyvKNXZaShVA
-hnlhv5DjXKb0wFWnt5PCCiQLtzG0yyHaITrrEme7FikkIcTxaX/Y
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.pem b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.pem
deleted file mode 100644
index 3a323e774e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEWjCCA0KgAwIBAgIJALfRlWsI8YQHMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEUMBIG
-A1UEChMLQnJhZGZpdHppbmMxEjAQBgNVBAMTCWxvY2FsaG9zdDEdMBsGCSqGSIb3
-DQEJARYOYnJhZEBkYW5nYS5jb20wHhcNMTQwNzE1MjA0NjA1WhcNMTcwNTA0MjA0
-NjA1WjB7MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC0JyYWRmaXR6aW5jMRIwEAYDVQQDEwlsb2NhbGhv
-c3QxHTAbBgkqhkiG9w0BCQEWDmJyYWRAZGFuZ2EuY29tMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAt5fAjp4fTcekWUTfzsp0kyih1OYbsGL0KX1eRbSS
-R8Od0+9Q62Hyny+GFwMTb4A/KU8mssoHvcceSAAbwfbxFK/+s51TobqUnORZrOoT
-ZjkUygbyXDSK99YBbcR1Pip8vwMTm4XKuLtCigeBBdjjAQdgUO28LENGlsMnmeYk
-JfODVGnVmr5Ltb9ANA8IKyTfsnHJ4iOCS/PlPbUj2q7YnoVLposUBMlgUb/CykX3
-mOoLb4yJJQyA/iST6ZxiIEj36D4yWZ5lg7YJl+UiiBQHGCnPdGyipqV06ex0heYW
-caiW8LWZSUQ93jQ+WVCH8hT7DQO1dmsvUmXlq/JeAlwQ/QIDAQABo4HgMIHdMB0G
-A1UdDgQWBBRcAROthS4P4U7vTfjByC569R7E6DCBrQYDVR0jBIGlMIGigBRcAROt
-hS4P4U7vTfjByC569R7E6KF/pH0wezELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNB
-MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRQwEgYDVQQKEwtCcmFkZml0emluYzES
-MBAGA1UEAxMJbG9jYWxob3N0MR0wGwYJKoZIhvcNAQkBFg5icmFkQGRhbmdhLmNv
-bYIJALfRlWsI8YQHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAG6h
-U9f9sNH0/6oBbGGy2EVU0UgITUQIrFWo9rFkrW5k/XkDjQm+3lzjT0iGR4IxE/Ao
-eU6sQhua7wrWeFEn47GL98lnCsJdD7oZNhFmQ95Tb/LnDUjs5Yj9brP0NWzXfYU4
-UK2ZnINJRcJpB8iRCaCxE8DdcUF0XqIEq6pA272snoLmiXLMvNl3kYEdm+je6voD
-58SNVEUsztzQyXmJEhCpwVI0A6QCjzXj+qvpmw3ZZHi8JwXei8ZZBLTSFBki8Z7n
-sH9BBH38/SzUmAN4QHSPy1gjqm00OAE8NaYDkh/bzE4d7mLGGMWp/WE3KPSu82HF
-kPe6XoSbiLm/kxk32T0=
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.srl b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.srl
deleted file mode 100644
index 6db3891880..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/rootCA.srl
+++ /dev/null
@@ -1 +0,0 @@
-E2CE26BF3285059C
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.crt b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.crt
deleted file mode 100644
index c59059bd64..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDPjCCAiYCCQDizia/MoUFnDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xFDASBgNVBAoT
-C0JyYWRmaXR6aW5jMRIwEAYDVQQDEwlsb2NhbGhvc3QxHTAbBgkqhkiG9w0BCQEW
-DmJyYWRAZGFuZ2EuY29tMB4XDTE0MDcxNTIwNTAyN1oXDTE1MTEyNzIwNTAyN1ow
-RzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQHEwJTRjEeMBwGA1UE
-ChMVYnJhZGZpdHogaHR0cDIgc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAs1Y9CyLFrdL8VQWN1WaifDqaZFnoqjHhCMlc1TfG2zA+InDifx2l
-gZD3o8FeNnAcfM2sPlk3+ZleOYw9P/CklFVDlvqmpCv9ss/BEp/dDaWvy1LmJ4c2
-dbQJfmTxn7CV1H3TsVJvKdwFmdoABb41NoBp6+NNO7OtDyhbIMiCI0pL3Nefb3HL
-A7hIMo3DYbORTtJLTIH9W8YKrEWL0lwHLrYFx/UdutZnv+HjdmO6vCN4na55mjws
-/vjKQUmc7xeY7Xe20xDEG2oDKVkL2eD7FfyrYMS3rO1ExP2KSqlXYG/1S9I/fz88
-F0GK7HX55b5WjZCl2J3ERVdnv/0MQv+sYQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQC0zL+n/YpRZOdulSu9tS8FxrstXqGWoxfe+vIUgqfMZ5+0MkjJ/vW0FqlLDl2R
-rn4XaR3e7FmWkwdDVbq/UB6lPmoAaFkCgh9/5oapMaclNVNnfF3fjCJfRr+qj/iD
-EmJStTIN0ZuUjAlpiACmfnpEU55PafT5Zx+i1yE4FGjw8bJpFoyD4Hnm54nGjX19
-KeCuvcYFUPnBm3lcL0FalF2AjqV02WTHYNQk7YF/oeO7NKBoEgvGvKG3x+xaOeBI
-dwvdq175ZsGul30h+QjrRlXhH/twcuaT3GSdoysDl9cCYE8f1Mk8PD6gan3uBCJU
-90p6/CbU71bGbfpM2PHot2fm
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.key b/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.key
deleted file mode 100644
index f329c14212..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2demo/server.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAs1Y9CyLFrdL8VQWN1WaifDqaZFnoqjHhCMlc1TfG2zA+InDi
-fx2lgZD3o8FeNnAcfM2sPlk3+ZleOYw9P/CklFVDlvqmpCv9ss/BEp/dDaWvy1Lm
-J4c2dbQJfmTxn7CV1H3TsVJvKdwFmdoABb41NoBp6+NNO7OtDyhbIMiCI0pL3Nef
-b3HLA7hIMo3DYbORTtJLTIH9W8YKrEWL0lwHLrYFx/UdutZnv+HjdmO6vCN4na55
-mjws/vjKQUmc7xeY7Xe20xDEG2oDKVkL2eD7FfyrYMS3rO1ExP2KSqlXYG/1S9I/
-fz88F0GK7HX55b5WjZCl2J3ERVdnv/0MQv+sYQIDAQABAoIBADQ2spUwbY+bcz4p
-3M66ECrNQTBggP40gYl2XyHxGGOu2xhZ94f9ELf1hjRWU2DUKWco1rJcdZClV6q3
-qwmXvcM2Q/SMS8JW0ImkNVl/0/NqPxGatEnj8zY30d/L8hGFb0orzFu/XYA5gCP4
-NbN2WrXgk3ZLeqwcNxHHtSiJWGJ/fPyeDWAu/apy75u9Xf2GlzBZmV6HYD9EfK80
-LTlI60f5FO487CrJnboL7ovPJrIHn+k05xRQqwma4orpz932rTXnTjs9Lg6KtbQN
-a7PrqfAntIISgr11a66Mng3IYH1lYqJsWJJwX/xHT4WLEy0EH4/0+PfYemJekz2+
-Co62drECgYEA6O9zVJZXrLSDsIi54cfxA7nEZWm5CAtkYWeAHa4EJ+IlZ7gIf9sL
-W8oFcEfFGpvwVqWZ+AsQ70dsjXAv3zXaG0tmg9FtqWp7pzRSMPidifZcQwWkKeTO
-gJnFmnVyed8h6GfjTEu4gxo1/S5U0V+mYSha01z5NTnN6ltKx1Or3b0CgYEAxRgm
-S30nZxnyg/V7ys61AZhst1DG2tkZXEMcA7dYhabMoXPJAP/EfhlWwpWYYUs/u0gS
-Wwmf5IivX5TlYScgmkvb/NYz0u4ZmOXkLTnLPtdKKFXhjXJcHjUP67jYmOxNlJLp
-V4vLRnFxTpffAV+OszzRxsXX6fvruwZBANYJeXUCgYBVouLFsFgfWGYp2rpr9XP4
-KK25kvrBqF6JKOIDB1zjxNJ3pUMKrl8oqccCFoCyXa4oTM2kUX0yWxHfleUjrMq4
-yimwQKiOZmV7fVLSSjSw6e/VfBd0h3gb82ygcplZkN0IclkwTY5SNKqwn/3y07V5
-drqdhkrgdJXtmQ6O5YYECQKBgATERcDToQ1USlI4sKrB/wyv1AlG8dg/IebiVJ4e
-ZAyvcQmClFzq0qS+FiQUnB/WQw9TeeYrwGs1hxBHuJh16srwhLyDrbMvQP06qh8R
-48F8UXXSRec22dV9MQphaROhu2qZdv1AC0WD3tqov6L33aqmEOi+xi8JgbT/PLk5
-c/c1AoGBAI1A/02ryksW6/wc7/6SP2M2rTy4m1sD/GnrTc67EHnRcVBdKO6qH2RY
-nqC8YcveC2ZghgPTDsA3VGuzuBXpwY6wTyV99q6jxQJ6/xcrD9/NUG6Uwv/xfCxl
-IJLeBYEqQundSSny3VtaAUK8Ul1nxpTvVRNwtcyWTo8RHAAyNPWd
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2i/README.md b/Godeps/_workspace/src/golang.org/x/net/http2/h2i/README.md
deleted file mode 100644
index fb5c5efb0f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2i/README.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# h2i
-
-**h2i** is an interactive HTTP/2 ("h2") console debugger. Miss the good ol'
-days of telnetting to your HTTP/1.n servers? We're bringing you
-back.
-
-Features:
-- send raw HTTP/2 frames
- - PING
- - SETTINGS
- - HEADERS
- - etc
-- type in HTTP/1.n and have it auto-HPACK/frame-ify it for HTTP/2
-- pretty print all received HTTP/2 frames from the peer (including HPACK decoding)
-- tab completion of commands, options
-
-Not yet features, but soon:
-- unnecessary CONTINUATION frames on short boundaries, to test peer implementations 
-- request bodies (DATA frames)
-- send invalid frames for testing server implementations (supported by underlying Framer)
-
-Later:
-- act like a server
-
-## Installation
-
-```
-$ go get golang.org/x/net/http2/h2i
-$ h2i <host>
-```
-
-## Demo
-
-```
-$ h2i
-Usage: h2i <hostname>
-  
-  -insecure
-        Whether to skip TLS cert validation
-  -nextproto string
-        Comma-separated list of NPN/ALPN protocol names to negotiate. (default "h2,h2-14")
-
-$ h2i google.com
-Connecting to google.com:443 ...
-Connected to 74.125.224.41:443
-Negotiated protocol "h2-14"
-[FrameHeader SETTINGS len=18]
-  [MAX_CONCURRENT_STREAMS = 100]
-  [INITIAL_WINDOW_SIZE = 1048576]
-  [MAX_FRAME_SIZE = 16384]
-[FrameHeader WINDOW_UPDATE len=4]
-  Window-Increment = 983041
-  
-h2i> PING h2iSayHI
-[FrameHeader PING flags=ACK len=8]
-  Data = "h2iSayHI"
-h2i> headers
-(as HTTP/1.1)> GET / HTTP/1.1
-(as HTTP/1.1)> Host: ip.appspot.com
-(as HTTP/1.1)> User-Agent: h2i/brad-n-blake
-(as HTTP/1.1)>  
-Opening Stream-ID 1:
- :authority = ip.appspot.com
- :method = GET
- :path = /
- :scheme = https
- user-agent = h2i/brad-n-blake
-[FrameHeader HEADERS flags=END_HEADERS stream=1 len=77]
-  :status = "200"
-  alternate-protocol = "443:quic,p=1"
-  content-length = "15"
-  content-type = "text/html"
-  date = "Fri, 01 May 2015 23:06:56 GMT"
-  server = "Google Frontend"
-[FrameHeader DATA flags=END_STREAM stream=1 len=15]
-  "173.164.155.78\n"
-[FrameHeader PING len=8]
-  Data = "\x00\x00\x00\x00\x00\x00\x00\x00"
-h2i> ping  
-[FrameHeader PING flags=ACK len=8]  
-  Data = "h2i_ping"  
-h2i> ping  
-[FrameHeader PING flags=ACK len=8]
-  Data = "h2i_ping"
-h2i> ping
-[FrameHeader GOAWAY len=22]
-  Last-Stream-ID = 1; Error-Code = PROTOCOL_ERROR (1)
-
-ReadFrame: EOF
-```
-
-## Status
-
-Quick few hour hack. So much yet to do. Feel free to file issues for
-bugs or wishlist items, but [@bmizerany](https://github.com/bmizerany/)
-and I aren't yet accepting pull requests until things settle down.
-
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/h2i/h2i.go b/Godeps/_workspace/src/golang.org/x/net/http2/h2i/h2i.go
deleted file mode 100644
index 73efe86011..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/h2i/h2i.go
+++ /dev/null
@@ -1,489 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-/*
-The h2i command is an interactive HTTP/2 console.
-
-Usage:
-  $ h2i [flags] <hostname>
-
-Interactive commands in the console: (all parts case-insensitive)
-
-  ping [data]
-  settings ack
-  settings FOO=n BAR=z
-  headers      (open a new stream by typing HTTP/1.1)
-*/
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"golang.org/x/crypto/ssh/terminal"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-)
-
-// Flags
-var (
-	flagNextProto = flag.String("nextproto", "h2,h2-14", "Comma-separated list of NPN/ALPN protocol names to negotiate.")
-	flagInsecure  = flag.Bool("insecure", false, "Whether to skip TLS cert validation")
-)
-
-type command struct {
-	run func(*h2i, []string) error // required
-
-	// complete optionally specifies tokens (case-insensitive) which are
-	// valid for this subcommand.
-	complete func() []string
-}
-
-var commands = map[string]command{
-	"ping": command{run: (*h2i).cmdPing},
-	"settings": command{
-		run: (*h2i).cmdSettings,
-		complete: func() []string {
-			return []string{
-				"ACK",
-				http2.SettingHeaderTableSize.String(),
-				http2.SettingEnablePush.String(),
-				http2.SettingMaxConcurrentStreams.String(),
-				http2.SettingInitialWindowSize.String(),
-				http2.SettingMaxFrameSize.String(),
-				http2.SettingMaxHeaderListSize.String(),
-			}
-		},
-	},
-	"quit":    command{run: (*h2i).cmdQuit},
-	"headers": command{run: (*h2i).cmdHeaders},
-}
-
-func usage() {
-	fmt.Fprintf(os.Stderr, "Usage: h2i <hostname>\n\n")
-	flag.PrintDefaults()
-	os.Exit(1)
-}
-
-// withPort adds ":443" if another port isn't already present.
-func withPort(host string) string {
-	if _, _, err := net.SplitHostPort(host); err != nil {
-		return net.JoinHostPort(host, "443")
-	}
-	return host
-}
-
-// h2i is the app's state.
-type h2i struct {
-	host   string
-	tc     *tls.Conn
-	framer *http2.Framer
-	term   *terminal.Terminal
-
-	// owned by the command loop:
-	streamID uint32
-	hbuf     bytes.Buffer
-	henc     *hpack.Encoder
-
-	// owned by the readFrames loop:
-	peerSetting map[http2.SettingID]uint32
-	hdec        *hpack.Decoder
-}
-
-func main() {
-	flag.Usage = usage
-	flag.Parse()
-	if flag.NArg() != 1 {
-		usage()
-	}
-	log.SetFlags(0)
-
-	host := flag.Arg(0)
-	app := &h2i{
-		host:        host,
-		peerSetting: make(map[http2.SettingID]uint32),
-	}
-	app.henc = hpack.NewEncoder(&app.hbuf)
-
-	if err := app.Main(); err != nil {
-		if app.term != nil {
-			app.logf("%v\n", err)
-		} else {
-			fmt.Fprintf(os.Stderr, "%v\n", err)
-		}
-		os.Exit(1)
-	}
-	fmt.Fprintf(os.Stdout, "\n")
-}
-
-func (app *h2i) Main() error {
-	cfg := &tls.Config{
-		ServerName:         app.host,
-		NextProtos:         strings.Split(*flagNextProto, ","),
-		InsecureSkipVerify: *flagInsecure,
-	}
-
-	hostAndPort := withPort(app.host)
-	log.Printf("Connecting to %s ...", hostAndPort)
-	tc, err := tls.Dial("tcp", hostAndPort, cfg)
-	if err != nil {
-		return fmt.Errorf("Error dialing %s: %v", withPort(app.host), err)
-	}
-	log.Printf("Connected to %v", tc.RemoteAddr())
-	defer tc.Close()
-
-	if err := tc.Handshake(); err != nil {
-		return fmt.Errorf("TLS handshake: %v", err)
-	}
-	if !*flagInsecure {
-		if err := tc.VerifyHostname(app.host); err != nil {
-			return fmt.Errorf("VerifyHostname: %v", err)
-		}
-	}
-	state := tc.ConnectionState()
-	log.Printf("Negotiated protocol %q", state.NegotiatedProtocol)
-	if !state.NegotiatedProtocolIsMutual || state.NegotiatedProtocol == "" {
-		return fmt.Errorf("Could not negotiate protocol mutually")
-	}
-
-	if _, err := io.WriteString(tc, http2.ClientPreface); err != nil {
-		return err
-	}
-
-	app.framer = http2.NewFramer(tc, tc)
-
-	oldState, err := terminal.MakeRaw(0)
-	if err != nil {
-		return err
-	}
-	defer terminal.Restore(0, oldState)
-
-	var screen = struct {
-		io.Reader
-		io.Writer
-	}{os.Stdin, os.Stdout}
-
-	app.term = terminal.NewTerminal(screen, "h2i> ")
-	lastWord := regexp.MustCompile(`.+\W(\w+)$`)
-	app.term.AutoCompleteCallback = func(line string, pos int, key rune) (newLine string, newPos int, ok bool) {
-		if key != '\t' {
-			return
-		}
-		if pos != len(line) {
-			// TODO: we're being lazy for now, only supporting tab completion at the end.
-			return
-		}
-		// Auto-complete for the command itself.
-		if !strings.Contains(line, " ") {
-			var name string
-			name, _, ok = lookupCommand(line)
-			if !ok {
-				return
-			}
-			return name, len(name), true
-		}
-		_, c, ok := lookupCommand(line[:strings.IndexByte(line, ' ')])
-		if !ok || c.complete == nil {
-			return
-		}
-		if strings.HasSuffix(line, " ") {
-			app.logf("%s", strings.Join(c.complete(), " "))
-			return line, pos, true
-		}
-		m := lastWord.FindStringSubmatch(line)
-		if m == nil {
-			return line, len(line), true
-		}
-		soFar := m[1]
-		var match []string
-		for _, cand := range c.complete() {
-			if len(soFar) > len(cand) || !strings.EqualFold(cand[:len(soFar)], soFar) {
-				continue
-			}
-			match = append(match, cand)
-		}
-		if len(match) == 0 {
-			return
-		}
-		if len(match) > 1 {
-			// TODO: auto-complete any common prefix
-			app.logf("%s", strings.Join(match, " "))
-			return line, pos, true
-		}
-		newLine = line[:len(line)-len(soFar)] + match[0]
-		return newLine, len(newLine), true
-
-	}
-
-	errc := make(chan error, 2)
-	go func() { errc <- app.readFrames() }()
-	go func() { errc <- app.readConsole() }()
-	return <-errc
-}
-
-func (app *h2i) logf(format string, args ...interface{}) {
-	fmt.Fprintf(app.term, format+"\n", args...)
-}
-
-func (app *h2i) readConsole() error {
-	for {
-		line, err := app.term.ReadLine()
-		if err == io.EOF {
-			return nil
-		}
-		if err != nil {
-			return fmt.Errorf("terminal.ReadLine: %v", err)
-		}
-		f := strings.Fields(line)
-		if len(f) == 0 {
-			continue
-		}
-		cmd, args := f[0], f[1:]
-		if _, c, ok := lookupCommand(cmd); ok {
-			err = c.run(app, args)
-		} else {
-			app.logf("Unknown command %q", line)
-		}
-		if err == errExitApp {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-	}
-}
-
-func lookupCommand(prefix string) (name string, c command, ok bool) {
-	prefix = strings.ToLower(prefix)
-	if c, ok = commands[prefix]; ok {
-		return prefix, c, ok
-	}
-
-	for full, candidate := range commands {
-		if strings.HasPrefix(full, prefix) {
-			if c.run != nil {
-				return "", command{}, false // ambiguous
-			}
-			c = candidate
-			name = full
-		}
-	}
-	return name, c, c.run != nil
-}
-
-var errExitApp = errors.New("internal sentinel error value to quit the console reading loop")
-
-func (a *h2i) cmdQuit(args []string) error {
-	if len(args) > 0 {
-		a.logf("the QUIT command takes no argument")
-		return nil
-	}
-	return errExitApp
-}
-
-func (a *h2i) cmdSettings(args []string) error {
-	if len(args) == 1 && strings.EqualFold(args[0], "ACK") {
-		return a.framer.WriteSettingsAck()
-	}
-	var settings []http2.Setting
-	for _, arg := range args {
-		if strings.EqualFold(arg, "ACK") {
-			a.logf("Error: ACK must be only argument with the SETTINGS command")
-			return nil
-		}
-		eq := strings.Index(arg, "=")
-		if eq == -1 {
-			a.logf("Error: invalid argument %q (expected SETTING_NAME=nnnn)", arg)
-			return nil
-		}
-		sid, ok := settingByName(arg[:eq])
-		if !ok {
-			a.logf("Error: unknown setting name %q", arg[:eq])
-			return nil
-		}
-		val, err := strconv.ParseUint(arg[eq+1:], 10, 32)
-		if err != nil {
-			a.logf("Error: invalid argument %q (expected SETTING_NAME=nnnn)", arg)
-			return nil
-		}
-		settings = append(settings, http2.Setting{
-			ID:  sid,
-			Val: uint32(val),
-		})
-	}
-	a.logf("Sending: %v", settings)
-	return a.framer.WriteSettings(settings...)
-}
-
-func settingByName(name string) (http2.SettingID, bool) {
-	for _, sid := range [...]http2.SettingID{
-		http2.SettingHeaderTableSize,
-		http2.SettingEnablePush,
-		http2.SettingMaxConcurrentStreams,
-		http2.SettingInitialWindowSize,
-		http2.SettingMaxFrameSize,
-		http2.SettingMaxHeaderListSize,
-	} {
-		if strings.EqualFold(sid.String(), name) {
-			return sid, true
-		}
-	}
-	return 0, false
-}
-
-func (app *h2i) cmdPing(args []string) error {
-	if len(args) > 1 {
-		app.logf("invalid PING usage: only accepts 0 or 1 args")
-		return nil // nil means don't end the program
-	}
-	var data [8]byte
-	if len(args) == 1 {
-		copy(data[:], args[0])
-	} else {
-		copy(data[:], "h2i_ping")
-	}
-	return app.framer.WritePing(false, data)
-}
-
-func (app *h2i) cmdHeaders(args []string) error {
-	if len(args) > 0 {
-		app.logf("Error: HEADERS doesn't yet take arguments.")
-		// TODO: flags for restricting window size, to force CONTINUATION
-		// frames.
-		return nil
-	}
-	var h1req bytes.Buffer
-	app.term.SetPrompt("(as HTTP/1.1)> ")
-	defer app.term.SetPrompt("h2i> ")
-	for {
-		line, err := app.term.ReadLine()
-		if err != nil {
-			return err
-		}
-		h1req.WriteString(line)
-		h1req.WriteString("\r\n")
-		if line == "" {
-			break
-		}
-	}
-	req, err := http.ReadRequest(bufio.NewReader(&h1req))
-	if err != nil {
-		app.logf("Invalid HTTP/1.1 request: %v", err)
-		return nil
-	}
-	if app.streamID == 0 {
-		app.streamID = 1
-	} else {
-		app.streamID += 2
-	}
-	app.logf("Opening Stream-ID %d:", app.streamID)
-	hbf := app.encodeHeaders(req)
-	if len(hbf) > 16<<10 {
-		app.logf("TODO: h2i doesn't yet write CONTINUATION frames. Copy it from transport.go")
-		return nil
-	}
-	return app.framer.WriteHeaders(http2.HeadersFrameParam{
-		StreamID:      app.streamID,
-		BlockFragment: hbf,
-		EndStream:     req.Method == "GET" || req.Method == "HEAD", // good enough for now
-		EndHeaders:    true,                                        // for now
-	})
-}
-
-func (app *h2i) readFrames() error {
-	for {
-		f, err := app.framer.ReadFrame()
-		if err != nil {
-			return fmt.Errorf("ReadFrame: %v", err)
-		}
-		app.logf("%v", f)
-		switch f := f.(type) {
-		case *http2.PingFrame:
-			app.logf("  Data = %q", f.Data)
-		case *http2.SettingsFrame:
-			f.ForeachSetting(func(s http2.Setting) error {
-				app.logf("  %v", s)
-				app.peerSetting[s.ID] = s.Val
-				return nil
-			})
-		case *http2.WindowUpdateFrame:
-			app.logf("  Window-Increment = %v\n", f.Increment)
-		case *http2.GoAwayFrame:
-			app.logf("  Last-Stream-ID = %d; Error-Code = %v (%d)\n", f.LastStreamID, f.ErrCode, f.ErrCode)
-		case *http2.DataFrame:
-			app.logf("  %q", f.Data())
-		case *http2.HeadersFrame:
-			if f.HasPriority() {
-				app.logf("  PRIORITY = %v", f.Priority)
-			}
-			if app.hdec == nil {
-				// TODO: if the user uses h2i to send a SETTINGS frame advertising
-				// something larger, we'll need to respect SETTINGS_HEADER_TABLE_SIZE
-				// and stuff here instead of using the 4k default. But for now:
-				tableSize := uint32(4 << 10)
-				app.hdec = hpack.NewDecoder(tableSize, app.onNewHeaderField)
-			}
-			app.hdec.Write(f.HeaderBlockFragment())
-		}
-	}
-}
-
-// called from readLoop
-func (app *h2i) onNewHeaderField(f hpack.HeaderField) {
-	if f.Sensitive {
-		app.logf("  %s = %q (SENSITIVE)", f.Name, f.Value)
-	}
-	app.logf("  %s = %q", f.Name, f.Value)
-}
-
-func (app *h2i) encodeHeaders(req *http.Request) []byte {
-	app.hbuf.Reset()
-
-	// TODO(bradfitz): figure out :authority-vs-Host stuff between http2 and Go
-	host := req.Host
-	if host == "" {
-		host = req.URL.Host
-	}
-
-	path := req.URL.Path
-	if path == "" {
-		path = "/"
-	}
-
-	app.writeHeader(":authority", host) // probably not right for all sites
-	app.writeHeader(":method", req.Method)
-	app.writeHeader(":path", path)
-	app.writeHeader(":scheme", "https")
-
-	for k, vv := range req.Header {
-		lowKey := strings.ToLower(k)
-		if lowKey == "host" {
-			continue
-		}
-		for _, v := range vv {
-			app.writeHeader(lowKey, v)
-		}
-	}
-	return app.hbuf.Bytes()
-}
-
-func (app *h2i) writeHeader(name, value string) {
-	app.henc.WriteField(hpack.HeaderField{Name: name, Value: value})
-	app.logf(" %s = %s", name, value)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/headermap.go b/Godeps/_workspace/src/golang.org/x/net/http2/headermap.go
deleted file mode 100644
index 67c7c48357..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/headermap.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package http2
-
-import (
-	"net/http"
-	"strings"
-)
-
-var (
-	commonLowerHeader = map[string]string{} // Go-Canonical-Case -> lower-case
-	commonCanonHeader = map[string]string{} // lower-case -> Go-Canonical-Case
-)
-
-func init() {
-	for _, v := range []string{
-		"accept",
-		"accept-charset",
-		"accept-encoding",
-		"accept-language",
-		"accept-ranges",
-		"age",
-		"access-control-allow-origin",
-		"allow",
-		"authorization",
-		"cache-control",
-		"content-disposition",
-		"content-encoding",
-		"content-language",
-		"content-length",
-		"content-location",
-		"content-range",
-		"content-type",
-		"cookie",
-		"date",
-		"etag",
-		"expect",
-		"expires",
-		"from",
-		"host",
-		"if-match",
-		"if-modified-since",
-		"if-none-match",
-		"if-unmodified-since",
-		"last-modified",
-		"link",
-		"location",
-		"max-forwards",
-		"proxy-authenticate",
-		"proxy-authorization",
-		"range",
-		"referer",
-		"refresh",
-		"retry-after",
-		"server",
-		"set-cookie",
-		"strict-transport-security",
-		"transfer-encoding",
-		"user-agent",
-		"vary",
-		"via",
-		"www-authenticate",
-	} {
-		chk := http.CanonicalHeaderKey(v)
-		commonLowerHeader[chk] = v
-		commonCanonHeader[v] = chk
-	}
-}
-
-func lowerHeader(v string) string {
-	if s, ok := commonLowerHeader[v]; ok {
-		return s
-	}
-	return strings.ToLower(v)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/encode.go b/Godeps/_workspace/src/golang.org/x/net/http2/hpack/encode.go
deleted file mode 100644
index 19bd9f4fcb..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/encode.go
+++ /dev/null
@@ -1,252 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package hpack
-
-import (
-	"io"
-)
-
-const (
-	uint32Max              = ^uint32(0)
-	initialHeaderTableSize = 4096
-)
-
-type Encoder struct {
-	dynTab dynamicTable
-	// minSize is the minimum table size set by
-	// SetMaxDynamicTableSize after the previous Header Table Size
-	// Update.
-	minSize uint32
-	// maxSizeLimit is the maximum table size this encoder
-	// supports. This will protect the encoder from too large
-	// size.
-	maxSizeLimit uint32
-	// tableSizeUpdate indicates whether "Header Table Size
-	// Update" is required.
-	tableSizeUpdate bool
-	w               io.Writer
-	buf             []byte
-}
-
-// NewEncoder returns a new Encoder which performs HPACK encoding. An
-// encoded data is written to w.
-func NewEncoder(w io.Writer) *Encoder {
-	e := &Encoder{
-		minSize:         uint32Max,
-		maxSizeLimit:    initialHeaderTableSize,
-		tableSizeUpdate: false,
-		w:               w,
-	}
-	e.dynTab.setMaxSize(initialHeaderTableSize)
-	return e
-}
-
-// WriteField encodes f into a single Write to e's underlying Writer.
-// This function may also produce bytes for "Header Table Size Update"
-// if necessary.  If produced, it is done before encoding f.
-func (e *Encoder) WriteField(f HeaderField) error {
-	e.buf = e.buf[:0]
-
-	if e.tableSizeUpdate {
-		e.tableSizeUpdate = false
-		if e.minSize < e.dynTab.maxSize {
-			e.buf = appendTableSize(e.buf, e.minSize)
-		}
-		e.minSize = uint32Max
-		e.buf = appendTableSize(e.buf, e.dynTab.maxSize)
-	}
-
-	idx, nameValueMatch := e.searchTable(f)
-	if nameValueMatch {
-		e.buf = appendIndexed(e.buf, idx)
-	} else {
-		indexing := e.shouldIndex(f)
-		if indexing {
-			e.dynTab.add(f)
-		}
-
-		if idx == 0 {
-			e.buf = appendNewName(e.buf, f, indexing)
-		} else {
-			e.buf = appendIndexedName(e.buf, f, idx, indexing)
-		}
-	}
-	n, err := e.w.Write(e.buf)
-	if err == nil && n != len(e.buf) {
-		err = io.ErrShortWrite
-	}
-	return err
-}
-
-// searchTable searches f in both stable and dynamic header tables.
-// The static header table is searched first. Only when there is no
-// exact match for both name and value, the dynamic header table is
-// then searched. If there is no match, i is 0. If both name and value
-// match, i is the matched index and nameValueMatch becomes true. If
-// only name matches, i points to that index and nameValueMatch
-// becomes false.
-func (e *Encoder) searchTable(f HeaderField) (i uint64, nameValueMatch bool) {
-	for idx, hf := range staticTable {
-		if !constantTimeStringCompare(hf.Name, f.Name) {
-			continue
-		}
-		if i == 0 {
-			i = uint64(idx + 1)
-		}
-		if f.Sensitive {
-			continue
-		}
-		if !constantTimeStringCompare(hf.Value, f.Value) {
-			continue
-		}
-		i = uint64(idx + 1)
-		nameValueMatch = true
-		return
-	}
-
-	j, nameValueMatch := e.dynTab.search(f)
-	if nameValueMatch || (i == 0 && j != 0) {
-		i = j + uint64(len(staticTable))
-	}
-	return
-}
-
-// SetMaxDynamicTableSize changes the dynamic header table size to v.
-// The actual size is bounded by the value passed to
-// SetMaxDynamicTableSizeLimit.
-func (e *Encoder) SetMaxDynamicTableSize(v uint32) {
-	if v > e.maxSizeLimit {
-		v = e.maxSizeLimit
-	}
-	if v < e.minSize {
-		e.minSize = v
-	}
-	e.tableSizeUpdate = true
-	e.dynTab.setMaxSize(v)
-}
-
-// SetMaxDynamicTableSizeLimit changes the maximum value that can be
-// specified in SetMaxDynamicTableSize to v. By default, it is set to
-// 4096, which is the same size of the default dynamic header table
-// size described in HPACK specification. If the current maximum
-// dynamic header table size is strictly greater than v, "Header Table
-// Size Update" will be done in the next WriteField call and the
-// maximum dynamic header table size is truncated to v.
-func (e *Encoder) SetMaxDynamicTableSizeLimit(v uint32) {
-	e.maxSizeLimit = v
-	if e.dynTab.maxSize > v {
-		e.tableSizeUpdate = true
-		e.dynTab.setMaxSize(v)
-	}
-}
-
-// shouldIndex reports whether f should be indexed.
-func (e *Encoder) shouldIndex(f HeaderField) bool {
-	return !f.Sensitive && f.size() <= e.dynTab.maxSize
-}
-
-// appendIndexed appends index i, as encoded in "Indexed Header Field"
-// representation, to dst and returns the extended buffer.
-func appendIndexed(dst []byte, i uint64) []byte {
-	first := len(dst)
-	dst = appendVarInt(dst, 7, i)
-	dst[first] |= 0x80
-	return dst
-}
-
-// appendNewName appends f, as encoded in one of "Literal Header field
-// - New Name" representation variants, to dst and returns the
-// extended buffer.
-//
-// If f.Sensitive is true, "Never Indexed" representation is used. If
-// f.Sensitive is false and indexing is true, "Inremental Indexing"
-// representation is used.
-func appendNewName(dst []byte, f HeaderField, indexing bool) []byte {
-	dst = append(dst, encodeTypeByte(indexing, f.Sensitive))
-	dst = appendHpackString(dst, f.Name)
-	return appendHpackString(dst, f.Value)
-}
-
-// appendIndexedName appends f and index i referring indexed name
-// entry, as encoded in one of "Literal Header field - Indexed Name"
-// representation variants, to dst and returns the extended buffer.
-//
-// If f.Sensitive is true, "Never Indexed" representation is used. If
-// f.Sensitive is false and indexing is true, "Incremental Indexing"
-// representation is used.
-func appendIndexedName(dst []byte, f HeaderField, i uint64, indexing bool) []byte {
-	first := len(dst)
-	var n byte
-	if indexing {
-		n = 6
-	} else {
-		n = 4
-	}
-	dst = appendVarInt(dst, n, i)
-	dst[first] |= encodeTypeByte(indexing, f.Sensitive)
-	return appendHpackString(dst, f.Value)
-}
-
-// appendTableSize appends v, as encoded in "Header Table Size Update"
-// representation, to dst and returns the extended buffer.
-func appendTableSize(dst []byte, v uint32) []byte {
-	first := len(dst)
-	dst = appendVarInt(dst, 5, uint64(v))
-	dst[first] |= 0x20
-	return dst
-}
-
-// appendVarInt appends i, as encoded in variable integer form using n
-// bit prefix, to dst and returns the extended buffer.
-//
-// See
-// http://http2.github.io/http2-spec/compression.html#integer.representation
-func appendVarInt(dst []byte, n byte, i uint64) []byte {
-	k := uint64((1 << n) - 1)
-	if i < k {
-		return append(dst, byte(i))
-	}
-	dst = append(dst, byte(k))
-	i -= k
-	for ; i >= 128; i >>= 7 {
-		dst = append(dst, byte(0x80|(i&0x7f)))
-	}
-	return append(dst, byte(i))
-}
-
-// appendHpackString appends s, as encoded in "String Literal"
-// representation, to dst and returns the the extended buffer.
-//
-// s will be encoded in Huffman codes only when it produces strictly
-// shorter byte string.
-func appendHpackString(dst []byte, s string) []byte {
-	huffmanLength := HuffmanEncodeLength(s)
-	if huffmanLength < uint64(len(s)) {
-		first := len(dst)
-		dst = appendVarInt(dst, 7, huffmanLength)
-		dst = AppendHuffmanString(dst, s)
-		dst[first] |= 0x80
-	} else {
-		dst = appendVarInt(dst, 7, uint64(len(s)))
-		dst = append(dst, s...)
-	}
-	return dst
-}
-
-// encodeTypeByte returns type byte. If sensitive is true, type byte
-// for "Never Indexed" representation is returned. If sensitive is
-// false and indexing is true, type byte for "Incremental Indexing"
-// representation is returned. Otherwise, type byte for "Without
-// Indexing" is returned.
-func encodeTypeByte(indexing, sensitive bool) byte {
-	if sensitive {
-		return 0x10
-	}
-	if indexing {
-		return 0x40
-	}
-	return 0
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/hpack.go b/Godeps/_workspace/src/golang.org/x/net/http2/hpack/hpack.go
deleted file mode 100644
index c9e36f7427..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/hpack.go
+++ /dev/null
@@ -1,445 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-// Package hpack implements HPACK, a compression format for
-// efficiently representing HTTP header fields in the context of HTTP/2.
-//
-// See http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-09
-package hpack
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-)
-
-// A DecodingError is something the spec defines as a decoding error.
-type DecodingError struct {
-	Err error
-}
-
-func (de DecodingError) Error() string {
-	return fmt.Sprintf("decoding error: %v", de.Err)
-}
-
-// An InvalidIndexError is returned when an encoder references a table
-// entry before the static table or after the end of the dynamic table.
-type InvalidIndexError int
-
-func (e InvalidIndexError) Error() string {
-	return fmt.Sprintf("invalid indexed representation index %d", int(e))
-}
-
-// A HeaderField is a name-value pair. Both the name and value are
-// treated as opaque sequences of octets.
-type HeaderField struct {
-	Name, Value string
-
-	// Sensitive means that this header field should never be
-	// indexed.
-	Sensitive bool
-}
-
-func (hf *HeaderField) size() uint32 {
-	// http://http2.github.io/http2-spec/compression.html#rfc.section.4.1
-	// "The size of the dynamic table is the sum of the size of
-	// its entries.  The size of an entry is the sum of its name's
-	// length in octets (as defined in Section 5.2), its value's
-	// length in octets (see Section 5.2), plus 32.  The size of
-	// an entry is calculated using the length of the name and
-	// value without any Huffman encoding applied."
-
-	// This can overflow if somebody makes a large HeaderField
-	// Name and/or Value by hand, but we don't care, because that
-	// won't happen on the wire because the encoding doesn't allow
-	// it.
-	return uint32(len(hf.Name) + len(hf.Value) + 32)
-}
-
-// A Decoder is the decoding context for incremental processing of
-// header blocks.
-type Decoder struct {
-	dynTab dynamicTable
-	emit   func(f HeaderField)
-
-	// buf is the unparsed buffer. It's only written to
-	// saveBuf if it was truncated in the middle of a header
-	// block. Because it's usually not owned, we can only
-	// process it under Write.
-	buf     []byte // usually not owned
-	saveBuf bytes.Buffer
-}
-
-func NewDecoder(maxSize uint32, emitFunc func(f HeaderField)) *Decoder {
-	d := &Decoder{
-		emit: emitFunc,
-	}
-	d.dynTab.allowedMaxSize = maxSize
-	d.dynTab.setMaxSize(maxSize)
-	return d
-}
-
-// TODO: add method *Decoder.Reset(maxSize, emitFunc) to let callers re-use Decoders and their
-// underlying buffers for garbage reasons.
-
-func (d *Decoder) SetMaxDynamicTableSize(v uint32) {
-	d.dynTab.setMaxSize(v)
-}
-
-// SetAllowedMaxDynamicTableSize sets the upper bound that the encoded
-// stream (via dynamic table size updates) may set the maximum size
-// to.
-func (d *Decoder) SetAllowedMaxDynamicTableSize(v uint32) {
-	d.dynTab.allowedMaxSize = v
-}
-
-type dynamicTable struct {
-	// ents is the FIFO described at
-	// http://http2.github.io/http2-spec/compression.html#rfc.section.2.3.2
-	// The newest (low index) is append at the end, and items are
-	// evicted from the front.
-	ents           []HeaderField
-	size           uint32
-	maxSize        uint32 // current maxSize
-	allowedMaxSize uint32 // maxSize may go up to this, inclusive
-}
-
-func (dt *dynamicTable) setMaxSize(v uint32) {
-	dt.maxSize = v
-	dt.evict()
-}
-
-// TODO: change dynamicTable to be a struct with a slice and a size int field,
-// per http://http2.github.io/http2-spec/compression.html#rfc.section.4.1:
-//
-//
-// Then make add increment the size. maybe the max size should move from Decoder to
-// dynamicTable and add should return an ok bool if there was enough space.
-//
-// Later we'll need a remove operation on dynamicTable.
-
-func (dt *dynamicTable) add(f HeaderField) {
-	dt.ents = append(dt.ents, f)
-	dt.size += f.size()
-	dt.evict()
-}
-
-// If we're too big, evict old stuff (front of the slice)
-func (dt *dynamicTable) evict() {
-	base := dt.ents // keep base pointer of slice
-	for dt.size > dt.maxSize {
-		dt.size -= dt.ents[0].size()
-		dt.ents = dt.ents[1:]
-	}
-
-	// Shift slice contents down if we evicted things.
-	if len(dt.ents) != len(base) {
-		copy(base, dt.ents)
-		dt.ents = base[:len(dt.ents)]
-	}
-}
-
-// constantTimeStringCompare compares string a and b in a constant
-// time manner.
-func constantTimeStringCompare(a, b string) bool {
-	if len(a) != len(b) {
-		return false
-	}
-
-	c := byte(0)
-
-	for i := 0; i < len(a); i++ {
-		c |= a[i] ^ b[i]
-	}
-
-	return c == 0
-}
-
-// Search searches f in the table. The return value i is 0 if there is
-// no name match. If there is name match or name/value match, i is the
-// index of that entry (1-based). If both name and value match,
-// nameValueMatch becomes true.
-func (dt *dynamicTable) search(f HeaderField) (i uint64, nameValueMatch bool) {
-	l := len(dt.ents)
-	for j := l - 1; j >= 0; j-- {
-		ent := dt.ents[j]
-		if !constantTimeStringCompare(ent.Name, f.Name) {
-			continue
-		}
-		if i == 0 {
-			i = uint64(l - j)
-		}
-		if f.Sensitive {
-			continue
-		}
-		if !constantTimeStringCompare(ent.Value, f.Value) {
-			continue
-		}
-		i = uint64(l - j)
-		nameValueMatch = true
-		return
-	}
-	return
-}
-
-func (d *Decoder) maxTableIndex() int {
-	return len(d.dynTab.ents) + len(staticTable)
-}
-
-func (d *Decoder) at(i uint64) (hf HeaderField, ok bool) {
-	if i < 1 {
-		return
-	}
-	if i > uint64(d.maxTableIndex()) {
-		return
-	}
-	if i <= uint64(len(staticTable)) {
-		return staticTable[i-1], true
-	}
-	dents := d.dynTab.ents
-	return dents[len(dents)-(int(i)-len(staticTable))], true
-}
-
-// Decode decodes an entire block.
-//
-// TODO: remove this method and make it incremental later? This is
-// easier for debugging now.
-func (d *Decoder) DecodeFull(p []byte) ([]HeaderField, error) {
-	var hf []HeaderField
-	saveFunc := d.emit
-	defer func() { d.emit = saveFunc }()
-	d.emit = func(f HeaderField) { hf = append(hf, f) }
-	if _, err := d.Write(p); err != nil {
-		return nil, err
-	}
-	if err := d.Close(); err != nil {
-		return nil, err
-	}
-	return hf, nil
-}
-
-func (d *Decoder) Close() error {
-	if d.saveBuf.Len() > 0 {
-		d.saveBuf.Reset()
-		return DecodingError{errors.New("truncated headers")}
-	}
-	return nil
-}
-
-func (d *Decoder) Write(p []byte) (n int, err error) {
-	if len(p) == 0 {
-		// Prevent state machine CPU attacks (making us redo
-		// work up to the point of finding out we don't have
-		// enough data)
-		return
-	}
-	// Only copy the data if we have to. Optimistically assume
-	// that p will contain a complete header block.
-	if d.saveBuf.Len() == 0 {
-		d.buf = p
-	} else {
-		d.saveBuf.Write(p)
-		d.buf = d.saveBuf.Bytes()
-		d.saveBuf.Reset()
-	}
-
-	for len(d.buf) > 0 {
-		err = d.parseHeaderFieldRepr()
-		if err != nil {
-			if err == errNeedMore {
-				err = nil
-				d.saveBuf.Write(d.buf)
-			}
-			break
-		}
-	}
-
-	return len(p), err
-}
-
-// errNeedMore is an internal sentinel error value that means the
-// buffer is truncated and we need to read more data before we can
-// continue parsing.
-var errNeedMore = errors.New("need more data")
-
-type indexType int
-
-const (
-	indexedTrue indexType = iota
-	indexedFalse
-	indexedNever
-)
-
-func (v indexType) indexed() bool   { return v == indexedTrue }
-func (v indexType) sensitive() bool { return v == indexedNever }
-
-// returns errNeedMore if there isn't enough data available.
-// any other error is fatal.
-// consumes d.buf iff it returns nil.
-// precondition: must be called with len(d.buf) > 0
-func (d *Decoder) parseHeaderFieldRepr() error {
-	b := d.buf[0]
-	switch {
-	case b&128 != 0:
-		// Indexed representation.
-		// High bit set?
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.1
-		return d.parseFieldIndexed()
-	case b&192 == 64:
-		// 6.2.1 Literal Header Field with Incremental Indexing
-		// 0b10xxxxxx: top two bits are 10
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.1
-		return d.parseFieldLiteral(6, indexedTrue)
-	case b&240 == 0:
-		// 6.2.2 Literal Header Field without Indexing
-		// 0b0000xxxx: top four bits are 0000
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.2
-		return d.parseFieldLiteral(4, indexedFalse)
-	case b&240 == 16:
-		// 6.2.3 Literal Header Field never Indexed
-		// 0b0001xxxx: top four bits are 0001
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.3
-		return d.parseFieldLiteral(4, indexedNever)
-	case b&224 == 32:
-		// 6.3 Dynamic Table Size Update
-		// Top three bits are '001'.
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.3
-		return d.parseDynamicTableSizeUpdate()
-	}
-
-	return DecodingError{errors.New("invalid encoding")}
-}
-
-// (same invariants and behavior as parseHeaderFieldRepr)
-func (d *Decoder) parseFieldIndexed() error {
-	buf := d.buf
-	idx, buf, err := readVarInt(7, buf)
-	if err != nil {
-		return err
-	}
-	hf, ok := d.at(idx)
-	if !ok {
-		return DecodingError{InvalidIndexError(idx)}
-	}
-	d.emit(HeaderField{Name: hf.Name, Value: hf.Value})
-	d.buf = buf
-	return nil
-}
-
-// (same invariants and behavior as parseHeaderFieldRepr)
-func (d *Decoder) parseFieldLiteral(n uint8, it indexType) error {
-	buf := d.buf
-	nameIdx, buf, err := readVarInt(n, buf)
-	if err != nil {
-		return err
-	}
-
-	var hf HeaderField
-	if nameIdx > 0 {
-		ihf, ok := d.at(nameIdx)
-		if !ok {
-			return DecodingError{InvalidIndexError(nameIdx)}
-		}
-		hf.Name = ihf.Name
-	} else {
-		hf.Name, buf, err = readString(buf)
-		if err != nil {
-			return err
-		}
-	}
-	hf.Value, buf, err = readString(buf)
-	if err != nil {
-		return err
-	}
-	d.buf = buf
-	if it.indexed() {
-		d.dynTab.add(hf)
-	}
-	hf.Sensitive = it.sensitive()
-	d.emit(hf)
-	return nil
-}
-
-// (same invariants and behavior as parseHeaderFieldRepr)
-func (d *Decoder) parseDynamicTableSizeUpdate() error {
-	buf := d.buf
-	size, buf, err := readVarInt(5, buf)
-	if err != nil {
-		return err
-	}
-	if size > uint64(d.dynTab.allowedMaxSize) {
-		return DecodingError{errors.New("dynamic table size update too large")}
-	}
-	d.dynTab.setMaxSize(uint32(size))
-	d.buf = buf
-	return nil
-}
-
-var errVarintOverflow = DecodingError{errors.New("varint integer overflow")}
-
-// readVarInt reads an unsigned variable length integer off the
-// beginning of p. n is the parameter as described in
-// http://http2.github.io/http2-spec/compression.html#rfc.section.5.1.
-//
-// n must always be between 1 and 8.
-//
-// The returned remain buffer is either a smaller suffix of p, or err != nil.
-// The error is errNeedMore if p doesn't contain a complete integer.
-func readVarInt(n byte, p []byte) (i uint64, remain []byte, err error) {
-	if n < 1 || n > 8 {
-		panic("bad n")
-	}
-	if len(p) == 0 {
-		return 0, p, errNeedMore
-	}
-	i = uint64(p[0])
-	if n < 8 {
-		i &= (1 << uint64(n)) - 1
-	}
-	if i < (1<<uint64(n))-1 {
-		return i, p[1:], nil
-	}
-
-	origP := p
-	p = p[1:]
-	var m uint64
-	for len(p) > 0 {
-		b := p[0]
-		p = p[1:]
-		i += uint64(b&127) << m
-		if b&128 == 0 {
-			return i, p, nil
-		}
-		m += 7
-		if m >= 63 { // TODO: proper overflow check. making this up.
-			return 0, origP, errVarintOverflow
-		}
-	}
-	return 0, origP, errNeedMore
-}
-
-func readString(p []byte) (s string, remain []byte, err error) {
-	if len(p) == 0 {
-		return "", p, errNeedMore
-	}
-	isHuff := p[0]&128 != 0
-	strLen, p, err := readVarInt(7, p)
-	if err != nil {
-		return "", p, err
-	}
-	if uint64(len(p)) < strLen {
-		return "", p, errNeedMore
-	}
-	if !isHuff {
-		return string(p[:strLen]), p[strLen:], nil
-	}
-
-	// TODO: optimize this garbage:
-	var buf bytes.Buffer
-	if _, err := HuffmanDecode(&buf, p[:strLen]); err != nil {
-		return "", nil, err
-	}
-	return buf.String(), p[strLen:], nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/huffman.go b/Godeps/_workspace/src/golang.org/x/net/http2/hpack/huffman.go
deleted file mode 100644
index 9fe76f68ee..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/huffman.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package hpack
-
-import (
-	"bytes"
-	"io"
-	"sync"
-)
-
-var bufPool = sync.Pool{
-	New: func() interface{} { return new(bytes.Buffer) },
-}
-
-// HuffmanDecode decodes the string in v and writes the expanded
-// result to w, returning the number of bytes written to w and the
-// Write call's return value. At most one Write call is made.
-func HuffmanDecode(w io.Writer, v []byte) (int, error) {
-	buf := bufPool.Get().(*bytes.Buffer)
-	buf.Reset()
-	defer bufPool.Put(buf)
-
-	n := rootHuffmanNode
-	cur, nbits := uint(0), uint8(0)
-	for _, b := range v {
-		cur = cur<<8 | uint(b)
-		nbits += 8
-		for nbits >= 8 {
-			n = n.children[byte(cur>>(nbits-8))]
-			if n.children == nil {
-				buf.WriteByte(n.sym)
-				nbits -= n.codeLen
-				n = rootHuffmanNode
-			} else {
-				nbits -= 8
-			}
-		}
-	}
-	for nbits > 0 {
-		n = n.children[byte(cur<<(8-nbits))]
-		if n.children != nil || n.codeLen > nbits {
-			break
-		}
-		buf.WriteByte(n.sym)
-		nbits -= n.codeLen
-		n = rootHuffmanNode
-	}
-	return w.Write(buf.Bytes())
-}
-
-type node struct {
-	// children is non-nil for internal nodes
-	children []*node
-
-	// The following are only valid if children is nil:
-	codeLen uint8 // number of bits that led to the output of sym
-	sym     byte  // output symbol
-}
-
-func newInternalNode() *node {
-	return &node{children: make([]*node, 256)}
-}
-
-var rootHuffmanNode = newInternalNode()
-
-func init() {
-	for i, code := range huffmanCodes {
-		if i > 255 {
-			panic("too many huffman codes")
-		}
-		addDecoderNode(byte(i), code, huffmanCodeLen[i])
-	}
-}
-
-func addDecoderNode(sym byte, code uint32, codeLen uint8) {
-	cur := rootHuffmanNode
-	for codeLen > 8 {
-		codeLen -= 8
-		i := uint8(code >> codeLen)
-		if cur.children[i] == nil {
-			cur.children[i] = newInternalNode()
-		}
-		cur = cur.children[i]
-	}
-	shift := 8 - codeLen
-	start, end := int(uint8(code<<shift)), int(1<<shift)
-	for i := start; i < start+end; i++ {
-		cur.children[i] = &node{sym: sym, codeLen: codeLen}
-	}
-}
-
-// AppendHuffmanString appends s, as encoded in Huffman codes, to dst
-// and returns the extended buffer.
-func AppendHuffmanString(dst []byte, s string) []byte {
-	rembits := uint8(8)
-
-	for i := 0; i < len(s); i++ {
-		if rembits == 8 {
-			dst = append(dst, 0)
-		}
-		dst, rembits = appendByteToHuffmanCode(dst, rembits, s[i])
-	}
-
-	if rembits < 8 {
-		// special EOS symbol
-		code := uint32(0x3fffffff)
-		nbits := uint8(30)
-
-		t := uint8(code >> (nbits - rembits))
-		dst[len(dst)-1] |= t
-	}
-
-	return dst
-}
-
-// HuffmanEncodeLength returns the number of bytes required to encode
-// s in Huffman codes. The result is round up to byte boundary.
-func HuffmanEncodeLength(s string) uint64 {
-	n := uint64(0)
-	for i := 0; i < len(s); i++ {
-		n += uint64(huffmanCodeLen[s[i]])
-	}
-	return (n + 7) / 8
-}
-
-// appendByteToHuffmanCode appends Huffman code for c to dst and
-// returns the extended buffer and the remaining bits in the last
-// element. The appending is not byte aligned and the remaining bits
-// in the last element of dst is given in rembits.
-func appendByteToHuffmanCode(dst []byte, rembits uint8, c byte) ([]byte, uint8) {
-	code := huffmanCodes[c]
-	nbits := huffmanCodeLen[c]
-
-	for {
-		if rembits > nbits {
-			t := uint8(code << (rembits - nbits))
-			dst[len(dst)-1] |= t
-			rembits -= nbits
-			break
-		}
-
-		t := uint8(code >> (nbits - rembits))
-		dst[len(dst)-1] |= t
-
-		nbits -= rembits
-		rembits = 8
-
-		if nbits == 0 {
-			break
-		}
-
-		dst = append(dst, 0)
-	}
-
-	return dst, rembits
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/tables.go b/Godeps/_workspace/src/golang.org/x/net/http2/hpack/tables.go
deleted file mode 100644
index f898e25126..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/hpack/tables.go
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package hpack
-
-func pair(name, value string) HeaderField {
-	return HeaderField{Name: name, Value: value}
-}
-
-// http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-07#appendix-B
-var staticTable = []HeaderField{
-	pair(":authority", ""), // index 1 (1-based)
-	pair(":method", "GET"),
-	pair(":method", "POST"),
-	pair(":path", "/"),
-	pair(":path", "/index.html"),
-	pair(":scheme", "http"),
-	pair(":scheme", "https"),
-	pair(":status", "200"),
-	pair(":status", "204"),
-	pair(":status", "206"),
-	pair(":status", "304"),
-	pair(":status", "400"),
-	pair(":status", "404"),
-	pair(":status", "500"),
-	pair("accept-charset", ""),
-	pair("accept-encoding", "gzip, deflate"),
-	pair("accept-language", ""),
-	pair("accept-ranges", ""),
-	pair("accept", ""),
-	pair("access-control-allow-origin", ""),
-	pair("age", ""),
-	pair("allow", ""),
-	pair("authorization", ""),
-	pair("cache-control", ""),
-	pair("content-disposition", ""),
-	pair("content-encoding", ""),
-	pair("content-language", ""),
-	pair("content-length", ""),
-	pair("content-location", ""),
-	pair("content-range", ""),
-	pair("content-type", ""),
-	pair("cookie", ""),
-	pair("date", ""),
-	pair("etag", ""),
-	pair("expect", ""),
-	pair("expires", ""),
-	pair("from", ""),
-	pair("host", ""),
-	pair("if-match", ""),
-	pair("if-modified-since", ""),
-	pair("if-none-match", ""),
-	pair("if-range", ""),
-	pair("if-unmodified-since", ""),
-	pair("last-modified", ""),
-	pair("link", ""),
-	pair("location", ""),
-	pair("max-forwards", ""),
-	pair("proxy-authenticate", ""),
-	pair("proxy-authorization", ""),
-	pair("range", ""),
-	pair("referer", ""),
-	pair("refresh", ""),
-	pair("retry-after", ""),
-	pair("server", ""),
-	pair("set-cookie", ""),
-	pair("strict-transport-security", ""),
-	pair("transfer-encoding", ""),
-	pair("user-agent", ""),
-	pair("vary", ""),
-	pair("via", ""),
-	pair("www-authenticate", ""),
-}
-
-var huffmanCodes = []uint32{
-	0x1ff8,
-	0x7fffd8,
-	0xfffffe2,
-	0xfffffe3,
-	0xfffffe4,
-	0xfffffe5,
-	0xfffffe6,
-	0xfffffe7,
-	0xfffffe8,
-	0xffffea,
-	0x3ffffffc,
-	0xfffffe9,
-	0xfffffea,
-	0x3ffffffd,
-	0xfffffeb,
-	0xfffffec,
-	0xfffffed,
-	0xfffffee,
-	0xfffffef,
-	0xffffff0,
-	0xffffff1,
-	0xffffff2,
-	0x3ffffffe,
-	0xffffff3,
-	0xffffff4,
-	0xffffff5,
-	0xffffff6,
-	0xffffff7,
-	0xffffff8,
-	0xffffff9,
-	0xffffffa,
-	0xffffffb,
-	0x14,
-	0x3f8,
-	0x3f9,
-	0xffa,
-	0x1ff9,
-	0x15,
-	0xf8,
-	0x7fa,
-	0x3fa,
-	0x3fb,
-	0xf9,
-	0x7fb,
-	0xfa,
-	0x16,
-	0x17,
-	0x18,
-	0x0,
-	0x1,
-	0x2,
-	0x19,
-	0x1a,
-	0x1b,
-	0x1c,
-	0x1d,
-	0x1e,
-	0x1f,
-	0x5c,
-	0xfb,
-	0x7ffc,
-	0x20,
-	0xffb,
-	0x3fc,
-	0x1ffa,
-	0x21,
-	0x5d,
-	0x5e,
-	0x5f,
-	0x60,
-	0x61,
-	0x62,
-	0x63,
-	0x64,
-	0x65,
-	0x66,
-	0x67,
-	0x68,
-	0x69,
-	0x6a,
-	0x6b,
-	0x6c,
-	0x6d,
-	0x6e,
-	0x6f,
-	0x70,
-	0x71,
-	0x72,
-	0xfc,
-	0x73,
-	0xfd,
-	0x1ffb,
-	0x7fff0,
-	0x1ffc,
-	0x3ffc,
-	0x22,
-	0x7ffd,
-	0x3,
-	0x23,
-	0x4,
-	0x24,
-	0x5,
-	0x25,
-	0x26,
-	0x27,
-	0x6,
-	0x74,
-	0x75,
-	0x28,
-	0x29,
-	0x2a,
-	0x7,
-	0x2b,
-	0x76,
-	0x2c,
-	0x8,
-	0x9,
-	0x2d,
-	0x77,
-	0x78,
-	0x79,
-	0x7a,
-	0x7b,
-	0x7ffe,
-	0x7fc,
-	0x3ffd,
-	0x1ffd,
-	0xffffffc,
-	0xfffe6,
-	0x3fffd2,
-	0xfffe7,
-	0xfffe8,
-	0x3fffd3,
-	0x3fffd4,
-	0x3fffd5,
-	0x7fffd9,
-	0x3fffd6,
-	0x7fffda,
-	0x7fffdb,
-	0x7fffdc,
-	0x7fffdd,
-	0x7fffde,
-	0xffffeb,
-	0x7fffdf,
-	0xffffec,
-	0xffffed,
-	0x3fffd7,
-	0x7fffe0,
-	0xffffee,
-	0x7fffe1,
-	0x7fffe2,
-	0x7fffe3,
-	0x7fffe4,
-	0x1fffdc,
-	0x3fffd8,
-	0x7fffe5,
-	0x3fffd9,
-	0x7fffe6,
-	0x7fffe7,
-	0xffffef,
-	0x3fffda,
-	0x1fffdd,
-	0xfffe9,
-	0x3fffdb,
-	0x3fffdc,
-	0x7fffe8,
-	0x7fffe9,
-	0x1fffde,
-	0x7fffea,
-	0x3fffdd,
-	0x3fffde,
-	0xfffff0,
-	0x1fffdf,
-	0x3fffdf,
-	0x7fffeb,
-	0x7fffec,
-	0x1fffe0,
-	0x1fffe1,
-	0x3fffe0,
-	0x1fffe2,
-	0x7fffed,
-	0x3fffe1,
-	0x7fffee,
-	0x7fffef,
-	0xfffea,
-	0x3fffe2,
-	0x3fffe3,
-	0x3fffe4,
-	0x7ffff0,
-	0x3fffe5,
-	0x3fffe6,
-	0x7ffff1,
-	0x3ffffe0,
-	0x3ffffe1,
-	0xfffeb,
-	0x7fff1,
-	0x3fffe7,
-	0x7ffff2,
-	0x3fffe8,
-	0x1ffffec,
-	0x3ffffe2,
-	0x3ffffe3,
-	0x3ffffe4,
-	0x7ffffde,
-	0x7ffffdf,
-	0x3ffffe5,
-	0xfffff1,
-	0x1ffffed,
-	0x7fff2,
-	0x1fffe3,
-	0x3ffffe6,
-	0x7ffffe0,
-	0x7ffffe1,
-	0x3ffffe7,
-	0x7ffffe2,
-	0xfffff2,
-	0x1fffe4,
-	0x1fffe5,
-	0x3ffffe8,
-	0x3ffffe9,
-	0xffffffd,
-	0x7ffffe3,
-	0x7ffffe4,
-	0x7ffffe5,
-	0xfffec,
-	0xfffff3,
-	0xfffed,
-	0x1fffe6,
-	0x3fffe9,
-	0x1fffe7,
-	0x1fffe8,
-	0x7ffff3,
-	0x3fffea,
-	0x3fffeb,
-	0x1ffffee,
-	0x1ffffef,
-	0xfffff4,
-	0xfffff5,
-	0x3ffffea,
-	0x7ffff4,
-	0x3ffffeb,
-	0x7ffffe6,
-	0x3ffffec,
-	0x3ffffed,
-	0x7ffffe7,
-	0x7ffffe8,
-	0x7ffffe9,
-	0x7ffffea,
-	0x7ffffeb,
-	0xffffffe,
-	0x7ffffec,
-	0x7ffffed,
-	0x7ffffee,
-	0x7ffffef,
-	0x7fffff0,
-	0x3ffffee,
-}
-
-var huffmanCodeLen = []uint8{
-	13, 23, 28, 28, 28, 28, 28, 28, 28, 24, 30, 28, 28, 30, 28, 28,
-	28, 28, 28, 28, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-	6, 10, 10, 12, 13, 6, 8, 11, 10, 10, 8, 11, 8, 6, 6, 6,
-	5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 8, 15, 6, 12, 10,
-	13, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 13, 19, 13, 14, 6,
-	15, 5, 6, 5, 6, 5, 6, 6, 6, 5, 7, 7, 6, 6, 6, 5,
-	6, 7, 6, 5, 5, 6, 7, 7, 7, 7, 7, 15, 11, 14, 13, 28,
-	20, 22, 20, 20, 22, 22, 22, 23, 22, 23, 23, 23, 23, 23, 24, 23,
-	24, 24, 22, 23, 24, 23, 23, 23, 23, 21, 22, 23, 22, 23, 23, 24,
-	22, 21, 20, 22, 22, 23, 23, 21, 23, 22, 22, 24, 21, 22, 23, 23,
-	21, 21, 22, 21, 23, 22, 23, 23, 20, 22, 22, 22, 23, 22, 22, 23,
-	26, 26, 20, 19, 22, 23, 22, 25, 26, 26, 26, 27, 27, 26, 24, 25,
-	19, 21, 26, 27, 27, 26, 27, 24, 21, 21, 26, 26, 28, 27, 27, 27,
-	20, 24, 20, 21, 22, 21, 21, 23, 22, 22, 25, 25, 24, 24, 26, 23,
-	26, 27, 26, 26, 27, 27, 27, 27, 27, 28, 27, 27, 27, 27, 27, 26,
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/http2.go b/Godeps/_workspace/src/golang.org/x/net/http2/http2.go
deleted file mode 100644
index 35f9b26e28..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/http2.go
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-// Package http2 implements the HTTP/2 protocol.
-//
-// This is a work in progress. This package is low-level and intended
-// to be used directly by very few people. Most users will use it
-// indirectly through integration with the net/http package. See
-// ConfigureServer. That ConfigureServer call will likely be automatic
-// or available via an empty import in the future.
-//
-// See http://http2.github.io/
-package http2
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"sync"
-)
-
-var VerboseLogs = false
-
-const (
-	// ClientPreface is the string that must be sent by new
-	// connections from clients.
-	ClientPreface = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
-
-	// SETTINGS_MAX_FRAME_SIZE default
-	// http://http2.github.io/http2-spec/#rfc.section.6.5.2
-	initialMaxFrameSize = 16384
-
-	// NextProtoTLS is the NPN/ALPN protocol negotiated during
-	// HTTP/2's TLS setup.
-	NextProtoTLS = "h2"
-
-	// http://http2.github.io/http2-spec/#SettingValues
-	initialHeaderTableSize = 4096
-
-	initialWindowSize = 65535 // 6.9.2 Initial Flow Control Window Size
-
-	defaultMaxReadFrameSize = 1 << 20
-)
-
-var (
-	clientPreface = []byte(ClientPreface)
-)
-
-type streamState int
-
-const (
-	stateIdle streamState = iota
-	stateOpen
-	stateHalfClosedLocal
-	stateHalfClosedRemote
-	stateResvLocal
-	stateResvRemote
-	stateClosed
-)
-
-var stateName = [...]string{
-	stateIdle:             "Idle",
-	stateOpen:             "Open",
-	stateHalfClosedLocal:  "HalfClosedLocal",
-	stateHalfClosedRemote: "HalfClosedRemote",
-	stateResvLocal:        "ResvLocal",
-	stateResvRemote:       "ResvRemote",
-	stateClosed:           "Closed",
-}
-
-func (st streamState) String() string {
-	return stateName[st]
-}
-
-// Setting is a setting parameter: which setting it is, and its value.
-type Setting struct {
-	// ID is which setting is being set.
-	// See http://http2.github.io/http2-spec/#SettingValues
-	ID SettingID
-
-	// Val is the value.
-	Val uint32
-}
-
-func (s Setting) String() string {
-	return fmt.Sprintf("[%v = %d]", s.ID, s.Val)
-}
-
-// Valid reports whether the setting is valid.
-func (s Setting) Valid() error {
-	// Limits and error codes from 6.5.2 Defined SETTINGS Parameters
-	switch s.ID {
-	case SettingEnablePush:
-		if s.Val != 1 && s.Val != 0 {
-			return ConnectionError(ErrCodeProtocol)
-		}
-	case SettingInitialWindowSize:
-		if s.Val > 1<<31-1 {
-			return ConnectionError(ErrCodeFlowControl)
-		}
-	case SettingMaxFrameSize:
-		if s.Val < 16384 || s.Val > 1<<24-1 {
-			return ConnectionError(ErrCodeProtocol)
-		}
-	}
-	return nil
-}
-
-// A SettingID is an HTTP/2 setting as defined in
-// http://http2.github.io/http2-spec/#iana-settings
-type SettingID uint16
-
-const (
-	SettingHeaderTableSize      SettingID = 0x1
-	SettingEnablePush           SettingID = 0x2
-	SettingMaxConcurrentStreams SettingID = 0x3
-	SettingInitialWindowSize    SettingID = 0x4
-	SettingMaxFrameSize         SettingID = 0x5
-	SettingMaxHeaderListSize    SettingID = 0x6
-)
-
-var settingName = map[SettingID]string{
-	SettingHeaderTableSize:      "HEADER_TABLE_SIZE",
-	SettingEnablePush:           "ENABLE_PUSH",
-	SettingMaxConcurrentStreams: "MAX_CONCURRENT_STREAMS",
-	SettingInitialWindowSize:    "INITIAL_WINDOW_SIZE",
-	SettingMaxFrameSize:         "MAX_FRAME_SIZE",
-	SettingMaxHeaderListSize:    "MAX_HEADER_LIST_SIZE",
-}
-
-func (s SettingID) String() string {
-	if v, ok := settingName[s]; ok {
-		return v
-	}
-	return fmt.Sprintf("UNKNOWN_SETTING_%d", uint16(s))
-}
-
-func validHeader(v string) bool {
-	if len(v) == 0 {
-		return false
-	}
-	for _, r := range v {
-		// "Just as in HTTP/1.x, header field names are
-		// strings of ASCII characters that are compared in a
-		// case-insensitive fashion. However, header field
-		// names MUST be converted to lowercase prior to their
-		// encoding in HTTP/2. "
-		if r >= 127 || ('A' <= r && r <= 'Z') {
-			return false
-		}
-	}
-	return true
-}
-
-var httpCodeStringCommon = map[int]string{} // n -> strconv.Itoa(n)
-
-func init() {
-	for i := 100; i <= 999; i++ {
-		if v := http.StatusText(i); v != "" {
-			httpCodeStringCommon[i] = strconv.Itoa(i)
-		}
-	}
-}
-
-func httpCodeString(code int) string {
-	if s, ok := httpCodeStringCommon[code]; ok {
-		return s
-	}
-	return strconv.Itoa(code)
-}
-
-// from pkg io
-type stringWriter interface {
-	WriteString(s string) (n int, err error)
-}
-
-// A gate lets two goroutines coordinate their activities.
-type gate chan struct{}
-
-func (g gate) Done() { g <- struct{}{} }
-func (g gate) Wait() { <-g }
-
-// A closeWaiter is like a sync.WaitGroup but only goes 1 to 0 (open to closed).
-type closeWaiter chan struct{}
-
-// Init makes a closeWaiter usable.
-// It exists because so a closeWaiter value can be placed inside a
-// larger struct and have the Mutex and Cond's memory in the same
-// allocation.
-func (cw *closeWaiter) Init() {
-	*cw = make(chan struct{})
-}
-
-// Close marks the closeWaiter as closed and unblocks any waiters.
-func (cw closeWaiter) Close() {
-	close(cw)
-}
-
-// Wait waits for the closeWaiter to become closed.
-func (cw closeWaiter) Wait() {
-	<-cw
-}
-
-// bufferedWriter is a buffered writer that writes to w.
-// Its buffered writer is lazily allocated as needed, to minimize
-// idle memory usage with many connections.
-type bufferedWriter struct {
-	w  io.Writer     // immutable
-	bw *bufio.Writer // non-nil when data is buffered
-}
-
-func newBufferedWriter(w io.Writer) *bufferedWriter {
-	return &bufferedWriter{w: w}
-}
-
-var bufWriterPool = sync.Pool{
-	New: func() interface{} {
-		// TODO: pick something better? this is a bit under
-		// (3 x typical 1500 byte MTU) at least.
-		return bufio.NewWriterSize(nil, 4<<10)
-	},
-}
-
-func (w *bufferedWriter) Write(p []byte) (n int, err error) {
-	if w.bw == nil {
-		bw := bufWriterPool.Get().(*bufio.Writer)
-		bw.Reset(w.w)
-		w.bw = bw
-	}
-	return w.bw.Write(p)
-}
-
-func (w *bufferedWriter) Flush() error {
-	bw := w.bw
-	if bw == nil {
-		return nil
-	}
-	err := bw.Flush()
-	bw.Reset(nil)
-	bufWriterPool.Put(bw)
-	w.bw = nil
-	return err
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/pipe.go b/Godeps/_workspace/src/golang.org/x/net/http2/pipe.go
deleted file mode 100644
index ce9aad5336..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/pipe.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2014 The Go Authors.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package http2
-
-import (
-	"sync"
-)
-
-type pipe struct {
-	b buffer
-	c sync.Cond
-	m sync.Mutex
-}
-
-// Read waits until data is available and copies bytes
-// from the buffer into p.
-func (r *pipe) Read(p []byte) (n int, err error) {
-	r.c.L.Lock()
-	defer r.c.L.Unlock()
-	for r.b.Len() == 0 && !r.b.closed {
-		r.c.Wait()
-	}
-	return r.b.Read(p)
-}
-
-// Write copies bytes from p into the buffer and wakes a reader.
-// It is an error to write more data than the buffer can hold.
-func (w *pipe) Write(p []byte) (n int, err error) {
-	w.c.L.Lock()
-	defer w.c.L.Unlock()
-	defer w.c.Signal()
-	return w.b.Write(p)
-}
-
-func (c *pipe) Close(err error) {
-	c.c.L.Lock()
-	defer c.c.L.Unlock()
-	defer c.c.Signal()
-	c.b.Close(err)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/server.go b/Godeps/_workspace/src/golang.org/x/net/http2/server.go
deleted file mode 100644
index 99cc673cc2..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/server.go
+++ /dev/null
@@ -1,1780 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-// TODO: replace all <-sc.doneServing with reads from the stream's cw
-// instead, and make sure that on close we close all open
-// streams. then remove doneServing?
-
-// TODO: finish GOAWAY support. Consider each incoming frame type and
-// whether it should be ignored during a shutdown race.
-
-// TODO: disconnect idle clients. GFE seems to do 4 minutes. make
-// configurable?  or maximum number of idle clients and remove the
-// oldest?
-
-// TODO: turn off the serve goroutine when idle, so
-// an idle conn only has the readFrames goroutine active. (which could
-// also be optimized probably to pin less memory in crypto/tls). This
-// would involve tracking when the serve goroutine is active (atomic
-// int32 read/CAS probably?) and starting it up when frames arrive,
-// and shutting it down when all handlers exit. the occasional PING
-// packets could use time.AfterFunc to call sc.wakeStartServeLoop()
-// (which is a no-op if already running) and then queue the PING write
-// as normal. The serve loop would then exit in most cases (if no
-// Handlers running) and not be woken up again until the PING packet
-// returns.
-
-// TODO (maybe): add a mechanism for Handlers to going into
-// half-closed-local mode (rw.(io.Closer) test?) but not exit their
-// handler, and continue to be able to read from the
-// Request.Body. This would be a somewhat semantic change from HTTP/1
-// (or at least what we expose in net/http), so I'd probably want to
-// add it there too. For now, this package says that returning from
-// the Handler ServeHTTP function means you're both done reading and
-// done writing, without a way to stop just one or the other.
-
-package http2
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-const (
-	prefaceTimeout        = 10 * time.Second
-	firstSettingsTimeout  = 2 * time.Second // should be in-flight with preface anyway
-	handlerChunkWriteSize = 4 << 10
-	defaultMaxStreams     = 250 // TODO: make this 100 as the GFE seems to?
-)
-
-var (
-	errClientDisconnected = errors.New("client disconnected")
-	errClosedBody         = errors.New("body closed by handler")
-	errStreamBroken       = errors.New("http2: stream broken")
-)
-
-var responseWriterStatePool = sync.Pool{
-	New: func() interface{} {
-		rws := &responseWriterState{}
-		rws.bw = bufio.NewWriterSize(chunkWriter{rws}, handlerChunkWriteSize)
-		return rws
-	},
-}
-
-// Test hooks.
-var (
-	testHookOnConn        func()
-	testHookGetServerConn func(*serverConn)
-	testHookOnPanicMu     *sync.Mutex // nil except in tests
-	testHookOnPanic       func(sc *serverConn, panicVal interface{}) (rePanic bool)
-)
-
-// Server is an HTTP/2 server.
-type Server struct {
-	// MaxHandlers limits the number of http.Handler ServeHTTP goroutines
-	// which may run at a time over all connections.
-	// Negative or zero no limit.
-	// TODO: implement
-	MaxHandlers int
-
-	// MaxConcurrentStreams optionally specifies the number of
-	// concurrent streams that each client may have open at a
-	// time. This is unrelated to the number of http.Handler goroutines
-	// which may be active globally, which is MaxHandlers.
-	// If zero, MaxConcurrentStreams defaults to at least 100, per
-	// the HTTP/2 spec's recommendations.
-	MaxConcurrentStreams uint32
-
-	// MaxReadFrameSize optionally specifies the largest frame
-	// this server is willing to read. A valid value is between
-	// 16k and 16M, inclusive. If zero or otherwise invalid, a
-	// default value is used.
-	MaxReadFrameSize uint32
-
-	// PermitProhibitedCipherSuites, if true, permits the use of
-	// cipher suites prohibited by the HTTP/2 spec.
-	PermitProhibitedCipherSuites bool
-}
-
-func (s *Server) maxReadFrameSize() uint32 {
-	if v := s.MaxReadFrameSize; v >= minMaxFrameSize && v <= maxFrameSize {
-		return v
-	}
-	return defaultMaxReadFrameSize
-}
-
-func (s *Server) maxConcurrentStreams() uint32 {
-	if v := s.MaxConcurrentStreams; v > 0 {
-		return v
-	}
-	return defaultMaxStreams
-}
-
-// ConfigureServer adds HTTP/2 support to a net/http Server.
-//
-// The configuration conf may be nil.
-//
-// ConfigureServer must be called before s begins serving.
-func ConfigureServer(s *http.Server, conf *Server) {
-	if conf == nil {
-		conf = new(Server)
-	}
-	if s.TLSConfig == nil {
-		s.TLSConfig = new(tls.Config)
-	}
-
-	// Note: not setting MinVersion to tls.VersionTLS12,
-	// as we don't want to interfere with HTTP/1.1 traffic
-	// on the user's server. We enforce TLS 1.2 later once
-	// we accept a connection. Ideally this should be done
-	// during next-proto selection, but using TLS <1.2 with
-	// HTTP/2 is still the client's bug.
-
-	// Be sure we advertise tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-	// at least.
-	// TODO: enable PreferServerCipherSuites?
-	if s.TLSConfig.CipherSuites != nil {
-		const requiredCipher = tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-		haveRequired := false
-		for _, v := range s.TLSConfig.CipherSuites {
-			if v == requiredCipher {
-				haveRequired = true
-				break
-			}
-		}
-		if !haveRequired {
-			s.TLSConfig.CipherSuites = append(s.TLSConfig.CipherSuites, requiredCipher)
-		}
-	}
-
-	haveNPN := false
-	for _, p := range s.TLSConfig.NextProtos {
-		if p == NextProtoTLS {
-			haveNPN = true
-			break
-		}
-	}
-	if !haveNPN {
-		s.TLSConfig.NextProtos = append(s.TLSConfig.NextProtos, NextProtoTLS)
-	}
-	// h2-14 is temporary (as of 2015-03-05) while we wait for all browsers
-	// to switch to "h2".
-	s.TLSConfig.NextProtos = append(s.TLSConfig.NextProtos, "h2-14")
-
-	if s.TLSNextProto == nil {
-		s.TLSNextProto = map[string]func(*http.Server, *tls.Conn, http.Handler){}
-	}
-	protoHandler := func(hs *http.Server, c *tls.Conn, h http.Handler) {
-		if testHookOnConn != nil {
-			testHookOnConn()
-		}
-		conf.handleConn(hs, c, h)
-	}
-	s.TLSNextProto[NextProtoTLS] = protoHandler
-	s.TLSNextProto["h2-14"] = protoHandler // temporary; see above.
-}
-
-func (srv *Server) handleConn(hs *http.Server, c net.Conn, h http.Handler) {
-	sc := &serverConn{
-		srv:              srv,
-		hs:               hs,
-		conn:             c,
-		remoteAddrStr:    c.RemoteAddr().String(),
-		bw:               newBufferedWriter(c),
-		handler:          h,
-		streams:          make(map[uint32]*stream),
-		readFrameCh:      make(chan frameAndGate),
-		readFrameErrCh:   make(chan error, 1), // must be buffered for 1
-		wantWriteFrameCh: make(chan frameWriteMsg, 8),
-		wroteFrameCh:     make(chan struct{}, 1), // buffered; one send in reading goroutine
-		bodyReadCh:       make(chan bodyReadMsg), // buffering doesn't matter either way
-		doneServing:      make(chan struct{}),
-		advMaxStreams:    srv.maxConcurrentStreams(),
-		writeSched: writeScheduler{
-			maxFrameSize: initialMaxFrameSize,
-		},
-		initialWindowSize: initialWindowSize,
-		headerTableSize:   initialHeaderTableSize,
-		serveG:            newGoroutineLock(),
-		pushEnabled:       true,
-	}
-	sc.flow.add(initialWindowSize)
-	sc.inflow.add(initialWindowSize)
-	sc.hpackEncoder = hpack.NewEncoder(&sc.headerWriteBuf)
-	sc.hpackDecoder = hpack.NewDecoder(initialHeaderTableSize, sc.onNewHeaderField)
-
-	fr := NewFramer(sc.bw, c)
-	fr.SetMaxReadFrameSize(srv.maxReadFrameSize())
-	sc.framer = fr
-
-	if tc, ok := c.(*tls.Conn); ok {
-		sc.tlsState = new(tls.ConnectionState)
-		*sc.tlsState = tc.ConnectionState()
-		// 9.2 Use of TLS Features
-		// An implementation of HTTP/2 over TLS MUST use TLS
-		// 1.2 or higher with the restrictions on feature set
-		// and cipher suite described in this section. Due to
-		// implementation limitations, it might not be
-		// possible to fail TLS negotiation. An endpoint MUST
-		// immediately terminate an HTTP/2 connection that
-		// does not meet the TLS requirements described in
-		// this section with a connection error (Section
-		// 5.4.1) of type INADEQUATE_SECURITY.
-		if sc.tlsState.Version < tls.VersionTLS12 {
-			sc.rejectConn(ErrCodeInadequateSecurity, "TLS version too low")
-			return
-		}
-
-		if sc.tlsState.ServerName == "" {
-			// Client must use SNI, but we don't enforce that anymore,
-			// since it was causing problems when connecting to bare IP
-			// addresses during development.
-			//
-			// TODO: optionally enforce? Or enforce at the time we receive
-			// a new request, and verify the the ServerName matches the :authority?
-			// But that precludes proxy situations, perhaps.
-			//
-			// So for now, do nothing here again.
-		}
-
-		if !srv.PermitProhibitedCipherSuites && isBadCipher(sc.tlsState.CipherSuite) {
-			// "Endpoints MAY choose to generate a connection error
-			// (Section 5.4.1) of type INADEQUATE_SECURITY if one of
-			// the prohibited cipher suites are negotiated."
-			//
-			// We choose that. In my opinion, the spec is weak
-			// here. It also says both parties must support at least
-			// TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 so there's no
-			// excuses here. If we really must, we could allow an
-			// "AllowInsecureWeakCiphers" option on the server later.
-			// Let's see how it plays out first.
-			sc.rejectConn(ErrCodeInadequateSecurity, fmt.Sprintf("Prohibited TLS 1.2 Cipher Suite: %x", sc.tlsState.CipherSuite))
-			return
-		}
-	}
-
-	if hook := testHookGetServerConn; hook != nil {
-		hook(sc)
-	}
-	sc.serve()
-}
-
-// isBadCipher reports whether the cipher is blacklisted by the HTTP/2 spec.
-func isBadCipher(cipher uint16) bool {
-	switch cipher {
-	case tls.TLS_RSA_WITH_RC4_128_SHA,
-		tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-		tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-		tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-		// Reject cipher suites from Appendix A.
-		// "This list includes those cipher suites that do not
-		// offer an ephemeral key exchange and those that are
-		// based on the TLS null, stream or block cipher type"
-		return true
-	default:
-		return false
-	}
-}
-
-func (sc *serverConn) rejectConn(err ErrCode, debug string) {
-	log.Printf("REJECTING conn: %v, %s", err, debug)
-	// ignoring errors. hanging up anyway.
-	sc.framer.WriteGoAway(0, err, []byte(debug))
-	sc.bw.Flush()
-	sc.conn.Close()
-}
-
-// frameAndGates coordinates the readFrames and serve
-// goroutines. Because the Framer interface only permits the most
-// recently-read Frame from being accessed, the readFrames goroutine
-// blocks until it has a frame, passes it to serve, and then waits for
-// serve to be done with it before reading the next one.
-type frameAndGate struct {
-	f Frame
-	g gate
-}
-
-type serverConn struct {
-	// Immutable:
-	srv              *Server
-	hs               *http.Server
-	conn             net.Conn
-	bw               *bufferedWriter // writing to conn
-	handler          http.Handler
-	framer           *Framer
-	hpackDecoder     *hpack.Decoder
-	doneServing      chan struct{}     // closed when serverConn.serve ends
-	readFrameCh      chan frameAndGate // written by serverConn.readFrames
-	readFrameErrCh   chan error
-	wantWriteFrameCh chan frameWriteMsg   // from handlers -> serve
-	wroteFrameCh     chan struct{}        // from writeFrameAsync -> serve, tickles more frame writes
-	bodyReadCh       chan bodyReadMsg     // from handlers -> serve
-	testHookCh       chan func()          // code to run on the serve loop
-	flow             flow                 // conn-wide (not stream-specific) outbound flow control
-	inflow           flow                 // conn-wide inbound flow control
-	tlsState         *tls.ConnectionState // shared by all handlers, like net/http
-	remoteAddrStr    string
-
-	// Everything following is owned by the serve loop; use serveG.check():
-	serveG                goroutineLock // used to verify funcs are on serve()
-	pushEnabled           bool
-	sawFirstSettings      bool // got the initial SETTINGS frame after the preface
-	needToSendSettingsAck bool
-	unackedSettings       int    // how many SETTINGS have we sent without ACKs?
-	clientMaxStreams      uint32 // SETTINGS_MAX_CONCURRENT_STREAMS from client (our PUSH_PROMISE limit)
-	advMaxStreams         uint32 // our SETTINGS_MAX_CONCURRENT_STREAMS advertised the client
-	curOpenStreams        uint32 // client's number of open streams
-	maxStreamID           uint32 // max ever seen
-	streams               map[uint32]*stream
-	initialWindowSize     int32
-	headerTableSize       uint32
-	maxHeaderListSize     uint32            // zero means unknown (default)
-	canonHeader           map[string]string // http2-lower-case -> Go-Canonical-Case
-	req                   requestParam      // non-zero while reading request headers
-	writingFrame          bool              // started write goroutine but haven't heard back on wroteFrameCh
-	needsFrameFlush       bool              // last frame write wasn't a flush
-	writeSched            writeScheduler
-	inGoAway              bool // we've started to or sent GOAWAY
-	needToSendGoAway      bool // we need to schedule a GOAWAY frame write
-	goAwayCode            ErrCode
-	shutdownTimerCh       <-chan time.Time // nil until used
-	shutdownTimer         *time.Timer      // nil until used
-
-	// Owned by the writeFrameAsync goroutine:
-	headerWriteBuf bytes.Buffer
-	hpackEncoder   *hpack.Encoder
-}
-
-// requestParam is the state of the next request, initialized over
-// potentially several frames HEADERS + zero or more CONTINUATION
-// frames.
-type requestParam struct {
-	// stream is non-nil if we're reading (HEADER or CONTINUATION)
-	// frames for a request (but not DATA).
-	stream            *stream
-	header            http.Header
-	method, path      string
-	scheme, authority string
-	sawRegularHeader  bool // saw a non-pseudo header already
-	invalidHeader     bool // an invalid header was seen
-}
-
-// stream represents a stream. This is the minimal metadata needed by
-// the serve goroutine. Most of the actual stream state is owned by
-// the http.Handler's goroutine in the responseWriter. Because the
-// responseWriter's responseWriterState is recycled at the end of a
-// handler, this struct intentionally has no pointer to the
-// *responseWriter{,State} itself, as the Handler ending nils out the
-// responseWriter's state field.
-type stream struct {
-	// immutable:
-	id   uint32
-	body *pipe       // non-nil if expecting DATA frames
-	cw   closeWaiter // closed wait stream transitions to closed state
-
-	// owned by serverConn's serve loop:
-	bodyBytes     int64   // body bytes seen so far
-	declBodyBytes int64   // or -1 if undeclared
-	flow          flow    // limits writing from Handler to client
-	inflow        flow    // what the client is allowed to POST/etc to us
-	parent        *stream // or nil
-	weight        uint8
-	state         streamState
-	sentReset     bool // only true once detached from streams map
-	gotReset      bool // only true once detacted from streams map
-}
-
-func (sc *serverConn) Framer() *Framer  { return sc.framer }
-func (sc *serverConn) CloseConn() error { return sc.conn.Close() }
-func (sc *serverConn) Flush() error     { return sc.bw.Flush() }
-func (sc *serverConn) HeaderEncoder() (*hpack.Encoder, *bytes.Buffer) {
-	return sc.hpackEncoder, &sc.headerWriteBuf
-}
-
-func (sc *serverConn) state(streamID uint32) (streamState, *stream) {
-	sc.serveG.check()
-	// http://http2.github.io/http2-spec/#rfc.section.5.1
-	if st, ok := sc.streams[streamID]; ok {
-		return st.state, st
-	}
-	// "The first use of a new stream identifier implicitly closes all
-	// streams in the "idle" state that might have been initiated by
-	// that peer with a lower-valued stream identifier. For example, if
-	// a client sends a HEADERS frame on stream 7 without ever sending a
-	// frame on stream 5, then stream 5 transitions to the "closed"
-	// state when the first frame for stream 7 is sent or received."
-	if streamID <= sc.maxStreamID {
-		return stateClosed, nil
-	}
-	return stateIdle, nil
-}
-
-func (sc *serverConn) vlogf(format string, args ...interface{}) {
-	if VerboseLogs {
-		sc.logf(format, args...)
-	}
-}
-
-func (sc *serverConn) logf(format string, args ...interface{}) {
-	if lg := sc.hs.ErrorLog; lg != nil {
-		lg.Printf(format, args...)
-	} else {
-		log.Printf(format, args...)
-	}
-}
-
-func (sc *serverConn) condlogf(err error, format string, args ...interface{}) {
-	if err == nil {
-		return
-	}
-	str := err.Error()
-	if err == io.EOF || strings.Contains(str, "use of closed network connection") {
-		// Boring, expected errors.
-		sc.vlogf(format, args...)
-	} else {
-		sc.logf(format, args...)
-	}
-}
-
-func (sc *serverConn) onNewHeaderField(f hpack.HeaderField) {
-	sc.serveG.check()
-	sc.vlogf("got header field %+v", f)
-	switch {
-	case !validHeader(f.Name):
-		sc.req.invalidHeader = true
-	case strings.HasPrefix(f.Name, ":"):
-		if sc.req.sawRegularHeader {
-			sc.logf("pseudo-header after regular header")
-			sc.req.invalidHeader = true
-			return
-		}
-		var dst *string
-		switch f.Name {
-		case ":method":
-			dst = &sc.req.method
-		case ":path":
-			dst = &sc.req.path
-		case ":scheme":
-			dst = &sc.req.scheme
-		case ":authority":
-			dst = &sc.req.authority
-		default:
-			// 8.1.2.1 Pseudo-Header Fields
-			// "Endpoints MUST treat a request or response
-			// that contains undefined or invalid
-			// pseudo-header fields as malformed (Section
-			// 8.1.2.6)."
-			sc.logf("invalid pseudo-header %q", f.Name)
-			sc.req.invalidHeader = true
-			return
-		}
-		if *dst != "" {
-			sc.logf("duplicate pseudo-header %q sent", f.Name)
-			sc.req.invalidHeader = true
-			return
-		}
-		*dst = f.Value
-	case f.Name == "cookie":
-		sc.req.sawRegularHeader = true
-		if s, ok := sc.req.header["Cookie"]; ok && len(s) == 1 {
-			s[0] = s[0] + "; " + f.Value
-		} else {
-			sc.req.header.Add("Cookie", f.Value)
-		}
-	default:
-		sc.req.sawRegularHeader = true
-		sc.req.header.Add(sc.canonicalHeader(f.Name), f.Value)
-	}
-}
-
-func (sc *serverConn) canonicalHeader(v string) string {
-	sc.serveG.check()
-	cv, ok := commonCanonHeader[v]
-	if ok {
-		return cv
-	}
-	cv, ok = sc.canonHeader[v]
-	if ok {
-		return cv
-	}
-	if sc.canonHeader == nil {
-		sc.canonHeader = make(map[string]string)
-	}
-	cv = http.CanonicalHeaderKey(v)
-	sc.canonHeader[v] = cv
-	return cv
-}
-
-// readFrames is the loop that reads incoming frames.
-// It's run on its own goroutine.
-func (sc *serverConn) readFrames() {
-	g := make(gate, 1)
-	for {
-		f, err := sc.framer.ReadFrame()
-		if err != nil {
-			sc.readFrameErrCh <- err
-			close(sc.readFrameCh)
-			return
-		}
-		sc.readFrameCh <- frameAndGate{f, g}
-		// We can't read another frame until this one is
-		// processed, as the ReadFrame interface doesn't copy
-		// memory.  The Frame accessor methods access the last
-		// frame's (shared) buffer. So we wait for the
-		// serve goroutine to tell us it's done:
-		g.Wait()
-	}
-}
-
-// writeFrameAsync runs in its own goroutine and writes a single frame
-// and then reports when it's done.
-// At most one goroutine can be running writeFrameAsync at a time per
-// serverConn.
-func (sc *serverConn) writeFrameAsync(wm frameWriteMsg) {
-	err := wm.write.writeFrame(sc)
-	if ch := wm.done; ch != nil {
-		select {
-		case ch <- err:
-		default:
-			panic(fmt.Sprintf("unbuffered done channel passed in for type %T", wm.write))
-		}
-	}
-	sc.wroteFrameCh <- struct{}{} // tickle frame selection scheduler
-}
-
-func (sc *serverConn) closeAllStreamsOnConnClose() {
-	sc.serveG.check()
-	for _, st := range sc.streams {
-		sc.closeStream(st, errClientDisconnected)
-	}
-}
-
-func (sc *serverConn) stopShutdownTimer() {
-	sc.serveG.check()
-	if t := sc.shutdownTimer; t != nil {
-		t.Stop()
-	}
-}
-
-func (sc *serverConn) notePanic() {
-	if testHookOnPanicMu != nil {
-		testHookOnPanicMu.Lock()
-		defer testHookOnPanicMu.Unlock()
-	}
-	if testHookOnPanic != nil {
-		if e := recover(); e != nil {
-			if testHookOnPanic(sc, e) {
-				panic(e)
-			}
-		}
-	}
-}
-
-func (sc *serverConn) serve() {
-	sc.serveG.check()
-	defer sc.notePanic()
-	defer sc.conn.Close()
-	defer sc.closeAllStreamsOnConnClose()
-	defer sc.stopShutdownTimer()
-	defer close(sc.doneServing) // unblocks handlers trying to send
-
-	sc.vlogf("HTTP/2 connection from %v on %p", sc.conn.RemoteAddr(), sc.hs)
-
-	sc.writeFrame(frameWriteMsg{
-		write: writeSettings{
-			{SettingMaxFrameSize, sc.srv.maxReadFrameSize()},
-			{SettingMaxConcurrentStreams, sc.advMaxStreams},
-
-			// TODO: more actual settings, notably
-			// SettingInitialWindowSize, but then we also
-			// want to bump up the conn window size the
-			// same amount here right after the settings
-		},
-	})
-	sc.unackedSettings++
-
-	if err := sc.readPreface(); err != nil {
-		sc.condlogf(err, "error reading preface from client %v: %v", sc.conn.RemoteAddr(), err)
-		return
-	}
-
-	go sc.readFrames() // closed by defer sc.conn.Close above
-
-	settingsTimer := time.NewTimer(firstSettingsTimeout)
-	for {
-		select {
-		case wm := <-sc.wantWriteFrameCh:
-			sc.writeFrame(wm)
-		case <-sc.wroteFrameCh:
-			if sc.writingFrame != true {
-				panic("internal error: expected to be already writing a frame")
-			}
-			sc.writingFrame = false
-			sc.scheduleFrameWrite()
-		case fg, ok := <-sc.readFrameCh:
-			if !ok {
-				sc.readFrameCh = nil
-			}
-			if !sc.processFrameFromReader(fg, ok) {
-				return
-			}
-			if settingsTimer.C != nil {
-				settingsTimer.Stop()
-				settingsTimer.C = nil
-			}
-		case m := <-sc.bodyReadCh:
-			sc.noteBodyRead(m.st, m.n)
-		case <-settingsTimer.C:
-			sc.logf("timeout waiting for SETTINGS frames from %v", sc.conn.RemoteAddr())
-			return
-		case <-sc.shutdownTimerCh:
-			sc.vlogf("GOAWAY close timer fired; closing conn from %v", sc.conn.RemoteAddr())
-			return
-		case fn := <-sc.testHookCh:
-			fn()
-		}
-	}
-}
-
-// readPreface reads the ClientPreface greeting from the peer
-// or returns an error on timeout or an invalid greeting.
-func (sc *serverConn) readPreface() error {
-	errc := make(chan error, 1)
-	go func() {
-		// Read the client preface
-		buf := make([]byte, len(ClientPreface))
-		if _, err := io.ReadFull(sc.conn, buf); err != nil {
-			errc <- err
-		} else if !bytes.Equal(buf, clientPreface) {
-			errc <- fmt.Errorf("bogus greeting %q", buf)
-		} else {
-			errc <- nil
-		}
-	}()
-	timer := time.NewTimer(prefaceTimeout) // TODO: configurable on *Server?
-	defer timer.Stop()
-	select {
-	case <-timer.C:
-		return errors.New("timeout waiting for client preface")
-	case err := <-errc:
-		if err == nil {
-			sc.vlogf("client %v said hello", sc.conn.RemoteAddr())
-		}
-		return err
-	}
-}
-
-// writeDataFromHandler writes the data described in req to stream.id.
-//
-// The provided ch is used to avoid allocating new channels for each
-// write operation. It's expected that the caller reuses writeData and ch
-// over time.
-//
-// The flow control currently happens in the Handler where it waits
-// for 1 or more bytes to be available to then write here.  So at this
-// point we know that we have flow control. But this might have to
-// change when priority is implemented, so the serve goroutine knows
-// the total amount of bytes waiting to be sent and can can have more
-// scheduling decisions available.
-func (sc *serverConn) writeDataFromHandler(stream *stream, writeData *writeData, ch chan error) error {
-	sc.writeFrameFromHandler(frameWriteMsg{
-		write:  writeData,
-		stream: stream,
-		done:   ch,
-	})
-	select {
-	case err := <-ch:
-		return err
-	case <-sc.doneServing:
-		return errClientDisconnected
-	case <-stream.cw:
-		return errStreamBroken
-	}
-}
-
-// writeFrameFromHandler sends wm to sc.wantWriteFrameCh, but aborts
-// if the connection has gone away.
-//
-// This must not be run from the serve goroutine itself, else it might
-// deadlock writing to sc.wantWriteFrameCh (which is only mildly
-// buffered and is read by serve itself). If you're on the serve
-// goroutine, call writeFrame instead.
-func (sc *serverConn) writeFrameFromHandler(wm frameWriteMsg) {
-	sc.serveG.checkNotOn() // NOT
-	select {
-	case sc.wantWriteFrameCh <- wm:
-	case <-sc.doneServing:
-		// Client has closed their connection to the server.
-	}
-}
-
-// writeFrame schedules a frame to write and sends it if there's nothing
-// already being written.
-//
-// There is no pushback here (the serve goroutine never blocks). It's
-// the http.Handlers that block, waiting for their previous frames to
-// make it onto the wire
-//
-// If you're not on the serve goroutine, use writeFrameFromHandler instead.
-func (sc *serverConn) writeFrame(wm frameWriteMsg) {
-	sc.serveG.check()
-	sc.writeSched.add(wm)
-	sc.scheduleFrameWrite()
-}
-
-// startFrameWrite starts a goroutine to write wm (in a separate
-// goroutine since that might block on the network), and updates the
-// serve goroutine's state about the world, updated from info in wm.
-func (sc *serverConn) startFrameWrite(wm frameWriteMsg) {
-	sc.serveG.check()
-	if sc.writingFrame {
-		panic("internal error: can only be writing one frame at a time")
-	}
-	sc.writingFrame = true
-
-	st := wm.stream
-	if st != nil {
-		switch st.state {
-		case stateHalfClosedLocal:
-			panic("internal error: attempt to send frame on half-closed-local stream")
-		case stateClosed:
-			if st.sentReset || st.gotReset {
-				// Skip this frame. But fake the frame write to reschedule:
-				sc.wroteFrameCh <- struct{}{}
-				return
-			}
-			panic(fmt.Sprintf("internal error: attempt to send a write %v on a closed stream", wm))
-		}
-	}
-
-	sc.needsFrameFlush = true
-	if endsStream(wm.write) {
-		if st == nil {
-			panic("internal error: expecting non-nil stream")
-		}
-		switch st.state {
-		case stateOpen:
-			// Here we would go to stateHalfClosedLocal in
-			// theory, but since our handler is done and
-			// the net/http package provides no mechanism
-			// for finishing writing to a ResponseWriter
-			// while still reading data (see possible TODO
-			// at top of this file), we go into closed
-			// state here anyway, after telling the peer
-			// we're hanging up on them.
-			st.state = stateHalfClosedLocal // won't last long, but necessary for closeStream via resetStream
-			errCancel := StreamError{st.id, ErrCodeCancel}
-			sc.resetStream(errCancel)
-		case stateHalfClosedRemote:
-			sc.closeStream(st, nil)
-		}
-	}
-	go sc.writeFrameAsync(wm)
-}
-
-// scheduleFrameWrite tickles the frame writing scheduler.
-//
-// If a frame is already being written, nothing happens. This will be called again
-// when the frame is done being written.
-//
-// If a frame isn't being written we need to send one, the best frame
-// to send is selected, preferring first things that aren't
-// stream-specific (e.g. ACKing settings), and then finding the
-// highest priority stream.
-//
-// If a frame isn't being written and there's nothing else to send, we
-// flush the write buffer.
-func (sc *serverConn) scheduleFrameWrite() {
-	sc.serveG.check()
-	if sc.writingFrame {
-		return
-	}
-	if sc.needToSendGoAway {
-		sc.needToSendGoAway = false
-		sc.startFrameWrite(frameWriteMsg{
-			write: &writeGoAway{
-				maxStreamID: sc.maxStreamID,
-				code:        sc.goAwayCode,
-			},
-		})
-		return
-	}
-	if sc.needToSendSettingsAck {
-		sc.needToSendSettingsAck = false
-		sc.startFrameWrite(frameWriteMsg{write: writeSettingsAck{}})
-		return
-	}
-	if !sc.inGoAway {
-		if wm, ok := sc.writeSched.take(); ok {
-			sc.startFrameWrite(wm)
-			return
-		}
-	}
-	if sc.needsFrameFlush {
-		sc.startFrameWrite(frameWriteMsg{write: flushFrameWriter{}})
-		sc.needsFrameFlush = false // after startFrameWrite, since it sets this true
-		return
-	}
-}
-
-func (sc *serverConn) goAway(code ErrCode) {
-	sc.serveG.check()
-	if sc.inGoAway {
-		return
-	}
-	if code != ErrCodeNo {
-		sc.shutDownIn(250 * time.Millisecond)
-	} else {
-		// TODO: configurable
-		sc.shutDownIn(1 * time.Second)
-	}
-	sc.inGoAway = true
-	sc.needToSendGoAway = true
-	sc.goAwayCode = code
-	sc.scheduleFrameWrite()
-}
-
-func (sc *serverConn) shutDownIn(d time.Duration) {
-	sc.serveG.check()
-	sc.shutdownTimer = time.NewTimer(d)
-	sc.shutdownTimerCh = sc.shutdownTimer.C
-}
-
-func (sc *serverConn) resetStream(se StreamError) {
-	sc.serveG.check()
-	sc.writeFrame(frameWriteMsg{write: se})
-	if st, ok := sc.streams[se.StreamID]; ok {
-		st.sentReset = true
-		sc.closeStream(st, se)
-	}
-}
-
-// curHeaderStreamID returns the stream ID of the header block we're
-// currently in the middle of reading. If this returns non-zero, the
-// next frame must be a CONTINUATION with this stream id.
-func (sc *serverConn) curHeaderStreamID() uint32 {
-	sc.serveG.check()
-	st := sc.req.stream
-	if st == nil {
-		return 0
-	}
-	return st.id
-}
-
-// processFrameFromReader processes the serve loop's read from readFrameCh from the
-// frame-reading goroutine.
-// processFrameFromReader returns whether the connection should be kept open.
-func (sc *serverConn) processFrameFromReader(fg frameAndGate, fgValid bool) bool {
-	sc.serveG.check()
-	var clientGone bool
-	var err error
-	if !fgValid {
-		err = <-sc.readFrameErrCh
-		if err == ErrFrameTooLarge {
-			sc.goAway(ErrCodeFrameSize)
-			return true // goAway will close the loop
-		}
-		clientGone = err == io.EOF || strings.Contains(err.Error(), "use of closed network connection")
-		if clientGone {
-			// TODO: could we also get into this state if
-			// the peer does a half close
-			// (e.g. CloseWrite) because they're done
-			// sending frames but they're still wanting
-			// our open replies?  Investigate.
-			// TODO: add CloseWrite to crypto/tls.Conn first
-			// so we have a way to test this? I suppose
-			// just for testing we could have a non-TLS mode.
-			return false
-		}
-	}
-
-	if fgValid {
-		f := fg.f
-		sc.vlogf("got %v: %#v", f.Header(), f)
-		err = sc.processFrame(f)
-		fg.g.Done() // unblock the readFrames goroutine
-		if err == nil {
-			return true
-		}
-	}
-
-	switch ev := err.(type) {
-	case StreamError:
-		sc.resetStream(ev)
-		return true
-	case goAwayFlowError:
-		sc.goAway(ErrCodeFlowControl)
-		return true
-	case ConnectionError:
-		sc.logf("%v: %v", sc.conn.RemoteAddr(), ev)
-		sc.goAway(ErrCode(ev))
-		return true // goAway will handle shutdown
-	default:
-		if !fgValid {
-			sc.logf("disconnecting; error reading frame from client %s: %v", sc.conn.RemoteAddr(), err)
-		} else {
-			sc.logf("disconnection due to other error: %v", err)
-		}
-	}
-	return false
-}
-
-func (sc *serverConn) processFrame(f Frame) error {
-	sc.serveG.check()
-
-	// First frame received must be SETTINGS.
-	if !sc.sawFirstSettings {
-		if _, ok := f.(*SettingsFrame); !ok {
-			return ConnectionError(ErrCodeProtocol)
-		}
-		sc.sawFirstSettings = true
-	}
-
-	if s := sc.curHeaderStreamID(); s != 0 {
-		if cf, ok := f.(*ContinuationFrame); !ok {
-			return ConnectionError(ErrCodeProtocol)
-		} else if cf.Header().StreamID != s {
-			return ConnectionError(ErrCodeProtocol)
-		}
-	}
-
-	switch f := f.(type) {
-	case *SettingsFrame:
-		return sc.processSettings(f)
-	case *HeadersFrame:
-		return sc.processHeaders(f)
-	case *ContinuationFrame:
-		return sc.processContinuation(f)
-	case *WindowUpdateFrame:
-		return sc.processWindowUpdate(f)
-	case *PingFrame:
-		return sc.processPing(f)
-	case *DataFrame:
-		return sc.processData(f)
-	case *RSTStreamFrame:
-		return sc.processResetStream(f)
-	case *PriorityFrame:
-		return sc.processPriority(f)
-	case *PushPromiseFrame:
-		// A client cannot push. Thus, servers MUST treat the receipt of a PUSH_PROMISE
-		// frame as a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-		return ConnectionError(ErrCodeProtocol)
-	default:
-		log.Printf("Ignoring frame: %v", f.Header())
-		return nil
-	}
-}
-
-func (sc *serverConn) processPing(f *PingFrame) error {
-	sc.serveG.check()
-	if f.Flags.Has(FlagSettingsAck) {
-		// 6.7 PING: " An endpoint MUST NOT respond to PING frames
-		// containing this flag."
-		return nil
-	}
-	if f.StreamID != 0 {
-		// "PING frames are not associated with any individual
-		// stream. If a PING frame is received with a stream
-		// identifier field value other than 0x0, the recipient MUST
-		// respond with a connection error (Section 5.4.1) of type
-		// PROTOCOL_ERROR."
-		return ConnectionError(ErrCodeProtocol)
-	}
-	sc.writeFrame(frameWriteMsg{write: writePingAck{f}})
-	return nil
-}
-
-func (sc *serverConn) processWindowUpdate(f *WindowUpdateFrame) error {
-	sc.serveG.check()
-	switch {
-	case f.StreamID != 0: // stream-level flow control
-		st := sc.streams[f.StreamID]
-		if st == nil {
-			// "WINDOW_UPDATE can be sent by a peer that has sent a
-			// frame bearing the END_STREAM flag. This means that a
-			// receiver could receive a WINDOW_UPDATE frame on a "half
-			// closed (remote)" or "closed" stream. A receiver MUST
-			// NOT treat this as an error, see Section 5.1."
-			return nil
-		}
-		if !st.flow.add(int32(f.Increment)) {
-			return StreamError{f.StreamID, ErrCodeFlowControl}
-		}
-	default: // connection-level flow control
-		if !sc.flow.add(int32(f.Increment)) {
-			return goAwayFlowError{}
-		}
-	}
-	sc.scheduleFrameWrite()
-	return nil
-}
-
-func (sc *serverConn) processResetStream(f *RSTStreamFrame) error {
-	sc.serveG.check()
-
-	state, st := sc.state(f.StreamID)
-	if state == stateIdle {
-		// 6.4 "RST_STREAM frames MUST NOT be sent for a
-		// stream in the "idle" state. If a RST_STREAM frame
-		// identifying an idle stream is received, the
-		// recipient MUST treat this as a connection error
-		// (Section 5.4.1) of type PROTOCOL_ERROR.
-		return ConnectionError(ErrCodeProtocol)
-	}
-	if st != nil {
-		st.gotReset = true
-		sc.closeStream(st, StreamError{f.StreamID, f.ErrCode})
-	}
-	return nil
-}
-
-func (sc *serverConn) closeStream(st *stream, err error) {
-	sc.serveG.check()
-	if st.state == stateIdle || st.state == stateClosed {
-		panic(fmt.Sprintf("invariant; can't close stream in state %v", st.state))
-	}
-	st.state = stateClosed
-	sc.curOpenStreams--
-	delete(sc.streams, st.id)
-	if p := st.body; p != nil {
-		p.Close(err)
-	}
-	st.cw.Close() // signals Handler's CloseNotifier, unblocks writes, etc
-	sc.writeSched.forgetStream(st.id)
-}
-
-func (sc *serverConn) processSettings(f *SettingsFrame) error {
-	sc.serveG.check()
-	if f.IsAck() {
-		sc.unackedSettings--
-		if sc.unackedSettings < 0 {
-			// Why is the peer ACKing settings we never sent?
-			// The spec doesn't mention this case, but
-			// hang up on them anyway.
-			return ConnectionError(ErrCodeProtocol)
-		}
-		return nil
-	}
-	if err := f.ForeachSetting(sc.processSetting); err != nil {
-		return err
-	}
-	sc.needToSendSettingsAck = true
-	sc.scheduleFrameWrite()
-	return nil
-}
-
-func (sc *serverConn) processSetting(s Setting) error {
-	sc.serveG.check()
-	if err := s.Valid(); err != nil {
-		return err
-	}
-	sc.vlogf("processing setting %v", s)
-	switch s.ID {
-	case SettingHeaderTableSize:
-		sc.headerTableSize = s.Val
-		sc.hpackEncoder.SetMaxDynamicTableSize(s.Val)
-	case SettingEnablePush:
-		sc.pushEnabled = s.Val != 0
-	case SettingMaxConcurrentStreams:
-		sc.clientMaxStreams = s.Val
-	case SettingInitialWindowSize:
-		return sc.processSettingInitialWindowSize(s.Val)
-	case SettingMaxFrameSize:
-		sc.writeSched.maxFrameSize = s.Val
-	case SettingMaxHeaderListSize:
-		sc.maxHeaderListSize = s.Val
-	default:
-		// Unknown setting: "An endpoint that receives a SETTINGS
-		// frame with any unknown or unsupported identifier MUST
-		// ignore that setting."
-	}
-	return nil
-}
-
-func (sc *serverConn) processSettingInitialWindowSize(val uint32) error {
-	sc.serveG.check()
-	// Note: val already validated to be within range by
-	// processSetting's Valid call.
-
-	// "A SETTINGS frame can alter the initial flow control window
-	// size for all current streams. When the value of
-	// SETTINGS_INITIAL_WINDOW_SIZE changes, a receiver MUST
-	// adjust the size of all stream flow control windows that it
-	// maintains by the difference between the new value and the
-	// old value."
-	old := sc.initialWindowSize
-	sc.initialWindowSize = int32(val)
-	growth := sc.initialWindowSize - old // may be negative
-	for _, st := range sc.streams {
-		if !st.flow.add(growth) {
-			// 6.9.2 Initial Flow Control Window Size
-			// "An endpoint MUST treat a change to
-			// SETTINGS_INITIAL_WINDOW_SIZE that causes any flow
-			// control window to exceed the maximum size as a
-			// connection error (Section 5.4.1) of type
-			// FLOW_CONTROL_ERROR."
-			return ConnectionError(ErrCodeFlowControl)
-		}
-	}
-	return nil
-}
-
-func (sc *serverConn) processData(f *DataFrame) error {
-	sc.serveG.check()
-	// "If a DATA frame is received whose stream is not in "open"
-	// or "half closed (local)" state, the recipient MUST respond
-	// with a stream error (Section 5.4.2) of type STREAM_CLOSED."
-	id := f.Header().StreamID
-	st, ok := sc.streams[id]
-	if !ok || st.state != stateOpen {
-		// This includes sending a RST_STREAM if the stream is
-		// in stateHalfClosedLocal (which currently means that
-		// the http.Handler returned, so it's done reading &
-		// done writing). Try to stop the client from sending
-		// more DATA.
-		return StreamError{id, ErrCodeStreamClosed}
-	}
-	if st.body == nil {
-		panic("internal error: should have a body in this state")
-	}
-	data := f.Data()
-
-	// Sender sending more than they'd declared?
-	if st.declBodyBytes != -1 && st.bodyBytes+int64(len(data)) > st.declBodyBytes {
-		st.body.Close(fmt.Errorf("sender tried to send more than declared Content-Length of %d bytes", st.declBodyBytes))
-		return StreamError{id, ErrCodeStreamClosed}
-	}
-	if len(data) > 0 {
-		// Check whether the client has flow control quota.
-		if int(st.inflow.available()) < len(data) {
-			return StreamError{id, ErrCodeFlowControl}
-		}
-		st.inflow.take(int32(len(data)))
-		wrote, err := st.body.Write(data)
-		if err != nil {
-			return StreamError{id, ErrCodeStreamClosed}
-		}
-		if wrote != len(data) {
-			panic("internal error: bad Writer")
-		}
-		st.bodyBytes += int64(len(data))
-	}
-	if f.StreamEnded() {
-		if st.declBodyBytes != -1 && st.declBodyBytes != st.bodyBytes {
-			st.body.Close(fmt.Errorf("request declared a Content-Length of %d but only wrote %d bytes",
-				st.declBodyBytes, st.bodyBytes))
-		} else {
-			st.body.Close(io.EOF)
-		}
-		st.state = stateHalfClosedRemote
-	}
-	return nil
-}
-
-func (sc *serverConn) processHeaders(f *HeadersFrame) error {
-	sc.serveG.check()
-	id := f.Header().StreamID
-	if sc.inGoAway {
-		// Ignore.
-		return nil
-	}
-	// http://http2.github.io/http2-spec/#rfc.section.5.1.1
-	if id%2 != 1 || id <= sc.maxStreamID || sc.req.stream != nil {
-		// Streams initiated by a client MUST use odd-numbered
-		// stream identifiers. [...] The identifier of a newly
-		// established stream MUST be numerically greater than all
-		// streams that the initiating endpoint has opened or
-		// reserved. [...]  An endpoint that receives an unexpected
-		// stream identifier MUST respond with a connection error
-		// (Section 5.4.1) of type PROTOCOL_ERROR.
-		return ConnectionError(ErrCodeProtocol)
-	}
-	if id > sc.maxStreamID {
-		sc.maxStreamID = id
-	}
-	st := &stream{
-		id:    id,
-		state: stateOpen,
-	}
-	if f.StreamEnded() {
-		st.state = stateHalfClosedRemote
-	}
-	st.cw.Init()
-
-	st.flow.conn = &sc.flow // link to conn-level counter
-	st.flow.add(sc.initialWindowSize)
-	st.inflow.conn = &sc.inflow      // link to conn-level counter
-	st.inflow.add(initialWindowSize) // TODO: update this when we send a higher initial window size in the initial settings
-
-	sc.streams[id] = st
-	if f.HasPriority() {
-		adjustStreamPriority(sc.streams, st.id, f.Priority)
-	}
-	sc.curOpenStreams++
-	sc.req = requestParam{
-		stream: st,
-		header: make(http.Header),
-	}
-	return sc.processHeaderBlockFragment(st, f.HeaderBlockFragment(), f.HeadersEnded())
-}
-
-func (sc *serverConn) processContinuation(f *ContinuationFrame) error {
-	sc.serveG.check()
-	st := sc.streams[f.Header().StreamID]
-	if st == nil || sc.curHeaderStreamID() != st.id {
-		return ConnectionError(ErrCodeProtocol)
-	}
-	return sc.processHeaderBlockFragment(st, f.HeaderBlockFragment(), f.HeadersEnded())
-}
-
-func (sc *serverConn) processHeaderBlockFragment(st *stream, frag []byte, end bool) error {
-	sc.serveG.check()
-	if _, err := sc.hpackDecoder.Write(frag); err != nil {
-		// TODO: convert to stream error I assume?
-		return err
-	}
-	if !end {
-		return nil
-	}
-	if err := sc.hpackDecoder.Close(); err != nil {
-		// TODO: convert to stream error I assume?
-		return err
-	}
-	defer sc.resetPendingRequest()
-	if sc.curOpenStreams > sc.advMaxStreams {
-		// "Endpoints MUST NOT exceed the limit set by their
-		// peer. An endpoint that receives a HEADERS frame
-		// that causes their advertised concurrent stream
-		// limit to be exceeded MUST treat this as a stream
-		// error (Section 5.4.2) of type PROTOCOL_ERROR or
-		// REFUSED_STREAM."
-		if sc.unackedSettings == 0 {
-			// They should know better.
-			return StreamError{st.id, ErrCodeProtocol}
-		}
-		// Assume it's a network race, where they just haven't
-		// received our last SETTINGS update. But actually
-		// this can't happen yet, because we don't yet provide
-		// a way for users to adjust server parameters at
-		// runtime.
-		return StreamError{st.id, ErrCodeRefusedStream}
-	}
-
-	rw, req, err := sc.newWriterAndRequest()
-	if err != nil {
-		return err
-	}
-	st.body = req.Body.(*requestBody).pipe // may be nil
-	st.declBodyBytes = req.ContentLength
-	go sc.runHandler(rw, req)
-	return nil
-}
-
-func (sc *serverConn) processPriority(f *PriorityFrame) error {
-	adjustStreamPriority(sc.streams, f.StreamID, f.PriorityParam)
-	return nil
-}
-
-func adjustStreamPriority(streams map[uint32]*stream, streamID uint32, priority PriorityParam) {
-	st, ok := streams[streamID]
-	if !ok {
-		// TODO: not quite correct (this streamID might
-		// already exist in the dep tree, but be closed), but
-		// close enough for now.
-		return
-	}
-	st.weight = priority.Weight
-	parent := streams[priority.StreamDep] // might be nil
-	if parent == st {
-		// if client tries to set this stream to be the parent of itself
-		// ignore and keep going
-		return
-	}
-
-	// section 5.3.3: If a stream is made dependent on one of its
-	// own dependencies, the formerly dependent stream is first
-	// moved to be dependent on the reprioritized stream's previous
-	// parent. The moved dependency retains its weight.
-	for piter := parent; piter != nil; piter = piter.parent {
-		if piter == st {
-			parent.parent = st.parent
-			break
-		}
-	}
-	st.parent = parent
-	if priority.Exclusive && (st.parent != nil || priority.StreamDep == 0) {
-		for _, openStream := range streams {
-			if openStream != st && openStream.parent == st.parent {
-				openStream.parent = st
-			}
-		}
-	}
-}
-
-// resetPendingRequest zeros out all state related to a HEADERS frame
-// and its zero or more CONTINUATION frames sent to start a new
-// request.
-func (sc *serverConn) resetPendingRequest() {
-	sc.serveG.check()
-	sc.req = requestParam{}
-}
-
-func (sc *serverConn) newWriterAndRequest() (*responseWriter, *http.Request, error) {
-	sc.serveG.check()
-	rp := &sc.req
-	if rp.invalidHeader || rp.method == "" || rp.path == "" ||
-		(rp.scheme != "https" && rp.scheme != "http") {
-		// See 8.1.2.6 Malformed Requests and Responses:
-		//
-		// Malformed requests or responses that are detected
-		// MUST be treated as a stream error (Section 5.4.2)
-		// of type PROTOCOL_ERROR."
-		//
-		// 8.1.2.3 Request Pseudo-Header Fields
-		// "All HTTP/2 requests MUST include exactly one valid
-		// value for the :method, :scheme, and :path
-		// pseudo-header fields"
-		return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
-	}
-	var tlsState *tls.ConnectionState // nil if not scheme https
-	if rp.scheme == "https" {
-		tlsState = sc.tlsState
-	}
-	authority := rp.authority
-	if authority == "" {
-		authority = rp.header.Get("Host")
-	}
-	needsContinue := rp.header.Get("Expect") == "100-continue"
-	if needsContinue {
-		rp.header.Del("Expect")
-	}
-	bodyOpen := rp.stream.state == stateOpen
-	body := &requestBody{
-		conn:          sc,
-		stream:        rp.stream,
-		needsContinue: needsContinue,
-	}
-	// TODO: handle asterisk '*' requests + test
-	url, err := url.ParseRequestURI(rp.path)
-	if err != nil {
-		// TODO: find the right error code?
-		return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
-	}
-	req := &http.Request{
-		Method:     rp.method,
-		URL:        url,
-		RemoteAddr: sc.remoteAddrStr,
-		Header:     rp.header,
-		RequestURI: rp.path,
-		Proto:      "HTTP/2.0",
-		ProtoMajor: 2,
-		ProtoMinor: 0,
-		TLS:        tlsState,
-		Host:       authority,
-		Body:       body,
-	}
-	if bodyOpen {
-		body.pipe = &pipe{
-			b: buffer{buf: make([]byte, initialWindowSize)}, // TODO: share/remove XXX
-		}
-		body.pipe.c.L = &body.pipe.m
-
-		if vv, ok := rp.header["Content-Length"]; ok {
-			req.ContentLength, _ = strconv.ParseInt(vv[0], 10, 64)
-		} else {
-			req.ContentLength = -1
-		}
-	}
-
-	rws := responseWriterStatePool.Get().(*responseWriterState)
-	bwSave := rws.bw
-	*rws = responseWriterState{} // zero all the fields
-	rws.conn = sc
-	rws.bw = bwSave
-	rws.bw.Reset(chunkWriter{rws})
-	rws.stream = rp.stream
-	rws.req = req
-	rws.body = body
-	rws.frameWriteCh = make(chan error, 1)
-
-	rw := &responseWriter{rws: rws}
-	return rw, req, nil
-}
-
-// Run on its own goroutine.
-func (sc *serverConn) runHandler(rw *responseWriter, req *http.Request) {
-	defer rw.handlerDone()
-	// TODO: catch panics like net/http.Server
-	sc.handler.ServeHTTP(rw, req)
-}
-
-// called from handler goroutines.
-// h may be nil.
-func (sc *serverConn) writeHeaders(st *stream, headerData *writeResHeaders, tempCh chan error) {
-	sc.serveG.checkNotOn() // NOT on
-	var errc chan error
-	if headerData.h != nil {
-		// If there's a header map (which we don't own), so we have to block on
-		// waiting for this frame to be written, so an http.Flush mid-handler
-		// writes out the correct value of keys, before a handler later potentially
-		// mutates it.
-		errc = tempCh
-	}
-	sc.writeFrameFromHandler(frameWriteMsg{
-		write:  headerData,
-		stream: st,
-		done:   errc,
-	})
-	if errc != nil {
-		select {
-		case <-errc:
-			// Ignore. Just for synchronization.
-			// Any error will be handled in the writing goroutine.
-		case <-sc.doneServing:
-			// Client has closed the connection.
-		}
-	}
-}
-
-// called from handler goroutines.
-func (sc *serverConn) write100ContinueHeaders(st *stream) {
-	sc.writeFrameFromHandler(frameWriteMsg{
-		write:  write100ContinueHeadersFrame{st.id},
-		stream: st,
-	})
-}
-
-// A bodyReadMsg tells the server loop that the http.Handler read n
-// bytes of the DATA from the client on the given stream.
-type bodyReadMsg struct {
-	st *stream
-	n  int
-}
-
-// called from handler goroutines.
-// Notes that the handler for the given stream ID read n bytes of its body
-// and schedules flow control tokens to be sent.
-func (sc *serverConn) noteBodyReadFromHandler(st *stream, n int) {
-	sc.serveG.checkNotOn() // NOT on
-	sc.bodyReadCh <- bodyReadMsg{st, n}
-}
-
-func (sc *serverConn) noteBodyRead(st *stream, n int) {
-	sc.serveG.check()
-	sc.sendWindowUpdate(nil, n) // conn-level
-	if st.state != stateHalfClosedRemote && st.state != stateClosed {
-		// Don't send this WINDOW_UPDATE if the stream is closed
-		// remotely.
-		sc.sendWindowUpdate(st, n)
-	}
-}
-
-// st may be nil for conn-level
-func (sc *serverConn) sendWindowUpdate(st *stream, n int) {
-	sc.serveG.check()
-	// "The legal range for the increment to the flow control
-	// window is 1 to 2^31-1 (2,147,483,647) octets."
-	// A Go Read call on 64-bit machines could in theory read
-	// a larger Read than this. Very unlikely, but we handle it here
-	// rather than elsewhere for now.
-	const maxUint31 = 1<<31 - 1
-	for n >= maxUint31 {
-		sc.sendWindowUpdate32(st, maxUint31)
-		n -= maxUint31
-	}
-	sc.sendWindowUpdate32(st, int32(n))
-}
-
-// st may be nil for conn-level
-func (sc *serverConn) sendWindowUpdate32(st *stream, n int32) {
-	sc.serveG.check()
-	if n == 0 {
-		return
-	}
-	if n < 0 {
-		panic("negative update")
-	}
-	var streamID uint32
-	if st != nil {
-		streamID = st.id
-	}
-	sc.writeFrame(frameWriteMsg{
-		write:  writeWindowUpdate{streamID: streamID, n: uint32(n)},
-		stream: st,
-	})
-	var ok bool
-	if st == nil {
-		ok = sc.inflow.add(n)
-	} else {
-		ok = st.inflow.add(n)
-	}
-	if !ok {
-		panic("internal error; sent too many window updates without decrements?")
-	}
-}
-
-type requestBody struct {
-	stream        *stream
-	conn          *serverConn
-	closed        bool
-	pipe          *pipe // non-nil if we have a HTTP entity message body
-	needsContinue bool  // need to send a 100-continue
-}
-
-func (b *requestBody) Close() error {
-	if b.pipe != nil {
-		b.pipe.Close(errClosedBody)
-	}
-	b.closed = true
-	return nil
-}
-
-func (b *requestBody) Read(p []byte) (n int, err error) {
-	if b.needsContinue {
-		b.needsContinue = false
-		b.conn.write100ContinueHeaders(b.stream)
-	}
-	if b.pipe == nil {
-		return 0, io.EOF
-	}
-	n, err = b.pipe.Read(p)
-	if n > 0 {
-		b.conn.noteBodyReadFromHandler(b.stream, n)
-	}
-	return
-}
-
-// responseWriter is the http.ResponseWriter implementation.  It's
-// intentionally small (1 pointer wide) to minimize garbage.  The
-// responseWriterState pointer inside is zeroed at the end of a
-// request (in handlerDone) and calls on the responseWriter thereafter
-// simply crash (caller's mistake), but the much larger responseWriterState
-// and buffers are reused between multiple requests.
-type responseWriter struct {
-	rws *responseWriterState
-}
-
-// Optional http.ResponseWriter interfaces implemented.
-var (
-	_ http.CloseNotifier = (*responseWriter)(nil)
-	_ http.Flusher       = (*responseWriter)(nil)
-	_ stringWriter       = (*responseWriter)(nil)
-)
-
-type responseWriterState struct {
-	// immutable within a request:
-	stream *stream
-	req    *http.Request
-	body   *requestBody // to close at end of request, if DATA frames didn't
-	conn   *serverConn
-
-	// TODO: adjust buffer writing sizes based on server config, frame size updates from peer, etc
-	bw *bufio.Writer // writing to a chunkWriter{this *responseWriterState}
-
-	// mutated by http.Handler goroutine:
-	handlerHeader http.Header // nil until called
-	snapHeader    http.Header // snapshot of handlerHeader at WriteHeader time
-	status        int         // status code passed to WriteHeader
-	wroteHeader   bool        // WriteHeader called (explicitly or implicitly). Not necessarily sent to user yet.
-	sentHeader    bool        // have we sent the header frame?
-	handlerDone   bool        // handler has finished
-	curWrite      writeData
-	frameWriteCh  chan error // re-used whenever we need to block on a frame being written
-
-	closeNotifierMu sync.Mutex // guards closeNotifierCh
-	closeNotifierCh chan bool  // nil until first used
-}
-
-type chunkWriter struct{ rws *responseWriterState }
-
-func (cw chunkWriter) Write(p []byte) (n int, err error) { return cw.rws.writeChunk(p) }
-
-// writeChunk writes chunks from the bufio.Writer. But because
-// bufio.Writer may bypass its chunking, sometimes p may be
-// arbitrarily large.
-//
-// writeChunk is also responsible (on the first chunk) for sending the
-// HEADER response.
-func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
-	if !rws.wroteHeader {
-		rws.writeHeader(200)
-	}
-	if !rws.sentHeader {
-		rws.sentHeader = true
-		var ctype, clen string // implicit ones, if we can calculate it
-		if rws.handlerDone && rws.snapHeader.Get("Content-Length") == "" {
-			clen = strconv.Itoa(len(p))
-		}
-		if rws.snapHeader.Get("Content-Type") == "" {
-			ctype = http.DetectContentType(p)
-		}
-		endStream := rws.handlerDone && len(p) == 0
-		rws.conn.writeHeaders(rws.stream, &writeResHeaders{
-			streamID:      rws.stream.id,
-			httpResCode:   rws.status,
-			h:             rws.snapHeader,
-			endStream:     endStream,
-			contentType:   ctype,
-			contentLength: clen,
-		}, rws.frameWriteCh)
-		if endStream {
-			return 0, nil
-		}
-	}
-	if len(p) == 0 && !rws.handlerDone {
-		return 0, nil
-	}
-	curWrite := &rws.curWrite
-	curWrite.streamID = rws.stream.id
-	curWrite.p = p
-	curWrite.endStream = rws.handlerDone
-	if err := rws.conn.writeDataFromHandler(rws.stream, curWrite, rws.frameWriteCh); err != nil {
-		return 0, err
-	}
-	return len(p), nil
-}
-
-func (w *responseWriter) Flush() {
-	rws := w.rws
-	if rws == nil {
-		panic("Header called after Handler finished")
-	}
-	if rws.bw.Buffered() > 0 {
-		if err := rws.bw.Flush(); err != nil {
-			// Ignore the error. The frame writer already knows.
-			return
-		}
-	} else {
-		// The bufio.Writer won't call chunkWriter.Write
-		// (writeChunk with zero bytes, so we have to do it
-		// ourselves to force the HTTP response header and/or
-		// final DATA frame (with END_STREAM) to be sent.
-		rws.writeChunk(nil)
-	}
-}
-
-func (w *responseWriter) CloseNotify() <-chan bool {
-	rws := w.rws
-	if rws == nil {
-		panic("CloseNotify called after Handler finished")
-	}
-	rws.closeNotifierMu.Lock()
-	ch := rws.closeNotifierCh
-	if ch == nil {
-		ch = make(chan bool, 1)
-		rws.closeNotifierCh = ch
-		go func() {
-			rws.stream.cw.Wait() // wait for close
-			ch <- true
-		}()
-	}
-	rws.closeNotifierMu.Unlock()
-	return ch
-}
-
-func (w *responseWriter) Header() http.Header {
-	rws := w.rws
-	if rws == nil {
-		panic("Header called after Handler finished")
-	}
-	if rws.handlerHeader == nil {
-		rws.handlerHeader = make(http.Header)
-	}
-	return rws.handlerHeader
-}
-
-func (w *responseWriter) WriteHeader(code int) {
-	rws := w.rws
-	if rws == nil {
-		panic("WriteHeader called after Handler finished")
-	}
-	rws.writeHeader(code)
-}
-
-func (rws *responseWriterState) writeHeader(code int) {
-	if !rws.wroteHeader {
-		rws.wroteHeader = true
-		rws.status = code
-		if len(rws.handlerHeader) > 0 {
-			rws.snapHeader = cloneHeader(rws.handlerHeader)
-		}
-	}
-}
-
-func cloneHeader(h http.Header) http.Header {
-	h2 := make(http.Header, len(h))
-	for k, vv := range h {
-		vv2 := make([]string, len(vv))
-		copy(vv2, vv)
-		h2[k] = vv2
-	}
-	return h2
-}
-
-// The Life Of A Write is like this:
-//
-// * Handler calls w.Write or w.WriteString ->
-// * -> rws.bw (*bufio.Writer) ->
-// * (Handler migth call Flush)
-// * -> chunkWriter{rws}
-// * -> responseWriterState.writeChunk(p []byte)
-// * -> responseWriterState.writeChunk (most of the magic; see comment there)
-func (w *responseWriter) Write(p []byte) (n int, err error) {
-	return w.write(len(p), p, "")
-}
-
-func (w *responseWriter) WriteString(s string) (n int, err error) {
-	return w.write(len(s), nil, s)
-}
-
-// either dataB or dataS is non-zero.
-func (w *responseWriter) write(lenData int, dataB []byte, dataS string) (n int, err error) {
-	rws := w.rws
-	if rws == nil {
-		panic("Write called after Handler finished")
-	}
-	if !rws.wroteHeader {
-		w.WriteHeader(200)
-	}
-	if dataB != nil {
-		return rws.bw.Write(dataB)
-	} else {
-		return rws.bw.WriteString(dataS)
-	}
-}
-
-func (w *responseWriter) handlerDone() {
-	rws := w.rws
-	if rws == nil {
-		panic("handlerDone called twice")
-	}
-	rws.handlerDone = true
-	w.Flush()
-	w.rws = nil
-	responseWriterStatePool.Put(rws)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/transport.go b/Godeps/_workspace/src/golang.org/x/net/http2/transport.go
deleted file mode 100644
index 73f358eefe..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/transport.go
+++ /dev/null
@@ -1,553 +0,0 @@
-// Copyright 2015 The Go Authors.
-// See https://go.googlesource.com/go/+/master/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://go.googlesource.com/go/+/master/LICENSE
-
-package http2
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-type Transport struct {
-	Fallback http.RoundTripper
-
-	// TODO: remove this and make more general with a TLS dial hook, like http
-	InsecureTLSDial bool
-
-	connMu sync.Mutex
-	conns  map[string][]*clientConn // key is host:port
-}
-
-type clientConn struct {
-	t        *Transport
-	tconn    *tls.Conn
-	tlsState *tls.ConnectionState
-	connKey  []string // key(s) this connection is cached in, in t.conns
-
-	readerDone chan struct{} // closed on error
-	readerErr  error         // set before readerDone is closed
-	hdec       *hpack.Decoder
-	nextRes    *http.Response
-
-	mu           sync.Mutex
-	closed       bool
-	goAway       *GoAwayFrame // if non-nil, the GoAwayFrame we received
-	streams      map[uint32]*clientStream
-	nextStreamID uint32
-	bw           *bufio.Writer
-	werr         error // first write error that has occurred
-	br           *bufio.Reader
-	fr           *Framer
-	// Settings from peer:
-	maxFrameSize         uint32
-	maxConcurrentStreams uint32
-	initialWindowSize    uint32
-	hbuf                 bytes.Buffer // HPACK encoder writes into this
-	henc                 *hpack.Encoder
-}
-
-type clientStream struct {
-	ID   uint32
-	resc chan resAndError
-	pw   *io.PipeWriter
-	pr   *io.PipeReader
-}
-
-type stickyErrWriter struct {
-	w   io.Writer
-	err *error
-}
-
-func (sew stickyErrWriter) Write(p []byte) (n int, err error) {
-	if *sew.err != nil {
-		return 0, *sew.err
-	}
-	n, err = sew.w.Write(p)
-	*sew.err = err
-	return
-}
-
-func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
-	if req.URL.Scheme != "https" {
-		if t.Fallback == nil {
-			return nil, errors.New("http2: unsupported scheme and no Fallback")
-		}
-		return t.Fallback.RoundTrip(req)
-	}
-
-	host, port, err := net.SplitHostPort(req.URL.Host)
-	if err != nil {
-		host = req.URL.Host
-		port = "443"
-	}
-
-	for {
-		cc, err := t.getClientConn(host, port)
-		if err != nil {
-			return nil, err
-		}
-		res, err := cc.roundTrip(req)
-		if shouldRetryRequest(err) { // TODO: or clientconn is overloaded (too many outstanding requests)?
-			continue
-		}
-		if err != nil {
-			return nil, err
-		}
-		return res, nil
-	}
-}
-
-// CloseIdleConnections closes any connections which were previously
-// connected from previous requests but are now sitting idle.
-// It does not interrupt any connections currently in use.
-func (t *Transport) CloseIdleConnections() {
-	t.connMu.Lock()
-	defer t.connMu.Unlock()
-	for _, vv := range t.conns {
-		for _, cc := range vv {
-			cc.closeIfIdle()
-		}
-	}
-}
-
-var errClientConnClosed = errors.New("http2: client conn is closed")
-
-func shouldRetryRequest(err error) bool {
-	// TODO: or GOAWAY graceful shutdown stuff
-	return err == errClientConnClosed
-}
-
-func (t *Transport) removeClientConn(cc *clientConn) {
-	t.connMu.Lock()
-	defer t.connMu.Unlock()
-	for _, key := range cc.connKey {
-		vv, ok := t.conns[key]
-		if !ok {
-			continue
-		}
-		newList := filterOutClientConn(vv, cc)
-		if len(newList) > 0 {
-			t.conns[key] = newList
-		} else {
-			delete(t.conns, key)
-		}
-	}
-}
-
-func filterOutClientConn(in []*clientConn, exclude *clientConn) []*clientConn {
-	out := in[:0]
-	for _, v := range in {
-		if v != exclude {
-			out = append(out, v)
-		}
-	}
-	return out
-}
-
-func (t *Transport) getClientConn(host, port string) (*clientConn, error) {
-	t.connMu.Lock()
-	defer t.connMu.Unlock()
-
-	key := net.JoinHostPort(host, port)
-
-	for _, cc := range t.conns[key] {
-		if cc.canTakeNewRequest() {
-			return cc, nil
-		}
-	}
-	if t.conns == nil {
-		t.conns = make(map[string][]*clientConn)
-	}
-	cc, err := t.newClientConn(host, port, key)
-	if err != nil {
-		return nil, err
-	}
-	t.conns[key] = append(t.conns[key], cc)
-	return cc, nil
-}
-
-func (t *Transport) newClientConn(host, port, key string) (*clientConn, error) {
-	cfg := &tls.Config{
-		ServerName:         host,
-		NextProtos:         []string{NextProtoTLS},
-		InsecureSkipVerify: t.InsecureTLSDial,
-	}
-	tconn, err := tls.Dial("tcp", net.JoinHostPort(host, port), cfg)
-	if err != nil {
-		return nil, err
-	}
-	if err := tconn.Handshake(); err != nil {
-		return nil, err
-	}
-	if !t.InsecureTLSDial {
-		if err := tconn.VerifyHostname(cfg.ServerName); err != nil {
-			return nil, err
-		}
-	}
-	state := tconn.ConnectionState()
-	if p := state.NegotiatedProtocol; p != NextProtoTLS {
-		// TODO(bradfitz): fall back to Fallback
-		return nil, fmt.Errorf("bad protocol: %v", p)
-	}
-	if !state.NegotiatedProtocolIsMutual {
-		return nil, errors.New("could not negotiate protocol mutually")
-	}
-	if _, err := tconn.Write(clientPreface); err != nil {
-		return nil, err
-	}
-
-	cc := &clientConn{
-		t:                    t,
-		tconn:                tconn,
-		connKey:              []string{key}, // TODO: cert's validated hostnames too
-		tlsState:             &state,
-		readerDone:           make(chan struct{}),
-		nextStreamID:         1,
-		maxFrameSize:         16 << 10, // spec default
-		initialWindowSize:    65535,    // spec default
-		maxConcurrentStreams: 1000,     // "infinite", per spec. 1000 seems good enough.
-		streams:              make(map[uint32]*clientStream),
-	}
-	cc.bw = bufio.NewWriter(stickyErrWriter{tconn, &cc.werr})
-	cc.br = bufio.NewReader(tconn)
-	cc.fr = NewFramer(cc.bw, cc.br)
-	cc.henc = hpack.NewEncoder(&cc.hbuf)
-
-	cc.fr.WriteSettings()
-	// TODO: re-send more conn-level flow control tokens when server uses all these.
-	cc.fr.WriteWindowUpdate(0, 1<<30) // um, 0x7fffffff doesn't work to Google? it hangs?
-	cc.bw.Flush()
-	if cc.werr != nil {
-		return nil, cc.werr
-	}
-
-	// Read the obligatory SETTINGS frame
-	f, err := cc.fr.ReadFrame()
-	if err != nil {
-		return nil, err
-	}
-	sf, ok := f.(*SettingsFrame)
-	if !ok {
-		return nil, fmt.Errorf("expected settings frame, got: %T", f)
-	}
-	cc.fr.WriteSettingsAck()
-	cc.bw.Flush()
-
-	sf.ForeachSetting(func(s Setting) error {
-		switch s.ID {
-		case SettingMaxFrameSize:
-			cc.maxFrameSize = s.Val
-		case SettingMaxConcurrentStreams:
-			cc.maxConcurrentStreams = s.Val
-		case SettingInitialWindowSize:
-			cc.initialWindowSize = s.Val
-		default:
-			// TODO(bradfitz): handle more
-			log.Printf("Unhandled Setting: %v", s)
-		}
-		return nil
-	})
-	// TODO: figure out henc size
-	cc.hdec = hpack.NewDecoder(initialHeaderTableSize, cc.onNewHeaderField)
-
-	go cc.readLoop()
-	return cc, nil
-}
-
-func (cc *clientConn) setGoAway(f *GoAwayFrame) {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	cc.goAway = f
-}
-
-func (cc *clientConn) canTakeNewRequest() bool {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	return cc.goAway == nil &&
-		int64(len(cc.streams)+1) < int64(cc.maxConcurrentStreams) &&
-		cc.nextStreamID < 2147483647
-}
-
-func (cc *clientConn) closeIfIdle() {
-	cc.mu.Lock()
-	if len(cc.streams) > 0 {
-		cc.mu.Unlock()
-		return
-	}
-	cc.closed = true
-	// TODO: do clients send GOAWAY too? maybe? Just Close:
-	cc.mu.Unlock()
-
-	cc.tconn.Close()
-}
-
-func (cc *clientConn) roundTrip(req *http.Request) (*http.Response, error) {
-	cc.mu.Lock()
-
-	if cc.closed {
-		cc.mu.Unlock()
-		return nil, errClientConnClosed
-	}
-
-	cs := cc.newStream()
-	hasBody := false // TODO
-
-	// we send: HEADERS[+CONTINUATION] + (DATA?)
-	hdrs := cc.encodeHeaders(req)
-	first := true
-	for len(hdrs) > 0 {
-		chunk := hdrs
-		if len(chunk) > int(cc.maxFrameSize) {
-			chunk = chunk[:cc.maxFrameSize]
-		}
-		hdrs = hdrs[len(chunk):]
-		endHeaders := len(hdrs) == 0
-		if first {
-			cc.fr.WriteHeaders(HeadersFrameParam{
-				StreamID:      cs.ID,
-				BlockFragment: chunk,
-				EndStream:     !hasBody,
-				EndHeaders:    endHeaders,
-			})
-			first = false
-		} else {
-			cc.fr.WriteContinuation(cs.ID, endHeaders, chunk)
-		}
-	}
-	cc.bw.Flush()
-	werr := cc.werr
-	cc.mu.Unlock()
-
-	if hasBody {
-		// TODO: write data. and it should probably be interleaved:
-		//   go ... io.Copy(dataFrameWriter{cc, cs, ...}, req.Body) ... etc
-	}
-
-	if werr != nil {
-		return nil, werr
-	}
-
-	re := <-cs.resc
-	if re.err != nil {
-		return nil, re.err
-	}
-	res := re.res
-	res.Request = req
-	res.TLS = cc.tlsState
-	return res, nil
-}
-
-// requires cc.mu be held.
-func (cc *clientConn) encodeHeaders(req *http.Request) []byte {
-	cc.hbuf.Reset()
-
-	// TODO(bradfitz): figure out :authority-vs-Host stuff between http2 and Go
-	host := req.Host
-	if host == "" {
-		host = req.URL.Host
-	}
-
-	path := req.URL.Path
-	if path == "" {
-		path = "/"
-	}
-
-	cc.writeHeader(":authority", host) // probably not right for all sites
-	cc.writeHeader(":method", req.Method)
-	cc.writeHeader(":path", path)
-	cc.writeHeader(":scheme", "https")
-
-	for k, vv := range req.Header {
-		lowKey := strings.ToLower(k)
-		if lowKey == "host" {
-			continue
-		}
-		for _, v := range vv {
-			cc.writeHeader(lowKey, v)
-		}
-	}
-	return cc.hbuf.Bytes()
-}
-
-func (cc *clientConn) writeHeader(name, value string) {
-	log.Printf("sending %q = %q", name, value)
-	cc.henc.WriteField(hpack.HeaderField{Name: name, Value: value})
-}
-
-type resAndError struct {
-	res *http.Response
-	err error
-}
-
-// requires cc.mu be held.
-func (cc *clientConn) newStream() *clientStream {
-	cs := &clientStream{
-		ID:   cc.nextStreamID,
-		resc: make(chan resAndError, 1),
-	}
-	cc.nextStreamID += 2
-	cc.streams[cs.ID] = cs
-	return cs
-}
-
-func (cc *clientConn) streamByID(id uint32, andRemove bool) *clientStream {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	cs := cc.streams[id]
-	if andRemove {
-		delete(cc.streams, id)
-	}
-	return cs
-}
-
-// runs in its own goroutine.
-func (cc *clientConn) readLoop() {
-	defer cc.t.removeClientConn(cc)
-	defer close(cc.readerDone)
-
-	activeRes := map[uint32]*clientStream{} // keyed by streamID
-	// Close any response bodies if the server closes prematurely.
-	// TODO: also do this if we've written the headers but not
-	// gotten a response yet.
-	defer func() {
-		err := cc.readerErr
-		if err == io.EOF {
-			err = io.ErrUnexpectedEOF
-		}
-		for _, cs := range activeRes {
-			cs.pw.CloseWithError(err)
-		}
-	}()
-
-	// continueStreamID is the stream ID we're waiting for
-	// continuation frames for.
-	var continueStreamID uint32
-
-	for {
-		f, err := cc.fr.ReadFrame()
-		if err != nil {
-			cc.readerErr = err
-			return
-		}
-		log.Printf("Transport received %v: %#v", f.Header(), f)
-
-		streamID := f.Header().StreamID
-
-		_, isContinue := f.(*ContinuationFrame)
-		if isContinue {
-			if streamID != continueStreamID {
-				log.Printf("Protocol violation: got CONTINUATION with id %d; want %d", streamID, continueStreamID)
-				cc.readerErr = ConnectionError(ErrCodeProtocol)
-				return
-			}
-		} else if continueStreamID != 0 {
-			// Continue frames need to be adjacent in the stream
-			// and we were in the middle of headers.
-			log.Printf("Protocol violation: got %T for stream %d, want CONTINUATION for %d", f, streamID, continueStreamID)
-			cc.readerErr = ConnectionError(ErrCodeProtocol)
-			return
-		}
-
-		if streamID%2 == 0 {
-			// Ignore streams pushed from the server for now.
-			// These always have an even stream id.
-			continue
-		}
-		streamEnded := false
-		if ff, ok := f.(streamEnder); ok {
-			streamEnded = ff.StreamEnded()
-		}
-
-		cs := cc.streamByID(streamID, streamEnded)
-		if cs == nil {
-			log.Printf("Received frame for untracked stream ID %d", streamID)
-			continue
-		}
-
-		switch f := f.(type) {
-		case *HeadersFrame:
-			cc.nextRes = &http.Response{
-				Proto:      "HTTP/2.0",
-				ProtoMajor: 2,
-				Header:     make(http.Header),
-			}
-			cs.pr, cs.pw = io.Pipe()
-			cc.hdec.Write(f.HeaderBlockFragment())
-		case *ContinuationFrame:
-			cc.hdec.Write(f.HeaderBlockFragment())
-		case *DataFrame:
-			log.Printf("DATA: %q", f.Data())
-			cs.pw.Write(f.Data())
-		case *GoAwayFrame:
-			cc.t.removeClientConn(cc)
-			if f.ErrCode != 0 {
-				// TODO: deal with GOAWAY more. particularly the error code
-				log.Printf("transport got GOAWAY with error code = %v", f.ErrCode)
-			}
-			cc.setGoAway(f)
-		default:
-			log.Printf("Transport: unhandled response frame type %T", f)
-		}
-		headersEnded := false
-		if he, ok := f.(headersEnder); ok {
-			headersEnded = he.HeadersEnded()
-			if headersEnded {
-				continueStreamID = 0
-			} else {
-				continueStreamID = streamID
-			}
-		}
-
-		if streamEnded {
-			cs.pw.Close()
-			delete(activeRes, streamID)
-		}
-		if headersEnded {
-			if cs == nil {
-				panic("couldn't find stream") // TODO be graceful
-			}
-			// TODO: set the Body to one which notes the
-			// Close and also sends the server a
-			// RST_STREAM
-			cc.nextRes.Body = cs.pr
-			res := cc.nextRes
-			activeRes[streamID] = cs
-			cs.resc <- resAndError{res: res}
-		}
-	}
-}
-
-func (cc *clientConn) onNewHeaderField(f hpack.HeaderField) {
-	// TODO: verifiy pseudo headers come before non-pseudo headers
-	// TODO: verifiy the status is set
-	log.Printf("Header field: %+v", f)
-	if f.Name == ":status" {
-		code, err := strconv.Atoi(f.Value)
-		if err != nil {
-			panic("TODO: be graceful")
-		}
-		cc.nextRes.Status = f.Value + " " + http.StatusText(code)
-		cc.nextRes.StatusCode = code
-		return
-	}
-	if strings.HasPrefix(f.Name, ":") {
-		// "Endpoints MUST NOT generate pseudo-header fields other than those defined in this document."
-		// TODO: treat as invalid?
-		return
-	}
-	cc.nextRes.Header.Add(http.CanonicalHeaderKey(f.Name), f.Value)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/write.go b/Godeps/_workspace/src/golang.org/x/net/http2/write.go
deleted file mode 100644
index 02f0743de6..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/write.go
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package http2
-
-import (
-	"bytes"
-	"fmt"
-	"net/http"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-// writeFramer is implemented by any type that is used to write frames.
-type writeFramer interface {
-	writeFrame(writeContext) error
-}
-
-// writeContext is the interface needed by the various frame writer
-// types below. All the writeFrame methods below are scheduled via the
-// frame writing scheduler (see writeScheduler in writesched.go).
-//
-// This interface is implemented by *serverConn.
-// TODO: use it from the client code too, once it exists.
-type writeContext interface {
-	Framer() *Framer
-	Flush() error
-	CloseConn() error
-	// HeaderEncoder returns an HPACK encoder that writes to the
-	// returned buffer.
-	HeaderEncoder() (*hpack.Encoder, *bytes.Buffer)
-}
-
-// endsStream reports whether the given frame writer w will locally
-// close the stream.
-func endsStream(w writeFramer) bool {
-	switch v := w.(type) {
-	case *writeData:
-		return v.endStream
-	case *writeResHeaders:
-		return v.endStream
-	}
-	return false
-}
-
-type flushFrameWriter struct{}
-
-func (flushFrameWriter) writeFrame(ctx writeContext) error {
-	return ctx.Flush()
-}
-
-type writeSettings []Setting
-
-func (s writeSettings) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteSettings([]Setting(s)...)
-}
-
-type writeGoAway struct {
-	maxStreamID uint32
-	code        ErrCode
-}
-
-func (p *writeGoAway) writeFrame(ctx writeContext) error {
-	err := ctx.Framer().WriteGoAway(p.maxStreamID, p.code, nil)
-	if p.code != 0 {
-		ctx.Flush() // ignore error: we're hanging up on them anyway
-		time.Sleep(50 * time.Millisecond)
-		ctx.CloseConn()
-	}
-	return err
-}
-
-type writeData struct {
-	streamID  uint32
-	p         []byte
-	endStream bool
-}
-
-func (w *writeData) String() string {
-	return fmt.Sprintf("writeData(stream=%d, p=%d, endStream=%v)", w.streamID, len(w.p), w.endStream)
-}
-
-func (w *writeData) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteData(w.streamID, w.endStream, w.p)
-}
-
-func (se StreamError) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteRSTStream(se.StreamID, se.Code)
-}
-
-type writePingAck struct{ pf *PingFrame }
-
-func (w writePingAck) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WritePing(true, w.pf.Data)
-}
-
-type writeSettingsAck struct{}
-
-func (writeSettingsAck) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteSettingsAck()
-}
-
-// writeResHeaders is a request to write a HEADERS and 0+ CONTINUATION frames
-// for HTTP response headers from a server handler.
-type writeResHeaders struct {
-	streamID    uint32
-	httpResCode int
-	h           http.Header // may be nil
-	endStream   bool
-
-	contentType   string
-	contentLength string
-}
-
-func (w *writeResHeaders) writeFrame(ctx writeContext) error {
-	enc, buf := ctx.HeaderEncoder()
-	buf.Reset()
-	enc.WriteField(hpack.HeaderField{Name: ":status", Value: httpCodeString(w.httpResCode)})
-	for k, vv := range w.h {
-		k = lowerHeader(k)
-		for _, v := range vv {
-			// TODO: more of "8.1.2.2 Connection-Specific Header Fields"
-			if k == "transfer-encoding" && v != "trailers" {
-				continue
-			}
-			enc.WriteField(hpack.HeaderField{Name: k, Value: v})
-		}
-	}
-	if w.contentType != "" {
-		enc.WriteField(hpack.HeaderField{Name: "content-type", Value: w.contentType})
-	}
-	if w.contentLength != "" {
-		enc.WriteField(hpack.HeaderField{Name: "content-length", Value: w.contentLength})
-	}
-
-	headerBlock := buf.Bytes()
-	if len(headerBlock) == 0 {
-		panic("unexpected empty hpack")
-	}
-
-	// For now we're lazy and just pick the minimum MAX_FRAME_SIZE
-	// that all peers must support (16KB). Later we could care
-	// more and send larger frames if the peer advertised it, but
-	// there's little point. Most headers are small anyway (so we
-	// generally won't have CONTINUATION frames), and extra frames
-	// only waste 9 bytes anyway.
-	const maxFrameSize = 16384
-
-	first := true
-	for len(headerBlock) > 0 {
-		frag := headerBlock
-		if len(frag) > maxFrameSize {
-			frag = frag[:maxFrameSize]
-		}
-		headerBlock = headerBlock[len(frag):]
-		endHeaders := len(headerBlock) == 0
-		var err error
-		if first {
-			first = false
-			err = ctx.Framer().WriteHeaders(HeadersFrameParam{
-				StreamID:      w.streamID,
-				BlockFragment: frag,
-				EndStream:     w.endStream,
-				EndHeaders:    endHeaders,
-			})
-		} else {
-			err = ctx.Framer().WriteContinuation(w.streamID, endHeaders, frag)
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-type write100ContinueHeadersFrame struct {
-	streamID uint32
-}
-
-func (w write100ContinueHeadersFrame) writeFrame(ctx writeContext) error {
-	enc, buf := ctx.HeaderEncoder()
-	buf.Reset()
-	enc.WriteField(hpack.HeaderField{Name: ":status", Value: "100"})
-	return ctx.Framer().WriteHeaders(HeadersFrameParam{
-		StreamID:      w.streamID,
-		BlockFragment: buf.Bytes(),
-		EndStream:     false,
-		EndHeaders:    true,
-	})
-}
-
-type writeWindowUpdate struct {
-	streamID uint32 // or 0 for conn-level
-	n        uint32
-}
-
-func (wu writeWindowUpdate) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteWindowUpdate(wu.streamID, wu.n)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/http2/writesched.go b/Godeps/_workspace/src/golang.org/x/net/http2/writesched.go
deleted file mode 100644
index 0e1b7486fb..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/http2/writesched.go
+++ /dev/null
@@ -1,286 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// See https://code.google.com/p/go/source/browse/CONTRIBUTORS
-// Licensed under the same terms as Go itself:
-// https://code.google.com/p/go/source/browse/LICENSE
-
-package http2
-
-import "fmt"
-
-// frameWriteMsg is a request to write a frame.
-type frameWriteMsg struct {
-	// write is the interface value that does the writing, once the
-	// writeScheduler (below) has decided to select this frame
-	// to write. The write functions are all defined in write.go.
-	write writeFramer
-
-	stream *stream // used for prioritization. nil for non-stream frames.
-
-	// done, if non-nil, must be a buffered channel with space for
-	// 1 message and is sent the return value from write (or an
-	// earlier error) when the frame has been written.
-	done chan error
-}
-
-// for debugging only:
-func (wm frameWriteMsg) String() string {
-	var streamID uint32
-	if wm.stream != nil {
-		streamID = wm.stream.id
-	}
-	var des string
-	if s, ok := wm.write.(fmt.Stringer); ok {
-		des = s.String()
-	} else {
-		des = fmt.Sprintf("%T", wm.write)
-	}
-	return fmt.Sprintf("[frameWriteMsg stream=%d, ch=%v, type: %v]", streamID, wm.done != nil, des)
-}
-
-// writeScheduler tracks pending frames to write, priorities, and decides
-// the next one to use. It is not thread-safe.
-type writeScheduler struct {
-	// zero are frames not associated with a specific stream.
-	// They're sent before any stream-specific freams.
-	zero writeQueue
-
-	// maxFrameSize is the maximum size of a DATA frame
-	// we'll write. Must be non-zero and between 16K-16M.
-	maxFrameSize uint32
-
-	// sq contains the stream-specific queues, keyed by stream ID.
-	// when a stream is idle, it's deleted from the map.
-	sq map[uint32]*writeQueue
-
-	// canSend is a slice of memory that's reused between frame
-	// scheduling decisions to hold the list of writeQueues (from sq)
-	// which have enough flow control data to send. After canSend is
-	// built, the best is selected.
-	canSend []*writeQueue
-
-	// pool of empty queues for reuse.
-	queuePool []*writeQueue
-}
-
-func (ws *writeScheduler) putEmptyQueue(q *writeQueue) {
-	if len(q.s) != 0 {
-		panic("queue must be empty")
-	}
-	ws.queuePool = append(ws.queuePool, q)
-}
-
-func (ws *writeScheduler) getEmptyQueue() *writeQueue {
-	ln := len(ws.queuePool)
-	if ln == 0 {
-		return new(writeQueue)
-	}
-	q := ws.queuePool[ln-1]
-	ws.queuePool = ws.queuePool[:ln-1]
-	return q
-}
-
-func (ws *writeScheduler) empty() bool { return ws.zero.empty() && len(ws.sq) == 0 }
-
-func (ws *writeScheduler) add(wm frameWriteMsg) {
-	st := wm.stream
-	if st == nil {
-		ws.zero.push(wm)
-	} else {
-		ws.streamQueue(st.id).push(wm)
-	}
-}
-
-func (ws *writeScheduler) streamQueue(streamID uint32) *writeQueue {
-	if q, ok := ws.sq[streamID]; ok {
-		return q
-	}
-	if ws.sq == nil {
-		ws.sq = make(map[uint32]*writeQueue)
-	}
-	q := ws.getEmptyQueue()
-	ws.sq[streamID] = q
-	return q
-}
-
-// take returns the most important frame to write and removes it from the scheduler.
-// It is illegal to call this if the scheduler is empty or if there are no connection-level
-// flow control bytes available.
-func (ws *writeScheduler) take() (wm frameWriteMsg, ok bool) {
-	if ws.maxFrameSize == 0 {
-		panic("internal error: ws.maxFrameSize not initialized or invalid")
-	}
-
-	// If there any frames not associated with streams, prefer those first.
-	// These are usually SETTINGS, etc.
-	if !ws.zero.empty() {
-		return ws.zero.shift(), true
-	}
-	if len(ws.sq) == 0 {
-		return
-	}
-
-	// Next, prioritize frames on streams that aren't DATA frames (no cost).
-	for id, q := range ws.sq {
-		if q.firstIsNoCost() {
-			return ws.takeFrom(id, q)
-		}
-	}
-
-	// Now, all that remains are DATA frames with non-zero bytes to
-	// send. So pick the best one.
-	if len(ws.canSend) != 0 {
-		panic("should be empty")
-	}
-	for _, q := range ws.sq {
-		if n := ws.streamWritableBytes(q); n > 0 {
-			ws.canSend = append(ws.canSend, q)
-		}
-	}
-	if len(ws.canSend) == 0 {
-		return
-	}
-	defer ws.zeroCanSend()
-
-	// TODO: find the best queue
-	q := ws.canSend[0]
-
-	return ws.takeFrom(q.streamID(), q)
-}
-
-// zeroCanSend is defered from take.
-func (ws *writeScheduler) zeroCanSend() {
-	for i := range ws.canSend {
-		ws.canSend[i] = nil
-	}
-	ws.canSend = ws.canSend[:0]
-}
-
-// streamWritableBytes returns the number of DATA bytes we could write
-// from the given queue's stream, if this stream/queue were
-// selected. It is an error to call this if q's head isn't a
-// *writeData.
-func (ws *writeScheduler) streamWritableBytes(q *writeQueue) int32 {
-	wm := q.head()
-	ret := wm.stream.flow.available() // max we can write
-	if ret == 0 {
-		return 0
-	}
-	if int32(ws.maxFrameSize) < ret {
-		ret = int32(ws.maxFrameSize)
-	}
-	if ret == 0 {
-		panic("internal error: ws.maxFrameSize not initialized or invalid")
-	}
-	wd := wm.write.(*writeData)
-	if len(wd.p) < int(ret) {
-		ret = int32(len(wd.p))
-	}
-	return ret
-}
-
-func (ws *writeScheduler) takeFrom(id uint32, q *writeQueue) (wm frameWriteMsg, ok bool) {
-	wm = q.head()
-	// If the first item in this queue costs flow control tokens
-	// and we don't have enough, write as much as we can.
-	if wd, ok := wm.write.(*writeData); ok && len(wd.p) > 0 {
-		allowed := wm.stream.flow.available() // max we can write
-		if allowed == 0 {
-			// No quota available. Caller can try the next stream.
-			return frameWriteMsg{}, false
-		}
-		if int32(ws.maxFrameSize) < allowed {
-			allowed = int32(ws.maxFrameSize)
-		}
-		// TODO: further restrict the allowed size, because even if
-		// the peer says it's okay to write 16MB data frames, we might
-		// want to write smaller ones to properly weight competing
-		// streams' priorities.
-
-		if len(wd.p) > int(allowed) {
-			wm.stream.flow.take(allowed)
-			chunk := wd.p[:allowed]
-			wd.p = wd.p[allowed:]
-			// Make up a new write message of a valid size, rather
-			// than shifting one off the queue.
-			return frameWriteMsg{
-				stream: wm.stream,
-				write: &writeData{
-					streamID: wd.streamID,
-					p:        chunk,
-					// even if the original had endStream set, there
-					// arebytes remaining because len(wd.p) > allowed,
-					// so we know endStream is false:
-					endStream: false,
-				},
-				// our caller is blocking on the final DATA frame, not
-				// these intermediates, so no need to wait:
-				done: nil,
-			}, true
-		}
-		wm.stream.flow.take(int32(len(wd.p)))
-	}
-
-	q.shift()
-	if q.empty() {
-		ws.putEmptyQueue(q)
-		delete(ws.sq, id)
-	}
-	return wm, true
-}
-
-func (ws *writeScheduler) forgetStream(id uint32) {
-	q, ok := ws.sq[id]
-	if !ok {
-		return
-	}
-	delete(ws.sq, id)
-
-	// But keep it for others later.
-	for i := range q.s {
-		q.s[i] = frameWriteMsg{}
-	}
-	q.s = q.s[:0]
-	ws.putEmptyQueue(q)
-}
-
-type writeQueue struct {
-	s []frameWriteMsg
-}
-
-// streamID returns the stream ID for a non-empty stream-specific queue.
-func (q *writeQueue) streamID() uint32 { return q.s[0].stream.id }
-
-func (q *writeQueue) empty() bool { return len(q.s) == 0 }
-
-func (q *writeQueue) push(wm frameWriteMsg) {
-	q.s = append(q.s, wm)
-}
-
-// head returns the next item that would be removed by shift.
-func (q *writeQueue) head() frameWriteMsg {
-	if len(q.s) == 0 {
-		panic("invalid use of queue")
-	}
-	return q.s[0]
-}
-
-func (q *writeQueue) shift() frameWriteMsg {
-	if len(q.s) == 0 {
-		panic("invalid use of queue")
-	}
-	wm := q.s[0]
-	// TODO: less copy-happy queue.
-	copy(q.s, q.s[1:])
-	q.s[len(q.s)-1] = frameWriteMsg{}
-	q.s = q.s[:len(q.s)-1]
-	return wm
-}
-
-func (q *writeQueue) firstIsNoCost() bool {
-	if df, ok := q.s[0].write.(*writeData); ok {
-		return len(df.p) == 0
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go b/Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go
deleted file mode 100644
index 3f90b7300d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/internal/timeseries/timeseries.go
+++ /dev/null
@@ -1,525 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package timeseries implements a time series structure for stats collection.
-package timeseries
-
-import (
-	"fmt"
-	"log"
-	"time"
-)
-
-const (
-	timeSeriesNumBuckets       = 64
-	minuteHourSeriesNumBuckets = 60
-)
-
-var timeSeriesResolutions = []time.Duration{
-	1 * time.Second,
-	10 * time.Second,
-	1 * time.Minute,
-	10 * time.Minute,
-	1 * time.Hour,
-	6 * time.Hour,
-	24 * time.Hour,          // 1 day
-	7 * 24 * time.Hour,      // 1 week
-	4 * 7 * 24 * time.Hour,  // 4 weeks
-	16 * 7 * 24 * time.Hour, // 16 weeks
-}
-
-var minuteHourSeriesResolutions = []time.Duration{
-	1 * time.Second,
-	1 * time.Minute,
-}
-
-// An Observable is a kind of data that can be aggregated in a time series.
-type Observable interface {
-	Multiply(ratio float64)    // Multiplies the data in self by a given ratio
-	Add(other Observable)      // Adds the data from a different observation to self
-	Clear()                    // Clears the observation so it can be reused.
-	CopyFrom(other Observable) // Copies the contents of a given observation to self
-}
-
-// Float attaches the methods of Observable to a float64.
-type Float float64
-
-// NewFloat returns a Float.
-func NewFloat() Observable {
-	f := Float(0)
-	return &f
-}
-
-// String returns the float as a string.
-func (f *Float) String() string { return fmt.Sprintf("%g", f.Value()) }
-
-// Value returns the float's value.
-func (f *Float) Value() float64 { return float64(*f) }
-
-func (f *Float) Multiply(ratio float64) { *f *= Float(ratio) }
-
-func (f *Float) Add(other Observable) {
-	o := other.(*Float)
-	*f += *o
-}
-
-func (f *Float) Clear() { *f = 0 }
-
-func (f *Float) CopyFrom(other Observable) {
-	o := other.(*Float)
-	*f = *o
-}
-
-// A Clock tells the current time.
-type Clock interface {
-	Time() time.Time
-}
-
-type defaultClock int
-
-var defaultClockInstance defaultClock
-
-func (defaultClock) Time() time.Time { return time.Now() }
-
-// Information kept per level. Each level consists of a circular list of
-// observations. The start of the level may be derived from end and the
-// len(buckets) * sizeInMillis.
-type tsLevel struct {
-	oldest   int               // index to oldest bucketed Observable
-	newest   int               // index to newest bucketed Observable
-	end      time.Time         // end timestamp for this level
-	size     time.Duration     // duration of the bucketed Observable
-	buckets  []Observable      // collections of observations
-	provider func() Observable // used for creating new Observable
-}
-
-func (l *tsLevel) Clear() {
-	l.oldest = 0
-	l.newest = len(l.buckets) - 1
-	l.end = time.Time{}
-	for i := range l.buckets {
-		if l.buckets[i] != nil {
-			l.buckets[i].Clear()
-			l.buckets[i] = nil
-		}
-	}
-}
-
-func (l *tsLevel) InitLevel(size time.Duration, numBuckets int, f func() Observable) {
-	l.size = size
-	l.provider = f
-	l.buckets = make([]Observable, numBuckets)
-}
-
-// Keeps a sequence of levels. Each level is responsible for storing data at
-// a given resolution. For example, the first level stores data at a one
-// minute resolution while the second level stores data at a one hour
-// resolution.
-
-// Each level is represented by a sequence of buckets. Each bucket spans an
-// interval equal to the resolution of the level. New observations are added
-// to the last bucket.
-type timeSeries struct {
-	provider    func() Observable // make more Observable
-	numBuckets  int               // number of buckets in each level
-	levels      []*tsLevel        // levels of bucketed Observable
-	lastAdd     time.Time         // time of last Observable tracked
-	total       Observable        // convenient aggregation of all Observable
-	clock       Clock             // Clock for getting current time
-	pending     Observable        // observations not yet bucketed
-	pendingTime time.Time         // what time are we keeping in pending
-	dirty       bool              // if there are pending observations
-}
-
-// init initializes a level according to the supplied criteria.
-func (ts *timeSeries) init(resolutions []time.Duration, f func() Observable, numBuckets int, clock Clock) {
-	ts.provider = f
-	ts.numBuckets = numBuckets
-	ts.clock = clock
-	ts.levels = make([]*tsLevel, len(resolutions))
-
-	for i := range resolutions {
-		if i > 0 && resolutions[i-1] >= resolutions[i] {
-			log.Print("timeseries: resolutions must be monotonically increasing")
-			break
-		}
-		newLevel := new(tsLevel)
-		newLevel.InitLevel(resolutions[i], ts.numBuckets, ts.provider)
-		ts.levels[i] = newLevel
-	}
-
-	ts.Clear()
-}
-
-// Clear removes all observations from the time series.
-func (ts *timeSeries) Clear() {
-	ts.lastAdd = time.Time{}
-	ts.total = ts.resetObservation(ts.total)
-	ts.pending = ts.resetObservation(ts.pending)
-	ts.pendingTime = time.Time{}
-	ts.dirty = false
-
-	for i := range ts.levels {
-		ts.levels[i].Clear()
-	}
-}
-
-// Add records an observation at the current time.
-func (ts *timeSeries) Add(observation Observable) {
-	ts.AddWithTime(observation, ts.clock.Time())
-}
-
-// AddWithTime records an observation at the specified time.
-func (ts *timeSeries) AddWithTime(observation Observable, t time.Time) {
-
-	smallBucketDuration := ts.levels[0].size
-
-	if t.After(ts.lastAdd) {
-		ts.lastAdd = t
-	}
-
-	if t.After(ts.pendingTime) {
-		ts.advance(t)
-		ts.mergePendingUpdates()
-		ts.pendingTime = ts.levels[0].end
-		ts.pending.CopyFrom(observation)
-		ts.dirty = true
-	} else if t.After(ts.pendingTime.Add(-1 * smallBucketDuration)) {
-		// The observation is close enough to go into the pending bucket.
-		// This compensates for clock skewing and small scheduling delays
-		// by letting the update stay in the fast path.
-		ts.pending.Add(observation)
-		ts.dirty = true
-	} else {
-		ts.mergeValue(observation, t)
-	}
-}
-
-// mergeValue inserts the observation at the specified time in the past into all levels.
-func (ts *timeSeries) mergeValue(observation Observable, t time.Time) {
-	for _, level := range ts.levels {
-		index := (ts.numBuckets - 1) - int(level.end.Sub(t)/level.size)
-		if 0 <= index && index < ts.numBuckets {
-			bucketNumber := (level.oldest + index) % ts.numBuckets
-			if level.buckets[bucketNumber] == nil {
-				level.buckets[bucketNumber] = level.provider()
-			}
-			level.buckets[bucketNumber].Add(observation)
-		}
-	}
-	ts.total.Add(observation)
-}
-
-// mergePendingUpdates applies the pending updates into all levels.
-func (ts *timeSeries) mergePendingUpdates() {
-	if ts.dirty {
-		ts.mergeValue(ts.pending, ts.pendingTime)
-		ts.pending = ts.resetObservation(ts.pending)
-		ts.dirty = false
-	}
-}
-
-// advance cycles the buckets at each level until the latest bucket in
-// each level can hold the time specified.
-func (ts *timeSeries) advance(t time.Time) {
-	if !t.After(ts.levels[0].end) {
-		return
-	}
-	for i := 0; i < len(ts.levels); i++ {
-		level := ts.levels[i]
-		if !level.end.Before(t) {
-			break
-		}
-
-		// If the time is sufficiently far, just clear the level and advance
-		// directly.
-		if !t.Before(level.end.Add(level.size * time.Duration(ts.numBuckets))) {
-			for _, b := range level.buckets {
-				ts.resetObservation(b)
-			}
-			level.end = time.Unix(0, (t.UnixNano()/level.size.Nanoseconds())*level.size.Nanoseconds())
-		}
-
-		for t.After(level.end) {
-			level.end = level.end.Add(level.size)
-			level.newest = level.oldest
-			level.oldest = (level.oldest + 1) % ts.numBuckets
-			ts.resetObservation(level.buckets[level.newest])
-		}
-
-		t = level.end
-	}
-}
-
-// Latest returns the sum of the num latest buckets from the level.
-func (ts *timeSeries) Latest(level, num int) Observable {
-	now := ts.clock.Time()
-	if ts.levels[0].end.Before(now) {
-		ts.advance(now)
-	}
-
-	ts.mergePendingUpdates()
-
-	result := ts.provider()
-	l := ts.levels[level]
-	index := l.newest
-
-	for i := 0; i < num; i++ {
-		if l.buckets[index] != nil {
-			result.Add(l.buckets[index])
-		}
-		if index == 0 {
-			index = ts.numBuckets
-		}
-		index--
-	}
-
-	return result
-}
-
-// LatestBuckets returns a copy of the num latest buckets from level.
-func (ts *timeSeries) LatestBuckets(level, num int) []Observable {
-	if level < 0 || level > len(ts.levels) {
-		log.Print("timeseries: bad level argument: ", level)
-		return nil
-	}
-	if num < 0 || num >= ts.numBuckets {
-		log.Print("timeseries: bad num argument: ", num)
-		return nil
-	}
-
-	results := make([]Observable, num)
-	now := ts.clock.Time()
-	if ts.levels[0].end.Before(now) {
-		ts.advance(now)
-	}
-
-	ts.mergePendingUpdates()
-
-	l := ts.levels[level]
-	index := l.newest
-
-	for i := 0; i < num; i++ {
-		result := ts.provider()
-		results[i] = result
-		if l.buckets[index] != nil {
-			result.CopyFrom(l.buckets[index])
-		}
-
-		if index == 0 {
-			index = ts.numBuckets
-		}
-		index -= 1
-	}
-	return results
-}
-
-// ScaleBy updates observations by scaling by factor.
-func (ts *timeSeries) ScaleBy(factor float64) {
-	for _, l := range ts.levels {
-		for i := 0; i < ts.numBuckets; i++ {
-			l.buckets[i].Multiply(factor)
-		}
-	}
-
-	ts.total.Multiply(factor)
-	ts.pending.Multiply(factor)
-}
-
-// Range returns the sum of observations added over the specified time range.
-// If start or finish times don't fall on bucket boundaries of the same
-// level, then return values are approximate answers.
-func (ts *timeSeries) Range(start, finish time.Time) Observable {
-	return ts.ComputeRange(start, finish, 1)[0]
-}
-
-// Recent returns the sum of observations from the last delta.
-func (ts *timeSeries) Recent(delta time.Duration) Observable {
-	now := ts.clock.Time()
-	return ts.Range(now.Add(-delta), now)
-}
-
-// Total returns the total of all observations.
-func (ts *timeSeries) Total() Observable {
-	ts.mergePendingUpdates()
-	return ts.total
-}
-
-// ComputeRange computes a specified number of values into a slice using
-// the observations recorded over the specified time period. The return
-// values are approximate if the start or finish times don't fall on the
-// bucket boundaries at the same level or if the number of buckets spanning
-// the range is not an integral multiple of num.
-func (ts *timeSeries) ComputeRange(start, finish time.Time, num int) []Observable {
-	if start.After(finish) {
-		log.Printf("timeseries: start > finish, %v>%v", start, finish)
-		return nil
-	}
-
-	if num < 0 {
-		log.Printf("timeseries: num < 0, %v", num)
-		return nil
-	}
-
-	results := make([]Observable, num)
-
-	for _, l := range ts.levels {
-		if !start.Before(l.end.Add(-l.size * time.Duration(ts.numBuckets))) {
-			ts.extract(l, start, finish, num, results)
-			return results
-		}
-	}
-
-	// Failed to find a level that covers the desired range.  So just
-	// extract from the last level, even if it doesn't cover the entire
-	// desired range.
-	ts.extract(ts.levels[len(ts.levels)-1], start, finish, num, results)
-
-	return results
-}
-
-// RecentList returns the specified number of values in slice over the most
-// recent time period of the specified range.
-func (ts *timeSeries) RecentList(delta time.Duration, num int) []Observable {
-	if delta < 0 {
-		return nil
-	}
-	now := ts.clock.Time()
-	return ts.ComputeRange(now.Add(-delta), now, num)
-}
-
-// extract returns a slice of specified number of observations from a given
-// level over a given range.
-func (ts *timeSeries) extract(l *tsLevel, start, finish time.Time, num int, results []Observable) {
-	ts.mergePendingUpdates()
-
-	srcInterval := l.size
-	dstInterval := finish.Sub(start) / time.Duration(num)
-	dstStart := start
-	srcStart := l.end.Add(-srcInterval * time.Duration(ts.numBuckets))
-
-	srcIndex := 0
-
-	// Where should scanning start?
-	if dstStart.After(srcStart) {
-		advance := dstStart.Sub(srcStart) / srcInterval
-		srcIndex += int(advance)
-		srcStart = srcStart.Add(advance * srcInterval)
-	}
-
-	// The i'th value is computed as show below.
-	// interval = (finish/start)/num
-	// i'th value = sum of observation in range
-	//   [ start + i       * interval,
-	//     start + (i + 1) * interval )
-	for i := 0; i < num; i++ {
-		results[i] = ts.resetObservation(results[i])
-		dstEnd := dstStart.Add(dstInterval)
-		for srcIndex < ts.numBuckets && srcStart.Before(dstEnd) {
-			srcEnd := srcStart.Add(srcInterval)
-			if srcEnd.After(ts.lastAdd) {
-				srcEnd = ts.lastAdd
-			}
-
-			if !srcEnd.Before(dstStart) {
-				srcValue := l.buckets[(srcIndex+l.oldest)%ts.numBuckets]
-				if !srcStart.Before(dstStart) && !srcEnd.After(dstEnd) {
-					// dst completely contains src.
-					if srcValue != nil {
-						results[i].Add(srcValue)
-					}
-				} else {
-					// dst partially overlaps src.
-					overlapStart := maxTime(srcStart, dstStart)
-					overlapEnd := minTime(srcEnd, dstEnd)
-					base := srcEnd.Sub(srcStart)
-					fraction := overlapEnd.Sub(overlapStart).Seconds() / base.Seconds()
-
-					used := ts.provider()
-					if srcValue != nil {
-						used.CopyFrom(srcValue)
-					}
-					used.Multiply(fraction)
-					results[i].Add(used)
-				}
-
-				if srcEnd.After(dstEnd) {
-					break
-				}
-			}
-			srcIndex++
-			srcStart = srcStart.Add(srcInterval)
-		}
-		dstStart = dstStart.Add(dstInterval)
-	}
-}
-
-// resetObservation clears the content so the struct may be reused.
-func (ts *timeSeries) resetObservation(observation Observable) Observable {
-	if observation == nil {
-		observation = ts.provider()
-	} else {
-		observation.Clear()
-	}
-	return observation
-}
-
-// TimeSeries tracks data at granularities from 1 second to 16 weeks.
-type TimeSeries struct {
-	timeSeries
-}
-
-// NewTimeSeries creates a new TimeSeries using the function provided for creating new Observable.
-func NewTimeSeries(f func() Observable) *TimeSeries {
-	return NewTimeSeriesWithClock(f, defaultClockInstance)
-}
-
-// NewTimeSeriesWithClock creates a new TimeSeries using the function provided for creating new Observable and the clock for
-// assigning timestamps.
-func NewTimeSeriesWithClock(f func() Observable, clock Clock) *TimeSeries {
-	ts := new(TimeSeries)
-	ts.timeSeries.init(timeSeriesResolutions, f, timeSeriesNumBuckets, clock)
-	return ts
-}
-
-// MinuteHourSeries tracks data at granularities of 1 minute and 1 hour.
-type MinuteHourSeries struct {
-	timeSeries
-}
-
-// NewMinuteHourSeries creates a new MinuteHourSeries using the function provided for creating new Observable.
-func NewMinuteHourSeries(f func() Observable) *MinuteHourSeries {
-	return NewMinuteHourSeriesWithClock(f, defaultClockInstance)
-}
-
-// NewMinuteHourSeriesWithClock creates a new MinuteHourSeries using the function provided for creating new Observable and the clock for
-// assigning timestamps.
-func NewMinuteHourSeriesWithClock(f func() Observable, clock Clock) *MinuteHourSeries {
-	ts := new(MinuteHourSeries)
-	ts.timeSeries.init(minuteHourSeriesResolutions, f,
-		minuteHourSeriesNumBuckets, clock)
-	return ts
-}
-
-func (ts *MinuteHourSeries) Minute() Observable {
-	return ts.timeSeries.Latest(0, 60)
-}
-
-func (ts *MinuteHourSeries) Hour() Observable {
-	return ts.timeSeries.Latest(1, 60)
-}
-
-func minTime(a, b time.Time) time.Time {
-	if a.Before(b) {
-		return a
-	}
-	return b
-}
-
-func maxTime(a, b time.Time) time.Time {
-	if a.After(b) {
-		return a
-	}
-	return b
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/events.go b/Godeps/_workspace/src/golang.org/x/net/trace/events.go
deleted file mode 100644
index e66c7e3282..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/trace/events.go
+++ /dev/null
@@ -1,524 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package trace
-
-import (
-	"bytes"
-	"fmt"
-	"html/template"
-	"io"
-	"log"
-	"net/http"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"text/tabwriter"
-	"time"
-)
-
-var eventsTmpl = template.Must(template.New("events").Funcs(template.FuncMap{
-	"elapsed":   elapsed,
-	"trimSpace": strings.TrimSpace,
-}).Parse(eventsHTML))
-
-const maxEventsPerLog = 100
-
-type bucket struct {
-	MaxErrAge time.Duration
-	String    string
-}
-
-var buckets = []bucket{
-	{0, "total"},
-	{10 * time.Second, "errs<10s"},
-	{1 * time.Minute, "errs<1m"},
-	{10 * time.Minute, "errs<10m"},
-	{1 * time.Hour, "errs<1h"},
-	{10 * time.Hour, "errs<10h"},
-	{24000 * time.Hour, "errors"},
-}
-
-// RenderEvents renders the HTML page typically served at /debug/events.
-// It does not do any auth checking; see AuthRequest for the default auth check
-// used by the handler registered on http.DefaultServeMux.
-// req may be nil.
-func RenderEvents(w http.ResponseWriter, req *http.Request, sensitive bool) {
-	now := time.Now()
-	data := &struct {
-		Families []string // family names
-		Buckets  []bucket
-		Counts   [][]int // eventLog count per family/bucket
-
-		// Set when a bucket has been selected.
-		Family    string
-		Bucket    int
-		EventLogs eventLogs
-		Expanded  bool
-	}{
-		Buckets: buckets,
-	}
-
-	data.Families = make([]string, 0, len(families))
-	famMu.RLock()
-	for name := range families {
-		data.Families = append(data.Families, name)
-	}
-	famMu.RUnlock()
-	sort.Strings(data.Families)
-
-	// Count the number of eventLogs in each family for each error age.
-	data.Counts = make([][]int, len(data.Families))
-	for i, name := range data.Families {
-		// TODO(sameer): move this loop under the family lock.
-		f := getEventFamily(name)
-		data.Counts[i] = make([]int, len(data.Buckets))
-		for j, b := range data.Buckets {
-			data.Counts[i][j] = f.Count(now, b.MaxErrAge)
-		}
-	}
-
-	if req != nil {
-		var ok bool
-		data.Family, data.Bucket, ok = parseEventsArgs(req)
-		if !ok {
-			// No-op
-		} else {
-			data.EventLogs = getEventFamily(data.Family).Copy(now, buckets[data.Bucket].MaxErrAge)
-		}
-		if data.EventLogs != nil {
-			defer data.EventLogs.Free()
-			sort.Sort(data.EventLogs)
-		}
-		if exp, err := strconv.ParseBool(req.FormValue("exp")); err == nil {
-			data.Expanded = exp
-		}
-	}
-
-	famMu.RLock()
-	defer famMu.RUnlock()
-	if err := eventsTmpl.Execute(w, data); err != nil {
-		log.Printf("net/trace: Failed executing template: %v", err)
-	}
-}
-
-func parseEventsArgs(req *http.Request) (fam string, b int, ok bool) {
-	fam, bStr := req.FormValue("fam"), req.FormValue("b")
-	if fam == "" || bStr == "" {
-		return "", 0, false
-	}
-	b, err := strconv.Atoi(bStr)
-	if err != nil || b < 0 || b >= len(buckets) {
-		return "", 0, false
-	}
-	return fam, b, true
-}
-
-// An EventLog provides a log of events associated with a specific object.
-type EventLog interface {
-	// Printf formats its arguments with fmt.Sprintf and adds the
-	// result to the event log.
-	Printf(format string, a ...interface{})
-
-	// Errorf is like Printf, but it marks this event as an error.
-	Errorf(format string, a ...interface{})
-
-	// Finish declares that this event log is complete.
-	// The event log should not be used after calling this method.
-	Finish()
-}
-
-// NewEventLog returns a new EventLog with the specified family name
-// and title.
-func NewEventLog(family, title string) EventLog {
-	el := newEventLog()
-	el.ref()
-	el.Family, el.Title = family, title
-	el.Start = time.Now()
-	el.events = make([]logEntry, 0, maxEventsPerLog)
-	el.stack = make([]uintptr, 32)
-	n := runtime.Callers(2, el.stack)
-	el.stack = el.stack[:n]
-
-	getEventFamily(family).add(el)
-	return el
-}
-
-func (el *eventLog) Finish() {
-	getEventFamily(el.Family).remove(el)
-	el.unref() // matches ref in New
-}
-
-var (
-	famMu    sync.RWMutex
-	families = make(map[string]*eventFamily) // family name => family
-)
-
-func getEventFamily(fam string) *eventFamily {
-	famMu.Lock()
-	defer famMu.Unlock()
-	f := families[fam]
-	if f == nil {
-		f = &eventFamily{}
-		families[fam] = f
-	}
-	return f
-}
-
-type eventFamily struct {
-	mu        sync.RWMutex
-	eventLogs eventLogs
-}
-
-func (f *eventFamily) add(el *eventLog) {
-	f.mu.Lock()
-	f.eventLogs = append(f.eventLogs, el)
-	f.mu.Unlock()
-}
-
-func (f *eventFamily) remove(el *eventLog) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	for i, el0 := range f.eventLogs {
-		if el == el0 {
-			copy(f.eventLogs[i:], f.eventLogs[i+1:])
-			f.eventLogs = f.eventLogs[:len(f.eventLogs)-1]
-			return
-		}
-	}
-}
-
-func (f *eventFamily) Count(now time.Time, maxErrAge time.Duration) (n int) {
-	f.mu.RLock()
-	defer f.mu.RUnlock()
-	for _, el := range f.eventLogs {
-		if el.hasRecentError(now, maxErrAge) {
-			n++
-		}
-	}
-	return
-}
-
-func (f *eventFamily) Copy(now time.Time, maxErrAge time.Duration) (els eventLogs) {
-	f.mu.RLock()
-	defer f.mu.RUnlock()
-	els = make(eventLogs, 0, len(f.eventLogs))
-	for _, el := range f.eventLogs {
-		if el.hasRecentError(now, maxErrAge) {
-			el.ref()
-			els = append(els, el)
-		}
-	}
-	return
-}
-
-type eventLogs []*eventLog
-
-// Free calls unref on each element of the list.
-func (els eventLogs) Free() {
-	for _, el := range els {
-		el.unref()
-	}
-}
-
-// eventLogs may be sorted in reverse chronological order.
-func (els eventLogs) Len() int           { return len(els) }
-func (els eventLogs) Less(i, j int) bool { return els[i].Start.After(els[j].Start) }
-func (els eventLogs) Swap(i, j int)      { els[i], els[j] = els[j], els[i] }
-
-// A logEntry is a timestamped log entry in an event log.
-type logEntry struct {
-	When    time.Time
-	Elapsed time.Duration // since previous event in log
-	NewDay  bool          // whether this event is on a different day to the previous event
-	What    string
-	IsErr   bool
-}
-
-// WhenString returns a string representation of the elapsed time of the event.
-// It will include the date if midnight was crossed.
-func (e logEntry) WhenString() string {
-	if e.NewDay {
-		return e.When.Format("2006/01/02 15:04:05.000000")
-	}
-	return e.When.Format("15:04:05.000000")
-}
-
-// An eventLog represents an active event log.
-type eventLog struct {
-	// Family is the top-level grouping of event logs to which this belongs.
-	Family string
-
-	// Title is the title of this event log.
-	Title string
-
-	// Timing information.
-	Start time.Time
-
-	// Call stack where this event log was created.
-	stack []uintptr
-
-	// Append-only sequence of events.
-	//
-	// TODO(sameer): change this to a ring buffer to avoid the array copy
-	// when we hit maxEventsPerLog.
-	mu            sync.RWMutex
-	events        []logEntry
-	LastErrorTime time.Time
-	discarded     int
-
-	refs int32 // how many buckets this is in
-}
-
-func (el *eventLog) reset() {
-	// Clear all but the mutex. Mutexes may not be copied, even when unlocked.
-	el.Family = ""
-	el.Title = ""
-	el.Start = time.Time{}
-	el.stack = nil
-	el.events = nil
-	el.LastErrorTime = time.Time{}
-	el.discarded = 0
-	el.refs = 0
-}
-
-func (el *eventLog) hasRecentError(now time.Time, maxErrAge time.Duration) bool {
-	if maxErrAge == 0 {
-		return true
-	}
-	el.mu.RLock()
-	defer el.mu.RUnlock()
-	return now.Sub(el.LastErrorTime) < maxErrAge
-}
-
-// delta returns the elapsed time since the last event or the log start,
-// and whether it spans midnight.
-// L >= el.mu
-func (el *eventLog) delta(t time.Time) (time.Duration, bool) {
-	if len(el.events) == 0 {
-		return t.Sub(el.Start), false
-	}
-	prev := el.events[len(el.events)-1].When
-	return t.Sub(prev), prev.Day() != t.Day()
-
-}
-
-func (el *eventLog) Printf(format string, a ...interface{}) {
-	el.printf(false, format, a...)
-}
-
-func (el *eventLog) Errorf(format string, a ...interface{}) {
-	el.printf(true, format, a...)
-}
-
-func (el *eventLog) printf(isErr bool, format string, a ...interface{}) {
-	e := logEntry{When: time.Now(), IsErr: isErr, What: fmt.Sprintf(format, a...)}
-	el.mu.Lock()
-	e.Elapsed, e.NewDay = el.delta(e.When)
-	if len(el.events) < maxEventsPerLog {
-		el.events = append(el.events, e)
-	} else {
-		// Discard the oldest event.
-		if el.discarded == 0 {
-			// el.discarded starts at two to count for the event it
-			// is replacing, plus the next one that we are about to
-			// drop.
-			el.discarded = 2
-		} else {
-			el.discarded++
-		}
-		// TODO(sameer): if this causes allocations on a critical path,
-		// change eventLog.What to be a fmt.Stringer, as in trace.go.
-		el.events[0].What = fmt.Sprintf("(%d events discarded)", el.discarded)
-		// The timestamp of the discarded meta-event should be
-		// the time of the last event it is representing.
-		el.events[0].When = el.events[1].When
-		copy(el.events[1:], el.events[2:])
-		el.events[maxEventsPerLog-1] = e
-	}
-	if e.IsErr {
-		el.LastErrorTime = e.When
-	}
-	el.mu.Unlock()
-}
-
-func (el *eventLog) ref() {
-	atomic.AddInt32(&el.refs, 1)
-}
-
-func (el *eventLog) unref() {
-	if atomic.AddInt32(&el.refs, -1) == 0 {
-		freeEventLog(el)
-	}
-}
-
-func (el *eventLog) When() string {
-	return el.Start.Format("2006/01/02 15:04:05.000000")
-}
-
-func (el *eventLog) ElapsedTime() string {
-	elapsed := time.Since(el.Start)
-	return fmt.Sprintf("%.6f", elapsed.Seconds())
-}
-
-func (el *eventLog) Stack() string {
-	buf := new(bytes.Buffer)
-	tw := tabwriter.NewWriter(buf, 1, 8, 1, '\t', 0)
-	printStackRecord(tw, el.stack)
-	tw.Flush()
-	return buf.String()
-}
-
-// printStackRecord prints the function + source line information
-// for a single stack trace.
-// Adapted from runtime/pprof/pprof.go.
-func printStackRecord(w io.Writer, stk []uintptr) {
-	for _, pc := range stk {
-		f := runtime.FuncForPC(pc)
-		if f == nil {
-			continue
-		}
-		file, line := f.FileLine(pc)
-		name := f.Name()
-		// Hide runtime.goexit and any runtime functions at the beginning.
-		if strings.HasPrefix(name, "runtime.") {
-			continue
-		}
-		fmt.Fprintf(w, "#   %s\t%s:%d\n", name, file, line)
-	}
-}
-
-func (el *eventLog) Events() []logEntry {
-	el.mu.RLock()
-	defer el.mu.RUnlock()
-	return el.events
-}
-
-// freeEventLogs is a freelist of *eventLog
-var freeEventLogs = make(chan *eventLog, 1000)
-
-// newEventLog returns a event log ready to use.
-func newEventLog() *eventLog {
-	select {
-	case el := <-freeEventLogs:
-		return el
-	default:
-		return new(eventLog)
-	}
-}
-
-// freeEventLog adds el to freeEventLogs if there's room.
-// This is non-blocking.
-func freeEventLog(el *eventLog) {
-	el.reset()
-	select {
-	case freeEventLogs <- el:
-	default:
-	}
-}
-
-const eventsHTML = `
-<html>
-	<head>
-		<title>events</title>
-	</head>
-	<style type="text/css">
-		body {
-			font-family: sans-serif;
-		}
-		table#req-status td.family {
-			padding-right: 2em;
-		}
-		table#req-status td.active {
-			padding-right: 1em;
-		}
-		table#req-status td.empty {
-			color: #aaa;
-		}
-		table#reqs {
-			margin-top: 1em;
-		}
-		table#reqs tr.first {
-			{{if $.Expanded}}font-weight: bold;{{end}}
-		}
-		table#reqs td {
-			font-family: monospace;
-		}
-		table#reqs td.when {
-			text-align: right;
-			white-space: nowrap;
-		}
-		table#reqs td.elapsed {
-			padding: 0 0.5em;
-			text-align: right;
-			white-space: pre;
-			width: 10em;
-		}
-		address {
-			font-size: smaller;
-			margin-top: 5em;
-		}
-	</style>
-	<body>
-
-<h1>/debug/events</h1>
-
-<table id="req-status">
-	{{range $i, $fam := .Families}}
-	<tr>
-		<td class="family">{{$fam}}</td>
-
-	        {{range $j, $bucket := $.Buckets}}
-	        {{$n := index $.Counts $i $j}}
-		<td class="{{if not $bucket.MaxErrAge}}active{{end}}{{if not $n}}empty{{end}}">
-	                {{if $n}}<a href="?fam={{$fam}}&b={{$j}}{{if $.Expanded}}&exp=1{{end}}">{{end}}
-		        [{{$n}} {{$bucket.String}}]
-			{{if $n}}</a>{{end}}
-		</td>
-                {{end}}
-
-	</tr>{{end}}
-</table>
-
-{{if $.EventLogs}}
-<hr />
-<h3>Family: {{$.Family}}</h3>
-
-{{if $.Expanded}}<a href="?fam={{$.Family}}&b={{$.Bucket}}">{{end}}
-[Summary]{{if $.Expanded}}</a>{{end}}
-
-{{if not $.Expanded}}<a href="?fam={{$.Family}}&b={{$.Bucket}}&exp=1">{{end}}
-[Expanded]{{if not $.Expanded}}</a>{{end}}
-
-<table id="reqs">
-	<tr><th>When</th><th>Elapsed</th></tr>
-	{{range $el := $.EventLogs}}
-	<tr class="first">
-		<td class="when">{{$el.When}}</td>
-		<td class="elapsed">{{$el.ElapsedTime}}</td>
-		<td>{{$el.Title}}
-	</tr>
-	{{if $.Expanded}}
-	<tr>
-		<td class="when"></td>
-		<td class="elapsed"></td>
-		<td><pre>{{$el.Stack|trimSpace}}</pre></td>
-	</tr>
-	{{range $el.Events}}
-	<tr>
-		<td class="when">{{.WhenString}}</td>
-		<td class="elapsed">{{elapsed .Elapsed}}</td>
-		<td>.{{if .IsErr}}E{{else}}.{{end}}. {{.What}}</td>
-	</tr>
-	{{end}}
-	{{end}}
-	{{end}}
-</table>
-{{end}}
-	</body>
-</html>
-`
diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/histogram.go b/Godeps/_workspace/src/golang.org/x/net/trace/histogram.go
deleted file mode 100644
index bb42aa5320..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/trace/histogram.go
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package trace
-
-// This file implements histogramming for RPC statistics collection.
-
-import (
-	"bytes"
-	"fmt"
-	"html/template"
-	"log"
-	"math"
-
-	"golang.org/x/net/internal/timeseries"
-)
-
-const (
-	bucketCount = 38
-)
-
-// histogram keeps counts of values in buckets that are spaced
-// out in powers of 2: 0-1, 2-3, 4-7...
-// histogram implements timeseries.Observable
-type histogram struct {
-	sum          int64   // running total of measurements
-	sumOfSquares float64 // square of running total
-	buckets      []int64 // bucketed values for histogram
-	value        int     // holds a single value as an optimization
-	valueCount   int64   // number of values recorded for single value
-}
-
-// AddMeasurement records a value measurement observation to the histogram.
-func (h *histogram) addMeasurement(value int64) {
-	// TODO: assert invariant
-	h.sum += value
-	h.sumOfSquares += float64(value) * float64(value)
-
-	bucketIndex := getBucket(value)
-
-	if h.valueCount == 0 || (h.valueCount > 0 && h.value == bucketIndex) {
-		h.value = bucketIndex
-		h.valueCount++
-	} else {
-		h.allocateBuckets()
-		h.buckets[bucketIndex]++
-	}
-}
-
-func (h *histogram) allocateBuckets() {
-	if h.buckets == nil {
-		h.buckets = make([]int64, bucketCount)
-		h.buckets[h.value] = h.valueCount
-		h.value = 0
-		h.valueCount = -1
-	}
-}
-
-func log2(i int64) int {
-	n := 0
-	for ; i >= 0x100; i >>= 8 {
-		n += 8
-	}
-	for ; i > 0; i >>= 1 {
-		n += 1
-	}
-	return n
-}
-
-func getBucket(i int64) (index int) {
-	index = log2(i) - 1
-	if index < 0 {
-		index = 0
-	}
-	if index >= bucketCount {
-		index = bucketCount - 1
-	}
-	return
-}
-
-// Total returns the number of recorded observations.
-func (h *histogram) total() (total int64) {
-	if h.valueCount >= 0 {
-		total = h.valueCount
-	}
-	for _, val := range h.buckets {
-		total += int64(val)
-	}
-	return
-}
-
-// Average returns the average value of recorded observations.
-func (h *histogram) average() float64 {
-	t := h.total()
-	if t == 0 {
-		return 0
-	}
-	return float64(h.sum) / float64(t)
-}
-
-// Variance returns the variance of recorded observations.
-func (h *histogram) variance() float64 {
-	t := float64(h.total())
-	if t == 0 {
-		return 0
-	}
-	s := float64(h.sum) / t
-	return h.sumOfSquares/t - s*s
-}
-
-// StandardDeviation returns the standard deviation of recorded observations.
-func (h *histogram) standardDeviation() float64 {
-	return math.Sqrt(h.variance())
-}
-
-// PercentileBoundary estimates the value that the given fraction of recorded
-// observations are less than.
-func (h *histogram) percentileBoundary(percentile float64) int64 {
-	total := h.total()
-
-	// Corner cases (make sure result is strictly less than Total())
-	if total == 0 {
-		return 0
-	} else if total == 1 {
-		return int64(h.average())
-	}
-
-	percentOfTotal := round(float64(total) * percentile)
-	var runningTotal int64
-
-	for i := range h.buckets {
-		value := h.buckets[i]
-		runningTotal += value
-		if runningTotal == percentOfTotal {
-			// We hit an exact bucket boundary. If the next bucket has data, it is a
-			// good estimate of the value. If the bucket is empty, we interpolate the
-			// midpoint between the next bucket's boundary and the next non-zero
-			// bucket. If the remaining buckets are all empty, then we use the
-			// boundary for the next bucket as the estimate.
-			j := uint8(i + 1)
-			min := bucketBoundary(j)
-			if runningTotal < total {
-				for h.buckets[j] == 0 {
-					j++
-				}
-			}
-			max := bucketBoundary(j)
-			return min + round(float64(max-min)/2)
-		} else if runningTotal > percentOfTotal {
-			// The value is in this bucket. Interpolate the value.
-			delta := runningTotal - percentOfTotal
-			percentBucket := float64(value-delta) / float64(value)
-			bucketMin := bucketBoundary(uint8(i))
-			nextBucketMin := bucketBoundary(uint8(i + 1))
-			bucketSize := nextBucketMin - bucketMin
-			return bucketMin + round(percentBucket*float64(bucketSize))
-		}
-	}
-	return bucketBoundary(bucketCount - 1)
-}
-
-// Median returns the estimated median of the observed values.
-func (h *histogram) median() int64 {
-	return h.percentileBoundary(0.5)
-}
-
-// Add adds other to h.
-func (h *histogram) Add(other timeseries.Observable) {
-	o := other.(*histogram)
-	if o.valueCount == 0 {
-		// Other histogram is empty
-	} else if h.valueCount >= 0 && o.valueCount > 0 && h.value == o.value {
-		// Both have a single bucketed value, aggregate them
-		h.valueCount += o.valueCount
-	} else {
-		// Two different values necessitate buckets in this histogram
-		h.allocateBuckets()
-		if o.valueCount >= 0 {
-			h.buckets[o.value] += o.valueCount
-		} else {
-			for i := range h.buckets {
-				h.buckets[i] += o.buckets[i]
-			}
-		}
-	}
-	h.sumOfSquares += o.sumOfSquares
-	h.sum += o.sum
-}
-
-// Clear resets the histogram to an empty state, removing all observed values.
-func (h *histogram) Clear() {
-	h.buckets = nil
-	h.value = 0
-	h.valueCount = 0
-	h.sum = 0
-	h.sumOfSquares = 0
-}
-
-// CopyFrom copies from other, which must be a *histogram, into h.
-func (h *histogram) CopyFrom(other timeseries.Observable) {
-	o := other.(*histogram)
-	if o.valueCount == -1 {
-		h.allocateBuckets()
-		copy(h.buckets, o.buckets)
-	}
-	h.sum = o.sum
-	h.sumOfSquares = o.sumOfSquares
-	h.value = o.value
-	h.valueCount = o.valueCount
-}
-
-// Multiply scales the histogram by the specified ratio.
-func (h *histogram) Multiply(ratio float64) {
-	if h.valueCount == -1 {
-		for i := range h.buckets {
-			h.buckets[i] = int64(float64(h.buckets[i]) * ratio)
-		}
-	} else {
-		h.valueCount = int64(float64(h.valueCount) * ratio)
-	}
-	h.sum = int64(float64(h.sum) * ratio)
-	h.sumOfSquares = h.sumOfSquares * ratio
-}
-
-// New creates a new histogram.
-func (h *histogram) New() timeseries.Observable {
-	r := new(histogram)
-	r.Clear()
-	return r
-}
-
-func (h *histogram) String() string {
-	return fmt.Sprintf("%d, %f, %d, %d, %v",
-		h.sum, h.sumOfSquares, h.value, h.valueCount, h.buckets)
-}
-
-// round returns the closest int64 to the argument
-func round(in float64) int64 {
-	return int64(math.Floor(in + 0.5))
-}
-
-// bucketBoundary returns the first value in the bucket.
-func bucketBoundary(bucket uint8) int64 {
-	if bucket == 0 {
-		return 0
-	}
-	return 1 << bucket
-}
-
-// bucketData holds data about a specific bucket for use in distTmpl.
-type bucketData struct {
-	Lower, Upper       int64
-	N                  int64
-	Pct, CumulativePct float64
-	GraphWidth         int
-}
-
-// data holds data about a Distribution for use in distTmpl.
-type data struct {
-	Buckets                 []*bucketData
-	Count, Median           int64
-	Mean, StandardDeviation float64
-}
-
-// maxHTMLBarWidth is the maximum width of the HTML bar for visualizing buckets.
-const maxHTMLBarWidth = 350.0
-
-// newData returns data representing h for use in distTmpl.
-func (h *histogram) newData() *data {
-	// Force the allocation of buckets to simplify the rendering implementation
-	h.allocateBuckets()
-	// We scale the bars on the right so that the largest bar is
-	// maxHTMLBarWidth pixels in width.
-	maxBucket := int64(0)
-	for _, n := range h.buckets {
-		if n > maxBucket {
-			maxBucket = n
-		}
-	}
-	total := h.total()
-	barsizeMult := maxHTMLBarWidth / float64(maxBucket)
-	var pctMult float64
-	if total == 0 {
-		pctMult = 1.0
-	} else {
-		pctMult = 100.0 / float64(total)
-	}
-
-	buckets := make([]*bucketData, len(h.buckets))
-	runningTotal := int64(0)
-	for i, n := range h.buckets {
-		if n == 0 {
-			continue
-		}
-		runningTotal += n
-		var upperBound int64
-		if i < bucketCount-1 {
-			upperBound = bucketBoundary(uint8(i + 1))
-		} else {
-			upperBound = math.MaxInt64
-		}
-		buckets[i] = &bucketData{
-			Lower:         bucketBoundary(uint8(i)),
-			Upper:         upperBound,
-			N:             n,
-			Pct:           float64(n) * pctMult,
-			CumulativePct: float64(runningTotal) * pctMult,
-			GraphWidth:    int(float64(n) * barsizeMult),
-		}
-	}
-	return &data{
-		Buckets:           buckets,
-		Count:             total,
-		Median:            h.median(),
-		Mean:              h.average(),
-		StandardDeviation: h.standardDeviation(),
-	}
-}
-
-func (h *histogram) html() template.HTML {
-	buf := new(bytes.Buffer)
-	if err := distTmpl.Execute(buf, h.newData()); err != nil {
-		buf.Reset()
-		log.Printf("net/trace: couldn't execute template: %v", err)
-	}
-	return template.HTML(buf.String())
-}
-
-// Input: data
-var distTmpl = template.Must(template.New("distTmpl").Parse(`
-<table>
-<tr>
-    <td style="padding:0.25em">Count: {{.Count}}</td>
-    <td style="padding:0.25em">Mean: {{printf "%.0f" .Mean}}</td>
-    <td style="padding:0.25em">StdDev: {{printf "%.0f" .StandardDeviation}}</td>
-    <td style="padding:0.25em">Median: {{.Median}}</td>
-</tr>
-</table>
-<hr>
-<table>
-{{range $b := .Buckets}}
-{{if $b}}
-  <tr>
-    <td style="padding:0 0 0 0.25em">[</td>
-    <td style="text-align:right;padding:0 0.25em">{{.Lower}},</td>
-    <td style="text-align:right;padding:0 0.25em">{{.Upper}})</td>
-    <td style="text-align:right;padding:0 0.25em">{{.N}}</td>
-    <td style="text-align:right;padding:0 0.25em">{{printf "%#.3f" .Pct}}%</td>
-    <td style="text-align:right;padding:0 0.25em">{{printf "%#.3f" .CumulativePct}}%</td>
-    <td><div style="background-color: blue; height: 1em; width: {{.GraphWidth}};"></div></td>
-  </tr>
-{{end}}
-{{end}}
-</table>
-`))
diff --git a/Godeps/_workspace/src/golang.org/x/net/trace/trace.go b/Godeps/_workspace/src/golang.org/x/net/trace/trace.go
deleted file mode 100644
index c87290b76e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/net/trace/trace.go
+++ /dev/null
@@ -1,1057 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package trace implements tracing of requests and long-lived objects.
-It exports HTTP interfaces on /debug/requests and /debug/events.
-
-A trace.Trace provides tracing for short-lived objects, usually requests.
-A request handler might be implemented like this:
-
-	func fooHandler(w http.ResponseWriter, req *http.Request) {
-		tr := trace.New("mypkg.Foo", req.URL.Path)
-		defer tr.Finish()
-		...
-		tr.LazyPrintf("some event %q happened", str)
-		...
-		if err := somethingImportant(); err != nil {
-			tr.LazyPrintf("somethingImportant failed: %v", err)
-			tr.SetError()
-		}
-	}
-
-The /debug/requests HTTP endpoint organizes the traces by family,
-errors, and duration.  It also provides histogram of request duration
-for each family.
-
-A trace.EventLog provides tracing for long-lived objects, such as RPC
-connections.
-
-	// A Fetcher fetches URL paths for a single domain.
-	type Fetcher struct {
-		domain string
-		events trace.EventLog
-	}
-
-	func NewFetcher(domain string) *Fetcher {
-		return &Fetcher{
-			domain,
-			trace.NewEventLog("mypkg.Fetcher", domain),
-		}
-	}
-
-	func (f *Fetcher) Fetch(path string) (string, error) {
-		resp, err := http.Get("http://" + f.domain + "/" + path)
-		if err != nil {
-			f.events.Errorf("Get(%q) = %v", path, err)
-			return "", err
-		}
-		f.events.Printf("Get(%q) = %s", path, resp.Status)
-		...
-	}
-
-	func (f *Fetcher) Close() error {
-		f.events.Finish()
-		return nil
-	}
-
-The /debug/events HTTP endpoint organizes the event logs by family and
-by time since the last error.  The expanded view displays recent log
-entries and the log's call stack.
-*/
-package trace
-
-import (
-	"bytes"
-	"fmt"
-	"html/template"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"runtime"
-	"sort"
-	"strconv"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"golang.org/x/net/context"
-	"golang.org/x/net/internal/timeseries"
-)
-
-// DebugUseAfterFinish controls whether to debug uses of Trace values after finishing.
-// FOR DEBUGGING ONLY. This will slow down the program.
-var DebugUseAfterFinish = false
-
-// AuthRequest determines whether a specific request is permitted to load the
-// /debug/requests or /debug/events pages.
-//
-// It returns two bools; the first indicates whether the page may be viewed at all,
-// and the second indicates whether sensitive events will be shown.
-//
-// AuthRequest may be replaced by a program to customise its authorisation requirements.
-//
-// The default AuthRequest function returns (true, true) iff the request comes from localhost/127.0.0.1/[::1].
-var AuthRequest = func(req *http.Request) (any, sensitive bool) {
-	host, _, err := net.SplitHostPort(req.RemoteAddr)
-	switch {
-	case err != nil: // Badly formed address; fail closed.
-		return false, false
-	case host == "localhost" || host == "127.0.0.1" || host == "::1":
-		return true, true
-	default:
-		return false, false
-	}
-}
-
-func init() {
-	http.HandleFunc("/debug/requests", func(w http.ResponseWriter, req *http.Request) {
-		any, sensitive := AuthRequest(req)
-		if !any {
-			http.Error(w, "not allowed", http.StatusUnauthorized)
-			return
-		}
-		Render(w, req, sensitive)
-	})
-	http.HandleFunc("/debug/events", func(w http.ResponseWriter, req *http.Request) {
-		any, sensitive := AuthRequest(req)
-		if !any {
-			http.Error(w, "not allowed", http.StatusUnauthorized)
-			return
-		}
-		RenderEvents(w, req, sensitive)
-	})
-}
-
-// Render renders the HTML page typically served at /debug/requests.
-// It does not do any auth checking; see AuthRequest for the default auth check
-// used by the handler registered on http.DefaultServeMux.
-// req may be nil.
-func Render(w io.Writer, req *http.Request, sensitive bool) {
-	data := &struct {
-		Families         []string
-		ActiveTraceCount map[string]int
-		CompletedTraces  map[string]*family
-
-		// Set when a bucket has been selected.
-		Traces        traceList
-		Family        string
-		Bucket        int
-		Expanded      bool
-		Traced        bool
-		Active        bool
-		ShowSensitive bool // whether to show sensitive events
-
-		Histogram       template.HTML
-		HistogramWindow string // e.g. "last minute", "last hour", "all time"
-
-		// If non-zero, the set of traces is a partial set,
-		// and this is the total number.
-		Total int
-	}{
-		CompletedTraces: completedTraces,
-	}
-
-	data.ShowSensitive = sensitive
-	if req != nil {
-		// Allow show_sensitive=0 to force hiding of sensitive data for testing.
-		// This only goes one way; you can't use show_sensitive=1 to see things.
-		if req.FormValue("show_sensitive") == "0" {
-			data.ShowSensitive = false
-		}
-
-		if exp, err := strconv.ParseBool(req.FormValue("exp")); err == nil {
-			data.Expanded = exp
-		}
-		if exp, err := strconv.ParseBool(req.FormValue("rtraced")); err == nil {
-			data.Traced = exp
-		}
-	}
-
-	completedMu.RLock()
-	data.Families = make([]string, 0, len(completedTraces))
-	for fam, _ := range completedTraces {
-		data.Families = append(data.Families, fam)
-	}
-	completedMu.RUnlock()
-	sort.Strings(data.Families)
-
-	// We are careful here to minimize the time spent locking activeMu,
-	// since that lock is required every time an RPC starts and finishes.
-	data.ActiveTraceCount = make(map[string]int, len(data.Families))
-	activeMu.RLock()
-	for fam, s := range activeTraces {
-		data.ActiveTraceCount[fam] = s.Len()
-	}
-	activeMu.RUnlock()
-
-	var ok bool
-	data.Family, data.Bucket, ok = parseArgs(req)
-	switch {
-	case !ok:
-		// No-op
-	case data.Bucket == -1:
-		data.Active = true
-		n := data.ActiveTraceCount[data.Family]
-		data.Traces = getActiveTraces(data.Family)
-		if len(data.Traces) < n {
-			data.Total = n
-		}
-	case data.Bucket < bucketsPerFamily:
-		if b := lookupBucket(data.Family, data.Bucket); b != nil {
-			data.Traces = b.Copy(data.Traced)
-		}
-	default:
-		if f := getFamily(data.Family, false); f != nil {
-			var obs timeseries.Observable
-			f.LatencyMu.RLock()
-			switch o := data.Bucket - bucketsPerFamily; o {
-			case 0:
-				obs = f.Latency.Minute()
-				data.HistogramWindow = "last minute"
-			case 1:
-				obs = f.Latency.Hour()
-				data.HistogramWindow = "last hour"
-			case 2:
-				obs = f.Latency.Total()
-				data.HistogramWindow = "all time"
-			}
-			f.LatencyMu.RUnlock()
-			if obs != nil {
-				data.Histogram = obs.(*histogram).html()
-			}
-		}
-	}
-
-	if data.Traces != nil {
-		defer data.Traces.Free()
-		sort.Sort(data.Traces)
-	}
-
-	completedMu.RLock()
-	defer completedMu.RUnlock()
-	if err := pageTmpl.ExecuteTemplate(w, "Page", data); err != nil {
-		log.Printf("net/trace: Failed executing template: %v", err)
-	}
-}
-
-func parseArgs(req *http.Request) (fam string, b int, ok bool) {
-	if req == nil {
-		return "", 0, false
-	}
-	fam, bStr := req.FormValue("fam"), req.FormValue("b")
-	if fam == "" || bStr == "" {
-		return "", 0, false
-	}
-	b, err := strconv.Atoi(bStr)
-	if err != nil || b < -1 {
-		return "", 0, false
-	}
-
-	return fam, b, true
-}
-
-func lookupBucket(fam string, b int) *traceBucket {
-	f := getFamily(fam, false)
-	if f == nil || b < 0 || b >= len(f.Buckets) {
-		return nil
-	}
-	return f.Buckets[b]
-}
-
-type contextKeyT string
-
-var contextKey = contextKeyT("golang.org/x/net/trace.Trace")
-
-// NewContext returns a copy of the parent context
-// and associates it with a Trace.
-func NewContext(ctx context.Context, tr Trace) context.Context {
-	return context.WithValue(ctx, contextKey, tr)
-}
-
-// FromContext returns the Trace bound to the context, if any.
-func FromContext(ctx context.Context) (tr Trace, ok bool) {
-	tr, ok = ctx.Value(contextKey).(Trace)
-	return
-}
-
-// Trace represents an active request.
-type Trace interface {
-	// LazyLog adds x to the event log. It will be evaluated each time the
-	// /debug/requests page is rendered. Any memory referenced by x will be
-	// pinned until the trace is finished and later discarded.
-	LazyLog(x fmt.Stringer, sensitive bool)
-
-	// LazyPrintf evaluates its arguments with fmt.Sprintf each time the
-	// /debug/requests page is rendered. Any memory referenced by a will be
-	// pinned until the trace is finished and later discarded.
-	LazyPrintf(format string, a ...interface{})
-
-	// SetError declares that this trace resulted in an error.
-	SetError()
-
-	// SetRecycler sets a recycler for the trace.
-	// f will be called for each event passed to LazyLog at a time when
-	// it is no longer required, whether while the trace is still active
-	// and the event is discarded, or when a completed trace is discarded.
-	SetRecycler(f func(interface{}))
-
-	// SetTraceInfo sets the trace info for the trace.
-	// This is currently unused.
-	SetTraceInfo(traceID, spanID uint64)
-
-	// SetMaxEvents sets the maximum number of events that will be stored
-	// in the trace. This has no effect if any events have already been
-	// added to the trace.
-	SetMaxEvents(m int)
-
-	// Finish declares that this trace is complete.
-	// The trace should not be used after calling this method.
-	Finish()
-}
-
-type lazySprintf struct {
-	format string
-	a      []interface{}
-}
-
-func (l *lazySprintf) String() string {
-	return fmt.Sprintf(l.format, l.a...)
-}
-
-// New returns a new Trace with the specified family and title.
-func New(family, title string) Trace {
-	tr := newTrace()
-	tr.ref()
-	tr.Family, tr.Title = family, title
-	tr.Start = time.Now()
-	tr.events = make([]event, 0, maxEventsPerTrace)
-
-	activeMu.RLock()
-	s := activeTraces[tr.Family]
-	activeMu.RUnlock()
-	if s == nil {
-		activeMu.Lock()
-		s = activeTraces[tr.Family] // check again
-		if s == nil {
-			s = new(traceSet)
-			activeTraces[tr.Family] = s
-		}
-		activeMu.Unlock()
-	}
-	s.Add(tr)
-
-	// Trigger allocation of the completed trace structure for this family.
-	// This will cause the family to be present in the request page during
-	// the first trace of this family. We don't care about the return value,
-	// nor is there any need for this to run inline, so we execute it in its
-	// own goroutine, but only if the family isn't allocated yet.
-	completedMu.RLock()
-	if _, ok := completedTraces[tr.Family]; !ok {
-		go allocFamily(tr.Family)
-	}
-	completedMu.RUnlock()
-
-	return tr
-}
-
-func (tr *trace) Finish() {
-	tr.Elapsed = time.Now().Sub(tr.Start)
-	if DebugUseAfterFinish {
-		buf := make([]byte, 4<<10) // 4 KB should be enough
-		n := runtime.Stack(buf, false)
-		tr.finishStack = buf[:n]
-	}
-
-	activeMu.RLock()
-	m := activeTraces[tr.Family]
-	activeMu.RUnlock()
-	m.Remove(tr)
-
-	f := getFamily(tr.Family, true)
-	for _, b := range f.Buckets {
-		if b.Cond.match(tr) {
-			b.Add(tr)
-		}
-	}
-	// Add a sample of elapsed time as microseconds to the family's timeseries
-	h := new(histogram)
-	h.addMeasurement(tr.Elapsed.Nanoseconds() / 1e3)
-	f.LatencyMu.Lock()
-	f.Latency.Add(h)
-	f.LatencyMu.Unlock()
-
-	tr.unref() // matches ref in New
-}
-
-const (
-	bucketsPerFamily    = 9
-	tracesPerBucket     = 10
-	maxActiveTraces     = 20 // Maximum number of active traces to show.
-	maxEventsPerTrace   = 10
-	numHistogramBuckets = 38
-)
-
-var (
-	// The active traces.
-	activeMu     sync.RWMutex
-	activeTraces = make(map[string]*traceSet) // family -> traces
-
-	// Families of completed traces.
-	completedMu     sync.RWMutex
-	completedTraces = make(map[string]*family) // family -> traces
-)
-
-type traceSet struct {
-	mu sync.RWMutex
-	m  map[*trace]bool
-
-	// We could avoid the entire map scan in FirstN by having a slice of all the traces
-	// ordered by start time, and an index into that from the trace struct, with a periodic
-	// repack of the slice after enough traces finish; we could also use a skip list or similar.
-	// However, that would shift some of the expense from /debug/requests time to RPC time,
-	// which is probably the wrong trade-off.
-}
-
-func (ts *traceSet) Len() int {
-	ts.mu.RLock()
-	defer ts.mu.RUnlock()
-	return len(ts.m)
-}
-
-func (ts *traceSet) Add(tr *trace) {
-	ts.mu.Lock()
-	if ts.m == nil {
-		ts.m = make(map[*trace]bool)
-	}
-	ts.m[tr] = true
-	ts.mu.Unlock()
-}
-
-func (ts *traceSet) Remove(tr *trace) {
-	ts.mu.Lock()
-	delete(ts.m, tr)
-	ts.mu.Unlock()
-}
-
-// FirstN returns the first n traces ordered by time.
-func (ts *traceSet) FirstN(n int) traceList {
-	ts.mu.RLock()
-	defer ts.mu.RUnlock()
-
-	if n > len(ts.m) {
-		n = len(ts.m)
-	}
-	trl := make(traceList, 0, n)
-
-	// Fast path for when no selectivity is needed.
-	if n == len(ts.m) {
-		for tr := range ts.m {
-			tr.ref()
-			trl = append(trl, tr)
-		}
-		sort.Sort(trl)
-		return trl
-	}
-
-	// Pick the oldest n traces.
-	// This is inefficient. See the comment in the traceSet struct.
-	for tr := range ts.m {
-		// Put the first n traces into trl in the order they occur.
-		// When we have n, sort trl, and thereafter maintain its order.
-		if len(trl) < n {
-			tr.ref()
-			trl = append(trl, tr)
-			if len(trl) == n {
-				// This is guaranteed to happen exactly once during this loop.
-				sort.Sort(trl)
-			}
-			continue
-		}
-		if tr.Start.After(trl[n-1].Start) {
-			continue
-		}
-
-		// Find where to insert this one.
-		tr.ref()
-		i := sort.Search(n, func(i int) bool { return trl[i].Start.After(tr.Start) })
-		trl[n-1].unref()
-		copy(trl[i+1:], trl[i:])
-		trl[i] = tr
-	}
-
-	return trl
-}
-
-func getActiveTraces(fam string) traceList {
-	activeMu.RLock()
-	s := activeTraces[fam]
-	activeMu.RUnlock()
-	if s == nil {
-		return nil
-	}
-	return s.FirstN(maxActiveTraces)
-}
-
-func getFamily(fam string, allocNew bool) *family {
-	completedMu.RLock()
-	f := completedTraces[fam]
-	completedMu.RUnlock()
-	if f == nil && allocNew {
-		f = allocFamily(fam)
-	}
-	return f
-}
-
-func allocFamily(fam string) *family {
-	completedMu.Lock()
-	defer completedMu.Unlock()
-	f := completedTraces[fam]
-	if f == nil {
-		f = newFamily()
-		completedTraces[fam] = f
-	}
-	return f
-}
-
-// family represents a set of trace buckets and associated latency information.
-type family struct {
-	// traces may occur in multiple buckets.
-	Buckets [bucketsPerFamily]*traceBucket
-
-	// latency time series
-	LatencyMu sync.RWMutex
-	Latency   *timeseries.MinuteHourSeries
-}
-
-func newFamily() *family {
-	return &family{
-		Buckets: [bucketsPerFamily]*traceBucket{
-			{Cond: minCond(0)},
-			{Cond: minCond(50 * time.Millisecond)},
-			{Cond: minCond(100 * time.Millisecond)},
-			{Cond: minCond(200 * time.Millisecond)},
-			{Cond: minCond(500 * time.Millisecond)},
-			{Cond: minCond(1 * time.Second)},
-			{Cond: minCond(10 * time.Second)},
-			{Cond: minCond(100 * time.Second)},
-			{Cond: errorCond{}},
-		},
-		Latency: timeseries.NewMinuteHourSeries(func() timeseries.Observable { return new(histogram) }),
-	}
-}
-
-// traceBucket represents a size-capped bucket of historic traces,
-// along with a condition for a trace to belong to the bucket.
-type traceBucket struct {
-	Cond cond
-
-	// Ring buffer implementation of a fixed-size FIFO queue.
-	mu     sync.RWMutex
-	buf    [tracesPerBucket]*trace
-	start  int // < tracesPerBucket
-	length int // <= tracesPerBucket
-}
-
-func (b *traceBucket) Add(tr *trace) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-
-	i := b.start + b.length
-	if i >= tracesPerBucket {
-		i -= tracesPerBucket
-	}
-	if b.length == tracesPerBucket {
-		// "Remove" an element from the bucket.
-		b.buf[i].unref()
-		b.start++
-		if b.start == tracesPerBucket {
-			b.start = 0
-		}
-	}
-	b.buf[i] = tr
-	if b.length < tracesPerBucket {
-		b.length++
-	}
-	tr.ref()
-}
-
-// Copy returns a copy of the traces in the bucket.
-// If tracedOnly is true, only the traces with trace information will be returned.
-// The logs will be ref'd before returning; the caller should call
-// the Free method when it is done with them.
-// TODO(dsymonds): keep track of traced requests in separate buckets.
-func (b *traceBucket) Copy(tracedOnly bool) traceList {
-	b.mu.RLock()
-	defer b.mu.RUnlock()
-
-	trl := make(traceList, 0, b.length)
-	for i, x := 0, b.start; i < b.length; i++ {
-		tr := b.buf[x]
-		if !tracedOnly || tr.spanID != 0 {
-			tr.ref()
-			trl = append(trl, tr)
-		}
-		x++
-		if x == b.length {
-			x = 0
-		}
-	}
-	return trl
-}
-
-func (b *traceBucket) Empty() bool {
-	b.mu.RLock()
-	defer b.mu.RUnlock()
-	return b.length == 0
-}
-
-// cond represents a condition on a trace.
-type cond interface {
-	match(t *trace) bool
-	String() string
-}
-
-type minCond time.Duration
-
-func (m minCond) match(t *trace) bool { return t.Elapsed >= time.Duration(m) }
-func (m minCond) String() string      { return fmt.Sprintf("≥%gs", time.Duration(m).Seconds()) }
-
-type errorCond struct{}
-
-func (e errorCond) match(t *trace) bool { return t.IsError }
-func (e errorCond) String() string      { return "errors" }
-
-type traceList []*trace
-
-// Free calls unref on each element of the list.
-func (trl traceList) Free() {
-	for _, t := range trl {
-		t.unref()
-	}
-}
-
-// traceList may be sorted in reverse chronological order.
-func (trl traceList) Len() int           { return len(trl) }
-func (trl traceList) Less(i, j int) bool { return trl[i].Start.After(trl[j].Start) }
-func (trl traceList) Swap(i, j int)      { trl[i], trl[j] = trl[j], trl[i] }
-
-// An event is a timestamped log entry in a trace.
-type event struct {
-	When       time.Time
-	Elapsed    time.Duration // since previous event in trace
-	NewDay     bool          // whether this event is on a different day to the previous event
-	Recyclable bool          // whether this event was passed via LazyLog
-	What       interface{}   // string or fmt.Stringer
-	Sensitive  bool          // whether this event contains sensitive information
-}
-
-// WhenString returns a string representation of the elapsed time of the event.
-// It will include the date if midnight was crossed.
-func (e event) WhenString() string {
-	if e.NewDay {
-		return e.When.Format("2006/01/02 15:04:05.000000")
-	}
-	return e.When.Format("15:04:05.000000")
-}
-
-// discarded represents a number of discarded events.
-// It is stored as *discarded to make it easier to update in-place.
-type discarded int
-
-func (d *discarded) String() string {
-	return fmt.Sprintf("(%d events discarded)", int(*d))
-}
-
-// trace represents an active or complete request,
-// either sent or received by this program.
-type trace struct {
-	// Family is the top-level grouping of traces to which this belongs.
-	Family string
-
-	// Title is the title of this trace.
-	Title string
-
-	// Timing information.
-	Start   time.Time
-	Elapsed time.Duration // zero while active
-
-	// Trace information if non-zero.
-	traceID uint64
-	spanID  uint64
-
-	// Whether this trace resulted in an error.
-	IsError bool
-
-	// Append-only sequence of events (modulo discards).
-	mu     sync.RWMutex
-	events []event
-
-	refs     int32 // how many buckets this is in
-	recycler func(interface{})
-	disc     discarded // scratch space to avoid allocation
-
-	finishStack []byte // where finish was called, if DebugUseAfterFinish is set
-}
-
-func (tr *trace) reset() {
-	// Clear all but the mutex. Mutexes may not be copied, even when unlocked.
-	tr.Family = ""
-	tr.Title = ""
-	tr.Start = time.Time{}
-	tr.Elapsed = 0
-	tr.traceID = 0
-	tr.spanID = 0
-	tr.IsError = false
-	tr.events = nil
-	tr.refs = 0
-	tr.recycler = nil
-	tr.disc = 0
-	tr.finishStack = nil
-}
-
-// delta returns the elapsed time since the last event or the trace start,
-// and whether it spans midnight.
-// L >= tr.mu
-func (tr *trace) delta(t time.Time) (time.Duration, bool) {
-	if len(tr.events) == 0 {
-		return t.Sub(tr.Start), false
-	}
-	prev := tr.events[len(tr.events)-1].When
-	return t.Sub(prev), prev.Day() != t.Day()
-}
-
-func (tr *trace) addEvent(x interface{}, recyclable, sensitive bool) {
-	if DebugUseAfterFinish && tr.finishStack != nil {
-		buf := make([]byte, 4<<10) // 4 KB should be enough
-		n := runtime.Stack(buf, false)
-		log.Printf("net/trace: trace used after finish:\nFinished at:\n%s\nUsed at:\n%s", tr.finishStack, buf[:n])
-	}
-
-	/*
-		NOTE TO DEBUGGERS
-
-		If you are here because your program panicked in this code,
-		it is almost definitely the fault of code using this package,
-		and very unlikely to be the fault of this code.
-
-		The most likely scenario is that some code elsewhere is using
-		a requestz.Trace after its Finish method is called.
-		You can temporarily set the DebugUseAfterFinish var
-		to help discover where that is; do not leave that var set,
-		since it makes this package much less efficient.
-	*/
-
-	e := event{When: time.Now(), What: x, Recyclable: recyclable, Sensitive: sensitive}
-	tr.mu.Lock()
-	e.Elapsed, e.NewDay = tr.delta(e.When)
-	if len(tr.events) < cap(tr.events) {
-		tr.events = append(tr.events, e)
-	} else {
-		// Discard the middle events.
-		di := int((cap(tr.events) - 1) / 2)
-		if d, ok := tr.events[di].What.(*discarded); ok {
-			(*d)++
-		} else {
-			// disc starts at two to count for the event it is replacing,
-			// plus the next one that we are about to drop.
-			tr.disc = 2
-			if tr.recycler != nil && tr.events[di].Recyclable {
-				go tr.recycler(tr.events[di].What)
-			}
-			tr.events[di].What = &tr.disc
-		}
-		// The timestamp of the discarded meta-event should be
-		// the time of the last event it is representing.
-		tr.events[di].When = tr.events[di+1].When
-
-		if tr.recycler != nil && tr.events[di+1].Recyclable {
-			go tr.recycler(tr.events[di+1].What)
-		}
-		copy(tr.events[di+1:], tr.events[di+2:])
-		tr.events[cap(tr.events)-1] = e
-	}
-	tr.mu.Unlock()
-}
-
-func (tr *trace) LazyLog(x fmt.Stringer, sensitive bool) {
-	tr.addEvent(x, true, sensitive)
-}
-
-func (tr *trace) LazyPrintf(format string, a ...interface{}) {
-	tr.addEvent(&lazySprintf{format, a}, false, false)
-}
-
-func (tr *trace) SetError() { tr.IsError = true }
-
-func (tr *trace) SetRecycler(f func(interface{})) {
-	tr.recycler = f
-}
-
-func (tr *trace) SetTraceInfo(traceID, spanID uint64) {
-	tr.traceID, tr.spanID = traceID, spanID
-}
-
-func (tr *trace) SetMaxEvents(m int) {
-	// Always keep at least three events: first, discarded count, last.
-	if len(tr.events) == 0 && m > 3 {
-		tr.events = make([]event, 0, m)
-	}
-}
-
-func (tr *trace) ref() {
-	atomic.AddInt32(&tr.refs, 1)
-}
-
-func (tr *trace) unref() {
-	if atomic.AddInt32(&tr.refs, -1) == 0 {
-		if tr.recycler != nil {
-			// freeTrace clears tr, so we hold tr.recycler and tr.events here.
-			go func(f func(interface{}), es []event) {
-				for _, e := range es {
-					if e.Recyclable {
-						f(e.What)
-					}
-				}
-			}(tr.recycler, tr.events)
-		}
-
-		freeTrace(tr)
-	}
-}
-
-func (tr *trace) When() string {
-	return tr.Start.Format("2006/01/02 15:04:05.000000")
-}
-
-func (tr *trace) ElapsedTime() string {
-	t := tr.Elapsed
-	if t == 0 {
-		// Active trace.
-		t = time.Since(tr.Start)
-	}
-	return fmt.Sprintf("%.6f", t.Seconds())
-}
-
-func (tr *trace) Events() []event {
-	tr.mu.RLock()
-	defer tr.mu.RUnlock()
-	return tr.events
-}
-
-var traceFreeList = make(chan *trace, 1000) // TODO(dsymonds): Use sync.Pool?
-
-// newTrace returns a trace ready to use.
-func newTrace() *trace {
-	select {
-	case tr := <-traceFreeList:
-		return tr
-	default:
-		return new(trace)
-	}
-}
-
-// freeTrace adds tr to traceFreeList if there's room.
-// This is non-blocking.
-func freeTrace(tr *trace) {
-	if DebugUseAfterFinish {
-		return // never reuse
-	}
-	tr.reset()
-	select {
-	case traceFreeList <- tr:
-	default:
-	}
-}
-
-func elapsed(d time.Duration) string {
-	b := []byte(fmt.Sprintf("%.6f", d.Seconds()))
-
-	// For subsecond durations, blank all zeros before decimal point,
-	// and all zeros between the decimal point and the first non-zero digit.
-	if d < time.Second {
-		dot := bytes.IndexByte(b, '.')
-		for i := 0; i < dot; i++ {
-			b[i] = ' '
-		}
-		for i := dot + 1; i < len(b); i++ {
-			if b[i] == '0' {
-				b[i] = ' '
-			} else {
-				break
-			}
-		}
-	}
-
-	return string(b)
-}
-
-var pageTmpl = template.Must(template.New("Page").Funcs(template.FuncMap{
-	"elapsed": elapsed,
-	"add":     func(a, b int) int { return a + b },
-}).Parse(pageHTML))
-
-const pageHTML = `
-{{template "Prolog" .}}
-{{template "StatusTable" .}}
-{{template "Epilog" .}}
-
-{{define "Prolog"}}
-<html>
-	<head>
-	<title>/debug/requests</title>
-	<style type="text/css">
-		body {
-			font-family: sans-serif;
-		}
-		table#tr-status td.family {
-			padding-right: 2em;
-		}
-		table#tr-status td.active {
-			padding-right: 1em;
-		}
-		table#tr-status td.latency-first {
-			padding-left: 1em;
-		}
-		table#tr-status td.empty {
-			color: #aaa;
-		}
-		table#reqs {
-			margin-top: 1em;
-		}
-		table#reqs tr.first {
-			{{if $.Expanded}}font-weight: bold;{{end}}
-		}
-		table#reqs td {
-			font-family: monospace;
-		}
-		table#reqs td.when {
-			text-align: right;
-			white-space: nowrap;
-		}
-		table#reqs td.elapsed {
-			padding: 0 0.5em;
-			text-align: right;
-			white-space: pre;
-			width: 10em;
-		}
-		address {
-			font-size: smaller;
-			margin-top: 5em;
-		}
-	</style>
-	</head>
-	<body>
-
-<h1>/debug/requests</h1>
-{{end}} {{/* end of Prolog */}}
-
-{{define "StatusTable"}}
-<table id="tr-status">
-	{{range $fam := .Families}}
-	<tr>
-		<td class="family">{{$fam}}</td>
-
-		{{$n := index $.ActiveTraceCount $fam}}
-		<td class="active {{if not $n}}empty{{end}}">
-			{{if $n}}<a href="?fam={{$fam}}&b=-1{{if $.Expanded}}&exp=1{{end}}">{{end}}
-			[{{$n}} active]
-			{{if $n}}</a>{{end}}
-		</td>
-
-		{{$f := index $.CompletedTraces $fam}}
-		{{range $i, $b := $f.Buckets}}
-		{{$empty := $b.Empty}}
-		<td {{if $empty}}class="empty"{{end}}>
-		{{if not $empty}}<a href="?fam={{$fam}}&b={{$i}}{{if $.Expanded}}&exp=1{{end}}">{{end}}
-		[{{.Cond}}]
-		{{if not $empty}}</a>{{end}}
-		</td>
-		{{end}}
-
-		{{$nb := len $f.Buckets}}
-		<td class="latency-first">
-		<a href="?fam={{$fam}}&b={{$nb}}">[minute]</a>
-		</td>
-		<td>
-		<a href="?fam={{$fam}}&b={{add $nb 1}}">[hour]</a>
-		</td>
-		<td>
-		<a href="?fam={{$fam}}&b={{add $nb 2}}">[total]</a>
-		</td>
-
-	</tr>
-	{{end}}
-</table>
-{{end}} {{/* end of StatusTable */}}
-
-{{define "Epilog"}}
-{{if $.Traces}}
-<hr />
-<h3>Family: {{$.Family}}</h3>
-
-{{if or $.Expanded $.Traced}}
-  <a href="?fam={{$.Family}}&b={{$.Bucket}}">[Normal/Summary]</a>
-{{else}}
-  [Normal/Summary]
-{{end}}
-
-{{if or (not $.Expanded) $.Traced}}
-  <a href="?fam={{$.Family}}&b={{$.Bucket}}&exp=1">[Normal/Expanded]</a>
-{{else}}
-  [Normal/Expanded]
-{{end}}
-
-{{if not $.Active}}
-	{{if or $.Expanded (not $.Traced)}}
-	<a href="?fam={{$.Family}}&b={{$.Bucket}}&rtraced=1">[Traced/Summary]</a>
-	{{else}}
-	[Traced/Summary]
-	{{end}}
-	{{if or (not $.Expanded) (not $.Traced)}}
-	<a href="?fam={{$.Family}}&b={{$.Bucket}}&exp=1&rtraced=1">[Traced/Expanded]</a>
-        {{else}}
-	[Traced/Expanded]
-	{{end}}
-{{end}}
-
-{{if $.Total}}
-<p><em>Showing <b>{{len $.Traces}}</b> of <b>{{$.Total}}</b> traces.</em></p>
-{{end}}
-
-<table id="reqs">
-	<caption>
-		{{if $.Active}}Active{{else}}Completed{{end}} Requests
-	</caption>
-	<tr><th>When</th><th>Elapsed&nbsp;(s)</th></tr>
-	{{range $tr := $.Traces}}
-	<tr class="first">
-		<td class="when">{{$tr.When}}</td>
-		<td class="elapsed">{{$tr.ElapsedTime}}</td>
-		<td>{{$tr.Title}}</td>
-		{{/* TODO: include traceID/spanID */}}
-	</tr>
-	{{if $.Expanded}}
-	{{range $tr.Events}}
-	<tr>
-		<td class="when">{{.WhenString}}</td>
-		<td class="elapsed">{{elapsed .Elapsed}}</td>
-		<td>{{if or $.ShowSensitive (not .Sensitive)}}... {{.What}}{{else}}<em>[redacted]</em>{{end}}</td>
-	</tr>
-	{{end}}
-	{{end}}
-	{{end}}
-</table>
-{{end}} {{/* if $.Traces */}}
-
-{{if $.Histogram}}
-<h4>Latency (&micro;s) of {{$.Family}} over {{$.HistogramWindow}}</h4>
-{{$.Histogram}}
-{{end}} {{/* if $.Histogram */}}
-
-	</body>
-</html>
-{{end}} {{/* end of Epilog */}}
-`
diff --git a/Godeps/_workspace/src/golang.org/x/sys/LICENSE b/Godeps/_workspace/src/golang.org/x/sys/LICENSE
deleted file mode 100644
index 6a66aea5ea..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/golang.org/x/sys/PATENTS b/Godeps/_workspace/src/golang.org/x/sys/PATENTS
deleted file mode 100644
index 733099041f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore b/Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore
deleted file mode 100644
index e482715909..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_obj/
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm.s
deleted file mode 100644
index 8ed2fdb94b..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm.s
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-TEXT ·use(SB),NOSPLIT,$0
-	RET
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_386.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_386.s
deleted file mode 100644
index 8a7278319e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_386.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for 386, Darwin
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_amd64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_amd64.s
deleted file mode 100644
index 6321421f27..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, Darwin
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s
deleted file mode 100644
index 333242d506..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm.s
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-// +build arm,darwin
-
-#include "textflag.h"
-
-//
-// System call support for ARM, Darwin
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	B	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	B	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-28
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	B	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s
deleted file mode 100644
index 97e0174371..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_darwin_arm64.s
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-// +build arm64,darwin
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, Darwin
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	B	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	B	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	B	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_amd64.s
deleted file mode 100644
index d5ed6726cc..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_dragonfly_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, DragonFly
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-64
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-88
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-112
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-64
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-88
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_386.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_386.s
deleted file mode 100644
index c9a0a26015..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_386.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for 386, FreeBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_amd64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_amd64.s
deleted file mode 100644
index 35172477c8..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, FreeBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_arm.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_arm.s
deleted file mode 100644
index 9227c875bf..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_freebsd_arm.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for ARM, FreeBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	B	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	B	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-28
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	B	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_386.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_386.s
deleted file mode 100644
index 4db2909323..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_386.s
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for 386, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
-
-TEXT ·socketcall(SB),NOSPLIT,$0-36
-	JMP	syscall·socketcall(SB)
-
-TEXT ·rawsocketcall(SB),NOSPLIT,$0-36
-	JMP	syscall·rawsocketcall(SB)
-
-TEXT ·seek(SB),NOSPLIT,$0-28
-	JMP	syscall·seek(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_amd64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_amd64.s
deleted file mode 100644
index 44e25c62f9..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for AMD64, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
-
-TEXT ·gettimeofday(SB),NOSPLIT,$0-16
-	JMP	syscall·gettimeofday(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm.s
deleted file mode 100644
index cf0b574658..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for arm, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	B	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	B	syscall·RawSyscall6(SB)
-
-TEXT ·seek(SB),NOSPLIT,$0-32
-	B	syscall·seek(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s
deleted file mode 100644
index 4be9bfedea..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_arm64.s
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build arm64
-// +build !gccgo
-
-#include "textflag.h"
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	B	syscall·Syscall(SB)
-
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
-	B	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	B	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-	B	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_mips64x.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_mips64x.s
deleted file mode 100644
index 724e580c4e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_mips64x.s
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build mips64 mips64le
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for mips64, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s
deleted file mode 100644
index 8d231feb4b..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_ppc64x.s
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build ppc64 ppc64le
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for ppc64, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	BR	syscall·Syscall(SB)
-
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
-	BR	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	BR	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-	BR	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_s390x.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_s390x.s
deleted file mode 100644
index 11889859fb..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_linux_s390x.s
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build s390x
-// +build linux
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for s390x, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT ·Syscall(SB),NOSPLIT,$0-56
-	BR	syscall·Syscall(SB)
-
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
-	BR	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	BR	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-	BR	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_386.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_386.s
deleted file mode 100644
index 48bdcd7632..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_386.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for 386, NetBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_amd64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_amd64.s
deleted file mode 100644
index 2ede05c72f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, NetBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_arm.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_arm.s
deleted file mode 100644
index e8928571c4..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_netbsd_arm.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for ARM, NetBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	B	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	B	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-28
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	B	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_386.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_386.s
deleted file mode 100644
index 00576f3c83..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_386.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for 386, OpenBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_amd64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_amd64.s
deleted file mode 100644
index 790ef77f86..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_openbsd_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, OpenBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s b/Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s
deleted file mode 100644
index 43ed17a05f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/asm_solaris_amd64.s
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for amd64, Solaris are implemented in runtime/syscall_solaris.go
-//
-
-TEXT ·sysvicall6(SB),NOSPLIT,$0-64
-	JMP	syscall·sysvicall6(SB)
-
-TEXT ·rawSysvicall6(SB),NOSPLIT,$0-64
-	JMP	syscall·rawSysvicall6(SB)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/bluetooth_linux.go b/Godeps/_workspace/src/golang.org/x/sys/unix/bluetooth_linux.go
deleted file mode 100644
index 6e32296970..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/bluetooth_linux.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Bluetooth sockets and messages
-
-package unix
-
-// Bluetooth Protocols
-const (
-	BTPROTO_L2CAP  = 0
-	BTPROTO_HCI    = 1
-	BTPROTO_SCO    = 2
-	BTPROTO_RFCOMM = 3
-	BTPROTO_BNEP   = 4
-	BTPROTO_CMTP   = 5
-	BTPROTO_HIDP   = 6
-	BTPROTO_AVDTP  = 7
-)
-
-const (
-	HCI_CHANNEL_RAW     = 0
-	HCI_CHANNEL_USER    = 1
-	HCI_CHANNEL_MONITOR = 2
-	HCI_CHANNEL_CONTROL = 3
-)
-
-// Socketoption Level
-const (
-	SOL_BLUETOOTH = 0x112
-	SOL_HCI       = 0x0
-	SOL_L2CAP     = 0x6
-	SOL_RFCOMM    = 0x12
-	SOL_SCO       = 0x11
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/constants.go b/Godeps/_workspace/src/golang.org/x/sys/unix/constants.go
deleted file mode 100644
index a96f0ebc26..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/constants.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix
-
-const (
-	R_OK = 0x4
-	W_OK = 0x2
-	X_OK = 0x1
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/env_unix.go b/Godeps/_workspace/src/golang.org/x/sys/unix/env_unix.go
deleted file mode 100644
index 45e281a047..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/env_unix.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2010 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-// Unix environment variables.
-
-package unix
-
-import "syscall"
-
-func Getenv(key string) (value string, found bool) {
-	return syscall.Getenv(key)
-}
-
-func Setenv(key, value string) error {
-	return syscall.Setenv(key, value)
-}
-
-func Clearenv() {
-	syscall.Clearenv()
-}
-
-func Environ() []string {
-	return syscall.Environ()
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/env_unset.go b/Godeps/_workspace/src/golang.org/x/sys/unix/env_unset.go
deleted file mode 100644
index 9222262559..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/env_unset.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.4
-
-package unix
-
-import "syscall"
-
-func Unsetenv(key string) error {
-	// This was added in Go 1.4.
-	return syscall.Unsetenv(key)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/flock.go b/Godeps/_workspace/src/golang.org/x/sys/unix/flock.go
deleted file mode 100644
index ce67a59528..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/flock.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// +build linux darwin freebsd openbsd netbsd dragonfly
-
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd
-
-package unix
-
-import "unsafe"
-
-// fcntl64Syscall is usually SYS_FCNTL, but is overridden on 32-bit Linux
-// systems by flock_linux_32bit.go to be SYS_FCNTL64.
-var fcntl64Syscall uintptr = SYS_FCNTL
-
-// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
-func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
-	_, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(unsafe.Pointer(lk)))
-	if errno == 0 {
-		return nil
-	}
-	return errno
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/flock_linux_32bit.go b/Godeps/_workspace/src/golang.org/x/sys/unix/flock_linux_32bit.go
deleted file mode 100644
index 362831c3f7..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/flock_linux_32bit.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build linux,386 linux,arm
-
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unix
-
-func init() {
-	// On 32-bit Linux systems, the fcntl syscall that matches Go's
-	// Flock_t type is SYS_FCNTL64, not SYS_FCNTL.
-	fcntl64Syscall = SYS_FCNTL64
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go b/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go
deleted file mode 100644
index 94c8232124..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo
-
-package unix
-
-import "syscall"
-
-// We can't use the gc-syntax .s files for gccgo.  On the plus side
-// much of the functionality can be written directly in Go.
-
-//extern gccgoRealSyscall
-func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr)
-
-func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	syscall.Entersyscall()
-	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
-	syscall.Exitsyscall()
-	return r, 0, syscall.Errno(errno)
-}
-
-func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	syscall.Entersyscall()
-	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
-	syscall.Exitsyscall()
-	return r, 0, syscall.Errno(errno)
-}
-
-func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	syscall.Entersyscall()
-	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9)
-	syscall.Exitsyscall()
-	return r, 0, syscall.Errno(errno)
-}
-
-func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
-	return r, 0, syscall.Errno(errno)
-}
-
-func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
-	return r, 0, syscall.Errno(errno)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c b/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c
deleted file mode 100644
index 07f6be0392..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_c.c
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo
-
-#include <errno.h>
-#include <stdint.h>
-#include <unistd.h>
-
-#define _STRINGIFY2_(x) #x
-#define _STRINGIFY_(x) _STRINGIFY2_(x)
-#define GOSYM_PREFIX _STRINGIFY_(__USER_LABEL_PREFIX__)
-
-// Call syscall from C code because the gccgo support for calling from
-// Go to C does not support varargs functions.
-
-struct ret {
-	uintptr_t r;
-	uintptr_t err;
-};
-
-struct ret
-gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
-{
-	struct ret r;
-
-	errno = 0;
-	r.r = syscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9);
-	r.err = errno;
-	return r;
-}
-
-// Define the use function in C so that it is not inlined.
-
-extern void use(void *) __asm__ (GOSYM_PREFIX GOPKGPATH ".use") __attribute__((noinline));
-
-void
-use(void *p __attribute__ ((unused)))
-{
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_linux_amd64.go
deleted file mode 100644
index bffe1a77db..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/gccgo_linux_amd64.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo,linux,amd64
-
-package unix
-
-import "syscall"
-
-//extern gettimeofday
-func realGettimeofday(*Timeval, *byte) int32
-
-func gettimeofday(tv *Timeval) (err syscall.Errno) {
-	r := realGettimeofday(tv, nil)
-	if r < 0 {
-		return syscall.GetErrno()
-	}
-	return 0
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh b/Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh
deleted file mode 100755
index 3e224c57e2..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mkall.sh
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# The unix package provides access to the raw system call
-# interface of the underlying operating system.  Porting Go to
-# a new architecture/operating system combination requires
-# some manual effort, though there are tools that automate
-# much of the process.  The auto-generated files have names
-# beginning with z.
-#
-# This script runs or (given -n) prints suggested commands to generate z files
-# for the current system.  Running those commands is not automatic.
-# This script is documentation more than anything else.
-#
-# * asm_${GOOS}_${GOARCH}.s
-#
-# This hand-written assembly file implements system call dispatch.
-# There are three entry points:
-#
-# 	func Syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr);
-# 	func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr);
-# 	func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr);
-#
-# The first and second are the standard ones; they differ only in
-# how many arguments can be passed to the kernel.
-# The third is for low-level use by the ForkExec wrapper;
-# unlike the first two, it does not call into the scheduler to
-# let it know that a system call is running.
-#
-# * syscall_${GOOS}.go
-#
-# This hand-written Go file implements system calls that need
-# special handling and lists "//sys" comments giving prototypes
-# for ones that can be auto-generated.  Mksyscall reads those
-# comments to generate the stubs.
-#
-# * syscall_${GOOS}_${GOARCH}.go
-#
-# Same as syscall_${GOOS}.go except that it contains code specific
-# to ${GOOS} on one particular architecture.
-#
-# * types_${GOOS}.c
-#
-# This hand-written C file includes standard C headers and then
-# creates typedef or enum names beginning with a dollar sign
-# (use of $ in variable names is a gcc extension).  The hardest
-# part about preparing this file is figuring out which headers to
-# include and which symbols need to be #defined to get the
-# actual data structures that pass through to the kernel system calls.
-# Some C libraries present alternate versions for binary compatibility
-# and translate them on the way in and out of system calls, but
-# there is almost always a #define that can get the real ones.
-# See types_darwin.c and types_linux.c for examples.
-#
-# * zerror_${GOOS}_${GOARCH}.go
-#
-# This machine-generated file defines the system's error numbers,
-# error strings, and signal numbers.  The generator is "mkerrors.sh".
-# Usually no arguments are needed, but mkerrors.sh will pass its
-# arguments on to godefs.
-#
-# * zsyscall_${GOOS}_${GOARCH}.go
-#
-# Generated by mksyscall.pl; see syscall_${GOOS}.go above.
-#
-# * zsysnum_${GOOS}_${GOARCH}.go
-#
-# Generated by mksysnum_${GOOS}.
-#
-# * ztypes_${GOOS}_${GOARCH}.go
-#
-# Generated by godefs; see types_${GOOS}.c above.
-
-GOOSARCH="${GOOS}_${GOARCH}"
-
-# defaults
-mksyscall="./mksyscall.pl"
-mkerrors="./mkerrors.sh"
-zerrors="zerrors_$GOOSARCH.go"
-mksysctl=""
-zsysctl="zsysctl_$GOOSARCH.go"
-mksysnum=
-mktypes=
-run="sh"
-
-case "$1" in
--syscalls)
-	for i in zsyscall*go
-	do
-		sed 1q $i | sed 's;^// ;;' | sh > _$i && gofmt < _$i > $i
-		rm _$i
-	done
-	exit 0
-	;;
--n)
-	run="cat"
-	shift
-esac
-
-case "$#" in
-0)
-	;;
-*)
-	echo 'usage: mkall.sh [-n]' 1>&2
-	exit 2
-esac
-
-GOOSARCH_in=syscall_$GOOSARCH.go
-case "$GOOSARCH" in
-_* | *_ | _)
-	echo 'undefined $GOOS_$GOARCH:' "$GOOSARCH" 1>&2
-	exit 1
-	;;
-darwin_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32"
-	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-darwin_amd64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-darwin_arm)
-	mkerrors="$mkerrors"
-	mksysnum="./mksysnum_darwin.pl /usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-darwin_arm64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk iphoneos)/usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-dragonfly_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32 -dragonfly"
-	mksysnum="curl -s 'http://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/sys/kern/syscalls.master' | ./mksysnum_dragonfly.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-dragonfly_amd64)
-	mkerrors="$mkerrors -m64"
-	mksyscall="./mksyscall.pl -dragonfly"
-	mksysnum="curl -s 'http://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/sys/kern/syscalls.master' | ./mksysnum_dragonfly.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-freebsd_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32"
-	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-freebsd_amd64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-freebsd_arm)
-	mkerrors="$mkerrors"
-	mksyscall="./mksyscall.pl -l32 -arm"
-	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	# Let the type of C char be signed for making the bare syscall
-	# API consistent across over platforms.
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-linux_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32"
-	mksysnum="./mksysnum_linux.pl /usr/include/asm/unistd_32.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_amd64)
-	unistd_h=$(ls -1 /usr/include/asm/unistd_64.h /usr/include/x86_64-linux-gnu/asm/unistd_64.h 2>/dev/null | head -1)
-	if [ "$unistd_h" = "" ]; then
-		echo >&2 cannot find unistd_64.h
-		exit 1
-	fi
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_arm)
-	mkerrors="$mkerrors"
-	mksyscall="./mksyscall.pl -l32 -arm"
-	mksysnum="curl -s 'http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/arch/arm/include/uapi/asm/unistd.h' | ./mksysnum_linux.pl -"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_arm64)
-	unistd_h=$(ls -1 /usr/include/asm/unistd.h /usr/include/asm-generic/unistd.h 2>/dev/null | head -1)
-	if [ "$unistd_h" = "" ]; then
-		echo >&2 cannot find unistd_64.h
-		exit 1
-	fi
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	# Let the type of C char be signed for making the bare syscall
-	# API consistent across over platforms.
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-linux_ppc64)
-	GOOSARCH_in=syscall_linux_ppc64x.go
-	unistd_h=/usr/include/asm/unistd.h
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_ppc64le)
-	GOOSARCH_in=syscall_linux_ppc64x.go
-	unistd_h=/usr/include/powerpc64le-linux-gnu/asm/unistd.h
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_s390x)
-	GOOSARCH_in=syscall_linux_s390x.go
-	unistd_h=/usr/include/asm/unistd.h
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	# Let the type of C char be signed to make the bare sys
-	# API more consistent between platforms.
-	# This is a deliberate departure from the way the syscall
-	# package generates its version of the types file.
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-netbsd_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32 -netbsd"
-	mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-netbsd_amd64)
-	mkerrors="$mkerrors -m64"
-	mksyscall="./mksyscall.pl -netbsd"
-	mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-openbsd_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32 -openbsd"
-	mksysctl="./mksysctl_openbsd.pl"
-	zsysctl="zsysctl_openbsd.go"
-	mksysnum="curl -s 'http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-openbsd_amd64)
-	mkerrors="$mkerrors -m64"
-	mksyscall="./mksyscall.pl -openbsd"
-	mksysctl="./mksysctl_openbsd.pl"
-	zsysctl="zsysctl_openbsd.go"
-	mksysnum="curl -s 'http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-solaris_amd64)
-	mksyscall="./mksyscall_solaris.pl"
-	mkerrors="$mkerrors -m64"
-	mksysnum=
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-*)
-	echo 'unrecognized $GOOS_$GOARCH: ' "$GOOSARCH" 1>&2
-	exit 1
-	;;
-esac
-
-(
-	if [ -n "$mkerrors" ]; then echo "$mkerrors |gofmt >$zerrors"; fi
-	case "$GOOS" in
-	*)
-		syscall_goos="syscall_$GOOS.go"
-		case "$GOOS" in
-		darwin | dragonfly | freebsd | netbsd | openbsd)
-			syscall_goos="syscall_bsd.go $syscall_goos"
-			;;
-		esac
-		if [ -n "$mksyscall" ]; then echo "$mksyscall $syscall_goos $GOOSARCH_in |gofmt >zsyscall_$GOOSARCH.go"; fi
-		;;
-	esac
-	if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi
-	if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi
-	if [ -n "$mktypes" ]; then
-		echo "echo // +build $GOARCH,$GOOS > ztypes_$GOOSARCH.go";
-		echo "$mktypes types_$GOOS.go | go run mkpost.go >>ztypes_$GOOSARCH.go";
-	fi
-) | $run
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh b/Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh
deleted file mode 100755
index c40d788c4a..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mkerrors.sh
+++ /dev/null
@@ -1,476 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Generate Go code listing errors and other #defined constant
-# values (ENAMETOOLONG etc.), by asking the preprocessor
-# about the definitions.
-
-unset LANG
-export LC_ALL=C
-export LC_CTYPE=C
-
-if test -z "$GOARCH" -o -z "$GOOS"; then
-	echo 1>&2 "GOARCH or GOOS not defined in environment"
-	exit 1
-fi
-
-CC=${CC:-cc}
-
-if [[ "$GOOS" -eq "solaris" ]]; then
-	# Assumes GNU versions of utilities in PATH.
-	export PATH=/usr/gnu/bin:$PATH
-fi
-
-uname=$(uname)
-
-includes_Darwin='
-#define _DARWIN_C_SOURCE
-#define KERNEL
-#define _DARWIN_USE_64_BIT_INODE
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/ptrace.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <termios.h>
-'
-
-includes_DragonFly='
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <netinet/ip.h>
-#include <net/ip_mroute/ip_mroute.h>
-'
-
-includes_FreeBSD='
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-#include <sys/extattr.h>
-
-#if __FreeBSD__ >= 10
-#define IFT_CARP	0xf8	// IFT_CARP is deprecated in FreeBSD 10
-#undef SIOCAIFADDR
-#define SIOCAIFADDR	_IOW(105, 26, struct oifaliasreq)	// ifaliasreq contains if_data
-#undef SIOCSIFPHYADDR
-#define SIOCSIFPHYADDR	_IOW(105, 70, struct oifaliasreq)	// ifaliasreq contains if_data
-#endif
-'
-
-includes_Linux='
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
-#ifndef __LP64__
-#define _FILE_OFFSET_BITS 64
-#endif
-#define _GNU_SOURCE
-
-#include <bits/sockaddr.h>
-#include <sys/epoll.h>
-#include <sys/inotify.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/prctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
-#include <linux/if_ether.h>
-#include <linux/if_tun.h>
-#include <linux/if_packet.h>
-#include <linux/if_addr.h>
-#include <linux/filter.h>
-#include <linux/netlink.h>
-#include <linux/reboot.h>
-#include <linux/rtnetlink.h>
-#include <linux/ptrace.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/icmpv6.h>
-#include <net/route.h>
-#include <asm/termbits.h>
-
-#ifndef MSG_FASTOPEN
-#define MSG_FASTOPEN    0x20000000
-#endif
-
-#ifndef PTRACE_GETREGS
-#define PTRACE_GETREGS	0xc
-#endif
-
-#ifndef PTRACE_SETREGS
-#define PTRACE_SETREGS	0xd
-#endif
-'
-
-includes_NetBSD='
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/termios.h>
-#include <sys/ttycom.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-#include <netinet/if_ether.h>
-
-// Needed since <sys/param.h> refers to it...
-#define schedppq 1
-'
-
-includes_OpenBSD='
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/termios.h>
-#include <sys/ttycom.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_var.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-#include <netinet/if_ether.h>
-#include <net/if_bridge.h>
-
-// We keep some constants not supported in OpenBSD 5.5 and beyond for
-// the promise of compatibility.
-#define EMUL_ENABLED		0x1
-#define EMUL_NATIVE		0x2
-#define IPV6_FAITH		0x1d
-#define IPV6_OPTIONS		0x1
-#define IPV6_RTHDR_STRICT	0x1
-#define IPV6_SOCKOPT_RESERVED1	0x3
-#define SIOCGIFGENERIC		0xc020693a
-#define SIOCSIFGENERIC		0x80206939
-#define WALTSIG			0x4
-'
-
-includes_SunOS='
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-'
-
-
-includes='
-#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
-#include <netinet/tcp.h>
-#include <errno.h>
-#include <sys/signal.h>
-#include <signal.h>
-#include <sys/resource.h>
-#include <time.h>
-'
-ccflags="$@"
-
-# Write go tool cgo -godefs input.
-(
-	echo package unix
-	echo
-	echo '/*'
-	indirect="includes_$(uname)"
-	echo "${!indirect} $includes"
-	echo '*/'
-	echo 'import "C"'
-	echo 'import "syscall"'
-	echo
-	echo 'const ('
-
-	# The gcc command line prints all the #defines
-	# it encounters while processing the input
-	echo "${!indirect} $includes" | $CC -x c - -E -dM $ccflags |
-	awk '
-		$1 != "#define" || $2 ~ /\(/ || $3 == "" {next}
-
-		$2 ~ /^E([ABCD]X|[BIS]P|[SD]I|S|FL)$/ {next}  # 386 registers
-		$2 ~ /^(SIGEV_|SIGSTKSZ|SIGRT(MIN|MAX))/ {next}
-		$2 ~ /^(SCM_SRCRT)$/ {next}
-		$2 ~ /^(MAP_FAILED)$/ {next}
-		$2 ~ /^ELF_.*$/ {next}# <asm/elf.h> contains ELF_ARCH, etc.
-
-		$2 ~ /^EXTATTR_NAMESPACE_NAMES/ ||
-		$2 ~ /^EXTATTR_NAMESPACE_[A-Z]+_STRING/ {next}
-
-		$2 !~ /^ETH_/ &&
-		$2 !~ /^EPROC_/ &&
-		$2 !~ /^EQUIV_/ &&
-		$2 !~ /^EXPR_/ &&
-		$2 ~ /^E[A-Z0-9_]+$/ ||
-		$2 ~ /^B[0-9_]+$/ ||
-		$2 == "BOTHER" ||
-		$2 ~ /^CI?BAUD(EX)?$/ ||
-		$2 == "IBSHIFT" ||
-		$2 ~ /^V[A-Z0-9]+$/ ||
-		$2 ~ /^CS[A-Z0-9]/ ||
-		$2 ~ /^I(SIG|CANON|CRNL|UCLC|EXTEN|MAXBEL|STRIP|UTF8)$/ ||
-		$2 ~ /^IGN/ ||
-		$2 ~ /^IX(ON|ANY|OFF)$/ ||
-		$2 ~ /^IN(LCR|PCK)$/ ||
-		$2 ~ /(^FLU?SH)|(FLU?SH$)/ ||
-		$2 ~ /^C(LOCAL|READ|MSPAR|RTSCTS)$/ ||
-		$2 == "BRKINT" ||
-		$2 == "HUPCL" ||
-		$2 == "PENDIN" ||
-		$2 == "TOSTOP" ||
-		$2 == "XCASE" ||
-		$2 == "ALTWERASE" ||
-		$2 == "NOKERNINFO" ||
-		$2 ~ /^PAR/ ||
-		$2 ~ /^SIG[^_]/ ||
-		$2 ~ /^O[CNPFPL][A-Z]+[^_][A-Z]+$/ ||
-		$2 ~ /^(NL|CR|TAB|BS|VT|FF)DLY$/ ||
-		$2 ~ /^(NL|CR|TAB|BS|VT|FF)[0-9]$/ ||
-		$2 ~ /^O?XTABS$/ ||
-		$2 ~ /^TC[IO](ON|OFF)$/ ||
-		$2 ~ /^IN_/ ||
-		$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
-		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|ICMP6|TCP|EVFILT|NOTE|EV|SHUT|PROT|MAP|PACKET|MSG|SCM|MCL|DT|MADV|PR)_/ ||
-		$2 == "ICMPV6_FILTER" ||
-		$2 == "SOMAXCONN" ||
-		$2 == "NAME_MAX" ||
-		$2 == "IFNAMSIZ" ||
-		$2 ~ /^CTL_(MAXNAME|NET|QUERY)$/ ||
-		$2 ~ /^SYSCTL_VERS/ ||
-		$2 ~ /^(MS|MNT)_/ ||
-		$2 ~ /^TUN(SET|GET|ATTACH|DETACH)/ ||
-		$2 ~ /^(O|F|FD|NAME|S|PTRACE|PT)_/ ||
-		$2 ~ /^LINUX_REBOOT_CMD_/ ||
-		$2 ~ /^LINUX_REBOOT_MAGIC[12]$/ ||
-		$2 !~ "NLA_TYPE_MASK" &&
-		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P)_/ ||
-		$2 ~ /^SIOC/ ||
-		$2 ~ /^TIOC/ ||
-		$2 ~ /^TCGET/ ||
-		$2 ~ /^TCSET/ ||
-		$2 ~ /^TC(FLSH|SBRKP?|XONC)$/ ||
-		$2 !~ "RTF_BITS" &&
-		$2 ~ /^(IFF|IFT|NET_RT|RTM|RTF|RTV|RTA|RTAX)_/ ||
-		$2 ~ /^BIOC/ ||
-		$2 ~ /^RUSAGE_(SELF|CHILDREN|THREAD)/ ||
-		$2 ~ /^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|NOFILE|STACK)|RLIM_INFINITY/ ||
-		$2 ~ /^PRIO_(PROCESS|PGRP|USER)/ ||
-		$2 ~ /^CLONE_[A-Z_]+/ ||
-		$2 !~ /^(BPF_TIMEVAL)$/ &&
-		$2 ~ /^(BPF|DLT)_/ ||
-		$2 ~ /^CLOCK_/ ||
-		$2 !~ "WMESGLEN" &&
-		$2 ~ /^W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", $2, $2)}
-		$2 ~ /^__WCOREFLAG$/ {next}
-		$2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)}
-
-		{next}
-	' | sort
-
-	echo ')'
-) >_const.go
-
-# Pull out the error names for later.
-errors=$(
-	echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print $2 }' |
-	sort
-)
-
-# Pull out the signal names for later.
-signals=$(
-	echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' |
-	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
-	sort
-)
-
-# Again, writing regexps to a file.
-echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print "^\t" $2 "[ \t]*=" }' |
-	sort >_error.grep
-echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print "^\t" $2 "[ \t]*=" }' |
-	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
-	sort >_signal.grep
-
-echo '// mkerrors.sh' "$@"
-echo '// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT'
-echo
-echo "// +build ${GOARCH},${GOOS}"
-echo
-go tool cgo -godefs -- "$@" _const.go >_error.out
-cat _error.out | grep -vf _error.grep | grep -vf _signal.grep
-echo
-echo '// Errors'
-echo 'const ('
-cat _error.out | grep -f _error.grep | sed 's/=\(.*\)/= syscall.Errno(\1)/'
-echo ')'
-
-echo
-echo '// Signals'
-echo 'const ('
-cat _error.out | grep -f _signal.grep | sed 's/=\(.*\)/= syscall.Signal(\1)/'
-echo ')'
-
-# Run C program to print error and syscall strings.
-(
-	echo -E "
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <signal.h>
-
-#define nelem(x) (sizeof(x)/sizeof((x)[0]))
-
-enum { A = 'A', Z = 'Z', a = 'a', z = 'z' }; // avoid need for single quotes below
-
-int errors[] = {
-"
-	for i in $errors
-	do
-		echo -E '	'$i,
-	done
-
-	echo -E "
-};
-
-int signals[] = {
-"
-	for i in $signals
-	do
-		echo -E '	'$i,
-	done
-
-	# Use -E because on some systems bash builtin interprets \n itself.
-	echo -E '
-};
-
-static int
-intcmp(const void *a, const void *b)
-{
-	return *(int*)a - *(int*)b;
-}
-
-int
-main(void)
-{
-	int i, j, e;
-	char buf[1024], *p;
-
-	printf("\n\n// Error table\n");
-	printf("var errors = [...]string {\n");
-	qsort(errors, nelem(errors), sizeof errors[0], intcmp);
-	for(i=0; i<nelem(errors); i++) {
-		e = errors[i];
-		if(i > 0 && errors[i-1] == e)
-			continue;
-		strcpy(buf, strerror(e));
-		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
-		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
-			buf[0] += a - A;
-		printf("\t%d: \"%s\",\n", e, buf);
-	}
-	printf("}\n\n");
-	
-	printf("\n\n// Signal table\n");
-	printf("var signals = [...]string {\n");
-	qsort(signals, nelem(signals), sizeof signals[0], intcmp);
-	for(i=0; i<nelem(signals); i++) {
-		e = signals[i];
-		if(i > 0 && signals[i-1] == e)
-			continue;
-		strcpy(buf, strsignal(e));
-		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
-		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
-			buf[0] += a - A;
-		// cut trailing : number.
-		p = strrchr(buf, ":"[0]);
-		if(p)
-			*p = '\0';
-		printf("\t%d: \"%s\",\n", e, buf);
-	}
-	printf("}\n\n");
-
-	return 0;
-}
-
-'
-) >_errors.c
-
-$CC $ccflags -o _errors _errors.c && $GORUN ./_errors && rm -f _errors.c _errors _const.go _error.grep _signal.grep _error.out
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mkpost.go b/Godeps/_workspace/src/golang.org/x/sys/unix/mkpost.go
deleted file mode 100644
index ed50d902af..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mkpost.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// mkpost processes the output of cgo -godefs to
-// modify the generated types. It is used to clean up
-// the sys API in an architecture specific manner.
-//
-// mkpost is run after cgo -godefs by mkall.sh.
-package main
-
-import (
-	"fmt"
-	"go/format"
-	"io/ioutil"
-	"log"
-	"os"
-	"regexp"
-)
-
-func main() {
-	b, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		log.Fatal(err)
-	}
-	s := string(b)
-
-	goarch := os.Getenv("GOARCH")
-	goos := os.Getenv("GOOS")
-	if goarch == "s390x" && goos == "linux" {
-		// Export the types of PtraceRegs fields.
-		re := regexp.MustCompile("ptrace(Psw|Fpregs|Per)")
-		s = re.ReplaceAllString(s, "Ptrace$1")
-
-		// Replace padding fields inserted by cgo with blank identifiers.
-		re = regexp.MustCompile("Pad_cgo[A-Za-z0-9_]*")
-		s = re.ReplaceAllString(s, "_")
-
-		// Replace other unwanted fields with blank identifiers.
-		re = regexp.MustCompile("X_[A-Za-z0-9_]*")
-		s = re.ReplaceAllString(s, "_")
-
-		// Replace the control_regs union with a blank identifier for now.
-		re = regexp.MustCompile("(Control_regs)\\s+\\[0\\]uint64")
-		s = re.ReplaceAllString(s, "_ [0]uint64")
-	}
-
-	// gofmt
-	b, err = format.Source([]byte(s))
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Append this command to the header to show where the new file
-	// came from.
-	re := regexp.MustCompile("(cgo -godefs [a-zA-Z0-9_]+\\.go.*)")
-	b = re.ReplaceAll(b, []byte("$1 | go run mkpost.go"))
-
-	fmt.Printf("%s", b)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl
deleted file mode 100755
index b1e7766dae..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall.pl
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This program reads a file containing function prototypes
-# (like syscall_darwin.go) and generates system call bodies.
-# The prototypes are marked by lines beginning with "//sys"
-# and read like func declarations if //sys is replaced by func, but:
-#	* The parameter lists must give a name for each argument.
-#	  This includes return parameters.
-#	* The parameter lists must give a type for each argument:
-#	  the (x, y, z int) shorthand is not allowed.
-#	* If the return parameter is an error number, it must be named errno.
-
-# A line beginning with //sysnb is like //sys, except that the
-# goroutine will not be suspended during the execution of the system
-# call.  This must only be used for system calls which can never
-# block, as otherwise the system call could cause all goroutines to
-# hang.
-
-use strict;
-
-my $cmdline = "mksyscall.pl " . join(' ', @ARGV);
-my $errors = 0;
-my $_32bit = "";
-my $plan9 = 0;
-my $openbsd = 0;
-my $netbsd = 0;
-my $dragonfly = 0;
-my $arm = 0; # 64-bit value should use (even, odd)-pair
-
-if($ARGV[0] eq "-b32") {
-	$_32bit = "big-endian";
-	shift;
-} elsif($ARGV[0] eq "-l32") {
-	$_32bit = "little-endian";
-	shift;
-}
-if($ARGV[0] eq "-plan9") {
-	$plan9 = 1;
-	shift;
-}
-if($ARGV[0] eq "-openbsd") {
-	$openbsd = 1;
-	shift;
-}
-if($ARGV[0] eq "-netbsd") {
-	$netbsd = 1;
-	shift;
-}
-if($ARGV[0] eq "-dragonfly") {
-	$dragonfly = 1;
-	shift;
-}
-if($ARGV[0] eq "-arm") {
-	$arm = 1;
-	shift;
-}
-
-if($ARGV[0] =~ /^-/) {
-	print STDERR "usage: mksyscall.pl [-b32 | -l32] [file ...]\n";
-	exit 1;
-}
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-sub parseparamlist($) {
-	my ($list) = @_;
-	$list =~ s/^\s*//;
-	$list =~ s/\s*$//;
-	if($list eq "") {
-		return ();
-	}
-	return split(/\s*,\s*/, $list);
-}
-
-sub parseparam($) {
-	my ($p) = @_;
-	if($p !~ /^(\S*) (\S*)$/) {
-		print STDERR "$ARGV:$.: malformed parameter: $p\n";
-		$errors = 1;
-		return ("xx", "int");
-	}
-	return ($1, $2);
-}
-
-my $text = "";
-while(<>) {
-	chomp;
-	s/\s+/ /g;
-	s/^\s+//;
-	s/\s+$//;
-	my $nonblock = /^\/\/sysnb /;
-	next if !/^\/\/sys / && !$nonblock;
-
-	# Line must be of the form
-	#	func Open(path string, mode int, perm int) (fd int, errno error)
-	# Split into name, in params, out params.
-	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*((?i)SYS_[A-Z0-9_]+))?$/) {
-		print STDERR "$ARGV:$.: malformed //sys declaration\n";
-		$errors = 1;
-		next;
-	}
-	my ($func, $in, $out, $sysname) = ($2, $3, $4, $5);
-
-	# Split argument lists on comma.
-	my @in = parseparamlist($in);
-	my @out = parseparamlist($out);
-
-	# Try in vain to keep people from editing this file.
-	# The theory is that they jump into the middle of the file
-	# without reading the header.
-	$text .= "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n";
-
-	# Go function header.
-	my $out_decl = @out ? sprintf(" (%s)", join(', ', @out)) : "";
-	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out_decl;
-
-	# Check if err return available
-	my $errvar = "";
-	foreach my $p (@out) {
-		my ($name, $type) = parseparam($p);
-		if($type eq "error") {
-			$errvar = $name;
-			last;
-		}
-	}
-
-	# Prepare arguments to Syscall.
-	my @args = ();
-	my @uses = ();
-	my $n = 0;
-	foreach my $p (@in) {
-		my ($name, $type) = parseparam($p);
-		if($type =~ /^\*/) {
-			push @args, "uintptr(unsafe.Pointer($name))";
-		} elsif($type eq "string" && $errvar ne "") {
-			$text .= "\tvar _p$n *byte\n";
-			$text .= "\t_p$n, $errvar = BytePtrFromString($name)\n";
-			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			push @uses, "use(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type eq "string") {
-			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
-			$text .= "\tvar _p$n *byte\n";
-			$text .= "\t_p$n, _ = BytePtrFromString($name)\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			push @uses, "use(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type =~ /^\[\](.*)/) {
-			# Convert slice into pointer, length.
-			# Have to be careful not to take address of &a[0] if len == 0:
-			# pass dummy pointer in that case.
-			# Used to pass nil, but some OSes or simulators reject write(fd, nil, 0).
-			$text .= "\tvar _p$n unsafe.Pointer\n";
-			$text .= "\tif len($name) > 0 {\n\t\t_p$n = unsafe.Pointer(\&${name}[0])\n\t}";
-			$text .= " else {\n\t\t_p$n = unsafe.Pointer(&_zero)\n\t}";
-			$text .= "\n";
-			push @args, "uintptr(_p$n)", "uintptr(len($name))";
-			$n++;
-		} elsif($type eq "int64" && ($openbsd || $netbsd)) {
-			push @args, "0";
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} elsif($_32bit eq "little-endian") {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			} else {
-				push @args, "uintptr($name)";
-			}
-		} elsif($type eq "int64" && $dragonfly) {
-			if ($func !~ /^extp(read|write)/i) {
-				push @args, "0";
-			}
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} elsif($_32bit eq "little-endian") {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			} else {
-				push @args, "uintptr($name)";
-			}
-		} elsif($type eq "int64" && $_32bit ne "") {
-			if(@args % 2 && $arm) {
-				# arm abi specifies 64-bit argument uses 
-				# (even, odd) pair
-				push @args, "0"
-			}
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} else {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			}
-		} else {
-			push @args, "uintptr($name)";
-		}
-	}
-
-	# Determine which form to use; pad args with zeros.
-	my $asm = "Syscall";
-	if ($nonblock) {
-		$asm = "RawSyscall";
-	}
-	if(@args <= 3) {
-		while(@args < 3) {
-			push @args, "0";
-		}
-	} elsif(@args <= 6) {
-		$asm .= "6";
-		while(@args < 6) {
-			push @args, "0";
-		}
-	} elsif(@args <= 9) {
-		$asm .= "9";
-		while(@args < 9) {
-			push @args, "0";
-		}
-	} else {
-		print STDERR "$ARGV:$.: too many arguments to system call\n";
-	}
-
-	# System call number.
-	if($sysname eq "") {
-		$sysname = "SYS_$func";
-		$sysname =~ s/([a-z])([A-Z])/${1}_$2/g;	# turn FooBar into Foo_Bar
-		$sysname =~ y/a-z/A-Z/;
-	}
-
-	# Actual call.
-	my $args = join(', ', @args);
-	my $call = "$asm($sysname, $args)";
-
-	# Assign return values.
-	my $body = "";
-	my @ret = ("_", "_", "_");
-	my $do_errno = 0;
-	for(my $i=0; $i<@out; $i++) {
-		my $p = $out[$i];
-		my ($name, $type) = parseparam($p);
-		my $reg = "";
-		if($name eq "err" && !$plan9) {
-			$reg = "e1";
-			$ret[2] = $reg;
-			$do_errno = 1;
-		} elsif($name eq "err" && $plan9) {
-			$ret[0] = "r0";
-			$ret[2] = "e1";
-			next;
-		} else {
-			$reg = sprintf("r%d", $i);
-			$ret[$i] = $reg;
-		}
-		if($type eq "bool") {
-			$reg = "$reg != 0";
-		}
-		if($type eq "int64" && $_32bit ne "") {
-			# 64-bit number in r1:r0 or r0:r1.
-			if($i+2 > @out) {
-				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
-			}
-			if($_32bit eq "big-endian") {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
-			} else {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
-			}
-			$ret[$i] = sprintf("r%d", $i);
-			$ret[$i+1] = sprintf("r%d", $i+1);
-		}
-		if($reg ne "e1" || $plan9) {
-			$body .= "\t$name = $type($reg)\n";
-		}
-	}
-	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
-		$text .= "\t$call\n";
-	} else {
-		$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
-	}
-	foreach my $use (@uses) {
-		$text .= "\t$use\n";
-	}
-	$text .= $body;
-	
-	if ($plan9 && $ret[2] eq "e1") {
-		$text .= "\tif int32(r0) == -1 {\n";
-		$text .= "\t\terr = e1\n";
-		$text .= "\t}\n";
-	} elsif ($do_errno) {
-		$text .= "\tif e1 != 0 {\n";
-		$text .= "\t\terr = errnoErr(e1)\n";
-		$text .= "\t}\n";
-	}
-	$text .= "\treturn\n";
-	$text .= "}\n\n";
-}
-
-chomp $text;
-chomp $text;
-
-if($errors) {
-	exit 1;
-}
-
-print <<EOF;
-// $cmdline
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-$text
-EOF
-exit 0;
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl
deleted file mode 100755
index 06bade7687..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksyscall_solaris.pl
+++ /dev/null
@@ -1,294 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This program reads a file containing function prototypes
-# (like syscall_solaris.go) and generates system call bodies.
-# The prototypes are marked by lines beginning with "//sys"
-# and read like func declarations if //sys is replaced by func, but:
-#	* The parameter lists must give a name for each argument.
-#	  This includes return parameters.
-#	* The parameter lists must give a type for each argument:
-#	  the (x, y, z int) shorthand is not allowed.
-#	* If the return parameter is an error number, it must be named err.
-#	* If go func name needs to be different than its libc name, 
-#	* or the function is not in libc, name could be specified
-#	* at the end, after "=" sign, like
-#	  //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt
-
-use strict;
-
-my $cmdline = "mksyscall_solaris.pl " . join(' ', @ARGV);
-my $errors = 0;
-my $_32bit = "";
-
-binmode STDOUT;
-
-if($ARGV[0] eq "-b32") {
-	$_32bit = "big-endian";
-	shift;
-} elsif($ARGV[0] eq "-l32") {
-	$_32bit = "little-endian";
-	shift;
-}
-
-if($ARGV[0] =~ /^-/) {
-	print STDERR "usage: mksyscall_solaris.pl [-b32 | -l32] [file ...]\n";
-	exit 1;
-}
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-sub parseparamlist($) {
-	my ($list) = @_;
-	$list =~ s/^\s*//;
-	$list =~ s/\s*$//;
-	if($list eq "") {
-		return ();
-	}
-	return split(/\s*,\s*/, $list);
-}
-
-sub parseparam($) {
-	my ($p) = @_;
-	if($p !~ /^(\S*) (\S*)$/) {
-		print STDERR "$ARGV:$.: malformed parameter: $p\n";
-		$errors = 1;
-		return ("xx", "int");
-	}
-	return ($1, $2);
-}
-
-my $package = "";
-my $text = "";
-my $dynimports = "";
-my $linknames = "";
-my @vars = ();
-while(<>) {
-	chomp;
-	s/\s+/ /g;
-	s/^\s+//;
-	s/\s+$//;
-	$package = $1 if !$package && /^package (\S+)$/;
-	my $nonblock = /^\/\/sysnb /;
-	next if !/^\/\/sys / && !$nonblock;
-
-	# Line must be of the form
-	#	func Open(path string, mode int, perm int) (fd int, err error)
-	# Split into name, in params, out params.
-	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$/) {
-		print STDERR "$ARGV:$.: malformed //sys declaration\n";
-		$errors = 1;
-		next;
-	}
-	my ($nb, $func, $in, $out, $modname, $sysname) = ($1, $2, $3, $4, $5, $6);
-
-	# Split argument lists on comma.
-	my @in = parseparamlist($in);
-	my @out = parseparamlist($out);
-
-	# So file name.
-	if($modname eq "") {
-		$modname = "libc";
-	}
-
-	# System call name.
-	if($sysname eq "") {
-		$sysname = "$func";
-	}
-
-	# System call pointer variable name.
-	my $sysvarname = "proc$sysname";
-
-	my $strconvfunc = "BytePtrFromString";
-	my $strconvtype = "*byte";
-
-	$sysname =~ y/A-Z/a-z/; # All libc functions are lowercase.
-
-	# Runtime import of function to allow cross-platform builds.
-	$dynimports .= "//go:cgo_import_dynamic libc_${sysname} ${sysname} \"$modname.so\"\n";
-	# Link symbol to proc address variable.
-	$linknames .= "//go:linkname ${sysvarname} libc_${sysname}\n";
-	# Library proc address variable.
-	push @vars, $sysvarname;
-
-	# Go function header.
-	$out = join(', ', @out);
-	if($out ne "") {
-		$out = " ($out)";
-	}
-	if($text ne "") {
-		$text .= "\n"
-	}
-	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out;
-
-	# Check if err return available
-	my $errvar = "";
-	foreach my $p (@out) {
-		my ($name, $type) = parseparam($p);
-		if($type eq "error") {
-			$errvar = $name;
-			last;
-		}
-	}
-
-	# Prepare arguments to Syscall.
-	my @args = ();
-	my @uses = ();
-	my $n = 0;
-	foreach my $p (@in) {
-		my ($name, $type) = parseparam($p);
-		if($type =~ /^\*/) {
-			push @args, "uintptr(unsafe.Pointer($name))";
-		} elsif($type eq "string" && $errvar ne "") {
-			$text .= "\tvar _p$n $strconvtype\n";
-			$text .= "\t_p$n, $errvar = $strconvfunc($name)\n";
-			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			push @uses, "use(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type eq "string") {
-			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
-			$text .= "\tvar _p$n $strconvtype\n";
-			$text .= "\t_p$n, _ = $strconvfunc($name)\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			push @uses, "use(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type =~ /^\[\](.*)/) {
-			# Convert slice into pointer, length.
-			# Have to be careful not to take address of &a[0] if len == 0:
-			# pass nil in that case.
-			$text .= "\tvar _p$n *$1\n";
-			$text .= "\tif len($name) > 0 {\n\t\t_p$n = \&$name\[0]\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))", "uintptr(len($name))";
-			$n++;
-		} elsif($type eq "int64" && $_32bit ne "") {
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name >> 32)", "uintptr($name)";
-			} else {
-				push @args, "uintptr($name)", "uintptr($name >> 32)";
-			}
-		} elsif($type eq "bool") {
- 			$text .= "\tvar _p$n uint32\n";
-			$text .= "\tif $name {\n\t\t_p$n = 1\n\t} else {\n\t\t_p$n = 0\n\t}\n";
-			push @args, "uintptr(_p$n)";
-			$n++;
-		} else {
-			push @args, "uintptr($name)";
-		}
-	}
-	my $nargs = @args;
-
-	# Determine which form to use; pad args with zeros.
-	my $asm = "sysvicall6";
-	if ($nonblock) {
-		$asm = "rawSysvicall6";
-	}
-	if(@args <= 6) {
-		while(@args < 6) {
-			push @args, "0";
-		}
-	} else {
-		print STDERR "$ARGV:$.: too many arguments to system call\n";
-	}
-
-	# Actual call.
-	my $args = join(', ', @args);
-	my $call = "$asm(uintptr(unsafe.Pointer(&$sysvarname)), $nargs, $args)";
-
-	# Assign return values.
-	my $body = "";
-	my $failexpr = "";
-	my @ret = ("_", "_", "_");
-	my @pout= ();
-	my $do_errno = 0;
-	for(my $i=0; $i<@out; $i++) {
-		my $p = $out[$i];
-		my ($name, $type) = parseparam($p);
-		my $reg = "";
-		if($name eq "err") {
-			$reg = "e1";
-			$ret[2] = $reg;
-			$do_errno = 1;
-		} else {
-			$reg = sprintf("r%d", $i);
-			$ret[$i] = $reg;
-		}
-		if($type eq "bool") {
-			$reg = "$reg != 0";
-		}
-		if($type eq "int64" && $_32bit ne "") {
-			# 64-bit number in r1:r0 or r0:r1.
-			if($i+2 > @out) {
-				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
-			}
-			if($_32bit eq "big-endian") {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
-			} else {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
-			}
-			$ret[$i] = sprintf("r%d", $i);
-			$ret[$i+1] = sprintf("r%d", $i+1);
-		}
-		if($reg ne "e1") {
-			$body .= "\t$name = $type($reg)\n";
-		}
-	}
-	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
-		$text .= "\t$call\n";
-	} else {
-		$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
-	}
-	foreach my $use (@uses) {
-		$text .= "\t$use\n";
-	}
-	$text .= $body;
-
-	if ($do_errno) {
-		$text .= "\tif e1 != 0 {\n";
-		$text .= "\t\terr = e1\n";
-		$text .= "\t}\n";
-	}
-	$text .= "\treturn\n";
-	$text .= "}\n";
-}
-
-if($errors) {
-	exit 1;
-}
-
-print <<EOF;
-// $cmdline
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package $package
-
-import (
-	"syscall"
-	"unsafe"
-)
-EOF
-
-print "import \"golang.org/x/sys/unix\"\n" if $package ne "unix";
-
-my $vardecls = "\t" . join(",\n\t", @vars);
-$vardecls .= " syscallFunc";
-
-chomp($_=<<EOF);
-
-$dynimports
-$linknames
-var (
-$vardecls
-)
-
-$text
-EOF
-print $_;
-exit 0;
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl
deleted file mode 100755
index be67afa417..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysctl_openbsd.pl
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/usr/bin/env perl
-
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-#
-# Parse the header files for OpenBSD and generate a Go usable sysctl MIB.
-#
-# Build a MIB with each entry being an array containing the level, type and
-# a hash that will contain additional entries if the current entry is a node.
-# We then walk this MIB and create a flattened sysctl name to OID hash.
-#
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $debug = 0;
-my %ctls = ();
-
-my @headers = qw (
-	sys/sysctl.h
-	sys/socket.h
-	sys/tty.h
-	sys/malloc.h
-	sys/mount.h
-	sys/namei.h
-	sys/sem.h
-	sys/shm.h
-	sys/vmmeter.h
-	uvm/uvm_param.h
-	uvm/uvm_swap_encrypt.h
-	ddb/db_var.h
-	net/if.h
-	net/if_pfsync.h
-	net/pipex.h
-	netinet/in.h
-	netinet/icmp_var.h
-	netinet/igmp_var.h
-	netinet/ip_ah.h
-	netinet/ip_carp.h
-	netinet/ip_divert.h
-	netinet/ip_esp.h
-	netinet/ip_ether.h
-	netinet/ip_gre.h
-	netinet/ip_ipcomp.h
-	netinet/ip_ipip.h
-	netinet/pim_var.h
-	netinet/tcp_var.h
-	netinet/udp_var.h
-	netinet6/in6.h
-	netinet6/ip6_divert.h
-	netinet6/pim6_var.h
-	netinet/icmp6.h
-	netmpls/mpls.h
-);
-
-my @ctls = qw (
-	kern
-	vm
-	fs
-	net
-	#debug				# Special handling required
-	hw
-	#machdep			# Arch specific
-	user
-	ddb
-	#vfs				# Special handling required
-	fs.posix
-	kern.forkstat
-	kern.intrcnt
-	kern.malloc
-	kern.nchstats
-	kern.seminfo
-	kern.shminfo
-	kern.timecounter
-	kern.tty
-	kern.watchdog
-	net.bpf
-	net.ifq
-	net.inet
-	net.inet.ah
-	net.inet.carp
-	net.inet.divert
-	net.inet.esp
-	net.inet.etherip
-	net.inet.gre
-	net.inet.icmp
-	net.inet.igmp
-	net.inet.ip
-	net.inet.ip.ifq
-	net.inet.ipcomp
-	net.inet.ipip
-	net.inet.mobileip
-	net.inet.pfsync
-	net.inet.pim
-	net.inet.tcp
-	net.inet.udp
-	net.inet6
-	net.inet6.divert
-	net.inet6.ip6
-	net.inet6.icmp6
-	net.inet6.pim6
-	net.inet6.tcp6
-	net.inet6.udp6
-	net.mpls
-	net.mpls.ifq
-	net.key
-	net.pflow
-	net.pfsync
-	net.pipex
-	net.rt
-	vm.swapencrypt
-	#vfsgenctl			# Special handling required
-);
-
-# Node name "fixups"
-my %ctl_map = (
-	"ipproto" => "net.inet",
-	"net.inet.ipproto" => "net.inet",
-	"net.inet6.ipv6proto" => "net.inet6",
-	"net.inet6.ipv6" => "net.inet6.ip6",
-	"net.inet.icmpv6" => "net.inet6.icmp6",
-	"net.inet6.divert6" => "net.inet6.divert",
-	"net.inet6.tcp6" => "net.inet.tcp",
-	"net.inet6.udp6" => "net.inet.udp",
-	"mpls" => "net.mpls",
-	"swpenc" => "vm.swapencrypt"
-);
-
-# Node mappings
-my %node_map = (
-	"net.inet.ip.ifq" => "net.ifq",
-	"net.inet.pfsync" => "net.pfsync",
-	"net.mpls.ifq" => "net.ifq"
-);
-
-my $ctlname;
-my %mib = ();
-my %sysctl = ();
-my $node;
-
-sub debug() {
-	print STDERR "$_[0]\n" if $debug;
-}
-
-# Walk the MIB and build a sysctl name to OID mapping.
-sub build_sysctl() {
-	my ($node, $name, $oid) = @_;
-	my %node = %{$node};
-	my @oid = @{$oid};
-
-	foreach my $key (sort keys %node) {
-		my @node = @{$node{$key}};
-		my $nodename = $name.($name ne '' ? '.' : '').$key;
-		my @nodeoid = (@oid, $node[0]);
-		if ($node[1] eq 'CTLTYPE_NODE') {
-			if (exists $node_map{$nodename}) {
-				$node = \%mib;
-				$ctlname = $node_map{$nodename};
-				foreach my $part (split /\./, $ctlname) {
-					$node = \%{@{$$node{$part}}[2]};
-				}
-			} else {
-				$node = $node[2];
-			}
-			&build_sysctl($node, $nodename, \@nodeoid);
-		} elsif ($node[1] ne '') {
-			$sysctl{$nodename} = \@nodeoid;
-		}
-	}
-}
-
-foreach my $ctl (@ctls) {
-	$ctls{$ctl} = $ctl;
-}
-
-# Build MIB
-foreach my $header (@headers) {
-	&debug("Processing $header...");
-	open HEADER, "/usr/include/$header" ||
-	    print STDERR "Failed to open $header\n";
-	while (<HEADER>) {
-		if ($_ =~ /^#define\s+(CTL_NAMES)\s+{/ ||
-		    $_ =~ /^#define\s+(CTL_(.*)_NAMES)\s+{/ ||
-		    $_ =~ /^#define\s+((.*)CTL_NAMES)\s+{/) {
-			if ($1 eq 'CTL_NAMES') {
-				# Top level.
-				$node = \%mib;
-			} else {
-				# Node.
-				my $nodename = lc($2);
-				if ($header =~ /^netinet\//) {
-					$ctlname = "net.inet.$nodename";
-				} elsif ($header =~ /^netinet6\//) {
-					$ctlname = "net.inet6.$nodename";
-				} elsif ($header =~ /^net\//) {
-					$ctlname = "net.$nodename";
-				} else {
-					$ctlname = "$nodename";
-					$ctlname =~ s/^(fs|net|kern)_/$1\./;
-				}
-				if (exists $ctl_map{$ctlname}) {
-					$ctlname = $ctl_map{$ctlname};
-				}
-				if (not exists $ctls{$ctlname}) {
-					&debug("Ignoring $ctlname...");
-					next;
-				}
-
-				# Walk down from the top of the MIB.
-				$node = \%mib;
-				foreach my $part (split /\./, $ctlname) {
-					if (not exists $$node{$part}) {
-						&debug("Missing node $part");
-						$$node{$part} = [ 0, '', {} ];
-					}
-					$node = \%{@{$$node{$part}}[2]};
-				}
-			}
-
-			# Populate current node with entries.
-			my $i = -1;
-			while (defined($_) && $_ !~ /^}/) {
-				$_ = <HEADER>;
-				$i++ if $_ =~ /{.*}/;
-				next if $_ !~ /{\s+"(\w+)",\s+(CTLTYPE_[A-Z]+)\s+}/;
-				$$node{$1} = [ $i, $2, {} ];
-			}
-		}
-	}
-	close HEADER;
-}
-
-&build_sysctl(\%mib, "", []);
-
-print <<EOF;
-// mksysctl_openbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix;
-
-type mibentry struct {
-	ctlname string
-	ctloid []_C_int
-}
-
-var sysctlMib = []mibentry {
-EOF
-
-foreach my $name (sort keys %sysctl) {
-	my @oid = @{$sysctl{$name}};
-	print "\t{ \"$name\", []_C_int{ ", join(', ', @oid), " } }, \n";
-}
-
-print <<EOF;
-}
-EOF
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl
deleted file mode 100755
index d3e5147fcb..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_darwin.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for Darwin from sys/syscall.h
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_darwin.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^#define\s+SYS_(\w+)\s+([0-9]+)/){
-		my $name = $1;
-		my $num = $2;
-		$name =~ y/a-z/A-Z/;
-		print "	SYS_$name = $num;"
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl
deleted file mode 100755
index 266a248c75..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_dragonfly.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for DragonFly from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_dragonfly.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^([0-9]+)\s+STD\s+({ \S+\s+(\w+).*)$/){
-		my $num = $1;
-		my $proto = $2;
-		my $name = "SYS_$3";
-		$name =~ y/a-z/A-Z/;
-
-		# There are multiple entries for enosys and nosys, so comment them out.
-		if($name =~ /^SYS_E?NOSYS$/){
-			$name = "// $name";
-		}
-		if($name eq 'SYS_SYS_EXIT'){
-			$name = 'SYS_EXIT';
-		}
-
-		print "	$name = $num;  // $proto\n";
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl
deleted file mode 100755
index b767e124cc..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_freebsd.pl
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for FreeBSD from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_freebsd.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^([0-9]+)\s+\S+\s+STD\s+({ \S+\s+(\w+).*)$/){
-		my $num = $1;
-		my $proto = $2;
-		my $name = "SYS_$3";
-		$name =~ y/a-z/A-Z/;
-
-		# There are multiple entries for enosys and nosys, so comment them out.
-		if($name =~ /^SYS_E?NOSYS$/){
-			$name = "// $name";
-		}
-		if($name eq 'SYS_SYS_EXIT'){
-			$name = 'SYS_EXIT';
-		}
-		if($name =~ /^SYS_CAP_+/ || $name =~ /^SYS___CAP_+/){
-			next
-		}
-
-		print "	$name = $num;  // $proto\n";
-
-		# We keep Capsicum syscall numbers for FreeBSD
-		# 9-STABLE here because we are not sure whether they
-		# are mature and stable.
-		if($num == 513){
-			print " SYS_CAP_NEW = 514 // { int cap_new(int fd, uint64_t rights); }\n";
-			print " SYS_CAP_GETRIGHTS = 515 // { int cap_getrights(int fd, \\\n";
-			print " SYS_CAP_ENTER = 516 // { int cap_enter(void); }\n";
-			print " SYS_CAP_GETMODE = 517 // { int cap_getmode(u_int *modep); }\n";
-		}
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl
deleted file mode 100755
index 4d4017deb2..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_linux.pl
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_linux.pl ". join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const(
-EOF
-
-sub fmt {
-	my ($name, $num) = @_;
-	if($num > 999){
-		# ignore deprecated syscalls that are no longer implemented
-		# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h?id=refs/heads/master#n716
-		return;
-	}
-	$name =~ y/a-z/A-Z/;
-	print "	SYS_$name = $num;\n";
-}
-
-my $prev;
-open(GCC, "gcc -E -dD $ARGV[0] |") || die "can't run gcc";
-while(<GCC>){
-	if(/^#define __NR_syscalls\s+/) {
-		# ignore redefinitions of __NR_syscalls
-	}
-	elsif(/^#define __NR_(\w+)\s+([0-9]+)/){
-		$prev = $2;
-		fmt($1, $2);
-	}
-	elsif(/^#define __NR3264_(\w+)\s+([0-9]+)/){
-		$prev = $2;
-		fmt($1, $2);
-	}
-	elsif(/^#define __NR_(\w+)\s+\(\w+\+\s*([0-9]+)\)/){
-		fmt($1, $prev+$2)
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl
deleted file mode 100755
index e74616a65a..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_netbsd.pl
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for OpenBSD from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_netbsd.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-my $line = '';
-while(<>){
-	if($line =~ /^(.*)\\$/) {
-		# Handle continuation
-		$line = $1;
-		$_ =~ s/^\s+//;
-		$line .= $_;
-	} else {
-		# New line
-		$line = $_;
-	}
-	next if $line =~ /\\$/;
-	if($line =~ /^([0-9]+)\s+((STD)|(NOERR))\s+(RUMP\s+)?({\s+\S+\s*\*?\s*\|(\S+)\|(\S*)\|(\w+).*\s+})(\s+(\S+))?$/) {
-		my $num = $1;
-		my $proto = $6;
-		my $compat = $8;
-		my $name = "$7_$9";
-
-		$name = "$7_$11" if $11 ne '';
-		$name =~ y/a-z/A-Z/;
-
-		if($compat eq '' || $compat eq '30' || $compat eq '50') {
-			print "	$name = $num;  // $proto\n";
-		}
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl b/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl
deleted file mode 100755
index ae5aad5866..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mksysnum_openbsd.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for OpenBSD from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_openbsd.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^([0-9]+)\s+STD\s+(NOLOCK\s+)?({ \S+\s+\*?(\w+).*)$/){
-		my $num = $1;
-		my $proto = $3;
-		my $name = $4;
-		$name =~ y/a-z/A-Z/;
-
-		# There are multiple entries for enosys and nosys, so comment them out.
-		if($name =~ /^SYS_E?NOSYS$/){
-			$name = "// $name";
-		}
-		if($name eq 'SYS_SYS_EXIT'){
-			$name = 'SYS_EXIT';
-		}
-
-		print "	$name = $num;  // $proto\n";
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/race.go b/Godeps/_workspace/src/golang.org/x/sys/unix/race.go
deleted file mode 100644
index 3c7627eb5c..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/race.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin,race linux,race freebsd,race
-
-package unix
-
-import (
-	"runtime"
-	"unsafe"
-)
-
-const raceenabled = true
-
-func raceAcquire(addr unsafe.Pointer) {
-	runtime.RaceAcquire(addr)
-}
-
-func raceReleaseMerge(addr unsafe.Pointer) {
-	runtime.RaceReleaseMerge(addr)
-}
-
-func raceReadRange(addr unsafe.Pointer, len int) {
-	runtime.RaceReadRange(addr, len)
-}
-
-func raceWriteRange(addr unsafe.Pointer, len int) {
-	runtime.RaceWriteRange(addr, len)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/race0.go b/Godeps/_workspace/src/golang.org/x/sys/unix/race0.go
deleted file mode 100644
index f8678e0d21..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/race0.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin,!race linux,!race freebsd,!race netbsd openbsd solaris dragonfly
-
-package unix
-
-import (
-	"unsafe"
-)
-
-const raceenabled = false
-
-func raceAcquire(addr unsafe.Pointer) {
-}
-
-func raceReleaseMerge(addr unsafe.Pointer) {
-}
-
-func raceReadRange(addr unsafe.Pointer, len int) {
-}
-
-func raceWriteRange(addr unsafe.Pointer, len int) {
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_linux.go b/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_linux.go
deleted file mode 100644
index d9ff4731a2..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_linux.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Socket control messages
-
-package unix
-
-import "unsafe"
-
-// UnixCredentials encodes credentials into a socket control message
-// for sending to another process. This can be used for
-// authentication.
-func UnixCredentials(ucred *Ucred) []byte {
-	b := make([]byte, CmsgSpace(SizeofUcred))
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = SOL_SOCKET
-	h.Type = SCM_CREDENTIALS
-	h.SetLen(CmsgLen(SizeofUcred))
-	*((*Ucred)(cmsgData(h))) = *ucred
-	return b
-}
-
-// ParseUnixCredentials decodes a socket control message that contains
-// credentials in a Ucred structure. To receive such a message, the
-// SO_PASSCRED option must be enabled on the socket.
-func ParseUnixCredentials(m *SocketControlMessage) (*Ucred, error) {
-	if m.Header.Level != SOL_SOCKET {
-		return nil, EINVAL
-	}
-	if m.Header.Type != SCM_CREDENTIALS {
-		return nil, EINVAL
-	}
-	ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
-	return &ucred, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go b/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go
deleted file mode 100644
index f1493a3e6f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/sockcmsg_unix.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-// Socket control messages
-
-package unix
-
-import "unsafe"
-
-// Round the length of a raw sockaddr up to align it properly.
-func cmsgAlignOf(salen int) int {
-	salign := sizeofPtr
-	// NOTE: It seems like 64-bit Darwin and DragonFly BSD kernels
-	// still require 32-bit aligned access to network subsystem.
-	if darwin64Bit || dragonfly64Bit {
-		salign = 4
-	}
-	return (salen + salign - 1) & ^(salign - 1)
-}
-
-// CmsgLen returns the value to store in the Len field of the Cmsghdr
-// structure, taking into account any necessary alignment.
-func CmsgLen(datalen int) int {
-	return cmsgAlignOf(SizeofCmsghdr) + datalen
-}
-
-// CmsgSpace returns the number of bytes an ancillary element with
-// payload of the passed data length occupies.
-func CmsgSpace(datalen int) int {
-	return cmsgAlignOf(SizeofCmsghdr) + cmsgAlignOf(datalen)
-}
-
-func cmsgData(h *Cmsghdr) unsafe.Pointer {
-	return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(SizeofCmsghdr)))
-}
-
-// SocketControlMessage represents a socket control message.
-type SocketControlMessage struct {
-	Header Cmsghdr
-	Data   []byte
-}
-
-// ParseSocketControlMessage parses b as an array of socket control
-// messages.
-func ParseSocketControlMessage(b []byte) ([]SocketControlMessage, error) {
-	var msgs []SocketControlMessage
-	i := 0
-	for i+CmsgLen(0) <= len(b) {
-		h, dbuf, err := socketControlMessageHeaderAndData(b[i:])
-		if err != nil {
-			return nil, err
-		}
-		m := SocketControlMessage{Header: *h, Data: dbuf}
-		msgs = append(msgs, m)
-		i += cmsgAlignOf(int(h.Len))
-	}
-	return msgs, nil
-}
-
-func socketControlMessageHeaderAndData(b []byte) (*Cmsghdr, []byte, error) {
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	if h.Len < SizeofCmsghdr || uint64(h.Len) > uint64(len(b)) {
-		return nil, nil, EINVAL
-	}
-	return h, b[cmsgAlignOf(SizeofCmsghdr):h.Len], nil
-}
-
-// UnixRights encodes a set of open file descriptors into a socket
-// control message for sending to another process.
-func UnixRights(fds ...int) []byte {
-	datalen := len(fds) * 4
-	b := make([]byte, CmsgSpace(datalen))
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = SOL_SOCKET
-	h.Type = SCM_RIGHTS
-	h.SetLen(CmsgLen(datalen))
-	data := cmsgData(h)
-	for _, fd := range fds {
-		*(*int32)(data) = int32(fd)
-		data = unsafe.Pointer(uintptr(data) + 4)
-	}
-	return b
-}
-
-// ParseUnixRights decodes a socket control message that contains an
-// integer array of open file descriptors from another process.
-func ParseUnixRights(m *SocketControlMessage) ([]int, error) {
-	if m.Header.Level != SOL_SOCKET {
-		return nil, EINVAL
-	}
-	if m.Header.Type != SCM_RIGHTS {
-		return nil, EINVAL
-	}
-	fds := make([]int, len(m.Data)>>2)
-	for i, j := 0, 0; i < len(m.Data); i += 4 {
-		fds[j] = int(*(*int32)(unsafe.Pointer(&m.Data[i])))
-		j++
-	}
-	return fds, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/str.go b/Godeps/_workspace/src/golang.org/x/sys/unix/str.go
deleted file mode 100644
index 35ed664353..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/str.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix
-
-func itoa(val int) string { // do it here rather than with fmt to avoid dependency
-	if val < 0 {
-		return "-" + uitoa(uint(-val))
-	}
-	return uitoa(uint(val))
-}
-
-func uitoa(val uint) string {
-	var buf [32]byte // big enough for int64
-	i := len(buf) - 1
-	for val >= 10 {
-		buf[i] = byte(val%10 + '0')
-		i--
-		val /= 10
-	}
-	buf[i] = byte(val + '0')
-	return string(buf[i:])
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go
deleted file mode 100644
index 571e6993c3..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-// Package unix contains an interface to the low-level operating system
-// primitives.  OS details vary depending on the underlying system, and
-// by default, godoc will display OS-specific documentation for the current
-// system.  If you want godoc to display OS documentation for another
-// system, set $GOOS and $GOARCH to the desired system.  For example, if
-// you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
-// to freebsd and $GOARCH to arm.
-// The primary use of this package is inside other packages that provide a more
-// portable interface to the system, such as "os", "time" and "net".  Use
-// those packages rather than this one if you can.
-// For details of the functions and data types in this package consult
-// the manuals for the appropriate operating system.
-// These calls return err == nil to indicate success; otherwise
-// err represents an operating system error describing the failure and
-// holds a value of type syscall.Errno.
-package unix
-
-import "unsafe"
-
-// ByteSliceFromString returns a NUL-terminated slice of bytes
-// containing the text of s. If s contains a NUL byte at any
-// location, it returns (nil, EINVAL).
-func ByteSliceFromString(s string) ([]byte, error) {
-	for i := 0; i < len(s); i++ {
-		if s[i] == 0 {
-			return nil, EINVAL
-		}
-	}
-	a := make([]byte, len(s)+1)
-	copy(a, s)
-	return a, nil
-}
-
-// BytePtrFromString returns a pointer to a NUL-terminated array of
-// bytes containing the text of s. If s contains a NUL byte at any
-// location, it returns (nil, EINVAL).
-func BytePtrFromString(s string) (*byte, error) {
-	a, err := ByteSliceFromString(s)
-	if err != nil {
-		return nil, err
-	}
-	return &a[0], nil
-}
-
-// Single-word zero for use when we need a valid pointer to 0 bytes.
-// See mkunix.pl.
-var _zero uintptr
-
-func (ts *Timespec) Unix() (sec int64, nsec int64) {
-	return int64(ts.Sec), int64(ts.Nsec)
-}
-
-func (tv *Timeval) Unix() (sec int64, nsec int64) {
-	return int64(tv.Sec), int64(tv.Usec) * 1000
-}
-
-func (ts *Timespec) Nano() int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
-}
-
-func (tv *Timeval) Nano() int64 {
-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
-}
-
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
-// use is a no-op, but the compiler cannot see that it is.
-// Calling use(p) ensures that p is kept live until that point.
-//go:noescape
-func use(p unsafe.Pointer)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go
deleted file mode 100644
index e9671764cc..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd.go
+++ /dev/null
@@ -1,628 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-// BSD system call wrappers shared by *BSD based systems
-// including OS X (Darwin) and FreeBSD.  Like the other
-// syscall_*.go files it is compiled as Go code but also
-// used as input to mksyscall which parses the //sys
-// lines and generates system call stubs.
-
-package unix
-
-import (
-	"runtime"
-	"syscall"
-	"unsafe"
-)
-
-/*
- * Wrapped
- */
-
-//sysnb	getgroups(ngid int, gid *_Gid_t) (n int, err error)
-//sysnb	setgroups(ngid int, gid *_Gid_t) (err error)
-
-func Getgroups() (gids []int, err error) {
-	n, err := getgroups(0, nil)
-	if err != nil {
-		return nil, err
-	}
-	if n == 0 {
-		return nil, nil
-	}
-
-	// Sanity check group count.  Max is 16 on BSD.
-	if n < 0 || n > 1000 {
-		return nil, EINVAL
-	}
-
-	a := make([]_Gid_t, n)
-	n, err = getgroups(n, &a[0])
-	if err != nil {
-		return nil, err
-	}
-	gids = make([]int, n)
-	for i, v := range a[0:n] {
-		gids[i] = int(v)
-	}
-	return
-}
-
-func Setgroups(gids []int) (err error) {
-	if len(gids) == 0 {
-		return setgroups(0, nil)
-	}
-
-	a := make([]_Gid_t, len(gids))
-	for i, v := range gids {
-		a[i] = _Gid_t(v)
-	}
-	return setgroups(len(a), &a[0])
-}
-
-func ReadDirent(fd int, buf []byte) (n int, err error) {
-	// Final argument is (basep *uintptr) and the syscall doesn't take nil.
-	// 64 bits should be enough. (32 bits isn't even on 386). Since the
-	// actual system call is getdirentries64, 64 is a good guess.
-	// TODO(rsc): Can we use a single global basep for all calls?
-	var base = (*uintptr)(unsafe.Pointer(new(uint64)))
-	return Getdirentries(fd, buf, base)
-}
-
-// Wait status is 7 bits at bottom, either 0 (exited),
-// 0x7F (stopped), or a signal number that caused an exit.
-// The 0x80 bit is whether there was a core dump.
-// An extra number (exit code, signal causing a stop)
-// is in the high bits.
-
-type WaitStatus uint32
-
-const (
-	mask  = 0x7F
-	core  = 0x80
-	shift = 8
-
-	exited  = 0
-	stopped = 0x7F
-)
-
-func (w WaitStatus) Exited() bool { return w&mask == exited }
-
-func (w WaitStatus) ExitStatus() int {
-	if w&mask != exited {
-		return -1
-	}
-	return int(w >> shift)
-}
-
-func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
-
-func (w WaitStatus) Signal() syscall.Signal {
-	sig := syscall.Signal(w & mask)
-	if sig == stopped || sig == 0 {
-		return -1
-	}
-	return sig
-}
-
-func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
-
-func (w WaitStatus) Stopped() bool { return w&mask == stopped && syscall.Signal(w>>shift) != SIGSTOP }
-
-func (w WaitStatus) Continued() bool { return w&mask == stopped && syscall.Signal(w>>shift) == SIGSTOP }
-
-func (w WaitStatus) StopSignal() syscall.Signal {
-	if !w.Stopped() {
-		return -1
-	}
-	return syscall.Signal(w>>shift) & 0xFF
-}
-
-func (w WaitStatus) TrapCause() int { return -1 }
-
-//sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error)
-
-func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
-	var status _C_int
-	wpid, err = wait4(pid, &status, options, rusage)
-	if wstatus != nil {
-		*wstatus = WaitStatus(status)
-	}
-	return
-}
-
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	Shutdown(s int, how int) (err error)
-
-func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Len = SizeofSockaddrInet4
-	sa.raw.Family = AF_INET
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
-}
-
-func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Len = SizeofSockaddrInet6
-	sa.raw.Family = AF_INET6
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	sa.raw.Scope_id = sa.ZoneId
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
-}
-
-func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	name := sa.Name
-	n := len(name)
-	if n >= len(sa.raw.Path) || n == 0 {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Len = byte(3 + n) // 2 for Family, Len; 1 for NUL
-	sa.raw.Family = AF_UNIX
-	for i := 0; i < n; i++ {
-		sa.raw.Path[i] = int8(name[i])
-	}
-	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
-}
-
-func (sa *SockaddrDatalink) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Index == 0 {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Len = sa.Len
-	sa.raw.Family = AF_LINK
-	sa.raw.Index = sa.Index
-	sa.raw.Type = sa.Type
-	sa.raw.Nlen = sa.Nlen
-	sa.raw.Alen = sa.Alen
-	sa.raw.Slen = sa.Slen
-	for i := 0; i < len(sa.raw.Data); i++ {
-		sa.raw.Data[i] = sa.Data[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrDatalink, nil
-}
-
-func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
-	switch rsa.Addr.Family {
-	case AF_LINK:
-		pp := (*RawSockaddrDatalink)(unsafe.Pointer(rsa))
-		sa := new(SockaddrDatalink)
-		sa.Len = pp.Len
-		sa.Family = pp.Family
-		sa.Index = pp.Index
-		sa.Type = pp.Type
-		sa.Nlen = pp.Nlen
-		sa.Alen = pp.Alen
-		sa.Slen = pp.Slen
-		for i := 0; i < len(sa.Data); i++ {
-			sa.Data[i] = pp.Data[i]
-		}
-		return sa, nil
-
-	case AF_UNIX:
-		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
-		if pp.Len < 2 || pp.Len > SizeofSockaddrUnix {
-			return nil, EINVAL
-		}
-		sa := new(SockaddrUnix)
-
-		// Some BSDs include the trailing NUL in the length, whereas
-		// others do not. Work around this by subtracting the leading
-		// family and len. The path is then scanned to see if a NUL
-		// terminator still exists within the length.
-		n := int(pp.Len) - 2 // subtract leading Family, Len
-		for i := 0; i < n; i++ {
-			if pp.Path[i] == 0 {
-				// found early NUL; assume Len included the NUL
-				// or was overestimating.
-				n = i
-				break
-			}
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
-		return sa, nil
-
-	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet4)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet6)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.ZoneId = pp.Scope_id
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-	}
-	return nil, EAFNOSUPPORT
-}
-
-func Accept(fd int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept(fd, &rsa, &len)
-	if err != nil {
-		return
-	}
-	if runtime.GOOS == "darwin" && len == 0 {
-		// Accepted socket has no address.
-		// This is likely due to a bug in xnu kernels,
-		// where instead of ECONNABORTED error socket
-		// is accepted, but has no address.
-		Close(nfd)
-		return 0, nil, ECONNABORTED
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-func Getsockname(fd int) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if err = getsockname(fd, &rsa, &len); err != nil {
-		return
-	}
-	// TODO(jsing): DragonFly has a "bug" (see issue 3349), which should be
-	// reported upstream.
-	if runtime.GOOS == "dragonfly" && rsa.Addr.Family == AF_UNSPEC && rsa.Addr.Len == 0 {
-		rsa.Addr.Family = AF_UNIX
-		rsa.Addr.Len = SizeofSockaddrUnix
-	}
-	return anyToSockaddr(&rsa)
-}
-
-//sysnb socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-
-func GetsockoptByte(fd, level, opt int) (value byte, err error) {
-	var n byte
-	vallen := _Socklen(1)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
-	return n, err
-}
-
-func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
-	vallen := _Socklen(4)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
-	return value, err
-}
-
-func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
-	var value IPMreq
-	vallen := _Socklen(SizeofIPMreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
-	var value IPv6Mreq
-	vallen := _Socklen(SizeofIPv6Mreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
-	var value IPv6MTUInfo
-	vallen := _Socklen(SizeofIPv6MTUInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
-	var value ICMPv6Filter
-	vallen := _Socklen(SizeofICMPv6Filter)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-//sys   recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys   sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-
-func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
-	var msg Msghdr
-	var rsa RawSockaddrAny
-	msg.Name = (*byte)(unsafe.Pointer(&rsa))
-	msg.Namelen = uint32(SizeofSockaddrAny)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy byte
-	if len(oob) > 0 {
-		// receive at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = recvmsg(fd, &msg, flags); err != nil {
-		return
-	}
-	oobn = int(msg.Controllen)
-	recvflags = int(msg.Flags)
-	// source address is only specified if the socket is unconnected
-	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
-	}
-	return
-}
-
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-	_, err = SendmsgN(fd, p, oob, to, flags)
-	return
-}
-
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-	var ptr unsafe.Pointer
-	var salen _Socklen
-	if to != nil {
-		ptr, salen, err = to.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-	}
-	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(ptr))
-	msg.Namelen = uint32(salen)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy byte
-	if len(oob) > 0 {
-		// send at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = sendmsg(fd, &msg, flags); err != nil {
-		return 0, err
-	}
-	if len(oob) > 0 && len(p) == 0 {
-		n = 0
-	}
-	return n, nil
-}
-
-//sys	kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error)
-
-func Kevent(kq int, changes, events []Kevent_t, timeout *Timespec) (n int, err error) {
-	var change, event unsafe.Pointer
-	if len(changes) > 0 {
-		change = unsafe.Pointer(&changes[0])
-	}
-	if len(events) > 0 {
-		event = unsafe.Pointer(&events[0])
-	}
-	return kevent(kq, change, len(changes), event, len(events), timeout)
-}
-
-//sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
-
-// sysctlmib translates name to mib number and appends any additional args.
-func sysctlmib(name string, args ...int) ([]_C_int, error) {
-	// Translate name to mib number.
-	mib, err := nametomib(name)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, a := range args {
-		mib = append(mib, _C_int(a))
-	}
-
-	return mib, nil
-}
-
-func Sysctl(name string) (string, error) {
-	return SysctlArgs(name)
-}
-
-func SysctlArgs(name string, args ...int) (string, error) {
-	mib, err := sysctlmib(name, args...)
-	if err != nil {
-		return "", err
-	}
-
-	// Find size.
-	n := uintptr(0)
-	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
-		return "", err
-	}
-	if n == 0 {
-		return "", nil
-	}
-
-	// Read into buffer of that size.
-	buf := make([]byte, n)
-	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
-		return "", err
-	}
-
-	// Throw away terminating NUL.
-	if n > 0 && buf[n-1] == '\x00' {
-		n--
-	}
-	return string(buf[0:n]), nil
-}
-
-func SysctlUint32(name string) (uint32, error) {
-	return SysctlUint32Args(name)
-}
-
-func SysctlUint32Args(name string, args ...int) (uint32, error) {
-	mib, err := sysctlmib(name, args...)
-	if err != nil {
-		return 0, err
-	}
-
-	n := uintptr(4)
-	buf := make([]byte, 4)
-	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
-		return 0, err
-	}
-	if n != 4 {
-		return 0, EIO
-	}
-	return *(*uint32)(unsafe.Pointer(&buf[0])), nil
-}
-
-func SysctlUint64(name string, args ...int) (uint64, error) {
-	mib, err := sysctlmib(name, args...)
-	if err != nil {
-		return 0, err
-	}
-
-	n := uintptr(8)
-	buf := make([]byte, 8)
-	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
-		return 0, err
-	}
-	if n != 8 {
-		return 0, EIO
-	}
-	return *(*uint64)(unsafe.Pointer(&buf[0])), nil
-}
-
-func SysctlRaw(name string, args ...int) ([]byte, error) {
-	mib, err := sysctlmib(name, args...)
-	if err != nil {
-		return nil, err
-	}
-
-	// Find size.
-	n := uintptr(0)
-	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
-		return nil, err
-	}
-	if n == 0 {
-		return nil, nil
-	}
-
-	// Read into buffer of that size.
-	buf := make([]byte, n)
-	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
-		return nil, err
-	}
-
-	// The actual call may return less than the original reported required
-	// size so ensure we deal with that.
-	return buf[:n], nil
-}
-
-//sys	utimes(path string, timeval *[2]Timeval) (err error)
-
-func Utimes(path string, tv []Timeval) error {
-	if tv == nil {
-		return utimes(path, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-func UtimesNano(path string, ts []Timespec) error {
-	if ts == nil {
-		return utimes(path, nil)
-	}
-	// TODO: The BSDs can do utimensat with SYS_UTIMENSAT but it
-	// isn't supported by darwin so this uses utimes instead
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	// Not as efficient as it could be because Timespec and
-	// Timeval have different types in the different OSes
-	tv := [2]Timeval{
-		NsecToTimeval(TimespecToNsec(ts[0])),
-		NsecToTimeval(TimespecToNsec(ts[1])),
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-//sys	futimes(fd int, timeval *[2]Timeval) (err error)
-
-func Futimes(fd int, tv []Timeval) error {
-	if tv == nil {
-		return futimes(fd, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return futimes(fd, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
-
-// TODO: wrap
-//	Acct(name nil-string) (err error)
-//	Gethostuuid(uuid *byte, timeout *Timespec) (err error)
-//	Madvise(addr *byte, len int, behav int) (err error)
-//	Mprotect(addr *byte, len int, prot int) (err error)
-//	Msync(addr *byte, len int, flags int) (err error)
-//	Ptrace(req int, pid int, addr uintptr, data int) (ret uintptr, err error)
-
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin.go
deleted file mode 100644
index 0d1771c3fc..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin.go
+++ /dev/null
@@ -1,509 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Darwin system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import (
-	errorspkg "errors"
-	"syscall"
-	"unsafe"
-)
-
-const ImplementsGetwd = true
-
-func Getwd() (string, error) {
-	buf := make([]byte, 2048)
-	attrs, err := getAttrList(".", attrList{CommonAttr: attrCmnFullpath}, buf, 0)
-	if err == nil && len(attrs) == 1 && len(attrs[0]) >= 2 {
-		wd := string(attrs[0])
-		// Sanity check that it's an absolute path and ends
-		// in a null byte, which we then strip.
-		if wd[0] == '/' && wd[len(wd)-1] == 0 {
-			return wd[:len(wd)-1], nil
-		}
-	}
-	// If pkg/os/getwd.go gets ENOTSUP, it will fall back to the
-	// slow algorithm.
-	return "", ENOTSUP
-}
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-	raw    RawSockaddrDatalink
-}
-
-// Translate "kern.hostname" to []_C_int{0,1,2,3}.
-func nametomib(name string) (mib []_C_int, err error) {
-	const siz = unsafe.Sizeof(mib[0])
-
-	// NOTE(rsc): It seems strange to set the buffer to have
-	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
-	// as the size.  I don't know why the +2 is here, but the
-	// kernel uses +2 for its own implementation of this function.
-	// I am scared that if we don't include the +2 here, the kernel
-	// will silently write 2 words farther than we specify
-	// and we'll get memory corruption.
-	var buf [CTL_MAXNAME + 2]_C_int
-	n := uintptr(CTL_MAXNAME) * siz
-
-	p := (*byte)(unsafe.Pointer(&buf[0]))
-	bytes, err := ByteSliceFromString(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// Magic sysctl: "setting" 0.3 to a string name
-	// lets you read back the array of integers form.
-	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
-		return nil, err
-	}
-	return buf[0 : n/siz], nil
-}
-
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names.  It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Ino == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
-//sys   ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
-func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
-func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
-
-const (
-	attrBitMapCount = 5
-	attrCmnFullpath = 0x08000000
-)
-
-type attrList struct {
-	bitmapCount uint16
-	_           uint16
-	CommonAttr  uint32
-	VolAttr     uint32
-	DirAttr     uint32
-	FileAttr    uint32
-	Forkattr    uint32
-}
-
-func getAttrList(path string, attrList attrList, attrBuf []byte, options uint) (attrs [][]byte, err error) {
-	if len(attrBuf) < 4 {
-		return nil, errorspkg.New("attrBuf too small")
-	}
-	attrList.bitmapCount = attrBitMapCount
-
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return nil, err
-	}
-
-	_, _, e1 := Syscall6(
-		SYS_GETATTRLIST,
-		uintptr(unsafe.Pointer(_p0)),
-		uintptr(unsafe.Pointer(&attrList)),
-		uintptr(unsafe.Pointer(&attrBuf[0])),
-		uintptr(len(attrBuf)),
-		uintptr(options),
-		0,
-	)
-	if e1 != 0 {
-		return nil, e1
-	}
-	size := *(*uint32)(unsafe.Pointer(&attrBuf[0]))
-
-	// dat is the section of attrBuf that contains valid data,
-	// without the 4 byte length header. All attribute offsets
-	// are relative to dat.
-	dat := attrBuf
-	if int(size) < len(attrBuf) {
-		dat = dat[:size]
-	}
-	dat = dat[4:] // remove length prefix
-
-	for i := uint32(0); int(i) < len(dat); {
-		header := dat[i:]
-		if len(header) < 8 {
-			return attrs, errorspkg.New("truncated attribute header")
-		}
-		datOff := *(*int32)(unsafe.Pointer(&header[0]))
-		attrLen := *(*uint32)(unsafe.Pointer(&header[4]))
-		if datOff < 0 || uint32(datOff)+attrLen > uint32(len(dat)) {
-			return attrs, errorspkg.New("truncated results; attrBuf too small")
-		}
-		end := uint32(datOff) + attrLen
-		attrs = append(attrs, dat[datOff:end])
-		i = end
-		if r := i % 4; r != 0 {
-			i += (4 - r)
-		}
-	}
-	return
-}
-
-//sysnb pipe() (r int, w int, err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	p[0], p[1], err = pipe()
-	return
-}
-
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT64, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-/*
- * Wrapped
- */
-
-//sys	kill(pid int, signum int, posix int) (err error)
-
-func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(signum), 1) }
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exchangedata(path1 string, path2 string, options int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
-//sys	Fstatfs(fd int, stat *Statfs_t) (err error) = SYS_FSTATFS64
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) = SYS_GETDIRENTRIES64
-//sys	Getdtablesize() (size int)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Getuid() (uid int)
-//sysnb	Issetugid() (tainted bool)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sys	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Setlogin(name string) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sys	Setprivexec(flag int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
-//sys	Statfs(path string, stat *Statfs_t) (err error) = SYS_STATFS64
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Undelete(path string) (err error)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys   munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-
-/*
- * Unimplemented
- */
-// Profil
-// Sigaction
-// Sigprocmask
-// Getlogin
-// Sigpending
-// Sigaltstack
-// Ioctl
-// Reboot
-// Execve
-// Vfork
-// Sbrk
-// Sstk
-// Ovadvise
-// Mincore
-// Setitimer
-// Swapon
-// Select
-// Sigsuspend
-// Readv
-// Writev
-// Nfssvc
-// Getfh
-// Quotactl
-// Mount
-// Csops
-// Waitid
-// Add_profil
-// Kdebug_trace
-// Sigreturn
-// Mmap
-// Mlock
-// Munlock
-// Atsocket
-// Kqueue_from_portset_np
-// Kqueue_portset
-// Getattrlist
-// Setattrlist
-// Getdirentriesattr
-// Searchfs
-// Delete
-// Copyfile
-// Poll
-// Watchevent
-// Waitevent
-// Modwatch
-// Getxattr
-// Fgetxattr
-// Setxattr
-// Fsetxattr
-// Removexattr
-// Fremovexattr
-// Listxattr
-// Flistxattr
-// Fsctl
-// Initgroups
-// Posix_spawn
-// Nfsclnt
-// Fhopen
-// Minherit
-// Semsys
-// Msgsys
-// Shmsys
-// Semctl
-// Semget
-// Semop
-// Msgctl
-// Msgget
-// Msgsnd
-// Msgrcv
-// Shmat
-// Shmctl
-// Shmdt
-// Shmget
-// Shm_open
-// Shm_unlink
-// Sem_open
-// Sem_close
-// Sem_unlink
-// Sem_wait
-// Sem_trywait
-// Sem_post
-// Sem_getvalue
-// Sem_init
-// Sem_destroy
-// Open_extended
-// Umask_extended
-// Stat_extended
-// Lstat_extended
-// Fstat_extended
-// Chmod_extended
-// Fchmod_extended
-// Access_extended
-// Settid
-// Gettid
-// Setsgroups
-// Getsgroups
-// Setwgroups
-// Getwgroups
-// Mkfifo_extended
-// Mkdir_extended
-// Identitysvc
-// Shared_region_check_np
-// Shared_region_map_np
-// __pthread_mutex_destroy
-// __pthread_mutex_init
-// __pthread_mutex_lock
-// __pthread_mutex_trylock
-// __pthread_mutex_unlock
-// __pthread_cond_init
-// __pthread_cond_destroy
-// __pthread_cond_broadcast
-// __pthread_cond_signal
-// Setsid_with_pid
-// __pthread_cond_timedwait
-// Aio_fsync
-// Aio_return
-// Aio_suspend
-// Aio_cancel
-// Aio_error
-// Aio_read
-// Aio_write
-// Lio_listio
-// __pthread_cond_wait
-// Iopolicysys
-// Mlockall
-// Munlockall
-// __pthread_kill
-// __pthread_sigmask
-// __sigwait
-// __disable_threadsignal
-// __pthread_markcancel
-// __pthread_canceled
-// __semwait_signal
-// Proc_info
-// sendfile
-// Stat64_extended
-// Lstat64_extended
-// Fstat64_extended
-// __pthread_chdir
-// __pthread_fchdir
-// Audit
-// Auditon
-// Getauid
-// Setauid
-// Getaudit
-// Setaudit
-// Getaudit_addr
-// Setaudit_addr
-// Auditctl
-// Bsdthread_create
-// Bsdthread_terminate
-// Stack_snapshot
-// Bsdthread_register
-// Workq_open
-// Workq_ops
-// __mac_execve
-// __mac_syscall
-// __mac_get_file
-// __mac_set_file
-// __mac_get_link
-// __mac_set_link
-// __mac_get_proc
-// __mac_set_proc
-// __mac_get_fd
-// __mac_set_fd
-// __mac_get_pid
-// __mac_get_lcid
-// __mac_get_lctx
-// __mac_set_lctx
-// Setlcid
-// Read_nocancel
-// Write_nocancel
-// Open_nocancel
-// Close_nocancel
-// Wait4_nocancel
-// Recvmsg_nocancel
-// Sendmsg_nocancel
-// Recvfrom_nocancel
-// Accept_nocancel
-// Msync_nocancel
-// Fcntl_nocancel
-// Select_nocancel
-// Fsync_nocancel
-// Connect_nocancel
-// Sigsuspend_nocancel
-// Readv_nocancel
-// Writev_nocancel
-// Sendto_nocancel
-// Pread_nocancel
-// Pwrite_nocancel
-// Waitid_nocancel
-// Poll_nocancel
-// Msgsnd_nocancel
-// Msgrcv_nocancel
-// Sem_wait_nocancel
-// Aio_suspend_nocancel
-// __sigwait_nocancel
-// __semwait_signal_nocancel
-// __mac_mount
-// __mac_get_mount
-// __mac_getfsstat
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go
deleted file mode 100644
index c172a3da5a..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_386.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
-}
-
-//sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
-func Gettimeofday(tv *Timeval) (err error) {
-	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
-	// in the two registers.
-	sec, usec, err := gettimeofday(tv)
-	tv.Sec = int32(sec)
-	tv.Usec = int32(usec)
-	return err
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var length = uint64(count)
-
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(*offset>>32), uintptr(unsafe.Pointer(&length)), 0, 0, 0, 0)
-
-	written = int(length)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
-// of darwin/386 the syscall is called sysctl instead of __sysctl.
-const SYS___SYSCTL = SYS_SYSCTL
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go
deleted file mode 100644
index fc1e5a4a82..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_amd64.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-//sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
-func Gettimeofday(tv *Timeval) (err error) {
-	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
-	// in the two registers.
-	sec, usec, err := gettimeofday(tv)
-	tv.Sec = sec
-	tv.Usec = usec
-	return err
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var length = uint64(count)
-
-	_, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(unsafe.Pointer(&length)), 0, 0)
-
-	written = int(length)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
-// of darwin/amd64 the syscall is called sysctl instead of __sysctl.
-const SYS___SYSCTL = SYS_SYSCTL
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm.go
deleted file mode 100644
index d286cf408d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
-}
-
-//sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
-func Gettimeofday(tv *Timeval) (err error) {
-	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
-	// in the two registers.
-	sec, usec, err := gettimeofday(tv)
-	tv.Sec = int32(sec)
-	tv.Usec = int32(usec)
-	return err
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var length = uint64(count)
-
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(*offset>>32), uintptr(unsafe.Pointer(&length)), 0, 0, 0, 0)
-
-	written = int(length)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go
deleted file mode 100644
index c33905cdcd..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin_arm64.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm64,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 16384 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-//sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
-func Gettimeofday(tv *Timeval) (err error) {
-	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
-	// in the two registers.
-	sec, usec, err := gettimeofday(tv)
-	tv.Sec = sec
-	tv.Usec = usec
-	return err
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var length = uint64(count)
-
-	_, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(unsafe.Pointer(&length)), 0, 0)
-
-	written = int(length)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
-
-// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
-// of darwin/arm64 the syscall is called sysctl instead of __sysctl.
-const SYS___SYSCTL = SYS_SYSCTL
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly.go
deleted file mode 100644
index fbbe0dce25..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly.go
+++ /dev/null
@@ -1,411 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// FreeBSD system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import "unsafe"
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-	Rcf    uint16
-	Route  [16]uint16
-	raw    RawSockaddrDatalink
-}
-
-// Translate "kern.hostname" to []_C_int{0,1,2,3}.
-func nametomib(name string) (mib []_C_int, err error) {
-	const siz = unsafe.Sizeof(mib[0])
-
-	// NOTE(rsc): It seems strange to set the buffer to have
-	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
-	// as the size.  I don't know why the +2 is here, but the
-	// kernel uses +2 for its own implementation of this function.
-	// I am scared that if we don't include the +2 here, the kernel
-	// will silently write 2 words farther than we specify
-	// and we'll get memory corruption.
-	var buf [CTL_MAXNAME + 2]_C_int
-	n := uintptr(CTL_MAXNAME) * siz
-
-	p := (*byte)(unsafe.Pointer(&buf[0]))
-	bytes, err := ByteSliceFromString(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// Magic sysctl: "setting" 0.3 to a string name
-	// lets you read back the array of integers form.
-	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
-		return nil, err
-	}
-	return buf[0 : n/siz], nil
-}
-
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names.  It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		reclen := int(16+dirent.Namlen+1+7) & ^7
-		buf = buf[reclen:]
-		if dirent.Fileno == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
-//sysnb pipe() (r int, w int, err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	p[0], p[1], err = pipe()
-	return
-}
-
-//sys	extpread(fd int, p []byte, flags int, offset int64) (n int, err error)
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	return extpread(fd, p, 0, offset)
-}
-
-//sys	extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error)
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	return extpwrite(fd, p, 0, offset)
-}
-
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
-//sys	Getdtablesize() (size int)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Issetugid() (tainted bool)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Setlogin(name string) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, stat *Statfs_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Undelete(path string) (err error)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys   munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-
-/*
- * Unimplemented
- * TODO(jsing): Update this list for DragonFly.
- */
-// Profil
-// Sigaction
-// Sigprocmask
-// Getlogin
-// Sigpending
-// Sigaltstack
-// Ioctl
-// Reboot
-// Execve
-// Vfork
-// Sbrk
-// Sstk
-// Ovadvise
-// Mincore
-// Setitimer
-// Swapon
-// Select
-// Sigsuspend
-// Readv
-// Writev
-// Nfssvc
-// Getfh
-// Quotactl
-// Mount
-// Csops
-// Waitid
-// Add_profil
-// Kdebug_trace
-// Sigreturn
-// Mmap
-// Atsocket
-// Kqueue_from_portset_np
-// Kqueue_portset
-// Getattrlist
-// Setattrlist
-// Getdirentriesattr
-// Searchfs
-// Delete
-// Copyfile
-// Poll
-// Watchevent
-// Waitevent
-// Modwatch
-// Getxattr
-// Fgetxattr
-// Setxattr
-// Fsetxattr
-// Removexattr
-// Fremovexattr
-// Listxattr
-// Flistxattr
-// Fsctl
-// Initgroups
-// Posix_spawn
-// Nfsclnt
-// Fhopen
-// Minherit
-// Semsys
-// Msgsys
-// Shmsys
-// Semctl
-// Semget
-// Semop
-// Msgctl
-// Msgget
-// Msgsnd
-// Msgrcv
-// Shmat
-// Shmctl
-// Shmdt
-// Shmget
-// Shm_open
-// Shm_unlink
-// Sem_open
-// Sem_close
-// Sem_unlink
-// Sem_wait
-// Sem_trywait
-// Sem_post
-// Sem_getvalue
-// Sem_init
-// Sem_destroy
-// Open_extended
-// Umask_extended
-// Stat_extended
-// Lstat_extended
-// Fstat_extended
-// Chmod_extended
-// Fchmod_extended
-// Access_extended
-// Settid
-// Gettid
-// Setsgroups
-// Getsgroups
-// Setwgroups
-// Getwgroups
-// Mkfifo_extended
-// Mkdir_extended
-// Identitysvc
-// Shared_region_check_np
-// Shared_region_map_np
-// __pthread_mutex_destroy
-// __pthread_mutex_init
-// __pthread_mutex_lock
-// __pthread_mutex_trylock
-// __pthread_mutex_unlock
-// __pthread_cond_init
-// __pthread_cond_destroy
-// __pthread_cond_broadcast
-// __pthread_cond_signal
-// Setsid_with_pid
-// __pthread_cond_timedwait
-// Aio_fsync
-// Aio_return
-// Aio_suspend
-// Aio_cancel
-// Aio_error
-// Aio_read
-// Aio_write
-// Lio_listio
-// __pthread_cond_wait
-// Iopolicysys
-// __pthread_kill
-// __pthread_sigmask
-// __sigwait
-// __disable_threadsignal
-// __pthread_markcancel
-// __pthread_canceled
-// __semwait_signal
-// Proc_info
-// Stat64_extended
-// Lstat64_extended
-// Fstat64_extended
-// __pthread_chdir
-// __pthread_fchdir
-// Audit
-// Auditon
-// Getauid
-// Setauid
-// Getaudit
-// Setaudit
-// Getaudit_addr
-// Setaudit_addr
-// Auditctl
-// Bsdthread_create
-// Bsdthread_terminate
-// Stack_snapshot
-// Bsdthread_register
-// Workq_open
-// Workq_ops
-// __mac_execve
-// __mac_syscall
-// __mac_get_file
-// __mac_set_file
-// __mac_get_link
-// __mac_set_link
-// __mac_get_proc
-// __mac_set_proc
-// __mac_get_fd
-// __mac_set_fd
-// __mac_get_pid
-// __mac_get_lcid
-// __mac_get_lctx
-// __mac_set_lctx
-// Setlcid
-// Read_nocancel
-// Write_nocancel
-// Open_nocancel
-// Close_nocancel
-// Wait4_nocancel
-// Recvmsg_nocancel
-// Sendmsg_nocancel
-// Recvfrom_nocancel
-// Accept_nocancel
-// Msync_nocancel
-// Fcntl_nocancel
-// Select_nocancel
-// Fsync_nocancel
-// Connect_nocancel
-// Sigsuspend_nocancel
-// Readv_nocancel
-// Writev_nocancel
-// Sendto_nocancel
-// Pread_nocancel
-// Pwrite_nocancel
-// Waitid_nocancel
-// Poll_nocancel
-// Msgsnd_nocancel
-// Msgrcv_nocancel
-// Sem_wait_nocancel
-// Aio_suspend_nocancel
-// __sigwait_nocancel
-// __semwait_signal_nocancel
-// __mac_mount
-// __mac_get_mount
-// __mac_getfsstat
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
deleted file mode 100644
index da7cb7982c..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,dragonfly
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
-
-	written = int(writtenOut)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd.go
deleted file mode 100644
index ec56ed608a..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd.go
+++ /dev/null
@@ -1,682 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// FreeBSD system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import "unsafe"
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [46]int8
-	raw    RawSockaddrDatalink
-}
-
-// Translate "kern.hostname" to []_C_int{0,1,2,3}.
-func nametomib(name string) (mib []_C_int, err error) {
-	const siz = unsafe.Sizeof(mib[0])
-
-	// NOTE(rsc): It seems strange to set the buffer to have
-	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
-	// as the size.  I don't know why the +2 is here, but the
-	// kernel uses +2 for its own implementation of this function.
-	// I am scared that if we don't include the +2 here, the kernel
-	// will silently write 2 words farther than we specify
-	// and we'll get memory corruption.
-	var buf [CTL_MAXNAME + 2]_C_int
-	n := uintptr(CTL_MAXNAME) * siz
-
-	p := (*byte)(unsafe.Pointer(&buf[0]))
-	bytes, err := ByteSliceFromString(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// Magic sysctl: "setting" 0.3 to a string name
-	// lets you read back the array of integers form.
-	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
-		return nil, err
-	}
-	return buf[0 : n/siz], nil
-}
-
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names.  It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Fileno == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
-//sysnb pipe() (r int, w int, err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	p[0], p[1], err = pipe()
-	return
-}
-
-func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
-	var value IPMreqn
-	vallen := _Socklen(SizeofIPMreqn)
-	errno := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, errno
-}
-
-func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
-}
-
-func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept4(fd, &rsa, &len, flags)
-	if err != nil {
-		return
-	}
-	if len > SizeofSockaddrAny {
-		panic("RawSockaddrAny too small")
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-// Derive extattr namespace and attribute name
-
-func xattrnamespace(fullattr string) (ns int, attr string, err error) {
-	s := -1
-	for idx, val := range fullattr {
-		if val == '.' {
-			s = idx
-			break
-		}
-	}
-
-	if s == -1 {
-		return -1, "", ENOATTR
-	}
-
-	namespace := fullattr[0:s]
-	attr = fullattr[s+1:]
-
-	switch namespace {
-	case "user":
-		return EXTATTR_NAMESPACE_USER, attr, nil
-	case "system":
-		return EXTATTR_NAMESPACE_SYSTEM, attr, nil
-	default:
-		return -1, "", ENOATTR
-	}
-}
-
-func initxattrdest(dest []byte, idx int) (d unsafe.Pointer) {
-	if len(dest) > idx {
-		return unsafe.Pointer(&dest[idx])
-	} else {
-		return unsafe.Pointer(_zero)
-	}
-}
-
-// FreeBSD implements its own syscalls to handle extended attributes
-
-func Getxattr(file string, attr string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsize := len(dest)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return -1, err
-	}
-
-	return ExtattrGetFile(file, nsid, a, uintptr(d), destsize)
-}
-
-func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsize := len(dest)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return -1, err
-	}
-
-	return ExtattrGetFd(fd, nsid, a, uintptr(d), destsize)
-}
-
-func Lgetxattr(link string, attr string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsize := len(dest)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return -1, err
-	}
-
-	return ExtattrGetLink(link, nsid, a, uintptr(d), destsize)
-}
-
-// flags are unused on FreeBSD
-
-func Fsetxattr(fd int, attr string, data []byte, flags int) (err error) {
-	d := unsafe.Pointer(&data[0])
-	datasiz := len(data)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	_, err = ExtattrSetFd(fd, nsid, a, uintptr(d), datasiz)
-	return
-}
-
-func Setxattr(file string, attr string, data []byte, flags int) (err error) {
-	d := unsafe.Pointer(&data[0])
-	datasiz := len(data)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	_, err = ExtattrSetFile(file, nsid, a, uintptr(d), datasiz)
-	return
-}
-
-func Lsetxattr(link string, attr string, data []byte, flags int) (err error) {
-	d := unsafe.Pointer(&data[0])
-	datasiz := len(data)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	_, err = ExtattrSetLink(link, nsid, a, uintptr(d), datasiz)
-	return
-}
-
-func Removexattr(file string, attr string) (err error) {
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	err = ExtattrDeleteFile(file, nsid, a)
-	return
-}
-
-func Fremovexattr(fd int, attr string) (err error) {
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	err = ExtattrDeleteFd(fd, nsid, a)
-	return
-}
-
-func Lremovexattr(link string, attr string) (err error) {
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	err = ExtattrDeleteLink(link, nsid, a)
-	return
-}
-
-func Listxattr(file string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsiz := len(dest)
-
-	// FreeBSD won't allow you to list xattrs from multiple namespaces
-	s := 0
-	var e error
-	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-		stmp, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
-
-		/* Errors accessing system attrs are ignored so that
-		 * we can implement the Linux-like behavior of omitting errors that
-		 * we don't have read permissions on
-		 *
-		 * Linux will still error if we ask for user attributes on a file that
-		 * we don't have read permissions on, so don't ignore those errors
-		 */
-		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-			e = nil
-			continue
-		} else if e != nil {
-			return s, e
-		}
-
-		s += stmp
-		destsiz -= s
-		if destsiz < 0 {
-			destsiz = 0
-		}
-		d = initxattrdest(dest, s)
-	}
-
-	return s, e
-}
-
-func Flistxattr(fd int, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsiz := len(dest)
-
-	s := 0
-	var e error
-	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-		stmp, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
-		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-			e = nil
-			continue
-		} else if e != nil {
-			return s, e
-		}
-
-		s += stmp
-		destsiz -= s
-		if destsiz < 0 {
-			destsiz = 0
-		}
-		d = initxattrdest(dest, s)
-	}
-
-	return s, e
-}
-
-func Llistxattr(link string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsiz := len(dest)
-
-	s := 0
-	var e error
-	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-		stmp, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
-		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-			e = nil
-			continue
-		} else if e != nil {
-			return s, e
-		}
-
-		s += stmp
-		destsiz -= s
-		if destsiz < 0 {
-			destsiz = 0
-		}
-		d = initxattrdest(dest, s)
-	}
-
-	return s, e
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exit(code int)
-//sys	ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error)
-//sys	ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error)
-//sys	ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error)
-//sys	ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
-//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_POSIX_FADVISE
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
-//sys	Getdtablesize() (size int)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Issetugid() (tainted bool)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Setlogin(name string) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, stat *Statfs_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Undelete(path string) (err error)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys   munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-//sys	accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
-
-/*
- * Unimplemented
- */
-// Profil
-// Sigaction
-// Sigprocmask
-// Getlogin
-// Sigpending
-// Sigaltstack
-// Ioctl
-// Reboot
-// Execve
-// Vfork
-// Sbrk
-// Sstk
-// Ovadvise
-// Mincore
-// Setitimer
-// Swapon
-// Select
-// Sigsuspend
-// Readv
-// Writev
-// Nfssvc
-// Getfh
-// Quotactl
-// Mount
-// Csops
-// Waitid
-// Add_profil
-// Kdebug_trace
-// Sigreturn
-// Mmap
-// Mlock
-// Munlock
-// Atsocket
-// Kqueue_from_portset_np
-// Kqueue_portset
-// Getattrlist
-// Setattrlist
-// Getdirentriesattr
-// Searchfs
-// Delete
-// Copyfile
-// Poll
-// Watchevent
-// Waitevent
-// Modwatch
-// Getxattr
-// Fgetxattr
-// Setxattr
-// Fsetxattr
-// Removexattr
-// Fremovexattr
-// Listxattr
-// Flistxattr
-// Fsctl
-// Initgroups
-// Posix_spawn
-// Nfsclnt
-// Fhopen
-// Minherit
-// Semsys
-// Msgsys
-// Shmsys
-// Semctl
-// Semget
-// Semop
-// Msgctl
-// Msgget
-// Msgsnd
-// Msgrcv
-// Shmat
-// Shmctl
-// Shmdt
-// Shmget
-// Shm_open
-// Shm_unlink
-// Sem_open
-// Sem_close
-// Sem_unlink
-// Sem_wait
-// Sem_trywait
-// Sem_post
-// Sem_getvalue
-// Sem_init
-// Sem_destroy
-// Open_extended
-// Umask_extended
-// Stat_extended
-// Lstat_extended
-// Fstat_extended
-// Chmod_extended
-// Fchmod_extended
-// Access_extended
-// Settid
-// Gettid
-// Setsgroups
-// Getsgroups
-// Setwgroups
-// Getwgroups
-// Mkfifo_extended
-// Mkdir_extended
-// Identitysvc
-// Shared_region_check_np
-// Shared_region_map_np
-// __pthread_mutex_destroy
-// __pthread_mutex_init
-// __pthread_mutex_lock
-// __pthread_mutex_trylock
-// __pthread_mutex_unlock
-// __pthread_cond_init
-// __pthread_cond_destroy
-// __pthread_cond_broadcast
-// __pthread_cond_signal
-// Setsid_with_pid
-// __pthread_cond_timedwait
-// Aio_fsync
-// Aio_return
-// Aio_suspend
-// Aio_cancel
-// Aio_error
-// Aio_read
-// Aio_write
-// Lio_listio
-// __pthread_cond_wait
-// Iopolicysys
-// Mlockall
-// Munlockall
-// __pthread_kill
-// __pthread_sigmask
-// __sigwait
-// __disable_threadsignal
-// __pthread_markcancel
-// __pthread_canceled
-// __semwait_signal
-// Proc_info
-// Stat64_extended
-// Lstat64_extended
-// Fstat64_extended
-// __pthread_chdir
-// __pthread_fchdir
-// Audit
-// Auditon
-// Getauid
-// Setauid
-// Getaudit
-// Setaudit
-// Getaudit_addr
-// Setaudit_addr
-// Auditctl
-// Bsdthread_create
-// Bsdthread_terminate
-// Stack_snapshot
-// Bsdthread_register
-// Workq_open
-// Workq_ops
-// __mac_execve
-// __mac_syscall
-// __mac_get_file
-// __mac_set_file
-// __mac_get_link
-// __mac_set_link
-// __mac_get_proc
-// __mac_set_proc
-// __mac_get_fd
-// __mac_set_fd
-// __mac_get_pid
-// __mac_get_lcid
-// __mac_get_lctx
-// __mac_set_lctx
-// Setlcid
-// Read_nocancel
-// Write_nocancel
-// Open_nocancel
-// Close_nocancel
-// Wait4_nocancel
-// Recvmsg_nocancel
-// Sendmsg_nocancel
-// Recvfrom_nocancel
-// Accept_nocancel
-// Msync_nocancel
-// Fcntl_nocancel
-// Select_nocancel
-// Fsync_nocancel
-// Connect_nocancel
-// Sigsuspend_nocancel
-// Readv_nocancel
-// Writev_nocancel
-// Sendto_nocancel
-// Pread_nocancel
-// Pwrite_nocancel
-// Waitid_nocancel
-// Poll_nocancel
-// Msgsnd_nocancel
-// Msgrcv_nocancel
-// Sem_wait_nocancel
-// Aio_suspend_nocancel
-// __sigwait_nocancel
-// __semwait_signal_nocancel
-// __mac_mount
-// __mac_get_mount
-// __mac_getfsstat
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go
deleted file mode 100644
index 6a0cd804d8..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_386.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
-
-	written = int(writtenOut)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go
deleted file mode 100644
index e142540efa..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_amd64.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
-
-	written = int(writtenOut)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go
deleted file mode 100644
index 5504cb1255..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_freebsd_arm.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm,freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return ts.Sec*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = nsec / 1e9
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
-
-	written = int(writtenOut)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go
deleted file mode 100644
index 9ca104c957..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux.go
+++ /dev/null
@@ -1,1108 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Linux system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and
-// wrap it in our own nicer implementation.
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-/*
- * Wrapped
- */
-
-func Access(path string, mode uint32) (err error) {
-	return Faccessat(AT_FDCWD, path, mode, 0)
-}
-
-func Chmod(path string, mode uint32) (err error) {
-	return Fchmodat(AT_FDCWD, path, mode, 0)
-}
-
-func Chown(path string, uid int, gid int) (err error) {
-	return Fchownat(AT_FDCWD, path, uid, gid, 0)
-}
-
-func Creat(path string, mode uint32) (fd int, err error) {
-	return Open(path, O_CREAT|O_WRONLY|O_TRUNC, mode)
-}
-
-//sys	Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error)
-
-func Link(oldpath string, newpath string) (err error) {
-	return Linkat(AT_FDCWD, oldpath, AT_FDCWD, newpath, 0)
-}
-
-func Mkdir(path string, mode uint32) (err error) {
-	return Mkdirat(AT_FDCWD, path, mode)
-}
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	return Mknodat(AT_FDCWD, path, mode, dev)
-}
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	return openat(AT_FDCWD, path, mode|O_LARGEFILE, perm)
-}
-
-//sys	openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
-
-func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	return openat(dirfd, path, flags|O_LARGEFILE, mode)
-}
-
-//sys	readlinkat(dirfd int, path string, buf []byte) (n int, err error)
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	return readlinkat(AT_FDCWD, path, buf)
-}
-
-func Rename(oldpath string, newpath string) (err error) {
-	return Renameat(AT_FDCWD, oldpath, AT_FDCWD, newpath)
-}
-
-func Rmdir(path string) error {
-	return unlinkat(AT_FDCWD, path, AT_REMOVEDIR)
-}
-
-//sys	symlinkat(oldpath string, newdirfd int, newpath string) (err error)
-
-func Symlink(oldpath string, newpath string) (err error) {
-	return symlinkat(oldpath, AT_FDCWD, newpath)
-}
-
-func Unlink(path string) error {
-	return unlinkat(AT_FDCWD, path, 0)
-}
-
-//sys	unlinkat(dirfd int, path string, flags int) (err error)
-
-func Unlinkat(dirfd int, path string, flags int) error {
-	return unlinkat(dirfd, path, flags)
-}
-
-//sys	utimes(path string, times *[2]Timeval) (err error)
-
-func Utimes(path string, tv []Timeval) error {
-	if tv == nil {
-		err := utimensat(AT_FDCWD, path, nil, 0)
-		if err != ENOSYS {
-			return err
-		}
-		return utimes(path, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	var ts [2]Timespec
-	ts[0] = NsecToTimespec(TimevalToNsec(tv[0]))
-	ts[1] = NsecToTimespec(TimevalToNsec(tv[1]))
-	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
-	if err != ENOSYS {
-		return err
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
-
-func UtimesNano(path string, ts []Timespec) error {
-	if ts == nil {
-		err := utimensat(AT_FDCWD, path, nil, 0)
-		if err != ENOSYS {
-			return err
-		}
-		return utimes(path, nil)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
-	if err != ENOSYS {
-		return err
-	}
-	// If the utimensat syscall isn't available (utimensat was added to Linux
-	// in 2.6.22, Released, 8 July 2007) then fall back to utimes
-	var tv [2]Timeval
-	for i := 0; i < 2; i++ {
-		tv[i].Sec = ts[i].Sec
-		tv[i].Usec = ts[i].Nsec / 1000
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
-	if ts == nil {
-		return utimensat(dirfd, path, nil, flags)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
-}
-
-//sys	futimesat(dirfd int, path *byte, times *[2]Timeval) (err error)
-
-func Futimesat(dirfd int, path string, tv []Timeval) error {
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	if tv == nil {
-		return futimesat(dirfd, pathp, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-func Futimes(fd int, tv []Timeval) (err error) {
-	// Believe it or not, this is the best we can do on Linux
-	// (and is what glibc does).
-	return Utimes("/proc/self/fd/"+itoa(fd), tv)
-}
-
-const ImplementsGetwd = true
-
-//sys	Getcwd(buf []byte) (n int, err error)
-
-func Getwd() (wd string, err error) {
-	var buf [PathMax]byte
-	n, err := Getcwd(buf[0:])
-	if err != nil {
-		return "", err
-	}
-	// Getcwd returns the number of bytes written to buf, including the NUL.
-	if n < 1 || n > len(buf) || buf[n-1] != 0 {
-		return "", EINVAL
-	}
-	return string(buf[0 : n-1]), nil
-}
-
-func Getgroups() (gids []int, err error) {
-	n, err := getgroups(0, nil)
-	if err != nil {
-		return nil, err
-	}
-	if n == 0 {
-		return nil, nil
-	}
-
-	// Sanity check group count.  Max is 1<<16 on Linux.
-	if n < 0 || n > 1<<20 {
-		return nil, EINVAL
-	}
-
-	a := make([]_Gid_t, n)
-	n, err = getgroups(n, &a[0])
-	if err != nil {
-		return nil, err
-	}
-	gids = make([]int, n)
-	for i, v := range a[0:n] {
-		gids[i] = int(v)
-	}
-	return
-}
-
-func Setgroups(gids []int) (err error) {
-	if len(gids) == 0 {
-		return setgroups(0, nil)
-	}
-
-	a := make([]_Gid_t, len(gids))
-	for i, v := range gids {
-		a[i] = _Gid_t(v)
-	}
-	return setgroups(len(a), &a[0])
-}
-
-type WaitStatus uint32
-
-// Wait status is 7 bits at bottom, either 0 (exited),
-// 0x7F (stopped), or a signal number that caused an exit.
-// The 0x80 bit is whether there was a core dump.
-// An extra number (exit code, signal causing a stop)
-// is in the high bits.  At least that's the idea.
-// There are various irregularities.  For example, the
-// "continued" status is 0xFFFF, distinguishing itself
-// from stopped via the core dump bit.
-
-const (
-	mask    = 0x7F
-	core    = 0x80
-	exited  = 0x00
-	stopped = 0x7F
-	shift   = 8
-)
-
-func (w WaitStatus) Exited() bool { return w&mask == exited }
-
-func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != exited }
-
-func (w WaitStatus) Stopped() bool { return w&0xFF == stopped }
-
-func (w WaitStatus) Continued() bool { return w == 0xFFFF }
-
-func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
-
-func (w WaitStatus) ExitStatus() int {
-	if !w.Exited() {
-		return -1
-	}
-	return int(w>>shift) & 0xFF
-}
-
-func (w WaitStatus) Signal() syscall.Signal {
-	if !w.Signaled() {
-		return -1
-	}
-	return syscall.Signal(w & mask)
-}
-
-func (w WaitStatus) StopSignal() syscall.Signal {
-	if !w.Stopped() {
-		return -1
-	}
-	return syscall.Signal(w>>shift) & 0xFF
-}
-
-func (w WaitStatus) TrapCause() int {
-	if w.StopSignal() != SIGTRAP {
-		return -1
-	}
-	return int(w>>shift) >> 8
-}
-
-//sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error)
-
-func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
-	var status _C_int
-	wpid, err = wait4(pid, &status, options, rusage)
-	if wstatus != nil {
-		*wstatus = WaitStatus(status)
-	}
-	return
-}
-
-func Mkfifo(path string, mode uint32) (err error) {
-	return Mknod(path, mode|S_IFIFO, 0)
-}
-
-func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_INET
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
-}
-
-func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_INET6
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	sa.raw.Scope_id = sa.ZoneId
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
-}
-
-func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	name := sa.Name
-	n := len(name)
-	if n >= len(sa.raw.Path) {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_UNIX
-	for i := 0; i < n; i++ {
-		sa.raw.Path[i] = int8(name[i])
-	}
-	// length is family (uint16), name, NUL.
-	sl := _Socklen(2)
-	if n > 0 {
-		sl += _Socklen(n) + 1
-	}
-	if sa.raw.Path[0] == '@' {
-		sa.raw.Path[0] = 0
-		// Don't count trailing NUL for abstract address.
-		sl--
-	}
-
-	return unsafe.Pointer(&sa.raw), sl, nil
-}
-
-type SockaddrLinklayer struct {
-	Protocol uint16
-	Ifindex  int
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]byte
-	raw      RawSockaddrLinklayer
-}
-
-func (sa *SockaddrLinklayer) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Ifindex < 0 || sa.Ifindex > 0x7fffffff {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_PACKET
-	sa.raw.Protocol = sa.Protocol
-	sa.raw.Ifindex = int32(sa.Ifindex)
-	sa.raw.Hatype = sa.Hatype
-	sa.raw.Pkttype = sa.Pkttype
-	sa.raw.Halen = sa.Halen
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrLinklayer, nil
-}
-
-type SockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-	raw    RawSockaddrNetlink
-}
-
-func (sa *SockaddrNetlink) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	sa.raw.Family = AF_NETLINK
-	sa.raw.Pad = sa.Pad
-	sa.raw.Pid = sa.Pid
-	sa.raw.Groups = sa.Groups
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrNetlink, nil
-}
-
-type SockaddrHCI struct {
-	Dev     uint16
-	Channel uint16
-	raw     RawSockaddrHCI
-}
-
-func (sa *SockaddrHCI) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	sa.raw.Family = AF_BLUETOOTH
-	sa.raw.Dev = sa.Dev
-	sa.raw.Channel = sa.Channel
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrHCI, nil
-}
-
-func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
-	switch rsa.Addr.Family {
-	case AF_NETLINK:
-		pp := (*RawSockaddrNetlink)(unsafe.Pointer(rsa))
-		sa := new(SockaddrNetlink)
-		sa.Family = pp.Family
-		sa.Pad = pp.Pad
-		sa.Pid = pp.Pid
-		sa.Groups = pp.Groups
-		return sa, nil
-
-	case AF_PACKET:
-		pp := (*RawSockaddrLinklayer)(unsafe.Pointer(rsa))
-		sa := new(SockaddrLinklayer)
-		sa.Protocol = pp.Protocol
-		sa.Ifindex = int(pp.Ifindex)
-		sa.Hatype = pp.Hatype
-		sa.Pkttype = pp.Pkttype
-		sa.Halen = pp.Halen
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_UNIX:
-		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
-		sa := new(SockaddrUnix)
-		if pp.Path[0] == 0 {
-			// "Abstract" Unix domain socket.
-			// Rewrite leading NUL as @ for textual display.
-			// (This is the standard convention.)
-			// Not friendly to overwrite in place,
-			// but the callers below don't care.
-			pp.Path[0] = '@'
-		}
-
-		// Assume path ends at NUL.
-		// This is not technically the Linux semantics for
-		// abstract Unix domain sockets--they are supposed
-		// to be uninterpreted fixed-size binary blobs--but
-		// everyone uses this convention.
-		n := 0
-		for n < len(pp.Path) && pp.Path[n] != 0 {
-			n++
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
-		return sa, nil
-
-	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet4)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet6)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.ZoneId = pp.Scope_id
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-	}
-	return nil, EAFNOSUPPORT
-}
-
-func Accept(fd int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept(fd, &rsa, &len)
-	if err != nil {
-		return
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept4(fd, &rsa, &len, flags)
-	if err != nil {
-		return
-	}
-	if len > SizeofSockaddrAny {
-		panic("RawSockaddrAny too small")
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-func Getsockname(fd int) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if err = getsockname(fd, &rsa, &len); err != nil {
-		return
-	}
-	return anyToSockaddr(&rsa)
-}
-
-func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
-	vallen := _Socklen(4)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
-	return value, err
-}
-
-func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
-	var value IPMreq
-	vallen := _Socklen(SizeofIPMreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
-	var value IPMreqn
-	vallen := _Socklen(SizeofIPMreqn)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
-	var value IPv6Mreq
-	vallen := _Socklen(SizeofIPv6Mreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
-	var value IPv6MTUInfo
-	vallen := _Socklen(SizeofIPv6MTUInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
-	var value ICMPv6Filter
-	vallen := _Socklen(SizeofICMPv6Filter)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptUcred(fd, level, opt int) (*Ucred, error) {
-	var value Ucred
-	vallen := _Socklen(SizeofUcred)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
-}
-
-func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
-	var msg Msghdr
-	var rsa RawSockaddrAny
-	msg.Name = (*byte)(unsafe.Pointer(&rsa))
-	msg.Namelen = uint32(SizeofSockaddrAny)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy byte
-	if len(oob) > 0 {
-		// receive at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = recvmsg(fd, &msg, flags); err != nil {
-		return
-	}
-	oobn = int(msg.Controllen)
-	recvflags = int(msg.Flags)
-	// source address is only specified if the socket is unconnected
-	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
-	}
-	return
-}
-
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-	_, err = SendmsgN(fd, p, oob, to, flags)
-	return
-}
-
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-	var ptr unsafe.Pointer
-	var salen _Socklen
-	if to != nil {
-		var err error
-		ptr, salen, err = to.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-	}
-	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(ptr))
-	msg.Namelen = uint32(salen)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy byte
-	if len(oob) > 0 {
-		// send at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = sendmsg(fd, &msg, flags); err != nil {
-		return 0, err
-	}
-	if len(oob) > 0 && len(p) == 0 {
-		n = 0
-	}
-	return n, nil
-}
-
-// BindToDevice binds the socket associated with fd to device.
-func BindToDevice(fd int, device string) (err error) {
-	return SetsockoptString(fd, SOL_SOCKET, SO_BINDTODEVICE, device)
-}
-
-//sys	ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
-
-func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err error) {
-	// The peek requests are machine-size oriented, so we wrap it
-	// to retrieve arbitrary-length data.
-
-	// The ptrace syscall differs from glibc's ptrace.
-	// Peeks returns the word in *data, not as the return value.
-
-	var buf [sizeofPtr]byte
-
-	// Leading edge.  PEEKTEXT/PEEKDATA don't require aligned
-	// access (PEEKUSER warns that it might), but if we don't
-	// align our reads, we might straddle an unmapped page
-	// boundary and not get the bytes leading up to the page
-	// boundary.
-	n := 0
-	if addr%sizeofPtr != 0 {
-		err = ptrace(req, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
-		if err != nil {
-			return 0, err
-		}
-		n += copy(out, buf[addr%sizeofPtr:])
-		out = out[n:]
-	}
-
-	// Remainder.
-	for len(out) > 0 {
-		// We use an internal buffer to guarantee alignment.
-		// It's not documented if this is necessary, but we're paranoid.
-		err = ptrace(req, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
-		if err != nil {
-			return n, err
-		}
-		copied := copy(out, buf[0:])
-		n += copied
-		out = out[copied:]
-	}
-
-	return n, nil
-}
-
-func PtracePeekText(pid int, addr uintptr, out []byte) (count int, err error) {
-	return ptracePeek(PTRACE_PEEKTEXT, pid, addr, out)
-}
-
-func PtracePeekData(pid int, addr uintptr, out []byte) (count int, err error) {
-	return ptracePeek(PTRACE_PEEKDATA, pid, addr, out)
-}
-
-func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (count int, err error) {
-	// As for ptracePeek, we need to align our accesses to deal
-	// with the possibility of straddling an invalid page.
-
-	// Leading edge.
-	n := 0
-	if addr%sizeofPtr != 0 {
-		var buf [sizeofPtr]byte
-		err = ptrace(peekReq, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
-		if err != nil {
-			return 0, err
-		}
-		n += copy(buf[addr%sizeofPtr:], data)
-		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
-		err = ptrace(pokeReq, pid, addr-addr%sizeofPtr, word)
-		if err != nil {
-			return 0, err
-		}
-		data = data[n:]
-	}
-
-	// Interior.
-	for len(data) > sizeofPtr {
-		word := *((*uintptr)(unsafe.Pointer(&data[0])))
-		err = ptrace(pokeReq, pid, addr+uintptr(n), word)
-		if err != nil {
-			return n, err
-		}
-		n += sizeofPtr
-		data = data[sizeofPtr:]
-	}
-
-	// Trailing edge.
-	if len(data) > 0 {
-		var buf [sizeofPtr]byte
-		err = ptrace(peekReq, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
-		if err != nil {
-			return n, err
-		}
-		copy(buf[0:], data)
-		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
-		err = ptrace(pokeReq, pid, addr+uintptr(n), word)
-		if err != nil {
-			return n, err
-		}
-		n += len(data)
-	}
-
-	return n, nil
-}
-
-func PtracePokeText(pid int, addr uintptr, data []byte) (count int, err error) {
-	return ptracePoke(PTRACE_POKETEXT, PTRACE_PEEKTEXT, pid, addr, data)
-}
-
-func PtracePokeData(pid int, addr uintptr, data []byte) (count int, err error) {
-	return ptracePoke(PTRACE_POKEDATA, PTRACE_PEEKDATA, pid, addr, data)
-}
-
-func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
-}
-
-func PtraceSetRegs(pid int, regs *PtraceRegs) (err error) {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
-}
-
-func PtraceSetOptions(pid int, options int) (err error) {
-	return ptrace(PTRACE_SETOPTIONS, pid, 0, uintptr(options))
-}
-
-func PtraceGetEventMsg(pid int) (msg uint, err error) {
-	var data _C_long
-	err = ptrace(PTRACE_GETEVENTMSG, pid, 0, uintptr(unsafe.Pointer(&data)))
-	msg = uint(data)
-	return
-}
-
-func PtraceCont(pid int, signal int) (err error) {
-	return ptrace(PTRACE_CONT, pid, 0, uintptr(signal))
-}
-
-func PtraceSyscall(pid int, signal int) (err error) {
-	return ptrace(PTRACE_SYSCALL, pid, 0, uintptr(signal))
-}
-
-func PtraceSingleStep(pid int) (err error) { return ptrace(PTRACE_SINGLESTEP, pid, 0, 0) }
-
-func PtraceAttach(pid int) (err error) { return ptrace(PTRACE_ATTACH, pid, 0, 0) }
-
-func PtraceDetach(pid int) (err error) { return ptrace(PTRACE_DETACH, pid, 0, 0) }
-
-//sys	reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error)
-
-func Reboot(cmd int) (err error) {
-	return reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, "")
-}
-
-func clen(n []byte) int {
-	for i := 0; i < len(n); i++ {
-		if n[i] == 0 {
-			return i
-		}
-	}
-	return len(n)
-}
-
-func ReadDirent(fd int, buf []byte) (n int, err error) {
-	return Getdents(fd, buf)
-}
-
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	count = 0
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		buf = buf[dirent.Reclen:]
-		if dirent.Ino == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:clen(bytes[:])])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
-//sys	mount(source string, target string, fstype string, flags uintptr, data *byte) (err error)
-
-func Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
-	// Certain file systems get rather angry and EINVAL if you give
-	// them an empty string of data, rather than NULL.
-	if data == "" {
-		return mount(source, target, fstype, flags, nil)
-	}
-	datap, err := BytePtrFromString(data)
-	if err != nil {
-		return err
-	}
-	return mount(source, target, fstype, flags, datap)
-}
-
-// Sendto
-// Recvfrom
-// Socketpair
-
-/*
- * Direct access
- */
-//sys	Acct(path string) (err error)
-//sys	Adjtimex(buf *Timex) (state int, err error)
-//sys	Chdir(path string) (err error)
-//sys	Chroot(path string) (err error)
-//sys	ClockGettime(clockid int32, time *Timespec) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(oldfd int) (fd int, err error)
-//sys	Dup3(oldfd int, newfd int, flags int) (err error)
-//sysnb	EpollCreate(size int) (fd int, err error)
-//sysnb	EpollCreate1(flag int) (fd int, err error)
-//sysnb	EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error)
-//sys	Exit(code int) = SYS_EXIT_GROUP
-//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
-//sys	Fallocate(fd int, mode uint32, off int64, len int64) (err error)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
-//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
-//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
-//sys	Fdatasync(fd int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Getdents(fd int, buf []byte) (n int, err error) = SYS_GETDENTS64
-//sysnb	Getpgid(pid int) (pgid int, err error)
-
-func Getpgrp() (pid int) {
-	pid, _ = Getpgid(0)
-	return
-}
-
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Gettid() (tid int)
-//sys	Getxattr(path string, attr string, dest []byte) (sz int, err error)
-//sys	InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error)
-//sysnb	InotifyInit1(flags int) (fd int, err error)
-//sysnb	InotifyRmWatch(fd int, watchdesc uint32) (success int, err error)
-//sysnb	Kill(pid int, sig syscall.Signal) (err error)
-//sys	Klogctl(typ int, buf []byte) (n int, err error) = SYS_SYSLOG
-//sys	Listxattr(path string, dest []byte) (sz int, err error)
-//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
-//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT
-//sysnb prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) = SYS_PRLIMIT64
-//sys   Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Removexattr(path string, attr string) (err error)
-//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
-//sys	Setdomainname(p []byte) (err error)
-//sys	Sethostname(p []byte) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tv *Timeval) (err error)
-//sys	Setns(fd int, nstype int) (err error)
-
-// issue 1435.
-// On linux Setuid and Setgid only affects the current thread, not the process.
-// This does not match what most callers expect so we must return an error
-// here rather than letting the caller think that the call succeeded.
-
-func Setuid(uid int) (err error) {
-	return EOPNOTSUPP
-}
-
-func Setgid(uid int) (err error) {
-	return EOPNOTSUPP
-}
-
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
-//sys	Sync()
-//sysnb	Sysinfo(info *Sysinfo_t) (err error)
-//sys	Tee(rfd int, wfd int, len int, flags int) (n int64, err error)
-//sysnb	Tgkill(tgid int, tid int, sig syscall.Signal) (err error)
-//sysnb	Times(tms *Tms) (ticks uintptr, err error)
-//sysnb	Umask(mask int) (oldmask int)
-//sysnb	Uname(buf *Utsname) (err error)
-//sys	Unmount(target string, flags int) (err error) = SYS_UMOUNT2
-//sys	Unshare(flags int) (err error)
-//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys	exitThread(code int) (err error) = SYS_EXIT
-//sys	readlen(fd int, p *byte, np int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, p *byte, np int) (n int, err error) = SYS_WRITE
-
-// mmap varies by architecture; see syscall_linux_*.go.
-//sys	munmap(addr uintptr, length uintptr) (err error)
-
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
-//sys	Madvise(b []byte, advice int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Munlockall() (err error)
-
-/*
- * Unimplemented
- */
-// AddKey
-// AfsSyscall
-// Alarm
-// ArchPrctl
-// Brk
-// Capget
-// Capset
-// ClockGetres
-// ClockNanosleep
-// ClockSettime
-// Clone
-// CreateModule
-// DeleteModule
-// EpollCtlOld
-// EpollPwait
-// EpollWaitOld
-// Eventfd
-// Execve
-// Fgetxattr
-// Flistxattr
-// Fork
-// Fremovexattr
-// Fsetxattr
-// Futex
-// GetKernelSyms
-// GetMempolicy
-// GetRobustList
-// GetThreadArea
-// Getitimer
-// Getpmsg
-// IoCancel
-// IoDestroy
-// IoGetevents
-// IoSetup
-// IoSubmit
-// Ioctl
-// IoprioGet
-// IoprioSet
-// KexecLoad
-// Keyctl
-// Lgetxattr
-// Llistxattr
-// LookupDcookie
-// Lremovexattr
-// Lsetxattr
-// Mbind
-// MigratePages
-// Mincore
-// ModifyLdt
-// Mount
-// MovePages
-// Mprotect
-// MqGetsetattr
-// MqNotify
-// MqOpen
-// MqTimedreceive
-// MqTimedsend
-// MqUnlink
-// Mremap
-// Msgctl
-// Msgget
-// Msgrcv
-// Msgsnd
-// Msync
-// Newfstatat
-// Nfsservctl
-// Personality
-// Poll
-// Ppoll
-// Pselect6
-// Ptrace
-// Putpmsg
-// QueryModule
-// Quotactl
-// Readahead
-// Readv
-// RemapFilePages
-// RequestKey
-// RestartSyscall
-// RtSigaction
-// RtSigpending
-// RtSigprocmask
-// RtSigqueueinfo
-// RtSigreturn
-// RtSigsuspend
-// RtSigtimedwait
-// SchedGetPriorityMax
-// SchedGetPriorityMin
-// SchedGetaffinity
-// SchedGetparam
-// SchedGetscheduler
-// SchedRrGetInterval
-// SchedSetaffinity
-// SchedSetparam
-// SchedYield
-// Security
-// Semctl
-// Semget
-// Semop
-// Semtimedop
-// SetMempolicy
-// SetRobustList
-// SetThreadArea
-// SetTidAddress
-// Shmat
-// Shmctl
-// Shmdt
-// Shmget
-// Sigaltstack
-// Signalfd
-// Swapoff
-// Swapon
-// Sysfs
-// TimerCreate
-// TimerDelete
-// TimerGetoverrun
-// TimerGettime
-// TimerSettime
-// Timerfd
-// Tkill (obsolete)
-// Tuxcall
-// Umount2
-// Uselib
-// Utimensat
-// Vfork
-// Vhangup
-// Vmsplice
-// Vserver
-// Waitid
-// _Sysctl
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go
deleted file mode 100644
index bea01cb506..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_386.go
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// TODO(rsc): Rewrite all nn(SP) references into name+(nn-8)(FP)
-// so that go vet can check that they are correct.
-
-// +build 386,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
-}
-
-//sysnb	pipe(p *[2]_C_int) (err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-// 64-bit file system and 32-bit uid calls
-// (386 default is 32-bit file system and 16-bit uid).
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64_64
-//sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
-//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
-//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
-//sysnb	Getegid() (egid int) = SYS_GETEGID32
-//sysnb	Geteuid() (euid int) = SYS_GETEUID32
-//sysnb	Getgid() (gid int) = SYS_GETGID32
-//sysnb	Getuid() (uid int) = SYS_GETUID32
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Ioperm(from int, num int, on int) (err error)
-//sys	Iopl(level int) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
-//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
-//sys	Setfsgid(gid int) (err error) = SYS_SETFSGID32
-//sys	Setfsuid(uid int) (err error) = SYS_SETFSUID32
-//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
-//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
-//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error) = SYS_GETGROUPS32
-//sysnb	setgroups(n int, list *_Gid_t) (err error) = SYS_SETGROUPS32
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
-
-//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Pause() (err error)
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	page := uintptr(offset / 4096)
-	if offset != int64(page)*4096 {
-		return 0, EINVAL
-	}
-	return mmap2(addr, length, prot, flags, fd, page)
-}
-
-type rlimit32 struct {
-	Cur uint32
-	Max uint32
-}
-
-//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_GETRLIMIT
-
-const rlimInf32 = ^uint32(0)
-const rlimInf64 = ^uint64(0)
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, nil, rlim)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	err = getrlimit(resource, &rl)
-	if err != nil {
-		return
-	}
-
-	if rl.Cur == rlimInf32 {
-		rlim.Cur = rlimInf64
-	} else {
-		rlim.Cur = uint64(rl.Cur)
-	}
-
-	if rl.Max == rlimInf32 {
-		rlim.Max = rlimInf64
-	} else {
-		rlim.Max = uint64(rl.Max)
-	}
-	return
-}
-
-//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	if rlim.Cur == rlimInf64 {
-		rl.Cur = rlimInf32
-	} else if rlim.Cur < uint64(rlimInf32) {
-		rl.Cur = uint32(rlim.Cur)
-	} else {
-		return EINVAL
-	}
-	if rlim.Max == rlimInf64 {
-		rl.Max = rlimInf32
-	} else if rlim.Max < uint64(rlimInf32) {
-		rl.Max = uint32(rlim.Max)
-	} else {
-		return EINVAL
-	}
-
-	return setrlimit(resource, &rl)
-}
-
-// Underlying system call writes to newoffset via pointer.
-// Implemented in assembly to avoid allocation.
-func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	newoffset, errno := seek(fd, offset, whence)
-	if errno != 0 {
-		return 0, errno
-	}
-	return newoffset, nil
-}
-
-// Vsyscalls on amd64.
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Time(t *Time_t) (tt Time_t, err error)
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-// On x86 Linux, all the socket calls go through an extra indirection,
-// I think because the 5-register system call interface can't handle
-// the 6-argument calls like sendto and recvfrom.  Instead the
-// arguments to the underlying system call are the number below
-// and a pointer to an array of uintptr.  We hide the pointer in the
-// socketcall assembly to avoid allocation on every system call.
-
-const (
-	// see linux/net.h
-	_SOCKET      = 1
-	_BIND        = 2
-	_CONNECT     = 3
-	_LISTEN      = 4
-	_ACCEPT      = 5
-	_GETSOCKNAME = 6
-	_GETPEERNAME = 7
-	_SOCKETPAIR  = 8
-	_SEND        = 9
-	_RECV        = 10
-	_SENDTO      = 11
-	_RECVFROM    = 12
-	_SHUTDOWN    = 13
-	_SETSOCKOPT  = 14
-	_GETSOCKOPT  = 15
-	_SENDMSG     = 16
-	_RECVMSG     = 17
-	_ACCEPT4     = 18
-	_RECVMMSG    = 19
-	_SENDMMSG    = 20
-)
-
-func socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, err syscall.Errno)
-func rawsocketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, err syscall.Errno)
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	fd, e := socketcall(_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	fd, e := socketcall(_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, e := rawsocketcall(_GETSOCKNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, e := rawsocketcall(_GETPEERNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func socketpair(domain int, typ int, flags int, fd *[2]int32) (err error) {
-	_, e := rawsocketcall(_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, e := socketcall(_BIND, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, e := socketcall(_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	fd, e := rawsocketcall(_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, e := socketcall(_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, e := socketcall(_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), vallen, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var base uintptr
-	if len(p) > 0 {
-		base = uintptr(unsafe.Pointer(&p[0]))
-	}
-	n, e := socketcall(_RECVFROM, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func sendto(s int, p []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var base uintptr
-	if len(p) > 0 {
-		base = uintptr(unsafe.Pointer(&p[0]))
-	}
-	_, e := socketcall(_SENDTO, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	n, e := socketcall(_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	n, e := socketcall(_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Listen(s int, n int) (err error) {
-	_, e := socketcall(_LISTEN, uintptr(s), uintptr(n), 0, 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Shutdown(s, how int) (err error) {
-	_, e := socketcall(_SHUTDOWN, uintptr(s), uintptr(how), 0, 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(pathp)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func (r *PtraceRegs) PC() uint64 { return uint64(uint32(r.Eip)) }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Eip = int32(pc) }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go
deleted file mode 100644
index 721f24b68d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_amd64.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,linux
-
-package unix
-
-import "syscall"
-
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Getuid() (uid int)
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Ioperm(from int, num int, on int) (err error)
-//sys	Iopl(level int) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Listen(s int, n int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-//go:noescape
-func gettimeofday(tv *Timeval) (err syscall.Errno)
-
-func Gettimeofday(tv *Timeval) (err error) {
-	errno := gettimeofday(tv)
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
-
-func Getpagesize() int { return 4096 }
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	var tv Timeval
-	errno := gettimeofday(&tv)
-	if errno != 0 {
-		return 0, errno
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-//sysnb	pipe(p *[2]_C_int) (err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Rip }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Rip = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go
deleted file mode 100644
index 122df649af..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm.go
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
-}
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-// Underlying system call writes to newoffset via pointer.
-// Implemented in assembly to avoid allocation.
-func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	newoffset, errno := seek(fd, offset, whence)
-	if errno != 0 {
-		return 0, errno
-	}
-	return newoffset, nil
-}
-
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error) = SYS_GETGROUPS32
-//sysnb	setgroups(n int, list *_Gid_t) (err error) = SYS_SETGROUPS32
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	socketpair(domain int, typ int, flags int, fd *[2]int32) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-
-// 64-bit file system and 32-bit uid calls
-// (16-bit uid calls are not always supported in newer kernels)
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
-//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
-//sysnb	Getegid() (egid int) = SYS_GETEGID32
-//sysnb	Geteuid() (euid int) = SYS_GETEUID32
-//sysnb	Getgid() (gid int) = SYS_GETGID32
-//sysnb	Getuid() (uid int) = SYS_GETUID32
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
-//sys	Listen(s int, n int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
-//sys	Setfsgid(gid int) (err error) = SYS_SETFSGID32
-//sys	Setfsuid(uid int) (err error) = SYS_SETFSUID32
-//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
-//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
-//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
-
-// Vsyscalls on amd64.
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Pause() (err error)
-
-func Time(t *Time_t) (Time_t, error) {
-	var tv Timeval
-	err := Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-func Utime(path string, buf *Utimbuf) error {
-	tv := []Timeval{
-		{Sec: buf.Actime},
-		{Sec: buf.Modtime},
-	}
-	return Utimes(path, tv)
-}
-
-//sys   Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys   Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
-//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_ARM_FADVISE64_64, uintptr(fd), uintptr(advice), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(pathp)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	page := uintptr(offset / 4096)
-	if offset != int64(page)*4096 {
-		return 0, EINVAL
-	}
-	return mmap2(addr, length, prot, flags, fd, page)
-}
-
-type rlimit32 struct {
-	Cur uint32
-	Max uint32
-}
-
-//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_UGETRLIMIT
-
-const rlimInf32 = ^uint32(0)
-const rlimInf64 = ^uint64(0)
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, nil, rlim)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	err = getrlimit(resource, &rl)
-	if err != nil {
-		return
-	}
-
-	if rl.Cur == rlimInf32 {
-		rlim.Cur = rlimInf64
-	} else {
-		rlim.Cur = uint64(rl.Cur)
-	}
-
-	if rl.Max == rlimInf32 {
-		rlim.Max = rlimInf64
-	} else {
-		rlim.Max = uint64(rl.Max)
-	}
-	return
-}
-
-//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	if rlim.Cur == rlimInf64 {
-		rl.Cur = rlimInf32
-	} else if rlim.Cur < uint64(rlimInf32) {
-		rl.Cur = uint32(rlim.Cur)
-	} else {
-		return EINVAL
-	}
-	if rlim.Max == rlimInf64 {
-		rl.Max = rlimInf32
-	} else if rlim.Max < uint64(rlimInf32) {
-		rl.Max = uint32(rlim.Max)
-	} else {
-		return EINVAL
-	}
-
-	return setrlimit(resource, &rl)
-}
-
-func (r *PtraceRegs) PC() uint64 { return uint64(r.Uregs[15]) }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Uregs[15] = uint32(pc) }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go
deleted file mode 100644
index d105186803..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_arm64.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm64,linux
-
-package unix
-
-const _SYS_dup = SYS_DUP3
-
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Listen(s int, n int) (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-
-func Stat(path string, stat *Stat_t) (err error) {
-	return Fstatat(AT_FDCWD, path, stat, 0)
-}
-
-func Lchown(path string, uid int, gid int) (err error) {
-	return Fchownat(AT_FDCWD, path, uid, gid, AT_SYMLINK_NOFOLLOW)
-}
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	return Fstatat(AT_FDCWD, path, stat, AT_SYMLINK_NOFOLLOW)
-}
-
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-func Getpagesize() int { return 65536 }
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-func Time(t *Time_t) (Time_t, error) {
-	var tv Timeval
-	err := Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-func Utime(path string, buf *Utimbuf) error {
-	tv := []Timeval{
-		{Sec: buf.Actime},
-		{Sec: buf.Modtime},
-	}
-	return Utimes(path, tv)
-}
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Pc }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Pc = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-func InotifyInit() (fd int, err error) {
-	return InotifyInit1(0)
-}
-
-func Dup2(oldfd int, newfd int) (err error) {
-	return Dup3(oldfd, newfd, 0)
-}
-
-func Pause() (err error) {
-	_, _, e1 := Syscall6(SYS_PPOLL, 0, 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// TODO(dfc): constants that should be in zsysnum_linux_arm64.go, remove
-// these when the deprecated syscalls that the syscall package relies on
-// are removed.
-const (
-	SYS_GETPGRP      = 1060
-	SYS_UTIMES       = 1037
-	SYS_FUTIMESAT    = 1066
-	SYS_PAUSE        = 1061
-	SYS_USTAT        = 1070
-	SYS_UTIME        = 1063
-	SYS_LCHOWN       = 1032
-	SYS_TIME         = 1062
-	SYS_EPOLL_CREATE = 1042
-	SYS_EPOLL_WAIT   = 1069
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_mips64x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_mips64x.go
deleted file mode 100644
index bb15ba3e68..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_mips64x.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build mips64 mips64le
-
-package unix
-
-// Linux introduced getdents64 syscall for N64 ABI only in 3.10
-// (May 21 2013, rev dec33abaafc89bcbd78f85fad0513170415a26d5),
-// to support older kernels, we have to use getdents for mips64.
-// Also note that struct dirent is different for these two.
-// Lookup linux_dirent{,64} in kernel source code for details.
-const _SYS_getdents = SYS_GETDENTS
-
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Listen(s int, n int) (err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-func Getpagesize() int { return 65536 }
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	var tv Timeval
-	err = Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func Ioperm(from int, num int, on int) (err error) {
-	return ENOSYS
-}
-
-func Iopl(level int) (err error) {
-	return ENOSYS
-}
-
-type stat_t struct {
-	Dev        uint32
-	Pad0       [3]int32
-	Ino        uint64
-	Mode       uint32
-	Nlink      uint32
-	Uid        uint32
-	Gid        uint32
-	Rdev       uint32
-	Pad1       [3]uint32
-	Size       int64
-	Atime      uint32
-	Atime_nsec uint32
-	Mtime      uint32
-	Mtime_nsec uint32
-	Ctime      uint32
-	Ctime_nsec uint32
-	Blksize    uint32
-	Pad2       uint32
-	Blocks     int64
-}
-
-//sys	fstat(fd int, st *stat_t) (err error)
-//sys	lstat(path string, st *stat_t) (err error)
-//sys	stat(path string, st *stat_t) (err error)
-
-func Fstat(fd int, s *Stat_t) (err error) {
-	st := &stat_t{}
-	err = fstat(fd, st)
-	fillStat_t(s, st)
-	return
-}
-
-func Lstat(path string, s *Stat_t) (err error) {
-	st := &stat_t{}
-	err = lstat(path, st)
-	fillStat_t(s, st)
-	return
-}
-
-func Stat(path string, s *Stat_t) (err error) {
-	st := &stat_t{}
-	err = stat(path, st)
-	fillStat_t(s, st)
-	return
-}
-
-func fillStat_t(s *Stat_t, st *stat_t) {
-	s.Dev = st.Dev
-	s.Ino = st.Ino
-	s.Mode = st.Mode
-	s.Nlink = st.Nlink
-	s.Uid = st.Uid
-	s.Gid = st.Gid
-	s.Rdev = st.Rdev
-	s.Size = st.Size
-	s.Atim = Timespec{int64(st.Atime), int64(st.Atime_nsec)}
-	s.Mtim = Timespec{int64(st.Mtime), int64(st.Mtime_nsec)}
-	s.Ctim = Timespec{int64(st.Ctime), int64(st.Ctime_nsec)}
-	s.Blksize = st.Blksize
-	s.Blocks = st.Blocks
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Regs[64] }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Regs[64] = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go
deleted file mode 100644
index acd2e1c789..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_ppc64x.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build ppc64 ppc64le
-
-package unix
-
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error) = SYS_UGETRLIMIT
-//sysnb	Getuid() (uid int)
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Ioperm(from int, num int, on int) (err error)
-//sys	Iopl(level int) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Listen(s int, n int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error) = SYS_SYNC_FILE_RANGE2
-//sys	Truncate(path string, length int64) (err error)
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-func Getpagesize() int { return 65536 }
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Time(t *Time_t) (tt Time_t, err error)
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Nip }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Nip = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-//sysnb pipe(p *[2]_C_int) (err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_s390x.go
deleted file mode 100644
index 3f98904e3c..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_linux_s390x.go
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build s390x,linux
-
-package unix
-
-import (
-	"unsafe"
-)
-
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Getuid() (uid int)
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-
-func Getpagesize() int { return 4096 }
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	var tv Timeval
-	err = Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0) // pipe2 is the same as pipe when flags are set to 0.
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func Ioperm(from int, num int, on int) (err error) {
-	return ENOSYS
-}
-
-func Iopl(level int) (err error) {
-	return ENOSYS
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Psw.Addr }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Psw.Addr = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-// Linux on s390x uses the old mmap interface, which requires arguments to be passed in a struct.
-// mmap2 also requires arguments to be passed in a struct; it is currently not exposed in <asm/unistd.h>.
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	mmap_args := [6]uintptr{addr, length, uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset)}
-	r0, _, e1 := Syscall(SYS_MMAP, uintptr(unsafe.Pointer(&mmap_args[0])), 0, 0)
-	use(unsafe.Pointer(&mmap_args[0]))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// On s390x Linux, all the socket calls go through an extra indirection.
-// The arguments to the underlying system call (SYS_SOCKETCALL) are the
-// number below and a pointer to an array of uintptr.
-const (
-	// see linux/net.h
-	netSocket      = 1
-	netBind        = 2
-	netConnect     = 3
-	netListen      = 4
-	netAccept      = 5
-	netGetSockName = 6
-	netGetPeerName = 7
-	netSocketPair  = 8
-	netSend        = 9
-	netRecv        = 10
-	netSendTo      = 11
-	netRecvFrom    = 12
-	netShutdown    = 13
-	netSetSockOpt  = 14
-	netGetSockOpt  = 15
-	netSendMsg     = 16
-	netRecvMsg     = 17
-	netAccept4     = 18
-	netRecvMMsg    = 19
-	netSendMMsg    = 20
-)
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (int, error) {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
-	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(fd), nil
-}
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (int, error) {
-	args := [4]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags)}
-	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept4, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(fd), nil
-}
-
-func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
-	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetSockName, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
-	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetPeerName, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func socketpair(domain int, typ int, flags int, fd *[2]int32) error {
-	args := [4]uintptr{uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd))}
-	_, _, err := RawSyscall(SYS_SOCKETCALL, netSocketPair, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) error {
-	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netBind, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) error {
-	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netConnect, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func socket(domain int, typ int, proto int) (int, error) {
-	args := [3]uintptr{uintptr(domain), uintptr(typ), uintptr(proto)}
-	fd, _, err := RawSyscall(SYS_SOCKETCALL, netSocket, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(fd), nil
-}
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) error {
-	args := [5]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen))}
-	_, _, err := Syscall(SYS_SOCKETCALL, netGetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) error {
-	args := [4]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netSetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (int, error) {
-	var base uintptr
-	if len(p) > 0 {
-		base = uintptr(unsafe.Pointer(&p[0]))
-	}
-	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen))}
-	n, _, err := Syscall(SYS_SOCKETCALL, netRecvFrom, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(n), nil
-}
-
-func sendto(s int, p []byte, flags int, to unsafe.Pointer, addrlen _Socklen) error {
-	var base uintptr
-	if len(p) > 0 {
-		base = uintptr(unsafe.Pointer(&p[0]))
-	}
-	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(to), uintptr(addrlen)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netSendTo, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func recvmsg(s int, msg *Msghdr, flags int) (int, error) {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
-	n, _, err := Syscall(SYS_SOCKETCALL, netRecvMsg, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(n), nil
-}
-
-func sendmsg(s int, msg *Msghdr, flags int) (int, error) {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
-	n, _, err := Syscall(SYS_SOCKETCALL, netSendMsg, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(n), nil
-}
-
-func Listen(s int, n int) error {
-	args := [2]uintptr{uintptr(s), uintptr(n)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netListen, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func Shutdown(s, how int) error {
-	args := [2]uintptr{uintptr(s), uintptr(how)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netShutdown, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd.go
deleted file mode 100644
index c4e945cd69..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd.go
+++ /dev/null
@@ -1,492 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// NetBSD system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-	raw    RawSockaddrDatalink
-}
-
-func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-func sysctlNodes(mib []_C_int) (nodes []Sysctlnode, err error) {
-	var olen uintptr
-
-	// Get a list of all sysctl nodes below the given MIB by performing
-	// a sysctl for the given MIB with CTL_QUERY appended.
-	mib = append(mib, CTL_QUERY)
-	qnode := Sysctlnode{Flags: SYSCTL_VERS_1}
-	qp := (*byte)(unsafe.Pointer(&qnode))
-	sz := unsafe.Sizeof(qnode)
-	if err = sysctl(mib, nil, &olen, qp, sz); err != nil {
-		return nil, err
-	}
-
-	// Now that we know the size, get the actual nodes.
-	nodes = make([]Sysctlnode, olen/sz)
-	np := (*byte)(unsafe.Pointer(&nodes[0]))
-	if err = sysctl(mib, np, &olen, qp, sz); err != nil {
-		return nil, err
-	}
-
-	return nodes, nil
-}
-
-func nametomib(name string) (mib []_C_int, err error) {
-
-	// Split name into components.
-	var parts []string
-	last := 0
-	for i := 0; i < len(name); i++ {
-		if name[i] == '.' {
-			parts = append(parts, name[last:i])
-			last = i + 1
-		}
-	}
-	parts = append(parts, name[last:])
-
-	// Discover the nodes and construct the MIB OID.
-	for partno, part := range parts {
-		nodes, err := sysctlNodes(mib)
-		if err != nil {
-			return nil, err
-		}
-		for _, node := range nodes {
-			n := make([]byte, 0)
-			for i := range node.Name {
-				if node.Name[i] != 0 {
-					n = append(n, byte(node.Name[i]))
-				}
-			}
-			if string(n) == part {
-				mib = append(mib, _C_int(node.Num))
-				break
-			}
-		}
-		if len(mib) != partno+1 {
-			return nil, EINVAL
-		}
-	}
-
-	return mib, nil
-}
-
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names. It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Fileno == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
-//sysnb pipe() (fd1 int, fd2 int, err error)
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	p[0], p[1], err = pipe()
-	return
-}
-
-//sys getdents(fd int, buf []byte) (n int, err error)
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	return getdents(fd, buf)
-}
-
-// TODO
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	return -1, ENOSYS
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Issetugid() (tainted bool)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-
-/*
- * Unimplemented
- */
-// ____semctl13
-// __clone
-// __fhopen40
-// __fhstat40
-// __fhstatvfs140
-// __fstat30
-// __getcwd
-// __getfh30
-// __getlogin
-// __lstat30
-// __mount50
-// __msgctl13
-// __msync13
-// __ntp_gettime30
-// __posix_chown
-// __posix_fadvise50
-// __posix_fchown
-// __posix_lchown
-// __posix_rename
-// __setlogin
-// __shmctl13
-// __sigaction_sigtramp
-// __sigaltstack14
-// __sigpending14
-// __sigprocmask14
-// __sigsuspend14
-// __sigtimedwait
-// __stat30
-// __syscall
-// __vfork14
-// _ksem_close
-// _ksem_destroy
-// _ksem_getvalue
-// _ksem_init
-// _ksem_open
-// _ksem_post
-// _ksem_trywait
-// _ksem_unlink
-// _ksem_wait
-// _lwp_continue
-// _lwp_create
-// _lwp_ctl
-// _lwp_detach
-// _lwp_exit
-// _lwp_getname
-// _lwp_getprivate
-// _lwp_kill
-// _lwp_park
-// _lwp_self
-// _lwp_setname
-// _lwp_setprivate
-// _lwp_suspend
-// _lwp_unpark
-// _lwp_unpark_all
-// _lwp_wait
-// _lwp_wakeup
-// _pset_bind
-// _sched_getaffinity
-// _sched_getparam
-// _sched_setaffinity
-// _sched_setparam
-// acct
-// aio_cancel
-// aio_error
-// aio_fsync
-// aio_read
-// aio_return
-// aio_suspend
-// aio_write
-// break
-// clock_getres
-// clock_gettime
-// clock_settime
-// compat_09_ogetdomainname
-// compat_09_osetdomainname
-// compat_09_ouname
-// compat_10_omsgsys
-// compat_10_osemsys
-// compat_10_oshmsys
-// compat_12_fstat12
-// compat_12_getdirentries
-// compat_12_lstat12
-// compat_12_msync
-// compat_12_oreboot
-// compat_12_oswapon
-// compat_12_stat12
-// compat_13_sigaction13
-// compat_13_sigaltstack13
-// compat_13_sigpending13
-// compat_13_sigprocmask13
-// compat_13_sigreturn13
-// compat_13_sigsuspend13
-// compat_14___semctl
-// compat_14_msgctl
-// compat_14_shmctl
-// compat_16___sigaction14
-// compat_16___sigreturn14
-// compat_20_fhstatfs
-// compat_20_fstatfs
-// compat_20_getfsstat
-// compat_20_statfs
-// compat_30___fhstat30
-// compat_30___fstat13
-// compat_30___lstat13
-// compat_30___stat13
-// compat_30_fhopen
-// compat_30_fhstat
-// compat_30_fhstatvfs1
-// compat_30_getdents
-// compat_30_getfh
-// compat_30_ntp_gettime
-// compat_30_socket
-// compat_40_mount
-// compat_43_fstat43
-// compat_43_lstat43
-// compat_43_oaccept
-// compat_43_ocreat
-// compat_43_oftruncate
-// compat_43_ogetdirentries
-// compat_43_ogetdtablesize
-// compat_43_ogethostid
-// compat_43_ogethostname
-// compat_43_ogetkerninfo
-// compat_43_ogetpagesize
-// compat_43_ogetpeername
-// compat_43_ogetrlimit
-// compat_43_ogetsockname
-// compat_43_okillpg
-// compat_43_olseek
-// compat_43_ommap
-// compat_43_oquota
-// compat_43_orecv
-// compat_43_orecvfrom
-// compat_43_orecvmsg
-// compat_43_osend
-// compat_43_osendmsg
-// compat_43_osethostid
-// compat_43_osethostname
-// compat_43_osetrlimit
-// compat_43_osigblock
-// compat_43_osigsetmask
-// compat_43_osigstack
-// compat_43_osigvec
-// compat_43_otruncate
-// compat_43_owait
-// compat_43_stat43
-// execve
-// extattr_delete_fd
-// extattr_delete_file
-// extattr_delete_link
-// extattr_get_fd
-// extattr_get_file
-// extattr_get_link
-// extattr_list_fd
-// extattr_list_file
-// extattr_list_link
-// extattr_set_fd
-// extattr_set_file
-// extattr_set_link
-// extattrctl
-// fchroot
-// fdatasync
-// fgetxattr
-// fktrace
-// flistxattr
-// fork
-// fremovexattr
-// fsetxattr
-// fstatvfs1
-// fsync_range
-// getcontext
-// getitimer
-// getvfsstat
-// getxattr
-// ioctl
-// ktrace
-// lchflags
-// lchmod
-// lfs_bmapv
-// lfs_markv
-// lfs_segclean
-// lfs_segwait
-// lgetxattr
-// lio_listio
-// listxattr
-// llistxattr
-// lremovexattr
-// lseek
-// lsetxattr
-// lutimes
-// madvise
-// mincore
-// minherit
-// modctl
-// mq_close
-// mq_getattr
-// mq_notify
-// mq_open
-// mq_receive
-// mq_send
-// mq_setattr
-// mq_timedreceive
-// mq_timedsend
-// mq_unlink
-// mremap
-// msgget
-// msgrcv
-// msgsnd
-// nfssvc
-// ntp_adjtime
-// pmc_control
-// pmc_get_info
-// poll
-// pollts
-// preadv
-// profil
-// pselect
-// pset_assign
-// pset_create
-// pset_destroy
-// ptrace
-// pwritev
-// quotactl
-// rasctl
-// readv
-// reboot
-// removexattr
-// sa_enable
-// sa_preempt
-// sa_register
-// sa_setconcurrency
-// sa_stacks
-// sa_yield
-// sbrk
-// sched_yield
-// semconfig
-// semget
-// semop
-// setcontext
-// setitimer
-// setxattr
-// shmat
-// shmdt
-// shmget
-// sstk
-// statvfs1
-// swapctl
-// sysarch
-// syscall
-// timer_create
-// timer_delete
-// timer_getoverrun
-// timer_gettime
-// timer_settime
-// undelete
-// utrace
-// uuidgen
-// vadvise
-// vfork
-// writev
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go
deleted file mode 100644
index afaca09838..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_386.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,netbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = uint32(mode)
-	k.Flags = uint32(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go
deleted file mode 100644
index a6ff04ce5b..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_amd64.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,netbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int64(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = uint32(mode)
-	k.Flags = uint32(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go
deleted file mode 100644
index 68a6969b28..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_netbsd_arm.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm,netbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = uint32(mode)
-	k.Flags = uint32(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_no_getwd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_no_getwd.go
deleted file mode 100644
index 530792ea93..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_no_getwd.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build dragonfly freebsd netbsd openbsd
-
-package unix
-
-const ImplementsGetwd = false
-
-func Getwd() (string, error) { return "", ENOTSUP }
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd.go
deleted file mode 100644
index 246131d2af..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd.go
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// OpenBSD system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [24]int8
-	raw    RawSockaddrDatalink
-}
-
-func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-func nametomib(name string) (mib []_C_int, err error) {
-
-	// Perform lookup via a binary search
-	left := 0
-	right := len(sysctlMib) - 1
-	for {
-		idx := left + (right-left)/2
-		switch {
-		case name == sysctlMib[idx].ctlname:
-			return sysctlMib[idx].ctloid, nil
-		case name > sysctlMib[idx].ctlname:
-			left = idx + 1
-		default:
-			right = idx - 1
-		}
-		if left > right {
-			break
-		}
-	}
-	return nil, EINVAL
-}
-
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names. It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Fileno == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
-//sysnb pipe(p *[2]_C_int) (err error)
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sys getdents(fd int, buf []byte) (n int, err error)
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	return getdents(fd, buf)
-}
-
-// TODO
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	return -1, ENOSYS
-}
-
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Issetugid() (tainted bool)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Setlogin(name string) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, stat *Statfs_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-
-/*
- * Unimplemented
- */
-// __getcwd
-// __semctl
-// __syscall
-// __sysctl
-// adjfreq
-// break
-// clock_getres
-// clock_gettime
-// clock_settime
-// closefrom
-// execve
-// faccessat
-// fchmodat
-// fchownat
-// fcntl
-// fhopen
-// fhstat
-// fhstatfs
-// fork
-// fstatat
-// futimens
-// getfh
-// getgid
-// getitimer
-// getlogin
-// getresgid
-// getresuid
-// getrtable
-// getthrid
-// ioctl
-// ktrace
-// lfs_bmapv
-// lfs_markv
-// lfs_segclean
-// lfs_segwait
-// linkat
-// mincore
-// minherit
-// mkdirat
-// mkfifoat
-// mknodat
-// mount
-// mquery
-// msgctl
-// msgget
-// msgrcv
-// msgsnd
-// nfssvc
-// nnpfspioctl
-// openat
-// poll
-// preadv
-// profil
-// pwritev
-// quotactl
-// readlinkat
-// readv
-// reboot
-// renameat
-// rfork
-// sched_yield
-// semget
-// semop
-// setgroups
-// setitimer
-// setrtable
-// setsockopt
-// shmat
-// shmctl
-// shmdt
-// shmget
-// sigaction
-// sigaltstack
-// sigpending
-// sigprocmask
-// sigreturn
-// sigsuspend
-// symlinkat
-// sysarch
-// syscall
-// threxit
-// thrsigdivert
-// thrsleep
-// thrwakeup
-// unlinkat
-// utimensat
-// vfork
-// writev
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go
deleted file mode 100644
index a66ddc59ce..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_386.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,openbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go
deleted file mode 100644
index 0776c1faf9..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_openbsd_amd64.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,openbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = nsec / 1e9
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go
deleted file mode 100644
index eb489b159f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris.go
+++ /dev/null
@@ -1,713 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Solaris system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_solaris.go or syscall_unix.go.
-
-package unix
-
-import (
-	"sync/atomic"
-	"syscall"
-	"unsafe"
-)
-
-// Implemented in runtime/syscall_solaris.go.
-type syscallFunc uintptr
-
-func rawSysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-type SockaddrDatalink struct {
-	Family uint16
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [244]int8
-	raw    RawSockaddrDatalink
-}
-
-func clen(n []byte) int {
-	for i := 0; i < len(n); i++ {
-		if n[i] == 0 {
-			return i
-		}
-	}
-	return len(n)
-}
-
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names.  It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Ino == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:clen(bytes[:])])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
-func pipe() (r uintptr, w uintptr, err uintptr)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	r0, w0, e1 := pipe()
-	if e1 != 0 {
-		err = syscall.Errno(e1)
-	}
-	p[0], p[1] = int(r0), int(w0)
-	return
-}
-
-func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_INET
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
-}
-
-func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_INET6
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	sa.raw.Scope_id = sa.ZoneId
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
-}
-
-func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	name := sa.Name
-	n := len(name)
-	if n >= len(sa.raw.Path) {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_UNIX
-	for i := 0; i < n; i++ {
-		sa.raw.Path[i] = int8(name[i])
-	}
-	// length is family (uint16), name, NUL.
-	sl := _Socklen(2)
-	if n > 0 {
-		sl += _Socklen(n) + 1
-	}
-	if sa.raw.Path[0] == '@' {
-		sa.raw.Path[0] = 0
-		// Don't count trailing NUL for abstract address.
-		sl--
-	}
-
-	return unsafe.Pointer(&sa.raw), sl, nil
-}
-
-//sys	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getsockname
-
-func Getsockname(fd int) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if err = getsockname(fd, &rsa, &len); err != nil {
-		return
-	}
-	return anyToSockaddr(&rsa)
-}
-
-const ImplementsGetwd = true
-
-//sys	Getcwd(buf []byte) (n int, err error)
-
-func Getwd() (wd string, err error) {
-	var buf [PathMax]byte
-	// Getcwd will return an error if it failed for any reason.
-	_, err = Getcwd(buf[0:])
-	if err != nil {
-		return "", err
-	}
-	n := clen(buf[:])
-	if n < 1 {
-		return "", EINVAL
-	}
-	return string(buf[:n]), nil
-}
-
-/*
- * Wrapped
- */
-
-//sysnb	getgroups(ngid int, gid *_Gid_t) (n int, err error)
-//sysnb	setgroups(ngid int, gid *_Gid_t) (err error)
-
-func Getgroups() (gids []int, err error) {
-	n, err := getgroups(0, nil)
-	// Check for error and sanity check group count.  Newer versions of
-	// Solaris allow up to 1024 (NGROUPS_MAX).
-	if n < 0 || n > 1024 {
-		if err != nil {
-			return nil, err
-		}
-		return nil, EINVAL
-	} else if n == 0 {
-		return nil, nil
-	}
-
-	a := make([]_Gid_t, n)
-	n, err = getgroups(n, &a[0])
-	if n == -1 {
-		return nil, err
-	}
-	gids = make([]int, n)
-	for i, v := range a[0:n] {
-		gids[i] = int(v)
-	}
-	return
-}
-
-func Setgroups(gids []int) (err error) {
-	if len(gids) == 0 {
-		return setgroups(0, nil)
-	}
-
-	a := make([]_Gid_t, len(gids))
-	for i, v := range gids {
-		a[i] = _Gid_t(v)
-	}
-	return setgroups(len(a), &a[0])
-}
-
-func ReadDirent(fd int, buf []byte) (n int, err error) {
-	// Final argument is (basep *uintptr) and the syscall doesn't take nil.
-	// TODO(rsc): Can we use a single global basep for all calls?
-	return Getdents(fd, buf, new(uintptr))
-}
-
-// Wait status is 7 bits at bottom, either 0 (exited),
-// 0x7F (stopped), or a signal number that caused an exit.
-// The 0x80 bit is whether there was a core dump.
-// An extra number (exit code, signal causing a stop)
-// is in the high bits.
-
-type WaitStatus uint32
-
-const (
-	mask  = 0x7F
-	core  = 0x80
-	shift = 8
-
-	exited  = 0
-	stopped = 0x7F
-)
-
-func (w WaitStatus) Exited() bool { return w&mask == exited }
-
-func (w WaitStatus) ExitStatus() int {
-	if w&mask != exited {
-		return -1
-	}
-	return int(w >> shift)
-}
-
-func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
-
-func (w WaitStatus) Signal() syscall.Signal {
-	sig := syscall.Signal(w & mask)
-	if sig == stopped || sig == 0 {
-		return -1
-	}
-	return sig
-}
-
-func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
-
-func (w WaitStatus) Stopped() bool { return w&mask == stopped && syscall.Signal(w>>shift) != SIGSTOP }
-
-func (w WaitStatus) Continued() bool { return w&mask == stopped && syscall.Signal(w>>shift) == SIGSTOP }
-
-func (w WaitStatus) StopSignal() syscall.Signal {
-	if !w.Stopped() {
-		return -1
-	}
-	return syscall.Signal(w>>shift) & 0xFF
-}
-
-func (w WaitStatus) TrapCause() int { return -1 }
-
-func wait4(pid uintptr, wstatus *WaitStatus, options uintptr, rusage *Rusage) (wpid uintptr, err uintptr)
-
-func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
-	r0, e1 := wait4(uintptr(pid), wstatus, uintptr(options), rusage)
-	if e1 != 0 {
-		err = syscall.Errno(e1)
-	}
-	return int(r0), err
-}
-
-func gethostname() (name string, err uintptr)
-
-func Gethostname() (name string, err error) {
-	name, e1 := gethostname()
-	if e1 != 0 {
-		err = syscall.Errno(e1)
-	}
-	return name, err
-}
-
-//sys	utimes(path string, times *[2]Timeval) (err error)
-
-func Utimes(path string, tv []Timeval) (err error) {
-	if tv == nil {
-		return utimes(path, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-//sys	utimensat(fd int, path string, times *[2]Timespec, flag int) (err error)
-
-func UtimesNano(path string, ts []Timespec) error {
-	if ts == nil {
-		return utimensat(AT_FDCWD, path, nil, 0)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
-}
-
-func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
-	if ts == nil {
-		return utimensat(dirfd, path, nil, flags)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
-}
-
-//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
-
-// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
-func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(unsafe.Pointer(lk)), 0, 0, 0)
-	if e1 != 0 {
-		return e1
-	}
-	return nil
-}
-
-//sys	futimesat(fildes int, path *byte, times *[2]Timeval) (err error)
-
-func Futimesat(dirfd int, path string, tv []Timeval) error {
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	if tv == nil {
-		return futimesat(dirfd, pathp, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-// Solaris doesn't have an futimes function because it allows NULL to be
-// specified as the path for futimesat.  However, Go doesn't like
-// NULL-style string interfaces, so this simple wrapper is provided.
-func Futimes(fd int, tv []Timeval) error {
-	if tv == nil {
-		return futimesat(fd, nil, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return futimesat(fd, nil, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
-	switch rsa.Addr.Family {
-	case AF_UNIX:
-		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
-		sa := new(SockaddrUnix)
-		// Assume path ends at NUL.
-		// This is not technically the Solaris semantics for
-		// abstract Unix domain sockets -- they are supposed
-		// to be uninterpreted fixed-size binary blobs -- but
-		// everyone uses this convention.
-		n := 0
-		for n < len(pp.Path) && pp.Path[n] != 0 {
-			n++
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
-		return sa, nil
-
-	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet4)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet6)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.ZoneId = pp.Scope_id
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-	}
-	return nil, EAFNOSUPPORT
-}
-
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) = libsocket.accept
-
-func Accept(fd int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept(fd, &rsa, &len)
-	if nfd == -1 {
-		return
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.recvmsg
-
-func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
-	var msg Msghdr
-	var rsa RawSockaddrAny
-	msg.Name = (*byte)(unsafe.Pointer(&rsa))
-	msg.Namelen = uint32(SizeofSockaddrAny)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy int8
-	if len(oob) > 0 {
-		// receive at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Accrights = (*int8)(unsafe.Pointer(&oob[0]))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = recvmsg(fd, &msg, flags); n == -1 {
-		return
-	}
-	oobn = int(msg.Accrightslen)
-	// source address is only specified if the socket is unconnected
-	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
-	}
-	return
-}
-
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-	_, err = SendmsgN(fd, p, oob, to, flags)
-	return
-}
-
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.sendmsg
-
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-	var ptr unsafe.Pointer
-	var salen _Socklen
-	if to != nil {
-		ptr, salen, err = to.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-	}
-	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(ptr))
-	msg.Namelen = uint32(salen)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy int8
-	if len(oob) > 0 {
-		// send at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Accrights = (*int8)(unsafe.Pointer(&oob[0]))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = sendmsg(fd, &msg, flags); err != nil {
-		return 0, err
-	}
-	if len(oob) > 0 && len(p) == 0 {
-		n = 0
-	}
-	return n, nil
-}
-
-//sys	acct(path *byte) (err error)
-
-func Acct(path string) (err error) {
-	if len(path) == 0 {
-		// Assume caller wants to disable accounting.
-		return acct(nil)
-	}
-
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	return acct(pathp)
-}
-
-/*
- * Expose the ioctl function
- */
-
-//sys	ioctl(fd int, req int, arg uintptr) (err error)
-
-func IoctlSetInt(fd int, req int, value int) (err error) {
-	return ioctl(fd, req, uintptr(value))
-}
-
-func IoctlSetWinsize(fd int, req int, value *Winsize) (err error) {
-	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-}
-
-func IoctlSetTermios(fd int, req int, value *Termios) (err error) {
-	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-}
-
-func IoctlSetTermio(fd int, req int, value *Termio) (err error) {
-	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-}
-
-func IoctlGetInt(fd int, req int) (int, error) {
-	var value int
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
-	return value, err
-}
-
-func IoctlGetWinsize(fd int, req int) (*Winsize, error) {
-	var value Winsize
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
-	return &value, err
-}
-
-func IoctlGetTermios(fd int, req int) (*Termios, error) {
-	var value Termios
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
-	return &value, err
-}
-
-func IoctlGetTermio(fd int, req int) (*Termio, error) {
-	var value Termio
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
-	return &value, err
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Creat(path string, mode uint32) (fd int, err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
-//sys	Fdatasync(fd int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Getdents(fd int, buf []byte, basep *uintptr) (n int, err error)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgid int, err error)
-//sys	Geteuid() (euid int)
-//sys	Getegid() (egid int)
-//sys	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (n int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error) = libsocket.listen
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Madvise(b []byte, advice int) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mkfifoat(dirfd int, path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = lseek
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Sethostname(p []byte) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Shutdown(s int, how int) (err error) = libsocket.shutdown
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sysnb	Times(tms *Tms) (ticks uintptr, err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sys	Umask(mask int) (oldmask int)
-//sysnb	Uname(buf *Utsname) (err error)
-//sys	Unmount(target string, flags int) (err error) = libc.umount
-//sys	Unlink(path string) (err error)
-//sys	Unlinkat(dirfd int, path string, flags int) (err error)
-//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
-//sys	Utime(path string, buf *Utimbuf) (err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.bind
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.connect
-//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.sendto
-//sys	socket(domain int, typ int, proto int) (fd int, err error) = libsocket.socket
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) = libsocket.socketpair
-//sys	write(fd int, p []byte) (n int, err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) = libsocket.getsockopt
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getpeername
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) = libsocket.setsockopt
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) = libsocket.recvfrom
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
-//sys	sysconf(name int) (n int64, err error)
-
-// pageSize caches the value of Getpagesize, since it can't change
-// once the system is booted.
-var pageSize int64 // accessed atomically
-
-func Getpagesize() int {
-	n := atomic.LoadInt64(&pageSize)
-	if n == 0 {
-		n, _ = sysconf(_SC_PAGESIZE)
-		atomic.StoreInt64(&pageSize, n)
-	}
-	return int(n)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go
deleted file mode 100644
index 5aff62c3bb..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_solaris_amd64.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,solaris
-
-package unix
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	// TODO(aram): implement this, see issue 5847.
-	panic("unimplemented")
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix.go
deleted file mode 100644
index b46b25028c..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix.go
+++ /dev/null
@@ -1,297 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix
-
-import (
-	"runtime"
-	"sync"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	Stdin  = 0
-	Stdout = 1
-	Stderr = 2
-)
-
-const (
-	darwin64Bit    = runtime.GOOS == "darwin" && sizeofPtr == 8
-	dragonfly64Bit = runtime.GOOS == "dragonfly" && sizeofPtr == 8
-	netbsd32Bit    = runtime.GOOS == "netbsd" && sizeofPtr == 4
-)
-
-// Do the interface allocations only once for common
-// Errno values.
-var (
-	errEAGAIN error = syscall.EAGAIN
-	errEINVAL error = syscall.EINVAL
-	errENOENT error = syscall.ENOENT
-)
-
-// errnoErr returns common boxed Errno values, to prevent
-// allocations at runtime.
-func errnoErr(e syscall.Errno) error {
-	switch e {
-	case 0:
-		return nil
-	case EAGAIN:
-		return errEAGAIN
-	case EINVAL:
-		return errEINVAL
-	case ENOENT:
-		return errENOENT
-	}
-	return e
-}
-
-func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-// Mmap manager, for use by operating system-specific implementations.
-
-type mmapper struct {
-	sync.Mutex
-	active map[*byte][]byte // active mappings; key is last byte in mapping
-	mmap   func(addr, length uintptr, prot, flags, fd int, offset int64) (uintptr, error)
-	munmap func(addr uintptr, length uintptr) error
-}
-
-func (m *mmapper) Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	if length <= 0 {
-		return nil, EINVAL
-	}
-
-	// Map the requested memory.
-	addr, errno := m.mmap(0, uintptr(length), prot, flags, fd, offset)
-	if errno != nil {
-		return nil, errno
-	}
-
-	// Slice memory layout
-	var sl = struct {
-		addr uintptr
-		len  int
-		cap  int
-	}{addr, length, length}
-
-	// Use unsafe to turn sl into a []byte.
-	b := *(*[]byte)(unsafe.Pointer(&sl))
-
-	// Register mapping in m and return it.
-	p := &b[cap(b)-1]
-	m.Lock()
-	defer m.Unlock()
-	m.active[p] = b
-	return b, nil
-}
-
-func (m *mmapper) Munmap(data []byte) (err error) {
-	if len(data) == 0 || len(data) != cap(data) {
-		return EINVAL
-	}
-
-	// Find the base of the mapping.
-	p := &data[cap(data)-1]
-	m.Lock()
-	defer m.Unlock()
-	b := m.active[p]
-	if b == nil || &b[0] != &data[0] {
-		return EINVAL
-	}
-
-	// Unmap the memory and update m.
-	if errno := m.munmap(uintptr(unsafe.Pointer(&b[0])), uintptr(len(b))); errno != nil {
-		return errno
-	}
-	delete(m.active, p)
-	return nil
-}
-
-func Read(fd int, p []byte) (n int, err error) {
-	n, err = read(fd, p)
-	if raceenabled {
-		if n > 0 {
-			raceWriteRange(unsafe.Pointer(&p[0]), n)
-		}
-		if err == nil {
-			raceAcquire(unsafe.Pointer(&ioSync))
-		}
-	}
-	return
-}
-
-func Write(fd int, p []byte) (n int, err error) {
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	n, err = write(fd, p)
-	if raceenabled && n > 0 {
-		raceReadRange(unsafe.Pointer(&p[0]), n)
-	}
-	return
-}
-
-// For testing: clients can set this flag to force
-// creation of IPv6 sockets to return EAFNOSUPPORT.
-var SocketDisableIPv6 bool
-
-type Sockaddr interface {
-	sockaddr() (ptr unsafe.Pointer, len _Socklen, err error) // lowercase; only we can define Sockaddrs
-}
-
-type SockaddrInet4 struct {
-	Port int
-	Addr [4]byte
-	raw  RawSockaddrInet4
-}
-
-type SockaddrInet6 struct {
-	Port   int
-	ZoneId uint32
-	Addr   [16]byte
-	raw    RawSockaddrInet6
-}
-
-type SockaddrUnix struct {
-	Name string
-	raw  RawSockaddrUnix
-}
-
-func Bind(fd int, sa Sockaddr) (err error) {
-	ptr, n, err := sa.sockaddr()
-	if err != nil {
-		return err
-	}
-	return bind(fd, ptr, n)
-}
-
-func Connect(fd int, sa Sockaddr) (err error) {
-	ptr, n, err := sa.sockaddr()
-	if err != nil {
-		return err
-	}
-	return connect(fd, ptr, n)
-}
-
-func Getpeername(fd int) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if err = getpeername(fd, &rsa, &len); err != nil {
-		return
-	}
-	return anyToSockaddr(&rsa)
-}
-
-func GetsockoptInt(fd, level, opt int) (value int, err error) {
-	var n int32
-	vallen := _Socklen(4)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
-	return int(n), err
-}
-
-func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if n, err = recvfrom(fd, p, flags, &rsa, &len); err != nil {
-		return
-	}
-	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
-	}
-	return
-}
-
-func Sendto(fd int, p []byte, flags int, to Sockaddr) (err error) {
-	ptr, n, err := to.sockaddr()
-	if err != nil {
-		return err
-	}
-	return sendto(fd, p, flags, ptr, n)
-}
-
-func SetsockoptByte(fd, level, opt int, value byte) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(&value), 1)
-}
-
-func SetsockoptInt(fd, level, opt int, value int) (err error) {
-	var n = int32(value)
-	return setsockopt(fd, level, opt, unsafe.Pointer(&n), 4)
-}
-
-func SetsockoptInet4Addr(fd, level, opt int, value [4]byte) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(&value[0]), 4)
-}
-
-func SetsockoptIPMreq(fd, level, opt int, mreq *IPMreq) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPMreq)
-}
-
-func SetsockoptIPv6Mreq(fd, level, opt int, mreq *IPv6Mreq) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPv6Mreq)
-}
-
-func SetsockoptICMPv6Filter(fd, level, opt int, filter *ICMPv6Filter) error {
-	return setsockopt(fd, level, opt, unsafe.Pointer(filter), SizeofICMPv6Filter)
-}
-
-func SetsockoptLinger(fd, level, opt int, l *Linger) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(l), SizeofLinger)
-}
-
-func SetsockoptString(fd, level, opt int, s string) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(&[]byte(s)[0]), uintptr(len(s)))
-}
-
-func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(tv), unsafe.Sizeof(*tv))
-}
-
-func Socket(domain, typ, proto int) (fd int, err error) {
-	if domain == AF_INET6 && SocketDisableIPv6 {
-		return -1, EAFNOSUPPORT
-	}
-	fd, err = socket(domain, typ, proto)
-	return
-}
-
-func Socketpair(domain, typ, proto int) (fd [2]int, err error) {
-	var fdx [2]int32
-	err = socketpair(domain, typ, proto, &fdx)
-	if err == nil {
-		fd[0] = int(fdx[0])
-		fd[1] = int(fdx[1])
-	}
-	return
-}
-
-func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	return sendfile(outfd, infd, offset, count)
-}
-
-var ioSync int64
-
-func CloseOnExec(fd int) { fcntl(fd, F_SETFD, FD_CLOEXEC) }
-
-func SetNonblock(fd int, nonblocking bool) (err error) {
-	flag, err := fcntl(fd, F_GETFL, 0)
-	if err != nil {
-		return err
-	}
-	if nonblocking {
-		flag |= O_NONBLOCK
-	} else {
-		flag &= ^O_NONBLOCK
-	}
-	_, err = fcntl(fd, F_SETFL, flag)
-	return err
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go
deleted file mode 100644
index 1153261822..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_darwin.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define __DARWIN_UNIX03 0
-#define KERNEL
-#define _DARWIN_USE_64_BIT_INODE
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <unistd.h>
-#include <mach/mach.h>
-#include <mach/message.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_var.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-type Timeval32 C.struct_timeval32
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-type Stat_t C.struct_stat64
-
-type Statfs_t C.struct_statfs64
-
-type Flock_t C.struct_flock
-
-type Fstore_t C.struct_fstore
-
-type Radvisory_t C.struct_radvisory
-
-type Fbootstraptransfer_t C.struct_fbootstraptransfer
-
-type Log2phys_t C.struct_log2phys
-
-type Fsid C.struct_fsid
-
-type Dirent C.struct_dirent
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet4Pktinfo C.struct_in_pktinfo
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet4Pktinfo     = C.sizeof_struct_in_pktinfo
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr    = C.sizeof_struct_if_msghdr
-	SizeofIfData      = C.sizeof_struct_if_data
-	SizeofIfaMsghdr   = C.sizeof_struct_ifa_msghdr
-	SizeofIfmaMsghdr  = C.sizeof_struct_ifma_msghdr
-	SizeofIfmaMsghdr2 = C.sizeof_struct_ifma_msghdr2
-	SizeofRtMsghdr    = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics   = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfmaMsghdr C.struct_ifma_msghdr
-
-type IfmaMsghdr2 C.struct_ifma_msghdr2
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-// Terminal handling
-
-type Termios C.struct_termios
-
-// fchmodat-like syscalls.
-
-const (
-	AT_FDCWD            = C.AT_FDCWD
-	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_dragonfly.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_dragonfly.go
deleted file mode 100644
index f3c971dffd..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_dragonfly.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-const ( // Directory mode bits
-	S_IFMT   = C.S_IFMT
-	S_IFIFO  = C.S_IFIFO
-	S_IFCHR  = C.S_IFCHR
-	S_IFDIR  = C.S_IFDIR
-	S_IFBLK  = C.S_IFBLK
-	S_IFREG  = C.S_IFREG
-	S_IFLNK  = C.S_IFLNK
-	S_IFSOCK = C.S_IFSOCK
-	S_ISUID  = C.S_ISUID
-	S_ISGID  = C.S_ISGID
-	S_ISVTX  = C.S_ISVTX
-	S_IRUSR  = C.S_IRUSR
-	S_IWUSR  = C.S_IWUSR
-	S_IXUSR  = C.S_IXUSR
-)
-
-type Stat_t C.struct_stat
-
-type Statfs_t C.struct_statfs
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-type Fsid C.struct_fsid
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
-	SizeofIfData           = C.sizeof_struct_if_data
-	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
-	SizeofIfmaMsghdr       = C.sizeof_struct_ifma_msghdr
-	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
-	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfmaMsghdr C.struct_ifma_msghdr
-
-type IfAnnounceMsghdr C.struct_if_announcemsghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-// Terminal handling
-
-type Termios C.struct_termios
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_freebsd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_freebsd.go
deleted file mode 100644
index ae24557ad1..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_freebsd.go
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-// This structure is a duplicate of stat on FreeBSD 8-STABLE.
-// See /usr/include/sys/stat.h.
-struct stat8 {
-#undef st_atimespec	st_atim
-#undef st_mtimespec	st_mtim
-#undef st_ctimespec	st_ctim
-#undef st_birthtimespec	st_birthtim
-	__dev_t   st_dev;
-	ino_t     st_ino;
-	mode_t    st_mode;
-	nlink_t   st_nlink;
-	uid_t     st_uid;
-	gid_t     st_gid;
-	__dev_t   st_rdev;
-#if __BSD_VISIBLE
-	struct  timespec st_atimespec;
-	struct  timespec st_mtimespec;
-	struct  timespec st_ctimespec;
-#else
-	time_t    st_atime;
-	long      __st_atimensec;
-	time_t    st_mtime;
-	long      __st_mtimensec;
-	time_t    st_ctime;
-	long      __st_ctimensec;
-#endif
-	off_t     st_size;
-	blkcnt_t st_blocks;
-	blksize_t st_blksize;
-	fflags_t  st_flags;
-	__uint32_t st_gen;
-	__int32_t st_lspare;
-#if __BSD_VISIBLE
-	struct timespec st_birthtimespec;
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-#else
-	time_t    st_birthtime;
-	long      st_birthtimensec;
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
-#endif
-};
-
-// This structure is a duplicate of if_data on FreeBSD 8-STABLE.
-// See /usr/include/net/if.h.
-struct if_data8 {
-	u_char  ifi_type;
-	u_char  ifi_physical;
-	u_char  ifi_addrlen;
-	u_char  ifi_hdrlen;
-	u_char  ifi_link_state;
-	u_char  ifi_spare_char1;
-	u_char  ifi_spare_char2;
-	u_char  ifi_datalen;
-	u_long  ifi_mtu;
-	u_long  ifi_metric;
-	u_long  ifi_baudrate;
-	u_long  ifi_ipackets;
-	u_long  ifi_ierrors;
-	u_long  ifi_opackets;
-	u_long  ifi_oerrors;
-	u_long  ifi_collisions;
-	u_long  ifi_ibytes;
-	u_long  ifi_obytes;
-	u_long  ifi_imcasts;
-	u_long  ifi_omcasts;
-	u_long  ifi_iqdrops;
-	u_long  ifi_noproto;
-	u_long  ifi_hwassist;
-	time_t  ifi_epoch;
-	struct  timeval ifi_lastchange;
-};
-
-// This structure is a duplicate of if_msghdr on FreeBSD 8-STABLE.
-// See /usr/include/net/if.h.
-struct if_msghdr8 {
-	u_short ifm_msglen;
-	u_char  ifm_version;
-	u_char  ifm_type;
-	int     ifm_addrs;
-	int     ifm_flags;
-	u_short ifm_index;
-	struct  if_data8 ifm_data;
-};
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-const ( // Directory mode bits
-	S_IFMT   = C.S_IFMT
-	S_IFIFO  = C.S_IFIFO
-	S_IFCHR  = C.S_IFCHR
-	S_IFDIR  = C.S_IFDIR
-	S_IFBLK  = C.S_IFBLK
-	S_IFREG  = C.S_IFREG
-	S_IFLNK  = C.S_IFLNK
-	S_IFSOCK = C.S_IFSOCK
-	S_ISUID  = C.S_ISUID
-	S_ISGID  = C.S_ISGID
-	S_ISVTX  = C.S_ISVTX
-	S_IRUSR  = C.S_IRUSR
-	S_IWUSR  = C.S_IWUSR
-	S_IXUSR  = C.S_IXUSR
-)
-
-type Stat_t C.struct_stat8
-
-type Statfs_t C.struct_statfs
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-type Fsid C.struct_fsid
-
-// Advice to Fadvise
-
-const (
-	FADV_NORMAL     = C.POSIX_FADV_NORMAL
-	FADV_RANDOM     = C.POSIX_FADV_RANDOM
-	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
-	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
-	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
-	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
-)
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPMreqn C.struct_ip_mreqn
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPMreqn          = C.sizeof_struct_ip_mreqn
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	sizeofIfMsghdr         = C.sizeof_struct_if_msghdr
-	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr8
-	sizeofIfData           = C.sizeof_struct_if_data
-	SizeofIfData           = C.sizeof_struct_if_data8
-	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
-	SizeofIfmaMsghdr       = C.sizeof_struct_ifma_msghdr
-	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
-	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
-)
-
-type ifMsghdr C.struct_if_msghdr
-
-type IfMsghdr C.struct_if_msghdr8
-
-type ifData C.struct_if_data
-
-type IfData C.struct_if_data8
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfmaMsghdr C.struct_ifma_msghdr
-
-type IfAnnounceMsghdr C.struct_if_announcemsghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion    = C.sizeof_struct_bpf_version
-	SizeofBpfStat       = C.sizeof_struct_bpf_stat
-	SizeofBpfZbuf       = C.sizeof_struct_bpf_zbuf
-	SizeofBpfProgram    = C.sizeof_struct_bpf_program
-	SizeofBpfInsn       = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr        = C.sizeof_struct_bpf_hdr
-	SizeofBpfZbufHeader = C.sizeof_struct_bpf_zbuf_header
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfZbuf C.struct_bpf_zbuf
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-type BpfZbufHeader C.struct_bpf_zbuf_header
-
-// Terminal handling
-
-type Termios C.struct_termios
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go
deleted file mode 100644
index d004b4a484..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go
+++ /dev/null
@@ -1,435 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
-#define _FILE_OFFSET_BITS 64
-#define _GNU_SOURCE
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netpacket/packet.h>
-#include <signal.h>
-#include <stdio.h>
-#include <sys/epoll.h>
-#include <sys/inotify.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/sysinfo.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/timex.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <sys/user.h>
-#include <sys/utsname.h>
-#include <sys/wait.h>
-#include <linux/filter.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <linux/icmpv6.h>
-#include <asm/termbits.h>
-#include <time.h>
-#include <unistd.h>
-#include <ustat.h>
-#include <utime.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-
-#ifdef TCSETS2
-// On systems that have "struct termios2" use this as type Termios.
-typedef struct termios2 termios_t;
-#else
-typedef struct termios termios_t;
-#endif
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_ll s5;
-	struct sockaddr_nl s6;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-// copied from /usr/include/linux/un.h
-struct my_sockaddr_un {
-	sa_family_t sun_family;
-#if defined(__ARM_EABI__) || defined(__powerpc64__)
-	// on ARM char is by default unsigned
-	signed char sun_path[108];
-#else
-	char sun_path[108];
-#endif
-};
-
-#ifdef __ARM_EABI__
-typedef struct user_regs PtraceRegs;
-#elif defined(__aarch64__)
-typedef struct user_pt_regs PtraceRegs;
-#elif defined(__powerpc64__)
-typedef struct pt_regs PtraceRegs;
-#elif defined(__mips__)
-typedef struct user PtraceRegs;
-#elif defined(__s390x__)
-typedef struct _user_regs_struct PtraceRegs;
-#else
-typedef struct user_regs_struct PtraceRegs;
-#endif
-
-#if defined(__s390x__)
-typedef struct _user_psw_struct ptracePsw;
-typedef struct _user_fpregs_struct ptraceFpregs;
-typedef struct _user_per_struct ptracePer;
-#else
-typedef struct {} ptracePsw;
-typedef struct {} ptraceFpregs;
-typedef struct {} ptracePer;
-#endif
-
-// The real epoll_event is a union, and godefs doesn't handle it well.
-struct my_epoll_event {
-	uint32_t events;
-#if defined(__ARM_EABI__) || defined(__aarch64__)
-	// padding is not specified in linux/eventpoll.h but added to conform to the
-	// alignment requirements of EABI
-	int32_t padFd;
-#elif defined(__powerpc64__) || defined(__s390x__)
-	int32_t _padFd;
-#endif
-	int32_t fd;
-	int32_t pad;
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-	PathMax        = C.PATH_MAX
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-type Timex C.struct_timex
-
-type Time_t C.time_t
-
-type Tms C.struct_tms
-
-type Utimbuf C.struct_utimbuf
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-type Stat_t C.struct_stat
-
-type Statfs_t C.struct_statfs
-
-type Dirent C.struct_dirent
-
-type Fsid C.fsid_t
-
-type Flock_t C.struct_flock
-
-// Advice to Fadvise
-
-const (
-	FADV_NORMAL     = C.POSIX_FADV_NORMAL
-	FADV_RANDOM     = C.POSIX_FADV_RANDOM
-	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
-	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
-	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
-	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
-)
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_my_sockaddr_un
-
-type RawSockaddrLinklayer C.struct_sockaddr_ll
-
-type RawSockaddrNetlink C.struct_sockaddr_nl
-
-type RawSockaddrHCI C.struct_sockaddr_hci
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPMreqn C.struct_ip_mreqn
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet4Pktinfo C.struct_in_pktinfo
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-type Ucred C.struct_ucred
-
-type TCPInfo C.struct_tcp_info
-
-const (
-	SizeofSockaddrInet4     = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6     = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny       = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix      = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrLinklayer = C.sizeof_struct_sockaddr_ll
-	SizeofSockaddrNetlink   = C.sizeof_struct_sockaddr_nl
-	SizeofSockaddrHCI       = C.sizeof_struct_sockaddr_hci
-	SizeofLinger            = C.sizeof_struct_linger
-	SizeofIPMreq            = C.sizeof_struct_ip_mreq
-	SizeofIPMreqn           = C.sizeof_struct_ip_mreqn
-	SizeofIPv6Mreq          = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr            = C.sizeof_struct_msghdr
-	SizeofCmsghdr           = C.sizeof_struct_cmsghdr
-	SizeofInet4Pktinfo      = C.sizeof_struct_in_pktinfo
-	SizeofInet6Pktinfo      = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo       = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter      = C.sizeof_struct_icmp6_filter
-	SizeofUcred             = C.sizeof_struct_ucred
-	SizeofTCPInfo           = C.sizeof_struct_tcp_info
-)
-
-// Netlink routing and interface messages
-
-const (
-	IFA_UNSPEC          = C.IFA_UNSPEC
-	IFA_ADDRESS         = C.IFA_ADDRESS
-	IFA_LOCAL           = C.IFA_LOCAL
-	IFA_LABEL           = C.IFA_LABEL
-	IFA_BROADCAST       = C.IFA_BROADCAST
-	IFA_ANYCAST         = C.IFA_ANYCAST
-	IFA_CACHEINFO       = C.IFA_CACHEINFO
-	IFA_MULTICAST       = C.IFA_MULTICAST
-	IFLA_UNSPEC         = C.IFLA_UNSPEC
-	IFLA_ADDRESS        = C.IFLA_ADDRESS
-	IFLA_BROADCAST      = C.IFLA_BROADCAST
-	IFLA_IFNAME         = C.IFLA_IFNAME
-	IFLA_MTU            = C.IFLA_MTU
-	IFLA_LINK           = C.IFLA_LINK
-	IFLA_QDISC          = C.IFLA_QDISC
-	IFLA_STATS          = C.IFLA_STATS
-	IFLA_COST           = C.IFLA_COST
-	IFLA_PRIORITY       = C.IFLA_PRIORITY
-	IFLA_MASTER         = C.IFLA_MASTER
-	IFLA_WIRELESS       = C.IFLA_WIRELESS
-	IFLA_PROTINFO       = C.IFLA_PROTINFO
-	IFLA_TXQLEN         = C.IFLA_TXQLEN
-	IFLA_MAP            = C.IFLA_MAP
-	IFLA_WEIGHT         = C.IFLA_WEIGHT
-	IFLA_OPERSTATE      = C.IFLA_OPERSTATE
-	IFLA_LINKMODE       = C.IFLA_LINKMODE
-	IFLA_LINKINFO       = C.IFLA_LINKINFO
-	IFLA_NET_NS_PID     = C.IFLA_NET_NS_PID
-	IFLA_IFALIAS        = C.IFLA_IFALIAS
-	IFLA_MAX            = C.IFLA_MAX
-	RT_SCOPE_UNIVERSE   = C.RT_SCOPE_UNIVERSE
-	RT_SCOPE_SITE       = C.RT_SCOPE_SITE
-	RT_SCOPE_LINK       = C.RT_SCOPE_LINK
-	RT_SCOPE_HOST       = C.RT_SCOPE_HOST
-	RT_SCOPE_NOWHERE    = C.RT_SCOPE_NOWHERE
-	RT_TABLE_UNSPEC     = C.RT_TABLE_UNSPEC
-	RT_TABLE_COMPAT     = C.RT_TABLE_COMPAT
-	RT_TABLE_DEFAULT    = C.RT_TABLE_DEFAULT
-	RT_TABLE_MAIN       = C.RT_TABLE_MAIN
-	RT_TABLE_LOCAL      = C.RT_TABLE_LOCAL
-	RT_TABLE_MAX        = C.RT_TABLE_MAX
-	RTA_UNSPEC          = C.RTA_UNSPEC
-	RTA_DST             = C.RTA_DST
-	RTA_SRC             = C.RTA_SRC
-	RTA_IIF             = C.RTA_IIF
-	RTA_OIF             = C.RTA_OIF
-	RTA_GATEWAY         = C.RTA_GATEWAY
-	RTA_PRIORITY        = C.RTA_PRIORITY
-	RTA_PREFSRC         = C.RTA_PREFSRC
-	RTA_METRICS         = C.RTA_METRICS
-	RTA_MULTIPATH       = C.RTA_MULTIPATH
-	RTA_FLOW            = C.RTA_FLOW
-	RTA_CACHEINFO       = C.RTA_CACHEINFO
-	RTA_TABLE           = C.RTA_TABLE
-	RTN_UNSPEC          = C.RTN_UNSPEC
-	RTN_UNICAST         = C.RTN_UNICAST
-	RTN_LOCAL           = C.RTN_LOCAL
-	RTN_BROADCAST       = C.RTN_BROADCAST
-	RTN_ANYCAST         = C.RTN_ANYCAST
-	RTN_MULTICAST       = C.RTN_MULTICAST
-	RTN_BLACKHOLE       = C.RTN_BLACKHOLE
-	RTN_UNREACHABLE     = C.RTN_UNREACHABLE
-	RTN_PROHIBIT        = C.RTN_PROHIBIT
-	RTN_THROW           = C.RTN_THROW
-	RTN_NAT             = C.RTN_NAT
-	RTN_XRESOLVE        = C.RTN_XRESOLVE
-	RTNLGRP_NONE        = C.RTNLGRP_NONE
-	RTNLGRP_LINK        = C.RTNLGRP_LINK
-	RTNLGRP_NOTIFY      = C.RTNLGRP_NOTIFY
-	RTNLGRP_NEIGH       = C.RTNLGRP_NEIGH
-	RTNLGRP_TC          = C.RTNLGRP_TC
-	RTNLGRP_IPV4_IFADDR = C.RTNLGRP_IPV4_IFADDR
-	RTNLGRP_IPV4_MROUTE = C.RTNLGRP_IPV4_MROUTE
-	RTNLGRP_IPV4_ROUTE  = C.RTNLGRP_IPV4_ROUTE
-	RTNLGRP_IPV4_RULE   = C.RTNLGRP_IPV4_RULE
-	RTNLGRP_IPV6_IFADDR = C.RTNLGRP_IPV6_IFADDR
-	RTNLGRP_IPV6_MROUTE = C.RTNLGRP_IPV6_MROUTE
-	RTNLGRP_IPV6_ROUTE  = C.RTNLGRP_IPV6_ROUTE
-	RTNLGRP_IPV6_IFINFO = C.RTNLGRP_IPV6_IFINFO
-	RTNLGRP_IPV6_PREFIX = C.RTNLGRP_IPV6_PREFIX
-	RTNLGRP_IPV6_RULE   = C.RTNLGRP_IPV6_RULE
-	RTNLGRP_ND_USEROPT  = C.RTNLGRP_ND_USEROPT
-	SizeofNlMsghdr      = C.sizeof_struct_nlmsghdr
-	SizeofNlMsgerr      = C.sizeof_struct_nlmsgerr
-	SizeofRtGenmsg      = C.sizeof_struct_rtgenmsg
-	SizeofNlAttr        = C.sizeof_struct_nlattr
-	SizeofRtAttr        = C.sizeof_struct_rtattr
-	SizeofIfInfomsg     = C.sizeof_struct_ifinfomsg
-	SizeofIfAddrmsg     = C.sizeof_struct_ifaddrmsg
-	SizeofRtMsg         = C.sizeof_struct_rtmsg
-	SizeofRtNexthop     = C.sizeof_struct_rtnexthop
-)
-
-type NlMsghdr C.struct_nlmsghdr
-
-type NlMsgerr C.struct_nlmsgerr
-
-type RtGenmsg C.struct_rtgenmsg
-
-type NlAttr C.struct_nlattr
-
-type RtAttr C.struct_rtattr
-
-type IfInfomsg C.struct_ifinfomsg
-
-type IfAddrmsg C.struct_ifaddrmsg
-
-type RtMsg C.struct_rtmsg
-
-type RtNexthop C.struct_rtnexthop
-
-// Linux socket filter
-
-const (
-	SizeofSockFilter = C.sizeof_struct_sock_filter
-	SizeofSockFprog  = C.sizeof_struct_sock_fprog
-)
-
-type SockFilter C.struct_sock_filter
-
-type SockFprog C.struct_sock_fprog
-
-// Inotify
-
-type InotifyEvent C.struct_inotify_event
-
-const SizeofInotifyEvent = C.sizeof_struct_inotify_event
-
-// Ptrace
-
-// Register structures
-type PtraceRegs C.PtraceRegs
-
-// Structures contained in PtraceRegs on s390x (exported by mkpost.go)
-type ptracePsw C.ptracePsw
-
-type ptraceFpregs C.ptraceFpregs
-
-type ptracePer C.ptracePer
-
-// Misc
-
-type FdSet C.fd_set
-
-type Sysinfo_t C.struct_sysinfo
-
-type Utsname C.struct_utsname
-
-type Ustat_t C.struct_ustat
-
-type EpollEvent C.struct_my_epoll_event
-
-const (
-	AT_FDCWD            = C.AT_FDCWD
-	AT_REMOVEDIR        = C.AT_REMOVEDIR
-	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
-	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
-)
-
-// Terminal handling
-
-type Termios C.termios_t
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_netbsd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_netbsd.go
deleted file mode 100644
index d15f93d192..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_netbsd.go
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-type Stat_t C.struct_stat
-
-type Statfs_t C.struct_statfs
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-type Fsid C.fsid_t
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
-	SizeofIfData           = C.sizeof_struct_if_data
-	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
-	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
-	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfAnnounceMsghdr C.struct_if_announcemsghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-type Mclpool C.struct_mclpool
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-type BpfTimeval C.struct_bpf_timeval
-
-// Terminal handling
-
-type Termios C.struct_termios
-
-// Sysctl
-
-type Sysctlnode C.struct_sysctlnode
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_openbsd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_openbsd.go
deleted file mode 100644
index b66fe25f73..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_openbsd.go
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-const ( // Directory mode bits
-	S_IFMT   = C.S_IFMT
-	S_IFIFO  = C.S_IFIFO
-	S_IFCHR  = C.S_IFCHR
-	S_IFDIR  = C.S_IFDIR
-	S_IFBLK  = C.S_IFBLK
-	S_IFREG  = C.S_IFREG
-	S_IFLNK  = C.S_IFLNK
-	S_IFSOCK = C.S_IFSOCK
-	S_ISUID  = C.S_ISUID
-	S_ISGID  = C.S_ISGID
-	S_ISVTX  = C.S_ISVTX
-	S_IRUSR  = C.S_IRUSR
-	S_IWUSR  = C.S_IWUSR
-	S_IXUSR  = C.S_IXUSR
-)
-
-type Stat_t C.struct_stat
-
-type Statfs_t C.struct_statfs
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-type Fsid C.fsid_t
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
-	SizeofIfData           = C.sizeof_struct_if_data
-	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
-	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
-	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfAnnounceMsghdr C.struct_if_announcemsghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-type Mclpool C.struct_mclpool
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-type BpfTimeval C.struct_bpf_timeval
-
-// Terminal handling
-
-type Termios C.struct_termios
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go
deleted file mode 100644
index 6ad50eaba6..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_solaris.go
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-// These defines ensure that builds done on newer versions of Solaris are
-// backwards-compatible with older versions of Solaris and
-// OpenSolaris-based derivatives.
-#define __USE_SUNOS_SOCKETS__          // msghdr
-#define __USE_LEGACY_PROTOTYPES__      // iovec
-#include <dirent.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <signal.h>
-#include <termios.h>
-#include <termio.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-#include <ustat.h>
-#include <utime.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-	PathMax        = C.PATH_MAX
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-type Timeval32 C.struct_timeval32
-
-type Tms C.struct_tms
-
-type Utimbuf C.struct_utimbuf
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-const ( // Directory mode bits
-	S_IFMT   = C.S_IFMT
-	S_IFIFO  = C.S_IFIFO
-	S_IFCHR  = C.S_IFCHR
-	S_IFDIR  = C.S_IFDIR
-	S_IFBLK  = C.S_IFBLK
-	S_IFREG  = C.S_IFREG
-	S_IFLNK  = C.S_IFLNK
-	S_IFSOCK = C.S_IFSOCK
-	S_ISUID  = C.S_ISUID
-	S_ISGID  = C.S_ISGID
-	S_ISVTX  = C.S_ISVTX
-	S_IRUSR  = C.S_IRUSR
-	S_IWUSR  = C.S_IWUSR
-	S_IXUSR  = C.S_IXUSR
-)
-
-type Stat_t C.struct_stat
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Select
-
-type FdSet C.fd_set
-
-// Misc
-
-type Utsname C.struct_utsname
-
-type Ustat_t C.struct_ustat
-
-const (
-	AT_FDCWD            = C.AT_FDCWD
-	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
-	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
-	AT_REMOVEDIR        = C.AT_REMOVEDIR
-	AT_EACCESS          = C.AT_EACCESS
-)
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr  = C.sizeof_struct_if_msghdr
-	SizeofIfData    = C.sizeof_struct_if_data
-	SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr
-	SizeofRtMsghdr  = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfTimeval C.struct_bpf_timeval
-
-type BpfHdr C.struct_bpf_hdr
-
-// sysconf information
-
-const _SC_PAGESIZE = C._SC_PAGESIZE
-
-// Terminal handling
-
-type Termios C.struct_termios
-
-type Termio C.struct_termio
-
-type Winsize C.struct_winsize
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go
deleted file mode 100644
index 8e63888351..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_386.go
+++ /dev/null
@@ -1,1576 +0,0 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,darwin
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1c
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1e
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1c
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x28
-	AF_NATM                           = 0x1f
-	AF_NDRV                           = 0x1b
-	AF_NETBIOS                        = 0x21
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PPP                            = 0x22
-	AF_PUP                            = 0x4
-	AF_RESERVED_36                    = 0x24
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_SYSTEM                         = 0x20
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_UTUN                           = 0x26
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc00c4279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4008426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80084267
-	BIOCSETFNR                        = 0x8008427e
-	BIOCSETIF                         = 0x8020426c
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8008426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf5
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_MACHPORT                   = -0x8
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xa
-	EVFILT_VM                         = -0xc
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG0                          = 0x1000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_OOBAND                         = 0x2000
-	EV_POLL                           = 0x1000
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_ADDFILESIGS                     = 0x3d
-	F_ADDSIGS                         = 0x3b
-	F_ALLOCATEALL                     = 0x4
-	F_ALLOCATECONTIG                  = 0x2
-	F_CHKCLEAN                        = 0x29
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x43
-	F_FINDSIGS                        = 0x4e
-	F_FLUSH_DATA                      = 0x28
-	F_FREEZE_FS                       = 0x35
-	F_FULLFSYNC                       = 0x33
-	F_GETCODEDIR                      = 0x48
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETLKPID                        = 0x42
-	F_GETNOSIGPIPE                    = 0x4a
-	F_GETOWN                          = 0x5
-	F_GETPATH                         = 0x32
-	F_GETPATH_MTMINFO                 = 0x47
-	F_GETPROTECTIONCLASS              = 0x3f
-	F_GETPROTECTIONLEVEL              = 0x4d
-	F_GLOBAL_NOCACHE                  = 0x37
-	F_LOG2PHYS                        = 0x31
-	F_LOG2PHYS_EXT                    = 0x41
-	F_NOCACHE                         = 0x30
-	F_NODIRECT                        = 0x3e
-	F_OK                              = 0x0
-	F_PATHPKG_CHECK                   = 0x34
-	F_PEOFPOSMODE                     = 0x3
-	F_PREALLOCATE                     = 0x2a
-	F_RDADVISE                        = 0x2c
-	F_RDAHEAD                         = 0x2d
-	F_RDLCK                           = 0x1
-	F_SETBACKINGSTORE                 = 0x46
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETLKWTIMEOUT                   = 0xa
-	F_SETNOSIGPIPE                    = 0x49
-	F_SETOWN                          = 0x6
-	F_SETPROTECTIONCLASS              = 0x40
-	F_SETSIZE                         = 0x2b
-	F_SINGLE_WRITER                   = 0x4c
-	F_THAW_FS                         = 0x36
-	F_TRANSCODEKEY                    = 0x4b
-	F_UNLCK                           = 0x2
-	F_VOLPOSMODE                      = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_AAL5                          = 0x31
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ATM                           = 0x25
-	IFT_BRIDGE                        = 0xd1
-	IFT_CARP                          = 0xf8
-	IFT_CELLULAR                      = 0xff
-	IFT_CEPT                          = 0x13
-	IFT_DS3                           = 0x1e
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0x38
-	IFT_FDDI                          = 0xf
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_GIF                           = 0x37
-	IFT_HDH1822                       = 0x3
-	IFT_HIPPI                         = 0x2f
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE8023ADLAG                 = 0x88
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88026                      = 0xa
-	IFT_L2VLAN                        = 0x87
-	IFT_LAPB                          = 0x10
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_NSIP                          = 0x1b
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PDP                           = 0xff
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PKTAP                         = 0xfe
-	IFT_PPP                           = 0x17
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PTPSERIAL                     = 0x16
-	IFT_RS232                         = 0x21
-	IFT_SDLC                          = 0x11
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0x39
-	IFT_T1                            = 0x12
-	IFT_ULTRA                         = 0x1d
-	IFT_V35                           = 0x2d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LINKLOCALNETNUM                = 0xa9fe0000
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_2292DSTOPTS                  = 0x17
-	IPV6_2292HOPLIMIT                 = 0x14
-	IPV6_2292HOPOPTS                  = 0x16
-	IPV6_2292NEXTHOP                  = 0x15
-	IPV6_2292PKTINFO                  = 0x13
-	IPV6_2292PKTOPTIONS               = 0x19
-	IPV6_2292RTHDR                    = 0x18
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_BOUND_IF                     = 0x7d
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x3c
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVTCLASS                   = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x24
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_BOUND_IF                       = 0x19
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x28
-	IP_FW_DEL                         = 0x29
-	IP_FW_FLUSH                       = 0x2a
-	IP_FW_GET                         = 0x2c
-	IP_FW_RESETLOG                    = 0x2d
-	IP_FW_ZERO                        = 0x2b
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MF                             = 0x2000
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_IFINDEX              = 0x42
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_NAT__XXX                       = 0x37
-	IP_OFFMASK                        = 0x1fff
-	IP_OLD_FW_ADD                     = 0x32
-	IP_OLD_FW_DEL                     = 0x33
-	IP_OLD_FW_FLUSH                   = 0x34
-	IP_OLD_FW_GET                     = 0x36
-	IP_OLD_FW_RESETLOG                = 0x38
-	IP_OLD_FW_ZERO                    = 0x35
-	IP_OPTIONS                        = 0x1
-	IP_PKTINFO                        = 0x1a
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVPKTINFO                    = 0x1a
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x18
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_STRIPHDR                       = 0x17
-	IP_TOS                            = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IUTF8                             = 0x4000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_CAN_REUSE                    = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_FREE_REUSABLE                = 0x7
-	MADV_FREE_REUSE                   = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MADV_ZERO_WIRED_PAGES             = 0x6
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_JIT                           = 0x800
-	MAP_NOCACHE                       = 0x400
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_SHARED                        = 0x1
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FLUSH                         = 0x400
-	MSG_HAVEMORE                      = 0x2000
-	MSG_HOLD                          = 0x800
-	MSG_NEEDSA                        = 0x10000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_RCVMORE                       = 0x4000
-	MSG_SEND                          = 0x1000
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MSG_WAITSTREAM                    = 0x200
-	MS_ASYNC                          = 0x1
-	MS_DEACTIVATE                     = 0x8
-	MS_INVALIDATE                     = 0x2
-	MS_KILLPAGES                      = 0x4
-	MS_SYNC                           = 0x10
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_DUMP2                      = 0x7
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLIST2                    = 0x6
-	NET_RT_MAXID                      = 0xa
-	NET_RT_STAT                       = 0x4
-	NET_RT_TRASH                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ABSOLUTE                     = 0x8
-	NOTE_ATTRIB                       = 0x8
-	NOTE_BACKGROUND                   = 0x40
-	NOTE_CHILD                        = 0x4
-	NOTE_CRITICAL                     = 0x20
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXITSTATUS                   = 0x4000000
-	NOTE_EXIT_CSERROR                 = 0x40000
-	NOTE_EXIT_DECRYPTFAIL             = 0x10000
-	NOTE_EXIT_DETAIL                  = 0x2000000
-	NOTE_EXIT_DETAIL_MASK             = 0x70000
-	NOTE_EXIT_MEMORY                  = 0x20000
-	NOTE_EXIT_REPARENTED              = 0x80000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LEEWAY                       = 0x10
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_NONE                         = 0x80
-	NOTE_NSECONDS                     = 0x4
-	NOTE_PCTRLMASK                    = -0x100000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_REAP                         = 0x10000000
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_SIGNAL                       = 0x8000000
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x2
-	NOTE_VM_ERROR                     = 0x10000000
-	NOTE_VM_PRESSURE                  = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFDEL                             = 0x20000
-	OFILL                             = 0x80
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALERT                           = 0x20000000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x1000000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x100000
-	O_DP_GETRAWENCRYPTED              = 0x1
-	O_DSYNC                           = 0x400000
-	O_EVTONLY                         = 0x8000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x20000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_POPUP                           = 0x80000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYMLINK                         = 0x200000
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_ATTACH                         = 0xa
-	PT_ATTACHEXC                      = 0xe
-	PT_CONTINUE                       = 0x7
-	PT_DENY_ATTACH                    = 0x1f
-	PT_DETACH                         = 0xb
-	PT_FIRSTMACH                      = 0x20
-	PT_FORCEQUOTA                     = 0x1e
-	PT_KILL                           = 0x8
-	PT_READ_D                         = 0x2
-	PT_READ_I                         = 0x1
-	PT_READ_U                         = 0x3
-	PT_SIGEXC                         = 0xc
-	PT_STEP                           = 0x9
-	PT_THUPDATE                       = 0xd
-	PT_TRACE_ME                       = 0x0
-	PT_WRITE_D                        = 0x5
-	PT_WRITE_I                        = 0x4
-	PT_WRITE_U                        = 0x6
-	RLIMIT_AS                         = 0x5
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_CPU_USAGE_MONITOR          = 0x2
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_CONDEMNED                     = 0x2000000
-	RTF_DELCLONE                      = 0x80
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_IFREF                         = 0x4000000
-	RTF_IFSCOPE                       = 0x1000000
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_NOIFREF                       = 0x2000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_PROXY                         = 0x8000000
-	RTF_REJECT                        = 0x8
-	RTF_ROUTER                        = 0x10000000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_GET2                          = 0x14
-	RTM_IFINFO                        = 0xe
-	RTM_IFINFO2                       = 0x12
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_NEWMADDR2                     = 0x13
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SCM_TIMESTAMP_MONOTONIC           = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCARPIPLL                       = 0xc0206928
-	SIOCATMARK                        = 0x40047307
-	SIOCAUTOADDR                      = 0xc0206926
-	SIOCAUTONETMASK                   = 0x80206927
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETVLAN                       = 0xc020697f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFALTMTU                     = 0xc0206948
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBOND                       = 0xc0206947
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020695b
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDEVMTU                     = 0xc0206944
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFKPI                        = 0xc0206987
-	SIOCGIFMAC                        = 0xc0206982
-	SIOCGIFMEDIA                      = 0xc0286938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206940
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc020693f
-	SIOCGIFSTATUS                     = 0xc331693d
-	SIOCGIFVLAN                       = 0xc020697f
-	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCIFCREATE                      = 0xc0206978
-	SIOCIFCREATE2                     = 0xc020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6981
-	SIOCRSLVMULTI                     = 0xc008693b
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSETVLAN                       = 0x8020697e
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFALTMTU                     = 0x80206945
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBOND                       = 0x80206946
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020695a
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFKPI                        = 0x80206986
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206983
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x8040693e
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_DONTTRUNC                      = 0x2000
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1010
-	SO_LINGER                         = 0x80
-	SO_LINGER_SEC                     = 0x1080
-	SO_NKE                            = 0x1021
-	SO_NOADDRERR                      = 0x1023
-	SO_NOSIGPIPE                      = 0x1022
-	SO_NOTIFYCONFLICT                 = 0x1026
-	SO_NP_EXTENSIONS                  = 0x1083
-	SO_NREAD                          = 0x1020
-	SO_NUMRCVPKT                      = 0x1112
-	SO_NWRITE                         = 0x1024
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1011
-	SO_RANDOMPORT                     = 0x1082
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_REUSESHAREUID                  = 0x1025
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TIMESTAMP_MONOTONIC            = 0x800
-	SO_TYPE                           = 0x1008
-	SO_UPCALLCLOSEWAIT                = 0x1027
-	SO_USELOOPBACK                    = 0x40
-	SO_WANTMORE                       = 0x4000
-	SO_WANTOOBFLAG                    = 0x8000
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONNECTIONTIMEOUT             = 0x20
-	TCP_ENABLE_ECN                    = 0x104
-	TCP_KEEPALIVE                     = 0x10
-	TCP_KEEPCNT                       = 0x102
-	TCP_KEEPINTVL                     = 0x101
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_NOTSENT_LOWAT                 = 0x201
-	TCP_RXT_CONNDROPTIME              = 0x80
-	TCP_RXT_FINDROP                   = 0x100
-	TCP_SENDMOREACKS                  = 0x103
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40087458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCDSIMICROCODE                  = 0x20007455
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGWINSZ                        = 0x40087468
-	TIOCIXOFF                         = 0x20007480
-	TIOCIXON                          = 0x20007481
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTYGNAME                      = 0x40807453
-	TIOCPTYGRANT                      = 0x20007454
-	TIOCPTYUNLK                       = 0x20007452
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCONS                         = 0x20007463
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40087459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VT0                               = 0x0
-	VT1                               = 0x10000
-	VTDLY                             = 0x10000
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x10
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x4
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x20
-	WORDSIZE                          = 0x20
-	WSTOPPED                          = 0x8
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADARCH        = syscall.Errno(0x56)
-	EBADEXEC        = syscall.Errno(0x55)
-	EBADF           = syscall.Errno(0x9)
-	EBADMACHO       = syscall.Errno(0x58)
-	EBADMSG         = syscall.Errno(0x5e)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x59)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDEVERR         = syscall.Errno(0x53)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x5a)
-	EILSEQ          = syscall.Errno(0x5c)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x6a)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5f)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x60)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x61)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5b)
-	ENOPOLICY       = syscall.Errno(0x67)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x62)
-	ENOSTR          = syscall.Errno(0x63)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x68)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x66)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x69)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x64)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	EPWROFF         = syscall.Errno(0x52)
-	EQFULL          = syscall.Errno(0x6a)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHLIBVERS      = syscall.Errno(0x57)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x65)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "device not configured",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource deadlock avoided",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "resource busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "operation not supported by device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "result too large",
-	35:  "resource temporarily unavailable",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol family",
-	48:  "address already in use",
-	49:  "can't assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "socket is already connected",
-	57:  "socket is not connected",
-	58:  "can't send after socket shutdown",
-	59:  "too many references: can't splice",
-	60:  "operation timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disc quota exceeded",
-	70:  "stale NFS file handle",
-	71:  "too many levels of remote in path",
-	72:  "RPC struct is bad",
-	73:  "RPC version wrong",
-	74:  "RPC prog. not avail",
-	75:  "program version wrong",
-	76:  "bad procedure for program",
-	77:  "no locks available",
-	78:  "function not implemented",
-	79:  "inappropriate file type or format",
-	80:  "authentication error",
-	81:  "need authenticator",
-	82:  "device power is off",
-	83:  "device error",
-	84:  "value too large to be stored in data type",
-	85:  "bad executable (or shared library)",
-	86:  "bad CPU type in executable",
-	87:  "shared library version mismatch",
-	88:  "malformed Mach-o file",
-	89:  "operation canceled",
-	90:  "identifier removed",
-	91:  "no message of desired type",
-	92:  "illegal byte sequence",
-	93:  "attribute not found",
-	94:  "bad message",
-	95:  "EMULTIHOP (Reserved)",
-	96:  "no message available on STREAM",
-	97:  "ENOLINK (Reserved)",
-	98:  "no STREAM resources",
-	99:  "not a STREAM",
-	100: "protocol error",
-	101: "STREAM ioctl timeout",
-	102: "operation not supported on socket",
-	103: "policy not found",
-	104: "state not recoverable",
-	105: "previous owner died",
-	106: "interface output queue is full",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go
deleted file mode 100644
index 9594f93817..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_amd64.go
+++ /dev/null
@@ -1,1576 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,darwin
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1c
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1e
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1c
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x28
-	AF_NATM                           = 0x1f
-	AF_NDRV                           = 0x1b
-	AF_NETBIOS                        = 0x21
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PPP                            = 0x22
-	AF_PUP                            = 0x4
-	AF_RESERVED_36                    = 0x24
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_SYSTEM                         = 0x20
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_UTUN                           = 0x26
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc00c4279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80104267
-	BIOCSETFNR                        = 0x8010427e
-	BIOCSETIF                         = 0x8020426c
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf5
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_MACHPORT                   = -0x8
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xa
-	EVFILT_VM                         = -0xc
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG0                          = 0x1000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_OOBAND                         = 0x2000
-	EV_POLL                           = 0x1000
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_ADDFILESIGS                     = 0x3d
-	F_ADDSIGS                         = 0x3b
-	F_ALLOCATEALL                     = 0x4
-	F_ALLOCATECONTIG                  = 0x2
-	F_CHKCLEAN                        = 0x29
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x43
-	F_FINDSIGS                        = 0x4e
-	F_FLUSH_DATA                      = 0x28
-	F_FREEZE_FS                       = 0x35
-	F_FULLFSYNC                       = 0x33
-	F_GETCODEDIR                      = 0x48
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETLKPID                        = 0x42
-	F_GETNOSIGPIPE                    = 0x4a
-	F_GETOWN                          = 0x5
-	F_GETPATH                         = 0x32
-	F_GETPATH_MTMINFO                 = 0x47
-	F_GETPROTECTIONCLASS              = 0x3f
-	F_GETPROTECTIONLEVEL              = 0x4d
-	F_GLOBAL_NOCACHE                  = 0x37
-	F_LOG2PHYS                        = 0x31
-	F_LOG2PHYS_EXT                    = 0x41
-	F_NOCACHE                         = 0x30
-	F_NODIRECT                        = 0x3e
-	F_OK                              = 0x0
-	F_PATHPKG_CHECK                   = 0x34
-	F_PEOFPOSMODE                     = 0x3
-	F_PREALLOCATE                     = 0x2a
-	F_RDADVISE                        = 0x2c
-	F_RDAHEAD                         = 0x2d
-	F_RDLCK                           = 0x1
-	F_SETBACKINGSTORE                 = 0x46
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETLKWTIMEOUT                   = 0xa
-	F_SETNOSIGPIPE                    = 0x49
-	F_SETOWN                          = 0x6
-	F_SETPROTECTIONCLASS              = 0x40
-	F_SETSIZE                         = 0x2b
-	F_SINGLE_WRITER                   = 0x4c
-	F_THAW_FS                         = 0x36
-	F_TRANSCODEKEY                    = 0x4b
-	F_UNLCK                           = 0x2
-	F_VOLPOSMODE                      = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_AAL5                          = 0x31
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ATM                           = 0x25
-	IFT_BRIDGE                        = 0xd1
-	IFT_CARP                          = 0xf8
-	IFT_CELLULAR                      = 0xff
-	IFT_CEPT                          = 0x13
-	IFT_DS3                           = 0x1e
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0x38
-	IFT_FDDI                          = 0xf
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_GIF                           = 0x37
-	IFT_HDH1822                       = 0x3
-	IFT_HIPPI                         = 0x2f
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE8023ADLAG                 = 0x88
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88026                      = 0xa
-	IFT_L2VLAN                        = 0x87
-	IFT_LAPB                          = 0x10
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_NSIP                          = 0x1b
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PDP                           = 0xff
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PKTAP                         = 0xfe
-	IFT_PPP                           = 0x17
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PTPSERIAL                     = 0x16
-	IFT_RS232                         = 0x21
-	IFT_SDLC                          = 0x11
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0x39
-	IFT_T1                            = 0x12
-	IFT_ULTRA                         = 0x1d
-	IFT_V35                           = 0x2d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LINKLOCALNETNUM                = 0xa9fe0000
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_2292DSTOPTS                  = 0x17
-	IPV6_2292HOPLIMIT                 = 0x14
-	IPV6_2292HOPOPTS                  = 0x16
-	IPV6_2292NEXTHOP                  = 0x15
-	IPV6_2292PKTINFO                  = 0x13
-	IPV6_2292PKTOPTIONS               = 0x19
-	IPV6_2292RTHDR                    = 0x18
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_BOUND_IF                     = 0x7d
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x3c
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVTCLASS                   = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x24
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_BOUND_IF                       = 0x19
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x28
-	IP_FW_DEL                         = 0x29
-	IP_FW_FLUSH                       = 0x2a
-	IP_FW_GET                         = 0x2c
-	IP_FW_RESETLOG                    = 0x2d
-	IP_FW_ZERO                        = 0x2b
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MF                             = 0x2000
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_IFINDEX              = 0x42
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_NAT__XXX                       = 0x37
-	IP_OFFMASK                        = 0x1fff
-	IP_OLD_FW_ADD                     = 0x32
-	IP_OLD_FW_DEL                     = 0x33
-	IP_OLD_FW_FLUSH                   = 0x34
-	IP_OLD_FW_GET                     = 0x36
-	IP_OLD_FW_RESETLOG                = 0x38
-	IP_OLD_FW_ZERO                    = 0x35
-	IP_OPTIONS                        = 0x1
-	IP_PKTINFO                        = 0x1a
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVPKTINFO                    = 0x1a
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x18
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_STRIPHDR                       = 0x17
-	IP_TOS                            = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IUTF8                             = 0x4000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_CAN_REUSE                    = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_FREE_REUSABLE                = 0x7
-	MADV_FREE_REUSE                   = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MADV_ZERO_WIRED_PAGES             = 0x6
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_JIT                           = 0x800
-	MAP_NOCACHE                       = 0x400
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_SHARED                        = 0x1
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FLUSH                         = 0x400
-	MSG_HAVEMORE                      = 0x2000
-	MSG_HOLD                          = 0x800
-	MSG_NEEDSA                        = 0x10000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_RCVMORE                       = 0x4000
-	MSG_SEND                          = 0x1000
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MSG_WAITSTREAM                    = 0x200
-	MS_ASYNC                          = 0x1
-	MS_DEACTIVATE                     = 0x8
-	MS_INVALIDATE                     = 0x2
-	MS_KILLPAGES                      = 0x4
-	MS_SYNC                           = 0x10
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_DUMP2                      = 0x7
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLIST2                    = 0x6
-	NET_RT_MAXID                      = 0xa
-	NET_RT_STAT                       = 0x4
-	NET_RT_TRASH                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ABSOLUTE                     = 0x8
-	NOTE_ATTRIB                       = 0x8
-	NOTE_BACKGROUND                   = 0x40
-	NOTE_CHILD                        = 0x4
-	NOTE_CRITICAL                     = 0x20
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXITSTATUS                   = 0x4000000
-	NOTE_EXIT_CSERROR                 = 0x40000
-	NOTE_EXIT_DECRYPTFAIL             = 0x10000
-	NOTE_EXIT_DETAIL                  = 0x2000000
-	NOTE_EXIT_DETAIL_MASK             = 0x70000
-	NOTE_EXIT_MEMORY                  = 0x20000
-	NOTE_EXIT_REPARENTED              = 0x80000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LEEWAY                       = 0x10
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_NONE                         = 0x80
-	NOTE_NSECONDS                     = 0x4
-	NOTE_PCTRLMASK                    = -0x100000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_REAP                         = 0x10000000
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_SIGNAL                       = 0x8000000
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x2
-	NOTE_VM_ERROR                     = 0x10000000
-	NOTE_VM_PRESSURE                  = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFDEL                             = 0x20000
-	OFILL                             = 0x80
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALERT                           = 0x20000000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x1000000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x100000
-	O_DP_GETRAWENCRYPTED              = 0x1
-	O_DSYNC                           = 0x400000
-	O_EVTONLY                         = 0x8000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x20000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_POPUP                           = 0x80000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYMLINK                         = 0x200000
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_ATTACH                         = 0xa
-	PT_ATTACHEXC                      = 0xe
-	PT_CONTINUE                       = 0x7
-	PT_DENY_ATTACH                    = 0x1f
-	PT_DETACH                         = 0xb
-	PT_FIRSTMACH                      = 0x20
-	PT_FORCEQUOTA                     = 0x1e
-	PT_KILL                           = 0x8
-	PT_READ_D                         = 0x2
-	PT_READ_I                         = 0x1
-	PT_READ_U                         = 0x3
-	PT_SIGEXC                         = 0xc
-	PT_STEP                           = 0x9
-	PT_THUPDATE                       = 0xd
-	PT_TRACE_ME                       = 0x0
-	PT_WRITE_D                        = 0x5
-	PT_WRITE_I                        = 0x4
-	PT_WRITE_U                        = 0x6
-	RLIMIT_AS                         = 0x5
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_CPU_USAGE_MONITOR          = 0x2
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_CONDEMNED                     = 0x2000000
-	RTF_DELCLONE                      = 0x80
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_IFREF                         = 0x4000000
-	RTF_IFSCOPE                       = 0x1000000
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_NOIFREF                       = 0x2000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_PROXY                         = 0x8000000
-	RTF_REJECT                        = 0x8
-	RTF_ROUTER                        = 0x10000000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_GET2                          = 0x14
-	RTM_IFINFO                        = 0xe
-	RTM_IFINFO2                       = 0x12
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_NEWMADDR2                     = 0x13
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SCM_TIMESTAMP_MONOTONIC           = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCARPIPLL                       = 0xc0206928
-	SIOCATMARK                        = 0x40047307
-	SIOCAUTOADDR                      = 0xc0206926
-	SIOCAUTONETMASK                   = 0x80206927
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETVLAN                       = 0xc020697f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFALTMTU                     = 0xc0206948
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBOND                       = 0xc0206947
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020695b
-	SIOCGIFCONF                       = 0xc00c6924
-	SIOCGIFDEVMTU                     = 0xc0206944
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFKPI                        = 0xc0206987
-	SIOCGIFMAC                        = 0xc0206982
-	SIOCGIFMEDIA                      = 0xc02c6938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206940
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc020693f
-	SIOCGIFSTATUS                     = 0xc331693d
-	SIOCGIFVLAN                       = 0xc020697f
-	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCIFCREATE                      = 0xc0206978
-	SIOCIFCREATE2                     = 0xc020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106981
-	SIOCRSLVMULTI                     = 0xc010693b
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSETVLAN                       = 0x8020697e
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFALTMTU                     = 0x80206945
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBOND                       = 0x80206946
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020695a
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFKPI                        = 0x80206986
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206983
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x8040693e
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_DONTTRUNC                      = 0x2000
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1010
-	SO_LINGER                         = 0x80
-	SO_LINGER_SEC                     = 0x1080
-	SO_NKE                            = 0x1021
-	SO_NOADDRERR                      = 0x1023
-	SO_NOSIGPIPE                      = 0x1022
-	SO_NOTIFYCONFLICT                 = 0x1026
-	SO_NP_EXTENSIONS                  = 0x1083
-	SO_NREAD                          = 0x1020
-	SO_NUMRCVPKT                      = 0x1112
-	SO_NWRITE                         = 0x1024
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1011
-	SO_RANDOMPORT                     = 0x1082
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_REUSESHAREUID                  = 0x1025
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TIMESTAMP_MONOTONIC            = 0x800
-	SO_TYPE                           = 0x1008
-	SO_UPCALLCLOSEWAIT                = 0x1027
-	SO_USELOOPBACK                    = 0x40
-	SO_WANTMORE                       = 0x4000
-	SO_WANTOOBFLAG                    = 0x8000
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONNECTIONTIMEOUT             = 0x20
-	TCP_ENABLE_ECN                    = 0x104
-	TCP_KEEPALIVE                     = 0x10
-	TCP_KEEPCNT                       = 0x102
-	TCP_KEEPINTVL                     = 0x101
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_NOTSENT_LOWAT                 = 0x201
-	TCP_RXT_CONNDROPTIME              = 0x80
-	TCP_RXT_FINDROP                   = 0x100
-	TCP_SENDMOREACKS                  = 0x103
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCDSIMICROCODE                  = 0x20007455
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x40487413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGWINSZ                        = 0x40087468
-	TIOCIXOFF                         = 0x20007480
-	TIOCIXON                          = 0x20007481
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTYGNAME                      = 0x40807453
-	TIOCPTYGRANT                      = 0x20007454
-	TIOCPTYUNLK                       = 0x20007452
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCONS                         = 0x20007463
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x80487414
-	TIOCSETAF                         = 0x80487416
-	TIOCSETAW                         = 0x80487415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VT0                               = 0x0
-	VT1                               = 0x10000
-	VTDLY                             = 0x10000
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x10
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x4
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x20
-	WORDSIZE                          = 0x40
-	WSTOPPED                          = 0x8
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADARCH        = syscall.Errno(0x56)
-	EBADEXEC        = syscall.Errno(0x55)
-	EBADF           = syscall.Errno(0x9)
-	EBADMACHO       = syscall.Errno(0x58)
-	EBADMSG         = syscall.Errno(0x5e)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x59)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDEVERR         = syscall.Errno(0x53)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x5a)
-	EILSEQ          = syscall.Errno(0x5c)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x6a)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5f)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x60)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x61)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5b)
-	ENOPOLICY       = syscall.Errno(0x67)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x62)
-	ENOSTR          = syscall.Errno(0x63)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x68)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x66)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x69)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x64)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	EPWROFF         = syscall.Errno(0x52)
-	EQFULL          = syscall.Errno(0x6a)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHLIBVERS      = syscall.Errno(0x57)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x65)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "device not configured",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource deadlock avoided",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "resource busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "operation not supported by device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "result too large",
-	35:  "resource temporarily unavailable",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol family",
-	48:  "address already in use",
-	49:  "can't assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "socket is already connected",
-	57:  "socket is not connected",
-	58:  "can't send after socket shutdown",
-	59:  "too many references: can't splice",
-	60:  "operation timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disc quota exceeded",
-	70:  "stale NFS file handle",
-	71:  "too many levels of remote in path",
-	72:  "RPC struct is bad",
-	73:  "RPC version wrong",
-	74:  "RPC prog. not avail",
-	75:  "program version wrong",
-	76:  "bad procedure for program",
-	77:  "no locks available",
-	78:  "function not implemented",
-	79:  "inappropriate file type or format",
-	80:  "authentication error",
-	81:  "need authenticator",
-	82:  "device power is off",
-	83:  "device error",
-	84:  "value too large to be stored in data type",
-	85:  "bad executable (or shared library)",
-	86:  "bad CPU type in executable",
-	87:  "shared library version mismatch",
-	88:  "malformed Mach-o file",
-	89:  "operation canceled",
-	90:  "identifier removed",
-	91:  "no message of desired type",
-	92:  "illegal byte sequence",
-	93:  "attribute not found",
-	94:  "bad message",
-	95:  "EMULTIHOP (Reserved)",
-	96:  "no message available on STREAM",
-	97:  "ENOLINK (Reserved)",
-	98:  "no STREAM resources",
-	99:  "not a STREAM",
-	100: "protocol error",
-	101: "STREAM ioctl timeout",
-	102: "operation not supported on socket",
-	103: "policy not found",
-	104: "state not recoverable",
-	105: "previous owner died",
-	106: "interface output queue is full",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go
deleted file mode 100644
index a410e88edd..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm.go
+++ /dev/null
@@ -1,1293 +0,0 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
-
-// +build arm,darwin
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1c
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1e
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1c
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x28
-	AF_NATM                           = 0x1f
-	AF_NDRV                           = 0x1b
-	AF_NETBIOS                        = 0x21
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PPP                            = 0x22
-	AF_PUP                            = 0x4
-	AF_RESERVED_36                    = 0x24
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_SYSTEM                         = 0x20
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_UTUN                           = 0x26
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc00c4279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AX25                          = 0x3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_C_HDLC                        = 0x68
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_FDDI                          = 0xa
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_NULL                          = 0x0
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PRONET                        = 0x4
-	DLT_RAW                           = 0xc
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_MACHPORT                   = -0x8
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xa
-	EVFILT_VM                         = -0xc
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG0                          = 0x1000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_OOBAND                         = 0x2000
-	EV_POLL                           = 0x1000
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_ADDFILESIGS                     = 0x3d
-	F_ADDSIGS                         = 0x3b
-	F_ALLOCATEALL                     = 0x4
-	F_ALLOCATECONTIG                  = 0x2
-	F_CHKCLEAN                        = 0x29
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x43
-	F_FINDSIGS                        = 0x4e
-	F_FLUSH_DATA                      = 0x28
-	F_FREEZE_FS                       = 0x35
-	F_FULLFSYNC                       = 0x33
-	F_GETCODEDIR                      = 0x48
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETLKPID                        = 0x42
-	F_GETNOSIGPIPE                    = 0x4a
-	F_GETOWN                          = 0x5
-	F_GETPATH                         = 0x32
-	F_GETPATH_MTMINFO                 = 0x47
-	F_GETPROTECTIONCLASS              = 0x3f
-	F_GETPROTECTIONLEVEL              = 0x4d
-	F_GLOBAL_NOCACHE                  = 0x37
-	F_LOG2PHYS                        = 0x31
-	F_LOG2PHYS_EXT                    = 0x41
-	F_NOCACHE                         = 0x30
-	F_NODIRECT                        = 0x3e
-	F_OK                              = 0x0
-	F_PATHPKG_CHECK                   = 0x34
-	F_PEOFPOSMODE                     = 0x3
-	F_PREALLOCATE                     = 0x2a
-	F_RDADVISE                        = 0x2c
-	F_RDAHEAD                         = 0x2d
-	F_RDLCK                           = 0x1
-	F_SETBACKINGSTORE                 = 0x46
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETLKWTIMEOUT                   = 0xa
-	F_SETNOSIGPIPE                    = 0x49
-	F_SETOWN                          = 0x6
-	F_SETPROTECTIONCLASS              = 0x40
-	F_SETSIZE                         = 0x2b
-	F_SINGLE_WRITER                   = 0x4c
-	F_THAW_FS                         = 0x36
-	F_TRANSCODEKEY                    = 0x4b
-	F_UNLCK                           = 0x2
-	F_VOLPOSMODE                      = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_AAL5                          = 0x31
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ATM                           = 0x25
-	IFT_BRIDGE                        = 0xd1
-	IFT_CARP                          = 0xf8
-	IFT_CELLULAR                      = 0xff
-	IFT_CEPT                          = 0x13
-	IFT_DS3                           = 0x1e
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0x38
-	IFT_FDDI                          = 0xf
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_GIF                           = 0x37
-	IFT_HDH1822                       = 0x3
-	IFT_HIPPI                         = 0x2f
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE8023ADLAG                 = 0x88
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88026                      = 0xa
-	IFT_L2VLAN                        = 0x87
-	IFT_LAPB                          = 0x10
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_NSIP                          = 0x1b
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PDP                           = 0xff
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PPP                           = 0x17
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PTPSERIAL                     = 0x16
-	IFT_RS232                         = 0x21
-	IFT_SDLC                          = 0x11
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0x39
-	IFT_T1                            = 0x12
-	IFT_ULTRA                         = 0x1d
-	IFT_V35                           = 0x2d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LINKLOCALNETNUM                = 0xa9fe0000
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_2292DSTOPTS                  = 0x17
-	IPV6_2292HOPLIMIT                 = 0x14
-	IPV6_2292HOPOPTS                  = 0x16
-	IPV6_2292NEXTHOP                  = 0x15
-	IPV6_2292PKTINFO                  = 0x13
-	IPV6_2292PKTOPTIONS               = 0x19
-	IPV6_2292RTHDR                    = 0x18
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_BOUND_IF                     = 0x7d
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVTCLASS                   = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x24
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_BOUND_IF                       = 0x19
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x28
-	IP_FW_DEL                         = 0x29
-	IP_FW_FLUSH                       = 0x2a
-	IP_FW_GET                         = 0x2c
-	IP_FW_RESETLOG                    = 0x2d
-	IP_FW_ZERO                        = 0x2b
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MF                             = 0x2000
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_IFINDEX              = 0x42
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_NAT__XXX                       = 0x37
-	IP_OFFMASK                        = 0x1fff
-	IP_OLD_FW_ADD                     = 0x32
-	IP_OLD_FW_DEL                     = 0x33
-	IP_OLD_FW_FLUSH                   = 0x34
-	IP_OLD_FW_GET                     = 0x36
-	IP_OLD_FW_RESETLOG                = 0x38
-	IP_OLD_FW_ZERO                    = 0x35
-	IP_OPTIONS                        = 0x1
-	IP_PKTINFO                        = 0x1a
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVPKTINFO                    = 0x1a
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x18
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_STRIPHDR                       = 0x17
-	IP_TOS                            = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IUTF8                             = 0x4000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_CAN_REUSE                    = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_FREE_REUSABLE                = 0x7
-	MADV_FREE_REUSE                   = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MADV_ZERO_WIRED_PAGES             = 0x6
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_JIT                           = 0x800
-	MAP_NOCACHE                       = 0x400
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_SHARED                        = 0x1
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FLUSH                         = 0x400
-	MSG_HAVEMORE                      = 0x2000
-	MSG_HOLD                          = 0x800
-	MSG_NEEDSA                        = 0x10000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_RCVMORE                       = 0x4000
-	MSG_SEND                          = 0x1000
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MSG_WAITSTREAM                    = 0x200
-	MS_ASYNC                          = 0x1
-	MS_DEACTIVATE                     = 0x8
-	MS_INVALIDATE                     = 0x2
-	MS_KILLPAGES                      = 0x4
-	MS_SYNC                           = 0x10
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_DUMP2                      = 0x7
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLIST2                    = 0x6
-	NET_RT_MAXID                      = 0xa
-	NET_RT_STAT                       = 0x4
-	NET_RT_TRASH                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ABSOLUTE                     = 0x8
-	NOTE_ATTRIB                       = 0x8
-	NOTE_BACKGROUND                   = 0x40
-	NOTE_CHILD                        = 0x4
-	NOTE_CRITICAL                     = 0x20
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXITSTATUS                   = 0x4000000
-	NOTE_EXIT_CSERROR                 = 0x40000
-	NOTE_EXIT_DECRYPTFAIL             = 0x10000
-	NOTE_EXIT_DETAIL                  = 0x2000000
-	NOTE_EXIT_DETAIL_MASK             = 0x70000
-	NOTE_EXIT_MEMORY                  = 0x20000
-	NOTE_EXIT_REPARENTED              = 0x80000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LEEWAY                       = 0x10
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_NONE                         = 0x80
-	NOTE_NSECONDS                     = 0x4
-	NOTE_PCTRLMASK                    = -0x100000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_REAP                         = 0x10000000
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_SIGNAL                       = 0x8000000
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x2
-	NOTE_VM_ERROR                     = 0x10000000
-	NOTE_VM_PRESSURE                  = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFDEL                             = 0x20000
-	OFILL                             = 0x80
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALERT                           = 0x20000000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x1000000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x100000
-	O_DP_GETRAWENCRYPTED              = 0x1
-	O_DSYNC                           = 0x400000
-	O_EVTONLY                         = 0x8000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x20000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_POPUP                           = 0x80000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYMLINK                         = 0x200000
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_ATTACH                         = 0xa
-	PT_ATTACHEXC                      = 0xe
-	PT_CONTINUE                       = 0x7
-	PT_DENY_ATTACH                    = 0x1f
-	PT_DETACH                         = 0xb
-	PT_FIRSTMACH                      = 0x20
-	PT_FORCEQUOTA                     = 0x1e
-	PT_KILL                           = 0x8
-	PT_READ_D                         = 0x2
-	PT_READ_I                         = 0x1
-	PT_READ_U                         = 0x3
-	PT_SIGEXC                         = 0xc
-	PT_STEP                           = 0x9
-	PT_THUPDATE                       = 0xd
-	PT_TRACE_ME                       = 0x0
-	PT_WRITE_D                        = 0x5
-	PT_WRITE_I                        = 0x4
-	PT_WRITE_U                        = 0x6
-	RLIMIT_AS                         = 0x5
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_CPU_USAGE_MONITOR          = 0x2
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_CONDEMNED                     = 0x2000000
-	RTF_DELCLONE                      = 0x80
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_IFREF                         = 0x4000000
-	RTF_IFSCOPE                       = 0x1000000
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_PROXY                         = 0x8000000
-	RTF_REJECT                        = 0x8
-	RTF_ROUTER                        = 0x10000000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_GET2                          = 0x14
-	RTM_IFINFO                        = 0xe
-	RTM_IFINFO2                       = 0x12
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_NEWMADDR2                     = 0x13
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SCM_TIMESTAMP_MONOTONIC           = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCARPIPLL                       = 0xc0206928
-	SIOCATMARK                        = 0x40047307
-	SIOCAUTOADDR                      = 0xc0206926
-	SIOCAUTONETMASK                   = 0x80206927
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETVLAN                       = 0xc020697f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFALTMTU                     = 0xc0206948
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBOND                       = 0xc0206947
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020695b
-	SIOCGIFCONF                       = 0xc00c6924
-	SIOCGIFDEVMTU                     = 0xc0206944
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFKPI                        = 0xc0206987
-	SIOCGIFMAC                        = 0xc0206982
-	SIOCGIFMEDIA                      = 0xc02c6938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206940
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc020693f
-	SIOCGIFSTATUS                     = 0xc331693d
-	SIOCGIFVLAN                       = 0xc020697f
-	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCIFCREATE                      = 0xc0206978
-	SIOCIFCREATE2                     = 0xc020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106981
-	SIOCRSLVMULTI                     = 0xc010693b
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSETVLAN                       = 0x8020697e
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFALTMTU                     = 0x80206945
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBOND                       = 0x80206946
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020695a
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFKPI                        = 0x80206986
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206983
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x8040693e
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_DONTTRUNC                      = 0x2000
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1010
-	SO_LINGER                         = 0x80
-	SO_LINGER_SEC                     = 0x1080
-	SO_NKE                            = 0x1021
-	SO_NOADDRERR                      = 0x1023
-	SO_NOSIGPIPE                      = 0x1022
-	SO_NOTIFYCONFLICT                 = 0x1026
-	SO_NP_EXTENSIONS                  = 0x1083
-	SO_NREAD                          = 0x1020
-	SO_NUMRCVPKT                      = 0x1112
-	SO_NWRITE                         = 0x1024
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1011
-	SO_RANDOMPORT                     = 0x1082
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_REUSESHAREUID                  = 0x1025
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TIMESTAMP_MONOTONIC            = 0x800
-	SO_TYPE                           = 0x1008
-	SO_UPCALLCLOSEWAIT                = 0x1027
-	SO_USELOOPBACK                    = 0x40
-	SO_WANTMORE                       = 0x4000
-	SO_WANTOOBFLAG                    = 0x8000
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONNECTIONTIMEOUT             = 0x20
-	TCP_ENABLE_ECN                    = 0x104
-	TCP_KEEPALIVE                     = 0x10
-	TCP_KEEPCNT                       = 0x102
-	TCP_KEEPINTVL                     = 0x101
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_NOTSENT_LOWAT                 = 0x201
-	TCP_RXT_CONNDROPTIME              = 0x80
-	TCP_RXT_FINDROP                   = 0x100
-	TCP_SENDMOREACKS                  = 0x103
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCDSIMICROCODE                  = 0x20007455
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x40487413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGWINSZ                        = 0x40087468
-	TIOCIXOFF                         = 0x20007480
-	TIOCIXON                          = 0x20007481
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTYGNAME                      = 0x40807453
-	TIOCPTYGRANT                      = 0x20007454
-	TIOCPTYUNLK                       = 0x20007452
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCONS                         = 0x20007463
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x80487414
-	TIOCSETAF                         = 0x80487416
-	TIOCSETAW                         = 0x80487415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VT0                               = 0x0
-	VT1                               = 0x10000
-	VTDLY                             = 0x10000
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x10
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x4
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x20
-	WORDSIZE                          = 0x40
-	WSTOPPED                          = 0x8
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADARCH        = syscall.Errno(0x56)
-	EBADEXEC        = syscall.Errno(0x55)
-	EBADF           = syscall.Errno(0x9)
-	EBADMACHO       = syscall.Errno(0x58)
-	EBADMSG         = syscall.Errno(0x5e)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x59)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDEVERR         = syscall.Errno(0x53)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x5a)
-	EILSEQ          = syscall.Errno(0x5c)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x6a)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5f)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x60)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x61)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5b)
-	ENOPOLICY       = syscall.Errno(0x67)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x62)
-	ENOSTR          = syscall.Errno(0x63)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x68)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x66)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x69)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x64)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	EPWROFF         = syscall.Errno(0x52)
-	EQFULL          = syscall.Errno(0x6a)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHLIBVERS      = syscall.Errno(0x57)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x65)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm64.go
deleted file mode 100644
index 3189c6b345..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_darwin_arm64.go
+++ /dev/null
@@ -1,1576 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm64,darwin
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1c
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1e
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1c
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x28
-	AF_NATM                           = 0x1f
-	AF_NDRV                           = 0x1b
-	AF_NETBIOS                        = 0x21
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PPP                            = 0x22
-	AF_PUP                            = 0x4
-	AF_RESERVED_36                    = 0x24
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_SYSTEM                         = 0x20
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_UTUN                           = 0x26
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc00c4279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80104267
-	BIOCSETFNR                        = 0x8010427e
-	BIOCSETIF                         = 0x8020426c
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf5
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_MACHPORT                   = -0x8
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xa
-	EVFILT_VM                         = -0xc
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG0                          = 0x1000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_OOBAND                         = 0x2000
-	EV_POLL                           = 0x1000
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_ADDFILESIGS                     = 0x3d
-	F_ADDSIGS                         = 0x3b
-	F_ALLOCATEALL                     = 0x4
-	F_ALLOCATECONTIG                  = 0x2
-	F_CHKCLEAN                        = 0x29
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x43
-	F_FINDSIGS                        = 0x4e
-	F_FLUSH_DATA                      = 0x28
-	F_FREEZE_FS                       = 0x35
-	F_FULLFSYNC                       = 0x33
-	F_GETCODEDIR                      = 0x48
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETLKPID                        = 0x42
-	F_GETNOSIGPIPE                    = 0x4a
-	F_GETOWN                          = 0x5
-	F_GETPATH                         = 0x32
-	F_GETPATH_MTMINFO                 = 0x47
-	F_GETPROTECTIONCLASS              = 0x3f
-	F_GETPROTECTIONLEVEL              = 0x4d
-	F_GLOBAL_NOCACHE                  = 0x37
-	F_LOG2PHYS                        = 0x31
-	F_LOG2PHYS_EXT                    = 0x41
-	F_NOCACHE                         = 0x30
-	F_NODIRECT                        = 0x3e
-	F_OK                              = 0x0
-	F_PATHPKG_CHECK                   = 0x34
-	F_PEOFPOSMODE                     = 0x3
-	F_PREALLOCATE                     = 0x2a
-	F_RDADVISE                        = 0x2c
-	F_RDAHEAD                         = 0x2d
-	F_RDLCK                           = 0x1
-	F_SETBACKINGSTORE                 = 0x46
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETLKWTIMEOUT                   = 0xa
-	F_SETNOSIGPIPE                    = 0x49
-	F_SETOWN                          = 0x6
-	F_SETPROTECTIONCLASS              = 0x40
-	F_SETSIZE                         = 0x2b
-	F_SINGLE_WRITER                   = 0x4c
-	F_THAW_FS                         = 0x36
-	F_TRANSCODEKEY                    = 0x4b
-	F_UNLCK                           = 0x2
-	F_VOLPOSMODE                      = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_AAL5                          = 0x31
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ATM                           = 0x25
-	IFT_BRIDGE                        = 0xd1
-	IFT_CARP                          = 0xf8
-	IFT_CELLULAR                      = 0xff
-	IFT_CEPT                          = 0x13
-	IFT_DS3                           = 0x1e
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0x38
-	IFT_FDDI                          = 0xf
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_GIF                           = 0x37
-	IFT_HDH1822                       = 0x3
-	IFT_HIPPI                         = 0x2f
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE8023ADLAG                 = 0x88
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88026                      = 0xa
-	IFT_L2VLAN                        = 0x87
-	IFT_LAPB                          = 0x10
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_NSIP                          = 0x1b
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PDP                           = 0xff
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PKTAP                         = 0xfe
-	IFT_PPP                           = 0x17
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PTPSERIAL                     = 0x16
-	IFT_RS232                         = 0x21
-	IFT_SDLC                          = 0x11
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0x39
-	IFT_T1                            = 0x12
-	IFT_ULTRA                         = 0x1d
-	IFT_V35                           = 0x2d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LINKLOCALNETNUM                = 0xa9fe0000
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_2292DSTOPTS                  = 0x17
-	IPV6_2292HOPLIMIT                 = 0x14
-	IPV6_2292HOPOPTS                  = 0x16
-	IPV6_2292NEXTHOP                  = 0x15
-	IPV6_2292PKTINFO                  = 0x13
-	IPV6_2292PKTOPTIONS               = 0x19
-	IPV6_2292RTHDR                    = 0x18
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_BOUND_IF                     = 0x7d
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x3c
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVTCLASS                   = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x24
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_BOUND_IF                       = 0x19
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x28
-	IP_FW_DEL                         = 0x29
-	IP_FW_FLUSH                       = 0x2a
-	IP_FW_GET                         = 0x2c
-	IP_FW_RESETLOG                    = 0x2d
-	IP_FW_ZERO                        = 0x2b
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MF                             = 0x2000
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_IFINDEX              = 0x42
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_NAT__XXX                       = 0x37
-	IP_OFFMASK                        = 0x1fff
-	IP_OLD_FW_ADD                     = 0x32
-	IP_OLD_FW_DEL                     = 0x33
-	IP_OLD_FW_FLUSH                   = 0x34
-	IP_OLD_FW_GET                     = 0x36
-	IP_OLD_FW_RESETLOG                = 0x38
-	IP_OLD_FW_ZERO                    = 0x35
-	IP_OPTIONS                        = 0x1
-	IP_PKTINFO                        = 0x1a
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVPKTINFO                    = 0x1a
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x18
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_STRIPHDR                       = 0x17
-	IP_TOS                            = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IUTF8                             = 0x4000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_CAN_REUSE                    = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_FREE_REUSABLE                = 0x7
-	MADV_FREE_REUSE                   = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MADV_ZERO_WIRED_PAGES             = 0x6
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_JIT                           = 0x800
-	MAP_NOCACHE                       = 0x400
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_SHARED                        = 0x1
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FLUSH                         = 0x400
-	MSG_HAVEMORE                      = 0x2000
-	MSG_HOLD                          = 0x800
-	MSG_NEEDSA                        = 0x10000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_RCVMORE                       = 0x4000
-	MSG_SEND                          = 0x1000
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MSG_WAITSTREAM                    = 0x200
-	MS_ASYNC                          = 0x1
-	MS_DEACTIVATE                     = 0x8
-	MS_INVALIDATE                     = 0x2
-	MS_KILLPAGES                      = 0x4
-	MS_SYNC                           = 0x10
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_DUMP2                      = 0x7
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLIST2                    = 0x6
-	NET_RT_MAXID                      = 0xa
-	NET_RT_STAT                       = 0x4
-	NET_RT_TRASH                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ABSOLUTE                     = 0x8
-	NOTE_ATTRIB                       = 0x8
-	NOTE_BACKGROUND                   = 0x40
-	NOTE_CHILD                        = 0x4
-	NOTE_CRITICAL                     = 0x20
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXITSTATUS                   = 0x4000000
-	NOTE_EXIT_CSERROR                 = 0x40000
-	NOTE_EXIT_DECRYPTFAIL             = 0x10000
-	NOTE_EXIT_DETAIL                  = 0x2000000
-	NOTE_EXIT_DETAIL_MASK             = 0x70000
-	NOTE_EXIT_MEMORY                  = 0x20000
-	NOTE_EXIT_REPARENTED              = 0x80000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LEEWAY                       = 0x10
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_NONE                         = 0x80
-	NOTE_NSECONDS                     = 0x4
-	NOTE_PCTRLMASK                    = -0x100000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_REAP                         = 0x10000000
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_SIGNAL                       = 0x8000000
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x2
-	NOTE_VM_ERROR                     = 0x10000000
-	NOTE_VM_PRESSURE                  = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFDEL                             = 0x20000
-	OFILL                             = 0x80
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALERT                           = 0x20000000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x1000000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x100000
-	O_DP_GETRAWENCRYPTED              = 0x1
-	O_DSYNC                           = 0x400000
-	O_EVTONLY                         = 0x8000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x20000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_POPUP                           = 0x80000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYMLINK                         = 0x200000
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_ATTACH                         = 0xa
-	PT_ATTACHEXC                      = 0xe
-	PT_CONTINUE                       = 0x7
-	PT_DENY_ATTACH                    = 0x1f
-	PT_DETACH                         = 0xb
-	PT_FIRSTMACH                      = 0x20
-	PT_FORCEQUOTA                     = 0x1e
-	PT_KILL                           = 0x8
-	PT_READ_D                         = 0x2
-	PT_READ_I                         = 0x1
-	PT_READ_U                         = 0x3
-	PT_SIGEXC                         = 0xc
-	PT_STEP                           = 0x9
-	PT_THUPDATE                       = 0xd
-	PT_TRACE_ME                       = 0x0
-	PT_WRITE_D                        = 0x5
-	PT_WRITE_I                        = 0x4
-	PT_WRITE_U                        = 0x6
-	RLIMIT_AS                         = 0x5
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_CPU_USAGE_MONITOR          = 0x2
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_CONDEMNED                     = 0x2000000
-	RTF_DELCLONE                      = 0x80
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_IFREF                         = 0x4000000
-	RTF_IFSCOPE                       = 0x1000000
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_NOIFREF                       = 0x2000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_PROXY                         = 0x8000000
-	RTF_REJECT                        = 0x8
-	RTF_ROUTER                        = 0x10000000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_GET2                          = 0x14
-	RTM_IFINFO                        = 0xe
-	RTM_IFINFO2                       = 0x12
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_NEWMADDR2                     = 0x13
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SCM_TIMESTAMP_MONOTONIC           = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCARPIPLL                       = 0xc0206928
-	SIOCATMARK                        = 0x40047307
-	SIOCAUTOADDR                      = 0xc0206926
-	SIOCAUTONETMASK                   = 0x80206927
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETVLAN                       = 0xc020697f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFALTMTU                     = 0xc0206948
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBOND                       = 0xc0206947
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020695b
-	SIOCGIFCONF                       = 0xc00c6924
-	SIOCGIFDEVMTU                     = 0xc0206944
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFKPI                        = 0xc0206987
-	SIOCGIFMAC                        = 0xc0206982
-	SIOCGIFMEDIA                      = 0xc02c6938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206940
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc020693f
-	SIOCGIFSTATUS                     = 0xc331693d
-	SIOCGIFVLAN                       = 0xc020697f
-	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCIFCREATE                      = 0xc0206978
-	SIOCIFCREATE2                     = 0xc020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106981
-	SIOCRSLVMULTI                     = 0xc010693b
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSETVLAN                       = 0x8020697e
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFALTMTU                     = 0x80206945
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBOND                       = 0x80206946
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020695a
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFKPI                        = 0x80206986
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206983
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x8040693e
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_DONTTRUNC                      = 0x2000
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1010
-	SO_LINGER                         = 0x80
-	SO_LINGER_SEC                     = 0x1080
-	SO_NKE                            = 0x1021
-	SO_NOADDRERR                      = 0x1023
-	SO_NOSIGPIPE                      = 0x1022
-	SO_NOTIFYCONFLICT                 = 0x1026
-	SO_NP_EXTENSIONS                  = 0x1083
-	SO_NREAD                          = 0x1020
-	SO_NUMRCVPKT                      = 0x1112
-	SO_NWRITE                         = 0x1024
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1011
-	SO_RANDOMPORT                     = 0x1082
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_REUSESHAREUID                  = 0x1025
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TIMESTAMP_MONOTONIC            = 0x800
-	SO_TYPE                           = 0x1008
-	SO_UPCALLCLOSEWAIT                = 0x1027
-	SO_USELOOPBACK                    = 0x40
-	SO_WANTMORE                       = 0x4000
-	SO_WANTOOBFLAG                    = 0x8000
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONNECTIONTIMEOUT             = 0x20
-	TCP_ENABLE_ECN                    = 0x104
-	TCP_KEEPALIVE                     = 0x10
-	TCP_KEEPCNT                       = 0x102
-	TCP_KEEPINTVL                     = 0x101
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_NOTSENT_LOWAT                 = 0x201
-	TCP_RXT_CONNDROPTIME              = 0x80
-	TCP_RXT_FINDROP                   = 0x100
-	TCP_SENDMOREACKS                  = 0x103
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCDSIMICROCODE                  = 0x20007455
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x40487413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGWINSZ                        = 0x40087468
-	TIOCIXOFF                         = 0x20007480
-	TIOCIXON                          = 0x20007481
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTYGNAME                      = 0x40807453
-	TIOCPTYGRANT                      = 0x20007454
-	TIOCPTYUNLK                       = 0x20007452
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCONS                         = 0x20007463
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x80487414
-	TIOCSETAF                         = 0x80487416
-	TIOCSETAW                         = 0x80487415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VT0                               = 0x0
-	VT1                               = 0x10000
-	VTDLY                             = 0x10000
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x10
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x4
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x20
-	WORDSIZE                          = 0x40
-	WSTOPPED                          = 0x8
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADARCH        = syscall.Errno(0x56)
-	EBADEXEC        = syscall.Errno(0x55)
-	EBADF           = syscall.Errno(0x9)
-	EBADMACHO       = syscall.Errno(0x58)
-	EBADMSG         = syscall.Errno(0x5e)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x59)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDEVERR         = syscall.Errno(0x53)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x5a)
-	EILSEQ          = syscall.Errno(0x5c)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x6a)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5f)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x60)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x61)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5b)
-	ENOPOLICY       = syscall.Errno(0x67)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x62)
-	ENOSTR          = syscall.Errno(0x63)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x68)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x66)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x69)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x64)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	EPWROFF         = syscall.Errno(0x52)
-	EQFULL          = syscall.Errno(0x6a)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHLIBVERS      = syscall.Errno(0x57)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x65)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "device not configured",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource deadlock avoided",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "resource busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "operation not supported by device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "result too large",
-	35:  "resource temporarily unavailable",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol family",
-	48:  "address already in use",
-	49:  "can't assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "socket is already connected",
-	57:  "socket is not connected",
-	58:  "can't send after socket shutdown",
-	59:  "too many references: can't splice",
-	60:  "operation timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disc quota exceeded",
-	70:  "stale NFS file handle",
-	71:  "too many levels of remote in path",
-	72:  "RPC struct is bad",
-	73:  "RPC version wrong",
-	74:  "RPC prog. not avail",
-	75:  "program version wrong",
-	76:  "bad procedure for program",
-	77:  "no locks available",
-	78:  "function not implemented",
-	79:  "inappropriate file type or format",
-	80:  "authentication error",
-	81:  "need authenticator",
-	82:  "device power is off",
-	83:  "device error",
-	84:  "value too large to be stored in data type",
-	85:  "bad executable (or shared library)",
-	86:  "bad CPU type in executable",
-	87:  "shared library version mismatch",
-	88:  "malformed Mach-o file",
-	89:  "operation canceled",
-	90:  "identifier removed",
-	91:  "no message of desired type",
-	92:  "illegal byte sequence",
-	93:  "attribute not found",
-	94:  "bad message",
-	95:  "EMULTIHOP (Reserved)",
-	96:  "no message available on STREAM",
-	97:  "ENOLINK (Reserved)",
-	98:  "no STREAM resources",
-	99:  "not a STREAM",
-	100: "protocol error",
-	101: "STREAM ioctl timeout",
-	102: "operation not supported on socket",
-	103: "policy not found",
-	104: "state not recoverable",
-	105: "previous owner died",
-	106: "interface output queue is full",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
deleted file mode 100644
index 0feceee151..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
+++ /dev/null
@@ -1,1530 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,dragonfly
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x21
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x23
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x24
-	AF_MPLS                           = 0x22
-	AF_NATM                           = 0x1d
-	AF_NETGRAPH                       = 0x20
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0104279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8010427b
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x8
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DEFAULTBUFSIZE                = 0x1000
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MAX_CLONES                    = 0x80
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DOCSIS                        = 0x8f
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_REDBACK_SMARTEDGE             = 0x20
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DBF                            = 0xf
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_EXCEPT                     = -0x8
-	EVFILT_MARKER                     = 0xf
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x8
-	EVFILT_TIMER                      = -0x7
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_NODATA                         = 0x1000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTEXIT_LWP                       = 0x10000
-	EXTEXIT_PROC                      = 0x0
-	EXTEXIT_SETINT                    = 0x1
-	EXTEXIT_SIMPLE                    = 0x0
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETOWN                          = 0x5
-	F_OK                              = 0x0
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x118e72
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NPOLLING                      = 0x100000
-	IFF_OACTIVE                       = 0x400
-	IFF_OACTIVE_COMPAT                = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_POLLING                       = 0x10000
-	IFF_POLLING_COMPAT                = 0x10000
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xf3
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UNKNOWN                   = 0x102
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PKTOPTIONS                   = 0x34
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0x14
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CONTROL_END                  = 0xb
-	MADV_CONTROL_START                = 0xa
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_INVAL                        = 0xa
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SETMAP                       = 0xb
-	MADV_WILLNEED                     = 0x3
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_NOCORE                        = 0x20000
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_SIZEALIGN                     = 0x40000
-	MAP_STACK                         = 0x400
-	MAP_TRYFIXED                      = 0x10000
-	MAP_VPAGETABLE                    = 0x2000
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FBLOCKING                     = 0x10000
-	MSG_FMASK                         = 0xffff0000
-	MSG_FNONBLOCKING                  = 0x20000
-	MSG_NOSIGNAL                      = 0x400
-	MSG_NOTIFICATION                  = 0x200
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_SYNC                          = 0x800
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_MAXID                      = 0x4
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x2
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x20000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x8000000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FAPPEND                         = 0x100000
-	O_FASYNCWRITE                     = 0x800000
-	O_FBLOCKING                       = 0x40000
-	O_FBUFFERED                       = 0x2000000
-	O_FMASK                           = 0x7fc0000
-	O_FNONBLOCKING                    = 0x80000
-	O_FOFFSET                         = 0x200000
-	O_FSYNC                           = 0x80
-	O_FSYNCWRITE                      = 0x400000
-	O_FUNBUFFERED                     = 0x1000000
-	O_MAPONREAD                       = 0x4000000
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0xb
-	RTAX_MPLS1                        = 0x8
-	RTAX_MPLS2                        = 0x9
-	RTAX_MPLS3                        = 0xa
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_MPLS1                         = 0x100
-	RTA_MPLS2                         = 0x200
-	RTA_MPLS3                         = 0x400
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MPLSOPS                       = 0x1000000
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x6
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_IWCAPSEGS                     = 0x400
-	RTV_IWMAXSEGS                     = 0x200
-	RTV_MSL                           = 0x100
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8040720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8040720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETSGCNT                      = 0xc0207210
-	SIOCGETVIFCNT                     = 0xc028720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0106924
-	SIOCGIFDATA                       = 0xc0206926
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc028698a
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMEDIA                      = 0xc0306938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPOLLCPU                    = 0xc020697e
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGIFTSOLEN                     = 0xc0206980
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFPOLLCPU                    = 0x8020697d
-	SIOCSIFTSOLEN                     = 0x8020697f
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NOSIGPIPE                      = 0x800
-	SO_OOBINLINE                      = 0x100
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDSPACE                       = 0x100a
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_FASTKEEP                      = 0x80
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x20
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0x100
-	TCP_MIN_WINSHIFT                  = 0x5
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_SIGNATURE_ENABLE              = 0x10
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGSID                          = 0x40047463
-	TIOCGSIZE                         = 0x40087468
-	TIOCGWINSZ                        = 0x40087468
-	TIOCISPTMASTER                    = 0x20007455
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSSIZE                         = 0x80087467
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VCHECKPT                          = 0x13
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EASYNC          = syscall.Errno(0x63)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x63)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEDIUM       = syscall.Errno(0x5d)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUNUSED94       = syscall.Errno(0x5e)
-	EUNUSED95       = syscall.Errno(0x5f)
-	EUNUSED96       = syscall.Errno(0x60)
-	EUNUSED97       = syscall.Errno(0x61)
-	EUNUSED98       = syscall.Errno(0x62)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT     = syscall.Signal(0x6)
-	SIGALRM     = syscall.Signal(0xe)
-	SIGBUS      = syscall.Signal(0xa)
-	SIGCHLD     = syscall.Signal(0x14)
-	SIGCKPT     = syscall.Signal(0x21)
-	SIGCKPTEXIT = syscall.Signal(0x22)
-	SIGCONT     = syscall.Signal(0x13)
-	SIGEMT      = syscall.Signal(0x7)
-	SIGFPE      = syscall.Signal(0x8)
-	SIGHUP      = syscall.Signal(0x1)
-	SIGILL      = syscall.Signal(0x4)
-	SIGINFO     = syscall.Signal(0x1d)
-	SIGINT      = syscall.Signal(0x2)
-	SIGIO       = syscall.Signal(0x17)
-	SIGIOT      = syscall.Signal(0x6)
-	SIGKILL     = syscall.Signal(0x9)
-	SIGPIPE     = syscall.Signal(0xd)
-	SIGPROF     = syscall.Signal(0x1b)
-	SIGQUIT     = syscall.Signal(0x3)
-	SIGSEGV     = syscall.Signal(0xb)
-	SIGSTOP     = syscall.Signal(0x11)
-	SIGSYS      = syscall.Signal(0xc)
-	SIGTERM     = syscall.Signal(0xf)
-	SIGTHR      = syscall.Signal(0x20)
-	SIGTRAP     = syscall.Signal(0x5)
-	SIGTSTP     = syscall.Signal(0x12)
-	SIGTTIN     = syscall.Signal(0x15)
-	SIGTTOU     = syscall.Signal(0x16)
-	SIGURG      = syscall.Signal(0x10)
-	SIGUSR1     = syscall.Signal(0x1e)
-	SIGUSR2     = syscall.Signal(0x1f)
-	SIGVTALRM   = syscall.Signal(0x1a)
-	SIGWINCH    = syscall.Signal(0x1c)
-	SIGXCPU     = syscall.Signal(0x18)
-	SIGXFSZ     = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "no medium found",
-	94: "unknown error: 94",
-	95: "unknown error: 95",
-	96: "unknown error: 96",
-	97: "unknown error: 97",
-	98: "unknown error: 98",
-	99: "unknown error: 99",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "thread Scheduler",
-	33: "checkPoint",
-	34: "checkPointExit",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go
deleted file mode 100644
index 7b95751c3d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_386.go
+++ /dev/null
@@ -1,1743 +0,0 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,freebsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x23
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x24
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_INET6_SDP                      = 0x2a
-	AF_INET_SDP                       = 0x28
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x2a
-	AF_NATM                           = 0x1d
-	AF_NETBIOS                        = 0x6
-	AF_NETGRAPH                       = 0x20
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SCLUSTER                       = 0x22
-	AF_SIP                            = 0x18
-	AF_SLOW                           = 0x21
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_VENDOR00                       = 0x27
-	AF_VENDOR01                       = 0x29
-	AF_VENDOR02                       = 0x2b
-	AF_VENDOR03                       = 0x2d
-	AF_VENDOR04                       = 0x2f
-	AF_VENDOR05                       = 0x31
-	AF_VENDOR06                       = 0x33
-	AF_VENDOR07                       = 0x35
-	AF_VENDOR08                       = 0x37
-	AF_VENDOR09                       = 0x39
-	AF_VENDOR10                       = 0x3b
-	AF_VENDOR11                       = 0x3d
-	AF_VENDOR12                       = 0x3f
-	AF_VENDOR13                       = 0x41
-	AF_VENDOR14                       = 0x43
-	AF_VENDOR15                       = 0x45
-	AF_VENDOR16                       = 0x47
-	AF_VENDOR17                       = 0x49
-	AF_VENDOR18                       = 0x4b
-	AF_VENDOR19                       = 0x4d
-	AF_VENDOR20                       = 0x4f
-	AF_VENDOR21                       = 0x51
-	AF_VENDOR22                       = 0x53
-	AF_VENDOR23                       = 0x55
-	AF_VENDOR24                       = 0x57
-	AF_VENDOR25                       = 0x59
-	AF_VENDOR26                       = 0x5b
-	AF_VENDOR27                       = 0x5d
-	AF_VENDOR28                       = 0x5f
-	AF_VENDOR29                       = 0x61
-	AF_VENDOR30                       = 0x63
-	AF_VENDOR31                       = 0x65
-	AF_VENDOR32                       = 0x67
-	AF_VENDOR33                       = 0x69
-	AF_VENDOR34                       = 0x6b
-	AF_VENDOR35                       = 0x6d
-	AF_VENDOR36                       = 0x6f
-	AF_VENDOR37                       = 0x71
-	AF_VENDOR38                       = 0x73
-	AF_VENDOR39                       = 0x75
-	AF_VENDOR40                       = 0x77
-	AF_VENDOR41                       = 0x79
-	AF_VENDOR42                       = 0x7b
-	AF_VENDOR43                       = 0x7d
-	AF_VENDOR44                       = 0x7f
-	AF_VENDOR45                       = 0x81
-	AF_VENDOR46                       = 0x83
-	AF_VENDOR47                       = 0x85
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427c
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRECTION                    = 0x40044276
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084279
-	BIOCGETBUFMODE                    = 0x4004427d
-	BIOCGETIF                         = 0x4020426b
-	BIOCGETZMAX                       = 0x4004427f
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4008426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCGTSTAMP                       = 0x40044283
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCROTZBUF                       = 0x400c4280
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRECTION                    = 0x80044277
-	BIOCSDLT                          = 0x80044278
-	BIOCSETBUFMODE                    = 0x8004427e
-	BIOCSETF                          = 0x80084267
-	BIOCSETFNR                        = 0x80084282
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8008427b
-	BIOCSETZBUF                       = 0x800c4281
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8008426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCSTSTAMP                       = 0x80044284
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_BUFMODE_BUFFER                = 0x1
-	BPF_BUFMODE_ZBUF                  = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_T_BINTIME                     = 0x2
-	BPF_T_BINTIME_FAST                = 0x102
-	BPF_T_BINTIME_MONOTONIC           = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
-	BPF_T_FAST                        = 0x100
-	BPF_T_FLAG_MASK                   = 0x300
-	BPF_T_FORMAT_MASK                 = 0x3
-	BPF_T_MICROTIME                   = 0x0
-	BPF_T_MICROTIME_FAST              = 0x100
-	BPF_T_MICROTIME_MONOTONIC         = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
-	BPF_T_MONOTONIC                   = 0x200
-	BPF_T_MONOTONIC_FAST              = 0x300
-	BPF_T_NANOTIME                    = 0x1
-	BPF_T_NANOTIME_FAST               = 0x101
-	BPF_T_NANOTIME_MONOTONIC          = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
-	BPF_T_NONE                        = 0x3
-	BPF_T_NORMAL                      = 0x0
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLOCK_MONOTONIC                   = 0x4
-	CLOCK_MONOTONIC_FAST              = 0xc
-	CLOCK_MONOTONIC_PRECISE           = 0xb
-	CLOCK_PROCESS_CPUTIME_ID          = 0xf
-	CLOCK_PROF                        = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_REALTIME_FAST               = 0xa
-	CLOCK_REALTIME_PRECISE            = 0x9
-	CLOCK_SECOND                      = 0xd
-	CLOCK_THREAD_CPUTIME_ID           = 0xe
-	CLOCK_UPTIME                      = 0x5
-	CLOCK_UPTIME_FAST                 = 0x8
-	CLOCK_UPTIME_PRECISE              = 0x7
-	CLOCK_VIRTUAL                     = 0x1
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0x18
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf6
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x79
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_LIO                        = -0xa
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xb
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xb
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_DROP                           = 0x1000
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTATTR_NAMESPACE_EMPTY           = 0x0
-	EXTATTR_NAMESPACE_SYSTEM          = 0x2
-	EXTATTR_NAMESPACE_USER            = 0x1
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_CANCEL                          = 0x5
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0xb
-	F_GETOWN                          = 0x5
-	F_OGETLK                          = 0x7
-	F_OK                              = 0x0
-	F_OSETLK                          = 0x8
-	F_OSETLKW                         = 0x9
-	F_RDAHEAD                         = 0x10
-	F_RDLCK                           = 0x1
-	F_READAHEAD                       = 0xf
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0xc
-	F_SETLKW                          = 0xd
-	F_SETLK_REMOTE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_UNLCKSYS                        = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x218f72
-	IFF_CANTCONFIG                    = 0x10000
-	IFF_DEBUG                         = 0x4
-	IFF_DRV_OACTIVE                   = 0x400
-	IFF_DRV_RUNNING                   = 0x40
-	IFF_DYING                         = 0x200000
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RENAMING                      = 0x400000
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_IPXIP                         = 0xf9
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf6
-	IFT_PFSYNC                        = 0xf7
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_MASK                   = 0xfffffffe
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HIP                       = 0x8b
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MH                        = 0x87
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OLD_DIVERT                = 0xfe
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_RESERVED_253              = 0xfd
-	IPPROTO_RESERVED_254              = 0xfe
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEND                      = 0x103
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SHIM6                     = 0x8c
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SPACER                    = 0x7fff
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDANY                      = 0x40
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BINDANY                        = 0x18
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DONTFRAG                       = 0x43
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET3                      = 0x31
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW3                            = 0x30
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_NAT_CFG                     = 0x38
-	IP_FW_NAT_DEL                     = 0x39
-	IP_FW_NAT_GET_CONFIG              = 0x3a
-	IP_FW_NAT_GET_LOG                 = 0x3b
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_TABLE_ADD                   = 0x28
-	IP_FW_TABLE_DEL                   = 0x29
-	IP_FW_TABLE_FLUSH                 = 0x2a
-	IP_FW_TABLE_GETSIZE               = 0x2b
-	IP_FW_TABLE_LIST                  = 0x2c
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MAX_SOURCE_FILTER              = 0x400
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_ONESBCAST                      = 0x17
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTOS                        = 0x44
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_PROTECT                      = 0xa
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNED_SUPER                 = 0x1000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_EXCL                          = 0x4000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_NOCORE                        = 0x20000
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PREFAULT_READ                 = 0x40000
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_RESERVED0100                  = 0x100
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CMSG_CLOEXEC                  = 0x40000
-	MSG_COMPAT                        = 0x8000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_NBIO                          = 0x4000
-	MSG_NOSIGNAL                      = 0x20000
-	MSG_NOTIFICATION                  = 0x2000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLISTL                    = 0x5
-	NET_RT_IFMALIST                   = 0x4
-	NET_RT_MAXID                      = 0x6
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x100000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x20000
-	O_EXCL                            = 0x800
-	O_EXEC                            = 0x40000
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_TTY_INIT                        = 0x80000
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x1004d808
-	RTF_GATEWAY                       = 0x2
-	RTF_GWFLAG_COMPAT                 = 0x80000000
-	RTF_HOST                          = 0x4
-	RTF_LLDATA                        = 0x400
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_RNH_LOCKED                    = 0x40000000
-	RTF_STATIC                        = 0x800
-	RTF_STICKY                        = 0x10000000
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RTV_WEIGHT                        = 0x100
-	RT_ALL_FIBS                       = -0x1
-	RT_CACHING_CONTEXT                = 0x1
-	RT_DEFAULT_FIB                    = 0x0
-	RT_NORTREF                        = 0x2
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_BINTIME                       = 0x4
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80246987
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETSGCNT                      = 0xc0147210
-	SIOCGETVIFCNT                     = 0xc014720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDESCR                      = 0xc020692a
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFIB                        = 0xc020695c
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc024698a
-	SIOCGIFGROUP                      = 0xc0246988
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMAC                        = 0xc0206926
-	SIOCGIFMEDIA                      = 0xc0286938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDESCR                      = 0x80206929
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFIB                        = 0x8020695d
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206927
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFRVNET                      = 0xc020695b
-	SIOCSIFVNET                       = 0xc020695a
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BINTIME                        = 0x2000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1009
-	SO_LINGER                         = 0x80
-	SO_LISTENINCQLEN                  = 0x1013
-	SO_LISTENQLEN                     = 0x1012
-	SO_LISTENQLIMIT                   = 0x1011
-	SO_NOSIGPIPE                      = 0x800
-	SO_NO_DDP                         = 0x8000
-	SO_NO_OFFLOAD                     = 0x4000
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1010
-	SO_PROTOCOL                       = 0x1016
-	SO_PROTOTYPE                      = 0x1016
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SETFIB                         = 0x1014
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_USER_COOKIE                    = 0x1015
-	SO_VENDOR                         = 0x80000000
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CA_NAME_MAX                   = 0x10
-	TCP_CONGESTION                    = 0x40
-	TCP_INFO                          = 0x20
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x80
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_VENDOR                        = 0x80000000
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGPTN                          = 0x4004740f
-	TIOCGSID                          = 0x40047463
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DCD                         = 0x40
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMASTER                      = 0x2000741c
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40087459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x10
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x8
-	WSTOPPED                          = 0x2
-	WTRAPPED                          = 0x20
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
-	ECAPMODE        = syscall.Errno(0x5e)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCAPABLE     = syscall.Errno(0x5d)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5f)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x60)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGLIBRT  = syscall.Signal(0x21)
-	SIGLWP    = syscall.Signal(0x20)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "capabilities insufficient",
-	94: "not permitted in capability mode",
-	95: "state not recoverable",
-	96: "previous owner died",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "unknown signal",
-	33: "unknown signal",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
deleted file mode 100644
index e48e7799a1..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
+++ /dev/null
@@ -1,1748 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,freebsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x23
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x24
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_INET6_SDP                      = 0x2a
-	AF_INET_SDP                       = 0x28
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x2a
-	AF_NATM                           = 0x1d
-	AF_NETBIOS                        = 0x6
-	AF_NETGRAPH                       = 0x20
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SCLUSTER                       = 0x22
-	AF_SIP                            = 0x18
-	AF_SLOW                           = 0x21
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_VENDOR00                       = 0x27
-	AF_VENDOR01                       = 0x29
-	AF_VENDOR02                       = 0x2b
-	AF_VENDOR03                       = 0x2d
-	AF_VENDOR04                       = 0x2f
-	AF_VENDOR05                       = 0x31
-	AF_VENDOR06                       = 0x33
-	AF_VENDOR07                       = 0x35
-	AF_VENDOR08                       = 0x37
-	AF_VENDOR09                       = 0x39
-	AF_VENDOR10                       = 0x3b
-	AF_VENDOR11                       = 0x3d
-	AF_VENDOR12                       = 0x3f
-	AF_VENDOR13                       = 0x41
-	AF_VENDOR14                       = 0x43
-	AF_VENDOR15                       = 0x45
-	AF_VENDOR16                       = 0x47
-	AF_VENDOR17                       = 0x49
-	AF_VENDOR18                       = 0x4b
-	AF_VENDOR19                       = 0x4d
-	AF_VENDOR20                       = 0x4f
-	AF_VENDOR21                       = 0x51
-	AF_VENDOR22                       = 0x53
-	AF_VENDOR23                       = 0x55
-	AF_VENDOR24                       = 0x57
-	AF_VENDOR25                       = 0x59
-	AF_VENDOR26                       = 0x5b
-	AF_VENDOR27                       = 0x5d
-	AF_VENDOR28                       = 0x5f
-	AF_VENDOR29                       = 0x61
-	AF_VENDOR30                       = 0x63
-	AF_VENDOR31                       = 0x65
-	AF_VENDOR32                       = 0x67
-	AF_VENDOR33                       = 0x69
-	AF_VENDOR34                       = 0x6b
-	AF_VENDOR35                       = 0x6d
-	AF_VENDOR36                       = 0x6f
-	AF_VENDOR37                       = 0x71
-	AF_VENDOR38                       = 0x73
-	AF_VENDOR39                       = 0x75
-	AF_VENDOR40                       = 0x77
-	AF_VENDOR41                       = 0x79
-	AF_VENDOR42                       = 0x7b
-	AF_VENDOR43                       = 0x7d
-	AF_VENDOR44                       = 0x7f
-	AF_VENDOR45                       = 0x81
-	AF_VENDOR46                       = 0x83
-	AF_VENDOR47                       = 0x85
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427c
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRECTION                    = 0x40044276
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0104279
-	BIOCGETBUFMODE                    = 0x4004427d
-	BIOCGETIF                         = 0x4020426b
-	BIOCGETZMAX                       = 0x4008427f
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCGTSTAMP                       = 0x40044283
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCROTZBUF                       = 0x40184280
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRECTION                    = 0x80044277
-	BIOCSDLT                          = 0x80044278
-	BIOCSETBUFMODE                    = 0x8004427e
-	BIOCSETF                          = 0x80104267
-	BIOCSETFNR                        = 0x80104282
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8010427b
-	BIOCSETZBUF                       = 0x80184281
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCSTSTAMP                       = 0x80044284
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x8
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_BUFMODE_BUFFER                = 0x1
-	BPF_BUFMODE_ZBUF                  = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_T_BINTIME                     = 0x2
-	BPF_T_BINTIME_FAST                = 0x102
-	BPF_T_BINTIME_MONOTONIC           = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
-	BPF_T_FAST                        = 0x100
-	BPF_T_FLAG_MASK                   = 0x300
-	BPF_T_FORMAT_MASK                 = 0x3
-	BPF_T_MICROTIME                   = 0x0
-	BPF_T_MICROTIME_FAST              = 0x100
-	BPF_T_MICROTIME_MONOTONIC         = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
-	BPF_T_MONOTONIC                   = 0x200
-	BPF_T_MONOTONIC_FAST              = 0x300
-	BPF_T_NANOTIME                    = 0x1
-	BPF_T_NANOTIME_FAST               = 0x101
-	BPF_T_NANOTIME_MONOTONIC          = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
-	BPF_T_NONE                        = 0x3
-	BPF_T_NORMAL                      = 0x0
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLOCK_MONOTONIC                   = 0x4
-	CLOCK_MONOTONIC_FAST              = 0xc
-	CLOCK_MONOTONIC_PRECISE           = 0xb
-	CLOCK_PROCESS_CPUTIME_ID          = 0xf
-	CLOCK_PROF                        = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_REALTIME_FAST               = 0xa
-	CLOCK_REALTIME_PRECISE            = 0x9
-	CLOCK_SECOND                      = 0xd
-	CLOCK_THREAD_CPUTIME_ID           = 0xe
-	CLOCK_UPTIME                      = 0x5
-	CLOCK_UPTIME_FAST                 = 0x8
-	CLOCK_UPTIME_PRECISE              = 0x7
-	CLOCK_VIRTUAL                     = 0x1
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0x18
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf6
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x79
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_LIO                        = -0xa
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xb
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xb
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_DROP                           = 0x1000
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTATTR_NAMESPACE_EMPTY           = 0x0
-	EXTATTR_NAMESPACE_SYSTEM          = 0x2
-	EXTATTR_NAMESPACE_USER            = 0x1
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_CANCEL                          = 0x5
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0xb
-	F_GETOWN                          = 0x5
-	F_OGETLK                          = 0x7
-	F_OK                              = 0x0
-	F_OSETLK                          = 0x8
-	F_OSETLKW                         = 0x9
-	F_RDAHEAD                         = 0x10
-	F_RDLCK                           = 0x1
-	F_READAHEAD                       = 0xf
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0xc
-	F_SETLKW                          = 0xd
-	F_SETLK_REMOTE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_UNLCKSYS                        = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x218f72
-	IFF_CANTCONFIG                    = 0x10000
-	IFF_DEBUG                         = 0x4
-	IFF_DRV_OACTIVE                   = 0x400
-	IFF_DRV_RUNNING                   = 0x40
-	IFF_DYING                         = 0x200000
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RENAMING                      = 0x400000
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_IPXIP                         = 0xf9
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf6
-	IFT_PFSYNC                        = 0xf7
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_MASK                   = 0xfffffffe
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HIP                       = 0x8b
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MH                        = 0x87
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OLD_DIVERT                = 0xfe
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_RESERVED_253              = 0xfd
-	IPPROTO_RESERVED_254              = 0xfe
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEND                      = 0x103
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SHIM6                     = 0x8c
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SPACER                    = 0x7fff
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDANY                      = 0x40
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BINDANY                        = 0x18
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DONTFRAG                       = 0x43
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET3                      = 0x31
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW3                            = 0x30
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_NAT_CFG                     = 0x38
-	IP_FW_NAT_DEL                     = 0x39
-	IP_FW_NAT_GET_CONFIG              = 0x3a
-	IP_FW_NAT_GET_LOG                 = 0x3b
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_TABLE_ADD                   = 0x28
-	IP_FW_TABLE_DEL                   = 0x29
-	IP_FW_TABLE_FLUSH                 = 0x2a
-	IP_FW_TABLE_GETSIZE               = 0x2b
-	IP_FW_TABLE_LIST                  = 0x2c
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MAX_SOURCE_FILTER              = 0x400
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_ONESBCAST                      = 0x17
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTOS                        = 0x44
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_PROTECT                      = 0xa
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MAP_32BIT                         = 0x80000
-	MAP_ALIGNED_SUPER                 = 0x1000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_EXCL                          = 0x4000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_NOCORE                        = 0x20000
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PREFAULT_READ                 = 0x40000
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_RESERVED0100                  = 0x100
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CMSG_CLOEXEC                  = 0x40000
-	MSG_COMPAT                        = 0x8000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_NBIO                          = 0x4000
-	MSG_NOSIGNAL                      = 0x20000
-	MSG_NOTIFICATION                  = 0x2000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLISTL                    = 0x5
-	NET_RT_IFMALIST                   = 0x4
-	NET_RT_MAXID                      = 0x6
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_MSECONDS                     = 0x2
-	NOTE_NSECONDS                     = 0x8
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x4
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x100000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x20000
-	O_EXCL                            = 0x800
-	O_EXEC                            = 0x40000
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_TTY_INIT                        = 0x80000
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x1004d808
-	RTF_GATEWAY                       = 0x2
-	RTF_GWFLAG_COMPAT                 = 0x80000000
-	RTF_HOST                          = 0x4
-	RTF_LLDATA                        = 0x400
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_RNH_LOCKED                    = 0x40000000
-	RTF_STATIC                        = 0x800
-	RTF_STICKY                        = 0x10000000
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RTV_WEIGHT                        = 0x100
-	RT_ALL_FIBS                       = -0x1
-	RT_CACHING_CONTEXT                = 0x1
-	RT_DEFAULT_FIB                    = 0x0
-	RT_NORTREF                        = 0x2
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_BINTIME                       = 0x4
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8040720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80286987
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8040720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80286989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETSGCNT                      = 0xc0207210
-	SIOCGETVIFCNT                     = 0xc028720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0106924
-	SIOCGIFDESCR                      = 0xc020692a
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFIB                        = 0xc020695c
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc028698a
-	SIOCGIFGROUP                      = 0xc0286988
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMAC                        = 0xc0206926
-	SIOCGIFMEDIA                      = 0xc0306938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDESCR                      = 0x80206929
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFIB                        = 0x8020695d
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206927
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFRVNET                      = 0xc020695b
-	SIOCSIFVNET                       = 0xc020695a
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BINTIME                        = 0x2000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1009
-	SO_LINGER                         = 0x80
-	SO_LISTENINCQLEN                  = 0x1013
-	SO_LISTENQLEN                     = 0x1012
-	SO_LISTENQLIMIT                   = 0x1011
-	SO_NOSIGPIPE                      = 0x800
-	SO_NO_DDP                         = 0x8000
-	SO_NO_OFFLOAD                     = 0x4000
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1010
-	SO_PROTOCOL                       = 0x1016
-	SO_PROTOTYPE                      = 0x1016
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SETFIB                         = 0x1014
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_USER_COOKIE                    = 0x1015
-	SO_VENDOR                         = 0x80000000
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CA_NAME_MAX                   = 0x10
-	TCP_CONGESTION                    = 0x40
-	TCP_INFO                          = 0x20
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x80
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_VENDOR                        = 0x80000000
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGPTN                          = 0x4004740f
-	TIOCGSID                          = 0x40047463
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DCD                         = 0x40
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMASTER                      = 0x2000741c
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x10
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x8
-	WSTOPPED                          = 0x2
-	WTRAPPED                          = 0x20
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
-	ECAPMODE        = syscall.Errno(0x5e)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCAPABLE     = syscall.Errno(0x5d)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5f)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x60)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGLIBRT  = syscall.Signal(0x21)
-	SIGLWP    = syscall.Signal(0x20)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "capabilities insufficient",
-	94: "not permitted in capability mode",
-	95: "state not recoverable",
-	96: "previous owner died",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "unknown signal",
-	33: "unknown signal",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go
deleted file mode 100644
index 2afbe2d5ed..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_freebsd_arm.go
+++ /dev/null
@@ -1,1729 +0,0 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm,freebsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x23
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x24
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_INET6_SDP                      = 0x2a
-	AF_INET_SDP                       = 0x28
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x2a
-	AF_NATM                           = 0x1d
-	AF_NETBIOS                        = 0x6
-	AF_NETGRAPH                       = 0x20
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SCLUSTER                       = 0x22
-	AF_SIP                            = 0x18
-	AF_SLOW                           = 0x21
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_VENDOR00                       = 0x27
-	AF_VENDOR01                       = 0x29
-	AF_VENDOR02                       = 0x2b
-	AF_VENDOR03                       = 0x2d
-	AF_VENDOR04                       = 0x2f
-	AF_VENDOR05                       = 0x31
-	AF_VENDOR06                       = 0x33
-	AF_VENDOR07                       = 0x35
-	AF_VENDOR08                       = 0x37
-	AF_VENDOR09                       = 0x39
-	AF_VENDOR10                       = 0x3b
-	AF_VENDOR11                       = 0x3d
-	AF_VENDOR12                       = 0x3f
-	AF_VENDOR13                       = 0x41
-	AF_VENDOR14                       = 0x43
-	AF_VENDOR15                       = 0x45
-	AF_VENDOR16                       = 0x47
-	AF_VENDOR17                       = 0x49
-	AF_VENDOR18                       = 0x4b
-	AF_VENDOR19                       = 0x4d
-	AF_VENDOR20                       = 0x4f
-	AF_VENDOR21                       = 0x51
-	AF_VENDOR22                       = 0x53
-	AF_VENDOR23                       = 0x55
-	AF_VENDOR24                       = 0x57
-	AF_VENDOR25                       = 0x59
-	AF_VENDOR26                       = 0x5b
-	AF_VENDOR27                       = 0x5d
-	AF_VENDOR28                       = 0x5f
-	AF_VENDOR29                       = 0x61
-	AF_VENDOR30                       = 0x63
-	AF_VENDOR31                       = 0x65
-	AF_VENDOR32                       = 0x67
-	AF_VENDOR33                       = 0x69
-	AF_VENDOR34                       = 0x6b
-	AF_VENDOR35                       = 0x6d
-	AF_VENDOR36                       = 0x6f
-	AF_VENDOR37                       = 0x71
-	AF_VENDOR38                       = 0x73
-	AF_VENDOR39                       = 0x75
-	AF_VENDOR40                       = 0x77
-	AF_VENDOR41                       = 0x79
-	AF_VENDOR42                       = 0x7b
-	AF_VENDOR43                       = 0x7d
-	AF_VENDOR44                       = 0x7f
-	AF_VENDOR45                       = 0x81
-	AF_VENDOR46                       = 0x83
-	AF_VENDOR47                       = 0x85
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427c
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRECTION                    = 0x40044276
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084279
-	BIOCGETBUFMODE                    = 0x4004427d
-	BIOCGETIF                         = 0x4020426b
-	BIOCGETZMAX                       = 0x4004427f
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4008426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCGTSTAMP                       = 0x40044283
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCROTZBUF                       = 0x400c4280
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRECTION                    = 0x80044277
-	BIOCSDLT                          = 0x80044278
-	BIOCSETBUFMODE                    = 0x8004427e
-	BIOCSETF                          = 0x80084267
-	BIOCSETFNR                        = 0x80084282
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8008427b
-	BIOCSETZBUF                       = 0x800c4281
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8008426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCSTSTAMP                       = 0x80044284
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_BUFMODE_BUFFER                = 0x1
-	BPF_BUFMODE_ZBUF                  = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_T_BINTIME                     = 0x2
-	BPF_T_BINTIME_FAST                = 0x102
-	BPF_T_BINTIME_MONOTONIC           = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
-	BPF_T_FAST                        = 0x100
-	BPF_T_FLAG_MASK                   = 0x300
-	BPF_T_FORMAT_MASK                 = 0x3
-	BPF_T_MICROTIME                   = 0x0
-	BPF_T_MICROTIME_FAST              = 0x100
-	BPF_T_MICROTIME_MONOTONIC         = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
-	BPF_T_MONOTONIC                   = 0x200
-	BPF_T_MONOTONIC_FAST              = 0x300
-	BPF_T_NANOTIME                    = 0x1
-	BPF_T_NANOTIME_FAST               = 0x101
-	BPF_T_NANOTIME_MONOTONIC          = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
-	BPF_T_NONE                        = 0x3
-	BPF_T_NORMAL                      = 0x0
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0x18
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf6
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x79
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_LIO                        = -0xa
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xb
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xb
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_DROP                           = 0x1000
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTATTR_NAMESPACE_EMPTY           = 0x0
-	EXTATTR_NAMESPACE_SYSTEM          = 0x2
-	EXTATTR_NAMESPACE_USER            = 0x1
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_CANCEL                          = 0x5
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0xb
-	F_GETOWN                          = 0x5
-	F_OGETLK                          = 0x7
-	F_OK                              = 0x0
-	F_OSETLK                          = 0x8
-	F_OSETLKW                         = 0x9
-	F_RDAHEAD                         = 0x10
-	F_RDLCK                           = 0x1
-	F_READAHEAD                       = 0xf
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0xc
-	F_SETLKW                          = 0xd
-	F_SETLK_REMOTE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_UNLCKSYS                        = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x218f72
-	IFF_CANTCONFIG                    = 0x10000
-	IFF_DEBUG                         = 0x4
-	IFF_DRV_OACTIVE                   = 0x400
-	IFF_DRV_RUNNING                   = 0x40
-	IFF_DYING                         = 0x200000
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RENAMING                      = 0x400000
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_IPXIP                         = 0xf9
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf6
-	IFT_PFSYNC                        = 0xf7
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_MASK                   = 0xfffffffe
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HIP                       = 0x8b
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MH                        = 0x87
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OLD_DIVERT                = 0xfe
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_RESERVED_253              = 0xfd
-	IPPROTO_RESERVED_254              = 0xfe
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEND                      = 0x103
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SHIM6                     = 0x8c
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SPACER                    = 0x7fff
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDANY                      = 0x40
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BINDANY                        = 0x18
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DONTFRAG                       = 0x43
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET3                      = 0x31
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW3                            = 0x30
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_NAT_CFG                     = 0x38
-	IP_FW_NAT_DEL                     = 0x39
-	IP_FW_NAT_GET_CONFIG              = 0x3a
-	IP_FW_NAT_GET_LOG                 = 0x3b
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_TABLE_ADD                   = 0x28
-	IP_FW_TABLE_DEL                   = 0x29
-	IP_FW_TABLE_FLUSH                 = 0x2a
-	IP_FW_TABLE_GETSIZE               = 0x2b
-	IP_FW_TABLE_LIST                  = 0x2c
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MAX_SOURCE_FILTER              = 0x400
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_ONESBCAST                      = 0x17
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTOS                        = 0x44
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_PROTECT                      = 0xa
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNED_SUPER                 = 0x1000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_EXCL                          = 0x4000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_NOCORE                        = 0x20000
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PREFAULT_READ                 = 0x40000
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_RESERVED0100                  = 0x100
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CMSG_CLOEXEC                  = 0x40000
-	MSG_COMPAT                        = 0x8000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_NBIO                          = 0x4000
-	MSG_NOSIGNAL                      = 0x20000
-	MSG_NOTIFICATION                  = 0x2000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLISTL                    = 0x5
-	NET_RT_IFMALIST                   = 0x4
-	NET_RT_MAXID                      = 0x6
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x100000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x20000
-	O_EXCL                            = 0x800
-	O_EXEC                            = 0x40000
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_TTY_INIT                        = 0x80000
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x1004d808
-	RTF_GATEWAY                       = 0x2
-	RTF_GWFLAG_COMPAT                 = 0x80000000
-	RTF_HOST                          = 0x4
-	RTF_LLDATA                        = 0x400
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_RNH_LOCKED                    = 0x40000000
-	RTF_STATIC                        = 0x800
-	RTF_STICKY                        = 0x10000000
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RTV_WEIGHT                        = 0x100
-	RT_ALL_FIBS                       = -0x1
-	RT_CACHING_CONTEXT                = 0x1
-	RT_DEFAULT_FIB                    = 0x0
-	RT_NORTREF                        = 0x2
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_BINTIME                       = 0x4
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80246987
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETSGCNT                      = 0xc0147210
-	SIOCGETVIFCNT                     = 0xc014720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDESCR                      = 0xc020692a
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFIB                        = 0xc020695c
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc024698a
-	SIOCGIFGROUP                      = 0xc0246988
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMAC                        = 0xc0206926
-	SIOCGIFMEDIA                      = 0xc0286938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDESCR                      = 0x80206929
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFIB                        = 0x8020695d
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206927
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFRVNET                      = 0xc020695b
-	SIOCSIFVNET                       = 0xc020695a
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BINTIME                        = 0x2000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1009
-	SO_LINGER                         = 0x80
-	SO_LISTENINCQLEN                  = 0x1013
-	SO_LISTENQLEN                     = 0x1012
-	SO_LISTENQLIMIT                   = 0x1011
-	SO_NOSIGPIPE                      = 0x800
-	SO_NO_DDP                         = 0x8000
-	SO_NO_OFFLOAD                     = 0x4000
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1010
-	SO_PROTOCOL                       = 0x1016
-	SO_PROTOTYPE                      = 0x1016
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SETFIB                         = 0x1014
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_USER_COOKIE                    = 0x1015
-	SO_VENDOR                         = 0x80000000
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CA_NAME_MAX                   = 0x10
-	TCP_CONGESTION                    = 0x40
-	TCP_INFO                          = 0x20
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x80
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_VENDOR                        = 0x80000000
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGPTN                          = 0x4004740f
-	TIOCGSID                          = 0x40047463
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DCD                         = 0x40
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMASTER                      = 0x2000741c
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40087459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x10
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x8
-	WSTOPPED                          = 0x2
-	WTRAPPED                          = 0x20
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
-	ECAPMODE        = syscall.Errno(0x5e)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCAPABLE     = syscall.Errno(0x5d)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5f)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x60)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGLIBRT  = syscall.Signal(0x21)
-	SIGLWP    = syscall.Signal(0x20)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "capabilities insufficient",
-	94: "not permitted in capability mode",
-	95: "state not recoverable",
-	96: "previous owner died",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "unknown signal",
-	33: "unknown signal",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go
deleted file mode 100644
index 8f920124b8..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_386.go
+++ /dev/null
@@ -1,1819 +0,0 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x28
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	EPOLL_NONBLOCK                   = 0x800
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xc
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0xd
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0xe
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_802_1Q_VLAN                  = 0x1
-	IFF_ALLMULTI                     = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BONDING                      = 0x20
-	IFF_BRIDGE_PORT                  = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DISABLE_NETPOLL              = 0x1000
-	IFF_DONT_BRIDGE                  = 0x800
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_EBRIDGE                      = 0x2
-	IFF_ECHO                         = 0x40000
-	IFF_ISATAP                       = 0x80
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MACVLAN_PORT                 = 0x2000
-	IFF_MASTER                       = 0x400
-	IFF_MASTER_8023AD                = 0x8
-	IFF_MASTER_ALB                   = 0x10
-	IFF_MASTER_ARPMON                = 0x100
-	IFF_MULTICAST                    = 0x1000
-	IFF_NOARP                        = 0x80
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_OVS_DATAPATH                 = 0x8000
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_SLAVE_INACTIVE               = 0x4
-	IFF_SLAVE_NEEDARP                = 0x40
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_TX_SKB_SHARING               = 0x10000
-	IFF_UNICAST_FLT                  = 0x20000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFF_WAN_HDLC                     = 0x200
-	IFF_XMIT_DST_RELEASE             = 0x400
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DOFORK                      = 0xb
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_32BIT                        = 0x40
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x8000
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = 0xffffffff
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETFPXREGS                = 0x12
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_MASK                    = 0xff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SEIZE_DEVEL               = 0x80000000
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETFPXREGS                = 0x13
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x21
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_SYSEMU                    = 0x1f
-	PTRACE_SYSEMU_SINGLESTEP         = 0x20
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xe
-	RTAX_MTU                         = 0x2
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x10
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x4f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x10
-	RTM_NR_MSGTYPES                  = 0x40
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_MARK                          = 0x24
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_NODELAY                      = 0x1
-	TCP_QUICKACK                     = 0xc
-	TCP_SYNCNT                       = 0x7
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x400854d5
-	TUNDETACHFILTER                  = 0x400854d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMIN                             = 0x6
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale NFS file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "unknown error 133",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go
deleted file mode 100644
index 49b6c35467..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ /dev/null
@@ -1,1820 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x28
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	EPOLL_NONBLOCK                   = 0x800
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_802_1Q_VLAN                  = 0x1
-	IFF_ALLMULTI                     = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BONDING                      = 0x20
-	IFF_BRIDGE_PORT                  = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DISABLE_NETPOLL              = 0x1000
-	IFF_DONT_BRIDGE                  = 0x800
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_EBRIDGE                      = 0x2
-	IFF_ECHO                         = 0x40000
-	IFF_ISATAP                       = 0x80
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MACVLAN_PORT                 = 0x2000
-	IFF_MASTER                       = 0x400
-	IFF_MASTER_8023AD                = 0x8
-	IFF_MASTER_ALB                   = 0x10
-	IFF_MASTER_ARPMON                = 0x100
-	IFF_MULTICAST                    = 0x1000
-	IFF_NOARP                        = 0x80
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_OVS_DATAPATH                 = 0x8000
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_SLAVE_INACTIVE               = 0x4
-	IFF_SLAVE_NEEDARP                = 0x40
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_TX_SKB_SHARING               = 0x10000
-	IFF_UNICAST_FLT                  = 0x20000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFF_WAN_HDLC                     = 0x200
-	IFF_XMIT_DST_RELEASE             = 0x400
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DOFORK                      = 0xb
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_32BIT                        = 0x40
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ARCH_PRCTL                = 0x1e
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETFPXREGS                = 0x12
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_MASK                    = 0xff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SEIZE_DEVEL               = 0x80000000
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETFPXREGS                = 0x13
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x21
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_SYSEMU                    = 0x1f
-	PTRACE_SYSEMU_SINGLESTEP         = 0x20
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xe
-	RTAX_MTU                         = 0x2
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x10
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x4f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x10
-	RTM_NR_MSGTYPES                  = 0x40
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_MARK                          = 0x24
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_NODELAY                      = 0x1
-	TCP_QUICKACK                     = 0xc
-	TCP_SYNCNT                       = 0x7
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMIN                             = 0x6
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale NFS file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "unknown error 133",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go
deleted file mode 100644
index f036758f92..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ /dev/null
@@ -1,1743 +0,0 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x27
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_PHY            = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ELF_NGREG                        = 0x12
-	ELF_PRARGSZ                      = 0x50
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	EPOLLERR                         = 0x8
-	EPOLLET                          = -0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	EPOLL_NONBLOCK                   = 0x800
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xc
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0xd
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0xe
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_ALLMULTI                     = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DYNAMIC                      = 0x8000
-	IFF_LOOPBACK                     = 0x8
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_NOARP                        = 0x80
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DOFORK                      = 0xb
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x10000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x1000
-	O_LARGEFILE                      = 0x20000
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x1000
-	O_SYNC                           = 0x1000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_BROADCAST                 = 0x1
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MULTICAST                 = 0x2
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PARENB                           = 0x100
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CLEAR_SECCOMP_FILTER          = 0x25
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECCOMP_FILTER            = 0x23
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SECCOMP_FILTER_EVENT          = 0x1
-	PR_SECCOMP_FILTER_SYSCALL        = 0x0
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_NAME                      = 0xf
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECCOMP_FILTER            = 0x24
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETCRUNCHREGS             = 0x19
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETHBPREGS                = 0x1d
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETVFPREGS                = 0x1b
-	PTRACE_GETWMMXREGS               = 0x12
-	PTRACE_GET_THREAD_AREA           = 0x16
-	PTRACE_KILL                      = 0x8
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_MASK                    = 0x7f
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SETCRUNCHREGS             = 0x1a
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETHBPREGS                = 0x1e
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETVFPREGS                = 0x1c
-	PTRACE_SETWMMXREGS               = 0x13
-	PTRACE_SET_SYSCALL               = 0x17
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PT_DATA_ADDR                     = 0x10004
-	PT_TEXT_ADDR                     = 0x10000
-	PT_TEXT_END_ADDR                 = 0x10008
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xe
-	RTAX_MTU                         = 0x2
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x10
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x4f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x10
-	RTM_NR_MSGTYPES                  = 0x40
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_MARK                          = 0x24
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_NODELAY                      = 0x1
-	TCP_QUICKACK                     = 0xc
-	TCP_SYNCNT                       = 0x7
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x400854d5
-	TUNDETACHFILTER                  = 0x400854d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMIN                             = 0x6
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale NFS file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "unknown error 133",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go
deleted file mode 100644
index 16dcbc9cb2..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ /dev/null
@@ -1,1897 +0,0 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm64,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ELF_NGREG                        = 0x22
-	ELF_PRARGSZ                      = 0x50
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_802_1Q_VLAN                  = 0x1
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BONDING                      = 0x20
-	IFF_BRIDGE_PORT                  = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DISABLE_NETPOLL              = 0x1000
-	IFF_DONT_BRIDGE                  = 0x800
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_EBRIDGE                      = 0x2
-	IFF_ECHO                         = 0x40000
-	IFF_ISATAP                       = 0x80
-	IFF_LIVE_ADDR_CHANGE             = 0x100000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MACVLAN                      = 0x200000
-	IFF_MACVLAN_PORT                 = 0x2000
-	IFF_MASTER                       = 0x400
-	IFF_MASTER_8023AD                = 0x8
-	IFF_MASTER_ALB                   = 0x10
-	IFF_MASTER_ARPMON                = 0x100
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_OVS_DATAPATH                 = 0x8000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_SLAVE_INACTIVE               = 0x4
-	IFF_SLAVE_NEEDARP                = 0x40
-	IFF_SUPP_NOFCS                   = 0x80000
-	IFF_TAP                          = 0x2
-	IFF_TEAM_PORT                    = 0x40000
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_TX_SKB_SHARING               = 0x10000
-	IFF_UNICAST_FLT                  = 0x20000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFF_WAN_HDLC                     = 0x200
-	IFF_XMIT_DST_RELEASE             = 0x400
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x10000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x1000ff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xf
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x11
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x57
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x12
-	RTM_NR_MSGTYPES                  = 0x48
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_WIFI_STATUS                   = 0x29
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x801054db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMIN                             = 0x6
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64.go
deleted file mode 100644
index 36535b242d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ /dev/null
@@ -1,1917 +0,0 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build mips64,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	CFLUSH                           = 0xf
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CREAD                            = 0x80
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FLUSHO                           = 0x2000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xe
-	F_GETLK64                        = 0xe
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HUPCL                            = 0x400
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_HUGETLB                      = 0x80000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x40000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x16
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5b
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x13
-	RTM_NR_MSGTYPES                  = 0x4c
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x11
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_WIFI_STATUS                   = 0x29
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TCFLSH                           = 0x5407
-	TCIFLUSH                         = 0x0
-	TCIOFLUSH                        = 0x2
-	TCOFLUSH                         = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x4020542e
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0xc020542f
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMIN                             = 0x4
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x7d)
-	EADDRNOTAVAIL   = syscall.Errno(0x7e)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x7c)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x95)
-	EBADE           = syscall.Errno(0x32)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x51)
-	EBADMSG         = syscall.Errno(0x4d)
-	EBADR           = syscall.Errno(0x33)
-	EBADRQC         = syscall.Errno(0x36)
-	EBADSLT         = syscall.Errno(0x37)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x9e)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x25)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x82)
-	ECONNREFUSED    = syscall.Errno(0x92)
-	ECONNRESET      = syscall.Errno(0x83)
-	EDEADLK         = syscall.Errno(0x2d)
-	EDEADLOCK       = syscall.Errno(0x38)
-	EDESTADDRREQ    = syscall.Errno(0x60)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x46d)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x93)
-	EHOSTUNREACH    = syscall.Errno(0x94)
-	EHWPOISON       = syscall.Errno(0xa8)
-	EIDRM           = syscall.Errno(0x24)
-	EILSEQ          = syscall.Errno(0x58)
-	EINIT           = syscall.Errno(0x8d)
-	EINPROGRESS     = syscall.Errno(0x96)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x85)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x8b)
-	EKEYEXPIRED     = syscall.Errno(0xa2)
-	EKEYREJECTED    = syscall.Errno(0xa4)
-	EKEYREVOKED     = syscall.Errno(0xa3)
-	EL2HLT          = syscall.Errno(0x2c)
-	EL2NSYNC        = syscall.Errno(0x26)
-	EL3HLT          = syscall.Errno(0x27)
-	EL3RST          = syscall.Errno(0x28)
-	ELIBACC         = syscall.Errno(0x53)
-	ELIBBAD         = syscall.Errno(0x54)
-	ELIBEXEC        = syscall.Errno(0x57)
-	ELIBMAX         = syscall.Errno(0x56)
-	ELIBSCN         = syscall.Errno(0x55)
-	ELNRNG          = syscall.Errno(0x29)
-	ELOOP           = syscall.Errno(0x5a)
-	EMEDIUMTYPE     = syscall.Errno(0xa0)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x61)
-	EMULTIHOP       = syscall.Errno(0x4a)
-	ENAMETOOLONG    = syscall.Errno(0x4e)
-	ENAVAIL         = syscall.Errno(0x8a)
-	ENETDOWN        = syscall.Errno(0x7f)
-	ENETRESET       = syscall.Errno(0x81)
-	ENETUNREACH     = syscall.Errno(0x80)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x35)
-	ENOBUFS         = syscall.Errno(0x84)
-	ENOCSI          = syscall.Errno(0x2b)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0xa1)
-	ENOLCK          = syscall.Errno(0x2e)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x9f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x23)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x63)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x59)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x86)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x5d)
-	ENOTNAM         = syscall.Errno(0x89)
-	ENOTRECOVERABLE = syscall.Errno(0xa6)
-	ENOTSOCK        = syscall.Errno(0x5f)
-	ENOTSUP         = syscall.Errno(0x7a)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x50)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x7a)
-	EOVERFLOW       = syscall.Errno(0x4f)
-	EOWNERDEAD      = syscall.Errno(0xa5)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x7b)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x78)
-	EPROTOTYPE      = syscall.Errno(0x62)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x52)
-	EREMDEV         = syscall.Errno(0x8e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x8c)
-	ERESTART        = syscall.Errno(0x5b)
-	ERFKILL         = syscall.Errno(0xa7)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x8f)
-	ESOCKTNOSUPPORT = syscall.Errno(0x79)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x97)
-	ESTRPIPE        = syscall.Errno(0x5c)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x91)
-	ETOOMANYREFS    = syscall.Errno(0x90)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x87)
-	EUNATCH         = syscall.Errno(0x2a)
-	EUSERS          = syscall.Errno(0x5e)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x34)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x12)
-	SIGCLD    = syscall.Signal(0x12)
-	SIGCONT   = syscall.Signal(0x19)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x16)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x16)
-	SIGPROF   = syscall.Signal(0x1d)
-	SIGPWR    = syscall.Signal(0x13)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x17)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x18)
-	SIGTTIN   = syscall.Signal(0x1a)
-	SIGTTOU   = syscall.Signal(0x1b)
-	SIGURG    = syscall.Signal(0x15)
-	SIGUSR1   = syscall.Signal(0x10)
-	SIGUSR2   = syscall.Signal(0x11)
-	SIGVTALRM = syscall.Signal(0x1c)
-	SIGWINCH  = syscall.Signal(0x14)
-	SIGXCPU   = syscall.Signal(0x1e)
-	SIGXFSZ   = syscall.Signal(0x1f)
-)
-
-// Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "memory page has hardware error",
-	1133: "disk quota exceeded",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64le.go
deleted file mode 100644
index 112f05de56..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ /dev/null
@@ -1,1917 +0,0 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build mips64le,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	CFLUSH                           = 0xf
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CREAD                            = 0x80
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FLUSHO                           = 0x2000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xe
-	F_GETLK64                        = 0xe
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HUPCL                            = 0x400
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_HUGETLB                      = 0x80000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x40000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x16
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5b
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x13
-	RTM_NR_MSGTYPES                  = 0x4c
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x11
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_WIFI_STATUS                   = 0x29
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TCFLSH                           = 0x5407
-	TCIFLUSH                         = 0x0
-	TCIOFLUSH                        = 0x2
-	TCOFLUSH                         = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x4020542e
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0xc020542f
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMIN                             = 0x4
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x7d)
-	EADDRNOTAVAIL   = syscall.Errno(0x7e)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x7c)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x95)
-	EBADE           = syscall.Errno(0x32)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x51)
-	EBADMSG         = syscall.Errno(0x4d)
-	EBADR           = syscall.Errno(0x33)
-	EBADRQC         = syscall.Errno(0x36)
-	EBADSLT         = syscall.Errno(0x37)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x9e)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x25)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x82)
-	ECONNREFUSED    = syscall.Errno(0x92)
-	ECONNRESET      = syscall.Errno(0x83)
-	EDEADLK         = syscall.Errno(0x2d)
-	EDEADLOCK       = syscall.Errno(0x38)
-	EDESTADDRREQ    = syscall.Errno(0x60)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x46d)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x93)
-	EHOSTUNREACH    = syscall.Errno(0x94)
-	EHWPOISON       = syscall.Errno(0xa8)
-	EIDRM           = syscall.Errno(0x24)
-	EILSEQ          = syscall.Errno(0x58)
-	EINIT           = syscall.Errno(0x8d)
-	EINPROGRESS     = syscall.Errno(0x96)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x85)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x8b)
-	EKEYEXPIRED     = syscall.Errno(0xa2)
-	EKEYREJECTED    = syscall.Errno(0xa4)
-	EKEYREVOKED     = syscall.Errno(0xa3)
-	EL2HLT          = syscall.Errno(0x2c)
-	EL2NSYNC        = syscall.Errno(0x26)
-	EL3HLT          = syscall.Errno(0x27)
-	EL3RST          = syscall.Errno(0x28)
-	ELIBACC         = syscall.Errno(0x53)
-	ELIBBAD         = syscall.Errno(0x54)
-	ELIBEXEC        = syscall.Errno(0x57)
-	ELIBMAX         = syscall.Errno(0x56)
-	ELIBSCN         = syscall.Errno(0x55)
-	ELNRNG          = syscall.Errno(0x29)
-	ELOOP           = syscall.Errno(0x5a)
-	EMEDIUMTYPE     = syscall.Errno(0xa0)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x61)
-	EMULTIHOP       = syscall.Errno(0x4a)
-	ENAMETOOLONG    = syscall.Errno(0x4e)
-	ENAVAIL         = syscall.Errno(0x8a)
-	ENETDOWN        = syscall.Errno(0x7f)
-	ENETRESET       = syscall.Errno(0x81)
-	ENETUNREACH     = syscall.Errno(0x80)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x35)
-	ENOBUFS         = syscall.Errno(0x84)
-	ENOCSI          = syscall.Errno(0x2b)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0xa1)
-	ENOLCK          = syscall.Errno(0x2e)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x9f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x23)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x63)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x59)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x86)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x5d)
-	ENOTNAM         = syscall.Errno(0x89)
-	ENOTRECOVERABLE = syscall.Errno(0xa6)
-	ENOTSOCK        = syscall.Errno(0x5f)
-	ENOTSUP         = syscall.Errno(0x7a)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x50)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x7a)
-	EOVERFLOW       = syscall.Errno(0x4f)
-	EOWNERDEAD      = syscall.Errno(0xa5)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x7b)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x78)
-	EPROTOTYPE      = syscall.Errno(0x62)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x52)
-	EREMDEV         = syscall.Errno(0x8e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x8c)
-	ERESTART        = syscall.Errno(0x5b)
-	ERFKILL         = syscall.Errno(0xa7)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x8f)
-	ESOCKTNOSUPPORT = syscall.Errno(0x79)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x97)
-	ESTRPIPE        = syscall.Errno(0x5c)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x91)
-	ETOOMANYREFS    = syscall.Errno(0x90)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x87)
-	EUNATCH         = syscall.Errno(0x2a)
-	EUSERS          = syscall.Errno(0x5e)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x34)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x12)
-	SIGCLD    = syscall.Signal(0x12)
-	SIGCONT   = syscall.Signal(0x19)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x16)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x16)
-	SIGPROF   = syscall.Signal(0x1d)
-	SIGPWR    = syscall.Signal(0x13)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x17)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x18)
-	SIGTTIN   = syscall.Signal(0x1a)
-	SIGTTOU   = syscall.Signal(0x1b)
-	SIGURG    = syscall.Signal(0x15)
-	SIGUSR1   = syscall.Signal(0x10)
-	SIGUSR2   = syscall.Signal(0x11)
-	SIGVTALRM = syscall.Signal(0x1c)
-	SIGWINCH  = syscall.Signal(0x14)
-	SIGXCPU   = syscall.Signal(0x1e)
-	SIGXFSZ   = syscall.Signal(0x1f)
-)
-
-// Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "memory page has hardware error",
-	1133: "disk quota exceeded",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go
deleted file mode 100644
index 8b42ca2fe9..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ /dev/null
@@ -1,1970 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build ppc64,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x17
-	B110                             = 0x3
-	B115200                          = 0x11
-	B1152000                         = 0x18
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x19
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x1a
-	B230400                          = 0x12
-	B2400                            = 0xb
-	B2500000                         = 0x1b
-	B300                             = 0x7
-	B3000000                         = 0x1c
-	B3500000                         = 0x1d
-	B38400                           = 0xf
-	B4000000                         = 0x1e
-	B460800                          = 0x13
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x14
-	B57600                           = 0x10
-	B576000                          = 0x15
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x16
-	B9600                            = 0xd
-	BOTHER                           = 0x1f
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x8000
-	BSDLY                            = 0x8000
-	CBAUD                            = 0xff
-	CBAUDEX                          = 0x0
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0xff0000
-	CLOCAL                           = 0x8000
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x1000
-	CR2                              = 0x2000
-	CR3                              = 0x3000
-	CRDLY                            = 0x3000
-	CREAD                            = 0x800
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x100
-	CS7                              = 0x200
-	CS8                              = 0x300
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x300
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x400
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x40
-	ECHOE                            = 0x2
-	ECHOK                            = 0x4
-	ECHOKE                           = 0x1
-	ECHONL                           = 0x10
-	ECHOPRT                          = 0x20
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000000
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x4000
-	FFDLY                            = 0x4000
-	FLUSHO                           = 0x800000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HUPCL                            = 0x4000
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x100
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x400
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x80
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x1000
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x400
-	IXON                             = 0x200
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x80
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x40
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x2000
-	MCL_FUTURE                       = 0x4000
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NL2                              = 0x200
-	NL3                              = 0x300
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x300
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80000000
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x4
-	ONLCR                            = 0x2
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x20000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x1000
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x2000
-	PENDIN                           = 0x20000000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_SAO                         = 0x10
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETEVRREGS                = 0x14
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGS64                 = 0x16
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GETVRREGS                 = 0x12
-	PTRACE_GETVSRREGS                = 0x1b
-	PTRACE_GET_DEBUGREG              = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x1000ff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETEVRREGS                = 0x15
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGS64                 = 0x17
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SETVRREGS                 = 0x13
-	PTRACE_SETVSRREGS                = 0x1c
-	PTRACE_SET_DEBUGREG              = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x100
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PT_CCR                           = 0x26
-	PT_CTR                           = 0x23
-	PT_DAR                           = 0x29
-	PT_DSCR                          = 0x2c
-	PT_DSISR                         = 0x2a
-	PT_FPR0                          = 0x30
-	PT_FPSCR                         = 0x50
-	PT_LNK                           = 0x24
-	PT_MSR                           = 0x21
-	PT_NIP                           = 0x20
-	PT_ORIG_R3                       = 0x22
-	PT_R0                            = 0x0
-	PT_R1                            = 0x1
-	PT_R10                           = 0xa
-	PT_R11                           = 0xb
-	PT_R12                           = 0xc
-	PT_R13                           = 0xd
-	PT_R14                           = 0xe
-	PT_R15                           = 0xf
-	PT_R16                           = 0x10
-	PT_R17                           = 0x11
-	PT_R18                           = 0x12
-	PT_R19                           = 0x13
-	PT_R2                            = 0x2
-	PT_R20                           = 0x14
-	PT_R21                           = 0x15
-	PT_R22                           = 0x16
-	PT_R23                           = 0x17
-	PT_R24                           = 0x18
-	PT_R25                           = 0x19
-	PT_R26                           = 0x1a
-	PT_R27                           = 0x1b
-	PT_R28                           = 0x1c
-	PT_R29                           = 0x1d
-	PT_R3                            = 0x3
-	PT_R30                           = 0x1e
-	PT_R31                           = 0x1f
-	PT_R4                            = 0x4
-	PT_R5                            = 0x5
-	PT_R6                            = 0x6
-	PT_R7                            = 0x7
-	PT_R8                            = 0x8
-	PT_R9                            = 0x9
-	PT_REGS_COUNT                    = 0x2c
-	PT_RESULT                        = 0x2b
-	PT_SOFTE                         = 0x27
-	PT_TRAP                          = 0x28
-	PT_VR0                           = 0x52
-	PT_VRSAVE                        = 0x94
-	PT_VSCR                          = 0x93
-	PT_VSR0                          = 0x96
-	PT_VSR31                         = 0xd4
-	PT_XER                           = 0x25
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xf
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x11
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x57
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x12
-	RTM_NR_MSGTYPES                  = 0x48
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x14
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x15
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x10
-	SO_RCVTIMEO                      = 0x12
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x11
-	SO_SNDTIMEO                      = 0x13
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_WIFI_STATUS                   = 0x29
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x400
-	TAB2                             = 0x800
-	TAB3                             = 0xc00
-	TABDLY                           = 0xc00
-	TCFLSH                           = 0x2000741f
-	TCGETA                           = 0x40147417
-	TCGETS                           = 0x402c7413
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x2000741d
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x80147418
-	TCSETAF                          = 0x8014741c
-	TCSETAW                          = 0x80147419
-	TCSETS                           = 0x802c7414
-	TCSETSF                          = 0x802c7416
-	TCSETSW                          = 0x802c7415
-	TCXONC                           = 0x2000741e
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x40045432
-	TIOCGETC                         = 0x40067412
-	TIOCGETD                         = 0x5424
-	TIOCGETP                         = 0x40067408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGLTC                         = 0x40067474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x4004667f
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_LOOP                       = 0x8000
-	TIOCM_OUT1                       = 0x2000
-	TIOCM_OUT2                       = 0x4000
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x40047473
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETC                         = 0x80067411
-	TIOCSETD                         = 0x5423
-	TIOCSETN                         = 0x8006740a
-	TIOCSETP                         = 0x80067409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSLTC                         = 0x80067475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTART                        = 0x2000746e
-	TIOCSTI                          = 0x5412
-	TIOCSTOP                         = 0x2000746f
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x400000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	VDISCARD                         = 0x10
-	VEOF                             = 0x4
-	VEOL                             = 0x6
-	VEOL2                            = 0x8
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMIN                             = 0x5
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xb
-	VSTART                           = 0xd
-	VSTOP                            = 0xe
-	VSUSP                            = 0xc
-	VSWTC                            = 0x9
-	VT0                              = 0x0
-	VT1                              = 0x10000
-	VTDLY                            = 0x10000
-	VTIME                            = 0x7
-	VWERASE                          = 0xa
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4000
-	XTABS                            = 0xc00
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x3a)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	58:  "file locking deadlock error",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
deleted file mode 100644
index e8d12b5d6d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ /dev/null
@@ -1,1969 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build ppc64le,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x17
-	B110                             = 0x3
-	B115200                          = 0x11
-	B1152000                         = 0x18
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x19
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x1a
-	B230400                          = 0x12
-	B2400                            = 0xb
-	B2500000                         = 0x1b
-	B300                             = 0x7
-	B3000000                         = 0x1c
-	B3500000                         = 0x1d
-	B38400                           = 0xf
-	B4000000                         = 0x1e
-	B460800                          = 0x13
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x14
-	B57600                           = 0x10
-	B576000                          = 0x15
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x16
-	B9600                            = 0xd
-	BOTHER                           = 0x1f
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x8000
-	BSDLY                            = 0x8000
-	CBAUD                            = 0xff
-	CBAUDEX                          = 0x0
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0xff0000
-	CLOCAL                           = 0x8000
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x1000
-	CR2                              = 0x2000
-	CR3                              = 0x3000
-	CRDLY                            = 0x3000
-	CREAD                            = 0x800
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x100
-	CS7                              = 0x200
-	CS8                              = 0x300
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x300
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x400
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x40
-	ECHOE                            = 0x2
-	ECHOK                            = 0x4
-	ECHOKE                           = 0x1
-	ECHONL                           = 0x10
-	ECHOPRT                          = 0x20
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000000
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x4000
-	FFDLY                            = 0x4000
-	FLUSHO                           = 0x800000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HUPCL                            = 0x4000
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x100
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x400
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_802_1Q_VLAN                  = 0x1
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BONDING                      = 0x20
-	IFF_BRIDGE_PORT                  = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DISABLE_NETPOLL              = 0x1000
-	IFF_DONT_BRIDGE                  = 0x800
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_EBRIDGE                      = 0x2
-	IFF_ECHO                         = 0x40000
-	IFF_ISATAP                       = 0x80
-	IFF_LIVE_ADDR_CHANGE             = 0x100000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MACVLAN                      = 0x200000
-	IFF_MACVLAN_PORT                 = 0x2000
-	IFF_MASTER                       = 0x400
-	IFF_MASTER_8023AD                = 0x8
-	IFF_MASTER_ALB                   = 0x10
-	IFF_MASTER_ARPMON                = 0x100
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_OVS_DATAPATH                 = 0x8000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_SLAVE_INACTIVE               = 0x4
-	IFF_SLAVE_NEEDARP                = 0x40
-	IFF_SUPP_NOFCS                   = 0x80000
-	IFF_TAP                          = 0x2
-	IFF_TEAM_PORT                    = 0x40000
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_TX_SKB_SHARING               = 0x10000
-	IFF_UNICAST_FLT                  = 0x20000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFF_WAN_HDLC                     = 0x200
-	IFF_XMIT_DST_RELEASE             = 0x400
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x80
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x1000
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x400
-	IXON                             = 0x200
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x80
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x40
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x2000
-	MCL_FUTURE                       = 0x4000
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NL2                              = 0x200
-	NL3                              = 0x300
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x300
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80000000
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x4
-	ONLCR                            = 0x2
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x20000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x1000
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x2000
-	PENDIN                           = 0x20000000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_SAO                         = 0x10
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETEVRREGS                = 0x14
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGS64                 = 0x16
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GETVRREGS                 = 0x12
-	PTRACE_GETVSRREGS                = 0x1b
-	PTRACE_GET_DEBUGREG              = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x1000ff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETEVRREGS                = 0x15
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGS64                 = 0x17
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SETVRREGS                 = 0x13
-	PTRACE_SETVSRREGS                = 0x1c
-	PTRACE_SET_DEBUGREG              = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x100
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PT_CCR                           = 0x26
-	PT_CTR                           = 0x23
-	PT_DAR                           = 0x29
-	PT_DSCR                          = 0x2c
-	PT_DSISR                         = 0x2a
-	PT_FPR0                          = 0x30
-	PT_FPSCR                         = 0x50
-	PT_LNK                           = 0x24
-	PT_MSR                           = 0x21
-	PT_NIP                           = 0x20
-	PT_ORIG_R3                       = 0x22
-	PT_R0                            = 0x0
-	PT_R1                            = 0x1
-	PT_R10                           = 0xa
-	PT_R11                           = 0xb
-	PT_R12                           = 0xc
-	PT_R13                           = 0xd
-	PT_R14                           = 0xe
-	PT_R15                           = 0xf
-	PT_R16                           = 0x10
-	PT_R17                           = 0x11
-	PT_R18                           = 0x12
-	PT_R19                           = 0x13
-	PT_R2                            = 0x2
-	PT_R20                           = 0x14
-	PT_R21                           = 0x15
-	PT_R22                           = 0x16
-	PT_R23                           = 0x17
-	PT_R24                           = 0x18
-	PT_R25                           = 0x19
-	PT_R26                           = 0x1a
-	PT_R27                           = 0x1b
-	PT_R28                           = 0x1c
-	PT_R29                           = 0x1d
-	PT_R3                            = 0x3
-	PT_R30                           = 0x1e
-	PT_R31                           = 0x1f
-	PT_R4                            = 0x4
-	PT_R5                            = 0x5
-	PT_R6                            = 0x6
-	PT_R7                            = 0x7
-	PT_R8                            = 0x8
-	PT_R9                            = 0x9
-	PT_REGS_COUNT                    = 0x2c
-	PT_RESULT                        = 0x2b
-	PT_SOFTE                         = 0x27
-	PT_TRAP                          = 0x28
-	PT_VR0                           = 0x52
-	PT_VRSAVE                        = 0x94
-	PT_VSCR                          = 0x93
-	PT_VSR0                          = 0x96
-	PT_VSR31                         = 0xd4
-	PT_XER                           = 0x25
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xf
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x11
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x57
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x12
-	RTM_NR_MSGTYPES                  = 0x48
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x14
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x15
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x10
-	SO_RCVTIMEO                      = 0x12
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x11
-	SO_SNDTIMEO                      = 0x13
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_WIFI_STATUS                   = 0x29
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x400
-	TAB2                             = 0x800
-	TAB3                             = 0xc00
-	TABDLY                           = 0xc00
-	TCFLSH                           = 0x2000741f
-	TCGETA                           = 0x40147417
-	TCGETS                           = 0x402c7413
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x2000741d
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x80147418
-	TCSETAF                          = 0x8014741c
-	TCSETAW                          = 0x80147419
-	TCSETS                           = 0x802c7414
-	TCSETSF                          = 0x802c7416
-	TCSETSW                          = 0x802c7415
-	TCXONC                           = 0x2000741e
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x40045432
-	TIOCGETC                         = 0x40067412
-	TIOCGETD                         = 0x5424
-	TIOCGETP                         = 0x40067408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGLTC                         = 0x40067474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x4004667f
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_LOOP                       = 0x8000
-	TIOCM_OUT1                       = 0x2000
-	TIOCM_OUT2                       = 0x4000
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x40047473
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETC                         = 0x80067411
-	TIOCSETD                         = 0x5423
-	TIOCSETN                         = 0x8006740a
-	TIOCSETP                         = 0x80067409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSLTC                         = 0x80067475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTART                        = 0x2000746e
-	TIOCSTI                          = 0x5412
-	TIOCSTOP                         = 0x2000746f
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x400000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	VDISCARD                         = 0x10
-	VEOF                             = 0x4
-	VEOL                             = 0x6
-	VEOL2                            = 0x8
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMIN                             = 0x5
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xb
-	VSTART                           = 0xd
-	VSTOP                            = 0xe
-	VSUSP                            = 0xc
-	VSWTC                            = 0x9
-	VT0                              = 0x0
-	VT1                              = 0x10000
-	VTDLY                            = 0x10000
-	VTIME                            = 0x7
-	VWERASE                          = 0xa
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4000
-	XTABS                            = 0xc00
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x3a)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	58:  "file locking deadlock error",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_s390x.go
deleted file mode 100644
index 329f25e7cf..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ /dev/null
@@ -1,2027 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build s390x,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_DISABLE_TE                = 0x5010
-	PTRACE_ENABLE_TE                 = 0x5009
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_LAST_BREAK            = 0x5006
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_AREA             = 0x5003
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_AREA             = 0x5002
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_PEEKUSR_AREA              = 0x5000
-	PTRACE_PEEK_SYSTEM_CALL          = 0x5007
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_AREA             = 0x5005
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_AREA             = 0x5004
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_POKEUSR_AREA              = 0x5001
-	PTRACE_POKE_SYSTEM_CALL          = 0x5008
-	PTRACE_PROT                      = 0x15
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SINGLEBLOCK               = 0xc
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TE_ABORT_RAND             = 0x5011
-	PTRACE_TRACEME                   = 0x0
-	PT_ACR0                          = 0x90
-	PT_ACR1                          = 0x94
-	PT_ACR10                         = 0xb8
-	PT_ACR11                         = 0xbc
-	PT_ACR12                         = 0xc0
-	PT_ACR13                         = 0xc4
-	PT_ACR14                         = 0xc8
-	PT_ACR15                         = 0xcc
-	PT_ACR2                          = 0x98
-	PT_ACR3                          = 0x9c
-	PT_ACR4                          = 0xa0
-	PT_ACR5                          = 0xa4
-	PT_ACR6                          = 0xa8
-	PT_ACR7                          = 0xac
-	PT_ACR8                          = 0xb0
-	PT_ACR9                          = 0xb4
-	PT_CR_10                         = 0x168
-	PT_CR_11                         = 0x170
-	PT_CR_9                          = 0x160
-	PT_ENDREGS                       = 0x1af
-	PT_FPC                           = 0xd8
-	PT_FPR0                          = 0xe0
-	PT_FPR1                          = 0xe8
-	PT_FPR10                         = 0x130
-	PT_FPR11                         = 0x138
-	PT_FPR12                         = 0x140
-	PT_FPR13                         = 0x148
-	PT_FPR14                         = 0x150
-	PT_FPR15                         = 0x158
-	PT_FPR2                          = 0xf0
-	PT_FPR3                          = 0xf8
-	PT_FPR4                          = 0x100
-	PT_FPR5                          = 0x108
-	PT_FPR6                          = 0x110
-	PT_FPR7                          = 0x118
-	PT_FPR8                          = 0x120
-	PT_FPR9                          = 0x128
-	PT_GPR0                          = 0x10
-	PT_GPR1                          = 0x18
-	PT_GPR10                         = 0x60
-	PT_GPR11                         = 0x68
-	PT_GPR12                         = 0x70
-	PT_GPR13                         = 0x78
-	PT_GPR14                         = 0x80
-	PT_GPR15                         = 0x88
-	PT_GPR2                          = 0x20
-	PT_GPR3                          = 0x28
-	PT_GPR4                          = 0x30
-	PT_GPR5                          = 0x38
-	PT_GPR6                          = 0x40
-	PT_GPR7                          = 0x48
-	PT_GPR8                          = 0x50
-	PT_GPR9                          = 0x58
-	PT_IEEE_IP                       = 0x1a8
-	PT_LASTOFF                       = 0x1a8
-	PT_ORIGGPR2                      = 0xd0
-	PT_PSWADDR                       = 0x8
-	PT_PSWMASK                       = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x16
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5b
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x13
-	RTM_NR_MSGTYPES                  = 0x4c
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x11
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_WIFI_STATUS                   = 0x29
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x801054db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETBE                     = 0x800454df
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNGETVNETLE                     = 0x800454dd
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETBE                     = 0x400454de
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	TUNSETVNETLE                     = 0x400454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMIN                             = 0x6
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go
deleted file mode 100644
index b4338d5f26..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_386.go
+++ /dev/null
@@ -1,1712 +0,0 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,netbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x1c
-	AF_BLUETOOTH                      = 0x1f
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x20
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x23
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OROUTE                         = 0x11
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x22
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ARCNET                     = 0x7
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	ARPHRD_STRIP                      = 0x17
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427d
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084277
-	BIOCGETIF                         = 0x4090426b
-	BIOCGFEEDBACK                     = 0x4004427c
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRTIMEOUT                     = 0x400c427b
-	BIOCGSEESENT                      = 0x40044278
-	BIOCGSTATS                        = 0x4080426f
-	BIOCGSTATSOLD                     = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044276
-	BIOCSETF                          = 0x80084267
-	BIOCSETIF                         = 0x8090426c
-	BIOCSFEEDBACK                     = 0x8004427d
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRTIMEOUT                     = 0x800c427a
-	BIOCSSEESENT                      = 0x80044279
-	BIOCSTCPF                         = 0x80084272
-	BIOCSUDPF                         = 0x80084273
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALIGNMENT32                   = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DFLTBUFSIZE                   = 0x100000
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x1000000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLONE_CSIGNAL                     = 0xff
-	CLONE_FILES                       = 0x400
-	CLONE_FS                          = 0x200
-	CLONE_PID                         = 0x1000
-	CLONE_PTRACE                      = 0x2000
-	CLONE_SIGHAND                     = 0x800
-	CLONE_VFORK                       = 0x4000
-	CLONE_VM                          = 0x100
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	CTL_QUERY                         = -0x2
-	DIOCBSFLUSH                       = 0x20006478
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HDLC                          = 0x10
-	DLT_HHDLC                         = 0x79
-	DLT_HIPPI                         = 0xf
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0xe
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RAWAF_MASK                    = 0x2240000
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xd
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMUL_LINUX                        = 0x1
-	EMUL_LINUX32                      = 0x5
-	EMUL_MAXID                        = 0x6
-	EN_SW_CTL_INF                     = 0x1000
-	EN_SW_CTL_PREC                    = 0x300
-	EN_SW_CTL_ROUND                   = 0xc00
-	EN_SW_DATACHAIN                   = 0x80
-	EN_SW_DENORM                      = 0x2
-	EN_SW_INVOP                       = 0x1
-	EN_SW_OVERFLOW                    = 0x8
-	EN_SW_PRECLOSS                    = 0x20
-	EN_SW_UNDERFLOW                   = 0x10
-	EN_SW_ZERODIV                     = 0x4
-	ETHERCAP_JUMBO_MTU                = 0x4
-	ETHERCAP_VLAN_HWTAGGING           = 0x2
-	ETHERCAP_VLAN_MTU                 = 0x1
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERMTU_JUMBO                    = 0x2328
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MAX_LEN_JUMBO               = 0x233a
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_PPPOE_ENCAP_LEN             = 0x8
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = 0x2
-	EVFILT_PROC                       = 0x4
-	EVFILT_READ                       = 0x0
-	EVFILT_SIGNAL                     = 0x5
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = 0x6
-	EVFILT_VNODE                      = 0x3
-	EVFILT_WRITE                      = 0x1
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x100
-	FLUSHO                            = 0x800000
-	F_CLOSEM                          = 0xa
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xc
-	F_FSCTL                           = -0x80000000
-	F_FSDIRMASK                       = 0x70000000
-	F_FSIN                            = 0x10000000
-	F_FSINOUT                         = 0x30000000
-	F_FSOUT                           = 0x20000000
-	F_FSPRIV                          = 0x8000
-	F_FSVOID                          = 0x40000000
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETNOSIGPIPE                    = 0xd
-	F_GETOWN                          = 0x5
-	F_MAXFD                           = 0xb
-	F_OK                              = 0x0
-	F_PARAM_MASK                      = 0xfff
-	F_PARAM_MAX                       = 0xfff
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETNOSIGPIPE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8f52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IPV6_ICMP                 = 0x3a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VRRP                      = 0x70
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_EF                             = 0x8000
-	IP_ERRORMTU                       = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x16
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0x14
-	IP_MF                             = 0x2000
-	IP_MINFRAGSIZE                    = 0x45
-	IP_MINTTL                         = 0x18
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x17
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNMENT_16MB                = 0x18000000
-	MAP_ALIGNMENT_1TB                 = 0x28000000
-	MAP_ALIGNMENT_256TB               = 0x30000000
-	MAP_ALIGNMENT_4GB                 = 0x20000000
-	MAP_ALIGNMENT_64KB                = 0x10000000
-	MAP_ALIGNMENT_64PB                = 0x38000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DEFAULT               = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x2000
-	MAP_TRYFIXED                      = 0x400
-	MAP_WIRED                         = 0x800
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_BCAST                         = 0x100
-	MSG_CMSG_CLOEXEC                  = 0x800
-	MSG_CONTROLMBUF                   = 0x2000000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_IOVUSRSPACE                   = 0x4000000
-	MSG_LENUSRSPACE                   = 0x8000000
-	MSG_MCAST                         = 0x200
-	MSG_NAMEMBUF                      = 0x1000000
-	MSG_NBIO                          = 0x1000
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_USERFLAGS                     = 0xffffff
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x4
-	NAME_MAX                          = 0x1ff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x5
-	NET_RT_MAXID                      = 0x6
-	NET_RT_OIFLIST                    = 0x4
-	NET_RT_OOIFLIST                   = 0x3
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFIOGETBMAP                       = 0xc004667a
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALT_IO                          = 0x40000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x400000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x80000
-	O_DIRECTORY                       = 0x200000
-	O_DSYNC                           = 0x10000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_NOSIGPIPE                       = 0x1000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x20000
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PRI_IOFLUSH                       = 0x7c
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x9
-	RTAX_NETMASK                      = 0x2
-	RTAX_TAG                          = 0x8
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTA_TAG                           = 0x100
-	RTF_ANNOUNCE                      = 0x20000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x2000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_REJECT                        = 0x8
-	RTF_SRC                           = 0x10000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_CHGADDR                       = 0x15
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x11
-	RTM_IFANNOUNCE                    = 0x10
-	RTM_IFINFO                        = 0x14
-	RTM_LLINFO_UPD                    = 0x13
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_OIFINFO                       = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_OOIFINFO                      = 0xe
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_SETGATE                       = 0x12
-	RTM_VERSION                       = 0x4
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x4
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x8
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80906931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691c
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80906932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80906919
-	SIOCDIFPHYADDR                    = 0x80906949
-	SIOCDLIFADDR                      = 0x8118691e
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETPFSYNC                     = 0xc09069f8
-	SIOCGETSGCNT                      = 0xc0147534
-	SIOCGETVIFCNT                     = 0xc0147533
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0906921
-	SIOCGIFADDRPREF                   = 0xc0946920
-	SIOCGIFALIAS                      = 0xc040691b
-	SIOCGIFBRDADDR                    = 0xc0906923
-	SIOCGIFCAP                        = 0xc0206976
-	SIOCGIFCONF                       = 0xc0086926
-	SIOCGIFDATA                       = 0xc0946985
-	SIOCGIFDLT                        = 0xc0906977
-	SIOCGIFDSTADDR                    = 0xc0906922
-	SIOCGIFFLAGS                      = 0xc0906911
-	SIOCGIFGENERIC                    = 0xc090693a
-	SIOCGIFMEDIA                      = 0xc0286936
-	SIOCGIFMETRIC                     = 0xc0906917
-	SIOCGIFMTU                        = 0xc090697e
-	SIOCGIFNETMASK                    = 0xc0906925
-	SIOCGIFPDSTADDR                   = 0xc0906948
-	SIOCGIFPSRCADDR                   = 0xc0906947
-	SIOCGLIFADDR                      = 0xc118691d
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLINKSTR                      = 0xc01c6987
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGVH                           = 0xc0906983
-	SIOCIFCREATE                      = 0x8090697a
-	SIOCIFDESTROY                     = 0x80906979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCINITIFADDR                    = 0xc0446984
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSETPFSYNC                     = 0x809069f7
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8090690c
-	SIOCSIFADDRPREF                   = 0x8094691f
-	SIOCSIFBRDADDR                    = 0x80906913
-	SIOCSIFCAP                        = 0x80206975
-	SIOCSIFDSTADDR                    = 0x8090690e
-	SIOCSIFFLAGS                      = 0x80906910
-	SIOCSIFGENERIC                    = 0x80906939
-	SIOCSIFMEDIA                      = 0xc0906935
-	SIOCSIFMETRIC                     = 0x80906918
-	SIOCSIFMTU                        = 0x8090697f
-	SIOCSIFNETMASK                    = 0x80906916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLINKSTR                      = 0x801c6988
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSVH                           = 0xc0906982
-	SIOCZIFDATA                       = 0xc0946986
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_FLAGS_MASK                   = 0xf0000000
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_NOSIGPIPE                    = 0x40000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NOHEADER                       = 0x100a
-	SO_NOSIGPIPE                      = 0x800
-	SO_OOBINLINE                      = 0x100
-	SO_OVERFLOWED                     = 0x1009
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x100c
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x100b
-	SO_TIMESTAMP                      = 0x2000
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SYSCTL_VERSION                    = 0x1000000
-	SYSCTL_VERS_0                     = 0x0
-	SYSCTL_VERS_1                     = 0x1000000
-	SYSCTL_VERS_MASK                  = 0xff000000
-	S_ARCH1                           = 0x10000
-	S_ARCH2                           = 0x20000
-	S_BLKSIZE                         = 0x200
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	S_LOGIN_SET                       = 0x1
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONGCTL                       = 0x20
-	TCP_KEEPCNT                       = 0x6
-	TCP_KEEPIDLE                      = 0x3
-	TCP_KEEPINIT                      = 0x7
-	TCP_KEEPINTVL                     = 0x5
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x400c7458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CDTRCTS                  = 0x10
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGLINED                        = 0x40207442
-	TIOCGPGRP                         = 0x40047477
-	TIOCGQSIZE                        = 0x40047481
-	TIOCGRANTPT                       = 0x20007447
-	TIOCGSID                          = 0x40047463
-	TIOCGSIZE                         = 0x40087468
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMGET                        = 0x40287446
-	TIOCPTSNAME                       = 0x40287448
-	TIOCRCVFRAME                      = 0x80047445
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x2000745f
-	TIOCSLINED                        = 0x80207443
-	TIOCSPGRP                         = 0x80047476
-	TIOCSQSIZE                        = 0x80047480
-	TIOCSSIZE                         = 0x80087467
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TIOCXMTFRAME                      = 0x80047444
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALL                              = 0x8
-	WALLSIG                           = 0x8
-	WALTSIG                           = 0x4
-	WCLONE                            = 0x4
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x10000
-	WNOZOMBIE                         = 0x20000
-	WOPTSCHECKED                      = 0x40000
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x58)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x57)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x55)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5e)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x59)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x5a)
-	ENOSTR          = syscall.Errno(0x5b)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x56)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x60)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x5c)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x20)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large or too small",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol option not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "illegal byte sequence",
-	86: "not supported",
-	87: "operation Canceled",
-	88: "bad or Corrupt message",
-	89: "no message available",
-	90: "no STREAM resources",
-	91: "not a STREAM",
-	92: "STREAM ioctl timeout",
-	93: "attribute not found",
-	94: "multihop attempted",
-	95: "link has been severed",
-	96: "protocol error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "power fail/restart",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
deleted file mode 100644
index 4994437b63..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
+++ /dev/null
@@ -1,1702 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,netbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x1c
-	AF_BLUETOOTH                      = 0x1f
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x20
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x23
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OROUTE                         = 0x11
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x22
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ARCNET                     = 0x7
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	ARPHRD_STRIP                      = 0x17
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427d
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0104277
-	BIOCGETIF                         = 0x4090426b
-	BIOCGFEEDBACK                     = 0x4004427c
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRTIMEOUT                     = 0x4010427b
-	BIOCGSEESENT                      = 0x40044278
-	BIOCGSTATS                        = 0x4080426f
-	BIOCGSTATSOLD                     = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044276
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8090426c
-	BIOCSFEEDBACK                     = 0x8004427d
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRTIMEOUT                     = 0x8010427a
-	BIOCSSEESENT                      = 0x80044279
-	BIOCSTCPF                         = 0x80104272
-	BIOCSUDPF                         = 0x80104273
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x8
-	BPF_ALIGNMENT32                   = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DFLTBUFSIZE                   = 0x100000
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x1000000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLONE_CSIGNAL                     = 0xff
-	CLONE_FILES                       = 0x400
-	CLONE_FS                          = 0x200
-	CLONE_PID                         = 0x1000
-	CLONE_PTRACE                      = 0x2000
-	CLONE_SIGHAND                     = 0x800
-	CLONE_VFORK                       = 0x4000
-	CLONE_VM                          = 0x100
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	CTL_QUERY                         = -0x2
-	DIOCBSFLUSH                       = 0x20006478
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HDLC                          = 0x10
-	DLT_HHDLC                         = 0x79
-	DLT_HIPPI                         = 0xf
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0xe
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RAWAF_MASK                    = 0x2240000
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xd
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMUL_LINUX                        = 0x1
-	EMUL_LINUX32                      = 0x5
-	EMUL_MAXID                        = 0x6
-	ETHERCAP_JUMBO_MTU                = 0x4
-	ETHERCAP_VLAN_HWTAGGING           = 0x2
-	ETHERCAP_VLAN_MTU                 = 0x1
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERMTU_JUMBO                    = 0x2328
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MAX_LEN_JUMBO               = 0x233a
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_PPPOE_ENCAP_LEN             = 0x8
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = 0x2
-	EVFILT_PROC                       = 0x4
-	EVFILT_READ                       = 0x0
-	EVFILT_SIGNAL                     = 0x5
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = 0x6
-	EVFILT_VNODE                      = 0x3
-	EVFILT_WRITE                      = 0x1
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x100
-	FLUSHO                            = 0x800000
-	F_CLOSEM                          = 0xa
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xc
-	F_FSCTL                           = -0x80000000
-	F_FSDIRMASK                       = 0x70000000
-	F_FSIN                            = 0x10000000
-	F_FSINOUT                         = 0x30000000
-	F_FSOUT                           = 0x20000000
-	F_FSPRIV                          = 0x8000
-	F_FSVOID                          = 0x40000000
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETNOSIGPIPE                    = 0xd
-	F_GETOWN                          = 0x5
-	F_MAXFD                           = 0xb
-	F_OK                              = 0x0
-	F_PARAM_MASK                      = 0xfff
-	F_PARAM_MAX                       = 0xfff
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETNOSIGPIPE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8f52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IPV6_ICMP                 = 0x3a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VRRP                      = 0x70
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_EF                             = 0x8000
-	IP_ERRORMTU                       = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x16
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0x14
-	IP_MF                             = 0x2000
-	IP_MINFRAGSIZE                    = 0x45
-	IP_MINTTL                         = 0x18
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x17
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNMENT_16MB                = 0x18000000
-	MAP_ALIGNMENT_1TB                 = 0x28000000
-	MAP_ALIGNMENT_256TB               = 0x30000000
-	MAP_ALIGNMENT_4GB                 = 0x20000000
-	MAP_ALIGNMENT_64KB                = 0x10000000
-	MAP_ALIGNMENT_64PB                = 0x38000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DEFAULT               = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x2000
-	MAP_TRYFIXED                      = 0x400
-	MAP_WIRED                         = 0x800
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_BCAST                         = 0x100
-	MSG_CMSG_CLOEXEC                  = 0x800
-	MSG_CONTROLMBUF                   = 0x2000000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_IOVUSRSPACE                   = 0x4000000
-	MSG_LENUSRSPACE                   = 0x8000000
-	MSG_MCAST                         = 0x200
-	MSG_NAMEMBUF                      = 0x1000000
-	MSG_NBIO                          = 0x1000
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_USERFLAGS                     = 0xffffff
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x4
-	NAME_MAX                          = 0x1ff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x5
-	NET_RT_MAXID                      = 0x6
-	NET_RT_OIFLIST                    = 0x4
-	NET_RT_OOIFLIST                   = 0x3
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFIOGETBMAP                       = 0xc004667a
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALT_IO                          = 0x40000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x400000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x80000
-	O_DIRECTORY                       = 0x200000
-	O_DSYNC                           = 0x10000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_NOSIGPIPE                       = 0x1000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x20000
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PRI_IOFLUSH                       = 0x7c
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x9
-	RTAX_NETMASK                      = 0x2
-	RTAX_TAG                          = 0x8
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTA_TAG                           = 0x100
-	RTF_ANNOUNCE                      = 0x20000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x2000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_REJECT                        = 0x8
-	RTF_SRC                           = 0x10000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_CHGADDR                       = 0x15
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x11
-	RTM_IFANNOUNCE                    = 0x10
-	RTM_IFINFO                        = 0x14
-	RTM_LLINFO_UPD                    = 0x13
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_OIFINFO                       = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_OOIFINFO                      = 0xe
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_SETGATE                       = 0x12
-	RTM_VERSION                       = 0x4
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x4
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x8
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80906931
-	SIOCADDRT                         = 0x8038720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691c
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80906932
-	SIOCDELRT                         = 0x8038720b
-	SIOCDIFADDR                       = 0x80906919
-	SIOCDIFPHYADDR                    = 0x80906949
-	SIOCDLIFADDR                      = 0x8118691e
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETPFSYNC                     = 0xc09069f8
-	SIOCGETSGCNT                      = 0xc0207534
-	SIOCGETVIFCNT                     = 0xc0287533
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0906921
-	SIOCGIFADDRPREF                   = 0xc0986920
-	SIOCGIFALIAS                      = 0xc040691b
-	SIOCGIFBRDADDR                    = 0xc0906923
-	SIOCGIFCAP                        = 0xc0206976
-	SIOCGIFCONF                       = 0xc0106926
-	SIOCGIFDATA                       = 0xc0986985
-	SIOCGIFDLT                        = 0xc0906977
-	SIOCGIFDSTADDR                    = 0xc0906922
-	SIOCGIFFLAGS                      = 0xc0906911
-	SIOCGIFGENERIC                    = 0xc090693a
-	SIOCGIFMEDIA                      = 0xc0306936
-	SIOCGIFMETRIC                     = 0xc0906917
-	SIOCGIFMTU                        = 0xc090697e
-	SIOCGIFNETMASK                    = 0xc0906925
-	SIOCGIFPDSTADDR                   = 0xc0906948
-	SIOCGIFPSRCADDR                   = 0xc0906947
-	SIOCGLIFADDR                      = 0xc118691d
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLINKSTR                      = 0xc0286987
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGVH                           = 0xc0906983
-	SIOCIFCREATE                      = 0x8090697a
-	SIOCIFDESTROY                     = 0x80906979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCINITIFADDR                    = 0xc0706984
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSETPFSYNC                     = 0x809069f7
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8090690c
-	SIOCSIFADDRPREF                   = 0x8098691f
-	SIOCSIFBRDADDR                    = 0x80906913
-	SIOCSIFCAP                        = 0x80206975
-	SIOCSIFDSTADDR                    = 0x8090690e
-	SIOCSIFFLAGS                      = 0x80906910
-	SIOCSIFGENERIC                    = 0x80906939
-	SIOCSIFMEDIA                      = 0xc0906935
-	SIOCSIFMETRIC                     = 0x80906918
-	SIOCSIFMTU                        = 0x8090697f
-	SIOCSIFNETMASK                    = 0x80906916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLINKSTR                      = 0x80286988
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSVH                           = 0xc0906982
-	SIOCZIFDATA                       = 0xc0986986
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_FLAGS_MASK                   = 0xf0000000
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_NOSIGPIPE                    = 0x40000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NOHEADER                       = 0x100a
-	SO_NOSIGPIPE                      = 0x800
-	SO_OOBINLINE                      = 0x100
-	SO_OVERFLOWED                     = 0x1009
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x100c
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x100b
-	SO_TIMESTAMP                      = 0x2000
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SYSCTL_VERSION                    = 0x1000000
-	SYSCTL_VERS_0                     = 0x0
-	SYSCTL_VERS_1                     = 0x1000000
-	SYSCTL_VERS_MASK                  = 0xff000000
-	S_ARCH1                           = 0x10000
-	S_ARCH2                           = 0x20000
-	S_BLKSIZE                         = 0x200
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	S_LOGIN_SET                       = 0x1
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONGCTL                       = 0x20
-	TCP_KEEPCNT                       = 0x6
-	TCP_KEEPIDLE                      = 0x3
-	TCP_KEEPINIT                      = 0x7
-	TCP_KEEPINTVL                     = 0x5
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CDTRCTS                  = 0x10
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGLINED                        = 0x40207442
-	TIOCGPGRP                         = 0x40047477
-	TIOCGQSIZE                        = 0x40047481
-	TIOCGRANTPT                       = 0x20007447
-	TIOCGSID                          = 0x40047463
-	TIOCGSIZE                         = 0x40087468
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMGET                        = 0x40287446
-	TIOCPTSNAME                       = 0x40287448
-	TIOCRCVFRAME                      = 0x80087445
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x2000745f
-	TIOCSLINED                        = 0x80207443
-	TIOCSPGRP                         = 0x80047476
-	TIOCSQSIZE                        = 0x80047480
-	TIOCSSIZE                         = 0x80087467
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TIOCXMTFRAME                      = 0x80087444
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALL                              = 0x8
-	WALLSIG                           = 0x8
-	WALTSIG                           = 0x4
-	WCLONE                            = 0x4
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x10000
-	WNOZOMBIE                         = 0x20000
-	WOPTSCHECKED                      = 0x40000
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x58)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x57)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x55)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5e)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x59)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x5a)
-	ENOSTR          = syscall.Errno(0x5b)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x56)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x60)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x5c)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x20)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large or too small",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol option not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "illegal byte sequence",
-	86: "not supported",
-	87: "operation Canceled",
-	88: "bad or Corrupt message",
-	89: "no message available",
-	90: "no STREAM resources",
-	91: "not a STREAM",
-	92: "STREAM ioctl timeout",
-	93: "attribute not found",
-	94: "multihop attempted",
-	95: "link has been severed",
-	96: "protocol error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "power fail/restart",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go
deleted file mode 100644
index ac85ca6452..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_netbsd_arm.go
+++ /dev/null
@@ -1,1688 +0,0 @@
-// mkerrors.sh -marm
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm,netbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -marm _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x1c
-	AF_BLUETOOTH                      = 0x1f
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x20
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x23
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OROUTE                         = 0x11
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x22
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ARCNET                     = 0x7
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	ARPHRD_STRIP                      = 0x17
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427d
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084277
-	BIOCGETIF                         = 0x4090426b
-	BIOCGFEEDBACK                     = 0x4004427c
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRTIMEOUT                     = 0x400c427b
-	BIOCGSEESENT                      = 0x40044278
-	BIOCGSTATS                        = 0x4080426f
-	BIOCGSTATSOLD                     = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044276
-	BIOCSETF                          = 0x80084267
-	BIOCSETIF                         = 0x8090426c
-	BIOCSFEEDBACK                     = 0x8004427d
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRTIMEOUT                     = 0x800c427a
-	BIOCSSEESENT                      = 0x80044279
-	BIOCSTCPF                         = 0x80084272
-	BIOCSUDPF                         = 0x80084273
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALIGNMENT32                   = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DFLTBUFSIZE                   = 0x100000
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x1000000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	CTL_QUERY                         = -0x2
-	DIOCBSFLUSH                       = 0x20006478
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HDLC                          = 0x10
-	DLT_HHDLC                         = 0x79
-	DLT_HIPPI                         = 0xf
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0xe
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RAWAF_MASK                    = 0x2240000
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xd
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMUL_LINUX                        = 0x1
-	EMUL_LINUX32                      = 0x5
-	EMUL_MAXID                        = 0x6
-	ETHERCAP_JUMBO_MTU                = 0x4
-	ETHERCAP_VLAN_HWTAGGING           = 0x2
-	ETHERCAP_VLAN_MTU                 = 0x1
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERMTU_JUMBO                    = 0x2328
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MAX_LEN_JUMBO               = 0x233a
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_PPPOE_ENCAP_LEN             = 0x8
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = 0x2
-	EVFILT_PROC                       = 0x4
-	EVFILT_READ                       = 0x0
-	EVFILT_SIGNAL                     = 0x5
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = 0x6
-	EVFILT_VNODE                      = 0x3
-	EVFILT_WRITE                      = 0x1
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x100
-	FLUSHO                            = 0x800000
-	F_CLOSEM                          = 0xa
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xc
-	F_FSCTL                           = -0x80000000
-	F_FSDIRMASK                       = 0x70000000
-	F_FSIN                            = 0x10000000
-	F_FSINOUT                         = 0x30000000
-	F_FSOUT                           = 0x20000000
-	F_FSPRIV                          = 0x8000
-	F_FSVOID                          = 0x40000000
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETNOSIGPIPE                    = 0xd
-	F_GETOWN                          = 0x5
-	F_MAXFD                           = 0xb
-	F_OK                              = 0x0
-	F_PARAM_MASK                      = 0xfff
-	F_PARAM_MAX                       = 0xfff
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETNOSIGPIPE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8f52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IPV6_ICMP                 = 0x3a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VRRP                      = 0x70
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_EF                             = 0x8000
-	IP_ERRORMTU                       = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x16
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0x14
-	IP_MF                             = 0x2000
-	IP_MINFRAGSIZE                    = 0x45
-	IP_MINTTL                         = 0x18
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x17
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNMENT_16MB                = 0x18000000
-	MAP_ALIGNMENT_1TB                 = 0x28000000
-	MAP_ALIGNMENT_256TB               = 0x30000000
-	MAP_ALIGNMENT_4GB                 = 0x20000000
-	MAP_ALIGNMENT_64KB                = 0x10000000
-	MAP_ALIGNMENT_64PB                = 0x38000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DEFAULT               = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x2000
-	MAP_TRYFIXED                      = 0x400
-	MAP_WIRED                         = 0x800
-	MSG_BCAST                         = 0x100
-	MSG_CMSG_CLOEXEC                  = 0x800
-	MSG_CONTROLMBUF                   = 0x2000000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_IOVUSRSPACE                   = 0x4000000
-	MSG_LENUSRSPACE                   = 0x8000000
-	MSG_MCAST                         = 0x200
-	MSG_NAMEMBUF                      = 0x1000000
-	MSG_NBIO                          = 0x1000
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_USERFLAGS                     = 0xffffff
-	MSG_WAITALL                       = 0x40
-	NAME_MAX                          = 0x1ff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x5
-	NET_RT_MAXID                      = 0x6
-	NET_RT_OIFLIST                    = 0x4
-	NET_RT_OOIFLIST                   = 0x3
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFIOGETBMAP                       = 0xc004667a
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALT_IO                          = 0x40000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x400000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x80000
-	O_DIRECTORY                       = 0x200000
-	O_DSYNC                           = 0x10000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_NOSIGPIPE                       = 0x1000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x20000
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PRI_IOFLUSH                       = 0x7c
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x9
-	RTAX_NETMASK                      = 0x2
-	RTAX_TAG                          = 0x8
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTA_TAG                           = 0x100
-	RTF_ANNOUNCE                      = 0x20000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x2000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_REJECT                        = 0x8
-	RTF_SRC                           = 0x10000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_CHGADDR                       = 0x15
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x11
-	RTM_IFANNOUNCE                    = 0x10
-	RTM_IFINFO                        = 0x14
-	RTM_LLINFO_UPD                    = 0x13
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_OIFINFO                       = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_OOIFINFO                      = 0xe
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_SETGATE                       = 0x12
-	RTM_VERSION                       = 0x4
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x4
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x8
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80906931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691c
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80906932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80906919
-	SIOCDIFPHYADDR                    = 0x80906949
-	SIOCDLIFADDR                      = 0x8118691e
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETPFSYNC                     = 0xc09069f8
-	SIOCGETSGCNT                      = 0xc0147534
-	SIOCGETVIFCNT                     = 0xc0147533
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0906921
-	SIOCGIFADDRPREF                   = 0xc0946920
-	SIOCGIFALIAS                      = 0xc040691b
-	SIOCGIFBRDADDR                    = 0xc0906923
-	SIOCGIFCAP                        = 0xc0206976
-	SIOCGIFCONF                       = 0xc0086926
-	SIOCGIFDATA                       = 0xc0946985
-	SIOCGIFDLT                        = 0xc0906977
-	SIOCGIFDSTADDR                    = 0xc0906922
-	SIOCGIFFLAGS                      = 0xc0906911
-	SIOCGIFGENERIC                    = 0xc090693a
-	SIOCGIFMEDIA                      = 0xc0286936
-	SIOCGIFMETRIC                     = 0xc0906917
-	SIOCGIFMTU                        = 0xc090697e
-	SIOCGIFNETMASK                    = 0xc0906925
-	SIOCGIFPDSTADDR                   = 0xc0906948
-	SIOCGIFPSRCADDR                   = 0xc0906947
-	SIOCGLIFADDR                      = 0xc118691d
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLINKSTR                      = 0xc01c6987
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGVH                           = 0xc0906983
-	SIOCIFCREATE                      = 0x8090697a
-	SIOCIFDESTROY                     = 0x80906979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCINITIFADDR                    = 0xc0446984
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSETPFSYNC                     = 0x809069f7
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8090690c
-	SIOCSIFADDRPREF                   = 0x8094691f
-	SIOCSIFBRDADDR                    = 0x80906913
-	SIOCSIFCAP                        = 0x80206975
-	SIOCSIFDSTADDR                    = 0x8090690e
-	SIOCSIFFLAGS                      = 0x80906910
-	SIOCSIFGENERIC                    = 0x80906939
-	SIOCSIFMEDIA                      = 0xc0906935
-	SIOCSIFMETRIC                     = 0x80906918
-	SIOCSIFMTU                        = 0x8090697f
-	SIOCSIFNETMASK                    = 0x80906916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLINKSTR                      = 0x801c6988
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSVH                           = 0xc0906982
-	SIOCZIFDATA                       = 0xc0946986
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_FLAGS_MASK                   = 0xf0000000
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_NOSIGPIPE                    = 0x40000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NOHEADER                       = 0x100a
-	SO_NOSIGPIPE                      = 0x800
-	SO_OOBINLINE                      = 0x100
-	SO_OVERFLOWED                     = 0x1009
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x100c
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x100b
-	SO_TIMESTAMP                      = 0x2000
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SYSCTL_VERSION                    = 0x1000000
-	SYSCTL_VERS_0                     = 0x0
-	SYSCTL_VERS_1                     = 0x1000000
-	SYSCTL_VERS_MASK                  = 0xff000000
-	S_ARCH1                           = 0x10000
-	S_ARCH2                           = 0x20000
-	S_BLKSIZE                         = 0x200
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONGCTL                       = 0x20
-	TCP_KEEPCNT                       = 0x6
-	TCP_KEEPIDLE                      = 0x3
-	TCP_KEEPINIT                      = 0x7
-	TCP_KEEPINTVL                     = 0x5
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x400c7458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CDTRCTS                  = 0x10
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGLINED                        = 0x40207442
-	TIOCGPGRP                         = 0x40047477
-	TIOCGQSIZE                        = 0x40047481
-	TIOCGRANTPT                       = 0x20007447
-	TIOCGSID                          = 0x40047463
-	TIOCGSIZE                         = 0x40087468
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMGET                        = 0x48087446
-	TIOCPTSNAME                       = 0x48087448
-	TIOCRCVFRAME                      = 0x80047445
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x2000745f
-	TIOCSLINED                        = 0x80207443
-	TIOCSPGRP                         = 0x80047476
-	TIOCSQSIZE                        = 0x80047480
-	TIOCSSIZE                         = 0x80087467
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TIOCXMTFRAME                      = 0x80047444
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALL                              = 0x8
-	WALLSIG                           = 0x8
-	WALTSIG                           = 0x4
-	WCLONE                            = 0x4
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x10000
-	WNOZOMBIE                         = 0x20000
-	WOPTSCHECKED                      = 0x40000
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x58)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x57)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x55)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5e)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x59)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x5a)
-	ENOSTR          = syscall.Errno(0x5b)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x56)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x60)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x5c)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x20)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large or too small",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol option not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "illegal byte sequence",
-	86: "not supported",
-	87: "operation Canceled",
-	88: "bad or Corrupt message",
-	89: "no message available",
-	90: "no STREAM resources",
-	91: "not a STREAM",
-	92: "STREAM ioctl timeout",
-	93: "attribute not found",
-	94: "multihop attempted",
-	95: "link has been severed",
-	96: "protocol error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "power fail/restart",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go
deleted file mode 100644
index 3322e998d3..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_386.go
+++ /dev/null
@@ -1,1584 +0,0 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,openbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_BLUETOOTH                      = 0x20
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_ENCAP                          = 0x1c
-	AF_HYLINK                         = 0xf
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_KEY                            = 0x1e
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x24
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x1d
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRFILT                      = 0x4004427c
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc008427b
-	BIOCGETIF                         = 0x4020426b
-	BIOCGFILDROP                      = 0x40044278
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044273
-	BIOCGRTIMEOUT                     = 0x400c426e
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x20004276
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRFILT                      = 0x8004427d
-	BIOCSDLT                          = 0x8004427a
-	BIOCSETF                          = 0x80084267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x80084277
-	BIOCSFILDROP                      = 0x80044279
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044272
-	BIOCSRTIMEOUT                     = 0x800c426d
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIRECTION_IN                  = 0x1
-	BPF_DIRECTION_OUT                 = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x200000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0xff
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DIOCOSFPFLUSH                     = 0x2000444e
-	DLT_ARCNET                        = 0x7
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AX25                          = 0x3
-	DLT_CHAOS                         = 0x5
-	DLT_C_HDLC                        = 0x68
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0xd
-	DLT_FDDI                          = 0xa
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_LOOP                          = 0xc
-	DLT_MPLS                          = 0xdb
-	DLT_NULL                          = 0x0
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PRONET                        = 0x4
-	DLT_RAW                           = 0xe
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMT_TAGOVF                        = 0x1
-	EMUL_ENABLED                      = 0x1
-	EMUL_NATIVE                       = 0x2
-	ENDRUNDISC                        = 0x9
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_AOE                     = 0x88a2
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LLDP                    = 0x88cc
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_QINQ                    = 0x88a8
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOW                    = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_ALIGN                       = 0x2
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_DIX_LEN                 = 0x600
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = -0x3
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = -0x7
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xa
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETOWN                          = 0x5
-	F_OK                              = 0x0
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8e52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BLUETOOTH                     = 0xf8
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf7
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DUMMY                         = 0xf1
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf3
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFLOW                         = 0xf9
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf2
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_HOST                   = 0x1
-	IN_RFC3021_NET                    = 0xfffffffe
-	IN_RFC3021_NSHIFT                 = 0x1f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DIVERT_INIT               = 0x2
-	IPPROTO_DIVERT_RESP               = 0x1
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x103
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPV6_AUTH_LEVEL                   = 0x35
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_ESP_NETWORK_LEVEL            = 0x37
-	IPV6_ESP_TRANS_LEVEL              = 0x36
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPCOMP_LEVEL                 = 0x3c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_OPTIONS                      = 0x1
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PIPEX                        = 0x3f
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVDSTPORT                  = 0x40
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTABLE                       = 0x1021
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_AUTH_LEVEL                     = 0x14
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DIVERTFL                       = 0x1022
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_ESP_NETWORK_LEVEL              = 0x16
-	IP_ESP_TRANS_LEVEL                = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPCOMP_LEVEL                   = 0x1d
-	IP_IPSECFLOWINFO                  = 0x24
-	IP_IPSEC_LOCAL_AUTH               = 0x1b
-	IP_IPSEC_LOCAL_CRED               = 0x19
-	IP_IPSEC_LOCAL_ID                 = 0x17
-	IP_IPSEC_REMOTE_AUTH              = 0x1c
-	IP_IPSEC_REMOTE_CRED              = 0x1a
-	IP_IPSEC_REMOTE_ID                = 0x18
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x20
-	IP_MIN_MEMBERSHIPS                = 0xf
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PIPEX                          = 0x22
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVDSTPORT                    = 0x21
-	IP_RECVIF                         = 0x1e
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVRTABLE                     = 0x23
-	IP_RECVTTL                        = 0x1f
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RTABLE                         = 0x1021
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LCNT_OVERLOAD_FLUSH               = 0x6
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x4
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_FLAGMASK                      = 0x1ff7
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_TRYFIXED                      = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_BCAST                         = 0x100
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_MCAST                         = 0x200
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x4
-	MS_SYNC                           = 0x2
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_MAXID                      = 0x6
-	NET_RT_STATS                      = 0x4
-	NET_RT_TABLE                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EOF                          = 0x2
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRUNCATE                     = 0x80
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x80
-	ONOCR                             = 0x40
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x10000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x20000
-	O_DSYNC                           = 0x80
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x80
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PF_FLUSH                          = 0x1
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_MASK                           = 0x3ff000
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_LABEL                        = 0xa
-	RTAX_MAX                          = 0xb
-	RTAX_NETMASK                      = 0x2
-	RTAX_SRC                          = 0x8
-	RTAX_SRCMASK                      = 0x9
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_LABEL                         = 0x400
-	RTA_NETMASK                       = 0x4
-	RTA_SRC                           = 0x100
-	RTA_SRCMASK                       = 0x200
-	RTF_ANNOUNCE                      = 0x4000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x10000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x10f808
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_MPATH                         = 0x40000
-	RTF_MPLS                          = 0x100000
-	RTF_PERMANENT_ARP                 = 0x2000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x2000
-	RTF_REJECT                        = 0x8
-	RTF_SOURCE                        = 0x20000
-	RTF_STATIC                        = 0x800
-	RTF_TUNNEL                        = 0x100000
-	RTF_UP                            = 0x1
-	RTF_USETRAILERS                   = 0x8000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DESYNC                        = 0x10
-	RTM_GET                           = 0x4
-	RTM_IFANNOUNCE                    = 0xf
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MAXSIZE                       = 0x800
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RT_TABLEID_MAX                    = 0xff
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80246987
-	SIOCALIFADDR                      = 0x8218691c
-	SIOCATMARK                        = 0x40047307
-	SIOCBRDGADD                       = 0x8054693c
-	SIOCBRDGADDS                      = 0x80546941
-	SIOCBRDGARL                       = 0x806e694d
-	SIOCBRDGDADDR                     = 0x81286947
-	SIOCBRDGDEL                       = 0x8054693d
-	SIOCBRDGDELS                      = 0x80546942
-	SIOCBRDGFLUSH                     = 0x80546948
-	SIOCBRDGFRL                       = 0x806e694e
-	SIOCBRDGGCACHE                    = 0xc0146941
-	SIOCBRDGGFD                       = 0xc0146952
-	SIOCBRDGGHT                       = 0xc0146951
-	SIOCBRDGGIFFLGS                   = 0xc054693e
-	SIOCBRDGGMA                       = 0xc0146953
-	SIOCBRDGGPARAM                    = 0xc03c6958
-	SIOCBRDGGPRI                      = 0xc0146950
-	SIOCBRDGGRL                       = 0xc028694f
-	SIOCBRDGGSIFS                     = 0xc054693c
-	SIOCBRDGGTO                       = 0xc0146946
-	SIOCBRDGIFS                       = 0xc0546942
-	SIOCBRDGRTS                       = 0xc0186943
-	SIOCBRDGSADDR                     = 0xc1286944
-	SIOCBRDGSCACHE                    = 0x80146940
-	SIOCBRDGSFD                       = 0x80146952
-	SIOCBRDGSHT                       = 0x80146951
-	SIOCBRDGSIFCOST                   = 0x80546955
-	SIOCBRDGSIFFLGS                   = 0x8054693f
-	SIOCBRDGSIFPRIO                   = 0x80546954
-	SIOCBRDGSMA                       = 0x80146953
-	SIOCBRDGSPRI                      = 0x80146950
-	SIOCBRDGSPROTO                    = 0x8014695a
-	SIOCBRDGSTO                       = 0x80146945
-	SIOCBRDGSTXHC                     = 0x80146959
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8218691e
-	SIOCGETKALIVE                     = 0xc01869a4
-	SIOCGETLABEL                      = 0x8020699a
-	SIOCGETPFLOW                      = 0xc02069fe
-	SIOCGETPFSYNC                     = 0xc02069f8
-	SIOCGETSGCNT                      = 0xc0147534
-	SIOCGETVIFCNT                     = 0xc0147533
-	SIOCGETVLAN                       = 0xc0206990
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDATA                       = 0xc020691b
-	SIOCGIFDESCR                      = 0xc0206981
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGATTR                      = 0xc024698b
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc024698a
-	SIOCGIFGROUP                      = 0xc0246988
-	SIOCGIFHARDMTU                    = 0xc02069a5
-	SIOCGIFMEDIA                      = 0xc0286936
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc020697e
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPRIORITY                   = 0xc020699c
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFRDOMAIN                    = 0xc02069a0
-	SIOCGIFRTLABEL                    = 0xc0206983
-	SIOCGIFTIMESLOT                   = 0xc0206986
-	SIOCGIFXFLAGS                     = 0xc020699e
-	SIOCGLIFADDR                      = 0xc218691d
-	SIOCGLIFPHYADDR                   = 0xc218694b
-	SIOCGLIFPHYRTABLE                 = 0xc02069a2
-	SIOCGLIFPHYTTL                    = 0xc02069a9
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGSPPPPARAMS                   = 0xc0206994
-	SIOCGVH                           = 0xc02069f6
-	SIOCGVNETID                       = 0xc02069a7
-	SIOCIFCREATE                      = 0x8020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCSETKALIVE                     = 0x801869a3
-	SIOCSETLABEL                      = 0x80206999
-	SIOCSETPFLOW                      = 0x802069fd
-	SIOCSETPFSYNC                     = 0x802069f7
-	SIOCSETVLAN                       = 0x8020698f
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFDESCR                      = 0x80206980
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGATTR                      = 0x8024698c
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020691f
-	SIOCSIFMEDIA                      = 0xc0206935
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x8020697f
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPRIORITY                   = 0x8020699b
-	SIOCSIFRDOMAIN                    = 0x8020699f
-	SIOCSIFRTLABEL                    = 0x80206982
-	SIOCSIFTIMESLOT                   = 0x80206985
-	SIOCSIFXFLAGS                     = 0x8020699d
-	SIOCSLIFPHYADDR                   = 0x8218694a
-	SIOCSLIFPHYRTABLE                 = 0x802069a1
-	SIOCSLIFPHYTTL                    = 0x802069a8
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSSPPPPARAMS                   = 0x80206993
-	SIOCSVH                           = 0xc02069f5
-	SIOCSVNETID                       = 0x802069a6
-	SOCK_DGRAM                        = 0x2
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BINDANY                        = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NETPROC                        = 0x1020
-	SO_OOBINLINE                      = 0x100
-	SO_PEERCRED                       = 0x1022
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_RTABLE                         = 0x1021
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_SPLICE                         = 0x1023
-	SO_TIMESTAMP                      = 0x800
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x3
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x4
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOPUSH                        = 0x10
-	TCP_NSTATES                       = 0xb
-	TCP_SACK_ENABLE                   = 0x8
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_PPS                      = 0x10
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGPGRP                         = 0x40047477
-	TIOCGSID                          = 0x40047463
-	TIOCGTSTAMP                       = 0x400c745b
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x4004746a
-	TIOCMODS                          = 0x8004746d
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x8004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSTSTAMP                       = 0x8008745a
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALTSIG                           = 0x4
-	WCONTINUED                        = 0x8
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x58)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x59)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EIPSEC          = syscall.Errno(0x52)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x5b)
-	ELOOP           = syscall.Errno(0x3e)
-	EMEDIUMTYPE     = syscall.Errno(0x56)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x53)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOMEDIUM       = syscall.Errno(0x55)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5a)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x5b)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x57)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "IPsec processing failure",
-	83: "attribute not found",
-	84: "illegal byte sequence",
-	85: "no medium found",
-	86: "wrong medium type",
-	87: "value too large to be stored in data type",
-	88: "operation canceled",
-	89: "identifier removed",
-	90: "no message of desired type",
-	91: "not supported",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "thread AST",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
deleted file mode 100644
index 1758ecca93..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
+++ /dev/null
@@ -1,1583 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,openbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_BLUETOOTH                      = 0x20
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_ENCAP                          = 0x1c
-	AF_HYLINK                         = 0xf
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_KEY                            = 0x1e
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x24
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x1d
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRFILT                      = 0x4004427c
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc010427b
-	BIOCGETIF                         = 0x4020426b
-	BIOCGFILDROP                      = 0x40044278
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044273
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x20004276
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRFILT                      = 0x8004427d
-	BIOCSDLT                          = 0x8004427a
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x80104277
-	BIOCSFILDROP                      = 0x80044279
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044272
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIRECTION_IN                  = 0x1
-	BPF_DIRECTION_OUT                 = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x200000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0xff
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DIOCOSFPFLUSH                     = 0x2000444e
-	DLT_ARCNET                        = 0x7
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AX25                          = 0x3
-	DLT_CHAOS                         = 0x5
-	DLT_C_HDLC                        = 0x68
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0xd
-	DLT_FDDI                          = 0xa
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_LOOP                          = 0xc
-	DLT_MPLS                          = 0xdb
-	DLT_NULL                          = 0x0
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PRONET                        = 0x4
-	DLT_RAW                           = 0xe
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMT_TAGOVF                        = 0x1
-	EMUL_ENABLED                      = 0x1
-	EMUL_NATIVE                       = 0x2
-	ENDRUNDISC                        = 0x9
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_AOE                     = 0x88a2
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LLDP                    = 0x88cc
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_QINQ                    = 0x88a8
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOW                    = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_ALIGN                       = 0x2
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_DIX_LEN                 = 0x600
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = -0x3
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = -0x7
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xa
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETOWN                          = 0x5
-	F_OK                              = 0x0
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8e52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BLUETOOTH                     = 0xf8
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf7
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DUMMY                         = 0xf1
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf3
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFLOW                         = 0xf9
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf2
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_HOST                   = 0x1
-	IN_RFC3021_NET                    = 0xfffffffe
-	IN_RFC3021_NSHIFT                 = 0x1f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DIVERT_INIT               = 0x2
-	IPPROTO_DIVERT_RESP               = 0x1
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x103
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPV6_AUTH_LEVEL                   = 0x35
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_ESP_NETWORK_LEVEL            = 0x37
-	IPV6_ESP_TRANS_LEVEL              = 0x36
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPCOMP_LEVEL                 = 0x3c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_OPTIONS                      = 0x1
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PIPEX                        = 0x3f
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVDSTPORT                  = 0x40
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTABLE                       = 0x1021
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_AUTH_LEVEL                     = 0x14
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DIVERTFL                       = 0x1022
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_ESP_NETWORK_LEVEL              = 0x16
-	IP_ESP_TRANS_LEVEL                = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPCOMP_LEVEL                   = 0x1d
-	IP_IPSECFLOWINFO                  = 0x24
-	IP_IPSEC_LOCAL_AUTH               = 0x1b
-	IP_IPSEC_LOCAL_CRED               = 0x19
-	IP_IPSEC_LOCAL_ID                 = 0x17
-	IP_IPSEC_REMOTE_AUTH              = 0x1c
-	IP_IPSEC_REMOTE_CRED              = 0x1a
-	IP_IPSEC_REMOTE_ID                = 0x18
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x20
-	IP_MIN_MEMBERSHIPS                = 0xf
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PIPEX                          = 0x22
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVDSTPORT                    = 0x21
-	IP_RECVIF                         = 0x1e
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVRTABLE                     = 0x23
-	IP_RECVTTL                        = 0x1f
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RTABLE                         = 0x1021
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LCNT_OVERLOAD_FLUSH               = 0x6
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x4
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_FLAGMASK                      = 0x1ff7
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_TRYFIXED                      = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_BCAST                         = 0x100
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_MCAST                         = 0x200
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x4
-	MS_SYNC                           = 0x2
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_MAXID                      = 0x6
-	NET_RT_STATS                      = 0x4
-	NET_RT_TABLE                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EOF                          = 0x2
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRUNCATE                     = 0x80
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x80
-	ONOCR                             = 0x40
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x10000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x20000
-	O_DSYNC                           = 0x80
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x80
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PF_FLUSH                          = 0x1
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_LABEL                        = 0xa
-	RTAX_MAX                          = 0xb
-	RTAX_NETMASK                      = 0x2
-	RTAX_SRC                          = 0x8
-	RTAX_SRCMASK                      = 0x9
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_LABEL                         = 0x400
-	RTA_NETMASK                       = 0x4
-	RTA_SRC                           = 0x100
-	RTA_SRCMASK                       = 0x200
-	RTF_ANNOUNCE                      = 0x4000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x10000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x10f808
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_MPATH                         = 0x40000
-	RTF_MPLS                          = 0x100000
-	RTF_PERMANENT_ARP                 = 0x2000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x2000
-	RTF_REJECT                        = 0x8
-	RTF_SOURCE                        = 0x20000
-	RTF_STATIC                        = 0x800
-	RTF_TUNNEL                        = 0x100000
-	RTF_UP                            = 0x1
-	RTF_USETRAILERS                   = 0x8000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DESYNC                        = 0x10
-	RTM_GET                           = 0x4
-	RTM_IFANNOUNCE                    = 0xf
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MAXSIZE                       = 0x800
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RT_TABLEID_MAX                    = 0xff
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80286987
-	SIOCALIFADDR                      = 0x8218691c
-	SIOCATMARK                        = 0x40047307
-	SIOCBRDGADD                       = 0x8058693c
-	SIOCBRDGADDS                      = 0x80586941
-	SIOCBRDGARL                       = 0x806e694d
-	SIOCBRDGDADDR                     = 0x81286947
-	SIOCBRDGDEL                       = 0x8058693d
-	SIOCBRDGDELS                      = 0x80586942
-	SIOCBRDGFLUSH                     = 0x80586948
-	SIOCBRDGFRL                       = 0x806e694e
-	SIOCBRDGGCACHE                    = 0xc0146941
-	SIOCBRDGGFD                       = 0xc0146952
-	SIOCBRDGGHT                       = 0xc0146951
-	SIOCBRDGGIFFLGS                   = 0xc058693e
-	SIOCBRDGGMA                       = 0xc0146953
-	SIOCBRDGGPARAM                    = 0xc0406958
-	SIOCBRDGGPRI                      = 0xc0146950
-	SIOCBRDGGRL                       = 0xc030694f
-	SIOCBRDGGSIFS                     = 0xc058693c
-	SIOCBRDGGTO                       = 0xc0146946
-	SIOCBRDGIFS                       = 0xc0586942
-	SIOCBRDGRTS                       = 0xc0206943
-	SIOCBRDGSADDR                     = 0xc1286944
-	SIOCBRDGSCACHE                    = 0x80146940
-	SIOCBRDGSFD                       = 0x80146952
-	SIOCBRDGSHT                       = 0x80146951
-	SIOCBRDGSIFCOST                   = 0x80586955
-	SIOCBRDGSIFFLGS                   = 0x8058693f
-	SIOCBRDGSIFPRIO                   = 0x80586954
-	SIOCBRDGSMA                       = 0x80146953
-	SIOCBRDGSPRI                      = 0x80146950
-	SIOCBRDGSPROTO                    = 0x8014695a
-	SIOCBRDGSTO                       = 0x80146945
-	SIOCBRDGSTXHC                     = 0x80146959
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80286989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8218691e
-	SIOCGETKALIVE                     = 0xc01869a4
-	SIOCGETLABEL                      = 0x8020699a
-	SIOCGETPFLOW                      = 0xc02069fe
-	SIOCGETPFSYNC                     = 0xc02069f8
-	SIOCGETSGCNT                      = 0xc0207534
-	SIOCGETVIFCNT                     = 0xc0287533
-	SIOCGETVLAN                       = 0xc0206990
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCONF                       = 0xc0106924
-	SIOCGIFDATA                       = 0xc020691b
-	SIOCGIFDESCR                      = 0xc0206981
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGATTR                      = 0xc028698b
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc028698a
-	SIOCGIFGROUP                      = 0xc0286988
-	SIOCGIFHARDMTU                    = 0xc02069a5
-	SIOCGIFMEDIA                      = 0xc0306936
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc020697e
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPRIORITY                   = 0xc020699c
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFRDOMAIN                    = 0xc02069a0
-	SIOCGIFRTLABEL                    = 0xc0206983
-	SIOCGIFTIMESLOT                   = 0xc0206986
-	SIOCGIFXFLAGS                     = 0xc020699e
-	SIOCGLIFADDR                      = 0xc218691d
-	SIOCGLIFPHYADDR                   = 0xc218694b
-	SIOCGLIFPHYRTABLE                 = 0xc02069a2
-	SIOCGLIFPHYTTL                    = 0xc02069a9
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGSPPPPARAMS                   = 0xc0206994
-	SIOCGVH                           = 0xc02069f6
-	SIOCGVNETID                       = 0xc02069a7
-	SIOCIFCREATE                      = 0x8020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCSETKALIVE                     = 0x801869a3
-	SIOCSETLABEL                      = 0x80206999
-	SIOCSETPFLOW                      = 0x802069fd
-	SIOCSETPFSYNC                     = 0x802069f7
-	SIOCSETVLAN                       = 0x8020698f
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFDESCR                      = 0x80206980
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGATTR                      = 0x8028698c
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020691f
-	SIOCSIFMEDIA                      = 0xc0206935
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x8020697f
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPRIORITY                   = 0x8020699b
-	SIOCSIFRDOMAIN                    = 0x8020699f
-	SIOCSIFRTLABEL                    = 0x80206982
-	SIOCSIFTIMESLOT                   = 0x80206985
-	SIOCSIFXFLAGS                     = 0x8020699d
-	SIOCSLIFPHYADDR                   = 0x8218694a
-	SIOCSLIFPHYRTABLE                 = 0x802069a1
-	SIOCSLIFPHYTTL                    = 0x802069a8
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSSPPPPARAMS                   = 0x80206993
-	SIOCSVH                           = 0xc02069f5
-	SIOCSVNETID                       = 0x802069a6
-	SOCK_DGRAM                        = 0x2
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BINDANY                        = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NETPROC                        = 0x1020
-	SO_OOBINLINE                      = 0x100
-	SO_PEERCRED                       = 0x1022
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_RTABLE                         = 0x1021
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_SPLICE                         = 0x1023
-	SO_TIMESTAMP                      = 0x800
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x3
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x4
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOPUSH                        = 0x10
-	TCP_NSTATES                       = 0xb
-	TCP_SACK_ENABLE                   = 0x8
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_PPS                      = 0x10
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGPGRP                         = 0x40047477
-	TIOCGSID                          = 0x40047463
-	TIOCGTSTAMP                       = 0x4010745b
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x4004746a
-	TIOCMODS                          = 0x8004746d
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x8004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSTSTAMP                       = 0x8008745a
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALTSIG                           = 0x4
-	WCONTINUED                        = 0x8
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x58)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x59)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EIPSEC          = syscall.Errno(0x52)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x5b)
-	ELOOP           = syscall.Errno(0x3e)
-	EMEDIUMTYPE     = syscall.Errno(0x56)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x53)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOMEDIUM       = syscall.Errno(0x55)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5a)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x5b)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x57)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "IPsec processing failure",
-	83: "attribute not found",
-	84: "illegal byte sequence",
-	85: "no medium found",
-	86: "wrong medium type",
-	87: "value too large to be stored in data type",
-	88: "operation canceled",
-	89: "identifier removed",
-	90: "no message of desired type",
-	91: "not supported",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "thread AST",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go
deleted file mode 100644
index a08922b981..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zerrors_solaris_amd64.go
+++ /dev/null
@@ -1,1436 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,solaris
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_802                        = 0x12
-	AF_APPLETALK                  = 0x10
-	AF_CCITT                      = 0xa
-	AF_CHAOS                      = 0x5
-	AF_DATAKIT                    = 0x9
-	AF_DECnet                     = 0xc
-	AF_DLI                        = 0xd
-	AF_ECMA                       = 0x8
-	AF_FILE                       = 0x1
-	AF_GOSIP                      = 0x16
-	AF_HYLINK                     = 0xf
-	AF_IMPLINK                    = 0x3
-	AF_INET                       = 0x2
-	AF_INET6                      = 0x1a
-	AF_INET_OFFLOAD               = 0x1e
-	AF_IPX                        = 0x17
-	AF_KEY                        = 0x1b
-	AF_LAT                        = 0xe
-	AF_LINK                       = 0x19
-	AF_LOCAL                      = 0x1
-	AF_MAX                        = 0x20
-	AF_NBS                        = 0x7
-	AF_NCA                        = 0x1c
-	AF_NIT                        = 0x11
-	AF_NS                         = 0x6
-	AF_OSI                        = 0x13
-	AF_OSINET                     = 0x15
-	AF_PACKET                     = 0x20
-	AF_POLICY                     = 0x1d
-	AF_PUP                        = 0x4
-	AF_ROUTE                      = 0x18
-	AF_SNA                        = 0xb
-	AF_TRILL                      = 0x1f
-	AF_UNIX                       = 0x1
-	AF_UNSPEC                     = 0x0
-	AF_X25                        = 0x14
-	ARPHRD_ARCNET                 = 0x7
-	ARPHRD_ATM                    = 0x10
-	ARPHRD_AX25                   = 0x3
-	ARPHRD_CHAOS                  = 0x5
-	ARPHRD_EETHER                 = 0x2
-	ARPHRD_ETHER                  = 0x1
-	ARPHRD_FC                     = 0x12
-	ARPHRD_FRAME                  = 0xf
-	ARPHRD_HDLC                   = 0x11
-	ARPHRD_IB                     = 0x20
-	ARPHRD_IEEE802                = 0x6
-	ARPHRD_IPATM                  = 0x13
-	ARPHRD_METRICOM               = 0x17
-	ARPHRD_TUNNEL                 = 0x1f
-	B0                            = 0x0
-	B110                          = 0x3
-	B115200                       = 0x12
-	B1200                         = 0x9
-	B134                          = 0x4
-	B150                          = 0x5
-	B153600                       = 0x13
-	B1800                         = 0xa
-	B19200                        = 0xe
-	B200                          = 0x6
-	B230400                       = 0x14
-	B2400                         = 0xb
-	B300                          = 0x7
-	B307200                       = 0x15
-	B38400                        = 0xf
-	B460800                       = 0x16
-	B4800                         = 0xc
-	B50                           = 0x1
-	B57600                        = 0x10
-	B600                          = 0x8
-	B75                           = 0x2
-	B76800                        = 0x11
-	B921600                       = 0x17
-	B9600                         = 0xd
-	BIOCFLUSH                     = 0x20004268
-	BIOCGBLEN                     = 0x40044266
-	BIOCGDLT                      = 0x4004426a
-	BIOCGDLTLIST                  = -0x3fefbd89
-	BIOCGDLTLIST32                = -0x3ff7bd89
-	BIOCGETIF                     = 0x4020426b
-	BIOCGETLIF                    = 0x4078426b
-	BIOCGHDRCMPLT                 = 0x40044274
-	BIOCGRTIMEOUT                 = 0x4010427b
-	BIOCGRTIMEOUT32               = 0x4008427b
-	BIOCGSEESENT                  = 0x40044278
-	BIOCGSTATS                    = 0x4080426f
-	BIOCGSTATSOLD                 = 0x4008426f
-	BIOCIMMEDIATE                 = -0x7ffbbd90
-	BIOCPROMISC                   = 0x20004269
-	BIOCSBLEN                     = -0x3ffbbd9a
-	BIOCSDLT                      = -0x7ffbbd8a
-	BIOCSETF                      = -0x7fefbd99
-	BIOCSETF32                    = -0x7ff7bd99
-	BIOCSETIF                     = -0x7fdfbd94
-	BIOCSETLIF                    = -0x7f87bd94
-	BIOCSHDRCMPLT                 = -0x7ffbbd8b
-	BIOCSRTIMEOUT                 = -0x7fefbd86
-	BIOCSRTIMEOUT32               = -0x7ff7bd86
-	BIOCSSEESENT                  = -0x7ffbbd87
-	BIOCSTCPF                     = -0x7fefbd8e
-	BIOCSUDPF                     = -0x7fefbd8d
-	BIOCVERSION                   = 0x40044271
-	BPF_A                         = 0x10
-	BPF_ABS                       = 0x20
-	BPF_ADD                       = 0x0
-	BPF_ALIGNMENT                 = 0x4
-	BPF_ALU                       = 0x4
-	BPF_AND                       = 0x50
-	BPF_B                         = 0x10
-	BPF_DFLTBUFSIZE               = 0x100000
-	BPF_DIV                       = 0x30
-	BPF_H                         = 0x8
-	BPF_IMM                       = 0x0
-	BPF_IND                       = 0x40
-	BPF_JA                        = 0x0
-	BPF_JEQ                       = 0x10
-	BPF_JGE                       = 0x30
-	BPF_JGT                       = 0x20
-	BPF_JMP                       = 0x5
-	BPF_JSET                      = 0x40
-	BPF_K                         = 0x0
-	BPF_LD                        = 0x0
-	BPF_LDX                       = 0x1
-	BPF_LEN                       = 0x80
-	BPF_LSH                       = 0x60
-	BPF_MAJOR_VERSION             = 0x1
-	BPF_MAXBUFSIZE                = 0x1000000
-	BPF_MAXINSNS                  = 0x200
-	BPF_MEM                       = 0x60
-	BPF_MEMWORDS                  = 0x10
-	BPF_MINBUFSIZE                = 0x20
-	BPF_MINOR_VERSION             = 0x1
-	BPF_MISC                      = 0x7
-	BPF_MSH                       = 0xa0
-	BPF_MUL                       = 0x20
-	BPF_NEG                       = 0x80
-	BPF_OR                        = 0x40
-	BPF_RELEASE                   = 0x30bb6
-	BPF_RET                       = 0x6
-	BPF_RSH                       = 0x70
-	BPF_ST                        = 0x2
-	BPF_STX                       = 0x3
-	BPF_SUB                       = 0x10
-	BPF_TAX                       = 0x0
-	BPF_TXA                       = 0x80
-	BPF_W                         = 0x0
-	BPF_X                         = 0x8
-	BRKINT                        = 0x2
-	CFLUSH                        = 0xf
-	CLOCAL                        = 0x800
-	CLOCK_HIGHRES                 = 0x4
-	CLOCK_LEVEL                   = 0xa
-	CLOCK_MONOTONIC               = 0x4
-	CLOCK_PROCESS_CPUTIME_ID      = 0x5
-	CLOCK_PROF                    = 0x2
-	CLOCK_REALTIME                = 0x3
-	CLOCK_THREAD_CPUTIME_ID       = 0x2
-	CLOCK_VIRTUAL                 = 0x1
-	CREAD                         = 0x80
-	CS5                           = 0x0
-	CS6                           = 0x10
-	CS7                           = 0x20
-	CS8                           = 0x30
-	CSIZE                         = 0x30
-	CSTART                        = 0x11
-	CSTATUS                       = 0x14
-	CSTOP                         = 0x13
-	CSTOPB                        = 0x40
-	CSUSP                         = 0x1a
-	CSWTCH                        = 0x1a
-	DLT_AIRONET_HEADER            = 0x78
-	DLT_APPLE_IP_OVER_IEEE1394    = 0x8a
-	DLT_ARCNET                    = 0x7
-	DLT_ARCNET_LINUX              = 0x81
-	DLT_ATM_CLIP                  = 0x13
-	DLT_ATM_RFC1483               = 0xb
-	DLT_AURORA                    = 0x7e
-	DLT_AX25                      = 0x3
-	DLT_BACNET_MS_TP              = 0xa5
-	DLT_CHAOS                     = 0x5
-	DLT_CISCO_IOS                 = 0x76
-	DLT_C_HDLC                    = 0x68
-	DLT_DOCSIS                    = 0x8f
-	DLT_ECONET                    = 0x73
-	DLT_EN10MB                    = 0x1
-	DLT_EN3MB                     = 0x2
-	DLT_ENC                       = 0x6d
-	DLT_ERF_ETH                   = 0xaf
-	DLT_ERF_POS                   = 0xb0
-	DLT_FDDI                      = 0xa
-	DLT_FRELAY                    = 0x6b
-	DLT_GCOM_SERIAL               = 0xad
-	DLT_GCOM_T1E1                 = 0xac
-	DLT_GPF_F                     = 0xab
-	DLT_GPF_T                     = 0xaa
-	DLT_GPRS_LLC                  = 0xa9
-	DLT_HDLC                      = 0x10
-	DLT_HHDLC                     = 0x79
-	DLT_HIPPI                     = 0xf
-	DLT_IBM_SN                    = 0x92
-	DLT_IBM_SP                    = 0x91
-	DLT_IEEE802                   = 0x6
-	DLT_IEEE802_11                = 0x69
-	DLT_IEEE802_11_RADIO          = 0x7f
-	DLT_IEEE802_11_RADIO_AVS      = 0xa3
-	DLT_IPNET                     = 0xe2
-	DLT_IPOIB                     = 0xa2
-	DLT_IP_OVER_FC                = 0x7a
-	DLT_JUNIPER_ATM1              = 0x89
-	DLT_JUNIPER_ATM2              = 0x87
-	DLT_JUNIPER_CHDLC             = 0xb5
-	DLT_JUNIPER_ES                = 0x84
-	DLT_JUNIPER_ETHER             = 0xb2
-	DLT_JUNIPER_FRELAY            = 0xb4
-	DLT_JUNIPER_GGSN              = 0x85
-	DLT_JUNIPER_MFR               = 0x86
-	DLT_JUNIPER_MLFR              = 0x83
-	DLT_JUNIPER_MLPPP             = 0x82
-	DLT_JUNIPER_MONITOR           = 0xa4
-	DLT_JUNIPER_PIC_PEER          = 0xae
-	DLT_JUNIPER_PPP               = 0xb3
-	DLT_JUNIPER_PPPOE             = 0xa7
-	DLT_JUNIPER_PPPOE_ATM         = 0xa8
-	DLT_JUNIPER_SERVICES          = 0x88
-	DLT_LINUX_IRDA                = 0x90
-	DLT_LINUX_LAPD                = 0xb1
-	DLT_LINUX_SLL                 = 0x71
-	DLT_LOOP                      = 0x6c
-	DLT_LTALK                     = 0x72
-	DLT_MTP2                      = 0x8c
-	DLT_MTP2_WITH_PHDR            = 0x8b
-	DLT_MTP3                      = 0x8d
-	DLT_NULL                      = 0x0
-	DLT_PCI_EXP                   = 0x7d
-	DLT_PFLOG                     = 0x75
-	DLT_PFSYNC                    = 0x12
-	DLT_PPP                       = 0x9
-	DLT_PPP_BSDOS                 = 0xe
-	DLT_PPP_PPPD                  = 0xa6
-	DLT_PRISM_HEADER              = 0x77
-	DLT_PRONET                    = 0x4
-	DLT_RAW                       = 0xc
-	DLT_RAWAF_MASK                = 0x2240000
-	DLT_RIO                       = 0x7c
-	DLT_SCCP                      = 0x8e
-	DLT_SLIP                      = 0x8
-	DLT_SLIP_BSDOS                = 0xd
-	DLT_SUNATM                    = 0x7b
-	DLT_SYMANTEC_FIREWALL         = 0x63
-	DLT_TZSP                      = 0x80
-	ECHO                          = 0x8
-	ECHOCTL                       = 0x200
-	ECHOE                         = 0x10
-	ECHOK                         = 0x20
-	ECHOKE                        = 0x800
-	ECHONL                        = 0x40
-	ECHOPRT                       = 0x400
-	EMPTY_SET                     = 0x0
-	EMT_CPCOVF                    = 0x1
-	EQUALITY_CHECK                = 0x0
-	EXTA                          = 0xe
-	EXTB                          = 0xf
-	FD_CLOEXEC                    = 0x1
-	FD_NFDBITS                    = 0x40
-	FD_SETSIZE                    = 0x10000
-	FLUSHALL                      = 0x1
-	FLUSHDATA                     = 0x0
-	FLUSHO                        = 0x2000
-	F_ALLOCSP                     = 0xa
-	F_ALLOCSP64                   = 0xa
-	F_BADFD                       = 0x2e
-	F_BLKSIZE                     = 0x13
-	F_BLOCKS                      = 0x12
-	F_CHKFL                       = 0x8
-	F_COMPAT                      = 0x8
-	F_DUP2FD                      = 0x9
-	F_DUP2FD_CLOEXEC              = 0x24
-	F_DUPFD                       = 0x0
-	F_DUPFD_CLOEXEC               = 0x25
-	F_FREESP                      = 0xb
-	F_FREESP64                    = 0xb
-	F_GETFD                       = 0x1
-	F_GETFL                       = 0x3
-	F_GETLK                       = 0xe
-	F_GETLK64                     = 0xe
-	F_GETOWN                      = 0x17
-	F_GETXFL                      = 0x2d
-	F_HASREMOTELOCKS              = 0x1a
-	F_ISSTREAM                    = 0xd
-	F_MANDDNY                     = 0x10
-	F_MDACC                       = 0x20
-	F_NODNY                       = 0x0
-	F_NPRIV                       = 0x10
-	F_PRIV                        = 0xf
-	F_QUOTACTL                    = 0x11
-	F_RDACC                       = 0x1
-	F_RDDNY                       = 0x1
-	F_RDLCK                       = 0x1
-	F_REVOKE                      = 0x19
-	F_RMACC                       = 0x4
-	F_RMDNY                       = 0x4
-	F_RWACC                       = 0x3
-	F_RWDNY                       = 0x3
-	F_SETFD                       = 0x2
-	F_SETFL                       = 0x4
-	F_SETLK                       = 0x6
-	F_SETLK64                     = 0x6
-	F_SETLK64_NBMAND              = 0x2a
-	F_SETLKW                      = 0x7
-	F_SETLKW64                    = 0x7
-	F_SETLK_NBMAND                = 0x2a
-	F_SETOWN                      = 0x18
-	F_SHARE                       = 0x28
-	F_SHARE_NBMAND                = 0x2b
-	F_UNLCK                       = 0x3
-	F_UNLKSYS                     = 0x4
-	F_UNSHARE                     = 0x29
-	F_WRACC                       = 0x2
-	F_WRDNY                       = 0x2
-	F_WRLCK                       = 0x2
-	HUPCL                         = 0x400
-	ICANON                        = 0x2
-	ICRNL                         = 0x100
-	IEXTEN                        = 0x8000
-	IFF_ADDRCONF                  = 0x80000
-	IFF_ALLMULTI                  = 0x200
-	IFF_ANYCAST                   = 0x400000
-	IFF_BROADCAST                 = 0x2
-	IFF_CANTCHANGE                = 0x7f203003b5a
-	IFF_COS_ENABLED               = 0x200000000
-	IFF_DEBUG                     = 0x4
-	IFF_DEPRECATED                = 0x40000
-	IFF_DHCPRUNNING               = 0x4000
-	IFF_DUPLICATE                 = 0x4000000000
-	IFF_FAILED                    = 0x10000000
-	IFF_FIXEDMTU                  = 0x1000000000
-	IFF_INACTIVE                  = 0x40000000
-	IFF_INTELLIGENT               = 0x400
-	IFF_IPMP                      = 0x8000000000
-	IFF_IPMP_CANTCHANGE           = 0x10000000
-	IFF_IPMP_INVALID              = 0x1ec200080
-	IFF_IPV4                      = 0x1000000
-	IFF_IPV6                      = 0x2000000
-	IFF_L3PROTECT                 = 0x40000000000
-	IFF_LOOPBACK                  = 0x8
-	IFF_MULTICAST                 = 0x800
-	IFF_MULTI_BCAST               = 0x1000
-	IFF_NOACCEPT                  = 0x4000000
-	IFF_NOARP                     = 0x80
-	IFF_NOFAILOVER                = 0x8000000
-	IFF_NOLINKLOCAL               = 0x20000000000
-	IFF_NOLOCAL                   = 0x20000
-	IFF_NONUD                     = 0x200000
-	IFF_NORTEXCH                  = 0x800000
-	IFF_NOTRAILERS                = 0x20
-	IFF_NOXMIT                    = 0x10000
-	IFF_OFFLINE                   = 0x80000000
-	IFF_POINTOPOINT               = 0x10
-	IFF_PREFERRED                 = 0x400000000
-	IFF_PRIVATE                   = 0x8000
-	IFF_PROMISC                   = 0x100
-	IFF_ROUTER                    = 0x100000
-	IFF_RUNNING                   = 0x40
-	IFF_STANDBY                   = 0x20000000
-	IFF_TEMPORARY                 = 0x800000000
-	IFF_UNNUMBERED                = 0x2000
-	IFF_UP                        = 0x1
-	IFF_VIRTUAL                   = 0x2000000000
-	IFF_VRRP                      = 0x10000000000
-	IFF_XRESOLV                   = 0x100000000
-	IFNAMSIZ                      = 0x10
-	IFT_1822                      = 0x2
-	IFT_6TO4                      = 0xca
-	IFT_AAL5                      = 0x31
-	IFT_ARCNET                    = 0x23
-	IFT_ARCNETPLUS                = 0x24
-	IFT_ATM                       = 0x25
-	IFT_CEPT                      = 0x13
-	IFT_DS3                       = 0x1e
-	IFT_EON                       = 0x19
-	IFT_ETHER                     = 0x6
-	IFT_FDDI                      = 0xf
-	IFT_FRELAY                    = 0x20
-	IFT_FRELAYDCE                 = 0x2c
-	IFT_HDH1822                   = 0x3
-	IFT_HIPPI                     = 0x2f
-	IFT_HSSI                      = 0x2e
-	IFT_HY                        = 0xe
-	IFT_IB                        = 0xc7
-	IFT_IPV4                      = 0xc8
-	IFT_IPV6                      = 0xc9
-	IFT_ISDNBASIC                 = 0x14
-	IFT_ISDNPRIMARY               = 0x15
-	IFT_ISO88022LLC               = 0x29
-	IFT_ISO88023                  = 0x7
-	IFT_ISO88024                  = 0x8
-	IFT_ISO88025                  = 0x9
-	IFT_ISO88026                  = 0xa
-	IFT_LAPB                      = 0x10
-	IFT_LOCALTALK                 = 0x2a
-	IFT_LOOP                      = 0x18
-	IFT_MIOX25                    = 0x26
-	IFT_MODEM                     = 0x30
-	IFT_NSIP                      = 0x1b
-	IFT_OTHER                     = 0x1
-	IFT_P10                       = 0xc
-	IFT_P80                       = 0xd
-	IFT_PARA                      = 0x22
-	IFT_PPP                       = 0x17
-	IFT_PROPMUX                   = 0x36
-	IFT_PROPVIRTUAL               = 0x35
-	IFT_PTPSERIAL                 = 0x16
-	IFT_RS232                     = 0x21
-	IFT_SDLC                      = 0x11
-	IFT_SIP                       = 0x1f
-	IFT_SLIP                      = 0x1c
-	IFT_SMDSDXI                   = 0x2b
-	IFT_SMDSICIP                  = 0x34
-	IFT_SONET                     = 0x27
-	IFT_SONETPATH                 = 0x32
-	IFT_SONETVT                   = 0x33
-	IFT_STARLAN                   = 0xb
-	IFT_T1                        = 0x12
-	IFT_ULTRA                     = 0x1d
-	IFT_V35                       = 0x2d
-	IFT_X25                       = 0x5
-	IFT_X25DDN                    = 0x4
-	IFT_X25PLE                    = 0x28
-	IFT_XETHER                    = 0x1a
-	IGNBRK                        = 0x1
-	IGNCR                         = 0x80
-	IGNPAR                        = 0x4
-	IMAXBEL                       = 0x2000
-	INLCR                         = 0x40
-	INPCK                         = 0x10
-	IN_AUTOCONF_MASK              = 0xffff0000
-	IN_AUTOCONF_NET               = 0xa9fe0000
-	IN_CLASSA_HOST                = 0xffffff
-	IN_CLASSA_MAX                 = 0x80
-	IN_CLASSA_NET                 = 0xff000000
-	IN_CLASSA_NSHIFT              = 0x18
-	IN_CLASSB_HOST                = 0xffff
-	IN_CLASSB_MAX                 = 0x10000
-	IN_CLASSB_NET                 = 0xffff0000
-	IN_CLASSB_NSHIFT              = 0x10
-	IN_CLASSC_HOST                = 0xff
-	IN_CLASSC_NET                 = 0xffffff00
-	IN_CLASSC_NSHIFT              = 0x8
-	IN_CLASSD_HOST                = 0xfffffff
-	IN_CLASSD_NET                 = 0xf0000000
-	IN_CLASSD_NSHIFT              = 0x1c
-	IN_CLASSE_NET                 = 0xffffffff
-	IN_LOOPBACKNET                = 0x7f
-	IN_PRIVATE12_MASK             = 0xfff00000
-	IN_PRIVATE12_NET              = 0xac100000
-	IN_PRIVATE16_MASK             = 0xffff0000
-	IN_PRIVATE16_NET              = 0xc0a80000
-	IN_PRIVATE8_MASK              = 0xff000000
-	IN_PRIVATE8_NET               = 0xa000000
-	IPPROTO_AH                    = 0x33
-	IPPROTO_DSTOPTS               = 0x3c
-	IPPROTO_EGP                   = 0x8
-	IPPROTO_ENCAP                 = 0x4
-	IPPROTO_EON                   = 0x50
-	IPPROTO_ESP                   = 0x32
-	IPPROTO_FRAGMENT              = 0x2c
-	IPPROTO_GGP                   = 0x3
-	IPPROTO_HELLO                 = 0x3f
-	IPPROTO_HOPOPTS               = 0x0
-	IPPROTO_ICMP                  = 0x1
-	IPPROTO_ICMPV6                = 0x3a
-	IPPROTO_IDP                   = 0x16
-	IPPROTO_IGMP                  = 0x2
-	IPPROTO_IP                    = 0x0
-	IPPROTO_IPV6                  = 0x29
-	IPPROTO_MAX                   = 0x100
-	IPPROTO_ND                    = 0x4d
-	IPPROTO_NONE                  = 0x3b
-	IPPROTO_OSPF                  = 0x59
-	IPPROTO_PIM                   = 0x67
-	IPPROTO_PUP                   = 0xc
-	IPPROTO_RAW                   = 0xff
-	IPPROTO_ROUTING               = 0x2b
-	IPPROTO_RSVP                  = 0x2e
-	IPPROTO_SCTP                  = 0x84
-	IPPROTO_TCP                   = 0x6
-	IPPROTO_UDP                   = 0x11
-	IPV6_ADD_MEMBERSHIP           = 0x9
-	IPV6_BOUND_IF                 = 0x41
-	IPV6_CHECKSUM                 = 0x18
-	IPV6_DONTFRAG                 = 0x21
-	IPV6_DROP_MEMBERSHIP          = 0xa
-	IPV6_DSTOPTS                  = 0xf
-	IPV6_FLOWINFO_FLOWLABEL       = 0xffff0f00
-	IPV6_FLOWINFO_TCLASS          = 0xf00f
-	IPV6_HOPLIMIT                 = 0xc
-	IPV6_HOPOPTS                  = 0xe
-	IPV6_JOIN_GROUP               = 0x9
-	IPV6_LEAVE_GROUP              = 0xa
-	IPV6_MULTICAST_HOPS           = 0x7
-	IPV6_MULTICAST_IF             = 0x6
-	IPV6_MULTICAST_LOOP           = 0x8
-	IPV6_NEXTHOP                  = 0xd
-	IPV6_PAD1_OPT                 = 0x0
-	IPV6_PATHMTU                  = 0x25
-	IPV6_PKTINFO                  = 0xb
-	IPV6_PREFER_SRC_CGA           = 0x20
-	IPV6_PREFER_SRC_CGADEFAULT    = 0x10
-	IPV6_PREFER_SRC_CGAMASK       = 0x30
-	IPV6_PREFER_SRC_COA           = 0x2
-	IPV6_PREFER_SRC_DEFAULT       = 0x15
-	IPV6_PREFER_SRC_HOME          = 0x1
-	IPV6_PREFER_SRC_MASK          = 0x3f
-	IPV6_PREFER_SRC_MIPDEFAULT    = 0x1
-	IPV6_PREFER_SRC_MIPMASK       = 0x3
-	IPV6_PREFER_SRC_NONCGA        = 0x10
-	IPV6_PREFER_SRC_PUBLIC        = 0x4
-	IPV6_PREFER_SRC_TMP           = 0x8
-	IPV6_PREFER_SRC_TMPDEFAULT    = 0x4
-	IPV6_PREFER_SRC_TMPMASK       = 0xc
-	IPV6_RECVDSTOPTS              = 0x28
-	IPV6_RECVHOPLIMIT             = 0x13
-	IPV6_RECVHOPOPTS              = 0x14
-	IPV6_RECVPATHMTU              = 0x24
-	IPV6_RECVPKTINFO              = 0x12
-	IPV6_RECVRTHDR                = 0x16
-	IPV6_RECVRTHDRDSTOPTS         = 0x17
-	IPV6_RECVTCLASS               = 0x19
-	IPV6_RTHDR                    = 0x10
-	IPV6_RTHDRDSTOPTS             = 0x11
-	IPV6_RTHDR_TYPE_0             = 0x0
-	IPV6_SEC_OPT                  = 0x22
-	IPV6_SRC_PREFERENCES          = 0x23
-	IPV6_TCLASS                   = 0x26
-	IPV6_UNICAST_HOPS             = 0x5
-	IPV6_UNSPEC_SRC               = 0x42
-	IPV6_USE_MIN_MTU              = 0x20
-	IPV6_V6ONLY                   = 0x27
-	IP_ADD_MEMBERSHIP             = 0x13
-	IP_ADD_SOURCE_MEMBERSHIP      = 0x17
-	IP_BLOCK_SOURCE               = 0x15
-	IP_BOUND_IF                   = 0x41
-	IP_BROADCAST                  = 0x106
-	IP_BROADCAST_TTL              = 0x43
-	IP_DEFAULT_MULTICAST_LOOP     = 0x1
-	IP_DEFAULT_MULTICAST_TTL      = 0x1
-	IP_DF                         = 0x4000
-	IP_DHCPINIT_IF                = 0x45
-	IP_DONTFRAG                   = 0x1b
-	IP_DONTROUTE                  = 0x105
-	IP_DROP_MEMBERSHIP            = 0x14
-	IP_DROP_SOURCE_MEMBERSHIP     = 0x18
-	IP_HDRINCL                    = 0x2
-	IP_MAXPACKET                  = 0xffff
-	IP_MF                         = 0x2000
-	IP_MSS                        = 0x240
-	IP_MULTICAST_IF               = 0x10
-	IP_MULTICAST_LOOP             = 0x12
-	IP_MULTICAST_TTL              = 0x11
-	IP_NEXTHOP                    = 0x19
-	IP_OPTIONS                    = 0x1
-	IP_PKTINFO                    = 0x1a
-	IP_RECVDSTADDR                = 0x7
-	IP_RECVIF                     = 0x9
-	IP_RECVOPTS                   = 0x5
-	IP_RECVPKTINFO                = 0x1a
-	IP_RECVRETOPTS                = 0x6
-	IP_RECVSLLA                   = 0xa
-	IP_RECVTTL                    = 0xb
-	IP_RETOPTS                    = 0x8
-	IP_REUSEADDR                  = 0x104
-	IP_SEC_OPT                    = 0x22
-	IP_TOS                        = 0x3
-	IP_TTL                        = 0x4
-	IP_UNBLOCK_SOURCE             = 0x16
-	IP_UNSPEC_SRC                 = 0x42
-	ISIG                          = 0x1
-	ISTRIP                        = 0x20
-	IXANY                         = 0x800
-	IXOFF                         = 0x1000
-	IXON                          = 0x400
-	MADV_ACCESS_DEFAULT           = 0x6
-	MADV_ACCESS_LWP               = 0x7
-	MADV_ACCESS_MANY              = 0x8
-	MADV_DONTNEED                 = 0x4
-	MADV_FREE                     = 0x5
-	MADV_NORMAL                   = 0x0
-	MADV_RANDOM                   = 0x1
-	MADV_SEQUENTIAL               = 0x2
-	MADV_WILLNEED                 = 0x3
-	MAP_32BIT                     = 0x80
-	MAP_ALIGN                     = 0x200
-	MAP_ANON                      = 0x100
-	MAP_ANONYMOUS                 = 0x100
-	MAP_FIXED                     = 0x10
-	MAP_INITDATA                  = 0x800
-	MAP_NORESERVE                 = 0x40
-	MAP_PRIVATE                   = 0x2
-	MAP_RENAME                    = 0x20
-	MAP_SHARED                    = 0x1
-	MAP_TEXT                      = 0x400
-	MAP_TYPE                      = 0xf
-	MCL_CURRENT                   = 0x1
-	MCL_FUTURE                    = 0x2
-	MSG_CTRUNC                    = 0x10
-	MSG_DONTROUTE                 = 0x4
-	MSG_DONTWAIT                  = 0x80
-	MSG_DUPCTRL                   = 0x800
-	MSG_EOR                       = 0x8
-	MSG_MAXIOVLEN                 = 0x10
-	MSG_NOTIFICATION              = 0x100
-	MSG_OOB                       = 0x1
-	MSG_PEEK                      = 0x2
-	MSG_TRUNC                     = 0x20
-	MSG_WAITALL                   = 0x40
-	MSG_XPG4_2                    = 0x8000
-	MS_ASYNC                      = 0x1
-	MS_INVALIDATE                 = 0x2
-	MS_OLDSYNC                    = 0x0
-	MS_SYNC                       = 0x4
-	M_FLUSH                       = 0x86
-	NOFLSH                        = 0x80
-	OCRNL                         = 0x8
-	OFDEL                         = 0x80
-	OFILL                         = 0x40
-	ONLCR                         = 0x4
-	ONLRET                        = 0x20
-	ONOCR                         = 0x10
-	OPENFAIL                      = -0x1
-	OPOST                         = 0x1
-	O_ACCMODE                     = 0x600003
-	O_APPEND                      = 0x8
-	O_CLOEXEC                     = 0x800000
-	O_CREAT                       = 0x100
-	O_DSYNC                       = 0x40
-	O_EXCL                        = 0x400
-	O_EXEC                        = 0x400000
-	O_LARGEFILE                   = 0x2000
-	O_NDELAY                      = 0x4
-	O_NOCTTY                      = 0x800
-	O_NOFOLLOW                    = 0x20000
-	O_NOLINKS                     = 0x40000
-	O_NONBLOCK                    = 0x80
-	O_RDONLY                      = 0x0
-	O_RDWR                        = 0x2
-	O_RSYNC                       = 0x8000
-	O_SEARCH                      = 0x200000
-	O_SIOCGIFCONF                 = -0x3ff796ec
-	O_SIOCGLIFCONF                = -0x3fef9688
-	O_SYNC                        = 0x10
-	O_TRUNC                       = 0x200
-	O_WRONLY                      = 0x1
-	O_XATTR                       = 0x4000
-	PARENB                        = 0x100
-	PAREXT                        = 0x100000
-	PARMRK                        = 0x8
-	PARODD                        = 0x200
-	PENDIN                        = 0x4000
-	PRIO_PGRP                     = 0x1
-	PRIO_PROCESS                  = 0x0
-	PRIO_USER                     = 0x2
-	PROT_EXEC                     = 0x4
-	PROT_NONE                     = 0x0
-	PROT_READ                     = 0x1
-	PROT_WRITE                    = 0x2
-	RLIMIT_AS                     = 0x6
-	RLIMIT_CORE                   = 0x4
-	RLIMIT_CPU                    = 0x0
-	RLIMIT_DATA                   = 0x2
-	RLIMIT_FSIZE                  = 0x1
-	RLIMIT_NOFILE                 = 0x5
-	RLIMIT_STACK                  = 0x3
-	RLIM_INFINITY                 = -0x3
-	RTAX_AUTHOR                   = 0x6
-	RTAX_BRD                      = 0x7
-	RTAX_DST                      = 0x0
-	RTAX_GATEWAY                  = 0x1
-	RTAX_GENMASK                  = 0x3
-	RTAX_IFA                      = 0x5
-	RTAX_IFP                      = 0x4
-	RTAX_MAX                      = 0x9
-	RTAX_NETMASK                  = 0x2
-	RTAX_SRC                      = 0x8
-	RTA_AUTHOR                    = 0x40
-	RTA_BRD                       = 0x80
-	RTA_DST                       = 0x1
-	RTA_GATEWAY                   = 0x2
-	RTA_GENMASK                   = 0x8
-	RTA_IFA                       = 0x20
-	RTA_IFP                       = 0x10
-	RTA_NETMASK                   = 0x4
-	RTA_NUMBITS                   = 0x9
-	RTA_SRC                       = 0x100
-	RTF_BLACKHOLE                 = 0x1000
-	RTF_CLONING                   = 0x100
-	RTF_DONE                      = 0x40
-	RTF_DYNAMIC                   = 0x10
-	RTF_GATEWAY                   = 0x2
-	RTF_HOST                      = 0x4
-	RTF_INDIRECT                  = 0x40000
-	RTF_KERNEL                    = 0x80000
-	RTF_LLINFO                    = 0x400
-	RTF_MASK                      = 0x80
-	RTF_MODIFIED                  = 0x20
-	RTF_MULTIRT                   = 0x10000
-	RTF_PRIVATE                   = 0x2000
-	RTF_PROTO1                    = 0x8000
-	RTF_PROTO2                    = 0x4000
-	RTF_REJECT                    = 0x8
-	RTF_SETSRC                    = 0x20000
-	RTF_STATIC                    = 0x800
-	RTF_UP                        = 0x1
-	RTF_XRESOLVE                  = 0x200
-	RTF_ZONE                      = 0x100000
-	RTM_ADD                       = 0x1
-	RTM_CHANGE                    = 0x3
-	RTM_CHGADDR                   = 0xf
-	RTM_DELADDR                   = 0xd
-	RTM_DELETE                    = 0x2
-	RTM_FREEADDR                  = 0x10
-	RTM_GET                       = 0x4
-	RTM_IFINFO                    = 0xe
-	RTM_LOCK                      = 0x8
-	RTM_LOSING                    = 0x5
-	RTM_MISS                      = 0x7
-	RTM_NEWADDR                   = 0xc
-	RTM_OLDADD                    = 0x9
-	RTM_OLDDEL                    = 0xa
-	RTM_REDIRECT                  = 0x6
-	RTM_RESOLVE                   = 0xb
-	RTM_VERSION                   = 0x3
-	RTV_EXPIRE                    = 0x4
-	RTV_HOPCOUNT                  = 0x2
-	RTV_MTU                       = 0x1
-	RTV_RPIPE                     = 0x8
-	RTV_RTT                       = 0x40
-	RTV_RTTVAR                    = 0x80
-	RTV_SPIPE                     = 0x10
-	RTV_SSTHRESH                  = 0x20
-	RT_AWARE                      = 0x1
-	RUSAGE_CHILDREN               = -0x1
-	RUSAGE_SELF                   = 0x0
-	SCM_RIGHTS                    = 0x1010
-	SCM_TIMESTAMP                 = 0x1013
-	SCM_UCRED                     = 0x1012
-	SHUT_RD                       = 0x0
-	SHUT_RDWR                     = 0x2
-	SHUT_WR                       = 0x1
-	SIG2STR_MAX                   = 0x20
-	SIOCADDMULTI                  = -0x7fdf96cf
-	SIOCADDRT                     = -0x7fcf8df6
-	SIOCATMARK                    = 0x40047307
-	SIOCDARP                      = -0x7fdb96e0
-	SIOCDELMULTI                  = -0x7fdf96ce
-	SIOCDELRT                     = -0x7fcf8df5
-	SIOCDXARP                     = -0x7fff9658
-	SIOCGARP                      = -0x3fdb96e1
-	SIOCGDSTINFO                  = -0x3fff965c
-	SIOCGENADDR                   = -0x3fdf96ab
-	SIOCGENPSTATS                 = -0x3fdf96c7
-	SIOCGETLSGCNT                 = -0x3fef8deb
-	SIOCGETNAME                   = 0x40107334
-	SIOCGETPEER                   = 0x40107335
-	SIOCGETPROP                   = -0x3fff8f44
-	SIOCGETSGCNT                  = -0x3feb8deb
-	SIOCGETSYNC                   = -0x3fdf96d3
-	SIOCGETVIFCNT                 = -0x3feb8dec
-	SIOCGHIWAT                    = 0x40047301
-	SIOCGIFADDR                   = -0x3fdf96f3
-	SIOCGIFBRDADDR                = -0x3fdf96e9
-	SIOCGIFCONF                   = -0x3ff796a4
-	SIOCGIFDSTADDR                = -0x3fdf96f1
-	SIOCGIFFLAGS                  = -0x3fdf96ef
-	SIOCGIFHWADDR                 = -0x3fdf9647
-	SIOCGIFINDEX                  = -0x3fdf96a6
-	SIOCGIFMEM                    = -0x3fdf96ed
-	SIOCGIFMETRIC                 = -0x3fdf96e5
-	SIOCGIFMTU                    = -0x3fdf96ea
-	SIOCGIFMUXID                  = -0x3fdf96a8
-	SIOCGIFNETMASK                = -0x3fdf96e7
-	SIOCGIFNUM                    = 0x40046957
-	SIOCGIP6ADDRPOLICY            = -0x3fff965e
-	SIOCGIPMSFILTER               = -0x3ffb964c
-	SIOCGLIFADDR                  = -0x3f87968f
-	SIOCGLIFBINDING               = -0x3f879666
-	SIOCGLIFBRDADDR               = -0x3f879685
-	SIOCGLIFCONF                  = -0x3fef965b
-	SIOCGLIFDADSTATE              = -0x3f879642
-	SIOCGLIFDSTADDR               = -0x3f87968d
-	SIOCGLIFFLAGS                 = -0x3f87968b
-	SIOCGLIFGROUPINFO             = -0x3f4b9663
-	SIOCGLIFGROUPNAME             = -0x3f879664
-	SIOCGLIFHWADDR                = -0x3f879640
-	SIOCGLIFINDEX                 = -0x3f87967b
-	SIOCGLIFLNKINFO               = -0x3f879674
-	SIOCGLIFMETRIC                = -0x3f879681
-	SIOCGLIFMTU                   = -0x3f879686
-	SIOCGLIFMUXID                 = -0x3f87967d
-	SIOCGLIFNETMASK               = -0x3f879683
-	SIOCGLIFNUM                   = -0x3ff3967e
-	SIOCGLIFSRCOF                 = -0x3fef964f
-	SIOCGLIFSUBNET                = -0x3f879676
-	SIOCGLIFTOKEN                 = -0x3f879678
-	SIOCGLIFUSESRC                = -0x3f879651
-	SIOCGLIFZONE                  = -0x3f879656
-	SIOCGLOWAT                    = 0x40047303
-	SIOCGMSFILTER                 = -0x3ffb964e
-	SIOCGPGRP                     = 0x40047309
-	SIOCGSTAMP                    = -0x3fef9646
-	SIOCGXARP                     = -0x3fff9659
-	SIOCIFDETACH                  = -0x7fdf96c8
-	SIOCILB                       = -0x3ffb9645
-	SIOCLIFADDIF                  = -0x3f879691
-	SIOCLIFDELND                  = -0x7f879673
-	SIOCLIFGETND                  = -0x3f879672
-	SIOCLIFREMOVEIF               = -0x7f879692
-	SIOCLIFSETND                  = -0x7f879671
-	SIOCLOWER                     = -0x7fdf96d7
-	SIOCSARP                      = -0x7fdb96e2
-	SIOCSCTPGOPT                  = -0x3fef9653
-	SIOCSCTPPEELOFF               = -0x3ffb9652
-	SIOCSCTPSOPT                  = -0x7fef9654
-	SIOCSENABLESDP                = -0x3ffb9649
-	SIOCSETPROP                   = -0x7ffb8f43
-	SIOCSETSYNC                   = -0x7fdf96d4
-	SIOCSHIWAT                    = -0x7ffb8d00
-	SIOCSIFADDR                   = -0x7fdf96f4
-	SIOCSIFBRDADDR                = -0x7fdf96e8
-	SIOCSIFDSTADDR                = -0x7fdf96f2
-	SIOCSIFFLAGS                  = -0x7fdf96f0
-	SIOCSIFINDEX                  = -0x7fdf96a5
-	SIOCSIFMEM                    = -0x7fdf96ee
-	SIOCSIFMETRIC                 = -0x7fdf96e4
-	SIOCSIFMTU                    = -0x7fdf96eb
-	SIOCSIFMUXID                  = -0x7fdf96a7
-	SIOCSIFNAME                   = -0x7fdf96b7
-	SIOCSIFNETMASK                = -0x7fdf96e6
-	SIOCSIP6ADDRPOLICY            = -0x7fff965d
-	SIOCSIPMSFILTER               = -0x7ffb964b
-	SIOCSLGETREQ                  = -0x3fdf96b9
-	SIOCSLIFADDR                  = -0x7f879690
-	SIOCSLIFBRDADDR               = -0x7f879684
-	SIOCSLIFDSTADDR               = -0x7f87968e
-	SIOCSLIFFLAGS                 = -0x7f87968c
-	SIOCSLIFGROUPNAME             = -0x7f879665
-	SIOCSLIFINDEX                 = -0x7f87967a
-	SIOCSLIFLNKINFO               = -0x7f879675
-	SIOCSLIFMETRIC                = -0x7f879680
-	SIOCSLIFMTU                   = -0x7f879687
-	SIOCSLIFMUXID                 = -0x7f87967c
-	SIOCSLIFNAME                  = -0x3f87967f
-	SIOCSLIFNETMASK               = -0x7f879682
-	SIOCSLIFPREFIX                = -0x3f879641
-	SIOCSLIFSUBNET                = -0x7f879677
-	SIOCSLIFTOKEN                 = -0x7f879679
-	SIOCSLIFUSESRC                = -0x7f879650
-	SIOCSLIFZONE                  = -0x7f879655
-	SIOCSLOWAT                    = -0x7ffb8cfe
-	SIOCSLSTAT                    = -0x7fdf96b8
-	SIOCSMSFILTER                 = -0x7ffb964d
-	SIOCSPGRP                     = -0x7ffb8cf8
-	SIOCSPROMISC                  = -0x7ffb96d0
-	SIOCSQPTR                     = -0x3ffb9648
-	SIOCSSDSTATS                  = -0x3fdf96d2
-	SIOCSSESTATS                  = -0x3fdf96d1
-	SIOCSXARP                     = -0x7fff965a
-	SIOCTMYADDR                   = -0x3ff79670
-	SIOCTMYSITE                   = -0x3ff7966e
-	SIOCTONLINK                   = -0x3ff7966f
-	SIOCUPPER                     = -0x7fdf96d8
-	SIOCX25RCV                    = -0x3fdf96c4
-	SIOCX25TBL                    = -0x3fdf96c3
-	SIOCX25XMT                    = -0x3fdf96c5
-	SIOCXPROTO                    = 0x20007337
-	SOCK_CLOEXEC                  = 0x80000
-	SOCK_DGRAM                    = 0x1
-	SOCK_NDELAY                   = 0x200000
-	SOCK_NONBLOCK                 = 0x100000
-	SOCK_RAW                      = 0x4
-	SOCK_RDM                      = 0x5
-	SOCK_SEQPACKET                = 0x6
-	SOCK_STREAM                   = 0x2
-	SOCK_TYPE_MASK                = 0xffff
-	SOL_FILTER                    = 0xfffc
-	SOL_PACKET                    = 0xfffd
-	SOL_ROUTE                     = 0xfffe
-	SOL_SOCKET                    = 0xffff
-	SOMAXCONN                     = 0x80
-	SO_ACCEPTCONN                 = 0x2
-	SO_ALL                        = 0x3f
-	SO_ALLZONES                   = 0x1014
-	SO_ANON_MLP                   = 0x100a
-	SO_ATTACH_FILTER              = 0x40000001
-	SO_BAND                       = 0x4000
-	SO_BROADCAST                  = 0x20
-	SO_COPYOPT                    = 0x80000
-	SO_DEBUG                      = 0x1
-	SO_DELIM                      = 0x8000
-	SO_DETACH_FILTER              = 0x40000002
-	SO_DGRAM_ERRIND               = 0x200
-	SO_DOMAIN                     = 0x100c
-	SO_DONTLINGER                 = -0x81
-	SO_DONTROUTE                  = 0x10
-	SO_ERROPT                     = 0x40000
-	SO_ERROR                      = 0x1007
-	SO_EXCLBIND                   = 0x1015
-	SO_HIWAT                      = 0x10
-	SO_ISNTTY                     = 0x800
-	SO_ISTTY                      = 0x400
-	SO_KEEPALIVE                  = 0x8
-	SO_LINGER                     = 0x80
-	SO_LOWAT                      = 0x20
-	SO_MAC_EXEMPT                 = 0x100b
-	SO_MAC_IMPLICIT               = 0x1016
-	SO_MAXBLK                     = 0x100000
-	SO_MAXPSZ                     = 0x8
-	SO_MINPSZ                     = 0x4
-	SO_MREADOFF                   = 0x80
-	SO_MREADON                    = 0x40
-	SO_NDELOFF                    = 0x200
-	SO_NDELON                     = 0x100
-	SO_NODELIM                    = 0x10000
-	SO_OOBINLINE                  = 0x100
-	SO_PROTOTYPE                  = 0x1009
-	SO_RCVBUF                     = 0x1002
-	SO_RCVLOWAT                   = 0x1004
-	SO_RCVPSH                     = 0x100d
-	SO_RCVTIMEO                   = 0x1006
-	SO_READOPT                    = 0x1
-	SO_RECVUCRED                  = 0x400
-	SO_REUSEADDR                  = 0x4
-	SO_SECATTR                    = 0x1011
-	SO_SNDBUF                     = 0x1001
-	SO_SNDLOWAT                   = 0x1003
-	SO_SNDTIMEO                   = 0x1005
-	SO_STRHOLD                    = 0x20000
-	SO_TAIL                       = 0x200000
-	SO_TIMESTAMP                  = 0x1013
-	SO_TONSTOP                    = 0x2000
-	SO_TOSTOP                     = 0x1000
-	SO_TYPE                       = 0x1008
-	SO_USELOOPBACK                = 0x40
-	SO_VRRP                       = 0x1017
-	SO_WROFF                      = 0x2
-	TCFLSH                        = 0x5407
-	TCGETA                        = 0x5401
-	TCGETS                        = 0x540d
-	TCIFLUSH                      = 0x0
-	TCIOFLUSH                     = 0x2
-	TCOFLUSH                      = 0x1
-	TCP_ABORT_THRESHOLD           = 0x11
-	TCP_ANONPRIVBIND              = 0x20
-	TCP_CONN_ABORT_THRESHOLD      = 0x13
-	TCP_CONN_NOTIFY_THRESHOLD     = 0x12
-	TCP_CORK                      = 0x18
-	TCP_EXCLBIND                  = 0x21
-	TCP_INIT_CWND                 = 0x15
-	TCP_KEEPALIVE                 = 0x8
-	TCP_KEEPALIVE_ABORT_THRESHOLD = 0x17
-	TCP_KEEPALIVE_THRESHOLD       = 0x16
-	TCP_KEEPCNT                   = 0x23
-	TCP_KEEPIDLE                  = 0x22
-	TCP_KEEPINTVL                 = 0x24
-	TCP_LINGER2                   = 0x1c
-	TCP_MAXSEG                    = 0x2
-	TCP_MSS                       = 0x218
-	TCP_NODELAY                   = 0x1
-	TCP_NOTIFY_THRESHOLD          = 0x10
-	TCP_RECVDSTADDR               = 0x14
-	TCP_RTO_INITIAL               = 0x19
-	TCP_RTO_MAX                   = 0x1b
-	TCP_RTO_MIN                   = 0x1a
-	TCSAFLUSH                     = 0x5410
-	TCSBRK                        = 0x5405
-	TCSETA                        = 0x5402
-	TCSETAF                       = 0x5404
-	TCSETAW                       = 0x5403
-	TCSETS                        = 0x540e
-	TCSETSF                       = 0x5410
-	TCSETSW                       = 0x540f
-	TCXONC                        = 0x5406
-	TIOC                          = 0x5400
-	TIOCCBRK                      = 0x747a
-	TIOCCDTR                      = 0x7478
-	TIOCCILOOP                    = 0x746c
-	TIOCEXCL                      = 0x740d
-	TIOCFLUSH                     = 0x7410
-	TIOCGETC                      = 0x7412
-	TIOCGETD                      = 0x7400
-	TIOCGETP                      = 0x7408
-	TIOCGLTC                      = 0x7474
-	TIOCGPGRP                     = 0x7414
-	TIOCGPPS                      = 0x547d
-	TIOCGPPSEV                    = 0x547f
-	TIOCGSID                      = 0x7416
-	TIOCGSOFTCAR                  = 0x5469
-	TIOCGWINSZ                    = 0x5468
-	TIOCHPCL                      = 0x7402
-	TIOCKBOF                      = 0x5409
-	TIOCKBON                      = 0x5408
-	TIOCLBIC                      = 0x747e
-	TIOCLBIS                      = 0x747f
-	TIOCLGET                      = 0x747c
-	TIOCLSET                      = 0x747d
-	TIOCMBIC                      = 0x741c
-	TIOCMBIS                      = 0x741b
-	TIOCMGET                      = 0x741d
-	TIOCMSET                      = 0x741a
-	TIOCM_CAR                     = 0x40
-	TIOCM_CD                      = 0x40
-	TIOCM_CTS                     = 0x20
-	TIOCM_DSR                     = 0x100
-	TIOCM_DTR                     = 0x2
-	TIOCM_LE                      = 0x1
-	TIOCM_RI                      = 0x80
-	TIOCM_RNG                     = 0x80
-	TIOCM_RTS                     = 0x4
-	TIOCM_SR                      = 0x10
-	TIOCM_ST                      = 0x8
-	TIOCNOTTY                     = 0x7471
-	TIOCNXCL                      = 0x740e
-	TIOCOUTQ                      = 0x7473
-	TIOCREMOTE                    = 0x741e
-	TIOCSBRK                      = 0x747b
-	TIOCSCTTY                     = 0x7484
-	TIOCSDTR                      = 0x7479
-	TIOCSETC                      = 0x7411
-	TIOCSETD                      = 0x7401
-	TIOCSETN                      = 0x740a
-	TIOCSETP                      = 0x7409
-	TIOCSIGNAL                    = 0x741f
-	TIOCSILOOP                    = 0x746d
-	TIOCSLTC                      = 0x7475
-	TIOCSPGRP                     = 0x7415
-	TIOCSPPS                      = 0x547e
-	TIOCSSOFTCAR                  = 0x546a
-	TIOCSTART                     = 0x746e
-	TIOCSTI                       = 0x7417
-	TIOCSTOP                      = 0x746f
-	TIOCSWINSZ                    = 0x5467
-	TOSTOP                        = 0x100
-	VCEOF                         = 0x8
-	VCEOL                         = 0x9
-	VDISCARD                      = 0xd
-	VDSUSP                        = 0xb
-	VEOF                          = 0x4
-	VEOL                          = 0x5
-	VEOL2                         = 0x6
-	VERASE                        = 0x2
-	VINTR                         = 0x0
-	VKILL                         = 0x3
-	VLNEXT                        = 0xf
-	VMIN                          = 0x4
-	VQUIT                         = 0x1
-	VREPRINT                      = 0xc
-	VSTART                        = 0x8
-	VSTATUS                       = 0x10
-	VSTOP                         = 0x9
-	VSUSP                         = 0xa
-	VSWTCH                        = 0x7
-	VT0                           = 0x0
-	VT1                           = 0x4000
-	VTDLY                         = 0x4000
-	VTIME                         = 0x5
-	VWERASE                       = 0xe
-	WCONTFLG                      = 0xffff
-	WCONTINUED                    = 0x8
-	WCOREFLG                      = 0x80
-	WEXITED                       = 0x1
-	WNOHANG                       = 0x40
-	WNOWAIT                       = 0x80
-	WOPTMASK                      = 0xcf
-	WRAP                          = 0x20000
-	WSIGMASK                      = 0x7f
-	WSTOPFLG                      = 0x7f
-	WSTOPPED                      = 0x4
-	WTRAPPED                      = 0x2
-	WUNTRACED                     = 0x4
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x7d)
-	EADDRNOTAVAIL   = syscall.Errno(0x7e)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x7c)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x95)
-	EBADE           = syscall.Errno(0x32)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x51)
-	EBADMSG         = syscall.Errno(0x4d)
-	EBADR           = syscall.Errno(0x33)
-	EBADRQC         = syscall.Errno(0x36)
-	EBADSLT         = syscall.Errno(0x37)
-	EBFONT          = syscall.Errno(0x39)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x2f)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x25)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x82)
-	ECONNREFUSED    = syscall.Errno(0x92)
-	ECONNRESET      = syscall.Errno(0x83)
-	EDEADLK         = syscall.Errno(0x2d)
-	EDEADLOCK       = syscall.Errno(0x38)
-	EDESTADDRREQ    = syscall.Errno(0x60)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x31)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x93)
-	EHOSTUNREACH    = syscall.Errno(0x94)
-	EIDRM           = syscall.Errno(0x24)
-	EILSEQ          = syscall.Errno(0x58)
-	EINPROGRESS     = syscall.Errno(0x96)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x85)
-	EISDIR          = syscall.Errno(0x15)
-	EL2HLT          = syscall.Errno(0x2c)
-	EL2NSYNC        = syscall.Errno(0x26)
-	EL3HLT          = syscall.Errno(0x27)
-	EL3RST          = syscall.Errno(0x28)
-	ELIBACC         = syscall.Errno(0x53)
-	ELIBBAD         = syscall.Errno(0x54)
-	ELIBEXEC        = syscall.Errno(0x57)
-	ELIBMAX         = syscall.Errno(0x56)
-	ELIBSCN         = syscall.Errno(0x55)
-	ELNRNG          = syscall.Errno(0x29)
-	ELOCKUNMAPPED   = syscall.Errno(0x48)
-	ELOOP           = syscall.Errno(0x5a)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x61)
-	EMULTIHOP       = syscall.Errno(0x4a)
-	ENAMETOOLONG    = syscall.Errno(0x4e)
-	ENETDOWN        = syscall.Errno(0x7f)
-	ENETRESET       = syscall.Errno(0x81)
-	ENETUNREACH     = syscall.Errno(0x80)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x35)
-	ENOBUFS         = syscall.Errno(0x84)
-	ENOCSI          = syscall.Errno(0x2b)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x2e)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x23)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x63)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x59)
-	ENOTACTIVE      = syscall.Errno(0x49)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x86)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x5d)
-	ENOTRECOVERABLE = syscall.Errno(0x3b)
-	ENOTSOCK        = syscall.Errno(0x5f)
-	ENOTSUP         = syscall.Errno(0x30)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x50)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x7a)
-	EOVERFLOW       = syscall.Errno(0x4f)
-	EOWNERDEAD      = syscall.Errno(0x3a)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x7b)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x78)
-	EPROTOTYPE      = syscall.Errno(0x62)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x52)
-	EREMOTE         = syscall.Errno(0x42)
-	ERESTART        = syscall.Errno(0x5b)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x8f)
-	ESOCKTNOSUPPORT = syscall.Errno(0x79)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x97)
-	ESTRPIPE        = syscall.Errno(0x5c)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x91)
-	ETOOMANYREFS    = syscall.Errno(0x90)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUNATCH         = syscall.Errno(0x2a)
-	EUSERS          = syscall.Errno(0x5e)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x34)
-)
-
-// Signals
-const (
-	SIGABRT    = syscall.Signal(0x6)
-	SIGALRM    = syscall.Signal(0xe)
-	SIGBUS     = syscall.Signal(0xa)
-	SIGCANCEL  = syscall.Signal(0x24)
-	SIGCHLD    = syscall.Signal(0x12)
-	SIGCLD     = syscall.Signal(0x12)
-	SIGCONT    = syscall.Signal(0x19)
-	SIGEMT     = syscall.Signal(0x7)
-	SIGFPE     = syscall.Signal(0x8)
-	SIGFREEZE  = syscall.Signal(0x22)
-	SIGHUP     = syscall.Signal(0x1)
-	SIGILL     = syscall.Signal(0x4)
-	SIGINFO    = syscall.Signal(0x29)
-	SIGINT     = syscall.Signal(0x2)
-	SIGIO      = syscall.Signal(0x16)
-	SIGIOT     = syscall.Signal(0x6)
-	SIGJVM1    = syscall.Signal(0x27)
-	SIGJVM2    = syscall.Signal(0x28)
-	SIGKILL    = syscall.Signal(0x9)
-	SIGLOST    = syscall.Signal(0x25)
-	SIGLWP     = syscall.Signal(0x21)
-	SIGPIPE    = syscall.Signal(0xd)
-	SIGPOLL    = syscall.Signal(0x16)
-	SIGPROF    = syscall.Signal(0x1d)
-	SIGPWR     = syscall.Signal(0x13)
-	SIGQUIT    = syscall.Signal(0x3)
-	SIGSEGV    = syscall.Signal(0xb)
-	SIGSTOP    = syscall.Signal(0x17)
-	SIGSYS     = syscall.Signal(0xc)
-	SIGTERM    = syscall.Signal(0xf)
-	SIGTHAW    = syscall.Signal(0x23)
-	SIGTRAP    = syscall.Signal(0x5)
-	SIGTSTP    = syscall.Signal(0x18)
-	SIGTTIN    = syscall.Signal(0x1a)
-	SIGTTOU    = syscall.Signal(0x1b)
-	SIGURG     = syscall.Signal(0x15)
-	SIGUSR1    = syscall.Signal(0x10)
-	SIGUSR2    = syscall.Signal(0x11)
-	SIGVTALRM  = syscall.Signal(0x1c)
-	SIGWAITING = syscall.Signal(0x20)
-	SIGWINCH   = syscall.Signal(0x14)
-	SIGXCPU    = syscall.Signal(0x1e)
-	SIGXFSZ    = syscall.Signal(0x1f)
-	SIGXRES    = syscall.Signal(0x26)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "not owner",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "I/O error",
-	6:   "no such device or address",
-	7:   "arg list too long",
-	8:   "exec format error",
-	9:   "bad file number",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "not enough space",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "file table overflow",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "argument out of domain",
-	34:  "result too large",
-	35:  "no message of desired type",
-	36:  "identifier removed",
-	37:  "channel number out of range",
-	38:  "level 2 not synchronized",
-	39:  "level 3 halted",
-	40:  "level 3 reset",
-	41:  "link number out of range",
-	42:  "protocol driver not attached",
-	43:  "no CSI structure available",
-	44:  "level 2 halted",
-	45:  "deadlock situation detected/avoided",
-	46:  "no record locks available",
-	47:  "operation canceled",
-	48:  "operation not supported",
-	49:  "disc quota exceeded",
-	50:  "bad exchange descriptor",
-	51:  "bad request descriptor",
-	52:  "message tables full",
-	53:  "anode table overflow",
-	54:  "bad request code",
-	55:  "invalid slot",
-	56:  "file locking deadlock",
-	57:  "bad font file format",
-	58:  "owner of the lock died",
-	59:  "lock is not recoverable",
-	60:  "not a stream device",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of stream resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "locked lock was unmapped ",
-	73:  "facility is not active",
-	74:  "multihop attempted",
-	77:  "not a data message",
-	78:  "file name too long",
-	79:  "value too large for defined data type",
-	80:  "name not unique on network",
-	81:  "file descriptor in bad state",
-	82:  "remote address changed",
-	83:  "can not access a needed shared library",
-	84:  "accessing a corrupted shared library",
-	85:  ".lib section in a.out corrupted",
-	86:  "attempting to link in more shared libraries than system limit",
-	87:  "can not exec a shared library directly",
-	88:  "illegal byte sequence",
-	89:  "operation not applicable",
-	90:  "number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS",
-	91:  "error 91",
-	92:  "error 92",
-	93:  "directory not empty",
-	94:  "too many users",
-	95:  "socket operation on non-socket",
-	96:  "destination address required",
-	97:  "message too long",
-	98:  "protocol wrong type for socket",
-	99:  "option not supported by protocol",
-	120: "protocol not supported",
-	121: "socket type not supported",
-	122: "operation not supported on transport endpoint",
-	123: "protocol family not supported",
-	124: "address family not supported by protocol family",
-	125: "address already in use",
-	126: "cannot assign requested address",
-	127: "network is down",
-	128: "network is unreachable",
-	129: "network dropped connection because of reset",
-	130: "software caused connection abort",
-	131: "connection reset by peer",
-	132: "no buffer space available",
-	133: "transport endpoint is already connected",
-	134: "transport endpoint is not connected",
-	143: "cannot send after socket shutdown",
-	144: "too many references: cannot splice",
-	145: "connection timed out",
-	146: "connection refused",
-	147: "host is down",
-	148: "no route to host",
-	149: "operation already in progress",
-	150: "operation now in progress",
-	151: "stale NFS file handle",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal Instruction",
-	5:  "trace/Breakpoint Trap",
-	6:  "abort",
-	7:  "emulation Trap",
-	8:  "arithmetic Exception",
-	9:  "killed",
-	10: "bus Error",
-	11: "segmentation Fault",
-	12: "bad System Call",
-	13: "broken Pipe",
-	14: "alarm Clock",
-	15: "terminated",
-	16: "user Signal 1",
-	17: "user Signal 2",
-	18: "child Status Changed",
-	19: "power-Fail/Restart",
-	20: "window Size Change",
-	21: "urgent Socket Condition",
-	22: "pollable Event",
-	23: "stopped (signal)",
-	24: "stopped (user)",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual Timer Expired",
-	29: "profiling Timer Expired",
-	30: "cpu Limit Exceeded",
-	31: "file Size Limit Exceeded",
-	32: "no runnable lwp",
-	33: "inter-lwp signal",
-	34: "checkpoint Freeze",
-	35: "checkpoint Thaw",
-	36: "thread Cancellation",
-	37: "resource Lost",
-	38: "resource Control Exceeded",
-	39: "reserved for JVM 1",
-	40: "reserved for JVM 2",
-	41: "information Request",
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go
deleted file mode 100644
index 031034a345..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_386.go
+++ /dev/null
@@ -1,1427 +0,0 @@
-// mksyscall.pl -l32 syscall_bsd.go syscall_darwin.go syscall_darwin_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kill(pid int, signum int, posix int) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exchangedata(path1 string, path2 string, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path1)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(path2)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setprivexec(flag int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func gettimeofday(tp *Timeval) (sec int32, usec int32, err error) {
-	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	sec = int32(r0)
-	usec = int32(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
deleted file mode 100644
index ee96f78bad..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ /dev/null
@@ -1,1443 +0,0 @@
-// mksyscall.pl syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kill(pid int, signum int, posix int) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exchangedata(path1 string, path2 string, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path1)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(path2)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setprivexec(flag int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
-	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	sec = int64(r0)
-	usec = int32(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm.go
deleted file mode 100644
index e52cd0d54c..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm.go
+++ /dev/null
@@ -1,1427 +0,0 @@
-// mksyscall.pl syscall_bsd.go syscall_darwin.go syscall_darwin_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kill(pid int, signum int, posix int) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exchangedata(path1 string, path2 string, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path1)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(path2)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setprivexec(flag int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func gettimeofday(tp *Timeval) (sec int32, usec int32, err error) {
-	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	sec = int32(r0)
-	usec = int32(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
deleted file mode 100644
index 9863ef99e3..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+++ /dev/null
@@ -1,1427 +0,0 @@
-// mksyscall.pl syscall_bsd.go syscall_darwin.go syscall_darwin_arm64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm64,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kill(pid int, signum int, posix int) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exchangedata(path1 string, path2 string, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path1)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(path2)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setprivexec(flag int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
-	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	sec = int64(r0)
-	usec = int32(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
deleted file mode 100644
index 78de48dcf3..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
+++ /dev/null
@@ -1,1413 +0,0 @@
-// mksyscall.pl -dragonfly syscall_bsd.go syscall_dragonfly.go syscall_dragonfly_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,dragonfly
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func extpread(fd int, p []byte, flags int, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EXTPREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EXTPWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go
deleted file mode 100644
index fade994dcf..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_386.go
+++ /dev/null
@@ -1,1665 +0,0 @@
-// mksyscall.pl -l32 syscall_bsd.go syscall_freebsd.go syscall_freebsd_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
deleted file mode 100644
index c28281e83e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
+++ /dev/null
@@ -1,1665 +0,0 @@
-// mksyscall.pl syscall_bsd.go syscall_freebsd.go syscall_freebsd_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
deleted file mode 100644
index a18ba5c88b..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
+++ /dev/null
@@ -1,1665 +0,0 @@
-// mksyscall.pl -l32 -arm syscall_bsd.go syscall_freebsd.go syscall_freebsd_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm,freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	use(unsafe.Pointer(_p0))
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall9(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go
deleted file mode 100644
index 749f3e46e6..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ /dev/null
@@ -1,1638 +0,0 @@
-// mksyscall.pl -l32 syscall_linux.go syscall_linux_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	use(unsafe.Pointer(_p2))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	use(unsafe.Pointer(_p0))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	use(unsafe.Pointer(_p0))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_FADVISE64_64, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE64, uintptr(fd), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
-	tt = Time_t(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go
deleted file mode 100644
index 1096aa5443..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ /dev/null
@@ -1,1832 +0,0 @@
-// mksyscall.pl syscall_linux.go syscall_linux_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	use(unsafe.Pointer(_p2))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	use(unsafe.Pointer(_p0))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	use(unsafe.Pointer(_p0))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go
deleted file mode 100644
index 9066e1cb77..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ /dev/null
@@ -1,1739 +0,0 @@
-// mksyscall.pl -l32 -arm syscall_linux.go syscall_linux_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	use(unsafe.Pointer(_p2))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	use(unsafe.Pointer(_p0))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	use(unsafe.Pointer(_p0))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, flags int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE64, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go
deleted file mode 100644
index 5b91612265..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ /dev/null
@@ -1,1723 +0,0 @@
-// mksyscall.pl syscall_linux.go syscall_linux_arm64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm64,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	use(unsafe.Pointer(_p2))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	use(unsafe.Pointer(_p0))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	use(unsafe.Pointer(_p0))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64.go
deleted file mode 100644
index 738c830914..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ /dev/null
@@ -1,1781 +0,0 @@
-// mksyscall.pl syscall_linux.go syscall_linux_mips64x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build mips64,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	use(unsafe.Pointer(_p2))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	use(unsafe.Pointer(_p0))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	use(unsafe.Pointer(_p0))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fstat(fd int, st *stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func lstat(path string, st *stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func stat(path string, st *stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
deleted file mode 100644
index 2a03578322..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ /dev/null
@@ -1,1781 +0,0 @@
-// mksyscall.pl syscall_linux.go syscall_linux_mips64x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build mips64le,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	use(unsafe.Pointer(_p2))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	use(unsafe.Pointer(_p0))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	use(unsafe.Pointer(_p0))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fstat(fd int, st *stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func lstat(path string, st *stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func stat(path string, st *stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
deleted file mode 100644
index 4bd18dcee6..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ /dev/null
@@ -1,1843 +0,0 @@
-// mksyscall.pl syscall_linux.go syscall_linux_ppc64x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build ppc64,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	use(unsafe.Pointer(_p2))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	use(unsafe.Pointer(_p0))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	use(unsafe.Pointer(_p0))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
-	tt = Time_t(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
deleted file mode 100644
index fbb43516cc..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ /dev/null
@@ -1,1843 +0,0 @@
-// mksyscall.pl syscall_linux.go syscall_linux_ppc64x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build ppc64le,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	use(unsafe.Pointer(_p2))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	use(unsafe.Pointer(_p0))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	use(unsafe.Pointer(_p0))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
-	tt = Time_t(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_s390x.go
deleted file mode 100644
index f8aa91f149..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_linux_s390x.go
+++ /dev/null
@@ -1,1623 +0,0 @@
-// mksyscall.pl syscall_linux.go syscall_linux_s390x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build s390x,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	use(unsafe.Pointer(_p2))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	use(unsafe.Pointer(_p0))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	use(unsafe.Pointer(_p0))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go
deleted file mode 100644
index b16e1d0ee3..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_386.go
+++ /dev/null
@@ -1,1327 +0,0 @@
-// mksyscall.pl -l32 -netbsd syscall_bsd.go syscall_netbsd.go syscall_netbsd_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,netbsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (fd1 int, fd2 int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	fd1 = int(r0)
-	fd2 = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
deleted file mode 100644
index b63667da9c..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
+++ /dev/null
@@ -1,1327 +0,0 @@
-// mksyscall.pl -netbsd syscall_bsd.go syscall_netbsd.go syscall_netbsd_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,netbsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (fd1 int, fd2 int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	fd1 = int(r0)
-	fd2 = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
deleted file mode 100644
index b0d19038d2..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
+++ /dev/null
@@ -1,1327 +0,0 @@
-// mksyscall.pl -l32 -arm syscall_bsd.go syscall_netbsd.go syscall_netbsd_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm,netbsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (fd1 int, fd2 int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	fd1 = int(r0)
-	fd2 = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go
deleted file mode 100644
index f91a5b8564..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_386.go
+++ /dev/null
@@ -1,1387 +0,0 @@
-// mksyscall.pl -l32 -openbsd syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,openbsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
deleted file mode 100644
index 2e8d59d724..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
+++ /dev/null
@@ -1,1387 +0,0 @@
-// mksyscall.pl -openbsd syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,openbsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	use(_p0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
deleted file mode 100644
index 4326427817..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
+++ /dev/null
@@ -1,1559 +0,0 @@
-// mksyscall_solaris.pl syscall_solaris.go syscall_solaris_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,solaris
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//go:cgo_import_dynamic libc_getsockname getsockname "libsocket.so"
-//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
-//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
-//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
-//go:cgo_import_dynamic libc_utimes utimes "libc.so"
-//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
-//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-//go:cgo_import_dynamic libc_futimesat futimesat "libc.so"
-//go:cgo_import_dynamic libc_accept accept "libsocket.so"
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libsocket.so"
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libsocket.so"
-//go:cgo_import_dynamic libc_acct acct "libc.so"
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-//go:cgo_import_dynamic libc_access access "libc.so"
-//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
-//go:cgo_import_dynamic libc_chdir chdir "libc.so"
-//go:cgo_import_dynamic libc_chmod chmod "libc.so"
-//go:cgo_import_dynamic libc_chown chown "libc.so"
-//go:cgo_import_dynamic libc_chroot chroot "libc.so"
-//go:cgo_import_dynamic libc_close close "libc.so"
-//go:cgo_import_dynamic libc_creat creat "libc.so"
-//go:cgo_import_dynamic libc_dup dup "libc.so"
-//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
-//go:cgo_import_dynamic libc_exit exit "libc.so"
-//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
-//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
-//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
-//go:cgo_import_dynamic libc_fchown fchown "libc.so"
-//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
-//go:cgo_import_dynamic libc_fdatasync fdatasync "libc.so"
-//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
-//go:cgo_import_dynamic libc_fstat fstat "libc.so"
-//go:cgo_import_dynamic libc_getdents getdents "libc.so"
-//go:cgo_import_dynamic libc_getgid getgid "libc.so"
-//go:cgo_import_dynamic libc_getpid getpid "libc.so"
-//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
-//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
-//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
-//go:cgo_import_dynamic libc_getegid getegid "libc.so"
-//go:cgo_import_dynamic libc_getppid getppid "libc.so"
-//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
-//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
-//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
-//go:cgo_import_dynamic libc_getuid getuid "libc.so"
-//go:cgo_import_dynamic libc_kill kill "libc.so"
-//go:cgo_import_dynamic libc_lchown lchown "libc.so"
-//go:cgo_import_dynamic libc_link link "libc.so"
-//go:cgo_import_dynamic libc_listen listen "libsocket.so"
-//go:cgo_import_dynamic libc_lstat lstat "libc.so"
-//go:cgo_import_dynamic libc_madvise madvise "libc.so"
-//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
-//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
-//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
-//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
-//go:cgo_import_dynamic libc_mknod mknod "libc.so"
-//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
-//go:cgo_import_dynamic libc_mlock mlock "libc.so"
-//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
-//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
-//go:cgo_import_dynamic libc_munlock munlock "libc.so"
-//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
-//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
-//go:cgo_import_dynamic libc_open open "libc.so"
-//go:cgo_import_dynamic libc_openat openat "libc.so"
-//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
-//go:cgo_import_dynamic libc_pause pause "libc.so"
-//go:cgo_import_dynamic libc_pread pread "libc.so"
-//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
-//go:cgo_import_dynamic libc_read read "libc.so"
-//go:cgo_import_dynamic libc_readlink readlink "libc.so"
-//go:cgo_import_dynamic libc_rename rename "libc.so"
-//go:cgo_import_dynamic libc_renameat renameat "libc.so"
-//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
-//go:cgo_import_dynamic libc_lseek lseek "libc.so"
-//go:cgo_import_dynamic libc_setegid setegid "libc.so"
-//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
-//go:cgo_import_dynamic libc_setgid setgid "libc.so"
-//go:cgo_import_dynamic libc_sethostname sethostname "libc.so"
-//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
-//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
-//go:cgo_import_dynamic libc_setregid setregid "libc.so"
-//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
-//go:cgo_import_dynamic libc_setsid setsid "libc.so"
-//go:cgo_import_dynamic libc_setuid setuid "libc.so"
-//go:cgo_import_dynamic libc_shutdown shutdown "libsocket.so"
-//go:cgo_import_dynamic libc_stat stat "libc.so"
-//go:cgo_import_dynamic libc_symlink symlink "libc.so"
-//go:cgo_import_dynamic libc_sync sync "libc.so"
-//go:cgo_import_dynamic libc_times times "libc.so"
-//go:cgo_import_dynamic libc_truncate truncate "libc.so"
-//go:cgo_import_dynamic libc_fsync fsync "libc.so"
-//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
-//go:cgo_import_dynamic libc_umask umask "libc.so"
-//go:cgo_import_dynamic libc_uname uname "libc.so"
-//go:cgo_import_dynamic libc_umount umount "libc.so"
-//go:cgo_import_dynamic libc_unlink unlink "libc.so"
-//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
-//go:cgo_import_dynamic libc_ustat ustat "libc.so"
-//go:cgo_import_dynamic libc_utime utime "libc.so"
-//go:cgo_import_dynamic libc_bind bind "libsocket.so"
-//go:cgo_import_dynamic libc_connect connect "libsocket.so"
-//go:cgo_import_dynamic libc_mmap mmap "libc.so"
-//go:cgo_import_dynamic libc_munmap munmap "libc.so"
-//go:cgo_import_dynamic libc_sendto sendto "libsocket.so"
-//go:cgo_import_dynamic libc_socket socket "libsocket.so"
-//go:cgo_import_dynamic libc_socketpair socketpair "libsocket.so"
-//go:cgo_import_dynamic libc_write write "libc.so"
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libsocket.so"
-//go:cgo_import_dynamic libc_getpeername getpeername "libsocket.so"
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
-//go:cgo_import_dynamic libc_recvfrom recvfrom "libsocket.so"
-//go:cgo_import_dynamic libc_sysconf sysconf "libc.so"
-
-//go:linkname procgetsockname libc_getsockname
-//go:linkname procGetcwd libc_getcwd
-//go:linkname procgetgroups libc_getgroups
-//go:linkname procsetgroups libc_setgroups
-//go:linkname procutimes libc_utimes
-//go:linkname procutimensat libc_utimensat
-//go:linkname procfcntl libc_fcntl
-//go:linkname procfutimesat libc_futimesat
-//go:linkname procaccept libc_accept
-//go:linkname procrecvmsg libc_recvmsg
-//go:linkname procsendmsg libc_sendmsg
-//go:linkname procacct libc_acct
-//go:linkname procioctl libc_ioctl
-//go:linkname procAccess libc_access
-//go:linkname procAdjtime libc_adjtime
-//go:linkname procChdir libc_chdir
-//go:linkname procChmod libc_chmod
-//go:linkname procChown libc_chown
-//go:linkname procChroot libc_chroot
-//go:linkname procClose libc_close
-//go:linkname procCreat libc_creat
-//go:linkname procDup libc_dup
-//go:linkname procDup2 libc_dup2
-//go:linkname procExit libc_exit
-//go:linkname procFchdir libc_fchdir
-//go:linkname procFchmod libc_fchmod
-//go:linkname procFchmodat libc_fchmodat
-//go:linkname procFchown libc_fchown
-//go:linkname procFchownat libc_fchownat
-//go:linkname procFdatasync libc_fdatasync
-//go:linkname procFpathconf libc_fpathconf
-//go:linkname procFstat libc_fstat
-//go:linkname procGetdents libc_getdents
-//go:linkname procGetgid libc_getgid
-//go:linkname procGetpid libc_getpid
-//go:linkname procGetpgid libc_getpgid
-//go:linkname procGetpgrp libc_getpgrp
-//go:linkname procGeteuid libc_geteuid
-//go:linkname procGetegid libc_getegid
-//go:linkname procGetppid libc_getppid
-//go:linkname procGetpriority libc_getpriority
-//go:linkname procGetrlimit libc_getrlimit
-//go:linkname procGetrusage libc_getrusage
-//go:linkname procGettimeofday libc_gettimeofday
-//go:linkname procGetuid libc_getuid
-//go:linkname procKill libc_kill
-//go:linkname procLchown libc_lchown
-//go:linkname procLink libc_link
-//go:linkname proclisten libc_listen
-//go:linkname procLstat libc_lstat
-//go:linkname procMadvise libc_madvise
-//go:linkname procMkdir libc_mkdir
-//go:linkname procMkdirat libc_mkdirat
-//go:linkname procMkfifo libc_mkfifo
-//go:linkname procMkfifoat libc_mkfifoat
-//go:linkname procMknod libc_mknod
-//go:linkname procMknodat libc_mknodat
-//go:linkname procMlock libc_mlock
-//go:linkname procMlockall libc_mlockall
-//go:linkname procMprotect libc_mprotect
-//go:linkname procMunlock libc_munlock
-//go:linkname procMunlockall libc_munlockall
-//go:linkname procNanosleep libc_nanosleep
-//go:linkname procOpen libc_open
-//go:linkname procOpenat libc_openat
-//go:linkname procPathconf libc_pathconf
-//go:linkname procPause libc_pause
-//go:linkname procPread libc_pread
-//go:linkname procPwrite libc_pwrite
-//go:linkname procread libc_read
-//go:linkname procReadlink libc_readlink
-//go:linkname procRename libc_rename
-//go:linkname procRenameat libc_renameat
-//go:linkname procRmdir libc_rmdir
-//go:linkname proclseek libc_lseek
-//go:linkname procSetegid libc_setegid
-//go:linkname procSeteuid libc_seteuid
-//go:linkname procSetgid libc_setgid
-//go:linkname procSethostname libc_sethostname
-//go:linkname procSetpgid libc_setpgid
-//go:linkname procSetpriority libc_setpriority
-//go:linkname procSetregid libc_setregid
-//go:linkname procSetreuid libc_setreuid
-//go:linkname procSetrlimit libc_setrlimit
-//go:linkname procSetsid libc_setsid
-//go:linkname procSetuid libc_setuid
-//go:linkname procshutdown libc_shutdown
-//go:linkname procStat libc_stat
-//go:linkname procSymlink libc_symlink
-//go:linkname procSync libc_sync
-//go:linkname procTimes libc_times
-//go:linkname procTruncate libc_truncate
-//go:linkname procFsync libc_fsync
-//go:linkname procFtruncate libc_ftruncate
-//go:linkname procUmask libc_umask
-//go:linkname procUname libc_uname
-//go:linkname procumount libc_umount
-//go:linkname procUnlink libc_unlink
-//go:linkname procUnlinkat libc_unlinkat
-//go:linkname procUstat libc_ustat
-//go:linkname procUtime libc_utime
-//go:linkname procbind libc_bind
-//go:linkname procconnect libc_connect
-//go:linkname procmmap libc_mmap
-//go:linkname procmunmap libc_munmap
-//go:linkname procsendto libc_sendto
-//go:linkname procsocket libc_socket
-//go:linkname procsocketpair libc_socketpair
-//go:linkname procwrite libc_write
-//go:linkname procgetsockopt libc_getsockopt
-//go:linkname procgetpeername libc_getpeername
-//go:linkname procsetsockopt libc_setsockopt
-//go:linkname procrecvfrom libc_recvfrom
-//go:linkname procsysconf libc_sysconf
-
-var (
-	procgetsockname,
-	procGetcwd,
-	procgetgroups,
-	procsetgroups,
-	procutimes,
-	procutimensat,
-	procfcntl,
-	procfutimesat,
-	procaccept,
-	procrecvmsg,
-	procsendmsg,
-	procacct,
-	procioctl,
-	procAccess,
-	procAdjtime,
-	procChdir,
-	procChmod,
-	procChown,
-	procChroot,
-	procClose,
-	procCreat,
-	procDup,
-	procDup2,
-	procExit,
-	procFchdir,
-	procFchmod,
-	procFchmodat,
-	procFchown,
-	procFchownat,
-	procFdatasync,
-	procFpathconf,
-	procFstat,
-	procGetdents,
-	procGetgid,
-	procGetpid,
-	procGetpgid,
-	procGetpgrp,
-	procGeteuid,
-	procGetegid,
-	procGetppid,
-	procGetpriority,
-	procGetrlimit,
-	procGetrusage,
-	procGettimeofday,
-	procGetuid,
-	procKill,
-	procLchown,
-	procLink,
-	proclisten,
-	procLstat,
-	procMadvise,
-	procMkdir,
-	procMkdirat,
-	procMkfifo,
-	procMkfifoat,
-	procMknod,
-	procMknodat,
-	procMlock,
-	procMlockall,
-	procMprotect,
-	procMunlock,
-	procMunlockall,
-	procNanosleep,
-	procOpen,
-	procOpenat,
-	procPathconf,
-	procPause,
-	procPread,
-	procPwrite,
-	procread,
-	procReadlink,
-	procRename,
-	procRenameat,
-	procRmdir,
-	proclseek,
-	procSetegid,
-	procSeteuid,
-	procSetgid,
-	procSethostname,
-	procSetpgid,
-	procSetpriority,
-	procSetregid,
-	procSetreuid,
-	procSetrlimit,
-	procSetsid,
-	procSetuid,
-	procshutdown,
-	procStat,
-	procSymlink,
-	procSync,
-	procTimes,
-	procTruncate,
-	procFsync,
-	procFtruncate,
-	procUmask,
-	procUname,
-	procumount,
-	procUnlink,
-	procUnlinkat,
-	procUstat,
-	procUtime,
-	procbind,
-	procconnect,
-	procmmap,
-	procmunmap,
-	procsendto,
-	procsocket,
-	procsocketpair,
-	procwrite,
-	procgetsockopt,
-	procgetpeername,
-	procsetsockopt,
-	procrecvfrom,
-	procsysconf syscallFunc
-)
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockname)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 *byte
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetcwd)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0, 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimes)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func utimensat(fd int, path string, times *[2]Timespec, flag int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimensat)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flag), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(arg), 0, 0, 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func futimesat(fildes int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfutimesat)), 3, uintptr(fildes), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procaccept)), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func acct(path *byte) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procacct)), 1, uintptr(unsafe.Pointer(path)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func ioctl(fd int, req int, arg uintptr) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAccess)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAdjtime)), 2, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChmod)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChroot)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Close(fd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procClose)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Creat(path string, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procCreat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup2)), 2, uintptr(oldfd), uintptr(newfd), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Exit(code int) {
-	sysvicall6(uintptr(unsafe.Pointer(&procExit)), 1, uintptr(code), 0, 0, 0, 0, 0)
-	return
-}
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchdir)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmod)), 2, uintptr(fd), uintptr(mode), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchown)), 3, uintptr(fd), uintptr(uid), uintptr(gid), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchownat)), 5, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFdatasync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFpathconf)), 2, uintptr(fd), uintptr(name), 0, 0, 0, 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstat)), 2, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getdents(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 *byte
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetdents)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getgid() (gid int) {
-	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetgid)), 0, 0, 0, 0, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-func Getpid() (pid int) {
-	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpid)), 0, 0, 0, 0, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgid)), 1, uintptr(pid), 0, 0, 0, 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getpgrp() (pgid int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgrp)), 0, 0, 0, 0, 0, 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Geteuid() (euid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGeteuid)), 0, 0, 0, 0, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-func Getegid() (egid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetegid)), 0, 0, 0, 0, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-func Getppid() (ppid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetppid)), 0, 0, 0, 0, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-func Getpriority(which int, who int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetpriority)), 2, uintptr(which), uintptr(who), 0, 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrusage)), 2, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGettimeofday)), 1, uintptr(unsafe.Pointer(tv)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getuid() (uid int) {
-	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetuid)), 0, 0, 0, 0, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procKill)), 2, uintptr(pid), uintptr(signum), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLchown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclisten)), 2, uintptr(s), uintptr(backlog), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLstat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMadvise)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(advice), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdir)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdirat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifo)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifoat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknod)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mlock(b []byte) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlockall)), 1, uintptr(flags), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMprotect)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(prot), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Munlock(b []byte) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Munlockall() (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlockall)), 0, 0, 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procNanosleep)), 2, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpen)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpenat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPathconf)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	val = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Pause() (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPause)), 0, 0, 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPread)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPwrite)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	if len(buf) > 0 {
-		_p1 = &buf[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procReadlink)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(len(buf)), 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRename)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRenameat)), 4, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRmdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclseek)), 3, uintptr(fd), uintptr(offset), uintptr(whence), 0, 0, 0)
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetegid)), 1, uintptr(egid), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSeteuid)), 1, uintptr(euid), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetgid)), 1, uintptr(gid), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Sethostname(p []byte) (err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSethostname)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetpgid)), 2, uintptr(pid), uintptr(pgid), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSetpriority)), 3, uintptr(which), uintptr(who), uintptr(prio), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetregid)), 2, uintptr(rgid), uintptr(egid), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetreuid)), 2, uintptr(ruid), uintptr(euid), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetsid)), 0, 0, 0, 0, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetuid)), 1, uintptr(uid), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procshutdown)), 2, uintptr(s), uintptr(how), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procStat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSymlink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Sync() (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSync)), 0, 0, 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procTimes)), 1, uintptr(unsafe.Pointer(tms)), 0, 0, 0, 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procTruncate)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFsync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFtruncate)), 2, uintptr(fd), uintptr(length), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procUmask)), 1, uintptr(mask), 0, 0, 0, 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procUname)), 1, uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procumount)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlink)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlinkat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUstat)), 2, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUtime)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0)
-	use(unsafe.Pointer(_p0))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procbind)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procconnect)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmmap)), 6, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmunmap)), 2, uintptr(addr), uintptr(length), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 *byte
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendto)), 6, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsocket)), 3, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsocketpair)), 4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetpeername)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvfrom)), 6, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func sysconf(name int) (n int64, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsysconf)), 1, uintptr(name), 0, 0, 0, 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysctl_openbsd.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysctl_openbsd.go
deleted file mode 100644
index 83bb935b91..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysctl_openbsd.go
+++ /dev/null
@@ -1,270 +0,0 @@
-// mksysctl_openbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-package unix
-
-type mibentry struct {
-	ctlname string
-	ctloid  []_C_int
-}
-
-var sysctlMib = []mibentry{
-	{"ddb.console", []_C_int{9, 6}},
-	{"ddb.log", []_C_int{9, 7}},
-	{"ddb.max_line", []_C_int{9, 3}},
-	{"ddb.max_width", []_C_int{9, 2}},
-	{"ddb.panic", []_C_int{9, 5}},
-	{"ddb.radix", []_C_int{9, 1}},
-	{"ddb.tab_stop_width", []_C_int{9, 4}},
-	{"ddb.trigger", []_C_int{9, 8}},
-	{"fs.posix.setuid", []_C_int{3, 1, 1}},
-	{"hw.allowpowerdown", []_C_int{6, 22}},
-	{"hw.byteorder", []_C_int{6, 4}},
-	{"hw.cpuspeed", []_C_int{6, 12}},
-	{"hw.diskcount", []_C_int{6, 10}},
-	{"hw.disknames", []_C_int{6, 8}},
-	{"hw.diskstats", []_C_int{6, 9}},
-	{"hw.machine", []_C_int{6, 1}},
-	{"hw.model", []_C_int{6, 2}},
-	{"hw.ncpu", []_C_int{6, 3}},
-	{"hw.ncpufound", []_C_int{6, 21}},
-	{"hw.pagesize", []_C_int{6, 7}},
-	{"hw.physmem", []_C_int{6, 19}},
-	{"hw.product", []_C_int{6, 15}},
-	{"hw.serialno", []_C_int{6, 17}},
-	{"hw.setperf", []_C_int{6, 13}},
-	{"hw.usermem", []_C_int{6, 20}},
-	{"hw.uuid", []_C_int{6, 18}},
-	{"hw.vendor", []_C_int{6, 14}},
-	{"hw.version", []_C_int{6, 16}},
-	{"kern.arandom", []_C_int{1, 37}},
-	{"kern.argmax", []_C_int{1, 8}},
-	{"kern.boottime", []_C_int{1, 21}},
-	{"kern.bufcachepercent", []_C_int{1, 72}},
-	{"kern.ccpu", []_C_int{1, 45}},
-	{"kern.clockrate", []_C_int{1, 12}},
-	{"kern.consdev", []_C_int{1, 75}},
-	{"kern.cp_time", []_C_int{1, 40}},
-	{"kern.cp_time2", []_C_int{1, 71}},
-	{"kern.cryptodevallowsoft", []_C_int{1, 53}},
-	{"kern.domainname", []_C_int{1, 22}},
-	{"kern.file", []_C_int{1, 73}},
-	{"kern.forkstat", []_C_int{1, 42}},
-	{"kern.fscale", []_C_int{1, 46}},
-	{"kern.fsync", []_C_int{1, 33}},
-	{"kern.hostid", []_C_int{1, 11}},
-	{"kern.hostname", []_C_int{1, 10}},
-	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
-	{"kern.job_control", []_C_int{1, 19}},
-	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
-	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
-	{"kern.maxclusters", []_C_int{1, 67}},
-	{"kern.maxfiles", []_C_int{1, 7}},
-	{"kern.maxlocksperuid", []_C_int{1, 70}},
-	{"kern.maxpartitions", []_C_int{1, 23}},
-	{"kern.maxproc", []_C_int{1, 6}},
-	{"kern.maxthread", []_C_int{1, 25}},
-	{"kern.maxvnodes", []_C_int{1, 5}},
-	{"kern.mbstat", []_C_int{1, 59}},
-	{"kern.msgbuf", []_C_int{1, 48}},
-	{"kern.msgbufsize", []_C_int{1, 38}},
-	{"kern.nchstats", []_C_int{1, 41}},
-	{"kern.netlivelocks", []_C_int{1, 76}},
-	{"kern.nfiles", []_C_int{1, 56}},
-	{"kern.ngroups", []_C_int{1, 18}},
-	{"kern.nosuidcoredump", []_C_int{1, 32}},
-	{"kern.nprocs", []_C_int{1, 47}},
-	{"kern.nselcoll", []_C_int{1, 43}},
-	{"kern.nthreads", []_C_int{1, 26}},
-	{"kern.numvnodes", []_C_int{1, 58}},
-	{"kern.osrelease", []_C_int{1, 2}},
-	{"kern.osrevision", []_C_int{1, 3}},
-	{"kern.ostype", []_C_int{1, 1}},
-	{"kern.osversion", []_C_int{1, 27}},
-	{"kern.pool_debug", []_C_int{1, 77}},
-	{"kern.posix1version", []_C_int{1, 17}},
-	{"kern.proc", []_C_int{1, 66}},
-	{"kern.random", []_C_int{1, 31}},
-	{"kern.rawpartition", []_C_int{1, 24}},
-	{"kern.saved_ids", []_C_int{1, 20}},
-	{"kern.securelevel", []_C_int{1, 9}},
-	{"kern.seminfo", []_C_int{1, 61}},
-	{"kern.shminfo", []_C_int{1, 62}},
-	{"kern.somaxconn", []_C_int{1, 28}},
-	{"kern.sominconn", []_C_int{1, 29}},
-	{"kern.splassert", []_C_int{1, 54}},
-	{"kern.stackgap_random", []_C_int{1, 50}},
-	{"kern.sysvipc_info", []_C_int{1, 51}},
-	{"kern.sysvmsg", []_C_int{1, 34}},
-	{"kern.sysvsem", []_C_int{1, 35}},
-	{"kern.sysvshm", []_C_int{1, 36}},
-	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
-	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
-	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
-	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
-	{"kern.tty.maxptys", []_C_int{1, 44, 6}},
-	{"kern.tty.nptys", []_C_int{1, 44, 7}},
-	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
-	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
-	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
-	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
-	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
-	{"kern.ttycount", []_C_int{1, 57}},
-	{"kern.userasymcrypto", []_C_int{1, 60}},
-	{"kern.usercrypto", []_C_int{1, 52}},
-	{"kern.usermount", []_C_int{1, 30}},
-	{"kern.version", []_C_int{1, 4}},
-	{"kern.vnode", []_C_int{1, 13}},
-	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
-	{"kern.watchdog.period", []_C_int{1, 64, 1}},
-	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
-	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
-	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
-	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
-	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
-	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
-	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
-	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
-	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
-	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
-	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
-	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
-	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
-	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
-	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
-	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
-	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
-	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
-	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
-	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
-	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
-	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
-	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
-	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
-	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
-	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
-	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
-	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
-	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
-	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
-	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
-	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
-	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
-	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
-	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
-	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
-	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
-	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
-	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
-	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
-	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
-	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
-	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
-	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
-	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
-	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
-	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
-	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
-	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
-	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
-	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
-	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
-	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
-	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
-	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
-	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
-	{"net.inet.pim.stats", []_C_int{4, 2, 103, 1}},
-	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
-	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
-	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
-	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
-	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
-	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
-	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
-	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
-	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
-	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
-	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
-	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
-	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
-	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
-	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
-	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
-	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
-	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
-	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
-	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
-	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
-	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
-	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
-	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
-	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
-	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
-	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
-	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
-	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
-	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
-	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
-	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
-	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
-	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
-	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
-	{"net.inet6.icmp6.nd6_prune", []_C_int{4, 24, 30, 6}},
-	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
-	{"net.inet6.icmp6.nd6_useloopback", []_C_int{4, 24, 30, 11}},
-	{"net.inet6.icmp6.nodeinfo", []_C_int{4, 24, 30, 13}},
-	{"net.inet6.icmp6.rediraccept", []_C_int{4, 24, 30, 2}},
-	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
-	{"net.inet6.ip6.accept_rtadv", []_C_int{4, 24, 17, 12}},
-	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
-	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
-	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
-	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
-	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
-	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
-	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
-	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
-	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
-	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
-	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
-	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
-	{"net.inet6.ip6.maxifdefrouters", []_C_int{4, 24, 17, 47}},
-	{"net.inet6.ip6.maxifprefixes", []_C_int{4, 24, 17, 46}},
-	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
-	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
-	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
-	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
-	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
-	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
-	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
-	{"net.inet6.ip6.rr_prune", []_C_int{4, 24, 17, 22}},
-	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
-	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
-	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
-	{"net.inet6.ip6.v6only", []_C_int{4, 24, 17, 24}},
-	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
-	{"net.key.spd_dump", []_C_int{4, 30, 2}},
-	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
-	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
-	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
-	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
-	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
-	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
-	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
-	{"net.mpls.ttl", []_C_int{4, 33, 2}},
-	{"net.pflow.stats", []_C_int{4, 34, 1}},
-	{"net.pipex.enable", []_C_int{4, 35, 1}},
-	{"vm.anonmin", []_C_int{2, 7}},
-	{"vm.loadavg", []_C_int{2, 2}},
-	{"vm.maxslp", []_C_int{2, 10}},
-	{"vm.nkmempages", []_C_int{2, 6}},
-	{"vm.psstrings", []_C_int{2, 3}},
-	{"vm.swapencrypt.enable", []_C_int{2, 5, 0}},
-	{"vm.swapencrypt.keyscreated", []_C_int{2, 5, 1}},
-	{"vm.swapencrypt.keysdeleted", []_C_int{2, 5, 2}},
-	{"vm.uspace", []_C_int{2, 11}},
-	{"vm.uvmexp", []_C_int{2, 4}},
-	{"vm.vmmeter", []_C_int{2, 1}},
-	{"vm.vnodemin", []_C_int{2, 9}},
-	{"vm.vtextmin", []_C_int{2, 8}},
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go
deleted file mode 100644
index 2786773ba3..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_386.go
+++ /dev/null
@@ -1,398 +0,0 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build 386,darwin
-
-package unix
-
-const (
-	SYS_SYSCALL                        = 0
-	SYS_EXIT                           = 1
-	SYS_FORK                           = 2
-	SYS_READ                           = 3
-	SYS_WRITE                          = 4
-	SYS_OPEN                           = 5
-	SYS_CLOSE                          = 6
-	SYS_WAIT4                          = 7
-	SYS_LINK                           = 9
-	SYS_UNLINK                         = 10
-	SYS_CHDIR                          = 12
-	SYS_FCHDIR                         = 13
-	SYS_MKNOD                          = 14
-	SYS_CHMOD                          = 15
-	SYS_CHOWN                          = 16
-	SYS_GETFSSTAT                      = 18
-	SYS_GETPID                         = 20
-	SYS_SETUID                         = 23
-	SYS_GETUID                         = 24
-	SYS_GETEUID                        = 25
-	SYS_PTRACE                         = 26
-	SYS_RECVMSG                        = 27
-	SYS_SENDMSG                        = 28
-	SYS_RECVFROM                       = 29
-	SYS_ACCEPT                         = 30
-	SYS_GETPEERNAME                    = 31
-	SYS_GETSOCKNAME                    = 32
-	SYS_ACCESS                         = 33
-	SYS_CHFLAGS                        = 34
-	SYS_FCHFLAGS                       = 35
-	SYS_SYNC                           = 36
-	SYS_KILL                           = 37
-	SYS_GETPPID                        = 39
-	SYS_DUP                            = 41
-	SYS_PIPE                           = 42
-	SYS_GETEGID                        = 43
-	SYS_SIGACTION                      = 46
-	SYS_GETGID                         = 47
-	SYS_SIGPROCMASK                    = 48
-	SYS_GETLOGIN                       = 49
-	SYS_SETLOGIN                       = 50
-	SYS_ACCT                           = 51
-	SYS_SIGPENDING                     = 52
-	SYS_SIGALTSTACK                    = 53
-	SYS_IOCTL                          = 54
-	SYS_REBOOT                         = 55
-	SYS_REVOKE                         = 56
-	SYS_SYMLINK                        = 57
-	SYS_READLINK                       = 58
-	SYS_EXECVE                         = 59
-	SYS_UMASK                          = 60
-	SYS_CHROOT                         = 61
-	SYS_MSYNC                          = 65
-	SYS_VFORK                          = 66
-	SYS_MUNMAP                         = 73
-	SYS_MPROTECT                       = 74
-	SYS_MADVISE                        = 75
-	SYS_MINCORE                        = 78
-	SYS_GETGROUPS                      = 79
-	SYS_SETGROUPS                      = 80
-	SYS_GETPGRP                        = 81
-	SYS_SETPGID                        = 82
-	SYS_SETITIMER                      = 83
-	SYS_SWAPON                         = 85
-	SYS_GETITIMER                      = 86
-	SYS_GETDTABLESIZE                  = 89
-	SYS_DUP2                           = 90
-	SYS_FCNTL                          = 92
-	SYS_SELECT                         = 93
-	SYS_FSYNC                          = 95
-	SYS_SETPRIORITY                    = 96
-	SYS_SOCKET                         = 97
-	SYS_CONNECT                        = 98
-	SYS_GETPRIORITY                    = 100
-	SYS_BIND                           = 104
-	SYS_SETSOCKOPT                     = 105
-	SYS_LISTEN                         = 106
-	SYS_SIGSUSPEND                     = 111
-	SYS_GETTIMEOFDAY                   = 116
-	SYS_GETRUSAGE                      = 117
-	SYS_GETSOCKOPT                     = 118
-	SYS_READV                          = 120
-	SYS_WRITEV                         = 121
-	SYS_SETTIMEOFDAY                   = 122
-	SYS_FCHOWN                         = 123
-	SYS_FCHMOD                         = 124
-	SYS_SETREUID                       = 126
-	SYS_SETREGID                       = 127
-	SYS_RENAME                         = 128
-	SYS_FLOCK                          = 131
-	SYS_MKFIFO                         = 132
-	SYS_SENDTO                         = 133
-	SYS_SHUTDOWN                       = 134
-	SYS_SOCKETPAIR                     = 135
-	SYS_MKDIR                          = 136
-	SYS_RMDIR                          = 137
-	SYS_UTIMES                         = 138
-	SYS_FUTIMES                        = 139
-	SYS_ADJTIME                        = 140
-	SYS_GETHOSTUUID                    = 142
-	SYS_SETSID                         = 147
-	SYS_GETPGID                        = 151
-	SYS_SETPRIVEXEC                    = 152
-	SYS_PREAD                          = 153
-	SYS_PWRITE                         = 154
-	SYS_NFSSVC                         = 155
-	SYS_STATFS                         = 157
-	SYS_FSTATFS                        = 158
-	SYS_UNMOUNT                        = 159
-	SYS_GETFH                          = 161
-	SYS_QUOTACTL                       = 165
-	SYS_MOUNT                          = 167
-	SYS_CSOPS                          = 169
-	SYS_CSOPS_AUDITTOKEN               = 170
-	SYS_WAITID                         = 173
-	SYS_KDEBUG_TRACE64                 = 179
-	SYS_KDEBUG_TRACE                   = 180
-	SYS_SETGID                         = 181
-	SYS_SETEGID                        = 182
-	SYS_SETEUID                        = 183
-	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
-	SYS_FDATASYNC                      = 187
-	SYS_STAT                           = 188
-	SYS_FSTAT                          = 189
-	SYS_LSTAT                          = 190
-	SYS_PATHCONF                       = 191
-	SYS_FPATHCONF                      = 192
-	SYS_GETRLIMIT                      = 194
-	SYS_SETRLIMIT                      = 195
-	SYS_GETDIRENTRIES                  = 196
-	SYS_MMAP                           = 197
-	SYS_LSEEK                          = 199
-	SYS_TRUNCATE                       = 200
-	SYS_FTRUNCATE                      = 201
-	SYS_SYSCTL                         = 202
-	SYS_MLOCK                          = 203
-	SYS_MUNLOCK                        = 204
-	SYS_UNDELETE                       = 205
-	SYS_OPEN_DPROTECTED_NP             = 216
-	SYS_GETATTRLIST                    = 220
-	SYS_SETATTRLIST                    = 221
-	SYS_GETDIRENTRIESATTR              = 222
-	SYS_EXCHANGEDATA                   = 223
-	SYS_SEARCHFS                       = 225
-	SYS_DELETE                         = 226
-	SYS_COPYFILE                       = 227
-	SYS_FGETATTRLIST                   = 228
-	SYS_FSETATTRLIST                   = 229
-	SYS_POLL                           = 230
-	SYS_WATCHEVENT                     = 231
-	SYS_WAITEVENT                      = 232
-	SYS_MODWATCH                       = 233
-	SYS_GETXATTR                       = 234
-	SYS_FGETXATTR                      = 235
-	SYS_SETXATTR                       = 236
-	SYS_FSETXATTR                      = 237
-	SYS_REMOVEXATTR                    = 238
-	SYS_FREMOVEXATTR                   = 239
-	SYS_LISTXATTR                      = 240
-	SYS_FLISTXATTR                     = 241
-	SYS_FSCTL                          = 242
-	SYS_INITGROUPS                     = 243
-	SYS_POSIX_SPAWN                    = 244
-	SYS_FFSCTL                         = 245
-	SYS_NFSCLNT                        = 247
-	SYS_FHOPEN                         = 248
-	SYS_MINHERIT                       = 250
-	SYS_SEMSYS                         = 251
-	SYS_MSGSYS                         = 252
-	SYS_SHMSYS                         = 253
-	SYS_SEMCTL                         = 254
-	SYS_SEMGET                         = 255
-	SYS_SEMOP                          = 256
-	SYS_MSGCTL                         = 258
-	SYS_MSGGET                         = 259
-	SYS_MSGSND                         = 260
-	SYS_MSGRCV                         = 261
-	SYS_SHMAT                          = 262
-	SYS_SHMCTL                         = 263
-	SYS_SHMDT                          = 264
-	SYS_SHMGET                         = 265
-	SYS_SHM_OPEN                       = 266
-	SYS_SHM_UNLINK                     = 267
-	SYS_SEM_OPEN                       = 268
-	SYS_SEM_CLOSE                      = 269
-	SYS_SEM_UNLINK                     = 270
-	SYS_SEM_WAIT                       = 271
-	SYS_SEM_TRYWAIT                    = 272
-	SYS_SEM_POST                       = 273
-	SYS_SYSCTLBYNAME                   = 274
-	SYS_OPEN_EXTENDED                  = 277
-	SYS_UMASK_EXTENDED                 = 278
-	SYS_STAT_EXTENDED                  = 279
-	SYS_LSTAT_EXTENDED                 = 280
-	SYS_FSTAT_EXTENDED                 = 281
-	SYS_CHMOD_EXTENDED                 = 282
-	SYS_FCHMOD_EXTENDED                = 283
-	SYS_ACCESS_EXTENDED                = 284
-	SYS_SETTID                         = 285
-	SYS_GETTID                         = 286
-	SYS_SETSGROUPS                     = 287
-	SYS_GETSGROUPS                     = 288
-	SYS_SETWGROUPS                     = 289
-	SYS_GETWGROUPS                     = 290
-	SYS_MKFIFO_EXTENDED                = 291
-	SYS_MKDIR_EXTENDED                 = 292
-	SYS_IDENTITYSVC                    = 293
-	SYS_SHARED_REGION_CHECK_NP         = 294
-	SYS_VM_PRESSURE_MONITOR            = 296
-	SYS_PSYNCH_RW_LONGRDLOCK           = 297
-	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
-	SYS_PSYNCH_RW_DOWNGRADE            = 299
-	SYS_PSYNCH_RW_UPGRADE              = 300
-	SYS_PSYNCH_MUTEXWAIT               = 301
-	SYS_PSYNCH_MUTEXDROP               = 302
-	SYS_PSYNCH_CVBROAD                 = 303
-	SYS_PSYNCH_CVSIGNAL                = 304
-	SYS_PSYNCH_CVWAIT                  = 305
-	SYS_PSYNCH_RW_RDLOCK               = 306
-	SYS_PSYNCH_RW_WRLOCK               = 307
-	SYS_PSYNCH_RW_UNLOCK               = 308
-	SYS_PSYNCH_RW_UNLOCK2              = 309
-	SYS_GETSID                         = 310
-	SYS_SETTID_WITH_PID                = 311
-	SYS_PSYNCH_CVCLRPREPOST            = 312
-	SYS_AIO_FSYNC                      = 313
-	SYS_AIO_RETURN                     = 314
-	SYS_AIO_SUSPEND                    = 315
-	SYS_AIO_CANCEL                     = 316
-	SYS_AIO_ERROR                      = 317
-	SYS_AIO_READ                       = 318
-	SYS_AIO_WRITE                      = 319
-	SYS_LIO_LISTIO                     = 320
-	SYS_IOPOLICYSYS                    = 322
-	SYS_PROCESS_POLICY                 = 323
-	SYS_MLOCKALL                       = 324
-	SYS_MUNLOCKALL                     = 325
-	SYS_ISSETUGID                      = 327
-	SYS___PTHREAD_KILL                 = 328
-	SYS___PTHREAD_SIGMASK              = 329
-	SYS___SIGWAIT                      = 330
-	SYS___DISABLE_THREADSIGNAL         = 331
-	SYS___PTHREAD_MARKCANCEL           = 332
-	SYS___PTHREAD_CANCELED             = 333
-	SYS___SEMWAIT_SIGNAL               = 334
-	SYS_PROC_INFO                      = 336
-	SYS_SENDFILE                       = 337
-	SYS_STAT64                         = 338
-	SYS_FSTAT64                        = 339
-	SYS_LSTAT64                        = 340
-	SYS_STAT64_EXTENDED                = 341
-	SYS_LSTAT64_EXTENDED               = 342
-	SYS_FSTAT64_EXTENDED               = 343
-	SYS_GETDIRENTRIES64                = 344
-	SYS_STATFS64                       = 345
-	SYS_FSTATFS64                      = 346
-	SYS_GETFSSTAT64                    = 347
-	SYS___PTHREAD_CHDIR                = 348
-	SYS___PTHREAD_FCHDIR               = 349
-	SYS_AUDIT                          = 350
-	SYS_AUDITON                        = 351
-	SYS_GETAUID                        = 353
-	SYS_SETAUID                        = 354
-	SYS_GETAUDIT_ADDR                  = 357
-	SYS_SETAUDIT_ADDR                  = 358
-	SYS_AUDITCTL                       = 359
-	SYS_BSDTHREAD_CREATE               = 360
-	SYS_BSDTHREAD_TERMINATE            = 361
-	SYS_KQUEUE                         = 362
-	SYS_KEVENT                         = 363
-	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
-	SYS_BSDTHREAD_REGISTER             = 366
-	SYS_WORKQ_OPEN                     = 367
-	SYS_WORKQ_KERNRETURN               = 368
-	SYS_KEVENT64                       = 369
-	SYS___OLD_SEMWAIT_SIGNAL           = 370
-	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
-	SYS_THREAD_SELFID                  = 372
-	SYS_LEDGER                         = 373
-	SYS___MAC_EXECVE                   = 380
-	SYS___MAC_SYSCALL                  = 381
-	SYS___MAC_GET_FILE                 = 382
-	SYS___MAC_SET_FILE                 = 383
-	SYS___MAC_GET_LINK                 = 384
-	SYS___MAC_SET_LINK                 = 385
-	SYS___MAC_GET_PROC                 = 386
-	SYS___MAC_SET_PROC                 = 387
-	SYS___MAC_GET_FD                   = 388
-	SYS___MAC_SET_FD                   = 389
-	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
-	SYS_READ_NOCANCEL                  = 396
-	SYS_WRITE_NOCANCEL                 = 397
-	SYS_OPEN_NOCANCEL                  = 398
-	SYS_CLOSE_NOCANCEL                 = 399
-	SYS_WAIT4_NOCANCEL                 = 400
-	SYS_RECVMSG_NOCANCEL               = 401
-	SYS_SENDMSG_NOCANCEL               = 402
-	SYS_RECVFROM_NOCANCEL              = 403
-	SYS_ACCEPT_NOCANCEL                = 404
-	SYS_MSYNC_NOCANCEL                 = 405
-	SYS_FCNTL_NOCANCEL                 = 406
-	SYS_SELECT_NOCANCEL                = 407
-	SYS_FSYNC_NOCANCEL                 = 408
-	SYS_CONNECT_NOCANCEL               = 409
-	SYS_SIGSUSPEND_NOCANCEL            = 410
-	SYS_READV_NOCANCEL                 = 411
-	SYS_WRITEV_NOCANCEL                = 412
-	SYS_SENDTO_NOCANCEL                = 413
-	SYS_PREAD_NOCANCEL                 = 414
-	SYS_PWRITE_NOCANCEL                = 415
-	SYS_WAITID_NOCANCEL                = 416
-	SYS_POLL_NOCANCEL                  = 417
-	SYS_MSGSND_NOCANCEL                = 418
-	SYS_MSGRCV_NOCANCEL                = 419
-	SYS_SEM_WAIT_NOCANCEL              = 420
-	SYS_AIO_SUSPEND_NOCANCEL           = 421
-	SYS___SIGWAIT_NOCANCEL             = 422
-	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
-	SYS___MAC_MOUNT                    = 424
-	SYS___MAC_GET_MOUNT                = 425
-	SYS___MAC_GETFSSTAT                = 426
-	SYS_FSGETPATH                      = 427
-	SYS_AUDIT_SESSION_SELF             = 428
-	SYS_AUDIT_SESSION_JOIN             = 429
-	SYS_FILEPORT_MAKEPORT              = 430
-	SYS_FILEPORT_MAKEFD                = 431
-	SYS_AUDIT_SESSION_PORT             = 432
-	SYS_PID_SUSPEND                    = 433
-	SYS_PID_RESUME                     = 434
-	SYS_PID_HIBERNATE                  = 435
-	SYS_PID_SHUTDOWN_SOCKETS           = 436
-	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_KAS_INFO                       = 439
-	SYS_MEMORYSTATUS_CONTROL           = 440
-	SYS_GUARDED_OPEN_NP                = 441
-	SYS_GUARDED_CLOSE_NP               = 442
-	SYS_GUARDED_KQUEUE_NP              = 443
-	SYS_CHANGE_FDGUARD_NP              = 444
-	SYS_PROC_RLIMIT_CONTROL            = 446
-	SYS_CONNECTX                       = 447
-	SYS_DISCONNECTX                    = 448
-	SYS_PEELOFF                        = 449
-	SYS_SOCKET_DELEGATE                = 450
-	SYS_TELEMETRY                      = 451
-	SYS_PROC_UUID_POLICY               = 452
-	SYS_MEMORYSTATUS_GET_LEVEL         = 453
-	SYS_SYSTEM_OVERRIDE                = 454
-	SYS_VFS_PURGE                      = 455
-	SYS_SFI_CTL                        = 456
-	SYS_SFI_PIDCTL                     = 457
-	SYS_COALITION                      = 458
-	SYS_COALITION_INFO                 = 459
-	SYS_NECP_MATCH_POLICY              = 460
-	SYS_GETATTRLISTBULK                = 461
-	SYS_OPENAT                         = 463
-	SYS_OPENAT_NOCANCEL                = 464
-	SYS_RENAMEAT                       = 465
-	SYS_FACCESSAT                      = 466
-	SYS_FCHMODAT                       = 467
-	SYS_FCHOWNAT                       = 468
-	SYS_FSTATAT                        = 469
-	SYS_FSTATAT64                      = 470
-	SYS_LINKAT                         = 471
-	SYS_UNLINKAT                       = 472
-	SYS_READLINKAT                     = 473
-	SYS_SYMLINKAT                      = 474
-	SYS_MKDIRAT                        = 475
-	SYS_GETATTRLISTAT                  = 476
-	SYS_PROC_TRACE_LOG                 = 477
-	SYS_BSDTHREAD_CTL                  = 478
-	SYS_OPENBYID_NP                    = 479
-	SYS_RECVMSG_X                      = 480
-	SYS_SENDMSG_X                      = 481
-	SYS_THREAD_SELFUSAGE               = 482
-	SYS_CSRCTL                         = 483
-	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
-	SYS_GUARDED_WRITE_NP               = 485
-	SYS_GUARDED_PWRITE_NP              = 486
-	SYS_GUARDED_WRITEV_NP              = 487
-	SYS_RENAME_EXT                     = 488
-	SYS_MREMAP_ENCRYPTED               = 489
-	SYS_MAXSYSCALL                     = 490
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
deleted file mode 100644
index 09de240c8f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
+++ /dev/null
@@ -1,398 +0,0 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,darwin
-
-package unix
-
-const (
-	SYS_SYSCALL                        = 0
-	SYS_EXIT                           = 1
-	SYS_FORK                           = 2
-	SYS_READ                           = 3
-	SYS_WRITE                          = 4
-	SYS_OPEN                           = 5
-	SYS_CLOSE                          = 6
-	SYS_WAIT4                          = 7
-	SYS_LINK                           = 9
-	SYS_UNLINK                         = 10
-	SYS_CHDIR                          = 12
-	SYS_FCHDIR                         = 13
-	SYS_MKNOD                          = 14
-	SYS_CHMOD                          = 15
-	SYS_CHOWN                          = 16
-	SYS_GETFSSTAT                      = 18
-	SYS_GETPID                         = 20
-	SYS_SETUID                         = 23
-	SYS_GETUID                         = 24
-	SYS_GETEUID                        = 25
-	SYS_PTRACE                         = 26
-	SYS_RECVMSG                        = 27
-	SYS_SENDMSG                        = 28
-	SYS_RECVFROM                       = 29
-	SYS_ACCEPT                         = 30
-	SYS_GETPEERNAME                    = 31
-	SYS_GETSOCKNAME                    = 32
-	SYS_ACCESS                         = 33
-	SYS_CHFLAGS                        = 34
-	SYS_FCHFLAGS                       = 35
-	SYS_SYNC                           = 36
-	SYS_KILL                           = 37
-	SYS_GETPPID                        = 39
-	SYS_DUP                            = 41
-	SYS_PIPE                           = 42
-	SYS_GETEGID                        = 43
-	SYS_SIGACTION                      = 46
-	SYS_GETGID                         = 47
-	SYS_SIGPROCMASK                    = 48
-	SYS_GETLOGIN                       = 49
-	SYS_SETLOGIN                       = 50
-	SYS_ACCT                           = 51
-	SYS_SIGPENDING                     = 52
-	SYS_SIGALTSTACK                    = 53
-	SYS_IOCTL                          = 54
-	SYS_REBOOT                         = 55
-	SYS_REVOKE                         = 56
-	SYS_SYMLINK                        = 57
-	SYS_READLINK                       = 58
-	SYS_EXECVE                         = 59
-	SYS_UMASK                          = 60
-	SYS_CHROOT                         = 61
-	SYS_MSYNC                          = 65
-	SYS_VFORK                          = 66
-	SYS_MUNMAP                         = 73
-	SYS_MPROTECT                       = 74
-	SYS_MADVISE                        = 75
-	SYS_MINCORE                        = 78
-	SYS_GETGROUPS                      = 79
-	SYS_SETGROUPS                      = 80
-	SYS_GETPGRP                        = 81
-	SYS_SETPGID                        = 82
-	SYS_SETITIMER                      = 83
-	SYS_SWAPON                         = 85
-	SYS_GETITIMER                      = 86
-	SYS_GETDTABLESIZE                  = 89
-	SYS_DUP2                           = 90
-	SYS_FCNTL                          = 92
-	SYS_SELECT                         = 93
-	SYS_FSYNC                          = 95
-	SYS_SETPRIORITY                    = 96
-	SYS_SOCKET                         = 97
-	SYS_CONNECT                        = 98
-	SYS_GETPRIORITY                    = 100
-	SYS_BIND                           = 104
-	SYS_SETSOCKOPT                     = 105
-	SYS_LISTEN                         = 106
-	SYS_SIGSUSPEND                     = 111
-	SYS_GETTIMEOFDAY                   = 116
-	SYS_GETRUSAGE                      = 117
-	SYS_GETSOCKOPT                     = 118
-	SYS_READV                          = 120
-	SYS_WRITEV                         = 121
-	SYS_SETTIMEOFDAY                   = 122
-	SYS_FCHOWN                         = 123
-	SYS_FCHMOD                         = 124
-	SYS_SETREUID                       = 126
-	SYS_SETREGID                       = 127
-	SYS_RENAME                         = 128
-	SYS_FLOCK                          = 131
-	SYS_MKFIFO                         = 132
-	SYS_SENDTO                         = 133
-	SYS_SHUTDOWN                       = 134
-	SYS_SOCKETPAIR                     = 135
-	SYS_MKDIR                          = 136
-	SYS_RMDIR                          = 137
-	SYS_UTIMES                         = 138
-	SYS_FUTIMES                        = 139
-	SYS_ADJTIME                        = 140
-	SYS_GETHOSTUUID                    = 142
-	SYS_SETSID                         = 147
-	SYS_GETPGID                        = 151
-	SYS_SETPRIVEXEC                    = 152
-	SYS_PREAD                          = 153
-	SYS_PWRITE                         = 154
-	SYS_NFSSVC                         = 155
-	SYS_STATFS                         = 157
-	SYS_FSTATFS                        = 158
-	SYS_UNMOUNT                        = 159
-	SYS_GETFH                          = 161
-	SYS_QUOTACTL                       = 165
-	SYS_MOUNT                          = 167
-	SYS_CSOPS                          = 169
-	SYS_CSOPS_AUDITTOKEN               = 170
-	SYS_WAITID                         = 173
-	SYS_KDEBUG_TRACE64                 = 179
-	SYS_KDEBUG_TRACE                   = 180
-	SYS_SETGID                         = 181
-	SYS_SETEGID                        = 182
-	SYS_SETEUID                        = 183
-	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
-	SYS_FDATASYNC                      = 187
-	SYS_STAT                           = 188
-	SYS_FSTAT                          = 189
-	SYS_LSTAT                          = 190
-	SYS_PATHCONF                       = 191
-	SYS_FPATHCONF                      = 192
-	SYS_GETRLIMIT                      = 194
-	SYS_SETRLIMIT                      = 195
-	SYS_GETDIRENTRIES                  = 196
-	SYS_MMAP                           = 197
-	SYS_LSEEK                          = 199
-	SYS_TRUNCATE                       = 200
-	SYS_FTRUNCATE                      = 201
-	SYS_SYSCTL                         = 202
-	SYS_MLOCK                          = 203
-	SYS_MUNLOCK                        = 204
-	SYS_UNDELETE                       = 205
-	SYS_OPEN_DPROTECTED_NP             = 216
-	SYS_GETATTRLIST                    = 220
-	SYS_SETATTRLIST                    = 221
-	SYS_GETDIRENTRIESATTR              = 222
-	SYS_EXCHANGEDATA                   = 223
-	SYS_SEARCHFS                       = 225
-	SYS_DELETE                         = 226
-	SYS_COPYFILE                       = 227
-	SYS_FGETATTRLIST                   = 228
-	SYS_FSETATTRLIST                   = 229
-	SYS_POLL                           = 230
-	SYS_WATCHEVENT                     = 231
-	SYS_WAITEVENT                      = 232
-	SYS_MODWATCH                       = 233
-	SYS_GETXATTR                       = 234
-	SYS_FGETXATTR                      = 235
-	SYS_SETXATTR                       = 236
-	SYS_FSETXATTR                      = 237
-	SYS_REMOVEXATTR                    = 238
-	SYS_FREMOVEXATTR                   = 239
-	SYS_LISTXATTR                      = 240
-	SYS_FLISTXATTR                     = 241
-	SYS_FSCTL                          = 242
-	SYS_INITGROUPS                     = 243
-	SYS_POSIX_SPAWN                    = 244
-	SYS_FFSCTL                         = 245
-	SYS_NFSCLNT                        = 247
-	SYS_FHOPEN                         = 248
-	SYS_MINHERIT                       = 250
-	SYS_SEMSYS                         = 251
-	SYS_MSGSYS                         = 252
-	SYS_SHMSYS                         = 253
-	SYS_SEMCTL                         = 254
-	SYS_SEMGET                         = 255
-	SYS_SEMOP                          = 256
-	SYS_MSGCTL                         = 258
-	SYS_MSGGET                         = 259
-	SYS_MSGSND                         = 260
-	SYS_MSGRCV                         = 261
-	SYS_SHMAT                          = 262
-	SYS_SHMCTL                         = 263
-	SYS_SHMDT                          = 264
-	SYS_SHMGET                         = 265
-	SYS_SHM_OPEN                       = 266
-	SYS_SHM_UNLINK                     = 267
-	SYS_SEM_OPEN                       = 268
-	SYS_SEM_CLOSE                      = 269
-	SYS_SEM_UNLINK                     = 270
-	SYS_SEM_WAIT                       = 271
-	SYS_SEM_TRYWAIT                    = 272
-	SYS_SEM_POST                       = 273
-	SYS_SYSCTLBYNAME                   = 274
-	SYS_OPEN_EXTENDED                  = 277
-	SYS_UMASK_EXTENDED                 = 278
-	SYS_STAT_EXTENDED                  = 279
-	SYS_LSTAT_EXTENDED                 = 280
-	SYS_FSTAT_EXTENDED                 = 281
-	SYS_CHMOD_EXTENDED                 = 282
-	SYS_FCHMOD_EXTENDED                = 283
-	SYS_ACCESS_EXTENDED                = 284
-	SYS_SETTID                         = 285
-	SYS_GETTID                         = 286
-	SYS_SETSGROUPS                     = 287
-	SYS_GETSGROUPS                     = 288
-	SYS_SETWGROUPS                     = 289
-	SYS_GETWGROUPS                     = 290
-	SYS_MKFIFO_EXTENDED                = 291
-	SYS_MKDIR_EXTENDED                 = 292
-	SYS_IDENTITYSVC                    = 293
-	SYS_SHARED_REGION_CHECK_NP         = 294
-	SYS_VM_PRESSURE_MONITOR            = 296
-	SYS_PSYNCH_RW_LONGRDLOCK           = 297
-	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
-	SYS_PSYNCH_RW_DOWNGRADE            = 299
-	SYS_PSYNCH_RW_UPGRADE              = 300
-	SYS_PSYNCH_MUTEXWAIT               = 301
-	SYS_PSYNCH_MUTEXDROP               = 302
-	SYS_PSYNCH_CVBROAD                 = 303
-	SYS_PSYNCH_CVSIGNAL                = 304
-	SYS_PSYNCH_CVWAIT                  = 305
-	SYS_PSYNCH_RW_RDLOCK               = 306
-	SYS_PSYNCH_RW_WRLOCK               = 307
-	SYS_PSYNCH_RW_UNLOCK               = 308
-	SYS_PSYNCH_RW_UNLOCK2              = 309
-	SYS_GETSID                         = 310
-	SYS_SETTID_WITH_PID                = 311
-	SYS_PSYNCH_CVCLRPREPOST            = 312
-	SYS_AIO_FSYNC                      = 313
-	SYS_AIO_RETURN                     = 314
-	SYS_AIO_SUSPEND                    = 315
-	SYS_AIO_CANCEL                     = 316
-	SYS_AIO_ERROR                      = 317
-	SYS_AIO_READ                       = 318
-	SYS_AIO_WRITE                      = 319
-	SYS_LIO_LISTIO                     = 320
-	SYS_IOPOLICYSYS                    = 322
-	SYS_PROCESS_POLICY                 = 323
-	SYS_MLOCKALL                       = 324
-	SYS_MUNLOCKALL                     = 325
-	SYS_ISSETUGID                      = 327
-	SYS___PTHREAD_KILL                 = 328
-	SYS___PTHREAD_SIGMASK              = 329
-	SYS___SIGWAIT                      = 330
-	SYS___DISABLE_THREADSIGNAL         = 331
-	SYS___PTHREAD_MARKCANCEL           = 332
-	SYS___PTHREAD_CANCELED             = 333
-	SYS___SEMWAIT_SIGNAL               = 334
-	SYS_PROC_INFO                      = 336
-	SYS_SENDFILE                       = 337
-	SYS_STAT64                         = 338
-	SYS_FSTAT64                        = 339
-	SYS_LSTAT64                        = 340
-	SYS_STAT64_EXTENDED                = 341
-	SYS_LSTAT64_EXTENDED               = 342
-	SYS_FSTAT64_EXTENDED               = 343
-	SYS_GETDIRENTRIES64                = 344
-	SYS_STATFS64                       = 345
-	SYS_FSTATFS64                      = 346
-	SYS_GETFSSTAT64                    = 347
-	SYS___PTHREAD_CHDIR                = 348
-	SYS___PTHREAD_FCHDIR               = 349
-	SYS_AUDIT                          = 350
-	SYS_AUDITON                        = 351
-	SYS_GETAUID                        = 353
-	SYS_SETAUID                        = 354
-	SYS_GETAUDIT_ADDR                  = 357
-	SYS_SETAUDIT_ADDR                  = 358
-	SYS_AUDITCTL                       = 359
-	SYS_BSDTHREAD_CREATE               = 360
-	SYS_BSDTHREAD_TERMINATE            = 361
-	SYS_KQUEUE                         = 362
-	SYS_KEVENT                         = 363
-	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
-	SYS_BSDTHREAD_REGISTER             = 366
-	SYS_WORKQ_OPEN                     = 367
-	SYS_WORKQ_KERNRETURN               = 368
-	SYS_KEVENT64                       = 369
-	SYS___OLD_SEMWAIT_SIGNAL           = 370
-	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
-	SYS_THREAD_SELFID                  = 372
-	SYS_LEDGER                         = 373
-	SYS___MAC_EXECVE                   = 380
-	SYS___MAC_SYSCALL                  = 381
-	SYS___MAC_GET_FILE                 = 382
-	SYS___MAC_SET_FILE                 = 383
-	SYS___MAC_GET_LINK                 = 384
-	SYS___MAC_SET_LINK                 = 385
-	SYS___MAC_GET_PROC                 = 386
-	SYS___MAC_SET_PROC                 = 387
-	SYS___MAC_GET_FD                   = 388
-	SYS___MAC_SET_FD                   = 389
-	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
-	SYS_READ_NOCANCEL                  = 396
-	SYS_WRITE_NOCANCEL                 = 397
-	SYS_OPEN_NOCANCEL                  = 398
-	SYS_CLOSE_NOCANCEL                 = 399
-	SYS_WAIT4_NOCANCEL                 = 400
-	SYS_RECVMSG_NOCANCEL               = 401
-	SYS_SENDMSG_NOCANCEL               = 402
-	SYS_RECVFROM_NOCANCEL              = 403
-	SYS_ACCEPT_NOCANCEL                = 404
-	SYS_MSYNC_NOCANCEL                 = 405
-	SYS_FCNTL_NOCANCEL                 = 406
-	SYS_SELECT_NOCANCEL                = 407
-	SYS_FSYNC_NOCANCEL                 = 408
-	SYS_CONNECT_NOCANCEL               = 409
-	SYS_SIGSUSPEND_NOCANCEL            = 410
-	SYS_READV_NOCANCEL                 = 411
-	SYS_WRITEV_NOCANCEL                = 412
-	SYS_SENDTO_NOCANCEL                = 413
-	SYS_PREAD_NOCANCEL                 = 414
-	SYS_PWRITE_NOCANCEL                = 415
-	SYS_WAITID_NOCANCEL                = 416
-	SYS_POLL_NOCANCEL                  = 417
-	SYS_MSGSND_NOCANCEL                = 418
-	SYS_MSGRCV_NOCANCEL                = 419
-	SYS_SEM_WAIT_NOCANCEL              = 420
-	SYS_AIO_SUSPEND_NOCANCEL           = 421
-	SYS___SIGWAIT_NOCANCEL             = 422
-	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
-	SYS___MAC_MOUNT                    = 424
-	SYS___MAC_GET_MOUNT                = 425
-	SYS___MAC_GETFSSTAT                = 426
-	SYS_FSGETPATH                      = 427
-	SYS_AUDIT_SESSION_SELF             = 428
-	SYS_AUDIT_SESSION_JOIN             = 429
-	SYS_FILEPORT_MAKEPORT              = 430
-	SYS_FILEPORT_MAKEFD                = 431
-	SYS_AUDIT_SESSION_PORT             = 432
-	SYS_PID_SUSPEND                    = 433
-	SYS_PID_RESUME                     = 434
-	SYS_PID_HIBERNATE                  = 435
-	SYS_PID_SHUTDOWN_SOCKETS           = 436
-	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_KAS_INFO                       = 439
-	SYS_MEMORYSTATUS_CONTROL           = 440
-	SYS_GUARDED_OPEN_NP                = 441
-	SYS_GUARDED_CLOSE_NP               = 442
-	SYS_GUARDED_KQUEUE_NP              = 443
-	SYS_CHANGE_FDGUARD_NP              = 444
-	SYS_PROC_RLIMIT_CONTROL            = 446
-	SYS_CONNECTX                       = 447
-	SYS_DISCONNECTX                    = 448
-	SYS_PEELOFF                        = 449
-	SYS_SOCKET_DELEGATE                = 450
-	SYS_TELEMETRY                      = 451
-	SYS_PROC_UUID_POLICY               = 452
-	SYS_MEMORYSTATUS_GET_LEVEL         = 453
-	SYS_SYSTEM_OVERRIDE                = 454
-	SYS_VFS_PURGE                      = 455
-	SYS_SFI_CTL                        = 456
-	SYS_SFI_PIDCTL                     = 457
-	SYS_COALITION                      = 458
-	SYS_COALITION_INFO                 = 459
-	SYS_NECP_MATCH_POLICY              = 460
-	SYS_GETATTRLISTBULK                = 461
-	SYS_OPENAT                         = 463
-	SYS_OPENAT_NOCANCEL                = 464
-	SYS_RENAMEAT                       = 465
-	SYS_FACCESSAT                      = 466
-	SYS_FCHMODAT                       = 467
-	SYS_FCHOWNAT                       = 468
-	SYS_FSTATAT                        = 469
-	SYS_FSTATAT64                      = 470
-	SYS_LINKAT                         = 471
-	SYS_UNLINKAT                       = 472
-	SYS_READLINKAT                     = 473
-	SYS_SYMLINKAT                      = 474
-	SYS_MKDIRAT                        = 475
-	SYS_GETATTRLISTAT                  = 476
-	SYS_PROC_TRACE_LOG                 = 477
-	SYS_BSDTHREAD_CTL                  = 478
-	SYS_OPENBYID_NP                    = 479
-	SYS_RECVMSG_X                      = 480
-	SYS_SENDMSG_X                      = 481
-	SYS_THREAD_SELFUSAGE               = 482
-	SYS_CSRCTL                         = 483
-	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
-	SYS_GUARDED_WRITE_NP               = 485
-	SYS_GUARDED_PWRITE_NP              = 486
-	SYS_GUARDED_WRITEV_NP              = 487
-	SYS_RENAME_EXT                     = 488
-	SYS_MREMAP_ENCRYPTED               = 489
-	SYS_MAXSYSCALL                     = 490
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go
deleted file mode 100644
index b8c9aea852..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm.go
+++ /dev/null
@@ -1,358 +0,0 @@
-// mksysnum_darwin.pl /usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm,darwin
-
-package unix
-
-const (
-	SYS_SYSCALL                        = 0
-	SYS_EXIT                           = 1
-	SYS_FORK                           = 2
-	SYS_READ                           = 3
-	SYS_WRITE                          = 4
-	SYS_OPEN                           = 5
-	SYS_CLOSE                          = 6
-	SYS_WAIT4                          = 7
-	SYS_LINK                           = 9
-	SYS_UNLINK                         = 10
-	SYS_CHDIR                          = 12
-	SYS_FCHDIR                         = 13
-	SYS_MKNOD                          = 14
-	SYS_CHMOD                          = 15
-	SYS_CHOWN                          = 16
-	SYS_GETFSSTAT                      = 18
-	SYS_GETPID                         = 20
-	SYS_SETUID                         = 23
-	SYS_GETUID                         = 24
-	SYS_GETEUID                        = 25
-	SYS_PTRACE                         = 26
-	SYS_RECVMSG                        = 27
-	SYS_SENDMSG                        = 28
-	SYS_RECVFROM                       = 29
-	SYS_ACCEPT                         = 30
-	SYS_GETPEERNAME                    = 31
-	SYS_GETSOCKNAME                    = 32
-	SYS_ACCESS                         = 33
-	SYS_CHFLAGS                        = 34
-	SYS_FCHFLAGS                       = 35
-	SYS_SYNC                           = 36
-	SYS_KILL                           = 37
-	SYS_GETPPID                        = 39
-	SYS_DUP                            = 41
-	SYS_PIPE                           = 42
-	SYS_GETEGID                        = 43
-	SYS_SIGACTION                      = 46
-	SYS_GETGID                         = 47
-	SYS_SIGPROCMASK                    = 48
-	SYS_GETLOGIN                       = 49
-	SYS_SETLOGIN                       = 50
-	SYS_ACCT                           = 51
-	SYS_SIGPENDING                     = 52
-	SYS_SIGALTSTACK                    = 53
-	SYS_IOCTL                          = 54
-	SYS_REBOOT                         = 55
-	SYS_REVOKE                         = 56
-	SYS_SYMLINK                        = 57
-	SYS_READLINK                       = 58
-	SYS_EXECVE                         = 59
-	SYS_UMASK                          = 60
-	SYS_CHROOT                         = 61
-	SYS_MSYNC                          = 65
-	SYS_VFORK                          = 66
-	SYS_MUNMAP                         = 73
-	SYS_MPROTECT                       = 74
-	SYS_MADVISE                        = 75
-	SYS_MINCORE                        = 78
-	SYS_GETGROUPS                      = 79
-	SYS_SETGROUPS                      = 80
-	SYS_GETPGRP                        = 81
-	SYS_SETPGID                        = 82
-	SYS_SETITIMER                      = 83
-	SYS_SWAPON                         = 85
-	SYS_GETITIMER                      = 86
-	SYS_GETDTABLESIZE                  = 89
-	SYS_DUP2                           = 90
-	SYS_FCNTL                          = 92
-	SYS_SELECT                         = 93
-	SYS_FSYNC                          = 95
-	SYS_SETPRIORITY                    = 96
-	SYS_SOCKET                         = 97
-	SYS_CONNECT                        = 98
-	SYS_GETPRIORITY                    = 100
-	SYS_BIND                           = 104
-	SYS_SETSOCKOPT                     = 105
-	SYS_LISTEN                         = 106
-	SYS_SIGSUSPEND                     = 111
-	SYS_GETTIMEOFDAY                   = 116
-	SYS_GETRUSAGE                      = 117
-	SYS_GETSOCKOPT                     = 118
-	SYS_READV                          = 120
-	SYS_WRITEV                         = 121
-	SYS_SETTIMEOFDAY                   = 122
-	SYS_FCHOWN                         = 123
-	SYS_FCHMOD                         = 124
-	SYS_SETREUID                       = 126
-	SYS_SETREGID                       = 127
-	SYS_RENAME                         = 128
-	SYS_FLOCK                          = 131
-	SYS_MKFIFO                         = 132
-	SYS_SENDTO                         = 133
-	SYS_SHUTDOWN                       = 134
-	SYS_SOCKETPAIR                     = 135
-	SYS_MKDIR                          = 136
-	SYS_RMDIR                          = 137
-	SYS_UTIMES                         = 138
-	SYS_FUTIMES                        = 139
-	SYS_ADJTIME                        = 140
-	SYS_GETHOSTUUID                    = 142
-	SYS_SETSID                         = 147
-	SYS_GETPGID                        = 151
-	SYS_SETPRIVEXEC                    = 152
-	SYS_PREAD                          = 153
-	SYS_PWRITE                         = 154
-	SYS_NFSSVC                         = 155
-	SYS_STATFS                         = 157
-	SYS_FSTATFS                        = 158
-	SYS_UNMOUNT                        = 159
-	SYS_GETFH                          = 161
-	SYS_QUOTACTL                       = 165
-	SYS_MOUNT                          = 167
-	SYS_CSOPS                          = 169
-	SYS_CSOPS_AUDITTOKEN               = 170
-	SYS_WAITID                         = 173
-	SYS_KDEBUG_TRACE                   = 180
-	SYS_SETGID                         = 181
-	SYS_SETEGID                        = 182
-	SYS_SETEUID                        = 183
-	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
-	SYS_FDATASYNC                      = 187
-	SYS_STAT                           = 188
-	SYS_FSTAT                          = 189
-	SYS_LSTAT                          = 190
-	SYS_PATHCONF                       = 191
-	SYS_FPATHCONF                      = 192
-	SYS_GETRLIMIT                      = 194
-	SYS_SETRLIMIT                      = 195
-	SYS_GETDIRENTRIES                  = 196
-	SYS_MMAP                           = 197
-	SYS_LSEEK                          = 199
-	SYS_TRUNCATE                       = 200
-	SYS_FTRUNCATE                      = 201
-	SYS___SYSCTL                       = 202
-	SYS_MLOCK                          = 203
-	SYS_MUNLOCK                        = 204
-	SYS_UNDELETE                       = 205
-	SYS_ATSOCKET                       = 206
-	SYS_ATGETMSG                       = 207
-	SYS_ATPUTMSG                       = 208
-	SYS_ATPSNDREQ                      = 209
-	SYS_ATPSNDRSP                      = 210
-	SYS_ATPGETREQ                      = 211
-	SYS_ATPGETRSP                      = 212
-	SYS_OPEN_DPROTECTED_NP             = 216
-	SYS_GETATTRLIST                    = 220
-	SYS_SETATTRLIST                    = 221
-	SYS_GETDIRENTRIESATTR              = 222
-	SYS_EXCHANGEDATA                   = 223
-	SYS_SEARCHFS                       = 225
-	SYS_DELETE                         = 226
-	SYS_COPYFILE                       = 227
-	SYS_FGETATTRLIST                   = 228
-	SYS_FSETATTRLIST                   = 229
-	SYS_POLL                           = 230
-	SYS_WATCHEVENT                     = 231
-	SYS_WAITEVENT                      = 232
-	SYS_MODWATCH                       = 233
-	SYS_GETXATTR                       = 234
-	SYS_FGETXATTR                      = 235
-	SYS_SETXATTR                       = 236
-	SYS_FSETXATTR                      = 237
-	SYS_REMOVEXATTR                    = 238
-	SYS_FREMOVEXATTR                   = 239
-	SYS_LISTXATTR                      = 240
-	SYS_FLISTXATTR                     = 241
-	SYS_FSCTL                          = 242
-	SYS_INITGROUPS                     = 243
-	SYS_POSIX_SPAWN                    = 244
-	SYS_FFSCTL                         = 245
-	SYS_NFSCLNT                        = 247
-	SYS_FHOPEN                         = 248
-	SYS_MINHERIT                       = 250
-	SYS_SEMSYS                         = 251
-	SYS_MSGSYS                         = 252
-	SYS_SHMSYS                         = 253
-	SYS_SEMCTL                         = 254
-	SYS_SEMGET                         = 255
-	SYS_SEMOP                          = 256
-	SYS_MSGCTL                         = 258
-	SYS_MSGGET                         = 259
-	SYS_MSGSND                         = 260
-	SYS_MSGRCV                         = 261
-	SYS_SHMAT                          = 262
-	SYS_SHMCTL                         = 263
-	SYS_SHMDT                          = 264
-	SYS_SHMGET                         = 265
-	SYS_SHM_OPEN                       = 266
-	SYS_SHM_UNLINK                     = 267
-	SYS_SEM_OPEN                       = 268
-	SYS_SEM_CLOSE                      = 269
-	SYS_SEM_UNLINK                     = 270
-	SYS_SEM_WAIT                       = 271
-	SYS_SEM_TRYWAIT                    = 272
-	SYS_SEM_POST                       = 273
-	SYS_SEM_GETVALUE                   = 274
-	SYS_SEM_INIT                       = 275
-	SYS_SEM_DESTROY                    = 276
-	SYS_OPEN_EXTENDED                  = 277
-	SYS_UMASK_EXTENDED                 = 278
-	SYS_STAT_EXTENDED                  = 279
-	SYS_LSTAT_EXTENDED                 = 280
-	SYS_FSTAT_EXTENDED                 = 281
-	SYS_CHMOD_EXTENDED                 = 282
-	SYS_FCHMOD_EXTENDED                = 283
-	SYS_ACCESS_EXTENDED                = 284
-	SYS_SETTID                         = 285
-	SYS_GETTID                         = 286
-	SYS_SETSGROUPS                     = 287
-	SYS_GETSGROUPS                     = 288
-	SYS_SETWGROUPS                     = 289
-	SYS_GETWGROUPS                     = 290
-	SYS_MKFIFO_EXTENDED                = 291
-	SYS_MKDIR_EXTENDED                 = 292
-	SYS_IDENTITYSVC                    = 293
-	SYS_SHARED_REGION_CHECK_NP         = 294
-	SYS_VM_PRESSURE_MONITOR            = 296
-	SYS_PSYNCH_RW_LONGRDLOCK           = 297
-	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
-	SYS_PSYNCH_RW_DOWNGRADE            = 299
-	SYS_PSYNCH_RW_UPGRADE              = 300
-	SYS_PSYNCH_MUTEXWAIT               = 301
-	SYS_PSYNCH_MUTEXDROP               = 302
-	SYS_PSYNCH_CVBROAD                 = 303
-	SYS_PSYNCH_CVSIGNAL                = 304
-	SYS_PSYNCH_CVWAIT                  = 305
-	SYS_PSYNCH_RW_RDLOCK               = 306
-	SYS_PSYNCH_RW_WRLOCK               = 307
-	SYS_PSYNCH_RW_UNLOCK               = 308
-	SYS_PSYNCH_RW_UNLOCK2              = 309
-	SYS_GETSID                         = 310
-	SYS_SETTID_WITH_PID                = 311
-	SYS_PSYNCH_CVCLRPREPOST            = 312
-	SYS_AIO_FSYNC                      = 313
-	SYS_AIO_RETURN                     = 314
-	SYS_AIO_SUSPEND                    = 315
-	SYS_AIO_CANCEL                     = 316
-	SYS_AIO_ERROR                      = 317
-	SYS_AIO_READ                       = 318
-	SYS_AIO_WRITE                      = 319
-	SYS_LIO_LISTIO                     = 320
-	SYS_IOPOLICYSYS                    = 322
-	SYS_PROCESS_POLICY                 = 323
-	SYS_MLOCKALL                       = 324
-	SYS_MUNLOCKALL                     = 325
-	SYS_ISSETUGID                      = 327
-	SYS___PTHREAD_KILL                 = 328
-	SYS___PTHREAD_SIGMASK              = 329
-	SYS___SIGWAIT                      = 330
-	SYS___DISABLE_THREADSIGNAL         = 331
-	SYS___PTHREAD_MARKCANCEL           = 332
-	SYS___PTHREAD_CANCELED             = 333
-	SYS___SEMWAIT_SIGNAL               = 334
-	SYS_PROC_INFO                      = 336
-	SYS_SENDFILE                       = 337
-	SYS_STAT64                         = 338
-	SYS_FSTAT64                        = 339
-	SYS_LSTAT64                        = 340
-	SYS_STAT64_EXTENDED                = 341
-	SYS_LSTAT64_EXTENDED               = 342
-	SYS_FSTAT64_EXTENDED               = 343
-	SYS_GETDIRENTRIES64                = 344
-	SYS_STATFS64                       = 345
-	SYS_FSTATFS64                      = 346
-	SYS_GETFSSTAT64                    = 347
-	SYS___PTHREAD_CHDIR                = 348
-	SYS___PTHREAD_FCHDIR               = 349
-	SYS_AUDIT                          = 350
-	SYS_AUDITON                        = 351
-	SYS_GETAUID                        = 353
-	SYS_SETAUID                        = 354
-	SYS_GETAUDIT_ADDR                  = 357
-	SYS_SETAUDIT_ADDR                  = 358
-	SYS_AUDITCTL                       = 359
-	SYS_BSDTHREAD_CREATE               = 360
-	SYS_BSDTHREAD_TERMINATE            = 361
-	SYS_KQUEUE                         = 362
-	SYS_KEVENT                         = 363
-	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
-	SYS_BSDTHREAD_REGISTER             = 366
-	SYS_WORKQ_OPEN                     = 367
-	SYS_WORKQ_KERNRETURN               = 368
-	SYS_KEVENT64                       = 369
-	SYS___OLD_SEMWAIT_SIGNAL           = 370
-	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
-	SYS_THREAD_SELFID                  = 372
-	SYS_LEDGER                         = 373
-	SYS___MAC_EXECVE                   = 380
-	SYS___MAC_SYSCALL                  = 381
-	SYS___MAC_GET_FILE                 = 382
-	SYS___MAC_SET_FILE                 = 383
-	SYS___MAC_GET_LINK                 = 384
-	SYS___MAC_SET_LINK                 = 385
-	SYS___MAC_GET_PROC                 = 386
-	SYS___MAC_SET_PROC                 = 387
-	SYS___MAC_GET_FD                   = 388
-	SYS___MAC_SET_FD                   = 389
-	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
-	SYS_READ_NOCANCEL                  = 396
-	SYS_WRITE_NOCANCEL                 = 397
-	SYS_OPEN_NOCANCEL                  = 398
-	SYS_CLOSE_NOCANCEL                 = 399
-	SYS_WAIT4_NOCANCEL                 = 400
-	SYS_RECVMSG_NOCANCEL               = 401
-	SYS_SENDMSG_NOCANCEL               = 402
-	SYS_RECVFROM_NOCANCEL              = 403
-	SYS_ACCEPT_NOCANCEL                = 404
-	SYS_MSYNC_NOCANCEL                 = 405
-	SYS_FCNTL_NOCANCEL                 = 406
-	SYS_SELECT_NOCANCEL                = 407
-	SYS_FSYNC_NOCANCEL                 = 408
-	SYS_CONNECT_NOCANCEL               = 409
-	SYS_SIGSUSPEND_NOCANCEL            = 410
-	SYS_READV_NOCANCEL                 = 411
-	SYS_WRITEV_NOCANCEL                = 412
-	SYS_SENDTO_NOCANCEL                = 413
-	SYS_PREAD_NOCANCEL                 = 414
-	SYS_PWRITE_NOCANCEL                = 415
-	SYS_WAITID_NOCANCEL                = 416
-	SYS_POLL_NOCANCEL                  = 417
-	SYS_MSGSND_NOCANCEL                = 418
-	SYS_MSGRCV_NOCANCEL                = 419
-	SYS_SEM_WAIT_NOCANCEL              = 420
-	SYS_AIO_SUSPEND_NOCANCEL           = 421
-	SYS___SIGWAIT_NOCANCEL             = 422
-	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
-	SYS___MAC_MOUNT                    = 424
-	SYS___MAC_GET_MOUNT                = 425
-	SYS___MAC_GETFSSTAT                = 426
-	SYS_FSGETPATH                      = 427
-	SYS_AUDIT_SESSION_SELF             = 428
-	SYS_AUDIT_SESSION_JOIN             = 429
-	SYS_FILEPORT_MAKEPORT              = 430
-	SYS_FILEPORT_MAKEFD                = 431
-	SYS_AUDIT_SESSION_PORT             = 432
-	SYS_PID_SUSPEND                    = 433
-	SYS_PID_RESUME                     = 434
-	SYS_PID_HIBERNATE                  = 435
-	SYS_PID_SHUTDOWN_SOCKETS           = 436
-	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_KAS_INFO                       = 439
-	SYS_MAXSYSCALL                     = 440
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
deleted file mode 100644
index 26677ebbf5..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
+++ /dev/null
@@ -1,398 +0,0 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm64,darwin
-
-package unix
-
-const (
-	SYS_SYSCALL                        = 0
-	SYS_EXIT                           = 1
-	SYS_FORK                           = 2
-	SYS_READ                           = 3
-	SYS_WRITE                          = 4
-	SYS_OPEN                           = 5
-	SYS_CLOSE                          = 6
-	SYS_WAIT4                          = 7
-	SYS_LINK                           = 9
-	SYS_UNLINK                         = 10
-	SYS_CHDIR                          = 12
-	SYS_FCHDIR                         = 13
-	SYS_MKNOD                          = 14
-	SYS_CHMOD                          = 15
-	SYS_CHOWN                          = 16
-	SYS_GETFSSTAT                      = 18
-	SYS_GETPID                         = 20
-	SYS_SETUID                         = 23
-	SYS_GETUID                         = 24
-	SYS_GETEUID                        = 25
-	SYS_PTRACE                         = 26
-	SYS_RECVMSG                        = 27
-	SYS_SENDMSG                        = 28
-	SYS_RECVFROM                       = 29
-	SYS_ACCEPT                         = 30
-	SYS_GETPEERNAME                    = 31
-	SYS_GETSOCKNAME                    = 32
-	SYS_ACCESS                         = 33
-	SYS_CHFLAGS                        = 34
-	SYS_FCHFLAGS                       = 35
-	SYS_SYNC                           = 36
-	SYS_KILL                           = 37
-	SYS_GETPPID                        = 39
-	SYS_DUP                            = 41
-	SYS_PIPE                           = 42
-	SYS_GETEGID                        = 43
-	SYS_SIGACTION                      = 46
-	SYS_GETGID                         = 47
-	SYS_SIGPROCMASK                    = 48
-	SYS_GETLOGIN                       = 49
-	SYS_SETLOGIN                       = 50
-	SYS_ACCT                           = 51
-	SYS_SIGPENDING                     = 52
-	SYS_SIGALTSTACK                    = 53
-	SYS_IOCTL                          = 54
-	SYS_REBOOT                         = 55
-	SYS_REVOKE                         = 56
-	SYS_SYMLINK                        = 57
-	SYS_READLINK                       = 58
-	SYS_EXECVE                         = 59
-	SYS_UMASK                          = 60
-	SYS_CHROOT                         = 61
-	SYS_MSYNC                          = 65
-	SYS_VFORK                          = 66
-	SYS_MUNMAP                         = 73
-	SYS_MPROTECT                       = 74
-	SYS_MADVISE                        = 75
-	SYS_MINCORE                        = 78
-	SYS_GETGROUPS                      = 79
-	SYS_SETGROUPS                      = 80
-	SYS_GETPGRP                        = 81
-	SYS_SETPGID                        = 82
-	SYS_SETITIMER                      = 83
-	SYS_SWAPON                         = 85
-	SYS_GETITIMER                      = 86
-	SYS_GETDTABLESIZE                  = 89
-	SYS_DUP2                           = 90
-	SYS_FCNTL                          = 92
-	SYS_SELECT                         = 93
-	SYS_FSYNC                          = 95
-	SYS_SETPRIORITY                    = 96
-	SYS_SOCKET                         = 97
-	SYS_CONNECT                        = 98
-	SYS_GETPRIORITY                    = 100
-	SYS_BIND                           = 104
-	SYS_SETSOCKOPT                     = 105
-	SYS_LISTEN                         = 106
-	SYS_SIGSUSPEND                     = 111
-	SYS_GETTIMEOFDAY                   = 116
-	SYS_GETRUSAGE                      = 117
-	SYS_GETSOCKOPT                     = 118
-	SYS_READV                          = 120
-	SYS_WRITEV                         = 121
-	SYS_SETTIMEOFDAY                   = 122
-	SYS_FCHOWN                         = 123
-	SYS_FCHMOD                         = 124
-	SYS_SETREUID                       = 126
-	SYS_SETREGID                       = 127
-	SYS_RENAME                         = 128
-	SYS_FLOCK                          = 131
-	SYS_MKFIFO                         = 132
-	SYS_SENDTO                         = 133
-	SYS_SHUTDOWN                       = 134
-	SYS_SOCKETPAIR                     = 135
-	SYS_MKDIR                          = 136
-	SYS_RMDIR                          = 137
-	SYS_UTIMES                         = 138
-	SYS_FUTIMES                        = 139
-	SYS_ADJTIME                        = 140
-	SYS_GETHOSTUUID                    = 142
-	SYS_SETSID                         = 147
-	SYS_GETPGID                        = 151
-	SYS_SETPRIVEXEC                    = 152
-	SYS_PREAD                          = 153
-	SYS_PWRITE                         = 154
-	SYS_NFSSVC                         = 155
-	SYS_STATFS                         = 157
-	SYS_FSTATFS                        = 158
-	SYS_UNMOUNT                        = 159
-	SYS_GETFH                          = 161
-	SYS_QUOTACTL                       = 165
-	SYS_MOUNT                          = 167
-	SYS_CSOPS                          = 169
-	SYS_CSOPS_AUDITTOKEN               = 170
-	SYS_WAITID                         = 173
-	SYS_KDEBUG_TRACE64                 = 179
-	SYS_KDEBUG_TRACE                   = 180
-	SYS_SETGID                         = 181
-	SYS_SETEGID                        = 182
-	SYS_SETEUID                        = 183
-	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
-	SYS_FDATASYNC                      = 187
-	SYS_STAT                           = 188
-	SYS_FSTAT                          = 189
-	SYS_LSTAT                          = 190
-	SYS_PATHCONF                       = 191
-	SYS_FPATHCONF                      = 192
-	SYS_GETRLIMIT                      = 194
-	SYS_SETRLIMIT                      = 195
-	SYS_GETDIRENTRIES                  = 196
-	SYS_MMAP                           = 197
-	SYS_LSEEK                          = 199
-	SYS_TRUNCATE                       = 200
-	SYS_FTRUNCATE                      = 201
-	SYS_SYSCTL                         = 202
-	SYS_MLOCK                          = 203
-	SYS_MUNLOCK                        = 204
-	SYS_UNDELETE                       = 205
-	SYS_OPEN_DPROTECTED_NP             = 216
-	SYS_GETATTRLIST                    = 220
-	SYS_SETATTRLIST                    = 221
-	SYS_GETDIRENTRIESATTR              = 222
-	SYS_EXCHANGEDATA                   = 223
-	SYS_SEARCHFS                       = 225
-	SYS_DELETE                         = 226
-	SYS_COPYFILE                       = 227
-	SYS_FGETATTRLIST                   = 228
-	SYS_FSETATTRLIST                   = 229
-	SYS_POLL                           = 230
-	SYS_WATCHEVENT                     = 231
-	SYS_WAITEVENT                      = 232
-	SYS_MODWATCH                       = 233
-	SYS_GETXATTR                       = 234
-	SYS_FGETXATTR                      = 235
-	SYS_SETXATTR                       = 236
-	SYS_FSETXATTR                      = 237
-	SYS_REMOVEXATTR                    = 238
-	SYS_FREMOVEXATTR                   = 239
-	SYS_LISTXATTR                      = 240
-	SYS_FLISTXATTR                     = 241
-	SYS_FSCTL                          = 242
-	SYS_INITGROUPS                     = 243
-	SYS_POSIX_SPAWN                    = 244
-	SYS_FFSCTL                         = 245
-	SYS_NFSCLNT                        = 247
-	SYS_FHOPEN                         = 248
-	SYS_MINHERIT                       = 250
-	SYS_SEMSYS                         = 251
-	SYS_MSGSYS                         = 252
-	SYS_SHMSYS                         = 253
-	SYS_SEMCTL                         = 254
-	SYS_SEMGET                         = 255
-	SYS_SEMOP                          = 256
-	SYS_MSGCTL                         = 258
-	SYS_MSGGET                         = 259
-	SYS_MSGSND                         = 260
-	SYS_MSGRCV                         = 261
-	SYS_SHMAT                          = 262
-	SYS_SHMCTL                         = 263
-	SYS_SHMDT                          = 264
-	SYS_SHMGET                         = 265
-	SYS_SHM_OPEN                       = 266
-	SYS_SHM_UNLINK                     = 267
-	SYS_SEM_OPEN                       = 268
-	SYS_SEM_CLOSE                      = 269
-	SYS_SEM_UNLINK                     = 270
-	SYS_SEM_WAIT                       = 271
-	SYS_SEM_TRYWAIT                    = 272
-	SYS_SEM_POST                       = 273
-	SYS_SYSCTLBYNAME                   = 274
-	SYS_OPEN_EXTENDED                  = 277
-	SYS_UMASK_EXTENDED                 = 278
-	SYS_STAT_EXTENDED                  = 279
-	SYS_LSTAT_EXTENDED                 = 280
-	SYS_FSTAT_EXTENDED                 = 281
-	SYS_CHMOD_EXTENDED                 = 282
-	SYS_FCHMOD_EXTENDED                = 283
-	SYS_ACCESS_EXTENDED                = 284
-	SYS_SETTID                         = 285
-	SYS_GETTID                         = 286
-	SYS_SETSGROUPS                     = 287
-	SYS_GETSGROUPS                     = 288
-	SYS_SETWGROUPS                     = 289
-	SYS_GETWGROUPS                     = 290
-	SYS_MKFIFO_EXTENDED                = 291
-	SYS_MKDIR_EXTENDED                 = 292
-	SYS_IDENTITYSVC                    = 293
-	SYS_SHARED_REGION_CHECK_NP         = 294
-	SYS_VM_PRESSURE_MONITOR            = 296
-	SYS_PSYNCH_RW_LONGRDLOCK           = 297
-	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
-	SYS_PSYNCH_RW_DOWNGRADE            = 299
-	SYS_PSYNCH_RW_UPGRADE              = 300
-	SYS_PSYNCH_MUTEXWAIT               = 301
-	SYS_PSYNCH_MUTEXDROP               = 302
-	SYS_PSYNCH_CVBROAD                 = 303
-	SYS_PSYNCH_CVSIGNAL                = 304
-	SYS_PSYNCH_CVWAIT                  = 305
-	SYS_PSYNCH_RW_RDLOCK               = 306
-	SYS_PSYNCH_RW_WRLOCK               = 307
-	SYS_PSYNCH_RW_UNLOCK               = 308
-	SYS_PSYNCH_RW_UNLOCK2              = 309
-	SYS_GETSID                         = 310
-	SYS_SETTID_WITH_PID                = 311
-	SYS_PSYNCH_CVCLRPREPOST            = 312
-	SYS_AIO_FSYNC                      = 313
-	SYS_AIO_RETURN                     = 314
-	SYS_AIO_SUSPEND                    = 315
-	SYS_AIO_CANCEL                     = 316
-	SYS_AIO_ERROR                      = 317
-	SYS_AIO_READ                       = 318
-	SYS_AIO_WRITE                      = 319
-	SYS_LIO_LISTIO                     = 320
-	SYS_IOPOLICYSYS                    = 322
-	SYS_PROCESS_POLICY                 = 323
-	SYS_MLOCKALL                       = 324
-	SYS_MUNLOCKALL                     = 325
-	SYS_ISSETUGID                      = 327
-	SYS___PTHREAD_KILL                 = 328
-	SYS___PTHREAD_SIGMASK              = 329
-	SYS___SIGWAIT                      = 330
-	SYS___DISABLE_THREADSIGNAL         = 331
-	SYS___PTHREAD_MARKCANCEL           = 332
-	SYS___PTHREAD_CANCELED             = 333
-	SYS___SEMWAIT_SIGNAL               = 334
-	SYS_PROC_INFO                      = 336
-	SYS_SENDFILE                       = 337
-	SYS_STAT64                         = 338
-	SYS_FSTAT64                        = 339
-	SYS_LSTAT64                        = 340
-	SYS_STAT64_EXTENDED                = 341
-	SYS_LSTAT64_EXTENDED               = 342
-	SYS_FSTAT64_EXTENDED               = 343
-	SYS_GETDIRENTRIES64                = 344
-	SYS_STATFS64                       = 345
-	SYS_FSTATFS64                      = 346
-	SYS_GETFSSTAT64                    = 347
-	SYS___PTHREAD_CHDIR                = 348
-	SYS___PTHREAD_FCHDIR               = 349
-	SYS_AUDIT                          = 350
-	SYS_AUDITON                        = 351
-	SYS_GETAUID                        = 353
-	SYS_SETAUID                        = 354
-	SYS_GETAUDIT_ADDR                  = 357
-	SYS_SETAUDIT_ADDR                  = 358
-	SYS_AUDITCTL                       = 359
-	SYS_BSDTHREAD_CREATE               = 360
-	SYS_BSDTHREAD_TERMINATE            = 361
-	SYS_KQUEUE                         = 362
-	SYS_KEVENT                         = 363
-	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
-	SYS_BSDTHREAD_REGISTER             = 366
-	SYS_WORKQ_OPEN                     = 367
-	SYS_WORKQ_KERNRETURN               = 368
-	SYS_KEVENT64                       = 369
-	SYS___OLD_SEMWAIT_SIGNAL           = 370
-	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
-	SYS_THREAD_SELFID                  = 372
-	SYS_LEDGER                         = 373
-	SYS___MAC_EXECVE                   = 380
-	SYS___MAC_SYSCALL                  = 381
-	SYS___MAC_GET_FILE                 = 382
-	SYS___MAC_SET_FILE                 = 383
-	SYS___MAC_GET_LINK                 = 384
-	SYS___MAC_SET_LINK                 = 385
-	SYS___MAC_GET_PROC                 = 386
-	SYS___MAC_SET_PROC                 = 387
-	SYS___MAC_GET_FD                   = 388
-	SYS___MAC_SET_FD                   = 389
-	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
-	SYS_READ_NOCANCEL                  = 396
-	SYS_WRITE_NOCANCEL                 = 397
-	SYS_OPEN_NOCANCEL                  = 398
-	SYS_CLOSE_NOCANCEL                 = 399
-	SYS_WAIT4_NOCANCEL                 = 400
-	SYS_RECVMSG_NOCANCEL               = 401
-	SYS_SENDMSG_NOCANCEL               = 402
-	SYS_RECVFROM_NOCANCEL              = 403
-	SYS_ACCEPT_NOCANCEL                = 404
-	SYS_MSYNC_NOCANCEL                 = 405
-	SYS_FCNTL_NOCANCEL                 = 406
-	SYS_SELECT_NOCANCEL                = 407
-	SYS_FSYNC_NOCANCEL                 = 408
-	SYS_CONNECT_NOCANCEL               = 409
-	SYS_SIGSUSPEND_NOCANCEL            = 410
-	SYS_READV_NOCANCEL                 = 411
-	SYS_WRITEV_NOCANCEL                = 412
-	SYS_SENDTO_NOCANCEL                = 413
-	SYS_PREAD_NOCANCEL                 = 414
-	SYS_PWRITE_NOCANCEL                = 415
-	SYS_WAITID_NOCANCEL                = 416
-	SYS_POLL_NOCANCEL                  = 417
-	SYS_MSGSND_NOCANCEL                = 418
-	SYS_MSGRCV_NOCANCEL                = 419
-	SYS_SEM_WAIT_NOCANCEL              = 420
-	SYS_AIO_SUSPEND_NOCANCEL           = 421
-	SYS___SIGWAIT_NOCANCEL             = 422
-	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
-	SYS___MAC_MOUNT                    = 424
-	SYS___MAC_GET_MOUNT                = 425
-	SYS___MAC_GETFSSTAT                = 426
-	SYS_FSGETPATH                      = 427
-	SYS_AUDIT_SESSION_SELF             = 428
-	SYS_AUDIT_SESSION_JOIN             = 429
-	SYS_FILEPORT_MAKEPORT              = 430
-	SYS_FILEPORT_MAKEFD                = 431
-	SYS_AUDIT_SESSION_PORT             = 432
-	SYS_PID_SUSPEND                    = 433
-	SYS_PID_RESUME                     = 434
-	SYS_PID_HIBERNATE                  = 435
-	SYS_PID_SHUTDOWN_SOCKETS           = 436
-	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_KAS_INFO                       = 439
-	SYS_MEMORYSTATUS_CONTROL           = 440
-	SYS_GUARDED_OPEN_NP                = 441
-	SYS_GUARDED_CLOSE_NP               = 442
-	SYS_GUARDED_KQUEUE_NP              = 443
-	SYS_CHANGE_FDGUARD_NP              = 444
-	SYS_PROC_RLIMIT_CONTROL            = 446
-	SYS_CONNECTX                       = 447
-	SYS_DISCONNECTX                    = 448
-	SYS_PEELOFF                        = 449
-	SYS_SOCKET_DELEGATE                = 450
-	SYS_TELEMETRY                      = 451
-	SYS_PROC_UUID_POLICY               = 452
-	SYS_MEMORYSTATUS_GET_LEVEL         = 453
-	SYS_SYSTEM_OVERRIDE                = 454
-	SYS_VFS_PURGE                      = 455
-	SYS_SFI_CTL                        = 456
-	SYS_SFI_PIDCTL                     = 457
-	SYS_COALITION                      = 458
-	SYS_COALITION_INFO                 = 459
-	SYS_NECP_MATCH_POLICY              = 460
-	SYS_GETATTRLISTBULK                = 461
-	SYS_OPENAT                         = 463
-	SYS_OPENAT_NOCANCEL                = 464
-	SYS_RENAMEAT                       = 465
-	SYS_FACCESSAT                      = 466
-	SYS_FCHMODAT                       = 467
-	SYS_FCHOWNAT                       = 468
-	SYS_FSTATAT                        = 469
-	SYS_FSTATAT64                      = 470
-	SYS_LINKAT                         = 471
-	SYS_UNLINKAT                       = 472
-	SYS_READLINKAT                     = 473
-	SYS_SYMLINKAT                      = 474
-	SYS_MKDIRAT                        = 475
-	SYS_GETATTRLISTAT                  = 476
-	SYS_PROC_TRACE_LOG                 = 477
-	SYS_BSDTHREAD_CTL                  = 478
-	SYS_OPENBYID_NP                    = 479
-	SYS_RECVMSG_X                      = 480
-	SYS_SENDMSG_X                      = 481
-	SYS_THREAD_SELFUSAGE               = 482
-	SYS_CSRCTL                         = 483
-	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
-	SYS_GUARDED_WRITE_NP               = 485
-	SYS_GUARDED_PWRITE_NP              = 486
-	SYS_GUARDED_WRITEV_NP              = 487
-	SYS_RENAME_EXT                     = 488
-	SYS_MREMAP_ENCRYPTED               = 489
-	SYS_MAXSYSCALL                     = 490
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
deleted file mode 100644
index d6038fa9b0..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
+++ /dev/null
@@ -1,304 +0,0 @@
-// mksysnum_dragonfly.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,dragonfly
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT          = 1   // { void exit(int rval); }
-	SYS_FORK          = 2   // { int fork(void); }
-	SYS_READ          = 3   // { ssize_t read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE         = 4   // { ssize_t write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN          = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE         = 6   // { int close(int fd); }
-	SYS_WAIT4         = 7   // { int wait4(int pid, int *status, int options, \
-	SYS_LINK          = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK        = 10  // { int unlink(char *path); }
-	SYS_CHDIR         = 12  // { int chdir(char *path); }
-	SYS_FCHDIR        = 13  // { int fchdir(int fd); }
-	SYS_MKNOD         = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD         = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN         = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK        = 17  // { int obreak(char *nsize); } break obreak_args int
-	SYS_GETFSSTAT     = 18  // { int getfsstat(struct statfs *buf, long bufsize, \
-	SYS_GETPID        = 20  // { pid_t getpid(void); }
-	SYS_MOUNT         = 21  // { int mount(char *type, char *path, int flags, \
-	SYS_UNMOUNT       = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID        = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID        = 24  // { uid_t getuid(void); }
-	SYS_GETEUID       = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE        = 26  // { int ptrace(int req, pid_t pid, caddr_t addr, \
-	SYS_RECVMSG       = 27  // { int recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG       = 28  // { int sendmsg(int s, caddr_t msg, int flags); }
-	SYS_RECVFROM      = 29  // { int recvfrom(int s, caddr_t buf, size_t len, \
-	SYS_ACCEPT        = 30  // { int accept(int s, caddr_t name, int *anamelen); }
-	SYS_GETPEERNAME   = 31  // { int getpeername(int fdes, caddr_t asa, int *alen); }
-	SYS_GETSOCKNAME   = 32  // { int getsockname(int fdes, caddr_t asa, int *alen); }
-	SYS_ACCESS        = 33  // { int access(char *path, int flags); }
-	SYS_CHFLAGS       = 34  // { int chflags(char *path, int flags); }
-	SYS_FCHFLAGS      = 35  // { int fchflags(int fd, int flags); }
-	SYS_SYNC          = 36  // { int sync(void); }
-	SYS_KILL          = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID       = 39  // { pid_t getppid(void); }
-	SYS_DUP           = 41  // { int dup(u_int fd); }
-	SYS_PIPE          = 42  // { int pipe(void); }
-	SYS_GETEGID       = 43  // { gid_t getegid(void); }
-	SYS_PROFIL        = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE        = 45  // { int ktrace(const char *fname, int ops, int facs, \
-	SYS_GETGID        = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN      = 49  // { int getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN      = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT          = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK   = 53  // { int sigaltstack(stack_t *ss, stack_t *oss); }
-	SYS_IOCTL         = 54  // { int ioctl(int fd, u_long com, caddr_t data); }
-	SYS_REBOOT        = 55  // { int reboot(int opt); }
-	SYS_REVOKE        = 56  // { int revoke(char *path); }
-	SYS_SYMLINK       = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK      = 58  // { int readlink(char *path, char *buf, int count); }
-	SYS_EXECVE        = 59  // { int execve(char *fname, char **argv, char **envv); }
-	SYS_UMASK         = 60  // { int umask(int newmask); } umask umask_args int
-	SYS_CHROOT        = 61  // { int chroot(char *path); }
-	SYS_MSYNC         = 65  // { int msync(void *addr, size_t len, int flags); }
-	SYS_VFORK         = 66  // { pid_t vfork(void); }
-	SYS_SBRK          = 69  // { int sbrk(int incr); }
-	SYS_SSTK          = 70  // { int sstk(int incr); }
-	SYS_MUNMAP        = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT      = 74  // { int mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE       = 75  // { int madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE       = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS     = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS     = 80  // { int setgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_GETPGRP       = 81  // { int getpgrp(void); }
-	SYS_SETPGID       = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER     = 83  // { int setitimer(u_int which, struct itimerval *itv, \
-	SYS_SWAPON        = 85  // { int swapon(char *name); }
-	SYS_GETITIMER     = 86  // { int getitimer(u_int which, struct itimerval *itv); }
-	SYS_GETDTABLESIZE = 89  // { int getdtablesize(void); }
-	SYS_DUP2          = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL         = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT        = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC         = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY   = 96  // { int setpriority(int which, int who, int prio); }
-	SYS_SOCKET        = 97  // { int socket(int domain, int type, int protocol); }
-	SYS_CONNECT       = 98  // { int connect(int s, caddr_t name, int namelen); }
-	SYS_GETPRIORITY   = 100 // { int getpriority(int which, int who); }
-	SYS_BIND          = 104 // { int bind(int s, caddr_t name, int namelen); }
-	SYS_SETSOCKOPT    = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN        = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY  = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE     = 117 // { int getrusage(int who, struct rusage *rusage); }
-	SYS_GETSOCKOPT    = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV         = 120 // { int readv(int fd, struct iovec *iovp, u_int iovcnt); }
-	SYS_WRITEV        = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY  = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN        = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD        = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID      = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID      = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME        = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK         = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO        = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO        = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN      = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR    = 135 // { int socketpair(int domain, int type, int protocol, \
-	SYS_MKDIR         = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR         = 137 // { int rmdir(char *path); }
-	SYS_UTIMES        = 138 // { int utimes(char *path, struct timeval *tptr); }
-	SYS_ADJTIME       = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID        = 147 // { int setsid(void); }
-	SYS_QUOTACTL      = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_STATFS        = 157 // { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS       = 158 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_GETFH         = 161 // { int getfh(char *fname, struct fhandle *fhp); }
-	SYS_GETDOMAINNAME = 162 // { int getdomainname(char *domainname, int len); }
-	SYS_SETDOMAINNAME = 163 // { int setdomainname(char *domainname, int len); }
-	SYS_UNAME         = 164 // { int uname(struct utsname *name); }
-	SYS_SYSARCH       = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO        = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_EXTPREAD      = 173 // { ssize_t extpread(int fd, void *buf, \
-	SYS_EXTPWRITE     = 174 // { ssize_t extpwrite(int fd, const void *buf, \
-	SYS_NTP_ADJTIME   = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID        = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID       = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID       = 183 // { int seteuid(uid_t euid); }
-	SYS_PATHCONF      = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF     = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT     = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT     = 195 // { int setrlimit(u_int which, \
-	SYS_MMAP          = 197 // { caddr_t mmap(caddr_t addr, size_t len, int prot, \
-	// SYS_NOSYS = 198;  // { int nosys(void); } __syscall __syscall_args int
-	SYS_LSEEK                  = 199 // { off_t lseek(int fd, int pad, off_t offset, \
-	SYS_TRUNCATE               = 200 // { int truncate(char *path, int pad, off_t length); }
-	SYS_FTRUNCATE              = 201 // { int ftruncate(int fd, int pad, off_t length); }
-	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, void *old, \
-	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE               = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS___SEMCTL               = 220 // { int __semctl(int semid, int semnum, int cmd, \
-	SYS_SEMGET                 = 221 // { int semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                  = 222 // { int semop(int semid, struct sembuf *sops, \
-	SYS_MSGCTL                 = 224 // { int msgctl(int msqid, int cmd, \
-	SYS_MSGGET                 = 225 // { int msgget(key_t key, int msgflg); }
-	SYS_MSGSND                 = 226 // { int msgsnd(int msqid, void *msgp, size_t msgsz, \
-	SYS_MSGRCV                 = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, \
-	SYS_SHMAT                  = 228 // { caddr_t shmat(int shmid, const void *shmaddr, \
-	SYS_SHMCTL                 = 229 // { int shmctl(int shmid, int cmd, \
-	SYS_SHMDT                  = 230 // { int shmdt(const void *shmaddr); }
-	SYS_SHMGET                 = 231 // { int shmget(key_t key, size_t size, int shmflg); }
-	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME          = 233 // { int clock_settime(clockid_t clock_id, \
-	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, int inherit); }
-	SYS_RFORK                  = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, u_int nfds, \
-	SYS_ISSETUGID              = 253 // { int issetugid(void); }
-	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                = 276 // { int lutimes(char *path, struct timeval *tptr); }
-	SYS_EXTPREADV              = 289 // { ssize_t extpreadv(int fd, struct iovec *iovp, \
-	SYS_EXTPWRITEV             = 290 // { ssize_t extpwritev(int fd, struct iovec *iovp,\
-	SYS_FHSTATFS               = 297 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
-	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
-	SYS_MODNEXT                = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                = 301 // { int modstat(int modid, struct module_stat* stat); }
-	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct kld_file_stat* stat); }
-	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
-	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
-	SYS_AIO_RETURN             = 314 // { int aio_return(struct aiocb *aiocbp); }
-	SYS_AIO_SUSPEND            = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
-	SYS_AIO_CANCEL             = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
-	SYS_AIO_ERROR              = 317 // { int aio_error(struct aiocb *aiocbp); }
-	SYS_AIO_READ               = 318 // { int aio_read(struct aiocb *aiocbp); }
-	SYS_AIO_WRITE              = 319 // { int aio_write(struct aiocb *aiocbp); }
-	SYS_LIO_LISTIO             = 320 // { int lio_listio(int mode, struct aiocb * const *acb_list, int nent, struct sigevent *sig); }
-	SYS_YIELD                  = 321 // { int yield(void); }
-	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
-	SYS___GETCWD               = 326 // { int __getcwd(u_char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
-	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
-	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
-	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, struct timespec *interval); }
-	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, void *data); }
-	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, const sigset_t *set, \
-	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGACTION              = 342 // { int sigaction(int sig, const struct sigaction *act, \
-	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGRETURN              = 344 // { int sigreturn(ucontext_t *sigcntxp); }
-	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set,\
-	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set,\
-	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, acl_type_t type, \
-	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, acl_type_t type, \
-	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, acl_type_t type); }
-	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, \
-	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE       = 356 // { int extattr_set_file(const char *path, \
-	SYS_EXTATTR_GET_FILE       = 357 // { int extattr_get_file(const char *path, \
-	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
-	SYS_AIO_WAITCOMPLETE       = 359 // { int aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
-	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
-	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
-	SYS_KQUEUE                 = 362 // { int kqueue(void); }
-	SYS_KEVENT                 = 363 // { int kevent(int fd, \
-	SYS_SCTP_PEELOFF           = 364 // { int sctp_peeloff(int sd, caddr_t name ); }
-	SYS_LCHFLAGS               = 391 // { int lchflags(char *path, int flags); }
-	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, int count); }
-	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, \
-	SYS_VARSYM_SET             = 450 // { int varsym_set(int level, const char *name, const char *data); }
-	SYS_VARSYM_GET             = 451 // { int varsym_get(int mask, const char *wild, char *buf, int bufsize); }
-	SYS_VARSYM_LIST            = 452 // { int varsym_list(int level, char *buf, int maxsize, int *marker); }
-	SYS_EXEC_SYS_REGISTER      = 465 // { int exec_sys_register(void *entry); }
-	SYS_EXEC_SYS_UNREGISTER    = 466 // { int exec_sys_unregister(int id); }
-	SYS_SYS_CHECKPOINT         = 467 // { int sys_checkpoint(int type, int fd, pid_t pid, int retval); }
-	SYS_MOUNTCTL               = 468 // { int mountctl(const char *path, int op, int fd, const void *ctl, int ctllen, void *buf, int buflen); }
-	SYS_UMTX_SLEEP             = 469 // { int umtx_sleep(volatile const int *ptr, int value, int timeout); }
-	SYS_UMTX_WAKEUP            = 470 // { int umtx_wakeup(volatile const int *ptr, int count); }
-	SYS_JAIL_ATTACH            = 471 // { int jail_attach(int jid); }
-	SYS_SET_TLS_AREA           = 472 // { int set_tls_area(int which, struct tls_info *info, size_t infosize); }
-	SYS_GET_TLS_AREA           = 473 // { int get_tls_area(int which, struct tls_info *info, size_t infosize); }
-	SYS_CLOSEFROM              = 474 // { int closefrom(int fd); }
-	SYS_STAT                   = 475 // { int stat(const char *path, struct stat *ub); }
-	SYS_FSTAT                  = 476 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                  = 477 // { int lstat(const char *path, struct stat *ub); }
-	SYS_FHSTAT                 = 478 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
-	SYS_GETDIRENTRIES          = 479 // { int getdirentries(int fd, char *buf, u_int count, \
-	SYS_GETDENTS               = 480 // { int getdents(int fd, char *buf, size_t count); }
-	SYS_USCHED_SET             = 481 // { int usched_set(pid_t pid, int cmd, void *data, \
-	SYS_EXTACCEPT              = 482 // { int extaccept(int s, int flags, caddr_t name, int *anamelen); }
-	SYS_EXTCONNECT             = 483 // { int extconnect(int s, int flags, caddr_t name, int namelen); }
-	SYS_MCONTROL               = 485 // { int mcontrol(void *addr, size_t len, int behav, off_t value); }
-	SYS_VMSPACE_CREATE         = 486 // { int vmspace_create(void *id, int type, void *data); }
-	SYS_VMSPACE_DESTROY        = 487 // { int vmspace_destroy(void *id); }
-	SYS_VMSPACE_CTL            = 488 // { int vmspace_ctl(void *id, int cmd, 		\
-	SYS_VMSPACE_MMAP           = 489 // { int vmspace_mmap(void *id, void *addr, size_t len, \
-	SYS_VMSPACE_MUNMAP         = 490 // { int vmspace_munmap(void *id, void *addr,	\
-	SYS_VMSPACE_MCONTROL       = 491 // { int vmspace_mcontrol(void *id, void *addr, 	\
-	SYS_VMSPACE_PREAD          = 492 // { ssize_t vmspace_pread(void *id, void *buf, \
-	SYS_VMSPACE_PWRITE         = 493 // { ssize_t vmspace_pwrite(void *id, const void *buf, \
-	SYS_EXTEXIT                = 494 // { void extexit(int how, int status, void *addr); }
-	SYS_LWP_CREATE             = 495 // { int lwp_create(struct lwp_params *params); }
-	SYS_LWP_GETTID             = 496 // { lwpid_t lwp_gettid(void); }
-	SYS_LWP_KILL               = 497 // { int lwp_kill(pid_t pid, lwpid_t tid, int signum); }
-	SYS_LWP_RTPRIO             = 498 // { int lwp_rtprio(int function, pid_t pid, lwpid_t tid, struct rtprio *rtp); }
-	SYS_PSELECT                = 499 // { int pselect(int nd, fd_set *in, fd_set *ou, \
-	SYS_STATVFS                = 500 // { int statvfs(const char *path, struct statvfs *buf); }
-	SYS_FSTATVFS               = 501 // { int fstatvfs(int fd, struct statvfs *buf); }
-	SYS_FHSTATVFS              = 502 // { int fhstatvfs(const struct fhandle *u_fhp, struct statvfs *buf); }
-	SYS_GETVFSSTAT             = 503 // { int getvfsstat(struct statfs *buf,          \
-	SYS_OPENAT                 = 504 // { int openat(int fd, char *path, int flags, int mode); }
-	SYS_FSTATAT                = 505 // { int fstatat(int fd, char *path, 	\
-	SYS_FCHMODAT               = 506 // { int fchmodat(int fd, char *path, int mode, \
-	SYS_FCHOWNAT               = 507 // { int fchownat(int fd, char *path, int uid, int gid, \
-	SYS_UNLINKAT               = 508 // { int unlinkat(int fd, char *path, int flags); }
-	SYS_FACCESSAT              = 509 // { int faccessat(int fd, char *path, int amode, \
-	SYS_MQ_OPEN                = 510 // { mqd_t mq_open(const char * name, int oflag, \
-	SYS_MQ_CLOSE               = 511 // { int mq_close(mqd_t mqdes); }
-	SYS_MQ_UNLINK              = 512 // { int mq_unlink(const char *name); }
-	SYS_MQ_GETATTR             = 513 // { int mq_getattr(mqd_t mqdes, \
-	SYS_MQ_SETATTR             = 514 // { int mq_setattr(mqd_t mqdes, \
-	SYS_MQ_NOTIFY              = 515 // { int mq_notify(mqd_t mqdes, \
-	SYS_MQ_SEND                = 516 // { int mq_send(mqd_t mqdes, const char *msg_ptr, \
-	SYS_MQ_RECEIVE             = 517 // { ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, \
-	SYS_MQ_TIMEDSEND           = 518 // { int mq_timedsend(mqd_t mqdes, \
-	SYS_MQ_TIMEDRECEIVE        = 519 // { ssize_t mq_timedreceive(mqd_t mqdes, \
-	SYS_IOPRIO_SET             = 520 // { int ioprio_set(int which, int who, int prio); }
-	SYS_IOPRIO_GET             = 521 // { int ioprio_get(int which, int who); }
-	SYS_CHROOT_KERNEL          = 522 // { int chroot_kernel(char *path); }
-	SYS_RENAMEAT               = 523 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_MKDIRAT                = 524 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT               = 525 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                = 526 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_READLINKAT             = 527 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_SYMLINKAT              = 528 // { int symlinkat(char *path1, int fd, char *path2); }
-	SYS_SWAPOFF                = 529 // { int swapoff(char *name); }
-	SYS_VQUOTACTL              = 530 // { int vquotactl(const char *path, \
-	SYS_LINKAT                 = 531 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_EACCESS                = 532 // { int eaccess(char *path, int flags); }
-	SYS_LPATHCONF              = 533 // { int lpathconf(char *path, int name); }
-	SYS_VMM_GUEST_CTL          = 534 // { int vmm_guest_ctl(int op, struct vmm_guest_options *options); }
-	SYS_VMM_GUEST_SYNC_ADDR    = 535 // { int vmm_guest_sync_addr(long *dstaddr, long *srcaddr); }
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go
deleted file mode 100644
index 262a84536a..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_386.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// mksysnum_freebsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build 386,freebsd
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT                   = 30  // { int accept(int s, \
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_PIPE                     = 42  // { int pipe(void); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
-	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, \
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
-	SYS_GETFH                    = 161 // { int getfh(char *fname, \
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
-	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_KEVENT                   = 363 // { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
-	SYS_STATFS                   = 396 // { int statfs(char *path, \
-	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
-	SYS_SIGRETURN                = 417 // { int sigreturn( \
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext( \
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, \
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
-	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
deleted file mode 100644
index 57a60ea126..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// mksysnum_freebsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,freebsd
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT                   = 30  // { int accept(int s, \
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_PIPE                     = 42  // { int pipe(void); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
-	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, \
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
-	SYS_GETFH                    = 161 // { int getfh(char *fname, \
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
-	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_KEVENT                   = 363 // { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
-	SYS_STATFS                   = 396 // { int statfs(char *path, \
-	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
-	SYS_SIGRETURN                = 417 // { int sigreturn( \
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext( \
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, \
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
-	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
deleted file mode 100644
index 206b9f612d..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// mksysnum_freebsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm,freebsd
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT                   = 30  // { int accept(int s, \
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_PIPE                     = 42  // { int pipe(void); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
-	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, \
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
-	SYS_GETFH                    = 161 // { int getfh(char *fname, \
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
-	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_KEVENT                   = 363 // { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
-	SYS_STATFS                   = 396 // { int statfs(char *path, \
-	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
-	SYS_SIGRETURN                = 417 // { int sigreturn( \
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext( \
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, \
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
-	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go
deleted file mode 100644
index ba952c6754..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_386.go
+++ /dev/null
@@ -1,355 +0,0 @@
-// mksysnum_linux.pl /usr/include/asm/unistd_32.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build 386,linux
-
-package unix
-
-const (
-	SYS_RESTART_SYSCALL        = 0
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_WAITPID                = 7
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_TIME                   = 13
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LCHOWN                 = 16
-	SYS_BREAK                  = 17
-	SYS_OLDSTAT                = 18
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_UMOUNT                 = 22
-	SYS_SETUID                 = 23
-	SYS_GETUID                 = 24
-	SYS_STIME                  = 25
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_OLDFSTAT               = 28
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_STTY                   = 31
-	SYS_GTTY                   = 32
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_FTIME                  = 35
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_PROF                   = 44
-	SYS_BRK                    = 45
-	SYS_SETGID                 = 46
-	SYS_GETGID                 = 47
-	SYS_SIGNAL                 = 48
-	SYS_GETEUID                = 49
-	SYS_GETEGID                = 50
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_LOCK                   = 53
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_MPX                    = 56
-	SYS_SETPGID                = 57
-	SYS_ULIMIT                 = 58
-	SYS_OLDOLDUNAME            = 59
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SGETMASK               = 68
-	SYS_SSETMASK               = 69
-	SYS_SETREUID               = 70
-	SYS_SETREGID               = 71
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRLIMIT              = 76
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_GETGROUPS              = 80
-	SYS_SETGROUPS              = 81
-	SYS_SELECT                 = 82
-	SYS_SYMLINK                = 83
-	SYS_OLDLSTAT               = 84
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_READDIR                = 89
-	SYS_MMAP                   = 90
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_FCHOWN                 = 95
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_PROFIL                 = 98
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_IOPERM                 = 101
-	SYS_SOCKETCALL             = 102
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_OLDUNAME               = 109
-	SYS_IOPL                   = 110
-	SYS_VHANGUP                = 111
-	SYS_IDLE                   = 112
-	SYS_VM86OLD                = 113
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_IPC                    = 117
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_MODIFY_LDT             = 123
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_CREATE_MODULE          = 127
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_GET_KERNEL_SYMS        = 130
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_AFS_SYSCALL            = 137
-	SYS_SETFSUID               = 138
-	SYS_SETFSGID               = 139
-	SYS__LLSEEK                = 140
-	SYS_GETDENTS               = 141
-	SYS__NEWSELECT             = 142
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_SETRESUID              = 164
-	SYS_GETRESUID              = 165
-	SYS_VM86                   = 166
-	SYS_QUERY_MODULE           = 167
-	SYS_POLL                   = 168
-	SYS_NFSSERVCTL             = 169
-	SYS_SETRESGID              = 170
-	SYS_GETRESGID              = 171
-	SYS_PRCTL                  = 172
-	SYS_RT_SIGRETURN           = 173
-	SYS_RT_SIGACTION           = 174
-	SYS_RT_SIGPROCMASK         = 175
-	SYS_RT_SIGPENDING          = 176
-	SYS_RT_SIGTIMEDWAIT        = 177
-	SYS_RT_SIGQUEUEINFO        = 178
-	SYS_RT_SIGSUSPEND          = 179
-	SYS_PREAD64                = 180
-	SYS_PWRITE64               = 181
-	SYS_CHOWN                  = 182
-	SYS_GETCWD                 = 183
-	SYS_CAPGET                 = 184
-	SYS_CAPSET                 = 185
-	SYS_SIGALTSTACK            = 186
-	SYS_SENDFILE               = 187
-	SYS_GETPMSG                = 188
-	SYS_PUTPMSG                = 189
-	SYS_VFORK                  = 190
-	SYS_UGETRLIMIT             = 191
-	SYS_MMAP2                  = 192
-	SYS_TRUNCATE64             = 193
-	SYS_FTRUNCATE64            = 194
-	SYS_STAT64                 = 195
-	SYS_LSTAT64                = 196
-	SYS_FSTAT64                = 197
-	SYS_LCHOWN32               = 198
-	SYS_GETUID32               = 199
-	SYS_GETGID32               = 200
-	SYS_GETEUID32              = 201
-	SYS_GETEGID32              = 202
-	SYS_SETREUID32             = 203
-	SYS_SETREGID32             = 204
-	SYS_GETGROUPS32            = 205
-	SYS_SETGROUPS32            = 206
-	SYS_FCHOWN32               = 207
-	SYS_SETRESUID32            = 208
-	SYS_GETRESUID32            = 209
-	SYS_SETRESGID32            = 210
-	SYS_GETRESGID32            = 211
-	SYS_CHOWN32                = 212
-	SYS_SETUID32               = 213
-	SYS_SETGID32               = 214
-	SYS_SETFSUID32             = 215
-	SYS_SETFSGID32             = 216
-	SYS_PIVOT_ROOT             = 217
-	SYS_MINCORE                = 218
-	SYS_MADVISE                = 219
-	SYS_MADVISE1               = 219
-	SYS_GETDENTS64             = 220
-	SYS_FCNTL64                = 221
-	SYS_GETTID                 = 224
-	SYS_READAHEAD              = 225
-	SYS_SETXATTR               = 226
-	SYS_LSETXATTR              = 227
-	SYS_FSETXATTR              = 228
-	SYS_GETXATTR               = 229
-	SYS_LGETXATTR              = 230
-	SYS_FGETXATTR              = 231
-	SYS_LISTXATTR              = 232
-	SYS_LLISTXATTR             = 233
-	SYS_FLISTXATTR             = 234
-	SYS_REMOVEXATTR            = 235
-	SYS_LREMOVEXATTR           = 236
-	SYS_FREMOVEXATTR           = 237
-	SYS_TKILL                  = 238
-	SYS_SENDFILE64             = 239
-	SYS_FUTEX                  = 240
-	SYS_SCHED_SETAFFINITY      = 241
-	SYS_SCHED_GETAFFINITY      = 242
-	SYS_SET_THREAD_AREA        = 243
-	SYS_GET_THREAD_AREA        = 244
-	SYS_IO_SETUP               = 245
-	SYS_IO_DESTROY             = 246
-	SYS_IO_GETEVENTS           = 247
-	SYS_IO_SUBMIT              = 248
-	SYS_IO_CANCEL              = 249
-	SYS_FADVISE64              = 250
-	SYS_EXIT_GROUP             = 252
-	SYS_LOOKUP_DCOOKIE         = 253
-	SYS_EPOLL_CREATE           = 254
-	SYS_EPOLL_CTL              = 255
-	SYS_EPOLL_WAIT             = 256
-	SYS_REMAP_FILE_PAGES       = 257
-	SYS_SET_TID_ADDRESS        = 258
-	SYS_TIMER_CREATE           = 259
-	SYS_TIMER_SETTIME          = 260
-	SYS_TIMER_GETTIME          = 261
-	SYS_TIMER_GETOVERRUN       = 262
-	SYS_TIMER_DELETE           = 263
-	SYS_CLOCK_SETTIME          = 264
-	SYS_CLOCK_GETTIME          = 265
-	SYS_CLOCK_GETRES           = 266
-	SYS_CLOCK_NANOSLEEP        = 267
-	SYS_STATFS64               = 268
-	SYS_FSTATFS64              = 269
-	SYS_TGKILL                 = 270
-	SYS_UTIMES                 = 271
-	SYS_FADVISE64_64           = 272
-	SYS_VSERVER                = 273
-	SYS_MBIND                  = 274
-	SYS_GET_MEMPOLICY          = 275
-	SYS_SET_MEMPOLICY          = 276
-	SYS_MQ_OPEN                = 277
-	SYS_MQ_UNLINK              = 278
-	SYS_MQ_TIMEDSEND           = 279
-	SYS_MQ_TIMEDRECEIVE        = 280
-	SYS_MQ_NOTIFY              = 281
-	SYS_MQ_GETSETATTR          = 282
-	SYS_KEXEC_LOAD             = 283
-	SYS_WAITID                 = 284
-	SYS_ADD_KEY                = 286
-	SYS_REQUEST_KEY            = 287
-	SYS_KEYCTL                 = 288
-	SYS_IOPRIO_SET             = 289
-	SYS_IOPRIO_GET             = 290
-	SYS_INOTIFY_INIT           = 291
-	SYS_INOTIFY_ADD_WATCH      = 292
-	SYS_INOTIFY_RM_WATCH       = 293
-	SYS_MIGRATE_PAGES          = 294
-	SYS_OPENAT                 = 295
-	SYS_MKDIRAT                = 296
-	SYS_MKNODAT                = 297
-	SYS_FCHOWNAT               = 298
-	SYS_FUTIMESAT              = 299
-	SYS_FSTATAT64              = 300
-	SYS_UNLINKAT               = 301
-	SYS_RENAMEAT               = 302
-	SYS_LINKAT                 = 303
-	SYS_SYMLINKAT              = 304
-	SYS_READLINKAT             = 305
-	SYS_FCHMODAT               = 306
-	SYS_FACCESSAT              = 307
-	SYS_PSELECT6               = 308
-	SYS_PPOLL                  = 309
-	SYS_UNSHARE                = 310
-	SYS_SET_ROBUST_LIST        = 311
-	SYS_GET_ROBUST_LIST        = 312
-	SYS_SPLICE                 = 313
-	SYS_SYNC_FILE_RANGE        = 314
-	SYS_TEE                    = 315
-	SYS_VMSPLICE               = 316
-	SYS_MOVE_PAGES             = 317
-	SYS_GETCPU                 = 318
-	SYS_EPOLL_PWAIT            = 319
-	SYS_UTIMENSAT              = 320
-	SYS_SIGNALFD               = 321
-	SYS_TIMERFD_CREATE         = 322
-	SYS_EVENTFD                = 323
-	SYS_FALLOCATE              = 324
-	SYS_TIMERFD_SETTIME        = 325
-	SYS_TIMERFD_GETTIME        = 326
-	SYS_SIGNALFD4              = 327
-	SYS_EVENTFD2               = 328
-	SYS_EPOLL_CREATE1          = 329
-	SYS_DUP3                   = 330
-	SYS_PIPE2                  = 331
-	SYS_INOTIFY_INIT1          = 332
-	SYS_PREADV                 = 333
-	SYS_PWRITEV                = 334
-	SYS_RT_TGSIGQUEUEINFO      = 335
-	SYS_PERF_EVENT_OPEN        = 336
-	SYS_RECVMMSG               = 337
-	SYS_FANOTIFY_INIT          = 338
-	SYS_FANOTIFY_MARK          = 339
-	SYS_PRLIMIT64              = 340
-	SYS_NAME_TO_HANDLE_AT      = 341
-	SYS_OPEN_BY_HANDLE_AT      = 342
-	SYS_CLOCK_ADJTIME          = 343
-	SYS_SYNCFS                 = 344
-	SYS_SENDMMSG               = 345
-	SYS_SETNS                  = 346
-	SYS_PROCESS_VM_READV       = 347
-	SYS_PROCESS_VM_WRITEV      = 348
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go
deleted file mode 100644
index ddac31f58a..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_amd64.go
+++ /dev/null
@@ -1,321 +0,0 @@
-// mksysnum_linux.pl /usr/include/asm/unistd_64.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,linux
-
-package unix
-
-const (
-	SYS_READ                   = 0
-	SYS_WRITE                  = 1
-	SYS_OPEN                   = 2
-	SYS_CLOSE                  = 3
-	SYS_STAT                   = 4
-	SYS_FSTAT                  = 5
-	SYS_LSTAT                  = 6
-	SYS_POLL                   = 7
-	SYS_LSEEK                  = 8
-	SYS_MMAP                   = 9
-	SYS_MPROTECT               = 10
-	SYS_MUNMAP                 = 11
-	SYS_BRK                    = 12
-	SYS_RT_SIGACTION           = 13
-	SYS_RT_SIGPROCMASK         = 14
-	SYS_RT_SIGRETURN           = 15
-	SYS_IOCTL                  = 16
-	SYS_PREAD64                = 17
-	SYS_PWRITE64               = 18
-	SYS_READV                  = 19
-	SYS_WRITEV                 = 20
-	SYS_ACCESS                 = 21
-	SYS_PIPE                   = 22
-	SYS_SELECT                 = 23
-	SYS_SCHED_YIELD            = 24
-	SYS_MREMAP                 = 25
-	SYS_MSYNC                  = 26
-	SYS_MINCORE                = 27
-	SYS_MADVISE                = 28
-	SYS_SHMGET                 = 29
-	SYS_SHMAT                  = 30
-	SYS_SHMCTL                 = 31
-	SYS_DUP                    = 32
-	SYS_DUP2                   = 33
-	SYS_PAUSE                  = 34
-	SYS_NANOSLEEP              = 35
-	SYS_GETITIMER              = 36
-	SYS_ALARM                  = 37
-	SYS_SETITIMER              = 38
-	SYS_GETPID                 = 39
-	SYS_SENDFILE               = 40
-	SYS_SOCKET                 = 41
-	SYS_CONNECT                = 42
-	SYS_ACCEPT                 = 43
-	SYS_SENDTO                 = 44
-	SYS_RECVFROM               = 45
-	SYS_SENDMSG                = 46
-	SYS_RECVMSG                = 47
-	SYS_SHUTDOWN               = 48
-	SYS_BIND                   = 49
-	SYS_LISTEN                 = 50
-	SYS_GETSOCKNAME            = 51
-	SYS_GETPEERNAME            = 52
-	SYS_SOCKETPAIR             = 53
-	SYS_SETSOCKOPT             = 54
-	SYS_GETSOCKOPT             = 55
-	SYS_CLONE                  = 56
-	SYS_FORK                   = 57
-	SYS_VFORK                  = 58
-	SYS_EXECVE                 = 59
-	SYS_EXIT                   = 60
-	SYS_WAIT4                  = 61
-	SYS_KILL                   = 62
-	SYS_UNAME                  = 63
-	SYS_SEMGET                 = 64
-	SYS_SEMOP                  = 65
-	SYS_SEMCTL                 = 66
-	SYS_SHMDT                  = 67
-	SYS_MSGGET                 = 68
-	SYS_MSGSND                 = 69
-	SYS_MSGRCV                 = 70
-	SYS_MSGCTL                 = 71
-	SYS_FCNTL                  = 72
-	SYS_FLOCK                  = 73
-	SYS_FSYNC                  = 74
-	SYS_FDATASYNC              = 75
-	SYS_TRUNCATE               = 76
-	SYS_FTRUNCATE              = 77
-	SYS_GETDENTS               = 78
-	SYS_GETCWD                 = 79
-	SYS_CHDIR                  = 80
-	SYS_FCHDIR                 = 81
-	SYS_RENAME                 = 82
-	SYS_MKDIR                  = 83
-	SYS_RMDIR                  = 84
-	SYS_CREAT                  = 85
-	SYS_LINK                   = 86
-	SYS_UNLINK                 = 87
-	SYS_SYMLINK                = 88
-	SYS_READLINK               = 89
-	SYS_CHMOD                  = 90
-	SYS_FCHMOD                 = 91
-	SYS_CHOWN                  = 92
-	SYS_FCHOWN                 = 93
-	SYS_LCHOWN                 = 94
-	SYS_UMASK                  = 95
-	SYS_GETTIMEOFDAY           = 96
-	SYS_GETRLIMIT              = 97
-	SYS_GETRUSAGE              = 98
-	SYS_SYSINFO                = 99
-	SYS_TIMES                  = 100
-	SYS_PTRACE                 = 101
-	SYS_GETUID                 = 102
-	SYS_SYSLOG                 = 103
-	SYS_GETGID                 = 104
-	SYS_SETUID                 = 105
-	SYS_SETGID                 = 106
-	SYS_GETEUID                = 107
-	SYS_GETEGID                = 108
-	SYS_SETPGID                = 109
-	SYS_GETPPID                = 110
-	SYS_GETPGRP                = 111
-	SYS_SETSID                 = 112
-	SYS_SETREUID               = 113
-	SYS_SETREGID               = 114
-	SYS_GETGROUPS              = 115
-	SYS_SETGROUPS              = 116
-	SYS_SETRESUID              = 117
-	SYS_GETRESUID              = 118
-	SYS_SETRESGID              = 119
-	SYS_GETRESGID              = 120
-	SYS_GETPGID                = 121
-	SYS_SETFSUID               = 122
-	SYS_SETFSGID               = 123
-	SYS_GETSID                 = 124
-	SYS_CAPGET                 = 125
-	SYS_CAPSET                 = 126
-	SYS_RT_SIGPENDING          = 127
-	SYS_RT_SIGTIMEDWAIT        = 128
-	SYS_RT_SIGQUEUEINFO        = 129
-	SYS_RT_SIGSUSPEND          = 130
-	SYS_SIGALTSTACK            = 131
-	SYS_UTIME                  = 132
-	SYS_MKNOD                  = 133
-	SYS_USELIB                 = 134
-	SYS_PERSONALITY            = 135
-	SYS_USTAT                  = 136
-	SYS_STATFS                 = 137
-	SYS_FSTATFS                = 138
-	SYS_SYSFS                  = 139
-	SYS_GETPRIORITY            = 140
-	SYS_SETPRIORITY            = 141
-	SYS_SCHED_SETPARAM         = 142
-	SYS_SCHED_GETPARAM         = 143
-	SYS_SCHED_SETSCHEDULER     = 144
-	SYS_SCHED_GETSCHEDULER     = 145
-	SYS_SCHED_GET_PRIORITY_MAX = 146
-	SYS_SCHED_GET_PRIORITY_MIN = 147
-	SYS_SCHED_RR_GET_INTERVAL  = 148
-	SYS_MLOCK                  = 149
-	SYS_MUNLOCK                = 150
-	SYS_MLOCKALL               = 151
-	SYS_MUNLOCKALL             = 152
-	SYS_VHANGUP                = 153
-	SYS_MODIFY_LDT             = 154
-	SYS_PIVOT_ROOT             = 155
-	SYS__SYSCTL                = 156
-	SYS_PRCTL                  = 157
-	SYS_ARCH_PRCTL             = 158
-	SYS_ADJTIMEX               = 159
-	SYS_SETRLIMIT              = 160
-	SYS_CHROOT                 = 161
-	SYS_SYNC                   = 162
-	SYS_ACCT                   = 163
-	SYS_SETTIMEOFDAY           = 164
-	SYS_MOUNT                  = 165
-	SYS_UMOUNT2                = 166
-	SYS_SWAPON                 = 167
-	SYS_SWAPOFF                = 168
-	SYS_REBOOT                 = 169
-	SYS_SETHOSTNAME            = 170
-	SYS_SETDOMAINNAME          = 171
-	SYS_IOPL                   = 172
-	SYS_IOPERM                 = 173
-	SYS_CREATE_MODULE          = 174
-	SYS_INIT_MODULE            = 175
-	SYS_DELETE_MODULE          = 176
-	SYS_GET_KERNEL_SYMS        = 177
-	SYS_QUERY_MODULE           = 178
-	SYS_QUOTACTL               = 179
-	SYS_NFSSERVCTL             = 180
-	SYS_GETPMSG                = 181
-	SYS_PUTPMSG                = 182
-	SYS_AFS_SYSCALL            = 183
-	SYS_TUXCALL                = 184
-	SYS_SECURITY               = 185
-	SYS_GETTID                 = 186
-	SYS_READAHEAD              = 187
-	SYS_SETXATTR               = 188
-	SYS_LSETXATTR              = 189
-	SYS_FSETXATTR              = 190
-	SYS_GETXATTR               = 191
-	SYS_LGETXATTR              = 192
-	SYS_FGETXATTR              = 193
-	SYS_LISTXATTR              = 194
-	SYS_LLISTXATTR             = 195
-	SYS_FLISTXATTR             = 196
-	SYS_REMOVEXATTR            = 197
-	SYS_LREMOVEXATTR           = 198
-	SYS_FREMOVEXATTR           = 199
-	SYS_TKILL                  = 200
-	SYS_TIME                   = 201
-	SYS_FUTEX                  = 202
-	SYS_SCHED_SETAFFINITY      = 203
-	SYS_SCHED_GETAFFINITY      = 204
-	SYS_SET_THREAD_AREA        = 205
-	SYS_IO_SETUP               = 206
-	SYS_IO_DESTROY             = 207
-	SYS_IO_GETEVENTS           = 208
-	SYS_IO_SUBMIT              = 209
-	SYS_IO_CANCEL              = 210
-	SYS_GET_THREAD_AREA        = 211
-	SYS_LOOKUP_DCOOKIE         = 212
-	SYS_EPOLL_CREATE           = 213
-	SYS_EPOLL_CTL_OLD          = 214
-	SYS_EPOLL_WAIT_OLD         = 215
-	SYS_REMAP_FILE_PAGES       = 216
-	SYS_GETDENTS64             = 217
-	SYS_SET_TID_ADDRESS        = 218
-	SYS_RESTART_SYSCALL        = 219
-	SYS_SEMTIMEDOP             = 220
-	SYS_FADVISE64              = 221
-	SYS_TIMER_CREATE           = 222
-	SYS_TIMER_SETTIME          = 223
-	SYS_TIMER_GETTIME          = 224
-	SYS_TIMER_GETOVERRUN       = 225
-	SYS_TIMER_DELETE           = 226
-	SYS_CLOCK_SETTIME          = 227
-	SYS_CLOCK_GETTIME          = 228
-	SYS_CLOCK_GETRES           = 229
-	SYS_CLOCK_NANOSLEEP        = 230
-	SYS_EXIT_GROUP             = 231
-	SYS_EPOLL_WAIT             = 232
-	SYS_EPOLL_CTL              = 233
-	SYS_TGKILL                 = 234
-	SYS_UTIMES                 = 235
-	SYS_VSERVER                = 236
-	SYS_MBIND                  = 237
-	SYS_SET_MEMPOLICY          = 238
-	SYS_GET_MEMPOLICY          = 239
-	SYS_MQ_OPEN                = 240
-	SYS_MQ_UNLINK              = 241
-	SYS_MQ_TIMEDSEND           = 242
-	SYS_MQ_TIMEDRECEIVE        = 243
-	SYS_MQ_NOTIFY              = 244
-	SYS_MQ_GETSETATTR          = 245
-	SYS_KEXEC_LOAD             = 246
-	SYS_WAITID                 = 247
-	SYS_ADD_KEY                = 248
-	SYS_REQUEST_KEY            = 249
-	SYS_KEYCTL                 = 250
-	SYS_IOPRIO_SET             = 251
-	SYS_IOPRIO_GET             = 252
-	SYS_INOTIFY_INIT           = 253
-	SYS_INOTIFY_ADD_WATCH      = 254
-	SYS_INOTIFY_RM_WATCH       = 255
-	SYS_MIGRATE_PAGES          = 256
-	SYS_OPENAT                 = 257
-	SYS_MKDIRAT                = 258
-	SYS_MKNODAT                = 259
-	SYS_FCHOWNAT               = 260
-	SYS_FUTIMESAT              = 261
-	SYS_NEWFSTATAT             = 262
-	SYS_UNLINKAT               = 263
-	SYS_RENAMEAT               = 264
-	SYS_LINKAT                 = 265
-	SYS_SYMLINKAT              = 266
-	SYS_READLINKAT             = 267
-	SYS_FCHMODAT               = 268
-	SYS_FACCESSAT              = 269
-	SYS_PSELECT6               = 270
-	SYS_PPOLL                  = 271
-	SYS_UNSHARE                = 272
-	SYS_SET_ROBUST_LIST        = 273
-	SYS_GET_ROBUST_LIST        = 274
-	SYS_SPLICE                 = 275
-	SYS_TEE                    = 276
-	SYS_SYNC_FILE_RANGE        = 277
-	SYS_VMSPLICE               = 278
-	SYS_MOVE_PAGES             = 279
-	SYS_UTIMENSAT              = 280
-	SYS_EPOLL_PWAIT            = 281
-	SYS_SIGNALFD               = 282
-	SYS_TIMERFD_CREATE         = 283
-	SYS_EVENTFD                = 284
-	SYS_FALLOCATE              = 285
-	SYS_TIMERFD_SETTIME        = 286
-	SYS_TIMERFD_GETTIME        = 287
-	SYS_ACCEPT4                = 288
-	SYS_SIGNALFD4              = 289
-	SYS_EVENTFD2               = 290
-	SYS_EPOLL_CREATE1          = 291
-	SYS_DUP3                   = 292
-	SYS_PIPE2                  = 293
-	SYS_INOTIFY_INIT1          = 294
-	SYS_PREADV                 = 295
-	SYS_PWRITEV                = 296
-	SYS_RT_TGSIGQUEUEINFO      = 297
-	SYS_PERF_EVENT_OPEN        = 298
-	SYS_RECVMMSG               = 299
-	SYS_FANOTIFY_INIT          = 300
-	SYS_FANOTIFY_MARK          = 301
-	SYS_PRLIMIT64              = 302
-	SYS_NAME_TO_HANDLE_AT      = 303
-	SYS_OPEN_BY_HANDLE_AT      = 304
-	SYS_CLOCK_ADJTIME          = 305
-	SYS_SYNCFS                 = 306
-	SYS_SENDMMSG               = 307
-	SYS_SETNS                  = 308
-	SYS_GETCPU                 = 309
-	SYS_PROCESS_VM_READV       = 310
-	SYS_PROCESS_VM_WRITEV      = 311
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go
deleted file mode 100644
index 45ced17fc4..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm.go
+++ /dev/null
@@ -1,356 +0,0 @@
-// mksysnum_linux.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm,linux
-
-package unix
-
-const (
-	SYS_OABI_SYSCALL_BASE      = 0
-	SYS_SYSCALL_BASE           = 0
-	SYS_RESTART_SYSCALL        = 0
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_TIME                   = 13
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LCHOWN                 = 16
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_UMOUNT                 = 22
-	SYS_SETUID                 = 23
-	SYS_GETUID                 = 24
-	SYS_STIME                  = 25
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_BRK                    = 45
-	SYS_SETGID                 = 46
-	SYS_GETGID                 = 47
-	SYS_GETEUID                = 49
-	SYS_GETEGID                = 50
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_SETPGID                = 57
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SETREUID               = 70
-	SYS_SETREGID               = 71
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRLIMIT              = 76
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_GETGROUPS              = 80
-	SYS_SETGROUPS              = 81
-	SYS_SELECT                 = 82
-	SYS_SYMLINK                = 83
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_READDIR                = 89
-	SYS_MMAP                   = 90
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_FCHOWN                 = 95
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_SOCKETCALL             = 102
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_VHANGUP                = 111
-	SYS_SYSCALL                = 113
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_IPC                    = 117
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_SETFSUID               = 138
-	SYS_SETFSGID               = 139
-	SYS__LLSEEK                = 140
-	SYS_GETDENTS               = 141
-	SYS__NEWSELECT             = 142
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_SETRESUID              = 164
-	SYS_GETRESUID              = 165
-	SYS_POLL                   = 168
-	SYS_NFSSERVCTL             = 169
-	SYS_SETRESGID              = 170
-	SYS_GETRESGID              = 171
-	SYS_PRCTL                  = 172
-	SYS_RT_SIGRETURN           = 173
-	SYS_RT_SIGACTION           = 174
-	SYS_RT_SIGPROCMASK         = 175
-	SYS_RT_SIGPENDING          = 176
-	SYS_RT_SIGTIMEDWAIT        = 177
-	SYS_RT_SIGQUEUEINFO        = 178
-	SYS_RT_SIGSUSPEND          = 179
-	SYS_PREAD64                = 180
-	SYS_PWRITE64               = 181
-	SYS_CHOWN                  = 182
-	SYS_GETCWD                 = 183
-	SYS_CAPGET                 = 184
-	SYS_CAPSET                 = 185
-	SYS_SIGALTSTACK            = 186
-	SYS_SENDFILE               = 187
-	SYS_VFORK                  = 190
-	SYS_UGETRLIMIT             = 191
-	SYS_MMAP2                  = 192
-	SYS_TRUNCATE64             = 193
-	SYS_FTRUNCATE64            = 194
-	SYS_STAT64                 = 195
-	SYS_LSTAT64                = 196
-	SYS_FSTAT64                = 197
-	SYS_LCHOWN32               = 198
-	SYS_GETUID32               = 199
-	SYS_GETGID32               = 200
-	SYS_GETEUID32              = 201
-	SYS_GETEGID32              = 202
-	SYS_SETREUID32             = 203
-	SYS_SETREGID32             = 204
-	SYS_GETGROUPS32            = 205
-	SYS_SETGROUPS32            = 206
-	SYS_FCHOWN32               = 207
-	SYS_SETRESUID32            = 208
-	SYS_GETRESUID32            = 209
-	SYS_SETRESGID32            = 210
-	SYS_GETRESGID32            = 211
-	SYS_CHOWN32                = 212
-	SYS_SETUID32               = 213
-	SYS_SETGID32               = 214
-	SYS_SETFSUID32             = 215
-	SYS_SETFSGID32             = 216
-	SYS_GETDENTS64             = 217
-	SYS_PIVOT_ROOT             = 218
-	SYS_MINCORE                = 219
-	SYS_MADVISE                = 220
-	SYS_FCNTL64                = 221
-	SYS_GETTID                 = 224
-	SYS_READAHEAD              = 225
-	SYS_SETXATTR               = 226
-	SYS_LSETXATTR              = 227
-	SYS_FSETXATTR              = 228
-	SYS_GETXATTR               = 229
-	SYS_LGETXATTR              = 230
-	SYS_FGETXATTR              = 231
-	SYS_LISTXATTR              = 232
-	SYS_LLISTXATTR             = 233
-	SYS_FLISTXATTR             = 234
-	SYS_REMOVEXATTR            = 235
-	SYS_LREMOVEXATTR           = 236
-	SYS_FREMOVEXATTR           = 237
-	SYS_TKILL                  = 238
-	SYS_SENDFILE64             = 239
-	SYS_FUTEX                  = 240
-	SYS_SCHED_SETAFFINITY      = 241
-	SYS_SCHED_GETAFFINITY      = 242
-	SYS_IO_SETUP               = 243
-	SYS_IO_DESTROY             = 244
-	SYS_IO_GETEVENTS           = 245
-	SYS_IO_SUBMIT              = 246
-	SYS_IO_CANCEL              = 247
-	SYS_EXIT_GROUP             = 248
-	SYS_LOOKUP_DCOOKIE         = 249
-	SYS_EPOLL_CREATE           = 250
-	SYS_EPOLL_CTL              = 251
-	SYS_EPOLL_WAIT             = 252
-	SYS_REMAP_FILE_PAGES       = 253
-	SYS_SET_TID_ADDRESS        = 256
-	SYS_TIMER_CREATE           = 257
-	SYS_TIMER_SETTIME          = 258
-	SYS_TIMER_GETTIME          = 259
-	SYS_TIMER_GETOVERRUN       = 260
-	SYS_TIMER_DELETE           = 261
-	SYS_CLOCK_SETTIME          = 262
-	SYS_CLOCK_GETTIME          = 263
-	SYS_CLOCK_GETRES           = 264
-	SYS_CLOCK_NANOSLEEP        = 265
-	SYS_STATFS64               = 266
-	SYS_FSTATFS64              = 267
-	SYS_TGKILL                 = 268
-	SYS_UTIMES                 = 269
-	SYS_ARM_FADVISE64_64       = 270
-	SYS_PCICONFIG_IOBASE       = 271
-	SYS_PCICONFIG_READ         = 272
-	SYS_PCICONFIG_WRITE        = 273
-	SYS_MQ_OPEN                = 274
-	SYS_MQ_UNLINK              = 275
-	SYS_MQ_TIMEDSEND           = 276
-	SYS_MQ_TIMEDRECEIVE        = 277
-	SYS_MQ_NOTIFY              = 278
-	SYS_MQ_GETSETATTR          = 279
-	SYS_WAITID                 = 280
-	SYS_SOCKET                 = 281
-	SYS_BIND                   = 282
-	SYS_CONNECT                = 283
-	SYS_LISTEN                 = 284
-	SYS_ACCEPT                 = 285
-	SYS_GETSOCKNAME            = 286
-	SYS_GETPEERNAME            = 287
-	SYS_SOCKETPAIR             = 288
-	SYS_SEND                   = 289
-	SYS_SENDTO                 = 290
-	SYS_RECV                   = 291
-	SYS_RECVFROM               = 292
-	SYS_SHUTDOWN               = 293
-	SYS_SETSOCKOPT             = 294
-	SYS_GETSOCKOPT             = 295
-	SYS_SENDMSG                = 296
-	SYS_RECVMSG                = 297
-	SYS_SEMOP                  = 298
-	SYS_SEMGET                 = 299
-	SYS_SEMCTL                 = 300
-	SYS_MSGSND                 = 301
-	SYS_MSGRCV                 = 302
-	SYS_MSGGET                 = 303
-	SYS_MSGCTL                 = 304
-	SYS_SHMAT                  = 305
-	SYS_SHMDT                  = 306
-	SYS_SHMGET                 = 307
-	SYS_SHMCTL                 = 308
-	SYS_ADD_KEY                = 309
-	SYS_REQUEST_KEY            = 310
-	SYS_KEYCTL                 = 311
-	SYS_SEMTIMEDOP             = 312
-	SYS_VSERVER                = 313
-	SYS_IOPRIO_SET             = 314
-	SYS_IOPRIO_GET             = 315
-	SYS_INOTIFY_INIT           = 316
-	SYS_INOTIFY_ADD_WATCH      = 317
-	SYS_INOTIFY_RM_WATCH       = 318
-	SYS_MBIND                  = 319
-	SYS_GET_MEMPOLICY          = 320
-	SYS_SET_MEMPOLICY          = 321
-	SYS_OPENAT                 = 322
-	SYS_MKDIRAT                = 323
-	SYS_MKNODAT                = 324
-	SYS_FCHOWNAT               = 325
-	SYS_FUTIMESAT              = 326
-	SYS_FSTATAT64              = 327
-	SYS_UNLINKAT               = 328
-	SYS_RENAMEAT               = 329
-	SYS_LINKAT                 = 330
-	SYS_SYMLINKAT              = 331
-	SYS_READLINKAT             = 332
-	SYS_FCHMODAT               = 333
-	SYS_FACCESSAT              = 334
-	SYS_PSELECT6               = 335
-	SYS_PPOLL                  = 336
-	SYS_UNSHARE                = 337
-	SYS_SET_ROBUST_LIST        = 338
-	SYS_GET_ROBUST_LIST        = 339
-	SYS_SPLICE                 = 340
-	SYS_ARM_SYNC_FILE_RANGE    = 341
-	SYS_TEE                    = 342
-	SYS_VMSPLICE               = 343
-	SYS_MOVE_PAGES             = 344
-	SYS_GETCPU                 = 345
-	SYS_EPOLL_PWAIT            = 346
-	SYS_KEXEC_LOAD             = 347
-	SYS_UTIMENSAT              = 348
-	SYS_SIGNALFD               = 349
-	SYS_TIMERFD_CREATE         = 350
-	SYS_EVENTFD                = 351
-	SYS_FALLOCATE              = 352
-	SYS_TIMERFD_SETTIME        = 353
-	SYS_TIMERFD_GETTIME        = 354
-	SYS_SIGNALFD4              = 355
-	SYS_EVENTFD2               = 356
-	SYS_EPOLL_CREATE1          = 357
-	SYS_DUP3                   = 358
-	SYS_PIPE2                  = 359
-	SYS_INOTIFY_INIT1          = 360
-	SYS_PREADV                 = 361
-	SYS_PWRITEV                = 362
-	SYS_RT_TGSIGQUEUEINFO      = 363
-	SYS_PERF_EVENT_OPEN        = 364
-	SYS_RECVMMSG               = 365
-	SYS_ACCEPT4                = 366
-	SYS_FANOTIFY_INIT          = 367
-	SYS_FANOTIFY_MARK          = 368
-	SYS_PRLIMIT64              = 369
-	SYS_NAME_TO_HANDLE_AT      = 370
-	SYS_OPEN_BY_HANDLE_AT      = 371
-	SYS_CLOCK_ADJTIME          = 372
-	SYS_SYNCFS                 = 373
-	SYS_SENDMMSG               = 374
-	SYS_SETNS                  = 375
-	SYS_PROCESS_VM_READV       = 376
-	SYS_PROCESS_VM_WRITEV      = 377
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go
deleted file mode 100644
index 2e9514f280..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_arm64.go
+++ /dev/null
@@ -1,272 +0,0 @@
-// mksysnum_linux.pl /usr/include/asm-generic/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm64,linux
-
-package unix
-
-const (
-	SYS_IO_SETUP               = 0
-	SYS_IO_DESTROY             = 1
-	SYS_IO_SUBMIT              = 2
-	SYS_IO_CANCEL              = 3
-	SYS_IO_GETEVENTS           = 4
-	SYS_SETXATTR               = 5
-	SYS_LSETXATTR              = 6
-	SYS_FSETXATTR              = 7
-	SYS_GETXATTR               = 8
-	SYS_LGETXATTR              = 9
-	SYS_FGETXATTR              = 10
-	SYS_LISTXATTR              = 11
-	SYS_LLISTXATTR             = 12
-	SYS_FLISTXATTR             = 13
-	SYS_REMOVEXATTR            = 14
-	SYS_LREMOVEXATTR           = 15
-	SYS_FREMOVEXATTR           = 16
-	SYS_GETCWD                 = 17
-	SYS_LOOKUP_DCOOKIE         = 18
-	SYS_EVENTFD2               = 19
-	SYS_EPOLL_CREATE1          = 20
-	SYS_EPOLL_CTL              = 21
-	SYS_EPOLL_PWAIT            = 22
-	SYS_DUP                    = 23
-	SYS_DUP3                   = 24
-	SYS_FCNTL                  = 25
-	SYS_INOTIFY_INIT1          = 26
-	SYS_INOTIFY_ADD_WATCH      = 27
-	SYS_INOTIFY_RM_WATCH       = 28
-	SYS_IOCTL                  = 29
-	SYS_IOPRIO_SET             = 30
-	SYS_IOPRIO_GET             = 31
-	SYS_FLOCK                  = 32
-	SYS_MKNODAT                = 33
-	SYS_MKDIRAT                = 34
-	SYS_UNLINKAT               = 35
-	SYS_SYMLINKAT              = 36
-	SYS_LINKAT                 = 37
-	SYS_RENAMEAT               = 38
-	SYS_UMOUNT2                = 39
-	SYS_MOUNT                  = 40
-	SYS_PIVOT_ROOT             = 41
-	SYS_NFSSERVCTL             = 42
-	SYS_STATFS                 = 43
-	SYS_FSTATFS                = 44
-	SYS_TRUNCATE               = 45
-	SYS_FTRUNCATE              = 46
-	SYS_FALLOCATE              = 47
-	SYS_FACCESSAT              = 48
-	SYS_CHDIR                  = 49
-	SYS_FCHDIR                 = 50
-	SYS_CHROOT                 = 51
-	SYS_FCHMOD                 = 52
-	SYS_FCHMODAT               = 53
-	SYS_FCHOWNAT               = 54
-	SYS_FCHOWN                 = 55
-	SYS_OPENAT                 = 56
-	SYS_CLOSE                  = 57
-	SYS_VHANGUP                = 58
-	SYS_PIPE2                  = 59
-	SYS_QUOTACTL               = 60
-	SYS_GETDENTS64             = 61
-	SYS_LSEEK                  = 62
-	SYS_READ                   = 63
-	SYS_WRITE                  = 64
-	SYS_READV                  = 65
-	SYS_WRITEV                 = 66
-	SYS_PREAD64                = 67
-	SYS_PWRITE64               = 68
-	SYS_PREADV                 = 69
-	SYS_PWRITEV                = 70
-	SYS_SENDFILE               = 71
-	SYS_PSELECT6               = 72
-	SYS_PPOLL                  = 73
-	SYS_SIGNALFD4              = 74
-	SYS_VMSPLICE               = 75
-	SYS_SPLICE                 = 76
-	SYS_TEE                    = 77
-	SYS_READLINKAT             = 78
-	SYS_FSTATAT                = 79
-	SYS_FSTAT                  = 80
-	SYS_SYNC                   = 81
-	SYS_FSYNC                  = 82
-	SYS_FDATASYNC              = 83
-	SYS_SYNC_FILE_RANGE        = 84
-	SYS_TIMERFD_CREATE         = 85
-	SYS_TIMERFD_SETTIME        = 86
-	SYS_TIMERFD_GETTIME        = 87
-	SYS_UTIMENSAT              = 88
-	SYS_ACCT                   = 89
-	SYS_CAPGET                 = 90
-	SYS_CAPSET                 = 91
-	SYS_PERSONALITY            = 92
-	SYS_EXIT                   = 93
-	SYS_EXIT_GROUP             = 94
-	SYS_WAITID                 = 95
-	SYS_SET_TID_ADDRESS        = 96
-	SYS_UNSHARE                = 97
-	SYS_FUTEX                  = 98
-	SYS_SET_ROBUST_LIST        = 99
-	SYS_GET_ROBUST_LIST        = 100
-	SYS_NANOSLEEP              = 101
-	SYS_GETITIMER              = 102
-	SYS_SETITIMER              = 103
-	SYS_KEXEC_LOAD             = 104
-	SYS_INIT_MODULE            = 105
-	SYS_DELETE_MODULE          = 106
-	SYS_TIMER_CREATE           = 107
-	SYS_TIMER_GETTIME          = 108
-	SYS_TIMER_GETOVERRUN       = 109
-	SYS_TIMER_SETTIME          = 110
-	SYS_TIMER_DELETE           = 111
-	SYS_CLOCK_SETTIME          = 112
-	SYS_CLOCK_GETTIME          = 113
-	SYS_CLOCK_GETRES           = 114
-	SYS_CLOCK_NANOSLEEP        = 115
-	SYS_SYSLOG                 = 116
-	SYS_PTRACE                 = 117
-	SYS_SCHED_SETPARAM         = 118
-	SYS_SCHED_SETSCHEDULER     = 119
-	SYS_SCHED_GETSCHEDULER     = 120
-	SYS_SCHED_GETPARAM         = 121
-	SYS_SCHED_SETAFFINITY      = 122
-	SYS_SCHED_GETAFFINITY      = 123
-	SYS_SCHED_YIELD            = 124
-	SYS_SCHED_GET_PRIORITY_MAX = 125
-	SYS_SCHED_GET_PRIORITY_MIN = 126
-	SYS_SCHED_RR_GET_INTERVAL  = 127
-	SYS_RESTART_SYSCALL        = 128
-	SYS_KILL                   = 129
-	SYS_TKILL                  = 130
-	SYS_TGKILL                 = 131
-	SYS_SIGALTSTACK            = 132
-	SYS_RT_SIGSUSPEND          = 133
-	SYS_RT_SIGACTION           = 134
-	SYS_RT_SIGPROCMASK         = 135
-	SYS_RT_SIGPENDING          = 136
-	SYS_RT_SIGTIMEDWAIT        = 137
-	SYS_RT_SIGQUEUEINFO        = 138
-	SYS_RT_SIGRETURN           = 139
-	SYS_SETPRIORITY            = 140
-	SYS_GETPRIORITY            = 141
-	SYS_REBOOT                 = 142
-	SYS_SETREGID               = 143
-	SYS_SETGID                 = 144
-	SYS_SETREUID               = 145
-	SYS_SETUID                 = 146
-	SYS_SETRESUID              = 147
-	SYS_GETRESUID              = 148
-	SYS_SETRESGID              = 149
-	SYS_GETRESGID              = 150
-	SYS_SETFSUID               = 151
-	SYS_SETFSGID               = 152
-	SYS_TIMES                  = 153
-	SYS_SETPGID                = 154
-	SYS_GETPGID                = 155
-	SYS_GETSID                 = 156
-	SYS_SETSID                 = 157
-	SYS_GETGROUPS              = 158
-	SYS_SETGROUPS              = 159
-	SYS_UNAME                  = 160
-	SYS_SETHOSTNAME            = 161
-	SYS_SETDOMAINNAME          = 162
-	SYS_GETRLIMIT              = 163
-	SYS_SETRLIMIT              = 164
-	SYS_GETRUSAGE              = 165
-	SYS_UMASK                  = 166
-	SYS_PRCTL                  = 167
-	SYS_GETCPU                 = 168
-	SYS_GETTIMEOFDAY           = 169
-	SYS_SETTIMEOFDAY           = 170
-	SYS_ADJTIMEX               = 171
-	SYS_GETPID                 = 172
-	SYS_GETPPID                = 173
-	SYS_GETUID                 = 174
-	SYS_GETEUID                = 175
-	SYS_GETGID                 = 176
-	SYS_GETEGID                = 177
-	SYS_GETTID                 = 178
-	SYS_SYSINFO                = 179
-	SYS_MQ_OPEN                = 180
-	SYS_MQ_UNLINK              = 181
-	SYS_MQ_TIMEDSEND           = 182
-	SYS_MQ_TIMEDRECEIVE        = 183
-	SYS_MQ_NOTIFY              = 184
-	SYS_MQ_GETSETATTR          = 185
-	SYS_MSGGET                 = 186
-	SYS_MSGCTL                 = 187
-	SYS_MSGRCV                 = 188
-	SYS_MSGSND                 = 189
-	SYS_SEMGET                 = 190
-	SYS_SEMCTL                 = 191
-	SYS_SEMTIMEDOP             = 192
-	SYS_SEMOP                  = 193
-	SYS_SHMGET                 = 194
-	SYS_SHMCTL                 = 195
-	SYS_SHMAT                  = 196
-	SYS_SHMDT                  = 197
-	SYS_SOCKET                 = 198
-	SYS_SOCKETPAIR             = 199
-	SYS_BIND                   = 200
-	SYS_LISTEN                 = 201
-	SYS_ACCEPT                 = 202
-	SYS_CONNECT                = 203
-	SYS_GETSOCKNAME            = 204
-	SYS_GETPEERNAME            = 205
-	SYS_SENDTO                 = 206
-	SYS_RECVFROM               = 207
-	SYS_SETSOCKOPT             = 208
-	SYS_GETSOCKOPT             = 209
-	SYS_SHUTDOWN               = 210
-	SYS_SENDMSG                = 211
-	SYS_RECVMSG                = 212
-	SYS_READAHEAD              = 213
-	SYS_BRK                    = 214
-	SYS_MUNMAP                 = 215
-	SYS_MREMAP                 = 216
-	SYS_ADD_KEY                = 217
-	SYS_REQUEST_KEY            = 218
-	SYS_KEYCTL                 = 219
-	SYS_CLONE                  = 220
-	SYS_EXECVE                 = 221
-	SYS_MMAP                   = 222
-	SYS_FADVISE64              = 223
-	SYS_SWAPON                 = 224
-	SYS_SWAPOFF                = 225
-	SYS_MPROTECT               = 226
-	SYS_MSYNC                  = 227
-	SYS_MLOCK                  = 228
-	SYS_MUNLOCK                = 229
-	SYS_MLOCKALL               = 230
-	SYS_MUNLOCKALL             = 231
-	SYS_MINCORE                = 232
-	SYS_MADVISE                = 233
-	SYS_REMAP_FILE_PAGES       = 234
-	SYS_MBIND                  = 235
-	SYS_GET_MEMPOLICY          = 236
-	SYS_SET_MEMPOLICY          = 237
-	SYS_MIGRATE_PAGES          = 238
-	SYS_MOVE_PAGES             = 239
-	SYS_RT_TGSIGQUEUEINFO      = 240
-	SYS_PERF_EVENT_OPEN        = 241
-	SYS_ACCEPT4                = 242
-	SYS_RECVMMSG               = 243
-	SYS_ARCH_SPECIFIC_SYSCALL  = 244
-	SYS_WAIT4                  = 260
-	SYS_PRLIMIT64              = 261
-	SYS_FANOTIFY_INIT          = 262
-	SYS_FANOTIFY_MARK          = 263
-	SYS_NAME_TO_HANDLE_AT      = 264
-	SYS_OPEN_BY_HANDLE_AT      = 265
-	SYS_CLOCK_ADJTIME          = 266
-	SYS_SYNCFS                 = 267
-	SYS_SETNS                  = 268
-	SYS_SENDMMSG               = 269
-	SYS_PROCESS_VM_READV       = 270
-	SYS_PROCESS_VM_WRITEV      = 271
-	SYS_KCMP                   = 272
-	SYS_FINIT_MODULE           = 273
-	SYS_SCHED_SETATTR          = 274
-	SYS_SCHED_GETATTR          = 275
-	SYS_RENAMEAT2              = 276
-	SYS_SECCOMP                = 277
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64.go
deleted file mode 100644
index 5ffe1c7191..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64.go
+++ /dev/null
@@ -1,327 +0,0 @@
-// mksysnum_linux.pl /usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build mips64,linux
-
-package unix
-
-const (
-	SYS_READ                   = 5000
-	SYS_WRITE                  = 5001
-	SYS_OPEN                   = 5002
-	SYS_CLOSE                  = 5003
-	SYS_STAT                   = 5004
-	SYS_FSTAT                  = 5005
-	SYS_LSTAT                  = 5006
-	SYS_POLL                   = 5007
-	SYS_LSEEK                  = 5008
-	SYS_MMAP                   = 5009
-	SYS_MPROTECT               = 5010
-	SYS_MUNMAP                 = 5011
-	SYS_BRK                    = 5012
-	SYS_RT_SIGACTION           = 5013
-	SYS_RT_SIGPROCMASK         = 5014
-	SYS_IOCTL                  = 5015
-	SYS_PREAD64                = 5016
-	SYS_PWRITE64               = 5017
-	SYS_READV                  = 5018
-	SYS_WRITEV                 = 5019
-	SYS_ACCESS                 = 5020
-	SYS_PIPE                   = 5021
-	SYS__NEWSELECT             = 5022
-	SYS_SCHED_YIELD            = 5023
-	SYS_MREMAP                 = 5024
-	SYS_MSYNC                  = 5025
-	SYS_MINCORE                = 5026
-	SYS_MADVISE                = 5027
-	SYS_SHMGET                 = 5028
-	SYS_SHMAT                  = 5029
-	SYS_SHMCTL                 = 5030
-	SYS_DUP                    = 5031
-	SYS_DUP2                   = 5032
-	SYS_PAUSE                  = 5033
-	SYS_NANOSLEEP              = 5034
-	SYS_GETITIMER              = 5035
-	SYS_SETITIMER              = 5036
-	SYS_ALARM                  = 5037
-	SYS_GETPID                 = 5038
-	SYS_SENDFILE               = 5039
-	SYS_SOCKET                 = 5040
-	SYS_CONNECT                = 5041
-	SYS_ACCEPT                 = 5042
-	SYS_SENDTO                 = 5043
-	SYS_RECVFROM               = 5044
-	SYS_SENDMSG                = 5045
-	SYS_RECVMSG                = 5046
-	SYS_SHUTDOWN               = 5047
-	SYS_BIND                   = 5048
-	SYS_LISTEN                 = 5049
-	SYS_GETSOCKNAME            = 5050
-	SYS_GETPEERNAME            = 5051
-	SYS_SOCKETPAIR             = 5052
-	SYS_SETSOCKOPT             = 5053
-	SYS_GETSOCKOPT             = 5054
-	SYS_CLONE                  = 5055
-	SYS_FORK                   = 5056
-	SYS_EXECVE                 = 5057
-	SYS_EXIT                   = 5058
-	SYS_WAIT4                  = 5059
-	SYS_KILL                   = 5060
-	SYS_UNAME                  = 5061
-	SYS_SEMGET                 = 5062
-	SYS_SEMOP                  = 5063
-	SYS_SEMCTL                 = 5064
-	SYS_SHMDT                  = 5065
-	SYS_MSGGET                 = 5066
-	SYS_MSGSND                 = 5067
-	SYS_MSGRCV                 = 5068
-	SYS_MSGCTL                 = 5069
-	SYS_FCNTL                  = 5070
-	SYS_FLOCK                  = 5071
-	SYS_FSYNC                  = 5072
-	SYS_FDATASYNC              = 5073
-	SYS_TRUNCATE               = 5074
-	SYS_FTRUNCATE              = 5075
-	SYS_GETDENTS               = 5076
-	SYS_GETCWD                 = 5077
-	SYS_CHDIR                  = 5078
-	SYS_FCHDIR                 = 5079
-	SYS_RENAME                 = 5080
-	SYS_MKDIR                  = 5081
-	SYS_RMDIR                  = 5082
-	SYS_CREAT                  = 5083
-	SYS_LINK                   = 5084
-	SYS_UNLINK                 = 5085
-	SYS_SYMLINK                = 5086
-	SYS_READLINK               = 5087
-	SYS_CHMOD                  = 5088
-	SYS_FCHMOD                 = 5089
-	SYS_CHOWN                  = 5090
-	SYS_FCHOWN                 = 5091
-	SYS_LCHOWN                 = 5092
-	SYS_UMASK                  = 5093
-	SYS_GETTIMEOFDAY           = 5094
-	SYS_GETRLIMIT              = 5095
-	SYS_GETRUSAGE              = 5096
-	SYS_SYSINFO                = 5097
-	SYS_TIMES                  = 5098
-	SYS_PTRACE                 = 5099
-	SYS_GETUID                 = 5100
-	SYS_SYSLOG                 = 5101
-	SYS_GETGID                 = 5102
-	SYS_SETUID                 = 5103
-	SYS_SETGID                 = 5104
-	SYS_GETEUID                = 5105
-	SYS_GETEGID                = 5106
-	SYS_SETPGID                = 5107
-	SYS_GETPPID                = 5108
-	SYS_GETPGRP                = 5109
-	SYS_SETSID                 = 5110
-	SYS_SETREUID               = 5111
-	SYS_SETREGID               = 5112
-	SYS_GETGROUPS              = 5113
-	SYS_SETGROUPS              = 5114
-	SYS_SETRESUID              = 5115
-	SYS_GETRESUID              = 5116
-	SYS_SETRESGID              = 5117
-	SYS_GETRESGID              = 5118
-	SYS_GETPGID                = 5119
-	SYS_SETFSUID               = 5120
-	SYS_SETFSGID               = 5121
-	SYS_GETSID                 = 5122
-	SYS_CAPGET                 = 5123
-	SYS_CAPSET                 = 5124
-	SYS_RT_SIGPENDING          = 5125
-	SYS_RT_SIGTIMEDWAIT        = 5126
-	SYS_RT_SIGQUEUEINFO        = 5127
-	SYS_RT_SIGSUSPEND          = 5128
-	SYS_SIGALTSTACK            = 5129
-	SYS_UTIME                  = 5130
-	SYS_MKNOD                  = 5131
-	SYS_PERSONALITY            = 5132
-	SYS_USTAT                  = 5133
-	SYS_STATFS                 = 5134
-	SYS_FSTATFS                = 5135
-	SYS_SYSFS                  = 5136
-	SYS_GETPRIORITY            = 5137
-	SYS_SETPRIORITY            = 5138
-	SYS_SCHED_SETPARAM         = 5139
-	SYS_SCHED_GETPARAM         = 5140
-	SYS_SCHED_SETSCHEDULER     = 5141
-	SYS_SCHED_GETSCHEDULER     = 5142
-	SYS_SCHED_GET_PRIORITY_MAX = 5143
-	SYS_SCHED_GET_PRIORITY_MIN = 5144
-	SYS_SCHED_RR_GET_INTERVAL  = 5145
-	SYS_MLOCK                  = 5146
-	SYS_MUNLOCK                = 5147
-	SYS_MLOCKALL               = 5148
-	SYS_MUNLOCKALL             = 5149
-	SYS_VHANGUP                = 5150
-	SYS_PIVOT_ROOT             = 5151
-	SYS__SYSCTL                = 5152
-	SYS_PRCTL                  = 5153
-	SYS_ADJTIMEX               = 5154
-	SYS_SETRLIMIT              = 5155
-	SYS_CHROOT                 = 5156
-	SYS_SYNC                   = 5157
-	SYS_ACCT                   = 5158
-	SYS_SETTIMEOFDAY           = 5159
-	SYS_MOUNT                  = 5160
-	SYS_UMOUNT2                = 5161
-	SYS_SWAPON                 = 5162
-	SYS_SWAPOFF                = 5163
-	SYS_REBOOT                 = 5164
-	SYS_SETHOSTNAME            = 5165
-	SYS_SETDOMAINNAME          = 5166
-	SYS_CREATE_MODULE          = 5167
-	SYS_INIT_MODULE            = 5168
-	SYS_DELETE_MODULE          = 5169
-	SYS_GET_KERNEL_SYMS        = 5170
-	SYS_QUERY_MODULE           = 5171
-	SYS_QUOTACTL               = 5172
-	SYS_NFSSERVCTL             = 5173
-	SYS_GETPMSG                = 5174
-	SYS_PUTPMSG                = 5175
-	SYS_AFS_SYSCALL            = 5176
-	SYS_RESERVED177            = 5177
-	SYS_GETTID                 = 5178
-	SYS_READAHEAD              = 5179
-	SYS_SETXATTR               = 5180
-	SYS_LSETXATTR              = 5181
-	SYS_FSETXATTR              = 5182
-	SYS_GETXATTR               = 5183
-	SYS_LGETXATTR              = 5184
-	SYS_FGETXATTR              = 5185
-	SYS_LISTXATTR              = 5186
-	SYS_LLISTXATTR             = 5187
-	SYS_FLISTXATTR             = 5188
-	SYS_REMOVEXATTR            = 5189
-	SYS_LREMOVEXATTR           = 5190
-	SYS_FREMOVEXATTR           = 5191
-	SYS_TKILL                  = 5192
-	SYS_RESERVED193            = 5193
-	SYS_FUTEX                  = 5194
-	SYS_SCHED_SETAFFINITY      = 5195
-	SYS_SCHED_GETAFFINITY      = 5196
-	SYS_CACHEFLUSH             = 5197
-	SYS_CACHECTL               = 5198
-	SYS_SYSMIPS                = 5199
-	SYS_IO_SETUP               = 5200
-	SYS_IO_DESTROY             = 5201
-	SYS_IO_GETEVENTS           = 5202
-	SYS_IO_SUBMIT              = 5203
-	SYS_IO_CANCEL              = 5204
-	SYS_EXIT_GROUP             = 5205
-	SYS_LOOKUP_DCOOKIE         = 5206
-	SYS_EPOLL_CREATE           = 5207
-	SYS_EPOLL_CTL              = 5208
-	SYS_EPOLL_WAIT             = 5209
-	SYS_REMAP_FILE_PAGES       = 5210
-	SYS_RT_SIGRETURN           = 5211
-	SYS_SET_TID_ADDRESS        = 5212
-	SYS_RESTART_SYSCALL        = 5213
-	SYS_SEMTIMEDOP             = 5214
-	SYS_FADVISE64              = 5215
-	SYS_TIMER_CREATE           = 5216
-	SYS_TIMER_SETTIME          = 5217
-	SYS_TIMER_GETTIME          = 5218
-	SYS_TIMER_GETOVERRUN       = 5219
-	SYS_TIMER_DELETE           = 5220
-	SYS_CLOCK_SETTIME          = 5221
-	SYS_CLOCK_GETTIME          = 5222
-	SYS_CLOCK_GETRES           = 5223
-	SYS_CLOCK_NANOSLEEP        = 5224
-	SYS_TGKILL                 = 5225
-	SYS_UTIMES                 = 5226
-	SYS_MBIND                  = 5227
-	SYS_GET_MEMPOLICY          = 5228
-	SYS_SET_MEMPOLICY          = 5229
-	SYS_MQ_OPEN                = 5230
-	SYS_MQ_UNLINK              = 5231
-	SYS_MQ_TIMEDSEND           = 5232
-	SYS_MQ_TIMEDRECEIVE        = 5233
-	SYS_MQ_NOTIFY              = 5234
-	SYS_MQ_GETSETATTR          = 5235
-	SYS_VSERVER                = 5236
-	SYS_WAITID                 = 5237
-	SYS_ADD_KEY                = 5239
-	SYS_REQUEST_KEY            = 5240
-	SYS_KEYCTL                 = 5241
-	SYS_SET_THREAD_AREA        = 5242
-	SYS_INOTIFY_INIT           = 5243
-	SYS_INOTIFY_ADD_WATCH      = 5244
-	SYS_INOTIFY_RM_WATCH       = 5245
-	SYS_MIGRATE_PAGES          = 5246
-	SYS_OPENAT                 = 5247
-	SYS_MKDIRAT                = 5248
-	SYS_MKNODAT                = 5249
-	SYS_FCHOWNAT               = 5250
-	SYS_FUTIMESAT              = 5251
-	SYS_NEWFSTATAT             = 5252
-	SYS_UNLINKAT               = 5253
-	SYS_RENAMEAT               = 5254
-	SYS_LINKAT                 = 5255
-	SYS_SYMLINKAT              = 5256
-	SYS_READLINKAT             = 5257
-	SYS_FCHMODAT               = 5258
-	SYS_FACCESSAT              = 5259
-	SYS_PSELECT6               = 5260
-	SYS_PPOLL                  = 5261
-	SYS_UNSHARE                = 5262
-	SYS_SPLICE                 = 5263
-	SYS_SYNC_FILE_RANGE        = 5264
-	SYS_TEE                    = 5265
-	SYS_VMSPLICE               = 5266
-	SYS_MOVE_PAGES             = 5267
-	SYS_SET_ROBUST_LIST        = 5268
-	SYS_GET_ROBUST_LIST        = 5269
-	SYS_KEXEC_LOAD             = 5270
-	SYS_GETCPU                 = 5271
-	SYS_EPOLL_PWAIT            = 5272
-	SYS_IOPRIO_SET             = 5273
-	SYS_IOPRIO_GET             = 5274
-	SYS_UTIMENSAT              = 5275
-	SYS_SIGNALFD               = 5276
-	SYS_TIMERFD                = 5277
-	SYS_EVENTFD                = 5278
-	SYS_FALLOCATE              = 5279
-	SYS_TIMERFD_CREATE         = 5280
-	SYS_TIMERFD_GETTIME        = 5281
-	SYS_TIMERFD_SETTIME        = 5282
-	SYS_SIGNALFD4              = 5283
-	SYS_EVENTFD2               = 5284
-	SYS_EPOLL_CREATE1          = 5285
-	SYS_DUP3                   = 5286
-	SYS_PIPE2                  = 5287
-	SYS_INOTIFY_INIT1          = 5288
-	SYS_PREADV                 = 5289
-	SYS_PWRITEV                = 5290
-	SYS_RT_TGSIGQUEUEINFO      = 5291
-	SYS_PERF_EVENT_OPEN        = 5292
-	SYS_ACCEPT4                = 5293
-	SYS_RECVMMSG               = 5294
-	SYS_FANOTIFY_INIT          = 5295
-	SYS_FANOTIFY_MARK          = 5296
-	SYS_PRLIMIT64              = 5297
-	SYS_NAME_TO_HANDLE_AT      = 5298
-	SYS_OPEN_BY_HANDLE_AT      = 5299
-	SYS_CLOCK_ADJTIME          = 5300
-	SYS_SYNCFS                 = 5301
-	SYS_SENDMMSG               = 5302
-	SYS_SETNS                  = 5303
-	SYS_PROCESS_VM_READV       = 5304
-	SYS_PROCESS_VM_WRITEV      = 5305
-	SYS_KCMP                   = 5306
-	SYS_FINIT_MODULE           = 5307
-	SYS_GETDENTS64             = 5308
-	SYS_SCHED_SETATTR          = 5309
-	SYS_SCHED_GETATTR          = 5310
-	SYS_RENAMEAT2              = 5311
-	SYS_SECCOMP                = 5312
-	SYS_GETRANDOM              = 5313
-	SYS_MEMFD_CREATE           = 5314
-	SYS_BPF                    = 5315
-	SYS_EXECVEAT               = 5316
-	SYS_USERFAULTFD            = 5317
-	SYS_MEMBARRIER             = 5318
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
deleted file mode 100644
index d192b940ce..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
+++ /dev/null
@@ -1,327 +0,0 @@
-// mksysnum_linux.pl /usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build mips64le,linux
-
-package unix
-
-const (
-	SYS_READ                   = 5000
-	SYS_WRITE                  = 5001
-	SYS_OPEN                   = 5002
-	SYS_CLOSE                  = 5003
-	SYS_STAT                   = 5004
-	SYS_FSTAT                  = 5005
-	SYS_LSTAT                  = 5006
-	SYS_POLL                   = 5007
-	SYS_LSEEK                  = 5008
-	SYS_MMAP                   = 5009
-	SYS_MPROTECT               = 5010
-	SYS_MUNMAP                 = 5011
-	SYS_BRK                    = 5012
-	SYS_RT_SIGACTION           = 5013
-	SYS_RT_SIGPROCMASK         = 5014
-	SYS_IOCTL                  = 5015
-	SYS_PREAD64                = 5016
-	SYS_PWRITE64               = 5017
-	SYS_READV                  = 5018
-	SYS_WRITEV                 = 5019
-	SYS_ACCESS                 = 5020
-	SYS_PIPE                   = 5021
-	SYS__NEWSELECT             = 5022
-	SYS_SCHED_YIELD            = 5023
-	SYS_MREMAP                 = 5024
-	SYS_MSYNC                  = 5025
-	SYS_MINCORE                = 5026
-	SYS_MADVISE                = 5027
-	SYS_SHMGET                 = 5028
-	SYS_SHMAT                  = 5029
-	SYS_SHMCTL                 = 5030
-	SYS_DUP                    = 5031
-	SYS_DUP2                   = 5032
-	SYS_PAUSE                  = 5033
-	SYS_NANOSLEEP              = 5034
-	SYS_GETITIMER              = 5035
-	SYS_SETITIMER              = 5036
-	SYS_ALARM                  = 5037
-	SYS_GETPID                 = 5038
-	SYS_SENDFILE               = 5039
-	SYS_SOCKET                 = 5040
-	SYS_CONNECT                = 5041
-	SYS_ACCEPT                 = 5042
-	SYS_SENDTO                 = 5043
-	SYS_RECVFROM               = 5044
-	SYS_SENDMSG                = 5045
-	SYS_RECVMSG                = 5046
-	SYS_SHUTDOWN               = 5047
-	SYS_BIND                   = 5048
-	SYS_LISTEN                 = 5049
-	SYS_GETSOCKNAME            = 5050
-	SYS_GETPEERNAME            = 5051
-	SYS_SOCKETPAIR             = 5052
-	SYS_SETSOCKOPT             = 5053
-	SYS_GETSOCKOPT             = 5054
-	SYS_CLONE                  = 5055
-	SYS_FORK                   = 5056
-	SYS_EXECVE                 = 5057
-	SYS_EXIT                   = 5058
-	SYS_WAIT4                  = 5059
-	SYS_KILL                   = 5060
-	SYS_UNAME                  = 5061
-	SYS_SEMGET                 = 5062
-	SYS_SEMOP                  = 5063
-	SYS_SEMCTL                 = 5064
-	SYS_SHMDT                  = 5065
-	SYS_MSGGET                 = 5066
-	SYS_MSGSND                 = 5067
-	SYS_MSGRCV                 = 5068
-	SYS_MSGCTL                 = 5069
-	SYS_FCNTL                  = 5070
-	SYS_FLOCK                  = 5071
-	SYS_FSYNC                  = 5072
-	SYS_FDATASYNC              = 5073
-	SYS_TRUNCATE               = 5074
-	SYS_FTRUNCATE              = 5075
-	SYS_GETDENTS               = 5076
-	SYS_GETCWD                 = 5077
-	SYS_CHDIR                  = 5078
-	SYS_FCHDIR                 = 5079
-	SYS_RENAME                 = 5080
-	SYS_MKDIR                  = 5081
-	SYS_RMDIR                  = 5082
-	SYS_CREAT                  = 5083
-	SYS_LINK                   = 5084
-	SYS_UNLINK                 = 5085
-	SYS_SYMLINK                = 5086
-	SYS_READLINK               = 5087
-	SYS_CHMOD                  = 5088
-	SYS_FCHMOD                 = 5089
-	SYS_CHOWN                  = 5090
-	SYS_FCHOWN                 = 5091
-	SYS_LCHOWN                 = 5092
-	SYS_UMASK                  = 5093
-	SYS_GETTIMEOFDAY           = 5094
-	SYS_GETRLIMIT              = 5095
-	SYS_GETRUSAGE              = 5096
-	SYS_SYSINFO                = 5097
-	SYS_TIMES                  = 5098
-	SYS_PTRACE                 = 5099
-	SYS_GETUID                 = 5100
-	SYS_SYSLOG                 = 5101
-	SYS_GETGID                 = 5102
-	SYS_SETUID                 = 5103
-	SYS_SETGID                 = 5104
-	SYS_GETEUID                = 5105
-	SYS_GETEGID                = 5106
-	SYS_SETPGID                = 5107
-	SYS_GETPPID                = 5108
-	SYS_GETPGRP                = 5109
-	SYS_SETSID                 = 5110
-	SYS_SETREUID               = 5111
-	SYS_SETREGID               = 5112
-	SYS_GETGROUPS              = 5113
-	SYS_SETGROUPS              = 5114
-	SYS_SETRESUID              = 5115
-	SYS_GETRESUID              = 5116
-	SYS_SETRESGID              = 5117
-	SYS_GETRESGID              = 5118
-	SYS_GETPGID                = 5119
-	SYS_SETFSUID               = 5120
-	SYS_SETFSGID               = 5121
-	SYS_GETSID                 = 5122
-	SYS_CAPGET                 = 5123
-	SYS_CAPSET                 = 5124
-	SYS_RT_SIGPENDING          = 5125
-	SYS_RT_SIGTIMEDWAIT        = 5126
-	SYS_RT_SIGQUEUEINFO        = 5127
-	SYS_RT_SIGSUSPEND          = 5128
-	SYS_SIGALTSTACK            = 5129
-	SYS_UTIME                  = 5130
-	SYS_MKNOD                  = 5131
-	SYS_PERSONALITY            = 5132
-	SYS_USTAT                  = 5133
-	SYS_STATFS                 = 5134
-	SYS_FSTATFS                = 5135
-	SYS_SYSFS                  = 5136
-	SYS_GETPRIORITY            = 5137
-	SYS_SETPRIORITY            = 5138
-	SYS_SCHED_SETPARAM         = 5139
-	SYS_SCHED_GETPARAM         = 5140
-	SYS_SCHED_SETSCHEDULER     = 5141
-	SYS_SCHED_GETSCHEDULER     = 5142
-	SYS_SCHED_GET_PRIORITY_MAX = 5143
-	SYS_SCHED_GET_PRIORITY_MIN = 5144
-	SYS_SCHED_RR_GET_INTERVAL  = 5145
-	SYS_MLOCK                  = 5146
-	SYS_MUNLOCK                = 5147
-	SYS_MLOCKALL               = 5148
-	SYS_MUNLOCKALL             = 5149
-	SYS_VHANGUP                = 5150
-	SYS_PIVOT_ROOT             = 5151
-	SYS__SYSCTL                = 5152
-	SYS_PRCTL                  = 5153
-	SYS_ADJTIMEX               = 5154
-	SYS_SETRLIMIT              = 5155
-	SYS_CHROOT                 = 5156
-	SYS_SYNC                   = 5157
-	SYS_ACCT                   = 5158
-	SYS_SETTIMEOFDAY           = 5159
-	SYS_MOUNT                  = 5160
-	SYS_UMOUNT2                = 5161
-	SYS_SWAPON                 = 5162
-	SYS_SWAPOFF                = 5163
-	SYS_REBOOT                 = 5164
-	SYS_SETHOSTNAME            = 5165
-	SYS_SETDOMAINNAME          = 5166
-	SYS_CREATE_MODULE          = 5167
-	SYS_INIT_MODULE            = 5168
-	SYS_DELETE_MODULE          = 5169
-	SYS_GET_KERNEL_SYMS        = 5170
-	SYS_QUERY_MODULE           = 5171
-	SYS_QUOTACTL               = 5172
-	SYS_NFSSERVCTL             = 5173
-	SYS_GETPMSG                = 5174
-	SYS_PUTPMSG                = 5175
-	SYS_AFS_SYSCALL            = 5176
-	SYS_RESERVED177            = 5177
-	SYS_GETTID                 = 5178
-	SYS_READAHEAD              = 5179
-	SYS_SETXATTR               = 5180
-	SYS_LSETXATTR              = 5181
-	SYS_FSETXATTR              = 5182
-	SYS_GETXATTR               = 5183
-	SYS_LGETXATTR              = 5184
-	SYS_FGETXATTR              = 5185
-	SYS_LISTXATTR              = 5186
-	SYS_LLISTXATTR             = 5187
-	SYS_FLISTXATTR             = 5188
-	SYS_REMOVEXATTR            = 5189
-	SYS_LREMOVEXATTR           = 5190
-	SYS_FREMOVEXATTR           = 5191
-	SYS_TKILL                  = 5192
-	SYS_RESERVED193            = 5193
-	SYS_FUTEX                  = 5194
-	SYS_SCHED_SETAFFINITY      = 5195
-	SYS_SCHED_GETAFFINITY      = 5196
-	SYS_CACHEFLUSH             = 5197
-	SYS_CACHECTL               = 5198
-	SYS_SYSMIPS                = 5199
-	SYS_IO_SETUP               = 5200
-	SYS_IO_DESTROY             = 5201
-	SYS_IO_GETEVENTS           = 5202
-	SYS_IO_SUBMIT              = 5203
-	SYS_IO_CANCEL              = 5204
-	SYS_EXIT_GROUP             = 5205
-	SYS_LOOKUP_DCOOKIE         = 5206
-	SYS_EPOLL_CREATE           = 5207
-	SYS_EPOLL_CTL              = 5208
-	SYS_EPOLL_WAIT             = 5209
-	SYS_REMAP_FILE_PAGES       = 5210
-	SYS_RT_SIGRETURN           = 5211
-	SYS_SET_TID_ADDRESS        = 5212
-	SYS_RESTART_SYSCALL        = 5213
-	SYS_SEMTIMEDOP             = 5214
-	SYS_FADVISE64              = 5215
-	SYS_TIMER_CREATE           = 5216
-	SYS_TIMER_SETTIME          = 5217
-	SYS_TIMER_GETTIME          = 5218
-	SYS_TIMER_GETOVERRUN       = 5219
-	SYS_TIMER_DELETE           = 5220
-	SYS_CLOCK_SETTIME          = 5221
-	SYS_CLOCK_GETTIME          = 5222
-	SYS_CLOCK_GETRES           = 5223
-	SYS_CLOCK_NANOSLEEP        = 5224
-	SYS_TGKILL                 = 5225
-	SYS_UTIMES                 = 5226
-	SYS_MBIND                  = 5227
-	SYS_GET_MEMPOLICY          = 5228
-	SYS_SET_MEMPOLICY          = 5229
-	SYS_MQ_OPEN                = 5230
-	SYS_MQ_UNLINK              = 5231
-	SYS_MQ_TIMEDSEND           = 5232
-	SYS_MQ_TIMEDRECEIVE        = 5233
-	SYS_MQ_NOTIFY              = 5234
-	SYS_MQ_GETSETATTR          = 5235
-	SYS_VSERVER                = 5236
-	SYS_WAITID                 = 5237
-	SYS_ADD_KEY                = 5239
-	SYS_REQUEST_KEY            = 5240
-	SYS_KEYCTL                 = 5241
-	SYS_SET_THREAD_AREA        = 5242
-	SYS_INOTIFY_INIT           = 5243
-	SYS_INOTIFY_ADD_WATCH      = 5244
-	SYS_INOTIFY_RM_WATCH       = 5245
-	SYS_MIGRATE_PAGES          = 5246
-	SYS_OPENAT                 = 5247
-	SYS_MKDIRAT                = 5248
-	SYS_MKNODAT                = 5249
-	SYS_FCHOWNAT               = 5250
-	SYS_FUTIMESAT              = 5251
-	SYS_NEWFSTATAT             = 5252
-	SYS_UNLINKAT               = 5253
-	SYS_RENAMEAT               = 5254
-	SYS_LINKAT                 = 5255
-	SYS_SYMLINKAT              = 5256
-	SYS_READLINKAT             = 5257
-	SYS_FCHMODAT               = 5258
-	SYS_FACCESSAT              = 5259
-	SYS_PSELECT6               = 5260
-	SYS_PPOLL                  = 5261
-	SYS_UNSHARE                = 5262
-	SYS_SPLICE                 = 5263
-	SYS_SYNC_FILE_RANGE        = 5264
-	SYS_TEE                    = 5265
-	SYS_VMSPLICE               = 5266
-	SYS_MOVE_PAGES             = 5267
-	SYS_SET_ROBUST_LIST        = 5268
-	SYS_GET_ROBUST_LIST        = 5269
-	SYS_KEXEC_LOAD             = 5270
-	SYS_GETCPU                 = 5271
-	SYS_EPOLL_PWAIT            = 5272
-	SYS_IOPRIO_SET             = 5273
-	SYS_IOPRIO_GET             = 5274
-	SYS_UTIMENSAT              = 5275
-	SYS_SIGNALFD               = 5276
-	SYS_TIMERFD                = 5277
-	SYS_EVENTFD                = 5278
-	SYS_FALLOCATE              = 5279
-	SYS_TIMERFD_CREATE         = 5280
-	SYS_TIMERFD_GETTIME        = 5281
-	SYS_TIMERFD_SETTIME        = 5282
-	SYS_SIGNALFD4              = 5283
-	SYS_EVENTFD2               = 5284
-	SYS_EPOLL_CREATE1          = 5285
-	SYS_DUP3                   = 5286
-	SYS_PIPE2                  = 5287
-	SYS_INOTIFY_INIT1          = 5288
-	SYS_PREADV                 = 5289
-	SYS_PWRITEV                = 5290
-	SYS_RT_TGSIGQUEUEINFO      = 5291
-	SYS_PERF_EVENT_OPEN        = 5292
-	SYS_ACCEPT4                = 5293
-	SYS_RECVMMSG               = 5294
-	SYS_FANOTIFY_INIT          = 5295
-	SYS_FANOTIFY_MARK          = 5296
-	SYS_PRLIMIT64              = 5297
-	SYS_NAME_TO_HANDLE_AT      = 5298
-	SYS_OPEN_BY_HANDLE_AT      = 5299
-	SYS_CLOCK_ADJTIME          = 5300
-	SYS_SYNCFS                 = 5301
-	SYS_SENDMMSG               = 5302
-	SYS_SETNS                  = 5303
-	SYS_PROCESS_VM_READV       = 5304
-	SYS_PROCESS_VM_WRITEV      = 5305
-	SYS_KCMP                   = 5306
-	SYS_FINIT_MODULE           = 5307
-	SYS_GETDENTS64             = 5308
-	SYS_SCHED_SETATTR          = 5309
-	SYS_SCHED_GETATTR          = 5310
-	SYS_RENAMEAT2              = 5311
-	SYS_SECCOMP                = 5312
-	SYS_GETRANDOM              = 5313
-	SYS_MEMFD_CREATE           = 5314
-	SYS_BPF                    = 5315
-	SYS_EXECVEAT               = 5316
-	SYS_USERFAULTFD            = 5317
-	SYS_MEMBARRIER             = 5318
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
deleted file mode 100644
index e1b08f00d3..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
+++ /dev/null
@@ -1,360 +0,0 @@
-// mksysnum_linux.pl /usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build ppc64,linux
-
-package unix
-
-const (
-	SYS_RESTART_SYSCALL        = 0
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_WAITPID                = 7
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_TIME                   = 13
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LCHOWN                 = 16
-	SYS_BREAK                  = 17
-	SYS_OLDSTAT                = 18
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_UMOUNT                 = 22
-	SYS_SETUID                 = 23
-	SYS_GETUID                 = 24
-	SYS_STIME                  = 25
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_OLDFSTAT               = 28
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_STTY                   = 31
-	SYS_GTTY                   = 32
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_FTIME                  = 35
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_PROF                   = 44
-	SYS_BRK                    = 45
-	SYS_SETGID                 = 46
-	SYS_GETGID                 = 47
-	SYS_SIGNAL                 = 48
-	SYS_GETEUID                = 49
-	SYS_GETEGID                = 50
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_LOCK                   = 53
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_MPX                    = 56
-	SYS_SETPGID                = 57
-	SYS_ULIMIT                 = 58
-	SYS_OLDOLDUNAME            = 59
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SGETMASK               = 68
-	SYS_SSETMASK               = 69
-	SYS_SETREUID               = 70
-	SYS_SETREGID               = 71
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRLIMIT              = 76
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_GETGROUPS              = 80
-	SYS_SETGROUPS              = 81
-	SYS_SELECT                 = 82
-	SYS_SYMLINK                = 83
-	SYS_OLDLSTAT               = 84
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_READDIR                = 89
-	SYS_MMAP                   = 90
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_FCHOWN                 = 95
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_PROFIL                 = 98
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_IOPERM                 = 101
-	SYS_SOCKETCALL             = 102
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_OLDUNAME               = 109
-	SYS_IOPL                   = 110
-	SYS_VHANGUP                = 111
-	SYS_IDLE                   = 112
-	SYS_VM86                   = 113
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_IPC                    = 117
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_MODIFY_LDT             = 123
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_CREATE_MODULE          = 127
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_GET_KERNEL_SYMS        = 130
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_AFS_SYSCALL            = 137
-	SYS_SETFSUID               = 138
-	SYS_SETFSGID               = 139
-	SYS__LLSEEK                = 140
-	SYS_GETDENTS               = 141
-	SYS__NEWSELECT             = 142
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_SETRESUID              = 164
-	SYS_GETRESUID              = 165
-	SYS_QUERY_MODULE           = 166
-	SYS_POLL                   = 167
-	SYS_NFSSERVCTL             = 168
-	SYS_SETRESGID              = 169
-	SYS_GETRESGID              = 170
-	SYS_PRCTL                  = 171
-	SYS_RT_SIGRETURN           = 172
-	SYS_RT_SIGACTION           = 173
-	SYS_RT_SIGPROCMASK         = 174
-	SYS_RT_SIGPENDING          = 175
-	SYS_RT_SIGTIMEDWAIT        = 176
-	SYS_RT_SIGQUEUEINFO        = 177
-	SYS_RT_SIGSUSPEND          = 178
-	SYS_PREAD64                = 179
-	SYS_PWRITE64               = 180
-	SYS_CHOWN                  = 181
-	SYS_GETCWD                 = 182
-	SYS_CAPGET                 = 183
-	SYS_CAPSET                 = 184
-	SYS_SIGALTSTACK            = 185
-	SYS_SENDFILE               = 186
-	SYS_GETPMSG                = 187
-	SYS_PUTPMSG                = 188
-	SYS_VFORK                  = 189
-	SYS_UGETRLIMIT             = 190
-	SYS_READAHEAD              = 191
-	SYS_PCICONFIG_READ         = 198
-	SYS_PCICONFIG_WRITE        = 199
-	SYS_PCICONFIG_IOBASE       = 200
-	SYS_MULTIPLEXER            = 201
-	SYS_GETDENTS64             = 202
-	SYS_PIVOT_ROOT             = 203
-	SYS_MADVISE                = 205
-	SYS_MINCORE                = 206
-	SYS_GETTID                 = 207
-	SYS_TKILL                  = 208
-	SYS_SETXATTR               = 209
-	SYS_LSETXATTR              = 210
-	SYS_FSETXATTR              = 211
-	SYS_GETXATTR               = 212
-	SYS_LGETXATTR              = 213
-	SYS_FGETXATTR              = 214
-	SYS_LISTXATTR              = 215
-	SYS_LLISTXATTR             = 216
-	SYS_FLISTXATTR             = 217
-	SYS_REMOVEXATTR            = 218
-	SYS_LREMOVEXATTR           = 219
-	SYS_FREMOVEXATTR           = 220
-	SYS_FUTEX                  = 221
-	SYS_SCHED_SETAFFINITY      = 222
-	SYS_SCHED_GETAFFINITY      = 223
-	SYS_TUXCALL                = 225
-	SYS_IO_SETUP               = 227
-	SYS_IO_DESTROY             = 228
-	SYS_IO_GETEVENTS           = 229
-	SYS_IO_SUBMIT              = 230
-	SYS_IO_CANCEL              = 231
-	SYS_SET_TID_ADDRESS        = 232
-	SYS_FADVISE64              = 233
-	SYS_EXIT_GROUP             = 234
-	SYS_LOOKUP_DCOOKIE         = 235
-	SYS_EPOLL_CREATE           = 236
-	SYS_EPOLL_CTL              = 237
-	SYS_EPOLL_WAIT             = 238
-	SYS_REMAP_FILE_PAGES       = 239
-	SYS_TIMER_CREATE           = 240
-	SYS_TIMER_SETTIME          = 241
-	SYS_TIMER_GETTIME          = 242
-	SYS_TIMER_GETOVERRUN       = 243
-	SYS_TIMER_DELETE           = 244
-	SYS_CLOCK_SETTIME          = 245
-	SYS_CLOCK_GETTIME          = 246
-	SYS_CLOCK_GETRES           = 247
-	SYS_CLOCK_NANOSLEEP        = 248
-	SYS_SWAPCONTEXT            = 249
-	SYS_TGKILL                 = 250
-	SYS_UTIMES                 = 251
-	SYS_STATFS64               = 252
-	SYS_FSTATFS64              = 253
-	SYS_RTAS                   = 255
-	SYS_SYS_DEBUG_SETCONTEXT   = 256
-	SYS_MIGRATE_PAGES          = 258
-	SYS_MBIND                  = 259
-	SYS_GET_MEMPOLICY          = 260
-	SYS_SET_MEMPOLICY          = 261
-	SYS_MQ_OPEN                = 262
-	SYS_MQ_UNLINK              = 263
-	SYS_MQ_TIMEDSEND           = 264
-	SYS_MQ_TIMEDRECEIVE        = 265
-	SYS_MQ_NOTIFY              = 266
-	SYS_MQ_GETSETATTR          = 267
-	SYS_KEXEC_LOAD             = 268
-	SYS_ADD_KEY                = 269
-	SYS_REQUEST_KEY            = 270
-	SYS_KEYCTL                 = 271
-	SYS_WAITID                 = 272
-	SYS_IOPRIO_SET             = 273
-	SYS_IOPRIO_GET             = 274
-	SYS_INOTIFY_INIT           = 275
-	SYS_INOTIFY_ADD_WATCH      = 276
-	SYS_INOTIFY_RM_WATCH       = 277
-	SYS_SPU_RUN                = 278
-	SYS_SPU_CREATE             = 279
-	SYS_PSELECT6               = 280
-	SYS_PPOLL                  = 281
-	SYS_UNSHARE                = 282
-	SYS_SPLICE                 = 283
-	SYS_TEE                    = 284
-	SYS_VMSPLICE               = 285
-	SYS_OPENAT                 = 286
-	SYS_MKDIRAT                = 287
-	SYS_MKNODAT                = 288
-	SYS_FCHOWNAT               = 289
-	SYS_FUTIMESAT              = 290
-	SYS_NEWFSTATAT             = 291
-	SYS_UNLINKAT               = 292
-	SYS_RENAMEAT               = 293
-	SYS_LINKAT                 = 294
-	SYS_SYMLINKAT              = 295
-	SYS_READLINKAT             = 296
-	SYS_FCHMODAT               = 297
-	SYS_FACCESSAT              = 298
-	SYS_GET_ROBUST_LIST        = 299
-	SYS_SET_ROBUST_LIST        = 300
-	SYS_MOVE_PAGES             = 301
-	SYS_GETCPU                 = 302
-	SYS_EPOLL_PWAIT            = 303
-	SYS_UTIMENSAT              = 304
-	SYS_SIGNALFD               = 305
-	SYS_TIMERFD_CREATE         = 306
-	SYS_EVENTFD                = 307
-	SYS_SYNC_FILE_RANGE2       = 308
-	SYS_FALLOCATE              = 309
-	SYS_SUBPAGE_PROT           = 310
-	SYS_TIMERFD_SETTIME        = 311
-	SYS_TIMERFD_GETTIME        = 312
-	SYS_SIGNALFD4              = 313
-	SYS_EVENTFD2               = 314
-	SYS_EPOLL_CREATE1          = 315
-	SYS_DUP3                   = 316
-	SYS_PIPE2                  = 317
-	SYS_INOTIFY_INIT1          = 318
-	SYS_PERF_EVENT_OPEN        = 319
-	SYS_PREADV                 = 320
-	SYS_PWRITEV                = 321
-	SYS_RT_TGSIGQUEUEINFO      = 322
-	SYS_FANOTIFY_INIT          = 323
-	SYS_FANOTIFY_MARK          = 324
-	SYS_PRLIMIT64              = 325
-	SYS_SOCKET                 = 326
-	SYS_BIND                   = 327
-	SYS_CONNECT                = 328
-	SYS_LISTEN                 = 329
-	SYS_ACCEPT                 = 330
-	SYS_GETSOCKNAME            = 331
-	SYS_GETPEERNAME            = 332
-	SYS_SOCKETPAIR             = 333
-	SYS_SEND                   = 334
-	SYS_SENDTO                 = 335
-	SYS_RECV                   = 336
-	SYS_RECVFROM               = 337
-	SYS_SHUTDOWN               = 338
-	SYS_SETSOCKOPT             = 339
-	SYS_GETSOCKOPT             = 340
-	SYS_SENDMSG                = 341
-	SYS_RECVMSG                = 342
-	SYS_RECVMMSG               = 343
-	SYS_ACCEPT4                = 344
-	SYS_NAME_TO_HANDLE_AT      = 345
-	SYS_OPEN_BY_HANDLE_AT      = 346
-	SYS_CLOCK_ADJTIME          = 347
-	SYS_SYNCFS                 = 348
-	SYS_SENDMMSG               = 349
-	SYS_SETNS                  = 350
-	SYS_PROCESS_VM_READV       = 351
-	SYS_PROCESS_VM_WRITEV      = 352
-	SYS_FINIT_MODULE           = 353
-	SYS_KCMP                   = 354
-	SYS_SCHED_SETATTR          = 355
-	SYS_SCHED_GETATTR          = 356
-	SYS_RENAMEAT2              = 357
-	SYS_SECCOMP                = 358
-	SYS_GETRANDOM              = 359
-	SYS_MEMFD_CREATE           = 360
-	SYS_BPF                    = 361
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
deleted file mode 100644
index 45e63f51a4..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
+++ /dev/null
@@ -1,353 +0,0 @@
-// mksysnum_linux.pl /usr/include/powerpc64le-linux-gnu/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build ppc64le,linux
-
-package unix
-
-const (
-	SYS_RESTART_SYSCALL        = 0
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_WAITPID                = 7
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_TIME                   = 13
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LCHOWN                 = 16
-	SYS_BREAK                  = 17
-	SYS_OLDSTAT                = 18
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_UMOUNT                 = 22
-	SYS_SETUID                 = 23
-	SYS_GETUID                 = 24
-	SYS_STIME                  = 25
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_OLDFSTAT               = 28
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_STTY                   = 31
-	SYS_GTTY                   = 32
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_FTIME                  = 35
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_PROF                   = 44
-	SYS_BRK                    = 45
-	SYS_SETGID                 = 46
-	SYS_GETGID                 = 47
-	SYS_SIGNAL                 = 48
-	SYS_GETEUID                = 49
-	SYS_GETEGID                = 50
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_LOCK                   = 53
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_MPX                    = 56
-	SYS_SETPGID                = 57
-	SYS_ULIMIT                 = 58
-	SYS_OLDOLDUNAME            = 59
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SGETMASK               = 68
-	SYS_SSETMASK               = 69
-	SYS_SETREUID               = 70
-	SYS_SETREGID               = 71
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRLIMIT              = 76
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_GETGROUPS              = 80
-	SYS_SETGROUPS              = 81
-	SYS_SELECT                 = 82
-	SYS_SYMLINK                = 83
-	SYS_OLDLSTAT               = 84
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_READDIR                = 89
-	SYS_MMAP                   = 90
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_FCHOWN                 = 95
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_PROFIL                 = 98
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_IOPERM                 = 101
-	SYS_SOCKETCALL             = 102
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_OLDUNAME               = 109
-	SYS_IOPL                   = 110
-	SYS_VHANGUP                = 111
-	SYS_IDLE                   = 112
-	SYS_VM86                   = 113
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_IPC                    = 117
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_MODIFY_LDT             = 123
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_CREATE_MODULE          = 127
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_GET_KERNEL_SYMS        = 130
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_AFS_SYSCALL            = 137
-	SYS_SETFSUID               = 138
-	SYS_SETFSGID               = 139
-	SYS__LLSEEK                = 140
-	SYS_GETDENTS               = 141
-	SYS__NEWSELECT             = 142
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_SETRESUID              = 164
-	SYS_GETRESUID              = 165
-	SYS_QUERY_MODULE           = 166
-	SYS_POLL                   = 167
-	SYS_NFSSERVCTL             = 168
-	SYS_SETRESGID              = 169
-	SYS_GETRESGID              = 170
-	SYS_PRCTL                  = 171
-	SYS_RT_SIGRETURN           = 172
-	SYS_RT_SIGACTION           = 173
-	SYS_RT_SIGPROCMASK         = 174
-	SYS_RT_SIGPENDING          = 175
-	SYS_RT_SIGTIMEDWAIT        = 176
-	SYS_RT_SIGQUEUEINFO        = 177
-	SYS_RT_SIGSUSPEND          = 178
-	SYS_PREAD64                = 179
-	SYS_PWRITE64               = 180
-	SYS_CHOWN                  = 181
-	SYS_GETCWD                 = 182
-	SYS_CAPGET                 = 183
-	SYS_CAPSET                 = 184
-	SYS_SIGALTSTACK            = 185
-	SYS_SENDFILE               = 186
-	SYS_GETPMSG                = 187
-	SYS_PUTPMSG                = 188
-	SYS_VFORK                  = 189
-	SYS_UGETRLIMIT             = 190
-	SYS_READAHEAD              = 191
-	SYS_PCICONFIG_READ         = 198
-	SYS_PCICONFIG_WRITE        = 199
-	SYS_PCICONFIG_IOBASE       = 200
-	SYS_MULTIPLEXER            = 201
-	SYS_GETDENTS64             = 202
-	SYS_PIVOT_ROOT             = 203
-	SYS_MADVISE                = 205
-	SYS_MINCORE                = 206
-	SYS_GETTID                 = 207
-	SYS_TKILL                  = 208
-	SYS_SETXATTR               = 209
-	SYS_LSETXATTR              = 210
-	SYS_FSETXATTR              = 211
-	SYS_GETXATTR               = 212
-	SYS_LGETXATTR              = 213
-	SYS_FGETXATTR              = 214
-	SYS_LISTXATTR              = 215
-	SYS_LLISTXATTR             = 216
-	SYS_FLISTXATTR             = 217
-	SYS_REMOVEXATTR            = 218
-	SYS_LREMOVEXATTR           = 219
-	SYS_FREMOVEXATTR           = 220
-	SYS_FUTEX                  = 221
-	SYS_SCHED_SETAFFINITY      = 222
-	SYS_SCHED_GETAFFINITY      = 223
-	SYS_TUXCALL                = 225
-	SYS_IO_SETUP               = 227
-	SYS_IO_DESTROY             = 228
-	SYS_IO_GETEVENTS           = 229
-	SYS_IO_SUBMIT              = 230
-	SYS_IO_CANCEL              = 231
-	SYS_SET_TID_ADDRESS        = 232
-	SYS_FADVISE64              = 233
-	SYS_EXIT_GROUP             = 234
-	SYS_LOOKUP_DCOOKIE         = 235
-	SYS_EPOLL_CREATE           = 236
-	SYS_EPOLL_CTL              = 237
-	SYS_EPOLL_WAIT             = 238
-	SYS_REMAP_FILE_PAGES       = 239
-	SYS_TIMER_CREATE           = 240
-	SYS_TIMER_SETTIME          = 241
-	SYS_TIMER_GETTIME          = 242
-	SYS_TIMER_GETOVERRUN       = 243
-	SYS_TIMER_DELETE           = 244
-	SYS_CLOCK_SETTIME          = 245
-	SYS_CLOCK_GETTIME          = 246
-	SYS_CLOCK_GETRES           = 247
-	SYS_CLOCK_NANOSLEEP        = 248
-	SYS_SWAPCONTEXT            = 249
-	SYS_TGKILL                 = 250
-	SYS_UTIMES                 = 251
-	SYS_STATFS64               = 252
-	SYS_FSTATFS64              = 253
-	SYS_RTAS                   = 255
-	SYS_SYS_DEBUG_SETCONTEXT   = 256
-	SYS_MIGRATE_PAGES          = 258
-	SYS_MBIND                  = 259
-	SYS_GET_MEMPOLICY          = 260
-	SYS_SET_MEMPOLICY          = 261
-	SYS_MQ_OPEN                = 262
-	SYS_MQ_UNLINK              = 263
-	SYS_MQ_TIMEDSEND           = 264
-	SYS_MQ_TIMEDRECEIVE        = 265
-	SYS_MQ_NOTIFY              = 266
-	SYS_MQ_GETSETATTR          = 267
-	SYS_KEXEC_LOAD             = 268
-	SYS_ADD_KEY                = 269
-	SYS_REQUEST_KEY            = 270
-	SYS_KEYCTL                 = 271
-	SYS_WAITID                 = 272
-	SYS_IOPRIO_SET             = 273
-	SYS_IOPRIO_GET             = 274
-	SYS_INOTIFY_INIT           = 275
-	SYS_INOTIFY_ADD_WATCH      = 276
-	SYS_INOTIFY_RM_WATCH       = 277
-	SYS_SPU_RUN                = 278
-	SYS_SPU_CREATE             = 279
-	SYS_PSELECT6               = 280
-	SYS_PPOLL                  = 281
-	SYS_UNSHARE                = 282
-	SYS_SPLICE                 = 283
-	SYS_TEE                    = 284
-	SYS_VMSPLICE               = 285
-	SYS_OPENAT                 = 286
-	SYS_MKDIRAT                = 287
-	SYS_MKNODAT                = 288
-	SYS_FCHOWNAT               = 289
-	SYS_FUTIMESAT              = 290
-	SYS_NEWFSTATAT             = 291
-	SYS_UNLINKAT               = 292
-	SYS_RENAMEAT               = 293
-	SYS_LINKAT                 = 294
-	SYS_SYMLINKAT              = 295
-	SYS_READLINKAT             = 296
-	SYS_FCHMODAT               = 297
-	SYS_FACCESSAT              = 298
-	SYS_GET_ROBUST_LIST        = 299
-	SYS_SET_ROBUST_LIST        = 300
-	SYS_MOVE_PAGES             = 301
-	SYS_GETCPU                 = 302
-	SYS_EPOLL_PWAIT            = 303
-	SYS_UTIMENSAT              = 304
-	SYS_SIGNALFD               = 305
-	SYS_TIMERFD_CREATE         = 306
-	SYS_EVENTFD                = 307
-	SYS_SYNC_FILE_RANGE2       = 308
-	SYS_FALLOCATE              = 309
-	SYS_SUBPAGE_PROT           = 310
-	SYS_TIMERFD_SETTIME        = 311
-	SYS_TIMERFD_GETTIME        = 312
-	SYS_SIGNALFD4              = 313
-	SYS_EVENTFD2               = 314
-	SYS_EPOLL_CREATE1          = 315
-	SYS_DUP3                   = 316
-	SYS_PIPE2                  = 317
-	SYS_INOTIFY_INIT1          = 318
-	SYS_PERF_EVENT_OPEN        = 319
-	SYS_PREADV                 = 320
-	SYS_PWRITEV                = 321
-	SYS_RT_TGSIGQUEUEINFO      = 322
-	SYS_FANOTIFY_INIT          = 323
-	SYS_FANOTIFY_MARK          = 324
-	SYS_PRLIMIT64              = 325
-	SYS_SOCKET                 = 326
-	SYS_BIND                   = 327
-	SYS_CONNECT                = 328
-	SYS_LISTEN                 = 329
-	SYS_ACCEPT                 = 330
-	SYS_GETSOCKNAME            = 331
-	SYS_GETPEERNAME            = 332
-	SYS_SOCKETPAIR             = 333
-	SYS_SEND                   = 334
-	SYS_SENDTO                 = 335
-	SYS_RECV                   = 336
-	SYS_RECVFROM               = 337
-	SYS_SHUTDOWN               = 338
-	SYS_SETSOCKOPT             = 339
-	SYS_GETSOCKOPT             = 340
-	SYS_SENDMSG                = 341
-	SYS_RECVMSG                = 342
-	SYS_RECVMMSG               = 343
-	SYS_ACCEPT4                = 344
-	SYS_NAME_TO_HANDLE_AT      = 345
-	SYS_OPEN_BY_HANDLE_AT      = 346
-	SYS_CLOCK_ADJTIME          = 347
-	SYS_SYNCFS                 = 348
-	SYS_SENDMMSG               = 349
-	SYS_SETNS                  = 350
-	SYS_PROCESS_VM_READV       = 351
-	SYS_PROCESS_VM_WRITEV      = 352
-	SYS_FINIT_MODULE           = 353
-	SYS_KCMP                   = 354
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_s390x.go
deleted file mode 100644
index 42d4f5cda8..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_linux_s390x.go
+++ /dev/null
@@ -1,328 +0,0 @@
-// mksysnum_linux.pl /usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build s390x,linux
-
-package unix
-
-const (
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_RESTART_SYSCALL        = 7
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_UMOUNT                 = 22
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_BRK                    = 45
-	SYS_SIGNAL                 = 48
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_SETPGID                = 57
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_SYMLINK                = 83
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_READDIR                = 89
-	SYS_MMAP                   = 90
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_SOCKETCALL             = 102
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_LOOKUP_DCOOKIE         = 110
-	SYS_VHANGUP                = 111
-	SYS_IDLE                   = 112
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_IPC                    = 117
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_CREATE_MODULE          = 127
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_GET_KERNEL_SYMS        = 130
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_AFS_SYSCALL            = 137
-	SYS_GETDENTS               = 141
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_QUERY_MODULE           = 167
-	SYS_POLL                   = 168
-	SYS_NFSSERVCTL             = 169
-	SYS_PRCTL                  = 172
-	SYS_RT_SIGRETURN           = 173
-	SYS_RT_SIGACTION           = 174
-	SYS_RT_SIGPROCMASK         = 175
-	SYS_RT_SIGPENDING          = 176
-	SYS_RT_SIGTIMEDWAIT        = 177
-	SYS_RT_SIGQUEUEINFO        = 178
-	SYS_RT_SIGSUSPEND          = 179
-	SYS_PREAD64                = 180
-	SYS_PWRITE64               = 181
-	SYS_GETCWD                 = 183
-	SYS_CAPGET                 = 184
-	SYS_CAPSET                 = 185
-	SYS_SIGALTSTACK            = 186
-	SYS_SENDFILE               = 187
-	SYS_GETPMSG                = 188
-	SYS_PUTPMSG                = 189
-	SYS_VFORK                  = 190
-	SYS_PIVOT_ROOT             = 217
-	SYS_MINCORE                = 218
-	SYS_MADVISE                = 219
-	SYS_GETDENTS64             = 220
-	SYS_READAHEAD              = 222
-	SYS_SETXATTR               = 224
-	SYS_LSETXATTR              = 225
-	SYS_FSETXATTR              = 226
-	SYS_GETXATTR               = 227
-	SYS_LGETXATTR              = 228
-	SYS_FGETXATTR              = 229
-	SYS_LISTXATTR              = 230
-	SYS_LLISTXATTR             = 231
-	SYS_FLISTXATTR             = 232
-	SYS_REMOVEXATTR            = 233
-	SYS_LREMOVEXATTR           = 234
-	SYS_FREMOVEXATTR           = 235
-	SYS_GETTID                 = 236
-	SYS_TKILL                  = 237
-	SYS_FUTEX                  = 238
-	SYS_SCHED_SETAFFINITY      = 239
-	SYS_SCHED_GETAFFINITY      = 240
-	SYS_TGKILL                 = 241
-	SYS_IO_SETUP               = 243
-	SYS_IO_DESTROY             = 244
-	SYS_IO_GETEVENTS           = 245
-	SYS_IO_SUBMIT              = 246
-	SYS_IO_CANCEL              = 247
-	SYS_EXIT_GROUP             = 248
-	SYS_EPOLL_CREATE           = 249
-	SYS_EPOLL_CTL              = 250
-	SYS_EPOLL_WAIT             = 251
-	SYS_SET_TID_ADDRESS        = 252
-	SYS_FADVISE64              = 253
-	SYS_TIMER_CREATE           = 254
-	SYS_TIMER_SETTIME          = 255
-	SYS_TIMER_GETTIME          = 256
-	SYS_TIMER_GETOVERRUN       = 257
-	SYS_TIMER_DELETE           = 258
-	SYS_CLOCK_SETTIME          = 259
-	SYS_CLOCK_GETTIME          = 260
-	SYS_CLOCK_GETRES           = 261
-	SYS_CLOCK_NANOSLEEP        = 262
-	SYS_STATFS64               = 265
-	SYS_FSTATFS64              = 266
-	SYS_REMAP_FILE_PAGES       = 267
-	SYS_MBIND                  = 268
-	SYS_GET_MEMPOLICY          = 269
-	SYS_SET_MEMPOLICY          = 270
-	SYS_MQ_OPEN                = 271
-	SYS_MQ_UNLINK              = 272
-	SYS_MQ_TIMEDSEND           = 273
-	SYS_MQ_TIMEDRECEIVE        = 274
-	SYS_MQ_NOTIFY              = 275
-	SYS_MQ_GETSETATTR          = 276
-	SYS_KEXEC_LOAD             = 277
-	SYS_ADD_KEY                = 278
-	SYS_REQUEST_KEY            = 279
-	SYS_KEYCTL                 = 280
-	SYS_WAITID                 = 281
-	SYS_IOPRIO_SET             = 282
-	SYS_IOPRIO_GET             = 283
-	SYS_INOTIFY_INIT           = 284
-	SYS_INOTIFY_ADD_WATCH      = 285
-	SYS_INOTIFY_RM_WATCH       = 286
-	SYS_MIGRATE_PAGES          = 287
-	SYS_OPENAT                 = 288
-	SYS_MKDIRAT                = 289
-	SYS_MKNODAT                = 290
-	SYS_FCHOWNAT               = 291
-	SYS_FUTIMESAT              = 292
-	SYS_UNLINKAT               = 294
-	SYS_RENAMEAT               = 295
-	SYS_LINKAT                 = 296
-	SYS_SYMLINKAT              = 297
-	SYS_READLINKAT             = 298
-	SYS_FCHMODAT               = 299
-	SYS_FACCESSAT              = 300
-	SYS_PSELECT6               = 301
-	SYS_PPOLL                  = 302
-	SYS_UNSHARE                = 303
-	SYS_SET_ROBUST_LIST        = 304
-	SYS_GET_ROBUST_LIST        = 305
-	SYS_SPLICE                 = 306
-	SYS_SYNC_FILE_RANGE        = 307
-	SYS_TEE                    = 308
-	SYS_VMSPLICE               = 309
-	SYS_MOVE_PAGES             = 310
-	SYS_GETCPU                 = 311
-	SYS_EPOLL_PWAIT            = 312
-	SYS_UTIMES                 = 313
-	SYS_FALLOCATE              = 314
-	SYS_UTIMENSAT              = 315
-	SYS_SIGNALFD               = 316
-	SYS_TIMERFD                = 317
-	SYS_EVENTFD                = 318
-	SYS_TIMERFD_CREATE         = 319
-	SYS_TIMERFD_SETTIME        = 320
-	SYS_TIMERFD_GETTIME        = 321
-	SYS_SIGNALFD4              = 322
-	SYS_EVENTFD2               = 323
-	SYS_INOTIFY_INIT1          = 324
-	SYS_PIPE2                  = 325
-	SYS_DUP3                   = 326
-	SYS_EPOLL_CREATE1          = 327
-	SYS_PREADV                 = 328
-	SYS_PWRITEV                = 329
-	SYS_RT_TGSIGQUEUEINFO      = 330
-	SYS_PERF_EVENT_OPEN        = 331
-	SYS_FANOTIFY_INIT          = 332
-	SYS_FANOTIFY_MARK          = 333
-	SYS_PRLIMIT64              = 334
-	SYS_NAME_TO_HANDLE_AT      = 335
-	SYS_OPEN_BY_HANDLE_AT      = 336
-	SYS_CLOCK_ADJTIME          = 337
-	SYS_SYNCFS                 = 338
-	SYS_SETNS                  = 339
-	SYS_PROCESS_VM_READV       = 340
-	SYS_PROCESS_VM_WRITEV      = 341
-	SYS_S390_RUNTIME_INSTR     = 342
-	SYS_KCMP                   = 343
-	SYS_FINIT_MODULE           = 344
-	SYS_SCHED_SETATTR          = 345
-	SYS_SCHED_GETATTR          = 346
-	SYS_RENAMEAT2              = 347
-	SYS_SECCOMP                = 348
-	SYS_GETRANDOM              = 349
-	SYS_MEMFD_CREATE           = 350
-	SYS_BPF                    = 351
-	SYS_S390_PCI_MMIO_WRITE    = 352
-	SYS_S390_PCI_MMIO_READ     = 353
-	SYS_EXECVEAT               = 354
-	SYS_USERFAULTFD            = 355
-	SYS_MEMBARRIER             = 356
-	SYS_RECVMMSG               = 357
-	SYS_SENDMMSG               = 358
-	SYS_SOCKET                 = 359
-	SYS_SOCKETPAIR             = 360
-	SYS_BIND                   = 361
-	SYS_CONNECT                = 362
-	SYS_LISTEN                 = 363
-	SYS_ACCEPT4                = 364
-	SYS_GETSOCKOPT             = 365
-	SYS_SETSOCKOPT             = 366
-	SYS_GETSOCKNAME            = 367
-	SYS_GETPEERNAME            = 368
-	SYS_SENDTO                 = 369
-	SYS_SENDMSG                = 370
-	SYS_RECVFROM               = 371
-	SYS_RECVMSG                = 372
-	SYS_SHUTDOWN               = 373
-	SYS_MLOCK2                 = 374
-	SYS_SELECT                 = 142
-	SYS_GETRLIMIT              = 191
-	SYS_LCHOWN                 = 198
-	SYS_GETUID                 = 199
-	SYS_GETGID                 = 200
-	SYS_GETEUID                = 201
-	SYS_GETEGID                = 202
-	SYS_SETREUID               = 203
-	SYS_SETREGID               = 204
-	SYS_GETGROUPS              = 205
-	SYS_SETGROUPS              = 206
-	SYS_FCHOWN                 = 207
-	SYS_SETRESUID              = 208
-	SYS_GETRESUID              = 209
-	SYS_SETRESGID              = 210
-	SYS_GETRESGID              = 211
-	SYS_CHOWN                  = 212
-	SYS_SETUID                 = 213
-	SYS_SETGID                 = 214
-	SYS_SETFSUID               = 215
-	SYS_SETFSGID               = 216
-	SYS_NEWFSTATAT             = 293
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go
deleted file mode 100644
index f60d8f9882..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_386.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// mksysnum_netbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build 386,netbsd
-
-package unix
-
-const (
-	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
-	SYS_FORK                 = 2   // { int|sys||fork(void); }
-	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
-	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
-	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
-	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
-	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
-	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
-	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
-	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
-	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
-	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
-	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
-	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
-	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
-	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
-	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
-	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
-	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
-	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
-	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
-	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
-	SYS_SYNC                 = 36  // { void|sys||sync(void); }
-	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
-	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
-	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
-	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
-	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
-	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
-	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
-	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
-	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
-	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
-	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
-	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
-	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
-	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
-	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
-	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
-	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
-	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
-	SYS_VFORK                = 66  // { int|sys||vfork(void); }
-	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
-	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
-	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
-	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
-	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
-	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
-	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
-	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
-	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
-	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
-	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
-	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
-	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
-	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
-	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
-	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
-	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
-	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
-	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
-	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
-	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
-	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
-	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
-	SYS_SETSID               = 147 // { int|sys||setsid(void); }
-	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
-	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
-	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
-	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
-	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
-	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
-	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
-	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
-	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
-	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
-	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
-	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
-	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
-	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
-	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
-	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
-	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
-	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
-	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
-	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
-	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
-	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
-	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
-	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
-	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
-	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
-	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
-	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
-	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
-	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
-	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
-	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
-	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
-	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
-	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
-	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
-	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
-	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
-	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
-	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
-	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
-	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
-	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
-	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
-	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
-	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
-	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
-	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
-	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
-	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
-	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
-	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
-	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
-	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
-	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
-	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
-	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
-	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
-	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
-	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
-	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
-	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
-	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
-	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
-	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
-	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
-	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
-	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
-	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
-	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
-	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
-	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
-	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
-	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
-	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
-	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
-	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
-	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
-	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
-	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
-	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
-	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
-	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
-	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
-	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
-	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
-	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
-	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
-	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
-	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
-	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
-	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
-	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
-	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
-	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
-	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
-	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
-	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
-	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
-	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
-	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
-	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
-	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
-	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
-	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
-	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
-	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
-	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
-	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
-	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
-	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
-	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
-	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
-	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
-	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
-	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
-	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
-	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
-	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
-	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
-	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
-	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
-	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
-	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
-	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
-	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
-	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
-	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
-	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
-	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
-	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
-	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
-	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
-	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
-	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
-	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
-	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
-	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
-	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
-	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
-	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
-	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
-	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
-	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
deleted file mode 100644
index 48a91d4646..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// mksysnum_netbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,netbsd
-
-package unix
-
-const (
-	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
-	SYS_FORK                 = 2   // { int|sys||fork(void); }
-	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
-	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
-	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
-	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
-	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
-	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
-	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
-	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
-	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
-	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
-	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
-	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
-	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
-	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
-	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
-	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
-	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
-	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
-	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
-	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
-	SYS_SYNC                 = 36  // { void|sys||sync(void); }
-	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
-	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
-	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
-	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
-	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
-	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
-	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
-	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
-	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
-	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
-	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
-	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
-	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
-	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
-	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
-	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
-	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
-	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
-	SYS_VFORK                = 66  // { int|sys||vfork(void); }
-	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
-	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
-	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
-	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
-	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
-	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
-	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
-	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
-	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
-	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
-	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
-	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
-	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
-	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
-	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
-	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
-	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
-	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
-	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
-	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
-	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
-	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
-	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
-	SYS_SETSID               = 147 // { int|sys||setsid(void); }
-	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
-	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
-	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
-	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
-	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
-	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
-	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
-	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
-	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
-	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
-	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
-	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
-	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
-	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
-	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
-	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
-	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
-	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
-	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
-	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
-	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
-	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
-	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
-	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
-	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
-	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
-	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
-	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
-	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
-	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
-	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
-	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
-	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
-	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
-	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
-	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
-	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
-	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
-	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
-	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
-	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
-	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
-	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
-	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
-	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
-	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
-	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
-	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
-	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
-	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
-	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
-	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
-	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
-	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
-	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
-	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
-	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
-	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
-	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
-	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
-	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
-	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
-	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
-	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
-	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
-	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
-	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
-	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
-	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
-	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
-	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
-	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
-	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
-	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
-	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
-	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
-	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
-	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
-	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
-	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
-	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
-	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
-	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
-	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
-	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
-	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
-	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
-	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
-	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
-	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
-	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
-	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
-	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
-	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
-	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
-	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
-	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
-	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
-	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
-	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
-	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
-	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
-	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
-	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
-	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
-	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
-	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
-	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
-	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
-	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
-	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
-	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
-	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
-	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
-	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
-	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
-	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
-	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
-	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
-	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
-	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
-	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
-	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
-	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
-	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
-	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
-	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
-	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
-	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
-	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
-	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
-	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
-	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
-	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
-	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
-	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
-	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
-	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
-	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
-	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
-	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
-	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
-	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
-	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
deleted file mode 100644
index 612ba662cb..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// mksysnum_netbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm,netbsd
-
-package unix
-
-const (
-	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
-	SYS_FORK                 = 2   // { int|sys||fork(void); }
-	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
-	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
-	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
-	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
-	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
-	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
-	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
-	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
-	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
-	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
-	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
-	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
-	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
-	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
-	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
-	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
-	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
-	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
-	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
-	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
-	SYS_SYNC                 = 36  // { void|sys||sync(void); }
-	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
-	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
-	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
-	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
-	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
-	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
-	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
-	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
-	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
-	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
-	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
-	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
-	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
-	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
-	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
-	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
-	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
-	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
-	SYS_VFORK                = 66  // { int|sys||vfork(void); }
-	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
-	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
-	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
-	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
-	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
-	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
-	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
-	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
-	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
-	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
-	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
-	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
-	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
-	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
-	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
-	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
-	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
-	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
-	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
-	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
-	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
-	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
-	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
-	SYS_SETSID               = 147 // { int|sys||setsid(void); }
-	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
-	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
-	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
-	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
-	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
-	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
-	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
-	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
-	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
-	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
-	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
-	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
-	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
-	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
-	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
-	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
-	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
-	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
-	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
-	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
-	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
-	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
-	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
-	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
-	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
-	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
-	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
-	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
-	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
-	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
-	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
-	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
-	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
-	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
-	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
-	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
-	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
-	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
-	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
-	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
-	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
-	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
-	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
-	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
-	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
-	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
-	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
-	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
-	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
-	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
-	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
-	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
-	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
-	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
-	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
-	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
-	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
-	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
-	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
-	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
-	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
-	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
-	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
-	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
-	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
-	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
-	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
-	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
-	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
-	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
-	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
-	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
-	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
-	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
-	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
-	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
-	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
-	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
-	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
-	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
-	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
-	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
-	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
-	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
-	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
-	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
-	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
-	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
-	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
-	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
-	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
-	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
-	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
-	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
-	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
-	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
-	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
-	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
-	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
-	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
-	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
-	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
-	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
-	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
-	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
-	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
-	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
-	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
-	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
-	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
-	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
-	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
-	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
-	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
-	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
-	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
-	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
-	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
-	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
-	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
-	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
-	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
-	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
-	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
-	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
-	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
-	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
-	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
-	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
-	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
-	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
-	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
-	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
-	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
-	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
-	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
-	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
-	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
-	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
-	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
-	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
-	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
-	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
-	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go
deleted file mode 100644
index 3e8ce2a1dd..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_386.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// mksysnum_openbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build 386,openbsd
-
-package unix
-
-const (
-	SYS_EXIT           = 1   // { void sys_exit(int rval); }
-	SYS_FORK           = 2   // { int sys_fork(void); }
-	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
-	SYS_OPEN           = 5   // { int sys_open(const char *path, \
-	SYS_CLOSE          = 6   // { int sys_close(int fd); }
-	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
-	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
-	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
-	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
-	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
-	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
-	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
-	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
-	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
-	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
-	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
-	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
-	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
-	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
-	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
-	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
-	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
-	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
-	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
-	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
-	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
-	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
-	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
-	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
-	SYS_ACCESS         = 33  // { int sys_access(const char *path, int flags); }
-	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
-	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
-	SYS_SYNC           = 36  // { void sys_sync(void); }
-	SYS_KILL           = 37  // { int sys_kill(int pid, int signum); }
-	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
-	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
-	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
-	SYS_DUP            = 41  // { int sys_dup(int fd); }
-	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
-	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
-	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
-	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
-	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
-	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
-	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
-	SYS_GETLOGIN       = 49  // { int sys_getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
-	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
-	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
-	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
-	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
-	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
-	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
-	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
-	SYS_READLINK       = 58  // { int sys_readlink(const char *path, char *buf, \
-	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
-	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
-	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
-	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
-	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
-	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
-	SYS_VFORK          = 66  // { int sys_vfork(void); }
-	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
-	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
-	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
-	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
-	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
-	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
-	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
-	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
-	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
-	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
-	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
-	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
-	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
-	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
-	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
-	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, int pgid); }
-	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
-	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
-	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
-	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
-	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
-	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
-	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
-	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
-	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
-	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
-	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
-	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
-	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
-	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
-	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
-	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
-	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
-	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
-	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
-	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
-	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
-	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
-	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
-	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
-	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
-	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
-	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
-	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
-	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
-	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
-	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
-	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
-	SYS_SETSID         = 147 // { int sys_setsid(void); }
-	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
-	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
-	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
-	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
-	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
-	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
-	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
-	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
-	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
-	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
-	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
-	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
-	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
-	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
-	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
-	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
-	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
-	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
-	SYS___SYSCTL       = 202 // { int sys___sysctl(const int *name, u_int namelen, \
-	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
-	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
-	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
-	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
-	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
-	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
-	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
-	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
-	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
-	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
-	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
-	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
-	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
-	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
-	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
-	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
-	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
-	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
-	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
-	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
-	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
-	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
-	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
-	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
-	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
-	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
-	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
-	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
-	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
-	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
-	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
-	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
-	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
-	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
-	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
-	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
-	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
-	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
-	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
-	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
-	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
-	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
-	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
-	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
-	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
-	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
-	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
-	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
-	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
-	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
-	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
-	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
-	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
-	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
-	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
deleted file mode 100644
index bd28146ddd..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// mksysnum_openbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,openbsd
-
-package unix
-
-const (
-	SYS_EXIT           = 1   // { void sys_exit(int rval); }
-	SYS_FORK           = 2   // { int sys_fork(void); }
-	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
-	SYS_OPEN           = 5   // { int sys_open(const char *path, \
-	SYS_CLOSE          = 6   // { int sys_close(int fd); }
-	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
-	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
-	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
-	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
-	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
-	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
-	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
-	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
-	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
-	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
-	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
-	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
-	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
-	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
-	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
-	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
-	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
-	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
-	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
-	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
-	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
-	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
-	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
-	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
-	SYS_ACCESS         = 33  // { int sys_access(const char *path, int flags); }
-	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
-	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
-	SYS_SYNC           = 36  // { void sys_sync(void); }
-	SYS_KILL           = 37  // { int sys_kill(int pid, int signum); }
-	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
-	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
-	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
-	SYS_DUP            = 41  // { int sys_dup(int fd); }
-	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
-	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
-	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
-	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
-	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
-	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
-	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
-	SYS_GETLOGIN       = 49  // { int sys_getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
-	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
-	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
-	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
-	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
-	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
-	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
-	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
-	SYS_READLINK       = 58  // { int sys_readlink(const char *path, char *buf, \
-	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
-	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
-	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
-	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
-	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
-	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
-	SYS_VFORK          = 66  // { int sys_vfork(void); }
-	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
-	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
-	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
-	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
-	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
-	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
-	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
-	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
-	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
-	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
-	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
-	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
-	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
-	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
-	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
-	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, int pgid); }
-	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
-	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
-	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
-	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
-	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
-	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
-	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
-	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
-	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
-	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
-	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
-	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
-	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
-	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
-	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
-	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
-	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
-	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
-	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
-	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
-	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
-	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
-	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
-	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
-	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
-	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
-	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
-	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
-	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
-	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
-	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
-	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
-	SYS_SETSID         = 147 // { int sys_setsid(void); }
-	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
-	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
-	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
-	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
-	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
-	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
-	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
-	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
-	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
-	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
-	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
-	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
-	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
-	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
-	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
-	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
-	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
-	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
-	SYS___SYSCTL       = 202 // { int sys___sysctl(const int *name, u_int namelen, \
-	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
-	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
-	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
-	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
-	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
-	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
-	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
-	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
-	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
-	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
-	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
-	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
-	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
-	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
-	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
-	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
-	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
-	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
-	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
-	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
-	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
-	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
-	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
-	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
-	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
-	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
-	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
-	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
-	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
-	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
-	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
-	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
-	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
-	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
-	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
-	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
-	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
-	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
-	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
-	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
-	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
-	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
-	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
-	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
-	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
-	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
-	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
-	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
-	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
-	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
-	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
-	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
-	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
-	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
-	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
deleted file mode 100644
index c708659859..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,solaris
-
-package unix
-
-// TODO(aram): remove these before Go 1.3.
-const (
-	SYS_EXECVE = 59
-	SYS_FCNTL  = 62
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go
deleted file mode 100644
index 2de1d44e28..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_386.go
+++ /dev/null
@@ -1,447 +0,0 @@
-// +build 386,darwin
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timeval32 struct{}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           int32
-	Mode          uint16
-	Nlink         uint16
-	Ino           uint64
-	Uid           uint32
-	Gid           uint32
-	Rdev          int32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       int32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Qspare        [2]int64
-}
-
-type Statfs_t struct {
-	Bsize       uint32
-	Iosize      int32
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      uint64
-	Files       uint64
-	Ffree       uint64
-	Fsid        Fsid
-	Owner       uint32
-	Type        uint32
-	Flags       uint32
-	Fssubtype   uint32
-	Fstypename  [16]int8
-	Mntonname   [1024]int8
-	Mntfromname [1024]int8
-	Reserved    [8]uint32
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Fstore_t struct {
-	Flags      uint32
-	Posmode    int32
-	Offset     int64
-	Length     int64
-	Bytesalloc int64
-}
-
-type Radvisory_t struct {
-	Offset int64
-	Count  int32
-}
-
-type Fbootstraptransfer_t struct {
-	Offset int64
-	Length uint32
-	Buffer *byte
-}
-
-type Log2phys_t struct {
-	Flags       uint32
-	Contigbytes int64
-	Devoffset   int64
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet4Pktinfo     = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int32
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-const (
-	SizeofIfMsghdr    = 0x70
-	SizeofIfData      = 0x60
-	SizeofIfaMsghdr   = 0x14
-	SizeofIfmaMsghdr  = 0x10
-	SizeofIfmaMsghdr2 = 0x14
-	SizeofRtMsghdr    = 0x5c
-	SizeofRtMetrics   = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval
-	Unused2    uint32
-	Hwassist   uint32
-	Reserved1  uint32
-	Reserved2  uint32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   int32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Filler   [4]uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go
deleted file mode 100644
index 044657878c..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_amd64.go
+++ /dev/null
@@ -1,462 +0,0 @@
-// +build amd64,darwin
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Timeval32 struct {
-	Sec  int32
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           int32
-	Mode          uint16
-	Nlink         uint16
-	Ino           uint64
-	Uid           uint32
-	Gid           uint32
-	Rdev          int32
-	Pad_cgo_0     [4]byte
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       int32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Qspare        [2]int64
-}
-
-type Statfs_t struct {
-	Bsize       uint32
-	Iosize      int32
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      uint64
-	Files       uint64
-	Ffree       uint64
-	Fsid        Fsid
-	Owner       uint32
-	Type        uint32
-	Flags       uint32
-	Fssubtype   uint32
-	Fstypename  [16]int8
-	Mntonname   [1024]int8
-	Mntfromname [1024]int8
-	Reserved    [8]uint32
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Fstore_t struct {
-	Flags      uint32
-	Posmode    int32
-	Offset     int64
-	Length     int64
-	Bytesalloc int64
-}
-
-type Radvisory_t struct {
-	Offset    int64
-	Count     int32
-	Pad_cgo_0 [4]byte
-}
-
-type Fbootstraptransfer_t struct {
-	Offset int64
-	Length uint64
-	Buffer *byte
-}
-
-type Log2phys_t struct {
-	Flags     uint32
-	Pad_cgo_0 [8]byte
-	Pad_cgo_1 [8]byte
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet4Pktinfo     = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-const (
-	SizeofIfMsghdr    = 0x70
-	SizeofIfData      = 0x60
-	SizeofIfaMsghdr   = 0x14
-	SizeofIfmaMsghdr  = 0x10
-	SizeofIfmaMsghdr2 = 0x14
-	SizeofRtMsghdr    = 0x5c
-	SizeofRtMetrics   = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval32
-	Unused2    uint32
-	Hwassist   uint32
-	Reserved1  uint32
-	Reserved2  uint32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   int32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Filler   [4]uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval32
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type Termios struct {
-	Iflag     uint64
-	Oflag     uint64
-	Cflag     uint64
-	Lflag     uint64
-	Cc        [20]uint8
-	Pad_cgo_0 [4]byte
-	Ispeed    uint64
-	Ospeed    uint64
-}
-
-const (
-	AT_FDCWD            = -0x2
-	AT_SYMLINK_NOFOLLOW = 0x20
-)
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm.go
deleted file mode 100644
index 66df363ce5..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm.go
+++ /dev/null
@@ -1,449 +0,0 @@
-// NOTE: cgo can't generate struct Stat_t and struct Statfs_t yet
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-// +build arm,darwin
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timeval32 [0]byte
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           int32
-	Mode          uint16
-	Nlink         uint16
-	Ino           uint64
-	Uid           uint32
-	Gid           uint32
-	Rdev          int32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       int32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Qspare        [2]int64
-}
-
-type Statfs_t struct {
-	Bsize       uint32
-	Iosize      int32
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      uint64
-	Files       uint64
-	Ffree       uint64
-	Fsid        Fsid
-	Owner       uint32
-	Type        uint32
-	Flags       uint32
-	Fssubtype   uint32
-	Fstypename  [16]int8
-	Mntonname   [1024]int8
-	Mntfromname [1024]int8
-	Reserved    [8]uint32
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Fstore_t struct {
-	Flags      uint32
-	Posmode    int32
-	Offset     int64
-	Length     int64
-	Bytesalloc int64
-}
-
-type Radvisory_t struct {
-	Offset int64
-	Count  int32
-}
-
-type Fbootstraptransfer_t struct {
-	Offset int64
-	Length uint32
-	Buffer *byte
-}
-
-type Log2phys_t struct {
-	Flags       uint32
-	Contigbytes int64
-	Devoffset   int64
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet4Pktinfo     = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int32
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-const (
-	SizeofIfMsghdr    = 0x70
-	SizeofIfData      = 0x60
-	SizeofIfaMsghdr   = 0x14
-	SizeofIfmaMsghdr  = 0x10
-	SizeofIfmaMsghdr2 = 0x14
-	SizeofRtMsghdr    = 0x5c
-	SizeofRtMetrics   = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval
-	Unused2    uint32
-	Hwassist   uint32
-	Reserved1  uint32
-	Reserved2  uint32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   int32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Filler   [4]uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go
deleted file mode 100644
index 85d56eabd3..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_darwin_arm64.go
+++ /dev/null
@@ -1,457 +0,0 @@
-// +build arm64,darwin
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Timeval32 struct {
-	Sec  int32
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           int32
-	Mode          uint16
-	Nlink         uint16
-	Ino           uint64
-	Uid           uint32
-	Gid           uint32
-	Rdev          int32
-	Pad_cgo_0     [4]byte
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       int32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Qspare        [2]int64
-}
-
-type Statfs_t struct {
-	Bsize       uint32
-	Iosize      int32
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      uint64
-	Files       uint64
-	Ffree       uint64
-	Fsid        Fsid
-	Owner       uint32
-	Type        uint32
-	Flags       uint32
-	Fssubtype   uint32
-	Fstypename  [16]int8
-	Mntonname   [1024]int8
-	Mntfromname [1024]int8
-	Reserved    [8]uint32
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Fstore_t struct {
-	Flags      uint32
-	Posmode    int32
-	Offset     int64
-	Length     int64
-	Bytesalloc int64
-}
-
-type Radvisory_t struct {
-	Offset    int64
-	Count     int32
-	Pad_cgo_0 [4]byte
-}
-
-type Fbootstraptransfer_t struct {
-	Offset int64
-	Length uint64
-	Buffer *byte
-}
-
-type Log2phys_t struct {
-	Flags     uint32
-	Pad_cgo_0 [8]byte
-	Pad_cgo_1 [8]byte
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet4Pktinfo     = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-const (
-	SizeofIfMsghdr    = 0x70
-	SizeofIfData      = 0x60
-	SizeofIfaMsghdr   = 0x14
-	SizeofIfmaMsghdr  = 0x10
-	SizeofIfmaMsghdr2 = 0x14
-	SizeofRtMsghdr    = 0x5c
-	SizeofRtMetrics   = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval32
-	Unused2    uint32
-	Hwassist   uint32
-	Reserved1  uint32
-	Reserved2  uint32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   int32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Filler   [4]uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval32
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type Termios struct {
-	Iflag     uint64
-	Oflag     uint64
-	Cflag     uint64
-	Lflag     uint64
-	Cc        [20]uint8
-	Pad_cgo_0 [4]byte
-	Ispeed    uint64
-	Ospeed    uint64
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
deleted file mode 100644
index 8a6f4e1ce3..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
+++ /dev/null
@@ -1,443 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_dragonfly.go
-
-// +build amd64,dragonfly
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur int64
-	Max int64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Ino      uint64
-	Nlink    uint32
-	Dev      uint32
-	Mode     uint16
-	Padding1 uint16
-	Uid      uint32
-	Gid      uint32
-	Rdev     uint32
-	Atim     Timespec
-	Mtim     Timespec
-	Ctim     Timespec
-	Size     int64
-	Blocks   int64
-	Blksize  uint32
-	Flags    uint32
-	Gen      uint32
-	Lspare   int32
-	Qspare1  int64
-	Qspare2  int64
-}
-
-type Statfs_t struct {
-	Spare2      int64
-	Bsize       int64
-	Iosize      int64
-	Blocks      int64
-	Bfree       int64
-	Bavail      int64
-	Files       int64
-	Ffree       int64
-	Fsid        Fsid
-	Owner       uint32
-	Type        int32
-	Flags       int32
-	Pad_cgo_0   [4]byte
-	Syncwrites  int64
-	Asyncwrites int64
-	Fstypename  [16]int8
-	Mntonname   [80]int8
-	Syncreads   int64
-	Asyncreads  int64
-	Spares1     int16
-	Mntfromname [80]int8
-	Spares2     int16
-	Pad_cgo_1   [4]byte
-	Spare       [2]int64
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno  uint64
-	Namlen  uint16
-	Type    uint8
-	Unused1 uint8
-	Unused2 uint32
-	Name    [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-	Rcf    uint16
-	Route  [16]uint16
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [16]uint64
-}
-
-const (
-	SizeofIfMsghdr         = 0xb0
-	SizeofIfData           = 0xa0
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x98
-	SizeofRtMetrics        = 0x70
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Pad_cgo_0  [2]byte
-	Mtu        uint64
-	Metric     uint64
-	Link_state uint64
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Hwassist   uint64
-	Unused     uint64
-	Lastchange Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint64
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks     uint64
-	Mtu       uint64
-	Pksent    uint64
-	Expire    uint64
-	Sendpipe  uint64
-	Ssthresh  uint64
-	Rtt       uint64
-	Rttvar    uint64
-	Recvpipe  uint64
-	Hopcount  uint64
-	Mssopt    uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Msl       uint64
-	Iwmaxsegs uint64
-	Iwcapsegs uint64
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [6]byte
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go
deleted file mode 100644
index 8cf30947b4..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_386.go
+++ /dev/null
@@ -1,502 +0,0 @@
-// +build 386,freebsd
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur int64
-	Max int64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Dev           uint32
-	Ino           uint32
-	Mode          uint16
-	Nlink         uint16
-	Uid           uint32
-	Gid           uint32
-	Rdev          uint32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Birthtimespec Timespec
-	Pad_cgo_0     [8]byte
-}
-
-type Statfs_t struct {
-	Version     uint32
-	Type        uint32
-	Flags       uint64
-	Bsize       uint64
-	Iosize      uint64
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      int64
-	Files       uint64
-	Ffree       int64
-	Syncwrites  uint64
-	Asyncwrites uint64
-	Syncreads   uint64
-	Asyncreads  uint64
-	Spare       [10]uint64
-	Namemax     uint32
-	Owner       uint32
-	Fsid        Fsid
-	Charspare   [80]int8
-	Fstypename  [16]int8
-	Mntfromname [88]int8
-	Mntonname   [88]int8
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-	Sysid  int32
-}
-
-type Dirent struct {
-	Fileno uint32
-	Reclen uint16
-	Type   uint8
-	Namlen uint8
-	Name   [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [46]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPMreqn          = 0xc
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int32
-	Udata  *byte
-}
-
-type FdSet struct {
-	X__fds_bits [32]uint32
-}
-
-const (
-	sizeofIfMsghdr         = 0x64
-	SizeofIfMsghdr         = 0x60
-	sizeofIfData           = 0x54
-	SizeofIfData           = 0x50
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x5c
-	SizeofRtMetrics        = 0x38
-)
-
-type ifMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      ifData
-}
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type ifData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Vhid        uint8
-	Baudrate_pf uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint64
-	Epoch       int32
-	Lastchange  Timeval
-}
-
-type IfData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Spare_char1 uint8
-	Spare_char2 uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint32
-	Epoch       int32
-	Lastchange  Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Fmask     int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Weight   uint32
-	Filler   [3]uint32
-}
-
-const (
-	SizeofBpfVersion    = 0x4
-	SizeofBpfStat       = 0x8
-	SizeofBpfZbuf       = 0xc
-	SizeofBpfProgram    = 0x8
-	SizeofBpfInsn       = 0x8
-	SizeofBpfHdr        = 0x14
-	SizeofBpfZbufHeader = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfZbuf struct {
-	Bufa   *byte
-	Bufb   *byte
-	Buflen uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfZbufHeader struct {
-	Kernel_gen uint32
-	Kernel_len uint32
-	User_gen   uint32
-	X_bzh_pad  [5]uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
deleted file mode 100644
index e5feb207be..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
+++ /dev/null
@@ -1,505 +0,0 @@
-// +build amd64,freebsd
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur int64
-	Max int64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Dev           uint32
-	Ino           uint32
-	Mode          uint16
-	Nlink         uint16
-	Uid           uint32
-	Gid           uint32
-	Rdev          uint32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Birthtimespec Timespec
-}
-
-type Statfs_t struct {
-	Version     uint32
-	Type        uint32
-	Flags       uint64
-	Bsize       uint64
-	Iosize      uint64
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      int64
-	Files       uint64
-	Ffree       int64
-	Syncwrites  uint64
-	Asyncwrites uint64
-	Syncreads   uint64
-	Asyncreads  uint64
-	Spare       [10]uint64
-	Namemax     uint32
-	Owner       uint32
-	Fsid        Fsid
-	Charspare   [80]int8
-	Fstypename  [16]int8
-	Mntfromname [88]int8
-	Mntonname   [88]int8
-}
-
-type Flock_t struct {
-	Start     int64
-	Len       int64
-	Pid       int32
-	Type      int16
-	Whence    int16
-	Sysid     int32
-	Pad_cgo_0 [4]byte
-}
-
-type Dirent struct {
-	Fileno uint32
-	Reclen uint16
-	Type   uint8
-	Namlen uint8
-	Name   [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [46]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPMreqn          = 0xc
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	X__fds_bits [16]uint64
-}
-
-const (
-	sizeofIfMsghdr         = 0xa8
-	SizeofIfMsghdr         = 0xa8
-	sizeofIfData           = 0x98
-	SizeofIfData           = 0x98
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x98
-	SizeofRtMetrics        = 0x70
-)
-
-type ifMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      ifData
-}
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type ifData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Vhid        uint8
-	Baudrate_pf uint8
-	Datalen     uint8
-	Mtu         uint64
-	Metric      uint64
-	Baudrate    uint64
-	Ipackets    uint64
-	Ierrors     uint64
-	Opackets    uint64
-	Oerrors     uint64
-	Collisions  uint64
-	Ibytes      uint64
-	Obytes      uint64
-	Imcasts     uint64
-	Omcasts     uint64
-	Iqdrops     uint64
-	Noproto     uint64
-	Hwassist    uint64
-	Epoch       int64
-	Lastchange  Timeval
-}
-
-type IfData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Spare_char1 uint8
-	Spare_char2 uint8
-	Datalen     uint8
-	Mtu         uint64
-	Metric      uint64
-	Baudrate    uint64
-	Ipackets    uint64
-	Ierrors     uint64
-	Opackets    uint64
-	Oerrors     uint64
-	Collisions  uint64
-	Ibytes      uint64
-	Obytes      uint64
-	Imcasts     uint64
-	Omcasts     uint64
-	Iqdrops     uint64
-	Noproto     uint64
-	Hwassist    uint64
-	Epoch       int64
-	Lastchange  Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Fmask     int32
-	Inits     uint64
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint64
-	Mtu      uint64
-	Hopcount uint64
-	Expire   uint64
-	Recvpipe uint64
-	Sendpipe uint64
-	Ssthresh uint64
-	Rtt      uint64
-	Rttvar   uint64
-	Pksent   uint64
-	Weight   uint64
-	Filler   [3]uint64
-}
-
-const (
-	SizeofBpfVersion    = 0x4
-	SizeofBpfStat       = 0x8
-	SizeofBpfZbuf       = 0x18
-	SizeofBpfProgram    = 0x10
-	SizeofBpfInsn       = 0x8
-	SizeofBpfHdr        = 0x20
-	SizeofBpfZbufHeader = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfZbuf struct {
-	Bufa   *byte
-	Bufb   *byte
-	Buflen uint64
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [6]byte
-}
-
-type BpfZbufHeader struct {
-	Kernel_gen uint32
-	Kernel_len uint32
-	User_gen   uint32
-	X_bzh_pad  [5]uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go
deleted file mode 100644
index 5472b54284..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_freebsd_arm.go
+++ /dev/null
@@ -1,497 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -fsigned-char types_freebsd.go
-
-// +build arm,freebsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec       int64
-	Nsec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur int64
-	Max int64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Dev           uint32
-	Ino           uint32
-	Mode          uint16
-	Nlink         uint16
-	Uid           uint32
-	Gid           uint32
-	Rdev          uint32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Birthtimespec Timespec
-}
-
-type Statfs_t struct {
-	Version     uint32
-	Type        uint32
-	Flags       uint64
-	Bsize       uint64
-	Iosize      uint64
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      int64
-	Files       uint64
-	Ffree       int64
-	Syncwrites  uint64
-	Asyncwrites uint64
-	Syncreads   uint64
-	Asyncreads  uint64
-	Spare       [10]uint64
-	Namemax     uint32
-	Owner       uint32
-	Fsid        Fsid
-	Charspare   [80]int8
-	Fstypename  [16]int8
-	Mntfromname [88]int8
-	Mntonname   [88]int8
-}
-
-type Flock_t struct {
-	Start     int64
-	Len       int64
-	Pid       int32
-	Type      int16
-	Whence    int16
-	Sysid     int32
-	Pad_cgo_0 [4]byte
-}
-
-type Dirent struct {
-	Fileno uint32
-	Reclen uint16
-	Type   uint8
-	Namlen uint8
-	Name   [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [46]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPMreqn          = 0xc
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int32
-	Udata  *byte
-}
-
-type FdSet struct {
-	X__fds_bits [32]uint32
-}
-
-const (
-	sizeofIfMsghdr         = 0x70
-	SizeofIfMsghdr         = 0x70
-	sizeofIfData           = 0x60
-	SizeofIfData           = 0x60
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x5c
-	SizeofRtMetrics        = 0x38
-)
-
-type ifMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      ifData
-}
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type ifData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Vhid        uint8
-	Baudrate_pf uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint64
-	Epoch       int64
-	Lastchange  Timeval
-}
-
-type IfData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Spare_char1 uint8
-	Spare_char2 uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint32
-	Pad_cgo_0   [4]byte
-	Epoch       int64
-	Lastchange  Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Fmask     int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Weight   uint32
-	Filler   [3]uint32
-}
-
-const (
-	SizeofBpfVersion    = 0x4
-	SizeofBpfStat       = 0x8
-	SizeofBpfZbuf       = 0xc
-	SizeofBpfProgram    = 0x8
-	SizeofBpfInsn       = 0x8
-	SizeofBpfHdr        = 0x20
-	SizeofBpfZbufHeader = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfZbuf struct {
-	Bufa   *byte
-	Bufb   *byte
-	Buflen uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [6]byte
-}
-
-type BpfZbufHeader struct {
-	Kernel_gen uint32
-	Kernel_len uint32
-	User_gen   uint32
-	X_bzh_pad  [5]uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go
deleted file mode 100644
index fb1257ae02..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_386.go
+++ /dev/null
@@ -1,607 +0,0 @@
-// +build 386,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timex struct {
-	Modes     uint32
-	Offset    int32
-	Freq      int32
-	Maxerror  int32
-	Esterror  int32
-	Status    int32
-	Constant  int32
-	Precision int32
-	Tolerance int32
-	Time      Timeval
-	Tick      int32
-	Ppsfreq   int32
-	Jitter    int32
-	Shift     int32
-	Stabil    int32
-	Jitcnt    int32
-	Calcnt    int32
-	Errcnt    int32
-	Stbcnt    int32
-	Tai       int32
-	Pad_cgo_0 [44]byte
-}
-
-type Time_t int32
-
-type Tms struct {
-	Utime  int32
-	Stime  int32
-	Cutime int32
-	Cstime int32
-}
-
-type Utimbuf struct {
-	Actime  int32
-	Modtime int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev       uint64
-	X__pad1   uint16
-	Pad_cgo_0 [2]byte
-	X__st_ino uint32
-	Mode      uint32
-	Nlink     uint32
-	Uid       uint32
-	Gid       uint32
-	Rdev      uint64
-	X__pad2   uint16
-	Pad_cgo_1 [2]byte
-	Size      int64
-	Blksize   int32
-	Blocks    int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	Ino       uint64
-}
-
-type Statfs_t struct {
-	Type    int32
-	Bsize   int32
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int32
-	Frsize  int32
-	Flags   int32
-	Spare   [4]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [1]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type   int16
-	Whence int16
-	Start  int64
-	Len    int64
-	Pid    int32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len          uint32
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x1c
-	SizeofCmsghdr           = 0xc
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x1d
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x8
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-	Name   [0]int8
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Ebx      int32
-	Ecx      int32
-	Edx      int32
-	Esi      int32
-	Edi      int32
-	Ebp      int32
-	Eax      int32
-	Xds      int32
-	Xes      int32
-	Xfs      int32
-	Xgs      int32
-	Orig_eax int32
-	Eip      int32
-	Xcs      int32
-	Eflags   int32
-	Esp      int32
-	Xss      int32
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-type Sysinfo_t struct {
-	Uptime    int32
-	Loads     [3]uint32
-	Totalram  uint32
-	Freeram   uint32
-	Sharedram uint32
-	Bufferram uint32
-	Totalswap uint32
-	Freeswap  uint32
-	Procs     uint16
-	Pad       uint16
-	Totalhigh uint32
-	Freehigh  uint32
-	Unit      uint32
-	X_f       [8]int8
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree  int32
-	Tinode uint32
-	Fname  [6]int8
-	Fpack  [6]int8
-}
-
-type EpollEvent struct {
-	Events uint32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go
deleted file mode 100644
index 34edb3685f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ /dev/null
@@ -1,625 +0,0 @@
-// +build amd64,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev       uint64
-	Ino       uint64
-	Nlink     uint64
-	Mode      uint32
-	Uid       uint32
-	Gid       uint32
-	X__pad0   int32
-	Rdev      uint64
-	Size      int64
-	Blksize   int64
-	Blocks    int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	X__unused [3]int64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len          uint64
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x1d
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-	Name   [0]int8
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	R15      uint64
-	R14      uint64
-	R13      uint64
-	R12      uint64
-	Rbp      uint64
-	Rbx      uint64
-	R11      uint64
-	R10      uint64
-	R9       uint64
-	R8       uint64
-	Rax      uint64
-	Rcx      uint64
-	Rdx      uint64
-	Rsi      uint64
-	Rdi      uint64
-	Orig_rax uint64
-	Rip      uint64
-	Cs       uint64
-	Eflags   uint64
-	Rsp      uint64
-	Ss       uint64
-	Fs_base  uint64
-	Gs_base  uint64
-	Ds       uint64
-	Es       uint64
-	Fs       uint64
-	Gs       uint64
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go
deleted file mode 100644
index 0fef350b14..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ /dev/null
@@ -1,587 +0,0 @@
-// +build arm,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timex struct {
-	Modes     uint32
-	Offset    int32
-	Freq      int32
-	Maxerror  int32
-	Esterror  int32
-	Status    int32
-	Constant  int32
-	Precision int32
-	Tolerance int32
-	Time      Timeval
-	Tick      int32
-	Ppsfreq   int32
-	Jitter    int32
-	Shift     int32
-	Stabil    int32
-	Jitcnt    int32
-	Calcnt    int32
-	Errcnt    int32
-	Stbcnt    int32
-	Tai       int32
-	Pad_cgo_0 [44]byte
-}
-
-type Time_t int32
-
-type Tms struct {
-	Utime  int32
-	Stime  int32
-	Cutime int32
-	Cstime int32
-}
-
-type Utimbuf struct {
-	Actime  int32
-	Modtime int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev       uint64
-	X__pad1   uint16
-	Pad_cgo_0 [2]byte
-	X__st_ino uint32
-	Mode      uint32
-	Nlink     uint32
-	Uid       uint32
-	Gid       uint32
-	Rdev      uint64
-	X__pad2   uint16
-	Pad_cgo_1 [6]byte
-	Size      int64
-	Blksize   int32
-	Pad_cgo_2 [4]byte
-	Blocks    int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	Ino       uint64
-}
-
-type Statfs_t struct {
-	Type      int32
-	Bsize     int32
-	Blocks    uint64
-	Bfree     uint64
-	Bavail    uint64
-	Files     uint64
-	Ffree     uint64
-	Fsid      Fsid
-	Namelen   int32
-	Frsize    int32
-	Flags     int32
-	Spare     [4]int32
-	Pad_cgo_0 [4]byte
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]uint8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]uint8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]uint8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len          uint32
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x1c
-	SizeofCmsghdr           = 0xc
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x1d
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x8
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-	Name   [0]uint8
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Uregs [18]uint32
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-type Sysinfo_t struct {
-	Uptime    int32
-	Loads     [3]uint32
-	Totalram  uint32
-	Freeram   uint32
-	Sharedram uint32
-	Bufferram uint32
-	Totalswap uint32
-	Freeswap  uint32
-	Procs     uint16
-	Pad       uint16
-	Totalhigh uint32
-	Freehigh  uint32
-	Unit      uint32
-	X_f       [8]uint8
-}
-
-type Utsname struct {
-	Sysname    [65]uint8
-	Nodename   [65]uint8
-	Release    [65]uint8
-	Version    [65]uint8
-	Machine    [65]uint8
-	Domainname [65]uint8
-}
-
-type Ustat_t struct {
-	Tfree  int32
-	Tinode uint32
-	Fname  [6]uint8
-	Fpack  [6]uint8
-}
-
-type EpollEvent struct {
-	Events uint32
-	PadFd  int32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go
deleted file mode 100644
index 28b7cd43ce..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_arm64.go
+++ /dev/null
@@ -1,604 +0,0 @@
-// +build arm64,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -fsigned-char types_linux.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev               uint64
-	Ino               uint64
-	Mode              uint32
-	Nlink             uint32
-	Uid               uint32
-	Gid               uint32
-	Rdev              uint64
-	X__pad1           uint64
-	Size              int64
-	Blksize           int32
-	X__pad2           int32
-	Blocks            int64
-	Atim              Timespec
-	Mtim              Timespec
-	Ctim              Timespec
-	X__glibc_reserved [2]int32
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len          uint64
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x22
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-	Name   [0]int8
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Regs   [31]uint64
-	Sp     uint64
-	Pc     uint64
-	Pstate uint64
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	PadFd  int32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64.go
deleted file mode 100644
index 8fe5af2628..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64.go
+++ /dev/null
@@ -1,607 +0,0 @@
-// +build mips64,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint32
-	Pad1    [3]int32
-	Ino     uint64
-	Mode    uint32
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    uint32
-	Pad2    [3]uint32
-	Size    int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Blksize uint32
-	Pad4    uint32
-	Blocks  int64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Frsize  int64
-	Blocks  uint64
-	Bfree   uint64
-	Files   uint64
-	Ffree   uint64
-	Bavail  uint64
-	Fsid    Fsid
-	Namelen int64
-	Flags   int64
-	Spare   [5]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x27
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Regs        [102]uint64
-	U_tsize     uint64
-	U_dsize     uint64
-	U_ssize     uint64
-	Start_code  uint64
-	Start_data  uint64
-	Start_stack uint64
-	Signal      int64
-	U_ar0       uint64
-	Magic       uint64
-	U_comm      [32]int8
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Line      uint8
-	Cc        [32]uint8
-	Pad_cgo_0 [3]byte
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64le.go
deleted file mode 100644
index df16e83c5b..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_mips64le.go
+++ /dev/null
@@ -1,607 +0,0 @@
-// +build mips64le,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint32
-	Pad1    [3]int32
-	Ino     uint64
-	Mode    uint32
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    uint32
-	Pad2    [3]uint32
-	Size    int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Blksize uint32
-	Pad4    uint32
-	Blocks  int64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Frsize  int64
-	Blocks  uint64
-	Bfree   uint64
-	Files   uint64
-	Ffree   uint64
-	Bavail  uint64
-	Fsid    Fsid
-	Namelen int64
-	Flags   int64
-	Spare   [5]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x27
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Regs        [102]uint64
-	U_tsize     uint64
-	U_dsize     uint64
-	U_ssize     uint64
-	Start_code  uint64
-	Start_data  uint64
-	Start_stack uint64
-	Signal      int64
-	U_ar0       uint64
-	Magic       uint64
-	U_comm      [32]int8
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Line      uint8
-	Cc        [32]uint8
-	Pad_cgo_0 [3]byte
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go
deleted file mode 100644
index d1105402ec..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64.go
+++ /dev/null
@@ -1,614 +0,0 @@
-// +build ppc64,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev                uint64
-	Ino                uint64
-	Nlink              uint64
-	Mode               uint32
-	Uid                uint32
-	Gid                uint32
-	X__pad2            int32
-	Rdev               uint64
-	Size               int64
-	Blksize            int64
-	Blocks             int64
-	Atim               Timespec
-	Mtim               Timespec
-	Ctim               Timespec
-	X__glibc_reserved4 uint64
-	X__glibc_reserved5 uint64
-	X__glibc_reserved6 uint64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]uint8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]uint8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]uint8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len          uint64
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x23
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-	Name   [0]uint8
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Gpr       [32]uint64
-	Nip       uint64
-	Msr       uint64
-	Orig_gpr3 uint64
-	Ctr       uint64
-	Link      uint64
-	Xer       uint64
-	Ccr       uint64
-	Softe     uint64
-	Trap      uint64
-	Dar       uint64
-	Dsisr     uint64
-	Result    uint64
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]uint8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]uint8
-	Nodename   [65]uint8
-	Release    [65]uint8
-	Version    [65]uint8
-	Machine    [65]uint8
-	Domainname [65]uint8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]uint8
-	Fpack     [6]uint8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events  uint32
-	X_padFd int32
-	Fd      int32
-	Pad     int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [19]uint8
-	Line   uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
deleted file mode 100644
index 8e25c9fffc..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
+++ /dev/null
@@ -1,614 +0,0 @@
-// +build ppc64le,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev                uint64
-	Ino                uint64
-	Nlink              uint64
-	Mode               uint32
-	Uid                uint32
-	Gid                uint32
-	X__pad2            int32
-	Rdev               uint64
-	Size               int64
-	Blksize            int64
-	Blocks             int64
-	Atim               Timespec
-	Mtim               Timespec
-	Ctim               Timespec
-	X__glibc_reserved4 uint64
-	X__glibc_reserved5 uint64
-	X__glibc_reserved6 uint64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]uint8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]uint8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]uint8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len          uint64
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x22
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-	Name   [0]uint8
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Gpr       [32]uint64
-	Nip       uint64
-	Msr       uint64
-	Orig_gpr3 uint64
-	Ctr       uint64
-	Link      uint64
-	Xer       uint64
-	Ccr       uint64
-	Softe     uint64
-	Trap      uint64
-	Dar       uint64
-	Dsisr     uint64
-	Result    uint64
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]uint8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]uint8
-	Nodename   [65]uint8
-	Release    [65]uint8
-	Version    [65]uint8
-	Machine    [65]uint8
-	Domainname [65]uint8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]uint8
-	Fpack     [6]uint8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events  uint32
-	X_padFd int32
-	Fd      int32
-	Pad     int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [19]uint8
-	Line   uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_s390x.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_s390x.go
deleted file mode 100644
index 268e373624..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_linux_s390x.go
+++ /dev/null
@@ -1,629 +0,0 @@
-// +build s390x,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -fsigned-char types_linux.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	_         [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	_         [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	_         [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	_         [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint64
-	Ino     uint64
-	Nlink   uint64
-	Mode    uint32
-	Uid     uint32
-	Gid     uint32
-	_       int32
-	Rdev    uint64
-	Size    int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Blksize int64
-	Blocks  int64
-	_       [3]int64
-}
-
-type Statfs_t struct {
-	Type    uint32
-	Bsize   uint32
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen uint32
-	Frsize  uint32
-	Flags   uint32
-	Spare   [4]uint32
-	_       [4]byte
-}
-
-type Dirent struct {
-	Ino    uint64
-	Off    int64
-	Reclen uint16
-	Type   uint8
-	Name   [256]int8
-	_      [5]byte
-}
-
-type Fsid struct {
-	_ [2]int32
-}
-
-type Flock_t struct {
-	Type   int16
-	Whence int16
-	_      [4]byte
-	Start  int64
-	Len    int64
-	Pid    int32
-	_      [4]byte
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x6
-	FADV_NOREUSE    = 0x7
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	_          [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	_          [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	_              [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x27
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family uint8
-	_      uint8
-	Type   uint16
-	Index  int32
-	Flags  uint32
-	Change uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len    uint16
-	_      [6]byte
-	Filter *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Psw                      PtracePsw
-	Gprs                     [16]uint64
-	Acrs                     [16]uint32
-	Orig_gpr2                uint64
-	Fp_regs                  PtraceFpregs
-	Per_info                 PtracePer
-	Ieee_instruction_pointer uint64
-}
-
-type PtracePsw struct {
-	Mask uint64
-	Addr uint64
-}
-
-type PtraceFpregs struct {
-	Fpc  uint32
-	_    [4]byte
-	Fprs [16]float64
-}
-
-type PtracePer struct {
-	_             [0]uint64
-	_             [24]byte
-	_             [8]byte
-	Starting_addr uint64
-	Ending_addr   uint64
-	Perc_atmid    uint16
-	_             [6]byte
-	Address       uint64
-	Access_id     uint8
-	_             [7]byte
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	_         [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	_         [0]int8
-	_         [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree  int32
-	_      [4]byte
-	Tinode uint64
-	Fname  [6]int8
-	Fpack  [6]int8
-	_      [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	_      int32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go
deleted file mode 100644
index caf755fb86..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_386.go
+++ /dev/null
@@ -1,396 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_netbsd.go
-
-// +build 386,netbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           uint64
-	Mode          uint32
-	Ino           uint64
-	Nlink         uint32
-	Uid           uint32
-	Gid           uint32
-	Rdev          uint64
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Spare         [2]uint32
-}
-
-type Statfs_t [0]byte
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno    uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [512]int8
-	Pad_cgo_0 [3]byte
-}
-
-type Fsid struct {
-	X__fsid_val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter uint32
-	Flags  uint32
-	Fflags uint32
-	Data   int64
-	Udata  int32
-}
-
-type FdSet struct {
-	Bits [8]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0x98
-	SizeofIfData           = 0x84
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x78
-	SizeofRtMetrics        = 0x50
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-	Pad_cgo_1 [4]byte
-}
-
-type IfData struct {
-	Type       uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Pad_cgo_0  [1]byte
-	Link_state int32
-	Mtu        uint64
-	Metric     uint64
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Lastchange Timespec
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Metric    int32
-	Index     uint16
-	Pad_cgo_0 [6]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     int32
-	Pad_cgo_1 [4]byte
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint64
-	Mtu      uint64
-	Hopcount uint64
-	Recvpipe uint64
-	Sendpipe uint64
-	Ssthresh uint64
-	Rtt      uint64
-	Rttvar   uint64
-	Expire   int64
-	Pksent   int64
-}
-
-type Mclpool [0]byte
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x80
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv    uint64
-	Drop    uint64
-	Capt    uint64
-	Padding [13]uint64
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfTimeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
-
-type Sysctlnode struct {
-	Flags           uint32
-	Num             int32
-	Name            [32]int8
-	Ver             uint32
-	X__rsvd         uint32
-	Un              [16]byte
-	X_sysctl_size   [8]byte
-	X_sysctl_func   [8]byte
-	X_sysctl_parent [8]byte
-	X_sysctl_desc   [8]byte
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
deleted file mode 100644
index 91b4a5305a..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
+++ /dev/null
@@ -1,403 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_netbsd.go
-
-// +build amd64,netbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           uint64
-	Mode          uint32
-	Pad_cgo_0     [4]byte
-	Ino           uint64
-	Nlink         uint32
-	Uid           uint32
-	Gid           uint32
-	Pad_cgo_1     [4]byte
-	Rdev          uint64
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Spare         [2]uint32
-	Pad_cgo_2     [4]byte
-}
-
-type Statfs_t [0]byte
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno    uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [512]int8
-	Pad_cgo_0 [3]byte
-}
-
-type Fsid struct {
-	X__fsid_val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident     uint64
-	Filter    uint32
-	Flags     uint32
-	Fflags    uint32
-	Pad_cgo_0 [4]byte
-	Data      int64
-	Udata     int64
-}
-
-type FdSet struct {
-	Bits [8]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0x98
-	SizeofIfData           = 0x88
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x78
-	SizeofRtMetrics        = 0x50
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Pad_cgo_0  [1]byte
-	Link_state int32
-	Mtu        uint64
-	Metric     uint64
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Lastchange Timespec
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Metric    int32
-	Index     uint16
-	Pad_cgo_0 [6]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     int32
-	Pad_cgo_1 [4]byte
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint64
-	Mtu      uint64
-	Hopcount uint64
-	Recvpipe uint64
-	Sendpipe uint64
-	Ssthresh uint64
-	Rtt      uint64
-	Rttvar   uint64
-	Expire   int64
-	Pksent   int64
-}
-
-type Mclpool [0]byte
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x80
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv    uint64
-	Drop    uint64
-	Capt    uint64
-	Padding [13]uint64
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [6]byte
-}
-
-type BpfTimeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
-
-type Sysctlnode struct {
-	Flags           uint32
-	Num             int32
-	Name            [32]int8
-	Ver             uint32
-	X__rsvd         uint32
-	Un              [16]byte
-	X_sysctl_size   [8]byte
-	X_sysctl_func   [8]byte
-	X_sysctl_parent [8]byte
-	X_sysctl_desc   [8]byte
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go
deleted file mode 100644
index c0758f9d3f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_netbsd_arm.go
+++ /dev/null
@@ -1,401 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_netbsd.go
-
-// +build arm,netbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec       int64
-	Nsec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           uint64
-	Mode          uint32
-	Pad_cgo_0     [4]byte
-	Ino           uint64
-	Nlink         uint32
-	Uid           uint32
-	Gid           uint32
-	Pad_cgo_1     [4]byte
-	Rdev          uint64
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Spare         [2]uint32
-	Pad_cgo_2     [4]byte
-}
-
-type Statfs_t [0]byte
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno    uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [512]int8
-	Pad_cgo_0 [3]byte
-}
-
-type Fsid struct {
-	X__fsid_val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident     uint32
-	Filter    uint32
-	Flags     uint32
-	Fflags    uint32
-	Data      int64
-	Udata     int32
-	Pad_cgo_0 [4]byte
-}
-
-type FdSet struct {
-	Bits [8]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0x98
-	SizeofIfData           = 0x88
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x78
-	SizeofRtMetrics        = 0x50
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Pad_cgo_0  [1]byte
-	Link_state int32
-	Mtu        uint64
-	Metric     uint64
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Lastchange Timespec
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Metric    int32
-	Index     uint16
-	Pad_cgo_0 [6]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     int32
-	Pad_cgo_1 [4]byte
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint64
-	Mtu      uint64
-	Hopcount uint64
-	Recvpipe uint64
-	Sendpipe uint64
-	Ssthresh uint64
-	Rtt      uint64
-	Rttvar   uint64
-	Expire   int64
-	Pksent   int64
-}
-
-type Mclpool [0]byte
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x80
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv    uint64
-	Drop    uint64
-	Capt    uint64
-	Padding [13]uint64
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfTimeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
-
-type Sysctlnode struct {
-	Flags           uint32
-	Num             int32
-	Name            [32]int8
-	Ver             uint32
-	X__rsvd         uint32
-	Un              [16]byte
-	X_sysctl_size   [8]byte
-	X_sysctl_func   [8]byte
-	X_sysctl_parent [8]byte
-	X_sysctl_desc   [8]byte
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go
deleted file mode 100644
index 860a469796..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_386.go
+++ /dev/null
@@ -1,441 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_openbsd.go
-
-// +build 386,openbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Mode           uint32
-	Dev            int32
-	Ino            uint64
-	Nlink          uint32
-	Uid            uint32
-	Gid            uint32
-	Rdev           int32
-	Atim           Timespec
-	Mtim           Timespec
-	Ctim           Timespec
-	Size           int64
-	Blocks         int64
-	Blksize        uint32
-	Flags          uint32
-	Gen            uint32
-	X__st_birthtim Timespec
-}
-
-type Statfs_t struct {
-	F_flags       uint32
-	F_bsize       uint32
-	F_iosize      uint32
-	F_blocks      uint64
-	F_bfree       uint64
-	F_bavail      int64
-	F_files       uint64
-	F_ffree       uint64
-	F_favail      int64
-	F_syncwrites  uint64
-	F_syncreads   uint64
-	F_asyncwrites uint64
-	F_asyncreads  uint64
-	F_fsid        Fsid
-	F_namemax     uint32
-	F_owner       uint32
-	F_ctime       uint64
-	F_fstypename  [16]int8
-	F_mntonname   [90]int8
-	F_mntfromname [90]int8
-	F_mntfromspec [90]int8
-	Pad_cgo_0     [2]byte
-	Mount_info    [160]byte
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno       uint64
-	Off          int64
-	Reclen       uint16
-	Type         uint8
-	Namlen       uint8
-	X__d_padding [4]uint8
-	Name         [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [24]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x20
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0xec
-	SizeofIfData           = 0xd4
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x1a
-	SizeofRtMsghdr         = 0x60
-	SizeofRtMetrics        = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Xflags  int32
-	Data    IfData
-}
-
-type IfData struct {
-	Type         uint8
-	Addrlen      uint8
-	Hdrlen       uint8
-	Link_state   uint8
-	Mtu          uint32
-	Metric       uint32
-	Pad          uint32
-	Baudrate     uint64
-	Ipackets     uint64
-	Ierrors      uint64
-	Opackets     uint64
-	Oerrors      uint64
-	Collisions   uint64
-	Ibytes       uint64
-	Obytes       uint64
-	Imcasts      uint64
-	Omcasts      uint64
-	Iqdrops      uint64
-	Noproto      uint64
-	Capabilities uint32
-	Lastchange   Timeval
-	Mclpool      [7]Mclpool
-}
-
-type IfaMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Metric  int32
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	What    uint16
-	Name    [16]int8
-}
-
-type RtMsghdr struct {
-	Msglen   uint16
-	Version  uint8
-	Type     uint8
-	Hdrlen   uint16
-	Index    uint16
-	Tableid  uint16
-	Priority uint8
-	Mpls     uint8
-	Addrs    int32
-	Flags    int32
-	Fmask    int32
-	Pid      int32
-	Seq      int32
-	Errno    int32
-	Inits    uint32
-	Rmx      RtMetrics
-}
-
-type RtMetrics struct {
-	Pksent   uint64
-	Expire   int64
-	Locks    uint32
-	Mtu      uint32
-	Refcnt   uint32
-	Hopcount uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pad      uint32
-}
-
-type Mclpool struct {
-	Grown int32
-	Alive uint16
-	Hwm   uint16
-	Cwm   uint16
-	Lwm   uint16
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfTimeval struct {
-	Sec  uint32
-	Usec uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
deleted file mode 100644
index 23c52727f7..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
+++ /dev/null
@@ -1,448 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_openbsd.go
-
-// +build amd64,openbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Mode           uint32
-	Dev            int32
-	Ino            uint64
-	Nlink          uint32
-	Uid            uint32
-	Gid            uint32
-	Rdev           int32
-	Atim           Timespec
-	Mtim           Timespec
-	Ctim           Timespec
-	Size           int64
-	Blocks         int64
-	Blksize        uint32
-	Flags          uint32
-	Gen            uint32
-	Pad_cgo_0      [4]byte
-	X__st_birthtim Timespec
-}
-
-type Statfs_t struct {
-	F_flags       uint32
-	F_bsize       uint32
-	F_iosize      uint32
-	Pad_cgo_0     [4]byte
-	F_blocks      uint64
-	F_bfree       uint64
-	F_bavail      int64
-	F_files       uint64
-	F_ffree       uint64
-	F_favail      int64
-	F_syncwrites  uint64
-	F_syncreads   uint64
-	F_asyncwrites uint64
-	F_asyncreads  uint64
-	F_fsid        Fsid
-	F_namemax     uint32
-	F_owner       uint32
-	F_ctime       uint64
-	F_fstypename  [16]int8
-	F_mntonname   [90]int8
-	F_mntfromname [90]int8
-	F_mntfromspec [90]int8
-	Pad_cgo_1     [2]byte
-	Mount_info    [160]byte
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno       uint64
-	Off          int64
-	Reclen       uint16
-	Type         uint8
-	Namlen       uint8
-	X__d_padding [4]uint8
-	Name         [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [24]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x20
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0xf8
-	SizeofIfData           = 0xe0
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x1a
-	SizeofRtMsghdr         = 0x60
-	SizeofRtMetrics        = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Xflags  int32
-	Data    IfData
-}
-
-type IfData struct {
-	Type         uint8
-	Addrlen      uint8
-	Hdrlen       uint8
-	Link_state   uint8
-	Mtu          uint32
-	Metric       uint32
-	Pad          uint32
-	Baudrate     uint64
-	Ipackets     uint64
-	Ierrors      uint64
-	Opackets     uint64
-	Oerrors      uint64
-	Collisions   uint64
-	Ibytes       uint64
-	Obytes       uint64
-	Imcasts      uint64
-	Omcasts      uint64
-	Iqdrops      uint64
-	Noproto      uint64
-	Capabilities uint32
-	Pad_cgo_0    [4]byte
-	Lastchange   Timeval
-	Mclpool      [7]Mclpool
-	Pad_cgo_1    [4]byte
-}
-
-type IfaMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Metric  int32
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	What    uint16
-	Name    [16]int8
-}
-
-type RtMsghdr struct {
-	Msglen   uint16
-	Version  uint8
-	Type     uint8
-	Hdrlen   uint16
-	Index    uint16
-	Tableid  uint16
-	Priority uint8
-	Mpls     uint8
-	Addrs    int32
-	Flags    int32
-	Fmask    int32
-	Pid      int32
-	Seq      int32
-	Errno    int32
-	Inits    uint32
-	Rmx      RtMetrics
-}
-
-type RtMetrics struct {
-	Pksent   uint64
-	Expire   int64
-	Locks    uint32
-	Mtu      uint32
-	Refcnt   uint32
-	Hopcount uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pad      uint32
-}
-
-type Mclpool struct {
-	Grown int32
-	Alive uint16
-	Hwm   uint16
-	Cwm   uint16
-	Lwm   uint16
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfTimeval struct {
-	Sec  uint32
-	Usec uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go
deleted file mode 100644
index b3b928a51e..0000000000
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/ztypes_solaris_amd64.go
+++ /dev/null
@@ -1,422 +0,0 @@
-// +build amd64,solaris
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_solaris.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x400
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timeval32 struct {
-	Sec  int32
-	Usec int32
-}
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Dev       uint64
-	Ino       uint64
-	Mode      uint32
-	Nlink     uint32
-	Uid       uint32
-	Gid       uint32
-	Rdev      uint64
-	Size      int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	Blksize   int32
-	Pad_cgo_0 [4]byte
-	Blocks    int64
-	Fstype    [16]int8
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Sysid     int32
-	Pid       int32
-	Pad       [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Name      [1]int8
-	Pad_cgo_0 [5]byte
-}
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Family         uint16
-	Port           uint16
-	Flowinfo       uint32
-	Addr           [16]byte /* in6_addr */
-	Scope_id       uint32
-	X__sin6_src_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrDatalink struct {
-	Family uint16
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [244]int8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [236]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *int8
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name         *byte
-	Namelen      uint32
-	Pad_cgo_0    [4]byte
-	Iov          *Iovec
-	Iovlen       int32
-	Pad_cgo_1    [4]byte
-	Accrights    *int8
-	Accrightslen int32
-	Pad_cgo_2    [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	X__icmp6_filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x20
-	SizeofSockaddrAny      = 0xfc
-	SizeofSockaddrUnix     = 0x6e
-	SizeofSockaddrDatalink = 0xfc
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x24
-	SizeofICMPv6Filter     = 0x20
-)
-
-type FdSet struct {
-	Bits [1024]int64
-}
-
-type Utsname struct {
-	Sysname  [257]int8
-	Nodename [257]int8
-	Release  [257]int8
-	Version  [257]int8
-	Machine  [257]int8
-}
-
-type Ustat_t struct {
-	Tfree     int64
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_0 [4]byte
-}
-
-const (
-	AT_FDCWD            = 0xffd19553
-	AT_SYMLINK_NOFOLLOW = 0x1000
-	AT_SYMLINK_FOLLOW   = 0x2000
-	AT_REMOVEDIR        = 0x1
-	AT_EACCESS          = 0x4
-)
-
-const (
-	SizeofIfMsghdr  = 0x54
-	SizeofIfData    = 0x44
-	SizeofIfaMsghdr = 0x14
-	SizeofRtMsghdr  = 0x4c
-	SizeofRtMetrics = 0x28
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Pad_cgo_0  [1]byte
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Lastchange Timeval32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x80
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv    uint64
-	Drop    uint64
-	Capt    uint64
-	Padding [13]uint64
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfTimeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-const _SC_PAGESIZE = 0xb
-
-type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Cc        [19]uint8
-	Pad_cgo_0 [1]byte
-}
-
-type Termio struct {
-	Iflag     uint16
-	Oflag     uint16
-	Cflag     uint16
-	Lflag     uint16
-	Line      int8
-	Cc        [8]uint8
-	Pad_cgo_0 [1]byte
-}
-
-type Winsize struct {
-	Row    uint16
-	Col    uint16
-	Xpixel uint16
-	Ypixel uint16
-}
diff --git a/Godeps/_workspace/src/golang.org/x/tools/LICENSE b/Godeps/_workspace/src/golang.org/x/tools/LICENSE
deleted file mode 100644
index 6a66aea5ea..0000000000
--- a/Godeps/_workspace/src/golang.org/x/tools/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/golang.org/x/tools/PATENTS b/Godeps/_workspace/src/golang.org/x/tools/PATENTS
deleted file mode 100644
index 733099041f..0000000000
--- a/Godeps/_workspace/src/golang.org/x/tools/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/golang.org/x/tools/go/vcs/discovery.go b/Godeps/_workspace/src/golang.org/x/tools/go/vcs/discovery.go
deleted file mode 100644
index c4b0e3d142..0000000000
--- a/Godeps/_workspace/src/golang.org/x/tools/go/vcs/discovery.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vcs
-
-import (
-	"encoding/xml"
-	"fmt"
-	"io"
-	"strings"
-)
-
-// charsetReader returns a reader for the given charset. Currently
-// it only supports UTF-8 and ASCII. Otherwise, it returns a meaningful
-// error which is printed by go get, so the user can find why the package
-// wasn't downloaded if the encoding is not supported. Note that, in
-// order to reduce potential errors, ASCII is treated as UTF-8 (i.e. characters
-// greater than 0x7f are not rejected).
-func charsetReader(charset string, input io.Reader) (io.Reader, error) {
-	switch strings.ToLower(charset) {
-	case "ascii":
-		return input, nil
-	default:
-		return nil, fmt.Errorf("can't decode XML document using charset %q", charset)
-	}
-}
-
-// parseMetaGoImports returns meta imports from the HTML in r.
-// Parsing ends at the end of the <head> section or the beginning of the <body>.
-func parseMetaGoImports(r io.Reader) (imports []metaImport, err error) {
-	d := xml.NewDecoder(r)
-	d.CharsetReader = charsetReader
-	d.Strict = false
-	var t xml.Token
-	for {
-		t, err = d.Token()
-		if err != nil {
-			if err == io.EOF {
-				err = nil
-			}
-			return
-		}
-		if e, ok := t.(xml.StartElement); ok && strings.EqualFold(e.Name.Local, "body") {
-			return
-		}
-		if e, ok := t.(xml.EndElement); ok && strings.EqualFold(e.Name.Local, "head") {
-			return
-		}
-		e, ok := t.(xml.StartElement)
-		if !ok || !strings.EqualFold(e.Name.Local, "meta") {
-			continue
-		}
-		if attrValue(e.Attr, "name") != "go-import" {
-			continue
-		}
-		if f := strings.Fields(attrValue(e.Attr, "content")); len(f) == 3 {
-			imports = append(imports, metaImport{
-				Prefix:   f[0],
-				VCS:      f[1],
-				RepoRoot: f[2],
-			})
-		}
-	}
-}
-
-// attrValue returns the attribute value for the case-insensitive key
-// `name', or the empty string if nothing is found.
-func attrValue(attrs []xml.Attr, name string) string {
-	for _, a := range attrs {
-		if strings.EqualFold(a.Name.Local, name) {
-			return a.Value
-		}
-	}
-	return ""
-}
diff --git a/Godeps/_workspace/src/golang.org/x/tools/go/vcs/env.go b/Godeps/_workspace/src/golang.org/x/tools/go/vcs/env.go
deleted file mode 100644
index e846f5b3b8..0000000000
--- a/Godeps/_workspace/src/golang.org/x/tools/go/vcs/env.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vcs
-
-import (
-	"os"
-	"strings"
-)
-
-// envForDir returns a copy of the environment
-// suitable for running in the given directory.
-// The environment is the current process's environment
-// but with an updated $PWD, so that an os.Getwd in the
-// child will be faster.
-func envForDir(dir string) []string {
-	env := os.Environ()
-	// Internally we only use rooted paths, so dir is rooted.
-	// Even if dir is not rooted, no harm done.
-	return mergeEnvLists([]string{"PWD=" + dir}, env)
-}
-
-// mergeEnvLists merges the two environment lists such that
-// variables with the same name in "in" replace those in "out".
-func mergeEnvLists(in, out []string) []string {
-NextVar:
-	for _, inkv := range in {
-		k := strings.SplitAfterN(inkv, "=", 2)[0]
-		for i, outkv := range out {
-			if strings.HasPrefix(outkv, k) {
-				out[i] = inkv
-				continue NextVar
-			}
-		}
-		out = append(out, inkv)
-	}
-	return out
-}
diff --git a/Godeps/_workspace/src/golang.org/x/tools/go/vcs/http.go b/Godeps/_workspace/src/golang.org/x/tools/go/vcs/http.go
deleted file mode 100644
index 96188185cb..0000000000
--- a/Godeps/_workspace/src/golang.org/x/tools/go/vcs/http.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vcs
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/url"
-)
-
-// httpClient is the default HTTP client, but a variable so it can be
-// changed by tests, without modifying http.DefaultClient.
-var httpClient = http.DefaultClient
-
-// httpGET returns the data from an HTTP GET request for the given URL.
-func httpGET(url string) ([]byte, error) {
-	resp, err := httpClient.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("%s: %s", url, resp.Status)
-	}
-	b, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("%s: %v", url, err)
-	}
-	return b, nil
-}
-
-// httpsOrHTTP returns the body of either the importPath's
-// https resource or, if unavailable, the http resource.
-func httpsOrHTTP(importPath string) (urlStr string, body io.ReadCloser, err error) {
-	fetch := func(scheme string) (urlStr string, res *http.Response, err error) {
-		u, err := url.Parse(scheme + "://" + importPath)
-		if err != nil {
-			return "", nil, err
-		}
-		u.RawQuery = "go-get=1"
-		urlStr = u.String()
-		if Verbose {
-			log.Printf("Fetching %s", urlStr)
-		}
-		res, err = httpClient.Get(urlStr)
-		return
-	}
-	closeBody := func(res *http.Response) {
-		if res != nil {
-			res.Body.Close()
-		}
-	}
-	urlStr, res, err := fetch("https")
-	if err != nil || res.StatusCode != 200 {
-		if Verbose {
-			if err != nil {
-				log.Printf("https fetch failed.")
-			} else {
-				log.Printf("ignoring https fetch with status code %d", res.StatusCode)
-			}
-		}
-		closeBody(res)
-		urlStr, res, err = fetch("http")
-	}
-	if err != nil {
-		closeBody(res)
-		return "", nil, err
-	}
-	// Note: accepting a non-200 OK here, so people can serve a
-	// meta import in their http 404 page.
-	if Verbose {
-		log.Printf("Parsing meta tags from %s (status code %d)", urlStr, res.StatusCode)
-	}
-	return urlStr, res.Body, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/tools/go/vcs/vcs.go b/Godeps/_workspace/src/golang.org/x/tools/go/vcs/vcs.go
deleted file mode 100644
index 700b84da16..0000000000
--- a/Godeps/_workspace/src/golang.org/x/tools/go/vcs/vcs.go
+++ /dev/null
@@ -1,754 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vcs
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// Verbose enables verbose operation logging.
-var Verbose bool
-
-// ShowCmd controls whether VCS commands are printed.
-var ShowCmd bool
-
-// A Cmd describes how to use a version control system
-// like Mercurial, Git, or Subversion.
-type Cmd struct {
-	Name string
-	Cmd  string // name of binary to invoke command
-
-	CreateCmd   string // command to download a fresh copy of a repository
-	DownloadCmd string // command to download updates into an existing repository
-
-	TagCmd         []TagCmd // commands to list tags
-	TagLookupCmd   []TagCmd // commands to lookup tags before running tagSyncCmd
-	TagSyncCmd     string   // command to sync to specific tag
-	TagSyncDefault string   // command to sync to default tag
-
-	LogCmd string // command to list repository changelogs in an XML format
-
-	Scheme  []string
-	PingCmd string
-}
-
-// A TagCmd describes a command to list available tags
-// that can be passed to Cmd.TagSyncCmd.
-type TagCmd struct {
-	Cmd     string // command to list tags
-	Pattern string // regexp to extract tags from list
-}
-
-// vcsList lists the known version control systems
-var vcsList = []*Cmd{
-	vcsHg,
-	vcsGit,
-	vcsSvn,
-	vcsBzr,
-}
-
-// ByCmd returns the version control system for the given
-// command name (hg, git, svn, bzr).
-func ByCmd(cmd string) *Cmd {
-	for _, vcs := range vcsList {
-		if vcs.Cmd == cmd {
-			return vcs
-		}
-	}
-	return nil
-}
-
-// vcsHg describes how to use Mercurial.
-var vcsHg = &Cmd{
-	Name: "Mercurial",
-	Cmd:  "hg",
-
-	CreateCmd:   "clone -U {repo} {dir}",
-	DownloadCmd: "pull",
-
-	// We allow both tag and branch names as 'tags'
-	// for selecting a version.  This lets people have
-	// a go.release.r60 branch and a go1 branch
-	// and make changes in both, without constantly
-	// editing .hgtags.
-	TagCmd: []TagCmd{
-		{"tags", `^(\S+)`},
-		{"branches", `^(\S+)`},
-	},
-	TagSyncCmd:     "update -r {tag}",
-	TagSyncDefault: "update default",
-
-	LogCmd: "log --encoding=utf-8 --limit={limit} --template={template}",
-
-	Scheme:  []string{"https", "http", "ssh"},
-	PingCmd: "identify {scheme}://{repo}",
-}
-
-// vcsGit describes how to use Git.
-var vcsGit = &Cmd{
-	Name: "Git",
-	Cmd:  "git",
-
-	CreateCmd:   "clone {repo} {dir}",
-	DownloadCmd: "pull --ff-only",
-
-	TagCmd: []TagCmd{
-		// tags/xxx matches a git tag named xxx
-		// origin/xxx matches a git branch named xxx on the default remote repository
-		{"show-ref", `(?:tags|origin)/(\S+)$`},
-	},
-	TagLookupCmd: []TagCmd{
-		{"show-ref tags/{tag} origin/{tag}", `((?:tags|origin)/\S+)$`},
-	},
-	TagSyncCmd:     "checkout {tag}",
-	TagSyncDefault: "checkout master",
-
-	Scheme:  []string{"git", "https", "http", "git+ssh"},
-	PingCmd: "ls-remote {scheme}://{repo}",
-}
-
-// vcsBzr describes how to use Bazaar.
-var vcsBzr = &Cmd{
-	Name: "Bazaar",
-	Cmd:  "bzr",
-
-	CreateCmd: "branch {repo} {dir}",
-
-	// Without --overwrite bzr will not pull tags that changed.
-	// Replace by --overwrite-tags after http://pad.lv/681792 goes in.
-	DownloadCmd: "pull --overwrite",
-
-	TagCmd:         []TagCmd{{"tags", `^(\S+)`}},
-	TagSyncCmd:     "update -r {tag}",
-	TagSyncDefault: "update -r revno:-1",
-
-	Scheme:  []string{"https", "http", "bzr", "bzr+ssh"},
-	PingCmd: "info {scheme}://{repo}",
-}
-
-// vcsSvn describes how to use Subversion.
-var vcsSvn = &Cmd{
-	Name: "Subversion",
-	Cmd:  "svn",
-
-	CreateCmd:   "checkout {repo} {dir}",
-	DownloadCmd: "update",
-
-	// There is no tag command in subversion.
-	// The branch information is all in the path names.
-
-	LogCmd: "log --xml --limit={limit}",
-
-	Scheme:  []string{"https", "http", "svn", "svn+ssh"},
-	PingCmd: "info {scheme}://{repo}",
-}
-
-func (v *Cmd) String() string {
-	return v.Name
-}
-
-// run runs the command line cmd in the given directory.
-// keyval is a list of key, value pairs.  run expands
-// instances of {key} in cmd into value, but only after
-// splitting cmd into individual arguments.
-// If an error occurs, run prints the command line and the
-// command's combined stdout+stderr to standard error.
-// Otherwise run discards the command's output.
-func (v *Cmd) run(dir string, cmd string, keyval ...string) error {
-	_, err := v.run1(dir, cmd, keyval, true)
-	return err
-}
-
-// runVerboseOnly is like run but only generates error output to standard error in verbose mode.
-func (v *Cmd) runVerboseOnly(dir string, cmd string, keyval ...string) error {
-	_, err := v.run1(dir, cmd, keyval, false)
-	return err
-}
-
-// runOutput is like run but returns the output of the command.
-func (v *Cmd) runOutput(dir string, cmd string, keyval ...string) ([]byte, error) {
-	return v.run1(dir, cmd, keyval, true)
-}
-
-// run1 is the generalized implementation of run and runOutput.
-func (v *Cmd) run1(dir string, cmdline string, keyval []string, verbose bool) ([]byte, error) {
-	m := make(map[string]string)
-	for i := 0; i < len(keyval); i += 2 {
-		m[keyval[i]] = keyval[i+1]
-	}
-	args := strings.Fields(cmdline)
-	for i, arg := range args {
-		args[i] = expand(m, arg)
-	}
-
-	_, err := exec.LookPath(v.Cmd)
-	if err != nil {
-		fmt.Fprintf(os.Stderr,
-			"go: missing %s command. See http://golang.org/s/gogetcmd\n",
-			v.Name)
-		return nil, err
-	}
-
-	cmd := exec.Command(v.Cmd, args...)
-	cmd.Dir = dir
-	cmd.Env = envForDir(cmd.Dir)
-	if ShowCmd {
-		fmt.Printf("cd %s\n", dir)
-		fmt.Printf("%s %s\n", v.Cmd, strings.Join(args, " "))
-	}
-	var buf bytes.Buffer
-	cmd.Stdout = &buf
-	cmd.Stderr = &buf
-	err = cmd.Run()
-	out := buf.Bytes()
-	if err != nil {
-		if verbose || Verbose {
-			fmt.Fprintf(os.Stderr, "# cd %s; %s %s\n", dir, v.Cmd, strings.Join(args, " "))
-			os.Stderr.Write(out)
-		}
-		return nil, err
-	}
-	return out, nil
-}
-
-// Ping pings the repo to determine if scheme used is valid.
-// This repo must be pingable with this scheme and VCS.
-func (v *Cmd) Ping(scheme, repo string) error {
-	return v.runVerboseOnly(".", v.PingCmd, "scheme", scheme, "repo", repo)
-}
-
-// Create creates a new copy of repo in dir.
-// The parent of dir must exist; dir must not.
-func (v *Cmd) Create(dir, repo string) error {
-	return v.run(".", v.CreateCmd, "dir", dir, "repo", repo)
-}
-
-// CreateAtRev creates a new copy of repo in dir at revision rev.
-// The parent of dir must exist; dir must not.
-// rev must be a valid revision in repo.
-func (v *Cmd) CreateAtRev(dir, repo, rev string) error {
-	if err := v.Create(dir, repo); err != nil {
-		return err
-	}
-	return v.run(dir, v.TagSyncCmd, "tag", rev)
-}
-
-// Download downloads any new changes for the repo in dir.
-// dir must be a valid VCS repo compatible with v.
-func (v *Cmd) Download(dir string) error {
-	return v.run(dir, v.DownloadCmd)
-}
-
-// Tags returns the list of available tags for the repo in dir.
-// dir must be a valid VCS repo compatible with v.
-func (v *Cmd) Tags(dir string) ([]string, error) {
-	var tags []string
-	for _, tc := range v.TagCmd {
-		out, err := v.runOutput(dir, tc.Cmd)
-		if err != nil {
-			return nil, err
-		}
-		re := regexp.MustCompile(`(?m-s)` + tc.Pattern)
-		for _, m := range re.FindAllStringSubmatch(string(out), -1) {
-			tags = append(tags, m[1])
-		}
-	}
-	return tags, nil
-}
-
-// TagSync syncs the repo in dir to the named tag,
-// which either is a tag returned by tags or is v.TagDefault.
-// dir must be a valid VCS repo compatible with v and the tag must exist.
-func (v *Cmd) TagSync(dir, tag string) error {
-	if v.TagSyncCmd == "" {
-		return nil
-	}
-	if tag != "" {
-		for _, tc := range v.TagLookupCmd {
-			out, err := v.runOutput(dir, tc.Cmd, "tag", tag)
-			if err != nil {
-				return err
-			}
-			re := regexp.MustCompile(`(?m-s)` + tc.Pattern)
-			m := re.FindStringSubmatch(string(out))
-			if len(m) > 1 {
-				tag = m[1]
-				break
-			}
-		}
-	}
-	if tag == "" && v.TagSyncDefault != "" {
-		return v.run(dir, v.TagSyncDefault)
-	}
-	return v.run(dir, v.TagSyncCmd, "tag", tag)
-}
-
-// Log logs the changes for the repo in dir.
-// dir must be a valid VCS repo compatible with v.
-func (v *Cmd) Log(dir, logTemplate string) ([]byte, error) {
-	if err := v.Download(dir); err != nil {
-		return []byte{}, err
-	}
-
-	const N = 50 // how many revisions to grab
-	return v.runOutput(dir, v.LogCmd, "limit", strconv.Itoa(N), "template", logTemplate)
-}
-
-// LogAtRev logs the change for repo in dir at the rev revision.
-// dir must be a valid VCS repo compatible with v.
-// rev must be a valid revision for the repo in dir.
-func (v *Cmd) LogAtRev(dir, rev, logTemplate string) ([]byte, error) {
-	if err := v.Download(dir); err != nil {
-		return []byte{}, err
-	}
-
-	// Append revision flag to LogCmd.
-	logAtRevCmd := v.LogCmd + " --rev=" + rev
-	return v.runOutput(dir, logAtRevCmd, "limit", strconv.Itoa(1), "template", logTemplate)
-}
-
-// A vcsPath describes how to convert an import path into a
-// version control system and repository name.
-type vcsPath struct {
-	prefix string                              // prefix this description applies to
-	re     string                              // pattern for import path
-	repo   string                              // repository to use (expand with match of re)
-	vcs    string                              // version control system to use (expand with match of re)
-	check  func(match map[string]string) error // additional checks
-	ping   bool                                // ping for scheme to use to download repo
-
-	regexp *regexp.Regexp // cached compiled form of re
-}
-
-// FromDir inspects dir and its parents to determine the
-// version control system and code repository to use.
-// On return, root is the import path
-// corresponding to the root of the repository
-// (thus root is a prefix of importPath).
-func FromDir(dir, srcRoot string) (vcs *Cmd, root string, err error) {
-	// Clean and double-check that dir is in (a subdirectory of) srcRoot.
-	dir = filepath.Clean(dir)
-	srcRoot = filepath.Clean(srcRoot)
-	if len(dir) <= len(srcRoot) || dir[len(srcRoot)] != filepath.Separator {
-		return nil, "", fmt.Errorf("directory %q is outside source root %q", dir, srcRoot)
-	}
-
-	for len(dir) > len(srcRoot) {
-		for _, vcs := range vcsList {
-			if fi, err := os.Stat(filepath.Join(dir, "."+vcs.Cmd)); err == nil && fi.IsDir() {
-				return vcs, dir[len(srcRoot)+1:], nil
-			}
-		}
-
-		// Move to parent.
-		ndir := filepath.Dir(dir)
-		if len(ndir) >= len(dir) {
-			// Shouldn't happen, but just in case, stop.
-			break
-		}
-		dir = ndir
-	}
-
-	return nil, "", fmt.Errorf("directory %q is not using a known version control system", dir)
-}
-
-// RepoRoot represents a version control system, a repo, and a root of
-// where to put it on disk.
-type RepoRoot struct {
-	VCS *Cmd
-
-	// repo is the repository URL, including scheme
-	Repo string
-
-	// root is the import path corresponding to the root of the
-	// repository
-	Root string
-}
-
-// RepoRootForImportPath analyzes importPath to determine the
-// version control system, and code repository to use.
-func RepoRootForImportPath(importPath string, verbose bool) (*RepoRoot, error) {
-	rr, err := RepoRootForImportPathStatic(importPath, "")
-	if err == errUnknownSite {
-		rr, err = RepoRootForImportDynamic(importPath, verbose)
-
-		// RepoRootForImportDynamic returns error detail
-		// that is irrelevant if the user didn't intend to use a
-		// dynamic import in the first place.
-		// Squelch it.
-		if err != nil {
-			if Verbose {
-				log.Printf("import %q: %v", importPath, err)
-			}
-			err = fmt.Errorf("unrecognized import path %q", importPath)
-		}
-	}
-
-	if err == nil && strings.Contains(importPath, "...") && strings.Contains(rr.Root, "...") {
-		// Do not allow wildcards in the repo root.
-		rr = nil
-		err = fmt.Errorf("cannot expand ... in %q", importPath)
-	}
-	return rr, err
-}
-
-var errUnknownSite = errors.New("dynamic lookup required to find mapping")
-
-// RepoRootForImportPathStatic attempts to map importPath to a
-// RepoRoot using the commonly-used VCS hosting sites in vcsPaths
-// (github.com/user/dir), or from a fully-qualified importPath already
-// containing its VCS type (foo.com/repo.git/dir)
-//
-// If scheme is non-empty, that scheme is forced.
-func RepoRootForImportPathStatic(importPath, scheme string) (*RepoRoot, error) {
-	if strings.Contains(importPath, "://") {
-		return nil, fmt.Errorf("invalid import path %q", importPath)
-	}
-	for _, srv := range vcsPaths {
-		if !strings.HasPrefix(importPath, srv.prefix) {
-			continue
-		}
-		m := srv.regexp.FindStringSubmatch(importPath)
-		if m == nil {
-			if srv.prefix != "" {
-				return nil, fmt.Errorf("invalid %s import path %q", srv.prefix, importPath)
-			}
-			continue
-		}
-
-		// Build map of named subexpression matches for expand.
-		match := map[string]string{
-			"prefix": srv.prefix,
-			"import": importPath,
-		}
-		for i, name := range srv.regexp.SubexpNames() {
-			if name != "" && match[name] == "" {
-				match[name] = m[i]
-			}
-		}
-		if srv.vcs != "" {
-			match["vcs"] = expand(match, srv.vcs)
-		}
-		if srv.repo != "" {
-			match["repo"] = expand(match, srv.repo)
-		}
-		if srv.check != nil {
-			if err := srv.check(match); err != nil {
-				return nil, err
-			}
-		}
-		vcs := ByCmd(match["vcs"])
-		if vcs == nil {
-			return nil, fmt.Errorf("unknown version control system %q", match["vcs"])
-		}
-		if srv.ping {
-			if scheme != "" {
-				match["repo"] = scheme + "://" + match["repo"]
-			} else {
-				for _, scheme := range vcs.Scheme {
-					if vcs.Ping(scheme, match["repo"]) == nil {
-						match["repo"] = scheme + "://" + match["repo"]
-						break
-					}
-				}
-			}
-		}
-		rr := &RepoRoot{
-			VCS:  vcs,
-			Repo: match["repo"],
-			Root: match["root"],
-		}
-		return rr, nil
-	}
-	return nil, errUnknownSite
-}
-
-// RepoRootForImportDynamic finds a *RepoRoot for a custom domain that's not
-// statically known by RepoRootForImportPathStatic.
-//
-// This handles "vanity import paths" like "name.tld/pkg/foo".
-func RepoRootForImportDynamic(importPath string, verbose bool) (*RepoRoot, error) {
-	slash := strings.Index(importPath, "/")
-	if slash < 0 {
-		return nil, errors.New("import path doesn't contain a slash")
-	}
-	host := importPath[:slash]
-	if !strings.Contains(host, ".") {
-		return nil, errors.New("import path doesn't contain a hostname")
-	}
-	urlStr, body, err := httpsOrHTTP(importPath)
-	if err != nil {
-		return nil, fmt.Errorf("http/https fetch: %v", err)
-	}
-	defer body.Close()
-	imports, err := parseMetaGoImports(body)
-	if err != nil {
-		return nil, fmt.Errorf("parsing %s: %v", importPath, err)
-	}
-	metaImport, err := matchGoImport(imports, importPath)
-	if err != nil {
-		if err != errNoMatch {
-			return nil, fmt.Errorf("parse %s: %v", urlStr, err)
-		}
-		return nil, fmt.Errorf("parse %s: no go-import meta tags", urlStr)
-	}
-	if verbose {
-		log.Printf("get %q: found meta tag %#v at %s", importPath, metaImport, urlStr)
-	}
-	// If the import was "uni.edu/bob/project", which said the
-	// prefix was "uni.edu" and the RepoRoot was "evilroot.com",
-	// make sure we don't trust Bob and check out evilroot.com to
-	// "uni.edu" yet (possibly overwriting/preempting another
-	// non-evil student).  Instead, first verify the root and see
-	// if it matches Bob's claim.
-	if metaImport.Prefix != importPath {
-		if verbose {
-			log.Printf("get %q: verifying non-authoritative meta tag", importPath)
-		}
-		urlStr0 := urlStr
-		urlStr, body, err = httpsOrHTTP(metaImport.Prefix)
-		if err != nil {
-			return nil, fmt.Errorf("fetch %s: %v", urlStr, err)
-		}
-		imports, err := parseMetaGoImports(body)
-		if err != nil {
-			return nil, fmt.Errorf("parsing %s: %v", importPath, err)
-		}
-		if len(imports) == 0 {
-			return nil, fmt.Errorf("fetch %s: no go-import meta tag", urlStr)
-		}
-		metaImport2, err := matchGoImport(imports, importPath)
-		if err != nil || metaImport != metaImport2 {
-			return nil, fmt.Errorf("%s and %s disagree about go-import for %s", urlStr0, urlStr, metaImport.Prefix)
-		}
-	}
-
-	if !strings.Contains(metaImport.RepoRoot, "://") {
-		return nil, fmt.Errorf("%s: invalid repo root %q; no scheme", urlStr, metaImport.RepoRoot)
-	}
-	rr := &RepoRoot{
-		VCS:  ByCmd(metaImport.VCS),
-		Repo: metaImport.RepoRoot,
-		Root: metaImport.Prefix,
-	}
-	if rr.VCS == nil {
-		return nil, fmt.Errorf("%s: unknown vcs %q", urlStr, metaImport.VCS)
-	}
-	return rr, nil
-}
-
-// metaImport represents the parsed <meta name="go-import"
-// content="prefix vcs reporoot" /> tags from HTML files.
-type metaImport struct {
-	Prefix, VCS, RepoRoot string
-}
-
-// errNoMatch is returned from matchGoImport when there's no applicable match.
-var errNoMatch = errors.New("no import match")
-
-// matchGoImport returns the metaImport from imports matching importPath.
-// An error is returned if there are multiple matches.
-// errNoMatch is returned if none match.
-func matchGoImport(imports []metaImport, importPath string) (_ metaImport, err error) {
-	match := -1
-	for i, im := range imports {
-		if !strings.HasPrefix(importPath, im.Prefix) {
-			continue
-		}
-		if match != -1 {
-			err = fmt.Errorf("multiple meta tags match import path %q", importPath)
-			return
-		}
-		match = i
-	}
-	if match == -1 {
-		err = errNoMatch
-		return
-	}
-	return imports[match], nil
-}
-
-// expand rewrites s to replace {k} with match[k] for each key k in match.
-func expand(match map[string]string, s string) string {
-	for k, v := range match {
-		s = strings.Replace(s, "{"+k+"}", v, -1)
-	}
-	return s
-}
-
-// vcsPaths lists the known vcs paths.
-var vcsPaths = []*vcsPath{
-	// go.googlesource.com
-	{
-		prefix: "go.googlesource.com",
-		re:     `^(?P<root>go\.googlesource\.com/[A-Za-z0-9_.\-]+/?)$`,
-		vcs:    "git",
-		repo:   "https://{root}",
-		check:  noVCSSuffix,
-	},
-
-	// Google Code - new syntax
-	{
-		prefix: "code.google.com/",
-		re:     `^(?P<root>code\.google\.com/[pr]/(?P<project>[a-z0-9\-]+)(\.(?P<subrepo>[a-z0-9\-]+))?)(/[A-Za-z0-9_.\-]+)*$`,
-		repo:   "https://{root}",
-		check:  googleCodeVCS,
-	},
-
-	// Google Code - old syntax
-	{
-		re:    `^(?P<project>[a-z0-9_\-.]+)\.googlecode\.com/(git|hg|svn)(?P<path>/.*)?$`,
-		check: oldGoogleCode,
-	},
-
-	// Github
-	{
-		prefix: "github.com/",
-		re:     `^(?P<root>github\.com/[A-Za-z0-9_.\-]+/[A-Za-z0-9_.\-]+)(/[A-Za-z0-9_.\-]+)*$`,
-		vcs:    "git",
-		repo:   "https://{root}",
-		check:  noVCSSuffix,
-	},
-
-	// Bitbucket
-	{
-		prefix: "bitbucket.org/",
-		re:     `^(?P<root>bitbucket\.org/(?P<bitname>[A-Za-z0-9_.\-]+/[A-Za-z0-9_.\-]+))(/[A-Za-z0-9_.\-]+)*$`,
-		repo:   "https://{root}",
-		check:  bitbucketVCS,
-	},
-
-	// Launchpad
-	{
-		prefix: "launchpad.net/",
-		re:     `^(?P<root>launchpad\.net/((?P<project>[A-Za-z0-9_.\-]+)(?P<series>/[A-Za-z0-9_.\-]+)?|~[A-Za-z0-9_.\-]+/(\+junk|[A-Za-z0-9_.\-]+)/[A-Za-z0-9_.\-]+))(/[A-Za-z0-9_.\-]+)*$`,
-		vcs:    "bzr",
-		repo:   "https://{root}",
-		check:  launchpadVCS,
-	},
-
-	// General syntax for any server.
-	{
-		re:   `^(?P<root>(?P<repo>([a-z0-9.\-]+\.)+[a-z0-9.\-]+(:[0-9]+)?/[A-Za-z0-9_.\-/]*?)\.(?P<vcs>bzr|git|hg|svn))(/[A-Za-z0-9_.\-]+)*$`,
-		ping: true,
-	},
-}
-
-func init() {
-	// fill in cached regexps.
-	// Doing this eagerly discovers invalid regexp syntax
-	// without having to run a command that needs that regexp.
-	for _, srv := range vcsPaths {
-		srv.regexp = regexp.MustCompile(srv.re)
-	}
-}
-
-// noVCSSuffix checks that the repository name does not
-// end in .foo for any version control system foo.
-// The usual culprit is ".git".
-func noVCSSuffix(match map[string]string) error {
-	repo := match["repo"]
-	for _, vcs := range vcsList {
-		if strings.HasSuffix(repo, "."+vcs.Cmd) {
-			return fmt.Errorf("invalid version control suffix in %s path", match["prefix"])
-		}
-	}
-	return nil
-}
-
-var googleCheckout = regexp.MustCompile(`id="checkoutcmd">(hg|git|svn)`)
-
-// googleCodeVCS determines the version control system for
-// a code.google.com repository, by scraping the project's
-// /source/checkout page.
-func googleCodeVCS(match map[string]string) error {
-	if err := noVCSSuffix(match); err != nil {
-		return err
-	}
-	data, err := httpGET(expand(match, "https://code.google.com/p/{project}/source/checkout?repo={subrepo}"))
-	if err != nil {
-		return err
-	}
-
-	if m := googleCheckout.FindSubmatch(data); m != nil {
-		if vcs := ByCmd(string(m[1])); vcs != nil {
-			// Subversion requires the old URLs.
-			// TODO: Test.
-			if vcs == vcsSvn {
-				if match["subrepo"] != "" {
-					return fmt.Errorf("sub-repositories not supported in Google Code Subversion projects")
-				}
-				match["repo"] = expand(match, "https://{project}.googlecode.com/svn")
-			}
-			match["vcs"] = vcs.Cmd
-			return nil
-		}
-	}
-
-	return fmt.Errorf("unable to detect version control system for code.google.com/ path")
-}
-
-// oldGoogleCode is invoked for old-style foo.googlecode.com paths.
-// It prints an error giving the equivalent new path.
-func oldGoogleCode(match map[string]string) error {
-	return fmt.Errorf("invalid Google Code import path: use %s instead",
-		expand(match, "code.google.com/p/{project}{path}"))
-}
-
-// bitbucketVCS determines the version control system for a
-// Bitbucket repository, by using the Bitbucket API.
-func bitbucketVCS(match map[string]string) error {
-	if err := noVCSSuffix(match); err != nil {
-		return err
-	}
-
-	var resp struct {
-		SCM string `json:"scm"`
-	}
-	url := expand(match, "https://api.bitbucket.org/1.0/repositories/{bitname}")
-	data, err := httpGET(url)
-	if err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &resp); err != nil {
-		return fmt.Errorf("decoding %s: %v", url, err)
-	}
-
-	if ByCmd(resp.SCM) != nil {
-		match["vcs"] = resp.SCM
-		if resp.SCM == "git" {
-			match["repo"] += ".git"
-		}
-		return nil
-	}
-
-	return fmt.Errorf("unable to detect version control system for bitbucket.org/ path")
-}
-
-// launchpadVCS solves the ambiguity for "lp.net/project/foo". In this case,
-// "foo" could be a series name registered in Launchpad with its own branch,
-// and it could also be the name of a directory within the main project
-// branch one level up.
-func launchpadVCS(match map[string]string) error {
-	if match["project"] == "" || match["series"] == "" {
-		return nil
-	}
-	_, err := httpGET(expand(match, "https://code.launchpad.net/{project}{series}/.bzr/branch-format"))
-	if err != nil {
-		match["root"] = expand(match, "launchpad.net/{project}")
-		match["repo"] = expand(match, "https://{root}")
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/.travis.yml b/Godeps/_workspace/src/google.golang.org/grpc/.travis.yml
deleted file mode 100644
index 3f83776ec5..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: go
-
-before_install:
-  - go get github.com/axw/gocov/gocov
-  - go get github.com/mattn/goveralls
-  - go get golang.org/x/tools/cmd/cover
-
-install:
-  - mkdir -p "$GOPATH/src/google.golang.org"
-  - mv "$TRAVIS_BUILD_DIR" "$GOPATH/src/google.golang.org/grpc"
-
-script:
-  - make test testrace
-  - make coverage
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md b/Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md
deleted file mode 100644
index 407d384a7c..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/CONTRIBUTING.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# How to contribute
-
-We definitely welcome patches and contribution to grpc! Here is some guideline
-and information about how to do so.
-
-## Getting started
-
-### Legal requirements
-
-In order to protect both you and ourselves, you will need to sign the
-[Contributor License Agreement](https://cla.developers.google.com/clas).
-
-### Filing Issues
-When filing an issue, make sure to answer these five questions:
-
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
-
-### Contributing code
-Unless otherwise noted, the Go source files are distributed under the BSD-style license found in the LICENSE file.
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/Documentation/grpc-auth-support.md b/Godeps/_workspace/src/google.golang.org/grpc/Documentation/grpc-auth-support.md
deleted file mode 100644
index 5a075f6132..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/Documentation/grpc-auth-support.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Authentication
-
-As outlined in the [gRPC authentication guide](http://www.grpc.io/docs/guides/auth.html) there are a number of different mechanisms for asserting identity between an client and server. We'll present some code-samples here demonstrating how to provide TLS support encryption and identity assertions as well as passing OAuth2 tokens to services that support it.
-
-# Enabling TLS on a gRPC client
-
-```Go
-conn, err := grpc.Dial(serverAddr, grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, ""))
-```
-
-# Enabling TLS on a gRPC server
-
-```Go
-creds, err := credentials.NewServerTLSFromFile(certFile, keyFile)
-if err != nil {
-  log.Fatalf("Failed to generate credentials %v", err)
-}
-lis, err := net.Listen("tcp", ":0")
-server := grpc.NewServer(grpc.Creds(creds))
-...
-server.Serve(lis)
-```
-
-# Authenticating with Google
-
-## Google Compute Engine (GCE)
-
-```Go
-conn, err := grpc.Dial(serverAddr, grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, ""), grpc.WithPerRPCCredentials(oauth.NewComputeEngine())))
-```
-
-## JWT
-
-```Go
-jwtCreds, err := oauth.NewServiceAccountFromFile(*serviceAccountKeyFile, *oauthScope)
-if err != nil {
-  log.Fatalf("Failed to create JWT credentials: %v", err)
-}
-conn, err := grpc.Dial(serverAddr, grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, ""), grpc.WithPerRPCCredentials(jwtCreds)))
-```
-
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/LICENSE b/Godeps/_workspace/src/google.golang.org/grpc/LICENSE
deleted file mode 100644
index f4988b4507..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright 2014, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/Makefile b/Godeps/_workspace/src/google.golang.org/grpc/Makefile
deleted file mode 100644
index 12e84e4e5b..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-.PHONY: \
-	all \
-	deps \
-	updatedeps \
-	testdeps \
-	updatetestdeps \
-	build \
-	proto \
-	test \
-	testrace \
-	clean \
-
-all: test testrace
-
-deps:
-	go get -d -v google.golang.org/grpc/...
-
-updatedeps:
-	go get -d -v -u -f google.golang.org/grpc/...
-
-testdeps:
-	go get -d -v -t google.golang.org/grpc/...
-
-updatetestdeps:
-	go get -d -v -t -u -f google.golang.org/grpc/...
-
-build: deps
-	go build google.golang.org/grpc/...
-
-proto:
-	@ if ! which protoc > /dev/null; then \
-		echo "error: protoc not installed" >&2; \
-		exit 1; \
-	fi
-	go get -v github.com/golang/protobuf/protoc-gen-go
-	for file in $$(git ls-files '*.proto'); do \
-		protoc -I $$(dirname $$file) --go_out=plugins=grpc:$$(dirname $$file) $$file; \
-	done
-
-test: testdeps
-	go test -v -cpu 1,4 google.golang.org/grpc/...
-
-testrace: testdeps
-	go test -v -race -cpu 1,4 google.golang.org/grpc/...
-
-clean:
-	go clean google.golang.org/grpc/...
-
-coverage: testdeps
-	./coverage.sh --coveralls
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/PATENTS b/Godeps/_workspace/src/google.golang.org/grpc/PATENTS
deleted file mode 100644
index 619f9dbfe6..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the GRPC project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of GRPC, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of GRPC.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of GRPC or any code incorporated within this
-implementation of GRPC constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of GRPC
-shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/README.md b/Godeps/_workspace/src/google.golang.org/grpc/README.md
deleted file mode 100644
index 37b05f0953..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-#gRPC-Go
-
-[![Build Status](https://travis-ci.org/grpc/grpc-go.svg)](https://travis-ci.org/grpc/grpc-go) [![GoDoc](https://godoc.org/google.golang.org/grpc?status.svg)](https://godoc.org/google.golang.org/grpc)
-
-The Go implementation of [gRPC](http://www.grpc.io/): A high performance, open source, general RPC framework that puts mobile and HTTP/2 first. For more information see the [gRPC Quick Start](http://www.grpc.io/docs/) guide.
-
-Installation
-------------
-
-To install this package, you need to install Go 1.4 or above and setup your Go workspace on your computer. The simplest way to install the library is to run:
-
-```
-$ go get google.golang.org/grpc
-```
-
-Prerequisites
--------------
-
-This requires Go 1.4 or above.
-
-Constraints
------------
-The grpc package should only depend on standard Go packages and a small number of exceptions. If your contribution introduces new dependencies which are NOT in the [list](http://godoc.org/google.golang.org/grpc?imports), you need a discussion with gRPC-Go authors and consultants.
-
-Documentation
--------------
-See [API documentation](https://godoc.org/google.golang.org/grpc) for package and API descriptions and find examples in the [examples directory](examples/).
-
-Status
-------
-Beta release
-
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark.go
deleted file mode 100644
index 7215d35a51..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/benchmark.go
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
-Package benchmark implements the building blocks to setup end-to-end gRPC benchmarks.
-*/
-package benchmark
-
-import (
-	"io"
-	"math"
-	"net"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-	testpb "google.golang.org/grpc/benchmark/grpc_testing"
-	"google.golang.org/grpc/grpclog"
-)
-
-func newPayload(t testpb.PayloadType, size int) *testpb.Payload {
-	if size < 0 {
-		grpclog.Fatalf("Requested a response with invalid length %d", size)
-	}
-	body := make([]byte, size)
-	switch t {
-	case testpb.PayloadType_COMPRESSABLE:
-	case testpb.PayloadType_UNCOMPRESSABLE:
-		grpclog.Fatalf("PayloadType UNCOMPRESSABLE is not supported")
-	default:
-		grpclog.Fatalf("Unsupported payload type: %d", t)
-	}
-	return &testpb.Payload{
-		Type: t,
-		Body: body,
-	}
-}
-
-type testServer struct {
-}
-
-func (s *testServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*testpb.SimpleResponse, error) {
-	return &testpb.SimpleResponse{
-		Payload: newPayload(in.ResponseType, int(in.ResponseSize)),
-	}, nil
-}
-
-func (s *testServer) StreamingCall(stream testpb.TestService_StreamingCallServer) error {
-	for {
-		in, err := stream.Recv()
-		if err == io.EOF {
-			// read done.
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-		if err := stream.Send(&testpb.SimpleResponse{
-			Payload: newPayload(in.ResponseType, int(in.ResponseSize)),
-		}); err != nil {
-			return err
-		}
-	}
-}
-
-// StartServer starts a gRPC server serving a benchmark service on the given
-// address, which may be something like "localhost:0". It returns its listen
-// address and a function to stop the server.
-func StartServer(addr string) (string, func()) {
-	lis, err := net.Listen("tcp", addr)
-	if err != nil {
-		grpclog.Fatalf("Failed to listen: %v", err)
-	}
-	s := grpc.NewServer(grpc.MaxConcurrentStreams(math.MaxUint32))
-	testpb.RegisterTestServiceServer(s, &testServer{})
-	go s.Serve(lis)
-	return lis.Addr().String(), func() {
-		s.Stop()
-	}
-}
-
-// DoUnaryCall performs an unary RPC with given stub and request and response sizes.
-func DoUnaryCall(tc testpb.TestServiceClient, reqSize, respSize int) {
-	pl := newPayload(testpb.PayloadType_COMPRESSABLE, reqSize)
-	req := &testpb.SimpleRequest{
-		ResponseType: pl.Type,
-		ResponseSize: int32(respSize),
-		Payload:      pl,
-	}
-	if _, err := tc.UnaryCall(context.Background(), req); err != nil {
-		grpclog.Fatal("/TestService/UnaryCall RPC failed: ", err)
-	}
-}
-
-// DoStreamingRoundTrip performs a round trip for a single streaming rpc.
-func DoStreamingRoundTrip(tc testpb.TestServiceClient, stream testpb.TestService_StreamingCallClient, reqSize, respSize int) {
-	pl := newPayload(testpb.PayloadType_COMPRESSABLE, reqSize)
-	req := &testpb.SimpleRequest{
-		ResponseType: pl.Type,
-		ResponseSize: int32(respSize),
-		Payload:      pl,
-	}
-	if err := stream.Send(req); err != nil {
-		grpclog.Fatalf("StreamingCall(_).Send: %v", err)
-	}
-	if _, err := stream.Recv(); err != nil {
-		grpclog.Fatalf("StreamingCall(_).Recv: %v", err)
-	}
-}
-
-// NewClientConn creates a gRPC client connection to addr.
-func NewClientConn(addr string) *grpc.ClientConn {
-	conn, err := grpc.Dial(addr, grpc.WithInsecure())
-	if err != nil {
-		grpclog.Fatalf("NewClientConn(%q) failed to create a ClientConn %v", addr, err)
-	}
-	return conn
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/client/main.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/client/main.go
deleted file mode 100644
index e7f0a8fb2c..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/client/main.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package main
-
-import (
-	"flag"
-	"math"
-	"net"
-	"net/http"
-	_ "net/http/pprof"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/benchmark"
-	testpb "google.golang.org/grpc/benchmark/grpc_testing"
-	"google.golang.org/grpc/benchmark/stats"
-	"google.golang.org/grpc/grpclog"
-)
-
-var (
-	server            = flag.String("server", "", "The server address")
-	maxConcurrentRPCs = flag.Int("max_concurrent_rpcs", 1, "The max number of concurrent RPCs")
-	duration          = flag.Int("duration", math.MaxInt32, "The duration in seconds to run the benchmark client")
-	trace             = flag.Bool("trace", true, "Whether tracing is on")
-	rpcType           = flag.Int("rpc_type", 0,
-		`Configure different client rpc type. Valid options are:
-		   0 : unary call;
-		   1 : streaming call.`)
-)
-
-func unaryCaller(client testpb.TestServiceClient) {
-	benchmark.DoUnaryCall(client, 1, 1)
-}
-
-func streamCaller(client testpb.TestServiceClient, stream testpb.TestService_StreamingCallClient) {
-	benchmark.DoStreamingRoundTrip(client, stream, 1, 1)
-}
-
-func buildConnection() (s *stats.Stats, conn *grpc.ClientConn, tc testpb.TestServiceClient) {
-	s = stats.NewStats(256)
-	conn = benchmark.NewClientConn(*server)
-	tc = testpb.NewTestServiceClient(conn)
-	return s, conn, tc
-}
-
-func closeLoopUnary() {
-	s, conn, tc := buildConnection()
-
-	for i := 0; i < 100; i++ {
-		unaryCaller(tc)
-	}
-	ch := make(chan int, *maxConcurrentRPCs*4)
-	var (
-		mu sync.Mutex
-		wg sync.WaitGroup
-	)
-	wg.Add(*maxConcurrentRPCs)
-
-	for i := 0; i < *maxConcurrentRPCs; i++ {
-		go func() {
-			for _ = range ch {
-				start := time.Now()
-				unaryCaller(tc)
-				elapse := time.Since(start)
-				mu.Lock()
-				s.Add(elapse)
-				mu.Unlock()
-			}
-			wg.Done()
-		}()
-	}
-	// Stop the client when time is up.
-	done := make(chan struct{})
-	go func() {
-		<-time.After(time.Duration(*duration) * time.Second)
-		close(done)
-	}()
-	ok := true
-	for ok {
-		select {
-		case ch <- 0:
-		case <-done:
-			ok = false
-		}
-	}
-	close(ch)
-	wg.Wait()
-	conn.Close()
-	grpclog.Println(s.String())
-
-}
-
-func closeLoopStream() {
-	s, conn, tc := buildConnection()
-	ch := make(chan int, *maxConcurrentRPCs*4)
-	var (
-		mu sync.Mutex
-		wg sync.WaitGroup
-	)
-	wg.Add(*maxConcurrentRPCs)
-	// Distribute RPCs over maxConcurrentCalls workers.
-	for i := 0; i < *maxConcurrentRPCs; i++ {
-		go func() {
-			stream, err := tc.StreamingCall(context.Background())
-			if err != nil {
-				grpclog.Fatalf("%v.StreamingCall(_) = _, %v", tc, err)
-			}
-			// Do some warm up.
-			for i := 0; i < 100; i++ {
-				streamCaller(tc, stream)
-			}
-			for range ch {
-				start := time.Now()
-				streamCaller(tc, stream)
-				elapse := time.Since(start)
-				mu.Lock()
-				s.Add(elapse)
-				mu.Unlock()
-			}
-			wg.Done()
-		}()
-	}
-	// Stop the client when time is up.
-	done := make(chan struct{})
-	go func() {
-		<-time.After(time.Duration(*duration) * time.Second)
-		close(done)
-	}()
-	ok := true
-	for ok {
-		select {
-		case ch <- 0:
-		case <-done:
-			ok = false
-		}
-	}
-	close(ch)
-	wg.Wait()
-	conn.Close()
-	grpclog.Println(s.String())
-}
-
-func main() {
-	flag.Parse()
-	grpc.EnableTracing = *trace
-	go func() {
-		lis, err := net.Listen("tcp", ":0")
-		if err != nil {
-			grpclog.Fatalf("Failed to listen: %v", err)
-		}
-		grpclog.Println("Client profiling address: ", lis.Addr().String())
-		if err := http.Serve(lis, nil); err != nil {
-			grpclog.Fatalf("Failed to serve: %v", err)
-		}
-	}()
-	switch *rpcType {
-	case 0:
-		closeLoopUnary()
-	case 1:
-		closeLoopStream()
-	}
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go
deleted file mode 100644
index 74e13c9e95..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.pb.go
+++ /dev/null
@@ -1,641 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: test.proto
-// DO NOT EDIT!
-
-/*
-Package grpc_testing is a generated protocol buffer package.
-
-It is generated from these files:
-	test.proto
-
-It has these top-level messages:
-	StatsRequest
-	ServerStats
-	Payload
-	HistogramData
-	ClientConfig
-	Mark
-	ClientArgs
-	ClientStats
-	ClientStatus
-	ServerConfig
-	ServerArgs
-	ServerStatus
-	SimpleRequest
-	SimpleResponse
-*/
-package grpc_testing
-
-import proto "github.com/golang/protobuf/proto"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-
-type PayloadType int32
-
-const (
-	// Compressable text format.
-	PayloadType_COMPRESSABLE PayloadType = 0
-	// Uncompressable binary format.
-	PayloadType_UNCOMPRESSABLE PayloadType = 1
-	// Randomly chosen from all other formats defined in this enum.
-	PayloadType_RANDOM PayloadType = 2
-)
-
-var PayloadType_name = map[int32]string{
-	0: "COMPRESSABLE",
-	1: "UNCOMPRESSABLE",
-	2: "RANDOM",
-}
-var PayloadType_value = map[string]int32{
-	"COMPRESSABLE":   0,
-	"UNCOMPRESSABLE": 1,
-	"RANDOM":         2,
-}
-
-func (x PayloadType) String() string {
-	return proto.EnumName(PayloadType_name, int32(x))
-}
-
-type ClientType int32
-
-const (
-	ClientType_SYNCHRONOUS_CLIENT ClientType = 0
-	ClientType_ASYNC_CLIENT       ClientType = 1
-)
-
-var ClientType_name = map[int32]string{
-	0: "SYNCHRONOUS_CLIENT",
-	1: "ASYNC_CLIENT",
-}
-var ClientType_value = map[string]int32{
-	"SYNCHRONOUS_CLIENT": 0,
-	"ASYNC_CLIENT":       1,
-}
-
-func (x ClientType) String() string {
-	return proto.EnumName(ClientType_name, int32(x))
-}
-
-type ServerType int32
-
-const (
-	ServerType_SYNCHRONOUS_SERVER ServerType = 0
-	ServerType_ASYNC_SERVER       ServerType = 1
-)
-
-var ServerType_name = map[int32]string{
-	0: "SYNCHRONOUS_SERVER",
-	1: "ASYNC_SERVER",
-}
-var ServerType_value = map[string]int32{
-	"SYNCHRONOUS_SERVER": 0,
-	"ASYNC_SERVER":       1,
-}
-
-func (x ServerType) String() string {
-	return proto.EnumName(ServerType_name, int32(x))
-}
-
-type RpcType int32
-
-const (
-	RpcType_UNARY     RpcType = 0
-	RpcType_STREAMING RpcType = 1
-)
-
-var RpcType_name = map[int32]string{
-	0: "UNARY",
-	1: "STREAMING",
-}
-var RpcType_value = map[string]int32{
-	"UNARY":     0,
-	"STREAMING": 1,
-}
-
-func (x RpcType) String() string {
-	return proto.EnumName(RpcType_name, int32(x))
-}
-
-type StatsRequest struct {
-	// run number
-	TestNum int32 `protobuf:"varint,1,opt,name=test_num" json:"test_num,omitempty"`
-}
-
-func (m *StatsRequest) Reset()         { *m = StatsRequest{} }
-func (m *StatsRequest) String() string { return proto.CompactTextString(m) }
-func (*StatsRequest) ProtoMessage()    {}
-
-type ServerStats struct {
-	// wall clock time
-	TimeElapsed float64 `protobuf:"fixed64,1,opt,name=time_elapsed" json:"time_elapsed,omitempty"`
-	// user time used by the server process and threads
-	TimeUser float64 `protobuf:"fixed64,2,opt,name=time_user" json:"time_user,omitempty"`
-	// server time used by the server process and all threads
-	TimeSystem float64 `protobuf:"fixed64,3,opt,name=time_system" json:"time_system,omitempty"`
-}
-
-func (m *ServerStats) Reset()         { *m = ServerStats{} }
-func (m *ServerStats) String() string { return proto.CompactTextString(m) }
-func (*ServerStats) ProtoMessage()    {}
-
-type Payload struct {
-	// The type of data in body.
-	Type PayloadType `protobuf:"varint,1,opt,name=type,enum=grpc.testing.PayloadType" json:"type,omitempty"`
-	// Primary contents of payload.
-	Body []byte `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
-}
-
-func (m *Payload) Reset()         { *m = Payload{} }
-func (m *Payload) String() string { return proto.CompactTextString(m) }
-func (*Payload) ProtoMessage()    {}
-
-type HistogramData struct {
-	Bucket       []uint32 `protobuf:"varint,1,rep,name=bucket" json:"bucket,omitempty"`
-	MinSeen      float64  `protobuf:"fixed64,2,opt,name=min_seen" json:"min_seen,omitempty"`
-	MaxSeen      float64  `protobuf:"fixed64,3,opt,name=max_seen" json:"max_seen,omitempty"`
-	Sum          float64  `protobuf:"fixed64,4,opt,name=sum" json:"sum,omitempty"`
-	SumOfSquares float64  `protobuf:"fixed64,5,opt,name=sum_of_squares" json:"sum_of_squares,omitempty"`
-	Count        float64  `protobuf:"fixed64,6,opt,name=count" json:"count,omitempty"`
-}
-
-func (m *HistogramData) Reset()         { *m = HistogramData{} }
-func (m *HistogramData) String() string { return proto.CompactTextString(m) }
-func (*HistogramData) ProtoMessage()    {}
-
-type ClientConfig struct {
-	ServerTargets             []string   `protobuf:"bytes,1,rep,name=server_targets" json:"server_targets,omitempty"`
-	ClientType                ClientType `protobuf:"varint,2,opt,name=client_type,enum=grpc.testing.ClientType" json:"client_type,omitempty"`
-	EnableSsl                 bool       `protobuf:"varint,3,opt,name=enable_ssl" json:"enable_ssl,omitempty"`
-	OutstandingRpcsPerChannel int32      `protobuf:"varint,4,opt,name=outstanding_rpcs_per_channel" json:"outstanding_rpcs_per_channel,omitempty"`
-	ClientChannels            int32      `protobuf:"varint,5,opt,name=client_channels" json:"client_channels,omitempty"`
-	PayloadSize               int32      `protobuf:"varint,6,opt,name=payload_size" json:"payload_size,omitempty"`
-	// only for async client:
-	AsyncClientThreads int32   `protobuf:"varint,7,opt,name=async_client_threads" json:"async_client_threads,omitempty"`
-	RpcType            RpcType `protobuf:"varint,8,opt,name=rpc_type,enum=grpc.testing.RpcType" json:"rpc_type,omitempty"`
-}
-
-func (m *ClientConfig) Reset()         { *m = ClientConfig{} }
-func (m *ClientConfig) String() string { return proto.CompactTextString(m) }
-func (*ClientConfig) ProtoMessage()    {}
-
-// Request current stats
-type Mark struct {
-}
-
-func (m *Mark) Reset()         { *m = Mark{} }
-func (m *Mark) String() string { return proto.CompactTextString(m) }
-func (*Mark) ProtoMessage()    {}
-
-type ClientArgs struct {
-	Setup *ClientConfig `protobuf:"bytes,1,opt,name=setup" json:"setup,omitempty"`
-	Mark  *Mark         `protobuf:"bytes,2,opt,name=mark" json:"mark,omitempty"`
-}
-
-func (m *ClientArgs) Reset()         { *m = ClientArgs{} }
-func (m *ClientArgs) String() string { return proto.CompactTextString(m) }
-func (*ClientArgs) ProtoMessage()    {}
-
-func (m *ClientArgs) GetSetup() *ClientConfig {
-	if m != nil {
-		return m.Setup
-	}
-	return nil
-}
-
-func (m *ClientArgs) GetMark() *Mark {
-	if m != nil {
-		return m.Mark
-	}
-	return nil
-}
-
-type ClientStats struct {
-	Latencies   *HistogramData `protobuf:"bytes,1,opt,name=latencies" json:"latencies,omitempty"`
-	TimeElapsed float64        `protobuf:"fixed64,3,opt,name=time_elapsed" json:"time_elapsed,omitempty"`
-	TimeUser    float64        `protobuf:"fixed64,4,opt,name=time_user" json:"time_user,omitempty"`
-	TimeSystem  float64        `protobuf:"fixed64,5,opt,name=time_system" json:"time_system,omitempty"`
-}
-
-func (m *ClientStats) Reset()         { *m = ClientStats{} }
-func (m *ClientStats) String() string { return proto.CompactTextString(m) }
-func (*ClientStats) ProtoMessage()    {}
-
-func (m *ClientStats) GetLatencies() *HistogramData {
-	if m != nil {
-		return m.Latencies
-	}
-	return nil
-}
-
-type ClientStatus struct {
-	Stats *ClientStats `protobuf:"bytes,1,opt,name=stats" json:"stats,omitempty"`
-}
-
-func (m *ClientStatus) Reset()         { *m = ClientStatus{} }
-func (m *ClientStatus) String() string { return proto.CompactTextString(m) }
-func (*ClientStatus) ProtoMessage()    {}
-
-func (m *ClientStatus) GetStats() *ClientStats {
-	if m != nil {
-		return m.Stats
-	}
-	return nil
-}
-
-type ServerConfig struct {
-	ServerType ServerType `protobuf:"varint,1,opt,name=server_type,enum=grpc.testing.ServerType" json:"server_type,omitempty"`
-	Threads    int32      `protobuf:"varint,2,opt,name=threads" json:"threads,omitempty"`
-	EnableSsl  bool       `protobuf:"varint,3,opt,name=enable_ssl" json:"enable_ssl,omitempty"`
-}
-
-func (m *ServerConfig) Reset()         { *m = ServerConfig{} }
-func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
-func (*ServerConfig) ProtoMessage()    {}
-
-type ServerArgs struct {
-	Setup *ServerConfig `protobuf:"bytes,1,opt,name=setup" json:"setup,omitempty"`
-	Mark  *Mark         `protobuf:"bytes,2,opt,name=mark" json:"mark,omitempty"`
-}
-
-func (m *ServerArgs) Reset()         { *m = ServerArgs{} }
-func (m *ServerArgs) String() string { return proto.CompactTextString(m) }
-func (*ServerArgs) ProtoMessage()    {}
-
-func (m *ServerArgs) GetSetup() *ServerConfig {
-	if m != nil {
-		return m.Setup
-	}
-	return nil
-}
-
-func (m *ServerArgs) GetMark() *Mark {
-	if m != nil {
-		return m.Mark
-	}
-	return nil
-}
-
-type ServerStatus struct {
-	Stats *ServerStats `protobuf:"bytes,1,opt,name=stats" json:"stats,omitempty"`
-	Port  int32        `protobuf:"varint,2,opt,name=port" json:"port,omitempty"`
-}
-
-func (m *ServerStatus) Reset()         { *m = ServerStatus{} }
-func (m *ServerStatus) String() string { return proto.CompactTextString(m) }
-func (*ServerStatus) ProtoMessage()    {}
-
-func (m *ServerStatus) GetStats() *ServerStats {
-	if m != nil {
-		return m.Stats
-	}
-	return nil
-}
-
-type SimpleRequest struct {
-	// Desired payload type in the response from the server.
-	// If response_type is RANDOM, server randomly chooses one from other formats.
-	ResponseType PayloadType `protobuf:"varint,1,opt,name=response_type,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
-	// Desired payload size in the response from the server.
-	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	ResponseSize int32 `protobuf:"varint,2,opt,name=response_size" json:"response_size,omitempty"`
-	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
-}
-
-func (m *SimpleRequest) Reset()         { *m = SimpleRequest{} }
-func (m *SimpleRequest) String() string { return proto.CompactTextString(m) }
-func (*SimpleRequest) ProtoMessage()    {}
-
-func (m *SimpleRequest) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-type SimpleResponse struct {
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
-}
-
-func (m *SimpleResponse) Reset()         { *m = SimpleResponse{} }
-func (m *SimpleResponse) String() string { return proto.CompactTextString(m) }
-func (*SimpleResponse) ProtoMessage()    {}
-
-func (m *SimpleResponse) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("grpc.testing.PayloadType", PayloadType_name, PayloadType_value)
-	proto.RegisterEnum("grpc.testing.ClientType", ClientType_name, ClientType_value)
-	proto.RegisterEnum("grpc.testing.ServerType", ServerType_name, ServerType_value)
-	proto.RegisterEnum("grpc.testing.RpcType", RpcType_name, RpcType_value)
-}
-
-// Client API for TestService service
-
-type TestServiceClient interface {
-	// One request followed by one response.
-	// The server returns the client payload as-is.
-	UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error)
-	// One request followed by one response.
-	// The server returns the client payload as-is.
-	StreamingCall(ctx context.Context, opts ...grpc.CallOption) (TestService_StreamingCallClient, error)
-}
-
-type testServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewTestServiceClient(cc *grpc.ClientConn) TestServiceClient {
-	return &testServiceClient{cc}
-}
-
-func (c *testServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error) {
-	out := new(SimpleResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/UnaryCall", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *testServiceClient) StreamingCall(ctx context.Context, opts ...grpc.CallOption) (TestService_StreamingCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[0], c.cc, "/grpc.testing.TestService/StreamingCall", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &testServiceStreamingCallClient{stream}
-	return x, nil
-}
-
-type TestService_StreamingCallClient interface {
-	Send(*SimpleRequest) error
-	Recv() (*SimpleResponse, error)
-	grpc.ClientStream
-}
-
-type testServiceStreamingCallClient struct {
-	grpc.ClientStream
-}
-
-func (x *testServiceStreamingCallClient) Send(m *SimpleRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *testServiceStreamingCallClient) Recv() (*SimpleResponse, error) {
-	m := new(SimpleResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// Server API for TestService service
-
-type TestServiceServer interface {
-	// One request followed by one response.
-	// The server returns the client payload as-is.
-	UnaryCall(context.Context, *SimpleRequest) (*SimpleResponse, error)
-	// One request followed by one response.
-	// The server returns the client payload as-is.
-	StreamingCall(TestService_StreamingCallServer) error
-}
-
-func RegisterTestServiceServer(s *grpc.Server, srv TestServiceServer) {
-	s.RegisterService(&_TestService_serviceDesc, srv)
-}
-
-func _TestService_UnaryCall_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
-	in := new(SimpleRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	out, err := srv.(TestServiceServer).UnaryCall(ctx, in)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func _TestService_StreamingCall_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TestServiceServer).StreamingCall(&testServiceStreamingCallServer{stream})
-}
-
-type TestService_StreamingCallServer interface {
-	Send(*SimpleResponse) error
-	Recv() (*SimpleRequest, error)
-	grpc.ServerStream
-}
-
-type testServiceStreamingCallServer struct {
-	grpc.ServerStream
-}
-
-func (x *testServiceStreamingCallServer) Send(m *SimpleResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *testServiceStreamingCallServer) Recv() (*SimpleRequest, error) {
-	m := new(SimpleRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-var _TestService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "grpc.testing.TestService",
-	HandlerType: (*TestServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "UnaryCall",
-			Handler:    _TestService_UnaryCall_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "StreamingCall",
-			Handler:       _TestService_StreamingCall_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-	},
-}
-
-// Client API for Worker service
-
-type WorkerClient interface {
-	// Start test with specified workload
-	RunTest(ctx context.Context, opts ...grpc.CallOption) (Worker_RunTestClient, error)
-	// Start test with specified workload
-	RunServer(ctx context.Context, opts ...grpc.CallOption) (Worker_RunServerClient, error)
-}
-
-type workerClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewWorkerClient(cc *grpc.ClientConn) WorkerClient {
-	return &workerClient{cc}
-}
-
-func (c *workerClient) RunTest(ctx context.Context, opts ...grpc.CallOption) (Worker_RunTestClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Worker_serviceDesc.Streams[0], c.cc, "/grpc.testing.Worker/RunTest", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &workerRunTestClient{stream}
-	return x, nil
-}
-
-type Worker_RunTestClient interface {
-	Send(*ClientArgs) error
-	Recv() (*ClientStatus, error)
-	grpc.ClientStream
-}
-
-type workerRunTestClient struct {
-	grpc.ClientStream
-}
-
-func (x *workerRunTestClient) Send(m *ClientArgs) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *workerRunTestClient) Recv() (*ClientStatus, error) {
-	m := new(ClientStatus)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *workerClient) RunServer(ctx context.Context, opts ...grpc.CallOption) (Worker_RunServerClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_Worker_serviceDesc.Streams[1], c.cc, "/grpc.testing.Worker/RunServer", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &workerRunServerClient{stream}
-	return x, nil
-}
-
-type Worker_RunServerClient interface {
-	Send(*ServerArgs) error
-	Recv() (*ServerStatus, error)
-	grpc.ClientStream
-}
-
-type workerRunServerClient struct {
-	grpc.ClientStream
-}
-
-func (x *workerRunServerClient) Send(m *ServerArgs) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *workerRunServerClient) Recv() (*ServerStatus, error) {
-	m := new(ServerStatus)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// Server API for Worker service
-
-type WorkerServer interface {
-	// Start test with specified workload
-	RunTest(Worker_RunTestServer) error
-	// Start test with specified workload
-	RunServer(Worker_RunServerServer) error
-}
-
-func RegisterWorkerServer(s *grpc.Server, srv WorkerServer) {
-	s.RegisterService(&_Worker_serviceDesc, srv)
-}
-
-func _Worker_RunTest_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(WorkerServer).RunTest(&workerRunTestServer{stream})
-}
-
-type Worker_RunTestServer interface {
-	Send(*ClientStatus) error
-	Recv() (*ClientArgs, error)
-	grpc.ServerStream
-}
-
-type workerRunTestServer struct {
-	grpc.ServerStream
-}
-
-func (x *workerRunTestServer) Send(m *ClientStatus) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *workerRunTestServer) Recv() (*ClientArgs, error) {
-	m := new(ClientArgs)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func _Worker_RunServer_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(WorkerServer).RunServer(&workerRunServerServer{stream})
-}
-
-type Worker_RunServerServer interface {
-	Send(*ServerStatus) error
-	Recv() (*ServerArgs, error)
-	grpc.ServerStream
-}
-
-type workerRunServerServer struct {
-	grpc.ServerStream
-}
-
-func (x *workerRunServerServer) Send(m *ServerStatus) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *workerRunServerServer) Recv() (*ServerArgs, error) {
-	m := new(ServerArgs)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-var _Worker_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "grpc.testing.Worker",
-	HandlerType: (*WorkerServer)(nil),
-	Methods:     []grpc.MethodDesc{},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "RunTest",
-			Handler:       _Worker_RunTest_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-		{
-			StreamName:    "RunServer",
-			Handler:       _Worker_RunServer_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-	},
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.proto b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.proto
deleted file mode 100644
index e3a27f861b..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/grpc_testing/test.proto
+++ /dev/null
@@ -1,148 +0,0 @@
-// An integration test service that covers all the method signature permutations
-// of unary/streaming requests/responses.
-syntax = "proto3";
-
-package grpc.testing;
-
-enum PayloadType {
-    // Compressable text format.
-    COMPRESSABLE = 0;
-
-    // Uncompressable binary format.
-    UNCOMPRESSABLE = 1;
-
-    // Randomly chosen from all other formats defined in this enum.
-    RANDOM = 2;
-}
-
-message StatsRequest {
-    // run number
-    optional int32 test_num = 1;
-}
-
-message ServerStats {
-    // wall clock time
-    double time_elapsed = 1;
-
-    // user time used by the server process and threads
-    double time_user = 2;
-
-    // server time used by the server process and all threads
-    double time_system = 3;
-}
-
-message Payload {
-    // The type of data in body.
-    PayloadType type = 1;
-    // Primary contents of payload.
-    bytes body = 2;
-}
-
-message HistogramData {
-    repeated uint32 bucket = 1;
-    double min_seen = 2;
-    double max_seen = 3;
-    double sum = 4;
-    double sum_of_squares = 5;
-    double count = 6;
-}
-
-enum ClientType {
-    SYNCHRONOUS_CLIENT = 0;
-    ASYNC_CLIENT = 1;
-}
-
-enum ServerType {
-    SYNCHRONOUS_SERVER = 0;
-    ASYNC_SERVER = 1;
-}
-
-enum RpcType {
-    UNARY = 0;
-    STREAMING = 1;
-}
-
-message ClientConfig {
-    repeated string server_targets = 1;
-    ClientType client_type = 2;
-    bool enable_ssl = 3;
-    int32 outstanding_rpcs_per_channel = 4;
-    int32 client_channels = 5;
-    int32 payload_size = 6;
-    // only for async client:
-    int32 async_client_threads = 7;
-    RpcType rpc_type = 8;
-}
-
-// Request current stats
-message Mark {}
-
-message ClientArgs {
-    oneof argtype {
-        ClientConfig setup = 1;
-        Mark mark = 2;
-    }
-}
-
-message ClientStats {
-    HistogramData latencies = 1;
-    double time_elapsed = 3;
-    double time_user = 4;
-    double time_system = 5;
-}
-
-message ClientStatus {
-    ClientStats stats = 1;
-}
-
-message ServerConfig {
-    ServerType server_type = 1;
-    int32 threads = 2;
-    bool enable_ssl = 3;
-}
-
-message ServerArgs {
-    oneof argtype {
-        ServerConfig setup = 1;
-        Mark mark = 2;
-    }
-}
-
-message ServerStatus {
-    ServerStats stats = 1;
-    int32 port = 2;
-}
-
-message SimpleRequest {
-    // Desired payload type in the response from the server.
-    // If response_type is RANDOM, server randomly chooses one from other formats.
-    PayloadType response_type = 1;
-
-    // Desired payload size in the response from the server.
-    // If response_type is COMPRESSABLE, this denotes the size before compression.
-    int32 response_size = 2;
-
-    // Optional input payload sent along with the request.
-    Payload payload = 3;
-}
-
-message SimpleResponse {
-    Payload payload = 1;
-}
-
-service TestService {
-    // One request followed by one response.
-    // The server returns the client payload as-is.
-    rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
-
-    // One request followed by one response.
-    // The server returns the client payload as-is.
-    rpc StreamingCall(stream SimpleRequest) returns (stream SimpleResponse);
-}
-
-service Worker {
-    // Start test with specified workload
-    rpc RunTest(stream ClientArgs) returns (stream ClientStatus);
-    // Start test with specified workload
-    rpc RunServer(stream ServerArgs) returns (stream ServerStatus);
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/server/main.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/server/main.go
deleted file mode 100644
index 090f002fa1..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/server/main.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package main
-
-import (
-	"flag"
-	"math"
-	"net"
-	"net/http"
-	_ "net/http/pprof"
-	"time"
-
-	"google.golang.org/grpc/benchmark"
-	"google.golang.org/grpc/grpclog"
-)
-
-var (
-	duration = flag.Int("duration", math.MaxInt32, "The duration in seconds to run the benchmark server")
-)
-
-func main() {
-	flag.Parse()
-	go func() {
-		lis, err := net.Listen("tcp", ":0")
-		if err != nil {
-			grpclog.Fatalf("Failed to listen: %v", err)
-		}
-		grpclog.Println("Server profiling address: ", lis.Addr().String())
-		if err := http.Serve(lis, nil); err != nil {
-			grpclog.Fatalf("Failed to serve: %v", err)
-		}
-	}()
-	addr, stopper := benchmark.StartServer(":0") // listen on all interfaces
-	grpclog.Println("Server Address: ", addr)
-	<-time.After(time.Duration(*duration) * time.Second)
-	stopper()
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/counter.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/counter.go
deleted file mode 100644
index 4389bae38c..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/counter.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package stats
-
-import (
-	"sync"
-	"time"
-)
-
-var (
-	// TimeNow is used for testing.
-	TimeNow = time.Now
-)
-
-const (
-	hour       = 0
-	tenminutes = 1
-	minute     = 2
-)
-
-// Counter is a counter that keeps track of its recent values over a given
-// period of time, and with a given resolution. Use newCounter() to instantiate.
-type Counter struct {
-	mu         sync.RWMutex
-	ts         [3]*timeseries
-	lastUpdate time.Time
-}
-
-// newCounter returns a new Counter.
-func newCounter() *Counter {
-	now := TimeNow()
-	c := &Counter{}
-	c.ts[hour] = newTimeSeries(now, time.Hour, time.Minute)
-	c.ts[tenminutes] = newTimeSeries(now, 10*time.Minute, 10*time.Second)
-	c.ts[minute] = newTimeSeries(now, time.Minute, time.Second)
-	return c
-}
-
-func (c *Counter) advance() time.Time {
-	now := TimeNow()
-	for _, ts := range c.ts {
-		ts.advanceTime(now)
-	}
-	return now
-}
-
-// Value returns the current value of the counter.
-func (c *Counter) Value() int64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	return c.ts[minute].headValue()
-}
-
-// LastUpdate returns the last update time of the counter.
-func (c *Counter) LastUpdate() time.Time {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	return c.lastUpdate
-}
-
-// Set updates the current value of the counter.
-func (c *Counter) Set(value int64) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	c.lastUpdate = c.advance()
-	for _, ts := range c.ts {
-		ts.set(value)
-	}
-}
-
-// Incr increments the current value of the counter by 'delta'.
-func (c *Counter) Incr(delta int64) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	c.lastUpdate = c.advance()
-	for _, ts := range c.ts {
-		ts.incr(delta)
-	}
-}
-
-// Delta1h returns the delta for the last hour.
-func (c *Counter) Delta1h() int64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	c.advance()
-	return c.ts[hour].delta()
-}
-
-// Delta10m returns the delta for the last 10 minutes.
-func (c *Counter) Delta10m() int64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	c.advance()
-	return c.ts[tenminutes].delta()
-}
-
-// Delta1m returns the delta for the last minute.
-func (c *Counter) Delta1m() int64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	c.advance()
-	return c.ts[minute].delta()
-}
-
-// Rate1h returns the rate of change of the counter in the last hour.
-func (c *Counter) Rate1h() float64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	c.advance()
-	return c.ts[hour].rate()
-}
-
-// Rate10m returns the rate of change of the counter in the last 10 minutes.
-func (c *Counter) Rate10m() float64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	c.advance()
-	return c.ts[tenminutes].rate()
-}
-
-// Rate1m returns the rate of change of the counter in the last minute.
-func (c *Counter) Rate1m() float64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	c.advance()
-	return c.ts[minute].rate()
-}
-
-// Reset resets the counter to an empty state.
-func (c *Counter) Reset() {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	now := TimeNow()
-	for _, ts := range c.ts {
-		ts.reset(now)
-	}
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/histogram.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/histogram.go
deleted file mode 100644
index 727808c8ba..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/histogram.go
+++ /dev/null
@@ -1,255 +0,0 @@
-package stats
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// HistogramValue is the value of Histogram objects.
-type HistogramValue struct {
-	// Count is the total number of values added to the histogram.
-	Count int64
-	// Sum is the sum of all the values added to the histogram.
-	Sum int64
-	// Min is the minimum of all the values added to the histogram.
-	Min int64
-	// Max is the maximum of all the values added to the histogram.
-	Max int64
-	// Buckets contains all the buckets of the histogram.
-	Buckets []HistogramBucket
-}
-
-// HistogramBucket is one histogram bucket.
-type HistogramBucket struct {
-	// LowBound is the lower bound of the bucket.
-	LowBound int64
-	// Count is the number of values in the bucket.
-	Count int64
-}
-
-// Print writes textual output of the histogram values.
-func (v HistogramValue) Print(w io.Writer) {
-	avg := float64(v.Sum) / float64(v.Count)
-	fmt.Fprintf(w, "Count: %d  Min: %d  Max: %d  Avg: %.2f\n", v.Count, v.Min, v.Max, avg)
-	fmt.Fprintf(w, "%s\n", strings.Repeat("-", 60))
-	if v.Count <= 0 {
-		return
-	}
-
-	maxBucketDigitLen := len(strconv.FormatInt(v.Buckets[len(v.Buckets)-1].LowBound, 10))
-	if maxBucketDigitLen < 3 {
-		// For "inf".
-		maxBucketDigitLen = 3
-	}
-	maxCountDigitLen := len(strconv.FormatInt(v.Count, 10))
-	percentMulti := 100 / float64(v.Count)
-
-	accCount := int64(0)
-	for i, b := range v.Buckets {
-		fmt.Fprintf(w, "[%*d, ", maxBucketDigitLen, b.LowBound)
-		if i+1 < len(v.Buckets) {
-			fmt.Fprintf(w, "%*d)", maxBucketDigitLen, v.Buckets[i+1].LowBound)
-		} else {
-			fmt.Fprintf(w, "%*s)", maxBucketDigitLen, "inf")
-		}
-
-		accCount += b.Count
-		fmt.Fprintf(w, "  %*d  %5.1f%%  %5.1f%%", maxCountDigitLen, b.Count, float64(b.Count)*percentMulti, float64(accCount)*percentMulti)
-
-		const barScale = 0.1
-		barLength := int(float64(b.Count)*percentMulti*barScale + 0.5)
-		fmt.Fprintf(w, "  %s\n", strings.Repeat("#", barLength))
-	}
-}
-
-// String returns the textual output of the histogram values as string.
-func (v HistogramValue) String() string {
-	var b bytes.Buffer
-	v.Print(&b)
-	return b.String()
-}
-
-// A Histogram accumulates values in the form of a histogram. The type of the
-// values is int64, which is suitable for keeping track of things like RPC
-// latency in milliseconds. New histogram objects should be obtained via the
-// New() function.
-type Histogram struct {
-	opts    HistogramOptions
-	buckets []bucketInternal
-	count   *Counter
-	sum     *Counter
-	tracker *Tracker
-}
-
-// HistogramOptions contains the parameters that define the histogram's buckets.
-type HistogramOptions struct {
-	// NumBuckets is the number of buckets.
-	NumBuckets int
-	// GrowthFactor is the growth factor of the buckets. A value of 0.1
-	// indicates that bucket N+1 will be 10% larger than bucket N.
-	GrowthFactor float64
-	// SmallestBucketSize is the size of the first bucket. Bucket sizes are
-	// rounded down to the nearest integer.
-	SmallestBucketSize float64
-	// MinValue is the lower bound of the first bucket.
-	MinValue int64
-}
-
-// bucketInternal is the internal representation of a bucket, which includes a
-// rate counter.
-type bucketInternal struct {
-	lowBound int64
-	count    *Counter
-}
-
-// NewHistogram returns a pointer to a new Histogram object that was created
-// with the provided options.
-func NewHistogram(opts HistogramOptions) *Histogram {
-	if opts.NumBuckets == 0 {
-		opts.NumBuckets = 32
-	}
-	if opts.SmallestBucketSize == 0.0 {
-		opts.SmallestBucketSize = 1.0
-	}
-	h := Histogram{
-		opts:    opts,
-		buckets: make([]bucketInternal, opts.NumBuckets),
-		count:   newCounter(),
-		sum:     newCounter(),
-		tracker: newTracker(),
-	}
-	low := opts.MinValue
-	delta := opts.SmallestBucketSize
-	for i := 0; i < opts.NumBuckets; i++ {
-		h.buckets[i].lowBound = low
-		h.buckets[i].count = newCounter()
-		low = low + int64(delta)
-		delta = delta * (1.0 + opts.GrowthFactor)
-	}
-	return &h
-}
-
-// Opts returns a copy of the options used to create the Histogram.
-func (h *Histogram) Opts() HistogramOptions {
-	return h.opts
-}
-
-// Add adds a value to the histogram.
-func (h *Histogram) Add(value int64) error {
-	bucket, err := h.findBucket(value)
-	if err != nil {
-		return err
-	}
-	h.buckets[bucket].count.Incr(1)
-	h.count.Incr(1)
-	h.sum.Incr(value)
-	h.tracker.Push(value)
-	return nil
-}
-
-// LastUpdate returns the time at which the object was last updated.
-func (h *Histogram) LastUpdate() time.Time {
-	return h.count.LastUpdate()
-}
-
-// Value returns the accumulated state of the histogram since it was created.
-func (h *Histogram) Value() HistogramValue {
-	b := make([]HistogramBucket, len(h.buckets))
-	for i, v := range h.buckets {
-		b[i] = HistogramBucket{
-			LowBound: v.lowBound,
-			Count:    v.count.Value(),
-		}
-	}
-
-	v := HistogramValue{
-		Count:   h.count.Value(),
-		Sum:     h.sum.Value(),
-		Min:     h.tracker.Min(),
-		Max:     h.tracker.Max(),
-		Buckets: b,
-	}
-	return v
-}
-
-// Delta1h returns the change in the last hour.
-func (h *Histogram) Delta1h() HistogramValue {
-	b := make([]HistogramBucket, len(h.buckets))
-	for i, v := range h.buckets {
-		b[i] = HistogramBucket{
-			LowBound: v.lowBound,
-			Count:    v.count.Delta1h(),
-		}
-	}
-
-	v := HistogramValue{
-		Count:   h.count.Delta1h(),
-		Sum:     h.sum.Delta1h(),
-		Min:     h.tracker.Min1h(),
-		Max:     h.tracker.Max1h(),
-		Buckets: b,
-	}
-	return v
-}
-
-// Delta10m returns the change in the last 10 minutes.
-func (h *Histogram) Delta10m() HistogramValue {
-	b := make([]HistogramBucket, len(h.buckets))
-	for i, v := range h.buckets {
-		b[i] = HistogramBucket{
-			LowBound: v.lowBound,
-			Count:    v.count.Delta10m(),
-		}
-	}
-
-	v := HistogramValue{
-		Count:   h.count.Delta10m(),
-		Sum:     h.sum.Delta10m(),
-		Min:     h.tracker.Min10m(),
-		Max:     h.tracker.Max10m(),
-		Buckets: b,
-	}
-	return v
-}
-
-// Delta1m returns the change in the last 10 minutes.
-func (h *Histogram) Delta1m() HistogramValue {
-	b := make([]HistogramBucket, len(h.buckets))
-	for i, v := range h.buckets {
-		b[i] = HistogramBucket{
-			LowBound: v.lowBound,
-			Count:    v.count.Delta1m(),
-		}
-	}
-
-	v := HistogramValue{
-		Count:   h.count.Delta1m(),
-		Sum:     h.sum.Delta1m(),
-		Min:     h.tracker.Min1m(),
-		Max:     h.tracker.Max1m(),
-		Buckets: b,
-	}
-	return v
-}
-
-// findBucket does a binary search to find in which bucket the value goes.
-func (h *Histogram) findBucket(value int64) (int, error) {
-	lastBucket := len(h.buckets) - 1
-	min, max := 0, lastBucket
-	for max >= min {
-		b := (min + max) / 2
-		if value >= h.buckets[b].lowBound && (b == lastBucket || value < h.buckets[b+1].lowBound) {
-			return b, nil
-		}
-		if value < h.buckets[b].lowBound {
-			max = b - 1
-			continue
-		}
-		min = b + 1
-	}
-	return 0, fmt.Errorf("no bucket for value: %d", value)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/stats.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/stats.go
deleted file mode 100644
index 4290ad77e5..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/stats.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package stats
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"math"
-	"time"
-)
-
-// Stats is a simple helper for gathering additional statistics like histogram
-// during benchmarks. This is not thread safe.
-type Stats struct {
-	numBuckets int
-	unit       time.Duration
-	min, max   int64
-	histogram  *Histogram
-
-	durations durationSlice
-	dirty     bool
-}
-
-type durationSlice []time.Duration
-
-// NewStats creates a new Stats instance. If numBuckets is not positive,
-// the default value (16) will be used.
-func NewStats(numBuckets int) *Stats {
-	if numBuckets <= 0 {
-		numBuckets = 16
-	}
-	return &Stats{
-		// Use one more bucket for the last unbounded bucket.
-		numBuckets: numBuckets + 1,
-		durations:  make(durationSlice, 0, 100000),
-	}
-}
-
-// Add adds an elapsed time per operation to the stats.
-func (stats *Stats) Add(d time.Duration) {
-	stats.durations = append(stats.durations, d)
-	stats.dirty = true
-}
-
-// Clear resets the stats, removing all values.
-func (stats *Stats) Clear() {
-	stats.durations = stats.durations[:0]
-	stats.histogram = nil
-	stats.dirty = false
-}
-
-// maybeUpdate updates internal stat data if there was any newly added
-// stats since this was updated.
-func (stats *Stats) maybeUpdate() {
-	if !stats.dirty {
-		return
-	}
-
-	stats.min = math.MaxInt64
-	stats.max = 0
-	for _, d := range stats.durations {
-		if stats.min > int64(d) {
-			stats.min = int64(d)
-		}
-		if stats.max < int64(d) {
-			stats.max = int64(d)
-		}
-	}
-
-	// Use the largest unit that can represent the minimum time duration.
-	stats.unit = time.Nanosecond
-	for _, u := range []time.Duration{time.Microsecond, time.Millisecond, time.Second} {
-		if stats.min <= int64(u) {
-			break
-		}
-		stats.unit = u
-	}
-
-	// Adjust the min/max according to the new unit.
-	stats.min /= int64(stats.unit)
-	stats.max /= int64(stats.unit)
-	numBuckets := stats.numBuckets
-	if n := int(stats.max - stats.min + 1); n < numBuckets {
-		numBuckets = n
-	}
-	stats.histogram = NewHistogram(HistogramOptions{
-		NumBuckets: numBuckets,
-		// max(i.e., Nth lower bound) = min + (1 + growthFactor)^(numBuckets-2).
-		GrowthFactor:       math.Pow(float64(stats.max-stats.min), 1/float64(stats.numBuckets-2)) - 1,
-		SmallestBucketSize: 1.0,
-		MinValue:           stats.min})
-
-	for _, d := range stats.durations {
-		stats.histogram.Add(int64(d / stats.unit))
-	}
-
-	stats.dirty = false
-}
-
-// Print writes textual output of the Stats.
-func (stats *Stats) Print(w io.Writer) {
-	stats.maybeUpdate()
-
-	if stats.histogram == nil {
-		fmt.Fprint(w, "Histogram (empty)\n")
-	} else {
-		fmt.Fprintf(w, "Histogram (unit: %s)\n", fmt.Sprintf("%v", stats.unit)[1:])
-		stats.histogram.Value().Print(w)
-	}
-}
-
-// String returns the textual output of the Stats as string.
-func (stats *Stats) String() string {
-	var b bytes.Buffer
-	stats.Print(&b)
-	return b.String()
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/timeseries.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/timeseries.go
deleted file mode 100644
index 2ba18a4d4f..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/timeseries.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package stats
-
-import (
-	"math"
-	"time"
-)
-
-// timeseries holds the history of a changing value over a predefined period of
-// time.
-type timeseries struct {
-	size       int           // The number of time slots. Equivalent to len(slots).
-	resolution time.Duration // The time resolution of each slot.
-	stepCount  int64         // The number of intervals seen since creation.
-	head       int           // The position of the current time in slots.
-	time       time.Time     // The time at the beginning of the current time slot.
-	slots      []int64       // A circular buffer of time slots.
-}
-
-// newTimeSeries returns a newly allocated timeseries that covers the requested
-// period with the given resolution.
-func newTimeSeries(initialTime time.Time, period, resolution time.Duration) *timeseries {
-	size := int(period.Nanoseconds()/resolution.Nanoseconds()) + 1
-	return &timeseries{
-		size:       size,
-		resolution: resolution,
-		stepCount:  1,
-		time:       initialTime,
-		slots:      make([]int64, size),
-	}
-}
-
-// advanceTimeWithFill moves the timeseries forward to time t and fills in any
-// slots that get skipped in the process with the given value. Values older than
-// the timeseries period are lost.
-func (ts *timeseries) advanceTimeWithFill(t time.Time, value int64) {
-	advanceTo := t.Truncate(ts.resolution)
-	if !advanceTo.After(ts.time) {
-		// This is shortcut for the most common case of a busy counter
-		// where updates come in many times per ts.resolution.
-		ts.time = advanceTo
-		return
-	}
-	steps := int(advanceTo.Sub(ts.time).Nanoseconds() / ts.resolution.Nanoseconds())
-	ts.stepCount += int64(steps)
-	if steps > ts.size {
-		steps = ts.size
-	}
-	for steps > 0 {
-		ts.head = (ts.head + 1) % ts.size
-		ts.slots[ts.head] = value
-		steps--
-	}
-	ts.time = advanceTo
-}
-
-// advanceTime moves the timeseries forward to time t and fills in any slots
-// that get skipped in the process with the head value. Values older than the
-// timeseries period are lost.
-func (ts *timeseries) advanceTime(t time.Time) {
-	ts.advanceTimeWithFill(t, ts.slots[ts.head])
-}
-
-// set sets the current value of the timeseries.
-func (ts *timeseries) set(value int64) {
-	ts.slots[ts.head] = value
-}
-
-// incr sets the current value of the timeseries.
-func (ts *timeseries) incr(delta int64) {
-	ts.slots[ts.head] += delta
-}
-
-// headValue returns the latest value from the timeseries.
-func (ts *timeseries) headValue() int64 {
-	return ts.slots[ts.head]
-}
-
-// headTime returns the time of the latest value from the timeseries.
-func (ts *timeseries) headTime() time.Time {
-	return ts.time
-}
-
-// tailValue returns the oldest value from the timeseries.
-func (ts *timeseries) tailValue() int64 {
-	if ts.stepCount < int64(ts.size) {
-		return 0
-	}
-	return ts.slots[(ts.head+1)%ts.size]
-}
-
-// tailTime returns the time of the oldest value from the timeseries.
-func (ts *timeseries) tailTime() time.Time {
-	size := int64(ts.size)
-	if ts.stepCount < size {
-		size = ts.stepCount
-	}
-	return ts.time.Add(-time.Duration(size-1) * ts.resolution)
-}
-
-// delta returns the difference between the newest and oldest values from the
-// timeseries.
-func (ts *timeseries) delta() int64 {
-	return ts.headValue() - ts.tailValue()
-}
-
-// rate returns the rate of change between the oldest and newest values from
-// the timeseries in units per second.
-func (ts *timeseries) rate() float64 {
-	deltaTime := ts.headTime().Sub(ts.tailTime()).Seconds()
-	if deltaTime == 0 {
-		return 0
-	}
-	return float64(ts.delta()) / deltaTime
-}
-
-// min returns the smallest value from the timeseries.
-func (ts *timeseries) min() int64 {
-	to := ts.size
-	if ts.stepCount < int64(ts.size) {
-		to = ts.head + 1
-	}
-	tail := (ts.head + 1) % ts.size
-	min := int64(math.MaxInt64)
-	for b := 0; b < to; b++ {
-		if b != tail && ts.slots[b] < min {
-			min = ts.slots[b]
-		}
-	}
-	return min
-}
-
-// max returns the largest value from the timeseries.
-func (ts *timeseries) max() int64 {
-	to := ts.size
-	if ts.stepCount < int64(ts.size) {
-		to = ts.head + 1
-	}
-	tail := (ts.head + 1) % ts.size
-	max := int64(math.MinInt64)
-	for b := 0; b < to; b++ {
-		if b != tail && ts.slots[b] > max {
-			max = ts.slots[b]
-		}
-	}
-	return max
-}
-
-// reset resets the timeseries to an empty state.
-func (ts *timeseries) reset(t time.Time) {
-	ts.head = 0
-	ts.time = t
-	ts.stepCount = 1
-	ts.slots = make([]int64, ts.size)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/tracker.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/tracker.go
deleted file mode 100644
index 802f72957b..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/tracker.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package stats
-
-import (
-	"math"
-	"sync"
-	"time"
-)
-
-// Tracker is a min/max value tracker that keeps track of its min/max values
-// over a given period of time, and with a given resolution. The initial min
-// and max values are math.MaxInt64 and math.MinInt64 respectively.
-type Tracker struct {
-	mu           sync.RWMutex
-	min, max     int64 // All time min/max.
-	minTS, maxTS [3]*timeseries
-	lastUpdate   time.Time
-}
-
-// newTracker returns a new Tracker.
-func newTracker() *Tracker {
-	now := TimeNow()
-	t := &Tracker{}
-	t.minTS[hour] = newTimeSeries(now, time.Hour, time.Minute)
-	t.minTS[tenminutes] = newTimeSeries(now, 10*time.Minute, 10*time.Second)
-	t.minTS[minute] = newTimeSeries(now, time.Minute, time.Second)
-	t.maxTS[hour] = newTimeSeries(now, time.Hour, time.Minute)
-	t.maxTS[tenminutes] = newTimeSeries(now, 10*time.Minute, 10*time.Second)
-	t.maxTS[minute] = newTimeSeries(now, time.Minute, time.Second)
-	t.init()
-	return t
-}
-
-func (t *Tracker) init() {
-	t.min = math.MaxInt64
-	t.max = math.MinInt64
-	for _, ts := range t.minTS {
-		ts.set(math.MaxInt64)
-	}
-	for _, ts := range t.maxTS {
-		ts.set(math.MinInt64)
-	}
-}
-
-func (t *Tracker) advance() time.Time {
-	now := TimeNow()
-	for _, ts := range t.minTS {
-		ts.advanceTimeWithFill(now, math.MaxInt64)
-	}
-	for _, ts := range t.maxTS {
-		ts.advanceTimeWithFill(now, math.MinInt64)
-	}
-	return now
-}
-
-// LastUpdate returns the last update time of the range.
-func (t *Tracker) LastUpdate() time.Time {
-	t.mu.RLock()
-	defer t.mu.RUnlock()
-	return t.lastUpdate
-}
-
-// Push adds a new value if it is a new minimum or maximum.
-func (t *Tracker) Push(value int64) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.lastUpdate = t.advance()
-	if t.min > value {
-		t.min = value
-	}
-	if t.max < value {
-		t.max = value
-	}
-	for _, ts := range t.minTS {
-		if ts.headValue() > value {
-			ts.set(value)
-		}
-	}
-	for _, ts := range t.maxTS {
-		if ts.headValue() < value {
-			ts.set(value)
-		}
-	}
-}
-
-// Min returns the minimum value of the tracker
-func (t *Tracker) Min() int64 {
-	t.mu.RLock()
-	defer t.mu.RUnlock()
-	return t.min
-}
-
-// Max returns the maximum value of the tracker.
-func (t *Tracker) Max() int64 {
-	t.mu.RLock()
-	defer t.mu.RUnlock()
-	return t.max
-}
-
-// Min1h returns the minimum value for the last hour.
-func (t *Tracker) Min1h() int64 {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.advance()
-	return t.minTS[hour].min()
-}
-
-// Max1h returns the maximum value for the last hour.
-func (t *Tracker) Max1h() int64 {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.advance()
-	return t.maxTS[hour].max()
-}
-
-// Min10m returns the minimum value for the last 10 minutes.
-func (t *Tracker) Min10m() int64 {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.advance()
-	return t.minTS[tenminutes].min()
-}
-
-// Max10m returns the maximum value for the last 10 minutes.
-func (t *Tracker) Max10m() int64 {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.advance()
-	return t.maxTS[tenminutes].max()
-}
-
-// Min1m returns the minimum value for the last 1 minute.
-func (t *Tracker) Min1m() int64 {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.advance()
-	return t.minTS[minute].min()
-}
-
-// Max1m returns the maximum value for the last 1 minute.
-func (t *Tracker) Max1m() int64 {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.advance()
-	return t.maxTS[minute].max()
-}
-
-// Reset resets the range to an empty state.
-func (t *Tracker) Reset() {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	now := TimeNow()
-	for _, ts := range t.minTS {
-		ts.reset(now)
-	}
-	for _, ts := range t.maxTS {
-		ts.reset(now)
-	}
-	t.init()
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/util.go b/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/util.go
deleted file mode 100644
index a9922f985f..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/benchmark/stats/util.go
+++ /dev/null
@@ -1,191 +0,0 @@
-package stats
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"os"
-	"runtime"
-	"sort"
-	"strings"
-	"sync"
-	"testing"
-)
-
-var (
-	curB         *testing.B
-	curBenchName string
-	curStats     map[string]*Stats
-
-	orgStdout  *os.File
-	nextOutPos int
-
-	injectCond *sync.Cond
-	injectDone chan struct{}
-)
-
-// AddStats adds a new unnamed Stats instance to the current benchmark. You need
-// to run benchmarks by calling RunTestMain() to inject the stats to the
-// benchmark results. If numBuckets is not positive, the default value (16) will
-// be used. Please note that this calls b.ResetTimer() since it may be blocked
-// until the previous benchmark stats is printed out. So AddStats() should
-// typically be called at the very beginning of each benchmark function.
-func AddStats(b *testing.B, numBuckets int) *Stats {
-	return AddStatsWithName(b, "", numBuckets)
-}
-
-// AddStatsWithName adds a new named Stats instance to the current benchmark.
-// With this, you can add multiple stats in a single benchmark. You need
-// to run benchmarks by calling RunTestMain() to inject the stats to the
-// benchmark results. If numBuckets is not positive, the default value (16) will
-// be used. Please note that this calls b.ResetTimer() since it may be blocked
-// until the previous benchmark stats is printed out. So AddStatsWithName()
-// should typically be called at the very beginning of each benchmark function.
-func AddStatsWithName(b *testing.B, name string, numBuckets int) *Stats {
-	var benchName string
-	for i := 1; ; i++ {
-		pc, _, _, ok := runtime.Caller(i)
-		if !ok {
-			panic("benchmark function not found")
-		}
-		p := strings.Split(runtime.FuncForPC(pc).Name(), ".")
-		benchName = p[len(p)-1]
-		if strings.HasPrefix(benchName, "Benchmark") {
-			break
-		}
-	}
-	procs := runtime.GOMAXPROCS(-1)
-	if procs != 1 {
-		benchName = fmt.Sprintf("%s-%d", benchName, procs)
-	}
-
-	stats := NewStats(numBuckets)
-
-	if injectCond != nil {
-		// We need to wait until the previous benchmark stats is printed out.
-		injectCond.L.Lock()
-		for curB != nil && curBenchName != benchName {
-			injectCond.Wait()
-		}
-
-		curB = b
-		curBenchName = benchName
-		curStats[name] = stats
-
-		injectCond.L.Unlock()
-	}
-
-	b.ResetTimer()
-	return stats
-}
-
-// RunTestMain runs the tests with enabling injection of benchmark stats. It
-// returns an exit code to pass to os.Exit.
-func RunTestMain(m *testing.M) int {
-	startStatsInjector()
-	defer stopStatsInjector()
-	return m.Run()
-}
-
-// startStatsInjector starts stats injection to benchmark results.
-func startStatsInjector() {
-	orgStdout = os.Stdout
-	r, w, _ := os.Pipe()
-	os.Stdout = w
-	nextOutPos = 0
-
-	resetCurBenchStats()
-
-	injectCond = sync.NewCond(&sync.Mutex{})
-	injectDone = make(chan struct{})
-	go func() {
-		defer close(injectDone)
-
-		scanner := bufio.NewScanner(r)
-		scanner.Split(splitLines)
-		for scanner.Scan() {
-			injectStatsIfFinished(scanner.Text())
-		}
-		if err := scanner.Err(); err != nil {
-			panic(err)
-		}
-	}()
-}
-
-// stopStatsInjector stops stats injection and restores os.Stdout.
-func stopStatsInjector() {
-	os.Stdout.Close()
-	<-injectDone
-	injectCond = nil
-	os.Stdout = orgStdout
-}
-
-// splitLines is a split function for a bufio.Scanner that returns each line
-// of text, teeing texts to the original stdout even before each line ends.
-func splitLines(data []byte, eof bool) (advance int, token []byte, err error) {
-	if eof && len(data) == 0 {
-		return 0, nil, nil
-	}
-
-	if i := bytes.IndexByte(data, '\n'); i >= 0 {
-		orgStdout.Write(data[nextOutPos : i+1])
-		nextOutPos = 0
-		return i + 1, data[0:i], nil
-	}
-
-	orgStdout.Write(data[nextOutPos:])
-	nextOutPos = len(data)
-
-	if eof {
-		// This is a final, non-terminated line. Return it.
-		return len(data), data, nil
-	}
-
-	return 0, nil, nil
-}
-
-// injectStatsIfFinished prints out the stats if the current benchmark finishes.
-func injectStatsIfFinished(line string) {
-	injectCond.L.Lock()
-	defer injectCond.L.Unlock()
-
-	// We assume that the benchmark results start with the benchmark name.
-	if curB == nil || !strings.HasPrefix(line, curBenchName) {
-		return
-	}
-
-	if !curB.Failed() {
-		// Output all stats in alphabetical order.
-		names := make([]string, 0, len(curStats))
-		for name := range curStats {
-			names = append(names, name)
-		}
-		sort.Strings(names)
-		for _, name := range names {
-			stats := curStats[name]
-			// The output of stats starts with a header like "Histogram (unit: ms)"
-			// followed by statistical properties and the buckets. Add the stats name
-			// if it is a named stats and indent them as Go testing outputs.
-			lines := strings.Split(stats.String(), "\n")
-			if n := len(lines); n > 0 {
-				if name != "" {
-					name = ": " + name
-				}
-				fmt.Fprintf(orgStdout, "--- %s%s\n", lines[0], name)
-				for _, line := range lines[1 : n-1] {
-					fmt.Fprintf(orgStdout, "\t%s\n", line)
-				}
-			}
-		}
-	}
-
-	resetCurBenchStats()
-	injectCond.Signal()
-}
-
-// resetCurBenchStats resets the current benchmark stats.
-func resetCurBenchStats() {
-	curB = nil
-	curBenchName = ""
-	curStats = make(map[string]*Stats)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/call.go b/Godeps/_workspace/src/google.golang.org/grpc/call.go
deleted file mode 100644
index 89d2782ae5..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/call.go
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package grpc
-
-import (
-	"io"
-	"time"
-
-	"golang.org/x/net/context"
-	"golang.org/x/net/trace"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/transport"
-)
-
-// recvResponse receives and parses an RPC response.
-// On error, it returns the error and indicates whether the call should be retried.
-//
-// TODO(zhaoq): Check whether the received message sequence is valid.
-func recvResponse(codec Codec, t transport.ClientTransport, c *callInfo, stream *transport.Stream, reply interface{}) error {
-	// Try to acquire header metadata from the server if there is any.
-	var err error
-	c.headerMD, err = stream.Header()
-	if err != nil {
-		return err
-	}
-	p := &parser{s: stream}
-	for {
-		if err = recv(p, codec, reply); err != nil {
-			if err == io.EOF {
-				break
-			}
-			return err
-		}
-	}
-	c.trailerMD = stream.Trailer()
-	return nil
-}
-
-// sendRequest writes out various information of an RPC such as Context and Message.
-func sendRequest(ctx context.Context, codec Codec, callHdr *transport.CallHdr, t transport.ClientTransport, args interface{}, opts *transport.Options) (_ *transport.Stream, err error) {
-	stream, err := t.NewStream(ctx, callHdr)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err != nil {
-			if _, ok := err.(transport.ConnectionError); !ok {
-				t.CloseStream(stream, err)
-			}
-		}
-	}()
-	// TODO(zhaoq): Support compression.
-	outBuf, err := encode(codec, args, compressionNone)
-	if err != nil {
-		return nil, transport.StreamErrorf(codes.Internal, "grpc: %v", err)
-	}
-	err = t.Write(stream, outBuf, opts)
-	if err != nil {
-		return nil, err
-	}
-	// Sent successfully.
-	return stream, nil
-}
-
-// Invoke is called by the generated code. It sends the RPC request on the
-// wire and returns after response is received.
-func Invoke(ctx context.Context, method string, args, reply interface{}, cc *ClientConn, opts ...CallOption) (err error) {
-	var c callInfo
-	for _, o := range opts {
-		if err := o.before(&c); err != nil {
-			return toRPCErr(err)
-		}
-	}
-	defer func() {
-		for _, o := range opts {
-			o.after(&c)
-		}
-	}()
-	if EnableTracing {
-		c.traceInfo.tr = trace.New("grpc.Sent."+methodFamily(method), method)
-		defer c.traceInfo.tr.Finish()
-		c.traceInfo.firstLine.client = true
-		if deadline, ok := ctx.Deadline(); ok {
-			c.traceInfo.firstLine.deadline = deadline.Sub(time.Now())
-		}
-		c.traceInfo.tr.LazyLog(&c.traceInfo.firstLine, false)
-		// TODO(dsymonds): Arrange for c.traceInfo.firstLine.remoteAddr to be set.
-		defer func() {
-			if err != nil {
-				c.traceInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
-				c.traceInfo.tr.SetError()
-			}
-		}()
-	}
-	topts := &transport.Options{
-		Last:  true,
-		Delay: false,
-	}
-	var (
-		lastErr error // record the error that happened
-	)
-	for {
-		var (
-			err    error
-			t      transport.ClientTransport
-			stream *transport.Stream
-		)
-		// TODO(zhaoq): Need a formal spec of retry strategy for non-failfast rpcs.
-		if lastErr != nil && c.failFast {
-			return toRPCErr(lastErr)
-		}
-		callHdr := &transport.CallHdr{
-			Host:   cc.authority,
-			Method: method,
-		}
-		t, err = cc.dopts.picker.Pick(ctx)
-		if err != nil {
-			if lastErr != nil {
-				// This was a retry; return the error from the last attempt.
-				return toRPCErr(lastErr)
-			}
-			return toRPCErr(err)
-		}
-		if c.traceInfo.tr != nil {
-			c.traceInfo.tr.LazyLog(&payload{sent: true, msg: args}, true)
-		}
-		stream, err = sendRequest(ctx, cc.dopts.codec, callHdr, t, args, topts)
-		if err != nil {
-			if _, ok := err.(transport.ConnectionError); ok {
-				lastErr = err
-				continue
-			}
-			if lastErr != nil {
-				return toRPCErr(lastErr)
-			}
-			return toRPCErr(err)
-		}
-		// Receive the response
-		lastErr = recvResponse(cc.dopts.codec, t, &c, stream, reply)
-		if _, ok := lastErr.(transport.ConnectionError); ok {
-			continue
-		}
-		if c.traceInfo.tr != nil {
-			c.traceInfo.tr.LazyLog(&payload{sent: false, msg: reply}, true)
-		}
-		t.CloseStream(stream, lastErr)
-		if lastErr != nil {
-			return toRPCErr(lastErr)
-		}
-		return Errorf(stream.StatusCode(), stream.StatusDesc())
-	}
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/clientconn.go b/Godeps/_workspace/src/google.golang.org/grpc/clientconn.go
deleted file mode 100644
index 9c2e983b9e..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/clientconn.go
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package grpc
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-	"golang.org/x/net/trace"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/transport"
-)
-
-var (
-	// ErrUnspecTarget indicates that the target address is unspecified.
-	ErrUnspecTarget = errors.New("grpc: target is unspecified")
-	// ErrNoTransportSecurity indicates that there is no transport security
-	// being set for ClientConn. Users should either set one or explicityly
-	// call WithInsecure DialOption to disable security.
-	ErrNoTransportSecurity = errors.New("grpc: no transport security set (use grpc.WithInsecure() explicitly or set credentials)")
-	// ErrCredentialsMisuse indicates that users want to transmit security infomation
-	// (e.g., oauth2 token) which requires secure connection on an insecure
-	// connection.
-	ErrCredentialsMisuse = errors.New("grpc: the credentials require transport level security (use grpc.WithTransportAuthenticator() to set)")
-	// ErrClientConnClosing indicates that the operation is illegal because
-	// the session is closing.
-	ErrClientConnClosing = errors.New("grpc: the client connection is closing")
-	// ErrClientConnTimeout indicates that the connection could not be
-	// established or re-established within the specified timeout.
-	ErrClientConnTimeout = errors.New("grpc: timed out trying to connect")
-	// minimum time to give a connection to complete
-	minConnectTimeout = 20 * time.Second
-)
-
-// dialOptions configure a Dial call. dialOptions are set by the DialOption
-// values passed to Dial.
-type dialOptions struct {
-	codec    Codec
-	picker   Picker
-	block    bool
-	insecure bool
-	copts    transport.ConnectOptions
-}
-
-// DialOption configures how we set up the connection.
-type DialOption func(*dialOptions)
-
-// WithCodec returns a DialOption which sets a codec for message marshaling and unmarshaling.
-func WithCodec(c Codec) DialOption {
-	return func(o *dialOptions) {
-		o.codec = c
-	}
-}
-
-// WithPicker returns a DialOption which sets a picker for connection selection.
-func WithPicker(p Picker) DialOption {
-	return func(o *dialOptions) {
-		o.picker = p
-	}
-}
-
-// WithBlock returns a DialOption which makes caller of Dial blocks until the underlying
-// connection is up. Without this, Dial returns immediately and connecting the server
-// happens in background.
-func WithBlock() DialOption {
-	return func(o *dialOptions) {
-		o.block = true
-	}
-}
-
-// WithInsecure returns a DialOption which disables transport security for this ClientConn.
-// Note that transport security is required unless WithInsecure is set.
-func WithInsecure() DialOption {
-	return func(o *dialOptions) {
-		o.insecure = true
-	}
-}
-
-// WithTransportCredentials returns a DialOption which configures a
-// connection level security credentials (e.g., TLS/SSL).
-func WithTransportCredentials(creds credentials.TransportAuthenticator) DialOption {
-	return func(o *dialOptions) {
-		o.copts.AuthOptions = append(o.copts.AuthOptions, creds)
-	}
-}
-
-// WithPerRPCCredentials returns a DialOption which sets
-// credentials which will place auth state on each outbound RPC.
-func WithPerRPCCredentials(creds credentials.Credentials) DialOption {
-	return func(o *dialOptions) {
-		o.copts.AuthOptions = append(o.copts.AuthOptions, creds)
-	}
-}
-
-// WithTimeout returns a DialOption that configures a timeout for dialing a client connection.
-func WithTimeout(d time.Duration) DialOption {
-	return func(o *dialOptions) {
-		o.copts.Timeout = d
-	}
-}
-
-// WithDialer returns a DialOption that specifies a function to use for dialing network addresses.
-func WithDialer(f func(addr string, timeout time.Duration) (net.Conn, error)) DialOption {
-	return func(o *dialOptions) {
-		o.copts.Dialer = f
-	}
-}
-
-// WithUserAgent returns a DialOption that specifies a user agent string for all the RPCs.
-func WithUserAgent(s string) DialOption {
-	return func(o *dialOptions) {
-		o.copts.UserAgent = s
-	}
-}
-
-// Dial creates a client connection the given target.
-func Dial(target string, opts ...DialOption) (*ClientConn, error) {
-	cc := &ClientConn{
-		target: target,
-	}
-	for _, opt := range opts {
-		opt(&cc.dopts)
-	}
-	if cc.dopts.codec == nil {
-		// Set the default codec.
-		cc.dopts.codec = protoCodec{}
-	}
-	if cc.dopts.picker == nil {
-		cc.dopts.picker = &unicastPicker{
-			target: target,
-		}
-	}
-	if err := cc.dopts.picker.Init(cc); err != nil {
-		return nil, err
-	}
-	colonPos := strings.LastIndex(target, ":")
-	if colonPos == -1 {
-		colonPos = len(target)
-	}
-	cc.authority = target[:colonPos]
-	return cc, nil
-}
-
-// ConnectivityState indicates the state of a client connection.
-type ConnectivityState int
-
-const (
-	// Idle indicates the ClientConn is idle.
-	Idle ConnectivityState = iota
-	// Connecting indicates the ClienConn is connecting.
-	Connecting
-	// Ready indicates the ClientConn is ready for work.
-	Ready
-	// TransientFailure indicates the ClientConn has seen a failure but expects to recover.
-	TransientFailure
-	// Shutdown indicates the ClientConn has started shutting down.
-	Shutdown
-)
-
-func (s ConnectivityState) String() string {
-	switch s {
-	case Idle:
-		return "IDLE"
-	case Connecting:
-		return "CONNECTING"
-	case Ready:
-		return "READY"
-	case TransientFailure:
-		return "TRANSIENT_FAILURE"
-	case Shutdown:
-		return "SHUTDOWN"
-	default:
-		panic(fmt.Sprintf("unknown connectivity state: %d", s))
-	}
-}
-
-// ClientConn represents a client connection to an RPC service.
-type ClientConn struct {
-	target    string
-	authority string
-	dopts     dialOptions
-}
-
-// State returns the connectivity state of cc.
-// This is EXPERIMENTAL API.
-func (cc *ClientConn) State() (ConnectivityState, error) {
-	return cc.dopts.picker.State()
-}
-
-// WaitForStateChange blocks until the state changes to something other than the sourceState.
-// It returns the new state or error.
-// This is EXPERIMENTAL API.
-func (cc *ClientConn) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
-	return cc.dopts.picker.WaitForStateChange(ctx, sourceState)
-}
-
-// Close starts to tear down the ClientConn.
-func (cc *ClientConn) Close() error {
-	return cc.dopts.picker.Close()
-}
-
-// Conn is a client connection to a single destination.
-type Conn struct {
-	target       string
-	dopts        dialOptions
-	resetChan    chan int
-	shutdownChan chan struct{}
-	events       trace.EventLog
-
-	mu      sync.Mutex
-	state   ConnectivityState
-	stateCV *sync.Cond
-	// ready is closed and becomes nil when a new transport is up or failed
-	// due to timeout.
-	ready     chan struct{}
-	transport transport.ClientTransport
-}
-
-// NewConn creates a Conn.
-func NewConn(cc *ClientConn) (*Conn, error) {
-	if cc.target == "" {
-		return nil, ErrUnspecTarget
-	}
-	c := &Conn{
-		target:       cc.target,
-		dopts:        cc.dopts,
-		resetChan:    make(chan int, 1),
-		shutdownChan: make(chan struct{}),
-	}
-	if EnableTracing {
-		c.events = trace.NewEventLog("grpc.ClientConn", c.target)
-	}
-	if !c.dopts.insecure {
-		var ok bool
-		for _, cd := range c.dopts.copts.AuthOptions {
-			if _, ok := cd.(credentials.TransportAuthenticator); !ok {
-				continue
-			}
-			ok = true
-		}
-		if !ok {
-			return nil, ErrNoTransportSecurity
-		}
-	} else {
-		for _, cd := range c.dopts.copts.AuthOptions {
-			if cd.RequireTransportSecurity() {
-				return nil, ErrCredentialsMisuse
-			}
-		}
-	}
-	c.stateCV = sync.NewCond(&c.mu)
-	if c.dopts.block {
-		if err := c.resetTransport(false); err != nil {
-			c.Close()
-			return nil, err
-		}
-		// Start to monitor the error status of transport.
-		go c.transportMonitor()
-	} else {
-		// Start a goroutine connecting to the server asynchronously.
-		go func() {
-			if err := c.resetTransport(false); err != nil {
-				grpclog.Printf("Failed to dial %s: %v; please retry.", c.target, err)
-				c.Close()
-				return
-			}
-			c.transportMonitor()
-		}()
-	}
-	return c, nil
-}
-
-// printf records an event in cc's event log, unless cc has been closed.
-// REQUIRES cc.mu is held.
-func (cc *Conn) printf(format string, a ...interface{}) {
-	if cc.events != nil {
-		cc.events.Printf(format, a...)
-	}
-}
-
-// errorf records an error in cc's event log, unless cc has been closed.
-// REQUIRES cc.mu is held.
-func (cc *Conn) errorf(format string, a ...interface{}) {
-	if cc.events != nil {
-		cc.events.Errorf(format, a...)
-	}
-}
-
-// State returns the connectivity state of the Conn
-func (cc *Conn) State() ConnectivityState {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	return cc.state
-}
-
-// WaitForStateChange blocks until the state changes to something other than the sourceState.
-func (cc *Conn) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	if sourceState != cc.state {
-		return cc.state, nil
-	}
-	done := make(chan struct{})
-	var err error
-	go func() {
-		select {
-		case <-ctx.Done():
-			cc.mu.Lock()
-			err = ctx.Err()
-			cc.stateCV.Broadcast()
-			cc.mu.Unlock()
-		case <-done:
-		}
-	}()
-	defer close(done)
-	for sourceState == cc.state {
-		cc.stateCV.Wait()
-		if err != nil {
-			return cc.state, err
-		}
-	}
-	return cc.state, nil
-}
-
-// NotifyReset tries to signal the underlying transport needs to be reset due to
-// for example a name resolution change in flight.
-func (cc *Conn) NotifyReset() {
-	select {
-	case cc.resetChan <- 0:
-	default:
-	}
-}
-
-func (cc *Conn) resetTransport(closeTransport bool) error {
-	var retries int
-	start := time.Now()
-	for {
-		cc.mu.Lock()
-		cc.printf("connecting")
-		if cc.state == Shutdown {
-			// cc.Close() has been invoked.
-			cc.mu.Unlock()
-			return ErrClientConnClosing
-		}
-		cc.state = Connecting
-		cc.stateCV.Broadcast()
-		cc.mu.Unlock()
-		if closeTransport {
-			cc.transport.Close()
-		}
-		// Adjust timeout for the current try.
-		copts := cc.dopts.copts
-		if copts.Timeout < 0 {
-			cc.Close()
-			return ErrClientConnTimeout
-		}
-		if copts.Timeout > 0 {
-			copts.Timeout -= time.Since(start)
-			if copts.Timeout <= 0 {
-				cc.Close()
-				return ErrClientConnTimeout
-			}
-		}
-		sleepTime := backoff(retries)
-		timeout := sleepTime
-		if timeout < minConnectTimeout {
-			timeout = minConnectTimeout
-		}
-		if copts.Timeout == 0 || copts.Timeout > timeout {
-			copts.Timeout = timeout
-		}
-		connectTime := time.Now()
-		addr, err := cc.dopts.picker.PickAddr()
-		var newTransport transport.ClientTransport
-		if err == nil {
-			newTransport, err = transport.NewClientTransport(addr, &copts)
-		}
-		if err != nil {
-			cc.mu.Lock()
-			if cc.state == Shutdown {
-				// cc.Close() has been invoked.
-				cc.mu.Unlock()
-				return ErrClientConnClosing
-			}
-			cc.errorf("transient failure: %v", err)
-			cc.state = TransientFailure
-			cc.stateCV.Broadcast()
-			if cc.ready != nil {
-				close(cc.ready)
-				cc.ready = nil
-			}
-			cc.mu.Unlock()
-			sleepTime -= time.Since(connectTime)
-			if sleepTime < 0 {
-				sleepTime = 0
-			}
-			// Fail early before falling into sleep.
-			if cc.dopts.copts.Timeout > 0 && cc.dopts.copts.Timeout < sleepTime+time.Since(start) {
-				cc.mu.Lock()
-				cc.errorf("connection timeout")
-				cc.mu.Unlock()
-				cc.Close()
-				return ErrClientConnTimeout
-			}
-			closeTransport = false
-			time.Sleep(sleepTime)
-			retries++
-			grpclog.Printf("grpc: Conn.resetTransport failed to create client transport: %v; Reconnecting to %q", err, cc.target)
-			continue
-		}
-		cc.mu.Lock()
-		cc.printf("ready")
-		if cc.state == Shutdown {
-			// cc.Close() has been invoked.
-			cc.mu.Unlock()
-			newTransport.Close()
-			return ErrClientConnClosing
-		}
-		cc.state = Ready
-		cc.stateCV.Broadcast()
-		cc.transport = newTransport
-		if cc.ready != nil {
-			close(cc.ready)
-			cc.ready = nil
-		}
-		cc.mu.Unlock()
-		return nil
-	}
-}
-
-func (cc *Conn) reconnect() bool {
-	cc.mu.Lock()
-	if cc.state == Shutdown {
-		// cc.Close() has been invoked.
-		cc.mu.Unlock()
-		return false
-	}
-	cc.state = TransientFailure
-	cc.stateCV.Broadcast()
-	cc.mu.Unlock()
-	if err := cc.resetTransport(true); err != nil {
-		// The ClientConn is closing.
-		cc.mu.Lock()
-		cc.printf("transport exiting: %v", err)
-		cc.mu.Unlock()
-		grpclog.Printf("grpc: Conn.transportMonitor exits due to: %v", err)
-		return false
-	}
-	return true
-}
-
-// Run in a goroutine to track the error in transport and create the
-// new transport if an error happens. It returns when the channel is closing.
-func (cc *Conn) transportMonitor() {
-	for {
-		select {
-		// shutdownChan is needed to detect the teardown when
-		// the ClientConn is idle (i.e., no RPC in flight).
-		case <-cc.shutdownChan:
-			return
-		case <-cc.resetChan:
-			if !cc.reconnect() {
-				return
-			}
-		case <-cc.transport.Error():
-			if !cc.reconnect() {
-				return
-			}
-			// Tries to drain reset signal if there is any since it is out-dated.
-			select {
-			case <-cc.resetChan:
-			default:
-			}
-		}
-	}
-}
-
-// Wait blocks until i) the new transport is up or ii) ctx is done or iii) cc is closed.
-func (cc *Conn) Wait(ctx context.Context) (transport.ClientTransport, error) {
-	for {
-		cc.mu.Lock()
-		switch {
-		case cc.state == Shutdown:
-			cc.mu.Unlock()
-			return nil, ErrClientConnClosing
-		case cc.state == Ready:
-			cc.mu.Unlock()
-			return cc.transport, nil
-		default:
-			ready := cc.ready
-			if ready == nil {
-				ready = make(chan struct{})
-				cc.ready = ready
-			}
-			cc.mu.Unlock()
-			select {
-			case <-ctx.Done():
-				return nil, transport.ContextErr(ctx.Err())
-			// Wait until the new transport is ready or failed.
-			case <-ready:
-			}
-		}
-	}
-}
-
-// Close starts to tear down the Conn. Returns ErrClientConnClosing if
-// it has been closed (mostly due to dial time-out).
-// TODO(zhaoq): Make this synchronous to avoid unbounded memory consumption in
-// some edge cases (e.g., the caller opens and closes many ClientConn's in a
-// tight loop.
-func (cc *Conn) Close() error {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	if cc.state == Shutdown {
-		return ErrClientConnClosing
-	}
-	cc.state = Shutdown
-	cc.stateCV.Broadcast()
-	if cc.events != nil {
-		cc.events.Finish()
-		cc.events = nil
-	}
-	if cc.ready != nil {
-		close(cc.ready)
-		cc.ready = nil
-	}
-	if cc.transport != nil {
-		cc.transport.Close()
-	}
-	if cc.shutdownChan != nil {
-		close(cc.shutdownChan)
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codegen.sh b/Godeps/_workspace/src/google.golang.org/grpc/codegen.sh
deleted file mode 100644
index b009488842..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/codegen.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script serves as an example to demonstrate how to generate the gRPC-Go
-# interface and the related messages from .proto file.
-#
-# It assumes the installation of i) Google proto buffer compiler at
-# https://github.com/google/protobuf (after v2.6.1) and ii) the Go codegen
-# plugin at https://github.com/golang/protobuf (after 2015-02-20). If you have
-# not, please install them first.
-#
-# We recommend running this script at $GOPATH/src.
-#
-# If this is not what you need, feel free to make your own scripts. Again, this
-# script is for demonstration purpose.
-#
-proto=$1
-protoc --go_out=plugins=grpc:. $proto
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go b/Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go
deleted file mode 100644
index e6762d0845..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/codes/code_string.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by stringer -type=Code; DO NOT EDIT
-
-package codes
-
-import "fmt"
-
-const _Code_name = "OKCanceledUnknownInvalidArgumentDeadlineExceededNotFoundAlreadyExistsPermissionDeniedResourceExhaustedFailedPreconditionAbortedOutOfRangeUnimplementedInternalUnavailableDataLossUnauthenticated"
-
-var _Code_index = [...]uint8{0, 2, 10, 17, 32, 48, 56, 69, 85, 102, 120, 127, 137, 150, 158, 169, 177, 192}
-
-func (i Code) String() string {
-	if i+1 >= Code(len(_Code_index)) {
-		return fmt.Sprintf("Code(%d)", i)
-	}
-	return _Code_name[_Code_index[i]:_Code_index[i+1]]
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go b/Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go
deleted file mode 100644
index 37c5b860bd..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/codes/codes.go
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-// Package codes defines the canonical error codes used by gRPC. It is
-// consistent across various languages.
-package codes
-
-// A Code is an unsigned 32-bit error code as defined in the gRPC spec.
-type Code uint32
-
-//go:generate stringer -type=Code
-
-const (
-	// OK is returned on success.
-	OK Code = 0
-
-	// Canceled indicates the operation was cancelled (typically by the caller).
-	Canceled Code = 1
-
-	// Unknown error.  An example of where this error may be returned is
-	// if a Status value received from another address space belongs to
-	// an error-space that is not known in this address space.  Also
-	// errors raised by APIs that do not return enough error information
-	// may be converted to this error.
-	Unknown Code = 2
-
-	// InvalidArgument indicates client specified an invalid argument.
-	// Note that this differs from FailedPrecondition. It indicates arguments
-	// that are problematic regardless of the state of the system
-	// (e.g., a malformed file name).
-	InvalidArgument Code = 3
-
-	// DeadlineExceeded means operation expired before completion.
-	// For operations that change the state of the system, this error may be
-	// returned even if the operation has completed successfully. For
-	// example, a successful response from a server could have been delayed
-	// long enough for the deadline to expire.
-	DeadlineExceeded Code = 4
-
-	// NotFound means some requested entity (e.g., file or directory) was
-	// not found.
-	NotFound Code = 5
-
-	// AlreadyExists means an attempt to create an entity failed because one
-	// already exists.
-	AlreadyExists Code = 6
-
-	// PermissionDenied indicates the caller does not have permission to
-	// execute the specified operation. It must not be used for rejections
-	// caused by exhausting some resource (use ResourceExhausted
-	// instead for those errors).  It must not be
-	// used if the caller cannot be identified (use Unauthenticated
-	// instead for those errors).
-	PermissionDenied Code = 7
-
-	// Unauthenticated indicates the request does not have valid
-	// authentication credentials for the operation.
-	Unauthenticated Code = 16
-
-	// ResourceExhausted indicates some resource has been exhausted, perhaps
-	// a per-user quota, or perhaps the entire file system is out of space.
-	ResourceExhausted Code = 8
-
-	// FailedPrecondition indicates operation was rejected because the
-	// system is not in a state required for the operation's execution.
-	// For example, directory to be deleted may be non-empty, an rmdir
-	// operation is applied to a non-directory, etc.
-	//
-	// A litmus test that may help a service implementor in deciding
-	// between FailedPrecondition, Aborted, and Unavailable:
-	//  (a) Use Unavailable if the client can retry just the failing call.
-	//  (b) Use Aborted if the client should retry at a higher-level
-	//      (e.g., restarting a read-modify-write sequence).
-	//  (c) Use FailedPrecondition if the client should not retry until
-	//      the system state has been explicitly fixed.  E.g., if an "rmdir"
-	//      fails because the directory is non-empty, FailedPrecondition
-	//      should be returned since the client should not retry unless
-	//      they have first fixed up the directory by deleting files from it.
-	//  (d) Use FailedPrecondition if the client performs conditional
-	//      REST Get/Update/Delete on a resource and the resource on the
-	//      server does not match the condition. E.g., conflicting
-	//      read-modify-write on the same resource.
-	FailedPrecondition Code = 9
-
-	// Aborted indicates the operation was aborted, typically due to a
-	// concurrency issue like sequencer check failures, transaction aborts,
-	// etc.
-	//
-	// See litmus test above for deciding between FailedPrecondition,
-	// Aborted, and Unavailable.
-	Aborted Code = 10
-
-	// OutOfRange means operation was attempted past the valid range.
-	// E.g., seeking or reading past end of file.
-	//
-	// Unlike InvalidArgument, this error indicates a problem that may
-	// be fixed if the system state changes. For example, a 32-bit file
-	// system will generate InvalidArgument if asked to read at an
-	// offset that is not in the range [0,2^32-1], but it will generate
-	// OutOfRange if asked to read from an offset past the current
-	// file size.
-	//
-	// There is a fair bit of overlap between FailedPrecondition and
-	// OutOfRange.  We recommend using OutOfRange (the more specific
-	// error) when it applies so that callers who are iterating through
-	// a space can easily look for an OutOfRange error to detect when
-	// they are done.
-	OutOfRange Code = 11
-
-	// Unimplemented indicates operation is not implemented or not
-	// supported/enabled in this service.
-	Unimplemented Code = 12
-
-	// Internal errors.  Means some invariants expected by underlying
-	// system has been broken.  If you see one of these errors,
-	// something is very broken.
-	Internal Code = 13
-
-	// Unavailable indicates the service is currently unavailable.
-	// This is a most likely a transient condition and may be corrected
-	// by retrying with a backoff.
-	//
-	// See litmus test above for deciding between FailedPrecondition,
-	// Aborted, and Unavailable.
-	Unavailable Code = 14
-
-	// DataLoss indicates unrecoverable data loss or corruption.
-	DataLoss Code = 15
-)
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/coverage.sh b/Godeps/_workspace/src/google.golang.org/grpc/coverage.sh
deleted file mode 100644
index 120235374a..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/coverage.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-set -e
-
-workdir=.cover
-profile="$workdir/cover.out"
-mode=set
-end2endtest="google.golang.org/grpc/test"
-
-generate_cover_data() {
-    rm -rf "$workdir"
-    mkdir "$workdir"
-
-    for pkg in "$@"; do
-        if [ $pkg == "google.golang.org/grpc" -o $pkg == "google.golang.org/grpc/transport" -o $pkg == "google.golang.org/grpc/metadata" -o $pkg == "google.golang.org/grpc/credentials" ]
-            then
-                f="$workdir/$(echo $pkg | tr / -)"
-                go test -covermode="$mode" -coverprofile="$f.cover" "$pkg"
-                go test -covermode="$mode" -coverpkg "$pkg" -coverprofile="$f.e2e.cover" "$end2endtest"
-        fi
-    done
-
-    echo "mode: $mode" >"$profile"
-    grep -h -v "^mode:" "$workdir"/*.cover >>"$profile"
-}
-
-show_cover_report() {
-    go tool cover -${1}="$profile"
-}
-
-push_to_coveralls() {
-    goveralls -coverprofile="$profile"
-}
-
-generate_cover_data $(go list ./...)
-show_cover_report func
-case "$1" in
-"")
-    ;;
---html)
-    show_cover_report html ;;
---coveralls)
-    push_to_coveralls ;;
-*)
-    echo >&2 "error: invalid option: $1" ;;
-esac
-rm -rf "$workdir"
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go b/Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go
deleted file mode 100644
index 0b0b89b6aa..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/credentials/credentials.go
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-// Package credentials implements various credentials supported by gRPC library,
-// which encapsulate all the state needed by a client to authenticate with a
-// server and make various assertions, e.g., about the client's identity, role,
-// or whether it is authorized to make a particular call.
-package credentials
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"strings"
-	"time"
-
-	"golang.org/x/net/context"
-)
-
-var (
-	// alpnProtoStr are the specified application level protocols for gRPC.
-	alpnProtoStr = []string{"h2"}
-)
-
-// Credentials defines the common interface all supported credentials must
-// implement.
-type Credentials interface {
-	// GetRequestMetadata gets the current request metadata, refreshing
-	// tokens if required. This should be called by the transport layer on
-	// each request, and the data should be populated in headers or other
-	// context. uri is the URI of the entry point for the request. When
-	// supported by the underlying implementation, ctx can be used for
-	// timeout and cancellation.
-	// TODO(zhaoq): Define the set of the qualified keys instead of leaving
-	// it as an arbitrary string.
-	GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error)
-	// RequireTransportSecurity indicates whether the credentails requires
-	// transport security.
-	RequireTransportSecurity() bool
-}
-
-// ProtocolInfo provides information regarding the gRPC wire protocol version,
-// security protocol, security protocol version in use, etc.
-type ProtocolInfo struct {
-	// ProtocolVersion is the gRPC wire protocol version.
-	ProtocolVersion string
-	// SecurityProtocol is the security protocol in use.
-	SecurityProtocol string
-	// SecurityVersion is the security protocol version.
-	SecurityVersion string
-}
-
-// AuthInfo defines the common interface for the auth information the users are interested in.
-type AuthInfo interface {
-	AuthType() string
-}
-
-// TransportAuthenticator defines the common interface for all the live gRPC wire
-// protocols and supported transport security protocols (e.g., TLS, SSL).
-type TransportAuthenticator interface {
-	// ClientHandshake does the authentication handshake specified by the corresponding
-	// authentication protocol on rawConn for clients. It returns the authenticated
-	// connection and the corresponding auth information about the connection.
-	ClientHandshake(addr string, rawConn net.Conn, timeout time.Duration) (net.Conn, AuthInfo, error)
-	// ServerHandshake does the authentication handshake for servers. It returns
-	// the authenticated connection and the corresponding auth information about
-	// the connection.
-	ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error)
-	// Info provides the ProtocolInfo of this TransportAuthenticator.
-	Info() ProtocolInfo
-	Credentials
-}
-
-// TLSInfo contains the auth information for a TLS authenticated connection.
-// It implements the AuthInfo interface.
-type TLSInfo struct {
-	State tls.ConnectionState
-}
-
-func (t TLSInfo) AuthType() string {
-	return "tls"
-}
-
-// tlsCreds is the credentials required for authenticating a connection using TLS.
-type tlsCreds struct {
-	// TLS configuration
-	config tls.Config
-}
-
-func (c tlsCreds) Info() ProtocolInfo {
-	return ProtocolInfo{
-		SecurityProtocol: "tls",
-		SecurityVersion:  "1.2",
-	}
-}
-
-// GetRequestMetadata returns nil, nil since TLS credentials does not have
-// metadata.
-func (c *tlsCreds) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
-	return nil, nil
-}
-
-func (c *tlsCreds) RequireTransportSecurity() bool {
-	return true
-}
-
-type timeoutError struct{}
-
-func (timeoutError) Error() string   { return "credentials: Dial timed out" }
-func (timeoutError) Timeout() bool   { return true }
-func (timeoutError) Temporary() bool { return true }
-
-func (c *tlsCreds) ClientHandshake(addr string, rawConn net.Conn, timeout time.Duration) (_ net.Conn, _ AuthInfo, err error) {
-	// borrow some code from tls.DialWithDialer
-	var errChannel chan error
-	if timeout != 0 {
-		errChannel = make(chan error, 2)
-		time.AfterFunc(timeout, func() {
-			errChannel <- timeoutError{}
-		})
-	}
-	if c.config.ServerName == "" {
-		colonPos := strings.LastIndex(addr, ":")
-		if colonPos == -1 {
-			colonPos = len(addr)
-		}
-		c.config.ServerName = addr[:colonPos]
-	}
-	conn := tls.Client(rawConn, &c.config)
-	if timeout == 0 {
-		err = conn.Handshake()
-	} else {
-		go func() {
-			errChannel <- conn.Handshake()
-		}()
-		err = <-errChannel
-	}
-	if err != nil {
-		rawConn.Close()
-		return nil, nil, err
-	}
-	// TODO(zhaoq): Omit the auth info for client now. It is more for
-	// information than anything else.
-	return conn, nil, nil
-}
-
-func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error) {
-	conn := tls.Server(rawConn, &c.config)
-	if err := conn.Handshake(); err != nil {
-		rawConn.Close()
-		return nil, nil, err
-	}
-	return conn, TLSInfo{conn.ConnectionState()}, nil
-}
-
-// NewTLS uses c to construct a TransportAuthenticator based on TLS.
-func NewTLS(c *tls.Config) TransportAuthenticator {
-	tc := &tlsCreds{*c}
-	tc.config.NextProtos = alpnProtoStr
-	return tc
-}
-
-// NewClientTLSFromCert constructs a TLS from the input certificate for client.
-func NewClientTLSFromCert(cp *x509.CertPool, serverName string) TransportAuthenticator {
-	return NewTLS(&tls.Config{ServerName: serverName, RootCAs: cp})
-}
-
-// NewClientTLSFromFile constructs a TLS from the input certificate file for client.
-func NewClientTLSFromFile(certFile, serverName string) (TransportAuthenticator, error) {
-	b, err := ioutil.ReadFile(certFile)
-	if err != nil {
-		return nil, err
-	}
-	cp := x509.NewCertPool()
-	if !cp.AppendCertsFromPEM(b) {
-		return nil, fmt.Errorf("credentials: failed to append certificates")
-	}
-	return NewTLS(&tls.Config{ServerName: serverName, RootCAs: cp}), nil
-}
-
-// NewServerTLSFromCert constructs a TLS from the input certificate for server.
-func NewServerTLSFromCert(cert *tls.Certificate) TransportAuthenticator {
-	return NewTLS(&tls.Config{Certificates: []tls.Certificate{*cert}})
-}
-
-// NewServerTLSFromFile constructs a TLS from the input certificate file and key
-// file for server.
-func NewServerTLSFromFile(certFile, keyFile string) (TransportAuthenticator, error) {
-	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
-	if err != nil {
-		return nil, err
-	}
-	return NewTLS(&tls.Config{Certificates: []tls.Certificate{cert}}), nil
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/doc.go b/Godeps/_workspace/src/google.golang.org/grpc/doc.go
deleted file mode 100644
index c0f54f7594..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/doc.go
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
-Package grpc implements an RPC system called gRPC.
-
-See https://github.com/grpc/grpc for more information about gRPC.
-*/
-package grpc
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/README.md b/Godeps/_workspace/src/google.golang.org/grpc/examples/README.md
deleted file mode 100644
index b65f8c5e63..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-gRPC in 3 minutes (Go)
-======================
-
-BACKGROUND
--------------
-For this sample, we've already generated the server and client stubs from [helloworld.proto](helloworld/helloworld/helloworld.proto).
-
-PREREQUISITES
--------------
-
-- This requires Go 1.4
-- Requires that [GOPATH is set](https://golang.org/doc/code.html#GOPATH)
-
-```
-$ go help gopath
-$ # ensure the PATH contains $GOPATH/bin
-$ export PATH=$PATH:$GOPATH/bin
-```
-
-INSTALL
--------
-
-```
-$ go get -u google.golang.org/grpc/examples/helloworld/greeter_client
-$ go get -u google.golang.org/grpc/examples/helloworld/greeter_server
-```
-
-TRY IT!
--------
-
-- Run the server
-
-```
-$ greeter_server &
-```
-
-- Run the client
-
-```
-$ greeter_client
-```
-
-OPTIONAL - Rebuilding the generated code
-----------------------------------------
-
-1 First [install protoc](https://github.com/google/protobuf/blob/master/README.md)
-  - For now, this needs to be installed from source
-  - This is will change once proto3 is officially released
-
-2 Install the protoc Go plugin.
-
-```
-$ go get -a github.com/golang/protobuf/protoc-gen-go
-$
-$ # from this dir; invoke protoc
-$  protoc -I ./helloworld/helloworld/ ./helloworld/helloworld/helloworld.proto --go_out=plugins=grpc:helloworld
-```
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/gotutorial.md b/Godeps/_workspace/src/google.golang.org/grpc/examples/gotutorial.md
deleted file mode 100644
index 39833fdf3d..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/gotutorial.md
+++ /dev/null
@@ -1,431 +0,0 @@
-#gRPC Basics: Go
-
-This tutorial provides a basic Go programmer's introduction to working with gRPC. By walking through this example you'll learn how to:
-
-- Define a service in a .proto file.
-- Generate server and client code using the protocol buffer compiler.
-- Use the Go gRPC API to write a simple client and server for your service.
-
-It assumes that you have read the [Getting started](https://github.com/grpc/grpc/tree/master/examples) guide and are familiar with [protocol buffers] (https://developers.google.com/protocol-buffers/docs/overview). Note that the example in this tutorial uses the proto3 version of the protocol buffers language, which is currently in alpha release:you can find out more in the [proto3 language guide](https://developers.google.com/protocol-buffers/docs/proto3) and see the [release notes](https://github.com/google/protobuf/releases) for the new version in the protocol buffers Github repository.
-
-This isn't a comprehensive guide to using gRPC in Go: more reference documentation is coming soon.
-
-## Why use gRPC?
-
-Our example is a simple route mapping application that lets clients get information about features on their route, create a summary of their route, and exchange route information such as traffic updates with the server and other clients.
-
-With gRPC we can define our service once in a .proto file and implement clients and servers in any of gRPC's supported languages, which in turn can be run in environments ranging from servers inside Google to your own tablet - all the complexity of communication between different languages and environments is handled for you by gRPC. We also get all the advantages of working with protocol buffers, including efficient serialization, a simple IDL, and easy interface updating.
-
-## Example code and setup
-
-The example code for our tutorial is in [grpc/grpc-go/examples/route_guide](https://github.com/grpc/grpc-go/tree/master/examples/route_guide). To download the example, clone the `grpc-go` repository by running the following command:
-```shell
-$ go get google.golang.org/grpc
-```
-
-Then change your current directory to `grpc-go/examples/route_guide`:
-```shell
-$ cd $GOPATH/src/google.golang.org/grpc/examples/route_guide
-```
-
-You also should have the relevant tools installed to generate the server and client interface code - if you don't already, follow the setup instructions in [the Go quick start guide](examples/).
-
-
-## Defining the service
-
-Our first step (as you'll know from the [quick start](http://www.grpc.io/docs/#quick-start)) is to define the gRPC *service* and the method *request* and *response* types using [protocol buffers] (https://developers.google.com/protocol-buffers/docs/overview). You can see the complete .proto file in [`examples/route_guide/proto/route_guide.proto`](examples/route_guide/proto/route_guide.proto).
-
-To define a service, you specify a named `service` in your .proto file:
-
-```proto
-service RouteGuide {
-   ...
-}
-```
-
-Then you define `rpc` methods inside your service definition, specifying their request and response types. gRPC lets you define four kinds of service method, all of which are used in the `RouteGuide` service:
-
-- A *simple RPC* where the client sends a request to the server using the stub and waits for a response to come back, just like a normal function call.
-```proto
-   // Obtains the feature at a given position.
-   rpc GetFeature(Point) returns (Feature) {}
-```
-
-- A *server-side streaming RPC* where the client sends a request to the server and gets a stream to read a sequence of messages back. The client reads from the returned stream until there are no more messages. As you can see in our example, you specify a server-side streaming method by placing the `stream` keyword before the *response* type.
-```proto
-  // Obtains the Features available within the given Rectangle.  Results are
-  // streamed rather than returned at once (e.g. in a response message with a
-  // repeated field), as the rectangle may cover a large area and contain a
-  // huge number of features.
-  rpc ListFeatures(Rectangle) returns (stream Feature) {}
-```
-
-- A *client-side streaming RPC* where the client writes a sequence of messages and sends them to the server, again using a provided stream. Once the client has finished writing the messages, it waits for the server to read them all and return its response. You specify a client-side streaming method by placing the `stream` keyword before the *request* type.
-```proto
-  // Accepts a stream of Points on a route being traversed, returning a
-  // RouteSummary when traversal is completed.
-  rpc RecordRoute(stream Point) returns (RouteSummary) {}
-```
-
-- A *bidirectional streaming RPC* where both sides send a sequence of messages using a read-write stream. The two streams operate independently, so clients and servers can read and write in whatever order they like: for example, the server could wait to receive all the client messages before writing its responses, or it could alternately read a message then write a message, or some other combination of reads and writes. The order of messages in each stream is preserved. You specify this type of method by placing the `stream` keyword before both the request and the response.
-```proto
-  // Accepts a stream of RouteNotes sent while a route is being traversed,
-  // while receiving other RouteNotes (e.g. from other users).
-  rpc RouteChat(stream RouteNote) returns (stream RouteNote) {}
-```
-
-Our .proto file also contains protocol buffer message type definitions for all the request and response types used in our service methods - for example, here's the `Point` message type:
-```proto
-// Points are represented as latitude-longitude pairs in the E7 representation
-// (degrees multiplied by 10**7 and rounded to the nearest integer).
-// Latitudes should be in the range +/- 90 degrees and longitude should be in
-// the range +/- 180 degrees (inclusive).
-message Point {
-  int32 latitude = 1;
-  int32 longitude = 2;
-}
-```
-
-
-## Generating client and server code
-
-Next we need to generate the gRPC client and server interfaces from our .proto service definition. We do this using the protocol buffer compiler `protoc` with a special gRPC Go plugin.
-
-For simplicity, we've provided a [bash script](https://github.com/grpc/grpc-go/blob/master/codegen.sh) that runs `protoc` for you with the appropriate plugin, input, and output (if you want to run this by yourself, make sure you've installed protoc and followed the gRPC-Go [installation instructions](https://github.com/grpc/grpc-go/blob/master/README.md) first):
-
-```shell
-$ codegen.sh route_guide.proto
-```
-
-which actually runs:
-
-```shell
-$ protoc --go_out=plugins=grpc:. route_guide.proto
-```
-
-Running this command generates the following file in your current directory:
-- `route_guide.pb.go`
-
-This contains:
-- All the protocol buffer code to populate, serialize, and retrieve our request and response message types
-- An interface type (or *stub*) for clients to call with the methods defined in the `RouteGuide` service.
-- An interface type for servers to implement, also with the methods defined in the `RouteGuide` service.
-
-
-<a name="server"></a>
-## Creating the server
-
-First let's look at how we create a `RouteGuide` server. If you're only interested in creating gRPC clients, you can skip this section and go straight to [Creating the client](#client) (though you might find it interesting anyway!).
-
-There are two parts to making our `RouteGuide` service do its job:
-- Implementing the service interface generated from our service definition: doing the actual "work" of our service.
-- Running a gRPC server to listen for requests from clients and dispatch them to the right service implementation.
-
-You can find our example `RouteGuide` server in [grpc-go/examples/route_guide/server/server.go](https://github.com/grpc/grpc-go/tree/master/examples/route_guide/server/server.go). Let's take a closer look at how it works.
-
-### Implementing RouteGuide
-
-As you can see, our server has a `routeGuideServer` struct type that implements the generated `RouteGuideServer` interface:
-
-```go
-type routeGuideServer struct {
-        ...
-}
-...
-
-func (s *routeGuideServer) GetFeature(ctx context.Context, point *pb.Point) (*pb.Feature, error) {
-        ...
-}
-...
-
-func (s *routeGuideServer) ListFeatures(rect *pb.Rectangle, stream pb.RouteGuide_ListFeaturesServer) error {
-        ...
-}
-...
-
-func (s *routeGuideServer) RecordRoute(stream pb.RouteGuide_RecordRouteServer) error {
-        ...
-}
-...
-
-func (s *routeGuideServer) RouteChat(stream pb.RouteGuide_RouteChatServer) error {
-        ...
-}
-...
-```
-
-#### Simple RPC
-`routeGuideServer` implements all our service methods. Let's look at the simplest type first, `GetFeature`, which just gets a `Point` from the client and returns the corresponding feature information from its database in a `Feature`.
-
-```go
-func (s *routeGuideServer) GetFeature(ctx context.Context, point *pb.Point) (*pb.Feature, error) {
-	for _, feature := range s.savedFeatures {
-		if proto.Equal(feature.Location, point) {
-			return feature, nil
-		}
-	}
-	// No feature was found, return an unnamed feature
-	return &pb.Feature{"", point}, nil
-}
-```
-
-The method is passed a context object for the RPC and the client's `Point` protocol buffer request. It returns a `Feature` protocol buffer object with the response information and an `error`. In the method we populate the `Feature` with the appropriate information, and then `return` it along with an `nil` error to tell gRPC that we've finished dealing with the RPC and that the `Feature` can be returned to the client.
-
-#### Server-side streaming RPC
-Now let's look at one of our streaming RPCs. `ListFeatures` is a server-side streaming RPC, so we need to send back multiple `Feature`s to our client.
-
-```go
-func (s *routeGuideServer) ListFeatures(rect *pb.Rectangle, stream pb.RouteGuide_ListFeaturesServer) error {
-	for _, feature := range s.savedFeatures {
-		if inRange(feature.Location, rect) {
-			if err := stream.Send(feature); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-```
-
-As you can see, instead of getting simple request and response objects in our method parameters, this time we get a request object (the `Rectangle` in which our client wants to find `Feature`s) and a special `RouteGuide_ListFeaturesServer` object to write our responses.
-
-In the method, we populate as many `Feature` objects as we need to return, writing them to the `RouteGuide_ListFeaturesServer` using its `Send()` method. Finally, as in our simple RPC, we return a `nil` error to tell gRPC that we've finished writing responses. Should any error happen in this call, we return a non-`nil` error; the gRPC layer will translate it into an appropriate RPC status to be sent on the wire.
-
-#### Client-side streaming RPC
-Now let's look at something a little more complicated: the client-side streaming method `RecordRoute`, where we get a stream of `Point`s from the client and return a single `RouteSummary` with information about their trip. As you can see, this time the method doesn't have a request parameter at all. Instead, it gets a `RouteGuide_RecordRouteServer` stream, which the server can use to both read *and* write messages - it can receive client messages using its `Recv()` method and return its single response using its `SendAndClose()` method.
-
-```go
-func (s *routeGuideServer) RecordRoute(stream pb.RouteGuide_RecordRouteServer) error {
-	var pointCount, featureCount, distance int32
-	var lastPoint *pb.Point
-	startTime := time.Now()
-	for {
-		point, err := stream.Recv()
-		if err == io.EOF {
-			endTime := time.Now()
-			return stream.SendAndClose(&pb.RouteSummary{
-				PointCount:   pointCount,
-				FeatureCount: featureCount,
-				Distance:     distance,
-				ElapsedTime:  int32(endTime.Sub(startTime).Seconds()),
-			})
-		}
-		if err != nil {
-			return err
-		}
-		pointCount++
-		for _, feature := range s.savedFeatures {
-			if proto.Equal(feature.Location, point) {
-				featureCount++
-			}
-		}
-		if lastPoint != nil {
-			distance += calcDistance(lastPoint, point)
-		}
-		lastPoint = point
-	}
-}
-```
-
-In the method body we use the `RouteGuide_RecordRouteServer`s `Recv()` method to repeatedly read in our client's requests to a request object (in this case a `Point`) until there are no more messages: the server needs to check the the error returned from `Recv()` after each call. If this is `nil`, the stream is still good and it can continue reading; if it's `io.EOF` the message stream has ended and the server can return its `RouteSummary`. If it has any other value, we return the error "as is" so that it'll be translated to an RPC status by the gRPC layer.
-
-#### Bidirectional streaming RPC
-Finally, let's look at our bidirectional streaming RPC `RouteChat()`.
-
-```go
-func (s *routeGuideServer) RouteChat(stream pb.RouteGuide_RouteChatServer) error {
-	for {
-		in, err := stream.Recv()
-		if err == io.EOF {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-		key := serialize(in.Location)
-                ... // look for notes to be sent to client
-		for _, note := range s.routeNotes[key] {
-			if err := stream.Send(note); err != nil {
-				return err
-			}
-		}
-	}
-}
-```
-
-This time we get a `RouteGuide_RouteChatServer` stream that, as in our client-side streaming example, can be used to read and write messages. However, this time we return values via our method's stream while the client is still writing messages to *their* message stream.
-
-The syntax for reading and writing here is very similar to our client-streaming method, except the server uses the stream's `Send()` method rather than `SendAndClose()` because it's writing multiple responses. Although each side will always get the other's messages in the order they were written, both the client and server can read and write in any order — the streams operate completely independently.
-
-### Starting the server
-
-Once we've implemented all our methods, we also need to start up a gRPC server so that clients can actually use our service. The following snippet shows how we do this for our `RouteGuide` service:
-
-```go
-flag.Parse()
-lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))
-if err != nil {
-        log.Fatalf("failed to listen: %v", err)
-}
-grpcServer := grpc.NewServer()
-pb.RegisterRouteGuideServer(grpcServer, &routeGuideServer{})
-... // determine whether to use TLS
-grpcServer.Serve(lis)
-```
-To build and start a server, we:
-
-1. Specify the port we want to use to listen for client requests using `lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))`.
-2. Create an instance of the gRPC server using `grpc.NewServer()`.
-3. Register our service implementation with the gRPC server.
-4. Call `Serve()` on the server with our port details to do a blocking wait until the process is killed or `Stop()` is called.
-
-<a name="client"></a>
-## Creating the client
-
-In this section, we'll look at creating a Go client for our `RouteGuide` service. You can see our complete example client code in [grpc-go/examples/route_guide/client/client.go](https://github.com/grpc/grpc-go/tree/master/examples/route_guide/client/client.go).
-
-### Creating a stub
-
-To call service methods, we first need to create a gRPC *channel* to communicate with the server. We create this by passing the server address and port number to `grpc.Dial()` as follows:
-
-```go
-conn, err := grpc.Dial(*serverAddr)
-if err != nil {
-    ...
-}
-defer conn.Close()
-```
-
-You can use `DialOptions` to set the auth credentials (e.g., TLS, GCE credentials, JWT credentials) in `grpc.Dial` if the service you request requires that - however, we don't need to do this for our `RouteGuide` service.
-
-Once the gRPC *channel* is setup, we need a client *stub* to perform RPCs. We get this using the `NewRouteGuideClient` method provided in the `pb` package we generated from our .proto.
-
-```go
-client := pb.NewRouteGuideClient(conn)
-```
-
-### Calling service methods
-
-Now let's look at how we call our service methods. Note that in gRPC-Go, RPCs operate in a blocking/synchronous mode, which means that the RPC call waits for the server to respond, and will either return a response or an error.
-
-#### Simple RPC
-
-Calling the simple RPC `GetFeature` is nearly as straightforward as calling a local method.
-
-```go
-feature, err := client.GetFeature(context.Background(), &pb.Point{409146138, -746188906})
-if err != nil {
-        ...
-}
-```
-
-As you can see, we call the method on the stub we got earlier. In our method parameters we create and populate a request protocol buffer object (in our case `Point`). We also pass a `context.Context` object which lets us change our RPC's behaviour if necessary, such as time-out/cancel an RPC in flight. If the call doesn't return an error, then we can read the response information from the server from the first return value.
-
-```go
-log.Println(feature)
-```
-
-#### Server-side streaming RPC
-
-Here's where we call the server-side streaming method `ListFeatures`, which returns a stream of geographical `Feature`s. If you've already read [Creating the server](#server) some of this may look very familiar - streaming RPCs are implemented in a similar way on both sides.
-
-```go
-rect := &pb.Rectangle{ ... }  // initialize a pb.Rectangle
-stream, err := client.ListFeatures(context.Background(), rect)
-if err != nil {
-    ...
-}
-for {
-    feature, err := stream.Recv()
-    if err == io.EOF {
-        break
-    }
-    if err != nil {
-        log.Fatalf("%v.ListFeatures(_) = _, %v", client, err)
-    }
-    log.Println(feature)
-}
-```
-
-As in the simple RPC, we pass the method a context and a request. However, instead of getting a response object back, we get back an instance of `RouteGuide_ListFeaturesClient`. The client can use the `RouteGuide_ListFeaturesClient` stream to read the server's responses.
-
-We use the `RouteGuide_ListFeaturesClient`'s `Recv()` method to repeatedly read in the server's responses to a response protocol buffer object (in this case a `Feature`) until there are no more messages: the client needs to check the error `err` returned from `Recv()` after each call. If `nil`, the stream is still good and it can continue reading; if it's `io.EOF` then the message stream has ended; otherwise there must be an RPC error, which is passed over through `err`.
-
-#### Client-side streaming RPC
-
-The client-side streaming method `RecordRoute` is similar to the server-side method, except that we only pass the method a context and get a `RouteGuide_RecordRouteClient` stream back, which we can use to both write *and* read messages.
-
-```go
-// Create a random number of random points
-r := rand.New(rand.NewSource(time.Now().UnixNano()))
-pointCount := int(r.Int31n(100)) + 2 // Traverse at least two points
-var points []*pb.Point
-for i := 0; i < pointCount; i++ {
-	points = append(points, randomPoint(r))
-}
-log.Printf("Traversing %d points.", len(points))
-stream, err := client.RecordRoute(context.Background())
-if err != nil {
-	log.Fatalf("%v.RecordRoute(_) = _, %v", client, err)
-}
-for _, point := range points {
-	if err := stream.Send(point); err != nil {
-		log.Fatalf("%v.Send(%v) = %v", stream, point, err)
-	}
-}
-reply, err := stream.CloseAndRecv()
-if err != nil {
-	log.Fatalf("%v.CloseAndRecv() got error %v, want %v", stream, err, nil)
-}
-log.Printf("Route summary: %v", reply)
-```
-
-The `RouteGuide_RecordRouteClient` has a `Send()` method that we can use to send requests to the server. Once we've finished writing our client's requests to the stream using `Send()`, we need to call `CloseAndRecv()` on the stream to let gRPC know that we've finished writing and are expecting to receive a response. We get our RPC status from the `err` returned from `CloseAndRecv()`. If the status is `nil`, then the first return value from `CloseAndRecv()` will be a valid server response.
-
-#### Bidirectional streaming RPC
-
-Finally, let's look at our bidirectional streaming RPC `RouteChat()`. As in the case of `RecordRoute`, we only pass the method a context object and get back a stream that we can use to both write and read messages. However, this time we return values via our method's stream while the server is still writing messages to *their* message stream.
-
-```go
-stream, err := client.RouteChat(context.Background())
-waitc := make(chan struct{})
-go func() {
-	for {
-		in, err := stream.Recv()
-		if err == io.EOF {
-			// read done.
-			close(waitc)
-			return
-		}
-		if err != nil {
-			log.Fatalf("Failed to receive a note : %v", err)
-		}
-		log.Printf("Got message %s at point(%d, %d)", in.Message, in.Location.Latitude, in.Location.Longitude)
-	}
-}()
-for _, note := range notes {
-	if err := stream.Send(note); err != nil {
-		log.Fatalf("Failed to send a note: %v", err)
-	}
-}
-stream.CloseSend()
-<-waitc
-```
-
-The syntax for reading and writing here is very similar to our client-side streaming method, except we use the stream's `CloseSend()` method once we've finished our call. Although each side will always get the other's messages in the order they were written, both the client and server can read and write in any order — the streams operate completely independently.
-
-## Try it out!
-
-To compile and run the server, assuming you are in the folder
-`$GOPATH/src/google.golang.org/grpc/examples/route_guide`, simply:
-
-```sh
-$ go run server/server.go
-```
-
-Likewise, to run the client:
-
-```sh
-$ go run client/client.go
-```
-
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_client/main.go b/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
deleted file mode 100644
index a451c99dc9..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_client/main.go
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package main
-
-import (
-	"log"
-	"os"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-	pb "google.golang.org/grpc/examples/helloworld/helloworld"
-)
-
-const (
-	address     = "localhost:50051"
-	defaultName = "world"
-)
-
-func main() {
-	// Set up a connection to the server.
-	conn, err := grpc.Dial(address, grpc.WithInsecure())
-	if err != nil {
-		log.Fatalf("did not connect: %v", err)
-	}
-	defer conn.Close()
-	c := pb.NewGreeterClient(conn)
-
-	// Contact the server and print out its response.
-	name := defaultName
-	if len(os.Args) > 1 {
-		name = os.Args[1]
-	}
-	r, err := c.SayHello(context.Background(), &pb.HelloRequest{Name: name})
-	if err != nil {
-		log.Fatalf("could not greet: %v", err)
-	}
-	log.Printf("Greeting: %s", r.Message)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_server/main.go b/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_server/main.go
deleted file mode 100644
index 4dce9e0796..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/greeter_server/main.go
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package main
-
-import (
-	"log"
-	"net"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-	pb "google.golang.org/grpc/examples/helloworld/helloworld"
-)
-
-const (
-	port = ":50051"
-)
-
-// server is used to implement helloworld.GreeterServer.
-type server struct{}
-
-// SayHello implements helloworld.GreeterServer
-func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
-	return &pb.HelloReply{Message: "Hello " + in.Name}, nil
-}
-
-func main() {
-	lis, err := net.Listen("tcp", port)
-	if err != nil {
-		log.Fatalf("failed to listen: %v", err)
-	}
-	s := grpc.NewServer()
-	pb.RegisterGreeterServer(s, &server{})
-	s.Serve(lis)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go b/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
deleted file mode 100644
index 366b23b6dd..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.pb.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: helloworld.proto
-// DO NOT EDIT!
-
-/*
-Package helloworld is a generated protocol buffer package.
-
-It is generated from these files:
-	helloworld.proto
-
-It has these top-level messages:
-	HelloRequest
-	HelloReply
-*/
-package helloworld
-
-import proto "github.com/golang/protobuf/proto"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-
-// The request message containing the user's name.
-type HelloRequest struct {
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-}
-
-func (m *HelloRequest) Reset()         { *m = HelloRequest{} }
-func (m *HelloRequest) String() string { return proto.CompactTextString(m) }
-func (*HelloRequest) ProtoMessage()    {}
-
-// The response message containing the greetings
-type HelloReply struct {
-	Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"`
-}
-
-func (m *HelloReply) Reset()         { *m = HelloReply{} }
-func (m *HelloReply) String() string { return proto.CompactTextString(m) }
-func (*HelloReply) ProtoMessage()    {}
-
-func init() {
-}
-
-// Client API for Greeter service
-
-type GreeterClient interface {
-	// Sends a greeting
-	SayHello(ctx context.Context, in *HelloRequest, opts ...grpc.CallOption) (*HelloReply, error)
-}
-
-type greeterClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewGreeterClient(cc *grpc.ClientConn) GreeterClient {
-	return &greeterClient{cc}
-}
-
-func (c *greeterClient) SayHello(ctx context.Context, in *HelloRequest, opts ...grpc.CallOption) (*HelloReply, error) {
-	out := new(HelloReply)
-	err := grpc.Invoke(ctx, "/helloworld.Greeter/SayHello", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for Greeter service
-
-type GreeterServer interface {
-	// Sends a greeting
-	SayHello(context.Context, *HelloRequest) (*HelloReply, error)
-}
-
-func RegisterGreeterServer(s *grpc.Server, srv GreeterServer) {
-	s.RegisterService(&_Greeter_serviceDesc, srv)
-}
-
-func _Greeter_SayHello_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
-	in := new(HelloRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	out, err := srv.(GreeterServer).SayHello(ctx, in)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-var _Greeter_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "helloworld.Greeter",
-	HandlerType: (*GreeterServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "SayHello",
-			Handler:    _Greeter_SayHello_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{},
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.proto b/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.proto
deleted file mode 100644
index 7d58870a70..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/helloworld/helloworld/helloworld.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-option java_package = "io.grpc.examples";
-option objc_class_prefix = "HLW";
-
-package helloworld;
-
-// The greeting service definition.
-service Greeter {
-  // Sends a greeting
-  rpc SayHello (HelloRequest) returns (HelloReply) {}
-}
-
-// The request message containing the user's name.
-message HelloRequest {
-  string name = 1;
-}
-
-// The response message containing the greetings
-message HelloReply {
-  string message = 1;
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/README.md b/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/README.md
deleted file mode 100644
index a7c0c2b0e5..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Description
-The route guide server and client demonstrate how to use grpc go libraries to
-perform unary, client streaming, server streaming and full duplex RPCs.
-
-Please refer to [gRPC Basics: Go] (http://www.grpc.io/docs/tutorials/basic/go.html) for more information.
-
-See the definition of the route guide service in proto/route_guide.proto.
-
-# Run the sample code
-To compile and run the server, assuming you are in the root of the route_guide
-folder, i.e., .../examples/route_guide/, simply:
-
-```sh
-$ go run server/server.go
-```
-
-Likewise, to run the client:
-
-```sh
-$ go run client/client.go
-```
-
-# Optional command line flags
-The server and client both take optional command line flags. For example, the
-client and server run without TLS by default. To enable TLS:
-
-```sh
-$ go run server/server.go -tls=true
-```
-
-and
-
-```sh
-$ go run client/client.go -tls=true
-```
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/client/client.go b/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/client/client.go
deleted file mode 100644
index a96c0302ce..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/client/client.go
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-// Package main implements a simple gRPC client that demonstrates how to use gRPC-Go libraries
-// to perform unary, client streaming, server streaming and full duplex RPCs.
-//
-// It interacts with the route guide service whose definition can be found in proto/route_guide.proto.
-package main
-
-import (
-	"flag"
-	"io"
-	"math/rand"
-	"time"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	pb "google.golang.org/grpc/examples/route_guide/routeguide"
-	"google.golang.org/grpc/grpclog"
-)
-
-var (
-	tls                = flag.Bool("tls", false, "Connection uses TLS if true, else plain TCP")
-	caFile             = flag.String("ca_file", "testdata/ca.pem", "The file containning the CA root cert file")
-	serverAddr         = flag.String("server_addr", "127.0.0.1:10000", "The server address in the format of host:port")
-	serverHostOverride = flag.String("server_host_override", "x.test.youtube.com", "The server name use to verify the hostname returned by TLS handshake")
-)
-
-// printFeature gets the feature for the given point.
-func printFeature(client pb.RouteGuideClient, point *pb.Point) {
-	grpclog.Printf("Getting feature for point (%d, %d)", point.Latitude, point.Longitude)
-	feature, err := client.GetFeature(context.Background(), point)
-	if err != nil {
-		grpclog.Fatalf("%v.GetFeatures(_) = _, %v: ", client, err)
-	}
-	grpclog.Println(feature)
-}
-
-// printFeatures lists all the features within the given bounding Rectangle.
-func printFeatures(client pb.RouteGuideClient, rect *pb.Rectangle) {
-	grpclog.Printf("Looking for features within %v", rect)
-	stream, err := client.ListFeatures(context.Background(), rect)
-	if err != nil {
-		grpclog.Fatalf("%v.ListFeatures(_) = _, %v", client, err)
-	}
-	for {
-		feature, err := stream.Recv()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			grpclog.Fatalf("%v.ListFeatures(_) = _, %v", client, err)
-		}
-		grpclog.Println(feature)
-	}
-}
-
-// runRecordRoute sends a sequence of points to server and expects to get a RouteSummary from server.
-func runRecordRoute(client pb.RouteGuideClient) {
-	// Create a random number of random points
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	pointCount := int(r.Int31n(100)) + 2 // Traverse at least two points
-	var points []*pb.Point
-	for i := 0; i < pointCount; i++ {
-		points = append(points, randomPoint(r))
-	}
-	grpclog.Printf("Traversing %d points.", len(points))
-	stream, err := client.RecordRoute(context.Background())
-	if err != nil {
-		grpclog.Fatalf("%v.RecordRoute(_) = _, %v", client, err)
-	}
-	for _, point := range points {
-		if err := stream.Send(point); err != nil {
-			grpclog.Fatalf("%v.Send(%v) = %v", stream, point, err)
-		}
-	}
-	reply, err := stream.CloseAndRecv()
-	if err != nil {
-		grpclog.Fatalf("%v.CloseAndRecv() got error %v, want %v", stream, err, nil)
-	}
-	grpclog.Printf("Route summary: %v", reply)
-}
-
-// runRouteChat receives a sequence of route notes, while sending notes for various locations.
-func runRouteChat(client pb.RouteGuideClient) {
-	notes := []*pb.RouteNote{
-		{&pb.Point{0, 1}, "First message"},
-		{&pb.Point{0, 2}, "Second message"},
-		{&pb.Point{0, 3}, "Third message"},
-		{&pb.Point{0, 1}, "Fourth message"},
-		{&pb.Point{0, 2}, "Fifth message"},
-		{&pb.Point{0, 3}, "Sixth message"},
-	}
-	stream, err := client.RouteChat(context.Background())
-	if err != nil {
-		grpclog.Fatalf("%v.RouteChat(_) = _, %v", client, err)
-	}
-	waitc := make(chan struct{})
-	go func() {
-		for {
-			in, err := stream.Recv()
-			if err == io.EOF {
-				// read done.
-				close(waitc)
-				return
-			}
-			if err != nil {
-				grpclog.Fatalf("Failed to receive a note : %v", err)
-			}
-			grpclog.Printf("Got message %s at point(%d, %d)", in.Message, in.Location.Latitude, in.Location.Longitude)
-		}
-	}()
-	for _, note := range notes {
-		if err := stream.Send(note); err != nil {
-			grpclog.Fatalf("Failed to send a note: %v", err)
-		}
-	}
-	stream.CloseSend()
-	<-waitc
-}
-
-func randomPoint(r *rand.Rand) *pb.Point {
-	lat := (r.Int31n(180) - 90) * 1e7
-	long := (r.Int31n(360) - 180) * 1e7
-	return &pb.Point{lat, long}
-}
-
-func main() {
-	flag.Parse()
-	var opts []grpc.DialOption
-	if *tls {
-		var sn string
-		if *serverHostOverride != "" {
-			sn = *serverHostOverride
-		}
-		var creds credentials.TransportAuthenticator
-		if *caFile != "" {
-			var err error
-			creds, err = credentials.NewClientTLSFromFile(*caFile, sn)
-			if err != nil {
-				grpclog.Fatalf("Failed to create TLS credentials %v", err)
-			}
-		} else {
-			creds = credentials.NewClientTLSFromCert(nil, sn)
-		}
-		opts = append(opts, grpc.WithTransportCredentials(creds))
-	} else {
-		opts = append(opts, grpc.WithInsecure())
-	}
-	conn, err := grpc.Dial(*serverAddr, opts...)
-	if err != nil {
-		grpclog.Fatalf("fail to dial: %v", err)
-	}
-	defer conn.Close()
-	client := pb.NewRouteGuideClient(conn)
-
-	// Looking for a valid feature
-	printFeature(client, &pb.Point{409146138, -746188906})
-
-	// Feature missing.
-	printFeature(client, &pb.Point{0, 0})
-
-	// Looking for features between 40, -75 and 42, -73.
-	printFeatures(client, &pb.Rectangle{&pb.Point{400000000, -750000000}, &pb.Point{420000000, -730000000}})
-
-	// RecordRoute
-	runRecordRoute(client)
-
-	// RouteChat
-	runRouteChat(client)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go b/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
deleted file mode 100644
index 7b209472f5..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.pb.go
+++ /dev/null
@@ -1,426 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto
-// DO NOT EDIT!
-
-/*
-Package routeguide is a generated protocol buffer package.
-
-It is generated from these files:
-	google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto
-
-It has these top-level messages:
-	Point
-	Rectangle
-	Feature
-	RouteNote
-	RouteSummary
-*/
-package routeguide
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// Points are represented as latitude-longitude pairs in the E7 representation
-// (degrees multiplied by 10**7 and rounded to the nearest integer).
-// Latitudes should be in the range +/- 90 degrees and longitude should be in
-// the range +/- 180 degrees (inclusive).
-type Point struct {
-	Latitude  int32 `protobuf:"varint,1,opt,name=latitude" json:"latitude,omitempty"`
-	Longitude int32 `protobuf:"varint,2,opt,name=longitude" json:"longitude,omitempty"`
-}
-
-func (m *Point) Reset()         { *m = Point{} }
-func (m *Point) String() string { return proto.CompactTextString(m) }
-func (*Point) ProtoMessage()    {}
-
-// A latitude-longitude rectangle, represented as two diagonally opposite
-// points "lo" and "hi".
-type Rectangle struct {
-	// One corner of the rectangle.
-	Lo *Point `protobuf:"bytes,1,opt,name=lo" json:"lo,omitempty"`
-	// The other corner of the rectangle.
-	Hi *Point `protobuf:"bytes,2,opt,name=hi" json:"hi,omitempty"`
-}
-
-func (m *Rectangle) Reset()         { *m = Rectangle{} }
-func (m *Rectangle) String() string { return proto.CompactTextString(m) }
-func (*Rectangle) ProtoMessage()    {}
-
-func (m *Rectangle) GetLo() *Point {
-	if m != nil {
-		return m.Lo
-	}
-	return nil
-}
-
-func (m *Rectangle) GetHi() *Point {
-	if m != nil {
-		return m.Hi
-	}
-	return nil
-}
-
-// A feature names something at a given point.
-//
-// If a feature could not be named, the name is empty.
-type Feature struct {
-	// The name of the feature.
-	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// The point where the feature is detected.
-	Location *Point `protobuf:"bytes,2,opt,name=location" json:"location,omitempty"`
-}
-
-func (m *Feature) Reset()         { *m = Feature{} }
-func (m *Feature) String() string { return proto.CompactTextString(m) }
-func (*Feature) ProtoMessage()    {}
-
-func (m *Feature) GetLocation() *Point {
-	if m != nil {
-		return m.Location
-	}
-	return nil
-}
-
-// A RouteNote is a message sent while at a given point.
-type RouteNote struct {
-	// The location from which the message is sent.
-	Location *Point `protobuf:"bytes,1,opt,name=location" json:"location,omitempty"`
-	// The message to be sent.
-	Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"`
-}
-
-func (m *RouteNote) Reset()         { *m = RouteNote{} }
-func (m *RouteNote) String() string { return proto.CompactTextString(m) }
-func (*RouteNote) ProtoMessage()    {}
-
-func (m *RouteNote) GetLocation() *Point {
-	if m != nil {
-		return m.Location
-	}
-	return nil
-}
-
-// A RouteSummary is received in response to a RecordRoute rpc.
-//
-// It contains the number of individual points received, the number of
-// detected features, and the total distance covered as the cumulative sum of
-// the distance between each point.
-type RouteSummary struct {
-	// The number of points received.
-	PointCount int32 `protobuf:"varint,1,opt,name=point_count" json:"point_count,omitempty"`
-	// The number of known features passed while traversing the route.
-	FeatureCount int32 `protobuf:"varint,2,opt,name=feature_count" json:"feature_count,omitempty"`
-	// The distance covered in metres.
-	Distance int32 `protobuf:"varint,3,opt,name=distance" json:"distance,omitempty"`
-	// The duration of the traversal in seconds.
-	ElapsedTime int32 `protobuf:"varint,4,opt,name=elapsed_time" json:"elapsed_time,omitempty"`
-}
-
-func (m *RouteSummary) Reset()         { *m = RouteSummary{} }
-func (m *RouteSummary) String() string { return proto.CompactTextString(m) }
-func (*RouteSummary) ProtoMessage()    {}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// Client API for RouteGuide service
-
-type RouteGuideClient interface {
-	// A simple RPC.
-	//
-	// Obtains the feature at a given position.
-	//
-	// If no feature is found for the given point, a feature with an empty name
-	// should be returned.
-	GetFeature(ctx context.Context, in *Point, opts ...grpc.CallOption) (*Feature, error)
-	// A server-to-client streaming RPC.
-	//
-	// Obtains the Features available within the given Rectangle.  Results are
-	// streamed rather than returned at once (e.g. in a response message with a
-	// repeated field), as the rectangle may cover a large area and contain a
-	// huge number of features.
-	ListFeatures(ctx context.Context, in *Rectangle, opts ...grpc.CallOption) (RouteGuide_ListFeaturesClient, error)
-	// A client-to-server streaming RPC.
-	//
-	// Accepts a stream of Points on a route being traversed, returning a
-	// RouteSummary when traversal is completed.
-	RecordRoute(ctx context.Context, opts ...grpc.CallOption) (RouteGuide_RecordRouteClient, error)
-	// A Bidirectional streaming RPC.
-	//
-	// Accepts a stream of RouteNotes sent while a route is being traversed,
-	// while receiving other RouteNotes (e.g. from other users).
-	RouteChat(ctx context.Context, opts ...grpc.CallOption) (RouteGuide_RouteChatClient, error)
-}
-
-type routeGuideClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewRouteGuideClient(cc *grpc.ClientConn) RouteGuideClient {
-	return &routeGuideClient{cc}
-}
-
-func (c *routeGuideClient) GetFeature(ctx context.Context, in *Point, opts ...grpc.CallOption) (*Feature, error) {
-	out := new(Feature)
-	err := grpc.Invoke(ctx, "/routeguide.RouteGuide/GetFeature", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *routeGuideClient) ListFeatures(ctx context.Context, in *Rectangle, opts ...grpc.CallOption) (RouteGuide_ListFeaturesClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_RouteGuide_serviceDesc.Streams[0], c.cc, "/routeguide.RouteGuide/ListFeatures", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &routeGuideListFeaturesClient{stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-type RouteGuide_ListFeaturesClient interface {
-	Recv() (*Feature, error)
-	grpc.ClientStream
-}
-
-type routeGuideListFeaturesClient struct {
-	grpc.ClientStream
-}
-
-func (x *routeGuideListFeaturesClient) Recv() (*Feature, error) {
-	m := new(Feature)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *routeGuideClient) RecordRoute(ctx context.Context, opts ...grpc.CallOption) (RouteGuide_RecordRouteClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_RouteGuide_serviceDesc.Streams[1], c.cc, "/routeguide.RouteGuide/RecordRoute", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &routeGuideRecordRouteClient{stream}
-	return x, nil
-}
-
-type RouteGuide_RecordRouteClient interface {
-	Send(*Point) error
-	CloseAndRecv() (*RouteSummary, error)
-	grpc.ClientStream
-}
-
-type routeGuideRecordRouteClient struct {
-	grpc.ClientStream
-}
-
-func (x *routeGuideRecordRouteClient) Send(m *Point) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *routeGuideRecordRouteClient) CloseAndRecv() (*RouteSummary, error) {
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	m := new(RouteSummary)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *routeGuideClient) RouteChat(ctx context.Context, opts ...grpc.CallOption) (RouteGuide_RouteChatClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_RouteGuide_serviceDesc.Streams[2], c.cc, "/routeguide.RouteGuide/RouteChat", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &routeGuideRouteChatClient{stream}
-	return x, nil
-}
-
-type RouteGuide_RouteChatClient interface {
-	Send(*RouteNote) error
-	Recv() (*RouteNote, error)
-	grpc.ClientStream
-}
-
-type routeGuideRouteChatClient struct {
-	grpc.ClientStream
-}
-
-func (x *routeGuideRouteChatClient) Send(m *RouteNote) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *routeGuideRouteChatClient) Recv() (*RouteNote, error) {
-	m := new(RouteNote)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// Server API for RouteGuide service
-
-type RouteGuideServer interface {
-	// A simple RPC.
-	//
-	// Obtains the feature at a given position.
-	//
-	// If no feature is found for the given point, a feature with an empty name
-	// should be returned.
-	GetFeature(context.Context, *Point) (*Feature, error)
-	// A server-to-client streaming RPC.
-	//
-	// Obtains the Features available within the given Rectangle.  Results are
-	// streamed rather than returned at once (e.g. in a response message with a
-	// repeated field), as the rectangle may cover a large area and contain a
-	// huge number of features.
-	ListFeatures(*Rectangle, RouteGuide_ListFeaturesServer) error
-	// A client-to-server streaming RPC.
-	//
-	// Accepts a stream of Points on a route being traversed, returning a
-	// RouteSummary when traversal is completed.
-	RecordRoute(RouteGuide_RecordRouteServer) error
-	// A Bidirectional streaming RPC.
-	//
-	// Accepts a stream of RouteNotes sent while a route is being traversed,
-	// while receiving other RouteNotes (e.g. from other users).
-	RouteChat(RouteGuide_RouteChatServer) error
-}
-
-func RegisterRouteGuideServer(s *grpc.Server, srv RouteGuideServer) {
-	s.RegisterService(&_RouteGuide_serviceDesc, srv)
-}
-
-func _RouteGuide_GetFeature_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
-	in := new(Point)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	out, err := srv.(RouteGuideServer).GetFeature(ctx, in)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func _RouteGuide_ListFeatures_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(Rectangle)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(RouteGuideServer).ListFeatures(m, &routeGuideListFeaturesServer{stream})
-}
-
-type RouteGuide_ListFeaturesServer interface {
-	Send(*Feature) error
-	grpc.ServerStream
-}
-
-type routeGuideListFeaturesServer struct {
-	grpc.ServerStream
-}
-
-func (x *routeGuideListFeaturesServer) Send(m *Feature) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func _RouteGuide_RecordRoute_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(RouteGuideServer).RecordRoute(&routeGuideRecordRouteServer{stream})
-}
-
-type RouteGuide_RecordRouteServer interface {
-	SendAndClose(*RouteSummary) error
-	Recv() (*Point, error)
-	grpc.ServerStream
-}
-
-type routeGuideRecordRouteServer struct {
-	grpc.ServerStream
-}
-
-func (x *routeGuideRecordRouteServer) SendAndClose(m *RouteSummary) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *routeGuideRecordRouteServer) Recv() (*Point, error) {
-	m := new(Point)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func _RouteGuide_RouteChat_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(RouteGuideServer).RouteChat(&routeGuideRouteChatServer{stream})
-}
-
-type RouteGuide_RouteChatServer interface {
-	Send(*RouteNote) error
-	Recv() (*RouteNote, error)
-	grpc.ServerStream
-}
-
-type routeGuideRouteChatServer struct {
-	grpc.ServerStream
-}
-
-func (x *routeGuideRouteChatServer) Send(m *RouteNote) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *routeGuideRouteChatServer) Recv() (*RouteNote, error) {
-	m := new(RouteNote)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-var _RouteGuide_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "routeguide.RouteGuide",
-	HandlerType: (*RouteGuideServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "GetFeature",
-			Handler:    _RouteGuide_GetFeature_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "ListFeatures",
-			Handler:       _RouteGuide_ListFeatures_Handler,
-			ServerStreams: true,
-		},
-		{
-			StreamName:    "RecordRoute",
-			Handler:       _RouteGuide_RecordRoute_Handler,
-			ClientStreams: true,
-		},
-		{
-			StreamName:    "RouteChat",
-			Handler:       _RouteGuide_RouteChat_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-	},
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto b/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto
deleted file mode 100644
index bee7ac51ab..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/routeguide/route_guide.proto
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2015, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package routeguide;
-
-// Interface exported by the server.
-service RouteGuide {
-  // A simple RPC.
-  //
-  // Obtains the feature at a given position.
-  //
-  // If no feature is found for the given point, a feature with an empty name
-  // should be returned.
-  rpc GetFeature(Point) returns (Feature) {}
-
-  // A server-to-client streaming RPC.
-  //
-  // Obtains the Features available within the given Rectangle.  Results are
-  // streamed rather than returned at once (e.g. in a response message with a
-  // repeated field), as the rectangle may cover a large area and contain a
-  // huge number of features.
-  rpc ListFeatures(Rectangle) returns (stream Feature) {}
-
-  // A client-to-server streaming RPC.
-  //
-  // Accepts a stream of Points on a route being traversed, returning a
-  // RouteSummary when traversal is completed.
-  rpc RecordRoute(stream Point) returns (RouteSummary) {}
-
-  // A Bidirectional streaming RPC.
-  //
-  // Accepts a stream of RouteNotes sent while a route is being traversed,
-  // while receiving other RouteNotes (e.g. from other users).
-  rpc RouteChat(stream RouteNote) returns (stream RouteNote) {}
-}
-
-// Points are represented as latitude-longitude pairs in the E7 representation
-// (degrees multiplied by 10**7 and rounded to the nearest integer).
-// Latitudes should be in the range +/- 90 degrees and longitude should be in
-// the range +/- 180 degrees (inclusive).
-message Point {
-  int32 latitude = 1;
-  int32 longitude = 2;
-}
-
-// A latitude-longitude rectangle, represented as two diagonally opposite
-// points "lo" and "hi".
-message Rectangle {
-  // One corner of the rectangle.
-  Point lo = 1;
-
-  // The other corner of the rectangle.
-  Point hi = 2;
-}
-
-// A feature names something at a given point.
-//
-// If a feature could not be named, the name is empty.
-message Feature {
-  // The name of the feature.
-  string name = 1;
-
-  // The point where the feature is detected.
-  Point location = 2;
-}
-
-// A RouteNote is a message sent while at a given point.
-message RouteNote {
-  // The location from which the message is sent.
-  Point location = 1;
-
-  // The message to be sent.
-  string message = 2;
-}
-
-// A RouteSummary is received in response to a RecordRoute rpc.
-//
-// It contains the number of individual points received, the number of
-// detected features, and the total distance covered as the cumulative sum of
-// the distance between each point.
-message RouteSummary {
-  // The number of points received.
-  int32 point_count = 1;
-
-  // The number of known features passed while traversing the route.
-  int32 feature_count = 2;
-
-  // The distance covered in metres.
-  int32 distance = 3;
-
-  // The duration of the traversal in seconds.
-  int32 elapsed_time = 4;
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/server/server.go b/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/server/server.go
deleted file mode 100644
index 09b3942d19..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/examples/route_guide/server/server.go
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-// Package main implements a simple gRPC server that demonstrates how to use gRPC-Go libraries
-// to perform unary, client streaming, server streaming and full duplex RPCs.
-//
-// It implements the route guide service whose definition can be found in proto/route_guide.proto.
-package main
-
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math"
-	"net"
-	"time"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/grpclog"
-
-	"github.com/golang/protobuf/proto"
-
-	pb "google.golang.org/grpc/examples/route_guide/routeguide"
-)
-
-var (
-	tls        = flag.Bool("tls", false, "Connection uses TLS if true, else plain TCP")
-	certFile   = flag.String("cert_file", "testdata/server1.pem", "The TLS cert file")
-	keyFile    = flag.String("key_file", "testdata/server1.key", "The TLS key file")
-	jsonDBFile = flag.String("json_db_file", "testdata/route_guide_db.json", "A json file containing a list of features")
-	port       = flag.Int("port", 10000, "The server port")
-)
-
-type routeGuideServer struct {
-	savedFeatures []*pb.Feature
-	routeNotes    map[string][]*pb.RouteNote
-}
-
-// GetFeature returns the feature at the given point.
-func (s *routeGuideServer) GetFeature(ctx context.Context, point *pb.Point) (*pb.Feature, error) {
-	for _, feature := range s.savedFeatures {
-		if proto.Equal(feature.Location, point) {
-			return feature, nil
-		}
-	}
-	// No feature was found, return an unnamed feature
-	return &pb.Feature{"", point}, nil
-}
-
-// ListFeatures lists all features comtained within the given bounding Rectangle.
-func (s *routeGuideServer) ListFeatures(rect *pb.Rectangle, stream pb.RouteGuide_ListFeaturesServer) error {
-	for _, feature := range s.savedFeatures {
-		if inRange(feature.Location, rect) {
-			if err := stream.Send(feature); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// RecordRoute records a route composited of a sequence of points.
-//
-// It gets a stream of points, and responds with statistics about the "trip":
-// number of points,  number of known features visited, total distance traveled, and
-// total time spent.
-func (s *routeGuideServer) RecordRoute(stream pb.RouteGuide_RecordRouteServer) error {
-	var pointCount, featureCount, distance int32
-	var lastPoint *pb.Point
-	startTime := time.Now()
-	for {
-		point, err := stream.Recv()
-		if err == io.EOF {
-			endTime := time.Now()
-			return stream.SendAndClose(&pb.RouteSummary{
-				PointCount:   pointCount,
-				FeatureCount: featureCount,
-				Distance:     distance,
-				ElapsedTime:  int32(endTime.Sub(startTime).Seconds()),
-			})
-		}
-		if err != nil {
-			return err
-		}
-		pointCount++
-		for _, feature := range s.savedFeatures {
-			if proto.Equal(feature.Location, point) {
-				featureCount++
-			}
-		}
-		if lastPoint != nil {
-			distance += calcDistance(lastPoint, point)
-		}
-		lastPoint = point
-	}
-}
-
-// RouteChat receives a stream of message/location pairs, and responds with a stream of all
-// previous messages at each of those locations.
-func (s *routeGuideServer) RouteChat(stream pb.RouteGuide_RouteChatServer) error {
-	for {
-		in, err := stream.Recv()
-		if err == io.EOF {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-		key := serialize(in.Location)
-		if _, present := s.routeNotes[key]; !present {
-			s.routeNotes[key] = []*pb.RouteNote{in}
-		} else {
-			s.routeNotes[key] = append(s.routeNotes[key], in)
-		}
-		for _, note := range s.routeNotes[key] {
-			if err := stream.Send(note); err != nil {
-				return err
-			}
-		}
-	}
-}
-
-// loadFeatures loads features from a JSON file.
-func (s *routeGuideServer) loadFeatures(filePath string) {
-	file, err := ioutil.ReadFile(filePath)
-	if err != nil {
-		grpclog.Fatalf("Failed to load default features: %v", err)
-	}
-	if err := json.Unmarshal(file, &s.savedFeatures); err != nil {
-		grpclog.Fatalf("Failed to load default features: %v", err)
-	}
-}
-
-func toRadians(num float64) float64 {
-	return num * math.Pi / float64(180)
-}
-
-// calcDistance calculates the distance between two points using the "haversine" formula.
-// This code was taken from http://www.movable-type.co.uk/scripts/latlong.html.
-func calcDistance(p1 *pb.Point, p2 *pb.Point) int32 {
-	const CordFactor float64 = 1e7
-	const R float64 = float64(6371000) // metres
-	lat1 := float64(p1.Latitude) / CordFactor
-	lat2 := float64(p2.Latitude) / CordFactor
-	lng1 := float64(p1.Longitude) / CordFactor
-	lng2 := float64(p2.Longitude) / CordFactor
-	φ1 := toRadians(lat1)
-	φ2 := toRadians(lat2)
-	Δφ := toRadians(lat2 - lat1)
-	Δλ := toRadians(lng2 - lng1)
-
-	a := math.Sin(Δφ/2)*math.Sin(Δφ/2) +
-		math.Cos(φ1)*math.Cos(φ2)*
-			math.Sin(Δλ/2)*math.Sin(Δλ/2)
-	c := 2 * math.Atan2(math.Sqrt(a), math.Sqrt(1-a))
-
-	distance := R * c
-	return int32(distance)
-}
-
-func inRange(point *pb.Point, rect *pb.Rectangle) bool {
-	left := math.Min(float64(rect.Lo.Longitude), float64(rect.Hi.Longitude))
-	right := math.Max(float64(rect.Lo.Longitude), float64(rect.Hi.Longitude))
-	top := math.Max(float64(rect.Lo.Latitude), float64(rect.Hi.Latitude))
-	bottom := math.Min(float64(rect.Lo.Latitude), float64(rect.Hi.Latitude))
-
-	if float64(point.Longitude) >= left &&
-		float64(point.Longitude) <= right &&
-		float64(point.Latitude) >= bottom &&
-		float64(point.Latitude) <= top {
-		return true
-	}
-	return false
-}
-
-func serialize(point *pb.Point) string {
-	return fmt.Sprintf("%d %d", point.Latitude, point.Longitude)
-}
-
-func newServer() *routeGuideServer {
-	s := new(routeGuideServer)
-	s.loadFeatures(*jsonDBFile)
-	s.routeNotes = make(map[string][]*pb.RouteNote)
-	return s
-}
-
-func main() {
-	flag.Parse()
-	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))
-	if err != nil {
-		grpclog.Fatalf("failed to listen: %v", err)
-	}
-	var opts []grpc.ServerOption
-	if *tls {
-		creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile)
-		if err != nil {
-			grpclog.Fatalf("Failed to generate credentials %v", err)
-		}
-		opts = []grpc.ServerOption{grpc.Creds(creds)}
-	}
-	grpcServer := grpc.NewServer(opts...)
-	pb.RegisterRouteGuideServer(grpcServer, newServer())
-	grpcServer.Serve(lis)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go b/Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go
deleted file mode 100644
index cc6e27c064..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/grpclog/logger.go
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
-Package grpclog defines logging for grpc.
-*/
-package grpclog
-
-import (
-	"log"
-	"os"
-)
-
-// Use golang's standard logger by default.
-var logger Logger = log.New(os.Stderr, "", log.LstdFlags)
-
-// Logger mimics golang's standard Logger as an interface.
-type Logger interface {
-	Fatal(args ...interface{})
-	Fatalf(format string, args ...interface{})
-	Fatalln(args ...interface{})
-	Print(args ...interface{})
-	Printf(format string, args ...interface{})
-	Println(args ...interface{})
-}
-
-// SetLogger sets the logger that is used in grpc.
-func SetLogger(l Logger) {
-	logger = l
-}
-
-// Fatal is equivalent to Print() followed by a call to os.Exit() with a non-zero exit code.
-func Fatal(args ...interface{}) {
-	logger.Fatal(args...)
-}
-
-// Fatalf is equivalent to Printf() followed by a call to os.Exit() with a non-zero exit code.
-func Fatalf(format string, args ...interface{}) {
-	logger.Fatalf(format, args...)
-}
-
-// Fatalln is equivalent to Println() followed by a call to os.Exit()) with a non-zero exit code.
-func Fatalln(args ...interface{}) {
-	logger.Fatalln(args...)
-}
-
-// Print prints to the logger. Arguments are handled in the manner of fmt.Print.
-func Print(args ...interface{}) {
-	logger.Print(args...)
-}
-
-// Printf prints to the logger. Arguments are handled in the manner of fmt.Printf.
-func Printf(format string, args ...interface{}) {
-	logger.Printf(format, args...)
-}
-
-// Println prints to the logger. Arguments are handled in the manner of fmt.Println.
-func Println(args ...interface{}) {
-	logger.Println(args...)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.pb.go b/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.pb.go
deleted file mode 100644
index 96eba6f85e..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.pb.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: health.proto
-// DO NOT EDIT!
-
-/*
-Package grpc_health_v1alpha is a generated protocol buffer package.
-
-It is generated from these files:
-	health.proto
-
-It has these top-level messages:
-	HealthCheckRequest
-	HealthCheckResponse
-*/
-package grpc_health_v1alpha
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type HealthCheckResponse_ServingStatus int32
-
-const (
-	HealthCheckResponse_UNKNOWN     HealthCheckResponse_ServingStatus = 0
-	HealthCheckResponse_SERVING     HealthCheckResponse_ServingStatus = 1
-	HealthCheckResponse_NOT_SERVING HealthCheckResponse_ServingStatus = 2
-)
-
-var HealthCheckResponse_ServingStatus_name = map[int32]string{
-	0: "UNKNOWN",
-	1: "SERVING",
-	2: "NOT_SERVING",
-}
-var HealthCheckResponse_ServingStatus_value = map[string]int32{
-	"UNKNOWN":     0,
-	"SERVING":     1,
-	"NOT_SERVING": 2,
-}
-
-func (x HealthCheckResponse_ServingStatus) String() string {
-	return proto.EnumName(HealthCheckResponse_ServingStatus_name, int32(x))
-}
-
-type HealthCheckRequest struct {
-	Service string `protobuf:"bytes,1,opt,name=service" json:"service,omitempty"`
-}
-
-func (m *HealthCheckRequest) Reset()         { *m = HealthCheckRequest{} }
-func (m *HealthCheckRequest) String() string { return proto.CompactTextString(m) }
-func (*HealthCheckRequest) ProtoMessage()    {}
-
-type HealthCheckResponse struct {
-	Status HealthCheckResponse_ServingStatus `protobuf:"varint,1,opt,name=status,enum=grpc.health.v1alpha.HealthCheckResponse_ServingStatus" json:"status,omitempty"`
-}
-
-func (m *HealthCheckResponse) Reset()         { *m = HealthCheckResponse{} }
-func (m *HealthCheckResponse) String() string { return proto.CompactTextString(m) }
-func (*HealthCheckResponse) ProtoMessage()    {}
-
-func init() {
-	proto.RegisterEnum("grpc.health.v1alpha.HealthCheckResponse_ServingStatus", HealthCheckResponse_ServingStatus_name, HealthCheckResponse_ServingStatus_value)
-}
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// Client API for Health service
-
-type HealthClient interface {
-	Check(ctx context.Context, in *HealthCheckRequest, opts ...grpc.CallOption) (*HealthCheckResponse, error)
-}
-
-type healthClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewHealthClient(cc *grpc.ClientConn) HealthClient {
-	return &healthClient{cc}
-}
-
-func (c *healthClient) Check(ctx context.Context, in *HealthCheckRequest, opts ...grpc.CallOption) (*HealthCheckResponse, error) {
-	out := new(HealthCheckResponse)
-	err := grpc.Invoke(ctx, "/grpc.health.v1alpha.Health/Check", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// Server API for Health service
-
-type HealthServer interface {
-	Check(context.Context, *HealthCheckRequest) (*HealthCheckResponse, error)
-}
-
-func RegisterHealthServer(s *grpc.Server, srv HealthServer) {
-	s.RegisterService(&_Health_serviceDesc, srv)
-}
-
-func _Health_Check_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
-	in := new(HealthCheckRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	out, err := srv.(HealthServer).Check(ctx, in)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-var _Health_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "grpc.health.v1alpha.Health",
-	HandlerType: (*HealthServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Check",
-			Handler:    _Health_Check_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{},
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.proto b/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.proto
deleted file mode 100644
index 91c7f06e9b..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/health/grpc_health_v1alpha/health.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-syntax = "proto3";
-
-package grpc.health.v1alpha;
-
-message HealthCheckRequest {
-  string service = 1;
-}
-
-message HealthCheckResponse {
-  enum ServingStatus {
- 	UNKNOWN = 0;
-	SERVING = 1;
-	NOT_SERVING = 2;
-  }
-  ServingStatus status = 1;
-}
-
-service Health{
-  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
-} 
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/health/health.go b/Godeps/_workspace/src/google.golang.org/grpc/health/health.go
deleted file mode 100644
index 7930bde7f3..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/health/health.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Package health provides some utility functions to health-check a server. The implementation
-// is based on protobuf. Users need to write their own implementations if other IDLs are used.
-package health
-
-import (
-	"sync"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	healthpb "google.golang.org/grpc/health/grpc_health_v1alpha"
-)
-
-type HealthServer struct {
-	mu sync.Mutex
-	// statusMap stores the serving status of the services this HealthServer monitors.
-	statusMap map[string]healthpb.HealthCheckResponse_ServingStatus
-}
-
-func NewHealthServer() *HealthServer {
-	return &HealthServer{
-		statusMap: make(map[string]healthpb.HealthCheckResponse_ServingStatus),
-	}
-}
-
-func (s *HealthServer) Check(ctx context.Context, in *healthpb.HealthCheckRequest) (*healthpb.HealthCheckResponse, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if in.Service == "" {
-		// check the server overall health status.
-		return &healthpb.HealthCheckResponse{
-			Status: healthpb.HealthCheckResponse_SERVING,
-		}, nil
-	}
-	if status, ok := s.statusMap[in.Service]; ok {
-		return &healthpb.HealthCheckResponse{
-			Status: status,
-		}, nil
-	}
-	return nil, grpc.Errorf(codes.NotFound, "unknown service")
-}
-
-// SetServingStatus is called when need to reset the serving status of a service
-// or insert a new service entry into the statusMap.
-func (s *HealthServer) SetServingStatus(service string, status healthpb.HealthCheckResponse_ServingStatus) {
-	s.mu.Lock()
-	s.statusMap[service] = status
-	s.mu.Unlock()
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/client/client.go b/Godeps/_workspace/src/google.golang.org/grpc/interop/client/client.go
deleted file mode 100644
index deb9c3d848..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/interop/client/client.go
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package main
-
-import (
-	"flag"
-	"net"
-	"strconv"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/credentials/oauth"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/interop"
-	testpb "google.golang.org/grpc/interop/grpc_testing"
-)
-
-var (
-	useTLS                = flag.Bool("use_tls", false, "Connection uses TLS if true, else plain TCP")
-	testCA                = flag.Bool("use_test_ca", false, "Whether to replace platform root CAs with test CA as the CA root")
-	serviceAccountKeyFile = flag.String("service_account_key_file", "", "Path to service account json key file")
-	oauthScope            = flag.String("oauth_scope", "", "The scope for OAuth2 tokens")
-	defaultServiceAccount = flag.String("default_service_account", "", "Email of GCE default service account")
-	serverHost            = flag.String("server_host", "127.0.0.1", "The server host name")
-	serverPort            = flag.Int("server_port", 10000, "The server port number")
-	tlsServerName         = flag.String("server_host_override", "x.test.youtube.com", "The server name use to verify the hostname returned by TLS handshake if it is not empty. Otherwise, --server_host is used.")
-	testCase              = flag.String("test_case", "large_unary",
-		`Configure different test cases. Valid options are:
-        empty_unary : empty (zero bytes) request and response;
-        large_unary : single request and (large) response;
-        client_streaming : request streaming with single response;
-        server_streaming : single request with response streaming;
-        ping_pong : full-duplex streaming;
-        empty_stream : full-duplex streaming with zero message;
-        timeout_on_sleeping_server: fullduplex streaming on a sleeping server;
-        compute_engine_creds: large_unary with compute engine auth;
-        service_account_creds: large_unary with service account auth;
-        jwt_token_creds: large_unary with jwt token auth;
-        per_rpc_creds: large_unary with per rpc token;
-        oauth2_auth_token: large_unary with oauth2 token auth;
-        cancel_after_begin: cancellation after metadata has been sent but before payloads are sent;
-        cancel_after_first_response: cancellation after receiving 1st message from the server.`)
-
-	// The test CA root cert file
-	testCAFile = "testdata/ca.pem"
-)
-
-func main() {
-	flag.Parse()
-	serverAddr := net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort))
-	var opts []grpc.DialOption
-	if *useTLS {
-		var sn string
-		if *tlsServerName != "" {
-			sn = *tlsServerName
-		}
-		var creds credentials.TransportAuthenticator
-		if *testCA {
-			var err error
-			creds, err = credentials.NewClientTLSFromFile(testCAFile, sn)
-			if err != nil {
-				grpclog.Fatalf("Failed to create TLS credentials %v", err)
-			}
-		} else {
-			creds = credentials.NewClientTLSFromCert(nil, sn)
-		}
-		opts = append(opts, grpc.WithTransportCredentials(creds))
-		if *testCase == "compute_engine_creds" {
-			opts = append(opts, grpc.WithPerRPCCredentials(oauth.NewComputeEngine()))
-		} else if *testCase == "service_account_creds" {
-			jwtCreds, err := oauth.NewServiceAccountFromFile(*serviceAccountKeyFile, *oauthScope)
-			if err != nil {
-				grpclog.Fatalf("Failed to create JWT credentials: %v", err)
-			}
-			opts = append(opts, grpc.WithPerRPCCredentials(jwtCreds))
-		} else if *testCase == "jwt_token_creds" {
-			jwtCreds, err := oauth.NewJWTAccessFromFile(*serviceAccountKeyFile)
-			if err != nil {
-				grpclog.Fatalf("Failed to create JWT credentials: %v", err)
-			}
-			opts = append(opts, grpc.WithPerRPCCredentials(jwtCreds))
-		} else if *testCase == "oauth2_auth_token" {
-			opts = append(opts, grpc.WithPerRPCCredentials(oauth.NewOauthAccess(interop.GetToken(*serviceAccountKeyFile, *oauthScope))))
-		}
-	} else {
-		opts = append(opts, grpc.WithInsecure())
-	}
-	conn, err := grpc.Dial(serverAddr, opts...)
-	if err != nil {
-		grpclog.Fatalf("Fail to dial: %v", err)
-	}
-	defer conn.Close()
-	tc := testpb.NewTestServiceClient(conn)
-	switch *testCase {
-	case "empty_unary":
-		interop.DoEmptyUnaryCall(tc)
-	case "large_unary":
-		interop.DoLargeUnaryCall(tc)
-	case "client_streaming":
-		interop.DoClientStreaming(tc)
-	case "server_streaming":
-		interop.DoServerStreaming(tc)
-	case "ping_pong":
-		interop.DoPingPong(tc)
-	case "empty_stream":
-		interop.DoEmptyStream(tc)
-	case "timeout_on_sleeping_server":
-		interop.DoTimeoutOnSleepingServer(tc)
-	case "compute_engine_creds":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute compute_engine_creds test case.")
-		}
-		interop.DoComputeEngineCreds(tc, *defaultServiceAccount, *oauthScope)
-	case "service_account_creds":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute service_account_creds test case.")
-		}
-		interop.DoServiceAccountCreds(tc, *serviceAccountKeyFile, *oauthScope)
-	case "jwt_token_creds":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute jwt_token_creds test case.")
-		}
-		interop.DoJWTTokenCreds(tc, *serviceAccountKeyFile)
-	case "per_rpc_creds":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute per_rpc_creds test case.")
-		}
-		interop.DoPerRPCCreds(tc, *serviceAccountKeyFile, *oauthScope)
-	case "oauth2_auth_token":
-		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute oauth2_auth_token test case.")
-		}
-		interop.DoOauth2TokenCreds(tc, *serviceAccountKeyFile, *oauthScope)
-	case "cancel_after_begin":
-		interop.DoCancelAfterBegin(tc)
-	case "cancel_after_first_response":
-		interop.DoCancelAfterFirstResponse(tc)
-	default:
-		grpclog.Fatal("Unsupported test case: ", *testCase)
-	}
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.pb.go b/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.pb.go
deleted file mode 100644
index bd492fef47..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.pb.go
+++ /dev/null
@@ -1,702 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: test.proto
-// DO NOT EDIT!
-
-/*
-Package grpc_testing is a generated protocol buffer package.
-
-It is generated from these files:
-	test.proto
-
-It has these top-level messages:
-	Empty
-	Payload
-	SimpleRequest
-	SimpleResponse
-	StreamingInputCallRequest
-	StreamingInputCallResponse
-	ResponseParameters
-	StreamingOutputCallRequest
-	StreamingOutputCallResponse
-*/
-package grpc_testing
-
-import proto "github.com/golang/protobuf/proto"
-import math "math"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = math.Inf
-
-// The type of payload that should be returned.
-type PayloadType int32
-
-const (
-	// Compressable text format.
-	PayloadType_COMPRESSABLE PayloadType = 0
-	// Uncompressable binary format.
-	PayloadType_UNCOMPRESSABLE PayloadType = 1
-	// Randomly chosen from all other formats defined in this enum.
-	PayloadType_RANDOM PayloadType = 2
-)
-
-var PayloadType_name = map[int32]string{
-	0: "COMPRESSABLE",
-	1: "UNCOMPRESSABLE",
-	2: "RANDOM",
-}
-var PayloadType_value = map[string]int32{
-	"COMPRESSABLE":   0,
-	"UNCOMPRESSABLE": 1,
-	"RANDOM":         2,
-}
-
-func (x PayloadType) Enum() *PayloadType {
-	p := new(PayloadType)
-	*p = x
-	return p
-}
-func (x PayloadType) String() string {
-	return proto.EnumName(PayloadType_name, int32(x))
-}
-func (x *PayloadType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(PayloadType_value, data, "PayloadType")
-	if err != nil {
-		return err
-	}
-	*x = PayloadType(value)
-	return nil
-}
-
-type Empty struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Empty) Reset()         { *m = Empty{} }
-func (m *Empty) String() string { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()    {}
-
-// A block of data, to simply increase gRPC message size.
-type Payload struct {
-	// The type of data in body.
-	Type *PayloadType `protobuf:"varint,1,opt,name=type,enum=grpc.testing.PayloadType" json:"type,omitempty"`
-	// Primary contents of payload.
-	Body             []byte `protobuf:"bytes,2,opt,name=body" json:"body,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Payload) Reset()         { *m = Payload{} }
-func (m *Payload) String() string { return proto.CompactTextString(m) }
-func (*Payload) ProtoMessage()    {}
-
-func (m *Payload) GetType() PayloadType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return PayloadType_COMPRESSABLE
-}
-
-func (m *Payload) GetBody() []byte {
-	if m != nil {
-		return m.Body
-	}
-	return nil
-}
-
-// Unary request.
-type SimpleRequest struct {
-	// Desired payload type in the response from the server.
-	// If response_type is RANDOM, server randomly chooses one from other formats.
-	ResponseType *PayloadType `protobuf:"varint,1,opt,name=response_type,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
-	// Desired payload size in the response from the server.
-	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	ResponseSize *int32 `protobuf:"varint,2,opt,name=response_size" json:"response_size,omitempty"`
-	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
-	// Whether SimpleResponse should include username.
-	FillUsername *bool `protobuf:"varint,4,opt,name=fill_username" json:"fill_username,omitempty"`
-	// Whether SimpleResponse should include OAuth scope.
-	FillOauthScope   *bool  `protobuf:"varint,5,opt,name=fill_oauth_scope" json:"fill_oauth_scope,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SimpleRequest) Reset()         { *m = SimpleRequest{} }
-func (m *SimpleRequest) String() string { return proto.CompactTextString(m) }
-func (*SimpleRequest) ProtoMessage()    {}
-
-func (m *SimpleRequest) GetResponseType() PayloadType {
-	if m != nil && m.ResponseType != nil {
-		return *m.ResponseType
-	}
-	return PayloadType_COMPRESSABLE
-}
-
-func (m *SimpleRequest) GetResponseSize() int32 {
-	if m != nil && m.ResponseSize != nil {
-		return *m.ResponseSize
-	}
-	return 0
-}
-
-func (m *SimpleRequest) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func (m *SimpleRequest) GetFillUsername() bool {
-	if m != nil && m.FillUsername != nil {
-		return *m.FillUsername
-	}
-	return false
-}
-
-func (m *SimpleRequest) GetFillOauthScope() bool {
-	if m != nil && m.FillOauthScope != nil {
-		return *m.FillOauthScope
-	}
-	return false
-}
-
-// Unary response, as configured by the request.
-type SimpleResponse struct {
-	// Payload to increase message size.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
-	// The user the request came from, for verifying authentication was
-	// successful when the client expected it.
-	Username *string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
-	// OAuth scope.
-	OauthScope       *string `protobuf:"bytes,3,opt,name=oauth_scope" json:"oauth_scope,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *SimpleResponse) Reset()         { *m = SimpleResponse{} }
-func (m *SimpleResponse) String() string { return proto.CompactTextString(m) }
-func (*SimpleResponse) ProtoMessage()    {}
-
-func (m *SimpleResponse) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func (m *SimpleResponse) GetUsername() string {
-	if m != nil && m.Username != nil {
-		return *m.Username
-	}
-	return ""
-}
-
-func (m *SimpleResponse) GetOauthScope() string {
-	if m != nil && m.OauthScope != nil {
-		return *m.OauthScope
-	}
-	return ""
-}
-
-// Client-streaming request.
-type StreamingInputCallRequest struct {
-	// Optional input payload sent along with the request.
-	Payload          *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *StreamingInputCallRequest) Reset()         { *m = StreamingInputCallRequest{} }
-func (m *StreamingInputCallRequest) String() string { return proto.CompactTextString(m) }
-func (*StreamingInputCallRequest) ProtoMessage()    {}
-
-func (m *StreamingInputCallRequest) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-// Client-streaming response.
-type StreamingInputCallResponse struct {
-	// Aggregated size of payloads received from the client.
-	AggregatedPayloadSize *int32 `protobuf:"varint,1,opt,name=aggregated_payload_size" json:"aggregated_payload_size,omitempty"`
-	XXX_unrecognized      []byte `json:"-"`
-}
-
-func (m *StreamingInputCallResponse) Reset()         { *m = StreamingInputCallResponse{} }
-func (m *StreamingInputCallResponse) String() string { return proto.CompactTextString(m) }
-func (*StreamingInputCallResponse) ProtoMessage()    {}
-
-func (m *StreamingInputCallResponse) GetAggregatedPayloadSize() int32 {
-	if m != nil && m.AggregatedPayloadSize != nil {
-		return *m.AggregatedPayloadSize
-	}
-	return 0
-}
-
-// Configuration for a particular response.
-type ResponseParameters struct {
-	// Desired payload sizes in responses from the server.
-	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	Size *int32 `protobuf:"varint,1,opt,name=size" json:"size,omitempty"`
-	// Desired interval between consecutive responses in the response stream in
-	// microseconds.
-	IntervalUs       *int32 `protobuf:"varint,2,opt,name=interval_us" json:"interval_us,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *ResponseParameters) Reset()         { *m = ResponseParameters{} }
-func (m *ResponseParameters) String() string { return proto.CompactTextString(m) }
-func (*ResponseParameters) ProtoMessage()    {}
-
-func (m *ResponseParameters) GetSize() int32 {
-	if m != nil && m.Size != nil {
-		return *m.Size
-	}
-	return 0
-}
-
-func (m *ResponseParameters) GetIntervalUs() int32 {
-	if m != nil && m.IntervalUs != nil {
-		return *m.IntervalUs
-	}
-	return 0
-}
-
-// Server-streaming request.
-type StreamingOutputCallRequest struct {
-	// Desired payload type in the response from the server.
-	// If response_type is RANDOM, the payload from each response in the stream
-	// might be of different types. This is to simulate a mixed type of payload
-	// stream.
-	ResponseType *PayloadType `protobuf:"varint,1,opt,name=response_type,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
-	// Configuration for each expected response message.
-	ResponseParameters []*ResponseParameters `protobuf:"bytes,2,rep,name=response_parameters" json:"response_parameters,omitempty"`
-	// Optional input payload sent along with the request.
-	Payload          *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *StreamingOutputCallRequest) Reset()         { *m = StreamingOutputCallRequest{} }
-func (m *StreamingOutputCallRequest) String() string { return proto.CompactTextString(m) }
-func (*StreamingOutputCallRequest) ProtoMessage()    {}
-
-func (m *StreamingOutputCallRequest) GetResponseType() PayloadType {
-	if m != nil && m.ResponseType != nil {
-		return *m.ResponseType
-	}
-	return PayloadType_COMPRESSABLE
-}
-
-func (m *StreamingOutputCallRequest) GetResponseParameters() []*ResponseParameters {
-	if m != nil {
-		return m.ResponseParameters
-	}
-	return nil
-}
-
-func (m *StreamingOutputCallRequest) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-// Server-streaming response, as configured by the request and parameters.
-type StreamingOutputCallResponse struct {
-	// Payload to increase response size.
-	Payload          *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *StreamingOutputCallResponse) Reset()         { *m = StreamingOutputCallResponse{} }
-func (m *StreamingOutputCallResponse) String() string { return proto.CompactTextString(m) }
-func (*StreamingOutputCallResponse) ProtoMessage()    {}
-
-func (m *StreamingOutputCallResponse) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("grpc.testing.PayloadType", PayloadType_name, PayloadType_value)
-}
-
-// Client API for TestService service
-
-type TestServiceClient interface {
-	// One empty request followed by one empty response.
-	EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error)
-	// One request followed by one response.
-	// The server returns the client payload as-is.
-	UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error)
-	// One request followed by a sequence of responses (streamed download).
-	// The server returns the payload with client desired type and sizes.
-	StreamingOutputCall(ctx context.Context, in *StreamingOutputCallRequest, opts ...grpc.CallOption) (TestService_StreamingOutputCallClient, error)
-	// A sequence of requests followed by one response (streamed upload).
-	// The server returns the aggregated size of client payload as the result.
-	StreamingInputCall(ctx context.Context, opts ...grpc.CallOption) (TestService_StreamingInputCallClient, error)
-	// A sequence of requests with each request served by the server immediately.
-	// As one request could lead to multiple responses, this interface
-	// demonstrates the idea of full duplexing.
-	FullDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_FullDuplexCallClient, error)
-	// A sequence of requests followed by a sequence of responses.
-	// The server buffers all the client requests and then serves them in order. A
-	// stream of responses are returned to the client when the server starts with
-	// first request.
-	HalfDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_HalfDuplexCallClient, error)
-}
-
-type testServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewTestServiceClient(cc *grpc.ClientConn) TestServiceClient {
-	return &testServiceClient{cc}
-}
-
-func (c *testServiceClient) EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) {
-	out := new(Empty)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/EmptyCall", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *testServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error) {
-	out := new(SimpleResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/UnaryCall", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *testServiceClient) StreamingOutputCall(ctx context.Context, in *StreamingOutputCallRequest, opts ...grpc.CallOption) (TestService_StreamingOutputCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[0], c.cc, "/grpc.testing.TestService/StreamingOutputCall", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &testServiceStreamingOutputCallClient{stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-type TestService_StreamingOutputCallClient interface {
-	Recv() (*StreamingOutputCallResponse, error)
-	grpc.ClientStream
-}
-
-type testServiceStreamingOutputCallClient struct {
-	grpc.ClientStream
-}
-
-func (x *testServiceStreamingOutputCallClient) Recv() (*StreamingOutputCallResponse, error) {
-	m := new(StreamingOutputCallResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *testServiceClient) StreamingInputCall(ctx context.Context, opts ...grpc.CallOption) (TestService_StreamingInputCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[1], c.cc, "/grpc.testing.TestService/StreamingInputCall", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &testServiceStreamingInputCallClient{stream}
-	return x, nil
-}
-
-type TestService_StreamingInputCallClient interface {
-	Send(*StreamingInputCallRequest) error
-	CloseAndRecv() (*StreamingInputCallResponse, error)
-	grpc.ClientStream
-}
-
-type testServiceStreamingInputCallClient struct {
-	grpc.ClientStream
-}
-
-func (x *testServiceStreamingInputCallClient) Send(m *StreamingInputCallRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *testServiceStreamingInputCallClient) CloseAndRecv() (*StreamingInputCallResponse, error) {
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	m := new(StreamingInputCallResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *testServiceClient) FullDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_FullDuplexCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[2], c.cc, "/grpc.testing.TestService/FullDuplexCall", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &testServiceFullDuplexCallClient{stream}
-	return x, nil
-}
-
-type TestService_FullDuplexCallClient interface {
-	Send(*StreamingOutputCallRequest) error
-	Recv() (*StreamingOutputCallResponse, error)
-	grpc.ClientStream
-}
-
-type testServiceFullDuplexCallClient struct {
-	grpc.ClientStream
-}
-
-func (x *testServiceFullDuplexCallClient) Send(m *StreamingOutputCallRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *testServiceFullDuplexCallClient) Recv() (*StreamingOutputCallResponse, error) {
-	m := new(StreamingOutputCallResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *testServiceClient) HalfDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_HalfDuplexCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[3], c.cc, "/grpc.testing.TestService/HalfDuplexCall", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &testServiceHalfDuplexCallClient{stream}
-	return x, nil
-}
-
-type TestService_HalfDuplexCallClient interface {
-	Send(*StreamingOutputCallRequest) error
-	Recv() (*StreamingOutputCallResponse, error)
-	grpc.ClientStream
-}
-
-type testServiceHalfDuplexCallClient struct {
-	grpc.ClientStream
-}
-
-func (x *testServiceHalfDuplexCallClient) Send(m *StreamingOutputCallRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *testServiceHalfDuplexCallClient) Recv() (*StreamingOutputCallResponse, error) {
-	m := new(StreamingOutputCallResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// Server API for TestService service
-
-type TestServiceServer interface {
-	// One empty request followed by one empty response.
-	EmptyCall(context.Context, *Empty) (*Empty, error)
-	// One request followed by one response.
-	// The server returns the client payload as-is.
-	UnaryCall(context.Context, *SimpleRequest) (*SimpleResponse, error)
-	// One request followed by a sequence of responses (streamed download).
-	// The server returns the payload with client desired type and sizes.
-	StreamingOutputCall(*StreamingOutputCallRequest, TestService_StreamingOutputCallServer) error
-	// A sequence of requests followed by one response (streamed upload).
-	// The server returns the aggregated size of client payload as the result.
-	StreamingInputCall(TestService_StreamingInputCallServer) error
-	// A sequence of requests with each request served by the server immediately.
-	// As one request could lead to multiple responses, this interface
-	// demonstrates the idea of full duplexing.
-	FullDuplexCall(TestService_FullDuplexCallServer) error
-	// A sequence of requests followed by a sequence of responses.
-	// The server buffers all the client requests and then serves them in order. A
-	// stream of responses are returned to the client when the server starts with
-	// first request.
-	HalfDuplexCall(TestService_HalfDuplexCallServer) error
-}
-
-func RegisterTestServiceServer(s *grpc.Server, srv TestServiceServer) {
-	s.RegisterService(&_TestService_serviceDesc, srv)
-}
-
-func _TestService_EmptyCall_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
-	in := new(Empty)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	out, err := srv.(TestServiceServer).EmptyCall(ctx, in)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func _TestService_UnaryCall_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
-	in := new(SimpleRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	out, err := srv.(TestServiceServer).UnaryCall(ctx, in)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func _TestService_StreamingOutputCall_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(StreamingOutputCallRequest)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(TestServiceServer).StreamingOutputCall(m, &testServiceStreamingOutputCallServer{stream})
-}
-
-type TestService_StreamingOutputCallServer interface {
-	Send(*StreamingOutputCallResponse) error
-	grpc.ServerStream
-}
-
-type testServiceStreamingOutputCallServer struct {
-	grpc.ServerStream
-}
-
-func (x *testServiceStreamingOutputCallServer) Send(m *StreamingOutputCallResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func _TestService_StreamingInputCall_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TestServiceServer).StreamingInputCall(&testServiceStreamingInputCallServer{stream})
-}
-
-type TestService_StreamingInputCallServer interface {
-	SendAndClose(*StreamingInputCallResponse) error
-	Recv() (*StreamingInputCallRequest, error)
-	grpc.ServerStream
-}
-
-type testServiceStreamingInputCallServer struct {
-	grpc.ServerStream
-}
-
-func (x *testServiceStreamingInputCallServer) SendAndClose(m *StreamingInputCallResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *testServiceStreamingInputCallServer) Recv() (*StreamingInputCallRequest, error) {
-	m := new(StreamingInputCallRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func _TestService_FullDuplexCall_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TestServiceServer).FullDuplexCall(&testServiceFullDuplexCallServer{stream})
-}
-
-type TestService_FullDuplexCallServer interface {
-	Send(*StreamingOutputCallResponse) error
-	Recv() (*StreamingOutputCallRequest, error)
-	grpc.ServerStream
-}
-
-type testServiceFullDuplexCallServer struct {
-	grpc.ServerStream
-}
-
-func (x *testServiceFullDuplexCallServer) Send(m *StreamingOutputCallResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *testServiceFullDuplexCallServer) Recv() (*StreamingOutputCallRequest, error) {
-	m := new(StreamingOutputCallRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func _TestService_HalfDuplexCall_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TestServiceServer).HalfDuplexCall(&testServiceHalfDuplexCallServer{stream})
-}
-
-type TestService_HalfDuplexCallServer interface {
-	Send(*StreamingOutputCallResponse) error
-	Recv() (*StreamingOutputCallRequest, error)
-	grpc.ServerStream
-}
-
-type testServiceHalfDuplexCallServer struct {
-	grpc.ServerStream
-}
-
-func (x *testServiceHalfDuplexCallServer) Send(m *StreamingOutputCallResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *testServiceHalfDuplexCallServer) Recv() (*StreamingOutputCallRequest, error) {
-	m := new(StreamingOutputCallRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-var _TestService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "grpc.testing.TestService",
-	HandlerType: (*TestServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "EmptyCall",
-			Handler:    _TestService_EmptyCall_Handler,
-		},
-		{
-			MethodName: "UnaryCall",
-			Handler:    _TestService_UnaryCall_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "StreamingOutputCall",
-			Handler:       _TestService_StreamingOutputCall_Handler,
-			ServerStreams: true,
-		},
-		{
-			StreamName:    "StreamingInputCall",
-			Handler:       _TestService_StreamingInputCall_Handler,
-			ClientStreams: true,
-		},
-		{
-			StreamName:    "FullDuplexCall",
-			Handler:       _TestService_FullDuplexCall_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-		{
-			StreamName:    "HalfDuplexCall",
-			Handler:       _TestService_HalfDuplexCall_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-	},
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.proto b/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.proto
deleted file mode 100644
index b5bfe05378..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/interop/grpc_testing/test.proto
+++ /dev/null
@@ -1,140 +0,0 @@
-// An integration test service that covers all the method signature permutations
-// of unary/streaming requests/responses.
-syntax = "proto2";
-
-package grpc.testing;
-
-message Empty {}
-
-// The type of payload that should be returned.
-enum PayloadType {
-  // Compressable text format.
-  COMPRESSABLE = 0;
-
-  // Uncompressable binary format.
-  UNCOMPRESSABLE = 1;
-
-  // Randomly chosen from all other formats defined in this enum.
-  RANDOM = 2;
-}
-
-// A block of data, to simply increase gRPC message size.
-message Payload {
-  // The type of data in body.
-  optional PayloadType type = 1;
-  // Primary contents of payload.
-  optional bytes body = 2;
-}
-
-// Unary request.
-message SimpleRequest {
-  // Desired payload type in the response from the server.
-  // If response_type is RANDOM, server randomly chooses one from other formats.
-  optional PayloadType response_type = 1;
-
-  // Desired payload size in the response from the server.
-  // If response_type is COMPRESSABLE, this denotes the size before compression.
-  optional int32 response_size = 2;
-
-  // Optional input payload sent along with the request.
-  optional Payload payload = 3;
-
-  // Whether SimpleResponse should include username.
-  optional bool fill_username = 4;
-
-  // Whether SimpleResponse should include OAuth scope.
-  optional bool fill_oauth_scope = 5;
-}
-
-// Unary response, as configured by the request.
-message SimpleResponse {
-  // Payload to increase message size.
-  optional Payload payload = 1;
-
-  // The user the request came from, for verifying authentication was
-  // successful when the client expected it.
-  optional string username = 2;
-  
-  // OAuth scope.
-  optional string oauth_scope = 3;
-}
-
-// Client-streaming request.
-message StreamingInputCallRequest {
-  // Optional input payload sent along with the request.
-  optional Payload payload = 1;
-
-  // Not expecting any payload from the response.
-}
-
-// Client-streaming response.
-message StreamingInputCallResponse {
-  // Aggregated size of payloads received from the client.
-  optional int32 aggregated_payload_size = 1;
-}
-
-// Configuration for a particular response.
-message ResponseParameters {
-  // Desired payload sizes in responses from the server.
-  // If response_type is COMPRESSABLE, this denotes the size before compression.
-  optional int32 size = 1;
-
-  // Desired interval between consecutive responses in the response stream in
-  // microseconds.
-  optional int32 interval_us = 2;
-}
-
-// Server-streaming request.
-message StreamingOutputCallRequest {
-  // Desired payload type in the response from the server.
-  // If response_type is RANDOM, the payload from each response in the stream
-  // might be of different types. This is to simulate a mixed type of payload
-  // stream.
-  optional PayloadType response_type = 1;
-
-  // Configuration for each expected response message.
-  repeated ResponseParameters response_parameters = 2;
-
-  // Optional input payload sent along with the request.
-  optional Payload payload = 3;
-}
-
-// Server-streaming response, as configured by the request and parameters.
-message StreamingOutputCallResponse {
-  // Payload to increase response size.
-  optional Payload payload = 1;
-}
-
-// A simple service to test the various types of RPCs and experiment with
-// performance with various types of payload.
-service TestService {
-  // One empty request followed by one empty response.
-  rpc EmptyCall(Empty) returns (Empty);
-
-  // One request followed by one response.
-  // The server returns the client payload as-is.
-  rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
-
-  // One request followed by a sequence of responses (streamed download).
-  // The server returns the payload with client desired type and sizes.
-  rpc StreamingOutputCall(StreamingOutputCallRequest)
-      returns (stream StreamingOutputCallResponse);
-
-  // A sequence of requests followed by one response (streamed upload).
-  // The server returns the aggregated size of client payload as the result.
-  rpc StreamingInputCall(stream StreamingInputCallRequest)
-      returns (StreamingInputCallResponse);
-
-  // A sequence of requests with each request served by the server immediately.
-  // As one request could lead to multiple responses, this interface
-  // demonstrates the idea of full duplexing.
-  rpc FullDuplexCall(stream StreamingOutputCallRequest)
-      returns (stream StreamingOutputCallResponse);
-
-  // A sequence of requests followed by a sequence of responses.
-  // The server buffers all the client requests and then serves them in order. A
-  // stream of responses are returned to the client when the server starts with
-  // first request.
-  rpc HalfDuplexCall(stream StreamingOutputCallRequest)
-      returns (stream StreamingOutputCallResponse);
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/server/server.go b/Godeps/_workspace/src/google.golang.org/grpc/interop/server/server.go
deleted file mode 100644
index 36ebcb6418..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/interop/server/server.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package main
-
-import (
-	"flag"
-	"net"
-	"strconv"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/interop"
-	testpb "google.golang.org/grpc/interop/grpc_testing"
-)
-
-var (
-	useTLS   = flag.Bool("use_tls", false, "Connection uses TLS if true, else plain TCP")
-	certFile = flag.String("tls_cert_file", "testdata/server1.pem", "The TLS cert file")
-	keyFile  = flag.String("tls_key_file", "testdata/server1.key", "The TLS key file")
-	port     = flag.Int("port", 10000, "The server port")
-)
-
-func main() {
-	flag.Parse()
-	p := strconv.Itoa(*port)
-	lis, err := net.Listen("tcp", ":"+p)
-	if err != nil {
-		grpclog.Fatalf("failed to listen: %v", err)
-	}
-	var opts []grpc.ServerOption
-	if *useTLS {
-		creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile)
-		if err != nil {
-			grpclog.Fatalf("Failed to generate credentials %v", err)
-		}
-		opts = []grpc.ServerOption{grpc.Creds(creds)}
-	}
-	server := grpc.NewServer(opts...)
-	testpb.RegisterTestServiceServer(server, interop.NewTestServer())
-	server.Serve(lis)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/interop/test_utils.go b/Godeps/_workspace/src/google.golang.org/grpc/interop/test_utils.go
deleted file mode 100644
index 6a73d6f453..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/interop/test_utils.go
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package interop
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"strings"
-	"time"
-
-	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/google"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/grpclog"
-	testpb "google.golang.org/grpc/interop/grpc_testing"
-	"google.golang.org/grpc/metadata"
-)
-
-var (
-	reqSizes      = []int{27182, 8, 1828, 45904}
-	respSizes     = []int{31415, 9, 2653, 58979}
-	largeReqSize  = 271828
-	largeRespSize = 314159
-)
-
-func clientNewPayload(t testpb.PayloadType, size int) *testpb.Payload {
-	if size < 0 {
-		grpclog.Fatalf("Requested a response with invalid length %d", size)
-	}
-	body := make([]byte, size)
-	switch t {
-	case testpb.PayloadType_COMPRESSABLE:
-	case testpb.PayloadType_UNCOMPRESSABLE:
-		grpclog.Fatalf("PayloadType UNCOMPRESSABLE is not supported")
-	default:
-		grpclog.Fatalf("Unsupported payload type: %d", t)
-	}
-	return &testpb.Payload{
-		Type: t.Enum(),
-		Body: body,
-	}
-}
-
-// DoEmptyUnaryCall performs a unary RPC with empty request and response messages.
-func DoEmptyUnaryCall(tc testpb.TestServiceClient) {
-	reply, err := tc.EmptyCall(context.Background(), &testpb.Empty{})
-	if err != nil {
-		grpclog.Fatal("/TestService/EmptyCall RPC failed: ", err)
-	}
-	if !proto.Equal(&testpb.Empty{}, reply) {
-		grpclog.Fatalf("/TestService/EmptyCall receives %v, want %v", reply, testpb.Empty{})
-	}
-	grpclog.Println("EmptyUnaryCall done")
-}
-
-// DoLargeUnaryCall performs a unary RPC with large payload in the request and response.
-func DoLargeUnaryCall(tc testpb.TestServiceClient) {
-	pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, largeReqSize)
-	req := &testpb.SimpleRequest{
-		ResponseType: testpb.PayloadType_COMPRESSABLE.Enum(),
-		ResponseSize: proto.Int32(int32(largeRespSize)),
-		Payload:      pl,
-	}
-	reply, err := tc.UnaryCall(context.Background(), req)
-	if err != nil {
-		grpclog.Fatal("/TestService/UnaryCall RPC failed: ", err)
-	}
-	t := reply.GetPayload().GetType()
-	s := len(reply.GetPayload().GetBody())
-	if t != testpb.PayloadType_COMPRESSABLE || s != largeRespSize {
-		grpclog.Fatalf("Got the reply with type %d len %d; want %d, %d", t, s, testpb.PayloadType_COMPRESSABLE, largeRespSize)
-	}
-	grpclog.Println("LargeUnaryCall done")
-}
-
-// DoClientStreaming performs a client streaming RPC.
-func DoClientStreaming(tc testpb.TestServiceClient) {
-	stream, err := tc.StreamingInputCall(context.Background())
-	if err != nil {
-		grpclog.Fatalf("%v.StreamingInputCall(_) = _, %v", tc, err)
-	}
-	var sum int
-	for _, s := range reqSizes {
-		pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, s)
-		req := &testpb.StreamingInputCallRequest{
-			Payload: pl,
-		}
-		if err := stream.Send(req); err != nil {
-			grpclog.Fatalf("%v.Send(%v) = %v", stream, req, err)
-		}
-		sum += s
-		grpclog.Printf("Sent a request of size %d, aggregated size %d", s, sum)
-
-	}
-	reply, err := stream.CloseAndRecv()
-	if err != nil {
-		grpclog.Fatalf("%v.CloseAndRecv() got error %v, want %v", stream, err, nil)
-	}
-	if reply.GetAggregatedPayloadSize() != int32(sum) {
-		grpclog.Fatalf("%v.CloseAndRecv().GetAggregatePayloadSize() = %v; want %v", stream, reply.GetAggregatedPayloadSize(), sum)
-	}
-	grpclog.Println("ClientStreaming done")
-}
-
-// DoServerStreaming performs a server streaming RPC.
-func DoServerStreaming(tc testpb.TestServiceClient) {
-	respParam := make([]*testpb.ResponseParameters, len(respSizes))
-	for i, s := range respSizes {
-		respParam[i] = &testpb.ResponseParameters{
-			Size: proto.Int32(int32(s)),
-		}
-	}
-	req := &testpb.StreamingOutputCallRequest{
-		ResponseType:       testpb.PayloadType_COMPRESSABLE.Enum(),
-		ResponseParameters: respParam,
-	}
-	stream, err := tc.StreamingOutputCall(context.Background(), req)
-	if err != nil {
-		grpclog.Fatalf("%v.StreamingOutputCall(_) = _, %v", tc, err)
-	}
-	var rpcStatus error
-	var respCnt int
-	var index int
-	for {
-		reply, err := stream.Recv()
-		if err != nil {
-			rpcStatus = err
-			break
-		}
-		t := reply.GetPayload().GetType()
-		if t != testpb.PayloadType_COMPRESSABLE {
-			grpclog.Fatalf("Got the reply of type %d, want %d", t, testpb.PayloadType_COMPRESSABLE)
-		}
-		size := len(reply.GetPayload().GetBody())
-		if size != int(respSizes[index]) {
-			grpclog.Fatalf("Got reply body of length %d, want %d", size, respSizes[index])
-		}
-		index++
-		respCnt++
-	}
-	if rpcStatus != io.EOF {
-		grpclog.Fatalf("Failed to finish the server streaming rpc: %v", err)
-	}
-	if respCnt != len(respSizes) {
-		grpclog.Fatalf("Got %d reply, want %d", len(respSizes), respCnt)
-	}
-	grpclog.Println("ServerStreaming done")
-}
-
-// DoPingPong performs ping-pong style bi-directional streaming RPC.
-func DoPingPong(tc testpb.TestServiceClient) {
-	stream, err := tc.FullDuplexCall(context.Background())
-	if err != nil {
-		grpclog.Fatalf("%v.FullDuplexCall(_) = _, %v", tc, err)
-	}
-	var index int
-	for index < len(reqSizes) {
-		respParam := []*testpb.ResponseParameters{
-			{
-				Size: proto.Int32(int32(respSizes[index])),
-			},
-		}
-		pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, reqSizes[index])
-		req := &testpb.StreamingOutputCallRequest{
-			ResponseType:       testpb.PayloadType_COMPRESSABLE.Enum(),
-			ResponseParameters: respParam,
-			Payload:            pl,
-		}
-		if err := stream.Send(req); err != nil {
-			grpclog.Fatalf("%v.Send(%v) = %v", stream, req, err)
-		}
-		reply, err := stream.Recv()
-		if err != nil {
-			grpclog.Fatalf("%v.Recv() = %v", stream, err)
-		}
-		t := reply.GetPayload().GetType()
-		if t != testpb.PayloadType_COMPRESSABLE {
-			grpclog.Fatalf("Got the reply of type %d, want %d", t, testpb.PayloadType_COMPRESSABLE)
-		}
-		size := len(reply.GetPayload().GetBody())
-		if size != int(respSizes[index]) {
-			grpclog.Fatalf("Got reply body of length %d, want %d", size, respSizes[index])
-		}
-		index++
-	}
-	if err := stream.CloseSend(); err != nil {
-		grpclog.Fatalf("%v.CloseSend() got %v, want %v", stream, err, nil)
-	}
-	if _, err := stream.Recv(); err != io.EOF {
-		grpclog.Fatalf("%v failed to complele the ping pong test: %v", stream, err)
-	}
-	grpclog.Println("Pingpong done")
-}
-
-// DoEmptyStream sets up a bi-directional streaming with zero message.
-func DoEmptyStream(tc testpb.TestServiceClient) {
-	stream, err := tc.FullDuplexCall(context.Background())
-	if err != nil {
-		grpclog.Fatalf("%v.FullDuplexCall(_) = _, %v", tc, err)
-	}
-	if err := stream.CloseSend(); err != nil {
-		grpclog.Fatalf("%v.CloseSend() got %v, want %v", stream, err, nil)
-	}
-	if _, err := stream.Recv(); err != io.EOF {
-		grpclog.Fatalf("%v failed to complete the empty stream test: %v", stream, err)
-	}
-	grpclog.Println("Emptystream done")
-}
-
-// DoTimeoutOnSleepingServer performs an RPC on a sleep server which causes RPC timeout.
-func DoTimeoutOnSleepingServer(tc testpb.TestServiceClient) {
-	ctx, _ := context.WithTimeout(context.Background(), 1*time.Millisecond)
-	stream, err := tc.FullDuplexCall(ctx)
-	if err != nil {
-		if grpc.Code(err) == codes.DeadlineExceeded {
-			grpclog.Println("TimeoutOnSleepingServer done")
-			return
-		}
-		grpclog.Fatalf("%v.FullDuplexCall(_) = _, %v", tc, err)
-	}
-	pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, 27182)
-	req := &testpb.StreamingOutputCallRequest{
-		ResponseType: testpb.PayloadType_COMPRESSABLE.Enum(),
-		Payload:      pl,
-	}
-	if err := stream.Send(req); err != nil {
-		grpclog.Fatalf("%v.Send(%v) = %v", stream, req, err)
-	}
-	if _, err := stream.Recv(); grpc.Code(err) != codes.DeadlineExceeded {
-		grpclog.Fatalf("%v.Recv() = _, %v, want error code %d", stream, err, codes.DeadlineExceeded)
-	}
-	grpclog.Println("TimeoutOnSleepingServer done")
-}
-
-// DoComputeEngineCreds performs a unary RPC with compute engine auth.
-func DoComputeEngineCreds(tc testpb.TestServiceClient, serviceAccount, oauthScope string) {
-	pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, largeReqSize)
-	req := &testpb.SimpleRequest{
-		ResponseType:   testpb.PayloadType_COMPRESSABLE.Enum(),
-		ResponseSize:   proto.Int32(int32(largeRespSize)),
-		Payload:        pl,
-		FillUsername:   proto.Bool(true),
-		FillOauthScope: proto.Bool(true),
-	}
-	reply, err := tc.UnaryCall(context.Background(), req)
-	if err != nil {
-		grpclog.Fatal("/TestService/UnaryCall RPC failed: ", err)
-	}
-	user := reply.GetUsername()
-	scope := reply.GetOauthScope()
-	if user != serviceAccount {
-		grpclog.Fatalf("Got user name %q, want %q.", user, serviceAccount)
-	}
-	if !strings.Contains(oauthScope, scope) {
-		grpclog.Fatalf("Got OAuth scope %q which is NOT a substring of %q.", scope, oauthScope)
-	}
-	grpclog.Println("ComputeEngineCreds done")
-}
-
-func getServiceAccountJSONKey(keyFile string) []byte {
-	jsonKey, err := ioutil.ReadFile(keyFile)
-	if err != nil {
-		grpclog.Fatalf("Failed to read the service account key file: %v", err)
-	}
-	return jsonKey
-}
-
-// DoServiceAccountCreds performs a unary RPC with service account auth.
-func DoServiceAccountCreds(tc testpb.TestServiceClient, serviceAccountKeyFile, oauthScope string) {
-	pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, largeReqSize)
-	req := &testpb.SimpleRequest{
-		ResponseType:   testpb.PayloadType_COMPRESSABLE.Enum(),
-		ResponseSize:   proto.Int32(int32(largeRespSize)),
-		Payload:        pl,
-		FillUsername:   proto.Bool(true),
-		FillOauthScope: proto.Bool(true),
-	}
-	reply, err := tc.UnaryCall(context.Background(), req)
-	if err != nil {
-		grpclog.Fatal("/TestService/UnaryCall RPC failed: ", err)
-	}
-	jsonKey := getServiceAccountJSONKey(serviceAccountKeyFile)
-	user := reply.GetUsername()
-	scope := reply.GetOauthScope()
-	if !strings.Contains(string(jsonKey), user) {
-		grpclog.Fatalf("Got user name %q which is NOT a substring of %q.", user, jsonKey)
-	}
-	if !strings.Contains(oauthScope, scope) {
-		grpclog.Fatalf("Got OAuth scope %q which is NOT a substring of %q.", scope, oauthScope)
-	}
-	grpclog.Println("ServiceAccountCreds done")
-}
-
-// DoJWTTokenCreds performs a unary RPC with JWT token auth.
-func DoJWTTokenCreds(tc testpb.TestServiceClient, serviceAccountKeyFile string) {
-	pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, largeReqSize)
-	req := &testpb.SimpleRequest{
-		ResponseType: testpb.PayloadType_COMPRESSABLE.Enum(),
-		ResponseSize: proto.Int32(int32(largeRespSize)),
-		Payload:      pl,
-		FillUsername: proto.Bool(true),
-	}
-	reply, err := tc.UnaryCall(context.Background(), req)
-	if err != nil {
-		grpclog.Fatal("/TestService/UnaryCall RPC failed: ", err)
-	}
-	jsonKey := getServiceAccountJSONKey(serviceAccountKeyFile)
-	user := reply.GetUsername()
-	if !strings.Contains(string(jsonKey), user) {
-		grpclog.Fatalf("Got user name %q which is NOT a substring of %q.", user, jsonKey)
-	}
-	grpclog.Println("JWTtokenCreds done")
-}
-
-// GetToken obtains an OAUTH token from the input.
-func GetToken(serviceAccountKeyFile string, oauthScope string) *oauth2.Token {
-	jsonKey := getServiceAccountJSONKey(serviceAccountKeyFile)
-	config, err := google.JWTConfigFromJSON(jsonKey, oauthScope)
-	if err != nil {
-		grpclog.Fatalf("Failed to get the config: %v", err)
-	}
-	token, err := config.TokenSource(context.Background()).Token()
-	if err != nil {
-		grpclog.Fatalf("Failed to get the token: %v", err)
-	}
-	return token
-}
-
-// DoOauth2TokenCreds performs a unary RPC with OAUTH2 token auth.
-func DoOauth2TokenCreds(tc testpb.TestServiceClient, serviceAccountKeyFile, oauthScope string) {
-	pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, largeReqSize)
-	req := &testpb.SimpleRequest{
-		ResponseType:   testpb.PayloadType_COMPRESSABLE.Enum(),
-		ResponseSize:   proto.Int32(int32(largeRespSize)),
-		Payload:        pl,
-		FillUsername:   proto.Bool(true),
-		FillOauthScope: proto.Bool(true),
-	}
-	reply, err := tc.UnaryCall(context.Background(), req)
-	if err != nil {
-		grpclog.Fatal("/TestService/UnaryCall RPC failed: ", err)
-	}
-	jsonKey := getServiceAccountJSONKey(serviceAccountKeyFile)
-	user := reply.GetUsername()
-	scope := reply.GetOauthScope()
-	if !strings.Contains(string(jsonKey), user) {
-		grpclog.Fatalf("Got user name %q which is NOT a substring of %q.", user, jsonKey)
-	}
-	if !strings.Contains(oauthScope, scope) {
-		grpclog.Fatalf("Got OAuth scope %q which is NOT a substring of %q.", scope, oauthScope)
-	}
-	grpclog.Println("Oauth2TokenCreds done")
-}
-
-// DoPerRPCCreds performs a unary RPC with per RPC OAUTH2 token.
-func DoPerRPCCreds(tc testpb.TestServiceClient, serviceAccountKeyFile, oauthScope string) {
-	jsonKey := getServiceAccountJSONKey(serviceAccountKeyFile)
-	pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, largeReqSize)
-	req := &testpb.SimpleRequest{
-		ResponseType:   testpb.PayloadType_COMPRESSABLE.Enum(),
-		ResponseSize:   proto.Int32(int32(largeRespSize)),
-		Payload:        pl,
-		FillUsername:   proto.Bool(true),
-		FillOauthScope: proto.Bool(true),
-	}
-	token := GetToken(serviceAccountKeyFile, oauthScope)
-	kv := map[string]string{"authorization": token.TokenType + " " + token.AccessToken}
-	ctx := metadata.NewContext(context.Background(), metadata.MD{"authorization": []string{kv["authorization"]}})
-	reply, err := tc.UnaryCall(ctx, req)
-	if err != nil {
-		grpclog.Fatal("/TestService/UnaryCall RPC failed: ", err)
-	}
-	user := reply.GetUsername()
-	scope := reply.GetOauthScope()
-	if !strings.Contains(string(jsonKey), user) {
-		grpclog.Fatalf("Got user name %q which is NOT a substring of %q.", user, jsonKey)
-	}
-	if !strings.Contains(oauthScope, scope) {
-		grpclog.Fatalf("Got OAuth scope %q which is NOT a substring of %q.", scope, oauthScope)
-	}
-	grpclog.Println("PerRPCCreds done")
-}
-
-var (
-	testMetadata = metadata.MD{
-		"key1": []string{"value1"},
-		"key2": []string{"value2"},
-	}
-)
-
-// DoCancelAfterBegin cancels the RPC after metadata has been sent but before payloads are sent.
-func DoCancelAfterBegin(tc testpb.TestServiceClient) {
-	ctx, cancel := context.WithCancel(metadata.NewContext(context.Background(), testMetadata))
-	stream, err := tc.StreamingInputCall(ctx)
-	if err != nil {
-		grpclog.Fatalf("%v.StreamingInputCall(_) = _, %v", tc, err)
-	}
-	cancel()
-	_, err = stream.CloseAndRecv()
-	if grpc.Code(err) != codes.Canceled {
-		grpclog.Fatalf("%v.CloseAndRecv() got error code %d, want %d", stream, grpc.Code(err), codes.Canceled)
-	}
-	grpclog.Println("CancelAfterBegin done")
-}
-
-// DoCancelAfterFirstResponse cancels the RPC after receiving the first message from the server.
-func DoCancelAfterFirstResponse(tc testpb.TestServiceClient) {
-	ctx, cancel := context.WithCancel(context.Background())
-	stream, err := tc.FullDuplexCall(ctx)
-	if err != nil {
-		grpclog.Fatalf("%v.FullDuplexCall(_) = _, %v", tc, err)
-	}
-	respParam := []*testpb.ResponseParameters{
-		{
-			Size: proto.Int32(31415),
-		},
-	}
-	pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, 27182)
-	req := &testpb.StreamingOutputCallRequest{
-		ResponseType:       testpb.PayloadType_COMPRESSABLE.Enum(),
-		ResponseParameters: respParam,
-		Payload:            pl,
-	}
-	if err := stream.Send(req); err != nil {
-		grpclog.Fatalf("%v.Send(%v) = %v", stream, req, err)
-	}
-	if _, err := stream.Recv(); err != nil {
-		grpclog.Fatalf("%v.Recv() = %v", stream, err)
-	}
-	cancel()
-	if _, err := stream.Recv(); grpc.Code(err) != codes.Canceled {
-		grpclog.Fatalf("%v compleled with error code %d, want %d", stream, grpc.Code(err), codes.Canceled)
-	}
-	grpclog.Println("CancelAfterFirstResponse done")
-}
-
-type testServer struct {
-}
-
-// NewTestServer creates a test server for test service.
-func NewTestServer() testpb.TestServiceServer {
-	return &testServer{}
-}
-
-func (s *testServer) EmptyCall(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
-	return new(testpb.Empty), nil
-}
-
-func serverNewPayload(t testpb.PayloadType, size int32) (*testpb.Payload, error) {
-	if size < 0 {
-		return nil, fmt.Errorf("requested a response with invalid length %d", size)
-	}
-	body := make([]byte, size)
-	switch t {
-	case testpb.PayloadType_COMPRESSABLE:
-	case testpb.PayloadType_UNCOMPRESSABLE:
-		return nil, fmt.Errorf("payloadType UNCOMPRESSABLE is not supported")
-	default:
-		return nil, fmt.Errorf("unsupported payload type: %d", t)
-	}
-	return &testpb.Payload{
-		Type: t.Enum(),
-		Body: body,
-	}, nil
-}
-
-func (s *testServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*testpb.SimpleResponse, error) {
-	pl, err := serverNewPayload(in.GetResponseType(), in.GetResponseSize())
-	if err != nil {
-		return nil, err
-	}
-	return &testpb.SimpleResponse{
-		Payload: pl,
-	}, nil
-}
-
-func (s *testServer) StreamingOutputCall(args *testpb.StreamingOutputCallRequest, stream testpb.TestService_StreamingOutputCallServer) error {
-	cs := args.GetResponseParameters()
-	for _, c := range cs {
-		if us := c.GetIntervalUs(); us > 0 {
-			time.Sleep(time.Duration(us) * time.Microsecond)
-		}
-		pl, err := serverNewPayload(args.GetResponseType(), c.GetSize())
-		if err != nil {
-			return err
-		}
-		if err := stream.Send(&testpb.StreamingOutputCallResponse{
-			Payload: pl,
-		}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (s *testServer) StreamingInputCall(stream testpb.TestService_StreamingInputCallServer) error {
-	var sum int
-	for {
-		in, err := stream.Recv()
-		if err == io.EOF {
-			return stream.SendAndClose(&testpb.StreamingInputCallResponse{
-				AggregatedPayloadSize: proto.Int32(int32(sum)),
-			})
-		}
-		if err != nil {
-			return err
-		}
-		p := in.GetPayload().GetBody()
-		sum += len(p)
-	}
-}
-
-func (s *testServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServer) error {
-	for {
-		in, err := stream.Recv()
-		if err == io.EOF {
-			// read done.
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-		cs := in.GetResponseParameters()
-		for _, c := range cs {
-			if us := c.GetIntervalUs(); us > 0 {
-				time.Sleep(time.Duration(us) * time.Microsecond)
-			}
-			pl, err := serverNewPayload(in.GetResponseType(), c.GetSize())
-			if err != nil {
-				return err
-			}
-			if err := stream.Send(&testpb.StreamingOutputCallResponse{
-				Payload: pl,
-			}); err != nil {
-				return err
-			}
-		}
-	}
-}
-
-func (s *testServer) HalfDuplexCall(stream testpb.TestService_HalfDuplexCallServer) error {
-	var msgBuf []*testpb.StreamingOutputCallRequest
-	for {
-		in, err := stream.Recv()
-		if err == io.EOF {
-			// read done.
-			break
-		}
-		if err != nil {
-			return err
-		}
-		msgBuf = append(msgBuf, in)
-	}
-	for _, m := range msgBuf {
-		cs := m.GetResponseParameters()
-		for _, c := range cs {
-			if us := c.GetIntervalUs(); us > 0 {
-				time.Sleep(time.Duration(us) * time.Microsecond)
-			}
-			pl, err := serverNewPayload(m.GetResponseType(), c.GetSize())
-			if err != nil {
-				return err
-			}
-			if err := stream.Send(&testpb.StreamingOutputCallResponse{
-				Payload: pl,
-			}); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go b/Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go
deleted file mode 100644
index 58469ddd3f..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/metadata/metadata.go
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-// Package metadata define the structure of the metadata supported by gRPC library.
-package metadata
-
-import (
-	"encoding/base64"
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-)
-
-const (
-	binHdrSuffix = "-bin"
-)
-
-// encodeKeyValue encodes key and value qualified for transmission via gRPC.
-// Transmitting binary headers violates HTTP/2 spec.
-// TODO(zhaoq): Maybe check if k is ASCII also.
-func encodeKeyValue(k, v string) (string, string) {
-	k = strings.ToLower(k)
-	if strings.HasSuffix(k, binHdrSuffix) {
-		val := base64.StdEncoding.EncodeToString([]byte(v))
-		v = string(val)
-	}
-	return k, v
-}
-
-// DecodeKeyValue returns the original key and value corresponding to the
-// encoded data in k, v.
-func DecodeKeyValue(k, v string) (string, string, error) {
-	if !strings.HasSuffix(k, binHdrSuffix) {
-		return k, v, nil
-	}
-	val, err := base64.StdEncoding.DecodeString(v)
-	if err != nil {
-		return "", "", err
-	}
-	return k, string(val), nil
-}
-
-// MD is a mapping from metadata keys to values. Users should use the following
-// two convenience functions New and Pairs to generate MD.
-type MD map[string][]string
-
-// New creates a MD from given key-value map.
-func New(m map[string]string) MD {
-	md := MD{}
-	for k, v := range m {
-		key, val := encodeKeyValue(k, v)
-		md[key] = append(md[key], val)
-	}
-	return md
-}
-
-// Pairs returns an MD formed by the mapping of key, value ...
-// Pairs panics if len(kv) is odd.
-func Pairs(kv ...string) MD {
-	if len(kv)%2 == 1 {
-		panic(fmt.Sprintf("metadata: Pairs got the odd number of input pairs for metadata: %d", len(kv)))
-	}
-	md := MD{}
-	var k string
-	for i, s := range kv {
-		if i%2 == 0 {
-			k = s
-			continue
-		}
-		key, val := encodeKeyValue(k, s)
-		md[key] = append(md[key], val)
-	}
-	return md
-}
-
-// Len returns the number of items in md.
-func (md MD) Len() int {
-	return len(md)
-}
-
-// Copy returns a copy of md.
-func (md MD) Copy() MD {
-	out := MD{}
-	for k, v := range md {
-		for _, i := range v {
-			out[k] = append(out[k], i)
-		}
-	}
-	return out
-}
-
-type mdKey struct{}
-
-// NewContext creates a new context with md attached.
-func NewContext(ctx context.Context, md MD) context.Context {
-	return context.WithValue(ctx, mdKey{}, md)
-}
-
-// FromContext returns the MD in ctx if it exists.
-func FromContext(ctx context.Context) (md MD, ok bool) {
-	md, ok = ctx.Value(mdKey{}).(MD)
-	return
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/naming/naming.go b/Godeps/_workspace/src/google.golang.org/grpc/naming/naming.go
deleted file mode 100644
index 06605607c3..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/naming/naming.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-// Package naming defines the naming API and related data structures for gRPC.
-// The interface is EXPERIMENTAL and may be suject to change.
-package naming
-
-// Operation defines the corresponding operations for a name resolution change.
-type Operation uint8
-
-const (
-	// Add indicates a new address is added.
-	Add Operation = iota
-	// Delete indicates an exisiting address is deleted.
-	Delete
-)
-
-// Update defines a name resolution update. Notice that it is not valid having both
-// empty string Addr and nil Metadata in an Update.
-type Update struct {
-	// Op indicates the operation of the update.
-	Op Operation
-	// Addr is the updated address. It is empty string if there is no address update.
-	Addr string
-	// Metadata is the updated metadata. It is nil if there is no metadata update.
-	// Metadata is not required for a custom naming implementation.
-	Metadata interface{}
-}
-
-// Resolver creates a Watcher for a target to track its resolution changes.
-type Resolver interface {
-	// Resolve creates a Watcher for target.
-	Resolve(target string) (Watcher, error)
-}
-
-// Watcher watches for the updates on the specified target.
-type Watcher interface {
-	// Next blocks until an update or error happens. It may return one or more
-	// updates. The first call should get the full set of the results.
-	Next() ([]*Update, error)
-	// Close closes the Watcher.
-	Close()
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/peer/peer.go b/Godeps/_workspace/src/google.golang.org/grpc/peer/peer.go
deleted file mode 100644
index bfa6205ba9..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/peer/peer.go
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-// Package peer defines various peer information associated with RPCs and
-// corresponding utils.
-package peer
-
-import (
-	"net"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc/credentials"
-)
-
-// Peer contains the information of the peer for an RPC.
-type Peer struct {
-	// Addr is the peer address.
-	Addr net.Addr
-	// AuthInfo is the authentication information of the transport.
-	// It is nil if there is no transport security being used.
-	AuthInfo credentials.AuthInfo
-}
-
-type peerKey struct{}
-
-// NewContext creates a new context with peer information attached.
-func NewContext(ctx context.Context, p *Peer) context.Context {
-	return context.WithValue(ctx, peerKey{}, p)
-}
-
-// FromContext returns the peer information in ctx if it exists.
-func FromContext(ctx context.Context) (p *Peer, ok bool) {
-	p, ok = ctx.Value(peerKey{}).(*Peer)
-	return
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/picker.go b/Godeps/_workspace/src/google.golang.org/grpc/picker.go
deleted file mode 100644
index 50f315b44f..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/picker.go
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package grpc
-
-import (
-	"container/list"
-	"fmt"
-	"sync"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/naming"
-	"google.golang.org/grpc/transport"
-)
-
-// Picker picks a Conn for RPC requests.
-// This is EXPERIMENTAL and please do not implement your own Picker for now.
-type Picker interface {
-	// Init does initial processing for the Picker, e.g., initiate some connections.
-	Init(cc *ClientConn) error
-	// Pick blocks until either a transport.ClientTransport is ready for the upcoming RPC
-	// or some error happens.
-	Pick(ctx context.Context) (transport.ClientTransport, error)
-	// PickAddr picks a peer address for connecting. This will be called repeated for
-	// connecting/reconnecting.
-	PickAddr() (string, error)
-	// State returns the connectivity state of the underlying connections.
-	State() (ConnectivityState, error)
-	// WaitForStateChange blocks until the state changes to something other than
-	// the sourceState. It returns the new state or error.
-	WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error)
-	// Close closes all the Conn's owned by this Picker.
-	Close() error
-}
-
-// unicastPicker is the default Picker which is used when there is no custom Picker
-// specified by users. It always picks the same Conn.
-type unicastPicker struct {
-	target string
-	conn   *Conn
-}
-
-func (p *unicastPicker) Init(cc *ClientConn) error {
-	c, err := NewConn(cc)
-	if err != nil {
-		return err
-	}
-	p.conn = c
-	return nil
-}
-
-func (p *unicastPicker) Pick(ctx context.Context) (transport.ClientTransport, error) {
-	return p.conn.Wait(ctx)
-}
-
-func (p *unicastPicker) PickAddr() (string, error) {
-	return p.target, nil
-}
-
-func (p *unicastPicker) State() (ConnectivityState, error) {
-	return p.conn.State(), nil
-}
-
-func (p *unicastPicker) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
-	return p.conn.WaitForStateChange(ctx, sourceState)
-}
-
-func (p *unicastPicker) Close() error {
-	if p.conn != nil {
-		return p.conn.Close()
-	}
-	return nil
-}
-
-// unicastNamingPicker picks an address from a name resolver to set up the connection.
-type unicastNamingPicker struct {
-	cc       *ClientConn
-	resolver naming.Resolver
-	watcher  naming.Watcher
-	mu       sync.Mutex
-	// The list of the addresses are obtained from watcher.
-	addrs *list.List
-	// It tracks the current picked addr by PickAddr(). The next PickAddr may
-	// push it forward on addrs.
-	pickedAddr *list.Element
-	conn       *Conn
-}
-
-// NewUnicastNamingPicker creates a Picker to pick addresses from a name resolver
-// to connect.
-func NewUnicastNamingPicker(r naming.Resolver) Picker {
-	return &unicastNamingPicker{
-		resolver: r,
-		addrs:    list.New(),
-	}
-}
-
-type addrInfo struct {
-	addr string
-	// Set to true if this addrInfo needs to be deleted in the next PickAddrr() call.
-	deleting bool
-}
-
-// processUpdates calls Watcher.Next() once and processes the obtained updates.
-func (p *unicastNamingPicker) processUpdates() error {
-	updates, err := p.watcher.Next()
-	if err != nil {
-		return err
-	}
-	for _, update := range updates {
-		switch update.Op {
-		case naming.Add:
-			p.mu.Lock()
-			p.addrs.PushBack(&addrInfo{
-				addr: update.Addr,
-			})
-			p.mu.Unlock()
-			// Initial connection setup
-			if p.conn == nil {
-				conn, err := NewConn(p.cc)
-				if err != nil {
-					return err
-				}
-				p.conn = conn
-			}
-		case naming.Delete:
-			p.mu.Lock()
-			for e := p.addrs.Front(); e != nil; e = e.Next() {
-				if update.Addr == e.Value.(*addrInfo).addr {
-					if e == p.pickedAddr {
-						// Do not remove the element now if it is the current picked
-						// one. We leave the deletion to the next PickAddr() call.
-						e.Value.(*addrInfo).deleting = true
-						// Notify Conn to close it. All the live RPCs on this connection
-						// will be aborted.
-						p.conn.NotifyReset()
-					} else {
-						p.addrs.Remove(e)
-					}
-				}
-			}
-			p.mu.Unlock()
-		default:
-			grpclog.Println("Unknown update.Op ", update.Op)
-		}
-	}
-	return nil
-}
-
-// monitor runs in a standalone goroutine to keep watching name resolution updates until the watcher
-// is closed.
-func (p *unicastNamingPicker) monitor() {
-	for {
-		if err := p.processUpdates(); err != nil {
-			return
-		}
-	}
-}
-
-func (p *unicastNamingPicker) Init(cc *ClientConn) error {
-	w, err := p.resolver.Resolve(cc.target)
-	if err != nil {
-		return err
-	}
-	p.watcher = w
-	p.cc = cc
-	// Get the initial name resolution.
-	if err := p.processUpdates(); err != nil {
-		return err
-	}
-	go p.monitor()
-	return nil
-}
-
-func (p *unicastNamingPicker) Pick(ctx context.Context) (transport.ClientTransport, error) {
-	return p.conn.Wait(ctx)
-}
-
-func (p *unicastNamingPicker) PickAddr() (string, error) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.pickedAddr == nil {
-		p.pickedAddr = p.addrs.Front()
-	} else {
-		pa := p.pickedAddr
-		p.pickedAddr = pa.Next()
-		if pa.Value.(*addrInfo).deleting {
-			p.addrs.Remove(pa)
-		}
-		if p.pickedAddr == nil {
-			p.pickedAddr = p.addrs.Front()
-		}
-	}
-	if p.pickedAddr == nil {
-		return "", fmt.Errorf("there is no address available to pick")
-	}
-	return p.pickedAddr.Value.(*addrInfo).addr, nil
-}
-
-func (p *unicastNamingPicker) State() (ConnectivityState, error) {
-	return 0, fmt.Errorf("State() is not supported for unicastNamingPicker")
-}
-
-func (p *unicastNamingPicker) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
-	return 0, fmt.Errorf("WaitForStateChange is not supported for unicastNamingPciker")
-}
-
-func (p *unicastNamingPicker) Close() error {
-	p.watcher.Close()
-	p.conn.Close()
-	return nil
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go b/Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go
deleted file mode 100644
index e6b2236811..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/rpc_util.go
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package grpc
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-	"math"
-	"math/rand"
-	"os"
-	"time"
-
-	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/transport"
-)
-
-// Codec defines the interface gRPC uses to encode and decode messages.
-type Codec interface {
-	// Marshal returns the wire format of v.
-	Marshal(v interface{}) ([]byte, error)
-	// Unmarshal parses the wire format into v.
-	Unmarshal(data []byte, v interface{}) error
-	// String returns the name of the Codec implementation. The returned
-	// string will be used as part of content type in transmission.
-	String() string
-}
-
-// protoCodec is a Codec implemetation with protobuf. It is the default codec for gRPC.
-type protoCodec struct{}
-
-func (protoCodec) Marshal(v interface{}) ([]byte, error) {
-	return proto.Marshal(v.(proto.Message))
-}
-
-func (protoCodec) Unmarshal(data []byte, v interface{}) error {
-	return proto.Unmarshal(data, v.(proto.Message))
-}
-
-func (protoCodec) String() string {
-	return "proto"
-}
-
-// callInfo contains all related configuration and information about an RPC.
-type callInfo struct {
-	failFast  bool
-	headerMD  metadata.MD
-	trailerMD metadata.MD
-	traceInfo traceInfo // in trace.go
-}
-
-// CallOption configures a Call before it starts or extracts information from
-// a Call after it completes.
-type CallOption interface {
-	// before is called before the call is sent to any server.  If before
-	// returns a non-nil error, the RPC fails with that error.
-	before(*callInfo) error
-
-	// after is called after the call has completed.  after cannot return an
-	// error, so any failures should be reported via output parameters.
-	after(*callInfo)
-}
-
-type beforeCall func(c *callInfo) error
-
-func (o beforeCall) before(c *callInfo) error { return o(c) }
-func (o beforeCall) after(c *callInfo)        {}
-
-type afterCall func(c *callInfo)
-
-func (o afterCall) before(c *callInfo) error { return nil }
-func (o afterCall) after(c *callInfo)        { o(c) }
-
-// Header returns a CallOptions that retrieves the header metadata
-// for a unary RPC.
-func Header(md *metadata.MD) CallOption {
-	return afterCall(func(c *callInfo) {
-		*md = c.headerMD
-	})
-}
-
-// Trailer returns a CallOptions that retrieves the trailer metadata
-// for a unary RPC.
-func Trailer(md *metadata.MD) CallOption {
-	return afterCall(func(c *callInfo) {
-		*md = c.trailerMD
-	})
-}
-
-// The format of the payload: compressed or not?
-type payloadFormat uint8
-
-const (
-	compressionNone payloadFormat = iota // no compression
-	compressionFlate
-	// More formats
-)
-
-// parser reads complelete gRPC messages from the underlying reader.
-type parser struct {
-	s io.Reader
-}
-
-// recvMsg is to read a complete gRPC message from the stream. It is blocking if
-// the message has not been complete yet. It returns the message and its type,
-// EOF is returned with nil msg and 0 pf if the entire stream is done. Other
-// non-nil error is returned if something is wrong on reading.
-func (p *parser) recvMsg() (pf payloadFormat, msg []byte, err error) {
-	// The header of a gRPC message. Find more detail
-	// at http://www.grpc.io/docs/guides/wire.html.
-	var buf [5]byte
-
-	if _, err := io.ReadFull(p.s, buf[:]); err != nil {
-		return 0, nil, err
-	}
-
-	pf = payloadFormat(buf[0])
-	length := binary.BigEndian.Uint32(buf[1:])
-
-	if length == 0 {
-		return pf, nil, nil
-	}
-	msg = make([]byte, int(length))
-	if _, err := io.ReadFull(p.s, msg); err != nil {
-		if err == io.EOF {
-			err = io.ErrUnexpectedEOF
-		}
-		return 0, nil, err
-	}
-	return pf, msg, nil
-}
-
-// encode serializes msg and prepends the message header. If msg is nil, it
-// generates the message header of 0 message length.
-func encode(c Codec, msg interface{}, pf payloadFormat) ([]byte, error) {
-	var b []byte
-	var length uint
-	if msg != nil {
-		var err error
-		// TODO(zhaoq): optimize to reduce memory alloc and copying.
-		b, err = c.Marshal(msg)
-		if err != nil {
-			return nil, err
-		}
-		length = uint(len(b))
-	}
-	if length > math.MaxUint32 {
-		return nil, Errorf(codes.InvalidArgument, "grpc: message too large (%d bytes)", length)
-	}
-
-	const (
-		payloadLen = 1
-		sizeLen    = 4
-	)
-
-	var buf = make([]byte, payloadLen+sizeLen+len(b))
-
-	// Write payload format
-	buf[0] = byte(pf)
-	// Write length of b into buf
-	binary.BigEndian.PutUint32(buf[1:], uint32(length))
-	// Copy encoded msg to buf
-	copy(buf[5:], b)
-
-	return buf, nil
-}
-
-func recv(p *parser, c Codec, m interface{}) error {
-	pf, d, err := p.recvMsg()
-	if err != nil {
-		return err
-	}
-	switch pf {
-	case compressionNone:
-		if err := c.Unmarshal(d, m); err != nil {
-			if rErr, ok := err.(rpcError); ok {
-				return rErr
-			} else {
-				return Errorf(codes.Internal, "grpc: %v", err)
-			}
-		}
-	default:
-		return Errorf(codes.Internal, "gprc: compression is not supported yet.")
-	}
-	return nil
-}
-
-// rpcError defines the status from an RPC.
-type rpcError struct {
-	code codes.Code
-	desc string
-}
-
-func (e rpcError) Error() string {
-	return fmt.Sprintf("rpc error: code = %d desc = %q", e.code, e.desc)
-}
-
-// Code returns the error code for err if it was produced by the rpc system.
-// Otherwise, it returns codes.Unknown.
-func Code(err error) codes.Code {
-	if err == nil {
-		return codes.OK
-	}
-	if e, ok := err.(rpcError); ok {
-		return e.code
-	}
-	return codes.Unknown
-}
-
-// ErrorDesc returns the error description of err if it was produced by the rpc system.
-// Otherwise, it returns err.Error() or empty string when err is nil.
-func ErrorDesc(err error) string {
-	if err == nil {
-		return ""
-	}
-	if e, ok := err.(rpcError); ok {
-		return e.desc
-	}
-	return err.Error()
-}
-
-// Errorf returns an error containing an error code and a description;
-// Errorf returns nil if c is OK.
-func Errorf(c codes.Code, format string, a ...interface{}) error {
-	if c == codes.OK {
-		return nil
-	}
-	return rpcError{
-		code: c,
-		desc: fmt.Sprintf(format, a...),
-	}
-}
-
-// toRPCErr converts an error into a rpcError.
-func toRPCErr(err error) error {
-	switch e := err.(type) {
-	case rpcError:
-		return err
-	case transport.StreamError:
-		return rpcError{
-			code: e.Code,
-			desc: e.Desc,
-		}
-	case transport.ConnectionError:
-		return rpcError{
-			code: codes.Internal,
-			desc: e.Desc,
-		}
-	}
-	return Errorf(codes.Unknown, "%v", err)
-}
-
-// convertCode converts a standard Go error into its canonical code. Note that
-// this is only used to translate the error returned by the server applications.
-func convertCode(err error) codes.Code {
-	switch err {
-	case nil:
-		return codes.OK
-	case io.EOF:
-		return codes.OutOfRange
-	case io.ErrClosedPipe, io.ErrNoProgress, io.ErrShortBuffer, io.ErrShortWrite, io.ErrUnexpectedEOF:
-		return codes.FailedPrecondition
-	case os.ErrInvalid:
-		return codes.InvalidArgument
-	case context.Canceled:
-		return codes.Canceled
-	case context.DeadlineExceeded:
-		return codes.DeadlineExceeded
-	}
-	switch {
-	case os.IsExist(err):
-		return codes.AlreadyExists
-	case os.IsNotExist(err):
-		return codes.NotFound
-	case os.IsPermission(err):
-		return codes.PermissionDenied
-	}
-	return codes.Unknown
-}
-
-const (
-	// how long to wait after the first failure before retrying
-	baseDelay = 1.0 * time.Second
-	// upper bound of backoff delay
-	maxDelay = 120 * time.Second
-	// backoff increases by this factor on each retry
-	backoffFactor = 1.6
-	// backoff is randomized downwards by this factor
-	backoffJitter = 0.2
-)
-
-func backoff(retries int) (t time.Duration) {
-	if retries == 0 {
-		return baseDelay
-	}
-	backoff, max := float64(baseDelay), float64(maxDelay)
-	for backoff < max && retries > 0 {
-		backoff *= backoffFactor
-		retries--
-	}
-	if backoff > max {
-		backoff = max
-	}
-	// Randomize backoff delays so that if a cluster of requests start at
-	// the same time, they won't operate in lockstep.
-	backoff *= 1 + backoffJitter*(rand.Float64()*2-1)
-	if backoff < 0 {
-		return 0
-	}
-	return time.Duration(backoff)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/server.go b/Godeps/_workspace/src/google.golang.org/grpc/server.go
deleted file mode 100644
index 655e7d865e..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/server.go
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package grpc
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"reflect"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-	"golang.org/x/net/trace"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/transport"
-)
-
-type methodHandler func(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error)
-
-// MethodDesc represents an RPC service's method specification.
-type MethodDesc struct {
-	MethodName string
-	Handler    methodHandler
-}
-
-// ServiceDesc represents an RPC service's specification.
-type ServiceDesc struct {
-	ServiceName string
-	// The pointer to the service interface. Used to check whether the user
-	// provided implementation satisfies the interface requirements.
-	HandlerType interface{}
-	Methods     []MethodDesc
-	Streams     []StreamDesc
-}
-
-// service consists of the information of the server serving this service and
-// the methods in this service.
-type service struct {
-	server interface{} // the server for service methods
-	md     map[string]*MethodDesc
-	sd     map[string]*StreamDesc
-}
-
-// Server is a gRPC server to serve RPC requests.
-type Server struct {
-	opts   options
-	mu     sync.Mutex
-	lis    map[net.Listener]bool
-	conns  map[transport.ServerTransport]bool
-	m      map[string]*service // service name -> service info
-	events trace.EventLog
-}
-
-type options struct {
-	creds                credentials.Credentials
-	codec                Codec
-	maxConcurrentStreams uint32
-}
-
-// A ServerOption sets options.
-type ServerOption func(*options)
-
-// CustomCodec returns a ServerOption that sets a codec for message marshaling and unmarshaling.
-func CustomCodec(codec Codec) ServerOption {
-	return func(o *options) {
-		o.codec = codec
-	}
-}
-
-// MaxConcurrentStreams returns a ServerOption that will apply a limit on the number
-// of concurrent streams to each ServerTransport.
-func MaxConcurrentStreams(n uint32) ServerOption {
-	return func(o *options) {
-		o.maxConcurrentStreams = n
-	}
-}
-
-// Creds returns a ServerOption that sets credentials for server connections.
-func Creds(c credentials.Credentials) ServerOption {
-	return func(o *options) {
-		o.creds = c
-	}
-}
-
-// NewServer creates a gRPC server which has no service registered and has not
-// started to accept requests yet.
-func NewServer(opt ...ServerOption) *Server {
-	var opts options
-	for _, o := range opt {
-		o(&opts)
-	}
-	if opts.codec == nil {
-		// Set the default codec.
-		opts.codec = protoCodec{}
-	}
-	s := &Server{
-		lis:   make(map[net.Listener]bool),
-		opts:  opts,
-		conns: make(map[transport.ServerTransport]bool),
-		m:     make(map[string]*service),
-	}
-	if EnableTracing {
-		_, file, line, _ := runtime.Caller(1)
-		s.events = trace.NewEventLog("grpc.Server", fmt.Sprintf("%s:%d", file, line))
-	}
-	return s
-}
-
-// printf records an event in s's event log, unless s has been stopped.
-// REQUIRES s.mu is held.
-func (s *Server) printf(format string, a ...interface{}) {
-	if s.events != nil {
-		s.events.Printf(format, a...)
-	}
-}
-
-// errorf records an error in s's event log, unless s has been stopped.
-// REQUIRES s.mu is held.
-func (s *Server) errorf(format string, a ...interface{}) {
-	if s.events != nil {
-		s.events.Errorf(format, a...)
-	}
-}
-
-// RegisterService register a service and its implementation to the gRPC
-// server. Called from the IDL generated code. This must be called before
-// invoking Serve.
-func (s *Server) RegisterService(sd *ServiceDesc, ss interface{}) {
-	ht := reflect.TypeOf(sd.HandlerType).Elem()
-	st := reflect.TypeOf(ss)
-	if !st.Implements(ht) {
-		grpclog.Fatalf("grpc: Server.RegisterService found the handler of type %v that does not satisfy %v", st, ht)
-	}
-	s.register(sd, ss)
-}
-
-func (s *Server) register(sd *ServiceDesc, ss interface{}) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.printf("RegisterService(%q)", sd.ServiceName)
-	if _, ok := s.m[sd.ServiceName]; ok {
-		grpclog.Fatalf("grpc: Server.RegisterService found duplicate service registration for %q", sd.ServiceName)
-	}
-	srv := &service{
-		server: ss,
-		md:     make(map[string]*MethodDesc),
-		sd:     make(map[string]*StreamDesc),
-	}
-	for i := range sd.Methods {
-		d := &sd.Methods[i]
-		srv.md[d.MethodName] = d
-	}
-	for i := range sd.Streams {
-		d := &sd.Streams[i]
-		srv.sd[d.StreamName] = d
-	}
-	s.m[sd.ServiceName] = srv
-}
-
-var (
-	// ErrServerStopped indicates that the operation is now illegal because of
-	// the server being stopped.
-	ErrServerStopped = errors.New("grpc: the server has been stopped")
-)
-
-// Serve accepts incoming connections on the listener lis, creating a new
-// ServerTransport and service goroutine for each. The service goroutines
-// read gRPC request and then call the registered handlers to reply to them.
-// Service returns when lis.Accept fails.
-func (s *Server) Serve(lis net.Listener) error {
-	s.mu.Lock()
-	s.printf("serving")
-	if s.lis == nil {
-		s.mu.Unlock()
-		return ErrServerStopped
-	}
-	s.lis[lis] = true
-	s.mu.Unlock()
-	defer func() {
-		lis.Close()
-		s.mu.Lock()
-		delete(s.lis, lis)
-		s.mu.Unlock()
-	}()
-	for {
-		c, err := lis.Accept()
-		if err != nil {
-			s.mu.Lock()
-			s.printf("done serving; Accept = %v", err)
-			s.mu.Unlock()
-			return err
-		}
-		var authInfo credentials.AuthInfo
-		if creds, ok := s.opts.creds.(credentials.TransportAuthenticator); ok {
-			var conn net.Conn
-			conn, authInfo, err = creds.ServerHandshake(c)
-			if err != nil {
-				s.mu.Lock()
-				s.errorf("ServerHandshake(%q) failed: %v", c.RemoteAddr(), err)
-				s.mu.Unlock()
-				grpclog.Println("grpc: Server.Serve failed to complete security handshake.")
-				continue
-			}
-			c = conn
-		}
-		s.mu.Lock()
-		if s.conns == nil {
-			s.mu.Unlock()
-			c.Close()
-			return nil
-		}
-		st, err := transport.NewServerTransport("http2", c, s.opts.maxConcurrentStreams, authInfo)
-		if err != nil {
-			s.errorf("NewServerTransport(%q) failed: %v", c.RemoteAddr(), err)
-			s.mu.Unlock()
-			c.Close()
-			grpclog.Println("grpc: Server.Serve failed to create ServerTransport: ", err)
-			continue
-		}
-		s.conns[st] = true
-		s.mu.Unlock()
-
-		go func() {
-			var wg sync.WaitGroup
-			st.HandleStreams(func(stream *transport.Stream) {
-				var trInfo *traceInfo
-				if EnableTracing {
-					trInfo = &traceInfo{
-						tr: trace.New("grpc.Recv."+methodFamily(stream.Method()), stream.Method()),
-					}
-					trInfo.firstLine.client = false
-					trInfo.firstLine.remoteAddr = st.RemoteAddr()
-					stream.TraceContext(trInfo.tr)
-					if dl, ok := stream.Context().Deadline(); ok {
-						trInfo.firstLine.deadline = dl.Sub(time.Now())
-					}
-				}
-				wg.Add(1)
-				go func() {
-					s.handleStream(st, stream, trInfo)
-					wg.Done()
-				}()
-			})
-			wg.Wait()
-			s.mu.Lock()
-			delete(s.conns, st)
-			s.mu.Unlock()
-		}()
-	}
-}
-
-func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Stream, msg interface{}, pf payloadFormat, opts *transport.Options) error {
-	p, err := encode(s.opts.codec, msg, pf)
-	if err != nil {
-		// This typically indicates a fatal issue (e.g., memory
-		// corruption or hardware faults) the application program
-		// cannot handle.
-		//
-		// TODO(zhaoq): There exist other options also such as only closing the
-		// faulty stream locally and remotely (Other streams can keep going). Find
-		// the optimal option.
-		grpclog.Fatalf("grpc: Server failed to encode response %v", err)
-	}
-	return t.Write(stream, p, opts)
-}
-
-func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, md *MethodDesc, trInfo *traceInfo) (err error) {
-	if trInfo != nil {
-		defer trInfo.tr.Finish()
-		trInfo.firstLine.client = false
-		trInfo.tr.LazyLog(&trInfo.firstLine, false)
-		defer func() {
-			if err != nil && err != io.EOF {
-				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
-				trInfo.tr.SetError()
-			}
-		}()
-	}
-	p := &parser{s: stream}
-	for {
-		pf, req, err := p.recvMsg()
-		if err == io.EOF {
-			// The entire stream is done (for unary RPC only).
-			return err
-		}
-		if err != nil {
-			switch err := err.(type) {
-			case transport.ConnectionError:
-				// Nothing to do here.
-			case transport.StreamError:
-				if err := t.WriteStatus(stream, err.Code, err.Desc); err != nil {
-					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status: %v", err)
-				}
-			default:
-				panic(fmt.Sprintf("grpc: Unexpected error (%T) from recvMsg: %v", err, err))
-			}
-			return err
-		}
-		switch pf {
-		case compressionNone:
-			statusCode := codes.OK
-			statusDesc := ""
-			df := func(v interface{}) error {
-				if err := s.opts.codec.Unmarshal(req, v); err != nil {
-					return err
-				}
-				if trInfo != nil {
-					trInfo.tr.LazyLog(&payload{sent: false, msg: v}, true)
-				}
-				return nil
-			}
-			reply, appErr := md.Handler(srv.server, stream.Context(), df)
-			if appErr != nil {
-				if err, ok := appErr.(rpcError); ok {
-					statusCode = err.code
-					statusDesc = err.desc
-				} else {
-					statusCode = convertCode(appErr)
-					statusDesc = appErr.Error()
-				}
-				if trInfo != nil && statusCode != codes.OK {
-					trInfo.tr.LazyLog(stringer(statusDesc), true)
-					trInfo.tr.SetError()
-				}
-
-				if err := t.WriteStatus(stream, statusCode, statusDesc); err != nil {
-					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status: %v", err)
-					return err
-				}
-				return nil
-			}
-			if trInfo != nil {
-				trInfo.tr.LazyLog(stringer("OK"), false)
-			}
-			opts := &transport.Options{
-				Last:  true,
-				Delay: false,
-			}
-			if err := s.sendResponse(t, stream, reply, compressionNone, opts); err != nil {
-				switch err := err.(type) {
-				case transport.ConnectionError:
-					// Nothing to do here.
-				case transport.StreamError:
-					statusCode = err.Code
-					statusDesc = err.Desc
-				default:
-					statusCode = codes.Unknown
-					statusDesc = err.Error()
-				}
-				return err
-			}
-			if trInfo != nil {
-				trInfo.tr.LazyLog(&payload{sent: true, msg: reply}, true)
-			}
-			return t.WriteStatus(stream, statusCode, statusDesc)
-		default:
-			panic(fmt.Sprintf("payload format to be supported: %d", pf))
-		}
-	}
-}
-
-func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, sd *StreamDesc, trInfo *traceInfo) (err error) {
-	ss := &serverStream{
-		t:      t,
-		s:      stream,
-		p:      &parser{s: stream},
-		codec:  s.opts.codec,
-		trInfo: trInfo,
-	}
-	if trInfo != nil {
-		trInfo.tr.LazyLog(&trInfo.firstLine, false)
-		defer func() {
-			ss.mu.Lock()
-			if err != nil && err != io.EOF {
-				ss.trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
-				ss.trInfo.tr.SetError()
-			}
-			ss.trInfo.tr.Finish()
-			ss.trInfo.tr = nil
-			ss.mu.Unlock()
-		}()
-	}
-	if appErr := sd.Handler(srv.server, ss); appErr != nil {
-		if err, ok := appErr.(rpcError); ok {
-			ss.statusCode = err.code
-			ss.statusDesc = err.desc
-		} else {
-			ss.statusCode = convertCode(appErr)
-			ss.statusDesc = appErr.Error()
-		}
-	}
-	if trInfo != nil {
-		ss.mu.Lock()
-		if ss.statusCode != codes.OK {
-			ss.trInfo.tr.LazyLog(stringer(ss.statusDesc), true)
-			ss.trInfo.tr.SetError()
-		} else {
-			ss.trInfo.tr.LazyLog(stringer("OK"), false)
-		}
-		ss.mu.Unlock()
-	}
-	return t.WriteStatus(ss.s, ss.statusCode, ss.statusDesc)
-
-}
-
-func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Stream, trInfo *traceInfo) {
-	sm := stream.Method()
-	if sm != "" && sm[0] == '/' {
-		sm = sm[1:]
-	}
-	pos := strings.LastIndex(sm, "/")
-	if pos == -1 {
-		if trInfo != nil {
-			trInfo.tr.LazyLog(&fmtStringer{"Malformed method name %q", []interface{}{sm}}, true)
-			trInfo.tr.SetError()
-		}
-		if err := t.WriteStatus(stream, codes.InvalidArgument, fmt.Sprintf("malformed method name: %q", stream.Method())); err != nil {
-			if trInfo != nil {
-				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
-				trInfo.tr.SetError()
-			}
-			grpclog.Printf("grpc: Server.handleStream failed to write status: %v", err)
-		}
-		if trInfo != nil {
-			trInfo.tr.Finish()
-		}
-		return
-	}
-	service := sm[:pos]
-	method := sm[pos+1:]
-	srv, ok := s.m[service]
-	if !ok {
-		if trInfo != nil {
-			trInfo.tr.LazyLog(&fmtStringer{"Unknown service %v", []interface{}{service}}, true)
-			trInfo.tr.SetError()
-		}
-		if err := t.WriteStatus(stream, codes.Unimplemented, fmt.Sprintf("unknown service %v", service)); err != nil {
-			if trInfo != nil {
-				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
-				trInfo.tr.SetError()
-			}
-			grpclog.Printf("grpc: Server.handleStream failed to write status: %v", err)
-		}
-		if trInfo != nil {
-			trInfo.tr.Finish()
-		}
-		return
-	}
-	// Unary RPC or Streaming RPC?
-	if md, ok := srv.md[method]; ok {
-		s.processUnaryRPC(t, stream, srv, md, trInfo)
-		return
-	}
-	if sd, ok := srv.sd[method]; ok {
-		s.processStreamingRPC(t, stream, srv, sd, trInfo)
-		return
-	}
-	if trInfo != nil {
-		trInfo.tr.LazyLog(&fmtStringer{"Unknown method %v", []interface{}{method}}, true)
-		trInfo.tr.SetError()
-	}
-	if err := t.WriteStatus(stream, codes.Unimplemented, fmt.Sprintf("unknown method %v", method)); err != nil {
-		if trInfo != nil {
-			trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
-			trInfo.tr.SetError()
-		}
-		grpclog.Printf("grpc: Server.handleStream failed to write status: %v", err)
-	}
-	if trInfo != nil {
-		trInfo.tr.Finish()
-	}
-}
-
-// Stop stops the gRPC server. Once Stop returns, the server stops accepting
-// connection requests and closes all the connected connections.
-func (s *Server) Stop() {
-	s.mu.Lock()
-	listeners := s.lis
-	s.lis = nil
-	cs := s.conns
-	s.conns = nil
-	s.mu.Unlock()
-	for lis := range listeners {
-		lis.Close()
-	}
-	for c := range cs {
-		c.Close()
-	}
-	s.mu.Lock()
-	if s.events != nil {
-		s.events.Finish()
-		s.events = nil
-	}
-	s.mu.Unlock()
-}
-
-// TestingCloseConns closes all exiting transports but keeps s.lis accepting new
-// connections. This is for test only now.
-func (s *Server) TestingCloseConns() {
-	s.mu.Lock()
-	for c := range s.conns {
-		c.Close()
-	}
-	s.conns = make(map[transport.ServerTransport]bool)
-	s.mu.Unlock()
-}
-
-// SendHeader sends header metadata. It may be called at most once from a unary
-// RPC handler. The ctx is the RPC handler's Context or one derived from it.
-func SendHeader(ctx context.Context, md metadata.MD) error {
-	if md.Len() == 0 {
-		return nil
-	}
-	stream, ok := transport.StreamFromContext(ctx)
-	if !ok {
-		return fmt.Errorf("grpc: failed to fetch the stream from the context %v", ctx)
-	}
-	t := stream.ServerTransport()
-	if t == nil {
-		grpclog.Fatalf("grpc: SendHeader: %v has no ServerTransport to send header metadata.", stream)
-	}
-	return t.WriteHeader(stream, md)
-}
-
-// SetTrailer sets the trailer metadata that will be sent when an RPC returns.
-// It may be called at most once from a unary RPC handler. The ctx is the RPC
-// handler's Context or one derived from it.
-func SetTrailer(ctx context.Context, md metadata.MD) error {
-	if md.Len() == 0 {
-		return nil
-	}
-	stream, ok := transport.StreamFromContext(ctx)
-	if !ok {
-		return fmt.Errorf("grpc: failed to fetch the stream from the context %v", ctx)
-	}
-	return stream.SetTrailer(md)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/stream.go b/Godeps/_workspace/src/google.golang.org/grpc/stream.go
deleted file mode 100644
index d8bdc16b56..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/stream.go
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package grpc
-
-import (
-	"errors"
-	"io"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-	"golang.org/x/net/trace"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/transport"
-)
-
-type streamHandler func(srv interface{}, stream ServerStream) error
-
-// StreamDesc represents a streaming RPC service's method specification.
-type StreamDesc struct {
-	StreamName string
-	Handler    streamHandler
-
-	// At least one of these is true.
-	ServerStreams bool
-	ClientStreams bool
-}
-
-// Stream defines the common interface a client or server stream has to satisfy.
-type Stream interface {
-	// Context returns the context for this stream.
-	Context() context.Context
-	// SendMsg blocks until it sends m, the stream is done or the stream
-	// breaks.
-	// On error, it aborts the stream and returns an RPC status on client
-	// side. On server side, it simply returns the error to the caller.
-	// SendMsg is called by generated code.
-	SendMsg(m interface{}) error
-	// RecvMsg blocks until it receives a message or the stream is
-	// done. On client side, it returns io.EOF when the stream is done. On
-	// any other error, it aborts the streama nd returns an RPC status. On
-	// server side, it simply returns the error to the caller.
-	RecvMsg(m interface{}) error
-}
-
-// ClientStream defines the interface a client stream has to satify.
-type ClientStream interface {
-	// Header returns the header metedata received from the server if there
-	// is any. It blocks if the metadata is not ready to read.
-	Header() (metadata.MD, error)
-	// Trailer returns the trailer metadata from the server. It must be called
-	// after stream.Recv() returns non-nil error (including io.EOF) for
-	// bi-directional streaming and server streaming or stream.CloseAndRecv()
-	// returns for client streaming in order to receive trailer metadata if
-	// present. Otherwise, it could returns an empty MD even though trailer
-	// is present.
-	Trailer() metadata.MD
-	// CloseSend closes the send direction of the stream. It closes the stream
-	// when non-nil error is met.
-	CloseSend() error
-	Stream
-}
-
-// NewClientStream creates a new Stream for the client side. This is called
-// by generated code.
-func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error) {
-	var (
-		t   transport.ClientTransport
-		err error
-	)
-	t, err = cc.dopts.picker.Pick(ctx)
-	if err != nil {
-		return nil, toRPCErr(err)
-	}
-	// TODO(zhaoq): CallOption is omitted. Add support when it is needed.
-	callHdr := &transport.CallHdr{
-		Host:   cc.authority,
-		Method: method,
-	}
-	cs := &clientStream{
-		desc:    desc,
-		codec:   cc.dopts.codec,
-		tracing: EnableTracing,
-	}
-	if cs.tracing {
-		cs.trInfo.tr = trace.New("grpc.Sent."+methodFamily(method), method)
-		cs.trInfo.firstLine.client = true
-		if deadline, ok := ctx.Deadline(); ok {
-			cs.trInfo.firstLine.deadline = deadline.Sub(time.Now())
-		}
-		cs.trInfo.tr.LazyLog(&cs.trInfo.firstLine, false)
-		ctx = trace.NewContext(ctx, cs.trInfo.tr)
-	}
-	s, err := t.NewStream(ctx, callHdr)
-	if err != nil {
-		cs.finish(err)
-		return nil, toRPCErr(err)
-	}
-	cs.t = t
-	cs.s = s
-	cs.p = &parser{s: s}
-	// Listen on ctx.Done() to detect cancellation when there is no pending
-	// I/O operations on this stream.
-	go func() {
-		select {
-		case <-t.Error():
-			// Incur transport error, simply exit.
-		case <-s.Context().Done():
-			err := s.Context().Err()
-			cs.finish(err)
-			cs.closeTransportStream(transport.ContextErr(err))
-		}
-	}()
-	return cs, nil
-}
-
-// clientStream implements a client side Stream.
-type clientStream struct {
-	t     transport.ClientTransport
-	s     *transport.Stream
-	p     *parser
-	desc  *StreamDesc
-	codec Codec
-
-	tracing bool // set to EnableTracing when the clientStream is created.
-
-	mu     sync.Mutex
-	closed bool
-	// trInfo.tr is set when the clientStream is created (if EnableTracing is true),
-	// and is set to nil when the clientStream's finish method is called.
-	trInfo traceInfo
-}
-
-func (cs *clientStream) Context() context.Context {
-	return cs.s.Context()
-}
-
-func (cs *clientStream) Header() (metadata.MD, error) {
-	m, err := cs.s.Header()
-	if err != nil {
-		if _, ok := err.(transport.ConnectionError); !ok {
-			cs.closeTransportStream(err)
-		}
-	}
-	return m, err
-}
-
-func (cs *clientStream) Trailer() metadata.MD {
-	return cs.s.Trailer()
-}
-
-func (cs *clientStream) SendMsg(m interface{}) (err error) {
-	if cs.tracing {
-		cs.mu.Lock()
-		if cs.trInfo.tr != nil {
-			cs.trInfo.tr.LazyLog(&payload{sent: true, msg: m}, true)
-		}
-		cs.mu.Unlock()
-	}
-	defer func() {
-		if err == nil || err == io.EOF {
-			return
-		}
-		if _, ok := err.(transport.ConnectionError); !ok {
-			cs.closeTransportStream(err)
-		}
-		err = toRPCErr(err)
-	}()
-	out, err := encode(cs.codec, m, compressionNone)
-	if err != nil {
-		return transport.StreamErrorf(codes.Internal, "grpc: %v", err)
-	}
-	return cs.t.Write(cs.s, out, &transport.Options{Last: false})
-}
-
-func (cs *clientStream) RecvMsg(m interface{}) (err error) {
-	err = recv(cs.p, cs.codec, m)
-	defer func() {
-		// err != nil indicates the termination of the stream.
-		if err != nil {
-			cs.finish(err)
-		}
-	}()
-	if err == nil {
-		if cs.tracing {
-			cs.mu.Lock()
-			if cs.trInfo.tr != nil {
-				cs.trInfo.tr.LazyLog(&payload{sent: false, msg: m}, true)
-			}
-			cs.mu.Unlock()
-		}
-		if !cs.desc.ClientStreams || cs.desc.ServerStreams {
-			return
-		}
-		// Special handling for client streaming rpc.
-		err = recv(cs.p, cs.codec, m)
-		cs.closeTransportStream(err)
-		if err == nil {
-			return toRPCErr(errors.New("grpc: client streaming protocol violation: get <nil>, want <EOF>"))
-		}
-		if err == io.EOF {
-			if cs.s.StatusCode() == codes.OK {
-				return nil
-			}
-			return Errorf(cs.s.StatusCode(), cs.s.StatusDesc())
-		}
-		return toRPCErr(err)
-	}
-	if _, ok := err.(transport.ConnectionError); !ok {
-		cs.closeTransportStream(err)
-	}
-	if err == io.EOF {
-		if cs.s.StatusCode() == codes.OK {
-			// Returns io.EOF to indicate the end of the stream.
-			return
-		}
-		return Errorf(cs.s.StatusCode(), cs.s.StatusDesc())
-	}
-	return toRPCErr(err)
-}
-
-func (cs *clientStream) CloseSend() (err error) {
-	err = cs.t.Write(cs.s, nil, &transport.Options{Last: true})
-	if err == nil || err == io.EOF {
-		return
-	}
-	if _, ok := err.(transport.ConnectionError); !ok {
-		cs.closeTransportStream(err)
-	}
-	err = toRPCErr(err)
-	return
-}
-
-func (cs *clientStream) closeTransportStream(err error) {
-	cs.mu.Lock()
-	if cs.closed {
-		cs.mu.Unlock()
-		return
-	}
-	cs.closed = true
-	cs.mu.Unlock()
-	cs.t.CloseStream(cs.s, err)
-}
-
-func (cs *clientStream) finish(err error) {
-	if !cs.tracing {
-		return
-	}
-	cs.mu.Lock()
-	defer cs.mu.Unlock()
-	if cs.trInfo.tr != nil {
-		if err == nil || err == io.EOF {
-			cs.trInfo.tr.LazyPrintf("RPC: [OK]")
-		} else {
-			cs.trInfo.tr.LazyPrintf("RPC: [%v]", err)
-			cs.trInfo.tr.SetError()
-		}
-		cs.trInfo.tr.Finish()
-		cs.trInfo.tr = nil
-	}
-}
-
-// ServerStream defines the interface a server stream has to satisfy.
-type ServerStream interface {
-	// SendHeader sends the header metadata. It should not be called
-	// after SendProto. It fails if called multiple times or if
-	// called after SendProto.
-	SendHeader(metadata.MD) error
-	// SetTrailer sets the trailer metadata which will be sent with the
-	// RPC status.
-	SetTrailer(metadata.MD)
-	Stream
-}
-
-// serverStream implements a server side Stream.
-type serverStream struct {
-	t          transport.ServerTransport
-	s          *transport.Stream
-	p          *parser
-	codec      Codec
-	statusCode codes.Code
-	statusDesc string
-	trInfo     *traceInfo
-
-	mu sync.Mutex // protects trInfo.tr after the service handler runs.
-}
-
-func (ss *serverStream) Context() context.Context {
-	return ss.s.Context()
-}
-
-func (ss *serverStream) SendHeader(md metadata.MD) error {
-	return ss.t.WriteHeader(ss.s, md)
-}
-
-func (ss *serverStream) SetTrailer(md metadata.MD) {
-	if md.Len() == 0 {
-		return
-	}
-	ss.s.SetTrailer(md)
-	return
-}
-
-func (ss *serverStream) SendMsg(m interface{}) (err error) {
-	defer func() {
-		if ss.trInfo != nil {
-			ss.mu.Lock()
-			if ss.trInfo.tr != nil {
-				if err == nil {
-					ss.trInfo.tr.LazyLog(&payload{sent: true, msg: m}, true)
-				} else {
-					ss.trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
-					ss.trInfo.tr.SetError()
-				}
-			}
-			ss.mu.Unlock()
-		}
-	}()
-	out, err := encode(ss.codec, m, compressionNone)
-	if err != nil {
-		err = transport.StreamErrorf(codes.Internal, "grpc: %v", err)
-		return err
-	}
-	return ss.t.Write(ss.s, out, &transport.Options{Last: false})
-}
-
-func (ss *serverStream) RecvMsg(m interface{}) (err error) {
-	defer func() {
-		if ss.trInfo != nil {
-			ss.mu.Lock()
-			if ss.trInfo.tr != nil {
-				if err == nil {
-					ss.trInfo.tr.LazyLog(&payload{sent: false, msg: m}, true)
-				} else if err != io.EOF {
-					ss.trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
-					ss.trInfo.tr.SetError()
-				}
-			}
-			ss.mu.Unlock()
-		}
-	}()
-	return recv(ss.p, ss.codec, m)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.pb.go b/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.pb.go
deleted file mode 100644
index 5f72c5570e..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.pb.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: perf.proto
-// DO NOT EDIT!
-
-/*
-Package codec_perf is a generated protocol buffer package.
-
-It is generated from these files:
-	perf.proto
-
-It has these top-level messages:
-	Buffer
-*/
-package codec_perf
-
-import proto "github.com/golang/protobuf/proto"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = math.Inf
-
-// Buffer is a message that contains a body of bytes that is used to exercise
-// encoding and decoding overheads.
-type Buffer struct {
-	Body             []byte `protobuf:"bytes,1,opt,name=body" json:"body,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Buffer) Reset()         { *m = Buffer{} }
-func (m *Buffer) String() string { return proto.CompactTextString(m) }
-func (*Buffer) ProtoMessage()    {}
-
-func (m *Buffer) GetBody() []byte {
-	if m != nil {
-		return m.Body
-	}
-	return nil
-}
-
-func init() {
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.proto b/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.proto
deleted file mode 100644
index 4cf561f7f1..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/test/codec_perf/perf.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-// Messages used for performance tests that may not reference grpc directly for
-// reasons of import cycles.
-syntax = "proto2";
-
-package codec.perf;
-
-// Buffer is a message that contains a body of bytes that is used to exercise
-// encoding and decoding overheads.
-message Buffer {
-  optional bytes body = 1;
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.pb.go b/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.pb.go
deleted file mode 100644
index bd492fef47..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.pb.go
+++ /dev/null
@@ -1,702 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: test.proto
-// DO NOT EDIT!
-
-/*
-Package grpc_testing is a generated protocol buffer package.
-
-It is generated from these files:
-	test.proto
-
-It has these top-level messages:
-	Empty
-	Payload
-	SimpleRequest
-	SimpleResponse
-	StreamingInputCallRequest
-	StreamingInputCallResponse
-	ResponseParameters
-	StreamingOutputCallRequest
-	StreamingOutputCallResponse
-*/
-package grpc_testing
-
-import proto "github.com/golang/protobuf/proto"
-import math "math"
-
-import (
-	context "golang.org/x/net/context"
-	grpc "google.golang.org/grpc"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConn
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = math.Inf
-
-// The type of payload that should be returned.
-type PayloadType int32
-
-const (
-	// Compressable text format.
-	PayloadType_COMPRESSABLE PayloadType = 0
-	// Uncompressable binary format.
-	PayloadType_UNCOMPRESSABLE PayloadType = 1
-	// Randomly chosen from all other formats defined in this enum.
-	PayloadType_RANDOM PayloadType = 2
-)
-
-var PayloadType_name = map[int32]string{
-	0: "COMPRESSABLE",
-	1: "UNCOMPRESSABLE",
-	2: "RANDOM",
-}
-var PayloadType_value = map[string]int32{
-	"COMPRESSABLE":   0,
-	"UNCOMPRESSABLE": 1,
-	"RANDOM":         2,
-}
-
-func (x PayloadType) Enum() *PayloadType {
-	p := new(PayloadType)
-	*p = x
-	return p
-}
-func (x PayloadType) String() string {
-	return proto.EnumName(PayloadType_name, int32(x))
-}
-func (x *PayloadType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(PayloadType_value, data, "PayloadType")
-	if err != nil {
-		return err
-	}
-	*x = PayloadType(value)
-	return nil
-}
-
-type Empty struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Empty) Reset()         { *m = Empty{} }
-func (m *Empty) String() string { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()    {}
-
-// A block of data, to simply increase gRPC message size.
-type Payload struct {
-	// The type of data in body.
-	Type *PayloadType `protobuf:"varint,1,opt,name=type,enum=grpc.testing.PayloadType" json:"type,omitempty"`
-	// Primary contents of payload.
-	Body             []byte `protobuf:"bytes,2,opt,name=body" json:"body,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Payload) Reset()         { *m = Payload{} }
-func (m *Payload) String() string { return proto.CompactTextString(m) }
-func (*Payload) ProtoMessage()    {}
-
-func (m *Payload) GetType() PayloadType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return PayloadType_COMPRESSABLE
-}
-
-func (m *Payload) GetBody() []byte {
-	if m != nil {
-		return m.Body
-	}
-	return nil
-}
-
-// Unary request.
-type SimpleRequest struct {
-	// Desired payload type in the response from the server.
-	// If response_type is RANDOM, server randomly chooses one from other formats.
-	ResponseType *PayloadType `protobuf:"varint,1,opt,name=response_type,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
-	// Desired payload size in the response from the server.
-	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	ResponseSize *int32 `protobuf:"varint,2,opt,name=response_size" json:"response_size,omitempty"`
-	// Optional input payload sent along with the request.
-	Payload *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
-	// Whether SimpleResponse should include username.
-	FillUsername *bool `protobuf:"varint,4,opt,name=fill_username" json:"fill_username,omitempty"`
-	// Whether SimpleResponse should include OAuth scope.
-	FillOauthScope   *bool  `protobuf:"varint,5,opt,name=fill_oauth_scope" json:"fill_oauth_scope,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SimpleRequest) Reset()         { *m = SimpleRequest{} }
-func (m *SimpleRequest) String() string { return proto.CompactTextString(m) }
-func (*SimpleRequest) ProtoMessage()    {}
-
-func (m *SimpleRequest) GetResponseType() PayloadType {
-	if m != nil && m.ResponseType != nil {
-		return *m.ResponseType
-	}
-	return PayloadType_COMPRESSABLE
-}
-
-func (m *SimpleRequest) GetResponseSize() int32 {
-	if m != nil && m.ResponseSize != nil {
-		return *m.ResponseSize
-	}
-	return 0
-}
-
-func (m *SimpleRequest) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func (m *SimpleRequest) GetFillUsername() bool {
-	if m != nil && m.FillUsername != nil {
-		return *m.FillUsername
-	}
-	return false
-}
-
-func (m *SimpleRequest) GetFillOauthScope() bool {
-	if m != nil && m.FillOauthScope != nil {
-		return *m.FillOauthScope
-	}
-	return false
-}
-
-// Unary response, as configured by the request.
-type SimpleResponse struct {
-	// Payload to increase message size.
-	Payload *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
-	// The user the request came from, for verifying authentication was
-	// successful when the client expected it.
-	Username *string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
-	// OAuth scope.
-	OauthScope       *string `protobuf:"bytes,3,opt,name=oauth_scope" json:"oauth_scope,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *SimpleResponse) Reset()         { *m = SimpleResponse{} }
-func (m *SimpleResponse) String() string { return proto.CompactTextString(m) }
-func (*SimpleResponse) ProtoMessage()    {}
-
-func (m *SimpleResponse) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func (m *SimpleResponse) GetUsername() string {
-	if m != nil && m.Username != nil {
-		return *m.Username
-	}
-	return ""
-}
-
-func (m *SimpleResponse) GetOauthScope() string {
-	if m != nil && m.OauthScope != nil {
-		return *m.OauthScope
-	}
-	return ""
-}
-
-// Client-streaming request.
-type StreamingInputCallRequest struct {
-	// Optional input payload sent along with the request.
-	Payload          *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *StreamingInputCallRequest) Reset()         { *m = StreamingInputCallRequest{} }
-func (m *StreamingInputCallRequest) String() string { return proto.CompactTextString(m) }
-func (*StreamingInputCallRequest) ProtoMessage()    {}
-
-func (m *StreamingInputCallRequest) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-// Client-streaming response.
-type StreamingInputCallResponse struct {
-	// Aggregated size of payloads received from the client.
-	AggregatedPayloadSize *int32 `protobuf:"varint,1,opt,name=aggregated_payload_size" json:"aggregated_payload_size,omitempty"`
-	XXX_unrecognized      []byte `json:"-"`
-}
-
-func (m *StreamingInputCallResponse) Reset()         { *m = StreamingInputCallResponse{} }
-func (m *StreamingInputCallResponse) String() string { return proto.CompactTextString(m) }
-func (*StreamingInputCallResponse) ProtoMessage()    {}
-
-func (m *StreamingInputCallResponse) GetAggregatedPayloadSize() int32 {
-	if m != nil && m.AggregatedPayloadSize != nil {
-		return *m.AggregatedPayloadSize
-	}
-	return 0
-}
-
-// Configuration for a particular response.
-type ResponseParameters struct {
-	// Desired payload sizes in responses from the server.
-	// If response_type is COMPRESSABLE, this denotes the size before compression.
-	Size *int32 `protobuf:"varint,1,opt,name=size" json:"size,omitempty"`
-	// Desired interval between consecutive responses in the response stream in
-	// microseconds.
-	IntervalUs       *int32 `protobuf:"varint,2,opt,name=interval_us" json:"interval_us,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *ResponseParameters) Reset()         { *m = ResponseParameters{} }
-func (m *ResponseParameters) String() string { return proto.CompactTextString(m) }
-func (*ResponseParameters) ProtoMessage()    {}
-
-func (m *ResponseParameters) GetSize() int32 {
-	if m != nil && m.Size != nil {
-		return *m.Size
-	}
-	return 0
-}
-
-func (m *ResponseParameters) GetIntervalUs() int32 {
-	if m != nil && m.IntervalUs != nil {
-		return *m.IntervalUs
-	}
-	return 0
-}
-
-// Server-streaming request.
-type StreamingOutputCallRequest struct {
-	// Desired payload type in the response from the server.
-	// If response_type is RANDOM, the payload from each response in the stream
-	// might be of different types. This is to simulate a mixed type of payload
-	// stream.
-	ResponseType *PayloadType `protobuf:"varint,1,opt,name=response_type,enum=grpc.testing.PayloadType" json:"response_type,omitempty"`
-	// Configuration for each expected response message.
-	ResponseParameters []*ResponseParameters `protobuf:"bytes,2,rep,name=response_parameters" json:"response_parameters,omitempty"`
-	// Optional input payload sent along with the request.
-	Payload          *Payload `protobuf:"bytes,3,opt,name=payload" json:"payload,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *StreamingOutputCallRequest) Reset()         { *m = StreamingOutputCallRequest{} }
-func (m *StreamingOutputCallRequest) String() string { return proto.CompactTextString(m) }
-func (*StreamingOutputCallRequest) ProtoMessage()    {}
-
-func (m *StreamingOutputCallRequest) GetResponseType() PayloadType {
-	if m != nil && m.ResponseType != nil {
-		return *m.ResponseType
-	}
-	return PayloadType_COMPRESSABLE
-}
-
-func (m *StreamingOutputCallRequest) GetResponseParameters() []*ResponseParameters {
-	if m != nil {
-		return m.ResponseParameters
-	}
-	return nil
-}
-
-func (m *StreamingOutputCallRequest) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-// Server-streaming response, as configured by the request and parameters.
-type StreamingOutputCallResponse struct {
-	// Payload to increase response size.
-	Payload          *Payload `protobuf:"bytes,1,opt,name=payload" json:"payload,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *StreamingOutputCallResponse) Reset()         { *m = StreamingOutputCallResponse{} }
-func (m *StreamingOutputCallResponse) String() string { return proto.CompactTextString(m) }
-func (*StreamingOutputCallResponse) ProtoMessage()    {}
-
-func (m *StreamingOutputCallResponse) GetPayload() *Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("grpc.testing.PayloadType", PayloadType_name, PayloadType_value)
-}
-
-// Client API for TestService service
-
-type TestServiceClient interface {
-	// One empty request followed by one empty response.
-	EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error)
-	// One request followed by one response.
-	// The server returns the client payload as-is.
-	UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error)
-	// One request followed by a sequence of responses (streamed download).
-	// The server returns the payload with client desired type and sizes.
-	StreamingOutputCall(ctx context.Context, in *StreamingOutputCallRequest, opts ...grpc.CallOption) (TestService_StreamingOutputCallClient, error)
-	// A sequence of requests followed by one response (streamed upload).
-	// The server returns the aggregated size of client payload as the result.
-	StreamingInputCall(ctx context.Context, opts ...grpc.CallOption) (TestService_StreamingInputCallClient, error)
-	// A sequence of requests with each request served by the server immediately.
-	// As one request could lead to multiple responses, this interface
-	// demonstrates the idea of full duplexing.
-	FullDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_FullDuplexCallClient, error)
-	// A sequence of requests followed by a sequence of responses.
-	// The server buffers all the client requests and then serves them in order. A
-	// stream of responses are returned to the client when the server starts with
-	// first request.
-	HalfDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_HalfDuplexCallClient, error)
-}
-
-type testServiceClient struct {
-	cc *grpc.ClientConn
-}
-
-func NewTestServiceClient(cc *grpc.ClientConn) TestServiceClient {
-	return &testServiceClient{cc}
-}
-
-func (c *testServiceClient) EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) {
-	out := new(Empty)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/EmptyCall", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *testServiceClient) UnaryCall(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error) {
-	out := new(SimpleResponse)
-	err := grpc.Invoke(ctx, "/grpc.testing.TestService/UnaryCall", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *testServiceClient) StreamingOutputCall(ctx context.Context, in *StreamingOutputCallRequest, opts ...grpc.CallOption) (TestService_StreamingOutputCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[0], c.cc, "/grpc.testing.TestService/StreamingOutputCall", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &testServiceStreamingOutputCallClient{stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-type TestService_StreamingOutputCallClient interface {
-	Recv() (*StreamingOutputCallResponse, error)
-	grpc.ClientStream
-}
-
-type testServiceStreamingOutputCallClient struct {
-	grpc.ClientStream
-}
-
-func (x *testServiceStreamingOutputCallClient) Recv() (*StreamingOutputCallResponse, error) {
-	m := new(StreamingOutputCallResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *testServiceClient) StreamingInputCall(ctx context.Context, opts ...grpc.CallOption) (TestService_StreamingInputCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[1], c.cc, "/grpc.testing.TestService/StreamingInputCall", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &testServiceStreamingInputCallClient{stream}
-	return x, nil
-}
-
-type TestService_StreamingInputCallClient interface {
-	Send(*StreamingInputCallRequest) error
-	CloseAndRecv() (*StreamingInputCallResponse, error)
-	grpc.ClientStream
-}
-
-type testServiceStreamingInputCallClient struct {
-	grpc.ClientStream
-}
-
-func (x *testServiceStreamingInputCallClient) Send(m *StreamingInputCallRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *testServiceStreamingInputCallClient) CloseAndRecv() (*StreamingInputCallResponse, error) {
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	m := new(StreamingInputCallResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *testServiceClient) FullDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_FullDuplexCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[2], c.cc, "/grpc.testing.TestService/FullDuplexCall", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &testServiceFullDuplexCallClient{stream}
-	return x, nil
-}
-
-type TestService_FullDuplexCallClient interface {
-	Send(*StreamingOutputCallRequest) error
-	Recv() (*StreamingOutputCallResponse, error)
-	grpc.ClientStream
-}
-
-type testServiceFullDuplexCallClient struct {
-	grpc.ClientStream
-}
-
-func (x *testServiceFullDuplexCallClient) Send(m *StreamingOutputCallRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *testServiceFullDuplexCallClient) Recv() (*StreamingOutputCallResponse, error) {
-	m := new(StreamingOutputCallResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (c *testServiceClient) HalfDuplexCall(ctx context.Context, opts ...grpc.CallOption) (TestService_HalfDuplexCallClient, error) {
-	stream, err := grpc.NewClientStream(ctx, &_TestService_serviceDesc.Streams[3], c.cc, "/grpc.testing.TestService/HalfDuplexCall", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &testServiceHalfDuplexCallClient{stream}
-	return x, nil
-}
-
-type TestService_HalfDuplexCallClient interface {
-	Send(*StreamingOutputCallRequest) error
-	Recv() (*StreamingOutputCallResponse, error)
-	grpc.ClientStream
-}
-
-type testServiceHalfDuplexCallClient struct {
-	grpc.ClientStream
-}
-
-func (x *testServiceHalfDuplexCallClient) Send(m *StreamingOutputCallRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *testServiceHalfDuplexCallClient) Recv() (*StreamingOutputCallResponse, error) {
-	m := new(StreamingOutputCallResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// Server API for TestService service
-
-type TestServiceServer interface {
-	// One empty request followed by one empty response.
-	EmptyCall(context.Context, *Empty) (*Empty, error)
-	// One request followed by one response.
-	// The server returns the client payload as-is.
-	UnaryCall(context.Context, *SimpleRequest) (*SimpleResponse, error)
-	// One request followed by a sequence of responses (streamed download).
-	// The server returns the payload with client desired type and sizes.
-	StreamingOutputCall(*StreamingOutputCallRequest, TestService_StreamingOutputCallServer) error
-	// A sequence of requests followed by one response (streamed upload).
-	// The server returns the aggregated size of client payload as the result.
-	StreamingInputCall(TestService_StreamingInputCallServer) error
-	// A sequence of requests with each request served by the server immediately.
-	// As one request could lead to multiple responses, this interface
-	// demonstrates the idea of full duplexing.
-	FullDuplexCall(TestService_FullDuplexCallServer) error
-	// A sequence of requests followed by a sequence of responses.
-	// The server buffers all the client requests and then serves them in order. A
-	// stream of responses are returned to the client when the server starts with
-	// first request.
-	HalfDuplexCall(TestService_HalfDuplexCallServer) error
-}
-
-func RegisterTestServiceServer(s *grpc.Server, srv TestServiceServer) {
-	s.RegisterService(&_TestService_serviceDesc, srv)
-}
-
-func _TestService_EmptyCall_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
-	in := new(Empty)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	out, err := srv.(TestServiceServer).EmptyCall(ctx, in)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func _TestService_UnaryCall_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
-	in := new(SimpleRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	out, err := srv.(TestServiceServer).UnaryCall(ctx, in)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func _TestService_StreamingOutputCall_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(StreamingOutputCallRequest)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(TestServiceServer).StreamingOutputCall(m, &testServiceStreamingOutputCallServer{stream})
-}
-
-type TestService_StreamingOutputCallServer interface {
-	Send(*StreamingOutputCallResponse) error
-	grpc.ServerStream
-}
-
-type testServiceStreamingOutputCallServer struct {
-	grpc.ServerStream
-}
-
-func (x *testServiceStreamingOutputCallServer) Send(m *StreamingOutputCallResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func _TestService_StreamingInputCall_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TestServiceServer).StreamingInputCall(&testServiceStreamingInputCallServer{stream})
-}
-
-type TestService_StreamingInputCallServer interface {
-	SendAndClose(*StreamingInputCallResponse) error
-	Recv() (*StreamingInputCallRequest, error)
-	grpc.ServerStream
-}
-
-type testServiceStreamingInputCallServer struct {
-	grpc.ServerStream
-}
-
-func (x *testServiceStreamingInputCallServer) SendAndClose(m *StreamingInputCallResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *testServiceStreamingInputCallServer) Recv() (*StreamingInputCallRequest, error) {
-	m := new(StreamingInputCallRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func _TestService_FullDuplexCall_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TestServiceServer).FullDuplexCall(&testServiceFullDuplexCallServer{stream})
-}
-
-type TestService_FullDuplexCallServer interface {
-	Send(*StreamingOutputCallResponse) error
-	Recv() (*StreamingOutputCallRequest, error)
-	grpc.ServerStream
-}
-
-type testServiceFullDuplexCallServer struct {
-	grpc.ServerStream
-}
-
-func (x *testServiceFullDuplexCallServer) Send(m *StreamingOutputCallResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *testServiceFullDuplexCallServer) Recv() (*StreamingOutputCallRequest, error) {
-	m := new(StreamingOutputCallRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func _TestService_HalfDuplexCall_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(TestServiceServer).HalfDuplexCall(&testServiceHalfDuplexCallServer{stream})
-}
-
-type TestService_HalfDuplexCallServer interface {
-	Send(*StreamingOutputCallResponse) error
-	Recv() (*StreamingOutputCallRequest, error)
-	grpc.ServerStream
-}
-
-type testServiceHalfDuplexCallServer struct {
-	grpc.ServerStream
-}
-
-func (x *testServiceHalfDuplexCallServer) Send(m *StreamingOutputCallResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *testServiceHalfDuplexCallServer) Recv() (*StreamingOutputCallRequest, error) {
-	m := new(StreamingOutputCallRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-var _TestService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "grpc.testing.TestService",
-	HandlerType: (*TestServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "EmptyCall",
-			Handler:    _TestService_EmptyCall_Handler,
-		},
-		{
-			MethodName: "UnaryCall",
-			Handler:    _TestService_UnaryCall_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "StreamingOutputCall",
-			Handler:       _TestService_StreamingOutputCall_Handler,
-			ServerStreams: true,
-		},
-		{
-			StreamName:    "StreamingInputCall",
-			Handler:       _TestService_StreamingInputCall_Handler,
-			ClientStreams: true,
-		},
-		{
-			StreamName:    "FullDuplexCall",
-			Handler:       _TestService_FullDuplexCall_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-		{
-			StreamName:    "HalfDuplexCall",
-			Handler:       _TestService_HalfDuplexCall_Handler,
-			ServerStreams: true,
-			ClientStreams: true,
-		},
-	},
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.proto b/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.proto
deleted file mode 100644
index b5bfe05378..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/test/grpc_testing/test.proto
+++ /dev/null
@@ -1,140 +0,0 @@
-// An integration test service that covers all the method signature permutations
-// of unary/streaming requests/responses.
-syntax = "proto2";
-
-package grpc.testing;
-
-message Empty {}
-
-// The type of payload that should be returned.
-enum PayloadType {
-  // Compressable text format.
-  COMPRESSABLE = 0;
-
-  // Uncompressable binary format.
-  UNCOMPRESSABLE = 1;
-
-  // Randomly chosen from all other formats defined in this enum.
-  RANDOM = 2;
-}
-
-// A block of data, to simply increase gRPC message size.
-message Payload {
-  // The type of data in body.
-  optional PayloadType type = 1;
-  // Primary contents of payload.
-  optional bytes body = 2;
-}
-
-// Unary request.
-message SimpleRequest {
-  // Desired payload type in the response from the server.
-  // If response_type is RANDOM, server randomly chooses one from other formats.
-  optional PayloadType response_type = 1;
-
-  // Desired payload size in the response from the server.
-  // If response_type is COMPRESSABLE, this denotes the size before compression.
-  optional int32 response_size = 2;
-
-  // Optional input payload sent along with the request.
-  optional Payload payload = 3;
-
-  // Whether SimpleResponse should include username.
-  optional bool fill_username = 4;
-
-  // Whether SimpleResponse should include OAuth scope.
-  optional bool fill_oauth_scope = 5;
-}
-
-// Unary response, as configured by the request.
-message SimpleResponse {
-  // Payload to increase message size.
-  optional Payload payload = 1;
-
-  // The user the request came from, for verifying authentication was
-  // successful when the client expected it.
-  optional string username = 2;
-  
-  // OAuth scope.
-  optional string oauth_scope = 3;
-}
-
-// Client-streaming request.
-message StreamingInputCallRequest {
-  // Optional input payload sent along with the request.
-  optional Payload payload = 1;
-
-  // Not expecting any payload from the response.
-}
-
-// Client-streaming response.
-message StreamingInputCallResponse {
-  // Aggregated size of payloads received from the client.
-  optional int32 aggregated_payload_size = 1;
-}
-
-// Configuration for a particular response.
-message ResponseParameters {
-  // Desired payload sizes in responses from the server.
-  // If response_type is COMPRESSABLE, this denotes the size before compression.
-  optional int32 size = 1;
-
-  // Desired interval between consecutive responses in the response stream in
-  // microseconds.
-  optional int32 interval_us = 2;
-}
-
-// Server-streaming request.
-message StreamingOutputCallRequest {
-  // Desired payload type in the response from the server.
-  // If response_type is RANDOM, the payload from each response in the stream
-  // might be of different types. This is to simulate a mixed type of payload
-  // stream.
-  optional PayloadType response_type = 1;
-
-  // Configuration for each expected response message.
-  repeated ResponseParameters response_parameters = 2;
-
-  // Optional input payload sent along with the request.
-  optional Payload payload = 3;
-}
-
-// Server-streaming response, as configured by the request and parameters.
-message StreamingOutputCallResponse {
-  // Payload to increase response size.
-  optional Payload payload = 1;
-}
-
-// A simple service to test the various types of RPCs and experiment with
-// performance with various types of payload.
-service TestService {
-  // One empty request followed by one empty response.
-  rpc EmptyCall(Empty) returns (Empty);
-
-  // One request followed by one response.
-  // The server returns the client payload as-is.
-  rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
-
-  // One request followed by a sequence of responses (streamed download).
-  // The server returns the payload with client desired type and sizes.
-  rpc StreamingOutputCall(StreamingOutputCallRequest)
-      returns (stream StreamingOutputCallResponse);
-
-  // A sequence of requests followed by one response (streamed upload).
-  // The server returns the aggregated size of client payload as the result.
-  rpc StreamingInputCall(stream StreamingInputCallRequest)
-      returns (StreamingInputCallResponse);
-
-  // A sequence of requests with each request served by the server immediately.
-  // As one request could lead to multiple responses, this interface
-  // demonstrates the idea of full duplexing.
-  rpc FullDuplexCall(stream StreamingOutputCallRequest)
-      returns (stream StreamingOutputCallResponse);
-
-  // A sequence of requests followed by a sequence of responses.
-  // The server buffers all the client requests and then serves them in order. A
-  // stream of responses are returned to the client when the server starts with
-  // first request.
-  rpc HalfDuplexCall(stream StreamingOutputCallRequest)
-      returns (stream StreamingOutputCallResponse);
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/trace.go b/Godeps/_workspace/src/google.golang.org/grpc/trace.go
deleted file mode 100644
index cde04fbfc9..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/trace.go
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package grpc
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"net"
-	"strings"
-	"time"
-
-	"golang.org/x/net/trace"
-)
-
-// EnableTracing controls whether to trace RPCs using the golang.org/x/net/trace package.
-// This should only be set before any RPCs are sent or received by this program.
-var EnableTracing = true
-
-// methodFamily returns the trace family for the given method.
-// It turns "/pkg.Service/GetFoo" into "pkg.Service".
-func methodFamily(m string) string {
-	m = strings.TrimPrefix(m, "/") // remove leading slash
-	if i := strings.Index(m, "/"); i >= 0 {
-		m = m[:i] // remove everything from second slash
-	}
-	if i := strings.LastIndex(m, "."); i >= 0 {
-		m = m[i+1:] // cut down to last dotted component
-	}
-	return m
-}
-
-// traceInfo contains tracing information for an RPC.
-type traceInfo struct {
-	tr        trace.Trace
-	firstLine firstLine
-}
-
-// firstLine is the first line of an RPC trace.
-type firstLine struct {
-	client     bool // whether this is a client (outgoing) RPC
-	remoteAddr net.Addr
-	deadline   time.Duration // may be zero
-}
-
-func (f *firstLine) String() string {
-	var line bytes.Buffer
-	io.WriteString(&line, "RPC: ")
-	if f.client {
-		io.WriteString(&line, "to")
-	} else {
-		io.WriteString(&line, "from")
-	}
-	fmt.Fprintf(&line, " %v deadline:", f.remoteAddr)
-	if f.deadline != 0 {
-		fmt.Fprint(&line, f.deadline)
-	} else {
-		io.WriteString(&line, "none")
-	}
-	return line.String()
-}
-
-// payload represents an RPC request or response payload.
-type payload struct {
-	sent bool        // whether this is an outgoing payload
-	msg  interface{} // e.g. a proto.Message
-	// TODO(dsymonds): add stringifying info to codec, and limit how much we hold here?
-}
-
-func (p payload) String() string {
-	if p.sent {
-		return fmt.Sprintf("sent: %v", p.msg)
-	} else {
-		return fmt.Sprintf("recv: %v", p.msg)
-	}
-}
-
-type fmtStringer struct {
-	format string
-	a      []interface{}
-}
-
-func (f *fmtStringer) String() string {
-	return fmt.Sprintf(f.format, f.a...)
-}
-
-type stringer string
-
-func (s stringer) String() string { return string(s) }
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/control.go b/Godeps/_workspace/src/google.golang.org/grpc/transport/control.go
deleted file mode 100644
index f6b38a5a6d..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/transport/control.go
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package transport
-
-import (
-	"fmt"
-	"sync"
-
-	"golang.org/x/net/http2"
-)
-
-const (
-	// The default value of flow control window size in HTTP2 spec.
-	defaultWindowSize = 65535
-	// The initial window size for flow control.
-	initialWindowSize     = defaultWindowSize      // for an RPC
-	initialConnWindowSize = defaultWindowSize * 16 // for a connection
-)
-
-// The following defines various control items which could flow through
-// the control buffer of transport. They represent different aspects of
-// control tasks, e.g., flow control, settings, streaming resetting, etc.
-type windowUpdate struct {
-	streamID  uint32
-	increment uint32
-}
-
-func (windowUpdate) isItem() bool {
-	return true
-}
-
-type settings struct {
-	ack bool
-	ss  []http2.Setting
-}
-
-func (settings) isItem() bool {
-	return true
-}
-
-type resetStream struct {
-	streamID uint32
-	code     http2.ErrCode
-}
-
-func (resetStream) isItem() bool {
-	return true
-}
-
-type flushIO struct {
-}
-
-func (flushIO) isItem() bool {
-	return true
-}
-
-type ping struct {
-	ack  bool
-	data [8]byte
-}
-
-func (ping) isItem() bool {
-	return true
-}
-
-// quotaPool is a pool which accumulates the quota and sends it to acquire()
-// when it is available.
-type quotaPool struct {
-	c chan int
-
-	mu    sync.Mutex
-	quota int
-}
-
-// newQuotaPool creates a quotaPool which has quota q available to consume.
-func newQuotaPool(q int) *quotaPool {
-	qb := &quotaPool{
-		c: make(chan int, 1),
-	}
-	if q > 0 {
-		qb.c <- q
-	} else {
-		qb.quota = q
-	}
-	return qb
-}
-
-// add adds n to the available quota and tries to send it on acquire.
-func (qb *quotaPool) add(n int) {
-	qb.mu.Lock()
-	defer qb.mu.Unlock()
-	qb.quota += n
-	if qb.quota <= 0 {
-		return
-	}
-	select {
-	case qb.c <- qb.quota:
-		qb.quota = 0
-	default:
-	}
-}
-
-// cancel cancels the pending quota sent on acquire, if any.
-func (qb *quotaPool) cancel() {
-	qb.mu.Lock()
-	defer qb.mu.Unlock()
-	select {
-	case n := <-qb.c:
-		qb.quota += n
-	default:
-	}
-}
-
-// reset cancels the pending quota sent on acquired, incremented by v and sends
-// it back on acquire.
-func (qb *quotaPool) reset(v int) {
-	qb.mu.Lock()
-	defer qb.mu.Unlock()
-	select {
-	case n := <-qb.c:
-		qb.quota += n
-	default:
-	}
-	qb.quota += v
-	if qb.quota <= 0 {
-		return
-	}
-	select {
-	case qb.c <- qb.quota:
-		qb.quota = 0
-	default:
-	}
-}
-
-// acquire returns the channel on which available quota amounts are sent.
-func (qb *quotaPool) acquire() <-chan int {
-	return qb.c
-}
-
-// inFlow deals with inbound flow control
-type inFlow struct {
-	// The inbound flow control limit for pending data.
-	limit uint32
-	// conn points to the shared connection-level inFlow that is shared
-	// by all streams on that conn. It is nil for the inFlow on the conn
-	// directly.
-	conn *inFlow
-
-	mu sync.Mutex
-	// pendingData is the overall data which have been received but not been
-	// consumed by applications.
-	pendingData uint32
-	// The amount of data the application has consumed but grpc has not sent
-	// window update for them. Used to reduce window update frequency.
-	pendingUpdate uint32
-}
-
-// onData is invoked when some data frame is received. It increments not only its
-// own pendingData but also that of the associated connection-level flow.
-func (f *inFlow) onData(n uint32) error {
-	if n == 0 {
-		return nil
-	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.pendingData+f.pendingUpdate+n > f.limit {
-		return fmt.Errorf("recieved %d-bytes data exceeding the limit %d bytes", f.pendingData+f.pendingUpdate+n, f.limit)
-	}
-	if f.conn != nil {
-		if err := f.conn.onData(n); err != nil {
-			return ConnectionErrorf("%v", err)
-		}
-	}
-	f.pendingData += n
-	return nil
-}
-
-// connOnRead updates the connection level states when the application consumes data.
-func (f *inFlow) connOnRead(n uint32) uint32 {
-	if n == 0 || f.conn != nil {
-		return 0
-	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	f.pendingData -= n
-	f.pendingUpdate += n
-	if f.pendingUpdate >= f.limit/4 {
-		ret := f.pendingUpdate
-		f.pendingUpdate = 0
-		return ret
-	}
-	return 0
-}
-
-// onRead is invoked when the application reads the data. It returns the window updates
-// for both stream and connection level.
-func (f *inFlow) onRead(n uint32) (swu, cwu uint32) {
-	if n == 0 {
-		return
-	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.pendingData == 0 {
-		// pendingData has been adjusted by restoreConn.
-		return
-	}
-	f.pendingData -= n
-	f.pendingUpdate += n
-	if f.pendingUpdate >= f.limit/4 {
-		swu = f.pendingUpdate
-		f.pendingUpdate = 0
-	}
-	cwu = f.conn.connOnRead(n)
-	return
-}
-
-// restoreConn is invoked when a stream is terminated. It removes its stake in
-// the connection-level flow and resets its own state.
-func (f *inFlow) restoreConn() uint32 {
-	if f.conn == nil {
-		return 0
-	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	n := f.pendingData
-	f.pendingData = 0
-	f.pendingUpdate = 0
-	return f.conn.connOnRead(n)
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go b/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go
deleted file mode 100644
index 9eae37df72..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_client.go
+++ /dev/null
@@ -1,865 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package transport
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"math"
-	"net"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/peer"
-)
-
-// http2Client implements the ClientTransport interface with HTTP2.
-type http2Client struct {
-	target    string // server name/addr
-	userAgent string
-	conn      net.Conn             // underlying communication channel
-	authInfo  credentials.AuthInfo // auth info about the connection
-	nextID    uint32               // the next stream ID to be used
-
-	// writableChan synchronizes write access to the transport.
-	// A writer acquires the write lock by sending a value on writableChan
-	// and releases it by receiving from writableChan.
-	writableChan chan int
-	// shutdownChan is closed when Close is called.
-	// Blocking operations should select on shutdownChan to avoid
-	// blocking forever after Close.
-	// TODO(zhaoq): Maybe have a channel context?
-	shutdownChan chan struct{}
-	// errorChan is closed to notify the I/O error to the caller.
-	errorChan chan struct{}
-
-	framer *framer
-	hBuf   *bytes.Buffer  // the buffer for HPACK encoding
-	hEnc   *hpack.Encoder // HPACK encoder
-
-	// controlBuf delivers all the control related tasks (e.g., window
-	// updates, reset streams, and various settings) to the controller.
-	controlBuf *recvBuffer
-	fc         *inFlow
-	// sendQuotaPool provides flow control to outbound message.
-	sendQuotaPool *quotaPool
-	// streamsQuota limits the max number of concurrent streams.
-	streamsQuota *quotaPool
-
-	// The scheme used: https if TLS is on, http otherwise.
-	scheme string
-
-	authCreds []credentials.Credentials
-
-	mu            sync.Mutex     // guard the following variables
-	state         transportState // the state of underlying connection
-	activeStreams map[uint32]*Stream
-	// The max number of concurrent streams
-	maxStreams int
-	// the per-stream outbound flow control window size set by the peer.
-	streamSendQuota uint32
-}
-
-// newHTTP2Client constructs a connected ClientTransport to addr based on HTTP2
-// and starts to receive messages on it. Non-nil error returns if construction
-// fails.
-func newHTTP2Client(addr string, opts *ConnectOptions) (_ ClientTransport, err error) {
-	if opts.Dialer == nil {
-		// Set the default Dialer.
-		opts.Dialer = func(addr string, timeout time.Duration) (net.Conn, error) {
-			return net.DialTimeout("tcp", addr, timeout)
-		}
-	}
-	scheme := "http"
-	startT := time.Now()
-	timeout := opts.Timeout
-	conn, connErr := opts.Dialer(addr, timeout)
-	if connErr != nil {
-		return nil, ConnectionErrorf("transport: %v", connErr)
-	}
-	var authInfo credentials.AuthInfo
-	for _, c := range opts.AuthOptions {
-		if ccreds, ok := c.(credentials.TransportAuthenticator); ok {
-			scheme = "https"
-			// TODO(zhaoq): Now the first TransportAuthenticator is used if there are
-			// multiple ones provided. Revisit this if it is not appropriate. Probably
-			// place the ClientTransport construction into a separate function to make
-			// things clear.
-			if timeout > 0 {
-				timeout -= time.Since(startT)
-			}
-			conn, authInfo, connErr = ccreds.ClientHandshake(addr, conn, timeout)
-			break
-		}
-	}
-	if connErr != nil {
-		return nil, ConnectionErrorf("transport: %v", connErr)
-	}
-	defer func() {
-		if err != nil {
-			conn.Close()
-		}
-	}()
-	// Send connection preface to server.
-	n, err := conn.Write(clientPreface)
-	if err != nil {
-		return nil, ConnectionErrorf("transport: %v", err)
-	}
-	if n != len(clientPreface) {
-		return nil, ConnectionErrorf("transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface))
-	}
-	framer := newFramer(conn)
-	if initialWindowSize != defaultWindowSize {
-		err = framer.writeSettings(true, http2.Setting{http2.SettingInitialWindowSize, uint32(initialWindowSize)})
-	} else {
-		err = framer.writeSettings(true)
-	}
-	if err != nil {
-		return nil, ConnectionErrorf("transport: %v", err)
-	}
-	// Adjust the connection flow control window if needed.
-	if delta := uint32(initialConnWindowSize - defaultWindowSize); delta > 0 {
-		if err := framer.writeWindowUpdate(true, 0, delta); err != nil {
-			return nil, ConnectionErrorf("transport: %v", err)
-		}
-	}
-	ua := primaryUA
-	if opts.UserAgent != "" {
-		ua = opts.UserAgent + " " + ua
-	}
-	var buf bytes.Buffer
-	t := &http2Client{
-		target:    addr,
-		userAgent: ua,
-		conn:      conn,
-		authInfo:  authInfo,
-		// The client initiated stream id is odd starting from 1.
-		nextID:          1,
-		writableChan:    make(chan int, 1),
-		shutdownChan:    make(chan struct{}),
-		errorChan:       make(chan struct{}),
-		framer:          framer,
-		hBuf:            &buf,
-		hEnc:            hpack.NewEncoder(&buf),
-		controlBuf:      newRecvBuffer(),
-		fc:              &inFlow{limit: initialConnWindowSize},
-		sendQuotaPool:   newQuotaPool(defaultWindowSize),
-		scheme:          scheme,
-		state:           reachable,
-		activeStreams:   make(map[uint32]*Stream),
-		authCreds:       opts.AuthOptions,
-		maxStreams:      math.MaxInt32,
-		streamSendQuota: defaultWindowSize,
-	}
-	go t.controller()
-	t.writableChan <- 0
-	// Start the reader goroutine for incoming message. The threading model
-	// on receiving is that each transport has a dedicated goroutine which
-	// reads HTTP2 frame from network. Then it dispatches the frame to the
-	// corresponding stream entity.
-	go t.reader()
-	return t, nil
-}
-
-func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
-	fc := &inFlow{
-		limit: initialWindowSize,
-		conn:  t.fc,
-	}
-	// TODO(zhaoq): Handle uint32 overflow of Stream.id.
-	s := &Stream{
-		id:            t.nextID,
-		method:        callHdr.Method,
-		buf:           newRecvBuffer(),
-		fc:            fc,
-		sendQuotaPool: newQuotaPool(int(t.streamSendQuota)),
-		headerChan:    make(chan struct{}),
-	}
-	t.nextID += 2
-	s.windowHandler = func(n int) {
-		t.updateWindow(s, uint32(n))
-	}
-	// Make a stream be able to cancel the pending operations by itself.
-	s.ctx, s.cancel = context.WithCancel(ctx)
-	s.dec = &recvBufferReader{
-		ctx:  s.ctx,
-		recv: s.buf,
-	}
-	return s
-}
-
-// NewStream creates a stream and register it into the transport as "active"
-// streams.
-func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Stream, err error) {
-	// Record the timeout value on the context.
-	var timeout time.Duration
-	if dl, ok := ctx.Deadline(); ok {
-		timeout = dl.Sub(time.Now())
-		if timeout <= 0 {
-			return nil, ContextErr(context.DeadlineExceeded)
-		}
-	}
-	pr := &peer.Peer{
-		Addr: t.conn.RemoteAddr(),
-	}
-	// Attach Auth info if there is any.
-	if t.authInfo != nil {
-		pr.AuthInfo = t.authInfo
-	}
-	ctx = peer.NewContext(ctx, pr)
-	authData := make(map[string]string)
-	for _, c := range t.authCreds {
-		// Construct URI required to get auth request metadata.
-		var port string
-		if pos := strings.LastIndex(t.target, ":"); pos != -1 {
-			// Omit port if it is the default one.
-			if t.target[pos+1:] != "443" {
-				port = ":" + t.target[pos+1:]
-			}
-		}
-		pos := strings.LastIndex(callHdr.Method, "/")
-		if pos == -1 {
-			return nil, StreamErrorf(codes.InvalidArgument, "transport: malformed method name: %q", callHdr.Method)
-		}
-		audience := "https://" + callHdr.Host + port + callHdr.Method[:pos]
-		data, err := c.GetRequestMetadata(ctx, audience)
-		if err != nil {
-			return nil, StreamErrorf(codes.InvalidArgument, "transport: %v", err)
-		}
-		for k, v := range data {
-			authData[k] = v
-		}
-	}
-	t.mu.Lock()
-	if t.state != reachable {
-		t.mu.Unlock()
-		return nil, ErrConnClosing
-	}
-	checkStreamsQuota := t.streamsQuota != nil
-	t.mu.Unlock()
-	if checkStreamsQuota {
-		sq, err := wait(ctx, t.shutdownChan, t.streamsQuota.acquire())
-		if err != nil {
-			return nil, err
-		}
-		// Returns the quota balance back.
-		if sq > 1 {
-			t.streamsQuota.add(sq - 1)
-		}
-	}
-	if _, err := wait(ctx, t.shutdownChan, t.writableChan); err != nil {
-		// t.streamsQuota will be updated when t.CloseStream is invoked.
-		return nil, err
-	}
-	t.mu.Lock()
-	if t.state != reachable {
-		t.mu.Unlock()
-		return nil, ErrConnClosing
-	}
-	s := t.newStream(ctx, callHdr)
-	t.activeStreams[s.id] = s
-
-	// This stream is not counted when applySetings(...) initialize t.streamsQuota.
-	// Reset t.streamsQuota to the right value.
-	var reset bool
-	if !checkStreamsQuota && t.streamsQuota != nil {
-		reset = true
-	}
-	t.mu.Unlock()
-	if reset {
-		t.streamsQuota.reset(-1)
-	}
-
-	// HPACK encodes various headers. Note that once WriteField(...) is
-	// called, the corresponding headers/continuation frame has to be sent
-	// because hpack.Encoder is stateful.
-	t.hBuf.Reset()
-	t.hEnc.WriteField(hpack.HeaderField{Name: ":method", Value: "POST"})
-	t.hEnc.WriteField(hpack.HeaderField{Name: ":scheme", Value: t.scheme})
-	t.hEnc.WriteField(hpack.HeaderField{Name: ":path", Value: callHdr.Method})
-	t.hEnc.WriteField(hpack.HeaderField{Name: ":authority", Value: callHdr.Host})
-	t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
-	t.hEnc.WriteField(hpack.HeaderField{Name: "user-agent", Value: t.userAgent})
-	t.hEnc.WriteField(hpack.HeaderField{Name: "te", Value: "trailers"})
-
-	if timeout > 0 {
-		t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-timeout", Value: timeoutEncode(timeout)})
-	}
-	for k, v := range authData {
-		t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: v})
-	}
-	var (
-		hasMD      bool
-		endHeaders bool
-	)
-	if md, ok := metadata.FromContext(ctx); ok {
-		hasMD = true
-		for k, v := range md {
-			for _, entry := range v {
-				t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
-			}
-		}
-	}
-	first := true
-	// Sends the headers in a single batch even when they span multiple frames.
-	for !endHeaders {
-		size := t.hBuf.Len()
-		if size > http2MaxFrameLen {
-			size = http2MaxFrameLen
-		} else {
-			endHeaders = true
-		}
-		if first {
-			// Sends a HeadersFrame to server to start a new stream.
-			p := http2.HeadersFrameParam{
-				StreamID:      s.id,
-				BlockFragment: t.hBuf.Next(size),
-				EndStream:     false,
-				EndHeaders:    endHeaders,
-			}
-			// Do a force flush for the buffered frames iff it is the last headers frame
-			// and there is header metadata to be sent. Otherwise, there is flushing until
-			// the corresponding data frame is written.
-			err = t.framer.writeHeaders(hasMD && endHeaders, p)
-			first = false
-		} else {
-			// Sends Continuation frames for the leftover headers.
-			err = t.framer.writeContinuation(hasMD && endHeaders, s.id, endHeaders, t.hBuf.Next(size))
-		}
-		if err != nil {
-			t.notifyError(err)
-			return nil, ConnectionErrorf("transport: %v", err)
-		}
-	}
-	t.writableChan <- 0
-	return s, nil
-}
-
-// CloseStream clears the footprint of a stream when the stream is not needed any more.
-// This must not be executed in reader's goroutine.
-func (t *http2Client) CloseStream(s *Stream, err error) {
-	var updateStreams bool
-	t.mu.Lock()
-	if t.streamsQuota != nil {
-		updateStreams = true
-	}
-	delete(t.activeStreams, s.id)
-	t.mu.Unlock()
-	if updateStreams {
-		t.streamsQuota.add(1)
-	}
-	// In case stream sending and receiving are invoked in separate
-	// goroutines (e.g., bi-directional streaming), the caller needs
-	// to call cancel on the stream to interrupt the blocking on
-	// other goroutines.
-	s.cancel()
-	s.mu.Lock()
-	if q := s.fc.restoreConn(); q > 0 {
-		t.controlBuf.put(&windowUpdate{0, q})
-	}
-	if s.state == streamDone {
-		s.mu.Unlock()
-		return
-	}
-	if !s.headerDone {
-		close(s.headerChan)
-		s.headerDone = true
-	}
-	s.state = streamDone
-	s.mu.Unlock()
-	if _, ok := err.(StreamError); ok {
-		t.controlBuf.put(&resetStream{s.id, http2.ErrCodeCancel})
-	}
-}
-
-// Close kicks off the shutdown process of the transport. This should be called
-// only once on a transport. Once it is called, the transport should not be
-// accessed any more.
-func (t *http2Client) Close() (err error) {
-	t.mu.Lock()
-	if t.state == closing {
-		t.mu.Unlock()
-		return errors.New("transport: Close() was already called")
-	}
-	t.state = closing
-	t.mu.Unlock()
-	close(t.shutdownChan)
-	err = t.conn.Close()
-	t.mu.Lock()
-	streams := t.activeStreams
-	t.activeStreams = nil
-	t.mu.Unlock()
-	// Notify all active streams.
-	for _, s := range streams {
-		s.mu.Lock()
-		if !s.headerDone {
-			close(s.headerChan)
-			s.headerDone = true
-		}
-		s.mu.Unlock()
-		s.write(recvMsg{err: ErrConnClosing})
-	}
-	return
-}
-
-// Write formats the data into HTTP2 data frame(s) and sends it out. The caller
-// should proceed only if Write returns nil.
-// TODO(zhaoq): opts.Delay is ignored in this implementation. Support it later
-// if it improves the performance.
-func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
-	r := bytes.NewBuffer(data)
-	for {
-		var p []byte
-		if r.Len() > 0 {
-			size := http2MaxFrameLen
-			s.sendQuotaPool.add(0)
-			// Wait until the stream has some quota to send the data.
-			sq, err := wait(s.ctx, t.shutdownChan, s.sendQuotaPool.acquire())
-			if err != nil {
-				return err
-			}
-			t.sendQuotaPool.add(0)
-			// Wait until the transport has some quota to send the data.
-			tq, err := wait(s.ctx, t.shutdownChan, t.sendQuotaPool.acquire())
-			if err != nil {
-				if _, ok := err.(StreamError); ok {
-					t.sendQuotaPool.cancel()
-				}
-				return err
-			}
-			if sq < size {
-				size = sq
-			}
-			if tq < size {
-				size = tq
-			}
-			p = r.Next(size)
-			ps := len(p)
-			if ps < sq {
-				// Overbooked stream quota. Return it back.
-				s.sendQuotaPool.add(sq - ps)
-			}
-			if ps < tq {
-				// Overbooked transport quota. Return it back.
-				t.sendQuotaPool.add(tq - ps)
-			}
-		}
-		var (
-			endStream  bool
-			forceFlush bool
-		)
-		if opts.Last && r.Len() == 0 {
-			endStream = true
-		}
-		// Indicate there is a writer who is about to write a data frame.
-		t.framer.adjustNumWriters(1)
-		// Got some quota. Try to acquire writing privilege on the transport.
-		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
-			if t.framer.adjustNumWriters(-1) == 0 {
-				// This writer is the last one in this batch and has the
-				// responsibility to flush the buffered frames. It queues
-				// a flush request to controlBuf instead of flushing directly
-				// in order to avoid the race with other writing or flushing.
-				t.controlBuf.put(&flushIO{})
-			}
-			return err
-		}
-		if r.Len() == 0 && t.framer.adjustNumWriters(0) == 1 {
-			// Do a force flush iff this is last frame for the entire gRPC message
-			// and the caller is the only writer at this moment.
-			forceFlush = true
-		}
-		// If WriteData fails, all the pending streams will be handled
-		// by http2Client.Close(). No explicit CloseStream() needs to be
-		// invoked.
-		if err := t.framer.writeData(forceFlush, s.id, endStream, p); err != nil {
-			t.notifyError(err)
-			return ConnectionErrorf("transport: %v", err)
-		}
-		if t.framer.adjustNumWriters(-1) == 0 {
-			t.framer.flushWrite()
-		}
-		t.writableChan <- 0
-		if r.Len() == 0 {
-			break
-		}
-	}
-	if !opts.Last {
-		return nil
-	}
-	s.mu.Lock()
-	if s.state != streamDone {
-		if s.state == streamReadDone {
-			s.state = streamDone
-		} else {
-			s.state = streamWriteDone
-		}
-	}
-	s.mu.Unlock()
-	return nil
-}
-
-func (t *http2Client) getStream(f http2.Frame) (*Stream, bool) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if t.activeStreams == nil {
-		// The transport is closing.
-		return nil, false
-	}
-	if s, ok := t.activeStreams[f.Header().StreamID]; ok {
-		return s, true
-	}
-	return nil, false
-}
-
-// updateWindow adjusts the inbound quota for the stream and the transport.
-// Window updates will deliver to the controller for sending when
-// the cumulative quota exceeds the corresponding threshold.
-func (t *http2Client) updateWindow(s *Stream, n uint32) {
-	swu, cwu := s.fc.onRead(n)
-	if swu > 0 {
-		t.controlBuf.put(&windowUpdate{s.id, swu})
-	}
-	if cwu > 0 {
-		t.controlBuf.put(&windowUpdate{0, cwu})
-	}
-}
-
-func (t *http2Client) handleData(f *http2.DataFrame) {
-	// Select the right stream to dispatch.
-	s, ok := t.getStream(f)
-	if !ok {
-		return
-	}
-	size := len(f.Data())
-	if size > 0 {
-		if err := s.fc.onData(uint32(size)); err != nil {
-			if _, ok := err.(ConnectionError); ok {
-				t.notifyError(err)
-				return
-			}
-			s.mu.Lock()
-			if s.state == streamDone {
-				s.mu.Unlock()
-				return
-			}
-			s.state = streamDone
-			s.statusCode = codes.Internal
-			s.statusDesc = err.Error()
-			s.mu.Unlock()
-			s.write(recvMsg{err: io.EOF})
-			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeFlowControl})
-			return
-		}
-		// TODO(bradfitz, zhaoq): A copy is required here because there is no
-		// guarantee f.Data() is consumed before the arrival of next frame.
-		// Can this copy be eliminated?
-		data := make([]byte, size)
-		copy(data, f.Data())
-		s.write(recvMsg{data: data})
-	}
-	// The server has closed the stream without sending trailers.  Record that
-	// the read direction is closed, and set the status appropriately.
-	if f.FrameHeader.Flags.Has(http2.FlagDataEndStream) {
-		s.mu.Lock()
-		if s.state == streamWriteDone {
-			s.state = streamDone
-		} else {
-			s.state = streamReadDone
-		}
-		s.statusCode = codes.Internal
-		s.statusDesc = "server closed the stream without sending trailers"
-		s.mu.Unlock()
-		s.write(recvMsg{err: io.EOF})
-	}
-}
-
-func (t *http2Client) handleRSTStream(f *http2.RSTStreamFrame) {
-	s, ok := t.getStream(f)
-	if !ok {
-		return
-	}
-	s.mu.Lock()
-	if s.state == streamDone {
-		s.mu.Unlock()
-		return
-	}
-	s.state = streamDone
-	if !s.headerDone {
-		close(s.headerChan)
-		s.headerDone = true
-	}
-	s.statusCode, ok = http2RSTErrConvTab[http2.ErrCode(f.ErrCode)]
-	if !ok {
-		grpclog.Println("transport: http2Client.handleRSTStream found no mapped gRPC status for the received http2 error ", f.ErrCode)
-	}
-	s.mu.Unlock()
-	s.write(recvMsg{err: io.EOF})
-}
-
-func (t *http2Client) handleSettings(f *http2.SettingsFrame) {
-	if f.IsAck() {
-		return
-	}
-	var ss []http2.Setting
-	f.ForeachSetting(func(s http2.Setting) error {
-		ss = append(ss, s)
-		return nil
-	})
-	// The settings will be applied once the ack is sent.
-	t.controlBuf.put(&settings{ack: true, ss: ss})
-}
-
-func (t *http2Client) handlePing(f *http2.PingFrame) {
-	pingAck := &ping{ack: true}
-	copy(pingAck.data[:], f.Data[:])
-	t.controlBuf.put(pingAck)
-}
-
-func (t *http2Client) handleGoAway(f *http2.GoAwayFrame) {
-	// TODO(zhaoq): GoAwayFrame handler to be implemented
-}
-
-func (t *http2Client) handleWindowUpdate(f *http2.WindowUpdateFrame) {
-	id := f.Header().StreamID
-	incr := f.Increment
-	if id == 0 {
-		t.sendQuotaPool.add(int(incr))
-		return
-	}
-	if s, ok := t.getStream(f); ok {
-		s.sendQuotaPool.add(int(incr))
-	}
-}
-
-// operateHeader takes action on the decoded headers. It returns the current
-// stream if there are remaining headers on the wire (in the following
-// Continuation frame).
-func (t *http2Client) operateHeaders(hDec *hpackDecoder, s *Stream, frame headerFrame, endStream bool) (pendingStream *Stream) {
-	defer func() {
-		if pendingStream == nil {
-			hDec.state = decodeState{}
-		}
-	}()
-	endHeaders, err := hDec.decodeClientHTTP2Headers(frame)
-	if s == nil {
-		// s has been closed.
-		return nil
-	}
-	if err != nil {
-		s.write(recvMsg{err: err})
-		// Something wrong. Stops reading even when there is remaining.
-		return nil
-	}
-	if !endHeaders {
-		return s
-	}
-
-	s.mu.Lock()
-	if !s.headerDone {
-		if !endStream && len(hDec.state.mdata) > 0 {
-			s.header = hDec.state.mdata
-		}
-		close(s.headerChan)
-		s.headerDone = true
-	}
-	if !endStream || s.state == streamDone {
-		s.mu.Unlock()
-		return nil
-	}
-
-	if len(hDec.state.mdata) > 0 {
-		s.trailer = hDec.state.mdata
-	}
-	s.state = streamDone
-	s.statusCode = hDec.state.statusCode
-	s.statusDesc = hDec.state.statusDesc
-	s.mu.Unlock()
-
-	s.write(recvMsg{err: io.EOF})
-	return nil
-}
-
-// reader runs as a separate goroutine in charge of reading data from network
-// connection.
-//
-// TODO(zhaoq): currently one reader per transport. Investigate whether this is
-// optimal.
-// TODO(zhaoq): Check the validity of the incoming frame sequence.
-func (t *http2Client) reader() {
-	// Check the validity of server preface.
-	frame, err := t.framer.readFrame()
-	if err != nil {
-		t.notifyError(err)
-		return
-	}
-	sf, ok := frame.(*http2.SettingsFrame)
-	if !ok {
-		t.notifyError(err)
-		return
-	}
-	t.handleSettings(sf)
-
-	hDec := newHPACKDecoder()
-	var curStream *Stream
-	// loop to keep reading incoming messages on this transport.
-	for {
-		frame, err := t.framer.readFrame()
-		if err != nil {
-			t.notifyError(err)
-			return
-		}
-		switch frame := frame.(type) {
-		case *http2.HeadersFrame:
-			// operateHeaders has to be invoked regardless the value of curStream
-			// because the HPACK decoder needs to be updated using the received
-			// headers.
-			curStream, _ = t.getStream(frame)
-			endStream := frame.Header().Flags.Has(http2.FlagHeadersEndStream)
-			curStream = t.operateHeaders(hDec, curStream, frame, endStream)
-		case *http2.ContinuationFrame:
-			curStream = t.operateHeaders(hDec, curStream, frame, frame.HeadersEnded())
-		case *http2.DataFrame:
-			t.handleData(frame)
-		case *http2.RSTStreamFrame:
-			t.handleRSTStream(frame)
-		case *http2.SettingsFrame:
-			t.handleSettings(frame)
-		case *http2.PingFrame:
-			t.handlePing(frame)
-		case *http2.GoAwayFrame:
-			t.handleGoAway(frame)
-		case *http2.WindowUpdateFrame:
-			t.handleWindowUpdate(frame)
-		default:
-			grpclog.Printf("transport: http2Client.reader got unhandled frame type %v.", frame)
-		}
-	}
-}
-
-func (t *http2Client) applySettings(ss []http2.Setting) {
-	for _, s := range ss {
-		switch s.ID {
-		case http2.SettingMaxConcurrentStreams:
-			// TODO(zhaoq): This is a hack to avoid significant refactoring of the
-			// code to deal with the unrealistic int32 overflow. Probably will try
-			// to find a better way to handle this later.
-			if s.Val > math.MaxInt32 {
-				s.Val = math.MaxInt32
-			}
-			t.mu.Lock()
-			reset := t.streamsQuota != nil
-			if !reset {
-				t.streamsQuota = newQuotaPool(int(s.Val) - len(t.activeStreams))
-			}
-			ms := t.maxStreams
-			t.maxStreams = int(s.Val)
-			t.mu.Unlock()
-			if reset {
-				t.streamsQuota.reset(int(s.Val) - ms)
-			}
-		case http2.SettingInitialWindowSize:
-			t.mu.Lock()
-			for _, stream := range t.activeStreams {
-				// Adjust the sending quota for each stream.
-				stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
-			}
-			t.streamSendQuota = s.Val
-			t.mu.Unlock()
-		}
-	}
-}
-
-// controller running in a separate goroutine takes charge of sending control
-// frames (e.g., window update, reset stream, setting, etc.) to the server.
-func (t *http2Client) controller() {
-	for {
-		select {
-		case i := <-t.controlBuf.get():
-			t.controlBuf.load()
-			select {
-			case <-t.writableChan:
-				switch i := i.(type) {
-				case *windowUpdate:
-					t.framer.writeWindowUpdate(true, i.streamID, i.increment)
-				case *settings:
-					if i.ack {
-						t.framer.writeSettingsAck(true)
-						t.applySettings(i.ss)
-					} else {
-						t.framer.writeSettings(true, i.ss...)
-					}
-				case *resetStream:
-					t.framer.writeRSTStream(true, i.streamID, i.code)
-				case *flushIO:
-					t.framer.flushWrite()
-				case *ping:
-					t.framer.writePing(true, i.ack, i.data)
-				default:
-					grpclog.Printf("transport: http2Client.controller got unexpected item type %v\n", i)
-				}
-				t.writableChan <- 0
-				continue
-			case <-t.shutdownChan:
-				return
-			}
-		case <-t.shutdownChan:
-			return
-		}
-	}
-}
-
-func (t *http2Client) Error() <-chan struct{} {
-	return t.errorChan
-}
-
-func (t *http2Client) notifyError(err error) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	// make sure t.errorChan is closed only once.
-	if t.state == reachable {
-		t.state = unreachable
-		close(t.errorChan)
-		grpclog.Printf("transport: http2Client.notifyError got notified that the client transport was broken %v.", err)
-	}
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go b/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go
deleted file mode 100644
index 98088d9a73..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/transport/http2_server.go
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package transport
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"math"
-	"net"
-	"strconv"
-	"sync"
-
-	"golang.org/x/net/context"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/peer"
-)
-
-// ErrIllegalHeaderWrite indicates that setting header is illegal because of
-// the stream's state.
-var ErrIllegalHeaderWrite = errors.New("transport: the stream is done or WriteHeader was already called")
-
-// http2Server implements the ServerTransport interface with HTTP2.
-type http2Server struct {
-	conn        net.Conn
-	maxStreamID uint32               // max stream ID ever seen
-	authInfo    credentials.AuthInfo // auth info about the connection
-	// writableChan synchronizes write access to the transport.
-	// A writer acquires the write lock by sending a value on writableChan
-	// and releases it by receiving from writableChan.
-	writableChan chan int
-	// shutdownChan is closed when Close is called.
-	// Blocking operations should select on shutdownChan to avoid
-	// blocking forever after Close.
-	shutdownChan chan struct{}
-	framer       *framer
-	hBuf         *bytes.Buffer  // the buffer for HPACK encoding
-	hEnc         *hpack.Encoder // HPACK encoder
-
-	// The max number of concurrent streams.
-	maxStreams uint32
-	// controlBuf delivers all the control related tasks (e.g., window
-	// updates, reset streams, and various settings) to the controller.
-	controlBuf *recvBuffer
-	fc         *inFlow
-	// sendQuotaPool provides flow control to outbound message.
-	sendQuotaPool *quotaPool
-
-	mu            sync.Mutex // guard the following
-	state         transportState
-	activeStreams map[uint32]*Stream
-	// the per-stream outbound flow control window size set by the peer.
-	streamSendQuota uint32
-}
-
-// newHTTP2Server constructs a ServerTransport based on HTTP2. ConnectionError is
-// returned if something goes wrong.
-func newHTTP2Server(conn net.Conn, maxStreams uint32, authInfo credentials.AuthInfo) (_ ServerTransport, err error) {
-	framer := newFramer(conn)
-	// Send initial settings as connection preface to client.
-	var settings []http2.Setting
-	// TODO(zhaoq): Have a better way to signal "no limit" because 0 is
-	// permitted in the HTTP2 spec.
-	if maxStreams == 0 {
-		maxStreams = math.MaxUint32
-	} else {
-		settings = append(settings, http2.Setting{http2.SettingMaxConcurrentStreams, maxStreams})
-	}
-	if initialWindowSize != defaultWindowSize {
-		settings = append(settings, http2.Setting{http2.SettingInitialWindowSize, uint32(initialWindowSize)})
-	}
-	if err := framer.writeSettings(true, settings...); err != nil {
-		return nil, ConnectionErrorf("transport: %v", err)
-	}
-	// Adjust the connection flow control window if needed.
-	if delta := uint32(initialConnWindowSize - defaultWindowSize); delta > 0 {
-		if err := framer.writeWindowUpdate(true, 0, delta); err != nil {
-			return nil, ConnectionErrorf("transport: %v", err)
-		}
-	}
-	var buf bytes.Buffer
-	t := &http2Server{
-		conn:            conn,
-		authInfo:        authInfo,
-		framer:          framer,
-		hBuf:            &buf,
-		hEnc:            hpack.NewEncoder(&buf),
-		maxStreams:      maxStreams,
-		controlBuf:      newRecvBuffer(),
-		fc:              &inFlow{limit: initialConnWindowSize},
-		sendQuotaPool:   newQuotaPool(defaultWindowSize),
-		state:           reachable,
-		writableChan:    make(chan int, 1),
-		shutdownChan:    make(chan struct{}),
-		activeStreams:   make(map[uint32]*Stream),
-		streamSendQuota: defaultWindowSize,
-	}
-	go t.controller()
-	t.writableChan <- 0
-	return t, nil
-}
-
-// operateHeader takes action on the decoded headers. It returns the current
-// stream if there are remaining headers on the wire (in the following
-// Continuation frame).
-func (t *http2Server) operateHeaders(hDec *hpackDecoder, s *Stream, frame headerFrame, endStream bool, handle func(*Stream)) (pendingStream *Stream) {
-	defer func() {
-		if pendingStream == nil {
-			hDec.state = decodeState{}
-		}
-	}()
-	endHeaders, err := hDec.decodeServerHTTP2Headers(frame)
-	if s == nil {
-		// s has been closed.
-		return nil
-	}
-	if err != nil {
-		grpclog.Printf("transport: http2Server.operateHeader found %v", err)
-		if se, ok := err.(StreamError); ok {
-			t.controlBuf.put(&resetStream{s.id, statusCodeConvTab[se.Code]})
-		}
-		return nil
-	}
-	if endStream {
-		// s is just created by the caller. No lock needed.
-		s.state = streamReadDone
-	}
-	if !endHeaders {
-		return s
-	}
-	if hDec.state.timeoutSet {
-		s.ctx, s.cancel = context.WithTimeout(context.TODO(), hDec.state.timeout)
-	} else {
-		s.ctx, s.cancel = context.WithCancel(context.TODO())
-	}
-	pr := &peer.Peer{
-		Addr: t.conn.RemoteAddr(),
-	}
-	// Attach Auth info if there is any.
-	if t.authInfo != nil {
-		pr.AuthInfo = t.authInfo
-	}
-	s.ctx = peer.NewContext(s.ctx, pr)
-	// Cache the current stream to the context so that the server application
-	// can find out. Required when the server wants to send some metadata
-	// back to the client (unary call only).
-	s.ctx = newContextWithStream(s.ctx, s)
-	// Attach the received metadata to the context.
-	if len(hDec.state.mdata) > 0 {
-		s.ctx = metadata.NewContext(s.ctx, hDec.state.mdata)
-	}
-
-	s.dec = &recvBufferReader{
-		ctx:  s.ctx,
-		recv: s.buf,
-	}
-	s.method = hDec.state.method
-	t.mu.Lock()
-	if t.state != reachable {
-		t.mu.Unlock()
-		return nil
-	}
-	if uint32(len(t.activeStreams)) >= t.maxStreams {
-		t.mu.Unlock()
-		t.controlBuf.put(&resetStream{s.id, http2.ErrCodeRefusedStream})
-		return nil
-	}
-	s.sendQuotaPool = newQuotaPool(int(t.streamSendQuota))
-	t.activeStreams[s.id] = s
-	t.mu.Unlock()
-	s.windowHandler = func(n int) {
-		t.updateWindow(s, uint32(n))
-	}
-	handle(s)
-	return nil
-}
-
-// HandleStreams receives incoming streams using the given handler. This is
-// typically run in a separate goroutine.
-func (t *http2Server) HandleStreams(handle func(*Stream)) {
-	// Check the validity of client preface.
-	preface := make([]byte, len(clientPreface))
-	if _, err := io.ReadFull(t.conn, preface); err != nil {
-		grpclog.Printf("transport: http2Server.HandleStreams failed to receive the preface from client: %v", err)
-		t.Close()
-		return
-	}
-	if !bytes.Equal(preface, clientPreface) {
-		grpclog.Printf("transport: http2Server.HandleStreams received bogus greeting from client: %q", preface)
-		t.Close()
-		return
-	}
-
-	frame, err := t.framer.readFrame()
-	if err != nil {
-		grpclog.Printf("transport: http2Server.HandleStreams failed to read frame: %v", err)
-		t.Close()
-		return
-	}
-	sf, ok := frame.(*http2.SettingsFrame)
-	if !ok {
-		grpclog.Printf("transport: http2Server.HandleStreams saw invalid preface type %T from client", frame)
-		t.Close()
-		return
-	}
-	t.handleSettings(sf)
-
-	hDec := newHPACKDecoder()
-	var curStream *Stream
-	for {
-		frame, err := t.framer.readFrame()
-		if err != nil {
-			t.Close()
-			return
-		}
-		switch frame := frame.(type) {
-		case *http2.HeadersFrame:
-			id := frame.Header().StreamID
-			if id%2 != 1 || id <= t.maxStreamID {
-				// illegal gRPC stream id.
-				grpclog.Println("transport: http2Server.HandleStreams received an illegal stream id: ", id)
-				t.Close()
-				break
-			}
-			t.maxStreamID = id
-			buf := newRecvBuffer()
-			fc := &inFlow{
-				limit: initialWindowSize,
-				conn:  t.fc,
-			}
-			curStream = &Stream{
-				id:  frame.Header().StreamID,
-				st:  t,
-				buf: buf,
-				fc:  fc,
-			}
-			endStream := frame.Header().Flags.Has(http2.FlagHeadersEndStream)
-			curStream = t.operateHeaders(hDec, curStream, frame, endStream, handle)
-		case *http2.ContinuationFrame:
-			curStream = t.operateHeaders(hDec, curStream, frame, frame.HeadersEnded(), handle)
-		case *http2.DataFrame:
-			t.handleData(frame)
-		case *http2.RSTStreamFrame:
-			t.handleRSTStream(frame)
-		case *http2.SettingsFrame:
-			t.handleSettings(frame)
-		case *http2.PingFrame:
-			t.handlePing(frame)
-		case *http2.WindowUpdateFrame:
-			t.handleWindowUpdate(frame)
-		case *http2.GoAwayFrame:
-			break
-		default:
-			grpclog.Printf("transport: http2Server.HandleStreams found unhandled frame type %v.", frame)
-		}
-	}
-}
-
-func (t *http2Server) getStream(f http2.Frame) (*Stream, bool) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if t.activeStreams == nil {
-		// The transport is closing.
-		return nil, false
-	}
-	s, ok := t.activeStreams[f.Header().StreamID]
-	if !ok {
-		// The stream is already done.
-		return nil, false
-	}
-	return s, true
-}
-
-// updateWindow adjusts the inbound quota for the stream and the transport.
-// Window updates will deliver to the controller for sending when
-// the cumulative quota exceeds the corresponding threshold.
-func (t *http2Server) updateWindow(s *Stream, n uint32) {
-	swu, cwu := s.fc.onRead(n)
-	if swu > 0 {
-		t.controlBuf.put(&windowUpdate{s.id, swu})
-	}
-	if cwu > 0 {
-		t.controlBuf.put(&windowUpdate{0, cwu})
-	}
-}
-
-func (t *http2Server) handleData(f *http2.DataFrame) {
-	// Select the right stream to dispatch.
-	s, ok := t.getStream(f)
-	if !ok {
-		return
-	}
-	size := len(f.Data())
-	if size > 0 {
-		if err := s.fc.onData(uint32(size)); err != nil {
-			if _, ok := err.(ConnectionError); ok {
-				grpclog.Printf("transport: http2Server %v", err)
-				t.Close()
-				return
-			}
-			t.closeStream(s)
-			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeFlowControl})
-			return
-		}
-		// TODO(bradfitz, zhaoq): A copy is required here because there is no
-		// guarantee f.Data() is consumed before the arrival of next frame.
-		// Can this copy be eliminated?
-		data := make([]byte, size)
-		copy(data, f.Data())
-		s.write(recvMsg{data: data})
-	}
-	if f.Header().Flags.Has(http2.FlagDataEndStream) {
-		// Received the end of stream from the client.
-		s.mu.Lock()
-		if s.state != streamDone {
-			if s.state == streamWriteDone {
-				s.state = streamDone
-			} else {
-				s.state = streamReadDone
-			}
-		}
-		s.mu.Unlock()
-		s.write(recvMsg{err: io.EOF})
-	}
-}
-
-func (t *http2Server) handleRSTStream(f *http2.RSTStreamFrame) {
-	s, ok := t.getStream(f)
-	if !ok {
-		return
-	}
-	t.closeStream(s)
-}
-
-func (t *http2Server) handleSettings(f *http2.SettingsFrame) {
-	if f.IsAck() {
-		return
-	}
-	var ss []http2.Setting
-	f.ForeachSetting(func(s http2.Setting) error {
-		ss = append(ss, s)
-		return nil
-	})
-	// The settings will be applied once the ack is sent.
-	t.controlBuf.put(&settings{ack: true, ss: ss})
-}
-
-func (t *http2Server) handlePing(f *http2.PingFrame) {
-	pingAck := &ping{ack: true}
-	copy(pingAck.data[:], f.Data[:])
-	t.controlBuf.put(pingAck)
-}
-
-func (t *http2Server) handleWindowUpdate(f *http2.WindowUpdateFrame) {
-	id := f.Header().StreamID
-	incr := f.Increment
-	if id == 0 {
-		t.sendQuotaPool.add(int(incr))
-		return
-	}
-	if s, ok := t.getStream(f); ok {
-		s.sendQuotaPool.add(int(incr))
-	}
-}
-
-func (t *http2Server) writeHeaders(s *Stream, b *bytes.Buffer, endStream bool) error {
-	first := true
-	endHeaders := false
-	var err error
-	// Sends the headers in a single batch.
-	for !endHeaders {
-		size := t.hBuf.Len()
-		if size > http2MaxFrameLen {
-			size = http2MaxFrameLen
-		} else {
-			endHeaders = true
-		}
-		if first {
-			p := http2.HeadersFrameParam{
-				StreamID:      s.id,
-				BlockFragment: b.Next(size),
-				EndStream:     endStream,
-				EndHeaders:    endHeaders,
-			}
-			err = t.framer.writeHeaders(endHeaders, p)
-			first = false
-		} else {
-			err = t.framer.writeContinuation(endHeaders, s.id, endHeaders, b.Next(size))
-		}
-		if err != nil {
-			t.Close()
-			return ConnectionErrorf("transport: %v", err)
-		}
-	}
-	return nil
-}
-
-// WriteHeader sends the header metedata md back to the client.
-func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
-	s.mu.Lock()
-	if s.headerOk || s.state == streamDone {
-		s.mu.Unlock()
-		return ErrIllegalHeaderWrite
-	}
-	s.headerOk = true
-	s.mu.Unlock()
-	if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
-		return err
-	}
-	t.hBuf.Reset()
-	t.hEnc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-	t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
-	for k, v := range md {
-		for _, entry := range v {
-			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
-		}
-	}
-	if err := t.writeHeaders(s, t.hBuf, false); err != nil {
-		return err
-	}
-	t.writableChan <- 0
-	return nil
-}
-
-// WriteStatus sends stream status to the client and terminates the stream.
-// There is no further I/O operations being able to perform on this stream.
-// TODO(zhaoq): Now it indicates the end of entire stream. Revisit if early
-// OK is adopted.
-func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc string) error {
-	var headersSent bool
-	s.mu.Lock()
-	if s.state == streamDone {
-		s.mu.Unlock()
-		return nil
-	}
-	if s.headerOk {
-		headersSent = true
-	}
-	s.mu.Unlock()
-	if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
-		return err
-	}
-	t.hBuf.Reset()
-	if !headersSent {
-		t.hEnc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
-	}
-	t.hEnc.WriteField(
-		hpack.HeaderField{
-			Name:  "grpc-status",
-			Value: strconv.Itoa(int(statusCode)),
-		})
-	t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-message", Value: statusDesc})
-	// Attach the trailer metadata.
-	for k, v := range s.trailer {
-		for _, entry := range v {
-			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
-		}
-	}
-	if err := t.writeHeaders(s, t.hBuf, true); err != nil {
-		t.Close()
-		return err
-	}
-	t.closeStream(s)
-	t.writableChan <- 0
-	return nil
-}
-
-// Write converts the data into HTTP2 data frame and sends it out. Non-nil error
-// is returns if it fails (e.g., framing error, transport error).
-func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
-	// TODO(zhaoq): Support multi-writers for a single stream.
-	var writeHeaderFrame bool
-	s.mu.Lock()
-	if !s.headerOk {
-		writeHeaderFrame = true
-		s.headerOk = true
-	}
-	s.mu.Unlock()
-	if writeHeaderFrame {
-		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
-			return err
-		}
-		t.hBuf.Reset()
-		t.hEnc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
-		p := http2.HeadersFrameParam{
-			StreamID:      s.id,
-			BlockFragment: t.hBuf.Bytes(),
-			EndHeaders:    true,
-		}
-		if err := t.framer.writeHeaders(false, p); err != nil {
-			t.Close()
-			return ConnectionErrorf("transport: %v", err)
-		}
-		t.writableChan <- 0
-	}
-	r := bytes.NewBuffer(data)
-	for {
-		if r.Len() == 0 {
-			return nil
-		}
-		size := http2MaxFrameLen
-		s.sendQuotaPool.add(0)
-		// Wait until the stream has some quota to send the data.
-		sq, err := wait(s.ctx, t.shutdownChan, s.sendQuotaPool.acquire())
-		if err != nil {
-			return err
-		}
-		t.sendQuotaPool.add(0)
-		// Wait until the transport has some quota to send the data.
-		tq, err := wait(s.ctx, t.shutdownChan, t.sendQuotaPool.acquire())
-		if err != nil {
-			if _, ok := err.(StreamError); ok {
-				t.sendQuotaPool.cancel()
-			}
-			return err
-		}
-		if sq < size {
-			size = sq
-		}
-		if tq < size {
-			size = tq
-		}
-		p := r.Next(size)
-		ps := len(p)
-		if ps < sq {
-			// Overbooked stream quota. Return it back.
-			s.sendQuotaPool.add(sq - ps)
-		}
-		if ps < tq {
-			// Overbooked transport quota. Return it back.
-			t.sendQuotaPool.add(tq - ps)
-		}
-		t.framer.adjustNumWriters(1)
-		// Got some quota. Try to acquire writing privilege on the
-		// transport.
-		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
-			if t.framer.adjustNumWriters(-1) == 0 {
-				// This writer is the last one in this batch and has the
-				// responsibility to flush the buffered frames. It queues
-				// a flush request to controlBuf instead of flushing directly
-				// in order to avoid the race with other writing or flushing.
-				t.controlBuf.put(&flushIO{})
-			}
-			return err
-		}
-		var forceFlush bool
-		if r.Len() == 0 && t.framer.adjustNumWriters(0) == 1 && !opts.Last {
-			forceFlush = true
-		}
-		if err := t.framer.writeData(forceFlush, s.id, false, p); err != nil {
-			t.Close()
-			return ConnectionErrorf("transport: %v", err)
-		}
-		if t.framer.adjustNumWriters(-1) == 0 {
-			t.framer.flushWrite()
-		}
-		t.writableChan <- 0
-	}
-
-}
-
-func (t *http2Server) applySettings(ss []http2.Setting) {
-	for _, s := range ss {
-		if s.ID == http2.SettingInitialWindowSize {
-			t.mu.Lock()
-			defer t.mu.Unlock()
-			for _, stream := range t.activeStreams {
-				stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
-			}
-			t.streamSendQuota = s.Val
-		}
-
-	}
-}
-
-// controller running in a separate goroutine takes charge of sending control
-// frames (e.g., window update, reset stream, setting, etc.) to the server.
-func (t *http2Server) controller() {
-	for {
-		select {
-		case i := <-t.controlBuf.get():
-			t.controlBuf.load()
-			select {
-			case <-t.writableChan:
-				switch i := i.(type) {
-				case *windowUpdate:
-					t.framer.writeWindowUpdate(true, i.streamID, i.increment)
-				case *settings:
-					if i.ack {
-						t.framer.writeSettingsAck(true)
-						t.applySettings(i.ss)
-					} else {
-						t.framer.writeSettings(true, i.ss...)
-					}
-				case *resetStream:
-					t.framer.writeRSTStream(true, i.streamID, i.code)
-				case *flushIO:
-					t.framer.flushWrite()
-				case *ping:
-					t.framer.writePing(true, i.ack, i.data)
-				default:
-					grpclog.Printf("transport: http2Server.controller got unexpected item type %v\n", i)
-				}
-				t.writableChan <- 0
-				continue
-			case <-t.shutdownChan:
-				return
-			}
-		case <-t.shutdownChan:
-			return
-		}
-	}
-}
-
-// Close starts shutting down the http2Server transport.
-// TODO(zhaoq): Now the destruction is not blocked on any pending streams. This
-// could cause some resource issue. Revisit this later.
-func (t *http2Server) Close() (err error) {
-	t.mu.Lock()
-	if t.state == closing {
-		t.mu.Unlock()
-		return errors.New("transport: Close() was already called")
-	}
-	t.state = closing
-	streams := t.activeStreams
-	t.activeStreams = nil
-	t.mu.Unlock()
-	close(t.shutdownChan)
-	err = t.conn.Close()
-	// Cancel all active streams.
-	for _, s := range streams {
-		s.cancel()
-	}
-	return
-}
-
-// closeStream clears the footprint of a stream when the stream is not needed
-// any more.
-func (t *http2Server) closeStream(s *Stream) {
-	t.mu.Lock()
-	delete(t.activeStreams, s.id)
-	t.mu.Unlock()
-	if q := s.fc.restoreConn(); q > 0 {
-		t.controlBuf.put(&windowUpdate{0, q})
-	}
-	s.mu.Lock()
-	if s.state == streamDone {
-		s.mu.Unlock()
-		return
-	}
-	s.state = streamDone
-	s.mu.Unlock()
-	// In case stream sending and receiving are invoked in separate
-	// goroutines (e.g., bi-directional streaming), cancel needs to be
-	// called to interrupt the potential blocking on other goroutines.
-	s.cancel()
-}
-
-func (t *http2Server) RemoteAddr() net.Addr {
-	return t.conn.RemoteAddr()
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go b/Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go
deleted file mode 100644
index fec4e4755d..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/transport/http_util.go
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package transport
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"net"
-	"strconv"
-	"strings"
-	"sync/atomic"
-	"time"
-
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/metadata"
-)
-
-const (
-	// The primary user agent
-	primaryUA = "grpc-go/0.11"
-	// http2MaxFrameLen specifies the max length of a HTTP2 frame.
-	http2MaxFrameLen = 16384 // 16KB frame
-	// http://http2.github.io/http2-spec/#SettingValues
-	http2InitHeaderTableSize = 4096
-	// http2IOBufSize specifies the buffer size for sending frames.
-	http2IOBufSize = 32 * 1024
-)
-
-var (
-	clientPreface      = []byte(http2.ClientPreface)
-	http2RSTErrConvTab = map[http2.ErrCode]codes.Code{
-		http2.ErrCodeNo:                 codes.Internal,
-		http2.ErrCodeProtocol:           codes.Internal,
-		http2.ErrCodeInternal:           codes.Internal,
-		http2.ErrCodeFlowControl:        codes.ResourceExhausted,
-		http2.ErrCodeSettingsTimeout:    codes.Internal,
-		http2.ErrCodeFrameSize:          codes.Internal,
-		http2.ErrCodeRefusedStream:      codes.Unavailable,
-		http2.ErrCodeCancel:             codes.Canceled,
-		http2.ErrCodeCompression:        codes.Internal,
-		http2.ErrCodeConnect:            codes.Internal,
-		http2.ErrCodeEnhanceYourCalm:    codes.ResourceExhausted,
-		http2.ErrCodeInadequateSecurity: codes.PermissionDenied,
-	}
-	statusCodeConvTab = map[codes.Code]http2.ErrCode{
-		codes.Internal:          http2.ErrCodeInternal,
-		codes.Canceled:          http2.ErrCodeCancel,
-		codes.Unavailable:       http2.ErrCodeRefusedStream,
-		codes.ResourceExhausted: http2.ErrCodeEnhanceYourCalm,
-		codes.PermissionDenied:  http2.ErrCodeInadequateSecurity,
-	}
-)
-
-// Records the states during HPACK decoding. Must be reset once the
-// decoding of the entire headers are finished.
-type decodeState struct {
-	// statusCode caches the stream status received from the trailer
-	// the server sent. Client side only.
-	statusCode codes.Code
-	statusDesc string
-	// Server side only fields.
-	timeoutSet bool
-	timeout    time.Duration
-	method     string
-	// key-value metadata map from the peer.
-	mdata map[string][]string
-}
-
-// An hpackDecoder decodes HTTP2 headers which may span multiple frames.
-type hpackDecoder struct {
-	h     *hpack.Decoder
-	state decodeState
-	err   error // The err when decoding
-}
-
-// A headerFrame is either a http2.HeaderFrame or http2.ContinuationFrame.
-type headerFrame interface {
-	Header() http2.FrameHeader
-	HeaderBlockFragment() []byte
-	HeadersEnded() bool
-}
-
-// isReservedHeader checks whether hdr belongs to HTTP2 headers
-// reserved by gRPC protocol. Any other headers are classified as the
-// user-specified metadata.
-func isReservedHeader(hdr string) bool {
-	if hdr[0] == ':' {
-		return true
-	}
-	switch hdr {
-	case "content-type",
-		"grpc-message-type",
-		"grpc-encoding",
-		"grpc-message",
-		"grpc-status",
-		"grpc-timeout",
-		"te":
-		return true
-	default:
-		return false
-	}
-}
-
-func newHPACKDecoder() *hpackDecoder {
-	d := &hpackDecoder{}
-	d.h = hpack.NewDecoder(http2InitHeaderTableSize, func(f hpack.HeaderField) {
-		switch f.Name {
-		case "content-type":
-			if !strings.Contains(f.Value, "application/grpc") {
-				d.err = StreamErrorf(codes.FailedPrecondition, "transport: received the unexpected header")
-				return
-			}
-		case "grpc-status":
-			code, err := strconv.Atoi(f.Value)
-			if err != nil {
-				d.err = StreamErrorf(codes.Internal, "transport: malformed grpc-status: %v", err)
-				return
-			}
-			d.state.statusCode = codes.Code(code)
-		case "grpc-message":
-			d.state.statusDesc = f.Value
-		case "grpc-timeout":
-			d.state.timeoutSet = true
-			var err error
-			d.state.timeout, err = timeoutDecode(f.Value)
-			if err != nil {
-				d.err = StreamErrorf(codes.Internal, "transport: malformed time-out: %v", err)
-				return
-			}
-		case ":path":
-			d.state.method = f.Value
-		default:
-			if !isReservedHeader(f.Name) {
-				if f.Name == "user-agent" {
-					i := strings.LastIndex(f.Value, " ")
-					if i == -1 {
-						// There is no application user agent string being set.
-						return
-					}
-					// Extract the application user agent string.
-					f.Value = f.Value[:i]
-				}
-				if d.state.mdata == nil {
-					d.state.mdata = make(map[string][]string)
-				}
-				k, v, err := metadata.DecodeKeyValue(f.Name, f.Value)
-				if err != nil {
-					grpclog.Printf("Failed to decode (%q, %q): %v", f.Name, f.Value, err)
-					return
-				}
-				d.state.mdata[k] = append(d.state.mdata[k], v)
-			}
-		}
-	})
-	return d
-}
-
-func (d *hpackDecoder) decodeClientHTTP2Headers(frame headerFrame) (endHeaders bool, err error) {
-	d.err = nil
-	_, err = d.h.Write(frame.HeaderBlockFragment())
-	if err != nil {
-		err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err)
-	}
-
-	if frame.HeadersEnded() {
-		if closeErr := d.h.Close(); closeErr != nil && err == nil {
-			err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr)
-		}
-		endHeaders = true
-	}
-
-	if err == nil && d.err != nil {
-		err = d.err
-	}
-	return
-}
-
-func (d *hpackDecoder) decodeServerHTTP2Headers(frame headerFrame) (endHeaders bool, err error) {
-	d.err = nil
-	_, err = d.h.Write(frame.HeaderBlockFragment())
-	if err != nil {
-		err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err)
-	}
-
-	if frame.HeadersEnded() {
-		if closeErr := d.h.Close(); closeErr != nil && err == nil {
-			err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr)
-		}
-		endHeaders = true
-	}
-
-	if err == nil && d.err != nil {
-		err = d.err
-	}
-	return
-}
-
-type timeoutUnit uint8
-
-const (
-	hour        timeoutUnit = 'H'
-	minute      timeoutUnit = 'M'
-	second      timeoutUnit = 'S'
-	millisecond timeoutUnit = 'm'
-	microsecond timeoutUnit = 'u'
-	nanosecond  timeoutUnit = 'n'
-)
-
-func timeoutUnitToDuration(u timeoutUnit) (d time.Duration, ok bool) {
-	switch u {
-	case hour:
-		return time.Hour, true
-	case minute:
-		return time.Minute, true
-	case second:
-		return time.Second, true
-	case millisecond:
-		return time.Millisecond, true
-	case microsecond:
-		return time.Microsecond, true
-	case nanosecond:
-		return time.Nanosecond, true
-	default:
-	}
-	return
-}
-
-const maxTimeoutValue int64 = 100000000 - 1
-
-// div does integer division and round-up the result. Note that this is
-// equivalent to (d+r-1)/r but has less chance to overflow.
-func div(d, r time.Duration) int64 {
-	if m := d % r; m > 0 {
-		return int64(d/r + 1)
-	}
-	return int64(d / r)
-}
-
-// TODO(zhaoq): It is the simplistic and not bandwidth efficient. Improve it.
-func timeoutEncode(t time.Duration) string {
-	if d := div(t, time.Nanosecond); d <= maxTimeoutValue {
-		return strconv.FormatInt(d, 10) + "n"
-	}
-	if d := div(t, time.Microsecond); d <= maxTimeoutValue {
-		return strconv.FormatInt(d, 10) + "u"
-	}
-	if d := div(t, time.Millisecond); d <= maxTimeoutValue {
-		return strconv.FormatInt(d, 10) + "m"
-	}
-	if d := div(t, time.Second); d <= maxTimeoutValue {
-		return strconv.FormatInt(d, 10) + "S"
-	}
-	if d := div(t, time.Minute); d <= maxTimeoutValue {
-		return strconv.FormatInt(d, 10) + "M"
-	}
-	// Note that maxTimeoutValue * time.Hour > MaxInt64.
-	return strconv.FormatInt(div(t, time.Hour), 10) + "H"
-}
-
-func timeoutDecode(s string) (time.Duration, error) {
-	size := len(s)
-	if size < 2 {
-		return 0, fmt.Errorf("transport: timeout string is too short: %q", s)
-	}
-	unit := timeoutUnit(s[size-1])
-	d, ok := timeoutUnitToDuration(unit)
-	if !ok {
-		return 0, fmt.Errorf("transport: timeout unit is not recognized: %q", s)
-	}
-	t, err := strconv.ParseInt(s[:size-1], 10, 64)
-	if err != nil {
-		return 0, err
-	}
-	return d * time.Duration(t), nil
-}
-
-type framer struct {
-	numWriters int32
-	reader     io.Reader
-	writer     *bufio.Writer
-	fr         *http2.Framer
-}
-
-func newFramer(conn net.Conn) *framer {
-	f := &framer{
-		reader: conn,
-		writer: bufio.NewWriterSize(conn, http2IOBufSize),
-	}
-	f.fr = http2.NewFramer(f.writer, f.reader)
-	return f
-}
-
-func (f *framer) adjustNumWriters(i int32) int32 {
-	return atomic.AddInt32(&f.numWriters, i)
-}
-
-// The following writeXXX functions can only be called when the caller gets
-// unblocked from writableChan channel (i.e., owns the privilege to write).
-
-func (f *framer) writeContinuation(forceFlush bool, streamID uint32, endHeaders bool, headerBlockFragment []byte) error {
-	if err := f.fr.WriteContinuation(streamID, endHeaders, headerBlockFragment); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writeData(forceFlush bool, streamID uint32, endStream bool, data []byte) error {
-	if err := f.fr.WriteData(streamID, endStream, data); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writeGoAway(forceFlush bool, maxStreamID uint32, code http2.ErrCode, debugData []byte) error {
-	if err := f.fr.WriteGoAway(maxStreamID, code, debugData); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writeHeaders(forceFlush bool, p http2.HeadersFrameParam) error {
-	if err := f.fr.WriteHeaders(p); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writePing(forceFlush, ack bool, data [8]byte) error {
-	if err := f.fr.WritePing(ack, data); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writePriority(forceFlush bool, streamID uint32, p http2.PriorityParam) error {
-	if err := f.fr.WritePriority(streamID, p); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writePushPromise(forceFlush bool, p http2.PushPromiseParam) error {
-	if err := f.fr.WritePushPromise(p); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writeRSTStream(forceFlush bool, streamID uint32, code http2.ErrCode) error {
-	if err := f.fr.WriteRSTStream(streamID, code); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writeSettings(forceFlush bool, settings ...http2.Setting) error {
-	if err := f.fr.WriteSettings(settings...); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writeSettingsAck(forceFlush bool) error {
-	if err := f.fr.WriteSettingsAck(); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) writeWindowUpdate(forceFlush bool, streamID, incr uint32) error {
-	if err := f.fr.WriteWindowUpdate(streamID, incr); err != nil {
-		return err
-	}
-	if forceFlush {
-		return f.writer.Flush()
-	}
-	return nil
-}
-
-func (f *framer) flushWrite() error {
-	return f.writer.Flush()
-}
-
-func (f *framer) readFrame() (http2.Frame, error) {
-	return f.fr.ReadFrame()
-}
diff --git a/Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go b/Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go
deleted file mode 100644
index 71b562fd33..0000000000
--- a/Godeps/_workspace/src/google.golang.org/grpc/transport/transport.go
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
-Package transport defines and implements message oriented communication channel
-to complete various transactions (e.g., an RPC).
-*/
-package transport
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-	"golang.org/x/net/trace"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/metadata"
-)
-
-// recvMsg represents the received msg from the transport. All transport
-// protocol specific info has been removed.
-type recvMsg struct {
-	data []byte
-	// nil: received some data
-	// io.EOF: stream is completed. data is nil.
-	// other non-nil error: transport failure. data is nil.
-	err error
-}
-
-func (recvMsg) isItem() bool {
-	return true
-}
-
-// All items in an out of a recvBuffer should be the same type.
-type item interface {
-	isItem() bool
-}
-
-// recvBuffer is an unbounded channel of item.
-type recvBuffer struct {
-	c       chan item
-	mu      sync.Mutex
-	backlog []item
-}
-
-func newRecvBuffer() *recvBuffer {
-	b := &recvBuffer{
-		c: make(chan item, 1),
-	}
-	return b
-}
-
-func (b *recvBuffer) put(r item) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	b.backlog = append(b.backlog, r)
-	select {
-	case b.c <- b.backlog[0]:
-		b.backlog = b.backlog[1:]
-	default:
-	}
-}
-
-func (b *recvBuffer) load() {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	if len(b.backlog) > 0 {
-		select {
-		case b.c <- b.backlog[0]:
-			b.backlog = b.backlog[1:]
-		default:
-		}
-	}
-}
-
-// get returns the channel that receives an item in the buffer.
-//
-// Upon receipt of an item, the caller should call load to send another
-// item onto the channel if there is any.
-func (b *recvBuffer) get() <-chan item {
-	return b.c
-}
-
-// recvBufferReader implements io.Reader interface to read the data from
-// recvBuffer.
-type recvBufferReader struct {
-	ctx  context.Context
-	recv *recvBuffer
-	last *bytes.Reader // Stores the remaining data in the previous calls.
-	err  error
-}
-
-// Read reads the next len(p) bytes from last. If last is drained, it tries to
-// read additional data from recv. It blocks if there no additional data available
-// in recv. If Read returns any non-nil error, it will continue to return that error.
-func (r *recvBufferReader) Read(p []byte) (n int, err error) {
-	if r.err != nil {
-		return 0, r.err
-	}
-	defer func() { r.err = err }()
-	if r.last != nil && r.last.Len() > 0 {
-		// Read remaining data left in last call.
-		return r.last.Read(p)
-	}
-	select {
-	case <-r.ctx.Done():
-		return 0, ContextErr(r.ctx.Err())
-	case i := <-r.recv.get():
-		r.recv.load()
-		m := i.(*recvMsg)
-		if m.err != nil {
-			return 0, m.err
-		}
-		r.last = bytes.NewReader(m.data)
-		return r.last.Read(p)
-	}
-}
-
-type streamState uint8
-
-const (
-	streamActive    streamState = iota
-	streamWriteDone             // EndStream sent
-	streamReadDone              // EndStream received
-	streamDone                  // sendDone and recvDone or RSTStreamFrame is sent or received.
-)
-
-// Stream represents an RPC in the transport layer.
-type Stream struct {
-	id uint32
-	// nil for client side Stream.
-	st ServerTransport
-	// ctx is the associated context of the stream.
-	ctx    context.Context
-	cancel context.CancelFunc
-	// method records the associated RPC method of the stream.
-	method    string
-	buf       *recvBuffer
-	dec       io.Reader
-	fc        *inFlow
-	recvQuota uint32
-	// The accumulated inbound quota pending for window update.
-	updateQuota uint32
-	// The handler to control the window update procedure for both this
-	// particular stream and the associated transport.
-	windowHandler func(int)
-
-	sendQuotaPool *quotaPool
-	// Close headerChan to indicate the end of reception of header metadata.
-	headerChan chan struct{}
-	// header caches the received header metadata.
-	header metadata.MD
-	// The key-value map of trailer metadata.
-	trailer metadata.MD
-
-	mu sync.RWMutex // guard the following
-	// headerOK becomes true from the first header is about to send.
-	headerOk bool
-	state    streamState
-	// true iff headerChan is closed. Used to avoid closing headerChan
-	// multiple times.
-	headerDone bool
-	// the status received from the server.
-	statusCode codes.Code
-	statusDesc string
-}
-
-// Header acquires the key-value pairs of header metadata once it
-// is available. It blocks until i) the metadata is ready or ii) there is no
-// header metadata or iii) the stream is cancelled/expired.
-func (s *Stream) Header() (metadata.MD, error) {
-	select {
-	case <-s.ctx.Done():
-		return nil, ContextErr(s.ctx.Err())
-	case <-s.headerChan:
-		return s.header.Copy(), nil
-	}
-}
-
-// Trailer returns the cached trailer metedata. Note that if it is not called
-// after the entire stream is done, it could return an empty MD. Client
-// side only.
-func (s *Stream) Trailer() metadata.MD {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.trailer.Copy()
-}
-
-// ServerTransport returns the underlying ServerTransport for the stream.
-// The client side stream always returns nil.
-func (s *Stream) ServerTransport() ServerTransport {
-	return s.st
-}
-
-// Context returns the context of the stream.
-func (s *Stream) Context() context.Context {
-	return s.ctx
-}
-
-// TraceContext recreates the context of s with a trace.Trace.
-func (s *Stream) TraceContext(tr trace.Trace) {
-	s.ctx = trace.NewContext(s.ctx, tr)
-}
-
-// Method returns the method for the stream.
-func (s *Stream) Method() string {
-	return s.method
-}
-
-// StatusCode returns statusCode received from the server.
-func (s *Stream) StatusCode() codes.Code {
-	return s.statusCode
-}
-
-// StatusDesc returns statusDesc received from the server.
-func (s *Stream) StatusDesc() string {
-	return s.statusDesc
-}
-
-// ErrIllegalTrailerSet indicates that the trailer has already been set or it
-// is too late to do so.
-var ErrIllegalTrailerSet = errors.New("transport: trailer has been set")
-
-// SetTrailer sets the trailer metadata which will be sent with the RPC status
-// by the server. This can only be called at most once. Server side only.
-func (s *Stream) SetTrailer(md metadata.MD) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.trailer != nil {
-		return ErrIllegalTrailerSet
-	}
-	s.trailer = md.Copy()
-	return nil
-}
-
-func (s *Stream) write(m recvMsg) {
-	s.buf.put(&m)
-}
-
-// Read reads all the data available for this Stream from the transport and
-// passes them into the decoder, which converts them into a gRPC message stream.
-// The error is io.EOF when the stream is done or another non-nil error if
-// the stream broke.
-func (s *Stream) Read(p []byte) (n int, err error) {
-	n, err = s.dec.Read(p)
-	if err != nil {
-		return
-	}
-	s.windowHandler(n)
-	return
-}
-
-type key int
-
-// The key to save transport.Stream in the context.
-const streamKey = key(0)
-
-// newContextWithStream creates a new context from ctx and attaches stream
-// to it.
-func newContextWithStream(ctx context.Context, stream *Stream) context.Context {
-	return context.WithValue(ctx, streamKey, stream)
-}
-
-// StreamFromContext returns the stream saved in ctx.
-func StreamFromContext(ctx context.Context) (s *Stream, ok bool) {
-	s, ok = ctx.Value(streamKey).(*Stream)
-	return
-}
-
-// state of transport
-type transportState int
-
-const (
-	reachable transportState = iota
-	unreachable
-	closing
-)
-
-// NewServerTransport creates a ServerTransport with conn or non-nil error
-// if it fails.
-func NewServerTransport(protocol string, conn net.Conn, maxStreams uint32, authInfo credentials.AuthInfo) (ServerTransport, error) {
-	return newHTTP2Server(conn, maxStreams, authInfo)
-}
-
-// ConnectOptions covers all relevant options for dialing a server.
-type ConnectOptions struct {
-	// UserAgent is the application user agent.
-	UserAgent string
-	// Dialer specifies how to dial a network address.
-	Dialer func(string, time.Duration) (net.Conn, error)
-	// AuthOptions stores the credentials required to setup a client connection and/or issue RPCs.
-	AuthOptions []credentials.Credentials
-	// Timeout specifies the timeout for dialing a client connection.
-	Timeout time.Duration
-}
-
-// NewClientTransport establishes the transport with the required ConnectOptions
-// and returns it to the caller.
-func NewClientTransport(target string, opts *ConnectOptions) (ClientTransport, error) {
-	return newHTTP2Client(target, opts)
-}
-
-// Options provides additional hints and information for message
-// transmission.
-type Options struct {
-	// Indicate whether it is the last piece for this stream.
-	Last bool
-	// The hint to transport impl whether the data could be buffered for
-	// batching write. Transport impl can feel free to ignore it.
-	Delay bool
-}
-
-// CallHdr carries the information of a particular RPC.
-type CallHdr struct {
-	Host   string // peer host
-	Method string // the operation to perform on the specified host
-}
-
-// ClientTransport is the common interface for all gRPC client side transport
-// implementations.
-type ClientTransport interface {
-	// Close tears down this transport. Once it returns, the transport
-	// should not be accessed any more. The caller must make sure this
-	// is called only once.
-	Close() error
-
-	// Write sends the data for the given stream. A nil stream indicates
-	// the write is to be performed on the transport as a whole.
-	Write(s *Stream, data []byte, opts *Options) error
-
-	// NewStream creates a Stream for an RPC.
-	NewStream(ctx context.Context, callHdr *CallHdr) (*Stream, error)
-
-	// CloseStream clears the footprint of a stream when the stream is
-	// not needed any more. The err indicates the error incurred when
-	// CloseStream is called. Must be called when a stream is finished
-	// unless the associated transport is closing.
-	CloseStream(stream *Stream, err error)
-
-	// Error returns a channel that is closed when some I/O error
-	// happens. Typically the caller should have a goroutine to monitor
-	// this in order to take action (e.g., close the current transport
-	// and create a new one) in error case. It should not return nil
-	// once the transport is initiated.
-	Error() <-chan struct{}
-}
-
-// ServerTransport is the common interface for all gRPC server side transport
-// implementations.
-type ServerTransport interface {
-	// WriteStatus sends the status of a stream to the client.
-	WriteStatus(s *Stream, statusCode codes.Code, statusDesc string) error
-	// Write sends the data for the given stream.
-	Write(s *Stream, data []byte, opts *Options) error
-	// WriteHeader sends the header metedata for the given stream.
-	WriteHeader(s *Stream, md metadata.MD) error
-	// HandleStreams receives incoming streams using the given handler.
-	HandleStreams(func(*Stream))
-	// Close tears down the transport. Once it is called, the transport
-	// should not be accessed any more. All the pending streams and their
-	// handlers will be terminated asynchronously.
-	Close() error
-	// RemoteAddr returns the remote network address.
-	RemoteAddr() net.Addr
-}
-
-// StreamErrorf creates an StreamError with the specified error code and description.
-func StreamErrorf(c codes.Code, format string, a ...interface{}) StreamError {
-	return StreamError{
-		Code: c,
-		Desc: fmt.Sprintf(format, a...),
-	}
-}
-
-// ConnectionErrorf creates an ConnectionError with the specified error description.
-func ConnectionErrorf(format string, a ...interface{}) ConnectionError {
-	return ConnectionError{
-		Desc: fmt.Sprintf(format, a...),
-	}
-}
-
-// ConnectionError is an error that results in the termination of the
-// entire connection and the retry of all the active streams.
-type ConnectionError struct {
-	Desc string
-}
-
-func (e ConnectionError) Error() string {
-	return fmt.Sprintf("connection error: desc = %q", e.Desc)
-}
-
-// Define some common ConnectionErrors.
-var ErrConnClosing = ConnectionError{Desc: "transport is closing"}
-
-// StreamError is an error that only affects one stream within a connection.
-type StreamError struct {
-	Code codes.Code
-	Desc string
-}
-
-func (e StreamError) Error() string {
-	return fmt.Sprintf("stream error: code = %d desc = %q", e.Code, e.Desc)
-}
-
-// ContextErr converts the error from context package into a StreamError.
-func ContextErr(err error) StreamError {
-	switch err {
-	case context.DeadlineExceeded:
-		return StreamErrorf(codes.DeadlineExceeded, "%v", err)
-	case context.Canceled:
-		return StreamErrorf(codes.Canceled, "%v", err)
-	}
-	panic(fmt.Sprintf("Unexpected error from context packet: %v", err))
-}
-
-// wait blocks until it can receive from ctx.Done, closing, or proceed.
-// If it receives from ctx.Done, it returns 0, the StreamError for ctx.Err.
-// If it receives from closing, it returns 0, ErrConnClosing.
-// If it receives from proceed, it returns the received integer, nil.
-func wait(ctx context.Context, closing <-chan struct{}, proceed <-chan int) (int, error) {
-	select {
-	case <-ctx.Done():
-		return 0, ContextErr(ctx.Err())
-	case <-closing:
-		return 0, ErrConnClosing
-	case i := <-proceed:
-		return i, nil
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE b/Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE
deleted file mode 100644
index 87a5cede33..0000000000
--- a/Godeps/_workspace/src/gopkg.in/inf.v0/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2012 Péter Surányi. Portions Copyright (c) 2009 The Go
-Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/gopkg.in/inf.v0/dec.go b/Godeps/_workspace/src/gopkg.in/inf.v0/dec.go
deleted file mode 100644
index d17ad945d4..0000000000
--- a/Godeps/_workspace/src/gopkg.in/inf.v0/dec.go
+++ /dev/null
@@ -1,615 +0,0 @@
-// Package inf (type inf.Dec) implements "infinite-precision" decimal
-// arithmetic.
-// "Infinite precision" describes two characteristics: practically unlimited
-// precision for decimal number representation and no support for calculating
-// with any specific fixed precision.
-// (Although there is no practical limit on precision, inf.Dec can only
-// represent finite decimals.)
-//
-// This package is currently in experimental stage and the API may change.
-//
-// This package does NOT support:
-//  - rounding to specific precisions (as opposed to specific decimal positions)
-//  - the notion of context (each rounding must be explicit)
-//  - NaN and Inf values, and distinguishing between positive and negative zero
-//  - conversions to and from float32/64 types
-//
-// Features considered for possible addition:
-//  + formatting options
-//  + Exp method
-//  + combined operations such as AddRound/MulAdd etc
-//  + exchanging data in decimal32/64/128 formats
-//
-package inf
-
-// TODO:
-//  - avoid excessive deep copying (quo and rounders)
-
-import (
-	"fmt"
-	"io"
-	"math/big"
-	"strings"
-)
-
-// A Dec represents a signed arbitrary-precision decimal.
-// It is a combination of a sign, an arbitrary-precision integer coefficient
-// value, and a signed fixed-precision exponent value.
-// The sign and the coefficient value are handled together as a signed value
-// and referred to as the unscaled value.
-// (Positive and negative zero values are not distinguished.)
-// Since the exponent is most commonly non-positive, it is handled in negated
-// form and referred to as scale.
-//
-// The mathematical value of a Dec equals:
-//
-//  unscaled * 10**(-scale)
-//
-// Note that different Dec representations may have equal mathematical values.
-//
-//  unscaled  scale  String()
-//  -------------------------
-//         0      0    "0"
-//         0      2    "0.00"
-//         0     -2    "0"
-//         1      0    "1"
-//       100      2    "1.00"
-//        10      0   "10"
-//         1     -1   "10"
-//
-// The zero value for a Dec represents the value 0 with scale 0.
-//
-// Operations are typically performed through the *Dec type.
-// The semantics of the assignment operation "=" for "bare" Dec values is
-// undefined and should not be relied on.
-//
-// Methods are typically of the form:
-//
-//	func (z *Dec) Op(x, y *Dec) *Dec
-//
-// and implement operations z = x Op y with the result as receiver; if it
-// is one of the operands it may be overwritten (and its memory reused).
-// To enable chaining of operations, the result is also returned. Methods
-// returning a result other than *Dec take one of the operands as the receiver.
-//
-// A "bare" Quo method (quotient / division operation) is not provided, as the
-// result is not always a finite decimal and thus in general cannot be
-// represented as a Dec.
-// Instead, in the common case when rounding is (potentially) necessary,
-// QuoRound should be used with a Scale and a Rounder.
-// QuoExact or QuoRound with RoundExact can be used in the special cases when it
-// is known that the result is always a finite decimal.
-//
-type Dec struct {
-	unscaled big.Int
-	scale    Scale
-}
-
-// Scale represents the type used for the scale of a Dec.
-type Scale int32
-
-const scaleSize = 4 // bytes in a Scale value
-
-// Scaler represents a method for obtaining the scale to use for the result of
-// an operation on x and y.
-type scaler interface {
-	Scale(x *Dec, y *Dec) Scale
-}
-
-var bigInt = [...]*big.Int{
-	big.NewInt(0), big.NewInt(1), big.NewInt(2), big.NewInt(3), big.NewInt(4),
-	big.NewInt(5), big.NewInt(6), big.NewInt(7), big.NewInt(8), big.NewInt(9),
-	big.NewInt(10),
-}
-
-var exp10cache [64]big.Int = func() [64]big.Int {
-	e10, e10i := [64]big.Int{}, bigInt[1]
-	for i, _ := range e10 {
-		e10[i].Set(e10i)
-		e10i = new(big.Int).Mul(e10i, bigInt[10])
-	}
-	return e10
-}()
-
-// NewDec allocates and returns a new Dec set to the given int64 unscaled value
-// and scale.
-func NewDec(unscaled int64, scale Scale) *Dec {
-	return new(Dec).SetUnscaled(unscaled).SetScale(scale)
-}
-
-// NewDecBig allocates and returns a new Dec set to the given *big.Int unscaled
-// value and scale.
-func NewDecBig(unscaled *big.Int, scale Scale) *Dec {
-	return new(Dec).SetUnscaledBig(unscaled).SetScale(scale)
-}
-
-// Scale returns the scale of x.
-func (x *Dec) Scale() Scale {
-	return x.scale
-}
-
-// Unscaled returns the unscaled value of x for u and true for ok when the
-// unscaled value can be represented as int64; otherwise it returns an undefined
-// int64 value for u and false for ok. Use x.UnscaledBig().Int64() to avoid
-// checking the validity of the value when the check is known to be redundant.
-func (x *Dec) Unscaled() (u int64, ok bool) {
-	u = x.unscaled.Int64()
-	var i big.Int
-	ok = i.SetInt64(u).Cmp(&x.unscaled) == 0
-	return
-}
-
-// UnscaledBig returns the unscaled value of x as *big.Int.
-func (x *Dec) UnscaledBig() *big.Int {
-	return &x.unscaled
-}
-
-// SetScale sets the scale of z, with the unscaled value unchanged, and returns
-// z.
-// The mathematical value of the Dec changes as if it was multiplied by
-// 10**(oldscale-scale).
-func (z *Dec) SetScale(scale Scale) *Dec {
-	z.scale = scale
-	return z
-}
-
-// SetUnscaled sets the unscaled value of z, with the scale unchanged, and
-// returns z.
-func (z *Dec) SetUnscaled(unscaled int64) *Dec {
-	z.unscaled.SetInt64(unscaled)
-	return z
-}
-
-// SetUnscaledBig sets the unscaled value of z, with the scale unchanged, and
-// returns z.
-func (z *Dec) SetUnscaledBig(unscaled *big.Int) *Dec {
-	z.unscaled.Set(unscaled)
-	return z
-}
-
-// Set sets z to the value of x and returns z.
-// It does nothing if z == x.
-func (z *Dec) Set(x *Dec) *Dec {
-	if z != x {
-		z.SetUnscaledBig(x.UnscaledBig())
-		z.SetScale(x.Scale())
-	}
-	return z
-}
-
-// Sign returns:
-//
-//	-1 if x <  0
-//	 0 if x == 0
-//	+1 if x >  0
-//
-func (x *Dec) Sign() int {
-	return x.UnscaledBig().Sign()
-}
-
-// Neg sets z to -x and returns z.
-func (z *Dec) Neg(x *Dec) *Dec {
-	z.SetScale(x.Scale())
-	z.UnscaledBig().Neg(x.UnscaledBig())
-	return z
-}
-
-// Cmp compares x and y and returns:
-//
-//   -1 if x <  y
-//    0 if x == y
-//   +1 if x >  y
-//
-func (x *Dec) Cmp(y *Dec) int {
-	xx, yy := upscale(x, y)
-	return xx.UnscaledBig().Cmp(yy.UnscaledBig())
-}
-
-// Abs sets z to |x| (the absolute value of x) and returns z.
-func (z *Dec) Abs(x *Dec) *Dec {
-	z.SetScale(x.Scale())
-	z.UnscaledBig().Abs(x.UnscaledBig())
-	return z
-}
-
-// Add sets z to the sum x+y and returns z.
-// The scale of z is the greater of the scales of x and y.
-func (z *Dec) Add(x, y *Dec) *Dec {
-	xx, yy := upscale(x, y)
-	z.SetScale(xx.Scale())
-	z.UnscaledBig().Add(xx.UnscaledBig(), yy.UnscaledBig())
-	return z
-}
-
-// Sub sets z to the difference x-y and returns z.
-// The scale of z is the greater of the scales of x and y.
-func (z *Dec) Sub(x, y *Dec) *Dec {
-	xx, yy := upscale(x, y)
-	z.SetScale(xx.Scale())
-	z.UnscaledBig().Sub(xx.UnscaledBig(), yy.UnscaledBig())
-	return z
-}
-
-// Mul sets z to the product x*y and returns z.
-// The scale of z is the sum of the scales of x and y.
-func (z *Dec) Mul(x, y *Dec) *Dec {
-	z.SetScale(x.Scale() + y.Scale())
-	z.UnscaledBig().Mul(x.UnscaledBig(), y.UnscaledBig())
-	return z
-}
-
-// Round sets z to the value of x rounded to Scale s using Rounder r, and
-// returns z.
-func (z *Dec) Round(x *Dec, s Scale, r Rounder) *Dec {
-	return z.QuoRound(x, NewDec(1, 0), s, r)
-}
-
-// QuoRound sets z to the quotient x/y, rounded using the given Rounder to the
-// specified scale.
-//
-// If the rounder is RoundExact but the result can not be expressed exactly at
-// the specified scale, QuoRound returns nil, and the value of z is undefined.
-//
-// There is no corresponding Div method; the equivalent can be achieved through
-// the choice of Rounder used.
-//
-func (z *Dec) QuoRound(x, y *Dec, s Scale, r Rounder) *Dec {
-	return z.quo(x, y, sclr{s}, r)
-}
-
-func (z *Dec) quo(x, y *Dec, s scaler, r Rounder) *Dec {
-	scl := s.Scale(x, y)
-	var zzz *Dec
-	if r.UseRemainder() {
-		zz, rA, rB := new(Dec).quoRem(x, y, scl, true, new(big.Int), new(big.Int))
-		zzz = r.Round(new(Dec), zz, rA, rB)
-	} else {
-		zz, _, _ := new(Dec).quoRem(x, y, scl, false, nil, nil)
-		zzz = r.Round(new(Dec), zz, nil, nil)
-	}
-	if zzz == nil {
-		return nil
-	}
-	return z.Set(zzz)
-}
-
-// QuoExact sets z to the quotient x/y and returns z when x/y is a finite
-// decimal. Otherwise it returns nil and the value of z is undefined.
-//
-// The scale of a non-nil result is "x.Scale() - y.Scale()" or greater; it is
-// calculated so that the remainder will be zero whenever x/y is a finite
-// decimal.
-func (z *Dec) QuoExact(x, y *Dec) *Dec {
-	return z.quo(x, y, scaleQuoExact{}, RoundExact)
-}
-
-// quoRem sets z to the quotient x/y with the scale s, and if useRem is true,
-// it sets remNum and remDen to the numerator and denominator of the remainder.
-// It returns z, remNum and remDen.
-//
-// The remainder is normalized to the range -1 < r < 1 to simplify rounding;
-// that is, the results satisfy the following equation:
-//
-//  x / y = z + (remNum/remDen) * 10**(-z.Scale())
-//
-// See Rounder for more details about rounding.
-//
-func (z *Dec) quoRem(x, y *Dec, s Scale, useRem bool,
-	remNum, remDen *big.Int) (*Dec, *big.Int, *big.Int) {
-	// difference (required adjustment) compared to "canonical" result scale
-	shift := s - (x.Scale() - y.Scale())
-	// pointers to adjusted unscaled dividend and divisor
-	var ix, iy *big.Int
-	switch {
-	case shift > 0:
-		// increased scale: decimal-shift dividend left
-		ix = new(big.Int).Mul(x.UnscaledBig(), exp10(shift))
-		iy = y.UnscaledBig()
-	case shift < 0:
-		// decreased scale: decimal-shift divisor left
-		ix = x.UnscaledBig()
-		iy = new(big.Int).Mul(y.UnscaledBig(), exp10(-shift))
-	default:
-		ix = x.UnscaledBig()
-		iy = y.UnscaledBig()
-	}
-	// save a copy of iy in case it to be overwritten with the result
-	iy2 := iy
-	if iy == z.UnscaledBig() {
-		iy2 = new(big.Int).Set(iy)
-	}
-	// set scale
-	z.SetScale(s)
-	// set unscaled
-	if useRem {
-		// Int division
-		_, intr := z.UnscaledBig().QuoRem(ix, iy, new(big.Int))
-		// set remainder
-		remNum.Set(intr)
-		remDen.Set(iy2)
-	} else {
-		z.UnscaledBig().Quo(ix, iy)
-	}
-	return z, remNum, remDen
-}
-
-type sclr struct{ s Scale }
-
-func (s sclr) Scale(x, y *Dec) Scale {
-	return s.s
-}
-
-type scaleQuoExact struct{}
-
-func (sqe scaleQuoExact) Scale(x, y *Dec) Scale {
-	rem := new(big.Rat).SetFrac(x.UnscaledBig(), y.UnscaledBig())
-	f2, f5 := factor2(rem.Denom()), factor(rem.Denom(), bigInt[5])
-	var f10 Scale
-	if f2 > f5 {
-		f10 = Scale(f2)
-	} else {
-		f10 = Scale(f5)
-	}
-	return x.Scale() - y.Scale() + f10
-}
-
-func factor(n *big.Int, p *big.Int) int {
-	// could be improved for large factors
-	d, f := n, 0
-	for {
-		dd, dm := new(big.Int).DivMod(d, p, new(big.Int))
-		if dm.Sign() == 0 {
-			f++
-			d = dd
-		} else {
-			break
-		}
-	}
-	return f
-}
-
-func factor2(n *big.Int) int {
-	// could be improved for large factors
-	f := 0
-	for ; n.Bit(f) == 0; f++ {
-	}
-	return f
-}
-
-func upscale(a, b *Dec) (*Dec, *Dec) {
-	if a.Scale() == b.Scale() {
-		return a, b
-	}
-	if a.Scale() > b.Scale() {
-		bb := b.rescale(a.Scale())
-		return a, bb
-	}
-	aa := a.rescale(b.Scale())
-	return aa, b
-}
-
-func exp10(x Scale) *big.Int {
-	if int(x) < len(exp10cache) {
-		return &exp10cache[int(x)]
-	}
-	return new(big.Int).Exp(bigInt[10], big.NewInt(int64(x)), nil)
-}
-
-func (x *Dec) rescale(newScale Scale) *Dec {
-	shift := newScale - x.Scale()
-	switch {
-	case shift < 0:
-		e := exp10(-shift)
-		return NewDecBig(new(big.Int).Quo(x.UnscaledBig(), e), newScale)
-	case shift > 0:
-		e := exp10(shift)
-		return NewDecBig(new(big.Int).Mul(x.UnscaledBig(), e), newScale)
-	}
-	return x
-}
-
-var zeros = []byte("00000000000000000000000000000000" +
-	"00000000000000000000000000000000")
-var lzeros = Scale(len(zeros))
-
-func appendZeros(s []byte, n Scale) []byte {
-	for i := Scale(0); i < n; i += lzeros {
-		if n > i+lzeros {
-			s = append(s, zeros...)
-		} else {
-			s = append(s, zeros[0:n-i]...)
-		}
-	}
-	return s
-}
-
-func (x *Dec) String() string {
-	if x == nil {
-		return "<nil>"
-	}
-	scale := x.Scale()
-	s := []byte(x.UnscaledBig().String())
-	if scale <= 0 {
-		if scale != 0 && x.unscaled.Sign() != 0 {
-			s = appendZeros(s, -scale)
-		}
-		return string(s)
-	}
-	negbit := Scale(-((x.Sign() - 1) / 2))
-	// scale > 0
-	lens := Scale(len(s))
-	if lens-negbit <= scale {
-		ss := make([]byte, 0, scale+2)
-		if negbit == 1 {
-			ss = append(ss, '-')
-		}
-		ss = append(ss, '0', '.')
-		ss = appendZeros(ss, scale-lens+negbit)
-		ss = append(ss, s[negbit:]...)
-		return string(ss)
-	}
-	// lens > scale
-	ss := make([]byte, 0, lens+1)
-	ss = append(ss, s[:lens-scale]...)
-	ss = append(ss, '.')
-	ss = append(ss, s[lens-scale:]...)
-	return string(ss)
-}
-
-// Format is a support routine for fmt.Formatter. It accepts the decimal
-// formats 'd' and 'f', and handles both equivalently.
-// Width, precision, flags and bases 2, 8, 16 are not supported.
-func (x *Dec) Format(s fmt.State, ch rune) {
-	if ch != 'd' && ch != 'f' && ch != 'v' && ch != 's' {
-		fmt.Fprintf(s, "%%!%c(dec.Dec=%s)", ch, x.String())
-		return
-	}
-	fmt.Fprintf(s, x.String())
-}
-
-func (z *Dec) scan(r io.RuneScanner) (*Dec, error) {
-	unscaled := make([]byte, 0, 256) // collects chars of unscaled as bytes
-	dp, dg := -1, -1                 // indexes of decimal point, first digit
-loop:
-	for {
-		ch, _, err := r.ReadRune()
-		if err == io.EOF {
-			break loop
-		}
-		if err != nil {
-			return nil, err
-		}
-		switch {
-		case ch == '+' || ch == '-':
-			if len(unscaled) > 0 || dp >= 0 { // must be first character
-				r.UnreadRune()
-				break loop
-			}
-		case ch == '.':
-			if dp >= 0 {
-				r.UnreadRune()
-				break loop
-			}
-			dp = len(unscaled)
-			continue // don't add to unscaled
-		case ch >= '0' && ch <= '9':
-			if dg == -1 {
-				dg = len(unscaled)
-			}
-		default:
-			r.UnreadRune()
-			break loop
-		}
-		unscaled = append(unscaled, byte(ch))
-	}
-	if dg == -1 {
-		return nil, fmt.Errorf("no digits read")
-	}
-	if dp >= 0 {
-		z.SetScale(Scale(len(unscaled) - dp))
-	} else {
-		z.SetScale(0)
-	}
-	_, ok := z.UnscaledBig().SetString(string(unscaled), 10)
-	if !ok {
-		return nil, fmt.Errorf("invalid decimal: %s", string(unscaled))
-	}
-	return z, nil
-}
-
-// SetString sets z to the value of s, interpreted as a decimal (base 10),
-// and returns z and a boolean indicating success. The scale of z is the
-// number of digits after the decimal point (including any trailing 0s),
-// or 0 if there is no decimal point. If SetString fails, the value of z
-// is undefined but the returned value is nil.
-func (z *Dec) SetString(s string) (*Dec, bool) {
-	r := strings.NewReader(s)
-	_, err := z.scan(r)
-	if err != nil {
-		return nil, false
-	}
-	_, _, err = r.ReadRune()
-	if err != io.EOF {
-		return nil, false
-	}
-	// err == io.EOF => scan consumed all of s
-	return z, true
-}
-
-// Scan is a support routine for fmt.Scanner; it sets z to the value of
-// the scanned number. It accepts the decimal formats 'd' and 'f', and
-// handles both equivalently. Bases 2, 8, 16 are not supported.
-// The scale of z is the number of digits after the decimal point
-// (including any trailing 0s), or 0 if there is no decimal point.
-func (z *Dec) Scan(s fmt.ScanState, ch rune) error {
-	if ch != 'd' && ch != 'f' && ch != 's' && ch != 'v' {
-		return fmt.Errorf("Dec.Scan: invalid verb '%c'", ch)
-	}
-	s.SkipSpace()
-	_, err := z.scan(s)
-	return err
-}
-
-// Gob encoding version
-const decGobVersion byte = 1
-
-func scaleBytes(s Scale) []byte {
-	buf := make([]byte, scaleSize)
-	i := scaleSize
-	for j := 0; j < scaleSize; j++ {
-		i--
-		buf[i] = byte(s)
-		s >>= 8
-	}
-	return buf
-}
-
-func scale(b []byte) (s Scale) {
-	for j := 0; j < scaleSize; j++ {
-		s <<= 8
-		s |= Scale(b[j])
-	}
-	return
-}
-
-// GobEncode implements the gob.GobEncoder interface.
-func (x *Dec) GobEncode() ([]byte, error) {
-	buf, err := x.UnscaledBig().GobEncode()
-	if err != nil {
-		return nil, err
-	}
-	buf = append(append(buf, scaleBytes(x.Scale())...), decGobVersion)
-	return buf, nil
-}
-
-// GobDecode implements the gob.GobDecoder interface.
-func (z *Dec) GobDecode(buf []byte) error {
-	if len(buf) == 0 {
-		return fmt.Errorf("Dec.GobDecode: no data")
-	}
-	b := buf[len(buf)-1]
-	if b != decGobVersion {
-		return fmt.Errorf("Dec.GobDecode: encoding version %d not supported", b)
-	}
-	l := len(buf) - scaleSize - 1
-	err := z.UnscaledBig().GobDecode(buf[:l])
-	if err != nil {
-		return err
-	}
-	z.SetScale(scale(buf[l : l+scaleSize]))
-	return nil
-}
-
-// MarshalText implements the encoding.TextMarshaler interface.
-func (x *Dec) MarshalText() ([]byte, error) {
-	return []byte(x.String()), nil
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface.
-func (z *Dec) UnmarshalText(data []byte) error {
-	_, ok := z.SetString(string(data))
-	if !ok {
-		return fmt.Errorf("invalid inf.Dec")
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/gopkg.in/inf.v0/rounder.go b/Godeps/_workspace/src/gopkg.in/inf.v0/rounder.go
deleted file mode 100644
index 3a97ef529b..0000000000
--- a/Godeps/_workspace/src/gopkg.in/inf.v0/rounder.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package inf
-
-import (
-	"math/big"
-)
-
-// Rounder represents a method for rounding the (possibly infinite decimal)
-// result of a division to a finite Dec. It is used by Dec.Round() and
-// Dec.Quo().
-//
-// See the Example for results of using each Rounder with some sample values.
-//
-type Rounder rounder
-
-// See http://speleotrove.com/decimal/damodel.html#refround for more detailed
-// definitions of these rounding modes.
-var (
-	RoundDown     Rounder // towards 0
-	RoundUp       Rounder // away from 0
-	RoundFloor    Rounder // towards -infinity
-	RoundCeil     Rounder // towards +infinity
-	RoundHalfDown Rounder // to nearest; towards 0 if same distance
-	RoundHalfUp   Rounder // to nearest; away from 0 if same distance
-	RoundHalfEven Rounder // to nearest; even last digit if same distance
-)
-
-// RoundExact is to be used in the case when rounding is not necessary.
-// When used with Quo or Round, it returns the result verbatim when it can be
-// expressed exactly with the given precision, and it returns nil otherwise.
-// QuoExact is a shorthand for using Quo with RoundExact.
-var RoundExact Rounder
-
-type rounder interface {
-
-	// When UseRemainder() returns true, the Round() method is passed the
-	// remainder of the division, expressed as the numerator and denominator of
-	// a rational.
-	UseRemainder() bool
-
-	// Round sets the rounded value of a quotient to z, and returns z.
-	// quo is rounded down (truncated towards zero) to the scale obtained from
-	// the Scaler in Quo().
-	//
-	// When the remainder is not used, remNum and remDen are nil.
-	// When used, the remainder is normalized between -1 and 1; that is:
-	//
-	//  -|remDen| < remNum < |remDen|
-	//
-	// remDen has the same sign as y, and remNum is zero or has the same sign
-	// as x.
-	Round(z, quo *Dec, remNum, remDen *big.Int) *Dec
-}
-
-type rndr struct {
-	useRem bool
-	round  func(z, quo *Dec, remNum, remDen *big.Int) *Dec
-}
-
-func (r rndr) UseRemainder() bool {
-	return r.useRem
-}
-
-func (r rndr) Round(z, quo *Dec, remNum, remDen *big.Int) *Dec {
-	return r.round(z, quo, remNum, remDen)
-}
-
-var intSign = []*big.Int{big.NewInt(-1), big.NewInt(0), big.NewInt(1)}
-
-func roundHalf(f func(c int, odd uint) (roundUp bool)) func(z, q *Dec, rA, rB *big.Int) *Dec {
-	return func(z, q *Dec, rA, rB *big.Int) *Dec {
-		z.Set(q)
-		brA, brB := rA.BitLen(), rB.BitLen()
-		if brA < brB-1 {
-			// brA < brB-1 => |rA| < |rB/2|
-			return z
-		}
-		roundUp := false
-		srA, srB := rA.Sign(), rB.Sign()
-		s := srA * srB
-		if brA == brB-1 {
-			rA2 := new(big.Int).Lsh(rA, 1)
-			if s < 0 {
-				rA2.Neg(rA2)
-			}
-			roundUp = f(rA2.Cmp(rB)*srB, z.UnscaledBig().Bit(0))
-		} else {
-			// brA > brB-1 => |rA| > |rB/2|
-			roundUp = true
-		}
-		if roundUp {
-			z.UnscaledBig().Add(z.UnscaledBig(), intSign[s+1])
-		}
-		return z
-	}
-}
-
-func init() {
-	RoundExact = rndr{true,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			if rA.Sign() != 0 {
-				return nil
-			}
-			return z.Set(q)
-		}}
-	RoundDown = rndr{false,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			return z.Set(q)
-		}}
-	RoundUp = rndr{true,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			z.Set(q)
-			if rA.Sign() != 0 {
-				z.UnscaledBig().Add(z.UnscaledBig(), intSign[rA.Sign()*rB.Sign()+1])
-			}
-			return z
-		}}
-	RoundFloor = rndr{true,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			z.Set(q)
-			if rA.Sign()*rB.Sign() < 0 {
-				z.UnscaledBig().Add(z.UnscaledBig(), intSign[0])
-			}
-			return z
-		}}
-	RoundCeil = rndr{true,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			z.Set(q)
-			if rA.Sign()*rB.Sign() > 0 {
-				z.UnscaledBig().Add(z.UnscaledBig(), intSign[2])
-			}
-			return z
-		}}
-	RoundHalfDown = rndr{true, roundHalf(
-		func(c int, odd uint) bool {
-			return c > 0
-		})}
-	RoundHalfUp = rndr{true, roundHalf(
-		func(c int, odd uint) bool {
-			return c >= 0
-		})}
-	RoundHalfEven = rndr{true, roundHalf(
-		func(c int, odd uint) bool {
-			return c > 0 || c == 0 && odd == 1
-		})}
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE b/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
deleted file mode 100644
index 6b4d837a44..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2014 The Kubernetes Authors All rights reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/examples/update-demo/local/LICENSE.angular b/Godeps/_workspace/src/k8s.io/kubernetes/examples/update-demo/local/LICENSE.angular
deleted file mode 100644
index 020f87acd2..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/examples/update-demo/local/LICENSE.angular
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
deleted file mode 100644
index 6a34e2d434..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// +build !ignore_autogenerated
-
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was autogenerated by deepcopy-gen. Do not edit it manually!
-
-package resource
-
-import (
-	inf_v0 "gopkg.in/inf.v0"
-	conversion "k8s.io/kubernetes/pkg/conversion"
-)
-
-func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error {
-	if in.Amount != nil {
-		in, out := in.Amount, &out.Amount
-		*out = new(inf_v0.Dec)
-		if newVal, err := c.DeepCopy(*in); err != nil {
-			return err
-		} else {
-			**out = newVal.(inf_v0.Dec)
-		}
-	} else {
-		out.Amount = nil
-	}
-	out.Format = in.Format
-	return nil
-}
-
-func DeepCopy_resource_QuantityProto(in QuantityProto, out *QuantityProto, c *conversion.Cloner) error {
-	out.Format = in.Format
-	out.Scale = in.Scale
-	if in.Bigint != nil {
-		in, out := in.Bigint, &out.Bigint
-		*out = make([]byte, len(in))
-		copy(*out, in)
-	} else {
-		out.Bigint = nil
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.pb.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
deleted file mode 100644
index 7484f92761..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by protoc-gen-gogo.
-// source: k8s.io/kubernetes/pkg/api/resource/generated.proto
-// DO NOT EDIT!
-
-/*
-	Package resource is a generated protocol buffer package.
-
-	It is generated from these files:
-		k8s.io/kubernetes/pkg/api/resource/generated.proto
-
-	It has these top-level messages:
-		Quantity
-		QuantityProto
-*/
-package resource
-
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-import io "io"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-func (m *Quantity) Reset()      { *m = Quantity{} }
-func (*Quantity) ProtoMessage() {}
-
-func (m *QuantityProto) Reset()         { *m = QuantityProto{} }
-func (m *QuantityProto) String() string { return proto.CompactTextString(m) }
-func (*QuantityProto) ProtoMessage()    {}
-
-func init() {
-	proto.RegisterType((*Quantity)(nil), "k8s.io.kubernetes.pkg.api.resource.Quantity")
-	proto.RegisterType((*QuantityProto)(nil), "k8s.io.kubernetes.pkg.api.resource.QuantityProto")
-}
-func (m *QuantityProto) Marshal() (data []byte, err error) {
-	size := m.Size()
-	data = make([]byte, size)
-	n, err := m.MarshalTo(data)
-	if err != nil {
-		return nil, err
-	}
-	return data[:n], nil
-}
-
-func (m *QuantityProto) MarshalTo(data []byte) (int, error) {
-	var i int
-	_ = i
-	var l int
-	_ = l
-	data[i] = 0xa
-	i++
-	i = encodeVarintGenerated(data, i, uint64(len(m.Format)))
-	i += copy(data[i:], m.Format)
-	data[i] = 0x10
-	i++
-	i = encodeVarintGenerated(data, i, uint64(m.Scale))
-	if m.Bigint != nil {
-		data[i] = 0x1a
-		i++
-		i = encodeVarintGenerated(data, i, uint64(len(m.Bigint)))
-		i += copy(data[i:], m.Bigint)
-	}
-	return i, nil
-}
-
-func encodeFixed64Generated(data []byte, offset int, v uint64) int {
-	data[offset] = uint8(v)
-	data[offset+1] = uint8(v >> 8)
-	data[offset+2] = uint8(v >> 16)
-	data[offset+3] = uint8(v >> 24)
-	data[offset+4] = uint8(v >> 32)
-	data[offset+5] = uint8(v >> 40)
-	data[offset+6] = uint8(v >> 48)
-	data[offset+7] = uint8(v >> 56)
-	return offset + 8
-}
-func encodeFixed32Generated(data []byte, offset int, v uint32) int {
-	data[offset] = uint8(v)
-	data[offset+1] = uint8(v >> 8)
-	data[offset+2] = uint8(v >> 16)
-	data[offset+3] = uint8(v >> 24)
-	return offset + 4
-}
-func encodeVarintGenerated(data []byte, offset int, v uint64) int {
-	for v >= 1<<7 {
-		data[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	data[offset] = uint8(v)
-	return offset + 1
-}
-func (m *QuantityProto) Size() (n int) {
-	var l int
-	_ = l
-	l = len(m.Format)
-	n += 1 + l + sovGenerated(uint64(l))
-	n += 1 + sovGenerated(uint64(m.Scale))
-	if m.Bigint != nil {
-		l = len(m.Bigint)
-		n += 1 + l + sovGenerated(uint64(l))
-	}
-	return n
-}
-
-func sovGenerated(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
-}
-func sozGenerated(x uint64) (n int) {
-	return sovGenerated(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *QuantityProto) Unmarshal(data []byte) error {
-	l := len(data)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowGenerated
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := data[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: QuantityProto: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QuantityProto: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Format", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Format = Format(data[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Scale", wireType)
-			}
-			m.Scale = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				m.Scale |= (int32(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Bigint", wireType)
-			}
-			var byteLen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				byteLen |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if byteLen < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			postIndex := iNdEx + byteLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Bigint = append(m.Bigint[:0], data[iNdEx:postIndex]...)
-			if m.Bigint == nil {
-				m.Bigint = []byte{}
-			}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipGenerated(data[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipGenerated(data []byte) (n int, err error) {
-	l := len(data)
-	iNdEx := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowGenerated
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := data[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if data[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-			return iNdEx, nil
-		case 1:
-			iNdEx += 8
-			return iNdEx, nil
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			iNdEx += length
-			if length < 0 {
-				return 0, ErrInvalidLengthGenerated
-			}
-			return iNdEx, nil
-		case 3:
-			for {
-				var innerWire uint64
-				var start int = iNdEx
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return 0, ErrIntOverflowGenerated
-					}
-					if iNdEx >= l {
-						return 0, io.ErrUnexpectedEOF
-					}
-					b := data[iNdEx]
-					iNdEx++
-					innerWire |= (uint64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				innerWireType := int(innerWire & 0x7)
-				if innerWireType == 4 {
-					break
-				}
-				next, err := skipGenerated(data[start:])
-				if err != nil {
-					return 0, err
-				}
-				iNdEx = start + next
-			}
-			return iNdEx, nil
-		case 4:
-			return iNdEx, nil
-		case 5:
-			iNdEx += 4
-			return iNdEx, nil
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-	}
-	panic("unreachable")
-}
-
-var (
-	ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowGenerated   = fmt.Errorf("proto: integer overflow")
-)
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.proto b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.proto
deleted file mode 100644
index 34ede4581b..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/generated.proto
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-
-// This file was autogenerated by go-to-protobuf. Do not edit it manually!
-
-syntax = 'proto2';
-
-package k8s.io.kubernetes.pkg.api.resource;
-
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
-
-// Package-wide variables from generator "generated".
-option go_package = "resource";
-
-// Quantity is a fixed-point representation of a number.
-// It provides convenient marshaling/unmarshaling in JSON and YAML,
-// in addition to String() and Int64() accessors.
-// 
-// The serialization format is:
-// 
-// <quantity>        ::= <signedNumber><suffix>
-//   (Note that <suffix> may be empty, from the "" case in <decimalSI>.)
-// <digit>           ::= 0 | 1 | ... | 9
-// <digits>          ::= <digit> | <digit><digits>
-// <number>          ::= <digits> | <digits>.<digits> | <digits>. | .<digits>
-// <sign>            ::= "+" | "-"
-// <signedNumber>    ::= <number> | <sign><number>
-// <suffix>          ::= <binarySI> | <decimalExponent> | <decimalSI>
-// <binarySI>        ::= Ki | Mi | Gi | Ti | Pi | Ei
-//   (International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)
-// <decimalSI>       ::= m | "" | k | M | G | T | P | E
-//   (Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)
-// <decimalExponent> ::= "e" <signedNumber> | "E" <signedNumber>
-// 
-// No matter which of the three exponent forms is used, no quantity may represent
-// a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal
-// places. Numbers larger or more precise will be capped or rounded up.
-// (E.g.: 0.1m will rounded up to 1m.)
-// This may be extended in the future if we require larger or smaller quantities.
-// 
-// When a Quantity is parsed from a string, it will remember the type of suffix
-// it had, and will use the same type again when it is serialized.
-// 
-// Before serializing, Quantity will be put in "canonical form".
-// This means that Exponent/suffix will be adjusted up or down (with a
-// corresponding increase or decrease in Mantissa) such that:
-//   a. No precision is lost
-//   b. No fractional digits will be emitted
-//   c. The exponent (or suffix) is as large as possible.
-// The sign will be omitted unless the number is negative.
-// 
-// Examples:
-//   1.5 will be serialized as "1500m"
-//   1.5Gi will be serialized as "1536Mi"
-// 
-// NOTE: We reserve the right to amend this canonical format, perhaps to
-//   allow 1.5 to be canonical.
-// TODO: Remove above disclaimer after all bikeshedding about format is over,
-//   or after March 2015.
-// 
-// Note that the quantity will NEVER be internally represented by a
-// floating point number. That is the whole point of this exercise.
-// 
-// Non-canonical values will still parse as long as they are well formed,
-// but will be re-emitted in their canonical form. (So always use canonical
-// form, or don't diff.)
-// 
-// This format is intended to make it difficult to use these numbers without
-// writing some sort of special handling code in the hopes that that will
-// cause implementors to also use a fixed point implementation.
-// 
-// +protobuf=true
-// +protobuf.embed=QuantityProto
-// +protobuf.options.marshal=false
-// +protobuf.options.(gogoproto.goproto_stringer)=false
-message Quantity {
-  optional QuantityProto QuantityProto = 1;
-}
-
-// QuantityProto is a struct that is equivalent to Quantity, but intended for
-// protobuf marshalling/unmarshalling. It is generated into a serialization
-// that matches Quantity. Do not use in Go structs.
-// 
-// +protobuf=true
-message QuantityProto {
-  // The format of the quantity
-  optional string format = 1;
-
-  // The scale dimension of the value
-  optional int32 scale = 2;
-
-  // Bigint is serialized as a raw bytes array
-  optional bytes bigint = 3;
-}
-
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity.go
deleted file mode 100644
index e61c8800ec..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity.go
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package resource
-
-import (
-	"errors"
-	"fmt"
-	"math/big"
-	"regexp"
-	"strings"
-
-	flag "github.com/spf13/pflag"
-
-	inf "gopkg.in/inf.v0"
-)
-
-// Quantity is a fixed-point representation of a number.
-// It provides convenient marshaling/unmarshaling in JSON and YAML,
-// in addition to String() and Int64() accessors.
-//
-// The serialization format is:
-//
-// <quantity>        ::= <signedNumber><suffix>
-//   (Note that <suffix> may be empty, from the "" case in <decimalSI>.)
-// <digit>           ::= 0 | 1 | ... | 9
-// <digits>          ::= <digit> | <digit><digits>
-// <number>          ::= <digits> | <digits>.<digits> | <digits>. | .<digits>
-// <sign>            ::= "+" | "-"
-// <signedNumber>    ::= <number> | <sign><number>
-// <suffix>          ::= <binarySI> | <decimalExponent> | <decimalSI>
-// <binarySI>        ::= Ki | Mi | Gi | Ti | Pi | Ei
-//   (International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)
-// <decimalSI>       ::= m | "" | k | M | G | T | P | E
-//   (Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)
-// <decimalExponent> ::= "e" <signedNumber> | "E" <signedNumber>
-//
-// No matter which of the three exponent forms is used, no quantity may represent
-// a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal
-// places. Numbers larger or more precise will be capped or rounded up.
-// (E.g.: 0.1m will rounded up to 1m.)
-// This may be extended in the future if we require larger or smaller quantities.
-//
-// When a Quantity is parsed from a string, it will remember the type of suffix
-// it had, and will use the same type again when it is serialized.
-//
-// Before serializing, Quantity will be put in "canonical form".
-// This means that Exponent/suffix will be adjusted up or down (with a
-// corresponding increase or decrease in Mantissa) such that:
-//   a. No precision is lost
-//   b. No fractional digits will be emitted
-//   c. The exponent (or suffix) is as large as possible.
-// The sign will be omitted unless the number is negative.
-//
-// Examples:
-//   1.5 will be serialized as "1500m"
-//   1.5Gi will be serialized as "1536Mi"
-//
-// NOTE: We reserve the right to amend this canonical format, perhaps to
-//   allow 1.5 to be canonical.
-// TODO: Remove above disclaimer after all bikeshedding about format is over,
-//   or after March 2015.
-//
-// Note that the quantity will NEVER be internally represented by a
-// floating point number. That is the whole point of this exercise.
-//
-// Non-canonical values will still parse as long as they are well formed,
-// but will be re-emitted in their canonical form. (So always use canonical
-// form, or don't diff.)
-//
-// This format is intended to make it difficult to use these numbers without
-// writing some sort of special handling code in the hopes that that will
-// cause implementors to also use a fixed point implementation.
-//
-// +protobuf=true
-// +protobuf.embed=QuantityProto
-// +protobuf.options.marshal=false
-// +protobuf.options.(gogoproto.goproto_stringer)=false
-type Quantity struct {
-	// Amount is public, so you can manipulate it if the accessor
-	// functions are not sufficient.
-	Amount *inf.Dec
-
-	// Change Format at will. See the comment for Canonicalize for
-	// more details.
-	Format
-}
-
-// Format lists the three possible formattings of a quantity.
-type Format string
-
-const (
-	DecimalExponent = Format("DecimalExponent") // e.g., 12e6
-	BinarySI        = Format("BinarySI")        // e.g., 12Mi (12 * 2^20)
-	DecimalSI       = Format("DecimalSI")       // e.g., 12M  (12 * 10^6)
-)
-
-// MustParse turns the given string into a quantity or panics; for tests
-// or others cases where you know the string is valid.
-func MustParse(str string) Quantity {
-	q, err := ParseQuantity(str)
-	if err != nil {
-		panic(fmt.Errorf("cannot parse '%v': %v", str, err))
-	}
-	return *q
-}
-
-// Scale is used for getting and setting the base-10 scaled value.
-// Base-2 scales are omitted for mathematical simplicity.
-// See Quantity.ScaledValue for more details.
-type Scale int
-
-const (
-	Nano  Scale = -9
-	Micro Scale = -6
-	Milli Scale = -3
-	Kilo  Scale = 3
-	Mega  Scale = 6
-	Giga  Scale = 9
-	Tera  Scale = 12
-	Peta  Scale = 15
-	Exa   Scale = 18
-)
-
-const (
-	// splitREString is used to separate a number from its suffix; as such,
-	// this is overly permissive, but that's OK-- it will be checked later.
-	splitREString = "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
-)
-
-var (
-	// splitRE is used to get the various parts of a number.
-	splitRE = regexp.MustCompile(splitREString)
-
-	// Errors that could happen while parsing a string.
-	ErrFormatWrong = errors.New("quantities must match the regular expression '" + splitREString + "'")
-	ErrNumeric     = errors.New("unable to parse numeric part of quantity")
-	ErrSuffix      = errors.New("unable to parse quantity's suffix")
-
-	// Commonly needed big.Int values-- treat as read only!
-	bigTen      = big.NewInt(10)
-	bigZero     = big.NewInt(0)
-	bigOne      = big.NewInt(1)
-	bigThousand = big.NewInt(1000)
-	big1024     = big.NewInt(1024)
-
-	// Commonly needed inf.Dec values-- treat as read only!
-	decZero      = inf.NewDec(0, 0)
-	decOne       = inf.NewDec(1, 0)
-	decMinusOne  = inf.NewDec(-1, 0)
-	decThousand  = inf.NewDec(1000, 0)
-	dec1024      = inf.NewDec(1024, 0)
-	decMinus1024 = inf.NewDec(-1024, 0)
-
-	// Largest (in magnitude) number allowed.
-	maxAllowed = inf.NewDec((1<<63)-1, 0) // == max int64
-
-	// The maximum value we can represent milli-units for.
-	// Compare with the return value of Quantity.Value() to
-	// see if it's safe to use Quantity.MilliValue().
-	MaxMilliValue = int64(((1 << 63) - 1) / 1000)
-)
-
-// ParseQuantity turns str into a Quantity, or returns an error.
-func ParseQuantity(str string) (*Quantity, error) {
-	parts := splitRE.FindStringSubmatch(strings.TrimSpace(str))
-	// regexp returns are entire match, followed by an entry for each () section.
-	if len(parts) != 3 {
-		return nil, ErrFormatWrong
-	}
-
-	amount := new(inf.Dec)
-	if _, ok := amount.SetString(parts[1]); !ok {
-		return nil, ErrNumeric
-	}
-
-	base, exponent, format, ok := quantitySuffixer.interpret(suffix(parts[2]))
-	if !ok {
-		return nil, ErrSuffix
-	}
-
-	// So that no one but us has to think about suffixes, remove it.
-	if base == 10 {
-		amount.SetScale(amount.Scale() + Scale(exponent).infScale())
-	} else if base == 2 {
-		// numericSuffix = 2 ** exponent
-		numericSuffix := big.NewInt(1).Lsh(bigOne, uint(exponent))
-		ub := amount.UnscaledBig()
-		amount.SetUnscaledBig(ub.Mul(ub, numericSuffix))
-	}
-
-	// Cap at min/max bounds.
-	sign := amount.Sign()
-	if sign == -1 {
-		amount.Neg(amount)
-	}
-
-	// This rounds non-zero values up to the minimum representable value, under the theory that
-	// if you want some resources, you should get some resources, even if you asked for way too small
-	// of an amount.  Arguably, this should be inf.RoundHalfUp (normal rounding), but that would have
-	// the side effect of rounding values < .5n to zero.
-	if v, ok := amount.Unscaled(); v != int64(0) || !ok {
-		amount.Round(amount, Nano.infScale(), inf.RoundUp)
-	}
-
-	// The max is just a simple cap.
-	if amount.Cmp(maxAllowed) > 0 {
-		amount.Set(maxAllowed)
-	}
-	if format == BinarySI && amount.Cmp(decOne) < 0 && amount.Cmp(decZero) > 0 {
-		// This avoids rounding and hopefully confusion, too.
-		format = DecimalSI
-	}
-	if sign == -1 {
-		amount.Neg(amount)
-	}
-
-	return &Quantity{amount, format}, nil
-}
-
-// removeFactors divides in a loop; the return values have the property that
-// d == result * factor ^ times
-// d may be modified in place.
-// If d == 0, then the return values will be (0, 0)
-func removeFactors(d, factor *big.Int) (result *big.Int, times int) {
-	q := big.NewInt(0)
-	m := big.NewInt(0)
-	for d.Cmp(bigZero) != 0 {
-		q.DivMod(d, factor, m)
-		if m.Cmp(bigZero) != 0 {
-			break
-		}
-		times++
-		d, q = q, d
-	}
-	return d, times
-}
-
-// Canonicalize returns the canonical form of q and its suffix (see comment on Quantity).
-//
-// Note about BinarySI:
-// * If q.Format is set to BinarySI and q.Amount represents a non-zero value between
-//   -1 and +1, it will be emitted as if q.Format were DecimalSI.
-// * Otherwise, if q.Format is set to BinarySI, frational parts of q.Amount will be
-//   rounded up. (1.1i becomes 2i.)
-func (q *Quantity) Canonicalize() (string, suffix) {
-	if q.Amount == nil {
-		return "0", ""
-	}
-
-	// zero is zero always
-	if q.Amount.Cmp(&inf.Dec{}) == 0 {
-		return "0", ""
-	}
-
-	format := q.Format
-	switch format {
-	case DecimalExponent, DecimalSI:
-	case BinarySI:
-		if q.Amount.Cmp(decMinus1024) > 0 && q.Amount.Cmp(dec1024) < 0 {
-			// This avoids rounding and hopefully confusion, too.
-			format = DecimalSI
-		} else {
-			tmp := &inf.Dec{}
-			tmp.Round(q.Amount, 0, inf.RoundUp)
-			if tmp.Cmp(q.Amount) != 0 {
-				// Don't lose precision-- show as DecimalSI
-				format = DecimalSI
-			}
-		}
-	default:
-		format = DecimalExponent
-	}
-
-	// TODO: If BinarySI formatting is requested but would cause rounding, upgrade to
-	// one of the other formats.
-	switch format {
-	case DecimalExponent, DecimalSI:
-		mantissa := q.Amount.UnscaledBig()
-		exponent := int(-q.Amount.Scale())
-		amount := big.NewInt(0).Set(mantissa)
-		// move all factors of 10 into the exponent for easy reasoning
-		amount, times := removeFactors(amount, bigTen)
-		exponent += times
-
-		// make sure exponent is a multiple of 3
-		for exponent%3 != 0 {
-			amount.Mul(amount, bigTen)
-			exponent--
-		}
-
-		suffix, _ := quantitySuffixer.construct(10, exponent, format)
-		number := amount.String()
-		return number, suffix
-	case BinarySI:
-		tmp := &inf.Dec{}
-		tmp.Round(q.Amount, 0, inf.RoundUp)
-
-		amount, exponent := removeFactors(tmp.UnscaledBig(), big1024)
-		suffix, _ := quantitySuffixer.construct(2, exponent*10, format)
-		number := amount.String()
-		return number, suffix
-	}
-	return "0", ""
-}
-
-// String formats the Quantity as a string.
-func (q *Quantity) String() string {
-	number, suffix := q.Canonicalize()
-	return number + string(suffix)
-}
-
-// Cmp compares q and y and returns:
-//
-//   -1 if q <  y
-//    0 if q == y
-//   +1 if q >  y
-//
-func (q *Quantity) Cmp(y Quantity) int {
-	if q.Amount == nil {
-		if y.Amount == nil {
-			return 0
-		}
-		return -y.Amount.Sign()
-	}
-	if y.Amount == nil {
-		return q.Amount.Sign()
-	}
-	return q.Amount.Cmp(y.Amount)
-}
-
-func (q *Quantity) Add(y Quantity) error {
-	switch {
-	case y.Amount == nil:
-		// Adding 0: do nothing.
-	case q.Amount == nil:
-		q.Amount = &inf.Dec{}
-		return q.Add(y)
-	default:
-		// we want to preserve the format of the non-zero value
-		zero := &inf.Dec{}
-		if q.Amount.Cmp(zero) == 0 && y.Amount.Cmp(zero) != 0 {
-			q.Format = y.Format
-		}
-		q.Amount.Add(q.Amount, y.Amount)
-	}
-	return nil
-}
-
-func (q *Quantity) Sub(y Quantity) error {
-	switch {
-	case y.Amount == nil:
-		// Subtracting 0: do nothing.
-	case q.Amount == nil:
-		q.Amount = &inf.Dec{}
-		return q.Sub(y)
-	default:
-		// we want to preserve the format of the non-zero value
-		zero := &inf.Dec{}
-		if q.Amount.Cmp(zero) == 0 && y.Amount.Cmp(zero) != 0 {
-			q.Format = y.Format
-		}
-		q.Amount.Sub(q.Amount, y.Amount)
-	}
-	return nil
-}
-
-// Neg sets q to the negative value of y.
-// It updates the format of q to match y.
-func (q *Quantity) Neg(y Quantity) error {
-	switch {
-	case y.Amount == nil:
-		*q = y
-	case q.Amount == nil:
-		q.Amount = &inf.Dec{}
-		fallthrough
-	default:
-		q.Amount.Neg(y.Amount)
-		q.Format = y.Format
-	}
-	return nil
-}
-
-// MarshalJSON implements the json.Marshaller interface.
-func (q Quantity) MarshalJSON() ([]byte, error) {
-	return []byte(`"` + q.String() + `"`), nil
-}
-
-// UnmarshalJSON implements the json.Unmarshaller interface.
-func (q *Quantity) UnmarshalJSON(value []byte) error {
-	str := string(value)
-	parsed, err := ParseQuantity(strings.Trim(str, `"`))
-	if err != nil {
-		return err
-	}
-	// This copy is safe because parsed will not be referred to again.
-	*q = *parsed
-	return nil
-}
-
-// NewQuantity returns a new Quantity representing the given
-// value in the given format.
-func NewQuantity(value int64, format Format) *Quantity {
-	return &Quantity{
-		Amount: inf.NewDec(value, 0),
-		Format: format,
-	}
-}
-
-// NewMilliQuantity returns a new Quantity representing the given
-// value * 1/1000 in the given format. Note that BinarySI formatting
-// will round fractional values, and will be changed to DecimalSI for
-// values x where (-1 < x < 1) && (x != 0).
-func NewMilliQuantity(value int64, format Format) *Quantity {
-	return &Quantity{
-		Amount: inf.NewDec(value, 3),
-		Format: format,
-	}
-}
-
-// NewScaledQuantity returns a new Quantity representing the given
-// value * 10^scale in DecimalSI format.
-func NewScaledQuantity(value int64, scale Scale) *Quantity {
-	return &Quantity{
-		Amount: inf.NewDec(value, scale.infScale()),
-		Format: DecimalSI,
-	}
-}
-
-// Value returns the value of q; any fractional part will be lost.
-func (q *Quantity) Value() int64 {
-	return q.ScaledValue(0)
-}
-
-// MilliValue returns the value of ceil(q * 1000); this could overflow an int64;
-// if that's a concern, call Value() first to verify the number is small enough.
-func (q *Quantity) MilliValue() int64 {
-	return q.ScaledValue(Milli)
-}
-
-// ScaledValue returns the value of ceil(q * 10^scale); this could overflow an int64.
-// To detect overflow, call Value() first and verify the expected magnitude.
-func (q *Quantity) ScaledValue(scale Scale) int64 {
-	if q.Amount == nil {
-		return 0
-	}
-	return scaledValue(q.Amount.UnscaledBig(), int(q.Amount.Scale()), int(scale.infScale()))
-}
-
-// Set sets q's value to be value.
-func (q *Quantity) Set(value int64) {
-	q.SetScaled(value, 0)
-}
-
-// SetMilli sets q's value to be value * 1/1000.
-func (q *Quantity) SetMilli(value int64) {
-	q.SetScaled(value, Milli)
-}
-
-// SetScaled sets q's value to be value * 10^scale
-func (q *Quantity) SetScaled(value int64, scale Scale) {
-	if q.Amount == nil {
-		q.Amount = &inf.Dec{}
-	}
-	q.Amount.SetUnscaled(value)
-	q.Amount.SetScale(scale.infScale())
-}
-
-// Copy is a convenience function that makes a deep copy for you. Non-deep
-// copies of quantities share pointers and you will regret that.
-func (q *Quantity) Copy() *Quantity {
-	if q.Amount == nil {
-		return NewQuantity(0, q.Format)
-	}
-	tmp := &inf.Dec{}
-	return &Quantity{
-		Amount: tmp.Set(q.Amount),
-		Format: q.Format,
-	}
-}
-
-// qFlag is a helper type for the Flag function
-type qFlag struct {
-	dest *Quantity
-}
-
-// Sets the value of the internal Quantity. (used by flag & pflag)
-func (qf qFlag) Set(val string) error {
-	q, err := ParseQuantity(val)
-	if err != nil {
-		return err
-	}
-	// This copy is OK because q will not be referenced again.
-	*qf.dest = *q
-	return nil
-}
-
-// Converts the value of the internal Quantity to a string. (used by flag & pflag)
-func (qf qFlag) String() string {
-	return qf.dest.String()
-}
-
-// States the type of flag this is (Quantity). (used by pflag)
-func (qf qFlag) Type() string {
-	return "quantity"
-}
-
-// QuantityFlag is a helper that makes a quantity flag (using standard flag package).
-// Will panic if defaultValue is not a valid quantity.
-func QuantityFlag(flagName, defaultValue, description string) *Quantity {
-	q := MustParse(defaultValue)
-	flag.Var(NewQuantityFlagValue(&q), flagName, description)
-	return &q
-}
-
-// NewQuantityFlagValue returns an object that can be used to back a flag,
-// pointing at the given Quantity variable.
-func NewQuantityFlagValue(q *Quantity) flag.Value {
-	return qFlag{q}
-}
-
-// infScale adapts a Scale value to an inf.Scale value.
-func (s Scale) infScale() inf.Scale {
-	return inf.Scale(-s) // inf.Scale is upside-down
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
deleted file mode 100644
index 01d5c2997e..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package resource
-
-import (
-	"math/big"
-
-	inf "gopkg.in/inf.v0"
-)
-
-// QuantityProto is a struct that is equivalent to Quantity, but intended for
-// protobuf marshalling/unmarshalling. It is generated into a serialization
-// that matches Quantity. Do not use in Go structs.
-//
-// +protobuf=true
-type QuantityProto struct {
-	// The format of the quantity
-	Format Format `protobuf:"bytes,1,opt,name=format,casttype=Format"`
-	// The scale dimension of the value
-	Scale int32 `protobuf:"varint,2,opt,name=scale"`
-	// Bigint is serialized as a raw bytes array
-	Bigint []byte `protobuf:"bytes,3,opt,name=bigint"`
-}
-
-// ProtoTime returns the Time as a new ProtoTime value.
-func (q *Quantity) QuantityProto() *QuantityProto {
-	if q == nil {
-		return &QuantityProto{}
-	}
-	p := &QuantityProto{
-		Format: q.Format,
-	}
-	if q.Amount != nil {
-		p.Scale = int32(q.Amount.Scale())
-		p.Bigint = q.Amount.UnscaledBig().Bytes()
-	}
-	return p
-}
-
-// Size implements the protobuf marshalling interface.
-func (q *Quantity) Size() (n int) { return q.QuantityProto().Size() }
-
-// Reset implements the protobuf marshalling interface.
-func (q *Quantity) Unmarshal(data []byte) error {
-	p := QuantityProto{}
-	if err := p.Unmarshal(data); err != nil {
-		return err
-	}
-	q.Format = p.Format
-	b := big.NewInt(0)
-	b.SetBytes(p.Bigint)
-	q.Amount = inf.NewDecBig(b, inf.Scale(p.Scale))
-	return nil
-}
-
-// Marshal implements the protobuf marshalling interface.
-func (q *Quantity) Marshal() (data []byte, err error) {
-	return q.QuantityProto().Marshal()
-}
-
-// MarshalTo implements the protobuf marshalling interface.
-func (q *Quantity) MarshalTo(data []byte) (int, error) {
-	return q.QuantityProto().MarshalTo(data)
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/scale_int.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/scale_int.go
deleted file mode 100644
index 173de1a217..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/scale_int.go
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package resource
-
-import (
-	"math"
-	"math/big"
-	"sync"
-)
-
-var (
-	// A sync pool to reduce allocation.
-	intPool  sync.Pool
-	maxInt64 = big.NewInt(math.MaxInt64)
-)
-
-func init() {
-	intPool.New = func() interface{} {
-		return &big.Int{}
-	}
-}
-
-// scaledValue scales given unscaled value from scale to new Scale and returns
-// an int64. It ALWAYS rounds up the result when scale down. The final result might
-// overflow.
-//
-// scale, newScale represents the scale of the unscaled decimal.
-// The mathematical value of the decimal is unscaled * 10**(-scale).
-func scaledValue(unscaled *big.Int, scale, newScale int) int64 {
-	dif := scale - newScale
-	if dif == 0 {
-		return unscaled.Int64()
-	}
-
-	// Handle scale up
-	// This is an easy case, we do not need to care about rounding and overflow.
-	// If any intermediate operation causes overflow, the result will overflow.
-	if dif < 0 {
-		return unscaled.Int64() * int64(math.Pow10(-dif))
-	}
-
-	// Handle scale down
-	// We have to be careful about the intermediate operations.
-
-	// fast path when unscaled < max.Int64 and exp(10,dif) < max.Int64
-	const log10MaxInt64 = 19
-	if unscaled.Cmp(maxInt64) < 0 && dif < log10MaxInt64 {
-		divide := int64(math.Pow10(dif))
-		result := unscaled.Int64() / divide
-		mod := unscaled.Int64() % divide
-		if mod != 0 {
-			return result + 1
-		}
-		return result
-	}
-
-	// We should only convert back to int64 when getting the result.
-	divisor := intPool.Get().(*big.Int)
-	exp := intPool.Get().(*big.Int)
-	result := intPool.Get().(*big.Int)
-	defer func() {
-		intPool.Put(divisor)
-		intPool.Put(exp)
-		intPool.Put(result)
-	}()
-
-	// divisor = 10^(dif)
-	// TODO: create loop up table if exp costs too much.
-	divisor.Exp(bigTen, exp.SetInt64(int64(dif)), nil)
-	// reuse exp
-	remainder := exp
-
-	// result = unscaled / divisor
-	// remainder = unscaled % divisor
-	result.DivMod(unscaled, divisor, remainder)
-	if remainder.Sign() != 0 {
-		return result.Int64() + 1
-	}
-
-	return result.Int64()
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/suffix.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/suffix.go
deleted file mode 100644
index 529712365d..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/suffix.go
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package resource
-
-import (
-	"strconv"
-)
-
-type suffix string
-
-// suffixer can interpret and construct suffixes.
-type suffixer interface {
-	interpret(suffix) (base, exponent int, fmt Format, ok bool)
-	construct(base, exponent int, fmt Format) (s suffix, ok bool)
-}
-
-// quantitySuffixer handles suffixes for all three formats that quantity
-// can handle.
-var quantitySuffixer = newSuffixer()
-
-type bePair struct {
-	base, exponent int
-}
-
-type listSuffixer struct {
-	suffixToBE map[suffix]bePair
-	beToSuffix map[bePair]suffix
-}
-
-func (ls *listSuffixer) addSuffix(s suffix, pair bePair) {
-	if ls.suffixToBE == nil {
-		ls.suffixToBE = map[suffix]bePair{}
-	}
-	if ls.beToSuffix == nil {
-		ls.beToSuffix = map[bePair]suffix{}
-	}
-	ls.suffixToBE[s] = pair
-	ls.beToSuffix[pair] = s
-}
-
-func (ls *listSuffixer) lookup(s suffix) (base, exponent int, ok bool) {
-	pair, ok := ls.suffixToBE[s]
-	if !ok {
-		return 0, 0, false
-	}
-	return pair.base, pair.exponent, true
-}
-
-func (ls *listSuffixer) construct(base, exponent int) (s suffix, ok bool) {
-	s, ok = ls.beToSuffix[bePair{base, exponent}]
-	return
-}
-
-type suffixHandler struct {
-	decSuffixes listSuffixer
-	binSuffixes listSuffixer
-}
-
-func newSuffixer() suffixer {
-	sh := &suffixHandler{}
-
-	sh.binSuffixes.addSuffix("Ki", bePair{2, 10})
-	sh.binSuffixes.addSuffix("Mi", bePair{2, 20})
-	sh.binSuffixes.addSuffix("Gi", bePair{2, 30})
-	sh.binSuffixes.addSuffix("Ti", bePair{2, 40})
-	sh.binSuffixes.addSuffix("Pi", bePair{2, 50})
-	sh.binSuffixes.addSuffix("Ei", bePair{2, 60})
-	// Don't emit an error when trying to produce
-	// a suffix for 2^0.
-	sh.decSuffixes.addSuffix("", bePair{2, 0})
-
-	sh.decSuffixes.addSuffix("n", bePair{10, -9})
-	sh.decSuffixes.addSuffix("u", bePair{10, -6})
-	sh.decSuffixes.addSuffix("m", bePair{10, -3})
-	sh.decSuffixes.addSuffix("", bePair{10, 0})
-	sh.decSuffixes.addSuffix("k", bePair{10, 3})
-	sh.decSuffixes.addSuffix("M", bePair{10, 6})
-	sh.decSuffixes.addSuffix("G", bePair{10, 9})
-	sh.decSuffixes.addSuffix("T", bePair{10, 12})
-	sh.decSuffixes.addSuffix("P", bePair{10, 15})
-	sh.decSuffixes.addSuffix("E", bePair{10, 18})
-
-	return sh
-}
-
-func (sh *suffixHandler) construct(base, exponent int, fmt Format) (s suffix, ok bool) {
-	switch fmt {
-	case DecimalSI:
-		return sh.decSuffixes.construct(base, exponent)
-	case BinarySI:
-		return sh.binSuffixes.construct(base, exponent)
-	case DecimalExponent:
-		if base != 10 {
-			return "", false
-		}
-		if exponent == 0 {
-			return "", true
-		}
-		return suffix("e" + strconv.FormatInt(int64(exponent), 10)), true
-	}
-	return "", false
-}
-
-func (sh *suffixHandler) interpret(suffix suffix) (base, exponent int, fmt Format, ok bool) {
-	// Try lookup tables first
-	if b, e, ok := sh.decSuffixes.lookup(suffix); ok {
-		return b, e, DecimalSI, true
-	}
-	if b, e, ok := sh.binSuffixes.lookup(suffix); ok {
-		return b, e, BinarySI, true
-	}
-
-	if len(suffix) > 1 && (suffix[0] == 'E' || suffix[0] == 'e') {
-		parsed, err := strconv.ParseInt(string(suffix[1:]), 10, 64)
-		if err != nil {
-			return 0, 0, DecimalExponent, false
-		}
-		return 10, int(parsed), DecimalExponent, true
-	}
-
-	return 0, 0, DecimalExponent, false
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/OWNERS b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/OWNERS
deleted file mode 100644
index a046efc0c2..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-assignees:
-  - derekwaynecarr
-  - lavalamp
-  - smarterclayton
-  - wojtek-t
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/cloner.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/cloner.go
deleted file mode 100644
index a8c5747132..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/cloner.go
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package conversion
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// Cloner knows how to copy one type to another.
-type Cloner struct {
-	// Map from the type to a function which can do the deep copy.
-	deepCopyFuncs          map[reflect.Type]reflect.Value
-	generatedDeepCopyFuncs map[reflect.Type]reflect.Value
-}
-
-// NewCloner creates a new Cloner object.
-func NewCloner() *Cloner {
-	c := &Cloner{
-		deepCopyFuncs:          map[reflect.Type]reflect.Value{},
-		generatedDeepCopyFuncs: map[reflect.Type]reflect.Value{},
-	}
-	if err := c.RegisterDeepCopyFunc(byteSliceDeepCopy); err != nil {
-		// If one of the deep-copy functions is malformed, detect it immediately.
-		panic(err)
-	}
-	return c
-}
-
-// Prevent recursing into every byte...
-func byteSliceDeepCopy(in []byte, out *[]byte, c *Cloner) error {
-	if in != nil {
-		*out = make([]byte, len(in))
-		copy(*out, in)
-	} else {
-		*out = nil
-	}
-	return nil
-}
-
-// Verifies whether a deep-copy function has a correct signature.
-func verifyDeepCopyFunctionSignature(ft reflect.Type) error {
-	if ft.Kind() != reflect.Func {
-		return fmt.Errorf("expected func, got: %v", ft)
-	}
-	if ft.NumIn() != 3 {
-		return fmt.Errorf("expected three 'in' params, got %v", ft)
-	}
-	if ft.NumOut() != 1 {
-		return fmt.Errorf("expected one 'out' param, got %v", ft)
-	}
-	if ft.In(1).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'in' param 1, got: %v", ft)
-	}
-	if ft.In(1).Elem() != ft.In(0) {
-		return fmt.Errorf("expected 'in' param 0 the same as param 1, got: %v", ft)
-	}
-	var forClonerType Cloner
-	if expected := reflect.TypeOf(&forClonerType); ft.In(2) != expected {
-		return fmt.Errorf("expected '%v' arg for 'in' param 2, got: '%v'", expected, ft.In(2))
-	}
-	var forErrorType error
-	// This convolution is necessary, otherwise TypeOf picks up on the fact
-	// that forErrorType is nil
-	errorType := reflect.TypeOf(&forErrorType).Elem()
-	if ft.Out(0) != errorType {
-		return fmt.Errorf("expected error return, got: %v", ft)
-	}
-	return nil
-}
-
-// RegisterGeneratedDeepCopyFunc registers a copying func with the Cloner.
-// deepCopyFunc must take three parameters: a type input, a pointer to a
-// type output, and a pointer to Cloner. It should return an error.
-//
-// Example:
-// c.RegisterGeneratedDeepCopyFunc(
-//         func(in Pod, out *Pod, c *Cloner) error {
-//                 // deep copy logic...
-//                 return nil
-//          })
-func (c *Cloner) RegisterDeepCopyFunc(deepCopyFunc interface{}) error {
-	fv := reflect.ValueOf(deepCopyFunc)
-	ft := fv.Type()
-	if err := verifyDeepCopyFunctionSignature(ft); err != nil {
-		return err
-	}
-	c.deepCopyFuncs[ft.In(0)] = fv
-	return nil
-}
-
-// Similar to RegisterDeepCopyFunc, but registers deep copy function that were
-// automatically generated.
-func (c *Cloner) RegisterGeneratedDeepCopyFunc(deepCopyFunc interface{}) error {
-	fv := reflect.ValueOf(deepCopyFunc)
-	ft := fv.Type()
-	if err := verifyDeepCopyFunctionSignature(ft); err != nil {
-		return err
-	}
-	c.generatedDeepCopyFuncs[ft.In(0)] = fv
-	return nil
-}
-
-// DeepCopy will perform a deep copy of a given object.
-func (c *Cloner) DeepCopy(in interface{}) (interface{}, error) {
-	// Can be invalid if we run DeepCopy(X) where X is a nil interface type.
-	// For example, we get an invalid value when someone tries to deep-copy
-	// a nil labels.Selector.
-	// This does not occur if X is nil and is a pointer to a concrete type.
-	if in == nil {
-		return nil, nil
-	}
-	inValue := reflect.ValueOf(in)
-	outValue, err := c.deepCopy(inValue)
-	if err != nil {
-		return nil, err
-	}
-	return outValue.Interface(), nil
-}
-
-func (c *Cloner) deepCopy(src reflect.Value) (reflect.Value, error) {
-	inType := src.Type()
-
-	if fv, ok := c.deepCopyFuncs[inType]; ok {
-		return c.customDeepCopy(src, fv)
-	}
-	if fv, ok := c.generatedDeepCopyFuncs[inType]; ok {
-		return c.customDeepCopy(src, fv)
-	}
-	return c.defaultDeepCopy(src)
-}
-
-func (c *Cloner) customDeepCopy(src, fv reflect.Value) (reflect.Value, error) {
-	outValue := reflect.New(src.Type())
-	args := []reflect.Value{src, outValue, reflect.ValueOf(c)}
-	result := fv.Call(args)[0].Interface()
-	// This convolution is necessary because nil interfaces won't convert
-	// to error.
-	if result == nil {
-		return outValue.Elem(), nil
-	}
-	return outValue.Elem(), result.(error)
-}
-
-func (c *Cloner) defaultDeepCopy(src reflect.Value) (reflect.Value, error) {
-	switch src.Kind() {
-	case reflect.Chan, reflect.Func, reflect.UnsafePointer, reflect.Uintptr:
-		return src, fmt.Errorf("cannot deep copy kind: %s", src.Kind())
-	case reflect.Array:
-		dst := reflect.New(src.Type())
-		for i := 0; i < src.Len(); i++ {
-			copyVal, err := c.deepCopy(src.Index(i))
-			if err != nil {
-				return src, err
-			}
-			dst.Elem().Index(i).Set(copyVal)
-		}
-		return dst.Elem(), nil
-	case reflect.Interface:
-		if src.IsNil() {
-			return src, nil
-		}
-		return c.deepCopy(src.Elem())
-	case reflect.Map:
-		if src.IsNil() {
-			return src, nil
-		}
-		dst := reflect.MakeMap(src.Type())
-		for _, k := range src.MapKeys() {
-			copyVal, err := c.deepCopy(src.MapIndex(k))
-			if err != nil {
-				return src, err
-			}
-			dst.SetMapIndex(k, copyVal)
-		}
-		return dst, nil
-	case reflect.Ptr:
-		if src.IsNil() {
-			return src, nil
-		}
-		dst := reflect.New(src.Type().Elem())
-		copyVal, err := c.deepCopy(src.Elem())
-		if err != nil {
-			return src, err
-		}
-		dst.Elem().Set(copyVal)
-		return dst, nil
-	case reflect.Slice:
-		if src.IsNil() {
-			return src, nil
-		}
-		dst := reflect.MakeSlice(src.Type(), 0, src.Len())
-		for i := 0; i < src.Len(); i++ {
-			copyVal, err := c.deepCopy(src.Index(i))
-			if err != nil {
-				return src, err
-			}
-			dst = reflect.Append(dst, copyVal)
-		}
-		return dst, nil
-	case reflect.Struct:
-		dst := reflect.New(src.Type())
-		for i := 0; i < src.NumField(); i++ {
-			if !dst.Elem().Field(i).CanSet() {
-				// Can't set private fields. At this point, the
-				// best we can do is a shallow copy. For
-				// example, time.Time is a value type with
-				// private members that can be shallow copied.
-				return src, nil
-			}
-			copyVal, err := c.deepCopy(src.Field(i))
-			if err != nil {
-				return src, err
-			}
-			dst.Elem().Field(i).Set(copyVal)
-		}
-		return dst.Elem(), nil
-
-	default:
-		// Value types like numbers, booleans, and strings.
-		return src, nil
-	}
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/converter.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/converter.go
deleted file mode 100644
index e045dcd2f7..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/converter.go
+++ /dev/null
@@ -1,951 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package conversion
-
-import (
-	"fmt"
-	"reflect"
-)
-
-type typePair struct {
-	source reflect.Type
-	dest   reflect.Type
-}
-
-type typeNamePair struct {
-	fieldType reflect.Type
-	fieldName string
-}
-
-// DebugLogger allows you to get debugging messages if necessary.
-type DebugLogger interface {
-	Logf(format string, args ...interface{})
-}
-
-type NameFunc func(t reflect.Type) string
-
-var DefaultNameFunc = func(t reflect.Type) string { return t.Name() }
-
-type GenericConversionFunc func(a, b interface{}, scope Scope) (bool, error)
-
-// Converter knows how to convert one type to another.
-type Converter struct {
-	// Map from the conversion pair to a function which can
-	// do the conversion.
-	conversionFuncs          ConversionFuncs
-	generatedConversionFuncs ConversionFuncs
-
-	// genericConversions are called during normal conversion to offer a "fast-path"
-	// that avoids all reflection. These methods are not called outside of the .Convert()
-	// method.
-	genericConversions []GenericConversionFunc
-
-	// Set of conversions that should be treated as a no-op
-	ignoredConversions map[typePair]struct{}
-
-	// This is a map from a source field type and name, to a list of destination
-	// field type and name.
-	structFieldDests map[typeNamePair][]typeNamePair
-
-	// Allows for the opposite lookup of structFieldDests. So that SourceFromDest
-	// copy flag also works. So this is a map of destination field name, to potential
-	// source field name and type to look for.
-	structFieldSources map[typeNamePair][]typeNamePair
-
-	// Map from a type to a function which applies defaults.
-	defaultingFuncs map[reflect.Type]reflect.Value
-
-	// Similar to above, but function is stored as interface{}.
-	defaultingInterfaces map[reflect.Type]interface{}
-
-	// Map from an input type to a function which can apply a key name mapping
-	inputFieldMappingFuncs map[reflect.Type]FieldMappingFunc
-
-	// Map from an input type to a set of default conversion flags.
-	inputDefaultFlags map[reflect.Type]FieldMatchingFlags
-
-	// If non-nil, will be called to print helpful debugging info. Quite verbose.
-	Debug DebugLogger
-
-	// nameFunc is called to retrieve the name of a type; this name is used for the
-	// purpose of deciding whether two types match or not (i.e., will we attempt to
-	// do a conversion). The default returns the go type name.
-	nameFunc func(t reflect.Type) string
-}
-
-// NewConverter creates a new Converter object.
-func NewConverter(nameFn NameFunc) *Converter {
-	c := &Converter{
-		conversionFuncs:          NewConversionFuncs(),
-		generatedConversionFuncs: NewConversionFuncs(),
-		ignoredConversions:       make(map[typePair]struct{}),
-		defaultingFuncs:          make(map[reflect.Type]reflect.Value),
-		defaultingInterfaces:     make(map[reflect.Type]interface{}),
-		nameFunc:                 nameFn,
-		structFieldDests:         make(map[typeNamePair][]typeNamePair),
-		structFieldSources:       make(map[typeNamePair][]typeNamePair),
-
-		inputFieldMappingFuncs: make(map[reflect.Type]FieldMappingFunc),
-		inputDefaultFlags:      make(map[reflect.Type]FieldMatchingFlags),
-	}
-	c.RegisterConversionFunc(Convert_Slice_byte_To_Slice_byte)
-	return c
-}
-
-// AddGenericConversionFunc adds a function that accepts the ConversionFunc call pattern
-// (for two conversion types) to the converter. These functions are checked first during
-// a normal conversion, but are otherwise not called. Use AddConversionFuncs when registering
-// typed conversions.
-func (c *Converter) AddGenericConversionFunc(fn GenericConversionFunc) {
-	c.genericConversions = append(c.genericConversions, fn)
-}
-
-// WithConversions returns a Converter that is a copy of c but with the additional
-// fns merged on top.
-func (c *Converter) WithConversions(fns ConversionFuncs) *Converter {
-	copied := *c
-	copied.conversionFuncs = c.conversionFuncs.Merge(fns)
-	return &copied
-}
-
-// DefaultMeta returns the conversion FieldMappingFunc and meta for a given type.
-func (c *Converter) DefaultMeta(t reflect.Type) (FieldMatchingFlags, *Meta) {
-	return c.inputDefaultFlags[t], &Meta{
-		KeyNameMapping: c.inputFieldMappingFuncs[t],
-	}
-}
-
-// Convert_Slice_byte_To_Slice_byte prevents recursing into every byte
-func Convert_Slice_byte_To_Slice_byte(in *[]byte, out *[]byte, s Scope) error {
-	if *in == nil {
-		*out = nil
-		return nil
-	}
-	*out = make([]byte, len(*in))
-	copy(*out, *in)
-	return nil
-}
-
-// Scope is passed to conversion funcs to allow them to continue an ongoing conversion.
-// If multiple converters exist in the system, Scope will allow you to use the correct one
-// from a conversion function--that is, the one your conversion function was called by.
-type Scope interface {
-	// Call Convert to convert sub-objects. Note that if you call it with your own exact
-	// parameters, you'll run out of stack space before anything useful happens.
-	Convert(src, dest interface{}, flags FieldMatchingFlags) error
-
-	// DefaultConvert performs the default conversion, without calling a conversion func
-	// on the current stack frame. This makes it safe to call from a conversion func.
-	DefaultConvert(src, dest interface{}, flags FieldMatchingFlags) error
-
-	// If registered, returns a function applying defaults for objects of a given type.
-	// Used for automatically generating conversion functions.
-	DefaultingInterface(inType reflect.Type) (interface{}, bool)
-
-	// SrcTags and DestTags contain the struct tags that src and dest had, respectively.
-	// If the enclosing object was not a struct, then these will contain no tags, of course.
-	SrcTag() reflect.StructTag
-	DestTag() reflect.StructTag
-
-	// Flags returns the flags with which the conversion was started.
-	Flags() FieldMatchingFlags
-
-	// Meta returns any information originally passed to Convert.
-	Meta() *Meta
-}
-
-// FieldMappingFunc can convert an input field value into different values, depending on
-// the value of the source or destination struct tags.
-type FieldMappingFunc func(key string, sourceTag, destTag reflect.StructTag) (source string, dest string)
-
-func NewConversionFuncs() ConversionFuncs {
-	return ConversionFuncs{fns: make(map[typePair]reflect.Value)}
-}
-
-type ConversionFuncs struct {
-	fns map[typePair]reflect.Value
-}
-
-// Add adds the provided conversion functions to the lookup table - they must have the signature
-// `func(type1, type2, Scope) error`. Functions are added in the order passed and will override
-// previously registered pairs.
-func (c ConversionFuncs) Add(fns ...interface{}) error {
-	for _, fn := range fns {
-		fv := reflect.ValueOf(fn)
-		ft := fv.Type()
-		if err := verifyConversionFunctionSignature(ft); err != nil {
-			return err
-		}
-		c.fns[typePair{ft.In(0).Elem(), ft.In(1).Elem()}] = fv
-	}
-	return nil
-}
-
-// Merge returns a new ConversionFuncs that contains all conversions from
-// both other and c, with other conversions taking precedence.
-func (c ConversionFuncs) Merge(other ConversionFuncs) ConversionFuncs {
-	merged := NewConversionFuncs()
-	for k, v := range c.fns {
-		merged.fns[k] = v
-	}
-	for k, v := range other.fns {
-		merged.fns[k] = v
-	}
-	return merged
-}
-
-// Meta is supplied by Scheme, when it calls Convert.
-type Meta struct {
-	// KeyNameMapping is an optional function which may map the listed key (field name)
-	// into a source and destination value.
-	KeyNameMapping FieldMappingFunc
-}
-
-// scope contains information about an ongoing conversion.
-type scope struct {
-	converter *Converter
-	meta      *Meta
-	flags     FieldMatchingFlags
-
-	// srcStack & destStack are separate because they may not have a 1:1
-	// relationship.
-	srcStack  scopeStack
-	destStack scopeStack
-}
-
-type scopeStackElem struct {
-	tag   reflect.StructTag
-	value reflect.Value
-	key   string
-}
-
-type scopeStack []scopeStackElem
-
-func (s *scopeStack) pop() {
-	n := len(*s)
-	*s = (*s)[:n-1]
-}
-
-func (s *scopeStack) push(e scopeStackElem) {
-	*s = append(*s, e)
-}
-
-func (s *scopeStack) top() *scopeStackElem {
-	return &(*s)[len(*s)-1]
-}
-
-func (s scopeStack) describe() string {
-	desc := ""
-	if len(s) > 1 {
-		desc = "(" + s[1].value.Type().String() + ")"
-	}
-	for i, v := range s {
-		if i < 2 {
-			// First layer on stack is not real; second is handled specially above.
-			continue
-		}
-		if v.key == "" {
-			desc += fmt.Sprintf(".%v", v.value.Type())
-		} else {
-			desc += fmt.Sprintf(".%v", v.key)
-		}
-	}
-	return desc
-}
-
-func (s *scope) DefaultingInterface(inType reflect.Type) (interface{}, bool) {
-	value, found := s.converter.defaultingInterfaces[inType]
-	return value, found
-}
-
-// Formats src & dest as indices for printing.
-func (s *scope) setIndices(src, dest int) {
-	s.srcStack.top().key = fmt.Sprintf("[%v]", src)
-	s.destStack.top().key = fmt.Sprintf("[%v]", dest)
-}
-
-// Formats src & dest as map keys for printing.
-func (s *scope) setKeys(src, dest interface{}) {
-	s.srcStack.top().key = fmt.Sprintf(`["%v"]`, src)
-	s.destStack.top().key = fmt.Sprintf(`["%v"]`, dest)
-}
-
-// Convert continues a conversion.
-func (s *scope) Convert(src, dest interface{}, flags FieldMatchingFlags) error {
-	return s.converter.Convert(src, dest, flags, s.meta)
-}
-
-// DefaultConvert continues a conversion, performing a default conversion (no conversion func)
-// for the current stack frame.
-func (s *scope) DefaultConvert(src, dest interface{}, flags FieldMatchingFlags) error {
-	return s.converter.DefaultConvert(src, dest, flags, s.meta)
-}
-
-// SrcTag returns the tag of the struct containing the current source item, if any.
-func (s *scope) SrcTag() reflect.StructTag {
-	return s.srcStack.top().tag
-}
-
-// DestTag returns the tag of the struct containing the current dest item, if any.
-func (s *scope) DestTag() reflect.StructTag {
-	return s.destStack.top().tag
-}
-
-// Flags returns the flags with which the current conversion was started.
-func (s *scope) Flags() FieldMatchingFlags {
-	return s.flags
-}
-
-// Meta returns the meta object that was originally passed to Convert.
-func (s *scope) Meta() *Meta {
-	return s.meta
-}
-
-// describe prints the path to get to the current (source, dest) values.
-func (s *scope) describe() (src, dest string) {
-	return s.srcStack.describe(), s.destStack.describe()
-}
-
-// error makes an error that includes information about where we were in the objects
-// we were asked to convert.
-func (s *scope) errorf(message string, args ...interface{}) error {
-	srcPath, destPath := s.describe()
-	where := fmt.Sprintf("converting %v to %v: ", srcPath, destPath)
-	return fmt.Errorf(where+message, args...)
-}
-
-// Verifies whether a conversion function has a correct signature.
-func verifyConversionFunctionSignature(ft reflect.Type) error {
-	if ft.Kind() != reflect.Func {
-		return fmt.Errorf("expected func, got: %v", ft)
-	}
-	if ft.NumIn() != 3 {
-		return fmt.Errorf("expected three 'in' params, got: %v", ft)
-	}
-	if ft.NumOut() != 1 {
-		return fmt.Errorf("expected one 'out' param, got: %v", ft)
-	}
-	if ft.In(0).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'in' param 0, got: %v", ft)
-	}
-	if ft.In(1).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'in' param 1, got: %v", ft)
-	}
-	scopeType := Scope(nil)
-	if e, a := reflect.TypeOf(&scopeType).Elem(), ft.In(2); e != a {
-		return fmt.Errorf("expected '%v' arg for 'in' param 2, got '%v' (%v)", e, a, ft)
-	}
-	var forErrorType error
-	// This convolution is necessary, otherwise TypeOf picks up on the fact
-	// that forErrorType is nil.
-	errorType := reflect.TypeOf(&forErrorType).Elem()
-	if ft.Out(0) != errorType {
-		return fmt.Errorf("expected error return, got: %v", ft)
-	}
-	return nil
-}
-
-// RegisterConversionFunc registers a conversion func with the
-// Converter. conversionFunc must take three parameters: a pointer to the input
-// type, a pointer to the output type, and a conversion.Scope (which should be
-// used if recursive conversion calls are desired).  It must return an error.
-//
-// Example:
-// c.RegisterConversionFunc(
-//         func(in *Pod, out *v1.Pod, s Scope) error {
-//                 // conversion logic...
-//                 return nil
-//          })
-func (c *Converter) RegisterConversionFunc(conversionFunc interface{}) error {
-	return c.conversionFuncs.Add(conversionFunc)
-}
-
-// Similar to RegisterConversionFunc, but registers conversion function that were
-// automatically generated.
-func (c *Converter) RegisterGeneratedConversionFunc(conversionFunc interface{}) error {
-	return c.generatedConversionFuncs.Add(conversionFunc)
-}
-
-// RegisterIgnoredConversion registers a "no-op" for conversion, where any requested
-// conversion between from and to is ignored.
-func (c *Converter) RegisterIgnoredConversion(from, to interface{}) error {
-	typeFrom := reflect.TypeOf(from)
-	typeTo := reflect.TypeOf(to)
-	if reflect.TypeOf(from).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'from' param 0, got: %v", typeFrom)
-	}
-	if typeTo.Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'to' param 1, got: %v", typeTo)
-	}
-	c.ignoredConversions[typePair{typeFrom.Elem(), typeTo.Elem()}] = struct{}{}
-	return nil
-}
-
-// IsConversionIgnored returns true if the specified objects should be dropped during
-// conversion.
-func (c *Converter) IsConversionIgnored(inType, outType reflect.Type) bool {
-	_, found := c.ignoredConversions[typePair{inType, outType}]
-	return found
-}
-
-func (c *Converter) HasConversionFunc(inType, outType reflect.Type) bool {
-	_, found := c.conversionFuncs.fns[typePair{inType, outType}]
-	return found
-}
-
-func (c *Converter) ConversionFuncValue(inType, outType reflect.Type) (reflect.Value, bool) {
-	value, found := c.conversionFuncs.fns[typePair{inType, outType}]
-	return value, found
-}
-
-// SetStructFieldCopy registers a correspondence. Whenever a struct field is encountered
-// which has a type and name matching srcFieldType and srcFieldName, it wil be copied
-// into the field in the destination struct matching destFieldType & Name, if such a
-// field exists.
-// May be called multiple times, even for the same source field & type--all applicable
-// copies will be performed.
-func (c *Converter) SetStructFieldCopy(srcFieldType interface{}, srcFieldName string, destFieldType interface{}, destFieldName string) error {
-	st := reflect.TypeOf(srcFieldType)
-	dt := reflect.TypeOf(destFieldType)
-	srcKey := typeNamePair{st, srcFieldName}
-	destKey := typeNamePair{dt, destFieldName}
-	c.structFieldDests[srcKey] = append(c.structFieldDests[srcKey], destKey)
-	c.structFieldSources[destKey] = append(c.structFieldSources[destKey], srcKey)
-	return nil
-}
-
-// RegisterDefaultingFunc registers a value-defaulting func with the Converter.
-// defaultingFunc must take one parameters: a pointer to the input type.
-//
-// Example:
-// c.RegisteDefaultingFunc(
-//         func(in *v1.Pod) {
-//                 // defaulting logic...
-//          })
-func (c *Converter) RegisterDefaultingFunc(defaultingFunc interface{}) error {
-	fv := reflect.ValueOf(defaultingFunc)
-	ft := fv.Type()
-	if ft.Kind() != reflect.Func {
-		return fmt.Errorf("expected func, got: %v", ft)
-	}
-	if ft.NumIn() != 1 {
-		return fmt.Errorf("expected one 'in' param, got: %v", ft)
-	}
-	if ft.NumOut() != 0 {
-		return fmt.Errorf("expected zero 'out' params, got: %v", ft)
-	}
-	if ft.In(0).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'in' param 0, got: %v", ft)
-	}
-	inType := ft.In(0).Elem()
-	c.defaultingFuncs[inType] = fv
-	c.defaultingInterfaces[inType] = defaultingFunc
-	return nil
-}
-
-// RegisterInputDefaults registers a field name mapping function, used when converting
-// from maps to structs. Inputs to the conversion methods are checked for this type and a mapping
-// applied automatically if the input matches in. A set of default flags for the input conversion
-// may also be provided, which will be used when no explicit flags are requested.
-func (c *Converter) RegisterInputDefaults(in interface{}, fn FieldMappingFunc, defaultFlags FieldMatchingFlags) error {
-	fv := reflect.ValueOf(in)
-	ft := fv.Type()
-	if ft.Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer 'in' argument, got: %v", ft)
-	}
-	c.inputFieldMappingFuncs[ft] = fn
-	c.inputDefaultFlags[ft] = defaultFlags
-	return nil
-}
-
-// FieldMatchingFlags contains a list of ways in which struct fields could be
-// copied. These constants may be | combined.
-type FieldMatchingFlags int
-
-const (
-	// Loop through destination fields, search for matching source
-	// field to copy it from. Source fields with no corresponding
-	// destination field will be ignored. If SourceToDest is
-	// specified, this flag is ignored. If neither is specified,
-	// or no flags are passed, this flag is the default.
-	DestFromSource FieldMatchingFlags = 0
-	// Loop through source fields, search for matching dest field
-	// to copy it into. Destination fields with no corresponding
-	// source field will be ignored.
-	SourceToDest FieldMatchingFlags = 1 << iota
-	// Don't treat it as an error if the corresponding source or
-	// dest field can't be found.
-	IgnoreMissingFields
-	// Don't require type names to match.
-	AllowDifferentFieldTypeNames
-)
-
-// IsSet returns true if the given flag or combination of flags is set.
-func (f FieldMatchingFlags) IsSet(flag FieldMatchingFlags) bool {
-	if flag == DestFromSource {
-		// The bit logic doesn't work on the default value.
-		return f&SourceToDest != SourceToDest
-	}
-	return f&flag == flag
-}
-
-// Convert will translate src to dest if it knows how. Both must be pointers.
-// If no conversion func is registered and the default copying mechanism
-// doesn't work on this type pair, an error will be returned.
-// Read the comments on the various FieldMatchingFlags constants to understand
-// what the 'flags' parameter does.
-// 'meta' is given to allow you to pass information to conversion functions,
-// it is not used by Convert() other than storing it in the scope.
-// Not safe for objects with cyclic references!
-func (c *Converter) Convert(src, dest interface{}, flags FieldMatchingFlags, meta *Meta) error {
-	if len(c.genericConversions) > 0 {
-		// TODO: avoid scope allocation
-		s := &scope{converter: c, flags: flags, meta: meta}
-		for _, fn := range c.genericConversions {
-			if ok, err := fn(src, dest, s); ok {
-				return err
-			}
-		}
-	}
-	return c.doConversion(src, dest, flags, meta, c.convert)
-}
-
-// DefaultConvert will translate src to dest if it knows how. Both must be pointers.
-// No conversion func is used. If the default copying mechanism
-// doesn't work on this type pair, an error will be returned.
-// Read the comments on the various FieldMatchingFlags constants to understand
-// what the 'flags' parameter does.
-// 'meta' is given to allow you to pass information to conversion functions,
-// it is not used by DefaultConvert() other than storing it in the scope.
-// Not safe for objects with cyclic references!
-func (c *Converter) DefaultConvert(src, dest interface{}, flags FieldMatchingFlags, meta *Meta) error {
-	return c.doConversion(src, dest, flags, meta, c.defaultConvert)
-}
-
-type conversionFunc func(sv, dv reflect.Value, scope *scope) error
-
-func (c *Converter) doConversion(src, dest interface{}, flags FieldMatchingFlags, meta *Meta, f conversionFunc) error {
-	dv, err := EnforcePtr(dest)
-	if err != nil {
-		return err
-	}
-	if !dv.CanAddr() && !dv.CanSet() {
-		return fmt.Errorf("can't write to dest")
-	}
-	sv, err := EnforcePtr(src)
-	if err != nil {
-		return err
-	}
-	s := &scope{
-		converter: c,
-		flags:     flags,
-		meta:      meta,
-	}
-	// Leave something on the stack, so that calls to struct tag getters never fail.
-	s.srcStack.push(scopeStackElem{})
-	s.destStack.push(scopeStackElem{})
-	return f(sv, dv, s)
-}
-
-// callCustom calls 'custom' with sv & dv. custom must be a conversion function.
-func (c *Converter) callCustom(sv, dv, custom reflect.Value, scope *scope) error {
-	if !sv.CanAddr() {
-		sv2 := reflect.New(sv.Type())
-		sv2.Elem().Set(sv)
-		sv = sv2
-	} else {
-		sv = sv.Addr()
-	}
-	if !dv.CanAddr() {
-		if !dv.CanSet() {
-			return scope.errorf("can't addr or set dest.")
-		}
-		dvOrig := dv
-		dv := reflect.New(dvOrig.Type())
-		defer func() { dvOrig.Set(dv) }()
-	} else {
-		dv = dv.Addr()
-	}
-	args := []reflect.Value{sv, dv, reflect.ValueOf(scope)}
-	ret := custom.Call(args)[0].Interface()
-	// This convolution is necessary because nil interfaces won't convert
-	// to errors.
-	if ret == nil {
-		return nil
-	}
-	return ret.(error)
-}
-
-// convert recursively copies sv into dv, calling an appropriate conversion function if
-// one is registered.
-func (c *Converter) convert(sv, dv reflect.Value, scope *scope) error {
-	dt, st := dv.Type(), sv.Type()
-	// Apply default values.
-	if fv, ok := c.defaultingFuncs[st]; ok {
-		if c.Debug != nil {
-			c.Debug.Logf("Applying defaults for '%v'", st)
-		}
-		args := []reflect.Value{sv.Addr()}
-		fv.Call(args)
-	}
-
-	pair := typePair{st, dt}
-
-	// ignore conversions of this type
-	if _, ok := c.ignoredConversions[pair]; ok {
-		if c.Debug != nil {
-			c.Debug.Logf("Ignoring conversion of '%v' to '%v'", st, dt)
-		}
-		return nil
-	}
-
-	// Convert sv to dv.
-	if fv, ok := c.conversionFuncs.fns[pair]; ok {
-		if c.Debug != nil {
-			c.Debug.Logf("Calling custom conversion of '%v' to '%v'", st, dt)
-		}
-		return c.callCustom(sv, dv, fv, scope)
-	}
-	if fv, ok := c.generatedConversionFuncs.fns[pair]; ok {
-		if c.Debug != nil {
-			c.Debug.Logf("Calling generated conversion of '%v' to '%v'", st, dt)
-		}
-		return c.callCustom(sv, dv, fv, scope)
-	}
-
-	return c.defaultConvert(sv, dv, scope)
-}
-
-// defaultConvert recursively copies sv into dv. no conversion function is called
-// for the current stack frame (but conversion functions may be called for nested objects)
-func (c *Converter) defaultConvert(sv, dv reflect.Value, scope *scope) error {
-	dt, st := dv.Type(), sv.Type()
-
-	if !dv.CanSet() {
-		return scope.errorf("Cannot set dest. (Tried to deep copy something with unexported fields?)")
-	}
-
-	if !scope.flags.IsSet(AllowDifferentFieldTypeNames) && c.nameFunc(dt) != c.nameFunc(st) {
-		return scope.errorf(
-			"type names don't match (%v, %v), and no conversion 'func (%v, %v) error' registered.",
-			c.nameFunc(st), c.nameFunc(dt), st, dt)
-	}
-
-	switch st.Kind() {
-	case reflect.Map, reflect.Ptr, reflect.Slice, reflect.Interface, reflect.Struct:
-		// Don't copy these via assignment/conversion!
-	default:
-		// This should handle all simple types.
-		if st.AssignableTo(dt) {
-			dv.Set(sv)
-			return nil
-		}
-		if st.ConvertibleTo(dt) {
-			dv.Set(sv.Convert(dt))
-			return nil
-		}
-	}
-
-	if c.Debug != nil {
-		c.Debug.Logf("Trying to convert '%v' to '%v'", st, dt)
-	}
-
-	scope.srcStack.push(scopeStackElem{value: sv})
-	scope.destStack.push(scopeStackElem{value: dv})
-	defer scope.srcStack.pop()
-	defer scope.destStack.pop()
-
-	switch dv.Kind() {
-	case reflect.Struct:
-		return c.convertKV(toKVValue(sv), toKVValue(dv), scope)
-	case reflect.Slice:
-		if sv.IsNil() {
-			// Don't make a zero-length slice.
-			dv.Set(reflect.Zero(dt))
-			return nil
-		}
-		dv.Set(reflect.MakeSlice(dt, sv.Len(), sv.Cap()))
-		for i := 0; i < sv.Len(); i++ {
-			scope.setIndices(i, i)
-			if err := c.convert(sv.Index(i), dv.Index(i), scope); err != nil {
-				return err
-			}
-		}
-	case reflect.Ptr:
-		if sv.IsNil() {
-			// Don't copy a nil ptr!
-			dv.Set(reflect.Zero(dt))
-			return nil
-		}
-		dv.Set(reflect.New(dt.Elem()))
-		switch st.Kind() {
-		case reflect.Ptr, reflect.Interface:
-			return c.convert(sv.Elem(), dv.Elem(), scope)
-		default:
-			return c.convert(sv, dv.Elem(), scope)
-		}
-	case reflect.Map:
-		if sv.IsNil() {
-			// Don't copy a nil ptr!
-			dv.Set(reflect.Zero(dt))
-			return nil
-		}
-		dv.Set(reflect.MakeMap(dt))
-		for _, sk := range sv.MapKeys() {
-			dk := reflect.New(dt.Key()).Elem()
-			if err := c.convert(sk, dk, scope); err != nil {
-				return err
-			}
-			dkv := reflect.New(dt.Elem()).Elem()
-			scope.setKeys(sk.Interface(), dk.Interface())
-			// TODO:  sv.MapIndex(sk) may return a value with CanAddr() == false,
-			// because a map[string]struct{} does not allow a pointer reference.
-			// Calling a custom conversion function defined for the map value
-			// will panic. Example is PodInfo map[string]ContainerStatus.
-			if err := c.convert(sv.MapIndex(sk), dkv, scope); err != nil {
-				return err
-			}
-			dv.SetMapIndex(dk, dkv)
-		}
-	case reflect.Interface:
-		if sv.IsNil() {
-			// Don't copy a nil interface!
-			dv.Set(reflect.Zero(dt))
-			return nil
-		}
-		tmpdv := reflect.New(sv.Elem().Type()).Elem()
-		if err := c.convert(sv.Elem(), tmpdv, scope); err != nil {
-			return err
-		}
-		dv.Set(reflect.ValueOf(tmpdv.Interface()))
-		return nil
-	default:
-		return scope.errorf("couldn't copy '%v' into '%v'; didn't understand types", st, dt)
-	}
-	return nil
-}
-
-var stringType = reflect.TypeOf("")
-
-func toKVValue(v reflect.Value) kvValue {
-	switch v.Kind() {
-	case reflect.Struct:
-		return structAdaptor(v)
-	case reflect.Map:
-		if v.Type().Key().AssignableTo(stringType) {
-			return stringMapAdaptor(v)
-		}
-	}
-
-	return nil
-}
-
-// kvValue lets us write the same conversion logic to work with both maps
-// and structs. Only maps with string keys make sense for this.
-type kvValue interface {
-	// returns all keys, as a []string.
-	keys() []string
-	// Will just return "" for maps.
-	tagOf(key string) reflect.StructTag
-	// Will return the zero Value if the key doesn't exist.
-	value(key string) reflect.Value
-	// Maps require explicit setting-- will do nothing for structs.
-	// Returns false on failure.
-	confirmSet(key string, v reflect.Value) bool
-}
-
-type stringMapAdaptor reflect.Value
-
-func (a stringMapAdaptor) len() int {
-	return reflect.Value(a).Len()
-}
-
-func (a stringMapAdaptor) keys() []string {
-	v := reflect.Value(a)
-	keys := make([]string, v.Len())
-	for i, v := range v.MapKeys() {
-		if v.IsNil() {
-			continue
-		}
-		switch t := v.Interface().(type) {
-		case string:
-			keys[i] = t
-		}
-	}
-	return keys
-}
-
-func (a stringMapAdaptor) tagOf(key string) reflect.StructTag {
-	return ""
-}
-
-func (a stringMapAdaptor) value(key string) reflect.Value {
-	return reflect.Value(a).MapIndex(reflect.ValueOf(key))
-}
-
-func (a stringMapAdaptor) confirmSet(key string, v reflect.Value) bool {
-	return true
-}
-
-type structAdaptor reflect.Value
-
-func (a structAdaptor) len() int {
-	v := reflect.Value(a)
-	return v.Type().NumField()
-}
-
-func (a structAdaptor) keys() []string {
-	v := reflect.Value(a)
-	t := v.Type()
-	keys := make([]string, t.NumField())
-	for i := range keys {
-		keys[i] = t.Field(i).Name
-	}
-	return keys
-}
-
-func (a structAdaptor) tagOf(key string) reflect.StructTag {
-	v := reflect.Value(a)
-	field, ok := v.Type().FieldByName(key)
-	if ok {
-		return field.Tag
-	}
-	return ""
-}
-
-func (a structAdaptor) value(key string) reflect.Value {
-	v := reflect.Value(a)
-	return v.FieldByName(key)
-}
-
-func (a structAdaptor) confirmSet(key string, v reflect.Value) bool {
-	return true
-}
-
-// convertKV can convert things that consist of key/value pairs, like structs
-// and some maps.
-func (c *Converter) convertKV(skv, dkv kvValue, scope *scope) error {
-	if skv == nil || dkv == nil {
-		// TODO: add keys to stack to support really understandable error messages.
-		return fmt.Errorf("Unable to convert %#v to %#v", skv, dkv)
-	}
-
-	lister := dkv
-	if scope.flags.IsSet(SourceToDest) {
-		lister = skv
-	}
-
-	var mapping FieldMappingFunc
-	if scope.meta != nil && scope.meta.KeyNameMapping != nil {
-		mapping = scope.meta.KeyNameMapping
-	}
-
-	for _, key := range lister.keys() {
-		if found, err := c.checkField(key, skv, dkv, scope); found {
-			if err != nil {
-				return err
-			}
-			continue
-		}
-		stag := skv.tagOf(key)
-		dtag := dkv.tagOf(key)
-		skey := key
-		dkey := key
-		if mapping != nil {
-			skey, dkey = scope.meta.KeyNameMapping(key, stag, dtag)
-		}
-
-		df := dkv.value(dkey)
-		sf := skv.value(skey)
-		if !df.IsValid() || !sf.IsValid() {
-			switch {
-			case scope.flags.IsSet(IgnoreMissingFields):
-				// No error.
-			case scope.flags.IsSet(SourceToDest):
-				return scope.errorf("%v not present in dest", dkey)
-			default:
-				return scope.errorf("%v not present in src", skey)
-			}
-			continue
-		}
-		scope.srcStack.top().key = skey
-		scope.srcStack.top().tag = stag
-		scope.destStack.top().key = dkey
-		scope.destStack.top().tag = dtag
-		if err := c.convert(sf, df, scope); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// checkField returns true if the field name matches any of the struct
-// field copying rules. The error should be ignored if it returns false.
-func (c *Converter) checkField(fieldName string, skv, dkv kvValue, scope *scope) (bool, error) {
-	replacementMade := false
-	if scope.flags.IsSet(DestFromSource) {
-		df := dkv.value(fieldName)
-		if !df.IsValid() {
-			return false, nil
-		}
-		destKey := typeNamePair{df.Type(), fieldName}
-		// Check each of the potential source (type, name) pairs to see if they're
-		// present in sv.
-		for _, potentialSourceKey := range c.structFieldSources[destKey] {
-			sf := skv.value(potentialSourceKey.fieldName)
-			if !sf.IsValid() {
-				continue
-			}
-			if sf.Type() == potentialSourceKey.fieldType {
-				// Both the source's name and type matched, so copy.
-				scope.srcStack.top().key = potentialSourceKey.fieldName
-				scope.destStack.top().key = fieldName
-				if err := c.convert(sf, df, scope); err != nil {
-					return true, err
-				}
-				dkv.confirmSet(fieldName, df)
-				replacementMade = true
-			}
-		}
-		return replacementMade, nil
-	}
-
-	sf := skv.value(fieldName)
-	if !sf.IsValid() {
-		return false, nil
-	}
-	srcKey := typeNamePair{sf.Type(), fieldName}
-	// Check each of the potential dest (type, name) pairs to see if they're
-	// present in dv.
-	for _, potentialDestKey := range c.structFieldDests[srcKey] {
-		df := dkv.value(potentialDestKey.fieldName)
-		if !df.IsValid() {
-			continue
-		}
-		if df.Type() == potentialDestKey.fieldType {
-			// Both the dest's name and type matched, so copy.
-			scope.srcStack.top().key = fieldName
-			scope.destStack.top().key = potentialDestKey.fieldName
-			if err := c.convert(sf, df, scope); err != nil {
-				return true, err
-			}
-			dkv.confirmSet(potentialDestKey.fieldName, df)
-			replacementMade = true
-		}
-	}
-	return replacementMade, nil
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
deleted file mode 100644
index 717feaf18f..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// +build !ignore_autogenerated
-
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was autogenerated by deepcopy-gen. Do not edit it manually!
-
-package conversion
-
-import (
-	forked_reflect "k8s.io/kubernetes/third_party/forked/reflect"
-	reflect "reflect"
-)
-
-func DeepCopy_conversion_Cloner(in Cloner, out *Cloner, c *Cloner) error {
-	if in.deepCopyFuncs != nil {
-		in, out := in.deepCopyFuncs, &out.deepCopyFuncs
-		*out = make(map[reflect.Type]reflect.Value)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.deepCopyFuncs = nil
-	}
-	if in.generatedDeepCopyFuncs != nil {
-		in, out := in.generatedDeepCopyFuncs, &out.generatedDeepCopyFuncs
-		*out = make(map[reflect.Type]reflect.Value)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.generatedDeepCopyFuncs = nil
-	}
-	return nil
-}
-
-func DeepCopy_conversion_ConversionFuncs(in ConversionFuncs, out *ConversionFuncs, c *Cloner) error {
-	if in.fns != nil {
-		in, out := in.fns, &out.fns
-		*out = make(map[typePair]reflect.Value)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported typePair
-		}
-	} else {
-		out.fns = nil
-	}
-	return nil
-}
-
-func DeepCopy_conversion_Converter(in Converter, out *Converter, c *Cloner) error {
-	if err := DeepCopy_conversion_ConversionFuncs(in.conversionFuncs, &out.conversionFuncs, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_conversion_ConversionFuncs(in.generatedConversionFuncs, &out.generatedConversionFuncs, c); err != nil {
-		return err
-	}
-	if in.genericConversions != nil {
-		in, out := in.genericConversions, &out.genericConversions
-		*out = make([]GenericConversionFunc, len(in))
-		for i := range in {
-			if newVal, err := c.DeepCopy(in[i]); err != nil {
-				return err
-			} else {
-				(*out)[i] = newVal.(GenericConversionFunc)
-			}
-		}
-	} else {
-		out.genericConversions = nil
-	}
-	if in.ignoredConversions != nil {
-		in, out := in.ignoredConversions, &out.ignoredConversions
-		*out = make(map[typePair]struct{})
-		for range in {
-			// FIXME: Copying unassignable keys unsupported typePair
-		}
-	} else {
-		out.ignoredConversions = nil
-	}
-	if in.structFieldDests != nil {
-		in, out := in.structFieldDests, &out.structFieldDests
-		*out = make(map[typeNamePair][]typeNamePair)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported typeNamePair
-		}
-	} else {
-		out.structFieldDests = nil
-	}
-	if in.structFieldSources != nil {
-		in, out := in.structFieldSources, &out.structFieldSources
-		*out = make(map[typeNamePair][]typeNamePair)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported typeNamePair
-		}
-	} else {
-		out.structFieldSources = nil
-	}
-	if in.defaultingFuncs != nil {
-		in, out := in.defaultingFuncs, &out.defaultingFuncs
-		*out = make(map[reflect.Type]reflect.Value)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.defaultingFuncs = nil
-	}
-	if in.defaultingInterfaces != nil {
-		in, out := in.defaultingInterfaces, &out.defaultingInterfaces
-		*out = make(map[reflect.Type]interface{})
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.defaultingInterfaces = nil
-	}
-	if in.inputFieldMappingFuncs != nil {
-		in, out := in.inputFieldMappingFuncs, &out.inputFieldMappingFuncs
-		*out = make(map[reflect.Type]FieldMappingFunc)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.inputFieldMappingFuncs = nil
-	}
-	if in.inputDefaultFlags != nil {
-		in, out := in.inputDefaultFlags, &out.inputDefaultFlags
-		*out = make(map[reflect.Type]FieldMatchingFlags)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.inputDefaultFlags = nil
-	}
-	if in.Debug == nil {
-		out.Debug = nil
-	} else if newVal, err := c.DeepCopy(in.Debug); err != nil {
-		return err
-	} else {
-		out.Debug = newVal.(DebugLogger)
-	}
-	if in.nameFunc == nil {
-		out.nameFunc = nil
-	} else if newVal, err := c.DeepCopy(in.nameFunc); err != nil {
-		return err
-	} else {
-		out.nameFunc = newVal.(func(reflect.Type) string)
-	}
-	return nil
-}
-
-func DeepCopy_conversion_Equalities(in Equalities, out *Equalities, c *Cloner) error {
-	if in.Equalities != nil {
-		in, out := in.Equalities, &out.Equalities
-		*out = make(forked_reflect.Equalities)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.Equalities = nil
-	}
-	return nil
-}
-
-func DeepCopy_conversion_Meta(in Meta, out *Meta, c *Cloner) error {
-	if in.KeyNameMapping == nil {
-		out.KeyNameMapping = nil
-	} else if newVal, err := c.DeepCopy(in.KeyNameMapping); err != nil {
-		return err
-	} else {
-		out.KeyNameMapping = newVal.(FieldMappingFunc)
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go
deleted file mode 100644
index 7c3ed7cda1..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package conversion
-
-import (
-	"k8s.io/kubernetes/third_party/forked/reflect"
-)
-
-// The code for this type must be located in third_party, since it forks from
-// go std lib. But for convenience, we expose the type here, too.
-type Equalities struct {
-	reflect.Equalities
-}
-
-// For convenience, panics on errrors
-func EqualitiesOrDie(funcs ...interface{}) Equalities {
-	e := Equalities{reflect.Equalities{}}
-	if err := e.AddFuncs(funcs...); err != nil {
-		panic(err)
-	}
-	return e
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/doc.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/doc.go
deleted file mode 100644
index 3ef2eaba45..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/doc.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package conversion provides go object versioning.
-//
-// Specifically, conversion provides a way for you to define multiple versions
-// of the same object. You may write functions which implement conversion logic,
-// but for the fields which did not change, copying is automated. This makes it
-// easy to modify the structures you use in memory without affecting the format
-// you store on disk or respond to in your external API calls.
-package conversion
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/helper.go b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/helper.go
deleted file mode 100644
index 39f7826595..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/helper.go
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package conversion
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// EnforcePtr ensures that obj is a pointer of some sort. Returns a reflect.Value
-// of the dereferenced pointer, ensuring that it is settable/addressable.
-// Returns an error if this is not possible.
-func EnforcePtr(obj interface{}) (reflect.Value, error) {
-	v := reflect.ValueOf(obj)
-	if v.Kind() != reflect.Ptr {
-		if v.Kind() == reflect.Invalid {
-			return reflect.Value{}, fmt.Errorf("expected pointer, but got invalid kind")
-		}
-		return reflect.Value{}, fmt.Errorf("expected pointer, but got %v type", v.Type())
-	}
-	if v.IsNil() {
-		return reflect.Value{}, fmt.Errorf("expected pointer, but got nil")
-	}
-	return v.Elem(), nil
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
deleted file mode 100644
index 7448756763..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
deleted file mode 100644
index 9e45dbe1d2..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
+++ /dev/null
@@ -1,388 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package reflect is a fork of go's standard library reflection package, which
-// allows for deep equal with equality functions defined.
-package reflect
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// Equalities is a map from type to a function comparing two values of
-// that type.
-type Equalities map[reflect.Type]reflect.Value
-
-// For convenience, panics on errrors
-func EqualitiesOrDie(funcs ...interface{}) Equalities {
-	e := Equalities{}
-	if err := e.AddFuncs(funcs...); err != nil {
-		panic(err)
-	}
-	return e
-}
-
-// AddFuncs is a shortcut for multiple calls to AddFunc.
-func (e Equalities) AddFuncs(funcs ...interface{}) error {
-	for _, f := range funcs {
-		if err := e.AddFunc(f); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// AddFunc uses func as an equality function: it must take
-// two parameters of the same type, and return a boolean.
-func (e Equalities) AddFunc(eqFunc interface{}) error {
-	fv := reflect.ValueOf(eqFunc)
-	ft := fv.Type()
-	if ft.Kind() != reflect.Func {
-		return fmt.Errorf("expected func, got: %v", ft)
-	}
-	if ft.NumIn() != 2 {
-		return fmt.Errorf("expected three 'in' params, got: %v", ft)
-	}
-	if ft.NumOut() != 1 {
-		return fmt.Errorf("expected one 'out' param, got: %v", ft)
-	}
-	if ft.In(0) != ft.In(1) {
-		return fmt.Errorf("expected arg 1 and 2 to have same type, but got %v", ft)
-	}
-	var forReturnType bool
-	boolType := reflect.TypeOf(forReturnType)
-	if ft.Out(0) != boolType {
-		return fmt.Errorf("expected bool return, got: %v", ft)
-	}
-	e[ft.In(0)] = fv
-	return nil
-}
-
-// Below here is forked from go's reflect/deepequal.go
-
-// During deepValueEqual, must keep track of checks that are
-// in progress.  The comparison algorithm assumes that all
-// checks in progress are true when it reencounters them.
-// Visited comparisons are stored in a map indexed by visit.
-type visit struct {
-	a1  uintptr
-	a2  uintptr
-	typ reflect.Type
-}
-
-// unexportedTypePanic is thrown when you use this DeepEqual on something that has an
-// unexported type. It indicates a programmer error, so should not occur at runtime,
-// which is why it's not public and thus impossible to catch.
-type unexportedTypePanic []reflect.Type
-
-func (u unexportedTypePanic) Error() string { return u.String() }
-func (u unexportedTypePanic) String() string {
-	strs := make([]string, len(u))
-	for i, t := range u {
-		strs[i] = fmt.Sprintf("%v", t)
-	}
-	return "an unexported field was encountered, nested like this: " + strings.Join(strs, " -> ")
-}
-
-func makeUsefulPanic(v reflect.Value) {
-	if x := recover(); x != nil {
-		if u, ok := x.(unexportedTypePanic); ok {
-			u = append(unexportedTypePanic{v.Type()}, u...)
-			x = u
-		}
-		panic(x)
-	}
-}
-
-// Tests for deep equality using reflected types. The map argument tracks
-// comparisons that have already been seen, which allows short circuiting on
-// recursive types.
-func (e Equalities) deepValueEqual(v1, v2 reflect.Value, visited map[visit]bool, depth int) bool {
-	defer makeUsefulPanic(v1)
-
-	if !v1.IsValid() || !v2.IsValid() {
-		return v1.IsValid() == v2.IsValid()
-	}
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	if fv, ok := e[v1.Type()]; ok {
-		return fv.Call([]reflect.Value{v1, v2})[0].Bool()
-	}
-
-	hard := func(k reflect.Kind) bool {
-		switch k {
-		case reflect.Array, reflect.Map, reflect.Slice, reflect.Struct:
-			return true
-		}
-		return false
-	}
-
-	if v1.CanAddr() && v2.CanAddr() && hard(v1.Kind()) {
-		addr1 := v1.UnsafeAddr()
-		addr2 := v2.UnsafeAddr()
-		if addr1 > addr2 {
-			// Canonicalize order to reduce number of entries in visited.
-			addr1, addr2 = addr2, addr1
-		}
-
-		// Short circuit if references are identical ...
-		if addr1 == addr2 {
-			return true
-		}
-
-		// ... or already seen
-		typ := v1.Type()
-		v := visit{addr1, addr2, typ}
-		if visited[v] {
-			return true
-		}
-
-		// Remember for later.
-		visited[v] = true
-	}
-
-	switch v1.Kind() {
-	case reflect.Array:
-		// We don't need to check length here because length is part of
-		// an array's type, which has already been filtered for.
-		for i := 0; i < v1.Len(); i++ {
-			if !e.deepValueEqual(v1.Index(i), v2.Index(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Slice:
-		if (v1.IsNil() || v1.Len() == 0) != (v2.IsNil() || v2.Len() == 0) {
-			return false
-		}
-		if v1.IsNil() || v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		if v1.Pointer() == v2.Pointer() {
-			return true
-		}
-		for i := 0; i < v1.Len(); i++ {
-			if !e.deepValueEqual(v1.Index(i), v2.Index(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Interface:
-		if v1.IsNil() || v2.IsNil() {
-			return v1.IsNil() == v2.IsNil()
-		}
-		return e.deepValueEqual(v1.Elem(), v2.Elem(), visited, depth+1)
-	case reflect.Ptr:
-		return e.deepValueEqual(v1.Elem(), v2.Elem(), visited, depth+1)
-	case reflect.Struct:
-		for i, n := 0, v1.NumField(); i < n; i++ {
-			if !e.deepValueEqual(v1.Field(i), v2.Field(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Map:
-		if (v1.IsNil() || v1.Len() == 0) != (v2.IsNil() || v2.Len() == 0) {
-			return false
-		}
-		if v1.IsNil() || v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		if v1.Pointer() == v2.Pointer() {
-			return true
-		}
-		for _, k := range v1.MapKeys() {
-			if !e.deepValueEqual(v1.MapIndex(k), v2.MapIndex(k), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Func:
-		if v1.IsNil() && v2.IsNil() {
-			return true
-		}
-		// Can't do better than this:
-		return false
-	default:
-		// Normal equality suffices
-		if !v1.CanInterface() || !v2.CanInterface() {
-			panic(unexportedTypePanic{})
-		}
-		return v1.Interface() == v2.Interface()
-	}
-}
-
-// DeepEqual is like reflect.DeepEqual, but focused on semantic equality
-// instead of memory equality.
-//
-// It will use e's equality functions if it finds types that match.
-//
-// An empty slice *is* equal to a nil slice for our purposes; same for maps.
-//
-// Unexported field members cannot be compared and will cause an imformative panic; you must add an Equality
-// function for these types.
-func (e Equalities) DeepEqual(a1, a2 interface{}) bool {
-	if a1 == nil || a2 == nil {
-		return a1 == a2
-	}
-	v1 := reflect.ValueOf(a1)
-	v2 := reflect.ValueOf(a2)
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	return e.deepValueEqual(v1, v2, make(map[visit]bool), 0)
-}
-
-func (e Equalities) deepValueDerive(v1, v2 reflect.Value, visited map[visit]bool, depth int) bool {
-	defer makeUsefulPanic(v1)
-
-	if !v1.IsValid() || !v2.IsValid() {
-		return v1.IsValid() == v2.IsValid()
-	}
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	if fv, ok := e[v1.Type()]; ok {
-		return fv.Call([]reflect.Value{v1, v2})[0].Bool()
-	}
-
-	hard := func(k reflect.Kind) bool {
-		switch k {
-		case reflect.Array, reflect.Map, reflect.Slice, reflect.Struct:
-			return true
-		}
-		return false
-	}
-
-	if v1.CanAddr() && v2.CanAddr() && hard(v1.Kind()) {
-		addr1 := v1.UnsafeAddr()
-		addr2 := v2.UnsafeAddr()
-		if addr1 > addr2 {
-			// Canonicalize order to reduce number of entries in visited.
-			addr1, addr2 = addr2, addr1
-		}
-
-		// Short circuit if references are identical ...
-		if addr1 == addr2 {
-			return true
-		}
-
-		// ... or already seen
-		typ := v1.Type()
-		v := visit{addr1, addr2, typ}
-		if visited[v] {
-			return true
-		}
-
-		// Remember for later.
-		visited[v] = true
-	}
-
-	switch v1.Kind() {
-	case reflect.Array:
-		// We don't need to check length here because length is part of
-		// an array's type, which has already been filtered for.
-		for i := 0; i < v1.Len(); i++ {
-			if !e.deepValueDerive(v1.Index(i), v2.Index(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Slice:
-		if v1.IsNil() || v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() > v2.Len() {
-			return false
-		}
-		if v1.Pointer() == v2.Pointer() {
-			return true
-		}
-		for i := 0; i < v1.Len(); i++ {
-			if !e.deepValueDerive(v1.Index(i), v2.Index(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.String:
-		if v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() > v2.Len() {
-			return false
-		}
-		return v1.String() == v2.String()
-	case reflect.Interface:
-		if v1.IsNil() {
-			return true
-		}
-		return e.deepValueDerive(v1.Elem(), v2.Elem(), visited, depth+1)
-	case reflect.Ptr:
-		if v1.IsNil() {
-			return true
-		}
-		return e.deepValueDerive(v1.Elem(), v2.Elem(), visited, depth+1)
-	case reflect.Struct:
-		for i, n := 0, v1.NumField(); i < n; i++ {
-			if !e.deepValueDerive(v1.Field(i), v2.Field(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Map:
-		if v1.IsNil() || v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() > v2.Len() {
-			return false
-		}
-		if v1.Pointer() == v2.Pointer() {
-			return true
-		}
-		for _, k := range v1.MapKeys() {
-			if !e.deepValueDerive(v1.MapIndex(k), v2.MapIndex(k), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Func:
-		if v1.IsNil() && v2.IsNil() {
-			return true
-		}
-		// Can't do better than this:
-		return false
-	default:
-		// Normal equality suffices
-		if !v1.CanInterface() || !v2.CanInterface() {
-			panic(unexportedTypePanic{})
-		}
-		return v1.Interface() == v2.Interface()
-	}
-}
-
-// DeepDerivative is similar to DeepEqual except that unset fields in a1 are
-// ignored (not compared). This allows us to focus on the fields that matter to
-// the semantic comparison.
-//
-// The unset fields include a nil pointer and an empty string.
-func (e Equalities) DeepDerivative(a1, a2 interface{}) bool {
-	if a1 == nil {
-		return true
-	}
-	v1 := reflect.ValueOf(a1)
-	v2 := reflect.ValueOf(a2)
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	return e.deepValueDerive(v1, v2, make(map[visit]bool), 0)
-}
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/LICENSE b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/LICENSE
deleted file mode 100644
index 7448756763..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/PATENTS b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/PATENTS
deleted file mode 100644
index 733099041f..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/golang/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING
deleted file mode 100644
index c6b097c016..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/htpasswd/COPYING
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (C) 2003-2013 Edgewall Software
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
- 3. The name of the author may not be used to endorse or promote
-    products derived from this software without specific prior
-    written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE
deleted file mode 100644
index 2b5e5ff1ab..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/pause/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-The Expat/MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the 
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software. 
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE b/Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE
deleted file mode 100644
index 9f93e067e8..0000000000
--- a/Godeps/_workspace/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE
+++ /dev/null
@@ -1,11 +0,0 @@
-Copyright 2014 Reverb Technologies, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

From e159207f9871ce94bf380bf31da73115bdb2f5d0 Mon Sep 17 00:00:00 2001
From: Joshua Wood <j@joshix.com>
Date: Tue, 21 Jun 2016 20:05:30 -0700
Subject: [PATCH 0461/1304] Documentation/trying-out-rkt: Update for clarity
 and style

Addressing https://github.com/coreos/rkt/pull/2808#discussion-diff-67933880

Update to clarify the 3 use cases (actually 4, since we describe Vagrant
on linux as well).
Update for styleguide stuff - ref links, sentence case, fmt.
Update etcd ACI version and hashes to v2.3.7.
---
 Documentation/trying-out-rkt.md | 260 ++++++++++++++++++++------------
 1 file changed, 166 insertions(+), 94 deletions(-)

diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index d9f85ec241..ac2dc39226 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -1,13 +1,23 @@
-# Trying out rkt 
+# Trying out rkt
 
-This guide provides a short introduction to trying out rkt.
-For a more in-depth guide of a full end-to-end workflow of building an application and running it using rkt, check out the [getting-started-guide](getting-started-guide.md)
+This document introduces the basics of getting rkt and running a container with it. For a more in-depth guide to building application containers and running them with rkt, check out the [getting started guide][getstart].
+
+Giving rkt a spin takes just a few basic steps, detailed below.
+
+1. Install rkt:
+  * [CoreOS Linux][run-coreos] comes with rkt installed and configured. You can skip straight to [running a container with rkt][id-rkt-run-by-name].
+  * On other Linux distributions, [grab the latest rkt binary][id-lin-rkt-bin], or [the distribution's rkt package][id-lin-rkt-pkg].
+  * On Mac or Windows, you can [use a Vagrant virtual machine to run rkt][id-vagrant-rkt]
+2. [Configure rkt][id-config-rkt]: Optional steps that make it simpler to experiment with rkt.
+3. [Download][id-rkt-fetch] and [run a container with rkt][id-rkt-run].
 
 ## Using rkt on Linux
 
-rkt consists of a single CLI tool and can run on different platforms. The primary target platform currently is amd64 Linux. A modern kernel is required but there should be no other system dependencies.
+rkt is written in Go and can be compiled for several CPU architectures. The rkt project distributes binaries for amd64. These rkt binaries will run on any modern Linux amd64 kernel.
+
+### Running the latest rkt binary
 
-To download the rkt binary, simply grab the latest release directly from GitHub:
+To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
 wget https://github.com/coreos/rkt/releases/download/v1.9.1/rkt-v1.9.1.tar.gz
@@ -16,45 +26,17 @@ cd rkt-v1.9.1
 ./rkt help
 ```
 
-Like most applications, the easiest way to run rkt is to install it with your system's package manager, like apt on Debian or dnf on Fedora. If your distribution doesn't include a rkt package, or your operating system isn't Linux at all, running rkt in a Vagrant virtual machine can be nearly as simple. The instructions below start a virtual machine with rkt installed and ready to run.
-
-Refer to the [distributions guide](distributions.md) whether a package is available for your Linux distribution.
-
-**SELinux Note**: rkt can use SELinux but the policy needs to be tailored to your distribution. We suggest that new users [disable SELinux](https://www.centos.org/docs/5/html/5.1/Deployment_Guide/sec-sel-enable-disable.html) to get started. If you can help package rkt for your distro [please help](https://github.com/coreos/rkt/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fdistribution++label%3Adependency%2Fexternal)!
-
-### Optional: Set up Privilege Separation
-
-To facilitate privilege separation between different commands, rkt uses a `rkt` group that has read-write access to the rkt data directory. This allows `rkt fetch`, which downloads and verifies images, to run as a non-root user. If you skip this section, you can run `sudo rkt fetch` instead but we recommend taking the following steps for production use cases.
-
-rkt ships with a simple script that can help set up the appropriate permissions to facilitate non-root use:
-
-```
-sudo groupadd rkt
-export WHOAMI=$(whoami); sudo gpasswd -a $WHOAMI rkt
-sudo ./dist/scripts/setup-data-dir.sh
-```
-
-Trust the signing key for etcd images. This must be run as root as access to the keystore is restricted:
-
-```
-sudo ./rkt trust --prefix coreos.com/etcd
-```
-
-Now it's time to test this out by retrieving an etcd image using a non-root user in the rkt group.
-Make sure your shell is restarted to enable the `rkt` group for your user, or
-just run `newgrp rkt` to enable it and continue on the same session.
+### Installing rkt from a Linux distribution package
 
-Now fetch the etcd image as an unprivileged user:
+Another easy way to run rkt is to install it with your system's package manager, like *apt* on Debian or *dnf* on Fedora. Check for your Linux distribution in the [distributions list][distlist] to see if a rkt package is available.
 
-```
-./rkt fetch coreos.com/etcd,version=v2.2.5
-```
+## Running rkt in a Vagrant virtual machine
 
-Success! Now rkt can fetch and download images as a non-root user.
+If your operating system isn't Linux, it's easy to run rkt in a Linux virtual machine with Vagrant. The instructions below start a virtual machine with rkt installed and ready to run.
 
-### rkt using Vagrant
+### Vagrant on Mac and Windows
 
-For Mac (and other Vagrant) users we have set up a `Vagrantfile`. Make sure you have [Vagrant](https://www.vagrantup.com/) 1.5.x or greater installed.
+For Mac (and other Vagrant) users we have set up a `Vagrantfile`. Make sure you have [Vagrant][vagrant] 1.5.x or greater installed.
 
 First, download the `Vagrantfile` and start a Linux machine with rkt installed by running `vagrant up`.
 
@@ -64,7 +46,9 @@ cd rkt
 vagrant up
 ```
 
-If you want to run Vagrant on a Linux host machine, you may want to use libvirt as a hypervisor, instead of VirtualBox. In order to do this, you need to install the necessary plugins, convert the box and start the machine using libvirt provider.
+### Vagrant on Linux
+
+To use Vagrant on a Linux machine, you may want to use libvirt as a VMM instead of VirtualBox. To do so, install the necessary plugins, convert the box, and start the machine using the `libvirt` provider:
 
 ```
 vagrant plugin install vagrant-libvirt
@@ -73,6 +57,8 @@ vagrant mutate ubuntu/xenial64 libvirt
 vagrant up --provider=libvirt
 ```
 
+### Accessing the Vagrant VM and running rkt
+
 With a subsequent `vagrant ssh` you will have access to run rkt:
 
 ```
@@ -80,7 +66,7 @@ vagrant ssh
 rkt --help
 ```
 
-Additional help can be consulted in the rkt man pages:
+Consult the rkt manual for more details:
 
 ```
 man rkt
@@ -88,7 +74,9 @@ man rkt
 
 The Vagrant setup also includes bash-completion to assist with rkt subcommands and options.
 
-To reach pods from your host determine the IP address of the Vagrant machine:
+#### Container networking on a Vagrant VM
+
+To reach pods from your host, determine the IP address of the Vagrant machine:
 
 ```
 vagrant ssh -c 'ip address'
@@ -98,28 +86,34 @@ vagrant ssh -c 'ip address'
     inet 172.28.128.3/24 brd 172.28.128.255 scope global enp0s8
        valid_lft forever preferred_lft forever
 ...
-
 ```
 
-In the given example the Vagrant machine has the IP address `172.28.128.3`. The following command starts a nginx container using host networking and will be reachable from the host:
+In this example, the Vagrant machine has the IP address `172.28.128.3`.
+
+The following command starts an `nginx` container, for simplicity using [*host networking*][host-network] to make the pod directly accessible on the host's network address and ports. Signature validation isn't supported for Docker registries and images, so `--insecure-options=image` switches off the signature check:
 
 ```
 sudo rkt run --net=host --insecure-options=image docker://nginx
 ```
 
-The nginx container is now accessible on the host under http://172.28.128.3. In order to use containers with the default contained network, a route to the 172.16.28.0/24 network has to be configured on the host:
+The nginx container is now accessible on the host under http://172.28.128.3.
+
+In order to use containers with the default [*contained network*][contained-network], a route to the 172.16.28.0/24 container network must be configured from the host through the VM:
+
+On Linux, execute:
 
-On Linux execute:
 ```
 sudo ip route add 172.16.28.0/24 via 172.28.128.3
 ```
 
-On OSX execute:
+On Mac OSX, execute:
+
 ```
 sudo route -n add 172.16.28.0/24 172.28.128.3
 ```
 
-Now nginx can be started using the default network:
+Now nginx can be started using the default contained network:
+
 ```
 $ sudo rkt run --insecure-options=image docker://nginx
 $ rkt list
@@ -131,24 +125,64 @@ The nginx container is now accessible on the host under http://172.16.28.2.
 
 Success! The rest of the guide can now be followed normally.
 
+## Configuring a rkt host
+
+Once rkt is present on a machine, some optional configuration steps can make it easier to operate.
+
+### SELinux
+
+rkt supports running under SELinux mandatory access controls, but an SELinux policy needs to be tailored to your distribution. New rkt users on distributions other than CoreOS should temporarily [disable SELinux][disable-selinux] to make it easier to get started. If you can help package rkt for your distro, including SELinux policy support, [please lend a hand][distro-pkg-help]!
+
+### Optional: Set up privilege separation
+
+To allow different subcommands to use the least necessary privilege, rkt recognizes a `rkt` group that has read-write access to the rkt data directory. This allows `rkt fetch`, which downloads and verifies images, to run as an unprivileged user who is a member of the `rkt` group.
+
+If you skip this section, you can still run `sudo rkt fetch` instead, but setting up a `rkt` group is a good basic security practice for production use. The rkt repo includes a `setup-data-dir.sh` script that can help set up the appropriate permissions for unprivileged execution of subcommands that manipulate the local store, but not the execution environment:
+
+```
+sudo groupadd rkt
+export WHOAMI=$(whoami); sudo gpasswd -a $WHOAMI rkt
+sudo ./dist/scripts/setup-data-dir.sh
+```
+
+#### Trust the signing key to validate unprivileged fetches
+
+Trust the signing key for etcd images. This step must be run as root because access to the keystore is restricted from even the `rkt` group:
+
+```
+sudo ./rkt trust --prefix coreos.com/etcd
+```
+
+#### Fetch an image as an unprivileged member of the rkt group
+
+Test this out by retrieving an etcd image using a non-root user in the rkt group. Make sure your shell is restarted to enable the `rkt` group for your user, or
+just run `newgrp rkt` to enable it and continue in the same session.
+
+Now fetch the etcd image as an unprivileged user:
+
+```
+./rkt fetch coreos.com/etcd:v2.3.7
+```
+
+Success! Now rkt can fetch and download images as an unprivileged user.
+
 ## rkt basics
 
-### Building App Container Images (ACIs)
+### Building an App Container Image
 
-rkt's native image format is ACI, defined in the [App Container spec](app-container.md).
-To build ACIs, a simple way to get started is by using [`acbuild`](https://github.com/appc/acbuild).
-Another good resource is the [appc build repository](https://github.com/appc/build-repository) which has resources for building ACIs from a number of popular projects and languages.
-There are also tools for converting [Docker images to ACIs](https://github.com/appc/docker2aci) (although note that rkt can [also run Docker images natively](running-docker-images.md) directly from Docker repositories by using this library internally).
+rkt's native image format is the App Container Image (ACI), defined in the [App Container spec][appc]. The [`acbuild`][acbuild] tool is a simple way to get started building ACIs. The [appc build repository][appc-build-repo] has resources for building ACIs from a number of popular applications.
 
-The example below uses a pre-built ACI for [etcd](https://github.com/coreos/etcd) (this was built by the [build-aci script](https://github.com/coreos/etcd/blob/master/scripts/build-aci)).
+The `docker2aci` tool [converts Docker images to ACIs][docker2aci], or rkt can [convert images directly from Docker registries on the fly][rktdocker].
 
-### Downloading an App Container Image (ACI)
+The example below uses an [etcd][etcd] ACI constructed with `acbuild` by the etcd project's [`build-aci` script][build-aci].
 
-rkt uses content addressable storage (CAS) for storing an ACI on disk.
-In this example, the image is downloaded and added to the CAS.
-Downloading an image before running it is not strictly necessary (if it is not present, rkt will automatically retrieve it), but useful to illustrate how rkt works.
+### Downloading an ACI
 
-Since rkt verifies signatures by default, you will need to first [trust](signing-and-verification-guide.md#establishing-trust) the [CoreOS public key](https://coreos.com/dist/pubkeys/aci-pubkeys.gpg) used to sign the image, using `rkt trust`:
+rkt uses content addressable storage (CAS) to store an ACI on disk. In this example, an image is downloaded and added to the CAS. Downloading an image before running it is not strictly necessary &ndash; if an image is not present in the store, [rkt will attempt to retrieve it][aci-discovery] &ndash; but it illustrates how rkt works.
+
+Since rkt verifies signatures by default, the first step is to [trust][signguide-establishing-trust] the [CoreOS public key][coreos-pubkey] used to sign the image, using the `rkt trust` subcommand:
+
+#### Trusting the signing key
 
 ```
 $ sudo rkt trust --prefix=coreos.com/etcd
@@ -161,74 +195,112 @@ Trusting "https://coreos.com/dist/pubkeys/aci-pubkeys.gpg" for prefix "coreos.co
 Added key for prefix "coreos.com/etcd" at "/etc/rkt/trustedkeys/prefix.d/coreos.com/etcd/8b86de38890ddb7291867b025210bd8888182190"
 ```
 
-For more information, see the [detailed, step-by-step guide for the signing procedure](signing-and-verification-guide.md).
+For more information, see the [detailed, step-by-step guide for the signing procedure][signguide].
 
-Now that we've trusted the CoreOS public key, we can fetch the ACI using `rkt fetch`:
+#### Fetching the ACI
+
+Now that the CoreOS public key is trusted, fetch the ACI using `rkt fetch`. This step doesn't need root privileges if the rkt host has been [configured for privilege separation][id-privsep]:
 
 ```
-$ sudo rkt fetch coreos.com/etcd:v2.0.4
-rkt: searching for app image coreos.com/etcd:v2.0.4
-rkt: fetching image from https://github.com/coreos/etcd/releases/download/v2.0.4/etcd-v2.0.4-linux-amd64.aci
+$ rkt fetch coreos.com/etcd:v2.3.7
+rkt: searching for app image coreos.com/etcd:v2.3.7
+rkt: fetching image from https://github.com/coreos/etcd/releases/download/v2.3.7/etcd-v2.3.7-linux-amd64.aci
 Downloading aci: [==========================================   ] 3.47 MB/3.7 MB
-Downloading signature from https://github.com/coreos/etcd/releases/download/v2.0.0/etcd-v2.0.4-linux-amd64.aci.asc
+Downloading signature from https://github.com/coreos/etcd/releases/download/v2.3.7/etcd-v2.3.7-linux-amd64.aci.asc
 rkt: signature verified:
   CoreOS ACI Builder <release@coreos.com>
-sha512-1eba37d9b344b33d272181e176da111e
+sha512-7d28419b27d5ae56cca97f4c6ccdd309c...
 ```
 
-Sometimes you will want to download an image from a private repository.
-This usually involves passing usernames and passwords or other kinds of credentials to the server.
-rkt currently supports authentication via configuration files.
-You can find configuration file format description (with examples!) in [configuration documentation](configuration.md).
+#### Downloading images from private registries
+
+Downloading container images from a private registry usually involves passing usernames and passwords or other kinds of credentials to the server. rkt supports different authentication regimes with configuration files. The [configuration documentation][configdoc] describes the file format and gives examples of setting up authentication with HTTP `basic` auth, OAuth bearer tokens, and other methods.
 
-For the curious, we can see the files written to disk in rkt's CAS:
+### The image in the local store
+
+For the curious, it is possible to list the hash-identified files written to disk in rkt's CAS:
 
 ```
 $ find /var/lib/rkt/cas/blob/
 /var/lib/rkt/cas/blob/
 /var/lib/rkt/cas/blob/sha512
 /var/lib/rkt/cas/blob/sha512/1e
-/var/lib/rkt/cas/blob/sha512/1e/sha512-1eba37d9b344b33d272181e176da111ef2fdd4958b88ba4071e56db9ac07cf62
+/var/lib/rkt/cas/blob/sha512/1e/sha512-7d28419b27d5ae56cca97f4c6ccdd309c95b967ca0119f6962b187d1287ec9967f49e367c36b0e44ecd73675bc06d112dec86386d0e9b84c2265cddd45d15020
 ```
 
-Per the [App Container Specification](https://github.com/appc/spec/blob/master/spec/aci.md#image-archives), the SHA-512 hash is of the tarball and can be reproduced with other tools:
+According to the [App Container specification][aci-archives], the SHA-512 hash is that of the `tar` file compressed in the ACI, and can be examined with standard tools:
 
 ```
-$ wget https://github.com/coreos/etcd/releases/download/v2.0.4/etcd-v2.0.4-linux-amd64.aci
+$ wget https://github.com/coreos/etcd/releases/download/v2.3.7/etcd-v2.3.7-linux-amd64.aci
 ...
-$ gzip -dc etcd-v2.0.4-linux-amd64.aci > etcd-v2.0.4-linux-amd64.tar
-$ sha512sum etcd-v2.0.4-linux-amd64.tar
-1eba37d9b344b33d272181e176da111ef2fdd4958b88ba4071e56db9ac07cf62cce3daaee03ebd92dfbb596fe7879938374c671ae768cd927bab7b16c5e432e8  etcd-v2.0.4-linux-amd64.tar
+$ gzip -dc etcd-v2.3.7-linux-amd64.aci > etcd-v2.3.7-linux-amd64.tar
+$ sha512sum etcd-v2.3.7-linux-amd64.tar
+7d28419b27d5ae56cca97f4c6ccdd309c95b967ca0119f6962b187d1287ec9967f49e367c36b0e44ecd73675bc06d112dec86386d0e9b84c2265cddd45d15020  etcd-v2.3.7-linux-amd64.tar
 ```
 
-### Launching an ACI
+### Running an ACI with rkt
+
+After it has been retrieved and stored locally, an ACI can be run by pointing `rkt run` at either the original image reference (in this case, `coreos.com/etcd:v2.3.7`), the ACI hash, or the full URL of the ACI. Therefore the following three examples are equivalent:
 
-After it has been retrieved and stored locally, an ACI can be run by pointing `rkt run` at either the original image reference (in this case, "coreos.com/etcd:v2.0.4"), the full URL of the ACI, or the ACI hash.
-Hence, the following three examples are equivalent:
+#### Running the container by ACI name and version
 
 ```
-# Example of running via ACI name:version
-$ sudo rkt run coreos.com/etcd:v2.0.4
+$ sudo rkt run coreos.com/etcd:v2.3.7
 ...
 Press ^] three times to kill container
 ```
 
+#### Running the container by ACI hash
+
 ```
-# Example of running via ACI hash
 $ sudo rkt run sha512-1eba37d9b344b33d272181e176da111e
 ...
-Press ^] three times to kill container
+^]]]
 ```
 
+#### Running the container by ACI URL
+
 ```
-# Example of running via ACI URL
-$ sudo rkt run https://github.com/coreos/etcd/releases/download/v2.0.4/etcd-v2.0.4-linux-amd64.aci
+$ sudo rkt run https://github.com/coreos/etcd/releases/download/v2.3.7/etcd-v2.3.7-linux-amd64.aci
 ...
-Press ^] three times to kill container
-```
-
-In the latter case, `rkt` will do the appropriate ETag checking on the URL to make sure it has the most up to date version of the image.
-
-Note that the escape character ```^]``` is generated by ```Ctrl-]``` on a US keyboard.
-The required key combination will differ on other keyboard layouts.
-For example, the Swedish keyboard layout uses ```Ctrl-å``` on OS X and ```Ctrl-^``` on Windows to generate the ```^]``` escape character.
+^]]]
+```
+
+When given an ACI URL, `rkt` will do the appropriate ETag checking to fetch the latest version of the container image.
+
+### Exiting rkt pods
+
+As shown above, repeating the `^]` escape character three times kills the pod and detaches from its console to return to the user's shell.
+
+The escape character `^]` is generated by `Ctrl-]` on a US keyboard. The required key combination will differ on other keyboard layouts. For example, the Swedish keyboard layout uses ```Ctrl-å``` on OS X, or ```Ctrl-^``` on Windows, to generate the ```^]``` escape character.
+
+
+[acbuild]: https://github.com/appc/acbuild
+[aci-archives]: https://github.com/appc/spec/blob/master/spec/aci.md#image-archives
+[aci-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md
+[appc]: app-container.md
+[appc-build-repo]: https://github.com/appc/build-repository
+[build-aci]: https://github.com/coreos/etcd/blob/master/scripts/build-aci
+[contained-network]: networking/overview.md#contained-mode
+[coreos-pubkey]: https://coreos.com/dist/pubkeys/aci-pubkeys.gpg
+[configdoc]: configuration.md
+[disable-selinux]: https://www.centos.org/docs/5/html/5.1/Deployment_Guide/sec-sel-enable-disable.html
+[distlist]: distributions.md
+[distro-pkg-help]: (https://github.com/coreos/rkt/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fdistribution++label%3Adependency%2Fexternal)
+[docker2aci]: https://github.com/appc/docker2aci
+[etcd]: https://coreos.com/etcd/
+[getstart]: getting-started-guide.md
+[host-network]: networking/overview.md#host-mode
+[id-config-rkt]: #configuring-a-rkt-host
+[id-lin-rkt-bin]: #running-the-latest-rkt-binary
+[id-lin-rkt-pkg]: #installing-rkt-from-a-linux-distribution-package
+[id-privsep]: #optional-set-up-privilege-separation
+[id-rkt-fetch]: #downloading-an-aci
+[id-rkt-run]: #running-an-aci-with-rkt
+[id-rkt-run-by-name]: #running-the-container-by-aci-name-and-version
+[id-vagrant-rkt]: #running-rkt-in-a-vagrant-virtual-machine
+[rktdocker]: running-docker-images.md
+[run-coreos]: https://coreos.com/os/docs/latest/#running-coreos
+[signguide]: signing-and-verification-guide.md
+[signguide-establishing-trust]: signing-and-verification-guide.md#establishing-trust
+[vagrant]: https://www.vagrantup.com/

From 7dc5b3a67dca03d42047bb5979ba11a0c3a94494 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Wed, 29 Jun 2016 12:18:06 +0200
Subject: [PATCH 0462/1304] docs: fix broken link to DNS document

---
 Documentation/app-environment.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/app-environment.md b/Documentation/app-environment.md
index e20a1f3fbf..250ed8a545 100644
--- a/Documentation/app-environment.md
+++ b/Documentation/app-environment.md
@@ -10,7 +10,7 @@ Support for /etc/hosts is optional in the App Container spec. rkt creates it.
 
 #### /etc/resolv.conf
 
-/etc/resolv.conf is automatically prepared by rkt as described in the [DNS support](Documentation/networking/dns.md).
+/etc/resolv.conf is automatically prepared by rkt as described in the [DNS support](networking/dns.md).
 
 #### /run/systemd/journal
 

From 157c46c17dc2784256b853249cf70c9a57a13f3f Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Thu, 30 Jun 2016 11:51:53 +0200
Subject: [PATCH 0463/1304] stage1/enterexec: fix formatting

`}` on a new line
---
 stage1/enterexec/enterexec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/stage1/enterexec/enterexec.c b/stage1/enterexec/enterexec.c
index 0d8c16361b..9739953042 100644
--- a/stage1/enterexec/enterexec.c
+++ b/stage1/enterexec/enterexec.c
@@ -195,7 +195,8 @@ static void set_env(const char *env_file)
 	}
 	free(line);
 	pexit_if(fclose(f) == EOF,
-			 "Unable to fclose \"%s\"", env_file);}
+			 "Unable to fclose \"%s\"", env_file);
+}
 
 /* Read environment from env and keep_env files make it our own, keeping the env variables in
  * if they're present in the current environment.

From de3826364e33cab202b7349e4224bdc0dedaae35 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 30 Jun 2016 17:29:25 +0200
Subject: [PATCH 0464/1304] dist: fix manpage/bash-completion generation

Fixes #2856
---
 rkt/rkt.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rkt/rkt.mk b/rkt/rkt.mk
index 96c6e88eaa..6e9dd73e61 100644
--- a/rkt/rkt.mk
+++ b/rkt/rkt.mk
@@ -32,12 +32,16 @@ include makelib/build_go_bin.mk
 manpages: GO_ENV += GOARCH=$(GOARCH_FOR_BUILD) CC=$(CC_FOR_BUILD)
 manpages: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/manpages/
-	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | $(GO_ENV) xargs "$(GO)" run rkt/manpages_gen.go
+	ls $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/*.go | \
+		grep -vE '_test.go|main.go|_gen.go' | \
+		$(GO_ENV) xargs "$(GO)" run $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/manpages_gen.go
 
 bash-completion: GO_ENV += GOARCH=$(GOARCH_FOR_BUILD) CC=$(CC_FOR_BUILD)
 bash-completion: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/bash_completion/
-	ls rkt/*.go | grep -vE '_test.go|main.go|_gen.go' | $(GO_ENV) xargs "$(GO)" run rkt/bash_completion_gen.go
+	ls $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/*.go | \
+		grep -vE '_test.go|main.go|_gen.go' | \
+		$(GO_ENV) xargs "$(GO)" run $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/bash_completion_gen.go
 
 protobuf:
 	scripts/genproto.sh

From b9d3a2fa7e48251fdb4622688f1b0d9dd2563b67 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 30 Jun 2016 17:42:09 +0200
Subject: [PATCH 0465/1304] CI: execute manpages/bash-completion targets

---
 .travis.yml                  | 2 +-
 tests/build-and-run-tests.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ced0d50191..32094d75be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ script:
  -      if [ "${TARGET}" == "amd64" ]; then
                 ./autogen.sh;
                 ./configure --with-stage1-flavors=host,fly --enable-tpm=auto;
-                make unit-check;
+                make unit-check manpages bash-completion;
         elif [ "${TARGET}" == "arm64" ]; then
                 eval "$(GIMME_ARCH=${TARGET} GIMME_CGO_ENABLED=1 ./gimme.local ${TRAVIS_GO_VERSION})";
                 ./autogen.sh;
diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index ddc02a315f..cc948eb336 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -160,6 +160,7 @@ function build {
     CORES=$(grep -c ^processor /proc/cpuinfo)
     echo "Running make with ${CORES} threads"
     make "-j${CORES}"
+    make manpages bash-completion
 
     if [[ ${PRECLEANUP} == true ]]; then
         rm -rf "${BUILD_DIR}/tmp/usr_from_${RKT_STAGE1_USR_FROM}"

From 14019334fed2532152a1d23810b326e3f57a48ff Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 16 Jun 2016 18:04:35 -0700
Subject: [PATCH 0466/1304] stage1hash.go: Fix the documentation for
 getStage1Hash().

Make comments consistent to the implementation as currently
the 'location' field only supports URL and file path.
---
 rkt/stage1hash.go | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index fdb6362bd0..2e035a025f 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -172,8 +172,25 @@ func addStage1ImageFlags(flags *pflag.FlagSet) {
 // If the user passed --stage1-url, --stage1-path, --stage1-name,
 // --stage1-hash, or --stage1-from-dir then we take what was passed
 // and try to load it. If it failed, we bail out. No second chances
-// and whatnot. The details about how each location type should be
-// handled are below.
+// and whatnot. The details about how each flag type should be handled
+// are below.
+//
+// For --stage1-url, we do discovery, and try to fetch it directly into
+// the store.
+//
+// For --stage1-path, we do no discovery and try to fetch the image
+// directly from the given file path into the store. If the file is not
+// found, then we try to fetch the file in the same directory as the
+// rkt binary itself into the store.
+//
+// For --stage1-from-dir, we do no discovery and try to fetch the image
+// from the stage1 images directory by the name.
+//
+// For --stage1-name, we do discovery and fetch the discovered image
+// into the store.
+//
+// For --stage1-hash, we do no discovery and try to fetch the image
+// from the store by the hash.
 //
 // If the user passed none of the above flags, we try to get the name,
 // the version and the location from the configuration. The name and
@@ -195,9 +212,6 @@ func addStage1ImageFlags(flags *pflag.FlagSet) {
 // have a second chance, we try to fetch the file in the same
 // directory as the rkt binary itself into the store.
 //
-// If location is a name, we do the discovery, fetch the discovered
-// image into the store.
-//
 // If location is an image hash then we make sure that it exists in
 // the store.
 func getStage1Hash(s *store.Store, c *config.Config) (*types.Hash, error) {

From 2481ccce45c253731e43e83cc731b7efd026ec6b Mon Sep 17 00:00:00 2001
From: Rob Szumski <rob@robszumski.com>
Date: Fri, 1 Jul 2016 16:00:07 -0400
Subject: [PATCH 0467/1304] docs: explain how to exit container

---
 Documentation/getting-started-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index 3c2bb4f33f..0f83c5f3aa 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -73,7 +73,7 @@ See the [Signing and Verification Guide](https://github.com/coreos/rkt/blob/mast
 
 At this point our hello app is running and ready to handle HTTP requests.
 
-You can also [run rkt as a daemon](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/run.md#run-rkt-as-a-daemon).
+To stop the container, pass three escape characters (`^]^]^]`), which is generated by `Ctrl-]` on a US keyboard. You can also [run rkt as a daemon](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/run.md#run-rkt-as-a-daemon).
 
 ### Test with curl
 

From 406464465e709c8b67a30f5ddeff76aad3a96cd5 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 4 Jul 2016 13:35:21 +0200
Subject: [PATCH 0468/1304] contributing: describe PRs consisting of multiple
 commits

Fixes #2855
---
 CONTRIBUTING.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f60d2daf39..3ef777e52b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -98,4 +98,7 @@ and the commit messages as the PR description for the PR.
 If your PR includes more commits spanning mulitple subsystems one should change the PR title
 and the first paragraph of the PR description to reflect a summary of all changes involved.
 
+A large PR must be split into multiple commits, each with clear commit messages.
+Intermediate commits should compile and pass tests. Exceptions to non-compilable must have a valid reason, i.e. dependency bumps.
+
 Do not add entries in the changelog yourself. They will be overwritten when creating a new release.

From 37db59e67ad4bb4f9b95a05c401acc0eba4346a3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 30 Jun 2016 14:23:56 +0200
Subject: [PATCH 0469/1304] glide: update appc/spec to 0.8.5

This `appc/spec` update introduces seccomp isolators and stricter
isolators validation.
---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index 78752a8295..da3efa8af4 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,7 +20,7 @@ import:
   subpackages:
   - proj2aci
 - package: github.com/appc/spec
-  version: v0.8.4
+  version: v0.8.5
   subpackages:
   - ace
   - aci

From ecbbbdcd8206a8a3572a87a392c3703757358bda Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 30 Jun 2016 14:23:56 +0200
Subject: [PATCH 0470/1304] appc/spec: update to 0.8.5

This bumps vendored appc/spec to 0.8.5 and updates rkt code for API changes.
---
 glide.lock                                    |   8 +-
 .../appc/spec/ace/image_manifest_main.json.in |   4 +-
 .../spec/ace/image_manifest_sidekick.json.in  |   4 +-
 .../github.com/appc/spec/actool/discover.go   |   9 +-
 .../github.com/appc/spec/actool/manifest.go   |  81 +++++++-
 .../appc/spec/discovery/discovery.go          |  22 ++-
 vendor/github.com/appc/spec/discovery/http.go |  12 +-
 .../github.com/appc/spec/schema/types/app.go  |   3 +
 .../appc/spec/schema/types/isolator.go        |  61 ++++++
 .../schema/types/isolator_linux_specific.go   | 174 +++++++++++++++++-
 .../spec/schema/types/isolator_resources.go   |   9 +
 vendor/github.com/appc/spec/schema/version.go |   2 +-
 12 files changed, 352 insertions(+), 37 deletions(-)

diff --git a/glide.lock b/glide.lock
index 87fe3ed55f..e637250fd5 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 74fbc0c8510a051f4fa1a79b834e401dbea213c8e5e5749ec1c3a81d2256f091
-updated: 2016-06-29T10:38:03.891204025+02:00
+hash: ac083a9947f04c599d238227e4cb251313045d516a9075bbb4c6e88120789d69
+updated: 2016-06-30T12:56:38.421141147+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: 355af275fa8d48b4ecdd361a5feaf173abff81e7
@@ -19,7 +19,7 @@ imports:
   subpackages:
   - proj2aci
 - name: github.com/appc/spec
-  version: f82c741e743001237821b5e0bb9a8ebd324d3117
+  version: fd5e3d8f5d596c6fbd506e80b5e13ba8a97b704c
   subpackages:
   - ace
   - aci
@@ -290,4 +290,4 @@ imports:
   - pkg/api/resource
   - pkg/conversion
   - third_party/forked/reflect
-devImports: []
+testImports: []
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
index 33157eeead..3a9e4a6684 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.4",
+    "acVersion": "0.8.5",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.4" },
+        { "name": "version", "value": "0.8.5" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index a69bbcf66b..f66bdd3b77 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.4",
+    "acVersion": "0.8.5",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.4" },
+        { "name": "version", "value": "0.8.5" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/actool/discover.go b/vendor/github.com/appc/spec/actool/discover.go
index f91f526d7b..14b6debf9e 100644
--- a/vendor/github.com/appc/spec/actool/discover.go
+++ b/vendor/github.com/appc/spec/actool/discover.go
@@ -29,9 +29,10 @@ var (
 		Name:        "discover",
 		Description: "Discover the download URLs for an app",
 		Summary:     "Discover the download URLs for one or more app container images",
-		Usage:       "[--json] APP...",
+		Usage:       "[--json] [--port] [--insecure] APP...",
 		Run:         runDiscover,
 	}
+	flagPort uint
 )
 
 func init() {
@@ -39,6 +40,8 @@ func init() {
 		"Don't check TLS certificates and allow insecure non-TLS downloads over http")
 	cmdDiscover.Flags.BoolVar(&outputJson, "json", false,
 		"Output result as JSON")
+	cmdDiscover.Flags.UintVar(&flagPort, "port", 0,
+		"Port to connect to when performing discovery")
 }
 
 func runDiscover(args []string) (exit int) {
@@ -62,7 +65,7 @@ func runDiscover(args []string) (exit int) {
 		if transportFlags.Insecure {
 			insecure = discovery.InsecureTLS | discovery.InsecureHTTP
 		}
-		eps, attempts, err := discovery.DiscoverACIEndpoints(*app, nil, insecure)
+		eps, attempts, err := discovery.DiscoverACIEndpoints(*app, nil, insecure, flagPort)
 		if err != nil {
 			stderr("error fetching endpoints for %s: %s", name, err)
 			return 1
@@ -70,7 +73,7 @@ func runDiscover(args []string) (exit int) {
 		for _, a := range attempts {
 			fmt.Printf("discover endpoints walk: prefix: %s error: %v\n", a.Prefix, a.Error)
 		}
-		publicKeys, attempts, err := discovery.DiscoverPublicKeys(*app, nil, insecure)
+		publicKeys, attempts, err := discovery.DiscoverPublicKeys(*app, nil, insecure, flagPort)
 		if err != nil {
 			stderr("error fetching public keys for %s: %s", name, err)
 			return 1
diff --git a/vendor/github.com/appc/spec/actool/manifest.go b/vendor/github.com/appc/spec/actool/manifest.go
index 46662167dc..cfc69f159a 100644
--- a/vendor/github.com/appc/spec/actool/manifest.go
+++ b/vendor/github.com/appc/spec/actool/manifest.go
@@ -51,6 +51,8 @@ var (
 	patchMounts            string
 	patchPorts             string
 	patchIsolators         string
+	patchSeccompMode       string
+	patchSeccompSet        string
 
 	catPrettyPrint bool
 
@@ -69,6 +71,8 @@ var (
 		  [--ports=query,protocol=tcp,port=8080[:query2,...]]
 		  [--supplementary-groups=gid1,gid2,...]
 		  [--isolators=resource/cpu,request=50m,limit=100m[:resource/memory,...]]
+		  [--seccomp-mode=remove|retain[,errno=EPERM]]
+		  [--seccomp-set=syscall1,syscall2,...]]
 		  [--replace]
 		  INPUT_ACI_FILE
 		  [OUTPUT_ACI_FILE]`,
@@ -99,6 +103,8 @@ func init() {
 	cmdPatchManifest.Flags.StringVar(&patchMounts, "mounts", "", "Replace mount points")
 	cmdPatchManifest.Flags.StringVar(&patchPorts, "ports", "", "Replace ports")
 	cmdPatchManifest.Flags.StringVar(&patchIsolators, "isolators", "", "Replace isolators")
+	cmdPatchManifest.Flags.StringVar(&patchSeccompMode, "seccomp-mode", "", "Enable and configure seccomp isolator")
+	cmdPatchManifest.Flags.StringVar(&patchSeccompSet, "seccomp-set", "", "Set of syscalls for seccomp isolator enforcing")
 
 	cmdCatManifest.Flags.BoolVar(&catPrettyPrint, "pretty-print", false, "Print with better style")
 }
@@ -211,7 +217,11 @@ func patchManifest(im *schema.ImageManifest) error {
 		if err != nil {
 			return fmt.Errorf("cannot parse capability %q: %v", patchCaps, err)
 		}
-		app.Isolators = append(app.Isolators, caps.AsIsolator())
+		isolator, err = caps.AsIsolator()
+		if err != nil {
+			return err
+		}
+		app.Isolators = append(app.Isolators, *isolator)
 	}
 	if patchRevokeCaps != "" {
 		isolator := app.Isolators.GetByName(types.LinuxCapabilitiesRevokeSetName)
@@ -225,7 +235,11 @@ func patchManifest(im *schema.ImageManifest) error {
 		if err != nil {
 			return fmt.Errorf("cannot parse capability %q: %v", patchRevokeCaps, err)
 		}
-		app.Isolators = append(app.Isolators, caps.AsIsolator())
+		isolator, err = caps.AsIsolator()
+		if err != nil {
+			return err
+		}
+		app.Isolators = append(app.Isolators, *isolator)
 	}
 
 	if patchMounts != "" {
@@ -250,6 +264,18 @@ func patchManifest(im *schema.ImageManifest) error {
 		}
 	}
 
+	// Parse seccomp args and override existing seccomp isolators
+	if patchSeccompMode != "" {
+		seccompIsolator, err := parseSeccompArgs(patchSeccompMode, patchSeccompSet)
+		if err != nil {
+			return err
+		}
+		seccompReps := []types.ACIdentifier{types.LinuxSeccompRemoveSetName, types.LinuxSeccompRetainSetName}
+		app.Isolators.ReplaceIsolatorsByName(*seccompIsolator, seccompReps)
+	} else if patchSeccompSet != "" {
+		return fmt.Errorf("--seccomp-set specified without --seccomp-mode")
+	}
+
 	if patchIsolators != "" {
 		isolators := strings.Split(patchIsolators, ":")
 		for _, is := range isolators {
@@ -260,14 +286,16 @@ func patchManifest(im *schema.ImageManifest) error {
 
 			_, ok := types.ResourceIsolatorNames[name]
 
-			if name == types.LinuxNoNewPrivilegesName {
+			switch name {
+			case types.LinuxNoNewPrivilegesName:
 				ok = true
 				kv := strings.Split(is, ",")
 				if len(kv) != 2 {
 					return fmt.Errorf("isolator %s: invalid format", name)
 				}
-
 				isolatorStr = fmt.Sprintf(`{ "name": "%s", "value": %s }`, name, kv[1])
+			case types.LinuxSeccompRemoveSetName, types.LinuxSeccompRetainSetName:
+				ok = false
 			}
 
 			if !ok {
@@ -284,6 +312,51 @@ func patchManifest(im *schema.ImageManifest) error {
 	return nil
 }
 
+// parseSeccompArgs parses seccomp mode and set CLI flags, preparing an
+// appropriate seccomp isolator.
+func parseSeccompArgs(patchSeccompMode string, patchSeccompSet string) (*types.Isolator, error) {
+	// Parse mode flag and additional keyed arguments.
+	var errno, mode string
+	args := strings.Split(patchSeccompMode, ",")
+	for _, a := range args {
+		kv := strings.Split(a, "=")
+		switch len(kv) {
+		case 1:
+			// mode, either "remove" or "retain"
+			mode = kv[0]
+		case 2:
+			// k=v argument, only "errno" allowed for now
+			if kv[0] == "errno" {
+				errno = kv[1]
+			} else {
+				return nil, fmt.Errorf("invalid seccomp-mode optional argument: %s", a)
+			}
+		default:
+			return nil, fmt.Errorf("cannot parse seccomp-mode argument: %s", a)
+		}
+	}
+
+	// Instantiate an Isolator with the content specified by the --seccomp-set parameter.
+	var err error
+	var seccomp types.AsIsolator
+	switch mode {
+	case "remove":
+		seccomp, err = types.NewLinuxSeccompRemoveSet(errno, strings.Split(patchSeccompSet, ",")...)
+	case "retain":
+		seccomp, err = types.NewLinuxSeccompRetainSet(errno, strings.Split(patchSeccompSet, ",")...)
+	default:
+		err = fmt.Errorf("unknown seccomp mode %s", mode)
+	}
+	if err != nil {
+		return nil, fmt.Errorf("cannot parse seccomp isolator: %s", err)
+	}
+	seccompIsolator, err := seccomp.AsIsolator()
+	if err != nil {
+		return nil, err
+	}
+	return seccompIsolator, nil
+}
+
 // extractManifest iterates over the tar reader and locate the manifest. Once
 // located, the manifest can be printed, replaced or patched.
 func extractManifest(tr *tar.Reader, tw *tar.Writer, printManifest bool, newManifest []byte) error {
diff --git a/vendor/github.com/appc/spec/discovery/discovery.go b/vendor/github.com/appc/spec/discovery/discovery.go
index b2dc659541..18862f6a06 100644
--- a/vendor/github.com/appc/spec/discovery/discovery.go
+++ b/vendor/github.com/appc/spec/discovery/discovery.go
@@ -126,13 +126,13 @@ func createTemplateVars(app App) []string {
 	return tplVars
 }
 
-func doDiscover(pre string, hostHeaders map[string]http.Header, app App, insecure InsecureOption) (*discoveryData, error) {
+func doDiscover(pre string, hostHeaders map[string]http.Header, app App, insecure InsecureOption, port uint) (*discoveryData, error) {
 	app = *app.Copy()
 	if app.Labels["version"] == "" {
 		app.Labels["version"] = defaultVersion
 	}
 
-	_, body, err := httpsOrHTTP(pre, hostHeaders, insecure)
+	_, body, err := httpsOrHTTP(pre, hostHeaders, insecure, port)
 	if err != nil {
 		return nil, err
 	}
@@ -174,14 +174,15 @@ func doDiscover(pre string, hostHeaders map[string]http.Header, app App, insecur
 // DiscoverWalk will make HTTPS requests to find discovery meta tags and
 // optionally will use HTTP if insecure is set. hostHeaders specifies the
 // header to apply depending on the host (e.g. authentication). Based on the
-// response of the discoverFn it will continue to recurse up the tree.
-func DiscoverWalk(app App, hostHeaders map[string]http.Header, insecure InsecureOption, discoverFn DiscoverWalkFunc) (dd *discoveryData, err error) {
+// response of the discoverFn it will continue to recurse up the tree. If port
+// is 0, the default port will be used.
+func DiscoverWalk(app App, hostHeaders map[string]http.Header, insecure InsecureOption, port uint, discoverFn DiscoverWalkFunc) (dd *discoveryData, err error) {
 	parts := strings.Split(string(app.Name), "/")
 	for i := range parts {
 		end := len(parts) - i
 		pre := strings.Join(parts[:end], "/")
 
-		dd, err = doDiscover(pre, hostHeaders, app, insecure)
+		dd, err = doDiscover(pre, hostHeaders, app, insecure, port)
 		if derr := discoverFn(pre, dd, err); derr != nil {
 			return dd, derr
 		}
@@ -217,8 +218,8 @@ func walker(attempts *[]FailedAttempt, testFn DiscoverWalkFunc) DiscoverWalkFunc
 // tags and optionally will use HTTP if insecure is set. hostHeaders
 // specifies the header to apply depending on the host (e.g. authentication).
 // It will not give up until it has exhausted the path or found an image
-// discovery.
-func DiscoverACIEndpoints(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (ACIEndpoints, []FailedAttempt, error) {
+// discovery. If port is 0, the default port will be used.
+func DiscoverACIEndpoints(app App, hostHeaders map[string]http.Header, insecure InsecureOption, port uint) (ACIEndpoints, []FailedAttempt, error) {
 	testFn := func(pre string, dd *discoveryData, err error) error {
 		if len(dd.ACIEndpoints) != 0 {
 			return errEnough
@@ -227,7 +228,7 @@ func DiscoverACIEndpoints(app App, hostHeaders map[string]http.Header, insecure
 	}
 
 	attempts := []FailedAttempt{}
-	dd, err := DiscoverWalk(app, hostHeaders, insecure, walker(&attempts, testFn))
+	dd, err := DiscoverWalk(app, hostHeaders, insecure, port, walker(&attempts, testFn))
 	if err != nil && err != errEnough {
 		return nil, attempts, err
 	}
@@ -239,7 +240,8 @@ func DiscoverACIEndpoints(app App, hostHeaders map[string]http.Header, insecure
 // tags and optionally will use HTTP if insecure is set. hostHeaders
 // specifies the header to apply depending on the host (e.g. authentication).
 // It will not give up until it has exhausted the path or found an public key.
-func DiscoverPublicKeys(app App, hostHeaders map[string]http.Header, insecure InsecureOption) (PublicKeys, []FailedAttempt, error) {
+// If port is 0, the default port will be used.
+func DiscoverPublicKeys(app App, hostHeaders map[string]http.Header, insecure InsecureOption, port uint) (PublicKeys, []FailedAttempt, error) {
 	testFn := func(pre string, dd *discoveryData, err error) error {
 		if len(dd.PublicKeys) != 0 {
 			return errEnough
@@ -248,7 +250,7 @@ func DiscoverPublicKeys(app App, hostHeaders map[string]http.Header, insecure In
 	}
 
 	attempts := []FailedAttempt{}
-	dd, err := DiscoverWalk(app, hostHeaders, insecure, walker(&attempts, testFn))
+	dd, err := DiscoverWalk(app, hostHeaders, insecure, port, walker(&attempts, testFn))
 	if err != nil && err != errEnough {
 		return nil, attempts, err
 	}
diff --git a/vendor/github.com/appc/spec/discovery/http.go b/vendor/github.com/appc/spec/discovery/http.go
index 430bcc61cf..b6ed644bd3 100644
--- a/vendor/github.com/appc/spec/discovery/http.go
+++ b/vendor/github.com/appc/spec/discovery/http.go
@@ -21,6 +21,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"strconv"
 	"time"
 )
 
@@ -75,13 +76,16 @@ func init() {
 	httpDoInsecureTLS = ClientInsecureTLS
 }
 
-func httpsOrHTTP(name string, hostHeaders map[string]http.Header, insecure InsecureOption) (urlStr string, body io.ReadCloser, err error) {
-	fetch := func(scheme string) (urlStr string, res *http.Response, err error) {
+func httpsOrHTTP(name string, hostHeaders map[string]http.Header, insecure InsecureOption, port uint) (urlStr string, body io.ReadCloser, err error) {
+	fetch := func(scheme string, port uint) (urlStr string, res *http.Response, err error) {
 		u, err := url.Parse(scheme + "://" + name)
 		if err != nil {
 			return "", nil, err
 		}
 		u.RawQuery = "ac-discovery=1"
+		if port != 0 {
+			u.Host += ":" + strconv.FormatUint(uint64(port), 10)
+		}
 		urlStr = u.String()
 		req, err := http.NewRequest("GET", urlStr, nil)
 		if err != nil {
@@ -102,11 +106,11 @@ func httpsOrHTTP(name string, hostHeaders map[string]http.Header, insecure Insec
 			res.Body.Close()
 		}
 	}
-	urlStr, res, err := fetch("https")
+	urlStr, res, err := fetch("https", port)
 	if err != nil || res.StatusCode != http.StatusOK {
 		if insecure&InsecureHTTP != 0 {
 			closeBody(res)
-			urlStr, res, err = fetch("http")
+			urlStr, res, err = fetch("http", port)
 		}
 	}
 
diff --git a/vendor/github.com/appc/spec/schema/types/app.go b/vendor/github.com/appc/spec/schema/types/app.go
index df13bf1c3a..a97ca0250f 100644
--- a/vendor/github.com/appc/spec/schema/types/app.go
+++ b/vendor/github.com/appc/spec/schema/types/app.go
@@ -86,5 +86,8 @@ func (a *App) assertValid() error {
 	if err := a.Environment.assertValid(); err != nil {
 		return err
 	}
+	if err := a.Isolators.assertValid(); err != nil {
+		return err
+	}
 	return nil
 }
diff --git a/vendor/github.com/appc/spec/schema/types/isolator.go b/vendor/github.com/appc/spec/schema/types/isolator.go
index ecdab0088b..fcd1801e64 100644
--- a/vendor/github.com/appc/spec/schema/types/isolator.go
+++ b/vendor/github.com/appc/spec/schema/types/isolator.go
@@ -16,10 +16,19 @@ package types
 
 import (
 	"encoding/json"
+	"errors"
+	"fmt"
 )
 
 var (
 	isolatorMap map[ACIdentifier]IsolatorValueConstructor
+
+	// ErrIncompatibleIsolator is returned whenever an Isolators set contains
+	// conflicting IsolatorValue instances
+	ErrIncompatibleIsolator = errors.New("isolators set contains incompatible types")
+	// ErrInvalidIsolator is returned upon validation failures due to improper
+	// or partially constructed Isolator instances (eg. from incomplete direct construction)
+	ErrInvalidIsolator = errors.New("invalid isolator")
 )
 
 func init() {
@@ -40,6 +49,33 @@ func AddIsolatorName(n ACIdentifier, ns map[ACIdentifier]struct{}) {
 // and PodManifest schemas.
 type Isolators []Isolator
 
+// assertValid checks that every single isolator is valid and that
+// the whole set is well built
+func (isolators Isolators) assertValid() error {
+	typesMap := make(map[ACIdentifier]bool)
+	for _, i := range isolators {
+		v := i.Value()
+		if v == nil {
+			return ErrInvalidIsolator
+		}
+		if err := v.AssertValid(); err != nil {
+			return err
+		}
+		if _, ok := typesMap[i.Name]; ok {
+			if !v.multipleAllowed() {
+				return fmt.Errorf(`isolators set contains too many instances of type %s"`, i.Name)
+			}
+		}
+		for _, c := range v.Conflicts() {
+			if _, found := typesMap[c]; found {
+				return ErrIncompatibleIsolator
+			}
+		}
+		typesMap[i.Name] = true
+	}
+	return nil
+}
+
 // GetByName returns the last isolator in the list by the given name.
 func (is *Isolators) GetByName(name ACIdentifier) *Isolator {
 	var i Isolator
@@ -52,6 +88,22 @@ func (is *Isolators) GetByName(name ACIdentifier) *Isolator {
 	return nil
 }
 
+// ReplaceIsolatorsByName overrides matching isolator types with a new
+// isolator, deleting them all and appending the new one instead
+func (is *Isolators) ReplaceIsolatorsByName(newIs Isolator, oldNames []ACIdentifier) {
+	var i Isolator
+	for j := len(*is) - 1; j >= 0; j-- {
+		i = []Isolator(*is)[j]
+		for _, name := range oldNames {
+			if i.Name == name {
+				*is = append((*is)[:j], (*is)[j+1:]...)
+			}
+		}
+	}
+	*is = append((*is)[:], newIs)
+	return
+}
+
 // Unrecognized returns a set of isolators that are not recognized.
 // An isolator is not recognized if it has not had an associated
 // constructor registered with AddIsolatorValueConstructor.
@@ -69,8 +121,17 @@ func (is *Isolators) Unrecognized() Isolators {
 // serialized as any arbitrary JSON blob. Specific Isolator types should
 // implement this interface to facilitate unmarshalling and validation.
 type IsolatorValue interface {
+	// UnmarshalJSON unserialize a JSON-encoded isolator
 	UnmarshalJSON(b []byte) error
+	// AssertValid returns a non-nil error value if an IsolatorValue is not valid
+	// according to appc spec
 	AssertValid() error
+	// Conflicts returns a list of conflicting isolators types, which cannot co-exist
+	// together with this IsolatorValue
+	Conflicts() []ACIdentifier
+	// multipleAllowed specifies whether multiple isolator instances are allowed
+	// for this isolator type
+	multipleAllowed() bool
 }
 
 // Isolator is a model for unmarshalling isolator types from their JSON-encoded
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
index 678e0bf1f4..6cb9a86730 100644
--- a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
+++ b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
@@ -17,12 +17,15 @@ package types
 import (
 	"encoding/json"
 	"errors"
+	"unicode"
 )
 
 const (
 	LinuxCapabilitiesRetainSetName = "os/linux/capabilities-retain-set"
 	LinuxCapabilitiesRevokeSetName = "os/linux/capabilities-remove-set"
 	LinuxNoNewPrivilegesName       = "os/linux/no-new-privileges"
+	LinuxSeccompRemoveSetName      = "os/linux/seccomp-remove-set"
+	LinuxSeccompRetainSetName      = "os/linux/seccomp-retain-set"
 )
 
 var LinuxIsolatorNames = make(map[ACIdentifier]struct{})
@@ -32,6 +35,8 @@ func init() {
 		LinuxCapabilitiesRevokeSetName: func() IsolatorValue { return &LinuxCapabilitiesRevokeSet{} },
 		LinuxCapabilitiesRetainSetName: func() IsolatorValue { return &LinuxCapabilitiesRetainSet{} },
 		LinuxNoNewPrivilegesName:       func() IsolatorValue { v := LinuxNoNewPrivileges(false); return &v },
+		LinuxSeccompRemoveSetName:      func() IsolatorValue { return &LinuxSeccompRemoveSet{} },
+		LinuxSeccompRetainSetName:      func() IsolatorValue { return &LinuxSeccompRetainSet{} },
 	} {
 		AddIsolatorName(name, LinuxIsolatorNames)
 		AddIsolatorValueConstructor(name, con)
@@ -44,6 +49,15 @@ func (l LinuxNoNewPrivileges) AssertValid() error {
 	return nil
 }
 
+// TODO(lucab): both need to be clarified in spec,
+// see https://github.com/appc/spec/issues/625
+func (l LinuxNoNewPrivileges) multipleAllowed() bool {
+	return true
+}
+func (l LinuxNoNewPrivileges) Conflicts() []ACIdentifier {
+	return nil
+}
+
 func (l *LinuxNoNewPrivileges) UnmarshalJSON(b []byte) error {
 	var v bool
 	err := json.Unmarshal(b, &v)
@@ -56,6 +70,10 @@ func (l *LinuxNoNewPrivileges) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
+type AsIsolator interface {
+	AsIsolator() (*Isolator, error)
+}
+
 type LinuxCapabilitiesSet interface {
 	Set() []LinuxCapability
 	AssertValid() error
@@ -78,6 +96,15 @@ func (l linuxCapabilitiesSetBase) AssertValid() error {
 	return nil
 }
 
+// TODO(lucab): both need to be clarified in spec,
+// see https://github.com/appc/spec/issues/625
+func (l linuxCapabilitiesSetBase) multipleAllowed() bool {
+	return true
+}
+func (l linuxCapabilitiesSetBase) Conflicts() []ACIdentifier {
+	return nil
+}
+
 func (l *linuxCapabilitiesSetBase) UnmarshalJSON(b []byte) error {
 	var v linuxCapabilitiesSetValue
 	err := json.Unmarshal(b, &v)
@@ -115,17 +142,17 @@ func NewLinuxCapabilitiesRetainSet(caps ...string) (*LinuxCapabilitiesRetainSet,
 	return &l, nil
 }
 
-func (l LinuxCapabilitiesRetainSet) AsIsolator() Isolator {
+func (l LinuxCapabilitiesRetainSet) AsIsolator() (*Isolator, error) {
 	b, err := json.Marshal(l.linuxCapabilitiesSetBase.val)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 	rm := json.RawMessage(b)
-	return Isolator{
+	return &Isolator{
 		Name:     LinuxCapabilitiesRetainSetName,
 		ValueRaw: &rm,
 		value:    &l,
-	}
+	}, nil
 }
 
 type LinuxCapabilitiesRevokeSet struct {
@@ -149,15 +176,148 @@ func NewLinuxCapabilitiesRevokeSet(caps ...string) (*LinuxCapabilitiesRevokeSet,
 	return &l, nil
 }
 
-func (l LinuxCapabilitiesRevokeSet) AsIsolator() Isolator {
+func (l LinuxCapabilitiesRevokeSet) AsIsolator() (*Isolator, error) {
 	b, err := json.Marshal(l.linuxCapabilitiesSetBase.val)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 	rm := json.RawMessage(b)
-	return Isolator{
+	return &Isolator{
 		Name:     LinuxCapabilitiesRevokeSetName,
 		ValueRaw: &rm,
 		value:    &l,
+	}, nil
+}
+
+type LinuxSeccompSet interface {
+	Set() []LinuxSeccompEntry
+	Errno() LinuxSeccompErrno
+	AssertValid() error
+}
+
+type LinuxSeccompEntry string
+type LinuxSeccompErrno string
+
+type linuxSeccompValue struct {
+	Set   []LinuxSeccompEntry `json:"set"`
+	Errno LinuxSeccompErrno   `json:"errno"`
+}
+
+type linuxSeccompBase struct {
+	val linuxSeccompValue
+}
+
+func (l linuxSeccompBase) multipleAllowed() bool {
+	return false
+}
+
+func (l linuxSeccompBase) AssertValid() error {
+	if len(l.val.Set) == 0 {
+		return errors.New("set must be non-empty")
+	}
+	if l.val.Errno == "" {
+		return nil
+	}
+	for _, c := range l.val.Errno {
+		if !unicode.IsUpper(c) {
+			return errors.New("errno must be an upper case string")
+		}
+	}
+	return nil
+}
+
+func (l *linuxSeccompBase) UnmarshalJSON(b []byte) error {
+	var v linuxSeccompValue
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
 	}
+	l.val = v
+	return nil
+}
+
+func (l linuxSeccompBase) Set() []LinuxSeccompEntry {
+	return l.val.Set
+}
+
+func (l linuxSeccompBase) Errno() LinuxSeccompErrno {
+	return l.val.Errno
+}
+
+type LinuxSeccompRetainSet struct {
+	linuxSeccompBase
+}
+
+func (l LinuxSeccompRetainSet) Conflicts() []ACIdentifier {
+	return []ACIdentifier{LinuxSeccompRemoveSetName}
+}
+
+func NewLinuxSeccompRetainSet(errno string, syscall ...string) (*LinuxSeccompRetainSet, error) {
+	l := LinuxSeccompRetainSet{
+		linuxSeccompBase{
+			linuxSeccompValue{
+				make([]LinuxSeccompEntry, len(syscall)),
+				LinuxSeccompErrno(errno),
+			},
+		},
+	}
+	for i, c := range syscall {
+		l.linuxSeccompBase.val.Set[i] = LinuxSeccompEntry(c)
+	}
+	if err := l.AssertValid(); err != nil {
+		return nil, err
+	}
+	return &l, nil
+}
+
+func (l LinuxSeccompRetainSet) AsIsolator() (*Isolator, error) {
+	b, err := json.Marshal(l.linuxSeccompBase.val)
+	if err != nil {
+		return nil, err
+	}
+	rm := json.RawMessage(b)
+	return &Isolator{
+		Name:     LinuxSeccompRetainSetName,
+		ValueRaw: &rm,
+		value:    &l,
+	}, nil
+}
+
+type LinuxSeccompRemoveSet struct {
+	linuxSeccompBase
+}
+
+func (l LinuxSeccompRemoveSet) Conflicts() []ACIdentifier {
+	return []ACIdentifier{LinuxSeccompRetainSetName}
+}
+
+func NewLinuxSeccompRemoveSet(errno string, syscall ...string) (*LinuxSeccompRemoveSet, error) {
+	l := LinuxSeccompRemoveSet{
+		linuxSeccompBase{
+			linuxSeccompValue{
+				make([]LinuxSeccompEntry, len(syscall)),
+				LinuxSeccompErrno(errno),
+			},
+		},
+	}
+	for i, c := range syscall {
+		l.linuxSeccompBase.val.Set[i] = LinuxSeccompEntry(c)
+	}
+	if err := l.AssertValid(); err != nil {
+		return nil, err
+	}
+	return &l, nil
+}
+
+func (l LinuxSeccompRemoveSet) AsIsolator() (*Isolator, error) {
+	b, err := json.Marshal(l.linuxSeccompBase.val)
+	if err != nil {
+		return nil, err
+	}
+	rm := json.RawMessage(b)
+	return &Isolator{
+		Name:     LinuxSeccompRemoveSetName,
+		ValueRaw: &rm,
+		value:    &l,
+	}, nil
 }
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_resources.go b/vendor/github.com/appc/spec/schema/types/isolator_resources.go
index 2ac5130d1c..2b77e30498 100644
--- a/vendor/github.com/appc/spec/schema/types/isolator_resources.go
+++ b/vendor/github.com/appc/spec/schema/types/isolator_resources.go
@@ -85,6 +85,15 @@ func (r ResourceBase) AssertValid() error {
 	return nil
 }
 
+// TODO(lucab): both need to be clarified in spec,
+// see https://github.com/appc/spec/issues/625
+func (l ResourceBase) multipleAllowed() bool {
+	return true
+}
+func (l ResourceBase) Conflicts() []ACIdentifier {
+	return nil
+}
+
 type ResourceBlockBandwidth struct {
 	ResourceBase
 }
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go
index 029ebfac35..494a8eb878 100644
--- a/vendor/github.com/appc/spec/schema/version.go
+++ b/vendor/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.4"
+	version string = "0.8.5"
 )
 
 var (

From 68c2e1770c31d96db376043908693cc9642bc782 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 5 Jul 2016 09:20:51 +0200
Subject: [PATCH 0471/1304] rkt: update to appc/spec API changes

Update rkt code to newer interfaces changed in appc/spec v0.8.5.
---
 rkt/image/namefetcher.go   |  2 +-
 rkt/pubkey/pubkey.go       |  3 ++-
 stage0/run.go              | 14 ++++++++++----
 stage1/aci/aci-manifest.in |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 9bdc75d757..20c3ca400c 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -70,7 +70,7 @@ func (f *nameFetcher) discoverApp(app *discovery.App) (discovery.ACIEndpoints, e
 		insecure = insecure | discovery.InsecureHTTP
 	}
 	hostHeaders := config.ResolveAuthPerHost(f.Headers)
-	ep, attempts, err := discovery.DiscoverACIEndpoints(*app, hostHeaders, insecure)
+	ep, attempts, err := discovery.DiscoverACIEndpoints(*app, hostHeaders, insecure, 0)
 	if f.Debug {
 		for _, a := range attempts {
 			log.PrintE(fmt.Sprintf("meta tag 'ac-discovery' not found on %s", a.Prefix), a.Error)
diff --git a/rkt/pubkey/pubkey.go b/rkt/pubkey/pubkey.go
index 41d604fc72..ea53b6096f 100644
--- a/rkt/pubkey/pubkey.go
+++ b/rkt/pubkey/pubkey.go
@@ -156,13 +156,14 @@ func (m *Manager) metaDiscoverPubKeyLocations(prefix string) ([]string, error) {
 
 	hostHeaders := config.ResolveAuthPerHost(m.AuthPerHost)
 	insecure := discovery.InsecureNone
+
 	if m.InsecureAllowHTTP {
 		insecure = insecure | discovery.InsecureHTTP
 	}
 	if m.InsecureSkipTLSCheck {
 		insecure = insecure | discovery.InsecureTLS
 	}
-	keys, attempts, err := discovery.DiscoverPublicKeys(*app, hostHeaders, insecure)
+	keys, attempts, err := discovery.DiscoverPublicKeys(*app, hostHeaders, insecure, 0)
 	if err != nil {
 		return nil, err
 	}
diff --git a/stage0/run.go b/stage0/run.go
index 2c0124c7a5..ca5528b30d 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -260,11 +260,17 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		}
 
 		if capsRetain := app.CapsRetain; capsRetain != nil {
-			isolator := capsRetain.AsIsolator()
-			ra.App.Isolators = append(ra.App.Isolators, isolator)
+			isolator, err := capsRetain.AsIsolator()
+			if err != nil {
+				return err
+			}
+			ra.App.Isolators = append(ra.App.Isolators, *isolator)
 		} else if capsRemove := app.CapsRemove; capsRemove != nil {
-			isolator := capsRemove.AsIsolator()
-			ra.App.Isolators = append(ra.App.Isolators, isolator)
+			isolator, err := capsRemove.AsIsolator()
+			if err != nil {
+				return err
+			}
+			ra.App.Isolators = append(ra.App.Isolators, *isolator)
 		}
 
 		if user := app.User; user != "" {
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index 257fcb8900..73284b9e9c 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.4",
+    "acVersion": "0.8.5",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {

From af8a548b356f64dd7a1c00cbd16d573635d7b2e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Wed, 6 Jul 2016 14:40:29 +0200
Subject: [PATCH 0472/1304] *: Bump version of gopsutils to 2.1

---
 glide.lock                                    |   6 +-
 glide.yaml                                    |   2 +-
 vendor/github.com/shirou/gopsutil/cpu/cpu.go  |  21 +-
 .../shirou/gopsutil/cpu/cpu_darwin.go         |   4 +-
 .../shirou/gopsutil/cpu/cpu_darwin_cgo.go     |   2 +
 .../shirou/gopsutil/cpu/cpu_freebsd.go        |   2 +-
 .../shirou/gopsutil/cpu/cpu_linux.go          |   4 +-
 .../shirou/gopsutil/cpu/cpu_unix.go           |  87 ++++--
 .../github.com/shirou/gopsutil/host/host.go   |  14 +-
 .../shirou/gopsutil/host/host_darwin.go       |   4 +-
 .../shirou/gopsutil/host/host_freebsd.go      |  10 +-
 .../shirou/gopsutil/host/host_freebsd_386.go  |  43 +++
 .../gopsutil/host/host_freebsd_amd64.go       |   9 +-
 .../shirou/gopsutil/host/host_linux.go        |  79 +++--
 .../shirou/gopsutil/host/host_linux_386.go    |   5 +-
 .../shirou/gopsutil/host/host_linux_amd64.go  |  16 +-
 .../shirou/gopsutil/host/host_linux_arm.go    |  21 +-
 .../shirou/gopsutil/host/host_linux_arm64.go  |  43 +++
 .../gopsutil/host/host_linux_ppc64le.go       |  45 +++
 .../shirou/gopsutil/host/host_windows.go      |  14 +-
 .../shirou/gopsutil/host/types_freebsd.go     |   1 +
 .../shirou/gopsutil/host/types_linux.go       |   9 +-
 .../shirou/gopsutil/internal/common/common.go |  66 +++-
 vendor/github.com/shirou/gopsutil/mem/mem.go  |   8 +
 .../shirou/gopsutil/mem/mem_darwin_nocgo.go   |   2 +-
 .../shirou/gopsutil/mem/mem_freebsd.go        |   2 +-
 vendor/github.com/shirou/gopsutil/net/net.go  |  13 +-
 .../shirou/gopsutil/net/net_darwin.go         |   2 +-
 .../shirou/gopsutil/net/net_freebsd.go        |   2 +-
 .../shirou/gopsutil/net/net_linux.go          |  10 +
 .../shirou/gopsutil/process/process.go        |   1 +
 .../gopsutil/process/process_freebsd_386.go   | 287 +++++++++++-------
 .../shirou/gopsutil/process/process_linux.go  | 104 ++++---
 .../gopsutil/process/process_linux_arm64.go   |   9 +
 .../shirou/gopsutil/process/process_posix.go  |  18 +-
 .../gopsutil/process/process_windows.go       | 103 +++++--
 .../gopsutil/process/process_windows_386.go   |  16 +
 .../gopsutil/process/process_windows_amd64.go |  16 +
 38 files changed, 819 insertions(+), 281 deletions(-)
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_freebsd_386.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_arm64.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_linux_ppc64le.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux_arm64.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_windows_386.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_windows_amd64.go

diff --git a/glide.lock b/glide.lock
index e637250fd5..d82f96aa5c 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: ac083a9947f04c599d238227e4cb251313045d516a9075bbb4c6e88120789d69
-updated: 2016-06-30T12:56:38.421141147+02:00
+hash: 262928409ee0c00a98dba9f47fec1ebaa0d0ec82e662bf9eae314c6dcc74ae80
+updated: 2016-07-06T14:39:16.612873298+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: 355af275fa8d48b4ecdd361a5feaf173abff81e7
@@ -209,7 +209,7 @@ imports:
 - name: github.com/russross/blackfriday
   version: 300106c228d52c8941d4b3de6054a6062a86dda3
 - name: github.com/shirou/gopsutil
-  version: e8f7a95747d711f34ddfe9dd9b825a84bd059dec
+  version: 22a03b5be3f384f558742929065778aa26471033
   subpackages:
   - cpu
   - host
diff --git a/glide.yaml b/glide.yaml
index da3efa8af4..b262568d54 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -200,7 +200,7 @@ import:
 - package: github.com/russross/blackfriday
   version: 300106c228d52c8941d4b3de6054a6062a86dda3
 - package: github.com/shirou/gopsutil
-  version: v2.0.0
+  version: v2.1
   subpackages:
   - cpu
   - host
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu.go b/vendor/github.com/shirou/gopsutil/cpu/cpu.go
index 71535094d4..6f76b764c0 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu.go
@@ -5,6 +5,9 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"sync"
+
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 type TimesStat struct {
@@ -37,8 +40,22 @@ type InfoStat struct {
 	Flags      []string `json:"flags"`
 }
 
-var lastCPUTimes []TimesStat
-var lastPerCPUTimes []TimesStat
+type lastPercent struct {
+	sync.Mutex
+	lastCPUTimes    []TimesStat
+	lastPerCPUTimes []TimesStat
+}
+
+var lastCPUPercent lastPercent
+var invoke common.Invoker
+
+func init() {
+	invoke = common.Invoke{}
+	lastCPUPercent.Lock()
+	lastCPUPercent.lastCPUTimes, _ = Times(false)
+	lastCPUPercent.lastPerCPUTimes, _ = Times(true)
+	lastCPUPercent.Unlock()
+}
 
 func Counts(logical bool) (int, error) {
 	return runtime.NumCPU(), nil
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
index fbb74a821f..4cb1d8ca88 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
@@ -36,7 +36,7 @@ func Info() ([]InfoStat, error) {
 	if err != nil {
 		return ret, err
 	}
-	out, err := exec.Command(sysctl, "machdep.cpu").Output()
+	out, err := invoke.Command(sysctl, "machdep.cpu")
 	if err != nil {
 		return ret, err
 	}
@@ -90,7 +90,7 @@ func Info() ([]InfoStat, error) {
 
 	// Use the rated frequency of the CPU. This is a static value and does not
 	// account for low power or Turbo Boost modes.
-	out, err = exec.Command(sysctl, "hw.cpufrequency").Output()
+	out, err = invoke.Command(sysctl, "hw.cpufrequency")
 	if err != nil {
 		return ret, err
 	}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
index ee59fefc06..d38dd627ed 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
@@ -10,7 +10,9 @@ package cpu
 #include <mach/mach_init.h>
 #include <mach/mach_host.h>
 #include <mach/host_info.h>
+#if TARGET_OS_MAC
 #include <libproc.h>
+#endif
 #include <mach/processor_info.h>
 #include <mach/vm_map.h>
 */
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
index ce1adf3c16..2f8d3ace1d 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
@@ -29,7 +29,7 @@ func init() {
 	if err != nil {
 		return
 	}
-	out, err := exec.Command(getconf, "CLK_TCK").Output()
+	out, err := invoke.Command(getconf, "CLK_TCK")
 	// ignore errors
 	if err == nil {
 		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
index f7cf4c3649..6df542bdb8 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
@@ -19,7 +19,7 @@ func init() {
 	if err != nil {
 		return
 	}
-	out, err := exec.Command(getconf, "CLK_TCK").Output()
+	out, err := invoke.Command(getconf, "CLK_TCK")
 	// ignore errors
 	if err == nil {
 		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
@@ -121,7 +121,7 @@ func Info() ([]InfoStat, error) {
 				return ret, err
 			}
 			c.CPU = int32(t)
-		case "vendorId":
+		case "vendorId", "vendor_id":
 			c.VendorID = value
 		case "cpu family":
 			c.Family = value
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go
index 9f1ea4d772..0ed7d62ad8 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go
@@ -7,24 +7,46 @@ import (
 	"time"
 )
 
-func Percent(interval time.Duration, percpu bool) ([]float64, error) {
-	getAllBusy := func(t TimesStat) (float64, float64) {
-		busy := t.User + t.System + t.Nice + t.Iowait + t.Irq +
-			t.Softirq + t.Steal + t.Guest + t.GuestNice + t.Stolen
-		return busy + t.Idle, busy
+func getAllBusy(t TimesStat) (float64, float64) {
+	busy := t.User + t.System + t.Nice + t.Iowait + t.Irq +
+		t.Softirq + t.Steal + t.Guest + t.GuestNice + t.Stolen
+	return busy + t.Idle, busy
+}
+
+func calculateBusy(t1, t2 TimesStat) float64 {
+	t1All, t1Busy := getAllBusy(t1)
+	t2All, t2Busy := getAllBusy(t2)
+
+	if t2Busy <= t1Busy {
+		return 0
+	}
+	if t2All <= t1All {
+		return 1
+	}
+	return (t2Busy - t1Busy) / (t2All - t1All) * 100
+}
+
+func calculateAllBusy(t1, t2 []TimesStat) ([]float64, error) {
+	// Make sure the CPU measurements have the same length.
+	if len(t1) != len(t2) {
+		return nil, fmt.Errorf(
+			"received two CPU counts: %d != %d",
+			len(t1), len(t2),
+		)
 	}
 
-	calculate := func(t1, t2 TimesStat) float64 {
-		t1All, t1Busy := getAllBusy(t1)
-		t2All, t2Busy := getAllBusy(t2)
+	ret := make([]float64, len(t1))
+	for i, t := range t2 {
+		ret[i] = calculateBusy(t1[i], t)
+	}
+	return ret, nil
+}
 
-		if t2Busy <= t1Busy {
-			return 0
-		}
-		if t2All <= t1All {
-			return 1
-		}
-		return (t2Busy - t1Busy) / (t2All - t1All) * 100
+//Percent calculates the percentage of cpu used either per CPU or combined.
+//If an interval of 0 is given it will compare the current cpu times against the last call.
+func Percent(interval time.Duration, percpu bool) ([]float64, error) {
+	if interval <= 0 {
+		return percentUsedFromLastCall(percpu)
 	}
 
 	// Get CPU usage at the start of the interval.
@@ -33,9 +55,7 @@ func Percent(interval time.Duration, percpu bool) ([]float64, error) {
 		return nil, err
 	}
 
-	if interval > 0 {
-		time.Sleep(interval)
-	}
+	time.Sleep(interval)
 
 	// And at the end of the interval.
 	cpuTimes2, err := Times(percpu)
@@ -43,17 +63,28 @@ func Percent(interval time.Duration, percpu bool) ([]float64, error) {
 		return nil, err
 	}
 
-	// Make sure the CPU measurements have the same length.
-	if len(cpuTimes1) != len(cpuTimes2) {
-		return nil, fmt.Errorf(
-			"received two CPU counts: %d != %d",
-			len(cpuTimes1), len(cpuTimes2),
-		)
+	return calculateAllBusy(cpuTimes1, cpuTimes2)
+}
+
+func percentUsedFromLastCall(percpu bool) ([]float64, error) {
+	cpuTimes, err := Times(percpu)
+	if err != nil {
+		return nil, err
+	}
+	lastCPUPercent.Lock()
+	defer lastCPUPercent.Unlock()
+	var lastTimes []TimesStat
+	if percpu {
+		lastTimes = lastCPUPercent.lastPerCPUTimes
+		lastCPUPercent.lastPerCPUTimes = cpuTimes
+	} else {
+		lastTimes = lastCPUPercent.lastCPUTimes
+		lastCPUPercent.lastCPUTimes = cpuTimes
 	}
 
-	ret := make([]float64, len(cpuTimes1))
-	for i, t := range cpuTimes2 {
-		ret[i] = calculate(cpuTimes1[i], t)
+	if lastTimes == nil {
+		return nil, fmt.Errorf("Error getting times for cpu percent. LastTimes was nil")
 	}
-	return ret, nil
+	return calculateAllBusy(lastTimes, cpuTimes)
+
 }
diff --git a/vendor/github.com/shirou/gopsutil/host/host.go b/vendor/github.com/shirou/gopsutil/host/host.go
index 150eb60a7d..1a6545b994 100644
--- a/vendor/github.com/shirou/gopsutil/host/host.go
+++ b/vendor/github.com/shirou/gopsutil/host/host.go
@@ -2,17 +2,25 @@ package host
 
 import (
 	"encoding/json"
+
+	"github.com/shirou/gopsutil/internal/common"
 )
 
+var invoke common.Invoker
+
+func init() {
+	invoke = common.Invoke{}
+}
+
 // A HostInfoStat describes the host status.
 // This is not in the psutil but it useful.
 type InfoStat struct {
 	Hostname             string `json:"hostname"`
 	Uptime               uint64 `json:"uptime"`
 	BootTime             uint64 `json:"bootTime"`
-	Procs                uint64 `json:"procs"`           // number of processes
-	OS                   string `json:"os"`              // ex: freebsd, linux
-	Platform             string `json:"platform"`        // ex: ubuntu, linuxmint
+	Procs                uint64 `json:"procs"`          // number of processes
+	OS                   string `json:"os"`             // ex: freebsd, linux
+	Platform             string `json:"platform"`       // ex: ubuntu, linuxmint
 	PlatformFamily       string `json:"platformFamily"` // ex: debian, rhel
 	PlatformVersion      string `json:"platformVersion"`
 	VirtualizationSystem string `json:"virtualizationSystem"`
diff --git a/vendor/github.com/shirou/gopsutil/host/host_darwin.go b/vendor/github.com/shirou/gopsutil/host/host_darwin.go
index f4a8c36a26..ec2dc2ce8d 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_darwin.go
@@ -131,12 +131,12 @@ func PlatformInformation() (string, string, string, error) {
 	if err != nil {
 		return "", "", "", err
 	}
-	out, err := exec.Command(uname, "-s").Output()
+	out, err := invoke.Command(uname, "-s")
 	if err == nil {
 		platform = strings.ToLower(strings.TrimSpace(string(out)))
 	}
 
-	out, err = exec.Command(uname, "-r").Output()
+	out, err = invoke.Command(uname, "-r")
 	if err == nil {
 		version = strings.ToLower(strings.TrimSpace(string(out)))
 	}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_freebsd.go b/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
index 06142e1c80..30206d2005 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
@@ -101,13 +101,11 @@ func Users() ([]UserStat, error) {
 		return ret, err
 	}
 
-	u := Utmpx{}
-	entrySize := int(unsafe.Sizeof(u)) - 3
-	entrySize = 197 // TODO: why should 197
+	entrySize := sizeOfUtmpx
 	count := len(buf) / entrySize
 
 	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
+		b := buf[i*sizeOfUtmpx : (i+1)*sizeOfUtmpx]
 		var u Utmpx
 		br := bytes.NewReader(b)
 		err := binary.Read(br, binary.LittleEndian, &u)
@@ -138,12 +136,12 @@ func PlatformInformation() (string, string, string, error) {
 		return "", "", "", err
 	}
 
-	out, err := exec.Command(uname, "-s").Output()
+	out, err := invoke.Command(uname, "-s")
 	if err == nil {
 		platform = strings.ToLower(strings.TrimSpace(string(out)))
 	}
 
-	out, err = exec.Command(uname, "-r").Output()
+	out, err = invoke.Command(uname, "-r")
 	if err == nil {
 		version = strings.ToLower(strings.TrimSpace(string(out)))
 	}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_freebsd_386.go b/vendor/github.com/shirou/gopsutil/host/host_freebsd_386.go
new file mode 100644
index 0000000000..7f06d8f8e2
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_freebsd_386.go
@@ -0,0 +1,43 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package host
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+	sizeOfUtmpx    = 197 // TODO why should 197
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Utmp struct {
+	Line [8]int8
+	Name [16]int8
+	Host [16]int8
+	Time int32
+}
+
+type Utmpx struct {
+	Type int16
+	Tv   Timeval
+	Id   [8]int8
+	Pid  int32
+	User [32]int8
+	Line [16]int8
+	Host [125]int8
+	//      X__ut_spare     [64]int8
+}
+
+type Timeval struct {
+	Sec  [4]byte
+	Usec [3]byte
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_freebsd_amd64.go b/vendor/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
index 9a4c0a47ac..3f015f0fb5 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
@@ -9,6 +9,7 @@ const (
 	sizeofInt      = 0x4
 	sizeofLong     = 0x8
 	sizeofLongLong = 0x8
+	sizeOfUtmpx    = 197 // TODO: why should 197, not 0x118
 )
 
 type (
@@ -24,17 +25,19 @@ type Utmp struct {
 	Host [16]int8
 	Time int32
 }
+
 type Utmpx struct {
 	Type int16
 	Tv   Timeval
-	ID   [8]int8
+	Id   [8]int8
 	Pid  int32
 	User [32]int8
 	Line [16]int8
 	Host [125]int8
-	//	Host [128]int8
-	//	X__ut_spare [64]int8
+	//      Host [128]int8
+	//      X__ut_spare [64]int8
 }
+
 type Timeval struct {
 	Sec  [4]byte
 	Usec [3]byte
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux.go b/vendor/github.com/shirou/gopsutil/host/host_linux.go
index f56906c28f..b56cc98a2f 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_linux.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux.go
@@ -14,9 +14,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
-	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
+	common "github.com/shirou/gopsutil/internal/common"
 )
 
 type LSB struct {
@@ -108,14 +107,12 @@ func Users() ([]UserStat, error) {
 		return nil, err
 	}
 
-	u := utmp{}
-	entrySize := int(unsafe.Sizeof(u))
-	count := len(buf) / entrySize
+	count := len(buf) / sizeOfUtmp
 
 	ret := make([]UserStat, 0, count)
 
 	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
+		b := buf[i*sizeOfUtmp : (i+1)*sizeOfUtmp]
 
 		var u utmp
 		br := bytes.NewReader(b)
@@ -130,7 +127,7 @@ func Users() ([]UserStat, error) {
 			User:     common.IntToString(u.User[:]),
 			Terminal: common.IntToString(u.Line[:]),
 			Host:     common.IntToString(u.Host[:]),
-			Started:  int(u.Tv.TvSec),
+			Started:  int(u.Tv.Sec),
 		}
 		ret = append(ret, user)
 	}
@@ -139,6 +136,26 @@ func Users() ([]UserStat, error) {
 
 }
 
+func getOSRelease() (platform string, version string, err error) {
+	contents, err := common.ReadLines(common.HostEtc("os-release"))
+	if err != nil {
+		return "", "", nil // return empty
+	}
+	for _, line := range contents {
+		field := strings.Split(line, "=")
+		if len(field) < 2 {
+			continue
+		}
+		switch field[0] {
+		case "ID": // use ID for lowercase
+			platform = field[1]
+		case "VERSION":
+			version = field[1]
+		}
+	}
+	return platform, version, nil
+}
+
 func getLSB() (*LSB, error) {
 	ret := &LSB{}
 	if common.PathExists(common.HostEtc("lsb-release")) {
@@ -167,7 +184,7 @@ func getLSB() (*LSB, error) {
 		if err != nil {
 			return ret, err
 		}
-		out, err := exec.Command(lsb_release).Output()
+		out, err := invoke.Command(lsb_release)
 		if err != nil {
 			return ret, err
 		}
@@ -259,6 +276,18 @@ func PlatformInformation() (platform string, family string, version string, err
 	} else if common.PathExists(common.HostEtc("arch-release")) {
 		platform = "arch"
 		version = lsb.Release
+	} else if common.PathExists(common.HostEtc("alpine-release")) {
+		platform = "alpine"
+		contents, err := common.ReadLines(common.HostEtc("alpine-release"))
+		if err == nil && len(contents) > 0 {
+			version = contents[0]
+		}
+	} else if common.PathExists(common.HostEtc("os-release")) {
+		p, v, err := getOSRelease()
+		if err == nil {
+			platform = p
+			version = v
+		}
 	} else if lsb.ID == "RedHat" {
 		platform = "redhat"
 		version = lsb.Release
@@ -293,6 +322,10 @@ func PlatformInformation() (platform string, family string, version string, err
 		family = "arch"
 	case "exherbo":
 		family = "exherbo"
+	case "alpine":
+		family = "alpine"
+	case "coreos":
+		family = "coreos"
 	}
 
 	return platform, family, version, nil
@@ -354,7 +387,7 @@ func Virtualization() (string, string, error) {
 		if common.PathExists(filename + "/capabilities") {
 			contents, err := common.ReadLines(filename + "/capabilities")
 			if err == nil {
-				if common.StringsHas(contents, "control_d") {
+				if common.StringsContains(contents, "control_d") {
 					role = "host"
 				}
 			}
@@ -382,9 +415,9 @@ func Virtualization() (string, string, error) {
 	if common.PathExists(filename) {
 		contents, err := common.ReadLines(filename)
 		if err == nil {
-			if common.StringsHas(contents, "QEMU Virtual CPU") ||
-				common.StringsHas(contents, "Common KVM processor") ||
-				common.StringsHas(contents, "Common 32-bit KVM processor") {
+			if common.StringsContains(contents, "QEMU Virtual CPU") ||
+				common.StringsContains(contents, "Common KVM processor") ||
+				common.StringsContains(contents, "Common 32-bit KVM processor") {
 				system = "kvm"
 				role = "guest"
 			}
@@ -405,8 +438,8 @@ func Virtualization() (string, string, error) {
 		contents, err := common.ReadLines(filename + "/self/status")
 		if err == nil {
 
-			if common.StringsHas(contents, "s_context:") ||
-				common.StringsHas(contents, "VxID:") {
+			if common.StringsContains(contents, "s_context:") ||
+				common.StringsContains(contents, "VxID:") {
 				system = "linux-vserver"
 			}
 			// TODO: guest or host
@@ -416,16 +449,28 @@ func Virtualization() (string, string, error) {
 	if common.PathExists(filename + "/self/cgroup") {
 		contents, err := common.ReadLines(filename + "/self/cgroup")
 		if err == nil {
-			if common.StringsHas(contents, "lxc") ||
-				common.StringsHas(contents, "docker") {
+			if common.StringsContains(contents, "lxc") {
 				system = "lxc"
 				role = "guest"
-			} else if common.PathExists("/usr/bin/lxc-version") { // TODO: which
+			} else if common.StringsContains(contents, "docker") {
+				system = "docker"
+				role = "guest"
+			} else if common.StringsContains(contents, "machine-rkt") {
+				system = "rkt"
+				role = "guest"
+			} else if common.PathExists("/usr/bin/lxc-version") {
 				system = "lxc"
 				role = "host"
 			}
 		}
 	}
 
+	if common.PathExists(common.HostEtc("os-release")) {
+		p, _, err := getOSRelease()
+		if err == nil && p == "coreos" {
+			system = "rkt" // Is it true?
+			role = "host"
+		}
+	}
 	return system, role, nil
 }
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux_386.go b/vendor/github.com/shirou/gopsutil/host/host_linux_386.go
index cab9feed41..79b5cb5d38 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_linux_386.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux_386.go
@@ -11,6 +11,7 @@ const (
 	sizeofInt      = 0x4
 	sizeofLong     = 0x4
 	sizeofLongLong = 0x8
+	sizeOfUtmp     = 0x180
 )
 
 type (
@@ -39,6 +40,6 @@ type exit_status struct {
 	Exit        int16
 }
 type UtTv struct {
-	TvSec  int32
-	TvUsec int32
+	Sec  int32
+	Usec int32
 }
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux_amd64.go b/vendor/github.com/shirou/gopsutil/host/host_linux_amd64.go
index 180394bbf4..9a69652f51 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_linux_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux_amd64.go
@@ -9,6 +9,7 @@ const (
 	sizeofInt      = 0x4
 	sizeofLong     = 0x8
 	sizeofLongLong = 0x8
+	sizeOfUtmp     = 0x180
 )
 
 type (
@@ -23,12 +24,12 @@ type utmp struct {
 	Pad_cgo_0         [2]byte
 	Pid               int32
 	Line              [32]int8
-	ID                [4]int8
+	Id                [4]int8
 	User              [32]int8
 	Host              [256]int8
 	Exit              exit_status
 	Session           int32
-	Tv                UtTv
+	Tv                _Ctype_struct___0
 	Addr_v6           [4]int32
 	X__glibc_reserved [20]int8
 }
@@ -36,7 +37,12 @@ type exit_status struct {
 	Termination int16
 	Exit        int16
 }
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
+type timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type _Ctype_struct___0 struct {
+	Sec  int32
+	Usec int32
 }
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux_arm.go b/vendor/github.com/shirou/gopsutil/host/host_linux_arm.go
index 5f7e168b61..e2cf448509 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_linux_arm.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux_arm.go
@@ -1,20 +1,21 @@
-// +build linux
-// +build arm
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go | sed "s/uint8/int8/g"
 
 package host
 
 const (
-	sizeofPtr      = 0x8
+	sizeofPtr      = 0x4
 	sizeofShort    = 0x2
 	sizeofInt      = 0x4
-	sizeofLong     = 0x8
+	sizeofLong     = 0x4
 	sizeofLongLong = 0x8
+	sizeOfUtmp     = 0x180
 )
 
 type (
 	_C_short     int16
 	_C_int       int32
-	_C_long      int64
+	_C_long      int32
 	_C_long_long int64
 )
 
@@ -23,12 +24,12 @@ type utmp struct {
 	Pad_cgo_0         [2]byte
 	Pid               int32
 	Line              [32]int8
-	ID                [4]int8
+	Id                [4]int8
 	User              [32]int8
 	Host              [256]int8
 	Exit              exit_status
 	Session           int32
-	Tv                UtTv
+	Tv                timeval
 	Addr_v6           [4]int32
 	X__glibc_reserved [20]int8
 }
@@ -36,7 +37,7 @@ type exit_status struct {
 	Termination int16
 	Exit        int16
 }
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
+type timeval struct {
+	Sec  int32
+	Usec int32
 }
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux_arm64.go b/vendor/github.com/shirou/gopsutil/host/host_linux_arm64.go
new file mode 100644
index 0000000000..37dbe5c8c3
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux_arm64.go
@@ -0,0 +1,43 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package host
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	sizeOfUtmp     = 0x180
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type utmp struct {
+	Type              int16
+	Pad_cgo_0         [2]byte
+	Pid               int32
+	Line              [32]int8
+	Id                [4]int8
+	User              [32]int8
+	Host              [256]int8
+	Exit              exit_status
+	Session           int32
+	Tv                timeval
+	Addr_v6           [4]int32
+	X__glibc_reserved [20]int8
+}
+type exit_status struct {
+	Termination int16
+	Exit        int16
+}
+type timeval struct {
+	Sec  int64
+	Usec int64
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux_ppc64le.go b/vendor/github.com/shirou/gopsutil/host/host_linux_ppc64le.go
new file mode 100644
index 0000000000..d081a08195
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux_ppc64le.go
@@ -0,0 +1,45 @@
+// +build linux
+// +build ppc64le
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package host
+
+const (
+	sizeofPtr      = 0x8
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x8
+	sizeofLongLong = 0x8
+	sizeOfUtmp     = 0x180
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int64
+	_C_long_long int64
+)
+
+type utmp struct {
+	Type              int16
+	Pad_cgo_0         [2]byte
+	Pid               int32
+	Line              [32]int8
+	Id                [4]int8
+	User              [32]int8
+	Host              [256]int8
+	Exit              exit_status
+	Session           int32
+	Tv                timeval
+	Addr_v6           [4]int32
+	X__glibc_reserved [20]int8
+}
+type exit_status struct {
+	Termination int16
+	Exit        int16
+}
+type timeval struct {
+	Sec  int64
+	Usec int64
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_windows.go b/vendor/github.com/shirou/gopsutil/host/host_windows.go
index 29f900c6e2..18062dfe55 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_windows.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_windows.go
@@ -50,7 +50,7 @@ func Info() (*InfoStat, error) {
 	boot, err := BootTime()
 	if err == nil {
 		ret.BootTime = boot
-		ret.Uptime = uptime(boot)
+		ret.Uptime, _ = Uptime()
 	}
 
 	procs, err := process.Pids()
@@ -76,7 +76,7 @@ func GetOSInfo() (Win32_OperatingSystem, error) {
 	return dst[0], nil
 }
 
-func BootTime() (uint64, error) {
+func Uptime() (uint64, error) {
 	if osInfo == nil {
 		_, err := GetOSInfo()
 		if err != nil {
@@ -88,16 +88,16 @@ func BootTime() (uint64, error) {
 	return uint64(now.Sub(t).Seconds()), nil
 }
 
-func uptime(boot uint64) uint64 {
-	return uint64(time.Now().Unix()) - boot
+func bootTime(up uint64) uint64 {
+	return uint64(time.Now().Unix()) - up
 }
 
-func Uptime() (uint64, error) {
-	boot, err := BootTime()
+func BootTime() (uint64, error) {
+	up, err := Uptime()
 	if err != nil {
 		return 0, err
 	}
-	return uptime(boot), nil
+	return bootTime(up), nil
 }
 
 func PlatformInformation() (platform string, family string, version string, err error) {
diff --git a/vendor/github.com/shirou/gopsutil/host/types_freebsd.go b/vendor/github.com/shirou/gopsutil/host/types_freebsd.go
index 113b22eeaf..e70677f681 100644
--- a/vendor/github.com/shirou/gopsutil/host/types_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/host/types_freebsd.go
@@ -27,6 +27,7 @@ const (
 	sizeofInt      = C.sizeof_int
 	sizeofLong     = C.sizeof_long
 	sizeofLongLong = C.sizeof_longlong
+	sizeOfUtmpx    = C.sizeof_struct_utmpx
 )
 
 // Basic types
diff --git a/vendor/github.com/shirou/gopsutil/host/types_linux.go b/vendor/github.com/shirou/gopsutil/host/types_linux.go
index 928545515c..8adecb6cfa 100644
--- a/vendor/github.com/shirou/gopsutil/host/types_linux.go
+++ b/vendor/github.com/shirou/gopsutil/host/types_linux.go
@@ -7,12 +7,11 @@ Input to cgo -godefs.
 package host
 
 /*
-#define KERNEL
 #include <sys/types.h>
 #include <utmp.h>
 
 enum {
-	sizeofPtr = sizeof(void*),
+       sizeofPtr = sizeof(void*),
 };
 
 */
@@ -26,6 +25,7 @@ const (
 	sizeofInt      = C.sizeof_int
 	sizeofLong     = C.sizeof_long
 	sizeofLongLong = C.sizeof_longlong
+	sizeOfUtmp     = C.sizeof_struct_utmp
 )
 
 // Basic types
@@ -39,7 +39,4 @@ type (
 
 type utmp C.struct_utmp
 type exit_status C.struct_exit_status
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
-}
+type timeval C.struct_timeval
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common.go b/vendor/github.com/shirou/gopsutil/internal/common/common.go
index d9dce5cac3..42cbaf92a5 100644
--- a/vendor/github.com/shirou/gopsutil/internal/common/common.go
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common.go
@@ -8,8 +8,10 @@ package common
 //  - windows (amd64)
 import (
 	"bufio"
+	"bytes"
 	"errors"
 	"io/ioutil"
+	"log"
 	"net/url"
 	"os"
 	"os/exec"
@@ -19,6 +21,12 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"time"
+)
+
+var (
+	Timeout    = 3 * time.Second
+	TimeoutErr = errors.New("Command timed out.")
 )
 
 type Invoker interface {
@@ -28,7 +36,8 @@ type Invoker interface {
 type Invoke struct{}
 
 func (i Invoke) Command(name string, arg ...string) ([]byte, error) {
-	return exec.Command(name, arg...).Output()
+	cmd := exec.Command(name, arg...)
+	return CombinedOutputTimeout(cmd, Timeout)
 }
 
 type FakeInvoke struct {
@@ -117,6 +126,23 @@ func IntToString(orig []int8) string {
 	return string(ret[0:size])
 }
 
+func UintToString(orig []uint8) string {
+	ret := make([]byte, len(orig))
+	size := -1
+	for i, o := range orig {
+		if o == 0 {
+			size = i
+			break
+		}
+		ret[i] = byte(o)
+	}
+	if size == -1 {
+		size = len(orig)
+	}
+
+	return string(ret[0:size])
+}
+
 func ByteToString(orig []byte) string {
 	n := -1
 	l := -1
@@ -277,3 +303,41 @@ func HostSys(combineWith ...string) string {
 func HostEtc(combineWith ...string) string {
 	return GetEnv("HOST_ETC", "/etc", combineWith...)
 }
+
+// CombinedOutputTimeout runs the given command with the given timeout and
+// returns the combined output of stdout and stderr.
+// If the command times out, it attempts to kill the process.
+// copied from https://github.com/influxdata/telegraf
+func CombinedOutputTimeout(c *exec.Cmd, timeout time.Duration) ([]byte, error) {
+	var b bytes.Buffer
+	c.Stdout = &b
+	c.Stderr = &b
+	if err := c.Start(); err != nil {
+		return nil, err
+	}
+	err := WaitTimeout(c, timeout)
+	return b.Bytes(), err
+}
+
+// WaitTimeout waits for the given command to finish with a timeout.
+// It assumes the command has already been started.
+// If the command times out, it attempts to kill the process.
+// copied from https://github.com/influxdata/telegraf
+func WaitTimeout(c *exec.Cmd, timeout time.Duration) error {
+	timer := time.NewTimer(timeout)
+	done := make(chan error)
+	go func() { done <- c.Wait() }()
+	select {
+	case err := <-done:
+		timer.Stop()
+		return err
+	case <-timer.C:
+		if err := c.Process.Kill(); err != nil {
+			log.Printf("FATAL error killing process: %s", err)
+			return err
+		}
+		// wait for the command to return after killing it
+		<-done
+		return TimeoutErr
+	}
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem.go b/vendor/github.com/shirou/gopsutil/mem/mem.go
index 5f122d11b1..32558908ae 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem.go
@@ -2,8 +2,16 @@ package mem
 
 import (
 	"encoding/json"
+
+	"github.com/shirou/gopsutil/internal/common"
 )
 
+var invoke common.Invoker
+
+func init() {
+	invoke = common.Invoke{}
+}
+
 // Memory usage statistics. Total, Available and Used contain numbers of bytes
 // for human consumption.
 //
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go b/vendor/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
index 7094802d9a..3eb33abb1b 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_darwin_nocgo.go
@@ -16,7 +16,7 @@ func getVMStat(vms *VirtualMemoryStat) error {
 	if err != nil {
 		return err
 	}
-	out, err := exec.Command(vm_stat).Output()
+	out, err := invoke.Command(vm_stat)
 	if err != nil {
 		return err
 	}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go b/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go
index 7194057674..8cca44b53b 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go
@@ -93,7 +93,7 @@ func SwapMemory() (*SwapMemoryStat, error) {
 		return nil, err
 	}
 
-	out, err := exec.Command(swapinfo).Output()
+	out, err := invoke.Command(swapinfo)
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/github.com/shirou/gopsutil/net/net.go b/vendor/github.com/shirou/gopsutil/net/net.go
index 60f1069c85..4d120dc7ed 100644
--- a/vendor/github.com/shirou/gopsutil/net/net.go
+++ b/vendor/github.com/shirou/gopsutil/net/net.go
@@ -18,15 +18,18 @@ func init() {
 }
 
 type IOCountersStat struct {
-	Name        string `json:"name"`         // interface name
+	Name        string `json:"name"`        // interface name
 	BytesSent   uint64 `json:"bytesSent"`   // number of bytes sent
 	BytesRecv   uint64 `json:"bytesRecv"`   // number of bytes received
 	PacketsSent uint64 `json:"packetsSent"` // number of packets sent
 	PacketsRecv uint64 `json:"packetsRecv"` // number of packets received
-	Errin       uint64 `json:"errin"`        // total number of errors while receiving
-	Errout      uint64 `json:"errout"`       // total number of errors while sending
-	Dropin      uint64 `json:"dropin"`       // total number of incoming packets which were dropped
-	Dropout     uint64 `json:"dropout"`      // total number of outgoing packets which were dropped (always 0 on OSX and BSD)
+	Errin       uint64 `json:"errin"`       // total number of errors while receiving
+	Errout      uint64 `json:"errout"`      // total number of errors while sending
+	Dropin      uint64 `json:"dropin"`      // total number of incoming packets which were dropped
+	Dropout     uint64 `json:"dropout"`     // total number of outgoing packets which were dropped (always 0 on OSX and BSD)
+	Fifoin      uint64 `json:"fifoin"`      // total number of FIFO buffers errors while receiving
+	Fifoout     uint64 `json:"fifoout"`     // total number of FIFO buffers errors while sending
+
 }
 
 // Addr is implemented compatibility to psutil
diff --git a/vendor/github.com/shirou/gopsutil/net/net_darwin.go b/vendor/github.com/shirou/gopsutil/net/net_darwin.go
index 4fa358a38c..78ccb665d3 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_darwin.go
@@ -21,7 +21,7 @@ func IOCounters(pernic bool) ([]IOCountersStat, error) {
 	if err != nil {
 		return nil, err
 	}
-	out, err := exec.Command(netstat, "-ibdnW").Output()
+	out, err := invoke.Command(netstat, "-ibdnW")
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/github.com/shirou/gopsutil/net/net_freebsd.go b/vendor/github.com/shirou/gopsutil/net/net_freebsd.go
index 3a67b4af4a..2b546550e5 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_freebsd.go
@@ -16,7 +16,7 @@ func IOCounters(pernic bool) ([]IOCountersStat, error) {
 	if err != nil {
 		return nil, err
 	}
-	out, err := exec.Command(netstat, "-ibdnW").Output()
+	out, err := invoke.Command(netstat, "-ibdnW")
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/github.com/shirou/gopsutil/net/net_linux.go b/vendor/github.com/shirou/gopsutil/net/net_linux.go
index e0247714fe..0803d8e789 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_linux.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_linux.go
@@ -63,6 +63,10 @@ func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
 		if err != nil {
 			return ret, err
 		}
+		fifoIn, err := strconv.ParseUint(fields[4], 10, 64)
+		if err != nil {
+			return ret, err
+		}
 		bytesSent, err := strconv.ParseUint(fields[8], 10, 64)
 		if err != nil {
 			return ret, err
@@ -79,6 +83,10 @@ func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
 		if err != nil {
 			return ret, err
 		}
+		fifoOut, err := strconv.ParseUint(fields[14], 10, 64)
+		if err != nil {
+			return ret, err
+		}
 
 		nic := IOCountersStat{
 			Name:        interfaceName,
@@ -86,10 +94,12 @@ func IOCountersByFile(pernic bool, filename string) ([]IOCountersStat, error) {
 			PacketsRecv: packetsRecv,
 			Errin:       errIn,
 			Dropin:      dropIn,
+			Fifoin:      fifoIn,
 			BytesSent:   bytesSent,
 			PacketsSent: packetsSent,
 			Errout:      errOut,
 			Dropout:     dropOut,
+			Fifoout:     fifoOut,
 		}
 		ret = append(ret, nic)
 	}
diff --git a/vendor/github.com/shirou/gopsutil/process/process.go b/vendor/github.com/shirou/gopsutil/process/process.go
index 2b9d6854ee..4b69224340 100644
--- a/vendor/github.com/shirou/gopsutil/process/process.go
+++ b/vendor/github.com/shirou/gopsutil/process/process.go
@@ -20,6 +20,7 @@ type Process struct {
 	Pid            int32 `json:"pid"`
 	name           string
 	status         string
+	parent         int32
 	numCtxSwitches *NumCtxSwitchesStat
 	uids           []int32
 	gids           []int32
diff --git a/vendor/github.com/shirou/gopsutil/process/process_freebsd_386.go b/vendor/github.com/shirou/gopsutil/process/process_freebsd_386.go
index 201f714601..05e96d0f03 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_freebsd_386.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_freebsd_386.go
@@ -1,141 +1,192 @@
-// +build freebsd
-// +build 386
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
 
 package process
 
-// copied from sys/sysctl.h
 const (
-	CTLKern          = 1  // "high kernel": proc, limits
-	KernProc         = 14 // struct: process entries
-	KernProcPID      = 1  // by process id
-	KernProcProc     = 8  // only return procs
-	KernProcPathname = 12 // path to executable
-	KernProcArgs     = 7  // get/set arguments/proctitle
+	CTLKern			= 1
+	KernProc		= 14
+	KernProcPID		= 1
+	KernProcProc		= 8
+	KernProcPathname	= 12
+	KernProcArgs		= 7
 )
 
 const (
-	SIDL   = 1
-	SRUN   = 2
-	SSLEEP = 3
-	SSTOP  = 4
-	SZOMB  = 5
-	SWAIT  = 6
-	SLOCK  = 7
+	sizeofPtr	= 0x4
+	sizeofShort	= 0x2
+	sizeofInt	= 0x4
+	sizeofLong	= 0x4
+	sizeofLongLong	= 0x8
 )
 
 const (
-	sizeOfKinfoVmentry = 0x244 // TODO: really?
-	sizeOfKinfoProc    = 0x220
+	sizeOfKinfoVmentry	= 0x488
+	sizeOfKinfoProc		= 0x300
+)
+
+const (
+	SIDL	= 1
+	SRUN	= 2
+	SSLEEP	= 3
+	SSTOP	= 4
+	SZOMB	= 5
+	SWAIT	= 6
+	SLOCK	= 7
+)
+
+type (
+	_C_short	int16
+	_C_int		int32
+	_C_long		int32
+	_C_long_long	int64
 )
 
 type Timespec struct {
-	Sec  int32
-	Nsec int32
+	Sec	int32
+	Nsec	int32
 }
 
 type Timeval struct {
-	Sec  int32
-	Usec int32
+	Sec	int32
+	Usec	int32
 }
 
 type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
+	Utime		Timeval
+	Stime		Timeval
+	Maxrss		int32
+	Ixrss		int32
+	Idrss		int32
+	Isrss		int32
+	Minflt		int32
+	Majflt		int32
+	Nswap		int32
+	Inblock		int32
+	Oublock		int32
+	Msgsnd		int32
+	Msgrcv		int32
+	Nsignals	int32
+	Nvcsw		int32
+	Nivcsw		int32
+}
+
+type Rlimit struct {
+	Cur	int64
+	Max	int64
 }
 
-// copied from sys/user.h
 type KinfoProc struct {
-	Structsize   int32
-	Layout       int32
-	Args         int32
-	Paddr        int32
-	Addr         int32
-	Tracep       int32
-	Textvp       int32
-	Fd           int32
-	Vmspace      int32
-	Wchan        int32
-	Pid          int32
-	Ppid         int32
-	Pgid         int32
-	Tpgid        int32
-	Sid          int32
-	Tsid         int32
-	Jobc         [2]byte
-	SpareShort1  [2]byte
-	Tdev         int32
-	Siglist      [16]byte
-	Sigmask      [16]byte
-	Sigignore    [16]byte
-	Sigcatch     [16]byte
-	Uid          int32
-	Ruid         int32
-	Svuid        int32
-	Rgid         int32
-	Svgid        int32
-	Ngroups      int16
-	SpareShort2  [2]byte
-	Groups       [64]byte
-	Size         int32
-	Rssize       int32
-	Swrss        int32
-	Tsize        int32
-	Dsize        int32
-	Ssize        int32
-	Xstat        [2]byte
-	Acflag       [2]byte
-	Pctcpu       int32
-	Estcpu       int32
-	Slptime      int32
-	Swtime       int32
-	Cow          int32
-	Runtime      int64
-	Start        [8]byte
-	Childtime    [8]byte
-	Flag         int32
-	Kflag        int32
-	Traceflag    int32
-	Stat         int8
-	Nice         [1]byte
-	Lock         [1]byte
-	Rqindex      [1]byte
-	Oncpu        [1]byte
-	Lastcpu      [1]byte
-	Ocomm        [17]byte
-	Wmesg        [9]byte
-	Login        [18]byte
-	Lockname     [9]byte
-	Comm         [20]int8
-	Emul         [17]byte
-	Sparestrings [68]byte
-	Spareints    [36]byte
-	CrFlags      int32
-	Jid          int32
-	Numthreads   int32
-	Tid          int32
-	Pri          int32
-	Rusage       Rusage
-	RusageCh     [72]byte
-	Pcb          int32
-	Kstack       int32
-	Udata        int32
-	Tdaddr       int32
-	Spareptrs    [24]byte
-	Spareint64s  [48]byte
-	Sflag        int32
-	Tdflags      int32
+	Structsize	int32
+	Layout		int32
+	Args		int32 /* pargs */
+	Paddr		int32 /* proc */
+	Addr		int32 /* user */
+	Tracep		int32 /* vnode */
+	Textvp		int32 /* vnode */
+	Fd		int32 /* filedesc */
+	Vmspace		int32 /* vmspace */
+	Wchan		int32
+	Pid		int32
+	Ppid		int32
+	Pgid		int32
+	Tpgid		int32
+	Sid		int32
+	Tsid		int32
+	Jobc		int16
+	Spare_short1	int16
+	Tdev		uint32
+	Siglist		[16]byte /* sigset */
+	Sigmask		[16]byte /* sigset */
+	Sigignore	[16]byte /* sigset */
+	Sigcatch	[16]byte /* sigset */
+	Uid		uint32
+	Ruid		uint32
+	Svuid		uint32
+	Rgid		uint32
+	Svgid		uint32
+	Ngroups		int16
+	Spare_short2	int16
+	Groups		[16]uint32
+	Size		uint32
+	Rssize		int32
+	Swrss		int32
+	Tsize		int32
+	Dsize		int32
+	Ssize		int32
+	Xstat		uint16
+	Acflag		uint16
+	Pctcpu		uint32
+	Estcpu		uint32
+	Slptime		uint32
+	Swtime		uint32
+	Cow		uint32
+	Runtime		uint64
+	Start		Timeval
+	Childtime	Timeval
+	Flag		int32
+	Kiflag		int32
+	Traceflag	int32
+	Stat		int8
+	Nice		int8
+	Lock		int8
+	Rqindex		int8
+	Oncpu		uint8
+	Lastcpu		uint8
+	Tdname		[17]int8
+	Wmesg		[9]int8
+	Login		[18]int8
+	Lockname	[9]int8
+	Comm		[20]int8
+	Emul		[17]int8
+	Loginclass	[18]int8
+	Sparestrings	[50]int8
+	Spareints	[7]int32
+	Flag2		int32
+	Fibnum		int32
+	Cr_flags	uint32
+	Jid		int32
+	Numthreads	int32
+	Tid		int32
+	Pri		Priority
+	Rusage		Rusage
+	Rusage_ch	Rusage
+	Pcb		int32 /* pcb */
+	Kstack		int32
+	Udata		int32
+	Tdaddr		int32 /* thread */
+	Spareptrs	[6]int32
+	Sparelongs	[12]int32
+	Sflag		int32
+	Tdflags		int32
+}
+
+type Priority struct {
+	Class	uint8
+	Level	uint8
+	Native	uint8
+	User	uint8
+}
+
+type KinfoVmentry struct {
+	Structsize		int32
+	Type			int32
+	Start			uint64
+	End			uint64
+	Offset			uint64
+	Vn_fileid		uint64
+	Vn_fsid			uint32
+	Flags			int32
+	Resident		int32
+	Private_resident	int32
+	Protection		int32
+	Ref_count		int32
+	Shadow_count		int32
+	Vn_type			int32
+	Vn_size			uint64
+	Vn_rdev			uint32
+	Vn_mode			uint16
+	Status			uint16
+	X_kve_ispare		[12]int32
+	Path			[1024]int8
 }
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux.go b/vendor/github.com/shirou/gopsutil/process/process_linux.go
index e79ba36edd..ae300412c2 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_linux.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_linux.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -57,6 +56,7 @@ type MemoryMapsStat struct {
 	Swap         uint64 `json:"swap"`
 }
 
+// String returns JSON value of the process.
 func (m MemoryMapsStat) String() string {
 	s, _ := json.Marshal(m)
 	return string(s)
@@ -75,6 +75,7 @@ func NewProcess(pid int32) (*Process, error) {
 	return p, err
 }
 
+// Ppid returns Parent Process ID of the process.
 func (p *Process) Ppid() (int32, error) {
 	_, ppid, _, _, _, err := p.fillFromStat()
 	if err != nil {
@@ -82,6 +83,8 @@ func (p *Process) Ppid() (int32, error) {
 	}
 	return ppid, nil
 }
+
+// Name returns name of the process.
 func (p *Process) Name() (string, error) {
 	if p.name == "" {
 		if err := p.fillFromStatus(); err != nil {
@@ -90,6 +93,8 @@ func (p *Process) Name() (string, error) {
 	}
 	return p.name, nil
 }
+
+// Exe returns executable path of the process.
 func (p *Process) Exe() (string, error) {
 	return p.fillFromExe()
 }
@@ -106,6 +111,7 @@ func (p *Process) CmdlineSlice() ([]string, error) {
 	return p.fillSliceFromCmdline()
 }
 
+// CreateTime returns created time of the process in seconds since the epoch, in UTC.
 func (p *Process) CreateTime() (int64, error) {
 	_, _, _, createTime, _, err := p.fillFromStat()
 	if err != nil {
@@ -114,23 +120,28 @@ func (p *Process) CreateTime() (int64, error) {
 	return createTime, nil
 }
 
+// Cwd returns current working directory of the process.
 func (p *Process) Cwd() (string, error) {
 	return p.fillFromCwd()
 }
+
+// Parent returns parent Process of the process.
 func (p *Process) Parent() (*Process, error) {
-	r, err := callLsof("R", p.Pid)
+	err := p.fillFromStatus()
 	if err != nil {
 		return nil, err
 	}
-	if len(r) != 1 { // TODO: pid 1
+	if p.parent == 0 {
 		return nil, fmt.Errorf("wrong number of parents")
 	}
-	v, err := strconv.Atoi(r[0])
-	if err != nil {
-		return nil, err
-	}
-	return NewProcess(int32(v))
+	return NewProcess(p.parent)
 }
+
+// Status returns the process status.
+// Return value could be one of these.
+// R: Running S: Sleep T: Stop I: Idle
+// Z: Zombie W: Wait L: Lock
+// The charactor is same within all supported platforms.
 func (p *Process) Status() (string, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -138,6 +149,8 @@ func (p *Process) Status() (string, error) {
 	}
 	return p.status, nil
 }
+
+// Uids returns user ids of the process as a slice of the int
 func (p *Process) Uids() ([]int32, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -145,6 +158,8 @@ func (p *Process) Uids() ([]int32, error) {
 	}
 	return p.uids, nil
 }
+
+// Gids returns group ids of the process as a slice of the int
 func (p *Process) Gids() ([]int32, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -152,6 +167,8 @@ func (p *Process) Gids() ([]int32, error) {
 	}
 	return p.gids, nil
 }
+
+// Terminal returns a terminal which is associated with the process.
 func (p *Process) Terminal() (string, error) {
 	terminal, _, _, _, _, err := p.fillFromStat()
 	if err != nil {
@@ -159,6 +176,9 @@ func (p *Process) Terminal() (string, error) {
 	}
 	return terminal, nil
 }
+
+// Nice returns a nice value (priority).
+// Notice: gopsutil can not set nice value.
 func (p *Process) Nice() (int32, error) {
 	_, _, _, _, nice, err := p.fillFromStat()
 	if err != nil {
@@ -166,15 +186,23 @@ func (p *Process) Nice() (int32, error) {
 	}
 	return nice, nil
 }
+
+// IOnice returns process I/O nice value (priority).
 func (p *Process) IOnice() (int32, error) {
 	return 0, common.ErrNotImplementedError
 }
+
+// Rlimit returns Resource Limits.
 func (p *Process) Rlimit() ([]RlimitStat, error) {
 	return nil, common.ErrNotImplementedError
 }
+
+// IOCounters returns IO Counters.
 func (p *Process) IOCounters() (*IOCountersStat, error) {
 	return p.fillFromIO()
 }
+
+// NumCtxSwitches returns the number of the context switches of the process.
 func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -182,10 +210,14 @@ func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
 	}
 	return p.numCtxSwitches, nil
 }
+
+// NumFDs returns the number of File Descriptors used by the process.
 func (p *Process) NumFDs() (int32, error) {
 	numFds, _, err := p.fillFromfd()
 	return numFds, err
 }
+
+// NumThreads returns the number of threads used by the process.
 func (p *Process) NumThreads() (int32, error) {
 	err := p.fillFromStatus()
 	if err != nil {
@@ -193,10 +225,16 @@ func (p *Process) NumThreads() (int32, error) {
 	}
 	return p.numThreads, nil
 }
+
+// Threads returns a map of threads
+//
+// Notice: Not implemented yet. always returns empty map.
 func (p *Process) Threads() (map[string]string, error) {
 	ret := make(map[string]string, 0)
 	return ret, nil
 }
+
+// Times returns CPU times of the process.
 func (p *Process) Times() (*cpu.TimesStat, error) {
 	_, _, cpuTimes, _, _, err := p.fillFromStat()
 	if err != nil {
@@ -204,9 +242,15 @@ func (p *Process) Times() (*cpu.TimesStat, error) {
 	}
 	return cpuTimes, nil
 }
+
+// CPUAffinity returns CPU affinity of the process.
+//
+// Notice: Not implemented yet.
 func (p *Process) CPUAffinity() ([]int32, error) {
 	return nil, common.ErrNotImplementedError
 }
+
+// MemoryInfo returns platform in-dependend memory information, such as RSS, VMS and Swap
 func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
 	meminfo, _, err := p.fillFromStatm()
 	if err != nil {
@@ -214,6 +258,8 @@ func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
 	}
 	return meminfo, nil
 }
+
+// MemoryInfoEx returns platform dependend memory information.
 func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
 	_, memInfoEx, err := p.fillFromStatm()
 	if err != nil {
@@ -222,6 +268,7 @@ func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
 	return memInfoEx, nil
 }
 
+// Children returns a slice of Process of the process.
 func (p *Process) Children() ([]*Process, error) {
 	pids, err := common.CallPgrep(invoke, p.Pid)
 	if err != nil {
@@ -241,6 +288,8 @@ func (p *Process) Children() ([]*Process, error) {
 	return ret, nil
 }
 
+// OpenFiles returns a slice of OpenFilesStat opend by the process.
+// OpenFilesStat includes a file path and file descriptor.
 func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
 	_, ofs, err := p.fillFromfd()
 	if err != nil {
@@ -254,15 +303,20 @@ func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
 	return ret, nil
 }
 
+// Connections returns a slice of net.ConnectionStat used by the process.
+// This returns all kind of the connection. This measn TCP, UDP or UNIX.
 func (p *Process) Connections() ([]net.ConnectionStat, error) {
 	return net.ConnectionsPid("all", p.Pid)
 }
 
+// NetIOCounters returns NetIOCounters of the process.
 func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
 	filename := common.HostProc(strconv.Itoa(int(p.Pid)), "net/dev")
 	return net.IOCountersByFile(pernic, filename)
 }
 
+// IsRunning returns whether the process is running or not.
+// Not implemented yet.
 func (p *Process) IsRunning() (bool, error) {
 	return true, common.ErrNotImplementedError
 }
@@ -557,6 +611,12 @@ func (p *Process) fillFromStatus() error {
 			p.name = strings.Trim(value, " \t")
 		case "State":
 			p.status = value[0:1]
+		case "PPid", "Ppid":
+			pval, err := strconv.ParseInt(value, 10, 32)
+			if err != nil {
+				return err
+			}
+			p.parent = int32(pval)
 		case "Uid":
 			p.uids = make([]int32, 0, 4)
 			for _, i := range strings.Split(value, "\t") {
@@ -680,6 +740,7 @@ func (p *Process) fillFromStat() (string, int32, *cpu.TimesStat, int64, int32, e
 	return terminal, int32(ppid), cpuTimes, createTime, nice, nil
 }
 
+// Pids returns a slice of process ID list which are running now.
 func Pids() ([]int32, error) {
 	var ret []int32
 
@@ -704,30 +765,3 @@ func Pids() ([]int32, error) {
 
 	return ret, nil
 }
-
-func callLsof(arg string, pid int32) ([]string, error) {
-	var cmd []string
-	if pid == 0 { // will get from all processes.
-		cmd = []string{"-F" + arg}
-	} else {
-		cmd = []string{"-a", "-F" + arg, "-p", strconv.Itoa(int(pid))}
-	}
-	lsof, err := exec.LookPath("lsof")
-	if err != nil {
-		return []string{}, err
-	}
-	out, err := invoke.Command(lsof, cmd...)
-	if err != nil {
-		return []string{}, err
-	}
-	lines := strings.Split(string(out), "\n")
-
-	var ret []string
-	for _, l := range lines[1:] {
-		if strings.HasPrefix(l, arg) {
-			ret = append(ret, l[1:]) // delete first char
-		}
-	}
-
-	return ret, nil
-}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux_arm64.go b/vendor/github.com/shirou/gopsutil/process/process_linux_arm64.go
new file mode 100644
index 0000000000..529aeaa9ad
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_linux_arm64.go
@@ -0,0 +1,9 @@
+// +build linux
+// +build arm64
+
+package process
+
+const (
+	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
+	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
+)
diff --git a/vendor/github.com/shirou/gopsutil/process/process_posix.go b/vendor/github.com/shirou/gopsutil/process/process_posix.go
index 92353b8c5d..0751f68606 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_posix.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_posix.go
@@ -9,6 +9,8 @@ import (
 	"strconv"
 	"strings"
 	"syscall"
+
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // POSIX
@@ -51,6 +53,8 @@ func getTerminalMap() (map[uint64]string, error) {
 	return ret, nil
 }
 
+// SendSignal sends a syscall.Signal to the process.
+// Currently, SIGSTOP, SIGCONT, SIGTERM and SIGKILL are supported.
 func (p *Process) SendSignal(sig syscall.Signal) error {
 	sigAsStr := "INT"
 	switch sig {
@@ -70,7 +74,10 @@ func (p *Process) SendSignal(sig syscall.Signal) error {
 	}
 	cmd := exec.Command(kill, "-s", sigAsStr, strconv.Itoa(int(p.Pid)))
 	cmd.Stderr = os.Stderr
-	err = cmd.Run()
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+	err = common.WaitTimeout(cmd, common.Timeout)
 	if err != nil {
 		return err
 	}
@@ -78,18 +85,27 @@ func (p *Process) SendSignal(sig syscall.Signal) error {
 	return nil
 }
 
+// Suspend sends SIGSTOP to the process.
 func (p *Process) Suspend() error {
 	return p.SendSignal(syscall.SIGSTOP)
 }
+
+// Resume sends SIGCONT to the process.
 func (p *Process) Resume() error {
 	return p.SendSignal(syscall.SIGCONT)
 }
+
+// Terminate sends SIGTERM to the process.
 func (p *Process) Terminate() error {
 	return p.SendSignal(syscall.SIGTERM)
 }
+
+// Kill sends SIGKILL to the process.
 func (p *Process) Kill() error {
 	return p.SendSignal(syscall.SIGKILL)
 }
+
+// Username returns a username of the process.
 func (p *Process) Username() (string, error) {
 	uids, err := p.Uids()
 	if err != nil {
diff --git a/vendor/github.com/shirou/gopsutil/process/process_windows.go b/vendor/github.com/shirou/gopsutil/process/process_windows.go
index 3176cde05a..c3d28376f9 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_windows.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_windows.go
@@ -23,6 +23,11 @@ const (
 	MaxPathLength = 260
 )
 
+var (
+	modpsapi                 = syscall.NewLazyDLL("psapi.dll")
+	procGetProcessMemoryInfo = modpsapi.NewProc("GetProcessMemoryInfo")
+)
+
 type SystemProcessInformation struct {
 	NextEntryOffset   uint64
 	NumberOfThreads   uint64
@@ -46,13 +51,18 @@ type MemoryMapsStat struct {
 }
 
 type Win32_Process struct {
-	Name           string
-	ExecutablePath *string
-	CommandLine    *string
-	Priority       uint32
-	CreationDate   *time.Time
-	ProcessID      uint32
-	ThreadCount    uint32
+	Name                string
+	ExecutablePath      *string
+	CommandLine         *string
+	Priority            uint32
+	CreationDate        *time.Time
+	ProcessID           uint32
+	ThreadCount         uint32
+	Status              *string
+	ReadOperationCount  uint64
+	ReadTransferCount   uint64
+	WriteOperationCount uint64
+	WriteTransferCount  uint64
 
 	/*
 		CSCreationClassName   string
@@ -76,14 +86,9 @@ type Win32_Process struct {
 		PeakVirtualSize       uint64
 		PeakWorkingSetSize    uint32
 		PrivatePageCount      uint64
-		ReadOperationCount    uint64
-		ReadTransferCount     uint64
-		Status                *string
 		TerminationDate       *time.Time
 		UserModeTime          uint64
 		WorkingSetSize        uint64
-		WriteOperationCount   uint64
-		WriteTransferCount    uint64
 	*/
 }
 
@@ -158,12 +163,12 @@ func (p *Process) CmdlineSlice() ([]string, error) {
 }
 
 func (p *Process) CreateTime() (int64, error) {
-	dst, err := GetWin32Proc(p.Pid)
+	ru, err := getRusage(p.Pid)
 	if err != nil {
 		return 0, fmt.Errorf("could not get CreationDate: %s", err)
 	}
-	date := *dst[0].CreationDate
-	return date.Unix(), nil
+
+	return ru.CreationTime.Nanoseconds() / 1000000, nil
 }
 
 func (p *Process) Cwd() (string, error) {
@@ -207,8 +212,20 @@ func (p *Process) Rlimit() ([]RlimitStat, error) {
 
 	return rlimit, common.ErrNotImplementedError
 }
+
 func (p *Process) IOCounters() (*IOCountersStat, error) {
-	return nil, common.ErrNotImplementedError
+	dst, err := GetWin32Proc(p.Pid)
+	if err != nil || len(dst) == 0 {
+		return nil, fmt.Errorf("could not get Win32Proc: %s", err)
+	}
+	ret := &IOCountersStat{
+		ReadCount:  uint64(dst[0].ReadOperationCount),
+		ReadBytes:  uint64(dst[0].ReadTransferCount),
+		WriteCount: uint64(dst[0].WriteOperationCount),
+		WriteBytes: uint64(dst[0].WriteTransferCount),
+	}
+
+	return ret, nil
 }
 func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
 	return nil, common.ErrNotImplementedError
@@ -234,7 +251,17 @@ func (p *Process) CPUAffinity() ([]int32, error) {
 	return nil, common.ErrNotImplementedError
 }
 func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
-	return nil, common.ErrNotImplementedError
+	mem, err := getMemoryInfo(p.Pid)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := &MemoryInfoStat{
+		RSS: mem.WorkingSetSize,
+		VMS: mem.PagefileUsage,
+	}
+
+	return ret, nil
 }
 func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
 	return nil, common.ErrNotImplementedError
@@ -355,3 +382,45 @@ func getProcInfo(pid int32) (*SystemProcessInformation, error) {
 
 	return &sysProcInfo, nil
 }
+
+func getRusage(pid int32) (*syscall.Rusage, error) {
+	var CPU syscall.Rusage
+
+	c, err := syscall.OpenProcess(syscall.PROCESS_QUERY_INFORMATION, false, uint32(pid))
+	if err != nil {
+		return nil, err
+	}
+	defer syscall.CloseHandle(c)
+
+	if err := syscall.GetProcessTimes(c, &CPU.CreationTime, &CPU.ExitTime, &CPU.KernelTime, &CPU.UserTime); err != nil {
+		return nil, err
+	}
+
+	return &CPU, nil
+}
+
+func getMemoryInfo(pid int32) (PROCESS_MEMORY_COUNTERS, error) {
+	var mem PROCESS_MEMORY_COUNTERS
+	c, err := syscall.OpenProcess(syscall.PROCESS_QUERY_INFORMATION, false, uint32(pid))
+	if err != nil {
+		return mem, err
+	}
+	defer syscall.CloseHandle(c)
+	if err := getProcessMemoryInfo(c, &mem); err != nil {
+		return mem, err
+	}
+
+	return mem, err
+}
+
+func getProcessMemoryInfo(h syscall.Handle, mem *PROCESS_MEMORY_COUNTERS) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetProcessMemoryInfo.Addr(), 3, uintptr(h), uintptr(unsafe.Pointer(mem)), uintptr(unsafe.Sizeof(*mem)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = error(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_windows_386.go b/vendor/github.com/shirou/gopsutil/process/process_windows_386.go
new file mode 100644
index 0000000000..68f3153dc7
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_windows_386.go
@@ -0,0 +1,16 @@
+// +build windows
+
+package process
+
+type PROCESS_MEMORY_COUNTERS struct {
+	CB                         uint32
+	PageFaultCount             uint32
+	PeakWorkingSetSize         uint32
+	WorkingSetSize             uint32
+	QuotaPeakPagedPoolUsage    uint32
+	QuotaPagedPoolUsage        uint32
+	QuotaPeakNonPagedPoolUsage uint32
+	QuotaNonPagedPoolUsage     uint32
+	PagefileUsage              uint32
+	PeakPagefileUsage          uint32
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_windows_amd64.go b/vendor/github.com/shirou/gopsutil/process/process_windows_amd64.go
new file mode 100644
index 0000000000..df286dfff2
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_windows_amd64.go
@@ -0,0 +1,16 @@
+// +build windows
+
+package process
+
+type PROCESS_MEMORY_COUNTERS struct {
+	CB                         uint32
+	PageFaultCount             uint32
+	PeakWorkingSetSize         uint64
+	WorkingSetSize             uint64
+	QuotaPeakPagedPoolUsage    uint64
+	QuotaPagedPoolUsage        uint64
+	QuotaPeakNonPagedPoolUsage uint64
+	QuotaNonPagedPoolUsage     uint64
+	PagefileUsage              uint64
+	PeakPagefileUsage          uint64
+}

From 9af0776177d583cfff2683bbb1c4a7a5e6ce40dc Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Fri, 1 Jul 2016 15:01:53 +0000
Subject: [PATCH 0473/1304] run: fix sandbox-side metadata service to comply to
 appc v0.8.1

---
 rkt/metadata_service.go            | 55 +++++++++++++++++++++---------
 tests/rkt_ace_validator_test.go    |  9 +++--
 tests/rkt_metadata_service_test.go |  5 +++
 3 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/rkt/metadata_service.go b/rkt/metadata_service.go
index 4855c42906..b25a57ed7f 100644
--- a/rkt/metadata_service.go
+++ b/rkt/metadata_service.go
@@ -309,12 +309,17 @@ func appGet(h func(http.ResponseWriter, *http.Request, *schema.PodManifest, *sch
 func handlePodAnnotations(w http.ResponseWriter, r *http.Request, pm *schema.PodManifest) {
 	defer r.Body.Close()
 
+	out, err := pm.Annotations.MarshalJSON()
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprintf(w, "invalid annotations: %v", err)
+		return
+	}
+
 	w.Header().Add("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
+	w.Write(out)
 
-	for k := range pm.Annotations {
-		fmt.Fprintln(w, k)
-	}
 }
 
 func handlePodAnnotation(w http.ResponseWriter, r *http.Request, pm *schema.PodManifest) {
@@ -335,7 +340,7 @@ func handlePodAnnotation(w http.ResponseWriter, r *http.Request, pm *schema.PodM
 		return
 	}
 
-	w.Header().Add("Content-Type", "application/json")
+	w.Header().Add("Content-Type", "text/plain; charset=us-ascii")
 	w.WriteHeader(http.StatusOK)
 	w.Write([]byte(v))
 }
@@ -343,12 +348,17 @@ func handlePodAnnotation(w http.ResponseWriter, r *http.Request, pm *schema.PodM
 func handlePodManifest(w http.ResponseWriter, r *http.Request, pm *schema.PodManifest) {
 	defer r.Body.Close()
 
+	out, err := json.Marshal(pm)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprintf(w, "JSON encoding error: %v", err)
+		return
+	}
+
 	w.Header().Add("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 
-	if err := json.NewEncoder(w).Encode(pm); err != nil {
-		stderr.Error(err)
-	}
+	w.Write(out)
 }
 
 func handlePodUUID(w http.ResponseWriter, r *http.Request) {
@@ -395,12 +405,19 @@ func handleAppAnnotations(w http.ResponseWriter, r *http.Request, pm *schema.Pod
 		return
 	}
 
-	w.Header().Add("Content-Type", "text/plain; charset=us-ascii")
-	w.WriteHeader(http.StatusOK)
+	anno := mergeAppAnnotations(im, pm, an)
+	out, err := anno.MarshalJSON()
 
-	for _, annot := range mergeAppAnnotations(im, pm, an) {
-		fmt.Fprintln(w, string(annot.Name))
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprint(w, err.Error())
+		return
 	}
+
+	w.Header().Add("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	w.Write(out)
+
 }
 
 func handleAppAnnotation(w http.ResponseWriter, r *http.Request, pm *schema.PodManifest, im *schema.ImageManifest) {
@@ -431,7 +448,7 @@ func handleAppAnnotation(w http.ResponseWriter, r *http.Request, pm *schema.PodM
 		return
 	}
 
-	w.Header().Add("Content-Type", "application/json")
+	w.Header().Add("Content-Type", "text/plain; charset=us-ascii")
 	w.WriteHeader(http.StatusOK)
 	w.Write([]byte(v))
 }
@@ -442,9 +459,14 @@ func handleImageManifest(w http.ResponseWriter, r *http.Request, _ *schema.PodMa
 	w.Header().Add("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 
-	if err := json.NewEncoder(w).Encode(*im); err != nil {
-		stderr.Error(err)
+	out, err := json.Marshal(im)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprint(w, err.Error())
+		return
 	}
+	w.Write(out)
+
 }
 
 func handleAppID(w http.ResponseWriter, r *http.Request, pm *schema.PodManifest, im *schema.ImageManifest) {
@@ -511,6 +533,7 @@ func handlePodSign(w http.ResponseWriter, r *http.Request) {
 func handlePodVerify(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 
+	w.Header().Add("Content-Type", "text/plain; charset=us-ascii")
 	uuid, err := types.NewUUID(r.FormValue("uuid"))
 	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
@@ -614,12 +637,12 @@ func runPublicServer(l net.Listener) {
 
 	mr := r.Methods("GET").Subrouter()
 
-	mr.HandleFunc("/pod/annotations/", logReq(podGet(handlePodAnnotations)))
+	mr.HandleFunc("/pod/annotations", logReq(podGet(handlePodAnnotations)))
 	mr.HandleFunc("/pod/annotations/{name:.*}", logReq(podGet(handlePodAnnotation)))
 	mr.HandleFunc("/pod/manifest", logReq(podGet(handlePodManifest)))
 	mr.HandleFunc("/pod/uuid", logReq(handlePodUUID))
 
-	mr.HandleFunc("/apps/{app:.*}/annotations/", logReq(appGet(handleAppAnnotations)))
+	mr.HandleFunc("/apps/{app:.*}/annotations", logReq(appGet(handleAppAnnotations)))
 	mr.HandleFunc("/apps/{app:.*}/annotations/{name:.*}", logReq(appGet(handleAppAnnotation)))
 	mr.HandleFunc("/apps/{app:.*}/image/manifest", logReq(appGet(handleImageManifest)))
 	mr.HandleFunc("/apps/{app:.*}/image/id", logReq(appGet(handleAppID)))
diff --git a/tests/rkt_ace_validator_test.go b/tests/rkt_ace_validator_test.go
index 820b396679..80c13b1d4b 100644
--- a/tests/rkt_ace_validator_test.go
+++ b/tests/rkt_ace_validator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build ignore
+// +build !fly
 
 package main
 
@@ -24,6 +24,11 @@ import (
 	"github.com/coreos/rkt/tests/testutils"
 )
 
+// Spin up the appc ACE validator pod and return the result.
+
+// You'll find the actual application at vendor/github.com/appc/spec/ace/validator.go,
+// the two ACIs are built from that
+
 func TestAceValidator(t *testing.T) {
 	newStringSet := func(strs ...string) map[string]struct{} {
 		m := make(map[string]struct{}, len(strs))
@@ -37,7 +42,7 @@ func TestAceValidator(t *testing.T) {
 		newStringSet("main", "sidekick"),
 		newStringSet("poststop"),
 	}
-	pattern := `ace-validator\[\d+\]: ([[:alpha:]]+) OK`
+	pattern := `ace-validator-(?:main|sidekick)\[\d+\]: ([[:alpha:]]+) OK`
 
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
diff --git a/tests/rkt_metadata_service_test.go b/tests/rkt_metadata_service_test.go
index 8c8e6d8b10..a11ce11d0f 100644
--- a/tests/rkt_metadata_service_test.go
+++ b/tests/rkt_metadata_service_test.go
@@ -24,6 +24,11 @@ import (
 	"github.com/coreos/rkt/tests/testutils"
 )
 
+// Launch an app that polls the Annotations metadata
+// service - (see https://github.com/appc/spec/blob/master/spec/ace.md#app-container-metadata-service)
+
+// The app's source is at tests/inspect/inspect.go
+
 func TestFetchAppAnnotation(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()

From c9a4a97b3ba04c14f27f528c0aa17889d238f6e5 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Tue, 5 Jul 2016 17:04:02 +0000
Subject: [PATCH 0474/1304] functional tests: disable ACE poststop validator
 test

Due to #2870, the post-stop event is not reliable. This
disables checking for successful post-stop.
---
 tests/rkt_ace_validator_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_ace_validator_test.go b/tests/rkt_ace_validator_test.go
index 80c13b1d4b..e59d760359 100644
--- a/tests/rkt_ace_validator_test.go
+++ b/tests/rkt_ace_validator_test.go
@@ -40,7 +40,7 @@ func TestAceValidator(t *testing.T) {
 	expected := []map[string]struct{}{
 		newStringSet("prestart"),
 		newStringSet("main", "sidekick"),
-		newStringSet("poststop"),
+		// newStringSet("poststop"), // Disabled by caseyc for #2870
 	}
 	pattern := `ace-validator-(?:main|sidekick)\[\d+\]: ([[:alpha:]]+) OK`
 

From cdc3b88fc210b44dfedd5160f99a3908056d46f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 6 Jul 2016 16:10:00 +0200
Subject: [PATCH 0475/1304] glide: bump ql to v1.0.4

It fixes an occassional panic when doing GC.
---
 glide.lock                                    |  16 +-
 glide.yaml                                    |  10 +-
 vendor/github.com/camlistore/go4/LICENSE      | 202 ------------------
 vendor/github.com/cznic/ql/doc.go             |  17 ++
 vendor/github.com/cznic/ql/expr.go            |   4 +-
 vendor/github.com/cznic/ql/file.go            |  58 ++++-
 vendor/github.com/cznic/ql/parser.go          | 114 +++++++++-
 vendor/github.com/cznic/ql/ql.go              |   2 +-
 .../github.com}/camlistore/go4/lock/lock.go   |   0
 .../camlistore/go4/lock/lock_appengine.go     |   0
 .../camlistore/go4/lock/lock_darwin_amd64.go  |   0
 .../camlistore/go4/lock/lock_freebsd.go       |   0
 .../camlistore/go4/lock/lock_linux_amd64.go   |   0
 .../camlistore/go4/lock/lock_linux_arm.go     |   0
 .../camlistore/go4/lock/lock_plan9.go         |   0
 .../camlistore/go4/lock/lock_sigzero.go       |   0
 .../github.com/cznic}/exp/lldb/2pc.go         |   0
 .../github.com/cznic}/exp/lldb/2pc_docs.go    |   0
 .../github.com/cznic}/exp/lldb/LICENSE        |   0
 .../github.com/cznic}/exp/lldb/btree.go       |  29 ++-
 .../github.com/cznic}/exp/lldb/errors.go      |   0
 .../github.com/cznic}/exp/lldb/falloc.go      |   0
 .../github.com/cznic}/exp/lldb/filer.go       |   0
 .../vendored/github.com/cznic}/exp/lldb/gb.go |   0
 .../github.com/cznic}/exp/lldb/lldb.go        |   0
 .../github.com/cznic}/exp/lldb/memfiler.go    |   0
 .../github.com/cznic}/exp/lldb/osfiler.go     |   0
 .../cznic}/exp/lldb/simplefilefiler.go        |   0
 .../github.com/cznic}/exp/lldb/xact.go        |  13 ++
 29 files changed, 230 insertions(+), 235 deletions(-)
 delete mode 100644 vendor/github.com/camlistore/go4/LICENSE
 rename vendor/github.com/{ => cznic/ql/vendored/github.com}/camlistore/go4/lock/lock.go (100%)
 rename vendor/github.com/{ => cznic/ql/vendored/github.com}/camlistore/go4/lock/lock_appengine.go (100%)
 rename vendor/github.com/{ => cznic/ql/vendored/github.com}/camlistore/go4/lock/lock_darwin_amd64.go (100%)
 rename vendor/github.com/{ => cznic/ql/vendored/github.com}/camlistore/go4/lock/lock_freebsd.go (100%)
 rename vendor/github.com/{ => cznic/ql/vendored/github.com}/camlistore/go4/lock/lock_linux_amd64.go (100%)
 rename vendor/github.com/{ => cznic/ql/vendored/github.com}/camlistore/go4/lock/lock_linux_arm.go (100%)
 rename vendor/github.com/{ => cznic/ql/vendored/github.com}/camlistore/go4/lock/lock_plan9.go (100%)
 rename vendor/github.com/{ => cznic/ql/vendored/github.com}/camlistore/go4/lock/lock_sigzero.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/2pc.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/2pc_docs.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/LICENSE (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/btree.go (98%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/errors.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/falloc.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/filer.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/gb.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/lldb.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/memfiler.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/osfiler.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/simplefilefiler.go (100%)
 rename vendor/github.com/cznic/{ => ql/vendored/github.com/cznic}/exp/lldb/xact.go (98%)

diff --git a/glide.lock b/glide.lock
index d82f96aa5c..c340012929 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 262928409ee0c00a98dba9f47fec1ebaa0d0ec82e662bf9eae314c6dcc74ae80
-updated: 2016-07-06T14:39:16.612873298+02:00
+hash: c98a3d0cb1340703d2bbf77ac3bf2f6e357c0de64fb02f5d502ffac399b5d5e5
+updated: 2016-07-06T16:44:19.414775414+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: 355af275fa8d48b4ecdd361a5feaf173abff81e7
@@ -43,10 +43,6 @@ imports:
   - aws/request
   - private/protocol/rest
   - private/signer/v4
-- name: github.com/camlistore/go4
-  version: 9ba773eba85ab9e258ff516630f7f6474bc4535b
-  subpackages:
-  - lock
 - name: github.com/containernetworking/cni
   version: 5c3c17164270150467498a32c71436c7cd5501be
   subpackages:
@@ -122,18 +118,16 @@ imports:
   version: e2e747ce049fb910cff6b1fd7ad8faf3900939d5
 - name: github.com/cznic/bufs
   version: 3dcccbd7064a1689f9c093a988ea11ac00e21f51
-- name: github.com/cznic/exp
-  version: 36265f1914ea00990ff0b73f72350edf9b1850df
-  subpackages:
-  - lldb
 - name: github.com/cznic/fileutil
   version: 21ae57c9dce724a15e88bd9cd46d5668f3e880a5
 - name: github.com/cznic/mathutil
   version: 250d0b9d3304c5ea0c4cfc7d9efc7ee528b81f3b
 - name: github.com/cznic/ql
-  version: 77545ff365ff426dfab06c46d70fa77600cd55af
+  version: 2cbfdfc32e5e9575be5176b1f6f21d6445003617
   subpackages:
   - driver
+  - vendored/github.com/camlistore/go4/lock
+  - vendored/github.com/cznic/exp/lldb
 - name: github.com/cznic/sortutil
   version: d4401851b4c370f979b842fa1e45e0b3b718b391
 - name: github.com/cznic/strutil
diff --git a/glide.yaml b/glide.yaml
index b262568d54..af71435198 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -44,10 +44,6 @@ import:
   - aws/request
   - private/protocol/rest
   - private/signer/v4
-- package: github.com/camlistore/go4
-  version: 9ba773eba85ab9e258ff516630f7f6474bc4535b
-  subpackages:
-  - lock
 - package: github.com/containernetworking/cni
   version: v0.3.0
   subpackages:
@@ -123,16 +119,12 @@ import:
   version: e2e747ce049fb910cff6b1fd7ad8faf3900939d5
 - package: github.com/cznic/bufs
   version: 3dcccbd7064a1689f9c093a988ea11ac00e21f51
-- package: github.com/cznic/exp
-  version: 36265f1914ea00990ff0b73f72350edf9b1850df
-  subpackages:
-  - lldb
 - package: github.com/cznic/fileutil
   version: 21ae57c9dce724a15e88bd9cd46d5668f3e880a5
 - package: github.com/cznic/mathutil
   version: 250d0b9d3304c5ea0c4cfc7d9efc7ee528b81f3b
 - package: github.com/cznic/ql
-  version: 77545ff365ff426dfab06c46d70fa77600cd55af
+  version: v1.0.4
   subpackages:
   - driver
 - package: github.com/cznic/sortutil
diff --git a/vendor/github.com/camlistore/go4/LICENSE b/vendor/github.com/camlistore/go4/LICENSE
deleted file mode 100644
index 8f71f43fee..0000000000
--- a/vendor/github.com/camlistore/go4/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/vendor/github.com/cznic/ql/doc.go b/vendor/github.com/cznic/ql/doc.go
index 7a8baf10eb..32baf0a8e8 100644
--- a/vendor/github.com/cznic/ql/doc.go
+++ b/vendor/github.com/cznic/ql/doc.go
@@ -14,6 +14,23 @@
 //
 // Change list
 //
+// 2016-07-06: Release v1.0.4 fixes a panic when closing the WAL file.
+//
+//	https://github.com/cznic/ql/pull/127
+//
+// 2016-04-03: Release v1.0.3 fixes a data race.
+//
+//	https://github.com/cznic/ql/issues/126
+//
+// 2016-03-23: Release v1.0.2 vendors github.com/cznic/exp/lldb and
+// github.com/camlistore/go4/lock.
+//
+// 2016-03-17: Release v1.0.1 adjusts for latest goyacc. Parser error messages
+// are improved and changed, but their exact form is not considered a API
+// change.
+//
+// 2016-03-05: The current version has been tagged v1.0.0.
+//
 // 2015-06-15: To improve compatibility with other SQL implementations, the
 // count built-in aggregate function now accepts * as its argument.
 //
diff --git a/vendor/github.com/cznic/ql/expr.go b/vendor/github.com/cznic/ql/expr.go
index 3e6954fbe6..f0e53af44e 100644
--- a/vendor/github.com/cznic/ql/expr.go
+++ b/vendor/github.com/cznic/ql/expr.go
@@ -3264,7 +3264,9 @@ func (l value) String() string {
 	case time.Duration:
 		return fmt.Sprintf("duration(%q)", l.val)
 	case time.Time:
-		return fmt.Sprintf("time(%q)", l.val)
+		y, m, d := x.Date()
+		zone, _ := x.Zone()
+		return fmt.Sprintf("date(%v, %v, %v, %v, %v, %v, %v, %v)", y, m, d, x.Hour(), x.Minute(), x.Second(), x.Nanosecond(), zone)
 	case *big.Rat:
 		return fmt.Sprintf("bigrat(%q)", l.val)
 	case *big.Int:
diff --git a/vendor/github.com/cznic/ql/file.go b/vendor/github.com/cznic/ql/file.go
index c7fb7c95ed..d61645ed73 100644
--- a/vendor/github.com/cznic/ql/file.go
+++ b/vendor/github.com/cznic/ql/file.go
@@ -19,9 +19,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/camlistore/go4/lock"
-	"github.com/cznic/exp/lldb"
 	"github.com/cznic/mathutil"
+	"github.com/cznic/ql/vendored/github.com/camlistore/go4/lock"
+	"github.com/cznic/ql/vendored/github.com/cznic/exp/lldb"
 )
 
 const (
@@ -409,7 +409,7 @@ func newFileFromOSFile(f lldb.OSFile) (fi *file, err error) {
 	w, err = os.OpenFile(wn, os.O_CREATE|os.O_EXCL|os.O_RDWR, 0666)
 	closew = true
 	defer func() {
-		if closew {
+		if w != nil && closew {
 			nm := w.Name()
 			w.Close()
 			os.Remove(nm)
@@ -554,7 +554,7 @@ func (s *file) OpenIndex(unique bool, handle int64) (btreeIndex, error) {
 		return nil, err
 	}
 
-	return &fileIndex{s, handle, t, unique}, nil
+	return &fileIndex{s, handle, t, unique, newGobCoder()}, nil
 }
 
 func (s *file) CreateIndex(unique bool) ( /* handle */ int64, btreeIndex, error) {
@@ -563,7 +563,7 @@ func (s *file) CreateIndex(unique bool) ( /* handle */ int64, btreeIndex, error)
 		return -1, nil, err
 	}
 
-	return h, &fileIndex{s, h, t, unique}, nil
+	return h, &fileIndex{s, h, t, unique, newGobCoder()}, nil
 }
 
 func (s *file) Acid() bool { return s.wal != nil }
@@ -1096,6 +1096,7 @@ type fileIndex struct {
 	h      int64
 	t      *lldb.BTree
 	unique bool
+	codec  *gobCoder
 }
 
 func (x *fileIndex) Clear() error {
@@ -1202,8 +1203,51 @@ func (x *fileIndex) Drop() error {
 	return x.f.a.Free(x.h)
 }
 
-func (x *fileIndex) Seek(indexedValues []interface{}) (indexIterator, bool, error) { //TODO(indices) blobs: +test
-	k, err := lldb.EncodeScalars(append(indexedValues, 0)...)
+// []interface{}{qltype, ...}->[]interface{}{lldb scalar type, ...}
+func (x *fileIndex) flatten(data []interface{}) (err error) {
+	for i, v := range data {
+		tag := 0
+		var b []byte
+		switch xx := v.(type) {
+		case []byte:
+			tag = qBlob
+			b = xx
+		case *big.Int:
+			tag = qBigInt
+			b, err = x.codec.encode(xx)
+		case *big.Rat:
+			tag = qBigRat
+			b, err = x.codec.encode(xx)
+		case time.Time:
+			tag = qTime
+			b, err = x.codec.encode(xx)
+		case time.Duration:
+			tag = qDuration
+			b, err = x.codec.encode(xx)
+		default:
+			continue
+		}
+		if err != nil {
+			return
+		}
+
+		var buf []byte
+		if buf, err = lldb.EncodeScalars([]interface{}{tag, b}...); err != nil {
+			return
+		}
+
+		data[i] = buf
+	}
+	return
+}
+
+func (x *fileIndex) Seek(indexedValues []interface{}) (indexIterator, bool, error) {
+	data := append(indexedValues, 0)
+	if err := x.flatten(data); err != nil {
+		return nil, false, err
+	}
+
+	k, err := lldb.EncodeScalars(data...)
 	if err != nil {
 		return nil, false, err
 	}
diff --git a/vendor/github.com/cznic/ql/parser.go b/vendor/github.com/cznic/ql/parser.go
index 1fb6e04a54..0edb803f22 100644
--- a/vendor/github.com/cznic/ql/parser.go
+++ b/vendor/github.com/cznic/ql/parser.go
@@ -534,6 +534,100 @@ var (
 		"error",
 	}
 
+	yyTokenLiteralStrings = map[int]string{
+		57347: "identifier",
+		57409: "OFFSET",
+		57404: "LIMIT",
+		57372: "DEFAULT",
+		57412: "ORDER",
+		57435: "WHERE",
+		57408: "NULL",
+		57361: "bigint",
+		57362: "bigrat",
+		57363: "blob",
+		57364: "bool",
+		57366: "byte",
+		57369: "complex128",
+		57370: "complex64",
+		57377: "duration",
+		57383: "float32",
+		57384: "float64",
+		57382: "float",
+		57394: "int16",
+		57395: "int32",
+		57396: "int64",
+		57397: "int8",
+		57393: "int",
+		57418: "rune",
+		57421: "string",
+		57423: "time",
+		57428: "uint16",
+		57429: "uint32",
+		57430: "uint64",
+		57431: "uint8",
+		57427: "uint",
+		57381: "false",
+		57346: "floating-point literal",
+		57388: "GROUP",
+		57348: "imaginary literal",
+		57349: "integer literal",
+		57407: "NOT",
+		57411: "OR",
+		57413: "||",
+		57350: "QL parameter",
+		57351: "string literal",
+		57425: "true",
+		57385: "FROM",
+		57358: "ASC",
+		57374: "DESC",
+		57357: "AS",
+		57354: "AND",
+		57355: "&&",
+		57360: "BETWEEN",
+		57390: "IN",
+		57378: "==",
+		57387: ">=",
+		57399: "IS",
+		57401: "<=",
+		57403: "LIKE",
+		57406: "!=",
+		57356: "&^",
+		57405: "<<",
+		57417: ">>",
+		57386: "FULL",
+		57402: "LEFT",
+		57415: "RIGHT",
+		57419: "SELECT",
+		57410: "ON",
+		57400: "JOIN",
+		57376: "DROP",
+		57379: "EXISTS",
+		57389: "IF",
+		57391: "INDEX",
+		57414: "OUTER",
+		57422: "TABLE",
+		57434: "VALUES",
+		57353: "ALTER",
+		57359: "BEGIN",
+		57368: "COMMIT",
+		57371: "CREATE",
+		57373: "DELETE",
+		57380: "EXPLAIN",
+		57392: "INSERT",
+		57416: "ROLLBACK",
+		57426: "TRUNCATE",
+		57433: "UPDATE",
+		57352: "ADD",
+		57365: "BY",
+		57420: "SET",
+		57367: "COLUMN",
+		57375: "DISTINCT",
+		57398: "INTO",
+		57436: "parse expression prefix",
+		57424: "TRANSACTION",
+		57432: "UNIQUE",
+	}
+
 	yyReductions = map[int]struct{ xsym, components int }{
 		0:   {0, 1},
 		1:   {190, 1},
@@ -1568,6 +1662,10 @@ func yySymName(c int) (s string) {
 		return yySymNames[x]
 	}
 
+	if c < 0x7f {
+		return __yyfmt__.Sprintf("'%c'", c)
+	}
+
 	return __yyfmt__.Sprintf("%d", c)
 }
 
@@ -1684,7 +1782,21 @@ yynewstate:
 			if !ok {
 				msg, ok = yyXErrors[yyXError{yyshift, -1}]
 			}
-			if !ok || msg == "" {
+			if yychar > 0 {
+				ls := yyTokenLiteralStrings[yychar]
+				if ls == "" {
+					ls = yySymName(yychar)
+				}
+				if ls != "" {
+					switch {
+					case msg == "":
+						msg = __yyfmt__.Sprintf("unexpected %s", ls)
+					default:
+						msg = __yyfmt__.Sprintf("unexpected %s, %s", ls, msg)
+					}
+				}
+			}
+			if msg == "" {
 				msg = "syntax error"
 			}
 			yylex.Error(msg)
diff --git a/vendor/github.com/cznic/ql/ql.go b/vendor/github.com/cznic/ql/ql.go
index 82c3c5fa58..3a70b86dc6 100644
--- a/vendor/github.com/cznic/ql/ql.go
+++ b/vendor/github.com/cznic/ql/ql.go
@@ -1241,8 +1241,8 @@ func (db *DB) run1(pc *TCtx, s stmt, arg ...interface{}) (rs Recordset, tnla, tn
 				return
 			}
 
-			db.beginTransaction()
 			db.rwmu.Lock()
+			db.beginTransaction()
 			db.cc = pc
 			db.tnl++
 			tnlb = db.tnl
diff --git a/vendor/github.com/camlistore/go4/lock/lock.go b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock.go
similarity index 100%
rename from vendor/github.com/camlistore/go4/lock/lock.go
rename to vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock.go
diff --git a/vendor/github.com/camlistore/go4/lock/lock_appengine.go b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_appengine.go
similarity index 100%
rename from vendor/github.com/camlistore/go4/lock/lock_appengine.go
rename to vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_appengine.go
diff --git a/vendor/github.com/camlistore/go4/lock/lock_darwin_amd64.go b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_darwin_amd64.go
similarity index 100%
rename from vendor/github.com/camlistore/go4/lock/lock_darwin_amd64.go
rename to vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_darwin_amd64.go
diff --git a/vendor/github.com/camlistore/go4/lock/lock_freebsd.go b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_freebsd.go
similarity index 100%
rename from vendor/github.com/camlistore/go4/lock/lock_freebsd.go
rename to vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_freebsd.go
diff --git a/vendor/github.com/camlistore/go4/lock/lock_linux_amd64.go b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_linux_amd64.go
similarity index 100%
rename from vendor/github.com/camlistore/go4/lock/lock_linux_amd64.go
rename to vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_linux_amd64.go
diff --git a/vendor/github.com/camlistore/go4/lock/lock_linux_arm.go b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_linux_arm.go
similarity index 100%
rename from vendor/github.com/camlistore/go4/lock/lock_linux_arm.go
rename to vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_linux_arm.go
diff --git a/vendor/github.com/camlistore/go4/lock/lock_plan9.go b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_plan9.go
similarity index 100%
rename from vendor/github.com/camlistore/go4/lock/lock_plan9.go
rename to vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_plan9.go
diff --git a/vendor/github.com/camlistore/go4/lock/lock_sigzero.go b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_sigzero.go
similarity index 100%
rename from vendor/github.com/camlistore/go4/lock/lock_sigzero.go
rename to vendor/github.com/cznic/ql/vendored/github.com/camlistore/go4/lock/lock_sigzero.go
diff --git a/vendor/github.com/cznic/exp/lldb/2pc.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/2pc.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/2pc.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/2pc.go
diff --git a/vendor/github.com/cznic/exp/lldb/2pc_docs.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/2pc_docs.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/2pc_docs.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/2pc_docs.go
diff --git a/vendor/github.com/cznic/exp/lldb/LICENSE b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/LICENSE
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/LICENSE
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/LICENSE
diff --git a/vendor/github.com/cznic/exp/lldb/btree.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/btree.go
similarity index 98%
rename from vendor/github.com/cznic/exp/lldb/btree.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/btree.go
index 57b0f39c62..8e58a92597 100644
--- a/vendor/github.com/cznic/exp/lldb/btree.go
+++ b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/btree.go
@@ -251,7 +251,12 @@ func (t *BTree) Get(buf, key []byte) (value []byte, err error) {
 		return
 	}
 
-	value = need(len(buffer), buf)
+	if len(buffer) != 0 {
+		// The buffer cache returns nil for empty buffers, bypass it
+		value = need(len(buffer), buf)
+	} else {
+		value = []byte{}
+	}
 	copy(value, buffer)
 	return
 }
@@ -625,6 +630,18 @@ func (e *BTreeEnumerator) Next() (key, value []byte, err error) {
 
 	canRetry := true
 retry:
+	if e.enum.p == nil {
+		e.err = io.EOF
+		return nil, nil, e.err
+	}
+
+	if e.enum.index == e.enum.p.len() && e.enum.serial == e.enum.t.serial {
+		if err := e.enum.next(); err != nil {
+			e.err = err
+			return nil, nil, e.err
+		}
+	}
+
 	if key, value, err = e.enum.current(); err != nil {
 		if _, ok := err.(*ErrINVAL); !ok || !canRetry {
 			e.err = err
@@ -1348,7 +1365,13 @@ func (p btreeDataPage) valueField(index int) (b []byte, h int64) {
 }
 
 func (p btreeDataPage) value(a btreeStore, index int) (b []byte, err error) {
-	return p.content(a, 15+kKV+2*kKV*index)
+	value, err := p.content(a, 15+kKV+2*kKV*index)
+	if err == nil && value == nil {
+		// We have a valid page, no fetch error, the key is valid so return
+		// non-nil data
+		return []byte{}, nil
+	}
+	return value, err
 }
 
 func (p btreeDataPage) valueCopy(a btreeStore, index int) (b []byte, err error) {
@@ -1491,7 +1514,7 @@ func (p btreeDataPage) overflow(a btreeStore, root, ph, parent int64, parentInde
 			return nil, err
 		}
 
-		if left.len() < 2*kData {
+		if left.len() < 2*kData && index > 0 {
 
 			p, left = p.moveLeft(left, 1)
 			if err = a.Realloc(leftH, left); err != nil {
diff --git a/vendor/github.com/cznic/exp/lldb/errors.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/errors.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/errors.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/errors.go
diff --git a/vendor/github.com/cznic/exp/lldb/falloc.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/falloc.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/falloc.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/falloc.go
diff --git a/vendor/github.com/cznic/exp/lldb/filer.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/filer.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/filer.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/filer.go
diff --git a/vendor/github.com/cznic/exp/lldb/gb.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/gb.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/gb.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/gb.go
diff --git a/vendor/github.com/cznic/exp/lldb/lldb.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/lldb.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/lldb.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/lldb.go
diff --git a/vendor/github.com/cznic/exp/lldb/memfiler.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/memfiler.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/memfiler.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/memfiler.go
diff --git a/vendor/github.com/cznic/exp/lldb/osfiler.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/osfiler.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/osfiler.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/osfiler.go
diff --git a/vendor/github.com/cznic/exp/lldb/simplefilefiler.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/simplefilefiler.go
similarity index 100%
rename from vendor/github.com/cznic/exp/lldb/simplefilefiler.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/simplefilefiler.go
diff --git a/vendor/github.com/cznic/exp/lldb/xact.go b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/xact.go
similarity index 98%
rename from vendor/github.com/cznic/exp/lldb/xact.go
rename to vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/xact.go
index f9ad1cbfb7..01eac10c4e 100644
--- a/vendor/github.com/cznic/exp/lldb/xact.go
+++ b/vendor/github.com/cznic/ql/vendored/github.com/cznic/exp/lldb/xact.go
@@ -96,6 +96,7 @@ type (
 		parent Filer
 		m      bitFilerMap
 		size   int64
+		sync.Mutex
 	}
 )
 
@@ -130,11 +131,13 @@ func (f *bitFiler) PunchHole(off, size int64) (err error) {
 	if limit := f.size >> bfBits; last > limit {
 		last = limit
 	}
+	f.Lock()
 	for pgI := first; pgI <= last; pgI++ {
 		pg := &bitPage{}
 		pg.flags = allDirtyFlags
 		f.m[pgI] = pg
 	}
+	f.Unlock()
 	return
 }
 
@@ -148,12 +151,14 @@ func (f *bitFiler) ReadAt(b []byte, off int64) (n int, err error) {
 		err = io.EOF
 	}
 	for rem != 0 && avail > 0 {
+		f.Lock()
 		pg := f.m[pgI]
 		if pg == nil {
 			pg = &bitPage{}
 			if f.parent != nil {
 				_, err = f.parent.ReadAt(pg.data[:], off&^bfMask)
 				if err != nil && !fileutil.IsEOF(err) {
+					f.Unlock()
 					return
 				}
 
@@ -161,6 +166,7 @@ func (f *bitFiler) ReadAt(b []byte, off int64) (n int, err error) {
 			}
 			f.m[pgI] = pg
 		}
+		f.Unlock()
 		nc := copy(b[:mathutil.Min(rem, bfSize)], pg.data[pgO:])
 		pgI++
 		pgO = 0
@@ -173,6 +179,8 @@ func (f *bitFiler) ReadAt(b []byte, off int64) (n int, err error) {
 }
 
 func (f *bitFiler) Truncate(size int64) (err error) {
+	f.Lock()
+	defer f.Unlock()
 	switch {
 	case size < 0:
 		return &ErrINVAL{"Truncate size", size}
@@ -206,12 +214,14 @@ func (f *bitFiler) WriteAt(b []byte, off int64) (n int, err error) {
 	rem := n
 	var nc int
 	for rem != 0 {
+		f.Lock()
 		pg := f.m[pgI]
 		if pg == nil {
 			pg = &bitPage{}
 			if f.parent != nil {
 				_, err = f.parent.ReadAt(pg.data[:], off&^bfMask)
 				if err != nil && !fileutil.IsEOF(err) {
+					f.Unlock()
 					return
 				}
 
@@ -219,6 +229,7 @@ func (f *bitFiler) WriteAt(b []byte, off int64) (n int, err error) {
 			}
 			f.m[pgI] = pg
 		}
+		f.Unlock()
 		nc = copy(pg.data[pgO:], b)
 		pgI++
 		pg.dirty = true
@@ -246,6 +257,8 @@ func (f *bitFiler) link() {
 }
 
 func (f *bitFiler) dumpDirty(w io.WriterAt) (nwr int, err error) {
+	f.Lock()
+	defer f.Unlock()
 	f.link()
 	for pgI, pg := range f.m {
 		if !pg.dirty {

From 86a318c6fa892a567dbbc9ae92c423fdf3af2379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Jan 2016 16:25:35 +0100
Subject: [PATCH 0476/1304] *: add stop for nspawn flavor

The stage1 implementation sends SIGTERM to systemd-nspawn, which causes
an orderly shutdown of stage1.
---
 rkt/stop.go                | 86 ++++++++++++++++++++++++++++++++++++++
 stage0/entrypoint.go       |  1 +
 stage0/stop.go             | 50 ++++++++++++++++++++++
 stage1/aci/aci-manifest.in |  4 ++
 stage1/secondary-stuff.mk  |  1 +
 stage1/stop/stop.go        | 52 +++++++++++++++++++++++
 stage1/stop/stop.mk        | 13 ++++++
 7 files changed, 207 insertions(+)
 create mode 100644 rkt/stop.go
 create mode 100644 stage0/stop.go
 create mode 100644 stage1/stop/stop.go
 create mode 100644 stage1/stop/stop.mk

diff --git a/rkt/stop.go b/rkt/stop.go
new file mode 100644
index 0000000000..1c4a05c9a4
--- /dev/null
+++ b/rkt/stop.go
@@ -0,0 +1,86 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/coreos/rkt/stage0"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdStop = &cobra.Command{
+		Use:   "stop UUID ...",
+		Short: "Stop a pod",
+		Run:   runWrapper(runStop),
+	}
+)
+
+func init() {
+	cmdRkt.AddCommand(cmdStop)
+}
+
+func runStop(cmd *cobra.Command, args []string) (exit int) {
+	var podUUID *types.UUID
+	var podUUIDs []*types.UUID
+	var errors int
+
+	if len(args) < 1 {
+		cmd.Usage()
+		return 1
+	}
+
+	for _, uuid := range args {
+		podUUID, err := resolveUUID(uuid)
+		if err != nil {
+			stderr.PrintE("stop: unable to resolve UUID: %v", err)
+		} else {
+			podUUIDs = append(podUUIDs, podUUID)
+		}
+	}
+
+	for _, podUUID = range podUUIDs {
+		p, err := getPod(podUUID)
+		if err != nil {
+			errors++
+			stderr.PrintE("stop: cannot get pod", err)
+		}
+
+		if !p.isRunning() {
+			stderr.Error(fmt.Errorf("stop: pod %q is not running", p.uuid))
+			errors++
+			continue
+		}
+
+		if err := stage0.StopPod(p.path()); err == nil {
+			stdout.Printf("%q", p.uuid)
+		} else {
+			stderr.PrintE(fmt.Sprintf("stop: error stopping %q", p.uuid), err)
+			errors++
+		}
+	}
+
+	if errors > 0 {
+		stderr.Error(fmt.Errorf("stop: failed to stop %d pod(s)", errors))
+		return 1
+	}
+
+	return 0
+}
diff --git a/stage0/entrypoint.go b/stage0/entrypoint.go
index bee93c3166..87e03f1b75 100644
--- a/stage0/entrypoint.go
+++ b/stage0/entrypoint.go
@@ -31,6 +31,7 @@ const (
 	enterEntrypoint = "coreos.com/rkt/stage1/enter"
 	runEntrypoint   = "coreos.com/rkt/stage1/run"
 	gcEntrypoint    = "coreos.com/rkt/stage1/gc"
+	stopEntrypoint  = "coreos.com/rkt/stage1/stop"
 )
 
 // getStage1Entrypoint retrieves the named entrypoint from the stage1 manifest for a given pod
diff --git a/stage0/stop.go b/stage0/stop.go
new file mode 100644
index 0000000000..d61a441884
--- /dev/null
+++ b/stage0/stop.go
@@ -0,0 +1,50 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package stage0
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/coreos/rkt/common"
+)
+
+func StopPod(dir string) error {
+	s1rootfs := common.Stage1RootfsPath(dir)
+
+	if err := os.Chdir(dir); err != nil {
+		return fmt.Errorf("failed changing to dir: %v", err)
+	}
+
+	ep, err := getStage1Entrypoint(dir, stopEntrypoint)
+	if err != nil {
+		return fmt.Errorf("rkt stop not implemented for pod's stage1: %v", err)
+	}
+	args := []string{filepath.Join(s1rootfs, ep)}
+	debug("Execing %s", ep)
+
+	c := exec.Cmd{
+		Path:   args[0],
+		Args:   args,
+		Stdout: os.Stdout,
+		Stderr: os.Stderr,
+	}
+
+	return c.Run()
+}
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index 73284b9e9c..6daa640ad6 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -29,6 +29,10 @@
             "name": "coreos.com/rkt/stage1/gc",
             "value": "/gc"
         },
+        {
+            "name": "coreos.com/rkt/stage1/stop",
+            "value": "/stop"
+        },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
             "value": "2"
diff --git a/stage1/secondary-stuff.mk b/stage1/secondary-stuff.mk
index e80be4ec8b..24c2ab397d 100644
--- a/stage1/secondary-stuff.mk
+++ b/stage1/secondary-stuff.mk
@@ -9,6 +9,7 @@ _S1_SS_SUBDIRS_ := \
 	net-plugins \
 	prepare-app \
 	reaper \
+	stop \
 	units \
 	aci
 
diff --git a/stage1/stop/stop.go b/stage1/stop/stop.go
new file mode 100644
index 0000000000..122ed7f099
--- /dev/null
+++ b/stage1/stop/stop.go
@@ -0,0 +1,52 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"syscall"
+)
+
+func readIntFromFile(path string) (i int, err error) {
+	b, err := ioutil.ReadFile(path)
+	if err != nil {
+		return
+	}
+	_, err = fmt.Sscanf(string(b), "%d", &i)
+	return
+}
+
+func stop() int {
+	pid, err := readIntFromFile("ppid")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
+		return 1
+	}
+
+	if err := syscall.Kill(pid, syscall.SIGTERM); err != nil {
+		fmt.Fprintf(os.Stderr, "error sending SIGTERM: %v\n", err)
+		return 1
+	}
+
+	return 0
+}
+
+func main() {
+	os.Exit(stop())
+}
diff --git a/stage1/stop/stop.mk b/stage1/stop/stop.mk
new file mode 100644
index 0000000000..933a8d4f1b
--- /dev/null
+++ b/stage1/stop/stop.mk
@@ -0,0 +1,13 @@
+STP_FLAVORS := $(filter-out kvm,$(STAGE1_FLAVORS))
+
+ifneq ($(STP_FLAVORS),)
+
+ASGB_FLAVORS := $(STP_FLAVORS)
+
+$(foreach f,$(ASGB_FLAVORS),$(eval STAGE1_STOP_CMD_$f := /stop))
+
+include stage1/makelib/aci_simple_go_bin.mk
+
+endif
+
+$(call undefine-namespaces,STP)

From 5fab5cd456c58f97b12d2ce5a5deda55afde6233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Jan 2016 17:01:53 +0100
Subject: [PATCH 0477/1304] *: add stop for fly flavor

The stage1 implementation sends SIGTERM to the process started by rkt
fly.
---
 stage1/stop/stop_fly.mk        | 1 +
 stage1_fly/aci/aci-manifest.in | 4 ++++
 stage1_fly/stage1_fly.mk       | 2 ++
 3 files changed, 7 insertions(+)
 create mode 100644 stage1/stop/stop_fly.mk

diff --git a/stage1/stop/stop_fly.mk b/stage1/stop/stop_fly.mk
new file mode 100644
index 0000000000..bb177a3da7
--- /dev/null
+++ b/stage1/stop/stop_fly.mk
@@ -0,0 +1 @@
+include stage1_fly/makelib/aci_binary.mk
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index 598c409eb5..45f7df2199 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -28,6 +28,10 @@
         {
             "name": "coreos.com/rkt/stage1/gc",
             "value": "/gc"
+        },
+        {
+            "name": "coreos.com/rkt/stage1/stop",
+            "value": "/stop_fly"
         }
     ]
 }
diff --git a/stage1_fly/stage1_fly.mk b/stage1_fly/stage1_fly.mk
index d9fe3149ea..01d42cf32a 100644
--- a/stage1_fly/stage1_fly.mk
+++ b/stage1_fly/stage1_fly.mk
@@ -9,6 +9,8 @@ $(call setup-stamp-file,FLY_STAMP,aci-build)
 
 $(call inc-many,$(foreach sd,$(FLY_SUBDIRS),$(sd)/$(sd).mk))
 
+$(call inc-one,../stage1/stop/stop_fly.mk)
+
 $(call generate-stamp-rule,$(FLY_STAMP),$(FLY_STAMPS) $(ACTOOL_STAMP),, \
 	$(call vb,vt,ACTOOL,$(call vsp,$(FLY_STAGE1))) \
 	"$(ACTOOL)" build --overwrite --owner-root "$(FLY_ACIDIR)" "$(FLY_STAGE1)")

From a3df18315ef57dceb1200017657b6848650f8f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 12 Jan 2016 14:25:22 +0100
Subject: [PATCH 0478/1304] Documentation: add the stop entrypoint to stage1
 implementors doc

---
 Documentation/devel/stage1-implementors-guide.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 72d31baee7..0422f87c57 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -104,6 +104,17 @@ For example, it removes the network namespace of a pod.
 * `--debug` to activate debugging
 * UUID of the pod
 
+### `rkt stop` => "coreos.com/rkt/stage1/stop"
+
+The optional stop entrypoint initiates an orderly shutdown of stage1.
+
+In the bundled rkt stage 1, the entrypoint is sending SIGTERM signal to systemd-nspawn. Fore kvm flavor, it is calling `systemctl halt` on the container (through SSH) for kvm flavor
+
+#### Arguments
+
+* `--force` to force the stopping of the pod. E.g. in the bundled rkt stage 1, stop sends SIGKILL
+* UUID of the pod
+
 ## Versioning
 
 The stage1 command line interface is versioned using an annotation with the name `coreos.com/rkt/stage1/interface-version`.
@@ -147,6 +158,10 @@ The current version of the stage1 interface is 2.
             "name": "coreos.com/rkt/stage1/gc",
             "value": "/ex/gc"
         },
+        {
+            "name": "coreos.com/rkt/stage1/stop",
+            "value": "/ex/stop"
+        },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
             "value": "2"

From d7a5ea25e469d15813d2f3a290d5d78a7162c092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 12 Jan 2016 15:42:39 +0100
Subject: [PATCH 0479/1304] Documentation: add rkt stop docs

---
 Documentation/commands.md         |  1 +
 Documentation/subcommands/stop.md | 32 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 Documentation/subcommands/stop.md

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 19e9ce852c..2dccab7551 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -28,6 +28,7 @@ If an ACI hasn't been cached on disk, rkt will attempt to find and download it.
 To use rkt's [metadata service][metadata-spec], enable registration with the `--mds-register` flag when [invoking it][rkt-mds].
 
 * [run](subcommands/run.md)
+* [stop](subcommands/stop.md)
 * [enter](subcommands/enter.md)
 * [prepare](subcommands/prepare.md)
 * [run-prepared](subcommands/run-prepared.md)
diff --git a/Documentation/subcommands/stop.md b/Documentation/subcommands/stop.md
new file mode 100644
index 0000000000..692df74803
--- /dev/null
+++ b/Documentation/subcommands/stop.md
@@ -0,0 +1,32 @@
+# rkt stop
+
+Given a list of pod UUIDs, rkt stop will shut them down, for the shipped stage1 images, this means:
+
+* default systemd-nspawn stage1: the apps in the pod receive a TERM signal and, after a timeout, a KILL signal.
+* kvm stage1: the virtual machine is shut down with `systemctl halt`.
+* rkt fly stage1: the app receives a TERM signal.
+
+The `--force` flag will stop a pod forcibly, that is:
+
+* default systemd-nspawn stage1: the container is killed.
+* kvm stage1: the lkvm process receives a KILL signal.
+* rkt fly stage1: the app receives a KILL signal.
+
+```
+# rkt stop 387fc8eb cbbf5c01
+"387fc8eb-eabd-4e77-b080-d8c0001eb50c"
+"cbbf5c01-dd52-4ccc-a1e0-cfd8f1e88418"
+# rkt stop --force 93e516b0
+"93e516b0-e84b-40cf-a45b-531b14dfcce2"
+```
+
+## Other ways to stop a rkt pod
+
+If you started rkt as a systemd service, you can stop the pod with `systemctl stop`.
+
+If you started rkt interactively:
+
+* For a stage1 with systemd-nspawn, you can stop the pod by pressing `^]` three times within 5 seconds.
+If you're using systemd on the host, you can also use `machinectl` with the `poweroff` or `terminate` subcommand.
+* For a stage1 with kvm, you can stop the pod by pressing Ctrl+A and then x.
+

From 58ca25c7f22864b329701853d334e7d3a58bf463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 14 Jan 2016 13:42:18 +0100
Subject: [PATCH 0480/1304] *: add a pod uuid argument to stage1's stop and
 --force

Makes getting the lkvm VM name less ugly.

Add --force to forcibly stopping a pod.
---
 rkt/stop.go         |  4 +++-
 stage0/stop.go      | 10 +++++++++-
 stage1/stop/stop.go | 24 ++++++++++++++++++++----
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/rkt/stop.go b/rkt/stop.go
index 1c4a05c9a4..4df0b9539c 100644
--- a/rkt/stop.go
+++ b/rkt/stop.go
@@ -31,10 +31,12 @@ var (
 		Short: "Stop a pod",
 		Run:   runWrapper(runStop),
 	}
+	flagForce bool
 )
 
 func init() {
 	cmdRkt.AddCommand(cmdStop)
+	cmdStop.Flags().BoolVar(&flagForce, "force", false, "forced stopping")
 }
 
 func runStop(cmd *cobra.Command, args []string) (exit int) {
@@ -69,7 +71,7 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 			continue
 		}
 
-		if err := stage0.StopPod(p.path()); err == nil {
+		if err := stage0.StopPod(p.path(), flagForce, podUUID); err == nil {
 			stdout.Printf("%q", p.uuid)
 		} else {
 			stderr.PrintE(fmt.Sprintf("stop: error stopping %q", p.uuid), err)
diff --git a/stage0/stop.go b/stage0/stop.go
index d61a441884..d0fa040108 100644
--- a/stage0/stop.go
+++ b/stage0/stop.go
@@ -23,9 +23,11 @@ import (
 	"path/filepath"
 
 	"github.com/coreos/rkt/common"
+
+	"github.com/appc/spec/schema/types"
 )
 
-func StopPod(dir string) error {
+func StopPod(dir string, force bool, uuid *types.UUID) error {
 	s1rootfs := common.Stage1RootfsPath(dir)
 
 	if err := os.Chdir(dir); err != nil {
@@ -39,6 +41,12 @@ func StopPod(dir string) error {
 	args := []string{filepath.Join(s1rootfs, ep)}
 	debug("Execing %s", ep)
 
+	if force {
+		args = append(args, "--force")
+	}
+
+	args = append(args, uuid.String())
+
 	c := exec.Cmd{
 		Path:   args[0],
 		Args:   args,
diff --git a/stage1/stop/stop.go b/stage1/stop/stop.go
index 122ed7f099..e191e223f5 100644
--- a/stage1/stop/stop.go
+++ b/stage1/stop/stop.go
@@ -17,12 +17,21 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"syscall"
 )
 
+var (
+	force bool
+)
+
+func init() {
+	flag.BoolVar(&force, "force", false, "Forced stopping")
+}
+
 func readIntFromFile(path string) (i int, err error) {
 	b, err := ioutil.ReadFile(path)
 	if err != nil {
@@ -32,15 +41,15 @@ func readIntFromFile(path string) (i int, err error) {
 	return
 }
 
-func stop() int {
+func stop(signal syscall.Signal) int {
 	pid, err := readIntFromFile("ppid")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
 		return 1
 	}
 
-	if err := syscall.Kill(pid, syscall.SIGTERM); err != nil {
-		fmt.Fprintf(os.Stderr, "error sending SIGTERM: %v\n", err)
+	if err := syscall.Kill(pid, signal); err != nil {
+		fmt.Fprintf(os.Stderr, "error sending %v: %v\n", signal, err)
 		return 1
 	}
 
@@ -48,5 +57,12 @@ func stop() int {
 }
 
 func main() {
-	os.Exit(stop())
+	flag.Parse()
+
+	signal := syscall.SIGTERM
+	if force {
+		signal = syscall.SIGKILL
+	}
+
+	os.Exit(stop(signal))
 }

From c35aa6f7a69c3a850b52d292486dde4bde6c19a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 20 Jan 2016 14:37:49 +0100
Subject: [PATCH 0481/1304] functional tests: remove useless temp dir

---
 tests/rkt_list_test.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index 117930c117..a0ed5032df 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -57,9 +57,6 @@ func TestRktList(t *testing.T) {
 	// Get hash
 	imageID := fmt.Sprintf("sha512-%s", imgID.hash[:12])
 
-	tmpDir := createTempDirOrPanic(imgName)
-	defer os.RemoveAll(tmpDir)
-
 	// Define tests
 	tests := []struct {
 		cmd           string

From d219e2e5d83d0e05a2ec34c0b980c4f7d835443f Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 29 Jun 2016 19:24:57 -0700
Subject: [PATCH 0482/1304] stage1/fly: respect runtimeApp App's MountPoints

* Fixes a bug where MountPoints from the PodManifest App's weren't
  processed
* Refactor code and add comments
---
 stage1_fly/run/main.go | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 77cf287ad6..0a6ac2b0aa 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -110,15 +110,24 @@ func init() {
 	flag.StringVar(&discardString, "local-config", common.DefaultLocalConfigDir, "Local config path")
 }
 
+func checkAndAddMps(namedVolumeMounts map[types.ACName]volumeMountTuple, mountpoints []types.MountPoint) error {
+	for _, mp := range mountpoints {
+		tuple, exists := namedVolumeMounts[mp.Name]
+		switch {
+		case exists && tuple.M.Path != mp.Path:
+			return fmt.Errorf("conflicting path information from mount and mountpoint %q", mp.Name)
+		case !exists:
+			namedVolumeMounts[mp.Name] = volumeMountTuple{M: schema.Mount{Volume: mp.Name, Path: mp.Path}}
+			diag.Printf("adding %+v", namedVolumeMounts[mp.Name])
+		}
+	}
+	return nil
+}
+
 func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMount, error) {
-	imApp := p.Images[app].App
 	namedVolumeMounts := map[types.ACName]volumeMountTuple{}
 
-	var manifestMPs []types.MountPoint
-	if imApp != nil {
-		manifestMPs = imApp.MountPoints
-	}
-
+	// Insert the PodManifest's first RuntimeApp's Mounts
 	for _, m := range p.Manifest.Apps[0].Mounts {
 		_, exists := namedVolumeMounts[m.Volume]
 		if exists {
@@ -129,17 +138,20 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 	}
 
 	// Merge command-line Mounts with ImageManifest's MountPoints
-	for _, mp := range manifestMPs {
-		tuple, exists := namedVolumeMounts[mp.Name]
-		switch {
-		case exists && tuple.M.Path != mp.Path:
-			return nil, fmt.Errorf("conflicting path information from mount and mountpoint %q", mp.Name)
-		case !exists:
-			namedVolumeMounts[mp.Name] = volumeMountTuple{M: schema.Mount{Volume: mp.Name, Path: mp.Path}}
-			diag.Printf("adding %+v", namedVolumeMounts[mp.Name])
+	var imAppManifestMPs []types.MountPoint
+	if imApp := p.Images[app].App; imApp != nil {
+		imAppManifestMPs = imApp.MountPoints
+		if err := checkAndAddMps(namedVolumeMounts, imAppManifestMPs); err != nil {
+			return nil, err
 		}
 	}
 
+	// Merge command-line Mounts with PodManifest's RuntimeApp's App's MountPoints
+	raApp := p.Manifest.Apps[0]
+	if err := checkAndAddMps(namedVolumeMounts, raApp.App.MountPoints); err != nil {
+		return nil, err
+	}
+
 	// Insert the command-line Volumes
 	for _, v := range p.Manifest.Volumes {
 		// Check if we have a mount for this volume
@@ -155,7 +167,7 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 	}
 
 	// Merge command-line Volumes with ImageManifest's MountPoints
-	for _, mp := range manifestMPs {
+	for _, mp := range imAppManifestMPs {
 		// Check if we have a volume for this mountpoint
 		tuple, exists := namedVolumeMounts[mp.Name]
 		if !exists || tuple.V.Name == "" {

From a1b9ca65807d894b7001b74d491db81421b62483 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 30 Jun 2016 12:18:03 -0700
Subject: [PATCH 0483/1304] stage1/fly tests: cover CLI mounts

---
 tests/rkt_fly_test.go | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/rkt_fly_test.go b/tests/rkt_fly_test.go
index 7001a3580b..edf3d70eb1 100644
--- a/tests/rkt_fly_test.go
+++ b/tests/rkt_fly_test.go
@@ -18,7 +18,9 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/coreos/rkt/tests/testutils"
@@ -52,3 +54,25 @@ func TestFlyNetns(t *testing.T) {
 		t.Fatalf("container left host netns")
 	}
 }
+
+func TestFlyMountCLI(t *testing.T) {
+	tmpDir := createTempDirOrPanic("rkt-mount-test-")
+	defer os.RemoveAll(tmpDir)
+	mountSrcFile := filepath.Join(tmpDir, "hello")
+	if err := ioutil.WriteFile(mountSrcFile, []byte("world"), 0600); err != nil {
+		t.Fatalf("Cannot write file: %v", err)
+	}
+
+	testImageArgs := []string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", mountSrcFile)}
+	testImage := patchTestACI("rkt-inspect-stage1-fly.aci", testImageArgs...)
+	defer os.Remove(testImage)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	paramMount := fmt.Sprintf("--volume=test,kind=host,source=%s --mount volume=test,target=%s", mountSrcFile, mountSrcFile)
+	cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s %s", ctx.Cmd(), testImage, paramMount)
+	child := spawnOrFail(t, cmd)
+	ctx.RegisterChild(child)
+	waitOrFail(t, child, 0)
+}

From d4f5178b15ddefd7457d1a26b7f0d9eedd5ead14 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 30 Jun 2016 13:35:16 -0700
Subject: [PATCH 0484/1304] stage1/fly tests: cover PodManifest MountPoints

---
 tests/rkt_fly_test.go | 142 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)

diff --git a/tests/rkt_fly_test.go b/tests/rkt_fly_test.go
index edf3d70eb1..63cc697fa4 100644
--- a/tests/rkt_fly_test.go
+++ b/tests/rkt_fly_test.go
@@ -20,9 +20,13 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
+	"strings"
 	"testing"
 
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/tests/testutils"
 )
 
@@ -76,3 +80,141 @@ func TestFlyMountCLI(t *testing.T) {
 	ctx.RegisterChild(child)
 	waitOrFail(t, child, 0)
 }
+
+// TODO: unite this with rkt_run_pod_manifest_test.go {
+type imagePatch struct {
+	name    string
+	patches []string
+}
+
+const baseAppName = "rkt-inspect"
+
+func verifyHostFile(t *testing.T, tmpdir, filename string, i int, expectedResult string) {
+	filePath := path.Join(tmpdir, filename)
+	defer os.Remove(filePath)
+
+	// Verify the file is written to host.
+	if strings.Contains(expectedResult, "host:") {
+		data, err := ioutil.ReadFile(filePath)
+		if err != nil {
+			t.Fatalf("%d: Cannot read the host file: %v", i, err)
+		}
+		if string(data) != expectedResult {
+			t.Fatalf("%d: Expecting %q in the host file, but saw %q", i, expectedResult, data)
+		}
+	}
+}
+
+func TestFlyMountPodManifest(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	tmpdir := createTempDirOrPanic("rkt-tests.")
+	defer os.RemoveAll(tmpdir)
+
+	tests := []struct {
+		// [image name]:[image patches]
+		images         []imagePatch
+		podManifest    *schema.PodManifest
+		expectedExit   int
+		expectedResult string
+	}{
+		{
+			// Simple read after write with volume mounted in a read-only rootfs.
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-read-only-rootfs-vol-rw.aci", []string{}},
+			},
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--write-file", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", "/dir1/file"},
+								{"CONTENT", "host:foo"},
+							},
+							MountPoints: []types.MountPoint{
+								{"dir1", "/dir1", false},
+							},
+						},
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+				},
+			},
+			0,
+			"host:foo",
+		},
+	}
+
+	for i, tt := range tests {
+		var hashesToRemove []string
+		for j, v := range tt.images {
+			hash := patchImportAndFetchHash(v.name, v.patches, t, ctx)
+			hashesToRemove = append(hashesToRemove, hash)
+			imgName := types.MustACIdentifier(v.name)
+			imgID, err := types.NewHash(hash)
+			if err != nil {
+				t.Fatalf("Cannot generate types.Hash from %v: %v", hash, err)
+			}
+
+			ra := &tt.podManifest.Apps[j]
+			ra.Image.Name = imgName
+			ra.Image.ID = *imgID
+		}
+
+		tt.podManifest.ACKind = schema.PodManifestKind
+		tt.podManifest.ACVersion = schema.AppContainerVersion
+
+		manifestFile := generatePodManifestFile(t, tt.podManifest)
+		defer os.Remove(manifestFile)
+
+		// 1. Test 'rkt run'.
+		runCmd := fmt.Sprintf("%s run --mds-register=false --pod-manifest=%s", ctx.Cmd(), manifestFile)
+		t.Logf("Running 'run' test #%v", i)
+		child := spawnOrFail(t, runCmd)
+		ctx.RegisterChild(child)
+
+		if tt.expectedResult != "" {
+			if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
+				t.Errorf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
+				continue
+			}
+		}
+		waitOrFail(t, child, tt.expectedExit)
+		verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
+
+		// 2. Test 'rkt prepare' + 'rkt run-prepared'.
+		rktCmd := fmt.Sprintf("%s --insecure-options=image prepare --pod-manifest=%s",
+			ctx.Cmd(), manifestFile)
+		uuid := runRktAndGetUUID(t, rktCmd)
+
+		runPreparedCmd := fmt.Sprintf("%s run-prepared --mds-register=false %s", ctx.Cmd(), uuid)
+		t.Logf("Running 'run-prepared' test #%v", i)
+		child = spawnOrFail(t, runPreparedCmd)
+
+		if tt.expectedResult != "" {
+			if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
+				t.Errorf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
+				continue
+			}
+		}
+
+		waitOrFail(t, child, tt.expectedExit)
+		verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
+
+		// we run the garbage collector and remove the imported images to save
+		// space
+		runGC(t, ctx)
+		for _, h := range hashesToRemove {
+			removeFromCas(t, ctx, h)
+		}
+	}
+}
+
+// }

From 682ef169b715d84e820467bfc02a74c885e7bee5 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 30 Jun 2016 17:23:21 -0700
Subject: [PATCH 0485/1304] stage1/fly tests: cover duplicate mount target via
 CLI

---
 stage1_fly/run/main.go |  6 +++---
 tests/rkt_fly_test.go  | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 0a6ac2b0aa..85f81e4758 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -110,7 +110,7 @@ func init() {
 	flag.StringVar(&discardString, "local-config", common.DefaultLocalConfigDir, "Local config path")
 }
 
-func checkAndAddMps(namedVolumeMounts map[types.ACName]volumeMountTuple, mountpoints []types.MountPoint) error {
+func addMountPoints(namedVolumeMounts map[types.ACName]volumeMountTuple, mountpoints []types.MountPoint) error {
 	for _, mp := range mountpoints {
 		tuple, exists := namedVolumeMounts[mp.Name]
 		switch {
@@ -141,14 +141,14 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 	var imAppManifestMPs []types.MountPoint
 	if imApp := p.Images[app].App; imApp != nil {
 		imAppManifestMPs = imApp.MountPoints
-		if err := checkAndAddMps(namedVolumeMounts, imAppManifestMPs); err != nil {
+		if err := addMountPoints(namedVolumeMounts, imAppManifestMPs); err != nil {
 			return nil, err
 		}
 	}
 
 	// Merge command-line Mounts with PodManifest's RuntimeApp's App's MountPoints
 	raApp := p.Manifest.Apps[0]
-	if err := checkAndAddMps(namedVolumeMounts, raApp.App.MountPoints); err != nil {
+	if err := addMountPoints(namedVolumeMounts, raApp.App.MountPoints); err != nil {
 		return nil, err
 	}
 
diff --git a/tests/rkt_fly_test.go b/tests/rkt_fly_test.go
index 63cc697fa4..5aadef70e3 100644
--- a/tests/rkt_fly_test.go
+++ b/tests/rkt_fly_test.go
@@ -74,14 +74,36 @@ func TestFlyMountCLI(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	paramMount := fmt.Sprintf("--volume=test,kind=host,source=%s --mount volume=test,target=%s", mountSrcFile, mountSrcFile)
-	cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s %s", ctx.Cmd(), testImage, paramMount)
-	child := spawnOrFail(t, cmd)
-	ctx.RegisterChild(child)
-	waitOrFail(t, child, 0)
+	testParams := []struct {
+		mountParam   string
+		expectedExit int
+	}{
+		{
+			fmt.Sprintf(
+				"--volume=test,kind=host,source=%s --mount volume=test,target=%s",
+				mountSrcFile, mountSrcFile,
+			),
+			0,
+		},
+		{
+			fmt.Sprintf(
+				"--volume=test1,kind=host,source=%s --mount volume=test1,target=%s --volume=test2,kind=host,source=%s --mount volume=test1,target=%s",
+				mountSrcFile, mountSrcFile,
+				mountSrcFile, mountSrcFile,
+			),
+			1, /* TODO: decide on consistency with other stage1s */
+		},
+	}
+
+	for _, testParam := range testParams {
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s %s", ctx.Cmd(), testImage, testParam.mountParam)
+		child := spawnOrFail(t, cmd)
+		ctx.RegisterChild(child)
+		waitOrFail(t, child, testParam.expectedExit)
+	}
 }
 
-// TODO: unite this with rkt_run_pod_manifest_test.go {
+// TODO: unite this with rkt_run_pod_manifest_test.go
 type imagePatch struct {
 	name    string
 	patches []string
@@ -216,5 +238,3 @@ func TestFlyMountPodManifest(t *testing.T) {
 		}
 	}
 }
-
-// }

From c22feba7b10b75e44becf75130c53dbce80e94b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Thu, 9 Jun 2016 12:03:51 +0200
Subject: [PATCH 0486/1304] KVM/networking: Add flannel default gateway parsing

---
 networking/kvm.go        | 32 ++++++++++++++++++++++++++++++++
 networking/networking.go |  5 +++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index 1dd0c5bedb..882104e32e 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -378,6 +378,10 @@ func kvmTransformFlannelNetwork(net *activeNet) error {
 		n.Delegate["type"] = "bridge"
 	}
 
+	if !hasKey(n.Delegate, "isDefaultGateway") {
+		n.Delegate["isDefaultGateway"] = false
+	}
+
 	if !hasKey(n.Delegate, "ipMasq") {
 		// if flannel is not doing ipmasq, we should
 		ipmasq := !fenv.ipmasq
@@ -420,6 +424,7 @@ func kvmTransformFlannelNetwork(net *activeNet) error {
 	net.conf.Type = n.Delegate["type"].(string)
 	net.conf.IPMasq = n.Delegate["ipMasq"].(bool)
 	net.conf.MTU = n.Delegate["mtu"].(int)
+	net.conf.IsDefaultGateway = n.Delegate["isDefaultGateway"].(bool)
 	net.conf.IPAM.Type = "host-local"
 	return nil
 }
@@ -436,6 +441,15 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 		},
 	}
 	var e error
+
+	// If there's a network set as default in CNI configuration
+	defaultGatewaySet := false
+
+	_, defaultNet, err := net.ParseCIDR("0.0.0.0/0")
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("error when parsing net address"), err)
+	}
+
 	network.nets, e = network.loadNets()
 	if e != nil {
 		return nil, errwrap.Wrap(errors.New("error loading network definitions"), e)
@@ -517,6 +531,15 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 				return nil, err
 			}
 
+			if n.conf.IsDefaultGateway {
+				n.runtime.IP4.Routes = append(
+					n.runtime.IP4.Routes,
+					cnitypes.Route{Dst: *defaultNet, GW: n.runtime.IP4.Gateway},
+				)
+				defaultGatewaySet = true
+				config.IsGw = true
+			}
+
 			if config.IsGw {
 				err = ensureHasAddr(
 					br,
@@ -552,6 +575,15 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 			return nil, fmt.Errorf("network %q have unsupported type: %q", n.conf.Name, n.conf.Type)
 		}
 
+		// Check if there's any other network set as default gateway
+		if defaultGatewaySet {
+			for _, route := range n.runtime.IP4.Routes {
+				if (defaultNet.String() == route.Dst.String()) && !n.conf.IsDefaultGateway {
+					return nil, fmt.Errorf("flannel config enables default gateway and IPAM sets default gateway via %q", n.runtime.IP4.Gateway)
+				}
+			}
+		}
+
 		if n.conf.IPMasq {
 			chain := cniutils.FormatChainName(n.conf.Name, podID.String())
 			comment := cniutils.FormatChainName(n.conf.Name, podID.String())
diff --git a/networking/networking.go b/networking/networking.go
index 1d6cd4b10a..572ed19fa9 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -53,8 +53,9 @@ type Networking struct {
 // similar to CNI plugins
 type NetConf struct {
 	cnitypes.NetConf
-	IPMasq bool `json:"ipMasq"`
-	MTU    int  `json:"mtu"`
+	IPMasq           bool `json:"ipMasq"`
+	MTU              int  `json:"mtu"`
+	IsDefaultGateway bool `json:"isDefaultGateway"`
 }
 
 var stderr *log.Logger

From 5de70cf818f2240a671bcca57308abc7af5551ef Mon Sep 17 00:00:00 2001
From: Lukas Redynk <lukasz.redynk@intel.com>
Date: Mon, 20 Jun 2016 17:39:21 +0200
Subject: [PATCH 0487/1304] tests: default gateway with flannel and netName for
 kvm

* test checking if default gateway was set when using flannel-based network
* test for preserving netName in kvm flavor
---
 tests/rkt_net_kvm_test.go       |   8 ++
 tests/rkt_net_nspawn_test.go    |   4 +
 tests/rkt_net_test.go           | 195 +++++++++++++++++++++++++++++---
 tests/rkt_socket_proxyd_test.go |   2 +-
 tests/testutils/iputils.go      |  11 +-
 5 files changed, 199 insertions(+), 21 deletions(-)

diff --git a/tests/rkt_net_kvm_test.go b/tests/rkt_net_kvm_test.go
index 70fac2773a..274823949f 100644
--- a/tests/rkt_net_kvm_test.go
+++ b/tests/rkt_net_kvm_test.go
@@ -40,3 +40,11 @@ func TestNetLongName(t *testing.T) {
 func TestNetDefaultRestrictedConnectivity(t *testing.T) {
 	NewTestNetDefaultRestrictedConnectivity().Execute(t)
 }
+
+func TestNetPreserveNetName(t *testing.T) {
+	NewNetPreserveNetNameTest().Execute(t)
+}
+
+func TestNetDefaultGW(t *testing.T) {
+	NewNetDefaultGWTest().Execute(t)
+}
diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index 376f2ca5e5..636f7a55be 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -75,3 +75,7 @@ func TestNetLongName(t *testing.T) {
 func TestNetDefaultRestrictedConnectivity(t *testing.T) {
 	NewTestNetDefaultRestrictedConnectivity().Execute(t)
 }
+
+func TestNetDefaultGW(t *testing.T) {
+	NewNetDefaultGWTest().Execute(t)
+}
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index 8bd7c0be55..ac66eeb40f 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -19,12 +19,16 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
+	"syscall"
 	"testing"
 	"time"
 
+	"github.com/coreos/rkt/networking/netinfo"
 	"github.com/coreos/rkt/tests/testutils"
 	"github.com/coreos/rkt/tests/testutils/logger"
 	"github.com/vishvananda/netlink"
@@ -373,7 +377,7 @@ var (
 		Bridge:    "bridge1",
 		IpMasq:    true,
 		IsGateway: true,
-		Ipam: ipamTemplateT{
+		Ipam: &ipamTemplateT{
 			Type:   "host-local",
 			Subnet: "11.11.5.0/24",
 			Routes: []map[string]string{
@@ -496,26 +500,33 @@ func writeNetwork(t *testing.T, net networkTemplateT, netd string) error {
 }
 
 type networkTemplateT struct {
-	Name      string
-	Type      string
-	Master    string `json:"master,omitempty"`
-	IpMasq    bool
-	IsGateway bool
-	Bridge    string `json:"bridge,omitempty"`
-	Ipam      ipamTemplateT
+	Name       string
+	Type       string
+	SubnetFile string `json:"subnetFile,omitempty"`
+	Master     string `json:"master,omitempty"`
+	IpMasq     bool
+	IsGateway  bool
+	Bridge     string             `json:"bridge,omitempty"`
+	Ipam       *ipamTemplateT     `json:",omitempty"`
+	Delegate   *delegateTemplateT `json:",omitempty"`
 }
 
 type ipamTemplateT struct {
-	Type   string
+	Type   string              `json:",omitempty"`
 	Subnet string              `json:"subnet,omitempty"`
 	Routes []map[string]string `json:"routes,omitempty"`
 }
 
+type delegateTemplateT struct {
+	Bridge           string `json:"bridge,omitempty"`
+	IsDefaultGateway bool   `json:"isDefaultGateway"`
+}
+
 func TestNetTemplates(t *testing.T) {
 	net := networkTemplateT{
 		Name: "ptp0",
 		Type: "ptp",
-		Ipam: ipamTemplateT{
+		Ipam: &ipamTemplateT{
 			Type:   "host-local",
 			Subnet: "11.11.3.0/24",
 			Routes: []map[string]string{{"dst": "0.0.0.0/0"}},
@@ -704,7 +715,7 @@ func NewNetCustomPtpTest(runCustomDual bool) testutils.Test {
 			Name:   "ptp0",
 			Type:   "ptp",
 			IpMasq: true,
-			Ipam: ipamTemplateT{
+			Ipam: &ipamTemplateT{
 				Type:   "host-local",
 				Subnet: "11.11.1.0/24",
 				Routes: []map[string]string{
@@ -733,7 +744,7 @@ func NewNetCustomMacvlanTest() testutils.Test {
 			Name:   "macvlan0",
 			Type:   "macvlan",
 			Master: iface.Name,
-			Ipam: ipamTemplateT{
+			Ipam: &ipamTemplateT{
 				Type:   "host-local",
 				Subnet: "11.11.2.0/24",
 			},
@@ -758,7 +769,7 @@ func NewNetCustomBridgeTest() testutils.Test {
 			IpMasq:    true,
 			IsGateway: true,
 			Master:    iface.Name,
-			Ipam: ipamTemplateT{
+			Ipam: &ipamTemplateT{
 				Type:   "host-local",
 				Subnet: "11.11.3.0/24",
 				Routes: []map[string]string{
@@ -788,7 +799,7 @@ func NewNetOverrideTest() testutils.Test {
 			Name:   "overridemacvlan",
 			Type:   "macvlan",
 			Master: iface.Name,
-			Ipam: ipamTemplateT{
+			Ipam: &ipamTemplateT{
 				Type:   "host-local",
 				Subnet: "11.11.4.0/24",
 			},
@@ -827,7 +838,7 @@ func NewTestNetLongName() testutils.Test {
 			Name:   "thisnameiswaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaytoolong",
 			Type:   "ptp",
 			IpMasq: true,
-			Ipam: ipamTemplateT{
+			Ipam: &ipamTemplateT{
 				Type:   "host-local",
 				Subnet: "11.11.6.0/24",
 				Routes: []map[string]string{
@@ -838,3 +849,157 @@ func NewTestNetLongName() testutils.Test {
 		testNetCustomNatConnectivity(t, nt)
 	})
 }
+
+/*
+ * mockFlannelNetwork creates fake flannel network status file and configuration pointing to this network.
+ * We won't have connectivity, but we could check if: netName was correct and if default gateway was set.
+ */
+func mockFlannelNetwork(t *testing.T, ctx *testutils.RktRunCtx) (string, networkTemplateT, error) {
+	// write fake flannel info
+	subnetPath := filepath.Join(ctx.DataDir(), "subnet.env")
+	file, err := os.Create(subnetPath)
+	if err != nil {
+		return "", networkTemplateT{}, err
+	}
+	mockedFlannel := strings.Join([]string{
+		"FLANNEL_NETWORK=11.11.0.0/16",
+		"FLANNEL_SUBNET=11.11.3.1/24",
+		"FLANNEL_MTU=1472",
+		"FLANNEL_IPMASQ=true",
+	}, "\n")
+	if _, err = file.WriteString(mockedFlannel); err != nil {
+		return "", networkTemplateT{}, err
+	}
+
+	file.Close()
+
+	// write net config for "flannel" based network
+	ntFlannel := networkTemplateT{
+		Name:       "rkt.kubernetes.io",
+		Type:       "flannel",
+		SubnetFile: subnetPath,
+		Delegate: &delegateTemplateT{
+			IsDefaultGateway: true,
+		},
+	}
+
+	netdir := prepareTestNet(t, ctx, ntFlannel)
+
+	return netdir, ntFlannel, nil
+}
+
+/*
+ * NewNetPreserveNetNameTest checks if netName is set if network is configured via flannel
+ */
+func NewNetPreserveNetNameTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		netdir, ntFlannel, err := mockFlannelNetwork(t, ctx)
+		if err != nil {
+			t.Errorf("Can't mock flannel network: %v", err)
+		}
+
+		defer os.RemoveAll(netdir)
+		defer os.Remove(ntFlannel.SubnetFile)
+
+		getNetInfo, resumeContainer := make(chan struct{}), make(chan struct{})
+		ga := testutils.NewGoroutineAssistant(t)
+		ga.Add(1)
+
+		podUUIDFile := filepath.Join(ctx.DataDir(), "pod_uuid")
+		defer os.Remove(podUUIDFile)
+		go func() {
+			// start container with 'flannel' network
+			defer ga.Done()
+			testImageArgs := []string{"--exec=/inspect --print-msg=sleeping --sleep=10"}
+			testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+			defer os.Remove(testImage)
+			cmd := fmt.Sprintf("%s --debug --insecure-options=image run --uuid-file-save=%s --net=%s --mds-register=false %s", ctx.Cmd(), podUUIDFile, ntFlannel.Name, testImage)
+			child := ga.SpawnOrFail(cmd)
+			defer ga.WaitOrFail(child)
+
+			// wait until stage2
+			if _, out, err := expectRegexTimeoutWithOutput(child, "sleeping", time.Minute); err != nil {
+				ga.Fatalf("Can't spawn container!\nError: %v\nOutput: %v", err, out)
+			}
+
+			// trigger parsing net-info.json
+			getNetInfo <- struct{}{}
+
+			// wait with cleanup for loading netInfo's
+			<-resumeContainer
+		}()
+
+		<-getNetInfo
+		podUUID, err := ioutil.ReadFile(podUUIDFile)
+		if err != nil {
+			t.Fatalf("Can't read pod UUID: %v", err)
+		}
+
+		// read net-info.json created for pod
+		podDir := filepath.Join(ctx.DataDir(), "pods", "run", string(podUUID))
+		podDirfd, err := syscall.Open(podDir, syscall.O_RDONLY|syscall.O_DIRECTORY, 0)
+		if err != nil {
+			t.Fatalf("Can't open pod directory for reading! %v", err)
+		}
+
+		info, err := netinfo.LoadAt(podDirfd)
+		if err != nil {
+			t.Fatalf("Can't open net-info.json for reading: %v", err)
+		}
+
+		// resume rkt-inspect-networking container for cleanup
+		resumeContainer <- struct{}{}
+
+		if len(info) != 2 {
+			t.Fatalf("Incorrect number of networks: %v", len(info))
+		}
+
+		found := false
+		for _, net := range info {
+			if net.NetName == ntFlannel.Name {
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			t.Fatalf("Network '%s' not found!\nnetInfo[0]: %v\nnetInfo[1]: %v", ntFlannel.Name, info[0], info[1])
+		}
+
+		ga.Wait()
+	})
+}
+
+/*
+ * NewNetDefaultGWTest checks if default gateway is correct if only configured network is one provided by flannel.
+ */
+func NewNetDefaultGWTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		netdir, ntFlannel, err := mockFlannelNetwork(t, ctx)
+		if err != nil {
+			t.Errorf("Can't mock flannel network: %v", err)
+		}
+
+		defer os.RemoveAll(netdir)
+		defer os.Remove(ntFlannel.SubnetFile)
+
+		testImageArgs := []string{"--exec=/inspect --print-defaultgwv4"}
+		testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+		defer os.Remove(testImage)
+
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%s --mds-register=false %s", ctx.Cmd(), ntFlannel.Name, testImage)
+		child := spawnOrFail(t, cmd)
+		defer waitOrFail(t, child, 0)
+
+		expectedRegex := `DefaultGWv4: (\d+\.\d+\.\d+\.\d+)`
+		if _, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, time.Minute); err != nil {
+			t.Fatalf("No default gateway!\nError: %v\nOutput: %v", err, out)
+		}
+	})
+}
diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
index d7f1a084c9..0a4ffde23a 100644
--- a/tests/rkt_socket_proxyd_test.go
+++ b/tests/rkt_socket_proxyd_test.go
@@ -59,7 +59,7 @@ func TestSocketProxyd(t *testing.T) {
 		Type:   "ptp",
 		IpMasq: true,
 		Master: iface.Name,
-		Ipam: ipamTemplateT{
+		Ipam: &ipamTemplateT{
 			Type:   "host-local",
 			Subnet: "192.168.0.0/24",
 			Routes: []map[string]string{
diff --git a/tests/testutils/iputils.go b/tests/testutils/iputils.go
index 7807228f13..9081909afe 100644
--- a/tests/testutils/iputils.go
+++ b/tests/testutils/iputils.go
@@ -27,17 +27,18 @@ import (
 )
 
 func getDefaultGW(family int) (string, error) {
-	l, err := netlink.LinkByName("lo")
+	routes, err := netlink.RouteList(nil, family)
 	if err != nil {
 		return "", err
 	}
 
-	routes, err := netlink.RouteList(l, family)
-	if err != nil {
-		return "", err
+	for _, route := range routes {
+		if route.Src == nil && route.Dst == nil {
+			return route.Gw.String(), nil
+		}
 	}
 
-	return routes[0].Gw.String(), nil
+	return "", fmt.Errorf("Default route is not set")
 }
 func GetDefaultGWv4() (string, error) {
 	return getDefaultGW(netlink.FAMILY_V4)

From 89045a24f01f967f345adf822a341e96a4e0a26b Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 30 Jun 2016 16:11:00 -0700
Subject: [PATCH 0488/1304] tests: fixup default gateway with flannel and
 netName for kvm

Remove unnecessary concurrency from the flannel network test.
---
 tests/rkt_net_test.go | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index ac66eeb40f..35ad7f80d8 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -904,35 +904,17 @@ func NewNetPreserveNetNameTest() testutils.Test {
 		defer os.RemoveAll(netdir)
 		defer os.Remove(ntFlannel.SubnetFile)
 
-		getNetInfo, resumeContainer := make(chan struct{}), make(chan struct{})
-		ga := testutils.NewGoroutineAssistant(t)
-		ga.Add(1)
-
 		podUUIDFile := filepath.Join(ctx.DataDir(), "pod_uuid")
 		defer os.Remove(podUUIDFile)
-		go func() {
-			// start container with 'flannel' network
-			defer ga.Done()
-			testImageArgs := []string{"--exec=/inspect --print-msg=sleeping --sleep=10"}
-			testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
-			defer os.Remove(testImage)
-			cmd := fmt.Sprintf("%s --debug --insecure-options=image run --uuid-file-save=%s --net=%s --mds-register=false %s", ctx.Cmd(), podUUIDFile, ntFlannel.Name, testImage)
-			child := ga.SpawnOrFail(cmd)
-			defer ga.WaitOrFail(child)
-
-			// wait until stage2
-			if _, out, err := expectRegexTimeoutWithOutput(child, "sleeping", time.Minute); err != nil {
-				ga.Fatalf("Can't spawn container!\nError: %v\nOutput: %v", err, out)
-			}
 
-			// trigger parsing net-info.json
-			getNetInfo <- struct{}{}
+		// start container with 'flannel' network
+		testImageArgs := []string{"--exec=/inspect"}
+		testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
+		defer os.Remove(testImage)
 
-			// wait with cleanup for loading netInfo's
-			<-resumeContainer
-		}()
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --uuid-file-save=%s --net=%s --mds-register=false %s", ctx.Cmd(), podUUIDFile, ntFlannel.Name, testImage)
+		spawnAndWaitOrFail(t, cmd, 0)
 
-		<-getNetInfo
 		podUUID, err := ioutil.ReadFile(podUUIDFile)
 		if err != nil {
 			t.Fatalf("Can't read pod UUID: %v", err)
@@ -950,9 +932,6 @@ func NewNetPreserveNetNameTest() testutils.Test {
 			t.Fatalf("Can't open net-info.json for reading: %v", err)
 		}
 
-		// resume rkt-inspect-networking container for cleanup
-		resumeContainer <- struct{}{}
-
 		if len(info) != 2 {
 			t.Fatalf("Incorrect number of networks: %v", len(info))
 		}
@@ -968,8 +947,6 @@ func NewNetPreserveNetNameTest() testutils.Test {
 		if !found {
 			t.Fatalf("Network '%s' not found!\nnetInfo[0]: %v\nnetInfo[1]: %v", ntFlannel.Name, info[0], info[1])
 		}
-
-		ga.Wait()
 	})
 }
 

From 3b6e20cea145ff869fe20d534ca5678a6be99b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 20 Jan 2016 15:01:35 +0100
Subject: [PATCH 0489/1304] functional tests: add test for rkt stop

---
 tests/rkt_stop_test.go | 90 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 tests/rkt_stop_test.go

diff --git a/tests/rkt_stop_test.go b/tests/rkt_stop_test.go
new file mode 100644
index 0000000000..b2017b3285
--- /dev/null
+++ b/tests/rkt_stop_test.go
@@ -0,0 +1,90 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestRktStop(t *testing.T) {
+	image := patchTestACI("rkt-stop-test.aci", "--name=rkt-stop-test", "--exec=/inspect --read-stdin")
+	defer os.Remove(image)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	// Define tests
+	tests := []struct {
+		cmd        string
+		expectKill bool
+	}{
+		// Test regular stop
+		{
+			"stop",
+			false,
+		},
+		// Test forced stop
+		{
+			"stop --force",
+			true,
+		},
+	}
+
+	// Run tests
+	for i, tt := range tests {
+		// Prepare image
+		cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), image)
+		podUUID := runRktAndGetUUID(t, cmd)
+
+		// Run image
+		cmd = fmt.Sprintf("%s --insecure-options=image run-prepared --interactive %s", ctx.Cmd(), podUUID)
+		child := spawnOrFail(t, cmd)
+
+		// Wait for prompt to make sure the pod is started
+		if err := expectTimeoutWithOutput(child, "Enter text:", time.Minute); err != nil {
+			t.Fatalf("Can't start pod")
+		}
+
+		runCmd := fmt.Sprintf("%s %s %s", ctx.Cmd(), tt.cmd, podUUID)
+		t.Logf("Running test #%d, %s", i, runCmd)
+		spawnOrFail(t, runCmd)
+
+		// Make sure the pod is stopped
+		var podInfo *podInfo
+		exitedSuccessfully := false
+		for i := 0; i < 10; i++ {
+			time.Sleep(500 * time.Millisecond)
+			podInfo = getPodInfo(t, ctx, podUUID)
+			if podInfo.state == "exited" {
+				exitedSuccessfully = true
+				break
+			}
+		}
+		if !exitedSuccessfully {
+			t.Fatalf("Expected pod %q to be exited, but it is %q", podUUID, podInfo.state)
+		}
+
+		if tt.expectKill {
+			child.Wait()
+		} else {
+			waitOrFail(t, child, 0)
+		}
+	}
+}

From 30f38773c70a52d873bd363a97fa019a51fe147e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Fri, 15 Apr 2016 13:31:23 +0200
Subject: [PATCH 0490/1304] KVM/Networking: Moving enter_kvm's SSH work to
 stage1/common/ssh for reuse purposes

---
 stage1/common/ssh/ssh.go      | 208 ++++++++++++++++++++++++++++++++++
 stage1/enter_kvm/enter_kvm.go | 188 +-----------------------------
 2 files changed, 213 insertions(+), 183 deletions(-)
 create mode 100644 stage1/common/ssh/ssh.go

diff --git a/stage1/common/ssh/ssh.go b/stage1/common/ssh/ssh.go
new file mode 100644
index 0000000000..9717113232
--- /dev/null
+++ b/stage1/common/ssh/ssh.go
@@ -0,0 +1,208 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// ssh.go file provides ssh communication with pod for kvm flavor
+
+package ssh
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"os/user"
+	"path/filepath"
+	"syscall"
+
+	"github.com/hashicorp/errwrap"
+
+	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/networking/netinfo"
+	"github.com/coreos/rkt/pkg/lock"
+)
+
+const (
+	kvmSettingsDir        = "/var/lib/rkt-stage1-kvm"
+	kvmPrivateKeyFilename = "ssh_kvm_key"
+	// TODO: overwrite below default by environment value + generate .socket unit just before pod start
+	KvmSSHPort = "122" // hardcoded value in .socket file
+)
+
+// fileAccessible checks if the given path exists and is a regular file
+func fileAccessible(path string) bool {
+	if info, err := os.Stat(path); err == nil {
+		return info.Mode().IsRegular()
+	}
+	return false
+}
+
+func sshPrivateKeyPath() string {
+	return filepath.Join(kvmSettingsDir, kvmPrivateKeyFilename)
+}
+
+func sshPublicKeyPath() string {
+	return sshPrivateKeyPath() + ".pub"
+}
+
+// generateKeyPair calls ssh-keygen with private key location for key generation purpose
+func generateKeyPair(private string) error {
+	out, err := exec.Command(
+		"ssh-keygen",
+		"-q",        // silence
+		"-t", "dsa", // type
+		"-b", "1024", // length in bits
+		"-f", private, // output file
+		"-N", "", // no passphrase
+	).Output()
+	if err != nil {
+		// out is in form of bytes buffer and we have to turn it into slice ending on first \0 occurrence
+		return fmt.Errorf("error in keygen time. ret_val: %v, output: %v", err, string(out[:]))
+	}
+	return nil
+}
+
+func ensureKeysExistOnHost() error {
+	private, public := sshPrivateKeyPath(), sshPublicKeyPath()
+	if !fileAccessible(private) || !fileAccessible(public) {
+		if err := os.MkdirAll(kvmSettingsDir, 0700); err != nil {
+			return err
+		}
+
+		if err := generateKeyPair(private); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func ensureAuthorizedKeysExist(keyDirPath string) error {
+	fout, err := os.OpenFile(
+		filepath.Join(keyDirPath, "/authorized_keys"),
+		os.O_CREATE|os.O_TRUNC|os.O_WRONLY,
+		0600,
+	)
+	if err != nil {
+		return err
+	}
+	defer fout.Close()
+
+	fin, err := os.Open(sshPublicKeyPath())
+	if err != nil {
+		return err
+	}
+	defer fin.Close()
+
+	if _, err := io.Copy(fout, fin); err != nil {
+		return err
+	}
+	return fout.Sync()
+}
+
+func ensureKeysExistInPod(workDir string) error {
+	u, _ := user.Current()
+	destRootfs := common.Stage1RootfsPath(workDir)
+	keyDirPath := filepath.Join(destRootfs, u.HomeDir, ".ssh")
+	if err := os.MkdirAll(keyDirPath, 0700); err != nil {
+		return err
+	}
+	return ensureAuthorizedKeysExist(keyDirPath)
+}
+
+func kvmCheckSSHSetup(workDir string) error {
+	if err := ensureKeysExistOnHost(); err != nil {
+		return err
+	}
+	return ensureKeysExistInPod(workDir)
+}
+
+func getPodDefaultIP(workDir string) (string, error) {
+	// get pod lock
+	l, err := lock.NewLock(workDir, lock.Dir)
+	if err != nil {
+		return "", err
+	}
+
+	// get file descriptor for lock
+	fd, err := l.Fd()
+	if err != nil {
+		return "", err
+	}
+
+	// use this descriptor as method of reading pod network configuration
+	nets, err := netinfo.LoadAt(fd)
+	if err != nil {
+		return "", err
+	}
+	// kvm flavored container must have at first position default vm<->host network
+	if len(nets) == 0 {
+		return "", fmt.Errorf("pod has no configured networks")
+	}
+
+	for _, net := range nets {
+		if net.NetName == "default" || net.NetName == "default-restricted" {
+			return net.IP.String(), nil
+		}
+	}
+
+	return "", fmt.Errorf("pod has no default network!")
+}
+
+func ExecSSH(execArgs []string) error {
+	u, _ := user.Current()
+
+	sshPath, err := exec.LookPath("ssh")
+	if err != nil {
+		return errwrap.Wrap(errors.New("cannot find 'ssh' binary"), err)
+	}
+
+	workDir, err := os.Getwd()
+	if err != nil {
+		return errwrap.Wrap(errors.New("cannot get working directory"), err)
+	}
+
+	podDefaultIP, err := getPodDefaultIP(workDir)
+	if err != nil {
+		return errwrap.Wrap(errors.New("cannot load networking configuration"), err)
+	}
+
+	// escape from running pod directory into base directory
+	if err = os.Chdir("../../.."); err != nil {
+		return errwrap.Wrap(errors.New("cannot change directory to rkt work directory"), err)
+	}
+
+	if err := kvmCheckSSHSetup(workDir); err != nil {
+		return errwrap.Wrap(errors.New("error setting up ssh keys"), err)
+	}
+
+	// prepare args for ssh invocation
+	keyFile := sshPrivateKeyPath()
+	args := []string{
+		"ssh",
+		"-t",          // use tty
+		"-i", keyFile, // use keyfile
+		"-l", u.Username, // login as user
+		"-p", KvmSSHPort, // port to connect
+		"-o", "StrictHostKeyChecking=no", // do not check changing host keys
+		"-o", "UserKnownHostsFile=/dev/null", // do not add host key to default knownhosts file
+		"-o", "LogLevel=quiet", // do not log minor informations
+		podDefaultIP,
+	}
+
+	args = append(args, execArgs...)
+
+	// this should not return in case of success
+	err = syscall.Exec(sshPath, args, os.Environ())
+	return errwrap.Wrap(errors.New("cannot exec to ssh"), err)
+}
diff --git a/stage1/enter_kvm/enter_kvm.go b/stage1/enter_kvm/enter_kvm.go
index 612c1ddf89..eae9bddb6b 100644
--- a/stage1/enter_kvm/enter_kvm.go
+++ b/stage1/enter_kvm/enter_kvm.go
@@ -15,173 +15,34 @@
 package main
 
 import (
-	"errors"
 	"flag"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"os/user"
-	"path/filepath"
-	"syscall"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/networking/netinfo"
-	"github.com/coreos/rkt/pkg/lock"
 	rktlog "github.com/coreos/rkt/pkg/log"
-	"github.com/hashicorp/errwrap"
-)
-
-const (
-	kvmSettingsDir        = "/var/lib/rkt-stage1-kvm"
-	kvmPrivateKeyFilename = "ssh_kvm_key"
-	// TODO: overwrite below default by environment value + generate .socket unit just before pod start
-	kvmSSHPort = "122" // hardcoded value in .socket file
+	"github.com/coreos/rkt/stage1/common/ssh"
 )
 
 var (
 	debug   bool
 	podPid  string
 	appName string
-	sshPath string
 	u, _    = user.Current()
 	log     *rktlog.Logger
 	diag    *rktlog.Logger
 )
 
-// fileAccessible checks if the given path exists and is a regular file
-func fileAccessible(path string) bool {
-	if info, err := os.Stat(path); err == nil {
-		return info.Mode().IsRegular()
-	}
-	return false
-}
-
-func sshPrivateKeyPath() string {
-	return filepath.Join(kvmSettingsDir, kvmPrivateKeyFilename)
-}
-
-func sshPublicKeyPath() string {
-	return sshPrivateKeyPath() + ".pub"
-}
-
-// generateKeyPair calls ssh-keygen with private key location for key generation purpose
-func generateKeyPair(private string) error {
-	out, err := exec.Command(
-		"ssh-keygen",
-		"-q",        // silence
-		"-t", "dsa", // type
-		"-b", "1024", // length in bits
-		"-f", private, // output file
-		"-N", "", // no passphrase
-	).Output()
-	if err != nil {
-		// out is in form of bytes buffer and we have to turn it into slice ending on first \0 occurrence
-		return fmt.Errorf("error in keygen time. ret_val: %v, output: %v", err, string(out[:]))
-	}
-	return nil
-}
-
-func ensureKeysExistOnHost() error {
-	private, public := sshPrivateKeyPath(), sshPublicKeyPath()
-	if !fileAccessible(private) || !fileAccessible(public) {
-		if err := os.MkdirAll(kvmSettingsDir, 0700); err != nil {
-			return err
-		}
-
-		if err := generateKeyPair(private); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func ensureAuthorizedKeysExist(keyDirPath string) error {
-	fout, err := os.OpenFile(
-		filepath.Join(keyDirPath, "/authorized_keys"),
-		os.O_CREATE|os.O_TRUNC|os.O_WRONLY,
-		0600,
-	)
-	if err != nil {
-		return err
-	}
-	defer fout.Close()
-
-	fin, err := os.Open(sshPublicKeyPath())
-	if err != nil {
-		return err
-	}
-	defer fin.Close()
-
-	if _, err := io.Copy(fout, fin); err != nil {
-		return err
-	}
-	return fout.Sync()
-}
-
-func ensureKeysExistInPod(workDir string) error {
-	destRootfs := common.Stage1RootfsPath(workDir)
-	keyDirPath := filepath.Join(destRootfs, u.HomeDir, ".ssh")
-	if err := os.MkdirAll(keyDirPath, 0700); err != nil {
-		return err
-	}
-	return ensureAuthorizedKeysExist(keyDirPath)
-}
-
-func kvmCheckSSHSetup(workDir string) error {
-	if err := ensureKeysExistOnHost(); err != nil {
-		return err
-	}
-	return ensureKeysExistInPod(workDir)
-}
-
 func init() {
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
 	flag.StringVar(&podPid, "pid", "", "podPID")
 	flag.StringVar(&appName, "appname", "", "application to use")
 
 	log, diag, _ = rktlog.NewLogSet("kvm", false)
-
-	var err error
-	if sshPath, err = exec.LookPath("ssh"); err != nil {
-		log.FatalE("cannot find 'ssh' binary in PATH", err)
-	}
-}
-
-func getPodDefaultIP(workDir string) (string, error) {
-	// get pod lock
-	l, err := lock.NewLock(workDir, lock.Dir)
-	if err != nil {
-		return "", err
-	}
-
-	// get file descriptor for lock
-	fd, err := l.Fd()
-	if err != nil {
-		return "", err
-	}
-
-	// use this descriptor as method of reading pod network configuration
-	nets, err := netinfo.LoadAt(fd)
-	if err != nil {
-		return "", err
-	}
-	// kvm flavored container must have at first position default vm<->host network
-	if len(nets) == 0 {
-		return "", fmt.Errorf("pod has no configured networks")
-	}
-
-	for _, net := range nets {
-		if net.NetName == "default" || net.NetName == "default-restricted" {
-			return net.IP.String(), nil
-		}
-	}
-
-	return "", fmt.Errorf("pod has no default network!")
 }
 
-func getEnterexecArgs() []string {
+func getAppexecArgs() []string {
 	// Documentation/devel/stage1-implementors-guide.md#arguments-1
 	// also from ../enter/enter.c
 	args := []string{
@@ -197,46 +58,6 @@ func getEnterexecArgs() []string {
 	return append(args, flag.Args()...)
 }
 
-func execSSH() error {
-	workDir, err := os.Getwd()
-	if err != nil {
-		return errwrap.Wrap(errors.New("cannot get working directory"), err)
-	}
-
-	podDefaultIP, err := getPodDefaultIP(workDir)
-	if err != nil {
-		return errwrap.Wrap(errors.New("cannot load networking configuration"), err)
-	}
-
-	// escape from running pod directory into base directory
-	if err = os.Chdir("../../.."); err != nil {
-		return errwrap.Wrap(errors.New("cannot change directory to rkt work directory"), err)
-	}
-
-	if err := kvmCheckSSHSetup(workDir); err != nil {
-		return errwrap.Wrap(errors.New("error setting up ssh keys"), err)
-	}
-
-	// prepare args for ssh invocation
-	keyFile := sshPrivateKeyPath()
-	args := []string{
-		"ssh",
-		"-t",          // use tty
-		"-i", keyFile, // use keyfile
-		"-l", u.Username, // login as user
-		"-p", kvmSSHPort, // port to connect
-		"-o", "StrictHostKeyChecking=no", // do not check changing host keys
-		"-o", "UserKnownHostsFile=/dev/null", // do not add host key to default knownhosts file
-		"-o", "LogLevel=quiet", // do not log minor informations
-		podDefaultIP,
-	}
-	args = append(args, getEnterexecArgs()...)
-
-	// this should not return in case of success
-	err = syscall.Exec(sshPath, args, os.Environ())
-	return errwrap.Wrap(errors.New("cannot exec to ssh"), err)
-}
-
 func main() {
 	flag.Parse()
 
@@ -251,7 +72,8 @@ func main() {
 		log.Fatal("--appname not set to correct value")
 	}
 
-	// execSSH should return only with error
-	log.Error(execSSH())
+	// ExecSSH() should return only with error
+	log.Error(ssh.ExecSSH(getAppexecArgs()))
+
 	os.Exit(2)
 }

From 82ac82389a50d2aab2fa4a5a0bd791f058c0b0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Fri, 15 Apr 2016 15:50:10 +0200
Subject: [PATCH 0491/1304] KVM: Adding "stop" command to KVM flavor

---
 stage1/aci/aci-install.mk   |  4 ++-
 stage1/aci/aci-manifest.in  |  2 +-
 stage1/secondary-stuff.mk   |  1 +
 stage1/stage1.mk            |  6 +++-
 stage1/stop_kvm/stop_kvm.go | 65 +++++++++++++++++++++++++++++++++++++
 stage1/stop_kvm/stop_kvm.mk | 14 ++++++++
 6 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 stage1/stop_kvm/stop_kvm.go
 create mode 100644 stage1/stop_kvm/stop_kvm.mk

diff --git a/stage1/aci/aci-install.mk b/stage1/aci/aci-install.mk
index 6e072c50f7..4cd238409d 100644
--- a/stage1/aci/aci-install.mk
+++ b/stage1/aci/aci-install.mk
@@ -64,6 +64,7 @@ AMI_SED_NAME := $(call sed-replacement-escape,$(AMI_NAME))
 AMI_SED_VERSION := $(call sed-replacement-escape,$(AMI_STAGE1_VERSION))
 AMI_SED_ENTER := $(call sed-replacement-escape,$(STAGE1_ENTER_CMD_$(AMI_FLAVOR)))
 AMI_SED_ARCH := $(call sed-replacement-escape,$(RKT_ACI_ARCH))
+AMI_SED_STOP := $(call sed-replacement-escape,$(STAGE1_STOP_CMD_$(AMI_FLAVOR)))
 
 # main stamp ensures everything is done
 $(call setup-stamp-file,AMI_STAMP,$(AMI_FLAVOR)-main)
@@ -87,7 +88,7 @@ $(call generate-stamp-rule,$(AMI_STAMP),$(AMI_INSTALLED_FILES) $(AMI_MANIFEST_KV
 
 # this rule generates a manifest
 $(call forward-vars,$(AMI_GEN_MANIFEST), \
-	AMI_FLAVOR AMI_SED_NAME AMI_SED_VERSION AMI_SED_ENTER AMI_SED_ARCH)
+	AMI_FLAVOR AMI_SED_NAME AMI_SED_VERSION AMI_SED_ENTER AMI_SED_ARCH AMI_SED_STOP)
 $(AMI_GEN_MANIFEST): $(AMI_SRC_MANIFEST) | $(AMI_TMPDIR)
 	$(VQ) \
 	set -e; \
@@ -97,6 +98,7 @@ $(AMI_GEN_MANIFEST): $(AMI_SRC_MANIFEST) | $(AMI_TMPDIR)
 		-e 's/@RKT_STAGE1_VERSION@/$(AMI_SED_VERSION)/g' \
 		-e 's/@RKT_STAGE1_ENTER@/$(AMI_SED_ENTER)/g' \
 		-e 's/@RKT_STAGE1_ARCH@/$(AMI_SED_ARCH)/g' \
+		-e 's/@RKT_STAGE1_STOP@/$(AMI_SED_STOP)/g' \
 	"$<" >"$@.tmp"; \
 	$(call bash-cond-rename,$@.tmp,$@)
 
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index 6daa640ad6..bed71e9b85 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -31,7 +31,7 @@
         },
         {
             "name": "coreos.com/rkt/stage1/stop",
-            "value": "/stop"
+            "value": "@RKT_STAGE1_STOP@"
         },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
diff --git a/stage1/secondary-stuff.mk b/stage1/secondary-stuff.mk
index 24c2ab397d..686dfd26e7 100644
--- a/stage1/secondary-stuff.mk
+++ b/stage1/secondary-stuff.mk
@@ -10,6 +10,7 @@ _S1_SS_SUBDIRS_ := \
 	prepare-app \
 	reaper \
 	stop \
+	stop_kvm \
 	units \
 	aci
 
diff --git a/stage1/stage1.mk b/stage1/stage1.mk
index 7bc82ad52a..7a12d94c69 100644
--- a/stage1/stage1.mk
+++ b/stage1/stage1.mk
@@ -53,6 +53,9 @@
 #
 # STAGE1_ENTER_CMD_$(flavor) - an enter command in stage1 to be used
 # for the "rkt enter" command.
+#
+# STAGE1_STOP_CMD_$(flavor) - a stop command in stage1 to be used
+# for the "rkt stop" command.
 
 STAGE1_FLAVORS := $(call commas-to-spaces,$(RKT_STAGE1_ALL_FLAVORS))
 STAGE1_BUILT_FLAVORS := $(call commas-to-spaces,$(RKT_STAGE1_FLAVORS))
@@ -71,7 +74,8 @@ $(foreach f,$(STAGE1_FLAVORS), \
 	$(eval STAGE1_INSTALL_SYMLINKS_$f :=) \
 	$(eval STAGE1_INSTALL_DIRS_$f :=) \
 	$(eval STAGE1_CREATE_DIRS_$f :=) \
-	$(eval STAGE1_ENTER_CMD_$f :=))
+	$(eval STAGE1_ENTER_CMD_$f :=) \
+	$(eval STAGE1_STOP_CMD_$f :=))
 
 # Main stamp that tells whether all the ACIs have been built.
 $(call setup-stamp-file,_STAGE1_BUILT_ACI_STAMP_,built_aci)
diff --git a/stage1/stop_kvm/stop_kvm.go b/stage1/stop_kvm/stop_kvm.go
new file mode 100644
index 0000000000..a56062cc1d
--- /dev/null
+++ b/stage1/stop_kvm/stop_kvm.go
@@ -0,0 +1,65 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"syscall"
+
+	rktlog "github.com/coreos/rkt/pkg/log"
+	"github.com/coreos/rkt/stage1/common/ssh"
+)
+
+var (
+	force bool
+	log   *rktlog.Logger
+)
+
+func init() {
+	flag.BoolVar(&force, "force", false, "Forced stop")
+}
+
+func readIntFromFile(path string) (i int, err error) {
+	b, err := ioutil.ReadFile(path)
+	if err != nil {
+		return
+	}
+	_, err = fmt.Sscanf(string(b), "%d", &i)
+	return
+}
+
+func main() {
+	flag.Parse()
+
+	if force {
+		if pid, err := readIntFromFile("pid"); err != nil {
+			fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
+			os.Exit(1)
+		} else if err := syscall.Kill(pid, syscall.SIGKILL); err != nil {
+			fmt.Fprintf(os.Stderr, "error sending %v: %v\n", syscall.SIGKILL, err)
+			os.Exit(1)
+		}
+		return
+	}
+
+	// ExecSSH() should return only with error
+	log.Error(ssh.ExecSSH([]string{"systemctl", "halt"}))
+	os.Exit(1)
+}
diff --git a/stage1/stop_kvm/stop_kvm.mk b/stage1/stop_kvm/stop_kvm.mk
new file mode 100644
index 0000000000..4133a6ed0f
--- /dev/null
+++ b/stage1/stop_kvm/stop_kvm.mk
@@ -0,0 +1,14 @@
+STK_FLAVORS := $(filter kvm,$(STAGE1_FLAVORS))
+
+ifneq ($(STK_FLAVORS),)
+
+ASGB_FLAVORS := $(STK_FLAVORS)
+
+$(foreach f,$(ASGB_FLAVORS),$(eval STAGE1_STOP_CMD_$f := /stop_kvm))
+
+include stage1/makelib/aci_simple_go_bin.mk
+
+endif
+
+$(undefine-namespaces,STK)
+

From c4c134367e05645db339959d754bdcc7c98116f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Wed, 11 May 2016 16:05:39 +0200
Subject: [PATCH 0492/1304] *: adding function to kill processes with child
 processes

---
 stage1/stop/stop.go         | 48 ++++++++++++++++++++++++-------------
 stage1/stop_kvm/stop_kvm.go | 12 ++++++----
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/stage1/stop/stop.go b/stage1/stop/stop.go
index e191e223f5..d6744b84c5 100644
--- a/stage1/stop/stop.go
+++ b/stage1/stop/stop.go
@@ -21,7 +21,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"syscall"
+
+	"github.com/shirou/gopsutil/process"
 )
 
 var (
@@ -32,7 +33,7 @@ func init() {
 	flag.BoolVar(&force, "force", false, "Forced stopping")
 }
 
-func readIntFromFile(path string) (i int, err error) {
+func readIntFromFile(path string) (i int32, err error) {
 	b, err := ioutil.ReadFile(path)
 	if err != nil {
 		return
@@ -41,28 +42,43 @@ func readIntFromFile(path string) (i int, err error) {
 	return
 }
 
-func stop(signal syscall.Signal) int {
+func main() {
+	flag.Parse()
+
 	pid, err := readIntFromFile("ppid")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
-		return 1
+		return
 	}
 
-	if err := syscall.Kill(pid, signal); err != nil {
-		fmt.Fprintf(os.Stderr, "error sending %v: %v\n", signal, err)
-		return 1
+	process, err := process.NewProcess(pid)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "unable to create process %d instance: %v\n", pid, err)
+		return
 	}
 
-	return 0
-}
+	if force {
+		children, err := process.Children()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot get child processes from %d: %v\n", pid, err)
+			os.Exit(1)
+		}
 
-func main() {
-	flag.Parse()
+		for _, child := range children {
+			if err := child.Kill(); err != nil {
+				fmt.Fprintf(os.Stderr, "unable to kill process %d: %v\n", child.Pid, err)
+				os.Exit(1)
+			}
+		}
 
-	signal := syscall.SIGTERM
-	if force {
-		signal = syscall.SIGKILL
+		if err := process.Kill(); err != nil {
+			fmt.Fprintf(os.Stderr, "unable to kill process %d: %v\n", pid, err)
+			os.Exit(1)
+		}
+	} else {
+		if process.Terminate() != nil {
+			fmt.Fprintf(os.Stderr, "unable to terminate process %d: %v\n", pid, err)
+			os.Exit(1)
+		}
 	}
-
-	os.Exit(stop(signal))
 }
diff --git a/stage1/stop_kvm/stop_kvm.go b/stage1/stop_kvm/stop_kvm.go
index a56062cc1d..3956fd8e9b 100644
--- a/stage1/stop_kvm/stop_kvm.go
+++ b/stage1/stop_kvm/stop_kvm.go
@@ -46,13 +46,17 @@ func readIntFromFile(path string) (i int, err error) {
 }
 
 func main() {
+
 	flag.Parse()
 
+	pid, err := readIntFromFile("pid")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
+		os.Exit(1)
+	}
+
 	if force {
-		if pid, err := readIntFromFile("pid"); err != nil {
-			fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
-			os.Exit(1)
-		} else if err := syscall.Kill(pid, syscall.SIGKILL); err != nil {
+		if err := syscall.Kill(pid, syscall.SIGKILL); err != nil {
 			fmt.Fprintf(os.Stderr, "error sending %v: %v\n", syscall.SIGKILL, err)
 			os.Exit(1)
 		}

From e12dd94cb46bd0accabcdb8142a761c3860343c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Mon, 20 Jun 2016 11:50:53 +0200
Subject: [PATCH 0493/1304] fly: Separate stop_fly code and minor error codes
 fixes

---
 stage1/aci/aci-install.mk                     |  4 +-
 stage1/stop/stop.go                           |  4 +-
 stage1/stop_kvm/stop_kvm.go                   | 13 ++--
 stage1_fly/aci/aci-manifest.in                |  2 +-
 stage1_fly/stage1_fly.mk                      |  2 +-
 stage1_fly/stop/stop.go                       | 71 +++++++++++++++++++
 .../stop_fly.mk => stage1_fly/stop/stop.mk    |  0
 7 files changed, 83 insertions(+), 13 deletions(-)
 create mode 100644 stage1_fly/stop/stop.go
 rename stage1/stop/stop_fly.mk => stage1_fly/stop/stop.mk (100%)

diff --git a/stage1/aci/aci-install.mk b/stage1/aci/aci-install.mk
index 4cd238409d..6262cdc7a7 100644
--- a/stage1/aci/aci-install.mk
+++ b/stage1/aci/aci-install.mk
@@ -102,8 +102,8 @@ $(AMI_GEN_MANIFEST): $(AMI_SRC_MANIFEST) | $(AMI_TMPDIR)
 	"$<" >"$@.tmp"; \
 	$(call bash-cond-rename,$@.tmp,$@)
 
-# invalidate generated manifest if name, version, arch or enter cmd changes
-$(call generate-kv-deps,$(AMI_MANIFEST_KV_DEPMK_STAMP),$(AMI_GEN_MANIFEST),$(AMI_MANIFEST_KV_DEPMK),AMI_SED_NAME AMI_SED_VERSION AMI_SED_ARCH AMI_SED_ENTER)
+# invalidate generated manifest if name, version, arch, enter or stop cmd changes
+$(call generate-kv-deps,$(AMI_MANIFEST_KV_DEPMK_STAMP),$(AMI_GEN_MANIFEST),$(AMI_MANIFEST_KV_DEPMK),AMI_SED_NAME AMI_SED_VERSION AMI_SED_ARCH AMI_SED_STOP AMI_SED_ENTER)
 
 # this removes the ACI rootfs dir
 $(call generate-rm-dir-rule,$(AMI_RMDIR_STAMP),$(AMI_ACIROOTFSDIR))
diff --git a/stage1/stop/stop.go b/stage1/stop/stop.go
index d6744b84c5..d6a6f05761 100644
--- a/stage1/stop/stop.go
+++ b/stage1/stop/stop.go
@@ -48,13 +48,13 @@ func main() {
 	pid, err := readIntFromFile("ppid")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
-		return
+		os.Exit(1)
 	}
 
 	process, err := process.NewProcess(pid)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "unable to create process %d instance: %v\n", pid, err)
-		return
+		os.Exit(1)
 	}
 
 	if force {
diff --git a/stage1/stop_kvm/stop_kvm.go b/stage1/stop_kvm/stop_kvm.go
index 3956fd8e9b..1591456e6a 100644
--- a/stage1/stop_kvm/stop_kvm.go
+++ b/stage1/stop_kvm/stop_kvm.go
@@ -46,16 +46,15 @@ func readIntFromFile(path string) (i int, err error) {
 }
 
 func main() {
-
 	flag.Parse()
 
-	pid, err := readIntFromFile("pid")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
-		os.Exit(1)
-	}
-
 	if force {
+		pid, err := readIntFromFile("pid")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
+			os.Exit(1)
+		}
+
 		if err := syscall.Kill(pid, syscall.SIGKILL); err != nil {
 			fmt.Fprintf(os.Stderr, "error sending %v: %v\n", syscall.SIGKILL, err)
 			os.Exit(1)
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index 45f7df2199..1d8b6c0fe9 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -31,7 +31,7 @@
         },
         {
             "name": "coreos.com/rkt/stage1/stop",
-            "value": "/stop_fly"
+            "value": "/stop"
         }
     ]
 }
diff --git a/stage1_fly/stage1_fly.mk b/stage1_fly/stage1_fly.mk
index 01d42cf32a..ec14a5f037 100644
--- a/stage1_fly/stage1_fly.mk
+++ b/stage1_fly/stage1_fly.mk
@@ -9,7 +9,7 @@ $(call setup-stamp-file,FLY_STAMP,aci-build)
 
 $(call inc-many,$(foreach sd,$(FLY_SUBDIRS),$(sd)/$(sd).mk))
 
-$(call inc-one,../stage1/stop/stop_fly.mk)
+$(call inc-one,stop/stop.mk)
 
 $(call generate-stamp-rule,$(FLY_STAMP),$(FLY_STAMPS) $(ACTOOL_STAMP),, \
 	$(call vb,vt,ACTOOL,$(call vsp,$(FLY_STAGE1))) \
diff --git a/stage1_fly/stop/stop.go b/stage1_fly/stop/stop.go
new file mode 100644
index 0000000000..18c645dbed
--- /dev/null
+++ b/stage1_fly/stop/stop.go
@@ -0,0 +1,71 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+
+	"github.com/shirou/gopsutil/process"
+)
+
+var (
+	force bool
+)
+
+func init() {
+	flag.BoolVar(&force, "force", false, "Forced stopping")
+}
+
+func readIntFromFile(path string) (i int32, err error) {
+	b, err := ioutil.ReadFile(path)
+	if err != nil {
+		return
+	}
+	_, err = fmt.Sscanf(string(b), "%d", &i)
+	return
+}
+
+func main() {
+	flag.Parse()
+
+	pid, err := readIntFromFile("pid")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
+		os.Exit(1)
+	}
+
+	process, err := process.NewProcess(pid)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "unable to create process %d instance: %v\n", pid, err)
+		os.Exit(1)
+	}
+
+	if force {
+		if process.Kill() != nil {
+			fmt.Fprintf(os.Stderr, "unable to kill process %d: %v\n", pid, err)
+			os.Exit(1)
+		}
+	} else {
+		if process.Terminate() != nil {
+			fmt.Fprintf(os.Stderr, "unable to terminate process %d: %v\n", pid, err)
+			os.Exit(1)
+		}
+	}
+}
diff --git a/stage1/stop/stop_fly.mk b/stage1_fly/stop/stop.mk
similarity index 100%
rename from stage1/stop/stop_fly.mk
rename to stage1_fly/stop/stop.mk

From f00b8389754e5450959be69c165d47c2312fa289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 7 Jul 2016 11:20:48 +0200
Subject: [PATCH 0494/1304] functional tests: add --silent-sigterm on rkt stop
 test

On the fly flavor, rkt stop just sends SIGTERM to the process, since we
don't do anything special, inspect returns a non-zero exit status which
makes the test fail because we expect 0.

Add `--silent-sigterm` so the test works on fly too.
---
 tests/rkt_stop_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_stop_test.go b/tests/rkt_stop_test.go
index b2017b3285..0bc816e4f4 100644
--- a/tests/rkt_stop_test.go
+++ b/tests/rkt_stop_test.go
@@ -24,7 +24,7 @@ import (
 )
 
 func TestRktStop(t *testing.T) {
-	image := patchTestACI("rkt-stop-test.aci", "--name=rkt-stop-test", "--exec=/inspect --read-stdin")
+	image := patchTestACI("rkt-stop-test.aci", "--name=rkt-stop-test", "--exec=/inspect --read-stdin --silent-sigterm")
 	defer os.Remove(image)
 
 	ctx := testutils.NewRktRunCtx()

From 603e8d4608fea48c46ac0612cadd48a4b550e2ed Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 7 Jul 2016 13:11:32 +0200
Subject: [PATCH 0495/1304] docs: update docs for the v1.10.0 release

---
 CHANGELOG.md | 29 ++++++++++++++++++++++++++++-
 ROADMAP.md   |  8 +++-----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cdb282588..84d1895883 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,35 @@
 ## v1.10.0
+This release introduces a number of important features and improvements:
 
-#### Other changes
+- ARM64 support
+- A new subcommand `rkt stop` to gracefully stop running pods
+- native Go vendoring with Glide
+- rkt is now packaged for openSUSE Tumbleweed and Leap
+
+#### New features
+- Add ARM64 support ([#2758](https://github.com/coreos/rkt/pull/2758)). This enables ARM64 cross-compliation, fly, and stage1-coreos.
+- Replace Godep with Glide, introduce native Go vendoring ([#2735](https://github.com/coreos/rkt/pull/2735)).
+- rkt: rkt stop ([#2438](https://github.com/coreos/rkt/pull/2438)). Cleanly stops a running pod. For systemd-nspawn, sends a SIGTERM. For kvm, executes `systemctl halt`.
 
+#### Bug fixes
+- stage1/fly: respect runtimeApp App's MountPoints ([#2852](https://github.com/coreos/rkt/pull/2852)). Fixes #2846.
+- run: fix sandbox-side metadata service to comply to appc v0.8.1 ([#2863](https://github.com/coreos/rkt/pull/2863)). Fixes #2621.
+
+#### Other changes
 - build directory layout change ([#2758](https://github.com/coreos/rkt/pull/2758)): The rkt binary and stage1 image files have been moved from the 'bin' sub-directory to the 'target/bin' sub-directory.
+- networking/kvm: add flannel default gateway parsing ([#2859](https://github.com/coreos/rkt/pull/2859)).
+- stage1/enterexec: environment file with '\n' as separator (systemd style) ([#2839](https://github.com/coreos/rkt/pull/2839)).
+- pkg/tar: ignore global extended headers ([#2847](https://github.com/coreos/rkt/pull/2847)).
+- pkg/tar: remove errwrap ([#2848](https://github.com/coreos/rkt/pull/2848)).
+- tests: fix abuses of appc types.Isolator ([#2840](https://github.com/coreos/rkt/pull/2840)).
+- common: remove unused GetImageIDs() ([#2834](https://github.com/coreos/rkt/pull/2834)).
+- common/cgroup: add mountFsRO() helper function ([#2829](https://github.com/coreos/rkt/pull/2829)).
+- Documentation updates ([#2732](https://github.com/coreos/rkt/pull/2732), [#2869](https://github.com/coreos/rkt/pull/2869), [#2810](https://github.com/coreos/rkt/pull/2810), [#2865](https://github.com/coreos/rkt/pull/2865), [#2825](https://github.com/coreos/rkt/pull/2825), [#2841](https://github.com/coreos/rkt/pull/2841), [#2732](https://github.com/coreos/rkt/pull/2732))
+
+#### Library updates
+- glide: bump ql to v1.0.4 ([#2875](https://github.com/coreos/rkt/pull/2875)). It fixes an occassional panic when doing GC.
+- glide: bump gopsutils to 2.1 ([#2876](https://github.com/coreos/rkt/pull/2876)). To include https://github.com/shirou/gopsutil/pull/194 (this adds ARM aarch64 support)
+- vendor: update appc/spec to 0.8.5 ([#2854](https://github.com/coreos/rkt/pull/2854)).
 
 ## v1.9.1
 
diff --git a/ROADMAP.md b/ROADMAP.md
index fe304ecde9..3043f730a8 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,20 +9,18 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-### rkt 1.10.0 (July)
+### rkt 1.11.0 (July)
 
 - stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
 - further improvements for SELinux environments, especially Fedora in enforcing mode
-- full integration with `machinectl login` and `systemd-run` [#1463](https://github.com/coreos/rkt/issues/1463)
 
-### rkt 1.11.0 (July)
+### rkt 1.12.0 (August)
 
-- IPv6 support [appc/cni#31](https://github.com/appc/cni/issues/31)
 - enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
 - packaged for more distributions
   - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)
 
-### rkt 1.12.0 (August)
+### rkt 1.13.0 (August)
 
 - `rkt fly` as top-level command [#1889](https://github.com/coreos/rkt/issues/1889)
 - user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)

From d97f538a35f340f28c6060ebc56c9dafc4d18388 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Thu, 7 Jul 2016 11:25:52 +0000
Subject: [PATCH 0496/1304] version: bump to v1.10.0+git

---
 configure.ac                   | 2 +-
 scripts/acbuild-rkt-builder.sh | 2 +-
 scripts/build-rir.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 904e06e8d4..0f4db5e130 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.10.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.10.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index c57b30a67c..bf13726459 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.10.0"}
+IMG_VERSION=${VERSION:-"v1.10.0+git"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 903537afeb..a901aa5f4a 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.10.0}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.10.0+git}"
 
 mkdir -p $BUILDDIR
 

From cb11bdfa3fa85239d321b937cdb1d0d9b834fbd6 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Thu, 7 Jul 2016 11:25:52 +0000
Subject: [PATCH 0497/1304] version: bump to v1.10.0

---
 Documentation/running-fly-stage1.md  | 4 ++--
 Documentation/running-lkvm-stage1.md | 4 ++--
 Documentation/subcommands/prepare.md | 2 +-
 Documentation/subcommands/version.md | 2 +-
 Documentation/trying-out-rkt.md      | 6 +++---
 configure.ac                         | 2 +-
 scripts/acbuild-rkt-builder.sh       | 2 +-
 scripts/build-rir.sh                 | 2 +-
 scripts/install-rkt.sh               | 2 +-
 tests/empty-image/manifest           | 2 +-
 tests/image/manifest                 | 2 +-
 tests/rkt_exec_test.go               | 2 +-
 tests/rkt_image_cat_manifest_test.go | 2 +-
 tests/rkt_image_export_test.go       | 2 +-
 tests/rkt_image_render_test.go       | 2 +-
 tests/rkt_os_arch_test.go            | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index bfd9be5d52..818b6994a4 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.9.1+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.10.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.9.1 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.10.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index fb3c3c541b..b4ec22918a 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.9.1+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.10.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.9.1 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.10.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 223f10d215..abc41b532f 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.9.1
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.10.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index c920b975bd..e6be598b59 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.9.1
+rkt Version: 1.10.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index ac2dc39226..72f55a0da3 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.9.1/rkt-v1.9.1.tar.gz
-tar xzvf rkt-v1.9.1.tar.gz
-cd rkt-v1.9.1
+wget https://github.com/coreos/rkt/releases/download/v1.10.0/rkt-v1.10.0.tar.gz
+tar xzvf rkt-v1.10.0.tar.gz
+cd rkt-v1.10.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index e8863160a8..904e06e8d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.9.1+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.10.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
index 01258ed61c..c57b30a67c 100755
--- a/scripts/acbuild-rkt-builder.sh
+++ b/scripts/acbuild-rkt-builder.sh
@@ -17,7 +17,7 @@ fi
 MODIFY=${MODIFY:-""}
 FLAGS=${FLAGS:-""}
 IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.9.1+git"}
+IMG_VERSION=${VERSION:-"v1.10.0"}
 ACI_FILE=rkt-builder.aci
 BUILDDIR=/opt/build-rkt
 SRC_DIR=/opt/rkt
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index ad660ef659..903537afeb 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.9.1+git}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.10.0}"
 
 mkdir -p $BUILDDIR
 
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index c2ff2aca68..007d3a579a 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.9.1"
+version="1.10.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index b0d661f23d..728814d4a3 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.9.1"
+            "value": "1.10.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 049cfd66fe..116a3e4b31 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.9.1"
+            "value": "1.10.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 17f8215cd8..f805976d78 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.9.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.10.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index fd7bcd5ff5..db9160a13a 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.10.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 1ffbebcf07..ba1828c022 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.10.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 460925aed5..73408609a8 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.1"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.10.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index ff130222c0..581a7400ec 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.9.1"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.10.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 1febfcb8f1ece2070064e238230f9c9c5cdfb698 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 7 Jul 2016 11:01:01 -0700
Subject: [PATCH 0498/1304] scripts/glide-update: ensure running from $GOPATH

glide is confused when it's not running the rkt repository inside $GOPATH.
The new check implies to be in the root directory of the repo.
---
 scripts/glide-update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/glide-update.sh b/scripts/glide-update.sh
index d28a2d500f..607e79134c 100755
--- a/scripts/glide-update.sh
+++ b/scripts/glide-update.sh
@@ -4,9 +4,9 @@
 #
 set -e
 
-if ! [[ "$0" =~ "scripts/glide-update.sh" ]]; then
-	echo "must be run from repository root"
-	exit 255
+if ! [[ "$PWD" = "$GOPATH/src/github.com/coreos/rkt" ]]; then
+  echo "must be run from \$GOPATH/src/github.com/coreos/rkt"
+  exit 255
 fi
 
 if [ ! $(command -v glide) ]; then

From 6e65fb020f5c159ccc5edff37d7aef993ce1903e Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 7 Jul 2016 19:33:19 +0200
Subject: [PATCH 0499/1304] stage1: update coreos image to 1097.0.0

This is needed for a recent enough version of libseccomp (2.3.0), with support for
new syscalls (eg. getrandom).
---
 stage1/usr_from_coreos/coreos-common.mk                      | 2 +-
 stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest | 4 ++--
 stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index 00491cea01..e812c9f853 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -11,7 +11,7 @@ $(call setup-tmp-dir,CCN_TMPDIR)
 # systemd version in coreos image
 CCN_SYSTEMD_VERSION := v229
 # coreos image version
-CCN_IMG_RELEASE := 1068.0.0
+CCN_IMG_RELEASE := 1097.0.0
 # coreos image URL
 CCN_IMG_URL := https://alpha.release.core-os.net/$(RKT_STAGE1_COREOS_BOARD)/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image
diff --git a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
index 51d5fbcd36..4b36cecda4 100644
--- a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
@@ -40,7 +40,7 @@ lib64/libgcc_s.so
 lib64/libgcc_s.so.1
 lib64/libgcrypt.so
 lib64/libgcrypt.so.20
-lib64/libgcrypt.so.20.0.3
+lib64/libgcrypt.so.20.0.5
 lib64/libgpg-error.so
 lib64/libgpg-error.so.0
 lib64/libgpg-error.so.0.10.0
@@ -75,7 +75,7 @@ lib64/librt.so
 lib64/librt.so.1
 lib64/libseccomp.so
 lib64/libseccomp.so.2
-lib64/libseccomp.so.2.1.1
+lib64/libseccomp.so.2.3.0
 lib64/libselinux.so
 lib64/libselinux.so.1
 lib64/libuuid.so
diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
index e1dc37bf3a..f47fe361c8 100644
--- a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
@@ -33,8 +33,8 @@ lib64/libc.so.6
 lib64/libdl-2.21.so
 lib64/libdl.so
 lib64/libdl.so.2
-lib64/libgcrypt.so.11
-lib64/libgcrypt.so.11.8.3
+lib64/libgcrypt.so.20
+lib64/libgcrypt.so.20.0.5
 lib64/libgpg-error.so.0
 lib64/libgpg-error.so.0.10.0
 lib64/libip4tc.so.0

From 1c26b66bacfd1ff4754046f792795556a889cad3 Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Sun, 10 Jul 2016 23:39:36 +0200
Subject: [PATCH 0500/1304] store: fix missing shared storelock acquisition on
 NewStore

the store's storelock is used to block store migration until no rkt processes
have a store instance opened. Despite the comment, the current code doesn't
take a shared lock on store instance creation.

This patch fixes this missing sharedlock acquisition.
---
 store/store.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/store/store.go b/store/store.go
index 77faf17d97..b515aee628 100644
--- a/store/store.go
+++ b/store/store.go
@@ -219,6 +219,9 @@ func NewStore(baseDir string) (*Store, error) {
 	if err != nil {
 		return nil, err
 	}
+	if err := s.storeLock.SharedLock(); err != nil {
+		return nil, err
+	}
 
 	for i, p := range diskvStores {
 		s.stores[i] = diskv.New(diskv.Options{

From 639a17c1813aba2e47d58986a54d1ef87a87c569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Jul 2016 15:24:35 +0200
Subject: [PATCH 0501/1304] rkt: close leaking overlay-prepared fd

We weren't closing the file when we checked if the pod used overlay.
---
 rkt/pods.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rkt/pods.go b/rkt/pods.go
index ec7e6b9023..723f622ad7 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -1061,7 +1061,8 @@ func (p *pod) getDirNames(path string) ([]string, error) {
 }
 
 func (p *pod) usesOverlay() bool {
-	_, err := p.openFile(common.OverlayPreparedFilename, syscall.O_RDONLY)
+	f, err := p.openFile(common.OverlayPreparedFilename, syscall.O_RDONLY)
+	defer f.Close()
 	return err == nil
 }
 

From 52a3c05fd88c26d49e5b407a8f41817e0ba4d99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Jul 2016 15:29:38 +0200
Subject: [PATCH 0502/1304] store: close db lock on store close

If we don't do it, there's a fd leak everytime we open a new Store, even
if it was closed.
---
 store/db.go    | 4 ++++
 store/store.go | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/store/db.go b/store/db.go
index d326760a93..193ad207f1 100644
--- a/store/db.go
+++ b/store/db.go
@@ -85,6 +85,10 @@ func (dl *dbLock) unlock() {
 	dl.Unlock()
 }
 
+func (dl *dbLock) close() error {
+	return dl.fl.Close()
+}
+
 type DB struct {
 	dbdir string
 	dl    *dbLock
diff --git a/store/store.go b/store/store.go
index 77faf17d97..8b188d71f9 100644
--- a/store/store.go
+++ b/store/store.go
@@ -307,7 +307,13 @@ func NewStore(baseDir string) (*Store, error) {
 
 // Close closes a Store opened with NewStore().
 func (s *Store) Close() error {
-	return s.storeLock.Close()
+	if err := s.storeLock.Close(); err != nil {
+		return err
+	}
+	if err := s.db.dl.close(); err != nil {
+		return err
+	}
+	return nil
 }
 
 // backupDB backs up current database.

From 87cd95852d6ab58db52459aeaa7373af6fecb9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Jul 2016 15:37:28 +0200
Subject: [PATCH 0503/1304] rkt/rm: fix help string

We allow either `UUID` or `--uuid-file`, not both. Reflect that on the
help string.
---
 rkt/rm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/rm.go b/rkt/rm.go
index 8c9816b32f..74e7f433bf 100644
--- a/rkt/rm.go
+++ b/rkt/rm.go
@@ -25,7 +25,7 @@ import (
 
 var (
 	cmdRm = &cobra.Command{
-		Use:   "rm [--uuid-file=FILE] UUID ...",
+		Use:   "rm --uuid-file=FILE | UUID ...",
 		Short: "Remove all files and resources associated with an exited pod",
 		Long:  `Unlike gc, rm allows users to remove specific pods.`,
 		Run:   ensureSuperuser(runWrapper(runRm)),

From 9fb8b910e49ef666be1975340c7adb7a4785fdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Jul 2016 13:15:14 +0200
Subject: [PATCH 0504/1304] rkt/stop: implement --uuid-file

So the user can use the value saved on rkt run with --uuid-file-save.
---
 rkt/stop.go | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/rkt/stop.go b/rkt/stop.go
index 4df0b9539c..d56b277503 100644
--- a/rkt/stop.go
+++ b/rkt/stop.go
@@ -27,7 +27,7 @@ import (
 
 var (
 	cmdStop = &cobra.Command{
-		Use:   "stop UUID ...",
+		Use:   "stop --uuid-file=FILE | UUID ...",
 		Short: "Stop a pod",
 		Run:   runWrapper(runStop),
 	}
@@ -37,25 +37,40 @@ var (
 func init() {
 	cmdRkt.AddCommand(cmdStop)
 	cmdStop.Flags().BoolVar(&flagForce, "force", false, "forced stopping")
+	cmdStop.Flags().StringVar(&flagUUIDFile, "uuid-file", "", "read pod UUID from file instead of argument")
 }
 
 func runStop(cmd *cobra.Command, args []string) (exit int) {
 	var podUUID *types.UUID
 	var podUUIDs []*types.UUID
+	var err error
 	var errors int
 
-	if len(args) < 1 {
-		cmd.Usage()
-		return 1
-	}
-
-	for _, uuid := range args {
-		podUUID, err := resolveUUID(uuid)
+	ret := 0
+	switch {
+	case len(args) == 0 && flagUUIDFile != "":
+		podUUID, err = readUUIDFromFile(flagUUIDFile)
 		if err != nil {
-			stderr.PrintE("stop: unable to resolve UUID: %v", err)
+			stderr.PrintE("unable to resolve UUID from file", err)
+			ret = 1
 		} else {
 			podUUIDs = append(podUUIDs, podUUID)
 		}
+
+	case len(args) > 0 && flagUUIDFile == "":
+		for _, uuid := range args {
+			podUUID, err := resolveUUID(uuid)
+			if err != nil {
+				stderr.PrintE("unable to resolve UUID", err)
+				ret = 1
+			} else {
+				podUUIDs = append(podUUIDs, podUUID)
+			}
+		}
+
+	default:
+		cmd.Usage()
+		return 1
 	}
 
 	for _, podUUID = range podUUIDs {
@@ -84,5 +99,5 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	return 0
+	return ret
 }

From 5f5bee2fbbc5befb95b4837600b66e6723622fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Jul 2016 13:15:48 +0200
Subject: [PATCH 0505/1304] rkt/stop: remove extra "stop: " prefix

It's already included by the log package.
---
 rkt/stop.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rkt/stop.go b/rkt/stop.go
index d56b277503..7750943c9a 100644
--- a/rkt/stop.go
+++ b/rkt/stop.go
@@ -77,11 +77,11 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 		p, err := getPod(podUUID)
 		if err != nil {
 			errors++
-			stderr.PrintE("stop: cannot get pod", err)
+			stderr.PrintE("cannot get pod", err)
 		}
 
 		if !p.isRunning() {
-			stderr.Error(fmt.Errorf("stop: pod %q is not running", p.uuid))
+			stderr.Error(fmt.Errorf("pod %q is not running", p.uuid))
 			errors++
 			continue
 		}
@@ -89,13 +89,13 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 		if err := stage0.StopPod(p.path(), flagForce, podUUID); err == nil {
 			stdout.Printf("%q", p.uuid)
 		} else {
-			stderr.PrintE(fmt.Sprintf("stop: error stopping %q", p.uuid), err)
+			stderr.PrintE(fmt.Sprintf("error stopping %q", p.uuid), err)
 			errors++
 		}
 	}
 
 	if errors > 0 {
-		stderr.Error(fmt.Errorf("stop: failed to stop %d pod(s)", errors))
+		stderr.Error(fmt.Errorf("failed to stop %d pod(s)", errors))
 		return 1
 	}
 

From 10aaba9c7cf8d2712ee42ead96606d9ae41224ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Jul 2016 15:51:49 +0200
Subject: [PATCH 0506/1304] functional tests: test uuid-file on rkt stop

---
 tests/rkt_stop_test.go | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/tests/rkt_stop_test.go b/tests/rkt_stop_test.go
index 0bc816e4f4..57c27ae74c 100644
--- a/tests/rkt_stop_test.go
+++ b/tests/rkt_stop_test.go
@@ -16,6 +16,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -30,20 +31,32 @@ func TestRktStop(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
+	tmpDir := createTempDirOrPanic("rkt-TestRktStop-")
+	defer os.RemoveAll(tmpDir)
+
 	// Define tests
 	tests := []struct {
 		cmd        string
+		uuidFile   bool
 		expectKill bool
 	}{
 		// Test regular stop
 		{
 			"stop",
 			false,
+			false,
 		},
 		// Test forced stop
 		{
 			"stop --force",
+			false,
+			true,
+		},
+		// Test uuid-file
+		{
+			"stop",
 			true,
+			false,
 		},
 	}
 
@@ -62,7 +75,20 @@ func TestRktStop(t *testing.T) {
 			t.Fatalf("Can't start pod")
 		}
 
-		runCmd := fmt.Sprintf("%s %s %s", ctx.Cmd(), tt.cmd, podUUID)
+		args := podUUID
+		if tt.uuidFile {
+			uuidFile, err := ioutil.TempFile(tmpDir, "uuid-file")
+			if err != nil {
+				panic(fmt.Sprintf("Cannot create uuid-file: %v", err))
+			}
+			uuidFilePath := uuidFile.Name()
+			if err := ioutil.WriteFile(uuidFilePath, []byte(podUUID), 0600); err != nil {
+				panic(fmt.Sprintf("Cannot write pod UUID to uuid-file: %v", err))
+			}
+			args = fmt.Sprintf("--uuid-file=%s", uuidFilePath)
+		}
+
+		runCmd := fmt.Sprintf("%s %s %s", ctx.Cmd(), tt.cmd, args)
 		t.Logf("Running test #%d, %s", i, runCmd)
 		spawnOrFail(t, runCmd)
 

From a5127b0c4274300c2930df62e4cd5ca287b415e3 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Mon, 11 Jul 2016 19:59:26 +0200
Subject: [PATCH 0507/1304] stage1/enterexec: remove trailing `\n` in
 environment variables

Loading environment retained the new line character (`\n`),
this produced an incorrect evaluation of the environment variables.

Fixes: https://github.com/coreos/rkt/issues/2893
Bug introduced by: https://github.com/coreos/rkt/pull/2839
---
 stage1/enterexec/enterexec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/stage1/enterexec/enterexec.c b/stage1/enterexec/enterexec.c
index 9739953042..c6daf2a40a 100644
--- a/stage1/enterexec/enterexec.c
+++ b/stage1/enterexec/enterexec.c
@@ -181,7 +181,7 @@ static void set_env(const char *env_file)
 	char 		*line = NULL;
 	size_t 		len = 0;
 	ssize_t 	read;
-	char 		*v;
+	char 		*v, *nl;
 
 	pexit_if((f = fopen(env_file, "r")) == NULL,
              "Unable to fopen \"%s\"", env_file);
@@ -190,6 +190,9 @@ static void set_env(const char *env_file)
 				"Malformed environment entry: \"%s\"", line);
 		*v = '\0';
 		v++;
+		/* remove new line character */
+		if ((nl = strchr(v, '\n')) != NULL)
+			*nl = '\0';
 		pexit_if(setenv(line, v, 1) == -1,
 				 "Unable to set env variable: \"%s\"=\"%s\"", line, v);
 	}

From ad5ece02e994ba3bbae27f2fe667e152fd73afff Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Mon, 11 Jul 2016 20:01:41 +0200
Subject: [PATCH 0508/1304] rkt/run: handle malformed environment files

This patch returns an error if the environment file contains a malformed
variable. For example, if a variable is unnamed (e.g. `=value`) or without
the equals sign (e.g. `VAR_1`). Empty variables may be set by `VAR_1=`.
Users may prefix with `#` or `;` those varibles to ignore. This patch
skips empty lines in the environment file.
---
 rkt/run.go               | 25 +++++++++----------------
 tests/env_file_test.conf |  2 ++
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/rkt/run.go b/rkt/run.go
index 56271a8be3..c1b30777a5 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -421,18 +421,6 @@ type envFileMap struct {
 	mapping map[string]string
 }
 
-func skipLine(s []string) bool {
-	// Empty line
-	if len(s) == 0 {
-		return true
-	}
-	// Line start with '#' and ';'
-	if string(s[0][0]) == "#" || string(s[0][0]) == ";" {
-		return true
-	}
-	return false
-}
-
 func (e *envFileMap) Set(s string) error {
 	if e.mapping == nil {
 		e.mapping = make(map[string]string)
@@ -445,14 +433,19 @@ func (e *envFileMap) Set(s string) error {
 
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
-		// TODO parse '\' to skip new line character
-		pair := strings.SplitN(scanner.Text(), "=", 2)
-		if skipLine(pair) {
+		// Skip empty lines
+		if len(scanner.Text()) == 0 {
 			continue
 		}
-		if len(pair) != 2 {
+		pair := strings.SplitN(scanner.Text(), "=", 2)
+		// Malformed lines
+		if len(pair) != 2 || len(pair[0]) == 0 {
 			return fmt.Errorf("environment variable must be specified as name=value (file %q)", file)
 		}
+		// Skip comments
+		if string(pair[0][0]) == "#" || string(pair[0][0]) == ";" {
+			continue
+		}
 		if _, exists := e.mapping[pair[0]]; exists {
 			return fmt.Errorf("environment variable %q already set (file %q)", pair[0], file)
 		}
diff --git a/tests/env_file_test.conf b/tests/env_file_test.conf
index caae5bfdea..0d2a525f11 100644
--- a/tests/env_file_test.conf
+++ b/tests/env_file_test.conf
@@ -1 +1,3 @@
 VAR_OTHER=file
+
+VAR_2=2

From 15c90d741a54ee0c68fbee01c48483e852fb0cfc Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 11 Jul 2016 15:23:34 -0700
Subject: [PATCH 0509/1304] api: Add labels to pod and image type.

---
 api/v1alpha/api.pb.go | 199 ++++++++++++++++++++++--------------------
 api/v1alpha/api.proto |   3 +
 2 files changed, 107 insertions(+), 95 deletions(-)

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index 5c4bbf0883..7e89748c1e 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -240,6 +240,8 @@ type Image struct {
 	Size int64 `protobuf:"varint,7,opt,name=size" json:"size,omitempty"`
 	// Annotations on this image.
 	Annotations []*KeyValue `protobuf:"bytes,8,rep,name=annotations" json:"annotations,omitempty"`
+	// Labels of this image.
+	Labels []*KeyValue `protobuf:"bytes,9,rep,name=labels" json:"labels,omitempty"`
 }
 
 func (m *Image) Reset()                    { *m = Image{} }
@@ -261,6 +263,13 @@ func (m *Image) GetAnnotations() []*KeyValue {
 	return nil
 }
 
+func (m *Image) GetLabels() []*KeyValue {
+	if m != nil {
+		return m.Labels
+	}
+	return nil
+}
+
 // Network describes the network information of a pod.
 type Network struct {
 	// Name of the network that a pod belongs to, required.
@@ -1141,99 +1150,99 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1492 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xcf, 0x6e, 0xdb, 0xc6,
-	0x13, 0x8e, 0xfe, 0x4b, 0x23, 0x45, 0x96, 0xd6, 0x4e, 0x2c, 0x2b, 0xff, 0x1c, 0xfe, 0x7e, 0x0d,
-	0x52, 0x1f, 0xdc, 0xd6, 0x49, 0x73, 0x29, 0x50, 0x44, 0xb1, 0x69, 0x43, 0x8d, 0x2d, 0x09, 0x8a,
-	0x62, 0x34, 0x27, 0x82, 0x92, 0x56, 0x0e, 0x61, 0x8a, 0x64, 0x49, 0xca, 0x89, 0x7b, 0xec, 0xa9,
-	0xb7, 0x3e, 0x42, 0x1f, 0xa3, 0xc7, 0xde, 0xfb, 0x18, 0x05, 0xfa, 0x1e, 0x9d, 0x5d, 0x2e, 0xc9,
-	0x25, 0x45, 0x1d, 0x7a, 0xb3, 0x66, 0x66, 0xbf, 0xf9, 0x66, 0x76, 0xe6, 0x5b, 0x1a, 0x6a, 0xba,
-	0x63, 0x1c, 0x3a, 0xae, 0xed, 0xdb, 0xa4, 0x72, 0xf3, 0x8d, 0x6e, 0x3a, 0x1f, 0x75, 0xe5, 0x35,
-	0xd4, 0xfb, 0x4b, 0xfd, 0x8a, 0x9e, 0xda, 0xee, 0x52, 0xf7, 0xc9, 0x3e, 0x14, 0xfd, 0x5b, 0x87,
-	0x76, 0x72, 0xfb, 0xb9, 0xe7, 0xcd, 0x23, 0x72, 0x28, 0xc2, 0x0e, 0x79, 0xcc, 0x04, 0x3d, 0x64,
-	0x0b, 0x2a, 0x37, 0xd4, 0xf5, 0x0c, 0xdb, 0xea, 0xe4, 0x31, 0xa8, 0xa6, 0xfc, 0x99, 0x83, 0x12,
-	0x77, 0x93, 0x2f, 0xa1, 0x3e, 0xd5, 0x3d, 0xaa, 0x2d, 0x38, 0x16, 0xc7, 0xa8, 0x1f, 0xed, 0x24,
-	0x31, 0x44, 0x1e, 0x80, 0xbc, 0x31, 0x0f, 0x00, 0x48, 0x03, 0x8a, 0x96, 0xbe, 0xa4, 0x9d, 0x02,
-	0xff, 0x25, 0xe1, 0x17, 0xb9, 0xa1, 0x03, 0x2d, 0x63, 0xe9, 0xd8, 0xae, 0xaf, 0xf9, 0xc6, 0x92,
-	0x7a, 0xbe, 0xbe, 0x74, 0x3a, 0x25, 0xf4, 0x14, 0x48, 0x0b, 0xaa, 0x4b, 0xdd, 0x32, 0x16, 0x68,
-	0xec, 0x94, 0xd1, 0xd2, 0x60, 0x50, 0x9e, 0xf1, 0x33, 0xed, 0x54, 0xb8, 0xff, 0x19, 0xd4, 0x75,
-	0xcb, 0xb2, 0x7d, 0xdd, 0x47, 0x34, 0xaf, 0x53, 0xdd, 0x2f, 0x20, 0x9f, 0x76, 0xc4, 0xe7, 0x2d,
-	0xbd, 0xbd, 0xd4, 0xcd, 0x15, 0x55, 0x5e, 0x40, 0x65, 0x40, 0xfd, 0x4f, 0xb6, 0x7b, 0x1d, 0x71,
-	0xc9, 0x85, 0xcc, 0x0c, 0xe7, 0xe6, 0x65, 0xcc, 0x13, 0x7f, 0xbd, 0x0a, 0x78, 0x2a, 0xbf, 0xe5,
-	0xa0, 0xd0, 0x73, 0x9c, 0xd4, 0x89, 0x47, 0x50, 0x32, 0x58, 0x99, 0xfc, 0x48, 0xfd, 0xa8, 0x99,
-	0x2c, 0x1e, 0xdb, 0x5b, 0xc2, 0x02, 0xfc, 0xa0, 0xd6, 0xa6, 0xc4, 0x05, 0x91, 0xde, 0x31, 0x07,
-	0x69, 0x43, 0x8d, 0x7e, 0x36, 0x7c, 0x6d, 0x66, 0xcf, 0x29, 0x6f, 0x40, 0x3b, 0x5d, 0x46, 0x69,
-	0x53, 0x19, 0xbf, 0xe6, 0xa1, 0x30, 0xb2, 0xe7, 0xa2, 0xb7, 0x01, 0x9f, 0x3a, 0x14, 0x1c, 0xd1,
-	0xe8, 0xf6, 0xe6, 0xec, 0x78, 0x2a, 0xc8, 0xde, 0x85, 0xa2, 0xee, 0x38, 0x1e, 0x26, 0x66, 0x39,
-	0x1a, 0x32, 0x3d, 0xa2, 0x40, 0xd5, 0x0a, 0xba, 0x14, 0x72, 0x68, 0x45, 0xfe, 0xb0, 0x7d, 0xeb,
-	0x37, 0x92, 0x22, 0x5f, 0xd9, 0x40, 0x9e, 0x34, 0xa1, 0x3c, 0xbb, 0x72, 0xed, 0x95, 0x83, 0xd7,
-	0xc4, 0x88, 0x63, 0x15, 0x33, 0x97, 0x22, 0xa7, 0xb9, 0x86, 0xa3, 0x54, 0xe3, 0xf7, 0x89, 0x36,
-	0xe4, 0xef, 0x0a, 0x1b, 0x70, 0xdb, 0x0e, 0x34, 0xae, 0x66, 0xda, 0x52, 0x77, 0xaf, 0x03, 0x6b,
-	0x9d, 0x59, 0x95, 0x67, 0x50, 0x8d, 0x90, 0xb1, 0x05, 0xf8, 0xb7, 0xe8, 0xc7, 0x5d, 0x28, 0xdd,
-	0x30, 0xab, 0x98, 0xdd, 0xbf, 0x72, 0x50, 0xc3, 0xe2, 0x4f, 0x0d, 0xd3, 0xa7, 0x2e, 0x8b, 0x34,
-	0xe6, 0x1e, 0x46, 0x16, 0x30, 0xf2, 0x29, 0x94, 0x79, 0xb3, 0x3c, 0x0c, 0x2d, 0x64, 0x77, 0xab,
-	0xcd, 0x36, 0xca, 0xd1, 0xd8, 0xf5, 0x7b, 0xd8, 0x53, 0x76, 0x0a, 0x4d, 0xfc, 0xfe, 0x35, 0x06,
-	0x54, 0xe4, 0xa6, 0x7b, 0x70, 0x57, 0xf4, 0x4d, 0x44, 0x96, 0xb8, 0x39, 0xd5, 0x98, 0xf2, 0xa6,
-	0xc6, 0xe0, 0x3e, 0x04, 0x8d, 0x09, 0x9a, 0x57, 0x23, 0xbb, 0xb0, 0xe5, 0xd8, 0x73, 0xcd, 0x5b,
-	0x4d, 0xb5, 0xd0, 0xc1, 0x26, 0xbb, 0xa6, 0xfc, 0x9d, 0x0b, 0x77, 0x39, 0xa3, 0x1c, 0xbc, 0x19,
-	0xc7, 0xa5, 0x0b, 0xe3, 0xb3, 0x28, 0x88, 0x77, 0x98, 0x6f, 0xab, 0x4c, 0x1f, 0xa3, 0xae, 0xe9,
-	0x2d, 0x72, 0x8d, 0xd8, 0x63, 0x1b, 0x4c, 0x7d, 0x4a, 0xcd, 0xcd, 0x73, 0x47, 0xee, 0x43, 0x33,
-	0x58, 0x50, 0x76, 0x03, 0x0b, 0xcc, 0xcc, 0xaf, 0xbe, 0xc0, 0x88, 0x46, 0xf6, 0x29, 0x45, 0x51,
-	0xf8, 0x8f, 0x7b, 0xc9, 0x18, 0x2e, 0x56, 0xa6, 0x29, 0x18, 0xd6, 0x78, 0x91, 0xbf, 0x63, 0x91,
-	0x67, 0xa6, 0x3d, 0xd5, 0xcd, 0x53, 0x53, 0xbf, 0xf2, 0x58, 0x91, 0x73, 0xc3, 0x15, 0xb7, 0xbb,
-	0x07, 0x6d, 0xef, 0xd6, 0xf3, 0xe9, 0x12, 0xd7, 0xc7, 0x5a, 0x18, 0x57, 0x1a, 0x73, 0xe5, 0x43,
-	0x15, 0x31, 0xed, 0x99, 0x6e, 0xca, 0x9e, 0x40, 0x70, 0x90, 0xe6, 0xca, 0xa3, 0xae, 0xec, 0x08,
-	0x84, 0x87, 0xd5, 0x65, 0x79, 0x74, 0xb6, 0x72, 0x51, 0xd2, 0x58, 0x32, 0x2e, 0x3b, 0x6c, 0xc7,
-	0xef, 0xf9, 0xee, 0xca, 0xf3, 0x35, 0x6c, 0x95, 0xa7, 0x2d, 0x5c, 0x7b, 0xa9, 0x7d, 0xf4, 0x7d,
-	0xc7, 0xe3, 0x65, 0x57, 0x15, 0x17, 0x8a, 0x7d, 0x6b, 0x61, 0x93, 0x6d, 0xa8, 0xbb, 0xd7, 0xbe,
-	0x16, 0x8a, 0x59, 0xc0, 0x10, 0xc7, 0x15, 0x47, 0x66, 0xa6, 0x25, 0x24, 0x94, 0x85, 0xa2, 0x34,
-	0x47, 0xc6, 0x80, 0xd7, 0x01, 0x4e, 0x36, 0x2f, 0x54, 0x24, 0x2f, 0xa6, 0xe4, 0x54, 0xea, 0x02,
-	0xe6, 0x2c, 0xa9, 0x37, 0xd4, 0xda, 0xac, 0xdf, 0xdc, 0xcb, 0xf5, 0x3b, 0xa5, 0xbc, 0x8c, 0xbe,
-	0x48, 0x88, 0xbf, 0x98, 0xc2, 0xf2, 0x44, 0x05, 0xf2, 0x04, 0x8a, 0x73, 0xdd, 0xd7, 0x37, 0xcb,
-	0x8d, 0x0f, 0x75, 0x8e, 0x2a, 0xa6, 0xed, 0x29, 0x94, 0x58, 0xe6, 0x60, 0xde, 0xb2, 0x53, 0x8b,
-	0x81, 0x0c, 0xc6, 0x0f, 0x37, 0x51, 0x9e, 0x3c, 0xb6, 0xdb, 0x86, 0x35, 0xa3, 0x9a, 0x44, 0x01,
-	0x6d, 0x2b, 0xcb, 0x37, 0xcc, 0xc0, 0xc6, 0x35, 0x5f, 0x69, 0x41, 0xf3, 0x8c, 0xfa, 0xac, 0xc1,
-	0x63, 0xfa, 0xd3, 0x0a, 0x75, 0x46, 0x39, 0x84, 0xad, 0xc8, 0xe2, 0x39, 0x38, 0x50, 0x94, 0x3c,
-	0x40, 0xa5, 0xc6, 0xdf, 0xe2, 0x05, 0xba, 0x1b, 0x8b, 0x30, 0x1a, 0x95, 0x53, 0xd8, 0x3a, 0x37,
-	0x3c, 0x1f, 0xb7, 0xd8, 0x13, 0x10, 0xe4, 0x7f, 0x50, 0x59, 0xf0, 0x2a, 0x02, 0xf6, 0x75, 0x89,
-	0x7d, 0xac, 0x0e, 0xa8, 0x50, 0x73, 0xea, 0xeb, 0x86, 0xc9, 0x9b, 0x57, 0xc5, 0xbc, 0xad, 0x18,
-	0x47, 0x24, 0x46, 0xfd, 0xc4, 0xdd, 0x0c, 0x51, 0x1a, 0x32, 0x8a, 0xf2, 0x04, 0xda, 0x7d, 0xcb,
-	0x73, 0xe8, 0x8c, 0x1d, 0x09, 0x33, 0x4b, 0x5a, 0xad, 0x7c, 0x05, 0x44, 0x0e, 0x10, 0x90, 0x7b,
-	0xa8, 0xe0, 0xf6, 0x5c, 0x94, 0x92, 0x44, 0xfc, 0x01, 0xda, 0x8c, 0x01, 0xdf, 0xf9, 0xa8, 0x96,
-	0x2f, 0xd2, 0xb5, 0xa4, 0x1f, 0xe0, 0xec, 0x6a, 0x5e, 0x02, 0x91, 0xb1, 0x44, 0xf2, 0xc7, 0x50,
-	0xe6, 0x72, 0x16, 0x62, 0xa5, 0xde, 0x33, 0xe5, 0x29, 0x6c, 0x0b, 0xca, 0xfc, 0x77, 0x56, 0x55,
-	0xdf, 0xc2, 0x4e, 0x32, 0x44, 0x40, 0x47, 0x2f, 0x65, 0x2e, 0xeb, 0xa5, 0x54, 0xbe, 0x83, 0x6d,
-	0xc6, 0x87, 0x5a, 0x7c, 0x7c, 0xa2, 0xea, 0xfe, 0x0f, 0xe5, 0xa0, 0xba, 0xb5, 0xaf, 0x0b, 0x69,
-	0x16, 0x95, 0x57, 0xb0, 0x93, 0x3c, 0x1c, 0x97, 0x43, 0xb9, 0x65, 0xad, 0x1c, 0x1e, 0xa8, 0xdc,
-	0xf2, 0xe1, 0x3a, 0xb7, 0xaf, 0xa2, 0x7c, 0xd8, 0x26, 0x26, 0xb6, 0xd1, 0x7b, 0x8a, 0x02, 0x19,
-	0x4a, 0xbe, 0xd8, 0x21, 0x9c, 0x63, 0xd3, 0xb0, 0xf8, 0x1c, 0xe7, 0x9e, 0x97, 0xd8, 0x81, 0x85,
-	0x6d, 0x9a, 0xf6, 0x27, 0x3e, 0xc3, 0xd5, 0xd4, 0x5c, 0x97, 0x32, 0xe6, 0x9a, 0x8b, 0xa5, 0xb2,
-	0xcf, 0xa7, 0x38, 0x48, 0x2d, 0xd8, 0x46, 0xc8, 0x5c, 0xc1, 0x0f, 0x28, 0xd4, 0xe2, 0xaf, 0xb0,
-	0x0e, 0x76, 0xf5, 0xa2, 0x77, 0xa6, 0x6a, 0x93, 0x0f, 0x23, 0x55, 0x7b, 0x3f, 0x38, 0x51, 0x4f,
-	0xfb, 0x03, 0xf5, 0xa4, 0x75, 0x07, 0xb5, 0x64, 0x4b, 0xf2, 0xf4, 0x46, 0xa3, 0xe3, 0x56, 0x0e,
-	0xdf, 0xa0, 0xb6, 0x64, 0x3c, 0x19, 0x1e, 0xbf, 0x55, 0xc7, 0xad, 0x3c, 0x12, 0x69, 0x4a, 0xe6,
-	0xe1, 0x71, 0xbf, 0x55, 0x38, 0x18, 0x41, 0x35, 0xfa, 0x18, 0xd9, 0x85, 0x6d, 0x04, 0xd0, 0xde,
-	0x4d, 0x7a, 0x93, 0x64, 0x12, 0xc4, 0x8b, 0x1d, 0xe3, 0xf7, 0x83, 0x41, 0x7f, 0x70, 0x86, 0x69,
-	0x76, 0xa0, 0x15, 0x9b, 0xd5, 0x1f, 0xfb, 0x13, 0x0c, 0xce, 0x1f, 0xfc, 0x93, 0x83, 0x6a, 0xf4,
-	0x66, 0x22, 0xe4, 0x68, 0x78, 0x92, 0x01, 0x89, 0x67, 0x63, 0x87, 0x7a, 0xf1, 0x66, 0xfc, 0x61,
-	0x88, 0x88, 0x89, 0xf0, 0xd1, 0x58, 0x1d, 0xf5, 0xc6, 0x2c, 0x55, 0x1e, 0xc5, 0x99, 0xa4, 0x1d,
-	0x08, 0x53, 0x60, 0xcc, 0x62, 0x7b, 0xc8, 0xac, 0x88, 0xd3, 0xb6, 0x17, 0x9b, 0x7b, 0x6f, 0x86,
-	0x63, 0xa4, 0x16, 0x1e, 0x6b, 0x95, 0x52, 0xc9, 0x03, 0xe2, 0xe5, 0x64, 0x8e, 0x13, 0xf5, 0x5c,
-	0x9d, 0x30, 0xb0, 0x4a, 0x32, 0xc7, 0x59, 0x6f, 0xfc, 0x06, 0x5b, 0xd8, 0xaa, 0x1e, 0xfc, 0x91,
-	0x87, 0x5a, 0x2c, 0x76, 0x78, 0x43, 0xea, 0xa5, 0x3a, 0x98, 0xac, 0xdf, 0xd0, 0x03, 0xd8, 0x95,
-	0x3c, 0x0c, 0x29, 0xe2, 0x9f, 0xc3, 0xaf, 0xac, 0xc7, 0xd9, 0xce, 0x90, 0x35, 0xd6, 0xde, 0x85,
-	0xfb, 0xa9, 0x18, 0xa4, 0xc2, 0x7d, 0x05, 0x94, 0x8b, 0x7b, 0x29, 0x9f, 0x28, 0xa7, 0x88, 0xbb,
-	0xb3, 0x9f, 0x72, 0x09, 0xee, 0xda, 0xf1, 0xf0, 0xfc, 0x5c, 0x3d, 0x66, 0x51, 0xa5, 0x14, 0xb8,
-	0xb8, 0xce, 0x71, 0xd0, 0x90, 0x24, 0x38, 0xf3, 0x09, 0xf0, 0x0a, 0x6b, 0xb0, 0xe4, 0x0a, 0xa6,
-	0xaa, 0x7f, 0x31, 0x0a, 0x28, 0x57, 0xc9, 0x43, 0xe8, 0xac, 0xb9, 0xc7, 0xea, 0xc5, 0xf0, 0x12,
-	0xbd, 0xb5, 0xa3, 0x5f, 0x8a, 0xf8, 0x19, 0xb6, 0x9a, 0x9a, 0xc6, 0xac, 0x37, 0xea, 0x93, 0xef,
-	0xa1, 0x22, 0x04, 0x9d, 0xec, 0xc6, 0xaf, 0x5d, 0x42, 0xf4, 0xbb, 0x9d, 0x75, 0x47, 0xb0, 0x35,
-	0xca, 0x1d, 0xd2, 0x83, 0x6a, 0x28, 0xcc, 0x24, 0x8e, 0x4b, 0x69, 0x7e, 0x77, 0x2f, 0xc3, 0x13,
-	0x41, 0x9c, 0x01, 0xc4, 0x52, 0x4c, 0xba, 0xd2, 0x03, 0x92, 0x12, 0xf0, 0xee, 0x83, 0x4c, 0x9f,
-	0x0c, 0x14, 0xcb, 0xaa, 0x04, 0xb4, 0xa6, 0xdb, 0x12, 0xd0, 0xba, 0x0e, 0x23, 0xd0, 0x05, 0x34,
-	0x64, 0x19, 0x25, 0x0f, 0xd3, 0x79, 0x65, 0x01, 0xee, 0x3e, 0xda, 0xe0, 0x8d, 0xe0, 0x86, 0xd0,
-	0x90, 0x15, 0x52, 0x82, 0xcb, 0x50, 0x5d, 0x09, 0x2e, 0x4b, 0x56, 0x95, 0x3b, 0x5f, 0xe7, 0xc8,
-	0x6b, 0x7e, 0x69, 0x4c, 0xbf, 0x92, 0x97, 0x26, 0x89, 0x69, 0xf2, 0xd2, 0x64, 0xa9, 0x63, 0x08,
-	0xd3, 0x32, 0xff, 0xcf, 0xf4, 0xc5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x23, 0xef, 0x15,
-	0xa6, 0x0e, 0x00, 0x00,
+	// 1496 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xcd, 0x6e, 0xdb, 0x46,
+	0x10, 0x8e, 0xfe, 0xa5, 0x91, 0x22, 0x4b, 0x6b, 0x27, 0x96, 0x95, 0x3f, 0x87, 0x6d, 0x83, 0xd4,
+	0x07, 0xb7, 0x75, 0xd2, 0x5c, 0x0a, 0x14, 0x51, 0x6c, 0xda, 0x50, 0x63, 0x4b, 0x82, 0xa2, 0x18,
+	0xcd, 0x89, 0xa0, 0xa4, 0x95, 0x43, 0x98, 0x22, 0x59, 0x92, 0x72, 0xe2, 0x1e, 0x7b, 0xea, 0xad,
+	0x8f, 0xd0, 0xc7, 0xe8, 0x3b, 0xf4, 0x31, 0x0a, 0xf4, 0x3d, 0x3a, 0xbb, 0x5c, 0x92, 0x4b, 0x8a,
+	0x3a, 0xf4, 0x66, 0xcd, 0xcc, 0x7e, 0xf3, 0xcd, 0xec, 0xcc, 0xb7, 0x34, 0xd4, 0x74, 0xc7, 0x38,
+	0x74, 0x5c, 0xdb, 0xb7, 0x49, 0xe5, 0xe6, 0x3b, 0xdd, 0x74, 0x3e, 0xea, 0xca, 0x6b, 0xa8, 0xf7,
+	0x97, 0xfa, 0x15, 0x3d, 0xb5, 0xdd, 0xa5, 0xee, 0x93, 0x7d, 0x28, 0xfa, 0xb7, 0x0e, 0xed, 0xe4,
+	0xf6, 0x73, 0xcf, 0x9b, 0x47, 0xe4, 0x50, 0x84, 0x1d, 0xf2, 0x98, 0x09, 0x7a, 0xc8, 0x16, 0x54,
+	0x6e, 0xa8, 0xeb, 0x19, 0xb6, 0xd5, 0xc9, 0x63, 0x50, 0x4d, 0xf9, 0x27, 0x07, 0x25, 0xee, 0x26,
+	0x5f, 0x43, 0x7d, 0xaa, 0x7b, 0x54, 0x5b, 0x70, 0x2c, 0x8e, 0x51, 0x3f, 0xda, 0x49, 0x62, 0x88,
+	0x3c, 0x00, 0x79, 0x63, 0x1e, 0x00, 0x90, 0x06, 0x14, 0x2d, 0x7d, 0x49, 0x3b, 0x05, 0xfe, 0x4b,
+	0xc2, 0x2f, 0x72, 0x43, 0x07, 0x5a, 0xc6, 0xd2, 0xb1, 0x5d, 0x5f, 0xf3, 0x8d, 0x25, 0xf5, 0x7c,
+	0x7d, 0xe9, 0x74, 0x4a, 0xe8, 0x29, 0x90, 0x16, 0x54, 0x97, 0xba, 0x65, 0x2c, 0xd0, 0xd8, 0x29,
+	0xa3, 0xa5, 0xc1, 0xa0, 0x3c, 0xe3, 0x57, 0xda, 0xa9, 0x70, 0xff, 0x33, 0xa8, 0xeb, 0x96, 0x65,
+	0xfb, 0xba, 0x8f, 0x68, 0x5e, 0xa7, 0xba, 0x5f, 0x40, 0x3e, 0xed, 0x88, 0xcf, 0x5b, 0x7a, 0x7b,
+	0xa9, 0x9b, 0x2b, 0x4a, 0x9e, 0x42, 0xd9, 0xd4, 0xa7, 0xd4, 0xf4, 0x3a, 0xb5, 0x0d, 0x21, 0xca,
+	0x0b, 0xa8, 0x0c, 0xa8, 0xff, 0xc9, 0x76, 0xaf, 0x23, 0xba, 0xb9, 0x90, 0xbc, 0xe1, 0xdc, 0xbc,
+	0x8c, 0x4b, 0xc1, 0x5f, 0xaf, 0x82, 0x52, 0x94, 0x3f, 0x72, 0x50, 0xe8, 0x39, 0x4e, 0xea, 0xc4,
+	0x23, 0x28, 0x19, 0xac, 0x13, 0xfc, 0x48, 0xfd, 0xa8, 0x99, 0xec, 0x0f, 0xde, 0x40, 0x09, 0x6b,
+	0xf4, 0x83, 0x76, 0x34, 0x25, 0x2e, 0x88, 0xf4, 0x8e, 0x39, 0x48, 0x1b, 0x6a, 0xf4, 0xb3, 0xe1,
+	0x6b, 0x33, 0x7b, 0x4e, 0x79, 0x8f, 0xda, 0xe9, 0x4a, 0x4b, 0x9b, 0xca, 0xf8, 0x3d, 0x0f, 0x85,
+	0x91, 0x3d, 0x17, 0xed, 0x0f, 0xf8, 0xd4, 0xa1, 0xe0, 0x88, 0xbb, 0x68, 0x6f, 0xce, 0x8e, 0xa7,
+	0x82, 0xec, 0x5d, 0x28, 0xea, 0x8e, 0xe3, 0x61, 0x62, 0x96, 0xa3, 0x21, 0xd3, 0x23, 0x0a, 0x54,
+	0xad, 0xa0, 0x4b, 0x21, 0x87, 0x56, 0xe4, 0x0f, 0xdb, 0xb7, 0x7e, 0x69, 0x29, 0xf2, 0x95, 0x4d,
+	0xd7, 0xd4, 0x84, 0xf2, 0xec, 0xca, 0xb5, 0x57, 0x0e, 0xde, 0x24, 0x23, 0x8e, 0x55, 0xcc, 0x5c,
+	0x8a, 0x9c, 0xe6, 0x1a, 0x4e, 0x5b, 0x8d, 0x5f, 0x39, 0xda, 0x90, 0xbf, 0x2b, 0x6c, 0xc0, 0x6d,
+	0x3b, 0xd0, 0xb8, 0x9a, 0x69, 0x4b, 0xdd, 0xbd, 0x0e, 0xac, 0x75, 0x66, 0x55, 0x9e, 0x41, 0x35,
+	0x42, 0xc6, 0x16, 0xe0, 0xdf, 0xa2, 0x1f, 0x77, 0xa1, 0x74, 0xc3, 0xac, 0x62, 0xbc, 0xff, 0xce,
+	0x41, 0x0d, 0x8b, 0x3f, 0x35, 0x4c, 0x9f, 0xba, 0x2c, 0xd2, 0x98, 0x7b, 0x18, 0x59, 0xc0, 0x48,
+	0x9c, 0x1b, 0xde, 0x2c, 0x0f, 0x43, 0x0b, 0xd9, 0xdd, 0x6a, 0xb3, 0xa5, 0x73, 0x34, 0x76, 0xfd,
+	0x1e, 0xf6, 0x94, 0x9d, 0x42, 0x13, 0xbf, 0x7f, 0x8d, 0x01, 0x15, 0xb9, 0xe9, 0x1e, 0xdc, 0x15,
+	0x7d, 0x13, 0x91, 0x25, 0x6e, 0x4e, 0x35, 0xa6, 0xbc, 0xa9, 0x31, 0xb8, 0x32, 0x41, 0x63, 0x82,
+	0xe6, 0xd5, 0xc8, 0x2e, 0x6c, 0x39, 0xf6, 0x5c, 0xf3, 0x56, 0x53, 0x2d, 0x74, 0xb0, 0xe1, 0xe7,
+	0xbb, 0x2a, 0xd6, 0x3d, 0xa3, 0x1c, 0xbc, 0x19, 0xc7, 0xa5, 0x0b, 0xe3, 0xb3, 0x28, 0x88, 0x77,
+	0x98, 0x2f, 0xb4, 0x4c, 0x1f, 0xa3, 0xae, 0xe9, 0x2d, 0x72, 0x8d, 0xd8, 0xc7, 0xeb, 0xb3, 0x69,
+	0xee, 0xc8, 0x7d, 0x68, 0x06, 0x3b, 0xcc, 0x6e, 0x60, 0x81, 0x99, 0xf9, 0xd5, 0x17, 0x18, 0xd1,
+	0xc8, 0x3e, 0xa5, 0xa8, 0x1b, 0xff, 0x77, 0x75, 0x91, 0xe1, 0x62, 0x65, 0x9a, 0x82, 0x61, 0x8d,
+	0x17, 0xf9, 0x27, 0x16, 0x79, 0x66, 0xda, 0x53, 0xdd, 0x3c, 0x35, 0xf5, 0x2b, 0x8f, 0x15, 0x39,
+	0x37, 0x5c, 0x71, 0xbb, 0x7b, 0xd0, 0xf6, 0x6e, 0x3d, 0x9f, 0x2e, 0x71, 0x7d, 0xac, 0x85, 0x71,
+	0xa5, 0x31, 0x57, 0x3e, 0x14, 0x1a, 0xd3, 0x9e, 0xe9, 0xa6, 0xec, 0x09, 0x34, 0x09, 0x69, 0xae,
+	0x3c, 0xea, 0xca, 0x8e, 0x40, 0x9b, 0x58, 0x5d, 0x96, 0x47, 0x67, 0x2b, 0x17, 0x55, 0x8f, 0x25,
+	0xe3, 0xca, 0xc4, 0x76, 0xfc, 0x9e, 0xef, 0xae, 0x3c, 0x5f, 0xc3, 0x56, 0x79, 0xda, 0xc2, 0xb5,
+	0x97, 0xda, 0x47, 0xdf, 0x77, 0x3c, 0x5e, 0x76, 0x55, 0x71, 0xa1, 0xd8, 0xb7, 0x16, 0x36, 0xd9,
+	0x86, 0xba, 0x7b, 0xed, 0x6b, 0xa1, 0xde, 0x05, 0x0c, 0x71, 0x5c, 0x71, 0x64, 0x66, 0x5a, 0x42,
+	0x65, 0x59, 0x28, 0xaa, 0x77, 0x64, 0x0c, 0x78, 0x1d, 0xe0, 0x64, 0xf3, 0x42, 0x45, 0xf2, 0x62,
+	0x4a, 0x71, 0xa5, 0x2e, 0x60, 0xce, 0x92, 0x7a, 0x43, 0xad, 0xcd, 0x12, 0xcf, 0xbd, 0x5c, 0xe2,
+	0x53, 0xe2, 0xcc, 0xe8, 0x8b, 0x84, 0xf8, 0x8b, 0x89, 0x30, 0x4f, 0x54, 0x20, 0x4f, 0xa0, 0x38,
+	0xd7, 0x7d, 0x7d, 0xb3, 0xdc, 0xf8, 0x50, 0xe7, 0xa8, 0x62, 0xda, 0x9e, 0x42, 0x89, 0x65, 0x0e,
+	0xe6, 0x2d, 0x3b, 0xb5, 0x18, 0xc8, 0x60, 0xfc, 0x70, 0x13, 0xe5, 0xc9, 0x63, 0xbb, 0x6d, 0x58,
+	0x33, 0xaa, 0x49, 0x14, 0xd0, 0xb6, 0xb2, 0x7c, 0xc3, 0x0c, 0x6c, 0xfc, 0x59, 0x50, 0x5a, 0xd0,
+	0x3c, 0xa3, 0x3e, 0x6b, 0xf0, 0x98, 0xfe, 0xb2, 0x42, 0x9d, 0x51, 0x0e, 0x61, 0x2b, 0xb2, 0x78,
+	0x0e, 0x0e, 0x14, 0x25, 0x0f, 0x50, 0xa9, 0xf1, 0xb7, 0x78, 0xa4, 0xee, 0xc6, 0x22, 0x8c, 0x46,
+	0xe5, 0x14, 0xb6, 0xce, 0x0d, 0xcf, 0xc7, 0x2d, 0xf6, 0x04, 0x04, 0xf9, 0x02, 0x2a, 0x0b, 0x5e,
+	0x45, 0xc0, 0xbe, 0x2e, 0xb1, 0x8f, 0xd5, 0x01, 0x15, 0x6a, 0x4e, 0x7d, 0xdd, 0x30, 0x79, 0xf3,
+	0xaa, 0x98, 0xb7, 0x15, 0xe3, 0x88, 0xc4, 0xa8, 0x9f, 0xb8, 0x9b, 0x21, 0x4a, 0x43, 0x46, 0x51,
+	0x9e, 0x40, 0xbb, 0x6f, 0x79, 0x0e, 0x9d, 0xb1, 0x23, 0x61, 0x66, 0x49, 0xab, 0x95, 0x6f, 0x80,
+	0xc8, 0x01, 0x02, 0x72, 0x0f, 0x15, 0xdc, 0x9e, 0x8b, 0x52, 0x92, 0x88, 0x3f, 0x41, 0x9b, 0x31,
+	0xe0, 0x3b, 0x1f, 0xd5, 0xf2, 0x55, 0xba, 0x96, 0xf4, 0x1b, 0x9d, 0x5d, 0xcd, 0x4b, 0x20, 0x32,
+	0x96, 0x48, 0xfe, 0x18, 0xca, 0x5c, 0xce, 0x42, 0xac, 0xd4, 0x7b, 0xa6, 0x3c, 0x85, 0x6d, 0x41,
+	0x99, 0xff, 0xce, 0xaa, 0xea, 0x7b, 0xd8, 0x49, 0x86, 0x08, 0xe8, 0xe8, 0xa5, 0xcc, 0x65, 0xbd,
+	0x94, 0xca, 0x0f, 0xb0, 0xcd, 0xf8, 0x50, 0x8b, 0x8f, 0x4f, 0x54, 0xdd, 0x97, 0x50, 0x0e, 0xaa,
+	0x5b, 0xfb, 0x00, 0x91, 0x66, 0x51, 0x79, 0x05, 0x3b, 0xc9, 0xc3, 0x71, 0x39, 0x94, 0x5b, 0xd6,
+	0xca, 0xe1, 0x81, 0xca, 0x2d, 0x1f, 0xae, 0x73, 0xfb, 0x2a, 0xca, 0x87, 0x6d, 0x62, 0x62, 0x1b,
+	0xbd, 0xa7, 0x28, 0x90, 0xa1, 0xe4, 0x8b, 0x1d, 0xc2, 0x39, 0x36, 0x0d, 0x8b, 0xcf, 0x71, 0xee,
+	0x79, 0x89, 0x1d, 0x58, 0xd8, 0xa6, 0x69, 0x7f, 0xe2, 0x33, 0x5c, 0x4d, 0xcd, 0x75, 0x29, 0x63,
+	0xae, 0xb9, 0x58, 0x2a, 0xfb, 0x7c, 0x8a, 0x83, 0xd4, 0x82, 0x6d, 0x84, 0xcc, 0x15, 0xfc, 0x80,
+	0x42, 0x2d, 0xfe, 0x50, 0xeb, 0x60, 0x57, 0x2f, 0x7a, 0x67, 0xaa, 0x36, 0xf9, 0x30, 0x52, 0xb5,
+	0xf7, 0x83, 0x13, 0xf5, 0xb4, 0x3f, 0x50, 0x4f, 0x5a, 0x77, 0x50, 0x4b, 0xb6, 0x24, 0x4f, 0x6f,
+	0x34, 0x3a, 0x6e, 0xe5, 0xf0, 0x0d, 0x6a, 0x4b, 0xc6, 0x93, 0xe1, 0xf1, 0x5b, 0x75, 0xdc, 0xca,
+	0x23, 0x91, 0xa6, 0x64, 0x1e, 0x1e, 0xf7, 0x5b, 0x85, 0x83, 0x11, 0x54, 0xa3, 0x8f, 0x91, 0x5d,
+	0xd8, 0x46, 0x00, 0xed, 0xdd, 0xa4, 0x37, 0x49, 0x26, 0x41, 0xbc, 0xd8, 0x31, 0x7e, 0x3f, 0x18,
+	0xf4, 0x07, 0x67, 0x98, 0x66, 0x07, 0x5a, 0xb1, 0x59, 0xfd, 0xb9, 0x3f, 0xc1, 0xe0, 0xfc, 0xc1,
+	0xbf, 0x39, 0xa8, 0x46, 0x6f, 0x26, 0x42, 0x8e, 0x86, 0x27, 0x19, 0x90, 0x78, 0x36, 0x76, 0xa8,
+	0x17, 0x6f, 0xc6, 0x1f, 0x86, 0x88, 0x98, 0x08, 0x1f, 0x8d, 0xd5, 0x51, 0x6f, 0xcc, 0x52, 0xe5,
+	0x51, 0x9c, 0x49, 0xda, 0x81, 0x30, 0x05, 0xc6, 0x2c, 0xb6, 0x87, 0xcc, 0x8a, 0x38, 0x6d, 0x7b,
+	0xb1, 0xb9, 0xf7, 0x66, 0x38, 0x46, 0x6a, 0xe1, 0xb1, 0x56, 0x29, 0x95, 0x3c, 0x20, 0x5e, 0x4e,
+	0xe6, 0x38, 0x51, 0xcf, 0xd5, 0x09, 0x03, 0xab, 0x24, 0x73, 0x9c, 0xf5, 0xc6, 0x6f, 0xb0, 0x85,
+	0xad, 0xea, 0xc1, 0x5f, 0x79, 0xa8, 0xc5, 0x62, 0x87, 0x37, 0xa4, 0x5e, 0xaa, 0x83, 0xc9, 0xfa,
+	0x0d, 0x3d, 0x80, 0x5d, 0xc9, 0xc3, 0x90, 0x22, 0xfe, 0x39, 0xfc, 0xca, 0x7a, 0x9c, 0xed, 0x0c,
+	0x59, 0x63, 0xed, 0x5d, 0xb8, 0x9f, 0x8a, 0x41, 0x2a, 0xdc, 0x57, 0x40, 0xb9, 0xb8, 0x97, 0xf2,
+	0x89, 0x72, 0x8a, 0xb8, 0x3b, 0xfb, 0x29, 0x97, 0xe0, 0xae, 0x1d, 0x0f, 0xcf, 0xcf, 0xd5, 0x63,
+	0x16, 0x55, 0x4a, 0x81, 0x8b, 0xeb, 0x1c, 0x07, 0x0d, 0x49, 0x82, 0x33, 0x9f, 0x00, 0xaf, 0xb0,
+	0x06, 0x4b, 0xae, 0x60, 0xaa, 0xfa, 0x17, 0xa3, 0x80, 0x72, 0x95, 0x3c, 0x84, 0xce, 0x9a, 0x7b,
+	0xac, 0x5e, 0x0c, 0x2f, 0xd1, 0x5b, 0x3b, 0xfa, 0xad, 0x88, 0x9f, 0x61, 0xab, 0xa9, 0x69, 0xcc,
+	0x7a, 0xa3, 0x3e, 0xf9, 0x11, 0x2a, 0x42, 0xd0, 0xc9, 0x6e, 0xfc, 0xda, 0x25, 0x44, 0xbf, 0xdb,
+	0x59, 0x77, 0x04, 0x5b, 0xa3, 0xdc, 0x21, 0x3d, 0xa8, 0x86, 0xc2, 0x4c, 0xe2, 0xb8, 0x94, 0xe6,
+	0x77, 0xf7, 0x32, 0x3c, 0x11, 0xc4, 0x19, 0x40, 0x2c, 0xc5, 0xa4, 0x2b, 0x3d, 0x20, 0x29, 0x01,
+	0xef, 0x3e, 0xc8, 0xf4, 0xc9, 0x40, 0xb1, 0xac, 0x4a, 0x40, 0x6b, 0xba, 0x2d, 0x01, 0xad, 0xeb,
+	0x30, 0x02, 0x5d, 0x40, 0x43, 0x96, 0x51, 0xf2, 0x30, 0x9d, 0x57, 0x16, 0xe0, 0xee, 0xa3, 0x0d,
+	0xde, 0x08, 0x6e, 0x08, 0x0d, 0x59, 0x21, 0x25, 0xb8, 0x0c, 0xd5, 0x95, 0xe0, 0xb2, 0x64, 0x55,
+	0xb9, 0xf3, 0x6d, 0x8e, 0xbc, 0xe6, 0x97, 0xc6, 0xf4, 0x2b, 0x79, 0x69, 0x92, 0x98, 0x26, 0x2f,
+	0x4d, 0x96, 0x3a, 0x86, 0x30, 0x2d, 0xf3, 0x7f, 0x5e, 0x5f, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff,
+	0x7c, 0xce, 0xe5, 0x26, 0xc9, 0x0e, 0x00, 0x00,
 }
diff --git a/api/v1alpha/api.proto b/api/v1alpha/api.proto
index 80b870a3f3..8bddb5c4f7 100644
--- a/api/v1alpha/api.proto
+++ b/api/v1alpha/api.proto
@@ -74,6 +74,9 @@ message Image {
 
         // Annotations on this image.
         repeated KeyValue annotations = 8;
+
+        // Labels of this image.
+        repeated KeyValue labels = 9;
 }
 
 // Network describes the network information of a pod.

From c3a48170b5c770eb1f2c21385135db06bec390bd Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 11 Jul 2016 15:44:22 -0700
Subject: [PATCH 0510/1304] api_service: Don't use manifest to do filtering.

So that we don't need to unmarshal the manifest.
---
 rkt/api_service.go | 85 ++++++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 37 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index f7eb381cb2..049739990f 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -100,15 +100,20 @@ func (s *v1AlphaAPIServer) GetInfo(context.Context, *v1alpha.GetInfoRequest) (*v
 	}, nil
 }
 
-type valueGetter interface {
-	Get(string) (string, bool)
+func findInKeyValues(kvs []*v1alpha.KeyValue, key string) (string, bool) {
+	for _, kv := range kvs {
+		if kv.Key == key {
+			return kv.Value, true
+		}
+	}
+	return "", false
 }
 
 // containsAllKeyValues returns true if the actualKVs contains all of the key-value
 // pairs listed in requiredKVs, otherwise it returns false.
-func containsAllKeyValues(actualKVs valueGetter, requiredKVs []*v1alpha.KeyValue) bool {
+func containsAllKeyValues(actualKVs []*v1alpha.KeyValue, requiredKVs []*v1alpha.KeyValue) bool {
 	for _, requiredKV := range requiredKVs {
-		actualValue, ok := actualKVs.Get(requiredKV.Key)
+		actualValue, ok := findInKeyValues(actualKVs, requiredKV.Key)
 		if !ok || actualValue != requiredKV.Value {
 			return false
 		}
@@ -132,8 +137,8 @@ func isPartOf(keyword, s string) bool {
 }
 
 // satisfiesPodFilter returns true if the pod satisfies the filter.
-// The pod, manifest, filter must not be nil.
-func satisfiesPodFilter(pod v1alpha.Pod, manifest schema.PodManifest, filter v1alpha.PodFilter) bool {
+// The pod, filter must not be nil.
+func satisfiesPodFilter(pod v1alpha.Pod, filter v1alpha.PodFilter) bool {
 	// Filter according to the ID.
 	if len(filter.Ids) > 0 {
 		s := set.NewString(filter.Ids...)
@@ -191,7 +196,7 @@ func satisfiesPodFilter(pod v1alpha.Pod, manifest schema.PodManifest, filter v1a
 
 	// Filter according to the annotations.
 	if len(filter.Annotations) > 0 {
-		if !containsAllKeyValues(manifest.Annotations, filter.Annotations) {
+		if !containsAllKeyValues(pod.Annotations, filter.Annotations) {
 			return false
 		}
 	}
@@ -226,19 +231,14 @@ func satisfiesPodFilter(pod v1alpha.Pod, manifest schema.PodManifest, filter v1a
 
 // satisfiesAnyPodFilters returns true if any of the filter conditions is satisfied
 // by the pod, or there's no filters.
-func satisfiesAnyPodFilters(pod *v1alpha.Pod, manifest *schema.PodManifest, filters []*v1alpha.PodFilter) bool {
+func satisfiesAnyPodFilters(pod *v1alpha.Pod, filters []*v1alpha.PodFilter) bool {
 	// No filters, return true directly.
 	if len(filters) == 0 {
 		return true
 	}
 
-	// No manifest, but have filters, return false.
-	if manifest == nil {
-		return false
-	}
-
 	for _, filter := range filters {
-		if satisfiesPodFilter(*pod, *manifest, *filter) {
+		if satisfiesPodFilter(*pod, *filter) {
 			return true
 		}
 	}
@@ -300,9 +300,8 @@ func getNetworks(p *pod) []*v1alpha.Network {
 	return networks
 }
 
-// getBasicPod returns *v1alpha.Pod with basic pod information, it also returns a *schema.PodManifest
-// object.
-func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest) {
+// getBasicPod returns *v1alpha.Pod with basic pod information.
+func getBasicPod(p *pod) *v1alpha.Pod {
 	pod := &v1alpha.Pod{Id: p.uuid.String(), Pid: -1}
 
 	manifest, data, err := getPodManifest(p)
@@ -319,7 +318,7 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest) {
 		pod.State = v1alpha.PodState_POD_STATE_EMBRYO
 		// When a pod is in embryo state, there is not much
 		// information to return.
-		return pod, manifest
+		return pod
 	case Preparing:
 		pod.State = v1alpha.PodState_POD_STATE_PREPARING
 	case AbortedPrepare:
@@ -337,7 +336,7 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest) {
 		pod.State = v1alpha.PodState_POD_STATE_GARBAGE
 	default:
 		pod.State = v1alpha.PodState_POD_STATE_UNDEFINED
-		return pod, manifest
+		return pod
 	}
 
 	createdAt, err := p.getCreationTime()
@@ -394,7 +393,7 @@ func getBasicPod(p *pod) (*v1alpha.Pod, *schema.PodManifest) {
 		}
 	}
 
-	return pod, manifest
+	return pod
 }
 
 func waitForMachinedRegistration(uuid string) error {
@@ -419,10 +418,10 @@ func waitForMachinedRegistration(uuid string) error {
 func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPodsRequest) (*v1alpha.ListPodsResponse, error) {
 	var pods []*v1alpha.Pod
 	if err := walkPods(includeMostDirs, func(p *pod) {
-		pod, manifest := getBasicPod(p)
+		pod := getBasicPod(p)
 
 		// Filters are combined with 'OR'.
-		if !satisfiesAnyPodFilters(pod, manifest, request.Filters) {
+		if !satisfiesAnyPodFilters(pod, request.Filters) {
 			return
 		}
 
@@ -524,7 +523,7 @@ func (s *v1AlphaAPIServer) InspectPod(ctx context.Context, request *v1alpha.Insp
 	}
 	defer p.Close()
 
-	pod, _ := getBasicPod(p)
+	pod := getBasicPod(p)
 
 	// Fill the extra pod info that is not available in ListPods(detail=false).
 	fillAppInfo(s.store, p, pod)
@@ -533,18 +532,17 @@ func (s *v1AlphaAPIServer) InspectPod(ctx context.Context, request *v1alpha.Insp
 }
 
 // aciInfoToV1AlphaAPIImage takes an aciInfo object and construct the v1alpha.Image object.
-// It also returns the image manifest of the image.
-func aciInfoToV1AlphaAPIImage(store *store.Store, aciInfo *store.ACIInfo) (*v1alpha.Image, *schema.ImageManifest, error) {
+func aciInfoToV1AlphaAPIImage(store *store.Store, aciInfo *store.ACIInfo) (*v1alpha.Image, error) {
 	manifest, err := store.GetImageManifestJSON(aciInfo.BlobKey)
 	if err != nil {
 		stderr.PrintE("failed to read the image manifest", err)
-		return nil, nil, err
+		return nil, err
 	}
 
 	var im schema.ImageManifest
 	if err = json.Unmarshal(manifest, &im); err != nil {
 		stderr.PrintE("failed to unmarshal image manifest", err)
-		return nil, nil, err
+		return nil, err
 	}
 
 	version, ok := im.Labels.Get("version")
@@ -566,7 +564,8 @@ func aciInfoToV1AlphaAPIImage(store *store.Store, aciInfo *store.ACIInfo) (*v1al
 		Manifest:        manifest,
 		Size:            aciInfo.Size + aciInfo.TreeStoreSize,
 		Annotations:     convertAnnotationsToKeyValue(im.Annotations),
-	}, &im, nil
+		Labels:          convertLabelsToKeyValue(im.Labels),
+	}, nil
 }
 
 func convertAnnotationsToKeyValue(as types.Annotations) []*v1alpha.KeyValue {
@@ -581,9 +580,21 @@ func convertAnnotationsToKeyValue(as types.Annotations) []*v1alpha.KeyValue {
 	return kvs
 }
 
+func convertLabelsToKeyValue(ls types.Labels) []*v1alpha.KeyValue {
+	kvs := make([]*v1alpha.KeyValue, 0, len(ls))
+	for _, l := range ls {
+		kv := &v1alpha.KeyValue{
+			Key:   string(l.Name),
+			Value: l.Value,
+		}
+		kvs = append(kvs, kv)
+	}
+	return kvs
+}
+
 // satisfiesImageFilter returns true if the image satisfies the filter.
-// The image, manifest, filter must not be nil.
-func satisfiesImageFilter(image v1alpha.Image, manifest schema.ImageManifest, filter v1alpha.ImageFilter) bool {
+// The image, filter must not be nil.
+func satisfiesImageFilter(image v1alpha.Image, filter v1alpha.ImageFilter) bool {
 	// Filter according to the IDs.
 	if len(filter.Ids) > 0 {
 		s := set.NewString(filter.Ids...)
@@ -638,14 +649,14 @@ func satisfiesImageFilter(image v1alpha.Image, manifest schema.ImageManifest, fi
 
 	// Filter according to the image labels.
 	if len(filter.Labels) > 0 {
-		if !containsAllKeyValues(manifest.Labels, filter.Labels) {
+		if !containsAllKeyValues(image.Labels, filter.Labels) {
 			return false
 		}
 	}
 
 	// Filter according to the annotations.
 	if len(filter.Annotations) > 0 {
-		if !containsAllKeyValues(manifest.Annotations, filter.Annotations) {
+		if !containsAllKeyValues(image.Annotations, filter.Annotations) {
 			return false
 		}
 	}
@@ -655,13 +666,13 @@ func satisfiesImageFilter(image v1alpha.Image, manifest schema.ImageManifest, fi
 
 // satisfiesAnyImageFilters returns true if any of the filter conditions is satisfied
 // by the image, or there's no filters.
-func satisfiesAnyImageFilters(image *v1alpha.Image, manifest *schema.ImageManifest, filters []*v1alpha.ImageFilter) bool {
+func satisfiesAnyImageFilters(image *v1alpha.Image, filters []*v1alpha.ImageFilter) bool {
 	// No filters, return true directly.
 	if len(filters) == 0 {
 		return true
 	}
 	for _, filter := range filters {
-		if satisfiesImageFilter(*image, *manifest, *filter) {
+		if satisfiesImageFilter(*image, *filter) {
 			return true
 		}
 	}
@@ -677,11 +688,11 @@ func (s *v1AlphaAPIServer) ListImages(ctx context.Context, request *v1alpha.List
 
 	var images []*v1alpha.Image
 	for _, aciInfo := range aciInfos {
-		image, manifest, err := aciInfoToV1AlphaAPIImage(s.store, aciInfo)
+		image, err := aciInfoToV1AlphaAPIImage(s.store, aciInfo)
 		if err != nil {
 			continue
 		}
-		if !satisfiesAnyImageFilters(image, manifest, request.Filters) {
+		if !satisfiesAnyImageFilters(image, request.Filters) {
 			continue
 		}
 		if !request.Detail {
@@ -706,7 +717,7 @@ func getImageInfo(store *store.Store, imageID string) (*v1alpha.Image, error) {
 		return nil, err
 	}
 
-	image, _, err := aciInfoToV1AlphaAPIImage(store, aciInfo)
+	image, err := aciInfoToV1AlphaAPIImage(store, aciInfo)
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to convert ACI to v1alphaAPIImage for image %q", key), err)
 		return nil, err

From 1fdc8b4dee93603e88877e962f326b0fb6b3ae55 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 11 Jul 2016 16:14:15 -0700
Subject: [PATCH 0511/1304] api_service: Update tests.

---
 rkt/api_service_test.go | 153 +++++++++++++---------------------------
 1 file changed, 49 insertions(+), 104 deletions(-)

diff --git a/rkt/api_service_test.go b/rkt/api_service_test.go
index c73bfa903d..74131c9992 100644
--- a/rkt/api_service_test.go
+++ b/rkt/api_service_test.go
@@ -17,24 +17,20 @@ package main
 import (
 	"testing"
 
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/api/v1alpha"
 )
 
 func TestFilterPod(t *testing.T) {
 	tests := []struct {
-		pod      *v1alpha.Pod
-		manifest *schema.PodManifest
-		filter   *v1alpha.PodFilter
-		result   bool
+		pod    *v1alpha.Pod
+		filter *v1alpha.PodFilter
+		result bool
 	}{
 		// Has the status.
 		{
 			&v1alpha.Pod{
 				State: v1alpha.PodState_POD_STATE_RUNNING,
 			},
-			&schema.PodManifest{},
 			&v1alpha.PodFilter{
 				States: []v1alpha.PodState{v1alpha.PodState_POD_STATE_RUNNING},
 			},
@@ -45,7 +41,6 @@ func TestFilterPod(t *testing.T) {
 			&v1alpha.Pod{
 				State: v1alpha.PodState_POD_STATE_EXITED,
 			},
-			&schema.PodManifest{},
 			&v1alpha.PodFilter{
 				States: []v1alpha.PodState{v1alpha.PodState_POD_STATE_RUNNING},
 			},
@@ -59,7 +54,6 @@ func TestFilterPod(t *testing.T) {
 					{Name: "app-bar"},
 				},
 			},
-			&schema.PodManifest{},
 			&v1alpha.PodFilter{
 				AppNames: []string{"app-foo", "app-bar"},
 			},
@@ -73,7 +67,6 @@ func TestFilterPod(t *testing.T) {
 					{Name: "app-bar"},
 				},
 			},
-			&schema.PodManifest{},
 			&v1alpha.PodFilter{
 				AppNames: []string{"app-foo", "app-bar", "app-baz"},
 			},
@@ -87,7 +80,6 @@ func TestFilterPod(t *testing.T) {
 					{Name: "network-bar"},
 				},
 			},
-			&schema.PodManifest{},
 			&v1alpha.PodFilter{
 				NetworkNames: []string{"network-foo", "network-bar"},
 			},
@@ -101,7 +93,6 @@ func TestFilterPod(t *testing.T) {
 					{Name: "network-bar"},
 				},
 			},
-			&schema.PodManifest{},
 			&v1alpha.PodFilter{
 				NetworkNames: []string{"network-foo", "network-bar", "network-baz"},
 			},
@@ -109,9 +100,8 @@ func TestFilterPod(t *testing.T) {
 		},
 		// Has all annotations.
 		{
-			&v1alpha.Pod{},
-			&schema.PodManifest{
-				Annotations: []types.Annotation{
+			&v1alpha.Pod{
+				Annotations: []*v1alpha.KeyValue{
 					{"annotation-key-foo", "annotation-value-foo"},
 					{"annotation-key-bar", "annotation-value-bar"},
 				},
@@ -126,9 +116,8 @@ func TestFilterPod(t *testing.T) {
 		},
 		// Doesn't have all annotation keys.
 		{
-			&v1alpha.Pod{},
-			&schema.PodManifest{
-				Annotations: []types.Annotation{
+			&v1alpha.Pod{
+				Annotations: []*v1alpha.KeyValue{
 					{"annotation-key-foo", "annotation-value-foo"},
 					{"annotation-key-bar", "annotation-value-bar"},
 				},
@@ -144,9 +133,8 @@ func TestFilterPod(t *testing.T) {
 		},
 		// Doesn't have all annotation values.
 		{
-			&v1alpha.Pod{},
-			&schema.PodManifest{
-				Annotations: []types.Annotation{
+			&v1alpha.Pod{
+				Annotations: []*v1alpha.KeyValue{
 					{"annotation-key-foo", "annotation-value-foo"},
 					{"annotation-key-bar", "annotation-value-bar"},
 				},
@@ -162,11 +150,9 @@ func TestFilterPod(t *testing.T) {
 		// Doesn't satisfy any filter conditions.
 		{
 			&v1alpha.Pod{
-				Apps:     []*v1alpha.App{{Name: "app-foo"}},
-				Networks: []*v1alpha.Network{{Name: "network-foo"}},
-			},
-			&schema.PodManifest{
-				Annotations: []types.Annotation{{"annotation-key-foo", "annotation-value-foo"}},
+				Apps:        []*v1alpha.App{{Name: "app-foo"}},
+				Networks:    []*v1alpha.Network{{Name: "network-foo"}},
+				Annotations: []*v1alpha.KeyValue{{"annotation-key-foo", "annotation-value-foo"}},
 			},
 			&v1alpha.PodFilter{
 				AppNames:     []string{"app-bar"},
@@ -178,11 +164,9 @@ func TestFilterPod(t *testing.T) {
 		// Satisfies some filter conditions.
 		{
 			&v1alpha.Pod{
-				Apps:     []*v1alpha.App{{Name: "app-foo"}},
-				Networks: []*v1alpha.Network{{Name: "network-foo"}},
-			},
-			&schema.PodManifest{
-				Annotations: []types.Annotation{{"annotation-key-foo", "annotation-value-foo"}},
+				Apps:        []*v1alpha.App{{Name: "app-foo"}},
+				Networks:    []*v1alpha.Network{{Name: "network-foo"}},
+				Annotations: []*v1alpha.KeyValue{{"annotation-key-foo", "annotation-value-foo"}},
 			},
 			&v1alpha.PodFilter{
 				AppNames:     []string{"app-foo", "app-bar"},
@@ -194,11 +178,9 @@ func TestFilterPod(t *testing.T) {
 		// Satisfies all filter conditions.
 		{
 			&v1alpha.Pod{
-				Apps:     []*v1alpha.App{{Name: "app-foo"}},
-				Networks: []*v1alpha.Network{{Name: "network-foo"}},
-			},
-			&schema.PodManifest{
-				Annotations: []types.Annotation{{"annotation-key-foo", "annotation-value-foo"}},
+				Apps:        []*v1alpha.App{{Name: "app-foo"}},
+				Networks:    []*v1alpha.Network{{Name: "network-foo"}},
+				Annotations: []*v1alpha.KeyValue{{"annotation-key-foo", "annotation-value-foo"}},
 			},
 			&v1alpha.PodFilter{
 				AppNames:     []string{"app-foo"},
@@ -210,7 +192,7 @@ func TestFilterPod(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		result := satisfiesPodFilter(*tt.pod, *tt.manifest, *tt.filter)
+		result := satisfiesPodFilter(*tt.pod, *tt.filter)
 		if result != tt.result {
 			t.Errorf("#%d: got %v, want %v", i, result, tt.result)
 		}
@@ -219,10 +201,9 @@ func TestFilterPod(t *testing.T) {
 
 func TestFilterPodAny(t *testing.T) {
 	tests := []struct {
-		pod      *v1alpha.Pod
-		manifest *schema.PodManifest
-		filters  []*v1alpha.PodFilter
-		result   bool
+		pod     *v1alpha.Pod
+		filters []*v1alpha.PodFilter
+		result  bool
 	}{
 		// No filters.
 		{
@@ -230,7 +211,6 @@ func TestFilterPodAny(t *testing.T) {
 				Apps:     []*v1alpha.App{{Name: "app-foo"}},
 				Networks: []*v1alpha.Network{{Name: "network-foo"}},
 			},
-			&schema.PodManifest{},
 			nil,
 			true,
 		},
@@ -240,7 +220,6 @@ func TestFilterPodAny(t *testing.T) {
 				Apps:     []*v1alpha.App{{Name: "app-foo"}},
 				Networks: []*v1alpha.Network{{Name: "network-foo"}},
 			},
-			&schema.PodManifest{},
 			[]*v1alpha.PodFilter{
 				{AppNames: []string{"app-foo"}},
 				{NetworkNames: []string{"network-foo"}},
@@ -253,7 +232,6 @@ func TestFilterPodAny(t *testing.T) {
 				Apps:     []*v1alpha.App{{Name: "app-foo"}},
 				Networks: []*v1alpha.Network{{Name: "network-foo"}},
 			},
-			&schema.PodManifest{},
 			[]*v1alpha.PodFilter{
 				{AppNames: []string{"app-foo"}},
 				{NetworkNames: []string{"network-bar"}},
@@ -266,7 +244,6 @@ func TestFilterPodAny(t *testing.T) {
 				Apps:     []*v1alpha.App{{Name: "app-foo"}},
 				Networks: []*v1alpha.Network{{Name: "network-foo"}},
 			},
-			&schema.PodManifest{},
 			[]*v1alpha.PodFilter{
 				{AppNames: []string{"app-bar"}},
 				{NetworkNames: []string{"network-bar"}},
@@ -276,7 +253,7 @@ func TestFilterPodAny(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		result := satisfiesAnyPodFilters(tt.pod, tt.manifest, tt.filters)
+		result := satisfiesAnyPodFilters(tt.pod, tt.filters)
 		if result != tt.result {
 			t.Errorf("#%d: got %v, want %v", i, result, tt.result)
 		}
@@ -285,17 +262,15 @@ func TestFilterPodAny(t *testing.T) {
 
 func TestFilterImage(t *testing.T) {
 	tests := []struct {
-		image    *v1alpha.Image
-		manifest *schema.ImageManifest
-		filter   *v1alpha.ImageFilter
-		result   bool
+		image  *v1alpha.Image
+		filter *v1alpha.ImageFilter
+		result bool
 	}{
 		// Has the id.
 		{
 			&v1alpha.Image{
 				Id: "id-foo",
 			},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				Ids: []string{"id-first", "id-foo", "id-last"},
 			},
@@ -306,7 +281,6 @@ func TestFilterImage(t *testing.T) {
 			&v1alpha.Image{
 				Id: "id-foo",
 			},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				Ids: []string{"id-first", "id-second", "id-last"},
 			},
@@ -317,7 +291,6 @@ func TestFilterImage(t *testing.T) {
 			&v1alpha.Image{
 				Name: "prefix-foo-foo",
 			},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				Prefixes: []string{"prefix-first", "prefix-foo", "prefix-last"},
 			},
@@ -328,7 +301,6 @@ func TestFilterImage(t *testing.T) {
 			&v1alpha.Image{
 				Name: "prefix-foo-foo",
 			},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				Prefixes: []string{"prefix-first", "prefix-second", "prefix-last"},
 			},
@@ -339,7 +311,6 @@ func TestFilterImage(t *testing.T) {
 			&v1alpha.Image{
 				Name: "foo/basename-foo",
 			},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				BaseNames: []string{"basename-first", "basename-foo", "basename-last"},
 			},
@@ -350,7 +321,6 @@ func TestFilterImage(t *testing.T) {
 			&v1alpha.Image{
 				Name: "foo/basename-foo",
 			},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				BaseNames: []string{"basename-first", "basename-second", "basename-last"},
 			},
@@ -361,7 +331,6 @@ func TestFilterImage(t *testing.T) {
 			&v1alpha.Image{
 				Name: "foo-keyword-foo-foo",
 			},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				Keywords: []string{"keyword-first", "keyword-foo", "keyword-last"},
 			},
@@ -372,7 +341,6 @@ func TestFilterImage(t *testing.T) {
 			&v1alpha.Image{
 				Name: "foo-keyword-foo-foo",
 			},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				Keywords: []string{"keyword-first", "keyword-second", "keyword-last"},
 			},
@@ -380,9 +348,8 @@ func TestFilterImage(t *testing.T) {
 		},
 		// Has all the labels in the manifest.
 		{
-			&v1alpha.Image{},
-			&schema.ImageManifest{
-				Labels: []types.Label{
+			&v1alpha.Image{
+				Labels: []*v1alpha.KeyValue{
 					{"label-key-foo", "label-value-foo"},
 					{"label-key-bar", "label-value-bar"},
 				},
@@ -397,9 +364,8 @@ func TestFilterImage(t *testing.T) {
 		},
 		// Doesn't have all the label keys in the manifest.
 		{
-			&v1alpha.Image{},
-			&schema.ImageManifest{
-				Labels: []types.Label{
+			&v1alpha.Image{
+				Labels: []*v1alpha.KeyValue{
 					{"label-key-foo", "label-value-foo"},
 					{"label-key-bar", "label-value-bar"},
 				},
@@ -415,9 +381,8 @@ func TestFilterImage(t *testing.T) {
 		},
 		// Doesn't have all the label values in the manifest.
 		{
-			&v1alpha.Image{},
-			&schema.ImageManifest{
-				Labels: []types.Label{
+			&v1alpha.Image{
+				Labels: []*v1alpha.KeyValue{
 					{"label-key-foo", "label-value-foo"},
 					{"label-key-bar", "label-value-bar"},
 				},
@@ -432,9 +397,8 @@ func TestFilterImage(t *testing.T) {
 		},
 		// Has all the annotation in the manifest.
 		{
-			&v1alpha.Image{},
-			&schema.ImageManifest{
-				Annotations: []types.Annotation{
+			&v1alpha.Image{
+				Annotations: []*v1alpha.KeyValue{
 					{"annotation-key-foo", "annotation-value-foo"},
 					{"annotation-key-bar", "annotation-value-bar"},
 				},
@@ -449,9 +413,8 @@ func TestFilterImage(t *testing.T) {
 		},
 		// Doesn't have all the annotation keys in the manifest.
 		{
-			&v1alpha.Image{},
-			&schema.ImageManifest{
-				Annotations: []types.Annotation{
+			&v1alpha.Image{
+				Annotations: []*v1alpha.KeyValue{
 					{"annotation-key-foo", "annotation-value-foo"},
 					{"annotation-key-bar", "annotation-value-bar"},
 				},
@@ -467,9 +430,8 @@ func TestFilterImage(t *testing.T) {
 		},
 		// Doesn't have all the annotation values in the manifest.
 		{
-			&v1alpha.Image{},
-			&schema.ImageManifest{
-				Annotations: []types.Annotation{
+			&v1alpha.Image{
+				Annotations: []*v1alpha.KeyValue{
 					{"annotation-key-foo", "annotation-value-foo"},
 					{"annotation-key-bar", "annotation-value-bar"},
 				},
@@ -485,7 +447,6 @@ func TestFilterImage(t *testing.T) {
 		// Satisfies 'imported after'.
 		{
 			&v1alpha.Image{ImportTimestamp: 1024},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				ImportedAfter: 1023,
 			},
@@ -494,7 +455,6 @@ func TestFilterImage(t *testing.T) {
 		// Doesn't satisfy 'imported after'.
 		{
 			&v1alpha.Image{ImportTimestamp: 1024},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				ImportedAfter: 1024,
 			},
@@ -503,7 +463,6 @@ func TestFilterImage(t *testing.T) {
 		// Satisfies 'imported before'.
 		{
 			&v1alpha.Image{ImportTimestamp: 1024},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				ImportedBefore: 1025,
 			},
@@ -512,7 +471,6 @@ func TestFilterImage(t *testing.T) {
 		// Doesn't satisfy 'imported before'.
 		{
 			&v1alpha.Image{ImportTimestamp: 1024},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				ImportedBefore: 1024,
 			},
@@ -521,7 +479,6 @@ func TestFilterImage(t *testing.T) {
 		// Match one of the full names.
 		{
 			&v1alpha.Image{Name: "foo/basename-foo"},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				FullNames: []string{"foo/basename-foo", "foo/basename-bar"},
 			},
@@ -530,7 +487,6 @@ func TestFilterImage(t *testing.T) {
 		// Doesn't match any full names.
 		{
 			&v1alpha.Image{Name: "foo/basename-foo"},
-			&schema.ImageManifest{},
 			&v1alpha.ImageFilter{
 				FullNames: []string{"bar/basename-foo", "foo/basename-bar"},
 			},
@@ -543,10 +499,8 @@ func TestFilterImage(t *testing.T) {
 				Name:            "prefix-foo-keyword-foo/basename-foo",
 				Version:         "1.0",
 				ImportTimestamp: 1024,
-			},
-			&schema.ImageManifest{
-				Labels:      []types.Label{{"label-key-foo", "label-value-foo"}},
-				Annotations: []types.Annotation{{"annotation-key-foo", "annotation-value-foo"}},
+				Labels:          []*v1alpha.KeyValue{{"label-key-foo", "label-value-foo"}},
+				Annotations:     []*v1alpha.KeyValue{{"annotation-key-foo", "annotation-value-foo"}},
 			},
 			&v1alpha.ImageFilter{
 				Ids:            []string{"id-bar"},
@@ -567,10 +521,8 @@ func TestFilterImage(t *testing.T) {
 				Name:            "prefix-foo-keyword-foo/basename-foo",
 				Version:         "1.0",
 				ImportTimestamp: 1024,
-			},
-			&schema.ImageManifest{
-				Labels:      []types.Label{{"label-key-foo", "label-value-foo"}},
-				Annotations: []types.Annotation{{"annotation-key-foo", "annotation-value-foo"}},
+				Labels:          []*v1alpha.KeyValue{{"label-key-foo", "label-value-foo"}},
+				Annotations:     []*v1alpha.KeyValue{{"annotation-key-foo", "annotation-value-foo"}},
 			},
 			&v1alpha.ImageFilter{
 				Ids:            []string{"id-bar", "id-foo"},
@@ -591,10 +543,8 @@ func TestFilterImage(t *testing.T) {
 				Name:            "prefix-foo-keyword-foo/basename-foo",
 				Version:         "1.0",
 				ImportTimestamp: 1024,
-			},
-			&schema.ImageManifest{
-				Labels:      []types.Label{{"label-key-foo", "label-value-foo"}},
-				Annotations: []types.Annotation{{"annotation-key-foo", "annotation-value-foo"}},
+				Labels:          []*v1alpha.KeyValue{{"label-key-foo", "label-value-foo"}},
+				Annotations:     []*v1alpha.KeyValue{{"annotation-key-foo", "annotation-value-foo"}},
 			},
 			&v1alpha.ImageFilter{
 				Ids:            []string{"id-bar", "id-foo"},
@@ -611,7 +561,7 @@ func TestFilterImage(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		result := satisfiesImageFilter(*tt.image, *tt.manifest, *tt.filter)
+		result := satisfiesImageFilter(*tt.image, *tt.filter)
 		if result != tt.result {
 			t.Errorf("#%d: got %v, want %v", i, result, tt.result)
 		}
@@ -620,10 +570,9 @@ func TestFilterImage(t *testing.T) {
 
 func TestFilterImageAny(t *testing.T) {
 	tests := []struct {
-		image    *v1alpha.Image
-		manifest *schema.ImageManifest
-		filters  []*v1alpha.ImageFilter
-		result   bool
+		image   *v1alpha.Image
+		filters []*v1alpha.ImageFilter
+		result  bool
 	}{
 		// No filters.
 		{
@@ -631,7 +580,6 @@ func TestFilterImageAny(t *testing.T) {
 				Id:   "id-foo",
 				Name: "prefix-foo-keyword-foo/basename-foo",
 			},
-			&schema.ImageManifest{},
 			nil,
 			true,
 		},
@@ -641,7 +589,6 @@ func TestFilterImageAny(t *testing.T) {
 				Id:   "id-foo",
 				Name: "prefix-foo-keyword-foo/basename-foo",
 			},
-			&schema.ImageManifest{},
 			[]*v1alpha.ImageFilter{
 				{Ids: []string{"id-foo"}},
 				{BaseNames: []string{"basename-foo"}},
@@ -654,7 +601,6 @@ func TestFilterImageAny(t *testing.T) {
 				Id:   "id-foo",
 				Name: "prefix-foo-keyword-foo/basename-foo",
 			},
-			&schema.ImageManifest{},
 			[]*v1alpha.ImageFilter{
 				{Ids: []string{"id-foo"}},
 				{BaseNames: []string{"basename-bar"}},
@@ -667,7 +613,6 @@ func TestFilterImageAny(t *testing.T) {
 				Id:   "id-foo",
 				Name: "prefix-foo-keyword-foo/basename-foo",
 			},
-			&schema.ImageManifest{},
 			[]*v1alpha.ImageFilter{
 				{Ids: []string{"id-bar"}},
 				{BaseNames: []string{"basename-bar"}},
@@ -677,7 +622,7 @@ func TestFilterImageAny(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		result := satisfiesAnyImageFilters(tt.image, tt.manifest, tt.filters)
+		result := satisfiesAnyImageFilters(tt.image, tt.filters)
 		if result != tt.result {
 			t.Errorf("#%d: got %v, want %v", i, result, tt.result)
 		}

From a0bbaef96c52ddf7f55b3282e72d51a709875523 Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Sun, 10 Jul 2016 23:39:00 +0200
Subject: [PATCH 0512/1304] store: simplify db locking and functions

Instead of having a file lock to handle inter process locking and a sync.Mutex
to handle locking between multiple goroutines, just create, lock and close a
new file lock at every db.Do function.

Additionally, saving a sqldb instance in the db struct between open and close
doesn't makes great sense (and will create data races accessing sqldb, and that
was one of the reasons for the added sync.Mutex) since sqldb will be opened and
closed for every db.Do.
---
 store/db.go      | 125 +++++------------------------------------------
 store/db_test.go |   4 --
 store/store.go   |   8 +--
 3 files changed, 14 insertions(+), 123 deletions(-)

diff --git a/store/db.go b/store/db.go
index 193ad207f1..833bcc4204 100644
--- a/store/db.go
+++ b/store/db.go
@@ -16,14 +16,10 @@ package store
 
 import (
 	"database/sql"
-	"errors"
-	"fmt"
 	"os"
 	"path/filepath"
-	"sync"
 
 	"github.com/coreos/rkt/pkg/lock"
-	"github.com/hashicorp/errwrap"
 
 	_ "github.com/cznic/ql/driver"
 )
@@ -32,133 +28,38 @@ const (
 	DbFilename = "ql.db"
 )
 
-// dbLock is used to guarantee both thread-safety and process-safety
-// for db access.
-type dbLock struct {
-	// This lock is to make that access to the ql db file being blocking
-	// since ql use an internal locking that will not block and return an
-	// error when a lock is already held.
-	fl *lock.FileLock
-	// This lock is to avoid concurrent access from multiple goroutines.
-	sync.Mutex
-}
-
-func newDBLock(dirPath string) (*dbLock, error) {
-	l, err := lock.NewLock(dirPath, lock.Dir)
-	if err != nil {
-		return nil, err
-	}
-	return &dbLock{fl: l}, nil
-}
-
-func (dl *dbLock) lock() error {
-	dl.Lock()
-	if err := dl.fl.ExclusiveLock(); err != nil {
-		dl.Unlock()
-		return err
-	}
-	return nil
-}
-
-func (dl *dbLock) unlock() {
-	if err := dl.fl.Unlock(); err != nil {
-		// TODO(sgotti) what'll happen when df.fl.Unlock fails? From
-		// man 2 flock looks like it'll happen only when the underlying
-		// fd has been closed (in this case the lock has been released
-		// when the fd has been closed, assuming no dup fd due to
-		// forking etc...).
-
-		// If there're other cases where it fails without unlocking,
-		// there's no simple way to handle them.
-		// Possible solutions:
-		// * panic (done here)
-		// * try to close the lock (and related fd), panic if close
-		// fails and create a new lock.
-		//
-		// Passing a specific error to the caller and let it recover
-		// creating a new store instance is tricky because we
-		// don't know the lock state and cannot be sure on how to clean
-		// this store instance
-
-		panic(fmt.Errorf("failed to unlock the db flock: %v", err))
-	}
-	dl.Unlock()
-}
-
-func (dl *dbLock) close() error {
-	return dl.fl.Close()
-}
-
 type DB struct {
 	dbdir string
-	dl    *dbLock
-	sqldb *sql.DB
 }
 
 func NewDB(dbdir string) (*DB, error) {
 	if err := os.MkdirAll(dbdir, defaultPathPerm); err != nil {
 		return nil, err
 	}
-
-	dl, err := newDBLock(dbdir)
-	if err != nil {
-		return nil, err
-	}
-
-	return &DB{dbdir: dbdir, dl: dl}, nil
-}
-
-func (db *DB) Open() error {
-	if err := db.dl.lock(); err != nil {
-		return err
-	}
-
-	sqldb, err := sql.Open("ql", filepath.Join(db.dbdir, DbFilename))
-	if err != nil {
-		db.dl.unlock()
-		return err
-	}
-	db.sqldb = sqldb
-
-	return nil
-}
-
-func (db *DB) Close() error {
-	if db.sqldb == nil {
-		panic("cas db, Close called without an open sqldb")
-	}
-
-	if err := db.sqldb.Close(); err != nil {
-		return errwrap.Wrap(errors.New("cas db close failed"), err)
-	}
-	db.sqldb = nil
-
-	// Don't close the flock as it will be reused.
-	db.dl.unlock()
-	return nil
-}
-
-func (db *DB) Begin() (*sql.Tx, error) {
-	return db.sqldb.Begin()
+	return &DB{dbdir: dbdir}, nil
 }
 
 type txfunc func(*sql.Tx) error
 
 // Do Opens the db, executes DoTx and then Closes the DB
+// To support a multiprocess and multigoroutine model on a single file access
+// database like ql there's the need to exlusively lock, open, close, unlock the
+// db for every transaction. For this reason every db transaction should be
+// fast to not block other processes/goroutines.
 func (db *DB) Do(fns ...txfunc) error {
-	err := db.Open()
+	l, err := lock.ExclusiveLock(db.dbdir, lock.Dir)
 	if err != nil {
 		return err
 	}
-	defer db.Close()
+	defer l.Close()
 
-	return db.DoTx(fns...)
-}
+	sqldb, err := sql.Open("ql", filepath.Join(db.dbdir, DbFilename))
+	if err != nil {
+		return err
+	}
+	defer sqldb.Close()
 
-// DoTx executes the provided txfuncs inside a unique transaction.
-// If one of the functions returns an error the whole transaction is rolled back.
-func (db *DB) DoTx(fns ...txfunc) error {
-	tx, err := db.Begin()
+	tx, err := sqldb.Begin()
 	if err != nil {
 		return err
 	}
diff --git a/store/db_test.go b/store/db_test.go
index b8bdd2a74d..895d6ec019 100644
--- a/store/db_test.go
+++ b/store/db_test.go
@@ -78,10 +78,6 @@ func createTable(db *DB, t *testing.T) {
 }
 
 func TestDBRace(t *testing.T) {
-	// TODO(sgotti) this will not find concurrent accesses to ql db from
-	// multiple processes using multiple goroutines. A test that spawns at
-	// least two processes using multiple goroutines is needed.
-	// See https://github.com/coreos/rkt/pull/2391
 	oldGoMaxProcs := runtime.GOMAXPROCS(runtime.NumCPU())
 	defer runtime.GOMAXPROCS(oldGoMaxProcs)
 
diff --git a/store/store.go b/store/store.go
index 17e5fbf943..b515aee628 100644
--- a/store/store.go
+++ b/store/store.go
@@ -310,13 +310,7 @@ func NewStore(baseDir string) (*Store, error) {
 
 // Close closes a Store opened with NewStore().
 func (s *Store) Close() error {
-	if err := s.storeLock.Close(); err != nil {
-		return err
-	}
-	if err := s.db.dl.close(); err != nil {
-		return err
-	}
-	return nil
+	return s.storeLock.Close()
 }
 
 // backupDB backs up current database.

From 7389bc86f7b552d411b0ff5152deaeaeb16b87fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 12 Jul 2016 13:46:49 +0200
Subject: [PATCH 0513/1304] stage1/gc: skip cleaning our own cgroup

It's not a good idea to clean up our own cgroup, it will lead to
errors.

If we're doing this it means we're running in the same unit file as the
rkt pod. We don't have to do anything, systemd will do the cleanup for
us.
---
 stage1/gc/gc.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index 25672a669d..3d25ab76a0 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -32,6 +32,7 @@ import (
 	"github.com/hashicorp/errwrap"
 
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/networking"
 	rktlog "github.com/coreos/rkt/pkg/log"
 )
@@ -128,6 +129,16 @@ func cleanupCgroups() error {
 	}
 	subcgroup := string(b)
 
+	// if we're trying to clean up our own cgroup it means we're running in the
+	// same unit file as the rkt pod. We don't have to do anything, systemd
+	// will do the cleanup for us
+	ourCgroupPath, err := cgroup.GetOwnCgroupPath("name=systemd")
+	if err == nil {
+		if strings.HasPrefix(ourCgroupPath, "/"+subcgroup) {
+			return nil
+		}
+	}
+
 	f, err := os.Open(cgroupFsPath)
 	if err != nil {
 		return err

From e1dd05a90dc9b8599991580bc8f2662d63fdbca9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 4 Jul 2016 11:40:29 +0200
Subject: [PATCH 0514/1304] api_service: optionally build systemd-journal
 support

This introduces a 'sdjournal' tag and corresponding stubs in api_service,
turning libsystemd headers into a soft-dependency.
If systemd-journal support is enabled and `sd-journal.h` found at build
time, api_service will use it for logs retrieval.
This is enabled by default, but downstream can turn it off via
`--enable-sdjournal=no`.
---
 Makefile.in                  |  2 +-
 configure.ac                 | 39 ++++++++++++---
 rkt/api_service.go           | 66 +------------------------
 rkt/api_service_sdjournal.go | 96 ++++++++++++++++++++++++++++++++++++
 rkt/api_service_stub.go      | 27 ++++++++++
 rkt/rkt.mk                   |  8 ++-
 6 files changed, 164 insertions(+), 74 deletions(-)
 create mode 100644 rkt/api_service_sdjournal.go
 create mode 100644 rkt/api_service_stub.go

diff --git a/Makefile.in b/Makefile.in
index db5636e386..995bd1b184 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@ ABS_GO := @ABS_GO@
 # [STAGE1] build settings
 
 # selinux tags for rkt and functional tests
-RKT_TAGS := -tags "selinux @TPM_TAGS@"
+RKT_TAGS := -tags "selinux @TPM_TAGS@ @SDJOURNAL_TAGS@"
 # stage1 build mode
 
 RKT_VERSION := @RKT_VERSION@
diff --git a/configure.ac b/configure.ac
index 0f4db5e130..90960c1796 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,14 @@ AC_ARG_ENABLE([tpm],
               [RKT_ENABLE_TPM="${enableval}"],
               [RKT_ENABLE_TPM="yes"])
 
+## Systemd-journal support on host
+
+AC_ARG_ENABLE([sdjournal],
+              [AS_HELP_STRING([--enable-sdjournal],
+                              [enable systemd-journal features on host, use 'auto' to enable it if the required development files are found, default: 'yes'])],
+              [RKT_ENABLE_SDJOURNAL="${enableval}"],
+              [RKT_ENABLE_SDJOURNAL="yes"])
+
 ## insecure go
 
 AC_ARG_ENABLE([insecure-go],
@@ -573,12 +581,6 @@ AC_CHECK_LIB([c], [fork],
 # Check whether we can build TPM support code
 AC_CHECK_HEADER(trousers/tss.h, [HAVE_TPM=yes], [HAVE_TPM=no], [AC_INCLUDES_DEFAULT])
 
-# Check whether we have libsystemd-journal (needed by the API server)
-AC_CHECK_HEADER([systemd/sd-journal.h],
-                           [],
-                           [AC_MSG_ERROR([*** No development headers for libsystemd-journal found])],
-                           [AC_INCLUDES_DEFAULT])
-
 TPM_TAGS=''
 AS_CASE([${RKT_ENABLE_TPM}],
         [no],
@@ -600,6 +602,30 @@ AS_CASE([${RKT_ENABLE_TPM}],
         [yes],
                 [RKT_ADD_FEATURE '+TPM'])
 
+# Check whether we have libsystemd-journal (for go-systemd/sdjournal)
+AC_CHECK_HEADER([systemd/sd-journal.h], [HAVE_SDJOURNAL=yes], [HAVE_SDJOURNAL=no], [AC_INCLUDES_DEFAULT])
+
+SDJOURNAL_TAGS=''
+AS_CASE([${RKT_ENABLE_SDJOURNAL}],
+        [no],
+                dnl nothing to do
+                [:],
+        [auto],
+                [AS_VAR_IF([HAVE_SDJOURNAL],[yes],
+                           [SDJOURNAL_TAGS=sdjournal
+                            RKT_ENABLE_SDJOURNAL=yes],
+                           [RKT_ENABLE_SDJOURNAL=no])],
+        [yes],
+                [AS_VAR_IF([HAVE_SDJOURNAL],[no],
+                           [AC_MSG_ERROR([*** Host systemd-journal support enabled, but could not find required development files])])
+                 SDJOURNAL_TAGS=sdjournal],
+        [AC_MSG_ERROR([*** Invalid value passed to --enable-sdjournal, should be either 'yes', 'no' or 'auto'])])
+AS_CASE([${RKT_ENABLE_SDJOURNAL}],
+        [no],
+                [RKT_ADD_FEATURE '-SDJOURNAL'],
+        [yes],
+                [RKT_ADD_FEATURE '+SDJOURNAL'])
+
 AC_LANG_POP([C])
 
 AC_PROG_INSTALL
@@ -696,6 +722,7 @@ AC_SUBST(RKT_VERSION_LDFLAGS)
 AC_SUBST(RKT_FEATURES_LDFLAGS)
 
 AC_SUBST(TPM_TAGS)
+AC_SUBST(SDJOURNAL_TAGS)
 
 AC_SUBST(RKT_DEFINES_FOR_ENTER)
 
diff --git a/rkt/api_service.go b/rkt/api_service.go
index f7eb381cb2..65b4ca2de4 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -18,7 +18,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"os/signal"
@@ -30,7 +29,6 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/go-systemd/sdjournal"
 	"github.com/coreos/rkt/api/v1alpha"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
@@ -744,69 +742,7 @@ func (sw LogsStreamWriter) Write(b []byte) (int, error) {
 }
 
 func (s *v1AlphaAPIServer) GetLogs(request *v1alpha.GetLogsRequest, server v1alpha.PublicAPI_GetLogsServer) error {
-	uuid, err := types.NewUUID(request.PodId)
-	if err != nil {
-		return err
-	}
-	pod, err := getPod(uuid)
-	if err != nil {
-		return err
-	}
-	stage1Path := "stage1/rootfs"
-	if pod.usesOverlay() {
-		stage1TreeStoreID, err := pod.getStage1TreeStoreID()
-		if err != nil {
-			return err
-		}
-		stage1Path = fmt.Sprintf("/overlay/%s/upper/", stage1TreeStoreID)
-	}
-	path := filepath.Join(getDataDir(), "/pods/run/", request.PodId, stage1Path, "/var/log/journal/")
-
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		return fmt.Errorf("%s: logging unsupported", uuid.String())
-	}
-
-	jconf := sdjournal.JournalReaderConfig{
-		Path: path,
-	}
-	if request.AppName != "" {
-		jconf.Matches = []sdjournal.Match{
-			{
-				Field: sdjournal.SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER,
-				Value: request.AppName,
-			},
-		}
-	}
-	if request.SinceTime != 0 {
-		t := time.Unix(request.SinceTime, 0)
-		jconf.Since = -time.Since(t)
-	}
-	if request.Lines != 0 {
-		jconf.NumFromTail = uint64(request.Lines)
-	}
-
-	jr, err := sdjournal.NewJournalReader(jconf)
-	if err != nil {
-		return err
-	}
-	defer jr.Close()
-
-	if request.Follow {
-		return jr.Follow(nil, LogsStreamWriter{server: server})
-	}
-
-	data, err := ioutil.ReadAll(jr)
-	if err != nil {
-		return err
-	}
-	// Remove empty lines
-	lines := make([]string, 0)
-	for _, v := range strings.Split(string(data), "\n") {
-		if len(v) > 0 {
-			lines = append(lines, v)
-		}
-	}
-	return server.Send(&v1alpha.GetLogsResponse{Lines: lines})
+	return s.constrainedGetLogs(request, server)
 }
 
 func (s *v1AlphaAPIServer) ListenEvents(request *v1alpha.ListenEventsRequest, server v1alpha.PublicAPI_ListenEventsServer) error {
diff --git a/rkt/api_service_sdjournal.go b/rkt/api_service_sdjournal.go
new file mode 100644
index 0000000000..12aabb1c4c
--- /dev/null
+++ b/rkt/api_service_sdjournal.go
@@ -0,0 +1,96 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build sdjournal
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/go-systemd/sdjournal"
+	"github.com/coreos/rkt/api/v1alpha"
+)
+
+func (s *v1AlphaAPIServer) constrainedGetLogs(request *v1alpha.GetLogsRequest, server v1alpha.PublicAPI_GetLogsServer) error {
+	uuid, err := types.NewUUID(request.PodId)
+	if err != nil {
+		return err
+	}
+	pod, err := getPod(uuid)
+	if err != nil {
+		return err
+	}
+	stage1Path := "stage1/rootfs"
+	if pod.usesOverlay() {
+		stage1TreeStoreID, err := pod.getStage1TreeStoreID()
+		if err != nil {
+			return err
+		}
+		stage1Path = fmt.Sprintf("/overlay/%s/upper/", stage1TreeStoreID)
+	}
+	path := filepath.Join(getDataDir(), "/pods/run/", request.PodId, stage1Path, "/var/log/journal/")
+
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return fmt.Errorf("%s: logging unsupported", uuid.String())
+	}
+
+	jconf := sdjournal.JournalReaderConfig{
+		Path: path,
+	}
+	if request.AppName != "" {
+		jconf.Matches = []sdjournal.Match{
+			{
+				Field: sdjournal.SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER,
+				Value: request.AppName,
+			},
+		}
+	}
+	if request.SinceTime != 0 {
+		t := time.Unix(request.SinceTime, 0)
+		jconf.Since = -time.Since(t)
+	}
+	if request.Lines != 0 {
+		jconf.NumFromTail = uint64(request.Lines)
+	}
+
+	jr, err := sdjournal.NewJournalReader(jconf)
+	if err != nil {
+		return err
+	}
+	defer jr.Close()
+
+	if request.Follow {
+		return jr.Follow(nil, LogsStreamWriter{server: server})
+	}
+
+	data, err := ioutil.ReadAll(jr)
+	if err != nil {
+		return err
+	}
+	// Remove empty lines
+	lines := make([]string, 0)
+	for _, v := range strings.Split(string(data), "\n") {
+		if len(v) > 0 {
+			lines = append(lines, v)
+		}
+	}
+	return server.Send(&v1alpha.GetLogsResponse{Lines: lines})
+}
diff --git a/rkt/api_service_stub.go b/rkt/api_service_stub.go
new file mode 100644
index 0000000000..5a1c743fcf
--- /dev/null
+++ b/rkt/api_service_stub.go
@@ -0,0 +1,27 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !sdjournal
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/coreos/rkt/api/v1alpha"
+)
+
+func (s *v1AlphaAPIServer) constrainedGetLogs(request *v1alpha.GetLogsRequest, server v1alpha.PublicAPI_GetLogsServer) error {
+	return fmt.Errorf("rkt built without logging support")
+}
diff --git a/rkt/rkt.mk b/rkt/rkt.mk
index 6e9dd73e61..bbe50b3127 100644
--- a/rkt/rkt.mk
+++ b/rkt/rkt.mk
@@ -29,18 +29,22 @@ $(BGB_BINARY): $(MK_PATH) | $(TARGET_BINDIR)
 
 include makelib/build_go_bin.mk
 
+LOCAL_DIST_SRC_FILTER := '_test.go|main.go|_gen.go|_stub.go'
+
+$(call forward-vars,manpages,LOCAL_DIST_SRC_FILTER)
 manpages: GO_ENV += GOARCH=$(GOARCH_FOR_BUILD) CC=$(CC_FOR_BUILD)
 manpages: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/manpages/
 	ls $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/*.go | \
-		grep -vE '_test.go|main.go|_gen.go' | \
+		grep -vE $(LOCAL_DIST_SRC_FILTER) | \
 		$(GO_ENV) xargs "$(GO)" run $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/manpages_gen.go
 
+$(call forward-vars,bash-completion,LOCAL_DIST_SRC_FILTER)
 bash-completion: GO_ENV += GOARCH=$(GOARCH_FOR_BUILD) CC=$(CC_FOR_BUILD)
 bash-completion: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/bash_completion/
 	ls $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/*.go | \
-		grep -vE '_test.go|main.go|_gen.go' | \
+		grep -vE $(LOCAL_DIST_SRC_FILTER) | \
 		$(GO_ENV) xargs "$(GO)" run $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/bash_completion_gen.go
 
 protobuf:

From 1886678391e7d295c1ba1c8aa808fe276164809b Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Tue, 12 Jul 2016 11:18:21 -0700
Subject: [PATCH 0515/1304] build: Add powerpc64 to GOARCH_FOR_BUILD

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 90960c1796..bd60f0a6d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -563,8 +563,10 @@ AS_VAR_IF([cross_compiling], [no],
                                       [GOARCH_FOR_BUILD="amd64"],
                               [aarch64],
                                       [GOARCH_FOR_BUILD="arm64"],
-                              [powerpc],
+                              [powerpc | powerpc64],
                                       [GOARCH_FOR_BUILD="ppc64"],
+                              [powerpc64le],
+                                      [GOARCH_FOR_BUILD="ppc64le"],
                               [AC_MSG_RESULT([unknown]); AC_MSG_ERROR([*** Unknown build cpu: ${build_cpu}.  Set GOARCH_FOR_BUILD variable.])])
                       AC_MSG_RESULT([${GOARCH_FOR_BUILD}])],
                      [AC_MSG_RESULT([user supplied ${GOARCH_FOR_BUILD}])])])

From 718b97f1bcb0ee8548d72abdcc1f25452bb24763 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Tue, 12 Jul 2016 11:18:21 -0700
Subject: [PATCH 0516/1304] build: Set arch variables for other arches

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 configure.ac | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index bd60f0a6d3..df65ef4866 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,9 +42,12 @@ AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 
 AS_CASE([${host_cpu}],
-        [aarch64], [RKT_ACI_ARCH=aarch64; GOARCH=arm64;],
-        [x86_64],  [RKT_ACI_ARCH=amd64; GOARCH=amd64;],
-        [AC_MSG_ERROR([*** unsupported host architecture specified: ${host_cpu}])])
+        [aarch64],    [RKT_ACI_ARCH=aarch64; GOARCH=arm64;],
+        [armv6l],     [RKT_ACI_ARCH=armv6l;  GOARCH=arm; GOARM=6;],
+        [armv7l],     [RKT_ACI_ARCH=armv7l;  GOARCH=arm; GOARM=7;],
+        [i?86 | x86], [RKT_ACI_ARCH=i386;    GOARCH=i386;],
+        [x86_64],     [RKT_ACI_ARCH=amd64;   GOARCH=amd64;],
+        [AC_MSG_ERROR([*** unsupported host arch specified: ${host_cpu}])])
 
 #### FLAGS
 
@@ -550,6 +553,15 @@ AS_IF([test "x${RKT_RUN_FUNCTIONAL_TESTS}" = 'xyes' -o "x${RKT_RUN_FUNCTIONAL_TE
 
 ## Miscellaneous stuff
 
+# Check if arch is supported for coreos/kvm flavor.
+AS_CASE([${RKT_ACI_ARCH}],
+        dnl supported arches
+        [aarch64 | amd64], [],
+        dnl unsupported arches
+        [RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos,kvm],
+                           [AC_MSG_ERROR([*** ${RKT_ACI_ARCH}: no arch support for stage1 flavors {coreos,kvm}])],
+                           [AC_MSG_WARN([* ${RKT_ACI_ARCH}: unsupported arch])])])
+
 # cross_compiling is a standard autoconf variable.  See the autoconf manual for
 # details.
 AS_VAR_IF([cross_compiling], [no],

From dd5be131a90164f278ded8afc20ba21ca0e34f7a Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Tue, 12 Jul 2016 11:18:21 -0700
Subject: [PATCH 0517/1304] build: Set GOARM variable

Used for 32 bit ARM builds.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 Makefile.in          | 1 +
 configure.ac         | 1 +
 makelib/variables.mk | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 995bd1b184..bc13ab40b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,6 +51,7 @@ RKT_DEFINES_FOR_ENTER := @RKT_DEFINES_FOR_ENTER@
 RKT_RUN_FUNCTIONAL_TESTS := @RKT_RUN_FUNCTIONAL_TESTS@
 
 GOARCH := @GOARCH@
+GOARM := @GOARM@
 GOARCH_FOR_BUILD := @GOARCH_FOR_BUILD@
 
 RKT_STAGE1_DEFAULT_NAME_LDFLAGS := @RKT_STAGE1_DEFAULT_NAME_LDFLAGS@
diff --git a/configure.ac b/configure.ac
index df65ef4866..7c2321b4f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -725,6 +725,7 @@ AC_SUBST(RKT_STAGE1_COREOS_BOARD)
 AC_SUBST(RKT_RUN_FUNCTIONAL_TESTS)
 
 AC_SUBST(GOARCH)
+AC_SUBST(GOARM)
 AC_SUBST(GOARCH_FOR_BUILD)
 
 AC_SUBST(RKT_STAGE1_DEFAULT_NAME_LDFLAGS)
diff --git a/makelib/variables.mk b/makelib/variables.mk
index 8408c2ae10..1aa22cc148 100644
--- a/makelib/variables.mk
+++ b/makelib/variables.mk
@@ -29,6 +29,7 @@ GO_TEST_FUNC_ARGS ?=
 GO_ENV := $(strip \
 	GO15VENDOREXPERIMENT=1 \
 	GOARCH="$(GOARCH)" \
+	$(if $(GOARM),GOARM="$(GOARM)") \
 	CGO_ENABLED=1 \
 	CC="$(CC)" \
 	CXX="$(CXX)" \

From 6065b5b5ff1a57a394ad7f551a86fc7a33f3e8fb Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 13 Jul 2016 10:52:23 +0200
Subject: [PATCH 0518/1304] build: use rkt-builder ACI

Fixes #2435
---
 Documentation/devel/release.md |  2 --
 scripts/acbuild-rkt-builder.sh | 61 ----------------------------------
 scripts/build-rir.sh           |  2 +-
 scripts/build-rkt.sh           | 12 -------
 scripts/install-appc-spec.sh   |  7 ----
 5 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100755 scripts/acbuild-rkt-builder.sh
 delete mode 100755 scripts/build-rkt.sh
 delete mode 100755 scripts/install-appc-spec.sh

diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index f1b20631f8..609ca6b14b 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -51,8 +51,6 @@ After merging and going back to master branch, we check out the release version
 
 - `git checkout HEAD^` should work; sanity check configure.ac (2nd line) after doing this
 - Build rkt inside rkt (so make sure you have rkt in your $PATH), we'll use this in a minute:
-  - `git clean -ffdx && sudo ./scripts/acbuild-rkt-builder.sh`
-  - `rkt --insecure-options=image fetch ./rkt-builder.aci`
   - `export BUILDDIR=$PWD/release-build && mkdir -p $BUILDDIR && sudo BUILDDIR=$BUILDDIR ./scripts/build-rir.sh`
   - Sanity check `release-build/target/bin/rkt version`
   - Sanity check `ldd release-build/target/bin/rkt`: it can contain linux-vdso.so, libpthread.so, libc.so, libdl.so and ld-linux-x86-64.so but nothing else.
diff --git a/scripts/acbuild-rkt-builder.sh b/scripts/acbuild-rkt-builder.sh
deleted file mode 100755
index bf13726459..0000000000
--- a/scripts/acbuild-rkt-builder.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root" 1>&2
-   exit 1
-fi
-
-set -ex
-
-function check_tool {
-if ! which $1; then
-    echo "Get $1 and put it in your \$PATH" >&2;
-    exit 1;
-fi
-}
-
-MODIFY=${MODIFY:-""}
-FLAGS=${FLAGS:-""}
-IMG_NAME="coreos.com/rkt/builder"
-IMG_VERSION=${VERSION:-"v1.10.0+git"}
-ACI_FILE=rkt-builder.aci
-BUILDDIR=/opt/build-rkt
-SRC_DIR=/opt/rkt
-ACI_GOPATH=/go
-
-DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libsystemd-dev"
-
-acbuildend () {
-    export EXIT=$?;
-    acbuild --debug end && rm -rf rootfs && exit $EXIT;
-}
-
-echo "Generating debian sid tree"
-
-mkdir rootfs
-debootstrap --force-check-gpg --variant=minbase --components=main --include="${DEBIAN_SID_DEPS}" sid rootfs http://httpredir.debian.org/debian/
-rm -rf rootfs/var/cache/apt/archives/*
-
-echo "Version: ${IMG_VERSION}"
-echo "Building ${ACI_FILE}"
-
-acbuild begin ./rootfs
-trap acbuildend EXIT
-
-acbuild $FLAGS set-name $IMG_NAME
-acbuild $FLAGS label add version $IMG_VERSION
-acbuild $FLAGS set-user 0
-acbuild $FLAGS set-group 0
-acbuild $FLAGS environment add OS_VERSION sid
-acbuild $FLAGS environment add GOPATH $ACI_GOPATH
-acbuild $FLAGS environment add BUILDDIR $BUILDDIR
-acbuild $FLAGS environment add SRC_DIR $SRC_DIR
-acbuild $FLAGS mount add build-dir $BUILDDIR
-acbuild $FLAGS mount add src-dir $SRC_DIR
-acbuild $FLAGS set-working-dir $SRC_DIR
-acbuild $FLAGS copy "$(dirname $0)" /scripts
-acbuild $FLAGS run /bin/bash /scripts/install-appc-spec.sh
-acbuild $FLAGS set-exec /bin/bash /scripts/build-rkt.sh
-if [ -z "$MODIFY" ]; then
-    acbuild write --overwrite $ACI_FILE
-fi
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index a901aa5f4a..dd8177293b 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:v1.10.0+git}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.0.1}"
 
 mkdir -p $BUILDDIR
 
diff --git a/scripts/build-rkt.sh b/scripts/build-rkt.sh
deleted file mode 100755
index 65db041679..0000000000
--- a/scripts/build-rkt.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./autogen.sh
-./configure \
-	--enable-tpm=no \
-	--with-stage1-default-images-directory=/usr/lib/rkt/stage1-images \
-	--with-stage1-default-location=/usr/lib/rkt/stage1-images/stage1-coreos.aci
-make manpages
-make bash-completion
-make -j4
diff --git a/scripts/install-appc-spec.sh b/scripts/install-appc-spec.sh
deleted file mode 100755
index b03f6442ee..0000000000
--- a/scripts/install-appc-spec.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-GOPATH=${GOPATH:-"/go"}
-mkdir -p $GOPATH
-go get github.com/appc/spec/...

From 0ffb76b3180efa5ba573aee76d16155efc4a3601 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Mon, 4 Jul 2016 15:10:40 +0200
Subject: [PATCH 0519/1304] stage1: diagnostic functionality for rkt run

After this patch, if the app exits with `ExecMainStatus == 203`, the app's reaper runs
the diagnostic tool and prints the output on stdout. systemd sets `ExecMainstatus`
to EXIT_EXEC (203) when execve() fails. References:
Exit status: https://github.com/systemd/systemd/blob/v230/src/basic/exit-status.h#L47
call execve(): https://github.com/systemd/systemd/blob/v230/src/core/execute.c#L1998

Example:
```
sudo build-rkt-1.9.1+git/target/bin/rkt run coreos.com/etcd:v2.0.10 --exec=/foo-not-there
image: using image from file /usr/lib/rkt/stage1-images/stage1-coreos.aci
image: using image from local store for image name coreos.com/etcd:v2.0.10
networking: loading networks from /etc/rkt/net.d
networking: loading network default with type ptp
Error: Unable to open "/foo-not-there": No such file or directory
```
Fixes https://github.com/coreos/rkt/issues/2506
---
 stage1/diagnostic/diagnostic-util.c       | 134 ++++++++++++++++++++++
 stage1/diagnostic/diagnostic-util.h       |  38 ++++++
 stage1/diagnostic/diagnostic.c            |  31 +++++
 stage1/diagnostic/diagnostic.mk           |   4 +
 stage1/{enterexec => diagnostic}/elf.h    |   0
 stage1/enterexec/enterexec.c              | 120 +------------------
 stage1/enterexec/enterexec.mk             |   4 +-
 stage1/init/common/pod.go                 |   6 +-
 stage1/makelib/aci_simple_static_c_bin.mk |   4 +-
 stage1/reaper/reaper.sh                   |  14 ++-
 stage1/secondary-stuff.mk                 |   1 +
 tests/rkt_diagnostic_test.go              |  48 ++++++++
 12 files changed, 277 insertions(+), 127 deletions(-)
 create mode 100644 stage1/diagnostic/diagnostic-util.c
 create mode 100644 stage1/diagnostic/diagnostic-util.h
 create mode 100644 stage1/diagnostic/diagnostic.c
 create mode 100644 stage1/diagnostic/diagnostic.mk
 rename stage1/{enterexec => diagnostic}/elf.h (100%)
 create mode 100644 tests/rkt_diagnostic_test.go

diff --git a/stage1/diagnostic/diagnostic-util.c b/stage1/diagnostic/diagnostic-util.c
new file mode 100644
index 0000000000..dc55995ae4
--- /dev/null
+++ b/stage1/diagnostic/diagnostic-util.c
@@ -0,0 +1,134 @@
+// Copyright 2014-2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#define _GNU_SOURCE
+#include <errno.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdint.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "diagnostic-util.h"
+#include "elf.h"
+
+
+static void map_file(const char *path, int prot, int flags, struct stat *st, void **map)
+{
+    int fd;
+
+    pexit_if((fd = open(path, O_RDONLY)) == -1,
+             "Unable to open \"%s\"", path);
+    pexit_if(fstat(fd, st) == -1,
+             "Cannot stat \"%s\"", path);
+    exit_if(!S_ISREG(st->st_mode), "\"%s\" is not a regular file", path);
+    pexit_if(!(*map = mmap(NULL, st->st_size, prot, flags, fd, 0)),
+             "Mmap of \"%s\" failed", path);
+    pexit_if(close(fd) == -1,
+             "Close of %i [%s] failed", fd, path);
+}
+
+void diag(const char *exe)
+{
+    static const uint8_t	elf[] = {0x7f, 'E', 'L', 'F'};
+    static const uint8_t	shebang[] = {'#','!'};
+    static int		        diag_depth;
+    struct stat		        st;
+    const uint8_t	        *mm;
+    const char		        *itrp = NULL;
+
+    map_file(exe, PROT_READ, MAP_SHARED, &st, (void **)&mm);
+    exit_if(!((S_IXUSR|S_IXGRP|S_IXOTH) & st.st_mode),
+            "\"%s\" is not executable", exe)
+
+    if(st.st_size >= sizeof(shebang) &&
+       !memcmp(mm, shebang, sizeof(shebang))) {
+        const uint8_t	*nl;
+        int		maxlen = MIN(PATH_MAX, st.st_size - sizeof(shebang));
+        /* TODO(vc): EOF-terminated shebang lines are technically possible */
+        exit_if(!(nl = memchr(&mm[sizeof(shebang)], '\n', maxlen)),
+                "Shebang line too long");
+        pexit_if(!(itrp = strndup((char *)&mm[sizeof(shebang)], (nl - mm) - 2)),
+                 "Failed to dup interpreter path");
+    } else if(st.st_size >= sizeof(elf) &&
+              !memcmp(mm, elf, sizeof(elf))) {
+        uint64_t	(*lget)(const uint8_t *) = NULL;
+        uint32_t	(*iget)(const uint8_t *) = NULL;
+        uint16_t	(*sget)(const uint8_t *) = NULL;
+        const void	*phoff = NULL, *phesz = NULL, *phecnt = NULL;
+        const uint8_t	*ph = NULL;
+        int		i, phreloff, phrelsz;
+
+        exit_if(mm[ELF_VERSION] != 1,
+                "Unsupported ELF version: %hhx", mm[ELF_VERSION]);
+
+        /* determine which accessors to use and where */
+        if(mm[ELF_BITS] == ELF_BITS_32) {
+            if(mm[ELF_ENDIAN] == ELF_ENDIAN_LITL) {
+                lget = le32_lget;
+                sget = le_sget;
+                iget = le_iget;
+            } else if(mm[ELF_ENDIAN] == ELF_ENDIAN_BIG) {
+                lget = be32_lget;
+                sget = be_sget;
+                iget = be_iget;
+            }
+            phoff = &mm[ELF32_PHT_OFF];
+            phesz = &mm[ELF32_PHTE_SIZE];
+            phecnt = &mm[ELF32_PHTE_CNT];
+            phreloff = ELF32_PHE_OFF;
+            phrelsz = ELF32_PHE_SIZE;
+        } else if(mm[ELF_BITS] == ELF_BITS_64) {
+            if(mm[ELF_ENDIAN] == ELF_ENDIAN_LITL) {
+                lget = le64_lget;
+                sget = le_sget;
+                iget = le_iget;
+            } else if(mm[ELF_ENDIAN] == ELF_ENDIAN_BIG) {
+                lget = be64_lget;
+                sget = be_sget;
+                iget = be_iget;
+            }
+            phoff = &mm[ELF64_PHT_OFF];
+            phesz = &mm[ELF64_PHTE_SIZE];
+            phecnt = &mm[ELF64_PHTE_CNT];
+            phreloff = ELF64_PHE_OFF;
+            phrelsz = ELF64_PHE_SIZE;
+        }
+
+        exit_if(!lget, "Unsupported ELF format");
+
+        if(!phoff) /* program header may be absent, don't make it an error */
+            return;
+
+        /* TODO(vc): sanity checks on values before using them */
+        for(ph = &mm[lget(phoff)], i = 0; i < sget(phecnt); i++, ph += sget(phesz)) {
+            if(iget(ph) == ELF_PT_INTERP) {
+                itrp = strndup((char *)&mm[lget(&ph[phreloff])], lget(&ph[phrelsz]));
+                break;
+            }
+        }
+    } else {
+        exit_if(1, "Unsupported file type");
+    }
+
+    exit_if(!itrp, "Unable to determine interpreter for \"%s\"", exe);
+    exit_if(*itrp != '/', "Path must be absolute: \"%s\"", itrp);
+    exit_if(++diag_depth > MAX_DIAG_DEPTH,
+            "Excessive interpreter recursion, giving up");
+    diag(itrp);
+}
diff --git a/stage1/diagnostic/diagnostic-util.h b/stage1/diagnostic/diagnostic-util.h
new file mode 100644
index 0000000000..5207d6ed34
--- /dev/null
+++ b/stage1/diagnostic/diagnostic-util.h
@@ -0,0 +1,38 @@
+// Copyright 2014-2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _DIAGNOSTIC_UTIL_H
+#define _DIAGNOSTIC_UTIL_H
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static int exit_err;
+#define exit_if(_cond, _fmt, _args...)				\
+	exit_err++;						\
+	if(_cond) {						\
+		fprintf(stderr, "Error: " _fmt "\n", ##_args);	\
+		exit(exit_err);					\
+	}
+#define pexit_if(_cond, _fmt, _args...)				\
+	exit_if(_cond, _fmt ": %s", ##_args, strerror(errno))
+
+#define MAX_DIAG_DEPTH 10
+#define MIN(_a, _b) (((_a) < (_b)) ? (_a) : (_b))
+
+void diag(const char *exe);
+
+#endif /* _DIAGNOSTIC_UTIL_H */
diff --git a/stage1/diagnostic/diagnostic.c b/stage1/diagnostic/diagnostic.c
new file mode 100644
index 0000000000..4bd5f5eb06
--- /dev/null
+++ b/stage1/diagnostic/diagnostic.c
@@ -0,0 +1,31 @@
+// Copyright 2014-2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <unistd.h>
+
+#include "diagnostic-util.h"
+
+int main(int argc, char *argv[])
+{
+	const char *root, *exe;
+	exit_if(argc != 3, "Usage: %s /path/to/root /to/exe", argv[0]);
+
+	root = argv[1];
+	exe = argv[2];
+
+	pexit_if(chroot(root) == -1, "Chroot \"%s\" failed", root);
+	diag(exe);
+
+	return 0;
+}
diff --git a/stage1/diagnostic/diagnostic.mk b/stage1/diagnostic/diagnostic.mk
new file mode 100644
index 0000000000..5b9230fa20
--- /dev/null
+++ b/stage1/diagnostic/diagnostic.mk
@@ -0,0 +1,4 @@
+ASSCB_EXTRA_HEADERS := diagnostic-util.h elf.h
+ASSCB_EXTRA_SOURCES := diagnostic-util.c
+
+include stage1/makelib/aci_simple_static_c_bin.mk
diff --git a/stage1/enterexec/elf.h b/stage1/diagnostic/elf.h
similarity index 100%
rename from stage1/enterexec/elf.h
rename to stage1/diagnostic/elf.h
diff --git a/stage1/enterexec/enterexec.c b/stage1/enterexec/enterexec.c
index c6daf2a40a..a4d1d3f26c 100644
--- a/stage1/enterexec/enterexec.c
+++ b/stage1/enterexec/enterexec.c
@@ -27,125 +27,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "elf.h"
-
-static int exit_err;
-#define exit_if(_cond, _fmt, _args...)				\
-	exit_err++;						\
-	if(_cond) {						\
-		fprintf(stderr, "Error: " _fmt "\n", ##_args);	\
-		exit(exit_err);					\
-	}
-#define pexit_if(_cond, _fmt, _args...)				\
-	exit_if(_cond, _fmt ": %s", ##_args, strerror(errno))
-
-#define MAX_DIAG_DEPTH 10
-#define MIN(_a, _b) (((_a) < (_b)) ? (_a) : (_b))
-
-static void map_file(const char *path, int prot, int flags, struct stat *st, void **map)
-{
-	int fd;
-
-	pexit_if((fd = open(path, O_RDONLY)) == -1,
-		"Unable to open \"%s\"", path);
-	pexit_if(fstat(fd, st) == -1,
-		"Cannot stat \"%s\"", path);
-	exit_if(!S_ISREG(st->st_mode), "\"%s\" is not a regular file", path);
-	pexit_if(!(*map = mmap(NULL, st->st_size, prot, flags, fd, 0)),
-		"Mmap of \"%s\" failed", path);
-	pexit_if(close(fd) == -1,
-		"Close of %i [%s] failed", fd, path);
-}
-
-static void diag(const char *exe)
-{
-	static const uint8_t	elf[] = {0x7f, 'E', 'L', 'F'};
-	static const uint8_t	shebang[] = {'#','!'};
-	static int		diag_depth;
-	struct stat		st;
-	const uint8_t		*mm;
-	const char		*itrp = NULL;
-
-	map_file(exe, PROT_READ, MAP_SHARED, &st, (void **)&mm);
-	exit_if(!((S_IXUSR|S_IXGRP|S_IXOTH) & st.st_mode),
-		"\"%s\" is not executable", exe)
-
-	if(st.st_size >= sizeof(shebang) &&
-	   !memcmp(mm, shebang, sizeof(shebang))) {
-		const uint8_t	*nl;
-		int		maxlen = MIN(PATH_MAX, st.st_size - sizeof(shebang));
-		/* TODO(vc): EOF-terminated shebang lines are technically possible */
-		exit_if(!(nl = memchr(&mm[sizeof(shebang)], '\n', maxlen)),
-			"Shebang line too long");
-		pexit_if(!(itrp = strndup((char *)&mm[sizeof(shebang)], (nl - mm) - 2)),
-			"Failed to dup interpreter path");
-	} else if(st.st_size >= sizeof(elf) &&
-		  !memcmp(mm, elf, sizeof(elf))) {
-		uint64_t	(*lget)(const uint8_t *) = NULL;
-		uint32_t	(*iget)(const uint8_t *) = NULL;
-		uint16_t	(*sget)(const uint8_t *) = NULL;
-		const void	*phoff = NULL, *phesz = NULL, *phecnt = NULL;
-		const uint8_t	*ph = NULL;
-		int		i, phreloff, phrelsz;
-
-		exit_if(mm[ELF_VERSION] != 1,
-			"Unsupported ELF version: %hhx", mm[ELF_VERSION]);
-
-		/* determine which accessors to use and where */
-		if(mm[ELF_BITS] == ELF_BITS_32) {
-			if(mm[ELF_ENDIAN] == ELF_ENDIAN_LITL) {
-				lget = le32_lget;
-				sget = le_sget;
-				iget = le_iget;
-			} else if(mm[ELF_ENDIAN] == ELF_ENDIAN_BIG) {
-				lget = be32_lget;
-				sget = be_sget;
-				iget = be_iget;
-			}
-			phoff = &mm[ELF32_PHT_OFF];
-			phesz = &mm[ELF32_PHTE_SIZE];
-			phecnt = &mm[ELF32_PHTE_CNT];
-			phreloff = ELF32_PHE_OFF;
-			phrelsz = ELF32_PHE_SIZE;
-		} else if(mm[ELF_BITS] == ELF_BITS_64) {
-			if(mm[ELF_ENDIAN] == ELF_ENDIAN_LITL) {
-				lget = le64_lget;
-				sget = le_sget;
-				iget = le_iget;
-			} else if(mm[ELF_ENDIAN] == ELF_ENDIAN_BIG) {
-				lget = be64_lget;
-				sget = be_sget;
-				iget = be_iget;
-			}
-			phoff = &mm[ELF64_PHT_OFF];
-			phesz = &mm[ELF64_PHTE_SIZE];
-			phecnt = &mm[ELF64_PHTE_CNT];
-			phreloff = ELF64_PHE_OFF;
-			phrelsz = ELF64_PHE_SIZE;
-		}
-
-		exit_if(!lget, "Unsupported ELF format");
-
-		if(!phoff) /* program header may be absent, don't make it an error */
-			return;
-
-		/* TODO(vc): sanity checks on values before using them */
-		for(ph = &mm[lget(phoff)], i = 0; i < sget(phecnt); i++, ph += sget(phesz)) {
-			if(iget(ph) == ELF_PT_INTERP) {
-				itrp = strndup((char *)&mm[lget(&ph[phreloff])], lget(&ph[phrelsz]));
-				break;
-			}
-		}
-	} else {
-		exit_if(1, "Unsupported file type");
-	}
-
-	exit_if(!itrp, "Unable to determine interpreter for \"%s\"", exe);
-	exit_if(*itrp != '/', "Path must be absolute: \"%s\"", itrp);
-	exit_if(++diag_depth > MAX_DIAG_DEPTH,
-		"Excessive interpreter recursion, giving up");
-	diag(itrp);
-}
+#include "diagnostic-util.h"
 
 /* Create keep_env file from keep_env, if they're present in
  * current environment and file doesn't exist */
diff --git a/stage1/enterexec/enterexec.mk b/stage1/enterexec/enterexec.mk
index 5c75993790..4591a2f9ad 100644
--- a/stage1/enterexec/enterexec.mk
+++ b/stage1/enterexec/enterexec.mk
@@ -1,3 +1,5 @@
-ASSCB_EXTRA_HEADERS := elf.h
+ASSCB_EXTRA_CFLAGS := -I$(MK_SRCDIR)/../diagnostic
+ASSCB_EXTRA_HEADERS := ../diagnostic/diagnostic-util.h
+ASSCB_EXTRA_SOURCES := ../diagnostic/diagnostic-util.c
 
 include stage1/makelib/aci_simple_static_c_bin.mk
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index c847ae5620..e4512a5212 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -155,7 +155,7 @@ func WritePrepareAppTemplate(p *stage1commontypes.Pod) error {
 	return nil
 }
 
-func writeAppReaper(p *stage1commontypes.Pod, appName string) error {
+func writeAppReaper(p *stage1commontypes.Pod, appName string, appRootDirectory string, binPath string) error {
 	opts := []*unit.UnitOption{
 		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("%s Reaper", appName)),
 		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
@@ -166,7 +166,7 @@ func writeAppReaper(p *stage1commontypes.Pod, appName string) error {
 		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
 		unit.NewUnitOption("Unit", "Conflicts", "poweroff.target"),
 		unit.NewUnitOption("Service", "RemainAfterExit", "yes"),
-		unit.NewUnitOption("Service", "ExecStop", fmt.Sprintf("/reaper.sh %s", appName)),
+		unit.NewUnitOption("Service", "ExecStop", fmt.Sprintf("/reaper.sh \"%s\" \"%s\" \"%s\"", appName, appRootDirectory, binPath)),
 	}
 
 	unitsPath := filepath.Join(common.Stage1RootfsPath(p.Root), UnitsDir)
@@ -604,7 +604,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		return errwrap.Wrap(errors.New("failed to link service want"), err)
 	}
 
-	if err = writeAppReaper(p, appName.String()); err != nil {
+	if err = writeAppReaper(p, appName.String(), common.RelAppRootfsPath(appName), binPath); err != nil {
 		return errwrap.Wrap(fmt.Errorf("failed to write app %q reaper service", appName), err)
 	}
 
diff --git a/stage1/makelib/aci_simple_static_c_bin.mk b/stage1/makelib/aci_simple_static_c_bin.mk
index bf15731734..c850de27db 100644
--- a/stage1/makelib/aci_simple_static_c_bin.mk
+++ b/stage1/makelib/aci_simple_static_c_bin.mk
@@ -2,6 +2,8 @@
 #
 # ASSCB_EXTRA_HEADERS - additional local C headers used
 #
+# ASSCB_EXTRA_SOURCES - additional local C sources used
+#
 # ASSCB_FLAVORS - which flavors want this app, set to STAGE1_FLAVORS
 # if empty
 #
@@ -37,7 +39,7 @@ endif
 # variables for build_static_c_bin.mk
 BSCB_BINARY := $(_ASSCB_BINARY_)
 BSCB_HEADERS := $(foreach h,$(ASSCB_EXTRA_HEADERS),$(MK_SRCDIR)/$h)
-BSCB_SOURCES := $(MK_SRCDIR)/$(_ASSCB_NAME_).c
+BSCB_SOURCES := $(MK_SRCDIR)/$(_ASSCB_NAME_).c $(foreach h,$(ASSCB_EXTRA_SOURCES),$(MK_SRCDIR)/$h)
 BSCB_ADDITIONAL_CFLAGS := -Wall -Os $(ASSCB_EXTRA_CFLAGS)
 
 CLEAN_FILES += $(_ASSCB_BINARY_)
diff --git a/stage1/reaper/reaper.sh b/stage1/reaper/reaper.sh
index ce5267311d..0962a34aa4 100755
--- a/stage1/reaper/reaper.sh
+++ b/stage1/reaper/reaper.sh
@@ -2,17 +2,25 @@
 shopt -s nullglob
 
 SYSCTL=/usr/bin/systemctl
+DIAG=/diagnostic
 
-if [ $# -eq 1 ]; then
+if [ $# -eq 3 ]; then
     app=$1
+    root_dir=$2
+    target=$3
     status=$(${SYSCTL} show --property ExecMainStatus "${app}.service")
-    echo "${status#*=}" > "/rkt/status/$app"
-    if [ "${status#*=}" != 0 ] ; then
+    status="${status#*=}"
+    echo "${status}" > "/rkt/status/$app"
+    if [ "${status}" != 0 ] ; then
         # The command "systemctl exit $status" sets the return value that will
         # be used when the pod exits (via shutdown.service).
         # This command is available since systemd v227. On older versions, the
         # command will fail and rkt will just exit with return code 0.
         ${SYSCTL} exit ${status#*=} 2>/dev/null
+        # systemd EXIT_EXEC is 203 (https://github.com/systemd/systemd/blob/v230/src/basic/exit-status.h#L47)
+        if [ "${status}" == 203 ]; then
+            "${DIAG}" "${root_dir}" "${target}" 2>&1
+        fi
     fi
     exit 0
 fi
diff --git a/stage1/secondary-stuff.mk b/stage1/secondary-stuff.mk
index 686dfd26e7..8fac67217a 100644
--- a/stage1/secondary-stuff.mk
+++ b/stage1/secondary-stuff.mk
@@ -3,6 +3,7 @@ _S1_SS_SUBDIRS_ := \
 	enter \
 	enter_kvm \
 	enterexec \
+	diagnostic \
 	gc \
 	init \
 	net \
diff --git a/tests/rkt_diagnostic_test.go b/tests/rkt_diagnostic_test.go
new file mode 100644
index 0000000000..7f40c8cb15
--- /dev/null
+++ b/tests/rkt_diagnostic_test.go
@@ -0,0 +1,48 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src kvm
+
+package main
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestDiagnostic(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	var img, runCmd, expectedRegex string
+
+	img = getInspectImagePath()
+	runCmd = fmt.Sprintf("%s --insecure-options=image run %s --exec=/foo-not-there", ctx.Cmd(), img)
+	expectedRegex = ".*Error: Unable to open \"/foo-not-there\": No such file or directory"
+	runRktAndCheckRegexOutput(t, runCmd, expectedRegex)
+
+	runCmd = fmt.Sprintf("%s --insecure-options=image run %s --exec=/foo-not-there -- arg1 arg2", ctx.Cmd(), img)
+	expectedRegex = ".*Error: Unable to open \"/foo-not-there\": No such file or directory"
+	runRktAndCheckRegexOutput(t, runCmd, expectedRegex)
+
+	runCmd = fmt.Sprintf("%s --insecure-options=image run %s --exec=/foo-not-there\\ X -- arg1 arg2", ctx.Cmd(), img)
+	expectedRegex = ".*Error: Unable to open \"/foo-not-there X\": No such file or directory"
+	runRktAndCheckRegexOutput(t, runCmd, expectedRegex)
+
+	runCmd = fmt.Sprintf("%s --insecure-options=image run --volume=host-bin,kind=host,source=/bin/ --mount volume=host-bin,target=/var/host-bin %s --exec=/var/host-bin/ls", ctx.Cmd(), img)
+	expectedRegex = ".*Error: Unable to open \".*lib.*\\.so\\.\\d\": No such file or directory"
+	runRktAndCheckRegexOutput(t, runCmd, expectedRegex)
+}

From 42264aa101dc96266dfc18df23714ade2c23bc65 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Wed, 13 Jul 2016 15:09:51 +0200
Subject: [PATCH 0520/1304] stage1/enterexec: Add entry to ASSCB_EXTRA_HEADERS

Added entry to ASSCB_EXTRA_HEADERS for a better changes tracking.
---
 stage1/enterexec/enterexec.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/enterexec/enterexec.mk b/stage1/enterexec/enterexec.mk
index 4591a2f9ad..f47eebef91 100644
--- a/stage1/enterexec/enterexec.mk
+++ b/stage1/enterexec/enterexec.mk
@@ -1,5 +1,5 @@
 ASSCB_EXTRA_CFLAGS := -I$(MK_SRCDIR)/../diagnostic
-ASSCB_EXTRA_HEADERS := ../diagnostic/diagnostic-util.h
+ASSCB_EXTRA_HEADERS := ../diagnostic/diagnostic-util.h ../diagnostic/elf.h
 ASSCB_EXTRA_SOURCES := ../diagnostic/diagnostic-util.c
 
 include stage1/makelib/aci_simple_static_c_bin.mk

From de0d6c32af7749f46b2850754018c124c868f809 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Mon, 11 Jul 2016 12:46:09 +0000
Subject: [PATCH 0521/1304] functional tests: add some more volume/mount tests

---
 tests/rkt_volume_test.go | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 406afef649..dc6dc55734 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -31,11 +31,19 @@ import (
 	"github.com/appc/spec/schema/types"
 )
 
+// Some of these tests persistently modify files; subsequent test rows
+// expect those modifications.
 var volTests = []struct {
 	rktCmd       string
 	expect       string
 	expectedExit int
 }{
+	// Check that mounting a non-existent directory fails
+	{
+		`/bin/sh -c "export FILE=/dir1/file ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=/this/directory/does/not/exist --mount=volume=dir1,target=dir1 ^VOL_RO_READ_FILE^"`,
+		`Failed to stat /this/directory/does/not/exist: No such file or directory`,
+		1,
+	},
 	// Check that we can read files in the ACI
 	{
 		`/bin/sh -c "export FILE=/dir1/file ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true ^READ_FILE^"`,
@@ -48,11 +56,18 @@ var volTests = []struct {
 		`<<<host>>>`,
 		0,
 	},
+	// ro case
 	{
 		`/bin/sh -c "export FILE=/dir1/file ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=dir1 ^VOL_RO_READ_FILE^"`,
 		`<<<host>>>`,
 		0,
 	},
+	// Check that, when we create a nested mountpoint, the created parents have the right perms
+	{
+		`/bin/sh -c "export FILE=/a/b ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=/a/b/c ^STAT_FILE^"`,
+		`/a/b: mode: drwxr-xr-x`,
+		0,
+	},
 	// Check that we can write to files in the ACI
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=1 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true ^WRITE_FILE^"`,
@@ -76,6 +91,12 @@ var volTests = []struct {
 		`<<<2>>>`,
 		0,
 	},
+	// Check that the file has changed on the host
+	{
+		`/bin/sh -c "cat ^TMPDIR^/file"`,
+		`2`,
+		0,
+	},
 	// Check that injecting a rw mount/volume works without any mountpoint in the image manifest
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=1 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ ^VOL_ADD_MOUNT_RW^ --mount=volume=dir1,target=dir1"`,
@@ -99,6 +120,18 @@ var volTests = []struct {
 		`<<<1>>>`,
 		0,
 	},
+	// Check that deeply nested mountpoints are created
+	{
+		`/bin/sh -c "export FILE=/dir1/dir2/dir3/file ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=/dir1/dir2/dir3 ^VOL_RW_READ_FILE^"`,
+		`<<<1>>>`,
+		0,
+	},
+	// Check that a non-existent mountpoint is OK
+	{
+		`/bin/sh -c "export FILE=/a/b/c/file ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=/a/b/c ^VOL_RW_READ_FILE^"`,
+		`<<<1>>>`,
+		0,
+	},
 }
 
 func NewVolumesTest() testutils.Test {
@@ -123,6 +156,9 @@ func NewVolumesTest() testutils.Test {
 		defer os.Remove(volAddMountRwImage)
 		volAddMountRoImage := patchTestACI("rkt-inspect-vol-add-mount-ro.aci", "--exec=/inspect --write-file --read-file")
 		defer os.Remove(volAddMountRoImage)
+		statFileImage := patchTestACI("rkt-inspect-stat.aci", "--exec=/inspect --stat-file")
+		defer os.Remove(statFileImage)
+
 		ctx := testutils.NewRktRunCtx()
 		defer ctx.Cleanup()
 
@@ -147,6 +183,7 @@ func NewVolumesTest() testutils.Test {
 			cmd = strings.Replace(cmd, "^VOL_RO_READ_FILE_ONLY^", volRoReadFileOnlyImage, -1)
 			cmd = strings.Replace(cmd, "^VOL_ADD_MOUNT_RW^", volAddMountRwImage, -1)
 			cmd = strings.Replace(cmd, "^VOL_ADD_MOUNT_RO^", volAddMountRoImage, -1)
+			cmd = strings.Replace(cmd, "^STAT_FILE^", statFileImage, -1)
 
 			t.Logf("Running test #%v", i)
 			child := spawnOrFail(t, cmd)

From ed6759cf6fada8aeffa2f0b409ade5e73b59c5a1 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Wed, 13 Jul 2016 18:35:08 -0700
Subject: [PATCH 0522/1304] api_service/log: Fix file descriptor leak in
 GetLogs().

---
 rkt/api_service_sdjournal.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rkt/api_service_sdjournal.go b/rkt/api_service_sdjournal.go
index 12aabb1c4c..b98fafa0c7 100644
--- a/rkt/api_service_sdjournal.go
+++ b/rkt/api_service_sdjournal.go
@@ -38,6 +38,8 @@ func (s *v1AlphaAPIServer) constrainedGetLogs(request *v1alpha.GetLogsRequest, s
 	if err != nil {
 		return err
 	}
+	defer pod.Close()
+
 	stage1Path := "stage1/rootfs"
 	if pod.usesOverlay() {
 		stage1TreeStoreID, err := pod.getStage1TreeStoreID()

From 12bed3857dda28084c9b8bdede18f24947744545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 6 Jul 2016 18:01:09 +0200
Subject: [PATCH 0523/1304] glide: update docker2aci to v0.12.1

It includes support for the docker image format v2.2 and OCI image
format and allows fetching via digest.
---
 glide.lock                                    |   7 +-
 glide.yaml                                    |   2 +-
 .../internal/backend/repository/repository.go |   7 +
 .../backend/repository/repository2.go         | 275 +++++++++++++++---
 .../appc/docker2aci/lib/internal/internal.go  | 206 +++++++++++--
 .../lib/internal/typesV2/docker_types.go      | 138 +++++++++
 .../github.com/appc/docker2aci/lib/version.go |   2 +-
 7 files changed, 574 insertions(+), 63 deletions(-)
 create mode 100644 vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go

diff --git a/glide.lock b/glide.lock
index c340012929..194b954a29 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: c98a3d0cb1340703d2bbf77ac3bf2f6e357c0de64fb02f5d502ffac399b5d5e5
-updated: 2016-07-06T16:44:19.414775414+02:00
+hash: 79f133fbb4e0f79f65f0b5303420513c3e3f8859b9d11ef7b6ff65120dcd29e4
+updated: 2016-07-14T12:45:07.658245282+02:00
 imports:
 - name: github.com/appc/docker2aci
-  version: 355af275fa8d48b4ecdd361a5feaf173abff81e7
+  version: d77d6e4b99a0d8b6be6f70c623c86ba777110cbd
   subpackages:
   - lib
   - lib/common
@@ -14,6 +14,7 @@ imports:
   - lib/internal/types
   - lib/internal/util
   - pkg/log
+  - lib/internal/typesV2
 - name: github.com/appc/goaci
   version: ba7b591f930783c0ab75f5bbfd6ff65c7bd011bf
   subpackages:
diff --git a/glide.yaml b/glide.yaml
index af71435198..37aada11c7 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.11.1
+  version: v0.12.1
   subpackages:
   - lib
   - lib/common
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
index 57533857a1..f9dfaac733 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
@@ -27,6 +27,7 @@ import (
 	"github.com/appc/docker2aci/lib/common"
 	"github.com/appc/docker2aci/lib/internal/docker"
 	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/typesV2"
 	"github.com/appc/docker2aci/lib/internal/util"
 	"github.com/appc/spec/schema"
 )
@@ -47,6 +48,9 @@ type RepositoryBackend struct {
 	hostsV2AuthTokens map[string]map[string]string
 	schema            string
 	imageManifests    map[types.ParsedDockerURL]v2Manifest
+	imageV2Manifests  map[types.ParsedDockerURL]*typesV2.ImageManifest
+	imageConfigs      map[types.ParsedDockerURL]*typesV2.ImageConfig
+	reverseLayers     map[string]int
 }
 
 func NewRepositoryBackend(username string, password string, insecure common.InsecureConfig) *RepositoryBackend {
@@ -57,6 +61,9 @@ func NewRepositoryBackend(username string, password string, insecure common.Inse
 		hostsV2Support:    make(map[string]bool),
 		hostsV2AuthTokens: make(map[string]map[string]string),
 		imageManifests:    make(map[types.ParsedDockerURL]v2Manifest),
+		imageV2Manifests:  make(map[types.ParsedDockerURL]*typesV2.ImageManifest),
+		imageConfigs:      make(map[types.ParsedDockerURL]*typesV2.ImageConfig),
+		reverseLayers:     make(map[string]int),
 	}
 }
 
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
index 356d6f9bee..fc12677b8e 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The appc Authors
+// Copyright 2016 The appc Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ import (
 	"github.com/appc/docker2aci/lib/common"
 	"github.com/appc/docker2aci/lib/internal"
 	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/typesV2"
 	"github.com/appc/docker2aci/lib/internal/util"
 	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/schema"
@@ -44,6 +45,7 @@ const (
 
 var validHex = regexp.MustCompile(`^([a-f0-9]{64})$`)
 
+// A manifest conforming to the docker v2.1 spec
 type v2Manifest struct {
 	Name     string `json:"name"`
 	Tag      string `json:"tag"`
@@ -57,17 +59,23 @@ type v2Manifest struct {
 }
 
 func (rb *RepositoryBackend) getImageInfoV2(dockerURL *types.ParsedDockerURL) ([]string, *types.ParsedDockerURL, error) {
-	manifest, layers, err := rb.getManifestV2(dockerURL)
+	layers, err := rb.getManifestV2(dockerURL)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	rb.imageManifests[*dockerURL] = *manifest
-
 	return layers, dockerURL, nil
 }
 
 func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	_, isVersion22 := rb.imageV2Manifests[*dockerURL]
+	if isVersion22 {
+		return rb.buildACIV22(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+	}
+	return rb.buildACIV21(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+}
+
+func (rb *RepositoryBackend) buildACIV21(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	layerFiles := make([]*os.File, len(layerIDs))
 	layerDatas := make([]types.DockerImageData, len(layerIDs))
 
@@ -94,9 +102,9 @@ func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.Pars
 
 			manifest := rb.imageManifests[*dockerURL]
 
-			layerIndex, err := getLayerIndex(layerID, manifest)
-			if err != nil {
-				errChan <- err
+			layerIndex, ok := rb.reverseLayers[layerID]
+			if !ok {
+				errChan <- fmt.Errorf("layer not found in manifest: %s", layerID)
 				return
 			}
 
@@ -167,48 +175,169 @@ func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.Pars
 	return aciLayerPaths, aciManifests, nil
 }
 
-func (rb *RepositoryBackend) getManifestV2(dockerURL *types.ParsedDockerURL) (*v2Manifest, []string, error) {
-	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "manifests", dockerURL.Tag)
+type layer struct {
+	index  int
+	file   *os.File
+	closer io.Closer
+	err    error
+}
 
-	req, err := http.NewRequest("GET", url, nil)
+func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	layerFiles := make([]*os.File, len(layerIDs))
+
+	tmpParentDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
 	if err != nil {
 		return nil, nil, err
 	}
+	defer os.RemoveAll(tmpParentDir)
 
-	rb.setBasicAuth(req)
+	copier := progressutil.NewCopyProgressPrinter()
 
-	res, err := rb.makeRequest(req, dockerURL.ImageName)
+	resultChan := make(chan layer, len(layerIDs))
+	for i, layerID := range layerIDs {
+		// https://github.com/golang/go/wiki/CommonMistakes
+		i := i // golang--
+		layerID := layerID
+		go func() {
+			tmpDir, err := ioutil.TempDir(tmpParentDir, "")
+			if err != nil {
+				resultChan <- layer{
+					index: i,
+					err:   fmt.Errorf("error creating dir: %v", err),
+				}
+				return
+			}
+
+			layerFile, closer, err := rb.getLayerV2(layerID, dockerURL, tmpDir, copier)
+			if err != nil {
+				resultChan <- layer{
+					index: i,
+					err:   fmt.Errorf("error getting the remote layer: %v", err),
+				}
+				return
+			}
+			resultChan <- layer{
+				index:  i,
+				file:   layerFile,
+				closer: closer,
+				err:    nil,
+			}
+		}()
+	}
+	var errs []error
+	for i := 0; i < len(layerIDs); i++ {
+		res := <-resultChan
+		if res.closer != nil {
+			defer res.closer.Close()
+		}
+		if res.file != nil {
+			defer res.file.Close()
+		}
+		if res.err != nil {
+			errs = append(errs, res.err)
+		}
+		layerFiles[res.index] = res.file
+	}
+	if len(errs) > 0 {
+		return nil, nil, errs[0]
+	}
+	err = copier.PrintAndWait(os.Stderr, 500*time.Millisecond, nil)
 	if err != nil {
 		return nil, nil, err
 	}
+	for _, layerFile := range layerFiles {
+		err := layerFile.Sync()
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+	var aciLayerPaths []string
+	var aciManifests []*schema.ImageManifest
+	var curPwl []string
+	for i := len(layerIDs) - 1; i > 0; i-- {
+		log.Debug("Generating layer ACI...")
+		aciPath, aciManifest, err := internal.GenerateACI22LowerLayer(dockerURL, layerIDs[i], outputDir, layerFiles[i], curPwl, compression)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
+		}
+		aciLayerPaths = append(aciLayerPaths, aciPath)
+		aciManifests = append(aciManifests, aciManifest)
+		curPwl = aciManifest.PathWhitelist
+	}
+	aciPath, aciManifest, err := internal.GenerateACI22TopLayer(dockerURL, rb.imageConfigs[*dockerURL], layerIDs[0], outputDir, layerFiles[0], curPwl, compression, aciManifests)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error generating ACI: %v", err)
+	}
+	aciLayerPaths = append(aciLayerPaths, aciPath)
+	aciManifests = append(aciManifests, aciManifest)
+
+	return aciLayerPaths, aciManifests, nil
+}
+
+func (rb *RepositoryBackend) getManifestV2(dockerURL *types.ParsedDockerURL) ([]string, error) {
+	var reference string
+	if dockerURL.Digest != "" {
+		reference = dockerURL.Digest
+	} else {
+		reference = dockerURL.Tag
+	}
+	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "manifests", reference)
+
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	rb.setBasicAuth(req)
+
+	accepting := []string{
+		typesV2.MediaTypeOCIManifest,
+		typesV2.MediaTypeDockerV22Manifest,
+		typesV2.MediaTypeDockerV21Manifest,
+	}
+
+	res, err := rb.makeRequest(req, dockerURL.ImageName, accepting)
+	if err != nil {
+		return nil, err
+	}
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusOK {
-		return nil, nil, fmt.Errorf("unexpected http code: %d, URL: %s", res.StatusCode, req.URL)
+		return nil, fmt.Errorf("unexpected http code: %d, URL: %s", res.StatusCode, req.URL)
 	}
 
+	switch res.Header.Get("content-type") {
+	case typesV2.MediaTypeDockerV22Manifest, typesV2.MediaTypeOCIManifest:
+		return rb.getManifestV22(dockerURL, res)
+	case typesV2.MediaTypeDockerV21Manifest:
+		return rb.getManifestV21(dockerURL, res)
+	}
+	return rb.getManifestV21(dockerURL, res)
+}
+
+func (rb *RepositoryBackend) getManifestV21(dockerURL *types.ParsedDockerURL, res *http.Response) ([]string, error) {
 	manblob, err := ioutil.ReadAll(res.Body)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	manifest := &v2Manifest{}
 
 	err = json.Unmarshal(manblob, manifest)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	if manifest.Name != dockerURL.ImageName {
-		return nil, nil, fmt.Errorf("name doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.ImageName, manifest.Name)
+		return nil, fmt.Errorf("name doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.ImageName, manifest.Name)
 	}
 
 	if manifest.Tag != dockerURL.Tag {
-		return nil, nil, fmt.Errorf("tag doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.Tag, manifest.Tag)
+		return nil, fmt.Errorf("tag doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.Tag, manifest.Tag)
 	}
 
 	if err := fixManifestLayers(manifest); err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	//TODO: verify signature here
@@ -216,10 +345,77 @@ func (rb *RepositoryBackend) getManifestV2(dockerURL *types.ParsedDockerURL) (*v
 	layers := make([]string, len(manifest.FSLayers))
 
 	for i, layer := range manifest.FSLayers {
+		rb.reverseLayers[layer.BlobSum] = i
 		layers[i] = layer.BlobSum
 	}
 
-	return manifest, layers, nil
+	rb.imageManifests[*dockerURL] = *manifest
+
+	return layers, nil
+}
+
+func (rb *RepositoryBackend) getManifestV22(dockerURL *types.ParsedDockerURL, res *http.Response) ([]string, error) {
+	manblob, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	manifest := &typesV2.ImageManifest{}
+
+	err = json.Unmarshal(manblob, manifest)
+	if err != nil {
+		return nil, err
+	}
+
+	//TODO: verify signature here
+
+	layers := make([]string, len(manifest.Layers))
+
+	for i, layer := range manifest.Layers {
+		layers[i] = layer.Digest
+	}
+
+	err = rb.getConfigV22(dockerURL, manifest.Config.Digest)
+	if err != nil {
+		return nil, err
+	}
+
+	rb.imageV2Manifests[*dockerURL] = manifest
+
+	return layers, nil
+}
+
+func (rb *RepositoryBackend) getConfigV22(dockerURL *types.ParsedDockerURL, configDigest string) error {
+	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "blobs", configDigest)
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return err
+	}
+
+	rb.setBasicAuth(req)
+
+	accepting := []string{
+		typesV2.MediaTypeOCIConfig,
+		typesV2.MediaTypeDockerV22Config,
+	}
+
+	res, err := rb.makeRequest(req, dockerURL.ImageName, accepting)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+
+	confblob, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return err
+	}
+	config := &typesV2.ImageConfig{}
+	err = json.Unmarshal(confblob, config)
+	if err != nil {
+		return err
+	}
+	rb.imageConfigs[*dockerURL] = config
+	return nil
 }
 
 func fixManifestLayers(manifest *v2Manifest) error {
@@ -278,17 +474,12 @@ func validateV1ID(id string) error {
 	return nil
 }
 
-func getLayerIndex(layerID string, manifest v2Manifest) (int, error) {
-	for i, layer := range manifest.FSLayers {
-		if layer.BlobSum == layerID {
-			return i, nil
-		}
-	}
-	return -1, fmt.Errorf("layer not found in manifest: %s", layerID)
-}
-
 func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedDockerURL, tmpDir string, copier *progressutil.CopyProgressPrinter) (*os.File, io.ReadCloser, error) {
-	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "blobs", layerID)
+	var (
+		err error
+		res *http.Response
+		url = rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "blobs", layerID)
+	)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
@@ -296,11 +487,22 @@ func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedD
 
 	rb.setBasicAuth(req)
 
-	res, err := rb.makeRequest(req, dockerURL.ImageName)
+	accepting := []string{
+		typesV2.MediaTypeDockerV22RootFS,
+		typesV2.MediaTypeOCIRootFS,
+	}
+
+	res, err = rb.makeRequest(req, dockerURL.ImageName, accepting)
 	if err != nil {
 		return nil, nil, err
 	}
 
+	defer func() {
+		if err != nil && res != nil {
+			res.Body.Close()
+		}
+	}()
+
 	if res.StatusCode == http.StatusTemporaryRedirect || res.StatusCode == http.StatusFound {
 		location := res.Header.Get("Location")
 		if location != "" {
@@ -308,11 +510,12 @@ func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedD
 			if err != nil {
 				return nil, nil, err
 			}
-			res, err = rb.makeRequest(req, dockerURL.ImageName)
+			res.Body.Close()
+			res = nil
+			res, err = rb.makeRequest(req, dockerURL.ImageName, accepting)
 			if err != nil {
 				return nil, nil, err
 			}
-			defer res.Body.Close()
 		}
 	}
 
@@ -347,7 +550,7 @@ func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedD
 	return layerFile, res.Body, nil
 }
 
-func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string) (*http.Response, error) {
+func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string, acceptHeaders []string) (*http.Response, error) {
 	setBearerHeader := false
 	hostAuthTokens, ok := rb.hostsV2AuthTokens[req.URL.Host]
 	if ok {
@@ -358,6 +561,10 @@ func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string) (*http.
 		}
 	}
 
+	for _, acceptHeader := range acceptHeaders {
+		req.Header.Add("Accept", acceptHeader)
+	}
+
 	client := util.GetTLSClient(rb.insecure.SkipVerify)
 	res, err := client.Do(req)
 	if err != nil {
@@ -456,7 +663,7 @@ func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string) (*http.
 
 	hostAuthTokens[repo] = tokenStruct.Token
 
-	return rb.makeRequest(req, repo)
+	return rb.makeRequest(req, repo, acceptHeaders)
 }
 
 func (rb *RepositoryBackend) setBasicAuth(req *http.Request) {
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/internal.go b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
index 29cd8c87e4..e116cc119c 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/internal.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
@@ -26,6 +26,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"runtime"
 	"sort"
 	"strconv"
 	"strings"
@@ -34,6 +35,7 @@ import (
 	"github.com/appc/docker2aci/lib/common"
 	"github.com/appc/docker2aci/lib/internal/tarball"
 	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/typesV2"
 	"github.com/appc/docker2aci/lib/internal/util"
 	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/aci"
@@ -63,20 +65,8 @@ func GenerateACI(layerNumber int, layerData types.DockerImageData, dockerURL *ty
 	}
 
 	imageName := strings.Replace(dockerURL.ImageName, "/", "-", -1)
-	aciPath := imageName + "-" + layerData.ID
-	if dockerURL.Tag != "" {
-		aciPath += "-" + dockerURL.Tag
-	}
-	if layerData.OS != "" {
-		aciPath += "-" + layerData.OS
-		if layerData.Architecture != "" {
-			aciPath += "-" + layerData.Architecture
-		}
-	}
-	aciPath += "-" + strconv.Itoa(layerNumber)
-	aciPath += ".aci"
+	aciPath := generateACIPath(outputDir, imageName, layerData.ID, dockerURL.Tag, layerData.OS, layerData.Architecture, layerNumber)
 
-	aciPath = path.Join(outputDir, aciPath)
 	manifest, err = writeACI(layerFile, *manifest, curPwl, aciPath, compression)
 	if err != nil {
 		return "", nil, fmt.Errorf("error writing ACI: %v", err)
@@ -89,25 +79,71 @@ func GenerateACI(layerNumber int, layerData types.DockerImageData, dockerURL *ty
 	return aciPath, manifest, nil
 }
 
-// ValidateACI checks whether the ACI in aciPath is valid.
-func ValidateACI(aciPath string) error {
-	aciFile, err := os.Open(aciPath)
+func GenerateACI22LowerLayer(dockerURL *types.ParsedDockerURL, layerDigest string, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
+	formattedDigest := strings.Replace(layerDigest, ":", "-", -1)
+	aciName := fmt.Sprintf("%s/%s-%s", dockerURL.IndexURL, dockerURL.ImageName, formattedDigest)
+	sanitizedAciName, err := appctypes.SanitizeACIdentifier(aciName)
 	if err != nil {
-		return err
+		return "", nil, err
+	}
+	manifest, err := GenerateEmptyManifest(sanitizedAciName)
+	if err != nil {
+		return "", nil, err
 	}
-	defer aciFile.Close()
 
-	tr, err := aci.NewCompressedTarReader(aciFile)
+	aciPath := generateACIPath(outputDir, aciName, layerDigest, dockerURL.Tag, runtime.GOOS, runtime.GOARCH, -1)
+	manifest, err = writeACI(layerFile, *manifest, curPwl, aciPath, compression)
 	if err != nil {
-		return err
+		return "", nil, err
 	}
-	defer tr.Close()
 
-	if err := aci.ValidateArchive(tr.Reader); err != nil {
-		return err
+	err = ValidateACI(aciPath)
+	if err != nil {
+		return "", nil, fmt.Errorf("invalid ACI generated: %v", err)
 	}
+	return aciPath, manifest, nil
+}
 
-	return nil
+func GenerateACI22TopLayer(dockerURL *types.ParsedDockerURL, imageConfig *typesV2.ImageConfig, layerDigest string, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression, lowerLayers []*schema.ImageManifest) (string, *schema.ImageManifest, error) {
+	aciName := fmt.Sprintf("%s/%s-%s", dockerURL.IndexURL, dockerURL.ImageName, layerDigest)
+	sanitizedAciName, err := appctypes.SanitizeACIdentifier(aciName)
+	if err != nil {
+		return "", nil, err
+	}
+	manifest, err := GenerateManifestV22(sanitizedAciName, dockerURL, imageConfig, layerDigest, lowerLayers)
+	if err != nil {
+		return "", nil, err
+	}
+
+	aciPath := generateACIPath(outputDir, aciName, layerDigest, dockerURL.Tag, runtime.GOOS, runtime.GOARCH, -1)
+	manifest, err = writeACI(layerFile, *manifest, curPwl, aciPath, compression)
+	if err != nil {
+		return "", nil, err
+	}
+
+	err = ValidateACI(aciPath)
+	if err != nil {
+		return "", nil, fmt.Errorf("invalid ACI generated: %v", err)
+	}
+	return aciPath, manifest, nil
+}
+
+func generateACIPath(outputDir, imageName, digest, tag, osString, arch string, layerNum int) string {
+	aciPath := imageName
+	if tag != "" {
+		aciPath += "-" + tag
+	}
+	if osString != "" {
+		aciPath += "-" + osString
+		if arch != "" {
+			aciPath += "-" + arch
+		}
+	}
+	if layerNum != -1 {
+		aciPath += "-" + strconv.Itoa(layerNum)
+	}
+	aciPath += ".aci"
+	return path.Join(outputDir, aciPath)
 }
 
 // GenerateManifest converts the docker manifest format to an appc
@@ -248,6 +284,123 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDo
 	return genManifest, nil
 }
 
+func GenerateEmptyManifest(name string) (*schema.ImageManifest, error) {
+	acid, err := appctypes.NewACIdentifier(name)
+	if err != nil {
+		return nil, err
+	}
+
+	return &schema.ImageManifest{
+		ACKind:    schema.ImageManifestKind,
+		ACVersion: schema.AppContainerVersion,
+		Name:      *acid,
+		Labels: appctypes.Labels{
+			appctypes.Label{
+				*appctypes.MustACIdentifier("arch"),
+				runtime.GOARCH,
+			},
+			appctypes.Label{
+				*appctypes.MustACIdentifier("os"),
+				runtime.GOOS,
+			},
+		},
+	}, nil
+}
+
+func GenerateManifestV22(name string, dockerURL *types.ParsedDockerURL, config *typesV2.ImageConfig, imageDigest string, lowerLayers []*schema.ImageManifest) (*schema.ImageManifest, error) {
+	manifest, err := GenerateEmptyManifest(name)
+	if err != nil {
+		return nil, err
+	}
+
+	labels := manifest.Labels.ToMap()
+	annotations := manifest.Annotations
+
+	addLabel := func(key, val string) {
+		if key != "" && val != "" {
+			labels[*appctypes.MustACIdentifier(key)] = val
+		}
+	}
+
+	addAnno := func(key, val string) {
+		if key != "" && val != "" {
+			annotations.Set(*appctypes.MustACIdentifier(key), val)
+		}
+	}
+
+	addLabel("version", dockerURL.Tag)
+	addLabel("os", config.OS)
+	addLabel("arch", config.Architecture)
+
+	addAnno("author", config.Author)
+	addAnno("created", config.Created)
+
+	addAnno(common.AppcDockerRegistryURL, dockerURL.IndexURL)
+	addAnno(common.AppcDockerRepository, dockerURL.ImageName)
+	addAnno(common.AppcDockerImageID, imageDigest)
+	addAnno("created", config.Created)
+
+	if config.Config != nil {
+		exec := getExecCommand(config.Config.Entrypoint, config.Config.Cmd)
+		user, group := parseDockerUser(config.Config.User)
+		var env appctypes.Environment
+		for _, v := range config.Config.Env {
+			parts := strings.SplitN(v, "=", 2)
+			env.Set(parts[0], parts[1])
+		}
+		manifest.App = &appctypes.App{
+			Exec:             exec,
+			User:             user,
+			Group:            group,
+			Environment:      env,
+			WorkingDirectory: config.Config.WorkingDir,
+		}
+		manifest.App.MountPoints, err = convertVolumesToMPs(config.Config.Volumes)
+		if err != nil {
+			return nil, err
+		}
+		manifest.App.Ports, err = convertPorts(config.Config.ExposedPorts, nil)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	for _, lowerLayer := range lowerLayers {
+		manifest.Dependencies = append(manifest.Dependencies, appctypes.Dependency{
+			ImageName: lowerLayer.Name,
+			Labels:    lowerLayer.Labels,
+		})
+	}
+
+	manifest.Labels, err = appctypes.LabelsFromMap(labels)
+	if err != nil {
+		return nil, err
+	}
+	manifest.Annotations = annotations
+	return manifest, nil
+}
+
+// ValidateACI checks whether the ACI in aciPath is valid.
+func ValidateACI(aciPath string) error {
+	aciFile, err := os.Open(aciPath)
+	if err != nil {
+		return err
+	}
+	defer aciFile.Close()
+
+	tr, err := aci.NewCompressedTarReader(aciFile)
+	if err != nil {
+		return err
+	}
+	defer tr.Close()
+
+	if err := aci.ValidateArchive(tr.Reader); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 type appcPortSorter []appctypes.Port
 
 func (s appcPortSorter) Len() int {
@@ -366,6 +519,11 @@ func convertVolumesToMPs(dockerVolumes map[string]struct{}) ([]appctypes.MountPo
 }
 
 func writeACI(layer io.ReadSeeker, manifest schema.ImageManifest, curPwl []string, output string, compression common.Compression) (*schema.ImageManifest, error) {
+	dir, _ := path.Split(output)
+	err := os.MkdirAll(dir, 0755)
+	if err != nil {
+		return nil, fmt.Errorf("error creating ACI parent dir: %v", err)
+	}
 	aciFile, err := os.Create(output)
 	if err != nil {
 		return nil, fmt.Errorf("error creating ACI file: %v", err)
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go b/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
new file mode 100644
index 0000000000..3a10cd5422
--- /dev/null
+++ b/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
@@ -0,0 +1,138 @@
+// Copyright 2016 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package typesV2
+
+import (
+	"encoding/json"
+	"errors"
+)
+
+const (
+	MediaTypeDockerV21Manifest       = "application/vnd.docker.distribution.manifest.v1+json"
+	MediaTypeDockerV21SignedManifest = "application/vnd.docker.distribution.manifest.v1+prettyjws"
+	MediaTypeDockerV21ManifestLayer  = "application/vnd.docker.container.image.rootfs.diff+x-gtar"
+
+	MediaTypeDockerV22Manifest     = "application/vnd.docker.distribution.manifest.v2+json"
+	MediaTypeDockerV22ManifestList = "application/vnd.docker.distribution.manifest.list.v2+json"
+	MediaTypeDockerV22Config       = "application/vnd.docker.container.image.v1+json"
+	MediaTypeDockerV22RootFS       = "application/vnd.docker.image.rootfs.diff.tar.gzip"
+
+	MediaTypeOCIManifest     = "application/vnd.oci.image.manifest.v1+json"
+	MediaTypeOCIManifestList = "application/vnd.oci.image.manifest.list.v1+json"
+	MediaTypeOCIConfig       = "application/vnd.oci.image.serialization.config.v1+json"
+	MediaTypeOCIRootFS       = "application/vnd.oci.image.serialization.rootfs.tar.gzip"
+	MediaTypeOCICombined     = "application/vnd.oci.image.serialization.combined.v1+json"
+)
+
+var (
+	ErrIncorrectMediaType = errors.New("incorrect mediaType")
+	ErrMissingConfig      = errors.New("the config field is empty")
+	ErrMissingLayers      = errors.New("the layers field is empty")
+)
+
+type ImageManifest struct {
+	SchemaVersion int                    `json:"schemaVersion"`
+	MediaType     string                 `json:"mediaType"`
+	Config        *ImageManifestDigest   `json:"config"`
+	Layers        []*ImageManifestDigest `json:"layers"`
+	Annotations   map[string]string      `json:"annotations"`
+}
+
+type ImageManifestDigest struct {
+	MediaType string `json:"mediaType"`
+	Size      int    `json:"size"`
+	Digest    string `json:"digest"`
+}
+
+func (im *ImageManifest) String() string {
+	manblob, err := json.Marshal(im)
+	if err != nil {
+		return err.Error()
+	}
+	return string(manblob)
+}
+
+func (im *ImageManifest) PrettyString() string {
+	manblob, err := json.MarshalIndent(im, "", "    ")
+	if err != nil {
+		return err.Error()
+	}
+	return string(manblob)
+}
+
+func (im *ImageManifest) Validate() error {
+	if im.MediaType != MediaTypeDockerV22Manifest && im.MediaType != MediaTypeOCIManifest {
+		return ErrIncorrectMediaType
+	}
+	if im.Config == nil {
+		return ErrMissingConfig
+	}
+	if len(im.Layers) == 0 {
+		return ErrMissingLayers
+	}
+	return nil
+}
+
+type ImageConfig struct {
+	Created      string                `json:"created"`
+	Author       string                `json:"author"`
+	Architecture string                `json:"architecture"`
+	OS           string                `json:"os"`
+	Config       *ImageConfigConfig    `json:"config"`
+	RootFS       *ImageConfigRootFS    `json:"rootfs"`
+	History      []*ImageConfigHistory `json:"history"`
+}
+
+type ImageConfigConfig struct {
+	User         string              `json:"User"`
+	Memory       int                 `json:"Memory"`
+	MemorySwap   int                 `json:"MemorySwap"`
+	CpuShares    int                 `json:"CpuShares"`
+	ExposedPorts map[string]struct{} `json:"ExposedPorts"`
+	Env          []string            `json:"Env"`
+	Entrypoint   []string            `json:"Entrypoint"`
+	Cmd          []string            `json:"Cmd"`
+	Volumes      map[string]struct{} `json:"Volumes"`
+	WorkingDir   string              `json:"WorkingDir"`
+}
+
+type ImageConfigRootFS struct {
+	DiffIDs []string `json:"diff_ids"`
+	Type    string   `json:"type"`
+}
+
+type ImageConfigHistory struct {
+	Created    string `json:"created,omitempty"`
+	Author     string `json:"author,omitempty"`
+	CreatedBy  string `json:"created_by,omitempty"`
+	Comment    string `json:"comment,omitempty"`
+	EmptyLayer bool   `json:"empty_layer,omitempty"`
+}
+
+func (ic *ImageConfig) String() string {
+	manblob, err := json.Marshal(ic)
+	if err != nil {
+		return err.Error()
+	}
+	return string(manblob)
+}
+
+func (ic *ImageConfig) PrettyString() string {
+	manblob, err := json.MarshalIndent(ic, "", "    ")
+	if err != nil {
+		return err.Error()
+	}
+	return string(manblob)
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index 487c4bc50e..862e861ee1 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.11.1"
+var Version = "0.12.1"
 var AppcVersion = schema.AppContainerVersion

From dd798aa9ccdeab451e2a6a6c248376676e326443 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Tue, 12 Jul 2016 15:35:14 +0000
Subject: [PATCH 0524/1304] rkt/api: detect when run as a systemd.socket(5)
 service

---
 rkt/api_service.go      | 71 ++++++++++++++++++++++++++++++++++------
 rkt/api_service_test.go | 72 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 10 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index d0d2413d47..c7c05cf6dd 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -29,6 +29,7 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
+	"github.com/coreos/go-systemd/activation"
 	"github.com/coreos/rkt/api/v1alpha"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
@@ -36,6 +37,7 @@ import (
 	"github.com/coreos/rkt/store"
 	"github.com/coreos/rkt/version"
 	"github.com/godbus/dbus"
+	"github.com/hashicorp/errwrap"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -44,21 +46,26 @@ import (
 var (
 	supportedAPIVersion = "1.0.0-alpha"
 	cmdAPIService       = &cobra.Command{
-		Use:   `api-service [--listen="localhost:15441"]`,
+		Use:   fmt.Sprintf(`api-service [--listen="%s"]`, common.APIServiceListenAddr),
 		Short: "Run API service (experimental)",
-		Long: `The API service listens for gRPC requests on the address and port specified by
-the --listen option.
+		Long: fmt.Sprintf(`The API service listens for gRPC requests on the address and port specified by
+the --listen option, by default %s
 
-Specify the address 0.0.0.0 to listen on all interfaces.`,
+Specify the address 0.0.0.0 to listen on all interfaces.
+
+It will also run correctly as a systemd socket-activated service, see
+systemd.socket(5).`, common.APIServiceListenAddr),
 		Run: runWrapper(runAPIService),
 	}
 
 	flagAPIServiceListenAddr string
+	flagSocketListen         bool
+	systemdFDs               = activation.Files // for mocking
 )
 
 func init() {
 	cmdRkt.AddCommand(cmdAPIService)
-	cmdAPIService.Flags().StringVar(&flagAPIServiceListenAddr, "listen", common.APIServiceListenAddr, "address to listen for client API requests")
+	cmdAPIService.Flags().StringVar(&flagAPIServiceListenAddr, "listen", "", "address to listen for client API requests")
 }
 
 // v1AlphaAPIServer implements v1Alpha.APIServer interface.
@@ -760,6 +767,7 @@ func (s *v1AlphaAPIServer) ListenEvents(request *v1alpha.ListenEventsRequest, se
 	return fmt.Errorf("not implemented yet")
 }
 
+// Open one or more listening sockets, then start the gRPC server
 func runAPIService(cmd *cobra.Command, args []string) (exit int) {
 	// Set up the signal handler here so we can make sure the
 	// signals are caught after print the starting message.
@@ -767,12 +775,15 @@ func runAPIService(cmd *cobra.Command, args []string) (exit int) {
 
 	stderr.Print("API service starting...")
 
-	tcpl, err := net.Listen("tcp", flagAPIServiceListenAddr)
+	listeners, err := openAPISockets()
 	if err != nil {
-		stderr.Error(err)
+		stderr.PrintE("Failed to open sockets", err)
+		return 1
+	}
+	if len(listeners) == 0 { // This is unlikely...
+		stderr.Println("No sockets to listen to. Quitting.")
 		return 1
 	}
-	defer tcpl.Close()
 
 	publicServer := grpc.NewServer() // TODO(yifan): Add TLS credential option.
 
@@ -784,9 +795,12 @@ func runAPIService(cmd *cobra.Command, args []string) (exit int) {
 
 	v1alpha.RegisterPublicAPIServer(publicServer, v1AlphaAPIServer)
 
-	go publicServer.Serve(tcpl)
+	for _, l := range listeners {
+		defer l.Close()
+		go publicServer.Serve(l)
+	}
 
-	stderr.Printf("API service running on %v...", flagAPIServiceListenAddr)
+	stderr.Printf("API service running")
 
 	<-exitCh
 
@@ -794,3 +808,40 @@ func runAPIService(cmd *cobra.Command, args []string) (exit int) {
 
 	return
 }
+
+// Open API sockets based on command line parameters and
+// the magic environment variable from systemd
+//
+// see sd_listen_fds(3)
+func openAPISockets() ([]net.Listener, error) {
+	listeners := []net.Listener{}
+
+	fds := systemdFDs(true) // Try to get the socket fds from systemd
+	if len(fds) > 0 {
+		if flagAPIServiceListenAddr != "" {
+			return nil, fmt.Errorf("started under systemd.socket(5), but --listen passed! Quitting.")
+		}
+
+		stderr.Printf("Listening on %d systemd-provided socket(s)\n", len(fds))
+		for _, fd := range fds {
+			l, err := net.FileListener(fd)
+			if err != nil {
+				return nil, errwrap.Wrap(fmt.Errorf("could not open listener"), err)
+			}
+			listeners = append(listeners, l)
+		}
+	} else {
+		if flagAPIServiceListenAddr == "" {
+			flagAPIServiceListenAddr = common.APIServiceListenAddr
+		}
+		stderr.Printf("Listening on %s\n", flagAPIServiceListenAddr)
+
+		l, err := net.Listen("tcp", flagAPIServiceListenAddr)
+		if err != nil {
+			return nil, errwrap.Wrap(fmt.Errorf("could not open tcp socket"), err)
+		}
+		listeners = append(listeners, l)
+	}
+
+	return listeners, nil
+}
diff --git a/rkt/api_service_test.go b/rkt/api_service_test.go
index 74131c9992..fdfc1af588 100644
--- a/rkt/api_service_test.go
+++ b/rkt/api_service_test.go
@@ -15,9 +15,13 @@
 package main
 
 import (
+	"io/ioutil"
+	"net"
+	"os"
 	"testing"
 
 	"github.com/coreos/rkt/api/v1alpha"
+	"github.com/coreos/rkt/pkg/log"
 )
 
 func TestFilterPod(t *testing.T) {
@@ -628,3 +632,71 @@ func TestFilterImageAny(t *testing.T) {
 		}
 	}
 }
+
+// Test that we open the correct kinds of sockets
+func TestOpenSocket(t *testing.T) {
+	stderr = log.New(os.Stderr, "TestOpenSocket", globalFlags.Debug)
+	// get a temp unix socket for us to play with
+	tempdir, err := ioutil.TempDir("", "TestOpenSocket")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tempdir)
+
+	l, err := net.Listen("unix", tempdir+"/sock")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer l.Close()
+	lfd, err := l.(*net.UnixListener).File()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer lfd.Close()
+
+	// Mock out the systemd FD function
+	systemdFDs = func(x bool) []*os.File {
+		return []*os.File{lfd}
+	}
+
+	// Test that we will open a systemd socket when asked for
+	l1, err := openAPISockets()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(l1) != 1 {
+		t.Errorf("expected len(l1) = 1, got %d", len(l1))
+	}
+
+	// Test that we fail when --listen is passed with a systemd socket
+	flagAPIServiceListenAddr = "localhost:0"
+	_, err = openAPISockets()
+	if err == nil {
+		t.Error("openAPISockets() did not fail when passed systemd socket and --listen")
+	}
+
+	// Then, disable socket mode and ask it to open a random tcp server port
+	systemdFDs = func(x bool) []*os.File {
+		return nil
+	}
+
+	l2, err := openAPISockets()
+	if err != nil {
+		t.Fatal("failed to open socket", err)
+	}
+
+	for _, ll := range l2 {
+		defer ll.Close()
+	}
+
+	if len(l2) != 1 {
+		t.Errorf("expected len(l2) == 1, but got %d", len(l2))
+	}
+
+	switch l2[0].(type) {
+	case *net.TCPListener:
+	// ok
+	default:
+		t.Errorf("expected type=*net.TCPListener, got %T", l2[0])
+	}
+}

From 24d05b3abbb07a55b5a8550b4511863e6d039ae0 Mon Sep 17 00:00:00 2001
From: John Pettigrew <john.pettigrew404@gmail.com>
Date: Thu, 14 Jul 2016 15:42:52 -0500
Subject: [PATCH 0525/1304] Add hidden 'image fetch' option.

Fetch deals with images so it should also be under the image command.

Fixes #2701
---
 rkt/fetch.go | 8 +++++++-
 rkt/help.go  | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/rkt/fetch.go b/rkt/fetch.go
index ad50f9f510..260b7d5236 100644
--- a/rkt/fetch.go
+++ b/rkt/fetch.go
@@ -44,7 +44,6 @@ again.`,
 )
 
 func init() {
-	cmdRkt.AddCommand(cmdFetch)
 	// Disable interspersed flags to stop parsing after the first non flag
 	// argument. All the subsequent parsing will be done by parseApps.
 	// This is needed to correctly handle multiple IMAGE --signature=sigfile options
@@ -54,6 +53,13 @@ func init() {
 	cmdFetch.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
 	cmdFetch.Flags().BoolVar(&flagNoStore, "no-store", false, "fetch images ignoring the local store")
 	cmdFetch.Flags().BoolVar(&flagFullHash, "full", false, "print the full image hash after fetching")
+
+	cmdRkt.AddCommand(cmdFetch)
+
+	// Hide image fetch option in command list
+	cmdImageFetch := *cmdFetch
+	cmdImageFetch.Hidden = true
+	cmdImage.AddCommand(&cmdImageFetch)
 }
 
 func runFetch(cmd *cobra.Command, args []string) (exit int) {
diff --git a/rkt/help.go b/rkt/help.go
index 872ffdd508..7a291e4e80 100644
--- a/rkt/help.go
+++ b/rkt/help.go
@@ -129,8 +129,10 @@ func rktFlagUsages(flagSet *pflag.FlagSet) string {
 func getSubCommands(cmd *cobra.Command) []*cobra.Command {
 	var subCommands []*cobra.Command
 	for _, subCmd := range cmd.Commands() {
-		subCommands = append(subCommands, subCmd)
-		subCommands = append(subCommands, getSubCommands(subCmd)...)
+		if !subCmd.Hidden {
+			subCommands = append(subCommands, subCmd)
+			subCommands = append(subCommands, getSubCommands(subCmd)...)
+		}
 	}
 	return subCommands
 }

From 7285f5da2a11650c351ef2ee49dad2a6c8033889 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Tue, 12 Jul 2016 12:34:52 -0700
Subject: [PATCH 0526/1304] Doc: Update rktnetes docs.

---
 Documentation/using-rkt-with-kubernetes.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Documentation/using-rkt-with-kubernetes.md b/Documentation/using-rkt-with-kubernetes.md
index 6b8124aeba..904e9ea446 100644
--- a/Documentation/using-rkt-with-kubernetes.md
+++ b/Documentation/using-rkt-with-kubernetes.md
@@ -10,17 +10,15 @@ This allows a Kubernetes cluster to leverage some of rkt's security features and
 The container runtime is configured at the _kubelet_ level.
 The kubelet is the agent that runs on each machine to manage containers.
 The kubelet provides several flags to use rkt as the container runtime:
-- `--container-runtime=rkt` chooses rkt as the runtime.
-- `--rkt-path` sets the rkt binary path.
-- `--rkt-stage1-image` sets the stage1 image path.
 
-The [getting started with rkt guide][] in the upstream Kubernetes documentation provides more detailed information about how to launch a kubernetes cluster with rkt, how to debug it, and more.
+- `--container-runtime=rkt` Sets the node's container runtime to rkt.
+- `--rkt-api-endpoint=HOST:PORT` Sets the endpoint of the rkt API service. Default to `localhost:15441`.
+- `--rkt-path=PATH_TO_RKT_BINARY` Sets the path of the rkt binary. If empty, it will search for rkt in `$PATH`.
+- `--rkt-stage1-image=STAGE1_NAME` Sets the name of the stage1 image, e.g. `coreos.com/rkt/stage1-coreos`. If not set, the default stage1 image (`coreos.com/rkt/stage1-coreos`) is used.
 
-[getting started with rkt guide]: http://kubernetes.io/docs/getting-started-guides/rkt/
+Check the [rktnetes getting started guide](http://kubernetes.io/docs/getting-started-guides/rkt/) for information about setting up and using a rktnetes cluster.
 
 ### Current Status
 
-Integration of rkt as a container runtime for Kubernetes is under active development.
-For the latest information on the progress of the integration, check out [this Google doc][rkt-k8s-checklist] which tracks the detailed status of implemented functionality.
-
-[rkt-k8s-checklist]: https://docs.google.com/document/d/1dYxInIUDTm4HEArQ9Hom_1NhYw22WrXWdglnaLjtQsI/edit
+Integration of rkt as a container runtime was officially [announced in the Kubernetes 1.3 release](http://blog.kubernetes.io/2016/07/rktnetes-brings-rkt-container-engine-to-Kubernetes.html).
+Known issues and tips for using rkt with Kubernetes can be found in the [rktnetes notes](http://kubernetes.io/docs/getting-started-guides/rkt/notes/).

From f2615896882ad085b8c96c0c9827ba2717e1da8b Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 8 Jul 2016 14:08:32 +0200
Subject: [PATCH 0527/1304] stage1: prepare-app: don't mount /sys if path
 already used

When users mount /sys or a sub-directory of /sys as a volume,
prepare-app should not mount /sys: that would mask the volume provided
by users. This patch detects if there is a volume mounted in /sys or a
subdirectory and skips the mount.

Fixes https://github.com/coreos/rkt/issues/2874
---
 stage1/init/common/path.go       |  2 +-
 stage1/prepare-app/prepare-app.c | 43 +++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/stage1/init/common/path.go b/stage1/init/common/path.go
index e2a9b733e3..ba9605bb8e 100644
--- a/stage1/init/common/path.go
+++ b/stage1/init/common/path.go
@@ -65,7 +65,7 @@ func ServiceWantPath(root string, appName types.ACName) string {
 func InstantiatedPrepareAppUnitName(appName types.ACName) string {
 	// Naming respecting escaping rules, see systemd.unit(5) and systemd-escape(1)
 	escapedRoot := unit.UnitNamePathEscape(common.RelAppRootfsPath(appName))
-	return "prepare-app@" + escapedRoot + ".service"
+	return "prepare-app@-" + escapedRoot + ".service"
 }
 
 // SocketUnitName returns a systemd socket unit name for the given app name.
diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index a5a89bd60a..7150b4eace 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#define _GNU_SOURCE
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
@@ -138,6 +139,45 @@ static void mount_at(const char *root, const mount_point *mnt)
 		 "Mounting \"%s\" on \"%s\" failed", mnt->source, to);
 }
 
+static int mount_sys_required(const char *root)
+{
+	FILE *f;
+	char *line = NULL;
+	size_t len = 0;
+	ssize_t read;
+
+	pexit_if((f = fopen("/proc/self/mountinfo", "re")) == NULL,
+		 "Unable to open /proc/self/mountinfo");
+
+	while ((read = getline(&line, &len, f)) != -1) {
+		char *sys_dir;
+		char *sys_subdir;
+		char *mountpoint;
+
+		exit_if(asprintf(&sys_dir, "%s/sys", root) == -1,
+			"Calling asprintf failed");
+		exit_if(asprintf(&sys_subdir, "%s/sys/", root) == -1,
+			"Calling asprintf failed");
+		sscanf(line, "%*s %*s %*s %*s %ms", &mountpoint);
+
+		// The mount point is exactly $ROOTFS/sys
+		if (strcmp(sys_dir, mountpoint) == 0) {
+			free(mountpoint);
+			return 0;
+		}
+		// The mount point is a subdirectory of $ROOTFS/sys
+		if (strncmp(sys_subdir, mountpoint, strlen(sys_subdir)) == 0) {
+			free(mountpoint);
+			return 0;
+		}
+
+		free(mountpoint);
+	}
+
+	pexit_if(fclose(f) != 0, "Unable to close /proc/self/mountinfo");
+
+	return 1;
+}
 static void mount_sys(const char *root)
 {
 	struct statfs fs;
@@ -327,7 +367,8 @@ int main(int argc, char *argv[])
 	}
 
 	/* Bind mount /sys: handled differently, depending on cgroups */
-	mount_sys(root);
+	if (mount_sys_required(root))
+		mount_sys(root);
 
 	/* Bind mount files, if the source exists */
 	for (i = 0; i < nelems(files_mount_table); i++) {

From 7b243707ca422ec13677d306f34b10a4b66ff4f4 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 14 Jul 2016 16:45:19 +0200
Subject: [PATCH 0528/1304] tests: new test TestVolumeSysfs for mounts in /sys

---
 tests/rkt_volume_test.go | 57 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index dc6dc55734..dc7ac2504b 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -288,3 +288,60 @@ func TestDockerVolumeSemanticsPodManifest(t *testing.T) {
 		runRktAndCheckOutput(t, cmd, expected, false)
 	}
 }
+
+var volSysfsTests = []struct {
+	name          string
+	imgPatch      string
+	cmdParams     string
+	expected      string
+	expectedError bool
+}{
+	{
+		"Without any mount",
+		"--name=base",
+		"",
+		"/sys/class: mode: drwxr-xr-x",
+		false,
+	},
+	{
+		"With /sys as an empty volume",
+		"--mounts=sysdir,path=/sys,readOnly=false",
+		"",
+		"stat /sys/class: no such file or directory",
+		true,
+	},
+	{
+		"With /sys bind-mounted from the host",
+		"--mounts=sysdir,path=/sys,readOnly=false",
+		"--volume=sysdir,kind=host,source=/sys,readOnly=false",
+		"/sys/class: mode: drwxr-xr-x",
+		false,
+	},
+	{
+		"With /sys/class bind-mounted from the host",
+		"--mounts=sysdir,path=/sys/class,readOnly=false",
+		"--volume=sysdir,kind=host,source=/dev/null,readOnly=false",
+		"/sys/class: mode: Dcrw-rw-rw-",
+		false,
+	},
+}
+
+// TestVolumeSysfs checks that sysfs is available for the apps, but only if
+// the app does not have mount points in /sys or a subdirectory.
+// See: https://github.com/coreos/rkt/issues/2874
+func TestVolumeSysfs(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for i, tt := range volSysfsTests {
+		t.Logf("Running test #%v: %s", i, tt.name)
+
+		img := patchTestACI("rkt-sysfs.aci", tt.imgPatch)
+		defer os.Remove(img)
+		cmd := fmt.Sprintf(`%s --debug --insecure-options=image --set-env=FILE=/sys/class run %s %s --exec /inspect -- --stat-file`,
+			ctx.Cmd(), tt.cmdParams, img)
+
+		runRktAndCheckOutput(t, cmd, tt.expected, tt.expectedError)
+	}
+
+}

From 41e1eb99b99db546da06bcd22b5168bab4c1fbf5 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 12 Jul 2016 10:50:06 +0200
Subject: [PATCH 0529/1304] protobuf: fix protoc-gen-go build with vendoring

Fixes #2912
---
 rkt/rkt.mk          | 4 ++--
 scripts/genproto.sh | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rkt/rkt.mk b/rkt/rkt.mk
index 6e9dd73e61..3ac0cd2275 100644
--- a/rkt/rkt.mk
+++ b/rkt/rkt.mk
@@ -43,8 +43,8 @@ bash-completion: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 		grep -vE '_test.go|main.go|_gen.go' | \
 		$(GO_ENV) xargs "$(GO)" run $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/bash_completion_gen.go
 
-protobuf:
-	scripts/genproto.sh
+protobuf: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
+	GOPATH=$(GOPATH_TO_CREATE) scripts/genproto.sh
 
 $(call undefine-namespaces,LOCAL)
 # RKT_STAMP deliberately not cleared
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index 35416a58a5..2999babea4 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -16,9 +16,14 @@ if ! [[ $(protoc --version) =~ "3.0.0" ]]; then
 fi
 
 export PATH=.:${PATH}
+cd $GOPATH/src/github.com/coreos/rkt
 
 echo "building protoc-gen-go"
-go build vendor/github.com/golang/protobuf/protoc-gen-go
+pushd vendor/github.com/golang/protobuf/protoc-gen-go
+go build
+mv protoc-gen-go $(dirs -l +1)
+popd
+
 trap 'rm -f "protoc-gen-go"' EXIT
 
 echo "generating code"

From 3a21986f9e61ec4a21e4b606502b226f16ff63eb Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thipp@suse.de>
Date: Wed, 13 Jul 2016 15:37:11 +0200
Subject: [PATCH 0530/1304] build: fix GOARCH for x86 machines

On x86 machines, GOARCH should be '386', not 'i386'.

Signed-off-by: Thomas Hipp <thipp@suse.de>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7c2321b4f1..2334a50a47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AS_CASE([${host_cpu}],
         [aarch64],    [RKT_ACI_ARCH=aarch64; GOARCH=arm64;],
         [armv6l],     [RKT_ACI_ARCH=armv6l;  GOARCH=arm; GOARM=6;],
         [armv7l],     [RKT_ACI_ARCH=armv7l;  GOARCH=arm; GOARM=7;],
-        [i?86 | x86], [RKT_ACI_ARCH=i386;    GOARCH=i386;],
+        [i?86 | x86], [RKT_ACI_ARCH=i386;    GOARCH=386;],
         [x86_64],     [RKT_ACI_ARCH=amd64;   GOARCH=amd64;],
         [AC_MSG_ERROR([*** unsupported host arch specified: ${host_cpu}])])
 

From b1327146122cbf6201e95f7b6c5a049eee88d29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 18 Jul 2016 11:52:10 +0200
Subject: [PATCH 0531/1304] functional tests: disable TestVolumeSysfs on kvm

This test fails because the mounts are done on the host so they can't
be detected inside the VM.

Since mounting `/sys` doesn't really make sense on a kvm container,
let's disable this test.
---
 tests/rkt_volume_nspawn_test.go | 64 ++++++++++++++++++++++++++++++++-
 tests/rkt_volume_test.go        | 57 -----------------------------
 2 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/tests/rkt_volume_nspawn_test.go b/tests/rkt_volume_nspawn_test.go
index bddf30554b..fba011a743 100644
--- a/tests/rkt_volume_nspawn_test.go
+++ b/tests/rkt_volume_nspawn_test.go
@@ -16,8 +16,70 @@
 
 package main
 
-import "testing"
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
 
 func TestVolumes(t *testing.T) {
 	NewVolumesTest().Execute(t)
 }
+
+var volSysfsTests = []struct {
+	name          string
+	imgPatch      string
+	cmdParams     string
+	expected      string
+	expectedError bool
+}{
+	{
+		"Without any mount",
+		"--name=base",
+		"",
+		"/sys/class: mode: drwxr-xr-x",
+		false,
+	},
+	{
+		"With /sys as an empty volume",
+		"--mounts=sysdir,path=/sys,readOnly=false",
+		"",
+		"stat /sys/class: no such file or directory",
+		true,
+	},
+	{
+		"With /sys bind-mounted from the host",
+		"--mounts=sysdir,path=/sys,readOnly=false",
+		"--volume=sysdir,kind=host,source=/sys,readOnly=false",
+		"/sys/class: mode: drwxr-xr-x",
+		false,
+	},
+	{
+		"With /sys/class bind-mounted from the host",
+		"--mounts=sysdir,path=/sys/class,readOnly=false",
+		"--volume=sysdir,kind=host,source=/dev/null,readOnly=false",
+		"/sys/class: mode: Dcrw-rw-rw-",
+		false,
+	},
+}
+
+// TestVolumeSysfs checks that sysfs is available for the apps, but only if
+// the app does not have mount points in /sys or a subdirectory.
+// See: https://github.com/coreos/rkt/issues/2874
+func TestVolumeSysfs(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for i, tt := range volSysfsTests {
+		t.Logf("Running test #%v: %s", i, tt.name)
+
+		img := patchTestACI("rkt-sysfs.aci", tt.imgPatch)
+		defer os.Remove(img)
+		cmd := fmt.Sprintf(`%s --debug --insecure-options=image --set-env=FILE=/sys/class run %s %s --exec /inspect -- --stat-file`,
+			ctx.Cmd(), tt.cmdParams, img)
+
+		runRktAndCheckOutput(t, cmd, tt.expected, tt.expectedError)
+	}
+}
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index dc7ac2504b..dc6dc55734 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -288,60 +288,3 @@ func TestDockerVolumeSemanticsPodManifest(t *testing.T) {
 		runRktAndCheckOutput(t, cmd, expected, false)
 	}
 }
-
-var volSysfsTests = []struct {
-	name          string
-	imgPatch      string
-	cmdParams     string
-	expected      string
-	expectedError bool
-}{
-	{
-		"Without any mount",
-		"--name=base",
-		"",
-		"/sys/class: mode: drwxr-xr-x",
-		false,
-	},
-	{
-		"With /sys as an empty volume",
-		"--mounts=sysdir,path=/sys,readOnly=false",
-		"",
-		"stat /sys/class: no such file or directory",
-		true,
-	},
-	{
-		"With /sys bind-mounted from the host",
-		"--mounts=sysdir,path=/sys,readOnly=false",
-		"--volume=sysdir,kind=host,source=/sys,readOnly=false",
-		"/sys/class: mode: drwxr-xr-x",
-		false,
-	},
-	{
-		"With /sys/class bind-mounted from the host",
-		"--mounts=sysdir,path=/sys/class,readOnly=false",
-		"--volume=sysdir,kind=host,source=/dev/null,readOnly=false",
-		"/sys/class: mode: Dcrw-rw-rw-",
-		false,
-	},
-}
-
-// TestVolumeSysfs checks that sysfs is available for the apps, but only if
-// the app does not have mount points in /sys or a subdirectory.
-// See: https://github.com/coreos/rkt/issues/2874
-func TestVolumeSysfs(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	for i, tt := range volSysfsTests {
-		t.Logf("Running test #%v: %s", i, tt.name)
-
-		img := patchTestACI("rkt-sysfs.aci", tt.imgPatch)
-		defer os.Remove(img)
-		cmd := fmt.Sprintf(`%s --debug --insecure-options=image --set-env=FILE=/sys/class run %s %s --exec /inspect -- --stat-file`,
-			ctx.Cmd(), tt.cmdParams, img)
-
-		runRktAndCheckOutput(t, cmd, tt.expected, tt.expectedError)
-	}
-
-}

From 3ea9e4562470e3ae452accc0be4204f60e055fc3 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Fri, 15 Jul 2016 23:57:25 +0200
Subject: [PATCH 0532/1304] build: Fix string equality function

Recently the string comparison failed, because we were putting it
between single quotes, but forgot to actually escape single quotes in
the string before passing it to shell.
---
 makelib/misc.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/makelib/misc.mk b/makelib/misc.mk
index 0b95c23364..da8f51015e 100644
--- a/makelib/misc.mk
+++ b/makelib/misc.mk
@@ -187,12 +187,20 @@ $(strip \
 	$(call undefine-namespaces,_MISC_GFD))
 endef
 
+# Escapes all single quotes in $1 (by replacing all ' with '"'"')
+define sq_escape
+$(subst ','"'"',$1)
+endef
+#'
+
 # Returns 1 if both parameters are equal, otherwise returns empty
 # string.
 # Example: is_a_equal_to_b := $(if $(call equal,a,b),yes,no)
 define equal
 $(strip \
-        $(eval _MISC_EQ_TMP_ := $(shell expr '$1' = '$2')) \
+        $(eval _MISC_EQ_OP1_ := $(call sq_escape,$1)) \
+        $(eval _MISC_EQ_OP2_ := $(call sq_escape,$2)) \
+        $(eval _MISC_EQ_TMP_ := $(shell expr '$(_MISC_EQ_OP1_)' = '$(_MISC_EQ_OP2_)')) \
         $(filter $(_MISC_EQ_TMP_),1) \
         $(call undefine-namespaces,_MISC_EQ))
 endef

From 071ed04bfe703291d4a9718d4ee98141e7a9fe50 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Sat, 16 Jul 2016 00:11:44 +0200
Subject: [PATCH 0533/1304] build: Avoid useless rebuilds of network plugins

The dependencies on directories should be always order-only (which
means, after a pipe character). This change just slipped through my
review.
---
 stage1/net-plugins/net-plugins.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/net-plugins/net-plugins.mk b/stage1/net-plugins/net-plugins.mk
index 513bbc7d8c..94b09417dd 100644
--- a/stage1/net-plugins/net-plugins.mk
+++ b/stage1/net-plugins/net-plugins.mk
@@ -41,7 +41,7 @@ BGB_BINARY := $$(NPM_PLUGIN)
 BGB_PKG_IN_REPO := vendor/github.com/containernetworking/cni/plugins/$1
 include makelib/build_go_bin.mk
 
-$$(NPM_PLUGIN): $(TARGET_TOOLSDIR)
+$$(NPM_PLUGIN): | $(TARGET_TOOLSDIR)
 
 $$(call generate-stamp-rule,$$(NPM_STAMP))
 

From 1472a247f6442c56ae1f2d2a050a8987eb796777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20K=C3=BChl?= <chris@kinvolk.io>
Date: Wed, 30 Mar 2016 14:27:01 +0200
Subject: [PATCH 0534/1304] rkt: add command to export a pod to an aci

This adds a new `export` command to rkt which generates an aci from a
pod; saving any changes made to the pod.

Usage is `rkt export POD_UUID my.aci`

This is currently restricted to only working with exited pods with a
single app and that have been run with the --no-overlay option.

Fixes #1197
---
 Documentation/commands.md           |   1 +
 Documentation/subcommands/export.md |  17 ++++
 rkt/export.go                       | 149 ++++++++++++++++++++++++++++
 tests/rkt_export_test.go            |  91 +++++++++++++++++
 4 files changed, 258 insertions(+)
 create mode 100644 Documentation/subcommands/export.md
 create mode 100644 rkt/export.go
 create mode 100644 tests/rkt_export_test.go

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 2dccab7551..45e63d6841 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -39,6 +39,7 @@ rkt provides subcommands to list, get status, and clean its pods.
 
 * [list](subcommands/list.md)
 * [status](subcommands/status.md)
+* [export](subcommands/export.md)
 * [gc](subcommands/gc.md)
 * [rm](subcommands/rm.md)
 * [cat-manifest](subcommands/cat-manifest.md)
diff --git a/Documentation/subcommands/export.md b/Documentation/subcommands/export.md
new file mode 100644
index 0000000000..96e127839c
--- /dev/null
+++ b/Documentation/subcommands/export.md
@@ -0,0 +1,17 @@
+# rkt export
+
+Exports an exited, single-app pod to an App Container Image (.aci)
+
+```
+$ rkt export UUID .aci
+```
+
+## Options
+
+| Flag | Default | Options | Description |
+| --- | --- | --- | --- |
+| `--overwrite` |  `false` | `true` or `false` | Overwrite the output aci if it exists  |
+
+## Global options
+
+See the table with [global options in general commands documentation](../commands.md#global-options).
diff --git a/rkt/export.go b/rkt/export.go
new file mode 100644
index 0000000000..08defa1ebd
--- /dev/null
+++ b/rkt/export.go
@@ -0,0 +1,149 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
+	"github.com/appc/spec/aci"
+	"github.com/appc/spec/schema"
+	"github.com/coreos/rkt/common"
+	"github.com/hashicorp/errwrap"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdExport = &cobra.Command{
+		Use:   "export UUID OUTPUT_ACI_FILE",
+		Short: "Export an exited pod to an ACI file",
+		Long: `UUID should be the uuid of an exited pod.
+
+Note that currently only pods with a single app and started with the --no-overlay option are supported.`,
+		Run: runWrapper(runExport),
+	}
+)
+
+func init() {
+	cmdRkt.AddCommand(cmdExport)
+	cmdExport.Flags().BoolVar(&flagOverwriteACI, "overwrite", false, "overwrite output ACI")
+}
+
+func runExport(cmd *cobra.Command, args []string) (exit int) {
+	if len(args) != 2 {
+		cmd.Usage()
+		return 1
+	}
+
+	aci := args[1]
+	ext := filepath.Ext(aci)
+	if ext != schema.ACIExtension {
+		stderr.Printf("extension must be %s (given %s)", schema.ACIExtension, aci)
+		return 1
+	}
+
+	p, err := getPodFromUUIDString(args[0])
+	if err != nil {
+		stderr.PrintE("problem retrieving pod", err)
+		return 1
+	}
+	defer p.Close()
+
+	if !p.isExited {
+		stderr.Print("pod is not exited. Only exited pods are supported.")
+		return 1
+	}
+
+	if p.usesOverlay() {
+		stderr.Print("pod uses overlayfs. Only pods using the --no-overlay flag are supported.")
+		return 1
+	}
+
+	var apps schema.AppList
+	if apps, err = p.getApps(); err != nil {
+		stderr.PrintE("problem getting pod's app list", err)
+		return 1
+	}
+
+	if len(apps) != 1 {
+		stderr.Print("pod has more than one app. Only pods with one app are supported.")
+		return 1
+	}
+
+	root := common.AppPath(p.path(), apps[0].Name)
+	if err = buildAci(root, aci); err != nil {
+		stderr.PrintE("error building aci", err)
+		return 1
+	}
+
+	return 0
+}
+
+func buildAci(root, target string) (e error) {
+	mode := os.O_CREATE | os.O_WRONLY
+	if flagOverwriteACI {
+		mode |= os.O_TRUNC
+	} else {
+		mode |= os.O_EXCL
+	}
+	aciFile, err := os.OpenFile(target, mode, 0644)
+	if err != nil {
+		if os.IsExist(err) {
+			return errors.New("target file exists (try --overwrite)")
+		} else {
+			return errwrap.Wrap(fmt.Errorf("unable to open target %s", target), err)
+		}
+	}
+
+	gw := gzip.NewWriter(aciFile)
+	tr := tar.NewWriter(gw)
+
+	defer func() {
+		tr.Close()
+		gw.Close()
+		aciFile.Close()
+		// e is implicitly assigned by the return statement. As defer runs
+		// after return, but before actually returning, this works.
+		if e != nil {
+			os.Remove(target)
+		}
+	}()
+
+	mpath := filepath.Join(root, aci.ManifestFile)
+	b, err := ioutil.ReadFile(mpath)
+	if err != nil {
+		return errwrap.Wrap(errors.New("unable to read Image Manifest"), err)
+	}
+	var im schema.ImageManifest
+	if err := im.UnmarshalJSON(b); err != nil {
+		return errwrap.Wrap(errors.New("unable to load Image Manifest"), err)
+	}
+	iw := aci.NewImageWriter(im, tr)
+
+	if err := filepath.Walk(root, aci.BuildWalker(root, iw, nil)); err != nil {
+		return errwrap.Wrap(errors.New("error walking rootfs"), err)
+	}
+
+	if err = iw.Close(); err != nil {
+		return errwrap.Wrap(fmt.Errorf("unable to close image %s", target), err)
+	}
+
+	return
+}
diff --git a/tests/rkt_export_test.go b/tests/rkt_export_test.go
new file mode 100644
index 0000000000..d7f308baa6
--- /dev/null
+++ b/tests/rkt_export_test.go
@@ -0,0 +1,91 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestExport(t *testing.T) {
+	const (
+		testAci     = "test.aci"
+		testFile    = "test.txt"
+		testContent = "ThisIsATest"
+		runInspect  = "%s %s %s %s --exec=/inspect -- %s"
+	)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	tests := []struct {
+		runArgs        string
+		writeArgs      string
+		readArgs       string
+		expectedStatus int
+		expectedResult string
+	}{
+		{
+			"--no-overlay --insecure-options=image",
+			"--write-file --file-name=" + testFile + " --content=" + testContent,
+			"--read-file --file-name=" + testFile,
+			0,
+			testContent,
+		},
+	}
+	for _, tt := range tests {
+		tmpDir := createTempDirOrPanic("rkt-TestExport-tmp-")
+		defer os.RemoveAll(tmpDir)
+
+		tmpTestAci := filepath.Join(tmpDir, testAci)
+
+		// Prepare the image with modifications
+		prepareCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "prepare", tt.runArgs, getInspectImagePath(), tt.writeArgs)
+		t.Logf("Preparing 'inspect --write-file'")
+		uuid := runRktAndGetUUID(t, prepareCmd)
+
+		runCmd := fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), uuid)
+		t.Logf("Running 'inspect --write-file'")
+		child := spawnOrFail(t, runCmd)
+		waitOrFail(t, child, 0)
+
+		// Export the image
+		exportCmd := fmt.Sprintf("%s export %s %s", ctx.Cmd(), uuid, tmpTestAci)
+		t.Logf("Running 'export'")
+		child = spawnOrFail(t, exportCmd)
+		waitOrFail(t, child, tt.expectedStatus)
+
+		if tt.expectedStatus == 0 {
+			// Run the newly created ACI and check the output
+			readCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "run", tt.runArgs, tmpTestAci, tt.readArgs)
+			t.Logf("Running 'inspect --read-file'")
+			child := spawnOrFail(t, readCmd)
+			if tt.expectedResult != "" {
+				if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
+					t.Fatalf("expected %q but not found: %v\n%s", tt.expectedResult, err, out)
+				}
+			}
+			waitOrFail(t, child, tt.expectedStatus)
+		}
+
+		// run garbage collector on pods and images
+		runGC(t, ctx)
+		runImageGC(t, ctx)
+	}
+}

From 68c76790607dce4cafc406e761fddb330db6aa10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20K=C3=BChl?= <chris@kinvolk.io>
Date: Fri, 8 Apr 2016 17:15:43 +0200
Subject: [PATCH 0535/1304] rkt: enable exporting overlayfs pods

---
 common/common.go          |   9 +++
 common/overlay/overlay.go |  47 ++++++++++++++++
 rkt/export.go             |  82 ++++++++++++++++++++++++----
 rkt/pods.go               |  33 +++++++----
 stage0/run.go             | 112 +++++++++++++++++++-------------------
 5 files changed, 205 insertions(+), 78 deletions(-)
 create mode 100644 common/overlay/overlay.go

diff --git a/common/common.go b/common/common.go
index e1ab87f871..e2f296ba54 100644
--- a/common/common.go
+++ b/common/common.go
@@ -55,6 +55,15 @@ const (
 
 	DefaultLocalConfigDir  = "/etc/rkt"
 	DefaultSystemConfigDir = "/usr/lib/rkt"
+
+	// Default perm bits for the regular files
+	// within the stage1 directory. (e.g. image manifest,
+	// pod manifest, stage1ID, etc).
+	DefaultRegularFilePerm = os.FileMode(0640)
+
+	// Default perm bits for the regular directories
+	// within the stage1 directory.
+	DefaultRegularDirPerm = os.FileMode(0750)
 )
 
 const (
diff --git a/common/overlay/overlay.go b/common/overlay/overlay.go
new file mode 100644
index 0000000000..353afb08ca
--- /dev/null
+++ b/common/overlay/overlay.go
@@ -0,0 +1,47 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package overlay
+
+import (
+	"fmt"
+	"syscall"
+
+	"github.com/coreos/rkt/pkg/label"
+	"github.com/hashicorp/errwrap"
+)
+
+// MountCfg containes the needed data to construct the overlay mount syscall. The Lower and Upper fields
+// are paths to the filesystems to be merged. The Work field should be an empty directory. Dest is where
+// the mount will be located. Lbl is an SELinux label.
+type MountCfg struct {
+	Lower,
+	Upper,
+	Work,
+	Dest,
+	Lbl string
+}
+
+// Mount mounts the upper and lower directories to the destination directory. The MountCfg struct supplies
+// information required to build the mount system call. The path to the mounted files system is returned
+// upon success.
+func Mount(cfg *MountCfg) (string, error) {
+	opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", cfg.Lower, cfg.Upper, cfg.Work)
+	opts = label.FormatMountLabel(opts, cfg.Lbl)
+	if err := syscall.Mount("overlay", cfg.Dest, "overlay", 0, opts); err != nil {
+		return "", errwrap.Wrap(fmt.Errorf("error mounting overlay with options '%s' and dest '%s'", opts, cfg.Dest), err)
+	}
+
+	return cfg.Dest, nil
+}
diff --git a/rkt/export.go b/rkt/export.go
index 08defa1ebd..8993a455dd 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -22,11 +22,15 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"syscall"
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema"
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/common/overlay"
 	"github.com/hashicorp/errwrap"
+
+	"github.com/coreos/rkt/store"
 	"github.com/spf13/cobra"
 )
 
@@ -36,7 +40,7 @@ var (
 		Short: "Export an exited pod to an ACI file",
 		Long: `UUID should be the uuid of an exited pod.
 
-Note that currently only pods with a single app and started with the --no-overlay option are supported.`,
+Note that currently only pods with a single app can be exported.`,
 		Run: runWrapper(runExport),
 	}
 )
@@ -67,27 +71,46 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 	defer p.Close()
 
 	if !p.isExited {
-		stderr.Print("pod is not exited. Only exited pods are supported.")
+		stderr.Print("pod is not exited. Only exited pods can be exported")
 		return 1
 	}
 
-	if p.usesOverlay() {
-		stderr.Print("pod uses overlayfs. Only pods using the --no-overlay flag are supported.")
+	apps, err := p.getApps()
+	if err != nil {
+		stderr.PrintE("problem getting the pod's app list", err)
 		return 1
 	}
 
-	var apps schema.AppList
-	if apps, err = p.getApps(); err != nil {
-		stderr.PrintE("problem getting pod's app list", err)
+	if len(apps) != 1 {
+		stderr.Printf("pod has %d apps. Only pods with one app can be exported", len(apps))
 		return 1
 	}
+	app := apps[0]
 
-	if len(apps) != 1 {
-		stderr.Print("pod has more than one app. Only pods with one app are supported.")
-		return 1
+	if p.usesOverlay() {
+		tmpMntDir := path.Join(getDataDir(), "tmp", fmt.Sprintf("rkt-export-%s", p.uuid))
+		if err := os.MkdirAll(tmpMntDir, common.DefaultRegularDirPerm); err != nil {
+			stderr.PrintE("unable to create temp directory", err)
+			return 1
+		}
+
+		mntDir, err := mountOverlay(p, &app, tmpMntDir)
+		if err != nil {
+			stderr.PrintE(fmt.Sprintf("couldn't mount directory at %s", tmpMntDir), err)
+		}
+		defer func() {
+			if err := syscall.Unmount(mntDir, 0); err != nil {
+				stderr.PrintE(fmt.Sprintf("error unmounting directory %s", mntDir), err)
+				exit = 1
+			}
+			if err := os.RemoveAll(tmpMntDir); err != nil {
+				stderr.PrintE("problem removing temp directory", err)
+				exit = 1
+			}
+		}()
 	}
 
-	root := common.AppPath(p.path(), apps[0].Name)
+	root := common.AppPath(p.path(), app.Name)
 	if err = buildAci(root, aci); err != nil {
 		stderr.PrintE("error building aci", err)
 		return 1
@@ -96,6 +119,43 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 	return 0
 }
 
+// mountOverlay mounts the app from the overlay-rendered pod to the destination directory.
+func mountOverlay(pod *pod, app *schema.RuntimeApp, dest string) (string, error) {
+	if _, err := os.Stat(dest); err != nil {
+		return "", err
+	}
+
+	s, err := store.NewStore(getDataDir())
+	if err != nil {
+		return "", errwrap.Wrap(errors.New("cannot open store"), err)
+	}
+
+	treeStoreID, err := pod.getAppTreeStoreID(app.Name)
+	if err != nil {
+		return "", err
+	}
+	lower := s.GetTreeStoreRootFS(treeStoreID)
+	imgDir := path.Join(path.Join(pod.path(), "overlay"), treeStoreID)
+	if _, err := os.Stat(imgDir); err != nil {
+		return "", err
+	}
+	upper := path.Join(imgDir, "upper", app.Name.String())
+	if _, err := os.Stat(upper); err != nil {
+		return "", err
+	}
+	work := path.Join(imgDir, "work", app.Name.String())
+	if _, err := os.Stat(work); err != nil {
+		return "", err
+	}
+
+	mntDir, err := overlay.Mount(&overlay.MountCfg{lower, upper, work, dest, ""})
+	if err != nil {
+		return "", errwrap.Wrap(errors.New("problem mounting overlayfs directory"), err)
+	}
+
+	return mntDir, nil
+}
+
 func buildAci(root, target string) (e error) {
 	mode := os.O_CREATE | os.O_WRONLY
 	if flagOverwriteACI {
diff --git a/rkt/pods.go b/rkt/pods.go
index 723f622ad7..1a00f2f907 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -960,8 +960,25 @@ func (p *pod) getStage1TreeStoreID() (string, error) {
 	return string(s1IDb), nil
 }
 
-// getAppTreeStoreIDs returns the treeStoreIDs of the apps images used in
-// this pod
+// getAppTreeStoreID returns the treeStoreID of the provided app.
+func (p *pod) getAppTreeStoreID(app types.ACName) (string, error) {
+	path, err := filepath.Rel("/", common.AppTreeStoreIDPath("", app))
+	if err != nil {
+		return "", err
+	}
+	treeStoreID, err := p.readFile(path)
+	if err != nil {
+		// When not using overlayfs, apps don't have a treeStoreID file. In
+		// other cases we've got a problem.
+		if !(os.IsNotExist(err) && !p.usesOverlay()) {
+			return "", errwrap.Wrap(fmt.Errorf("no treeStoreID found for app %s", app), err)
+		}
+	}
+	return string(treeStoreID), nil
+}
+
+// getAppsTreeStoreIDs returns the treeStoreIDs of the apps images used in
+// this pod.
 func (p *pod) getAppsTreeStoreIDs() ([]string, error) {
 	var treeStoreIDs []string
 	apps, err := p.getApps()
@@ -969,19 +986,13 @@ func (p *pod) getAppsTreeStoreIDs() ([]string, error) {
 		return nil, err
 	}
 	for _, a := range apps {
-		path, err := filepath.Rel("/", common.AppTreeStoreIDPath("", a.Name))
+		id, err := p.getAppTreeStoreID(a.Name)
 		if err != nil {
 			return nil, err
 		}
-		treeStoreID, err := p.readFile(path)
-		if err != nil {
-			// When not using overlayfs, apps don't have a treeStoreID file
-			if os.IsNotExist(err) {
-				continue
-			}
-			return nil, err
+		if id != "" {
+			treeStoreIDs = append(treeStoreIDs, id)
 		}
-		treeStoreIDs = append(treeStoreIDs, string(treeStoreID))
 	}
 	return treeStoreIDs, nil
 }
diff --git a/stage0/run.go b/stage0/run.go
index ca5528b30d..7e8cec62d3 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -42,6 +42,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
+	"github.com/coreos/rkt/common/overlay"
 	"github.com/coreos/rkt/pkg/aci"
 	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/pkg/label"
@@ -53,17 +54,6 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
-const (
-	// Default perm bits for the regular files
-	// within the stage1 directory. (e.g. image manifest,
-	// pod manifest, stage1ID, etc).
-	defaultRegularFilePerm = os.FileMode(0640)
-
-	// Default perm bits for the regular directories
-	// within the stage1 directory.
-	defaultRegularDirPerm = os.FileMode(0750)
-)
-
 var debugEnabled bool
 
 // configuration parameters required by Prepare
@@ -196,6 +186,7 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		if err != nil {
 			return errwrap.Wrap(errors.New("error converting image name to app name"), err)
 		}
+
 		if err := prepareAppImage(cfg, *appName, img, dir, cfg.UseOverlay); err != nil {
 			return errwrap.Wrap(fmt.Errorf("error setting up image %s", img), err)
 		}
@@ -348,7 +339,7 @@ func validatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 
 // Prepare sets up a pod based on the given config.
 func Prepare(cfg PrepareConfig, dir string, uuid *types.UUID) error {
-	if err := os.MkdirAll(common.AppsInfoPath(dir), defaultRegularDirPerm); err != nil {
+	if err := os.MkdirAll(common.AppsInfoPath(dir), common.DefaultRegularDirPerm); err != nil {
 		return errwrap.Wrap(errors.New("error creating apps info directory"), err)
 	}
 	debug("Preparing stage1")
@@ -371,7 +362,7 @@ func Prepare(cfg PrepareConfig, dir string, uuid *types.UUID) error {
 
 	debug("Writing pod manifest")
 	fn := common.PodManifestPath(dir)
-	if err := ioutil.WriteFile(fn, pmb, defaultRegularFilePerm); err != nil {
+	if err := ioutil.WriteFile(fn, pmb, common.DefaultRegularFilePerm); err != nil {
 		return errwrap.Wrap(errors.New("error writing pod manifest"), err)
 	}
 
@@ -388,7 +379,7 @@ func Prepare(cfg PrepareConfig, dir string, uuid *types.UUID) error {
 		// mark the pod as prepared for user namespaces
 		uidrangeBytes := cfg.PrivateUsers.Serialize()
 
-		if err := ioutil.WriteFile(filepath.Join(dir, common.PrivateUsersPreparedFilename), uidrangeBytes, defaultRegularFilePerm); err != nil {
+		if err := ioutil.WriteFile(filepath.Join(dir, common.PrivateUsersPreparedFilename), uidrangeBytes, common.DefaultRegularFilePerm); err != nil {
 			return errwrap.Wrap(errors.New("error writing userns marker file"), err)
 		}
 	}
@@ -445,7 +436,7 @@ func addResolvConf(cfg RunConfig, rootfs string) {
 	}
 	content += "\n"
 
-	if err := os.Mkdir(filepath.Join(rootfs, "etc"), defaultRegularDirPerm); err != nil {
+	if err := os.Mkdir(filepath.Join(rootfs, "etc"), common.DefaultRegularDirPerm); err != nil {
 		if !os.IsExist(err) {
 			log.Fatalf("error creating dir %q: %v\n", "/etc", err)
 		}
@@ -590,7 +581,7 @@ func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cd
 	}
 
 	appInfoDir := common.AppInfoPath(cdir, appName)
-	if err := os.MkdirAll(appInfoDir, defaultRegularDirPerm); err != nil {
+	if err := os.MkdirAll(appInfoDir, common.DefaultRegularDirPerm); err != nil {
 		return errwrap.Wrap(errors.New("error creating apps info directory"), err)
 	}
 
@@ -616,12 +607,12 @@ func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cd
 			cfg.CommonConfig.RootHash = hash
 		}
 
-		if err := ioutil.WriteFile(common.AppTreeStoreIDPath(cdir, appName), []byte(treeStoreID), defaultRegularFilePerm); err != nil {
+		if err := ioutil.WriteFile(common.AppTreeStoreIDPath(cdir, appName), []byte(treeStoreID), common.DefaultRegularFilePerm); err != nil {
 			return errwrap.Wrap(errors.New("error writing app treeStoreID"), err)
 		}
 	} else {
 		ad := common.AppPath(cdir, appName)
-		err := os.MkdirAll(ad, defaultRegularDirPerm)
+		err := os.MkdirAll(ad, common.DefaultRegularDirPerm)
 		if err != nil {
 			return errwrap.Wrap(errors.New("error creating image directory"), err)
 		}
@@ -651,7 +642,7 @@ func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cd
 func setupAppImage(cfg RunConfig, appName types.ACName, img types.Hash, cdir string, useOverlay bool) error {
 	ad := common.AppPath(cdir, appName)
 	if useOverlay {
-		err := os.MkdirAll(ad, defaultRegularDirPerm)
+		err := os.MkdirAll(ad, common.DefaultRegularDirPerm)
 		if err != nil {
 			return errwrap.Wrap(errors.New("error creating image directory"), err)
 		}
@@ -675,7 +666,7 @@ func setupAppImage(cfg RunConfig, appName types.ACName, img types.Hash, cdir str
 // When useOverlay is false, it attempts to render and expand the stage1.
 func prepareStage1Image(cfg PrepareConfig, img types.Hash, cdir string, useOverlay bool) error {
 	s1 := common.Stage1ImagePath(cdir)
-	if err := os.MkdirAll(s1, defaultRegularDirPerm); err != nil {
+	if err := os.MkdirAll(s1, common.DefaultRegularDirPerm); err != nil {
 		return errwrap.Wrap(errors.New("error creating stage1 directory"), err)
 	}
 
@@ -710,7 +701,7 @@ func prepareStage1Image(cfg PrepareConfig, img types.Hash, cdir string, useOverl
 	}
 
 	fn := path.Join(cdir, common.Stage1TreeStoreIDFilename)
-	if err := ioutil.WriteFile(fn, []byte(treeStoreID), defaultRegularFilePerm); err != nil {
+	if err := ioutil.WriteFile(fn, []byte(treeStoreID), common.DefaultRegularFilePerm); err != nil {
 		return errwrap.Wrap(errors.New("error writing stage1 treeStoreID"), err)
 	}
 	return nil
@@ -751,7 +742,7 @@ func writeManifest(cfg CommonConfig, img types.Hash, dest string) error {
 	}
 
 	debug("Writing image manifest")
-	if err := ioutil.WriteFile(filepath.Join(dest, "manifest"), mb, defaultRegularFilePerm); err != nil {
+	if err := ioutil.WriteFile(filepath.Join(dest, "manifest"), mb, common.DefaultRegularFilePerm); err != nil {
 		return errwrap.Wrap(errors.New("error writing image manifest"), err)
 	}
 
@@ -771,24 +762,40 @@ func copyAppManifest(cdir string, appName types.ACName, dest string) error {
 }
 
 // overlayRender renders the image that corresponds to the given hash using the
-// overlay filesystem.
-// It mounts an overlay filesystem from the cached tree of the image as rootfs.
+// overlay filesystem. It mounts an overlay filesystem from the cached tree of
+// the image as rootfs.
 func overlayRender(cfg RunConfig, treeStoreID string, cdir string, dest string, appName string) error {
 	cachedTreePath := cfg.Store.GetTreeStoreRootFS(treeStoreID)
-	fi, err := os.Stat(cachedTreePath)
+	mc, err := prepareOverlay(cachedTreePath, treeStoreID, cdir, dest, appName, cfg.MountLabel,
+		cfg.RktGid, common.DefaultRegularDirPerm)
 	if err != nil {
-		return err
+		return errwrap.Wrap(errors.New("problem preparing overlay directories"), err)
+	}
+	if _, err = overlay.Mount(mc); err != nil {
+		return errwrap.Wrap(errors.New("problem mounting overlay filesystem"), err)
+	}
+
+	return nil
+}
+
+// prepateOverlay sets up the needed directories, files and permissions for the
+// overlay-rendered pods
+func prepareOverlay(lower, treeStoreID, cdir, dest, appName, lbl string,
+	gid int, fm os.FileMode) (*overlay.MountCfg, error) {
+	fi, err := os.Stat(lower)
+	if err != nil {
+		return nil, err
 	}
 	imgMode := fi.Mode()
 
-	destRootfs := path.Join(dest, "rootfs")
-	if err := os.MkdirAll(destRootfs, imgMode); err != nil {
-		return err
+	dst := path.Join(dest, "rootfs")
+	if err := os.MkdirAll(dst, imgMode); err != nil {
+		return nil, err
 	}
 
 	overlayDir := path.Join(cdir, "overlay")
-	if err := os.MkdirAll(overlayDir, defaultRegularDirPerm); err != nil {
-		return err
+	if err := os.MkdirAll(overlayDir, fm); err != nil {
+		return nil, err
 	}
 
 	// Since the parent directory (rkt/pods/$STATE/$POD_UUID) has the 'S_ISGID' bit, here
@@ -796,43 +803,36 @@ func overlayRender(cfg RunConfig, treeStoreID string, cdir string, dest string,
 	// directory so that it won't inherit the bit. Otherwise the files
 	// created by users within the pod will inherit the 'S_ISGID' bit
 	// as well.
-	if err := os.Chmod(overlayDir, defaultRegularDirPerm); err != nil {
-		return err
+	if err := os.Chmod(overlayDir, fm); err != nil {
+		return nil, err
 	}
 
 	imgDir := path.Join(overlayDir, treeStoreID)
-	if err := os.MkdirAll(imgDir, defaultRegularDirPerm); err != nil {
-		return err
+	if err := os.MkdirAll(imgDir, fm); err != nil {
+		return nil, err
 	}
-
 	// Also make 'rkt/pods/$STATE/$POD_UUID/overlay/$IMAGE_ID' to be readable by 'rkt' group
 	// As 'rkt' status will read the 'rkt/pods/$STATE/$POD_UUID/overlay/$IMAGE_ID/upper/rkt/status/$APP'
-	// to get exit status.
-	if err := os.Chown(imgDir, -1, cfg.RktGid); err != nil {
-		return err
+	// to get exgid
+	if err := os.Chown(imgDir, -1, gid); err != nil {
+		return nil, err
 	}
 
-	upperDir := path.Join(imgDir, "upper", appName)
-	if err := os.MkdirAll(upperDir, imgMode); err != nil {
-		return err
+	upper := path.Join(imgDir, "upper", appName)
+	if err := os.MkdirAll(upper, imgMode); err != nil {
+		return nil, err
 	}
-	if err := label.SetFileLabel(upperDir, cfg.MountLabel); err != nil {
-		return err
+	if err := label.SetFileLabel(upper, lbl); err != nil {
+		return nil, err
 	}
 
-	workDir := path.Join(imgDir, "work", appName)
-	if err := os.MkdirAll(workDir, defaultRegularDirPerm); err != nil {
-		return err
-	}
-	if err := label.SetFileLabel(workDir, cfg.MountLabel); err != nil {
-		return err
+	work := path.Join(imgDir, "work", appName)
+	if err := os.MkdirAll(work, fm); err != nil {
+		return nil, err
 	}
-
-	opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", cachedTreePath, upperDir, workDir)
-	opts = label.FormatMountLabel(opts, cfg.MountLabel)
-	if err := syscall.Mount("overlay", destRootfs, "overlay", 0, opts); err != nil {
-		return errwrap.Wrap(errors.New("error mounting"), err)
+	if err := label.SetFileLabel(work, lbl); err != nil {
+		return nil, err
 	}
 
-	return nil
+	return &overlay.MountCfg{lower, upper, work, dst, lbl}, nil
 }

From 83f927905c13503eefa2348f2fb20a9e8cab2928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20K=C3=BChl?= <chris@kinvolk.io>
Date: Mon, 2 May 2016 10:27:45 +0200
Subject: [PATCH 0536/1304] rkt: perform user namespace unshift on export

---
 rkt/export.go | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/rkt/export.go b/rkt/export.go
index 8993a455dd..58d176fba1 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"syscall"
 
@@ -28,9 +29,9 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/overlay"
-	"github.com/hashicorp/errwrap"
-
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/store"
+	"github.com/hashicorp/errwrap"
 	"github.com/spf13/cobra"
 )
 
@@ -110,12 +111,24 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		}()
 	}
 
+	// Check for user namespace (--private-user), if in use get uidRange
+	var uidRange *user.UidRange
+	privUserFile := path.Join(p.path(), common.PrivateUsersPreparedFilename)
+	privUserContent, err := ioutil.ReadFile(privUserFile)
+	if err == nil {
+		uidRange = user.NewBlankUidRange()
+		// The file was found, save uid & gid shift and count
+		if err := uidRange.Deserialize(privUserContent); err != nil {
+			stderr.PrintE(fmt.Sprintf("problem deserializing the content of %s", common.PrivateUsersPreparedFilename), err)
+			return 1
+		}
+	}
+
 	root := common.AppPath(p.path(), app.Name)
-	if err = buildAci(root, aci); err != nil {
+	if err = buildAci(root, aci, uidRange); err != nil {
 		stderr.PrintE("error building aci", err)
 		return 1
 	}
-
 	return 0
 }
 
@@ -156,7 +169,9 @@ func mountOverlay(pod *pod, app *schema.RuntimeApp, dest string) (string, error)
 	return mntDir, nil
 }
 
-func buildAci(root, target string) (e error) {
+// buildAci builds a target aci from the root directory using any uid shift
+// information from uidRange.
+func buildAci(root, target string, uidRange *user.UidRange) (e error) {
 	mode := os.O_CREATE | os.O_WRONLY
 	if flagOverwriteACI {
 		mode |= os.O_TRUNC
@@ -197,7 +212,20 @@ func buildAci(root, target string) (e error) {
 	}
 	iw := aci.NewImageWriter(im, tr)
 
-	if err := filepath.Walk(root, aci.BuildWalker(root, iw, nil)); err != nil {
+	// Unshift uid and gid when pod was started with --private-user (user namespace)
+	var walkerCb aci.TarHeaderWalkFunc = func(hdr *tar.Header) bool {
+		if uidRange != nil {
+			uid, gid, err := uidRange.UnshiftRange(uint32(hdr.Uid), uint32(hdr.Gid))
+			if err != nil {
+				stderr.PrintE("error unshifting gid and uid", err)
+				return false
+			}
+			hdr.Uid, hdr.Gid = int(uid), int(gid)
+		}
+		return true
+	}
+
+	if err := filepath.Walk(root, aci.BuildWalker(root, iw, walkerCb)); err != nil {
 		return errwrap.Wrap(errors.New("error walking rootfs"), err)
 	}
 

From f75847f25eb0f059f2aad9893056956a3b95502e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20K=C3=BChl?= <chris@kinvolk.io>
Date: Mon, 2 May 2016 17:39:43 +0200
Subject: [PATCH 0537/1304] functional tests: add export tests for overlay and
 user ns

Also tries to simplify things in areas; remove some const variable
checks, etc.
---
 tests/rkt_export_test.go | 60 +++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/tests/rkt_export_test.go b/tests/rkt_export_test.go
index d7f308baa6..83bd37fd0b 100644
--- a/tests/rkt_export_test.go
+++ b/tests/rkt_export_test.go
@@ -20,42 +20,66 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/tests/testutils"
 )
 
 func TestExport(t *testing.T) {
 	const (
-		testAci     = "test.aci"
 		testFile    = "test.txt"
 		testContent = "ThisIsATest"
-		runInspect  = "%s %s %s %s --exec=/inspect -- %s"
 	)
 
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	tests := []struct {
+	type testCfg struct {
 		runArgs        string
 		writeArgs      string
 		readArgs       string
-		expectedStatus int
 		expectedResult string
-	}{
+	}
+
+	tests := []testCfg{
 		{
 			"--no-overlay --insecure-options=image",
 			"--write-file --file-name=" + testFile + " --content=" + testContent,
 			"--read-file --file-name=" + testFile,
-			0,
 			testContent,
 		},
 	}
+
+	// Need to do both checks
+	if common.SupportsUserNS() && checkUserNS() == nil {
+		tests = append(tests, []testCfg{
+			{
+				"--private-users --no-overlay --insecure-options=image",
+				"--write-file --file-name=" + testFile + " --content=" + testContent,
+				"--read-file --file-name=" + testFile,
+				testContent,
+			},
+		}...)
+	}
+
+	if common.SupportsOverlay() {
+		tests = append(tests, []testCfg{
+			{
+				"--insecure-options=image",
+				"--write-file --file-name=" + testFile + " --content=" + testContent,
+				"--read-file --file-name=" + testFile,
+				testContent,
+			},
+		}...)
+	}
+
 	for _, tt := range tests {
 		tmpDir := createTempDirOrPanic("rkt-TestExport-tmp-")
 		defer os.RemoveAll(tmpDir)
 
-		tmpTestAci := filepath.Join(tmpDir, testAci)
+		tmpTestAci := filepath.Join(tmpDir, "test.aci")
 
 		// Prepare the image with modifications
+		const runInspect = "%s %s %s %s --exec=/inspect -- %s"
 		prepareCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "prepare", tt.runArgs, getInspectImagePath(), tt.writeArgs)
 		t.Logf("Preparing 'inspect --write-file'")
 		uuid := runRktAndGetUUID(t, prepareCmd)
@@ -69,20 +93,18 @@ func TestExport(t *testing.T) {
 		exportCmd := fmt.Sprintf("%s export %s %s", ctx.Cmd(), uuid, tmpTestAci)
 		t.Logf("Running 'export'")
 		child = spawnOrFail(t, exportCmd)
-		waitOrFail(t, child, tt.expectedStatus)
-
-		if tt.expectedStatus == 0 {
-			// Run the newly created ACI and check the output
-			readCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "run", tt.runArgs, tmpTestAci, tt.readArgs)
-			t.Logf("Running 'inspect --read-file'")
-			child := spawnOrFail(t, readCmd)
-			if tt.expectedResult != "" {
-				if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
-					t.Fatalf("expected %q but not found: %v\n%s", tt.expectedResult, err, out)
-				}
+		waitOrFail(t, child, 0)
+
+		// Run the newly created ACI and check the output
+		readCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "run", tt.runArgs, tmpTestAci, tt.readArgs)
+		t.Logf("Running 'inspect --read-file'")
+		child = spawnOrFail(t, readCmd)
+		if tt.expectedResult != "" {
+			if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
+				t.Fatalf("expected %q but not found: %v\n%s", tt.expectedResult, err, out)
 			}
-			waitOrFail(t, child, tt.expectedStatus)
 		}
+		waitOrFail(t, child, 0)
 
 		// run garbage collector on pods and images
 		runGC(t, ctx)

From 32bbfe7b55619587e8c5809df972b78106f5272e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 8 Jul 2016 12:40:29 +0200
Subject: [PATCH 0538/1304] rkt/export: fix bug in overlay handling

It wasn't working if the overlay fs was unmounted (e.g. because of a
reboot).

Also:

* Randomize the temporary directory where we mount the overlay fs so
an inconsistent state doesn't affect future exports.
* Change path.Join to filepath.Join.
* Simplify overlay.Mount, we don't need to return the mounted path.
* Fix typos and wrap overlay documentation.
---
 Documentation/subcommands/export.md |  2 +-
 common/overlay/overlay.go           | 19 +++----
 rkt/export.go                       | 77 ++++++++++++++++-------------
 stage0/run.go                       |  2 +-
 4 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/Documentation/subcommands/export.md b/Documentation/subcommands/export.md
index 96e127839c..ae05165c1f 100644
--- a/Documentation/subcommands/export.md
+++ b/Documentation/subcommands/export.md
@@ -10,7 +10,7 @@ $ rkt export UUID .aci
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--overwrite` |  `false` | `true` or `false` | Overwrite the output aci if it exists  |
+| `--overwrite` |  `false` | `true` or `false` | Overwrite the output ACI if it exists  |
 
 ## Global options
 
diff --git a/common/overlay/overlay.go b/common/overlay/overlay.go
index 353afb08ca..0dbe14cd3b 100644
--- a/common/overlay/overlay.go
+++ b/common/overlay/overlay.go
@@ -22,9 +22,10 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
-// MountCfg containes the needed data to construct the overlay mount syscall. The Lower and Upper fields
-// are paths to the filesystems to be merged. The Work field should be an empty directory. Dest is where
-// the mount will be located. Lbl is an SELinux label.
+// MountCfg contains the needed data to construct the overlay mount syscall.
+// The Lower and Upper fields are paths to the filesystems to be merged. The
+// Work field should be an empty directory. Dest is where the mount will be
+// located. Lbl is an SELinux label.
 type MountCfg struct {
 	Lower,
 	Upper,
@@ -33,15 +34,15 @@ type MountCfg struct {
 	Lbl string
 }
 
-// Mount mounts the upper and lower directories to the destination directory. The MountCfg struct supplies
-// information required to build the mount system call. The path to the mounted files system is returned
-// upon success.
-func Mount(cfg *MountCfg) (string, error) {
+// Mount mounts the upper and lower directories to the destination directory.
+// The MountCfg struct supplies information required to build the mount system
+// call.
+func Mount(cfg *MountCfg) error {
 	opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", cfg.Lower, cfg.Upper, cfg.Work)
 	opts = label.FormatMountLabel(opts, cfg.Lbl)
 	if err := syscall.Mount("overlay", cfg.Dest, "overlay", 0, opts); err != nil {
-		return "", errwrap.Wrap(fmt.Errorf("error mounting overlay with options '%s' and dest '%s'", opts, cfg.Dest), err)
+		return errwrap.Wrap(fmt.Errorf("error mounting overlay with options '%s' and dest '%s'", opts, cfg.Dest), err)
 	}
 
-	return cfg.Dest, nil
+	return nil
 }
diff --git a/rkt/export.go b/rkt/export.go
index 58d176fba1..e697ded4f2 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path"
 	"path/filepath"
 	"syscall"
 
@@ -57,10 +56,10 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	aci := args[1]
-	ext := filepath.Ext(aci)
+	outACI := args[1]
+	ext := filepath.Ext(outACI)
 	if ext != schema.ACIExtension {
-		stderr.Printf("extension must be %s (given %s)", schema.ACIExtension, aci)
+		stderr.Printf("extension must be %s (given %s)", schema.ACIExtension, outACI)
 		return 1
 	}
 
@@ -88,32 +87,47 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 	}
 	app := apps[0]
 
+	root := common.AppPath(p.path(), app.Name)
+	manifestPath := filepath.Join(common.AppInfoPath(p.path(), app.Name), aci.ManifestFile)
 	if p.usesOverlay() {
-		tmpMntDir := path.Join(getDataDir(), "tmp", fmt.Sprintf("rkt-export-%s", p.uuid))
-		if err := os.MkdirAll(tmpMntDir, common.DefaultRegularDirPerm); err != nil {
+		tmpDir := filepath.Join(getDataDir(), "tmp")
+		if err := os.MkdirAll(tmpDir, common.DefaultRegularDirPerm); err != nil {
 			stderr.PrintE("unable to create temp directory", err)
 			return 1
 		}
-
-		mntDir, err := mountOverlay(p, &app, tmpMntDir)
+		podDir, err := ioutil.TempDir(tmpDir, fmt.Sprintf("rkt-export-%s", p.uuid))
 		if err != nil {
-			stderr.PrintE(fmt.Sprintf("couldn't mount directory at %s", tmpMntDir), err)
+			stderr.PrintE("unable to create export temp directory", err)
+			return 1
 		}
 		defer func() {
-			if err := syscall.Unmount(mntDir, 0); err != nil {
-				stderr.PrintE(fmt.Sprintf("error unmounting directory %s", mntDir), err)
+			if err := os.RemoveAll(podDir); err != nil {
+				stderr.PrintE("problem removing temp directory", err)
 				exit = 1
 			}
-			if err := os.RemoveAll(tmpMntDir); err != nil {
-				stderr.PrintE("problem removing temp directory", err)
+		}()
+		mntDir := filepath.Join(podDir, "rootfs")
+		if err := os.Mkdir(mntDir, common.DefaultRegularDirPerm); err != nil {
+			stderr.PrintE("unable to create rootfs directory inside temp directory", err)
+			return 1
+		}
+
+		if err := mountOverlay(p, &app, mntDir); err != nil {
+			stderr.PrintE(fmt.Sprintf("couldn't mount directory at %s", mntDir), err)
+			return 1
+		}
+		defer func() {
+			if err := syscall.Unmount(mntDir, 0); err != nil {
+				stderr.PrintE(fmt.Sprintf("error unmounting directory %s", mntDir), err)
 				exit = 1
 			}
 		}()
+		root = podDir
 	}
 
 	// Check for user namespace (--private-user), if in use get uidRange
 	var uidRange *user.UidRange
-	privUserFile := path.Join(p.path(), common.PrivateUsersPreparedFilename)
+	privUserFile := filepath.Join(p.path(), common.PrivateUsersPreparedFilename)
 	privUserContent, err := ioutil.ReadFile(privUserFile)
 	if err == nil {
 		uidRange = user.NewBlankUidRange()
@@ -124,8 +138,7 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		}
 	}
 
-	root := common.AppPath(p.path(), app.Name)
-	if err = buildAci(root, aci, uidRange); err != nil {
+	if err = buildAci(root, manifestPath, outACI, uidRange); err != nil {
 		stderr.PrintE("error building aci", err)
 		return 1
 	}
@@ -133,45 +146,44 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 }
 
 // mountOverlay mounts the app from the overlay-rendered pod to the destination directory.
-func mountOverlay(pod *pod, app *schema.RuntimeApp, dest string) (string, error) {
+func mountOverlay(pod *pod, app *schema.RuntimeApp, dest string) error {
 	if _, err := os.Stat(dest); err != nil {
-		return "", err
+		return err
 	}
 
 	s, err := store.NewStore(getDataDir())
 	if err != nil {
-		return "", errwrap.Wrap(errors.New("cannot open store"), err)
+		return errwrap.Wrap(errors.New("cannot open store"), err)
 	}
 
 	treeStoreID, err := pod.getAppTreeStoreID(app.Name)
 	if err != nil {
-		return "", err
+		return err
 	}
 	lower := s.GetTreeStoreRootFS(treeStoreID)
-	imgDir := path.Join(path.Join(pod.path(), "overlay"), treeStoreID)
+	imgDir := filepath.Join(filepath.Join(pod.path(), "overlay"), treeStoreID)
 	if _, err := os.Stat(imgDir); err != nil {
-		return "", err
+		return err
 	}
-	upper := path.Join(imgDir, "upper", app.Name.String())
+	upper := filepath.Join(imgDir, "upper", app.Name.String())
 	if _, err := os.Stat(upper); err != nil {
-		return "", err
+		return err
 	}
-	work := path.Join(imgDir, "work", app.Name.String())
+	work := filepath.Join(imgDir, "work", app.Name.String())
 	if _, err := os.Stat(work); err != nil {
-		return "", err
+		return err
 	}
 
-	mntDir, err := overlay.Mount(&overlay.MountCfg{lower, upper, work, dest, ""})
-	if err != nil {
-		return "", errwrap.Wrap(errors.New("problem mounting overlayfs directory"), err)
+	if err := overlay.Mount(&overlay.MountCfg{lower, upper, work, dest, ""}); err != nil {
+		return errwrap.Wrap(errors.New("problem mounting overlayfs directory"), err)
 	}
 
-	return mntDir, nil
+	return nil
 }
 
 // buildAci builds a target aci from the root directory using any uid shift
 // information from uidRange.
-func buildAci(root, target string, uidRange *user.UidRange) (e error) {
+func buildAci(root, manifestPath, target string, uidRange *user.UidRange) (e error) {
 	mode := os.O_CREATE | os.O_WRONLY
 	if flagOverwriteACI {
 		mode |= os.O_TRUNC
@@ -201,8 +213,7 @@ func buildAci(root, target string, uidRange *user.UidRange) (e error) {
 		}
 	}()
 
-	mpath := filepath.Join(root, aci.ManifestFile)
-	b, err := ioutil.ReadFile(mpath)
+	b, err := ioutil.ReadFile(manifestPath)
 	if err != nil {
 		return errwrap.Wrap(errors.New("unable to read Image Manifest"), err)
 	}
diff --git a/stage0/run.go b/stage0/run.go
index 7e8cec62d3..ba9a27ef60 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -771,7 +771,7 @@ func overlayRender(cfg RunConfig, treeStoreID string, cdir string, dest string,
 	if err != nil {
 		return errwrap.Wrap(errors.New("problem preparing overlay directories"), err)
 	}
-	if _, err = overlay.Mount(mc); err != nil {
+	if err = overlay.Mount(mc); err != nil {
 		return errwrap.Wrap(errors.New("problem mounting overlay filesystem"), err)
 	}
 

From 596159369414cf94a1cae2acb541a99e75ee35e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 13 Jul 2016 14:53:32 +0200
Subject: [PATCH 0539/1304] rkt/export: refuse to export if the app has MPs +
 no-overlay

If we're using "fly" the mounts we do (`/dev`, `/proc`, `/sys` and
`/tmp` and other user-defined mounts) are in the host's mount namespace.
Trying to export this kind of pods causes problems (e.g. some files in
`/proc` cannot be directly read). Also, the user doesn't expect the
contents of mountpoints to be exported.

This is not problematic if we use overlay, because in that case we
derive the exported fs from the ACI image plus the upper layer.

To avoid problems, if the pod doesn't use overlay, we refuse exporting
if the app has mountpoints inside.
---
 rkt/export.go | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/rkt/export.go b/rkt/export.go
index e697ded4f2..23580b60d9 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -16,16 +16,19 @@ package main
 
 import (
 	"archive/tar"
+	"bufio"
 	"compress/gzip"
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 	"syscall"
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/overlay"
 	"github.com/coreos/rkt/pkg/user"
@@ -50,6 +53,37 @@ func init() {
 	cmdExport.Flags().BoolVar(&flagOverwriteACI, "overwrite", false, "overwrite output ACI")
 }
 
+func appHasMountpoints(podPath string, appName types.ACName) (bool, error) {
+	appRootfs := common.AppRootfsPath(podPath, appName)
+	// add a filepath separator so we don't match the appRootfs path
+	appRootfs += string(filepath.Separator)
+
+	mi, err := os.Open("/proc/self/mountinfo")
+	if err != nil {
+		return false, err
+	}
+	defer mi.Close()
+
+	sc := bufio.NewScanner(mi)
+	for sc.Scan() {
+		line := sc.Text()
+		lineResult := strings.Split(line, " ")
+		if len(lineResult) < 7 {
+			return false, fmt.Errorf("not enough fields from line %q: %+v", line, lineResult)
+		}
+
+		mp := lineResult[4]
+
+		if strings.HasPrefix(mp, appRootfs) {
+			return true, nil
+		}
+	}
+	if err := sc.Err(); err != nil {
+		return false, err
+	}
+	return false, nil
+}
+
 func runExport(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 2 {
 		cmd.Usage()
@@ -123,6 +157,16 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 			}
 		}()
 		root = podDir
+	} else {
+		hasMPs, err := appHasMountpoints(p.path(), app.Name)
+		if err != nil {
+			stderr.PrintE("error parsing mountpoints", err)
+			return 1
+		}
+		if hasMPs {
+			stderr.Printf("pod has remaining mountpoints. Only pods using overlayfs or with no mountpoints can be exported")
+			return 1
+		}
 	}
 
 	// Check for user namespace (--private-user), if in use get uidRange

From 19e77f14701098247e4f4bf2145ea27f26a70c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 8 Jul 2016 14:04:10 +0200
Subject: [PATCH 0540/1304] functional tests: test export with unmounted
 overlayfs

---
 tests/rkt_export_test.go | 16 ++++++++++++++++
 tests/rkt_gc_test.go     | 27 +--------------------------
 tests/rkt_tests.go       | 28 ++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/tests/rkt_export_test.go b/tests/rkt_export_test.go
index 83bd37fd0b..9141699be0 100644
--- a/tests/rkt_export_test.go
+++ b/tests/rkt_export_test.go
@@ -38,6 +38,7 @@ func TestExport(t *testing.T) {
 		writeArgs      string
 		readArgs       string
 		expectedResult string
+		unmountOverlay bool
 	}
 
 	tests := []testCfg{
@@ -46,6 +47,7 @@ func TestExport(t *testing.T) {
 			"--write-file --file-name=" + testFile + " --content=" + testContent,
 			"--read-file --file-name=" + testFile,
 			testContent,
+			false,
 		},
 	}
 
@@ -57,6 +59,7 @@ func TestExport(t *testing.T) {
 				"--write-file --file-name=" + testFile + " --content=" + testContent,
 				"--read-file --file-name=" + testFile,
 				testContent,
+				false,
 			},
 		}...)
 	}
@@ -68,6 +71,15 @@ func TestExport(t *testing.T) {
 				"--write-file --file-name=" + testFile + " --content=" + testContent,
 				"--read-file --file-name=" + testFile,
 				testContent,
+				false,
+			},
+			// Test unmounting overlay to simulate a reboot
+			{
+				"--insecure-options=image",
+				"--write-file --file-name=" + testFile + " --content=" + testContent,
+				"--read-file --file-name=" + testFile,
+				testContent,
+				true,
 			},
 		}...)
 	}
@@ -89,6 +101,10 @@ func TestExport(t *testing.T) {
 		child := spawnOrFail(t, runCmd)
 		waitOrFail(t, child, 0)
 
+		if tt.unmountOverlay {
+			unmountPod(t, ctx, uuid, true)
+		}
+
 		// Export the image
 		exportCmd := fmt.Sprintf("%s export %s %s", ctx.Cmd(), uuid, tmpTestAci)
 		t.Logf("Running 'export'")
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 2e4f36e94a..8ecc453233 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -21,7 +21,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"syscall"
 	"testing"
 
 	"github.com/coreos/rkt/common"
@@ -99,31 +98,7 @@ func TestGCAfterUnmount(t *testing.T) {
 		cmd = fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), uuid)
 		runRktAndCheckOutput(t, cmd, "", false)
 
-		podDir := filepath.Join(ctx.DataDir(), "pods", "run", uuid)
-		stage1MntPath := filepath.Join(podDir, "stage1", "rootfs")
-		stage2MntPath := filepath.Join(stage1MntPath, "opt", "stage2", "rkt-inspect", "rootfs")
-		netnsPath := filepath.Join(podDir, "netns")
-		podNetNSPathBytes, err := ioutil.ReadFile(netnsPath)
-		if err != nil {
-			t.Fatalf(`cannot read "netns" stage1: %v`, err)
-		}
-		podNetNSPath := string(podNetNSPathBytes)
-
-		if err := syscall.Unmount(stage2MntPath, 0); err != nil {
-			t.Fatalf("cannot umount stage2: %v", err)
-		}
-
-		if err := syscall.Unmount(stage1MntPath, 0); err != nil {
-			t.Fatalf("cannot umount stage1: %v", err)
-		}
-
-		if err := syscall.Unmount(podNetNSPath, 0); err != nil {
-			t.Fatalf("cannot umount pod netns: %v", err)
-		}
-
-		if rmNetns {
-			_ = os.RemoveAll(podNetNSPath)
-		}
+		unmountPod(t, ctx, uuid, rmNetns)
 
 		pods := podsRemaining(t, ctx)
 		if len(pods) == 0 {
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index a30d1383a8..030e68a41d 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -815,3 +815,31 @@ func writeConfig(t *testing.T, dir, filename, contents string) {
 		t.Fatalf("Failed to write file %q: %v", path, err)
 	}
 }
+
+func unmountPod(t *testing.T, ctx *testutils.RktRunCtx, uuid string, rmNetns bool) {
+	podDir := filepath.Join(ctx.DataDir(), "pods", "run", uuid)
+	stage1MntPath := filepath.Join(podDir, "stage1", "rootfs")
+	stage2MntPath := filepath.Join(stage1MntPath, "opt", "stage2", "rkt-inspect", "rootfs")
+	netnsPath := filepath.Join(podDir, "netns")
+	podNetNSPathBytes, err := ioutil.ReadFile(netnsPath)
+	if err != nil {
+		t.Fatalf(`cannot read "netns" stage1: %v`, err)
+	}
+	podNetNSPath := string(podNetNSPathBytes)
+
+	if err := syscall.Unmount(stage2MntPath, 0); err != nil {
+		t.Fatalf("cannot umount stage2: %v", err)
+	}
+
+	if err := syscall.Unmount(stage1MntPath, 0); err != nil {
+		t.Fatalf("cannot umount stage1: %v", err)
+	}
+
+	if err := syscall.Unmount(podNetNSPath, 0); err != nil {
+		t.Fatalf("cannot umount pod netns: %v", err)
+	}
+
+	if rmNetns {
+		_ = os.RemoveAll(podNetNSPath)
+	}
+}

From 461fce096ecd64fa672426ccfb724fb0db5ed002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 13 Jul 2016 13:03:26 +0200
Subject: [PATCH 0541/1304] functional tests: refactor TestExport

So we can test with fly.
---
 tests/rkt_export_container_test.go |  39 +++++++
 tests/rkt_export_fly_test.go       |  33 ++++++
 tests/rkt_export_test.go           | 172 ++++++++++++++---------------
 3 files changed, 158 insertions(+), 86 deletions(-)
 create mode 100644 tests/rkt_export_container_test.go
 create mode 100644 tests/rkt_export_fly_test.go

diff --git a/tests/rkt_export_container_test.go b/tests/rkt_export_container_test.go
new file mode 100644
index 0000000000..7d091c2637
--- /dev/null
+++ b/tests/rkt_export_container_test.go
@@ -0,0 +1,39 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !fly
+
+package main
+
+import (
+	"testing"
+
+	"github.com/coreos/rkt/common"
+)
+
+func TestExport(t *testing.T) {
+	testCases := []ExportTestCase{noOverlaySimpleTest}
+
+	// Need to do both checks
+	if common.SupportsUserNS() && checkUserNS() == nil {
+		testCases = append(testCases, userNS)
+	}
+
+	if common.SupportsOverlay() {
+		testCases = append(testCases, overlaySimpleTest)
+		testCases = append(testCases, overlaySimulateReboot)
+	}
+
+	NewTestExport(testCases...).Execute(t)
+}
diff --git a/tests/rkt_export_fly_test.go b/tests/rkt_export_fly_test.go
new file mode 100644
index 0000000000..c6383b83fa
--- /dev/null
+++ b/tests/rkt_export_fly_test.go
@@ -0,0 +1,33 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build fly
+
+package main
+
+import (
+	"testing"
+
+	"github.com/coreos/rkt/common"
+)
+
+func TestExport(t *testing.T) {
+	if !common.SupportsOverlay() {
+		t.Skip("Overlay fs not supported.")
+	}
+
+	// TODO(iaguis): we need a new function to unmount the fly pod so we can also test
+	// overlaySimulateReboot
+	NewTestExport(overlaySimpleTest).Execute(t)
+}
diff --git a/tests/rkt_export_test.go b/tests/rkt_export_test.go
index 9141699be0..a1b69a2209 100644
--- a/tests/rkt_export_test.go
+++ b/tests/rkt_export_test.go
@@ -20,110 +20,110 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/tests/testutils"
 )
 
-func TestExport(t *testing.T) {
-	const (
-		testFile    = "test.txt"
-		testContent = "ThisIsATest"
-	)
+const (
+	testFile    = "test.txt"
+	testContent = "ThisIsATest"
+)
 
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+type ExportTestCase struct {
+	runArgs        string
+	writeArgs      string
+	readArgs       string
+	expectedResult string
+	unmountOverlay bool
+}
+
+type exportTest []ExportTestCase
 
-	type testCfg struct {
-		runArgs        string
-		writeArgs      string
-		readArgs       string
-		expectedResult string
-		unmountOverlay bool
+var (
+	noOverlaySimpleTest = ExportTestCase{
+		"--no-overlay --insecure-options=image",
+		"--write-file --file-name=" + testFile + " --content=" + testContent,
+		"--read-file --file-name=" + testFile,
+		testContent,
+		false,
 	}
 
-	tests := []testCfg{
-		{
-			"--no-overlay --insecure-options=image",
-			"--write-file --file-name=" + testFile + " --content=" + testContent,
-			"--read-file --file-name=" + testFile,
-			testContent,
-			false,
-		},
+	userNS = ExportTestCase{
+		"--private-users --no-overlay --insecure-options=image",
+		"--write-file --file-name=" + testFile + " --content=" + testContent,
+		"--read-file --file-name=" + testFile,
+		testContent,
+		false,
 	}
 
-	// Need to do both checks
-	if common.SupportsUserNS() && checkUserNS() == nil {
-		tests = append(tests, []testCfg{
-			{
-				"--private-users --no-overlay --insecure-options=image",
-				"--write-file --file-name=" + testFile + " --content=" + testContent,
-				"--read-file --file-name=" + testFile,
-				testContent,
-				false,
-			},
-		}...)
+	overlaySimpleTest = ExportTestCase{
+		"--insecure-options=image",
+		"--write-file --file-name=" + testFile + " --content=" + testContent,
+		"--read-file --file-name=" + testFile,
+		testContent,
+		false,
 	}
 
-	if common.SupportsOverlay() {
-		tests = append(tests, []testCfg{
-			{
-				"--insecure-options=image",
-				"--write-file --file-name=" + testFile + " --content=" + testContent,
-				"--read-file --file-name=" + testFile,
-				testContent,
-				false,
-			},
-			// Test unmounting overlay to simulate a reboot
-			{
-				"--insecure-options=image",
-				"--write-file --file-name=" + testFile + " --content=" + testContent,
-				"--read-file --file-name=" + testFile,
-				testContent,
-				true,
-			},
-		}...)
+	overlaySimulateReboot = ExportTestCase{
+		"--insecure-options=image",
+		"--write-file --file-name=" + testFile + " --content=" + testContent,
+		"--read-file --file-name=" + testFile,
+		testContent,
+		true,
+	}
+)
+
+func (ct exportTest) Execute(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for _, testCase := range ct {
+		testCase.Execute(t, ctx)
 	}
+}
 
-	for _, tt := range tests {
-		tmpDir := createTempDirOrPanic("rkt-TestExport-tmp-")
-		defer os.RemoveAll(tmpDir)
+func (ct ExportTestCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
+	tmpDir := createTempDirOrPanic("rkt-TestExport-tmp-")
+	defer os.RemoveAll(tmpDir)
 
-		tmpTestAci := filepath.Join(tmpDir, "test.aci")
+	tmpTestAci := filepath.Join(tmpDir, "test.aci")
 
-		// Prepare the image with modifications
-		const runInspect = "%s %s %s %s --exec=/inspect -- %s"
-		prepareCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "prepare", tt.runArgs, getInspectImagePath(), tt.writeArgs)
-		t.Logf("Preparing 'inspect --write-file'")
-		uuid := runRktAndGetUUID(t, prepareCmd)
+	// Prepare the image with modifications
+	const runInspect = "%s %s %s %s --exec=/inspect -- %s"
+	prepareCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "prepare", ct.runArgs, getInspectImagePath(), ct.writeArgs)
+	t.Logf("Preparing 'inspect --write-file'")
+	uuid := runRktAndGetUUID(t, prepareCmd)
 
-		runCmd := fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), uuid)
-		t.Logf("Running 'inspect --write-file'")
-		child := spawnOrFail(t, runCmd)
-		waitOrFail(t, child, 0)
+	runCmd := fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), uuid)
+	t.Logf("Running 'inspect --write-file'")
+	child := spawnOrFail(t, runCmd)
+	waitOrFail(t, child, 0)
 
-		if tt.unmountOverlay {
-			unmountPod(t, ctx, uuid, true)
-		}
+	if ct.unmountOverlay {
+		unmountPod(t, ctx, uuid, true)
+	}
 
-		// Export the image
-		exportCmd := fmt.Sprintf("%s export %s %s", ctx.Cmd(), uuid, tmpTestAci)
-		t.Logf("Running 'export'")
-		child = spawnOrFail(t, exportCmd)
-		waitOrFail(t, child, 0)
-
-		// Run the newly created ACI and check the output
-		readCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "run", tt.runArgs, tmpTestAci, tt.readArgs)
-		t.Logf("Running 'inspect --read-file'")
-		child = spawnOrFail(t, readCmd)
-		if tt.expectedResult != "" {
-			if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
-				t.Fatalf("expected %q but not found: %v\n%s", tt.expectedResult, err, out)
-			}
+	// Export the image
+	exportCmd := fmt.Sprintf("%s export %s %s", ctx.Cmd(), uuid, tmpTestAci)
+	t.Logf("Running 'export'")
+	child = spawnOrFail(t, exportCmd)
+	waitOrFail(t, child, 0)
+
+	// Run the newly created ACI and check the output
+	readCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "run", ct.runArgs, tmpTestAci, ct.readArgs)
+	t.Logf("Running 'inspect --read-file'")
+	child = spawnOrFail(t, readCmd)
+	if ct.expectedResult != "" {
+		if _, out, err := expectRegexWithOutput(child, ct.expectedResult); err != nil {
+			t.Fatalf("expected %q but not found: %v\n%s", ct.expectedResult, err, out)
 		}
-		waitOrFail(t, child, 0)
-
-		// run garbage collector on pods and images
-		runGC(t, ctx)
-		runImageGC(t, ctx)
 	}
+	waitOrFail(t, child, 0)
+
+	// run garbage collector on pods and images
+	runGC(t, ctx)
+	runImageGC(t, ctx)
+}
+
+func NewTestExport(cases ...ExportTestCase) testutils.Test {
+	return exportTest(cases)
 }

From aede5d8e1462a421d744667c0c5d8f8c23f1fe50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Tue, 24 May 2016 14:25:09 +0200
Subject: [PATCH 0542/1304] make: Add configure option to set KVM hypervisor.

---
 Makefile.in  |  2 +-
 configure.ac | 25 ++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index bc13ab40b2..8cd8c7a333 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@ ABS_GO := @ABS_GO@
 # [STAGE1] build settings
 
 # selinux tags for rkt and functional tests
-RKT_TAGS := -tags "selinux @TPM_TAGS@ @SDJOURNAL_TAGS@"
+RKT_TAGS := -tags "selinux @TPM_TAGS@ @SDJOURNAL_TAGS@ @KVM_HV_TAG@"
 # stage1 build mode
 
 RKT_VERSION := @RKT_VERSION@
diff --git a/configure.ac b/configure.ac
index 7c2321b4f1..7f55379475 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,6 +113,13 @@ AC_ARG_WITH([stage1-systemd-version],
             [RKT_STAGE1_SYSTEMD_VER="${withval}"],
             [RKT_STAGE1_SYSTEMD_VER='auto'])
 
+# STAGE1 - KVM hypervisor. LKVM is the only choice for now
+AC_ARG_WITH([stage1-kvm-hypervisor],
+            [AS_HELP_STRING([--with-stage1-kvm-hypervisor],
+                            [hypervisor used by 'kvm' flavor; default and only option for now: 'lkvm'])],
+            [RKT_STAGE1_KVM_HV="${withval}"],
+            [RKT_STAGE1_KVM_HV='lkvm'])
+
 ## STAGE1 - path to coreos pxe and its systemd version for kvm and coreos flavors
 
 AC_ARG_WITH([coreos-local-pxe-image-path],
@@ -306,7 +313,7 @@ RKT_ITERATE_FLAVORS([${RKT_STAGE1_FLAVORS}],[flavor],
                              [coreos],
                                      [RKT_COMMON_COREOS_PROGS],
                              [kvm],
-                                     [AC_MSG_NOTICE([will build linux kernel and lkvm from source, make sure that all their build requirements are fulfilled])
+                                     [AC_MSG_NOTICE([will build linux kernel and ${RKT_STAGE1_KVM_HV} from source, make sure that all their build requirements are fulfilled])
                                       RKT_COMMON_COREOS_PROGS
                                       RKT_REQ_PROG([PATCH],[patch],[patch])
                                       RKT_REQ_PROG([TAR],[tar],[tar])
@@ -408,6 +415,14 @@ AS_VAR_IF([RKT_STAGE1_SYSTEMD_VER], [HEAD],
           [AC_MSG_WARN([* 'HEAD' is not a systemd version, setting it to 'master' instead])
            RKT_STAGE1_SYSTEMD_VER='master'])
 
+KVM_HV_TAG='hv_none'
+RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [kvm],
+                  dnl for kvm check hypervisor
+                  AS_CASE([${RKT_STAGE1_KVM_HV}],
+                          [lkvm],
+                                  KVM_HV_TAG='hv_lkvm',
+                          [AC_MSG_ERROR([*** Invalid value passed to --with-stage1-kvm-hypervisor; lkvm is the only supported tool right now])]))
+
 ## Options specific to coreos/kvm flavors
 
 # Process local CoreOS PXE image path and its systemd version for
@@ -736,6 +751,7 @@ AC_SUBST(RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS)
 AC_SUBST(RKT_VERSION_LDFLAGS)
 AC_SUBST(RKT_FEATURES_LDFLAGS)
 
+AC_SUBST(KVM_HV_TAG)
 AC_SUBST(TPM_TAGS)
 AC_SUBST(SDJOURNAL_TAGS)
 
@@ -787,6 +803,13 @@ RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [src],
         systemd git repo:                       '${RKT_STAGE1_SYSTEMD_SRC}'
         systemd version:                        '${RKT_STAGE1_SYSTEMD_VER}'])])
 
+RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [kvm],
+                  [AC_MSG_RESULT([
+        kvm flavor specific build parameters
+
+        hypervisor:                             '${RKT_STAGE1_KVM_HV}'])])
+
+
 AC_MSG_RESULT([
         other build parameters
 

From 08eea2fff7891264ecd952034821e469f15b5843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Tue, 24 May 2016 15:00:25 +0200
Subject: [PATCH 0543/1304] KVM: Add hypervisor prototype

---
 stage1/init/kvm/hypervisor/hypervisor.go | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 stage1/init/kvm/hypervisor/hypervisor.go

diff --git a/stage1/init/kvm/hypervisor/hypervisor.go b/stage1/init/kvm/hypervisor/hypervisor.go
new file mode 100644
index 0000000000..da1beb8644
--- /dev/null
+++ b/stage1/init/kvm/hypervisor/hypervisor.go
@@ -0,0 +1,46 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package hypervisor
+
+// KvmHypervisor structure describes KVM hypervisor binary and its parameters
+type KvmHypervisor struct {
+	Bin          string
+	KernelParams []string
+}
+
+// InitKernelParams sets debug and common parameters passed to the kernel
+func (hv *KvmHypervisor) InitKernelParams(isDebug bool) {
+	hv.KernelParams = append(hv.KernelParams, []string{
+		"console=hvc0",
+		"init=/usr/lib/systemd/systemd",
+		"no_timer_check",
+		"noreplace-smp",
+		"tsc=reliable"}...)
+
+	if isDebug {
+		hv.KernelParams = append(hv.KernelParams, []string{
+			"debug",
+			"systemd.log_level=debug",
+			"systemd.show_status=true",
+		}...)
+	} else {
+		hv.KernelParams = append(hv.KernelParams, []string{
+			"systemd.show_status=false",
+			"rd.udev.log-priority=3",
+			"quiet=vga",
+			"quiet systemd.log_level=emerg",
+		}...)
+	}
+}

From 622f92909af80efcc2f46c6051388658bcae0a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Tue, 24 May 2016 15:37:58 +0200
Subject: [PATCH 0544/1304] KVM: Refactor current lkvm code to start as a
 hypervisor driver

---
 stage1/init/init.go                       | 61 +++++--------------
 stage1/init/init.mk                       |  1 +
 stage1/init/kvm/hypervisor/lkvm_driver.go | 73 +++++++++++++++++++++++
 stage1/init/kvm/network.go                | 16 +++--
 stage1/init/kvm/network_test.go           |  8 +--
 5 files changed, 100 insertions(+), 59 deletions(-)
 create mode 100644 stage1/init/kvm/hypervisor/lkvm_driver.go

diff --git a/stage1/init/init.go b/stage1/init/init.go
index cad2674615..ae9c52eac7 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -29,7 +29,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"strconv"
 	"strings"
 	"syscall"
 
@@ -51,6 +50,7 @@ import (
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/stage1/init/kvm"
+	"github.com/coreos/rkt/stage1/init/kvm/hypervisor"
 )
 
 const (
@@ -235,61 +235,30 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 			return nil, nil, fmt.Errorf("flag --private-users cannot be used with an lkvm stage1")
 		}
 
-		// kernel and lkvm are relative path, because init has /var/lib/rkt/..../uuid as its working directory
+		// kernel and hypervisor binaries are located relative to the working directory
+		// of init (/var/lib/rkt/..../uuid)
 		// TODO: move to path.go
 		kernelPath := filepath.Join(common.Stage1RootfsPath(p.Root), "bzImage")
-		lkvmPath := filepath.Join(common.Stage1RootfsPath(p.Root), "lkvm")
 		netDescriptions := kvm.GetNetworkDescriptions(n)
-		lkvmNetArgs, err := kvm.GetKVMNetArgs(netDescriptions)
-		if err != nil {
-			return nil, nil, err
-		}
 
 		cpu, mem := kvm.GetAppsResources(p.Manifest.Apps)
 
-		kernelParams := []string{
-			"console=hvc0",
-			"init=/usr/lib/systemd/systemd",
-			"no_timer_check",
-			"noreplace-smp",
-			"systemd.default_standard_error=journal+console",
-			"systemd.default_standard_output=journal+console",
-			// "systemd.default_standard_output=tty",
-			"tsc=reliable",
-			"MACHINEID=" + p.UUID.String(),
-		}
-
-		if debug {
-			kernelParams = append(kernelParams, []string{
-				"debug",
-				"systemd.log_level=debug",
-				"systemd.show_status=true",
-				// "systemd.confirm_spawn=true",
-			}...)
-		} else {
-			kernelParams = append(kernelParams, "quiet")
-		}
-
-		args = append(args, []string{
-			"./" + lkvmPath, // relative path
-			"run",
-			"--name", "rkt-" + p.UUID.String(),
-			"--no-dhcp", // speed bootup
-			"--cpu", strconv.FormatInt(cpu, 10),
-			"--mem", strconv.FormatInt(mem, 10),
-			"--console=virtio",
-			"--kernel", kernelPath,
-			"--disk", "stage1/rootfs", // relative to run/pods/uuid dir this is a place where systemd resides
-			// MACHINEID will be available as environment variable
-			"--params", strings.Join(kernelParams, " "),
-		}...,
+		hvStartCmd := hypervisor.StartCmd(
+			common.Stage1RootfsPath(p.Root),
+			p.UUID.String(),
+			kernelPath,
+			netDescriptions,
+			cpu,
+			mem,
+			debug,
 		)
-		args = append(args, lkvmNetArgs...)
 
-		if debug {
-			args = append(args, "--debug")
+		if hvStartCmd == nil {
+			return nil, nil, fmt.Errorf("no hypervisor")
 		}
 
+		args = append(args, hvStartCmd...)
+
 		// lkvm requires $HOME to be defined,
 		// see https://github.com/coreos/rkt/issues/1393
 		if os.Getenv("HOME") == "" {
diff --git a/stage1/init/init.mk b/stage1/init/init.mk
index b96c5ea77b..b5a6de0a3d 100644
--- a/stage1/init/init.mk
+++ b/stage1/init/init.mk
@@ -1 +1,2 @@
+BGB_GO_FLAGS := $(strip $(RKT_TAGS))
 include stage1/makelib/aci_simple_go_bin.mk
diff --git a/stage1/init/kvm/hypervisor/lkvm_driver.go b/stage1/init/kvm/hypervisor/lkvm_driver.go
new file mode 100644
index 0000000000..c1b2b4b812
--- /dev/null
+++ b/stage1/init/kvm/hypervisor/lkvm_driver.go
@@ -0,0 +1,73 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build hv_lkvm
+
+package hypervisor
+
+import (
+	"fmt"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/coreos/rkt/stage1/init/kvm"
+)
+
+// StartCmd takes path to stage1, name of the machine, path to kernel, network describers, memory in megabytes
+// and quantity of cpus and prepares command line to run LKVM process
+func StartCmd(wdPath, name, kernelPath string, nds []kvm.NetDescriber, cpu, mem int64, debug bool) []string {
+	driverConfiguration := KvmHypervisor{
+		Bin: "./lkvm",
+		KernelParams: []string{
+			"systemd.default_standard_error=journal+console",
+			"systemd.default_standard_output=journal+console",
+		},
+	}
+
+	driverConfiguration.InitKernelParams(debug)
+
+	startCmd := []string{
+		filepath.Join(wdPath, driverConfiguration.Bin),
+		"run",
+		"--name", "rkt-" + name,
+		"--no-dhcp",
+		"--cpu", strconv.Itoa(int(cpu)),
+		"--mem", strconv.Itoa(int(mem)),
+		"--console=virtio",
+		"--kernel", kernelPath,
+		"--disk", "stage1/rootfs", // relative to run/pods/uuid dir this is a place where systemd resides
+		// MACHINEID will be available as environment variable
+		"--params", strings.Join(driverConfiguration.KernelParams, " "),
+	}
+	return append(startCmd, kvmNetArgs(nds)...)
+}
+
+// kvmNetArgs returns additional arguments that need to be passed
+// to lkvm tool to configure networks properly. Logic is based on
+// network configuration extracted from Networking struct
+// and essentially from activeNets that expose NetDescriber behavior
+func kvmNetArgs(nds []kvm.NetDescriber) []string {
+	var lkvmArgs []string
+
+	for _, nd := range nds {
+		lkvmArgs = append(lkvmArgs, "--network")
+		lkvmArgs = append(
+			lkvmArgs,
+			fmt.Sprintf("mode=tap,tapif=%s,host_ip=%s,guest_ip=%s", nd.IfName(), nd.Gateway(), nd.GuestIP()),
+		)
+	}
+
+	return lkvmArgs
+}
diff --git a/stage1/init/kvm/network.go b/stage1/init/kvm/network.go
index 6724983fe3..2aaa420748 100644
--- a/stage1/init/kvm/network.go
+++ b/stage1/init/kvm/network.go
@@ -28,18 +28,17 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
-// GetNetworkDescriptions explicitly convert slice of activeNets to slice of netDescribers
-// which is slice required by GetKVMNetArgs
-func GetNetworkDescriptions(n *networking.Networking) []netDescriber {
-	var nds []netDescriber
+// GetNetworkDescriptions converts activeNets to netDescribers
+func GetNetworkDescriptions(n *networking.Networking) []NetDescriber {
+	var nds []NetDescriber
 	for _, an := range n.GetActiveNetworks() {
 		nds = append(nds, an)
 	}
 	return nds
 }
 
-// netDescriber is something that describes network configuration
-type netDescriber interface {
+// NetDescriber is the interface that describes a network configuration
+type NetDescriber interface {
 	GuestIP() net.IP
 	Mask() net.IP
 	IfName() string
@@ -53,7 +52,7 @@ type netDescriber interface {
 // to lkvm tool to configure networks properly.
 // Logic is based on Network configuration extracted from Networking struct
 // and essentially from activeNets that expose netDescriber behavior
-func GetKVMNetArgs(nds []netDescriber) ([]string, error) {
+func GetKVMNetArgs(nds []NetDescriber) ([]string, error) {
 
 	var lkvmArgs []string
 
@@ -103,8 +102,7 @@ func upInterfaceCommand(ifName string) string {
 	return fmt.Sprintf("/bin/ip link set dev %s up", ifName)
 }
 
-func GenerateNetworkInterfaceUnits(unitsPath string, netDescriptions []netDescriber) error {
-
+func GenerateNetworkInterfaceUnits(unitsPath string, netDescriptions []NetDescriber) error {
 	for i, netDescription := range netDescriptions {
 		ifName := fmt.Sprintf(networking.IfNamePattern, i)
 		netAddress := net.IPNet{
diff --git a/stage1/init/kvm/network_test.go b/stage1/init/kvm/network_test.go
index 16699d7fcf..6790a093a4 100644
--- a/stage1/init/kvm/network_test.go
+++ b/stage1/init/kvm/network_test.go
@@ -41,11 +41,11 @@ func (t testNetDescriber) Routes() []types.Route { return []types.Route{} }
 
 func TestGetKVMNetArgs(t *testing.T) {
 	tests := []struct {
-		netDescriptions []netDescriber
+		netDescriptions []NetDescriber
 		expectedLkvm    []string
 	}{
 		{ // without Masquerading - not gw passed to kernel
-			netDescriptions: []netDescriber{
+			netDescriptions: []NetDescriber{
 				testNetDescriber{
 					net.ParseIP("1.1.1.1"),
 					net.ParseIP("2.2.2.2"),
@@ -58,7 +58,7 @@ func TestGetKVMNetArgs(t *testing.T) {
 			expectedLkvm: []string{"--network", "mode=tap,tapif=fooInt,host_ip=1.1.1.1,guest_ip=2.2.2.2"},
 		},
 		{ // extra gw passed to kernel on (third position)
-			netDescriptions: []netDescriber{
+			netDescriptions: []NetDescriber{
 				testNetDescriber{
 					net.ParseIP("1.1.1.1"),
 					net.ParseIP("2.2.2.2"),
@@ -71,7 +71,7 @@ func TestGetKVMNetArgs(t *testing.T) {
 			expectedLkvm: []string{"--network", "mode=tap,tapif=barInt,host_ip=1.1.1.1,guest_ip=2.2.2.2"},
 		},
 		{ // two networks
-			netDescriptions: []netDescriber{
+			netDescriptions: []NetDescriber{
 				testNetDescriber{
 					net.ParseIP("1.1.1.1"),
 					net.ParseIP("2.2.2.2"),

From a29797fe6cc9a0bb54fc6d8564f71688a17f0027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Tue, 24 May 2016 17:20:32 +0200
Subject: [PATCH 0545/1304] KVM: Add none driver to prevent non-kvm flavors
 build problems

---
 stage1/init/kvm/hypervisor/none_driver.go | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 stage1/init/kvm/hypervisor/none_driver.go

diff --git a/stage1/init/kvm/hypervisor/none_driver.go b/stage1/init/kvm/hypervisor/none_driver.go
new file mode 100644
index 0000000000..9549b0e4f0
--- /dev/null
+++ b/stage1/init/kvm/hypervisor/none_driver.go
@@ -0,0 +1,24 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build hv_none
+
+package hypervisor
+
+import "github.com/coreos/rkt/stage1/init/kvm"
+
+// StartCmd always returns nil in case of no hypervisor is set.
+func StartCmd(wdPath, name, kernelPath string, nds []kvm.NetDescriber, cpu, mem int64, debug bool) []string {
+	return nil
+}

From 42e10e1bdf44cc49d95cca54c2d831207d3a0ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 14 Jul 2016 16:15:22 +0200
Subject: [PATCH 0546/1304] stage1/init: pass machine-id to lkvm

So the kvm flavor has the right machine ID (taken from the pod UUID).
---
 stage1/init/kvm/hypervisor/lkvm_driver.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/stage1/init/kvm/hypervisor/lkvm_driver.go b/stage1/init/kvm/hypervisor/lkvm_driver.go
index c1b2b4b812..b29468aea4 100644
--- a/stage1/init/kvm/hypervisor/lkvm_driver.go
+++ b/stage1/init/kvm/hypervisor/lkvm_driver.go
@@ -25,14 +25,17 @@ import (
 	"github.com/coreos/rkt/stage1/init/kvm"
 )
 
-// StartCmd takes path to stage1, name of the machine, path to kernel, network describers, memory in megabytes
-// and quantity of cpus and prepares command line to run LKVM process
-func StartCmd(wdPath, name, kernelPath string, nds []kvm.NetDescriber, cpu, mem int64, debug bool) []string {
+// StartCmd takes path to stage1, UUID of the pod, path to kernel, network
+// describers, memory in megabytes and quantity of cpus and prepares command
+// line to run LKVM process
+func StartCmd(wdPath, uuid, kernelPath string, nds []kvm.NetDescriber, cpu, mem int64, debug bool) []string {
+	machineID := strings.Replace(uuid, "-", "", -1)
 	driverConfiguration := KvmHypervisor{
 		Bin: "./lkvm",
 		KernelParams: []string{
 			"systemd.default_standard_error=journal+console",
 			"systemd.default_standard_output=journal+console",
+			"systemd.machine_id=" + machineID,
 		},
 	}
 
@@ -41,14 +44,13 @@ func StartCmd(wdPath, name, kernelPath string, nds []kvm.NetDescriber, cpu, mem
 	startCmd := []string{
 		filepath.Join(wdPath, driverConfiguration.Bin),
 		"run",
-		"--name", "rkt-" + name,
+		"--name", "rkt-" + uuid,
 		"--no-dhcp",
 		"--cpu", strconv.Itoa(int(cpu)),
 		"--mem", strconv.Itoa(int(mem)),
 		"--console=virtio",
 		"--kernel", kernelPath,
 		"--disk", "stage1/rootfs", // relative to run/pods/uuid dir this is a place where systemd resides
-		// MACHINEID will be available as environment variable
 		"--params", strings.Join(driverConfiguration.KernelParams, " "),
 	}
 	return append(startCmd, kvmNetArgs(nds)...)

From 395c0d707aa2a89e283840ab87ab8d028bf90b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 14 Jul 2016 16:16:03 +0200
Subject: [PATCH 0547/1304] stage1/init: link pod's journal in kvm flavor

In nspawn flavors, nspawn creates a symlink from
/var/log/journal/${machine-id} to the pod's journal directory. In kvm we
need to do the link ourselves.

Logs can be inspected like this:

```
$ journalctl -m _MACHINE_ID=${MACHINE_ID}
```

where MACHINE_ID is the pod UUID without the dashes.
---
 stage1/init/init.go | 18 ++++++++-----
 stage1/init/kvm.go  | 66 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index ae9c52eac7..1cebbd9c04 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -229,6 +229,12 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 		return nil, nil, fmt.Errorf("error writing %s, %s", hostnamePath, err)
 	}
 
+	// systemd-nspawn needs /etc/machine-id to link the container's journal
+	// to the host. Since systemd-v230, /etc/machine-id is mandatory, see
+	// https://github.com/systemd/systemd/commit/e01ff70a77e781734e1e73a2238af2e9bf7967a8
+	mPath := filepath.Join(common.Stage1RootfsPath(p.Root), "etc", "machine-id")
+	machineID := strings.Replace(p.UUID.String(), "-", "", -1)
+
 	switch flavor {
 	case "kvm":
 		if privateUsers != "" {
@@ -265,6 +271,10 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 			env = append(env, "HOME=/root")
 		}
 
+		if err := linkJournal(common.Stage1RootfsPath(p.Root), machineID); err != nil {
+			return nil, nil, errwrap.Wrap(errors.New("error linking pod's journal"), err)
+		}
+
 		return args, env, nil
 
 	case "coreos":
@@ -350,13 +360,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 		return nil, nil, fmt.Errorf("unrecognized stage1 flavor: %q", flavor)
 	}
 
-	// systemd-nspawn needs /etc/machine-id to link the container's journal
-	// to the host. Since systemd-v230, /etc/machine-id is mandatory, see
-	// https://github.com/systemd/systemd/commit/e01ff70a77e781734e1e73a2238af2e9bf7967a8
-	mPath := filepath.Join(common.Stage1RootfsPath(p.Root), "etc", "machine-id")
-	mID := strings.Replace(p.UUID.String(), "-", "", -1)
-
-	if err := ioutil.WriteFile(mPath, []byte(mID), 0644); err != nil {
+	if err := ioutil.WriteFile(mPath, []byte(machineID), 0644); err != nil {
 		log.FatalE("error writing /etc/machine-id", err)
 	}
 
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index 34ee9afb6b..cc9d5d8051 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
+	"github.com/coreos/go-systemd/util"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/networking"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
@@ -33,6 +34,8 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
+const journalDir = "/var/log/journal"
+
 // KvmNetworkingToSystemd generates systemd unit files for a pod according to network configuration
 func KvmNetworkingToSystemd(p *stage1commontypes.Pod, n *networking.Networking) error {
 	podRoot := common.Stage1RootfsPath(p.Root)
@@ -163,3 +166,66 @@ func KvmPrepareMounts(s1Root string, p *stage1commontypes.Pod) error {
 
 	return nil
 }
+
+func linkJournal(s1Root, machineID string) error {
+	if !util.IsRunningSystemd() {
+		return nil
+	}
+
+	absS1Root, err := filepath.Abs(s1Root)
+	if err != nil {
+		return err
+	}
+
+	// /var/log/journal doesn't exist on the host, don't do anything
+	if _, err := os.Stat(journalDir); os.IsNotExist(err) {
+		return nil
+	}
+
+	machineJournalDir := filepath.Join(journalDir, machineID)
+	podJournalDir := filepath.Join(absS1Root, machineJournalDir)
+
+	hostMachineID, err := util.GetMachineID()
+	if err != nil {
+		return err
+	}
+
+	// unlikely, machine ID is random (== pod UUID)
+	if hostMachineID == machineID {
+		return fmt.Errorf("host and pod machine IDs are equal (%s)", machineID)
+	}
+
+	fi, err := os.Lstat(machineJournalDir)
+	switch {
+	case os.IsNotExist(err):
+		// good, we'll create the symlink
+	case err != nil:
+		return err
+	// unlikely, machine ID is random (== pod UUID)
+	default:
+		if fi.IsDir() {
+			if err := os.Remove(machineJournalDir); err != nil {
+				return err
+			}
+		}
+
+		link, err := os.Readlink(machineJournalDir)
+		if err != nil {
+			return err
+		}
+
+		if link == podJournalDir {
+			return nil
+		} else {
+			if err := os.Remove(machineJournalDir); err != nil {
+				return err
+			}
+		}
+	}
+
+	if err := os.Symlink(podJournalDir, machineJournalDir); err != nil {
+		return err
+	}
+
+	return nil
+}

From 1f97f422ffd83511dab983b89f7fd4a2acab8415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 14 Jul 2016 17:07:41 +0200
Subject: [PATCH 0548/1304] stage1/init: silence systemd output on hypervisor

If we don't pass --debug. We do this on the nspawn flavors.
---
 stage1/init/kvm/hypervisor/hypervisor.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage1/init/kvm/hypervisor/hypervisor.go b/stage1/init/kvm/hypervisor/hypervisor.go
index da1beb8644..f4508d9eeb 100644
--- a/stage1/init/kvm/hypervisor/hypervisor.go
+++ b/stage1/init/kvm/hypervisor/hypervisor.go
@@ -38,6 +38,7 @@ func (hv *KvmHypervisor) InitKernelParams(isDebug bool) {
 	} else {
 		hv.KernelParams = append(hv.KernelParams, []string{
 			"systemd.show_status=false",
+			"systemd.log_target=null",
 			"rd.udev.log-priority=3",
 			"quiet=vga",
 			"quiet systemd.log_level=emerg",

From d16776a3f1adbd22ee80c1a9c2edf419184b0413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 14 Jul 2016 18:52:13 +0200
Subject: [PATCH 0549/1304] functional tests: add a journal linking test

---
 tests/rkt_journal_test.go | 64 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 tests/rkt_journal_test.go

diff --git a/tests/rkt_journal_test.go b/tests/rkt_journal_test.go
new file mode 100644
index 0000000000..127f0f990f
--- /dev/null
+++ b/tests/rkt_journal_test.go
@@ -0,0 +1,64 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src kvm
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	sd_util "github.com/coreos/go-systemd/util"
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+const journalDir = "/var/log/journal"
+
+func TestJournalLink(t *testing.T) {
+	if !sd_util.IsRunningSystemd() {
+		t.Skip("Systemd is not running on the host.")
+	}
+
+	if _, err := os.Stat(journalDir); os.IsNotExist(err) {
+		t.Skip("Persistent journaling disabled.")
+	}
+
+	image := getInspectImagePath()
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	rktCmd := fmt.Sprintf("%s prepare --insecure-options=image %s", ctx.Cmd(), image)
+	uuid := runRktAndGetUUID(t, rktCmd)
+
+	rktCmd = fmt.Sprintf("%s run-prepared %s", ctx.Cmd(), uuid)
+	spawnAndWaitOrFail(t, rktCmd, 0)
+
+	machineID := strings.Replace(uuid, "-", "", -1)
+	journalPath := filepath.Join("/var/log/journal", machineID)
+
+	link, err := os.Readlink(journalPath)
+	if err != nil {
+		t.Fatalf("failed to read journal link %q", journalPath)
+	}
+
+	podJournal := filepath.Join(ctx.DataDir(), "pods/run", uuid, "stage1/rootfs/var/log/journal/", machineID)
+	if link != podJournal {
+		t.Fatalf("unexpected target of journal link: %q. Expected %q", link, podJournal)
+	}
+}

From 6b738bee45015077bb35cdc88b29977da6a82da7 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Tue, 12 Jul 2016 17:59:32 -0700
Subject: [PATCH 0550/1304] rkt: Add --cpuprofile and --memprofile to enable
 profiling rkt.

These are hidden flags, so users will not find them in the help.
---
 rkt/rkt.go | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/rkt/rkt.go b/rkt/rkt.go
index 775d768243..548ec4b91a 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -19,6 +19,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"runtime/pprof"
 	"text/tabwriter"
 
 	"github.com/coreos/rkt/common"
@@ -128,6 +129,10 @@ var (
 		Help               bool
 		InsecureFlags      *rktflag.SecFlags
 		TrustKeysFromHTTPS bool
+
+		// Hidden flags for profiling.
+		CPUProfile string
+		MemProfile string
 	}{
 		Dir:             defaultDataDir,
 		SystemConfigDir: common.DefaultSystemConfigDir,
@@ -171,6 +176,10 @@ func init() {
 			globalFlags.InsecureFlags.PermissibleString()))
 	cmdRkt.PersistentFlags().BoolVar(&globalFlags.TrustKeysFromHTTPS, "trust-keys-from-https",
 		false, "automatically trust gpg keys fetched from https")
+	cmdRkt.PersistentFlags().StringVar(&globalFlags.CPUProfile, "cpuprofile", "", "write CPU profile to the file")
+	cmdRkt.PersistentFlags().MarkHidden("cpuprofile")
+	cmdRkt.PersistentFlags().StringVar(&globalFlags.MemProfile, "memprofile", "", "write memory profile to the file")
+	cmdRkt.PersistentFlags().MarkHidden("memprofile")
 
 	// Run this before the execution of each subcommand to set up output
 	cmdRkt.PersistentPreRun = func(cmd *cobra.Command, args []string) {
@@ -189,11 +198,47 @@ func getTabOutWithWriter(writer io.Writer) *tabwriter.Writer {
 	return aTabOut
 }
 
+func startProfile() (cpufile *os.File, memfile *os.File, err error) {
+	if globalFlags.CPUProfile != "" {
+		cpufile, err = os.Create(globalFlags.CPUProfile)
+		if err != nil {
+			return nil, nil, fmt.Errorf("cannot create cpu profile file %q: %v", globalFlags.CPUProfile, err)
+		}
+		pprof.StartCPUProfile(cpufile)
+	}
+	if globalFlags.MemProfile != "" {
+		memfile, err = os.Create(globalFlags.MemProfile)
+		if err != nil {
+			return nil, nil, fmt.Errorf("cannot create memory profile file %q: %v", globalFlags.MemProfile, err)
+		}
+	}
+	return cpufile, memfile, nil
+}
+
+func stopProfile(cpuprofile, memprofile *os.File) {
+	if globalFlags.CPUProfile != "" {
+		pprof.StopCPUProfile()
+		cpuprofile.Close()
+	}
+	if globalFlags.MemProfile != "" {
+		pprof.WriteHeapProfile(memprofile)
+		memprofile.Close()
+	}
+}
+
 // runWrapper returns a func(cmd *cobra.Command, args []string) that internally
 // will add command function return code and the reinsertion of the "--" flag
 // terminator.
 func runWrapper(cf func(cmd *cobra.Command, args []string) (exit int)) func(cmd *cobra.Command, args []string) {
 	return func(cmd *cobra.Command, args []string) {
+		cpufile, memfile, err := startProfile()
+		if err != nil {
+			stderr.PrintE("cannot setup profiling", err)
+			cmdExitCode = 1
+			return
+		}
+		defer stopProfile(cpufile, memfile)
+
 		cmdExitCode = cf(cmd, args)
 	}
 }

From 6a9ef420987cf9315ddcca73e0850fdbf77b50ae Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 7 Jul 2016 12:05:29 -0700
Subject: [PATCH 0551/1304] Documentation: Add documentation about profiling.

---
 Documentation/commands.md                      |  2 ++
 .../{benchmarks => performance}/README.md      | 18 ++++++++++++++++++
 .../rkt-1-4-0-benchmarks.md                    |  6 +++---
 3 files changed, 23 insertions(+), 3 deletions(-)
 rename Documentation/{benchmarks => performance}/README.md (66%)
 rename Documentation/{benchmarks => performance}/rkt-1-4-0-benchmarks.md (95%)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 2dccab7551..66739bbf0e 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -72,10 +72,12 @@ In addition to the flags used by individual `rkt` commands, `rkt` has a set of g
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
+| `--cpuprofile (hidden flag)` | `` | A file path | Write CPU profile to the file |
 | `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
 | `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
 | `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**pubkey**: Allow fetching pubkeys via insecure connections (via HTTP connections or from servers with unverified certificates). This slightly extends the meaning of the `--trust-keys-from-https` flag.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
 | `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
+| `--memprofile (hidden flag)` | `` | A file path | Write memory profile to the file |
 | `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
 | `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from HTTPS (or HTTP if the insecure `pubkey` option is also specified) |
 | `--user-config` |  `` | A directory path | Path to the user configuration directory |
diff --git a/Documentation/benchmarks/README.md b/Documentation/performance/README.md
similarity index 66%
rename from Documentation/benchmarks/README.md
rename to Documentation/performance/README.md
index f626b571a2..c376f35872 100644
--- a/Documentation/benchmarks/README.md
+++ b/Documentation/performance/README.md
@@ -29,3 +29,21 @@ temporary directory with `rkt_benchmark` prefix, `-v` will print out the current
 resource usage of each process every second. `-d` can be used to specify a
 duration to run the tests for (default of 10s). For example, `-d 30s` will run
 the tests for 30 seconds.
+
+# Profiling
+
+rkt will provide two hidden global flags `--cpuprofile` and `--memprofile` that can be used for performance profiling.
+Setting `--cpuprofile=$FILE` will make rkt write down the CPU profiles to the `$FILE`.
+Setting `--memprofile=$FILE` will make rkt write down the Memory profile to the `$FILE`.
+Note that memory profile will only be written down before rkt exits, so during the execution
+of rkt, the memory profile will be empty.
+
+The profile result can be viewed by go's profiling tool, for example:
+
+```shell
+$ sudo /usr/bin/rkt --cpuprofile=/tmp/cpu.profile --memprofile=/tmp/mem.profile gc --grace-period=0
+$ go tool pprof /usr/bin/rkt /tmp/cpu.profile
+$ go tool pprof /usr/bin/rkt /tmp/mem.profile
+```
+
+For more profiling tips, please see https://blog.golang.org/profiling-go-programs
diff --git a/Documentation/benchmarks/rkt-1-4-0-benchmarks.md b/Documentation/performance/rkt-1-4-0-benchmarks.md
similarity index 95%
rename from Documentation/benchmarks/rkt-1-4-0-benchmarks.md
rename to Documentation/performance/rkt-1-4-0-benchmarks.md
index 1bbffa3488..ff233fe328 100644
--- a/Documentation/benchmarks/rkt-1-4-0-benchmarks.md
+++ b/Documentation/performance/rkt-1-4-0-benchmarks.md
@@ -4,7 +4,7 @@ model name  : Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz
 model name  : Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz
 model name  : Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz
 model name  : Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz
-derek@proton ~> uname -a                             
+derek@proton ~> uname -a
 Linux proton 4.4.6 #1-NixOS SMP Wed Mar 16 15:43:17 UTC 2016 x86_64 GNU/Linux
 ```
 
@@ -25,7 +25,7 @@ container stop time: 17332926ns
 
 ### mem-stresser.aci
 ```
-derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor mem-stresser.aci 
+derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor mem-stresser.aci
 worker(18634): seconds alive: 9  avg CPU: 98.550401%  avg Mem: 318 mB  peak Mem: 555 mB
 rkt(18599): seconds alive: 10  avg CPU: 3.583814%  avg Mem: 2 mB  peak Mem: 2 mB
 systemd(18628): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
@@ -37,7 +37,7 @@ container stop time: 17593446ns
 
 ### cpu-stresser.aci
 ```
-derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor cpu-stresser.aci 
+derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor cpu-stresser.aci
 rkt(18706): seconds alive: 10  avg CPU: 3.587050%  avg Mem: 2 mB  peak Mem: 2 mB
 systemd(18736): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(18740): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB

From 7c9249c43b945c275e8576e42a710a566b2ceb7c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 12 Jul 2016 18:14:34 +0200
Subject: [PATCH 0552/1304] docs: document capabilities overriding

This commit introduces a new section in the capabilities guide,
showing how to override capabilities (both on-the-fly at runtime
and by patching images).
---
 Documentation/capabilities-guide.md | 106 +++++++++++++++++++++++++++-
 1 file changed, 103 insertions(+), 3 deletions(-)

diff --git a/Documentation/capabilities-guide.md b/Documentation/capabilities-guide.md
index 4dec8194cd..470906ccd9 100644
--- a/Documentation/capabilities-guide.md
+++ b/Documentation/capabilities-guide.md
@@ -7,6 +7,7 @@ This document is a walk-through guide describing how to use rkt isolators for
 * [Default Capabilities](#default-capabilities)
 * [Capability Isolators](#capability-isolators)
 * [Usage Example](#usage-example)
+* [Overriding Capabilities](#overriding-capabilities)
 * [Recommendations](#recommendations)
 
 ## About Linux Capabilities
@@ -210,9 +211,9 @@ For example, using `nc` to bind to port 80 will now result in a failure due to
 the missing `CAP_NET_BIND_SERVICE` capability:
 
 ```
-$ sudo rkt run --interactive --insecure-options=image caps-remove-set-example.aci
+$ sudo rkt run --interactive --insecure-options=image caps-retain-set-example.aci
 image: using image from file stage1-coreos.aci
-image: using image from file caps-remove-set-example.aci
+image: using image from file caps-retain-set-example.aci
 image: using image from local store for image name quay.io/coreos/alpine-sh
 
 / # whoami
@@ -222,6 +223,105 @@ root
 nc: bind: Permission denied
 ```
 
+## Overriding capabilities
+
+Capability sets are typically defined when creating images, as they are tightly
+linked to specific app requirements. However, image consumers may need to further
+tweak/restrict the set of available capabilities in specific local scenarios.
+This can be done either by permanently patching the manifest of specific images, or
+by overriding capability isolators with command line options.
+
+### Patching images
+
+Image manifests can be manipulated manually, by unpacking the image and editing
+the manifest file, or with helper tools like `actool`.
+To override an image's pre-defined capabilities set, replace the existing capabilities
+isolators in the image with new isolators defining the desired capabilities.
+
+The `patch-manifest` subcommand to `actool` manipulates the capabilities sets
+defined in an image.
+`actool patch-manifest --capability` changes the `retain` capabilities set.
+`actool patch-manifest --revoke-capability` changes the `remove` set.
+These commands take an input image, modify its existing capabilities sets, and
+write the changes to an output image, as shown in the example:
+
+```
+$ actool cat-manifest caps-retain-set-example.aci
+...
+    "isolators": [
+      {
+        "name": "os/linux/capabilities-retain-set",
+        "value": {
+          "set": [
+            "CAP_NET_RAW"
+          ]
+        }
+      }
+    ]
+...
+
+$ actool patch-manifest -capability CAP_NET_RAW,CAP_NET_BIND_SERVICE caps-retain-set-example.aci caps-retain-set-patched.aci
+
+$ actool cat-manifest caps-retain-set-patched.aci
+...
+    "isolators": [
+      {
+        "name": "os/linux/capabilities-retain-set",
+        "value": {
+          "set": [
+            "CAP_NET_RAW",
+            "CAP_NET_BIND_SERVICE"
+          ]
+        }
+      }
+    ]
+...
+
+```
+
+Now run the image to check that the `CAP_NET_BIND_SERVICE` capability added to
+the patched image is retained as expected by using `nc` to listen on a
+"privileged" port:
+
+```
+$ sudo rkt run --interactive --insecure-options=image caps-retain-set-patched.aci
+image: using image from file stage1-coreos.aci
+image: using image from file caps-retain-set-patched.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # nc -v -l -p 80
+listening on [::]:80 ...
+```
+
+### Overriding capabilities at run-time
+
+Capabilities can be directly overridden at run time from the command-line,
+without changing the executed images.
+The `--cap-retain` option to `rkt run` manipulates the `retain` capabilities set.
+The `--cap-remove` option manipulates the `remove` set.
+
+Capabilities isolators can be added on the command line at run time by
+specifying the desired overriding set, as shown in this example:
+
+```
+$ sudo rkt run --interactive quay.io/coreos/alpine-sh --cap-retain CAP_NET_BIND_SERVICE
+image: using image from file /usr/local/bin/stage1-coreos.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # ping -c 1 8.8.8.8
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+ping: permission denied (are you root?)
+
+```
+
+Capability sets are application-specific configuration entries, and in a
+`rkt run` command line, they must follow the application container image to
+which they apply.
+Each application within a pod can have different capability sets.
+
 ## Recommendations
 
 As with most security features, capability isolators may require some
@@ -236,5 +336,5 @@ set of capabilities requirements and follow best practices:
  3. Avoid granting overly generic capabilities. For example, `CAP_SYS_ADMIN` and
     `CAP_SYS_PTRACE` are typically bad choices, as they open large attack
     surfaces.
- 4. Prefer a blacklisting approach, trying to keep the "retain-set" as small as
+ 4. Prefer a whitelisting approach, trying to keep the "retain-set" as small as
     possible.

From 97f981f2373cd97d2d5517915bd655ed02cf9a66 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Mon, 18 Jul 2016 16:05:22 +0200
Subject: [PATCH 0553/1304] functional test: check presence of `\n` in PATH
 variable.

This patch implements the test for https://github.com/coreos/rkt/pull/2901,
it tests that `$PATH` does not contain `\n`.

This fixes https://github.com/coreos/rkt/issues/2905
Related to https://github.com/coreos/rkt/issues/2893

This patch also introduces the `--check-path` flag in `inspect.go` to carry out the test.
---
 tests/inspect/inspect.go | 28 ++++++++++++++++++++++++++++
 tests/rkt_env_test.go    |  9 +++++++++
 2 files changed, 37 insertions(+)

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index b8140233e2..5b33d085ca 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -42,6 +42,7 @@ var (
 	globalFlags   = struct {
 		ReadStdin          bool
 		CheckTty           bool
+		CheckPath          bool
 		PrintExec          bool
 		PrintMsg           string
 		SuffixMsg          string
@@ -83,6 +84,7 @@ var (
 func init() {
 	globalFlagset.BoolVar(&globalFlags.ReadStdin, "read-stdin", false, "Read a line from stdin")
 	globalFlagset.BoolVar(&globalFlags.CheckTty, "check-tty", false, "Check if stdin is a terminal")
+	globalFlagset.BoolVar(&globalFlags.CheckPath, "check-path", false, "Check if environment variable PATH does not contain \\n")
 	globalFlagset.BoolVar(&globalFlags.PrintExec, "print-exec", false, "Print the command we were execed as (i.e. argv[0])")
 	globalFlagset.StringVar(&globalFlags.PrintMsg, "print-msg", "", "Print the message given as parameter")
 	globalFlagset.StringVar(&globalFlags.SuffixMsg, "suffix-msg", "", "Print this suffix after some commands")
@@ -178,6 +180,32 @@ func main() {
 		}
 	}
 
+	if globalFlags.CheckPath {
+		envBytes, err := ioutil.ReadFile("/proc/self/environ")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error reading environment from \"/proc/self/environ\": %v\n", err)
+			os.Exit(1)
+		}
+		for _, v := range bytes.Split(envBytes, []byte{0}) {
+			if len(v) == 0 {
+				continue
+			}
+			if strings.HasPrefix(string(v), "PATH=") {
+				if strings.Contains(string(v), "\n") {
+					fmt.Fprintf(os.Stderr, "Malformed PATH: found new line")
+					os.Exit(1)
+				} else {
+					fmt.Printf("PATH is good\n")
+					os.Exit(0)
+				}
+			} else {
+				continue
+			}
+		}
+		fmt.Fprintf(os.Stderr, "PATH not found")
+		os.Exit(1)
+	}
+
 	if globalFlags.PrintExec {
 		fmt.Fprintf(os.Stdout, "inspect execed as: %s\n", os.Args[0])
 	}
diff --git a/tests/rkt_env_test.go b/tests/rkt_env_test.go
index a1f3ba1316..fc244ca0ce 100644
--- a/tests/rkt_env_test.go
+++ b/tests/rkt_env_test.go
@@ -90,6 +90,12 @@ var envTests = []struct {
 		`/bin/sh -c "^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --interactive --set-env-file=env_file_test.conf ^SLEEP^"`,
 		`/bin/sh -c "^RKT_BIN^ --debug enter $(^RKT_BIN^ list --full|grep running|awk '{print $1}') /inspect --print-env=VAR_OTHER"`,
 	},
+	{
+		`/bin/sh -c "^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --set-env-file=env_file_test.conf ^CHECK_PATH^"`,
+		"PATH is good",
+		`/bin/sh -c "^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --interactive --set-env-file=env_file_test.conf ^SLEEP^"`,
+		`/bin/sh -c "^RKT_BIN^ --debug enter $(^RKT_BIN^ list --full|grep running|awk '{print $1}') /inspect --check-path"`,
+	},
 }
 
 func TestEnv(t *testing.T) {
@@ -99,6 +105,8 @@ func TestEnv(t *testing.T) {
 	defer os.Remove(printVarOtherImage)
 	printTermHostImage := patchTestACI("rkt-inspect-print-term-host.aci", "--exec=/inspect --print-env=TERM")
 	defer os.Remove(printTermHostImage)
+	checkPathImage := patchTestACI("rkt-inspect-check-path.aci", "--exec=/inspect --check-path")
+	defer os.Remove(checkPathImage)
 	sleepImage := patchTestACI("rkt-inspect-sleep.aci", "--exec=/inspect --read-stdin")
 	defer os.Remove(sleepImage)
 	ctx := testutils.NewRktRunCtx()
@@ -111,6 +119,7 @@ func TestEnv(t *testing.T) {
 		fixed = strings.Replace(fixed, "^PRINT_VAR_FROM_MANIFEST^", printVarFromManifestImage, -1)
 		fixed = strings.Replace(fixed, "^PRINT_VAR_OTHER^", printVarOtherImage, -1)
 		fixed = strings.Replace(fixed, "^PRINT_TERM_HOST^", printTermHostImage, -1)
+		fixed = strings.Replace(fixed, "^CHECK_PATH^", checkPathImage, -1)
 		fixed = strings.Replace(fixed, "^SLEEP^", sleepImage, -1)
 		fixed = strings.Replace(fixed, "^HOST_TERM^", term, -1)
 		return fixed

From 9f40659fee724e180ea97e39a59aa13bbf0a4fd0 Mon Sep 17 00:00:00 2001
From: Lukas Redynk <lukasz.redynk@intel.com>
Date: Wed, 20 Jul 2016 12:47:47 +0200
Subject: [PATCH 0554/1304] rkt-monitor: fix build issues

* Fix to build issue introduced with glide? (BINDIR -> TARGET_BIN
* Fix to build issue with rkt v1.10
---
 tests/rkt-monitor/build-stresser.sh | 2 +-
 tools/cpu-stresser.mk               | 2 +-
 tools/log-stresser.mk               | 2 +-
 tools/mem-stresser.mk               | 2 +-
 tools/rkt-monitor.mk                | 2 +-
 tools/sleeper.mk                    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 1bc66ab2d6..8575651473 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -28,7 +28,7 @@ trap acbuildEnd EXIT
 
 acbuild --debug set-name appc.io/rkt-"${1}"-stresser
 
-acbuild --debug copy build-rkt-1.8.0+git/bin/"${1}"-stresser /worker
+acbuild --debug copy build-rkt-1.10.0+git/target/bin/"${1}"-stresser /worker
 
 acbuild --debug set-exec -- /worker
 
diff --git a/tools/cpu-stresser.mk b/tools/cpu-stresser.mk
index f78fbebedd..d137a20066 100644
--- a/tools/cpu-stresser.mk
+++ b/tools/cpu-stresser.mk
@@ -1,7 +1,7 @@
 $(call setup-stamp-file,CPU_STRESSER_STAMP)
 
 # variables for makelib/build_go_bin.mk
-CPU_STRESSER := $(BINDIR)/cpu-stresser
+CPU_STRESSER := $(TARGET_BINDIR)/cpu-stresser
 BGB_STAMP := $(CPU_STRESSER_STAMP)
 BGB_PKG_IN_REPO := tests/rkt-monitor/cpu-stresser
 BGB_BINARY := $(CPU_STRESSER)
diff --git a/tools/log-stresser.mk b/tools/log-stresser.mk
index 21c3b4fa5a..4aac625db7 100644
--- a/tools/log-stresser.mk
+++ b/tools/log-stresser.mk
@@ -1,7 +1,7 @@
 $(call setup-stamp-file,LOG_STRESSER_STAMP)
 
 # variables for makelib/build_go_bin.mk
-LOG_STRESSER := $(BINDIR)/log-stresser
+LOG_STRESSER := $(TARGET_BINDIR)/log-stresser
 BGB_STAMP := $(LOG_STRESSER_STAMP)
 BGB_PKG_IN_REPO := tests/rkt-monitor/log-stresser
 BGB_BINARY := $(LOG_STRESSER)
diff --git a/tools/mem-stresser.mk b/tools/mem-stresser.mk
index c66331f3d7..355713f5de 100644
--- a/tools/mem-stresser.mk
+++ b/tools/mem-stresser.mk
@@ -1,7 +1,7 @@
 $(call setup-stamp-file,MEM_STRESSER_STAMP)
 
 # variables for makelib/build_go_bin.mk
-MEM_STRESSER := $(BINDIR)/mem-stresser
+MEM_STRESSER := $(TARGET_BINDIR)/mem-stresser
 BGB_STAMP := $(MEM_STRESSER_STAMP)
 BGB_PKG_IN_REPO := tests/rkt-monitor/mem-stresser
 BGB_BINARY := $(MEM_STRESSER)
diff --git a/tools/rkt-monitor.mk b/tools/rkt-monitor.mk
index d6fa0db1b7..83f7858031 100644
--- a/tools/rkt-monitor.mk
+++ b/tools/rkt-monitor.mk
@@ -1,7 +1,7 @@
 $(call setup-stamp-file,RKT_MONITOR_STAMP)
 
 # variables for makelib/build_go_bin.mk
-RKT_MONITOR := $(BINDIR)/rkt-monitor
+RKT_MONITOR := $(TARGET_BINDIR)/rkt-monitor
 BGB_STAMP := $(RKT_MONITOR_STAMP)
 BGB_PKG_IN_REPO := tests/rkt-monitor
 BGB_BINARY := $(RKT_MONITOR)
diff --git a/tools/sleeper.mk b/tools/sleeper.mk
index ae028aaa2c..68c6a6c56f 100644
--- a/tools/sleeper.mk
+++ b/tools/sleeper.mk
@@ -1,7 +1,7 @@
 $(call setup-stamp-file,SLEEPER_STAMP)
 
 # variables for makelib/build_go_bin.mk
-SLEEPER := $(BINDIR)/sleeper
+SLEEPER := $(TARGET_BINDIR)/sleeper
 BGB_STAMP := $(SLEEPER_STAMP)
 BGB_PKG_IN_REPO := tests/rkt-monitor/sleeper
 BGB_BINARY := $(SLEEPER)

From 23ce50eaa7b01585ecb76b543990c8721739fd42 Mon Sep 17 00:00:00 2001
From: Lukas Redynk <lukasz.redynk@intel.com>
Date: Wed, 20 Jul 2016 12:48:35 +0200
Subject: [PATCH 0555/1304] rkt-monitor: new flags

* New flag: output-dir, output CSV files will be placed there
* New flag: rkt-dir: directory with rkt binary
* New flag: stage1-path: which flavor use in tests
* CSV output filename now contains date, time and flavor
* Flag "--to-file" won't suppress printing summary on stdout
---
 tests/rkt-monitor/README.md |  7 +++--
 tests/rkt-monitor/main.go   | 54 +++++++++++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/tests/rkt-monitor/README.md b/tests/rkt-monitor/README.md
index 94cbc51575..9cc2471d16 100644
--- a/tests/rkt-monitor/README.md
+++ b/tests/rkt-monitor/README.md
@@ -15,6 +15,9 @@ rkt-monitor mem-stresser.aci -v -d 30s
 
 Flags:
   -f, --to-file[=false]: Save benchmark results to files in a temp dir
+  -w, --output-dir="/tmp": Specify directory to write results
+  -p, --rkt-dir="": Directory with rkt binary
+  -s, --stage1-path="": Path to Stage1 image to use, default: coreos
   -d, --duration="10s": How long to run the ACI
   -h, --help[=false]: help for rkt-monitor
   -r, --repetitions=1: Numbers of benchmark repetitions
@@ -28,7 +31,7 @@ attempt to eat up resources in different ways.
 An example usage:
 
 ```
-derek@rokot ~/go/src/github.com/coreos/rkt> ./tests/rkt-monitor/build-stresser.sh log
+$ ./tests/rkt-monitor/build-stresser.sh log
 Building worker...
 Beginning build with an empty ACI
 Setting name of ACI to appc.io/rkt-log-stresser
@@ -36,7 +39,7 @@ Copying host:worker-binary to aci:/worker
 Setting exec command [/worker]
 Writing ACI to log-stresser.aci
 Ending the build
-derek@rokot ~/go/src/github.com/coreos/rkt> sudo ./build-rkt-1.8.0+git/bin/rkt-monitor log-stresser.aci 
+$ sudo ./build-rkt-1.10.0+git/target/bin/rkt-monitor log-stresser.aci 
 [sudo] password for derek: 
 rkt(13261): seconds alive: 10  avg CPU: 33.113897%  avg Mem: 4 kB  peak Mem: 4 kB
 systemd(13302): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
diff --git a/tests/rkt-monitor/main.go b/tests/rkt-monitor/main.go
index 0803ece332..158fdd33db 100644
--- a/tests/rkt-monitor/main.go
+++ b/tests/rkt-monitor/main.go
@@ -19,10 +19,10 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/signal"
+	"path/filepath"
 	"strconv"
 	"time"
 
@@ -48,7 +48,10 @@ var (
 	flagDuration         string
 	flagShowOutput       bool
 	flagSaveToCsv        bool
+	flagCsvDir           string
 	flagRepetitionNumber int
+	flagRktDir           string
+	flagStage1Path       string
 
 	cmdRktMonitor = &cobra.Command{
 		Use:     "rkt-monitor IMAGE",
@@ -66,6 +69,9 @@ func init() {
 	cmdRktMonitor.Flags().StringVarP(&flagDuration, "duration", "d", "10s", "How long to run the ACI")
 	cmdRktMonitor.Flags().BoolVarP(&flagShowOutput, "show-output", "o", false, "Display rkt's stdout and stderr")
 	cmdRktMonitor.Flags().BoolVarP(&flagSaveToCsv, "to-file", "f", false, "Save benchmark results to files in a temp dir")
+	cmdRktMonitor.Flags().StringVarP(&flagCsvDir, "output-dir", "w", "/tmp", "Specify directory to write results")
+	cmdRktMonitor.Flags().StringVarP(&flagRktDir, "rkt-dir", "p", "", "Directory with rkt binary")
+	cmdRktMonitor.Flags().StringVarP(&flagStage1Path, "stage1-path", "s", "", "Path to Stage1 image to use")
 
 	flag.Parse()
 }
@@ -105,6 +111,13 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 		podManifest = true
 	}
 
+	var flavorType string
+	if flagStage1Path == "" {
+		flavorType = "stage1-coreos.aci"
+	} else {
+		_, flavorType = filepath.Split(flagStage1Path)
+	}
+
 	var execCmd *exec.Cmd
 	var loadAvg *load.AvgStat
 	var containerStarting, containerStarted, containerStopping, containerStopped time.Time
@@ -112,14 +125,31 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 	records := [][]string{{"Time", "PID name", "PID number", "RSS", "CPU"}}             // csv headers
 	summaryRecords := [][]string{{"Load1", "Load5", "Load15", "StartTime", "StopTime"}} // csv summary headers
 
+	var rktBinary string
+	if flagRktDir != "" {
+		rktBinary = flagRktDir + "/rkt"
+	} else {
+		rktBinary = "rkt"
+	}
+
 	for i := 0; i < flagRepetitionNumber; i++ {
 		containerStarting = time.Now()
 
+		// build argument list for execCmd
+		argv := []string{"run"}
+
+		if flagStage1Path != "" {
+			argv = append(argv, fmt.Sprintf("--stage1-path=%v", flagStage1Path))
+		}
+
 		if podManifest {
-			execCmd = exec.Command("rkt", "run", "--pod-manifest", args[0], "--net=default-restricted")
+			argv = append(argv, "--pod-manifest", args[0])
 		} else {
-			execCmd = exec.Command("rkt", "run", args[0], "--insecure-options=image", "--net=default-restricted")
+			argv = append(argv, args[0], "--insecure-options=image")
 		}
+		argv = append(argv, "--net=default-restricted")
+
+		execCmd = exec.Command(rktBinary, argv...)
 
 		if flagShowOutput {
 			execCmd.Stdout = os.Stdout
@@ -216,19 +246,21 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 				strconv.FormatFloat(loadAvg.Load15, 'g', 3, 64),
 				strconv.FormatInt(containerStarted.Sub(containerStarting).Nanoseconds(), 10),
 				strconv.FormatInt(containerStopped.Sub(containerStopping).Nanoseconds(), 10)})
-		} else {
-			fmt.Printf("load average: Load1: %f Load5: %f Load15: %f\n", loadAvg.Load1, loadAvg.Load5, loadAvg.Load15)
-			fmt.Printf("container start time: %dns\n", containerStarted.Sub(containerStarting).Nanoseconds())
-			fmt.Printf("container stop time: %dns\n", containerStopped.Sub(containerStopping).Nanoseconds())
 		}
+
+		fmt.Printf("load average: Load1: %f Load5: %f Load15: %f\n", loadAvg.Load1, loadAvg.Load5, loadAvg.Load15)
+		fmt.Printf("container start time: %dns\n", containerStarted.Sub(containerStarting).Nanoseconds())
+		fmt.Printf("container stop time: %dns\n", containerStopped.Sub(containerStopping).Nanoseconds())
 	}
 
+	t := time.Now()
+	prefix := fmt.Sprintf("%d-%02d-%02d_%02d-%02d_%s_", t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), flavorType)
 	if flagSaveToCsv {
-		err = saveRecords(records, "rkt_benchmark_interval_")
+		err = saveRecords(records, flagCsvDir, prefix+"rkt_benchmark_interval.csv")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Can't write to a file: %v\n", err)
 		}
-		err = saveRecords(summaryRecords, "rkt_benchmark_summary_")
+		err = saveRecords(summaryRecords, flagCsvDir, prefix+"rkt_benchmark_summary.csv")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Can't write to a summary file: %v\n", err)
 		}
@@ -352,8 +384,8 @@ func addRecords(statuses []*ProcessStatus, records [][]string) [][]string {
 	return records
 }
 
-func saveRecords(records [][]string, prefix string) error {
-	csvFile, err := ioutil.TempFile("", prefix)
+func saveRecords(records [][]string, dir, filename string) error {
+	csvFile, err := os.Create(filepath.Join(dir, filename))
 	defer csvFile.Close()
 	if err != nil {
 		return err

From 1cf09ba69c9c46490fe966af79caa53f6731d0c0 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomashipp@gmail.com>
Date: Tue, 19 Jul 2016 19:07:17 +0200
Subject: [PATCH 0556/1304] build,stage1/init: set interpBin at build time

Remove architecture-specific stage1/init files containing the
`interpBin` constant since this breaks other architectures (e.g. x86)
because of the missing constant.

Instead, declare the variable in init.go, and set the appropriate
value at build time.

Signed-off-by: Thomas Hipp <thipp@suse.de>
---
 Makefile.in                     |  2 ++
 configure.ac                    | 17 +++++++++++++++++
 stage1/init/init.go             |  1 +
 stage1/init/init.mk             |  4 +++-
 stage1/init/init_linux_amd64.go | 22 ----------------------
 stage1/init/init_linux_arm64.go | 22 ----------------------
 6 files changed, 23 insertions(+), 45 deletions(-)
 delete mode 100644 stage1/init/init_linux_amd64.go
 delete mode 100644 stage1/init/init_linux_arm64.go

diff --git a/Makefile.in b/Makefile.in
index 8cd8c7a333..a839644490 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,6 +44,7 @@ RKT_LOCAL_COREOS_PXE_IMAGE_PATH := @RKT_LOCAL_COREOS_PXE_IMAGE_PATH@
 RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER := @RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER@
 
 RKT_STAGE1_COREOS_BOARD := @RKT_STAGE1_COREOS_BOARD@
+RKT_STAGE1_COREOS_INTERPRETER := @RKT_STAGE1_COREOS_INTERPRETER@
 
 # defines for enter
 RKT_DEFINES_FOR_ENTER := @RKT_DEFINES_FOR_ENTER@
@@ -59,6 +60,7 @@ RKT_STAGE1_DEFAULT_VERSION_LDFLAGS := @RKT_STAGE1_DEFAULT_VERSION_LDFLAGS@
 RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS := @RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS@
 RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS := @RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS@
 RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS := @RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS@
+RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS := @RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS@
 RKT_VERSION_LDFLAGS := @RKT_VERSION_LDFLAGS@
 RKT_FEATURES_LDFLAGS := @RKT_FEATURES_LDFLAGS@
 
diff --git a/configure.ac b/configure.ac
index c84d3efab9..089074ea8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -577,6 +577,14 @@ AS_CASE([${RKT_ACI_ARCH}],
                            [AC_MSG_ERROR([*** ${RKT_ACI_ARCH}: no arch support for stage1 flavors {coreos,kvm}])],
                            [AC_MSG_WARN([* ${RKT_ACI_ARCH}: unsupported arch])])])
 
+# Set the path to the interpreter binary for coreos flavor.
+RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos],
+                  [AS_CASE([${RKT_ACI_ARCH}],
+                           [aarch64],
+                                    [RKT_STAGE1_COREOS_INTERPRETER="/usr/lib/ld-linux-aarch64.so.1"],
+                           [amd64],
+                                    [RKT_STAGE1_COREOS_INTERPRETER="/usr/lib/ld-linux-x86-64.so.2"])])
+
 # cross_compiling is a standard autoconf variable.  See the autoconf manual for
 # details.
 AS_VAR_IF([cross_compiling], [no],
@@ -709,6 +717,7 @@ RKT_STAGE1_DEFAULT_VERSION_LDFLAGS="-X 'main.buildDefaultStage1Version=${RKT_STA
 RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS="-X 'main.buildDefaultStage1ImageLoc=${RKT_STAGE1_DEFAULT_LOCATION}'"
 RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS="-X 'main.buildDefaultStage1ImageInRktDir=${RKT_STAGE1_DEFAULT_IMAGE_FILENAME_IN_RKT_DIRECTORY}'"
 RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS="-X 'main.buildDefaultStage1ImagesDir=${RKT_STAGE1_DEFAULT_IMAGES_DIR}'"
+RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS="-X 'main.interpBin=${RKT_STAGE1_COREOS_INTERPRETER}'"
 RKT_VERSION_LDFLAGS="-X 'github.com/coreos/rkt/version.Version=${RKT_VERSION}'"
 RKT_FEATURES_LDFLAGS="-X 'main.rktFeatures=${RKT_FEATURES}'"
 
@@ -736,6 +745,7 @@ AC_SUBST(RKT_LOCAL_COREOS_PXE_IMAGE_PATH)
 AC_SUBST(RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER)
 
 AC_SUBST(RKT_STAGE1_COREOS_BOARD)
+AC_SUBST(RKT_STAGE1_COREOS_INTERPRETER)
 
 AC_SUBST(RKT_RUN_FUNCTIONAL_TESTS)
 
@@ -748,6 +758,7 @@ AC_SUBST(RKT_STAGE1_DEFAULT_VERSION_LDFLAGS)
 AC_SUBST(RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS)
 AC_SUBST(RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS)
 AC_SUBST(RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS)
+AC_SUBST(RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS)
 AC_SUBST(RKT_VERSION_LDFLAGS)
 AC_SUBST(RKT_FEATURES_LDFLAGS)
 
@@ -809,6 +820,12 @@ RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [kvm],
 
         hypervisor:                             '${RKT_STAGE1_KVM_HV}'])])
 
+RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos],
+                  [AC_MSG_RESULT([
+        coreos flavor specific build parameters
+
+        interpreter:                            '${RKT_STAGE1_COREOS_INTERPRETER}'])])
+
 
 AC_MSG_RESULT([
         other build parameters
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 1cebbd9c04..d997594c15 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -105,6 +105,7 @@ var (
 	hostname     string
 	log          *rktlog.Logger
 	diag         *rktlog.Logger
+	interpBin    string // Path to the interpreter within the stage1 rootfs, set by the linker
 )
 
 func init() {
diff --git a/stage1/init/init.mk b/stage1/init/init.mk
index b5a6de0a3d..8cdfc11982 100644
--- a/stage1/init/init.mk
+++ b/stage1/init/init.mk
@@ -1,2 +1,4 @@
-BGB_GO_FLAGS := $(strip $(RKT_TAGS))
+BGB_GO_FLAGS := $(strip \
+	-ldflags "$(RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS)" \
+	$(RKT_TAGS))
 include stage1/makelib/aci_simple_go_bin.mk
diff --git a/stage1/init/init_linux_amd64.go b/stage1/init/init_linux_amd64.go
deleted file mode 100644
index fb673c2999..0000000000
--- a/stage1/init/init_linux_amd64.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//+build amd64,linux
-
-package main
-
-const (
-	// Path to the interpreter within the stage1 rootfs
-	interpBin = "/usr/lib/ld-linux-x86-64.so.2"
-)
diff --git a/stage1/init/init_linux_arm64.go b/stage1/init/init_linux_arm64.go
deleted file mode 100644
index c7962260f8..0000000000
--- a/stage1/init/init_linux_arm64.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//+build arm64,linux
-
-package main
-
-const (
-	// Path to the interpreter within the stage1 rootfs
-	interpBin = "/usr/lib/ld-linux-aarch64.so.1"
-)

From 3029a4f25c780a3cb551bfeac8a2f92c82c1ad26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 1 Jun 2016 15:14:17 +0200
Subject: [PATCH 0557/1304] functional tests: re-purpose aws.sh for generating
 AMIs

This changes the aws.sh script to generate AMIs with the rkt
dependencies installed so they can be used in Jenkins.
---
 tests/aws.sh                        | 145 +++++++++++-----------------
 tests/cloudinit/centos.cloudinit    |  36 ++-----
 tests/cloudinit/debian.cloudinit    |  33 ++-----
 tests/cloudinit/fedora-24.cloudinit |   1 +
 tests/cloudinit/fedora.cloudinit    |  46 +++------
 tests/cloudinit/ubuntu.cloudinit    |  25 ++---
 6 files changed, 96 insertions(+), 190 deletions(-)
 create mode 120000 tests/cloudinit/fedora-24.cloudinit

diff --git a/tests/aws.sh b/tests/aws.sh
index a3163d6dc7..0f57aa83af 100755
--- a/tests/aws.sh
+++ b/tests/aws.sh
@@ -8,95 +8,65 @@ SCRIPTPATH=$PWD
 
 KEY_PAIR_NAME=rkt-testing-${USER}
 SECURITY_GROUP=rkt-testing-${USER}-security-group
+REGION=us-west-1
 
 ## First time only
 if [ "$1" = "setup" ] ; then
   MYIP=$(curl --silent http://checkip.amazonaws.com/)
 
-  aws ec2 create-key-pair --key-name $KEY_PAIR_NAME --query 'KeyMaterial' --output text > ${KEY_PAIR_NAME}.pem
+  aws --region $REGION ec2 create-key-pair --key-name $KEY_PAIR_NAME --query 'KeyMaterial' --output text > ${KEY_PAIR_NAME}.pem
   chmod 0600 ${KEY_PAIR_NAME}.pem
-  aws ec2 create-security-group --group-name $SECURITY_GROUP --description "Security group for rkt testing"
-  aws ec2 authorize-security-group-ingress --group-name $SECURITY_GROUP --protocol tcp --port 22 --cidr $MYIP/32
+  aws --region $REGION ec2 create-security-group --group-name $SECURITY_GROUP --description "Security group for rkt testing"
+  aws --region $REGION ec2 authorize-security-group-ingress --group-name $SECURITY_GROUP --protocol tcp --port 22 --cidr $MYIP/32
   exit 0
 fi
 
 DISTRO=$1
-GIT_URL=${2-https://github.com/coreos/rkt.git}
-GIT_BRANCH=${3-master}
-FLAVOR=${4-coreos}
-
-if [ "$DISTRO" = "all" ] ; then
-  gnome-terminal \
-	--tab --command="$SCRIPTPATH/aws.sh fedora-22      $GIT_URL $GIT_BRANCH $FLAVOR" \
-	--tab --command="$SCRIPTPATH/aws.sh fedora-23      $GIT_URL $GIT_BRANCH $FLAVOR" \
-	--tab --command="$SCRIPTPATH/aws.sh fedora-24      $GIT_URL $GIT_BRANCH $FLAVOR" \
-	--tab --command="$SCRIPTPATH/aws.sh fedora-rawhide $GIT_URL $GIT_BRANCH $FLAVOR" \
-	--tab --command="$SCRIPTPATH/aws.sh ubuntu-1604    $GIT_URL $GIT_BRANCH $FLAVOR" \
-	--tab --command="$SCRIPTPATH/aws.sh ubuntu-1510    $GIT_URL $GIT_BRANCH $FLAVOR" \
-	--tab --command="$SCRIPTPATH/aws.sh debian         $GIT_URL $GIT_BRANCH $FLAVOR" \
-	--tab --command="$SCRIPTPATH/aws.sh centos         $GIT_URL $GIT_BRANCH $FLAVOR"
-
-  exit 0
-fi
 
 test -f cloudinit/${DISTRO}.cloudinit
-CLOUDINIT_IN=$PWD/cloudinit/${DISTRO}.cloudinit
+CLOUDINIT=$PWD/cloudinit/${DISTRO}.cloudinit
 
 if [ "$DISTRO" = "fedora-22" ] ; then
   # https://getfedora.org/en/cloud/download/
-  # Search on AWS or look at
+  # Search on aws --region $REGION or look at
   # https://apps.fedoraproject.org/datagrepper/raw?category=fedimg
   # Sources: https://github.com/fedora-infra/fedimg/blob/develop/bin/list-the-amis.py
 
-  # Fedora-Cloud-Base-22-20160218.x86_64-eu-central-1-HVM-standard-0
-  AMI=ami-7a1b0116
+  # Fedora-Cloud-Base-22-20160218.x86_64-us-west-1-HVM-standard-0
+  AMI=ami-e291e082
   AWS_USER=fedora
-
-  # Workarounds
-  DISABLE_SELINUX=true
 elif [ "$DISTRO" = "fedora-23" ] ; then
-  # Fedora-Cloud-Base-23-20160323.x86_64-eu-central-1-HVM-standard-0
-  AMI=ami-d59670ba
+  # Fedora-Cloud-Base-23-20151030.x86_64-us-west-1-HVM-standard-0
+  AMI=ami-a6fc90c6
   AWS_USER=fedora
-
-  # Workarounds
-  DISABLE_SELINUX=true
 elif [ "$DISTRO" = "fedora-24" ] ; then
-  # Fedora-Cloud-Base-24_Alpha-7.x86_64-eu-central-1-HVM-standard-0
-  AMI=ami-748b6d1b
+  # Fedora-Cloud-Base-24-20160507.n.0.x86_64-us-west-1-HVM-standard-0
+  AMI=ami-8b4c35eb
   AWS_USER=fedora
-
-  # Workarounds
-  DISABLE_OVERLAY=true
 elif [ "$DISTRO" = "fedora-rawhide" ] ; then
-  # Fedora-Cloud-Base-Rawhide-20160321.0.x86_64-eu-central-1-HVM-standard-0
-  AMI=ami-69967006
+  # Fedora-Cloud-Base-rawhide-20160129.x86_64-us-west-1-HVM-standard-0
+  AMI=ami-a18dfac1
   AWS_USER=fedora
-
-  # Workarounds
-  # systemd in stage1 does not have the fixes for SELinux yet
-  FLAVOR=host
-  DISABLE_OVERLAY=true
 elif [ "$DISTRO" = "ubuntu-1604" ] ; then
   # https://cloud-images.ubuntu.com/locator/ec2/
-  # ubuntu/images-milestone/hvm/ubuntu-xenial-alpha2-amd64-server-20160125
-  AMI=ami-b4a5b9d8
+  # ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20160627
+  AMI=ami-b20542d2
   AWS_USER=ubuntu
 elif [ "$DISTRO" = "ubuntu-1510" ] ; then
   # https://cloud-images.ubuntu.com/locator/ec2/
-  # ubuntu/images/hvm/ubuntu-wily-15.10-amd64-server-20160123
-  AMI=ami-e9869f85
+  # ubuntu/images/hvm-instance/ubuntu-wily-15.10-amd64-server-20160715
+  AMI=ami-cee8aeae
   AWS_USER=ubuntu
 elif [ "$DISTRO" = "debian" ] ; then
   # https://wiki.debian.org/Cloud/AmazonEC2Image/Jessie
-  # Debian 8.1
-  AMI=ami-02b78e1f
+  # Debian 8.4
+  AMI=ami-45374b25
   AWS_USER=admin
 elif [ "$DISTRO" = "centos" ] ; then
   # Needs to subscribe first, see:
   # https://wiki.centos.org/Cloud/AWS
   # CentOS-7 x86_64 HVM
-  AMI=ami-e68f82fb
+  AMI=ami-af4333cf
   AWS_USER=centos
 fi
 
@@ -104,15 +74,7 @@ test -n "$AMI"
 test -n "$AWS_USER"
 test -f "${KEY_PAIR_NAME}.pem"
 
-CLOUDINIT=$(mktemp --tmpdir rkt-cloudinit.XXXXXXXXXX)
-sed -e "s#@GIT_URL@#${GIT_URL}#g" \
-    -e "s#@GIT_BRANCH@#${GIT_BRANCH}#g" \
-    -e "s#@FLAVOR@#${FLAVOR}#g" \
-    -e "s#@DISABLE_SELINUX@#${DISABLE_SELINUX}#g" \
-    -e "s#@DISABLE_OVERLAY@#${DISABLE_OVERLAY}#g" \
-    < $CLOUDINIT_IN >> $CLOUDINIT
-
-INSTANCE_ID=$(aws ec2 run-instances \
+INSTANCE_ID=$(aws --region $REGION ec2 run-instances \
 	--image-id $AMI \
 	--count 1 \
 	--key-name $KEY_PAIR_NAME \
@@ -125,16 +87,15 @@ INSTANCE_ID=$(aws ec2 run-instances \
 	)
 echo INSTANCE_ID=$INSTANCE_ID
 
-aws ec2 create-tags --resources $INSTANCE_ID \
+aws --region $REGION ec2 create-tags \
+	--resources ${INSTANCE_ID} \
 	--tags \
-	Key=Name,Value=rkt-tst-${DISTRO}-${GIT_BRANCH}-${FLAVOR} \
-	Key=Distro,Value=${DISTRO} \
-	Key=Repo,Value=${GIT_URL} \
-	Key=Branch,Value=${GIT_BRANCH} \
-	Key=Flavor,Value=${FLAVOR} \
-	Key=User,Value=${USER}
-
-while state=$(aws ec2 describe-instances \
+	Key=Name,Value=rkt-tst-${DISTRO} \
+	Key=BaseAmi,Value=${AMI} \
+	Key=User,Value=${AWS_USER}
+
+
+while state=$(aws --region $REGION ec2 describe-instances \
 	--instance-ids $INSTANCE_ID \
 	--output text \
 	--query 'Reservations[*].Instances[*].State.Name' \
@@ -142,33 +103,39 @@ while state=$(aws ec2 describe-instances \
   sleep 1; echo -n '.'
 done; echo " $state"
 
-AWS_IP=$(aws ec2 describe-instances \
+AWS_IP=$(aws --region $REGION ec2 describe-instances \
 	--instance-ids $INSTANCE_ID \
 	--output text \
 	--query 'Reservations[*].Instances[*].PublicIpAddress' \
 	)
 echo AWS_IP=$AWS_IP
 
-rm -f $CLOUDINIT
-
-sleep 5
-aws ec2 get-console-output --instance-id $INSTANCE_ID --output text |
-  perl -ne 'print if /BEGIN SSH .* FINGERPRINTS/../END SSH .* FINGERPRINTS/'
+echo "Waiting for the instance to boot..."
+sleep 60
+echo "Waiting for the instance to be initialized..."
+echo "To check the logs:"
+echo ssh -i ${SCRIPTPATH}/${KEY_PAIR_NAME}.pem ${AWS_USER}@${AWS_IP} tail -f /var/log/cloud-init-output.log
+while ! ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=20 -o ConnectTimeout=10 -o ConnectionAttempts=60 -i ${SCRIPTPATH}/${KEY_PAIR_NAME}.pem ${AWS_USER}@${AWS_IP} stat /var/lib/cloud/instances/$INSTANCE_ID/boot-finished >/dev/null 2>&1
+do
+  echo -n '.'
+  sleep 30
+done
 
-echo
-echo "Check the logs with:"
-echo tail -n 5000 -f /var/tmp/rkt-test.log
 
-repeat="Y"
-while [ "$repeat" = "Y" ] ; do
-  ssh -o ServerAliveInterval=20 -o ConnectTimeout=10 -o ConnectionAttempts=60 -i ${SCRIPTPATH}/${KEY_PAIR_NAME}.pem ${AWS_USER}@${AWS_IP}
+NAME=$DISTRO-rkt-test-$(date +"%d-%m-%Y")
+AMI_ID=$(aws --region $REGION ec2 create-image --instance-id $INSTANCE_ID --name $NAME --output text)
 
-  echo -n "Reconnect? (Y/N)"
-  read -n1 Input
-  echo
-  case $Input in
-    [Nn]):
-    repeat="N"
-    ;;
-  esac
+echo -e "\nWaiting for the AMI to be avaliable..."
+while ! aws --region $REGION ec2 describe-images --image-id $AMI_ID | grep -q available
+do
+  echo -n '.'
+  sleep 30
 done
+
+aws --region $REGION ec2 modify-image-attribute --image-id $AMI_ID --launch-permission "{\"Add\":[{\"Group\":\"all\"}]}"
+
+echo -e "\nRemoving instance..."
+
+aws --region $REGION ec2 terminate-instances --instance-ids $INSTANCE_ID --output text
+
+echo "${DISTRO} AMI available: $AMI_ID (Region $REGION)"
diff --git a/tests/cloudinit/centos.cloudinit b/tests/cloudinit/centos.cloudinit
index c0956a12ae..69ca233f9f 100644
--- a/tests/cloudinit/centos.cloudinit
+++ b/tests/cloudinit/centos.cloudinit
@@ -1,43 +1,25 @@
 #!/bin/bash
-cat > /var/tmp/rkt-test.sh <<TESTEOF
-#!/bin/bash
-
 set -e
 set -x
 
-# Sometimes journald does not work on CentOS :-(
-exec > >(tee -a "/var/tmp/rkt-test.log") 2>&1
-
-groupadd rkt
-gpasswd -a centos rkt
+groupadd rkt || true
+gpasswd -a centos rkt || true
 
 #yum update -y
 yum -y -v groupinstall "Development Tools"
-yum -y -v install wget squashfs-tools patch glibc-static gnupg libacl-devel systemd-devel
+yum -y -v install wget squashfs-tools patch glibc-static gnupg libacl-devel openssl-devel bc
+yum -y -v install java # for Jenkins
+dnf -y -v install iptables intltool
 
 pushd /tmp
-wget https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz
+wget -c https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz
 popd
 tar -C /usr/local -xzf /tmp/go1.5.3.linux-amd64.tar.gz
-ln -s /usr/local/go/bin/go /usr/local/bin/go
-ln -s /usr/local/go/bin/godoc /usr/local/bin/godoc
-ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt
-export GOROOT=/usr/local/go
-
-/usr/sbin/setenforce 0
-
-# unsquashfs is in /usr/sbin
-export PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/centos/.local/bin:/home/centos/bin
+ln -sf /usr/local/go/bin/go /usr/local/bin/go
+ln -sf /usr/local/go/bin/godoc /usr/local/bin/godoc
+ln -sf /usr/local/go/bin/gofmt /usr/local/bin/gofmt
 
 # sudo/su without tty is disabled on old CentOS.
 # https://bugzilla.redhat.com/show_bug.cgi?id=1020147
 # Cannot workaround with /usr/bin/expect because this would need expect > 2.27
 sed -i 's/ requiretty$/ !requiretty/g' /etc/sudoers
-
-su - centos --command="cd /var/tmp ; git clone --branch @GIT_BRANCH@ @GIT_URL@ rkt"
-su - centos --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/build-and-run-tests.sh -f @FLAVOR@"
-TESTEOF
-
-chmod +x /var/tmp/rkt-test.sh
-
-systemd-run --unit=rkt-test /var/tmp/rkt-test.sh
diff --git a/tests/cloudinit/debian.cloudinit b/tests/cloudinit/debian.cloudinit
index 7c8858639a..eacb5153e6 100644
--- a/tests/cloudinit/debian.cloudinit
+++ b/tests/cloudinit/debian.cloudinit
@@ -1,28 +1,15 @@
 #!/bin/bash
-cat > /var/tmp/rkt-test.sh <<TESTEOF
-#!/bin/bash
-
-set -e
-set -x
-
-# Sometimes journald does not work well on old versions
-exec > >(tee -a "/var/tmp/rkt-test.log") 2>&1
-
-sudo groupadd rkt
-sudo gpasswd -a admin rkt
 
-export DEBIAN_FRONTEND=noninteractive
-echo 'deb http://cloudfront.debian.net/debian testing main' | tee -a /etc/apt/sources.list
-echo 'deb-src http://cloudfront.debian.net/debian testing main' | tee -a /etc/apt/sources.list
-apt-get update -y
-#apt-get dist-upgrade -y --force-yes
-apt-get install -y --force-yes build-essential autoconf
-apt-get install -y --force-yes wget squashfs-tools patch gnupg golang git dbus libacl1-dev systemd-container
+groupadd rkt || true
+gpasswd -a admin rkt || true
 
-su - admin --command="cd /var/tmp ; git clone --branch @GIT_BRANCH@ @GIT_URL@ rkt"
-su - admin --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/build-and-run-tests.sh -f @FLAVOR@"
-TESTEOF
+sed -i 's/jessie/testing/g' /etc/apt/sources.list
 
-chmod +x /var/tmp/rkt-test.sh
+DEBIAN_FRONTEND=noninteractive apt-get update -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew"
+DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew"
 
-systemd-run --unit=rkt-test /var/tmp/rkt-test.sh
+DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes build-essential autoconf
+DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" squashfs-tools patch gnupg golang dbus libacl1-dev systemd-container libssl-dev libsystemd-dev libpam-systemd
+DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" default-jre
+DEBIAN_FRONTEND=noninteractive apt-get build-dep -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" systemd
+DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" git
diff --git a/tests/cloudinit/fedora-24.cloudinit b/tests/cloudinit/fedora-24.cloudinit
new file mode 120000
index 0000000000..2130c0b72a
--- /dev/null
+++ b/tests/cloudinit/fedora-24.cloudinit
@@ -0,0 +1 @@
+fedora.cloudinit
\ No newline at end of file
diff --git a/tests/cloudinit/fedora.cloudinit b/tests/cloudinit/fedora.cloudinit
index 6bcbe179a9..75ca7982ce 100644
--- a/tests/cloudinit/fedora.cloudinit
+++ b/tests/cloudinit/fedora.cloudinit
@@ -1,42 +1,24 @@
 #!/bin/bash
 
-if [ "@DISABLE_OVERLAY@" = true ] ; then
-  # Workaround for SELinux: do not use overlay fs
-  /sbin/rmmod overlay || true
-  mv /lib/modules/`uname -r`/kernel/fs/overlayfs/overlay.ko.xz /root/overlay.ko.xz-disabled
-fi
-
-if [ "@DISABLE_SELINUX@" = true ] ; then
-  /usr/sbin/setenforce 0
-fi
-
-cat > /var/tmp/rkt-test.sh <<TESTEOF
-#!/bin/bash
-
 set -e
 set -x
 
-# Sometimes journald does not work well on old versions
-exec > >(tee -a "/var/tmp/rkt-test.log") 2>&1
+# ---pretend-input-tty (with 3 dashes) is an undocumented feature of parted
+parted /dev/xvda ---pretend-input-tty resizepart 1 yes 100%
+resize2fs /dev/xvda1
 
-groupadd rkt
-gpasswd -a fedora rkt
+chmod 755 /home/fedora
 
 dnf -y -v update
-dnf -y -v groupinstall "Development Tools"
-dnf -y -v groupinstall "C Development Tools and Libraries"
-dnf -y -v install wget squashfs-tools patch glibc-static gnupg golang libacl-devel file systemd-devel
+dnf -y -v groupinstall "Development Tools" "C Development Tools and Libraries"
+dnf -y -v install wget squashfs-tools patch glibc-static gnupg golang libacl-devel file openssl-devel bc
 # systemd-container only available in newer versions of Fedora
 dnf -y -v install systemd-container || true
-
-# unsquashfs is in /usr/sbin
-export PATH=/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/fedora/.local/bin:/home/fedora/bin
-
-su - fedora --command="cd /var/tmp ; git clone --branch @GIT_BRANCH@ @GIT_URL@ rkt"
-su - fedora --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/build-and-run-tests.sh -f @FLAVOR@"
-TESTEOF
-
-chmod +x /var/tmp/rkt-test.sh
-
-# "sh -c" is necessary, otherwise SELinux would reject the service
-systemd-run --unit=rkt-test sh -c /var/tmp/rkt-test.sh
+dnf -y -v install java || true
+dnf -y -v install iptables || true
+dnf builddep -y -v systemd
+dnf -y -v install systemd-devel || true
+dnf -y -v install iptables intltool
+
+groupadd rkt || true
+gpasswd -a fedora rkt || true
diff --git a/tests/cloudinit/ubuntu.cloudinit b/tests/cloudinit/ubuntu.cloudinit
index f5141cf24c..c368674f67 100644
--- a/tests/cloudinit/ubuntu.cloudinit
+++ b/tests/cloudinit/ubuntu.cloudinit
@@ -1,27 +1,14 @@
 #!/bin/bash
-cat > /var/tmp/rkt-test.sh <<TESTEOF
-#!/bin/bash
 
 set -e
 set -x
 
-# Sometimes journald does not work well on old versions
-exec > >(tee -a "/var/tmp/rkt-test.log") 2>&1
-
 export DEBIAN_FRONTEND=noninteractive
 
-groupadd rkt
-gpasswd -a ubuntu rkt
-
-apt-get update -y
-apt-get dist-upgrade -y --force-yes
-apt-get install -y build-essential autoconf
-apt-get install -y wget squashfs-tools patch gnupg golang libacl1-dev systemd-container libsystemd-dev
-
-su - ubuntu --command="cd /var/tmp ; git clone --branch @GIT_BRANCH@ @GIT_URL@ rkt"
-su - ubuntu --command="PATH=\$PATH ; cd /var/tmp/rkt ; ./tests/build-and-run-tests.sh -f @FLAVOR@"
-TESTEOF
-
-chmod +x /var/tmp/rkt-test.sh
+groupadd rkt || true
+gpasswd -a ubuntu rkt || true
 
-systemd-run --unit=rkt-test /var/tmp/rkt-test.sh
+DEBIAN_FRONTEND=noninteractive apt-get update -y
+DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y --force-yes
+DEBIAN_FRONTEND=noninteractive apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" -y --force-yes build-essential autoconf
+DEBIAN_FRONTEND=noninteractive apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" -y --force-yes wget squashfs-tools patch gnupg golang dbus libacl1-dev systemd-container libssl-dev libsystemd-dev libpam-systemd

From 2ecf31585216a1931d5924fcbb49f5f34d793c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 19 Jul 2016 11:55:40 +0200
Subject: [PATCH 0558/1304] functional tests: update aws.sh documentation

---
 tests/test-on-several-distro.md | 36 +++++++++------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/tests/test-on-several-distro.md b/tests/test-on-several-distro.md
index 29dad237fa..d9d14adc3f 100644
--- a/tests/test-on-several-distro.md
+++ b/tests/test-on-several-distro.md
@@ -2,15 +2,18 @@
 
 rkt aims to be supported on several Linux distributions.
 In order to notice distro-specific issues, Continuous Integration should ideally run the tests on several Linux distributions.
-This is not done yet but there is a script to help with manual testing on several Linux distributions.
 
 rkt tests can be intrusive and require full root privileges.
 Each test should be run on a fresh VM.
 VMs should not be reused for next tests.
 
-## AWS
+## Jenkins
+
+Tests run on Jenkins [Jenkins](https://jenkins-ci.org/) [for each PR](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-github-ci/) and [periodically on the master branch](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-master-periodic/).
 
-The script `tests/aws.sh` can automatically spawn a fresh VM of the specified Linux distribution and start the rkt tests.
+### AMIs
+
+The script `tests/aws.sh` can generate a AMI of the specified Linux distribution with all the dependencies rkt needs.
 
 First, install [aws-cli](https://github.com/aws/aws-cli) and configure it with your AWS credentials.
 Then, create a key pair and a security group for rkt tests:
@@ -19,11 +22,12 @@ Then, create a key pair and a security group for rkt tests:
 $ tests/aws.sh setup
 ```
 
-Then run the tests with the specified Linux distribution:
+Then generate an AMI of the specified Linux distribution:
 
 ```
 $ tests/aws.sh fedora-22
 $ tests/aws.sh fedora-23
+$ tests/aws.sh fedora-24
 $ tests/aws.sh fedora-rawhide
 $ tests/aws.sh ubuntu-1604
 $ tests/aws.sh ubuntu-1510
@@ -31,26 +35,6 @@ $ tests/aws.sh debian
 $ tests/aws.sh centos
 ```
 
-By default, this tests the upstream master branch.
-A specific branch can be tested with:
-
-```
-$ tests/aws.sh fedora-23 https://github.com/coreos/rkt.git branch-name
-```
-
-Additionally, a stage1 flavor can be selected:
-```
-$ tests/aws.sh fedora-23 https://github.com/coreos/rkt.git branch-name coreos
-```
-
-The VM instances are configured to terminate automatically on shutdown to reduce costs.
-However they are not shut down automatically after the tests.
-It is recommended to check in the AWS console that instances are terminated.
-
-## Jenkins
-
-This could be automatised with [Jenkins](https://jenkins-ci.org/).
-In order to spawn a new VM for each test, the [Amazon EC2 Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Amazon+EC2+Plugin) could be used.
-However, it would require additional fixes: [JENKINS-8618](https://issues.jenkins-ci.org/browse/JENKINS-8618).
-
+The generated AMIs can then be used to configure Jenkins.
 
+If new packages are needed they can be added to the corresponding cloudinit files in `test/cloudinit`.

From 0439e4e52686c3064cdb1d23b726a767a10525ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 21 Jul 2016 13:36:13 +0200
Subject: [PATCH 0559/1304] rkt: don't errwrap cli_apps errors

We don't print them with the rkt log package, it's cobra/pflag who does
it, so the concrete error messages were missing.
---
 rkt/cli_apps.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 5e01daff0f..8d95e595e5 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -22,7 +22,6 @@ import (
 	"strings"
 
 	"github.com/coreos/rkt/common/apps"
-	"github.com/hashicorp/errwrap"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -173,7 +172,7 @@ func (al *appMount) Set(s string) error {
 		case "volume":
 			mv, err := types.NewACName(val[0])
 			if err != nil {
-				return errwrap.Wrap(fmt.Errorf("invalid volume name %q in --mount flag %q", val[0], s), err)
+				return fmt.Errorf("invalid volume name %q in --mount flag %q: %v", val[0], s, err)
 			}
 			mount.Volume = *mv
 		case "target":
@@ -225,7 +224,7 @@ type appsVolume apps.Apps
 func (al *appsVolume) Set(s string) error {
 	vol, err := types.VolumeFromString(s)
 	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("invalid value in --volume flag %q", s), err)
+		return fmt.Errorf("invalid value in --volume flag %q: %v", s, err)
 	}
 
 	(*apps.Apps)(al).Volumes = append((*apps.Apps)(al).Volumes, *vol)

From b172d657999374a511c042914d0506a3ad8e6464 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 21 Jul 2016 11:55:30 +0200
Subject: [PATCH 0560/1304] changelog, roadmap: document v1.11.0 release

---
 CHANGELOG.md | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ROADMAP.md   |  5 +----
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84d1895883..253932a707 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,56 @@
+## 1.11.0
+
+This release sets the ground for the new upcoming KVM qemu flavor. It adds support for exporting a pod to an ACI including all modifications. The rkt API service now also supports systemd socket activation. Finally we have diagnostics back, helping users to find out why their app failed to execute.
+
+#### New features
+- KVM: Hypervisor support for KVM flavor focusing on qemu ([#2684](https://github.com/coreos/rkt/pull/2684)). This provides a generic mechanism to use different kvm hypervisors (such as lkvm, qemu-kvm).
+- rkt: add command to export a pod to an aci ([#2889](https://github.com/coreos/rkt/pull/2889)). Adds a new `export` command to rkt which generates an ACI from a pod; saving any changes made to the pod.
+- rkt/api: detect when run as a `systemd.socket(5)` service ([#2916](https://github.com/coreos/rkt/pull/2916)). This allows rkt to run as a systemd socket-based unit.
+- rkt/stop: implement `--uuid-file` ([#2902](https://github.com/coreos/rkt/pull/2902)). So the user can use the value saved on rkt run with `--uuid-file-save`.
+
+#### Bug fixes
+- scripts/glide-update: ensure running from $GOPATH ([#2885](https://github.com/coreos/rkt/pull/2885)). glide is confused when it's not running with the rkt repository inside $GOPATH.
+- store: fix missing shared storelock acquisition on NewStore ([#2896](https://github.com/coreos/rkt/pull/2896)).
+- store,rkt: fix fd leaks ([#2906](https://github.com/coreos/rkt/pull/2906)). Close db lock on store close. If we don't do it, there's a fd leak everytime we open a new Store, even if it was closed.
+- stage1/enterexec: remove trailing `\n` in environment variables ([#2901](https://github.com/coreos/rkt/pull/2901)). Loading environment retained the new line character (`\n`), this produced an incorrect evaluation of the environment variables.
+- stage1/gc: skip cleaning our own cgroup ([#2914](https://github.com/coreos/rkt/pull/2914)).
+- api_service/log: fix file descriptor leak in GetLogs() ([#2930](https://github.com/coreos/rkt/pull/2930)).
+- protobuf: fix protoc-gen-go build with vendoring ([#2913](https://github.com/coreos/rkt/pull/2913)).
+- build: fix x86 builds ([#2926](https://github.com/coreos/rkt/pull/2926)). This PR fixes a minor issue which leads to x86 builds failing.
+- functional tests: add some more volume/mount tests ([#2903](https://github.com/coreos/rkt/pull/2903)).
+- stage1/init: link pod's journal in kvm flavor ([#2934](https://github.com/coreos/rkt/pull/2934)). In nspawn flavors, nspawn creates a symlink from `/var/log/journal/${machine-id}` to the pod's journal directory. In kvm we need to do the link ourselves.
+- build: Build system fixes ([#2938](https://github.com/coreos/rkt/pull/2938)). This should fix the `expr: syntax error` and useless rebuilds of network plugins.
+
+#### Other changes
+- stage1: diagnostic functionality for rkt run ([#2872](https://github.com/coreos/rkt/pull/2872)). If the app exits with `ExecMainStatus == 203`, the app's reaper runs the diagnostic tool and prints the output on stdout. systemd sets `ExecMainstatus` to EXIT_EXEC (203) when execve() fails.
+- build: add support for more architectures at configure time ([#2907](https://github.com/coreos/rkt/pull/2907)).
+- stage1: update coreos image to 1097.0.0 ([#2884](https://github.com/coreos/rkt/pull/2884)). This is needed for a recent enough version of libseccomp (2.3.0), with support for new syscalls (eg. getrandom).
+- api: By adding labels to the image itself, we don't need to pass the manifest to filter function ([#2909](https://github.com/coreos/rkt/pull/2909)). api: Add labels to pod and image type.
+- api: optionally build systemd-journal support ([#2868](https://github.com/coreos/rkt/pull/2868)). This introduces a 'sdjournal' tag and corresponding stubs in api_service, turning libsystemd headers into a soft-dependency.
+- store: simplify db locking and functions ([#2897](https://github.com/coreos/rkt/pull/2897)). Instead of having a file lock to handle inter process locking and a sync.Mutex to handle locking between multiple goroutines, just create, lock and close a new file lock at every db.Do function.
+- stage1/enterexec: Add entry to ASSCB_EXTRA_HEADERS ([#2924](https://github.com/coreos/rkt/pull/2924)). Added entry to ASSCB_EXTRA_HEADERS for better change tracking.
+- build: use rkt-builder ACI ([#2923](https://github.com/coreos/rkt/pull/2923)).
+- Add hidden 'image fetch' next to the existing 'fetch' option ([#2860](https://github.com/coreos/rkt/pull/2860)).
+- stage1: prepare-app: don't mount /sys if path already used ([#2888](https://github.com/coreos/rkt/pull/2888)). When users mount /sys or a sub-directory of /sys as a volume, prepare-app should not mount /sys: that would mask the volume provided by users.
+- build,stage1/init: set interpBin at build time to fix other architecture builds (e.g. x86) ([#2950](https://github.com/coreos/rkt/pull/2950)).
+- functional tests: re-purpose aws.sh for generating AMIs ([#2736](https://github.com/coreos/rkt/pull/2736)).
+- rkt: Add `--cpuprofile` `--memprofile` for profiling rkt ([#2887](https://github.com/coreos/rkt/pull/2887)). Adds two hidden global flags and documentation to enable profiling rkt.
+- functional test: check PATH variable for trailer `\n` character ([#2942](https://github.com/coreos/rkt/pull/2942)).
+- functional tests: disable TestVolumeSysfs on kvm ([#2941](https://github.com/coreos/rkt/pull/2941)).
+- Documentation updates ([#2918](https://github.com/coreos/rkt/pull/2918))
+
+#### Library updates
+
+- glide: update docker2aci to v0.12.1 ([#2873](https://github.com/coreos/rkt/pull/2873)). Includes support for the docker image format v2.2 and OCI image format and allows fetching via digest.
+
+## 1.10.1
+
+This is a minor bug fix release.
+
+#### Bug fixes
+- rkt/run: handle malformed environment files ([#2901](https://github.com/coreos/rkt/pull/2901))
+- stage1/enterexec: remove trailing `\n` in environment variables ([#2901](https://github.com/coreos/rkt/pull/2901))
+
 ## v1.10.0
 This release introduces a number of important features and improvements:
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 3043f730a8..35159dcb8c 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,13 +9,10 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-### rkt 1.11.0 (July)
+### rkt 1.12.0 (August)
 
 - stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
 - further improvements for SELinux environments, especially Fedora in enforcing mode
-
-### rkt 1.12.0 (August)
-
 - enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
 - packaged for more distributions
   - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)

From 9fdaafb414284edb39afbccd44a700cdac0452dc Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 21 Jul 2016 11:57:39 +0200
Subject: [PATCH 0561/1304] scripts/bump-release: remove acbuild-rkt-builder.sh

---
 scripts/bump-release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bump-release b/scripts/bump-release
index e9a114ed88..6e135ff8ce 100755
--- a/scripts/bump-release
+++ b/scripts/bump-release
@@ -38,7 +38,7 @@ function replace_all() {
 }
 
 function replace_version() {
-	replace_stuff $1 $2 configure.ac scripts/build-rir.sh scripts/acbuild-rkt-builder.sh
+	replace_stuff $1 $2 configure.ac scripts/build-rir.sh
 }
 
 NEXT=${1:1} 	        # 0.2.3

From ef647be0bdf35b3d7eddc8a86e1d476b94a062c4 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 21 Jul 2016 11:58:18 +0200
Subject: [PATCH 0562/1304] version: bump to v1.11.0

---
 Documentation/running-fly-stage1.md  | 4 ++--
 Documentation/running-lkvm-stage1.md | 4 ++--
 Documentation/subcommands/prepare.md | 2 +-
 Documentation/subcommands/version.md | 2 +-
 Documentation/trying-out-rkt.md      | 6 +++---
 configure.ac                         | 2 +-
 scripts/install-rkt.sh               | 2 +-
 tests/empty-image/manifest           | 2 +-
 tests/image/manifest                 | 2 +-
 tests/rkt_exec_test.go               | 2 +-
 tests/rkt_image_cat_manifest_test.go | 2 +-
 tests/rkt_image_export_test.go       | 2 +-
 tests/rkt_image_render_test.go       | 2 +-
 tests/rkt_os_arch_test.go            | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 818b6994a4..19494cf9ba 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.10.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.11.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.10.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.11.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index b4ec22918a..b5c0462856 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.10.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.11.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.10.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.11.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index abc41b532f..8f22eb3ea0 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.10.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.11.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index e6be598b59..00b14b1483 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.10.0
+rkt Version: 1.11.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 72f55a0da3..60fac2c5a6 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.10.0/rkt-v1.10.0.tar.gz
-tar xzvf rkt-v1.10.0.tar.gz
-cd rkt-v1.10.0
+wget https://github.com/coreos/rkt/releases/download/v1.11.0/rkt-v1.11.0.tar.gz
+tar xzvf rkt-v1.11.0.tar.gz
+cd rkt-v1.11.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 089074ea8e..f2c7e6f7ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.10.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.11.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 007d3a579a..1843e32385 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.10.0"
+version="1.11.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 728814d4a3..933339ee65 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.10.0"
+            "value": "1.11.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 116a3e4b31..bd994c8b37 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.10.0"
+            "value": "1.11.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index f805976d78..7e903cc38f 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.10.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.11.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index db9160a13a..e8ba0aa84b 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.10.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.11.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index ba1828c022..df99935588 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.10.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.11.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 73408609a8..42db9e0a48 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.10.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.11.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 581a7400ec..480bde8532 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.10.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.11.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From d560b6fc024b281a74a553f196873cee00ea3b8d Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 21 Jul 2016 11:58:18 +0200
Subject: [PATCH 0563/1304] version: bump to v1.11.0+git

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f2c7e6f7ec..6c04157b38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.11.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.11.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX

From 6476ff5e8532df49a326ca1cd0723a6badcd60a2 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Tue, 5 Jul 2016 11:46:58 +0200
Subject: [PATCH 0564/1304] rkt/image: store ACI fetch information

---
 rkt/fetch_test.go          |  2 +-
 rkt/flag/secflags.go       | 26 ++++++++++++++
 rkt/image/dockerfetcher.go |  8 ++---
 rkt/image/filefetcher.go   |  5 ++-
 rkt/image/httpfetcher.go   |  6 +++-
 rkt/image/namefetcher.go   |  5 ++-
 rkt/image_list.go          | 73 +++++++++++++++++++++++++++-----------
 store/aciinfo.go           | 16 +++++++--
 store/migrate.go           | 21 +++++++++++
 store/remote.go            | 38 ++++++++++++++++++++
 store/schema.go            |  4 +--
 store/store.go             | 29 +++++++++++----
 store/store_test.go        | 10 +++---
 store/tree_test.go         |  2 +-
 14 files changed, 200 insertions(+), 45 deletions(-)

diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index 1c7600a52a..c225b44fca 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -382,7 +382,7 @@ func TestGetStoreKeyFromApp(t *testing.T) {
 	if _, err := a.Seek(0, 0); err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
-	_, err = s.WriteACI(a, false)
+	_, err = s.WriteACI(a, store.ACIFetchInfo{Latest: false})
 	if err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
diff --git a/rkt/flag/secflags.go b/rkt/flag/secflags.go
index 817c3ef485..6c84b4c29e 100644
--- a/rkt/flag/secflags.go
+++ b/rkt/flag/secflags.go
@@ -14,6 +14,8 @@
 
 package flag
 
+import "strings"
+
 const (
 	insecureNone  = 0
 	insecureImage = 1 << (iota - 1)
@@ -43,6 +45,14 @@ type SecFlags struct {
 	*bitFlags
 }
 
+func NewSecFlagsFromValue(val int) (*SecFlags, error) {
+	sf := &SecFlags{
+		bitFlags: &bitFlags{flags: val},
+	}
+
+	return sf, nil
+}
+
 func NewSecFlags(defOpts string) (*SecFlags, error) {
 	bf, err := newBitFlags(insecureOptions, defOpts, insecureOptionsMap)
 	if err != nil {
@@ -82,3 +92,19 @@ func (sf *SecFlags) SkipAllSecurityChecks() bool {
 func (sf *SecFlags) SkipAnySecurityChecks() bool {
 	return sf.flags != 0
 }
+
+func (sf *SecFlags) Value() int {
+	return sf.flags
+}
+
+func (sf *SecFlags) String() string {
+	opts := []string{}
+
+	for optstr, opt := range insecureOptionsMap {
+		if sf.hasFlag(opt) {
+			opts = append(opts, optstr)
+		}
+	}
+
+	return strings.Join(opts, ",")
+}
diff --git a/rkt/image/dockerfetcher.go b/rkt/image/dockerfetcher.go
index e7d71b50fa..2c9ae912a6 100644
--- a/rkt/image/dockerfetcher.go
+++ b/rkt/image/dockerfetcher.go
@@ -75,14 +75,14 @@ func (f *dockerFetcher) fetchImageFrom(u *url.URL, latest bool) (string, error)
 	// alive, because we have an fd to it opened.
 	defer aciFile.Close()
 
-	key, err := f.S.WriteACI(aciFile, latest)
+	key, err := f.S.WriteACI(aciFile, store.ACIFetchInfo{
+		Latest:          latest,
+		InsecureOptions: int64(f.InsecureFlags.Value()),
+	})
 	if err != nil {
 		return "", err
 	}
 
-	// TODO(krnowak): Consider dropping the signature URL part
-	// from store.Remote. It is not used anywhere and the data
-	// stored here is useless.
 	newRem := store.NewRemote(u.String(), ascURLFromImgURL(u).String())
 	newRem.BlobKey = key
 	newRem.DownloadTime = time.Now()
diff --git a/rkt/image/filefetcher.go b/rkt/image/filefetcher.go
index f88ee1c152..a012b69605 100644
--- a/rkt/image/filefetcher.go
+++ b/rkt/image/filefetcher.go
@@ -50,7 +50,10 @@ func (f *fileFetcher) Hash(aciPath string, a *asc) (string, error) {
 	}
 	defer aciFile.Close()
 
-	key, err := f.S.WriteACI(aciFile, false)
+	key, err := f.S.WriteACI(aciFile, store.ACIFetchInfo{
+		Latest:          false,
+		InsecureOptions: int64(f.InsecureFlags.Value()),
+	})
 	if err != nil {
 		return "", err
 	}
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index 59dab6f464..6769415fbd 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -17,6 +17,7 @@ package image
 import (
 	"errors"
 	"io"
+
 	"net/url"
 	"time"
 
@@ -59,7 +60,10 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 		// CacheMaxAge is exceeded
 		return key, nil
 	}
-	key, err := f.S.WriteACI(aciFile, false)
+	key, err := f.S.WriteACI(aciFile, store.ACIFetchInfo{
+		Latest:          false,
+		InsecureOptions: int64(f.InsecureFlags.Value()),
+	})
 	if err != nil {
 		return "", err
 	}
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 20c3ca400c..c338fed2ef 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -108,7 +108,10 @@ func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL st
 	}
 	defer aciFile.Close()
 
-	key, err := f.S.WriteACI(aciFile, latest)
+	key, err := f.S.WriteACI(aciFile, store.ACIFetchInfo{
+		Latest:          latest,
+		InsecureOptions: int64(f.InsecureFlags.Value()),
+	})
 	if err != nil {
 		return "", err
 	}
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 4cdefd9efd..92f6eedb72 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -22,22 +22,25 @@ import (
 
 	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/coreos/rkt/store"
+	"github.com/dustin/go-humanize"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/lastditch"
-	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 )
 
 const (
 	defaultTimeLayout = "2006-01-02 15:04:05.999 -0700 MST"
 
-	id         = "id"
-	name       = "name"
-	importTime = "import time"
-	lastUsed   = "last used"
-	size       = "size"
-	latest     = "latest"
+	id              = "id"
+	name            = "name"
+	importTime      = "import time"
+	lastUsed        = "last used"
+	size            = "size"
+	latest          = "latest"
+	insecureOptions = "insecure options"
+	aciURL          = "ACI URL"
+	signatureURL    = "signature URL"
 )
 
 // Convenience methods for formatting fields
@@ -51,23 +54,29 @@ func u(s string) string {
 var (
 	// map of valid fields and related header name
 	ImagesFieldHeaderMap = map[string]string{
-		l(id):         u(id),
-		l(name):       u(name),
-		l(importTime): u(importTime),
-		l(lastUsed):   u(lastUsed),
-		l(latest):     u(latest),
-		l(size):       u(size),
+		l(id):              u(id),
+		l(name):            u(name),
+		l(importTime):      u(importTime),
+		l(lastUsed):        u(lastUsed),
+		l(latest):          u(latest),
+		l(size):            u(size),
+		l(insecureOptions): u(insecureOptions),
+		l(aciURL):          u(aciURL),
+		l(signatureURL):    u(signatureURL),
 	}
 
 	// map of valid sort fields containing the mapping between the provided field name
 	// and the related aciinfo's field name.
 	ImagesFieldAciInfoMap = map[string]string{
-		l(id):         "blobkey",
-		l(name):       l(name),
-		l(importTime): l(importTime),
-		l(lastUsed):   l(lastUsed),
-		l(latest):     l(latest),
-		l(size):       l(size),
+		l(id):              "blobkey",
+		l(name):            l(name),
+		l(importTime):      l(importTime),
+		l(lastUsed):        l(lastUsed),
+		l(latest):          l(latest),
+		l(size):            l(size),
+		l(insecureOptions): u(insecureOptions),
+		l(aciURL):          u(aciURL),
+		l(signatureURL):    u(signatureURL),
 	}
 
 	ImagesSortableFields = map[string]struct{}{
@@ -117,7 +126,8 @@ var (
 
 func init() {
 	sortFields := []string{l(name), l(importTime), l(lastUsed), l(size)}
-	fields := append([]string{l(id)}, append(sortFields, l(latest))...)
+
+	fields := []string{l(id), l(name), l(aciURL), l(signatureURL), l(size), l(importTime), l(lastUsed)}
 
 	// Set defaults
 	var err error
@@ -160,6 +170,17 @@ func runImages(cmd *cobra.Command, args []string) int {
 		return 1
 	}
 
+	remotes, err := s.GetAllRemotes()
+	if err != nil {
+		stderr.PrintE("unable to get remotes", err)
+		return 1
+	}
+
+	remoteMap := make(map[string]*store.Remote)
+	for _, r := range remotes {
+		remoteMap[r.BlobKey] = r
+	}
+
 	var sortAciinfoFields []string
 	for _, f := range flagImagesSortFields.Options {
 		sortAciinfoFields = append(sortAciinfoFields, ImagesFieldAciInfoMap[f])
@@ -224,6 +245,18 @@ func runImages(cmd *cobra.Command, args []string) int {
 				}
 			case l(latest):
 				fieldValue = fmt.Sprintf("%t", aciInfo.Latest)
+			case l(insecureOptions):
+				f, err := rktflag.NewSecFlagsFromValue(int(aciInfo.InsecureOptions))
+				if err != nil {
+					stderr.Error(err)
+					return 1
+				}
+
+				fieldValue = fmt.Sprintf("%s", f.String())
+			case l(aciURL):
+				fieldValue = fmt.Sprintf("%s", remoteMap[aciInfo.BlobKey].ACIURL)
+			case l(signatureURL):
+				fieldValue = fmt.Sprintf("%s", remoteMap[aciInfo.BlobKey].SigURL)
 			}
 			fieldValues = append(fieldValues, fieldValue)
 
diff --git a/store/aciinfo.go b/store/aciinfo.go
index ec831908f8..dfd625b9d6 100644
--- a/store/aciinfo.go
+++ b/store/aciinfo.go
@@ -21,6 +21,16 @@ import (
 	"time"
 )
 
+// ACIFetchInfo is used to store information about the fetching process of an ACI.
+type ACIFetchInfo struct {
+	// Latest defines if the ACI was imported using the latest pattern
+	// (no version label was provided on ACI discovery).
+	Latest bool
+
+	// InsecureOptions are the insecure options that was used when retrieving the ACI.
+	InsecureOptions int64
+}
+
 // ACIInfo is used to store information about an ACI.
 type ACIInfo struct {
 	// BlobKey is the key in the blob/imageManifest store of the related
@@ -39,6 +49,8 @@ type ACIInfo struct {
 	// Latest defines if the ACI was imported using the latest pattern (no
 	// version label was provided on ACI discovery)
 	Latest bool
+	// InsecureOptions are the insecure options that were used when retrieving the ACI.
+	InsecureOptions int64
 }
 
 func NewACIInfo(blobKey string, latest bool, t time.Time, size int64, treeStoreSize int64) *ACIInfo {
@@ -54,7 +66,7 @@ func NewACIInfo(blobKey string, latest bool, t time.Time, size int64, treeStoreS
 
 func aciinfoRowScan(rows *sql.Rows, aciinfo *ACIInfo) error {
 	// This ordering MUST match that in schema.go
-	return rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize)
+	return rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize, &aciinfo.InsecureOptions)
 }
 
 // GetAciInfosWithKeyPrefix returns all the ACIInfos with a blobkey starting with the given prefix.
@@ -161,7 +173,7 @@ func WriteACIInfo(tx *sql.Tx, aciinfo *ACIInfo) error {
 	if err != nil {
 		return err
 	}
-	_, err = tx.Exec("INSERT into aciinfo (blobkey, name, importtime, lastused, latest, size, treestoresize) VALUES ($1, $2, $3, $4, $5, $6, $7)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest, aciinfo.Size, aciinfo.TreeStoreSize)
+	_, err = tx.Exec("INSERT into aciinfo (blobkey, name, importtime, lastused, latest, size, treestoresize, insecureoptions) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest, aciinfo.Size, aciinfo.TreeStoreSize, aciinfo.InsecureOptions)
 	if err != nil {
 		return err
 	}
diff --git a/store/migrate.go b/store/migrate.go
index e145091be9..27734ba8a0 100644
--- a/store/migrate.go
+++ b/store/migrate.go
@@ -33,6 +33,7 @@ var (
 		3: migrateToV3,
 		4: migrateToV4,
 		5: migrateToV5,
+		6: migrateToV6,
 	}
 )
 
@@ -152,3 +153,23 @@ func migrateToV5(tx *sql.Tx) error {
 
 	return nil
 }
+
+func migrateToV6(tx *sql.Tx) error {
+	for _, t := range []string{
+		"CREATE TABLE aciinfo_tmp (blobkey string, name string, importtime time, lastused time, latest bool, size int64, treestoresize int64, insecureoptions int64 DEFAULT 0);",
+		"INSERT INTO aciinfo_tmp (blobkey, name, importtime, lastused, latest, size, treestoresize) SELECT blobkey, name, importtime, lastused, latest, size, treestoresize from aciinfo",
+		"DROP TABLE aciinfo",
+		"CREATE TABLE aciinfo (blobkey string, name string, importtime time, lastused time, latest bool, size int64 DEFAULT 0, treestoresize int64 DEFAULT 0, insecureoptions int64 DEFAULT 0);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS blobkeyidx ON aciinfo (blobkey)",
+		"CREATE INDEX IF NOT EXISTS nameidx ON aciinfo (name)",
+		"INSERT INTO aciinfo SELECT * from aciinfo_tmp",
+		"DROP TABLE aciinfo_tmp",
+	} {
+		_, err := tx.Exec(t)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/store/remote.go b/store/remote.go
index 4eee9839ef..7aa91ce09d 100644
--- a/store/remote.go
+++ b/store/remote.go
@@ -31,7 +31,9 @@ func NewRemote(aciurl, sigurl string) *Remote {
 }
 
 type Remote struct {
+	// ACIURL is the URL used to import an ACI.
 	ACIURL string
+	// SigURL is the URL used to import an ACI verification signature.
 	SigURL string
 	ETag   string
 	// The key in the blob store under which the ACI has been saved.
@@ -40,6 +42,10 @@ type Remote struct {
 	DownloadTime time.Time
 }
 
+func remoteRowScan(rows *sql.Rows, remote *Remote) error {
+	return rows.Scan(&remote.ACIURL, &remote.SigURL, &remote.ETag, &remote.BlobKey, &remote.CacheMaxAge, &remote.DownloadTime)
+}
+
 // GetRemote tries to retrieve a remote with the given aciURL. found will be
 // false if remote doesn't exist.
 func GetRemote(tx *sql.Tx, aciURL string) (remote *Remote, found bool, err error) {
@@ -61,6 +67,38 @@ func GetRemote(tx *sql.Tx, aciURL string) (remote *Remote, found bool, err error
 	return remote, found, err
 }
 
+// GetAllRemotes returns all the ACIInfos sorted by optional sortfields and
+// with ascending or descending order.
+func GetAllRemotes(tx *sql.Tx) ([]*Remote, error) {
+	var remotes []*Remote
+	query := "SELECT * from remote"
+
+	rows, err := tx.Query(query)
+	if err != nil {
+		return nil, err
+
+	}
+
+	for rows.Next() {
+		r := &Remote{}
+		if err := remoteRowScan(rows, r); err != nil {
+			return nil, err
+
+		}
+
+		remotes = append(remotes, r)
+
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, err
+
+	}
+
+	return remotes, nil
+
+}
+
 // WriteRemote adds or updates the provided Remote.
 func WriteRemote(tx *sql.Tx, remote *Remote) error {
 	// ql doesn't have an INSERT OR UPDATE function so
diff --git a/store/schema.go b/store/schema.go
index 4b0b28f64c..b85de7ce95 100644
--- a/store/schema.go
+++ b/store/schema.go
@@ -21,7 +21,7 @@ import (
 
 const (
 	// Incremental db version at the current code revision.
-	dbVersion = 5
+	dbVersion = 6
 )
 
 // Statement to run when creating a db. These are the statements to create the
@@ -37,7 +37,7 @@ var dbCreateStmts = [...]string{
 	"CREATE UNIQUE INDEX IF NOT EXISTS aciurlidx ON remote (aciurl)",
 
 	// aciinfo table. The primary key is "blobkey" and it matches the key used to save that aci in the blob store
-	"CREATE TABLE IF NOT EXISTS aciinfo (blobkey string, name string, importtime time, lastused time, latest bool, size int64 DEFAULT 0, treestoresize int64 DEFAULT 0);",
+	"CREATE TABLE IF NOT EXISTS aciinfo (blobkey string, name string, importtime time, lastused time, latest bool, size int64 DEFAULT 0, treestoresize int64 DEFAULT 0, insecureoptions int64 DEFAULT 0);",
 	"CREATE UNIQUE INDEX IF NOT EXISTS blobkeyidx ON aciinfo (blobkey)",
 	"CREATE INDEX IF NOT EXISTS nameidx ON aciinfo (name)",
 }
diff --git a/store/store.go b/store/store.go
index b515aee628..6529d67f2d 100644
--- a/store/store.go
+++ b/store/store.go
@@ -452,7 +452,7 @@ func (s *Store) ReadStream(key string) (io.ReadCloser, error) {
 // (i.e. the hash of the uncompressed ACI)
 // latest defines if the aci has to be marked as the latest. For example an ACI
 // discovered without asking for a specific version (latest pattern).
-func (s *Store) WriteACI(r io.ReadSeeker, latest bool) (string, error) {
+func (s *Store) WriteACI(r io.ReadSeeker, fetchInfo ACIFetchInfo) (string, error) {
 	// We need to allow the store's setgid bits (if any) to propagate, so
 	// disable umask
 	um := syscall.Umask(0)
@@ -508,12 +508,13 @@ func (s *Store) WriteACI(r io.ReadSeeker, latest bool) (string, error) {
 	// Save aciinfo
 	if err = s.db.Do(func(tx *sql.Tx) error {
 		aciinfo := &ACIInfo{
-			BlobKey:    key,
-			Name:       im.Name.String(),
-			ImportTime: time.Now(),
-			LastUsed:   time.Now(),
-			Latest:     latest,
-			Size:       sz,
+			BlobKey:         key,
+			Name:            im.Name.String(),
+			ImportTime:      time.Now(),
+			LastUsed:        time.Now(),
+			Latest:          fetchInfo.Latest,
+			Size:            sz,
+			InsecureOptions: fetchInfo.InsecureOptions,
 		}
 		return WriteACIInfo(tx, aciinfo)
 	}); err != nil {
@@ -845,6 +846,20 @@ nextKey:
 	return "", ACINotFoundError{name: name, labels: labels}
 }
 
+func (s *Store) GetAllRemotes() ([]*Remote, error) {
+	var remotes []*Remote
+	err := s.db.Do(func(tx *sql.Tx) error {
+		var err error
+		remotes, err = GetAllRemotes(tx)
+		return err
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return remotes, nil
+}
+
 func (s *Store) GetAllACIInfos(sortfields []string, ascending bool) ([]*ACIInfo, error) {
 	var aciInfos []*ACIInfo
 	err := s.db.Do(func(tx *sql.Tx) error {
diff --git a/store/store_test.go b/store/store_test.go
index 2d066fa0ab..c4f3901e86 100644
--- a/store/store_test.go
+++ b/store/store_test.go
@@ -177,7 +177,7 @@ func TestGetImageManifest(t *testing.T) {
 	if _, err := aci.Seek(0, 0); err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
-	key, err := s.WriteACI(aci, false)
+	key, err := s.WriteACI(aci, ACIFetchInfo{Latest: false})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -320,7 +320,7 @@ func TestGetAci(t *testing.T) {
 				t.Fatalf("unexpected error %v", err)
 			}
 
-			key, err := s.WriteACI(aci, ad.latest)
+			key, err := s.WriteACI(aci, ACIFetchInfo{Latest: ad.latest})
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}
@@ -419,7 +419,7 @@ func TestTreeStore(t *testing.T) {
 	}
 
 	// Import the new ACI
-	key, err := s.WriteACI(aci, false)
+	key, err := s.WriteACI(aci, ACIFetchInfo{Latest: false})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -500,7 +500,7 @@ func TestRemoveACI(t *testing.T) {
 	if _, err := aciFile.Seek(0, 0); err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
-	key, err := s.WriteACI(aciFile, false)
+	key, err := s.WriteACI(aciFile, ACIFetchInfo{Latest: false})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -545,7 +545,7 @@ func TestRemoveACI(t *testing.T) {
 	if _, err := aciFile.Seek(0, 0); err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
-	key, err = s.WriteACI(aciFile, false)
+	key, err = s.WriteACI(aciFile, ACIFetchInfo{Latest: false})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
diff --git a/store/tree_test.go b/store/tree_test.go
index 6a246abf11..9032f49b91 100644
--- a/store/tree_test.go
+++ b/store/tree_test.go
@@ -82,7 +82,7 @@ func treeStoreWriteACI(dir string, s *Store) (string, error) {
 	}
 
 	// Import the new ACI
-	key, err := s.WriteACI(aci, false)
+	key, err := s.WriteACI(aci, ACIFetchInfo{Latest: false})
 	if err != nil {
 		return "", err
 	}

From e527086fb0fc61188c502424865debfc791a96c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 21 Jul 2016 14:48:17 +0200
Subject: [PATCH 0565/1304] glide: vendor jonboulle/clockwork

---
 glide.lock                                    |   6 +-
 glide.yaml                                    |   2 +
 vendor/github.com/jonboulle/clockwork/LICENSE | 201 ++++++++++++++++++
 .../jonboulle/clockwork/clockwork.go          | 169 +++++++++++++++
 4 files changed, 376 insertions(+), 2 deletions(-)
 create mode 100644 vendor/github.com/jonboulle/clockwork/LICENSE
 create mode 100644 vendor/github.com/jonboulle/clockwork/clockwork.go

diff --git a/glide.lock b/glide.lock
index 194b954a29..42cab183ba 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 79f133fbb4e0f79f65f0b5303420513c3e3f8859b9d11ef7b6ff65120dcd29e4
-updated: 2016-07-14T12:45:07.658245282+02:00
+hash: 05a0c03ecc6483a3a678d57fb25ad2077de5725245db02867e7123d38dfc7efe
+updated: 2016-07-21T14:46:44.37734022+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: d77d6e4b99a0d8b6be6f70c623c86ba777110cbd
@@ -183,6 +183,8 @@ imports:
   version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
 - name: github.com/jmespath/go-jmespath
   version: 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
+- name: github.com/jonboulle/clockwork
+  version: 2eee05ed794112d45db504eb05aa693efd2b8b09
 - name: github.com/kballard/go-shellquote
   version: e5c918b80c17694cbc49aab32a759f9a40067f5d
 - name: github.com/klauspost/compress
diff --git a/glide.yaml b/glide.yaml
index 37aada11c7..98044caa3c 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -281,3 +281,5 @@ import:
   version: v1.0
 - package: github.com/klauspost/cpuid
   version: v1.0
+- package: github.com/jonboulle/clockwork
+  version: v0.1.0
diff --git a/vendor/github.com/jonboulle/clockwork/LICENSE b/vendor/github.com/jonboulle/clockwork/LICENSE
new file mode 100644
index 0000000000..5c304d1a4a
--- /dev/null
+++ b/vendor/github.com/jonboulle/clockwork/LICENSE
@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/jonboulle/clockwork/clockwork.go b/vendor/github.com/jonboulle/clockwork/clockwork.go
new file mode 100644
index 0000000000..9ec96ed296
--- /dev/null
+++ b/vendor/github.com/jonboulle/clockwork/clockwork.go
@@ -0,0 +1,169 @@
+package clockwork
+
+import (
+	"sync"
+	"time"
+)
+
+// Clock provides an interface that packages can use instead of directly
+// using the time module, so that chronology-related behavior can be tested
+type Clock interface {
+	After(d time.Duration) <-chan time.Time
+	Sleep(d time.Duration)
+	Now() time.Time
+}
+
+// FakeClock provides an interface for a clock which can be
+// manually advanced through time
+type FakeClock interface {
+	Clock
+	// Advance advances the FakeClock to a new point in time, ensuring any existing
+	// sleepers are notified appropriately before returning
+	Advance(d time.Duration)
+	// BlockUntil will block until the FakeClock has the given number of
+	// sleepers (callers of Sleep or After)
+	BlockUntil(n int)
+}
+
+// NewRealClock returns a Clock which simply delegates calls to the actual time
+// package; it should be used by packages in production.
+func NewRealClock() Clock {
+	return &realClock{}
+}
+
+// NewFakeClock returns a FakeClock implementation which can be
+// manually advanced through time for testing. The initial time of the
+// FakeClock will be an arbitrary non-zero time.
+func NewFakeClock() FakeClock {
+	// use a fixture that does not fulfill Time.IsZero()
+	return NewFakeClockAt(time.Date(1984, time.April, 4, 0, 0, 0, 0, time.UTC))
+}
+
+// NewFakeClockAt returns a FakeClock initialised at the given time.Time.
+func NewFakeClockAt(t time.Time) FakeClock {
+	return &fakeClock{
+		time: t,
+	}
+}
+
+type realClock struct{}
+
+func (rc *realClock) After(d time.Duration) <-chan time.Time {
+	return time.After(d)
+}
+
+func (rc *realClock) Sleep(d time.Duration) {
+	time.Sleep(d)
+}
+
+func (rc *realClock) Now() time.Time {
+	return time.Now()
+}
+
+type fakeClock struct {
+	sleepers []*sleeper
+	blockers []*blocker
+	time     time.Time
+
+	l sync.RWMutex
+}
+
+// sleeper represents a caller of After or Sleep
+type sleeper struct {
+	until time.Time
+	done  chan time.Time
+}
+
+// blocker represents a caller of BlockUntil
+type blocker struct {
+	count int
+	ch    chan struct{}
+}
+
+// After mimics time.After; it waits for the given duration to elapse on the
+// fakeClock, then sends the current time on the returned channel.
+func (fc *fakeClock) After(d time.Duration) <-chan time.Time {
+	fc.l.Lock()
+	defer fc.l.Unlock()
+	now := fc.time
+	done := make(chan time.Time, 1)
+	if d.Nanoseconds() == 0 {
+		// special case - trigger immediately
+		done <- now
+	} else {
+		// otherwise, add to the set of sleepers
+		s := &sleeper{
+			until: now.Add(d),
+			done:  done,
+		}
+		fc.sleepers = append(fc.sleepers, s)
+		// and notify any blockers
+		fc.blockers = notifyBlockers(fc.blockers, len(fc.sleepers))
+	}
+	return done
+}
+
+// notifyBlockers notifies all the blockers waiting until the
+// given number of sleepers are waiting on the fakeClock. It
+// returns an updated slice of blockers (i.e. those still waiting)
+func notifyBlockers(blockers []*blocker, count int) (newBlockers []*blocker) {
+	for _, b := range blockers {
+		if b.count == count {
+			close(b.ch)
+		} else {
+			newBlockers = append(newBlockers, b)
+		}
+	}
+	return
+}
+
+// Sleep blocks until the given duration has passed on the fakeClock
+func (fc *fakeClock) Sleep(d time.Duration) {
+	<-fc.After(d)
+}
+
+// Time returns the current time of the fakeClock
+func (fc *fakeClock) Now() time.Time {
+	fc.l.RLock()
+	t := fc.time
+	fc.l.RUnlock()
+	return t
+}
+
+// Advance advances fakeClock to a new point in time, ensuring channels from any
+// previous invocations of After are notified appropriately before returning
+func (fc *fakeClock) Advance(d time.Duration) {
+	fc.l.Lock()
+	defer fc.l.Unlock()
+	end := fc.time.Add(d)
+	var newSleepers []*sleeper
+	for _, s := range fc.sleepers {
+		if end.Sub(s.until) >= 0 {
+			s.done <- end
+		} else {
+			newSleepers = append(newSleepers, s)
+		}
+	}
+	fc.sleepers = newSleepers
+	fc.blockers = notifyBlockers(fc.blockers, len(fc.sleepers))
+	fc.time = end
+}
+
+// BlockUntil will block until the fakeClock has the given number of sleepers
+// (callers of Sleep or After)
+func (fc *fakeClock) BlockUntil(n int) {
+	fc.l.Lock()
+	// Fast path: current number of sleepers is what we're looking for
+	if len(fc.sleepers) == n {
+		fc.l.Unlock()
+		return
+	}
+	// Otherwise, set up a new blocker
+	b := &blocker{
+		count: n,
+		ch:    make(chan struct{}),
+	}
+	fc.blockers = append(fc.blockers, b)
+	fc.l.Unlock()
+	<-b.ch
+}

From 938714388a5e5be8e9264a19511b4a8571fabbd6 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Wed, 6 Jul 2016 16:36:49 +0200
Subject: [PATCH 0566/1304] store: implement db migration tests

---
 store/migrate.go      |  18 +-
 store/migrate_test.go | 590 ++++++++++++++++++++++++++++++++++++++----
 2 files changed, 555 insertions(+), 53 deletions(-)

diff --git a/store/migrate.go b/store/migrate.go
index 27734ba8a0..167bf17b1f 100644
--- a/store/migrate.go
+++ b/store/migrate.go
@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/errwrap"
+	"github.com/jonboulle/clockwork"
 )
 
 type migrateFunc func(*sql.Tx) error
@@ -35,6 +36,8 @@ var (
 		5: migrateToV5,
 		6: migrateToV6,
 	}
+
+	clock = clockwork.NewRealClock()
 )
 
 func migrate(tx *sql.Tx, finalVersion int) error {
@@ -47,17 +50,18 @@ func migrate(tx *sql.Tx, finalVersion int) error {
 	}
 
 	for v := version + 1; v <= finalVersion; v++ {
-		f, ok := migrateTable[v]
+		migrate, ok := migrateTable[v]
 		if !ok {
 			return fmt.Errorf("missing migrate function for version %d", v)
 		}
-		err := f(tx)
-		if err == nil {
-			updateDBVersion(tx, v)
-		}
-		if err != nil {
+
+		if err := migrate(tx); err != nil {
 			return errwrap.Wrap(fmt.Errorf("failed to migrate db to version %d", v), err)
 		}
+
+		if err := updateDBVersion(tx, v); err != nil {
+			return errwrap.Wrap(fmt.Errorf("updateDBVersion() failed to update the db to version %d", v), err)
+		}
 	}
 	return nil
 }
@@ -126,7 +130,7 @@ func migrateToV4(tx *sql.Tx) error {
 			return err
 		}
 	}
-	t := time.Now().UTC()
+	t := clock.Now().UTC()
 	_, err := tx.Exec("UPDATE aciinfo lastusedtime = $1", t)
 	if err != nil {
 		return err
diff --git a/store/migrate_test.go b/store/migrate_test.go
index 7a9f9ca384..80df14a88e 100644
--- a/store/migrate_test.go
+++ b/store/migrate_test.go
@@ -23,6 +23,8 @@ import (
 	"reflect"
 	"testing"
 	"time"
+
+	"github.com/jonboulle/clockwork"
 )
 
 type testdb interface {
@@ -129,7 +131,7 @@ func (d *DBV1) compare(td testdb) bool {
 
 type DBV2 struct {
 	aciinfos []*ACIInfoV0_2
-	remotes  []*RemoteV2_3
+	remotes  []*RemoteV2_6
 }
 
 func (d *DBV2) version() int {
@@ -146,7 +148,7 @@ func (d *DBV2) load(db *DB) error {
 		if err != nil {
 			return err
 		}
-		d.remotes, err = getAllRemoteV2_3(tx)
+		d.remotes, err = getAllRemoteV2_6(tx)
 		if err != nil {
 			return err
 		}
@@ -174,7 +176,7 @@ func (d *DBV2) compare(td testdb) bool {
 
 type DBV3 struct {
 	aciinfos []*ACIInfoV3
-	remotes  []*RemoteV2_3
+	remotes  []*RemoteV2_6
 }
 
 func (d *DBV3) version() int {
@@ -191,7 +193,7 @@ func (d *DBV3) load(db *DB) error {
 		if err != nil {
 			return err
 		}
-		d.remotes, err = getAllRemoteV2_3(tx)
+		d.remotes, err = getAllRemoteV2_6(tx)
 		if err != nil {
 			return err
 		}
@@ -217,6 +219,141 @@ func (d *DBV3) compare(td testdb) bool {
 	return true
 }
 
+type DBV4 struct {
+	aciinfos []*ACIInfoV4
+	remotes  []*RemoteV2_6
+}
+
+func (d *DBV4) version() int {
+	return 4
+}
+func (d *DBV4) populate(db *DB) error {
+	return populateDBV4(db, d.version(), d.aciinfos, d.remotes)
+}
+
+func (d *DBV4) load(db *DB) error {
+	fn := func(tx *sql.Tx) error {
+		var err error
+		d.aciinfos, err = getAllACIInfosV4(tx)
+		if err != nil {
+			return err
+		}
+		d.remotes, err = getAllRemoteV2_6(tx)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (d *DBV4) compare(td testdb) bool {
+	d4, ok := td.(*DBV4)
+	if !ok {
+		return false
+	}
+	if !compareSlicesNoOrder(d.aciinfos, d4.aciinfos) {
+		return false
+	}
+	if !compareSlicesNoOrder(d.remotes, d4.remotes) {
+		return false
+	}
+	return true
+}
+
+type DBV5 struct {
+	aciinfos []*ACIInfoV5
+	remotes  []*RemoteV2_6
+}
+
+func (d *DBV5) version() int {
+	return 5
+}
+func (d *DBV5) populate(db *DB) error {
+	return populateDBV5(db, d.version(), d.aciinfos, d.remotes)
+}
+
+func (d *DBV5) load(db *DB) error {
+	fn := func(tx *sql.Tx) error {
+		var err error
+		d.aciinfos, err = getAllACIInfosV5(tx)
+		if err != nil {
+			return err
+		}
+		d.remotes, err = getAllRemoteV2_6(tx)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (d *DBV5) compare(td testdb) bool {
+	d5, ok := td.(*DBV5)
+	if !ok {
+		return false
+	}
+	if !compareSlicesNoOrder(d.aciinfos, d5.aciinfos) {
+		return false
+	}
+	if !compareSlicesNoOrder(d.remotes, d5.remotes) {
+		return false
+	}
+	return true
+}
+
+type DBV6 struct {
+	aciinfos []*ACIInfoV6
+	remotes  []*RemoteV2_6
+}
+
+func (d *DBV6) version() int {
+	return 6
+}
+func (d *DBV6) populate(db *DB) error {
+	return populateDBV6(db, d.version(), d.aciinfos, d.remotes)
+}
+
+func (d *DBV6) load(db *DB) error {
+	fn := func(tx *sql.Tx) error {
+		var err error
+		d.aciinfos, err = getAllACIInfosV6(tx)
+		if err != nil {
+			return err
+		}
+		d.remotes, err = getAllRemoteV2_6(tx)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (d *DBV6) compare(td testdb) bool {
+	d6, ok := td.(*DBV6)
+	if !ok {
+		return false
+	}
+	if !compareSlicesNoOrder(d.aciinfos, d6.aciinfos) {
+		return false
+	}
+	if !compareSlicesNoOrder(d.remotes, d6.remotes) {
+		return false
+	}
+	return true
+}
+
 // The ACIInfo struct for different db versions. The ending VX_Y represent the
 // first and the last version where the format isn't changed
 // The latest existing struct should be updated when updating the db version
@@ -237,9 +374,38 @@ type ACIInfoV3 struct {
 	Latest     bool
 }
 
+type ACIInfoV4 struct {
+	BlobKey    string
+	Name       string
+	ImportTime time.Time
+	LastUsed   time.Time
+	Latest     bool
+}
+
+type ACIInfoV5 struct {
+	BlobKey       string
+	Name          string
+	ImportTime    time.Time
+	LastUsed      time.Time
+	Latest        bool
+	Size          int64
+	TreeStoreSize int64
+}
+
+type ACIInfoV6 struct {
+	BlobKey         string
+	Name            string
+	ImportTime      time.Time
+	LastUsed        time.Time
+	Latest          bool
+	Size            int64
+	TreeStoreSize   int64
+	InsecureOptions int64
+}
+
 func getAllACIInfosV0_2(tx *sql.Tx) ([]*ACIInfoV0_2, error) {
 	var aciinfos []*ACIInfoV0_2
-	rows, err := tx.Query("SELECT * from aciinfo")
+	rows, err := tx.Query("SELECT * FROM aciinfo")
 	if err != nil {
 		return nil, err
 	}
@@ -258,7 +424,7 @@ func getAllACIInfosV0_2(tx *sql.Tx) ([]*ACIInfoV0_2, error) {
 
 func getAllACIInfosV3(tx *sql.Tx) ([]*ACIInfoV3, error) {
 	var aciinfos []*ACIInfoV3
-	rows, err := tx.Query("SELECT * from aciinfo")
+	rows, err := tx.Query("SELECT * FROM aciinfo")
 	if err != nil {
 		return nil, err
 	}
@@ -275,6 +441,63 @@ func getAllACIInfosV3(tx *sql.Tx) ([]*ACIInfoV3, error) {
 	return aciinfos, nil
 }
 
+func getAllACIInfosV4(tx *sql.Tx) ([]*ACIInfoV4, error) {
+	var aciinfos []*ACIInfoV4
+	rows, err := tx.Query("SELECT * FROM aciinfo")
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		aciinfo := &ACIInfoV4{}
+		if rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest); err != nil {
+			return nil, err
+		}
+		aciinfos = append(aciinfos, aciinfo)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return aciinfos, nil
+}
+
+func getAllACIInfosV5(tx *sql.Tx) ([]*ACIInfoV5, error) {
+	var aciinfos []*ACIInfoV5
+	rows, err := tx.Query("SELECT * FROM aciinfo")
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		aciinfo := &ACIInfoV5{}
+		if rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize); err != nil {
+			return nil, err
+		}
+		aciinfos = append(aciinfos, aciinfo)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return aciinfos, nil
+}
+
+func getAllACIInfosV6(tx *sql.Tx) ([]*ACIInfoV6, error) {
+	var aciinfos []*ACIInfoV6
+	rows, err := tx.Query("SELECT * FROM aciinfo")
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		aciinfo := &ACIInfoV6{}
+		if rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize, &aciinfo.InsecureOptions); err != nil {
+			return nil, err
+		}
+		aciinfos = append(aciinfos, aciinfo)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return aciinfos, nil
+}
+
 type RemoteV0_1 struct {
 	ACIURL  string
 	SigURL  string
@@ -284,7 +507,7 @@ type RemoteV0_1 struct {
 
 func getAllRemoteV0_1(tx *sql.Tx) ([]*RemoteV0_1, error) {
 	var remotes []*RemoteV0_1
-	rows, err := tx.Query("SELECT * from remote")
+	rows, err := tx.Query("SELECT * FROM remote")
 	if err != nil {
 		return nil, err
 	}
@@ -301,7 +524,7 @@ func getAllRemoteV0_1(tx *sql.Tx) ([]*RemoteV0_1, error) {
 	return remotes, nil
 }
 
-type RemoteV2_3 struct {
+type RemoteV2_6 struct {
 	ACIURL       string
 	SigURL       string
 	ETag         string
@@ -310,14 +533,14 @@ type RemoteV2_3 struct {
 	DownloadTime time.Time
 }
 
-func getAllRemoteV2_3(tx *sql.Tx) ([]*RemoteV2_3, error) {
-	var remotes []*RemoteV2_3
-	rows, err := tx.Query("SELECT * from remote")
+func getAllRemoteV2_6(tx *sql.Tx) ([]*RemoteV2_6, error) {
+	var remotes []*RemoteV2_6
+	rows, err := tx.Query("SELECT * FROM remote")
 	if err != nil {
 		return nil, err
 	}
 	for rows.Next() {
-		remote := &RemoteV2_3{}
+		remote := &RemoteV2_6{}
 		if err := rows.Scan(&remote.ACIURL, &remote.SigURL, &remote.ETag, &remote.BlobKey, &remote.CacheMaxAge, &remote.DownloadTime); err != nil {
 			return nil, err
 		}
@@ -387,7 +610,7 @@ func populateDBV0_1(db *DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*R
 	return nil
 }
 
-func populateDBV2(db *DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*RemoteV2_3) error {
+func populateDBV2(db *DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*RemoteV2_6) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -445,7 +668,7 @@ func populateDBV2(db *DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*Rem
 	return nil
 }
 
-func populateDBV3(db *DB, dbVersion int, aciInfos []*ACIInfoV3, remotes []*RemoteV2_3) error {
+func populateDBV3(db *DB, dbVersion int, aciInfos []*ACIInfoV3, remotes []*RemoteV2_6) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -500,7 +723,177 @@ func populateDBV3(db *DB, dbVersion int, aciInfos []*ACIInfoV3, remotes []*Remot
 	}
 
 	return nil
+}
+
+func populateDBV4(db *DB, dbVersion int, aciInfos []*ACIInfoV4, remotes []*RemoteV2_6) error {
+	var dbCreateStmts = [...]string{
+		// version table
+		"CREATE TABLE IF NOT EXISTS version (version int);",
+		fmt.Sprintf("INSERT INTO version VALUES (%d)", dbVersion),
+
+		// remote table. The primary key is "aciurl".
+		"CREATE TABLE IF NOT EXISTS remote (aciurl string, sigurl string, etag string, blobkey string, cachemaxage int, downloadtime time);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS aciurlidx ON remote (aciurl)",
+
+		// aciinfo table. The primary key is "blobkey" and it matches the key used to save that aci in the blob store
+		"CREATE TABLE IF NOT EXISTS aciinfo (blobkey string, name string, importtime time, lastusedtime time, latest bool);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS blobkeyidx ON aciinfo (blobkey)",
+		"CREATE INDEX IF NOT EXISTS nameidx ON aciinfo (name)",
+	}
+	fn := func(tx *sql.Tx) error {
+		for _, stmt := range dbCreateStmts {
+			_, err := tx.Exec(stmt)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	fn = func(tx *sql.Tx) error {
+		for _, aciinfo := range aciInfos {
+			_, err := tx.Exec("INSERT INTO aciinfo (blobkey, name, importtime, lastusedtime, latest) VALUES ($1, $2, $3, $4, $5)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	fn = func(tx *sql.Tx) error {
+		for _, remote := range remotes {
+			_, err := tx.Exec("INSERT into remote values ($1, $2, $3, $4, $5, $6)", remote.ACIURL, remote.SigURL, remote.ETag, remote.BlobKey, remote.CacheMaxAge, remote.DownloadTime)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func populateDBV5(db *DB, dbVersion int, aciInfos []*ACIInfoV5, remotes []*RemoteV2_6) error {
+	var dbCreateStmts = [...]string{
+		// version table
+		"CREATE TABLE IF NOT EXISTS version (version int);",
+		fmt.Sprintf("INSERT INTO version VALUES (%d)", dbVersion),
+
+		// remote table. The primary key is "aciurl".
+		"CREATE TABLE IF NOT EXISTS remote (aciurl string, sigurl string, etag string, blobkey string, cachemaxage int, downloadtime time);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS aciurlidx ON remote (aciurl)",
+
+		// aciinfo table. The primary key is "blobkey" and it matches the key used to save that aci in the blob store
+		"CREATE TABLE IF NOT EXISTS aciinfo (blobkey string, name string, importtime time, lastused time, latest bool, size int64, treestoresize int64);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS blobkeyidx ON aciinfo (blobkey)",
+		"CREATE INDEX IF NOT EXISTS nameidx ON aciinfo (name)",
+	}
+	fn := func(tx *sql.Tx) error {
+		for _, stmt := range dbCreateStmts {
+			_, err := tx.Exec(stmt)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	fn = func(tx *sql.Tx) error {
+		for _, aciinfo := range aciInfos {
+			_, err := tx.Exec("INSERT INTO aciinfo (blobkey, name, importtime, lastused, latest, size, treestoresize) VALUES ($1, $2, $3, $4, $5, $6, $7)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest, aciinfo.Size, aciinfo.TreeStoreSize)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	fn = func(tx *sql.Tx) error {
+		for _, remote := range remotes {
+			_, err := tx.Exec("INSERT into remote values ($1, $2, $3, $4, $5, $6)", remote.ACIURL, remote.SigURL, remote.ETag, remote.BlobKey, remote.CacheMaxAge, remote.DownloadTime)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func populateDBV6(db *DB, dbVersion int, aciInfos []*ACIInfoV6, remotes []*RemoteV2_6) error {
+	var dbCreateStmts = [...]string{
+		// version table
+		"CREATE TABLE IF NOT EXISTS version (version int);",
+		fmt.Sprintf("INSERT INTO version VALUES (%d)", dbVersion),
+
+		// remote table. The primary key is "aciurl".
+		"CREATE TABLE IF NOT EXISTS remote (aciurl string, sigurl string, etag string, blobkey string, cachemaxage int, downloadtime time);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS aciurlidx ON remote (aciurl)",
 
+		// aciinfo table. The primary key is "blobkey" and it matches the key used to save that aci in the blob store
+		"CREATE TABLE IF NOT EXISTS aciinfo (blobkey string, name string, importtime time, lastused time, latest bool, size int64, treestoresize int64, insecureoptions int64 DEFAULT 0);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS blobkeyidx ON aciinfo (blobkey)",
+		"CREATE INDEX IF NOT EXISTS nameidx ON aciinfo (name)",
+	}
+	fn := func(tx *sql.Tx) error {
+		for _, stmt := range dbCreateStmts {
+			_, err := tx.Exec(stmt)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	fn = func(tx *sql.Tx) error {
+		for _, aciinfo := range aciInfos {
+			_, err := tx.Exec("INSERT INTO aciinfo (blobkey, name, importtime, lastused, latest, size, treestoresize, souceurl, insecureoptions) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest, aciinfo.Size, aciinfo.TreeStoreSize, aciinfo.InsecureOptions)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	fn = func(tx *sql.Tx) error {
+		for _, remote := range remotes {
+			_, err := tx.Exec("INSERT into remote values ($1, $2, $3, $4, $5, $6)", remote.ACIURL, remote.SigURL, remote.ETag, remote.BlobKey, remote.CacheMaxAge, remote.DownloadTime)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	return nil
 }
 
 type migrateTest struct {
@@ -561,6 +954,7 @@ func testMigrate(tt migrateTest) error {
 		// Use something like go-spew to write the full data?
 		return fmt.Errorf("got %#v, want %#v", tt.curdb, tt.postdb)
 	}
+
 	return nil
 }
 
@@ -571,86 +965,188 @@ func TestMigrate(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 
-	now := time.Now()
+	blobKeys := []string{
+		"sha512-aaaaaaaa",
+		"sha512-bbbbbbbb",
+	}
+
+	names := []string{
+		"example.com/app01",
+		"example.com/app02",
+	}
+
+	sizes := []int64{
+		0,
+		2 << 8,
+	}
+
+	treeStoreSizes := []int64{
+		0,
+		2 << 8,
+	}
+
+	now := time.Now().UTC()
+
+	// Injects a fake clock to store pkg clock
+	clock = clockwork.NewFakeClockAt(now)
+
 	tests := []migrateTest{
-		// Test migration from V0 to V1
-		// Empty db
 		{
+			// Test migration from V0 to V1 with an empty database
 			&DBV0{},
 			&DBV1{},
 			&DBV1{},
 		},
+
 		{
+			// Test migration from V0 to V1
 			&DBV0{
 				[]*ACIInfoV0_2{
-					{"sha512-aaaaaaaa", "example.com/app01", now, false},
-					{"sha512-bbbbbbbb", "example.com/app02", now, true},
+					{blobKeys[0], names[0], now, false},
+					{blobKeys[1], names[1], now, true},
 				},
 				[]*RemoteV0_1{
-					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", "sha512-aaaaaaaa"},
-					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", "sha512-bbbbbbbb"},
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0]},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1]},
 				},
 			},
 			&DBV1{
 				[]*ACIInfoV0_2{
-					{"sha512-aaaaaaaa", "example.com/app01", now, false},
-					{"sha512-bbbbbbbb", "example.com/app02", now, true},
+					{blobKeys[0], names[0], now, false},
+					{blobKeys[1], names[1], now, true},
 				},
 				[]*RemoteV0_1{
-					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", "sha512-aaaaaaaa"},
-					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", "sha512-bbbbbbbb"},
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0]},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1]},
 				},
 			},
 			&DBV1{},
 		},
-		// Test migration from V1 to V2
+
 		{
+			// Test migration from V1 to V2
 			&DBV1{
 				[]*ACIInfoV0_2{
-					{"sha512-aaaaaaaa", "example.com/app01", now, false},
-					{"sha512-bbbbbbbb", "example.com/app02", now, true},
+					{blobKeys[0], "example.com/app01", now, false},
+					{blobKeys[1], "example.com/app02", now, true},
 				},
 				[]*RemoteV0_1{
-					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", "sha512-aaaaaaaa"},
-					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", "sha512-bbbbbbbb"},
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0]},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1]},
 				},
 			},
 			&DBV2{
 				[]*ACIInfoV0_2{
-					{"sha512-aaaaaaaa", "example.com/app01", now, false},
-					{"sha512-bbbbbbbb", "example.com/app02", now, true},
+					{blobKeys[0], "example.com/app01", now, false},
+					{blobKeys[1], "example.com/app02", now, true},
 				},
-				[]*RemoteV2_3{
-					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", "sha512-aaaaaaaa", 0, time.Time{}.UTC()},
-					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", "sha512-bbbbbbbb", 0, time.Time{}.UTC()},
+				[]*RemoteV2_6{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
 			},
 			&DBV2{},
 		},
-		// Test migration from V1 to V3
+
 		{
+			// Test migration from V2 to V3
 			&DBV2{
 				[]*ACIInfoV0_2{
-					{"sha512-aaaaaaaa", "example.com/app01", now, false},
-					{"sha512-bbbbbbbb", "example.com/app02", now, true},
+					{blobKeys[0], "example.com/app01", now, false},
+					{blobKeys[1], "example.com/app02", now, true},
 				},
-				[]*RemoteV2_3{
-					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", "sha512-aaaaaaaa", 0, time.Time{}.UTC()},
-					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", "sha512-bbbbbbbb", 0, time.Time{}.UTC()},
+				[]*RemoteV2_6{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
 			},
 			&DBV3{
 				[]*ACIInfoV3{
-					{"sha512-aaaaaaaa", "example.com/app01", now, false},
-					{"sha512-bbbbbbbb", "example.com/app02", now, true},
+					{blobKeys[0], "example.com/app01", now, false},
+					{blobKeys[1], "example.com/app02", now, true},
 				},
-				[]*RemoteV2_3{
-					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", "sha512-aaaaaaaa", 0, time.Time{}.UTC()},
-					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", "sha512-bbbbbbbb", 0, time.Time{}.UTC()},
+				[]*RemoteV2_6{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
 			},
 			&DBV3{},
 		},
+
+		{
+			// Test migration from V3 to V4
+			&DBV3{
+				[]*ACIInfoV3{
+					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, Latest: false},
+					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, Latest: true},
+				},
+				[]*RemoteV2_6{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
+				},
+			},
+			&DBV4{
+				[]*ACIInfoV4{
+					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false},
+					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true},
+				},
+				[]*RemoteV2_6{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
+				},
+			},
+			&DBV4{},
+		},
+
+		{
+			// Test migration from V4 to V5
+			&DBV4{
+				[]*ACIInfoV4{
+					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false},
+					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true},
+				},
+				[]*RemoteV2_6{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
+				},
+			},
+			&DBV5{
+				[]*ACIInfoV5{
+					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false},
+					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true},
+				},
+				[]*RemoteV2_6{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
+				},
+			},
+			&DBV5{},
+		},
+
+		{
+			// Test migration from V5 to V6
+			&DBV5{
+				[]*ACIInfoV5{
+					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false, Size: sizes[0], TreeStoreSize: treeStoreSizes[0]},
+					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true, Size: sizes[1], TreeStoreSize: treeStoreSizes[1]},
+				},
+				[]*RemoteV2_6{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
+				},
+			},
+			&DBV6{
+				[]*ACIInfoV6{
+					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false, Size: sizes[0], TreeStoreSize: treeStoreSizes[0]},
+					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true, Size: sizes[1], TreeStoreSize: treeStoreSizes[1]},
+				},
+				[]*RemoteV2_6{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
+				},
+			},
+			&DBV6{},
+		},
 	}
 
 	for i, tt := range tests {
@@ -676,12 +1172,14 @@ func compareSlicesNoOrder(i1 interface{}, i2 interface{}) bool {
 			if _, ok := seen[i2]; ok {
 				continue
 			}
+
 			if reflect.DeepEqual(v1, v2) {
 				found = true
 				seen[i2] = true
 				continue
 			}
 		}
+
 		if !found {
 			return false
 		}

From bac20d018e985f74fa7a66376a3c61c45e2da16f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 21 Jul 2016 14:52:17 +0200
Subject: [PATCH 0567/1304] glide: vendor davecgh/go-spew

---
 glide.lock                                    |   8 +-
 glide.yaml                                    |   4 +
 vendor/github.com/davecgh/go-spew/LICENSE     |  13 +
 .../github.com/davecgh/go-spew/spew/bypass.go | 151 ++++++
 .../davecgh/go-spew/spew/bypasssafe.go        |  37 ++
 .../github.com/davecgh/go-spew/spew/common.go | 341 ++++++++++++
 .../github.com/davecgh/go-spew/spew/config.go | 297 ++++++++++
 vendor/github.com/davecgh/go-spew/spew/doc.go | 202 +++++++
 .../github.com/davecgh/go-spew/spew/dump.go   | 509 ++++++++++++++++++
 .../github.com/davecgh/go-spew/spew/format.go | 419 ++++++++++++++
 .../github.com/davecgh/go-spew/spew/spew.go   | 148 +++++
 11 files changed, 2127 insertions(+), 2 deletions(-)
 create mode 100644 vendor/github.com/davecgh/go-spew/LICENSE
 create mode 100644 vendor/github.com/davecgh/go-spew/spew/bypass.go
 create mode 100644 vendor/github.com/davecgh/go-spew/spew/bypasssafe.go
 create mode 100644 vendor/github.com/davecgh/go-spew/spew/common.go
 create mode 100644 vendor/github.com/davecgh/go-spew/spew/config.go
 create mode 100644 vendor/github.com/davecgh/go-spew/spew/doc.go
 create mode 100644 vendor/github.com/davecgh/go-spew/spew/dump.go
 create mode 100644 vendor/github.com/davecgh/go-spew/spew/format.go
 create mode 100644 vendor/github.com/davecgh/go-spew/spew/spew.go

diff --git a/glide.lock b/glide.lock
index 42cab183ba..885d6f201e 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 05a0c03ecc6483a3a678d57fb25ad2077de5725245db02867e7123d38dfc7efe
-updated: 2016-07-21T14:46:44.37734022+02:00
+hash: 987b9326351872beba11bdd392a840167eeccaca6394fa11120c3b0733cb9de5
+updated: 2016-07-21T14:52:03.860669235+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: d77d6e4b99a0d8b6be6f70c623c86ba777110cbd
@@ -139,6 +139,10 @@ imports:
   version: f0e4d29ff0231dce36e250b2ed9ff08412584bca
 - name: github.com/d2g/dhcp4client
   version: bed07e1bc5b85f69c6f0fd73393aa35ec68ed892
+- name: github.com/davecgh/go-spew
+  version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
+  subpackages:
+  - spew
 - name: github.com/docker/distribution
   version: 099622876197e3b24d627a72053d1bcc8968076a
   subpackages:
diff --git a/glide.yaml b/glide.yaml
index 98044caa3c..8685879635 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -283,3 +283,7 @@ import:
   version: v1.0
 - package: github.com/jonboulle/clockwork
   version: v0.1.0
+- package: github.com/davecgh/go-spew
+  version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
+  subpackages:
+  - spew
diff --git a/vendor/github.com/davecgh/go-spew/LICENSE b/vendor/github.com/davecgh/go-spew/LICENSE
new file mode 100644
index 0000000000..2a7cfd2bf6
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2012-2013 Dave Collins <dave@davec.name>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/vendor/github.com/davecgh/go-spew/spew/bypass.go b/vendor/github.com/davecgh/go-spew/spew/bypass.go
new file mode 100644
index 0000000000..565bf5899f
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/spew/bypass.go
@@ -0,0 +1,151 @@
+// Copyright (c) 2015 Dave Collins <dave@davec.name>
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+// NOTE: Due to the following build constraints, this file will only be compiled
+// when the code is not running on Google App Engine and "-tags disableunsafe"
+// is not added to the go build command line.
+// +build !appengine,!disableunsafe
+
+package spew
+
+import (
+	"reflect"
+	"unsafe"
+)
+
+const (
+	// UnsafeDisabled is a build-time constant which specifies whether or
+	// not access to the unsafe package is available.
+	UnsafeDisabled = false
+
+	// ptrSize is the size of a pointer on the current arch.
+	ptrSize = unsafe.Sizeof((*byte)(nil))
+)
+
+var (
+	// offsetPtr, offsetScalar, and offsetFlag are the offsets for the
+	// internal reflect.Value fields.  These values are valid before golang
+	// commit ecccf07e7f9d which changed the format.  The are also valid
+	// after commit 82f48826c6c7 which changed the format again to mirror
+	// the original format.  Code in the init function updates these offsets
+	// as necessary.
+	offsetPtr    = uintptr(ptrSize)
+	offsetScalar = uintptr(0)
+	offsetFlag   = uintptr(ptrSize * 2)
+
+	// flagKindWidth and flagKindShift indicate various bits that the
+	// reflect package uses internally to track kind information.
+	//
+	// flagRO indicates whether or not the value field of a reflect.Value is
+	// read-only.
+	//
+	// flagIndir indicates whether the value field of a reflect.Value is
+	// the actual data or a pointer to the data.
+	//
+	// These values are valid before golang commit 90a7c3c86944 which
+	// changed their positions.  Code in the init function updates these
+	// flags as necessary.
+	flagKindWidth = uintptr(5)
+	flagKindShift = uintptr(flagKindWidth - 1)
+	flagRO        = uintptr(1 << 0)
+	flagIndir     = uintptr(1 << 1)
+)
+
+func init() {
+	// Older versions of reflect.Value stored small integers directly in the
+	// ptr field (which is named val in the older versions).  Versions
+	// between commits ecccf07e7f9d and 82f48826c6c7 added a new field named
+	// scalar for this purpose which unfortunately came before the flag
+	// field, so the offset of the flag field is different for those
+	// versions.
+	//
+	// This code constructs a new reflect.Value from a known small integer
+	// and checks if the size of the reflect.Value struct indicates it has
+	// the scalar field. When it does, the offsets are updated accordingly.
+	vv := reflect.ValueOf(0xf00)
+	if unsafe.Sizeof(vv) == (ptrSize * 4) {
+		offsetScalar = ptrSize * 2
+		offsetFlag = ptrSize * 3
+	}
+
+	// Commit 90a7c3c86944 changed the flag positions such that the low
+	// order bits are the kind.  This code extracts the kind from the flags
+	// field and ensures it's the correct type.  When it's not, the flag
+	// order has been changed to the newer format, so the flags are updated
+	// accordingly.
+	upf := unsafe.Pointer(uintptr(unsafe.Pointer(&vv)) + offsetFlag)
+	upfv := *(*uintptr)(upf)
+	flagKindMask := uintptr((1<<flagKindWidth - 1) << flagKindShift)
+	if (upfv&flagKindMask)>>flagKindShift != uintptr(reflect.Int) {
+		flagKindShift = 0
+		flagRO = 1 << 5
+		flagIndir = 1 << 6
+
+		// Commit adf9b30e5594 modified the flags to separate the
+		// flagRO flag into two bits which specifies whether or not the
+		// field is embedded.  This causes flagIndir to move over a bit
+		// and means that flagRO is the combination of either of the
+		// original flagRO bit and the new bit.
+		//
+		// This code detects the change by extracting what used to be
+		// the indirect bit to ensure it's set.  When it's not, the flag
+		// order has been changed to the newer format, so the flags are
+		// updated accordingly.
+		if upfv&flagIndir == 0 {
+			flagRO = 3 << 5
+			flagIndir = 1 << 7
+		}
+	}
+}
+
+// unsafeReflectValue converts the passed reflect.Value into a one that bypasses
+// the typical safety restrictions preventing access to unaddressable and
+// unexported data.  It works by digging the raw pointer to the underlying
+// value out of the protected value and generating a new unprotected (unsafe)
+// reflect.Value to it.
+//
+// This allows us to check for implementations of the Stringer and error
+// interfaces to be used for pretty printing ordinarily unaddressable and
+// inaccessible values such as unexported struct fields.
+func unsafeReflectValue(v reflect.Value) (rv reflect.Value) {
+	indirects := 1
+	vt := v.Type()
+	upv := unsafe.Pointer(uintptr(unsafe.Pointer(&v)) + offsetPtr)
+	rvf := *(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&v)) + offsetFlag))
+	if rvf&flagIndir != 0 {
+		vt = reflect.PtrTo(v.Type())
+		indirects++
+	} else if offsetScalar != 0 {
+		// The value is in the scalar field when it's not one of the
+		// reference types.
+		switch vt.Kind() {
+		case reflect.Uintptr:
+		case reflect.Chan:
+		case reflect.Func:
+		case reflect.Map:
+		case reflect.Ptr:
+		case reflect.UnsafePointer:
+		default:
+			upv = unsafe.Pointer(uintptr(unsafe.Pointer(&v)) +
+				offsetScalar)
+		}
+	}
+
+	pv := reflect.NewAt(vt, upv)
+	rv = pv
+	for i := 0; i < indirects; i++ {
+		rv = rv.Elem()
+	}
+	return rv
+}
diff --git a/vendor/github.com/davecgh/go-spew/spew/bypasssafe.go b/vendor/github.com/davecgh/go-spew/spew/bypasssafe.go
new file mode 100644
index 0000000000..457e41235e
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/spew/bypasssafe.go
@@ -0,0 +1,37 @@
+// Copyright (c) 2015 Dave Collins <dave@davec.name>
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+// NOTE: Due to the following build constraints, this file will only be compiled
+// when either the code is running on Google App Engine or "-tags disableunsafe"
+// is added to the go build command line.
+// +build appengine disableunsafe
+
+package spew
+
+import "reflect"
+
+const (
+	// UnsafeDisabled is a build-time constant which specifies whether or
+	// not access to the unsafe package is available.
+	UnsafeDisabled = true
+)
+
+// unsafeReflectValue typically converts the passed reflect.Value into a one
+// that bypasses the typical safety restrictions preventing access to
+// unaddressable and unexported data.  However, doing this relies on access to
+// the unsafe package.  This is a stub version which simply returns the passed
+// reflect.Value when the unsafe package is not available.
+func unsafeReflectValue(v reflect.Value) reflect.Value {
+	return v
+}
diff --git a/vendor/github.com/davecgh/go-spew/spew/common.go b/vendor/github.com/davecgh/go-spew/spew/common.go
new file mode 100644
index 0000000000..14f02dc15b
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/spew/common.go
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2013 Dave Collins <dave@davec.name>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+package spew
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"reflect"
+	"sort"
+	"strconv"
+)
+
+// Some constants in the form of bytes to avoid string overhead.  This mirrors
+// the technique used in the fmt package.
+var (
+	panicBytes            = []byte("(PANIC=")
+	plusBytes             = []byte("+")
+	iBytes                = []byte("i")
+	trueBytes             = []byte("true")
+	falseBytes            = []byte("false")
+	interfaceBytes        = []byte("(interface {})")
+	commaNewlineBytes     = []byte(",\n")
+	newlineBytes          = []byte("\n")
+	openBraceBytes        = []byte("{")
+	openBraceNewlineBytes = []byte("{\n")
+	closeBraceBytes       = []byte("}")
+	asteriskBytes         = []byte("*")
+	colonBytes            = []byte(":")
+	colonSpaceBytes       = []byte(": ")
+	openParenBytes        = []byte("(")
+	closeParenBytes       = []byte(")")
+	spaceBytes            = []byte(" ")
+	pointerChainBytes     = []byte("->")
+	nilAngleBytes         = []byte("<nil>")
+	maxNewlineBytes       = []byte("<max depth reached>\n")
+	maxShortBytes         = []byte("<max>")
+	circularBytes         = []byte("<already shown>")
+	circularShortBytes    = []byte("<shown>")
+	invalidAngleBytes     = []byte("<invalid>")
+	openBracketBytes      = []byte("[")
+	closeBracketBytes     = []byte("]")
+	percentBytes          = []byte("%")
+	precisionBytes        = []byte(".")
+	openAngleBytes        = []byte("<")
+	closeAngleBytes       = []byte(">")
+	openMapBytes          = []byte("map[")
+	closeMapBytes         = []byte("]")
+	lenEqualsBytes        = []byte("len=")
+	capEqualsBytes        = []byte("cap=")
+)
+
+// hexDigits is used to map a decimal value to a hex digit.
+var hexDigits = "0123456789abcdef"
+
+// catchPanic handles any panics that might occur during the handleMethods
+// calls.
+func catchPanic(w io.Writer, v reflect.Value) {
+	if err := recover(); err != nil {
+		w.Write(panicBytes)
+		fmt.Fprintf(w, "%v", err)
+		w.Write(closeParenBytes)
+	}
+}
+
+// handleMethods attempts to call the Error and String methods on the underlying
+// type the passed reflect.Value represents and outputes the result to Writer w.
+//
+// It handles panics in any called methods by catching and displaying the error
+// as the formatted value.
+func handleMethods(cs *ConfigState, w io.Writer, v reflect.Value) (handled bool) {
+	// We need an interface to check if the type implements the error or
+	// Stringer interface.  However, the reflect package won't give us an
+	// interface on certain things like unexported struct fields in order
+	// to enforce visibility rules.  We use unsafe, when it's available,
+	// to bypass these restrictions since this package does not mutate the
+	// values.
+	if !v.CanInterface() {
+		if UnsafeDisabled {
+			return false
+		}
+
+		v = unsafeReflectValue(v)
+	}
+
+	// Choose whether or not to do error and Stringer interface lookups against
+	// the base type or a pointer to the base type depending on settings.
+	// Technically calling one of these methods with a pointer receiver can
+	// mutate the value, however, types which choose to satisify an error or
+	// Stringer interface with a pointer receiver should not be mutating their
+	// state inside these interface methods.
+	if !cs.DisablePointerMethods && !UnsafeDisabled && !v.CanAddr() {
+		v = unsafeReflectValue(v)
+	}
+	if v.CanAddr() {
+		v = v.Addr()
+	}
+
+	// Is it an error or Stringer?
+	switch iface := v.Interface().(type) {
+	case error:
+		defer catchPanic(w, v)
+		if cs.ContinueOnMethod {
+			w.Write(openParenBytes)
+			w.Write([]byte(iface.Error()))
+			w.Write(closeParenBytes)
+			w.Write(spaceBytes)
+			return false
+		}
+
+		w.Write([]byte(iface.Error()))
+		return true
+
+	case fmt.Stringer:
+		defer catchPanic(w, v)
+		if cs.ContinueOnMethod {
+			w.Write(openParenBytes)
+			w.Write([]byte(iface.String()))
+			w.Write(closeParenBytes)
+			w.Write(spaceBytes)
+			return false
+		}
+		w.Write([]byte(iface.String()))
+		return true
+	}
+	return false
+}
+
+// printBool outputs a boolean value as true or false to Writer w.
+func printBool(w io.Writer, val bool) {
+	if val {
+		w.Write(trueBytes)
+	} else {
+		w.Write(falseBytes)
+	}
+}
+
+// printInt outputs a signed integer value to Writer w.
+func printInt(w io.Writer, val int64, base int) {
+	w.Write([]byte(strconv.FormatInt(val, base)))
+}
+
+// printUint outputs an unsigned integer value to Writer w.
+func printUint(w io.Writer, val uint64, base int) {
+	w.Write([]byte(strconv.FormatUint(val, base)))
+}
+
+// printFloat outputs a floating point value using the specified precision,
+// which is expected to be 32 or 64bit, to Writer w.
+func printFloat(w io.Writer, val float64, precision int) {
+	w.Write([]byte(strconv.FormatFloat(val, 'g', -1, precision)))
+}
+
+// printComplex outputs a complex value using the specified float precision
+// for the real and imaginary parts to Writer w.
+func printComplex(w io.Writer, c complex128, floatPrecision int) {
+	r := real(c)
+	w.Write(openParenBytes)
+	w.Write([]byte(strconv.FormatFloat(r, 'g', -1, floatPrecision)))
+	i := imag(c)
+	if i >= 0 {
+		w.Write(plusBytes)
+	}
+	w.Write([]byte(strconv.FormatFloat(i, 'g', -1, floatPrecision)))
+	w.Write(iBytes)
+	w.Write(closeParenBytes)
+}
+
+// printHexPtr outputs a uintptr formatted as hexidecimal with a leading '0x'
+// prefix to Writer w.
+func printHexPtr(w io.Writer, p uintptr) {
+	// Null pointer.
+	num := uint64(p)
+	if num == 0 {
+		w.Write(nilAngleBytes)
+		return
+	}
+
+	// Max uint64 is 16 bytes in hex + 2 bytes for '0x' prefix
+	buf := make([]byte, 18)
+
+	// It's simpler to construct the hex string right to left.
+	base := uint64(16)
+	i := len(buf) - 1
+	for num >= base {
+		buf[i] = hexDigits[num%base]
+		num /= base
+		i--
+	}
+	buf[i] = hexDigits[num]
+
+	// Add '0x' prefix.
+	i--
+	buf[i] = 'x'
+	i--
+	buf[i] = '0'
+
+	// Strip unused leading bytes.
+	buf = buf[i:]
+	w.Write(buf)
+}
+
+// valuesSorter implements sort.Interface to allow a slice of reflect.Value
+// elements to be sorted.
+type valuesSorter struct {
+	values  []reflect.Value
+	strings []string // either nil or same len and values
+	cs      *ConfigState
+}
+
+// newValuesSorter initializes a valuesSorter instance, which holds a set of
+// surrogate keys on which the data should be sorted.  It uses flags in
+// ConfigState to decide if and how to populate those surrogate keys.
+func newValuesSorter(values []reflect.Value, cs *ConfigState) sort.Interface {
+	vs := &valuesSorter{values: values, cs: cs}
+	if canSortSimply(vs.values[0].Kind()) {
+		return vs
+	}
+	if !cs.DisableMethods {
+		vs.strings = make([]string, len(values))
+		for i := range vs.values {
+			b := bytes.Buffer{}
+			if !handleMethods(cs, &b, vs.values[i]) {
+				vs.strings = nil
+				break
+			}
+			vs.strings[i] = b.String()
+		}
+	}
+	if vs.strings == nil && cs.SpewKeys {
+		vs.strings = make([]string, len(values))
+		for i := range vs.values {
+			vs.strings[i] = Sprintf("%#v", vs.values[i].Interface())
+		}
+	}
+	return vs
+}
+
+// canSortSimply tests whether a reflect.Kind is a primitive that can be sorted
+// directly, or whether it should be considered for sorting by surrogate keys
+// (if the ConfigState allows it).
+func canSortSimply(kind reflect.Kind) bool {
+	// This switch parallels valueSortLess, except for the default case.
+	switch kind {
+	case reflect.Bool:
+		return true
+	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int:
+		return true
+	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
+		return true
+	case reflect.Float32, reflect.Float64:
+		return true
+	case reflect.String:
+		return true
+	case reflect.Uintptr:
+		return true
+	case reflect.Array:
+		return true
+	}
+	return false
+}
+
+// Len returns the number of values in the slice.  It is part of the
+// sort.Interface implementation.
+func (s *valuesSorter) Len() int {
+	return len(s.values)
+}
+
+// Swap swaps the values at the passed indices.  It is part of the
+// sort.Interface implementation.
+func (s *valuesSorter) Swap(i, j int) {
+	s.values[i], s.values[j] = s.values[j], s.values[i]
+	if s.strings != nil {
+		s.strings[i], s.strings[j] = s.strings[j], s.strings[i]
+	}
+}
+
+// valueSortLess returns whether the first value should sort before the second
+// value.  It is used by valueSorter.Less as part of the sort.Interface
+// implementation.
+func valueSortLess(a, b reflect.Value) bool {
+	switch a.Kind() {
+	case reflect.Bool:
+		return !a.Bool() && b.Bool()
+	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int:
+		return a.Int() < b.Int()
+	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
+		return a.Uint() < b.Uint()
+	case reflect.Float32, reflect.Float64:
+		return a.Float() < b.Float()
+	case reflect.String:
+		return a.String() < b.String()
+	case reflect.Uintptr:
+		return a.Uint() < b.Uint()
+	case reflect.Array:
+		// Compare the contents of both arrays.
+		l := a.Len()
+		for i := 0; i < l; i++ {
+			av := a.Index(i)
+			bv := b.Index(i)
+			if av.Interface() == bv.Interface() {
+				continue
+			}
+			return valueSortLess(av, bv)
+		}
+	}
+	return a.String() < b.String()
+}
+
+// Less returns whether the value at index i should sort before the
+// value at index j.  It is part of the sort.Interface implementation.
+func (s *valuesSorter) Less(i, j int) bool {
+	if s.strings == nil {
+		return valueSortLess(s.values[i], s.values[j])
+	}
+	return s.strings[i] < s.strings[j]
+}
+
+// sortValues is a sort function that handles both native types and any type that
+// can be converted to error or Stringer.  Other inputs are sorted according to
+// their Value.String() value to ensure display stability.
+func sortValues(values []reflect.Value, cs *ConfigState) {
+	if len(values) == 0 {
+		return
+	}
+	sort.Sort(newValuesSorter(values, cs))
+}
diff --git a/vendor/github.com/davecgh/go-spew/spew/config.go b/vendor/github.com/davecgh/go-spew/spew/config.go
new file mode 100644
index 0000000000..ee1ab07b3f
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/spew/config.go
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2013 Dave Collins <dave@davec.name>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+package spew
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+)
+
+// ConfigState houses the configuration options used by spew to format and
+// display values.  There is a global instance, Config, that is used to control
+// all top-level Formatter and Dump functionality.  Each ConfigState instance
+// provides methods equivalent to the top-level functions.
+//
+// The zero value for ConfigState provides no indentation.  You would typically
+// want to set it to a space or a tab.
+//
+// Alternatively, you can use NewDefaultConfig to get a ConfigState instance
+// with default settings.  See the documentation of NewDefaultConfig for default
+// values.
+type ConfigState struct {
+	// Indent specifies the string to use for each indentation level.  The
+	// global config instance that all top-level functions use set this to a
+	// single space by default.  If you would like more indentation, you might
+	// set this to a tab with "\t" or perhaps two spaces with "  ".
+	Indent string
+
+	// MaxDepth controls the maximum number of levels to descend into nested
+	// data structures.  The default, 0, means there is no limit.
+	//
+	// NOTE: Circular data structures are properly detected, so it is not
+	// necessary to set this value unless you specifically want to limit deeply
+	// nested data structures.
+	MaxDepth int
+
+	// DisableMethods specifies whether or not error and Stringer interfaces are
+	// invoked for types that implement them.
+	DisableMethods bool
+
+	// DisablePointerMethods specifies whether or not to check for and invoke
+	// error and Stringer interfaces on types which only accept a pointer
+	// receiver when the current type is not a pointer.
+	//
+	// NOTE: This might be an unsafe action since calling one of these methods
+	// with a pointer receiver could technically mutate the value, however,
+	// in practice, types which choose to satisify an error or Stringer
+	// interface with a pointer receiver should not be mutating their state
+	// inside these interface methods.  As a result, this option relies on
+	// access to the unsafe package, so it will not have any effect when
+	// running in environments without access to the unsafe package such as
+	// Google App Engine or with the "disableunsafe" build tag specified.
+	DisablePointerMethods bool
+
+	// ContinueOnMethod specifies whether or not recursion should continue once
+	// a custom error or Stringer interface is invoked.  The default, false,
+	// means it will print the results of invoking the custom error or Stringer
+	// interface and return immediately instead of continuing to recurse into
+	// the internals of the data type.
+	//
+	// NOTE: This flag does not have any effect if method invocation is disabled
+	// via the DisableMethods or DisablePointerMethods options.
+	ContinueOnMethod bool
+
+	// SortKeys specifies map keys should be sorted before being printed. Use
+	// this to have a more deterministic, diffable output.  Note that only
+	// native types (bool, int, uint, floats, uintptr and string) and types
+	// that support the error or Stringer interfaces (if methods are
+	// enabled) are supported, with other types sorted according to the
+	// reflect.Value.String() output which guarantees display stability.
+	SortKeys bool
+
+	// SpewKeys specifies that, as a last resort attempt, map keys should
+	// be spewed to strings and sorted by those strings.  This is only
+	// considered if SortKeys is true.
+	SpewKeys bool
+}
+
+// Config is the active configuration of the top-level functions.
+// The configuration can be changed by modifying the contents of spew.Config.
+var Config = ConfigState{Indent: " "}
+
+// Errorf is a wrapper for fmt.Errorf that treats each argument as if it were
+// passed with a Formatter interface returned by c.NewFormatter.  It returns
+// the formatted string as a value that satisfies error.  See NewFormatter
+// for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Errorf(format, c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Errorf(format string, a ...interface{}) (err error) {
+	return fmt.Errorf(format, c.convertArgs(a)...)
+}
+
+// Fprint is a wrapper for fmt.Fprint that treats each argument as if it were
+// passed with a Formatter interface returned by c.NewFormatter.  It returns
+// the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Fprint(w, c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Fprint(w io.Writer, a ...interface{}) (n int, err error) {
+	return fmt.Fprint(w, c.convertArgs(a)...)
+}
+
+// Fprintf is a wrapper for fmt.Fprintf that treats each argument as if it were
+// passed with a Formatter interface returned by c.NewFormatter.  It returns
+// the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Fprintf(w, format, c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Fprintf(w io.Writer, format string, a ...interface{}) (n int, err error) {
+	return fmt.Fprintf(w, format, c.convertArgs(a)...)
+}
+
+// Fprintln is a wrapper for fmt.Fprintln that treats each argument as if it
+// passed with a Formatter interface returned by c.NewFormatter.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Fprintln(w, c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Fprintln(w io.Writer, a ...interface{}) (n int, err error) {
+	return fmt.Fprintln(w, c.convertArgs(a)...)
+}
+
+// Print is a wrapper for fmt.Print that treats each argument as if it were
+// passed with a Formatter interface returned by c.NewFormatter.  It returns
+// the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Print(c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Print(a ...interface{}) (n int, err error) {
+	return fmt.Print(c.convertArgs(a)...)
+}
+
+// Printf is a wrapper for fmt.Printf that treats each argument as if it were
+// passed with a Formatter interface returned by c.NewFormatter.  It returns
+// the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Printf(format, c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Printf(format string, a ...interface{}) (n int, err error) {
+	return fmt.Printf(format, c.convertArgs(a)...)
+}
+
+// Println is a wrapper for fmt.Println that treats each argument as if it were
+// passed with a Formatter interface returned by c.NewFormatter.  It returns
+// the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Println(c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Println(a ...interface{}) (n int, err error) {
+	return fmt.Println(c.convertArgs(a)...)
+}
+
+// Sprint is a wrapper for fmt.Sprint that treats each argument as if it were
+// passed with a Formatter interface returned by c.NewFormatter.  It returns
+// the resulting string.  See NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Sprint(c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Sprint(a ...interface{}) string {
+	return fmt.Sprint(c.convertArgs(a)...)
+}
+
+// Sprintf is a wrapper for fmt.Sprintf that treats each argument as if it were
+// passed with a Formatter interface returned by c.NewFormatter.  It returns
+// the resulting string.  See NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Sprintf(format, c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Sprintf(format string, a ...interface{}) string {
+	return fmt.Sprintf(format, c.convertArgs(a)...)
+}
+
+// Sprintln is a wrapper for fmt.Sprintln that treats each argument as if it
+// were passed with a Formatter interface returned by c.NewFormatter.  It
+// returns the resulting string.  See NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Sprintln(c.NewFormatter(a), c.NewFormatter(b))
+func (c *ConfigState) Sprintln(a ...interface{}) string {
+	return fmt.Sprintln(c.convertArgs(a)...)
+}
+
+/*
+NewFormatter returns a custom formatter that satisfies the fmt.Formatter
+interface.  As a result, it integrates cleanly with standard fmt package
+printing functions.  The formatter is useful for inline printing of smaller data
+types similar to the standard %v format specifier.
+
+The custom formatter only responds to the %v (most compact), %+v (adds pointer
+addresses), %#v (adds types), and %#+v (adds types and pointer addresses) verb
+combinations.  Any other verbs such as %x and %q will be sent to the the
+standard fmt package for formatting.  In addition, the custom formatter ignores
+the width and precision arguments (however they will still work on the format
+specifiers not handled by the custom formatter).
+
+Typically this function shouldn't be called directly.  It is much easier to make
+use of the custom formatter by calling one of the convenience functions such as
+c.Printf, c.Println, or c.Printf.
+*/
+func (c *ConfigState) NewFormatter(v interface{}) fmt.Formatter {
+	return newFormatter(c, v)
+}
+
+// Fdump formats and displays the passed arguments to io.Writer w.  It formats
+// exactly the same as Dump.
+func (c *ConfigState) Fdump(w io.Writer, a ...interface{}) {
+	fdump(c, w, a...)
+}
+
+/*
+Dump displays the passed parameters to standard out with newlines, customizable
+indentation, and additional debug information such as complete types and all
+pointer addresses used to indirect to the final value.  It provides the
+following features over the built-in printing facilities provided by the fmt
+package:
+
+	* Pointers are dereferenced and followed
+	* Circular data structures are detected and handled properly
+	* Custom Stringer/error interfaces are optionally invoked, including
+	  on unexported types
+	* Custom types which only implement the Stringer/error interfaces via
+	  a pointer receiver are optionally invoked when passing non-pointer
+	  variables
+	* Byte arrays and slices are dumped like the hexdump -C command which
+	  includes offsets, byte values in hex, and ASCII output
+
+The configuration options are controlled by modifying the public members
+of c.  See ConfigState for options documentation.
+
+See Fdump if you would prefer dumping to an arbitrary io.Writer or Sdump to
+get the formatted result as a string.
+*/
+func (c *ConfigState) Dump(a ...interface{}) {
+	fdump(c, os.Stdout, a...)
+}
+
+// Sdump returns a string with the passed arguments formatted exactly the same
+// as Dump.
+func (c *ConfigState) Sdump(a ...interface{}) string {
+	var buf bytes.Buffer
+	fdump(c, &buf, a...)
+	return buf.String()
+}
+
+// convertArgs accepts a slice of arguments and returns a slice of the same
+// length with each argument converted to a spew Formatter interface using
+// the ConfigState associated with s.
+func (c *ConfigState) convertArgs(args []interface{}) (formatters []interface{}) {
+	formatters = make([]interface{}, len(args))
+	for index, arg := range args {
+		formatters[index] = newFormatter(c, arg)
+	}
+	return formatters
+}
+
+// NewDefaultConfig returns a ConfigState with the following default settings.
+//
+// 	Indent: " "
+// 	MaxDepth: 0
+// 	DisableMethods: false
+// 	DisablePointerMethods: false
+// 	ContinueOnMethod: false
+// 	SortKeys: false
+func NewDefaultConfig() *ConfigState {
+	return &ConfigState{Indent: " "}
+}
diff --git a/vendor/github.com/davecgh/go-spew/spew/doc.go b/vendor/github.com/davecgh/go-spew/spew/doc.go
new file mode 100644
index 0000000000..5be0c40609
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/spew/doc.go
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2013 Dave Collins <dave@davec.name>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+Package spew implements a deep pretty printer for Go data structures to aid in
+debugging.
+
+A quick overview of the additional features spew provides over the built-in
+printing facilities for Go data types are as follows:
+
+	* Pointers are dereferenced and followed
+	* Circular data structures are detected and handled properly
+	* Custom Stringer/error interfaces are optionally invoked, including
+	  on unexported types
+	* Custom types which only implement the Stringer/error interfaces via
+	  a pointer receiver are optionally invoked when passing non-pointer
+	  variables
+	* Byte arrays and slices are dumped like the hexdump -C command which
+	  includes offsets, byte values in hex, and ASCII output (only when using
+	  Dump style)
+
+There are two different approaches spew allows for dumping Go data structures:
+
+	* Dump style which prints with newlines, customizable indentation,
+	  and additional debug information such as types and all pointer addresses
+	  used to indirect to the final value
+	* A custom Formatter interface that integrates cleanly with the standard fmt
+	  package and replaces %v, %+v, %#v, and %#+v to provide inline printing
+	  similar to the default %v while providing the additional functionality
+	  outlined above and passing unsupported format verbs such as %x and %q
+	  along to fmt
+
+Quick Start
+
+This section demonstrates how to quickly get started with spew.  See the
+sections below for further details on formatting and configuration options.
+
+To dump a variable with full newlines, indentation, type, and pointer
+information use Dump, Fdump, or Sdump:
+	spew.Dump(myVar1, myVar2, ...)
+	spew.Fdump(someWriter, myVar1, myVar2, ...)
+	str := spew.Sdump(myVar1, myVar2, ...)
+
+Alternatively, if you would prefer to use format strings with a compacted inline
+printing style, use the convenience wrappers Printf, Fprintf, etc with
+%v (most compact), %+v (adds pointer addresses), %#v (adds types), or
+%#+v (adds types and pointer addresses):
+	spew.Printf("myVar1: %v -- myVar2: %+v", myVar1, myVar2)
+	spew.Printf("myVar3: %#v -- myVar4: %#+v", myVar3, myVar4)
+	spew.Fprintf(someWriter, "myVar1: %v -- myVar2: %+v", myVar1, myVar2)
+	spew.Fprintf(someWriter, "myVar3: %#v -- myVar4: %#+v", myVar3, myVar4)
+
+Configuration Options
+
+Configuration of spew is handled by fields in the ConfigState type.  For
+convenience, all of the top-level functions use a global state available
+via the spew.Config global.
+
+It is also possible to create a ConfigState instance that provides methods
+equivalent to the top-level functions.  This allows concurrent configuration
+options.  See the ConfigState documentation for more details.
+
+The following configuration options are available:
+	* Indent
+		String to use for each indentation level for Dump functions.
+		It is a single space by default.  A popular alternative is "\t".
+
+	* MaxDepth
+		Maximum number of levels to descend into nested data structures.
+		There is no limit by default.
+
+	* DisableMethods
+		Disables invocation of error and Stringer interface methods.
+		Method invocation is enabled by default.
+
+	* DisablePointerMethods
+		Disables invocation of error and Stringer interface methods on types
+		which only accept pointer receivers from non-pointer variables.
+		Pointer method invocation is enabled by default.
+
+	* ContinueOnMethod
+		Enables recursion into types after invoking error and Stringer interface
+		methods. Recursion after method invocation is disabled by default.
+
+	* SortKeys
+		Specifies map keys should be sorted before being printed. Use
+		this to have a more deterministic, diffable output.  Note that
+		only native types (bool, int, uint, floats, uintptr and string)
+		and types which implement error or Stringer interfaces are
+		supported with other types sorted according to the
+		reflect.Value.String() output which guarantees display
+		stability.  Natural map order is used by default.
+
+	* SpewKeys
+		Specifies that, as a last resort attempt, map keys should be
+		spewed to strings and sorted by those strings.  This is only
+		considered if SortKeys is true.
+
+Dump Usage
+
+Simply call spew.Dump with a list of variables you want to dump:
+
+	spew.Dump(myVar1, myVar2, ...)
+
+You may also call spew.Fdump if you would prefer to output to an arbitrary
+io.Writer.  For example, to dump to standard error:
+
+	spew.Fdump(os.Stderr, myVar1, myVar2, ...)
+
+A third option is to call spew.Sdump to get the formatted output as a string:
+
+	str := spew.Sdump(myVar1, myVar2, ...)
+
+Sample Dump Output
+
+See the Dump example for details on the setup of the types and variables being
+shown here.
+
+	(main.Foo) {
+	 unexportedField: (*main.Bar)(0xf84002e210)({
+	  flag: (main.Flag) flagTwo,
+	  data: (uintptr) <nil>
+	 }),
+	 ExportedField: (map[interface {}]interface {}) (len=1) {
+	  (string) (len=3) "one": (bool) true
+	 }
+	}
+
+Byte (and uint8) arrays and slices are displayed uniquely like the hexdump -C
+command as shown.
+	([]uint8) (len=32 cap=32) {
+	 00000000  11 12 13 14 15 16 17 18  19 1a 1b 1c 1d 1e 1f 20  |............... |
+	 00000010  21 22 23 24 25 26 27 28  29 2a 2b 2c 2d 2e 2f 30  |!"#$%&'()*+,-./0|
+	 00000020  31 32                                             |12|
+	}
+
+Custom Formatter
+
+Spew provides a custom formatter that implements the fmt.Formatter interface
+so that it integrates cleanly with standard fmt package printing functions. The
+formatter is useful for inline printing of smaller data types similar to the
+standard %v format specifier.
+
+The custom formatter only responds to the %v (most compact), %+v (adds pointer
+addresses), %#v (adds types), or %#+v (adds types and pointer addresses) verb
+combinations.  Any other verbs such as %x and %q will be sent to the the
+standard fmt package for formatting.  In addition, the custom formatter ignores
+the width and precision arguments (however they will still work on the format
+specifiers not handled by the custom formatter).
+
+Custom Formatter Usage
+
+The simplest way to make use of the spew custom formatter is to call one of the
+convenience functions such as spew.Printf, spew.Println, or spew.Printf.  The
+functions have syntax you are most likely already familiar with:
+
+	spew.Printf("myVar1: %v -- myVar2: %+v", myVar1, myVar2)
+	spew.Printf("myVar3: %#v -- myVar4: %#+v", myVar3, myVar4)
+	spew.Println(myVar, myVar2)
+	spew.Fprintf(os.Stderr, "myVar1: %v -- myVar2: %+v", myVar1, myVar2)
+	spew.Fprintf(os.Stderr, "myVar3: %#v -- myVar4: %#+v", myVar3, myVar4)
+
+See the Index for the full list convenience functions.
+
+Sample Formatter Output
+
+Double pointer to a uint8:
+	  %v: <**>5
+	 %+v: <**>(0xf8400420d0->0xf8400420c8)5
+	 %#v: (**uint8)5
+	%#+v: (**uint8)(0xf8400420d0->0xf8400420c8)5
+
+Pointer to circular struct with a uint8 field and a pointer to itself:
+	  %v: <*>{1 <*><shown>}
+	 %+v: <*>(0xf84003e260){ui8:1 c:<*>(0xf84003e260)<shown>}
+	 %#v: (*main.circular){ui8:(uint8)1 c:(*main.circular)<shown>}
+	%#+v: (*main.circular)(0xf84003e260){ui8:(uint8)1 c:(*main.circular)(0xf84003e260)<shown>}
+
+See the Printf example for details on the setup of variables being shown
+here.
+
+Errors
+
+Since it is possible for custom Stringer/error interfaces to panic, spew
+detects them and handles them internally by printing the panic information
+inline with the output.  Since spew is intended to provide deep pretty printing
+capabilities on structures, it intentionally does not return any errors.
+*/
+package spew
diff --git a/vendor/github.com/davecgh/go-spew/spew/dump.go b/vendor/github.com/davecgh/go-spew/spew/dump.go
new file mode 100644
index 0000000000..a0ff95e27e
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/spew/dump.go
@@ -0,0 +1,509 @@
+/*
+ * Copyright (c) 2013 Dave Collins <dave@davec.name>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+package spew
+
+import (
+	"bytes"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"os"
+	"reflect"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+var (
+	// uint8Type is a reflect.Type representing a uint8.  It is used to
+	// convert cgo types to uint8 slices for hexdumping.
+	uint8Type = reflect.TypeOf(uint8(0))
+
+	// cCharRE is a regular expression that matches a cgo char.
+	// It is used to detect character arrays to hexdump them.
+	cCharRE = regexp.MustCompile("^.*\\._Ctype_char$")
+
+	// cUnsignedCharRE is a regular expression that matches a cgo unsigned
+	// char.  It is used to detect unsigned character arrays to hexdump
+	// them.
+	cUnsignedCharRE = regexp.MustCompile("^.*\\._Ctype_unsignedchar$")
+
+	// cUint8tCharRE is a regular expression that matches a cgo uint8_t.
+	// It is used to detect uint8_t arrays to hexdump them.
+	cUint8tCharRE = regexp.MustCompile("^.*\\._Ctype_uint8_t$")
+)
+
+// dumpState contains information about the state of a dump operation.
+type dumpState struct {
+	w                io.Writer
+	depth            int
+	pointers         map[uintptr]int
+	ignoreNextType   bool
+	ignoreNextIndent bool
+	cs               *ConfigState
+}
+
+// indent performs indentation according to the depth level and cs.Indent
+// option.
+func (d *dumpState) indent() {
+	if d.ignoreNextIndent {
+		d.ignoreNextIndent = false
+		return
+	}
+	d.w.Write(bytes.Repeat([]byte(d.cs.Indent), d.depth))
+}
+
+// unpackValue returns values inside of non-nil interfaces when possible.
+// This is useful for data types like structs, arrays, slices, and maps which
+// can contain varying types packed inside an interface.
+func (d *dumpState) unpackValue(v reflect.Value) reflect.Value {
+	if v.Kind() == reflect.Interface && !v.IsNil() {
+		v = v.Elem()
+	}
+	return v
+}
+
+// dumpPtr handles formatting of pointers by indirecting them as necessary.
+func (d *dumpState) dumpPtr(v reflect.Value) {
+	// Remove pointers at or below the current depth from map used to detect
+	// circular refs.
+	for k, depth := range d.pointers {
+		if depth >= d.depth {
+			delete(d.pointers, k)
+		}
+	}
+
+	// Keep list of all dereferenced pointers to show later.
+	pointerChain := make([]uintptr, 0)
+
+	// Figure out how many levels of indirection there are by dereferencing
+	// pointers and unpacking interfaces down the chain while detecting circular
+	// references.
+	nilFound := false
+	cycleFound := false
+	indirects := 0
+	ve := v
+	for ve.Kind() == reflect.Ptr {
+		if ve.IsNil() {
+			nilFound = true
+			break
+		}
+		indirects++
+		addr := ve.Pointer()
+		pointerChain = append(pointerChain, addr)
+		if pd, ok := d.pointers[addr]; ok && pd < d.depth {
+			cycleFound = true
+			indirects--
+			break
+		}
+		d.pointers[addr] = d.depth
+
+		ve = ve.Elem()
+		if ve.Kind() == reflect.Interface {
+			if ve.IsNil() {
+				nilFound = true
+				break
+			}
+			ve = ve.Elem()
+		}
+	}
+
+	// Display type information.
+	d.w.Write(openParenBytes)
+	d.w.Write(bytes.Repeat(asteriskBytes, indirects))
+	d.w.Write([]byte(ve.Type().String()))
+	d.w.Write(closeParenBytes)
+
+	// Display pointer information.
+	if len(pointerChain) > 0 {
+		d.w.Write(openParenBytes)
+		for i, addr := range pointerChain {
+			if i > 0 {
+				d.w.Write(pointerChainBytes)
+			}
+			printHexPtr(d.w, addr)
+		}
+		d.w.Write(closeParenBytes)
+	}
+
+	// Display dereferenced value.
+	d.w.Write(openParenBytes)
+	switch {
+	case nilFound == true:
+		d.w.Write(nilAngleBytes)
+
+	case cycleFound == true:
+		d.w.Write(circularBytes)
+
+	default:
+		d.ignoreNextType = true
+		d.dump(ve)
+	}
+	d.w.Write(closeParenBytes)
+}
+
+// dumpSlice handles formatting of arrays and slices.  Byte (uint8 under
+// reflection) arrays and slices are dumped in hexdump -C fashion.
+func (d *dumpState) dumpSlice(v reflect.Value) {
+	// Determine whether this type should be hex dumped or not.  Also,
+	// for types which should be hexdumped, try to use the underlying data
+	// first, then fall back to trying to convert them to a uint8 slice.
+	var buf []uint8
+	doConvert := false
+	doHexDump := false
+	numEntries := v.Len()
+	if numEntries > 0 {
+		vt := v.Index(0).Type()
+		vts := vt.String()
+		switch {
+		// C types that need to be converted.
+		case cCharRE.MatchString(vts):
+			fallthrough
+		case cUnsignedCharRE.MatchString(vts):
+			fallthrough
+		case cUint8tCharRE.MatchString(vts):
+			doConvert = true
+
+		// Try to use existing uint8 slices and fall back to converting
+		// and copying if that fails.
+		case vt.Kind() == reflect.Uint8:
+			// We need an addressable interface to convert the type
+			// to a byte slice.  However, the reflect package won't
+			// give us an interface on certain things like
+			// unexported struct fields in order to enforce
+			// visibility rules.  We use unsafe, when available, to
+			// bypass these restrictions since this package does not
+			// mutate the values.
+			vs := v
+			if !vs.CanInterface() || !vs.CanAddr() {
+				vs = unsafeReflectValue(vs)
+			}
+			if !UnsafeDisabled {
+				vs = vs.Slice(0, numEntries)
+
+				// Use the existing uint8 slice if it can be
+				// type asserted.
+				iface := vs.Interface()
+				if slice, ok := iface.([]uint8); ok {
+					buf = slice
+					doHexDump = true
+					break
+				}
+			}
+
+			// The underlying data needs to be converted if it can't
+			// be type asserted to a uint8 slice.
+			doConvert = true
+		}
+
+		// Copy and convert the underlying type if needed.
+		if doConvert && vt.ConvertibleTo(uint8Type) {
+			// Convert and copy each element into a uint8 byte
+			// slice.
+			buf = make([]uint8, numEntries)
+			for i := 0; i < numEntries; i++ {
+				vv := v.Index(i)
+				buf[i] = uint8(vv.Convert(uint8Type).Uint())
+			}
+			doHexDump = true
+		}
+	}
+
+	// Hexdump the entire slice as needed.
+	if doHexDump {
+		indent := strings.Repeat(d.cs.Indent, d.depth)
+		str := indent + hex.Dump(buf)
+		str = strings.Replace(str, "\n", "\n"+indent, -1)
+		str = strings.TrimRight(str, d.cs.Indent)
+		d.w.Write([]byte(str))
+		return
+	}
+
+	// Recursively call dump for each item.
+	for i := 0; i < numEntries; i++ {
+		d.dump(d.unpackValue(v.Index(i)))
+		if i < (numEntries - 1) {
+			d.w.Write(commaNewlineBytes)
+		} else {
+			d.w.Write(newlineBytes)
+		}
+	}
+}
+
+// dump is the main workhorse for dumping a value.  It uses the passed reflect
+// value to figure out what kind of object we are dealing with and formats it
+// appropriately.  It is a recursive function, however circular data structures
+// are detected and handled properly.
+func (d *dumpState) dump(v reflect.Value) {
+	// Handle invalid reflect values immediately.
+	kind := v.Kind()
+	if kind == reflect.Invalid {
+		d.w.Write(invalidAngleBytes)
+		return
+	}
+
+	// Handle pointers specially.
+	if kind == reflect.Ptr {
+		d.indent()
+		d.dumpPtr(v)
+		return
+	}
+
+	// Print type information unless already handled elsewhere.
+	if !d.ignoreNextType {
+		d.indent()
+		d.w.Write(openParenBytes)
+		d.w.Write([]byte(v.Type().String()))
+		d.w.Write(closeParenBytes)
+		d.w.Write(spaceBytes)
+	}
+	d.ignoreNextType = false
+
+	// Display length and capacity if the built-in len and cap functions
+	// work with the value's kind and the len/cap itself is non-zero.
+	valueLen, valueCap := 0, 0
+	switch v.Kind() {
+	case reflect.Array, reflect.Slice, reflect.Chan:
+		valueLen, valueCap = v.Len(), v.Cap()
+	case reflect.Map, reflect.String:
+		valueLen = v.Len()
+	}
+	if valueLen != 0 || valueCap != 0 {
+		d.w.Write(openParenBytes)
+		if valueLen != 0 {
+			d.w.Write(lenEqualsBytes)
+			printInt(d.w, int64(valueLen), 10)
+		}
+		if valueCap != 0 {
+			if valueLen != 0 {
+				d.w.Write(spaceBytes)
+			}
+			d.w.Write(capEqualsBytes)
+			printInt(d.w, int64(valueCap), 10)
+		}
+		d.w.Write(closeParenBytes)
+		d.w.Write(spaceBytes)
+	}
+
+	// Call Stringer/error interfaces if they exist and the handle methods flag
+	// is enabled
+	if !d.cs.DisableMethods {
+		if (kind != reflect.Invalid) && (kind != reflect.Interface) {
+			if handled := handleMethods(d.cs, d.w, v); handled {
+				return
+			}
+		}
+	}
+
+	switch kind {
+	case reflect.Invalid:
+		// Do nothing.  We should never get here since invalid has already
+		// been handled above.
+
+	case reflect.Bool:
+		printBool(d.w, v.Bool())
+
+	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int:
+		printInt(d.w, v.Int(), 10)
+
+	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
+		printUint(d.w, v.Uint(), 10)
+
+	case reflect.Float32:
+		printFloat(d.w, v.Float(), 32)
+
+	case reflect.Float64:
+		printFloat(d.w, v.Float(), 64)
+
+	case reflect.Complex64:
+		printComplex(d.w, v.Complex(), 32)
+
+	case reflect.Complex128:
+		printComplex(d.w, v.Complex(), 64)
+
+	case reflect.Slice:
+		if v.IsNil() {
+			d.w.Write(nilAngleBytes)
+			break
+		}
+		fallthrough
+
+	case reflect.Array:
+		d.w.Write(openBraceNewlineBytes)
+		d.depth++
+		if (d.cs.MaxDepth != 0) && (d.depth > d.cs.MaxDepth) {
+			d.indent()
+			d.w.Write(maxNewlineBytes)
+		} else {
+			d.dumpSlice(v)
+		}
+		d.depth--
+		d.indent()
+		d.w.Write(closeBraceBytes)
+
+	case reflect.String:
+		d.w.Write([]byte(strconv.Quote(v.String())))
+
+	case reflect.Interface:
+		// The only time we should get here is for nil interfaces due to
+		// unpackValue calls.
+		if v.IsNil() {
+			d.w.Write(nilAngleBytes)
+		}
+
+	case reflect.Ptr:
+		// Do nothing.  We should never get here since pointers have already
+		// been handled above.
+
+	case reflect.Map:
+		// nil maps should be indicated as different than empty maps
+		if v.IsNil() {
+			d.w.Write(nilAngleBytes)
+			break
+		}
+
+		d.w.Write(openBraceNewlineBytes)
+		d.depth++
+		if (d.cs.MaxDepth != 0) && (d.depth > d.cs.MaxDepth) {
+			d.indent()
+			d.w.Write(maxNewlineBytes)
+		} else {
+			numEntries := v.Len()
+			keys := v.MapKeys()
+			if d.cs.SortKeys {
+				sortValues(keys, d.cs)
+			}
+			for i, key := range keys {
+				d.dump(d.unpackValue(key))
+				d.w.Write(colonSpaceBytes)
+				d.ignoreNextIndent = true
+				d.dump(d.unpackValue(v.MapIndex(key)))
+				if i < (numEntries - 1) {
+					d.w.Write(commaNewlineBytes)
+				} else {
+					d.w.Write(newlineBytes)
+				}
+			}
+		}
+		d.depth--
+		d.indent()
+		d.w.Write(closeBraceBytes)
+
+	case reflect.Struct:
+		d.w.Write(openBraceNewlineBytes)
+		d.depth++
+		if (d.cs.MaxDepth != 0) && (d.depth > d.cs.MaxDepth) {
+			d.indent()
+			d.w.Write(maxNewlineBytes)
+		} else {
+			vt := v.Type()
+			numFields := v.NumField()
+			for i := 0; i < numFields; i++ {
+				d.indent()
+				vtf := vt.Field(i)
+				d.w.Write([]byte(vtf.Name))
+				d.w.Write(colonSpaceBytes)
+				d.ignoreNextIndent = true
+				d.dump(d.unpackValue(v.Field(i)))
+				if i < (numFields - 1) {
+					d.w.Write(commaNewlineBytes)
+				} else {
+					d.w.Write(newlineBytes)
+				}
+			}
+		}
+		d.depth--
+		d.indent()
+		d.w.Write(closeBraceBytes)
+
+	case reflect.Uintptr:
+		printHexPtr(d.w, uintptr(v.Uint()))
+
+	case reflect.UnsafePointer, reflect.Chan, reflect.Func:
+		printHexPtr(d.w, v.Pointer())
+
+	// There were not any other types at the time this code was written, but
+	// fall back to letting the default fmt package handle it in case any new
+	// types are added.
+	default:
+		if v.CanInterface() {
+			fmt.Fprintf(d.w, "%v", v.Interface())
+		} else {
+			fmt.Fprintf(d.w, "%v", v.String())
+		}
+	}
+}
+
+// fdump is a helper function to consolidate the logic from the various public
+// methods which take varying writers and config states.
+func fdump(cs *ConfigState, w io.Writer, a ...interface{}) {
+	for _, arg := range a {
+		if arg == nil {
+			w.Write(interfaceBytes)
+			w.Write(spaceBytes)
+			w.Write(nilAngleBytes)
+			w.Write(newlineBytes)
+			continue
+		}
+
+		d := dumpState{w: w, cs: cs}
+		d.pointers = make(map[uintptr]int)
+		d.dump(reflect.ValueOf(arg))
+		d.w.Write(newlineBytes)
+	}
+}
+
+// Fdump formats and displays the passed arguments to io.Writer w.  It formats
+// exactly the same as Dump.
+func Fdump(w io.Writer, a ...interface{}) {
+	fdump(&Config, w, a...)
+}
+
+// Sdump returns a string with the passed arguments formatted exactly the same
+// as Dump.
+func Sdump(a ...interface{}) string {
+	var buf bytes.Buffer
+	fdump(&Config, &buf, a...)
+	return buf.String()
+}
+
+/*
+Dump displays the passed parameters to standard out with newlines, customizable
+indentation, and additional debug information such as complete types and all
+pointer addresses used to indirect to the final value.  It provides the
+following features over the built-in printing facilities provided by the fmt
+package:
+
+	* Pointers are dereferenced and followed
+	* Circular data structures are detected and handled properly
+	* Custom Stringer/error interfaces are optionally invoked, including
+	  on unexported types
+	* Custom types which only implement the Stringer/error interfaces via
+	  a pointer receiver are optionally invoked when passing non-pointer
+	  variables
+	* Byte arrays and slices are dumped like the hexdump -C command which
+	  includes offsets, byte values in hex, and ASCII output
+
+The configuration options are controlled by an exported package global,
+spew.Config.  See ConfigState for options documentation.
+
+See Fdump if you would prefer dumping to an arbitrary io.Writer or Sdump to
+get the formatted result as a string.
+*/
+func Dump(a ...interface{}) {
+	fdump(&Config, os.Stdout, a...)
+}
diff --git a/vendor/github.com/davecgh/go-spew/spew/format.go b/vendor/github.com/davecgh/go-spew/spew/format.go
new file mode 100644
index 0000000000..ecf3b80e24
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/spew/format.go
@@ -0,0 +1,419 @@
+/*
+ * Copyright (c) 2013 Dave Collins <dave@davec.name>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+package spew
+
+import (
+	"bytes"
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+)
+
+// supportedFlags is a list of all the character flags supported by fmt package.
+const supportedFlags = "0-+# "
+
+// formatState implements the fmt.Formatter interface and contains information
+// about the state of a formatting operation.  The NewFormatter function can
+// be used to get a new Formatter which can be used directly as arguments
+// in standard fmt package printing calls.
+type formatState struct {
+	value          interface{}
+	fs             fmt.State
+	depth          int
+	pointers       map[uintptr]int
+	ignoreNextType bool
+	cs             *ConfigState
+}
+
+// buildDefaultFormat recreates the original format string without precision
+// and width information to pass in to fmt.Sprintf in the case of an
+// unrecognized type.  Unless new types are added to the language, this
+// function won't ever be called.
+func (f *formatState) buildDefaultFormat() (format string) {
+	buf := bytes.NewBuffer(percentBytes)
+
+	for _, flag := range supportedFlags {
+		if f.fs.Flag(int(flag)) {
+			buf.WriteRune(flag)
+		}
+	}
+
+	buf.WriteRune('v')
+
+	format = buf.String()
+	return format
+}
+
+// constructOrigFormat recreates the original format string including precision
+// and width information to pass along to the standard fmt package.  This allows
+// automatic deferral of all format strings this package doesn't support.
+func (f *formatState) constructOrigFormat(verb rune) (format string) {
+	buf := bytes.NewBuffer(percentBytes)
+
+	for _, flag := range supportedFlags {
+		if f.fs.Flag(int(flag)) {
+			buf.WriteRune(flag)
+		}
+	}
+
+	if width, ok := f.fs.Width(); ok {
+		buf.WriteString(strconv.Itoa(width))
+	}
+
+	if precision, ok := f.fs.Precision(); ok {
+		buf.Write(precisionBytes)
+		buf.WriteString(strconv.Itoa(precision))
+	}
+
+	buf.WriteRune(verb)
+
+	format = buf.String()
+	return format
+}
+
+// unpackValue returns values inside of non-nil interfaces when possible and
+// ensures that types for values which have been unpacked from an interface
+// are displayed when the show types flag is also set.
+// This is useful for data types like structs, arrays, slices, and maps which
+// can contain varying types packed inside an interface.
+func (f *formatState) unpackValue(v reflect.Value) reflect.Value {
+	if v.Kind() == reflect.Interface {
+		f.ignoreNextType = false
+		if !v.IsNil() {
+			v = v.Elem()
+		}
+	}
+	return v
+}
+
+// formatPtr handles formatting of pointers by indirecting them as necessary.
+func (f *formatState) formatPtr(v reflect.Value) {
+	// Display nil if top level pointer is nil.
+	showTypes := f.fs.Flag('#')
+	if v.IsNil() && (!showTypes || f.ignoreNextType) {
+		f.fs.Write(nilAngleBytes)
+		return
+	}
+
+	// Remove pointers at or below the current depth from map used to detect
+	// circular refs.
+	for k, depth := range f.pointers {
+		if depth >= f.depth {
+			delete(f.pointers, k)
+		}
+	}
+
+	// Keep list of all dereferenced pointers to possibly show later.
+	pointerChain := make([]uintptr, 0)
+
+	// Figure out how many levels of indirection there are by derferencing
+	// pointers and unpacking interfaces down the chain while detecting circular
+	// references.
+	nilFound := false
+	cycleFound := false
+	indirects := 0
+	ve := v
+	for ve.Kind() == reflect.Ptr {
+		if ve.IsNil() {
+			nilFound = true
+			break
+		}
+		indirects++
+		addr := ve.Pointer()
+		pointerChain = append(pointerChain, addr)
+		if pd, ok := f.pointers[addr]; ok && pd < f.depth {
+			cycleFound = true
+			indirects--
+			break
+		}
+		f.pointers[addr] = f.depth
+
+		ve = ve.Elem()
+		if ve.Kind() == reflect.Interface {
+			if ve.IsNil() {
+				nilFound = true
+				break
+			}
+			ve = ve.Elem()
+		}
+	}
+
+	// Display type or indirection level depending on flags.
+	if showTypes && !f.ignoreNextType {
+		f.fs.Write(openParenBytes)
+		f.fs.Write(bytes.Repeat(asteriskBytes, indirects))
+		f.fs.Write([]byte(ve.Type().String()))
+		f.fs.Write(closeParenBytes)
+	} else {
+		if nilFound || cycleFound {
+			indirects += strings.Count(ve.Type().String(), "*")
+		}
+		f.fs.Write(openAngleBytes)
+		f.fs.Write([]byte(strings.Repeat("*", indirects)))
+		f.fs.Write(closeAngleBytes)
+	}
+
+	// Display pointer information depending on flags.
+	if f.fs.Flag('+') && (len(pointerChain) > 0) {
+		f.fs.Write(openParenBytes)
+		for i, addr := range pointerChain {
+			if i > 0 {
+				f.fs.Write(pointerChainBytes)
+			}
+			printHexPtr(f.fs, addr)
+		}
+		f.fs.Write(closeParenBytes)
+	}
+
+	// Display dereferenced value.
+	switch {
+	case nilFound == true:
+		f.fs.Write(nilAngleBytes)
+
+	case cycleFound == true:
+		f.fs.Write(circularShortBytes)
+
+	default:
+		f.ignoreNextType = true
+		f.format(ve)
+	}
+}
+
+// format is the main workhorse for providing the Formatter interface.  It
+// uses the passed reflect value to figure out what kind of object we are
+// dealing with and formats it appropriately.  It is a recursive function,
+// however circular data structures are detected and handled properly.
+func (f *formatState) format(v reflect.Value) {
+	// Handle invalid reflect values immediately.
+	kind := v.Kind()
+	if kind == reflect.Invalid {
+		f.fs.Write(invalidAngleBytes)
+		return
+	}
+
+	// Handle pointers specially.
+	if kind == reflect.Ptr {
+		f.formatPtr(v)
+		return
+	}
+
+	// Print type information unless already handled elsewhere.
+	if !f.ignoreNextType && f.fs.Flag('#') {
+		f.fs.Write(openParenBytes)
+		f.fs.Write([]byte(v.Type().String()))
+		f.fs.Write(closeParenBytes)
+	}
+	f.ignoreNextType = false
+
+	// Call Stringer/error interfaces if they exist and the handle methods
+	// flag is enabled.
+	if !f.cs.DisableMethods {
+		if (kind != reflect.Invalid) && (kind != reflect.Interface) {
+			if handled := handleMethods(f.cs, f.fs, v); handled {
+				return
+			}
+		}
+	}
+
+	switch kind {
+	case reflect.Invalid:
+		// Do nothing.  We should never get here since invalid has already
+		// been handled above.
+
+	case reflect.Bool:
+		printBool(f.fs, v.Bool())
+
+	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int:
+		printInt(f.fs, v.Int(), 10)
+
+	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
+		printUint(f.fs, v.Uint(), 10)
+
+	case reflect.Float32:
+		printFloat(f.fs, v.Float(), 32)
+
+	case reflect.Float64:
+		printFloat(f.fs, v.Float(), 64)
+
+	case reflect.Complex64:
+		printComplex(f.fs, v.Complex(), 32)
+
+	case reflect.Complex128:
+		printComplex(f.fs, v.Complex(), 64)
+
+	case reflect.Slice:
+		if v.IsNil() {
+			f.fs.Write(nilAngleBytes)
+			break
+		}
+		fallthrough
+
+	case reflect.Array:
+		f.fs.Write(openBracketBytes)
+		f.depth++
+		if (f.cs.MaxDepth != 0) && (f.depth > f.cs.MaxDepth) {
+			f.fs.Write(maxShortBytes)
+		} else {
+			numEntries := v.Len()
+			for i := 0; i < numEntries; i++ {
+				if i > 0 {
+					f.fs.Write(spaceBytes)
+				}
+				f.ignoreNextType = true
+				f.format(f.unpackValue(v.Index(i)))
+			}
+		}
+		f.depth--
+		f.fs.Write(closeBracketBytes)
+
+	case reflect.String:
+		f.fs.Write([]byte(v.String()))
+
+	case reflect.Interface:
+		// The only time we should get here is for nil interfaces due to
+		// unpackValue calls.
+		if v.IsNil() {
+			f.fs.Write(nilAngleBytes)
+		}
+
+	case reflect.Ptr:
+		// Do nothing.  We should never get here since pointers have already
+		// been handled above.
+
+	case reflect.Map:
+		// nil maps should be indicated as different than empty maps
+		if v.IsNil() {
+			f.fs.Write(nilAngleBytes)
+			break
+		}
+
+		f.fs.Write(openMapBytes)
+		f.depth++
+		if (f.cs.MaxDepth != 0) && (f.depth > f.cs.MaxDepth) {
+			f.fs.Write(maxShortBytes)
+		} else {
+			keys := v.MapKeys()
+			if f.cs.SortKeys {
+				sortValues(keys, f.cs)
+			}
+			for i, key := range keys {
+				if i > 0 {
+					f.fs.Write(spaceBytes)
+				}
+				f.ignoreNextType = true
+				f.format(f.unpackValue(key))
+				f.fs.Write(colonBytes)
+				f.ignoreNextType = true
+				f.format(f.unpackValue(v.MapIndex(key)))
+			}
+		}
+		f.depth--
+		f.fs.Write(closeMapBytes)
+
+	case reflect.Struct:
+		numFields := v.NumField()
+		f.fs.Write(openBraceBytes)
+		f.depth++
+		if (f.cs.MaxDepth != 0) && (f.depth > f.cs.MaxDepth) {
+			f.fs.Write(maxShortBytes)
+		} else {
+			vt := v.Type()
+			for i := 0; i < numFields; i++ {
+				if i > 0 {
+					f.fs.Write(spaceBytes)
+				}
+				vtf := vt.Field(i)
+				if f.fs.Flag('+') || f.fs.Flag('#') {
+					f.fs.Write([]byte(vtf.Name))
+					f.fs.Write(colonBytes)
+				}
+				f.format(f.unpackValue(v.Field(i)))
+			}
+		}
+		f.depth--
+		f.fs.Write(closeBraceBytes)
+
+	case reflect.Uintptr:
+		printHexPtr(f.fs, uintptr(v.Uint()))
+
+	case reflect.UnsafePointer, reflect.Chan, reflect.Func:
+		printHexPtr(f.fs, v.Pointer())
+
+	// There were not any other types at the time this code was written, but
+	// fall back to letting the default fmt package handle it if any get added.
+	default:
+		format := f.buildDefaultFormat()
+		if v.CanInterface() {
+			fmt.Fprintf(f.fs, format, v.Interface())
+		} else {
+			fmt.Fprintf(f.fs, format, v.String())
+		}
+	}
+}
+
+// Format satisfies the fmt.Formatter interface. See NewFormatter for usage
+// details.
+func (f *formatState) Format(fs fmt.State, verb rune) {
+	f.fs = fs
+
+	// Use standard formatting for verbs that are not v.
+	if verb != 'v' {
+		format := f.constructOrigFormat(verb)
+		fmt.Fprintf(fs, format, f.value)
+		return
+	}
+
+	if f.value == nil {
+		if fs.Flag('#') {
+			fs.Write(interfaceBytes)
+		}
+		fs.Write(nilAngleBytes)
+		return
+	}
+
+	f.format(reflect.ValueOf(f.value))
+}
+
+// newFormatter is a helper function to consolidate the logic from the various
+// public methods which take varying config states.
+func newFormatter(cs *ConfigState, v interface{}) fmt.Formatter {
+	fs := &formatState{value: v, cs: cs}
+	fs.pointers = make(map[uintptr]int)
+	return fs
+}
+
+/*
+NewFormatter returns a custom formatter that satisfies the fmt.Formatter
+interface.  As a result, it integrates cleanly with standard fmt package
+printing functions.  The formatter is useful for inline printing of smaller data
+types similar to the standard %v format specifier.
+
+The custom formatter only responds to the %v (most compact), %+v (adds pointer
+addresses), %#v (adds types), or %#+v (adds types and pointer addresses) verb
+combinations.  Any other verbs such as %x and %q will be sent to the the
+standard fmt package for formatting.  In addition, the custom formatter ignores
+the width and precision arguments (however they will still work on the format
+specifiers not handled by the custom formatter).
+
+Typically this function shouldn't be called directly.  It is much easier to make
+use of the custom formatter by calling one of the convenience functions such as
+Printf, Println, or Fprintf.
+*/
+func NewFormatter(v interface{}) fmt.Formatter {
+	return newFormatter(&Config, v)
+}
diff --git a/vendor/github.com/davecgh/go-spew/spew/spew.go b/vendor/github.com/davecgh/go-spew/spew/spew.go
new file mode 100644
index 0000000000..d8233f542e
--- /dev/null
+++ b/vendor/github.com/davecgh/go-spew/spew/spew.go
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2013 Dave Collins <dave@davec.name>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+package spew
+
+import (
+	"fmt"
+	"io"
+)
+
+// Errorf is a wrapper for fmt.Errorf that treats each argument as if it were
+// passed with a default Formatter interface returned by NewFormatter.  It
+// returns the formatted string as a value that satisfies error.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Errorf(format, spew.NewFormatter(a), spew.NewFormatter(b))
+func Errorf(format string, a ...interface{}) (err error) {
+	return fmt.Errorf(format, convertArgs(a)...)
+}
+
+// Fprint is a wrapper for fmt.Fprint that treats each argument as if it were
+// passed with a default Formatter interface returned by NewFormatter.  It
+// returns the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Fprint(w, spew.NewFormatter(a), spew.NewFormatter(b))
+func Fprint(w io.Writer, a ...interface{}) (n int, err error) {
+	return fmt.Fprint(w, convertArgs(a)...)
+}
+
+// Fprintf is a wrapper for fmt.Fprintf that treats each argument as if it were
+// passed with a default Formatter interface returned by NewFormatter.  It
+// returns the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Fprintf(w, format, spew.NewFormatter(a), spew.NewFormatter(b))
+func Fprintf(w io.Writer, format string, a ...interface{}) (n int, err error) {
+	return fmt.Fprintf(w, format, convertArgs(a)...)
+}
+
+// Fprintln is a wrapper for fmt.Fprintln that treats each argument as if it
+// passed with a default Formatter interface returned by NewFormatter.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Fprintln(w, spew.NewFormatter(a), spew.NewFormatter(b))
+func Fprintln(w io.Writer, a ...interface{}) (n int, err error) {
+	return fmt.Fprintln(w, convertArgs(a)...)
+}
+
+// Print is a wrapper for fmt.Print that treats each argument as if it were
+// passed with a default Formatter interface returned by NewFormatter.  It
+// returns the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Print(spew.NewFormatter(a), spew.NewFormatter(b))
+func Print(a ...interface{}) (n int, err error) {
+	return fmt.Print(convertArgs(a)...)
+}
+
+// Printf is a wrapper for fmt.Printf that treats each argument as if it were
+// passed with a default Formatter interface returned by NewFormatter.  It
+// returns the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Printf(format, spew.NewFormatter(a), spew.NewFormatter(b))
+func Printf(format string, a ...interface{}) (n int, err error) {
+	return fmt.Printf(format, convertArgs(a)...)
+}
+
+// Println is a wrapper for fmt.Println that treats each argument as if it were
+// passed with a default Formatter interface returned by NewFormatter.  It
+// returns the number of bytes written and any write error encountered.  See
+// NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Println(spew.NewFormatter(a), spew.NewFormatter(b))
+func Println(a ...interface{}) (n int, err error) {
+	return fmt.Println(convertArgs(a)...)
+}
+
+// Sprint is a wrapper for fmt.Sprint that treats each argument as if it were
+// passed with a default Formatter interface returned by NewFormatter.  It
+// returns the resulting string.  See NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Sprint(spew.NewFormatter(a), spew.NewFormatter(b))
+func Sprint(a ...interface{}) string {
+	return fmt.Sprint(convertArgs(a)...)
+}
+
+// Sprintf is a wrapper for fmt.Sprintf that treats each argument as if it were
+// passed with a default Formatter interface returned by NewFormatter.  It
+// returns the resulting string.  See NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Sprintf(format, spew.NewFormatter(a), spew.NewFormatter(b))
+func Sprintf(format string, a ...interface{}) string {
+	return fmt.Sprintf(format, convertArgs(a)...)
+}
+
+// Sprintln is a wrapper for fmt.Sprintln that treats each argument as if it
+// were passed with a default Formatter interface returned by NewFormatter.  It
+// returns the resulting string.  See NewFormatter for formatting details.
+//
+// This function is shorthand for the following syntax:
+//
+//	fmt.Sprintln(spew.NewFormatter(a), spew.NewFormatter(b))
+func Sprintln(a ...interface{}) string {
+	return fmt.Sprintln(convertArgs(a)...)
+}
+
+// convertArgs accepts a slice of arguments and returns a slice of the same
+// length with each argument converted to a default spew Formatter interface.
+func convertArgs(args []interface{}) (formatters []interface{}) {
+	formatters = make([]interface{}, len(args))
+	for index, arg := range args {
+		formatters[index] = NewFormatter(arg)
+	}
+	return formatters
+}

From 5d13ce71135b5503093692d62409bfa845599c97 Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Wed, 6 Jul 2016 16:38:34 +0200
Subject: [PATCH 0568/1304] store: use a deep pretty printer fo migration tests

---
 rkt/image_list.go     | 12 ++++++++++--
 store/migrate_test.go |  7 ++++---
 tests/rkt_tests.go    | 10 +++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/rkt/image_list.go b/rkt/image_list.go
index 92f6eedb72..9a399fad37 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -254,9 +254,17 @@ func runImages(cmd *cobra.Command, args []string) int {
 
 				fieldValue = fmt.Sprintf("%s", f.String())
 			case l(aciURL):
-				fieldValue = fmt.Sprintf("%s", remoteMap[aciInfo.BlobKey].ACIURL)
+				if imageRemote := remoteMap[aciInfo.BlobKey]; imageRemote == nil {
+					fieldValue = ""
+				} else {
+					fieldValue = fmt.Sprintf("%s", imageRemote.ACIURL)
+				}
 			case l(signatureURL):
-				fieldValue = fmt.Sprintf("%s", remoteMap[aciInfo.BlobKey].SigURL)
+				if imageRemote := remoteMap[aciInfo.BlobKey]; imageRemote == nil {
+					fieldValue = ""
+				} else {
+					fieldValue = fmt.Sprintf("%s", imageRemote.SigURL)
+				}
 			}
 			fieldValues = append(fieldValues, fieldValue)
 
diff --git a/store/migrate_test.go b/store/migrate_test.go
index 80df14a88e..1324649cce 100644
--- a/store/migrate_test.go
+++ b/store/migrate_test.go
@@ -24,6 +24,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/davecgh/go-spew/spew"
 	"github.com/jonboulle/clockwork"
 )
 
@@ -949,10 +950,9 @@ func testMigrate(tt migrateTest) error {
 	if err := tt.curdb.load(db); err != nil {
 		return err
 	}
+
 	if !tt.curdb.compare(tt.postdb) {
-		// TODO(sgotti) not very useful as these are pointers.
-		// Use something like go-spew to write the full data?
-		return fmt.Errorf("got %#v, want %#v", tt.curdb, tt.postdb)
+		return spew.Errorf("while comparing DBs:\n\tgot %#v\n\twant %#v\n", tt.curdb, tt.postdb)
 	}
 
 	return nil
@@ -983,6 +983,7 @@ func TestMigrate(t *testing.T) {
 	treeStoreSizes := []int64{
 		0,
 		2 << 8,
+		2 << 16,
 	}
 
 	now := time.Now().UTC()
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 030e68a41d..e0a226fee2 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -618,18 +618,18 @@ func getPodInfo(t *testing.T, ctx *testutils.RktRunCtx, podID string) *podInfo {
 // For example, the 'result' can be:
 // 'sha512-e9b77714dbbfda12cb9e136318b103a6f0ce082004d09d0224a620d2bbf38133 nginx:latest 2015-10-16 17:42:57.741 -0700 PDT true'
 func parseImageInfoOutput(t *testing.T, result string) *imageInfo {
-	fields := regexp.MustCompile("\t+").Split(result, 6)
+	fields := regexp.MustCompile("\t+").Split(result, -1)
 	nameVersion := strings.Split(fields[1], ":")
 	if len(nameVersion) != 2 {
 		t.Fatalf("Failed to parse name version string: %q", fields[1])
 	}
-	importTime, err := time.Parse(defaultTimeLayout, fields[2])
+	importTime, err := time.Parse(defaultTimeLayout, fields[3])
 	if err != nil {
-		t.Fatalf("Failed to parse time string: %q", fields[2])
+		t.Fatalf("Failed to parse time string: %q", fields[3])
 	}
-	size, err := strconv.Atoi(fields[4])
+	size, err := strconv.Atoi(fields[2])
 	if err != nil {
-		t.Fatalf("Failed to parse image size string: %q", fields[4])
+		t.Fatalf("Failed to parse image size string: %q", fields[2])
 	}
 
 	return &imageInfo{

From afd5a63d1b22663edab4d6b754e1ebf907d1bebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 21 Jul 2016 15:37:28 +0200
Subject: [PATCH 0569/1304] rkt/image: various fixes

* Don't print the literals "none" and "all" when generating the string of
secflags.
* Docker images don't have a signature URL, store an empty string.
* Store ACI URL and Signature URL on the filefetcher.
* Show insecure options in rkt image list.
* Don't print "ondisk" in rkt image list, it is a runtime insecure
option.
---
 rkt/flag/secflags.go       |  7 +++++++
 rkt/image/dockerfetcher.go |  3 ++-
 rkt/image/filefetcher.go   | 14 ++++++++++++++
 rkt/image_list.go          | 12 ++++++++++--
 tests/rkt_tests.go         |  8 ++++----
 5 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/rkt/flag/secflags.go b/rkt/flag/secflags.go
index 6c84b4c29e..a0f21dff9b 100644
--- a/rkt/flag/secflags.go
+++ b/rkt/flag/secflags.go
@@ -102,9 +102,16 @@ func (sf *SecFlags) String() string {
 
 	for optstr, opt := range insecureOptionsMap {
 		if sf.hasFlag(opt) {
+			if opt == insecureNone || opt == insecureAll {
+				continue
+			}
 			opts = append(opts, optstr)
 		}
 	}
 
+	if len(opts) == 0 {
+		return "none"
+	}
+
 	return strings.Join(opts, ",")
 }
diff --git a/rkt/image/dockerfetcher.go b/rkt/image/dockerfetcher.go
index 2c9ae912a6..97bb73f715 100644
--- a/rkt/image/dockerfetcher.go
+++ b/rkt/image/dockerfetcher.go
@@ -83,7 +83,8 @@ func (f *dockerFetcher) fetchImageFrom(u *url.URL, latest bool) (string, error)
 		return "", err
 	}
 
-	newRem := store.NewRemote(u.String(), ascURLFromImgURL(u).String())
+	// docker images don't have signature URL
+	newRem := store.NewRemote(u.String(), "")
 	newRem.BlobKey = key
 	newRem.DownloadTime = time.Now()
 	err = f.S.WriteRemote(newRem)
diff --git a/rkt/image/filefetcher.go b/rkt/image/filefetcher.go
index a012b69605..1e5f7aa970 100644
--- a/rkt/image/filefetcher.go
+++ b/rkt/image/filefetcher.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/coreos/rkt/pkg/keystore"
 	rktflag "github.com/coreos/rkt/rkt/flag"
@@ -58,6 +59,19 @@ func (f *fileFetcher) Hash(aciPath string, a *asc) (string, error) {
 		return "", err
 	}
 
+	ascLocation := ""
+	if a != nil {
+		ascLocation = "file://" + a.Location
+	}
+
+	newRem := store.NewRemote("file://"+aciPath, ascLocation)
+	newRem.BlobKey = key
+	newRem.DownloadTime = time.Now()
+	err = f.S.WriteRemote(newRem)
+	if err != nil {
+		return "", err
+	}
+
 	return key, nil
 }
 
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 9a399fad37..7056c6c507 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -127,7 +127,7 @@ var (
 func init() {
 	sortFields := []string{l(name), l(importTime), l(lastUsed), l(size)}
 
-	fields := []string{l(id), l(name), l(aciURL), l(signatureURL), l(size), l(importTime), l(lastUsed)}
+	fields := []string{l(id), l(name), l(aciURL), l(signatureURL), l(insecureOptions), l(size), l(importTime), l(lastUsed)}
 
 	// Set defaults
 	var err error
@@ -252,7 +252,15 @@ func runImages(cmd *cobra.Command, args []string) int {
 					return 1
 				}
 
-				fieldValue = fmt.Sprintf("%s", f.String())
+				// remove ondisk, it's a runtime insecure option
+				sp := strings.Split(f.String(), ",")
+				for i, o := range sp {
+					if o == "ondisk" {
+						sp = append(sp[:i], sp[i+1:]...)
+					}
+				}
+
+				fieldValue = fmt.Sprintf("%s", strings.Join(sp, ","))
 			case l(aciURL):
 				if imageRemote := remoteMap[aciInfo.BlobKey]; imageRemote == nil {
 					fieldValue = ""
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index e0a226fee2..6fbffac373 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -623,13 +623,13 @@ func parseImageInfoOutput(t *testing.T, result string) *imageInfo {
 	if len(nameVersion) != 2 {
 		t.Fatalf("Failed to parse name version string: %q", fields[1])
 	}
-	importTime, err := time.Parse(defaultTimeLayout, fields[3])
+	importTime, err := time.Parse(defaultTimeLayout, fields[6])
 	if err != nil {
-		t.Fatalf("Failed to parse time string: %q", fields[3])
+		t.Fatalf("Failed to parse time string: %q", fields[6])
 	}
-	size, err := strconv.Atoi(fields[2])
+	size, err := strconv.Atoi(fields[5])
 	if err != nil {
-		t.Fatalf("Failed to parse image size string: %q", fields[2])
+		t.Fatalf("Failed to parse image size string: %q", fields[5])
 	}
 
 	return &imageInfo{

From 29ce1f40f6c2fa13bcced884e6af0e10ebf79ee4 Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Tue, 12 Jul 2016 18:48:55 +0200
Subject: [PATCH 0570/1304] store: move backup functions inside pkg/backup

---
 {store => pkg/backup}/backup.go      | 10 +++++-----
 {store => pkg/backup}/backup_test.go | 22 ++++++++++++----------
 store/store.go                       |  5 +++--
 3 files changed, 20 insertions(+), 17 deletions(-)
 rename {store => pkg/backup}/backup.go (89%)
 rename {store => pkg/backup}/backup_test.go (85%)

diff --git a/store/backup.go b/pkg/backup/backup.go
similarity index 89%
rename from store/backup.go
rename to pkg/backup/backup.go
index dfda1cf1ef..edde116c9b 100644
--- a/store/backup.go
+++ b/pkg/backup/backup.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package backup
 
 import (
 	"io/ioutil"
@@ -24,7 +24,7 @@ import (
 	"github.com/coreos/rkt/pkg/user"
 )
 
-// createBackup backs a database up in a given directory. It basically
+// CreateBackup backs a directory up in a given directory. It basically
 // copies this directory into a given backups directory. The backups
 // directory has a simple structure - a directory inside named "0" is
 // the most recent backup. A directory name for oldest backup is
@@ -32,12 +32,12 @@ import (
 // name for the oldest backup would be "4". If a backups number
 // exceeds the given limit then only newest ones are kept and the rest
 // is removed.
-func createBackup(dbDir, backupsDir string, limit int) error {
+func CreateBackup(dir, backupsDir string, limit int) error {
 	tmpBackupDir := filepath.Join(backupsDir, "tmp")
-	if err := os.MkdirAll(backupsDir, defaultPathPerm); err != nil {
+	if err := os.MkdirAll(backupsDir, 0750); err != nil {
 		return err
 	}
-	if err := fileutil.CopyTree(dbDir, tmpBackupDir, user.NewBlankUidRange()); err != nil {
+	if err := fileutil.CopyTree(dir, tmpBackupDir, user.NewBlankUidRange()); err != nil {
 		return err
 	}
 	defer os.RemoveAll(tmpBackupDir)
diff --git a/store/backup_test.go b/pkg/backup/backup_test.go
similarity index 85%
rename from store/backup_test.go
rename to pkg/backup/backup_test.go
index 0a941d7564..5d93e57098 100644
--- a/store/backup_test.go
+++ b/pkg/backup/backup_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package backup
 
 import (
 	"fmt"
@@ -23,6 +23,8 @@ import (
 	"testing"
 )
 
+const tstprefix = "backup-test"
+
 // TestBackup tests backup creation with limit 4
 func TestBackup(t *testing.T) {
 	dir, err := ioutil.TempDir("", tstprefix)
@@ -30,21 +32,21 @@ func TestBackup(t *testing.T) {
 		t.Fatalf("error creating tempdir: %v", err)
 	}
 	defer os.RemoveAll(dir)
-	dbDir := filepath.Join(dir, "db")
-	backupsDir := filepath.Join(dir, "db-backups")
+	srcDir := filepath.Join(dir, "src")
+	backupsDir := filepath.Join(dir, "backups")
 	limit := 4
 
 	for i := 0; i < limit*2; i++ {
-		if err := os.RemoveAll(dbDir); err != nil {
-			t.Fatalf("error removing dbdir: %v", err)
+		if err := os.RemoveAll(srcDir); err != nil {
+			t.Fatalf("error removing srcDir: %v", err)
 		}
-		if err := os.MkdirAll(dbDir, 0755); err != nil {
-			t.Fatalf("error creating dbdir: %v", err)
+		if err := os.MkdirAll(srcDir, 0755); err != nil {
+			t.Fatalf("error creating srcDir: %v", err)
 		}
-		if err := touch(filepath.Join(dbDir, strconv.Itoa(i))); err != nil {
+		if err := touch(filepath.Join(srcDir, strconv.Itoa(i))); err != nil {
 			t.Fatalf("error creating a file: %v", err)
 		}
-		if err := createBackup(dbDir, backupsDir, limit); err != nil {
+		if err := CreateBackup(srcDir, backupsDir, limit); err != nil {
 			t.Fatalf("error creating a backup: %v", err)
 		}
 		if err := checkBackups(backupsDir, limit, i); err != nil {
@@ -72,7 +74,7 @@ func checkBackups(backupsDir string, limit, i int) error {
 // Expectations for limit L
 //
 // for iteration I (0, 1, 2, ...)
-// at most D directories (where D = min(L,I + 1)
+// at most D srcDir (where D = min(L,I + 1)
 // dir 0 with file I
 // dir 1 with file I - 1
 // ...
diff --git a/store/store.go b/store/store.go
index 6529d67f2d..8248745df3 100644
--- a/store/store.go
+++ b/store/store.go
@@ -29,14 +29,15 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/coreos/rkt/pkg/backup"
 	"github.com/coreos/rkt/pkg/lock"
-	"github.com/hashicorp/errwrap"
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/pkg/acirenderer"
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 
+	"github.com/hashicorp/errwrap"
 	"github.com/peterbourgon/diskv"
 )
 
@@ -316,7 +317,7 @@ func (s *Store) Close() error {
 // backupDB backs up current database.
 func (s *Store) backupDB() error {
 	backupsDir := filepath.Join(s.dir, "db-backups")
-	return createBackup(s.db.dbdir, backupsDir, backupsNumber)
+	return backup.CreateBackup(s.db.dbdir, backupsDir, backupsNumber)
 }
 
 // TmpFile returns an *os.File local to the same filesystem as the Store, or

From 568f0c9531fffbce9741ef388579db303c4ea824 Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Tue, 12 Jul 2016 18:54:44 +0200
Subject: [PATCH 0571/1304] store: move db in its own package.

---
 store/{ => db}/db.go      |  8 ++++++-
 store/{ => db}/db_test.go |  2 +-
 store/migrate_test.go     | 47 ++++++++++++++++++++-------------------
 store/store.go            |  7 +++---
 4 files changed, 36 insertions(+), 28 deletions(-)
 rename store/{ => db}/db.go (93%)
 rename store/{ => db}/db_test.go (99%)

diff --git a/store/db.go b/store/db/db.go
similarity index 93%
rename from store/db.go
rename to store/db/db.go
index 833bcc4204..380edfbf14 100644
--- a/store/db.go
+++ b/store/db/db.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package db
 
 import (
 	"database/sql"
@@ -25,6 +25,8 @@ import (
 )
 
 const (
+	defaultPathPerm = os.FileMode(0770 | os.ModeSetgid)
+
 	DbFilename = "ql.db"
 )
 
@@ -39,6 +41,10 @@ func NewDB(dbdir string) (*DB, error) {
 	return &DB{dbdir: dbdir}, nil
 }
 
+func (db *DB) Path() string {
+	return db.dbdir
+}
+
 type txfunc func(*sql.Tx) error
 
 // Do Opens the db, executes DoTx and then Closes the DB
diff --git a/store/db_test.go b/store/db/db_test.go
similarity index 99%
rename from store/db_test.go
rename to store/db/db_test.go
index 895d6ec019..fd92640692 100644
--- a/store/db_test.go
+++ b/store/db/db_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package db
 
 import (
 	"database/sql"
diff --git a/store/migrate_test.go b/store/migrate_test.go
index 1324649cce..6f40e7e964 100644
--- a/store/migrate_test.go
+++ b/store/migrate_test.go
@@ -24,14 +24,15 @@ import (
 	"testing"
 	"time"
 
+	"github.com/coreos/rkt/store/db"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/jonboulle/clockwork"
 )
 
 type testdb interface {
 	version() int
-	populate(db *DB) error
-	load(db *DB) error
+	populate(db *db.DB) error
+	load(db *db.DB) error
 	compare(db testdb) bool
 }
 
@@ -44,7 +45,7 @@ func (d *DBV0) version() int {
 	return 0
 }
 
-func (d *DBV0) populate(db *DB) error {
+func (d *DBV0) populate(db *db.DB) error {
 	// As DBV0 and DBV1 have the same schema use a common populate
 	// function.
 	return populateDBV0_1(db, d.version(), d.aciinfos, d.remotes)
@@ -52,7 +53,7 @@ func (d *DBV0) populate(db *DB) error {
 
 // load populates the given struct with the data in db.
 // the given struct d should be empty
-func (d *DBV0) load(db *DB) error {
+func (d *DBV0) load(db *db.DB) error {
 	fn := func(tx *sql.Tx) error {
 		var err error
 		d.aciinfos, err = getAllACIInfosV0_2(tx)
@@ -93,11 +94,11 @@ type DBV1 struct {
 func (d *DBV1) version() int {
 	return 1
 }
-func (d *DBV1) populate(db *DB) error {
+func (d *DBV1) populate(db *db.DB) error {
 	return populateDBV0_1(db, d.version(), d.aciinfos, d.remotes)
 }
 
-func (d *DBV1) load(db *DB) error {
+func (d *DBV1) load(db *db.DB) error {
 	fn := func(tx *sql.Tx) error {
 		var err error
 		d.aciinfos, err = getAllACIInfosV0_2(tx)
@@ -138,11 +139,11 @@ type DBV2 struct {
 func (d *DBV2) version() int {
 	return 2
 }
-func (d *DBV2) populate(db *DB) error {
+func (d *DBV2) populate(db *db.DB) error {
 	return populateDBV2(db, d.version(), d.aciinfos, d.remotes)
 }
 
-func (d *DBV2) load(db *DB) error {
+func (d *DBV2) load(db *db.DB) error {
 	fn := func(tx *sql.Tx) error {
 		var err error
 		d.aciinfos, err = getAllACIInfosV0_2(tx)
@@ -183,11 +184,11 @@ type DBV3 struct {
 func (d *DBV3) version() int {
 	return 3
 }
-func (d *DBV3) populate(db *DB) error {
+func (d *DBV3) populate(db *db.DB) error {
 	return populateDBV3(db, d.version(), d.aciinfos, d.remotes)
 }
 
-func (d *DBV3) load(db *DB) error {
+func (d *DBV3) load(db *db.DB) error {
 	fn := func(tx *sql.Tx) error {
 		var err error
 		d.aciinfos, err = getAllACIInfosV3(tx)
@@ -228,11 +229,11 @@ type DBV4 struct {
 func (d *DBV4) version() int {
 	return 4
 }
-func (d *DBV4) populate(db *DB) error {
+func (d *DBV4) populate(db *db.DB) error {
 	return populateDBV4(db, d.version(), d.aciinfos, d.remotes)
 }
 
-func (d *DBV4) load(db *DB) error {
+func (d *DBV4) load(db *db.DB) error {
 	fn := func(tx *sql.Tx) error {
 		var err error
 		d.aciinfos, err = getAllACIInfosV4(tx)
@@ -273,11 +274,11 @@ type DBV5 struct {
 func (d *DBV5) version() int {
 	return 5
 }
-func (d *DBV5) populate(db *DB) error {
+func (d *DBV5) populate(db *db.DB) error {
 	return populateDBV5(db, d.version(), d.aciinfos, d.remotes)
 }
 
-func (d *DBV5) load(db *DB) error {
+func (d *DBV5) load(db *db.DB) error {
 	fn := func(tx *sql.Tx) error {
 		var err error
 		d.aciinfos, err = getAllACIInfosV5(tx)
@@ -318,11 +319,11 @@ type DBV6 struct {
 func (d *DBV6) version() int {
 	return 6
 }
-func (d *DBV6) populate(db *DB) error {
+func (d *DBV6) populate(db *db.DB) error {
 	return populateDBV6(db, d.version(), d.aciinfos, d.remotes)
 }
 
-func (d *DBV6) load(db *DB) error {
+func (d *DBV6) load(db *db.DB) error {
 	fn := func(tx *sql.Tx) error {
 		var err error
 		d.aciinfos, err = getAllACIInfosV6(tx)
@@ -553,7 +554,7 @@ func getAllRemoteV2_6(tx *sql.Tx) ([]*RemoteV2_6, error) {
 	return remotes, nil
 }
 
-func populateDBV0_1(db *DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*RemoteV0_1) error {
+func populateDBV0_1(db *db.DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*RemoteV0_1) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -611,7 +612,7 @@ func populateDBV0_1(db *DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*R
 	return nil
 }
 
-func populateDBV2(db *DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*RemoteV2_6) error {
+func populateDBV2(db *db.DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*RemoteV2_6) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -669,7 +670,7 @@ func populateDBV2(db *DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*Rem
 	return nil
 }
 
-func populateDBV3(db *DB, dbVersion int, aciInfos []*ACIInfoV3, remotes []*RemoteV2_6) error {
+func populateDBV3(db *db.DB, dbVersion int, aciInfos []*ACIInfoV3, remotes []*RemoteV2_6) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -726,7 +727,7 @@ func populateDBV3(db *DB, dbVersion int, aciInfos []*ACIInfoV3, remotes []*Remot
 	return nil
 }
 
-func populateDBV4(db *DB, dbVersion int, aciInfos []*ACIInfoV4, remotes []*RemoteV2_6) error {
+func populateDBV4(db *db.DB, dbVersion int, aciInfos []*ACIInfoV4, remotes []*RemoteV2_6) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -783,7 +784,7 @@ func populateDBV4(db *DB, dbVersion int, aciInfos []*ACIInfoV4, remotes []*Remot
 	return nil
 }
 
-func populateDBV5(db *DB, dbVersion int, aciInfos []*ACIInfoV5, remotes []*RemoteV2_6) error {
+func populateDBV5(db *db.DB, dbVersion int, aciInfos []*ACIInfoV5, remotes []*RemoteV2_6) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -840,7 +841,7 @@ func populateDBV5(db *DB, dbVersion int, aciInfos []*ACIInfoV5, remotes []*Remot
 	return nil
 }
 
-func populateDBV6(db *DB, dbVersion int, aciInfos []*ACIInfoV6, remotes []*RemoteV2_6) error {
+func populateDBV6(db *db.DB, dbVersion int, aciInfos []*ACIInfoV6, remotes []*RemoteV2_6) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -912,7 +913,7 @@ func testMigrate(tt migrateTest) error {
 	defer os.RemoveAll(dir)
 
 	casDir := filepath.Join(dir, "cas")
-	db, err := NewDB(filepath.Join(casDir, "db"))
+	db, err := db.NewDB(filepath.Join(casDir, "db"))
 	if err != nil {
 		return err
 	}
diff --git a/store/store.go b/store/store.go
index 8248745df3..31569ebd19 100644
--- a/store/store.go
+++ b/store/store.go
@@ -31,6 +31,7 @@ import (
 
 	"github.com/coreos/rkt/pkg/backup"
 	"github.com/coreos/rkt/pkg/lock"
+	"github.com/coreos/rkt/store/db"
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/pkg/acirenderer"
@@ -100,7 +101,7 @@ func (e *StoreRemovalError) Error() string {
 type Store struct {
 	dir       string
 	stores    []*diskv.Diskv
-	db        *DB
+	db        *db.DB
 	treestore *TreeStore
 	// storeLock is a lock on the whole store. It's used for store migration. If
 	// a previous version of rkt is using the store and in the meantime a
@@ -232,7 +233,7 @@ func NewStore(baseDir string) (*Store, error) {
 			Transform: blockTransform,
 		})
 	}
-	db, err := NewDB(filepath.Join(storeDir, "db"))
+	db, err := db.NewDB(filepath.Join(storeDir, "db"))
 	if err != nil {
 		return nil, err
 	}
@@ -317,7 +318,7 @@ func (s *Store) Close() error {
 // backupDB backs up current database.
 func (s *Store) backupDB() error {
 	backupsDir := filepath.Join(s.dir, "db-backups")
-	return backup.CreateBackup(s.db.dbdir, backupsDir, backupsNumber)
+	return backup.CreateBackup(s.db.Path(), backupsDir, backupsNumber)
 }
 
 // TmpFile returns an *os.File local to the same filesystem as the Store, or

From 4a6f0c2105818199057971641c047f5b1dc1cced Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Tue, 12 Jul 2016 22:57:16 +0200
Subject: [PATCH 0572/1304] store: use storeDir on NewStore

For a strange reason store.NewStore was made to get the rkt DataDir and
calculate by itself the store dir adding the "cas" directory.

This patch makes it more logical passing to NewStore the store dir.
---
 rkt/api_service.go        |  2 +-
 rkt/enter.go              |  2 +-
 rkt/fetch.go              |  2 +-
 rkt/gc.go                 |  2 +-
 rkt/image_cat_manifest.go |  2 +-
 rkt/image_export.go       |  2 +-
 rkt/image_extract.go      |  2 +-
 rkt/image_gc.go           |  2 +-
 rkt/image_list.go         |  2 +-
 rkt/image_render.go       |  2 +-
 rkt/image_rm.go           |  2 +-
 rkt/prepare.go            |  2 +-
 rkt/rkt.go                |  4 ++++
 rkt/run.go                |  2 +-
 rkt/run_prepared.go       |  2 +-
 store/store.go            | 18 ++++++++----------
 store/store_test.go       |  2 +-
 17 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index c7c05cf6dd..aa6fcc702e 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -76,7 +76,7 @@ type v1AlphaAPIServer struct {
 var _ v1alpha.PublicAPIServer = &v1AlphaAPIServer{}
 
 func newV1AlphaAPIServer() (*v1AlphaAPIServer, error) {
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		return nil, err
 	}
diff --git a/rkt/enter.go b/rkt/enter.go
index 7e2a9c2b1b..564807d6b1 100644
--- a/rkt/enter.go
+++ b/rkt/enter.go
@@ -94,7 +94,7 @@ func runEnter(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/fetch.go b/rkt/fetch.go
index 260b7d5236..40a238b60e 100644
--- a/rkt/fetch.go
+++ b/rkt/fetch.go
@@ -78,7 +78,7 @@ func runFetch(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/gc.go b/rkt/gc.go
index 2911101c17..0c92c2fc0e 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -229,7 +229,7 @@ func deletePod(p *pod) {
 	}
 
 	if p.isExitedGarbage {
-		s, err := store.NewStore(getDataDir())
+		s, err := store.NewStore(storeDir())
 		if err != nil {
 			stderr.PrintE("cannot open store", err)
 			return
diff --git a/rkt/image_cat_manifest.go b/rkt/image_cat_manifest.go
index 490a59432b..2fb5c666eb 100644
--- a/rkt/image_cat_manifest.go
+++ b/rkt/image_cat_manifest.go
@@ -43,7 +43,7 @@ func runImageCatManifest(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/image_export.go b/rkt/image_export.go
index 9d11e38f44..2c4a741194 100644
--- a/rkt/image_export.go
+++ b/rkt/image_export.go
@@ -48,7 +48,7 @@ func runImageExport(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/image_extract.go b/rkt/image_extract.go
index e90df89817..26b72a1833 100644
--- a/rkt/image_extract.go
+++ b/rkt/image_extract.go
@@ -55,7 +55,7 @@ func runImageExtract(cmd *cobra.Command, args []string) (exit int) {
 	}
 	outputDir := args[1]
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/image_gc.go b/rkt/image_gc.go
index cb5c914c66..028535bb0b 100644
--- a/rkt/image_gc.go
+++ b/rkt/image_gc.go
@@ -49,7 +49,7 @@ func init() {
 }
 
 func runGCImage(cmd *cobra.Command, args []string) (exit int) {
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 7056c6c507..1cef3fa1eb 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -164,7 +164,7 @@ func runImages(cmd *cobra.Command, args []string) int {
 		fmt.Fprintf(tabOut, "%s\n", strings.Join(headerFields, "\t"))
 	}
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/image_render.go b/rkt/image_render.go
index 43b4426251..d1a0caca9a 100644
--- a/rkt/image_render.go
+++ b/rkt/image_render.go
@@ -57,7 +57,7 @@ func runImageRender(cmd *cobra.Command, args []string) (exit int) {
 	}
 	outputDir := args[1]
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/image_rm.go b/rkt/image_rm.go
index 316c40c2d9..5b65746826 100644
--- a/rkt/image_rm.go
+++ b/rkt/image_rm.go
@@ -131,7 +131,7 @@ func runRmImage(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/prepare.go b/rkt/prepare.go
index a71e673203..05dd2bc1a2 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -121,7 +121,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/rkt.go b/rkt/rkt.go
index 548ec4b91a..2d90909764 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -293,6 +293,10 @@ func garbageDir() string {
 	return filepath.Join(getDataDir(), "pods", "garbage")
 }
 
+func storeDir() string {
+	return filepath.Join(getDataDir(), "cas")
+}
+
 func getKeystore() *keystore.Keystore {
 	if globalFlags.InsecureFlags.SkipImageCheck() {
 		return nil
diff --git a/rkt/run.go b/rkt/run.go
index c1b30777a5..f48369b0ef 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -173,7 +173,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index 787f1f95b2..832083c201 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -62,7 +62,7 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 	}
 	defer p.Close()
 
-	s, err := store.NewStore(getDataDir())
+	s, err := store.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/store/store.go b/store/store.go
index 31569ebd19..5166c98d00 100644
--- a/store/store.go
+++ b/store/store.go
@@ -191,33 +191,31 @@ func (s *Store) populateSize() error {
 	return nil
 }
 
-func NewStore(baseDir string) (*Store, error) {
+func NewStore(dir string) (*Store, error) {
 	// We need to allow the store's setgid bits (if any) to propagate, so
 	// disable umask
 	um := syscall.Umask(0)
 	defer syscall.Umask(um)
 
-	storeDir := filepath.Join(baseDir, "cas")
-
 	s := &Store{
-		dir:    storeDir,
+		dir:    dir,
 		stores: make([]*diskv.Diskv, len(diskvStores)),
 	}
 
-	s.imageLockDir = filepath.Join(storeDir, "imagelocks")
+	s.imageLockDir = filepath.Join(dir, "imagelocks")
 	err := os.MkdirAll(s.imageLockDir, defaultPathPerm)
 	if err != nil {
 		return nil, err
 	}
 
-	s.treeStoreLockDir = filepath.Join(storeDir, "treestorelocks")
+	s.treeStoreLockDir = filepath.Join(dir, "treestorelocks")
 	err = os.MkdirAll(s.treeStoreLockDir, defaultPathPerm)
 	if err != nil {
 		return nil, err
 	}
 
 	// Take a shared cas lock
-	s.storeLock, err = lock.NewLock(storeDir, lock.Dir)
+	s.storeLock, err = lock.NewLock(dir, lock.Dir)
 	if err != nil {
 		return nil, err
 	}
@@ -229,17 +227,17 @@ func NewStore(baseDir string) (*Store, error) {
 		s.stores[i] = diskv.New(diskv.Options{
 			PathPerm:  defaultPathPerm,
 			FilePerm:  defaultFilePerm,
-			BasePath:  filepath.Join(storeDir, p),
+			BasePath:  filepath.Join(dir, p),
 			Transform: blockTransform,
 		})
 	}
-	db, err := db.NewDB(filepath.Join(storeDir, "db"))
+	db, err := db.NewDB(filepath.Join(dir, "db"))
 	if err != nil {
 		return nil, err
 	}
 	s.db = db
 
-	s.treestore = &TreeStore{path: filepath.Join(storeDir, "tree")}
+	s.treestore = &TreeStore{path: filepath.Join(dir, "tree")}
 
 	needsMigrate := false
 	needsSizePopulation := false
diff --git a/store/store_test.go b/store/store_test.go
index c4f3901e86..276ad84ae7 100644
--- a/store/store_test.go
+++ b/store/store_test.go
@@ -555,7 +555,7 @@ func TestRemoveACI(t *testing.T) {
 	na.BlobKey = key
 	s.WriteRemote(na)
 
-	err = os.Remove(filepath.Join(dir, "cas", "blob", blockTransform(key)[0], blockTransform(key)[1], key))
+	err = os.Remove(filepath.Join(dir, "blob", blockTransform(key)[0], blockTransform(key)[1], key))
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

From 3709ddc7682e5ed39e34613969f43da9e5b07ef9 Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Tue, 12 Jul 2016 19:12:21 +0200
Subject: [PATCH 0573/1304] store: decouple image store and tree store
 implementations.

The current image store and tree store are logically decoupled but
historically the implementation was done under an unique store object.

This patch splits the store in its two logical parts: an image store
(currently only appc ACIs) and a tree store.

This makes the code cleaner and will ease implementations of different kind
of image types for other specs (like OCI).

Future patches will cover the various TODOs:

* Migration to a less unfortunate path naming ("cas") and separated
paths for the store and the tree store. This needs to be seamless and
is quite complex (have to handle pods with an overlayfs mounted etc.)
Make the tree store accept an interface to an image store (this needs
* The removal of the current logic of saving the aci tree store sizes
inside the aci store totally decoupling them and make `rkt image list`
calculate the total size)
---
 rkt/api_service.go                     |  12 +-
 rkt/enter.go                           |  13 +-
 rkt/export.go                          |  12 +-
 rkt/fetch.go                           |  13 +-
 rkt/fetch_test.go                      |  12 +-
 rkt/gc.go                              |  17 +-
 rkt/image/asc.go                       |   4 +-
 rkt/image/common.go                    |   9 +-
 rkt/image/dockerfetcher.go             |   8 +-
 rkt/image/fetcher.go                   |  14 +-
 rkt/image/filefetcher.go               |   8 +-
 rkt/image/httpfetcher.go               |  12 +-
 rkt/image/httpops.go                   |   4 +-
 rkt/image/io.go                        |   4 +-
 rkt/image/namefetcher.go               |   8 +-
 rkt/image_cat_manifest.go              |   4 +-
 rkt/image_cmd_common.go                |   8 +-
 rkt/image_export.go                    |   4 +-
 rkt/image_extract.go                   |   4 +-
 rkt/image_gc.go                        |  21 +-
 rkt/image_list.go                      |   6 +-
 rkt/image_render.go                    |  19 +-
 rkt/image_rm.go                        |   8 +-
 rkt/prepare.go                         |  15 +-
 rkt/rkt.go                             |   5 +
 rkt/run.go                             |  15 +-
 rkt/run_prepared.go                    |  18 +-
 rkt/stage1hash.go                      |  20 +-
 stage0/run.go                          |  30 +--
 store/db/db.go                         |   4 -
 store/{ => imagestore}/LICENSE.BSD     |   0
 store/{ => imagestore}/aciinfo.go      |   2 +-
 store/{ => imagestore}/aciinfo_test.go |   2 +-
 store/{ => imagestore}/main_test.go    |   4 +-
 store/{ => imagestore}/migrate.go      |   2 +-
 store/{ => imagestore}/migrate_test.go |   6 +-
 store/{ => imagestore}/remote.go       |   2 +-
 store/{ => imagestore}/remote_test.go  |   2 +-
 store/{ => imagestore}/schema.go       |   2 +-
 store/{ => imagestore}/store.go        | 198 ++--------------
 store/{ => imagestore}/store_test.go   | 132 +----------
 store/{ => imagestore}/utils.go        |   2 +-
 store/{ => imagestore}/utils_test.go   |   2 +-
 store/tree_test.go                     | 165 -------------
 store/{ => treestore}/tree.go          | 201 +++++++++++++---
 store/treestore/tree_test.go           | 312 +++++++++++++++++++++++++
 46 files changed, 723 insertions(+), 642 deletions(-)
 rename store/{ => imagestore}/LICENSE.BSD (100%)
 rename store/{ => imagestore}/aciinfo.go (99%)
 rename store/{ => imagestore}/aciinfo_test.go (99%)
 rename store/{ => imagestore}/main_test.go (93%)
 rename store/{ => imagestore}/migrate.go (99%)
 rename store/{ => imagestore}/migrate_test.go (99%)
 rename store/{ => imagestore}/remote.go (99%)
 rename store/{ => imagestore}/remote_test.go (98%)
 rename store/{ => imagestore}/schema.go (99%)
 rename store/{ => imagestore}/store.go (78%)
 rename store/{ => imagestore}/store_test.go (80%)
 rename store/{ => imagestore}/utils.go (99%)
 rename store/{ => imagestore}/utils_test.go (98%)
 delete mode 100644 store/tree_test.go
 rename store/{ => treestore}/tree.go (63%)
 create mode 100644 store/treestore/tree_test.go

diff --git a/rkt/api_service.go b/rkt/api_service.go
index aa6fcc702e..8e163eda6b 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -34,7 +34,7 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/pkg/set"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/coreos/rkt/version"
 	"github.com/godbus/dbus"
 	"github.com/hashicorp/errwrap"
@@ -70,13 +70,13 @@ func init() {
 
 // v1AlphaAPIServer implements v1Alpha.APIServer interface.
 type v1AlphaAPIServer struct {
-	store *store.Store
+	store *imagestore.Store
 }
 
 var _ v1alpha.PublicAPIServer = &v1AlphaAPIServer{}
 
 func newV1AlphaAPIServer() (*v1AlphaAPIServer, error) {
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		return nil, err
 	}
@@ -444,7 +444,7 @@ func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPo
 }
 
 // fillAppInfo fills the apps' state and image info of the pod.
-func fillAppInfo(store *store.Store, p *pod, v1pod *v1alpha.Pod) {
+func fillAppInfo(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
 	switch v1pod.State {
 	case v1alpha.PodState_POD_STATE_UNDEFINED:
 		return
@@ -537,7 +537,7 @@ func (s *v1AlphaAPIServer) InspectPod(ctx context.Context, request *v1alpha.Insp
 }
 
 // aciInfoToV1AlphaAPIImage takes an aciInfo object and construct the v1alpha.Image object.
-func aciInfoToV1AlphaAPIImage(store *store.Store, aciInfo *store.ACIInfo) (*v1alpha.Image, error) {
+func aciInfoToV1AlphaAPIImage(store *imagestore.Store, aciInfo *imagestore.ACIInfo) (*v1alpha.Image, error) {
 	manifest, err := store.GetImageManifestJSON(aciInfo.BlobKey)
 	if err != nil {
 		stderr.PrintE("failed to read the image manifest", err)
@@ -709,7 +709,7 @@ func (s *v1AlphaAPIServer) ListImages(ctx context.Context, request *v1alpha.List
 }
 
 // getImageInfo for a given image ID, returns the *v1alpha.Image object.
-func getImageInfo(store *store.Store, imageID string) (*v1alpha.Image, error) {
+func getImageInfo(store *imagestore.Store, imageID string) (*v1alpha.Image, error) {
 	key, err := store.ResolveKey(imageID)
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to resolve the image ID %q", imageID), err)
diff --git a/rkt/enter.go b/rkt/enter.go
index 564807d6b1..8c40e675c4 100644
--- a/rkt/enter.go
+++ b/rkt/enter.go
@@ -25,7 +25,8 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
 	"github.com/spf13/cobra"
 )
@@ -94,7 +95,13 @@ func runEnter(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
+	if err != nil {
+		stderr.PrintE("cannot open store", err)
+		return 1
+	}
+
+	ts, err := treestore.NewStore(treeStoreDir(), s)
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
@@ -106,7 +113,7 @@ func runEnter(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	stage1RootFS := s.GetTreeStoreRootFS(stage1TreeStoreID)
+	stage1RootFS := ts.GetRootFS(stage1TreeStoreID)
 
 	if err = stage0.Enter(p.path(), podPID, *appName, stage1RootFS, argv); err != nil {
 		stderr.PrintE("enter failed", err)
diff --git a/rkt/export.go b/rkt/export.go
index 23580b60d9..3750cf9465 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -32,7 +32,8 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/overlay"
 	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
 	"github.com/spf13/cobra"
 )
@@ -195,16 +196,21 @@ func mountOverlay(pod *pod, app *schema.RuntimeApp, dest string) error {
 		return err
 	}
 
-	s, err := store.NewStore(getDataDir())
+	s, err := imagestore.NewStore(getDataDir())
 	if err != nil {
 		return errwrap.Wrap(errors.New("cannot open store"), err)
 	}
 
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		return errwrap.Wrap(errors.New("cannot open treestore"), err)
+	}
+
 	treeStoreID, err := pod.getAppTreeStoreID(app.Name)
 	if err != nil {
 		return err
 	}
-	lower := s.GetTreeStoreRootFS(treeStoreID)
+	lower := ts.GetRootFS(treeStoreID)
 	imgDir := filepath.Join(filepath.Join(pod.path(), "overlay"), treeStoreID)
 	if _, err := os.Stat(imgDir); err != nil {
 		return err
diff --git a/rkt/fetch.go b/rkt/fetch.go
index 40a238b60e..f3706366f2 100644
--- a/rkt/fetch.go
+++ b/rkt/fetch.go
@@ -20,7 +20,8 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common/apps"
 	"github.com/coreos/rkt/rkt/image"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 
 	"github.com/spf13/cobra"
 )
@@ -78,11 +79,18 @@ func runFetch(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
 	}
+
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open treestore", err)
+		return 1
+	}
+
 	ks := getKeystore()
 	config, err := getConfig()
 	if err != nil {
@@ -91,6 +99,7 @@ func runFetch(cmd *cobra.Command, args []string) (exit int) {
 	}
 	ft := &image.Fetcher{
 		S:                  s,
+		Ts:                 ts,
 		Ks:                 ks,
 		Headers:            config.AuthPerHost,
 		DockerAuth:         config.DockerCredentialsPerRegistry,
diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index c225b44fca..c173429f49 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -36,7 +36,7 @@ import (
 	"github.com/coreos/rkt/rkt/config"
 	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/coreos/rkt/rkt/image"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 )
 
 type httpError struct {
@@ -253,7 +253,7 @@ func TestDownloading(t *testing.T) {
 		{denyAuthTS.URL, true, noAuth, false},
 	}
 
-	s, err := store.NewStore(dir)
+	s, err := imagestore.NewStore(dir)
 	if err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
@@ -299,7 +299,7 @@ func TestFetchImage(t *testing.T) {
 		t.Fatalf("error creating tempdir: %v", err)
 	}
 	defer os.RemoveAll(dir)
-	s, err := store.NewStore(dir)
+	s, err := imagestore.NewStore(dir)
 	if err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
@@ -366,7 +366,7 @@ func TestGetStoreKeyFromApp(t *testing.T) {
 		t.Fatalf("error creating tempdir: %v", err)
 	}
 	defer os.RemoveAll(dir)
-	s, err := store.NewStore(dir)
+	s, err := imagestore.NewStore(dir)
 	if err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
@@ -382,7 +382,7 @@ func TestGetStoreKeyFromApp(t *testing.T) {
 	if _, err := a.Seek(0, 0); err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
-	_, err = s.WriteACI(a, store.ACIFetchInfo{Latest: false})
+	_, err = s.WriteACI(a, imagestore.ACIFetchInfo{Latest: false})
 	if err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
@@ -437,7 +437,7 @@ func TestFetchImageCache(t *testing.T) {
 		t.Fatalf("error creating tempdir: %v", err)
 	}
 	defer os.RemoveAll(dir)
-	s, err := store.NewStore(dir)
+	s, err := imagestore.NewStore(dir)
 	if err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
diff --git a/rkt/gc.go b/rkt/gc.go
index 0c92c2fc0e..9bcca5abcc 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -26,7 +26,8 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
 	"github.com/spf13/cobra"
 )
@@ -195,7 +196,7 @@ func emptyGarbage() error {
 	return nil
 }
 
-func mountPodStage1(s *store.Store, p *pod) error {
+func mountPodStage1(ts *treestore.Store, p *pod) error {
 	if !p.usesOverlay() {
 		return nil
 	}
@@ -204,7 +205,7 @@ func mountPodStage1(s *store.Store, p *pod) error {
 	if err != nil {
 		return errwrap.Wrap(errors.New("error getting stage1 treeStoreID"), err)
 	}
-	s1rootfs := s.GetTreeStoreRootFS(s1Id)
+	s1rootfs := ts.GetRootFS(s1Id)
 
 	stage1Dir := common.Stage1RootfsPath(p.path())
 	overlayDir := filepath.Join(p.path(), "overlay")
@@ -229,18 +230,24 @@ func deletePod(p *pod) {
 	}
 
 	if p.isExitedGarbage {
-		s, err := store.NewStore(storeDir())
+		s, err := imagestore.NewStore(storeDir())
 		if err != nil {
 			stderr.PrintE("cannot open store", err)
 			return
 		}
 		defer s.Close()
 
+		ts, err := treestore.NewStore(treeStoreDir(), s)
+		if err != nil {
+			stderr.PrintE("cannot open store", err)
+			return
+		}
+
 		if globalFlags.Debug {
 			stage0.InitDebug()
 		}
 
-		if err := mountPodStage1(s, p); err == nil {
+		if err := mountPodStage1(ts, p); err == nil {
 			if err = stage0.GC(p.path(), p.uuid); err != nil {
 				stderr.PrintE(fmt.Sprintf("problem performing stage1 GC on %q", p.uuid), err)
 			}
diff --git a/rkt/image/asc.go b/rkt/image/asc.go
index ce26c47b54..964385ceef 100644
--- a/rkt/image/asc.go
+++ b/rkt/image/asc.go
@@ -19,7 +19,7 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 )
 
@@ -44,7 +44,7 @@ type remoteAscFetcher struct {
 	// F is a function that actually does the fetching
 	F func(*url.URL, *os.File) error
 	// S is a store - used for getting a temporary file
-	S *store.Store
+	S *imagestore.Store
 }
 
 func (f *remoteAscFetcher) Get(location string) (readSeekCloser, error) {
diff --git a/rkt/image/common.go b/rkt/image/common.go
index 789f3cf663..a659f72519 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -28,7 +28,8 @@ import (
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/rkt/config"
 	rktflag "github.com/coreos/rkt/rkt/flag"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -37,8 +38,10 @@ import (
 
 // action is a common type for Finder and Fetcher
 type action struct {
-	// S is a store where images will be looked for or stored.
-	S *store.Store
+	// S is an aci store where images will be looked for or stored.
+	S *imagestore.Store
+	// Ts is an aci tree store.
+	Ts *treestore.Store
 	// Ks is a keystore used for verification of the image
 	Ks *keystore.Keystore
 	// Headers is a map of headers which might be used for
diff --git a/rkt/image/dockerfetcher.go b/rkt/image/dockerfetcher.go
index 97bb73f715..581bf209f0 100644
--- a/rkt/image/dockerfetcher.go
+++ b/rkt/image/dockerfetcher.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/coreos/rkt/rkt/config"
 	rktflag "github.com/coreos/rkt/rkt/flag"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 
 	docker2aci "github.com/appc/docker2aci/lib"
@@ -42,7 +42,7 @@ type dockerFetcher struct {
 	// be enabled. No image verification must be true for now.
 	InsecureFlags *rktflag.SecFlags
 	DockerAuth    map[string]config.BasicCredentials
-	S             *store.Store
+	S             *imagestore.Store
 	Debug         bool
 }
 
@@ -75,7 +75,7 @@ func (f *dockerFetcher) fetchImageFrom(u *url.URL, latest bool) (string, error)
 	// alive, because we have an fd to it opened.
 	defer aciFile.Close()
 
-	key, err := f.S.WriteACI(aciFile, store.ACIFetchInfo{
+	key, err := f.S.WriteACI(aciFile, imagestore.ACIFetchInfo{
 		Latest:          latest,
 		InsecureOptions: int64(f.InsecureFlags.Value()),
 	})
@@ -84,7 +84,7 @@ func (f *dockerFetcher) fetchImageFrom(u *url.URL, latest bool) (string, error)
 	}
 
 	// docker images don't have signature URL
-	newRem := store.NewRemote(u.String(), "")
+	newRem := imagestore.NewRemote(u.String(), "")
 	newRem.BlobKey = key
 	newRem.DownloadTime = time.Now()
 	err = f.S.WriteRemote(newRem)
diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index 831e9a39bb..928ffd7a94 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -25,7 +25,7 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
 	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 
 	"github.com/appc/spec/discovery"
@@ -56,7 +56,7 @@ func (f *Fetcher) FetchImage(img string, ascPath string, imgType apps.AppImageTy
 	// we need to be able to do a chroot and access to the tree store
 	// directories, check if we're root
 	if common.SupportsOverlay() && os.Geteuid() == 0 {
-		if _, _, err := f.S.RenderTreeStore(hash, false); err != nil {
+		if _, _, err := f.Ts.Render(hash, false); err != nil {
 			return "", errwrap.Wrap(errors.New("error rendering tree store"), err)
 		}
 	}
@@ -200,7 +200,7 @@ func (f *Fetcher) fetchSingleImageByDockerURL(u *url.URL) (string, error) {
 	return "", fmt.Errorf("unable to fetch docker image from URL %q: either image was not found in the store or store was disabled and fetching from remote yielded nothing or it was disabled", u.String())
 }
 
-func (f *Fetcher) getRemoteForURL(u *url.URL) (*store.Remote, error) {
+func (f *Fetcher) getRemoteForURL(u *url.URL) (*imagestore.Remote, error) {
 	if f.NoCache {
 		return nil, nil
 	}
@@ -213,7 +213,7 @@ func (f *Fetcher) getRemoteForURL(u *url.URL) (*store.Remote, error) {
 	return nil, nil
 }
 
-func (f *Fetcher) maybeCheckRemoteFromStore(rem *store.Remote, check remoteCheck) string {
+func (f *Fetcher) maybeCheckRemoteFromStore(rem *imagestore.Remote, check remoteCheck) string {
 	if f.NoStore || rem == nil {
 		return ""
 	}
@@ -231,7 +231,7 @@ func (f *Fetcher) maybeCheckRemoteFromStore(rem *store.Remote, check remoteCheck
 	return ""
 }
 
-func (f *Fetcher) maybeFetchHTTPURLFromRemote(rem *store.Remote, u *url.URL, a *asc) (string, error) {
+func (f *Fetcher) maybeFetchHTTPURLFromRemote(rem *imagestore.Remote, u *url.URL, a *asc) (string, error) {
 	if !f.StoreOnly {
 		log.Printf("remote fetching from URL %q", u.String())
 		hf := &httpFetcher{
@@ -320,7 +320,7 @@ func (f *Fetcher) maybeCheckStoreForApp(app *appBundle) (string, error) {
 			return key, nil
 		}
 		switch err.(type) {
-		case store.ACINotFoundError:
+		case imagestore.ACINotFoundError:
 			// ignore the "not found" error
 		default:
 			return "", err
@@ -337,7 +337,7 @@ func (f *Fetcher) getStoreKeyFromApp(app *appBundle) (string, error) {
 	key, err := f.S.GetACI(app.App.Name, labels)
 	if err != nil {
 		switch err.(type) {
-		case store.ACINotFoundError:
+		case imagestore.ACINotFoundError:
 			return "", err
 		default:
 			return "", errwrap.Wrap(fmt.Errorf("cannot find image %q", app.Str), err)
diff --git a/rkt/image/filefetcher.go b/rkt/image/filefetcher.go
index 1e5f7aa970..e570b40e13 100644
--- a/rkt/image/filefetcher.go
+++ b/rkt/image/filefetcher.go
@@ -23,14 +23,14 @@ import (
 
 	"github.com/coreos/rkt/pkg/keystore"
 	rktflag "github.com/coreos/rkt/rkt/flag"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 )
 
 // fileFetcher is used to fetch files from a local filesystem
 type fileFetcher struct {
 	InsecureFlags *rktflag.SecFlags
-	S             *store.Store
+	S             *imagestore.Store
 	Ks            *keystore.Keystore
 	Debug         bool
 }
@@ -51,7 +51,7 @@ func (f *fileFetcher) Hash(aciPath string, a *asc) (string, error) {
 	}
 	defer aciFile.Close()
 
-	key, err := f.S.WriteACI(aciFile, store.ACIFetchInfo{
+	key, err := f.S.WriteACI(aciFile, imagestore.ACIFetchInfo{
 		Latest:          false,
 		InsecureOptions: int64(f.InsecureFlags.Value()),
 	})
@@ -64,7 +64,7 @@ func (f *fileFetcher) Hash(aciPath string, a *asc) (string, error) {
 		ascLocation = "file://" + a.Location
 	}
 
-	newRem := store.NewRemote("file://"+aciPath, ascLocation)
+	newRem := imagestore.NewRemote("file://"+aciPath, ascLocation)
 	newRem.BlobKey = key
 	newRem.DownloadTime = time.Now()
 	err = f.S.WriteRemote(newRem)
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index 6769415fbd..7330e31828 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -24,16 +24,16 @@ import (
 	"github.com/coreos/rkt/pkg/keystore"
 	"github.com/coreos/rkt/rkt/config"
 	rktflag "github.com/coreos/rkt/rkt/flag"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 )
 
 // httpFetcher is used to download images from http or https URLs.
 type httpFetcher struct {
 	InsecureFlags *rktflag.SecFlags
-	S             *store.Store
+	S             *imagestore.Store
 	Ks            *keystore.Keystore
-	Rem           *store.Remote
+	Rem           *imagestore.Remote
 	Debug         bool
 	Headers       map[string]config.Headerer
 }
@@ -60,7 +60,7 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 		// CacheMaxAge is exceeded
 		return key, nil
 	}
-	key, err := f.S.WriteACI(aciFile, store.ACIFetchInfo{
+	key, err := f.S.WriteACI(aciFile, imagestore.ACIFetchInfo{
 		Latest:          false,
 		InsecureOptions: int64(f.InsecureFlags.Value()),
 	})
@@ -69,9 +69,9 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 	}
 
 	// TODO(krnowak): What's the point of the second parameter?
-	// The SigURL field in store.Remote seems to be completely
+	// The SigURL field in imagestore.Remote seems to be completely
 	// unused.
-	newRem := store.NewRemote(urlStr, a.Location)
+	newRem := imagestore.NewRemote(urlStr, a.Location)
 	newRem.BlobKey = key
 	newRem.DownloadTime = time.Now()
 	if cd != nil {
diff --git a/rkt/image/httpops.go b/rkt/image/httpops.go
index 87553aafe9..f400ea4f5a 100644
--- a/rkt/image/httpops.go
+++ b/rkt/image/httpops.go
@@ -22,7 +22,7 @@ import (
 	"os"
 
 	"github.com/coreos/rkt/rkt/config"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 )
 
@@ -32,7 +32,7 @@ import (
 // remote fetcher for asc.
 type httpOps struct {
 	InsecureSkipTLSVerify bool
-	S                     *store.Store
+	S                     *imagestore.Store
 	Headers               map[string]config.Headerer
 	Debug                 bool
 }
diff --git a/rkt/image/io.go b/rkt/image/io.go
index 542d4b6fa1..0569b91651 100644
--- a/rkt/image/io.go
+++ b/rkt/image/io.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/coreos/rkt/pkg/lock"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 
 	"github.com/coreos/ioprogress"
@@ -106,7 +106,7 @@ func (f *removeOnClose) Close() error {
 // getTmpROC returns a removeOnClose instance wrapping a temporary
 // file provided by the passed store. The actual file name is based on
 // a hash of the passed path.
-func getTmpROC(s *store.Store, path string) (*removeOnClose, error) {
+func getTmpROC(s *imagestore.Store, path string) (*removeOnClose, error) {
 	h := sha512.New()
 	h.Write([]byte(path))
 	pathHash := s.HashToKey(h)
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index c338fed2ef..5369c7261b 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -26,7 +26,7 @@ import (
 	"github.com/coreos/rkt/rkt/config"
 	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/coreos/rkt/rkt/pubkey"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 
 	"github.com/appc/spec/discovery"
@@ -36,7 +36,7 @@ import (
 // nameFetcher is used to download images via discovery
 type nameFetcher struct {
 	InsecureFlags      *rktflag.SecFlags
-	S                  *store.Store
+	S                  *imagestore.Store
 	Ks                 *keystore.Keystore
 	Debug              bool
 	Headers            map[string]config.Headerer
@@ -108,7 +108,7 @@ func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL st
 	}
 	defer aciFile.Close()
 
-	key, err := f.S.WriteACI(aciFile, store.ACIFetchInfo{
+	key, err := f.S.WriteACI(aciFile, imagestore.ACIFetchInfo{
 		Latest:          latest,
 		InsecureOptions: int64(f.InsecureFlags.Value()),
 	})
@@ -116,7 +116,7 @@ func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL st
 		return "", err
 	}
 
-	rem := store.NewRemote(aciURL, a.Location)
+	rem := imagestore.NewRemote(aciURL, a.Location)
 	rem.BlobKey = key
 	rem.DownloadTime = time.Now()
 	rem.ETag = cd.ETag
diff --git a/rkt/image_cat_manifest.go b/rkt/image_cat_manifest.go
index 2fb5c666eb..352e370f40 100644
--- a/rkt/image_cat_manifest.go
+++ b/rkt/image_cat_manifest.go
@@ -17,7 +17,7 @@ package main
 import (
 	"encoding/json"
 
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 
 	"github.com/spf13/cobra"
 )
@@ -43,7 +43,7 @@ func runImageCatManifest(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/image_cmd_common.go b/rkt/image_cmd_common.go
index 8a749709c6..88f7fcda8d 100644
--- a/rkt/image_cmd_common.go
+++ b/rkt/image_cmd_common.go
@@ -18,14 +18,14 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 
 	"github.com/appc/spec/discovery"
 	"github.com/appc/spec/schema/types"
 )
 
-func getStoreKeyFromApp(s *store.Store, img string) (string, error) {
+func getStoreKeyFromApp(s *imagestore.Store, img string) (string, error) {
 	app, err := discovery.NewAppFromString(img)
 	if err != nil {
 		return "", errwrap.Wrap(fmt.Errorf("cannot parse the image name %q", img), err)
@@ -37,7 +37,7 @@ func getStoreKeyFromApp(s *store.Store, img string) (string, error) {
 	key, err := s.GetACI(app.Name, labels)
 	if err != nil {
 		switch err.(type) {
-		case store.ACINotFoundError:
+		case imagestore.ACINotFoundError:
 			return "", err
 		default:
 			return "", errwrap.Wrap(fmt.Errorf("cannot find image %q", img), err)
@@ -46,7 +46,7 @@ func getStoreKeyFromApp(s *store.Store, img string) (string, error) {
 	return key, nil
 }
 
-func getStoreKeyFromAppOrHash(s *store.Store, input string) (string, error) {
+func getStoreKeyFromAppOrHash(s *imagestore.Store, input string) (string, error) {
 	var key string
 	if _, err := types.NewHash(input); err == nil {
 		key, err = s.ResolveKey(input)
diff --git a/rkt/image_export.go b/rkt/image_export.go
index 2c4a741194..84dd682003 100644
--- a/rkt/image_export.go
+++ b/rkt/image_export.go
@@ -19,7 +19,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 
 	"github.com/spf13/cobra"
 )
@@ -48,7 +48,7 @@ func runImageExport(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/image_extract.go b/rkt/image_extract.go
index 26b72a1833..a4bf651d57 100644
--- a/rkt/image_extract.go
+++ b/rkt/image_extract.go
@@ -23,7 +23,7 @@ import (
 	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/pkg/tar"
 	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 
 	"github.com/spf13/cobra"
 )
@@ -55,7 +55,7 @@ func runImageExtract(cmd *cobra.Command, args []string) (exit int) {
 	}
 	outputDir := args[1]
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/image_gc.go b/rkt/image_gc.go
index 028535bb0b..8c3216c311 100644
--- a/rkt/image_gc.go
+++ b/rkt/image_gc.go
@@ -21,7 +21,8 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/lock"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
 	"github.com/spf13/cobra"
 )
@@ -49,13 +50,19 @@ func init() {
 }
 
 func runGCImage(cmd *cobra.Command, args []string) (exit int) {
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
 	}
 
-	if err := gcTreeStore(s); err != nil {
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open store", err)
+		return
+	}
+
+	if err := gcTreeStore(ts); err != nil {
 		stderr.PrintE("failed to remove unreferenced treestores", err)
 		return 1
 	}
@@ -70,7 +77,7 @@ func runGCImage(cmd *cobra.Command, args []string) (exit int) {
 
 // gcTreeStore removes all treeStoreIDs not referenced by any non garbage
 // collected pod from the store.
-func gcTreeStore(s *store.Store) error {
+func gcTreeStore(ts *treestore.Store) error {
 	// Take an exclusive lock to block other pods being created.
 	// This is needed to avoid races between the below steps (getting the
 	// list of referenced treeStoreIDs, getting the list of treeStoreIDs
@@ -85,13 +92,13 @@ func gcTreeStore(s *store.Store) error {
 	if err != nil {
 		return errwrap.Wrap(errors.New("cannot get referenced treestoreIDs"), err)
 	}
-	treeStoreIDs, err := s.GetTreeStoreIDs()
+	treeStoreIDs, err := ts.GetIDs()
 	if err != nil {
 		return errwrap.Wrap(errors.New("cannot get treestoreIDs from the store"), err)
 	}
 	for _, treeStoreID := range treeStoreIDs {
 		if _, ok := referencedTreeStoreIDs[treeStoreID]; !ok {
-			if err := s.RemoveTreeStore(treeStoreID); err != nil {
+			if err := ts.Remove(treeStoreID); err != nil {
 				stderr.PrintE(fmt.Sprintf("error removing treestore %q", treeStoreID), err)
 			} else {
 				stderr.Printf("removed treestore %q", treeStoreID)
@@ -126,7 +133,7 @@ func getReferencedTreeStoreIDs() (map[string]struct{}, error) {
 	return treeStoreIDs, nil
 }
 
-func gcStore(s *store.Store, gracePeriod time.Duration) error {
+func gcStore(s *imagestore.Store, gracePeriod time.Duration) error {
 	var imagesToRemove []string
 	aciinfos, err := s.GetAllACIInfos([]string{"lastused"}, true)
 	if err != nil {
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 1cef3fa1eb..6d2d79ac9b 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	rktflag "github.com/coreos/rkt/rkt/flag"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/dustin/go-humanize"
 
 	"github.com/appc/spec/schema"
@@ -164,7 +164,7 @@ func runImages(cmd *cobra.Command, args []string) int {
 		fmt.Fprintf(tabOut, "%s\n", strings.Join(headerFields, "\t"))
 	}
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
@@ -176,7 +176,7 @@ func runImages(cmd *cobra.Command, args []string) int {
 		return 1
 	}
 
-	remoteMap := make(map[string]*store.Remote)
+	remoteMap := make(map[string]*imagestore.Remote)
 	for _, r := range remotes {
 		remoteMap[r.BlobKey] = r
 	}
diff --git a/rkt/image_render.go b/rkt/image_render.go
index d1a0caca9a..e4999d0362 100644
--- a/rkt/image_render.go
+++ b/rkt/image_render.go
@@ -22,7 +22,8 @@ import (
 
 	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 
 	"github.com/spf13/cobra"
 )
@@ -57,27 +58,33 @@ func runImageRender(cmd *cobra.Command, args []string) (exit int) {
 	}
 	outputDir := args[1]
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
 	}
 
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open store", err)
+		return
+	}
+
 	key, err := getStoreKeyFromAppOrHash(s, args[0])
 	if err != nil {
 		stderr.Error(err)
 		return 1
 	}
 
-	id, _, err := s.RenderTreeStore(key, false)
+	id, _, err := ts.Render(key, false)
 	if err != nil {
 		stderr.PrintE("error rendering ACI", err)
 		return 1
 	}
-	if _, err := s.CheckTreeStore(id); err != nil {
+	if _, err := ts.Check(id); err != nil {
 		stderr.Print("warning: tree cache is in a bad state. Rebuilding...")
 		var err error
-		if id, _, err = s.RenderTreeStore(key, true); err != nil {
+		if id, _, err = ts.Render(key, true); err != nil {
 			stderr.PrintE("error rendering ACI", err)
 			return 1
 		}
@@ -126,7 +133,7 @@ func runImageRender(cmd *cobra.Command, args []string) (exit int) {
 		}
 	}
 
-	cachedTreePath := s.GetTreeStoreRootFS(id)
+	cachedTreePath := ts.GetRootFS(id)
 	if err := fileutil.CopyTree(cachedTreePath, rootfsOutDir, user.NewBlankUidRange()); err != nil {
 		stderr.PrintE("error copying ACI rootfs", err)
 		return 1
diff --git a/rkt/image_rm.go b/rkt/image_rm.go
index 5b65746826..2482625a52 100644
--- a/rkt/image_rm.go
+++ b/rkt/image_rm.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/spf13/cobra"
 )
 
@@ -35,7 +35,7 @@ func init() {
 	cmdImage.AddCommand(cmdImageRm)
 }
 
-func rmImages(s *store.Store, images []string) error {
+func rmImages(s *imagestore.Store, images []string) error {
 	done := 0
 	errors := 0
 	staleErrors := 0
@@ -94,7 +94,7 @@ func rmImages(s *store.Store, images []string) error {
 
 	for key, name := range imageMap {
 		if err := s.RemoveACI(key); err != nil {
-			if serr, ok := err.(*store.StoreRemovalError); ok {
+			if serr, ok := err.(*imagestore.StoreRemovalError); ok {
 				staleErrors++
 				stderr.PrintE(fmt.Sprintf("some files cannot be removed for image %q (%q)", key, name), serr)
 			} else {
@@ -131,7 +131,7 @@ func runRmImage(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 05dd2bc1a2..4b6d351395 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -25,7 +25,8 @@ import (
 	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/rkt/image"
 	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
@@ -121,19 +122,25 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
 	}
 
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open treestore", err)
+		return 1
+	}
+
 	config, err := getConfig()
 	if err != nil {
 		stderr.PrintE("cannot get configuration", err)
 		return 1
 	}
 
-	s1img, err := getStage1Hash(s, config)
+	s1img, err := getStage1Hash(s, ts, config)
 	if err != nil {
 		stderr.Error(err)
 		return 1
@@ -141,6 +148,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 
 	fn := &image.Finder{
 		S:                  s,
+		Ts:                 ts,
 		Ks:                 getKeystore(),
 		Headers:            config.AuthPerHost,
 		DockerAuth:         config.DockerCredentialsPerRegistry,
@@ -165,6 +173,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 
 	cfg := stage0.CommonConfig{
 		Store:       s,
+		TreeStore:   ts,
 		Stage1Image: *s1img,
 		UUID:        p.uuid,
 		Debug:       globalFlags.Debug,
diff --git a/rkt/rkt.go b/rkt/rkt.go
index 2d90909764..168edf7c7b 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -297,6 +297,11 @@ func storeDir() string {
 	return filepath.Join(getDataDir(), "cas")
 }
 
+// TODO(sgotti) backward compatibility with the current tree store paths. Needs a migration path to better paths.
+func treeStoreDir() string {
+	return filepath.Join(getDataDir(), "cas")
+}
+
 func getKeystore() *keystore.Keystore {
 	if globalFlags.InsecureFlags.SkipImageCheck() {
 		return nil
diff --git a/rkt/run.go b/rkt/run.go
index f48369b0ef..04497c5219 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -30,7 +30,8 @@ import (
 	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/rkt/image"
 	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
 	"github.com/spf13/cobra"
 )
@@ -173,19 +174,25 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
 	}
 
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open treestore", err)
+		return 1
+	}
+
 	config, err := getConfig()
 	if err != nil {
 		stderr.PrintE("cannot get configuration", err)
 		return 1
 	}
 
-	s1img, err := getStage1Hash(s, config)
+	s1img, err := getStage1Hash(s, ts, config)
 	if err != nil {
 		stderr.Error(err)
 		return 1
@@ -193,6 +200,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 
 	fn := &image.Finder{
 		S:                  s,
+		Ts:                 ts,
 		Ks:                 getKeystore(),
 		Headers:            config.AuthPerHost,
 		DockerAuth:         config.DockerCredentialsPerRegistry,
@@ -236,6 +244,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		MountLabel:   mountLabel,
 		ProcessLabel: processLabel,
 		Store:        s,
+		TreeStore:    ts,
 		Stage1Image:  *s1img,
 		UUID:         p.uuid,
 		Debug:        globalFlags.Debug,
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index 832083c201..3b62f77b23 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -19,7 +19,8 @@ package main
 import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
@@ -62,12 +63,18 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 	}
 	defer p.Close()
 
-	s, err := store.NewStore(storeDir())
+	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
 		return 1
 	}
 
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open treestore", err)
+		return 1
+	}
+
 	if !p.isPrepared {
 		stderr.Printf("pod %q is not prepared", p.uuid)
 		return 1
@@ -120,9 +127,10 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 
 	rcfg := stage0.RunConfig{
 		CommonConfig: &stage0.CommonConfig{
-			Store: s,
-			UUID:  p.uuid,
-			Debug: globalFlags.Debug,
+			Store:     s,
+			TreeStore: ts,
+			UUID:      p.uuid,
+			Debug:     globalFlags.Debug,
 		},
 		Net:         flagNet,
 		LockFd:      lfd,
diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index 2e035a025f..3462aef025 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -25,7 +25,8 @@ import (
 	"github.com/coreos/rkt/common/apps"
 	"github.com/coreos/rkt/rkt/config"
 	"github.com/coreos/rkt/rkt/image"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
 	"github.com/spf13/pflag"
 )
@@ -214,15 +215,15 @@ func addStage1ImageFlags(flags *pflag.FlagSet) {
 //
 // If location is an image hash then we make sure that it exists in
 // the store.
-func getStage1Hash(s *store.Store, c *config.Config) (*types.Hash, error) {
+func getStage1Hash(s *imagestore.Store, ts *treestore.Store, c *config.Config) (*types.Hash, error) {
 	imgDir := getStage1ImagesDirectory(c)
 	if overriddenStage1Location.kind != stage1ImageLocationUnset {
 		// we passed a --stage-{url,path,name,hash,from-dir} flag
-		return getStage1HashFromFlag(s, overriddenStage1Location, imgDir)
+		return getStage1HashFromFlag(s, ts, overriddenStage1Location, imgDir)
 	}
 
 	imgRef, imgLoc, imgFileName := getStage1DataFromConfig(c)
-	return getConfiguredStage1Hash(s, imgRef, imgLoc, imgFileName)
+	return getConfiguredStage1Hash(s, ts, imgRef, imgLoc, imgFileName)
 }
 
 func getStage1ImagesDirectory(c *config.Config) string {
@@ -232,7 +233,7 @@ func getStage1ImagesDirectory(c *config.Config) string {
 	return buildDefaultStage1ImagesDir
 }
 
-func getStage1HashFromFlag(s *store.Store, loc stage1ImageLocation, dir string) (*types.Hash, error) {
+func getStage1HashFromFlag(s *imagestore.Store, ts *treestore.Store, loc stage1ImageLocation, dir string) (*types.Hash, error) {
 	withKeystore := true
 	location := loc.location
 	if loc.kind == stage1ImageLocationFromDir {
@@ -266,7 +267,7 @@ func getStage1HashFromFlag(s *store.Store, loc stage1ImageLocation, dir string)
 		imgType = apps.AppImagePath
 	}
 
-	fn := getStage1Finder(s, withKeystore)
+	fn := getStage1Finder(s, ts, withKeystore)
 	return fn.FindImage(location, "", imgType)
 }
 
@@ -311,12 +312,12 @@ func isTrustedLocation(location string) (bool, error) {
 	return false, nil
 }
 
-func getConfiguredStage1Hash(s *store.Store, imgRef, imgLoc, imgFileName string) (*types.Hash, error) {
+func getConfiguredStage1Hash(s *imagestore.Store, ts *treestore.Store, imgRef, imgLoc, imgFileName string) (*types.Hash, error) {
 	trusted, err := isTrustedLocation(imgLoc)
 	if err != nil {
 		return nil, err
 	}
-	fn := getStage1Finder(s, !trusted)
+	fn := getStage1Finder(s, ts, !trusted)
 	if !strings.HasSuffix(imgRef, "-dirty") {
 		fn.StoreOnly = true
 		if hash, err := fn.FindImage(imgRef, "", apps.AppImageName); err == nil {
@@ -335,9 +336,10 @@ func getConfiguredStage1Hash(s *store.Store, imgRef, imgLoc, imgFileName string)
 	return getStage1HashFromPath(fn, imgLoc, imgFileName)
 }
 
-func getStage1Finder(s *store.Store, withKeystore bool) *image.Finder {
+func getStage1Finder(s *imagestore.Store, ts *treestore.Store, withKeystore bool) *image.Finder {
 	fn := &image.Finder{
 		S:                  s,
+		Ts:                 ts,
 		InsecureFlags:      globalFlags.InsecureFlags,
 		TrustKeysFromHTTPS: globalFlags.TrustKeysFromHTTPS,
 
diff --git a/stage0/run.go b/stage0/run.go
index ba9a27ef60..473d229f01 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -49,7 +49,8 @@ import (
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/pkg/tpm"
 	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/store"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
 	"github.com/coreos/rkt/version"
 	"github.com/hashicorp/errwrap"
 )
@@ -88,11 +89,12 @@ type RunConfig struct {
 
 // configuration shared by both Run and Prepare
 type CommonConfig struct {
-	Store        *store.Store // store containing all of the configured application images
-	Stage1Image  types.Hash   // stage1 image containing usable /init and /enter entrypoints
-	UUID         *types.UUID  // UUID of the pod
-	RootHash     string       // Hash of the root filesystem
-	ManifestData string       // The pod manifest data
+	Store        *imagestore.Store // store containing all of the configured application images
+	TreeStore    *treestore.Store  // store containing all of the configured application images
+	Stage1Image  types.Hash        // stage1 image containing usable /init and /enter entrypoints
+	UUID         *types.UUID       // UUID of the pod
+	RootHash     string            // Hash of the root filesystem
+	ManifestData string            // The pod manifest data
 	Debug        bool
 	MountLabel   string // selinux label to use for fs
 	ProcessLabel string // selinux label to use for process
@@ -589,17 +591,17 @@ func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cd
 		if cfg.PrivateUsers.Shift > 0 {
 			return fmt.Errorf("cannot use both overlay and user namespace: not implemented yet. (Try --no-overlay)")
 		}
-		treeStoreID, _, err := cfg.Store.RenderTreeStore(img.String(), false)
+		treeStoreID, _, err := cfg.TreeStore.Render(img.String(), false)
 		if err != nil {
 			return errwrap.Wrap(errors.New("error rendering tree image"), err)
 		}
 
 		if !cfg.SkipTreeStoreCheck {
-			hash, err := cfg.Store.CheckTreeStore(treeStoreID)
+			hash, err := cfg.TreeStore.Check(treeStoreID)
 			if err != nil {
 				log.PrintE("warning: tree cache is in a bad state.  Rebuilding...", err)
 				var err error
-				treeStoreID, hash, err = cfg.Store.RenderTreeStore(img.String(), true)
+				treeStoreID, hash, err = cfg.TreeStore.Render(img.String(), true)
 				if err != nil {
 					return errwrap.Wrap(errors.New("error rendering tree image"), err)
 				}
@@ -670,17 +672,17 @@ func prepareStage1Image(cfg PrepareConfig, img types.Hash, cdir string, useOverl
 		return errwrap.Wrap(errors.New("error creating stage1 directory"), err)
 	}
 
-	treeStoreID, _, err := cfg.Store.RenderTreeStore(img.String(), false)
+	treeStoreID, _, err := cfg.TreeStore.Render(img.String(), false)
 	if err != nil {
 		return errwrap.Wrap(errors.New("error rendering tree image"), err)
 	}
 
 	if !cfg.SkipTreeStoreCheck {
-		hash, err := cfg.Store.CheckTreeStore(treeStoreID)
+		hash, err := cfg.TreeStore.Check(treeStoreID)
 		if err != nil {
 			log.Printf("warning: tree cache is in a bad state: %v. Rebuilding...", err)
 			var err error
-			treeStoreID, hash, err = cfg.Store.RenderTreeStore(img.String(), true)
+			treeStoreID, hash, err = cfg.TreeStore.Render(img.String(), true)
 			if err != nil {
 				return errwrap.Wrap(errors.New("error rendering tree image"), err)
 			}
@@ -694,7 +696,7 @@ func prepareStage1Image(cfg PrepareConfig, img types.Hash, cdir string, useOverl
 
 	if !useOverlay {
 		destRootfs := filepath.Join(s1, "rootfs")
-		cachedTreePath := cfg.Store.GetTreeStoreRootFS(treeStoreID)
+		cachedTreePath := cfg.TreeStore.GetRootFS(treeStoreID)
 		if err := fileutil.CopyTree(cachedTreePath, destRootfs, cfg.PrivateUsers); err != nil {
 			return errwrap.Wrap(errors.New("error rendering ACI"), err)
 		}
@@ -765,7 +767,7 @@ func copyAppManifest(cdir string, appName types.ACName, dest string) error {
 // overlay filesystem. It mounts an overlay filesystem from the cached tree of
 // the image as rootfs.
 func overlayRender(cfg RunConfig, treeStoreID string, cdir string, dest string, appName string) error {
-	cachedTreePath := cfg.Store.GetTreeStoreRootFS(treeStoreID)
+	cachedTreePath := cfg.TreeStore.GetRootFS(treeStoreID)
 	mc, err := prepareOverlay(cachedTreePath, treeStoreID, cdir, dest, appName, cfg.MountLabel,
 		cfg.RktGid, common.DefaultRegularDirPerm)
 	if err != nil {
diff --git a/store/db/db.go b/store/db/db.go
index 380edfbf14..502eb7b769 100644
--- a/store/db/db.go
+++ b/store/db/db.go
@@ -41,10 +41,6 @@ func NewDB(dbdir string) (*DB, error) {
 	return &DB{dbdir: dbdir}, nil
 }
 
-func (db *DB) Path() string {
-	return db.dbdir
-}
-
 type txfunc func(*sql.Tx) error
 
 // Do Opens the db, executes DoTx and then Closes the DB
diff --git a/store/LICENSE.BSD b/store/imagestore/LICENSE.BSD
similarity index 100%
rename from store/LICENSE.BSD
rename to store/imagestore/LICENSE.BSD
diff --git a/store/aciinfo.go b/store/imagestore/aciinfo.go
similarity index 99%
rename from store/aciinfo.go
rename to store/imagestore/aciinfo.go
index dfd625b9d6..bf5955c46a 100644
--- a/store/aciinfo.go
+++ b/store/imagestore/aciinfo.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
 	"database/sql"
diff --git a/store/aciinfo_test.go b/store/imagestore/aciinfo_test.go
similarity index 99%
rename from store/aciinfo_test.go
rename to store/imagestore/aciinfo_test.go
index 9c6833b5fa..d33048024c 100644
--- a/store/aciinfo_test.go
+++ b/store/imagestore/aciinfo_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
 	"database/sql"
diff --git a/store/main_test.go b/store/imagestore/main_test.go
similarity index 93%
rename from store/main_test.go
rename to store/imagestore/main_test.go
index abb54300ba..c21d99062f 100644
--- a/store/main_test.go
+++ b/store/imagestore/main_test.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE.BSD file,
 // or at https://opensource.org/licenses/BSD-3-Clause
 
-package store
+package imagestore
 
 import (
 	"fmt"
@@ -28,7 +28,7 @@ func interestingGoroutines() (gs []string) {
 			strings.Contains(stack, "created by testing.RunTests") ||
 			strings.Contains(stack, "testing.Main(") ||
 			strings.Contains(stack, "runtime.goexit") ||
-			strings.Contains(stack, "github.com/coreos/rkt/store.interestingGoroutines") ||
+			strings.Contains(stack, "github.com/coreos/rkt/store/imagestore.interestingGoroutines") ||
 			strings.Contains(stack, "created by runtime.gc") ||
 			strings.Contains(stack, "runtime.MHeap_Scavenger") {
 			continue
diff --git a/store/migrate.go b/store/imagestore/migrate.go
similarity index 99%
rename from store/migrate.go
rename to store/imagestore/migrate.go
index 167bf17b1f..e56f318171 100644
--- a/store/migrate.go
+++ b/store/imagestore/migrate.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
 	"database/sql"
diff --git a/store/migrate_test.go b/store/imagestore/migrate_test.go
similarity index 99%
rename from store/migrate_test.go
rename to store/imagestore/migrate_test.go
index 6f40e7e964..3970157795 100644
--- a/store/migrate_test.go
+++ b/store/imagestore/migrate_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
 	"database/sql"
@@ -912,8 +912,8 @@ func testMigrate(tt migrateTest) error {
 	}
 	defer os.RemoveAll(dir)
 
-	casDir := filepath.Join(dir, "cas")
-	db, err := db.NewDB(filepath.Join(casDir, "db"))
+	storeDir := filepath.Join(dir, "store")
+	db, err := db.NewDB(filepath.Join(storeDir, "db"))
 	if err != nil {
 		return err
 	}
diff --git a/store/remote.go b/store/imagestore/remote.go
similarity index 99%
rename from store/remote.go
rename to store/imagestore/remote.go
index 7aa91ce09d..382bc5c98f 100644
--- a/store/remote.go
+++ b/store/imagestore/remote.go
@@ -15,7 +15,7 @@
 // Package store implements a content-addressable-store on disk.
 // It leverages the `diskv` package to store items in a simple
 // key-value blob store: https://github.com/peterbourgon/diskv
-package store
+package imagestore
 
 import (
 	"database/sql"
diff --git a/store/remote_test.go b/store/imagestore/remote_test.go
similarity index 98%
rename from store/remote_test.go
rename to store/imagestore/remote_test.go
index c7921505cf..307fa47203 100644
--- a/store/remote_test.go
+++ b/store/imagestore/remote_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
 	"io/ioutil"
diff --git a/store/schema.go b/store/imagestore/schema.go
similarity index 99%
rename from store/schema.go
rename to store/imagestore/schema.go
index b85de7ce95..7a3e65e5c6 100644
--- a/store/schema.go
+++ b/store/imagestore/schema.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
 	"database/sql"
diff --git a/store/store.go b/store/imagestore/store.go
similarity index 78%
rename from store/store.go
rename to store/imagestore/store.go
index 5166c98d00..bc753d320d 100644
--- a/store/store.go
+++ b/store/imagestore/store.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
 	"crypto/sha512"
@@ -34,7 +34,6 @@ import (
 	"github.com/coreos/rkt/store/db"
 
 	"github.com/appc/spec/aci"
-	"github.com/appc/spec/pkg/acirenderer"
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 
@@ -82,7 +81,7 @@ func (e ACINotFoundError) Error() string {
 }
 
 // StoreRemovalError defines an error removing a non transactional store (like
-// a diskv store or the tree store).
+// a diskv store).
 // When this happen there's the possibility that the store is left in an
 // unclean state (for example with some stale files).
 type StoreRemovalError struct {
@@ -99,10 +98,9 @@ func (e *StoreRemovalError) Error() string {
 
 // Store encapsulates a content-addressable-storage for storing ACIs on disk.
 type Store struct {
-	dir       string
-	stores    []*diskv.Diskv
-	db        *db.DB
-	treestore *TreeStore
+	dir    string
+	stores []*diskv.Diskv
+	db     *db.DB
 	// storeLock is a lock on the whole store. It's used for store migration. If
 	// a previous version of rkt is using the store and in the meantime a
 	// new version is installed and executed it will try migrate the store
@@ -110,18 +108,18 @@ type Store struct {
 	// or behave badly after the migration as it's expecting another db format.
 	// For this reason, before executing migration, an exclusive lock must
 	// be taken on the whole store.
-	storeLock        *lock.FileLock
-	imageLockDir     string
-	treeStoreLockDir string
+	storeLock    *lock.FileLock
+	imageLockDir string
 }
 
-func (s *Store) UpdateSize(key string, newSize int64) error {
+func (s *Store) updateSize(key string, newSize int64) error {
 	return s.db.Do(func(tx *sql.Tx) error {
 		_, err := tx.Exec("UPDATE aciinfo SET size = $1 WHERE blobkey == $2", newSize, key)
 		return err
 	})
 }
 
+// TODO(sgotti) remove this when the treestore will save its images' sizes by itself
 func (s *Store) UpdateTreeStoreSize(key string, newSize int64) error {
 	return s.db.Do(func(tx *sql.Tx) error {
 		_, err := tx.Exec("UPDATE aciinfo SET treestoresize = $1 WHERE blobkey == $2", newSize, key)
@@ -141,7 +139,6 @@ func (s *Store) populateSize() error {
 	}
 
 	aciSizes := make(map[string]int64)
-	tsSizes := make(map[string]int64)
 	for _, ai := range ais {
 		key := ai.BlobKey
 
@@ -156,36 +153,10 @@ func (s *Store) populateSize() error {
 		}
 		aciSizes[key] = rd
 
-		id, err := s.GetTreeStoreID(key)
-		if err != nil {
-			return err
-		}
-
-		tsR, err := s.treestore.IsRendered(id)
-		if err != nil {
-			return errwrap.Wrap(errors.New("error determining whether the tree store is rendered"), err)
-		}
-		if tsR {
-			// We associate a tree store with an image by writing the image
-			// hash to a file. We need this so we can update the image size
-			// when we remove the rendered tree store.
-			treepath := s.treestore.GetPath(id)
-			if err := ioutil.WriteFile(filepath.Join(treepath, imagefilename), []byte(key), 0644); err != nil {
-				return errwrap.Wrap(errors.New("error writing app treeStoreID"), err)
-			}
-
-			tsSize, err := s.treestore.Size(id)
-			if err != nil {
-				return err
-			}
-
-			tsSizes[key] = tsSize
-		}
 	}
 
 	for k := range aciSizes {
-		s.UpdateSize(k, aciSizes[k])
-		s.UpdateTreeStoreSize(k, tsSizes[k])
+		s.updateSize(k, aciSizes[k])
 	}
 
 	return nil
@@ -208,12 +179,6 @@ func NewStore(dir string) (*Store, error) {
 		return nil, err
 	}
 
-	s.treeStoreLockDir = filepath.Join(dir, "treestorelocks")
-	err = os.MkdirAll(s.treeStoreLockDir, defaultPathPerm)
-	if err != nil {
-		return nil, err
-	}
-
 	// Take a shared cas lock
 	s.storeLock, err = lock.NewLock(dir, lock.Dir)
 	if err != nil {
@@ -231,14 +196,12 @@ func NewStore(dir string) (*Store, error) {
 			Transform: blockTransform,
 		})
 	}
-	db, err := db.NewDB(filepath.Join(dir, "db"))
+	db, err := db.NewDB(s.dbDir())
 	if err != nil {
 		return nil, err
 	}
 	s.db = db
 
-	s.treestore = &TreeStore{path: filepath.Join(dir, "tree")}
-
 	needsMigrate := false
 	needsSizePopulation := false
 	fn := func(tx *sql.Tx) error {
@@ -316,9 +279,14 @@ func (s *Store) Close() error {
 // backupDB backs up current database.
 func (s *Store) backupDB() error {
 	backupsDir := filepath.Join(s.dir, "db-backups")
-	return backup.CreateBackup(s.db.Path(), backupsDir, backupsNumber)
+	return backup.CreateBackup(s.dbDir(), backupsDir, backupsNumber)
 }
 
+func (s *Store) dbDir() string {
+	return filepath.Join(s.dir, "db")
+}
+
+// TODO(sgotti), unexport this and provide other functions for external users
 // TmpFile returns an *os.File local to the same filesystem as the Store, or
 // any error encountered
 func (s *Store) TmpFile() (*os.File, error) {
@@ -329,6 +297,7 @@ func (s *Store) TmpFile() (*os.File, error) {
 	return ioutil.TempFile(dir, "")
 }
 
+// TODO(sgotti), unexport this and provide other functions for external users
 // TmpNamedFile returns an *os.File with the specified name local to the same
 // filesystem as the Store, or any error encountered. If the file already
 // exists it will return the existing file in read/write mode with the cursor
@@ -349,6 +318,7 @@ func (s Store) TmpNamedFile(name string) (*os.File, error) {
 	return os.OpenFile(fname, os.O_RDWR|os.O_APPEND, 0644)
 }
 
+// TODO(sgotti), unexport this and provide other functions for external users
 // TmpDir creates and returns dir local to the same filesystem as the Store,
 // or any error encountered
 func (s *Store) TmpDir() (string, error) {
@@ -521,10 +491,6 @@ func (s *Store) WriteACI(r io.ReadSeeker, fetchInfo ACIFetchInfo) (string, error
 		return "", errwrap.Wrap(errors.New("error writing ACI Info"), err)
 	}
 
-	// The treestore for this ACI is not written here as ACIs downloaded as
-	// dependencies of another ACI will be exploded also if never directly used.
-	// Users of treestore should call s.RenderTreeStore before using it.
-
 	return key, nil
 }
 
@@ -596,132 +562,6 @@ func (s *Store) RemoveACI(key string) error {
 	return nil
 }
 
-// GetTreeStoreID calculates the treestore ID for the given image key.
-// The treeStoreID is computed as an hash of the flattened dependency tree
-// image keys. In this way the ID may change for the same key if the image's
-// dependencies change.
-func (s *Store) GetTreeStoreID(key string) (string, error) {
-	hash, err := types.NewHash(key)
-	if err != nil {
-		return "", err
-	}
-	images, err := acirenderer.CreateDepListFromImageID(*hash, s)
-	if err != nil {
-		return "", err
-	}
-
-	var keys []string
-	for _, image := range images {
-		keys = append(keys, image.Key)
-	}
-	imagesString := strings.Join(keys, ",")
-	h := sha512.New()
-	h.Write([]byte(imagesString))
-	return "deps-" + hashToKey(h), nil
-}
-
-// RenderTreeStore renders a treestore for the given image key if it's not
-// already fully rendered.
-// Users of treestore should call s.RenderTreeStore before using it to ensure
-// that the treestore is completely rendered.
-// Returns the id and hash of the rendered treestore if it is newly rendered,
-// and only the id if it is already rendered.
-func (s *Store) RenderTreeStore(key string, rebuild bool) (id string, hash string, err error) {
-	id, err = s.GetTreeStoreID(key)
-	if err != nil {
-		return "", "", errwrap.Wrap(errors.New("cannot calculate treestore id"), err)
-	}
-
-	// this lock references the treestore dir for the specified id.
-	treeStoreKeyLock, err := lock.ExclusiveKeyLock(s.treeStoreLockDir, id)
-	if err != nil {
-		return "", "", errwrap.Wrap(errors.New("error locking tree store"), err)
-	}
-	defer treeStoreKeyLock.Close()
-
-	if !rebuild {
-		rendered, err := s.treestore.IsRendered(id)
-		if err != nil {
-			return "", "", errwrap.Wrap(errors.New("cannot determine if tree is already rendered"), err)
-		}
-		if rendered {
-			return id, "", nil
-		}
-	}
-	// Firstly remove a possible partial treestore if existing.
-	// This is needed as a previous ACI removal operation could have failed
-	// cleaning the tree store leaving some stale files.
-	if err := s.treestore.Remove(id, s); err != nil {
-		return "", "", err
-	}
-	if hash, err = s.treestore.Write(id, key, s); err != nil {
-		return "", "", err
-	}
-
-	return id, hash, nil
-}
-
-// CheckTreeStore verifies the treestore consistency for the specified id.
-func (s *Store) CheckTreeStore(id string) (string, error) {
-	treeStoreKeyLock, err := lock.SharedKeyLock(s.treeStoreLockDir, id)
-	if err != nil {
-		return "", errwrap.Wrap(errors.New("error locking tree store"), err)
-	}
-	defer treeStoreKeyLock.Close()
-
-	return s.treestore.Check(id)
-}
-
-// GetTreeStorePath returns the absolute path of the treestore for the specified id.
-// It doesn't ensure that the path exists and is fully rendered. This should
-// be done calling IsRendered()
-func (s *Store) GetTreeStorePath(id string) string {
-	return s.treestore.GetPath(id)
-}
-
-// GetTreeStoreRootFS returns the absolute path of the rootfs in the treestore
-// for specified id.
-// It doesn't ensure that the rootfs exists and is fully rendered. This should
-// be done calling IsRendered()
-func (s *Store) GetTreeStoreRootFS(id string) string {
-	return s.treestore.GetRootFS(id)
-}
-
-// RemoveTreeStore removes the rendered image in tree store with the given id.
-func (s *Store) RemoveTreeStore(id string) error {
-	treeStoreKeyLock, err := lock.ExclusiveKeyLock(s.treeStoreLockDir, id)
-	if err != nil {
-		return errwrap.Wrap(errors.New("error locking tree store"), err)
-	}
-	defer treeStoreKeyLock.Close()
-
-	if err := s.treestore.Remove(id, s); err != nil {
-		return errwrap.Wrap(errors.New("error removing the tree store"), err)
-	}
-
-	return nil
-}
-
-// GetTreeStoreIDs returns a slice containing all the treeStore's IDs available
-// (both fully or partially rendered).
-func (s *Store) GetTreeStoreIDs() ([]string, error) {
-	var treeStoreIDs []string
-	ls, err := ioutil.ReadDir(s.treestore.path)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return nil, errwrap.Wrap(errors.New("cannot read treestore directory"), err)
-		}
-	}
-
-	for _, p := range ls {
-		if p.IsDir() {
-			id := filepath.Base(p.Name())
-			treeStoreIDs = append(treeStoreIDs, id)
-		}
-	}
-	return treeStoreIDs, nil
-}
-
 // GetRemote tries to retrieve a remote with the given ACIURL. found will be
 // false if remote doesn't exist.
 func (s *Store) GetRemote(aciURL string) (*Remote, bool, error) {
diff --git a/store/store_test.go b/store/imagestore/store_test.go
similarity index 80%
rename from store/store_test.go
rename to store/imagestore/store_test.go
index 276ad84ae7..6dd368d18e 100644
--- a/store/store_test.go
+++ b/store/imagestore/store_test.go
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
-	"archive/tar"
 	"bytes"
 	"database/sql"
 	"encoding/hex"
@@ -27,7 +26,6 @@ import (
 
 	"github.com/coreos/rkt/pkg/aci"
 	"github.com/coreos/rkt/pkg/multicall"
-	"github.com/coreos/rkt/pkg/sys"
 
 	"github.com/appc/spec/schema/types"
 )
@@ -346,134 +344,6 @@ func TestGetAci(t *testing.T) {
 	}
 }
 
-func TestTreeStore(t *testing.T) {
-	if !sys.HasChrootCapability() {
-		t.Skipf("chroot capability not available. Disabling test.")
-	}
-
-	dir, err := ioutil.TempDir("", tstprefix)
-	if err != nil {
-		t.Fatalf("error creating tempdir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-	s, err := NewStore(dir)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	defer s.Close()
-
-	imj := `
-		{
-		    "acKind": "ImageManifest",
-		    "acVersion": "0.7.4",
-		    "name": "example.com/test01"
-		}
-	`
-
-	entries := []*aci.ACIEntry{
-		// An empty dir
-		{
-			Header: &tar.Header{
-				Name:     "rootfs/a",
-				Typeflag: tar.TypeDir,
-			},
-		},
-		{
-			Contents: "hello",
-			Header: &tar.Header{
-				Name: "hello.txt",
-				Size: 5,
-			},
-		},
-		{
-			Header: &tar.Header{
-				Name:     "rootfs/link.txt",
-				Linkname: "rootfs/hello.txt",
-				Typeflag: tar.TypeSymlink,
-			},
-		},
-		// dangling symlink
-		{
-			Header: &tar.Header{
-				Name:     "rootfs/link2.txt",
-				Linkname: "rootfs/missingfile.txt",
-				Typeflag: tar.TypeSymlink,
-			},
-		},
-		{
-			Header: &tar.Header{
-				Name:     "rootfs/fifo",
-				Typeflag: tar.TypeFifo,
-			},
-		},
-	}
-	aci, err := aci.NewACI(dir, imj, entries)
-	if err != nil {
-		t.Fatalf("error creating test tar: %v", err)
-	}
-	defer aci.Close()
-
-	// Rewind the ACI
-	if _, err := aci.Seek(0, 0); err != nil {
-		t.Fatalf("unexpected error %v", err)
-	}
-
-	// Import the new ACI
-	key, err := s.WriteACI(aci, ACIFetchInfo{Latest: false})
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Ask the store to render the treestore
-	id, _, err := s.RenderTreeStore(key, false)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Verify image Hash. Should be the same.
-	_, err = s.CheckTreeStore(id)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Change a file permission
-	rootfs := s.GetTreeStoreRootFS(id)
-	err = os.Chmod(filepath.Join(rootfs, "a"), 0600)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Verify image Hash. Should be different
-	_, err = s.CheckTreeStore(id)
-	if err == nil {
-		t.Errorf("expected non-nil error!")
-	}
-
-	// rebuild the tree
-	prevID := id
-	id, _, err = s.RenderTreeStore(key, true)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if id != prevID {
-		t.Fatalf("unexpected different IDs. prevID: %s, id: %s", prevID, id)
-	}
-
-	// Add a file
-	rootfs = s.GetTreeStoreRootFS(id)
-	err = ioutil.WriteFile(filepath.Join(rootfs, "newfile"), []byte("newfile"), 0644)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Verify image Hash. Should be different
-	_, err = s.CheckTreeStore(id)
-	if err == nil {
-		t.Errorf("expected non-nil error!")
-	}
-}
-
 func TestRemoveACI(t *testing.T) {
 	dir, err := ioutil.TempDir("", tstprefix)
 	if err != nil {
diff --git a/store/utils.go b/store/imagestore/utils.go
similarity index 99%
rename from store/utils.go
rename to store/imagestore/utils.go
index 5a66549844..f98c2c6754 100644
--- a/store/utils.go
+++ b/store/imagestore/utils.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
 	"fmt"
diff --git a/store/utils_test.go b/store/imagestore/utils_test.go
similarity index 98%
rename from store/utils_test.go
rename to store/imagestore/utils_test.go
index 452a5df095..0ca7651547 100644
--- a/store/utils_test.go
+++ b/store/imagestore/utils_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package imagestore
 
 import (
 	"testing"
diff --git a/store/tree_test.go b/store/tree_test.go
deleted file mode 100644
index 9032f49b91..0000000000
--- a/store/tree_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2015 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package store
-
-import (
-	"archive/tar"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/coreos/rkt/pkg/aci"
-	"github.com/coreos/rkt/pkg/sys"
-)
-
-func treeStoreWriteACI(dir string, s *Store) (string, error) {
-	imj := `
-		{
-		    "acKind": "ImageManifest",
-		    "acVersion": "0.7.4",
-		    "name": "example.com/test01"
-		}
-	`
-
-	entries := []*aci.ACIEntry{
-		// An empty dir
-		{
-			Header: &tar.Header{
-				Name:     "rootfs/a",
-				Typeflag: tar.TypeDir,
-			},
-		},
-		{
-			Contents: "hello",
-			Header: &tar.Header{
-				Name: "hello.txt",
-				Size: 5,
-			},
-		},
-		{
-			Header: &tar.Header{
-				Name:     "rootfs/link.txt",
-				Linkname: "rootfs/hello.txt",
-				Typeflag: tar.TypeSymlink,
-			},
-		},
-		// dangling symlink
-		{
-			Header: &tar.Header{
-				Name:     "rootfs/link2.txt",
-				Linkname: "rootfs/missingfile.txt",
-				Typeflag: tar.TypeSymlink,
-			},
-		},
-		{
-			Header: &tar.Header{
-				Name:     "rootfs/fifo",
-				Typeflag: tar.TypeFifo,
-			},
-		},
-	}
-	aci, err := aci.NewACI(dir, imj, entries)
-	if err != nil {
-		return "", err
-	}
-	defer aci.Close()
-
-	// Rewind the ACI
-	if _, err := aci.Seek(0, 0); err != nil {
-		return "", err
-	}
-
-	// Import the new ACI
-	key, err := s.WriteACI(aci, ACIFetchInfo{Latest: false})
-	if err != nil {
-		return "", err
-	}
-	return key, nil
-}
-
-func TestTreeStoreWrite(t *testing.T) {
-	if !sys.HasChrootCapability() {
-		t.Skipf("chroot capability not available. Disabling test.")
-	}
-
-	dir, err := ioutil.TempDir("", tstprefix)
-	if err != nil {
-		t.Fatalf("error creating tempdir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-	s, err := NewStore(dir)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	key, err := treeStoreWriteACI(dir, s)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	id := "treestoreid01"
-
-	// Ask the store to render the treestore
-	_, err = s.treestore.Write(id, key, s)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Verify image Hash. Should be the same.
-	_, err = s.treestore.Check(id)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestTreeStoreRemove(t *testing.T) {
-	if !sys.HasChrootCapability() {
-		t.Skipf("chroot capability not available. Disabling test.")
-	}
-
-	dir, err := ioutil.TempDir("", tstprefix)
-	if err != nil {
-		t.Fatalf("error creating tempdir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-	s, err := NewStore(dir)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	key, err := treeStoreWriteACI(dir, s)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	id := "treestoreid01"
-
-	// Test non existent dir
-	err = s.treestore.Remove(id, s)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Test rendered tree
-	_, err = s.treestore.Write(id, key, s)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	err = s.treestore.Remove(id, s)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
diff --git a/store/tree.go b/store/treestore/tree.go
similarity index 63%
rename from store/tree.go
rename to store/treestore/tree.go
index 5eb8ebcd9a..7b6c75cfb1 100644
--- a/store/tree.go
+++ b/store/treestore/tree.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package store
+package treestore
 
 import (
 	"archive/tar"
@@ -20,20 +20,25 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"hash"
 	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
+	"strings"
 	"syscall"
 
 	specaci "github.com/appc/spec/aci"
+	"github.com/appc/spec/pkg/acirenderer"
 	"github.com/appc/spec/pkg/tarheader"
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/pkg/aci"
 	"github.com/coreos/rkt/pkg/fileutil"
+	"github.com/coreos/rkt/pkg/lock"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/pkg/user"
+	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 )
 
@@ -41,19 +46,152 @@ const (
 	hashfilename     = "hash"
 	renderedfilename = "rendered"
 	imagefilename    = "image"
+
+	// To ameliorate excessively long paths, keys for the (blob)store use
+	// only the first half of a sha512 rather than the entire sum
+	hashPrefix = "sha512-"
+	lenHash    = sha512.Size       // raw byte size
+	lenHashKey = (lenHash / 2) * 2 // half length, in hex characters
+	lenKey     = len(hashPrefix) + lenHashKey
+	minlenKey  = len(hashPrefix) + 2 // at least sha512-aa
 )
 
-// TreeStore represents a store of rendered ACIs
-type TreeStore struct {
-	path string
+// Store represents a store of rendered ACIs
+type Store struct {
+	dir string
+	// TODO(sgotti) make this an interface (acirenderer.ACIRegistry) when the ACIStore functions to update treestore size will be removed
+	store   *imagestore.Store
+	lockDir string
+}
+
+func NewStore(dir string, store *imagestore.Store) (*Store, error) {
+	// TODO(sgotti) backward compatibility with the current tree store paths. Needs a migration path to better paths.
+	ts := &Store{dir: filepath.Join(dir, "tree"), store: store}
+
+	ts.lockDir = filepath.Join(dir, "treestorelocks")
+	if err := os.MkdirAll(ts.lockDir, 0755); err != nil {
+		return nil, err
+	}
+	return ts, nil
+}
+
+// GetID calculates the treestore ID for the given image key.
+// The treeStoreID is computed as an hash of the flattened dependency tree
+// image keys. In this way the ID may change for the same key if the image's
+// dependencies change.
+func (ts *Store) GetID(key string) (string, error) {
+	hash, err := types.NewHash(key)
+	if err != nil {
+		return "", err
+	}
+	images, err := acirenderer.CreateDepListFromImageID(*hash, ts.store)
+	if err != nil {
+		return "", err
+	}
+
+	var keys []string
+	for _, image := range images {
+		keys = append(keys, image.Key)
+	}
+	imagesString := strings.Join(keys, ",")
+	h := sha512.New()
+	h.Write([]byte(imagesString))
+	return "deps-" + hashToKey(h), nil
 }
 
-// Write renders the ACI with the provided key in the treestore. id references
+// Render renders a treestore for the given image key if it's not
+// already fully rendered.
+// Users of treestore should call s.Render before using it to ensure
+// that the treestore is completely rendered.
+// Returns the id and hash of the rendered treestore if it is newly rendered,
+// and only the id if it is already rendered.
+func (ts *Store) Render(key string, rebuild bool) (id string, hash string, err error) {
+	id, err = ts.GetID(key)
+	if err != nil {
+		return "", "", errwrap.Wrap(errors.New("cannot calculate treestore id"), err)
+	}
+
+	// this lock references the treestore dir for the specified id.
+	treeStoreKeyLock, err := lock.ExclusiveKeyLock(ts.lockDir, id)
+	if err != nil {
+		return "", "", errwrap.Wrap(errors.New("error locking tree store"), err)
+	}
+	defer treeStoreKeyLock.Close()
+
+	if !rebuild {
+		rendered, err := ts.IsRendered(id)
+		if err != nil {
+			return "", "", errwrap.Wrap(errors.New("cannot determine if tree is already rendered"), err)
+		}
+		if rendered {
+			return id, "", nil
+		}
+	}
+	// Firstly remove a possible partial treestore if existing.
+	// This is needed as a previous ACI removal operation could have failed
+	// cleaning the tree store leaving some stale files.
+	if err := ts.remove(id); err != nil {
+		return "", "", err
+	}
+	if hash, err = ts.render(id, key); err != nil {
+		return "", "", err
+	}
+
+	return id, hash, nil
+}
+
+// Check verifies the treestore consistency for the specified id.
+func (ts *Store) Check(id string) (string, error) {
+	treeStoreKeyLock, err := lock.SharedKeyLock(ts.lockDir, id)
+	if err != nil {
+		return "", errwrap.Wrap(errors.New("error locking tree store"), err)
+	}
+	defer treeStoreKeyLock.Close()
+
+	return ts.check(id)
+}
+
+// Remove removes the rendered image in tree store with the given id.
+func (ts *Store) Remove(id string) error {
+	treeStoreKeyLock, err := lock.ExclusiveKeyLock(ts.lockDir, id)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error locking tree store"), err)
+	}
+	defer treeStoreKeyLock.Close()
+
+	if err := ts.remove(id); err != nil {
+		return errwrap.Wrap(errors.New("error removing the tree store"), err)
+	}
+
+	return nil
+}
+
+// GetIDs returns a slice containing all the treeStore's IDs available
+// (both fully or partially rendered).
+func (ts *Store) GetIDs() ([]string, error) {
+	var treeStoreIDs []string
+	ls, err := ioutil.ReadDir(ts.dir)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return nil, errwrap.Wrap(errors.New("cannot read treestore directory"), err)
+		}
+	}
+
+	for _, p := range ls {
+		if p.IsDir() {
+			id := filepath.Base(p.Name())
+			treeStoreIDs = append(treeStoreIDs, id)
+		}
+	}
+	return treeStoreIDs, nil
+}
+
+// render renders the ACI with the provided key in the treestore. id references
 // that specific tree store rendered image.
-// Write, to avoid having a rendered ACI with old stale files, requires that
-// the destination directory doesn't exist (usually Remove should be called
-// before Write)
-func (ts *TreeStore) Write(id string, key string, s *Store) (string, error) {
+// render, to avoid having a rendered ACI with old stale files, requires that
+// the destination directory doesn't exist (usually remove should be called
+// before render)
+func (ts *Store) render(id string, key string) (string, error) {
 	treepath := ts.GetPath(id)
 	fi, _ := os.Stat(treepath)
 	if fi != nil {
@@ -66,7 +204,7 @@ func (ts *TreeStore) Write(id string, key string, s *Store) (string, error) {
 	if err := os.MkdirAll(treepath, 0755); err != nil {
 		return "", errwrap.Wrap(fmt.Errorf("cannot create treestore directory %s", treepath), err)
 	}
-	err = aci.RenderACIWithImageID(*imageID, treepath, s, user.NewBlankUidRange())
+	err = aci.RenderACIWithImageID(*imageID, treepath, ts.store, user.NewBlankUidRange())
 	if err != nil {
 		return "", errwrap.Wrap(errors.New("cannot render aci"), err)
 	}
@@ -104,20 +242,26 @@ func (ts *TreeStore) Write(id string, key string, s *Store) (string, error) {
 		return "", errwrap.Wrap(errors.New("failed to sync tree store directory"), err)
 	}
 
+	// TODO(sgotti) this is wrong for various reasons:
+	// * Doesn't consider that can there can be multiple treestore per ACI
+	// (and fixing this adding/subtracting sizes is bad since cannot be
+	// atomic and could bring to duplicated/missing subtractions causing
+	// wrong sizes)
+	// * ImageStore and TreeStore are decoupled (TreeStore should just use acirenderer.ACIRegistry interface)
 	treeSize, err := ts.Size(id)
 	if err != nil {
 		return "", err
 	}
 
-	if err := s.UpdateTreeStoreSize(key, treeSize); err != nil {
+	if err := ts.store.UpdateTreeStoreSize(key, treeSize); err != nil {
 		return "", err
 	}
 
 	return string(hash), nil
 }
 
-// Remove cleans the directory for the provided id
-func (ts *TreeStore) Remove(id string, s *Store) error {
+// remove cleans the directory for the provided id
+func (ts *Store) remove(id string) error {
 	treepath := ts.GetPath(id)
 	// If tree path doesn't exist we're done
 	_, err := os.Stat(treepath)
@@ -151,24 +295,22 @@ func (ts *TreeStore) Remove(id string, s *Store) error {
 		}
 	}
 
-	key, err := ts.GetImageHash(id)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "store: warning: tree store in a bad state, forcing removal\n")
-	}
+	// Ignore error retrieving image hash
+	key, _ := ts.GetImageHash(id)
 
 	if err := os.RemoveAll(treepath); err != nil {
 		return err
 	}
 
 	if key != "" {
-		return s.UpdateTreeStoreSize(key, 0)
+		return ts.store.UpdateTreeStoreSize(key, 0)
 	}
 
 	return nil
 }
 
 // IsRendered checks if the tree store with the provided id is fully rendered
-func (ts *TreeStore) IsRendered(id string) (bool, error) {
+func (ts *Store) IsRendered(id string) (bool, error) {
 	// if the "rendered" flag file exists, assume that the store is already
 	// fully rendered.
 	treepath := ts.GetPath(id)
@@ -185,21 +327,21 @@ func (ts *TreeStore) IsRendered(id string) (bool, error) {
 // GetPath returns the absolute path of the treestore for the provided id.
 // It doesn't ensure that the path exists and is fully rendered. This should
 // be done calling IsRendered()
-func (ts *TreeStore) GetPath(id string) string {
-	return filepath.Join(ts.path, id)
+func (ts *Store) GetPath(id string) string {
+	return filepath.Join(ts.dir, id)
 }
 
 // GetRootFS returns the absolute path of the rootfs for the provided id.
 // It doesn't ensure that the rootfs exists and is fully rendered. This should
 // be done calling IsRendered()
-func (ts *TreeStore) GetRootFS(id string) string {
+func (ts *Store) GetRootFS(id string) string {
 	return filepath.Join(ts.GetPath(id), "rootfs")
 }
 
 // Hash calculates an hash of the rendered ACI. It uses the same functions
 // used to create a tar but instead of writing the full archive is just
 // computes the sha512 sum of the file infos and contents.
-func (ts *TreeStore) Hash(id string) (string, error) {
+func (ts *Store) Hash(id string) (string, error) {
 	treepath := ts.GetPath(id)
 
 	hash := sha512.New()
@@ -214,9 +356,9 @@ func (ts *TreeStore) Hash(id string) (string, error) {
 	return hashstring, nil
 }
 
-// Check calculates the actual rendered ACI's hash and verifies that it matches
+// check calculates the actual rendered ACI's hash and verifies that it matches
 // the saved value. Returns the calculated hash.
-func (ts *TreeStore) Check(id string) (string, error) {
+func (ts *Store) check(id string) (string, error) {
 	treepath := ts.GetPath(id)
 	hash, err := ioutil.ReadFile(filepath.Join(treepath, hashfilename))
 	if err != nil {
@@ -234,7 +376,7 @@ func (ts *TreeStore) Check(id string) (string, error) {
 
 // Size returns the size of the rootfs for the provided id. It is a relatively
 // expensive operation, it goes through all the files and adds up their size.
-func (ts *TreeStore) Size(id string) (int64, error) {
+func (ts *Store) Size(id string) (int64, error) {
 	sz, err := fileutil.DirSize(ts.GetPath(id))
 	if err != nil {
 		return -1, errwrap.Wrap(errors.New("error calculating size"), err)
@@ -244,7 +386,7 @@ func (ts *TreeStore) Size(id string) (int64, error) {
 
 // GetImageHash returns the hash of the image that uses the tree store
 // identified by id.
-func (ts *TreeStore) GetImageHash(id string) (string, error) {
+func (ts *Store) GetImageHash(id string) (string, error) {
 	treepath := ts.GetPath(id)
 
 	imgHash, err := ioutil.ReadFile(filepath.Join(treepath, imagefilename))
@@ -410,3 +552,8 @@ func (aw *imageHashWriter) AddFile(hdr *tar.Header, r io.Reader) error {
 func (aw *imageHashWriter) Close() error {
 	return nil
 }
+
+func hashToKey(h hash.Hash) string {
+	s := h.Sum(nil)
+	return fmt.Sprintf("%s%x", hashPrefix, s)[0:lenKey]
+}
diff --git a/store/treestore/tree_test.go b/store/treestore/tree_test.go
new file mode 100644
index 0000000000..9724d0c9ae
--- /dev/null
+++ b/store/treestore/tree_test.go
@@ -0,0 +1,312 @@
+// Copyright 2015 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package treestore
+
+import (
+	"archive/tar"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/coreos/rkt/pkg/aci"
+	"github.com/coreos/rkt/pkg/sys"
+	"github.com/coreos/rkt/store/imagestore"
+)
+
+const tstprefix = "treestore-test"
+
+// TODO(sgotti) when the TreeStore will use an interface, change it to a
+// test implementation without relying on store/imagestore
+func testStoreWriteACI(dir string, s *imagestore.Store) (string, error) {
+	imj := `
+		{
+		    "acKind": "ImageManifest",
+		    "acVersion": "0.7.4",
+		    "name": "example.com/test01"
+		}
+	`
+
+	entries := []*aci.ACIEntry{
+		// An empty dir
+		{
+			Header: &tar.Header{
+				Name:     "rootfs/a",
+				Typeflag: tar.TypeDir,
+			},
+		},
+		{
+			Contents: "hello",
+			Header: &tar.Header{
+				Name: "hello.txt",
+				Size: 5,
+			},
+		},
+		{
+			Header: &tar.Header{
+				Name:     "rootfs/link.txt",
+				Linkname: "rootfs/hello.txt",
+				Typeflag: tar.TypeSymlink,
+			},
+		},
+		// dangling symlink
+		{
+			Header: &tar.Header{
+				Name:     "rootfs/link2.txt",
+				Linkname: "rootfs/missingfile.txt",
+				Typeflag: tar.TypeSymlink,
+			},
+		},
+		{
+			Header: &tar.Header{
+				Name:     "rootfs/fifo",
+				Typeflag: tar.TypeFifo,
+			},
+		},
+	}
+	aci, err := aci.NewACI(dir, imj, entries)
+	if err != nil {
+		return "", err
+	}
+	defer aci.Close()
+
+	// Rewind the ACI
+	if _, err := aci.Seek(0, 0); err != nil {
+		return "", err
+	}
+
+	// Import the new ACI
+	key, err := s.WriteACI(aci, imagestore.ACIFetchInfo{Latest: false})
+	if err != nil {
+		return "", err
+	}
+	return key, nil
+}
+
+func TestTreeStoreRender(t *testing.T) {
+	if !sys.HasChrootCapability() {
+		t.Skipf("chroot capability not available. Disabling test.")
+	}
+
+	dir, err := ioutil.TempDir("", tstprefix)
+	if err != nil {
+		t.Fatalf("error creating tempdir: %v", err)
+	}
+	defer os.RemoveAll(dir)
+
+	s, err := imagestore.NewStore(dir)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	ts, err := NewStore(dir, s)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	key, err := testStoreWriteACI(dir, s)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	id := "treestoreid01"
+
+	_, err = ts.render(id, key)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Verify image Hash. Should be the same.
+	_, err = ts.Check(id)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+}
+
+func TestTreeStoreRemove(t *testing.T) {
+	if !sys.HasChrootCapability() {
+		t.Skipf("chroot capability not available. Disabling test.")
+	}
+
+	dir, err := ioutil.TempDir("", tstprefix)
+	if err != nil {
+		t.Fatalf("error creating tempdir: %v", err)
+	}
+	defer os.RemoveAll(dir)
+
+	s, err := imagestore.NewStore(dir)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	ts, err := NewStore(dir, s)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	key, err := testStoreWriteACI(dir, s)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	id := "treestoreid01"
+
+	// Test non existent dir
+	err = ts.remove(id)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Test rendered tree
+	_, err = ts.render(id, key)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	err = ts.remove(id)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+}
+
+func TestTreeStore(t *testing.T) {
+	if !sys.HasChrootCapability() {
+		t.Skipf("chroot capability not available. Disabling test.")
+	}
+
+	dir, err := ioutil.TempDir("", tstprefix)
+	if err != nil {
+		t.Fatalf("error creating tempdir: %v", err)
+	}
+	defer os.RemoveAll(dir)
+
+	s, err := imagestore.NewStore(dir)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	ts, err := NewStore(dir, s)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	imj := `
+		{
+		    "acKind": "ImageManifest",
+		    "acVersion": "0.7.4",
+		    "name": "example.com/test01"
+		}
+	`
+
+	entries := []*aci.ACIEntry{
+		// An empty dir
+		{
+			Header: &tar.Header{
+				Name:     "rootfs/a",
+				Typeflag: tar.TypeDir,
+			},
+		},
+		{
+			Contents: "hello",
+			Header: &tar.Header{
+				Name: "hello.txt",
+				Size: 5,
+			},
+		},
+		{
+			Header: &tar.Header{
+				Name:     "rootfs/link.txt",
+				Linkname: "rootfs/hello.txt",
+				Typeflag: tar.TypeSymlink,
+			},
+		},
+		// dangling symlink
+		{
+			Header: &tar.Header{
+				Name:     "rootfs/link2.txt",
+				Linkname: "rootfs/missingfile.txt",
+				Typeflag: tar.TypeSymlink,
+			},
+		},
+		{
+			Header: &tar.Header{
+				Name:     "rootfs/fifo",
+				Typeflag: tar.TypeFifo,
+			},
+		},
+	}
+	aci, err := aci.NewACI(dir, imj, entries)
+	if err != nil {
+		t.Fatalf("error creating test tar: %v", err)
+	}
+	defer aci.Close()
+
+	// Rewind the ACI
+	if _, err := aci.Seek(0, 0); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Import the new ACI
+	key, err := s.WriteACI(aci, imagestore.ACIFetchInfo{Latest: false})
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Ask the store to render the treestore
+	id, _, err := ts.Render(key, false)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Verify image Hash. Should be the same.
+	_, err = ts.Check(id)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Change a file permission
+	rootfs := ts.GetRootFS(id)
+	err = os.Chmod(filepath.Join(rootfs, "a"), 0600)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Verify image Hash. Should be different
+	_, err = ts.Check(id)
+	if err == nil {
+		t.Errorf("expected non-nil error!")
+	}
+
+	// rebuild the tree
+	prevID := id
+	id, _, err = ts.Render(key, true)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	if id != prevID {
+		t.Fatalf("unexpected different IDs. prevID: %s, id: %s", prevID, id)
+	}
+
+	// Add a file
+	rootfs = ts.GetRootFS(id)
+	err = ioutil.WriteFile(filepath.Join(rootfs, "newfile"), []byte("newfile"), 0644)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Verify image Hash. Should be different
+	_, err = ts.Check(id)
+	if err == nil {
+		t.Errorf("expected non-nil error!")
+	}
+}

From 5b43ac63e820cdd8dfc7be1cf1cf4046fb6e874c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 22 Jul 2016 17:56:14 +0000
Subject: [PATCH 0574/1304] glide: update go-systemd to v11

This fixes a buggy corner-case in journal seeking (implicit seek to head).
---
 glide.lock                                    |  6 +--
 glide.yaml                                    |  2 +-
 .../coreos/go-systemd/sdjournal/journal.go    | 45 ++++++++++++++++---
 .../coreos/go-systemd/sdjournal/read.go       | 10 ++++-
 4 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/glide.lock b/glide.lock
index 885d6f201e..d0ec96f294 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 987b9326351872beba11bdd392a840167eeccaca6394fa11120c3b0733cb9de5
-updated: 2016-07-21T14:52:03.860669235+02:00
+hash: 3664e0406cca66d626364cc1303ab1d94ff457d8274c3003f982019fafc9a1b8
+updated: 2016-07-22T17:45:52.776583272Z
 imports:
 - name: github.com/appc/docker2aci
   version: d77d6e4b99a0d8b6be6f70c623c86ba777110cbd
@@ -91,7 +91,7 @@ imports:
   subpackages:
   - semver
 - name: github.com/coreos/go-systemd
-  version: b32b8467dbea18858bfebf65c1a6a761090f2c31
+  version: d6c05a1dcbb5ac02b7653da4d99e5db340c20778
   subpackages:
   - activation
   - dbus
diff --git a/glide.yaml b/glide.yaml
index 8685879635..2f56dcd474 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -91,7 +91,7 @@ import:
   subpackages:
   - semver
 - package: github.com/coreos/go-systemd
-  version: v10
+  version: v11
   subpackages:
   - activation
   - dbus
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/journal.go b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
index 4fd29c66f1..51fe69ca20 100644
--- a/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
@@ -257,6 +257,7 @@ package sdjournal
 //
 import "C"
 import (
+	"bytes"
 	"fmt"
 	"path/filepath"
 	"strings"
@@ -614,12 +615,10 @@ func (j *Journal) PreviousSkip(skip uint64) (uint64, error) {
 	return uint64(r), nil
 }
 
-// GetData gets the data object associated with a specific field from the
-// current journal entry.
-func (j *Journal) GetData(field string) (string, error) {
+func (j *Journal) getData(field string) (unsafe.Pointer, C.int, error) {
 	sd_journal_get_data, err := j.getFunction("sd_journal_get_data")
 	if err != nil {
-		return "", err
+		return nil, 0, err
 	}
 
 	f := C.CString(field)
@@ -633,12 +632,21 @@ func (j *Journal) GetData(field string) (string, error) {
 	j.mu.Unlock()
 
 	if r < 0 {
-		return "", fmt.Errorf("failed to read message: %d", syscall.Errno(-r))
+		return nil, 0, fmt.Errorf("failed to read message: %d", syscall.Errno(-r))
 	}
 
-	msg := C.GoStringN((*C.char)(d), C.int(l))
+	return d, C.int(l), nil
+}
+
+// GetData gets the data object associated with a specific field from the
+// current journal entry.
+func (j *Journal) GetData(field string) (string, error) {
+	d, l, err := j.getData(field)
+	if err != nil {
+		return "", err
+	}
 
-	return msg, nil
+	return C.GoStringN((*C.char)(d), l), nil
 }
 
 // GetDataValue gets the data object associated with a specific field from the
@@ -648,9 +656,32 @@ func (j *Journal) GetDataValue(field string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+
 	return strings.SplitN(val, "=", 2)[1], nil
 }
 
+// GetDataBytes gets the data object associated with a specific field from the
+// current journal entry.
+func (j *Journal) GetDataBytes(field string) ([]byte, error) {
+	d, l, err := j.getData(field)
+	if err != nil {
+		return nil, err
+	}
+
+	return C.GoBytes(d, l), nil
+}
+
+// GetDataValueBytes gets the data object associated with a specific field from the
+// current journal entry, returning only the value of the object.
+func (j *Journal) GetDataValueBytes(field string) ([]byte, error) {
+	val, err := j.GetDataBytes(field)
+	if err != nil {
+		return nil, err
+	}
+
+	return bytes.SplitN(val, []byte("="), 2)[1], nil
+}
+
 // GetEntry returns a full representation of a journal entry with
 // all key-value pairs of data as well as address fields (cursor, realtime
 // timestamp and monotonic timestamp)
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/read.go b/vendor/github.com/coreos/go-systemd/sdjournal/read.go
index 71ee806a96..c9c44bac32 100644
--- a/vendor/github.com/coreos/go-systemd/sdjournal/read.go
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/read.go
@@ -90,9 +90,17 @@ func NewJournalReader(config JournalReaderConfig) (*JournalReader, error) {
 		// Move the read pointer into position near the tail. Go one further than
 		// the option so that the initial cursor advancement positions us at the
 		// correct starting point.
-		if _, err := r.journal.PreviousSkip(config.NumFromTail + 1); err != nil {
+		skip, err := r.journal.PreviousSkip(config.NumFromTail + 1)
+		if err != nil {
 			return nil, err
 		}
+		// If we skipped fewer lines than expected, we have reached journal start.
+		// Thus, we seek to head so that next invocation can read the first line.
+		if skip != config.NumFromTail+1 {
+			if err := r.journal.SeekHead(); err != nil {
+				return nil, err
+			}
+		}
 	} else if config.Cursor != "" {
 		// Start based on a custom cursor
 		if err := r.journal.SeekCursor(config.Cursor); err != nil {

From 7f92f523c6ff8278ec1e27ac8119ee209f752b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 25 Jul 2016 16:02:23 +0200
Subject: [PATCH 0575/1304] stage1/init: fix writing of /etc/machine-id

According to machine-id(5):

  machine ID is a single newline-terminated, hexadecimal, 32-character,
  lowercase machine ID string.

Let's finish the file with a new line. Otherwise, systemd ~v231 will
fail.
---
 stage1/init/init.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index d997594c15..f6bea0e991 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -361,7 +361,8 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 		return nil, nil, fmt.Errorf("unrecognized stage1 flavor: %q", flavor)
 	}
 
-	if err := ioutil.WriteFile(mPath, []byte(machineID), 0644); err != nil {
+	machineIDBytes := append([]byte(machineID), '\n')
+	if err := ioutil.WriteFile(mPath, machineIDBytes, 0644); err != nil {
 		log.FatalE("error writing /etc/machine-id", err)
 	}
 

From 217eee73a3f62cca17abb9db0c7cedc7c16d4482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 25 Jul 2016 17:21:41 +0200
Subject: [PATCH 0576/1304] functional tests: set cpu isolator correctly

The ACE spec defines limit as:

*limit*: cores that can be consumed before the kernel temporarily throttles
the process

and core as:

*core*: seconds/second that the app/pod will be able to run. e.g. 1 (or
1000m for 1000 milli-seconds) would represent full use of a single CPU
core every second.

So setting 100 would mean 100 seconds/second which doesn't make sense.

Somehow this wasn't failing until now but testing the flavor src with
the (yet to be released) systemd v231 makes it fail.
---
 tests/rkt_run_pod_manifest_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 321a2d60ab..1db9e57ac5 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -729,7 +729,7 @@ func TestPodManifest(t *testing.T) {
 							Isolators: []types.Isolator{
 								mustNewIsolator(`{
 									"name":     "resource/cpu",
-									"value":    { "request": "100", "limit": "100"}
+									"value":    { "request": "100m", "limit": "100m"}
 								}`),
 								mustNewIsolator(`{
 									"name":     "os/linux/capabilities-retain-set",

From a02915cf218721fb4b99b5cbd73345859b95bad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 21 Jul 2016 17:37:57 +0200
Subject: [PATCH 0577/1304] store: allow users in the rkt group to delete
 images

Don't check if we're the owner of the image before removing, all the
users in the rkt group should be able to remove any image.

If the user removing the image is in the rkt group and permissions are
correctly set up (or if they're root), then it's fine, they can remove
images.

If the user is not in the rkt group or permissions are not correctly set
up, they will get errors before this function because they're not
allowed to use the CAS directory.
---
 store/imagestore/store.go | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/store/imagestore/store.go b/store/imagestore/store.go
index bc753d320d..41c60e9883 100644
--- a/store/imagestore/store.go
+++ b/store/imagestore/store.go
@@ -505,23 +505,6 @@ func (s *Store) RemoveACI(key string) error {
 	}
 	defer imageKeyLock.Close()
 
-	// Try to see if we are the owner of the images, if not, returns not enough permission error.
-	for _, ds := range s.stores {
-		// XXX: The construction of 'path' depends on the implementation of diskv.
-		path := filepath.Join(ds.BasePath, filepath.Join(ds.Transform(key)...))
-		fi, err := os.Stat(path)
-		if err != nil {
-			return errwrap.Wrap(errors.New("cannot get the stat of the image directory"), err)
-		}
-
-		uid := os.Getuid()
-		dirUid := int(fi.Sys().(*syscall.Stat_t).Uid)
-
-		if uid != dirUid && uid != 0 {
-			return fmt.Errorf("permission denied on %s, directory owner id (%d) does not match current real id (%d). Are you root or the owner of the image?", path, dirUid, uid)
-		}
-	}
-
 	// Firstly remove aciinfo and remote from the db in an unique transaction.
 	// remote needs to be removed or a GetRemote will return a blobKey not
 	// referenced by any ACIInfo.

From 3e1ac4a80adfd48aef8299c38251d3a44cac6b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 22 Jul 2016 11:43:32 +0200
Subject: [PATCH 0578/1304] functional tests: update tests with new rkt group
 semantics

The members of the rkt group can now manipulate images freely.
---
 tests/rkt_non_root_test.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index 3d46c39377..0b8211d7e8 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -85,8 +85,8 @@ func TestNonRootReadInfo(t *testing.T) {
 	runRktAsGidAndCheckOutput(t, imgListCmd, "inspect-", false, gid)
 }
 
-// TestNonRootFetchRmGCImage tests that non-root users can remove images fetched by themselves but
-// cannot remove images fetched by root, or gc any images.
+// TestNonRootFetchRmGCImage tests that non-root users can remove all images but
+// cannot gc images.
 func TestNonRootFetchRmGCImage(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
@@ -111,14 +111,15 @@ func TestNonRootFetchRmGCImage(t *testing.T) {
 	ctx.RunGC()
 
 	// Should not be able to do image gc.
+	// We can't touch the treestores even as members of the rkt group.
 	imgGCCmd := fmt.Sprintf("%s image gc", ctx.Cmd())
 	t.Logf("Running %s", imgGCCmd)
 	runRktAsGidAndCheckOutput(t, imgGCCmd, "permission denied", true, gid)
 
-	// Should not be able to remove the image fetched by root.
+	// Should be able to remove the image fetched by root since we're in the rkt group.
 	imgRmCmd := fmt.Sprintf("%s image rm %s", ctx.Cmd(), rootImgHash)
 	t.Logf("Running %s", imgRmCmd)
-	runRktAsGidAndCheckOutput(t, imgRmCmd, "permission denied", true, gid)
+	runRktAsGidAndCheckOutput(t, imgRmCmd, "successfully removed", false, gid)
 
 	// Should be able to remove the image fetched by ourselves.
 	nonrootImg := patchTestACI("rkt-inspect-non-root-rm.aci", "--exec=/inspect")

From 7db0589f91749a9f666fb01c72986492ea256d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 25 Jul 2016 16:13:13 +0200
Subject: [PATCH 0579/1304] build,stage1/init: set interpBin at build time for
 src flavor

The src flavor has a different interpreter path.

Take advantage of the new build variable to set it for the src flavor.
Also, change its name because it's not coreos flavor specific anymore.
---
 Makefile.in         |  4 ++--
 configure.ac        | 27 ++++++++++++++++++---------
 stage1/init/init.go |  6 ++++++
 stage1/init/init.mk |  2 +-
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a839644490..dd976c3281 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@ RKT_LOCAL_COREOS_PXE_IMAGE_PATH := @RKT_LOCAL_COREOS_PXE_IMAGE_PATH@
 RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER := @RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER@
 
 RKT_STAGE1_COREOS_BOARD := @RKT_STAGE1_COREOS_BOARD@
-RKT_STAGE1_COREOS_INTERPRETER := @RKT_STAGE1_COREOS_INTERPRETER@
+RKT_STAGE1_INTERPRETER := @RKT_STAGE1_INTERPRETER@
 
 # defines for enter
 RKT_DEFINES_FOR_ENTER := @RKT_DEFINES_FOR_ENTER@
@@ -60,7 +60,7 @@ RKT_STAGE1_DEFAULT_VERSION_LDFLAGS := @RKT_STAGE1_DEFAULT_VERSION_LDFLAGS@
 RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS := @RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS@
 RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS := @RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS@
 RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS := @RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS@
-RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS := @RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS@
+RKT_STAGE1_INTERPRETER_LDFLAGS := @RKT_STAGE1_INTERPRETER_LDFLAGS@
 RKT_VERSION_LDFLAGS := @RKT_VERSION_LDFLAGS@
 RKT_FEATURES_LDFLAGS := @RKT_FEATURES_LDFLAGS@
 
diff --git a/configure.ac b/configure.ac
index 6c04157b38..871f80fb9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -573,17 +573,26 @@ AS_CASE([${RKT_ACI_ARCH}],
         dnl supported arches
         [aarch64 | amd64], [],
         dnl unsupported arches
-        [RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos,kvm],
-                           [AC_MSG_ERROR([*** ${RKT_ACI_ARCH}: no arch support for stage1 flavors {coreos,kvm}])],
+        [RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos,kvm,src],
+                           [AC_MSG_ERROR([*** ${RKT_ACI_ARCH}: no arch support for stage1 flavors {coreos,kvm,src}])],
                            [AC_MSG_WARN([* ${RKT_ACI_ARCH}: unsupported arch])])])
 
 # Set the path to the interpreter binary for coreos flavor.
 RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos],
                   [AS_CASE([${RKT_ACI_ARCH}],
                            [aarch64],
-                                    [RKT_STAGE1_COREOS_INTERPRETER="/usr/lib/ld-linux-aarch64.so.1"],
+                                    [RKT_STAGE1_INTERPRETER="/usr/lib/ld-linux-aarch64.so.1"],
                            [amd64],
-                                    [RKT_STAGE1_COREOS_INTERPRETER="/usr/lib/ld-linux-x86-64.so.2"])])
+                                    [RKT_STAGE1_INTERPRETER="/usr/lib/ld-linux-x86-64.so.2"])])
+
+# Set the path to the interpreter binary for src flavor.
+RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [src],
+                  [AS_CASE([${RKT_ACI_ARCH}],
+                           [aarch64],
+                                    [RKT_STAGE1_INTERPRETER="/lib64/ld-linux-aarch64.so.1"],
+                           [amd64],
+                                    [RKT_STAGE1_INTERPRETER="/lib64/ld-linux-x86-64.so.2"])])
+
 
 # cross_compiling is a standard autoconf variable.  See the autoconf manual for
 # details.
@@ -717,7 +726,7 @@ RKT_STAGE1_DEFAULT_VERSION_LDFLAGS="-X 'main.buildDefaultStage1Version=${RKT_STA
 RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS="-X 'main.buildDefaultStage1ImageLoc=${RKT_STAGE1_DEFAULT_LOCATION}'"
 RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS="-X 'main.buildDefaultStage1ImageInRktDir=${RKT_STAGE1_DEFAULT_IMAGE_FILENAME_IN_RKT_DIRECTORY}'"
 RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS="-X 'main.buildDefaultStage1ImagesDir=${RKT_STAGE1_DEFAULT_IMAGES_DIR}'"
-RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS="-X 'main.interpBin=${RKT_STAGE1_COREOS_INTERPRETER}'"
+RKT_STAGE1_INTERPRETER_LDFLAGS="-X 'main.interpBin=${RKT_STAGE1_INTERPRETER}'"
 RKT_VERSION_LDFLAGS="-X 'github.com/coreos/rkt/version.Version=${RKT_VERSION}'"
 RKT_FEATURES_LDFLAGS="-X 'main.rktFeatures=${RKT_FEATURES}'"
 
@@ -745,7 +754,7 @@ AC_SUBST(RKT_LOCAL_COREOS_PXE_IMAGE_PATH)
 AC_SUBST(RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER)
 
 AC_SUBST(RKT_STAGE1_COREOS_BOARD)
-AC_SUBST(RKT_STAGE1_COREOS_INTERPRETER)
+AC_SUBST(RKT_STAGE1_INTERPRETER)
 
 AC_SUBST(RKT_RUN_FUNCTIONAL_TESTS)
 
@@ -758,7 +767,7 @@ AC_SUBST(RKT_STAGE1_DEFAULT_VERSION_LDFLAGS)
 AC_SUBST(RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS)
 AC_SUBST(RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS)
 AC_SUBST(RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS)
-AC_SUBST(RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS)
+AC_SUBST(RKT_STAGE1_INTERPRETER_LDFLAGS)
 AC_SUBST(RKT_VERSION_LDFLAGS)
 AC_SUBST(RKT_FEATURES_LDFLAGS)
 
@@ -820,11 +829,11 @@ RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [kvm],
 
         hypervisor:                             '${RKT_STAGE1_KVM_HV}'])])
 
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos],
+RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos,src],
                   [AC_MSG_RESULT([
         coreos flavor specific build parameters
 
-        interpreter:                            '${RKT_STAGE1_COREOS_INTERPRETER}'])])
+        interpreter:                            '${RKT_STAGE1_INTERPRETER}'])])
 
 
 AC_MSG_RESULT([
diff --git a/stage1/init/init.go b/stage1/init/init.go
index d997594c15..4585c59971 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -301,6 +301,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 		env = append(env, "LD_LIBRARY_PATH="+filepath.Join(common.Stage1RootfsPath(p.Root), "usr/lib"))
 
 	case "src":
+		args = append(args, filepath.Join(common.Stage1RootfsPath(p.Root), interpBin))
 		args = append(args, filepath.Join(common.Stage1RootfsPath(p.Root), nspawnBin))
 		args = append(args, "--boot") // Launch systemd in the pod
 
@@ -318,6 +319,11 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 			args = append(args, fmt.Sprintf("--register=false"))
 		}
 
+		// use only dynamic libraries provided in the image
+		// from systemd v231 there's a new internal libsystemd-shared-v231.so
+		// which is present in /usr/lib/systemd
+		env = append(env, "LD_LIBRARY_PATH="+filepath.Join(common.Stage1RootfsPath(p.Root), "usr/lib/systemd"))
+
 	case "host":
 		hostNspawnBin, err := common.LookupPath("systemd-nspawn", os.Getenv("PATH"))
 		if err != nil {
diff --git a/stage1/init/init.mk b/stage1/init/init.mk
index 8cdfc11982..8be60d1e16 100644
--- a/stage1/init/init.mk
+++ b/stage1/init/init.mk
@@ -1,4 +1,4 @@
 BGB_GO_FLAGS := $(strip \
-	-ldflags "$(RKT_STAGE1_COREOS_INTERPRETER_LDFLAGS)" \
+	-ldflags "$(RKT_STAGE1_INTERPRETER_LDFLAGS)" \
 	$(RKT_TAGS))
 include stage1/makelib/aci_simple_go_bin.mk

From 6cfcc1921dde00b7b184c474a37ace63e68811cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 26 Jul 2016 12:36:05 +0200
Subject: [PATCH 0580/1304] fly: copy rkt-resolv.conf in the app

If the user specified the --dns option, a file named rkt-resolv.conf
will be created in /etc in the stage1 rootfs.

If this file is present, copy it in the app so the --dns option works
in rkt fly.
---
 stage1_fly/run/main.go | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 85f81e4758..2f24f30a14 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -31,6 +31,7 @@ import (
 	"github.com/hashicorp/errwrap"
 
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/fileutil"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/pkg/user"
@@ -264,6 +265,11 @@ func stage1() int {
 
 	rfs := filepath.Join(common.AppPath(p.Root, ra.Name), "rootfs")
 
+	if err := copyResolv(p); err != nil {
+		log.PrintE("can't copy /etc/resolv.conf", err)
+		return 1
+	}
+
 	argFlyMounts, err := evaluateMounts(rfs, string(ra.Name), p)
 	if err != nil {
 		log.PrintE("can't evaluate mounts", err)
@@ -424,6 +430,32 @@ func stage1() int {
 	return 0
 }
 
+func copyResolv(p *stage1commontypes.Pod) error {
+	ra := p.Manifest.Apps[0]
+
+	stage1Rootfs := common.Stage1RootfsPath(p.Root)
+	resolvPath := filepath.Join(stage1Rootfs, "etc", "rkt-resolv.conf")
+
+	appRootfs := common.AppRootfsPath(p.Root, ra.Name)
+	targetEtc := filepath.Join(appRootfs, "etc")
+	targetResolvPath := filepath.Join(targetEtc, "resolv.conf")
+
+	_, err := os.Stat(resolvPath)
+	switch {
+	case os.IsNotExist(err):
+		return nil
+	case err != nil:
+		return err
+	}
+
+	_, err = os.Stat(targetResolvPath)
+	if err != nil && !os.IsNotExist(err) {
+		return err
+	}
+
+	return fileutil.CopyRegularFile(resolvPath, targetResolvPath)
+}
+
 func main() {
 	flag.Parse()
 

From fc754e1b1dd7bd1f6c57783ac0d7bfd40d6c6b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 26 Jul 2016 12:39:56 +0200
Subject: [PATCH 0581/1304] functional tests: enable TestDNS in rkt fly

---
 tests/rkt_dns_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_dns_test.go b/tests/rkt_dns_test.go
index 9608c12248..dacbd394b6 100644
--- a/tests/rkt_dns_test.go
+++ b/tests/rkt_dns_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build host coreos src
+// +build host coreos src fly
 
 package main
 

From 8fcb19a5a04921daa001b401014590fe62ede2fe Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Tue, 26 Jul 2016 17:17:59 +0200
Subject: [PATCH 0582/1304] stage1: disabling cgroup namespace in
 systemd-nspawn

If the kernel has the cgroup namespace enabled, systemd v232 will use it
by default. This was introduced by https://github.com/systemd/systemd/pull/3809
and it will cause problems in rkt when cgns is enabled and cgroup-v1 is used.
For more information see https://github.com/systemd/systemd/pull/3589#discussion_r70277625.
This patch tells systemd-nspawn not to use cgroup namespace using
the environment variable introduced by https://github.com/systemd/systemd/pull/3809.
---
 stage1/init/init.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index dd23063ebe..065959ce70 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -398,6 +398,14 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 	}
 
 	env = append(env, "SYSTEMD_NSPAWN_CONTAINER_SERVICE=rkt")
+	// TODO (alepuccetti) remove this line when rkt will use cgroup namespace
+	// If the kernel has the cgroup namespace enabled, systemd v232 will use it by default.
+	// This was introduced by https://github.com/systemd/systemd/pull/3809 and it will cause
+	// problems in rkt when cgns is enabled and cgroup-v1 is used. For more information see
+	// https://github.com/systemd/systemd/pull/3589#discussion_r70277625.
+	// The following line tells systemd-nspawn not to use cgroup namespace using the environment variable
+	// introduced by https://github.com/systemd/systemd/pull/3809.
+	env = append(env, "SYSTEMD_NSPAWN_USE_CGNS=no")
 
 	if len(privateUsers) > 0 {
 		args = append(args, "--private-users="+privateUsers)

From 335bb48a16ccdb6aa5849a51ac3fe08b952ba2d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 22 Jul 2016 12:23:23 +0200
Subject: [PATCH 0583/1304] store: tell the user to run as root on db update

If the CAS database is updated and the user runs a command that opens
the store as non-root, the DB backup will fail because it requires
privileges to copy the old DB.

Moreover, this leads to a state where manual intervention is required:

```
$ sudo rkt image list
list: cannot open store: mkdir /var/lib/rkt/cas/db-backups/tmp: file
exists
```

To avoid these issues, let's give a friendly error message asking the
user to run the command as root.
---
 store/imagestore/store.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/store/imagestore/store.go b/store/imagestore/store.go
index bc753d320d..ba56422870 100644
--- a/store/imagestore/store.go
+++ b/store/imagestore/store.go
@@ -66,7 +66,8 @@ var diskvStores = [...]string{
 }
 
 var (
-	ErrKeyNotFound = errors.New("no image IDs found")
+	ErrKeyNotFound       = errors.New("no image IDs found")
+	ErrDBUpdateNeedsRoot = errors.New("database schema needs to be updated, re-run as root to perform the update")
 )
 
 // ACINotFoundError is returned when an ACI cannot be found by GetACI
@@ -278,6 +279,9 @@ func (s *Store) Close() error {
 
 // backupDB backs up current database.
 func (s *Store) backupDB() error {
+	if os.Geteuid() != 0 {
+		return ErrDBUpdateNeedsRoot
+	}
 	backupsDir := filepath.Join(s.dir, "db-backups")
 	return backup.CreateBackup(s.dbDir(), backupsDir, backupsNumber)
 }

From 52fce1c0a65d6e826621dbd702b58763f9de82a2 Mon Sep 17 00:00:00 2001
From: Dominika Krzyszczyk <dominika.krzyszczyk@intel.com>
Date: Mon, 18 Jul 2016 12:58:58 +0200
Subject: [PATCH 0584/1304] rkt-monitor: add another file named
 'build-stresser.sh' to bump-release script

---
 scripts/bump-release                | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bump-release b/scripts/bump-release
index 6e135ff8ce..ec9fceff5c 100755
--- a/scripts/bump-release
+++ b/scripts/bump-release
@@ -38,7 +38,7 @@ function replace_all() {
 }
 
 function replace_version() {
-	replace_stuff $1 $2 configure.ac scripts/build-rir.sh
+	replace_stuff $1 $2 configure.ac scripts/build-rir.sh tests/rkt-monitor/build-stresser.sh
 }
 
 NEXT=${1:1} 	        # 0.2.3
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 8575651473..f0b8c2264b 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -28,7 +28,7 @@ trap acbuildEnd EXIT
 
 acbuild --debug set-name appc.io/rkt-"${1}"-stresser
 
-acbuild --debug copy build-rkt-1.10.0+git/target/bin/"${1}"-stresser /worker
+acbuild --debug copy build-rkt-1.11.0+git/target/bin/"${1}"-stresser /worker
 
 acbuild --debug set-exec -- /worker
 

From 10796e390eb470f1c4ea3bd0174866132fcc82b0 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 27 Jul 2016 08:47:27 -0700
Subject: [PATCH 0585/1304] docs: clarify run-time override semantics of
 capabilities

Fixes #2986
---
 Documentation/capabilities-guide.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/capabilities-guide.md b/Documentation/capabilities-guide.md
index 470906ccd9..25041cce61 100644
--- a/Documentation/capabilities-guide.md
+++ b/Documentation/capabilities-guide.md
@@ -300,6 +300,10 @@ without changing the executed images.
 The `--cap-retain` option to `rkt run` manipulates the `retain` capabilities set.
 The `--cap-remove` option manipulates the `remove` set.
 
+Capabilities specified from the command-line will replace all capability settings in the image manifest.
+Also as stated above the options `--cap-retain`, and `--cap-remove` are mutually exclusive.
+Only one can be specified at a time.
+
 Capabilities isolators can be added on the command line at run time by
 specifying the desired overriding set, as shown in this example:
 

From 427b95945400111bf6e17192f3c4e3cc81eeffaa Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Fri, 8 Jul 2016 13:30:47 -0700
Subject: [PATCH 0586/1304] api_service: Cache static pod info.

Add a LRU cache to cache the static pod result, only the dynamic infos
(e.g. pod state, app state, etc.) will be read from the disk everytime.
---
 rkt/api_service.go | 327 +++++++++++++++++++++++++++++----------------
 1 file changed, 209 insertions(+), 118 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 8e163eda6b..751251ea72 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -38,11 +38,15 @@ import (
 	"github.com/coreos/rkt/version"
 	"github.com/godbus/dbus"
 	"github.com/hashicorp/errwrap"
+	"github.com/hashicorp/golang-lru"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 
+// Default size for the pod manifest LRU cache.
+const defaultCacheSize = 512
+
 var (
 	supportedAPIVersion = "1.0.0-alpha"
 	cmdAPIService       = &cobra.Command{
@@ -68,9 +72,33 @@ func init() {
 	cmdAPIService.Flags().StringVar(&flagAPIServiceListenAddr, "listen", "", "address to listen for client API requests")
 }
 
+type podCacheItem struct {
+	pod   *v1alpha.Pod
+	mtime time.Time
+}
+
+// copyPod copies the immutable information of the pod into the new pod.
+func copyPod(pod *v1alpha.Pod) *v1alpha.Pod {
+	p := &v1alpha.Pod{
+		Id:          pod.Id,
+		Manifest:    pod.Manifest,
+		Annotations: pod.Annotations,
+	}
+
+	for _, app := range pod.Apps {
+		p.Apps = append(p.Apps, &v1alpha.App{
+			Name:        app.Name,
+			Image:       app.Image,
+			Annotations: app.Annotations,
+		})
+	}
+	return p
+}
+
 // v1AlphaAPIServer implements v1Alpha.APIServer interface.
 type v1AlphaAPIServer struct {
-	store *imagestore.Store
+	store    *imagestore.Store
+	podCache *lru.Cache
 }
 
 var _ v1alpha.PublicAPIServer = &v1AlphaAPIServer{}
@@ -81,8 +109,14 @@ func newV1AlphaAPIServer() (*v1AlphaAPIServer, error) {
 		return nil, err
 	}
 
+	cache, err := lru.New(defaultCacheSize)
+	if err != nil {
+		return nil, err
+	}
+
 	return &v1AlphaAPIServer{
-		store: s,
+		store:    s,
+		podCache: cache,
 	}, nil
 }
 
@@ -251,8 +285,10 @@ func satisfiesAnyPodFilters(pod *v1alpha.Pod, filters []*v1alpha.PodFilter) bool
 }
 
 // getPodManifest returns the pod manifest of the pod.
+// It will try to find the manifest in the LRU cache first, if not found or the manifest is stale,
+// then it will read the manifest from the disk.
 // Both marshaled and unmarshaled manifest are returned.
-func getPodManifest(p *pod) (*schema.PodManifest, []byte, error) {
+func (s *v1AlphaAPIServer) getPodManifest(p *pod) (*schema.PodManifest, []byte, error) {
 	data, err := p.readFile("pod")
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to read pod manifest for pod %q", p.uuid), err)
@@ -264,6 +300,7 @@ func getPodManifest(p *pod) (*schema.PodManifest, []byte, error) {
 		stderr.PrintE(fmt.Sprintf("failed to unmarshal pod manifest for pod %q", p.uuid), err)
 		return nil, nil, err
 	}
+
 	return &manifest, data, nil
 }
 
@@ -286,7 +323,8 @@ func getApplist(manifest *schema.PodManifest) []*v1alpha.App {
 			Name:        app.Name.String(),
 			Image:       img,
 			Annotations: convertAnnotationsToKeyValue(app.Annotations),
-			// State and exit code are not returned in 'ListPods()'.
+			State:       v1alpha.AppState_APP_STATE_UNDEFINED,
+			ExitCode:    -1,
 		})
 	}
 	return apps
@@ -305,57 +343,174 @@ func getNetworks(p *pod) []*v1alpha.Network {
 	return networks
 }
 
-// getBasicPod returns *v1alpha.Pod with basic pod information.
-func getBasicPod(p *pod) *v1alpha.Pod {
-	pod := &v1alpha.Pod{Id: p.uuid.String(), Pid: -1}
+type errs struct {
+	errs []error
+}
+
+// Error is part of the error interface.
+func (e errs) Error() string {
+	return fmt.Sprintf("%v", e.errs)
+}
+
+// fillStaticAppInfo will modify the 'v1pod' in place with the infomation retrived with 'pod'.
+// Today, these information are static and will not change during the pod's lifecycle.
+func fillStaticAppInfo(store *imagestore.Store, pod *pod, v1pod *v1alpha.Pod) error {
+	var errlist []error
+
+	// Fill static app image info.
+	for _, app := range v1pod.Apps {
+		// Fill app's image info (id, name, version).
+		fullImageID, err := store.ResolveKey(app.Image.Id)
+		if err != nil {
+			stderr.PrintE(fmt.Sprintf("failed to resolve the image ID %q", app.Image.Id), err)
+			errlist = append(errlist, err)
+		}
 
-	manifest, data, err := getPodManifest(p)
+		// The following information is always known
+		app.Image = &v1alpha.Image{
+			BaseFormat: &v1alpha.ImageFormat{
+				// Only support appc image now. If it's a docker image, then it
+				// will be transformed to appc before storing in the disk store.
+				Type:    v1alpha.ImageType_IMAGE_TYPE_APPC,
+				Version: schema.AppContainerVersion.String(),
+			},
+			Id: fullImageID,
+			// Other information are not available because they require the image
+			// info from store. Some of it is filled in below if possible.
+		}
+
+		im, err := pod.getAppImageManifest(*types.MustACName(app.Name))
+		if err != nil {
+			stderr.PrintE(fmt.Sprintf("failed to get image manifests for app %q", app.Name), err)
+			errlist = append(errlist, err)
+		} else {
+			app.Image.Name = im.Name.String()
+
+			version, ok := im.Labels.Get("version")
+			if !ok {
+				version = "latest"
+			}
+			app.Image.Version = version
+		}
+	}
+
+	if len(errlist) != 0 {
+		return errs{errlist}
+	}
+	return nil
+}
+
+func (s *v1AlphaAPIServer) getBasicPodFromDisk(p *pod) (*v1alpha.Pod, error) {
+	pod := &v1alpha.Pod{Id: p.uuid.String()}
+
+	manifest, data, err := s.getPodManifest(p)
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to get the pod manifest for pod %q", p.uuid), err)
 	} else {
-		pod.Manifest = data
 		pod.Annotations = convertAnnotationsToKeyValue(manifest.Annotations)
 		pod.Apps = getApplist(manifest)
+		pod.Manifest = data
+		err = fillStaticAppInfo(s.store, p, pod)
+	}
+
+	return pod, err
+}
+
+// getBasicPod returns v1alpha.Pod with basic pod information.
+func (s *v1AlphaAPIServer) getBasicPod(p *pod) *v1alpha.Pod {
+	mtime, mtimeErr := p.getModTime("pod")
+	if mtimeErr != nil {
+		stderr.PrintE(fmt.Sprintf("failed to read the pod manifest's mtime for pod %q", p.uuid), mtimeErr)
+	}
+
+	// Couldn't use pod.uuid directly as it's a pointer.
+	itemValue, found := s.podCache.Get(p.uuid.String())
+	if found && mtimeErr == nil {
+		cacheItem := itemValue.(*podCacheItem)
+
+		// Check the mtime to make sure we are not returning stale manifests.
+		if !mtime.After(cacheItem.mtime) {
+			return copyPod(cacheItem.pod)
+		}
+	}
+
+	pod, err := s.getBasicPodFromDisk(p)
+	if mtimeErr != nil || err != nil {
+		// If any error happens or the mtime is unknown,
+		// returns the raw pod directly without adding it to the cache.
+		return pod
+	}
+
+	cacheItem := &podCacheItem{pod, mtime}
+	s.podCache.Add(p.uuid.String(), cacheItem)
+
+	// Return a copy of the pod, so the cached pod is not mutated later.
+	return copyPod(cacheItem.pod)
+}
+
+func waitForMachinedRegistration(uuid string) error {
+	conn, err := dbus.SystemBus()
+	if err != nil {
+		return err
+	}
+	machined := conn.Object("org.freedesktop.machine1", "/org/freedesktop/machine1")
+	machineName := "rkt-" + uuid
+
+	var o dbus.ObjectPath
+	for i := 0; i < 10; i++ {
+		if err := machined.Call("org.freedesktop.machine1.Manager.GetMachine", 0, machineName).Store(&o); err == nil {
+			return nil
+		}
+		time.Sleep(time.Millisecond * 50)
 	}
 
+	return errors.New("pod not found")
+}
+
+// fillPodDetails fills the v1pod's dynamic info in place, e.g. the pod's state,
+// the pod's network info, the apps' state, etc. Such information can change
+// during the lifecycle of the pod, so we need to read it in every request.
+func fillPodDetails(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
+	v1pod.Pid = -1
+
 	switch p.getState() {
 	case Embryo:
-		pod.State = v1alpha.PodState_POD_STATE_EMBRYO
+		v1pod.State = v1alpha.PodState_POD_STATE_EMBRYO
 		// When a pod is in embryo state, there is not much
 		// information to return.
-		return pod
+		return
 	case Preparing:
-		pod.State = v1alpha.PodState_POD_STATE_PREPARING
+		v1pod.State = v1alpha.PodState_POD_STATE_PREPARING
 	case AbortedPrepare:
-		pod.State = v1alpha.PodState_POD_STATE_ABORTED_PREPARE
+		v1pod.State = v1alpha.PodState_POD_STATE_ABORTED_PREPARE
 	case Prepared:
-		pod.State = v1alpha.PodState_POD_STATE_PREPARED
+		v1pod.State = v1alpha.PodState_POD_STATE_PREPARED
 	case Running:
-		pod.State = v1alpha.PodState_POD_STATE_RUNNING
-		pod.Networks = getNetworks(p)
+		v1pod.State = v1alpha.PodState_POD_STATE_RUNNING
+		v1pod.Networks = getNetworks(p)
 	case Deleting:
-		pod.State = v1alpha.PodState_POD_STATE_DELETING
+		v1pod.State = v1alpha.PodState_POD_STATE_DELETING
 	case Exited:
-		pod.State = v1alpha.PodState_POD_STATE_EXITED
+		v1pod.State = v1alpha.PodState_POD_STATE_EXITED
 	case Garbage:
-		pod.State = v1alpha.PodState_POD_STATE_GARBAGE
+		v1pod.State = v1alpha.PodState_POD_STATE_GARBAGE
 	default:
-		pod.State = v1alpha.PodState_POD_STATE_UNDEFINED
-		return pod
+		v1pod.State = v1alpha.PodState_POD_STATE_UNDEFINED
+		return
 	}
 
 	createdAt, err := p.getCreationTime()
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to get the creation time for pod %q", p.uuid), err)
 	} else if !createdAt.IsZero() {
-		pod.CreatedAt = createdAt.UnixNano()
+		v1pod.CreatedAt = createdAt.UnixNano()
 	}
 
 	startedAt, err := p.getStartTime()
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to get the start time for pod %q", p.uuid), err)
 	} else if !startedAt.IsZero() {
-		pod.StartedAt = startedAt.UnixNano()
+		v1pod.StartedAt = startedAt.UnixNano()
 
 	}
 
@@ -363,18 +518,18 @@ func getBasicPod(p *pod) *v1alpha.Pod {
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to get the gc marked time for pod %q", p.uuid), err)
 	} else if !gcMarkedAt.IsZero() {
-		pod.GcMarkedAt = gcMarkedAt.UnixNano()
+		v1pod.GcMarkedAt = gcMarkedAt.UnixNano()
 	}
 
 	pid, err := p.getPID()
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to get the PID for pod %q", p.uuid), err)
 	} else {
-		pod.Pid = int32(pid)
+		v1pod.Pid = int32(pid)
 	}
 
-	if pod.State == v1alpha.PodState_POD_STATE_RUNNING {
-		if err := waitForMachinedRegistration(pod.Id); err != nil {
+	if v1pod.State == v1alpha.PodState_POD_STATE_RUNNING {
+		if err := waitForMachinedRegistration(v1pod.Id); err != nil {
 			// If there's an error, it means we're not registered to machined
 			// in a reasonable time. Just output the cgroup we're in.
 			stderr.PrintE("checking for machined registration failed", err)
@@ -393,65 +548,11 @@ func getBasicPod(p *pod) *v1alpha.Pod {
 				// See https://github.com/coreos/rkt/pull/2331#issuecomment-203540543
 				//
 				// TODO(yifan): Revisit this when using unified cgroup hierarchy.
-				pod.Cgroup = strings.TrimSuffix(cgroup, "/init.scope")
+				v1pod.Cgroup = strings.TrimSuffix(cgroup, "/init.scope")
 			}
 		}
 	}
 
-	return pod
-}
-
-func waitForMachinedRegistration(uuid string) error {
-	conn, err := dbus.SystemBus()
-	if err != nil {
-		return err
-	}
-	machined := conn.Object("org.freedesktop.machine1", "/org/freedesktop/machine1")
-	machineName := "rkt-" + uuid
-
-	var o dbus.ObjectPath
-	for i := 0; i < 10; i++ {
-		if err := machined.Call("org.freedesktop.machine1.Manager.GetMachine", 0, machineName).Store(&o); err == nil {
-			return nil
-		}
-		time.Sleep(time.Millisecond * 50)
-	}
-
-	return errors.New("pod not found")
-}
-
-func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPodsRequest) (*v1alpha.ListPodsResponse, error) {
-	var pods []*v1alpha.Pod
-	if err := walkPods(includeMostDirs, func(p *pod) {
-		pod := getBasicPod(p)
-
-		// Filters are combined with 'OR'.
-		if !satisfiesAnyPodFilters(pod, request.Filters) {
-			return
-		}
-
-		if request.Detail {
-			fillAppInfo(s.store, p, pod)
-		} else {
-			pod.Manifest = nil
-		}
-		pods = append(pods, pod)
-	}); err != nil {
-		stderr.PrintE("failed to list pod", err)
-		return nil, err
-	}
-	return &v1alpha.ListPodsResponse{Pods: pods}, nil
-}
-
-// fillAppInfo fills the apps' state and image info of the pod.
-func fillAppInfo(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
-	switch v1pod.State {
-	case v1alpha.PodState_POD_STATE_UNDEFINED:
-		return
-	case v1alpha.PodState_POD_STATE_EMBRYO:
-		return
-	}
-
 	for _, app := range v1pod.Apps {
 		readStatus := false
 
@@ -465,40 +566,7 @@ func fillAppInfo(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
 			app.State = v1alpha.AppState_APP_STATE_UNDEFINED
 		}
 
-		// Fill app's image info (id, name, version).
-		fullImageID, err := store.ResolveKey(app.Image.Id)
-		if err != nil {
-			stderr.PrintE(fmt.Sprintf("failed to resolve the image ID %q", app.Image.Id), err)
-		}
-
-		// The following information is always known
-		app.Image = &v1alpha.Image{
-			BaseFormat: &v1alpha.ImageFormat{
-				// Only support appc image now. If it's a docker image, then it
-				// will be transformed to appc before storing in the disk store.
-				Type:    v1alpha.ImageType_IMAGE_TYPE_APPC,
-				Version: schema.AppContainerVersion.String(),
-			},
-			Id: fullImageID,
-			// Other information are not available because they require the image
-			// info from store. Some of it is filled in below if possible.
-		}
-
-		im, err := p.getAppImageManifest(*types.MustACName(app.Name))
-		if err != nil {
-			stderr.PrintE(fmt.Sprintf("failed to get image manifests for app %q", app.Name), err)
-		} else {
-			app.Image.Name = im.Name.String()
-
-			version, ok := im.Labels.Get("version")
-			if !ok {
-				version = "latest"
-			}
-			app.Image.Version = version
-		}
-
 		if readStatus {
-			// Fill app's state and exit code.
 			statusDir, err := p.getStatusDir()
 			if err != nil {
 				stderr.PrintE("failed to get pod exit status directory", err)
@@ -514,6 +582,30 @@ func fillAppInfo(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
 	}
 }
 
+func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPodsRequest) (*v1alpha.ListPodsResponse, error) {
+	var pods []*v1alpha.Pod
+	if err := walkPods(includeMostDirs, func(p *pod) {
+		pod := s.getBasicPod(p)
+
+		fillPodDetails(s.store, p, pod)
+
+		// Filters are combined with 'OR'.
+		if !satisfiesAnyPodFilters(pod, request.Filters) {
+			return
+		}
+
+		if !request.Detail {
+			pod.Manifest = nil
+		}
+
+		pods = append(pods, pod)
+	}); err != nil {
+		stderr.PrintE("failed to list pod", err)
+		return nil, err
+	}
+	return &v1alpha.ListPodsResponse{Pods: pods}, nil
+}
+
 func (s *v1AlphaAPIServer) InspectPod(ctx context.Context, request *v1alpha.InspectPodRequest) (*v1alpha.InspectPodResponse, error) {
 	uuid, err := types.NewUUID(request.Id)
 	if err != nil {
@@ -528,10 +620,9 @@ func (s *v1AlphaAPIServer) InspectPod(ctx context.Context, request *v1alpha.Insp
 	}
 	defer p.Close()
 
-	pod := getBasicPod(p)
+	pod := s.getBasicPod(p)
 
-	// Fill the extra pod info that is not available in ListPods(detail=false).
-	fillAppInfo(s.store, p, pod)
+	fillPodDetails(s.store, p, pod)
 
 	return &v1alpha.InspectPodResponse{Pod: pod}, nil
 }

From 95dd7937b7110c502a385ed28b7d4d53b5d304d6 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 25 Jul 2016 11:38:09 -0700
Subject: [PATCH 0587/1304] glide: Add hashicorp/golang-lru.

---
 glide.lock                                    |   8 +-
 glide.yaml                                    |   2 +
 vendor/github.com/hashicorp/golang-lru/2q.go  | 212 ++++++++++
 .../github.com/hashicorp/golang-lru/LICENSE   | 362 ++++++++++++++++++
 vendor/github.com/hashicorp/golang-lru/arc.go | 257 +++++++++++++
 vendor/github.com/hashicorp/golang-lru/lru.go | 114 ++++++
 .../hashicorp/golang-lru/simplelru/lru.go     | 160 ++++++++
 7 files changed, 1113 insertions(+), 2 deletions(-)
 create mode 100644 vendor/github.com/hashicorp/golang-lru/2q.go
 create mode 100644 vendor/github.com/hashicorp/golang-lru/LICENSE
 create mode 100644 vendor/github.com/hashicorp/golang-lru/arc.go
 create mode 100644 vendor/github.com/hashicorp/golang-lru/lru.go
 create mode 100644 vendor/github.com/hashicorp/golang-lru/simplelru/lru.go

diff --git a/glide.lock b/glide.lock
index d0ec96f294..ba983b625a 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 3664e0406cca66d626364cc1303ab1d94ff457d8274c3003f982019fafc9a1b8
-updated: 2016-07-22T17:45:52.776583272Z
+hash: e3d37aa49d23e987f708f967f805d4cd176295dbe852b278f325fd9e03b476d7
+updated: 2016-07-25T11:28:59.622207002-07:00
 imports:
 - name: github.com/appc/docker2aci
   version: d77d6e4b99a0d8b6be6f70c623c86ba777110cbd
@@ -181,6 +181,10 @@ imports:
   version: e444e69cbd2e2e3e0749a2f3c717cec491552bbf
 - name: github.com/hashicorp/errwrap
   version: 7554cd9344cec97297fa6649b055a8c98c2a1e55
+- name: github.com/hashicorp/golang-lru
+  version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
+  subpackages:
+  - simplelru
 - name: github.com/hydrogen18/stoppableListener
   version: 2eebd04b47ff393f4bc50b7fcacf8f048994c6fd
 - name: github.com/inconshreveable/mousetrap
diff --git a/glide.yaml b/glide.yaml
index 2f56dcd474..a1cb44f176 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -287,3 +287,5 @@ import:
   version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
   subpackages:
   - spew
+- package: github.com/hashicorp/golang-lru
+  version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
diff --git a/vendor/github.com/hashicorp/golang-lru/2q.go b/vendor/github.com/hashicorp/golang-lru/2q.go
new file mode 100644
index 0000000000..337d963296
--- /dev/null
+++ b/vendor/github.com/hashicorp/golang-lru/2q.go
@@ -0,0 +1,212 @@
+package lru
+
+import (
+	"fmt"
+	"sync"
+
+	"github.com/hashicorp/golang-lru/simplelru"
+)
+
+const (
+	// Default2QRecentRatio is the ratio of the 2Q cache dedicated
+	// to recently added entries that have only been accessed once.
+	Default2QRecentRatio = 0.25
+
+	// Default2QGhostEntries is the default ratio of ghost
+	// entries kept to track entries recently evicted
+	Default2QGhostEntries = 0.50
+)
+
+// TwoQueueCache is a thread-safe fixed size 2Q cache.
+// 2Q is an enhancement over the standard LRU cache
+// in that it tracks both frequently and recently used
+// entries separately. This avoids a burst in access to new
+// entries from evicting frequently used entries. It adds some
+// additional tracking overhead to the standard LRU cache, and is
+// computationally about 2x the cost, and adds some metadata over
+// head. The ARCCache is similar, but does not require setting any
+// parameters.
+type TwoQueueCache struct {
+	size       int
+	recentSize int
+
+	recent      *simplelru.LRU
+	frequent    *simplelru.LRU
+	recentEvict *simplelru.LRU
+	lock        sync.RWMutex
+}
+
+// New2Q creates a new TwoQueueCache using the default
+// values for the parameters.
+func New2Q(size int) (*TwoQueueCache, error) {
+	return New2QParams(size, Default2QRecentRatio, Default2QGhostEntries)
+}
+
+// New2QParams creates a new TwoQueueCache using the provided
+// parameter values.
+func New2QParams(size int, recentRatio float64, ghostRatio float64) (*TwoQueueCache, error) {
+	if size <= 0 {
+		return nil, fmt.Errorf("invalid size")
+	}
+	if recentRatio < 0.0 || recentRatio > 1.0 {
+		return nil, fmt.Errorf("invalid recent ratio")
+	}
+	if ghostRatio < 0.0 || ghostRatio > 1.0 {
+		return nil, fmt.Errorf("invalid ghost ratio")
+	}
+
+	// Determine the sub-sizes
+	recentSize := int(float64(size) * recentRatio)
+	evictSize := int(float64(size) * ghostRatio)
+
+	// Allocate the LRUs
+	recent, err := simplelru.NewLRU(size, nil)
+	if err != nil {
+		return nil, err
+	}
+	frequent, err := simplelru.NewLRU(size, nil)
+	if err != nil {
+		return nil, err
+	}
+	recentEvict, err := simplelru.NewLRU(evictSize, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	// Initialize the cache
+	c := &TwoQueueCache{
+		size:        size,
+		recentSize:  recentSize,
+		recent:      recent,
+		frequent:    frequent,
+		recentEvict: recentEvict,
+	}
+	return c, nil
+}
+
+func (c *TwoQueueCache) Get(key interface{}) (interface{}, bool) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	// Check if this is a frequent value
+	if val, ok := c.frequent.Get(key); ok {
+		return val, ok
+	}
+
+	// If the value is contained in recent, then we
+	// promote it to frequent
+	if val, ok := c.recent.Peek(key); ok {
+		c.recent.Remove(key)
+		c.frequent.Add(key, val)
+		return val, ok
+	}
+
+	// No hit
+	return nil, false
+}
+
+func (c *TwoQueueCache) Add(key, value interface{}) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	// Check if the value is frequently used already,
+	// and just update the value
+	if c.frequent.Contains(key) {
+		c.frequent.Add(key, value)
+		return
+	}
+
+	// Check if the value is recently used, and promote
+	// the value into the frequent list
+	if c.recent.Contains(key) {
+		c.recent.Remove(key)
+		c.frequent.Add(key, value)
+		return
+	}
+
+	// If the value was recently evicted, add it to the
+	// frequently used list
+	if c.recentEvict.Contains(key) {
+		c.ensureSpace(true)
+		c.recentEvict.Remove(key)
+		c.frequent.Add(key, value)
+		return
+	}
+
+	// Add to the recently seen list
+	c.ensureSpace(false)
+	c.recent.Add(key, value)
+	return
+}
+
+// ensureSpace is used to ensure we have space in the cache
+func (c *TwoQueueCache) ensureSpace(recentEvict bool) {
+	// If we have space, nothing to do
+	recentLen := c.recent.Len()
+	freqLen := c.frequent.Len()
+	if recentLen+freqLen < c.size {
+		return
+	}
+
+	// If the recent buffer is larger than
+	// the target, evict from there
+	if recentLen > 0 && (recentLen > c.recentSize || (recentLen == c.recentSize && !recentEvict)) {
+		k, _, _ := c.recent.RemoveOldest()
+		c.recentEvict.Add(k, nil)
+		return
+	}
+
+	// Remove from the frequent list otherwise
+	c.frequent.RemoveOldest()
+}
+
+func (c *TwoQueueCache) Len() int {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	return c.recent.Len() + c.frequent.Len()
+}
+
+func (c *TwoQueueCache) Keys() []interface{} {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	k1 := c.frequent.Keys()
+	k2 := c.recent.Keys()
+	return append(k1, k2...)
+}
+
+func (c *TwoQueueCache) Remove(key interface{}) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+	if c.frequent.Remove(key) {
+		return
+	}
+	if c.recent.Remove(key) {
+		return
+	}
+	if c.recentEvict.Remove(key) {
+		return
+	}
+}
+
+func (c *TwoQueueCache) Purge() {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+	c.recent.Purge()
+	c.frequent.Purge()
+	c.recentEvict.Purge()
+}
+
+func (c *TwoQueueCache) Contains(key interface{}) bool {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	return c.frequent.Contains(key) || c.recent.Contains(key)
+}
+
+func (c *TwoQueueCache) Peek(key interface{}) (interface{}, bool) {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	if val, ok := c.frequent.Peek(key); ok {
+		return val, ok
+	}
+	return c.recent.Peek(key)
+}
diff --git a/vendor/github.com/hashicorp/golang-lru/LICENSE b/vendor/github.com/hashicorp/golang-lru/LICENSE
new file mode 100644
index 0000000000..be2cc4dfb6
--- /dev/null
+++ b/vendor/github.com/hashicorp/golang-lru/LICENSE
@@ -0,0 +1,362 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the terms of
+        a Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a
+     separate file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether
+     at the time of the initial grant or subsequently, any and all of the
+     rights conveyed by this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method,
+      process, and apparatus claims, in any patent Licensable by such
+      Contributor that would be infringed, but for the grant of the License,
+      by the making, using, selling, offering for sale, having made, import,
+      or transfer of either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or
+        as part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its
+        Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution
+     become effective for each Contribution on the date the Contributor first
+     distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under
+     this License. No additional rights or licenses will be implied from the
+     distribution or licensing of Covered Software under this License.
+     Notwithstanding Section 2.1(b) above, no patent license is granted by a
+     Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party's
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of
+        its Contributions.
+
+     This License does not grant any rights in the trademarks, service marks,
+     or logos of any Contributor (except as may be necessary to comply with
+     the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this
+     License (see Section 10.2) or under the terms of a Secondary License (if
+     permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its
+     Contributions are its original creation(s) or it has sufficient rights to
+     grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under
+     applicable copyright doctrines of fair use, fair dealing, or other
+     equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under
+     the terms of this License. You must inform recipients that the Source
+     Code Form of the Covered Software is governed by the terms of this
+     License, and how they can obtain a copy of this License. You may not
+     attempt to alter or restrict the recipients' rights in the Source Code
+     Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this
+        License, or sublicense it under different terms, provided that the
+        license for the Executable Form does not attempt to limit or alter the
+        recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for
+     the Covered Software. If the Larger Work is a combination of Covered
+     Software with a work governed by one or more Secondary Licenses, and the
+     Covered Software is not Incompatible With Secondary Licenses, this
+     License permits You to additionally distribute such Covered Software
+     under the terms of such Secondary License(s), so that the recipient of
+     the Larger Work may, at their option, further distribute the Covered
+     Software under the terms of either this License or such Secondary
+     License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices
+     (including copyright notices, patent notices, disclaimers of warranty, or
+     limitations of liability) contained within the Source Code Form of the
+     Covered Software, except that You may alter any license notices to the
+     extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on
+     behalf of any Contributor. You must make it absolutely clear that any
+     such warranty, support, indemnity, or liability obligation is offered by
+     You alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute,
+   judicial order, or regulation then You must: (a) comply with the terms of
+   this License to the maximum extent possible; and (b) describe the
+   limitations and the code they affect. Such description must be placed in a
+   text file included with all distributions of the Covered Software under
+   this License. Except to the extent prohibited by statute or regulation,
+   such description must be sufficiently detailed for a recipient of ordinary
+   skill to be able to understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing
+     basis, if such Contributor fails to notify You of the non-compliance by
+     some reasonable means prior to 60 days after You have come back into
+     compliance. Moreover, Your grants from a particular Contributor are
+     reinstated on an ongoing basis if such Contributor notifies You of the
+     non-compliance by some reasonable means, this is the first time You have
+     received notice of non-compliance with this License from such
+     Contributor, and You become compliant prior to 30 days after Your receipt
+     of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions,
+     counter-claims, and cross-claims) alleging that a Contributor Version
+     directly or indirectly infringes any patent, then the rights granted to
+     You by any and all Contributors for the Covered Software under Section
+     2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis,
+   without warranty of any kind, either expressed, implied, or statutory,
+   including, without limitation, warranties that the Covered Software is free
+   of defects, merchantable, fit for a particular purpose or non-infringing.
+   The entire risk as to the quality and performance of the Covered Software
+   is with You. Should any Covered Software prove defective in any respect,
+   You (not any Contributor) assume the cost of any necessary servicing,
+   repair, or correction. This disclaimer of warranty constitutes an essential
+   part of this License. No use of  any Covered Software is authorized under
+   this License except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from
+   such party's negligence to the extent applicable law prohibits such
+   limitation. Some jurisdictions do not allow the exclusion or limitation of
+   incidental or consequential damages, so this exclusion and limitation may
+   not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts
+   of a jurisdiction where the defendant maintains its principal place of
+   business and such litigation shall be governed by laws of that
+   jurisdiction, without reference to its conflict-of-law provisions. Nothing
+   in this Section shall prevent a party's ability to bring cross-claims or
+   counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject
+   matter hereof. If any provision of this License is held to be
+   unenforceable, such provision shall be reformed only to the extent
+   necessary to make it enforceable. Any law or regulation which provides that
+   the language of a contract shall be construed against the drafter shall not
+   be used to construe this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version
+      of the License under which You originally received the Covered Software,
+      or under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a
+      modified version of this License if you rename the license and remove
+      any references to the name of the license steward (except to note that
+      such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+      Licenses If You choose to distribute Source Code Form that is
+      Incompatible With Secondary Licenses under the terms of this version of
+      the License, the notice described in Exhibit B of this License must be
+      attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file,
+then You may include the notice in a location (such as a LICENSE file in a
+relevant directory) where a recipient would be likely to look for such a
+notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
diff --git a/vendor/github.com/hashicorp/golang-lru/arc.go b/vendor/github.com/hashicorp/golang-lru/arc.go
new file mode 100644
index 0000000000..a2a2528173
--- /dev/null
+++ b/vendor/github.com/hashicorp/golang-lru/arc.go
@@ -0,0 +1,257 @@
+package lru
+
+import (
+	"sync"
+
+	"github.com/hashicorp/golang-lru/simplelru"
+)
+
+// ARCCache is a thread-safe fixed size Adaptive Replacement Cache (ARC).
+// ARC is an enhancement over the standard LRU cache in that tracks both
+// frequency and recency of use. This avoids a burst in access to new
+// entries from evicting the frequently used older entries. It adds some
+// additional tracking overhead to a standard LRU cache, computationally
+// it is roughly 2x the cost, and the extra memory overhead is linear
+// with the size of the cache. ARC has been patented by IBM, but is
+// similar to the TwoQueueCache (2Q) which requires setting parameters.
+type ARCCache struct {
+	size int // Size is the total capacity of the cache
+	p    int // P is the dynamic preference towards T1 or T2
+
+	t1 *simplelru.LRU // T1 is the LRU for recently accessed items
+	b1 *simplelru.LRU // B1 is the LRU for evictions from t1
+
+	t2 *simplelru.LRU // T2 is the LRU for frequently accessed items
+	b2 *simplelru.LRU // B2 is the LRU for evictions from t2
+
+	lock sync.RWMutex
+}
+
+// NewARC creates an ARC of the given size
+func NewARC(size int) (*ARCCache, error) {
+	// Create the sub LRUs
+	b1, err := simplelru.NewLRU(size, nil)
+	if err != nil {
+		return nil, err
+	}
+	b2, err := simplelru.NewLRU(size, nil)
+	if err != nil {
+		return nil, err
+	}
+	t1, err := simplelru.NewLRU(size, nil)
+	if err != nil {
+		return nil, err
+	}
+	t2, err := simplelru.NewLRU(size, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	// Initialize the ARC
+	c := &ARCCache{
+		size: size,
+		p:    0,
+		t1:   t1,
+		b1:   b1,
+		t2:   t2,
+		b2:   b2,
+	}
+	return c, nil
+}
+
+// Get looks up a key's value from the cache.
+func (c *ARCCache) Get(key interface{}) (interface{}, bool) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	// Ff the value is contained in T1 (recent), then
+	// promote it to T2 (frequent)
+	if val, ok := c.t1.Peek(key); ok {
+		c.t1.Remove(key)
+		c.t2.Add(key, val)
+		return val, ok
+	}
+
+	// Check if the value is contained in T2 (frequent)
+	if val, ok := c.t2.Get(key); ok {
+		return val, ok
+	}
+
+	// No hit
+	return nil, false
+}
+
+// Add adds a value to the cache.
+func (c *ARCCache) Add(key, value interface{}) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	// Check if the value is contained in T1 (recent), and potentially
+	// promote it to frequent T2
+	if c.t1.Contains(key) {
+		c.t1.Remove(key)
+		c.t2.Add(key, value)
+		return
+	}
+
+	// Check if the value is already in T2 (frequent) and update it
+	if c.t2.Contains(key) {
+		c.t2.Add(key, value)
+		return
+	}
+
+	// Check if this value was recently evicted as part of the
+	// recently used list
+	if c.b1.Contains(key) {
+		// T1 set is too small, increase P appropriately
+		delta := 1
+		b1Len := c.b1.Len()
+		b2Len := c.b2.Len()
+		if b2Len > b1Len {
+			delta = b2Len / b1Len
+		}
+		if c.p+delta >= c.size {
+			c.p = c.size
+		} else {
+			c.p += delta
+		}
+
+		// Potentially need to make room in the cache
+		if c.t1.Len()+c.t2.Len() >= c.size {
+			c.replace(false)
+		}
+
+		// Remove from B1
+		c.b1.Remove(key)
+
+		// Add the key to the frequently used list
+		c.t2.Add(key, value)
+		return
+	}
+
+	// Check if this value was recently evicted as part of the
+	// frequently used list
+	if c.b2.Contains(key) {
+		// T2 set is too small, decrease P appropriately
+		delta := 1
+		b1Len := c.b1.Len()
+		b2Len := c.b2.Len()
+		if b1Len > b2Len {
+			delta = b1Len / b2Len
+		}
+		if delta >= c.p {
+			c.p = 0
+		} else {
+			c.p -= delta
+		}
+
+		// Potentially need to make room in the cache
+		if c.t1.Len()+c.t2.Len() >= c.size {
+			c.replace(true)
+		}
+
+		// Remove from B2
+		c.b2.Remove(key)
+
+		// Add the key to the frequntly used list
+		c.t2.Add(key, value)
+		return
+	}
+
+	// Potentially need to make room in the cache
+	if c.t1.Len()+c.t2.Len() >= c.size {
+		c.replace(false)
+	}
+
+	// Keep the size of the ghost buffers trim
+	if c.b1.Len() > c.size-c.p {
+		c.b1.RemoveOldest()
+	}
+	if c.b2.Len() > c.p {
+		c.b2.RemoveOldest()
+	}
+
+	// Add to the recently seen list
+	c.t1.Add(key, value)
+	return
+}
+
+// replace is used to adaptively evict from either T1 or T2
+// based on the current learned value of P
+func (c *ARCCache) replace(b2ContainsKey bool) {
+	t1Len := c.t1.Len()
+	if t1Len > 0 && (t1Len > c.p || (t1Len == c.p && b2ContainsKey)) {
+		k, _, ok := c.t1.RemoveOldest()
+		if ok {
+			c.b1.Add(k, nil)
+		}
+	} else {
+		k, _, ok := c.t2.RemoveOldest()
+		if ok {
+			c.b2.Add(k, nil)
+		}
+	}
+}
+
+// Len returns the number of cached entries
+func (c *ARCCache) Len() int {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	return c.t1.Len() + c.t2.Len()
+}
+
+// Keys returns all the cached keys
+func (c *ARCCache) Keys() []interface{} {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	k1 := c.t1.Keys()
+	k2 := c.t2.Keys()
+	return append(k1, k2...)
+}
+
+// Remove is used to purge a key from the cache
+func (c *ARCCache) Remove(key interface{}) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+	if c.t1.Remove(key) {
+		return
+	}
+	if c.t2.Remove(key) {
+		return
+	}
+	if c.b1.Remove(key) {
+		return
+	}
+	if c.b2.Remove(key) {
+		return
+	}
+}
+
+// Purge is used to clear the cache
+func (c *ARCCache) Purge() {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+	c.t1.Purge()
+	c.t2.Purge()
+	c.b1.Purge()
+	c.b2.Purge()
+}
+
+// Contains is used to check if the cache contains a key
+// without updating recency or frequency.
+func (c *ARCCache) Contains(key interface{}) bool {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	return c.t1.Contains(key) || c.t2.Contains(key)
+}
+
+// Peek is used to inspect the cache value of a key
+// without updating recency or frequency.
+func (c *ARCCache) Peek(key interface{}) (interface{}, bool) {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	if val, ok := c.t1.Peek(key); ok {
+		return val, ok
+	}
+	return c.t2.Peek(key)
+}
diff --git a/vendor/github.com/hashicorp/golang-lru/lru.go b/vendor/github.com/hashicorp/golang-lru/lru.go
new file mode 100644
index 0000000000..a6285f989e
--- /dev/null
+++ b/vendor/github.com/hashicorp/golang-lru/lru.go
@@ -0,0 +1,114 @@
+// This package provides a simple LRU cache. It is based on the
+// LRU implementation in groupcache:
+// https://github.com/golang/groupcache/tree/master/lru
+package lru
+
+import (
+	"sync"
+
+	"github.com/hashicorp/golang-lru/simplelru"
+)
+
+// Cache is a thread-safe fixed size LRU cache.
+type Cache struct {
+	lru  *simplelru.LRU
+	lock sync.RWMutex
+}
+
+// New creates an LRU of the given size
+func New(size int) (*Cache, error) {
+	return NewWithEvict(size, nil)
+}
+
+// NewWithEvict constructs a fixed size cache with the given eviction
+// callback.
+func NewWithEvict(size int, onEvicted func(key interface{}, value interface{})) (*Cache, error) {
+	lru, err := simplelru.NewLRU(size, simplelru.EvictCallback(onEvicted))
+	if err != nil {
+		return nil, err
+	}
+	c := &Cache{
+		lru: lru,
+	}
+	return c, nil
+}
+
+// Purge is used to completely clear the cache
+func (c *Cache) Purge() {
+	c.lock.Lock()
+	c.lru.Purge()
+	c.lock.Unlock()
+}
+
+// Add adds a value to the cache.  Returns true if an eviction occurred.
+func (c *Cache) Add(key, value interface{}) bool {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+	return c.lru.Add(key, value)
+}
+
+// Get looks up a key's value from the cache.
+func (c *Cache) Get(key interface{}) (interface{}, bool) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+	return c.lru.Get(key)
+}
+
+// Check if a key is in the cache, without updating the recent-ness
+// or deleting it for being stale.
+func (c *Cache) Contains(key interface{}) bool {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	return c.lru.Contains(key)
+}
+
+// Returns the key value (or undefined if not found) without updating
+// the "recently used"-ness of the key.
+func (c *Cache) Peek(key interface{}) (interface{}, bool) {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	return c.lru.Peek(key)
+}
+
+// ContainsOrAdd checks if a key is in the cache  without updating the
+// recent-ness or deleting it for being stale,  and if not, adds the value.
+// Returns whether found and whether an eviction occurred.
+func (c *Cache) ContainsOrAdd(key, value interface{}) (ok, evict bool) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	if c.lru.Contains(key) {
+		return true, false
+	} else {
+		evict := c.lru.Add(key, value)
+		return false, evict
+	}
+}
+
+// Remove removes the provided key from the cache.
+func (c *Cache) Remove(key interface{}) {
+	c.lock.Lock()
+	c.lru.Remove(key)
+	c.lock.Unlock()
+}
+
+// RemoveOldest removes the oldest item from the cache.
+func (c *Cache) RemoveOldest() {
+	c.lock.Lock()
+	c.lru.RemoveOldest()
+	c.lock.Unlock()
+}
+
+// Keys returns a slice of the keys in the cache, from oldest to newest.
+func (c *Cache) Keys() []interface{} {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	return c.lru.Keys()
+}
+
+// Len returns the number of items in the cache.
+func (c *Cache) Len() int {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	return c.lru.Len()
+}
diff --git a/vendor/github.com/hashicorp/golang-lru/simplelru/lru.go b/vendor/github.com/hashicorp/golang-lru/simplelru/lru.go
new file mode 100644
index 0000000000..68d097a1c0
--- /dev/null
+++ b/vendor/github.com/hashicorp/golang-lru/simplelru/lru.go
@@ -0,0 +1,160 @@
+package simplelru
+
+import (
+	"container/list"
+	"errors"
+)
+
+// EvictCallback is used to get a callback when a cache entry is evicted
+type EvictCallback func(key interface{}, value interface{})
+
+// LRU implements a non-thread safe fixed size LRU cache
+type LRU struct {
+	size      int
+	evictList *list.List
+	items     map[interface{}]*list.Element
+	onEvict   EvictCallback
+}
+
+// entry is used to hold a value in the evictList
+type entry struct {
+	key   interface{}
+	value interface{}
+}
+
+// NewLRU constructs an LRU of the given size
+func NewLRU(size int, onEvict EvictCallback) (*LRU, error) {
+	if size <= 0 {
+		return nil, errors.New("Must provide a positive size")
+	}
+	c := &LRU{
+		size:      size,
+		evictList: list.New(),
+		items:     make(map[interface{}]*list.Element),
+		onEvict:   onEvict,
+	}
+	return c, nil
+}
+
+// Purge is used to completely clear the cache
+func (c *LRU) Purge() {
+	for k, v := range c.items {
+		if c.onEvict != nil {
+			c.onEvict(k, v.Value.(*entry).value)
+		}
+		delete(c.items, k)
+	}
+	c.evictList.Init()
+}
+
+// Add adds a value to the cache.  Returns true if an eviction occured.
+func (c *LRU) Add(key, value interface{}) bool {
+	// Check for existing item
+	if ent, ok := c.items[key]; ok {
+		c.evictList.MoveToFront(ent)
+		ent.Value.(*entry).value = value
+		return false
+	}
+
+	// Add new item
+	ent := &entry{key, value}
+	entry := c.evictList.PushFront(ent)
+	c.items[key] = entry
+
+	evict := c.evictList.Len() > c.size
+	// Verify size not exceeded
+	if evict {
+		c.removeOldest()
+	}
+	return evict
+}
+
+// Get looks up a key's value from the cache.
+func (c *LRU) Get(key interface{}) (value interface{}, ok bool) {
+	if ent, ok := c.items[key]; ok {
+		c.evictList.MoveToFront(ent)
+		return ent.Value.(*entry).value, true
+	}
+	return
+}
+
+// Check if a key is in the cache, without updating the recent-ness
+// or deleting it for being stale.
+func (c *LRU) Contains(key interface{}) (ok bool) {
+	_, ok = c.items[key]
+	return ok
+}
+
+// Returns the key value (or undefined if not found) without updating
+// the "recently used"-ness of the key.
+func (c *LRU) Peek(key interface{}) (value interface{}, ok bool) {
+	if ent, ok := c.items[key]; ok {
+		return ent.Value.(*entry).value, true
+	}
+	return nil, ok
+}
+
+// Remove removes the provided key from the cache, returning if the
+// key was contained.
+func (c *LRU) Remove(key interface{}) bool {
+	if ent, ok := c.items[key]; ok {
+		c.removeElement(ent)
+		return true
+	}
+	return false
+}
+
+// RemoveOldest removes the oldest item from the cache.
+func (c *LRU) RemoveOldest() (interface{}, interface{}, bool) {
+	ent := c.evictList.Back()
+	if ent != nil {
+		c.removeElement(ent)
+		kv := ent.Value.(*entry)
+		return kv.key, kv.value, true
+	}
+	return nil, nil, false
+}
+
+// GetOldest returns the oldest entry
+func (c *LRU) GetOldest() (interface{}, interface{}, bool) {
+	ent := c.evictList.Back()
+	if ent != nil {
+		kv := ent.Value.(*entry)
+		return kv.key, kv.value, true
+	}
+	return nil, nil, false
+}
+
+// Keys returns a slice of the keys in the cache, from oldest to newest.
+func (c *LRU) Keys() []interface{} {
+	keys := make([]interface{}, len(c.items))
+	i := 0
+	for ent := c.evictList.Back(); ent != nil; ent = ent.Prev() {
+		keys[i] = ent.Value.(*entry).key
+		i++
+	}
+	return keys
+}
+
+// Len returns the number of items in the cache.
+func (c *LRU) Len() int {
+	return c.evictList.Len()
+}
+
+// removeOldest removes the oldest item from the cache.
+func (c *LRU) removeOldest() {
+	ent := c.evictList.Back()
+	if ent != nil {
+		c.removeElement(ent)
+	}
+}
+
+// removeElement is used to remove a given list element from the cache
+func (c *LRU) removeElement(e *list.Element) {
+	c.evictList.Remove(e)
+	kv := e.Value.(*entry)
+	delete(c.items, kv.key)
+	if c.onEvict != nil {
+		c.onEvict(kv.key, kv.value)
+	}
+}

From d3471db683ad82097e5ed732ae90f233c8a49a1d Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Wed, 27 Jul 2016 18:20:07 -0700
Subject: [PATCH 0588/1304] api_service: Remove ResolveKey(), assumes full-size
 hashes as ID.

---
 rkt/api_service.go | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 751251ea72..0d4b3654cc 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -359,14 +359,7 @@ func fillStaticAppInfo(store *imagestore.Store, pod *pod, v1pod *v1alpha.Pod) er
 
 	// Fill static app image info.
 	for _, app := range v1pod.Apps {
-		// Fill app's image info (id, name, version).
-		fullImageID, err := store.ResolveKey(app.Image.Id)
-		if err != nil {
-			stderr.PrintE(fmt.Sprintf("failed to resolve the image ID %q", app.Image.Id), err)
-			errlist = append(errlist, err)
-		}
-
-		// The following information is always known
+		// Fill app's image info.
 		app.Image = &v1alpha.Image{
 			BaseFormat: &v1alpha.ImageFormat{
 				// Only support appc image now. If it's a docker image, then it
@@ -374,7 +367,7 @@ func fillStaticAppInfo(store *imagestore.Store, pod *pod, v1pod *v1alpha.Pod) er
 				Type:    v1alpha.ImageType_IMAGE_TYPE_APPC,
 				Version: schema.AppContainerVersion.String(),
 			},
-			Id: fullImageID,
+			Id: app.Image.Id,
 			// Other information are not available because they require the image
 			// info from store. Some of it is filled in below if possible.
 		}
@@ -801,21 +794,15 @@ func (s *v1AlphaAPIServer) ListImages(ctx context.Context, request *v1alpha.List
 
 // getImageInfo for a given image ID, returns the *v1alpha.Image object.
 func getImageInfo(store *imagestore.Store, imageID string) (*v1alpha.Image, error) {
-	key, err := store.ResolveKey(imageID)
-	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to resolve the image ID %q", imageID), err)
-		return nil, err
-	}
-
-	aciInfo, err := store.GetACIInfoWithBlobKey(key)
+	aciInfo, err := store.GetACIInfoWithBlobKey(imageID)
 	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to get ACI info for image %q", key), err)
+		stderr.PrintE(fmt.Sprintf("failed to get ACI info for image %q", imageID), err)
 		return nil, err
 	}
 
 	image, err := aciInfoToV1AlphaAPIImage(store, aciInfo)
 	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to convert ACI to v1alphaAPIImage for image %q", key), err)
+		stderr.PrintE(fmt.Sprintf("failed to convert ACI to v1alphaAPIImage for image %q", imageID), err)
 		return nil, err
 	}
 	return image, nil

From b41b1e2d137138f8863917249d49c87fca98c0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 28 Jul 2016 12:11:52 +0200
Subject: [PATCH 0589/1304] glide: bump docker2aci to v0.12.2

Fixes a bug where the converted Image Manifest had the wrong fields.
---
 glide.lock                                                  | 6 +++---
 glide.yaml                                                  | 2 +-
 .../lib/internal/backend/repository/repository2.go          | 2 +-
 vendor/github.com/appc/docker2aci/lib/version.go            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/glide.lock b/glide.lock
index ba983b625a..f16535263a 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: e3d37aa49d23e987f708f967f805d4cd176295dbe852b278f325fd9e03b476d7
-updated: 2016-07-25T11:28:59.622207002-07:00
+hash: 921b4843584237d360fb529fb07e2ba9e869968232e61db80e120c1fa4a15e8b
+updated: 2016-07-28T12:11:29.703586483+02:00
 imports:
 - name: github.com/appc/docker2aci
-  version: d77d6e4b99a0d8b6be6f70c623c86ba777110cbd
+  version: 90dfcf166a2967b926e77e4864fb616dc291c026
   subpackages:
   - lib
   - lib/common
diff --git a/glide.yaml b/glide.yaml
index a1cb44f176..7d78783e12 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.12.1
+  version: v0.12.2
   subpackages:
   - lib
   - lib/common
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
index fc12677b8e..ecd1c22e89 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -345,7 +345,7 @@ func (rb *RepositoryBackend) getManifestV21(dockerURL *types.ParsedDockerURL, re
 	layers := make([]string, len(manifest.FSLayers))
 
 	for i, layer := range manifest.FSLayers {
-		rb.reverseLayers[layer.BlobSum] = i
+		rb.reverseLayers[layer.BlobSum] = len(manifest.FSLayers) - 1 - i
 		layers[i] = layer.BlobSum
 	}
 
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index 862e861ee1..4b42806939 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.12.1"
+var Version = "0.12.2"
 var AppcVersion = schema.AppContainerVersion

From 3c0c37971122b06d71653832efe70d55684f737d Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Wed, 27 Jul 2016 17:13:47 +0200
Subject: [PATCH 0590/1304] pkg/tar/chroot: avoid errwrap in function called by
 multicall

When a function is called by multicall, it is not possible to use errwrap
because the log pkg is not initialized yet. Also initialize the log pkg will
not show the correct indentation in the log because the new process will
start printing from the most left.

Fixes https://github.com/coreos/rkt/issues/2984
---
 pkg/tar/chroot.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/tar/chroot.go b/pkg/tar/chroot.go
index d835fdd155..f678b2f731 100644
--- a/pkg/tar/chroot.go
+++ b/pkg/tar/chroot.go
@@ -43,6 +43,7 @@ func init() {
 	mcEntrypoint = multicall.Add(multicallName, extractTarCommand)
 }
 
+// Because this function is executed by multicall in a different process, it is not possible to use errwrap to return errors
 func extractTarCommand() error {
 	if len(os.Args) != 5 {
 		return fmt.Errorf("incorrect number of arguments. Usage: %s DIR {true|false} uidShift uidCount", multicallName)
@@ -56,38 +57,38 @@ func extractTarCommand() error {
 	}
 	overwrite, err := strconv.ParseBool(os.Args[2])
 	if err != nil {
-		return errwrap.Wrap(errors.New("error parsing overwrite argument"), err)
+		return fmt.Errorf("error parsing overwrite argument: %v", err)
 	}
 
 	us, err := strconv.ParseUint(os.Args[3], 10, 32)
 	if err != nil {
-		return errwrap.Wrap(errors.New("error parsing uidShift argument"), err)
+		return fmt.Errorf("error parsing uidShift argument: %v", err)
 	}
 	uc, err := strconv.ParseUint(os.Args[4], 10, 32)
 	if err != nil {
-		return errwrap.Wrap(errors.New("error parsing uidShift argument"), err)
+		return fmt.Errorf("error parsing uidShift argument: %v", err)
 	}
 
 	uidRange := &user.UidRange{Shift: uint32(us), Count: uint32(uc)}
 
 	if err := syscall.Chroot(dir); err != nil {
-		return errwrap.Wrap(fmt.Errorf("failed to chroot in %s", dir), err)
+		return fmt.Errorf("failed to chroot in %s: %v", dir, err)
 	}
 	if err := syscall.Chdir("/"); err != nil {
-		return errwrap.Wrap(errors.New("failed to chdir"), err)
+		return fmt.Errorf("failed to chdir: %v", err)
 	}
 	fileMapFile := os.NewFile(uintptr(fileMapFdNum), "fileMap")
 
 	fileMap := map[string]struct{}{}
 	if err := json.NewDecoder(fileMapFile).Decode(&fileMap); err != nil {
-		return errwrap.Wrap(errors.New("error decoding fileMap"), err)
+		return fmt.Errorf("error decoding fileMap: %v", err)
 	}
 	editor, err := NewUidShiftingFilePermEditor(uidRange)
 	if err != nil {
-		return errwrap.Wrap(errors.New("error determining current user"), err)
+		return fmt.Errorf("error determining current user: %v", err)
 	}
 	if err := ExtractTarInsecure(tar.NewReader(os.Stdin), "/", overwrite, fileMap, editor); err != nil {
-		return errwrap.Wrap(errors.New("error extracting tar"), err)
+		return fmt.Errorf("error extracting tar: %v", err)
 	}
 
 	// flush remaining bytes

From 3c21c4a4849e3ce0982e72c72f1f007992646ee9 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Thu, 28 Jul 2016 13:32:38 +0200
Subject: [PATCH 0591/1304] pkg/tar: enhance error message in
 ExtractTarInsecure()

Sometimes tests fail on `ExtractTarInsecure()` and the error message was not clear
enough to reproduce the fail. In case of error from `extractFile()` or `UtimesNano()`,
`ExtractTarInsecure()` adds the file name to the returned error.
---
 pkg/tar/tar.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/tar/tar.go b/pkg/tar/tar.go
index 0c2c1eafb4..3c7889492f 100644
--- a/pkg/tar/tar.go
+++ b/pkg/tar/tar.go
@@ -93,7 +93,7 @@ Tar:
 			}
 			err = extractFile(tr, target, hdr, overwrite, editor)
 			if err != nil {
-				return err
+				return fmt.Errorf("could not extract file %q in %q: %v", hdr.Name, target, err)
 			}
 			if hdr.Typeflag == tar.TypeDir {
 				dirhdrs = append(dirhdrs, hdr)
@@ -108,7 +108,7 @@ Tar:
 	for _, hdr := range dirhdrs {
 		p := filepath.Join(target, hdr.Name)
 		if err := syscall.UtimesNano(p, HdrToTimespec(hdr)); err != nil {
-			return err
+			return fmt.Errorf("UtimesNano failed on %q: %v", p, err)
 		}
 	}
 	return nil

From 516ebc955ffa4f426c7884b7f2a4d005f77cbd18 Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Fri, 15 Jul 2016 10:24:29 +0200
Subject: [PATCH 0592/1304] httpfetcher: check Cache-Control max-age inside
 remote fetching

The fetcher refactor in #1763 moved Cache-Control max-age check
inside the store caching logic, instead it should live in the transport
logic (currently colled "remote"), like the ETag handling.

This made the behavior different from the explained image fetching
behavior and will cause redownloading an image when using `--no-store`
regardless of the Cache-Control max-age value.

Also fix the maybeUseCached function since it's wrong to check the
returned cache-control max-age information. The check should be done with
the current max-age saved in the remote (before the http fetching).

A functional test has been added.
---
 rkt/image/fetcher.go     | 29 ++++------------------
 rkt/image/httpfetcher.go | 13 +++++++---
 tests/rkt_auth_test.go   |  7 ++++++
 tests/rkt_fetch_test.go  | 53 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index 928ffd7a94..a4f1db2169 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -143,13 +143,6 @@ func (f *Fetcher) fetchSingleImage(img string, a *asc, imgType apps.AppImageType
 	}
 }
 
-type remoteCheck int
-
-const (
-	remoteCheckLax remoteCheck = iota
-	remoteCheckStrict
-)
-
 func (f *Fetcher) fetchSingleImageByURL(urlStr string, a *asc) (string, error) {
 	u, err := url.Parse(urlStr)
 	if err != nil {
@@ -175,7 +168,7 @@ func (f *Fetcher) fetchSingleImageByHTTPURL(u *url.URL, a *asc) (string, error)
 	if err != nil {
 		return "", err
 	}
-	if h := f.maybeCheckRemoteFromStore(rem, remoteCheckStrict); h != "" {
+	if h := f.maybeCheckRemoteFromStore(rem); h != "" {
 		return h, nil
 	}
 	if h, err := f.maybeFetchHTTPURLFromRemote(rem, u, a); h != "" || err != nil {
@@ -189,9 +182,7 @@ func (f *Fetcher) fetchSingleImageByDockerURL(u *url.URL) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	// TODO(krnowak): use strict checking when we implement
-	// setting CacheMaxAge in store.Remote for docker images
-	if h := f.maybeCheckRemoteFromStore(rem, remoteCheckLax); h != "" {
+	if h := f.maybeCheckRemoteFromStore(rem); h != "" {
 		return h, nil
 	}
 	if h, err := f.maybeFetchDockerURLFromRemote(u); h != "" || err != nil {
@@ -213,22 +204,12 @@ func (f *Fetcher) getRemoteForURL(u *url.URL) (*imagestore.Remote, error) {
 	return nil, nil
 }
 
-func (f *Fetcher) maybeCheckRemoteFromStore(rem *imagestore.Remote, check remoteCheck) string {
+func (f *Fetcher) maybeCheckRemoteFromStore(rem *imagestore.Remote) string {
 	if f.NoStore || rem == nil {
 		return ""
 	}
-	useBlobKey := false
-	switch check {
-	case remoteCheckLax:
-		useBlobKey = true
-	case remoteCheckStrict:
-		useBlobKey = useCached(rem.DownloadTime, rem.CacheMaxAge)
-	}
-	if useBlobKey {
-		log.Printf("using image from local store for url %s", rem.ACIURL)
-		return rem.BlobKey
-	}
-	return ""
+	log.Printf("using image from local store for url %s", rem.ACIURL)
+	return rem.BlobKey
 }
 
 func (f *Fetcher) maybeFetchHTTPURLFromRemote(rem *imagestore.Remote, u *url.URL, a *asc) (string, error) {
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index 7330e31828..3a891476a9 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -44,6 +44,15 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 	ensureLogger(f.Debug)
 	urlStr := u.String()
 
+	if f.Rem != nil {
+		if useCached(f.Rem.DownloadTime, f.Rem.CacheMaxAge) {
+			if f.Debug {
+				log.Printf("image for %s isn't expired, not fetching.", urlStr)
+			}
+			return f.Rem.BlobKey, nil
+		}
+	}
+
 	if f.Debug {
 		log.Printf("fetching image from %s", urlStr)
 	}
@@ -53,6 +62,7 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 		return "", err
 	}
 	defer func() { maybeClose(aciFile) }()
+
 	if key := f.maybeUseCached(cd); key != "" {
 		// TODO(krnowak): that does not update the store with
 		// the new CacheMaxAge and Download Time, so it will
@@ -93,9 +103,6 @@ func (f *httpFetcher) maybeUseCached(cd *cacheData) string {
 	if cd.UseCached {
 		return f.Rem.BlobKey
 	}
-	if useCached(f.Rem.DownloadTime, cd.MaxAge) {
-		return f.Rem.BlobKey
-	}
 	return ""
 }
 
diff --git a/tests/rkt_auth_test.go b/tests/rkt_auth_test.go
index f4c1c49e24..4299b3bbf0 100644
--- a/tests/rkt_auth_test.go
+++ b/tests/rkt_auth_test.go
@@ -106,6 +106,7 @@ func TestAuthOverride(t *testing.T) {
 	defer ctx.Cleanup()
 	server, image := runAuthServer(t, taas.AuthOauth)
 	defer authCleanup(server, image)
+	hash := "sha512-" + getHashOrPanic(image)
 	tests := []struct {
 		systemConfig         string
 		localConfig          string
@@ -119,6 +120,12 @@ func TestAuthOverride(t *testing.T) {
 	for _, tt := range tests {
 		writeConfig(t, authDir(ctx.SystemDir()), "test.json", tt.systemConfig)
 		expectedRunRkt(ctx, t, server.URL, tt.name+"-1", tt.resultBeforeOverride)
+		if tt.resultBeforeOverride == authSuccessfulDownload {
+			// Remove the image from the store since it was fetched in the
+			// previous run and the test aci-server returns a
+			// Cache-Control max-age header
+			removeFromCas(t, ctx, hash)
+		}
 		writeConfig(t, authDir(ctx.LocalDir()), "test.json", tt.localConfig)
 		expectedRunRkt(ctx, t, server.URL, tt.name+"-2", tt.resultAfterOverride)
 		ctx.Reset()
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 86c080b256..924fd40358 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -217,6 +217,59 @@ func testFetchNoStore(t *testing.T, args string, image string, imageArgs string,
 	}
 }
 
+func TestFetchNoStoreCacheControl(t *testing.T) {
+	imageName := "rkt-inspect-fetch-nostore-cachecontrol"
+	imageFileName := fmt.Sprintf("%s.aci", imageName)
+	// no spaces between words, because of an actool limitation
+	successMsg := "deferredSignatureDownloadWasSuccessful"
+
+	args := []string{
+		fmt.Sprintf("--exec=/inspect --print-msg='%s'", successMsg),
+		fmt.Sprintf("--name=%s", imageName),
+	}
+	image := patchTestACI(imageFileName, args...)
+	defer os.Remove(image)
+
+	asc := runSignImage(t, image, 1)
+	defer os.Remove(asc)
+	ascBase := filepath.Base(asc)
+
+	setup := taas.GetDefaultServerSetup()
+	setup.Server = taas.ServerQuay
+	server := runServer(t, setup)
+	defer server.Close()
+	fileSet := make(map[string]string, 2)
+	fileSet[imageFileName] = image
+	fileSet[ascBase] = asc
+	if err := server.UpdateFileSet(fileSet); err != nil {
+		t.Fatalf("Failed to populate a file list in test aci server: %v", err)
+	}
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	runRktTrust(t, ctx, "", 1)
+
+	tests := []struct {
+		imageArg string
+		imageURL string
+	}{
+		{"https://127.0.0.1/" + imageFileName, "https://127.0.0.1/" + imageFileName},
+	}
+
+	for _, tt := range tests {
+		cmd := fmt.Sprintf("%s --no-store --debug --insecure-options=tls,image fetch %s", ctx.Cmd(), tt.imageArg)
+		expectedMessage := fmt.Sprintf("fetching image from %s", tt.imageURL)
+		runRktAndCheckRegexOutput(t, cmd, expectedMessage)
+
+		cmd = fmt.Sprintf("%s --no-store --debug --insecure-options=tls,image fetch %s", ctx.Cmd(), tt.imageArg)
+		expectedMessage = fmt.Sprintf("image for %s isn't expired, not fetching.", tt.imageURL)
+		runRktAndCheckRegexOutput(t, cmd, expectedMessage)
+
+		ctx.Reset()
+	}
+}
+
 type synchronizedBool struct {
 	value bool
 	lock  sync.Mutex

From 292a009463b3873a0f2f038f3ec61e2fb6586308 Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Fri, 22 Jul 2016 10:30:12 +0200
Subject: [PATCH 0593/1304] namefetcher: Honor http Cache-Control max-age

The fetcher refactor in #1763 removed the http caching checks but left
them only in the http fetcher.

This patch adds the same logic also to the namefetcher and extends the
functional test to also check fetching by appc name.

In the meantime (it won't affect anything since there's no way to
currently ask for it) change the meaning of Fetcher.NoCache to not disable both store and
transport cache but only disable transport cache. This is a more logical
one and decoupled from the store as it should be.
---
 rkt/image/common.go      | 34 ++++++++++++++++++++++++++++---
 rkt/image/fetcher.go     | 18 +++--------------
 rkt/image/httpfetcher.go | 24 ++++------------------
 rkt/image/namefetcher.go | 43 ++++++++++++++++++++++++++++++----------
 tests/rkt_fetch_test.go  |  1 +
 5 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/rkt/image/common.go b/rkt/image/common.go
index a659f72519..15ce861de8 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -30,6 +30,7 @@ import (
 	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/coreos/rkt/store/treestore"
+	"github.com/hashicorp/errwrap"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -65,10 +66,10 @@ type action struct {
 	// local filesystem or a remote location.
 	StoreOnly bool
 	// NoStore tells whether to avoid getting images from the
-	// store. Note that the store can be still used as a cache.
+	// store. Note that transport caching (like http Etags) can be still
+	// used to avoid refetching.
 	NoStore bool
-	// NoCache tells to avoid getting images from the store
-	// completely.
+	// NoCache tells to ignore transport caching.
 	NoCache bool
 	// WithDeps tells whether image dependencies should be
 	// downloaded too.
@@ -202,3 +203,30 @@ func guessImageType(image string) apps.AppImageType {
 	// treat this as an image name otherwise.
 	return apps.AppImageName
 }
+
+func eTag(rem *imagestore.Remote) string {
+	if rem != nil {
+		return rem.ETag
+	}
+	return ""
+}
+
+func maybeUseCached(rem *imagestore.Remote, cd *cacheData) string {
+	if rem == nil || cd == nil {
+		return ""
+	}
+	if cd.UseCached {
+		return rem.BlobKey
+	}
+	return ""
+}
+
+func remoteForURL(s *imagestore.Store, u *url.URL) (*imagestore.Remote, error) {
+	urlStr := u.String()
+	if rem, ok, err := s.GetRemote(urlStr); err != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("failed to fetch remote for URL %q", urlStr), err)
+	} else if ok {
+		return rem, nil
+	}
+	return nil, nil
+}
diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index a4f1db2169..245f082b0f 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -164,7 +164,7 @@ func (f *Fetcher) fetchSingleImageByURL(urlStr string, a *asc) (string, error) {
 }
 
 func (f *Fetcher) fetchSingleImageByHTTPURL(u *url.URL, a *asc) (string, error) {
-	rem, err := f.getRemoteForURL(u)
+	rem, err := remoteForURL(f.S, u)
 	if err != nil {
 		return "", err
 	}
@@ -178,7 +178,7 @@ func (f *Fetcher) fetchSingleImageByHTTPURL(u *url.URL, a *asc) (string, error)
 }
 
 func (f *Fetcher) fetchSingleImageByDockerURL(u *url.URL) (string, error) {
-	rem, err := f.getRemoteForURL(u)
+	rem, err := remoteForURL(f.S, u)
 	if err != nil {
 		return "", err
 	}
@@ -191,19 +191,6 @@ func (f *Fetcher) fetchSingleImageByDockerURL(u *url.URL) (string, error) {
 	return "", fmt.Errorf("unable to fetch docker image from URL %q: either image was not found in the store or store was disabled and fetching from remote yielded nothing or it was disabled", u.String())
 }
 
-func (f *Fetcher) getRemoteForURL(u *url.URL) (*imagestore.Remote, error) {
-	if f.NoCache {
-		return nil, nil
-	}
-	urlStr := u.String()
-	if rem, ok, err := f.S.GetRemote(urlStr); err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("failed to fetch URL %q", urlStr), err)
-	} else if ok {
-		return rem, nil
-	}
-	return nil, nil
-}
-
 func (f *Fetcher) maybeCheckRemoteFromStore(rem *imagestore.Remote) string {
 	if f.NoStore || rem == nil {
 		return ""
@@ -333,6 +320,7 @@ func (f *Fetcher) maybeFetchImageFromRemote(app *appBundle, a *asc) (string, err
 			InsecureFlags:      f.InsecureFlags,
 			S:                  f.S,
 			Ks:                 f.Ks,
+			NoCache:            f.NoCache,
 			Debug:              f.Debug,
 			Headers:            f.Headers,
 			TrustKeysFromHTTPS: f.TrustKeysFromHTTPS,
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index 3a891476a9..7b3ffee2d7 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -34,6 +34,7 @@ type httpFetcher struct {
 	S             *imagestore.Store
 	Ks            *keystore.Keystore
 	Rem           *imagestore.Remote
+	NoCache       bool
 	Debug         bool
 	Headers       map[string]config.Headerer
 }
@@ -44,7 +45,7 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 	ensureLogger(f.Debug)
 	urlStr := u.String()
 
-	if f.Rem != nil {
+	if !f.NoCache && f.Rem != nil {
 		if useCached(f.Rem.DownloadTime, f.Rem.CacheMaxAge) {
 			if f.Debug {
 				log.Printf("image for %s isn't expired, not fetching.", urlStr)
@@ -57,13 +58,13 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 		log.Printf("fetching image from %s", urlStr)
 	}
 
-	aciFile, cd, err := f.fetchURL(u, a, f.eTag())
+	aciFile, cd, err := f.fetchURL(u, a, eTag(f.Rem))
 	if err != nil {
 		return "", err
 	}
 	defer func() { maybeClose(aciFile) }()
 
-	if key := f.maybeUseCached(cd); key != "" {
+	if key := maybeUseCached(f.Rem, cd); key != "" {
 		// TODO(krnowak): that does not update the store with
 		// the new CacheMaxAge and Download Time, so it will
 		// query the server every time after initial
@@ -96,16 +97,6 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 	return key, nil
 }
 
-func (f *httpFetcher) maybeUseCached(cd *cacheData) string {
-	if f.Rem == nil || cd == nil {
-		return ""
-	}
-	if cd.UseCached {
-		return f.Rem.BlobKey
-	}
-	return ""
-}
-
 func (f *httpFetcher) fetchURL(u *url.URL, a *asc, etag string) (readSeekCloser, *cacheData, error) {
 	if f.InsecureFlags.SkipTLSCheck() && f.Ks != nil {
 		log.Printf("warning: TLS verification has been disabled")
@@ -185,13 +176,6 @@ func (f *httpFetcher) validate(aciFile, ascFile io.ReadSeeker) error {
 	return nil
 }
 
-func (f *httpFetcher) eTag() string {
-	if f.Rem != nil {
-		return f.Rem.ETag
-	}
-	return ""
-}
-
 func (f *httpFetcher) maybeOverrideAscFetcherWithRemote(o *httpOps, u *url.URL, a *asc) {
 	if a.Fetcher != nil {
 		return
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 5369c7261b..7d0d0fefc1 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -38,6 +38,7 @@ type nameFetcher struct {
 	InsecureFlags      *rktflag.SecFlags
 	S                  *imagestore.Store
 	Ks                 *keystore.Keystore
+	NoCache            bool
 	Debug              bool
 	Headers            map[string]config.Headerer
 	TrustKeysFromHTTPS bool
@@ -102,12 +103,32 @@ func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL st
 		log.Printf("fetching image from %s", aciURL)
 	}
 
-	aciFile, cd, err := f.fetch(app, aciURL, a)
+	u, err := url.Parse(aciURL)
+	if err != nil {
+		return "", errwrap.Wrap(fmt.Errorf("failed to parse URL %q", aciURL), err)
+	}
+	rem, err := remoteForURL(f.S, u)
 	if err != nil {
 		return "", err
 	}
-	defer aciFile.Close()
+	if !f.NoCache && rem != nil {
+		if useCached(rem.DownloadTime, rem.CacheMaxAge) {
+			if f.Debug {
+				log.Printf("image for %s isn't expired, not fetching.", aciURL)
+			}
+			return rem.BlobKey, nil
+		}
+	}
 
+	aciFile, cd, err := f.fetch(app, aciURL, a, eTag(rem))
+	if err != nil {
+		return "", err
+	}
+	defer func() { maybeClose(aciFile) }()
+
+	if key := maybeUseCached(rem, cd); key != "" {
+		return key, nil
+	}
 	key, err := f.S.WriteACI(aciFile, imagestore.ACIFetchInfo{
 		Latest:          latest,
 		InsecureOptions: int64(f.InsecureFlags.Value()),
@@ -116,12 +137,14 @@ func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL st
 		return "", err
 	}
 
-	rem := imagestore.NewRemote(aciURL, a.Location)
-	rem.BlobKey = key
-	rem.DownloadTime = time.Now()
-	rem.ETag = cd.ETag
-	rem.CacheMaxAge = cd.MaxAge
-	err = f.S.WriteRemote(rem)
+	newRem := imagestore.NewRemote(aciURL, a.Location)
+	newRem.BlobKey = key
+	newRem.DownloadTime = time.Now()
+	if cd != nil {
+		newRem.ETag = cd.ETag
+		newRem.CacheMaxAge = cd.MaxAge
+	}
+	err = f.S.WriteRemote(newRem)
 	if err != nil {
 		return "", err
 	}
@@ -129,7 +152,7 @@ func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL st
 	return key, nil
 }
 
-func (f *nameFetcher) fetch(app *discovery.App, aciURL string, a *asc) (readSeekCloser, *cacheData, error) {
+func (f *nameFetcher) fetch(app *discovery.App, aciURL string, a *asc, etag string) (readSeekCloser, *cacheData, error) {
 	if f.InsecureFlags.SkipTLSCheck() && f.Ks != nil {
 		log.Print("warning: TLS verification has been disabled")
 	}
@@ -144,7 +167,7 @@ func (f *nameFetcher) fetch(app *discovery.App, aciURL string, a *asc) (readSeek
 
 	if f.InsecureFlags.SkipImageCheck() || f.Ks == nil {
 		o := f.httpOps()
-		aciFile, cd, err := o.DownloadImage(u)
+		aciFile, cd, err := o.DownloadImageWithETag(u, etag)
 		if err != nil {
 			return nil, nil, err
 		}
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 924fd40358..5dd470d65f 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -255,6 +255,7 @@ func TestFetchNoStoreCacheControl(t *testing.T) {
 		imageURL string
 	}{
 		{"https://127.0.0.1/" + imageFileName, "https://127.0.0.1/" + imageFileName},
+		{"localhost/" + imageName, "https://127.0.0.1:443/localhost/" + imageFileName},
 	}
 
 	for _, tt := range tests {

From 65fc1fb935acdaade143243128cfcc38c1260cb3 Mon Sep 17 00:00:00 2001
From: Akshay Karle <akshay.a.karle@gmail.com>
Date: Mon, 18 Jul 2016 22:53:37 -0400
Subject: [PATCH 0594/1304] scripts: add /etc/rkt owned by group rkt-admin in
 setup-data-dir.sh

Fixes the immediate problem with `scripts/setup-data-dir.sh` being out
of sync with `init/systemd/tmpfiles.d/rkt.conf`(#2862).

This doesn't include the tips mentioned by @lucab in the issue. I'm
working on it. Just wanted to take a first stab to fix the problem for
now while I work on the rest of the points mentioned in #2862 to make
the script better and avoid duplicating the directories.

Signed-off-by: Akshay Karle <akshay.a.karle@gmail.com>
---
 dist/scripts/setup-data-dir.sh | 56 +++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/dist/scripts/setup-data-dir.sh b/dist/scripts/setup-data-dir.sh
index 26569da81c..167c69235b 100755
--- a/dist/scripts/setup-data-dir.sh
+++ b/dist/scripts/setup-data-dir.sh
@@ -20,19 +20,21 @@ if [[ -z "${datadir}" ]]; then
     datadir="/var/lib/rkt"
 fi
 
-# Creates the directory with the given mode and rkt group
+# Creates the directory with the given mode and given group
 # 1 - directory to create if it does not exist
 # 2 - mode to set the directory to
-make_rkt_directory() {
+# 3 - group to set the directory ownership to
+make_directory() {
     local dir="${1}"
     local mode="${2}"
+    local group="${3}"
 
     if [[ -e "${dir}" ]]; then
         chmod "${mode}" "${dir}"
     else
         mkdir --mode="${mode}" "${dir}"
     fi
-    chgrp rkt "${dir}"
+    chgrp "${group}" "${dir}"
 }
 
 # Creates the file with the given mode and rkt group
@@ -49,27 +51,37 @@ create_rkt_file() {
     chgrp rkt "${file}"
 }
 
-make_rkt_directory "${datadir}" 2750
-make_rkt_directory "${datadir}/tmp" 2750
+getent group rkt-admin || groupadd --force --system rkt-admin
+getent group rkt || groupadd --force --system rkt
 
-make_rkt_directory "${datadir}/cas" 2770
-make_rkt_directory "${datadir}/cas/db" 2770
+if which systemd-tmpfiles; then
+    systemd-tmpfiles --create /usr/lib/tmpfiles.d/rkt.conf
+    exit
+fi
+
+make_directory "${datadir}" 2750 "rkt"
+make_directory "${datadir}/tmp" 2750 "rkt"
+
+make_directory "${datadir}/cas" 2770 "rkt"
+make_directory "${datadir}/cas/db" 2770 "rkt"
 create_rkt_file "${datadir}/cas/db/ql.db" 0660
 # the ql database uses a WAL file whose name is generated from the sha1 hash of
 # the database name
 create_rkt_file "${datadir}/cas/db/.34a8b4c1ad933745146fdbfef3073706ee571625" 0660
-make_rkt_directory "${datadir}/cas/imagelocks" 2770
-make_rkt_directory "${datadir}/cas/imageManifest" 2770
-make_rkt_directory "${datadir}/cas/blob" 2770
-make_rkt_directory "${datadir}/cas/tmp" 2770
-make_rkt_directory "${datadir}/cas/tree" 2700
-make_rkt_directory "${datadir}/cas/treestorelocks" 2700
-make_rkt_directory "${datadir}/locks" 2750
-
-make_rkt_directory "${datadir}/pods" 2750
-make_rkt_directory "${datadir}/pods/embryo" 2750
-make_rkt_directory "${datadir}/pods/prepare" 2750
-make_rkt_directory "${datadir}/pods/prepared" 2750
-make_rkt_directory "${datadir}/pods/run" 2750
-make_rkt_directory "${datadir}/pods/exited-garbage" 2750
-make_rkt_directory "${datadir}/pods/garbage" 2750
+make_directory "${datadir}/cas/imagelocks" 2770 "rkt"
+make_directory "${datadir}/cas/imageManifest" 2770 "rkt"
+make_directory "${datadir}/cas/blob" 2770 "rkt"
+make_directory "${datadir}/cas/tmp" 2770 "rkt"
+make_directory "${datadir}/cas/tree" 2700 "rkt"
+make_directory "${datadir}/cas/treestorelocks" 2700 "rkt"
+make_directory "${datadir}/locks" 2750 "rkt"
+
+make_directory "${datadir}/pods" 2750 "rkt"
+make_directory "${datadir}/pods/embryo" 2750 "rkt"
+make_directory "${datadir}/pods/prepare" 2750 "rkt"
+make_directory "${datadir}/pods/prepared" 2750 "rkt"
+make_directory "${datadir}/pods/run" 2750 "rkt"
+make_directory "${datadir}/pods/exited-garbage" 2750 "rkt"
+make_directory "${datadir}/pods/garbage" 2750 "rkt"
+
+make_directory "/etc/rkt" 2775 "rkt-admin"

From 8a775d6ad53ba14ec4a1f6164b50e1fdf246ef9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 28 Jul 2016 14:30:55 +0200
Subject: [PATCH 0595/1304] functional tests: skip test if remote fetch fails

On eed65378a we started skipping tests that fail on remote fetch when
calling rkt run or prepare. However, we didn't do the same with the
fetching functions we run before those.

Modify those functions to return an error if the exit status is not 0
and skip the test when this happens.

On the other tests, we always fetch from local files so treat errors as
Failures.
---
 tests/rkt_api_service_bench_test.go  |  5 ++++-
 tests/rkt_api_service_test.go        | 10 ++++++++--
 tests/rkt_fetch_test.go              | 13 ++++++++++---
 tests/rkt_fly_test.go                |  5 ++++-
 tests/rkt_gc_test.go                 |  6 ++++--
 tests/rkt_image_cat_manifest_test.go |  5 ++++-
 tests/rkt_image_dependencies_test.go | 14 +++++++++++---
 tests/rkt_image_export_test.go       |  5 ++++-
 tests/rkt_image_extract_test.go      |  5 ++++-
 tests/rkt_image_render_test.go       | 10 ++++++++--
 tests/rkt_non_root_test.go           | 10 ++++++++--
 tests/rkt_os_arch_test.go            |  5 ++++-
 tests/rkt_run_pod_manifest_test.go   |  5 ++++-
 tests/rkt_stage1_loading_test.go     |  5 ++++-
 tests/rkt_tests.go                   | 16 ++++++++++------
 tests/rkt_volume_test.go             |  5 ++++-
 16 files changed, 95 insertions(+), 29 deletions(-)

diff --git a/tests/rkt_api_service_bench_test.go b/tests/rkt_api_service_bench_test.go
index bfa522439c..a30dc96fb3 100644
--- a/tests/rkt_api_service_bench_test.go
+++ b/tests/rkt_api_service_bench_test.go
@@ -96,7 +96,10 @@ func fetchImages(ctx *testutils.RktRunCtx, numOfImages int) {
 	wg.Add(numOfImages)
 	for i := 0; i < numOfImages; i++ {
 		go func(i int) {
-			patchImportAndFetchHash(fmt.Sprintf("rkt-inspect-sleep-%d.aci", i), []string{"--exec=/inspect"}, t, ctx)
+			_, err := patchImportAndFetchHash(fmt.Sprintf("rkt-inspect-sleep-%d.aci", i), []string{"--exec=/inspect"}, t, ctx)
+			if err != nil {
+				t.Fatalf("%v", err)
+			}
 			wg.Done()
 		}(i)
 	}
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 28ebdce503..163cd67f6b 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -346,7 +346,10 @@ func NewAPIServiceListInspectPodsTest() testutils.Test {
 		}
 
 		patches := []string{"--exec=/inspect --print-msg=HELLO_API --exit-code=0"}
-		imageHash := patchImportAndFetchHash("rkt-inspect-print.aci", patches, t, ctx)
+		imageHash, err := patchImportAndFetchHash("rkt-inspect-print.aci", patches, t, ctx)
+		if err != nil {
+			t.Fatalf("%v", err)
+		}
 		imgID, err := types.NewHash(imageHash)
 		if err != nil {
 			t.Fatalf("Cannot generate types.Hash from %v: %v", imageHash, err)
@@ -503,7 +506,10 @@ func TestAPIServiceListInspectImages(t *testing.T) {
 		t.Errorf("Unexpected result: %v, should see zero images", resp.Images)
 	}
 
-	patchImportAndFetchHash("rkt-inspect-sleep.aci", []string{"--exec=/inspect"}, t, ctx)
+	_, err = patchImportAndFetchHash("rkt-inspect-sleep.aci", []string{"--exec=/inspect"}, t, ctx)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
 
 	// ListImages(detail=false).
 	resp, err = c.ListImages(context.Background(), &v1alpha.ListImagesRequest{})
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 86c080b256..6b69bc2f1c 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -136,7 +136,10 @@ func TestFetchFullHash(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		hash := importImageAndFetchHash(t, ctx, tt.fetchArgs, imagePath)
+		hash, err := importImageAndFetchHash(t, ctx, tt.fetchArgs, imagePath)
+		if err != nil {
+			t.Fatalf("%v", err)
+		}
 		if len(hash) != tt.expectedHashLength {
 			t.Fatalf("expected hash length of %d, got %d", tt.expectedHashLength, len(hash))
 		}
@@ -187,7 +190,9 @@ func testFetchStoreOnly(t *testing.T, args string, image string, imageArgs strin
 	// 1. Run cmd with the image not available in the store should get $cannotFetchMsg.
 	runRktAndCheckRegexOutput(t, cmd, cannotFetchMsg)
 
-	importImageAndFetchHash(t, ctx, "", image)
+	if _, err := importImageAndFetchHash(t, ctx, "", image); err != nil {
+		t.Skip(fmt.Sprintf("%v, probably a network failure. Skipping...", err))
+	}
 
 	// 2. Run cmd with the image available in the store, should get $storeMsg.
 	runRktAndCheckRegexOutput(t, cmd, storeMsg)
@@ -200,7 +205,9 @@ func testFetchNoStore(t *testing.T, args string, image string, imageArgs string,
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	importImageAndFetchHash(t, ctx, "", image)
+	if _, err := importImageAndFetchHash(t, ctx, "", image); err != nil {
+		t.Skip(fmt.Sprintf("%v, probably a network failure. Skipping...", err))
+	}
 
 	cmd := fmt.Sprintf("%s --no-store %s %s %s", ctx.Cmd(), args, image, imageArgs)
 
diff --git a/tests/rkt_fly_test.go b/tests/rkt_fly_test.go
index 5aadef70e3..82ce5431a3 100644
--- a/tests/rkt_fly_test.go
+++ b/tests/rkt_fly_test.go
@@ -177,7 +177,10 @@ func TestFlyMountPodManifest(t *testing.T) {
 	for i, tt := range tests {
 		var hashesToRemove []string
 		for j, v := range tt.images {
-			hash := patchImportAndFetchHash(v.name, v.patches, t, ctx)
+			hash, err := patchImportAndFetchHash(v.name, v.patches, t, ctx)
+			if err != nil {
+				t.Fatalf("%v", err)
+			}
 			hashesToRemove = append(hashesToRemove, hash)
 			imgName := types.MustACIdentifier(v.name)
 			imgID, err := types.NewHash(hash)
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 8ecc453233..4cfc55ba45 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -90,8 +90,10 @@ func TestGCAfterUnmount(t *testing.T) {
 	imagePath := getInspectImagePath()
 
 	for _, rmNetns := range []bool{false, true} {
-
-		importImageAndFetchHash(t, ctx, "", imagePath)
+		_, err := importImageAndFetchHash(t, ctx, "", imagePath)
+		if err != nil {
+			t.Fatalf("%v", err)
+		}
 		cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
 		uuid := runRktAndGetUUID(t, cmd)
 
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index e8ba0aa84b..be645a1cd8 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -55,7 +55,10 @@ func TestImageCatManifest(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	testImageHash := importImageAndFetchHash(t, ctx, "", testImage)
+	testImageHash, err := importImageAndFetchHash(t, ctx, "", testImage)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
 
 	tests := []struct {
 		image      string
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index f3f39fa000..f4e7e67de8 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -84,7 +84,9 @@ func generateComplexDependencyTree(t *testing.T, ctx *testutils.RktRunCtx) (map[
 	defer os.RemoveAll(tmpDir)
 
 	baseImage := getInspectImagePath()
-	_ = importImageAndFetchHash(t, ctx, "", baseImage)
+	if _, err := importImageAndFetchHash(t, ctx, "", baseImage); err != nil {
+		t.Fatalf("%v", err)
+	}
 	emptyImage := getEmptyImagePath()
 	fileSet := make(map[string]string)
 
@@ -188,7 +190,10 @@ func TestImageDependencies(t *testing.T) {
 		img := imageList[i]
 		if img.prefetch {
 			t.Logf("Importing image %q: %q", img.imageName, img.fileName)
-			testImageShortHash := importImageAndFetchHash(t, ctx, "", img.fileName)
+			testImageShortHash, err := importImageAndFetchHash(t, ctx, "", img.fileName)
+			if err != nil {
+				t.Fatalf("%v", err)
+			}
 			t.Logf("Imported image %q: %s", img.imageName, testImageShortHash)
 		}
 	}
@@ -238,7 +243,10 @@ func TestRenderOnFetch(t *testing.T) {
 		img := imageList[i]
 		if img.prefetch {
 			t.Logf("Importing image %q: %q", img.imageName, img.fileName)
-			testImageShortHash := importImageAndFetchHash(t, ctx, "", img.fileName)
+			testImageShortHash, err := importImageAndFetchHash(t, ctx, "", img.fileName)
+			if err != nil {
+				t.Fatalf("%v", err)
+			}
 			t.Logf("Imported image %q: %s", img.imageName, testImageShortHash)
 		}
 	}
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index df99935588..7e9a0a33a3 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -57,7 +57,10 @@ func TestImageExport(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	testImageID := importImageAndFetchHash(t, ctx, "", testImage)
+	testImageID, err := importImageAndFetchHash(t, ctx, "", testImage)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
 
 	testImageHash, err := getHash(testImage)
 	if err != nil {
diff --git a/tests/rkt_image_extract_test.go b/tests/rkt_image_extract_test.go
index 25189db8ea..9882a7d188 100644
--- a/tests/rkt_image_extract_test.go
+++ b/tests/rkt_image_extract_test.go
@@ -41,7 +41,10 @@ func TestImageExtract(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	testImageShortHash := importImageAndFetchHash(t, ctx, "", testImage)
+	testImageShortHash, err := importImageAndFetchHash(t, ctx, "", testImage)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
 
 	tests := []struct {
 		image        string
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 42db9e0a48..1cca7c1f20 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -63,8 +63,14 @@ func TestImageRender(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	_ = importImageAndFetchHash(t, ctx, "", baseImage)
-	testImageShortHash := importImageAndFetchHash(t, ctx, "", testImage)
+	_, err = importImageAndFetchHash(t, ctx, "", baseImage)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
+	testImageShortHash, err := importImageAndFetchHash(t, ctx, "", testImage)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
 
 	tests := []struct {
 		image        string
diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index 0b8211d7e8..459ecd0d64 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -102,7 +102,10 @@ func TestNonRootFetchRmGCImage(t *testing.T) {
 
 	rootImg := patchTestACI("rkt-inspect-root-rm.aci", "--exec=/inspect --print-msg=foobar")
 	defer os.Remove(rootImg)
-	rootImgHash := importImageAndFetchHash(t, ctx, "", rootImg)
+	rootImgHash, err := importImageAndFetchHash(t, ctx, "", rootImg)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
 
 	// Launch/gc a pod so we can test non-root image gc.
 	runCmd := fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s", ctx.Cmd(), rootImg)
@@ -124,7 +127,10 @@ func TestNonRootFetchRmGCImage(t *testing.T) {
 	// Should be able to remove the image fetched by ourselves.
 	nonrootImg := patchTestACI("rkt-inspect-non-root-rm.aci", "--exec=/inspect")
 	defer os.Remove(nonrootImg)
-	nonrootImgHash := importImageAndFetchHashAsGid(t, ctx, nonrootImg, "", gid)
+	nonrootImgHash, err := importImageAndFetchHashAsGid(t, ctx, nonrootImg, "", gid)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
 
 	imgRmCmd = fmt.Sprintf("%s image rm %s", ctx.Cmd(), nonrootImgHash)
 	t.Logf("Running %s", imgRmCmd)
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 480bde8532..30c861e928 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -154,7 +154,10 @@ func TestMissingOrInvalidOSArchFetchRun(t *testing.T) {
 	defer osArchTestRemoveImages(tests)
 
 	for i, tt := range tests {
-		imgHash := importImageAndFetchHash(t, ctx, "", tt.image)
+		imgHash, err := importImageAndFetchHash(t, ctx, "", tt.image)
+		if err != nil {
+			t.Fatalf("%v", err)
+		}
 		rktCmd := fmt.Sprintf("%s run --mds-register=false %s", ctx.Cmd(), imgHash)
 		t.Logf("Running test #%v: %v", i, rktCmd)
 		runRktAndCheckOutput(t, rktCmd, tt.expectedLine, tt.expectError)
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 1db9e57ac5..84f99a07d9 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -1056,7 +1056,10 @@ func TestPodManifest(t *testing.T) {
 
 		var hashesToRemove []string
 		for j, v := range tt.images {
-			hash := patchImportAndFetchHash(v.name, v.patches, t, ctx)
+			hash, err := patchImportAndFetchHash(v.name, v.patches, t, ctx)
+			if err != nil {
+				t.Fatalf("%v", err)
+			}
 			hashesToRemove = append(hashesToRemove, hash)
 			imgName := types.MustACIdentifier(v.name)
 			imgID, err := types.NewHash(hash)
diff --git a/tests/rkt_stage1_loading_test.go b/tests/rkt_stage1_loading_test.go
index ec80852291..ab4cbdeb3d 100644
--- a/tests/rkt_stage1_loading_test.go
+++ b/tests/rkt_stage1_loading_test.go
@@ -400,7 +400,10 @@ func TestStage1LoadingFromFlagsHash(t *testing.T) {
 	setup := newStubStage1Setup(t, nil)
 	defer setup.cleanup()
 
-	stubHash := importImageAndFetchHash(setup.t, setup.ctx, "", setup.getLocation(stubStage1PathAbs))
+	stubHash, err := importImageAndFetchHash(setup.t, setup.ctx, "", setup.getLocation(stubStage1PathAbs))
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
 	cmd := fmt.Sprintf("%s --insecure-options=image,tls --debug run --stage1-hash=%s %s", setup.ctx.Cmd(), stubHash, getInspectImagePath())
 	child := spawnOrFail(setup.t, cmd)
 	defer waitOrFail(setup.t, child, 0)
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 6fbffac373..6b1e515bc9 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -186,7 +186,7 @@ func createTempDirOrPanic(dirName string) string {
 	return tmpDir
 }
 
-func importImageAndFetchHashAsGid(t *testing.T, ctx *testutils.RktRunCtx, img string, fetchArgs string, gid int) string {
+func importImageAndFetchHashAsGid(t *testing.T, ctx *testutils.RktRunCtx, img string, fetchArgs string, gid int) (string, error) {
 	// Import the test image into store manually.
 	cmd := fmt.Sprintf("%s --insecure-options=image,tls fetch %s %s", ctx.Cmd(), fetchArgs, img)
 
@@ -215,13 +215,17 @@ func importImageAndFetchHashAsGid(t *testing.T, ctx *testutils.RktRunCtx, img st
 	if err != nil || len(result) != 1 {
 		t.Fatalf("Error: %v\nOutput: %v", err, out)
 	}
+	err = child.Wait()
+	status := getExitStatus(err)
+	if status != 0 {
+		t.Logf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
+		return "", fmt.Errorf("fetching of %q failed", img)
+	}
 
-	waitOrFail(t, child, 0)
-
-	return result[0]
+	return result[0], nil
 }
 
-func importImageAndFetchHash(t *testing.T, ctx *testutils.RktRunCtx, fetchArgs string, img string) string {
+func importImageAndFetchHash(t *testing.T, ctx *testutils.RktRunCtx, fetchArgs string, img string) (string, error) {
 	return importImageAndFetchHashAsGid(t, ctx, fetchArgs, img, 0)
 }
 
@@ -235,7 +239,7 @@ func importImageAndPrepare(imagePath string, t *testing.T, ctx *testutils.RktRun
 	spawnAndWaitOrFail(t, cmd, 0)
 }
 
-func patchImportAndFetchHash(image string, patches []string, t *testing.T, ctx *testutils.RktRunCtx) string {
+func patchImportAndFetchHash(image string, patches []string, t *testing.T, ctx *testutils.RktRunCtx) (string, error) {
 	imagePath := patchTestACI(image, patches...)
 	defer os.Remove(imagePath)
 
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index dc6dc55734..d51ffe8e57 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -247,7 +247,10 @@ func TestDockerVolumeSemanticsPodManifest(t *testing.T) {
 	for i, tt := range volDockerTests {
 		t.Logf("Running test #%v on directory %s", i, tt.dir)
 
-		hash := patchImportAndFetchHash(fmt.Sprintf("rkt-volume-image-pm-%d.aci", i), []string{fmt.Sprintf("--mounts=mydir,path=%s,readOnly=false", tt.dir)}, t, ctx)
+		hash, err := patchImportAndFetchHash(fmt.Sprintf("rkt-volume-image-pm-%d.aci", i), []string{fmt.Sprintf("--mounts=mydir,path=%s,readOnly=false", tt.dir)}, t, ctx)
+		if err != nil {
+			t.Fatalf("%v", err)
+		}
 
 		imgID, err := types.NewHash(hash)
 		if err != nil {

From 76900ee991f316a7ad78259d0b8c06821785cbe9 Mon Sep 17 00:00:00 2001
From: Eugene Yakubovich <eugene.yakubovich@coreos.com>
Date: Fri, 29 Jul 2016 18:02:17 -0700
Subject: [PATCH 0596/1304] rkt: add --cap-retain and --cap-remove to prepare

"rkt run" supports these overrides and it is convenient
for "rkt prepare" to do the same.

Fixes #3006
---
 Documentation/subcommands/prepare.md | 2 ++
 rkt/prepare.go                       | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 8f22eb3ea0..0d4676764e 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -34,6 +34,8 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
+| `--cap-remove` | none | capability to remove (example: '--cap-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
+| `--cap-retain` | none | capability to retain (example: '--cap-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
 | `--group` | root | gid, groupname or file path | Group override for the preceding image (example: '--group=group') |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 4b6d351395..7019b1d6cf 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -73,6 +73,8 @@ func init() {
 	cmdPrepare.Flags().Var((*appAsc)(&rktApps), "signature", "local signature file to use in validating the preceding image")
 	cmdPrepare.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
 	cmdPrepare.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
+	cmdPrepare.Flags().Var((*appCapsRetain)(&rktApps), "cap-retain", "capability to retain (example: '--cap-retain=CAP_SYS_ADMIN')")
+	cmdPrepare.Flags().Var((*appCapsRemove)(&rktApps), "cap-remove", "capability to remove (example: '--cap-remove=CAP_MKNOD')")
 
 	// Disable interspersed flags to stop parsing after the first non flag
 	// argument. This is need to permit to correctly handle
@@ -112,7 +114,8 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagStoreOnly || flagNoStore ||
 		flagInheritEnv || !flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty() ||
 		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" || (*appExec)(&rktApps).String() != "" ||
-		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "") {
+		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "" ||
+		(*appCapsRetain)(&rktApps).String() != "" || (*appCapsRemove)(&rktApps).String() != "") {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
 		return 1
 	}

From eac8f1f31376bff3802a052b2986ed68e50b3c1a Mon Sep 17 00:00:00 2001
From: 0xAX <0xAX@users.noreply.github.com>
Date: Sat, 30 Jul 2016 19:57:18 +0600
Subject: [PATCH 0597/1304] issue template: Add '\n' to the end of environment
 output

It will be much convenient to copy output of the script
without touching of bash prompt at the last line of the
output.
---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 36cd699078..40e7f74b81 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -2,7 +2,7 @@
 
 Replace this with the output of:
 
-`printf "$(rkt version)\n--\n$(uname -srm)\n--\n$(cat /etc/os-release)\n--\n$(systemctl --version)"`
+`printf "$(rkt version)\n--\n$(uname -srm)\n--\n$(cat /etc/os-release)\n--\n$(systemctl --version)\n"`
 
 **What did you do?**
 

From 77e2b301eae72603ed168c10f7831388dc56bee3 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Sat, 30 Jul 2016 00:37:24 +0600
Subject: [PATCH 0598/1304] common: introduce RemoveEmptyLines()

Couple of places uses the same functionality which removes empty lines from
a multiline string. This patch introduces RemoveEmptyLines() function to
achive this functionality in one place and get rid from code duplication.
---
 common/common.go             | 14 ++++++++++++++
 rkt/api_service.go           |  8 +-------
 rkt/api_service_sdjournal.go | 12 +++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/common/common.go b/common/common.go
index e2f296ba54..05b6a60da7 100644
--- a/common/common.go
+++ b/common/common.go
@@ -346,3 +346,17 @@ func FSSupportsOverlay(path string) bool {
 
 	return true
 }
+
+// RemoveEmptyLines removes empty lines from the given string
+// and breaks it up into a list of strings at newline characters
+func RemoveEmptyLines(str string) []string {
+	lines := make([]string, 0)
+
+	for _, v := range strings.Split(str, "\n") {
+		if len(v) > 0 {
+			lines = append(lines, v)
+		}
+	}
+
+	return lines
+}
diff --git a/rkt/api_service.go b/rkt/api_service.go
index 0d4b3654cc..2f672969c2 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -823,13 +823,7 @@ type LogsStreamWriter struct {
 }
 
 func (sw LogsStreamWriter) Write(b []byte) (int, error) {
-	// Remove empty lines
-	lines := make([]string, 0)
-	for _, v := range strings.Split(string(b), "\n") {
-		if len(v) > 0 {
-			lines = append(lines, v)
-		}
-	}
+	lines := common.RemoveEmptyLines(string(b))
 
 	if err := sw.server.Send(&v1alpha.GetLogsResponse{Lines: lines}); err != nil {
 		return 0, err
diff --git a/rkt/api_service_sdjournal.go b/rkt/api_service_sdjournal.go
index b98fafa0c7..a520d8ca91 100644
--- a/rkt/api_service_sdjournal.go
+++ b/rkt/api_service_sdjournal.go
@@ -21,12 +21,12 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/sdjournal"
 	"github.com/coreos/rkt/api/v1alpha"
+	"github.com/coreos/rkt/common"
 )
 
 func (s *v1AlphaAPIServer) constrainedGetLogs(request *v1alpha.GetLogsRequest, server v1alpha.PublicAPI_GetLogsServer) error {
@@ -87,12 +87,6 @@ func (s *v1AlphaAPIServer) constrainedGetLogs(request *v1alpha.GetLogsRequest, s
 	if err != nil {
 		return err
 	}
-	// Remove empty lines
-	lines := make([]string, 0)
-	for _, v := range strings.Split(string(data), "\n") {
-		if len(v) > 0 {
-			lines = append(lines, v)
-		}
-	}
-	return server.Send(&v1alpha.GetLogsResponse{Lines: lines})
+
+	return server.Send(&v1alpha.GetLogsResponse{Lines: common.RemoveEmptyLines(string(data))})
 }

From a83419be28ac626876f94a28b4df2dbc9eac7448 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@coreos.com>
Date: Mon, 1 Aug 2016 11:47:06 -0700
Subject: [PATCH 0599/1304] api_service: Update grpc version

---
 api/v1alpha/api.pb.go                         | 362 ++++----
 glide.lock                                    |  12 +-
 glide.yaml                                    |   7 +-
 .../github.com/golang/protobuf/proto/clone.go |  12 +-
 .../golang/protobuf/proto/decode.go           |  21 +-
 .../golang/protobuf/proto/encode.go           |  60 +-
 .../github.com/golang/protobuf/proto/equal.go |  26 +-
 .../golang/protobuf/proto/extensions.go       | 227 ++++-
 .../github.com/golang/protobuf/proto/lib.go   |   5 +
 .../golang/protobuf/proto/message_set.go      |  43 +-
 .../golang/protobuf/proto/pointer_reflect.go  |   7 +-
 .../golang/protobuf/proto/pointer_unsafe.go   |   6 +-
 .../golang/protobuf/proto/properties.go       |  54 +-
 .../github.com/golang/protobuf/proto/text.go  | 181 +++-
 .../golang/protobuf/proto/text_parser.go      | 189 +++-
 .../protoc-gen-go/descriptor/descriptor.pb.go | 728 ++++++++++-----
 .../protoc-gen-go/generator/generator.go      | 223 +++--
 .../protoc-gen-go/{internal => }/grpc/grpc.go |  33 +-
 .../protobuf/protoc-gen-go/link_grpc.go       |   2 +-
 .../protoc-gen-go/plugin/plugin.pb.go         |  55 +-
 vendor/golang.org/x/net/context/context.go    | 295 +-----
 vendor/golang.org/x/net/context/go17.go       |  72 ++
 vendor/golang.org/x/net/context/pre_go17.go   | 300 ++++++
 .../x/net/http2/client_conn_pool.go           |  35 +-
 .../x/net/http2/configure_transport.go        |  11 +-
 vendor/golang.org/x/net/http2/errors.go       |  34 +-
 vendor/golang.org/x/net/http2/frame.go        | 250 ++++-
 vendor/golang.org/x/net/http2/go15.go         |  11 -
 vendor/golang.org/x/net/http2/go16.go         |  43 +
 vendor/golang.org/x/net/http2/go17.go         |  94 ++
 vendor/golang.org/x/net/http2/hpack/encode.go |   2 +-
 vendor/golang.org/x/net/http2/hpack/hpack.go  |  15 +-
 .../golang.org/x/net/http2/hpack/huffman.go   |  42 +-
 vendor/golang.org/x/net/http2/http2.go        | 165 +---
 vendor/golang.org/x/net/http2/not_go15.go     |  11 -
 vendor/golang.org/x/net/http2/not_go16.go     |  35 +-
 vendor/golang.org/x/net/http2/not_go17.go     |  51 ++
 vendor/golang.org/x/net/http2/pipe.go         |   6 +
 vendor/golang.org/x/net/http2/server.go       | 558 ++++++------
 vendor/golang.org/x/net/http2/transport.go    | 854 +++++++++++-------
 vendor/golang.org/x/net/http2/write.go        |  23 +-
 .../golang.org/x/net/lex/httplex/httplex.go   | 312 +++++++
 vendor/golang.org/x/net/trace/trace.go        |  14 +-
 vendor/google.golang.org/grpc/PATENTS         |  12 +-
 vendor/google.golang.org/grpc/backoff.go      |  80 ++
 vendor/google.golang.org/grpc/balancer.go     | 385 ++++++++
 vendor/google.golang.org/grpc/call.go         |  75 +-
 vendor/google.golang.org/grpc/clientconn.go   | 682 ++++++++------
 .../grpc/credentials/credentials.go           |  40 +-
 vendor/google.golang.org/grpc/interceptor.go  |  74 ++
 .../google.golang.org/grpc/naming/naming.go   |   3 +-
 vendor/google.golang.org/grpc/picker.go       | 243 -----
 vendor/google.golang.org/grpc/rpc_util.go     | 101 ++-
 vendor/google.golang.org/grpc/server.go       | 178 ++--
 vendor/google.golang.org/grpc/stream.go       |  85 +-
 vendor/google.golang.org/grpc/trace.go        |   3 +-
 .../grpc/transport/control.go                 |  86 +-
 .../grpc/transport/handler_server.go          |  32 +-
 .../grpc/transport/http2_client.go            | 316 ++++---
 .../grpc/transport/http2_server.go            | 177 ++--
 .../grpc/transport/http_util.go               | 178 ++--
 .../grpc/transport/transport.go               |  41 +-
 62 files changed, 5475 insertions(+), 2802 deletions(-)
 rename vendor/github.com/golang/protobuf/protoc-gen-go/{internal => }/grpc/grpc.go (90%)
 create mode 100644 vendor/golang.org/x/net/context/go17.go
 create mode 100644 vendor/golang.org/x/net/context/pre_go17.go
 delete mode 100644 vendor/golang.org/x/net/http2/go15.go
 create mode 100644 vendor/golang.org/x/net/http2/go16.go
 create mode 100644 vendor/golang.org/x/net/http2/go17.go
 delete mode 100644 vendor/golang.org/x/net/http2/not_go15.go
 create mode 100644 vendor/golang.org/x/net/http2/not_go17.go
 create mode 100644 vendor/golang.org/x/net/lex/httplex/httplex.go
 create mode 100644 vendor/google.golang.org/grpc/backoff.go
 create mode 100644 vendor/google.golang.org/grpc/balancer.go
 create mode 100644 vendor/google.golang.org/grpc/interceptor.go
 delete mode 100644 vendor/google.golang.org/grpc/picker.go

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index 7e89748c1e..1b03b90ecb 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -54,7 +54,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // ImageType defines the supported image type.
 type ImageType int32
@@ -224,7 +226,7 @@ type Image struct {
 	// Base format of the image, required. This indicates the original format
 	// for the image as nowadays all the image formats will be transformed to
 	// ACI.
-	BaseFormat *ImageFormat `protobuf:"bytes,1,opt,name=base_format" json:"base_format,omitempty"`
+	BaseFormat *ImageFormat `protobuf:"bytes,1,opt,name=base_format,json=baseFormat" json:"base_format,omitempty"`
 	// ID of the image, a string that can be used to uniquely identify the image,
 	// e.g. sha512 hash of the ACIs, required.
 	Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
@@ -233,7 +235,7 @@ type Image struct {
 	// Version of the image, e.g. 'latest', '2.0.10', optional.
 	Version string `protobuf:"bytes,4,opt,name=version" json:"version,omitempty"`
 	// Timestamp of when the image is imported, it is the seconds since epoch, optional.
-	ImportTimestamp int64 `protobuf:"varint,5,opt,name=import_timestamp" json:"import_timestamp,omitempty"`
+	ImportTimestamp int64 `protobuf:"varint,5,opt,name=import_timestamp,json=importTimestamp" json:"import_timestamp,omitempty"`
 	// JSON-encoded byte array that represents the image manifest, optional.
 	Manifest []byte `protobuf:"bytes,6,opt,name=manifest,proto3" json:"manifest,omitempty"`
 	// Size is the size in bytes of this image in the store.
@@ -296,7 +298,7 @@ type App struct {
 	State AppState `protobuf:"varint,3,opt,name=state,enum=v1alpha.AppState" json:"state,omitempty"`
 	// Exit code of the app. optional, only valid if it's returned by InspectPod() and
 	// the app has already exited.
-	ExitCode int32 `protobuf:"zigzag32,4,opt,name=exit_code" json:"exit_code,omitempty"`
+	ExitCode int32 `protobuf:"zigzag32,4,opt,name=exit_code,json=exitCode" json:"exit_code,omitempty"`
 	// Annotations for this app.
 	Annotations []*KeyValue `protobuf:"bytes,5,rep,name=annotations" json:"annotations,omitempty"`
 }
@@ -351,14 +353,14 @@ type Pod struct {
 	Cgroup string `protobuf:"bytes,8,opt,name=cgroup" json:"cgroup,omitempty"`
 	// Timestamp of when the pod is created, nanoseconds since epoch.
 	// Zero if the pod is not created.
-	CreatedAt int64 `protobuf:"varint,9,opt,name=created_at" json:"created_at,omitempty"`
+	CreatedAt int64 `protobuf:"varint,9,opt,name=created_at,json=createdAt" json:"created_at,omitempty"`
 	// Timestamp of when the pod is started, nanoseconds since epoch.
 	// Zero if the pod is not started.
-	StartedAt int64 `protobuf:"varint,10,opt,name=started_at" json:"started_at,omitempty"`
+	StartedAt int64 `protobuf:"varint,10,opt,name=started_at,json=startedAt" json:"started_at,omitempty"`
 	// Timestamp of when the pod is moved to exited-garbage/garbage,
 	// in nanoseconds since epoch.
 	// Zero if the pod is not moved to exited-garbage/garbage yet.
-	GcMarkedAt int64 `protobuf:"varint,11,opt,name=gc_marked_at" json:"gc_marked_at,omitempty"`
+	GcMarkedAt int64 `protobuf:"varint,11,opt,name=gc_marked_at,json=gcMarkedAt" json:"gc_marked_at,omitempty"`
 }
 
 func (m *Pod) Reset()                    { *m = Pod{} }
@@ -389,7 +391,7 @@ func (m *Pod) GetAnnotations() []*KeyValue {
 
 type KeyValue struct {
 	// Key part of the key-value pair.
-	Key string `protobuf:"bytes,1,opt,name=Key" json:"Key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=Key,json=key" json:"Key,omitempty"`
 	// Value part of the key-value pair.
 	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
 }
@@ -405,20 +407,20 @@ type PodFilter struct {
 	// If not empty, the pods that have any of the ids will be returned.
 	Ids []string `protobuf:"bytes,1,rep,name=ids" json:"ids,omitempty"`
 	// If not empty, the pods that have any of the states will be returned.
-	States []PodState `protobuf:"varint,2,rep,name=states,enum=v1alpha.PodState" json:"states,omitempty"`
+	States []PodState `protobuf:"varint,2,rep,packed,name=states,enum=v1alpha.PodState" json:"states,omitempty"`
 	// If not empty, the pods that all of the apps will be returned.
-	AppNames []string `protobuf:"bytes,3,rep,name=app_names" json:"app_names,omitempty"`
+	AppNames []string `protobuf:"bytes,3,rep,name=app_names,json=appNames" json:"app_names,omitempty"`
 	// If not empty, the pods that have all of the images(in the apps) will be returned
-	ImageIds []string `protobuf:"bytes,4,rep,name=image_ids" json:"image_ids,omitempty"`
+	ImageIds []string `protobuf:"bytes,4,rep,name=image_ids,json=imageIds" json:"image_ids,omitempty"`
 	// If not empty, the pods that are in all of the networks will be returned.
-	NetworkNames []string `protobuf:"bytes,5,rep,name=network_names" json:"network_names,omitempty"`
+	NetworkNames []string `protobuf:"bytes,5,rep,name=network_names,json=networkNames" json:"network_names,omitempty"`
 	// If not empty, the pods that have all of the annotations will be returned.
 	Annotations []*KeyValue `protobuf:"bytes,6,rep,name=annotations" json:"annotations,omitempty"`
 	// If not empty, the pods whose cgroup are listed will be returned.
 	Cgroups []string `protobuf:"bytes,7,rep,name=cgroups" json:"cgroups,omitempty"`
 	// If not empty, the pods whose these cgroup belong to will be returned.
 	// i.e. the pod's cgroup is a prefix of the specified cgroup
-	PodSubCgroups []string `protobuf:"bytes,8,rep,name=pod_sub_cgroups" json:"pod_sub_cgroups,omitempty"`
+	PodSubCgroups []string `protobuf:"bytes,8,rep,name=pod_sub_cgroups,json=podSubCgroups" json:"pod_sub_cgroups,omitempty"`
 }
 
 func (m *PodFilter) Reset()                    { *m = PodFilter{} }
@@ -443,20 +445,20 @@ type ImageFilter struct {
 	// If not empty, the images that have any of the base names will be returned.
 	// For example, both 'coreos.com/etcd' and 'k8s.io/etcd' will be returned if 'etcd' is included,
 	// however 'k8s.io/etcd-backup' will not be returned.
-	BaseNames []string `protobuf:"bytes,3,rep,name=base_names" json:"base_names,omitempty"`
+	BaseNames []string `protobuf:"bytes,3,rep,name=base_names,json=baseNames" json:"base_names,omitempty"`
 	// If not empty, the images that have any of the keywords in the name will be returned.
 	// For example, both 'kubernetes-etcd', 'etcd:latest' will be returned if 'etcd' is included,
 	Keywords []string `protobuf:"bytes,4,rep,name=keywords" json:"keywords,omitempty"`
 	// If not empty, the images that have all of the labels will be returned.
 	Labels []*KeyValue `protobuf:"bytes,5,rep,name=labels" json:"labels,omitempty"`
 	// If set, the images that are imported after this timestamp will be returned.
-	ImportedAfter int64 `protobuf:"varint,6,opt,name=imported_after" json:"imported_after,omitempty"`
+	ImportedAfter int64 `protobuf:"varint,6,opt,name=imported_after,json=importedAfter" json:"imported_after,omitempty"`
 	// If set, the images that are imported before this timestamp will be returned.
-	ImportedBefore int64 `protobuf:"varint,7,opt,name=imported_before" json:"imported_before,omitempty"`
+	ImportedBefore int64 `protobuf:"varint,7,opt,name=imported_before,json=importedBefore" json:"imported_before,omitempty"`
 	// If not empty, the images that have all of the annotations will be returned.
 	Annotations []*KeyValue `protobuf:"bytes,8,rep,name=annotations" json:"annotations,omitempty"`
 	// If not empty, the images that have any of the exact full names will be returned.
-	FullNames []string `protobuf:"bytes,9,rep,name=full_names" json:"full_names,omitempty"`
+	FullNames []string `protobuf:"bytes,9,rep,name=full_names,json=fullNames" json:"full_names,omitempty"`
 }
 
 func (m *ImageFilter) Reset()                    { *m = ImageFilter{} }
@@ -483,15 +485,15 @@ type GlobalFlags struct {
 	// Data directory.
 	Dir string `protobuf:"bytes,1,opt,name=dir" json:"dir,omitempty"`
 	// System configuration directory.
-	SystemConfigDir string `protobuf:"bytes,2,opt,name=system_config_dir" json:"system_config_dir,omitempty"`
+	SystemConfigDir string `protobuf:"bytes,2,opt,name=system_config_dir,json=systemConfigDir" json:"system_config_dir,omitempty"`
 	// Local configuration directory.
-	LocalConfigDir string `protobuf:"bytes,3,opt,name=local_config_dir" json:"local_config_dir,omitempty"`
+	LocalConfigDir string `protobuf:"bytes,3,opt,name=local_config_dir,json=localConfigDir" json:"local_config_dir,omitempty"`
 	// User configuration directory.
-	UserConfigDir string `protobuf:"bytes,4,opt,name=user_config_dir" json:"user_config_dir,omitempty"`
+	UserConfigDir string `protobuf:"bytes,4,opt,name=user_config_dir,json=userConfigDir" json:"user_config_dir,omitempty"`
 	// Insecure flags configurates what security features to disable.
-	InsecureFlags string `protobuf:"bytes,5,opt,name=insecure_flags" json:"insecure_flags,omitempty"`
+	InsecureFlags string `protobuf:"bytes,5,opt,name=insecure_flags,json=insecureFlags" json:"insecure_flags,omitempty"`
 	// Whether to automatically trust gpg keys fetched from https
-	TrustKeysFromHttps bool `protobuf:"varint,6,opt,name=trust_keys_from_https" json:"trust_keys_from_https,omitempty"`
+	TrustKeysFromHttps bool `protobuf:"varint,6,opt,name=trust_keys_from_https,json=trustKeysFromHttps" json:"trust_keys_from_https,omitempty"`
 }
 
 func (m *GlobalFlags) Reset()                    { *m = GlobalFlags{} }
@@ -502,13 +504,13 @@ func (*GlobalFlags) Descriptor() ([]byte, []int) { return fileDescriptor0, []int
 // Info describes the information of rkt on the machine.
 type Info struct {
 	// Version of rkt, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
-	RktVersion string `protobuf:"bytes,1,opt,name=rkt_version" json:"rkt_version,omitempty"`
+	RktVersion string `protobuf:"bytes,1,opt,name=rkt_version,json=rktVersion" json:"rkt_version,omitempty"`
 	// Version of appc, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
-	AppcVersion string `protobuf:"bytes,2,opt,name=appc_version" json:"appc_version,omitempty"`
+	AppcVersion string `protobuf:"bytes,2,opt,name=appc_version,json=appcVersion" json:"appc_version,omitempty"`
 	// Latest version of the api that's supported by the service, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
-	ApiVersion string `protobuf:"bytes,3,opt,name=api_version" json:"api_version,omitempty"`
+	ApiVersion string `protobuf:"bytes,3,opt,name=api_version,json=apiVersion" json:"api_version,omitempty"`
 	// The global flags that passed to the rkt api service when it's launched.
-	GlobalFlags *GlobalFlags `protobuf:"bytes,4,opt,name=global_flags" json:"global_flags,omitempty"`
+	GlobalFlags *GlobalFlags `protobuf:"bytes,4,opt,name=global_flags,json=globalFlags" json:"global_flags,omitempty"`
 }
 
 func (m *Info) Reset()                    { *m = Info{} }
@@ -558,7 +560,7 @@ func (m *Event) GetData() []*KeyValue {
 // The condition are combined by 'AND'.
 type EventFilter struct {
 	// If not empty, then only returns the events that have the listed types.
-	Types []EventType `protobuf:"varint,1,rep,name=types,enum=v1alpha.EventType" json:"types,omitempty"`
+	Types []EventType `protobuf:"varint,1,rep,packed,name=types,enum=v1alpha.EventType" json:"types,omitempty"`
 	// If not empty, then only returns the events whose 'id' is included in the listed ids.
 	Ids []string `protobuf:"bytes,2,rep,name=ids" json:"ids,omitempty"`
 	// If not empty, then only returns the events whose 'from' is included in the listed names.
@@ -566,10 +568,10 @@ type EventFilter struct {
 	// If set, then only returns the events after this timestamp.
 	// If the server starts after since_time, then only the events happened after the start of the server will be returned.
 	// If since_time is a future timestamp, then no events will be returned until that time.
-	SinceTime int64 `protobuf:"varint,4,opt,name=since_time" json:"since_time,omitempty"`
+	SinceTime int64 `protobuf:"varint,4,opt,name=since_time,json=sinceTime" json:"since_time,omitempty"`
 	// If set, then only returns the events before this timestamp.
 	// If it is a future timestamp, then the event stream will be closed at that moment.
-	UntilTime int64 `protobuf:"varint,5,opt,name=until_time" json:"until_time,omitempty"`
+	UntilTime int64 `protobuf:"varint,5,opt,name=until_time,json=untilTime" json:"until_time,omitempty"`
 }
 
 func (m *EventFilter) Reset()                    { *m = EventFilter{} }
@@ -766,11 +768,11 @@ func (m *ListenEventsResponse) GetEvents() []*Event {
 // Request for GetLogs().
 type GetLogsRequest struct {
 	// ID of the pod which we will get logs from, required.
-	PodId string `protobuf:"bytes,1,opt,name=pod_id" json:"pod_id,omitempty"`
+	PodId string `protobuf:"bytes,1,opt,name=pod_id,json=podId" json:"pod_id,omitempty"`
 	// Name of the app within the pod which we will get logs
 	// from, optional. If not set, then the logs of all the
 	// apps within the pod will be returned.
-	AppName string `protobuf:"bytes,2,opt,name=app_name" json:"app_name,omitempty"`
+	AppName string `protobuf:"bytes,2,opt,name=app_name,json=appName" json:"app_name,omitempty"`
 	// Number of most recent lines to return, optional.
 	Lines int32 `protobuf:"varint,3,opt,name=lines" json:"lines,omitempty"`
 	// If true, then a response stream will not be closed,
@@ -778,10 +780,10 @@ type GetLogsRequest struct {
 	Follow bool `protobuf:"varint,4,opt,name=follow" json:"follow,omitempty"`
 	// If set, then only the logs after the timestamp will
 	// be returned, optional.
-	SinceTime int64 `protobuf:"varint,5,opt,name=since_time" json:"since_time,omitempty"`
+	SinceTime int64 `protobuf:"varint,5,opt,name=since_time,json=sinceTime" json:"since_time,omitempty"`
 	// If set, then only the logs before the timestamp will
 	// be returned, optional.
-	UntilTime int64 `protobuf:"varint,6,opt,name=until_time" json:"until_time,omitempty"`
+	UntilTime int64 `protobuf:"varint,6,opt,name=until_time,json=untilTime" json:"until_time,omitempty"`
 }
 
 func (m *GetLogsRequest) Reset()                    { *m = GetLogsRequest{} }
@@ -837,6 +839,10 @@ func init() {
 var _ context.Context
 var _ grpc.ClientConn
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion3
+
 // Client API for PublicAPI service
 
 type PublicAPIClient interface {
@@ -1008,64 +1014,94 @@ func RegisterPublicAPIServer(s *grpc.Server, srv PublicAPIServer) {
 	s.RegisterService(&_PublicAPI_serviceDesc, srv)
 }
 
-func _PublicAPI_GetInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _PublicAPI_GetInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetInfoRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(PublicAPIServer).GetInfo(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(PublicAPIServer).GetInfo(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/v1alpha.PublicAPI/GetInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PublicAPIServer).GetInfo(ctx, req.(*GetInfoRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _PublicAPI_ListPods_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _PublicAPI_ListPods_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ListPodsRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(PublicAPIServer).ListPods(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(PublicAPIServer).ListPods(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/v1alpha.PublicAPI/ListPods",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PublicAPIServer).ListPods(ctx, req.(*ListPodsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _PublicAPI_InspectPod_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _PublicAPI_InspectPod_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(InspectPodRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(PublicAPIServer).InspectPod(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(PublicAPIServer).InspectPod(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/v1alpha.PublicAPI/InspectPod",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PublicAPIServer).InspectPod(ctx, req.(*InspectPodRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _PublicAPI_ListImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _PublicAPI_ListImages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ListImagesRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(PublicAPIServer).ListImages(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(PublicAPIServer).ListImages(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/v1alpha.PublicAPI/ListImages",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PublicAPIServer).ListImages(ctx, req.(*ListImagesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
-func _PublicAPI_InspectImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _PublicAPI_InspectImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(InspectImageRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
-	out, err := srv.(PublicAPIServer).InspectImage(ctx, in)
-	if err != nil {
-		return nil, err
+	if interceptor == nil {
+		return srv.(PublicAPIServer).InspectImage(ctx, in)
 	}
-	return out, nil
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/v1alpha.PublicAPI/InspectImage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PublicAPIServer).InspectImage(ctx, req.(*InspectImageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
 }
 
 func _PublicAPI_ListenEvents_Handler(srv interface{}, stream grpc.ServerStream) error {
@@ -1147,102 +1183,122 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptor0,
 }
 
+func init() { proto.RegisterFile("api.proto", fileDescriptor0) }
+
 var fileDescriptor0 = []byte{
-	// 1496 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xcd, 0x6e, 0xdb, 0x46,
-	0x10, 0x8e, 0xfe, 0xa5, 0x91, 0x22, 0x4b, 0x6b, 0x27, 0x96, 0x95, 0x3f, 0x87, 0x6d, 0x83, 0xd4,
-	0x07, 0xb7, 0x75, 0xd2, 0x5c, 0x0a, 0x14, 0x51, 0x6c, 0xda, 0x50, 0x63, 0x4b, 0x82, 0xa2, 0x18,
-	0xcd, 0x89, 0xa0, 0xa4, 0x95, 0x43, 0x98, 0x22, 0x59, 0x92, 0x72, 0xe2, 0x1e, 0x7b, 0xea, 0xad,
-	0x8f, 0xd0, 0xc7, 0xe8, 0x3b, 0xf4, 0x31, 0x0a, 0xf4, 0x3d, 0x3a, 0xbb, 0x5c, 0x92, 0x4b, 0x8a,
-	0x3a, 0xf4, 0x66, 0xcd, 0xcc, 0x7e, 0xf3, 0xcd, 0xec, 0xcc, 0xb7, 0x34, 0xd4, 0x74, 0xc7, 0x38,
-	0x74, 0x5c, 0xdb, 0xb7, 0x49, 0xe5, 0xe6, 0x3b, 0xdd, 0x74, 0x3e, 0xea, 0xca, 0x6b, 0xa8, 0xf7,
-	0x97, 0xfa, 0x15, 0x3d, 0xb5, 0xdd, 0xa5, 0xee, 0x93, 0x7d, 0x28, 0xfa, 0xb7, 0x0e, 0xed, 0xe4,
-	0xf6, 0x73, 0xcf, 0x9b, 0x47, 0xe4, 0x50, 0x84, 0x1d, 0xf2, 0x98, 0x09, 0x7a, 0xc8, 0x16, 0x54,
-	0x6e, 0xa8, 0xeb, 0x19, 0xb6, 0xd5, 0xc9, 0x63, 0x50, 0x4d, 0xf9, 0x27, 0x07, 0x25, 0xee, 0x26,
-	0x5f, 0x43, 0x7d, 0xaa, 0x7b, 0x54, 0x5b, 0x70, 0x2c, 0x8e, 0x51, 0x3f, 0xda, 0x49, 0x62, 0x88,
-	0x3c, 0x00, 0x79, 0x63, 0x1e, 0x00, 0x90, 0x06, 0x14, 0x2d, 0x7d, 0x49, 0x3b, 0x05, 0xfe, 0x4b,
-	0xc2, 0x2f, 0x72, 0x43, 0x07, 0x5a, 0xc6, 0xd2, 0xb1, 0x5d, 0x5f, 0xf3, 0x8d, 0x25, 0xf5, 0x7c,
-	0x7d, 0xe9, 0x74, 0x4a, 0xe8, 0x29, 0x90, 0x16, 0x54, 0x97, 0xba, 0x65, 0x2c, 0xd0, 0xd8, 0x29,
-	0xa3, 0xa5, 0xc1, 0xa0, 0x3c, 0xe3, 0x57, 0xda, 0xa9, 0x70, 0xff, 0x33, 0xa8, 0xeb, 0x96, 0x65,
-	0xfb, 0xba, 0x8f, 0x68, 0x5e, 0xa7, 0xba, 0x5f, 0x40, 0x3e, 0xed, 0x88, 0xcf, 0x5b, 0x7a, 0x7b,
-	0xa9, 0x9b, 0x2b, 0x4a, 0x9e, 0x42, 0xd9, 0xd4, 0xa7, 0xd4, 0xf4, 0x3a, 0xb5, 0x0d, 0x21, 0xca,
-	0x0b, 0xa8, 0x0c, 0xa8, 0xff, 0xc9, 0x76, 0xaf, 0x23, 0xba, 0xb9, 0x90, 0xbc, 0xe1, 0xdc, 0xbc,
-	0x8c, 0x4b, 0xc1, 0x5f, 0xaf, 0x82, 0x52, 0x94, 0x3f, 0x72, 0x50, 0xe8, 0x39, 0x4e, 0xea, 0xc4,
-	0x23, 0x28, 0x19, 0xac, 0x13, 0xfc, 0x48, 0xfd, 0xa8, 0x99, 0xec, 0x0f, 0xde, 0x40, 0x09, 0x6b,
-	0xf4, 0x83, 0x76, 0x34, 0x25, 0x2e, 0x88, 0xf4, 0x8e, 0x39, 0x48, 0x1b, 0x6a, 0xf4, 0xb3, 0xe1,
-	0x6b, 0x33, 0x7b, 0x4e, 0x79, 0x8f, 0xda, 0xe9, 0x4a, 0x4b, 0x9b, 0xca, 0xf8, 0x3d, 0x0f, 0x85,
-	0x91, 0x3d, 0x17, 0xed, 0x0f, 0xf8, 0xd4, 0xa1, 0xe0, 0x88, 0xbb, 0x68, 0x6f, 0xce, 0x8e, 0xa7,
-	0x82, 0xec, 0x5d, 0x28, 0xea, 0x8e, 0xe3, 0x61, 0x62, 0x96, 0xa3, 0x21, 0xd3, 0x23, 0x0a, 0x54,
-	0xad, 0xa0, 0x4b, 0x21, 0x87, 0x56, 0xe4, 0x0f, 0xdb, 0xb7, 0x7e, 0x69, 0x29, 0xf2, 0x95, 0x4d,
-	0xd7, 0xd4, 0x84, 0xf2, 0xec, 0xca, 0xb5, 0x57, 0x0e, 0xde, 0x24, 0x23, 0x8e, 0x55, 0xcc, 0x5c,
-	0x8a, 0x9c, 0xe6, 0x1a, 0x4e, 0x5b, 0x8d, 0x5f, 0x39, 0xda, 0x90, 0xbf, 0x2b, 0x6c, 0xc0, 0x6d,
-	0x3b, 0xd0, 0xb8, 0x9a, 0x69, 0x4b, 0xdd, 0xbd, 0x0e, 0xac, 0x75, 0x66, 0x55, 0x9e, 0x41, 0x35,
-	0x42, 0xc6, 0x16, 0xe0, 0xdf, 0xa2, 0x1f, 0x77, 0xa1, 0x74, 0xc3, 0xac, 0x62, 0xbc, 0xff, 0xce,
-	0x41, 0x0d, 0x8b, 0x3f, 0x35, 0x4c, 0x9f, 0xba, 0x2c, 0xd2, 0x98, 0x7b, 0x18, 0x59, 0xc0, 0x48,
-	0x9c, 0x1b, 0xde, 0x2c, 0x0f, 0x43, 0x0b, 0xd9, 0xdd, 0x6a, 0xb3, 0xa5, 0x73, 0x34, 0x76, 0xfd,
-	0x1e, 0xf6, 0x94, 0x9d, 0x42, 0x13, 0xbf, 0x7f, 0x8d, 0x01, 0x15, 0xb9, 0xe9, 0x1e, 0xdc, 0x15,
-	0x7d, 0x13, 0x91, 0x25, 0x6e, 0x4e, 0x35, 0xa6, 0xbc, 0xa9, 0x31, 0xb8, 0x32, 0x41, 0x63, 0x82,
-	0xe6, 0xd5, 0xc8, 0x2e, 0x6c, 0x39, 0xf6, 0x5c, 0xf3, 0x56, 0x53, 0x2d, 0x74, 0xb0, 0xe1, 0xe7,
-	0xbb, 0x2a, 0xd6, 0x3d, 0xa3, 0x1c, 0xbc, 0x19, 0xc7, 0xa5, 0x0b, 0xe3, 0xb3, 0x28, 0x88, 0x77,
-	0x98, 0x2f, 0xb4, 0x4c, 0x1f, 0xa3, 0xae, 0xe9, 0x2d, 0x72, 0x8d, 0xd8, 0xc7, 0xeb, 0xb3, 0x69,
-	0xee, 0xc8, 0x7d, 0x68, 0x06, 0x3b, 0xcc, 0x6e, 0x60, 0x81, 0x99, 0xf9, 0xd5, 0x17, 0x18, 0xd1,
-	0xc8, 0x3e, 0xa5, 0xa8, 0x1b, 0xff, 0x77, 0x75, 0x91, 0xe1, 0x62, 0x65, 0x9a, 0x82, 0x61, 0x8d,
-	0x17, 0xf9, 0x27, 0x16, 0x79, 0x66, 0xda, 0x53, 0xdd, 0x3c, 0x35, 0xf5, 0x2b, 0x8f, 0x15, 0x39,
-	0x37, 0x5c, 0x71, 0xbb, 0x7b, 0xd0, 0xf6, 0x6e, 0x3d, 0x9f, 0x2e, 0x71, 0x7d, 0xac, 0x85, 0x71,
-	0xa5, 0x31, 0x57, 0x3e, 0x14, 0x1a, 0xd3, 0x9e, 0xe9, 0xa6, 0xec, 0x09, 0x34, 0x09, 0x69, 0xae,
-	0x3c, 0xea, 0xca, 0x8e, 0x40, 0x9b, 0x58, 0x5d, 0x96, 0x47, 0x67, 0x2b, 0x17, 0x55, 0x8f, 0x25,
-	0xe3, 0xca, 0xc4, 0x76, 0xfc, 0x9e, 0xef, 0xae, 0x3c, 0x5f, 0xc3, 0x56, 0x79, 0xda, 0xc2, 0xb5,
-	0x97, 0xda, 0x47, 0xdf, 0x77, 0x3c, 0x5e, 0x76, 0x55, 0x71, 0xa1, 0xd8, 0xb7, 0x16, 0x36, 0xd9,
-	0x86, 0xba, 0x7b, 0xed, 0x6b, 0xa1, 0xde, 0x05, 0x0c, 0x71, 0x5c, 0x71, 0x64, 0x66, 0x5a, 0x42,
-	0x65, 0x59, 0x28, 0xaa, 0x77, 0x64, 0x0c, 0x78, 0x1d, 0xe0, 0x64, 0xf3, 0x42, 0x45, 0xf2, 0x62,
-	0x4a, 0x71, 0xa5, 0x2e, 0x60, 0xce, 0x92, 0x7a, 0x43, 0xad, 0xcd, 0x12, 0xcf, 0xbd, 0x5c, 0xe2,
-	0x53, 0xe2, 0xcc, 0xe8, 0x8b, 0x84, 0xf8, 0x8b, 0x89, 0x30, 0x4f, 0x54, 0x20, 0x4f, 0xa0, 0x38,
-	0xd7, 0x7d, 0x7d, 0xb3, 0xdc, 0xf8, 0x50, 0xe7, 0xa8, 0x62, 0xda, 0x9e, 0x42, 0x89, 0x65, 0x0e,
-	0xe6, 0x2d, 0x3b, 0xb5, 0x18, 0xc8, 0x60, 0xfc, 0x70, 0x13, 0xe5, 0xc9, 0x63, 0xbb, 0x6d, 0x58,
-	0x33, 0xaa, 0x49, 0x14, 0xd0, 0xb6, 0xb2, 0x7c, 0xc3, 0x0c, 0x6c, 0xfc, 0x59, 0x50, 0x5a, 0xd0,
-	0x3c, 0xa3, 0x3e, 0x6b, 0xf0, 0x98, 0xfe, 0xb2, 0x42, 0x9d, 0x51, 0x0e, 0x61, 0x2b, 0xb2, 0x78,
-	0x0e, 0x0e, 0x14, 0x25, 0x0f, 0x50, 0xa9, 0xf1, 0xb7, 0x78, 0xa4, 0xee, 0xc6, 0x22, 0x8c, 0x46,
-	0xe5, 0x14, 0xb6, 0xce, 0x0d, 0xcf, 0xc7, 0x2d, 0xf6, 0x04, 0x04, 0xf9, 0x02, 0x2a, 0x0b, 0x5e,
-	0x45, 0xc0, 0xbe, 0x2e, 0xb1, 0x8f, 0xd5, 0x01, 0x15, 0x6a, 0x4e, 0x7d, 0xdd, 0x30, 0x79, 0xf3,
-	0xaa, 0x98, 0xb7, 0x15, 0xe3, 0x88, 0xc4, 0xa8, 0x9f, 0xb8, 0x9b, 0x21, 0x4a, 0x43, 0x46, 0x51,
-	0x9e, 0x40, 0xbb, 0x6f, 0x79, 0x0e, 0x9d, 0xb1, 0x23, 0x61, 0x66, 0x49, 0xab, 0x95, 0x6f, 0x80,
-	0xc8, 0x01, 0x02, 0x72, 0x0f, 0x15, 0xdc, 0x9e, 0x8b, 0x52, 0x92, 0x88, 0x3f, 0x41, 0x9b, 0x31,
-	0xe0, 0x3b, 0x1f, 0xd5, 0xf2, 0x55, 0xba, 0x96, 0xf4, 0x1b, 0x9d, 0x5d, 0xcd, 0x4b, 0x20, 0x32,
-	0x96, 0x48, 0xfe, 0x18, 0xca, 0x5c, 0xce, 0x42, 0xac, 0xd4, 0x7b, 0xa6, 0x3c, 0x85, 0x6d, 0x41,
-	0x99, 0xff, 0xce, 0xaa, 0xea, 0x7b, 0xd8, 0x49, 0x86, 0x08, 0xe8, 0xe8, 0xa5, 0xcc, 0x65, 0xbd,
-	0x94, 0xca, 0x0f, 0xb0, 0xcd, 0xf8, 0x50, 0x8b, 0x8f, 0x4f, 0x54, 0xdd, 0x97, 0x50, 0x0e, 0xaa,
-	0x5b, 0xfb, 0x00, 0x91, 0x66, 0x51, 0x79, 0x05, 0x3b, 0xc9, 0xc3, 0x71, 0x39, 0x94, 0x5b, 0xd6,
-	0xca, 0xe1, 0x81, 0xca, 0x2d, 0x1f, 0xae, 0x73, 0xfb, 0x2a, 0xca, 0x87, 0x6d, 0x62, 0x62, 0x1b,
-	0xbd, 0xa7, 0x28, 0x90, 0xa1, 0xe4, 0x8b, 0x1d, 0xc2, 0x39, 0x36, 0x0d, 0x8b, 0xcf, 0x71, 0xee,
-	0x79, 0x89, 0x1d, 0x58, 0xd8, 0xa6, 0x69, 0x7f, 0xe2, 0x33, 0x5c, 0x4d, 0xcd, 0x75, 0x29, 0x63,
-	0xae, 0xb9, 0x58, 0x2a, 0xfb, 0x7c, 0x8a, 0x83, 0xd4, 0x82, 0x6d, 0x84, 0xcc, 0x15, 0xfc, 0x80,
-	0x42, 0x2d, 0xfe, 0x50, 0xeb, 0x60, 0x57, 0x2f, 0x7a, 0x67, 0xaa, 0x36, 0xf9, 0x30, 0x52, 0xb5,
-	0xf7, 0x83, 0x13, 0xf5, 0xb4, 0x3f, 0x50, 0x4f, 0x5a, 0x77, 0x50, 0x4b, 0xb6, 0x24, 0x4f, 0x6f,
-	0x34, 0x3a, 0x6e, 0xe5, 0xf0, 0x0d, 0x6a, 0x4b, 0xc6, 0x93, 0xe1, 0xf1, 0x5b, 0x75, 0xdc, 0xca,
-	0x23, 0x91, 0xa6, 0x64, 0x1e, 0x1e, 0xf7, 0x5b, 0x85, 0x83, 0x11, 0x54, 0xa3, 0x8f, 0x91, 0x5d,
-	0xd8, 0x46, 0x00, 0xed, 0xdd, 0xa4, 0x37, 0x49, 0x26, 0x41, 0xbc, 0xd8, 0x31, 0x7e, 0x3f, 0x18,
-	0xf4, 0x07, 0x67, 0x98, 0x66, 0x07, 0x5a, 0xb1, 0x59, 0xfd, 0xb9, 0x3f, 0xc1, 0xe0, 0xfc, 0xc1,
-	0xbf, 0x39, 0xa8, 0x46, 0x6f, 0x26, 0x42, 0x8e, 0x86, 0x27, 0x19, 0x90, 0x78, 0x36, 0x76, 0xa8,
-	0x17, 0x6f, 0xc6, 0x1f, 0x86, 0x88, 0x98, 0x08, 0x1f, 0x8d, 0xd5, 0x51, 0x6f, 0xcc, 0x52, 0xe5,
-	0x51, 0x9c, 0x49, 0xda, 0x81, 0x30, 0x05, 0xc6, 0x2c, 0xb6, 0x87, 0xcc, 0x8a, 0x38, 0x6d, 0x7b,
-	0xb1, 0xb9, 0xf7, 0x66, 0x38, 0x46, 0x6a, 0xe1, 0xb1, 0x56, 0x29, 0x95, 0x3c, 0x20, 0x5e, 0x4e,
-	0xe6, 0x38, 0x51, 0xcf, 0xd5, 0x09, 0x03, 0xab, 0x24, 0x73, 0x9c, 0xf5, 0xc6, 0x6f, 0xb0, 0x85,
-	0xad, 0xea, 0xc1, 0x5f, 0x79, 0xa8, 0xc5, 0x62, 0x87, 0x37, 0xa4, 0x5e, 0xaa, 0x83, 0xc9, 0xfa,
-	0x0d, 0x3d, 0x80, 0x5d, 0xc9, 0xc3, 0x90, 0x22, 0xfe, 0x39, 0xfc, 0xca, 0x7a, 0x9c, 0xed, 0x0c,
-	0x59, 0x63, 0xed, 0x5d, 0xb8, 0x9f, 0x8a, 0x41, 0x2a, 0xdc, 0x57, 0x40, 0xb9, 0xb8, 0x97, 0xf2,
-	0x89, 0x72, 0x8a, 0xb8, 0x3b, 0xfb, 0x29, 0x97, 0xe0, 0xae, 0x1d, 0x0f, 0xcf, 0xcf, 0xd5, 0x63,
-	0x16, 0x55, 0x4a, 0x81, 0x8b, 0xeb, 0x1c, 0x07, 0x0d, 0x49, 0x82, 0x33, 0x9f, 0x00, 0xaf, 0xb0,
-	0x06, 0x4b, 0xae, 0x60, 0xaa, 0xfa, 0x17, 0xa3, 0x80, 0x72, 0x95, 0x3c, 0x84, 0xce, 0x9a, 0x7b,
-	0xac, 0x5e, 0x0c, 0x2f, 0xd1, 0x5b, 0x3b, 0xfa, 0xad, 0x88, 0x9f, 0x61, 0xab, 0xa9, 0x69, 0xcc,
-	0x7a, 0xa3, 0x3e, 0xf9, 0x11, 0x2a, 0x42, 0xd0, 0xc9, 0x6e, 0xfc, 0xda, 0x25, 0x44, 0xbf, 0xdb,
-	0x59, 0x77, 0x04, 0x5b, 0xa3, 0xdc, 0x21, 0x3d, 0xa8, 0x86, 0xc2, 0x4c, 0xe2, 0xb8, 0x94, 0xe6,
-	0x77, 0xf7, 0x32, 0x3c, 0x11, 0xc4, 0x19, 0x40, 0x2c, 0xc5, 0xa4, 0x2b, 0x3d, 0x20, 0x29, 0x01,
-	0xef, 0x3e, 0xc8, 0xf4, 0xc9, 0x40, 0xb1, 0xac, 0x4a, 0x40, 0x6b, 0xba, 0x2d, 0x01, 0xad, 0xeb,
-	0x30, 0x02, 0x5d, 0x40, 0x43, 0x96, 0x51, 0xf2, 0x30, 0x9d, 0x57, 0x16, 0xe0, 0xee, 0xa3, 0x0d,
-	0xde, 0x08, 0x6e, 0x08, 0x0d, 0x59, 0x21, 0x25, 0xb8, 0x0c, 0xd5, 0x95, 0xe0, 0xb2, 0x64, 0x55,
-	0xb9, 0xf3, 0x6d, 0x8e, 0xbc, 0xe6, 0x97, 0xc6, 0xf4, 0x2b, 0x79, 0x69, 0x92, 0x98, 0x26, 0x2f,
-	0x4d, 0x96, 0x3a, 0x86, 0x30, 0x2d, 0xf3, 0x7f, 0x5e, 0x5f, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff,
-	0x7c, 0xce, 0xe5, 0x26, 0xc9, 0x0e, 0x00, 0x00,
+	// 1767 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x58, 0xcd, 0x6e, 0xdb, 0xc6,
+	0x16, 0x8e, 0xfe, 0xa5, 0x23, 0x59, 0x96, 0xc7, 0x4e, 0xa2, 0x38, 0x3f, 0xd7, 0x97, 0xb9, 0x49,
+	0x7c, 0x8d, 0x0b, 0xe3, 0xc6, 0x49, 0xdb, 0x4d, 0x10, 0x54, 0x96, 0x69, 0x57, 0x88, 0x2d, 0x09,
+	0x8c, 0xe2, 0x36, 0xe8, 0x82, 0xa0, 0x24, 0x4a, 0x21, 0x4c, 0x89, 0x2c, 0x49, 0x39, 0x71, 0x97,
+	0x7d, 0x80, 0xbe, 0x41, 0xbb, 0xea, 0xba, 0xdb, 0x02, 0xdd, 0xf7, 0x51, 0xba, 0xe8, 0x13, 0x74,
+	0xdb, 0x33, 0x3f, 0x24, 0x87, 0xb4, 0x9c, 0x1a, 0xdd, 0x71, 0xce, 0x77, 0xe6, 0x9b, 0xf3, 0x37,
+	0xe7, 0x8c, 0x04, 0x15, 0xc3, 0xb5, 0x76, 0x5d, 0xcf, 0x09, 0x1c, 0x52, 0x3a, 0x7f, 0x6a, 0xd8,
+	0xee, 0x3b, 0x43, 0xe9, 0x41, 0xb5, 0x33, 0x33, 0xa6, 0xe6, 0xa1, 0xe3, 0xcd, 0x8c, 0x80, 0x3c,
+	0x86, 0x7c, 0x70, 0xe1, 0x9a, 0xcd, 0xcc, 0x56, 0x66, 0xbb, 0xbe, 0x47, 0x76, 0x85, 0xda, 0x2e,
+	0xd3, 0x19, 0x20, 0xa2, 0x31, 0x9c, 0x34, 0xa1, 0x74, 0x6e, 0x7a, 0xbe, 0xe5, 0xcc, 0x9b, 0x59,
+	0x54, 0xad, 0x68, 0xe1, 0x52, 0xf9, 0x25, 0x0b, 0x05, 0xa6, 0x4d, 0x3e, 0x81, 0xea, 0xd0, 0xf0,
+	0x4d, 0x7d, 0xc2, 0xa8, 0x19, 0x65, 0x75, 0x6f, 0x23, 0x49, 0xc9, 0x8f, 0xd5, 0x80, 0x2a, 0x0a,
+	0x13, 0xea, 0x90, 0xb5, 0xc6, 0x82, 0x15, 0xbf, 0x08, 0x81, 0xfc, 0xdc, 0x98, 0x99, 0xcd, 0x1c,
+	0x93, 0xb0, 0x6f, 0xf9, 0xf8, 0x7c, 0xe2, 0x78, 0xf2, 0x5f, 0x68, 0x58, 0x33, 0xd7, 0xf1, 0x02,
+	0x3d, 0xb0, 0x66, 0xa6, 0x1f, 0x18, 0x33, 0xb7, 0x59, 0x40, 0x95, 0x9c, 0xb6, 0xca, 0xe5, 0x83,
+	0x50, 0x4c, 0x36, 0xa1, 0x3c, 0x33, 0xe6, 0xd6, 0x04, 0x97, 0xcd, 0x22, 0xaa, 0xd4, 0xb4, 0x68,
+	0x4d, 0x0f, 0xf5, 0xad, 0x6f, 0xcd, 0x66, 0x89, 0x6d, 0x65, 0xdf, 0xe4, 0x19, 0x54, 0x8d, 0xf9,
+	0xdc, 0x09, 0x8c, 0x00, 0x0f, 0xf2, 0x9b, 0xe5, 0xad, 0x1c, 0xfa, 0xb3, 0x16, 0xf9, 0xf3, 0xca,
+	0xbc, 0x38, 0x35, 0xec, 0x85, 0xa9, 0xc9, 0x5a, 0x68, 0x4f, 0xd1, 0x36, 0x86, 0xa6, 0xed, 0x37,
+	0x2b, 0x57, 0xe9, 0x0b, 0x05, 0x45, 0x85, 0x52, 0xd7, 0x0c, 0xde, 0x3b, 0xde, 0x59, 0xe4, 0x73,
+	0x46, 0xf2, 0x19, 0x65, 0x96, 0x7b, 0xfe, 0x5c, 0x44, 0x86, 0x7d, 0x0b, 0xd9, 0xa7, 0x61, 0x6c,
+	0xe8, 0xb7, 0xf2, 0x6b, 0x06, 0x72, 0x2d, 0xd7, 0x5d, 0xca, 0xf1, 0x1f, 0x28, 0x58, 0x34, 0xec,
+	0x8c, 0xa4, 0xba, 0x57, 0x4f, 0x26, 0x43, 0xe3, 0x20, 0x79, 0x02, 0x05, 0x8c, 0x50, 0xc0, 0x43,
+	0x5e, 0x97, 0x4c, 0x46, 0xda, 0xd7, 0x14, 0xd0, 0x38, 0x4e, 0xee, 0x42, 0xc5, 0xfc, 0x60, 0x05,
+	0xfa, 0xc8, 0x19, 0x9b, 0x2c, 0x11, 0x6b, 0x5a, 0x99, 0x0a, 0xda, 0xb8, 0x4e, 0x87, 0xab, 0x70,
+	0x9d, 0x70, 0x29, 0x7f, 0x64, 0x21, 0xd7, 0x77, 0xc6, 0xa2, 0x08, 0x32, 0x51, 0x11, 0x34, 0x20,
+	0xe7, 0x8a, 0xaa, 0x58, 0xd3, 0xe8, 0xe7, 0xd5, 0x46, 0xe2, 0xf6, 0x84, 0x91, 0x5b, 0x90, 0x37,
+	0x5c, 0xd7, 0x47, 0xfb, 0xa8, 0x01, 0x35, 0xd9, 0x19, 0x8d, 0x21, 0xe4, 0x7f, 0x50, 0x9e, 0xf3,
+	0xc0, 0x87, 0x66, 0x36, 0x22, 0x2d, 0x91, 0x11, 0x2d, 0xd2, 0xf8, 0x68, 0xd9, 0xa4, 0x7c, 0x2e,
+	0x5d, 0xab, 0x44, 0x6e, 0x41, 0x71, 0x34, 0xf5, 0x9c, 0x85, 0x8b, 0x25, 0x45, 0xfd, 0x15, 0x2b,
+	0x72, 0x1f, 0x60, 0xe4, 0x99, 0xe8, 0xc2, 0x58, 0xc7, 0xeb, 0x53, 0x61, 0x95, 0x58, 0x11, 0x92,
+	0x56, 0x40, 0x61, 0x74, 0xd0, 0x13, 0x30, 0x70, 0x58, 0x48, 0x10, 0xde, 0x82, 0xda, 0x74, 0xa4,
+	0xcf, 0x0c, 0xef, 0x8c, 0x2b, 0x54, 0x99, 0x02, 0x4c, 0x47, 0x27, 0x4c, 0xd4, 0x0a, 0x94, 0x3d,
+	0x28, 0x87, 0x06, 0xd1, 0xf8, 0xe2, 0xb7, 0x08, 0x78, 0xee, 0xcc, 0xbc, 0x20, 0x1b, 0x50, 0x38,
+	0xa7, 0x90, 0xa8, 0x37, 0xbe, 0x50, 0x7e, 0xcc, 0x42, 0x05, 0x03, 0x7c, 0x68, 0xd9, 0x81, 0xe9,
+	0xd1, 0x5d, 0xd6, 0xd8, 0xc7, 0x5d, 0x39, 0xba, 0x0b, 0x3f, 0x69, 0xb9, 0xb3, 0xa8, 0xfb, 0xb8,
+	0x2d, 0xb7, 0x3c, 0x2d, 0x42, 0x81, 0x16, 0x0f, 0x46, 0x5f, 0xa7, 0x75, 0xe9, 0x63, 0x12, 0x29,
+	0x45, 0x19, 0x05, 0x5d, 0xba, 0xa6, 0x20, 0xab, 0x45, 0x9d, 0xf2, 0xe7, 0x39, 0xc8, 0x04, 0x1d,
+	0x3c, 0xe4, 0x21, 0xac, 0x88, 0x6c, 0x88, 0xdd, 0x05, 0xa6, 0x50, 0x13, 0x42, 0xce, 0x90, 0x4a,
+	0x45, 0xf1, 0x5a, 0xa9, 0xc0, 0xbe, 0xc2, 0x83, 0xcf, 0x73, 0x87, 0x7d, 0x45, 0x2c, 0xb1, 0x31,
+	0xae, 0xba, 0xce, 0x58, 0xf7, 0x17, 0x43, 0x3d, 0xd4, 0x28, 0x33, 0x8d, 0x15, 0x14, 0xbf, 0x5e,
+	0x0c, 0xdb, 0x5c, 0xa8, 0xfc, 0x96, 0x0d, 0x1b, 0xea, 0x55, 0x21, 0xc2, 0xfa, 0x71, 0x3d, 0x73,
+	0x62, 0x7d, 0x10, 0x41, 0x42, 0xcf, 0xc2, 0x35, 0xcd, 0x29, 0x6b, 0x99, 0x72, 0x50, 0x2a, 0x54,
+	0xc2, 0x7d, 0xc2, 0xad, 0x98, 0x1a, 0xf4, 0x31, 0x0e, 0x4a, 0xb8, 0x96, 0x1a, 0x4d, 0xe1, 0x6f,
+	0x1a, 0x0d, 0x79, 0x04, 0x75, 0xde, 0x0b, 0x69, 0x65, 0x4c, 0xd0, 0x4a, 0x56, 0xc7, 0x39, 0x6d,
+	0x25, 0x94, 0xb6, 0xa8, 0x10, 0x6f, 0xd8, 0x6a, 0xa4, 0x36, 0x34, 0xb1, 0x8b, 0x87, 0xed, 0x30,
+	0xda, 0xbd, 0xcf, 0xa4, 0xff, 0xac, 0x31, 0xa2, 0xab, 0x93, 0x85, 0x6d, 0x0b, 0x57, 0x2b, 0xdc,
+	0x55, 0x2a, 0x61, 0xae, 0x2a, 0x7f, 0x66, 0xa0, 0x7a, 0x64, 0x3b, 0x43, 0xc3, 0x3e, 0xb4, 0x8d,
+	0xa9, 0x4f, 0xe3, 0x38, 0xb6, 0xbc, 0xb0, 0x40, 0xf1, 0x93, 0xec, 0xc0, 0x9a, 0x7f, 0xe1, 0x07,
+	0xe6, 0x0c, 0xdb, 0xcf, 0x7c, 0x62, 0x4d, 0x75, 0x8a, 0xf3, 0x62, 0x5d, 0xe5, 0x40, 0x9b, 0xc9,
+	0x0f, 0x50, 0x77, 0x1b, 0x1a, 0xb6, 0x33, 0x32, 0x6c, 0x59, 0x95, 0xf7, 0xcc, 0x3a, 0x93, 0xc7,
+	0x9a, 0x98, 0xe7, 0x85, 0x6f, 0x7a, 0xb2, 0x22, 0x9f, 0x30, 0x2b, 0x54, 0x1c, 0xeb, 0xd1, 0x18,
+	0xce, 0x7d, 0x73, 0xb4, 0xf0, 0x70, 0xc0, 0x51, 0x0b, 0xd9, 0x94, 0x41, 0xb5, 0x50, 0xca, 0xcd,
+	0x7e, 0x0a, 0x37, 0x03, 0x6f, 0xe1, 0x07, 0x3a, 0xe6, 0xc9, 0xd7, 0x27, 0x9e, 0x33, 0xd3, 0xdf,
+	0x05, 0x81, 0xeb, 0xb3, 0x88, 0x97, 0x35, 0xc2, 0x40, 0x0c, 0x90, 0x7f, 0x88, 0xd0, 0x17, 0x14,
+	0x51, 0x7e, 0xca, 0x40, 0xbe, 0x33, 0x9f, 0x38, 0xe4, 0x5f, 0x50, 0xf5, 0xce, 0x02, 0x3d, 0x1c,
+	0x74, 0xdc, 0x75, 0x40, 0xd1, 0xa9, 0x98, 0x75, 0xff, 0x86, 0x1a, 0x5e, 0x98, 0x91, 0x9e, 0x9c,
+	0xc4, 0x55, 0x2a, 0x0b, 0x55, 0x90, 0x03, 0x87, 0x7e, 0xa4, 0xc1, 0x7d, 0x06, 0x14, 0x85, 0x0a,
+	0x9f, 0x61, 0x9b, 0x60, 0x61, 0x16, 0x5e, 0xe4, 0x53, 0x53, 0x5a, 0xca, 0x81, 0x56, 0x9d, 0xc6,
+	0x0b, 0xe5, 0xfb, 0x0c, 0x14, 0xd4, 0x73, 0x73, 0x7e, 0xf5, 0x9b, 0x81, 0xa1, 0xd2, 0x9b, 0x61,
+	0xc9, 0x60, 0xa7, 0x01, 0x09, 0x87, 0x17, 0xfd, 0xa6, 0x32, 0x3a, 0xb7, 0x99, 0x19, 0x38, 0x77,
+	0xe9, 0x37, 0x86, 0x3a, 0x3f, 0x36, 0x02, 0xe3, 0xea, 0xba, 0x66, 0xb0, 0xf2, 0x03, 0x56, 0x0c,
+	0x3b, 0x52, 0xdc, 0xbc, 0x6d, 0x28, 0xd0, 0x63, 0xf9, 0xdd, 0x5b, 0x6e, 0x17, 0x57, 0x08, 0xef,
+	0x68, 0x36, 0xbe, 0xa3, 0xd8, 0xfc, 0xe4, 0x2b, 0xc8, 0x17, 0xac, 0xe3, 0x5a, 0xf3, 0x91, 0xa9,
+	0x4b, 0x26, 0x56, 0x98, 0x84, 0x3e, 0x2a, 0x28, 0xbc, 0x98, 0x07, 0x96, 0xcd, 0x61, 0xfe, 0xe8,
+	0xa8, 0x30, 0x09, 0x85, 0x95, 0x06, 0xd4, 0x8f, 0xcc, 0x80, 0x66, 0x56, 0x33, 0xbf, 0x59, 0xe0,
+	0xb4, 0x50, 0x9e, 0xc3, 0x6a, 0x24, 0xf1, 0x5d, 0xbc, 0x14, 0x26, 0xa6, 0x34, 0x6f, 0xe1, 0x5a,
+	0x3c, 0x96, 0x56, 0xe2, 0xf9, 0x4c, 0x95, 0x18, 0xa4, 0x7c, 0x09, 0xab, 0xc7, 0x96, 0x1f, 0x60,
+	0x3f, 0xf5, 0x05, 0x11, 0x0e, 0xb0, 0xd2, 0x84, 0x39, 0xcd, 0x9d, 0xad, 0x4a, 0xce, 0x46, 0xcd,
+	0x5a, 0x0b, 0x55, 0xe8, 0xbc, 0x19, 0x9b, 0x81, 0x61, 0xd9, 0x2c, 0x17, 0x65, 0x4d, 0xac, 0xd0,
+	0x9c, 0x46, 0x4c, 0x2c, 0xec, 0xc1, 0xe1, 0x89, 0xfd, 0x2d, 0xa4, 0xad, 0xc9, 0xb4, 0x1a, 0x43,
+	0x94, 0x87, 0xb0, 0xd6, 0x99, 0xfb, 0xae, 0x39, 0xa2, 0x1b, 0x43, 0x83, 0x52, 0xe3, 0x1b, 0xa9,
+	0x89, 0xac, 0x24, 0xc8, 0x1f, 0xe0, 0x50, 0x77, 0xc6, 0xc2, 0xd7, 0x24, 0x37, 0x05, 0x94, 0xaf,
+	0x61, 0x8d, 0x1a, 0xc4, 0xda, 0x69, 0xe4, 0xeb, 0x6e, 0xda, 0xd7, 0xf4, 0x8b, 0xf2, 0x9a, 0xde,
+	0xbe, 0x00, 0x22, 0x93, 0x0b, 0x93, 0x1e, 0x43, 0x91, 0x8d, 0x99, 0x90, 0x3c, 0xfd, 0x42, 0x12,
+	0xa8, 0xf2, 0x08, 0xd6, 0x85, 0x43, 0x5c, 0x7e, 0x85, 0xdf, 0x2f, 0x60, 0x23, 0xa9, 0x26, 0x8e,
+	0x89, 0xde, 0x61, 0x99, 0x8f, 0xbc, 0xc3, 0x94, 0x36, 0xac, 0x53, 0x13, 0xcd, 0x39, 0xab, 0x58,
+	0x29, 0xdb, 0x45, 0xee, 0xdc, 0xa5, 0x27, 0xb5, 0x54, 0xfe, 0x9a, 0xd0, 0x51, 0x5e, 0xc2, 0x46,
+	0x92, 0x24, 0xf6, 0xd4, 0x64, 0x92, 0x4b, 0x9e, 0x32, 0x45, 0x4d, 0xa0, 0xca, 0xcf, 0x19, 0x56,
+	0xb7, 0xc7, 0xce, 0x34, 0x32, 0xe0, 0x26, 0x14, 0xe9, 0x2c, 0x8c, 0x3c, 0x2d, 0xe0, 0xaa, 0x33,
+	0x26, 0x77, 0xa0, 0x1c, 0x0e, 0xf4, 0xf0, 0x47, 0x81, 0x98, 0xe7, 0xf4, 0x3e, 0xd9, 0xd6, 0x9c,
+	0xdd, 0xa7, 0xcc, 0x76, 0x41, 0xe3, 0x0b, 0x9a, 0x9a, 0x89, 0x63, 0xdb, 0xce, 0x7b, 0x76, 0x97,
+	0x30, 0x35, 0x7c, 0x95, 0xba, 0x67, 0x85, 0x8f, 0xdf, 0xb3, 0x62, 0xfa, 0x9e, 0x3d, 0x61, 0xb7,
+	0x8a, 0xdb, 0x2b, 0x7c, 0x8d, 0x8e, 0xe7, 0x63, 0x98, 0x2f, 0x76, 0x4c, 0xa8, 0x44, 0x3f, 0x6b,
+	0x70, 0xf2, 0x6f, 0x74, 0x4e, 0x5a, 0x47, 0xaa, 0x3e, 0x78, 0xdb, 0x57, 0xf5, 0x37, 0xdd, 0x03,
+	0xf5, 0xb0, 0xd3, 0x55, 0x0f, 0x1a, 0x37, 0xc8, 0x3a, 0xac, 0x4a, 0x48, 0xab, 0xdf, 0x6f, 0x37,
+	0x32, 0x18, 0x82, 0x35, 0x49, 0x78, 0xd0, 0x6b, 0xbf, 0x52, 0xb5, 0x46, 0x16, 0xdb, 0x57, 0x5d,
+	0x12, 0xf7, 0xda, 0x9d, 0x46, 0x6e, 0xa7, 0x0f, 0xe5, 0xf0, 0xdd, 0x4c, 0x6e, 0xc3, 0x3a, 0x12,
+	0xe8, 0xaf, 0x07, 0xad, 0x41, 0xf2, 0x10, 0xe4, 0x8b, 0x01, 0xed, 0x4d, 0xb7, 0xdb, 0xe9, 0x1e,
+	0xe1, 0x31, 0x1b, 0xd0, 0x88, 0xc5, 0xea, 0x57, 0x9d, 0x01, 0x2a, 0x67, 0x77, 0x7e, 0xcf, 0x40,
+	0x39, 0x7c, 0x4e, 0x51, 0xca, 0x7e, 0xef, 0x60, 0x09, 0x25, 0xee, 0x8d, 0x01, 0xf5, 0x64, 0x5f,
+	0x7b, 0xdb, 0x43, 0xc6, 0x84, 0x7a, 0x5f, 0x53, 0xfb, 0x2d, 0x8d, 0x1e, 0x95, 0xc5, 0x64, 0x90,
+	0x34, 0x80, 0x34, 0x39, 0x6a, 0x59, 0x2c, 0x0f, 0x2d, 0xcb, 0x63, 0x12, 0xee, 0xc4, 0xe2, 0xd6,
+	0x7e, 0x4f, 0x43, 0xd3, 0xc2, 0x6d, 0x8d, 0x42, 0xea, 0x70, 0x6e, 0x78, 0x31, 0x79, 0xc6, 0x81,
+	0x7a, 0xac, 0x0e, 0x28, 0x59, 0x29, 0x79, 0xc6, 0x51, 0x4b, 0xdb, 0xc7, 0x10, 0x36, 0xca, 0x3b,
+	0xf8, 0x53, 0xb2, 0x12, 0x35, 0x6b, 0x9a, 0x21, 0xf5, 0x54, 0xed, 0x0e, 0x2e, 0x67, 0xe8, 0x2e,
+	0xdc, 0x96, 0x10, 0xca, 0x14, 0xd9, 0x9f, 0x21, 0x0a, 0x3c, 0x58, 0x0e, 0x86, 0x56, 0xa3, 0xef,
+	0x9b, 0x70, 0x2b, 0xa5, 0x83, 0xa6, 0x30, 0x2c, 0x87, 0x55, 0x7d, 0x33, 0x85, 0x09, 0x77, 0xf2,
+	0x78, 0x8b, 0xb7, 0x52, 0x90, 0xb0, 0x5d, 0x6f, 0xf7, 0x8e, 0x8f, 0xd5, 0x36, 0xd5, 0x2a, 0xa4,
+	0xc8, 0x45, 0x3a, 0x35, 0x1e, 0x90, 0x24, 0x39, 0xc5, 0x04, 0x79, 0x89, 0x06, 0x58, 0x82, 0x78,
+	0x55, 0x75, 0x4e, 0xfa, 0xdc, 0xe4, 0x32, 0xb9, 0x07, 0xcd, 0x4b, 0xb0, 0xa6, 0x9e, 0xf4, 0x4e,
+	0x11, 0xad, 0xec, 0x7d, 0x97, 0xc7, 0x67, 0xfa, 0x62, 0x68, 0x5b, 0xa3, 0x56, 0xbf, 0x43, 0x5e,
+	0x42, 0x49, 0xcc, 0x19, 0x72, 0x3b, 0x1e, 0xec, 0x89, 0x59, 0xb4, 0xd9, 0xbc, 0x0c, 0xf0, 0xcb,
+	0xa3, 0xdc, 0x20, 0x2d, 0x28, 0x87, 0x83, 0x81, 0xc4, 0x7a, 0xa9, 0x21, 0xb4, 0x79, 0x67, 0x09,
+	0x12, 0x51, 0x1c, 0x01, 0xc4, 0x03, 0x80, 0x6c, 0x4a, 0x73, 0x2d, 0x35, 0x3a, 0x36, 0xef, 0x2e,
+	0xc5, 0x64, 0xa2, 0xb8, 0x6d, 0x4b, 0x44, 0x97, 0x06, 0x85, 0x44, 0x74, 0xb9, 0xcf, 0x23, 0xd1,
+	0x09, 0xd4, 0xe4, 0xd6, 0x4c, 0xee, 0xa5, 0xcf, 0x95, 0x1b, 0xfb, 0xe6, 0xfd, 0x2b, 0xd0, 0x88,
+	0xae, 0x07, 0x35, 0xb9, 0xcd, 0x4a, 0x74, 0x4b, 0x5a, 0xb8, 0x44, 0xb7, 0xac, 0x37, 0x2b, 0x37,
+	0xfe, 0x9f, 0x21, 0x9f, 0xb3, 0xa4, 0xd1, 0x36, 0x96, 0x4c, 0x9a, 0xd4, 0x88, 0x93, 0x49, 0x93,
+	0x3b, 0x1e, 0x65, 0x18, 0x16, 0xd9, 0x5f, 0x3d, 0xcf, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x45,
+	0x22, 0xcb, 0xca, 0xf7, 0x11, 0x00, 0x00,
 }
diff --git a/glide.lock b/glide.lock
index f16535263a..5a02db517d 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 921b4843584237d360fb529fb07e2ba9e869968232e61db80e120c1fa4a15e8b
-updated: 2016-07-28T12:11:29.703586483+02:00
+hash: 6dd4eb2d90cb8ac317ad1aeb1a1cd0ed0d29375f4fecddaf5ae168eb62f6bc4b
+updated: 2016-08-01T11:52:19.106454487-07:00
 imports:
 - name: github.com/appc/docker2aci
   version: 90dfcf166a2967b926e77e4864fb616dc291c026
@@ -165,7 +165,7 @@ imports:
   subpackages:
   - proto
 - name: github.com/golang/protobuf
-  version: 2402d76f3d41f928c7902a765dfc872356dd3aad
+  version: c3cefd437628a0b7d31b34fe44b3a7a540e98527
   subpackages:
   - proto
   - protoc-gen-go
@@ -173,6 +173,7 @@ imports:
   - protoc-gen-go/generator
   - protoc-gen-go/internal/grpc
   - protoc-gen-go/plugin
+  - protoc-gen-go/grpc
 - name: github.com/google/btree
   version: f06e229e679911bb31a04e07ac891115822e37c3
 - name: github.com/gorilla/context
@@ -259,7 +260,7 @@ imports:
   - openpgp/s2k
   - ssh/terminal
 - name: golang.org/x/net
-  version: d513e58596cd55e6f47cd1dcbff6b46035baeccb
+  version: 6a513affb38dc9788b449d59ffed099b8de18fa0
   subpackages:
   - context
   - html
@@ -268,6 +269,7 @@ imports:
   - http2/hpack
   - internal/timeseries
   - trace
+  - lex/httplex
 - name: golang.org/x/sys
   version: b44883b474ffefa37335017174e397412b633a4f
   subpackages:
@@ -277,7 +279,7 @@ imports:
   subpackages:
   - go/vcs
 - name: google.golang.org/grpc
-  version: 0f80f5b995e8332b1bdaac1bc37af0482c60147c
+  version: 02fca896ff5f50c6bbbee0860345a49344b37a03
   subpackages:
   - codes
   - credentials
diff --git a/glide.yaml b/glide.yaml
index 7d78783e12..dc3405a16c 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -159,7 +159,7 @@ import:
   subpackages:
   - proto
 - package: github.com/golang/protobuf
-  version: 2402d76f3d41f928c7902a765dfc872356dd3aad
+  version: c3cefd437628a0b7d31b34fe44b3a7a540e98527
   subpackages:
   - proto
   - protoc-gen-go
@@ -167,6 +167,7 @@ import:
   - protoc-gen-go/generator
   - protoc-gen-go/internal/grpc
   - protoc-gen-go/plugin
+  - protoc-gen-go/grpc
 - package: github.com/google/btree
   version: f06e229e679911bb31a04e07ac891115822e37c3
 - package: github.com/gorilla/context
@@ -235,7 +236,7 @@ import:
   - openpgp/s2k
   - ssh/terminal
 - package: golang.org/x/net
-  version: d513e58596cd55e6f47cd1dcbff6b46035baeccb
+  version: 6a513affb38dc9788b449d59ffed099b8de18fa0
   subpackages:
   - context
   - html
@@ -253,7 +254,7 @@ import:
   subpackages:
   - go/vcs
 - package: google.golang.org/grpc
-  version: 0f80f5b995e8332b1bdaac1bc37af0482c60147c
+  version: 02fca896ff5f50c6bbbee0860345a49344b37a03
   subpackages:
   - codes
   - credentials
diff --git a/vendor/github.com/golang/protobuf/proto/clone.go b/vendor/github.com/golang/protobuf/proto/clone.go
index e98ddec981..e392575b35 100644
--- a/vendor/github.com/golang/protobuf/proto/clone.go
+++ b/vendor/github.com/golang/protobuf/proto/clone.go
@@ -84,9 +84,15 @@ func mergeStruct(out, in reflect.Value) {
 		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
 	}
 
-	if emIn, ok := in.Addr().Interface().(extendableProto); ok {
-		emOut := out.Addr().Interface().(extendableProto)
-		mergeExtension(emOut.ExtensionMap(), emIn.ExtensionMap())
+	if emIn, ok := extendable(in.Addr().Interface()); ok {
+		emOut, _ := extendable(out.Addr().Interface())
+		mIn, muIn := emIn.extensionsRead()
+		if mIn != nil {
+			mOut := emOut.extensionsWrite()
+			muIn.Lock()
+			mergeExtension(mOut, mIn)
+			muIn.Unlock()
+		}
 	}
 
 	uf := in.FieldByName("XXX_unrecognized")
diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go
index 5810782fd8..04dcb88130 100644
--- a/vendor/github.com/golang/protobuf/proto/decode.go
+++ b/vendor/github.com/golang/protobuf/proto/decode.go
@@ -378,6 +378,11 @@ func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group
 		wire := int(u & 0x7)
 		if wire == WireEndGroup {
 			if is_group {
+				if required > 0 {
+					// Not enough information to determine the exact field.
+					// (See below.)
+					return &RequiredNotSetError{"{Unknown}"}
+				}
 				return nil // input is satisfied
 			}
 			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
@@ -390,11 +395,12 @@ func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group
 		if !ok {
 			// Maybe it's an extension?
 			if prop.extendable {
-				if e := structPointer_Interface(base, st).(extendableProto); isExtensionField(e, int32(tag)) {
+				if e, _ := extendable(structPointer_Interface(base, st)); isExtensionField(e, int32(tag)) {
 					if err = o.skip(st, tag, wire); err == nil {
-						ext := e.ExtensionMap()[int32(tag)] // may be missing
+						extmap := e.extensionsWrite()
+						ext := extmap[int32(tag)] // may be missing
 						ext.enc = append(ext.enc, o.buf[oi:o.index]...)
-						e.ExtensionMap()[int32(tag)] = ext
+						extmap[int32(tag)] = ext
 					}
 					continue
 				}
@@ -768,10 +774,11 @@ func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
 		}
 	}
 	keyelem, valelem := keyptr.Elem(), valptr.Elem()
-	if !keyelem.IsValid() || !valelem.IsValid() {
-		// We did not decode the key or the value in the map entry.
-		// Either way, it's an invalid map entry.
-		return fmt.Errorf("proto: bad map data: missing key/val")
+	if !keyelem.IsValid() {
+		keyelem = reflect.Zero(p.mtype.Key())
+	}
+	if !valelem.IsValid() {
+		valelem = reflect.Zero(p.mtype.Elem())
 	}
 
 	v.SetMapIndex(keyelem, valelem)
diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go
index 231b07401a..8c1b8fd1f6 100644
--- a/vendor/github.com/golang/protobuf/proto/encode.go
+++ b/vendor/github.com/golang/protobuf/proto/encode.go
@@ -64,8 +64,16 @@ var (
 	// a struct with a repeated field containing a nil element.
 	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
 
+	// errOneofHasNil is the error returned if Marshal is called with
+	// a struct with a oneof field containing a nil element.
+	errOneofHasNil = errors.New("proto: oneof field has nil value")
+
 	// ErrNil is the error returned if Marshal is called with nil.
 	ErrNil = errors.New("proto: Marshal called with nil")
+
+	// ErrTooLarge is the error returned if Marshal is called with a
+	// message that encodes to >2GB.
+	ErrTooLarge = errors.New("proto: message encodes to over 2 GB")
 )
 
 // The fundamental encoders that put bytes on the wire.
@@ -74,6 +82,10 @@ var (
 
 const maxVarintBytes = 10 // maximum length of a varint
 
+// maxMarshalSize is the largest allowed size of an encoded protobuf,
+// since C++ and Java use signed int32s for the size.
+const maxMarshalSize = 1<<31 - 1
+
 // EncodeVarint returns the varint encoding of x.
 // This is the format for the
 // int32, int64, uint32, uint64, bool, and enum
@@ -273,6 +285,9 @@ func (p *Buffer) Marshal(pb Message) error {
 		stats.Encode++
 	}
 
+	if len(p.buf) > maxMarshalSize {
+		return ErrTooLarge
+	}
 	return err
 }
 
@@ -1058,10 +1073,25 @@ func size_slice_struct_group(p *Properties, base structPointer) (n int) {
 
 // Encode an extension map.
 func (o *Buffer) enc_map(p *Properties, base structPointer) error {
-	v := *structPointer_ExtMap(base, p.field)
-	if err := encodeExtensionMap(v); err != nil {
+	exts := structPointer_ExtMap(base, p.field)
+	if err := encodeExtensionsMap(*exts); err != nil {
+		return err
+	}
+
+	return o.enc_map_body(*exts)
+}
+
+func (o *Buffer) enc_exts(p *Properties, base structPointer) error {
+	exts := structPointer_Extensions(base, p.field)
+	if err := encodeExtensions(exts); err != nil {
 		return err
 	}
+	v, _ := exts.extensionsRead()
+
+	return o.enc_map_body(v)
+}
+
+func (o *Buffer) enc_map_body(v map[int32]Extension) error {
 	// Fast-path for common cases: zero or one extensions.
 	if len(v) <= 1 {
 		for _, e := range v {
@@ -1084,8 +1114,13 @@ func (o *Buffer) enc_map(p *Properties, base structPointer) error {
 }
 
 func size_map(p *Properties, base structPointer) int {
-	v := *structPointer_ExtMap(base, p.field)
-	return sizeExtensionMap(v)
+	v := structPointer_ExtMap(base, p.field)
+	return extensionsMapSize(*v)
+}
+
+func size_exts(p *Properties, base structPointer) int {
+	v := structPointer_Extensions(base, p.field)
+	return extensionsSize(v)
 }
 
 // Encode a map field.
@@ -1114,7 +1149,7 @@ func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
 		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
 			return err
 		}
-		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil {
+		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil && err != ErrNil {
 			return err
 		}
 		return nil
@@ -1124,11 +1159,6 @@ func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
 	for _, key := range v.MapKeys() {
 		val := v.MapIndex(key)
 
-		// The only illegal map entry values are nil message pointers.
-		if val.Kind() == reflect.Ptr && val.IsNil() {
-			return errors.New("proto: map has nil element")
-		}
-
 		keycopy.Set(key)
 		valcopy.Set(val)
 
@@ -1216,13 +1246,18 @@ func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
 					return err
 				}
 			}
+			if len(o.buf) > maxMarshalSize {
+				return ErrTooLarge
+			}
 		}
 	}
 
 	// Do oneof fields.
 	if prop.oneofMarshaler != nil {
 		m := structPointer_Interface(base, prop.stype).(Message)
-		if err := prop.oneofMarshaler(m, o); err != nil {
+		if err := prop.oneofMarshaler(m, o); err == ErrNil {
+			return errOneofHasNil
+		} else if err != nil {
 			return err
 		}
 	}
@@ -1230,6 +1265,9 @@ func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
 	// Add unrecognized fields at the end.
 	if prop.unrecField.IsValid() {
 		v := *structPointer_Bytes(base, prop.unrecField)
+		if len(o.buf)+len(v) > maxMarshalSize {
+			return ErrTooLarge
+		}
 		if len(v) > 0 {
 			o.buf = append(o.buf, v...)
 		}
diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go
index f5db1def3c..8b16f951c7 100644
--- a/vendor/github.com/golang/protobuf/proto/equal.go
+++ b/vendor/github.com/golang/protobuf/proto/equal.go
@@ -121,9 +121,16 @@ func equalStruct(v1, v2 reflect.Value) bool {
 		}
 	}
 
+	if em1 := v1.FieldByName("XXX_InternalExtensions"); em1.IsValid() {
+		em2 := v2.FieldByName("XXX_InternalExtensions")
+		if !equalExtensions(v1.Type(), em1.Interface().(XXX_InternalExtensions), em2.Interface().(XXX_InternalExtensions)) {
+			return false
+		}
+	}
+
 	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
 		em2 := v2.FieldByName("XXX_extensions")
-		if !equalExtensions(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
+		if !equalExtMap(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
 			return false
 		}
 	}
@@ -184,6 +191,13 @@ func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
 		}
 		return true
 	case reflect.Ptr:
+		// Maps may have nil values in them, so check for nil.
+		if v1.IsNil() && v2.IsNil() {
+			return true
+		}
+		if v1.IsNil() != v2.IsNil() {
+			return false
+		}
 		return equalAny(v1.Elem(), v2.Elem(), prop)
 	case reflect.Slice:
 		if v1.Type().Elem().Kind() == reflect.Uint8 {
@@ -223,8 +237,14 @@ func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
 }
 
 // base is the struct type that the extensions are based on.
-// em1 and em2 are extension maps.
-func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
+// x1 and x2 are InternalExtensions.
+func equalExtensions(base reflect.Type, x1, x2 XXX_InternalExtensions) bool {
+	em1, _ := x1.extensionsRead()
+	em2, _ := x2.extensionsRead()
+	return equalExtMap(base, em1, em2)
+}
+
+func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool {
 	if len(em1) != len(em2) {
 		return false
 	}
diff --git a/vendor/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go
index 054f4f1df7..6b9b363746 100644
--- a/vendor/github.com/golang/protobuf/proto/extensions.go
+++ b/vendor/github.com/golang/protobuf/proto/extensions.go
@@ -52,14 +52,99 @@ type ExtensionRange struct {
 	Start, End int32 // both inclusive
 }
 
-// extendableProto is an interface implemented by any protocol buffer that may be extended.
+// extendableProto is an interface implemented by any protocol buffer generated by the current
+// proto compiler that may be extended.
 type extendableProto interface {
+	Message
+	ExtensionRangeArray() []ExtensionRange
+	extensionsWrite() map[int32]Extension
+	extensionsRead() (map[int32]Extension, sync.Locker)
+}
+
+// extendableProtoV1 is an interface implemented by a protocol buffer generated by the previous
+// version of the proto compiler that may be extended.
+type extendableProtoV1 interface {
 	Message
 	ExtensionRangeArray() []ExtensionRange
 	ExtensionMap() map[int32]Extension
 }
 
+// extensionAdapter is a wrapper around extendableProtoV1 that implements extendableProto.
+type extensionAdapter struct {
+	extendableProtoV1
+}
+
+func (e extensionAdapter) extensionsWrite() map[int32]Extension {
+	return e.ExtensionMap()
+}
+
+func (e extensionAdapter) extensionsRead() (map[int32]Extension, sync.Locker) {
+	return e.ExtensionMap(), notLocker{}
+}
+
+// notLocker is a sync.Locker whose Lock and Unlock methods are nops.
+type notLocker struct{}
+
+func (n notLocker) Lock()   {}
+func (n notLocker) Unlock() {}
+
+// extendable returns the extendableProto interface for the given generated proto message.
+// If the proto message has the old extension format, it returns a wrapper that implements
+// the extendableProto interface.
+func extendable(p interface{}) (extendableProto, bool) {
+	if ep, ok := p.(extendableProto); ok {
+		return ep, ok
+	}
+	if ep, ok := p.(extendableProtoV1); ok {
+		return extensionAdapter{ep}, ok
+	}
+	return nil, false
+}
+
+// XXX_InternalExtensions is an internal representation of proto extensions.
+//
+// Each generated message struct type embeds an anonymous XXX_InternalExtensions field,
+// thus gaining the unexported 'extensions' method, which can be called only from the proto package.
+//
+// The methods of XXX_InternalExtensions are not concurrency safe in general,
+// but calls to logically read-only methods such as has and get may be executed concurrently.
+type XXX_InternalExtensions struct {
+	// The struct must be indirect so that if a user inadvertently copies a
+	// generated message and its embedded XXX_InternalExtensions, they
+	// avoid the mayhem of a copied mutex.
+	//
+	// The mutex serializes all logically read-only operations to p.extensionMap.
+	// It is up to the client to ensure that write operations to p.extensionMap are
+	// mutually exclusive with other accesses.
+	p *struct {
+		mu           sync.Mutex
+		extensionMap map[int32]Extension
+	}
+}
+
+// extensionsWrite returns the extension map, creating it on first use.
+func (e *XXX_InternalExtensions) extensionsWrite() map[int32]Extension {
+	if e.p == nil {
+		e.p = new(struct {
+			mu           sync.Mutex
+			extensionMap map[int32]Extension
+		})
+		e.p.extensionMap = make(map[int32]Extension)
+	}
+	return e.p.extensionMap
+}
+
+// extensionsRead returns the extensions map for read-only use.  It may be nil.
+// The caller must hold the returned mutex's lock when accessing Elements within the map.
+func (e *XXX_InternalExtensions) extensionsRead() (map[int32]Extension, sync.Locker) {
+	if e.p == nil {
+		return nil, nil
+	}
+	return e.p.extensionMap, &e.p.mu
+}
+
 var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
+var extendableProtoV1Type = reflect.TypeOf((*extendableProtoV1)(nil)).Elem()
 
 // ExtensionDesc represents an extension specification.
 // Used in generated code from the protocol compiler.
@@ -92,8 +177,13 @@ type Extension struct {
 }
 
 // SetRawExtension is for testing only.
-func SetRawExtension(base extendableProto, id int32, b []byte) {
-	base.ExtensionMap()[id] = Extension{enc: b}
+func SetRawExtension(base Message, id int32, b []byte) {
+	epb, ok := extendable(base)
+	if !ok {
+		return
+	}
+	extmap := epb.extensionsWrite()
+	extmap[id] = Extension{enc: b}
 }
 
 // isExtensionField returns true iff the given field number is in an extension range.
@@ -108,8 +198,12 @@ func isExtensionField(pb extendableProto, field int32) bool {
 
 // checkExtensionTypes checks that the given extension is valid for pb.
 func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
+	var pbi interface{} = pb
 	// Check the extended type.
-	if a, b := reflect.TypeOf(pb), reflect.TypeOf(extension.ExtendedType); a != b {
+	if ea, ok := pbi.(extensionAdapter); ok {
+		pbi = ea.extendableProtoV1
+	}
+	if a, b := reflect.TypeOf(pbi), reflect.TypeOf(extension.ExtendedType); a != b {
 		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
 	}
 	// Check the range.
@@ -155,8 +249,19 @@ func extensionProperties(ed *ExtensionDesc) *Properties {
 	return prop
 }
 
-// encodeExtensionMap encodes any unmarshaled (unencoded) extensions in m.
-func encodeExtensionMap(m map[int32]Extension) error {
+// encode encodes any unmarshaled (unencoded) extensions in e.
+func encodeExtensions(e *XXX_InternalExtensions) error {
+	m, mu := e.extensionsRead()
+	if m == nil {
+		return nil // fast path
+	}
+	mu.Lock()
+	defer mu.Unlock()
+	return encodeExtensionsMap(m)
+}
+
+// encode encodes any unmarshaled (unencoded) extensions in e.
+func encodeExtensionsMap(m map[int32]Extension) error {
 	for k, e := range m {
 		if e.value == nil || e.desc == nil {
 			// Extension is only in its encoded form.
@@ -184,7 +289,17 @@ func encodeExtensionMap(m map[int32]Extension) error {
 	return nil
 }
 
-func sizeExtensionMap(m map[int32]Extension) (n int) {
+func extensionsSize(e *XXX_InternalExtensions) (n int) {
+	m, mu := e.extensionsRead()
+	if m == nil {
+		return 0
+	}
+	mu.Lock()
+	defer mu.Unlock()
+	return extensionsMapSize(m)
+}
+
+func extensionsMapSize(m map[int32]Extension) (n int) {
 	for _, e := range m {
 		if e.value == nil || e.desc == nil {
 			// Extension is only in its encoded form.
@@ -209,26 +324,51 @@ func sizeExtensionMap(m map[int32]Extension) (n int) {
 }
 
 // HasExtension returns whether the given extension is present in pb.
-func HasExtension(pb extendableProto, extension *ExtensionDesc) bool {
+func HasExtension(pb Message, extension *ExtensionDesc) bool {
 	// TODO: Check types, field numbers, etc.?
-	_, ok := pb.ExtensionMap()[extension.Field]
+	epb, ok := extendable(pb)
+	if !ok {
+		return false
+	}
+	extmap, mu := epb.extensionsRead()
+	if extmap == nil {
+		return false
+	}
+	mu.Lock()
+	_, ok = extmap[extension.Field]
+	mu.Unlock()
 	return ok
 }
 
 // ClearExtension removes the given extension from pb.
-func ClearExtension(pb extendableProto, extension *ExtensionDesc) {
+func ClearExtension(pb Message, extension *ExtensionDesc) {
+	epb, ok := extendable(pb)
+	if !ok {
+		return
+	}
 	// TODO: Check types, field numbers, etc.?
-	delete(pb.ExtensionMap(), extension.Field)
+	extmap := epb.extensionsWrite()
+	delete(extmap, extension.Field)
 }
 
 // GetExtension parses and returns the given extension of pb.
 // If the extension is not present and has no default value it returns ErrMissingExtension.
-func GetExtension(pb extendableProto, extension *ExtensionDesc) (interface{}, error) {
-	if err := checkExtensionTypes(pb, extension); err != nil {
+func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
+	epb, ok := extendable(pb)
+	if !ok {
+		return nil, errors.New("proto: not an extendable proto")
+	}
+
+	if err := checkExtensionTypes(epb, extension); err != nil {
 		return nil, err
 	}
 
-	emap := pb.ExtensionMap()
+	emap, mu := epb.extensionsRead()
+	if emap == nil {
+		return defaultExtensionValue(extension)
+	}
+	mu.Lock()
+	defer mu.Unlock()
 	e, ok := emap[extension.Field]
 	if !ok {
 		// defaultExtensionValue returns the default value or
@@ -332,10 +472,9 @@ func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
 // GetExtensions returns a slice of the extensions present in pb that are also listed in es.
 // The returned slice has the same length as es; missing extensions will appear as nil elements.
 func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
-	epb, ok := pb.(extendableProto)
+	epb, ok := extendable(pb)
 	if !ok {
-		err = errors.New("proto: not an extendable proto")
-		return
+		return nil, errors.New("proto: not an extendable proto")
 	}
 	extensions = make([]interface{}, len(es))
 	for i, e := range es {
@@ -350,9 +489,44 @@ func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, e
 	return
 }
 
+// ExtensionDescs returns a new slice containing pb's extension descriptors, in undefined order.
+// For non-registered extensions, ExtensionDescs returns an incomplete descriptor containing
+// just the Field field, which defines the extension's field number.
+func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
+	epb, ok := extendable(pb)
+	if !ok {
+		return nil, fmt.Errorf("proto: %T is not an extendable proto.Message", pb)
+	}
+	registeredExtensions := RegisteredExtensions(pb)
+
+	emap, mu := epb.extensionsRead()
+	if emap == nil {
+		return nil, nil
+	}
+	mu.Lock()
+	defer mu.Unlock()
+	extensions := make([]*ExtensionDesc, 0, len(emap))
+	for extid, e := range emap {
+		desc := e.desc
+		if desc == nil {
+			desc = registeredExtensions[extid]
+			if desc == nil {
+				desc = &ExtensionDesc{Field: extid}
+			}
+		}
+
+		extensions = append(extensions, desc)
+	}
+	return extensions, nil
+}
+
 // SetExtension sets the specified extension of pb to the specified value.
-func SetExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
-	if err := checkExtensionTypes(pb, extension); err != nil {
+func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error {
+	epb, ok := extendable(pb)
+	if !ok {
+		return errors.New("proto: not an extendable proto")
+	}
+	if err := checkExtensionTypes(epb, extension); err != nil {
 		return err
 	}
 	typ := reflect.TypeOf(extension.ExtensionType)
@@ -368,10 +542,23 @@ func SetExtension(pb extendableProto, extension *ExtensionDesc, value interface{
 		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
 	}
 
-	pb.ExtensionMap()[extension.Field] = Extension{desc: extension, value: value}
+	extmap := epb.extensionsWrite()
+	extmap[extension.Field] = Extension{desc: extension, value: value}
 	return nil
 }
 
+// ClearAllExtensions clears all extensions from pb.
+func ClearAllExtensions(pb Message) {
+	epb, ok := extendable(pb)
+	if !ok {
+		return
+	}
+	m := epb.extensionsWrite()
+	for k := range m {
+		delete(m, k)
+	}
+}
+
 // A global registry of extensions.
 // The generated code will register the generated descriptors by calling RegisterExtension.
 
diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go
index 42a58c6fd4..170b8e87d2 100644
--- a/vendor/github.com/golang/protobuf/proto/lib.go
+++ b/vendor/github.com/golang/protobuf/proto/lib.go
@@ -235,6 +235,7 @@ To create and play with a Test object:
 		test := &pb.Test{
 			Label: proto.String("hello"),
 			Type:  proto.Int32(17),
+			Reps:  []int64{1, 2, 3},
 			Optionalgroup: &pb.Test_OptionalGroup{
 				RequiredField: proto.String("good bye"),
 			},
@@ -888,6 +889,10 @@ func isProto3Zero(v reflect.Value) bool {
 	return false
 }
 
+// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
+// to assert that that code is compatible with this version of the proto package.
+const ProtoPackageIsVersion2 = true
+
 // ProtoPackageIsVersion1 is referenced from generated protocol buffer files
 // to assert that that code is compatible with this version of the proto package.
 const ProtoPackageIsVersion1 = true
diff --git a/vendor/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go
index e25e01e637..fd982decd6 100644
--- a/vendor/github.com/golang/protobuf/proto/message_set.go
+++ b/vendor/github.com/golang/protobuf/proto/message_set.go
@@ -149,9 +149,21 @@ func skipVarint(buf []byte) []byte {
 
 // MarshalMessageSet encodes the extension map represented by m in the message set wire format.
 // It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSet(m map[int32]Extension) ([]byte, error) {
-	if err := encodeExtensionMap(m); err != nil {
-		return nil, err
+func MarshalMessageSet(exts interface{}) ([]byte, error) {
+	var m map[int32]Extension
+	switch exts := exts.(type) {
+	case *XXX_InternalExtensions:
+		if err := encodeExtensions(exts); err != nil {
+			return nil, err
+		}
+		m, _ = exts.extensionsRead()
+	case map[int32]Extension:
+		if err := encodeExtensionsMap(exts); err != nil {
+			return nil, err
+		}
+		m = exts
+	default:
+		return nil, errors.New("proto: not an extension map")
 	}
 
 	// Sort extension IDs to provide a deterministic encoding.
@@ -178,7 +190,17 @@ func MarshalMessageSet(m map[int32]Extension) ([]byte, error) {
 
 // UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
 // It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSet(buf []byte, m map[int32]Extension) error {
+func UnmarshalMessageSet(buf []byte, exts interface{}) error {
+	var m map[int32]Extension
+	switch exts := exts.(type) {
+	case *XXX_InternalExtensions:
+		m = exts.extensionsWrite()
+	case map[int32]Extension:
+		m = exts
+	default:
+		return errors.New("proto: not an extension map")
+	}
+
 	ms := new(messageSet)
 	if err := Unmarshal(buf, ms); err != nil {
 		return err
@@ -209,7 +231,16 @@ func UnmarshalMessageSet(buf []byte, m map[int32]Extension) error {
 
 // MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
 // It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSetJSON(m map[int32]Extension) ([]byte, error) {
+func MarshalMessageSetJSON(exts interface{}) ([]byte, error) {
+	var m map[int32]Extension
+	switch exts := exts.(type) {
+	case *XXX_InternalExtensions:
+		m, _ = exts.extensionsRead()
+	case map[int32]Extension:
+		m = exts
+	default:
+		return nil, errors.New("proto: not an extension map")
+	}
 	var b bytes.Buffer
 	b.WriteByte('{')
 
@@ -252,7 +283,7 @@ func MarshalMessageSetJSON(m map[int32]Extension) ([]byte, error) {
 
 // UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
 // It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSetJSON(buf []byte, m map[int32]Extension) error {
+func UnmarshalMessageSetJSON(buf []byte, exts interface{}) error {
 	// Common-case fast path.
 	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
 		return nil
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
index 749919d250..fb512e2e16 100644
--- a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
+++ b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
@@ -29,7 +29,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// +build appengine
+// +build appengine js
 
 // This file contains an implementation of proto field accesses using package reflect.
 // It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
@@ -139,6 +139,11 @@ func structPointer_StringSlice(p structPointer, f field) *[]string {
 	return structPointer_ifield(p, f).(*[]string)
 }
 
+// Extensions returns the address of an extension map field in the struct.
+func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
+	return structPointer_ifield(p, f).(*XXX_InternalExtensions)
+}
+
 // ExtMap returns the address of an extension map field in the struct.
 func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
 	return structPointer_ifield(p, f).(*map[int32]Extension)
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
index e9be0fe92e..6b5567d47c 100644
--- a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
+++ b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
@@ -29,7 +29,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// +build !appengine
+// +build !appengine,!js
 
 // This file contains the implementation of the proto field accesses using package unsafe.
 
@@ -126,6 +126,10 @@ func structPointer_StringSlice(p structPointer, f field) *[]string {
 }
 
 // ExtMap returns the address of an extension map field in the struct.
+func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
+	return (*XXX_InternalExtensions)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+}
+
 func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
 	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
 }
diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go
index d4531c0563..69ddda8d4b 100644
--- a/vendor/github.com/golang/protobuf/proto/properties.go
+++ b/vendor/github.com/golang/protobuf/proto/properties.go
@@ -173,6 +173,7 @@ func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order
 type Properties struct {
 	Name     string // name of the field, for error messages
 	OrigName string // original name before protocol compiler (always set)
+	JSONName string // name to use for JSON; determined by protoc
 	Wire     string
 	WireType int
 	Tag      int
@@ -229,8 +230,9 @@ func (p *Properties) String() string {
 	if p.Packed {
 		s += ",packed"
 	}
-	if p.OrigName != p.Name {
-		s += ",name=" + p.OrigName
+	s += ",name=" + p.OrigName
+	if p.JSONName != p.OrigName {
+		s += ",json=" + p.JSONName
 	}
 	if p.proto3 {
 		s += ",proto3"
@@ -310,6 +312,8 @@ func (p *Properties) Parse(s string) {
 			p.Packed = true
 		case strings.HasPrefix(f, "name="):
 			p.OrigName = f[5:]
+		case strings.HasPrefix(f, "json="):
+			p.JSONName = f[5:]
 		case strings.HasPrefix(f, "enum="):
 			p.Enum = f[5:]
 		case f == "proto3":
@@ -469,17 +473,13 @@ func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lock
 			p.dec = (*Buffer).dec_slice_int64
 			p.packedDec = (*Buffer).dec_slice_packed_int64
 		case reflect.Uint8:
-			p.enc = (*Buffer).enc_slice_byte
 			p.dec = (*Buffer).dec_slice_byte
-			p.size = size_slice_byte
-			// This is a []byte, which is either a bytes field,
-			// or the value of a map field. In the latter case,
-			// we always encode an empty []byte, so we should not
-			// use the proto3 enc/size funcs.
-			// f == nil iff this is the key/value of a map field.
-			if p.proto3 && f != nil {
+			if p.proto3 {
 				p.enc = (*Buffer).enc_proto3_slice_byte
 				p.size = size_proto3_slice_byte
+			} else {
+				p.enc = (*Buffer).enc_slice_byte
+				p.size = size_slice_byte
 			}
 		case reflect.Float32, reflect.Float64:
 			switch t2.Bits() {
@@ -678,7 +678,8 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 	propertiesMap[t] = prop
 
 	// build properties
-	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType)
+	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType) ||
+		reflect.PtrTo(t).Implements(extendableProtoV1Type)
 	prop.unrecField = invalidField
 	prop.Prop = make([]*Properties, t.NumField())
 	prop.order = make([]int, t.NumField())
@@ -689,15 +690,22 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 		name := f.Name
 		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
 
-		if f.Name == "XXX_extensions" { // special case
+		if f.Name == "XXX_InternalExtensions" { // special case
+			p.enc = (*Buffer).enc_exts
+			p.dec = nil // not needed
+			p.size = size_exts
+		} else if f.Name == "XXX_extensions" { // special case
 			p.enc = (*Buffer).enc_map
 			p.dec = nil // not needed
 			p.size = size_map
-		}
-		if f.Name == "XXX_unrecognized" { // special case
+		} else if f.Name == "XXX_unrecognized" { // special case
 			prop.unrecField = toField(&f)
 		}
-		oneof := f.Tag.Get("protobuf_oneof") != "" // special case
+		oneof := f.Tag.Get("protobuf_oneof") // special case
+		if oneof != "" {
+			// Oneof fields don't use the traditional protobuf tag.
+			p.OrigName = oneof
+		}
 		prop.Prop[i] = p
 		prop.order[i] = i
 		if debug {
@@ -707,7 +715,7 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 			}
 			print("\n")
 		}
-		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && !oneof {
+		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && oneof == "" {
 			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
 		}
 	}
@@ -840,3 +848,17 @@ func MessageName(x Message) string { return revProtoTypes[reflect.TypeOf(x)] }
 
 // MessageType returns the message type (pointer to struct) for a named message.
 func MessageType(name string) reflect.Type { return protoTypes[name] }
+
+// A registry of all linked proto files.
+var (
+	protoFiles = make(map[string][]byte) // file name => fileDescriptor
+)
+
+// RegisterFile is called from generated code and maps from the
+// full file name of a .proto file to its compressed FileDescriptorProto.
+func RegisterFile(filename string, fileDescriptor []byte) {
+	protoFiles[filename] = fileDescriptor
+}
+
+// FileDescriptor returns the compressed FileDescriptorProto for a .proto file.
+func FileDescriptor(filename string) []byte { return protoFiles[filename] }
diff --git a/vendor/github.com/golang/protobuf/proto/text.go b/vendor/github.com/golang/protobuf/proto/text.go
index 2336b144c1..965876bf03 100644
--- a/vendor/github.com/golang/protobuf/proto/text.go
+++ b/vendor/github.com/golang/protobuf/proto/text.go
@@ -154,7 +154,7 @@ func (w *textWriter) indent() { w.ind++ }
 
 func (w *textWriter) unindent() {
 	if w.ind == 0 {
-		log.Printf("proto: textWriter unindented too far")
+		log.Print("proto: textWriter unindented too far")
 		return
 	}
 	w.ind--
@@ -175,7 +175,93 @@ type raw interface {
 	Bytes() []byte
 }
 
-func writeStruct(w *textWriter, sv reflect.Value) error {
+func requiresQuotes(u string) bool {
+	// When type URL contains any characters except [0-9A-Za-z./\-]*, it must be quoted.
+	for _, ch := range u {
+		switch {
+		case ch == '.' || ch == '/' || ch == '_':
+			continue
+		case '0' <= ch && ch <= '9':
+			continue
+		case 'A' <= ch && ch <= 'Z':
+			continue
+		case 'a' <= ch && ch <= 'z':
+			continue
+		default:
+			return true
+		}
+	}
+	return false
+}
+
+// isAny reports whether sv is a google.protobuf.Any message
+func isAny(sv reflect.Value) bool {
+	type wkt interface {
+		XXX_WellKnownType() string
+	}
+	t, ok := sv.Addr().Interface().(wkt)
+	return ok && t.XXX_WellKnownType() == "Any"
+}
+
+// writeProto3Any writes an expanded google.protobuf.Any message.
+//
+// It returns (false, nil) if sv value can't be unmarshaled (e.g. because
+// required messages are not linked in).
+//
+// It returns (true, error) when sv was written in expanded format or an error
+// was encountered.
+func (tm *TextMarshaler) writeProto3Any(w *textWriter, sv reflect.Value) (bool, error) {
+	turl := sv.FieldByName("TypeUrl")
+	val := sv.FieldByName("Value")
+	if !turl.IsValid() || !val.IsValid() {
+		return true, errors.New("proto: invalid google.protobuf.Any message")
+	}
+
+	b, ok := val.Interface().([]byte)
+	if !ok {
+		return true, errors.New("proto: invalid google.protobuf.Any message")
+	}
+
+	parts := strings.Split(turl.String(), "/")
+	mt := MessageType(parts[len(parts)-1])
+	if mt == nil {
+		return false, nil
+	}
+	m := reflect.New(mt.Elem())
+	if err := Unmarshal(b, m.Interface().(Message)); err != nil {
+		return false, nil
+	}
+	w.Write([]byte("["))
+	u := turl.String()
+	if requiresQuotes(u) {
+		writeString(w, u)
+	} else {
+		w.Write([]byte(u))
+	}
+	if w.compact {
+		w.Write([]byte("]:<"))
+	} else {
+		w.Write([]byte("]: <\n"))
+		w.ind++
+	}
+	if err := tm.writeStruct(w, m.Elem()); err != nil {
+		return true, err
+	}
+	if w.compact {
+		w.Write([]byte("> "))
+	} else {
+		w.ind--
+		w.Write([]byte(">\n"))
+	}
+	return true, nil
+}
+
+func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
+	if tm.ExpandAny && isAny(sv) {
+		if canExpand, err := tm.writeProto3Any(w, sv); canExpand {
+			return err
+		}
+	}
 	st := sv.Type()
 	sprops := GetProperties(st)
 	for i := 0; i < sv.NumField(); i++ {
@@ -227,7 +313,7 @@ func writeStruct(w *textWriter, sv reflect.Value) error {
 					}
 					continue
 				}
-				if err := writeAny(w, v, props); err != nil {
+				if err := tm.writeAny(w, v, props); err != nil {
 					return err
 				}
 				if err := w.WriteByte('\n'); err != nil {
@@ -269,7 +355,7 @@ func writeStruct(w *textWriter, sv reflect.Value) error {
 						return err
 					}
 				}
-				if err := writeAny(w, key, props.mkeyprop); err != nil {
+				if err := tm.writeAny(w, key, props.mkeyprop); err != nil {
 					return err
 				}
 				if err := w.WriteByte('\n'); err != nil {
@@ -286,7 +372,7 @@ func writeStruct(w *textWriter, sv reflect.Value) error {
 							return err
 						}
 					}
-					if err := writeAny(w, val, props.mvalprop); err != nil {
+					if err := tm.writeAny(w, val, props.mvalprop); err != nil {
 						return err
 					}
 					if err := w.WriteByte('\n'); err != nil {
@@ -358,7 +444,7 @@ func writeStruct(w *textWriter, sv reflect.Value) error {
 		}
 
 		// Enums have a String method, so writeAny will work fine.
-		if err := writeAny(w, fv, props); err != nil {
+		if err := tm.writeAny(w, fv, props); err != nil {
 			return err
 		}
 
@@ -369,8 +455,8 @@ func writeStruct(w *textWriter, sv reflect.Value) error {
 
 	// Extensions (the XXX_extensions field).
 	pv := sv.Addr()
-	if pv.Type().Implements(extendableProtoType) {
-		if err := writeExtensions(w, pv); err != nil {
+	if _, ok := extendable(pv.Interface()); ok {
+		if err := tm.writeExtensions(w, pv); err != nil {
 			return err
 		}
 	}
@@ -400,7 +486,7 @@ func writeRaw(w *textWriter, b []byte) error {
 }
 
 // writeAny writes an arbitrary field.
-func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
+func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
 	v = reflect.Indirect(v)
 
 	// Floats have special cases.
@@ -427,7 +513,7 @@ func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
 	switch v.Kind() {
 	case reflect.Slice:
 		// Should only be a []byte; repeated fields are handled in writeStruct.
-		if err := writeString(w, string(v.Interface().([]byte))); err != nil {
+		if err := writeString(w, string(v.Bytes())); err != nil {
 			return err
 		}
 	case reflect.String:
@@ -449,15 +535,15 @@ func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
 			}
 		}
 		w.indent()
-		if tm, ok := v.Interface().(encoding.TextMarshaler); ok {
-			text, err := tm.MarshalText()
+		if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
+			text, err := etm.MarshalText()
 			if err != nil {
 				return err
 			}
 			if _, err = w.Write(text); err != nil {
 				return err
 			}
-		} else if err := writeStruct(w, v); err != nil {
+		} else if err := tm.writeStruct(w, v); err != nil {
 			return err
 		}
 		w.unindent()
@@ -601,19 +687,24 @@ func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
 
 // writeExtensions writes all the extensions in pv.
 // pv is assumed to be a pointer to a protocol message struct that is extendable.
-func writeExtensions(w *textWriter, pv reflect.Value) error {
+func (tm *TextMarshaler) writeExtensions(w *textWriter, pv reflect.Value) error {
 	emap := extensionMaps[pv.Type().Elem()]
-	ep := pv.Interface().(extendableProto)
+	ep, _ := extendable(pv.Interface())
 
 	// Order the extensions by ID.
 	// This isn't strictly necessary, but it will give us
 	// canonical output, which will also make testing easier.
-	m := ep.ExtensionMap()
+	m, mu := ep.extensionsRead()
+	if m == nil {
+		return nil
+	}
+	mu.Lock()
 	ids := make([]int32, 0, len(m))
 	for id := range m {
 		ids = append(ids, id)
 	}
 	sort.Sort(int32Slice(ids))
+	mu.Unlock()
 
 	for _, extNum := range ids {
 		ext := m[extNum]
@@ -636,13 +727,13 @@ func writeExtensions(w *textWriter, pv reflect.Value) error {
 
 		// Repeated extensions will appear as a slice.
 		if !desc.repeated() {
-			if err := writeExtension(w, desc.Name, pb); err != nil {
+			if err := tm.writeExtension(w, desc.Name, pb); err != nil {
 				return err
 			}
 		} else {
 			v := reflect.ValueOf(pb)
 			for i := 0; i < v.Len(); i++ {
-				if err := writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
+				if err := tm.writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
 					return err
 				}
 			}
@@ -651,7 +742,7 @@ func writeExtensions(w *textWriter, pv reflect.Value) error {
 	return nil
 }
 
-func writeExtension(w *textWriter, name string, pb interface{}) error {
+func (tm *TextMarshaler) writeExtension(w *textWriter, name string, pb interface{}) error {
 	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
 		return err
 	}
@@ -660,7 +751,7 @@ func writeExtension(w *textWriter, name string, pb interface{}) error {
 			return err
 		}
 	}
-	if err := writeAny(w, reflect.ValueOf(pb), nil); err != nil {
+	if err := tm.writeAny(w, reflect.ValueOf(pb), nil); err != nil {
 		return err
 	}
 	if err := w.WriteByte('\n'); err != nil {
@@ -685,7 +776,15 @@ func (w *textWriter) writeIndent() {
 	w.complete = false
 }
 
-func marshalText(w io.Writer, pb Message, compact bool) error {
+// TextMarshaler is a configurable text format marshaler.
+type TextMarshaler struct {
+	Compact   bool // use compact text format (one line).
+	ExpandAny bool // expand google.protobuf.Any messages of known types
+}
+
+// Marshal writes a given protocol buffer in text format.
+// The only errors returned are from w.
+func (tm *TextMarshaler) Marshal(w io.Writer, pb Message) error {
 	val := reflect.ValueOf(pb)
 	if pb == nil || val.IsNil() {
 		w.Write([]byte("<nil>"))
@@ -700,11 +799,11 @@ func marshalText(w io.Writer, pb Message, compact bool) error {
 	aw := &textWriter{
 		w:        ww,
 		complete: true,
-		compact:  compact,
+		compact:  tm.Compact,
 	}
 
-	if tm, ok := pb.(encoding.TextMarshaler); ok {
-		text, err := tm.MarshalText()
+	if etm, ok := pb.(encoding.TextMarshaler); ok {
+		text, err := etm.MarshalText()
 		if err != nil {
 			return err
 		}
@@ -718,7 +817,7 @@ func marshalText(w io.Writer, pb Message, compact bool) error {
 	}
 	// Dereference the received pointer so we don't have outer < and >.
 	v := reflect.Indirect(val)
-	if err := writeStruct(aw, v); err != nil {
+	if err := tm.writeStruct(aw, v); err != nil {
 		return err
 	}
 	if bw != nil {
@@ -727,25 +826,29 @@ func marshalText(w io.Writer, pb Message, compact bool) error {
 	return nil
 }
 
+// Text is the same as Marshal, but returns the string directly.
+func (tm *TextMarshaler) Text(pb Message) string {
+	var buf bytes.Buffer
+	tm.Marshal(&buf, pb)
+	return buf.String()
+}
+
+var (
+	defaultTextMarshaler = TextMarshaler{}
+	compactTextMarshaler = TextMarshaler{Compact: true}
+)
+
+// TODO: consider removing some of the Marshal functions below.
+
 // MarshalText writes a given protocol buffer in text format.
 // The only errors returned are from w.
-func MarshalText(w io.Writer, pb Message) error {
-	return marshalText(w, pb, false)
-}
+func MarshalText(w io.Writer, pb Message) error { return defaultTextMarshaler.Marshal(w, pb) }
 
 // MarshalTextString is the same as MarshalText, but returns the string directly.
-func MarshalTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, false)
-	return buf.String()
-}
+func MarshalTextString(pb Message) string { return defaultTextMarshaler.Text(pb) }
 
 // CompactText writes a given protocol buffer in compact text format (one line).
-func CompactText(w io.Writer, pb Message) error { return marshalText(w, pb, true) }
+func CompactText(w io.Writer, pb Message) error { return compactTextMarshaler.Marshal(w, pb) }
 
 // CompactTextString is the same as CompactText, but returns the string directly.
-func CompactTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, true)
-	return buf.String()
-}
+func CompactTextString(pb Message) string { return compactTextMarshaler.Text(pb) }
diff --git a/vendor/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go
index 6d0cf25894..7e6f145a10 100644
--- a/vendor/github.com/golang/protobuf/proto/text_parser.go
+++ b/vendor/github.com/golang/protobuf/proto/text_parser.go
@@ -44,6 +44,9 @@ import (
 	"unicode/utf8"
 )
 
+// Error string emitted when deserializing Any and fields are already set
+const anyRepeatedlyUnpacked = "Any message unpacked multiple times, or %q already set"
+
 type ParseError struct {
 	Message string
 	Line    int // 1-based line number
@@ -119,6 +122,14 @@ func isWhitespace(c byte) bool {
 	return false
 }
 
+func isQuote(c byte) bool {
+	switch c {
+	case '"', '\'':
+		return true
+	}
+	return false
+}
+
 func (p *textParser) skipWhitespace() {
 	i := 0
 	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
@@ -155,7 +166,7 @@ func (p *textParser) advance() {
 	p.cur.offset, p.cur.line = p.offset, p.line
 	p.cur.unquoted = ""
 	switch p.s[0] {
-	case '<', '>', '{', '}', ':', '[', ']', ';', ',':
+	case '<', '>', '{', '}', ':', '[', ']', ';', ',', '/':
 		// Single symbol
 		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
 	case '"', '\'':
@@ -333,13 +344,13 @@ func (p *textParser) next() *token {
 	p.advance()
 	if p.done {
 		p.cur.value = ""
-	} else if len(p.cur.value) > 0 && p.cur.value[0] == '"' {
+	} else if len(p.cur.value) > 0 && isQuote(p.cur.value[0]) {
 		// Look for multiple quoted strings separated by whitespace,
 		// and concatenate them.
 		cat := p.cur
 		for {
 			p.skipWhitespace()
-			if p.done || p.s[0] != '"' {
+			if p.done || !isQuote(p.s[0]) {
 				break
 			}
 			p.advance()
@@ -443,7 +454,10 @@ func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
 	fieldSet := make(map[string]bool)
 	// A struct is a sequence of "name: value", terminated by one of
 	// '>' or '}', or the end of the input.  A name may also be
-	// "[extension]".
+	// "[extension]" or "[type/url]".
+	//
+	// The whole struct can also be an expanded Any message, like:
+	// [type/url] < ... struct contents ... >
 	for {
 		tok := p.next()
 		if tok.err != nil {
@@ -453,33 +467,74 @@ func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
 			break
 		}
 		if tok.value == "[" {
-			// Looks like an extension.
+			// Looks like an extension or an Any.
 			//
 			// TODO: Check whether we need to handle
 			// namespace rooted names (e.g. ".something.Foo").
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
+			extName, err := p.consumeExtName()
+			if err != nil {
+				return err
+			}
+
+			if s := strings.LastIndex(extName, "/"); s >= 0 {
+				// If it contains a slash, it's an Any type URL.
+				messageName := extName[s+1:]
+				mt := MessageType(messageName)
+				if mt == nil {
+					return p.errorf("unrecognized message %q in google.protobuf.Any", messageName)
+				}
+				tok = p.next()
+				if tok.err != nil {
+					return tok.err
+				}
+				// consume an optional colon
+				if tok.value == ":" {
+					tok = p.next()
+					if tok.err != nil {
+						return tok.err
+					}
+				}
+				var terminator string
+				switch tok.value {
+				case "<":
+					terminator = ">"
+				case "{":
+					terminator = "}"
+				default:
+					return p.errorf("expected '{' or '<', found %q", tok.value)
+				}
+				v := reflect.New(mt.Elem())
+				if pe := p.readStruct(v.Elem(), terminator); pe != nil {
+					return pe
+				}
+				b, err := Marshal(v.Interface().(Message))
+				if err != nil {
+					return p.errorf("failed to marshal message of type %q: %v", messageName, err)
+				}
+				if fieldSet["type_url"] {
+					return p.errorf(anyRepeatedlyUnpacked, "type_url")
+				}
+				if fieldSet["value"] {
+					return p.errorf(anyRepeatedlyUnpacked, "value")
+				}
+				sv.FieldByName("TypeUrl").SetString(extName)
+				sv.FieldByName("Value").SetBytes(b)
+				fieldSet["type_url"] = true
+				fieldSet["value"] = true
+				continue
 			}
+
 			var desc *ExtensionDesc
 			// This could be faster, but it's functional.
 			// TODO: Do something smarter than a linear scan.
 			for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
-				if d.Name == tok.value {
+				if d.Name == extName {
 					desc = d
 					break
 				}
 			}
 			if desc == nil {
-				return p.errorf("unrecognized extension %q", tok.value)
-			}
-			// Check the extension terminator.
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
-			}
-			if tok.value != "]" {
-				return p.errorf("unrecognized extension terminator %q", tok.value)
+				return p.errorf("unrecognized extension %q", extName)
 			}
 
 			props := &Properties{}
@@ -506,7 +561,7 @@ func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
 				}
 				reqFieldErr = err
 			}
-			ep := sv.Addr().Interface().(extendableProto)
+			ep := sv.Addr().Interface().(Message)
 			if !rep {
 				SetExtension(ep, desc, ext.Interface())
 			} else {
@@ -558,8 +613,9 @@ func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
 
 			// The map entry should be this sequence of tokens:
 			//	< key : KEY value : VALUE >
-			// Technically the "key" and "value" could come in any order,
-			// but in practice they won't.
+			// However, implementations may omit key or value, and technically
+			// we should support them in any order.  See b/28924776 for a time
+			// this went wrong.
 
 			tok := p.next()
 			var terminator string
@@ -571,32 +627,39 @@ func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
 			default:
 				return p.errorf("expected '{' or '<', found %q", tok.value)
 			}
-			if err := p.consumeToken("key"); err != nil {
-				return err
-			}
-			if err := p.consumeToken(":"); err != nil {
-				return err
-			}
-			if err := p.readAny(key, props.mkeyprop); err != nil {
-				return err
-			}
-			if err := p.consumeOptionalSeparator(); err != nil {
-				return err
-			}
-			if err := p.consumeToken("value"); err != nil {
-				return err
-			}
-			if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
-				return err
-			}
-			if err := p.readAny(val, props.mvalprop); err != nil {
-				return err
-			}
-			if err := p.consumeOptionalSeparator(); err != nil {
-				return err
-			}
-			if err := p.consumeToken(terminator); err != nil {
-				return err
+			for {
+				tok := p.next()
+				if tok.err != nil {
+					return tok.err
+				}
+				if tok.value == terminator {
+					break
+				}
+				switch tok.value {
+				case "key":
+					if err := p.consumeToken(":"); err != nil {
+						return err
+					}
+					if err := p.readAny(key, props.mkeyprop); err != nil {
+						return err
+					}
+					if err := p.consumeOptionalSeparator(); err != nil {
+						return err
+					}
+				case "value":
+					if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
+						return err
+					}
+					if err := p.readAny(val, props.mvalprop); err != nil {
+						return err
+					}
+					if err := p.consumeOptionalSeparator(); err != nil {
+						return err
+					}
+				default:
+					p.back()
+					return p.errorf(`expected "key", "value", or %q, found %q`, terminator, tok.value)
+				}
 			}
 
 			dst.SetMapIndex(key, val)
@@ -619,7 +682,8 @@ func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
 				return err
 			}
 			reqFieldErr = err
-		} else if props.Required {
+		}
+		if props.Required {
 			reqCount--
 		}
 
@@ -635,6 +699,35 @@ func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
 	return reqFieldErr
 }
 
+// consumeExtName consumes extension name or expanded Any type URL and the
+// following ']'. It returns the name or URL consumed.
+func (p *textParser) consumeExtName() (string, error) {
+	tok := p.next()
+	if tok.err != nil {
+		return "", tok.err
+	}
+
+	// If extension name or type url is quoted, it's a single token.
+	if len(tok.value) > 2 && isQuote(tok.value[0]) && tok.value[len(tok.value)-1] == tok.value[0] {
+		name, err := unquoteC(tok.value[1:len(tok.value)-1], rune(tok.value[0]))
+		if err != nil {
+			return "", err
+		}
+		return name, p.consumeToken("]")
+	}
+
+	// Consume everything up to "]"
+	var parts []string
+	for tok.value != "]" {
+		parts = append(parts, tok.value)
+		tok = p.next()
+		if tok.err != nil {
+			return "", p.errorf("unrecognized type_url or extension name: %s", tok.err)
+		}
+	}
+	return strings.Join(parts, ""), nil
+}
+
 // consumeOptionalSeparator consumes an optional semicolon or comma.
 // It is used in readStruct to provide backward compatibility.
 func (p *textParser) consumeOptionalSeparator() error {
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
index 6a3be28eb6..2e06cb3a9e 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
@@ -3,7 +3,7 @@
 // DO NOT EDIT!
 
 /*
-Package google_protobuf is a generated protocol buffer package.
+Package descriptor is a generated protocol buffer package.
 
 It is generated from these files:
 	google/protobuf/descriptor.proto
@@ -21,12 +21,14 @@ It has these top-level messages:
 	FileOptions
 	MessageOptions
 	FieldOptions
+	OneofOptions
 	EnumOptions
 	EnumValueOptions
 	ServiceOptions
 	MethodOptions
 	UninterpretedOption
 	SourceCodeInfo
+	GeneratedCodeInfo
 */
 package descriptor
 
@@ -41,7 +43,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type FieldDescriptorProto_Type int32
 
@@ -249,6 +253,46 @@ func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error {
 }
 func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{11, 0} }
 
+type FieldOptions_JSType int32
+
+const (
+	// Use the default type.
+	FieldOptions_JS_NORMAL FieldOptions_JSType = 0
+	// Use JavaScript strings.
+	FieldOptions_JS_STRING FieldOptions_JSType = 1
+	// Use JavaScript numbers.
+	FieldOptions_JS_NUMBER FieldOptions_JSType = 2
+)
+
+var FieldOptions_JSType_name = map[int32]string{
+	0: "JS_NORMAL",
+	1: "JS_STRING",
+	2: "JS_NUMBER",
+}
+var FieldOptions_JSType_value = map[string]int32{
+	"JS_NORMAL": 0,
+	"JS_STRING": 1,
+	"JS_NUMBER": 2,
+}
+
+func (x FieldOptions_JSType) Enum() *FieldOptions_JSType {
+	p := new(FieldOptions_JSType)
+	*p = x
+	return p
+}
+func (x FieldOptions_JSType) String() string {
+	return proto.EnumName(FieldOptions_JSType_name, int32(x))
+}
+func (x *FieldOptions_JSType) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(FieldOptions_JSType_value, data, "FieldOptions_JSType")
+	if err != nil {
+		return err
+	}
+	*x = FieldOptions_JSType(value)
+	return nil
+}
+func (FieldOptions_JSType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{11, 1} }
+
 // The protocol compiler can output a FileDescriptorSet containing the .proto
 // files it parses.
 type FileDescriptorSet struct {
@@ -275,13 +319,13 @@ type FileDescriptorProto struct {
 	// Names of files imported by this file.
 	Dependency []string `protobuf:"bytes,3,rep,name=dependency" json:"dependency,omitempty"`
 	// Indexes of the public imported files in the dependency list above.
-	PublicDependency []int32 `protobuf:"varint,10,rep,name=public_dependency" json:"public_dependency,omitempty"`
+	PublicDependency []int32 `protobuf:"varint,10,rep,name=public_dependency,json=publicDependency" json:"public_dependency,omitempty"`
 	// Indexes of the weak imported files in the dependency list.
 	// For Google-internal migration only. Do not use.
-	WeakDependency []int32 `protobuf:"varint,11,rep,name=weak_dependency" json:"weak_dependency,omitempty"`
+	WeakDependency []int32 `protobuf:"varint,11,rep,name=weak_dependency,json=weakDependency" json:"weak_dependency,omitempty"`
 	// All top-level definitions in this file.
-	MessageType []*DescriptorProto        `protobuf:"bytes,4,rep,name=message_type" json:"message_type,omitempty"`
-	EnumType    []*EnumDescriptorProto    `protobuf:"bytes,5,rep,name=enum_type" json:"enum_type,omitempty"`
+	MessageType []*DescriptorProto        `protobuf:"bytes,4,rep,name=message_type,json=messageType" json:"message_type,omitempty"`
+	EnumType    []*EnumDescriptorProto    `protobuf:"bytes,5,rep,name=enum_type,json=enumType" json:"enum_type,omitempty"`
 	Service     []*ServiceDescriptorProto `protobuf:"bytes,6,rep,name=service" json:"service,omitempty"`
 	Extension   []*FieldDescriptorProto   `protobuf:"bytes,7,rep,name=extension" json:"extension,omitempty"`
 	Options     *FileOptions              `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
@@ -289,7 +333,7 @@ type FileDescriptorProto struct {
 	// You may safely remove this entire field without harming runtime
 	// functionality of the descriptors -- the information is needed only by
 	// development tools.
-	SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info" json:"source_code_info,omitempty"`
+	SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info,json=sourceCodeInfo" json:"source_code_info,omitempty"`
 	// The syntax of the proto file.
 	// The supported values are "proto2" and "proto3".
 	Syntax           *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
@@ -387,15 +431,19 @@ func (m *FileDescriptorProto) GetSyntax() string {
 
 // Describes a message type.
 type DescriptorProto struct {
-	Name             *string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Field            []*FieldDescriptorProto           `protobuf:"bytes,2,rep,name=field" json:"field,omitempty"`
-	Extension        []*FieldDescriptorProto           `protobuf:"bytes,6,rep,name=extension" json:"extension,omitempty"`
-	NestedType       []*DescriptorProto                `protobuf:"bytes,3,rep,name=nested_type" json:"nested_type,omitempty"`
-	EnumType         []*EnumDescriptorProto            `protobuf:"bytes,4,rep,name=enum_type" json:"enum_type,omitempty"`
-	ExtensionRange   []*DescriptorProto_ExtensionRange `protobuf:"bytes,5,rep,name=extension_range" json:"extension_range,omitempty"`
-	OneofDecl        []*OneofDescriptorProto           `protobuf:"bytes,8,rep,name=oneof_decl" json:"oneof_decl,omitempty"`
-	Options          *MessageOptions                   `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                            `json:"-"`
+	Name           *string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Field          []*FieldDescriptorProto           `protobuf:"bytes,2,rep,name=field" json:"field,omitempty"`
+	Extension      []*FieldDescriptorProto           `protobuf:"bytes,6,rep,name=extension" json:"extension,omitempty"`
+	NestedType     []*DescriptorProto                `protobuf:"bytes,3,rep,name=nested_type,json=nestedType" json:"nested_type,omitempty"`
+	EnumType       []*EnumDescriptorProto            `protobuf:"bytes,4,rep,name=enum_type,json=enumType" json:"enum_type,omitempty"`
+	ExtensionRange []*DescriptorProto_ExtensionRange `protobuf:"bytes,5,rep,name=extension_range,json=extensionRange" json:"extension_range,omitempty"`
+	OneofDecl      []*OneofDescriptorProto           `protobuf:"bytes,8,rep,name=oneof_decl,json=oneofDecl" json:"oneof_decl,omitempty"`
+	Options        *MessageOptions                   `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"`
+	ReservedRange  []*DescriptorProto_ReservedRange  `protobuf:"bytes,9,rep,name=reserved_range,json=reservedRange" json:"reserved_range,omitempty"`
+	// Reserved field names, which may not be used by fields in the same message.
+	// A given name may only be reserved once.
+	ReservedName     []string `protobuf:"bytes,10,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
+	XXX_unrecognized []byte   `json:"-"`
 }
 
 func (m *DescriptorProto) Reset()                    { *m = DescriptorProto{} }
@@ -459,6 +507,20 @@ func (m *DescriptorProto) GetOptions() *MessageOptions {
 	return nil
 }
 
+func (m *DescriptorProto) GetReservedRange() []*DescriptorProto_ReservedRange {
+	if m != nil {
+		return m.ReservedRange
+	}
+	return nil
+}
+
+func (m *DescriptorProto) GetReservedName() []string {
+	if m != nil {
+		return m.ReservedName
+	}
+	return nil
+}
+
 type DescriptorProto_ExtensionRange struct {
 	Start            *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
 	End              *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
@@ -486,6 +548,36 @@ func (m *DescriptorProto_ExtensionRange) GetEnd() int32 {
 	return 0
 }
 
+// Range of reserved tag numbers. Reserved tag numbers may not be used by
+// fields or extension ranges in the same message. Reserved ranges may
+// not overlap.
+type DescriptorProto_ReservedRange struct {
+	Start            *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End              *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	XXX_unrecognized []byte `json:"-"`
+}
+
+func (m *DescriptorProto_ReservedRange) Reset()         { *m = DescriptorProto_ReservedRange{} }
+func (m *DescriptorProto_ReservedRange) String() string { return proto.CompactTextString(m) }
+func (*DescriptorProto_ReservedRange) ProtoMessage()    {}
+func (*DescriptorProto_ReservedRange) Descriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{2, 1}
+}
+
+func (m *DescriptorProto_ReservedRange) GetStart() int32 {
+	if m != nil && m.Start != nil {
+		return *m.Start
+	}
+	return 0
+}
+
+func (m *DescriptorProto_ReservedRange) GetEnd() int32 {
+	if m != nil && m.End != nil {
+		return *m.End
+	}
+	return 0
+}
+
 // Describes a field within a message.
 type FieldDescriptorProto struct {
 	Name   *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
@@ -499,7 +591,7 @@ type FieldDescriptorProto struct {
 	// rules are used to find the type (i.e. first the nested types within this
 	// message are searched, then within the parent, on up to the root
 	// namespace).
-	TypeName *string `protobuf:"bytes,6,opt,name=type_name" json:"type_name,omitempty"`
+	TypeName *string `protobuf:"bytes,6,opt,name=type_name,json=typeName" json:"type_name,omitempty"`
 	// For extensions, this is the name of the type being extended.  It is
 	// resolved in the same manner as type_name.
 	Extendee *string `protobuf:"bytes,2,opt,name=extendee" json:"extendee,omitempty"`
@@ -508,17 +600,15 @@ type FieldDescriptorProto struct {
 	// For strings, contains the default text contents (not escaped in any way).
 	// For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
 	// TODO(kenton):  Base-64 encode?
-	DefaultValue *string `protobuf:"bytes,7,opt,name=default_value" json:"default_value,omitempty"`
+	DefaultValue *string `protobuf:"bytes,7,opt,name=default_value,json=defaultValue" json:"default_value,omitempty"`
 	// If set, gives the index of a oneof in the containing type's oneof_decl
-	// list.  This field is a member of that oneof.  Extensions of a oneof should
-	// not set this since the oneof to which they belong will be inferred based
-	// on the extension range containing the extension's field number.
-	OneofIndex *int32 `protobuf:"varint,9,opt,name=oneof_index" json:"oneof_index,omitempty"`
+	// list.  This field is a member of that oneof.
+	OneofIndex *int32 `protobuf:"varint,9,opt,name=oneof_index,json=oneofIndex" json:"oneof_index,omitempty"`
 	// JSON name of this field. The value is set by protocol compiler. If the
 	// user has set a "json_name" option on this field, that option's value
 	// will be used. Otherwise, it's deduced from the field's name by converting
 	// it to camelCase.
-	JsonName         *string       `protobuf:"bytes,10,opt,name=json_name" json:"json_name,omitempty"`
+	JsonName         *string       `protobuf:"bytes,10,opt,name=json_name,json=jsonName" json:"json_name,omitempty"`
 	Options          *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
 	XXX_unrecognized []byte        `json:"-"`
 }
@@ -600,8 +690,9 @@ func (m *FieldDescriptorProto) GetOptions() *FieldOptions {
 
 // Describes a oneof.
 type OneofDescriptorProto struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	Name             *string       `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Options          *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
+	XXX_unrecognized []byte        `json:"-"`
 }
 
 func (m *OneofDescriptorProto) Reset()                    { *m = OneofDescriptorProto{} }
@@ -616,6 +707,13 @@ func (m *OneofDescriptorProto) GetName() string {
 	return ""
 }
 
+func (m *OneofDescriptorProto) GetOptions() *OneofOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
 // Describes an enum type.
 type EnumDescriptorProto struct {
 	Name             *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
@@ -723,13 +821,13 @@ type MethodDescriptorProto struct {
 	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	// Input and output type names.  These are resolved in the same way as
 	// FieldDescriptorProto.type_name, but must refer to a message type.
-	InputType  *string        `protobuf:"bytes,2,opt,name=input_type" json:"input_type,omitempty"`
-	OutputType *string        `protobuf:"bytes,3,opt,name=output_type" json:"output_type,omitempty"`
+	InputType  *string        `protobuf:"bytes,2,opt,name=input_type,json=inputType" json:"input_type,omitempty"`
+	OutputType *string        `protobuf:"bytes,3,opt,name=output_type,json=outputType" json:"output_type,omitempty"`
 	Options    *MethodOptions `protobuf:"bytes,4,opt,name=options" json:"options,omitempty"`
 	// Identifies if client streams multiple client messages
-	ClientStreaming *bool `protobuf:"varint,5,opt,name=client_streaming,def=0" json:"client_streaming,omitempty"`
+	ClientStreaming *bool `protobuf:"varint,5,opt,name=client_streaming,json=clientStreaming,def=0" json:"client_streaming,omitempty"`
 	// Identifies if server streams multiple server messages
-	ServerStreaming  *bool  `protobuf:"varint,6,opt,name=server_streaming,def=0" json:"server_streaming,omitempty"`
+	ServerStreaming  *bool  `protobuf:"varint,6,opt,name=server_streaming,json=serverStreaming,def=0" json:"server_streaming,omitempty"`
 	XXX_unrecognized []byte `json:"-"`
 }
 
@@ -788,23 +886,25 @@ type FileOptions struct {
 	// placed.  By default, the proto package is used, but this is often
 	// inappropriate because proto packages do not normally start with backwards
 	// domain names.
-	JavaPackage *string `protobuf:"bytes,1,opt,name=java_package" json:"java_package,omitempty"`
+	JavaPackage *string `protobuf:"bytes,1,opt,name=java_package,json=javaPackage" json:"java_package,omitempty"`
 	// If set, all the classes from the .proto file are wrapped in a single
 	// outer class with the given name.  This applies to both Proto1
 	// (equivalent to the old "--one_java_file" option) and Proto2 (where
 	// a .proto always translates to a single class, but you may want to
 	// explicitly choose the class name).
-	JavaOuterClassname *string `protobuf:"bytes,8,opt,name=java_outer_classname" json:"java_outer_classname,omitempty"`
+	JavaOuterClassname *string `protobuf:"bytes,8,opt,name=java_outer_classname,json=javaOuterClassname" json:"java_outer_classname,omitempty"`
 	// If set true, then the Java code generator will generate a separate .java
 	// file for each top-level message, enum, and service defined in the .proto
 	// file.  Thus, these types will *not* be nested inside the outer class
 	// named by java_outer_classname.  However, the outer class will still be
 	// generated to contain the file's getDescriptor() method as well as any
 	// top-level extensions defined in the file.
-	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,def=0" json:"java_multiple_files,omitempty"`
+	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,json=javaMultipleFiles,def=0" json:"java_multiple_files,omitempty"`
 	// If set true, then the Java code generator will generate equals() and
 	// hashCode() methods for all messages defined in the .proto file.
-	// - In the full runtime, this is purely a speed optimization, as the
+	// This increases generated code size, potentially substantially for large
+	// protos, which may harm a memory-constrained application.
+	// - In the full runtime this is a speed optimization, as the
 	// AbstractMessage base class includes reflection-based implementations of
 	// these methods.
 	// - In the lite runtime, setting this option changes the semantics of
@@ -812,21 +912,21 @@ type FileOptions struct {
 	// the generated methods compute their results based on field values rather
 	// than object identity. (Implementations should not assume that hashcodes
 	// will be consistent across runtimes or versions of the protocol compiler.)
-	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,def=0" json:"java_generate_equals_and_hash,omitempty"`
+	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,json=javaGenerateEqualsAndHash,def=0" json:"java_generate_equals_and_hash,omitempty"`
 	// If set true, then the Java2 code generator will generate code that
 	// throws an exception whenever an attempt is made to assign a non-UTF-8
 	// byte sequence to a string field.
 	// Message reflection will do the same.
 	// However, an extension field still accepts non-UTF-8 byte sequences.
 	// This option has no effect on when used with the lite runtime.
-	JavaStringCheckUtf8 *bool                     `protobuf:"varint,27,opt,name=java_string_check_utf8,def=0" json:"java_string_check_utf8,omitempty"`
-	OptimizeFor         *FileOptions_OptimizeMode `protobuf:"varint,9,opt,name=optimize_for,enum=google.protobuf.FileOptions_OptimizeMode,def=1" json:"optimize_for,omitempty"`
+	JavaStringCheckUtf8 *bool                     `protobuf:"varint,27,opt,name=java_string_check_utf8,json=javaStringCheckUtf8,def=0" json:"java_string_check_utf8,omitempty"`
+	OptimizeFor         *FileOptions_OptimizeMode `protobuf:"varint,9,opt,name=optimize_for,json=optimizeFor,enum=google.protobuf.FileOptions_OptimizeMode,def=1" json:"optimize_for,omitempty"`
 	// Sets the Go package where structs generated from this .proto will be
 	// placed. If omitted, the Go package will be derived from the following:
 	//   - The basename of the package import path, if provided.
 	//   - Otherwise, the package statement in the .proto file, if present.
 	//   - Otherwise, the basename of the .proto file, without extension.
-	GoPackage *string `protobuf:"bytes,11,opt,name=go_package" json:"go_package,omitempty"`
+	GoPackage *string `protobuf:"bytes,11,opt,name=go_package,json=goPackage" json:"go_package,omitempty"`
 	// Should generic services be generated in each language?  "Generic" services
 	// are not specific to any particular RPC system.  They are generated by the
 	// main code generators in each language (without additional plugins).
@@ -837,9 +937,9 @@ type FileOptions struct {
 	// that generate code specific to your particular RPC system.  Therefore,
 	// these default to false.  Old code which depends on generic services should
 	// explicitly set them to true.
-	CcGenericServices   *bool `protobuf:"varint,16,opt,name=cc_generic_services,def=0" json:"cc_generic_services,omitempty"`
-	JavaGenericServices *bool `protobuf:"varint,17,opt,name=java_generic_services,def=0" json:"java_generic_services,omitempty"`
-	PyGenericServices   *bool `protobuf:"varint,18,opt,name=py_generic_services,def=0" json:"py_generic_services,omitempty"`
+	CcGenericServices   *bool `protobuf:"varint,16,opt,name=cc_generic_services,json=ccGenericServices,def=0" json:"cc_generic_services,omitempty"`
+	JavaGenericServices *bool `protobuf:"varint,17,opt,name=java_generic_services,json=javaGenericServices,def=0" json:"java_generic_services,omitempty"`
+	PyGenericServices   *bool `protobuf:"varint,18,opt,name=py_generic_services,json=pyGenericServices,def=0" json:"py_generic_services,omitempty"`
 	// Is this file deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for everything in the file, or it will be completely ignored; in the very
@@ -847,11 +947,16 @@ type FileOptions struct {
 	Deprecated *bool `protobuf:"varint,23,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// Enables the use of arenas for the proto messages in this file. This applies
 	// only to generated classes for C++.
-	CcEnableArenas *bool `protobuf:"varint,31,opt,name=cc_enable_arenas,def=0" json:"cc_enable_arenas,omitempty"`
+	CcEnableArenas *bool `protobuf:"varint,31,opt,name=cc_enable_arenas,json=ccEnableArenas,def=0" json:"cc_enable_arenas,omitempty"`
+	// Sets the objective c class prefix which is prepended to all objective c
+	// generated classes from this .proto. There is no default.
+	ObjcClassPrefix *string `protobuf:"bytes,36,opt,name=objc_class_prefix,json=objcClassPrefix" json:"objc_class_prefix,omitempty"`
+	// Namespace for generated classes; defaults to the package.
+	CsharpNamespace *string `protobuf:"bytes,37,opt,name=csharp_namespace,json=csharpNamespace" json:"csharp_namespace,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
+	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
 }
 
 func (m *FileOptions) Reset()                    { *m = FileOptions{} }
@@ -866,12 +971,6 @@ var extRange_FileOptions = []proto.ExtensionRange{
 func (*FileOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_FileOptions
 }
-func (m *FileOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
 
 const Default_FileOptions_JavaMultipleFiles bool = false
 const Default_FileOptions_JavaGenerateEqualsAndHash bool = false
@@ -967,6 +1066,20 @@ func (m *FileOptions) GetCcEnableArenas() bool {
 	return Default_FileOptions_CcEnableArenas
 }
 
+func (m *FileOptions) GetObjcClassPrefix() string {
+	if m != nil && m.ObjcClassPrefix != nil {
+		return *m.ObjcClassPrefix
+	}
+	return ""
+}
+
+func (m *FileOptions) GetCsharpNamespace() string {
+	if m != nil && m.CsharpNamespace != nil {
+		return *m.CsharpNamespace
+	}
+	return ""
+}
+
 func (m *FileOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if m != nil {
 		return m.UninterpretedOption
@@ -993,11 +1106,11 @@ type MessageOptions struct {
 	//
 	// Because this is an option, the above two restrictions are not enforced by
 	// the protocol compiler.
-	MessageSetWireFormat *bool `protobuf:"varint,1,opt,name=message_set_wire_format,def=0" json:"message_set_wire_format,omitempty"`
+	MessageSetWireFormat *bool `protobuf:"varint,1,opt,name=message_set_wire_format,json=messageSetWireFormat,def=0" json:"message_set_wire_format,omitempty"`
 	// Disables the generation of the standard "descriptor()" accessor, which can
 	// conflict with a field of the same name.  This is meant to make migration
 	// from proto1 easier; new code should avoid fields named "descriptor".
-	NoStandardDescriptorAccessor *bool `protobuf:"varint,2,opt,name=no_standard_descriptor_accessor,def=0" json:"no_standard_descriptor_accessor,omitempty"`
+	NoStandardDescriptorAccessor *bool `protobuf:"varint,2,opt,name=no_standard_descriptor_accessor,json=noStandardDescriptorAccessor,def=0" json:"no_standard_descriptor_accessor,omitempty"`
 	// Is this message deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for the message, or it will be completely ignored; in the very least,
@@ -1024,11 +1137,11 @@ type MessageOptions struct {
 	// NOTE: Do not set the option in .proto files. Always use the maps syntax
 	// instead. The option should only be implicitly set by the proto compiler
 	// parser.
-	MapEntry *bool `protobuf:"varint,7,opt,name=map_entry" json:"map_entry,omitempty"`
+	MapEntry *bool `protobuf:"varint,7,opt,name=map_entry,json=mapEntry" json:"map_entry,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
+	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
 }
 
 func (m *MessageOptions) Reset()                    { *m = MessageOptions{} }
@@ -1043,12 +1156,6 @@ var extRange_MessageOptions = []proto.ExtensionRange{
 func (*MessageOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_MessageOptions
 }
-func (m *MessageOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
 
 const Default_MessageOptions_MessageSetWireFormat bool = false
 const Default_MessageOptions_NoStandardDescriptorAccessor bool = false
@@ -1098,8 +1205,19 @@ type FieldOptions struct {
 	// The packed option can be enabled for repeated primitive fields to enable
 	// a more efficient representation on the wire. Rather than repeatedly
 	// writing the tag and type for each element, the entire array is encoded as
-	// a single length-delimited blob.
+	// a single length-delimited blob. In proto3, only explicit setting it to
+	// false will avoid using packed encoding.
 	Packed *bool `protobuf:"varint,2,opt,name=packed" json:"packed,omitempty"`
+	// The jstype option determines the JavaScript type used for values of the
+	// field.  The option is permitted only for 64 bit integral and fixed types
+	// (int64, uint64, sint64, fixed64, sfixed64).  By default these types are
+	// represented as JavaScript strings.  This avoids loss of precision that can
+	// happen when a large value is converted to a floating point JavaScript
+	// numbers.  Specifying JS_NUMBER for the jstype causes the generated
+	// JavaScript code to use the JavaScript "number" type instead of strings.
+	// This option is an enum to permit additional types to be added,
+	// e.g. goog.math.Integer.
+	Jstype *FieldOptions_JSType `protobuf:"varint,6,opt,name=jstype,enum=google.protobuf.FieldOptions_JSType,def=0" json:"jstype,omitempty"`
 	// Should this field be parsed lazily?  Lazy applies only to message-type
 	// fields.  It means that when the outer message is initially parsed, the
 	// inner message's contents will not be parsed but instead stored in encoded
@@ -1137,9 +1255,9 @@ type FieldOptions struct {
 	// For Google-internal migration only. Do not use.
 	Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
+	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
 }
 
 func (m *FieldOptions) Reset()                    { *m = FieldOptions{} }
@@ -1154,14 +1272,9 @@ var extRange_FieldOptions = []proto.ExtensionRange{
 func (*FieldOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_FieldOptions
 }
-func (m *FieldOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
 
 const Default_FieldOptions_Ctype FieldOptions_CType = FieldOptions_STRING
+const Default_FieldOptions_Jstype FieldOptions_JSType = FieldOptions_JS_NORMAL
 const Default_FieldOptions_Lazy bool = false
 const Default_FieldOptions_Deprecated bool = false
 const Default_FieldOptions_Weak bool = false
@@ -1180,6 +1293,13 @@ func (m *FieldOptions) GetPacked() bool {
 	return false
 }
 
+func (m *FieldOptions) GetJstype() FieldOptions_JSType {
+	if m != nil && m.Jstype != nil {
+		return *m.Jstype
+	}
+	return Default_FieldOptions_Jstype
+}
+
 func (m *FieldOptions) GetLazy() bool {
 	if m != nil && m.Lazy != nil {
 		return *m.Lazy
@@ -1208,25 +1328,52 @@ func (m *FieldOptions) GetUninterpretedOption() []*UninterpretedOption {
 	return nil
 }
 
+type OneofOptions struct {
+	// The parser stores options it doesn't recognize here. See above.
+	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
+}
+
+func (m *OneofOptions) Reset()                    { *m = OneofOptions{} }
+func (m *OneofOptions) String() string            { return proto.CompactTextString(m) }
+func (*OneofOptions) ProtoMessage()               {}
+func (*OneofOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+
+var extRange_OneofOptions = []proto.ExtensionRange{
+	{1000, 536870911},
+}
+
+func (*OneofOptions) ExtensionRangeArray() []proto.ExtensionRange {
+	return extRange_OneofOptions
+}
+
+func (m *OneofOptions) GetUninterpretedOption() []*UninterpretedOption {
+	if m != nil {
+		return m.UninterpretedOption
+	}
+	return nil
+}
+
 type EnumOptions struct {
 	// Set this option to true to allow mapping different tag names to the same
 	// value.
-	AllowAlias *bool `protobuf:"varint,2,opt,name=allow_alias" json:"allow_alias,omitempty"`
+	AllowAlias *bool `protobuf:"varint,2,opt,name=allow_alias,json=allowAlias" json:"allow_alias,omitempty"`
 	// Is this enum deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for the enum, or it will be completely ignored; in the very least, this
 	// is a formalization for deprecating enums.
 	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
+	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
 }
 
 func (m *EnumOptions) Reset()                    { *m = EnumOptions{} }
 func (m *EnumOptions) String() string            { return proto.CompactTextString(m) }
 func (*EnumOptions) ProtoMessage()               {}
-func (*EnumOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (*EnumOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
 
 var extRange_EnumOptions = []proto.ExtensionRange{
 	{1000, 536870911},
@@ -1235,12 +1382,6 @@ var extRange_EnumOptions = []proto.ExtensionRange{
 func (*EnumOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_EnumOptions
 }
-func (m *EnumOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
 
 const Default_EnumOptions_Deprecated bool = false
 
@@ -1272,15 +1413,15 @@ type EnumValueOptions struct {
 	// this is a formalization for deprecating enum values.
 	Deprecated *bool `protobuf:"varint,1,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
+	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
 }
 
 func (m *EnumValueOptions) Reset()                    { *m = EnumValueOptions{} }
 func (m *EnumValueOptions) String() string            { return proto.CompactTextString(m) }
 func (*EnumValueOptions) ProtoMessage()               {}
-func (*EnumValueOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+func (*EnumValueOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
 
 var extRange_EnumValueOptions = []proto.ExtensionRange{
 	{1000, 536870911},
@@ -1289,12 +1430,6 @@ var extRange_EnumValueOptions = []proto.ExtensionRange{
 func (*EnumValueOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_EnumValueOptions
 }
-func (m *EnumValueOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
 
 const Default_EnumValueOptions_Deprecated bool = false
 
@@ -1319,15 +1454,15 @@ type ServiceOptions struct {
 	// this is a formalization for deprecating services.
 	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
+	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
 }
 
 func (m *ServiceOptions) Reset()                    { *m = ServiceOptions{} }
 func (m *ServiceOptions) String() string            { return proto.CompactTextString(m) }
 func (*ServiceOptions) ProtoMessage()               {}
-func (*ServiceOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+func (*ServiceOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
 
 var extRange_ServiceOptions = []proto.ExtensionRange{
 	{1000, 536870911},
@@ -1336,12 +1471,6 @@ var extRange_ServiceOptions = []proto.ExtensionRange{
 func (*ServiceOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_ServiceOptions
 }
-func (m *ServiceOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
 
 const Default_ServiceOptions_Deprecated bool = false
 
@@ -1366,15 +1495,15 @@ type MethodOptions struct {
 	// this is a formalization for deprecating methods.
 	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option" json:"uninterpreted_option,omitempty"`
-	XXX_extensions      map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized    []byte                    `json:"-"`
+	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	proto.XXX_InternalExtensions `json:"-"`
+	XXX_unrecognized             []byte `json:"-"`
 }
 
 func (m *MethodOptions) Reset()                    { *m = MethodOptions{} }
 func (m *MethodOptions) String() string            { return proto.CompactTextString(m) }
 func (*MethodOptions) ProtoMessage()               {}
-func (*MethodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
+func (*MethodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
 
 var extRange_MethodOptions = []proto.ExtensionRange{
 	{1000, 536870911},
@@ -1383,12 +1512,6 @@ var extRange_MethodOptions = []proto.ExtensionRange{
 func (*MethodOptions) ExtensionRangeArray() []proto.ExtensionRange {
 	return extRange_MethodOptions
 }
-func (m *MethodOptions) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
 
 const Default_MethodOptions_Deprecated bool = false
 
@@ -1416,19 +1539,19 @@ type UninterpretedOption struct {
 	Name []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
 	// The value of the uninterpreted option, in whatever type the tokenizer
 	// identified it as during parsing. Exactly one of these should be set.
-	IdentifierValue  *string  `protobuf:"bytes,3,opt,name=identifier_value" json:"identifier_value,omitempty"`
-	PositiveIntValue *uint64  `protobuf:"varint,4,opt,name=positive_int_value" json:"positive_int_value,omitempty"`
-	NegativeIntValue *int64   `protobuf:"varint,5,opt,name=negative_int_value" json:"negative_int_value,omitempty"`
-	DoubleValue      *float64 `protobuf:"fixed64,6,opt,name=double_value" json:"double_value,omitempty"`
-	StringValue      []byte   `protobuf:"bytes,7,opt,name=string_value" json:"string_value,omitempty"`
-	AggregateValue   *string  `protobuf:"bytes,8,opt,name=aggregate_value" json:"aggregate_value,omitempty"`
+	IdentifierValue  *string  `protobuf:"bytes,3,opt,name=identifier_value,json=identifierValue" json:"identifier_value,omitempty"`
+	PositiveIntValue *uint64  `protobuf:"varint,4,opt,name=positive_int_value,json=positiveIntValue" json:"positive_int_value,omitempty"`
+	NegativeIntValue *int64   `protobuf:"varint,5,opt,name=negative_int_value,json=negativeIntValue" json:"negative_int_value,omitempty"`
+	DoubleValue      *float64 `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"`
+	StringValue      []byte   `protobuf:"bytes,7,opt,name=string_value,json=stringValue" json:"string_value,omitempty"`
+	AggregateValue   *string  `protobuf:"bytes,8,opt,name=aggregate_value,json=aggregateValue" json:"aggregate_value,omitempty"`
 	XXX_unrecognized []byte   `json:"-"`
 }
 
 func (m *UninterpretedOption) Reset()                    { *m = UninterpretedOption{} }
 func (m *UninterpretedOption) String() string            { return proto.CompactTextString(m) }
 func (*UninterpretedOption) ProtoMessage()               {}
-func (*UninterpretedOption) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
+func (*UninterpretedOption) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
 
 func (m *UninterpretedOption) GetName() []*UninterpretedOption_NamePart {
 	if m != nil {
@@ -1485,8 +1608,8 @@ func (m *UninterpretedOption) GetAggregateValue() string {
 // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
 // "foo.(bar.baz).qux".
 type UninterpretedOption_NamePart struct {
-	NamePart         *string `protobuf:"bytes,1,req,name=name_part" json:"name_part,omitempty"`
-	IsExtension      *bool   `protobuf:"varint,2,req,name=is_extension" json:"is_extension,omitempty"`
+	NamePart         *string `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"`
+	IsExtension      *bool   `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
@@ -1494,7 +1617,7 @@ func (m *UninterpretedOption_NamePart) Reset()         { *m = UninterpretedOptio
 func (m *UninterpretedOption_NamePart) String() string { return proto.CompactTextString(m) }
 func (*UninterpretedOption_NamePart) ProtoMessage()    {}
 func (*UninterpretedOption_NamePart) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{16, 0}
+	return fileDescriptor0, []int{17, 0}
 }
 
 func (m *UninterpretedOption_NamePart) GetNamePart() string {
@@ -1564,7 +1687,7 @@ type SourceCodeInfo struct {
 func (m *SourceCodeInfo) Reset()                    { *m = SourceCodeInfo{} }
 func (m *SourceCodeInfo) String() string            { return proto.CompactTextString(m) }
 func (*SourceCodeInfo) ProtoMessage()               {}
-func (*SourceCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
+func (*SourceCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
 
 func (m *SourceCodeInfo) GetLocation() []*SourceCodeInfo_Location {
 	if m != nil {
@@ -1611,6 +1734,11 @@ type SourceCodeInfo_Location struct {
 	// A series of line comments appearing on consecutive lines, with no other
 	// tokens appearing on those lines, will be treated as a single comment.
 	//
+	// leading_detached_comments will keep paragraphs of comments that appear
+	// before (but not connected to) the current element. Each paragraph,
+	// separated by empty lines, will be one comment element in the repeated
+	// field.
+	//
 	// Only the comment content is provided; comment markers (e.g. //) are
 	// stripped out.  For block comments, leading whitespace and an asterisk
 	// will be stripped from the beginning of each line other than the first.
@@ -1631,6 +1759,12 @@ type SourceCodeInfo_Location struct {
 	//   // Another line attached to qux.
 	//   optional double qux = 4;
 	//
+	//   // Detached comment for corge. This is not leading or trailing comments
+	//   // to qux or corge because there are blank lines separating it from
+	//   // both.
+	//
+	//   // Detached comment for corge paragraph 2.
+	//
 	//   optional string corge = 5;
 	//   /* Block comment attached
 	//    * to corge.  Leading asterisks
@@ -1638,15 +1772,18 @@ type SourceCodeInfo_Location struct {
 	//   /* Block comment attached to
 	//    * grault. */
 	//   optional int32 grault = 6;
-	LeadingComments  *string `protobuf:"bytes,3,opt,name=leading_comments" json:"leading_comments,omitempty"`
-	TrailingComments *string `protobuf:"bytes,4,opt,name=trailing_comments" json:"trailing_comments,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	//
+	//   // ignored detached comments.
+	LeadingComments         *string  `protobuf:"bytes,3,opt,name=leading_comments,json=leadingComments" json:"leading_comments,omitempty"`
+	TrailingComments        *string  `protobuf:"bytes,4,opt,name=trailing_comments,json=trailingComments" json:"trailing_comments,omitempty"`
+	LeadingDetachedComments []string `protobuf:"bytes,6,rep,name=leading_detached_comments,json=leadingDetachedComments" json:"leading_detached_comments,omitempty"`
+	XXX_unrecognized        []byte   `json:"-"`
 }
 
 func (m *SourceCodeInfo_Location) Reset()                    { *m = SourceCodeInfo_Location{} }
 func (m *SourceCodeInfo_Location) String() string            { return proto.CompactTextString(m) }
 func (*SourceCodeInfo_Location) ProtoMessage()               {}
-func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17, 0} }
+func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18, 0} }
 
 func (m *SourceCodeInfo_Location) GetPath() []int32 {
 	if m != nil {
@@ -1676,11 +1813,92 @@ func (m *SourceCodeInfo_Location) GetTrailingComments() string {
 	return ""
 }
 
+func (m *SourceCodeInfo_Location) GetLeadingDetachedComments() []string {
+	if m != nil {
+		return m.LeadingDetachedComments
+	}
+	return nil
+}
+
+// Describes the relationship between generated code and its original source
+// file. A GeneratedCodeInfo message is associated with only one generated
+// source file, but may contain references to different source .proto files.
+type GeneratedCodeInfo struct {
+	// An Annotation connects some span of text in generated code to an element
+	// of its generating .proto file.
+	Annotation       []*GeneratedCodeInfo_Annotation `protobuf:"bytes,1,rep,name=annotation" json:"annotation,omitempty"`
+	XXX_unrecognized []byte                          `json:"-"`
+}
+
+func (m *GeneratedCodeInfo) Reset()                    { *m = GeneratedCodeInfo{} }
+func (m *GeneratedCodeInfo) String() string            { return proto.CompactTextString(m) }
+func (*GeneratedCodeInfo) ProtoMessage()               {}
+func (*GeneratedCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
+
+func (m *GeneratedCodeInfo) GetAnnotation() []*GeneratedCodeInfo_Annotation {
+	if m != nil {
+		return m.Annotation
+	}
+	return nil
+}
+
+type GeneratedCodeInfo_Annotation struct {
+	// Identifies the element in the original source .proto file. This field
+	// is formatted the same as SourceCodeInfo.Location.path.
+	Path []int32 `protobuf:"varint,1,rep,packed,name=path" json:"path,omitempty"`
+	// Identifies the filesystem path to the original source .proto.
+	SourceFile *string `protobuf:"bytes,2,opt,name=source_file,json=sourceFile" json:"source_file,omitempty"`
+	// Identifies the starting offset in bytes in the generated code
+	// that relates to the identified object.
+	Begin *int32 `protobuf:"varint,3,opt,name=begin" json:"begin,omitempty"`
+	// Identifies the ending offset in bytes in the generated code that
+	// relates to the identified offset. The end offset should be one past
+	// the last relevant byte (so the length of the text = end - begin).
+	End              *int32 `protobuf:"varint,4,opt,name=end" json:"end,omitempty"`
+	XXX_unrecognized []byte `json:"-"`
+}
+
+func (m *GeneratedCodeInfo_Annotation) Reset()         { *m = GeneratedCodeInfo_Annotation{} }
+func (m *GeneratedCodeInfo_Annotation) String() string { return proto.CompactTextString(m) }
+func (*GeneratedCodeInfo_Annotation) ProtoMessage()    {}
+func (*GeneratedCodeInfo_Annotation) Descriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{19, 0}
+}
+
+func (m *GeneratedCodeInfo_Annotation) GetPath() []int32 {
+	if m != nil {
+		return m.Path
+	}
+	return nil
+}
+
+func (m *GeneratedCodeInfo_Annotation) GetSourceFile() string {
+	if m != nil && m.SourceFile != nil {
+		return *m.SourceFile
+	}
+	return ""
+}
+
+func (m *GeneratedCodeInfo_Annotation) GetBegin() int32 {
+	if m != nil && m.Begin != nil {
+		return *m.Begin
+	}
+	return 0
+}
+
+func (m *GeneratedCodeInfo_Annotation) GetEnd() int32 {
+	if m != nil && m.End != nil {
+		return *m.End
+	}
+	return 0
+}
+
 func init() {
 	proto.RegisterType((*FileDescriptorSet)(nil), "google.protobuf.FileDescriptorSet")
 	proto.RegisterType((*FileDescriptorProto)(nil), "google.protobuf.FileDescriptorProto")
 	proto.RegisterType((*DescriptorProto)(nil), "google.protobuf.DescriptorProto")
 	proto.RegisterType((*DescriptorProto_ExtensionRange)(nil), "google.protobuf.DescriptorProto.ExtensionRange")
+	proto.RegisterType((*DescriptorProto_ReservedRange)(nil), "google.protobuf.DescriptorProto.ReservedRange")
 	proto.RegisterType((*FieldDescriptorProto)(nil), "google.protobuf.FieldDescriptorProto")
 	proto.RegisterType((*OneofDescriptorProto)(nil), "google.protobuf.OneofDescriptorProto")
 	proto.RegisterType((*EnumDescriptorProto)(nil), "google.protobuf.EnumDescriptorProto")
@@ -1690,6 +1908,7 @@ func init() {
 	proto.RegisterType((*FileOptions)(nil), "google.protobuf.FileOptions")
 	proto.RegisterType((*MessageOptions)(nil), "google.protobuf.MessageOptions")
 	proto.RegisterType((*FieldOptions)(nil), "google.protobuf.FieldOptions")
+	proto.RegisterType((*OneofOptions)(nil), "google.protobuf.OneofOptions")
 	proto.RegisterType((*EnumOptions)(nil), "google.protobuf.EnumOptions")
 	proto.RegisterType((*EnumValueOptions)(nil), "google.protobuf.EnumValueOptions")
 	proto.RegisterType((*ServiceOptions)(nil), "google.protobuf.ServiceOptions")
@@ -1698,115 +1917,160 @@ func init() {
 	proto.RegisterType((*UninterpretedOption_NamePart)(nil), "google.protobuf.UninterpretedOption.NamePart")
 	proto.RegisterType((*SourceCodeInfo)(nil), "google.protobuf.SourceCodeInfo")
 	proto.RegisterType((*SourceCodeInfo_Location)(nil), "google.protobuf.SourceCodeInfo.Location")
+	proto.RegisterType((*GeneratedCodeInfo)(nil), "google.protobuf.GeneratedCodeInfo")
+	proto.RegisterType((*GeneratedCodeInfo_Annotation)(nil), "google.protobuf.GeneratedCodeInfo.Annotation")
 	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Type", FieldDescriptorProto_Type_name, FieldDescriptorProto_Type_value)
 	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Label", FieldDescriptorProto_Label_name, FieldDescriptorProto_Label_value)
 	proto.RegisterEnum("google.protobuf.FileOptions_OptimizeMode", FileOptions_OptimizeMode_name, FileOptions_OptimizeMode_value)
 	proto.RegisterEnum("google.protobuf.FieldOptions_CType", FieldOptions_CType_name, FieldOptions_CType_value)
+	proto.RegisterEnum("google.protobuf.FieldOptions_JSType", FieldOptions_JSType_name, FieldOptions_JSType_value)
 }
 
+func init() { proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor0) }
+
 var fileDescriptor0 = []byte{
-	// 1635 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x72, 0xdb, 0xd4,
-	0x17, 0xff, 0xfb, 0x43, 0xfe, 0x38, 0x76, 0x1c, 0x45, 0x49, 0x5b, 0x35, 0xff, 0x96, 0xb4, 0xa6,
-	0x2d, 0x69, 0x69, 0x1d, 0x26, 0x2d, 0xa5, 0x84, 0x55, 0x3e, 0xd4, 0xd4, 0x33, 0x4e, 0x6c, 0x12,
-	0x87, 0xa1, 0x6c, 0x34, 0x37, 0xf2, 0xb5, 0xa3, 0x56, 0x96, 0x8c, 0x24, 0xa7, 0x4d, 0x19, 0x66,
-	0x78, 0x00, 0x98, 0xe1, 0x09, 0x18, 0x5e, 0x81, 0x0d, 0x2b, 0x36, 0xec, 0x79, 0x03, 0xb6, 0x0c,
-	0xf0, 0x18, 0x9c, 0x7b, 0xaf, 0x25, 0x4b, 0x8a, 0x9d, 0xb6, 0x4c, 0x4b, 0x57, 0xee, 0xb9, 0xbf,
-	0x73, 0xce, 0xef, 0x9e, 0xcf, 0xab, 0xc0, 0x95, 0x9e, 0xe3, 0xf4, 0x2c, 0xba, 0x32, 0x70, 0x1d,
-	0xdf, 0x39, 0x1c, 0x76, 0x57, 0x3a, 0xd4, 0x33, 0x5c, 0x73, 0xe0, 0x3b, 0x6e, 0x8d, 0xcb, 0x94,
-	0x59, 0x81, 0xa8, 0x05, 0x88, 0xea, 0x36, 0xcc, 0x3d, 0x34, 0x2d, 0xba, 0x15, 0x02, 0xf7, 0xa9,
-	0xaf, 0xac, 0x42, 0xb6, 0x8b, 0x42, 0x35, 0x75, 0x25, 0xb3, 0x5c, 0x5a, 0xbd, 0x56, 0x4b, 0x28,
-	0xd5, 0xe2, 0x1a, 0x2d, 0x26, 0xae, 0xfe, 0x9e, 0x81, 0xf9, 0x09, 0x72, 0xa5, 0x0c, 0x59, 0x9b,
-	0xf4, 0x99, 0xad, 0xd4, 0x72, 0x51, 0x99, 0x85, 0xfc, 0x80, 0x18, 0x4f, 0x49, 0x8f, 0xaa, 0x69,
-	0x2e, 0x50, 0x00, 0x3a, 0x74, 0x40, 0xed, 0x0e, 0xb5, 0x8d, 0x13, 0x35, 0x83, 0x0e, 0x8b, 0xca,
-	0x45, 0x98, 0x1b, 0x0c, 0x0f, 0x2d, 0xd3, 0xd0, 0x23, 0x47, 0x80, 0x47, 0x92, 0x72, 0x01, 0x66,
-	0x9f, 0x51, 0xf2, 0x34, 0x7a, 0x50, 0xe2, 0x07, 0xf7, 0xa1, 0xdc, 0xa7, 0x9e, 0x87, 0x86, 0x75,
-	0xff, 0x64, 0x40, 0xd5, 0x2c, 0xa7, 0x7e, 0xe5, 0x14, 0xf5, 0x24, 0xbd, 0x8f, 0xa0, 0x48, 0xed,
-	0x61, 0x5f, 0x28, 0x49, 0x53, 0xee, 0xab, 0x21, 0x22, 0xa9, 0xf8, 0x00, 0xf2, 0x1e, 0x75, 0x8f,
-	0x4d, 0x83, 0xaa, 0x39, 0xae, 0xf6, 0xde, 0x29, 0xb5, 0x7d, 0x71, 0x7e, 0x5a, 0xb3, 0x48, 0x9f,
-	0xfb, 0xd4, 0xf6, 0x4c, 0xc7, 0x56, 0xf3, 0x5c, 0xf7, 0xfa, 0x84, 0x10, 0x53, 0xab, 0x93, 0xd4,
-	0xbc, 0x03, 0x79, 0x67, 0xe0, 0xa3, 0x9a, 0xa7, 0x16, 0x30, 0x7a, 0xa5, 0xd5, 0x4b, 0x13, 0x53,
-	0xd3, 0x14, 0x18, 0xe5, 0x63, 0x90, 0x3d, 0x67, 0xe8, 0x1a, 0x54, 0x37, 0x9c, 0x0e, 0xd5, 0x4d,
-	0xbb, 0xeb, 0xa8, 0x45, 0xae, 0xb7, 0x74, 0x9a, 0x2b, 0x07, 0x6e, 0x22, 0xae, 0x8e, 0x30, 0xa5,
-	0x02, 0x39, 0xef, 0xc4, 0xf6, 0xc9, 0x73, 0xb5, 0xcc, 0xd2, 0x54, 0xfd, 0x23, 0x03, 0xb3, 0x67,
-	0x67, 0xf6, 0x1e, 0x48, 0x5d, 0xc6, 0x19, 0xf3, 0xfa, 0x1a, 0x37, 0x8a, 0xc5, 0x22, 0xf7, 0x3a,
-	0x9a, 0x1f, 0x42, 0xc9, 0xa6, 0x9e, 0x4f, 0x3b, 0x22, 0x75, 0x99, 0x7f, 0x93, 0xef, 0xec, 0x6b,
-	0xe4, 0xfb, 0x11, 0xcc, 0x86, 0x4c, 0x75, 0x97, 0xd8, 0xbd, 0xa0, 0x5c, 0x56, 0x5e, 0xe6, 0xb3,
-	0xa6, 0x05, 0x7a, 0x7b, 0x4c, 0x0d, 0xd3, 0x02, 0x8e, 0x4d, 0x9d, 0x2e, 0x16, 0xb1, 0x61, 0x61,
-	0x22, 0x27, 0x5f, 0xba, 0xc9, 0x20, 0x49, 0x12, 0x1f, 0x8c, 0x0b, 0x20, 0x3f, 0x25, 0x91, 0x3b,
-	0xa2, 0x0b, 0x46, 0x35, 0xb0, 0x78, 0x1b, 0x2a, 0x09, 0xf7, 0x33, 0x20, 0x79, 0x3e, 0x71, 0x7d,
-	0x9e, 0x37, 0x49, 0x29, 0x41, 0x06, 0x3b, 0x89, 0x77, 0xa3, 0x54, 0xfd, 0x45, 0x82, 0x85, 0x89,
-	0xd1, 0x8e, 0xe7, 0x1a, 0xab, 0x03, 0x23, 0x74, 0x48, 0x5d, 0x0c, 0x3b, 0xb3, 0xb1, 0x06, 0x92,
-	0x45, 0x0e, 0xa9, 0x85, 0x01, 0x4d, 0x2d, 0x57, 0x56, 0xdf, 0x7f, 0xa5, 0x0c, 0xd6, 0x1a, 0x4c,
-	0x05, 0x2b, 0x20, 0x3b, 0xea, 0x3d, 0xa6, 0x7a, 0xeb, 0xd5, 0x54, 0xdb, 0xa8, 0xa1, 0xcc, 0x41,
-	0x91, 0x69, 0xea, 0x9c, 0x58, 0x8e, 0x13, 0x93, 0xa1, 0xc0, 0x93, 0xd4, 0xa1, 0xc1, 0x7c, 0x39,
-	0x07, 0x33, 0x1d, 0xda, 0x25, 0x43, 0xcb, 0xd7, 0x8f, 0x89, 0x35, 0xa4, 0x3c, 0x6e, 0x45, 0x65,
-	0x1e, 0x4a, 0x22, 0x07, 0x26, 0x62, 0x9f, 0xf3, 0xae, 0x90, 0x98, 0xc1, 0x27, 0x1e, 0x66, 0x97,
-	0x1b, 0x04, 0x8e, 0xab, 0x25, 0x3b, 0xee, 0xf2, 0x64, 0x82, 0xa3, 0x70, 0x57, 0x7f, 0x4e, 0x43,
-	0x96, 0x93, 0x9b, 0x85, 0x52, 0xfb, 0x71, 0x4b, 0xd3, 0xb7, 0x9a, 0x07, 0x1b, 0x0d, 0x4d, 0x4e,
-	0x61, 0xcc, 0x80, 0x0b, 0x1e, 0x36, 0x9a, 0xeb, 0x6d, 0x39, 0x1d, 0xfe, 0xbf, 0xbe, 0xdb, 0xbe,
-	0x7f, 0x4f, 0xce, 0x84, 0x0a, 0x07, 0x42, 0x90, 0x8d, 0x02, 0xee, 0xae, 0xca, 0x12, 0xde, 0xad,
-	0x2c, 0x0c, 0xd4, 0x3f, 0xd7, 0xb6, 0x10, 0x91, 0x8b, 0x4b, 0x10, 0x93, 0xc7, 0xdc, 0x16, 0xb9,
-	0x64, 0xa3, 0xd9, 0x6c, 0xc8, 0x85, 0xd0, 0xe6, 0x7e, 0x7b, 0xaf, 0xbe, 0xbb, 0x2d, 0x17, 0x43,
-	0x9b, 0xdb, 0x7b, 0xcd, 0x83, 0x96, 0x0c, 0xa1, 0x85, 0x1d, 0x6d, 0x7f, 0x7f, 0x7d, 0x5b, 0x93,
-	0x4b, 0x21, 0x62, 0xe3, 0x71, 0x5b, 0xdb, 0x97, 0xcb, 0x31, 0x5a, 0xe8, 0x62, 0x26, 0x74, 0xa1,
-	0xed, 0x1e, 0xec, 0xc8, 0x15, 0x8c, 0xd9, 0x8c, 0x70, 0x11, 0x90, 0x98, 0x4d, 0x88, 0x90, 0xa9,
-	0x3c, 0x26, 0x22, 0xac, 0xcc, 0xc5, 0x04, 0x88, 0x50, 0xaa, 0x9b, 0x20, 0x89, 0x7a, 0x50, 0xa0,
-	0xd2, 0x58, 0xdf, 0xd0, 0x1a, 0x7a, 0xb3, 0xd5, 0xae, 0x37, 0x77, 0xd7, 0x1b, 0x18, 0xbb, 0x50,
-	0xb6, 0xa7, 0x7d, 0x7a, 0x50, 0xdf, 0xd3, 0xb6, 0x30, 0x7e, 0x11, 0x59, 0x4b, 0x5b, 0x6f, 0xa3,
-	0x2c, 0x53, 0xbd, 0x06, 0x0b, 0x13, 0xdb, 0x26, 0x56, 0xbd, 0xd5, 0x6f, 0x53, 0x30, 0x3f, 0xa9,
-	0xc3, 0xe3, 0x35, 0xfe, 0x00, 0x24, 0x51, 0x30, 0x62, 0x9e, 0xdd, 0x9c, 0x38, 0x24, 0x3e, 0x63,
-	0x88, 0x33, 0xa6, 0x74, 0x66, 0xca, 0x94, 0x66, 0xba, 0x41, 0xc9, 0x58, 0xa0, 0x4e, 0x35, 0x35,
-	0xad, 0xed, 0x78, 0xb7, 0xe2, 0x9a, 0x4e, 0x38, 0xba, 0x3a, 0x9d, 0x64, 0xe0, 0xed, 0xfb, 0x14,
-	0x9c, 0x9f, 0xb2, 0x97, 0xe2, 0xce, 0xee, 0x43, 0xae, 0x4f, 0xfd, 0x23, 0x27, 0x18, 0xe8, 0x37,
-	0x26, 0x4c, 0x1a, 0x76, 0x7c, 0xc6, 0x88, 0xca, 0x4c, 0xdb, 0x35, 0xc2, 0x7f, 0x40, 0xe9, 0xd7,
-	0x14, 0x9c, 0x9b, 0x6c, 0x2b, 0xce, 0x08, 0x9f, 0x0a, 0xa6, 0x3d, 0x18, 0xfa, 0x62, 0x76, 0xa7,
-	0xc3, 0x3e, 0x1e, 0xfa, 0xa1, 0x30, 0xc3, 0x85, 0x2b, 0x63, 0x0a, 0x59, 0x4e, 0xe1, 0x9d, 0x29,
-	0xdc, 0x83, 0x45, 0xb9, 0x04, 0xb2, 0x61, 0x99, 0xd4, 0xf6, 0x75, 0xcf, 0x77, 0x29, 0xe9, 0x9b,
-	0x76, 0x8f, 0xcf, 0xa3, 0xc2, 0x9a, 0xd4, 0x25, 0x96, 0x47, 0x19, 0x80, 0x2d, 0x7b, 0xea, 0x46,
-	0x00, 0xb9, 0x08, 0xa0, 0xfa, 0x5b, 0x16, 0x4a, 0xd1, 0xd5, 0xbb, 0x00, 0xe5, 0x27, 0xe4, 0x98,
-	0xe8, 0xc1, 0x63, 0x47, 0xdc, 0xe0, 0x12, 0x2c, 0x70, 0x29, 0x52, 0x46, 0x53, 0x86, 0x45, 0x3c,
-	0x8f, 0xdf, 0xaf, 0xc0, 0x4f, 0xab, 0x30, 0xcf, 0x4f, 0xfb, 0x38, 0xac, 0xcc, 0x81, 0x45, 0x75,
-	0xf6, 0x06, 0xf3, 0xf8, 0x20, 0x0a, 0x89, 0xdc, 0x86, 0xcb, 0x1c, 0xd3, 0xa3, 0x36, 0x75, 0x89,
-	0x4f, 0x75, 0xfa, 0xe5, 0x10, 0x0f, 0x74, 0x62, 0x77, 0xf4, 0x23, 0xe2, 0x1d, 0xa9, 0x0b, 0x51,
-	0xf4, 0x75, 0x38, 0xcf, 0xd1, 0x48, 0x1a, 0x19, 0xeb, 0xc6, 0x11, 0x35, 0x9e, 0xea, 0x43, 0xbf,
-	0xfb, 0x40, 0xfd, 0x7f, 0x14, 0xf6, 0x10, 0xca, 0x2c, 0x5e, 0x7d, 0xf3, 0x05, 0xfa, 0x74, 0x5c,
-	0x3e, 0x0d, 0x2b, 0x13, 0x2a, 0x3e, 0x72, 0xc1, 0x5a, 0x73, 0xa4, 0xb0, 0x83, 0x2f, 0x86, 0x35,
-	0x69, 0xbf, 0xa5, 0x69, 0x5b, 0x2c, 0x41, 0x3d, 0x27, 0xbc, 0x72, 0x29, 0xb8, 0x94, 0x61, 0x08,
-	0xba, 0xf8, 0x9e, 0x1b, 0xbd, 0x98, 0x3c, 0x55, 0x8e, 0xfa, 0xbf, 0x06, 0xe7, 0xc6, 0x97, 0x8a,
-	0xa2, 0xe6, 0xa2, 0x28, 0xb4, 0x34, 0x38, 0x39, 0x8d, 0x51, 0xa2, 0x98, 0x8b, 0xfc, 0x35, 0xe9,
-	0x52, 0x03, 0x43, 0xd3, 0x51, 0x2f, 0x24, 0x52, 0x88, 0x44, 0xa8, 0x4d, 0x0e, 0x31, 0xb2, 0xc4,
-	0xc5, 0x1f, 0x9e, 0xba, 0x14, 0x05, 0x6c, 0xc2, 0xc2, 0xd0, 0x36, 0x6d, 0xcc, 0x0c, 0x1a, 0x60,
-	0xef, 0x0a, 0x51, 0x43, 0xea, 0x5f, 0xf9, 0x29, 0xaf, 0x84, 0x83, 0x28, 0x5a, 0xc4, 0xa5, 0xba,
-	0x06, 0xe5, 0x68, 0x64, 0x94, 0x22, 0x88, 0xd8, 0xe0, 0x10, 0xc3, 0xc1, 0xb9, 0xd9, 0xdc, 0x62,
-	0x23, 0xef, 0x0b, 0x0d, 0xe7, 0x17, 0x8e, 0xde, 0x46, 0xbd, 0xad, 0xe9, 0x7b, 0x07, 0xbb, 0xed,
-	0xfa, 0x8e, 0x26, 0x67, 0x6e, 0x15, 0x0b, 0x7f, 0xe7, 0xe5, 0x6f, 0xf0, 0x5f, 0xba, 0xfa, 0x67,
-	0x0a, 0x2a, 0xf1, 0x45, 0xae, 0xdc, 0x80, 0x0b, 0xc1, 0x03, 0xd7, 0xa3, 0xbe, 0xfe, 0xcc, 0x74,
-	0x79, 0xb2, 0xfa, 0x44, 0x2c, 0xf2, 0xf0, 0x1a, 0x35, 0x58, 0xb2, 0x1d, 0xcc, 0x38, 0x56, 0x04,
-	0x71, 0x3b, 0xfa, 0xf8, 0x0b, 0x40, 0x27, 0x06, 0xc6, 0xcb, 0x73, 0xc4, 0xf4, 0x98, 0x12, 0xb2,
-	0x4c, 0xf4, 0x08, 0xf7, 0x61, 0x9f, 0x0c, 0x30, 0x66, 0xbe, 0x7b, 0xc2, 0xf7, 0x66, 0xe1, 0x8d,
-	0x04, 0x29, 0x7a, 0xd1, 0x1f, 0xd3, 0x50, 0x8e, 0x2e, 0x50, 0xf6, 0x94, 0x30, 0x78, 0x2b, 0xa7,
-	0x78, 0x11, 0xbe, 0x7b, 0xe6, 0xba, 0xad, 0x6d, 0xb2, 0x5d, 0xbb, 0x96, 0x13, 0xfb, 0x8d, 0xcd,
-	0x47, 0x56, 0x7c, 0x54, 0xbc, 0x66, 0x0a, 0x38, 0x1c, 0xb2, 0x16, 0x79, 0x71, 0x12, 0x6f, 0xe5,
-	0x33, 0xee, 0x8b, 0x78, 0xf6, 0x71, 0x11, 0xef, 0xb8, 0x37, 0x52, 0x16, 0x2b, 0x20, 0x71, 0xaa,
-	0xd8, 0x21, 0x23, 0xb2, 0xf2, 0xff, 0x94, 0x02, 0x64, 0x37, 0x9b, 0x7b, 0xac, 0x34, 0xb0, 0x16,
-	0x84, 0x54, 0x6f, 0xd5, 0xb5, 0x4d, 0xac, 0x8e, 0x68, 0x88, 0xbe, 0x4b, 0x41, 0x29, 0xb2, 0x2f,
-	0xd8, 0xc8, 0x23, 0x96, 0xe5, 0x3c, 0xd3, 0x89, 0x65, 0x62, 0x0d, 0x8b, 0xab, 0x9e, 0x71, 0xab,
-	0x37, 0x9d, 0xb2, 0xaf, 0x41, 0x4e, 0x6e, 0x95, 0x84, 0xfb, 0xd4, 0xdb, 0x74, 0xff, 0x15, 0x54,
-	0xe2, 0xfb, 0x23, 0xe1, 0xfc, 0xea, 0xdb, 0x74, 0xfe, 0x02, 0x66, 0xe2, 0x9b, 0xe3, 0x3f, 0xf4,
-	0xfd, 0x43, 0x1a, 0xe6, 0x27, 0x40, 0x94, 0x4f, 0x46, 0x4b, 0x52, 0xac, 0xe9, 0x3b, 0xaf, 0x62,
-	0xb6, 0xb6, 0x8b, 0x0a, 0x2d, 0xfc, 0x06, 0x50, 0x54, 0x90, 0x4d, 0xfc, 0x8c, 0xf6, 0x4d, 0xfc,
-	0x76, 0x73, 0x47, 0x2f, 0x64, 0xb1, 0x44, 0x17, 0x41, 0x19, 0x38, 0x9e, 0xe9, 0x9b, 0xc7, 0xec,
-	0xcb, 0x31, 0x78, 0x3d, 0xb3, 0x7d, 0x9a, 0x65, 0x67, 0x36, 0xed, 0x91, 0xc4, 0x19, 0x6b, 0xb3,
-	0x0c, 0xdb, 0x7c, 0x1d, 0x67, 0xc8, 0x86, 0xac, 0x90, 0xb2, 0x35, 0x99, 0x62, 0xd2, 0xd1, 0x12,
-	0x1a, 0xbf, 0xc2, 0xcb, 0xec, 0x6b, 0x9e, 0xf4, 0x7a, 0x2e, 0x33, 0x15, 0xc0, 0xf9, 0x2a, 0x5c,
-	0xbc, 0x0b, 0x85, 0x90, 0x22, 0x4e, 0x21, 0x76, 0x3f, 0xdc, 0x2b, 0xfc, 0x9b, 0x25, 0x8d, 0xdc,
-	0xd0, 0x9a, 0xe9, 0xe9, 0xe3, 0x0f, 0xc7, 0x34, 0x4a, 0x0b, 0xd5, 0x9f, 0x70, 0x68, 0x26, 0x3e,
-	0x63, 0xd7, 0xa0, 0x60, 0x39, 0x98, 0x1b, 0x06, 0x12, 0x7f, 0xcc, 0x58, 0x7e, 0xc9, 0x97, 0x6f,
-	0xad, 0x31, 0xc2, 0x2f, 0x1a, 0x50, 0x08, 0x7e, 0x63, 0x83, 0x66, 0x07, 0xc4, 0x3f, 0xe2, 0x36,
-	0xa4, 0x8d, 0x34, 0x6f, 0xd9, 0xac, 0x37, 0x20, 0x36, 0x8f, 0xba, 0x90, 0x60, 0x28, 0x2d, 0x4a,
-	0x3a, 0x7c, 0xd1, 0x3a, 0xfd, 0x3e, 0x06, 0xd5, 0x1b, 0x85, 0xf2, 0x22, 0xcc, 0xf9, 0x2e, 0x31,
-	0xad, 0xd8, 0x11, 0x8b, 0x64, 0x71, 0xe3, 0x26, 0xae, 0x47, 0xa7, 0x9f, 0xe4, 0xb4, 0x21, 0x27,
-	0x5e, 0x42, 0xde, 0xa3, 0xd4, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xe5, 0x5c, 0x96, 0xdd,
-	0x11, 0x00, 0x00,
+	// 2287 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x73, 0xdb, 0xc6,
+	0x15, 0x0f, 0xf8, 0x25, 0xf2, 0x91, 0xa2, 0x56, 0x2b, 0xc5, 0x86, 0xe5, 0x38, 0x96, 0x19, 0x3b,
+	0x96, 0xed, 0x96, 0xce, 0xc8, 0x1f, 0x71, 0x94, 0x4e, 0x3a, 0x94, 0x08, 0x2b, 0xf4, 0x50, 0x22,
+	0x0b, 0x4a, 0xad, 0x93, 0x1e, 0x30, 0x2b, 0x60, 0x49, 0xc1, 0x06, 0x17, 0x28, 0x00, 0xda, 0x56,
+	0x4e, 0x9e, 0xe9, 0xa9, 0xc7, 0xde, 0x3a, 0x6d, 0xa7, 0xd3, 0xc9, 0x25, 0x33, 0xfd, 0x03, 0x7a,
+	0xe8, 0xbd, 0xd7, 0xce, 0xf4, 0xde, 0x63, 0x67, 0xda, 0xff, 0xa0, 0xd7, 0xce, 0xee, 0x02, 0x20,
+	0xf8, 0x15, 0xab, 0x99, 0x49, 0xd2, 0x93, 0xb8, 0xbf, 0xf7, 0x7b, 0x0f, 0x6f, 0xdf, 0x3e, 0xbc,
+	0xf7, 0xb0, 0x82, 0xcd, 0x81, 0xeb, 0x0e, 0x1c, 0x7a, 0xd7, 0xf3, 0xdd, 0xd0, 0x3d, 0x19, 0xf5,
+	0xef, 0x5a, 0x34, 0x30, 0x7d, 0xdb, 0x0b, 0x5d, 0xbf, 0x2e, 0x30, 0xbc, 0x22, 0x19, 0xf5, 0x98,
+	0x51, 0x3b, 0x80, 0xd5, 0xc7, 0xb6, 0x43, 0x9b, 0x09, 0xb1, 0x47, 0x43, 0xfc, 0x08, 0x72, 0x7d,
+	0xdb, 0xa1, 0xaa, 0xb2, 0x99, 0xdd, 0x2a, 0x6f, 0x5f, 0xaf, 0x4f, 0x29, 0xd5, 0x27, 0x35, 0xba,
+	0x1c, 0xd6, 0x85, 0x46, 0xed, 0x9f, 0x39, 0x58, 0x9b, 0x23, 0xc5, 0x18, 0x72, 0x8c, 0x0c, 0xb9,
+	0x45, 0x65, 0xab, 0xa4, 0x8b, 0xdf, 0x58, 0x85, 0x25, 0x8f, 0x98, 0xcf, 0xc9, 0x80, 0xaa, 0x19,
+	0x01, 0xc7, 0x4b, 0xfc, 0x2e, 0x80, 0x45, 0x3d, 0xca, 0x2c, 0xca, 0xcc, 0x33, 0x35, 0xbb, 0x99,
+	0xdd, 0x2a, 0xe9, 0x29, 0x04, 0xdf, 0x81, 0x55, 0x6f, 0x74, 0xe2, 0xd8, 0xa6, 0x91, 0xa2, 0xc1,
+	0x66, 0x76, 0x2b, 0xaf, 0x23, 0x29, 0x68, 0x8e, 0xc9, 0x37, 0x61, 0xe5, 0x25, 0x25, 0xcf, 0xd3,
+	0xd4, 0xb2, 0xa0, 0x56, 0x39, 0x9c, 0x22, 0xee, 0x41, 0x65, 0x48, 0x83, 0x80, 0x0c, 0xa8, 0x11,
+	0x9e, 0x79, 0x54, 0xcd, 0x89, 0xdd, 0x6f, 0xce, 0xec, 0x7e, 0x7a, 0xe7, 0xe5, 0x48, 0xeb, 0xe8,
+	0xcc, 0xa3, 0xb8, 0x01, 0x25, 0xca, 0x46, 0x43, 0x69, 0x21, 0xbf, 0x20, 0x7e, 0x1a, 0x1b, 0x0d,
+	0xa7, 0xad, 0x14, 0xb9, 0x5a, 0x64, 0x62, 0x29, 0xa0, 0xfe, 0x0b, 0xdb, 0xa4, 0x6a, 0x41, 0x18,
+	0xb8, 0x39, 0x63, 0xa0, 0x27, 0xe5, 0xd3, 0x36, 0x62, 0x3d, 0xbc, 0x07, 0x25, 0xfa, 0x2a, 0xa4,
+	0x2c, 0xb0, 0x5d, 0xa6, 0x2e, 0x09, 0x23, 0x37, 0xe6, 0x9c, 0x22, 0x75, 0xac, 0x69, 0x13, 0x63,
+	0x3d, 0xfc, 0x10, 0x96, 0x5c, 0x2f, 0xb4, 0x5d, 0x16, 0xa8, 0xc5, 0x4d, 0x65, 0xab, 0xbc, 0xfd,
+	0xce, 0xdc, 0x44, 0xe8, 0x48, 0x8e, 0x1e, 0x93, 0x71, 0x0b, 0x50, 0xe0, 0x8e, 0x7c, 0x93, 0x1a,
+	0xa6, 0x6b, 0x51, 0xc3, 0x66, 0x7d, 0x57, 0x2d, 0x09, 0x03, 0x57, 0x67, 0x37, 0x22, 0x88, 0x7b,
+	0xae, 0x45, 0x5b, 0xac, 0xef, 0xea, 0xd5, 0x60, 0x62, 0x8d, 0x2f, 0x40, 0x21, 0x38, 0x63, 0x21,
+	0x79, 0xa5, 0x56, 0x44, 0x86, 0x44, 0xab, 0xda, 0x7f, 0xf2, 0xb0, 0x72, 0x9e, 0x14, 0xfb, 0x18,
+	0xf2, 0x7d, 0xbe, 0x4b, 0x35, 0xf3, 0xbf, 0xc4, 0x40, 0xea, 0x4c, 0x06, 0xb1, 0xf0, 0x0d, 0x83,
+	0xd8, 0x80, 0x32, 0xa3, 0x41, 0x48, 0x2d, 0x99, 0x11, 0xd9, 0x73, 0xe6, 0x14, 0x48, 0xa5, 0xd9,
+	0x94, 0xca, 0x7d, 0xa3, 0x94, 0x7a, 0x0a, 0x2b, 0x89, 0x4b, 0x86, 0x4f, 0xd8, 0x20, 0xce, 0xcd,
+	0xbb, 0x6f, 0xf2, 0xa4, 0xae, 0xc5, 0x7a, 0x3a, 0x57, 0xd3, 0xab, 0x74, 0x62, 0x8d, 0x9b, 0x00,
+	0x2e, 0xa3, 0x6e, 0xdf, 0xb0, 0xa8, 0xe9, 0xa8, 0xc5, 0x05, 0x51, 0xea, 0x70, 0xca, 0x4c, 0x94,
+	0x5c, 0x89, 0x9a, 0x0e, 0xfe, 0x68, 0x9c, 0x6a, 0x4b, 0x0b, 0x32, 0xe5, 0x40, 0xbe, 0x64, 0x33,
+	0xd9, 0x76, 0x0c, 0x55, 0x9f, 0xf2, 0xbc, 0xa7, 0x56, 0xb4, 0xb3, 0x92, 0x70, 0xa2, 0xfe, 0xc6,
+	0x9d, 0xe9, 0x91, 0x9a, 0xdc, 0xd8, 0xb2, 0x9f, 0x5e, 0xe2, 0xf7, 0x20, 0x01, 0x0c, 0x91, 0x56,
+	0x20, 0xaa, 0x50, 0x25, 0x06, 0x0f, 0xc9, 0x90, 0x6e, 0x3c, 0x82, 0xea, 0x64, 0x78, 0xf0, 0x3a,
+	0xe4, 0x83, 0x90, 0xf8, 0xa1, 0xc8, 0xc2, 0xbc, 0x2e, 0x17, 0x18, 0x41, 0x96, 0x32, 0x4b, 0x54,
+	0xb9, 0xbc, 0xce, 0x7f, 0x6e, 0x7c, 0x08, 0xcb, 0x13, 0x8f, 0x3f, 0xaf, 0x62, 0xed, 0x37, 0x05,
+	0x58, 0x9f, 0x97, 0x73, 0x73, 0xd3, 0xff, 0x02, 0x14, 0xd8, 0x68, 0x78, 0x42, 0x7d, 0x35, 0x2b,
+	0x2c, 0x44, 0x2b, 0xdc, 0x80, 0xbc, 0x43, 0x4e, 0xa8, 0xa3, 0xe6, 0x36, 0x95, 0xad, 0xea, 0xf6,
+	0x9d, 0x73, 0x65, 0x75, 0xbd, 0xcd, 0x55, 0x74, 0xa9, 0x89, 0x3f, 0x81, 0x5c, 0x54, 0xe2, 0xb8,
+	0x85, 0xdb, 0xe7, 0xb3, 0xc0, 0x73, 0x51, 0x17, 0x7a, 0xf8, 0x32, 0x94, 0xf8, 0x5f, 0x19, 0xdb,
+	0x82, 0xf0, 0xb9, 0xc8, 0x01, 0x1e, 0x57, 0xbc, 0x01, 0x45, 0x91, 0x66, 0x16, 0x8d, 0x5b, 0x43,
+	0xb2, 0xe6, 0x07, 0x63, 0xd1, 0x3e, 0x19, 0x39, 0xa1, 0xf1, 0x82, 0x38, 0x23, 0x2a, 0x12, 0xa6,
+	0xa4, 0x57, 0x22, 0xf0, 0xa7, 0x1c, 0xc3, 0x57, 0xa1, 0x2c, 0xb3, 0xd2, 0x66, 0x16, 0x7d, 0x25,
+	0xaa, 0x4f, 0x5e, 0x97, 0x89, 0xda, 0xe2, 0x08, 0x7f, 0xfc, 0xb3, 0xc0, 0x65, 0xf1, 0xd1, 0x8a,
+	0x47, 0x70, 0x40, 0x3c, 0xfe, 0xc3, 0xe9, 0xc2, 0x77, 0x65, 0xfe, 0xf6, 0xa6, 0x73, 0xb1, 0xf6,
+	0xe7, 0x0c, 0xe4, 0xc4, 0xfb, 0xb6, 0x02, 0xe5, 0xa3, 0xcf, 0xba, 0x9a, 0xd1, 0xec, 0x1c, 0xef,
+	0xb6, 0x35, 0xa4, 0xe0, 0x2a, 0x80, 0x00, 0x1e, 0xb7, 0x3b, 0x8d, 0x23, 0x94, 0x49, 0xd6, 0xad,
+	0xc3, 0xa3, 0x87, 0xf7, 0x51, 0x36, 0x51, 0x38, 0x96, 0x40, 0x2e, 0x4d, 0xb8, 0xb7, 0x8d, 0xf2,
+	0x18, 0x41, 0x45, 0x1a, 0x68, 0x3d, 0xd5, 0x9a, 0x0f, 0xef, 0xa3, 0xc2, 0x24, 0x72, 0x6f, 0x1b,
+	0x2d, 0xe1, 0x65, 0x28, 0x09, 0x64, 0xb7, 0xd3, 0x69, 0xa3, 0x62, 0x62, 0xb3, 0x77, 0xa4, 0xb7,
+	0x0e, 0xf7, 0x51, 0x29, 0xb1, 0xb9, 0xaf, 0x77, 0x8e, 0xbb, 0x08, 0x12, 0x0b, 0x07, 0x5a, 0xaf,
+	0xd7, 0xd8, 0xd7, 0x50, 0x39, 0x61, 0xec, 0x7e, 0x76, 0xa4, 0xf5, 0x50, 0x65, 0xc2, 0xad, 0x7b,
+	0xdb, 0x68, 0x39, 0x79, 0x84, 0x76, 0x78, 0x7c, 0x80, 0xaa, 0x78, 0x15, 0x96, 0xe5, 0x23, 0x62,
+	0x27, 0x56, 0xa6, 0xa0, 0x87, 0xf7, 0x11, 0x1a, 0x3b, 0x22, 0xad, 0xac, 0x4e, 0x00, 0x0f, 0xef,
+	0x23, 0x5c, 0xdb, 0x83, 0xbc, 0xc8, 0x2e, 0x8c, 0xa1, 0xda, 0x6e, 0xec, 0x6a, 0x6d, 0xa3, 0xd3,
+	0x3d, 0x6a, 0x75, 0x0e, 0x1b, 0x6d, 0xa4, 0x8c, 0x31, 0x5d, 0xfb, 0xc9, 0x71, 0x4b, 0xd7, 0x9a,
+	0x28, 0x93, 0xc6, 0xba, 0x5a, 0xe3, 0x48, 0x6b, 0xa2, 0x6c, 0xcd, 0x84, 0xf5, 0x79, 0x75, 0x66,
+	0xee, 0x9b, 0x91, 0x3a, 0xe2, 0xcc, 0x82, 0x23, 0x16, 0xb6, 0x66, 0x8e, 0xf8, 0x4b, 0x05, 0xd6,
+	0xe6, 0xd4, 0xda, 0xb9, 0x0f, 0xf9, 0x31, 0xe4, 0x65, 0x8a, 0xca, 0xee, 0x73, 0x6b, 0x6e, 0xd1,
+	0x16, 0x09, 0x3b, 0xd3, 0x81, 0x84, 0x5e, 0xba, 0x03, 0x67, 0x17, 0x74, 0x60, 0x6e, 0x62, 0xc6,
+	0xc9, 0x5f, 0x2a, 0xa0, 0x2e, 0xb2, 0xfd, 0x86, 0x42, 0x91, 0x99, 0x28, 0x14, 0x1f, 0x4f, 0x3b,
+	0x70, 0x6d, 0xf1, 0x1e, 0x66, 0xbc, 0xf8, 0x4a, 0x81, 0x0b, 0xf3, 0x07, 0x95, 0xb9, 0x3e, 0x7c,
+	0x02, 0x85, 0x21, 0x0d, 0x4f, 0xdd, 0xb8, 0x59, 0xbf, 0x3f, 0xa7, 0x05, 0x70, 0xf1, 0x74, 0xac,
+	0x22, 0xad, 0x74, 0x0f, 0xc9, 0x2e, 0x9a, 0x36, 0xa4, 0x37, 0x33, 0x9e, 0xfe, 0x2a, 0x03, 0x6f,
+	0xcf, 0x35, 0x3e, 0xd7, 0xd1, 0x2b, 0x00, 0x36, 0xf3, 0x46, 0xa1, 0x6c, 0xc8, 0xb2, 0x3e, 0x95,
+	0x04, 0x22, 0xde, 0x7d, 0x5e, 0x7b, 0x46, 0x61, 0x22, 0xcf, 0x0a, 0x39, 0x48, 0x48, 0x10, 0x1e,
+	0x8d, 0x1d, 0xcd, 0x09, 0x47, 0xdf, 0x5d, 0xb0, 0xd3, 0x99, 0x5e, 0xf7, 0x01, 0x20, 0xd3, 0xb1,
+	0x29, 0x0b, 0x8d, 0x20, 0xf4, 0x29, 0x19, 0xda, 0x6c, 0x20, 0x0a, 0x70, 0x71, 0x27, 0xdf, 0x27,
+	0x4e, 0x40, 0xf5, 0x15, 0x29, 0xee, 0xc5, 0x52, 0xae, 0x21, 0xba, 0x8c, 0x9f, 0xd2, 0x28, 0x4c,
+	0x68, 0x48, 0x71, 0xa2, 0x51, 0xfb, 0xf5, 0x12, 0x94, 0x53, 0x63, 0x1d, 0xbe, 0x06, 0x95, 0x67,
+	0xe4, 0x05, 0x31, 0xe2, 0x51, 0x5d, 0x46, 0xa2, 0xcc, 0xb1, 0x6e, 0x34, 0xae, 0x7f, 0x00, 0xeb,
+	0x82, 0xe2, 0x8e, 0x42, 0xea, 0x1b, 0xa6, 0x43, 0x82, 0x40, 0x04, 0xad, 0x28, 0xa8, 0x98, 0xcb,
+	0x3a, 0x5c, 0xb4, 0x17, 0x4b, 0xf0, 0x03, 0x58, 0x13, 0x1a, 0xc3, 0x91, 0x13, 0xda, 0x9e, 0x43,
+	0x0d, 0xfe, 0xf1, 0x10, 0x88, 0x42, 0x9c, 0x78, 0xb6, 0xca, 0x19, 0x07, 0x11, 0x81, 0x7b, 0x14,
+	0xe0, 0x7d, 0xb8, 0x22, 0xd4, 0x06, 0x94, 0x51, 0x9f, 0x84, 0xd4, 0xa0, 0xbf, 0x18, 0x11, 0x27,
+	0x30, 0x08, 0xb3, 0x8c, 0x53, 0x12, 0x9c, 0xaa, 0xeb, 0x69, 0x03, 0x97, 0x38, 0x77, 0x3f, 0xa2,
+	0x6a, 0x82, 0xd9, 0x60, 0xd6, 0xa7, 0x24, 0x38, 0xc5, 0x3b, 0x70, 0x41, 0x18, 0x0a, 0x42, 0xdf,
+	0x66, 0x03, 0xc3, 0x3c, 0xa5, 0xe6, 0x73, 0x63, 0x14, 0xf6, 0x1f, 0xa9, 0x97, 0xd3, 0x16, 0x84,
+	0x93, 0x3d, 0xc1, 0xd9, 0xe3, 0x94, 0xe3, 0xb0, 0xff, 0x08, 0xf7, 0xa0, 0xc2, 0xcf, 0x63, 0x68,
+	0x7f, 0x41, 0x8d, 0xbe, 0xeb, 0x8b, 0xe6, 0x52, 0x9d, 0xf3, 0x72, 0xa7, 0x82, 0x58, 0xef, 0x44,
+	0x0a, 0x07, 0xae, 0x45, 0x77, 0xf2, 0xbd, 0xae, 0xa6, 0x35, 0xf5, 0x72, 0x6c, 0xe5, 0xb1, 0xeb,
+	0xf3, 0x9c, 0x1a, 0xb8, 0x49, 0x8c, 0xcb, 0x32, 0xa7, 0x06, 0x6e, 0x1c, 0xe1, 0x07, 0xb0, 0x66,
+	0x9a, 0x72, 0xdb, 0xb6, 0x69, 0x44, 0x53, 0x7e, 0xa0, 0xa2, 0x89, 0x78, 0x99, 0xe6, 0xbe, 0x24,
+	0x44, 0x69, 0x1e, 0xe0, 0x8f, 0xe0, 0xed, 0x71, 0xbc, 0xd2, 0x8a, 0xab, 0x33, 0xbb, 0x9c, 0x56,
+	0x7d, 0x00, 0x6b, 0xde, 0xd9, 0xac, 0x22, 0x9e, 0x78, 0xa2, 0x77, 0x36, 0xad, 0x76, 0x43, 0x7c,
+	0xb9, 0xf9, 0xd4, 0x24, 0x21, 0xb5, 0xd4, 0x8b, 0x69, 0x76, 0x4a, 0x80, 0xef, 0x02, 0x32, 0x4d,
+	0x83, 0x32, 0x72, 0xe2, 0x50, 0x83, 0xf8, 0x94, 0x91, 0x40, 0xbd, 0x9a, 0x26, 0x57, 0x4d, 0x53,
+	0x13, 0xd2, 0x86, 0x10, 0xe2, 0xdb, 0xb0, 0xea, 0x9e, 0x3c, 0x33, 0x65, 0x72, 0x19, 0x9e, 0x4f,
+	0xfb, 0xf6, 0x2b, 0xf5, 0xba, 0x08, 0xd3, 0x0a, 0x17, 0x88, 0xd4, 0xea, 0x0a, 0x18, 0xdf, 0x02,
+	0x64, 0x06, 0xa7, 0xc4, 0xf7, 0x44, 0x77, 0x0f, 0x3c, 0x62, 0x52, 0xf5, 0x86, 0xa4, 0x4a, 0xfc,
+	0x30, 0x86, 0xf1, 0x53, 0x58, 0x1f, 0x31, 0x9b, 0x85, 0xd4, 0xf7, 0x7c, 0xca, 0x87, 0x74, 0xf9,
+	0xa6, 0xa9, 0xff, 0x5a, 0x5a, 0x30, 0x66, 0x1f, 0xa7, 0xd9, 0xf2, 0x74, 0xf5, 0xb5, 0xd1, 0x2c,
+	0x58, 0xdb, 0x81, 0x4a, 0xfa, 0xd0, 0x71, 0x09, 0xe4, 0xb1, 0x23, 0x85, 0xf7, 0xd0, 0xbd, 0x4e,
+	0x93, 0x77, 0xbf, 0xcf, 0x35, 0x94, 0xe1, 0x5d, 0xb8, 0xdd, 0x3a, 0xd2, 0x0c, 0xfd, 0xf8, 0xf0,
+	0xa8, 0x75, 0xa0, 0xa1, 0xec, 0xed, 0x52, 0xf1, 0xdf, 0x4b, 0xe8, 0xf5, 0xeb, 0xd7, 0xaf, 0x33,
+	0x4f, 0x72, 0xc5, 0xf7, 0xd1, 0xcd, 0xda, 0x5f, 0x33, 0x50, 0x9d, 0x9c, 0x7f, 0xf1, 0x8f, 0xe0,
+	0x62, 0xfc, 0xb1, 0x1a, 0xd0, 0xd0, 0x78, 0x69, 0xfb, 0x22, 0x1b, 0x87, 0x44, 0x4e, 0x90, 0x49,
+	0x20, 0xd7, 0x23, 0x56, 0x8f, 0x86, 0x3f, 0xb3, 0x7d, 0x9e, 0x6b, 0x43, 0x12, 0xe2, 0x36, 0x5c,
+	0x65, 0xae, 0x11, 0x84, 0x84, 0x59, 0xc4, 0xb7, 0x8c, 0xf1, 0x35, 0x81, 0x41, 0x4c, 0x93, 0x06,
+	0x81, 0x2b, 0x1b, 0x41, 0x62, 0xe5, 0x1d, 0xe6, 0xf6, 0x22, 0xf2, 0xb8, 0x42, 0x36, 0x22, 0xea,
+	0xd4, 0xa1, 0x67, 0x17, 0x1d, 0xfa, 0x65, 0x28, 0x0d, 0x89, 0x67, 0x50, 0x16, 0xfa, 0x67, 0x62,
+	0x6a, 0x2b, 0xea, 0xc5, 0x21, 0xf1, 0x34, 0xbe, 0xfe, 0xf6, 0x4e, 0x22, 0x15, 0xcd, 0xda, 0x3f,
+	0xb2, 0x50, 0x49, 0x4f, 0x6e, 0x7c, 0x10, 0x36, 0x45, 0x95, 0x56, 0xc4, 0x4b, 0xfc, 0xde, 0xd7,
+	0xce, 0x79, 0xf5, 0x3d, 0x5e, 0xbe, 0x77, 0x0a, 0x72, 0x9e, 0xd2, 0xa5, 0x26, 0x6f, 0x9d, 0xfc,
+	0xb5, 0xa5, 0x72, 0x4a, 0x2f, 0xea, 0xd1, 0x0a, 0xef, 0x43, 0xe1, 0x59, 0x20, 0x6c, 0x17, 0x84,
+	0xed, 0xeb, 0x5f, 0x6f, 0xfb, 0x49, 0x4f, 0x18, 0x2f, 0x3d, 0xe9, 0x19, 0x87, 0x1d, 0xfd, 0xa0,
+	0xd1, 0xd6, 0x23, 0x75, 0x7c, 0x09, 0x72, 0x0e, 0xf9, 0xe2, 0x6c, 0xb2, 0xd0, 0x0b, 0xe8, 0xbc,
+	0x81, 0xbf, 0x04, 0xb9, 0x97, 0x94, 0x3c, 0x9f, 0x2c, 0xaf, 0x02, 0xfa, 0x16, 0x5f, 0x80, 0xbb,
+	0x90, 0x17, 0xf1, 0xc2, 0x00, 0x51, 0xc4, 0xd0, 0x5b, 0xb8, 0x08, 0xb9, 0xbd, 0x8e, 0xce, 0x5f,
+	0x02, 0x04, 0x15, 0x89, 0x1a, 0xdd, 0x96, 0xb6, 0xa7, 0xa1, 0x4c, 0xed, 0x01, 0x14, 0x64, 0x10,
+	0xf8, 0x0b, 0x92, 0x84, 0x01, 0xbd, 0x15, 0x2d, 0x23, 0x1b, 0x4a, 0x2c, 0x3d, 0x3e, 0xd8, 0xd5,
+	0x74, 0x94, 0x49, 0x1f, 0x6f, 0x00, 0x95, 0xf4, 0xd0, 0xf6, 0xdd, 0xe4, 0xd4, 0x5f, 0x14, 0x28,
+	0xa7, 0x86, 0x30, 0xde, 0xfe, 0x89, 0xe3, 0xb8, 0x2f, 0x0d, 0xe2, 0xd8, 0x24, 0x88, 0x92, 0x02,
+	0x04, 0xd4, 0xe0, 0xc8, 0x79, 0x0f, 0xed, 0x3b, 0x71, 0xfe, 0x0f, 0x0a, 0xa0, 0xe9, 0x01, 0x6e,
+	0xca, 0x41, 0xe5, 0x7b, 0x75, 0xf0, 0xf7, 0x0a, 0x54, 0x27, 0xa7, 0xb6, 0x29, 0xf7, 0xae, 0x7d,
+	0xaf, 0xee, 0xfd, 0x4e, 0x81, 0xe5, 0x89, 0x59, 0xed, 0xff, 0xca, 0xbb, 0xdf, 0x66, 0x61, 0x6d,
+	0x8e, 0x1e, 0x6e, 0x44, 0x43, 0xad, 0x9c, 0xb3, 0x7f, 0x78, 0x9e, 0x67, 0xd5, 0x79, 0xcf, 0xec,
+	0x12, 0x3f, 0x8c, 0x66, 0xe0, 0x5b, 0x80, 0x6c, 0x8b, 0xb2, 0xd0, 0xee, 0xdb, 0xd4, 0x8f, 0x3e,
+	0xc4, 0xe5, 0xa4, 0xbb, 0x32, 0xc6, 0xe5, 0xb7, 0xf8, 0x0f, 0x00, 0x7b, 0x6e, 0x60, 0x87, 0xf6,
+	0x0b, 0x6a, 0xd8, 0x2c, 0xfe, 0x6a, 0xe7, 0x93, 0x6f, 0x4e, 0x47, 0xb1, 0xa4, 0xc5, 0xc2, 0x84,
+	0xcd, 0xe8, 0x80, 0x4c, 0xb1, 0x79, 0xed, 0xcb, 0xea, 0x28, 0x96, 0x24, 0xec, 0x6b, 0x50, 0xb1,
+	0xdc, 0x11, 0x1f, 0x22, 0x24, 0x8f, 0x97, 0x5a, 0x45, 0x2f, 0x4b, 0x2c, 0xa1, 0x44, 0x53, 0xde,
+	0xf8, 0xba, 0xa0, 0xa2, 0x97, 0x25, 0x26, 0x29, 0x37, 0x61, 0x85, 0x0c, 0x06, 0x3e, 0x37, 0x1e,
+	0x1b, 0x92, 0xa3, 0x6b, 0x35, 0x81, 0x05, 0x71, 0xe3, 0x09, 0x14, 0xe3, 0x38, 0xf0, 0x6e, 0xc6,
+	0x23, 0x61, 0x78, 0xf2, 0xd2, 0x26, 0xb3, 0x55, 0xd2, 0x8b, 0x2c, 0x16, 0x5e, 0x83, 0x8a, 0x1d,
+	0x18, 0xe3, 0xdb, 0xc3, 0xcc, 0x66, 0x66, 0xab, 0xa8, 0x97, 0xed, 0x20, 0xb9, 0x2e, 0xaa, 0x7d,
+	0x95, 0x81, 0xea, 0xe4, 0xed, 0x27, 0x6e, 0x42, 0xd1, 0x71, 0x4d, 0x22, 0x12, 0x41, 0x5e, 0xbd,
+	0x6f, 0xbd, 0xe1, 0xc2, 0xb4, 0xde, 0x8e, 0xf8, 0x7a, 0xa2, 0xb9, 0xf1, 0x37, 0x05, 0x8a, 0x31,
+	0x8c, 0x2f, 0x40, 0xce, 0x23, 0xe1, 0xa9, 0x30, 0x97, 0xdf, 0xcd, 0x20, 0x45, 0x17, 0x6b, 0x8e,
+	0x07, 0x1e, 0x61, 0x22, 0x05, 0x22, 0x9c, 0xaf, 0xf9, 0xb9, 0x3a, 0x94, 0x58, 0x62, 0x28, 0x76,
+	0x87, 0x43, 0xca, 0xc2, 0x20, 0x3e, 0xd7, 0x08, 0xdf, 0x8b, 0x60, 0x7c, 0x07, 0x56, 0x43, 0x9f,
+	0xd8, 0xce, 0x04, 0x37, 0x27, 0xb8, 0x28, 0x16, 0x24, 0xe4, 0x1d, 0xb8, 0x14, 0xdb, 0xb5, 0x68,
+	0x48, 0xcc, 0x53, 0x6a, 0x8d, 0x95, 0x0a, 0xe2, 0x6a, 0xed, 0x62, 0x44, 0x68, 0x46, 0xf2, 0x58,
+	0xb7, 0xf6, 0x77, 0x05, 0x56, 0xe3, 0x31, 0xde, 0x4a, 0x82, 0x75, 0x00, 0x40, 0x18, 0x73, 0xc3,
+	0x74, 0xb8, 0x66, 0x53, 0x79, 0x46, 0xaf, 0xde, 0x48, 0x94, 0xf4, 0x94, 0x81, 0x8d, 0x21, 0xc0,
+	0x58, 0xb2, 0x30, 0x6c, 0x57, 0xa1, 0x1c, 0x5d, 0x6d, 0x8b, 0xff, 0x8f, 0xc8, 0x6f, 0x3f, 0x90,
+	0x10, 0x9f, 0xf7, 0xf1, 0x3a, 0xe4, 0x4f, 0xe8, 0xc0, 0x66, 0xd1, 0x85, 0x9b, 0x5c, 0xc4, 0xd7,
+	0x78, 0xb9, 0xe4, 0x1a, 0x6f, 0xf7, 0xe7, 0xb0, 0x66, 0xba, 0xc3, 0x69, 0x77, 0x77, 0xd1, 0xd4,
+	0xf7, 0x67, 0xf0, 0xa9, 0xf2, 0x39, 0x8c, 0xa7, 0xb3, 0x3f, 0x2a, 0xca, 0x97, 0x99, 0xec, 0x7e,
+	0x77, 0xf7, 0x4f, 0x99, 0x8d, 0x7d, 0xa9, 0xda, 0x8d, 0x77, 0xaa, 0xd3, 0xbe, 0x43, 0x4d, 0xee,
+	0xfd, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x05, 0x54, 0xc8, 0x7d, 0x07, 0x1a, 0x00, 0x00,
 }
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
index c2c96bf720..4d7d19b677 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
@@ -62,7 +62,7 @@ import (
 // It is incremented whenever an incompatibility between the generated code and
 // proto package is introduced; the generated code references
 // a constant, proto.ProtoPackageIsVersionN (where N is generatedCodeVersion).
-const generatedCodeVersion = 1
+const generatedCodeVersion = 2
 
 // A Plugin provides functionality to add to the output during Go code generation,
 // such as to produce RPC stubs.
@@ -264,6 +264,36 @@ type FileDescriptor struct {
 // PackageName is the package name we'll use in the generated code to refer to this file.
 func (d *FileDescriptor) PackageName() string { return uniquePackageOf(d.FileDescriptorProto) }
 
+// VarName is the variable name we'll use in the generated code to refer
+// to the compressed bytes of this descriptor. It is not exported, so
+// it is only valid inside the generated package.
+func (d *FileDescriptor) VarName() string { return fmt.Sprintf("fileDescriptor%d", d.index) }
+
+// goPackageOption interprets the file's go_package option.
+// If there is no go_package, it returns ("", "", false).
+// If there's a simple name, it returns ("", pkg, true).
+// If the option implies an import path, it returns (impPath, pkg, true).
+func (d *FileDescriptor) goPackageOption() (impPath, pkg string, ok bool) {
+	pkg = d.GetOptions().GetGoPackage()
+	if pkg == "" {
+		return
+	}
+	ok = true
+	// The presence of a slash implies there's an import path.
+	slash := strings.LastIndex(pkg, "/")
+	if slash < 0 {
+		return
+	}
+	impPath, pkg = pkg, pkg[slash+1:]
+	// A semicolon-delimited suffix overrides the package name.
+	sc := strings.IndexByte(impPath, ';')
+	if sc < 0 {
+		return
+	}
+	impPath, pkg = impPath[:sc], impPath[sc+1:]
+	return
+}
+
 // goPackageName returns the Go package name to use in the
 // generated Go file.  The result explicit reports whether the name
 // came from an option go_package statement.  If explicit is false,
@@ -271,10 +301,8 @@ func (d *FileDescriptor) PackageName() string { return uniquePackageOf(d.FileDes
 // or the input file name.
 func (d *FileDescriptor) goPackageName() (name string, explicit bool) {
 	// Does the file have a "go_package" option?
-	if opts := d.Options; opts != nil {
-		if pkg := opts.GetGoPackage(); pkg != "" {
-			return pkg, true
-		}
+	if _, pkg, ok := d.goPackageOption(); ok {
+		return pkg, true
 	}
 
 	// Does the file have a package clause?
@@ -285,6 +313,26 @@ func (d *FileDescriptor) goPackageName() (name string, explicit bool) {
 	return baseName(d.GetName()), false
 }
 
+// goFileName returns the output name for the generated Go file.
+func (d *FileDescriptor) goFileName() string {
+	name := *d.Name
+	if ext := path.Ext(name); ext == ".proto" || ext == ".protodevel" {
+		name = name[:len(name)-len(ext)]
+	}
+	name += ".pb.go"
+
+	// Does the file have a "go_package" option?
+	// If it does, it may override the filename.
+	if impPath, _, ok := d.goPackageOption(); ok && impPath != "" {
+		// Replace the existing dirname with the declared import path.
+		_, name = path.Split(name)
+		name = path.Join(impPath, name)
+		return name
+	}
+
+	return name
+}
+
 func (d *FileDescriptor) addExport(obj Object, sym symbol) {
 	d.exported[obj] = append(d.exported[obj], sym)
 }
@@ -320,8 +368,6 @@ func (ms *messageSymbol) GenerateAlias(g *Generator, pkg string) {
 	if ms.hasExtensions {
 		g.P("func (*", ms.sym, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange ",
 			"{ return (*", remoteSym, ")(nil).ExtensionRangeArray() }")
-		g.P("func (m *", ms.sym, ") ExtensionMap() map[int32]", g.Pkg["proto"], ".Extension ",
-			"{ return (*", remoteSym, ")(m).ExtensionMap() }")
 		if ms.isMessageSet {
 			g.P("func (m *", ms.sym, ") Marshal() ([]byte, error) ",
 				"{ return (*", remoteSym, ")(m).Marshal() }")
@@ -512,7 +558,7 @@ type Generator struct {
 	Param             map[string]string // Command-line parameters.
 	PackageImportPath string            // Go import path of the package we're generating code for
 	ImportPrefix      string            // String to prefix to imported package file names.
-	ImportMap         map[string]string // Mapping from import name to generated name
+	ImportMap         map[string]string // Mapping from .proto file name to import path
 
 	Pkg map[string]string // The names under which we import support packages
 
@@ -760,9 +806,9 @@ AllFiles:
 // and FileDescriptorProtos into file-referenced objects within the Generator.
 // It also creates the list of files to generate and so should be called before GenerateAllFiles.
 func (g *Generator) WrapTypes() {
-	g.allFiles = make([]*FileDescriptor, len(g.Request.ProtoFile))
+	g.allFiles = make([]*FileDescriptor, 0, len(g.Request.ProtoFile))
 	g.allFilesByName = make(map[string]*FileDescriptor, len(g.allFiles))
-	for i, f := range g.Request.ProtoFile {
+	for _, f := range g.Request.ProtoFile {
 		// We must wrap the descriptors before we wrap the enums
 		descs := wrapDescriptors(f)
 		g.buildNestedDescriptors(descs)
@@ -778,22 +824,22 @@ func (g *Generator) WrapTypes() {
 			proto3:              fileIsProto3(f),
 		}
 		extractComments(fd)
-		g.allFiles[i] = fd
+		g.allFiles = append(g.allFiles, fd)
 		g.allFilesByName[f.GetName()] = fd
 	}
 	for _, fd := range g.allFiles {
 		fd.imp = wrapImported(fd.FileDescriptorProto, g)
 	}
 
-	g.genFiles = make([]*FileDescriptor, len(g.Request.FileToGenerate))
-	for i, fileName := range g.Request.FileToGenerate {
-		g.genFiles[i] = g.allFilesByName[fileName]
-		if g.genFiles[i] == nil {
+	g.genFiles = make([]*FileDescriptor, 0, len(g.Request.FileToGenerate))
+	for _, fileName := range g.Request.FileToGenerate {
+		fd := g.allFilesByName[fileName]
+		if fd == nil {
 			g.Fail("could not find file named", fileName)
 		}
-		g.genFiles[i].index = i
+		fd.index = len(g.genFiles)
+		g.genFiles = append(g.genFiles, fd)
 	}
-	g.Response.File = make([]*plugin.CodeGeneratorResponse_File, len(g.genFiles))
 }
 
 // Scan the descriptors in this file.  For each one, build the slice of nested descriptors
@@ -857,9 +903,8 @@ func newDescriptor(desc *descriptor.DescriptorProto, parent *Descriptor, file *d
 		}
 	}
 
-	d.ext = make([]*ExtensionDescriptor, len(desc.Extension))
-	for i, field := range desc.Extension {
-		d.ext[i] = &ExtensionDescriptor{common{file}, field, d}
+	for _, field := range desc.Extension {
+		d.ext = append(d.ext, &ExtensionDescriptor{common{file}, field, d})
 	}
 
 	return d
@@ -918,9 +963,9 @@ func wrapEnumDescriptors(file *descriptor.FileDescriptorProto, descs []*Descript
 
 // Return a slice of all the top-level ExtensionDescriptors defined within this file.
 func wrapExtensions(file *descriptor.FileDescriptorProto) []*ExtensionDescriptor {
-	sl := make([]*ExtensionDescriptor, len(file.Extension))
-	for i, field := range file.Extension {
-		sl[i] = &ExtensionDescriptor{common{file}, field, nil}
+	var sl []*ExtensionDescriptor
+	for _, field := range file.Extension {
+		sl = append(sl, &ExtensionDescriptor{common{file}, field, nil})
 	}
 	return sl
 }
@@ -1089,7 +1134,6 @@ func (g *Generator) GenerateAllFiles() {
 	for _, file := range g.genFiles {
 		genFileMap[file] = true
 	}
-	i := 0
 	for _, file := range g.allFiles {
 		g.Reset()
 		g.writeOutput = genFileMap[file]
@@ -1097,10 +1141,10 @@ func (g *Generator) GenerateAllFiles() {
 		if !g.writeOutput {
 			continue
 		}
-		g.Response.File[i] = new(plugin.CodeGeneratorResponse_File)
-		g.Response.File[i].Name = proto.String(goFileName(*file.Name))
-		g.Response.File[i].Content = proto.String(g.String())
-		i++
+		g.Response.File = append(g.Response.File, &plugin.CodeGeneratorResponse_File{
+			Name:    proto.String(file.goFileName()),
+			Content: proto.String(g.String()),
+		})
 	}
 }
 
@@ -1132,7 +1176,9 @@ func (g *Generator) generate(file *FileDescriptor) {
 		// For one file in the package, assert version compatibility.
 		g.P("// This is a compile-time assertion to ensure that this generated file")
 		g.P("// is compatible with the proto package it is being compiled against.")
-		g.P("const _ = ", g.Pkg["proto"], ".ProtoPackageIsVersion", generatedCodeVersion)
+		g.P("// A compilation error at this line likely means your copy of the")
+		g.P("// proto package needs to be updated.")
+		g.P("const _ = ", g.Pkg["proto"], ".ProtoPackageIsVersion", generatedCodeVersion, " // please upgrade the proto package")
 		g.P()
 	}
 
@@ -1285,7 +1331,7 @@ func (g *Generator) generateImports() {
 		if fd.PackageName() == g.packageName {
 			continue
 		}
-		filename := goFileName(s)
+		filename := fd.goFileName()
 		// By default, import path is the dirname of the Go filename.
 		importPath := path.Dir(filename)
 		if substitution, ok := g.ImportMap[s]; ok {
@@ -1425,7 +1471,10 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) {
 		indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
 	}
 	indexes = append(indexes, strconv.Itoa(enum.index))
-	g.P("func (", ccTypeName, ") EnumDescriptor() ([]byte, []int) { return fileDescriptor", g.file.index, ", []int{", strings.Join(indexes, ", "), "} }")
+	g.P("func (", ccTypeName, ") EnumDescriptor() ([]byte, []int) { return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "} }")
+	if enum.file.GetPackage() == "google.protobuf" && enum.GetName() == "NullValue" {
+		g.P("func (", ccTypeName, `) XXX_WellKnownType() string { return "`, enum.GetName(), `" }`)
+	}
 
 	g.P()
 }
@@ -1502,7 +1551,11 @@ func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptor
 		enum += CamelCaseSlice(obj.TypeName())
 	}
 	packed := ""
-	if field.Options != nil && field.Options.GetPacked() {
+	if (field.Options != nil && field.Options.GetPacked()) ||
+		// Per https://developers.google.com/protocol-buffers/docs/proto3#simple:
+		// "In proto3, repeated fields of scalar numeric types use packed encoding by default."
+		(message.proto3() && (field.Options == nil || field.Options.Packed == nil) &&
+			isRepeated(field) && isScalar(field)) {
 		packed = ",packed"
 	}
 	fieldName := field.GetName()
@@ -1517,6 +1570,11 @@ func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptor
 			name = name[i+1:]
 		}
 	}
+	if json := field.GetJsonName(); json != "" && json != name {
+		// TODO: escaping might be needed, in which case
+		// perhaps this should be in its own "json" tag.
+		name += ",json=" + json
+	}
 	name = ",name=" + name
 	if message.proto3() {
 		// We only need the extra tag for []byte fields;
@@ -1635,7 +1693,8 @@ func (g *Generator) RecordTypeUse(t string) {
 }
 
 // Method names that may be generated.  Fields with these names get an
-// underscore appended.
+// underscore appended. Any change to this set is a potential incompatible
+// API change because it changes generated field names.
 var methodNames = [...]string{
 	"Reset",
 	"String",
@@ -1647,6 +1706,28 @@ var methodNames = [...]string{
 	"Descriptor",
 }
 
+// Names of messages in the `google.protobuf` package for which
+// we will generate XXX_WellKnownType methods.
+var wellKnownTypes = map[string]bool{
+	"Any":       true,
+	"Duration":  true,
+	"Empty":     true,
+	"Struct":    true,
+	"Timestamp": true,
+
+	"Value":       true,
+	"ListValue":   true,
+	"DoubleValue": true,
+	"FloatValue":  true,
+	"Int64Value":  true,
+	"UInt64Value": true,
+	"Int32Value":  true,
+	"UInt32Value": true,
+	"BoolValue":   true,
+	"StringValue": true,
+	"BytesValue":  true,
+}
+
 // Generate the type and default constant definitions for this Descriptor.
 func (g *Generator) generateMessage(message *Descriptor) {
 	// The full type name
@@ -1798,7 +1879,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
 		g.RecordTypeUse(field.GetTypeName())
 	}
 	if len(message.ExtensionRange) > 0 {
-		g.P("XXX_extensions\t\tmap[int32]", g.Pkg["proto"], ".Extension `json:\"-\"`")
+		g.P(g.Pkg["proto"], ".XXX_InternalExtensions `json:\"-\"`")
 	}
 	if !message.proto3() {
 		g.P("XXX_unrecognized\t[]byte `json:\"-\"`")
@@ -1827,13 +1908,15 @@ func (g *Generator) generateMessage(message *Descriptor) {
 	g.P("func (m *", ccTypeName, ") Reset() { *m = ", ccTypeName, "{} }")
 	g.P("func (m *", ccTypeName, ") String() string { return ", g.Pkg["proto"], ".CompactTextString(m) }")
 	g.P("func (*", ccTypeName, ") ProtoMessage() {}")
-	if !message.group {
-		var indexes []string
-		for m := message; m != nil; m = m.parent {
-			// XXX: skip groups?
-			indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
-		}
-		g.P("func (*", ccTypeName, ") Descriptor() ([]byte, []int) { return fileDescriptor", g.file.index, ", []int{", strings.Join(indexes, ", "), "} }")
+	var indexes []string
+	for m := message; m != nil; m = m.parent {
+		indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
+	}
+	g.P("func (*", ccTypeName, ") Descriptor() ([]byte, []int) { return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "} }")
+	// TODO: Revisit the decision to use a XXX_WellKnownType method
+	// if we change proto.MessageName to work with multiple equivalents.
+	if message.file.GetPackage() == "google.protobuf" && wellKnownTypes[message.GetName()] {
+		g.P("func (*", ccTypeName, `) XXX_WellKnownType() string { return "`, message.GetName(), `" }`)
 	}
 
 	// Extension support methods
@@ -1846,22 +1929,22 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			g.P()
 			g.P("func (m *", ccTypeName, ") Marshal() ([]byte, error) {")
 			g.In()
-			g.P("return ", g.Pkg["proto"], ".MarshalMessageSet(m.ExtensionMap())")
+			g.P("return ", g.Pkg["proto"], ".MarshalMessageSet(&m.XXX_InternalExtensions)")
 			g.Out()
 			g.P("}")
 			g.P("func (m *", ccTypeName, ") Unmarshal(buf []byte) error {")
 			g.In()
-			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSet(buf, m.ExtensionMap())")
+			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSet(buf, &m.XXX_InternalExtensions)")
 			g.Out()
 			g.P("}")
 			g.P("func (m *", ccTypeName, ") MarshalJSON() ([]byte, error) {")
 			g.In()
-			g.P("return ", g.Pkg["proto"], ".MarshalMessageSetJSON(m.XXX_extensions)")
+			g.P("return ", g.Pkg["proto"], ".MarshalMessageSetJSON(&m.XXX_InternalExtensions)")
 			g.Out()
 			g.P("}")
 			g.P("func (m *", ccTypeName, ") UnmarshalJSON(buf []byte) error {")
 			g.In()
-			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSetJSON(buf, m.XXX_extensions)")
+			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)")
 			g.Out()
 			g.P("}")
 			g.P("// ensure ", ccTypeName, " satisfies proto.Marshaler and proto.Unmarshaler")
@@ -1883,16 +1966,6 @@ func (g *Generator) generateMessage(message *Descriptor) {
 		g.P("return extRange_", ccTypeName)
 		g.Out()
 		g.P("}")
-		g.P("func (m *", ccTypeName, ") ExtensionMap() map[int32]", g.Pkg["proto"], ".Extension {")
-		g.In()
-		g.P("if m.XXX_extensions == nil {")
-		g.In()
-		g.P("m.XXX_extensions = make(map[int32]", g.Pkg["proto"], ".Extension)")
-		g.Out()
-		g.P("}")
-		g.P("return m.XXX_extensions")
-		g.Out()
-		g.P("}")
 	}
 
 	// Default constants
@@ -2541,7 +2614,10 @@ func (g *Generator) generateFileDescriptor(file *FileDescriptor) {
 	w.Close()
 	b = buf.Bytes()
 
-	g.P("var fileDescriptor", file.index, " = []byte{")
+	v := file.VarName()
+	g.P()
+	g.P("func init() { ", g.Pkg["proto"], ".RegisterFile(", strconv.Quote(*file.Name), ", ", v, ") }")
+	g.P("var ", v, " = []byte{")
 	g.In()
 	g.P("// ", len(b), " bytes of a gzipped FileDescriptorProto")
 	for len(b) > 0 {
@@ -2645,15 +2721,6 @@ func CamelCaseSlice(elem []string) string { return CamelCase(strings.Join(elem,
 // dottedSlice turns a sliced name into a dotted name.
 func dottedSlice(elem []string) string { return strings.Join(elem, ".") }
 
-// Given a .proto file name, return the output name for the generated Go program.
-func goFileName(name string) string {
-	ext := path.Ext(name)
-	if ext == ".proto" || ext == ".protodevel" {
-		name = name[0 : len(name)-len(ext)]
-	}
-	return name + ".pb.go"
-}
-
 // Is this field optional?
 func isOptional(field *descriptor.FieldDescriptorProto) bool {
 	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_OPTIONAL
@@ -2669,6 +2736,32 @@ func isRepeated(field *descriptor.FieldDescriptorProto) bool {
 	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_REPEATED
 }
 
+// Is this field a scalar numeric type?
+func isScalar(field *descriptor.FieldDescriptorProto) bool {
+	if field.Type == nil {
+		return false
+	}
+	switch *field.Type {
+	case descriptor.FieldDescriptorProto_TYPE_DOUBLE,
+		descriptor.FieldDescriptorProto_TYPE_FLOAT,
+		descriptor.FieldDescriptorProto_TYPE_INT64,
+		descriptor.FieldDescriptorProto_TYPE_UINT64,
+		descriptor.FieldDescriptorProto_TYPE_INT32,
+		descriptor.FieldDescriptorProto_TYPE_FIXED64,
+		descriptor.FieldDescriptorProto_TYPE_FIXED32,
+		descriptor.FieldDescriptorProto_TYPE_BOOL,
+		descriptor.FieldDescriptorProto_TYPE_UINT32,
+		descriptor.FieldDescriptorProto_TYPE_ENUM,
+		descriptor.FieldDescriptorProto_TYPE_SFIXED32,
+		descriptor.FieldDescriptorProto_TYPE_SFIXED64,
+		descriptor.FieldDescriptorProto_TYPE_SINT32,
+		descriptor.FieldDescriptorProto_TYPE_SINT64:
+		return true
+	default:
+		return false
+	}
+}
+
 // badToUnderscore is the mapping function used to generate Go names from package names,
 // which can be dotted in the input .proto file.  It replaces non-identifier characters such as
 // dot or dash with underscore.
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
similarity index 90%
rename from vendor/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
rename to vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
index f33f7011bf..a29a8d2c20 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/internal/grpc/grpc.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
@@ -44,6 +44,12 @@ import (
 	"github.com/golang/protobuf/protoc-gen-go/generator"
 )
 
+// generatedCodeVersion indicates a version of the generated code.
+// It is incremented whenever an incompatibility between the generated code and
+// the grpc package is introduced; the generated code references
+// a constant, grpc.SupportPackageIsVersionN (where N is generatedCodeVersion).
+const generatedCodeVersion = 3
+
 // Paths for packages used by code generated in this file,
 // relative to the import_prefix of the generator.Generator.
 const (
@@ -101,10 +107,18 @@ func (g *grpc) Generate(file *generator.FileDescriptor) {
 	if len(file.FileDescriptorProto.Service) == 0 {
 		return
 	}
+
 	g.P("// Reference imports to suppress errors if they are not otherwise used.")
 	g.P("var _ ", contextPkg, ".Context")
 	g.P("var _ ", grpcPkg, ".ClientConn")
 	g.P()
+
+	// Assert version compatibility.
+	g.P("// This is a compile-time assertion to ensure that this generated file")
+	g.P("// is compatible with the grpc package it is being compiled against.")
+	g.P("const _ = ", grpcPkg, ".SupportPackageIsVersion", generatedCodeVersion)
+	g.P()
+
 	for i, service := range file.FileDescriptorProto.Service {
 		g.generateService(file, service, i)
 	}
@@ -204,7 +218,7 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi
 	// Server handler implementations.
 	var handlerNames []string
 	for _, method := range service.Method {
-		hname := g.generateServerMethod(servName, method)
+		hname := g.generateServerMethod(servName, fullServName, method)
 		handlerNames = append(handlerNames, hname)
 	}
 
@@ -240,6 +254,7 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi
 		g.P("},")
 	}
 	g.P("},")
+	g.P("Metadata: ", file.VarName(), ",")
 	g.P("}")
 	g.P()
 }
@@ -364,19 +379,25 @@ func (g *grpc) generateServerSignature(servName string, method *pb.MethodDescrip
 	return methName + "(" + strings.Join(reqArgs, ", ") + ") " + ret
 }
 
-func (g *grpc) generateServerMethod(servName string, method *pb.MethodDescriptorProto) string {
+func (g *grpc) generateServerMethod(servName, fullServName string, method *pb.MethodDescriptorProto) string {
 	methName := generator.CamelCase(method.GetName())
 	hname := fmt.Sprintf("_%s_%s_Handler", servName, methName)
 	inType := g.typeName(method.GetInputType())
 	outType := g.typeName(method.GetOutputType())
 
 	if !method.GetServerStreaming() && !method.GetClientStreaming() {
-		g.P("func ", hname, "(srv interface{}, ctx ", contextPkg, ".Context, dec func(interface{}) error) (interface{}, error) {")
+		g.P("func ", hname, "(srv interface{}, ctx ", contextPkg, ".Context, dec func(interface{}) error, interceptor ", grpcPkg, ".UnaryServerInterceptor) (interface{}, error) {")
 		g.P("in := new(", inType, ")")
 		g.P("if err := dec(in); err != nil { return nil, err }")
-		g.P("out, err := srv.(", servName, "Server).", methName, "(ctx, in)")
-		g.P("if err != nil { return nil, err }")
-		g.P("return out, nil")
+		g.P("if interceptor == nil { return srv.(", servName, "Server).", methName, "(ctx, in) }")
+		g.P("info := &", grpcPkg, ".UnaryServerInfo{")
+		g.P("Server: srv,")
+		g.P("FullMethod: ", strconv.Quote(fmt.Sprintf("/%s/%s", fullServName, methName)), ",")
+		g.P("}")
+		g.P("handler := func(ctx ", contextPkg, ".Context, req interface{}) (interface{}, error) {")
+		g.P("return srv.(", servName, "Server).", methName, "(ctx, req.(*", inType, "))")
+		g.P("}")
+		g.P("return interceptor(ctx, in, info, handler)")
 		g.P("}")
 		g.P()
 		return hname
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
index 24e490ec4b..532a550050 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
@@ -31,4 +31,4 @@
 
 package main
 
-import _ "github.com/golang/protobuf/protoc-gen-go/internal/grpc"
+import _ "github.com/golang/protobuf/protoc-gen-go/grpc"
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
index af31f733e9..0ff4e13a8f 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
@@ -3,7 +3,7 @@
 // DO NOT EDIT!
 
 /*
-Package google_protobuf_compiler is a generated protocol buffer package.
+Package plugin_go is a generated protocol buffer package.
 
 It is generated from these files:
 	google/protobuf/compiler/plugin.proto
@@ -12,7 +12,7 @@ It has these top-level messages:
 	CodeGeneratorRequest
 	CodeGeneratorResponse
 */
-package google_protobuf_compiler
+package plugin_go
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -26,14 +26,16 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 // An encoded CodeGeneratorRequest is written to the plugin's stdin.
 type CodeGeneratorRequest struct {
 	// The .proto files that were explicitly listed on the command-line.  The
 	// code generator should generate code only for these files.  Each file's
 	// descriptor will be included in proto_file, below.
-	FileToGenerate []string `protobuf:"bytes,1,rep,name=file_to_generate" json:"file_to_generate,omitempty"`
+	FileToGenerate []string `protobuf:"bytes,1,rep,name=file_to_generate,json=fileToGenerate" json:"file_to_generate,omitempty"`
 	// The generator parameter passed on the command-line.
 	Parameter *string `protobuf:"bytes,2,opt,name=parameter" json:"parameter,omitempty"`
 	// FileDescriptorProtos for all files in files_to_generate and everything
@@ -47,7 +49,7 @@ type CodeGeneratorRequest struct {
 	// the entire set into memory at once.  However, as of this writing, this
 	// is not similarly optimized on protoc's end -- it will store all fields in
 	// memory at once before sending them to the plugin.
-	ProtoFile        []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file" json:"proto_file,omitempty"`
+	ProtoFile        []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file,json=protoFile" json:"proto_file,omitempty"`
 	XXX_unrecognized []byte                                 `json:"-"`
 }
 
@@ -162,7 +164,7 @@ type CodeGeneratorResponse_File struct {
 	// command line.
 	//
 	// If |insertion_point| is present, |name| must also be present.
-	InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point" json:"insertion_point,omitempty"`
+	InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point,json=insertionPoint" json:"insertion_point,omitempty"`
 	// The file contents.
 	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
@@ -200,23 +202,28 @@ func init() {
 	proto.RegisterType((*CodeGeneratorResponse_File)(nil), "google.protobuf.compiler.CodeGeneratorResponse.File")
 }
 
+func init() { proto.RegisterFile("google/protobuf/compiler/plugin.proto", fileDescriptor0) }
+
 var fileDescriptor0 = []byte{
-	// 269 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4a, 0xc3, 0x40,
-	0x10, 0x86, 0xa9, 0x46, 0xa4, 0x63, 0x25, 0x1a, 0x14, 0x43, 0xf1, 0x10, 0x44, 0xc1, 0x83, 0x6c,
-	0x40, 0x3c, 0x78, 0xf2, 0x10, 0x45, 0xaf, 0xc5, 0x17, 0x08, 0x31, 0x9d, 0x86, 0x85, 0x74, 0x67,
-	0x9d, 0xdd, 0x1c, 0x7d, 0x21, 0x9f, 0xd2, 0xc9, 0xa6, 0x15, 0x09, 0xf6, 0x14, 0xf8, 0xe7, 0xcf,
-	0xf7, 0xcd, 0xb0, 0x70, 0xd3, 0x10, 0x35, 0x2d, 0xe6, 0x96, 0xc9, 0xd3, 0x47, 0xb7, 0xca, 0x6b,
-	0x5a, 0x5b, 0xdd, 0x22, 0xe7, 0xb6, 0xed, 0x1a, 0x6d, 0x54, 0x18, 0x24, 0xe9, 0x50, 0x53, 0xdb,
-	0x9a, 0xda, 0xd6, 0xe6, 0xd9, 0x18, 0xb0, 0x44, 0x57, 0xb3, 0xb6, 0x9e, 0x78, 0x68, 0x5f, 0x7d,
-	0xc1, 0xd9, 0x33, 0x2d, 0xf1, 0x0d, 0x0d, 0x72, 0x25, 0xf1, 0x3b, 0x7e, 0x76, 0xe8, 0x7c, 0x92,
-	0xc2, 0xc9, 0x4a, 0x10, 0xa5, 0xa7, 0xb2, 0x19, 0x66, 0x98, 0x4e, 0xb2, 0xfd, 0xdb, 0x69, 0x72,
-	0x0a, 0x53, 0x5b, 0x71, 0xb5, 0x46, 0x8f, 0x9c, 0xee, 0x65, 0x13, 0x89, 0x1e, 0x01, 0x02, 0xad,
-	0xec, 0x7f, 0x49, 0x63, 0xa9, 0x1d, 0xdd, 0x5f, 0xab, 0xf1, 0x56, 0xaf, 0x32, 0x7c, 0xf9, 0xf5,
-	0x2f, 0x82, 0xfe, 0x7b, 0x02, 0xe7, 0x23, 0xbf, 0xb3, 0x64, 0x1c, 0x26, 0xc7, 0x70, 0x80, 0xcc,
-	0xc4, 0x62, 0xed, 0x15, 0x05, 0x44, 0x7f, 0xe0, 0x0f, 0x6a, 0xd7, 0xc9, 0xea, 0x5f, 0x5a, 0x70,
-	0xcf, 0x9f, 0x20, 0xea, 0xbf, 0xc9, 0x0c, 0x22, 0x23, 0xfb, 0x6f, 0xc8, 0x17, 0x10, 0x6b, 0xa9,
-	0xb0, 0xd7, 0x64, 0x4a, 0x4b, 0xda, 0xf8, 0xcd, 0x55, 0x31, 0x1c, 0xd6, 0x64, 0x3c, 0x4a, 0x10,
-	0xf7, 0x41, 0x71, 0x07, 0x97, 0xa2, 0xd9, 0xa9, 0x2e, 0x66, 0x8b, 0xf0, 0x2a, 0xe1, 0x32, 0xf7,
-	0x13, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x18, 0x2a, 0x2a, 0xbd, 0x01, 0x00, 0x00,
+	// 310 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x51, 0xc1, 0x4a, 0xc3, 0x40,
+	0x10, 0x25, 0xb6, 0x22, 0x19, 0xa5, 0x95, 0xa5, 0xc2, 0x52, 0x7a, 0x08, 0x45, 0x31, 0xa7, 0x14,
+	0x44, 0xf0, 0xde, 0x8a, 0x7a, 0x2c, 0xc1, 0x93, 0x20, 0x21, 0xa6, 0xd3, 0xb0, 0x90, 0xec, 0xac,
+	0xb3, 0xdb, 0x2f, 0xf2, 0x9f, 0xfc, 0x1e, 0xd9, 0x4d, 0x5b, 0xa5, 0xd8, 0xdb, 0xce, 0x7b, 0x6f,
+	0xe6, 0xbd, 0x9d, 0x81, 0x9b, 0x9a, 0xa8, 0x6e, 0x70, 0x66, 0x98, 0x1c, 0x7d, 0x6c, 0xd6, 0xb3,
+	0x8a, 0x5a, 0xa3, 0x1a, 0xe4, 0x99, 0x69, 0x36, 0xb5, 0xd2, 0x59, 0x20, 0x84, 0xec, 0x64, 0xd9,
+	0x4e, 0x96, 0xed, 0x64, 0xe3, 0xe4, 0x70, 0xc0, 0x0a, 0x6d, 0xc5, 0xca, 0x38, 0xe2, 0x4e, 0x3d,
+	0xfd, 0x8a, 0x60, 0xb4, 0xa0, 0x15, 0x3e, 0xa3, 0x46, 0x2e, 0x1d, 0x71, 0x8e, 0x9f, 0x1b, 0xb4,
+	0x4e, 0xa4, 0x70, 0xb9, 0x56, 0x0d, 0x16, 0x8e, 0x8a, 0xba, 0xe3, 0x50, 0x46, 0x49, 0x2f, 0x8d,
+	0xf3, 0x81, 0xc7, 0x5f, 0x69, 0xdb, 0x81, 0x62, 0x02, 0xb1, 0x29, 0xb9, 0x6c, 0xd1, 0x21, 0xcb,
+	0x93, 0x24, 0x4a, 0xe3, 0xfc, 0x17, 0x10, 0x0b, 0x80, 0xe0, 0x54, 0xf8, 0x2e, 0x39, 0x4c, 0x7a,
+	0xe9, 0xf9, 0xdd, 0x75, 0x76, 0x98, 0xf8, 0x49, 0x35, 0xf8, 0xb8, 0xcf, 0xb6, 0xf4, 0x70, 0x1e,
+	0x07, 0xd6, 0x33, 0xd3, 0xef, 0x08, 0xae, 0x0e, 0x52, 0x5a, 0x43, 0xda, 0xa2, 0x18, 0xc1, 0x29,
+	0x32, 0x13, 0xcb, 0x28, 0x18, 0x77, 0x85, 0x78, 0x81, 0xfe, 0x1f, 0xbb, 0xfb, 0xec, 0xd8, 0x82,
+	0xb2, 0x7f, 0x87, 0x86, 0x34, 0x79, 0x98, 0x30, 0x7e, 0x87, 0xbe, 0xaf, 0x84, 0x80, 0xbe, 0x2e,
+	0x5b, 0xdc, 0xda, 0x84, 0xb7, 0xb8, 0x85, 0xa1, 0xd2, 0x16, 0xd9, 0x29, 0xd2, 0x85, 0x21, 0xa5,
+	0xdd, 0xf6, 0xfb, 0x83, 0x3d, 0xbc, 0xf4, 0xa8, 0x90, 0x70, 0x56, 0x91, 0x76, 0xa8, 0x9d, 0x1c,
+	0x06, 0xc1, 0xae, 0x9c, 0x3f, 0xc0, 0xa4, 0xa2, 0xf6, 0x68, 0xbe, 0xf9, 0xc5, 0x32, 0x1c, 0x3a,
+	0x2c, 0xc4, 0xbe, 0xc5, 0xdd, 0xd9, 0x8b, 0x9a, 0x7e, 0x02, 0x00, 0x00, 0xff, 0xff, 0x83, 0x7b,
+	0x5c, 0x7c, 0x1b, 0x02, 0x00, 0x00,
 }
diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go
index 77b64d0c67..134654cf7e 100644
--- a/vendor/golang.org/x/net/context/context.go
+++ b/vendor/golang.org/x/net/context/context.go
@@ -36,12 +36,7 @@
 // Contexts.
 package context // import "golang.org/x/net/context"
 
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-)
+import "time"
 
 // A Context carries a deadline, a cancelation signal, and other values across
 // API boundaries.
@@ -66,7 +61,7 @@ type Context interface {
 	//
 	//  // Stream generates values with DoSomething and sends them to out
 	//  // until DoSomething returns an error or ctx.Done is closed.
-	//  func Stream(ctx context.Context, out <-chan Value) error {
+	//  func Stream(ctx context.Context, out chan<- Value) error {
 	//  	for {
 	//  		v, err := DoSomething(ctx)
 	//  		if err != nil {
@@ -138,48 +133,6 @@ type Context interface {
 	Value(key interface{}) interface{}
 }
 
-// Canceled is the error returned by Context.Err when the context is canceled.
-var Canceled = errors.New("context canceled")
-
-// DeadlineExceeded is the error returned by Context.Err when the context's
-// deadline passes.
-var DeadlineExceeded = errors.New("context deadline exceeded")
-
-// An emptyCtx is never canceled, has no values, and has no deadline.  It is not
-// struct{}, since vars of this type must have distinct addresses.
-type emptyCtx int
-
-func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
-	return
-}
-
-func (*emptyCtx) Done() <-chan struct{} {
-	return nil
-}
-
-func (*emptyCtx) Err() error {
-	return nil
-}
-
-func (*emptyCtx) Value(key interface{}) interface{} {
-	return nil
-}
-
-func (e *emptyCtx) String() string {
-	switch e {
-	case background:
-		return "context.Background"
-	case todo:
-		return "context.TODO"
-	}
-	return "unknown empty Context"
-}
-
-var (
-	background = new(emptyCtx)
-	todo       = new(emptyCtx)
-)
-
 // Background returns a non-nil, empty Context. It is never canceled, has no
 // values, and has no deadline.  It is typically used by the main function,
 // initialization, and tests, and as the top-level Context for incoming
@@ -201,247 +154,3 @@ func TODO() Context {
 // A CancelFunc does not wait for the work to stop.
 // After the first call, subsequent calls to a CancelFunc do nothing.
 type CancelFunc func()
-
-// WithCancel returns a copy of parent with a new Done channel. The returned
-// context's Done channel is closed when the returned cancel function is called
-// or when the parent context's Done channel is closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete.
-func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
-	c := newCancelCtx(parent)
-	propagateCancel(parent, &c)
-	return &c, func() { c.cancel(true, Canceled) }
-}
-
-// newCancelCtx returns an initialized cancelCtx.
-func newCancelCtx(parent Context) cancelCtx {
-	return cancelCtx{
-		Context: parent,
-		done:    make(chan struct{}),
-	}
-}
-
-// propagateCancel arranges for child to be canceled when parent is.
-func propagateCancel(parent Context, child canceler) {
-	if parent.Done() == nil {
-		return // parent is never canceled
-	}
-	if p, ok := parentCancelCtx(parent); ok {
-		p.mu.Lock()
-		if p.err != nil {
-			// parent has already been canceled
-			child.cancel(false, p.err)
-		} else {
-			if p.children == nil {
-				p.children = make(map[canceler]bool)
-			}
-			p.children[child] = true
-		}
-		p.mu.Unlock()
-	} else {
-		go func() {
-			select {
-			case <-parent.Done():
-				child.cancel(false, parent.Err())
-			case <-child.Done():
-			}
-		}()
-	}
-}
-
-// parentCancelCtx follows a chain of parent references until it finds a
-// *cancelCtx.  This function understands how each of the concrete types in this
-// package represents its parent.
-func parentCancelCtx(parent Context) (*cancelCtx, bool) {
-	for {
-		switch c := parent.(type) {
-		case *cancelCtx:
-			return c, true
-		case *timerCtx:
-			return &c.cancelCtx, true
-		case *valueCtx:
-			parent = c.Context
-		default:
-			return nil, false
-		}
-	}
-}
-
-// removeChild removes a context from its parent.
-func removeChild(parent Context, child canceler) {
-	p, ok := parentCancelCtx(parent)
-	if !ok {
-		return
-	}
-	p.mu.Lock()
-	if p.children != nil {
-		delete(p.children, child)
-	}
-	p.mu.Unlock()
-}
-
-// A canceler is a context type that can be canceled directly.  The
-// implementations are *cancelCtx and *timerCtx.
-type canceler interface {
-	cancel(removeFromParent bool, err error)
-	Done() <-chan struct{}
-}
-
-// A cancelCtx can be canceled.  When canceled, it also cancels any children
-// that implement canceler.
-type cancelCtx struct {
-	Context
-
-	done chan struct{} // closed by the first cancel call.
-
-	mu       sync.Mutex
-	children map[canceler]bool // set to nil by the first cancel call
-	err      error             // set to non-nil by the first cancel call
-}
-
-func (c *cancelCtx) Done() <-chan struct{} {
-	return c.done
-}
-
-func (c *cancelCtx) Err() error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	return c.err
-}
-
-func (c *cancelCtx) String() string {
-	return fmt.Sprintf("%v.WithCancel", c.Context)
-}
-
-// cancel closes c.done, cancels each of c's children, and, if
-// removeFromParent is true, removes c from its parent's children.
-func (c *cancelCtx) cancel(removeFromParent bool, err error) {
-	if err == nil {
-		panic("context: internal error: missing cancel error")
-	}
-	c.mu.Lock()
-	if c.err != nil {
-		c.mu.Unlock()
-		return // already canceled
-	}
-	c.err = err
-	close(c.done)
-	for child := range c.children {
-		// NOTE: acquiring the child's lock while holding parent's lock.
-		child.cancel(false, err)
-	}
-	c.children = nil
-	c.mu.Unlock()
-
-	if removeFromParent {
-		removeChild(c.Context, c)
-	}
-}
-
-// WithDeadline returns a copy of the parent context with the deadline adjusted
-// to be no later than d.  If the parent's deadline is already earlier than d,
-// WithDeadline(parent, d) is semantically equivalent to parent.  The returned
-// context's Done channel is closed when the deadline expires, when the returned
-// cancel function is called, or when the parent context's Done channel is
-// closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete.
-func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
-	if cur, ok := parent.Deadline(); ok && cur.Before(deadline) {
-		// The current deadline is already sooner than the new one.
-		return WithCancel(parent)
-	}
-	c := &timerCtx{
-		cancelCtx: newCancelCtx(parent),
-		deadline:  deadline,
-	}
-	propagateCancel(parent, c)
-	d := deadline.Sub(time.Now())
-	if d <= 0 {
-		c.cancel(true, DeadlineExceeded) // deadline has already passed
-		return c, func() { c.cancel(true, Canceled) }
-	}
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if c.err == nil {
-		c.timer = time.AfterFunc(d, func() {
-			c.cancel(true, DeadlineExceeded)
-		})
-	}
-	return c, func() { c.cancel(true, Canceled) }
-}
-
-// A timerCtx carries a timer and a deadline.  It embeds a cancelCtx to
-// implement Done and Err.  It implements cancel by stopping its timer then
-// delegating to cancelCtx.cancel.
-type timerCtx struct {
-	cancelCtx
-	timer *time.Timer // Under cancelCtx.mu.
-
-	deadline time.Time
-}
-
-func (c *timerCtx) Deadline() (deadline time.Time, ok bool) {
-	return c.deadline, true
-}
-
-func (c *timerCtx) String() string {
-	return fmt.Sprintf("%v.WithDeadline(%s [%s])", c.cancelCtx.Context, c.deadline, c.deadline.Sub(time.Now()))
-}
-
-func (c *timerCtx) cancel(removeFromParent bool, err error) {
-	c.cancelCtx.cancel(false, err)
-	if removeFromParent {
-		// Remove this timerCtx from its parent cancelCtx's children.
-		removeChild(c.cancelCtx.Context, c)
-	}
-	c.mu.Lock()
-	if c.timer != nil {
-		c.timer.Stop()
-		c.timer = nil
-	}
-	c.mu.Unlock()
-}
-
-// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete:
-//
-// 	func slowOperationWithTimeout(ctx context.Context) (Result, error) {
-// 		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
-// 		defer cancel()  // releases resources if slowOperation completes before timeout elapses
-// 		return slowOperation(ctx)
-// 	}
-func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
-	return WithDeadline(parent, time.Now().Add(timeout))
-}
-
-// WithValue returns a copy of parent in which the value associated with key is
-// val.
-//
-// Use context Values only for request-scoped data that transits processes and
-// APIs, not for passing optional parameters to functions.
-func WithValue(parent Context, key interface{}, val interface{}) Context {
-	return &valueCtx{parent, key, val}
-}
-
-// A valueCtx carries a key-value pair.  It implements Value for that key and
-// delegates all other calls to the embedded Context.
-type valueCtx struct {
-	Context
-	key, val interface{}
-}
-
-func (c *valueCtx) String() string {
-	return fmt.Sprintf("%v.WithValue(%#v, %#v)", c.Context, c.key, c.val)
-}
-
-func (c *valueCtx) Value(key interface{}) interface{} {
-	if c.key == key {
-		return c.val
-	}
-	return c.Context.Value(key)
-}
diff --git a/vendor/golang.org/x/net/context/go17.go b/vendor/golang.org/x/net/context/go17.go
new file mode 100644
index 0000000000..f8cda19ada
--- /dev/null
+++ b/vendor/golang.org/x/net/context/go17.go
@@ -0,0 +1,72 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.7
+
+package context
+
+import (
+	"context" // standard library's context, as of Go 1.7
+	"time"
+)
+
+var (
+	todo       = context.TODO()
+	background = context.Background()
+)
+
+// Canceled is the error returned by Context.Err when the context is canceled.
+var Canceled = context.Canceled
+
+// DeadlineExceeded is the error returned by Context.Err when the context's
+// deadline passes.
+var DeadlineExceeded = context.DeadlineExceeded
+
+// WithCancel returns a copy of parent with a new Done channel. The returned
+// context's Done channel is closed when the returned cancel function is called
+// or when the parent context's Done channel is closed, whichever happens first.
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete.
+func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
+	ctx, f := context.WithCancel(parent)
+	return ctx, CancelFunc(f)
+}
+
+// WithDeadline returns a copy of the parent context with the deadline adjusted
+// to be no later than d.  If the parent's deadline is already earlier than d,
+// WithDeadline(parent, d) is semantically equivalent to parent.  The returned
+// context's Done channel is closed when the deadline expires, when the returned
+// cancel function is called, or when the parent context's Done channel is
+// closed, whichever happens first.
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete.
+func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
+	ctx, f := context.WithDeadline(parent, deadline)
+	return ctx, CancelFunc(f)
+}
+
+// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete:
+//
+// 	func slowOperationWithTimeout(ctx context.Context) (Result, error) {
+// 		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
+// 		defer cancel()  // releases resources if slowOperation completes before timeout elapses
+// 		return slowOperation(ctx)
+// 	}
+func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
+	return WithDeadline(parent, time.Now().Add(timeout))
+}
+
+// WithValue returns a copy of parent in which the value associated with key is
+// val.
+//
+// Use context Values only for request-scoped data that transits processes and
+// APIs, not for passing optional parameters to functions.
+func WithValue(parent Context, key interface{}, val interface{}) Context {
+	return context.WithValue(parent, key, val)
+}
diff --git a/vendor/golang.org/x/net/context/pre_go17.go b/vendor/golang.org/x/net/context/pre_go17.go
new file mode 100644
index 0000000000..5a30acabd0
--- /dev/null
+++ b/vendor/golang.org/x/net/context/pre_go17.go
@@ -0,0 +1,300 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !go1.7
+
+package context
+
+import (
+	"errors"
+	"fmt"
+	"sync"
+	"time"
+)
+
+// An emptyCtx is never canceled, has no values, and has no deadline.  It is not
+// struct{}, since vars of this type must have distinct addresses.
+type emptyCtx int
+
+func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
+	return
+}
+
+func (*emptyCtx) Done() <-chan struct{} {
+	return nil
+}
+
+func (*emptyCtx) Err() error {
+	return nil
+}
+
+func (*emptyCtx) Value(key interface{}) interface{} {
+	return nil
+}
+
+func (e *emptyCtx) String() string {
+	switch e {
+	case background:
+		return "context.Background"
+	case todo:
+		return "context.TODO"
+	}
+	return "unknown empty Context"
+}
+
+var (
+	background = new(emptyCtx)
+	todo       = new(emptyCtx)
+)
+
+// Canceled is the error returned by Context.Err when the context is canceled.
+var Canceled = errors.New("context canceled")
+
+// DeadlineExceeded is the error returned by Context.Err when the context's
+// deadline passes.
+var DeadlineExceeded = errors.New("context deadline exceeded")
+
+// WithCancel returns a copy of parent with a new Done channel. The returned
+// context's Done channel is closed when the returned cancel function is called
+// or when the parent context's Done channel is closed, whichever happens first.
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete.
+func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
+	c := newCancelCtx(parent)
+	propagateCancel(parent, c)
+	return c, func() { c.cancel(true, Canceled) }
+}
+
+// newCancelCtx returns an initialized cancelCtx.
+func newCancelCtx(parent Context) *cancelCtx {
+	return &cancelCtx{
+		Context: parent,
+		done:    make(chan struct{}),
+	}
+}
+
+// propagateCancel arranges for child to be canceled when parent is.
+func propagateCancel(parent Context, child canceler) {
+	if parent.Done() == nil {
+		return // parent is never canceled
+	}
+	if p, ok := parentCancelCtx(parent); ok {
+		p.mu.Lock()
+		if p.err != nil {
+			// parent has already been canceled
+			child.cancel(false, p.err)
+		} else {
+			if p.children == nil {
+				p.children = make(map[canceler]bool)
+			}
+			p.children[child] = true
+		}
+		p.mu.Unlock()
+	} else {
+		go func() {
+			select {
+			case <-parent.Done():
+				child.cancel(false, parent.Err())
+			case <-child.Done():
+			}
+		}()
+	}
+}
+
+// parentCancelCtx follows a chain of parent references until it finds a
+// *cancelCtx.  This function understands how each of the concrete types in this
+// package represents its parent.
+func parentCancelCtx(parent Context) (*cancelCtx, bool) {
+	for {
+		switch c := parent.(type) {
+		case *cancelCtx:
+			return c, true
+		case *timerCtx:
+			return c.cancelCtx, true
+		case *valueCtx:
+			parent = c.Context
+		default:
+			return nil, false
+		}
+	}
+}
+
+// removeChild removes a context from its parent.
+func removeChild(parent Context, child canceler) {
+	p, ok := parentCancelCtx(parent)
+	if !ok {
+		return
+	}
+	p.mu.Lock()
+	if p.children != nil {
+		delete(p.children, child)
+	}
+	p.mu.Unlock()
+}
+
+// A canceler is a context type that can be canceled directly.  The
+// implementations are *cancelCtx and *timerCtx.
+type canceler interface {
+	cancel(removeFromParent bool, err error)
+	Done() <-chan struct{}
+}
+
+// A cancelCtx can be canceled.  When canceled, it also cancels any children
+// that implement canceler.
+type cancelCtx struct {
+	Context
+
+	done chan struct{} // closed by the first cancel call.
+
+	mu       sync.Mutex
+	children map[canceler]bool // set to nil by the first cancel call
+	err      error             // set to non-nil by the first cancel call
+}
+
+func (c *cancelCtx) Done() <-chan struct{} {
+	return c.done
+}
+
+func (c *cancelCtx) Err() error {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	return c.err
+}
+
+func (c *cancelCtx) String() string {
+	return fmt.Sprintf("%v.WithCancel", c.Context)
+}
+
+// cancel closes c.done, cancels each of c's children, and, if
+// removeFromParent is true, removes c from its parent's children.
+func (c *cancelCtx) cancel(removeFromParent bool, err error) {
+	if err == nil {
+		panic("context: internal error: missing cancel error")
+	}
+	c.mu.Lock()
+	if c.err != nil {
+		c.mu.Unlock()
+		return // already canceled
+	}
+	c.err = err
+	close(c.done)
+	for child := range c.children {
+		// NOTE: acquiring the child's lock while holding parent's lock.
+		child.cancel(false, err)
+	}
+	c.children = nil
+	c.mu.Unlock()
+
+	if removeFromParent {
+		removeChild(c.Context, c)
+	}
+}
+
+// WithDeadline returns a copy of the parent context with the deadline adjusted
+// to be no later than d.  If the parent's deadline is already earlier than d,
+// WithDeadline(parent, d) is semantically equivalent to parent.  The returned
+// context's Done channel is closed when the deadline expires, when the returned
+// cancel function is called, or when the parent context's Done channel is
+// closed, whichever happens first.
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete.
+func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
+	if cur, ok := parent.Deadline(); ok && cur.Before(deadline) {
+		// The current deadline is already sooner than the new one.
+		return WithCancel(parent)
+	}
+	c := &timerCtx{
+		cancelCtx: newCancelCtx(parent),
+		deadline:  deadline,
+	}
+	propagateCancel(parent, c)
+	d := deadline.Sub(time.Now())
+	if d <= 0 {
+		c.cancel(true, DeadlineExceeded) // deadline has already passed
+		return c, func() { c.cancel(true, Canceled) }
+	}
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	if c.err == nil {
+		c.timer = time.AfterFunc(d, func() {
+			c.cancel(true, DeadlineExceeded)
+		})
+	}
+	return c, func() { c.cancel(true, Canceled) }
+}
+
+// A timerCtx carries a timer and a deadline.  It embeds a cancelCtx to
+// implement Done and Err.  It implements cancel by stopping its timer then
+// delegating to cancelCtx.cancel.
+type timerCtx struct {
+	*cancelCtx
+	timer *time.Timer // Under cancelCtx.mu.
+
+	deadline time.Time
+}
+
+func (c *timerCtx) Deadline() (deadline time.Time, ok bool) {
+	return c.deadline, true
+}
+
+func (c *timerCtx) String() string {
+	return fmt.Sprintf("%v.WithDeadline(%s [%s])", c.cancelCtx.Context, c.deadline, c.deadline.Sub(time.Now()))
+}
+
+func (c *timerCtx) cancel(removeFromParent bool, err error) {
+	c.cancelCtx.cancel(false, err)
+	if removeFromParent {
+		// Remove this timerCtx from its parent cancelCtx's children.
+		removeChild(c.cancelCtx.Context, c)
+	}
+	c.mu.Lock()
+	if c.timer != nil {
+		c.timer.Stop()
+		c.timer = nil
+	}
+	c.mu.Unlock()
+}
+
+// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
+//
+// Canceling this context releases resources associated with it, so code should
+// call cancel as soon as the operations running in this Context complete:
+//
+// 	func slowOperationWithTimeout(ctx context.Context) (Result, error) {
+// 		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
+// 		defer cancel()  // releases resources if slowOperation completes before timeout elapses
+// 		return slowOperation(ctx)
+// 	}
+func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
+	return WithDeadline(parent, time.Now().Add(timeout))
+}
+
+// WithValue returns a copy of parent in which the value associated with key is
+// val.
+//
+// Use context Values only for request-scoped data that transits processes and
+// APIs, not for passing optional parameters to functions.
+func WithValue(parent Context, key interface{}, val interface{}) Context {
+	return &valueCtx{parent, key, val}
+}
+
+// A valueCtx carries a key-value pair.  It implements Value for that key and
+// delegates all other calls to the embedded Context.
+type valueCtx struct {
+	Context
+	key, val interface{}
+}
+
+func (c *valueCtx) String() string {
+	return fmt.Sprintf("%v.WithValue(%#v, %#v)", c.Context, c.key, c.val)
+}
+
+func (c *valueCtx) Value(key interface{}) interface{} {
+	if c.key == key {
+		return c.val
+	}
+	return c.Context.Value(key)
+}
diff --git a/vendor/golang.org/x/net/http2/client_conn_pool.go b/vendor/golang.org/x/net/http2/client_conn_pool.go
index 772ea5e924..b13941258a 100644
--- a/vendor/golang.org/x/net/http2/client_conn_pool.go
+++ b/vendor/golang.org/x/net/http2/client_conn_pool.go
@@ -18,6 +18,18 @@ type ClientConnPool interface {
 	MarkDead(*ClientConn)
 }
 
+// clientConnPoolIdleCloser is the interface implemented by ClientConnPool
+// implementations which can close their idle connections.
+type clientConnPoolIdleCloser interface {
+	ClientConnPool
+	closeIdleConnections()
+}
+
+var (
+	_ clientConnPoolIdleCloser = (*clientConnPool)(nil)
+	_ clientConnPoolIdleCloser = noDialClientConnPool{}
+)
+
 // TODO: use singleflight for dialing and addConnCalls?
 type clientConnPool struct {
 	t *Transport
@@ -40,7 +52,16 @@ const (
 	noDialOnMiss = false
 )
 
-func (p *clientConnPool) getClientConn(_ *http.Request, addr string, dialOnMiss bool) (*ClientConn, error) {
+func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMiss bool) (*ClientConn, error) {
+	if isConnectionCloseRequest(req) && dialOnMiss {
+		// It gets its own connection.
+		const singleUse = true
+		cc, err := p.t.dialClientConn(addr, singleUse)
+		if err != nil {
+			return nil, err
+		}
+		return cc, nil
+	}
 	p.mu.Lock()
 	for _, cc := range p.conns[addr] {
 		if cc.CanTakeNewRequest() {
@@ -83,7 +104,8 @@ func (p *clientConnPool) getStartDialLocked(addr string) *dialCall {
 
 // run in its own goroutine.
 func (c *dialCall) dial(addr string) {
-	c.res, c.err = c.p.t.dialClientConn(addr)
+	const singleUse = false // shared conn
+	c.res, c.err = c.p.t.dialClientConn(addr, singleUse)
 	close(c.done)
 
 	c.p.mu.Lock()
@@ -223,3 +245,12 @@ func filterOutClientConn(in []*ClientConn, exclude *ClientConn) []*ClientConn {
 	}
 	return out
 }
+
+// noDialClientConnPool is an implementation of http2.ClientConnPool
+// which never dials.  We let the HTTP/1.1 client dial and use its TLS
+// connection instead.
+type noDialClientConnPool struct{ *clientConnPool }
+
+func (p noDialClientConnPool) GetClientConn(req *http.Request, addr string) (*ClientConn, error) {
+	return p.getClientConn(req, addr, noDialOnMiss)
+}
diff --git a/vendor/golang.org/x/net/http2/configure_transport.go b/vendor/golang.org/x/net/http2/configure_transport.go
index daa17f5d43..4f720f530b 100644
--- a/vendor/golang.org/x/net/http2/configure_transport.go
+++ b/vendor/golang.org/x/net/http2/configure_transport.go
@@ -32,7 +32,7 @@ func configureTransport(t1 *http.Transport) (*Transport, error) {
 		t1.TLSClientConfig.NextProtos = append(t1.TLSClientConfig.NextProtos, "http/1.1")
 	}
 	upgradeFn := func(authority string, c *tls.Conn) http.RoundTripper {
-		addr := authorityAddr(authority)
+		addr := authorityAddr("https", authority)
 		if used, err := connPool.addConnIfNeeded(addr, t2, c); err != nil {
 			go c.Close()
 			return erringRoundTripper{err}
@@ -67,15 +67,6 @@ func registerHTTPSProtocol(t *http.Transport, rt http.RoundTripper) (err error)
 	return nil
 }
 
-// noDialClientConnPool is an implementation of http2.ClientConnPool
-// which never dials.  We let the HTTP/1.1 client dial and use its TLS
-// connection instead.
-type noDialClientConnPool struct{ *clientConnPool }
-
-func (p noDialClientConnPool) GetClientConn(req *http.Request, addr string) (*ClientConn, error) {
-	return p.getClientConn(req, addr, noDialOnMiss)
-}
-
 // noDialH2RoundTripper is a RoundTripper which only tries to complete the request
 // if there's already has a cached connection to the host.
 type noDialH2RoundTripper struct{ t *Transport }
diff --git a/vendor/golang.org/x/net/http2/errors.go b/vendor/golang.org/x/net/http2/errors.go
index f320b2c09e..71a4e29056 100644
--- a/vendor/golang.org/x/net/http2/errors.go
+++ b/vendor/golang.org/x/net/http2/errors.go
@@ -4,7 +4,10 @@
 
 package http2
 
-import "fmt"
+import (
+	"errors"
+	"fmt"
+)
 
 // An ErrCode is an unsigned 32-bit error code as defined in the HTTP/2 spec.
 type ErrCode uint32
@@ -88,3 +91,32 @@ type connError struct {
 func (e connError) Error() string {
 	return fmt.Sprintf("http2: connection error: %v: %v", e.Code, e.Reason)
 }
+
+type pseudoHeaderError string
+
+func (e pseudoHeaderError) Error() string {
+	return fmt.Sprintf("invalid pseudo-header %q", string(e))
+}
+
+type duplicatePseudoHeaderError string
+
+func (e duplicatePseudoHeaderError) Error() string {
+	return fmt.Sprintf("duplicate pseudo-header %q", string(e))
+}
+
+type headerFieldNameError string
+
+func (e headerFieldNameError) Error() string {
+	return fmt.Sprintf("invalid header field name %q", string(e))
+}
+
+type headerFieldValueError string
+
+func (e headerFieldValueError) Error() string {
+	return fmt.Sprintf("invalid header field value %q", string(e))
+}
+
+var (
+	errMixPseudoHeaderTypes = errors.New("mix of request and response pseudo headers")
+	errPseudoAfterRegular   = errors.New("pseudo header field after regular")
+)
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
index e1e837cc8a..981d407a71 100644
--- a/vendor/golang.org/x/net/http2/frame.go
+++ b/vendor/golang.org/x/net/http2/frame.go
@@ -11,7 +11,11 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"strings"
 	"sync"
+
+	"golang.org/x/net/http2/hpack"
+	"golang.org/x/net/lex/httplex"
 )
 
 const frameHeaderLen = 9
@@ -261,7 +265,7 @@ type Frame interface {
 type Framer struct {
 	r         io.Reader
 	lastFrame Frame
-	errReason string
+	errDetail error
 
 	// lastHeaderStream is non-zero if the last frame was an
 	// unfinished HEADERS/CONTINUATION.
@@ -293,8 +297,20 @@ type Framer struct {
 	// to return non-compliant frames or frame orders.
 	// This is for testing and permits using the Framer to test
 	// other HTTP/2 implementations' conformance to the spec.
+	// It is not compatible with ReadMetaHeaders.
 	AllowIllegalReads bool
 
+	// ReadMetaHeaders if non-nil causes ReadFrame to merge
+	// HEADERS and CONTINUATION frames together and return
+	// MetaHeadersFrame instead.
+	ReadMetaHeaders *hpack.Decoder
+
+	// MaxHeaderListSize is the http2 MAX_HEADER_LIST_SIZE.
+	// It's used only if ReadMetaHeaders is set; 0 means a sane default
+	// (currently 16MB)
+	// If the limit is hit, MetaHeadersFrame.Truncated is set true.
+	MaxHeaderListSize uint32
+
 	// TODO: track which type of frame & with which flags was sent
 	// last.  Then return an error (unless AllowIllegalWrites) if
 	// we're in the middle of a header block and a
@@ -307,6 +323,13 @@ type Framer struct {
 	debugFramerBuf *bytes.Buffer
 }
 
+func (fr *Framer) maxHeaderListSize() uint32 {
+	if fr.MaxHeaderListSize == 0 {
+		return 16 << 20 // sane default, per docs
+	}
+	return fr.MaxHeaderListSize
+}
+
 func (f *Framer) startWrite(ftype FrameType, flags Flags, streamID uint32) {
 	// Write the FrameHeader.
 	f.wbuf = append(f.wbuf[:0],
@@ -402,6 +425,17 @@ func (fr *Framer) SetMaxReadFrameSize(v uint32) {
 	fr.maxReadSize = v
 }
 
+// ErrorDetail returns a more detailed error of the last error
+// returned by Framer.ReadFrame. For instance, if ReadFrame
+// returns a StreamError with code PROTOCOL_ERROR, ErrorDetail
+// will say exactly what was invalid. ErrorDetail is not guaranteed
+// to return a non-nil value and like the rest of the http2 package,
+// its return value is not protected by an API compatibility promise.
+// ErrorDetail is reset after the next call to ReadFrame.
+func (fr *Framer) ErrorDetail() error {
+	return fr.errDetail
+}
+
 // ErrFrameTooLarge is returned from Framer.ReadFrame when the peer
 // sends a frame that is larger than declared with SetMaxReadFrameSize.
 var ErrFrameTooLarge = errors.New("http2: frame too large")
@@ -420,9 +454,10 @@ func terminalReadFrameError(err error) bool {
 //
 // If the frame is larger than previously set with SetMaxReadFrameSize, the
 // returned error is ErrFrameTooLarge. Other errors may be of type
-// ConnectionError, StreamError, or anything else from from the underlying
+// ConnectionError, StreamError, or anything else from the underlying
 // reader.
 func (fr *Framer) ReadFrame() (Frame, error) {
+	fr.errDetail = nil
 	if fr.lastFrame != nil {
 		fr.lastFrame.invalidate()
 	}
@@ -450,6 +485,9 @@ func (fr *Framer) ReadFrame() (Frame, error) {
 	if fr.logReads {
 		log.Printf("http2: Framer %p: read %v", fr, summarizeFrame(f))
 	}
+	if fh.Type == FrameHeaders && fr.ReadMetaHeaders != nil {
+		return fr.readMetaFrame(f.(*HeadersFrame))
+	}
 	return f, nil
 }
 
@@ -458,7 +496,7 @@ func (fr *Framer) ReadFrame() (Frame, error) {
 // to the peer before hanging up on them. This might help others debug
 // their implementations.
 func (fr *Framer) connError(code ErrCode, reason string) error {
-	fr.errReason = reason
+	fr.errDetail = errors.New(reason)
 	return ConnectionError(code)
 }
 
@@ -553,7 +591,14 @@ func parseDataFrame(fh FrameHeader, payload []byte) (Frame, error) {
 	return f, nil
 }
 
-var errStreamID = errors.New("invalid streamid")
+var (
+	errStreamID    = errors.New("invalid stream ID")
+	errDepStreamID = errors.New("invalid dependent stream ID")
+)
+
+func validStreamIDOrZero(streamID uint32) bool {
+	return streamID&(1<<31) == 0
+}
 
 func validStreamID(streamID uint32) bool {
 	return streamID != 0 && streamID&(1<<31) == 0
@@ -940,8 +985,8 @@ func (f *Framer) WriteHeaders(p HeadersFrameParam) error {
 	}
 	if !p.Priority.IsZero() {
 		v := p.Priority.StreamDep
-		if !validStreamID(v) && !f.AllowIllegalWrites {
-			return errors.New("invalid dependent stream id")
+		if !validStreamIDOrZero(v) && !f.AllowIllegalWrites {
+			return errDepStreamID
 		}
 		if p.Priority.Exclusive {
 			v |= 1 << 31
@@ -1009,6 +1054,9 @@ func (f *Framer) WritePriority(streamID uint32, p PriorityParam) error {
 	if !validStreamID(streamID) && !f.AllowIllegalWrites {
 		return errStreamID
 	}
+	if !validStreamIDOrZero(p.StreamDep) {
+		return errDepStreamID
+	}
 	f.startWrite(FramePriority, 0, streamID)
 	v := p.StreamDep
 	if p.Exclusive {
@@ -1225,6 +1273,196 @@ type headersEnder interface {
 	HeadersEnded() bool
 }
 
+type headersOrContinuation interface {
+	headersEnder
+	HeaderBlockFragment() []byte
+}
+
+// A MetaHeadersFrame is the representation of one HEADERS frame and
+// zero or more contiguous CONTINUATION frames and the decoding of
+// their HPACK-encoded contents.
+//
+// This type of frame does not appear on the wire and is only returned
+// by the Framer when Framer.ReadMetaHeaders is set.
+type MetaHeadersFrame struct {
+	*HeadersFrame
+
+	// Fields are the fields contained in the HEADERS and
+	// CONTINUATION frames. The underlying slice is owned by the
+	// Framer and must not be retained after the next call to
+	// ReadFrame.
+	//
+	// Fields are guaranteed to be in the correct http2 order and
+	// not have unknown pseudo header fields or invalid header
+	// field names or values. Required pseudo header fields may be
+	// missing, however. Use the MetaHeadersFrame.Pseudo accessor
+	// method access pseudo headers.
+	Fields []hpack.HeaderField
+
+	// Truncated is whether the max header list size limit was hit
+	// and Fields is incomplete. The hpack decoder state is still
+	// valid, however.
+	Truncated bool
+}
+
+// PseudoValue returns the given pseudo header field's value.
+// The provided pseudo field should not contain the leading colon.
+func (mh *MetaHeadersFrame) PseudoValue(pseudo string) string {
+	for _, hf := range mh.Fields {
+		if !hf.IsPseudo() {
+			return ""
+		}
+		if hf.Name[1:] == pseudo {
+			return hf.Value
+		}
+	}
+	return ""
+}
+
+// RegularFields returns the regular (non-pseudo) header fields of mh.
+// The caller does not own the returned slice.
+func (mh *MetaHeadersFrame) RegularFields() []hpack.HeaderField {
+	for i, hf := range mh.Fields {
+		if !hf.IsPseudo() {
+			return mh.Fields[i:]
+		}
+	}
+	return nil
+}
+
+// PseudoFields returns the pseudo header fields of mh.
+// The caller does not own the returned slice.
+func (mh *MetaHeadersFrame) PseudoFields() []hpack.HeaderField {
+	for i, hf := range mh.Fields {
+		if !hf.IsPseudo() {
+			return mh.Fields[:i]
+		}
+	}
+	return mh.Fields
+}
+
+func (mh *MetaHeadersFrame) checkPseudos() error {
+	var isRequest, isResponse bool
+	pf := mh.PseudoFields()
+	for i, hf := range pf {
+		switch hf.Name {
+		case ":method", ":path", ":scheme", ":authority":
+			isRequest = true
+		case ":status":
+			isResponse = true
+		default:
+			return pseudoHeaderError(hf.Name)
+		}
+		// Check for duplicates.
+		// This would be a bad algorithm, but N is 4.
+		// And this doesn't allocate.
+		for _, hf2 := range pf[:i] {
+			if hf.Name == hf2.Name {
+				return duplicatePseudoHeaderError(hf.Name)
+			}
+		}
+	}
+	if isRequest && isResponse {
+		return errMixPseudoHeaderTypes
+	}
+	return nil
+}
+
+func (fr *Framer) maxHeaderStringLen() int {
+	v := fr.maxHeaderListSize()
+	if uint32(int(v)) == v {
+		return int(v)
+	}
+	// They had a crazy big number for MaxHeaderBytes anyway,
+	// so give them unlimited header lengths:
+	return 0
+}
+
+// readMetaFrame returns 0 or more CONTINUATION frames from fr and
+// merge them into into the provided hf and returns a MetaHeadersFrame
+// with the decoded hpack values.
+func (fr *Framer) readMetaFrame(hf *HeadersFrame) (*MetaHeadersFrame, error) {
+	if fr.AllowIllegalReads {
+		return nil, errors.New("illegal use of AllowIllegalReads with ReadMetaHeaders")
+	}
+	mh := &MetaHeadersFrame{
+		HeadersFrame: hf,
+	}
+	var remainSize = fr.maxHeaderListSize()
+	var sawRegular bool
+
+	var invalid error // pseudo header field errors
+	hdec := fr.ReadMetaHeaders
+	hdec.SetEmitEnabled(true)
+	hdec.SetMaxStringLength(fr.maxHeaderStringLen())
+	hdec.SetEmitFunc(func(hf hpack.HeaderField) {
+		if !httplex.ValidHeaderFieldValue(hf.Value) {
+			invalid = headerFieldValueError(hf.Value)
+		}
+		isPseudo := strings.HasPrefix(hf.Name, ":")
+		if isPseudo {
+			if sawRegular {
+				invalid = errPseudoAfterRegular
+			}
+		} else {
+			sawRegular = true
+			if !validWireHeaderFieldName(hf.Name) {
+				invalid = headerFieldNameError(hf.Name)
+			}
+		}
+
+		if invalid != nil {
+			hdec.SetEmitEnabled(false)
+			return
+		}
+
+		size := hf.Size()
+		if size > remainSize {
+			hdec.SetEmitEnabled(false)
+			mh.Truncated = true
+			return
+		}
+		remainSize -= size
+
+		mh.Fields = append(mh.Fields, hf)
+	})
+	// Lose reference to MetaHeadersFrame:
+	defer hdec.SetEmitFunc(func(hf hpack.HeaderField) {})
+
+	var hc headersOrContinuation = hf
+	for {
+		frag := hc.HeaderBlockFragment()
+		if _, err := hdec.Write(frag); err != nil {
+			return nil, ConnectionError(ErrCodeCompression)
+		}
+
+		if hc.HeadersEnded() {
+			break
+		}
+		if f, err := fr.ReadFrame(); err != nil {
+			return nil, err
+		} else {
+			hc = f.(*ContinuationFrame) // guaranteed by checkFrameOrder
+		}
+	}
+
+	mh.HeadersFrame.headerFragBuf = nil
+	mh.HeadersFrame.invalidate()
+
+	if err := hdec.Close(); err != nil {
+		return nil, ConnectionError(ErrCodeCompression)
+	}
+	if invalid != nil {
+		fr.errDetail = invalid
+		return nil, StreamError{mh.StreamID, ErrCodeProtocol}
+	}
+	if err := mh.checkPseudos(); err != nil {
+		fr.errDetail = err
+		return nil, StreamError{mh.StreamID, ErrCodeProtocol}
+	}
+	return mh, nil
+}
+
 func summarizeFrame(f Frame) string {
 	var buf bytes.Buffer
 	f.Header().writeDebug(&buf)
diff --git a/vendor/golang.org/x/net/http2/go15.go b/vendor/golang.org/x/net/http2/go15.go
deleted file mode 100644
index f0a5624141..0000000000
--- a/vendor/golang.org/x/net/http2/go15.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.5
-
-package http2
-
-import "net/http"
-
-func requestCancel(req *http.Request) <-chan struct{} { return req.Cancel }
diff --git a/vendor/golang.org/x/net/http2/go16.go b/vendor/golang.org/x/net/http2/go16.go
new file mode 100644
index 0000000000..2b72855f55
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/go16.go
@@ -0,0 +1,43 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.6
+
+package http2
+
+import (
+	"crypto/tls"
+	"net/http"
+	"time"
+)
+
+func transportExpectContinueTimeout(t1 *http.Transport) time.Duration {
+	return t1.ExpectContinueTimeout
+}
+
+// isBadCipher reports whether the cipher is blacklisted by the HTTP/2 spec.
+func isBadCipher(cipher uint16) bool {
+	switch cipher {
+	case tls.TLS_RSA_WITH_RC4_128_SHA,
+		tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+		tls.TLS_RSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+		tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+		tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+		tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
+		tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
+		tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
+		// Reject cipher suites from Appendix A.
+		// "This list includes those cipher suites that do not
+		// offer an ephemeral key exchange and those that are
+		// based on the TLS null, stream or block cipher type"
+		return true
+	default:
+		return false
+	}
+}
diff --git a/vendor/golang.org/x/net/http2/go17.go b/vendor/golang.org/x/net/http2/go17.go
new file mode 100644
index 0000000000..730319dd5a
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/go17.go
@@ -0,0 +1,94 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.7
+
+package http2
+
+import (
+	"context"
+	"net"
+	"net/http"
+	"net/http/httptrace"
+	"time"
+)
+
+type contextContext interface {
+	context.Context
+}
+
+func serverConnBaseContext(c net.Conn, opts *ServeConnOpts) (ctx contextContext, cancel func()) {
+	ctx, cancel = context.WithCancel(context.Background())
+	ctx = context.WithValue(ctx, http.LocalAddrContextKey, c.LocalAddr())
+	if hs := opts.baseConfig(); hs != nil {
+		ctx = context.WithValue(ctx, http.ServerContextKey, hs)
+	}
+	return
+}
+
+func contextWithCancel(ctx contextContext) (_ contextContext, cancel func()) {
+	return context.WithCancel(ctx)
+}
+
+func requestWithContext(req *http.Request, ctx contextContext) *http.Request {
+	return req.WithContext(ctx)
+}
+
+type clientTrace httptrace.ClientTrace
+
+func reqContext(r *http.Request) context.Context { return r.Context() }
+
+func setResponseUncompressed(res *http.Response) { res.Uncompressed = true }
+
+func traceGotConn(req *http.Request, cc *ClientConn) {
+	trace := httptrace.ContextClientTrace(req.Context())
+	if trace == nil || trace.GotConn == nil {
+		return
+	}
+	ci := httptrace.GotConnInfo{Conn: cc.tconn}
+	cc.mu.Lock()
+	ci.Reused = cc.nextStreamID > 1
+	ci.WasIdle = len(cc.streams) == 0 && ci.Reused
+	if ci.WasIdle && !cc.lastActive.IsZero() {
+		ci.IdleTime = time.Now().Sub(cc.lastActive)
+	}
+	cc.mu.Unlock()
+
+	trace.GotConn(ci)
+}
+
+func traceWroteHeaders(trace *clientTrace) {
+	if trace != nil && trace.WroteHeaders != nil {
+		trace.WroteHeaders()
+	}
+}
+
+func traceGot100Continue(trace *clientTrace) {
+	if trace != nil && trace.Got100Continue != nil {
+		trace.Got100Continue()
+	}
+}
+
+func traceWait100Continue(trace *clientTrace) {
+	if trace != nil && trace.Wait100Continue != nil {
+		trace.Wait100Continue()
+	}
+}
+
+func traceWroteRequest(trace *clientTrace, err error) {
+	if trace != nil && trace.WroteRequest != nil {
+		trace.WroteRequest(httptrace.WroteRequestInfo{Err: err})
+	}
+}
+
+func traceFirstResponseByte(trace *clientTrace) {
+	if trace != nil && trace.GotFirstResponseByte != nil {
+		trace.GotFirstResponseByte()
+	}
+}
+
+func requestTrace(req *http.Request) *clientTrace {
+	trace := httptrace.ContextClientTrace(req.Context())
+	return (*clientTrace)(trace)
+}
diff --git a/vendor/golang.org/x/net/http2/hpack/encode.go b/vendor/golang.org/x/net/http2/hpack/encode.go
index 80d621cf35..f9bb033984 100644
--- a/vendor/golang.org/x/net/http2/hpack/encode.go
+++ b/vendor/golang.org/x/net/http2/hpack/encode.go
@@ -144,7 +144,7 @@ func (e *Encoder) SetMaxDynamicTableSizeLimit(v uint32) {
 
 // shouldIndex reports whether f should be indexed.
 func (e *Encoder) shouldIndex(f HeaderField) bool {
-	return !f.Sensitive && f.size() <= e.dynTab.maxSize
+	return !f.Sensitive && f.Size() <= e.dynTab.maxSize
 }
 
 // appendIndexed appends index i, as encoded in "Indexed Header Field"
diff --git a/vendor/golang.org/x/net/http2/hpack/hpack.go b/vendor/golang.org/x/net/http2/hpack/hpack.go
index 2ea4949ab0..8aa197ad67 100644
--- a/vendor/golang.org/x/net/http2/hpack/hpack.go
+++ b/vendor/golang.org/x/net/http2/hpack/hpack.go
@@ -41,6 +41,14 @@ type HeaderField struct {
 	Sensitive bool
 }
 
+// IsPseudo reports whether the header field is an http2 pseudo header.
+// That is, it reports whether it starts with a colon.
+// It is not otherwise guaranteed to be a valid pseudo header field,
+// though.
+func (hf HeaderField) IsPseudo() bool {
+	return len(hf.Name) != 0 && hf.Name[0] == ':'
+}
+
 func (hf HeaderField) String() string {
 	var suffix string
 	if hf.Sensitive {
@@ -49,7 +57,8 @@ func (hf HeaderField) String() string {
 	return fmt.Sprintf("header field %q = %q%s", hf.Name, hf.Value, suffix)
 }
 
-func (hf *HeaderField) size() uint32 {
+// Size returns the size of an entry per RFC 7540 section 5.2.
+func (hf HeaderField) Size() uint32 {
 	// http://http2.github.io/http2-spec/compression.html#rfc.section.4.1
 	// "The size of the dynamic table is the sum of the size of
 	// its entries.  The size of an entry is the sum of its name's
@@ -171,7 +180,7 @@ func (dt *dynamicTable) setMaxSize(v uint32) {
 
 func (dt *dynamicTable) add(f HeaderField) {
 	dt.ents = append(dt.ents, f)
-	dt.size += f.size()
+	dt.size += f.Size()
 	dt.evict()
 }
 
@@ -179,7 +188,7 @@ func (dt *dynamicTable) add(f HeaderField) {
 func (dt *dynamicTable) evict() {
 	base := dt.ents // keep base pointer of slice
 	for dt.size > dt.maxSize {
-		dt.size -= dt.ents[0].size()
+		dt.size -= dt.ents[0].Size()
 		dt.ents = dt.ents[1:]
 	}
 
diff --git a/vendor/golang.org/x/net/http2/hpack/huffman.go b/vendor/golang.org/x/net/http2/hpack/huffman.go
index eb4b1f05cd..8850e39467 100644
--- a/vendor/golang.org/x/net/http2/hpack/huffman.go
+++ b/vendor/golang.org/x/net/http2/hpack/huffman.go
@@ -48,12 +48,16 @@ var ErrInvalidHuffman = errors.New("hpack: invalid Huffman-encoded data")
 // maxLen bytes will return ErrStringLength.
 func huffmanDecode(buf *bytes.Buffer, maxLen int, v []byte) error {
 	n := rootHuffmanNode
-	cur, nbits := uint(0), uint8(0)
+	// cur is the bit buffer that has not been fed into n.
+	// cbits is the number of low order bits in cur that are valid.
+	// sbits is the number of bits of the symbol prefix being decoded.
+	cur, cbits, sbits := uint(0), uint8(0), uint8(0)
 	for _, b := range v {
 		cur = cur<<8 | uint(b)
-		nbits += 8
-		for nbits >= 8 {
-			idx := byte(cur >> (nbits - 8))
+		cbits += 8
+		sbits += 8
+		for cbits >= 8 {
+			idx := byte(cur >> (cbits - 8))
 			n = n.children[idx]
 			if n == nil {
 				return ErrInvalidHuffman
@@ -63,22 +67,40 @@ func huffmanDecode(buf *bytes.Buffer, maxLen int, v []byte) error {
 					return ErrStringLength
 				}
 				buf.WriteByte(n.sym)
-				nbits -= n.codeLen
+				cbits -= n.codeLen
 				n = rootHuffmanNode
+				sbits = cbits
 			} else {
-				nbits -= 8
+				cbits -= 8
 			}
 		}
 	}
-	for nbits > 0 {
-		n = n.children[byte(cur<<(8-nbits))]
-		if n.children != nil || n.codeLen > nbits {
+	for cbits > 0 {
+		n = n.children[byte(cur<<(8-cbits))]
+		if n == nil {
+			return ErrInvalidHuffman
+		}
+		if n.children != nil || n.codeLen > cbits {
 			break
 		}
+		if maxLen != 0 && buf.Len() == maxLen {
+			return ErrStringLength
+		}
 		buf.WriteByte(n.sym)
-		nbits -= n.codeLen
+		cbits -= n.codeLen
 		n = rootHuffmanNode
+		sbits = cbits
+	}
+	if sbits > 7 {
+		// Either there was an incomplete symbol, or overlong padding.
+		// Both are decoding errors per RFC 7541 section 5.2.
+		return ErrInvalidHuffman
 	}
+	if mask := uint(1<<cbits - 1); cur&mask != mask {
+		// Trailing bits must be a prefix of EOS per RFC 7541 section 5.2.
+		return ErrInvalidHuffman
+	}
+
 	return nil
 }
 
diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go
index 3ed51a44e8..0173aed64a 100644
--- a/vendor/golang.org/x/net/http2/http2.go
+++ b/vendor/golang.org/x/net/http2/http2.go
@@ -17,14 +17,18 @@ package http2
 
 import (
 	"bufio"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"os"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
+
+	"golang.org/x/net/lex/httplex"
 )
 
 var (
@@ -164,57 +168,23 @@ var (
 	errInvalidHeaderFieldValue = errors.New("http2: invalid header field value")
 )
 
-// validHeaderFieldName reports whether v is a valid header field name (key).
-//  RFC 7230 says:
-//   header-field   = field-name ":" OWS field-value OWS
-//   field-name     = token
-//   tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." /
-//           "^" / "_" / "
+// validWireHeaderFieldName reports whether v is a valid header field
+// name (key). See httplex.ValidHeaderName for the base rules.
+//
 // Further, http2 says:
 //   "Just as in HTTP/1.x, header field names are strings of ASCII
 //   characters that are compared in a case-insensitive
 //   fashion. However, header field names MUST be converted to
 //   lowercase prior to their encoding in HTTP/2. "
-func validHeaderFieldName(v string) bool {
+func validWireHeaderFieldName(v string) bool {
 	if len(v) == 0 {
 		return false
 	}
 	for _, r := range v {
-		if int(r) >= len(isTokenTable) || ('A' <= r && r <= 'Z') {
-			return false
-		}
-		if !isTokenTable[byte(r)] {
+		if !httplex.IsTokenRune(r) {
 			return false
 		}
-	}
-	return true
-}
-
-// validHeaderFieldValue reports whether v is a valid header field value.
-//
-// RFC 7230 says:
-//  field-value    = *( field-content / obs-fold )
-//  obj-fold       =  N/A to http2, and deprecated
-//  field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
-//  field-vchar    = VCHAR / obs-text
-//  obs-text       = %x80-FF
-//  VCHAR          = "any visible [USASCII] character"
-//
-// http2 further says: "Similarly, HTTP/2 allows header field values
-// that are not valid. While most of the values that can be encoded
-// will not alter header field parsing, carriage return (CR, ASCII
-// 0xd), line feed (LF, ASCII 0xa), and the zero character (NUL, ASCII
-// 0x0) might be exploited by an attacker if they are translated
-// verbatim. Any request or response that contains a character not
-// permitted in a header field value MUST be treated as malformed
-// (Section 8.1.2.6). Valid characters are defined by the
-// field-content ABNF rule in Section 3.2 of [RFC7230]."
-//
-// This function does not (yet?) properly handle the rejection of
-// strings that begin or end with SP or HTAB.
-func validHeaderFieldValue(v string) bool {
-	for i := 0; i < len(v); i++ {
-		if b := v[i]; b < ' ' && b != '\t' || b == 0x7f {
+		if 'A' <= r && r <= 'Z' {
 			return false
 		}
 	}
@@ -319,7 +289,7 @@ func mustUint31(v int32) uint32 {
 }
 
 // bodyAllowedForStatus reports whether a given response status code
-// permits a body. See RFC2616, section 4.4.
+// permits a body. See RFC 2616, section 4.4.
 func bodyAllowedForStatus(status int) bool {
 	switch {
 	case status >= 100 && status <= 199:
@@ -343,82 +313,39 @@ func (e *httpError) Temporary() bool { return true }
 
 var errTimeout error = &httpError{msg: "http2: timeout awaiting response headers", timeout: true}
 
-var isTokenTable = [127]bool{
-	'!':  true,
-	'#':  true,
-	'$':  true,
-	'%':  true,
-	'&':  true,
-	'\'': true,
-	'*':  true,
-	'+':  true,
-	'-':  true,
-	'.':  true,
-	'0':  true,
-	'1':  true,
-	'2':  true,
-	'3':  true,
-	'4':  true,
-	'5':  true,
-	'6':  true,
-	'7':  true,
-	'8':  true,
-	'9':  true,
-	'A':  true,
-	'B':  true,
-	'C':  true,
-	'D':  true,
-	'E':  true,
-	'F':  true,
-	'G':  true,
-	'H':  true,
-	'I':  true,
-	'J':  true,
-	'K':  true,
-	'L':  true,
-	'M':  true,
-	'N':  true,
-	'O':  true,
-	'P':  true,
-	'Q':  true,
-	'R':  true,
-	'S':  true,
-	'T':  true,
-	'U':  true,
-	'W':  true,
-	'V':  true,
-	'X':  true,
-	'Y':  true,
-	'Z':  true,
-	'^':  true,
-	'_':  true,
-	'`':  true,
-	'a':  true,
-	'b':  true,
-	'c':  true,
-	'd':  true,
-	'e':  true,
-	'f':  true,
-	'g':  true,
-	'h':  true,
-	'i':  true,
-	'j':  true,
-	'k':  true,
-	'l':  true,
-	'm':  true,
-	'n':  true,
-	'o':  true,
-	'p':  true,
-	'q':  true,
-	'r':  true,
-	's':  true,
-	't':  true,
-	'u':  true,
-	'v':  true,
-	'w':  true,
-	'x':  true,
-	'y':  true,
-	'z':  true,
-	'|':  true,
-	'~':  true,
+type connectionStater interface {
+	ConnectionState() tls.ConnectionState
+}
+
+var sorterPool = sync.Pool{New: func() interface{} { return new(sorter) }}
+
+type sorter struct {
+	v []string // owned by sorter
+}
+
+func (s *sorter) Len() int           { return len(s.v) }
+func (s *sorter) Swap(i, j int)      { s.v[i], s.v[j] = s.v[j], s.v[i] }
+func (s *sorter) Less(i, j int) bool { return s.v[i] < s.v[j] }
+
+// Keys returns the sorted keys of h.
+//
+// The returned slice is only valid until s used again or returned to
+// its pool.
+func (s *sorter) Keys(h http.Header) []string {
+	keys := s.v[:0]
+	for k := range h {
+		keys = append(keys, k)
+	}
+	s.v = keys
+	sort.Sort(s)
+	return keys
+}
+
+func (s *sorter) SortStrings(ss []string) {
+	// Our sorter works on s.v, which sorter owners, so
+	// stash it away while we sort the user's buffer.
+	save := s.v
+	s.v = ss
+	sort.Sort(s)
+	s.v = save
 }
diff --git a/vendor/golang.org/x/net/http2/not_go15.go b/vendor/golang.org/x/net/http2/not_go15.go
deleted file mode 100644
index d0fa5c8906..0000000000
--- a/vendor/golang.org/x/net/http2/not_go15.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.5
-
-package http2
-
-import "net/http"
-
-func requestCancel(req *http.Request) <-chan struct{} { return nil }
diff --git a/vendor/golang.org/x/net/http2/not_go16.go b/vendor/golang.org/x/net/http2/not_go16.go
index db53c5b8cb..efd2e1282c 100644
--- a/vendor/golang.org/x/net/http2/not_go16.go
+++ b/vendor/golang.org/x/net/http2/not_go16.go
@@ -6,8 +6,41 @@
 
 package http2
 
-import "net/http"
+import (
+	"crypto/tls"
+	"net/http"
+	"time"
+)
 
 func configureTransport(t1 *http.Transport) (*Transport, error) {
 	return nil, errTransportVersion
 }
+
+func transportExpectContinueTimeout(t1 *http.Transport) time.Duration {
+	return 0
+
+}
+
+// isBadCipher reports whether the cipher is blacklisted by the HTTP/2 spec.
+func isBadCipher(cipher uint16) bool {
+	switch cipher {
+	case tls.TLS_RSA_WITH_RC4_128_SHA,
+		tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+		tls.TLS_RSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+		tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
+		tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
+		tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
+		// Reject cipher suites from Appendix A.
+		// "This list includes those cipher suites that do not
+		// offer an ephemeral key exchange and those that are
+		// based on the TLS null, stream or block cipher type"
+		return true
+	default:
+		return false
+	}
+}
diff --git a/vendor/golang.org/x/net/http2/not_go17.go b/vendor/golang.org/x/net/http2/not_go17.go
new file mode 100644
index 0000000000..28df0c16bf
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/not_go17.go
@@ -0,0 +1,51 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !go1.7
+
+package http2
+
+import (
+	"net"
+	"net/http"
+)
+
+type contextContext interface{}
+
+type fakeContext struct{}
+
+func (fakeContext) Done() <-chan struct{} { return nil }
+func (fakeContext) Err() error            { panic("should not be called") }
+
+func reqContext(r *http.Request) fakeContext {
+	return fakeContext{}
+}
+
+func setResponseUncompressed(res *http.Response) {
+	// Nothing.
+}
+
+type clientTrace struct{}
+
+func requestTrace(*http.Request) *clientTrace { return nil }
+func traceGotConn(*http.Request, *ClientConn) {}
+func traceFirstResponseByte(*clientTrace)     {}
+func traceWroteHeaders(*clientTrace)          {}
+func traceWroteRequest(*clientTrace, error)   {}
+func traceGot100Continue(trace *clientTrace)  {}
+func traceWait100Continue(trace *clientTrace) {}
+
+func nop() {}
+
+func serverConnBaseContext(c net.Conn, opts *ServeConnOpts) (ctx contextContext, cancel func()) {
+	return nil, nop
+}
+
+func contextWithCancel(ctx contextContext) (_ contextContext, cancel func()) {
+	return ctx, nop
+}
+
+func requestWithContext(req *http.Request, ctx contextContext) *http.Request {
+	return req
+}
diff --git a/vendor/golang.org/x/net/http2/pipe.go b/vendor/golang.org/x/net/http2/pipe.go
index 69446e7a37..53b7a1daf6 100644
--- a/vendor/golang.org/x/net/http2/pipe.go
+++ b/vendor/golang.org/x/net/http2/pipe.go
@@ -29,6 +29,12 @@ type pipeBuffer interface {
 	io.Reader
 }
 
+func (p *pipe) Len() int {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	return p.b.Len()
+}
+
 // Read waits until data is available and copies bytes
 // from the buffer into p.
 func (p *pipe) Read(d []byte) (n int, err error) {
diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go
index f24a8e828c..dbe6c87c63 100644
--- a/vendor/golang.org/x/net/http2/server.go
+++ b/vendor/golang.org/x/net/http2/server.go
@@ -51,7 +51,6 @@ import (
 	"os"
 	"reflect"
 	"runtime"
-	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -195,28 +194,80 @@ func ConfigureServer(s *http.Server, conf *Server) error {
 		if testHookOnConn != nil {
 			testHookOnConn()
 		}
-		conf.handleConn(hs, c, h)
+		conf.ServeConn(c, &ServeConnOpts{
+			Handler:    h,
+			BaseConfig: hs,
+		})
 	}
 	s.TLSNextProto[NextProtoTLS] = protoHandler
 	s.TLSNextProto["h2-14"] = protoHandler // temporary; see above.
 	return nil
 }
 
-func (srv *Server) handleConn(hs *http.Server, c net.Conn, h http.Handler) {
+// ServeConnOpts are options for the Server.ServeConn method.
+type ServeConnOpts struct {
+	// BaseConfig optionally sets the base configuration
+	// for values. If nil, defaults are used.
+	BaseConfig *http.Server
+
+	// Handler specifies which handler to use for processing
+	// requests. If nil, BaseConfig.Handler is used. If BaseConfig
+	// or BaseConfig.Handler is nil, http.DefaultServeMux is used.
+	Handler http.Handler
+}
+
+func (o *ServeConnOpts) baseConfig() *http.Server {
+	if o != nil && o.BaseConfig != nil {
+		return o.BaseConfig
+	}
+	return new(http.Server)
+}
+
+func (o *ServeConnOpts) handler() http.Handler {
+	if o != nil {
+		if o.Handler != nil {
+			return o.Handler
+		}
+		if o.BaseConfig != nil && o.BaseConfig.Handler != nil {
+			return o.BaseConfig.Handler
+		}
+	}
+	return http.DefaultServeMux
+}
+
+// ServeConn serves HTTP/2 requests on the provided connection and
+// blocks until the connection is no longer readable.
+//
+// ServeConn starts speaking HTTP/2 assuming that c has not had any
+// reads or writes. It writes its initial settings frame and expects
+// to be able to read the preface and settings frame from the
+// client. If c has a ConnectionState method like a *tls.Conn, the
+// ConnectionState is used to verify the TLS ciphersuite and to set
+// the Request.TLS field in Handlers.
+//
+// ServeConn does not support h2c by itself. Any h2c support must be
+// implemented in terms of providing a suitably-behaving net.Conn.
+//
+// The opts parameter is optional. If nil, default values are used.
+func (s *Server) ServeConn(c net.Conn, opts *ServeConnOpts) {
+	baseCtx, cancel := serverConnBaseContext(c, opts)
+	defer cancel()
+
 	sc := &serverConn{
-		srv:              srv,
-		hs:               hs,
+		srv:              s,
+		hs:               opts.baseConfig(),
 		conn:             c,
+		baseCtx:          baseCtx,
 		remoteAddrStr:    c.RemoteAddr().String(),
 		bw:               newBufferedWriter(c),
-		handler:          h,
+		handler:          opts.handler(),
 		streams:          make(map[uint32]*stream),
 		readFrameCh:      make(chan readFrameResult),
 		wantWriteFrameCh: make(chan frameWriteMsg, 8),
 		wroteFrameCh:     make(chan frameWriteResult, 1), // buffered; one send in writeFrameAsync
 		bodyReadCh:       make(chan bodyReadMsg),         // buffering doesn't matter either way
 		doneServing:      make(chan struct{}),
-		advMaxStreams:    srv.maxConcurrentStreams(),
+		advMaxStreams:    s.maxConcurrentStreams(),
 		writeSched: writeScheduler{
 			maxFrameSize: initialMaxFrameSize,
 		},
@@ -225,17 +276,18 @@ func (srv *Server) handleConn(hs *http.Server, c net.Conn, h http.Handler) {
 		serveG:            newGoroutineLock(),
 		pushEnabled:       true,
 	}
+
 	sc.flow.add(initialWindowSize)
 	sc.inflow.add(initialWindowSize)
 	sc.hpackEncoder = hpack.NewEncoder(&sc.headerWriteBuf)
-	sc.hpackDecoder = hpack.NewDecoder(initialHeaderTableSize, nil)
-	sc.hpackDecoder.SetMaxStringLength(sc.maxHeaderStringLen())
 
 	fr := NewFramer(sc.bw, c)
-	fr.SetMaxReadFrameSize(srv.maxReadFrameSize())
+	fr.ReadMetaHeaders = hpack.NewDecoder(initialHeaderTableSize, nil)
+	fr.MaxHeaderListSize = sc.maxHeaderListSize()
+	fr.SetMaxReadFrameSize(s.maxReadFrameSize())
 	sc.framer = fr
 
-	if tc, ok := c.(*tls.Conn); ok {
+	if tc, ok := c.(connectionStater); ok {
 		sc.tlsState = new(tls.ConnectionState)
 		*sc.tlsState = tc.ConnectionState()
 		// 9.2 Use of TLS Features
@@ -265,7 +317,7 @@ func (srv *Server) handleConn(hs *http.Server, c net.Conn, h http.Handler) {
 			// So for now, do nothing here again.
 		}
 
-		if !srv.PermitProhibitedCipherSuites && isBadCipher(sc.tlsState.CipherSuite) {
+		if !s.PermitProhibitedCipherSuites && isBadCipher(sc.tlsState.CipherSuite) {
 			// "Endpoints MAY choose to generate a connection error
 			// (Section 5.4.1) of type INADEQUATE_SECURITY if one of
 			// the prohibited cipher suites are negotiated."
@@ -287,30 +339,6 @@ func (srv *Server) handleConn(hs *http.Server, c net.Conn, h http.Handler) {
 	sc.serve()
 }
 
-// isBadCipher reports whether the cipher is blacklisted by the HTTP/2 spec.
-func isBadCipher(cipher uint16) bool {
-	switch cipher {
-	case tls.TLS_RSA_WITH_RC4_128_SHA,
-		tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-		tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-		tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-		// Reject cipher suites from Appendix A.
-		// "This list includes those cipher suites that do not
-		// offer an ephemeral key exchange and those that are
-		// based on the TLS null, stream or block cipher type"
-		return true
-	default:
-		return false
-	}
-}
-
 func (sc *serverConn) rejectConn(err ErrCode, debug string) {
 	sc.vlogf("http2: server rejecting conn: %v, %s", err, debug)
 	// ignoring errors. hanging up anyway.
@@ -326,8 +354,8 @@ type serverConn struct {
 	conn             net.Conn
 	bw               *bufferedWriter // writing to conn
 	handler          http.Handler
+	baseCtx          contextContext
 	framer           *Framer
-	hpackDecoder     *hpack.Decoder
 	doneServing      chan struct{}         // closed when serverConn.serve ends
 	readFrameCh      chan readFrameResult  // written by serverConn.readFrames
 	wantWriteFrameCh chan frameWriteMsg    // from handlers -> serve
@@ -354,7 +382,6 @@ type serverConn struct {
 	headerTableSize       uint32
 	peerMaxHeaderListSize uint32            // zero means unknown (default)
 	canonHeader           map[string]string // http2-lower-case -> Go-Canonical-Case
-	req                   requestParam      // non-zero while reading request headers
 	writingFrame          bool              // started write goroutine but haven't heard back on wroteFrameCh
 	needsFrameFlush       bool              // last frame write wasn't a flush
 	writeSched            writeScheduler
@@ -363,22 +390,13 @@ type serverConn struct {
 	goAwayCode            ErrCode
 	shutdownTimerCh       <-chan time.Time // nil until used
 	shutdownTimer         *time.Timer      // nil until used
+	freeRequestBodyBuf    []byte           // if non-nil, a free initialWindowSize buffer for getRequestBodyBuf
 
 	// Owned by the writeFrameAsync goroutine:
 	headerWriteBuf bytes.Buffer
 	hpackEncoder   *hpack.Encoder
 }
 
-func (sc *serverConn) maxHeaderStringLen() int {
-	v := sc.maxHeaderListSize()
-	if uint32(int(v)) == v {
-		return int(v)
-	}
-	// They had a crazy big number for MaxHeaderBytes anyway,
-	// so give them unlimited header lengths:
-	return 0
-}
-
 func (sc *serverConn) maxHeaderListSize() uint32 {
 	n := sc.hs.MaxHeaderBytes
 	if n <= 0 {
@@ -391,21 +409,6 @@ func (sc *serverConn) maxHeaderListSize() uint32 {
 	return uint32(n + typicalHeaders*perFieldOverhead)
 }
 
-// requestParam is the state of the next request, initialized over
-// potentially several frames HEADERS + zero or more CONTINUATION
-// frames.
-type requestParam struct {
-	// stream is non-nil if we're reading (HEADER or CONTINUATION)
-	// frames for a request (but not DATA).
-	stream            *stream
-	header            http.Header
-	method, path      string
-	scheme, authority string
-	sawRegularHeader  bool  // saw a non-pseudo header already
-	invalidHeader     bool  // an invalid header was seen
-	headerListSize    int64 // actually uint32, but easier math this way
-}
-
 // stream represents a stream. This is the minimal metadata needed by
 // the serve goroutine. Most of the actual stream state is owned by
 // the http.Handler's goroutine in the responseWriter. Because the
@@ -415,10 +418,12 @@ type requestParam struct {
 // responseWriter's state field.
 type stream struct {
 	// immutable:
-	sc   *serverConn
-	id   uint32
-	body *pipe       // non-nil if expecting DATA frames
-	cw   closeWaiter // closed wait stream transitions to closed state
+	sc        *serverConn
+	id        uint32
+	body      *pipe       // non-nil if expecting DATA frames
+	cw        closeWaiter // closed wait stream transitions to closed state
+	ctx       contextContext
+	cancelCtx func()
 
 	// owned by serverConn's serve loop:
 	bodyBytes        int64   // body bytes seen so far
@@ -432,6 +437,8 @@ type stream struct {
 	sentReset        bool // only true once detached from streams map
 	gotReset         bool // only true once detacted from streams map
 	gotTrailerHeader bool // HEADER frame for trailers was seen
+	wroteHeaders     bool // whether we wrote headers (not status 100)
+	reqBuf           []byte
 
 	trailer    http.Header // accumulated trailers
 	reqTrailer http.Header // handler's Request.Trailer
@@ -541,87 +548,6 @@ func (sc *serverConn) condlogf(err error, format string, args ...interface{}) {
 	}
 }
 
-func (sc *serverConn) onNewHeaderField(f hpack.HeaderField) {
-	sc.serveG.check()
-	if VerboseLogs {
-		sc.vlogf("http2: server decoded %v", f)
-	}
-	switch {
-	case !validHeaderFieldValue(f.Value): // f.Name checked _after_ pseudo check, since ':' is invalid
-		sc.req.invalidHeader = true
-	case strings.HasPrefix(f.Name, ":"):
-		if sc.req.sawRegularHeader {
-			sc.logf("pseudo-header after regular header")
-			sc.req.invalidHeader = true
-			return
-		}
-		var dst *string
-		switch f.Name {
-		case ":method":
-			dst = &sc.req.method
-		case ":path":
-			dst = &sc.req.path
-		case ":scheme":
-			dst = &sc.req.scheme
-		case ":authority":
-			dst = &sc.req.authority
-		default:
-			// 8.1.2.1 Pseudo-Header Fields
-			// "Endpoints MUST treat a request or response
-			// that contains undefined or invalid
-			// pseudo-header fields as malformed (Section
-			// 8.1.2.6)."
-			sc.logf("invalid pseudo-header %q", f.Name)
-			sc.req.invalidHeader = true
-			return
-		}
-		if *dst != "" {
-			sc.logf("duplicate pseudo-header %q sent", f.Name)
-			sc.req.invalidHeader = true
-			return
-		}
-		*dst = f.Value
-	case !validHeaderFieldName(f.Name):
-		sc.req.invalidHeader = true
-	default:
-		sc.req.sawRegularHeader = true
-		sc.req.header.Add(sc.canonicalHeader(f.Name), f.Value)
-		const headerFieldOverhead = 32 // per spec
-		sc.req.headerListSize += int64(len(f.Name)) + int64(len(f.Value)) + headerFieldOverhead
-		if sc.req.headerListSize > int64(sc.maxHeaderListSize()) {
-			sc.hpackDecoder.SetEmitEnabled(false)
-		}
-	}
-}
-
-func (st *stream) onNewTrailerField(f hpack.HeaderField) {
-	sc := st.sc
-	sc.serveG.check()
-	if VerboseLogs {
-		sc.vlogf("http2: server decoded trailer %v", f)
-	}
-	switch {
-	case strings.HasPrefix(f.Name, ":"):
-		sc.req.invalidHeader = true
-		return
-	case !validHeaderFieldName(f.Name) || !validHeaderFieldValue(f.Value):
-		sc.req.invalidHeader = true
-		return
-	default:
-		key := sc.canonicalHeader(f.Name)
-		if st.trailer != nil {
-			vv := append(st.trailer[key], f.Value)
-			st.trailer[key] = vv
-
-			// arbitrary; TODO: read spec about header list size limits wrt trailers
-			const tooBig = 1000
-			if len(vv) >= tooBig {
-				sc.hpackDecoder.SetEmitEnabled(false)
-			}
-		}
-	}
-}
-
 func (sc *serverConn) canonicalHeader(v string) string {
 	sc.serveG.check()
 	cv, ok := commonCanonHeader[v]
@@ -656,10 +582,11 @@ type readFrameResult struct {
 // It's run on its own goroutine.
 func (sc *serverConn) readFrames() {
 	gate := make(gate)
+	gateDone := gate.Done
 	for {
 		f, err := sc.framer.ReadFrame()
 		select {
-		case sc.readFrameCh <- readFrameResult{f, err, gate.Done}:
+		case sc.readFrameCh <- readFrameResult{f, err, gateDone}:
 		case <-sc.doneServing:
 			return
 		}
@@ -898,7 +825,23 @@ func (sc *serverConn) writeFrameFromHandler(wm frameWriteMsg) error {
 // If you're not on the serve goroutine, use writeFrameFromHandler instead.
 func (sc *serverConn) writeFrame(wm frameWriteMsg) {
 	sc.serveG.check()
-	sc.writeSched.add(wm)
+
+	var ignoreWrite bool
+
+	// Don't send a 100-continue response if we've already sent headers.
+	// See golang.org/issue/14030.
+	switch wm.write.(type) {
+	case *writeResHeaders:
+		wm.stream.wroteHeaders = true
+	case write100ContinueHeadersFrame:
+		if wm.stream.wroteHeaders {
+			ignoreWrite = true
+		}
+	}
+
+	if !ignoreWrite {
+		sc.writeSched.add(wm)
+	}
 	sc.scheduleFrameWrite()
 }
 
@@ -1135,10 +1078,8 @@ func (sc *serverConn) processFrame(f Frame) error {
 	switch f := f.(type) {
 	case *SettingsFrame:
 		return sc.processSettings(f)
-	case *HeadersFrame:
+	case *MetaHeadersFrame:
 		return sc.processHeaders(f)
-	case *ContinuationFrame:
-		return sc.processContinuation(f)
 	case *WindowUpdateFrame:
 		return sc.processWindowUpdate(f)
 	case *PingFrame:
@@ -1217,6 +1158,7 @@ func (sc *serverConn) processResetStream(f *RSTStreamFrame) error {
 	}
 	if st != nil {
 		st.gotReset = true
+		st.cancelCtx()
 		sc.closeStream(st, StreamError{f.StreamID, f.ErrCode})
 	}
 	return nil
@@ -1234,10 +1176,26 @@ func (sc *serverConn) closeStream(st *stream, err error) {
 	}
 	delete(sc.streams, st.id)
 	if p := st.body; p != nil {
+		// Return any buffered unread bytes worth of conn-level flow control.
+		// See golang.org/issue/16481
+		sc.sendWindowUpdate(nil, p.Len())
+
 		p.CloseWithError(err)
 	}
 	st.cw.Close() // signals Handler's CloseNotifier, unblocks writes, etc
 	sc.writeSched.forgetStream(st.id)
+	if st.reqBuf != nil {
+		// Stash this request body buffer (64k) away for reuse
+		// by a future POST/PUT/etc.
+		//
+		// TODO(bradfitz): share on the server? sync.Pool?
+		// Server requires locks and might hurt contention.
+		// sync.Pool might work, or might be worse, depending
+		// on goroutine CPU migrations. (get and put on
+		// separate CPUs).  Maybe a mix of strategies. But
+		// this is an easy win for now.
+		sc.freeRequestBodyBuf = st.reqBuf
+	}
 }
 
 func (sc *serverConn) processSettings(f *SettingsFrame) error {
@@ -1323,6 +1281,8 @@ func (sc *serverConn) processSettingInitialWindowSize(val uint32) error {
 
 func (sc *serverConn) processData(f *DataFrame) error {
 	sc.serveG.check()
+	data := f.Data()
+
 	// "If a DATA frame is received whose stream is not in "open"
 	// or "half closed (local)" state, the recipient MUST respond
 	// with a stream error (Section 5.4.2) of type STREAM_CLOSED."
@@ -1334,12 +1294,25 @@ func (sc *serverConn) processData(f *DataFrame) error {
 		// the http.Handler returned, so it's done reading &
 		// done writing). Try to stop the client from sending
 		// more DATA.
+
+		// But still enforce their connection-level flow control,
+		// and return any flow control bytes since we're not going
+		// to consume them.
+		if int(sc.inflow.available()) < len(data) {
+			return StreamError{id, ErrCodeFlowControl}
+		}
+		// Deduct the flow control from inflow, since we're
+		// going to immediately add it back in
+		// sendWindowUpdate, which also schedules sending the
+		// frames.
+		sc.inflow.take(int32(len(data)))
+		sc.sendWindowUpdate(nil, len(data)) // conn-level
+
 		return StreamError{id, ErrCodeStreamClosed}
 	}
 	if st.body == nil {
 		panic("internal error: should have a body in this state")
 	}
-	data := f.Data()
 
 	// Sender sending more than they'd declared?
 	if st.declBodyBytes != -1 && st.bodyBytes+int64(len(data)) > st.declBodyBytes {
@@ -1394,7 +1367,7 @@ func (st *stream) copyTrailersToHandlerRequest() {
 	}
 }
 
-func (sc *serverConn) processHeaders(f *HeadersFrame) error {
+func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
 	sc.serveG.check()
 	id := f.Header().StreamID
 	if sc.inGoAway {
@@ -1423,17 +1396,18 @@ func (sc *serverConn) processHeaders(f *HeadersFrame) error {
 	// endpoint has opened or reserved. [...]  An endpoint that
 	// receives an unexpected stream identifier MUST respond with
 	// a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-	if id <= sc.maxStreamID || sc.req.stream != nil {
+	if id <= sc.maxStreamID {
 		return ConnectionError(ErrCodeProtocol)
 	}
+	sc.maxStreamID = id
 
-	if id > sc.maxStreamID {
-		sc.maxStreamID = id
-	}
+	ctx, cancelCtx := contextWithCancel(sc.baseCtx)
 	st = &stream{
-		sc:    sc,
-		id:    id,
-		state: stateOpen,
+		sc:        sc,
+		id:        id,
+		state:     stateOpen,
+		ctx:       ctx,
+		cancelCtx: cancelCtx,
 	}
 	if f.StreamEnded() {
 		st.state = stateHalfClosedRemote
@@ -1453,50 +1427,6 @@ func (sc *serverConn) processHeaders(f *HeadersFrame) error {
 	if sc.curOpenStreams == 1 {
 		sc.setConnState(http.StateActive)
 	}
-	sc.req = requestParam{
-		stream: st,
-		header: make(http.Header),
-	}
-	sc.hpackDecoder.SetEmitFunc(sc.onNewHeaderField)
-	sc.hpackDecoder.SetEmitEnabled(true)
-	return sc.processHeaderBlockFragment(st, f.HeaderBlockFragment(), f.HeadersEnded())
-}
-
-func (st *stream) processTrailerHeaders(f *HeadersFrame) error {
-	sc := st.sc
-	sc.serveG.check()
-	if st.gotTrailerHeader {
-		return ConnectionError(ErrCodeProtocol)
-	}
-	st.gotTrailerHeader = true
-	if !f.StreamEnded() {
-		return StreamError{st.id, ErrCodeProtocol}
-	}
-	sc.resetPendingRequest() // we use invalidHeader from it for trailers
-	return st.processTrailerHeaderBlockFragment(f.HeaderBlockFragment(), f.HeadersEnded())
-}
-
-func (sc *serverConn) processContinuation(f *ContinuationFrame) error {
-	sc.serveG.check()
-	st := sc.streams[f.Header().StreamID]
-	if st.gotTrailerHeader {
-		return st.processTrailerHeaderBlockFragment(f.HeaderBlockFragment(), f.HeadersEnded())
-	}
-	return sc.processHeaderBlockFragment(st, f.HeaderBlockFragment(), f.HeadersEnded())
-}
-
-func (sc *serverConn) processHeaderBlockFragment(st *stream, frag []byte, end bool) error {
-	sc.serveG.check()
-	if _, err := sc.hpackDecoder.Write(frag); err != nil {
-		return ConnectionError(ErrCodeCompression)
-	}
-	if !end {
-		return nil
-	}
-	if err := sc.hpackDecoder.Close(); err != nil {
-		return ConnectionError(ErrCodeCompression)
-	}
-	defer sc.resetPendingRequest()
 	if sc.curOpenStreams > sc.advMaxStreams {
 		// "Endpoints MUST NOT exceed the limit set by their
 		// peer. An endpoint that receives a HEADERS frame
@@ -1516,7 +1446,7 @@ func (sc *serverConn) processHeaderBlockFragment(st *stream, frag []byte, end bo
 		return StreamError{st.id, ErrCodeRefusedStream}
 	}
 
-	rw, req, err := sc.newWriterAndRequest()
+	rw, req, err := sc.newWriterAndRequest(st, f)
 	if err != nil {
 		return err
 	}
@@ -1528,36 +1458,44 @@ func (sc *serverConn) processHeaderBlockFragment(st *stream, frag []byte, end bo
 	st.declBodyBytes = req.ContentLength
 
 	handler := sc.handler.ServeHTTP
-	if !sc.hpackDecoder.EmitEnabled() {
+	if f.Truncated {
 		// Their header list was too long. Send a 431 error.
 		handler = handleHeaderListTooLong
+	} else if err := checkValidHTTP2Request(req); err != nil {
+		handler = new400Handler(err)
 	}
 
 	go sc.runHandler(rw, req, handler)
 	return nil
 }
 
-func (st *stream) processTrailerHeaderBlockFragment(frag []byte, end bool) error {
+func (st *stream) processTrailerHeaders(f *MetaHeadersFrame) error {
 	sc := st.sc
 	sc.serveG.check()
-	sc.hpackDecoder.SetEmitFunc(st.onNewTrailerField)
-	if _, err := sc.hpackDecoder.Write(frag); err != nil {
-		return ConnectionError(ErrCodeCompression)
+	if st.gotTrailerHeader {
+		return ConnectionError(ErrCodeProtocol)
 	}
-	if !end {
-		return nil
+	st.gotTrailerHeader = true
+	if !f.StreamEnded() {
+		return StreamError{st.id, ErrCodeProtocol}
 	}
 
-	rp := &sc.req
-	if rp.invalidHeader {
-		return StreamError{rp.stream.id, ErrCodeProtocol}
+	if len(f.PseudoFields()) > 0 {
+		return StreamError{st.id, ErrCodeProtocol}
 	}
-
-	err := sc.hpackDecoder.Close()
-	st.endStream()
-	if err != nil {
-		return ConnectionError(ErrCodeCompression)
+	if st.trailer != nil {
+		for _, hf := range f.RegularFields() {
+			key := sc.canonicalHeader(hf.Name)
+			if !ValidTrailerHeader(key) {
+				// TODO: send more details to the peer somehow. But http2 has
+				// no way to send debug data at a stream level. Discuss with
+				// HTTP folk.
+				return StreamError{st.id, ErrCodeProtocol}
+			}
+			st.trailer[key] = append(st.trailer[key], hf.Value)
+		}
 	}
+	st.endStream()
 	return nil
 }
 
@@ -1602,29 +1540,21 @@ func adjustStreamPriority(streams map[uint32]*stream, streamID uint32, priority
 	}
 }
 
-// resetPendingRequest zeros out all state related to a HEADERS frame
-// and its zero or more CONTINUATION frames sent to start a new
-// request.
-func (sc *serverConn) resetPendingRequest() {
-	sc.serveG.check()
-	sc.req = requestParam{}
-}
-
-func (sc *serverConn) newWriterAndRequest() (*responseWriter, *http.Request, error) {
+func (sc *serverConn) newWriterAndRequest(st *stream, f *MetaHeadersFrame) (*responseWriter, *http.Request, error) {
 	sc.serveG.check()
-	rp := &sc.req
 
-	if rp.invalidHeader {
-		return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
-	}
+	method := f.PseudoValue("method")
+	path := f.PseudoValue("path")
+	scheme := f.PseudoValue("scheme")
+	authority := f.PseudoValue("authority")
 
-	isConnect := rp.method == "CONNECT"
+	isConnect := method == "CONNECT"
 	if isConnect {
-		if rp.path != "" || rp.scheme != "" || rp.authority == "" {
-			return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
+		if path != "" || scheme != "" || authority == "" {
+			return nil, nil, StreamError{f.StreamID, ErrCodeProtocol}
 		}
-	} else if rp.method == "" || rp.path == "" ||
-		(rp.scheme != "https" && rp.scheme != "http") {
+	} else if method == "" || path == "" ||
+		(scheme != "https" && scheme != "http") {
 		// See 8.1.2.6 Malformed Requests and Responses:
 		//
 		// Malformed requests or responses that are detected
@@ -1635,35 +1565,40 @@ func (sc *serverConn) newWriterAndRequest() (*responseWriter, *http.Request, err
 		// "All HTTP/2 requests MUST include exactly one valid
 		// value for the :method, :scheme, and :path
 		// pseudo-header fields"
-		return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
+		return nil, nil, StreamError{f.StreamID, ErrCodeProtocol}
 	}
 
-	bodyOpen := rp.stream.state == stateOpen
-	if rp.method == "HEAD" && bodyOpen {
+	bodyOpen := !f.StreamEnded()
+	if method == "HEAD" && bodyOpen {
 		// HEAD requests can't have bodies
-		return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
+		return nil, nil, StreamError{f.StreamID, ErrCodeProtocol}
 	}
 	var tlsState *tls.ConnectionState // nil if not scheme https
 
-	if rp.scheme == "https" {
+	if scheme == "https" {
 		tlsState = sc.tlsState
 	}
-	authority := rp.authority
+
+	header := make(http.Header)
+	for _, hf := range f.RegularFields() {
+		header.Add(sc.canonicalHeader(hf.Name), hf.Value)
+	}
+
 	if authority == "" {
-		authority = rp.header.Get("Host")
+		authority = header.Get("Host")
 	}
-	needsContinue := rp.header.Get("Expect") == "100-continue"
+	needsContinue := header.Get("Expect") == "100-continue"
 	if needsContinue {
-		rp.header.Del("Expect")
+		header.Del("Expect")
 	}
 	// Merge Cookie headers into one "; "-delimited value.
-	if cookies := rp.header["Cookie"]; len(cookies) > 1 {
-		rp.header.Set("Cookie", strings.Join(cookies, "; "))
+	if cookies := header["Cookie"]; len(cookies) > 1 {
+		header.Set("Cookie", strings.Join(cookies, "; "))
 	}
 
 	// Setup Trailers
 	var trailer http.Header
-	for _, v := range rp.header["Trailer"] {
+	for _, v := range header["Trailer"] {
 		for _, key := range strings.Split(v, ",") {
 			key = http.CanonicalHeaderKey(strings.TrimSpace(key))
 			switch key {
@@ -1678,31 +1613,31 @@ func (sc *serverConn) newWriterAndRequest() (*responseWriter, *http.Request, err
 			}
 		}
 	}
-	delete(rp.header, "Trailer")
+	delete(header, "Trailer")
 
 	body := &requestBody{
 		conn:          sc,
-		stream:        rp.stream,
+		stream:        st,
 		needsContinue: needsContinue,
 	}
 	var url_ *url.URL
 	var requestURI string
 	if isConnect {
-		url_ = &url.URL{Host: rp.authority}
-		requestURI = rp.authority // mimic HTTP/1 server behavior
+		url_ = &url.URL{Host: authority}
+		requestURI = authority // mimic HTTP/1 server behavior
 	} else {
 		var err error
-		url_, err = url.ParseRequestURI(rp.path)
+		url_, err = url.ParseRequestURI(path)
 		if err != nil {
-			return nil, nil, StreamError{rp.stream.id, ErrCodeProtocol}
+			return nil, nil, StreamError{f.StreamID, ErrCodeProtocol}
 		}
-		requestURI = rp.path
+		requestURI = path
 	}
 	req := &http.Request{
-		Method:     rp.method,
+		Method:     method,
 		URL:        url_,
 		RemoteAddr: sc.remoteAddrStr,
-		Header:     rp.header,
+		Header:     header,
 		RequestURI: requestURI,
 		Proto:      "HTTP/2.0",
 		ProtoMajor: 2,
@@ -1712,12 +1647,18 @@ func (sc *serverConn) newWriterAndRequest() (*responseWriter, *http.Request, err
 		Body:       body,
 		Trailer:    trailer,
 	}
+	req = requestWithContext(req, st.ctx)
 	if bodyOpen {
+		// Disabled, per golang.org/issue/14960:
+		// st.reqBuf = sc.getRequestBodyBuf()
+		// TODO: remove this 64k of garbage per request (again, but without a data race):
+		buf := make([]byte, initialWindowSize)
+
 		body.pipe = &pipe{
-			b: &fixedBuffer{buf: make([]byte, initialWindowSize)}, // TODO: garbage
+			b: &fixedBuffer{buf: buf},
 		}
 
-		if vv, ok := rp.header["Content-Length"]; ok {
+		if vv, ok := header["Content-Length"]; ok {
 			req.ContentLength, _ = strconv.ParseInt(vv[0], 10, 64)
 		} else {
 			req.ContentLength = -1
@@ -1730,7 +1671,7 @@ func (sc *serverConn) newWriterAndRequest() (*responseWriter, *http.Request, err
 	rws.conn = sc
 	rws.bw = bwSave
 	rws.bw.Reset(chunkWriter{rws})
-	rws.stream = rp.stream
+	rws.stream = st
 	rws.req = req
 	rws.body = body
 
@@ -1738,10 +1679,20 @@ func (sc *serverConn) newWriterAndRequest() (*responseWriter, *http.Request, err
 	return rw, req, nil
 }
 
+func (sc *serverConn) getRequestBodyBuf() []byte {
+	sc.serveG.check()
+	if buf := sc.freeRequestBodyBuf; buf != nil {
+		sc.freeRequestBodyBuf = nil
+		return buf
+	}
+	return make([]byte, initialWindowSize)
+}
+
 // Run on its own goroutine.
 func (sc *serverConn) runHandler(rw *responseWriter, req *http.Request, handler func(http.ResponseWriter, *http.Request)) {
 	didPanic := true
 	defer func() {
+		rw.rws.stream.cancelCtx()
 		if didPanic {
 			e := recover()
 			// Same as net/http:
@@ -1894,7 +1845,7 @@ type requestBody struct {
 
 func (b *requestBody) Close() error {
 	if b.pipe != nil {
-		b.pipe.CloseWithError(errClosedBody)
+		b.pipe.BreakWithError(errClosedBody)
 	}
 	b.closed = true
 	return nil
@@ -1969,9 +1920,9 @@ func (rws *responseWriterState) hasTrailers() bool { return len(rws.trailers) !=
 // written in the trailers at the end of the response.
 func (rws *responseWriterState) declareTrailer(k string) {
 	k = http.CanonicalHeaderKey(k)
-	switch k {
-	case "Transfer-Encoding", "Content-Length", "Trailer":
+	if !ValidTrailerHeader(k) {
 		// Forbidden by RFC 2616 14.40.
+		rws.conn.logf("ignoring invalid trailer %q", k)
 		return
 	}
 	if !strSliceContains(rws.trailers, k) {
@@ -2112,7 +2063,12 @@ func (rws *responseWriterState) promoteUndeclaredTrailers() {
 		rws.declareTrailer(trailerKey)
 		rws.handlerHeader[http.CanonicalHeaderKey(trailerKey)] = vv
 	}
-	sort.Strings(rws.trailers)
+
+	if len(rws.trailers) > 1 {
+		sorter := sorterPool.Get().(*sorter)
+		sorter.SortStrings(rws.trailers)
+		sorterPool.Put(sorter)
+	}
 }
 
 func (w *responseWriter) Flush() {
@@ -2258,3 +2214,69 @@ func foreachHeaderElement(v string, fn func(string)) {
 		}
 	}
 }
+
+// From http://httpwg.org/specs/rfc7540.html#rfc.section.8.1.2.2
+var connHeaders = []string{
+	"Connection",
+	"Keep-Alive",
+	"Proxy-Connection",
+	"Transfer-Encoding",
+	"Upgrade",
+}
+
+// checkValidHTTP2Request checks whether req is a valid HTTP/2 request,
+// per RFC 7540 Section 8.1.2.2.
+// The returned error is reported to users.
+func checkValidHTTP2Request(req *http.Request) error {
+	for _, h := range connHeaders {
+		if _, ok := req.Header[h]; ok {
+			return fmt.Errorf("request header %q is not valid in HTTP/2", h)
+		}
+	}
+	te := req.Header["Te"]
+	if len(te) > 0 && (len(te) > 1 || (te[0] != "trailers" && te[0] != "")) {
+		return errors.New(`request header "TE" may only be "trailers" in HTTP/2`)
+	}
+	return nil
+}
+
+func new400Handler(err error) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+	}
+}
+
+// ValidTrailerHeader reports whether name is a valid header field name to appear
+// in trailers.
+// See: http://tools.ietf.org/html/rfc7230#section-4.1.2
+func ValidTrailerHeader(name string) bool {
+	name = http.CanonicalHeaderKey(name)
+	if strings.HasPrefix(name, "If-") || badTrailer[name] {
+		return false
+	}
+	return true
+}
+
+var badTrailer = map[string]bool{
+	"Authorization":       true,
+	"Cache-Control":       true,
+	"Connection":          true,
+	"Content-Encoding":    true,
+	"Content-Length":      true,
+	"Content-Range":       true,
+	"Content-Type":        true,
+	"Expect":              true,
+	"Host":                true,
+	"Keep-Alive":          true,
+	"Max-Forwards":        true,
+	"Pragma":              true,
+	"Proxy-Authenticate":  true,
+	"Proxy-Authorization": true,
+	"Proxy-Connection":    true,
+	"Range":               true,
+	"Realm":               true,
+	"Te":                  true,
+	"Trailer":             true,
+	"Transfer-Encoding":   true,
+	"Www-Authenticate":    true,
+}
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
index b3cbb9943d..b6f6f95281 100644
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"golang.org/x/net/http2/hpack"
+	"golang.org/x/net/lex/httplex"
 )
 
 const (
@@ -76,6 +77,10 @@ type Transport struct {
 	// uncompressed.
 	DisableCompression bool
 
+	// AllowHTTP, if true, permits HTTP/2 requests using the insecure,
+	// plain-text "http" scheme. Note that this does not enable h2c support.
+	AllowHTTP bool
+
 	// MaxHeaderListSize is the http2 SETTINGS_MAX_HEADER_LIST_SIZE to
 	// send in the initial settings frame. It is how many bytes
 	// of response headers are allow. Unlike the http2 spec, zero here
@@ -134,9 +139,10 @@ func (t *Transport) initConnPool() {
 // ClientConn is the state of a single HTTP/2 client connection to an
 // HTTP/2 server.
 type ClientConn struct {
-	t        *Transport
-	tconn    net.Conn             // usually *tls.Conn, except specialized impls
-	tlsState *tls.ConnectionState // nil only for specialized impls
+	t         *Transport
+	tconn     net.Conn             // usually *tls.Conn, except specialized impls
+	tlsState  *tls.ConnectionState // nil only for specialized impls
+	singleUse bool                 // whether being used for a single http.Request
 
 	// readLoop goroutine fields:
 	readerDone chan struct{} // closed on error
@@ -148,11 +154,14 @@ type ClientConn struct {
 	inflow       flow       // peer's conn-level flow control
 	closed       bool
 	goAway       *GoAwayFrame             // if non-nil, the GoAwayFrame we received
+	goAwayDebug  string                   // goAway frame's debug data, retained as a string
 	streams      map[uint32]*clientStream // client-initiated
 	nextStreamID uint32
 	bw           *bufio.Writer
 	br           *bufio.Reader
 	fr           *Framer
+	lastActive   time.Time
+
 	// Settings from peer:
 	maxFrameSize         uint32
 	maxConcurrentStreams uint32
@@ -170,10 +179,12 @@ type ClientConn struct {
 type clientStream struct {
 	cc            *ClientConn
 	req           *http.Request
+	trace         *clientTrace // or nil
 	ID            uint32
 	resc          chan resAndError
 	bufPipe       pipe // buffered pipe with the flow-controlled response payload
 	requestedGzip bool
+	on100         func() // optional code to run if get a 100 continue response
 
 	flow        flow  // guarded by cc.mu
 	inflow      flow  // guarded by cc.mu
@@ -187,36 +198,43 @@ type clientStream struct {
 	done chan struct{} // closed when stream remove from cc.streams map; close calls guarded by cc.mu
 
 	// owned by clientConnReadLoop:
-	pastHeaders  bool // got HEADERS w/ END_HEADERS
-	pastTrailers bool // got second HEADERS frame w/ END_HEADERS
+	firstByte    bool // got the first response byte
+	pastHeaders  bool // got first MetaHeadersFrame (actual headers)
+	pastTrailers bool // got optional second MetaHeadersFrame (trailers)
 
 	trailer    http.Header  // accumulated trailers
 	resTrailer *http.Header // client's Response.Trailer
 }
 
 // awaitRequestCancel runs in its own goroutine and waits for the user
-// to either cancel a RoundTrip request (using the provided
-// Request.Cancel channel), or for the request to be done (any way it
-// might be removed from the cc.streams map: peer reset, successful
-// completion, TCP connection breakage, etc)
-func (cs *clientStream) awaitRequestCancel(cancel <-chan struct{}) {
-	if cancel == nil {
+// to cancel a RoundTrip request, its context to expire, or for the
+// request to be done (any way it might be removed from the cc.streams
+// map: peer reset, successful completion, TCP connection breakage,
+// etc)
+func (cs *clientStream) awaitRequestCancel(req *http.Request) {
+	ctx := reqContext(req)
+	if req.Cancel == nil && ctx.Done() == nil {
 		return
 	}
 	select {
-	case <-cancel:
+	case <-req.Cancel:
 		cs.bufPipe.CloseWithError(errRequestCanceled)
 		cs.cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+	case <-ctx.Done():
+		cs.bufPipe.CloseWithError(ctx.Err())
+		cs.cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
 	case <-cs.done:
 	}
 }
 
-// checkReset reports any error sent in a RST_STREAM frame by the
-// server.
-func (cs *clientStream) checkReset() error {
+// checkResetOrDone reports any error sent in a RST_STREAM frame by the
+// server, or errStreamClosed if the stream is complete.
+func (cs *clientStream) checkResetOrDone() error {
 	select {
 	case <-cs.peerReset:
 		return cs.resetErr
+	case <-cs.done:
+		return errStreamClosed
 	default:
 		return nil
 	}
@@ -264,26 +282,31 @@ func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
 
 // authorityAddr returns a given authority (a host/IP, or host:port / ip:port)
 // and returns a host:port. The port 443 is added if needed.
-func authorityAddr(authority string) (addr string) {
+func authorityAddr(scheme string, authority string) (addr string) {
 	if _, _, err := net.SplitHostPort(authority); err == nil {
 		return authority
 	}
-	return net.JoinHostPort(authority, "443")
+	port := "443"
+	if scheme == "http" {
+		port = "80"
+	}
+	return net.JoinHostPort(authority, port)
 }
 
 // RoundTripOpt is like RoundTrip, but takes options.
 func (t *Transport) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.Response, error) {
-	if req.URL.Scheme != "https" {
+	if !(req.URL.Scheme == "https" || (req.URL.Scheme == "http" && t.AllowHTTP)) {
 		return nil, errors.New("http2: unsupported scheme")
 	}
 
-	addr := authorityAddr(req.URL.Host)
+	addr := authorityAddr(req.URL.Scheme, req.URL.Host)
 	for {
 		cc, err := t.connPool().GetClientConn(req, addr)
 		if err != nil {
 			t.vlogf("http2: Transport failed to get client conn for %s: %v", addr, err)
 			return nil, err
 		}
+		traceGotConn(req, cc)
 		res, err := cc.RoundTrip(req)
 		if shouldRetryRequest(req, err) {
 			continue
@@ -300,7 +323,7 @@ func (t *Transport) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.Res
 // connected from previous requests but are now sitting idle.
 // It does not interrupt any connections currently in use.
 func (t *Transport) CloseIdleConnections() {
-	if cp, ok := t.connPool().(*clientConnPool); ok {
+	if cp, ok := t.connPool().(clientConnPoolIdleCloser); ok {
 		cp.closeIdleConnections()
 	}
 }
@@ -316,7 +339,7 @@ func shouldRetryRequest(req *http.Request, err error) bool {
 	return err == errClientConnUnusable
 }
 
-func (t *Transport) dialClientConn(addr string) (*ClientConn, error) {
+func (t *Transport) dialClientConn(addr string, singleUse bool) (*ClientConn, error) {
 	host, _, err := net.SplitHostPort(addr)
 	if err != nil {
 		return nil, err
@@ -325,7 +348,7 @@ func (t *Transport) dialClientConn(addr string) (*ClientConn, error) {
 	if err != nil {
 		return nil, err
 	}
-	return t.NewClientConn(tconn)
+	return t.newClientConn(tconn, singleUse)
 }
 
 func (t *Transport) newTLSConfig(host string) *tls.Config {
@@ -333,8 +356,12 @@ func (t *Transport) newTLSConfig(host string) *tls.Config {
 	if t.TLSClientConfig != nil {
 		*cfg = *t.TLSClientConfig
 	}
-	cfg.NextProtos = []string{NextProtoTLS} // TODO: don't override if already in list
-	cfg.ServerName = host
+	if !strSliceContains(cfg.NextProtos, NextProtoTLS) {
+		cfg.NextProtos = append([]string{NextProtoTLS}, cfg.NextProtos...)
+	}
+	if cfg.ServerName == "" {
+		cfg.ServerName = host
+	}
 	return cfg
 }
 
@@ -374,7 +401,18 @@ func (t *Transport) disableKeepAlives() bool {
 	return t.t1 != nil && t.t1.DisableKeepAlives
 }
 
+func (t *Transport) expectContinueTimeout() time.Duration {
+	if t.t1 == nil {
+		return 0
+	}
+	return transportExpectContinueTimeout(t.t1)
+}
+
 func (t *Transport) NewClientConn(c net.Conn) (*ClientConn, error) {
+	return t.newClientConn(c, false)
+}
+
+func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, error) {
 	if VerboseLogs {
 		t.vlogf("http2: Transport creating client conn to %v", c.RemoteAddr())
 	}
@@ -392,6 +430,7 @@ func (t *Transport) NewClientConn(c net.Conn) (*ClientConn, error) {
 		initialWindowSize:    65535,    // spec default
 		maxConcurrentStreams: 1000,     // "infinite", per spec. 1000 seems good enough.
 		streams:              make(map[uint32]*clientStream),
+		singleUse:            singleUse,
 	}
 	cc.cond = sync.NewCond(&cc.mu)
 	cc.flow.add(int32(initialWindowSize))
@@ -401,22 +440,21 @@ func (t *Transport) NewClientConn(c net.Conn) (*ClientConn, error) {
 	cc.bw = bufio.NewWriter(stickyErrWriter{c, &cc.werr})
 	cc.br = bufio.NewReader(c)
 	cc.fr = NewFramer(cc.bw, cc.br)
+	cc.fr.ReadMetaHeaders = hpack.NewDecoder(initialHeaderTableSize, nil)
+	cc.fr.MaxHeaderListSize = t.maxHeaderListSize()
 
 	// TODO: SetMaxDynamicTableSize, SetMaxDynamicTableSizeLimit on
 	// henc in response to SETTINGS frames?
 	cc.henc = hpack.NewEncoder(&cc.hbuf)
 
-	type connectionStater interface {
-		ConnectionState() tls.ConnectionState
-	}
 	if cs, ok := c.(connectionStater); ok {
 		state := cs.ConnectionState()
 		cc.tlsState = &state
 	}
 
 	initialSettings := []Setting{
-		Setting{ID: SettingEnablePush, Val: 0},
-		Setting{ID: SettingInitialWindowSize, Val: transportDefaultStreamFlow},
+		{ID: SettingEnablePush, Val: 0},
+		{ID: SettingInitialWindowSize, Val: transportDefaultStreamFlow},
 	}
 	if max := t.maxHeaderListSize(); max != 0 {
 		initialSettings = append(initialSettings, Setting{ID: SettingMaxHeaderListSize, Val: max})
@@ -463,7 +501,17 @@ func (t *Transport) NewClientConn(c net.Conn) (*ClientConn, error) {
 func (cc *ClientConn) setGoAway(f *GoAwayFrame) {
 	cc.mu.Lock()
 	defer cc.mu.Unlock()
+
+	old := cc.goAway
 	cc.goAway = f
+
+	// Merge the previous and current GoAway error frames.
+	if cc.goAwayDebug == "" {
+		cc.goAwayDebug = string(f.DebugData())
+	}
+	if old != nil && old.ErrCode != ErrCodeNo {
+		cc.goAway.ErrCode = old.ErrCode
+	}
 }
 
 func (cc *ClientConn) CanTakeNewRequest() bool {
@@ -473,6 +521,9 @@ func (cc *ClientConn) CanTakeNewRequest() bool {
 }
 
 func (cc *ClientConn) canTakeNewRequestLocked() bool {
+	if cc.singleUse && cc.nextStreamID > 1 {
+		return false
+	}
 	return cc.goAway == nil && !cc.closed &&
 		int64(len(cc.streams)+1) < int64(cc.maxConcurrentStreams) &&
 		cc.nextStreamID < 2147483647
@@ -565,46 +616,72 @@ func (cc *ClientConn) responseHeaderTimeout() time.Duration {
 	return 0
 }
 
+// checkConnHeaders checks whether req has any invalid connection-level headers.
+// per RFC 7540 section 8.1.2.2: Connection-Specific Header Fields.
+// Certain headers are special-cased as okay but not transmitted later.
+func checkConnHeaders(req *http.Request) error {
+	if v := req.Header.Get("Upgrade"); v != "" {
+		return errors.New("http2: invalid Upgrade request header")
+	}
+	if v := req.Header.Get("Transfer-Encoding"); (v != "" && v != "chunked") || len(req.Header["Transfer-Encoding"]) > 1 {
+		return errors.New("http2: invalid Transfer-Encoding request header")
+	}
+	if v := req.Header.Get("Connection"); (v != "" && v != "close" && v != "keep-alive") || len(req.Header["Connection"]) > 1 {
+		return errors.New("http2: invalid Connection request header")
+	}
+	return nil
+}
+
+func bodyAndLength(req *http.Request) (body io.Reader, contentLen int64) {
+	body = req.Body
+	if body == nil {
+		return nil, 0
+	}
+	if req.ContentLength != 0 {
+		return req.Body, req.ContentLength
+	}
+
+	// We have a body but a zero content length. Test to see if
+	// it's actually zero or just unset.
+	var buf [1]byte
+	n, rerr := io.ReadFull(body, buf[:])
+	if rerr != nil && rerr != io.EOF {
+		return errorReader{rerr}, -1
+	}
+	if n == 1 {
+		// Oh, guess there is data in this Body Reader after all.
+		// The ContentLength field just wasn't set.
+		// Stich the Body back together again, re-attaching our
+		// consumed byte.
+		return io.MultiReader(bytes.NewReader(buf[:]), body), -1
+	}
+	// Body is actually zero bytes.
+	return nil, 0
+}
+
 func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
+	if err := checkConnHeaders(req); err != nil {
+		return nil, err
+	}
+
 	trailers, err := commaSeparatedTrailers(req)
 	if err != nil {
 		return nil, err
 	}
 	hasTrailers := trailers != ""
 
-	var body io.Reader = req.Body
-	contentLen := req.ContentLength
-	if req.Body != nil && contentLen == 0 {
-		// Test to see if it's actually zero or just unset.
-		var buf [1]byte
-		n, rerr := io.ReadFull(body, buf[:])
-		if rerr != nil && rerr != io.EOF {
-			contentLen = -1
-			body = errorReader{rerr}
-		} else if n == 1 {
-			// Oh, guess there is data in this Body Reader after all.
-			// The ContentLength field just wasn't set.
-			// Stich the Body back together again, re-attaching our
-			// consumed byte.
-			contentLen = -1
-			body = io.MultiReader(bytes.NewReader(buf[:]), body)
-		} else {
-			// Body is actually empty.
-			body = nil
-		}
-	}
+	body, contentLen := bodyAndLength(req)
+	hasBody := body != nil
 
 	cc.mu.Lock()
+	cc.lastActive = time.Now()
 	if cc.closed || !cc.canTakeNewRequestLocked() {
 		cc.mu.Unlock()
 		return nil, errClientConnUnusable
 	}
 
-	cs := cc.newStream()
-	cs.req = req
-	hasBody := body != nil
-
 	// TODO(bradfitz): this is a copy of the logic in net/http. Unify somewhere?
+	var requestedGzip bool
 	if !cc.t.disableCompression() &&
 		req.Header.Get("Accept-Encoding") == "" &&
 		req.Header.Get("Range") == "" &&
@@ -621,37 +698,49 @@ func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
 		// We don't request gzip if the request is for a range, since
 		// auto-decoding a portion of a gzipped document will just fail
 		// anyway. See https://golang.org/issue/8923
-		cs.requestedGzip = true
+		requestedGzip = true
 	}
 
 	// we send: HEADERS{1}, CONTINUATION{0,} + DATA{0,} (DATA is
 	// sent by writeRequestBody below, along with any Trailers,
 	// again in form HEADERS{1}, CONTINUATION{0,})
-	hdrs := cc.encodeHeaders(req, cs.requestedGzip, trailers, contentLen)
+	hdrs, err := cc.encodeHeaders(req, requestedGzip, trailers, contentLen)
+	if err != nil {
+		cc.mu.Unlock()
+		return nil, err
+	}
+
+	cs := cc.newStream()
+	cs.req = req
+	cs.trace = requestTrace(req)
+	cs.requestedGzip = requestedGzip
+	bodyWriter := cc.t.getBodyWriterState(cs, body)
+	cs.on100 = bodyWriter.on100
+
 	cc.wmu.Lock()
 	endStream := !hasBody && !hasTrailers
 	werr := cc.writeHeaders(cs.ID, endStream, hdrs)
 	cc.wmu.Unlock()
+	traceWroteHeaders(cs.trace)
 	cc.mu.Unlock()
 
 	if werr != nil {
 		if hasBody {
 			req.Body.Close() // per RoundTripper contract
+			bodyWriter.cancel()
 		}
 		cc.forgetStreamID(cs.ID)
 		// Don't bother sending a RST_STREAM (our write already failed;
 		// no need to keep writing)
+		traceWroteRequest(cs.trace, werr)
 		return nil, werr
 	}
 
 	var respHeaderTimer <-chan time.Time
-	var bodyCopyErrc chan error // result of body copy
 	if hasBody {
-		bodyCopyErrc = make(chan error, 1)
-		go func() {
-			bodyCopyErrc <- cs.writeRequestBody(body, req.Body)
-		}()
+		bodyWriter.scheduleBodyWrite()
 	} else {
+		traceWroteRequest(cs.trace, nil)
 		if d := cc.responseHeaderTimeout(); d != 0 {
 			timer := time.NewTimer(d)
 			defer timer.Stop()
@@ -660,45 +749,61 @@ func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
 	}
 
 	readLoopResCh := cs.resc
-	requestCanceledCh := requestCancel(req)
 	bodyWritten := false
+	ctx := reqContext(req)
+
+	handleReadLoopResponse := func(re resAndError) (*http.Response, error) {
+		res := re.res
+		if re.err != nil || res.StatusCode > 299 {
+			// On error or status code 3xx, 4xx, 5xx, etc abort any
+			// ongoing write, assuming that the server doesn't care
+			// about our request body. If the server replied with 1xx or
+			// 2xx, however, then assume the server DOES potentially
+			// want our body (e.g. full-duplex streaming:
+			// golang.org/issue/13444). If it turns out the server
+			// doesn't, they'll RST_STREAM us soon enough.  This is a
+			// heuristic to avoid adding knobs to Transport.  Hopefully
+			// we can keep it.
+			bodyWriter.cancel()
+			cs.abortRequestBodyWrite(errStopReqBodyWrite)
+		}
+		if re.err != nil {
+			cc.forgetStreamID(cs.ID)
+			return nil, re.err
+		}
+		res.Request = req
+		res.TLS = cc.tlsState
+		return res, nil
+	}
 
 	for {
 		select {
 		case re := <-readLoopResCh:
-			res := re.res
-			if re.err != nil || res.StatusCode > 299 {
-				// On error or status code 3xx, 4xx, 5xx, etc abort any
-				// ongoing write, assuming that the server doesn't care
-				// about our request body. If the server replied with 1xx or
-				// 2xx, however, then assume the server DOES potentially
-				// want our body (e.g. full-duplex streaming:
-				// golang.org/issue/13444). If it turns out the server
-				// doesn't, they'll RST_STREAM us soon enough.  This is a
-				// heuristic to avoid adding knobs to Transport.  Hopefully
-				// we can keep it.
-				cs.abortRequestBodyWrite(errStopReqBodyWrite)
-			}
-			if re.err != nil {
-				cc.forgetStreamID(cs.ID)
-				return nil, re.err
-			}
-			res.Request = req
-			res.TLS = cc.tlsState
-			return res, nil
+			return handleReadLoopResponse(re)
 		case <-respHeaderTimer:
 			cc.forgetStreamID(cs.ID)
 			if !hasBody || bodyWritten {
 				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
 			} else {
+				bodyWriter.cancel()
 				cs.abortRequestBodyWrite(errStopReqBodyWriteAndCancel)
 			}
 			return nil, errTimeout
-		case <-requestCanceledCh:
+		case <-ctx.Done():
 			cc.forgetStreamID(cs.ID)
 			if !hasBody || bodyWritten {
 				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
 			} else {
+				bodyWriter.cancel()
+				cs.abortRequestBodyWrite(errStopReqBodyWriteAndCancel)
+			}
+			return nil, ctx.Err()
+		case <-req.Cancel:
+			cc.forgetStreamID(cs.ID)
+			if !hasBody || bodyWritten {
+				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+			} else {
+				bodyWriter.cancel()
 				cs.abortRequestBodyWrite(errStopReqBodyWriteAndCancel)
 			}
 			return nil, errRequestCanceled
@@ -707,7 +812,13 @@ func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
 			// stream from the streams map; no need for
 			// forgetStreamID.
 			return nil, cs.resetErr
-		case err := <-bodyCopyErrc:
+		case err := <-bodyWriter.resc:
+			// Prefer the read loop's response, if available. Issue 16102.
+			select {
+			case re := <-readLoopResCh:
+				return handleReadLoopResponse(re)
+			default:
+			}
 			if err != nil {
 				return nil, err
 			}
@@ -768,6 +879,7 @@ func (cs *clientStream) writeRequestBody(body io.Reader, bodyCloser io.Closer) (
 	defer cc.putFrameScratchBuffer(buf)
 
 	defer func() {
+		traceWroteRequest(cs.trace, err)
 		// TODO: write h12Compare test showing whether
 		// Request.Body is closed by the Transport,
 		// and in multiple cases: server replies <=299 and >299
@@ -864,7 +976,7 @@ func (cs *clientStream) awaitFlowControl(maxBytes int) (taken int32, err error)
 		if cs.stopReqBody != nil {
 			return 0, cs.stopReqBody
 		}
-		if err := cs.checkReset(); err != nil {
+		if err := cs.checkResetOrDone(); err != nil {
 			return 0, err
 		}
 		if a := cs.flow.available(); a > 0 {
@@ -891,7 +1003,7 @@ type badStringError struct {
 func (e *badStringError) Error() string { return fmt.Sprintf("%s %q", e.what, e.str) }
 
 // requires cc.mu be held.
-func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trailers string, contentLength int64) []byte {
+func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trailers string, contentLength int64) ([]byte, error) {
 	cc.hbuf.Reset()
 
 	host := req.Host
@@ -899,6 +1011,20 @@ func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trail
 		host = req.URL.Host
 	}
 
+	// Check for any invalid headers and return an error before we
+	// potentially pollute our hpack state. (We want to be able to
+	// continue to reuse the hpack encoder for future requests)
+	for k, vv := range req.Header {
+		if !httplex.ValidHeaderFieldName(k) {
+			return nil, fmt.Errorf("invalid HTTP header name %q", k)
+		}
+		for _, v := range vv {
+			if !httplex.ValidHeaderFieldValue(v) {
+				return nil, fmt.Errorf("invalid HTTP header value %q for header %q", v, k)
+			}
+		}
+	}
+
 	// 8.1.2.3 Request Pseudo-Header Fields
 	// The :path pseudo-header field includes the path and query parts of the
 	// target URI (the path-absolute production and optionally a '?' character
@@ -917,13 +1043,21 @@ func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trail
 	var didUA bool
 	for k, vv := range req.Header {
 		lowKey := strings.ToLower(k)
-		if lowKey == "host" || lowKey == "content-length" {
+		switch lowKey {
+		case "host", "content-length":
+			// Host is :authority, already sent.
+			// Content-Length is automatic, set below.
 			continue
-		}
-		if lowKey == "user-agent" {
+		case "connection", "proxy-connection", "transfer-encoding", "upgrade", "keep-alive":
+			// Per 8.1.2.2 Connection-Specific Header
+			// Fields, don't send connection-specific
+			// fields. We have already checked if any
+			// are error-worthy so just ignore the rest.
+			continue
+		case "user-agent":
 			// Match Go's http1 behavior: at most one
-			// User-Agent.  If set to nil or empty string,
-			// then omit it.  Otherwise if not mentioned,
+			// User-Agent. If set to nil or empty string,
+			// then omit it. Otherwise if not mentioned,
 			// include the default (below).
 			didUA = true
 			if len(vv) < 1 {
@@ -947,7 +1081,7 @@ func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trail
 	if !didUA {
 		cc.writeHeader("user-agent", defaultUserAgent)
 	}
-	return cc.hbuf.Bytes()
+	return cc.hbuf.Bytes(), nil
 }
 
 // shouldSendReqContentLength reports whether the http2.Transport should send
@@ -1025,25 +1159,19 @@ func (cc *ClientConn) streamByID(id uint32, andRemove bool) *clientStream {
 	defer cc.mu.Unlock()
 	cs := cc.streams[id]
 	if andRemove && cs != nil && !cc.closed {
+		cc.lastActive = time.Now()
 		delete(cc.streams, id)
 		close(cs.done)
+		cc.cond.Broadcast() // wake up checkResetOrDone via clientStream.awaitFlowControl
 	}
 	return cs
 }
 
 // clientConnReadLoop is the state owned by the clientConn's frame-reading readLoop.
 type clientConnReadLoop struct {
-	cc        *ClientConn
-	activeRes map[uint32]*clientStream // keyed by streamID
-
-	hdec *hpack.Decoder
-
-	// Fields reset on each HEADERS:
-	nextRes              *http.Response
-	sawRegHeader         bool  // saw non-pseudo header
-	reqMalformed         error // non-nil once known to be malformed
-	lastHeaderEndsStream bool
-	headerListSize       int64 // actually uint32, but easier math this way
+	cc            *ClientConn
+	activeRes     map[uint32]*clientStream // keyed by streamID
+	closeWhenIdle bool
 }
 
 // readLoop runs in its own goroutine and reads and dispatches frames.
@@ -1052,7 +1180,6 @@ func (cc *ClientConn) readLoop() {
 		cc:        cc,
 		activeRes: make(map[uint32]*clientStream),
 	}
-	rl.hdec = hpack.NewDecoder(initialHeaderTableSize, rl.onNewHeaderField)
 
 	defer rl.cleanup()
 	cc.readerErr = rl.run()
@@ -1063,6 +1190,19 @@ func (cc *ClientConn) readLoop() {
 	}
 }
 
+// GoAwayError is returned by the Transport when the server closes the
+// TCP connection after sending a GOAWAY frame.
+type GoAwayError struct {
+	LastStreamID uint32
+	ErrCode      ErrCode
+	DebugData    string
+}
+
+func (e GoAwayError) Error() string {
+	return fmt.Sprintf("http2: server sent GOAWAY and closed the connection; LastStreamID=%v, ErrCode=%v, debug=%q",
+		e.LastStreamID, e.ErrCode, e.DebugData)
+}
+
 func (rl *clientConnReadLoop) cleanup() {
 	cc := rl.cc
 	defer cc.tconn.Close()
@@ -1073,10 +1213,18 @@ func (rl *clientConnReadLoop) cleanup() {
 	// TODO: also do this if we've written the headers but not
 	// gotten a response yet.
 	err := cc.readerErr
+	cc.mu.Lock()
 	if err == io.EOF {
-		err = io.ErrUnexpectedEOF
+		if cc.goAway != nil {
+			err = GoAwayError{
+				LastStreamID: cc.goAway.LastStreamID,
+				ErrCode:      cc.goAway.ErrCode,
+				DebugData:    cc.goAwayDebug,
+			}
+		} else {
+			err = io.ErrUnexpectedEOF
+		}
 	}
-	cc.mu.Lock()
 	for _, cs := range rl.activeRes {
 		cs.bufPipe.CloseWithError(err)
 	}
@@ -1094,7 +1242,7 @@ func (rl *clientConnReadLoop) cleanup() {
 
 func (rl *clientConnReadLoop) run() error {
 	cc := rl.cc
-	closeWhenIdle := cc.t.disableKeepAlives()
+	rl.closeWhenIdle = cc.t.disableKeepAlives() || cc.singleUse
 	gotReply := false // ever saw a reply
 	for {
 		f, err := cc.fr.ReadFrame()
@@ -1102,8 +1250,10 @@ func (rl *clientConnReadLoop) run() error {
 			cc.vlogf("Transport readFrame error: (%T) %v", err, err)
 		}
 		if se, ok := err.(StreamError); ok {
-			// TODO: deal with stream errors from the framer.
-			return se
+			if cs := cc.streamByID(se.StreamID, true /*ended; remove it*/); cs != nil {
+				rl.endStreamError(cs, cc.fr.errDetail)
+			}
+			continue
 		} else if err != nil {
 			return err
 		}
@@ -1113,13 +1263,10 @@ func (rl *clientConnReadLoop) run() error {
 		maybeIdle := false // whether frame might transition us to idle
 
 		switch f := f.(type) {
-		case *HeadersFrame:
+		case *MetaHeadersFrame:
 			err = rl.processHeaders(f)
 			maybeIdle = true
 			gotReply = true
-		case *ContinuationFrame:
-			err = rl.processContinuation(f)
-			maybeIdle = true
 		case *DataFrame:
 			err = rl.processData(f)
 			maybeIdle = true
@@ -1143,98 +1290,116 @@ func (rl *clientConnReadLoop) run() error {
 		if err != nil {
 			return err
 		}
-		if closeWhenIdle && gotReply && maybeIdle && len(rl.activeRes) == 0 {
+		if rl.closeWhenIdle && gotReply && maybeIdle && len(rl.activeRes) == 0 {
 			cc.closeIfIdle()
 		}
 	}
 }
 
-func (rl *clientConnReadLoop) processHeaders(f *HeadersFrame) error {
-	rl.sawRegHeader = false
-	rl.reqMalformed = nil
-	rl.lastHeaderEndsStream = f.StreamEnded()
-	rl.headerListSize = 0
-	rl.nextRes = &http.Response{
-		Proto:      "HTTP/2.0",
-		ProtoMajor: 2,
-		Header:     make(http.Header),
-	}
-	rl.hdec.SetEmitEnabled(true)
-	return rl.processHeaderBlockFragment(f.HeaderBlockFragment(), f.StreamID, f.HeadersEnded())
-}
-
-func (rl *clientConnReadLoop) processContinuation(f *ContinuationFrame) error {
-	return rl.processHeaderBlockFragment(f.HeaderBlockFragment(), f.StreamID, f.HeadersEnded())
-}
-
-func (rl *clientConnReadLoop) processHeaderBlockFragment(frag []byte, streamID uint32, finalFrag bool) error {
+func (rl *clientConnReadLoop) processHeaders(f *MetaHeadersFrame) error {
 	cc := rl.cc
-	streamEnded := rl.lastHeaderEndsStream
-	cs := cc.streamByID(streamID, streamEnded && finalFrag)
+	cs := cc.streamByID(f.StreamID, f.StreamEnded())
 	if cs == nil {
 		// We'd get here if we canceled a request while the
-		// server was mid-way through replying with its
-		// headers. (The case of a CONTINUATION arriving
-		// without HEADERS would be rejected earlier by the
-		// Framer). So if this was just something we canceled,
-		// ignore it.
+		// server had its response still in flight. So if this
+		// was just something we canceled, ignore it.
 		return nil
 	}
-	if cs.pastHeaders {
-		rl.hdec.SetEmitFunc(func(f hpack.HeaderField) { rl.onNewTrailerField(cs, f) })
-	} else {
-		rl.hdec.SetEmitFunc(rl.onNewHeaderField)
-	}
-	_, err := rl.hdec.Write(frag)
-	if err != nil {
-		return ConnectionError(ErrCodeCompression)
-	}
-	if finalFrag {
-		if err := rl.hdec.Close(); err != nil {
-			return ConnectionError(ErrCodeCompression)
+	if !cs.firstByte {
+		if cs.trace != nil {
+			// TODO(bradfitz): move first response byte earlier,
+			// when we first read the 9 byte header, not waiting
+			// until all the HEADERS+CONTINUATION frames have been
+			// merged. This works for now.
+			traceFirstResponseByte(cs.trace)
 		}
+		cs.firstByte = true
 	}
-
-	if !finalFrag {
-		return nil
-	}
-
 	if !cs.pastHeaders {
 		cs.pastHeaders = true
 	} else {
-		// We're dealing with trailers. (and specifically the
-		// final frame of headers)
-		if cs.pastTrailers {
-			// Too many HEADERS frames for this stream.
-			return ConnectionError(ErrCodeProtocol)
-		}
-		cs.pastTrailers = true
-		if !streamEnded {
-			// We expect that any header block fragment
-			// frame for trailers with END_HEADERS also
-			// has END_STREAM.
-			return ConnectionError(ErrCodeProtocol)
+		return rl.processTrailers(cs, f)
+	}
+
+	res, err := rl.handleResponse(cs, f)
+	if err != nil {
+		if _, ok := err.(ConnectionError); ok {
+			return err
 		}
-		rl.endStream(cs)
+		// Any other error type is a stream error.
+		cs.cc.writeStreamReset(f.StreamID, ErrCodeProtocol, err)
+		cs.resc <- resAndError{err: err}
+		return nil // return nil from process* funcs to keep conn alive
+	}
+	if res == nil {
+		// (nil, nil) special case. See handleResponse docs.
 		return nil
 	}
+	if res.Body != noBody {
+		rl.activeRes[cs.ID] = cs
+	}
+	cs.resTrailer = &res.Trailer
+	cs.resc <- resAndError{res: res}
+	return nil
+}
 
-	if rl.reqMalformed != nil {
-		cs.resc <- resAndError{err: rl.reqMalformed}
-		rl.cc.writeStreamReset(cs.ID, ErrCodeProtocol, rl.reqMalformed)
-		return nil
+// may return error types nil, or ConnectionError. Any other error value
+// is a StreamError of type ErrCodeProtocol. The returned error in that case
+// is the detail.
+//
+// As a special case, handleResponse may return (nil, nil) to skip the
+// frame (currently only used for 100 expect continue). This special
+// case is going away after Issue 13851 is fixed.
+func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFrame) (*http.Response, error) {
+	if f.Truncated {
+		return nil, errResponseHeaderListSize
 	}
 
-	res := rl.nextRes
+	status := f.PseudoValue("status")
+	if status == "" {
+		return nil, errors.New("missing status pseudo header")
+	}
+	statusCode, err := strconv.Atoi(status)
+	if err != nil {
+		return nil, errors.New("malformed non-numeric status pseudo header")
+	}
 
-	if res.StatusCode == 100 {
-		// Just skip 100-continue response headers for now.
-		// TODO: golang.org/issue/13851 for doing it properly.
+	if statusCode == 100 {
+		traceGot100Continue(cs.trace)
+		if cs.on100 != nil {
+			cs.on100() // forces any write delay timer to fire
+		}
 		cs.pastHeaders = false // do it all again
-		return nil
+		return nil, nil
+	}
+
+	header := make(http.Header)
+	res := &http.Response{
+		Proto:      "HTTP/2.0",
+		ProtoMajor: 2,
+		Header:     header,
+		StatusCode: statusCode,
+		Status:     status + " " + http.StatusText(statusCode),
+	}
+	for _, hf := range f.RegularFields() {
+		key := http.CanonicalHeaderKey(hf.Name)
+		if key == "Trailer" {
+			t := res.Trailer
+			if t == nil {
+				t = make(http.Header)
+				res.Trailer = t
+			}
+			foreachHeaderElement(hf.Value, func(v string) {
+				t[http.CanonicalHeaderKey(v)] = nil
+			})
+		} else {
+			header[key] = append(header[key], hf.Value)
+		}
 	}
 
-	if !streamEnded || cs.req.Method == "HEAD" {
+	streamEnded := f.StreamEnded()
+	isHead := cs.req.Method == "HEAD"
+	if !streamEnded || isHead {
 		res.ContentLength = -1
 		if clens := res.Header["Content-Length"]; len(clens) == 1 {
 			if clen64, err := strconv.ParseInt(clens[0], 10, 64); err == nil {
@@ -1249,27 +1414,52 @@ func (rl *clientConnReadLoop) processHeaderBlockFragment(frag []byte, streamID u
 		}
 	}
 
-	if streamEnded {
+	if streamEnded || isHead {
 		res.Body = noBody
-	} else {
-		buf := new(bytes.Buffer) // TODO(bradfitz): recycle this garbage
-		cs.bufPipe = pipe{b: buf}
-		cs.bytesRemain = res.ContentLength
-		res.Body = transportResponseBody{cs}
-		go cs.awaitRequestCancel(requestCancel(cs.req))
-
-		if cs.requestedGzip && res.Header.Get("Content-Encoding") == "gzip" {
-			res.Header.Del("Content-Encoding")
-			res.Header.Del("Content-Length")
-			res.ContentLength = -1
-			res.Body = &gzipReader{body: res.Body}
-		}
+		return res, nil
 	}
 
-	cs.resTrailer = &res.Trailer
-	rl.activeRes[cs.ID] = cs
-	cs.resc <- resAndError{res: res}
-	rl.nextRes = nil // unused now; will be reset next HEADERS frame
+	buf := new(bytes.Buffer) // TODO(bradfitz): recycle this garbage
+	cs.bufPipe = pipe{b: buf}
+	cs.bytesRemain = res.ContentLength
+	res.Body = transportResponseBody{cs}
+	go cs.awaitRequestCancel(cs.req)
+
+	if cs.requestedGzip && res.Header.Get("Content-Encoding") == "gzip" {
+		res.Header.Del("Content-Encoding")
+		res.Header.Del("Content-Length")
+		res.ContentLength = -1
+		res.Body = &gzipReader{body: res.Body}
+		setResponseUncompressed(res)
+	}
+	return res, nil
+}
+
+func (rl *clientConnReadLoop) processTrailers(cs *clientStream, f *MetaHeadersFrame) error {
+	if cs.pastTrailers {
+		// Too many HEADERS frames for this stream.
+		return ConnectionError(ErrCodeProtocol)
+	}
+	cs.pastTrailers = true
+	if !f.StreamEnded() {
+		// We expect that any headers for trailers also
+		// has END_STREAM.
+		return ConnectionError(ErrCodeProtocol)
+	}
+	if len(f.PseudoFields()) > 0 {
+		// No pseudo header fields are defined for trailers.
+		// TODO: ConnectionError might be overly harsh? Check.
+		return ConnectionError(ErrCodeProtocol)
+	}
+
+	trailer := make(http.Header)
+	for _, hf := range f.RegularFields() {
+		key := http.CanonicalHeaderKey(hf.Name)
+		trailer[key] = append(trailer[key], hf.Value)
+	}
+	cs.trailer = trailer
+
+	rl.endStream(cs)
 	return nil
 }
 
@@ -1320,8 +1510,12 @@ func (b transportResponseBody) Read(p []byte) (n int, err error) {
 		cc.inflow.add(connAdd)
 	}
 	if err == nil { // No need to refresh if the stream is over or failed.
-		if v := cs.inflow.available(); v < transportDefaultStreamFlow-transportDefaultStreamMinRefresh {
-			streamAdd = transportDefaultStreamFlow - v
+		// Consider any buffered body data (read from the conn but not
+		// consumed by the client) when computing flow control for this
+		// stream.
+		v := int(cs.inflow.available()) + cs.bufPipe.Len()
+		if v < transportDefaultStreamFlow-transportDefaultStreamMinRefresh {
+			streamAdd = int32(transportDefaultStreamFlow - v)
 			cs.inflow.add(streamAdd)
 		}
 	}
@@ -1343,10 +1537,27 @@ var errClosedResponseBody = errors.New("http2: response body closed")
 
 func (b transportResponseBody) Close() error {
 	cs := b.cs
-	if cs.bufPipe.Err() != io.EOF {
-		// TODO: write test for this
-		cs.cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
+	cc := cs.cc
+
+	serverSentStreamEnd := cs.bufPipe.Err() == io.EOF
+	unread := cs.bufPipe.Len()
+
+	if unread > 0 || !serverSentStreamEnd {
+		cc.mu.Lock()
+		cc.wmu.Lock()
+		if !serverSentStreamEnd {
+			cc.fr.WriteRSTStream(cs.ID, ErrCodeCancel)
+		}
+		// Return connection-level flow control.
+		if unread > 0 {
+			cc.inflow.add(int32(unread))
+			cc.fr.WriteWindowUpdate(0, uint32(unread))
+		}
+		cc.bw.Flush()
+		cc.wmu.Unlock()
+		cc.mu.Unlock()
 	}
+
 	cs.bufPipe.BreakWithError(errClosedResponseBody)
 	return nil
 }
@@ -1354,6 +1565,7 @@ func (b transportResponseBody) Close() error {
 func (rl *clientConnReadLoop) processData(f *DataFrame) error {
 	cc := rl.cc
 	cs := cc.streamByID(f.StreamID, f.StreamEnded())
+	data := f.Data()
 	if cs == nil {
 		cc.mu.Lock()
 		neverSent := cc.nextStreamID
@@ -1367,9 +1579,17 @@ func (rl *clientConnReadLoop) processData(f *DataFrame) error {
 		// TODO: be stricter here? only silently ignore things which
 		// we canceled, but not things which were closed normally
 		// by the peer? Tough without accumulating too much state.
+
+		// But at least return their flow control:
+		if len(data) > 0 {
+			cc.wmu.Lock()
+			cc.fr.WriteWindowUpdate(0, uint32(len(data)))
+			cc.bw.Flush()
+			cc.wmu.Unlock()
+		}
 		return nil
 	}
-	if data := f.Data(); len(data) > 0 {
+	if len(data) > 0 {
 		if cs.bufPipe.b == nil {
 			// Data frame after it's already closed?
 			cc.logf("http2: Transport received DATA frame for closed stream; closing connection")
@@ -1387,6 +1607,7 @@ func (rl *clientConnReadLoop) processData(f *DataFrame) error {
 		cc.mu.Unlock()
 
 		if _, err := cs.bufPipe.Write(data); err != nil {
+			rl.endStreamError(cs, err)
 			return err
 		}
 	}
@@ -1402,14 +1623,20 @@ var errInvalidTrailers = errors.New("http2: invalid trailers")
 func (rl *clientConnReadLoop) endStream(cs *clientStream) {
 	// TODO: check that any declared content-length matches, like
 	// server.go's (*stream).endStream method.
-	err := io.EOF
-	code := cs.copyTrailers
-	if rl.reqMalformed != nil {
-		err = rl.reqMalformed
-		code = nil
+	rl.endStreamError(cs, nil)
+}
+
+func (rl *clientConnReadLoop) endStreamError(cs *clientStream, err error) {
+	var code func()
+	if err == nil {
+		err = io.EOF
+		code = cs.copyTrailers
 	}
 	cs.bufPipe.closeWithErrorAndCode(err, code)
 	delete(rl.activeRes, cs.ID)
+	if isConnectionCloseRequest(cs.req) {
+		rl.closeWhenIdle = true
+	}
 }
 
 func (cs *clientStream) copyTrailers() {
@@ -1496,7 +1723,7 @@ func (rl *clientConnReadLoop) processResetStream(f *RSTStreamFrame) error {
 		cs.resetErr = err
 		close(cs.peerReset)
 		cs.bufPipe.CloseWithError(err)
-		cs.cc.cond.Broadcast() // wake up checkReset via clientStream.awaitFlowControl
+		cs.cc.cond.Broadcast() // wake up checkResetOrDone via clientStream.awaitFlowControl
 	}
 	delete(rl.activeRes, cs.ID)
 	return nil
@@ -1529,8 +1756,10 @@ func (rl *clientConnReadLoop) processPushPromise(f *PushPromiseFrame) error {
 }
 
 func (cc *ClientConn) writeStreamReset(streamID uint32, code ErrCode, err error) {
-	// TODO: do something with err? send it as a debug frame to the peer?
-	// But that's only in GOAWAY. Invent a new frame type? Is there one already?
+	// TODO: map err to more interesting error codes, once the
+	// HTTP community comes up with some. But currently for
+	// RST_STREAM there's no equivalent to GOAWAY frame's debug
+	// data, and the error codes are all pretty vague ("cancel").
 	cc.wmu.Lock()
 	cc.fr.WriteRSTStream(streamID, code)
 	cc.bw.Flush()
@@ -1542,118 +1771,6 @@ var (
 	errPseudoTrailers         = errors.New("http2: invalid pseudo header in trailers")
 )
 
-func (rl *clientConnReadLoop) checkHeaderField(f hpack.HeaderField) bool {
-	if rl.reqMalformed != nil {
-		return false
-	}
-
-	const headerFieldOverhead = 32 // per spec
-	rl.headerListSize += int64(len(f.Name)) + int64(len(f.Value)) + headerFieldOverhead
-	if max := rl.cc.t.maxHeaderListSize(); max != 0 && rl.headerListSize > int64(max) {
-		rl.hdec.SetEmitEnabled(false)
-		rl.reqMalformed = errResponseHeaderListSize
-		return false
-	}
-
-	if !validHeaderFieldValue(f.Value) {
-		rl.reqMalformed = errInvalidHeaderFieldValue
-		return false
-	}
-
-	isPseudo := strings.HasPrefix(f.Name, ":")
-	if isPseudo {
-		if rl.sawRegHeader {
-			rl.reqMalformed = errors.New("http2: invalid pseudo header after regular header")
-			return false
-		}
-	} else {
-		if !validHeaderFieldName(f.Name) {
-			rl.reqMalformed = errInvalidHeaderFieldName
-			return false
-		}
-		rl.sawRegHeader = true
-	}
-
-	return true
-}
-
-// onNewHeaderField runs on the readLoop goroutine whenever a new
-// hpack header field is decoded.
-func (rl *clientConnReadLoop) onNewHeaderField(f hpack.HeaderField) {
-	cc := rl.cc
-	if VerboseLogs {
-		cc.logf("http2: Transport decoded %v", f)
-	}
-
-	if !rl.checkHeaderField(f) {
-		return
-	}
-
-	isPseudo := strings.HasPrefix(f.Name, ":")
-	if isPseudo {
-		switch f.Name {
-		case ":status":
-			code, err := strconv.Atoi(f.Value)
-			if err != nil {
-				rl.reqMalformed = errors.New("http2: invalid :status")
-				return
-			}
-			rl.nextRes.Status = f.Value + " " + http.StatusText(code)
-			rl.nextRes.StatusCode = code
-		default:
-			// "Endpoints MUST NOT generate pseudo-header
-			// fields other than those defined in this
-			// document."
-			rl.reqMalformed = fmt.Errorf("http2: unknown response pseudo header %q", f.Name)
-		}
-		return
-	}
-
-	key := http.CanonicalHeaderKey(f.Name)
-	if key == "Trailer" {
-		t := rl.nextRes.Trailer
-		if t == nil {
-			t = make(http.Header)
-			rl.nextRes.Trailer = t
-		}
-		foreachHeaderElement(f.Value, func(v string) {
-			t[http.CanonicalHeaderKey(v)] = nil
-		})
-	} else {
-		rl.nextRes.Header.Add(key, f.Value)
-	}
-}
-
-func (rl *clientConnReadLoop) onNewTrailerField(cs *clientStream, f hpack.HeaderField) {
-	if VerboseLogs {
-		rl.cc.logf("http2: Transport decoded trailer %v", f)
-	}
-	if !rl.checkHeaderField(f) {
-		return
-	}
-	if strings.HasPrefix(f.Name, ":") {
-		// Pseudo-header fields MUST NOT appear in
-		// trailers. Endpoints MUST treat a request or
-		// response that contains undefined or invalid
-		// pseudo-header fields as malformed.
-		rl.reqMalformed = errPseudoTrailers
-		return
-	}
-
-	key := http.CanonicalHeaderKey(f.Name)
-
-	// The spec says one must predeclare their trailers but in practice
-	// popular users (which is to say the only user we found) do not so we
-	// violate the spec and accept all of them.
-	const acceptAllTrailers = true
-	if _, ok := (*cs.resTrailer)[key]; ok || acceptAllTrailers {
-		if cs.trailer == nil {
-			cs.trailer = make(http.Header)
-		}
-		cs.trailer[key] = append(cs.trailer[key], f.Value)
-	}
-}
-
 func (cc *ClientConn) logf(format string, args ...interface{}) {
 	cc.t.logf(format, args...)
 }
@@ -1691,13 +1808,18 @@ func (rt erringRoundTripper) RoundTrip(*http.Request) (*http.Response, error) {
 // call gzip.NewReader on the first call to Read
 type gzipReader struct {
 	body io.ReadCloser // underlying Response.Body
-	zr   io.Reader     // lazily-initialized gzip reader
+	zr   *gzip.Reader  // lazily-initialized gzip reader
+	zerr error         // sticky error
 }
 
 func (gz *gzipReader) Read(p []byte) (n int, err error) {
+	if gz.zerr != nil {
+		return 0, gz.zerr
+	}
 	if gz.zr == nil {
 		gz.zr, err = gzip.NewReader(gz.body)
 		if err != nil {
+			gz.zerr = err
 			return 0, err
 		}
 	}
@@ -1711,3 +1833,85 @@ func (gz *gzipReader) Close() error {
 type errorReader struct{ err error }
 
 func (r errorReader) Read(p []byte) (int, error) { return 0, r.err }
+
+// bodyWriterState encapsulates various state around the Transport's writing
+// of the request body, particularly regarding doing delayed writes of the body
+// when the request contains "Expect: 100-continue".
+type bodyWriterState struct {
+	cs     *clientStream
+	timer  *time.Timer   // if non-nil, we're doing a delayed write
+	fnonce *sync.Once    // to call fn with
+	fn     func()        // the code to run in the goroutine, writing the body
+	resc   chan error    // result of fn's execution
+	delay  time.Duration // how long we should delay a delayed write for
+}
+
+func (t *Transport) getBodyWriterState(cs *clientStream, body io.Reader) (s bodyWriterState) {
+	s.cs = cs
+	if body == nil {
+		return
+	}
+	resc := make(chan error, 1)
+	s.resc = resc
+	s.fn = func() {
+		resc <- cs.writeRequestBody(body, cs.req.Body)
+	}
+	s.delay = t.expectContinueTimeout()
+	if s.delay == 0 ||
+		!httplex.HeaderValuesContainsToken(
+			cs.req.Header["Expect"],
+			"100-continue") {
+		return
+	}
+	s.fnonce = new(sync.Once)
+
+	// Arm the timer with a very large duration, which we'll
+	// intentionally lower later. It has to be large now because
+	// we need a handle to it before writing the headers, but the
+	// s.delay value is defined to not start until after the
+	// request headers were written.
+	const hugeDuration = 365 * 24 * time.Hour
+	s.timer = time.AfterFunc(hugeDuration, func() {
+		s.fnonce.Do(s.fn)
+	})
+	return
+}
+
+func (s bodyWriterState) cancel() {
+	if s.timer != nil {
+		s.timer.Stop()
+	}
+}
+
+func (s bodyWriterState) on100() {
+	if s.timer == nil {
+		// If we didn't do a delayed write, ignore the server's
+		// bogus 100 continue response.
+		return
+	}
+	s.timer.Stop()
+	go func() { s.fnonce.Do(s.fn) }()
+}
+
+// scheduleBodyWrite starts writing the body, either immediately (in
+// the common case) or after the delay timeout. It should not be
+// called until after the headers have been written.
+func (s bodyWriterState) scheduleBodyWrite() {
+	if s.timer == nil {
+		// We're not doing a delayed write (see
+		// getBodyWriterState), so just start the writing
+		// goroutine immediately.
+		go s.fn()
+		return
+	}
+	traceWait100Continue(s.cs.trace)
+	if s.timer.Stop() {
+		s.timer.Reset(s.delay)
+	}
+}
+
+// isConnectionCloseRequest reports whether req should use its own
+// connection for a single request and then close the connection.
+func isConnectionCloseRequest(req *http.Request) bool {
+	return req.Close || httplex.HeaderValuesContainsToken(req.Header["Connection"], "close")
+}
diff --git a/vendor/golang.org/x/net/http2/write.go b/vendor/golang.org/x/net/http2/write.go
index 5297a4bfe3..27ef0dd4d7 100644
--- a/vendor/golang.org/x/net/http2/write.go
+++ b/vendor/golang.org/x/net/http2/write.go
@@ -9,10 +9,10 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"sort"
 	"time"
 
 	"golang.org/x/net/http2/hpack"
+	"golang.org/x/net/lex/httplex"
 )
 
 // writeFramer is implemented by any type that is used to write frames.
@@ -230,25 +230,26 @@ func (wu writeWindowUpdate) writeFrame(ctx writeContext) error {
 }
 
 func encodeHeaders(enc *hpack.Encoder, h http.Header, keys []string) {
-	// TODO: garbage. pool sorters like http1? hot path for 1 key?
 	if keys == nil {
-		keys = make([]string, 0, len(h))
-		for k := range h {
-			keys = append(keys, k)
-		}
-		sort.Strings(keys)
+		sorter := sorterPool.Get().(*sorter)
+		// Using defer here, since the returned keys from the
+		// sorter.Keys method is only valid until the sorter
+		// is returned:
+		defer sorterPool.Put(sorter)
+		keys = sorter.Keys(h)
 	}
 	for _, k := range keys {
 		vv := h[k]
 		k = lowerHeader(k)
-		if !validHeaderFieldName(k) {
-			// TODO: return an error? golang.org/issue/14048
-			// For now just omit it.
+		if !validWireHeaderFieldName(k) {
+			// Skip it as backup paranoia. Per
+			// golang.org/issue/14048, these should
+			// already be rejected at a higher level.
 			continue
 		}
 		isTE := k == "transfer-encoding"
 		for _, v := range vv {
-			if !validHeaderFieldValue(v) {
+			if !httplex.ValidHeaderFieldValue(v) {
 				// TODO: return an error? golang.org/issue/14048
 				// For now just omit it.
 				continue
diff --git a/vendor/golang.org/x/net/lex/httplex/httplex.go b/vendor/golang.org/x/net/lex/httplex/httplex.go
new file mode 100644
index 0000000000..bd0ec24f44
--- /dev/null
+++ b/vendor/golang.org/x/net/lex/httplex/httplex.go
@@ -0,0 +1,312 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package httplex contains rules around lexical matters of various
+// HTTP-related specifications.
+//
+// This package is shared by the standard library (which vendors it)
+// and x/net/http2. It comes with no API stability promise.
+package httplex
+
+import (
+	"strings"
+	"unicode/utf8"
+)
+
+var isTokenTable = [127]bool{
+	'!':  true,
+	'#':  true,
+	'$':  true,
+	'%':  true,
+	'&':  true,
+	'\'': true,
+	'*':  true,
+	'+':  true,
+	'-':  true,
+	'.':  true,
+	'0':  true,
+	'1':  true,
+	'2':  true,
+	'3':  true,
+	'4':  true,
+	'5':  true,
+	'6':  true,
+	'7':  true,
+	'8':  true,
+	'9':  true,
+	'A':  true,
+	'B':  true,
+	'C':  true,
+	'D':  true,
+	'E':  true,
+	'F':  true,
+	'G':  true,
+	'H':  true,
+	'I':  true,
+	'J':  true,
+	'K':  true,
+	'L':  true,
+	'M':  true,
+	'N':  true,
+	'O':  true,
+	'P':  true,
+	'Q':  true,
+	'R':  true,
+	'S':  true,
+	'T':  true,
+	'U':  true,
+	'W':  true,
+	'V':  true,
+	'X':  true,
+	'Y':  true,
+	'Z':  true,
+	'^':  true,
+	'_':  true,
+	'`':  true,
+	'a':  true,
+	'b':  true,
+	'c':  true,
+	'd':  true,
+	'e':  true,
+	'f':  true,
+	'g':  true,
+	'h':  true,
+	'i':  true,
+	'j':  true,
+	'k':  true,
+	'l':  true,
+	'm':  true,
+	'n':  true,
+	'o':  true,
+	'p':  true,
+	'q':  true,
+	'r':  true,
+	's':  true,
+	't':  true,
+	'u':  true,
+	'v':  true,
+	'w':  true,
+	'x':  true,
+	'y':  true,
+	'z':  true,
+	'|':  true,
+	'~':  true,
+}
+
+func IsTokenRune(r rune) bool {
+	i := int(r)
+	return i < len(isTokenTable) && isTokenTable[i]
+}
+
+func isNotToken(r rune) bool {
+	return !IsTokenRune(r)
+}
+
+// HeaderValuesContainsToken reports whether any string in values
+// contains the provided token, ASCII case-insensitively.
+func HeaderValuesContainsToken(values []string, token string) bool {
+	for _, v := range values {
+		if headerValueContainsToken(v, token) {
+			return true
+		}
+	}
+	return false
+}
+
+// isOWS reports whether b is an optional whitespace byte, as defined
+// by RFC 7230 section 3.2.3.
+func isOWS(b byte) bool { return b == ' ' || b == '\t' }
+
+// trimOWS returns x with all optional whitespace removes from the
+// beginning and end.
+func trimOWS(x string) string {
+	// TODO: consider using strings.Trim(x, " \t") instead,
+	// if and when it's fast enough. See issue 10292.
+	// But this ASCII-only code will probably always beat UTF-8
+	// aware code.
+	for len(x) > 0 && isOWS(x[0]) {
+		x = x[1:]
+	}
+	for len(x) > 0 && isOWS(x[len(x)-1]) {
+		x = x[:len(x)-1]
+	}
+	return x
+}
+
+// headerValueContainsToken reports whether v (assumed to be a
+// 0#element, in the ABNF extension described in RFC 7230 section 7)
+// contains token amongst its comma-separated tokens, ASCII
+// case-insensitively.
+func headerValueContainsToken(v string, token string) bool {
+	v = trimOWS(v)
+	if comma := strings.IndexByte(v, ','); comma != -1 {
+		return tokenEqual(trimOWS(v[:comma]), token) || headerValueContainsToken(v[comma+1:], token)
+	}
+	return tokenEqual(v, token)
+}
+
+// lowerASCII returns the ASCII lowercase version of b.
+func lowerASCII(b byte) byte {
+	if 'A' <= b && b <= 'Z' {
+		return b + ('a' - 'A')
+	}
+	return b
+}
+
+// tokenEqual reports whether t1 and t2 are equal, ASCII case-insensitively.
+func tokenEqual(t1, t2 string) bool {
+	if len(t1) != len(t2) {
+		return false
+	}
+	for i, b := range t1 {
+		if b >= utf8.RuneSelf {
+			// No UTF-8 or non-ASCII allowed in tokens.
+			return false
+		}
+		if lowerASCII(byte(b)) != lowerASCII(t2[i]) {
+			return false
+		}
+	}
+	return true
+}
+
+// isLWS reports whether b is linear white space, according
+// to http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2
+//      LWS            = [CRLF] 1*( SP | HT )
+func isLWS(b byte) bool { return b == ' ' || b == '\t' }
+
+// isCTL reports whether b is a control byte, according
+// to http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2
+//      CTL            = <any US-ASCII control character
+//                       (octets 0 - 31) and DEL (127)>
+func isCTL(b byte) bool {
+	const del = 0x7f // a CTL
+	return b < ' ' || b == del
+}
+
+// ValidHeaderFieldName reports whether v is a valid HTTP/1.x header name.
+// HTTP/2 imposes the additional restriction that uppercase ASCII
+// letters are not allowed.
+//
+//  RFC 7230 says:
+//   header-field   = field-name ":" OWS field-value OWS
+//   field-name     = token
+//   token          = 1*tchar
+//   tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." /
+//           "^" / "_" / "`" / "|" / "~" / DIGIT / ALPHA
+func ValidHeaderFieldName(v string) bool {
+	if len(v) == 0 {
+		return false
+	}
+	for _, r := range v {
+		if !IsTokenRune(r) {
+			return false
+		}
+	}
+	return true
+}
+
+// ValidHostHeader reports whether h is a valid host header.
+func ValidHostHeader(h string) bool {
+	// The latest spec is actually this:
+	//
+	// http://tools.ietf.org/html/rfc7230#section-5.4
+	//     Host = uri-host [ ":" port ]
+	//
+	// Where uri-host is:
+	//     http://tools.ietf.org/html/rfc3986#section-3.2.2
+	//
+	// But we're going to be much more lenient for now and just
+	// search for any byte that's not a valid byte in any of those
+	// expressions.
+	for i := 0; i < len(h); i++ {
+		if !validHostByte[h[i]] {
+			return false
+		}
+	}
+	return true
+}
+
+// See the validHostHeader comment.
+var validHostByte = [256]bool{
+	'0': true, '1': true, '2': true, '3': true, '4': true, '5': true, '6': true, '7': true,
+	'8': true, '9': true,
+
+	'a': true, 'b': true, 'c': true, 'd': true, 'e': true, 'f': true, 'g': true, 'h': true,
+	'i': true, 'j': true, 'k': true, 'l': true, 'm': true, 'n': true, 'o': true, 'p': true,
+	'q': true, 'r': true, 's': true, 't': true, 'u': true, 'v': true, 'w': true, 'x': true,
+	'y': true, 'z': true,
+
+	'A': true, 'B': true, 'C': true, 'D': true, 'E': true, 'F': true, 'G': true, 'H': true,
+	'I': true, 'J': true, 'K': true, 'L': true, 'M': true, 'N': true, 'O': true, 'P': true,
+	'Q': true, 'R': true, 'S': true, 'T': true, 'U': true, 'V': true, 'W': true, 'X': true,
+	'Y': true, 'Z': true,
+
+	'!':  true, // sub-delims
+	'$':  true, // sub-delims
+	'%':  true, // pct-encoded (and used in IPv6 zones)
+	'&':  true, // sub-delims
+	'(':  true, // sub-delims
+	')':  true, // sub-delims
+	'*':  true, // sub-delims
+	'+':  true, // sub-delims
+	',':  true, // sub-delims
+	'-':  true, // unreserved
+	'.':  true, // unreserved
+	':':  true, // IPv6address + Host expression's optional port
+	';':  true, // sub-delims
+	'=':  true, // sub-delims
+	'[':  true,
+	'\'': true, // sub-delims
+	']':  true,
+	'_':  true, // unreserved
+	'~':  true, // unreserved
+}
+
+// ValidHeaderFieldValue reports whether v is a valid "field-value" according to
+// http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2 :
+//
+//        message-header = field-name ":" [ field-value ]
+//        field-value    = *( field-content | LWS )
+//        field-content  = <the OCTETs making up the field-value
+//                         and consisting of either *TEXT or combinations
+//                         of token, separators, and quoted-string>
+//
+// http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2 :
+//
+//        TEXT           = <any OCTET except CTLs,
+//                          but including LWS>
+//        LWS            = [CRLF] 1*( SP | HT )
+//        CTL            = <any US-ASCII control character
+//                         (octets 0 - 31) and DEL (127)>
+//
+// RFC 7230 says:
+//  field-value    = *( field-content / obs-fold )
+//  obj-fold       =  N/A to http2, and deprecated
+//  field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
+//  field-vchar    = VCHAR / obs-text
+//  obs-text       = %x80-FF
+//  VCHAR          = "any visible [USASCII] character"
+//
+// http2 further says: "Similarly, HTTP/2 allows header field values
+// that are not valid. While most of the values that can be encoded
+// will not alter header field parsing, carriage return (CR, ASCII
+// 0xd), line feed (LF, ASCII 0xa), and the zero character (NUL, ASCII
+// 0x0) might be exploited by an attacker if they are translated
+// verbatim. Any request or response that contains a character not
+// permitted in a header field value MUST be treated as malformed
+// (Section 8.1.2.6). Valid characters are defined by the
+// field-content ABNF rule in Section 3.2 of [RFC7230]."
+//
+// This function does not (yet?) properly handle the rejection of
+// strings that begin or end with SP or HTAB.
+func ValidHeaderFieldValue(v string) bool {
+	for i := 0; i < len(v); i++ {
+		b := v[i]
+		if isCTL(b) && !isLWS(b) {
+			return false
+		}
+	}
+	return true
+}
diff --git a/vendor/golang.org/x/net/trace/trace.go b/vendor/golang.org/x/net/trace/trace.go
index 0767c8c69d..d860fccf9b 100644
--- a/vendor/golang.org/x/net/trace/trace.go
+++ b/vendor/golang.org/x/net/trace/trace.go
@@ -93,13 +93,17 @@ var DebugUseAfterFinish = false
 //
 // AuthRequest may be replaced by a program to customise its authorisation requirements.
 //
-// The default AuthRequest function returns (true, true) iff the request comes from localhost/127.0.0.1/[::1].
+// The default AuthRequest function returns (true, true) if and only if the request
+// comes from localhost/127.0.0.1/[::1].
 var AuthRequest = func(req *http.Request) (any, sensitive bool) {
+	// RemoteAddr is commonly in the form "IP" or "IP:port".
+	// If it is in the form "IP:port", split off the port.
 	host, _, err := net.SplitHostPort(req.RemoteAddr)
-	switch {
-	case err != nil: // Badly formed address; fail closed.
-		return false, false
-	case host == "localhost" || host == "127.0.0.1" || host == "::1":
+	if err != nil {
+		host = req.RemoteAddr
+	}
+	switch host {
+	case "localhost", "127.0.0.1", "::1":
 		return true, true
 	default:
 		return false, false
diff --git a/vendor/google.golang.org/grpc/PATENTS b/vendor/google.golang.org/grpc/PATENTS
index 619f9dbfe6..69b47959fa 100644
--- a/vendor/google.golang.org/grpc/PATENTS
+++ b/vendor/google.golang.org/grpc/PATENTS
@@ -1,22 +1,22 @@
 Additional IP Rights Grant (Patents)
 
 "This implementation" means the copyrightable works distributed by
-Google as part of the GRPC project.
+Google as part of the gRPC project.
 
 Google hereby grants to You a perpetual, worldwide, non-exclusive,
 no-charge, royalty-free, irrevocable (except as stated in this section)
 patent license to make, have made, use, offer to sell, sell, import,
 transfer and otherwise run, modify and propagate the contents of this
-implementation of GRPC, where such license applies only to those patent
+implementation of gRPC, where such license applies only to those patent
 claims, both currently owned or controlled by Google and acquired in
 the future, licensable by Google that are necessarily infringed by this
-implementation of GRPC.  This grant does not include claims that would be
+implementation of gRPC.  This grant does not include claims that would be
 infringed only as a consequence of further modification of this
 implementation.  If you or your agent or exclusive licensee institute or
 order or agree to the institution of patent litigation against any
 entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of GRPC or any code incorporated within this
-implementation of GRPC constitutes direct or contributory patent
+that this implementation of gRPC or any code incorporated within this
+implementation of gRPC constitutes direct or contributory patent
 infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of GRPC
+rights granted to you under this License for this implementation of gRPC
 shall terminate as of the date such litigation is filed.
diff --git a/vendor/google.golang.org/grpc/backoff.go b/vendor/google.golang.org/grpc/backoff.go
new file mode 100644
index 0000000000..52f4f10fc2
--- /dev/null
+++ b/vendor/google.golang.org/grpc/backoff.go
@@ -0,0 +1,80 @@
+package grpc
+
+import (
+	"math/rand"
+	"time"
+)
+
+// DefaultBackoffConfig uses values specified for backoff in
+// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
+var (
+	DefaultBackoffConfig = BackoffConfig{
+		MaxDelay:  120 * time.Second,
+		baseDelay: 1.0 * time.Second,
+		factor:    1.6,
+		jitter:    0.2,
+	}
+)
+
+// backoffStrategy defines the methodology for backing off after a grpc
+// connection failure.
+//
+// This is unexported until the gRPC project decides whether or not to allow
+// alternative backoff strategies. Once a decision is made, this type and its
+// method may be exported.
+type backoffStrategy interface {
+	// backoff returns the amount of time to wait before the next retry given
+	// the number of consecutive failures.
+	backoff(retries int) time.Duration
+}
+
+// BackoffConfig defines the parameters for the default gRPC backoff strategy.
+type BackoffConfig struct {
+	// MaxDelay is the upper bound of backoff delay.
+	MaxDelay time.Duration
+
+	// TODO(stevvooe): The following fields are not exported, as allowing
+	// changes would violate the current gRPC specification for backoff. If
+	// gRPC decides to allow more interesting backoff strategies, these fields
+	// may be opened up in the future.
+
+	// baseDelay is the amount of time to wait before retrying after the first
+	// failure.
+	baseDelay time.Duration
+
+	// factor is applied to the backoff after each retry.
+	factor float64
+
+	// jitter provides a range to randomize backoff delays.
+	jitter float64
+}
+
+func setDefaults(bc *BackoffConfig) {
+	md := bc.MaxDelay
+	*bc = DefaultBackoffConfig
+
+	if md > 0 {
+		bc.MaxDelay = md
+	}
+}
+
+func (bc BackoffConfig) backoff(retries int) (t time.Duration) {
+	if retries == 0 {
+		return bc.baseDelay
+	}
+	backoff, max := float64(bc.baseDelay), float64(bc.MaxDelay)
+	for backoff < max && retries > 0 {
+		backoff *= bc.factor
+		retries--
+	}
+	if backoff > max {
+		backoff = max
+	}
+	// Randomize backoff delays so that if a cluster of requests start at
+	// the same time, they won't operate in lockstep.
+	backoff *= 1 + bc.jitter*(rand.Float64()*2-1)
+	if backoff < 0 {
+		return 0
+	}
+	return time.Duration(backoff)
+}
diff --git a/vendor/google.golang.org/grpc/balancer.go b/vendor/google.golang.org/grpc/balancer.go
new file mode 100644
index 0000000000..419e214611
--- /dev/null
+++ b/vendor/google.golang.org/grpc/balancer.go
@@ -0,0 +1,385 @@
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package grpc
+
+import (
+	"fmt"
+	"sync"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/naming"
+)
+
+// Address represents a server the client connects to.
+// This is the EXPERIMENTAL API and may be changed or extended in the future.
+type Address struct {
+	// Addr is the server address on which a connection will be established.
+	Addr string
+	// Metadata is the information associated with Addr, which may be used
+	// to make load balancing decision.
+	Metadata interface{}
+}
+
+// BalancerGetOptions configures a Get call.
+// This is the EXPERIMENTAL API and may be changed or extended in the future.
+type BalancerGetOptions struct {
+	// BlockingWait specifies whether Get should block when there is no
+	// connected address.
+	BlockingWait bool
+}
+
+// Balancer chooses network addresses for RPCs.
+// This is the EXPERIMENTAL API and may be changed or extended in the future.
+type Balancer interface {
+	// Start does the initialization work to bootstrap a Balancer. For example,
+	// this function may start the name resolution and watch the updates. It will
+	// be called when dialing.
+	Start(target string) error
+	// Up informs the Balancer that gRPC has a connection to the server at
+	// addr. It returns down which is called once the connection to addr gets
+	// lost or closed.
+	// TODO: It is not clear how to construct and take advantage the meaningful error
+	// parameter for down. Need realistic demands to guide.
+	Up(addr Address) (down func(error))
+	// Get gets the address of a server for the RPC corresponding to ctx.
+	// i) If it returns a connected address, gRPC internals issues the RPC on the
+	// connection to this address;
+	// ii) If it returns an address on which the connection is under construction
+	// (initiated by Notify(...)) but not connected, gRPC internals
+	//  * fails RPC if the RPC is fail-fast and connection is in the TransientFailure or
+	//  Shutdown state;
+	//  or
+	//  * issues RPC on the connection otherwise.
+	// iii) If it returns an address on which the connection does not exist, gRPC
+	// internals treats it as an error and will fail the corresponding RPC.
+	//
+	// Therefore, the following is the recommended rule when writing a custom Balancer.
+	// If opts.BlockingWait is true, it should return a connected address or
+	// block if there is no connected address. It should respect the timeout or
+	// cancellation of ctx when blocking. If opts.BlockingWait is false (for fail-fast
+	// RPCs), it should return an address it has notified via Notify(...) immediately
+	// instead of blocking.
+	//
+	// The function returns put which is called once the rpc has completed or failed.
+	// put can collect and report RPC stats to a remote load balancer.
+	//
+	// This function should only return the errors Balancer cannot recover by itself.
+	// gRPC internals will fail the RPC if an error is returned.
+	Get(ctx context.Context, opts BalancerGetOptions) (addr Address, put func(), err error)
+	// Notify returns a channel that is used by gRPC internals to watch the addresses
+	// gRPC needs to connect. The addresses might be from a name resolver or remote
+	// load balancer. gRPC internals will compare it with the existing connected
+	// addresses. If the address Balancer notified is not in the existing connected
+	// addresses, gRPC starts to connect the address. If an address in the existing
+	// connected addresses is not in the notification list, the corresponding connection
+	// is shutdown gracefully. Otherwise, there are no operations to take. Note that
+	// the Address slice must be the full list of the Addresses which should be connected.
+	// It is NOT delta.
+	Notify() <-chan []Address
+	// Close shuts down the balancer.
+	Close() error
+}
+
+// downErr implements net.Error. It is constructed by gRPC internals and passed to the down
+// call of Balancer.
+type downErr struct {
+	timeout   bool
+	temporary bool
+	desc      string
+}
+
+func (e downErr) Error() string   { return e.desc }
+func (e downErr) Timeout() bool   { return e.timeout }
+func (e downErr) Temporary() bool { return e.temporary }
+
+func downErrorf(timeout, temporary bool, format string, a ...interface{}) downErr {
+	return downErr{
+		timeout:   timeout,
+		temporary: temporary,
+		desc:      fmt.Sprintf(format, a...),
+	}
+}
+
+// RoundRobin returns a Balancer that selects addresses round-robin. It uses r to watch
+// the name resolution updates and updates the addresses available correspondingly.
+func RoundRobin(r naming.Resolver) Balancer {
+	return &roundRobin{r: r}
+}
+
+type addrInfo struct {
+	addr      Address
+	connected bool
+}
+
+type roundRobin struct {
+	r      naming.Resolver
+	w      naming.Watcher
+	addrs  []*addrInfo // all the addresses the client should potentially connect
+	mu     sync.Mutex
+	addrCh chan []Address // the channel to notify gRPC internals the list of addresses the client should connect to.
+	next   int            // index of the next address to return for Get()
+	waitCh chan struct{}  // the channel to block when there is no connected address available
+	done   bool           // The Balancer is closed.
+}
+
+func (rr *roundRobin) watchAddrUpdates() error {
+	updates, err := rr.w.Next()
+	if err != nil {
+		grpclog.Printf("grpc: the naming watcher stops working due to %v.\n", err)
+		return err
+	}
+	rr.mu.Lock()
+	defer rr.mu.Unlock()
+	for _, update := range updates {
+		addr := Address{
+			Addr:     update.Addr,
+			Metadata: update.Metadata,
+		}
+		switch update.Op {
+		case naming.Add:
+			var exist bool
+			for _, v := range rr.addrs {
+				if addr == v.addr {
+					exist = true
+					grpclog.Println("grpc: The name resolver wanted to add an existing address: ", addr)
+					break
+				}
+			}
+			if exist {
+				continue
+			}
+			rr.addrs = append(rr.addrs, &addrInfo{addr: addr})
+		case naming.Delete:
+			for i, v := range rr.addrs {
+				if addr == v.addr {
+					copy(rr.addrs[i:], rr.addrs[i+1:])
+					rr.addrs = rr.addrs[:len(rr.addrs)-1]
+					break
+				}
+			}
+		default:
+			grpclog.Println("Unknown update.Op ", update.Op)
+		}
+	}
+	// Make a copy of rr.addrs and write it onto rr.addrCh so that gRPC internals gets notified.
+	open := make([]Address, len(rr.addrs))
+	for i, v := range rr.addrs {
+		open[i] = v.addr
+	}
+	if rr.done {
+		return ErrClientConnClosing
+	}
+	rr.addrCh <- open
+	return nil
+}
+
+func (rr *roundRobin) Start(target string) error {
+	if rr.r == nil {
+		// If there is no name resolver installed, it is not needed to
+		// do name resolution. In this case, target is added into rr.addrs
+		// as the only address available and rr.addrCh stays nil.
+		rr.addrs = append(rr.addrs, &addrInfo{addr: Address{Addr: target}})
+		return nil
+	}
+	w, err := rr.r.Resolve(target)
+	if err != nil {
+		return err
+	}
+	rr.w = w
+	rr.addrCh = make(chan []Address)
+	go func() {
+		for {
+			if err := rr.watchAddrUpdates(); err != nil {
+				return
+			}
+		}
+	}()
+	return nil
+}
+
+// Up sets the connected state of addr and sends notification if there are pending
+// Get() calls.
+func (rr *roundRobin) Up(addr Address) func(error) {
+	rr.mu.Lock()
+	defer rr.mu.Unlock()
+	var cnt int
+	for _, a := range rr.addrs {
+		if a.addr == addr {
+			if a.connected {
+				return nil
+			}
+			a.connected = true
+		}
+		if a.connected {
+			cnt++
+		}
+	}
+	// addr is only one which is connected. Notify the Get() callers who are blocking.
+	if cnt == 1 && rr.waitCh != nil {
+		close(rr.waitCh)
+		rr.waitCh = nil
+	}
+	return func(err error) {
+		rr.down(addr, err)
+	}
+}
+
+// down unsets the connected state of addr.
+func (rr *roundRobin) down(addr Address, err error) {
+	rr.mu.Lock()
+	defer rr.mu.Unlock()
+	for _, a := range rr.addrs {
+		if addr == a.addr {
+			a.connected = false
+			break
+		}
+	}
+}
+
+// Get returns the next addr in the rotation.
+func (rr *roundRobin) Get(ctx context.Context, opts BalancerGetOptions) (addr Address, put func(), err error) {
+	var ch chan struct{}
+	rr.mu.Lock()
+	if rr.done {
+		rr.mu.Unlock()
+		err = ErrClientConnClosing
+		return
+	}
+
+	if len(rr.addrs) > 0 {
+		if rr.next >= len(rr.addrs) {
+			rr.next = 0
+		}
+		next := rr.next
+		for {
+			a := rr.addrs[next]
+			next = (next + 1) % len(rr.addrs)
+			if a.connected {
+				addr = a.addr
+				rr.next = next
+				rr.mu.Unlock()
+				return
+			}
+			if next == rr.next {
+				// Has iterated all the possible address but none is connected.
+				break
+			}
+		}
+	}
+	if !opts.BlockingWait {
+		if len(rr.addrs) == 0 {
+			rr.mu.Unlock()
+			err = fmt.Errorf("there is no address available")
+			return
+		}
+		// Returns the next addr on rr.addrs for failfast RPCs.
+		addr = rr.addrs[rr.next].addr
+		rr.next++
+		rr.mu.Unlock()
+		return
+	}
+	// Wait on rr.waitCh for non-failfast RPCs.
+	if rr.waitCh == nil {
+		ch = make(chan struct{})
+		rr.waitCh = ch
+	} else {
+		ch = rr.waitCh
+	}
+	rr.mu.Unlock()
+	for {
+		select {
+		case <-ctx.Done():
+			err = ctx.Err()
+			return
+		case <-ch:
+			rr.mu.Lock()
+			if rr.done {
+				rr.mu.Unlock()
+				err = ErrClientConnClosing
+				return
+			}
+
+			if len(rr.addrs) > 0 {
+				if rr.next >= len(rr.addrs) {
+					rr.next = 0
+				}
+				next := rr.next
+				for {
+					a := rr.addrs[next]
+					next = (next + 1) % len(rr.addrs)
+					if a.connected {
+						addr = a.addr
+						rr.next = next
+						rr.mu.Unlock()
+						return
+					}
+					if next == rr.next {
+						// Has iterated all the possible address but none is connected.
+						break
+					}
+				}
+			}
+			// The newly added addr got removed by Down() again.
+			if rr.waitCh == nil {
+				ch = make(chan struct{})
+				rr.waitCh = ch
+			} else {
+				ch = rr.waitCh
+			}
+			rr.mu.Unlock()
+		}
+	}
+}
+
+func (rr *roundRobin) Notify() <-chan []Address {
+	return rr.addrCh
+}
+
+func (rr *roundRobin) Close() error {
+	rr.mu.Lock()
+	defer rr.mu.Unlock()
+	rr.done = true
+	if rr.w != nil {
+		rr.w.Close()
+	}
+	if rr.waitCh != nil {
+		close(rr.waitCh)
+		rr.waitCh = nil
+	}
+	if rr.addrCh != nil {
+		close(rr.addrCh)
+	}
+	return nil
+}
diff --git a/vendor/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go
index 504a6e18a8..84ac178c43 100644
--- a/vendor/google.golang.org/grpc/call.go
+++ b/vendor/google.golang.org/grpc/call.go
@@ -97,10 +97,11 @@ func sendRequest(ctx context.Context, codec Codec, compressor Compressor, callHd
 	return stream, nil
 }
 
-// Invoke is called by the generated code. It sends the RPC request on the
-// wire and returns after response is received.
+// Invoke sends the RPC request on the wire and returns after response is received.
+// Invoke is called by generated code. Also users can call Invoke directly when it
+// is really needed in their use cases.
 func Invoke(ctx context.Context, method string, args, reply interface{}, cc *ClientConn, opts ...CallOption) (err error) {
-	var c callInfo
+	c := defaultCallInfo
 	for _, o := range opts {
 		if err := o.before(&c); err != nil {
 			return toRPCErr(err)
@@ -131,19 +132,16 @@ func Invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 		Last:  true,
 		Delay: false,
 	}
-	var (
-		lastErr error // record the error that happened
-	)
 	for {
 		var (
 			err    error
 			t      transport.ClientTransport
 			stream *transport.Stream
+			// Record the put handler from Balancer.Get(...). It is called once the
+			// RPC has completed or failed.
+			put func()
 		)
-		// TODO(zhaoq): Need a formal spec of retry strategy for non-failfast rpcs.
-		if lastErr != nil && c.failFast {
-			return toRPCErr(lastErr)
-		}
+		// TODO(zhaoq): Need a formal spec of fail-fast.
 		callHdr := &transport.CallHdr{
 			Host:   cc.authority,
 			Method: method,
@@ -151,40 +149,65 @@ func Invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 		if cc.dopts.cp != nil {
 			callHdr.SendCompress = cc.dopts.cp.Type()
 		}
-		t, err = cc.dopts.picker.Pick(ctx)
+		gopts := BalancerGetOptions{
+			BlockingWait: !c.failFast,
+		}
+		t, put, err = cc.getTransport(ctx, gopts)
 		if err != nil {
-			if lastErr != nil {
-				// This was a retry; return the error from the last attempt.
-				return toRPCErr(lastErr)
+			// TODO(zhaoq): Probably revisit the error handling.
+			if _, ok := err.(*rpcError); ok {
+				return err
 			}
-			return toRPCErr(err)
+			if err == errConnClosing {
+				if c.failFast {
+					return Errorf(codes.Unavailable, "%v", errConnClosing)
+				}
+				continue
+			}
+			// All the other errors are treated as Internal errors.
+			return Errorf(codes.Internal, "%v", err)
 		}
 		if c.traceInfo.tr != nil {
 			c.traceInfo.tr.LazyLog(&payload{sent: true, msg: args}, true)
 		}
 		stream, err = sendRequest(ctx, cc.dopts.codec, cc.dopts.cp, callHdr, t, args, topts)
 		if err != nil {
+			if put != nil {
+				put()
+				put = nil
+			}
 			if _, ok := err.(transport.ConnectionError); ok {
-				lastErr = err
+				if c.failFast {
+					return toRPCErr(err)
+				}
 				continue
 			}
-			if lastErr != nil {
-				return toRPCErr(lastErr)
-			}
 			return toRPCErr(err)
 		}
 		// Receive the response
-		lastErr = recvResponse(cc.dopts, t, &c, stream, reply)
-		if _, ok := lastErr.(transport.ConnectionError); ok {
-			continue
+		err = recvResponse(cc.dopts, t, &c, stream, reply)
+		if err != nil {
+			if put != nil {
+				put()
+				put = nil
+			}
+			if _, ok := err.(transport.ConnectionError); ok {
+				if c.failFast {
+					return toRPCErr(err)
+				}
+				continue
+			}
+			t.CloseStream(stream, err)
+			return toRPCErr(err)
 		}
 		if c.traceInfo.tr != nil {
 			c.traceInfo.tr.LazyLog(&payload{sent: false, msg: reply}, true)
 		}
-		t.CloseStream(stream, lastErr)
-		if lastErr != nil {
-			return toRPCErr(lastErr)
+		t.CloseStream(stream, nil)
+		if put != nil {
+			put()
+			put = nil
 		}
-		return Errorf(stream.StatusCode(), stream.StatusDesc())
+		return Errorf(stream.StatusCode(), "%s", stream.StatusDesc())
 	}
 }
diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go
index 15d7af6c1e..c3c7691dc0 100644
--- a/vendor/google.golang.org/grpc/clientconn.go
+++ b/vendor/google.golang.org/grpc/clientconn.go
@@ -43,28 +43,38 @@ import (
 
 	"golang.org/x/net/context"
 	"golang.org/x/net/trace"
+	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/transport"
 )
 
 var (
-	// ErrUnspecTarget indicates that the target address is unspecified.
-	ErrUnspecTarget = errors.New("grpc: target is unspecified")
-	// ErrNoTransportSecurity indicates that there is no transport security
-	// being set for ClientConn. Users should either set one or explicityly
-	// call WithInsecure DialOption to disable security.
-	ErrNoTransportSecurity = errors.New("grpc: no transport security set (use grpc.WithInsecure() explicitly or set credentials)")
-	// ErrCredentialsMisuse indicates that users want to transmit security infomation
-	// (e.g., oauth2 token) which requires secure connection on an insecure
-	// connection.
-	ErrCredentialsMisuse = errors.New("grpc: the credentials require transport level security (use grpc.WithTransportAuthenticator() to set)")
 	// ErrClientConnClosing indicates that the operation is illegal because
-	// the session is closing.
+	// the ClientConn is closing.
 	ErrClientConnClosing = errors.New("grpc: the client connection is closing")
-	// ErrClientConnTimeout indicates that the connection could not be
-	// established or re-established within the specified timeout.
-	ErrClientConnTimeout = errors.New("grpc: timed out trying to connect")
+	// ErrClientConnTimeout indicates that the ClientConn cannot establish the
+	// underlying connections within the specified timeout.
+	ErrClientConnTimeout = errors.New("grpc: timed out when dialing")
+
+	// errNoTransportSecurity indicates that there is no transport security
+	// being set for ClientConn. Users should either set one or explicitly
+	// call WithInsecure DialOption to disable security.
+	errNoTransportSecurity = errors.New("grpc: no transport security set (use grpc.WithInsecure() explicitly or set credentials)")
+	// errTransportCredentialsMissing indicates that users want to transmit security
+	// information (e.g., oauth2 token) which requires secure connection on an insecure
+	// connection.
+	errTransportCredentialsMissing = errors.New("grpc: the credentials require transport level security (use grpc.WithTransportCredentials() to set)")
+	// errCredentialsConflict indicates that grpc.WithTransportCredentials()
+	// and grpc.WithInsecure() are both called for a connection.
+	errCredentialsConflict = errors.New("grpc: transport credentials are set for an insecure connection (grpc.WithTransportCredentials() and grpc.WithInsecure() are both called)")
+	// errNetworkIP indicates that the connection is down due to some network I/O error.
+	errNetworkIO = errors.New("grpc: failed with network I/O error")
+	// errConnDrain indicates that the connection starts to be drained and does not accept any new RPCs.
+	errConnDrain = errors.New("grpc: the connection is drained")
+	// errConnClosing indicates that the connection is closing.
+	errConnClosing = errors.New("grpc: the connection is closing")
+	errNoAddr      = errors.New("grpc: there is no address available to dial")
 	// minimum time to give a connection to complete
 	minConnectTimeout = 20 * time.Second
 )
@@ -75,9 +85,11 @@ type dialOptions struct {
 	codec    Codec
 	cp       Compressor
 	dc       Decompressor
-	picker   Picker
+	bs       backoffStrategy
+	balancer Balancer
 	block    bool
 	insecure bool
+	timeout  time.Duration
 	copts    transport.ConnectOptions
 }
 
@@ -107,10 +119,38 @@ func WithDecompressor(dc Decompressor) DialOption {
 	}
 }
 
-// WithPicker returns a DialOption which sets a picker for connection selection.
-func WithPicker(p Picker) DialOption {
+// WithBalancer returns a DialOption which sets a load balancer.
+func WithBalancer(b Balancer) DialOption {
+	return func(o *dialOptions) {
+		o.balancer = b
+	}
+}
+
+// WithBackoffMaxDelay configures the dialer to use the provided maximum delay
+// when backing off after failed connection attempts.
+func WithBackoffMaxDelay(md time.Duration) DialOption {
+	return WithBackoffConfig(BackoffConfig{MaxDelay: md})
+}
+
+// WithBackoffConfig configures the dialer to use the provided backoff
+// parameters after connection failures.
+//
+// Use WithBackoffMaxDelay until more parameters on BackoffConfig are opened up
+// for use.
+func WithBackoffConfig(b BackoffConfig) DialOption {
+	// Set defaults to ensure that provided BackoffConfig is valid and
+	// unexported fields get default values.
+	setDefaults(&b)
+	return withBackoff(b)
+}
+
+// withBackoff sets the backoff strategy used for retries after a
+// failed connection attempt.
+//
+// This can be exported if arbitrary backoff strategies are allowed by gRPC.
+func withBackoff(bs backoffStrategy) DialOption {
 	return func(o *dialOptions) {
-		o.picker = p
+		o.bs = bs
 	}
 }
 
@@ -133,24 +173,25 @@ func WithInsecure() DialOption {
 
 // WithTransportCredentials returns a DialOption which configures a
 // connection level security credentials (e.g., TLS/SSL).
-func WithTransportCredentials(creds credentials.TransportAuthenticator) DialOption {
+func WithTransportCredentials(creds credentials.TransportCredentials) DialOption {
 	return func(o *dialOptions) {
-		o.copts.AuthOptions = append(o.copts.AuthOptions, creds)
+		o.copts.TransportCredentials = creds
 	}
 }
 
 // WithPerRPCCredentials returns a DialOption which sets
 // credentials which will place auth state on each outbound RPC.
-func WithPerRPCCredentials(creds credentials.Credentials) DialOption {
+func WithPerRPCCredentials(creds credentials.PerRPCCredentials) DialOption {
 	return func(o *dialOptions) {
-		o.copts.AuthOptions = append(o.copts.AuthOptions, creds)
+		o.copts.PerRPCCredentials = append(o.copts.PerRPCCredentials, creds)
 	}
 }
 
-// WithTimeout returns a DialOption that configures a timeout for dialing a client connection.
+// WithTimeout returns a DialOption that configures a timeout for dialing a ClientConn
+// initially. This is valid if and only if WithBlock() is present.
 func WithTimeout(d time.Duration) DialOption {
 	return func(o *dialOptions) {
-		o.copts.Timeout = d
+		o.timeout = d
 	}
 }
 
@@ -172,22 +213,67 @@ func WithUserAgent(s string) DialOption {
 func Dial(target string, opts ...DialOption) (*ClientConn, error) {
 	cc := &ClientConn{
 		target: target,
+		conns:  make(map[Address]*addrConn),
 	}
 	for _, opt := range opts {
 		opt(&cc.dopts)
 	}
+
+	// Set defaults.
 	if cc.dopts.codec == nil {
-		// Set the default codec.
 		cc.dopts.codec = protoCodec{}
 	}
-	if cc.dopts.picker == nil {
-		cc.dopts.picker = &unicastPicker{
-			target: target,
-		}
+	if cc.dopts.bs == nil {
+		cc.dopts.bs = DefaultBackoffConfig
+	}
+	if cc.dopts.balancer == nil {
+		cc.dopts.balancer = RoundRobin(nil)
 	}
-	if err := cc.dopts.picker.Init(cc); err != nil {
+
+	if err := cc.dopts.balancer.Start(target); err != nil {
 		return nil, err
 	}
+	var (
+		ok    bool
+		addrs []Address
+	)
+	ch := cc.dopts.balancer.Notify()
+	if ch == nil {
+		// There is no name resolver installed.
+		addrs = append(addrs, Address{Addr: target})
+	} else {
+		addrs, ok = <-ch
+		if !ok || len(addrs) == 0 {
+			return nil, errNoAddr
+		}
+	}
+	waitC := make(chan error, 1)
+	go func() {
+		for _, a := range addrs {
+			if err := cc.newAddrConn(a, false); err != nil {
+				waitC <- err
+				return
+			}
+		}
+		close(waitC)
+	}()
+	var timeoutCh <-chan time.Time
+	if cc.dopts.timeout > 0 {
+		timeoutCh = time.After(cc.dopts.timeout)
+	}
+	select {
+	case err := <-waitC:
+		if err != nil {
+			cc.Close()
+			return nil, err
+		}
+	case <-timeoutCh:
+		cc.Close()
+		return nil, ErrClientConnTimeout
+	}
+	if ok {
+		go cc.lbWatcher()
+	}
 	colonPos := strings.LastIndex(target, ":")
 	if colonPos == -1 {
 		colonPos = len(target)
@@ -229,329 +315,363 @@ func (s ConnectivityState) String() string {
 	}
 }
 
-// ClientConn represents a client connection to an RPC service.
+// ClientConn represents a client connection to an RPC server.
 type ClientConn struct {
 	target    string
 	authority string
 	dopts     dialOptions
-}
 
-// State returns the connectivity state of cc.
-// This is EXPERIMENTAL API.
-func (cc *ClientConn) State() (ConnectivityState, error) {
-	return cc.dopts.picker.State()
+	mu    sync.RWMutex
+	conns map[Address]*addrConn
 }
 
-// WaitForStateChange blocks until the state changes to something other than the sourceState.
-// It returns the new state or error.
-// This is EXPERIMENTAL API.
-func (cc *ClientConn) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
-	return cc.dopts.picker.WaitForStateChange(ctx, sourceState)
-}
-
-// Close starts to tear down the ClientConn.
-func (cc *ClientConn) Close() error {
-	return cc.dopts.picker.Close()
-}
-
-// Conn is a client connection to a single destination.
-type Conn struct {
-	target       string
-	dopts        dialOptions
-	resetChan    chan int
-	shutdownChan chan struct{}
-	events       trace.EventLog
-
-	mu      sync.Mutex
-	state   ConnectivityState
-	stateCV *sync.Cond
-	// ready is closed and becomes nil when a new transport is up or failed
-	// due to timeout.
-	ready     chan struct{}
-	transport transport.ClientTransport
+func (cc *ClientConn) lbWatcher() {
+	for addrs := range cc.dopts.balancer.Notify() {
+		var (
+			add []Address   // Addresses need to setup connections.
+			del []*addrConn // Connections need to tear down.
+		)
+		cc.mu.Lock()
+		for _, a := range addrs {
+			if _, ok := cc.conns[a]; !ok {
+				add = append(add, a)
+			}
+		}
+		for k, c := range cc.conns {
+			var keep bool
+			for _, a := range addrs {
+				if k == a {
+					keep = true
+					break
+				}
+			}
+			if !keep {
+				del = append(del, c)
+			}
+		}
+		cc.mu.Unlock()
+		for _, a := range add {
+			cc.newAddrConn(a, true)
+		}
+		for _, c := range del {
+			c.tearDown(errConnDrain)
+		}
+	}
 }
 
-// NewConn creates a Conn.
-func NewConn(cc *ClientConn) (*Conn, error) {
-	if cc.target == "" {
-		return nil, ErrUnspecTarget
-	}
-	c := &Conn{
-		target:       cc.target,
+func (cc *ClientConn) newAddrConn(addr Address, skipWait bool) error {
+	ac := &addrConn{
+		cc:           cc,
+		addr:         addr,
 		dopts:        cc.dopts,
-		resetChan:    make(chan int, 1),
 		shutdownChan: make(chan struct{}),
 	}
 	if EnableTracing {
-		c.events = trace.NewEventLog("grpc.ClientConn", c.target)
+		ac.events = trace.NewEventLog("grpc.ClientConn", ac.addr.Addr)
 	}
-	if !c.dopts.insecure {
-		var ok bool
-		for _, cd := range c.dopts.copts.AuthOptions {
-			if _, ok := cd.(credentials.TransportAuthenticator); !ok {
-				continue
-			}
-			ok = true
-		}
-		if !ok {
-			return nil, ErrNoTransportSecurity
+	if !ac.dopts.insecure {
+		if ac.dopts.copts.TransportCredentials == nil {
+			return errNoTransportSecurity
 		}
 	} else {
-		for _, cd := range c.dopts.copts.AuthOptions {
+		if ac.dopts.copts.TransportCredentials != nil {
+			return errCredentialsConflict
+		}
+		for _, cd := range ac.dopts.copts.PerRPCCredentials {
 			if cd.RequireTransportSecurity() {
-				return nil, ErrCredentialsMisuse
+				return errTransportCredentialsMissing
 			}
 		}
 	}
-	c.stateCV = sync.NewCond(&c.mu)
-	if c.dopts.block {
-		if err := c.resetTransport(false); err != nil {
-			c.Close()
-			return nil, err
+	// Insert ac into ac.cc.conns. This needs to be done before any getTransport(...) is called.
+	ac.cc.mu.Lock()
+	if ac.cc.conns == nil {
+		ac.cc.mu.Unlock()
+		return ErrClientConnClosing
+	}
+	stale := ac.cc.conns[ac.addr]
+	ac.cc.conns[ac.addr] = ac
+	ac.cc.mu.Unlock()
+	if stale != nil {
+		// There is an addrConn alive on ac.addr already. This could be due to
+		// i) stale's Close is undergoing;
+		// ii) a buggy Balancer notifies duplicated Addresses.
+		stale.tearDown(errConnDrain)
+	}
+	ac.stateCV = sync.NewCond(&ac.mu)
+	// skipWait may overwrite the decision in ac.dopts.block.
+	if ac.dopts.block && !skipWait {
+		if err := ac.resetTransport(false); err != nil {
+			ac.tearDown(err)
+			return err
 		}
 		// Start to monitor the error status of transport.
-		go c.transportMonitor()
+		go ac.transportMonitor()
 	} else {
 		// Start a goroutine connecting to the server asynchronously.
 		go func() {
-			if err := c.resetTransport(false); err != nil {
-				grpclog.Printf("Failed to dial %s: %v; please retry.", c.target, err)
-				c.Close()
+			if err := ac.resetTransport(false); err != nil {
+				grpclog.Printf("Failed to dial %s: %v; please retry.", ac.addr.Addr, err)
+				ac.tearDown(err)
 				return
 			}
-			c.transportMonitor()
+			ac.transportMonitor()
 		}()
 	}
-	return c, nil
+	return nil
 }
 
-// printf records an event in cc's event log, unless cc has been closed.
-// REQUIRES cc.mu is held.
-func (cc *Conn) printf(format string, a ...interface{}) {
-	if cc.events != nil {
-		cc.events.Printf(format, a...)
+func (cc *ClientConn) getTransport(ctx context.Context, opts BalancerGetOptions) (transport.ClientTransport, func(), error) {
+	addr, put, err := cc.dopts.balancer.Get(ctx, opts)
+	if err != nil {
+		return nil, nil, toRPCErr(err)
+	}
+	cc.mu.RLock()
+	if cc.conns == nil {
+		cc.mu.RUnlock()
+		return nil, nil, toRPCErr(ErrClientConnClosing)
+	}
+	ac, ok := cc.conns[addr]
+	cc.mu.RUnlock()
+	if !ok {
+		if put != nil {
+			put()
+		}
+		return nil, nil, Errorf(codes.Internal, "grpc: failed to find the transport to send the rpc")
 	}
+	t, err := ac.wait(ctx, !opts.BlockingWait)
+	if err != nil {
+		if put != nil {
+			put()
+		}
+		return nil, nil, err
+	}
+	return t, put, nil
 }
 
-// errorf records an error in cc's event log, unless cc has been closed.
-// REQUIRES cc.mu is held.
-func (cc *Conn) errorf(format string, a ...interface{}) {
-	if cc.events != nil {
-		cc.events.Errorf(format, a...)
+// Close tears down the ClientConn and all underlying connections.
+func (cc *ClientConn) Close() error {
+	cc.mu.Lock()
+	if cc.conns == nil {
+		cc.mu.Unlock()
+		return ErrClientConnClosing
+	}
+	conns := cc.conns
+	cc.conns = nil
+	cc.mu.Unlock()
+	cc.dopts.balancer.Close()
+	for _, ac := range conns {
+		ac.tearDown(ErrClientConnClosing)
 	}
+	return nil
 }
 
-// State returns the connectivity state of the Conn
-func (cc *Conn) State() ConnectivityState {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	return cc.state
+// addrConn is a network connection to a given address.
+type addrConn struct {
+	cc           *ClientConn
+	addr         Address
+	dopts        dialOptions
+	shutdownChan chan struct{}
+	events       trace.EventLog
+
+	mu      sync.Mutex
+	state   ConnectivityState
+	stateCV *sync.Cond
+	down    func(error) // the handler called when a connection is down.
+	// ready is closed and becomes nil when a new transport is up or failed
+	// due to timeout.
+	ready     chan struct{}
+	transport transport.ClientTransport
 }
 
-// WaitForStateChange blocks until the state changes to something other than the sourceState.
-func (cc *Conn) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	if sourceState != cc.state {
-		return cc.state, nil
+// printf records an event in ac's event log, unless ac has been closed.
+// REQUIRES ac.mu is held.
+func (ac *addrConn) printf(format string, a ...interface{}) {
+	if ac.events != nil {
+		ac.events.Printf(format, a...)
+	}
+}
+
+// errorf records an error in ac's event log, unless ac has been closed.
+// REQUIRES ac.mu is held.
+func (ac *addrConn) errorf(format string, a ...interface{}) {
+	if ac.events != nil {
+		ac.events.Errorf(format, a...)
+	}
+}
+
+// getState returns the connectivity state of the Conn
+func (ac *addrConn) getState() ConnectivityState {
+	ac.mu.Lock()
+	defer ac.mu.Unlock()
+	return ac.state
+}
+
+// waitForStateChange blocks until the state changes to something other than the sourceState.
+func (ac *addrConn) waitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
+	ac.mu.Lock()
+	defer ac.mu.Unlock()
+	if sourceState != ac.state {
+		return ac.state, nil
 	}
 	done := make(chan struct{})
 	var err error
 	go func() {
 		select {
 		case <-ctx.Done():
-			cc.mu.Lock()
+			ac.mu.Lock()
 			err = ctx.Err()
-			cc.stateCV.Broadcast()
-			cc.mu.Unlock()
+			ac.stateCV.Broadcast()
+			ac.mu.Unlock()
 		case <-done:
 		}
 	}()
 	defer close(done)
-	for sourceState == cc.state {
-		cc.stateCV.Wait()
+	for sourceState == ac.state {
+		ac.stateCV.Wait()
 		if err != nil {
-			return cc.state, err
+			return ac.state, err
 		}
 	}
-	return cc.state, nil
-}
-
-// NotifyReset tries to signal the underlying transport needs to be reset due to
-// for example a name resolution change in flight.
-func (cc *Conn) NotifyReset() {
-	select {
-	case cc.resetChan <- 0:
-	default:
-	}
+	return ac.state, nil
 }
 
-func (cc *Conn) resetTransport(closeTransport bool) error {
+func (ac *addrConn) resetTransport(closeTransport bool) error {
 	var retries int
-	start := time.Now()
 	for {
-		cc.mu.Lock()
-		cc.printf("connecting")
-		if cc.state == Shutdown {
-			// cc.Close() has been invoked.
-			cc.mu.Unlock()
-			return ErrClientConnClosing
+		ac.mu.Lock()
+		ac.printf("connecting")
+		if ac.state == Shutdown {
+			// ac.tearDown(...) has been invoked.
+			ac.mu.Unlock()
+			return errConnClosing
 		}
-		cc.state = Connecting
-		cc.stateCV.Broadcast()
-		cc.mu.Unlock()
-		if closeTransport {
-			cc.transport.Close()
+		if ac.down != nil {
+			ac.down(downErrorf(false, true, "%v", errNetworkIO))
+			ac.down = nil
 		}
-		// Adjust timeout for the current try.
-		copts := cc.dopts.copts
-		if copts.Timeout < 0 {
-			cc.Close()
-			return ErrClientConnTimeout
+		ac.state = Connecting
+		ac.stateCV.Broadcast()
+		t := ac.transport
+		ac.mu.Unlock()
+		if closeTransport && t != nil {
+			t.Close()
 		}
-		if copts.Timeout > 0 {
-			copts.Timeout -= time.Since(start)
-			if copts.Timeout <= 0 {
-				cc.Close()
-				return ErrClientConnTimeout
-			}
-		}
-		sleepTime := backoff(retries)
-		timeout := sleepTime
-		if timeout < minConnectTimeout {
-			timeout = minConnectTimeout
-		}
-		if copts.Timeout == 0 || copts.Timeout > timeout {
-			copts.Timeout = timeout
+		sleepTime := ac.dopts.bs.backoff(retries)
+		ac.dopts.copts.Timeout = sleepTime
+		if sleepTime < minConnectTimeout {
+			ac.dopts.copts.Timeout = minConnectTimeout
 		}
 		connectTime := time.Now()
-		addr, err := cc.dopts.picker.PickAddr()
-		var newTransport transport.ClientTransport
-		if err == nil {
-			newTransport, err = transport.NewClientTransport(addr, &copts)
-		}
+		newTransport, err := transport.NewClientTransport(ac.addr.Addr, &ac.dopts.copts)
 		if err != nil {
-			cc.mu.Lock()
-			if cc.state == Shutdown {
-				// cc.Close() has been invoked.
-				cc.mu.Unlock()
-				return ErrClientConnClosing
+			ac.mu.Lock()
+			if ac.state == Shutdown {
+				// ac.tearDown(...) has been invoked.
+				ac.mu.Unlock()
+				return errConnClosing
 			}
-			cc.errorf("transient failure: %v", err)
-			cc.state = TransientFailure
-			cc.stateCV.Broadcast()
-			if cc.ready != nil {
-				close(cc.ready)
-				cc.ready = nil
+			ac.errorf("transient failure: %v", err)
+			ac.state = TransientFailure
+			ac.stateCV.Broadcast()
+			if ac.ready != nil {
+				close(ac.ready)
+				ac.ready = nil
 			}
-			cc.mu.Unlock()
+			ac.mu.Unlock()
 			sleepTime -= time.Since(connectTime)
 			if sleepTime < 0 {
 				sleepTime = 0
 			}
-			// Fail early before falling into sleep.
-			if cc.dopts.copts.Timeout > 0 && cc.dopts.copts.Timeout < sleepTime+time.Since(start) {
-				cc.mu.Lock()
-				cc.errorf("connection timeout")
-				cc.mu.Unlock()
-				cc.Close()
-				return ErrClientConnTimeout
-			}
 			closeTransport = false
-			time.Sleep(sleepTime)
+			select {
+			case <-time.After(sleepTime):
+			case <-ac.shutdownChan:
+			}
 			retries++
-			grpclog.Printf("grpc: Conn.resetTransport failed to create client transport: %v; Reconnecting to %q", err, cc.target)
+			grpclog.Printf("grpc: addrConn.resetTransport failed to create client transport: %v; Reconnecting to %q", err, ac.addr)
 			continue
 		}
-		cc.mu.Lock()
-		cc.printf("ready")
-		if cc.state == Shutdown {
-			// cc.Close() has been invoked.
-			cc.mu.Unlock()
+		ac.mu.Lock()
+		ac.printf("ready")
+		if ac.state == Shutdown {
+			// ac.tearDown(...) has been invoked.
+			ac.mu.Unlock()
 			newTransport.Close()
-			return ErrClientConnClosing
+			return errConnClosing
 		}
-		cc.state = Ready
-		cc.stateCV.Broadcast()
-		cc.transport = newTransport
-		if cc.ready != nil {
-			close(cc.ready)
-			cc.ready = nil
+		ac.state = Ready
+		ac.stateCV.Broadcast()
+		ac.transport = newTransport
+		if ac.ready != nil {
+			close(ac.ready)
+			ac.ready = nil
 		}
-		cc.mu.Unlock()
+		ac.down = ac.cc.dopts.balancer.Up(ac.addr)
+		ac.mu.Unlock()
 		return nil
 	}
 }
 
-func (cc *Conn) reconnect() bool {
-	cc.mu.Lock()
-	if cc.state == Shutdown {
-		// cc.Close() has been invoked.
-		cc.mu.Unlock()
-		return false
-	}
-	cc.state = TransientFailure
-	cc.stateCV.Broadcast()
-	cc.mu.Unlock()
-	if err := cc.resetTransport(true); err != nil {
-		// The ClientConn is closing.
-		cc.mu.Lock()
-		cc.printf("transport exiting: %v", err)
-		cc.mu.Unlock()
-		grpclog.Printf("grpc: Conn.transportMonitor exits due to: %v", err)
-		return false
-	}
-	return true
-}
-
 // Run in a goroutine to track the error in transport and create the
 // new transport if an error happens. It returns when the channel is closing.
-func (cc *Conn) transportMonitor() {
+func (ac *addrConn) transportMonitor() {
 	for {
+		ac.mu.Lock()
+		t := ac.transport
+		ac.mu.Unlock()
 		select {
 		// shutdownChan is needed to detect the teardown when
-		// the ClientConn is idle (i.e., no RPC in flight).
-		case <-cc.shutdownChan:
+		// the addrConn is idle (i.e., no RPC in flight).
+		case <-ac.shutdownChan:
 			return
-		case <-cc.resetChan:
-			if !cc.reconnect() {
+		case <-t.Error():
+			ac.mu.Lock()
+			if ac.state == Shutdown {
+				// ac.tearDown(...) has been invoked.
+				ac.mu.Unlock()
 				return
 			}
-		case <-cc.transport.Error():
-			if !cc.reconnect() {
+			ac.state = TransientFailure
+			ac.stateCV.Broadcast()
+			ac.mu.Unlock()
+			if err := ac.resetTransport(true); err != nil {
+				ac.mu.Lock()
+				ac.printf("transport exiting: %v", err)
+				ac.mu.Unlock()
+				grpclog.Printf("grpc: addrConn.transportMonitor exits due to: %v", err)
 				return
 			}
-			// Tries to drain reset signal if there is any since it is out-dated.
-			select {
-			case <-cc.resetChan:
-			default:
-			}
 		}
 	}
 }
 
-// Wait blocks until i) the new transport is up or ii) ctx is done or iii) cc is closed.
-func (cc *Conn) Wait(ctx context.Context) (transport.ClientTransport, error) {
+// wait blocks until i) the new transport is up or ii) ctx is done or iii) ac is closed or
+// iv) transport is in TransientFailure and the RPC is fail-fast.
+func (ac *addrConn) wait(ctx context.Context, failFast bool) (transport.ClientTransport, error) {
 	for {
-		cc.mu.Lock()
+		ac.mu.Lock()
 		switch {
-		case cc.state == Shutdown:
-			cc.mu.Unlock()
-			return nil, ErrClientConnClosing
-		case cc.state == Ready:
-			ct := cc.transport
-			cc.mu.Unlock()
+		case ac.state == Shutdown:
+			ac.mu.Unlock()
+			return nil, errConnClosing
+		case ac.state == Ready:
+			ct := ac.transport
+			ac.mu.Unlock()
 			return ct, nil
+		case ac.state == TransientFailure && failFast:
+			ac.mu.Unlock()
+			return nil, Errorf(codes.Unavailable, "grpc: RPC failed fast due to transport failure")
 		default:
-			ready := cc.ready
+			ready := ac.ready
 			if ready == nil {
 				ready = make(chan struct{})
-				cc.ready = ready
+				ac.ready = ready
 			}
-			cc.mu.Unlock()
+			ac.mu.Unlock()
 			select {
 			case <-ctx.Done():
-				return nil, transport.ContextErr(ctx.Err())
+				return nil, toRPCErr(ctx.Err())
 			// Wait until the new transport is ready or failed.
 			case <-ready:
 			}
@@ -559,32 +679,46 @@ func (cc *Conn) Wait(ctx context.Context) (transport.ClientTransport, error) {
 	}
 }
 
-// Close starts to tear down the Conn. Returns ErrClientConnClosing if
-// it has been closed (mostly due to dial time-out).
+// tearDown starts to tear down the addrConn.
 // TODO(zhaoq): Make this synchronous to avoid unbounded memory consumption in
-// some edge cases (e.g., the caller opens and closes many ClientConn's in a
+// some edge cases (e.g., the caller opens and closes many addrConn's in a
 // tight loop.
-func (cc *Conn) Close() error {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	if cc.state == Shutdown {
-		return ErrClientConnClosing
-	}
-	cc.state = Shutdown
-	cc.stateCV.Broadcast()
-	if cc.events != nil {
-		cc.events.Finish()
-		cc.events = nil
-	}
-	if cc.ready != nil {
-		close(cc.ready)
-		cc.ready = nil
-	}
-	if cc.transport != nil {
-		cc.transport.Close()
+func (ac *addrConn) tearDown(err error) {
+	ac.mu.Lock()
+	defer func() {
+		ac.mu.Unlock()
+		ac.cc.mu.Lock()
+		if ac.cc.conns != nil {
+			delete(ac.cc.conns, ac.addr)
+		}
+		ac.cc.mu.Unlock()
+	}()
+	if ac.state == Shutdown {
+		return
+	}
+	ac.state = Shutdown
+	if ac.down != nil {
+		ac.down(downErrorf(false, false, "%v", err))
+		ac.down = nil
+	}
+	ac.stateCV.Broadcast()
+	if ac.events != nil {
+		ac.events.Finish()
+		ac.events = nil
+	}
+	if ac.ready != nil {
+		close(ac.ready)
+		ac.ready = nil
+	}
+	if ac.transport != nil {
+		if err == errConnDrain {
+			ac.transport.GracefulClose()
+		} else {
+			ac.transport.Close()
+		}
 	}
-	if cc.shutdownChan != nil {
-		close(cc.shutdownChan)
+	if ac.shutdownChan != nil {
+		close(ac.shutdownChan)
 	}
-	return nil
+	return
 }
diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go
index 681f64e445..8d4c57ccf6 100644
--- a/vendor/google.golang.org/grpc/credentials/credentials.go
+++ b/vendor/google.golang.org/grpc/credentials/credentials.go
@@ -54,9 +54,9 @@ var (
 	alpnProtoStr = []string{"h2"}
 )
 
-// Credentials defines the common interface all supported credentials must
-// implement.
-type Credentials interface {
+// PerRPCCredentials defines the common interface for the credentials which need to
+// attach security information to every RPC (e.g., oauth2).
+type PerRPCCredentials interface {
 	// GetRequestMetadata gets the current request metadata, refreshing
 	// tokens if required. This should be called by the transport layer on
 	// each request, and the data should be populated in headers or other
@@ -66,7 +66,7 @@ type Credentials interface {
 	// TODO(zhaoq): Define the set of the qualified keys instead of leaving
 	// it as an arbitrary string.
 	GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error)
-	// RequireTransportSecurity indicates whether the credentails requires
+	// RequireTransportSecurity indicates whether the credentials requires
 	// transport security.
 	RequireTransportSecurity() bool
 }
@@ -87,9 +87,9 @@ type AuthInfo interface {
 	AuthType() string
 }
 
-// TransportAuthenticator defines the common interface for all the live gRPC wire
+// TransportCredentials defines the common interface for all the live gRPC wire
 // protocols and supported transport security protocols (e.g., TLS, SSL).
-type TransportAuthenticator interface {
+type TransportCredentials interface {
 	// ClientHandshake does the authentication handshake specified by the corresponding
 	// authentication protocol on rawConn for clients. It returns the authenticated
 	// connection and the corresponding auth information about the connection.
@@ -98,9 +98,8 @@ type TransportAuthenticator interface {
 	// the authenticated connection and the corresponding auth information about
 	// the connection.
 	ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error)
-	// Info provides the ProtocolInfo of this TransportAuthenticator.
+	// Info provides the ProtocolInfo of this TransportCredentials.
 	Info() ProtocolInfo
-	Credentials
 }
 
 // TLSInfo contains the auth information for a TLS authenticated connection.
@@ -109,6 +108,7 @@ type TLSInfo struct {
 	State tls.ConnectionState
 }
 
+// AuthType returns the type of TLSInfo as a string.
 func (t TLSInfo) AuthType() string {
 	return "tls"
 }
@@ -116,7 +116,7 @@ func (t TLSInfo) AuthType() string {
 // tlsCreds is the credentials required for authenticating a connection using TLS.
 type tlsCreds struct {
 	// TLS configuration
-	config tls.Config
+	config *tls.Config
 }
 
 func (c tlsCreds) Info() ProtocolInfo {
@@ -151,14 +151,16 @@ func (c *tlsCreds) ClientHandshake(addr string, rawConn net.Conn, timeout time.D
 			errChannel <- timeoutError{}
 		})
 	}
+	// use local cfg to avoid clobbering ServerName if using multiple endpoints
+	cfg := *c.config
 	if c.config.ServerName == "" {
 		colonPos := strings.LastIndex(addr, ":")
 		if colonPos == -1 {
 			colonPos = len(addr)
 		}
-		c.config.ServerName = addr[:colonPos]
+		cfg.ServerName = addr[:colonPos]
 	}
-	conn := tls.Client(rawConn, &c.config)
+	conn := tls.Client(rawConn, &cfg)
 	if timeout == 0 {
 		err = conn.Handshake()
 	} else {
@@ -177,7 +179,7 @@ func (c *tlsCreds) ClientHandshake(addr string, rawConn net.Conn, timeout time.D
 }
 
 func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error) {
-	conn := tls.Server(rawConn, &c.config)
+	conn := tls.Server(rawConn, c.config)
 	if err := conn.Handshake(); err != nil {
 		rawConn.Close()
 		return nil, nil, err
@@ -185,20 +187,20 @@ func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error)
 	return conn, TLSInfo{conn.ConnectionState()}, nil
 }
 
-// NewTLS uses c to construct a TransportAuthenticator based on TLS.
-func NewTLS(c *tls.Config) TransportAuthenticator {
-	tc := &tlsCreds{*c}
+// NewTLS uses c to construct a TransportCredentials based on TLS.
+func NewTLS(c *tls.Config) TransportCredentials {
+	tc := &tlsCreds{c}
 	tc.config.NextProtos = alpnProtoStr
 	return tc
 }
 
 // NewClientTLSFromCert constructs a TLS from the input certificate for client.
-func NewClientTLSFromCert(cp *x509.CertPool, serverName string) TransportAuthenticator {
+func NewClientTLSFromCert(cp *x509.CertPool, serverName string) TransportCredentials {
 	return NewTLS(&tls.Config{ServerName: serverName, RootCAs: cp})
 }
 
 // NewClientTLSFromFile constructs a TLS from the input certificate file for client.
-func NewClientTLSFromFile(certFile, serverName string) (TransportAuthenticator, error) {
+func NewClientTLSFromFile(certFile, serverName string) (TransportCredentials, error) {
 	b, err := ioutil.ReadFile(certFile)
 	if err != nil {
 		return nil, err
@@ -211,13 +213,13 @@ func NewClientTLSFromFile(certFile, serverName string) (TransportAuthenticator,
 }
 
 // NewServerTLSFromCert constructs a TLS from the input certificate for server.
-func NewServerTLSFromCert(cert *tls.Certificate) TransportAuthenticator {
+func NewServerTLSFromCert(cert *tls.Certificate) TransportCredentials {
 	return NewTLS(&tls.Config{Certificates: []tls.Certificate{*cert}})
 }
 
 // NewServerTLSFromFile constructs a TLS from the input certificate file and key
 // file for server.
-func NewServerTLSFromFile(certFile, keyFile string) (TransportAuthenticator, error) {
+func NewServerTLSFromFile(certFile, keyFile string) (TransportCredentials, error) {
 	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
 	if err != nil {
 		return nil, err
diff --git a/vendor/google.golang.org/grpc/interceptor.go b/vendor/google.golang.org/grpc/interceptor.go
new file mode 100644
index 0000000000..588f59e5ab
--- /dev/null
+++ b/vendor/google.golang.org/grpc/interceptor.go
@@ -0,0 +1,74 @@
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package grpc
+
+import (
+	"golang.org/x/net/context"
+)
+
+// UnaryServerInfo consists of various information about a unary RPC on
+// server side. All per-rpc information may be mutated by the interceptor.
+type UnaryServerInfo struct {
+	// Server is the service implementation the user provides. This is read-only.
+	Server interface{}
+	// FullMethod is the full RPC method string, i.e., /package.service/method.
+	FullMethod string
+}
+
+// UnaryHandler defines the handler invoked by UnaryServerInterceptor to complete the normal
+// execution of a unary RPC.
+type UnaryHandler func(ctx context.Context, req interface{}) (interface{}, error)
+
+// UnaryServerInterceptor provides a hook to intercept the execution of a unary RPC on the server. info
+// contains all the information of this RPC the interceptor can operate on. And handler is the wrapper
+// of the service method implementation. It is the responsibility of the interceptor to invoke handler
+// to complete the RPC.
+type UnaryServerInterceptor func(ctx context.Context, req interface{}, info *UnaryServerInfo, handler UnaryHandler) (resp interface{}, err error)
+
+// StreamServerInfo consists of various information about a streaming RPC on
+// server side. All per-rpc information may be mutated by the interceptor.
+type StreamServerInfo struct {
+	// FullMethod is the full RPC method string, i.e., /package.service/method.
+	FullMethod string
+	// IsClientStream indicates whether the RPC is a client streaming RPC.
+	IsClientStream bool
+	// IsServerStream indicates whether the RPC is a server streaming RPC.
+	IsServerStream bool
+}
+
+// StreamServerInterceptor provides a hook to intercept the execution of a streaming RPC on the server.
+// info contains all the information of this RPC the interceptor can operate on. And handler is the
+// service method implementation. It is the responsibility of the interceptor to invoke handler to
+// complete the RPC.
+type StreamServerInterceptor func(srv interface{}, ss ServerStream, info *StreamServerInfo, handler StreamHandler) error
diff --git a/vendor/google.golang.org/grpc/naming/naming.go b/vendor/google.golang.org/grpc/naming/naming.go
index 06605607c3..c2e0871e6f 100644
--- a/vendor/google.golang.org/grpc/naming/naming.go
+++ b/vendor/google.golang.org/grpc/naming/naming.go
@@ -66,7 +66,8 @@ type Resolver interface {
 // Watcher watches for the updates on the specified target.
 type Watcher interface {
 	// Next blocks until an update or error happens. It may return one or more
-	// updates. The first call should get the full set of the results.
+	// updates. The first call should get the full set of the results. It should
+	// return an error if and only if Watcher cannot recover.
 	Next() ([]*Update, error)
 	// Close closes the Watcher.
 	Close()
diff --git a/vendor/google.golang.org/grpc/picker.go b/vendor/google.golang.org/grpc/picker.go
deleted file mode 100644
index 50f315b44f..0000000000
--- a/vendor/google.golang.org/grpc/picker.go
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- *
- * Copyright 2014, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package grpc
-
-import (
-	"container/list"
-	"fmt"
-	"sync"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/naming"
-	"google.golang.org/grpc/transport"
-)
-
-// Picker picks a Conn for RPC requests.
-// This is EXPERIMENTAL and please do not implement your own Picker for now.
-type Picker interface {
-	// Init does initial processing for the Picker, e.g., initiate some connections.
-	Init(cc *ClientConn) error
-	// Pick blocks until either a transport.ClientTransport is ready for the upcoming RPC
-	// or some error happens.
-	Pick(ctx context.Context) (transport.ClientTransport, error)
-	// PickAddr picks a peer address for connecting. This will be called repeated for
-	// connecting/reconnecting.
-	PickAddr() (string, error)
-	// State returns the connectivity state of the underlying connections.
-	State() (ConnectivityState, error)
-	// WaitForStateChange blocks until the state changes to something other than
-	// the sourceState. It returns the new state or error.
-	WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error)
-	// Close closes all the Conn's owned by this Picker.
-	Close() error
-}
-
-// unicastPicker is the default Picker which is used when there is no custom Picker
-// specified by users. It always picks the same Conn.
-type unicastPicker struct {
-	target string
-	conn   *Conn
-}
-
-func (p *unicastPicker) Init(cc *ClientConn) error {
-	c, err := NewConn(cc)
-	if err != nil {
-		return err
-	}
-	p.conn = c
-	return nil
-}
-
-func (p *unicastPicker) Pick(ctx context.Context) (transport.ClientTransport, error) {
-	return p.conn.Wait(ctx)
-}
-
-func (p *unicastPicker) PickAddr() (string, error) {
-	return p.target, nil
-}
-
-func (p *unicastPicker) State() (ConnectivityState, error) {
-	return p.conn.State(), nil
-}
-
-func (p *unicastPicker) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
-	return p.conn.WaitForStateChange(ctx, sourceState)
-}
-
-func (p *unicastPicker) Close() error {
-	if p.conn != nil {
-		return p.conn.Close()
-	}
-	return nil
-}
-
-// unicastNamingPicker picks an address from a name resolver to set up the connection.
-type unicastNamingPicker struct {
-	cc       *ClientConn
-	resolver naming.Resolver
-	watcher  naming.Watcher
-	mu       sync.Mutex
-	// The list of the addresses are obtained from watcher.
-	addrs *list.List
-	// It tracks the current picked addr by PickAddr(). The next PickAddr may
-	// push it forward on addrs.
-	pickedAddr *list.Element
-	conn       *Conn
-}
-
-// NewUnicastNamingPicker creates a Picker to pick addresses from a name resolver
-// to connect.
-func NewUnicastNamingPicker(r naming.Resolver) Picker {
-	return &unicastNamingPicker{
-		resolver: r,
-		addrs:    list.New(),
-	}
-}
-
-type addrInfo struct {
-	addr string
-	// Set to true if this addrInfo needs to be deleted in the next PickAddrr() call.
-	deleting bool
-}
-
-// processUpdates calls Watcher.Next() once and processes the obtained updates.
-func (p *unicastNamingPicker) processUpdates() error {
-	updates, err := p.watcher.Next()
-	if err != nil {
-		return err
-	}
-	for _, update := range updates {
-		switch update.Op {
-		case naming.Add:
-			p.mu.Lock()
-			p.addrs.PushBack(&addrInfo{
-				addr: update.Addr,
-			})
-			p.mu.Unlock()
-			// Initial connection setup
-			if p.conn == nil {
-				conn, err := NewConn(p.cc)
-				if err != nil {
-					return err
-				}
-				p.conn = conn
-			}
-		case naming.Delete:
-			p.mu.Lock()
-			for e := p.addrs.Front(); e != nil; e = e.Next() {
-				if update.Addr == e.Value.(*addrInfo).addr {
-					if e == p.pickedAddr {
-						// Do not remove the element now if it is the current picked
-						// one. We leave the deletion to the next PickAddr() call.
-						e.Value.(*addrInfo).deleting = true
-						// Notify Conn to close it. All the live RPCs on this connection
-						// will be aborted.
-						p.conn.NotifyReset()
-					} else {
-						p.addrs.Remove(e)
-					}
-				}
-			}
-			p.mu.Unlock()
-		default:
-			grpclog.Println("Unknown update.Op ", update.Op)
-		}
-	}
-	return nil
-}
-
-// monitor runs in a standalone goroutine to keep watching name resolution updates until the watcher
-// is closed.
-func (p *unicastNamingPicker) monitor() {
-	for {
-		if err := p.processUpdates(); err != nil {
-			return
-		}
-	}
-}
-
-func (p *unicastNamingPicker) Init(cc *ClientConn) error {
-	w, err := p.resolver.Resolve(cc.target)
-	if err != nil {
-		return err
-	}
-	p.watcher = w
-	p.cc = cc
-	// Get the initial name resolution.
-	if err := p.processUpdates(); err != nil {
-		return err
-	}
-	go p.monitor()
-	return nil
-}
-
-func (p *unicastNamingPicker) Pick(ctx context.Context) (transport.ClientTransport, error) {
-	return p.conn.Wait(ctx)
-}
-
-func (p *unicastNamingPicker) PickAddr() (string, error) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.pickedAddr == nil {
-		p.pickedAddr = p.addrs.Front()
-	} else {
-		pa := p.pickedAddr
-		p.pickedAddr = pa.Next()
-		if pa.Value.(*addrInfo).deleting {
-			p.addrs.Remove(pa)
-		}
-		if p.pickedAddr == nil {
-			p.pickedAddr = p.addrs.Front()
-		}
-	}
-	if p.pickedAddr == nil {
-		return "", fmt.Errorf("there is no address available to pick")
-	}
-	return p.pickedAddr.Value.(*addrInfo).addr, nil
-}
-
-func (p *unicastNamingPicker) State() (ConnectivityState, error) {
-	return 0, fmt.Errorf("State() is not supported for unicastNamingPicker")
-}
-
-func (p *unicastNamingPicker) WaitForStateChange(ctx context.Context, sourceState ConnectivityState) (ConnectivityState, error) {
-	return 0, fmt.Errorf("WaitForStateChange is not supported for unicastNamingPciker")
-}
-
-func (p *unicastNamingPicker) Close() error {
-	p.watcher.Close()
-	p.conn.Close()
-	return nil
-}
diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go
index 66d34eb95a..d628717560 100644
--- a/vendor/google.golang.org/grpc/rpc_util.go
+++ b/vendor/google.golang.org/grpc/rpc_util.go
@@ -41,9 +41,7 @@ import (
 	"io"
 	"io/ioutil"
 	"math"
-	"math/rand"
 	"os"
-	"time"
 
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
@@ -63,7 +61,7 @@ type Codec interface {
 	String() string
 }
 
-// protoCodec is a Codec implemetation with protobuf. It is the default codec for gRPC.
+// protoCodec is a Codec implementation with protobuf. It is the default codec for gRPC.
 type protoCodec struct{}
 
 func (protoCodec) Marshal(v interface{}) ([]byte, error) {
@@ -143,6 +141,8 @@ type callInfo struct {
 	traceInfo traceInfo // in trace.go
 }
 
+var defaultCallInfo = callInfo{failFast: true}
+
 // CallOption configures a Call before it starts or extracts information from
 // a Call after it completes.
 type CallOption interface {
@@ -181,6 +181,19 @@ func Trailer(md *metadata.MD) CallOption {
 	})
 }
 
+// FailFast configures the action to take when an RPC is attempted on broken
+// connections or unreachable servers. If failfast is true, the RPC will fail
+// immediately. Otherwise, the RPC client will block the call until a
+// connection is available (or the call is canceled or times out) and will retry
+// the call if it fails due to a transient error. Please refer to
+// https://github.com/grpc/grpc/blob/master/doc/fail_fast.md
+func FailFast(failFast bool) CallOption {
+	return beforeCall(func(c *callInfo) error {
+		c.failFast = failFast
+		return nil
+	})
+}
+
 // The format of the payload: compressed or not?
 type payloadFormat uint8
 
@@ -189,7 +202,7 @@ const (
 	compressionMade
 )
 
-// parser reads complelete gRPC messages from the underlying reader.
+// parser reads complete gRPC messages from the underlying reader.
 type parser struct {
 	// r is the underlying reader.
 	// See the comment on recvMsg for the permissible
@@ -286,14 +299,11 @@ func checkRecvPayload(pf payloadFormat, recvCompress string, dc Decompressor) er
 	switch pf {
 	case compressionNone:
 	case compressionMade:
-		if recvCompress == "" {
-			return transport.StreamErrorf(codes.InvalidArgument, "grpc: invalid grpc-encoding %q with compression enabled", recvCompress)
-		}
 		if dc == nil || recvCompress != dc.Type() {
-			return transport.StreamErrorf(codes.InvalidArgument, "grpc: Decompressor is not installed for grpc-encoding %q", recvCompress)
+			return transport.StreamErrorf(codes.Unimplemented, "grpc: Decompressor is not installed for grpc-encoding %q", recvCompress)
 		}
 	default:
-		return transport.StreamErrorf(codes.InvalidArgument, "grpc: received unexpected payload format %d", pf)
+		return transport.StreamErrorf(codes.Internal, "grpc: received unexpected payload format %d", pf)
 	}
 	return nil
 }
@@ -324,8 +334,8 @@ type rpcError struct {
 	desc string
 }
 
-func (e rpcError) Error() string {
-	return fmt.Sprintf("rpc error: code = %d desc = %q", e.code, e.desc)
+func (e *rpcError) Error() string {
+	return fmt.Sprintf("rpc error: code = %d desc = %s", e.code, e.desc)
 }
 
 // Code returns the error code for err if it was produced by the rpc system.
@@ -334,7 +344,7 @@ func Code(err error) codes.Code {
 	if err == nil {
 		return codes.OK
 	}
-	if e, ok := err.(rpcError); ok {
+	if e, ok := err.(*rpcError); ok {
 		return e.code
 	}
 	return codes.Unknown
@@ -346,7 +356,7 @@ func ErrorDesc(err error) string {
 	if err == nil {
 		return ""
 	}
-	if e, ok := err.(rpcError); ok {
+	if e, ok := err.(*rpcError); ok {
 		return e.desc
 	}
 	return err.Error()
@@ -358,7 +368,7 @@ func Errorf(c codes.Code, format string, a ...interface{}) error {
 	if c == codes.OK {
 		return nil
 	}
-	return rpcError{
+	return &rpcError{
 		code: c,
 		desc: fmt.Sprintf(format, a...),
 	}
@@ -367,18 +377,37 @@ func Errorf(c codes.Code, format string, a ...interface{}) error {
 // toRPCErr converts an error into a rpcError.
 func toRPCErr(err error) error {
 	switch e := err.(type) {
-	case rpcError:
+	case *rpcError:
 		return err
 	case transport.StreamError:
-		return rpcError{
+		return &rpcError{
 			code: e.Code,
 			desc: e.Desc,
 		}
 	case transport.ConnectionError:
-		return rpcError{
+		return &rpcError{
 			code: codes.Internal,
 			desc: e.Desc,
 		}
+	default:
+		switch err {
+		case context.DeadlineExceeded:
+			return &rpcError{
+				code: codes.DeadlineExceeded,
+				desc: err.Error(),
+			}
+		case context.Canceled:
+			return &rpcError{
+				code: codes.Canceled,
+				desc: err.Error(),
+			}
+		case ErrClientConnClosing:
+			return &rpcError{
+				code: codes.FailedPrecondition,
+				desc: err.Error(),
+			}
+		}
+
 	}
 	return Errorf(codes.Unknown, "%v", err)
 }
@@ -411,34 +440,10 @@ func convertCode(err error) codes.Code {
 	return codes.Unknown
 }
 
-const (
-	// how long to wait after the first failure before retrying
-	baseDelay = 1.0 * time.Second
-	// upper bound of backoff delay
-	maxDelay = 120 * time.Second
-	// backoff increases by this factor on each retry
-	backoffFactor = 1.6
-	// backoff is randomized downwards by this factor
-	backoffJitter = 0.2
-)
-
-func backoff(retries int) (t time.Duration) {
-	if retries == 0 {
-		return baseDelay
-	}
-	backoff, max := float64(baseDelay), float64(maxDelay)
-	for backoff < max && retries > 0 {
-		backoff *= backoffFactor
-		retries--
-	}
-	if backoff > max {
-		backoff = max
-	}
-	// Randomize backoff delays so that if a cluster of requests start at
-	// the same time, they won't operate in lockstep.
-	backoff *= 1 + backoffJitter*(rand.Float64()*2-1)
-	if backoff < 0 {
-		return 0
-	}
-	return time.Duration(backoff)
-}
+// SupportPackageIsVersion3 is referenced from generated protocol buffer files
+// to assert that that code is compatible with this version of the grpc package.
+//
+// This constant may be renamed in the future if a change in the generated code
+// requires a synchronised update of grpc-go and protoc-gen-go. This constant
+// should not be referenced from any other code.
+const SupportPackageIsVersion3 = true
diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go
index 927b1c5e1e..a2b2b94d48 100644
--- a/vendor/google.golang.org/grpc/server.go
+++ b/vendor/google.golang.org/grpc/server.go
@@ -57,7 +57,7 @@ import (
 	"google.golang.org/grpc/transport"
 )
 
-type methodHandler func(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error)
+type methodHandler func(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor UnaryServerInterceptor) (interface{}, error)
 
 // MethodDesc represents an RPC service's method specification.
 type MethodDesc struct {
@@ -73,6 +73,7 @@ type ServiceDesc struct {
 	HandlerType interface{}
 	Methods     []MethodDesc
 	Streams     []StreamDesc
+	Metadata    interface{}
 }
 
 // service consists of the information of the server serving this service and
@@ -81,6 +82,7 @@ type service struct {
 	server interface{} // the server for service methods
 	md     map[string]*MethodDesc
 	sd     map[string]*StreamDesc
+	mdata  interface{}
 }
 
 // Server is a gRPC server to serve RPC requests.
@@ -95,10 +97,12 @@ type Server struct {
 }
 
 type options struct {
-	creds                credentials.Credentials
+	creds                credentials.TransportCredentials
 	codec                Codec
 	cp                   Compressor
 	dc                   Decompressor
+	unaryInt             UnaryServerInterceptor
+	streamInt            StreamServerInterceptor
 	maxConcurrentStreams uint32
 	useHandlerImpl       bool // use http.Handler-based server
 }
@@ -113,12 +117,14 @@ func CustomCodec(codec Codec) ServerOption {
 	}
 }
 
+// RPCCompressor returns a ServerOption that sets a compressor for outbound message.
 func RPCCompressor(cp Compressor) ServerOption {
 	return func(o *options) {
 		o.cp = cp
 	}
 }
 
+// RPCDecompressor returns a ServerOption that sets a decompressor for inbound message.
 func RPCDecompressor(dc Decompressor) ServerOption {
 	return func(o *options) {
 		o.dc = dc
@@ -134,12 +140,35 @@ func MaxConcurrentStreams(n uint32) ServerOption {
 }
 
 // Creds returns a ServerOption that sets credentials for server connections.
-func Creds(c credentials.Credentials) ServerOption {
+func Creds(c credentials.TransportCredentials) ServerOption {
 	return func(o *options) {
 		o.creds = c
 	}
 }
 
+// UnaryInterceptor returns a ServerOption that sets the UnaryServerInterceptor for the
+// server. Only one unary interceptor can be installed. The construction of multiple
+// interceptors (e.g., chaining) can be implemented at the caller.
+func UnaryInterceptor(i UnaryServerInterceptor) ServerOption {
+	return func(o *options) {
+		if o.unaryInt != nil {
+			panic("The unary server interceptor has been set.")
+		}
+		o.unaryInt = i
+	}
+}
+
+// StreamInterceptor returns a ServerOption that sets the StreamServerInterceptor for the
+// server. Only one stream interceptor can be installed.
+func StreamInterceptor(i StreamServerInterceptor) ServerOption {
+	return func(o *options) {
+		if o.streamInt != nil {
+			panic("The stream server interceptor has been set.")
+		}
+		o.streamInt = i
+	}
+}
+
 // NewServer creates a gRPC server which has no service registered and has not
 // started to accept requests yet.
 func NewServer(opt ...ServerOption) *Server {
@@ -203,6 +232,7 @@ func (s *Server) register(sd *ServiceDesc, ss interface{}) {
 		server: ss,
 		md:     make(map[string]*MethodDesc),
 		sd:     make(map[string]*StreamDesc),
+		mdata:  sd.Metadata,
 	}
 	for i := range sd.Methods {
 		d := &sd.Methods[i]
@@ -215,6 +245,52 @@ func (s *Server) register(sd *ServiceDesc, ss interface{}) {
 	s.m[sd.ServiceName] = srv
 }
 
+// MethodInfo contains the information of an RPC including its method name and type.
+type MethodInfo struct {
+	// Name is the method name only, without the service name or package name.
+	Name string
+	// IsClientStream indicates whether the RPC is a client streaming RPC.
+	IsClientStream bool
+	// IsServerStream indicates whether the RPC is a server streaming RPC.
+	IsServerStream bool
+}
+
+// ServiceInfo contains unary RPC method info, streaming RPC methid info and metadata for a service.
+type ServiceInfo struct {
+	Methods []MethodInfo
+	// Metadata is the metadata specified in ServiceDesc when registering service.
+	Metadata interface{}
+}
+
+// GetServiceInfo returns a map from service names to ServiceInfo.
+// Service names include the package names, in the form of <package>.<service>.
+func (s *Server) GetServiceInfo() map[string]*ServiceInfo {
+	ret := make(map[string]*ServiceInfo)
+	for n, srv := range s.m {
+		methods := make([]MethodInfo, 0, len(srv.md)+len(srv.sd))
+		for m := range srv.md {
+			methods = append(methods, MethodInfo{
+				Name:           m,
+				IsClientStream: false,
+				IsServerStream: false,
+			})
+		}
+		for m, d := range srv.sd {
+			methods = append(methods, MethodInfo{
+				Name:           m,
+				IsClientStream: d.ClientStreams,
+				IsServerStream: d.ServerStreams,
+			})
+		}
+
+		ret[n] = &ServiceInfo{
+			Methods:  methods,
+			Metadata: srv.mdata,
+		}
+	}
+	return ret
+}
+
 var (
 	// ErrServerStopped indicates that the operation is now illegal because of
 	// the server being stopped.
@@ -222,33 +298,35 @@ var (
 )
 
 func (s *Server) useTransportAuthenticator(rawConn net.Conn) (net.Conn, credentials.AuthInfo, error) {
-	creds, ok := s.opts.creds.(credentials.TransportAuthenticator)
-	if !ok {
+	if s.opts.creds == nil {
 		return rawConn, nil, nil
 	}
-	return creds.ServerHandshake(rawConn)
+	return s.opts.creds.ServerHandshake(rawConn)
 }
 
 // Serve accepts incoming connections on the listener lis, creating a new
 // ServerTransport and service goroutine for each. The service goroutines
 // read gRPC requests and then call the registered handlers to reply to them.
-// Service returns when lis.Accept fails.
+// Service returns when lis.Accept fails. lis will be closed when
+// this method returns.
 func (s *Server) Serve(lis net.Listener) error {
 	s.mu.Lock()
 	s.printf("serving")
 	if s.lis == nil {
 		s.mu.Unlock()
+		lis.Close()
 		return ErrServerStopped
 	}
 	s.lis[lis] = true
 	s.mu.Unlock()
 	defer func() {
-		lis.Close()
 		s.mu.Lock()
-		delete(s.lis, lis)
+		if s.lis != nil && s.lis[lis] {
+			lis.Close()
+			delete(s.lis, lis)
+		}
 		s.mu.Unlock()
 	}()
-	listenerAddr := lis.Addr()
 	for {
 		rawConn, err := lis.Accept()
 		if err != nil {
@@ -259,13 +337,13 @@ func (s *Server) Serve(lis net.Listener) error {
 		}
 		// Start a new goroutine to deal with rawConn
 		// so we don't stall this Accept loop goroutine.
-		go s.handleRawConn(listenerAddr, rawConn)
+		go s.handleRawConn(rawConn)
 	}
 }
 
 // handleRawConn is run in its own goroutine and handles a just-accepted
 // connection that has not had any I/O performed on it yet.
-func (s *Server) handleRawConn(listenerAddr net.Addr, rawConn net.Conn) {
+func (s *Server) handleRawConn(rawConn net.Conn) {
 	conn, authInfo, err := s.useTransportAuthenticator(rawConn)
 	if err != nil {
 		s.mu.Lock()
@@ -285,7 +363,7 @@ func (s *Server) handleRawConn(listenerAddr net.Addr, rawConn net.Conn) {
 	s.mu.Unlock()
 
 	if s.opts.useHandlerImpl {
-		s.serveUsingHandler(listenerAddr, conn)
+		s.serveUsingHandler(conn)
 	} else {
 		s.serveNewHTTP2Transport(conn, authInfo)
 	}
@@ -341,29 +419,18 @@ var _ http.Handler = (*Server)(nil)
 // method as one of the environment types.
 //
 // conn is the *tls.Conn that's already been authenticated.
-func (s *Server) serveUsingHandler(listenerAddr net.Addr, conn net.Conn) {
+func (s *Server) serveUsingHandler(conn net.Conn) {
 	if !s.addConn(conn) {
 		conn.Close()
 		return
 	}
 	defer s.removeConn(conn)
-	connDone := make(chan struct{})
-	hs := &http.Server{
-		Handler: s,
-		ConnState: func(c net.Conn, cs http.ConnState) {
-			if cs == http.StateClosed {
-				close(connDone)
-			}
-		},
-	}
-	if err := http2.ConfigureServer(hs, &http2.Server{
+	h2s := &http2.Server{
 		MaxConcurrentStreams: s.opts.maxConcurrentStreams,
-	}); err != nil {
-		grpclog.Fatalf("grpc: http2.ConfigureServer: %v", err)
-		return
 	}
-	hs.Serve(&singleConnListener{addr: listenerAddr, conn: conn})
-	<-connDone
+	h2s.ServeConn(conn, &http2.ServeConnOpts{
+		Handler: s,
+	})
 }
 
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -447,6 +514,10 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 			}
 		}()
 	}
+	if s.opts.cp != nil {
+		// NOTE: this needs to be ahead of all handling, https://github.com/grpc/grpc-go/issues/686.
+		stream.SetSendCompress(s.opts.cp.Type())
+	}
 	p := &parser{r: stream}
 	for {
 		pf, req, err := p.recvMsg()
@@ -506,9 +577,9 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 			}
 			return nil
 		}
-		reply, appErr := md.Handler(srv.server, stream.Context(), df)
+		reply, appErr := md.Handler(srv.server, stream.Context(), df, s.opts.unaryInt)
 		if appErr != nil {
-			if err, ok := appErr.(rpcError); ok {
+			if err, ok := appErr.(*rpcError); ok {
 				statusCode = err.code
 				statusDesc = err.desc
 			} else {
@@ -532,9 +603,6 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 			Last:  true,
 			Delay: false,
 		}
-		if s.opts.cp != nil {
-			stream.SetSendCompress(s.opts.cp.Type())
-		}
 		if err := s.sendResponse(t, stream, reply, s.opts.cp, opts); err != nil {
 			switch err := err.(type) {
 			case transport.ConnectionError:
@@ -584,8 +652,19 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
 			ss.mu.Unlock()
 		}()
 	}
-	if appErr := sd.Handler(srv.server, ss); appErr != nil {
-		if err, ok := appErr.(rpcError); ok {
+	var appErr error
+	if s.opts.streamInt == nil {
+		appErr = sd.Handler(srv.server, ss)
+	} else {
+		info := &StreamServerInfo{
+			FullMethod:     stream.Method(),
+			IsClientStream: sd.ClientStreams,
+			IsServerStream: sd.ServerStreams,
+		}
+		appErr = s.opts.streamInt(srv.server, ss, info, sd.Handler)
+	}
+	if appErr != nil {
+		if err, ok := appErr.(*rpcError); ok {
 			ss.statusCode = err.code
 			ss.statusDesc = err.desc
 		} else if err, ok := appErr.(transport.StreamError); ok {
@@ -756,30 +835,3 @@ func SetTrailer(ctx context.Context, md metadata.MD) error {
 	}
 	return stream.SetTrailer(md)
 }
-
-// singleConnListener is a net.Listener that yields a single conn.
-type singleConnListener struct {
-	mu   sync.Mutex
-	addr net.Addr
-	conn net.Conn // nil if done
-}
-
-func (ln *singleConnListener) Addr() net.Addr { return ln.addr }
-
-func (ln *singleConnListener) Close() error {
-	ln.mu.Lock()
-	defer ln.mu.Unlock()
-	ln.conn = nil
-	return nil
-}
-
-func (ln *singleConnListener) Accept() (net.Conn, error) {
-	ln.mu.Lock()
-	defer ln.mu.Unlock()
-	c := ln.conn
-	if c == nil {
-		return nil, io.EOF
-	}
-	ln.conn = nil
-	return c, nil
-}
diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go
index dba7f6c420..7a3bef511b 100644
--- a/vendor/google.golang.org/grpc/stream.go
+++ b/vendor/google.golang.org/grpc/stream.go
@@ -47,12 +47,14 @@ import (
 	"google.golang.org/grpc/transport"
 )
 
-type streamHandler func(srv interface{}, stream ServerStream) error
+// StreamHandler defines the handler called by gRPC server to complete the
+// execution of a streaming RPC.
+type StreamHandler func(srv interface{}, stream ServerStream) error
 
 // StreamDesc represents a streaming RPC service's method specification.
 type StreamDesc struct {
 	StreamName string
-	Handler    streamHandler
+	Handler    StreamHandler
 
 	// At least one of these is true.
 	ServerStreams bool
@@ -67,7 +69,8 @@ type Stream interface {
 	// breaks.
 	// On error, it aborts the stream and returns an RPC status on client
 	// side. On server side, it simply returns the error to the caller.
-	// SendMsg is called by generated code.
+	// SendMsg is called by generated code. Also Users can call SendMsg
+	// directly when it is really needed in their use cases.
 	SendMsg(m interface{}) error
 	// RecvMsg blocks until it receives a message or the stream is
 	// done. On client side, it returns io.EOF when the stream is done. On
@@ -76,9 +79,9 @@ type Stream interface {
 	RecvMsg(m interface{}) error
 }
 
-// ClientStream defines the interface a client stream has to satify.
+// ClientStream defines the interface a client stream has to satisfy.
 type ClientStream interface {
-	// Header returns the header metedata received from the server if there
+	// Header returns the header metadata received from the server if there
 	// is any. It blocks if the metadata is not ready to read.
 	Header() (metadata.MD, error)
 	// Trailer returns the trailer metadata from the server. It must be called
@@ -99,13 +102,16 @@ type ClientStream interface {
 func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error) {
 	var (
 		t   transport.ClientTransport
+		s   *transport.Stream
 		err error
+		put func()
 	)
-	t, err = cc.dopts.picker.Pick(ctx)
-	if err != nil {
-		return nil, toRPCErr(err)
+	c := defaultCallInfo
+	for _, o := range opts {
+		if err := o.before(&c); err != nil {
+			return nil, toRPCErr(err)
+		}
 	}
-	// TODO(zhaoq): CallOption is omitted. Add support when it is needed.
 	callHdr := &transport.CallHdr{
 		Host:   cc.authority,
 		Method: method,
@@ -115,6 +121,8 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 		callHdr.SendCompress = cc.dopts.cp.Type()
 	}
 	cs := &clientStream{
+		opts:    opts,
+		c:       c,
 		desc:    desc,
 		codec:   cc.dopts.codec,
 		cp:      cc.dopts.cp,
@@ -134,11 +142,44 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 		cs.trInfo.tr.LazyLog(&cs.trInfo.firstLine, false)
 		ctx = trace.NewContext(ctx, cs.trInfo.tr)
 	}
-	s, err := t.NewStream(ctx, callHdr)
-	if err != nil {
-		cs.finish(err)
-		return nil, toRPCErr(err)
+	gopts := BalancerGetOptions{
+		BlockingWait: !c.failFast,
 	}
+	for {
+		t, put, err = cc.getTransport(ctx, gopts)
+		if err != nil {
+			// TODO(zhaoq): Probably revisit the error handling.
+			if _, ok := err.(*rpcError); ok {
+				return nil, err
+			}
+			if err == errConnClosing {
+				if c.failFast {
+					return nil, Errorf(codes.Unavailable, "%v", errConnClosing)
+				}
+				continue
+			}
+			// All the other errors are treated as Internal errors.
+			return nil, Errorf(codes.Internal, "%v", err)
+		}
+
+		s, err = t.NewStream(ctx, callHdr)
+		if err != nil {
+			if put != nil {
+				put()
+				put = nil
+			}
+			if _, ok := err.(transport.ConnectionError); ok {
+				if c.failFast {
+					cs.finish(err)
+					return nil, toRPCErr(err)
+				}
+				continue
+			}
+			return nil, toRPCErr(err)
+		}
+		break
+	}
+	cs.put = put
 	cs.t = t
 	cs.s = s
 	cs.p = &parser{r: s}
@@ -159,6 +200,8 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 
 // clientStream implements a client side Stream.
 type clientStream struct {
+	opts  []CallOption
+	c     callInfo
 	t     transport.ClientTransport
 	s     *transport.Stream
 	p     *parser
@@ -171,6 +214,7 @@ type clientStream struct {
 	tracing bool // set to EnableTracing when the clientStream is created.
 
 	mu     sync.Mutex
+	put    func()
 	closed bool
 	// trInfo.tr is set when the clientStream is created (if EnableTracing is true),
 	// and is set to nil when the clientStream's finish method is called.
@@ -257,7 +301,7 @@ func (cs *clientStream) RecvMsg(m interface{}) (err error) {
 				cs.finish(err)
 				return nil
 			}
-			return Errorf(cs.s.StatusCode(), cs.s.StatusDesc())
+			return Errorf(cs.s.StatusCode(), "%s", cs.s.StatusDesc())
 		}
 		return toRPCErr(err)
 	}
@@ -269,7 +313,7 @@ func (cs *clientStream) RecvMsg(m interface{}) (err error) {
 			// Returns io.EOF to indicate the end of the stream.
 			return
 		}
-		return Errorf(cs.s.StatusCode(), cs.s.StatusDesc())
+		return Errorf(cs.s.StatusCode(), "%s", cs.s.StatusDesc())
 	}
 	return toRPCErr(err)
 }
@@ -303,11 +347,18 @@ func (cs *clientStream) closeTransportStream(err error) {
 }
 
 func (cs *clientStream) finish(err error) {
+	cs.mu.Lock()
+	defer cs.mu.Unlock()
+	for _, o := range cs.opts {
+		o.after(&cs.c)
+	}
+	if cs.put != nil {
+		cs.put()
+		cs.put = nil
+	}
 	if !cs.tracing {
 		return
 	}
-	cs.mu.Lock()
-	defer cs.mu.Unlock()
 	if cs.trInfo.tr != nil {
 		if err == nil || err == io.EOF {
 			cs.trInfo.tr.LazyPrintf("RPC: [OK]")
diff --git a/vendor/google.golang.org/grpc/trace.go b/vendor/google.golang.org/grpc/trace.go
index cde04fbfc9..f6747e1dfa 100644
--- a/vendor/google.golang.org/grpc/trace.go
+++ b/vendor/google.golang.org/grpc/trace.go
@@ -101,9 +101,8 @@ type payload struct {
 func (p payload) String() string {
 	if p.sent {
 		return fmt.Sprintf("sent: %v", p.msg)
-	} else {
-		return fmt.Sprintf("recv: %v", p.msg)
 	}
+	return fmt.Sprintf("recv: %v", p.msg)
 }
 
 type fmtStringer struct {
diff --git a/vendor/google.golang.org/grpc/transport/control.go b/vendor/google.golang.org/grpc/transport/control.go
index f6b38a5a6d..7e9bdf3350 100644
--- a/vendor/google.golang.org/grpc/transport/control.go
+++ b/vendor/google.golang.org/grpc/transport/control.go
@@ -56,43 +56,33 @@ type windowUpdate struct {
 	increment uint32
 }
 
-func (windowUpdate) isItem() bool {
-	return true
-}
+func (*windowUpdate) item() {}
 
 type settings struct {
 	ack bool
 	ss  []http2.Setting
 }
 
-func (settings) isItem() bool {
-	return true
-}
+func (*settings) item() {}
 
 type resetStream struct {
 	streamID uint32
 	code     http2.ErrCode
 }
 
-func (resetStream) isItem() bool {
-	return true
-}
+func (*resetStream) item() {}
 
 type flushIO struct {
 }
 
-func (flushIO) isItem() bool {
-	return true
-}
+func (*flushIO) item() {}
 
 type ping struct {
 	ack  bool
 	data [8]byte
 }
 
-func (ping) isItem() bool {
-	return true
-}
+func (*ping) item() {}
 
 // quotaPool is a pool which accumulates the quota and sends it to acquire()
 // when it is available.
@@ -172,10 +162,6 @@ func (qb *quotaPool) acquire() <-chan int {
 type inFlow struct {
 	// The inbound flow control limit for pending data.
 	limit uint32
-	// conn points to the shared connection-level inFlow that is shared
-	// by all streams on that conn. It is nil for the inFlow on the conn
-	// directly.
-	conn *inFlow
 
 	mu sync.Mutex
 	// pendingData is the overall data which have been received but not been
@@ -186,75 +172,39 @@ type inFlow struct {
 	pendingUpdate uint32
 }
 
-// onData is invoked when some data frame is received. It increments not only its
-// own pendingData but also that of the associated connection-level flow.
+// onData is invoked when some data frame is received. It updates pendingData.
 func (f *inFlow) onData(n uint32) error {
-	if n == 0 {
-		return nil
-	}
 	f.mu.Lock()
 	defer f.mu.Unlock()
-	if f.pendingData+f.pendingUpdate+n > f.limit {
-		return fmt.Errorf("recieved %d-bytes data exceeding the limit %d bytes", f.pendingData+f.pendingUpdate+n, f.limit)
-	}
-	if f.conn != nil {
-		if err := f.conn.onData(n); err != nil {
-			return ConnectionErrorf("%v", err)
-		}
-	}
 	f.pendingData += n
-	return nil
-}
-
-// connOnRead updates the connection level states when the application consumes data.
-func (f *inFlow) connOnRead(n uint32) uint32 {
-	if n == 0 || f.conn != nil {
-		return 0
-	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	f.pendingData -= n
-	f.pendingUpdate += n
-	if f.pendingUpdate >= f.limit/4 {
-		ret := f.pendingUpdate
-		f.pendingUpdate = 0
-		return ret
+	if f.pendingData+f.pendingUpdate > f.limit {
+		return fmt.Errorf("received %d-bytes data exceeding the limit %d bytes", f.pendingData+f.pendingUpdate, f.limit)
 	}
-	return 0
+	return nil
 }
 
-// onRead is invoked when the application reads the data. It returns the window updates
-// for both stream and connection level.
-func (f *inFlow) onRead(n uint32) (swu, cwu uint32) {
-	if n == 0 {
-		return
-	}
+// onRead is invoked when the application reads the data. It returns the window size
+// to be sent to the peer.
+func (f *inFlow) onRead(n uint32) uint32 {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 	if f.pendingData == 0 {
-		// pendingData has been adjusted by restoreConn.
-		return
+		return 0
 	}
 	f.pendingData -= n
 	f.pendingUpdate += n
 	if f.pendingUpdate >= f.limit/4 {
-		swu = f.pendingUpdate
+		wu := f.pendingUpdate
 		f.pendingUpdate = 0
+		return wu
 	}
-	cwu = f.conn.connOnRead(n)
-	return
+	return 0
 }
 
-// restoreConn is invoked when a stream is terminated. It removes its stake in
-// the connection-level flow and resets its own state.
-func (f *inFlow) restoreConn() uint32 {
-	if f.conn == nil {
-		return 0
-	}
+func (f *inFlow) resetPendingData() uint32 {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 	n := f.pendingData
 	f.pendingData = 0
-	f.pendingUpdate = 0
-	return f.conn.connOnRead(n)
+	return n
 }
diff --git a/vendor/google.golang.org/grpc/transport/handler_server.go b/vendor/google.golang.org/grpc/transport/handler_server.go
index 63ba0537a1..4b0d525243 100644
--- a/vendor/google.golang.org/grpc/transport/handler_server.go
+++ b/vendor/google.golang.org/grpc/transport/handler_server.go
@@ -65,7 +65,7 @@ func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request) (ServerTr
 	if r.Method != "POST" {
 		return nil, errors.New("invalid gRPC request method")
 	}
-	if !strings.Contains(r.Header.Get("Content-Type"), "application/grpc") {
+	if !validContentType(r.Header.Get("Content-Type")) {
 		return nil, errors.New("invalid gRPC request content-type")
 	}
 	if _, ok := w.(http.Flusher); !ok {
@@ -92,9 +92,12 @@ func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request) (ServerTr
 	}
 
 	var metakv []string
+	if r.Host != "" {
+		metakv = append(metakv, ":authority", r.Host)
+	}
 	for k, vv := range r.Header {
 		k = strings.ToLower(k)
-		if isReservedHeader(k) {
+		if isReservedHeader(k) && !isWhitelistedPseudoHeader(k) {
 			continue
 		}
 		for _, v := range vv {
@@ -108,7 +111,6 @@ func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request) (ServerTr
 				}
 			}
 			metakv = append(metakv, k, v)
-
 		}
 	}
 	st.headerMD = metadata.Pairs(metakv...)
@@ -118,7 +120,7 @@ func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request) (ServerTr
 
 // serverHandlerTransport is an implementation of ServerTransport
 // which replies to exactly one gRPC request (exactly one HTTP request),
-// using the net/http.Handler interface. This http.Handler is guranteed
+// using the net/http.Handler interface. This http.Handler is guaranteed
 // at this point to be speaking over HTTP/2, so it's able to speak valid
 // gRPC.
 type serverHandlerTransport struct {
@@ -196,6 +198,10 @@ func (ht *serverHandlerTransport) WriteStatus(s *Stream, statusCode codes.Code,
 		}
 		if md := s.Trailer(); len(md) > 0 {
 			for k, vv := range md {
+				// Clients don't tolerate reading restricted headers after some non restricted ones were sent.
+				if isReservedHeader(k) {
+					continue
+				}
 				for _, v := range vv {
 					// http2 ResponseWriter mechanism to
 					// send undeclared Trailers after the
@@ -249,6 +255,10 @@ func (ht *serverHandlerTransport) WriteHeader(s *Stream, md metadata.MD) error {
 		ht.writeCommonHeaders(s)
 		h := ht.rw.Header()
 		for k, vv := range md {
+			// Clients don't tolerate reading restricted headers after some non restricted ones were sent.
+			if isReservedHeader(k) {
+				continue
+			}
 			for _, v := range vv {
 				h.Add(k, v)
 			}
@@ -302,7 +312,7 @@ func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream)) {
 		Addr: ht.RemoteAddr(),
 	}
 	if req.TLS != nil {
-		pr.AuthInfo = credentials.TLSInfo{*req.TLS}
+		pr.AuthInfo = credentials.TLSInfo{State: *req.TLS}
 	}
 	ctx = metadata.NewContext(ctx, ht.headerMD)
 	ctx = peer.NewContext(ctx, pr)
@@ -313,16 +323,22 @@ func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream)) {
 	readerDone := make(chan struct{})
 	go func() {
 		defer close(readerDone)
-		for {
-			buf := make([]byte, 1024) // TODO: minimize garbage, optimize recvBuffer code/ownership
+
+		// TODO: minimize garbage, optimize recvBuffer code/ownership
+		const readSize = 8196
+		for buf := make([]byte, readSize); ; {
 			n, err := req.Body.Read(buf)
 			if n > 0 {
-				s.buf.put(&recvMsg{data: buf[:n]})
+				s.buf.put(&recvMsg{data: buf[:n:n]})
+				buf = buf[n:]
 			}
 			if err != nil {
 				s.buf.put(&recvMsg{err: mapRecvMsgError(err)})
 				return
 			}
+			if len(buf) == 0 {
+				buf = make([]byte, readSize)
+			}
 		}
 	}()
 
diff --git a/vendor/google.golang.org/grpc/transport/http2_client.go b/vendor/google.golang.org/grpc/transport/http2_client.go
index bb72fea3ff..f66435fdbd 100644
--- a/vendor/google.golang.org/grpc/transport/http2_client.go
+++ b/vendor/google.golang.org/grpc/transport/http2_client.go
@@ -35,7 +35,6 @@ package transport
 
 import (
 	"bytes"
-	"errors"
 	"io"
 	"math"
 	"net"
@@ -89,7 +88,7 @@ type http2Client struct {
 	// The scheme used: https if TLS is on, http otherwise.
 	scheme string
 
-	authCreds []credentials.Credentials
+	creds []credentials.PerRPCCredentials
 
 	mu            sync.Mutex     // guard the following variables
 	state         transportState // the state of underlying connection
@@ -118,19 +117,12 @@ func newHTTP2Client(addr string, opts *ConnectOptions) (_ ClientTransport, err e
 		return nil, ConnectionErrorf("transport: %v", connErr)
 	}
 	var authInfo credentials.AuthInfo
-	for _, c := range opts.AuthOptions {
-		if ccreds, ok := c.(credentials.TransportAuthenticator); ok {
-			scheme = "https"
-			// TODO(zhaoq): Now the first TransportAuthenticator is used if there are
-			// multiple ones provided. Revisit this if it is not appropriate. Probably
-			// place the ClientTransport construction into a separate function to make
-			// things clear.
-			if timeout > 0 {
-				timeout -= time.Since(startT)
-			}
-			conn, authInfo, connErr = ccreds.ClientHandshake(addr, conn, timeout)
-			break
+	if opts.TransportCredentials != nil {
+		scheme = "https"
+		if timeout > 0 {
+			timeout -= time.Since(startT)
 		}
+		conn, authInfo, connErr = opts.TransportCredentials.ClientHandshake(addr, conn, timeout)
 	}
 	if connErr != nil {
 		return nil, ConnectionErrorf("transport: %v", connErr)
@@ -140,29 +132,6 @@ func newHTTP2Client(addr string, opts *ConnectOptions) (_ ClientTransport, err e
 			conn.Close()
 		}
 	}()
-	// Send connection preface to server.
-	n, err := conn.Write(clientPreface)
-	if err != nil {
-		return nil, ConnectionErrorf("transport: %v", err)
-	}
-	if n != len(clientPreface) {
-		return nil, ConnectionErrorf("transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface))
-	}
-	framer := newFramer(conn)
-	if initialWindowSize != defaultWindowSize {
-		err = framer.writeSettings(true, http2.Setting{http2.SettingInitialWindowSize, uint32(initialWindowSize)})
-	} else {
-		err = framer.writeSettings(true)
-	}
-	if err != nil {
-		return nil, ConnectionErrorf("transport: %v", err)
-	}
-	// Adjust the connection flow control window if needed.
-	if delta := uint32(initialConnWindowSize - defaultWindowSize); delta > 0 {
-		if err := framer.writeWindowUpdate(true, 0, delta); err != nil {
-			return nil, ConnectionErrorf("transport: %v", err)
-		}
-	}
 	ua := primaryUA
 	if opts.UserAgent != "" {
 		ua = opts.UserAgent + " " + ua
@@ -178,7 +147,7 @@ func newHTTP2Client(addr string, opts *ConnectOptions) (_ ClientTransport, err e
 		writableChan:    make(chan int, 1),
 		shutdownChan:    make(chan struct{}),
 		errorChan:       make(chan struct{}),
-		framer:          framer,
+		framer:          newFramer(conn),
 		hBuf:            &buf,
 		hEnc:            hpack.NewEncoder(&buf),
 		controlBuf:      newRecvBuffer(),
@@ -187,32 +156,56 @@ func newHTTP2Client(addr string, opts *ConnectOptions) (_ ClientTransport, err e
 		scheme:          scheme,
 		state:           reachable,
 		activeStreams:   make(map[uint32]*Stream),
-		authCreds:       opts.AuthOptions,
+		creds:           opts.PerRPCCredentials,
 		maxStreams:      math.MaxInt32,
 		streamSendQuota: defaultWindowSize,
 	}
+	// Start the reader goroutine for incoming message. Each transport has
+	// a dedicated goroutine which reads HTTP2 frame from network. Then it
+	// dispatches the frame to the corresponding stream entity.
+	go t.reader()
+	// Send connection preface to server.
+	n, err := t.conn.Write(clientPreface)
+	if err != nil {
+		t.Close()
+		return nil, ConnectionErrorf("transport: %v", err)
+	}
+	if n != len(clientPreface) {
+		t.Close()
+		return nil, ConnectionErrorf("transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface))
+	}
+	if initialWindowSize != defaultWindowSize {
+		err = t.framer.writeSettings(true, http2.Setting{
+			ID:  http2.SettingInitialWindowSize,
+			Val: uint32(initialWindowSize),
+		})
+	} else {
+		err = t.framer.writeSettings(true)
+	}
+	if err != nil {
+		t.Close()
+		return nil, ConnectionErrorf("transport: %v", err)
+	}
+	// Adjust the connection flow control window if needed.
+	if delta := uint32(initialConnWindowSize - defaultWindowSize); delta > 0 {
+		if err := t.framer.writeWindowUpdate(true, 0, delta); err != nil {
+			t.Close()
+			return nil, ConnectionErrorf("transport: %v", err)
+		}
+	}
 	go t.controller()
 	t.writableChan <- 0
-	// Start the reader goroutine for incoming message. The threading model
-	// on receiving is that each transport has a dedicated goroutine which
-	// reads HTTP2 frame from network. Then it dispatches the frame to the
-	// corresponding stream entity.
-	go t.reader()
 	return t, nil
 }
 
 func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
-	fc := &inFlow{
-		limit: initialWindowSize,
-		conn:  t.fc,
-	}
 	// TODO(zhaoq): Handle uint32 overflow of Stream.id.
 	s := &Stream{
 		id:            t.nextID,
 		method:        callHdr.Method,
 		sendCompress:  callHdr.SendCompress,
 		buf:           newRecvBuffer(),
-		fc:            fc,
+		fc:            &inFlow{limit: initialWindowSize},
 		sendQuotaPool: newQuotaPool(int(t.streamSendQuota)),
 		headerChan:    make(chan struct{}),
 	}
@@ -236,9 +229,11 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 	var timeout time.Duration
 	if dl, ok := ctx.Deadline(); ok {
 		timeout = dl.Sub(time.Now())
-		if timeout <= 0 {
-			return nil, ContextErr(context.DeadlineExceeded)
-		}
+	}
+	select {
+	case <-ctx.Done():
+		return nil, ContextErr(ctx.Err())
+	default:
 	}
 	pr := &peer.Peer{
 		Addr: t.conn.RemoteAddr(),
@@ -249,7 +244,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 	}
 	ctx = peer.NewContext(ctx, pr)
 	authData := make(map[string]string)
-	for _, c := range t.authCreds {
+	for _, c := range t.creds {
 		// Construct URI required to get auth request metadata.
 		var port string
 		if pos := strings.LastIndex(t.target, ":"); pos != -1 {
@@ -272,6 +267,10 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		}
 	}
 	t.mu.Lock()
+	if t.activeStreams == nil {
+		t.mu.Unlock()
+		return nil, ErrConnClosing
+	}
 	if t.state != reachable {
 		t.mu.Unlock()
 		return nil, ErrConnClosing
@@ -289,7 +288,10 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		}
 	}
 	if _, err := wait(ctx, t.shutdownChan, t.writableChan); err != nil {
-		// t.streamsQuota will be updated when t.CloseStream is invoked.
+		// Return the quota back now because there is no stream returned to the caller.
+		if _, ok := err.(StreamError); ok && checkStreamsQuota {
+			t.streamsQuota.add(1)
+		}
 		return nil, err
 	}
 	t.mu.Lock()
@@ -330,6 +332,8 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-timeout", Value: timeoutEncode(timeout)})
 	}
 	for k, v := range authData {
+		// Capital header names are illegal in HTTP/2.
+		k = strings.ToLower(k)
 		t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: v})
 	}
 	var (
@@ -339,6 +343,10 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 	if md, ok := metadata.FromContext(ctx); ok {
 		hasMD = true
 		for k, v := range md {
+			// HTTP doesn't allow you to set pseudoheaders after non pseudoheaders were set.
+			if isReservedHeader(k) {
+				continue
+			}
 			for _, entry := range v {
 				t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
 			}
@@ -388,9 +396,19 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 func (t *http2Client) CloseStream(s *Stream, err error) {
 	var updateStreams bool
 	t.mu.Lock()
+	if t.activeStreams == nil {
+		t.mu.Unlock()
+		return
+	}
 	if t.streamsQuota != nil {
 		updateStreams = true
 	}
+	if t.state == draining && len(t.activeStreams) == 1 {
+		// The transport is draining and s is the last live stream on t.
+		t.mu.Unlock()
+		t.Close()
+		return
+	}
 	delete(t.activeStreams, s.id)
 	t.mu.Unlock()
 	if updateStreams {
@@ -402,8 +420,10 @@ func (t *http2Client) CloseStream(s *Stream, err error) {
 	// other goroutines.
 	s.cancel()
 	s.mu.Lock()
-	if q := s.fc.restoreConn(); q > 0 {
-		t.controlBuf.put(&windowUpdate{0, q})
+	if q := s.fc.resetPendingData(); q > 0 {
+		if n := t.fc.onRead(q); n > 0 {
+			t.controlBuf.put(&windowUpdate{0, n})
+		}
 	}
 	if s.state == streamDone {
 		s.mu.Unlock()
@@ -425,9 +445,12 @@ func (t *http2Client) CloseStream(s *Stream, err error) {
 // accessed any more.
 func (t *http2Client) Close() (err error) {
 	t.mu.Lock()
+	if t.state == reachable {
+		close(t.errorChan)
+	}
 	if t.state == closing {
 		t.mu.Unlock()
-		return errors.New("transport: Close() was already called")
+		return
 	}
 	t.state = closing
 	t.mu.Unlock()
@@ -450,6 +473,25 @@ func (t *http2Client) Close() (err error) {
 	return
 }
 
+func (t *http2Client) GracefulClose() error {
+	t.mu.Lock()
+	if t.state == closing {
+		t.mu.Unlock()
+		return nil
+	}
+	if t.state == draining {
+		t.mu.Unlock()
+		return nil
+	}
+	t.state = draining
+	active := len(t.activeStreams)
+	t.mu.Unlock()
+	if active == 0 {
+		return t.Close()
+	}
+	return nil
+}
+
 // Write formats the data into HTTP2 data frame(s) and sends it out. The caller
 // should proceed only if Write returns nil.
 // TODO(zhaoq): opts.Delay is ignored in this implementation. Support it later
@@ -503,6 +545,10 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
 		t.framer.adjustNumWriters(1)
 		// Got some quota. Try to acquire writing privilege on the transport.
 		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+			if _, ok := err.(StreamError); ok {
+				// Return the connection quota back.
+				t.sendQuotaPool.add(len(p))
+			}
 			if t.framer.adjustNumWriters(-1) == 0 {
 				// This writer is the last one in this batch and has the
 				// responsibility to flush the buffered frames. It queues
@@ -512,6 +558,16 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
 			}
 			return err
 		}
+		select {
+		case <-s.ctx.Done():
+			t.sendQuotaPool.add(len(p))
+			if t.framer.adjustNumWriters(-1) == 0 {
+				t.controlBuf.put(&flushIO{})
+			}
+			t.writableChan <- 0
+			return ContextErr(s.ctx.Err())
+		default:
+		}
 		if r.Len() == 0 && t.framer.adjustNumWriters(0) == 1 {
 			// Do a force flush iff this is last frame for the entire gRPC message
 			// and the caller is the only writer at this moment.
@@ -550,47 +606,52 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
 func (t *http2Client) getStream(f http2.Frame) (*Stream, bool) {
 	t.mu.Lock()
 	defer t.mu.Unlock()
-	if t.activeStreams == nil {
-		// The transport is closing.
-		return nil, false
-	}
-	if s, ok := t.activeStreams[f.Header().StreamID]; ok {
-		return s, true
-	}
-	return nil, false
+	s, ok := t.activeStreams[f.Header().StreamID]
+	return s, ok
 }
 
 // updateWindow adjusts the inbound quota for the stream and the transport.
 // Window updates will deliver to the controller for sending when
 // the cumulative quota exceeds the corresponding threshold.
 func (t *http2Client) updateWindow(s *Stream, n uint32) {
-	swu, cwu := s.fc.onRead(n)
-	if swu > 0 {
-		t.controlBuf.put(&windowUpdate{s.id, swu})
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	if s.state == streamDone {
+		return
 	}
-	if cwu > 0 {
-		t.controlBuf.put(&windowUpdate{0, cwu})
+	if w := t.fc.onRead(n); w > 0 {
+		t.controlBuf.put(&windowUpdate{0, w})
+	}
+	if w := s.fc.onRead(n); w > 0 {
+		t.controlBuf.put(&windowUpdate{s.id, w})
 	}
 }
 
 func (t *http2Client) handleData(f *http2.DataFrame) {
+	size := len(f.Data())
+	if err := t.fc.onData(uint32(size)); err != nil {
+		t.notifyError(ConnectionErrorf("%v", err))
+		return
+	}
 	// Select the right stream to dispatch.
 	s, ok := t.getStream(f)
 	if !ok {
+		if w := t.fc.onRead(uint32(size)); w > 0 {
+			t.controlBuf.put(&windowUpdate{0, w})
+		}
 		return
 	}
-	size := len(f.Data())
 	if size > 0 {
-		if err := s.fc.onData(uint32(size)); err != nil {
-			if _, ok := err.(ConnectionError); ok {
-				t.notifyError(err)
-				return
-			}
-			s.mu.Lock()
-			if s.state == streamDone {
-				s.mu.Unlock()
-				return
+		s.mu.Lock()
+		if s.state == streamDone {
+			s.mu.Unlock()
+			// The stream has been closed. Release the corresponding quota.
+			if w := t.fc.onRead(uint32(size)); w > 0 {
+				t.controlBuf.put(&windowUpdate{0, w})
 			}
+			return
+		}
+		if err := s.fc.onData(uint32(size)); err != nil {
 			s.state = streamDone
 			s.statusCode = codes.Internal
 			s.statusDesc = err.Error()
@@ -599,6 +660,7 @@ func (t *http2Client) handleData(f *http2.DataFrame) {
 			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeFlowControl})
 			return
 		}
+		s.mu.Unlock()
 		// TODO(bradfitz, zhaoq): A copy is required here because there is no
 		// guarantee f.Data() is consumed before the arrival of next frame.
 		// Can this copy be eliminated?
@@ -640,6 +702,7 @@ func (t *http2Client) handleRSTStream(f *http2.RSTStreamFrame) {
 	s.statusCode, ok = http2ErrConvTab[http2.ErrCode(f.ErrCode)]
 	if !ok {
 		grpclog.Println("transport: http2Client.handleRSTStream found no mapped gRPC status for the received http2 error ", f.ErrCode)
+		s.statusCode = codes.Unknown
 	}
 	s.mu.Unlock()
 	s.write(recvMsg{err: io.EOF})
@@ -680,54 +743,59 @@ func (t *http2Client) handleWindowUpdate(f *http2.WindowUpdateFrame) {
 	}
 }
 
-// operateHeader takes action on the decoded headers. It returns the current
-// stream if there are remaining headers on the wire (in the following
-// Continuation frame).
-func (t *http2Client) operateHeaders(hDec *hpackDecoder, s *Stream, frame headerFrame, endStream bool) (pendingStream *Stream) {
-	defer func() {
-		if pendingStream == nil {
-			hDec.state = decodeState{}
-		}
-	}()
-	endHeaders, err := hDec.decodeClientHTTP2Headers(frame)
-	if s == nil {
-		// s has been closed.
-		return nil
+// operateHeaders takes action on the decoded headers.
+func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
+	s, ok := t.getStream(frame)
+	if !ok {
+		return
 	}
-	if err != nil {
-		s.write(recvMsg{err: err})
-		// Something wrong. Stops reading even when there is remaining.
-		return nil
+	var state decodeState
+	for _, hf := range frame.Fields {
+		state.processHeaderField(hf)
 	}
-	if !endHeaders {
-		return s
+	if state.err != nil {
+		s.write(recvMsg{err: state.err})
+		// Something wrong. Stops reading even when there is remaining.
+		return
 	}
+
+	endStream := frame.StreamEnded()
+
 	s.mu.Lock()
 	if !endStream {
-		s.recvCompress = hDec.state.encoding
+		s.recvCompress = state.encoding
 	}
 	if !s.headerDone {
-		if !endStream && len(hDec.state.mdata) > 0 {
-			s.header = hDec.state.mdata
+		if !endStream && len(state.mdata) > 0 {
+			s.header = state.mdata
 		}
 		close(s.headerChan)
 		s.headerDone = true
 	}
 	if !endStream || s.state == streamDone {
 		s.mu.Unlock()
-		return nil
+		return
 	}
 
-	if len(hDec.state.mdata) > 0 {
-		s.trailer = hDec.state.mdata
+	if len(state.mdata) > 0 {
+		s.trailer = state.mdata
 	}
 	s.state = streamDone
-	s.statusCode = hDec.state.statusCode
-	s.statusDesc = hDec.state.statusDesc
+	s.statusCode = state.statusCode
+	s.statusDesc = state.statusDesc
 	s.mu.Unlock()
 
 	s.write(recvMsg{err: io.EOF})
-	return nil
+}
+
+func handleMalformedHTTP2(s *Stream, err error) {
+	s.mu.Lock()
+	if !s.headerDone {
+		close(s.headerChan)
+		s.headerDone = true
+	}
+	s.mu.Unlock()
+	s.write(recvMsg{err: err})
 }
 
 // reader runs as a separate goroutine in charge of reading data from network
@@ -750,25 +818,31 @@ func (t *http2Client) reader() {
 	}
 	t.handleSettings(sf)
 
-	hDec := newHPACKDecoder()
-	var curStream *Stream
 	// loop to keep reading incoming messages on this transport.
 	for {
 		frame, err := t.framer.readFrame()
 		if err != nil {
-			t.notifyError(err)
-			return
+			// Abort an active stream if the http2.Framer returns a
+			// http2.StreamError. This can happen only if the server's response
+			// is malformed http2.
+			if se, ok := err.(http2.StreamError); ok {
+				t.mu.Lock()
+				s := t.activeStreams[se.StreamID]
+				t.mu.Unlock()
+				if s != nil {
+					// use error detail to provide better err message
+					handleMalformedHTTP2(s, StreamErrorf(http2ErrConvTab[se.Code], "%v", t.framer.errorDetail()))
+				}
+				continue
+			} else {
+				// Transport error.
+				t.notifyError(err)
+				return
+			}
 		}
 		switch frame := frame.(type) {
-		case *http2.HeadersFrame:
-			// operateHeaders has to be invoked regardless the value of curStream
-			// because the HPACK decoder needs to be updated using the received
-			// headers.
-			curStream, _ = t.getStream(frame)
-			endStream := frame.Header().Flags.Has(http2.FlagHeadersEndStream)
-			curStream = t.operateHeaders(hDec, curStream, frame, endStream)
-		case *http2.ContinuationFrame:
-			curStream = t.operateHeaders(hDec, curStream, frame, frame.HeadersEnded())
+		case *http2.MetaHeadersFrame:
+			t.operateHeaders(frame)
 		case *http2.DataFrame:
 			t.handleData(frame)
 		case *http2.RSTStreamFrame:
diff --git a/vendor/google.golang.org/grpc/transport/http2_server.go b/vendor/google.golang.org/grpc/transport/http2_server.go
index b9d4959fea..cee1542976 100644
--- a/vendor/google.golang.org/grpc/transport/http2_server.go
+++ b/vendor/google.golang.org/grpc/transport/http2_server.go
@@ -100,10 +100,15 @@ func newHTTP2Server(conn net.Conn, maxStreams uint32, authInfo credentials.AuthI
 	if maxStreams == 0 {
 		maxStreams = math.MaxUint32
 	} else {
-		settings = append(settings, http2.Setting{http2.SettingMaxConcurrentStreams, maxStreams})
+		settings = append(settings, http2.Setting{
+			ID:  http2.SettingMaxConcurrentStreams,
+			Val: maxStreams,
+		})
 	}
 	if initialWindowSize != defaultWindowSize {
-		settings = append(settings, http2.Setting{http2.SettingInitialWindowSize, uint32(initialWindowSize)})
+		settings = append(settings, http2.Setting{
+			ID:  http2.SettingInitialWindowSize,
+			Val: uint32(initialWindowSize)})
 	}
 	if err := framer.writeSettings(true, settings...); err != nil {
 		return nil, ConnectionErrorf("transport: %v", err)
@@ -136,37 +141,34 @@ func newHTTP2Server(conn net.Conn, maxStreams uint32, authInfo credentials.AuthI
 	return t, nil
 }
 
-// operateHeader takes action on the decoded headers. It returns the current
-// stream if there are remaining headers on the wire (in the following
-// Continuation frame).
-func (t *http2Server) operateHeaders(hDec *hpackDecoder, s *Stream, frame headerFrame, endStream bool, handle func(*Stream)) (pendingStream *Stream) {
-	defer func() {
-		if pendingStream == nil {
-			hDec.state = decodeState{}
-		}
-	}()
-	endHeaders, err := hDec.decodeServerHTTP2Headers(frame)
-	if s == nil {
-		// s has been closed.
-		return nil
+// operateHeader takes action on the decoded headers.
+func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(*Stream)) {
+	buf := newRecvBuffer()
+	s := &Stream{
+		id:  frame.Header().StreamID,
+		st:  t,
+		buf: buf,
+		fc:  &inFlow{limit: initialWindowSize},
 	}
-	if err != nil {
-		grpclog.Printf("transport: http2Server.operateHeader found %v", err)
+
+	var state decodeState
+	for _, hf := range frame.Fields {
+		state.processHeaderField(hf)
+	}
+	if err := state.err; err != nil {
 		if se, ok := err.(StreamError); ok {
 			t.controlBuf.put(&resetStream{s.id, statusCodeConvTab[se.Code]})
 		}
-		return nil
+		return
 	}
-	if endStream {
+
+	if frame.StreamEnded() {
 		// s is just created by the caller. No lock needed.
 		s.state = streamReadDone
 	}
-	if !endHeaders {
-		return s
-	}
-	s.recvCompress = hDec.state.encoding
-	if hDec.state.timeoutSet {
-		s.ctx, s.cancel = context.WithTimeout(context.TODO(), hDec.state.timeout)
+	s.recvCompress = state.encoding
+	if state.timeoutSet {
+		s.ctx, s.cancel = context.WithTimeout(context.TODO(), state.timeout)
 	} else {
 		s.ctx, s.cancel = context.WithCancel(context.TODO())
 	}
@@ -183,25 +185,25 @@ func (t *http2Server) operateHeaders(hDec *hpackDecoder, s *Stream, frame header
 	// back to the client (unary call only).
 	s.ctx = newContextWithStream(s.ctx, s)
 	// Attach the received metadata to the context.
-	if len(hDec.state.mdata) > 0 {
-		s.ctx = metadata.NewContext(s.ctx, hDec.state.mdata)
+	if len(state.mdata) > 0 {
+		s.ctx = metadata.NewContext(s.ctx, state.mdata)
 	}
 
 	s.dec = &recvBufferReader{
 		ctx:  s.ctx,
 		recv: s.buf,
 	}
-	s.recvCompress = hDec.state.encoding
-	s.method = hDec.state.method
+	s.recvCompress = state.encoding
+	s.method = state.method
 	t.mu.Lock()
 	if t.state != reachable {
 		t.mu.Unlock()
-		return nil
+		return
 	}
 	if uint32(len(t.activeStreams)) >= t.maxStreams {
 		t.mu.Unlock()
 		t.controlBuf.put(&resetStream{s.id, http2.ErrCodeRefusedStream})
-		return nil
+		return
 	}
 	s.sendQuotaPool = newQuotaPool(int(t.streamSendQuota))
 	t.activeStreams[s.id] = s
@@ -210,7 +212,6 @@ func (t *http2Server) operateHeaders(hDec *hpackDecoder, s *Stream, frame header
 		t.updateWindow(s, uint32(n))
 	}
 	handle(s)
-	return nil
 }
 
 // HandleStreams receives incoming streams using the given handler. This is
@@ -243,16 +244,24 @@ func (t *http2Server) HandleStreams(handle func(*Stream)) {
 	}
 	t.handleSettings(sf)
 
-	hDec := newHPACKDecoder()
-	var curStream *Stream
 	for {
 		frame, err := t.framer.readFrame()
 		if err != nil {
+			if se, ok := err.(http2.StreamError); ok {
+				t.mu.Lock()
+				s := t.activeStreams[se.StreamID]
+				t.mu.Unlock()
+				if s != nil {
+					t.closeStream(s)
+				}
+				t.controlBuf.put(&resetStream{se.StreamID, se.Code})
+				continue
+			}
 			t.Close()
 			return
 		}
 		switch frame := frame.(type) {
-		case *http2.HeadersFrame:
+		case *http2.MetaHeadersFrame:
 			id := frame.Header().StreamID
 			if id%2 != 1 || id <= t.maxStreamID {
 				// illegal gRPC stream id.
@@ -261,21 +270,7 @@ func (t *http2Server) HandleStreams(handle func(*Stream)) {
 				break
 			}
 			t.maxStreamID = id
-			buf := newRecvBuffer()
-			fc := &inFlow{
-				limit: initialWindowSize,
-				conn:  t.fc,
-			}
-			curStream = &Stream{
-				id:  frame.Header().StreamID,
-				st:  t,
-				buf: buf,
-				fc:  fc,
-			}
-			endStream := frame.Header().Flags.Has(http2.FlagHeadersEndStream)
-			curStream = t.operateHeaders(hDec, curStream, frame, endStream, handle)
-		case *http2.ContinuationFrame:
-			curStream = t.operateHeaders(hDec, curStream, frame, frame.HeadersEnded(), handle)
+			t.operateHeaders(frame, handle)
 		case *http2.DataFrame:
 			t.handleData(frame)
 		case *http2.RSTStreamFrame:
@@ -313,33 +308,51 @@ func (t *http2Server) getStream(f http2.Frame) (*Stream, bool) {
 // Window updates will deliver to the controller for sending when
 // the cumulative quota exceeds the corresponding threshold.
 func (t *http2Server) updateWindow(s *Stream, n uint32) {
-	swu, cwu := s.fc.onRead(n)
-	if swu > 0 {
-		t.controlBuf.put(&windowUpdate{s.id, swu})
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	if s.state == streamDone {
+		return
 	}
-	if cwu > 0 {
-		t.controlBuf.put(&windowUpdate{0, cwu})
+	if w := t.fc.onRead(n); w > 0 {
+		t.controlBuf.put(&windowUpdate{0, w})
+	}
+	if w := s.fc.onRead(n); w > 0 {
+		t.controlBuf.put(&windowUpdate{s.id, w})
 	}
 }
 
 func (t *http2Server) handleData(f *http2.DataFrame) {
+	size := len(f.Data())
+	if err := t.fc.onData(uint32(size)); err != nil {
+		grpclog.Printf("transport: http2Server %v", err)
+		t.Close()
+		return
+	}
 	// Select the right stream to dispatch.
 	s, ok := t.getStream(f)
 	if !ok {
+		if w := t.fc.onRead(uint32(size)); w > 0 {
+			t.controlBuf.put(&windowUpdate{0, w})
+		}
 		return
 	}
-	size := len(f.Data())
 	if size > 0 {
-		if err := s.fc.onData(uint32(size)); err != nil {
-			if _, ok := err.(ConnectionError); ok {
-				grpclog.Printf("transport: http2Server %v", err)
-				t.Close()
-				return
+		s.mu.Lock()
+		if s.state == streamDone {
+			s.mu.Unlock()
+			// The stream has been closed. Release the corresponding quota.
+			if w := t.fc.onRead(uint32(size)); w > 0 {
+				t.controlBuf.put(&windowUpdate{0, w})
 			}
+			return
+		}
+		if err := s.fc.onData(uint32(size)); err != nil {
+			s.mu.Unlock()
 			t.closeStream(s)
 			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeFlowControl})
 			return
 		}
+		s.mu.Unlock()
 		// TODO(bradfitz, zhaoq): A copy is required here because there is no
 		// guarantee f.Data() is consumed before the arrival of next frame.
 		// Can this copy be eliminated?
@@ -452,6 +465,10 @@ func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
 		t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-encoding", Value: s.sendCompress})
 	}
 	for k, v := range md {
+		if isReservedHeader(k) {
+			// Clients don't tolerate reading restricted headers after some non restricted ones were sent.
+			continue
+		}
 		for _, entry := range v {
 			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
 		}
@@ -494,6 +511,10 @@ func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc s
 	t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-message", Value: statusDesc})
 	// Attach the trailer metadata.
 	for k, v := range s.trailer {
+		// Clients don't tolerate reading restricted headers after some non restricted ones were sent.
+		if isReservedHeader(k) {
+			continue
+		}
 		for _, entry := range v {
 			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
 		}
@@ -513,6 +534,10 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
 	// TODO(zhaoq): Support multi-writers for a single stream.
 	var writeHeaderFrame bool
 	s.mu.Lock()
+	if s.state == streamDone {
+		s.mu.Unlock()
+		return StreamErrorf(codes.Unknown, "the stream has been done")
+	}
 	if !s.headerOk {
 		writeHeaderFrame = true
 		s.headerOk = true
@@ -580,6 +605,10 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
 		// Got some quota. Try to acquire writing privilege on the
 		// transport.
 		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+			if _, ok := err.(StreamError); ok {
+				// Return the connection quota back.
+				t.sendQuotaPool.add(ps)
+			}
 			if t.framer.adjustNumWriters(-1) == 0 {
 				// This writer is the last one in this batch and has the
 				// responsibility to flush the buffered frames. It queues
@@ -589,6 +618,16 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
 			}
 			return err
 		}
+		select {
+		case <-s.ctx.Done():
+			t.sendQuotaPool.add(ps)
+			if t.framer.adjustNumWriters(-1) == 0 {
+				t.controlBuf.put(&flushIO{})
+			}
+			t.writableChan <- 0
+			return ContextErr(s.ctx.Err())
+		default:
+		}
 		var forceFlush bool
 		if r.Len() == 0 && t.framer.adjustNumWriters(0) == 1 && !opts.Last {
 			forceFlush = true
@@ -686,20 +725,22 @@ func (t *http2Server) closeStream(s *Stream) {
 	t.mu.Lock()
 	delete(t.activeStreams, s.id)
 	t.mu.Unlock()
-	if q := s.fc.restoreConn(); q > 0 {
-		t.controlBuf.put(&windowUpdate{0, q})
-	}
+	// In case stream sending and receiving are invoked in separate
+	// goroutines (e.g., bi-directional streaming), cancel needs to be
+	// called to interrupt the potential blocking on other goroutines.
+	s.cancel()
 	s.mu.Lock()
+	if q := s.fc.resetPendingData(); q > 0 {
+		if w := t.fc.onRead(q); w > 0 {
+			t.controlBuf.put(&windowUpdate{0, w})
+		}
+	}
 	if s.state == streamDone {
 		s.mu.Unlock()
 		return
 	}
 	s.state = streamDone
 	s.mu.Unlock()
-	// In case stream sending and receiving are invoked in separate
-	// goroutines (e.g., bi-directional streaming), cancel needs to be
-	// called to interrupt the potential blocking on other goroutines.
-	s.cancel()
 }
 
 func (t *http2Server) RemoteAddr() net.Addr {
diff --git a/vendor/google.golang.org/grpc/transport/http_util.go b/vendor/google.golang.org/grpc/transport/http_util.go
index ea7b39bff9..f2e23dcec3 100644
--- a/vendor/google.golang.org/grpc/transport/http_util.go
+++ b/vendor/google.golang.org/grpc/transport/http_util.go
@@ -69,6 +69,7 @@ var (
 		http2.ErrCodeInternal:           codes.Internal,
 		http2.ErrCodeFlowControl:        codes.ResourceExhausted,
 		http2.ErrCodeSettingsTimeout:    codes.Internal,
+		http2.ErrCodeStreamClosed:       codes.Internal,
 		http2.ErrCodeFrameSize:          codes.Internal,
 		http2.ErrCodeRefusedStream:      codes.Unavailable,
 		http2.ErrCodeCancel:             codes.Canceled,
@@ -90,6 +91,8 @@ var (
 // Records the states during HPACK decoding. Must be reset once the
 // decoding of the entire headers are finished.
 type decodeState struct {
+	err error // first error encountered decoding
+
 	encoding string
 	// statusCode caches the stream status received from the trailer
 	// the server sent. Client side only.
@@ -103,20 +106,6 @@ type decodeState struct {
 	mdata map[string][]string
 }
 
-// An hpackDecoder decodes HTTP2 headers which may span multiple frames.
-type hpackDecoder struct {
-	h     *hpack.Decoder
-	state decodeState
-	err   error // The err when decoding
-}
-
-// A headerFrame is either a http2.HeaderFrame or http2.ContinuationFrame.
-type headerFrame interface {
-	Header() http2.FrameHeader
-	HeaderBlockFragment() []byte
-	HeadersEnded() bool
-}
-
 // isReservedHeader checks whether hdr belongs to HTTP2 headers
 // reserved by gRPC protocol. Any other headers are classified as the
 // user-specified metadata.
@@ -138,100 +127,86 @@ func isReservedHeader(hdr string) bool {
 	}
 }
 
-func newHPACKDecoder() *hpackDecoder {
-	d := &hpackDecoder{}
-	d.h = hpack.NewDecoder(http2InitHeaderTableSize, func(f hpack.HeaderField) {
-		switch f.Name {
-		case "content-type":
-			if !strings.Contains(f.Value, "application/grpc") {
-				d.err = StreamErrorf(codes.FailedPrecondition, "transport: received the unexpected content-type %q", f.Value)
-				return
-			}
-		case "grpc-encoding":
-			d.state.encoding = f.Value
-		case "grpc-status":
-			code, err := strconv.Atoi(f.Value)
-			if err != nil {
-				d.err = StreamErrorf(codes.Internal, "transport: malformed grpc-status: %v", err)
-				return
-			}
-			d.state.statusCode = codes.Code(code)
-		case "grpc-message":
-			d.state.statusDesc = f.Value
-		case "grpc-timeout":
-			d.state.timeoutSet = true
-			var err error
-			d.state.timeout, err = timeoutDecode(f.Value)
-			if err != nil {
-				d.err = StreamErrorf(codes.Internal, "transport: malformed time-out: %v", err)
-				return
-			}
-		case ":path":
-			d.state.method = f.Value
-		default:
-			if !isReservedHeader(f.Name) {
-				if f.Name == "user-agent" {
-					i := strings.LastIndex(f.Value, " ")
-					if i == -1 {
-						// There is no application user agent string being set.
-						return
-					}
-					// Extract the application user agent string.
-					f.Value = f.Value[:i]
-				}
-				if d.state.mdata == nil {
-					d.state.mdata = make(map[string][]string)
-				}
-				k, v, err := metadata.DecodeKeyValue(f.Name, f.Value)
-				if err != nil {
-					grpclog.Printf("Failed to decode (%q, %q): %v", f.Name, f.Value, err)
-					return
-				}
-				d.state.mdata[k] = append(d.state.mdata[k], v)
-			}
-		}
-	})
-	return d
+// isWhitelistedPseudoHeader checks whether hdr belongs to HTTP2 pseudoheaders
+// that should be propagated into metadata visible to users.
+func isWhitelistedPseudoHeader(hdr string) bool {
+	switch hdr {
+	case ":authority":
+		return true
+	default:
+		return false
+	}
 }
 
-func (d *hpackDecoder) decodeClientHTTP2Headers(frame headerFrame) (endHeaders bool, err error) {
-	d.err = nil
-	_, err = d.h.Write(frame.HeaderBlockFragment())
-	if err != nil {
-		err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err)
+func (d *decodeState) setErr(err error) {
+	if d.err == nil {
+		d.err = err
 	}
+}
 
-	if frame.HeadersEnded() {
-		if closeErr := d.h.Close(); closeErr != nil && err == nil {
-			err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr)
-		}
-		endHeaders = true
+func validContentType(t string) bool {
+	e := "application/grpc"
+	if !strings.HasPrefix(t, e) {
+		return false
 	}
-
-	if err == nil && d.err != nil {
-		err = d.err
+	// Support variations on the content-type
+	// (e.g. "application/grpc+blah", "application/grpc;blah").
+	if len(t) > len(e) && t[len(e)] != '+' && t[len(e)] != ';' {
+		return false
 	}
-	return
+	return true
 }
 
-func (d *hpackDecoder) decodeServerHTTP2Headers(frame headerFrame) (endHeaders bool, err error) {
-	d.err = nil
-	_, err = d.h.Write(frame.HeaderBlockFragment())
-	if err != nil {
-		err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err)
-	}
-
-	if frame.HeadersEnded() {
-		if closeErr := d.h.Close(); closeErr != nil && err == nil {
-			err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr)
+func (d *decodeState) processHeaderField(f hpack.HeaderField) {
+	switch f.Name {
+	case "content-type":
+		if !validContentType(f.Value) {
+			d.setErr(StreamErrorf(codes.FailedPrecondition, "transport: received the unexpected content-type %q", f.Value))
+			return
+		}
+	case "grpc-encoding":
+		d.encoding = f.Value
+	case "grpc-status":
+		code, err := strconv.Atoi(f.Value)
+		if err != nil {
+			d.setErr(StreamErrorf(codes.Internal, "transport: malformed grpc-status: %v", err))
+			return
+		}
+		d.statusCode = codes.Code(code)
+	case "grpc-message":
+		d.statusDesc = f.Value
+	case "grpc-timeout":
+		d.timeoutSet = true
+		var err error
+		d.timeout, err = timeoutDecode(f.Value)
+		if err != nil {
+			d.setErr(StreamErrorf(codes.Internal, "transport: malformed time-out: %v", err))
+			return
+		}
+	case ":path":
+		d.method = f.Value
+	default:
+		if !isReservedHeader(f.Name) || isWhitelistedPseudoHeader(f.Name) {
+			if f.Name == "user-agent" {
+				i := strings.LastIndex(f.Value, " ")
+				if i == -1 {
+					// There is no application user agent string being set.
+					return
+				}
+				// Extract the application user agent string.
+				f.Value = f.Value[:i]
+			}
+			if d.mdata == nil {
+				d.mdata = make(map[string][]string)
+			}
+			k, v, err := metadata.DecodeKeyValue(f.Name, f.Value)
+			if err != nil {
+				grpclog.Printf("Failed to decode (%q, %q): %v", f.Name, f.Value, err)
+				return
+			}
+			d.mdata[k] = append(d.mdata[k], v)
 		}
-		endHeaders = true
-	}
-
-	if err == nil && d.err != nil {
-		err = d.err
 	}
-	return
 }
 
 type timeoutUnit uint8
@@ -322,10 +297,11 @@ type framer struct {
 
 func newFramer(conn net.Conn) *framer {
 	f := &framer{
-		reader: conn,
+		reader: bufio.NewReaderSize(conn, http2IOBufSize),
 		writer: bufio.NewWriterSize(conn, http2IOBufSize),
 	}
 	f.fr = http2.NewFramer(f.writer, f.reader)
+	f.fr.ReadMetaHeaders = hpack.NewDecoder(http2InitHeaderTableSize, nil)
 	return f
 }
 
@@ -453,3 +429,7 @@ func (f *framer) flushWrite() error {
 func (f *framer) readFrame() (http2.Frame, error) {
 	return f.fr.ReadFrame()
 }
+
+func (f *framer) errorDetail() error {
+	return f.fr.ErrorDetail()
+}
diff --git a/vendor/google.golang.org/grpc/transport/transport.go b/vendor/google.golang.org/grpc/transport/transport.go
index 3b934b4dc0..d4c220a0c4 100644
--- a/vendor/google.golang.org/grpc/transport/transport.go
+++ b/vendor/google.golang.org/grpc/transport/transport.go
@@ -63,13 +63,11 @@ type recvMsg struct {
 	err error
 }
 
-func (recvMsg) isItem() bool {
-	return true
-}
+func (*recvMsg) item() {}
 
 // All items in an out of a recvBuffer should be the same type.
 type item interface {
-	isItem() bool
+	item()
 }
 
 // recvBuffer is an unbounded channel of item.
@@ -89,12 +87,14 @@ func newRecvBuffer() *recvBuffer {
 func (b *recvBuffer) put(r item) {
 	b.mu.Lock()
 	defer b.mu.Unlock()
-	b.backlog = append(b.backlog, r)
-	select {
-	case b.c <- b.backlog[0]:
-		b.backlog = b.backlog[1:]
-	default:
+	if len(b.backlog) == 0 {
+		select {
+		case b.c <- r:
+			return
+		default:
+		}
 	}
+	b.backlog = append(b.backlog, r)
 }
 
 func (b *recvBuffer) load() {
@@ -299,20 +299,18 @@ func (s *Stream) Read(p []byte) (n int, err error) {
 	return
 }
 
-type key int
-
 // The key to save transport.Stream in the context.
-const streamKey = key(0)
+type streamKey struct{}
 
 // newContextWithStream creates a new context from ctx and attaches stream
 // to it.
 func newContextWithStream(ctx context.Context, stream *Stream) context.Context {
-	return context.WithValue(ctx, streamKey, stream)
+	return context.WithValue(ctx, streamKey{}, stream)
 }
 
 // StreamFromContext returns the stream saved in ctx.
 func StreamFromContext(ctx context.Context) (s *Stream, ok bool) {
-	s, ok = ctx.Value(streamKey).(*Stream)
+	s, ok = ctx.Value(streamKey{}).(*Stream)
 	return
 }
 
@@ -323,6 +321,7 @@ const (
 	reachable transportState = iota
 	unreachable
 	closing
+	draining
 )
 
 // NewServerTransport creates a ServerTransport with conn or non-nil error
@@ -337,9 +336,11 @@ type ConnectOptions struct {
 	UserAgent string
 	// Dialer specifies how to dial a network address.
 	Dialer func(string, time.Duration) (net.Conn, error)
-	// AuthOptions stores the credentials required to setup a client connection and/or issue RPCs.
-	AuthOptions []credentials.Credentials
-	// Timeout specifies the timeout for dialing a client connection.
+	// PerRPCCredentials stores the PerRPCCredentials required to issue RPCs.
+	PerRPCCredentials []credentials.PerRPCCredentials
+	// TransportCredentials stores the Authenticator required to setup a client connection.
+	TransportCredentials credentials.TransportCredentials
+	// Timeout specifies the timeout for dialing a ClientTransport.
 	Timeout time.Duration
 }
 
@@ -393,6 +394,10 @@ type ClientTransport interface {
 	// is called only once.
 	Close() error
 
+	// GracefulClose starts to tear down the transport. It stops accepting
+	// new RPCs and wait the completion of the pending RPCs.
+	GracefulClose() error
+
 	// Write sends the data for the given stream. A nil stream indicates
 	// the write is to be performed on the transport as a whole.
 	Write(s *Stream, data []byte, opts *Options) error
@@ -470,7 +475,7 @@ func (e ConnectionError) Error() string {
 	return fmt.Sprintf("connection error: desc = %q", e.Desc)
 }
 
-// Define some common ConnectionErrors.
+// ErrConnClosing indicates that the transport is closing.
 var ErrConnClosing = ConnectionError{Desc: "transport is closing"}
 
 // StreamError is an error that only affects one stream within a connection.

From 4557b84b2ed98d1a38debde6bcad72bca83cf27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 1 Aug 2016 19:42:57 +0200
Subject: [PATCH 0600/1304] functional tests: really skip failed remote fetches

Another stab at skipping remote fetches that fail.

Previously we were failing before we could check the exit status when we
expected a regexp, so we missed the chance to skip the test.

Fix that and refactor the code to a checkExitStatus() function so we
don't repeat ourselves.
---
 tests/rkt_fetch_test.go | 26 ++++++++++++--------------
 tests/rkt_tests.go      | 20 ++++++++++++++------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 6b69bc2f1c..dd041d9cad 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -162,15 +162,14 @@ func testFetchDefault(t *testing.T, arg string, image string, imageArgs string,
 
 	// 1. Run cmd with the image not available in the store, should get $remoteFetchMsg.
 	child := spawnOrFail(t, cmd)
-	if err := expectWithOutput(child, remoteFetchMsg); err != nil {
-		t.Fatalf("%q should be found: %v", remoteFetchMsg, err)
-	}
-	err := child.Wait()
-	status := getExitStatus(err)
-	if status != 0 {
-		t.Logf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
+	err := expectWithOutput(child, remoteFetchMsg)
+	if exitErr := checkExitStatus(child); exitErr != nil {
+		t.Logf("%v", exitErr)
 		t.Skip("remote fetching failed, probably a network failure. Skipping...")
 	}
+	if err != nil {
+		t.Fatalf("%q should be found: %v", remoteFetchMsg, err)
+	}
 
 	// 2. Run cmd with the image available in the store, should get $storeMsg.
 	runRktAndCheckRegexOutput(t, cmd, storeMsg)
@@ -213,15 +212,14 @@ func testFetchNoStore(t *testing.T, args string, image string, imageArgs string,
 
 	// 1. Run cmd with the image available in the store, should get $remoteFetchMsg.
 	child := spawnOrFail(t, cmd)
-	if err := expectWithOutput(child, remoteFetchMsg); err != nil {
-		t.Fatalf("%q should be found: %v", remoteFetchMsg, err)
-	}
-	err := child.Wait()
-	status := getExitStatus(err)
-	if status != 0 {
-		t.Logf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
+	err := expectWithOutput(child, remoteFetchMsg)
+	if exitErr := checkExitStatus(child); exitErr != nil {
+		t.Logf("%v", exitErr)
 		t.Skip("remote fetching failed, probably a network failure. Skipping...")
 	}
+	if err != nil {
+		t.Fatalf("%q should be found: %v", remoteFetchMsg, err)
+	}
 }
 
 type synchronizedBool struct {
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 6b1e515bc9..e9dfc9bed5 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -212,15 +212,13 @@ func importImageAndFetchHashAsGid(t *testing.T, ctx *testutils.RktRunCtx, img st
 
 	// Read out the image hash.
 	result, out, err := expectRegexWithOutput(child, "sha512-[0-9a-f]{32,64}")
+	if exitErr := checkExitStatus(child); exitErr != nil {
+		t.Logf("%v", exitErr)
+		return "", fmt.Errorf("fetching of %q failed", img)
+	}
 	if err != nil || len(result) != 1 {
 		t.Fatalf("Error: %v\nOutput: %v", err, out)
 	}
-	err = child.Wait()
-	status := getExitStatus(err)
-	if status != 0 {
-		t.Logf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
-		return "", fmt.Errorf("fetching of %q failed", img)
-	}
 
 	return result[0], nil
 }
@@ -847,3 +845,13 @@ func unmountPod(t *testing.T, ctx *testutils.RktRunCtx, uuid string, rmNetns boo
 		_ = os.RemoveAll(podNetNSPath)
 	}
 }
+
+func checkExitStatus(child *gexpect.ExpectSubprocess) error {
+	err := child.Wait()
+	status := getExitStatus(err)
+	if status != 0 {
+		return fmt.Errorf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
+	}
+
+	return nil
+}

From 46085bf3a40bebf95da994ec425258dc3837621b Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Tue, 2 Aug 2016 14:41:31 +0600
Subject: [PATCH 0601/1304] trust: provide InsecureSkipTLSCheck to pubkey
 manager

We should be able to pass --insecure-options=tls option to the `rkt trust`
command. But now we can't because we test insecure tls value not from
global options but from already initialized public key manager in the
metaDiscoverPubKeyLocations():

if m.InsecureSkipTLSCheck {
        insecure = insecure | discovery.InsecureTLS
}

This patch adds InsecureSkipTLSCheck to the initialization of a public
key manager structure during `rkt trust` command execution. So, the
value of the `--insecure-option=tls` will be matched and used as we
suppose.
---
 rkt/trust.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rkt/trust.go b/rkt/trust.go
index 0679bf2e9e..0f02696623 100644
--- a/rkt/trust.go
+++ b/rkt/trust.go
@@ -91,10 +91,11 @@ Otherwise, trust at the root domain (not recommended) must be explicitly request
 
 	pkls := args
 	m := &pubkey.Manager{
-		InsecureAllowHTTP:  flagAllowHTTP,
-		TrustKeysFromHTTPS: globalFlags.TrustKeysFromHTTPS,
-		Ks:                 ks,
-		Debug:              globalFlags.Debug,
+		InsecureAllowHTTP:    flagAllowHTTP,
+		InsecureSkipTLSCheck: globalFlags.InsecureFlags.SkipTLSCheck(),
+		TrustKeysFromHTTPS:   globalFlags.TrustKeysFromHTTPS,
+		Ks:                   ks,
+		Debug:                globalFlags.Debug,
 	}
 	if len(pkls) == 0 {
 		pkls, err = m.GetPubKeyLocations(flagPrefix)

From b641f3802f83b8472f6563780d54a9b6185a3c2e Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 1 Jul 2016 17:39:35 +0200
Subject: [PATCH 0602/1304] stage1: apply seccomp isolators

This commit introduces support for appc seccomp isolators.
Two isolatore are currently specified and implemented: a "retain-set"
mode (whitelist) and a "remove-set" one (blacklist).
If no seccomp isolator is specified, rkt will apply its own default
whitelist.
---
 common/apps/apps.go                     |  57 +++-
 rkt/cli_apps.go                         |  24 ++
 rkt/run.go                              |   1 +
 stage0/run.go                           |  30 ++
 stage1/init/common/pod.go               |  18 +-
 stage1/init/common/seccomp.go           | 182 +++++++++++
 stage1/init/common/seccomp_wildcards.go | 398 ++++++++++++++++++++++++
 tests/rkt_no_new_privs_test.go          |  20 +-
 tests/rkt_seccomp_test.go               | 137 ++++++++
 9 files changed, 843 insertions(+), 24 deletions(-)
 create mode 100644 stage1/init/common/seccomp.go
 create mode 100644 stage1/init/common/seccomp_wildcards.go
 create mode 100644 tests/rkt_seccomp_test.go

diff --git a/common/apps/apps.go b/common/apps/apps.go
index b00efdb450..925d29c51a 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -17,7 +17,9 @@
 package apps
 
 import (
+	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -29,6 +31,11 @@ import (
 // actual type (one of the last four).
 type AppImageType int
 
+var (
+	ErrInvalidSeccompMode     = errors.New("invalid seccomp mode command-line override")
+	ErrInvalidSeccompOverride = errors.New("invalid seccomp command-line override")
+)
+
 const (
 	AppImageGuess AppImageType = iota // image type to be guessed
 	AppImageHash                      // image hash
@@ -38,17 +45,18 @@ const (
 )
 
 type App struct {
-	Image       string                            // the image reference as supplied by the user on the cli
-	ImType      AppImageType                      // the type of the image reference (to be guessed, url, path or hash)
-	Args        []string                          // any arguments the user supplied for this app
-	Asc         string                            // signature file override for image verification (if fetching occurs)
-	Exec        string                            // exec override for image
-	Mounts      []schema.Mount                    // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
-	MemoryLimit *types.ResourceMemory             // memory isolator override
-	CPULimit    *types.ResourceCPU                // cpu isolator override
-	User, Group string                            // user, group overrides
-	CapsRetain  *types.LinuxCapabilitiesRetainSet // os/linux/capabilities-retain-set overrides
-	CapsRemove  *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
+	Image         string                            // the image reference as supplied by the user on the cli
+	ImType        AppImageType                      // the type of the image reference (to be guessed, url, path or hash)
+	Args          []string                          // any arguments the user supplied for this app
+	Asc           string                            // signature file override for image verification (if fetching occurs)
+	Exec          string                            // exec override for image
+	Mounts        []schema.Mount                    // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
+	MemoryLimit   *types.ResourceMemory             // memory isolator override
+	CPULimit      *types.ResourceCPU                // cpu isolator override
+	User, Group   string                            // user, group overrides
+	CapsRetain    *types.LinuxCapabilitiesRetainSet // os/linux/capabilities-retain-set overrides
+	CapsRemove    *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
+	SeccompFilter string                            // seccomp CLI overrides
 
 	// TODO(jonboulle): These images are partially-populated hashes, this should be clarified.
 	ImageID types.Hash // resolved image identifier
@@ -60,6 +68,33 @@ type Apps struct {
 	Volumes []types.Volume // volumes available to all apps
 }
 
+// SeccompFilter returns type, filter set and optional errno
+// for a seccomp filter override specified via CLI
+func (a *App) SeccompOverride() (mode string, errno string, set []string, e error) {
+	if a.SeccompFilter == "" {
+		return
+	}
+	for _, i := range strings.Split(a.SeccompFilter, ",") {
+		kv := strings.Split(i, "=")
+		if len(kv) == 2 {
+			switch kv[0] {
+			case "mode":
+				if kv[1] != "remove" && kv[1] != "retain" {
+					e = ErrInvalidSeccompMode
+				}
+				mode = kv[1]
+			case "errno":
+				errno = kv[1]
+			default:
+				e = ErrInvalidSeccompOverride
+			}
+		} else {
+			set = append(set, i)
+		}
+	}
+	return
+}
+
 // Reset creates a new slice for al.apps, needed by tests
 func (al *Apps) Reset() {
 	al.apps = make([]App, 0)
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 8d95e595e5..ede8fa25c6 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -416,3 +416,27 @@ func (au *appCapsRemove) String() string {
 func (au *appCapsRemove) Type() string {
 	return "appCapsRemove"
 }
+
+// appSeccompFilter is for --seccomp flags in the form of: --seccomp [errno=EPERM,]mode=retain,chown,chmod[,syscalls]
+type appSeccompFilter apps.Apps
+
+func (au *appSeccompFilter) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--seccomp must follow an image")
+	}
+	app.SeccompFilter = s
+	return nil
+}
+
+func (au *appSeccompFilter) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	return app.SeccompFilter
+}
+
+func (au *appSeccompFilter) Type() string {
+	return "appSeccompFilter"
+}
diff --git a/rkt/run.go b/rkt/run.go
index 04497c5219..9c7eba156b 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -108,6 +108,7 @@ func init() {
 	cmdRun.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
 	cmdRun.Flags().Var((*appCapsRetain)(&rktApps), "cap-retain", "capability to retain (example: '--cap-retain=CAP_SYS_ADMIN')")
 	cmdRun.Flags().Var((*appCapsRemove)(&rktApps), "cap-remove", "capability to remove (example: '--cap-remove=CAP_MKNOD')")
+	cmdRun.Flags().Var((*appSeccompFilter)(&rktApps), "seccomp", "seccomp filter override (example: '--seccomp mode=retain,errno=EPERM,chmod,chown')")
 
 	flagPorts = portList{}
 	flagDNS = flagStringList{}
diff --git a/stage0/run.go b/stage0/run.go
index 473d229f01..bb9128421b 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -266,6 +266,36 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 			ra.App.Isolators = append(ra.App.Isolators, *isolator)
 		}
 
+		// Override seccomp isolators via --seccomp CLI switch
+		if app.SeccompFilter != "" {
+			var is *types.Isolator
+			mode, errno, set, err := app.SeccompOverride()
+			if err != nil {
+				return err
+			}
+			switch mode {
+			case "retain":
+				lss, err := types.NewLinuxSeccompRetainSet(errno, set...)
+				if err != nil {
+					return err
+				}
+				if is, err = lss.AsIsolator(); err != nil {
+					return err
+				}
+			case "remove":
+				lss, err := types.NewLinuxSeccompRemoveSet(errno, set...)
+				if err != nil {
+					return err
+				}
+				if is, err = lss.AsIsolator(); err != nil {
+					return err
+				}
+			default:
+				return apps.ErrInvalidSeccompMode
+			}
+			ra.App.Isolators.ReplaceIsolatorsByName(*is, []types.ACIdentifier{types.LinuxSeccompRemoveSetName, types.LinuxSeccompRetainSetName})
+		}
+
 		if user := app.User; user != "" {
 			ra.App.User = user
 		}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index e4512a5212..af2b312b76 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -423,8 +423,6 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		return err
 	}
 
-	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
-
 	execStart := append([]string{binPath}, app.Exec[1:]...)
 	execStartString := quoteExec(execStart)
 	opts := []*unit.UnitOption{
@@ -443,7 +441,6 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
 		unit.NewUnitOption("Service", "SupplementaryGroups", strings.Join(supplementaryGroups, " ")),
 		unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")),
-		unit.NewUnitOption("Service", "NoNewPrivileges", strconv.FormatBool(noNewPrivileges)),
 		// This helps working around a race
 		// (https://github.com/systemd/systemd/issues/2913) that causes the
 		// systemd unit name not getting written to the journal if the unit is
@@ -454,6 +451,21 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 	// Restrict access to sensitive paths (eg. procfs)
 	opts = protectSystemFiles(opts, appName)
 
+	// Apply seccomp isolator, if any and not opt-ing out;
+	// see https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
+	unprivileged := (u != 0)
+	opts, noNewPrivileges, err := getSeccompFilter(opts, p, unprivileged, app.Isolators)
+	if err != nil {
+		return err
+	}
+
+	// Seccomp filters require NoNewPrivileges for unprivileged apps, that may override
+	// manifest annotation.
+	if !noNewPrivileges {
+		noNewPrivileges = getAppNoNewPrivileges(app.Isolators)
+	}
+	opts = append(opts, unit.NewUnitOption("Service", "NoNewPrivileges", strconv.FormatBool(noNewPrivileges)))
+
 	if ra.ReadOnlyRootFS {
 		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", common.RelAppRootfsPath(appName)))
 	}
diff --git a/stage1/init/common/seccomp.go b/stage1/init/common/seccomp.go
new file mode 100644
index 0000000000..16bf422844
--- /dev/null
+++ b/stage1/init/common/seccomp.go
@@ -0,0 +1,182 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package common
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/go-systemd/unit"
+)
+
+var (
+	ErrTooManySeccompIsolators = errors.New("too many seccomp isolators specified")
+)
+
+// Systemd filter mode, see
+// https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
+const (
+	sdBlacklistMode = "~"
+	sdWhitelistMode = ""
+)
+
+// getSeccompFilter gets an appc seccomp set and an optional error mode,
+// returning those values in a format suitable for systemd consumption.
+func getSeccompFilter(opts []*unit.UnitOption, p *stage1commontypes.Pod, unprivileged bool, isolators types.Isolators) ([]*unit.UnitOption, bool, error) {
+	var filterMode string
+	flag := ""
+	seccompIsolators := 0
+	seccompErrno := ""
+	noNewPrivs := false
+	var err error
+	var seccompSet []string
+	for _, i := range isolators {
+		if seccomp, ok := i.Value().(types.LinuxSeccompSet); ok {
+			seccompIsolators++
+			// By appc spec, only one seccomp isolator per app is allowed
+			if seccompIsolators > 1 {
+				return nil, false, ErrTooManySeccompIsolators
+			}
+			switch i.Name {
+			case types.LinuxSeccompRemoveSetName:
+				filterMode = sdBlacklistMode
+				seccompSet, flag, err = parseLinuxSeccompSet(p, seccomp)
+				if err != nil {
+					return nil, false, err
+				}
+				if flag == "empty" {
+					// Opt-in to rkt default whitelist
+					seccompSet = nil
+					break
+				}
+			case types.LinuxSeccompRetainSetName:
+				filterMode = sdWhitelistMode
+				seccompSet, flag, err = parseLinuxSeccompSet(p, seccomp)
+				if err != nil {
+					return nil, false, err
+				}
+				if flag == "all" {
+					// Opt-out seccomp filtering
+					return opts, false, nil
+				}
+			}
+			seccompErrno = string(seccomp.Errno())
+		}
+	}
+
+	// If unset, use rkt default whitelist
+	if len(seccompSet) == 0 {
+		filterMode = sdWhitelistMode
+		seccompSet = RktDefaultSeccompWhitelist
+	}
+
+	// Append computed options
+	if seccompErrno != "" {
+		opts = append(opts, unit.NewUnitOption("Service", "SystemCallErrorNumber", seccompErrno))
+	}
+	// SystemCallFilter options are written down in batches of 50 entries per line, because
+	// filtering sets may be quite large and overlong lines break unit serialization.
+	seccompStr := ""
+	for i, s := range seccompSet {
+		next := i + 1
+		seccompStr += (s + " ")
+		if next%50 == 0 || next == len(seccompSet) {
+			opts = append(opts, unit.NewUnitOption("Service", "SystemCallFilter", fmt.Sprintf("%s%s", filterMode, seccompStr)))
+			seccompStr = ""
+		}
+	}
+	// In order to install seccomp filters, unprivileged process must first set no-news-privs.
+	if unprivileged {
+		noNewPrivs = true
+	}
+
+	return opts, noNewPrivs, nil
+}
+
+// parseLinuxSeccompSet gets an appc LinuxSeccompSet and returns an array
+// of values suitable for systemd SystemCallFilter.
+func parseLinuxSeccompSet(p *stage1commontypes.Pod, s types.LinuxSeccompSet) (syscallFilter []string, flag string, err error) {
+	for _, item := range s.Set() {
+		if item[0] == '@' {
+			// Wildcards
+			wildcard := strings.SplitN(string(item), "/", 2)
+			if len(wildcard) != 2 {
+				continue
+			}
+			scope := wildcard[0]
+			name := wildcard[1]
+			switch scope {
+			case "@appc.io":
+				// appc-reserved wildcards
+				switch name {
+				case "all":
+					return nil, "all", nil
+				case "empty":
+					return nil, "empty", nil
+				}
+			case "@docker":
+				// Docker-originated wildcards
+				switch name {
+				case "default-blacklist":
+					syscallFilter = append(syscallFilter, DockerDefaultSeccompBlacklist...)
+				case "default-whitelist":
+					syscallFilter = append(syscallFilter, DockerDefaultSeccompWhitelist...)
+				}
+			case "@rkt":
+				// Custom rkt wildcards
+				switch name {
+				case "default-blacklist":
+					syscallFilter = append(syscallFilter, RktDefaultSeccompBlacklist...)
+				case "default-whitelist":
+					syscallFilter = append(syscallFilter, RktDefaultSeccompWhitelist...)
+				}
+			case "@systemd":
+				// Custom systemd wildcards (systemd >= 231)
+				_, systemdVersion, err := GetFlavor(p)
+				if err != nil || systemdVersion < 231 {
+					return nil, "", errors.New("Unsupported or unknown systemd version, seccomp groups need systemd >= v231")
+				}
+				switch name {
+				case "clock":
+					syscallFilter = append(syscallFilter, "@clock")
+				case "default-whitelist":
+					syscallFilter = append(syscallFilter, "@default")
+				case "mount":
+					syscallFilter = append(syscallFilter, "@mount")
+				case "network-io":
+					syscallFilter = append(syscallFilter, "@network-io")
+				case "obsolete":
+					syscallFilter = append(syscallFilter, "@obsolete")
+				case "privileged":
+					syscallFilter = append(syscallFilter, "@privileged")
+				case "process":
+					syscallFilter = append(syscallFilter, "@process")
+				case "raw-io":
+					syscallFilter = append(syscallFilter, "@raw-io")
+				}
+			}
+		} else {
+			// Plain syscall name
+			syscallFilter = append(syscallFilter, string(item))
+		}
+	}
+	return syscallFilter, "", nil
+}
diff --git a/stage1/init/common/seccomp_wildcards.go b/stage1/init/common/seccomp_wildcards.go
new file mode 100644
index 0000000000..22d2f1d8dc
--- /dev/null
+++ b/stage1/init/common/seccomp_wildcards.go
@@ -0,0 +1,398 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package common
+
+// seccomp default whitelists/blacklists.
+// rkt tries not to diverge from docker here, for the moment.
+
+var (
+	// DockerDefaultSeccompWhitelist contains a default whitelist of syscalls,
+	// used by docker for seccomp filtering.
+	// See https://github.com/docker/docker/blob/master/profiles/seccomp/default.json
+	DockerDefaultSeccompWhitelist = []string{
+		"accept",
+		"accept4",
+		"access",
+		"alarm",
+		"bind",
+		"brk",
+		"capget",
+		"capset",
+		"chdir",
+		"chmod",
+		"chown",
+		"chown32",
+		"clock_getres",
+		"clock_gettime",
+		"clock_nanosleep",
+		"close",
+		"connect",
+		"copy_file_range",
+		"creat",
+		"dup",
+		"dup2",
+		"dup3",
+		"epoll_create",
+		"epoll_create1",
+		"epoll_ctl",
+		"epoll_ctl_old",
+		"epoll_pwait",
+		"epoll_wait",
+		"epoll_wait_old",
+		"eventfd",
+		"eventfd2",
+		"execve",
+		"execveat",
+		"exit",
+		"exit_group",
+		"faccessat",
+		"fadvise64",
+		"fadvise64_64",
+		"fallocate",
+		"fanotify_mark",
+		"fchdir",
+		"fchmod",
+		"fchmodat",
+		"fchown",
+		"fchown32",
+		"fchownat",
+		"fcntl",
+		"fcntl64",
+		"fdatasync",
+		"fgetxattr",
+		"flistxattr",
+		"flock",
+		"fork",
+		"fremovexattr",
+		"fsetxattr",
+		"fstat",
+		"fstat64",
+		"fstatat64",
+		"fstatfs",
+		"fstatfs64",
+		"fsync",
+		"ftruncate",
+		"ftruncate64",
+		"futex",
+		"futimesat",
+		"getcpu",
+		"getcwd",
+		"getdents",
+		"getdents64",
+		"getegid",
+		"getegid32",
+		"geteuid",
+		"geteuid32",
+		"getgid",
+		"getgid32",
+		"getgroups",
+		"getgroups32",
+		"getitimer",
+		"getpeername",
+		"getpgid",
+		"getpgrp",
+		"getpid",
+		"getppid",
+		"getpriority",
+		"getrandom",
+		"getresgid",
+		"getresgid32",
+		"getresuid",
+		"getresuid32",
+		"getrlimit",
+		"get_robust_list",
+		"getrusage",
+		"getsid",
+		"getsockname",
+		"getsockopt",
+		"get_thread_area",
+		"gettid",
+		"gettimeofday",
+		"getuid",
+		"getuid32",
+		"getxattr",
+		"inotify_add_watch",
+		"inotify_init",
+		"inotify_init1",
+		"inotify_rm_watch",
+		"io_cancel",
+		"ioctl",
+		"io_destroy",
+		"io_getevents",
+		"ioprio_get",
+		"ioprio_set",
+		"io_setup",
+		"io_submit",
+		"ipc",
+		"kill",
+		"lchown",
+		"lchown32",
+		"lgetxattr",
+		"link",
+		"linkat",
+		"listen",
+		"listxattr",
+		"llistxattr",
+		"_llseek",
+		"lremovexattr",
+		"lseek",
+		"lsetxattr",
+		"lstat",
+		"lstat64",
+		"madvise",
+		"memfd_create",
+		"mincore",
+		"mkdir",
+		"mkdirat",
+		"mknod",
+		"mknodat",
+		"mmap",
+		"mmap2",
+		"mprotect",
+		"mq_getsetattr",
+		"mq_notify",
+		"mq_open",
+		"mq_timedreceive",
+		"mq_timedsend",
+		"mq_unlink",
+		"mremap",
+		"msgctl",
+		"msgget",
+		"msgrcv",
+		"msgsnd",
+		"msync",
+		"munlock",
+		"munlockall",
+		"munmap",
+		"nanosleep",
+		"newfstatat",
+		"_newselect",
+		"open",
+		"openat",
+		"pause",
+		"personality", // this is args-filtered by docker
+		"pipe",
+		"pipe2",
+		"poll",
+		"ppoll",
+		"prctl",
+		"pread64",
+		"preadv",
+		"prlimit64",
+		"pselect6",
+		"pwrite64",
+		"pwritev",
+		"read",
+		"readahead",
+		"readlink",
+		"readlinkat",
+		"readv",
+		"recv",
+		"recvfrom",
+		"recvmmsg",
+		"recvmsg",
+		"remap_file_pages",
+		"removexattr",
+		"rename",
+		"renameat",
+		"renameat2",
+		"restart_syscall",
+		"rmdir",
+		"rt_sigaction",
+		"rt_sigpending",
+		"rt_sigprocmask",
+		"rt_sigqueueinfo",
+		"rt_sigreturn",
+		"rt_sigsuspend",
+		"rt_sigtimedwait",
+		"rt_tgsigqueueinfo",
+		"sched_getaffinity",
+		"sched_getattr",
+		"sched_getparam",
+		"sched_get_priority_max",
+		"sched_get_priority_min",
+		"sched_getscheduler",
+		"sched_rr_get_interval",
+		"sched_setaffinity",
+		"sched_setattr",
+		"sched_setparam",
+		"sched_setscheduler",
+		"sched_yield",
+		"seccomp",
+		"select",
+		"semctl",
+		"semget",
+		"semop",
+		"semtimedop",
+		"send",
+		"sendfile",
+		"sendfile64",
+		"sendmmsg",
+		"sendmsg",
+		"sendto",
+		"setfsgid",
+		"setfsgid32",
+		"setfsuid",
+		"setfsuid32",
+		"setgid",
+		"setgid32",
+		"setgroups",
+		"setgroups32",
+		"setitimer",
+		"setpgid",
+		"setpriority",
+		"setregid",
+		"setregid32",
+		"setresgid",
+		"setresgid32",
+		"setresuid",
+		"setresuid32",
+		"setreuid",
+		"setreuid32",
+		"setrlimit",
+		"set_robust_list",
+		"setsid",
+		"setsockopt",
+		"set_thread_area",
+		"set_tid_address",
+		"setuid",
+		"setuid32",
+		"setxattr",
+		"shmat",
+		"shmctl",
+		"shmdt",
+		"shmget",
+		"shutdown",
+		"sigaltstack",
+		"signalfd",
+		"signalfd4",
+		"sigreturn",
+		"socket",
+		"socketcall",
+		"socketpair",
+		"splice",
+		"stat",
+		"stat64",
+		"statfs",
+		"statfs64",
+		"symlink",
+		"symlinkat",
+		"sync",
+		"sync_file_range",
+		"syncfs",
+		"sysinfo",
+		"syslog",
+		"tee",
+		"tgkill",
+		"time",
+		"timer_create",
+		"timer_delete",
+		"timerfd_create",
+		"timerfd_gettime",
+		"timerfd_settime",
+		"timer_getoverrun",
+		"timer_gettime",
+		"timer_settime",
+		"times",
+		"tkill",
+		"truncate",
+		"truncate64",
+		"ugetrlimit",
+		"umask",
+		"uname",
+		"unlink",
+		"unlinkat",
+		"utime",
+		"utimensat",
+		"utimes",
+		"vfork",
+		"vmsplice",
+		"wait4",
+		"waitid",
+		"waitpid",
+		"write",
+		"writev",
+		"arch_prctl",
+		"modify_ldt",
+		"chroot",
+		"clone", // this is args-filtered by docker
+	}
+	// DockerDefaultSeccompBlacklist contains a default blacklist of syscalls,
+	// used by docker for seccomp filtering.
+	// See https://github.com/docker/docker/blob/master/docs/security/seccomp.md
+	DockerDefaultSeccompBlacklist = []string{
+		"acct",
+		"add_key",
+		"adjtimex",
+		"bpf",
+		"clock_adjtime",
+		"clock_settime",
+		// "clone", // this is args-filtered by docker
+		"create_module",
+		"delete_module",
+		"finit_module",
+		"get_kernel_syms",
+		"get_mempolicy",
+		"init_module",
+		"ioperm",
+		"iopl",
+		"kcmp",
+		"kexec_file_load",
+		"kexec_load",
+		"keyctl",
+		"lookup_dcookie",
+		"mbind",
+		"mount",
+		"move_pages",
+		"name_to_handle_at",
+		"nfsservctl",
+		"open_by_handle_at",
+		"perf_event_open",
+		// "personality", // this is args-filtered by docker
+		"pivot_root",
+		"process_vm_readv",
+		"process_vm_writev",
+		"ptrace",
+		"query_module",
+		"quotactl",
+		"reboot",
+		"request_key",
+		"set_mempolicy",
+		"setns",
+		"settimeofday",
+		"stime",
+		"swapon",
+		"swapoff",
+		"sysfs",
+		"_sysctl",
+		"umount",
+		"umount2",
+		"unshare",
+		"uselib",
+		"userfaultfd",
+		"ustat",
+		"vm86",
+		"vm86old",
+	}
+
+	// RktDefaultSeccompBlacklist contains a default blacklist of syscalls,
+	// used by rkt for seccomp filtering.
+	RktDefaultSeccompBlacklist = DockerDefaultSeccompBlacklist
+	// RktDefaultSeccompWhitelist contains a default whitelist of syscalls,
+	// used by rkt for seccomp filtering.
+	RktDefaultSeccompWhitelist = DockerDefaultSeccompWhitelist
+)
diff --git a/tests/rkt_no_new_privs_test.go b/tests/rkt_no_new_privs_test.go
index ca16a15192..9a1434e60a 100644
--- a/tests/rkt_no_new_privs_test.go
+++ b/tests/rkt_no_new_privs_test.go
@@ -27,38 +27,38 @@ import (
 func TestNoNewPrivileges(t *testing.T) {
 	for _, tt := range []struct {
 		rktParams string
-		patch     string
+		patch     []string
 		expected  string
 	}{
 		{
-			patch:    "--isolators=os/linux/no-new-privileges,true",
+			patch:    []string{"--isolators=os/linux/no-new-privileges,true"},
 			expected: "no_new_privs: 1 err: errno 0",
 		},
 		{
 			rktParams: "--user=1000 --group=100",
-			patch:     "--isolators=os/linux/no-new-privileges,true",
+			patch:     []string{"--isolators=os/linux/no-new-privileges,true"},
 			expected:  "no_new_privs: 1 err: errno 0",
 		},
 		{
-			patch:    "--isolators=os/linux/no-new-privileges,false",
+			patch:    []string{"--isolators=os/linux/no-new-privileges,false"},
 			expected: "no_new_privs: 0 err: errno 0",
 		},
 		{
 			rktParams: "--user=1000 --group=100",
-			patch:     "--isolators=os/linux/no-new-privileges,false",
+			patch:     []string{"--isolators=os/linux/no-new-privileges,false", "--seccomp-mode=retain", "--seccomp-set=@appc.io/all"},
 			expected:  "no_new_privs: 0 err: errno 0",
 		},
 		{
-			patch:    `--isolators=os/linux/no-new-privileges,false:os/linux/no-new-privileges,true`,
+			patch:    []string{`--isolators=os/linux/no-new-privileges,false:os/linux/no-new-privileges,true`},
 			expected: "no_new_privs: 1 err: errno 0",
 		},
 		{
 			rktParams: "--user=1000 --group=100",
-			patch:     `--isolators=os/linux/no-new-privileges,false:os/linux/no-new-privileges,true`,
+			patch:     []string{`--isolators=os/linux/no-new-privileges,false:os/linux/no-new-privileges,true`},
 			expected:  "no_new_privs: 1 err: errno 0",
 		},
 		{
-			patch:    "",
+			patch:    nil,
 			expected: "no_new_privs: 0 err: errno 0",
 		},
 	} {
@@ -67,8 +67,8 @@ func TestNoNewPrivileges(t *testing.T) {
 			defer ctx.Cleanup()
 
 			ps := []string{}
-			if tt.patch != "" {
-				ps = append(ps, tt.patch)
+			if len(tt.patch) > 0 {
+				ps = append(ps, tt.patch...)
 			}
 
 			image := patchTestACI("rkt-no-new-privs.aci", ps...)
diff --git a/tests/rkt_seccomp_test.go b/tests/rkt_seccomp_test.go
new file mode 100644
index 0000000000..48bba68dc2
--- /dev/null
+++ b/tests/rkt_seccomp_test.go
@@ -0,0 +1,137 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+const (
+	baseApp = `--exec=/inspect -file-name / -stat-file`
+)
+
+var seccompTestCases = []struct {
+	name           string
+	aciBuildArgs   []string
+	runArgs        []string
+	expectedOutput string
+	expectErr      bool
+}{
+	{
+		`default: aci seccomp filter or rkt whitelist`,
+		[]string{baseApp},
+		nil,
+		`/: mode: d`,
+		false,
+	},
+	{
+		`seccomp opt-out: no filtering`,
+		[]string{baseApp, "--seccomp-mode=retain", "--seccomp-set=@appc.io/all"},
+		nil,
+		`/: mode: d`,
+		false,
+	},
+	{
+		`seccomp opt-in: rkt whitelist`,
+		[]string{baseApp, "--seccomp-mode=remove", "--seccomp-set=@appc.io/empty"},
+		nil,
+		`/: mode: d`,
+		false,
+	},
+	{
+		`remove-set rkt blacklist`,
+		[]string{baseApp, "--seccomp-mode=remove", "--seccomp-set=@rkt/default-blacklist"},
+		nil,
+		`/: mode: d`,
+		false,
+	},
+	{
+		`remove-set unrelated blacklist`,
+		[]string{baseApp, "--seccomp-mode=remove", "--seccomp-set=reboot"},
+		nil,
+		`/: mode: d`,
+		false,
+	},
+	{
+		`remove-set blacklist stat with custom error`,
+		[]string{baseApp, "--seccomp-mode=remove,errno=EXFULL", "--seccomp-set=stat"},
+		nil,
+		"exchange full",
+		true,
+	},
+	{
+		`retain-set rkt whitelist`,
+		[]string{baseApp, "--seccomp-mode=retain", "--seccomp-set=@rkt/default-whitelist"},
+		nil,
+		`/: mode: d`,
+		false,
+	},
+	{
+		`retain-set docker whitelist`,
+		[]string{baseApp, "--seccomp-mode=retain", "--seccomp-set=@docker/default-whitelist"},
+		nil,
+		`/: mode: d`,
+		false,
+	},
+	{
+		`remove-set unprivileged group`,
+		[]string{baseApp, "--seccomp-mode=remove", "--seccomp-set=reboot"},
+		[]string{"--group=100"},
+		`/: mode: d`,
+		false,
+	},
+	{
+		`remove-set unprivileged user`,
+		[]string{baseApp, "--seccomp-mode=remove", "--seccomp-set=reboot"},
+		[]string{"--user=1000"},
+		`/: mode: d`,
+		false,
+	},
+	{
+		`CLI override whitelist all`,
+		[]string{baseApp, "--seccomp-mode=remove,errno=EXFULL", "--seccomp-set=stat"},
+		[]string{"--seccomp=mode=retain,@appc.io/all"},
+		`/: mode: d`,
+		false,
+	},
+	{
+		`CLI override blacklist stat with custom error`,
+		[]string{baseApp},
+		[]string{"--seccomp=mode=remove,errno=EXFULL,stat"},
+		"exchange full",
+		true,
+	},
+}
+
+func TestAppIsolatorSeccomp(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	for i, ti := range seccompTestCases {
+		t.Logf("Running seccomp test #%d: %v", i, ti.name)
+		aciFileName := patchTestACI(fmt.Sprintf("rkt-inspect-isolators-%d.aci", i), ti.aciBuildArgs...)
+		defer os.Remove(aciFileName)
+
+		rktCmd := fmt.Sprintf("%s --insecure-options=image run --debug %s %s", ctx.Cmd(), aciFileName, strings.Join(ti.runArgs, " "))
+		runRktAndCheckOutput(t, rktCmd, ti.expectedOutput, ti.expectErr)
+	}
+}

From bc077ba15fbed7cedb10d567a5d6a6e010ce7cfa Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Tue, 26 Jul 2016 22:02:10 +0000
Subject: [PATCH 0603/1304] networking: apply CNI args to the default networks
 as well

---
 networking/podenv.go         | 10 ++++-
 tests/rkt_net_nspawn_test.go |  8 ++++
 tests/rkt_net_test.go        | 76 ++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/networking/podenv.go b/networking/podenv.go
index c5b5f33226..ebde48b91a 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -91,6 +91,11 @@ func (e *podEnv) loadNets() ([]activeNet, error) {
 		return nil, fmt.Errorf("networks not found: %v", strings.Join(missing, ", "))
 	}
 
+	// Add the runtime args to the network instances.
+	// We don't do this earlier because we also load networks in other contexts
+	for _, n := range nets {
+		n.runtime.Args = e.netsLoadList.SpecificArgs(n.conf.Name)
+	}
 	return nets, nil
 }
 
@@ -277,6 +282,9 @@ func copyFileToDir(src, dstdir string) (string, error) {
 	return dst, err
 }
 
+// loadUserNets will load all network configuration files from the user-supplied
+// configuration directory (typically /etc/rkt/net.d). Do not do any mutation here -
+// we also load networks in a few other code paths.
 func loadUserNets(localConfig string, netsLoadList common.NetList) ([]activeNet, error) {
 	if netsLoadList.None() {
 		stderr.Printf("networking namespace with loopback only")
@@ -319,8 +327,6 @@ func loadUserNets(localConfig string, netsLoadList common.NetList) ([]activeNet,
 			continue
 		}
 
-		n.runtime.Args = netsLoadList.SpecificArgs(n.conf.Name)
-
 		nets = append(nets, *n)
 	}
 
diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index 636f7a55be..e327cdd073 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -55,6 +55,14 @@ func TestNetOverride(t *testing.T) {
 	NewNetOverrideTest().Execute(t)
 }
 
+func TestNetDefaultIPArg(t *testing.T) {
+	NewNetDefaultIPArgTest().Execute(t)
+}
+
+func TestNetIPConflict(t *testing.T) {
+	NewNetIPConflictTest().Execute(t)
+}
+
 func TestNetCustomPtp(t *testing.T) {
 	// PTP means connection Point-To-Point. That is, connections to other pods/containers should be forbidden
 	NewNetCustomPtpTest(true).Execute(t)
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index 35ad7f80d8..344705f53d 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -832,6 +832,82 @@ func NewNetOverrideTest() testutils.Test {
 	})
 }
 
+/*
+ * Pass the IP arg to the default networks, ensure it works
+ */
+func NewNetDefaultIPArgTest() testutils.Test {
+	doTest := func(netArg, expectedIP string, t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		appCmd := "--exec=/inspect -- --print-ipv4=eth0"
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=\"%s\" --mds-register=false %s %s",
+			ctx.Cmd(), netArg, getInspectImagePath(), appCmd)
+		child := spawnOrFail(t, cmd)
+		defer waitOrFail(t, child, 0)
+
+		expectedRegex := `IPv4: (\d+\.\d+\.\d+\.\d+)`
+		result, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+			return
+		}
+
+		containerIP := result[1]
+		if expectedIP != containerIP {
+			t.Fatalf("--net=%s setting IP failed: Got %q but expected %q", netArg, containerIP, expectedIP)
+		}
+	}
+	return testutils.TestFunc(func(t *testing.T) {
+		doTest("default:IP=172.16.28.123", "172.16.28.123", t)
+		doTest("default-restricted:IP=172.16.28.42", "172.16.28.42", t)
+	})
+}
+
+/*
+ * Try and start two containers with the same IP, ensure
+ * the second invocation fails
+ */
+func NewNetIPConflictTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		// Launch one container and grab the IP it uses -- and have it idle
+		appCmd := "--exec=/inspect -- --print-ipv4=eth0  --serve-http=0.0.0.0:80"
+		cmd1 := fmt.Sprintf("%s --debug --insecure-options=image run --mds-register=false %s %s",
+			ctx.Cmd(), getInspectImagePath(), appCmd)
+
+		child1 := spawnOrFail(t, cmd1)
+
+		expectedRegex := `IPv4: (\d+\.\d+\.\d+\.\d+)`
+		result, out, err := expectRegexTimeoutWithOutput(child1, expectedRegex, 30*time.Second)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+			return
+		}
+		ip := result[1]
+
+		// Launch a second container with the same IP
+		cmd2 := fmt.Sprintf("%s --debug --insecure-options=image run --net=\"default:IP=%s\" %s --exec=/inspect -- --print-ipv4=eth0",
+			ctx.Cmd(), ip, getInspectImagePath())
+		child2 := spawnOrFail(t, cmd2)
+
+		expectedOutput := fmt.Sprintf(`requested IP address "%s" is not available in network: default`, ip)
+
+		_, out, err = expectRegexTimeoutWithOutput(child2, expectedOutput, 10*time.Second)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+			return
+		}
+
+		// Clean up
+		waitOrFail(t, child2, 1)
+		syscall.Kill(child1.Cmd.Process.Pid, syscall.SIGTERM)
+		waitOrFail(t, child1, 0)
+	})
+}
+
 func NewTestNetLongName() testutils.Test {
 	return testutils.TestFunc(func(t *testing.T) {
 		nt := networkTemplateT{

From 0169a42c530fe92aae5e0bba11d2ab8033f454e4 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Tue, 26 Jul 2016 15:45:54 -0700
Subject: [PATCH 0604/1304] cli: Update `cap-retain/remove` typo in errors

---
 rkt/cli_apps.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index ede8fa25c6..22d15cad19 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -353,13 +353,13 @@ func (ag *appGroup) Type() string {
 	return "appGroup"
 }
 
-// appCapsRetain is for --caps-retain flags in the form of: --caps-retain=CAP_KILL,CAP_NET_ADMIN
+// appCapsRetain is for --cap-retain flags in the form of: --cap-retain=CAP_KILL,CAP_NET_ADMIN
 type appCapsRetain apps.Apps
 
 func (au *appCapsRetain) Set(s string) error {
 	app := (*apps.Apps)(au).Last()
 	if app == nil {
-		return fmt.Errorf("--caps-retain must follow an image")
+		return fmt.Errorf("--cap-retain must follow an image")
 	}
 	capsRetain, err := types.NewLinuxCapabilitiesRetainSet(strings.Split(s, ",")...)
 	if err != nil {
@@ -385,13 +385,13 @@ func (au *appCapsRetain) Type() string {
 	return "appCapsRetain"
 }
 
-// appCapsRemove is for --caps-remove flags in the form of: --caps-remove=CAP_MKNOD,CAP_SYS_CHROOT
+// appCapsRemove is for --cap-remove flags in the form of: --cap-remove=CAP_MKNOD,CAP_SYS_CHROOT
 type appCapsRemove apps.Apps
 
 func (au *appCapsRemove) Set(s string) error {
 	app := (*apps.Apps)(au).Last()
 	if app == nil {
-		return fmt.Errorf("--caps-retain must follow an image")
+		return fmt.Errorf("--cap-retain must follow an image")
 	}
 	capsRemove, err := types.NewLinuxCapabilitiesRevokeSet(strings.Split(s, ",")...)
 	if err != nil {

From c82c712a1bb97ebe26555430e9b58bc7217578eb Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Mon, 1 Aug 2016 17:29:43 -0700
Subject: [PATCH 0605/1304] cli: update cap-* flags to caps-*

See discussion in #2994
---
 Documentation/capabilities-guide.md |  6 +++---
 Documentation/subcommands/run.md    |  4 ++--
 rkt/cli_apps.go                     |  8 ++++----
 rkt/run.go                          | 10 ++++++++--
 stage0/run.go                       |  4 ++--
 tests/rkt_caps_test.go              | 29 +++++++++++++++++++++++++++--
 6 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/Documentation/capabilities-guide.md b/Documentation/capabilities-guide.md
index 25041cce61..9da3302bc8 100644
--- a/Documentation/capabilities-guide.md
+++ b/Documentation/capabilities-guide.md
@@ -297,8 +297,8 @@ listening on [::]:80 ...
 
 Capabilities can be directly overridden at run time from the command-line,
 without changing the executed images.
-The `--cap-retain` option to `rkt run` manipulates the `retain` capabilities set.
-The `--cap-remove` option manipulates the `remove` set.
+The `--caps-retain` option to `rkt run` manipulates the `retain` capabilities set.
+The `--caps-remove` option manipulates the `remove` set.
 
 Capabilities specified from the command-line will replace all capability settings in the image manifest.
 Also as stated above the options `--cap-retain`, and `--cap-remove` are mutually exclusive.
@@ -308,7 +308,7 @@ Capabilities isolators can be added on the command line at run time by
 specifying the desired overriding set, as shown in this example:
 
 ```
-$ sudo rkt run --interactive quay.io/coreos/alpine-sh --cap-retain CAP_NET_BIND_SERVICE
+$ sudo rkt run --interactive quay.io/coreos/alpine-sh --caps-retain CAP_NET_BIND_SERVICE
 image: using image from file /usr/local/bin/stage1-coreos.aci
 image: using image from local store for image name quay.io/coreos/alpine-sh
 
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 21f9096cb3..049679b774 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -344,8 +344,8 @@ For more details see the [hacking documentation](../hacking.md).
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--cap-remove` | none | capability to remove (example: '--cap-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
-| `--cap-retain` | none | capability to retain (example: '--cap-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
+| `--caps-remove` | none | capability to remove (example: '--caps-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
+| `--caps-retain` | none | capability to retain (example: '--caps-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
 | `--cpu` | none | CPU units (ex. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
 | `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times |
 | `--dns-opt` | none | DNS option  | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 22d15cad19..ede8fa25c6 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -353,13 +353,13 @@ func (ag *appGroup) Type() string {
 	return "appGroup"
 }
 
-// appCapsRetain is for --cap-retain flags in the form of: --cap-retain=CAP_KILL,CAP_NET_ADMIN
+// appCapsRetain is for --caps-retain flags in the form of: --caps-retain=CAP_KILL,CAP_NET_ADMIN
 type appCapsRetain apps.Apps
 
 func (au *appCapsRetain) Set(s string) error {
 	app := (*apps.Apps)(au).Last()
 	if app == nil {
-		return fmt.Errorf("--cap-retain must follow an image")
+		return fmt.Errorf("--caps-retain must follow an image")
 	}
 	capsRetain, err := types.NewLinuxCapabilitiesRetainSet(strings.Split(s, ",")...)
 	if err != nil {
@@ -385,13 +385,13 @@ func (au *appCapsRetain) Type() string {
 	return "appCapsRetain"
 }
 
-// appCapsRemove is for --cap-remove flags in the form of: --cap-remove=CAP_MKNOD,CAP_SYS_CHROOT
+// appCapsRemove is for --caps-remove flags in the form of: --caps-remove=CAP_MKNOD,CAP_SYS_CHROOT
 type appCapsRemove apps.Apps
 
 func (au *appCapsRemove) Set(s string) error {
 	app := (*apps.Apps)(au).Last()
 	if app == nil {
-		return fmt.Errorf("--cap-retain must follow an image")
+		return fmt.Errorf("--caps-retain must follow an image")
 	}
 	capsRemove, err := types.NewLinuxCapabilitiesRevokeSet(strings.Split(s, ",")...)
 	if err != nil {
diff --git a/rkt/run.go b/rkt/run.go
index 9c7eba156b..4365f8dada 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -106,10 +106,16 @@ func init() {
 	cmdRun.Flags().Var((*appCPULimit)(&rktApps), "cpu", "cpu limit for the preceding image (example: '--cpu=500m')")
 	cmdRun.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
 	cmdRun.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
-	cmdRun.Flags().Var((*appCapsRetain)(&rktApps), "cap-retain", "capability to retain (example: '--cap-retain=CAP_SYS_ADMIN')")
-	cmdRun.Flags().Var((*appCapsRemove)(&rktApps), "cap-remove", "capability to remove (example: '--cap-remove=CAP_MKNOD')")
+	cmdRun.Flags().Var((*appCapsRetain)(&rktApps), "caps-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")
+	cmdRun.Flags().Var((*appCapsRemove)(&rktApps), "caps-remove", "capability to remove (example: '--caps-remove=CAP_MKNOD')")
 	cmdRun.Flags().Var((*appSeccompFilter)(&rktApps), "seccomp", "seccomp filter override (example: '--seccomp mode=retain,errno=EPERM,chmod,chown')")
 
+	// For backwards compatibility
+	cmdRun.Flags().Var((*appCapsRetain)(&rktApps), "cap-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")
+	cmdRun.Flags().Var((*appCapsRemove)(&rktApps), "cap-remove", "capability to remove (example: '--caps-remove=CAP_MKNOD')")
+	cmdRun.Flags().MarkDeprecated("cap-retain", "use --caps-retain instead")
+	cmdRun.Flags().MarkDeprecated("cap-remove", "use --caps-remove instead")
+
 	flagPorts = portList{}
 	flagDNS = flagStringList{}
 	flagDNSSearch = flagStringList{}
diff --git a/stage0/run.go b/stage0/run.go
index bb9128421b..17d9eeadf1 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -237,11 +237,11 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		}
 
 		if app.CapsRetain != nil && app.CapsRemove != nil {
-			return fmt.Errorf("error: cannot use both --cap-retain and --cap-remove on the same image")
+			return fmt.Errorf("error: cannot use both --caps-retain and --caps-remove on the same image")
 		}
 
 		// Delete existing caps isolators if the user wants to override
-		// them with either --cap-retain or --cap-remove
+		// them with either --caps-retain or --caps-remove
 		if app.CapsRetain != nil || app.CapsRemove != nil {
 			for i := len(ra.App.Isolators) - 1; i >= 0; i-- {
 				isolator := ra.App.Isolators[i]
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index 1943e09506..5bdd56ef00 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -32,6 +32,7 @@ var appCapsTests = []struct {
 	capRetainSet string // only use value if != "x"
 	capRemoveSet string // only use value if != "x"
 	expected     string // caps bounding set as printed by gocapability
+	useOldFlag   bool   // use --cap-retain or --cap-remove instead of --caps-*; backwards compatibility testing
 
 	// set during the test
 	imageFile string
@@ -65,6 +66,13 @@ var appCapsTests = []struct {
 		capRemoveSet: "x",
 		expected:     "net_admin",
 	},
+	{
+		testName:     "image-only-one-cap-old",
+		capRetainSet: "CAP_NET_ADMIN",
+		capRemoveSet: "x",
+		expected:     "net_admin",
+		useOldFlag:   true,
+	},
 	{
 		testName:     "image-only-one-cap-from-default",
 		capRetainSet: "CAP_CHOWN",
@@ -154,6 +162,15 @@ var appCapsTests = []struct {
 			"dac_override, fowner, fsetid, kill, setgid, setuid, setpcap, net_bind_service, net_raw, sys_chroot, mknod, audit_write, setfcap",
 		}, ", "),
 	},
+	{
+		testName:     "image-remove-one-from-default-old",
+		capRetainSet: "x",
+		capRemoveSet: "CAP_CHOWN",
+		useOldFlag:   true,
+		expected: strings.Join([]string{
+			"dac_override, fowner, fsetid, kill, setgid, setuid, setpcap, net_bind_service, net_raw, sys_chroot, mknod, audit_write, setfcap",
+		}, ", "),
+	},
 	{
 		testName:     "image-remove-one-already-removed",
 		capRetainSet: "x",
@@ -347,10 +364,18 @@ func TestCapsSeveralAppWithFlags(t *testing.T) {
 	for _, tt := range appCapsTests {
 		rktArgs += " " + tt.imageFile
 		if tt.capRetainSet != "x" {
-			rktArgs += " --cap-retain=" + tt.capRetainSet
+			capFlag := " --caps-retain"
+			if tt.useOldFlag {
+				capFlag = " --cap-retain"
+			}
+			rktArgs += fmt.Sprintf("%s=%s", capFlag, tt.capRetainSet)
 		}
 		if tt.capRemoveSet != "x" {
-			rktArgs += " --cap-remove=" + tt.capRemoveSet
+			capFlag := " --caps-remove"
+			if tt.useOldFlag {
+				capFlag = " --cap-remove"
+			}
+			rktArgs += fmt.Sprintf("%s=%s", capFlag, tt.capRemoveSet)
 		}
 	}
 	cmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), rktArgs)

From 5e181ea4fe6b5a1d067975b6d876a4cbc00e0618 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Wed, 3 Aug 2016 23:27:53 +0600
Subject: [PATCH 0606/1304] common: use fileutil.IsExecutable()

instead of direct coding of it.
---
 common/common.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/common.go b/common/common.go
index 05b6a60da7..5b3af215e7 100644
--- a/common/common.go
+++ b/common/common.go
@@ -30,6 +30,8 @@ import (
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
+
+	"github.com/coreos/rkt/pkg/fileutil"
 )
 
 const (
@@ -302,12 +304,7 @@ func LookupPath(bin string, paths string) (string, error) {
 		if err != nil {
 			return "", fmt.Errorf("unable to find absolute path for %s", binPath)
 		}
-		d, err := os.Stat(binAbsPath)
-		if err != nil {
-			continue
-		}
-		// Check the executable bit, inspired by os.exec.LookPath()
-		if m := d.Mode(); !m.IsDir() && m&0111 != 0 {
+		if fileutil.IsExecutable(binAbsPath) {
 			return binAbsPath, nil
 		}
 	}

From 49f83cf8e3d60b1d6d629fdae2840e9b77ad97a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 4 Aug 2016 11:49:55 +0200
Subject: [PATCH 0607/1304] glide: bump docker2aci to v0.12.3

Fixes bugs in layer ordering for Docker API v2.1 and v2.2.
---
 glide.lock                                           |  6 +++---
 glide.yaml                                           |  2 +-
 .../lib/internal/backend/repository/repository.go    |  4 ++--
 .../lib/internal/backend/repository/repository2.go   | 12 ++++++++----
 vendor/github.com/appc/docker2aci/lib/version.go     |  2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/glide.lock b/glide.lock
index 5a02db517d..6ae4296ee5 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: 6dd4eb2d90cb8ac317ad1aeb1a1cd0ed0d29375f4fecddaf5ae168eb62f6bc4b
-updated: 2016-08-01T11:52:19.106454487-07:00
+hash: d9834cb91d3632bb241bce57f16fba13fbdce46aee98c555774efcf73f94bb10
+updated: 2016-08-04T11:49:40.691485819+02:00
 imports:
 - name: github.com/appc/docker2aci
-  version: 90dfcf166a2967b926e77e4864fb616dc291c026
+  version: 15d68b33bfee95a448c4da37dbe876baa8fcb5b6
   subpackages:
   - lib
   - lib/common
diff --git a/glide.yaml b/glide.yaml
index dc3405a16c..1e98015673 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.12.2
+  version: v0.12.3
   subpackages:
   - lib
   - lib/common
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
index f9dfaac733..0b5b495199 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
@@ -50,7 +50,7 @@ type RepositoryBackend struct {
 	imageManifests    map[types.ParsedDockerURL]v2Manifest
 	imageV2Manifests  map[types.ParsedDockerURL]*typesV2.ImageManifest
 	imageConfigs      map[types.ParsedDockerURL]*typesV2.ImageConfig
-	reverseLayers     map[string]int
+	layersIndex       map[string]int
 }
 
 func NewRepositoryBackend(username string, password string, insecure common.InsecureConfig) *RepositoryBackend {
@@ -63,7 +63,7 @@ func NewRepositoryBackend(username string, password string, insecure common.Inse
 		imageManifests:    make(map[types.ParsedDockerURL]v2Manifest),
 		imageV2Manifests:  make(map[types.ParsedDockerURL]*typesV2.ImageManifest),
 		imageConfigs:      make(map[types.ParsedDockerURL]*typesV2.ImageConfig),
-		reverseLayers:     make(map[string]int),
+		layersIndex:       make(map[string]int),
 	}
 }
 
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
index ecd1c22e89..d074e9a02c 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -102,7 +102,7 @@ func (rb *RepositoryBackend) buildACIV21(layerIDs []string, dockerURL *types.Par
 
 			manifest := rb.imageManifests[*dockerURL]
 
-			layerIndex, ok := rb.reverseLayers[layerID]
+			layerIndex, ok := rb.layersIndex[layerID]
 			if !ok {
 				errChan <- fmt.Errorf("layer not found in manifest: %s", layerID)
 				return
@@ -254,7 +254,8 @@ func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *types.Par
 	var aciLayerPaths []string
 	var aciManifests []*schema.ImageManifest
 	var curPwl []string
-	for i := len(layerIDs) - 1; i > 0; i-- {
+	var i int
+	for i = 0; i < len(layerIDs)-1; i++ {
 		log.Debug("Generating layer ACI...")
 		aciPath, aciManifest, err := internal.GenerateACI22LowerLayer(dockerURL, layerIDs[i], outputDir, layerFiles[i], curPwl, compression)
 		if err != nil {
@@ -264,7 +265,8 @@ func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *types.Par
 		aciManifests = append(aciManifests, aciManifest)
 		curPwl = aciManifest.PathWhitelist
 	}
-	aciPath, aciManifest, err := internal.GenerateACI22TopLayer(dockerURL, rb.imageConfigs[*dockerURL], layerIDs[0], outputDir, layerFiles[0], curPwl, compression, aciManifests)
+	log.Debug("Generating layer ACI...")
+	aciPath, aciManifest, err := internal.GenerateACI22TopLayer(dockerURL, rb.imageConfigs[*dockerURL], layerIDs[i], outputDir, layerFiles[i], curPwl, compression, aciManifests)
 	if err != nil {
 		return nil, nil, fmt.Errorf("error generating ACI: %v", err)
 	}
@@ -345,7 +347,9 @@ func (rb *RepositoryBackend) getManifestV21(dockerURL *types.ParsedDockerURL, re
 	layers := make([]string, len(manifest.FSLayers))
 
 	for i, layer := range manifest.FSLayers {
-		rb.reverseLayers[layer.BlobSum] = len(manifest.FSLayers) - 1 - i
+		if _, ok := rb.layersIndex[layer.BlobSum]; !ok {
+			rb.layersIndex[layer.BlobSum] = i
+		}
 		layers[i] = layer.BlobSum
 	}
 
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index 4b42806939..bb86085c19 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.12.2"
+var Version = "0.12.3"
 var AppcVersion = schema.AppContainerVersion

From 27d09c6cdf21b8506bc22162a8669d6587efd9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 2 Aug 2016 18:10:23 +0200
Subject: [PATCH 0608/1304] store/*: remove insecureoptions, and aci and sig
 urls

There're some design issues around these fields (see
https://github.com/coreos/rkt/issues/3012 for details) so let's remove
them for now.
---
 rkt/image/dockerfetcher.go       |   3 +-
 rkt/image/filefetcher.go         |  17 +--
 rkt/image/httpfetcher.go         |   4 +-
 rkt/image/namefetcher.go         |   3 +-
 rkt/image_list.go                |  76 +++--------
 store/imagestore/aciinfo.go      |   9 +-
 store/imagestore/migrate.go      |  21 +++
 store/imagestore/migrate_test.go | 218 +++++++++++++++++++++++++++----
 store/imagestore/schema.go       |   4 +-
 store/imagestore/store.go        |  13 +-
 tests/rkt_tests.go               |   8 +-
 11 files changed, 247 insertions(+), 129 deletions(-)

diff --git a/rkt/image/dockerfetcher.go b/rkt/image/dockerfetcher.go
index 581bf209f0..a978c13e0c 100644
--- a/rkt/image/dockerfetcher.go
+++ b/rkt/image/dockerfetcher.go
@@ -76,8 +76,7 @@ func (f *dockerFetcher) fetchImageFrom(u *url.URL, latest bool) (string, error)
 	defer aciFile.Close()
 
 	key, err := f.S.WriteACI(aciFile, imagestore.ACIFetchInfo{
-		Latest:          latest,
-		InsecureOptions: int64(f.InsecureFlags.Value()),
+		Latest: latest,
 	})
 	if err != nil {
 		return "", err
diff --git a/rkt/image/filefetcher.go b/rkt/image/filefetcher.go
index e570b40e13..98c11ac2f2 100644
--- a/rkt/image/filefetcher.go
+++ b/rkt/image/filefetcher.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"time"
 
 	"github.com/coreos/rkt/pkg/keystore"
 	rktflag "github.com/coreos/rkt/rkt/flag"
@@ -52,26 +51,12 @@ func (f *fileFetcher) Hash(aciPath string, a *asc) (string, error) {
 	defer aciFile.Close()
 
 	key, err := f.S.WriteACI(aciFile, imagestore.ACIFetchInfo{
-		Latest:          false,
-		InsecureOptions: int64(f.InsecureFlags.Value()),
+		Latest: false,
 	})
 	if err != nil {
 		return "", err
 	}
 
-	ascLocation := ""
-	if a != nil {
-		ascLocation = "file://" + a.Location
-	}
-
-	newRem := imagestore.NewRemote("file://"+aciPath, ascLocation)
-	newRem.BlobKey = key
-	newRem.DownloadTime = time.Now()
-	err = f.S.WriteRemote(newRem)
-	if err != nil {
-		return "", err
-	}
-
 	return key, nil
 }
 
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index 7b3ffee2d7..b93741c9fe 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -17,7 +17,6 @@ package image
 import (
 	"errors"
 	"io"
-
 	"net/url"
 	"time"
 
@@ -72,8 +71,7 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 		return key, nil
 	}
 	key, err := f.S.WriteACI(aciFile, imagestore.ACIFetchInfo{
-		Latest:          false,
-		InsecureOptions: int64(f.InsecureFlags.Value()),
+		Latest: false,
 	})
 	if err != nil {
 		return "", err
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 7d0d0fefc1..218ca990dc 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -130,8 +130,7 @@ func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL st
 		return key, nil
 	}
 	key, err := f.S.WriteACI(aciFile, imagestore.ACIFetchInfo{
-		Latest:          latest,
-		InsecureOptions: int64(f.InsecureFlags.Value()),
+		Latest: latest,
 	})
 	if err != nil {
 		return "", err
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 6d2d79ac9b..a0848f1452 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -32,15 +32,12 @@ import (
 const (
 	defaultTimeLayout = "2006-01-02 15:04:05.999 -0700 MST"
 
-	id              = "id"
-	name            = "name"
-	importTime      = "import time"
-	lastUsed        = "last used"
-	size            = "size"
-	latest          = "latest"
-	insecureOptions = "insecure options"
-	aciURL          = "ACI URL"
-	signatureURL    = "signature URL"
+	id         = "id"
+	name       = "name"
+	importTime = "import time"
+	lastUsed   = "last used"
+	size       = "size"
+	latest     = "latest"
 )
 
 // Convenience methods for formatting fields
@@ -54,29 +51,23 @@ func u(s string) string {
 var (
 	// map of valid fields and related header name
 	ImagesFieldHeaderMap = map[string]string{
-		l(id):              u(id),
-		l(name):            u(name),
-		l(importTime):      u(importTime),
-		l(lastUsed):        u(lastUsed),
-		l(latest):          u(latest),
-		l(size):            u(size),
-		l(insecureOptions): u(insecureOptions),
-		l(aciURL):          u(aciURL),
-		l(signatureURL):    u(signatureURL),
+		l(id):         u(id),
+		l(name):       u(name),
+		l(importTime): u(importTime),
+		l(lastUsed):   u(lastUsed),
+		l(latest):     u(latest),
+		l(size):       u(size),
 	}
 
 	// map of valid sort fields containing the mapping between the provided field name
 	// and the related aciinfo's field name.
 	ImagesFieldAciInfoMap = map[string]string{
-		l(id):              "blobkey",
-		l(name):            l(name),
-		l(importTime):      l(importTime),
-		l(lastUsed):        l(lastUsed),
-		l(latest):          l(latest),
-		l(size):            l(size),
-		l(insecureOptions): u(insecureOptions),
-		l(aciURL):          u(aciURL),
-		l(signatureURL):    u(signatureURL),
+		l(id):         "blobkey",
+		l(name):       l(name),
+		l(importTime): l(importTime),
+		l(lastUsed):   l(lastUsed),
+		l(latest):     l(latest),
+		l(size):       l(size),
 	}
 
 	ImagesSortableFields = map[string]struct{}{
@@ -127,7 +118,7 @@ var (
 func init() {
 	sortFields := []string{l(name), l(importTime), l(lastUsed), l(size)}
 
-	fields := []string{l(id), l(name), l(aciURL), l(signatureURL), l(insecureOptions), l(size), l(importTime), l(lastUsed)}
+	fields := []string{l(id), l(name), l(size), l(importTime), l(lastUsed)}
 
 	// Set defaults
 	var err error
@@ -245,37 +236,8 @@ func runImages(cmd *cobra.Command, args []string) int {
 				}
 			case l(latest):
 				fieldValue = fmt.Sprintf("%t", aciInfo.Latest)
-			case l(insecureOptions):
-				f, err := rktflag.NewSecFlagsFromValue(int(aciInfo.InsecureOptions))
-				if err != nil {
-					stderr.Error(err)
-					return 1
-				}
-
-				// remove ondisk, it's a runtime insecure option
-				sp := strings.Split(f.String(), ",")
-				for i, o := range sp {
-					if o == "ondisk" {
-						sp = append(sp[:i], sp[i+1:]...)
-					}
-				}
-
-				fieldValue = fmt.Sprintf("%s", strings.Join(sp, ","))
-			case l(aciURL):
-				if imageRemote := remoteMap[aciInfo.BlobKey]; imageRemote == nil {
-					fieldValue = ""
-				} else {
-					fieldValue = fmt.Sprintf("%s", imageRemote.ACIURL)
-				}
-			case l(signatureURL):
-				if imageRemote := remoteMap[aciInfo.BlobKey]; imageRemote == nil {
-					fieldValue = ""
-				} else {
-					fieldValue = fmt.Sprintf("%s", imageRemote.SigURL)
-				}
 			}
 			fieldValues = append(fieldValues, fieldValue)
-
 		}
 		fmt.Fprintf(tabOut, "%s\n", strings.Join(fieldValues, "\t"))
 	}
diff --git a/store/imagestore/aciinfo.go b/store/imagestore/aciinfo.go
index bf5955c46a..1f96156fa8 100644
--- a/store/imagestore/aciinfo.go
+++ b/store/imagestore/aciinfo.go
@@ -26,9 +26,6 @@ type ACIFetchInfo struct {
 	// Latest defines if the ACI was imported using the latest pattern
 	// (no version label was provided on ACI discovery).
 	Latest bool
-
-	// InsecureOptions are the insecure options that was used when retrieving the ACI.
-	InsecureOptions int64
 }
 
 // ACIInfo is used to store information about an ACI.
@@ -49,8 +46,6 @@ type ACIInfo struct {
 	// Latest defines if the ACI was imported using the latest pattern (no
 	// version label was provided on ACI discovery)
 	Latest bool
-	// InsecureOptions are the insecure options that were used when retrieving the ACI.
-	InsecureOptions int64
 }
 
 func NewACIInfo(blobKey string, latest bool, t time.Time, size int64, treeStoreSize int64) *ACIInfo {
@@ -66,7 +61,7 @@ func NewACIInfo(blobKey string, latest bool, t time.Time, size int64, treeStoreS
 
 func aciinfoRowScan(rows *sql.Rows, aciinfo *ACIInfo) error {
 	// This ordering MUST match that in schema.go
-	return rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize, &aciinfo.InsecureOptions)
+	return rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize)
 }
 
 // GetAciInfosWithKeyPrefix returns all the ACIInfos with a blobkey starting with the given prefix.
@@ -173,7 +168,7 @@ func WriteACIInfo(tx *sql.Tx, aciinfo *ACIInfo) error {
 	if err != nil {
 		return err
 	}
-	_, err = tx.Exec("INSERT into aciinfo (blobkey, name, importtime, lastused, latest, size, treestoresize, insecureoptions) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest, aciinfo.Size, aciinfo.TreeStoreSize, aciinfo.InsecureOptions)
+	_, err = tx.Exec("INSERT into aciinfo (blobkey, name, importtime, lastused, latest, size, treestoresize) VALUES ($1, $2, $3, $4, $5, $6, $7)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest, aciinfo.Size, aciinfo.TreeStoreSize)
 	if err != nil {
 		return err
 	}
diff --git a/store/imagestore/migrate.go b/store/imagestore/migrate.go
index e56f318171..7157897e60 100644
--- a/store/imagestore/migrate.go
+++ b/store/imagestore/migrate.go
@@ -35,6 +35,7 @@ var (
 		4: migrateToV4,
 		5: migrateToV5,
 		6: migrateToV6,
+		7: migrateToV7,
 	}
 
 	clock = clockwork.NewRealClock()
@@ -177,3 +178,23 @@ func migrateToV6(tx *sql.Tx) error {
 
 	return nil
 }
+
+func migrateToV7(tx *sql.Tx) error {
+	for _, t := range []string{
+		"CREATE TABLE aciinfo_tmp (blobkey string, name string, importtime time, lastused time, latest bool, size int64, treestoresize int64, insecureoptions int64 DEFAULT 0);",
+		"INSERT INTO aciinfo_tmp (blobkey, name, importtime, lastused, latest, size, treestoresize) SELECT blobkey, name, importtime, lastused, latest, size, treestoresize from aciinfo",
+		"DROP TABLE aciinfo",
+		"CREATE TABLE aciinfo (blobkey string, name string, importtime time, lastused time, latest bool, size int64 DEFAULT 0, treestoresize int64 DEFAULT 0);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS blobkeyidx ON aciinfo (blobkey)",
+		"CREATE INDEX IF NOT EXISTS nameidx ON aciinfo (name)",
+		"INSERT INTO aciinfo SELECT blobkey, name, importtime, lastused, latest, size, treestoresize from aciinfo_tmp",
+		"DROP TABLE aciinfo_tmp",
+	} {
+		_, err := tx.Exec(t)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/store/imagestore/migrate_test.go b/store/imagestore/migrate_test.go
index 3970157795..847d81536a 100644
--- a/store/imagestore/migrate_test.go
+++ b/store/imagestore/migrate_test.go
@@ -133,7 +133,7 @@ func (d *DBV1) compare(td testdb) bool {
 
 type DBV2 struct {
 	aciinfos []*ACIInfoV0_2
-	remotes  []*RemoteV2_6
+	remotes  []*RemoteV2_7
 }
 
 func (d *DBV2) version() int {
@@ -150,7 +150,7 @@ func (d *DBV2) load(db *db.DB) error {
 		if err != nil {
 			return err
 		}
-		d.remotes, err = getAllRemoteV2_6(tx)
+		d.remotes, err = getAllRemoteV2_7(tx)
 		if err != nil {
 			return err
 		}
@@ -178,7 +178,7 @@ func (d *DBV2) compare(td testdb) bool {
 
 type DBV3 struct {
 	aciinfos []*ACIInfoV3
-	remotes  []*RemoteV2_6
+	remotes  []*RemoteV2_7
 }
 
 func (d *DBV3) version() int {
@@ -195,7 +195,7 @@ func (d *DBV3) load(db *db.DB) error {
 		if err != nil {
 			return err
 		}
-		d.remotes, err = getAllRemoteV2_6(tx)
+		d.remotes, err = getAllRemoteV2_7(tx)
 		if err != nil {
 			return err
 		}
@@ -223,7 +223,7 @@ func (d *DBV3) compare(td testdb) bool {
 
 type DBV4 struct {
 	aciinfos []*ACIInfoV4
-	remotes  []*RemoteV2_6
+	remotes  []*RemoteV2_7
 }
 
 func (d *DBV4) version() int {
@@ -240,7 +240,7 @@ func (d *DBV4) load(db *db.DB) error {
 		if err != nil {
 			return err
 		}
-		d.remotes, err = getAllRemoteV2_6(tx)
+		d.remotes, err = getAllRemoteV2_7(tx)
 		if err != nil {
 			return err
 		}
@@ -268,7 +268,7 @@ func (d *DBV4) compare(td testdb) bool {
 
 type DBV5 struct {
 	aciinfos []*ACIInfoV5
-	remotes  []*RemoteV2_6
+	remotes  []*RemoteV2_7
 }
 
 func (d *DBV5) version() int {
@@ -285,7 +285,7 @@ func (d *DBV5) load(db *db.DB) error {
 		if err != nil {
 			return err
 		}
-		d.remotes, err = getAllRemoteV2_6(tx)
+		d.remotes, err = getAllRemoteV2_7(tx)
 		if err != nil {
 			return err
 		}
@@ -313,7 +313,7 @@ func (d *DBV5) compare(td testdb) bool {
 
 type DBV6 struct {
 	aciinfos []*ACIInfoV6
-	remotes  []*RemoteV2_6
+	remotes  []*RemoteV2_7
 }
 
 func (d *DBV6) version() int {
@@ -330,7 +330,7 @@ func (d *DBV6) load(db *db.DB) error {
 		if err != nil {
 			return err
 		}
-		d.remotes, err = getAllRemoteV2_6(tx)
+		d.remotes, err = getAllRemoteV2_7(tx)
 		if err != nil {
 			return err
 		}
@@ -356,6 +356,51 @@ func (d *DBV6) compare(td testdb) bool {
 	return true
 }
 
+type DBV7 struct {
+	aciinfos []*ACIInfoV7
+	remotes  []*RemoteV2_7
+}
+
+func (d *DBV7) version() int {
+	return 7
+}
+func (d *DBV7) populate(db *db.DB) error {
+	return populateDBV7(db, d.version(), d.aciinfos, d.remotes)
+}
+
+func (d *DBV7) load(db *db.DB) error {
+	fn := func(tx *sql.Tx) error {
+		var err error
+		d.aciinfos, err = getAllACIInfosV7(tx)
+		if err != nil {
+			return err
+		}
+		d.remotes, err = getAllRemoteV2_7(tx)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (d *DBV7) compare(td testdb) bool {
+	d7, ok := td.(*DBV7)
+	if !ok {
+		return false
+	}
+	if !compareSlicesNoOrder(d.aciinfos, d7.aciinfos) {
+		return false
+	}
+	if !compareSlicesNoOrder(d.remotes, d7.remotes) {
+		return false
+	}
+	return true
+}
+
 // The ACIInfo struct for different db versions. The ending VX_Y represent the
 // first and the last version where the format isn't changed
 // The latest existing struct should be updated when updating the db version
@@ -405,6 +450,16 @@ type ACIInfoV6 struct {
 	InsecureOptions int64
 }
 
+type ACIInfoV7 struct {
+	BlobKey       string
+	Name          string
+	ImportTime    time.Time
+	LastUsed      time.Time
+	Latest        bool
+	Size          int64
+	TreeStoreSize int64
+}
+
 func getAllACIInfosV0_2(tx *sql.Tx) ([]*ACIInfoV0_2, error) {
 	var aciinfos []*ACIInfoV0_2
 	rows, err := tx.Query("SELECT * FROM aciinfo")
@@ -500,6 +555,25 @@ func getAllACIInfosV6(tx *sql.Tx) ([]*ACIInfoV6, error) {
 	return aciinfos, nil
 }
 
+func getAllACIInfosV7(tx *sql.Tx) ([]*ACIInfoV7, error) {
+	var aciinfos []*ACIInfoV7
+	rows, err := tx.Query("SELECT * FROM aciinfo")
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		aciinfo := &ACIInfoV7{}
+		if rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize); err != nil {
+			return nil, err
+		}
+		aciinfos = append(aciinfos, aciinfo)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return aciinfos, nil
+}
+
 type RemoteV0_1 struct {
 	ACIURL  string
 	SigURL  string
@@ -526,7 +600,7 @@ func getAllRemoteV0_1(tx *sql.Tx) ([]*RemoteV0_1, error) {
 	return remotes, nil
 }
 
-type RemoteV2_6 struct {
+type RemoteV2_7 struct {
 	ACIURL       string
 	SigURL       string
 	ETag         string
@@ -535,14 +609,14 @@ type RemoteV2_6 struct {
 	DownloadTime time.Time
 }
 
-func getAllRemoteV2_6(tx *sql.Tx) ([]*RemoteV2_6, error) {
-	var remotes []*RemoteV2_6
+func getAllRemoteV2_7(tx *sql.Tx) ([]*RemoteV2_7, error) {
+	var remotes []*RemoteV2_7
 	rows, err := tx.Query("SELECT * FROM remote")
 	if err != nil {
 		return nil, err
 	}
 	for rows.Next() {
-		remote := &RemoteV2_6{}
+		remote := &RemoteV2_7{}
 		if err := rows.Scan(&remote.ACIURL, &remote.SigURL, &remote.ETag, &remote.BlobKey, &remote.CacheMaxAge, &remote.DownloadTime); err != nil {
 			return nil, err
 		}
@@ -612,7 +686,7 @@ func populateDBV0_1(db *db.DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes [
 	return nil
 }
 
-func populateDBV2(db *db.DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*RemoteV2_6) error {
+func populateDBV2(db *db.DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*RemoteV2_7) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -670,7 +744,7 @@ func populateDBV2(db *db.DB, dbVersion int, aciInfos []*ACIInfoV0_2, remotes []*
 	return nil
 }
 
-func populateDBV3(db *db.DB, dbVersion int, aciInfos []*ACIInfoV3, remotes []*RemoteV2_6) error {
+func populateDBV3(db *db.DB, dbVersion int, aciInfos []*ACIInfoV3, remotes []*RemoteV2_7) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -727,7 +801,7 @@ func populateDBV3(db *db.DB, dbVersion int, aciInfos []*ACIInfoV3, remotes []*Re
 	return nil
 }
 
-func populateDBV4(db *db.DB, dbVersion int, aciInfos []*ACIInfoV4, remotes []*RemoteV2_6) error {
+func populateDBV4(db *db.DB, dbVersion int, aciInfos []*ACIInfoV4, remotes []*RemoteV2_7) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -784,7 +858,7 @@ func populateDBV4(db *db.DB, dbVersion int, aciInfos []*ACIInfoV4, remotes []*Re
 	return nil
 }
 
-func populateDBV5(db *db.DB, dbVersion int, aciInfos []*ACIInfoV5, remotes []*RemoteV2_6) error {
+func populateDBV5(db *db.DB, dbVersion int, aciInfos []*ACIInfoV5, remotes []*RemoteV2_7) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -841,7 +915,7 @@ func populateDBV5(db *db.DB, dbVersion int, aciInfos []*ACIInfoV5, remotes []*Re
 	return nil
 }
 
-func populateDBV6(db *db.DB, dbVersion int, aciInfos []*ACIInfoV6, remotes []*RemoteV2_6) error {
+func populateDBV6(db *db.DB, dbVersion int, aciInfos []*ACIInfoV6, remotes []*RemoteV2_7) error {
 	var dbCreateStmts = [...]string{
 		// version table
 		"CREATE TABLE IF NOT EXISTS version (version int);",
@@ -871,7 +945,64 @@ func populateDBV6(db *db.DB, dbVersion int, aciInfos []*ACIInfoV6, remotes []*Re
 
 	fn = func(tx *sql.Tx) error {
 		for _, aciinfo := range aciInfos {
-			_, err := tx.Exec("INSERT INTO aciinfo (blobkey, name, importtime, lastused, latest, size, treestoresize, souceurl, insecureoptions) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest, aciinfo.Size, aciinfo.TreeStoreSize, aciinfo.InsecureOptions)
+			_, err := tx.Exec("INSERT INTO aciinfo (blobkey, name, importtime, lastused, latest, size, treestoresize, insecureoptions) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest, aciinfo.Size, aciinfo.TreeStoreSize, aciinfo.InsecureOptions)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	fn = func(tx *sql.Tx) error {
+		for _, remote := range remotes {
+			_, err := tx.Exec("INSERT into remote values ($1, $2, $3, $4, $5, $6)", remote.ACIURL, remote.SigURL, remote.ETag, remote.BlobKey, remote.CacheMaxAge, remote.DownloadTime)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func populateDBV7(db *db.DB, dbVersion int, aciInfos []*ACIInfoV7, remotes []*RemoteV2_7) error {
+	var dbCreateStmts = [...]string{
+		// version table
+		"CREATE TABLE IF NOT EXISTS version (version int);",
+		fmt.Sprintf("INSERT INTO version VALUES (%d)", dbVersion),
+
+		// remote table. The primary key is "aciurl".
+		"CREATE TABLE IF NOT EXISTS remote (aciurl string, sigurl string, etag string, blobkey string, cachemaxage int, downloadtime time);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS aciurlidx ON remote (aciurl)",
+
+		// aciinfo table. The primary key is "blobkey" and it matches the key used to save that aci in the blob store
+		"CREATE TABLE IF NOT EXISTS aciinfo (blobkey string, name string, importtime time, lastused time, latest bool, size int64, treestoresize int64);",
+		"CREATE UNIQUE INDEX IF NOT EXISTS blobkeyidx ON aciinfo (blobkey)",
+		"CREATE INDEX IF NOT EXISTS nameidx ON aciinfo (name)",
+	}
+	fn := func(tx *sql.Tx) error {
+		for _, stmt := range dbCreateStmts {
+			_, err := tx.Exec(stmt)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	if err := db.Do(fn); err != nil {
+		return err
+	}
+
+	fn = func(tx *sql.Tx) error {
+		for _, aciinfo := range aciInfos {
+			_, err := tx.Exec("INSERT INTO aciinfo (blobkey, name, importtime, lastused, latest, size, treestoresize) VALUES ($1, $2, $3, $4, $5, $6, $7)", aciinfo.BlobKey, aciinfo.Name, aciinfo.ImportTime, aciinfo.LastUsed, aciinfo.Latest, aciinfo.Size, aciinfo.TreeStoreSize)
 			if err != nil {
 				return err
 			}
@@ -987,6 +1118,11 @@ func TestMigrate(t *testing.T) {
 		2 << 16,
 	}
 
+	insecureOptions := []int64{
+		0,
+		2,
+	}
+
 	now := time.Now().UTC()
 
 	// Injects a fake clock to store pkg clock
@@ -1042,7 +1178,7 @@ func TestMigrate(t *testing.T) {
 					{blobKeys[0], "example.com/app01", now, false},
 					{blobKeys[1], "example.com/app02", now, true},
 				},
-				[]*RemoteV2_6{
+				[]*RemoteV2_7{
 					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
 					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
@@ -1057,7 +1193,7 @@ func TestMigrate(t *testing.T) {
 					{blobKeys[0], "example.com/app01", now, false},
 					{blobKeys[1], "example.com/app02", now, true},
 				},
-				[]*RemoteV2_6{
+				[]*RemoteV2_7{
 					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
 					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
@@ -1067,7 +1203,7 @@ func TestMigrate(t *testing.T) {
 					{blobKeys[0], "example.com/app01", now, false},
 					{blobKeys[1], "example.com/app02", now, true},
 				},
-				[]*RemoteV2_6{
+				[]*RemoteV2_7{
 					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
 					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
@@ -1082,7 +1218,7 @@ func TestMigrate(t *testing.T) {
 					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, Latest: false},
 					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, Latest: true},
 				},
-				[]*RemoteV2_6{
+				[]*RemoteV2_7{
 					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
 					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
@@ -1092,7 +1228,7 @@ func TestMigrate(t *testing.T) {
 					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false},
 					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true},
 				},
-				[]*RemoteV2_6{
+				[]*RemoteV2_7{
 					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
 					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
@@ -1107,7 +1243,7 @@ func TestMigrate(t *testing.T) {
 					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false},
 					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true},
 				},
-				[]*RemoteV2_6{
+				[]*RemoteV2_7{
 					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
 					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
@@ -1117,7 +1253,7 @@ func TestMigrate(t *testing.T) {
 					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false},
 					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true},
 				},
-				[]*RemoteV2_6{
+				[]*RemoteV2_7{
 					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
 					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
@@ -1132,7 +1268,7 @@ func TestMigrate(t *testing.T) {
 					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false, Size: sizes[0], TreeStoreSize: treeStoreSizes[0]},
 					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true, Size: sizes[1], TreeStoreSize: treeStoreSizes[1]},
 				},
-				[]*RemoteV2_6{
+				[]*RemoteV2_7{
 					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
 					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
@@ -1142,13 +1278,37 @@ func TestMigrate(t *testing.T) {
 					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false, Size: sizes[0], TreeStoreSize: treeStoreSizes[0]},
 					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true, Size: sizes[1], TreeStoreSize: treeStoreSizes[1]},
 				},
-				[]*RemoteV2_6{
+				[]*RemoteV2_7{
 					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
 					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
 				},
 			},
 			&DBV6{},
 		},
+		{
+			// Test migration from V6 to V7
+			&DBV6{
+				[]*ACIInfoV6{
+					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false, Size: sizes[0], TreeStoreSize: treeStoreSizes[0], InsecureOptions: insecureOptions[0]},
+					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true, Size: sizes[1], TreeStoreSize: treeStoreSizes[1], InsecureOptions: insecureOptions[1]},
+				},
+				[]*RemoteV2_7{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
+				},
+			},
+			&DBV7{
+				[]*ACIInfoV7{
+					{BlobKey: blobKeys[0], Name: names[0], ImportTime: now, LastUsed: now, Latest: false, Size: sizes[0], TreeStoreSize: treeStoreSizes[0]},
+					{BlobKey: blobKeys[1], Name: names[1], ImportTime: now, LastUsed: now, Latest: true, Size: sizes[1], TreeStoreSize: treeStoreSizes[1]},
+				},
+				[]*RemoteV2_7{
+					{"http://example.com/app01.aci", "http://example.com/app01.aci.asc", "", blobKeys[0], 0, time.Time{}.UTC()},
+					{"http://example.com/app02.aci", "http://example.com/app02.aci.asc", "", blobKeys[1], 0, time.Time{}.UTC()},
+				},
+			},
+			&DBV7{},
+		},
 	}
 
 	for i, tt := range tests {
diff --git a/store/imagestore/schema.go b/store/imagestore/schema.go
index 7a3e65e5c6..c9a21fb184 100644
--- a/store/imagestore/schema.go
+++ b/store/imagestore/schema.go
@@ -21,7 +21,7 @@ import (
 
 const (
 	// Incremental db version at the current code revision.
-	dbVersion = 6
+	dbVersion = 7
 )
 
 // Statement to run when creating a db. These are the statements to create the
@@ -37,7 +37,7 @@ var dbCreateStmts = [...]string{
 	"CREATE UNIQUE INDEX IF NOT EXISTS aciurlidx ON remote (aciurl)",
 
 	// aciinfo table. The primary key is "blobkey" and it matches the key used to save that aci in the blob store
-	"CREATE TABLE IF NOT EXISTS aciinfo (blobkey string, name string, importtime time, lastused time, latest bool, size int64 DEFAULT 0, treestoresize int64 DEFAULT 0, insecureoptions int64 DEFAULT 0);",
+	"CREATE TABLE IF NOT EXISTS aciinfo (blobkey string, name string, importtime time, lastused time, latest bool, size int64 DEFAULT 0, treestoresize int64 DEFAULT 0);",
 	"CREATE UNIQUE INDEX IF NOT EXISTS blobkeyidx ON aciinfo (blobkey)",
 	"CREATE INDEX IF NOT EXISTS nameidx ON aciinfo (name)",
 }
diff --git a/store/imagestore/store.go b/store/imagestore/store.go
index 1d1613052e..d096dce1fe 100644
--- a/store/imagestore/store.go
+++ b/store/imagestore/store.go
@@ -482,13 +482,12 @@ func (s *Store) WriteACI(r io.ReadSeeker, fetchInfo ACIFetchInfo) (string, error
 	// Save aciinfo
 	if err = s.db.Do(func(tx *sql.Tx) error {
 		aciinfo := &ACIInfo{
-			BlobKey:         key,
-			Name:            im.Name.String(),
-			ImportTime:      time.Now(),
-			LastUsed:        time.Now(),
-			Latest:          fetchInfo.Latest,
-			Size:            sz,
-			InsecureOptions: fetchInfo.InsecureOptions,
+			BlobKey:    key,
+			Name:       im.Name.String(),
+			ImportTime: time.Now(),
+			LastUsed:   time.Now(),
+			Latest:     fetchInfo.Latest,
+			Size:       sz,
 		}
 		return WriteACIInfo(tx, aciinfo)
 	}); err != nil {
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 6b1e515bc9..9404549995 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -627,13 +627,13 @@ func parseImageInfoOutput(t *testing.T, result string) *imageInfo {
 	if len(nameVersion) != 2 {
 		t.Fatalf("Failed to parse name version string: %q", fields[1])
 	}
-	importTime, err := time.Parse(defaultTimeLayout, fields[6])
+	importTime, err := time.Parse(defaultTimeLayout, fields[3])
 	if err != nil {
-		t.Fatalf("Failed to parse time string: %q", fields[6])
+		t.Fatalf("Failed to parse time string: %q", fields[3])
 	}
-	size, err := strconv.Atoi(fields[5])
+	size, err := strconv.Atoi(fields[2])
 	if err != nil {
-		t.Fatalf("Failed to parse image size string: %q", fields[5])
+		t.Fatalf("Failed to parse image size string: %q", fields[2])
 	}
 
 	return &imageInfo{

From d80741dc49847170ccaa6f56fa3c45be0aedcd4b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 4 Aug 2016 13:44:40 +0000
Subject: [PATCH 0609/1304] version: bump to v1.12.0

---
 CHANGELOG.md                         | 37 ++++++++++++++++++++++++++++
 Documentation/running-fly-stage1.md  |  4 +--
 Documentation/running-lkvm-stage1.md |  4 +--
 Documentation/subcommands/prepare.md |  2 +-
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 ++---
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 16 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 253932a707..d482ac056c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,40 @@
+## 1.12.0
+
+This release introduces support for seccomp filtering via two new seccomp isolators. It also gives a boost to api-service performance by introducing manifest caching. Finally it fixes several regressions related to Docker images handling.
+
+#### New features and UX changes
+
+- cli: rename `--cap-retain` and `--cap-remove` to `--caps-*` ([#2994](https://github.com/coreos/rkt/pull/2994)).
+- stage1: apply seccomp isolators ([#2753](https://github.com/coreos/rkt/pull/2753)). This introduces support for appc seccomp isolators.
+- scripts: add /etc/rkt owned by group rkt-admin in setup-data-dir.sh ([#2944](https://github.com/coreos/rkt/pull/2944)).
+- rkt: add `--caps-retain` and `--caps-remove` to prepare ([#3007](https://github.com/coreos/rkt/pull/3007)).
+- store: allow users in the rkt group to delete images ([#2961](https://github.com/coreos/rkt/pull/2961)).
+- api_service: cache pod manifest ([#2891](https://github.com/coreos/rkt/pull/2891)). Manifest caching considerably improves api-service performances.
+- store: tell the user to run as root on db update ([#2966](https://github.com/coreos/rkt/pull/2966)).
+- stage1: disabling cgroup namespace in systemd-nspawn ([#2989](https://github.com/coreos/rkt/pull/2989)). For more information see [systemd#3589](https://github.com/systemd/systemd/pull/3589).
+- fly: copy rkt-resolv.conf in the app ([#2982](https://github.com/coreos/rkt/pull/2982)).
+- store: decouple aci store and treestore implementations ([#2919](https://github.com/coreos/rkt/pull/2919)).
+- store: record ACI fetching information ([#2960](https://github.com/coreos/rkt/pull/2960)).
+
+#### Bug fixes
+- stage1/init: fix writing of /etc/machine-id ([#2977](https://github.com/coreos/rkt/pull/2977)).
+- rkt-monitor: multiple fixes ([#2927](https://github.com/coreos/rkt/pull/2927), [#2988](https://github.com/coreos/rkt/pull/2988)).
+- rkt: don't errwrap cli_apps errors ([#2958](https://github.com/coreos/rkt/pull/2958)).
+- pkg/tar/chroot: avoid errwrap in function called by multicall ([#2997](https://github.com/coreos/rkt/pull/2997)).
+- networking: apply CNI args to the default networks as well ([#2985](https://github.com/coreos/rkt/pull/2985)).
+- trust: provide InsecureSkipTLSCheck to pubkey manager ([#3016](https://github.com/coreos/rkt/pull/3016)).
+- api_service: update grpc version ([#3015](https://github.com/coreos/rkt/pull/3015)).
+- fetcher: httpcaching fixes ([#2965](https://github.com/coreos/rkt/pull/2965)).
+
+#### Other changes
+- build,stage1/init: set interpBin at build time for src flavor ([#2978](https://github.com/coreos/rkt/pull/2978)).
+- common: introduce RemoveEmptyLines() ([#3004](https://github.com/coreos/rkt/pull/3004)).
+- glide: update docker2aci to v0.12.3 ([#3026](https://github.com/coreos/rkt/pull/3026)). This fixes multiple bugs in layers ordering for Docker images.
+- glide: update go-systemd to v11 ([#2970](https://github.com/coreos/rkt/pull/2970)). This fixes a buggy corner-case in journal seeking (implicit seek to head).
+- docs: document capabilities overriding ([#2917](https://github.com/coreos/rkt/pull/2917), [#2991](https://github.com/coreos/rkt/pull/2991)).
+- issue template: add '\n' to the end of environment output ([#3008](https://github.com/coreos/rkt/pull/3008)).
+- functional tests: multiple fixes ([#2999](https://github.com/coreos/rkt/pull/2999), [#2979](https://github.com/coreos/rkt/pull/2979), [#3014](https://github.com/coreos/rkt/pull/3014)).
+
 ## 1.11.0
 
 This release sets the ground for the new upcoming KVM qemu flavor. It adds support for exporting a pod to an ACI including all modifications. The rkt API service now also supports systemd socket activation. Finally we have diagnostics back, helping users to find out why their app failed to execute.
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 19494cf9ba..e238fc7934 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.11.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.12.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.11.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.12.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index b5c0462856..f80709fe2a 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.11.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.12.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.11.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.12.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 0d4676764e..3d5feec771 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.11.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.12.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 00b14b1483..3fca1f80b6 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.11.0
+rkt Version: 1.12.0
 appc Version: 0.7.4
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 60fac2c5a6..df155de6c6 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.11.0/rkt-v1.11.0.tar.gz
-tar xzvf rkt-v1.11.0.tar.gz
-cd rkt-v1.11.0
+wget https://github.com/coreos/rkt/releases/download/v1.12.0/rkt-v1.12.0.tar.gz
+tar xzvf rkt-v1.12.0.tar.gz
+cd rkt-v1.12.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 871f80fb9a..515333dc8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.11.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.12.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 1843e32385..c22f647099 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.11.0"
+version="1.12.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 933339ee65..ed89c334bf 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.11.0"
+            "value": "1.12.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index bd994c8b37..9e1042a09f 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.11.0"
+            "value": "1.12.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index f0b8c2264b..3975727b38 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -28,7 +28,7 @@ trap acbuildEnd EXIT
 
 acbuild --debug set-name appc.io/rkt-"${1}"-stresser
 
-acbuild --debug copy build-rkt-1.11.0+git/target/bin/"${1}"-stresser /worker
+acbuild --debug copy build-rkt-1.12.0/target/bin/"${1}"-stresser /worker
 
 acbuild --debug set-exec -- /worker
 
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 7e903cc38f..1486faa599 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.11.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index be645a1cd8..ca88a25174 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.11.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 7e9a0a33a3..0d825c3374 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.11.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 1cca7c1f20..f00512de5a 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.11.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 30c861e928..91812e897e 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.11.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From e65fcfc792d5b60823ca3cc2c6ee5711c2e4b98a Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 4 Aug 2016 13:44:41 +0000
Subject: [PATCH 0610/1304] version: bump to v1.12.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 515333dc8b..bb93e8ea56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.12.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.12.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 3975727b38..9c4654a027 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -28,7 +28,7 @@ trap acbuildEnd EXIT
 
 acbuild --debug set-name appc.io/rkt-"${1}"-stresser
 
-acbuild --debug copy build-rkt-1.12.0/target/bin/"${1}"-stresser /worker
+acbuild --debug copy build-rkt-1.12.0+git/target/bin/"${1}"-stresser /worker
 
 acbuild --debug set-exec -- /worker
 

From 414b03cf1fe62ddf9f25a4bc8a6b48c7da2a9e42 Mon Sep 17 00:00:00 2001
From: Tim Dettrick <t.dettrick@uq.edu.au>
Date: Thu, 4 Aug 2016 16:05:04 +1000
Subject: [PATCH 0611/1304] export: name flag for exporting multi-app pods

Previously only single-app pods could export apps. For multi-app pods,
an app name can now be specified, in a similar manner to `rkt enter`.
---
 rkt/export.go | 63 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/rkt/export.go b/rkt/export.go
index 3750cf9465..bc60ef4ba4 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -40,17 +40,17 @@ import (
 
 var (
 	cmdExport = &cobra.Command{
-		Use:   "export UUID OUTPUT_ACI_FILE",
-		Short: "Export an exited pod to an ACI file",
-		Long: `UUID should be the uuid of an exited pod.
-
-Note that currently only pods with a single app can be exported.`,
-		Run: runWrapper(runExport),
+		Use:   "export [--app=APPNAME] UUID OUTPUT_ACI_FILE",
+		Short: "Export an app from an exited pod to an ACI file",
+		Long:  `UUID should be the uuid of an exited pod.`,
+		Run:   runWrapper(runExport),
 	}
+	flagExportAppName string
 )
 
 func init() {
 	cmdRkt.AddCommand(cmdExport)
+	cmdExport.Flags().StringVar(&flagExportAppName, "app", "", "name of the app to export within the specified pod")
 	cmdExport.Flags().BoolVar(&flagOverwriteACI, "overwrite", false, "overwrite output ACI")
 }
 
@@ -110,17 +110,11 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	apps, err := p.getApps()
+	app, err := getApp(p)
 	if err != nil {
-		stderr.PrintE("problem getting the pod's app list", err)
-		return 1
-	}
-
-	if len(apps) != 1 {
-		stderr.Printf("pod has %d apps. Only pods with one app can be exported", len(apps))
+		stderr.PrintE("unable to find app", err)
 		return 1
 	}
-	app := apps[0]
 
 	root := common.AppPath(p.path(), app.Name)
 	manifestPath := filepath.Join(common.AppInfoPath(p.path(), app.Name), aci.ManifestFile)
@@ -147,7 +141,7 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 			return 1
 		}
 
-		if err := mountOverlay(p, &app, mntDir); err != nil {
+		if err := mountOverlay(p, app, mntDir); err != nil {
 			stderr.PrintE(fmt.Sprintf("couldn't mount directory at %s", mntDir), err)
 			return 1
 		}
@@ -190,6 +184,45 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 	return 0
 }
 
+// getApp returns the app to export
+// If one was supplied in the flags then it's returned if present
+// If the PM contains a single app, that app is returned
+// If the PM has multiple apps, the names are printed and an error is returned
+func getApp(p *pod) (*schema.RuntimeApp, error) {
+	apps, err := p.getApps()
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("problem getting the pod's app list"), err)
+	}
+
+	if flagExportAppName != "" {
+		exportAppName, err := types.NewACName(flagExportAppName)
+		if err != nil {
+			return nil, err
+		}
+		for _, ra := range apps {
+			if *exportAppName == ra.Name {
+				return &ra, nil
+			}
+		}
+		return nil, fmt.Errorf("app %s is not present in pod", flagExportAppName)
+	}
+
+	switch len(apps) {
+	case 0:
+		return nil, fmt.Errorf("pod contains zero apps")
+	case 1:
+		return &apps[0], nil
+	default:
+	}
+
+	stderr.Print("pod contains multiple apps:")
+	for _, ra := range apps {
+		stderr.Printf("\t%v", ra.Name)
+	}
+
+	return nil, fmt.Errorf("specify app using \"rkt export --app= ...\"")
+}
+
 // mountOverlay mounts the app from the overlay-rendered pod to the destination directory.
 func mountOverlay(pod *pod, app *schema.RuntimeApp, dest string) error {
 	if _, err := os.Stat(dest); err != nil {

From f05a99652aee56451a0617fcdc14b2f3f7061dfc Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 22 Jul 2016 14:38:35 +0200
Subject: [PATCH 0612/1304] stage1 ABI: add parameters to disable security
 options

---
 Documentation/devel/stage1-implementors-guide.md | 8 +++++++-
 stage1/aci/aci-manifest.in                       | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 0422f87c57..a1d6344a23 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -68,6 +68,12 @@ Stage1 implementors have two options for doing so; only one must be implemented:
 
 * `--hostname=$HOSTNAME` configures the host name of the pod. If empty, it will be "rkt-$PODUUID".
 
+#### Arguments added in interface version 3
+
+* `--disable-capabilities-restriction` gives all capabilities to apps (overrides `retain-set` and `remove-set`)
+* `--disable-paths` disables inaccessible and read-only paths (such as `/proc/sysrq-trigger`)
+* `--disable-seccomp` disables seccomp (overrides `retain-set` and `remove-set`)
+
 ### rkt enter
 
 `coreos.com/rkt/stage1/enter`
@@ -120,7 +126,7 @@ In the bundled rkt stage 1, the entrypoint is sending SIGTERM signal to systemd-
 The stage1 command line interface is versioned using an annotation with the name `coreos.com/rkt/stage1/interface-version`.
 If the annotation is not present, rkt assumes the version is 1.
 
-The current version of the stage1 interface is 2.
+The current version of the stage1 interface is 3.
 
 ## Examples
 
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index bed71e9b85..c704469b65 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -35,7 +35,7 @@
         },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
-            "value": "2"
+            "value": "3"
         }
     ]
 }

From 13fa4bf12a46ee187550798e8e8e29ce0040189a Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 26 Jul 2016 13:20:11 +0200
Subject: [PATCH 0613/1304] stage1: implement
 --disable-{paths,seccomp,capabilities}

---
 stage1/init/common/pod.go      | 43 ++++++++++++++++++++++++----------
 stage1/init/common/pod_test.go |  3 ++-
 stage1/init/init.go            | 43 ++++++++++++++++++++++------------
 3 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index af2b312b76..81fa1068f9 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -59,6 +59,12 @@ var (
 	}
 )
 
+type Stage1InsecureOptions struct {
+	DisablePaths        bool
+	DisableCapabilities bool
+	DisableSeccomp      bool
+}
+
 // execEscape uses Golang's string quoting for ", \, \n, and regex for special cases
 func execEscape(i int, str string) string {
 	escapeMap := map[string]string{
@@ -367,7 +373,7 @@ func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App,
 }
 
 // appToSystemd transforms the provided RuntimeApp+ImageManifest into systemd units
-func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive bool, flavor string, privateUsers string) error {
+func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive bool, flavor string, privateUsers string, insecureOptions Stage1InsecureOptions) error {
 	app := ra.App
 	appName := ra.Name
 	imgName := p.AppNameToImageName(appName)
@@ -440,7 +446,6 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "User", strconv.Itoa(u)),
 		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
 		unit.NewUnitOption("Service", "SupplementaryGroups", strings.Join(supplementaryGroups, " ")),
-		unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")),
 		// This helps working around a race
 		// (https://github.com/systemd/systemd/issues/2913) that causes the
 		// systemd unit name not getting written to the journal if the unit is
@@ -448,8 +453,14 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
 	}
 
+	if !insecureOptions.DisableCapabilities {
+		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
+	}
+
 	// Restrict access to sensitive paths (eg. procfs)
-	opts = protectSystemFiles(opts, appName)
+	if !insecureOptions.DisablePaths {
+		opts = protectSystemFiles(opts, appName)
+	}
 
 	// Apply seccomp isolator, if any and not opt-ing out;
 	// see https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
@@ -751,10 +762,10 @@ func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types
 
 // PodToSystemd creates the appropriate systemd service unit files for
 // all the constituent apps of the Pod
-func PodToSystemd(p *stage1commontypes.Pod, interactive bool, flavor string, privateUsers string) error {
+func PodToSystemd(p *stage1commontypes.Pod, interactive bool, flavor string, privateUsers string, insecureOptions Stage1InsecureOptions) error {
 	for i := range p.Manifest.Apps {
 		ra := &p.Manifest.Apps[i]
-		if err := appToSystemd(p, ra, interactive, flavor, privateUsers); err != nil {
+		if err := appToSystemd(p, ra, interactive, flavor, privateUsers, insecureOptions); err != nil {
 			return errwrap.Wrap(fmt.Errorf("failed to transform app %q into systemd service", ra.Name), err)
 		}
 	}
@@ -815,7 +826,7 @@ func EvaluateSymlinksInsideApp(appRootfs, path string) (string, error) {
 
 // appToNspawnArgs transforms the given app manifest, with the given associated
 // app name, into a subset of applicable systemd-nspawn argument
-func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string, error) {
+func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp, insecureOptions Stage1InsecureOptions) ([]string, error) {
 	var args []string
 	appName := ra.Name
 	app := ra.App
@@ -881,19 +892,21 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 		args = append(args, strings.Join(opt, ""))
 	}
 
-	capabilitiesStr, err := getAppCapabilities(app.Isolators)
-	if err != nil {
-		return nil, err
+	if !insecureOptions.DisableCapabilities {
+		capabilitiesStr, err := getAppCapabilities(app.Isolators)
+		if err != nil {
+			return nil, err
+		}
+		capList := strings.Join(capabilitiesStr, ",")
+		args = append(args, "--capability="+capList)
 	}
-	capList := strings.Join(capabilitiesStr, ",")
-	args = append(args, "--capability="+capList)
 
 	return args, nil
 }
 
 // PodToNspawnArgs renders a prepared Pod as a systemd-nspawn
 // argument list ready to be executed
-func PodToNspawnArgs(p *stage1commontypes.Pod) ([]string, error) {
+func PodToNspawnArgs(p *stage1commontypes.Pod, insecureOptions Stage1InsecureOptions) ([]string, error) {
 	args := []string{
 		"--uuid=" + p.UUID.String(),
 		"--machine=" + GetMachineID(p),
@@ -901,13 +914,17 @@ func PodToNspawnArgs(p *stage1commontypes.Pod) ([]string, error) {
 	}
 
 	for i := range p.Manifest.Apps {
-		aa, err := appToNspawnArgs(p, &p.Manifest.Apps[i])
+		aa, err := appToNspawnArgs(p, &p.Manifest.Apps[i], insecureOptions)
 		if err != nil {
 			return nil, err
 		}
 		args = append(args, aa...)
 	}
 
+	if insecureOptions.DisableCapabilities {
+		args = append(args, "--capability=all")
+	}
+
 	return args, nil
 }
 
diff --git a/stage1/init/common/pod_test.go b/stage1/init/common/pod_test.go
index 87186a0a0d..142fbbe3e1 100644
--- a/stage1/init/common/pod_test.go
+++ b/stage1/init/common/pod_test.go
@@ -153,7 +153,8 @@ func TestAppToNspawnArgsOverridesImageManifestReadOnly(t *testing.T) {
 		defer os.RemoveAll(tmpDir)
 
 		p := &stage1commontypes.Pod{Manifest: podManifest, Root: tmpDir}
-		output, err := appToNspawnArgs(p, appManifest)
+		insecureOptions := Stage1InsecureOptions{}
+		output, err := appToNspawnArgs(p, appManifest, insecureOptions)
 		if err != nil {
 			t.Errorf("#%d: unexpected error: `%v`", i, err)
 		}
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 065959ce70..e3f859e651 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -95,17 +95,20 @@ func mirrorLocalZoneInfo(root string) {
 }
 
 var (
-	debug        bool
-	netList      common.NetList
-	interactive  bool
-	privateUsers string
-	mdsToken     string
-	localhostIP  net.IP
-	localConfig  string
-	hostname     string
-	log          *rktlog.Logger
-	diag         *rktlog.Logger
-	interpBin    string // Path to the interpreter within the stage1 rootfs, set by the linker
+	debug               bool
+	netList             common.NetList
+	interactive         bool
+	privateUsers        string
+	mdsToken            string
+	localhostIP         net.IP
+	localConfig         string
+	hostname            string
+	log                 *rktlog.Logger
+	diag                *rktlog.Logger
+	interpBin           string // Path to the interpreter within the stage1 rootfs, set by the linker
+	disableCapabilities bool
+	disablePaths        bool
+	disableSeccomp      bool
 )
 
 func init() {
@@ -116,6 +119,10 @@ func init() {
 	flag.StringVar(&mdsToken, "mds-token", "", "MDS auth token")
 	flag.StringVar(&localConfig, "local-config", common.DefaultLocalConfigDir, "Local config path")
 	flag.StringVar(&hostname, "hostname", "", "Hostname of the pod")
+	flag.BoolVar(&disableCapabilities, "disable-capabilities-restriction", false, "Disable capability restrictions")
+	flag.BoolVar(&disablePaths, "disable-paths", false, "Disable paths restrictions")
+	flag.BoolVar(&disableSeccomp, "disable-seccomp", false, "Disable seccomp restrictions")
+
 	// this ensures that main runs only on main thread (thread group leader).
 	// since namespace ops (unshare, setns) are done for a single thread, we
 	// must ensure that the goroutine does not jump from OS thread to thread
@@ -209,7 +216,7 @@ func installAssets() error {
 }
 
 // getArgsEnv returns the nspawn or lkvm args and env according to the flavor used
-func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networking.Networking) ([]string, []string, error) {
+func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networking.Networking, insecureOptions stage1initcommon.Stage1InsecureOptions) ([]string, []string, error) {
 	var args []string
 	env := os.Environ()
 
@@ -411,7 +418,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 		args = append(args, "--private-users="+privateUsers)
 	}
 
-	nsargs, err := stage1initcommon.PodToNspawnArgs(p)
+	nsargs, err := stage1initcommon.PodToNspawnArgs(p, insecureOptions)
 	if err != nil {
 		return nil, nil, errwrap.Wrap(errors.New("failed to generate nspawn args"), err)
 	}
@@ -563,12 +570,18 @@ func stage1() int {
 		}
 	}
 
-	if err = stage1initcommon.PodToSystemd(p, interactive, flavor, privateUsers); err != nil {
+	insecureOptions := stage1initcommon.Stage1InsecureOptions{
+		DisablePaths:        disablePaths,
+		DisableCapabilities: disableCapabilities,
+		DisableSeccomp:      disableSeccomp,
+	}
+
+	if err = stage1initcommon.PodToSystemd(p, interactive, flavor, privateUsers, insecureOptions); err != nil {
 		log.PrintE("failed to configure systemd", err)
 		return 1
 	}
 
-	args, env, err := getArgsEnv(p, flavor, debug, n)
+	args, env, err := getArgsEnv(p, flavor, debug, n, insecureOptions)
 	if err != nil {
 		log.Error(err)
 		return 1

From 8768846efe90c7580e833c90ddcdee7acbdb2f6d Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 26 Jul 2016 17:32:55 +0200
Subject: [PATCH 0614/1304] rkt: implements
 --insecure-options={capabilities,paths}

This does not add --insecure-options=seccomp: do not expose it to the
user since seccomp support is not there yet.
---
 rkt/flag/secflags.go | 46 +++++++++++++++++++++++++++++++++++---------
 rkt/run.go           | 24 ++++++++++++-----------
 stage0/interface.go  |  4 ++++
 stage0/run.go        | 33 ++++++++++++++++++++-----------
 4 files changed, 76 insertions(+), 31 deletions(-)

diff --git a/rkt/flag/secflags.go b/rkt/flag/secflags.go
index a0f21dff9b..8a5686ac3e 100644
--- a/rkt/flag/secflags.go
+++ b/rkt/flag/secflags.go
@@ -23,21 +23,41 @@ const (
 	insecureOnDisk
 	insecureHTTP
 	insecurePubKey
+	insecureCapabilities
+	insecurePaths
 
-	insecureAll = (insecureImage | insecureTLS | insecureOnDisk | insecureHTTP | insecurePubKey)
+	insecureAllFetch = (insecureImage | insecureTLS | insecureHTTP | insecurePubKey)
+	insecureAllRun   = (insecureOnDisk | insecureCapabilities | insecurePaths)
+	insecureAll      = (insecureAllFetch | insecureAllRun)
 )
 
 var (
-	insecureOptions = []string{"none", "image", "tls", "ondisk", "http", "pubkey", "all"}
+	insecureOptions = []string{
+		"none",
+		"image",
+		"tls",
+		"ondisk",
+		"http",
+		"pubkey",
+		"capabilities",
+		"paths",
+		"all-fetch",
+		"all-run",
+		"all",
+	}
 
 	insecureOptionsMap = map[string]int{
-		insecureOptions[0]: insecureNone,
-		insecureOptions[1]: insecureImage,
-		insecureOptions[2]: insecureTLS,
-		insecureOptions[3]: insecureOnDisk,
-		insecureOptions[4]: insecureHTTP,
-		insecureOptions[5]: insecurePubKey,
-		insecureOptions[6]: insecureAll,
+		insecureOptions[0]:  insecureNone,
+		insecureOptions[1]:  insecureImage,
+		insecureOptions[2]:  insecureTLS,
+		insecureOptions[3]:  insecureOnDisk,
+		insecureOptions[4]:  insecureHTTP,
+		insecureOptions[5]:  insecurePubKey,
+		insecureOptions[6]:  insecureCapabilities,
+		insecureOptions[7]:  insecurePaths,
+		insecureOptions[8]:  insecureAllFetch,
+		insecureOptions[9]:  insecureAllRun,
+		insecureOptions[10]: insecureAll,
 	}
 )
 
@@ -85,6 +105,14 @@ func (sf *SecFlags) ConsiderInsecurePubKeys() bool {
 	return sf.hasFlag(insecurePubKey)
 }
 
+func (sf *SecFlags) SkipCapabilities() bool {
+	return sf.hasFlag(insecureCapabilities)
+}
+
+func (sf *SecFlags) SkipPaths() bool {
+	return sf.hasFlag(insecurePaths)
+}
+
 func (sf *SecFlags) SkipAllSecurityChecks() bool {
 	return sf.hasFlag(insecureAll)
 }
diff --git a/rkt/run.go b/rkt/run.go
index 4365f8dada..62771c1279 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -311,17 +311,19 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	rcfg := stage0.RunConfig{
-		CommonConfig: &cfg,
-		Net:          flagNet,
-		LockFd:       lfd,
-		Interactive:  flagInteractive,
-		DNS:          flagDNS,
-		DNSSearch:    flagDNSSearch,
-		DNSOpt:       flagDNSOpt,
-		MDSRegister:  flagMDSRegister,
-		LocalConfig:  globalFlags.LocalConfigDir,
-		RktGid:       rktgid,
-		Hostname:     flagHostname,
+		CommonConfig:         &cfg,
+		Net:                  flagNet,
+		LockFd:               lfd,
+		Interactive:          flagInteractive,
+		DNS:                  flagDNS,
+		DNSSearch:            flagDNSSearch,
+		DNSOpt:               flagDNSOpt,
+		MDSRegister:          flagMDSRegister,
+		LocalConfig:          globalFlags.LocalConfigDir,
+		RktGid:               rktgid,
+		Hostname:             flagHostname,
+		InsecureCapabilities: globalFlags.InsecureFlags.SkipCapabilities(),
+		InsecurePaths:        globalFlags.InsecureFlags.SkipPaths(),
 	}
 
 	apps, err := p.getApps()
diff --git a/stage0/interface.go b/stage0/interface.go
index e09eba2f7d..08e26edb16 100644
--- a/stage0/interface.go
+++ b/stage0/interface.go
@@ -59,3 +59,7 @@ func getStage1InterfaceVersion(cdir string) (int, error) {
 func interfaceVersionSupportsHostname(version int) bool {
 	return version > 1
 }
+
+func interfaceVersionSupportsInsecureOptions(version int) bool {
+	return version > 2
+}
diff --git a/stage0/run.go b/stage0/run.go
index 17d9eeadf1..b819f2c580 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -74,17 +74,19 @@ type PrepareConfig struct {
 // configuration parameters needed by Run
 type RunConfig struct {
 	*CommonConfig
-	Net         common.NetList // pod should have its own network stack
-	LockFd      int            // lock file descriptor
-	Interactive bool           // whether the pod is interactive or not
-	MDSRegister bool           // whether to register with metadata service or not
-	Apps        schema.AppList // applications (prepare gets them via Apps)
-	LocalConfig string         // Path to local configuration
-	Hostname    string         // hostname of the pod
-	RktGid      int            // group id of the 'rkt' group, -1 if there's no rkt group.
-	DNS         []string       // DNS name servers to write in /etc/resolv.conf
-	DNSSearch   []string       // DNS search domains to write in /etc/resolv.conf
-	DNSOpt      []string       // DNS options to write in /etc/resolv.conf
+	Net                  common.NetList // pod should have its own network stack
+	LockFd               int            // lock file descriptor
+	Interactive          bool           // whether the pod is interactive or not
+	MDSRegister          bool           // whether to register with metadata service or not
+	Apps                 schema.AppList // applications (prepare gets them via Apps)
+	LocalConfig          string         // Path to local configuration
+	Hostname             string         // hostname of the pod
+	RktGid               int            // group id of the 'rkt' group, -1 if there's no rkt group.
+	DNS                  []string       // DNS name servers to write in /etc/resolv.conf
+	DNSSearch            []string       // DNS search domains to write in /etc/resolv.conf
+	DNSOpt               []string       // DNS options to write in /etc/resolv.conf
+	InsecureCapabilities bool           // Do not restrict capabilities
+	InsecurePaths        bool           // Do not restrict access to files in sysfs or procfs
 }
 
 // configuration shared by both Run and Prepare
@@ -572,6 +574,15 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 		}
 	}
 
+	if interfaceVersionSupportsInsecureOptions(s1v) {
+		if cfg.InsecureCapabilities {
+			args = append(args, "--disable-capabilities-restriction")
+		}
+		if cfg.InsecurePaths {
+			args = append(args, "--disable-paths")
+		}
+	}
+
 	args = append(args, cfg.UUID.String())
 
 	// make sure the lock fd stays open across exec

From 63d45a8b3d03116e41db282f8bf8a745737c28fa Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 28 Jul 2016 14:31:57 +0200
Subject: [PATCH 0615/1304] tests: new test for --insecure-options=paths

This test checks that a container cannot write to /proc/sysrq-trigger,
unless --insecure-options=paths is given.
---
 tests/rkt_paths_test.go | 65 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 tests/rkt_paths_test.go

diff --git a/tests/rkt_paths_test.go b/tests/rkt_paths_test.go
new file mode 100644
index 0000000000..2dcf9b2f43
--- /dev/null
+++ b/tests/rkt_paths_test.go
@@ -0,0 +1,65 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+// TestPaths checks whether access to paths like /proc/sysrq-trigger are
+// restricted
+func TestPaths(t *testing.T) {
+	imageFile := patchTestACI("rkt-inspect-paths.aci",
+		"--exec=/inspect --write-file --print-msg=testing-insecure-option")
+	defer os.Remove(imageFile)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	tests := []struct {
+		Path    string
+		Content string
+	}{
+		{
+			Path:    "/proc/sysrq-trigger",
+			Content: "h", // Print help message in dmesg: not dangerous
+		},
+	}
+
+	for _, tt := range tests {
+		// Without --insecure-options=paths
+		for _, insecureOption := range []string{"image", "image,ondisk,capabilities", "all-fetch"} {
+			cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run --set-env=FILE=%s --set-env=CONTENT=%s %s`,
+				ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
+			t.Logf("Attempting to write on %q with --insecure-options=%s (expecting error)\n", tt.Path, insecureOption)
+			expect := fmt.Sprintf("open %s: read-only file system", tt.Path)
+			runRktAndCheckOutput(t, cmd, expect, true)
+		}
+
+		// With --insecure-options=paths
+		for _, insecureOption := range []string{"image,paths", "image,paths,ondisk,capabilities", "image,all-run", "all"} {
+			cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run --set-env=FILE=%s --set-env=CONTENT=%s %s`,
+				ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
+			t.Logf("Attempting to write on %q with --insecure-options=%s (expecting success)\n", tt.Path, insecureOption)
+			runRktAndCheckOutput(t, cmd, "testing-insecure-option", false)
+		}
+	}
+}

From 445b2ea25c5c0454dbb91c06c74dbb29d315882a Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 28 Jul 2016 17:09:54 +0200
Subject: [PATCH 0616/1304] tests: new test for --insecure-options=capabilities

This test will run on all flavors except fly.
---
 tests/rkt_caps_test.go | 88 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index 5bdd56ef00..be6ef348f7 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -500,6 +500,94 @@ func TestCapsOverride(t *testing.T) {
 	}
 }
 
+// Tests that --insecure-options=capabilities allows everything
+func TestCapsInsecureOption(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	imageFile := patchTestACI("insecure-options-caps.aci", "--exec=/inspect --print-caps-pid=0")
+	defer os.Remove(imageFile)
+
+	defaultCaps := strings.Join([]string{
+		"chown",
+		"dac_override",
+		"fowner",
+		"fsetid",
+		"kill",
+		"setgid",
+		"setuid",
+		"setpcap",
+		"net_bind_service",
+		"net_raw",
+		"sys_chroot",
+		"mknod",
+		"audit_write",
+		"setfcap",
+	}, ", ")
+
+	// All capabilities defined in Linux, in the same order as their definition:
+	// https://github.com/torvalds/linux/blob/v4.7/include/uapi/linux/capability.h#L90
+	allCaps := strings.Join([]string{
+		"chown",
+		"dac_override",
+		"dac_read_search",
+		"fowner",
+		"fsetid",
+		"kill",
+		"setgid",
+		"setuid",
+		"setpcap",
+		"linux_immutable",
+		"net_bind_service",
+		"net_broadcast",
+		"net_admin",
+		"net_raw",
+		"ipc_lock",
+		"ipc_owner",
+		"sys_module",
+		"sys_rawio",
+		"sys_chroot",
+		"sys_ptrace",
+		"sys_psacct",
+		"sys_admin",
+		"sys_boot",
+		"sys_nice",
+		"sys_resource",
+		"sys_time",
+		"sys_tty_config",
+		"mknod",
+		"lease",
+		"audit_write",
+		"audit_control",
+		"setfcap",
+		"mac_override",
+		"mac_admin",
+		"syslog",
+		"wake_alarm",
+		"block_suspend",
+		// do not check "audit_read" to support tests in older kernels
+		// "audit_read", // since Linux 3.16
+	}, ", ")
+
+	// Without --insecure-options=capabilities
+	for _, insecureOption := range []string{"image", "image,ondisk,paths", "all-fetch"} {
+		cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run %s`,
+			ctx.Cmd(), insecureOption, imageFile)
+		t.Logf("Check caps with --insecure-options=%s\n", insecureOption)
+		expected := fmt.Sprintf("Capability set: bounding: %s", defaultCaps)
+		runRktAndCheckOutput(t, cmd, expected, false)
+	}
+
+	// With --insecure-options=capabilities
+	for _, insecureOption := range []string{"image,capabilities", "image,ondisk,paths,capabilities", "all-fetch,capabilities", "all"} {
+		cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run %s`,
+			ctx.Cmd(), insecureOption, imageFile)
+		t.Logf("Check caps with --insecure-options=%s\n", insecureOption)
+		expected := fmt.Sprintf("Capability set: bounding: %s", allCaps)
+		runRktAndCheckOutput(t, cmd, expected, false)
+	}
+}
+
 var capsTests = []struct {
 	testName            string
 	capIsolator         string

From e266abda37ff14dc46247489451a0a9eb52d9d00 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 5 Aug 2016 11:14:12 +0200
Subject: [PATCH 0617/1304] rkt: implements --insecure-options=seccomp

---
 rkt/flag/secflags.go      | 15 +++++++++++----
 rkt/run.go                |  1 +
 stage0/run.go             |  4 ++++
 stage1/init/common/pod.go | 25 ++++++++++++++++---------
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/rkt/flag/secflags.go b/rkt/flag/secflags.go
index 8a5686ac3e..3807682788 100644
--- a/rkt/flag/secflags.go
+++ b/rkt/flag/secflags.go
@@ -25,9 +25,10 @@ const (
 	insecurePubKey
 	insecureCapabilities
 	insecurePaths
+	insecureSeccomp
 
 	insecureAllFetch = (insecureImage | insecureTLS | insecureHTTP | insecurePubKey)
-	insecureAllRun   = (insecureOnDisk | insecureCapabilities | insecurePaths)
+	insecureAllRun   = (insecureOnDisk | insecureCapabilities | insecurePaths | insecureSeccomp)
 	insecureAll      = (insecureAllFetch | insecureAllRun)
 )
 
@@ -41,6 +42,7 @@ var (
 		"pubkey",
 		"capabilities",
 		"paths",
+		"seccomp",
 		"all-fetch",
 		"all-run",
 		"all",
@@ -55,9 +57,10 @@ var (
 		insecureOptions[5]:  insecurePubKey,
 		insecureOptions[6]:  insecureCapabilities,
 		insecureOptions[7]:  insecurePaths,
-		insecureOptions[8]:  insecureAllFetch,
-		insecureOptions[9]:  insecureAllRun,
-		insecureOptions[10]: insecureAll,
+		insecureOptions[8]:  insecureSeccomp,
+		insecureOptions[9]:  insecureAllFetch,
+		insecureOptions[10]: insecureAllRun,
+		insecureOptions[11]: insecureAll,
 	}
 )
 
@@ -113,6 +116,10 @@ func (sf *SecFlags) SkipPaths() bool {
 	return sf.hasFlag(insecurePaths)
 }
 
+func (sf *SecFlags) SkipSeccomp() bool {
+	return sf.hasFlag(insecureSeccomp)
+}
+
 func (sf *SecFlags) SkipAllSecurityChecks() bool {
 	return sf.hasFlag(insecureAll)
 }
diff --git a/rkt/run.go b/rkt/run.go
index 62771c1279..d93fd067f1 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -324,6 +324,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		Hostname:             flagHostname,
 		InsecureCapabilities: globalFlags.InsecureFlags.SkipCapabilities(),
 		InsecurePaths:        globalFlags.InsecureFlags.SkipPaths(),
+		InsecureSeccomp:      globalFlags.InsecureFlags.SkipSeccomp(),
 	}
 
 	apps, err := p.getApps()
diff --git a/stage0/run.go b/stage0/run.go
index b819f2c580..d6ee323bb8 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -87,6 +87,7 @@ type RunConfig struct {
 	DNSOpt               []string       // DNS options to write in /etc/resolv.conf
 	InsecureCapabilities bool           // Do not restrict capabilities
 	InsecurePaths        bool           // Do not restrict access to files in sysfs or procfs
+	InsecureSeccomp      bool           // Do not add seccomp restrictions
 }
 
 // configuration shared by both Run and Prepare
@@ -581,6 +582,9 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 		if cfg.InsecurePaths {
 			args = append(args, "--disable-paths")
 		}
+		if cfg.InsecureSeccomp {
+			args = append(args, "--disable-seccomp")
+		}
 	}
 
 	args = append(args, cfg.UUID.String())
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 81fa1068f9..67a6c3eb5a 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -462,19 +462,26 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		opts = protectSystemFiles(opts, appName)
 	}
 
+	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
+
 	// Apply seccomp isolator, if any and not opt-ing out;
 	// see https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
-	unprivileged := (u != 0)
-	opts, noNewPrivileges, err := getSeccompFilter(opts, p, unprivileged, app.Isolators)
-	if err != nil {
-		return err
-	}
+	if !insecureOptions.DisableSeccomp {
+		var forceNoNewPrivileges bool
+
+		unprivileged := (u != 0)
+		opts, forceNoNewPrivileges, err = getSeccompFilter(opts, p, unprivileged, app.Isolators)
+		if err != nil {
+			return err
+		}
 
-	// Seccomp filters require NoNewPrivileges for unprivileged apps, that may override
-	// manifest annotation.
-	if !noNewPrivileges {
-		noNewPrivileges = getAppNoNewPrivileges(app.Isolators)
+		// Seccomp filters require NoNewPrivileges for unprivileged apps, that may override
+		// manifest annotation.
+		if forceNoNewPrivileges {
+			noNewPrivileges = true
+		}
 	}
+
 	opts = append(opts, unit.NewUnitOption("Service", "NoNewPrivileges", strconv.FormatBool(noNewPrivileges)))
 
 	if ra.ReadOnlyRootFS {

From 5dc23c18d38c6e3d0d1b043620aa20e4dfe62281 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 5 Aug 2016 11:44:42 +0200
Subject: [PATCH 0618/1304] tests: update TestAppIsolatorSeccomp for
 --insecure-options=seccomp

---
 tests/rkt_seccomp_test.go | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/rkt_seccomp_test.go b/tests/rkt_seccomp_test.go
index 48bba68dc2..1458ccdf1f 100644
--- a/tests/rkt_seccomp_test.go
+++ b/tests/rkt_seccomp_test.go
@@ -120,6 +120,27 @@ var seccompTestCases = []struct {
 		"exchange full",
 		true,
 	},
+	{
+		`insecure-options fake override: remove-set blacklist stat with custom error`,
+		[]string{baseApp, "--seccomp-mode=remove,errno=EMULTIHOP", "--seccomp-set=stat"},
+		[]string{"--insecure-options=image,ondisk,capabilities,paths"},
+		"multihop attempted",
+		true,
+	},
+	{
+		`insecure-options simple override: remove-set blacklist stat with custom error`,
+		[]string{baseApp, "--seccomp-mode=remove,errno=EMULTIHOP", "--seccomp-set=stat"},
+		[]string{"--insecure-options=image,seccomp"},
+		`/: mode: d`,
+		false,
+	},
+	{
+		`insecure-options complete override: remove-set blacklist stat with custom error`,
+		[]string{baseApp, "--seccomp-mode=remove,errno=EMULTIHOP", "--seccomp-set=stat"},
+		[]string{"--insecure-options=image,all-run"},
+		`/: mode: d`,
+		false,
+	},
 }
 
 func TestAppIsolatorSeccomp(t *testing.T) {

From 5487def3183516d91a82c9639ed6499703aa16c7 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 5 Aug 2016 17:00:54 +0200
Subject: [PATCH 0619/1304] tests: move TestProcFSRestrictions with TestPaths

- remove duplicate test on sysrq-trigger
- rename the two tests
- they are not merged in one test: I kept the split between one doing
  the "stat" test and the other doing the "write" test.
---
 tests/rkt_mount_test.go | 32 --------------------------------
 tests/rkt_paths_test.go | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index d93c72ed9a..a1f3585540 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -102,35 +102,3 @@ func TestMountSymlink(t *testing.T) {
 		}
 	}
 }
-
-// TestProcFSRestrictions checks that access to sensitive paths under
-// /proc and /sys is correctly restricted:
-// https://github.com/coreos/rkt/issues/2484
-func TestProcFSRestrictions(t *testing.T) {
-	// check access to read-only paths
-	roEntry := "/proc/sysrq-trigger"
-	testContent := "h"
-	roImage := patchTestACI("rkt-inspect-write-procfs.aci", fmt.Sprintf("--exec=/inspect --write-file --file-name %s --content %s", roEntry, testContent))
-	defer os.Remove(roImage)
-
-	roCtx := testutils.NewRktRunCtx()
-	defer roCtx.Cleanup()
-
-	roCmd := fmt.Sprintf("%s --insecure-options=image run %s", roCtx.Cmd(), roImage)
-
-	roExpectedLine := fmt.Sprintf("Cannot write to file \"%s\"", roEntry)
-	runRktAndCheckOutput(t, roCmd, roExpectedLine, true)
-
-	// check access to inaccessible paths
-	hiddenEntry := "/sys/firmware/"
-	hiddenImage := patchTestACI("rkt-inspect-stat-procfs.aci", fmt.Sprintf("--exec=/inspect --stat-file --file-name %s", hiddenEntry))
-	defer os.Remove(hiddenImage)
-
-	hiddenCtx := testutils.NewRktRunCtx()
-	defer hiddenCtx.Cleanup()
-
-	hiddenCmd := fmt.Sprintf("%s --insecure-options=image run %s", hiddenCtx.Cmd(), hiddenImage)
-
-	hiddenExpectedLine := fmt.Sprintf("%s: mode: d---------", hiddenEntry)
-	runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
-}
diff --git a/tests/rkt_paths_test.go b/tests/rkt_paths_test.go
index 2dcf9b2f43..949a24fde3 100644
--- a/tests/rkt_paths_test.go
+++ b/tests/rkt_paths_test.go
@@ -24,9 +24,9 @@ import (
 	"github.com/coreos/rkt/tests/testutils"
 )
 
-// TestPaths checks whether access to paths like /proc/sysrq-trigger are
+// TestPathsWrite checks whether access to paths like /proc/sysrq-trigger are
 // restricted
-func TestPaths(t *testing.T) {
+func TestPathsWrite(t *testing.T) {
 	imageFile := patchTestACI("rkt-inspect-paths.aci",
 		"--exec=/inspect --write-file --print-msg=testing-insecure-option")
 	defer os.Remove(imageFile)
@@ -63,3 +63,20 @@ func TestPaths(t *testing.T) {
 		}
 	}
 }
+
+// TestPathsStat checks that access to inaccessible paths under
+// /proc or /sys is correctly restricted:
+// https://github.com/coreos/rkt/issues/2484
+func TestPathsStat(t *testing.T) {
+	hiddenEntry := "/sys/firmware/"
+	hiddenImage := patchTestACI("rkt-inspect-stat-procfs.aci", fmt.Sprintf("--exec=/inspect --stat-file --file-name %s", hiddenEntry))
+	defer os.Remove(hiddenImage)
+
+	hiddenCtx := testutils.NewRktRunCtx()
+	defer hiddenCtx.Cleanup()
+
+	hiddenCmd := fmt.Sprintf("%s --insecure-options=image run %s", hiddenCtx.Cmd(), hiddenImage)
+
+	hiddenExpectedLine := fmt.Sprintf("%s: mode: d---------", hiddenEntry)
+	runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
+}

From 864f6614d49353c523bc3c0fe9ef2b51b21c107f Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Tue, 12 Jul 2016 10:20:04 +0200
Subject: [PATCH 0620/1304] Documentation: document image lifecycle and
 implementation.

Document the image lifecycle phases, their logic and explain the rkt implementations.
---
 Documentation/devel/architecture.md | 63 +++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index f6d11911d3..4509b2dead 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -102,3 +102,66 @@ This will activate all the reaper services when one of the targets is activated,
 ### Stage 2
 
 The final stage, stage2, is the actual environment in which the applications run, as launched by stage1.
+
+
+### Image lifecycle
+
+rkt commands like prepare and run, as a first step, need to retrieve all the images requested in the command line and prepare the stage2 directories with the application contents.
+
+This is done with the following chain:
+
+```
+ -----------            -----------            ------------
+|           |          |           |          |            |
+|   Fetch   |--------->|   Store   |--------->|   Render   |
+|           |          |           |          |            |
+ -----------            -----------            ------------
+
+```
+
+* Fetch: in the fetch phase rkt retrieves the requested images. The fetching implementation depends on the provided image argument such as an image string/hash/https URL/file (e.g. `example.com/app:v1.0`).
+* Store: in the store phase the fetched images are saved to the local store. The local store is a cache for fetched images and related data.
+* Render: in the render phase, a renderer pulls the required images from the store and renders them so they can be easily used as stage2 content.
+
+
+These three logical blocks are implemented inside rkt in this way:
+
+```
+ ------------            ---------------                -------------                    ------------------------
+|            |          |               |              |             |     overlayfs    |                        |
+|  Fetchers  |--------->|  Image Store  |<-------------|  TreeStore  |<-----------------|  Stage1-2 fs contents  |
+|            |          |               |<----         |             |           -------|                        |
+ ------------            ---------------      \         -------------           /        ------------------------
+                                               \                               /
+                                                \       -----------------     /
+                                                 \     |                 |   /
+                                                  -----| Direct stage1-2 |---
+                                                       |   renderer      |
+                                                       |                 |
+                                                        -----------------
+```
+
+Currently rkt implements the [appc][appc-spec] internally, converting to it from other container image formats for compatibility. In the future, additional formats like the [OCI image spec][oci-img-spec] may be added to rkt, keeping the same basic scheme for fetching, storing, and rendering application container images.
+
+* Fetchers: Fetchers retrieve images from either a provided URL, or a URL found by [image discovery][appc-discovery] on a given image string. Fetchers read data from the Image Store to check if an image is already present. Once fetched, images are verified with their signatures, then saved in the Image Store. An image's [dependencies][appc-dependencies] are also discovered and fetched. For details, see the [image fetching][rkt-image-fetching] documentation.
+* Image Store: the Image Store is used to store images (currently ACIs) and their related information.
+* The render phase can be done in different ways:
+ * Directly render the stage1-2 contents inside a pod. This will require more disk space and more stage1-2 preparation time.
+ * Render in the treestore. The treestore is a cache of rendered images (currently ACIs). When using the treestore, rkt mounts an overlayfs with the treestore rendered image as its lower directory.
+
+When using stage1-2 with overlayfs a pod will contain references to the required treestore rendered images. So there's an hard connection between pods and the treestore.
+
+*Aci Renderer*
+
+Both stage1-2 render modes internally uses the [aci renderer](https://github.com/appc/spec/tree/master/pkg/acirenderer).
+Since an ACI may depend on other ones the acirenderer may require other ACIs.
+The acirenderer only relies on the ACIStore, so all the required ACIs must already be available in the store.
+Additionally, since appc dependencies can be found only via discovery, a dependency may be updated and so there can be multiple rendered images for the same ACI.
+
+Given this 1:N relation between an ACI and their rendered images, the ACIStore and TreeStore are decoupled.
+
+[appc-spec]: https://github.com/appc/spec
+[appc-dependencies]: https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
+[appc-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md
+[oci-img-spec]: https://github.com/opencontainers/image-spec
+[rkt-image-fetching]: ../image-fetching-behavior.md

From 95edd1989ccc044aff85b4475447f62c68002a64 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 5 Aug 2016 17:28:19 +0200
Subject: [PATCH 0621/1304] documentations: new flags in --insecure-options

---
 Documentation/commands.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 70652c9da4..4cf4911969 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -76,7 +76,7 @@ In addition to the flags used by individual `rkt` commands, `rkt` has a set of g
 | `--cpuprofile (hidden flag)` | `` | A file path | Write CPU profile to the file |
 | `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
 | `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**pubkey**: Allow fetching pubkeys via insecure connections (via HTTP connections or from servers with unverified certificates). This slightly extends the meaning of the `--trust-keys-from-https` flag.<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
+| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**pubkey**: Allow fetching pubkeys via insecure connections (via HTTP connections or from servers with unverified certificates). This slightly extends the meaning of the `--trust-keys-from-https` flag.<br/>**capabilities**: Gives all capabilities to apps<br/>**paths**: Disables inaccessible and read-only paths<br/>**seccomp**: Disables seccomp<br/>**all-fetch**: Disables the following security checks: image, tls, http<br/>**all-run**: Disables the following security checks: ondisk, capabilities, paths, seccomp<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
 | `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
 | `--memprofile (hidden flag)` | `` | A file path | Write memory profile to the file |
 | `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |

From bfe063e628f16a6fb2dda0ab2b31ae7df95571cc Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 4 Aug 2016 09:47:52 +0000
Subject: [PATCH 0622/1304] docs: document seccomp usage

This commit introduces a walk-through guide for seccomp usage.
It is targeted to users, introducing them to Linux seccomp in
general, documenting the differences between the two available
isolators, and how to use them when building images, patching
images and running them.
---
 Documentation/seccomp-guide.md | 377 +++++++++++++++++++++++++++++++++
 1 file changed, 377 insertions(+)
 create mode 100644 Documentation/seccomp-guide.md

diff --git a/Documentation/seccomp-guide.md b/Documentation/seccomp-guide.md
new file mode 100644
index 0000000000..26b597048a
--- /dev/null
+++ b/Documentation/seccomp-guide.md
@@ -0,0 +1,377 @@
+# Seccomp Isolators Guide
+
+This document is a walk-through guide describing how to use rkt isolators for
+[Linux seccomp filtering](https://lwn.net/Articles/656307/).
+
+* [About Seccomp](#about-seccomp)
+* [Predefined Seccomp Filters](#predefined-seccomp-filter)
+* [Seccomp Isolators](#seccomp-isolators)
+* [Usage Example](#usage-example)
+* [Overriding Seccomp Filters](#overriding-seccomp-filters)
+* [Recommendations](#recommendations)
+
+## About seccomp
+
+Linux seccomp (short for SECure COMputing) filtering allows one to specify which
+system calls a process should be allowed to invoke, reducing the kernel surface
+exposed to applications.
+This provides a clearly defined mechanism to build sandboxed environments, where
+processes can run having access only to a specific reduced set of system calls.
+
+In the context of containers, seccomp filtering is useful for:
+
+* Restricting applications from invoking syscalls that can affect the host
+* Reducing kernel attack surface in case of security bugs
+
+For more details on how Linux seccomp filtering works, see
+[seccomp(2)](http://man7.org/linux/man-pages/man2/seccomp.2.html).
+
+## Predefined seccomp filters
+
+By default, rkt comes with a set of predefined filtering groups that can be
+used to quickly build sandboxed environments for containerized applications.
+Each set is simply a reference to a group of syscalls, covering a single
+functional area or kernel subsystem. They can be further combined to
+build more complex filters, either by blacklisting or by whitelisting specific
+system calls. To distinguish these predefined groups from real syscall names,
+wildcard labels are prefixed with a `@` symbols and are namespaced.
+
+The App Container Spec (appc) defines
+[two groups](https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators):
+
+ * `@appc.io/all` represents the set of all available syscalls.
+ * `@appc.io/empty` represents the empty set.
+
+rkt provides two default groups for generic usage:
+
+ * `@rkt/default-blacklist` represents a broad-scope filter than can be used for generic blacklisting
+ * `@rkt/default-whitelist` represents a broad-scope filter than can be used for generic whitelisting
+
+For compatibility reasons, two groups are provided mirroring [default Docker
+profiles](https://github.com/docker/docker/blob/v1.12.0/docs/security/seccomp.md):
+
+ * `@docker/default-blacklist`
+ * `@docker/default-whitelist`
+
+When using stage1 images with systemd >= v231, some
+[predefined groups](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=)
+are also available:
+
+ * `@systemd/clock` for syscalls manipulating the system clock
+ * `@systemd/default-whitelist` for a generic set of typically whitelisted syscalls
+ * `@systemd/mount` for filesystem mounting and unmounting
+ * `@systemd/network-io` for socket I/O operationgs
+ * `@systemd/obsolete` for unusual, obsolete or unimplemented syscalls
+ * `@systemd/privileged` for syscalls which need super-user syscalls
+ * `@systemd/process` for syscalls acting on process control, execution and namespacing
+ * `@systemd/raw-io` for raw I/O port access
+
+When no seccomp filtering is specified, by default rkt whitelists all the generic
+syscalls typically needed by applications for common operations. This is
+the same set defined by `@rkt/default-whitelist`.
+
+The default set is tailored to stop applications from performing a large
+variety of privileged actions, while not impacting their normal behavior.
+Operations which are typically not needed in containers and which may
+impact host state, eg. invoking `umount(2)`, are denied in this way.
+
+However, this default set is mostly meant as a safety precaution against erratic
+and misbehaving applications, and will not suffice against tailored attacks.
+As such, it is recommended to fine-tune seccomp filtering using one of the
+customizable isolators available in rkt.
+
+## Seccomp Isolators
+
+When running Linux containers, rkt provides two mutually exclusive isolators
+to define a seccomp filter for an application:
+
+* `os/linux/seccomp-retain-set`
+* `os/linux/seccomp-remove-set`
+
+Those isolators cover different use-cases and employ different techniques to
+achieve the same goal of limiting available syscalls. As such, they cannot
+be used together at the same time, and recommended usage varies on a
+case-by-case basis.
+
+### Operation mode
+
+Seccomp isolators work by defining a set of syscalls than can be either blocked
+("remove-set") or allowed ("retain-set"). Once an application tries to invoke
+a blocked syscall, the kernel will deny this operation and the application will
+be notified about the failure.
+
+By default, invoking blocked syscalls will result in the application being
+immediately terminated with a `SIGSYS` signal. This behavior can be tweaked by
+returning a specific error code ("errno") to the application instead of
+terminating it.
+
+For both isolators, this can be customized by specifying an additional `errno`
+parameter with the desired symbolic errno name. For a list of errno labels, check
+the [reference](http://man7.org/linux/man-pages/man3/errno.3.html) at `man 3 errno`.
+
+### Retain-set
+
+`os/linux/seccomp-retain-set` allows for an additive approach to build a seccomp
+filter: applications will not able to use any syscalls, except the ones
+listed in this isolator.
+
+This whitelisting approach is useful for completely locking down environments
+and whenever application requirements (in terms of syscalls) are
+well-defined in advance. It allows one to ensure that exactly and only the
+specified syscalls could ever be used.
+
+For example, the "retain-set" for a typical network application will include
+entries for generic POSIX operations (available in `@systemd/default-whitelist`),
+socket operations (`@systemd/network-io`) and reacting to I/O
+events (`@systemd/io-event`).
+
+### Remove-set
+
+`os/linux/seccomp-remove-set` tackles syscalls in a subtractive way:
+starting from all available syscalls, single entries can be forbidden in order
+to prevent specific actions.
+
+This blacklisting approach is useful to somehow limit applications which have
+broad requirements in terms of syscalls, in order to deny access to some clearly
+unused but potentially exploitable syscalls.
+
+For example, an application that will need to perform multiple operations but is
+known to never touch mountpoints could have `@systemd/mount` specified in its
+"remove-set".
+
+## Usage Example
+
+The goal of these examples is to show how to build ACI images with `acbuild`,
+where some syscalls are either explicitly blocked or allowed.
+For simplicity, the starting point will be a bare Alpine Linux image which
+ships with `ping` and `umount` commands (from busybox). Those
+commands respectively requires `socket(2)` and `umount(2)` syscalls in order to
+perform privileged operations.
+To block their usage, a syscalls filter can be installed via
+`os/linux/seccomp-remove-set` or `os/linux/seccomp-retain-set`; both approaches
+are shown here.
+
+### Blacklisting specific syscalls
+
+This example shows how to block socket operation (e.g. with `ping`), by removing
+`socket()` from the set of allowed syscalls.
+
+First, a local image is built with an explicit "remove-set" isolator.
+This set contains the syscalls that need to be forbidden in order to block
+socket setup:
+
+```
+$ acbuild begin
+$ acbuild set-name localhost/seccomp-remove-set-example
+$ acbuild dependency add quay.io/coreos/alpine-sh
+$ acbuild set-exec -- /bin/sh
+$ echo '{ "set": ["@rkt/default-blacklist", "socket"] }' | acbuild isolator add "os/linux/seccomp-remove-set" -
+$ acbuild write seccomp-remove-set-example.aci
+$ acbuild end
+```
+
+Once properly built, this image can be run in order to check that `ping` usage is
+now blocked by the seccomp filter. At the same time, the default blacklist will
+also block other dangerous syscalls like `umount(2)`:
+
+```
+$ sudo rkt run --interactive --insecure-options=image seccomp-remove-set-example.aci
+image: using image from file stage1-coreos.aci
+image: using image from file seccomp-remove-set-example.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # ping -c1 8.8.8.8
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+Bad system call
+
+/ # umount /proc/bus/
+Bad system call
+```
+
+This means that `socket(2)` and `umount(2)` have been both effectively disabled
+inside the container.
+
+### Allowing specific syscalls
+
+In contrast to the example above, this one shows how to allow some operations
+only (e.g. network communication via `ping`), by whitelisting all required
+syscalls. This means that syscalls outside of this set will be blocked.
+
+First, a local image is built with an explicit "retain-set" isolator.
+This set contains the rkt wildcard "default-whitelist" (which already provides
+all socket-related entries), plus some custom syscalls (e.g. `umount(2)`) which
+are typically not allowed:
+
+```
+$ acbuild begin
+$ acbuild set-name localhost/seccomp-retain-set-example
+$ acbuild dependency add quay.io/coreos/alpine-sh
+$ acbuild set-exec -- /bin/sh
+$ echo '{ "set": ["@rkt/default-whitelist", "umount", "umount2"] }' | acbuild isolator add "os/linux/seccomp-retain-set" -
+$ acbuild write seccomp-retain-set-example.aci
+$ acbuild end
+```
+
+Once run, it can be easily verified that both `ping` and `umount` are now
+functional inside the container. These operations also require additional
+capabilities to be retained in order to work:
+
+```
+$ sudo rkt run --interactive --insecure-options=image seccomp-retain-set-example.aci --caps-retain=CAP_SYS_ADMIN,CAP_NET_RAW
+image: using image from file stage1-coreos.aci
+image: using image from file seccomp-retain-set-example.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # ping -c 1 8.8.8.8
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+64 bytes from 8.8.8.8: seq=0 ttl=41 time=24.910 ms
+
+--- 8.8.8.8 ping statistics ---
+1 packets transmitted, 1 packets received, 0% packet loss
+round-trip min/avg/max = 24.910/24.910/24.910 ms
+
+/ # mount | grep /proc/bus
+proc on /proc/bus type proc (ro,nosuid,nodev,noexec,relatime)
+/ # umount /proc/bus
+/ # mount | grep /proc/bus
+```
+
+However, others syscalls are still not available to the application.
+For example, trying to set the time will result in a failure due to invoking
+non-whitelisted syscalls:
+
+```
+$ sudo rkt run --interactive --insecure-options=image seccomp-retain-set-example.aci
+image: using image from file stage1-coreos.aci
+image: using image from file seccomp-retain-set-example.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # adjtimex -f 0
+Bad system call
+```
+
+## Overriding Seccomp Filters
+
+Seccomp filters are typically defined when creating images, as they are tightly
+linked to specific app requirements. However, image consumers may need to further
+tweak/restrict the set of available syscalls in specific local scenarios.
+This can be done either by permanently patching the manifest of specific images,
+or by overriding seccomp isolators with command line options.
+
+### Patching images
+
+Image manifests can be manipulated manually, by unpacking the image and editing
+the manifest file, or with helper tools like `actool`.
+To override an image's pre-defined syscalls set, just replace the existing seccomp
+isolators in the image with new isolators defining the desired syscalls.
+
+The `patch-manifest` subcommand to `actool` manipulates the syscalls sets
+defined in an image.
+`actool patch-manifest -seccomp-mode=... -seccomp-set=...` options
+can be used together to override any seccomp filters, by specifying a new mode 
+(retain or reset) and set of syscalls to filter.
+These commands take an input image, modify any existing seccomp isolators, and
+write the changes to an output image, as shown in the example:
+
+```
+$ actool cat-manifest seccomp-retain-set-example.aci
+...
+    "isolators": [
+      {
+      "name": "os/linux/seccomp-retain-set",
+        "value": {
+          "set": [
+            "@rkt/default-whitelist",
+            "umount",
+            "umount2"
+          ]
+        }
+      }
+    ]
+...
+
+$ actool patch-manifest -seccomp-mode=retain -seccomp-set=@rkt/default-whitelist seccomp-retain-set-example.aci seccomp-retain-set-patched.aci
+
+$ actool cat-manifest seccomp-retain-set-patched.aci
+...
+    "isolators": [
+      {
+        "name": "os/linux/seccomp-retain-set",
+        "value": {
+          "set": [
+            "@rkt/default-whitelist",
+          ]
+        }
+      }
+    ]
+...
+
+```
+
+Now run the image to verify that the `umount(2)` syscall is no longer allowed:
+
+```
+$ sudo rkt run --interactive --insecure-options=image seccomp-retain-set-patched.aci
+image: using image from file stage1-coreos.aci
+image: using image from file seccomp-retain-set-patched.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # mount | grep /proc/bus
+proc on /proc/bus type proc (ro,nosuid,nodev,noexec,relatime)
+/ # umount /proc/bus/
+Bad system call
+```
+
+### Overriding seccomp filters at run-time
+
+Seccomp filters can be directly overridden at run time from the command-line,
+without changing the executed images.
+The `--seccomp` option to `rkt run` can manipulate both the "retain" and the
+"remove" isolators.
+
+Isolator overridden from the command-line will replace all seccomp settings in
+the image manifest, and can be specified as shown in this example:
+
+```
+$ sudo rkt run --interactive quay.io/coreos/alpine-sh --seccomp mode=remove,socket
+image: using image from file /usr/local/bin/stage1-coreos.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # ping -c 1 8.8.8.8
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+Bad system call
+
+```
+
+Seccomp isolators are application-specific configuration entries, and in a
+`rkt run` command line they **must follow the application container image to
+which they apply**.
+Each application within a pod can have different seccomp filters.
+
+## Recommendations
+
+As with most security features, seccomp isolators may require some
+application-specific tuning in order to be maximally effective. For this reason,
+for security-sensitive environments it is recommended to have a well-specified
+set of syscalls requirements and follow best practices:
+
+ 1. Only allow syscalls needed by an application, according to its typical usage.
+ 2. While it is possible to completely disable seccomp, it is rarely needed and
+    should be generally avoided. Tweaking the syscalls set is a better approach
+    instead.
+ 3. Avoid granting access to dangerous syscalls. For example, `mount(2)` and
+    `ptrace(2)` are typically abused to escape containers.
+ 4. Prefer a whitelisting approach, trying to keep the "retain-set" as small as
+    possible.

From 5e428a30b2269f4b09b61f44bca750ef16983861 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Fri, 5 Aug 2016 22:55:53 +0600
Subject: [PATCH 0623/1304] pods: fix path of documentation in a comment

as Documentation/container-lifecycle.md does not exist anymore.
---
 rkt/pods.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/pods.go b/rkt/pods.go
index 1a00f2f907..4c802d90fd 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -61,7 +61,7 @@ type pod struct {
 	mountLabel       string // Label to use for container image
 }
 
-// Exported state. See Documentation/container-lifecycle.md for some explanation
+// Exported state. See Documentation/devel/pod-lifecycle.md for some explanation
 const (
 	Embryo         = "embryo"
 	Preparing      = "preparing"

From 32abe0bdc99605d84144f9b52984eab3a6f3751d Mon Sep 17 00:00:00 2001
From: Andrei Krasnitski <me@infra-red.xyz>
Date: Sat, 6 Aug 2016 15:59:36 +0300
Subject: [PATCH 0624/1304] docs: fix broken jenkins ci badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83f8cfc1d4..b3961d3a39 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![godoc](https://godoc.org/github.com/coreos/rkt?status.svg)](http://godoc.org/github.com/coreos/rkt)
 [![Build Status (Travis)](https://travis-ci.org/coreos/rkt.svg?branch=master)](https://travis-ci.org/coreos/rkt)
 [![Build Status (SemaphoreCI)](https://semaphoreci.com/api/v1/projects/28468e19-4fd0-483e-9c29-6c8368661333/395211/badge.svg)](https://semaphoreci.com/coreos/rkt)
-[![Build Status (Jenkins)](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-matrix/badge/icon)](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-matrix/)
+[![Build Status (Jenkins)](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-github-ci/badge/icon)](https://jenkins-rkt-public.prod.coreos.systems/view/rkt/job/rkt-github-ci/)
 
 ![rkt Logo](logos/rkt-horizontal-color.png)
 

From 3d8accf4dc19c500d6afec9cd72f9d07c68e2b60 Mon Sep 17 00:00:00 2001
From: Abhishek Chanda <abhishek.becs@gmail.com>
Date: Sat, 6 Aug 2016 19:20:44 -0700
Subject: [PATCH 0625/1304] kvm: use a properly formatted comment

We were using the chain name as comment. This can lead to confusion
and does not add much value since the chain name is partly random.
---
 networking/kvm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index 882104e32e..9c478c1a7a 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -586,7 +586,7 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 
 		if n.conf.IPMasq {
 			chain := cniutils.FormatChainName(n.conf.Name, podID.String())
-			comment := cniutils.FormatChainName(n.conf.Name, podID.String())
+			comment := cniutils.FormatComment(n.conf.Name, podID.String())
 			if err := ip.SetupIPMasq(&net.IPNet{
 				IP:   n.runtime.IP,
 				Mask: net.IPMask(n.runtime.Mask),

From fdf9d5b5c8649fb64a0f4e6036cef3719231f4a2 Mon Sep 17 00:00:00 2001
From: Tim Dettrick <t.dettrick@uq.edu.au>
Date: Mon, 8 Aug 2016 12:00:45 +1000
Subject: [PATCH 0626/1304] export: test export with specified app name

---
 tests/rkt_export_container_test.go |  2 +-
 tests/rkt_export_test.go           | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_export_container_test.go b/tests/rkt_export_container_test.go
index 7d091c2637..90ce704072 100644
--- a/tests/rkt_export_container_test.go
+++ b/tests/rkt_export_container_test.go
@@ -23,7 +23,7 @@ import (
 )
 
 func TestExport(t *testing.T) {
-	testCases := []ExportTestCase{noOverlaySimpleTest}
+	testCases := []ExportTestCase{noOverlaySimpleTest, specifiedAppTest}
 
 	// Need to do both checks
 	if common.SupportsUserNS() && checkUserNS() == nil {
diff --git a/tests/rkt_export_test.go b/tests/rkt_export_test.go
index a1b69a2209..a96d4bb15b 100644
--- a/tests/rkt_export_test.go
+++ b/tests/rkt_export_test.go
@@ -32,6 +32,7 @@ type ExportTestCase struct {
 	runArgs        string
 	writeArgs      string
 	readArgs       string
+	exportArgs     string
 	expectedResult string
 	unmountOverlay bool
 }
@@ -43,6 +44,16 @@ var (
 		"--no-overlay --insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
+		"",
+		testContent,
+		false,
+	}
+
+	specifiedAppTest = ExportTestCase{
+		"--no-overlay --insecure-options=image",
+		"--write-file --file-name=" + testFile + " --content=" + testContent,
+		"--read-file --file-name=" + testFile,
+		"--app=rkt-inspect",
 		testContent,
 		false,
 	}
@@ -51,6 +62,7 @@ var (
 		"--private-users --no-overlay --insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
+		"",
 		testContent,
 		false,
 	}
@@ -59,6 +71,7 @@ var (
 		"--insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
+		"",
 		testContent,
 		false,
 	}
@@ -67,6 +80,7 @@ var (
 		"--insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
+		"",
 		testContent,
 		true,
 	}
@@ -103,7 +117,7 @@ func (ct ExportTestCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
 	}
 
 	// Export the image
-	exportCmd := fmt.Sprintf("%s export %s %s", ctx.Cmd(), uuid, tmpTestAci)
+	exportCmd := fmt.Sprintf("%s export %s %s %s", ctx.Cmd(), ct.exportArgs, uuid, tmpTestAci)
 	t.Logf("Running 'export'")
 	child = spawnOrFail(t, exportCmd)
 	waitOrFail(t, child, 0)

From 73c63fca6053b084a4e3a706e2c62e7f8e3cfe9e Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Tue, 2 Aug 2016 16:48:39 -0700
Subject: [PATCH 0627/1304] api_service: Add lru cache to cache image info.

---
 rkt/api_service.go        | 75 ++++++++++++++++++++++++++++++++++-----
 store/imagestore/store.go |  6 ++++
 2 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 2f672969c2..edc9e345f2 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -44,8 +44,12 @@ import (
 	"google.golang.org/grpc"
 )
 
-// Default size for the pod manifest LRU cache.
-const defaultCacheSize = 512
+const (
+	// Default size for the pod LRU cache.
+	defaultPodCacheSize = 512
+	// Default size for the image LRU cache.
+	defaultImageCacheSize = 512
+)
 
 var (
 	supportedAPIVersion = "1.0.0-alpha"
@@ -77,6 +81,10 @@ type podCacheItem struct {
 	mtime time.Time
 }
 
+type imageCacheItem struct {
+	image *v1alpha.Image
+}
+
 // copyPod copies the immutable information of the pod into the new pod.
 func copyPod(pod *v1alpha.Pod) *v1alpha.Pod {
 	p := &v1alpha.Pod{
@@ -95,10 +103,26 @@ func copyPod(pod *v1alpha.Pod) *v1alpha.Pod {
 	return p
 }
 
+// copyImage copies the image object to avoid modification on the original one.
+func copyImage(img *v1alpha.Image) *v1alpha.Image {
+	return &v1alpha.Image{
+		BaseFormat:      img.BaseFormat,
+		Id:              img.Id,
+		Name:            img.Name,
+		Version:         img.Version,
+		ImportTimestamp: img.ImportTimestamp,
+		Manifest:        img.Manifest,
+		Size:            img.Size,
+		Annotations:     img.Annotations,
+		Labels:          img.Labels,
+	}
+}
+
 // v1AlphaAPIServer implements v1Alpha.APIServer interface.
 type v1AlphaAPIServer struct {
 	store    *imagestore.Store
 	podCache *lru.Cache
+	imgCache *lru.Cache
 }
 
 var _ v1alpha.PublicAPIServer = &v1AlphaAPIServer{}
@@ -109,14 +133,20 @@ func newV1AlphaAPIServer() (*v1AlphaAPIServer, error) {
 		return nil, err
 	}
 
-	cache, err := lru.New(defaultCacheSize)
+	podCache, err := lru.New(defaultPodCacheSize)
+	if err != nil {
+		return nil, err
+	}
+
+	imgCache, err := lru.New(defaultImageCacheSize)
 	if err != nil {
 		return nil, err
 	}
 
 	return &v1AlphaAPIServer{
 		store:    s,
-		podCache: cache,
+		podCache: podCache,
+		imgCache: imgCache,
 	}, nil
 }
 
@@ -777,7 +807,7 @@ func (s *v1AlphaAPIServer) ListImages(ctx context.Context, request *v1alpha.List
 
 	var images []*v1alpha.Image
 	for _, aciInfo := range aciInfos {
-		image, err := aciInfoToV1AlphaAPIImage(s.store, aciInfo)
+		image, err := s.getImageInfo(aciInfo.BlobKey)
 		if err != nil {
 			continue
 		}
@@ -792,8 +822,37 @@ func (s *v1AlphaAPIServer) ListImages(ctx context.Context, request *v1alpha.List
 	return &v1alpha.ListImagesResponse{Images: images}, nil
 }
 
-// getImageInfo for a given image ID, returns the *v1alpha.Image object.
-func getImageInfo(store *imagestore.Store, imageID string) (*v1alpha.Image, error) {
+// getImageInfo returns the image info of a given image ID.
+// It will first try to read the image info from cache.
+// - If the image exists in cache:
+//   - If the image exists on disk, then return it directly.
+//   - Otherwise, return nil.
+// - Else, try to return the image from disk.
+func (s *v1AlphaAPIServer) getImageInfo(imageID string) (*v1alpha.Image, error) {
+	item, found := s.imgCache.Get(imageID)
+	if found {
+		image := item.(*imageCacheItem).image
+
+		// Check if the image has been removed.
+		if found := s.store.HasFullKey(image.Id); !found {
+			s.imgCache.Remove(imageID)
+			return nil, fmt.Errorf("no such image with ID %q", imageID)
+		}
+		return copyImage(image), nil
+	}
+
+	image, err := s.getImageInfoFromDisk(s.store, imageID)
+	if err != nil {
+		return nil, err
+	}
+
+	s.imgCache.Add(imageID, &imageCacheItem{image})
+
+	return copyImage(image), err
+}
+
+// getImageInfoFromDisk for a given image ID, returns the *v1alpha.Image object.
+func (s *v1AlphaAPIServer) getImageInfoFromDisk(store *imagestore.Store, imageID string) (*v1alpha.Image, error) {
 	aciInfo, err := store.GetACIInfoWithBlobKey(imageID)
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to get ACI info for image %q", imageID), err)
@@ -809,7 +868,7 @@ func getImageInfo(store *imagestore.Store, imageID string) (*v1alpha.Image, erro
 }
 
 func (s *v1AlphaAPIServer) InspectImage(ctx context.Context, request *v1alpha.InspectImageRequest) (*v1alpha.InspectImageResponse, error) {
-	image, err := getImageInfo(s.store, request.Id)
+	image, err := s.getImageInfo(request.Id)
 	if err != nil {
 		return nil, err
 	}
diff --git a/store/imagestore/store.go b/store/imagestore/store.go
index d096dce1fe..4136d64460 100644
--- a/store/imagestore/store.go
+++ b/store/imagestore/store.go
@@ -743,6 +743,12 @@ func (s *Store) HashToKey(h hash.Hash) string {
 	return hashToKey(h)
 }
 
+// HasFullKey returns whether the image with the given key exists on the disk by
+// checking if the image manifest kv store contains the key.
+func (s *Store) HasFullKey(key string) bool {
+	return s.stores[imageManifestType].Has(key)
+}
+
 func hashToKey(h hash.Hash) string {
 	s := h.Sum(nil)
 	return keyToString(s)

From 4601343ce3d187292fa7dc570f0e06ab8b348641 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Tue, 9 Aug 2016 12:18:14 +0200
Subject: [PATCH 0628/1304] build: Quiet down go builds

Tell go to be verbose when we want it to be verbose, which is when we
pass V=3 to make.
---
 makelib/build_go_bin.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/makelib/build_go_bin.mk b/makelib/build_go_bin.mk
index 8ceec59fcf..0b42b20081 100644
--- a/makelib/build_go_bin.mk
+++ b/makelib/build_go_bin.mk
@@ -41,16 +41,12 @@ _BGB_PKG_NAME_ := $(REPO_PATH)/$(BGB_PKG_IN_REPO)
 $(call setup-dep-file,_BGB_GO_DEPMK,$(_BGB_PKG_NAME_))
 $(call setup-dep-file,_BGB_KV_DEPMK,$(_BGB_PKG_NAME_)/kv)
 
-VERBOSE_1 := -v
-VERBOSE_2 := -v
-VERBOSE_3 := -v -x
-
 $(call forward-vars,$(BGB_BINARY), \
 	BGB_ADDITIONAL_GO_ENV GO_ENV GO BGB_GO_FLAGS _BGB_PKG_NAME_)
 $(BGB_BINARY): $(_BGB_PATH_) $(_BGB_RKT_SYMLINK_STAMP_)
 	$(VQ) \
 	$(call vb,vt,GO,$(call vsg,$(_BGB_PKG_NAME_))) \
-	$(GO_ENV) $(BGB_ADDITIONAL_GO_ENV) "$(GO)" build $(VERBOSE_$(V)) -o "$@" $(BGB_GO_FLAGS) "$(_BGB_PKG_NAME_)"
+	$(GO_ENV) $(BGB_ADDITIONAL_GO_ENV) "$(GO)" build $(call v3,-v -x) -o "$@" $(BGB_GO_FLAGS) "$(_BGB_PKG_NAME_)"
 
 $(call generate-go-deps,$(_BGB_GO_DEPMK_STAMP_),$(BGB_BINARY),$(_BGB_GO_DEPMK),$(BGB_PKG_IN_REPO))
 $(call generate-kv-deps,$(_BGB_KV_DEPMK_STAMP_),$(BGB_BINARY),$(_BGB_KV_DEPMK),BGB_GO_FLAGS)

From 57d6e597e06f1dbd970717fc281c5f730a2291cb Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Tue, 9 Aug 2016 16:32:53 +0200
Subject: [PATCH 0629/1304] build: Get the list of standard library directories
 from ld

This avoid hardcoding paths like /usr/lib64 which may not be valid on
some distros.
---
 stage1/find-so-deps.mk        | 11 +++++++----
 stage1/stdlibdirs.mk          | 33 +++++++++++++++++++++++++++++++++
 stage1/usr_from_src/libnss.mk |  7 ++++---
 3 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 stage1/stdlibdirs.mk

diff --git a/stage1/find-so-deps.mk b/stage1/find-so-deps.mk
index d70a9f84e7..d9b53443d8 100644
--- a/stage1/find-so-deps.mk
+++ b/stage1/find-so-deps.mk
@@ -5,6 +5,9 @@
 #
 # STAGE1_FSD_FLAVOR - a flavor which wants libraries from host
 
+SLD_FLAVOR := $(STAGE1_FSD_FLAVOR)
+$(call inc-one,stdlibdirs.mk)
+
 # a clean file for removing solibs in both the ACI rootfs and the tmp
 # lib dir.
 $(call setup-clean-file,STAGE1_FSD_SOLIBS_CLEANMK,/$(STAGE1_FSD_FLAVOR)-solibs)
@@ -33,11 +36,11 @@ STAGE1_FSD_ACIROOTFSDIR := $(STAGE1_ACIROOTFSDIR_$(STAGE1_FSD_FLAVOR))
 # actool to create the ACI
 STAGE1_FSD_ALL_STAMPS := $(STAGE1_ALL_STAMPS_$(STAGE1_FSD_FLAVOR))
 
+STAGE1_FSD_SPACE :=
+STAGE1_FSD_SPACE +=
+
 # additions to LD_LIBRARY_PATH environment variable
-# TODO: we should somehow query the ACI which libdirs it uses -
-# on fedora these would be /usr/lib and /usr/lib64, but on debian it
-# is probably /usr/lib and /usr/lib/x86_64 or something
-STAGE1_FSD_LD_LIBRARY_PATH := $(STAGE1_FSD_ACIROOTFSDIR)/lib:$(STAGE1_FSD_ACIROOTFSDIR)/lib64:$(STAGE1_FSD_ACIROOTFSDIR)/usr/lib:$(STAGE1_FSD_ACIROOTFSDIR)/usr/lib64
+STAGE1_FSD_LD_LIBRARY_PATH := $(subst $(STAGE1_FSD_SPACE),:,$(foreach l,$(SLD_LOCATIONS),$(STAGE1_FSD_ACIROOTFSDIR)/$l))
 
 ifneq ($(LD_LIBRARY_PATH),)
 
diff --git a/stage1/stdlibdirs.mk b/stage1/stdlibdirs.mk
new file mode 100644
index 0000000000..ae5af5abd8
--- /dev/null
+++ b/stage1/stdlibdirs.mk
@@ -0,0 +1,33 @@
+# This file gets the list of standard library locations and tells make
+# to create their counterparts inside the ACI rootfs directory.
+#
+# Inputs:
+#
+# SLD_FLAVOR - a flavor which wants the standard library directories
+# to be created
+
+ifeq ($(SLD_INCLUDED),)
+
+SLD_INCLUDED := x
+SLD_LOCATIONS := $(shell ld --verbose | grep SEARCH_DIR | sed -e 's/SEARCH_DIR("=*\([^"]*\)");*/\1/g')
+
+endif
+
+ifneq ($(SLD_FLAVOR),)
+
+ifeq ($(SLDKEEP_INCLUDED_$(SLD_FLAVOR)),)
+
+SLDKEEP_INCLUDED_$(SLD_FLAVOR) := x
+SLD_ACIROOTFSDIR := $(STAGE1_ACIROOTFSDIR_$(SLD_FLAVOR))
+
+INSTALL_DIRS += $(foreach l,$(SLD_LOCATIONS),$(SLD_ACIROOTFSDIR)$l:0755)
+
+endif
+
+endif
+
+# SLD_LOCATIONS is deliberately not cleared, we will use this variable
+# to know standard library directories.
+# SLD_INCLUDED and SLDKEEP_* variables are not cleared to avoid
+# potential problems with including this file more than once.
+$(call undefine-namespaces,SLD,SLD_LOCATIONS SLD_INCLUDED)
diff --git a/stage1/usr_from_src/libnss.mk b/stage1/usr_from_src/libnss.mk
index 497a235701..bcfa35c5ac 100644
--- a/stage1/usr_from_src/libnss.mk
+++ b/stage1/usr_from_src/libnss.mk
@@ -1,8 +1,9 @@
+SLD_FLAVOR := $(S1_RF_FLAVOR)
+$(call inc-one,../stdlibdirs.mk)
+
 $(call setup-stamp-file,UFSN_STAMP)
 UFSN_LIBNSS_FILES_LINK := libnss_files.so.2
-# TODO: add this functionality to find-so-deps.mk
-UFSN_LIBS := $(shell ld --verbose | grep SEARCH_DIR | sed -e 's/SEARCH_DIR("=*\([^"]*\)");*/\1/g')
-UFSN_LIB_PATH := $(shell for l in $(UFSN_LIBS); do if [[ -e $${l}/$(UFSN_LIBNSS_FILES_LINK) ]]; then echo $${l}; break; fi; done)
+UFSN_LIB_PATH := $(shell for l in $(SLD_LOCATIONS); do if [[ -e $${l}/$(UFSN_LIBNSS_FILES_LINK) ]]; then echo $${l}; break; fi; done)
 
 UFSN_LIBNSS_FILES_PATH := $(UFSN_LIB_PATH)/$(UFSN_LIBNSS_FILES_LINK)
 UFSN_LIBNSS_FILES_REALPATH := $(shell realpath $(UFSN_LIBNSS_FILES_PATH))

From 9793c86a5d2e09f0d8f7f4b83d79e0da65b08795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 1 Jun 2016 12:04:28 +0200
Subject: [PATCH 0630/1304] usr_from_src: fix missing variable

We were using the variable name instead of the actual variable.
---
 stage1/usr_from_src/libnss.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/usr_from_src/libnss.mk b/stage1/usr_from_src/libnss.mk
index bcfa35c5ac..0b04281ccc 100644
--- a/stage1/usr_from_src/libnss.mk
+++ b/stage1/usr_from_src/libnss.mk
@@ -7,7 +7,7 @@ UFSN_LIB_PATH := $(shell for l in $(SLD_LOCATIONS); do if [[ -e $${l}/$(UFSN_LIB
 
 UFSN_LIBNSS_FILES_PATH := $(UFSN_LIB_PATH)/$(UFSN_LIBNSS_FILES_LINK)
 UFSN_LIBNSS_FILES_REALPATH := $(shell realpath $(UFSN_LIBNSS_FILES_PATH))
-UFSN_LIBNSS_FILES := $(shell basename UFSN_LIBNSS_FILES_REALPATH)
+UFSN_LIBNSS_FILES := $(shell basename $(UFSN_LIBNSS_FILES_REALPATH))
 
 UFSN_LIBNSS_FILES_ON_ACI := $(S1_RF_ACIROOTFSDIR)/usr/lib/$(UFSN_LIBNSS_FILES)
 

From acba368dfc520e242784684fbea4ba1b6b7abb30 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Tue, 9 Aug 2016 16:36:13 +0200
Subject: [PATCH 0631/1304] build: Fix loading libnss

I could not find where systemd tries to load libnss_files, so probably
it does not do it directly. But apparently the loader does not like
the hardcoded /usr/lib path in the ACI rootfs, so instead put the
libnss_files libraries in the same directory as found on host.
---
 stage1/usr_from_src/libnss.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/stage1/usr_from_src/libnss.mk b/stage1/usr_from_src/libnss.mk
index 0b04281ccc..328480a12d 100644
--- a/stage1/usr_from_src/libnss.mk
+++ b/stage1/usr_from_src/libnss.mk
@@ -5,16 +5,18 @@ $(call setup-stamp-file,UFSN_STAMP)
 UFSN_LIBNSS_FILES_LINK := libnss_files.so.2
 UFSN_LIB_PATH := $(shell for l in $(SLD_LOCATIONS); do if [[ -e $${l}/$(UFSN_LIBNSS_FILES_LINK) ]]; then echo $${l}; break; fi; done)
 
+UFSN_ACI_LIB_PATH := $(S1_RF_ACIROOTFSDIR)$(UFSN_LIB_PATH)
+
 UFSN_LIBNSS_FILES_PATH := $(UFSN_LIB_PATH)/$(UFSN_LIBNSS_FILES_LINK)
 UFSN_LIBNSS_FILES_REALPATH := $(shell realpath $(UFSN_LIBNSS_FILES_PATH))
 UFSN_LIBNSS_FILES := $(shell basename $(UFSN_LIBNSS_FILES_REALPATH))
 
-UFSN_LIBNSS_FILES_ON_ACI := $(S1_RF_ACIROOTFSDIR)/usr/lib/$(UFSN_LIBNSS_FILES)
+UFSN_LIBNSS_FILES_ON_ACI := $(UFSN_ACI_LIB_PATH)/$(UFSN_LIBNSS_FILES)
 
 S1_RF_SECONDARY_STAMPS += $(UFSN_STAMP)
 S1_RF_INSTALL_FILES += $(UFSN_LIBNSS_FILES_PATH):$(UFSN_LIBNSS_FILES_ON_ACI):-
-S1_RF_INSTALL_SYMLINKS += $(UFSN_LIBNSS_FILES):$(S1_RF_ACIROOTFSDIR)/usr/lib/$(UFSN_LIBNSS_FILES_LINK)
+S1_RF_INSTALL_SYMLINKS += $(UFSN_LIBNSS_FILES):$(UFSN_ACI_LIB_PATH)/$(UFSN_LIBNSS_FILES_LINK)
 
-$(call generate-stamp-rule,$(UFSN_STAMP),$(UFSN_LIBNSS_FILES_ON_ACI), $(S1_RF_ACIROOTFSDIR)/usr/lib/$(UFSN_LIBNSS_FILES_LINK))
+$(call generate-stamp-rule,$(UFSN_STAMP),$(UFSN_LIBNSS_FILES_ON_ACI),$(UFSN_ACI_LIB_PATH)/$(UFSN_LIBNSS_FILES_LINK))
 
 $(call undefine-namespaces,UFSN)

From 39ffc2af4f4449f25d55b247605d01f588424121 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Tue, 9 Aug 2016 16:00:29 +0200
Subject: [PATCH 0632/1304] build: Remove obsolete and dead build code

---
 stage1/usr_from_src/usr_from_src.mk | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index 65cedd1a1f..ec2216e4ba 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -82,12 +82,6 @@ UFS_AG_OUT := $(UFS_TMPDIR)/ag_out
 UFS_SYSTEMD_CONFIGURE := $(UFS_SYSTEMD_SRCDIR)/configure
 UFS_SYSTEMD_CONFIGURE_AC := $(UFS_SYSTEMD_CONFIGURE).ac
 
-# TODO: the symlinks should be build-host specific, instead of hardcoded
-# UFS_LIB_SYMLINK := $(S1_RF_ACIROOTFSDIR)/lib
-# UFS_LIB64_SYMLINK := $(S1_RF_ACIROOTFSDIR)/lib64
-# INSTALL_SYMLINKS += usr/lib:$(UFS_LIB_SYMLINK) usr/lib64:$(UFS_LIB64_SYMLINK)
-# $(UFS_ROOTFS_STAMP): | $(UFS_LIB_SYMLINK) $(UFS_LIB64_SYMLINK)
-
 S1_RF_USR_STAMPS += $(UFS_STAMP)
 S1_RF_COPY_SO_DEPS := yes
 INSTALL_DIRS += \

From 03e497fef37b0bd545f9fe1ccd88a9101ccb731c Mon Sep 17 00:00:00 2001
From: Vito Caputo <vito.caputo@coreos.com>
Date: Tue, 9 Aug 2016 21:01:53 -0700
Subject: [PATCH 0633/1304] pkg/label: delete deprecated GenLabels()

Nothing is using this, and it's an InitLabels() call-site which the next
commit must update.
---
 pkg/label/label.go         | 4 ----
 pkg/label/label_selinux.go | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/pkg/label/label.go b/pkg/label/label.go
index 1a8b7ebb22..1153cc63b5 100644
--- a/pkg/label/label.go
+++ b/pkg/label/label.go
@@ -24,10 +24,6 @@ func InitLabels(options []string) (string, string, error) {
 	return "", "", nil
 }
 
-func GenLabels(options string) (string, string, error) {
-	return "", "", nil
-}
-
 func FormatMountLabel(src string, mountLabel string) string {
 	return src
 }
diff --git a/pkg/label/label_selinux.go b/pkg/label/label_selinux.go
index a806f40352..e7a468a6f3 100644
--- a/pkg/label/label_selinux.go
+++ b/pkg/label/label_selinux.go
@@ -66,11 +66,6 @@ func InitLabels(options []string) (string, string, error) {
 	return processLabel, mountLabel, nil
 }
 
-// DEPRECATED: The GenLabels function is only to be used during the transition to the official API.
-func GenLabels(options string) (string, string, error) {
-	return InitLabels(strings.Fields(options))
-}
-
 // FormatMountLabel returns a string to be used by the mount command.
 // The format of this string will be used to alter the labeling of the mountpoint.
 // The string returned is suitable to be used as the options field of the mount command.

From 908eeca4d126534d8eaa432b9b9b66b354ff6773 Mon Sep 17 00:00:00 2001
From: Vito Caputo <vito.caputo@coreos.com>
Date: Tue, 9 Aug 2016 21:09:50 -0700
Subject: [PATCH 0634/1304] pkg/label/label_selinux: mcsdir as arg InitLabels

mcsdir was being supplied in options arg, which gets processed _after_
calling selinux.GetLxcContexts(), which results in an mcsAdd() before
setting mcsdir.

Simply move the mcsdir out of the options array and supply it as a
discrete function argument handled independently and prior to both
options processing and selinux.GetLxcContexts().

Fixes https://github.com/coreos/rkt/issues/3043
---
 pkg/label/label.go              |  2 +-
 pkg/label/label_selinux.go      | 13 ++++++-------
 pkg/label/label_selinux_test.go | 10 +++++-----
 rkt/run.go                      |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkg/label/label.go b/pkg/label/label.go
index 1153cc63b5..6f61280392 100644
--- a/pkg/label/label.go
+++ b/pkg/label/label.go
@@ -20,7 +20,7 @@ package label
 // InitLabels returns the process label and file labels to be used within
 // the container.  A list of options can be passed into this function to alter
 // the labels.
-func InitLabels(options []string) (string, string, error) {
+func InitLabels(mcsdir string, options []string) (string, string, error) {
 	return "", "", nil
 }
 
diff --git a/pkg/label/label_selinux.go b/pkg/label/label_selinux.go
index e7a468a6f3..946c2b4f4b 100644
--- a/pkg/label/label_selinux.go
+++ b/pkg/label/label_selinux.go
@@ -30,10 +30,15 @@ import (
 // the container.  A list of options can be passed into this function to alter
 // the labels.  The labels returned will include a random MCS String, that is
 // guaranteed to be unique.
-func InitLabels(options []string) (string, string, error) {
+func InitLabels(mcsdir string, options []string) (string, string, error) {
 	if !selinux.SelinuxEnabled() {
 		return "", "", nil
 	}
+
+	if err := selinux.SetMCSDir(mcsdir); err != nil {
+		return "", "", errwrap.Wrap(errors.New("unable to configure MCS storage directory"), err)
+	}
+
 	processLabel, mountLabel, err := selinux.GetLxcContexts()
 	if err != nil {
 		return "", "", err
@@ -53,12 +58,6 @@ func InitLabels(options []string) (string, string, error) {
 			if con[0] == "level" || con[0] == "user" {
 				mcon[con[0]] = con[1]
 			}
-			if con[0] == "mcsdir" {
-				err := selinux.SetMCSDir(con[1])
-				if err != nil {
-					return "", "", errwrap.Wrap(errors.New("unable to configure MCS storage directory"), err)
-				}
-			}
 		}
 		processLabel = pcon.Get()
 		mountLabel = mcon.Get()
diff --git a/pkg/label/label_selinux_test.go b/pkg/label/label_selinux_test.go
index 7733a43705..f3fcaa0a50 100644
--- a/pkg/label/label_selinux_test.go
+++ b/pkg/label/label_selinux_test.go
@@ -28,13 +28,13 @@ import (
 func TestInit(t *testing.T) {
 	if selinux.SelinuxEnabled() {
 		var testNull []string
-		plabel, mlabel, err := InitLabels(testNull)
+		plabel, mlabel, err := InitLabels("", testNull)
 		if err != nil {
 			t.Log("InitLabels Failed")
 			t.Fatal(err)
 		}
 		testDisabled := []string{"disable"}
-		plabel, mlabel, err = InitLabels(testDisabled)
+		plabel, mlabel, err = InitLabels("", testDisabled)
 		if err != nil {
 			t.Log("InitLabels Disabled Failed")
 			t.Fatal(err)
@@ -44,7 +44,7 @@ func TestInit(t *testing.T) {
 			t.Fatal(plabel)
 		}
 		testUser := []string{"user:user_u", "role:user_r", "type:user_t", "level:s0:c1,c15"}
-		plabel, mlabel, err = InitLabels(testUser)
+		plabel, mlabel, err = InitLabels("", testUser)
 		if err != nil {
 			t.Log("InitLabels User Failed")
 			t.Fatal(err)
@@ -56,7 +56,7 @@ func TestInit(t *testing.T) {
 		}
 
 		testBadData := []string{"user", "role:user_r", "type:user_t", "level:s0:c1,c15"}
-		plabel, mlabel, err = InitLabels(testBadData)
+		plabel, mlabel, err = InitLabels("", testBadData)
 		if err == nil {
 			t.Log("InitLabels Bad Failed")
 			t.Fatal(err)
@@ -104,7 +104,7 @@ func TestDuplicateLabel(t *testing.T) {
 	}
 }
 func TestRelabel(t *testing.T) {
-	plabel, _, err := InitLabels(nil)
+	plabel, _, err := InitLabels("", nil)
 	if err != nil {
 		t.Fatalf("InitLabels failed: %v", err)
 	}
diff --git a/rkt/run.go b/rkt/run.go
index d93fd067f1..06414a5c0c 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -239,7 +239,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		}
 	}
 
-	processLabel, mountLabel, err := label.InitLabels([]string{"mcsdir:/var/run/rkt/mcs"})
+	processLabel, mountLabel, err := label.InitLabels("/var/run/rkt/mcs", []string{})
 	if err != nil {
 		stderr.PrintE("error initialising SELinux", err)
 		return 1

From 33c277838010e54afa03573ffa6aeacacf71dec8 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Wed, 10 Aug 2016 11:41:50 +0200
Subject: [PATCH 0635/1304] build: Fix make clean for recent systemd version in
 src flavor

Apparently systemd got some tools written in python, which is executed
at the build time. And python being python likes to put the compiled
bytecode of the script next to the script itself, which violates my
assumption that the srcdir should not change when we perform the build
in a different directory.

To fix this, we generate the second filelist of the srcdir after the
building of systemd finishes and generate a clean file based on the
generated filelist.
---
 stage1/usr_from_src/usr_from_src.mk | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index ec2216e4ba..848ca555c8 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -44,6 +44,13 @@ $(call setup-clean-file,UFS_SYSTEMD_BUILDDIR_CLEANMK,systemd-build)
 # build dir filelist
 $(call setup-filelist-file,UFS_SYSTEMD_BUILDDIR_FILELIST,systemd-build)
 
+# stamp for generating src dir clean file after build
+$(call setup-stamp-file,UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEAN_STAMP,systemd-src-after-build-clean)
+# clean file for src dir after build
+$(call setup-clean-file,UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEANMK,systemd-src-after-build)
+# src dir filelist after build
+$(call setup-filelist-file,UFS_SYSTEMD_SRCDIR_AFTER_BUILD_FILELIST,systemd-src-after-build)
+
 # stamp for generating dep file on patches dir
 $(call setup-stamp-file,UFS_PATCHES_DEPS_STAMP,systemd-patches-deps)
 # dep.mk file for patches dir, will cause git repo reset and clean if
@@ -102,7 +109,7 @@ $(call inc-one,libnss.mk)
 
 # this makes sure everything is done - ACI rootfs is populated,
 # clean/deps/filelist are generated
-$(call generate-stamp-rule,$(UFS_STAMP),$(UFS_ROOTFS_STAMP) $(UFS_ROOTFS_DEPS_STAMP) $(UFS_PATCHES_DEPS_STAMP) $(UFS_SYSTEMD_ROOTFSDIR_CLEAN_STAMP) $(UFS_SYSTEMD_BUILDDIR_CLEAN_STAMP) $(UFS_SYSTEMD_SRCDIR_CLEAN_STAMP))
+$(call generate-stamp-rule,$(UFS_STAMP),$(UFS_ROOTFS_STAMP) $(UFS_ROOTFS_DEPS_STAMP) $(UFS_PATCHES_DEPS_STAMP) $(UFS_SYSTEMD_ROOTFSDIR_CLEAN_STAMP) $(UFS_SYSTEMD_BUILDDIR_CLEAN_STAMP) $(UFS_SYSTEMD_SRCDIR_CLEAN_STAMP) $(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEAN_STAMP))
 
 # this copies the temporary rootfs contents to ACI rootfs and adds
 # some misc files
@@ -191,6 +198,17 @@ $(call generate-deep-filelist,$(UFS_SYSTEMD_BUILDDIR_FILELIST),$(UFS_SYSTEMD_BUI
 # in systemd.
 $(call generate-clean-mk,$(UFS_SYSTEMD_BUILDDIR_CLEAN_STAMP),$(UFS_SYSTEMD_BUILDDIR_CLEANMK),$(UFS_SYSTEMD_BUILDDIR_FILELIST),$(UFS_SYSTEMD_BUILDDIR))
 
+# Generate the filelist of systemd's srcdir again. This can be done
+# only after building systemd was finished. This is to take some files
+# generated during build in the srcdir into account. Normally srcdir
+# should be considered read only at this point, but apparently python
+# likes to put compiled bytecode next to the src file.
+$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_FILELIST): $(UFS_SYSTEMD_BUILD_STAMP)
+$(call generate-deep-filelist,$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_FILELIST),$(UFS_SYSTEMD_SRCDIR))
+
+# Generate clean.mk file for cleaning all files in srcdir-after-build.
+$(call generate-clean-mk,$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEAN_STAMP),$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEANMK),$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_FILELIST),$(UFS_SYSTEMD_SRCDIR))
+
 # this patch makes sure that systemd git repo was cloned and patched
 $(call generate-stamp-rule,$(UFS_SYSTEMD_CLONE_AND_PATCH_STAMP),$(UFS_SYSTEMD_CONFIGURE))
 

From a642c6cf8cb17b79e5bf170ece6199570a64f11c Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Mon, 8 Aug 2016 15:17:05 +0300
Subject: [PATCH 0636/1304] stage1: expose app-level operations

---
 Documentation/proposals/app-level-api.md | 237 +++++++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100644 Documentation/proposals/app-level-api.md

diff --git a/Documentation/proposals/app-level-api.md b/Documentation/proposals/app-level-api.md
new file mode 100644
index 0000000000..db1769bc0f
--- /dev/null
+++ b/Documentation/proposals/app-level-api.md
@@ -0,0 +1,237 @@
+# Fine-Grained Pod Manipulations
+
+To provide and API for imperative application operations (e.g. start|stop|add)
+inside a pod for finer-grained control over rkt containerization concepts and
+debugging needs, this proposal introduces new stage1 entrypoints and a
+subcommand CLI API that will be used for manipulating applications inside pods.
+
+The motivation behind this change is the direction orchestration systems are
+taking and to facilitate this new direction. For more details, see
+[kubernetes#25899](https://github.com/yujuhong/kubernetes/blob/08dc66113399c89e31f6872f3c638695a6ec6a8d/docs/proposals/container-runtime-interface-v1.md).
+
+# API
+
+The envisioned workflow for the app-level CLI API is that after a pod has been started, 
+the users will be invoking the rkt CLI which consist of application logic on top of aforementioned stage1 entrypoints.
+
+## rkt app add
+Injects an application image into a running pod.
+
+It first prepares an application rootfs in stage0 for the application image/images
+and then the prepared-app is injected via the entrypoint.
+
+```bash
+rkt app add <pod-uuid> --app=<app-name> <image-name/hash/address/registry-URL> <arguments>
+```
+
+**Note:** Not every pod will be injectable and it will be enabled through an option.
+
+## rkt app rm
+Removes an application image into a running pod, meaning that the leftover resources are removed from the pod.
+
+```bash
+rkt app rm <pod-uuid> --app=<app-name> <arguments>
+```
+
+**Note:** when a pod becomes empty, currently it will terminate, but this
+proposal will introduce a `--mutable` or `--allow-empty` or `--dumb` flag to be
+used when starting pods, so that the lifecycle management of the pod is left to
+the user. Meaning that empty pods won't be terminated.
+
+### Resources Leftover by an Application in Default Stage1 Flavor
+- Rootfs (e.g. `/opt/stage/<app-name>`)
+- Mounts from volumes (e.g. `/opt/stage/<app-name>/<volume-name>`)
+- Mounts related to rkt operations (e.g. `/opt/stage/<app-name>/dev/null`)
+- Systemd service files (e.g. `<app-name>.service` and `reaper-<app-name>.service`)
+- Miscellaneous files (e.g. `/rkt/<app-name>.env`, `/rkt/status...`)
+
+## rkt app start
+Starts an application that was injected.
+This operation is idempotent.
+
+```bash
+rkt app start <pod-uuid> --app=<app-name> <arguments>
+```
+
+## rkt app stop
+Stops a running application gracefully (grace is defined in the `app stop` entrypoint section).
+
+```bash
+rkt app stop <pod-uuid> --app=<app-name>
+```
+
+## rkt app list
+Lists the applications that are inside a pod, running or stopped.
+
+```bash
+rkt app list <pod-uuid> <arguments>
+```
+
+**Note:** List should consist of an app specifier and status at the very least,
+the rest is up for discussions.
+
+## rkt app status
+Returns the execution status of application inside a pod.
+
+```bash
+rkt app status <pod-uuid> --app=<app-name> <arguments>
+```
+
+The returned status information for an example mysql application would contain
+the following details (output format is up for discussion):
+
+```go
+type AppStatus struct {
+	Name       string
+	State      AppState
+	CreatedAt  time.Time
+	StartedAt  time.Time
+	FinishedAt time.Time
+	ExitCode   int64 
+}
+```
+
+**Note:** status will be obtained from an annotated json file residing in stage1
+that contains the required information.
+
+## rkt app exec
+Executes a command inside an application.
+
+```bash
+rkt app exec <pod-uuid> --app=<app-name> <arguments> -- <command> <command-arguments>
+```
+
+# Entrypoints
+
+In order to facilitate the app-level operations API, 4 new entrypoints are introduced.
+
+For example, the `app start` entrypoint in default stage1 flavor sends a `start` signal
+(similar to `systemctl start`) for the service files of the application to the systemd which is the stage1.
+
+## rkt app add
+
+`coreos.com/rkt/stage1/app/add`
+
+1. `coreos.com/rkt/stage1/add` entrypoint is resolved via annotations found within `/var/lib/rkt/pods/run/$uuid/stage1/manifest`.
+2. The entrypoint will be executed and passed a reference to the runtime-manifest of the app that was prepared.
+3. Perform setup based on the runtime-manifest of the app.
+
+The responsibility of this entrypoint is to receive a prepared app, inject it
+into the pod, where it will be started using `app/start` entrypoint.
+
+### Stage1 Default Flavor Example Workflow
+
+1. Render the application rootfs.
+2. Prepare the application/s
+3. Start the injected application using the `app/start` entrypoint.
+
+This approach is similar to using `rkt run`, instead of creating a new pod,
+an existing pod will be used.
+
+## rkt app rm
+
+`coreos.com/rkt/stage1/app/rm`
+
+1. receive a reference to an application that resides inside the pod (running or stopped)
+2. stop the application if its running.
+3. remove the contents of the application (rootfs) from the pod (keep the logs?) and delete references to it (e.g. service files).
+   - Delegate these steps by creating `app/install` and `app/rm` entrypoints?
+
+The responsibility of this entrypoint is to receive an app inside a pod and to remove it from the pod, so that it is ready to be started by the stage1 (e.g. systemd for the default flavor).
+After `rm`, starting the application again is not possible and requires injecting the same
+application using the `app/add` entrypoint.
+
+### Stage1 Default Flavor Example Workflow
+
+1. Stop the application using the `app stop` entrypoint.
+2. Collect the garbage left by the app (e.g. rootfs, unit files, etc.)
+3. Reload the systemd daemon for changes to take place without disturbing the other tennant applications.
+
+## rkt app start
+
+`coreos.com/rkt/stage1/app/start`
+
+1. given a reference to an application that's in the `Prepared` state, start the application.
+
+The responsibility of this entrypoint is to start an application that is in the `Prepared` state, 
+which is an app that was recently injected, instruct the stage1 to start the application.
+
+## rkt app stop
+
+`coreos.com/rkt/stage1/app/stop`
+
+1. given a reference to an application that's in the `Running` state (see below), instruct the stage1 to stop the application.
+
+The responsibility of this entrypoint is to stop an application that is `Running` by instructing the stage1. 
+
+**Note:** there is a graceful shutdown which sends the termination signal to application and waits for a grace period
+for application to terminate and then the application is shutdown if it doesn't terminate by the end of the grace period.
+
+# App States
+
+Expected set of app states are listed below:
+
+```go
+type AppState string
+
+const (
+	UnknownAppState AppState = "unknown"
+
+	PreparingAppState AppState = "preparing"
+
+	// Apps that are ready to be used by `app start`.
+	PreparedAppState AppState = "prepared"
+
+	RunningAppState AppState = "running"
+
+	// Apps stopped by `app stop`.
+	StoppingAppState AppState = "stopping"
+
+	// Apps that finish their execution naturally.
+	ExitedAppState AppState = "exited"
+
+	// Once an app is marked for ejection, while the ejection is being
+	// performed, no further operations can be done on that app.
+	DeletingAppState AppState = "deleting"
+)
+```
+
+**Note:** State transitions are linear in that an app that is in state `Exited` cannot transition into `Running` state.
+
+# Use Cases
+
+## Low-level  Pods
+
+Grant granular access to pods for orchestration systems and allow orchestration systems to develop their
+own pod concept on top of the exposed app-level operations.
+
+### Workflow
+
+1. Create an empty pod (specified via an option that allows empty pods to stay alive).
+2. Inject applications into the pod.
+3. Orchestrate the workflow of applications (e.g. app1 has to terminate successfully before app2).
+
+## Pod Mutability
+
+Enable in-place updates of a pod without disrupting the operations of the pod.
+
+### Workflow
+
+1. Remove the old applications without disturbing/restarting the whole pod.
+2. Inject updated applications.
+3. Start the updated applications.
+
+### Note
+
+Allows the consumers to perform rolling updates inside running pods.
+
+## Debugging Pods
+
+Allow users to inject debug applications into a pod in production.
+
+### Example Workflow
+
+1. Deploy an application containing only a Go web service binary.
+2. Encounter an error not decipherable via the available information (e.g. status info, logs, etc.).
+3. Inject a debug ACI containing binaries (e.g. `lsof`) for debugging the service.
+4. Enter the pod namespace and use the debug binaries.

From 50b5339bc9d56543b323a760ef32c0ad11cdfcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 10 Aug 2016 13:38:56 +0200
Subject: [PATCH 0637/1304] configure: disable tests on host flavor with
 systemd <227

The functional tests rely on the propagation of exit status, which was
adde on systemd v227.
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index bb93e8ea56..26c95cefc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,7 +140,7 @@ RKT_STAGE1_COREOS_BOARD=${GOARCH}-usr;
 
 AC_ARG_ENABLE([functional-tests],
               [AS_HELP_STRING([--enable-functional-tests],
-                              [enable functional tests on make check (linux only, uses sudo, default: 'no', use 'auto' to enable if possible, for host stage1 flavor systemd version 220 or higher on host is required)])],
+                              [enable functional tests on make check (linux only, uses sudo, default: 'no', use 'auto' to enable if possible, for host stage1 flavor systemd version 227 or higher on host is required)])],
               [RKT_RUN_FUNCTIONAL_TESTS="${enableval}"],
               [RKT_RUN_FUNCTIONAL_TESTS="no"])
 
@@ -542,8 +542,8 @@ AS_IF([test "x${RKT_RUN_FUNCTIONAL_TESTS}" = 'xyes' -o "x${RKT_RUN_FUNCTIONAL_TE
                            [AS_IF([systemctl 2>/dev/null | grep --silent -e '-\.mount'],
                                   dnl systemd runs as init
                                   [sdv=`systemctl --version | head -1 | sed -e 's/^systemd \(@<:@0-9@:>@*\)$/\1/'`
-                                   AS_IF([test ${sdv} -lt 220],
-                                         [rkt_functional_tests_msg="Cannot run functional tests with ${RKT_STAGE1_DEFAULT_FLAVOR} stage1 flavor - systemd version on host is lower than 220 (currently running ${sdv})"])],
+                                   AS_IF([test ${sdv} -lt 227],
+                                         [rkt_functional_tests_msg="Cannot run functional tests with ${RKT_STAGE1_DEFAULT_FLAVOR} stage1 flavor - systemd version on host is lower than 227 (currently running ${sdv})"])],
                                   dnl systemd is not an init
                                   [rkt_functional_tests_msg="Cannot run functional tests with ${RKT_STAGE1_DEFAULT_FLAVOR} stage1 flavor - no systemd on host"])])])
       dnl gpg is required for functional tests

From 01e85a59f147c4e4be80fa9027c60deb1346bbe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 10 Aug 2016 14:39:14 +0200
Subject: [PATCH 0638/1304] functional tests: skip TestSocketProxyd

This test is currently racy. The socket-activated proxyd service depends
on a rkt service being ready. However, the application that runs inside
rkt doesn't have a way to signal when it's ready because of
https://github.com/coreos/rkt/issues/1464. Instead, systemd assumes it's
ready when the container starts, which is wrong, because the application
inside might not be listening on the port yet. This makes the test fail.

It fails a lot particularly in Fedora Rawhide with the flavor host:

https://jenkins-rkt-public.prod.coreos.systems/job/rkt-master-periodic/os_type=fedora-rawhide,stage1_flavor=host/

We can re-enable it when we fix https://github.com/coreos/rkt/issues/1464.
---
 tests/rkt_socket_proxyd_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
index 0a4ffde23a..78c361d4d0 100644
--- a/tests/rkt_socket_proxyd_test.go
+++ b/tests/rkt_socket_proxyd_test.go
@@ -34,6 +34,11 @@ import (
 )
 
 func TestSocketProxyd(t *testing.T) {
+	// Skip the test for now. See
+	// https://github.com/coreos/rkt/issues/2432#issuecomment-238858840 for
+	// details.
+	t.Skip("this test is racy, let's skip it until we fix it")
+
 	if !sd_util.IsRunningSystemd() {
 		t.Skip("Systemd is not running on the host.")
 	}

From c9d6f3a352239017c06ec12282fba305b7ccee25 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Mon, 8 Aug 2016 15:17:41 +0200
Subject: [PATCH 0639/1304] build: Stop printing irrelevant invalidation
 messages

The invalidation messages were printed when Makefile was parsed and we
may be interested in them only when we actually want to build the
invalidated target.
---
 tools/depsgen/mkfile.go | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/tools/depsgen/mkfile.go b/tools/depsgen/mkfile.go
index a384f42e2a..75ed13d85d 100644
--- a/tools/depsgen/mkfile.go
+++ b/tools/depsgen/mkfile.go
@@ -41,13 +41,16 @@ ifeq ($(_DEPS_GEN_F1_),$(_DEPS_GEN_F2_))
 
 else
 
-$(info Invalidating !!!DEPS_GEN_TARGET!!!)
-$(info Prerequisites stored in deps file that are not in currently on disk: $(filter-out $(_DEPS_GEN_F2_),$(_DEPS_GEN_F1_)))
-$(info Prerequisites currently on disk that are not stored in deps file: $(filter-out $(_DEPS_GEN_F1_),$(_DEPS_GEN_F2_)))
-
-# invalidate the target
-!!!DEPS_GEN_TARGET!!!: _DEPS_GEN_INVALIDATE_
-.PHONY: _DEPS_GEN_INVALIDATE_
+$(foreach t,!!!DEPS_GEN_TARGET!!!, \
+	$(eval _DEPS_GEN_RL_INVALIDATE_ := _DEPS_GEN_RL_$(call escape-for-file,$t)_INVALIDATE_) \
+	$(call add-dependency,$t,$(_DEPS_GEN_RL_INVALIDATE_)) \
+	$(call generate-strict-rule,$(_DEPS_GEN_RL_INVALIDATE_),,, \
+		$(call vb,v2,INVALIDATE,$(call vsp,$t)) \
+		$(call v3,echo Invalidating $t;) \
+		$(call v3,echo Prerequisites stored in deps file that are not in currently on disk: $(filter-out $(_DEPS_GEN_F2_),$(_DEPS_GEN_F1_));) \
+		$(call v3,echo Prerequisites currently on disk that are not stored in deps file: $(filter-out $(_DEPS_GEN_F1_),$(_DEPS_GEN_F2_));)) \
+	$(call add-dependency,.PHONY,$(_DEPS_GEN_RL_INVALIDATE_)) \
+	$(call undefine-namespaces,_DEPS_GEN_RL))
 
 endif
 
@@ -73,15 +76,18 @@ $(foreach v,$(_DEPS_GEN_VARIABLES_), \
 
 ifeq ($(_DEPS_GEN_DO_INVALIDATE_),yes)
 
-$(info Invalidating !!!DEPS_GEN_TARGET!!!)
-$(foreach k,$(_DEPS_GEN_DIFFS_), \
-        $(info Differing key: $k) \
-        $(info Value stored in deps file: $(!!!DEPS_GEN_STORED_PREFIX!!!$k)) \
-        $(info Value currently used: $($k)))
-
-# invalidate the target
-!!!DEPS_GEN_TARGET!!!: _DEPS_GEN_INVALIDATE_
-.PHONY: _DEPS_GEN_INVALIDATE_
+$(foreach t,!!!DEPS_GEN_TARGET!!!, \
+	$(eval _DEPS_GEN_RL_INVALIDATE_ := _DEPS_GEN_RL_$(call escape-for-file,$t)_INVALIDATE_KV_) \
+	$(call add-dependency,$t,$(_DEPS_GEN_RL_INVALIDATE_)) \
+	$(call generate-strict-rule,$(_DEPS_GEN_RL_INVALIDATE_),,, \
+		$(call vb,v2,INVALIDATE,$(call vsp,$t)) \
+		$(call v3,echo Invalidating $t;) \
+		$(call v3,$(foreach k,$(_DEPS_GEN_DIFFS_), \
+			echo Differing key: $k; \
+			echo Value stored in deps file: $(!!!DEPS_GEN_STORED_PREFIX!!!$k); \
+			echo Value currently used: $($k);))) \
+	$(call add-dependency,.PHONY,$(_DEPS_GEN_RL_INVALIDATE_)) \
+	$(call undefine-namespaces,_DEPS_GEN_RL))
 
 endif
 

From 0b959028709b40a7595a937d566a64efe0bb229d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 10 Aug 2016 17:28:05 +0200
Subject: [PATCH 0640/1304] README: fix Jenkins badge

Now that test pass on the periodic master build, let's use that for the
Jenkins badge.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b3961d3a39..955ecad78d 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![godoc](https://godoc.org/github.com/coreos/rkt?status.svg)](http://godoc.org/github.com/coreos/rkt)
 [![Build Status (Travis)](https://travis-ci.org/coreos/rkt.svg?branch=master)](https://travis-ci.org/coreos/rkt)
 [![Build Status (SemaphoreCI)](https://semaphoreci.com/api/v1/projects/28468e19-4fd0-483e-9c29-6c8368661333/395211/badge.svg)](https://semaphoreci.com/coreos/rkt)
-[![Build Status (Jenkins)](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-github-ci/badge/icon)](https://jenkins-rkt-public.prod.coreos.systems/view/rkt/job/rkt-github-ci/)
+[![Build Status (Jenkins)](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-master-periodic/badge/icon)](https://jenkins-rkt-public.prod.coreos.systems/view/rkt/job/rkt-master-periodic/)
 
 ![rkt Logo](logos/rkt-horizontal-color.png)
 

From e8f760129fedf48d2b0c9258cff509c41968090b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 3 Aug 2016 12:17:59 +0200
Subject: [PATCH 0641/1304] stage1/init: set DevicePolicy to closed

This forbids creating and reading/writing to arbitrary device nodes.
---
 common/cgroup/cgroup.go   | 5 +++--
 stage1/init/common/pod.go | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index 6211d4d528..a9fa04ef06 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -41,8 +41,9 @@ var (
 		"memory": addMemoryLimit,
 	}
 	cgroupControllerRWFiles = map[string][]string{
-		"memory": {"memory.limit_in_bytes"},
-		"cpu":    {"cpu.cfs_quota_us"},
+		"memory":  {"memory.limit_in_bytes"},
+		"cpu":     {"cpu.cfs_quota_us"},
+		"devices": {"devices.allow", "devices.deny"},
 	}
 )
 
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 67a6c3eb5a..ba6d1dc3e7 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -451,6 +451,7 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		// systemd unit name not getting written to the journal if the unit is
 		// short-lived and runs as non-root.
 		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
+		unit.NewUnitOption("Service", "DevicePolicy", "closed"),
 	}
 
 	if !insecureOptions.DisableCapabilities {

From c0b0f1e9ba2edd6e37ef7dba62a4a223ab2a3315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 3 Aug 2016 18:53:16 +0200
Subject: [PATCH 0642/1304] stage1/init,prepare_app: allow devices in volumes

Use `DeviceAllow=` to allow accessing to devices that are in volumes.

Since systemd requires the device to start with `/dev` we need to do
some tricks to make it work.

The device won't exist inside the container so for a given mount, if the
volume is a device node, we create a symlink to the mount target in
`/rkt/volumes`. Later, prepare-app copies the links in `/rkt/volumes` to
`/dev/.rkt/` which is what we write in `DeviceAllow=`
---
 pkg/fileutil/fileutil.go         | 11 +++++
 stage1/init/common/pod.go        | 79 +++++++++++++++++++++++++++++---
 stage1/prepare-app/prepare-app.c | 46 +++++++++++++++++++
 3 files changed, 129 insertions(+), 7 deletions(-)

diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go
index ec4b234d13..94c91da751 100644
--- a/pkg/fileutil/fileutil.go
+++ b/pkg/fileutil/fileutil.go
@@ -238,3 +238,14 @@ func IsExecutable(path string) bool {
 	}
 	return false
 }
+
+// IsDeviceNode checks if the given path points to a block or char device.
+// It doesn't follow symlinks.
+func IsDeviceNode(path string) bool {
+	d, err := os.Lstat(path)
+	if err == nil {
+		m := d.Mode()
+		return m&os.ModeDevice == os.ModeDevice || m&os.ModeCharDevice == os.ModeCharDevice
+	}
+	return false
+}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index ba6d1dc3e7..678e0250e3 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -372,6 +372,63 @@ func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App,
 	return binPath, nil
 }
 
+// generateDeviceAllows generates a DeviceAllow= line for an app.
+// To make it work, the path needs to start with "/dev" but the device won't
+// exist inside the container. So for a given mount, if the volume is a device
+// node, we create a symlink to its target in "/rkt/volumes". Later,
+// prepare-app will copy those to "/dev/.rkt/" so that's what we use in the
+// DeviceAllow= line.
+func generateDeviceAllows(root string, appName types.ACName, mountPoints []types.MountPoint, mounts []mountWrapper, vols map[types.ACName]types.Volume, uidRange *user.UidRange) ([]string, error) {
+	var devAllow []string
+	var toShift []string
+
+	rktVolumeLinksPath := filepath.Join(root, "rkt", "volumes")
+	if err := os.MkdirAll(rktVolumeLinksPath, 0600); err != nil {
+		return nil, err
+	}
+	toShift = append(toShift, rktVolumeLinksPath)
+
+	for _, m := range mounts {
+		v := vols[m.Volume]
+		if v.Kind == "host" {
+			if fileutil.IsDeviceNode(v.Source) {
+				mode := "r"
+				if !IsMountReadOnly(v, mountPoints) {
+					mode += "w"
+				}
+
+				tgt := filepath.Join(common.RelAppRootfsPath(appName), m.Path)
+				// the DeviceAllow= line needs the link path in /dev/.rkt/
+				linkRel := filepath.Join("/dev/.rkt", v.Name.String())
+				// the real link should be in /rkt/volumes for now
+				link := filepath.Join(rktVolumeLinksPath, v.Name.String())
+
+				err := os.Symlink(tgt, link)
+				switch {
+				case err == nil:
+					toShift = append(toShift, link)
+				case os.IsExist(err):
+					// it already exists, do nothing
+				default:
+					return nil, err
+				}
+
+				devAllow = append(devAllow, linkRel+" "+mode)
+			}
+		}
+	}
+
+	if uidRange.Shift != 0 && uidRange.Count != 0 {
+		for _, f := range toShift {
+			if err := os.Chown(f, int(uidRange.Shift), int(uidRange.Shift)); err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	return devAllow, nil
+}
+
 // appToSystemd transforms the provided RuntimeApp+ImageManifest into systemd units
 func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive bool, flavor string, privateUsers string, insecureOptions Stage1InsecureOptions) error {
 	app := ra.App
@@ -451,18 +508,12 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		// systemd unit name not getting written to the journal if the unit is
 		// short-lived and runs as non-root.
 		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
-		unit.NewUnitOption("Service", "DevicePolicy", "closed"),
 	}
 
 	if !insecureOptions.DisableCapabilities {
 		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
 	}
 
-	// Restrict access to sensitive paths (eg. procfs)
-	if !insecureOptions.DisablePaths {
-		opts = protectSystemFiles(opts, appName)
-	}
-
 	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
 
 	// Apply seccomp isolator, if any and not opt-ing out;
@@ -503,7 +554,8 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 
 	rwDirs := []string{}
 	imageManifest := p.Images[appName.String()]
-	for _, m := range GenerateMounts(ra, vols, imageManifest) {
+	mounts := GenerateMounts(ra, vols, imageManifest)
+	for _, m := range mounts {
 		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Path)
 		if err != nil {
 			return err
@@ -514,6 +566,19 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		}
 	}
 
+	// Restrict access to sensitive paths (eg. procfs) and devices
+	if !insecureOptions.DisablePaths {
+		opts = protectSystemFiles(opts, appName)
+		opts = append(opts, unit.NewUnitOption("Service", "DevicePolicy", "closed"))
+		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(absRoot), appName, app.MountPoints, mounts, vols, uidRange)
+		if err != nil {
+			return err
+		}
+		for _, dev := range deviceAllows {
+			opts = append(opts, unit.NewUnitOption("Service", "DeviceAllow", dev))
+		}
+	}
+
 	opts = append(opts, unit.NewUnitOption("Service", "ReadWriteDirectories", strings.Join(rwDirs, " ")))
 
 	if interactive {
diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 7150b4eace..7420eb35a1 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -230,6 +230,47 @@ static void mount_sys(const char *root)
 	mount_at(root, &sys_bind);
 }
 
+static void copy_volume_symlinks()
+{
+	DIR *volumes_dir;
+	struct dirent *de;
+	const char *rkt_volume_links_path = "/rkt/volumes";
+	const char *dev_rkt_path = "/dev/.rkt";
+
+	pexit_if(mkdir(dev_rkt_path, 0700) == -1 && errno != EEXIST,
+		"Failed to create directory \"%s\"", dev_rkt_path);
+
+	pexit_if((volumes_dir = opendir(rkt_volume_links_path)) == NULL && errno != ENOENT,
+                 "Failed to open directory \"%s\"", rkt_volume_links_path);
+	while (volumes_dir) {
+		errno = 0;
+		if ((de = readdir(volumes_dir)) != NULL) {
+			char *link_path;
+			char *new_link;
+			char target[4096] = {0,};
+
+			if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, ".."))
+			  continue;
+
+			exit_if(asprintf(&link_path, "%s/%s", rkt_volume_links_path, de->d_name) == -1,
+				"Calling asprintf failed");
+			exit_if(asprintf(&new_link, "%s/%s", dev_rkt_path, de->d_name) == -1,
+				"Calling asprintf failed");
+
+			pexit_if(readlink(link_path, target, sizeof(target)) == -1,
+				 "Error reading \"%s\" link", link_path);
+			pexit_if(symlink(target, new_link) == -1 && errno != EEXIST,
+				"Failed to create volume symlink \"%s\"", new_link);
+		} else {
+			pexit_if(errno != 0,
+				"Error reading \"%s\" directory", rkt_volume_links_path);
+			pexit_if(closedir(volumes_dir),
+				 "Error closing \"%s\" directory", rkt_volume_links_path);
+			return;
+		}
+	}
+}
+
 int main(int argc, char *argv[])
 {
 	static const char *unlink_paths[] = {
@@ -396,6 +437,11 @@ int main(int argc, char *argv[])
 	pexit_if(symlink("/dev/pts/ptmx", to) == -1 && errno != EEXIST,
 		"Failed to create /dev/ptmx symlink");
 
+	/* Copy symlinks to device node volumes to "/dev/.rkt" so they can be
+	 * used in the DeviceAllow= option of the app's unit file (systemd
+	 * needs the path to start with "/dev". */
+	copy_volume_symlinks();
+
 	/* /dev/log -> /run/systemd/journal/dev-log */
 	exit_if(snprintf(to, sizeof(to), "%s/dev/log", root) >= sizeof(to),
 		"Path too long: \"%s\"", to);

From da8521093b4bdbacb5e05c9da0249dd75574b717 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 2 Aug 2016 20:11:33 +0200
Subject: [PATCH 0643/1304] tests: new tests for mknod

This tests that the app is allowed to mknod /dev/null but is not allowed
to mknod /dev/loop-control or /dev/ptmx.
---
 tests/inspect/inspect.go | 42 +++++++++++++++++++++++++
 tests/rkt_mknod_test.go  | 67 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 tests/rkt_mknod_test.go

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 5b33d085ca..3e898e1935 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -32,6 +32,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
+	"github.com/appc/spec/pkg/device"
 	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/tests/testutils"
 	"github.com/syndtr/gocapability/capability"
@@ -78,6 +79,7 @@ var (
 		SilentSigterm      bool
 		CheckMountNS       bool
 		PrintNoNewPrivs    bool
+		CheckMknod         string
 	}{}
 )
 
@@ -120,6 +122,7 @@ func init() {
 	globalFlagset.BoolVar(&globalFlags.SilentSigterm, "silent-sigterm", false, "Exit with a success exit status if we receive SIGTERM")
 	globalFlagset.BoolVar(&globalFlags.CheckMountNS, "check-mountns", false, "Check if app's mount ns is different than stage1's. Requires CAP_SYS_PTRACE")
 	globalFlagset.BoolVar(&globalFlags.PrintNoNewPrivs, "print-no-new-privs", false, "print the prctl PR_GET_NO_NEW_PRIVS value")
+	globalFlagset.StringVar(&globalFlags.CheckMknod, "check-mknod", "", "check whether mknod on restricted devices is allowed")
 }
 
 func in(list []int, el int) bool {
@@ -149,6 +152,45 @@ func main() {
 		fmt.Printf("no_new_privs: %v err: %v\n", r1, err)
 	}
 
+	if globalFlags.CheckMknod != "" {
+		/* format: c:5:2:name */
+		dev := strings.SplitN(globalFlags.CheckMknod, ":", 4)
+		if len(dev) != 4 {
+			fmt.Fprintln(os.Stderr, "Wrong parameter for mknod")
+			os.Exit(1)
+		}
+		typ := dev[0]
+		major, err := strconv.Atoi(dev[1])
+		if err != nil {
+			fmt.Fprintln(os.Stderr, "Wrong major")
+			os.Exit(1)
+		}
+		minor, err := strconv.Atoi(dev[2])
+		if err != nil {
+			fmt.Fprintln(os.Stderr, "Wrong minor")
+			os.Exit(1)
+		}
+		nodeName := dev[3]
+
+		majorMinor := device.Makedev(uint(major), uint(minor))
+		mode := uint32(0777)
+		switch typ {
+		case "c":
+			mode |= syscall.S_IFCHR
+		case "b":
+			mode |= syscall.S_IFBLK
+		default:
+			fmt.Fprintln(os.Stderr, "Wrong device node type")
+			os.Exit(1)
+		}
+
+		if err := syscall.Mknod(nodeName, mode, int(majorMinor)); err != nil {
+			fmt.Printf("mknod %s: fail: %v\n", nodeName, err)
+		} else {
+			fmt.Printf("mknod %s: succeed\n", nodeName)
+		}
+	}
+
 	if globalFlags.SilentSigterm {
 		terminateCh := make(chan os.Signal, 1)
 		signal.Notify(terminateCh, syscall.SIGTERM)
diff --git a/tests/rkt_mknod_test.go b/tests/rkt_mknod_test.go
new file mode 100644
index 0000000000..f597e1ec13
--- /dev/null
+++ b/tests/rkt_mknod_test.go
@@ -0,0 +1,67 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src
+
+package main
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestMknod(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	image := getInspectImagePath()
+
+	for _, tt := range []struct {
+		rktParam string
+		expect   string
+	}{
+		/* There should be no restriction on /dev/null */
+		{
+			rktParam: "--check-mknod=c:1:3:/null",
+			expect:   "mknod /null: succeed",
+		},
+
+		/* Test the old ptmx device node, before devpts filesystem
+		 * existed. It should be blocked. Containers should use the new
+		 * ptmx from devpts instead. It is created with
+		 * "mknod name c 5 2" according to:
+		 * https://github.com/torvalds/linux/blob/master/Documentation/filesystems/devpts.txt
+		 */
+		{
+			rktParam: "--check-mknod=c:5:2:/ptmx",
+			expect:   "mknod /ptmx: fail",
+		},
+
+		/* /dev/loop-control has major:minor 10:237 according to:
+		 * https://github.com/torvalds/linux/blob/master/Documentation/devices.txt#L424
+		 */
+		{
+			rktParam: "--check-mknod=c:10:237:/loop-control",
+			expect:   "mknod /loop-control: fail",
+		},
+	} {
+		rktCmd := fmt.Sprintf(
+			"%s --debug --insecure-options=image run %s --exec=/inspect -- %s",
+			ctx.Cmd(), image, tt.rktParam)
+
+		runRktAndCheckOutput(t, rktCmd, tt.expect, false)
+	}
+}

From a04b6759857258a38dbc786398490f4663dcc23f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 4 Aug 2016 14:21:59 +0200
Subject: [PATCH 0644/1304] functional tests: improve devices tests

Test mounting a device, we should be able to read it.

Test --insecure-options=paths, it should allow creating and accessing
any device nodes.

Also, change the name from TestMknod to TestDevices since we're not only
doing mknods anymore.
---
 tests/inspect/inspect.go  |   8 ++-
 tests/rkt_devices_test.go | 115 ++++++++++++++++++++++++++++++++++++++
 tests/rkt_mknod_test.go   |  67 ----------------------
 3 files changed, 120 insertions(+), 70 deletions(-)
 create mode 100644 tests/rkt_devices_test.go
 delete mode 100644 tests/rkt_mknod_test.go

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 3e898e1935..629acc652e 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -155,8 +155,8 @@ func main() {
 	if globalFlags.CheckMknod != "" {
 		/* format: c:5:2:name */
 		dev := strings.SplitN(globalFlags.CheckMknod, ":", 4)
-		if len(dev) != 4 {
-			fmt.Fprintln(os.Stderr, "Wrong parameter for mknod")
+		if len(dev) < 4 {
+			fmt.Fprintln(os.Stderr, "Not enough parameters for mknod")
 			os.Exit(1)
 		}
 		typ := dev[0]
@@ -185,9 +185,11 @@ func main() {
 		}
 
 		if err := syscall.Mknod(nodeName, mode, int(majorMinor)); err != nil {
-			fmt.Printf("mknod %s: fail: %v\n", nodeName, err)
+			fmt.Fprintf(os.Stderr, "mknod %s: fail: %v\n", nodeName, err)
+			os.Exit(1)
 		} else {
 			fmt.Printf("mknod %s: succeed\n", nodeName)
+			os.Exit(0)
 		}
 	}
 
diff --git a/tests/rkt_devices_test.go b/tests/rkt_devices_test.go
new file mode 100644
index 0000000000..a78f5ed821
--- /dev/null
+++ b/tests/rkt_devices_test.go
@@ -0,0 +1,115 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src
+
+package main
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestDevices(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	image := getInspectImagePath()
+
+	for _, tt := range []struct {
+		rktArgs        string
+		rktAppArgs     string
+		execArgs       string
+		expectedOutput string
+		expectErr      bool
+	}{
+		/* There should be no restriction on /dev/null */
+		{
+			rktArgs:        "--insecure-options=image",
+			rktAppArgs:     "",
+			execArgs:       "--check-mknod=c:1:3:/null",
+			expectedOutput: "mknod /null: succeed",
+			expectErr:      false,
+		},
+
+		/* Test the old ptmx device node, before devpts filesystem
+		 * existed. It should be blocked. Containers should use the new
+		 * ptmx from devpts instead. It is created with
+		 * "mknod name c 5 2" according to:
+		 * https://github.com/torvalds/linux/blob/master/Documentation/filesystems/devpts.txt
+		 */
+		{
+			rktArgs:        "--insecure-options=image",
+			rktAppArgs:     "",
+			execArgs:       "--check-mknod=c:5:2:/ptmx",
+			expectedOutput: "mknod /ptmx: fail",
+			expectErr:      true,
+		},
+
+		/* /dev/loop-control has major:minor 10:237 according to:
+		 * https://github.com/torvalds/linux/blob/master/Documentation/devices.txt#L424
+		 */
+		{
+			rktArgs:        "--insecure-options=image",
+			rktAppArgs:     "",
+			execArgs:       "--check-mknod=c:10:237:/loop-control",
+			expectedOutput: "mknod /loop-control: fail",
+			expectErr:      true,
+		},
+
+		/* We should be able to create /dev/loop-control with the paths
+		 * insecure option.
+		 */
+		{
+			rktArgs:        "--insecure-options=image,paths",
+			rktAppArgs:     "",
+			execArgs:       "--check-mknod=c:10:237:/loop-control",
+			expectedOutput: "mknod /loop-control: succeed",
+			expectErr:      false,
+		},
+
+		/* Test mounting /dev/loop-control. We should be able to access it
+		 * without the paths insecure option. It should return "invalid
+		 * argument" instead of "operation not permitted".
+		 */
+		{
+			rktArgs:        "--insecure-options=image --volume loopcontrol,kind=host,source=/dev/loop-control --set-env=FILE=/tmp/loop-control",
+			rktAppArgs:     "--mount volume=loopcontrol,target=/tmp/loop-control",
+			execArgs:       "--read-file",
+			expectedOutput: `Cannot read file "/tmp/loop-control": read /tmp/loop-control: invalid argument`,
+			expectErr:      true,
+		},
+
+		/* Test mounting /dev/loop-control. We should be able to create
+		 * other devices with mknod with the paths insecure option.
+		 * Let's try the old ptmx device again.
+		 */
+		{
+			rktArgs:        "--insecure-options=image,paths --volume loopcontrol,kind=host,source=/dev/loop-control --set-env=FILE=/tmp/loop-control",
+			rktAppArgs:     "--mount volume=loopcontrol,target=/tmp/loop-control",
+			execArgs:       "--check-mknod=c:5:2:/ptmx",
+			expectedOutput: "mknod /ptmx: succeed",
+			expectErr:      false,
+		},
+	} {
+		rktCmd := fmt.Sprintf(
+			"%s --debug run %s %s %s --exec=/inspect -- %s",
+			ctx.Cmd(), tt.rktArgs, image, tt.rktAppArgs, tt.execArgs)
+		t.Logf("Running %s", rktCmd)
+
+		runRktAndCheckOutput(t, rktCmd, tt.expectedOutput, tt.expectErr)
+	}
+}
diff --git a/tests/rkt_mknod_test.go b/tests/rkt_mknod_test.go
deleted file mode 100644
index f597e1ec13..0000000000
--- a/tests/rkt_mknod_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2016 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build host coreos src
-
-package main
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/coreos/rkt/tests/testutils"
-)
-
-func TestMknod(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	image := getInspectImagePath()
-
-	for _, tt := range []struct {
-		rktParam string
-		expect   string
-	}{
-		/* There should be no restriction on /dev/null */
-		{
-			rktParam: "--check-mknod=c:1:3:/null",
-			expect:   "mknod /null: succeed",
-		},
-
-		/* Test the old ptmx device node, before devpts filesystem
-		 * existed. It should be blocked. Containers should use the new
-		 * ptmx from devpts instead. It is created with
-		 * "mknod name c 5 2" according to:
-		 * https://github.com/torvalds/linux/blob/master/Documentation/filesystems/devpts.txt
-		 */
-		{
-			rktParam: "--check-mknod=c:5:2:/ptmx",
-			expect:   "mknod /ptmx: fail",
-		},
-
-		/* /dev/loop-control has major:minor 10:237 according to:
-		 * https://github.com/torvalds/linux/blob/master/Documentation/devices.txt#L424
-		 */
-		{
-			rktParam: "--check-mknod=c:10:237:/loop-control",
-			expect:   "mknod /loop-control: fail",
-		},
-	} {
-		rktCmd := fmt.Sprintf(
-			"%s --debug --insecure-options=image run %s --exec=/inspect -- %s",
-			ctx.Cmd(), image, tt.rktParam)
-
-		runRktAndCheckOutput(t, rktCmd, tt.expect, false)
-	}
-}

From e1f1986dc101d4b990c6ded608d82bc86741977c Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Thu, 11 Aug 2016 15:37:38 +0200
Subject: [PATCH 0645/1304] build: Make generating clean files simpler to do

This adds two functions. One takes a filelist and a directory map and
generates the clean files based on them. The other one takes the
directory, dependencies and the directory map, generates the filelist
based on a directory after the passed dependencies were met and then
generates the clean file based on the generated filelist and the
directory map.

The former is useful for just removing some directory with contents
generated during build. The latter is useful when we want to generate
the filelist ourselves, because the filelist will be used also for
something else (like defining dependencies).
---
 makelib/misc.mk | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/makelib/misc.mk b/makelib/misc.mk
index da8f51015e..e8b69b5c60 100644
--- a/makelib/misc.mk
+++ b/makelib/misc.mk
@@ -469,6 +469,52 @@ define add-dependency
 $(eval $(call add-dependency-template,$1,$2))
 endef
 
+# 1 - stamp file, which will depend on the generated clean stamp
+# 2 - file list
+# 3 - a list of directory mappings
+# 4 - descriptor
+define generate-clean-mk-from-filelist
+$(strip \
+	$(eval _MISC_GCMFF_MAIN_STAMP_ := $(strip $1)) \
+	$(eval _MISC_GCMFF_FILELIST_ := $(strip $2)) \
+	$(eval _MISC_GCMFF_DIR_MAPS_ := $(strip $3)) \
+	$(eval _MISC_GCMFF_DESCRIPTOR_ := $(strip $4)) \
+	\
+	$(call setup-stamp-file,_MISC_GCMFF_CLEAN_STAMP_,$(_MISC_GCMFF_DESCRIPTOR_)-gcmff-generated-clean-stamp) \
+	$(call setup-clean-file,_MISC_GCMFF_CLEANMK_,$(_MISC_GCMFF_DESCRIPTOR_)-gcmff-generated-cleanmk) \
+	\
+	$(call add-dependency,$(_MISC_GCMFF_MAIN_STAMP_),$(_MISC_GCMFF_CLEAN_STAMP_)) \
+	$(call generate-clean-mk,$(_MISC_GCMFF_CLEAN_STAMP_),$(_MISC_GCMFF_CLEANMK_),$(_MISC_GCMFF_FILELIST_),$(_MISC_GCMFF_DIR_MAPS_)) \
+	\
+	$(call undefine-namespaces,_MISC_GCMFF))
+endef
+
+# 1 - stamp file, which will depend on the generated clean stamp
+# 2 - source directory
+# 3 - a list of directory mappings
+# 4 - filelist deps
+# 5 - descriptor
+define generate-clean-mk-simple
+$(strip \
+	$(eval _MISC_GCMS_MAIN_STAMP_ := $(strip $1)) \
+	$(eval _MISC_GCMS_SRCDIR_ := $(strip $2)) \
+	$(eval _MISC_GCMS_DIR_MAPS_ := $(strip $3)) \
+	$(eval _MISC_GCMS_DEPS_ := $(strip $4)) \
+	$(eval _MISC_GCMS_DESCRIPTOR_ := $(strip $5)) \
+	\
+	$(call setup-filelist-file,_MISC_GCMS_FILELIST_,$(_MISC_GCMS_DESCRIPTOR_)-gcms-generated-filelist) \
+	$(call add-dependency,$(_MISC_GCMS_FILELIST_),$(_MISC_GCMS_DEPS_)) \
+	$(call generate-deep-filelist,$(_MISC_GCMS_FILELIST_),$(_MISC_GCMS_SRCDIR_)) \
+	\
+	$(call generate-clean-mk-from-filelist, \
+		$(_MISC_GCMS_MAIN_STAMP_), \
+		$(_MISC_GCMS_FILELIST_), \
+		$(_MISC_GCMS_DIR_MAPS_), \
+		$(_MISC_GCMS_DESCRIPTOR_)) \
+	\
+	$(call undefine-namespaces,_MISC_GCMS))
+endef
+
 # Formats given lists of source and destination files for the
 # INSTALL_FILES variable.
 #

From 2bc2d2ec5c754627137451f6c67fd615e361eb2c Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Thu, 11 Aug 2016 15:49:09 +0200
Subject: [PATCH 0646/1304] build: Use new functions for generating clean files

---
 stage1/find-so-deps.mk              | 26 ++++-----
 stage1/usr_from_coreos/build-usr.mk | 22 ++++----
 stage1/usr_from_kvm/kernel.mk       | 36 ++++++------
 stage1/usr_from_kvm/lkvm.mk         | 18 +++---
 stage1/usr_from_src/usr_from_src.mk | 85 +++++++++++------------------
 5 files changed, 77 insertions(+), 110 deletions(-)

diff --git a/stage1/find-so-deps.mk b/stage1/find-so-deps.mk
index d9b53443d8..4b63a929a7 100644
--- a/stage1/find-so-deps.mk
+++ b/stage1/find-so-deps.mk
@@ -8,10 +8,6 @@
 SLD_FLAVOR := $(STAGE1_FSD_FLAVOR)
 $(call inc-one,stdlibdirs.mk)
 
-# a clean file for removing solibs in both the ACI rootfs and the tmp
-# lib dir.
-$(call setup-clean-file,STAGE1_FSD_SOLIBS_CLEANMK,/$(STAGE1_FSD_FLAVOR)-solibs)
-
 # temporary directory
 $(call setup-tmp-dir,STAGE1_FSD_TMPDIR)
 
@@ -24,10 +20,6 @@ STAGE1_FSD_LIBSDIR := $(STAGE1_FSD_TMPDIR)/libs-$(STAGE1_FSD_FLAVOR)
 $(call setup-stamp-file,STAGE1_FSD_STAMP,$(STAGE1_FSD_FLAVOR))
 # this stamp makes sure that libs were copied
 $(call setup-stamp-file,STAGE1_FSD_COPY_STAMP,/$(STAGE1_FSD_FLAVOR)-fsd_copy)
-# this stamp makes sure that clean file was generated
-$(call setup-stamp-file,STAGE1_FSD_CLEAN_STAMP,/$(STAGE1_FSD_FLAVOR)-fsd_clean)
-# filelist of all copied libs
-$(call setup-filelist-file,STAGE1_FSD_FILELIST,/$(STAGE1_FSD_FLAVOR)-fsd)
 
 # the ACI rootfs for given flavor
 STAGE1_FSD_ACIROOTFSDIR := $(STAGE1_ACIROOTFSDIR_$(STAGE1_FSD_FLAVOR))
@@ -54,7 +46,7 @@ endif
 INSTALL_DIRS += $(STAGE1_FSD_LIBSDIR):-
 
 # this makes sure that everything is done
-$(call generate-stamp-rule,$(STAGE1_FSD_STAMP),$(STAGE1_FSD_COPY_STAMP) $(STAGE1_FSD_CLEAN_STAMP))
+$(call generate-stamp-rule,$(STAGE1_FSD_STAMP),$(STAGE1_FSD_COPY_STAMP))
 
 # this detects which libs need to be copied and copies them into two
 # places - the libdirs in the ACI rootfs and a temporary directory at
@@ -67,13 +59,15 @@ $(call generate-stamp-rule,$(STAGE1_FSD_COPY_STAMP),$(STAGE1_FSD_ALL_STAMPS),$(S
 		$(INSTALL) -D "$$$${f}" "$(STAGE1_FSD_LIBSDIR)$$$${f}"; \
 	done)
 
-# This filelist can be generated only after the files were copied.
-$(STAGE1_FSD_FILELIST): $(STAGE1_FSD_COPY_STAMP)
-$(call generate-deep-filelist,$(STAGE1_FSD_FILELIST),$(STAGE1_FSD_LIBSDIR))
-
-# Generate clean.mk file cleaning libraries copied from the host to
-# both the temporary directory and the ACI rootfs directory.
-$(call generate-clean-mk,$(STAGE1_FSD_CLEAN_STAMP),$(STAGE1_FSD_SOLIBS_CLEANMK),$(STAGE1_FSD_FILELIST),$(STAGE1_FSD_LIBSDIR) $(STAGE1_FSD_ACIROOTFSDIR))
+# Generate clean file cleaning libraries copied from the host to both
+# the temporary directory and the ACI rootfs directory. Can happen
+# only after the files were copied.
+$(call generate-clean-mk-simple, \
+	$(STAGE1_FSD_STAMP), \
+	$(STAGE1_FSD_LIBSDIR), \
+	$(STAGE1_FSD_LIBSDIR) $(STAGE1_FSD_ACIROOTFSDIR), \
+	$(STAGE1_FSD_COPY_STAMP), \
+	libs-cleanup)
 
 # STAGE1_FSD_STAMP is deliberately not cleared - it will be used in
 # stage1.mk to create the stage1.aci dependency on the stamp.
diff --git a/stage1/usr_from_coreos/build-usr.mk b/stage1/usr_from_coreos/build-usr.mk
index a32a7447f3..64cf3176ca 100644
--- a/stage1/usr_from_coreos/build-usr.mk
+++ b/stage1/usr_from_coreos/build-usr.mk
@@ -58,11 +58,6 @@ $(call setup-dep-file,CBU_MANIFEST_DEPMK,$(CBU_DIFF)-manifest)
 $(call setup-stamp-file,CBU_TMPROOTFS_DEPMK_STAMP,$(CBU_DIFF)-tmprootfs-deps)
 $(call setup-dep-file,CBU_TMPROOTFS_DEPMK,$(CBU_DIFF)-tmprootfs)
 
-# Stamp and clean file for cleaning partially ACI rootfs and whole tmp
-# rootfs.
-$(call setup-stamp-file,CBU_ROOTFS_CLEAN_STAMP,$(CBU_DIFF)-rootfs-clean)
-$(call setup-clean-file,CBU_ROOTFSDIR_CLEANMK,$(CBU_DIFF)-rootfs)
-
 # Filelist for stuff taken from squashfs - it is more detailed when
 # compared to complete manifest.
 $(call setup-filelist-file,CBU_DETAILED_FILELIST,$(CBU_DIFF)-acirootfs)
@@ -83,11 +78,10 @@ $(call setup-dep-file,CBU_ACIROOTFS_SYMLINKS_KV_DEPMK,$(CBU_DIFF)-acirootfs-syml
 $(call setup-stamp-file,CBU_ACIROOTFS_SYSTEMD_VERSION_KV_DEPMK_STAMP,$(CBU_DIFF)-systemd-version)
 $(call setup-dep-file,CBU_ACIROOTFS_SYSTEMD_VERSION_KV_DEPMK,$(CBU_DIFF)-systemd-version-kv)
 
-# All stamps in this file that generate deps or clean files
-CBU_DEPS_AND_CLEAN_STAMPS := \
+# All stamps in this file that generate deps files
+CBU_DEPS_STAMPS := \
 	$(CBU_TMPROOTFS_DEPMK_STAMP) \
 	$(CBU_MANIFEST_DEPS_STAMP) \
-	$(CBU_ROOTFS_CLEAN_STAMP) \
 	$(CBU_ACIROOTFS_SYMLINKS_KV_DEPMK_STAMP) \
 	$(CBU_ACIROOTFS_SYSTEMD_VERSION_KV_DEPMK_STAMP)
 
@@ -115,7 +109,7 @@ INSTALL_SYMLINKS += \
 
 # The main stamp - makes sure that ACI rootfs directory is prepared
 # with initial contents and all deps/clean files are generated.
-$(call generate-stamp-rule,$(CBU_STAMP),$(CBU_ACI_ROOTFS_STAMP) $(CBU_DEPS_AND_CLEAN_STAMPS))
+$(call generate-stamp-rule,$(CBU_STAMP),$(CBU_ACI_ROOTFS_STAMP) $(CBU_DEPS_STAMPS))
 
 # This stamp makes sure that ACI rootfs is fully populated - stuff is
 # copied, symlinks and systemd-version file are created.
@@ -156,9 +150,13 @@ $(call generate-kv-deps,$(CBU_ACIROOTFS_SYMLINKS_KV_DEPMK_STAMP),$(CBU_REMOVE_AC
 # temporary rootfs change.
 $(call generate-glob-deps,$(CBU_TMPROOTFS_DEPMK_STAMP),$(CBU_REMOVE_ACIROOTFSDIR_STAMP),$(CBU_TMPROOTFS_DEPMK),,$(CBU_DETAILED_FILELIST),$(CBU_ROOTFS))
 
-# This cleanmk can be generated only after the detailed filelist was
-# generated.
-$(call generate-clean-mk,$(CBU_ROOTFS_CLEAN_STAMP),$(CBU_ROOTFSDIR_CLEANMK),$(CBU_DETAILED_FILELIST),$(CBU_ACIROOTFSDIR) $(CBU_ROOTFS))
+# Generate clean file for files put in the ACI rootfs and in the
+# temporary rootfs.
+$(call generate-clean-mk-from-filelist, \
+	$(CBU_STAMP), \
+	$(CBU_DETAILED_FILELIST), \
+	$(CBU_ACIROOTFSDIR) $(CBU_ROOTFS), \
+	$(CBU_DIFF)-rootfs-cleanup)
 
 # This unpacks squashfs image to a temporary rootfs.
 $(call generate-stamp-rule,$(CBU_MKBASE_STAMP),$(CCN_SQUASHFS) $(CBU_COMPLETE_MANIFEST),$(CBU_ROOTFS), \
diff --git a/stage1/usr_from_kvm/kernel.mk b/stage1/usr_from_kvm/kernel.mk
index a89b688164..e01502c97f 100644
--- a/stage1/usr_from_kvm/kernel.mk
+++ b/stage1/usr_from_kvm/kernel.mk
@@ -21,13 +21,7 @@ $(call setup-stamp-file,KERNEL_BZIMAGE_STAMP,/bzimage)
 $(call setup-stamp-file,KERNEL_PATCH_STAMP,/patch_kernel)
 $(call setup-stamp-file,KERNEL_DEPS_STAMP,/deps)
 $(call setup-dep-file,KERNEL_PATCHES_DEPMK)
-$(call setup-clean-file,KERNEL_SRC_CLEANMK,/src)
-$(call setup-clean-file,KERNEL_BUILD_CLEANMK,/build)
 $(call setup-filelist-file,KERNEL_PATCHES_FILELIST,/patches)
-$(call setup-filelist-file,KERNEL_BUILD_FILELIST,/build)
-$(call setup-filelist-file,KERNEL_SRC_FILELIST,/src)
-$(call setup-stamp-file,KERNEL_SRC_CLEAN_STAMP,/src-clean)
-$(call setup-stamp-file,KERNEL_BUILD_CLEAN_STAMP,/build-clean)
 
 CREATE_DIRS += $(KERNEL_TMPDIR) $(KERNEL_BUILDDIR)
 CLEAN_DIRS += $(KERNEL_SRCDIR)
@@ -36,7 +30,7 @@ S1_RF_INSTALL_FILES += $(KERNEL_BZIMAGE):$(KERNEL_ACI_BZIMAGE):-
 S1_RF_SECONDARY_STAMPS += $(KERNEL_STAMP)
 CLEAN_FILES += $(KERNEL_TARGET_FILE)
 
-$(call generate-stamp-rule,$(KERNEL_STAMP),$(KERNEL_ACI_BZIMAGE) $(KERNEL_DEPS_STAMP) $(KERNEL_BUILD_CLEAN_STAMP) $(KERNEL_SRC_CLEAN_STAMP))
+$(call generate-stamp-rule,$(KERNEL_STAMP),$(KERNEL_ACI_BZIMAGE) $(KERNEL_DEPS_STAMP))
 
 # $(KERNEL_ACI_BZIMAGE) has a dependency on $(KERNEL_BZIMAGE), which
 # is actually provided by $(KERNEL_BZIMAGE_STAMP)
@@ -47,13 +41,14 @@ $(call generate-stamp-rule,$(KERNEL_BZIMAGE_STAMP),$(KERNEL_BUILD_CONFIG) $(KERN
 	$(call vb,vt,BUILD EXT,bzImage) \
 	$$(MAKE) $(call vl2,--silent) -C "$(KERNEL_SRCDIR)" O="$(KERNEL_BUILDDIR)" V=0 bzImage $(call vl2,>/dev/null))
 
-# Generate filelist of a builddir. Can happen only after the building
-# finished.
-$(KERNEL_BUILD_FILELIST): $(KERNEL_BZIMAGE_STAMP)
-$(call generate-deep-filelist,$(KERNEL_BUILD_FILELIST),$(KERNEL_BUILDDIR))
-
-# Generate clean.mk cleaning builddir.
-$(call generate-clean-mk,$(KERNEL_BUILD_CLEAN_STAMP),$(KERNEL_BUILD_CLEANMK),$(KERNEL_BUILD_FILELIST),$(KERNEL_BUILDDIR))
+# Generate clean file of a builddir. Can happen only after the
+# building finished.
+$(call generate-clean-mk-simple,\
+	$(KERNEL_STAMP), \
+	$(KERNEL_BUILDDIR), \
+	$(KERNEL_BUILDDIR), \
+	$(KERNEL_BZIMAGE_STAMP), \
+	builddir-cleanup)
 
 $(call generate-stamp-rule,$(KERNEL_PATCH_STAMP),$(KERNEL_MAKEFILE),, \
 	shopt -s nullglob; \
@@ -62,13 +57,14 @@ $(call generate-stamp-rule,$(KERNEL_PATCH_STAMP),$(KERNEL_MAKEFILE),, \
 		patch $(call vl3,--silent )--directory="$(KERNEL_SRCDIR)" --strip=1 --forward <"$$$${p}"; \
 	done)
 
-# Generate a filelist of srcdir. Can happen after the sources were
+# Generate clean file of a srcdir. Can happen after the sources were
 # patched.
-$(KERNEL_SRC_FILELIST): $(KERNEL_PATCH_STAMP)
-$(call generate-deep-filelist,$(KERNEL_SRC_FILELIST),$(KERNEL_SRCDIR))
-
-# Generate clean.mk cleaning the sources.
-$(call generate-clean-mk,$(KERNEL_SRC_CLEAN_STAMP),$(KERNEL_SRC_CLEANMK),$(KERNEL_SRC_FILELIST),$(KERNEL_SRCDIR))
+$(call generate-clean-mk-simple,\
+	$(KERNEL_STAMP), \
+	$(KERNEL_SRCDIR), \
+	$(KERNEL_SRCDIR), \
+	$(KERNEL_PATCH_STAMP), \
+	srcdir-cleanup)
 
 # Generate a filelist of patches. Can happen anytime.
 $(call generate-patches-filelist,$(KERNEL_PATCHES_FILELIST),$(KERNEL_PATCHESDIR))
diff --git a/stage1/usr_from_kvm/lkvm.mk b/stage1/usr_from_kvm/lkvm.mk
index 81ded66447..9e6997b1f4 100644
--- a/stage1/usr_from_kvm/lkvm.mk
+++ b/stage1/usr_from_kvm/lkvm.mk
@@ -14,10 +14,7 @@ LKVM_PATCHES := $(abspath $(LKVM_PATCHESDIR)/*.patch)
 $(call setup-stamp-file,LKVM_BUILD_STAMP,/build)
 $(call setup-stamp-file,LKVM_PATCH_STAMP,/patch_lkvm)
 $(call setup-stamp-file,LKVM_DEPS_STAMP,/deps)
-$(call setup-stamp-file,LKVM_DIR_CLEAN_STAMP,/dir-clean)
 $(call setup-dep-file,LKVM_PATCHES_DEPMK)
-$(call setup-clean-file,LKVM_CLEANMK,/src)
-$(call setup-filelist-file,LKVM_DIR_FILELIST,/dir)
 $(call setup-filelist-file,LKVM_PATCHES_FILELIST,/patches)
 
 S1_RF_SECONDARY_STAMPS += $(LKVM_STAMP)
@@ -26,7 +23,7 @@ INSTALL_DIRS += \
 	$(LKVM_SRCDIR):- \
 	$(LKVM_TMPDIR):-
 
-$(call generate-stamp-rule,$(LKVM_STAMP),$(LKVM_ACI_BINARY) $(LKVM_DEPS_STAMP) $(LKVM_DIR_CLEAN_STAMP))
+$(call generate-stamp-rule,$(LKVM_STAMP),$(LKVM_ACI_BINARY) $(LKVM_DEPS_STAMP))
 
 $(LKVM_BINARY): $(LKVM_BUILD_STAMP)
 
@@ -34,13 +31,14 @@ $(call generate-stamp-rule,$(LKVM_BUILD_STAMP),$(LKVM_PATCH_STAMP),, \
 	$(call vb,vt,BUILD EXT,lkvm) \
 	$$(MAKE) $(call vl2,--silent) -C "$(LKVM_SRCDIR)" V= lkvm-static $(call vl2,>/dev/null))
 
-# Generate filelist of lkvm directory (this is both srcdir and
+# Generate clean file for lkvm directory (this is both srcdir and
 # builddir). Can happen after build finished.
-$(LKVM_DIR_FILELIST): $(LKVM_BUILD_STAMP)
-$(call generate-deep-filelist,$(LKVM_DIR_FILELIST),$(LKVM_SRCDIR))
-
-# Generate clean.mk cleaning lkvm directory
-$(call generate-clean-mk,$(LKVM_DIR_CLEAN_STAMP),$(LKVM_CLEANMK),$(LKVM_DIR_FILELIST),$(LKVM_SRCDIR))
+$(call generate-clean-mk-simple, \
+	$(LKVM_STAMP), \
+	$(LKVM_SRCDIR), \
+	$(LKVM_SRCDIR), \
+	$(LKVM_BUILD_STAMP), \
+	cleanup)
 
 $(call generate-stamp-rule,$(LKVM_PATCH_STAMP),,, \
 	shopt -s nullglob; \
diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index 848ca555c8..9aa259c3f5 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -30,27 +30,9 @@ $(call setup-stamp-file,UFS_ROOTFS_DEPS_STAMP,systemd-rootfs-deps)
 # dep.mk for install/tmp rootfs dir contents, will cause ACI rootfs
 # removal if they change
 $(call setup-dep-file,UFS_ROOTFS_DEPMK,systemd-rootfs)
-# stamp for generating install/tmp rootfs dir clean file
-$(call setup-stamp-file,UFS_SYSTEMD_ROOTFSDIR_CLEAN_STAMP,systemd-rootfs-clean)
-# clean file for installdir/tmp rootfs dir
-$(call setup-clean-file,UFS_ROOTFSDIR_CLEANMK,systemd-rootfs)
 # install/tmp rootfs dir filelist
 $(call setup-filelist-file,UFS_ROOTFSDIR_FILELIST,systemd-rootfs)
 
-# stamp for generating build dir clean file
-$(call setup-stamp-file,UFS_SYSTEMD_BUILDDIR_CLEAN_STAMP,systemd-build-clean)
-# clean file for build dir
-$(call setup-clean-file,UFS_SYSTEMD_BUILDDIR_CLEANMK,systemd-build)
-# build dir filelist
-$(call setup-filelist-file,UFS_SYSTEMD_BUILDDIR_FILELIST,systemd-build)
-
-# stamp for generating src dir clean file after build
-$(call setup-stamp-file,UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEAN_STAMP,systemd-src-after-build-clean)
-# clean file for src dir after build
-$(call setup-clean-file,UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEANMK,systemd-src-after-build)
-# src dir filelist after build
-$(call setup-filelist-file,UFS_SYSTEMD_SRCDIR_AFTER_BUILD_FILELIST,systemd-src-after-build)
-
 # stamp for generating dep file on patches dir
 $(call setup-stamp-file,UFS_PATCHES_DEPS_STAMP,systemd-patches-deps)
 # dep.mk file for patches dir, will cause git repo reset and clean if
@@ -59,13 +41,6 @@ $(call setup-dep-file,UFS_PATCHES_DEPMK,systemd-patches)
 # patches dir filelist
 $(call setup-filelist-file,UFS_PATCHES_FILELIST,systemd-patches)
 
-# stamp for generating src dir clean file
-$(call setup-stamp-file,UFS_SYSTEMD_SRCDIR_CLEAN_STAMP,systemd-src-clean)
-# clean file for src dir
-$(call setup-clean-file,UFS_SYSTEMD_SRCDIR_CLEANMK,systemd-src)
-# src dir filelist
-$(call setup-filelist-file,UFS_SYSTEMD_SRCDIR_FILELIST,systemd-src)
-
 # stamp for removing builddir
 $(call setup-stamp-file,UFS_SYSTEMD_RM_BUILDDIR_STAMP,systemd-rm-build)
 # stamp for removing installdir
@@ -109,7 +84,7 @@ $(call inc-one,libnss.mk)
 
 # this makes sure everything is done - ACI rootfs is populated,
 # clean/deps/filelist are generated
-$(call generate-stamp-rule,$(UFS_STAMP),$(UFS_ROOTFS_STAMP) $(UFS_ROOTFS_DEPS_STAMP) $(UFS_PATCHES_DEPS_STAMP) $(UFS_SYSTEMD_ROOTFSDIR_CLEAN_STAMP) $(UFS_SYSTEMD_BUILDDIR_CLEAN_STAMP) $(UFS_SYSTEMD_SRCDIR_CLEAN_STAMP) $(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEAN_STAMP))
+$(call generate-stamp-rule,$(UFS_STAMP),$(UFS_ROOTFS_STAMP) $(UFS_ROOTFS_DEPS_STAMP) $(UFS_PATCHES_DEPS_STAMP))
 
 # this copies the temporary rootfs contents to ACI rootfs and adds
 # some misc files
@@ -135,10 +110,14 @@ $(call generate-deep-filelist,$(UFS_ROOTFSDIR_FILELIST),$(UFS_ROOTFSDIR))
 # recreated if any file in temporary rootfs changes.
 $(call generate-glob-deps,$(UFS_ROOTFS_DEPS_STAMP),$(UFS_SYSTEMD_RM_ACIROOTFSDIR_STAMP),$(UFS_ROOTFS_DEPMK),,$(UFS_ROOTFSDIR_FILELIST),$(UFS_ROOTFSDIR))
 
-# Generate a clean.mk files for cleaning everything that systemd's
-# "make install" put in a temporary rootfs and for the same files in
-# ACI rootfs.
-$(call generate-clean-mk,$(UFS_SYSTEMD_ROOTFSDIR_CLEAN_STAMP),$(UFS_ROOTFSDIR_CLEANMK),$(UFS_ROOTFSDIR_FILELIST),$(UFS_ROOTFSDIR) $(S1_RF_ACIROOTFSDIR))
+# Generate a clean file for cleaning everything that systemd's "make
+# install" put in a temporary rootfs directory and for the same files
+# in ACI rootfs.
+$(call generate-clean-mk-from-filelist, \
+	$(UFS_STAMP), \
+	$(UFS_ROOTFSDIR_FILELIST), \
+	$(UFS_ROOTFSDIR) $(S1_RF_ACIROOTFSDIR), \
+	systemd-rootfs-cleanup)
 
 # this builds systemd
 $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PATCH_STAMP),$(UFS_SYSTEMD_BUILDDIR), \
@@ -189,27 +168,28 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 	$(call vb,v2,BUILD EXT,systemd) \
 	$$(MAKE) -C "$(UFS_SYSTEMD_BUILDDIR)" all V=0 $(call vl2,>/dev/null))
 
-# Generate filelist of a build directory. This can be done only after
-# building systemd was finished.
-$(UFS_SYSTEMD_BUILDDIR_FILELIST): $(UFS_SYSTEMD_BUILD_STAMP)
-$(call generate-deep-filelist,$(UFS_SYSTEMD_BUILDDIR_FILELIST),$(UFS_SYSTEMD_BUILDDIR))
-
-# Generate clean.mk for cleaning all files created during "make all"
-# in systemd.
-$(call generate-clean-mk,$(UFS_SYSTEMD_BUILDDIR_CLEAN_STAMP),$(UFS_SYSTEMD_BUILDDIR_CLEANMK),$(UFS_SYSTEMD_BUILDDIR_FILELIST),$(UFS_SYSTEMD_BUILDDIR))
+# Generate a clean file for a build directory. This can be done only
+# after building systemd was finished.
+$(call generate-clean-mk-simple, \
+	$(UFS_STAMP), \
+	$(UFS_SYSTEMD_BUILDDIR), \
+	$(UFS_SYSTEMD_BUILDDIR), \
+	$(UFS_SYSTEMD_BUILD_STAMP), \
+	builddir-cleanup)
 
-# Generate the filelist of systemd's srcdir again. This can be done
+# Generate a clean file for systemd's srcdir again. This can be done
 # only after building systemd was finished. This is to take some files
 # generated during build in the srcdir into account. Normally srcdir
 # should be considered read only at this point, but apparently python
 # likes to put compiled bytecode next to the src file.
-$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_FILELIST): $(UFS_SYSTEMD_BUILD_STAMP)
-$(call generate-deep-filelist,$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_FILELIST),$(UFS_SYSTEMD_SRCDIR))
-
-# Generate clean.mk file for cleaning all files in srcdir-after-build.
-$(call generate-clean-mk,$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEAN_STAMP),$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_CLEANMK),$(UFS_SYSTEMD_SRCDIR_AFTER_BUILD_FILELIST),$(UFS_SYSTEMD_SRCDIR))
-
-# this patch makes sure that systemd git repo was cloned and patched
+$(call generate-clean-mk-simple, \
+	$(UFS_STAMP), \
+	$(UFS_SYSTEMD_SRCDIR), \
+	$(UFS_SYSTEMD_SRCDIR), \
+	$(UFS_SYSTEMD_BUILD_STAMP), \
+	srcdir-cleanup-again)
+
+# this stamp makes sure that systemd git repo was cloned and patched
 $(call generate-stamp-rule,$(UFS_SYSTEMD_CLONE_AND_PATCH_STAMP),$(UFS_SYSTEMD_CONFIGURE))
 
 # this patches the git repo and generates the configure script
@@ -235,13 +215,14 @@ $(UFS_SYSTEMD_CONFIGURE):
 		fi); \
 	popd $(call vl3,>/dev/null)
 
-# Generate the filelist of systemd's srcdir. This can be done only
+# Generate the clean file for systemd's srcdir. This can be done only
 # after it was cloned, patched and configure script was generated.
-$(UFS_SYSTEMD_SRCDIR_FILELIST): $(UFS_SYSTEMD_CONFIGURE)
-$(call generate-deep-filelist,$(UFS_SYSTEMD_SRCDIR_FILELIST),$(UFS_SYSTEMD_SRCDIR))
-
-# Generate clean.mk file for cleaning all files in srcdir.
-$(call generate-clean-mk,$(UFS_SYSTEMD_SRCDIR_CLEAN_STAMP),$(UFS_SYSTEMD_SRCDIR_CLEANMK),$(UFS_SYSTEMD_SRCDIR_FILELIST),$(UFS_SYSTEMD_SRCDIR))
+$(call generate-clean-mk-simple, \
+	$(UFS_STAMP), \
+	$(UFS_SYSTEMD_SRCDIR), \
+	$(UFS_SYSTEMD_SRCDIR), \
+	$(UFS_SYSTEMD_CONFIGURE), \
+	srcdir-cleanup)
 
 # Generate a filelist of patches. Can happen anytime.
 $(call generate-patches-filelist,$(UFS_PATCHES_FILELIST),$(UFS_PATCHES_DIR))

From 3df5335a40a4cf13fb8225d0c3b90968e7c13cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 11 Aug 2016 17:04:44 +0200
Subject: [PATCH 0647/1304] pkg/fileutil: simplify IsDeviceNode

Golang's `os.ModeDevice` is enough to detect if a file is a device node.
---
 pkg/fileutil/fileutil.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go
index 94c91da751..1fa3933c4a 100644
--- a/pkg/fileutil/fileutil.go
+++ b/pkg/fileutil/fileutil.go
@@ -245,7 +245,7 @@ func IsDeviceNode(path string) bool {
 	d, err := os.Lstat(path)
 	if err == nil {
 		m := d.Mode()
-		return m&os.ModeDevice == os.ModeDevice || m&os.ModeCharDevice == os.ModeCharDevice
+		return m&os.ModeDevice == os.ModeDevice
 	}
 	return false
 }

From 928dc4d294c807b258a36c5e9200dc9310902595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 11 Aug 2016 17:05:52 +0200
Subject: [PATCH 0648/1304] stage1/init: reduce indentation

---
 stage1/init/common/pod.go | 49 ++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 678e0250e3..8d6d186dd5 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -390,31 +390,32 @@ func generateDeviceAllows(root string, appName types.ACName, mountPoints []types
 
 	for _, m := range mounts {
 		v := vols[m.Volume]
-		if v.Kind == "host" {
-			if fileutil.IsDeviceNode(v.Source) {
-				mode := "r"
-				if !IsMountReadOnly(v, mountPoints) {
-					mode += "w"
-				}
-
-				tgt := filepath.Join(common.RelAppRootfsPath(appName), m.Path)
-				// the DeviceAllow= line needs the link path in /dev/.rkt/
-				linkRel := filepath.Join("/dev/.rkt", v.Name.String())
-				// the real link should be in /rkt/volumes for now
-				link := filepath.Join(rktVolumeLinksPath, v.Name.String())
-
-				err := os.Symlink(tgt, link)
-				switch {
-				case err == nil:
-					toShift = append(toShift, link)
-				case os.IsExist(err):
-					// it already exists, do nothing
-				default:
-					return nil, err
-				}
-
-				devAllow = append(devAllow, linkRel+" "+mode)
+		if v.Kind != "host" {
+			continue
+		}
+		if fileutil.IsDeviceNode(v.Source) {
+			mode := "r"
+			if !IsMountReadOnly(v, mountPoints) {
+				mode += "w"
 			}
+
+			tgt := filepath.Join(common.RelAppRootfsPath(appName), m.Path)
+			// the DeviceAllow= line needs the link path in /dev/.rkt/
+			linkRel := filepath.Join("/dev/.rkt", v.Name.String())
+			// the real link should be in /rkt/volumes for now
+			link := filepath.Join(rktVolumeLinksPath, v.Name.String())
+
+			err := os.Symlink(tgt, link)
+			switch {
+			case err == nil:
+				toShift = append(toShift, tgt)
+			case os.IsExist(err):
+				// it already exists, do nothing
+			default:
+				return nil, err
+			}
+
+			devAllow = append(devAllow, linkRel+" "+mode)
 		}
 	}
 

From a269067d00c314d21c4ce94ab1576ab103534378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 11 Aug 2016 17:06:23 +0200
Subject: [PATCH 0649/1304] stage1/init: don't shift device node volumes

Shifting doesn't make sense because:

1. The device is not bind-mounted in any location inside the pod.
2. If it were, shifting would affect the host. And we don't want to do
that.
---
 stage1/init/common/pod.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 8d6d186dd5..8fe006498f 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -406,12 +406,8 @@ func generateDeviceAllows(root string, appName types.ACName, mountPoints []types
 			link := filepath.Join(rktVolumeLinksPath, v.Name.String())
 
 			err := os.Symlink(tgt, link)
-			switch {
-			case err == nil:
-				toShift = append(toShift, tgt)
-			case os.IsExist(err):
-				// it already exists, do nothing
-			default:
+			// if the link already exists, we don't need to do anything
+			if err != nil && !os.IsExist(err) {
 				return nil, err
 			}
 

From 9af924ee0d930eced4806010443e02b920edf158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 11 Aug 2016 17:16:03 +0200
Subject: [PATCH 0650/1304] stage1/init: refactor file shifting to a function

---
 stage1/init/common/pod.go | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 8fe006498f..ce341150fc 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -286,12 +286,8 @@ func generateSysusers(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uid_ int,
 		return err
 	}
 
-	if uidRange.Shift != 0 && uidRange.Count != 0 {
-		for _, f := range toShift {
-			if err := os.Chown(f, int(uidRange.Shift), int(uidRange.Shift)); err != nil {
-				return err
-			}
-		}
+	if err := shiftFiles(toShift, uidRange); err != nil {
+		return err
 	}
 
 	return nil
@@ -372,6 +368,18 @@ func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App,
 	return binPath, nil
 }
 
+// shiftFiles shifts filesToshift by the amounts specified in uidRange
+func shiftFiles(filesToShift []string, uidRange *user.UidRange) error {
+	if uidRange.Shift != 0 && uidRange.Count != 0 {
+		for _, f := range filesToShift {
+			if err := os.Chown(f, int(uidRange.Shift), int(uidRange.Shift)); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 // generateDeviceAllows generates a DeviceAllow= line for an app.
 // To make it work, the path needs to start with "/dev" but the device won't
 // exist inside the container. So for a given mount, if the volume is a device
@@ -380,13 +388,14 @@ func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App,
 // DeviceAllow= line.
 func generateDeviceAllows(root string, appName types.ACName, mountPoints []types.MountPoint, mounts []mountWrapper, vols map[types.ACName]types.Volume, uidRange *user.UidRange) ([]string, error) {
 	var devAllow []string
-	var toShift []string
 
 	rktVolumeLinksPath := filepath.Join(root, "rkt", "volumes")
 	if err := os.MkdirAll(rktVolumeLinksPath, 0600); err != nil {
 		return nil, err
 	}
-	toShift = append(toShift, rktVolumeLinksPath)
+	if err := shiftFiles([]string{rktVolumeLinksPath}, uidRange); err != nil {
+		return nil, err
+	}
 
 	for _, m := range mounts {
 		v := vols[m.Volume]
@@ -415,14 +424,6 @@ func generateDeviceAllows(root string, appName types.ACName, mountPoints []types
 		}
 	}
 
-	if uidRange.Shift != 0 && uidRange.Count != 0 {
-		for _, f := range toShift {
-			if err := os.Chown(f, int(uidRange.Shift), int(uidRange.Shift)); err != nil {
-				return nil, err
-			}
-		}
-	}
-
 	return devAllow, nil
 }
 
@@ -821,10 +822,8 @@ func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types
 		return err
 	}
 
-	if uidRange.Shift != 0 && uidRange.Count != 0 {
-		if err := os.Chown(envFilePath, int(uidRange.Shift), int(uidRange.Shift)); err != nil {
-			return err
-		}
+	if err := shiftFiles([]string{envFilePath}, uidRange); err != nil {
+		return err
 	}
 
 	return nil

From cd9e59d19f440d82ff7fe9f9ac725e078b6225b4 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Thu, 11 Aug 2016 16:58:26 -0700
Subject: [PATCH 0651/1304] api_service: Improve machined call error output

---
 rkt/api_service.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index edc9e345f2..93af5f875b 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -16,7 +16,6 @@ package main
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net"
 	"os"
@@ -479,15 +478,16 @@ func waitForMachinedRegistration(uuid string) error {
 	machined := conn.Object("org.freedesktop.machine1", "/org/freedesktop/machine1")
 	machineName := "rkt-" + uuid
 
+	var machinedErr error
 	var o dbus.ObjectPath
 	for i := 0; i < 10; i++ {
-		if err := machined.Call("org.freedesktop.machine1.Manager.GetMachine", 0, machineName).Store(&o); err == nil {
+		if machinedErr = machined.Call("org.freedesktop.machine1.Manager.GetMachine", 0, machineName).Store(&o); machinedErr == nil {
 			return nil
 		}
 		time.Sleep(time.Millisecond * 50)
 	}
 
-	return errors.New("pod not found")
+	return fmt.Errorf("pod %v not found in machined: %v", uuid, machinedErr)
 }
 
 // fillPodDetails fills the v1pod's dynamic info in place, e.g. the pod's state,
@@ -555,7 +555,7 @@ func fillPodDetails(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
 		if err := waitForMachinedRegistration(v1pod.Id); err != nil {
 			// If there's an error, it means we're not registered to machined
 			// in a reasonable time. Just output the cgroup we're in.
-			stderr.PrintE("checking for machined registration failed", err)
+			stderr.PrintE("checking for machined registration failed: ", err)
 		}
 		// Get cgroup for the "name=systemd" controller.
 		pid, err := p.getContainerPID1()

From 6bdfc5794f1a1f1e2295e850516106b564aebf5d Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Thu, 11 Aug 2016 17:17:35 +0200
Subject: [PATCH 0652/1304] *: Bump the old appc/spec version to the recent one

---
 Documentation/app-container.md                   |  4 ++--
 Documentation/devel/stage1-implementors-guide.md |  2 +-
 Documentation/subcommands/cat-manifest.md        |  2 +-
 Documentation/subcommands/image.md               |  2 +-
 Documentation/subcommands/version.md             |  2 +-
 pkg/aci/aci.go                                   |  2 +-
 stage1_fly/aci/aci-manifest.in                   |  2 +-
 store/imagestore/store_test.go                   | 12 ++++++------
 store/treestore/tree_test.go                     |  4 ++--
 tests/empty-image/manifest                       |  2 +-
 tests/image/manifest                             |  2 +-
 tests/rkt-monitor/build-too-many-apps.sh         |  2 +-
 tests/rkt_exec_test.go                           |  2 +-
 tests/rkt_fetch_test.go                          |  2 +-
 tests/rkt_image_cat_manifest_test.go             |  2 +-
 tests/rkt_image_dependencies_test.go             |  2 +-
 tests/rkt_image_export_test.go                   |  2 +-
 tests/rkt_image_render_test.go                   |  2 +-
 tests/rkt_os_arch_test.go                        |  2 +-
 tests/stub-stage1/manifest                       |  2 +-
 20 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index 3f73b0ffd2..a8039a624a 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -33,8 +33,8 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 # rkt --insecure-options=image run \
 	--mds-register \
 	--volume=database,kind=host,source=/tmp \
-	https://github.com/appc/spec/releases/download/v0.7.4/ace-validator-main.aci \
-	https://github.com/appc/spec/releases/download/v0.7.4/ace-validator-sidekick.aci
+	https://github.com/appc/spec/releases/download/v0.8.5/ace-validator-main.aci \
+	https://github.com/appc/spec/releases/download/v0.8.5/ace-validator-sidekick.aci
 ```
 
 [appc-repo]: https://github.com/appc/spec/
diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index a1d6344a23..fc322d8a27 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -135,7 +135,7 @@ The current version of the stage1 interface is 3.
 ```json
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.7.4",
+    "acVersion": "0.8.5",
     "name": "foo.com/rkt/stage1",
     "labels": [
         {
diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index 844d35acdb..df6221aadd 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -5,7 +5,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 ```
 # rkt cat-manifest UUID
 {
-  "acVersion":"0.7.0",
+  "acVersion":"0.8.5",
   "acKind":"PodManifest"
 ...
 ```
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 43907e1abc..6a239c1b2a 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -7,7 +7,7 @@ For debugging or inspection you may want to extract an ACI manifest to stdout.
 ```
 # rkt image cat-manifest coreos.com/etcd
 {
-  "acVersion": "0.7.0",
+  "acVersion": "0.8.5",
   "acKind": "ImageManifest",
 ...
 ```
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 3fca1f80b6..0032129be9 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -7,6 +7,6 @@ This command prints the rkt version, the appc version rkt is built against, and
 ```
 $ rkt version
 rkt Version: 1.12.0
-appc Version: 0.7.4
+appc Version: 0.8.5
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/pkg/aci/aci.go b/pkg/aci/aci.go
index 89c91b5c1f..5a722f508d 100644
--- a/pkg/aci/aci.go
+++ b/pkg/aci/aci.go
@@ -107,7 +107,7 @@ func (aw *imageArchiveWriter) Close() error {
 // NewBasicACI creates a new ACI in the given directory with the given name.
 // Used for testing.
 func NewBasicACI(dir string, name string) (*os.File, error) {
-	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.7.4","name":"%s"}`, name)
+	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.5","name":"%s"}`, name)
 	return NewACI(dir, manifest, nil)
 }
 
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index 1d8b6c0fe9..571aab2651 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.7.4",
+    "acVersion": "0.8.5",
     "name": "coreos.com/rkt/stage1-fly",
     "labels": [
         {
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index 6dd368d18e..60d3e5b2a4 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -163,7 +163,7 @@ func TestGetImageManifest(t *testing.T) {
 
 	imj := `{
 			"acKind": "ImageManifest",
-			"acVersion": "0.7.4",
+			"acVersion": "0.8.5",
 			"name": "example.com/test01"
 		}`
 
@@ -228,7 +228,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.7.4",
+						"acVersion": "0.8.5",
 						"name": "example.com/test01"
 					}`,
 					false,
@@ -236,7 +236,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.7.4",
+						"acVersion": "0.8.5",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.7.4",
+						"acVersion": "0.8.5",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -358,7 +358,7 @@ func TestRemoveACI(t *testing.T) {
 
 	imj := `{
                     "acKind": "ImageManifest",
-                    "acVersion": "0.7.4",
+                    "acVersion": "0.8.5",
                     "name": "example.com/test01"
                 }`
 
@@ -403,7 +403,7 @@ func TestRemoveACI(t *testing.T) {
 	// Simulate error removing from the
 	imj = `{
                    "acKind": "ImageManifest",
-                   "acVersion": "0.7.4",
+                   "acVersion": "0.8.5",
                    "name": "example.com/test01"
                }`
 
diff --git a/store/treestore/tree_test.go b/store/treestore/tree_test.go
index 9724d0c9ae..a72fee6ca8 100644
--- a/store/treestore/tree_test.go
+++ b/store/treestore/tree_test.go
@@ -34,7 +34,7 @@ func testStoreWriteACI(dir string, s *imagestore.Store) (string, error) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.7.4",
+		    "acVersion": "0.8.5",
 		    "name": "example.com/test01"
 		}
 	`
@@ -202,7 +202,7 @@ func TestTreeStore(t *testing.T) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.7.4",
+		    "acVersion": "0.8.5",
 		    "name": "example.com/test01"
 		}
 	`
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index ed89c334bf..ea4b6da14b 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.7.4",
+    "acVersion": "0.8.5",
     "name": "coreos.com/rkt-empty",
     "labels": [
         {
diff --git a/tests/image/manifest b/tests/image/manifest
index 9e1042a09f..f9fb02a6f2 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.7.4",
+    "acVersion": "0.8.5",
     "name": "coreos.com/rkt-inspect",
     "labels": [
         {
diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
index 97e0a31152..3fc48bdfa0 100755
--- a/tests/rkt-monitor/build-too-many-apps.sh
+++ b/tests/rkt-monitor/build-too-many-apps.sh
@@ -45,7 +45,7 @@ OUTPUT=${PWD}/too-many-apps.podmanifest
 
 cat <<EOF >${OUTPUT}
 {
-    "acVersion": "0.7.4",
+    "acVersion": "0.8.5",
     "acKind": "PodManifest",
     "apps": [
 EOF
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 1486faa599..b9981717a7 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index e2ccc643c9..7a147e9a0e 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -536,7 +536,7 @@ func TestDeferredSignatureDownload(t *testing.T) {
 }
 
 func TestDifferentDiscoveryLabels(t *testing.T) {
-	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 	emptyImage := getEmptyImagePath()
 	imageName := "localhost/rkt-test-different-discovery-labels-image"
 	manifest := strings.Replace(manifestTemplate, "IMG_NAME", imageName, -1)
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index ca88a25174..19cea1e1aa 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index f4e7e67de8..ffa2ba3929 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -33,7 +33,7 @@ const (
 	manifestDepsTemplate = `
 {
    "acKind" : "ImageManifest",
-   "acVersion" : "0.7.4",
+   "acVersion" : "0.8.5",
    "dependencies" : [
       DEPENDENCIES
    ],
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 0d825c3374..29f581c0b1 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index f00512de5a..1e161f0440 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 91812e897e..5abc71d5ef 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.7.4","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {
diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest
index 58df97903a..d7241b2e6a 100644
--- a/tests/stub-stage1/manifest
+++ b/tests/stub-stage1/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.7.4",
+    "acVersion": "0.8.5",
     "name": "localhost/rkt-stub-stage1",
     "labels": [
         {

From ec42739212b1dc77c33dc90177f7791d5be993ca Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Thu, 11 Aug 2016 17:20:29 +0200
Subject: [PATCH 0653/1304] scripts: Do not touch glide files when bumping rkt
 version

Usually they are untouched anyway, but it may happen that some other
project has the same version as rkt during release and a bogus version
bump can happen.
---
 scripts/bump-release | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bump-release b/scripts/bump-release
index ec9fceff5c..9537ed958b 100755
--- a/scripts/bump-release
+++ b/scripts/bump-release
@@ -34,14 +34,14 @@ function replace_stuff() {
 }
 
 function replace_all() {
-	replace_stuff $1 $2 $(git ls-files | grep -Ev "(CHANGELOG.md|vendor|manifest\.d)")
+	replace_stuff $1 $2 $(git ls-files | grep -Ev "(CHANGELOG.md|vendor|manifest\.d|glide.lock|glide.yaml)")
 }
 
 function replace_version() {
 	replace_stuff $1 $2 configure.ac scripts/build-rir.sh tests/rkt-monitor/build-stresser.sh
 }
 
-NEXT=${1:1} 	        # 0.2.3
+NEXT=${1:1}             # 0.2.3
 NEXTGIT="${NEXT}+git"   # 0.2.3+git
 
 PREVGIT=$(grep -Po 'AC_INIT\(\[rkt\], \[\K[^\]]*(?=])' configure.ac) # 0.1.2+git

From 5141f542a3db783c0a6f91a0b4c59478dc7c69e4 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Thu, 11 Aug 2016 17:21:53 +0200
Subject: [PATCH 0654/1304] scripts: New script for bumping the appc/spec
 version

Called without any parameters. Should be executed right after updating
appc/spec with glide.

This script takes an old version from stage1/aci/aci-manifest.in and a
new version from glide.yaml and does the replacements if they are
different.
---
 scripts/bump-appc-spec-version | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100755 scripts/bump-appc-spec-version

diff --git a/scripts/bump-appc-spec-version b/scripts/bump-appc-spec-version
new file mode 100755
index 0000000000..4ef6a4289b
--- /dev/null
+++ b/scripts/bump-appc-spec-version
@@ -0,0 +1,39 @@
+#!/bin/bash -e
+#
+# Attempt to bump the appc/spec version to the version specified in
+# glide.yaml by replacing all occurrences of the current/previous
+# version. The old version is taken from stage1/aci/aci-manifest.in.
+#
+# YMMV, no disclaimer or warranty, etc.
+
+# make sure we are running in a toplevel directory
+if ! [[ "$0" =~ "scripts/bump-appc-spec-version" ]]; then
+	echo "This script must be run in a toplevel rkt directory"
+	exit 255
+fi
+
+function replace_stuff() {
+	local FROM
+	local TO
+	local REPLACE
+
+	FROM=$1
+	TO=$2
+	# escape special characters
+	REPLACE=$(sed -e 's/[]\/$*.^|[]/\\&/g'<<< $FROM)
+	shift 2
+	echo $* | xargs sed -i --follow-symlinks -e "s/$REPLACE/$TO/g"
+}
+
+function replace_all() {
+	replace_stuff $1 $2 $(git ls-files | grep -Ev "(CHANGELOG.md|vendor|manifest\.d|glide.lock|glide.yaml)")
+}
+
+PREV=$(grep -Pe 'acVersion' stage1/aci/aci-manifest.in | grep -Po '\d+\.\d+\.\d+')
+NEXT=$(grep -A 1 -e '^- package: github.com/appc/spec$' glide.yaml | grep -Po '\d+\.\d+\.\d+')
+
+if [[ ${PREV} = ${NEXT} ]]; then
+	exit 0
+fi
+
+replace_all $PREV $NEXT

From 170afb90be169a6f47fca5320a790e2d284ec9ca Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 12 Aug 2016 16:34:52 +0200
Subject: [PATCH 0655/1304] README: update btrfs known issue reference

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 955ecad78d..732c8af4c3 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ For more information, see the [CoreOS security disclosure page](https://coreos.c
 
 Due to a bug in the Linux kernel, using rkt's overlay support on top of an overlay filesystem requires Linux 4.3+ (see the [stacked overlay fix](https://github.com/torvalds/linux/commit/1c8a47d) and [#1537](https://github.com/coreos/rkt/issues/1537)).
 
-Due to a bug in the Linux kernel, rkt will not work when /var/lib/rkt is on btrfs ([#2175](https://github.com/coreos/rkt/issues/2175)).
+Due to a bug in the Linux kernel, using rkt when /var/lib/rkt is on btrfs requires Linux 4.5.2+ ([#2175](https://github.com/coreos/rkt/issues/2175)).
 
 Due to a bug in the Linux kernel, using rkt's overlay support in conjunction with SELinux requires a set of patches that are only currently available on some Linux distributions (for example, [CoreOS Linux](https://github.com/coreos/coreos-overlay/tree/master/sys-kernel/coreos-sources/files)). Work is ongoing to merge this work into the mainline Linux kernel ([#1727](https://github.com/coreos/rkt/issues/1727#issuecomment-173203129)).
 

From a50c87ba2430612851f186929def5f037b659c31 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 12 Aug 2016 13:09:32 +0200
Subject: [PATCH 0656/1304] vendor: use appc/spec 0.8.6 and k8s.io/kubernetes
 v1.3.0

Based on Stefan Junker's work from https://github.com/coreos/rkt/pull/2880
---
 glide.lock                                    |  38 +-
 glide.yaml                                    |   4 +-
 .../appc/spec/ace/image_manifest_main.json.in |   4 +-
 .../spec/ace/image_manifest_sidekick.json.in  |   4 +-
 .../spec/schema/types/isolator_resources.go   |   8 +-
 .../appc/spec/schema/types/volume.go          |  17 +-
 vendor/github.com/appc/spec/schema/version.go |   2 +-
 .../kubernetes/pkg/api/resource/amount.go     | 298 +++++++++
 .../{deep_copy_generated.go => deep_copy.go}  |  35 +-
 .../pkg/api/resource/generated.pb.go          | 325 ---------
 .../kubernetes/pkg/api/resource/math.go       | 327 +++++++++
 .../kubernetes/pkg/api/resource/quantity.go   | 620 ++++++++++++------
 .../pkg/api/resource/quantity_proto.go        | 292 +++++++--
 .../kubernetes/pkg/api/resource/suffix.go     |  84 ++-
 .../pkg/conversion/deep_copy_generated.go     | 185 ------
 15 files changed, 1422 insertions(+), 821 deletions(-)
 create mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/amount.go
 rename vendor/k8s.io/kubernetes/pkg/api/resource/{deep_copy_generated.go => deep_copy.go} (53%)
 create mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/math.go
 delete mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go

diff --git a/glide.lock b/glide.lock
index 6ae4296ee5..c8ffcb0582 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: d9834cb91d3632bb241bce57f16fba13fbdce46aee98c555774efcf73f94bb10
-updated: 2016-08-04T11:49:40.691485819+02:00
+hash: 641a1665288ef7ea9979edbab5541e39912a2a68f08a65c640ca4b29cd49e4bb
+updated: 2016-08-12T13:08:21.997452984+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: 15d68b33bfee95a448c4da37dbe876baa8fcb5b6
@@ -12,15 +12,15 @@ imports:
   - lib/internal/docker
   - lib/internal/tarball
   - lib/internal/types
+  - lib/internal/typesV2
   - lib/internal/util
   - pkg/log
-  - lib/internal/typesV2
 - name: github.com/appc/goaci
   version: ba7b591f930783c0ab75f5bbfd6ff65c7bd011bf
   subpackages:
   - proj2aci
 - name: github.com/appc/spec
-  version: fd5e3d8f5d596c6fbd506e80b5e13ba8a97b704c
+  version: 01b1a0221620c2f394c0684686dcf111c484873e
   subpackages:
   - ace
   - aci
@@ -53,33 +53,33 @@ imports:
   - pkg/ipam
   - pkg/ns
   - pkg/skel
-  - pkg/testutils
   - pkg/skel
   - pkg/testutils
+  - pkg/testutils
   - pkg/types
   - pkg/utils
   - pkg/utils/sysctl
-  - plugins/ipam/dhcp
-  - plugins/ipam/host-local
-  - plugins/ipam/host-local/backend
-  - plugins/ipam/host-local/backend/disk
-  - plugins/main/bridge
-  - plugins/main/ipvlan
-  - plugins/main/macvlan
-  - plugins/main/ptp
-  - plugins/meta/flannel
-  - plugins/meta/tuning
   - pkg/utils/sysctl
   - plugins/ipam/dhcp
+  - plugins/ipam/dhcp
   - plugins/ipam/host-local
+  - plugins/ipam/host-local
+  - plugins/ipam/host-local/backend
   - plugins/ipam/host-local/backend
   - plugins/ipam/host-local/backend/disk
+  - plugins/ipam/host-local/backend/disk
+  - plugins/main/bridge
   - plugins/main/bridge
   - plugins/main/ipvlan
+  - plugins/main/ipvlan
+  - plugins/main/macvlan
   - plugins/main/macvlan
   - plugins/main/ptp
+  - plugins/main/ptp
+  - plugins/meta/flannel
   - plugins/meta/flannel
   - plugins/meta/tuning
+  - plugins/meta/tuning
 - name: github.com/coreos/gexpect
   version: ca42424d18c76d0d51a4cccd830d11878e9e5c17
 - name: github.com/coreos/go-iptables
@@ -171,9 +171,9 @@ imports:
   - protoc-gen-go
   - protoc-gen-go/descriptor
   - protoc-gen-go/generator
+  - protoc-gen-go/grpc
   - protoc-gen-go/internal/grpc
   - protoc-gen-go/plugin
-  - protoc-gen-go/grpc
 - name: github.com/google/btree
   version: f06e229e679911bb31a04e07ac891115822e37c3
 - name: github.com/gorilla/context
@@ -268,8 +268,8 @@ imports:
   - http2
   - http2/hpack
   - internal/timeseries
-  - trace
   - lex/httplex
+  - trace
 - name: golang.org/x/sys
   version: b44883b474ffefa37335017174e397412b633a4f
   subpackages:
@@ -284,15 +284,15 @@ imports:
   - codes
   - credentials
   - grpclog
+  - internal
   - metadata
   - naming
   - peer
   - transport
-  - internal
 - name: gopkg.in/inf.v0
   version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
 - name: k8s.io/kubernetes
-  version: 9990f843cd62caa90445cf76b07d63ba7b5c86fd
+  version: 283137936a498aed572ee22af6774b6fb6e9fd94
   subpackages:
   - pkg/api/resource
   - pkg/conversion
diff --git a/glide.yaml b/glide.yaml
index 1e98015673..277dd72bf1 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,7 +20,7 @@ import:
   subpackages:
   - proj2aci
 - package: github.com/appc/spec
-  version: v0.8.5
+  version: v0.8.6
   subpackages:
   - ace
   - aci
@@ -267,7 +267,7 @@ import:
 - package: gopkg.in/inf.v0
   version: v0.9.0
 - package: k8s.io/kubernetes
-  version: v1.3.0-alpha.4
+  version: v1.3.0
   subpackages:
   - pkg/api/resource
   - pkg/conversion
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
index 3a9e4a6684..9f3f02c360 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.5",
+    "acVersion": "0.8.6",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.5" },
+        { "name": "version", "value": "0.8.6" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index f66bdd3b77..93ebb61d7c 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.5",
+    "acVersion": "0.8.6",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.5" },
+        { "name": "version", "value": "0.8.6" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_resources.go b/vendor/github.com/appc/spec/schema/types/isolator_resources.go
index 2b77e30498..771c73fdcb 100644
--- a/vendor/github.com/appc/spec/schema/types/isolator_resources.go
+++ b/vendor/github.com/appc/spec/schema/types/isolator_resources.go
@@ -164,8 +164,8 @@ func NewResourceCPUIsolator(request, limit string) (*ResourceCPU, error) {
 	res := &ResourceCPU{
 		ResourceBase{
 			resourceValue{
-				Request: req,
-				Limit:   lim,
+				Request: &req,
+				Limit:   &lim,
 			},
 		},
 	}
@@ -218,8 +218,8 @@ func NewResourceMemoryIsolator(request, limit string) (*ResourceMemory, error) {
 	res := &ResourceMemory{
 		ResourceBase{
 			resourceValue{
-				Request: req,
-				Limit:   lim,
+				Request: &req,
+				Limit:   &lim,
 			},
 		},
 	}
diff --git a/vendor/github.com/appc/spec/schema/types/volume.go b/vendor/github.com/appc/spec/schema/types/volume.go
index c5ae59180f..c2c429dcf7 100644
--- a/vendor/github.com/appc/spec/schema/types/volume.go
+++ b/vendor/github.com/appc/spec/schema/types/volume.go
@@ -40,8 +40,9 @@ type Volume struct {
 
 	// currently used only by "host"
 	// TODO(jonboulle): factor out?
-	Source   string `json:"source,omitempty"`
-	ReadOnly *bool  `json:"readOnly,omitempty"`
+	Source    string `json:"source,omitempty"`
+	ReadOnly  *bool  `json:"readOnly,omitempty"`
+	Recursive *bool  `json:"recursive,omitempty"`
 
 	// currently used only by "empty"
 	Mode *string `json:"mode,omitempty"`
@@ -128,6 +129,10 @@ func (v Volume) String() string {
 		s = append(s, ",readOnly=")
 		s = append(s, strconv.FormatBool(*v.ReadOnly))
 	}
+	if v.Recursive != nil {
+		s = append(s, ",recursive=")
+		s = append(s, strconv.FormatBool(*v.Recursive))
+	}
 	switch v.Kind {
 	case "empty":
 		if *v.Mode != emptyVolumeDefaultMode {
@@ -149,7 +154,7 @@ func (v Volume) String() string {
 // VolumeFromString takes a command line volume parameter and returns a volume
 //
 // Example volume parameters:
-// 	database,kind=host,source=/tmp,readOnly=true
+// 	database,kind=host,source=/tmp,readOnly=true,recursive=true
 func VolumeFromString(vp string) (*Volume, error) {
 	var vol Volume
 
@@ -186,6 +191,12 @@ func VolumeFromString(vp string) (*Volume, error) {
 				return nil, err
 			}
 			vol.ReadOnly = &ro
+		case "recursive":
+			rec, err := strconv.ParseBool(val[0])
+			if err != nil {
+				return nil, err
+			}
+			vol.Recursive = &rec
 		case "mode":
 			vol.Mode = &val[0]
 		case "uid":
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go
index 494a8eb878..4d4e1f1fba 100644
--- a/vendor/github.com/appc/spec/schema/version.go
+++ b/vendor/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.5"
+	version string = "0.8.6"
 )
 
 var (
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go b/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go
new file mode 100644
index 0000000000..6ae823a022
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go
@@ -0,0 +1,298 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resource
+
+import (
+	"math/big"
+	"strconv"
+
+	inf "gopkg.in/inf.v0"
+)
+
+// Scale is used for getting and setting the base-10 scaled value.
+// Base-2 scales are omitted for mathematical simplicity.
+// See Quantity.ScaledValue for more details.
+type Scale int32
+
+// infScale adapts a Scale value to an inf.Scale value.
+func (s Scale) infScale() inf.Scale {
+	return inf.Scale(-s) // inf.Scale is upside-down
+}
+
+const (
+	Nano  Scale = -9
+	Micro Scale = -6
+	Milli Scale = -3
+	Kilo  Scale = 3
+	Mega  Scale = 6
+	Giga  Scale = 9
+	Tera  Scale = 12
+	Peta  Scale = 15
+	Exa   Scale = 18
+)
+
+var (
+	Zero = int64Amount{}
+
+	// Used by quantity strings - treat as read only
+	zeroBytes = []byte("0")
+)
+
+// int64Amount represents a fixed precision numerator and arbitrary scale exponent. It is faster
+// than operations on inf.Dec for values that can be represented as int64.
+type int64Amount struct {
+	value int64
+	scale Scale
+}
+
+// Sign returns 0 if the value is zero, -1 if it is less than 0, or 1 if it is greater than 0.
+func (a int64Amount) Sign() int {
+	switch {
+	case a.value == 0:
+		return 0
+	case a.value > 0:
+		return 1
+	default:
+		return -1
+	}
+}
+
+// AsInt64 returns the current amount as an int64 at scale 0, or false if the value cannot be
+// represented in an int64 OR would result in a loss of precision. This method is intended as
+// an optimization to avoid calling AsDec.
+func (a int64Amount) AsInt64() (int64, bool) {
+	if a.scale == 0 {
+		return a.value, true
+	}
+	if a.scale < 0 {
+		// TODO: attempt to reduce factors, although it is assumed that factors are reduced prior
+		// to the int64Amount being created.
+		return 0, false
+	}
+	return positiveScaleInt64(a.value, a.scale)
+}
+
+// AsScaledInt64 returns an int64 representing the value of this amount at the specified scale,
+// rounding up, or false if that would result in overflow. (1e20).AsScaledInt64(1) would result
+// in overflow because 1e19 is not representable as an int64. Note that setting a scale larger
+// than the current value may result in loss of precision - i.e. (1e-6).AsScaledInt64(0) would
+// return 1, because 0.000001 is rounded up to 1.
+func (a int64Amount) AsScaledInt64(scale Scale) (result int64, ok bool) {
+	if a.scale < scale {
+		result, _ = negativeScaleInt64(a.value, scale-a.scale)
+		return result, true
+	}
+	return positiveScaleInt64(a.value, a.scale-scale)
+}
+
+// AsDec returns an inf.Dec representation of this value.
+func (a int64Amount) AsDec() *inf.Dec {
+	var base inf.Dec
+	base.SetUnscaled(a.value)
+	base.SetScale(inf.Scale(-a.scale))
+	return &base
+}
+
+// Cmp returns 0 if a and b are equal, 1 if a is greater than b, or -1 if a is less than b.
+func (a int64Amount) Cmp(b int64Amount) int {
+	switch {
+	case a.scale == b.scale:
+		// compare only the unscaled portion
+	case a.scale > b.scale:
+		result, remainder, exact := divideByScaleInt64(b.value, a.scale-b.scale)
+		if !exact {
+			return a.AsDec().Cmp(b.AsDec())
+		}
+		if result == a.value {
+			switch {
+			case remainder == 0:
+				return 0
+			case remainder > 0:
+				return -1
+			default:
+				return 1
+			}
+		}
+		b.value = result
+	default:
+		result, remainder, exact := divideByScaleInt64(a.value, b.scale-a.scale)
+		if !exact {
+			return a.AsDec().Cmp(b.AsDec())
+		}
+		if result == b.value {
+			switch {
+			case remainder == 0:
+				return 0
+			case remainder > 0:
+				return 1
+			default:
+				return -1
+			}
+		}
+		a.value = result
+	}
+
+	switch {
+	case a.value == b.value:
+		return 0
+	case a.value < b.value:
+		return -1
+	default:
+		return 1
+	}
+}
+
+// Add adds two int64Amounts together, matching scales. It will return false and not mutate
+// a if overflow or underflow would result.
+func (a *int64Amount) Add(b int64Amount) bool {
+	switch {
+	case b.value == 0:
+		return true
+	case a.value == 0:
+		a.value = b.value
+		a.scale = b.scale
+		return true
+	case a.scale == b.scale:
+		c, ok := int64Add(a.value, b.value)
+		if !ok {
+			return false
+		}
+		a.value = c
+	case a.scale > b.scale:
+		c, ok := positiveScaleInt64(a.value, a.scale-b.scale)
+		if !ok {
+			return false
+		}
+		c, ok = int64Add(c, b.value)
+		if !ok {
+			return false
+		}
+		a.scale = b.scale
+		a.value = c
+	default:
+		c, ok := positiveScaleInt64(b.value, b.scale-a.scale)
+		if !ok {
+			return false
+		}
+		c, ok = int64Add(a.value, c)
+		if !ok {
+			return false
+		}
+		a.value = c
+	}
+	return true
+}
+
+// Sub removes the value of b from the current amount, or returns false if underflow would result.
+func (a *int64Amount) Sub(b int64Amount) bool {
+	return a.Add(int64Amount{value: -b.value, scale: b.scale})
+}
+
+// AsScale adjusts this amount to set a minimum scale, rounding up, and returns true iff no precision
+// was lost. (1.1e5).AsScale(5) would return 1.1e5, but (1.1e5).AsScale(6) would return 1e6.
+func (a int64Amount) AsScale(scale Scale) (int64Amount, bool) {
+	if a.scale >= scale {
+		return a, true
+	}
+	result, exact := negativeScaleInt64(a.value, scale-a.scale)
+	return int64Amount{value: result, scale: scale}, exact
+}
+
+// AsCanonicalBytes accepts a buffer to write the base-10 string value of this field to, and returns
+// either that buffer or a larger buffer and the current exponent of the value. The value is adjusted
+// until the exponent is a multiple of 3 - i.e. 1.1e5 would return "110", 3.
+func (a int64Amount) AsCanonicalBytes(out []byte) (result []byte, exponent int32) {
+	mantissa := a.value
+	exponent = int32(a.scale)
+
+	amount, times := removeInt64Factors(mantissa, 10)
+	exponent += int32(times)
+
+	// make sure exponent is a multiple of 3
+	var ok bool
+	switch exponent % 3 {
+	case 1, -2:
+		amount, ok = int64MultiplyScale10(amount)
+		if !ok {
+			return infDecAmount{a.AsDec()}.AsCanonicalBytes(out)
+		}
+		exponent = exponent - 1
+	case 2, -1:
+		amount, ok = int64MultiplyScale100(amount)
+		if !ok {
+			return infDecAmount{a.AsDec()}.AsCanonicalBytes(out)
+		}
+		exponent = exponent - 2
+	}
+	return strconv.AppendInt(out, amount, 10), exponent
+}
+
+// AsCanonicalBase1024Bytes accepts a buffer to write the base-1024 string value of this field to, and returns
+// either that buffer or a larger buffer and the current exponent of the value. 2048 is 2 * 1024 ^ 1 and would
+// return []byte("2048"), 1.
+func (a int64Amount) AsCanonicalBase1024Bytes(out []byte) (result []byte, exponent int32) {
+	value, ok := a.AsScaledInt64(0)
+	if !ok {
+		return infDecAmount{a.AsDec()}.AsCanonicalBase1024Bytes(out)
+	}
+	amount, exponent := removeInt64Factors(value, 1024)
+	return strconv.AppendInt(out, amount, 10), exponent
+}
+
+// infDecAmount implements common operations over an inf.Dec that are specific to the quantity
+// representation.
+type infDecAmount struct {
+	*inf.Dec
+}
+
+// AsScale adjusts this amount to set a minimum scale, rounding up, and returns true iff no precision
+// was lost. (1.1e5).AsScale(5) would return 1.1e5, but (1.1e5).AsScale(6) would return 1e6.
+func (a infDecAmount) AsScale(scale Scale) (infDecAmount, bool) {
+	tmp := &inf.Dec{}
+	tmp.Round(a.Dec, scale.infScale(), inf.RoundUp)
+	return infDecAmount{tmp}, tmp.Cmp(a.Dec) == 0
+}
+
+// AsCanonicalBytes accepts a buffer to write the base-10 string value of this field to, and returns
+// either that buffer or a larger buffer and the current exponent of the value. The value is adjusted
+// until the exponent is a multiple of 3 - i.e. 1.1e5 would return "110", 3.
+func (a infDecAmount) AsCanonicalBytes(out []byte) (result []byte, exponent int32) {
+	mantissa := a.Dec.UnscaledBig()
+	exponent = int32(-a.Dec.Scale())
+	amount := big.NewInt(0).Set(mantissa)
+	// move all factors of 10 into the exponent for easy reasoning
+	amount, times := removeBigIntFactors(amount, bigTen)
+	exponent += times
+
+	// make sure exponent is a multiple of 3
+	for exponent%3 != 0 {
+		amount.Mul(amount, bigTen)
+		exponent--
+	}
+
+	return append(out, amount.String()...), exponent
+}
+
+// AsCanonicalBase1024Bytes accepts a buffer to write the base-1024 string value of this field to, and returns
+// either that buffer or a larger buffer and the current exponent of the value. 2048 is 2 * 1024 ^ 1 and would
+// return []byte("2048"), 1.
+func (a infDecAmount) AsCanonicalBase1024Bytes(out []byte) (result []byte, exponent int32) {
+	tmp := &inf.Dec{}
+	tmp.Round(a.Dec, 0, inf.RoundUp)
+	amount, exponent := removeBigIntFactors(tmp.UnscaledBig(), big1024)
+	return append(out, amount.String()...), exponent
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go b/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy.go
similarity index 53%
rename from vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
rename to vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy.go
index 6a34e2d434..4efc0406f0 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy.go
@@ -1,5 +1,3 @@
-// +build !ignore_autogenerated
-
 /*
 Copyright 2016 The Kubernetes Authors All rights reserved.
 
@@ -16,40 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// This file was autogenerated by deepcopy-gen. Do not edit it manually!
-
 package resource
 
 import (
-	inf_v0 "gopkg.in/inf.v0"
+	inf "gopkg.in/inf.v0"
+
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
 
 func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error {
-	if in.Amount != nil {
-		in, out := in.Amount, &out.Amount
-		*out = new(inf_v0.Dec)
-		if newVal, err := c.DeepCopy(*in); err != nil {
-			return err
-		} else {
-			**out = newVal.(inf_v0.Dec)
-		}
-	} else {
-		out.Amount = nil
-	}
-	out.Format = in.Format
-	return nil
-}
-
-func DeepCopy_resource_QuantityProto(in QuantityProto, out *QuantityProto, c *conversion.Cloner) error {
-	out.Format = in.Format
-	out.Scale = in.Scale
-	if in.Bigint != nil {
-		in, out := in.Bigint, &out.Bigint
-		*out = make([]byte, len(in))
-		copy(*out, in)
-	} else {
-		out.Bigint = nil
+	*out = in
+	if in.d.Dec != nil {
+		tmp := &inf.Dec{}
+		out.d.Dec = tmp.Set(in.d.Dec)
 	}
 	return nil
 }
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go b/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
index 7484f92761..cf9447a321 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
@@ -26,7 +26,6 @@ limitations under the License.
 
 	It has these top-level messages:
 		Quantity
-		QuantityProto
 */
 package resource
 
@@ -34,8 +33,6 @@ import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
-import io "io"
-
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
@@ -44,328 +41,6 @@ var _ = math.Inf
 func (m *Quantity) Reset()      { *m = Quantity{} }
 func (*Quantity) ProtoMessage() {}
 
-func (m *QuantityProto) Reset()         { *m = QuantityProto{} }
-func (m *QuantityProto) String() string { return proto.CompactTextString(m) }
-func (*QuantityProto) ProtoMessage()    {}
-
 func init() {
 	proto.RegisterType((*Quantity)(nil), "k8s.io.kubernetes.pkg.api.resource.Quantity")
-	proto.RegisterType((*QuantityProto)(nil), "k8s.io.kubernetes.pkg.api.resource.QuantityProto")
-}
-func (m *QuantityProto) Marshal() (data []byte, err error) {
-	size := m.Size()
-	data = make([]byte, size)
-	n, err := m.MarshalTo(data)
-	if err != nil {
-		return nil, err
-	}
-	return data[:n], nil
-}
-
-func (m *QuantityProto) MarshalTo(data []byte) (int, error) {
-	var i int
-	_ = i
-	var l int
-	_ = l
-	data[i] = 0xa
-	i++
-	i = encodeVarintGenerated(data, i, uint64(len(m.Format)))
-	i += copy(data[i:], m.Format)
-	data[i] = 0x10
-	i++
-	i = encodeVarintGenerated(data, i, uint64(m.Scale))
-	if m.Bigint != nil {
-		data[i] = 0x1a
-		i++
-		i = encodeVarintGenerated(data, i, uint64(len(m.Bigint)))
-		i += copy(data[i:], m.Bigint)
-	}
-	return i, nil
-}
-
-func encodeFixed64Generated(data []byte, offset int, v uint64) int {
-	data[offset] = uint8(v)
-	data[offset+1] = uint8(v >> 8)
-	data[offset+2] = uint8(v >> 16)
-	data[offset+3] = uint8(v >> 24)
-	data[offset+4] = uint8(v >> 32)
-	data[offset+5] = uint8(v >> 40)
-	data[offset+6] = uint8(v >> 48)
-	data[offset+7] = uint8(v >> 56)
-	return offset + 8
-}
-func encodeFixed32Generated(data []byte, offset int, v uint32) int {
-	data[offset] = uint8(v)
-	data[offset+1] = uint8(v >> 8)
-	data[offset+2] = uint8(v >> 16)
-	data[offset+3] = uint8(v >> 24)
-	return offset + 4
-}
-func encodeVarintGenerated(data []byte, offset int, v uint64) int {
-	for v >= 1<<7 {
-		data[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	data[offset] = uint8(v)
-	return offset + 1
 }
-func (m *QuantityProto) Size() (n int) {
-	var l int
-	_ = l
-	l = len(m.Format)
-	n += 1 + l + sovGenerated(uint64(l))
-	n += 1 + sovGenerated(uint64(m.Scale))
-	if m.Bigint != nil {
-		l = len(m.Bigint)
-		n += 1 + l + sovGenerated(uint64(l))
-	}
-	return n
-}
-
-func sovGenerated(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
-}
-func sozGenerated(x uint64) (n int) {
-	return sovGenerated(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *QuantityProto) Unmarshal(data []byte) error {
-	l := len(data)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowGenerated
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := data[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: QuantityProto: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: QuantityProto: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Format", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Format = Format(data[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Scale", wireType)
-			}
-			m.Scale = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				m.Scale |= (int32(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Bigint", wireType)
-			}
-			var byteLen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				byteLen |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if byteLen < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			postIndex := iNdEx + byteLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Bigint = append(m.Bigint[:0], data[iNdEx:postIndex]...)
-			if m.Bigint == nil {
-				m.Bigint = []byte{}
-			}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipGenerated(data[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipGenerated(data []byte) (n int, err error) {
-	l := len(data)
-	iNdEx := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowGenerated
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := data[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if data[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-			return iNdEx, nil
-		case 1:
-			iNdEx += 8
-			return iNdEx, nil
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			iNdEx += length
-			if length < 0 {
-				return 0, ErrInvalidLengthGenerated
-			}
-			return iNdEx, nil
-		case 3:
-			for {
-				var innerWire uint64
-				var start int = iNdEx
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return 0, ErrIntOverflowGenerated
-					}
-					if iNdEx >= l {
-						return 0, io.ErrUnexpectedEOF
-					}
-					b := data[iNdEx]
-					iNdEx++
-					innerWire |= (uint64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				innerWireType := int(innerWire & 0x7)
-				if innerWireType == 4 {
-					break
-				}
-				next, err := skipGenerated(data[start:])
-				if err != nil {
-					return 0, err
-				}
-				iNdEx = start + next
-			}
-			return iNdEx, nil
-		case 4:
-			return iNdEx, nil
-		case 5:
-			iNdEx += 4
-			return iNdEx, nil
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-	}
-	panic("unreachable")
-}
-
-var (
-	ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowGenerated   = fmt.Errorf("proto: integer overflow")
-)
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/math.go b/vendor/k8s.io/kubernetes/pkg/api/resource/math.go
new file mode 100644
index 0000000000..163aafa5db
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/math.go
@@ -0,0 +1,327 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resource
+
+import (
+	"math/big"
+
+	inf "gopkg.in/inf.v0"
+)
+
+const (
+	// maxInt64Factors is the highest value that will be checked when removing factors of 10 from an int64.
+	// It is also the maximum decimal digits that can be represented with an int64.
+	maxInt64Factors = 18
+)
+
+var (
+	// Commonly needed big.Int values-- treat as read only!
+	bigTen      = big.NewInt(10)
+	bigZero     = big.NewInt(0)
+	bigOne      = big.NewInt(1)
+	bigThousand = big.NewInt(1000)
+	big1024     = big.NewInt(1024)
+
+	// Commonly needed inf.Dec values-- treat as read only!
+	decZero      = inf.NewDec(0, 0)
+	decOne       = inf.NewDec(1, 0)
+	decMinusOne  = inf.NewDec(-1, 0)
+	decThousand  = inf.NewDec(1000, 0)
+	dec1024      = inf.NewDec(1024, 0)
+	decMinus1024 = inf.NewDec(-1024, 0)
+
+	// Largest (in magnitude) number allowed.
+	maxAllowed = infDecAmount{inf.NewDec((1<<63)-1, 0)} // == max int64
+
+	// The maximum value we can represent milli-units for.
+	// Compare with the return value of Quantity.Value() to
+	// see if it's safe to use Quantity.MilliValue().
+	MaxMilliValue = int64(((1 << 63) - 1) / 1000)
+)
+
+const mostNegative = -(mostPositive + 1)
+const mostPositive = 1<<63 - 1
+
+// int64Add returns a+b, or false if that would overflow int64.
+func int64Add(a, b int64) (int64, bool) {
+	c := a + b
+	switch {
+	case a > 0 && b > 0:
+		if c < 0 {
+			return 0, false
+		}
+	case a < 0 && b < 0:
+		if c > 0 {
+			return 0, false
+		}
+		if a == mostNegative && b == mostNegative {
+			return 0, false
+		}
+	}
+	return c, true
+}
+
+// int64Multiply returns a*b, or false if that would overflow or underflow int64.
+func int64Multiply(a, b int64) (int64, bool) {
+	if a == 0 || b == 0 || a == 1 || b == 1 {
+		return a * b, true
+	}
+	if a == mostNegative || b == mostNegative {
+		return 0, false
+	}
+	c := a * b
+	return c, c/b == a
+}
+
+// int64MultiplyScale returns a*b, assuming b is greater than one, or false if that would overflow or underflow int64.
+// Use when b is known to be greater than one.
+func int64MultiplyScale(a int64, b int64) (int64, bool) {
+	if a == 0 || a == 1 {
+		return a * b, true
+	}
+	if a == mostNegative && b != 1 {
+		return 0, false
+	}
+	c := a * b
+	return c, c/b == a
+}
+
+// int64MultiplyScale10 multiplies a by 10, or returns false if that would overflow. This method is faster than
+// int64Multiply(a, 10) because the compiler can optimize constant factor multiplication.
+func int64MultiplyScale10(a int64) (int64, bool) {
+	if a == 0 || a == 1 {
+		return a * 10, true
+	}
+	if a == mostNegative {
+		return 0, false
+	}
+	c := a * 10
+	return c, c/10 == a
+}
+
+// int64MultiplyScale100 multiplies a by 100, or returns false if that would overflow. This method is faster than
+// int64Multiply(a, 100) because the compiler can optimize constant factor multiplication.
+func int64MultiplyScale100(a int64) (int64, bool) {
+	if a == 0 || a == 1 {
+		return a * 100, true
+	}
+	if a == mostNegative {
+		return 0, false
+	}
+	c := a * 100
+	return c, c/100 == a
+}
+
+// int64MultiplyScale1000 multiplies a by 1000, or returns false if that would overflow. This method is faster than
+// int64Multiply(a, 1000) because the compiler can optimize constant factor multiplication.
+func int64MultiplyScale1000(a int64) (int64, bool) {
+	if a == 0 || a == 1 {
+		return a * 1000, true
+	}
+	if a == mostNegative {
+		return 0, false
+	}
+	c := a * 1000
+	return c, c/1000 == a
+}
+
+// positiveScaleInt64 multiplies base by 10^scale, returning false if the
+// value overflows. Passing a negative scale is undefined.
+func positiveScaleInt64(base int64, scale Scale) (int64, bool) {
+	switch scale {
+	case 0:
+		return base, true
+	case 1:
+		return int64MultiplyScale10(base)
+	case 2:
+		return int64MultiplyScale100(base)
+	case 3:
+		return int64MultiplyScale1000(base)
+	case 6:
+		return int64MultiplyScale(base, 1000000)
+	case 9:
+		return int64MultiplyScale(base, 1000000000)
+	default:
+		value := base
+		var ok bool
+		for i := Scale(0); i < scale; i++ {
+			if value, ok = int64MultiplyScale(value, 10); !ok {
+				return 0, false
+			}
+		}
+		return value, true
+	}
+}
+
+// negativeScaleInt64 reduces base by the provided scale, rounding up, until the
+// value is zero or the scale is reached. Passing a negative scale is undefined.
+// The value returned, if not exact, is rounded away from zero.
+func negativeScaleInt64(base int64, scale Scale) (result int64, exact bool) {
+	if scale == 0 {
+		return base, true
+	}
+
+	value := base
+	var fraction bool
+	for i := Scale(0); i < scale; i++ {
+		if !fraction && value%10 != 0 {
+			fraction = true
+		}
+		value = value / 10
+		if value == 0 {
+			if fraction {
+				if base > 0 {
+					return 1, false
+				}
+				return -1, false
+			}
+			return 0, true
+		}
+	}
+	if fraction {
+		if base > 0 {
+			value += 1
+		} else {
+			value += -1
+		}
+	}
+	return value, !fraction
+}
+
+func pow10Int64(b int64) int64 {
+	switch b {
+	case 0:
+		return 1
+	case 1:
+		return 10
+	case 2:
+		return 100
+	case 3:
+		return 1000
+	case 4:
+		return 10000
+	case 5:
+		return 100000
+	case 6:
+		return 1000000
+	case 7:
+		return 10000000
+	case 8:
+		return 100000000
+	case 9:
+		return 1000000000
+	case 10:
+		return 10000000000
+	case 11:
+		return 100000000000
+	case 12:
+		return 1000000000000
+	case 13:
+		return 10000000000000
+	case 14:
+		return 100000000000000
+	case 15:
+		return 1000000000000000
+	case 16:
+		return 10000000000000000
+	case 17:
+		return 100000000000000000
+	case 18:
+		return 1000000000000000000
+	default:
+		return 0
+	}
+}
+
+// powInt64 raises a to the bth power. Is not overflow aware.
+func powInt64(a, b int64) int64 {
+	p := int64(1)
+	for b > 0 {
+		if b&1 != 0 {
+			p *= a
+		}
+		b >>= 1
+		a *= a
+	}
+	return p
+}
+
+// negativeScaleInt64 returns the result of dividing base by scale * 10 and the remainder, or
+// false if no such division is possible. Dividing by negative scales is undefined.
+func divideByScaleInt64(base int64, scale Scale) (result, remainder int64, exact bool) {
+	if scale == 0 {
+		return base, 0, true
+	}
+	// the max scale representable in base 10 in an int64 is 18 decimal places
+	if scale >= 18 {
+		return 0, base, false
+	}
+	divisor := pow10Int64(int64(scale))
+	return base / divisor, base % divisor, true
+}
+
+// removeInt64Factors divides in a loop; the return values have the property that
+// value == result * base ^ scale
+func removeInt64Factors(value int64, base int64) (result int64, times int32) {
+	times = 0
+	result = value
+	negative := result < 0
+	if negative {
+		result = -result
+	}
+	switch base {
+	// allow the compiler to optimize the common cases
+	case 10:
+		for result >= 10 && result%10 == 0 {
+			times++
+			result = result / 10
+		}
+	// allow the compiler to optimize the common cases
+	case 1024:
+		for result >= 1024 && result%1024 == 0 {
+			times++
+			result = result / 1024
+		}
+	default:
+		for result >= base && result%base == 0 {
+			times++
+			result = result / base
+		}
+	}
+	if negative {
+		result = -result
+	}
+	return result, times
+}
+
+// removeBigIntFactors divides in a loop; the return values have the property that
+// d == result * factor ^ times
+// d may be modified in place.
+// If d == 0, then the return values will be (0, 0)
+func removeBigIntFactors(d, factor *big.Int) (result *big.Int, times int32) {
+	q := big.NewInt(0)
+	m := big.NewInt(0)
+	for d.Cmp(bigZero) != 0 {
+		q.DivMod(d, factor, m)
+		if m.Cmp(bigZero) != 0 {
+			break
+		}
+		times++
+		d, q = q, d
+	}
+	return d, times
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
index e61c8800ec..96877b4c94 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
@@ -17,10 +17,12 @@ limitations under the License.
 package resource
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"math/big"
 	"regexp"
+	"strconv"
 	"strings"
 
 	flag "github.com/spf13/pflag"
@@ -85,20 +87,36 @@ import (
 // writing some sort of special handling code in the hopes that that will
 // cause implementors to also use a fixed point implementation.
 //
+// +gencopy=false
 // +protobuf=true
-// +protobuf.embed=QuantityProto
+// +protobuf.embed=string
 // +protobuf.options.marshal=false
 // +protobuf.options.(gogoproto.goproto_stringer)=false
 type Quantity struct {
-	// Amount is public, so you can manipulate it if the accessor
-	// functions are not sufficient.
-	Amount *inf.Dec
+	// i is the quantity in int64 scaled form, if d.Dec == nil
+	i int64Amount
+	// d is the quantity in inf.Dec form if d.Dec != nil
+	d infDecAmount
+	// s is the generated value of this quantity to avoid recalculation
+	s string
 
 	// Change Format at will. See the comment for Canonicalize for
 	// more details.
 	Format
 }
 
+// CanonicalValue allows a quantity amount to be converted to a string.
+type CanonicalValue interface {
+	// AsCanonicalBytes returns a byte array representing the string representation
+	// of the value mantissa and an int32 representing its exponent in base-10. Callers may
+	// pass a byte slice to the method to avoid allocations.
+	AsCanonicalBytes(out []byte) ([]byte, int32)
+	// AsCanonicalBase1024Bytes returns a byte array representing the string representation
+	// of the value mantissa and an int32 representing its exponent in base-1024. Callers
+	// may pass a byte slice to the method to avoid allocations.
+	AsCanonicalBase1024Bytes(out []byte) ([]byte, int32)
+}
+
 // Format lists the three possible formattings of a quantity.
 type Format string
 
@@ -115,26 +133,9 @@ func MustParse(str string) Quantity {
 	if err != nil {
 		panic(fmt.Errorf("cannot parse '%v': %v", str, err))
 	}
-	return *q
+	return q
 }
 
-// Scale is used for getting and setting the base-10 scaled value.
-// Base-2 scales are omitted for mathematical simplicity.
-// See Quantity.ScaledValue for more details.
-type Scale int
-
-const (
-	Nano  Scale = -9
-	Micro Scale = -6
-	Milli Scale = -3
-	Kilo  Scale = 3
-	Mega  Scale = 6
-	Giga  Scale = 9
-	Tera  Scale = 12
-	Peta  Scale = 15
-	Exa   Scale = 18
-)
-
 const (
 	// splitREString is used to separate a number from its suffix; as such,
 	// this is overly permissive, but that's OK-- it will be checked later.
@@ -149,47 +150,199 @@ var (
 	ErrFormatWrong = errors.New("quantities must match the regular expression '" + splitREString + "'")
 	ErrNumeric     = errors.New("unable to parse numeric part of quantity")
 	ErrSuffix      = errors.New("unable to parse quantity's suffix")
-
-	// Commonly needed big.Int values-- treat as read only!
-	bigTen      = big.NewInt(10)
-	bigZero     = big.NewInt(0)
-	bigOne      = big.NewInt(1)
-	bigThousand = big.NewInt(1000)
-	big1024     = big.NewInt(1024)
-
-	// Commonly needed inf.Dec values-- treat as read only!
-	decZero      = inf.NewDec(0, 0)
-	decOne       = inf.NewDec(1, 0)
-	decMinusOne  = inf.NewDec(-1, 0)
-	decThousand  = inf.NewDec(1000, 0)
-	dec1024      = inf.NewDec(1024, 0)
-	decMinus1024 = inf.NewDec(-1024, 0)
-
-	// Largest (in magnitude) number allowed.
-	maxAllowed = inf.NewDec((1<<63)-1, 0) // == max int64
-
-	// The maximum value we can represent milli-units for.
-	// Compare with the return value of Quantity.Value() to
-	// see if it's safe to use Quantity.MilliValue().
-	MaxMilliValue = int64(((1 << 63) - 1) / 1000)
 )
 
+// parseQuantityString is a fast scanner for quantity values.
+func parseQuantityString(str string) (positive bool, value, num, denom, suffix string, err error) {
+	positive = true
+	pos := 0
+	end := len(str)
+
+	// handle leading sign
+	if pos < end {
+		switch str[0] {
+		case '-':
+			positive = false
+			pos++
+		case '+':
+			pos++
+		}
+	}
+
+	// strip leading zeros
+Zeroes:
+	for i := pos; ; i++ {
+		if i >= end {
+			num = "0"
+			value = num
+			return
+		}
+		switch str[i] {
+		case '0':
+			pos++
+		default:
+			break Zeroes
+		}
+	}
+
+	// extract the numerator
+Num:
+	for i := pos; ; i++ {
+		if i >= end {
+			num = str[pos:end]
+			value = str[0:end]
+			return
+		}
+		switch str[i] {
+		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+		default:
+			num = str[pos:i]
+			pos = i
+			break Num
+		}
+	}
+
+	// if we stripped all numerator positions, always return 0
+	if len(num) == 0 {
+		num = "0"
+	}
+
+	// handle a denominator
+	if pos < end && str[pos] == '.' {
+		pos++
+	Denom:
+		for i := pos; ; i++ {
+			if i >= end {
+				denom = str[pos:end]
+				value = str[0:end]
+				return
+			}
+			switch str[i] {
+			case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+			default:
+				denom = str[pos:i]
+				pos = i
+				break Denom
+			}
+		}
+		// TODO: we currently allow 1.G, but we may not want to in the future.
+		// if len(denom) == 0 {
+		// 	err = ErrFormatWrong
+		// 	return
+		// }
+	}
+	value = str[0:pos]
+
+	// grab the elements of the suffix
+	suffixStart := pos
+	for i := pos; ; i++ {
+		if i >= end {
+			suffix = str[suffixStart:end]
+			return
+		}
+		if !strings.ContainsAny(str[i:i+1], "eEinumkKMGTP") {
+			pos = i
+			break
+		}
+	}
+	if pos < end {
+		switch str[pos] {
+		case '-', '+':
+			pos++
+		}
+	}
+Suffix:
+	for i := pos; ; i++ {
+		if i >= end {
+			suffix = str[suffixStart:end]
+			return
+		}
+		switch str[i] {
+		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+		default:
+			break Suffix
+		}
+	}
+	// we encountered a non decimal in the Suffix loop, but the last character
+	// was not a valid exponent
+	err = ErrFormatWrong
+	return
+}
+
 // ParseQuantity turns str into a Quantity, or returns an error.
-func ParseQuantity(str string) (*Quantity, error) {
-	parts := splitRE.FindStringSubmatch(strings.TrimSpace(str))
-	// regexp returns are entire match, followed by an entry for each () section.
-	if len(parts) != 3 {
-		return nil, ErrFormatWrong
+func ParseQuantity(str string) (Quantity, error) {
+	if len(str) == 0 {
+		return Quantity{}, ErrFormatWrong
+	}
+	if str == "0" {
+		return Quantity{Format: DecimalSI, s: str}, nil
 	}
 
-	amount := new(inf.Dec)
-	if _, ok := amount.SetString(parts[1]); !ok {
-		return nil, ErrNumeric
+	positive, value, num, denom, suf, err := parseQuantityString(str)
+	if err != nil {
+		return Quantity{}, err
 	}
 
-	base, exponent, format, ok := quantitySuffixer.interpret(suffix(parts[2]))
+	base, exponent, format, ok := quantitySuffixer.interpret(suffix(suf))
 	if !ok {
-		return nil, ErrSuffix
+		return Quantity{}, ErrSuffix
+	}
+
+	precision := int32(0)
+	scale := int32(0)
+	mantissa := int64(1)
+	switch format {
+	case DecimalExponent, DecimalSI:
+		scale = exponent
+		precision = maxInt64Factors - int32(len(num)+len(denom))
+	case BinarySI:
+		scale = 0
+		switch {
+		case exponent >= 0 && len(denom) == 0:
+			// only handle positive binary numbers with the fast path
+			mantissa = int64(int64(mantissa) << uint64(exponent))
+			// 1Mi (2^20) has ~6 digits of decimal precision, so exponent*3/10 -1 is roughly the precision
+			precision = 15 - int32(len(num)) - int32(float32(exponent)*3/10) - 1
+		default:
+			precision = -1
+		}
+	}
+
+	if precision >= 0 {
+		// if we have a denominator, shift the entire value to the left by the number of places in the
+		// denominator
+		scale -= int32(len(denom))
+		if scale >= int32(Nano) {
+			shifted := num + denom
+
+			var value int64
+			value, err := strconv.ParseInt(shifted, 10, 64)
+			if err != nil {
+				return Quantity{}, ErrNumeric
+			}
+			if result, ok := int64Multiply(value, int64(mantissa)); ok {
+				if !positive {
+					result = -result
+				}
+				// if the number is in canonical form, reuse the string
+				switch format {
+				case BinarySI:
+					if exponent%10 == 0 && (value&0x07 != 0) {
+						return Quantity{i: int64Amount{value: result, scale: Scale(scale)}, Format: format, s: str}, nil
+					}
+				default:
+					if scale%3 == 0 && !strings.HasSuffix(shifted, "000") && shifted[0] != '0' {
+						return Quantity{i: int64Amount{value: result, scale: Scale(scale)}, Format: format, s: str}, nil
+					}
+				}
+				return Quantity{i: int64Amount{value: result, scale: Scale(scale)}, Format: format}, nil
+			}
+		}
+	}
+
+	amount := new(inf.Dec)
+	if _, ok := amount.SetString(value); !ok {
+		return Quantity{}, ErrNumeric
 	}
 
 	// So that no one but us has to think about suffixes, remove it.
@@ -217,9 +370,11 @@ func ParseQuantity(str string) (*Quantity, error) {
 	}
 
 	// The max is just a simple cap.
-	if amount.Cmp(maxAllowed) > 0 {
-		amount.Set(maxAllowed)
+	// TODO: this prevents accumulating quantities greater than int64, for instance quota across a cluster
+	if format == BinarySI && amount.Cmp(maxAllowed.Dec) > 0 {
+		amount.Set(maxAllowed.Dec)
 	}
+
 	if format == BinarySI && amount.Cmp(decOne) < 0 && amount.Cmp(decZero) > 0 {
 		// This avoids rounding and hopefully confusion, too.
 		format = DecimalSI
@@ -228,55 +383,32 @@ func ParseQuantity(str string) (*Quantity, error) {
 		amount.Neg(amount)
 	}
 
-	return &Quantity{amount, format}, nil
+	return Quantity{d: infDecAmount{amount}, Format: format}, nil
 }
 
-// removeFactors divides in a loop; the return values have the property that
-// d == result * factor ^ times
-// d may be modified in place.
-// If d == 0, then the return values will be (0, 0)
-func removeFactors(d, factor *big.Int) (result *big.Int, times int) {
-	q := big.NewInt(0)
-	m := big.NewInt(0)
-	for d.Cmp(bigZero) != 0 {
-		q.DivMod(d, factor, m)
-		if m.Cmp(bigZero) != 0 {
-			break
-		}
-		times++
-		d, q = q, d
-	}
-	return d, times
-}
-
-// Canonicalize returns the canonical form of q and its suffix (see comment on Quantity).
+// CanonicalizeBytes returns the canonical form of q and its suffix (see comment on Quantity).
 //
 // Note about BinarySI:
 // * If q.Format is set to BinarySI and q.Amount represents a non-zero value between
 //   -1 and +1, it will be emitted as if q.Format were DecimalSI.
 // * Otherwise, if q.Format is set to BinarySI, frational parts of q.Amount will be
 //   rounded up. (1.1i becomes 2i.)
-func (q *Quantity) Canonicalize() (string, suffix) {
-	if q.Amount == nil {
-		return "0", ""
-	}
-
-	// zero is zero always
-	if q.Amount.Cmp(&inf.Dec{}) == 0 {
-		return "0", ""
+func (q *Quantity) CanonicalizeBytes(out []byte) (result, suffix []byte) {
+	if q.IsZero() {
+		return zeroBytes, nil
 	}
 
+	var rounded CanonicalValue
 	format := q.Format
 	switch format {
 	case DecimalExponent, DecimalSI:
 	case BinarySI:
-		if q.Amount.Cmp(decMinus1024) > 0 && q.Amount.Cmp(dec1024) < 0 {
+		if q.CmpInt64(-1024) > 0 && q.CmpInt64(1024) < 0 {
 			// This avoids rounding and hopefully confusion, too.
 			format = DecimalSI
 		} else {
-			tmp := &inf.Dec{}
-			tmp.Round(q.Amount, 0, inf.RoundUp)
-			if tmp.Cmp(q.Amount) != 0 {
+			var exact bool
+			if rounded, exact = q.AsScale(0); !exact {
 				// Don't lose precision-- show as DecimalSI
 				format = DecimalSI
 			}
@@ -289,125 +421,223 @@ func (q *Quantity) Canonicalize() (string, suffix) {
 	// one of the other formats.
 	switch format {
 	case DecimalExponent, DecimalSI:
-		mantissa := q.Amount.UnscaledBig()
-		exponent := int(-q.Amount.Scale())
-		amount := big.NewInt(0).Set(mantissa)
-		// move all factors of 10 into the exponent for easy reasoning
-		amount, times := removeFactors(amount, bigTen)
-		exponent += times
-
-		// make sure exponent is a multiple of 3
-		for exponent%3 != 0 {
-			amount.Mul(amount, bigTen)
-			exponent--
-		}
-
-		suffix, _ := quantitySuffixer.construct(10, exponent, format)
-		number := amount.String()
+		number, exponent := q.AsCanonicalBytes(out)
+		suffix, _ := quantitySuffixer.constructBytes(10, exponent, format)
 		return number, suffix
-	case BinarySI:
-		tmp := &inf.Dec{}
-		tmp.Round(q.Amount, 0, inf.RoundUp)
-
-		amount, exponent := removeFactors(tmp.UnscaledBig(), big1024)
-		suffix, _ := quantitySuffixer.construct(2, exponent*10, format)
-		number := amount.String()
+	default:
+		// format must be BinarySI
+		number, exponent := rounded.AsCanonicalBase1024Bytes(out)
+		suffix, _ := quantitySuffixer.constructBytes(2, exponent*10, format)
 		return number, suffix
 	}
-	return "0", ""
 }
 
-// String formats the Quantity as a string.
-func (q *Quantity) String() string {
-	number, suffix := q.Canonicalize()
-	return number + string(suffix)
+// AsInt64 returns a representation of the current value as an int64 if a fast conversion
+// is possible. If false is returned, callers must use the inf.Dec form of this quantity.
+func (q *Quantity) AsInt64() (int64, bool) {
+	if q.d.Dec != nil {
+		return 0, false
+	}
+	return q.i.AsInt64()
 }
 
-// Cmp compares q and y and returns:
-//
-//   -1 if q <  y
-//    0 if q == y
-//   +1 if q >  y
-//
-func (q *Quantity) Cmp(y Quantity) int {
-	if q.Amount == nil {
-		if y.Amount == nil {
-			return 0
-		}
-		return -y.Amount.Sign()
+// ToDec promotes the quantity in place to use an inf.Dec representation and returns itself.
+func (q *Quantity) ToDec() *Quantity {
+	if q.d.Dec == nil {
+		q.d.Dec = q.i.AsDec()
+		q.i = int64Amount{}
 	}
-	if y.Amount == nil {
-		return q.Amount.Sign()
+	return q
+}
+
+// AsDec returns the quantity as represented by a scaled inf.Dec.
+func (q *Quantity) AsDec() *inf.Dec {
+	if q.d.Dec != nil {
+		return q.d.Dec
 	}
-	return q.Amount.Cmp(y.Amount)
+	q.d.Dec = q.i.AsDec()
+	q.i = int64Amount{}
+	return q.d.Dec
 }
 
-func (q *Quantity) Add(y Quantity) error {
-	switch {
-	case y.Amount == nil:
-		// Adding 0: do nothing.
-	case q.Amount == nil:
-		q.Amount = &inf.Dec{}
-		return q.Add(y)
-	default:
-		// we want to preserve the format of the non-zero value
-		zero := &inf.Dec{}
-		if q.Amount.Cmp(zero) == 0 && y.Amount.Cmp(zero) != 0 {
-			q.Format = y.Format
-		}
-		q.Amount.Add(q.Amount, y.Amount)
+// AsCanonicalBytes returns the canonical byte representation of this quantity as a mantissa
+// and base 10 exponent. The out byte slice may be passed to the method to avoid an extra
+// allocation.
+func (q *Quantity) AsCanonicalBytes(out []byte) (result []byte, exponent int32) {
+	if q.d.Dec != nil {
+		return q.d.AsCanonicalBytes(out)
 	}
-	return nil
+	return q.i.AsCanonicalBytes(out)
 }
 
-func (q *Quantity) Sub(y Quantity) error {
-	switch {
-	case y.Amount == nil:
-		// Subtracting 0: do nothing.
-	case q.Amount == nil:
-		q.Amount = &inf.Dec{}
-		return q.Sub(y)
-	default:
-		// we want to preserve the format of the non-zero value
-		zero := &inf.Dec{}
-		if q.Amount.Cmp(zero) == 0 && y.Amount.Cmp(zero) != 0 {
+// IsZero returns true if the quantity is equal to zero.
+func (q *Quantity) IsZero() bool {
+	if q.d.Dec != nil {
+		return q.d.Dec.Sign() == 0
+	}
+	return q.i.value == 0
+}
+
+// Sign returns 0 if the quantity is zero, -1 if the quantity is less than zero, or 1 if the
+// quantity is greater than zero.
+func (q *Quantity) Sign() int {
+	if q.d.Dec != nil {
+		return q.d.Dec.Sign()
+	}
+	return q.i.Sign()
+}
+
+// AsScaled returns the current value, rounded up to the provided scale, and returns
+// false if the scale resulted in a loss of precision.
+func (q *Quantity) AsScale(scale Scale) (CanonicalValue, bool) {
+	if q.d.Dec != nil {
+		return q.d.AsScale(scale)
+	}
+	return q.i.AsScale(scale)
+}
+
+// RoundUp updates the quantity to the provided scale, ensuring that the value is at
+// least 1. False is returned if the rounding operation resulted in a loss of precision.
+// Negative numbers are rounded away from zero (-9 scale 1 rounds to -10).
+func (q *Quantity) RoundUp(scale Scale) bool {
+	if q.d.Dec != nil {
+		q.s = ""
+		d, exact := q.d.AsScale(scale)
+		q.d = d
+		return exact
+	}
+	// avoid clearing the string value if we have already calculated it
+	if q.i.scale >= scale {
+		return true
+	}
+	q.s = ""
+	i, exact := q.i.AsScale(scale)
+	q.i = i
+	return exact
+}
+
+// Add adds the provide y quantity to the current value. If the current value is zero,
+// the format of the quantity will be updated to the format of y.
+func (q *Quantity) Add(y Quantity) {
+	q.s = ""
+	if q.d.Dec == nil && y.d.Dec == nil {
+		if q.i.value == 0 {
 			q.Format = y.Format
 		}
-		q.Amount.Sub(q.Amount, y.Amount)
+		if q.i.Add(y.i) {
+			return
+		}
+	} else if q.IsZero() {
+		q.Format = y.Format
 	}
-	return nil
+	q.ToDec().d.Dec.Add(q.d.Dec, y.AsDec())
 }
 
-// Neg sets q to the negative value of y.
-// It updates the format of q to match y.
-func (q *Quantity) Neg(y Quantity) error {
-	switch {
-	case y.Amount == nil:
-		*q = y
-	case q.Amount == nil:
-		q.Amount = &inf.Dec{}
-		fallthrough
-	default:
-		q.Amount.Neg(y.Amount)
+// Sub subtracts the provided quantity from the current value in place. If the current
+// value is zero, the format of the quantity will be updated to the format of y.
+func (q *Quantity) Sub(y Quantity) {
+	q.s = ""
+	if q.IsZero() {
 		q.Format = y.Format
 	}
-	return nil
+	if q.d.Dec == nil && y.d.Dec == nil && q.i.Sub(y.i) {
+		return
+	}
+	q.ToDec().d.Dec.Sub(q.d.Dec, y.AsDec())
+}
+
+// Cmp returns 0 if the quantity is equal to y, -1 if the quantity is less than y, or 1 if the
+// quantity is greater than y.
+func (q *Quantity) Cmp(y Quantity) int {
+	if q.d.Dec == nil && y.d.Dec == nil {
+		return q.i.Cmp(y.i)
+	}
+	return q.AsDec().Cmp(y.AsDec())
+}
+
+// CmpInt64 returns 0 if the quantity is equal to y, -1 if the quantity is less than y, or 1 if the
+// quantity is greater than y.
+func (q *Quantity) CmpInt64(y int64) int {
+	if q.d.Dec != nil {
+		return q.d.Dec.Cmp(inf.NewDec(y, inf.Scale(0)))
+	}
+	return q.i.Cmp(int64Amount{value: y})
+}
+
+// Neg sets quantity to be the negative value of itself.
+func (q *Quantity) Neg() {
+	q.s = ""
+	if q.d.Dec == nil {
+		q.i.value = -q.i.value
+		return
+	}
+	q.d.Dec.Neg(q.d.Dec)
+}
+
+// int64QuantityExpectedBytes is the expected width in bytes of the canonical string representation
+// of most Quantity values.
+const int64QuantityExpectedBytes = 18
+
+// String formats the Quantity as a string, caching the result if not calculated.
+// String is an expensive operation and caching this result significantly reduces the cost of
+// normal parse / marshal operations on Quantity.
+func (q *Quantity) String() string {
+	if len(q.s) == 0 {
+		result := make([]byte, 0, int64QuantityExpectedBytes)
+		number, suffix := q.CanonicalizeBytes(result)
+		number = append(number, suffix...)
+		q.s = string(number)
+	}
+	return q.s
 }
 
 // MarshalJSON implements the json.Marshaller interface.
 func (q Quantity) MarshalJSON() ([]byte, error) {
-	return []byte(`"` + q.String() + `"`), nil
+	if len(q.s) > 0 {
+		out := make([]byte, len(q.s)+2)
+		out[0], out[len(out)-1] = '"', '"'
+		copy(out[1:], q.s)
+		return out, nil
+	}
+	result := make([]byte, int64QuantityExpectedBytes, int64QuantityExpectedBytes)
+	result[0] = '"'
+	number, suffix := q.CanonicalizeBytes(result[1:1])
+	// if the same slice was returned to us that we passed in, avoid another allocation by copying number into
+	// the source slice and returning that
+	if len(number) > 0 && &number[0] == &result[1] && (len(number)+len(suffix)+2) <= int64QuantityExpectedBytes {
+		number = append(number, suffix...)
+		number = append(number, '"')
+		return result[:1+len(number)], nil
+	}
+	// if CanonicalizeBytes needed more space than our slice provided, we may need to allocate again so use
+	// append
+	result = result[:1]
+	result = append(result, number...)
+	result = append(result, suffix...)
+	result = append(result, '"')
+	return result, nil
 }
 
 // UnmarshalJSON implements the json.Unmarshaller interface.
+// TODO: Remove support for leading/trailing whitespace
 func (q *Quantity) UnmarshalJSON(value []byte) error {
-	str := string(value)
-	parsed, err := ParseQuantity(strings.Trim(str, `"`))
+	l := len(value)
+	if l == 4 && bytes.Equal(value, []byte("null")) {
+		q.d.Dec = nil
+		q.i = int64Amount{}
+		return nil
+	}
+	if l >= 2 && value[0] == '"' && value[l-1] == '"' {
+		value = value[1 : l-1]
+	}
+
+	parsed, err := ParseQuantity(strings.TrimSpace(string(value)))
 	if err != nil {
 		return err
 	}
+
 	// This copy is safe because parsed will not be referred to again.
-	*q = *parsed
+	*q = parsed
 	return nil
 }
 
@@ -415,7 +645,7 @@ func (q *Quantity) UnmarshalJSON(value []byte) error {
 // value in the given format.
 func NewQuantity(value int64, format Format) *Quantity {
 	return &Quantity{
-		Amount: inf.NewDec(value, 0),
+		i:      int64Amount{value: value},
 		Format: format,
 	}
 }
@@ -426,7 +656,7 @@ func NewQuantity(value int64, format Format) *Quantity {
 // values x where (-1 < x < 1) && (x != 0).
 func NewMilliQuantity(value int64, format Format) *Quantity {
 	return &Quantity{
-		Amount: inf.NewDec(value, 3),
+		i:      int64Amount{value: value, scale: -3},
 		Format: format,
 	}
 }
@@ -435,7 +665,7 @@ func NewMilliQuantity(value int64, format Format) *Quantity {
 // value * 10^scale in DecimalSI format.
 func NewScaledQuantity(value int64, scale Scale) *Quantity {
 	return &Quantity{
-		Amount: inf.NewDec(value, scale.infScale()),
+		i:      int64Amount{value: value, scale: scale},
 		Format: DecimalSI,
 	}
 }
@@ -454,10 +684,12 @@ func (q *Quantity) MilliValue() int64 {
 // ScaledValue returns the value of ceil(q * 10^scale); this could overflow an int64.
 // To detect overflow, call Value() first and verify the expected magnitude.
 func (q *Quantity) ScaledValue(scale Scale) int64 {
-	if q.Amount == nil {
-		return 0
+	if q.d.Dec == nil {
+		i, _ := q.i.AsScaledInt64(scale)
+		return i
 	}
-	return scaledValue(q.Amount.UnscaledBig(), int(q.Amount.Scale()), int(scale.infScale()))
+	dec := q.d.Dec
+	return scaledValue(dec.UnscaledBig(), int(dec.Scale()), int(scale.infScale()))
 }
 
 // Set sets q's value to be value.
@@ -472,22 +704,25 @@ func (q *Quantity) SetMilli(value int64) {
 
 // SetScaled sets q's value to be value * 10^scale
 func (q *Quantity) SetScaled(value int64, scale Scale) {
-	if q.Amount == nil {
-		q.Amount = &inf.Dec{}
-	}
-	q.Amount.SetUnscaled(value)
-	q.Amount.SetScale(scale.infScale())
+	q.s = ""
+	q.d.Dec = nil
+	q.i = int64Amount{value: value, scale: scale}
 }
 
 // Copy is a convenience function that makes a deep copy for you. Non-deep
 // copies of quantities share pointers and you will regret that.
 func (q *Quantity) Copy() *Quantity {
-	if q.Amount == nil {
-		return NewQuantity(0, q.Format)
+	if q.d.Dec == nil {
+		return &Quantity{
+			s:      q.s,
+			i:      q.i,
+			Format: q.Format,
+		}
 	}
 	tmp := &inf.Dec{}
 	return &Quantity{
-		Amount: tmp.Set(q.Amount),
+		s:      q.s,
+		d:      infDecAmount{tmp.Set(q.d.Dec)},
 		Format: q.Format,
 	}
 }
@@ -504,7 +739,7 @@ func (qf qFlag) Set(val string) error {
 		return err
 	}
 	// This copy is OK because q will not be referenced again.
-	*qf.dest = *q
+	*qf.dest = q
 	return nil
 }
 
@@ -531,8 +766,3 @@ func QuantityFlag(flagName, defaultValue, description string) *Quantity {
 func NewQuantityFlagValue(q *Quantity) flag.Value {
 	return qFlag{q}
 }
-
-// infScale adapts a Scale value to an inf.Scale value.
-func (s Scale) infScale() inf.Scale {
-	return inf.Scale(-s) // inf.Scale is upside-down
-}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
index 01d5c2997e..240294682c 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
@@ -17,62 +17,268 @@ limitations under the License.
 package resource
 
 import (
-	"math/big"
+	"fmt"
+	"io"
 
-	inf "gopkg.in/inf.v0"
+	"github.com/gogo/protobuf/proto"
 )
 
-// QuantityProto is a struct that is equivalent to Quantity, but intended for
-// protobuf marshalling/unmarshalling. It is generated into a serialization
-// that matches Quantity. Do not use in Go structs.
-//
-// +protobuf=true
-type QuantityProto struct {
-	// The format of the quantity
-	Format Format `protobuf:"bytes,1,opt,name=format,casttype=Format"`
-	// The scale dimension of the value
-	Scale int32 `protobuf:"varint,2,opt,name=scale"`
-	// Bigint is serialized as a raw bytes array
-	Bigint []byte `protobuf:"bytes,3,opt,name=bigint"`
-}
+var _ proto.Sizer = &Quantity{}
 
-// ProtoTime returns the Time as a new ProtoTime value.
-func (q *Quantity) QuantityProto() *QuantityProto {
-	if q == nil {
-		return &QuantityProto{}
+func (m *Quantity) Marshal() (data []byte, err error) {
+	size := m.Size()
+	data = make([]byte, size)
+	n, err := m.MarshalTo(data)
+	if err != nil {
+		return nil, err
 	}
-	p := &QuantityProto{
-		Format: q.Format,
+	return data[:n], nil
+}
+
+// MarshalTo is a customized version of the generated Protobuf unmarshaler for a struct
+// with a single string field.
+func (m *Quantity) MarshalTo(data []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+
+	data[i] = 0xa
+	i++
+	// BEGIN CUSTOM MARSHAL
+	out := m.String()
+	i = encodeVarintGenerated(data, i, uint64(len(out)))
+	i += copy(data[i:], out)
+	// END CUSTOM MARSHAL
+
+	return i, nil
+}
+
+func encodeVarintGenerated(data []byte, offset int, v uint64) int {
+	for v >= 1<<7 {
+		data[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
 	}
-	if q.Amount != nil {
-		p.Scale = int32(q.Amount.Scale())
-		p.Bigint = q.Amount.UnscaledBig().Bytes()
+	data[offset] = uint8(v)
+	return offset + 1
+}
+
+func (m *Quantity) Size() (n int) {
+	var l int
+	_ = l
+
+	// BEGIN CUSTOM SIZE
+	l = len(m.String())
+	// END CUSTOM SIZE
+
+	n += 1 + l + sovGenerated(uint64(l))
+	return n
+}
+
+func sovGenerated(x uint64) (n int) {
+	for {
+		n++
+		x >>= 7
+		if x == 0 {
+			break
+		}
 	}
-	return p
+	return n
 }
 
-// Size implements the protobuf marshalling interface.
-func (q *Quantity) Size() (n int) { return q.QuantityProto().Size() }
+// Unmarshal is a customized version of the generated Protobuf unmarshaler for a struct
+// with a single string field.
+func (m *Quantity) Unmarshal(data []byte) error {
+	l := len(data)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowGenerated
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := data[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: Quantity: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: Quantity: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field String_", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthGenerated
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			s := string(data[iNdEx:postIndex])
 
-// Reset implements the protobuf marshalling interface.
-func (q *Quantity) Unmarshal(data []byte) error {
-	p := QuantityProto{}
-	if err := p.Unmarshal(data); err != nil {
-		return err
+			// BEGIN CUSTOM DECODE
+			p, err := ParseQuantity(s)
+			if err != nil {
+				return err
+			}
+			*m = p
+			// END CUSTOM DECODE
+
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipGenerated(data[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthGenerated
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
 	}
-	q.Format = p.Format
-	b := big.NewInt(0)
-	b.SetBytes(p.Bigint)
-	q.Amount = inf.NewDecBig(b, inf.Scale(p.Scale))
 	return nil
 }
 
-// Marshal implements the protobuf marshalling interface.
-func (q *Quantity) Marshal() (data []byte, err error) {
-	return q.QuantityProto().Marshal()
+func skipGenerated(data []byte) (n int, err error) {
+	l := len(data)
+	iNdEx := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowGenerated
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := data[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if data[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+			return iNdEx, nil
+		case 1:
+			iNdEx += 8
+			return iNdEx, nil
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := data[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			iNdEx += length
+			if length < 0 {
+				return 0, ErrInvalidLengthGenerated
+			}
+			return iNdEx, nil
+		case 3:
+			for {
+				var innerWire uint64
+				var start int = iNdEx
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return 0, ErrIntOverflowGenerated
+					}
+					if iNdEx >= l {
+						return 0, io.ErrUnexpectedEOF
+					}
+					b := data[iNdEx]
+					iNdEx++
+					innerWire |= (uint64(b) & 0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				innerWireType := int(innerWire & 0x7)
+				if innerWireType == 4 {
+					break
+				}
+				next, err := skipGenerated(data[start:])
+				if err != nil {
+					return 0, err
+				}
+				iNdEx = start + next
+			}
+			return iNdEx, nil
+		case 4:
+			return iNdEx, nil
+		case 5:
+			iNdEx += 4
+			return iNdEx, nil
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+	}
+	panic("unreachable")
 }
 
-// MarshalTo implements the protobuf marshalling interface.
-func (q *Quantity) MarshalTo(data []byte) (int, error) {
-	return q.QuantityProto().MarshalTo(data)
-}
+var (
+	ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowGenerated   = fmt.Errorf("proto: integer overflow")
+)
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go b/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
index 529712365d..0aa2ce2bf6 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
@@ -24,8 +24,9 @@ type suffix string
 
 // suffixer can interpret and construct suffixes.
 type suffixer interface {
-	interpret(suffix) (base, exponent int, fmt Format, ok bool)
-	construct(base, exponent int, fmt Format) (s suffix, ok bool)
+	interpret(suffix) (base, exponent int32, fmt Format, ok bool)
+	construct(base, exponent int32, fmt Format) (s suffix, ok bool)
+	constructBytes(base, exponent int32, fmt Format) (s []byte, ok bool)
 }
 
 // quantitySuffixer handles suffixes for all three formats that quantity
@@ -33,12 +34,13 @@ type suffixer interface {
 var quantitySuffixer = newSuffixer()
 
 type bePair struct {
-	base, exponent int
+	base, exponent int32
 }
 
 type listSuffixer struct {
-	suffixToBE map[suffix]bePair
-	beToSuffix map[bePair]suffix
+	suffixToBE      map[suffix]bePair
+	beToSuffix      map[bePair]suffix
+	beToSuffixBytes map[bePair][]byte
 }
 
 func (ls *listSuffixer) addSuffix(s suffix, pair bePair) {
@@ -48,11 +50,15 @@ func (ls *listSuffixer) addSuffix(s suffix, pair bePair) {
 	if ls.beToSuffix == nil {
 		ls.beToSuffix = map[bePair]suffix{}
 	}
+	if ls.beToSuffixBytes == nil {
+		ls.beToSuffixBytes = map[bePair][]byte{}
+	}
 	ls.suffixToBE[s] = pair
 	ls.beToSuffix[pair] = s
+	ls.beToSuffixBytes[pair] = []byte(s)
 }
 
-func (ls *listSuffixer) lookup(s suffix) (base, exponent int, ok bool) {
+func (ls *listSuffixer) lookup(s suffix) (base, exponent int32, ok bool) {
 	pair, ok := ls.suffixToBE[s]
 	if !ok {
 		return 0, 0, false
@@ -60,19 +66,50 @@ func (ls *listSuffixer) lookup(s suffix) (base, exponent int, ok bool) {
 	return pair.base, pair.exponent, true
 }
 
-func (ls *listSuffixer) construct(base, exponent int) (s suffix, ok bool) {
+func (ls *listSuffixer) construct(base, exponent int32) (s suffix, ok bool) {
 	s, ok = ls.beToSuffix[bePair{base, exponent}]
 	return
 }
 
+func (ls *listSuffixer) constructBytes(base, exponent int32) (s []byte, ok bool) {
+	s, ok = ls.beToSuffixBytes[bePair{base, exponent}]
+	return
+}
+
 type suffixHandler struct {
 	decSuffixes listSuffixer
 	binSuffixes listSuffixer
 }
 
+type fastLookup struct {
+	*suffixHandler
+}
+
+func (l fastLookup) interpret(s suffix) (base, exponent int32, format Format, ok bool) {
+	switch s {
+	case "":
+		return 10, 0, DecimalSI, true
+	case "n":
+		return 10, -9, DecimalSI, true
+	case "u":
+		return 10, -6, DecimalSI, true
+	case "m":
+		return 10, -3, DecimalSI, true
+	case "k":
+		return 10, 3, DecimalSI, true
+	case "M":
+		return 10, 6, DecimalSI, true
+	case "G":
+		return 10, 9, DecimalSI, true
+	}
+	return l.suffixHandler.interpret(s)
+}
+
 func newSuffixer() suffixer {
 	sh := &suffixHandler{}
 
+	// IMPORTANT: if you change this section you must change fastLookup
+
 	sh.binSuffixes.addSuffix("Ki", bePair{2, 10})
 	sh.binSuffixes.addSuffix("Mi", bePair{2, 20})
 	sh.binSuffixes.addSuffix("Gi", bePair{2, 30})
@@ -94,10 +131,10 @@ func newSuffixer() suffixer {
 	sh.decSuffixes.addSuffix("P", bePair{10, 15})
 	sh.decSuffixes.addSuffix("E", bePair{10, 18})
 
-	return sh
+	return fastLookup{sh}
 }
 
-func (sh *suffixHandler) construct(base, exponent int, fmt Format) (s suffix, ok bool) {
+func (sh *suffixHandler) construct(base, exponent int32, fmt Format) (s suffix, ok bool) {
 	switch fmt {
 	case DecimalSI:
 		return sh.decSuffixes.construct(base, exponent)
@@ -115,7 +152,32 @@ func (sh *suffixHandler) construct(base, exponent int, fmt Format) (s suffix, ok
 	return "", false
 }
 
-func (sh *suffixHandler) interpret(suffix suffix) (base, exponent int, fmt Format, ok bool) {
+func (sh *suffixHandler) constructBytes(base, exponent int32, format Format) (s []byte, ok bool) {
+	switch format {
+	case DecimalSI:
+		return sh.decSuffixes.constructBytes(base, exponent)
+	case BinarySI:
+		return sh.binSuffixes.constructBytes(base, exponent)
+	case DecimalExponent:
+		if base != 10 {
+			return nil, false
+		}
+		if exponent == 0 {
+			return nil, true
+		}
+		result := make([]byte, 8, 8)
+		result[0] = 'e'
+		number := strconv.AppendInt(result[1:1], int64(exponent), 10)
+		if &result[1] == &number[0] {
+			return result[:1+len(number)], true
+		}
+		result = append(result[:1], number...)
+		return result, true
+	}
+	return nil, false
+}
+
+func (sh *suffixHandler) interpret(suffix suffix) (base, exponent int32, fmt Format, ok bool) {
 	// Try lookup tables first
 	if b, e, ok := sh.decSuffixes.lookup(suffix); ok {
 		return b, e, DecimalSI, true
@@ -129,7 +191,7 @@ func (sh *suffixHandler) interpret(suffix suffix) (base, exponent int, fmt Forma
 		if err != nil {
 			return 0, 0, DecimalExponent, false
 		}
-		return 10, int(parsed), DecimalExponent, true
+		return 10, int32(parsed), DecimalExponent, true
 	}
 
 	return 0, 0, DecimalExponent, false
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go b/vendor/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
deleted file mode 100644
index 717feaf18f..0000000000
--- a/vendor/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// +build !ignore_autogenerated
-
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was autogenerated by deepcopy-gen. Do not edit it manually!
-
-package conversion
-
-import (
-	forked_reflect "k8s.io/kubernetes/third_party/forked/reflect"
-	reflect "reflect"
-)
-
-func DeepCopy_conversion_Cloner(in Cloner, out *Cloner, c *Cloner) error {
-	if in.deepCopyFuncs != nil {
-		in, out := in.deepCopyFuncs, &out.deepCopyFuncs
-		*out = make(map[reflect.Type]reflect.Value)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.deepCopyFuncs = nil
-	}
-	if in.generatedDeepCopyFuncs != nil {
-		in, out := in.generatedDeepCopyFuncs, &out.generatedDeepCopyFuncs
-		*out = make(map[reflect.Type]reflect.Value)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.generatedDeepCopyFuncs = nil
-	}
-	return nil
-}
-
-func DeepCopy_conversion_ConversionFuncs(in ConversionFuncs, out *ConversionFuncs, c *Cloner) error {
-	if in.fns != nil {
-		in, out := in.fns, &out.fns
-		*out = make(map[typePair]reflect.Value)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported typePair
-		}
-	} else {
-		out.fns = nil
-	}
-	return nil
-}
-
-func DeepCopy_conversion_Converter(in Converter, out *Converter, c *Cloner) error {
-	if err := DeepCopy_conversion_ConversionFuncs(in.conversionFuncs, &out.conversionFuncs, c); err != nil {
-		return err
-	}
-	if err := DeepCopy_conversion_ConversionFuncs(in.generatedConversionFuncs, &out.generatedConversionFuncs, c); err != nil {
-		return err
-	}
-	if in.genericConversions != nil {
-		in, out := in.genericConversions, &out.genericConversions
-		*out = make([]GenericConversionFunc, len(in))
-		for i := range in {
-			if newVal, err := c.DeepCopy(in[i]); err != nil {
-				return err
-			} else {
-				(*out)[i] = newVal.(GenericConversionFunc)
-			}
-		}
-	} else {
-		out.genericConversions = nil
-	}
-	if in.ignoredConversions != nil {
-		in, out := in.ignoredConversions, &out.ignoredConversions
-		*out = make(map[typePair]struct{})
-		for range in {
-			// FIXME: Copying unassignable keys unsupported typePair
-		}
-	} else {
-		out.ignoredConversions = nil
-	}
-	if in.structFieldDests != nil {
-		in, out := in.structFieldDests, &out.structFieldDests
-		*out = make(map[typeNamePair][]typeNamePair)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported typeNamePair
-		}
-	} else {
-		out.structFieldDests = nil
-	}
-	if in.structFieldSources != nil {
-		in, out := in.structFieldSources, &out.structFieldSources
-		*out = make(map[typeNamePair][]typeNamePair)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported typeNamePair
-		}
-	} else {
-		out.structFieldSources = nil
-	}
-	if in.defaultingFuncs != nil {
-		in, out := in.defaultingFuncs, &out.defaultingFuncs
-		*out = make(map[reflect.Type]reflect.Value)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.defaultingFuncs = nil
-	}
-	if in.defaultingInterfaces != nil {
-		in, out := in.defaultingInterfaces, &out.defaultingInterfaces
-		*out = make(map[reflect.Type]interface{})
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.defaultingInterfaces = nil
-	}
-	if in.inputFieldMappingFuncs != nil {
-		in, out := in.inputFieldMappingFuncs, &out.inputFieldMappingFuncs
-		*out = make(map[reflect.Type]FieldMappingFunc)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.inputFieldMappingFuncs = nil
-	}
-	if in.inputDefaultFlags != nil {
-		in, out := in.inputDefaultFlags, &out.inputDefaultFlags
-		*out = make(map[reflect.Type]FieldMatchingFlags)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.inputDefaultFlags = nil
-	}
-	if in.Debug == nil {
-		out.Debug = nil
-	} else if newVal, err := c.DeepCopy(in.Debug); err != nil {
-		return err
-	} else {
-		out.Debug = newVal.(DebugLogger)
-	}
-	if in.nameFunc == nil {
-		out.nameFunc = nil
-	} else if newVal, err := c.DeepCopy(in.nameFunc); err != nil {
-		return err
-	} else {
-		out.nameFunc = newVal.(func(reflect.Type) string)
-	}
-	return nil
-}
-
-func DeepCopy_conversion_Equalities(in Equalities, out *Equalities, c *Cloner) error {
-	if in.Equalities != nil {
-		in, out := in.Equalities, &out.Equalities
-		*out = make(forked_reflect.Equalities)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported reflect.Type
-		}
-	} else {
-		out.Equalities = nil
-	}
-	return nil
-}
-
-func DeepCopy_conversion_Meta(in Meta, out *Meta, c *Cloner) error {
-	if in.KeyNameMapping == nil {
-		out.KeyNameMapping = nil
-	} else if newVal, err := c.DeepCopy(in.KeyNameMapping); err != nil {
-		return err
-	} else {
-		out.KeyNameMapping = newVal.(FieldMappingFunc)
-	}
-	return nil
-}

From 26078e8a5dba9fcbdb33fc5add2a392ba1843678 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Sat, 13 Aug 2016 15:45:16 +0200
Subject: [PATCH 0657/1304] appc/spec: update to 0.8.6

Done by the script scripts/bump-appc-spec-version as explained in
https://github.com/coreos/rkt/pull/3063#issuecomment-239516748
---
 Documentation/app-container.md                   |  4 ++--
 Documentation/devel/stage1-implementors-guide.md |  2 +-
 Documentation/subcommands/cat-manifest.md        |  2 +-
 Documentation/subcommands/image.md               |  2 +-
 Documentation/subcommands/version.md             |  2 +-
 pkg/aci/aci.go                                   |  2 +-
 stage1/aci/aci-manifest.in                       |  2 +-
 stage1_fly/aci/aci-manifest.in                   |  2 +-
 store/imagestore/store_test.go                   | 12 ++++++------
 store/treestore/tree_test.go                     |  4 ++--
 tests/empty-image/manifest                       |  2 +-
 tests/image/manifest                             |  2 +-
 tests/rkt-monitor/build-too-many-apps.sh         |  2 +-
 tests/rkt_exec_test.go                           |  2 +-
 tests/rkt_fetch_test.go                          |  2 +-
 tests/rkt_image_cat_manifest_test.go             |  2 +-
 tests/rkt_image_dependencies_test.go             |  2 +-
 tests/rkt_image_export_test.go                   |  2 +-
 tests/rkt_image_render_test.go                   |  2 +-
 tests/rkt_os_arch_test.go                        |  2 +-
 tests/stub-stage1/manifest                       |  2 +-
 21 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index a8039a624a..cb54478628 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -33,8 +33,8 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 # rkt --insecure-options=image run \
 	--mds-register \
 	--volume=database,kind=host,source=/tmp \
-	https://github.com/appc/spec/releases/download/v0.8.5/ace-validator-main.aci \
-	https://github.com/appc/spec/releases/download/v0.8.5/ace-validator-sidekick.aci
+	https://github.com/appc/spec/releases/download/v0.8.6/ace-validator-main.aci \
+	https://github.com/appc/spec/releases/download/v0.8.6/ace-validator-sidekick.aci
 ```
 
 [appc-repo]: https://github.com/appc/spec/
diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index fc322d8a27..c193964b81 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -135,7 +135,7 @@ The current version of the stage1 interface is 3.
 ```json
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.5",
+    "acVersion": "0.8.6",
     "name": "foo.com/rkt/stage1",
     "labels": [
         {
diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index df6221aadd..c39d6253dc 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -5,7 +5,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 ```
 # rkt cat-manifest UUID
 {
-  "acVersion":"0.8.5",
+  "acVersion":"0.8.6",
   "acKind":"PodManifest"
 ...
 ```
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 6a239c1b2a..c83da83117 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -7,7 +7,7 @@ For debugging or inspection you may want to extract an ACI manifest to stdout.
 ```
 # rkt image cat-manifest coreos.com/etcd
 {
-  "acVersion": "0.8.5",
+  "acVersion": "0.8.6",
   "acKind": "ImageManifest",
 ...
 ```
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 0032129be9..36681e5578 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -7,6 +7,6 @@ This command prints the rkt version, the appc version rkt is built against, and
 ```
 $ rkt version
 rkt Version: 1.12.0
-appc Version: 0.8.5
+appc Version: 0.8.6
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/pkg/aci/aci.go b/pkg/aci/aci.go
index 5a722f508d..f760fa615b 100644
--- a/pkg/aci/aci.go
+++ b/pkg/aci/aci.go
@@ -107,7 +107,7 @@ func (aw *imageArchiveWriter) Close() error {
 // NewBasicACI creates a new ACI in the given directory with the given name.
 // Used for testing.
 func NewBasicACI(dir string, name string) (*os.File, error) {
-	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.5","name":"%s"}`, name)
+	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.6","name":"%s"}`, name)
 	return NewACI(dir, manifest, nil)
 }
 
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index c704469b65..c3e2753e2c 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.5",
+    "acVersion": "0.8.6",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index 571aab2651..69cd279b3a 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.5",
+    "acVersion": "0.8.6",
     "name": "coreos.com/rkt/stage1-fly",
     "labels": [
         {
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index 60d3e5b2a4..4243e4e9b9 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -163,7 +163,7 @@ func TestGetImageManifest(t *testing.T) {
 
 	imj := `{
 			"acKind": "ImageManifest",
-			"acVersion": "0.8.5",
+			"acVersion": "0.8.6",
 			"name": "example.com/test01"
 		}`
 
@@ -228,7 +228,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.5",
+						"acVersion": "0.8.6",
 						"name": "example.com/test01"
 					}`,
 					false,
@@ -236,7 +236,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.5",
+						"acVersion": "0.8.6",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.5",
+						"acVersion": "0.8.6",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -358,7 +358,7 @@ func TestRemoveACI(t *testing.T) {
 
 	imj := `{
                     "acKind": "ImageManifest",
-                    "acVersion": "0.8.5",
+                    "acVersion": "0.8.6",
                     "name": "example.com/test01"
                 }`
 
@@ -403,7 +403,7 @@ func TestRemoveACI(t *testing.T) {
 	// Simulate error removing from the
 	imj = `{
                    "acKind": "ImageManifest",
-                   "acVersion": "0.8.5",
+                   "acVersion": "0.8.6",
                    "name": "example.com/test01"
                }`
 
diff --git a/store/treestore/tree_test.go b/store/treestore/tree_test.go
index a72fee6ca8..49b81c1c9c 100644
--- a/store/treestore/tree_test.go
+++ b/store/treestore/tree_test.go
@@ -34,7 +34,7 @@ func testStoreWriteACI(dir string, s *imagestore.Store) (string, error) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.5",
+		    "acVersion": "0.8.6",
 		    "name": "example.com/test01"
 		}
 	`
@@ -202,7 +202,7 @@ func TestTreeStore(t *testing.T) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.5",
+		    "acVersion": "0.8.6",
 		    "name": "example.com/test01"
 		}
 	`
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index ea4b6da14b..450b9d7228 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.5",
+    "acVersion": "0.8.6",
     "name": "coreos.com/rkt-empty",
     "labels": [
         {
diff --git a/tests/image/manifest b/tests/image/manifest
index f9fb02a6f2..bc483493db 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.5",
+    "acVersion": "0.8.6",
     "name": "coreos.com/rkt-inspect",
     "labels": [
         {
diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
index 3fc48bdfa0..36affa97f6 100755
--- a/tests/rkt-monitor/build-too-many-apps.sh
+++ b/tests/rkt-monitor/build-too-many-apps.sh
@@ -45,7 +45,7 @@ OUTPUT=${PWD}/too-many-apps.podmanifest
 
 cat <<EOF >${OUTPUT}
 {
-    "acVersion": "0.8.5",
+    "acVersion": "0.8.6",
     "acKind": "PodManifest",
     "apps": [
 EOF
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index b9981717a7..fb50b01486 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 7a147e9a0e..0fb60487a6 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -536,7 +536,7 @@ func TestDeferredSignatureDownload(t *testing.T) {
 }
 
 func TestDifferentDiscoveryLabels(t *testing.T) {
-	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 	emptyImage := getEmptyImagePath()
 	imageName := "localhost/rkt-test-different-discovery-labels-image"
 	manifest := strings.Replace(manifestTemplate, "IMG_NAME", imageName, -1)
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 19cea1e1aa..90ac780e78 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index ffa2ba3929..8375fa1543 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -33,7 +33,7 @@ const (
 	manifestDepsTemplate = `
 {
    "acKind" : "ImageManifest",
-   "acVersion" : "0.8.5",
+   "acVersion" : "0.8.6",
    "dependencies" : [
       DEPENDENCIES
    ],
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 29f581c0b1..81a4e6352d 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 1e161f0440..9f987cef37 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 5abc71d5ef..078e6d5f2f 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {
diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest
index d7241b2e6a..d405570161 100644
--- a/tests/stub-stage1/manifest
+++ b/tests/stub-stage1/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.5",
+    "acVersion": "0.8.6",
     "name": "localhost/rkt-stub-stage1",
     "labels": [
         {

From 4cbdf203a17580e38197e753f68e447b19260801 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 12 Aug 2016 17:23:03 +0200
Subject: [PATCH 0658/1304] tests: fix compilation errors after glide updates

---
 tests/rkt_fly_test.go              |  12 +-
 tests/rkt_run_pod_manifest_test.go | 173 ++++++++++++++++++++++++-----
 2 files changed, 155 insertions(+), 30 deletions(-)

diff --git a/tests/rkt_fly_test.go b/tests/rkt_fly_test.go
index 82ce5431a3..9f0bbdc265 100644
--- a/tests/rkt_fly_test.go
+++ b/tests/rkt_fly_test.go
@@ -159,14 +159,22 @@ func TestFlyMountPodManifest(t *testing.T) {
 								{"CONTENT", "host:foo"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: false,
+								},
 							},
 						},
 						ReadOnlyRootFS: true,
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir1",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			0,
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 84f99a07d9..d536a8d9ed 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -200,7 +200,11 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "empty:foo"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: false,
+								},
 							},
 						},
 					},
@@ -237,7 +241,11 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "empty:foo"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: false,
+								},
 							},
 						},
 						ReadOnlyRootFS: true,
@@ -274,7 +282,11 @@ func TestPodManifest(t *testing.T) {
 								{"FILE", "/dir1"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: false,
+								},
 							},
 						},
 					},
@@ -310,7 +322,11 @@ func TestPodManifest(t *testing.T) {
 								{"FILE", "/dir1"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: false,
+								},
 							},
 						},
 						ReadOnlyRootFS: true,
@@ -348,13 +364,21 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "host:foo"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: false,
+								},
 							},
 						},
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir1",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			0,
@@ -379,14 +403,22 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "host:foo"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: false,
+								},
 							},
 						},
 						ReadOnlyRootFS: true,
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir1",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			0,
@@ -411,13 +443,21 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "bar"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", true},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: true,
+								},
 							},
 						},
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir1",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			1,
@@ -442,14 +482,22 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "bar"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", true},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: true,
+								},
 							},
 						},
 						ReadOnlyRootFS: true,
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir1",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			1,
@@ -476,13 +524,22 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "bar"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: false,
+								},
 							},
 						},
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, &boolTrue, nil, nil, nil},
+					{
+						Name:     "dir1",
+						Kind:     "host",
+						Source:   tmpdir,
+						ReadOnly: &boolTrue,
+					},
 				},
 			},
 			1,
@@ -509,14 +566,23 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "bar"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir1", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir1",
+									ReadOnly: false,
+								},
 							},
 						},
 						ReadOnlyRootFS: true,
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, &boolTrue, nil, nil, nil},
+					{
+						Name:     "dir1",
+						Kind:     "host",
+						Source:   tmpdir,
+						ReadOnly: &boolTrue,
+					},
 				},
 			},
 			1,
@@ -542,13 +608,21 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "host:bar"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir2", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir2",
+									ReadOnly: false,
+								},
 							},
 						},
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir1",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			0,
@@ -574,14 +648,22 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "host:bar"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", "/dir2", false},
+								{
+									Name:     "dir1",
+									Path:     "/dir2",
+									ReadOnly: false,
+								},
 							},
 						},
 						ReadOnlyRootFS: true,
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir1",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			0,
@@ -604,7 +686,11 @@ func TestPodManifest(t *testing.T) {
 					{Name: baseAppName},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir1",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			0,
@@ -630,7 +716,11 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir1",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			0,
@@ -655,7 +745,12 @@ func TestPodManifest(t *testing.T) {
 					{Name: baseAppName},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, &boolFalse, nil, nil, nil},
+					{
+						Name:     "dir1",
+						Kind:     "host",
+						Source:   tmpdir,
+						ReadOnly: &boolFalse,
+					},
 				},
 			},
 			0,
@@ -679,7 +774,12 @@ func TestPodManifest(t *testing.T) {
 					{Name: baseAppName},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, &boolTrue, nil, nil, nil},
+					{
+						Name:     "dir1",
+						Kind:     "host",
+						Source:   tmpdir,
+						ReadOnly: &boolTrue,
+					},
 				},
 			},
 			1,
@@ -706,7 +806,12 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir1", "host", tmpdir, &boolTrue, nil, nil, nil},
+					{
+						Name:     "dir1",
+						Kind:     "host",
+						Source:   tmpdir,
+						ReadOnly: &boolTrue,
+					},
 				},
 			},
 			1,
@@ -795,7 +900,11 @@ func TestPodManifest(t *testing.T) {
 								{"FILE", "/dir/file"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir", "/dir", false},
+								{
+									Name:     "dir",
+									Path:     "/dir",
+									ReadOnly: false,
+								},
 							},
 						},
 					},
@@ -810,13 +919,21 @@ func TestPodManifest(t *testing.T) {
 								{"CONTENT", "host:foo"},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir", "/dir", false},
+								{
+									Name:     "dir",
+									Path:     "/dir",
+									ReadOnly: false,
+								},
 							},
 						},
 					},
 				},
 				Volumes: []types.Volume{
-					{"dir", "host", tmpdir, nil, nil, nil, nil},
+					{
+						Name:   "dir",
+						Kind:   "host",
+						Source: tmpdir,
+					},
 				},
 			},
 			0,

From 9abbcba5e6c0e454bec64e53dd212432e8972b53 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 6 Jul 2016 20:05:46 -0700
Subject: [PATCH 0659/1304] tests/ctx: tolerate incomplete child processes

---
 tests/testutils/ctx.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/testutils/ctx.go b/tests/testutils/ctx.go
index 65c969acc2..dd0f4eac5b 100644
--- a/tests/testutils/ctx.go
+++ b/tests/testutils/ctx.go
@@ -144,6 +144,12 @@ func (ctx *RktRunCtx) Reset() {
 
 func (ctx *RktRunCtx) cleanupChildren() error {
 	for _, child := range ctx.children {
+		if child.Cmd == nil ||
+			child.Cmd.Process == nil ||
+			child.Cmd.ProcessState == nil {
+			continue
+		}
+
 		if child.Cmd.ProcessState.Exited() {
 			logger.Logf("Child %q already exited", child.Cmd.Path)
 			continue

From 84d4301fd8fe635b314780890752aee13bbef306 Mon Sep 17 00:00:00 2001
From: Hamish Hutchings <hamish@freeagent.com>
Date: Mon, 15 Aug 2016 10:52:35 +0100
Subject: [PATCH 0660/1304] Add curl as build dependency.

Ubuntu doesn't install curl by default, so this adds support for Ubuntu.
---
 scripts/install-rkt.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 1843e32385..5c62f58ef7 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -13,7 +13,8 @@ apt-get install -y --no-install-recommends \
         ca-certificates \
         gnupg2 \
         bash-completion \
-        checkinstall
+        checkinstall \
+        curl
 
 curl -sSL https://coreos.com/dist/pubkeys/app-signing-pubkey.gpg | gpg2 --import -
 key=$(gpg2 --with-colons --keyid-format LONG -k security@coreos.com | egrep ^pub | cut -d ':' -f5)

From 1bdf84d712fc9c9150fda4ef95653faad28f4ae4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 15 Aug 2016 10:08:42 +0000
Subject: [PATCH 0661/1304] docs/seccomp: show errno usage in examples

`errno` parameter was only mentioned but never shown in practice.
This adds some usages into existing examples.
---
 Documentation/seccomp-guide.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Documentation/seccomp-guide.md b/Documentation/seccomp-guide.md
index 26b597048a..9640483c02 100644
--- a/Documentation/seccomp-guide.md
+++ b/Documentation/seccomp-guide.md
@@ -277,8 +277,8 @@ isolators in the image with new isolators defining the desired syscalls.
 The `patch-manifest` subcommand to `actool` manipulates the syscalls sets
 defined in an image.
 `actool patch-manifest -seccomp-mode=... -seccomp-set=...` options
-can be used together to override any seccomp filters, by specifying a new mode 
-(retain or reset) and set of syscalls to filter.
+can be used together to override any seccomp filters by specifying a new mode
+(retain or reset), an optional custom errno, and a set of syscalls to filter.
 These commands take an input image, modify any existing seccomp isolators, and
 write the changes to an output image, as shown in the example:
 
@@ -299,7 +299,7 @@ $ actool cat-manifest seccomp-retain-set-example.aci
     ]
 ...
 
-$ actool patch-manifest -seccomp-mode=retain -seccomp-set=@rkt/default-whitelist seccomp-retain-set-example.aci seccomp-retain-set-patched.aci
+$ actool patch-manifest -seccomp-mode=retain,errno=ENOSYS -seccomp-set=@rkt/default-whitelist seccomp-retain-set-example.aci seccomp-retain-set-patched.aci
 
 $ actool cat-manifest seccomp-retain-set-patched.aci
 ...
@@ -309,7 +309,8 @@ $ actool cat-manifest seccomp-retain-set-patched.aci
         "value": {
           "set": [
             "@rkt/default-whitelist",
-          ]
+          ],
+          "errno": "ENOSYS"
         }
       }
     ]
@@ -317,7 +318,8 @@ $ actool cat-manifest seccomp-retain-set-patched.aci
 
 ```
 
-Now run the image to verify that the `umount(2)` syscall is no longer allowed:
+Now run the image to verify that the `umount(2)` syscall is no longer allowed,
+and a custom error is returned:
 
 ```
 $ sudo rkt run --interactive --insecure-options=image seccomp-retain-set-patched.aci
@@ -328,7 +330,7 @@ image: using image from local store for image name quay.io/coreos/alpine-sh
 / # mount | grep /proc/bus
 proc on /proc/bus type proc (ro,nosuid,nodev,noexec,relatime)
 / # umount /proc/bus/
-Bad system call
+umount: can't umount /proc/bus: Function not implemented
 ```
 
 ### Overriding seccomp filters at run-time
@@ -342,7 +344,7 @@ Isolator overridden from the command-line will replace all seccomp settings in
 the image manifest, and can be specified as shown in this example:
 
 ```
-$ sudo rkt run --interactive quay.io/coreos/alpine-sh --seccomp mode=remove,socket
+$ sudo rkt run --interactive quay.io/coreos/alpine-sh --seccomp mode=remove,errno=ENOTSUP,socket
 image: using image from file /usr/local/bin/stage1-coreos.aci
 image: using image from local store for image name quay.io/coreos/alpine-sh
 
@@ -351,8 +353,7 @@ root
 
 / # ping -c 1 8.8.8.8
 PING 8.8.8.8 (8.8.8.8): 56 data bytes
-Bad system call
-
+ping: can't create raw socket: Not supported
 ```
 
 Seccomp isolators are application-specific configuration entries, and in a

From 3708c823bad6d9d63e3537db70049e8e3bf0f129 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Fri, 15 Jul 2016 14:27:37 +0200
Subject: [PATCH 0662/1304] doc/devel: detail execution flow between stages

---
 Documentation/devel/architecture.md           |  80 +++++++++++++++---
 Documentation/devel/execution-flow-fly.dot    |  29 +++++++
 Documentation/devel/execution-flow-fly.png    | Bin 0 -> 20105 bytes
 .../devel/execution-flow-systemd.dot          |  66 +++++++++++++++
 .../devel/execution-flow-systemd.png          | Bin 0 -> 43263 bytes
 Documentation/devel/execution-flow.dot        |  43 ++++++++++
 Documentation/devel/execution-flow.png        | Bin 0 -> 19363 bytes
 7 files changed, 208 insertions(+), 10 deletions(-)
 create mode 100644 Documentation/devel/execution-flow-fly.dot
 create mode 100644 Documentation/devel/execution-flow-fly.png
 create mode 100644 Documentation/devel/execution-flow-systemd.dot
 create mode 100644 Documentation/devel/execution-flow-systemd.png
 create mode 100644 Documentation/devel/execution-flow.dot
 create mode 100644 Documentation/devel/execution-flow.png

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index 4509b2dead..5fd75bd69d 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -13,8 +13,22 @@ Facilities like file-locking are used to ensure co-operation and mutual exclusio
 
 Execution with rkt is divided into several distinct stages.
 
-_**NB** The goal is for the ABI between stages to be relatively fixed, but while rkt is still under heavy development this is still evolving.
-Until https://github.com/coreos/rkt/issues/572 is resolved, this should be considered in flux and the description below may not be authoritative._
+**NB** The goal is for the ABI between stages to be relatively fixed, but while rkt is still under heavy development this is still evolving.
+
+After calling `rkt` the execution chain follows the numbering of stages, having the following general order:
+
+![execution-flow](execution-flow.png)
+
+1. invoking process -> stage0:
+The invoking process uses its own mechanism to invoke the rkt binary (stage0). When started via a regular shell or a supervisor, stage0 is usually forked and exec'ed becoming a child process of the invoking shell or supervisor.
+
+2. stage0 -> stage1:
+An ordinary `exec(3)` is being used to replace the stage0 process with the stage1 entrypoint. The entrypoint is referenced by the `coreos.com/rkt/stage1/run` annotation in the stage1 image manifest.
+
+3. stage1 -> stage2:
+The stage1 entrypoint uses its mechanism to invoke the stage2 app executables. The app executables are referenced by the `apps.app.exec` settings in the stage2 image manifest.
+
+The details of the execution flow varies across the different stage1 implementations.
 
 ### Stage 0
 
@@ -60,11 +74,27 @@ At this point the stage0 execs `/stage1/rootfs/init` with the current working di
 
 ### Stage 1
 
-The next stage is a binary that the user trusts to set up cgroups, execute processes, and perform other operations as root on the host.
-This stage has the responsibility of taking the pod filesystem that was created by stage0 and creating the necessary cgroups, namespaces and mounts to launch the pod.
+The next stage is a binary that the user trusts, and has the responsibility of taking the pod filesystem that was created by stage0, create the necessary container isolation, network, and mounts to launch the pod.
 Specifically, it must:
 
 - Read the Image and Pod Manifests. The Image Manifest defines the default `exec` specifications of each application; the Pod Manifest defines the ordering of the units, as well as any overrides.
+- Set up/execute the actual isolation environment for the target pod, called the "stage1 flavor". Currently there are three flavors implemented:
+  - fly: a simple chroot only environment.
+  - systemd/nspawn: a cgroup/namespace based isolation environment using systemd, and systemd-nspawn.
+  - kvm: a fully isolated kvm environment.
+
+### Stage 2
+
+The final stage, stage2, is the actual environment in which the applications run, as launched by stage1.
+
+## Flavors
+### systemd/nspawn flavors
+
+The "host", "src", and "coreos" flavors (referenced to as systemd/nspawn flavors) use  `systemd-nspawn`, and `systemd` to set up the execution chain.
+They include a very minimal systemd that takes care of launching the apps in each pod, apply per-app resource isolators and makes sure the apps finish in an orderly manner.
+
+These flavors will:
+- Read the image and pod manifests
 - Generate systemd unit files from those Manifests
 - Create and enter network namespace if rkt is not started with `--net=host`
 - Start systemd-nspawn (which takes care of the following steps)
@@ -74,10 +104,6 @@ Specifically, it must:
 
 This process is slightly different for the qemu-kvm stage1 but a similar workflow starting at `exec()`'ing kvm instead of an nspawn.
 
-### Stage 1 systemd Architecture
-
-rkt's Stage1 includes a very minimal systemd that takes care of launching the apps in each pod, apply per-app resource isolators and make sure the apps finish in an orderly manner.
-
 We will now detail how the starting, shutdown, and exist status collection of the apps in a pod are implemented internally.
 
 ![rkt-systemd](rkt-systemd.png)
@@ -99,10 +125,44 @@ In this case, the failed app's exit status will get propagated to rkt.
 A [*Conflicts*](http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Conflicts=) dependency was also added between each reaper service and the halt and poweroff targets (they are triggered when the pod is stopped from the outside when rkt receives `SIGINT`).
 This will activate all the reaper services when one of the targets is activated, causing the exit statuses to be saved and the pod to finish like it was described in the previous paragraph.
 
-### Stage 2
+We will now detail the execution chain for the stage1 systemd/nspawn flavors. The entrypoint is implemented in the `stage1/init/init.go` binary and sets up the following execution chain:
 
-The final stage, stage2, is the actual environment in which the applications run, as launched by stage1.
+1. "ld-linux-*.so.*": Depending on the architecture the appropriate loader helper in the stage1 rootfs is invoked using "exec". This makes sure that subsequent binaries load shared libraries from the stage1 rootfs and not from the host file system.
+
+2. "systemd-nspawn": Used for starting the actual container. systemd-nspawn registers the started container in "systemd-machined" on the host, if available. It is parametrized with the `--boot` option to instruct it to "fork+exec" systemd as the supervisor in the started container.
+
+3. "systemd": Used as the supervisor in the started container. Similar as on a regular host system, it uses "fork+exec" to execute the child app processes.
+
+The following diagram illustrates the execution chain:
 
+![execution-flow-systemd](execution-flow-systemd.png)
+
+The resulting process tree reveals the parent-child relationships. Note that "exec"ing processes do not appear in the tree:
+
+```
+$ ps auxf
+...
+\_ -bash
+    \_ stage1/rootfs/usr/lib/ld-linux-x86-64.so.2 stage1/rootfs/usr/bin/systemd-nspawn
+        \_ /usr/lib/systemd/systemd
+            \_ /usr/lib/systemd/systemd-journald
+            \_ nginx
+```
+
+### fly flavor
+
+The "fly" flavor uses a very simple mechanism being limited to only execute one child app process. The entrypoint is implemented in `stage1_fly/run/main.go`. After setting up a chroot'ed environment it simply exec's the target app without any further internal supervision:
+
+![execution-flow-fly](execution-flow-fly.png)
+
+The resulting example process tree shows the target process as a direct child of the invoking process:
+
+```
+$ ps auxf
+...
+\_ -bash
+    \_ nginx
+```
 
 ### Image lifecycle
 
diff --git a/Documentation/devel/execution-flow-fly.dot b/Documentation/devel/execution-flow-fly.dot
new file mode 100644
index 0000000000..9ea81a2ece
--- /dev/null
+++ b/Documentation/devel/execution-flow-fly.dot
@@ -0,0 +1,29 @@
+digraph G {
+    graph [fontname = "helvetica"];
+    node [fontname = "Arial", fillcolor="#FFE599", style="filled"];
+    edge [fontname = "monospace"];
+  
+    {
+        invokingProcess [shape="node", label=<<B>bash/systemd/kubelet</B><BR/>invoking process>]
+        stage0 [shape="node", label=<<B>stage0</B><BR/>rkt>]
+        entrypoint [shape="node", label=<entrypoint<BR/>"coreos.com/rkt/stage1/run">]
+        app1 [shape="node", label=<<B>stage2</B><BR/>"apps.app.exec"<BR/>app1>]
+    }
+
+    invokingProcess -> stage0
+    stage0 -> entrypoint [label="exec(3)"]
+
+    subgraph cluster_1 {
+        label=<<B>stage1</B>>
+        labeljust="left"
+        entrypoint
+
+        subgraph cluster_2 {
+            label=<<B>stage2</B>>
+            labeljust="left"
+            app1
+        }
+    }
+
+    entrypoint -> app1 [label="chroot(2)+\nexec(3)"]
+}
diff --git a/Documentation/devel/execution-flow-fly.png b/Documentation/devel/execution-flow-fly.png
new file mode 100644
index 0000000000000000000000000000000000000000..35e3771fc8f002c0dba0e9fe3a50b93121824ccc
GIT binary patch
literal 20105
zcmcG$Wk6NYzV^Em6$JqSr9-+wx<R@_Lb|)VQ<N_0?o_%vBp2N!-QC@Hu=hFd+2`DS
z&!_k52SnCdbIuX}cz(|yP*z$50S*fe0)Zfii3-YruO|@5v*_2az`u~ny_CS0SGp1+
zf{@3jzv)eRQ4q*Sh?pRsf^+iTypzKFsoB=!!_flomqMRk@X6}&eJOijD!cS+%F+!c
z4G<0`5!P~(WHJr;67qp_TDMd<D^QMFSr5VIb-+u$?fzR>op!ih-5<Wko`cKD^G!|%
zT#OA!V+Sc;L?ej_Uh|7pOGu0%zxFv=3=~9rfjK;457E)lxjUcIN<<WRw=hGN=FY!8
zn!}9soqwzwn!;JND%S5|P8mC*kKuD9J?Oijvv8O57LQ9gN@s8M3QZ-F;o4mvo{M8*
z%%0pwR@<Y?@*^Xo{FqLFo<84Cm<XuPM;H>)2!y@vjM582jtil(1f{yfDC3dcB>wO`
zwg9)pfVRKzFt;{!y|%@$zE$XOW^}17&gW?xm(9(Gmmg$olyp(*YF#kylWX$=$BQlH
zvrq4d)@Z@Y1~qDxvQIrwrHcI9<mM(z>IDf~vihcop5-eR8GE%p_|tvZzB|eKbuOzM
zG<&0{6ezJ);KiNo>3@we9iAn<Tc=)o@;QfVYjn|luk0;jTwrwZ1N*#R2`S-DLiyd$
zuv_KcIl=~Qn$8N-H{ld?<g3{#uFVg~=h24qaoP$7T<4tqN)N`*Xf;A1vX+4-W|v;v
zahatTx~s*!&!%ttgx*hTGVRrV-k;v7Ozj(G7J(R#yCCnsD*VV!5=w{ua%p%=;%u)=
zE@Mz%SZapfogW1<Qbs4M?51<blhV3a{AI)eZqlLU<57*-o$Cn}%XxEauLHyFbGicR
z+p3mK>%+=-VA#g*^bw7|A8yozX=)*{=j0iUHi}Hz-dge&gmiY8_>>RMI?gQbFFJYl
zJ=EXrY*u+n1fj%1qc#sRB$ECznQe8f??#+qH-zm;EC<rb8;@ObN<SQ<S2S@lPG=#5
zi!si*5&b+Ds>Uz%p<=~9naCcbPF_fXiVR_}yV#|6%j)G>W&IX#*)#8bXUncWgQ#y2
zSXot-zpVbH$g!ci2&T1exKN{dm}(hfZ>}i6KW*sd)K;DO5;DePF|<j<oAFqC-mhg7
z|H^@~!eHH6_`<5!wT1C5&LO;av*+Z8uDl_wa_4hooPC<WAeX@o70#=h+3yM^rb706
z@Lkfg!iI*EuF=GS&3axdcb&IPPEMI#HLoO7T3Ck;i8fuG=PO@6+<88*$amN1IWLm#
zc>F1GnY~O|EN`K0xp664jO1UPihwuWFv8s)`4h7i&D1+}u{_y?;X~&?mM(2@c2@c3
z+JS?DVtd@WSQN}q-xTiV<!Mb%f3)+_5ykNvF}4}C(JBjzJ*pUkyV6*z<SFRG00wg@
z=4IPz{^*qit!5~gZ3Gw(4O*@6)}93v0T>O-`QV<K`C<z*Mw3C>L9Irl&&JA=u{o<`
zDuIR4=JT@+3`R42gqf)$IZ`zJk_gAV?#NUUjMc?wf@*5P3n}xp9=x%*w*s~9+$fw$
zg?J)#D3K~`O`O#qB=puf5?T(rtUC@F6IrY~`dtXW&<_O$x_yhu!OYM>s&!?AL)G)R
zu)y%o_(sc|Of~8-y`#QMzUd0>c|0PCEoSF033Eu`tx|i|vhLNieapf;Ipj2BcR(^%
zi<@F~KQ&e2rs3}t){q}lD`=@ag$Du8m0Y0k@oIGO4i`Bt23pTyzKGsdZ($S=;QD*6
zEjv3mDls-p&p={lqMV3{8pmH)YenBmtiW&rgSU`mqCj;$Q3-qlu`Z<wZcas{__f{9
zB1$+WxN>o??CQ|J(~&9Npt#rjrM-?&$&zPHQI0Z0XIWV#@k@;%N!6^g#&oDZgexdi
zByTiceSPX7NRE`@^F9{K*7i<%L6(%N>#M4QS#9HViG<NE!S3cIA%2Fhv4(SQM;M<;
z_^`*zh9({gvK3;^e~#5|&qB7w>(StR35TvGj&lz=8+cb{W4Vn8{pSOyW$z<%J4kG$
zX99oc#5nvY-PI;%L_f?5(qJFNjTfho7f??elAD|wm9us&K}vE=BLZ7C8KJokDM`9)
zfH#1O%#g~dpd1r(heB(2%Qz}BF^u?6OcD}UMbTP~_4|$%YDw2rnQYcfAt1y#Uzlay
zMW8dWc<<enR#3F}KJF$JGzu$D%xiFK;I219z@mIM{9tr%a9D0gCN}t@Kic+E)767}
zZM<3t;R3&|zw-Lw%=j?qSKzmDYHn_U>l;Nm(_)iF;?2vH`6Tgq1EqBG|9GOKoR%_6
zCI9R-Ca@@<wPwhvK=^5maGg9y`+aX5DDCzxv3s}6y^@9fTto22lSjTMMkP?tJFmQ|
zKHwgjS>im~SJf)Qpw+tFl(cX#TQ}ONoUO9J-6&z}&-IdaHaPr>o*inwy`9j@*l8n!
zYVx-g`BYB0PS+!DH}B%Ha7gV^*EuFSC?W&T%Wth2Cu+(STD?3=AemT!y|{0ba63<c
zHnbI3mp}mL>k~b0{}ATPZ!pV%!)te1RMxnCJNQ6$TWv5z!71#po0n(SJZr!g9WOX2
z-2sBD_38zYbn<=hj}CoP#fmQnsfLe`%a@v6)w(7udu+kqHB=6KyUTR%-|*P}f{LaM
zDEv|n%V@%micRG+R%YYiP<>hN9_evW@93Zgk-m2c_SBnNpS8UI>!?6&H5f5AH8M7l
z;c&Xs%iu6eZejVh)#ngtb)*hYV|LO|Ysuj6h1y_i>H(KaEcCLOtn3rx%G{q{TU+n%
z+zr7;uqjatX*ua_vA8qSU~^U&9J(wm9ukzCAJx~%*Oz)|eOkP?#~JdJvMH8J<zP0i
zb!PUF7Wg`v?fIej&d&MhW*FC@`S32b$=n3hz>PNS!}#yVn;YD}4L0AV(nzBNDkc*W
zP)r{8!io|X(=49xCG$8X`4wMW72#zRvQ|0~xjH$nt{1#_uSqlL3DKlZ7=Z`jrTLPZ
zugH`|5^FvYtU-5<_Hc^R3vC@kLGQz9Ry_ZW^^^10)cqmR4GjbHDdVO}8M4E54m6`<
zjMrL3WRfB0F$O!;$DOs+Ps1~_)bNzBJPSk^49wMZS5S^pE23hsrAO!H10joLl)P&`
zvgGg0HMYgT6_amHSvW8Jk5)6kk-vwN8yk&js4Xe+pHif@3cJkznw?|x$z~D}!s5;u
z?OL^0i~bN##fn#MbNwmg?YXGLkZg6q!KKEqfl}VX?ru%?@YSa-Y24XQ*#-Boj5j9G
z4g~YR9$|{7xAcyp@KXLncOsxZN%vr-^Fze_-SdfwH{@8r=Gv8**PN>}wrR7B+N}3o
zxNst(*v|-*GBX<3%QpPe(?Q;RU8S&jv!+ihqeEVVe6mr~gy<0m`x;`+E#hN3uNg?H
zp?9<R*OJ32{Ap9C=p`VBAJ3-MFk$(Bq$7;@Hi{;UGyj0eT(I7ZcSF!c5Y44Kl~{-;
zGc!*wgu^dJTn)`X7|qQwN(Z$ASUjqi_lN@i$80RA8I8Hq>8sBho2N4w?q8=#G3_+I
z_Rf#rbPl<RIH~d|EnF9v(kXB`I@-qG^w>O9?$_YaTlb5483eNglHs@oCz4*bjLFO{
zwj<taKAn9beqGz*Yhq&3EO4Q*13OThK){8@Ety%TEE}u$jad$PL_%Y=Myelet76Fr
z=rK#^s%4w2k^B%>ueVm&?<&uo46fU^HqS81{Nx5v%fR)+k<9|!&kl!2zjwD858FJ;
zNhZ@>VS08c4X+r>*ka2^Y)f0up>iL-NzK{XNLP<y=R$FAIzxYv#s_KQm|Pz&qw2kh
zB(^!4{%~V&1Czd6IzgP5ZMVOsG{<qu47OqA&M6HhW?jQwlY0!m(-1z!NQ+5vg!FZ1
zL~^8XH{YT>NDbk%v^o!!2a;+_Y0O2%jtA>En-!e}Fe(lD?~n=Le=VB}#bp#I+;Hyh
zZXXSViyY%kBz7{o{;uN6$~9j;sS*v_ze?WflTiLt#JOPSXtU)!>AJ(YLH72{!TDXI
zH>c624oD&3+7RcHJrZuNsZZrz@|kor1UI87T(`^_;GR3WNY>P7^^pVbUU@W3=4BLc
z=SU)8Oji(G;&*@>^%Kc+<qGi}?DTpyp4MQUHeLIIi(?8T#N?lS%l#>%zU4VmpXdxa
z%nzmKn(+&8n&Zc;52b1qezis>aKqztr)69|U7C^9F+2L#v(O#(;Vh4N_c$|aIww=5
znhX#J3?=uV6<11k$R~$VFqM^+#s>#Kj9N&u^NiLSxFW(+%Rp2KHag4B4Q4jX^|QCs
z2>zi)wRI&XMXM3KBsq*5JGkTPLO~>+fK_Vkio{RrkLpMiNj8KcCNb37HitnZzzy~|
zCVM*Oo0>R1l}V;WTY_NGHCC`Mq^~*L$hB<6u`XhI<v?0S#Dj;?)><NYDnROe*e~%q
zo~g7yYFce-Iwy<Y_IYxNx0b{ypUO;i`*a~+4{6BkQQf=gJ*t`}6WbNb@m+H?Sh*@l
zHj1Yt(yHv|S8#dF4`4x;R+PUrf}w%;c9^G&W^F4_@S=oV;&Wwy$`eic@K3so$FINk
zq(ts4;6Y2vOB_7c`OzYvR_R6e8;YwVzwltg4M|QOh;(}AcYMHleS0fz5MM^Vl(GW7
z+l(vBxvJsXl>Nin<HC5pw@_EI_`Y@cbGVQA5EOc9SLF2|)^ugYZnDgqf9GH#4-eg0
z#PM)>6WqM_EwJnvsHFc?4RED)w#XHzzYDyRewtZg>SSJl!{e!WV^>G$-<*L3+xdF*
zg2JRGAzRy01rxpPLQQjZo)8C5BR2OH({FmE<xDW;2UM~9=eKd|>y}q~>$^u#GRU;@
zI`<Y|$~s5{c-|6Iggp|DO}jPt8Ch95Cwa2uqS9hSggcl|6KZwX>tyF@cVAQD{2p~E
zLr>|12E9B$&=dBldMZdn7(=@n%Zy<BKrQi1HqVa+L1RCm&KX}Ot%dl&gb>s+d46_6
zSmVD6NBv@B(ZElSG3Q?mi6wzmXYfteSYhZHs2f3jC@yD<1uC$;>vjI-F^jo#GS)-E
zQ%Z`M&Vq1lwGl!k^O<oKJZvg>kYe;s=H`=IoYTmLG*9{h3zQXZaaz2!K`zcPfe|4c
zm=O{jXN-&-ySm8JtF2BD0ks-zxJCwO%AQh3Nu->Zxb*6Hom!)NjE`N+$#pEeN{7Rm
z(;ApdEm}D3fy`%=X@|;;kv3!Z`3hcGUBa%F#%ui}`)N(bY|ddaMqnB0^^X@7#wXnl
zez4Lt)onef(sXBWBU?9>&NR?7$_+E?UJAsHc7pWuJ(cVi*TPQ~dY$;oi(>54$@bR{
zu}1rm->%%7k_H979upD-_EsCjug^z#&X-&IE!DWbNE@7%K1ZvFAkLR>_X8Ow15})#
zd=7NE^XWNtw4>ufq@j5Uvh(!az4gx2FUfn3m_=0(Bib<}N<qQ(KB(|k<yqk+XCG)$
zI{at`6j?!|0KzfO0>d{)8ngEf`Q?i0e)K^ayC{^5@|mu|GrhMAi}2yAZi}d3151o$
zyutd2QukwYRIYS0Z)DEvorusB1=B%&0LYV9hK_Vn{-nm<Y{ImEb|wou4j-Z>ew(G2
z1fLys^M{EJzb_L4&HuYV>emb(QB>aPe_ri|a&Wl1bLgSVqvH(Qlb1(FL<I6@IPX>&
zEYEj#@MH!1TRwb%Pv|Nk>h9`7K}OE#d8a?n-R=LiNOh!GgHy_%P@=xRUZLPCf`&#Y
zX~l+>znO_iU`~#~!v|j{T}#WbrY7$5oj^oZThg$Imwc}T3E_R-20Td+|8f_^<sYHm
zqChx!_7CBJ@c*9|GCe>smha)<;q}&_5!rcpFh^S>M3Rz{pO~3nrt|y4;c(cCMiIar
zrfuM35;ba}p`rcw@#AMgLV}UYKq7N68({`{fQDH@Syfez<NjZlSWIkeM$_?p!Z1;C
zIKl`6<MI427}(gGH(WF{2uMgs2!h1#St6he;|)$$a`N(a9t-JwFuiefCEo&mw2`8y
z_=(5SN=1=MDey2dGaG<g!U_^4HwPbN+7W=<%Qyj{prEkd|Eu^N`Him_ak-?!?xa+m
zTahfe@x<>BhK7b%VdCV};N`v3)A7|7vzfBwpXljzz<WU*LoNt@V19M9ytTU<m6|Gj
zd$G@q8zvhd=>L=dJudFRVasE2*|pK-!Ed!1T3AG!VPza)Vc|-%DMSkki_p%GPMN`m
z1UEOkCC3^yC}eI_p`GuLKlr;)=t)YwWkzdHNKaC4bjCzSM+dL91FzNT?eEW)*>t78
zDR0OX7$LtEu2`HlP;ln$p#PVt<!@d=jl}rm$(>W+B~7sz_%@;T8>rN!{7KfHmh{zs
z={swu7m4M*77u*2Y+uvsqdtJ{YIO{AHkb=>c|edb?i~<$O!S+>(}+uNhhI|nCEA*n
zAdxxAWP&`Yc0Y7V$Y&lC3?BjQYy~;g7*s-_L~8Fac^=9^M+lm<-V=_Z&2swzWC)gn
zreMP}D#+{lGgf>z>h^vE!l!$ySuO|+aLr9V*cl+7<D}_m^~9M_bMO4cYn5TdisoAt
z*LxQwKYC^R1%epbEI4FI{b5Jaa6Fo(gNzv2mOVKnL{gpi_mAQ*7Qa{Z<Mw5w+}u$>
z3K1%GeBlt#CxaCWikRDHRKp`9D+OXHBO@caBfmcjOD{-HAFIU2G3Zu1k&zDm<pZHI
z*W+*MV;yJ26@xE}M+*@TL7<hP+tJdpd~6BlV4u>jrvejl-*w+Hk@Tg~d{1(B1GL!f
z;gx4^?Hv?24bSjv@E+UIx5qj|ea9N?*1H5Yyu9K?=#TBqlwiF_H-vj{at128IC$O9
z8UrRHf8s|#u`a-;gK4rZugNx>{X4Bh*>|Nwqqy^wYmyCM!LSI&u~b=??0z;?<sfL0
zCL<w9!5aJ!C?l$SUBCJyx_~wWy_jnW3|&a*8GES>PM7eFf?auL!zPlk2}QKUV(tBF
za8qUFOnSTGGC(!jnx6@sz0{j2<Na~6UM?)VF6o)#rAbDziFZnE>?f*^U{`1^)}-qA
z!_RjWh-b-rG$s>;SgZb3*{&0;m#@dhCUkC_-%VO@3J8wNGcZ<gY~}nzff&3GV1s~H
z)3c1iwl)<D6g#$Aa=lpkV$Q`8)3rv~a(k%<869PeP6N@ZiG^v{Elvmx?i;w?*#FYf
z>w$zfwC#xd)?j1BL!peSyADR4!oV~@;#8&gWG}TQ$cwdEbnPHCNyE}e-Y@2HidE_Q
zyT8o!{*W4%$AkFwOq5X|M4_BkV`=>ZoWJOrZYxwa9CX->uCjIvj3lpQ=2|D4HrcV=
z{hKv*3&y2nhIV!^Y}t1O$H)fM^R@CAx;<Mm3W>y20^eBgYEsi_<!GB{57iCN#TA1r
z`|Kk~>{8flx|+SBId|Kqagy<M--DI#e}V>AT$}@_DIK4+;#{jJn_6N%-jNYTFz=10
z)oigk;wn<c=@}n(fyV0{7Ft+XSS&-&(juxPd^2x|$fhe;2Jo%Tt$ov9sR#UUjciJ(
z`kIc|z83QSnI?E_?^%ch^S909Op?Y_;HULjw)naM>|3yW_TU>OXFdBcr^ix2S$Vy1
zNsMMFoXp7<^Nky;+-53`X}9_ZXz@|Ba*wu;VtX|l`A$35$q>vA4mz?&iUQpdp?QpV
z@eEc-;B7Ci!W7wsA9U5#C}UYS&5txZxm`j*^FGp0fenUXso|bl!thKNG`B!1I&M0A
z16J{Lwdsqh-!n%dP;N*3w+21^nyoEl1?AU8cs<c&7J-2ht!{(TUoF|h?3~D+yLZb~
zSH7WoEWsCWW8Jvf7Xit&dy8*Cg)7S_qL^%XzvELE|Jj6+R>av=qp%2Xlc;De2sjY1
z+S4@~9<xA|t<!C^&bWT7w`k1bkBFb=dcGsXGK3U@(M7HlN&MwBs-*5h={<}aOSYJY
z2w1Q%t)<PO%s44W&4D1X$dSL_yRmtnqB^kx8YE}0s;KNWg;=k7|G?BVV-BumZd5gW
z%z_R5&TpZsOt^lsFFMdv{D5fg+x9nj@u4wiTlNPbA<8ujlg@@Cc&1<5pMG455}&|s
ztxUX@^8eUqw1S~RT4^D2dRil(QoExhskxhP1Nz6gzXL`K=o&K{_#Jidmv8E?SpCDa
zmXBiJU<D~Vr-6%*o}JrYZFFZjhnp6SsywL(^==QX0S{7`K+f~pdwkwkp6kxo5GSgO
ziL9odFg!Y%S=WG?dY^c7*VzJt<L748mLvW$w*NhM*_tGAc?bxJUtL=Ey0cz9IHu$W
z2Y*?^c|`&Zo34tDnCgZV;c@lz$YJPLexIHZ@FSD38p=>@|CJ5|6O+Fd^csK1bML$H
zO*n`%eg@E#hnSd{j0{iUrHxn|C07Q5vh%shYFf#ntKi(2Ac6>aBk06=A$IN@^0}4t
zdbyS_wa2{;%|Qu^`^uwa8T#W=Xiv3IaAp5P@6<+4$WOe7eD{*Pg7%ozikQQ^FsttI
z<NY8eo($_int#b-fNlKG5+yDTE+Q-p5#*`OtC<F@U;;))RA2s#k><%SBQnDy$h=i;
z#FqYQ0h*1@fA(i<0A>jfM=DaS%GBT-&|saMoXiC!h3=B@GIC8jjbx5^Or~a&D^}>A
zxj7s+H@DDkg7>sGA^)dp`@dW-4abv6#17|5C8?*uzI;jVe56gO`1?mf0;Z*<<=x%s
z&{`vv;_hUTO1-_w7eBQ^0FamnX=p;NTJB@7Pd7Iyu~{u~Xw<6Lu8vnbIyy>C#z^n(
z?&6uvV#^18UcxI^n`44m62f#WBRQBMG46;U5-F{!>KquLQBtwCF73VDnJ8G@-Idt?
zTb01+L<<2|ot~byKHK`jVZS9yOpk7)8+`YS-FgXfzBAF@+6v+1<eV&2$)d()HhoVd
z93uPcaC<v2E-vn`g+Bc2*R2Bs2rw`(zZDDoN=mGXIc_fx^JLO^UIsm$7g;Sfd(5<W
zd42o)lSb@kmF0ZBm|Bfx3?e=cbwW~-1gGQP&z05HoTVl0U#1hk<+QcaiNzwLBO?jx
z8X6=xoerYGw~l+$1W(_B@~pS|#7rQP*yQoyUJlGzc5CZr3IYPYdYe_hHK2b|(JCn^
zQIM09FJ8&Z%jfjP(MhDap9C@)_G849pKcCG6c-mCR%+@S=85Vj^hvLgN+pU?eJzxw
z;B-Dp9|zU-`YjYH+SA!7#Nn_Ly|%JK$nAb5o72o;!DKov3itXol$F-b&W?hX_MpfC
zvYu8@P!Js-pD*`tb*$IZ)<(GK;sFsP?9*^0#KyuBkBEq%Gynq;Q&?1_$iwMzQ<+^<
zM3chf!J(wKQ>kNYOwR3b!?ainGI9>k65Mxlva?0eY1MxwvRctf#ed?<p=M@Q932_y
zsR>1Dm9`1FdsbFf_JxN>I73zzEDbzv*K9d5HZ}}1Gc$gE{)IXOhxo)q6ny+ND{k;d
zT|;B0-hoQ3+WZSeaCmt4_;_XOX)I9$6#q3VE32-q?oVQ|bvhy<0TnVPrsy=UhXjc@
z+A^K?SG4N2vP&#G<G<Rs$MQ}?yB8Kx8=NM*NWX#_xHw9~>2M*(cD>iMhQJ7H^>-D9
z1DRfr4=-N6Jl>h0%FN81ZgOLlN@98Wk)A%{8w_l@<Gw02HTBhTH$LVkZAf5XplQvs
zPZocfNG0Q2!O9eslw6xEQVYRkBvs-%-<{g*PhfQE`deutf3Y_sps!CXCMKp{YyFKt
z!0(gs@W&Weqrv11zVELN_0FT+6K9LigZMA#%ZbHCk5{{M&}dXeNl8f~eSLk$n?2mN
z*LtEN!H-(M!Q@cL=jKatx}4~n45#x^rZp9Xn!8;d#OzEKQEh|0pjhx#agaApz#mZz
z0gDOBxG|O|BcajY7*kkSNQ{b#`pa-2akSi^&lXpHsz6ERX`}Fc^;h42FQXS-cQD_u
zy1dK>RwXlTP*7zh6Qxpdf3wH!$=>_OwDk0k^$xqj&dzM0Z}WYp6Id>>rwWgiQBcsg
zndUWEX)?B8asx(sb$_2G@(N!!nA)z>A(*;R3H<A|?LWK5|2_VYA8|L}@p?*vMWE9`
z_}(XuP74JayRXUZk_k5`Js0i+rMAAlLb?gucm)*^5saSR>hmGN;pC1E!Lzfo;jytN
zqKpMPCV->iXR9r!p!yAPl|qC4{lp|BzCV7v80oJ1@lJzDBGzKIy3A~<__++(f3=pz
z)Dc8PM1dh8f~en1Qn_6CMMYnO7EXxAijVv)mV~~Vnwq(V1(-yN(d*p2JVr2ZJ5wbx
zrlzJ5gKF>K`e09?@$l%h)>lV5V8YuwgV90b^s!ONw^}GHFz~6pn*RG&S6kcr`*#=~
z9-c<$<L4mG7aAEGL&1z6pPh9~PNI2ucz}62Iyzb!OyQ)oDAs5|12GE+7Z=2ymXp}R
z8A3wBt(gk4*x1-;8nsy3yaW3G^a6mTgp7-e@L5~?quu7<`px;SZxz%ho&9B9yOOEt
z?-!!Ke*L<hw3sQ+c_GSdHW>{{43e4YX;JUB<z)hPPEM+{k4tN7#Oxd#;@%3?<|@DR
zy2Io^+$8z@TRtzWya|M;H$TBRXZs;wi|6L%_OgJGrrGRH@$@08s;Y7gj{Dgg14$Cz
z3R%JkG2N+mcJu1bv%w!9YR|yv(+xNN;~IzEufIUte3?>cZ7EA9hQi0k_j!`h+G%h4
z&rF5U@ySVBSC?NBs}<$0pReyop$g;8*>*c!%U#=_@31jbBeWXz*<4`*o^XpN>wWA_
z2RKn=GG7xmyF#(Syy<TZXW;O-$IItQkNlD+17qjc(&D8<o%``Uwr?a9Frf?q|L4OX
zI#Md+w~qgkHv#SNqWh^-@eRmPSs)w~YPF<-r<2Q*#x+neG$f5AMn*%+HAhMZw@hiF
zUT6CfqNSy^PJ0RN=2<NmKsPO6K5}WeeGHfN-WU)$=uJk6dt<2l)6($q@bKPZvrsF|
zk7S9ART#<8YBq|d@p!P=t_6tK5sML%k-?;AMLBpLoTnPh7`1>9A6`*W(VND`Ndwi$
z*jK&1y0Tt_BF9pzv{ji+vDvJ=_*}d>W2mpcw7Ch}3dZ^P;zC$Lf|;6zhUWLzA~^k&
z%IDKHR%zlXASuFp(r$%VE;RNGB(cskx-gz@4D_9*`G16pWvF|CY7xj2);r@AclY-;
z_V&a~Oz*wH2f}FU>hkOA5~il68k?EH41>4>M2bHkS?8Klk&wIusSylxcRalw2CpaA
z?o`Rp`OmWDcK-_NW&T(?Eol(qz<zo0;)S-car`c(u+K+U-)gh{&CTvoo%VpRFvG)z
zrbhScNS$`SGRt`m$VPv{cTg&P`}VC+wJHdN78G1uDM`t<Kvj_CNv8Vv5#s$NOZXTV
zP2_VWF$sx?j?d2(6ViNrUp_@n5SekfU87gK!^biNU<XsVgR`>qbZEe2!~0GWboBO8
zDwVIV?eB-y)YP2Zdq0Cw=sjF)DRHL}Lt!);Bqk#Ip2F!gn*W7pvRDKDbDiya^m%eh
z%Jq7j)=8)o%H<lmey-rzUhje;ukG6FV05}%$pnUu&dz7Uc{2D2B4n=<m2`!9Ef$+o
z%JjN*_4EYz`JYQmOM{s2pCb`x%E81pT#HgB<X5P-1R`>o=>#PZyk2)o2hIQ)>&WmQ
zRiJo(aaDTi^t3XI`E<JbBhZwd!@vXv1VGa5w?{*8*yZGx-}nj=m-llyA9<UM<^Gyu
zJ{`@G`24lSAp&|rjG|&VH#b*WUQS3!NvV{Onu;gj_jcs70>2JwH<W=1#HX|Kb32dX
zqN0IxzVA%$B4npQP9IK+oEROA4ClGY56D6e@)6a?w6(GMGdcNnoe|8ijXAa6e<(?m
z;TI9aVq6ydUEpmBASZ~)$S5_Js8&&4TwGv<h>}Y_X-MFWE)_39<SbL8v3t^vp2RFn
z%!t@nVKCqS)Q$-I;{E+$dwP19jEB9!&Nbt}$#~aviAZp|F-XwrHFRtF)mbDrmy|0g
zsI|zF28<Mh{C%PNInlwv!C}?RWhyiy<Bz@7>gNVD<^`uQAK8`b{`qc@7J|G8VWwwe
zb2Moh+Kg4-i8I+TX5CRW!Tg(wm*$^d85`0q>4z9!LNXv5#ecHnq+(4TpT3h&!?3Zx
zH5xB8Ec)sp)qR_R9H`E(-iVbka=p8~GyGeH85k=jewS=J^D+@e1VjHF(|YR-#1mlQ
zdFotun-_JqKH+tDF<zaoF+;GNR5}3U1e`kQ0!9gvZo!#2&@l8RYh9^wza{w<F8U|a
zUbGk&PYyj!1P<Dd0Hgt56X*!Cbh=++aD?PJ7SvHT^Z;+hF~&L3y4kI^N}qpm``1$-
zxEQz$YV0}%Dv_&$`x0HG=haCsY5%_Ta*mx733x|9y9MzsmYx*Y+xYK5&GCi>@-Y4Q
zGS)!q8fd?WRtXSq;HX%<bAEsLr3f^xWZzxuD=y>U0TQCzbXhXSxUZiOQDQB)|9_D(
zfaK4iGvI!rk|PJJqO@#w`=_?Hj7NSC)#&Tr&1zQv=k2xTm?0;>sc#=uX#(_0kU|~?
zuoyn*x^<hSAm#4)zG@o4&e06a+S)^YPx7>_xN53}DQMH?=HCFkov$(P*Q_xgAS1dm
zeaH%V-GD3xWE+41<)s;G<2ZqJLl$)50D7&d+)+Keu9E;@o*=G0finl*Kq5(7vo~O7
zA*B|WVNTHxH`yP3x~M>FblOB{ed|dL0mdn)qT}Nq)F&+@J!rlKDVvcA>iW|Skg8WV
z^>w*0`P(OlfqAwDk|t9tM2>q%85(_9d%P%Jk8=fbWsP+Vb->voJ6ThrfCiAOGvGVV
zfqzF%B^CEc@W5(N?6G@z8LC9i1?I^+mj796a7(P7aeAIyZc!2RxL%u6w4{bPUrC@b
z*W3Vr1ROTogb0|#U(rT}4-HAl_kz89FWk}p@c}DI<j<uMRn+SL1?`+9sCs|~S2&W`
zaSwj^<XqI%v9LhSll89b#KCzD6=GgU9j&$k{1Y+jGj7N;W$>LzqHBb*fb;;(hXMGC
zfPW|=I=QQc7q=bIDIji*o3;aeX}1Os`I6~4)B(WF?TKHsJa$fFz%@dxxtrbsRG7I&
z)B)g#K`Y_$u@Hg>Ku9tLtD4Ea$_PkYK(vYk)_{KX#xx-FnaJjyaMDz89K#)kgDbB9
zAhO;YFW1y*-aC=pkt%?$%-oW8^48i@7{R!!OT%kaXZX^ph&4ZtlRjK)xJ2z<-GJzp
zRd0F|o8mTtHLh5w)M*}L{opu^S*7OrZ$NaIRXu%yF+`-s>tfLD?M@d}BR(9(t+p5f
z=peVYw<8i0gNiK|y1&jhIJ9Lsyu5L;I$H2~KVI_)H2^XLF@t@?Nwz$gY{0JB8x5ZC
zs|MMuB#wJ@aB#iyyy)Ugw4ALD1!eT|;i1+~L#Mzf4Tgxw#KC>HvL{Fs)u<ZG*o}_?
zEC8r>E!=|lh^N=JfsFE9)f4t?{K!ClNr=A`QrhqsVIE=tCa7$GUNjp){x73Yv>B&c
z70U61x1XyX2Mo6pi4tE6#7d_%gbHNQ*?BzNby9(la(A&=^f>p`=45IfW2ZXBKTv)_
zgAd*gGidBknJ7@bcl@2a9t;E!S9)gpVL^;?`@4QA9+MrprR@_eN9CW@O!Ve9NnY=0
zTxk?9<ofy=ijf@N=Pi~Aqs)ve<IAJodud{mEBPHQ;_}*k4^Mi3=btoH+U`@C6Q~nB
zWyQU6w$Nj5dB34{-@JPxD`InlYepO~Tb=*Mw-pnTJiT6I`-}45vj2~d8IC{Qobeky
zUT4(r<8h%0e-DEvU*|$b&3jYpq?(UY9T)dlk7G!SI@5TIGtceSn&0bOs7`h|Hn~`5
zPxHLy;xxu$184jv5V6yPy-saVH@T(+q@5nZI_K6Ifl!sOS=yd#v0iiMB8Bh1ZIyVb
zEDqqnlPj}H_+Hdp-N*J}lWrl;a@GZd(^I@pbFuXF^J`!PML~(0xEcJo+xU6#VY$T3
z15;CrY{nmZ21W|<+_UKi@RvfpoVRB^yM>CTQ>yTo4dCNSglx^bHwCpc+k8ysk5emx
z1-eV}na2;#mpzUy2!8y0eAf&lq|tUe1h7m=0O<$7|4)S$YCWP_(aEZNS|7lD13ob=
z41Z4b@HAB0ybll(KH0&Jp}#6Mx&B1RkEW|<@a<BmA$lyC!zuW;Vy}F&`Y-Ub)o~?q
zTL;%LL^rHYhCvrZ&i<LNo_%RkXQ@#vUnc%U`ey{!KFs0}W~I`*99Vwbt#|yNE{C5E
z^Gt3~1JA_-4qMvxBu{Lss7336m271a+qEnsV8H8N!Q}q6ts9!~iy%d9ig0-njxw4m
zXHvFd%Kvhm^@nT<fxAp9Nn~v5H{UvXVC{;>*k!c+%!p!1*Iiy{l0gmod8)d~WM&$Z
zQC`6B!cr3KBBC4S99KoE-dL6lD<#(AMc3>?ue(dHa9Ay1Iz_l#_#qJkN1brJfp0fh
z4Of2$0rF>=<+e6}METk(L9`a8RB?yEP|M|V5s8V)Dc3vhEqso%HS)0Nxx9mT+b=U{
z0JTbKloG=zRw<<Ay?0=J1wrqItLr`B4uBcQHjT4$*76j1Ek8DTYEkoF%s-*IHErWS
zy3+J(C~)JzJFw$WJ*stgu<a@rim%(U^Dus-U{}0;xJpQJ=dP1T-6fbU#}7xjnsvye
zrS&ws>`S)zV1ND0lieo9m&$9sq+tXk$4G!=>KIhS@G)bmg3Yylg_L_1neKQQ&9w8J
zp5EMeH%^Ipinm!0=vE00#-?U0eD-1OVQ-|{eAiZags<>WU-{+HMN})qOyX>v1VAuY
z(ymvMsSU7GET_?WE~h72aYUQ%MAnT|UAzp+Y~HB1;0gtIDaNEV@$@5?U!VaWsZLj>
zH|rp4Ni|&gol`shn8y{8`&>uDQTj`+y6O;>G$*-OqlYmnWr^d%@-?p2Tb|~M#@J^k
znq=(j4kFQ!pVTXqg|^g5b_2h~6|XONxK3p_ULz1F<jn(jE655uhNhyI7sc+Zd8|`j
zw?O~_;cz(Sh{h7}k_|3&oM(w&FW^}HH-Ex!)u&<lPIv!gs02n@dCMvv+IzQYZ3B~6
zp9RNT$gXJBUDDm}dHg(nSMb<g2o1&FYeX}3Qbt%5Qa>S`9y=$yhZT=hF1H>!vSQsY
z`*xOdVV-&ayf35Ii+}W#^2c0hTT&alK=J{m05*pMG$7=YM^(=rO#lawMFx$C=XjIm
z@0=VV0VOwg;hH~oqom;T-sB^4x;N1{#PV*Qv3x}njeIK0fPtvYdcEYS;<yVY1{O7w
zf8$^9`Mao6-9nUl<kW$>l1fS_7J1^~&L63|+x}S#oimBSe8w&n{Y}pcjhmztSbn(5
zh2UUahmg0Wjy<2<n-`=u2@0GeehLCNV*km3Xp7~!$=*h5?Y5`FZ(amFB5qYC+plK%
zDT_PE0H||LsPzj+rb{DW#}NGBoD6X{YXH_Kl8s|{(xKS_P)t--z6W$u`}DH?*Q4JW
zRmi$?(yEc=32?-jP667P0IXFQj1E+sUO1ik&j#XwEt0>j4Iq*H(O8bYG`pL0fwB0d
zYkF>xLOvy>q-Bq!CqKYl$)+4mQvcH7>FG?<WblyTVYd2!7(j#l<2L&kTsAPOsw%r5
zTMpm0E_l@UG8nXIeJX1ByQ?>G=Lt|z3b2<M%eBBgS&lZL%wS(+X2};;+gXwL(ZgYZ
z%EFKT`0!xgwWR{Mu4K%o<q$-^*20-#==EI35kZ9wa|MAl0uuyUV3D5tr)R-xKZB$(
zMN~fnYGOh$eL7}*z#EX2x%(c=Nkb4Yy(estD?n8iG*4fCq?4~!fzom-Gii@ePEh@H
zgy6qq_V>N?CxGYix3|G(nedU1q_*Tp9C{rupw?+N-CW%s{&|EpUCvh?A*S+rfnJp7
z)vKFCL?MW*@#@mj(L$2PVIY^@hPh#X@_lpChlMYf2lK~AN6vb%FZl5O8>9Yj7yZBD
zQ+VF$<?5YGN~2Q#gT><S+RYv4F3<L6P_ePG#bYRalajELSS)%KO90=e)=)i3V<kaR
zA+J8U-HeQl?W$Sy?7O=@wTl5-PY9VzDv%9CKywYW6+@r~^rvtt<t+S{#$NZATnrd2
zNGAV9Vov~|0lYC=rNR&c3rns@mD%0HL#56(N1PkzuIA?EY_4a<Uwk!yWx(t6^XJd4
z?d*WY{`tCnaQkd~jLB*NM^8@=s39Ui_6P_K9heB?&sYLd*V*nA5<EOSAO#&xiynE@
zT0rJUL_`Ed+Vav;x?HYw9e;+bWoU)gW|hN2ix;oQ%~_9~N*uLHq#2fgfWYY3nB4>*
zA#^~VAF4=6rvLB{`4*@K+AAG_{b{^uwY6+O*|=T}=T+Eof4JW4Pht%RT{aMpet;$!
zl}x(7q6vr)BRLZ2K=ADDi6X1>xMhI=fmsKT1oQd&7^9)oGJ`&}uO*rT7yGjll(0XE
z1NXWejamkG=@<U|`NL#3DY@@(bbq-xR%5lOp2lkNHyX&JRkIYa+0R9#q+%cx%*<6E
zquyYR7pbwD0C`C+OE@&!+uNIU5+)l6_yz80xVSViR7$i%_07%AF4giao*vuK2qMZf
zTpo92)8X`Qs_P{~n-={8139&|wKbDHXz$*AoSB{7RCxqr2!!EIwLCiQ-;EVTYBl2X
zKp)@I=j_x|<b4-MtC8t)x?xqcy0i29q}l!Ygv;}eZKxhRTHopEY>m|zaFfIg&CSo(
zIqb%&uD^`<`O`ZgL8bZp;&3rME)E@Rf@lhPQl&Z|&b)c^rjEzU!--?ljUt@;g%nD|
zq)#M(4}Tqs3Jb@JZ*%q39r_kK#>b<tuC8h(XUg<ofqaC+<^1z+mD#2W84nMhy!@DY
znncO|WXnS{8*n^+%a_kX1YCvo?3#_8eVt>03+Q-2Ix&se%+AV++U)sd4)ldN(A|fw
z^WLAK5{ZPZ0o~grb!O1<@<0P9(sx}ak)Hvc)CJ<YWc;UZ;1xgP<Dp<6Fc=N{-O`5g
z(mZ>Ayg_C2df=kdYF?YGvy)6_`{FW6-Exw=x4#dRMkGv3Oqam|&-<HXc01Cca-h~S
zI_@b0H;i9H!>yVgkKKl3@%%kX-baz~6@8_iD35XpfNOxFAqU2q1jw{cn5TD$WP5<j
z?&OB6C2e4(GnfQuwPGS7BIOkoQL(fds_7@@z&{fOE=fW|Q^d9D0u)LvnMi}~tK63E
zaQuStBBhd4d+?t%wDMnErlK@}enM+R*e3<_T7@!QAqqCOtCU&r7>)V{28!mMV~2@Q
z-6>V_GJ6MyYk=1hKv>|cq4&74Z)|FUx6dqLLy1fKfdX7sumGMor9MoT=^fHz4FI<K
z4~G<g;7P7dFwk7VajbX{LUarb{Xi7qeY~saW!9>DtI{6~;%$fXY-y*>YS&1)fkYTS
zuk=&YV6kW$8VU!IfMOSF0M*q5kxy2)(PCQne_*&6y`Of7Dtp5j0udeR3V;AR7r?+G
z%9dzyzkU0*w4y=}_@R2sfviWb+wnT)2CNll7nfi2!qs<v%5Ag$G|fG`YFZ9{)Ul#3
z>y$}~iQ>2(*Evpr$VdWkl}UFPuAIAj<9i$&YQ-W|MYy+bpRk&ooE))}latBjV9FCC
z3B%=l`j&!(L}>p>q6Vv)PVu*b*wd>~P*Ab~a})*Fty{5iaES5o@i__Q1azw2{kr_D
zhb&E0uPfvW1t%EtwVj<C>D?^y07L@*)CUPdR+CXd)iPb*UL#l}ylAkz^W5<<F)8Y5
zYen;<QzF&X)wBJP@X=~R!J`<;8%-0kyIR-P*NX#CM7h56R%M)cgh0^w5J0KV;dtB%
zJZ5vX^h(9*Uz%&Gs|~^CbiX_9F4Sm<4f;TZR*T@^r|jd}jz%Iz2+#$<3fiWoy&$S8
z_AWB%mt~^{Qa8qghKBa;I|47*K$b|j!p;j=SUn31DN#`<XH5p8gCEWFr--_<(+i-~
zOu0d@_)HQQS9`(;UshW?J0en2VFR3EVlm3B2z~*9>+8+5I{R%DY!>sSHedLcmICtx
zvDXM{?i&AOWwsdQ@#qoIHtZ)q+r#}W>ihQ{1xh6WK|#78Au?I~eeVq@%qv73C>WTs
z($b}Fd@uc0?`OoMq`&81<@0u&ShS-(Wvf(fw}6lkVhV~t@KB%hq3>QHU}ek6pb4Oz
z%KaoVwJ9%HyDrH}1M7~q%6NpI0kAg!-LgRxmH@fvX}ZBh$fXh(gmNAL6w3kB<7xTS
zAe8lARO<wTxDs3MxKF8~q9O+PnH;#?9D}}CF(3j^o(GNn>}&+b9r#n%m_m+Q5Y?zH
z!DR^tRpHAowft#%pBA<tx>SbXHC;Q}I)gqv-4nU`55MF8POko8Nt9i2b1YIW^I7kU
zGvf%+r6MKu<9)dLp1^2i$`P$AmLUt+&@xxrE0xITE5T;3M;>n1GxBIM_})KTBU#(S
z89=VHAF(Iz1pFbz`R=MrbZw=zt?fB1EUc9O7iwS{)B}~!<PbKn=9zK)xa7wn0***1
zK-@fn!ots0Sfk|0-(!Udzk?Gtk9gEEGYbZk7O-YuB-tEFV+3Q}8%q-$6Y~Kq@nsP3
zgjl@zcmxT}hQT<_RGOdyss~O~06yNHEf&Ru8!P+V<5M6GDr$QGGSL%u2mBn|io3hJ
z^YMyrZ*gTt27ywECJ8C&D;XIXfW}6qrn-B3;edhhV6HA}^x$bFR8+K&j6~euUQ$_I
z!@WaB<{L`oE~~7}HlHbfi^UWGWWx2zhldBq6So0j98zjDgcn2h8qSA<Cthz2glC(R
zH8Io4!oY?GPO!gMldPJT0eoTO<UF0y@_Gh<)l*7u_ea`{)AGy!pIT`-p9l(r3b#v3
za2HP$?pvXMkc*28#bFkg_0s3{J7A9xTI~uA3<}Bw4588WJP0@ttdCcOz|QmrZf39*
zVbTF4{Rg4RIsbEK^<g0kX+??XKWNpd!@s9hU#d(Mfk_i^a*r!O5!jrMJ^~{4ygW7N
zXJR5;x_j@xGOOwen^j?eG%z{r$wAcE05r;eXFL!vNgyzV13$=9G13=H13=8_=@2i>
z5unb&Q5O8)Jl+Ks%93M%w?V*-W&!i5WC}+N@YEg;ur98#4*-m^HQ&Gr=u93calprl
zsKh2D1QLt=@b#sbeX%uJlvFN#LG%Tbaxo3FAd<aU0=$Uw^k&%~|LSZ^#>U1*XX3Zw
zp;3k}QZH--6hfs`OiWH5AQnaXrC6OE*fRi})SfQYahb&Dc4gvryI2E>4@4#rm$yk$
zk;Ll<rD4*O$l`+yjD~6Vv|7zvgM)*VUNdU;Vv+HzR(Jp^=BQSg;&3{K0QTN=X@I_V
z_+3<AEb{31cp20`)S%b}qhPbr@y1(ysCU3KIuO7#2q;^-W@kC4$_l^?0ig2o<EKyW
zyghC&DEdGcLIjZprq<<@l+|iM|Eao7VwJfb(!0Mo?@wlr0++M7*i!-Kg~iKEc>DmQ
z75zB=jE}^`KL9Cw8t$wtqKu3TNN*k_F+Ltt5&?O6WMJ&uCnsY;viNTtjPBoYFeR6O
znWN=)m0D{8fbqx}7$W=oB|$;_iHS*p2j2wHXh=s_*KaO<67U}^8nC{Z$9(1y1ZMD@
z=F^`tv$AFyoajKEq7O#3P^|{ho84|h+t5%LfLxF}%;#z&{s$Yo`~P5LgF|g?J^*e3
zLk@Nr9(OOO6Q80AC}umsCIt6nx!8>G+1{RMs#rt*A+S$|pU>l+nm&YziYi9XEv2T0
zbzxzFGR?rMs$#yyOY2%SlGt!CSxi{?6)>=5gQN}86WV8&<lVi!e!yfSH}8PkLm^d^
z{PkleY!viR?c(4D^bg97&h!So(FC-#h~7LNH^yun%L1o=_EgdRK-K<KWr5Z~R8+LJ
zrza3RDS5cZ%Z&U0niDT=9i2bGd(%;+#kUG72jDUPN6ZE0t^{BNIN2>}iA+d%(+V~_
zJ4nyvQz{7z23J?B;mnwsvabQ6>IZoeEY8;P@%PXjbkEZbDbI&%BhW5@z_bZ`30Prr
z&Wqr6lE6CsiIsH|l!0}<_V)G)eyVUM1Yr>d0H+3nkn`*95;V7@WauY>0Momee?qgR
zKi^L!^+ET6#cZ1WpEhhP7V`i=JbR5?U0ng|m7J^moC`jG98^Dw!m=i2W{kk+fgnu$
zo)nn5nSnVf<`Q7yED&3;f`tEJ*zWD@d<nWa2q=y)*ln}@h*0370Fc9`*L~sV=Lh5o
zu&$Z@VZSEqQ*QCR7Zn$88yP_c#x8I+?R_RvrT`RVcQ%h5Rw;ix-llB`1d;UV_X1=f
z$HuOgeqwDm8wUoyOyo4T+ohG2%<WHb^I%VV&a&uO9{D8F;x7#BcOh8*NG)c86FNxM
zw5_4}_`@zVDM&Cj3Y<3v2Vqik+usEZ`<i`8M9hHx<AnZy8tr}E=WFi+5WhEfXa3!c
zE?^HlNaeMr<B}fJdBYwcNJ{_!Ofaw)+MyqO*mg(N${hxW#1PYJ#Sx6Cp3Z(B?UHaH
zX^6SH8b)*xHYSL!p|pV`#i9L|K=lJ==r1L)xJJ)&tq)oidSmF<Z;C|j99TIXU;Q9F
z{*zoqJNWRnsr&5Z13+|quEM0u8im)Ua%6w2^PhcAnY60|C!M{)0sIj_Dm>>ozNJfe
zF`hqOptzFYSkTZUHgF!_H+oKgt%N*TjfJnwS4OK|<LvbwxBGxoVYj#@+nAzAUJ8S}
z;MjfLB5oVq$9QPIQFQgETyO%OI$<Via-aa&%dW1xI4lh9##Mzk=|^0TP*u<m_W;4k
zQlOgsMN<9-exxO}69T>je|^bddt%rYHq_P_jSLRT(}VMgKv<*SAG^34nh)%Vqo~}z
z#RbBLJLBwkSfsRa_jw!5X7Tl{iy_Ds>j7EuLdeqz6jj!et}9GW;Ijp1m5WdW9&L8P
zQSS&IjX7m-np??|OaI~0-vylJ0VYp{o#I(XKXB-tT&XJ>90?6J=YC^FhN9Ar$K@^#
zj-^Xq#M)b^VS`gmz=)Y6o&wa+go?e7$X|xGMsv{)9B@UYB*@mLwt;!$>A)PgH)<`X
z<i(*yQbzfewisCTCQRS52p(9Lu=Z)uG*juX_Lq0hXo|eLiT^i`HuzNwzcjebjyeJE
z!QiyOhV&V_X{V>%ZoKp{1Vi_!yEk^cz(53GJ7A9Q0N&uQ1Hb7#l_h>FRk^O(yZ-B8
zadB{t|NEkx+?be@#HOd<q>2HVn?y)xc^65;lmm1^`hOnu&UAFZzI*P2$u$ypb|x9y
zzt_{6itu<^4i9M5|8Co+3U|_~`L_qSV~u!6=r<9-kwxBh`i8l|+_%61Y*l=MrATE9
z4nn_8-I5UY>-gIV1J1$Ccq!{<d;<I86*z{9!JW^Z1<OpvD6e}24xG-rrB?iL+M2Cu
z7N6gf-~q_;*;RG|{Q0iJ2H>304#X5x^v}R~>vdqCeKN+QC*F=K7MZFv4A}giGt!jn
zLt2fx+Hr+6$C-3)0mQT*5SdMbV+SKvdmO(NXuF3OLc!U*kKjx_&>ajSpGC8<zS914
z>3_VXjs%v$vuSi^%-NuvnbK8iL`Q=<biD4Mb21FhH81cB3v2-(O?g$a7G*eb1pm61
z*$YVRVEH6@e2X)gwPJ^Ht3O>+AzZvo?P%){0OoVl)2o+|mb8|3d;+JKu`sOZWJG)~
zh4=yy*{IsELLG1*IG(AV8QlD}y&t~(#{M7hwx@Hx-B6%|-#+fodnhP4;B_Bg9)0}j
zE%!!F-}gDsd+{6<(lVX~Q8?R5bw*SK`WPXBF=f<qYI5`9B=VdYQy!9dmvMJC9(}Q2
z0U56fC@8e^DI$EhLOE_>KQX8d3c>o-d1`H154PTU+O@2%uQtWGwKzF<6tSCZvzyOG
zbwUZ~J`r!R7sq}rHMhWeL!Uw1@nhxSZwOM{{)Vj$W<iwj>g?e6L&ST@osG9B56E!d
z12kS$nia-x<-5+;+j4YCJB#&}^W2UOcRJ(xx^(pHPL=de2eZuQJOv-m?G8Hqu0>FU
zd(dY3nXnL|+T9r08!vIY&k?p->HIgb?)FaCW~~-cPn3A?^^ly<o9Ew!Rzz__{KMCu
zEvYmymn>^r_03)K$KPr~ElMsGW<}!J*+plPkPV6WzEY$}caL!!ML1-7FMm(VQ`=;r
z)@VZVX4Uc->7RHbAEjXyGiuC~?S6&^<9c0gut`rkpe~}~LIQ7yK*CU%SJ#J1O3GJU
z4IZ0@QwV1GVEs}|azSS!=s<&$&WVM_D`~NOQ$DfcXCXIZ0>)(flFvJd^ezWIQ<OE+
zL1{!b<|2+*dvjC&sH~<0Dimh@c?>eX;*IffL^6?vo$iYpEgT)sa?6mYk4n4P!{6Fx
z^&rzJ41qd-G|q-{j8gyb5+fU>iQ<{#3vH?4AMfVq21)deaA6Gwjo)+OWB7mHbmq87
z9BBTYcV-t8^6j@gr^fSD>x;mS5i>#!*p3PdnMwS~8>4e_jnvUZ)7$mC!yh5iT{C1T
zN{ddfF;n_y>{zX~;_hZxnar?zI@^A8z|r1GkFlUCN7QSL+^s~~w&fLf6s>ZCQ-GVl
z@XDxF&WlDIh<=Oy{O~%d@wt_Zl4no6#KlxuG7UMQt0QG~wc@7UCe7c$?l&b-UgW8W
zJO_;o41uHN;t(M{xZq+Gl-T}w9XcBx#&4$yZ+<jQhJLf69feg8;}(z0)9)|R3|01N
zN<nbhwn-LG`u@F%=8sPB`H(--q2`3=b;$svqkkR>Kjg|lSXq#HZ6&4B6H!>PcgGcU
zDuNP_gw~%u{l0pS!;!UMuNh4I(pE7hwG_^`s4Q+8jTDz084<)gYt_fQfZ<|$^TR*w
zNE|4rn4%-=a^I=aLqaL2Df!&?IcNuxPP_$BagzShZ&=M!@YF%3{8M(+!zoOE(=bw{
zdBDm<un|RX3?eP<>C4=my+g$9S>Jm6eUr_Mg@8ZgmhxD98&-uqrcy)kJ$wT}iRp2#
zj&Raa(nzykJJs@*d>|R;_0GP;vCJbuX`Z`g42mtD%C{27N71`Bi)1MKP?Z@gdCBnT
zN=DMNQ<HhQ$J&k29v}EP1kF`xy+-c&fHb_eUDQ~5ZcCU4ji#-MCfq;w_g6$+JM=<Q
zRViHeRFH5U#`Ee;>CF#2bR-ss`-6+!XZq8#X`hUGKdbUC@Q>UD`;vT~SkGKJ5d9en
z?P(G{%I}m+8V<)bBP^?_Ft8kTL@Svtz_(lN8gNsZu*YSe#=h9W!e%_*Zw|p-9y;*o
zo@sa_9;ujOG<!fBWs&}qGczFkisU^0cP`e~2^u*iY3kNL&4GXHCMW&!%B43oR-XBj
zzN&e~z~bff_YI_2qs4Q!+?S!;%tFw01G93f`1Ih)^G5jQdxBp>8GBVR`yjX4YXuFw
zU-ptNzOi>cgo*6z@8<rW-S4kI&ZqeM^~^cD3ufwC^Y#l)y^`EDE9>*85>|!ZPb_nC
z*6{4hsxSD}xA$hv*4OUe*3I{MHSO@5TjenqYvy0eV@OGxyEpfylO*RRLAiH&FG{Q~
zT`C3!w9x(n>E)mG3V(Xd+_$u#^3-=3`_g&9)cQ>K*1_cd9T%2f7G_&tyxeehx!mI5
z_cwthp=)NOYU<OdZ}0whu3jqoV@p}`g%z$}q^#l#ZI`WB`OT>IcIAhl>1IBCzKZ)7
zbZjcp{XG56k@e?gwp?GeZ4pqT(z3Nl$CfbKy#8%*QLt9Rx>WS3Xw>4*ws&GBgucjJ
z+#GEA;czA}r+m8lPQEZx{OBzG%f5Tuu6mZO?X6hpEv?q}HQ~dHl$_kPl3%mTujxyk
zKHV&wd3o)tDJNzm-mNswvUK0{`D5nYN&3^=5^{5Y)IXVftcA_)aBFvX$Gpj>&hMPQ
zVbi4x+kCz4eiw+$&F7rIv8u0LID68pysc>$Gt`c(Sz3GG_luGXE1TIp|JV4||6hND
z-z+gZ`D{yI=yuInM(gzFuklp=)_nGeFSnW1|Hmy4_ZVwWU0^<GM^MZ$;eOjAJ)Vtw
z%vOAszoyKSSz^lW&Xut>YL-c+Q);T}wr#zS>wE(P1Gi*cYy$Q;{=b~T*jQVU{9v-$
z|2NA&aq05Sdwg?Ok<#CPmmaP=zGAOhv82_z;9vY)>A+2#^;XA#L##`dsKnK5EHs(4
zCT{PnDN{s%O9KO@XKHTB)@|YPn9v%)Xz8|({ae{KHuI|ew+)wFk;oSM>c8!T(|eb5
ztn*%4v%9bFe5U7mWg<%?!-lHEj!aI%U&AXnPb)c!F{J!2>C4~Op|)cC`kmf_<&I4`
zj8cnwi_TqXtgwA~>q5Toj1HEYOjpXKmu{#LO5qN;pF8Eyr;{($VJxwo6IW+Ozqxp}
z{Z4bCNLuZIo)wI2$v!tXY3NL5**P)0!^|u3r^<=m80Rg4Omj}^Kk=zkoL;Bxxcu_V
z{rh8Lt~I<5yQ6FAmiGi`tI&g!>)P%no8CX}%l+)`$G@+B#&%V!I&NbC)=8-c*DPeS
zKkeOreY<j1^{$V9m)(Bf9y)uYVbR;IslduiF~p%sr-kdpx~;5}r@00?1AV`ufhCed
zbb<o+LZ<I$4L_~Y=bKPya{W$f2V04Wb^pKSGqJ9Rcj!0C*p)E>M*^SeIh$;_uy8IX
z2ZuqqB=4hr97O>E0>EK$phQQN@^KXNgi@gPt$4Kl8Y?SnN=nL%-8_knUf$kkW1Bo9
zY9{R6yVujlCj~gk0}S~H1z>*;xGeKb>@nNTKNQ?uT!5oqiSLYB474rX#GF`Fup55m
z<(J98kvZUY9^gF6f{PiiR;ww#i&j-t{qg(v^~$)pO~COr-?B2ZqeqXH#!V1#nh6~7
zxmwxh7XJBSjT49WR3#ja1}7QLO#)g9j>wk(uow8QbuCRUuL*dz9D}E;pUXO@geCw+
C9_p+B

literal 0
HcmV?d00001

diff --git a/Documentation/devel/execution-flow-systemd.dot b/Documentation/devel/execution-flow-systemd.dot
new file mode 100644
index 0000000000..e2d27ad5e1
--- /dev/null
+++ b/Documentation/devel/execution-flow-systemd.dot
@@ -0,0 +1,66 @@
+digraph G {
+    graph [fontname = "helvetica"];
+    node [fontname = "Arial", fillcolor="#FFE599", style="filled"];
+    edge [fontname = "monospace"];
+
+    {
+        invokingProcess [shape="node",
+                       label=<<B>systemd-run / service unit</B><BR/>invoking process>, fillcolor="#FFF4D4"]
+        stage0 [shape="node", label=<<B>stage0</B><BR/>rkt>, fillcolor="#FFF4D4"]
+        init [shape="node", label=</init<BR/>"coreos.com/rkt/stage1/run">]
+        ld [shape="node", label="ld-linux-x86-64"]
+        systemdNspawn [shape="node", label=<systemd-nspawn>]
+        systemdMachined [shape="node", label=<systemd-machined>, fillcolor="#FFF4D4"]
+
+        systemd [shape="node",
+                 label=<systemd>]
+      
+        app1 [shape="node",
+              label=<"apps.app.exec"<BR/>app1>]
+      
+        app2 [shape="node",
+              label=<"apps.app.exec"<BR/>app2>]
+
+        journal [shape="node",
+                 label=<systemd-journal>]
+    }
+
+    invokingProcess -> stage0 [label="fork(2)+exec(3)"]
+    stage0 -> init [label="exec(3)"]
+    systemdNspawn -> systemd [label="fork(2)+exec(3)"]
+    systemdNspawn -> systemdMachined [label="register",
+                                      fontname="Arial"]
+    init -> ld [label="exec(3)"]
+    ld -> systemdNspawn
+    systemd -> app1
+    systemd -> app2
+    systemd -> journal [label="fork(2)+exec(3)"]
+
+    invokingProcess
+    stage0
+    systemdMachined
+
+    subgraph cluster_1 {
+        label=<<B>stage1</B>>
+        labeljust="left"
+
+        init
+        ld
+        systemdNspawn
+        systemd
+        journal
+
+        subgraph cluster_2 {
+            label=<<B>stage2</B>>
+            labeljust="left"
+            app1
+        }
+
+        subgraph cluster_3 {
+            label=<<B>stage2</B>>
+            labeljust="left"
+            app2
+        }
+    }
+
+}
diff --git a/Documentation/devel/execution-flow-systemd.png b/Documentation/devel/execution-flow-systemd.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd2fd252fb5ef121eb6cf380528f4cdeb756aab1
GIT binary patch
literal 43263
zcmce;1z1&Gw?De1ySrOOI;Cq1h#)B_A>G~GwP_V8X%OjdkWf-oLb^djx<MN5-0%0j
z=l?zDo^zh>+<Tw9ecngc+H0>l*Bo<<@f*MKTW^%wQw3ZsDl7<sa33qeG$07c4EzVj
zKm%tMQhq-If1#N?QGh|Wh(9@Pg^3Wv06m7uXnAF9&wFZVDNv*BTNYz;nU|B0%E)ls
zGf)?>F;VS)SsfynJQd0-KUP#7(7<gI+ol79M{`mslMtvQ{~?o+sSc?_-91I8r`FMa
zLGTf2XfHz|vW?$!SFE<F-O{2-hY2GDVgetc7}+P=7;x|z5M?uife+Itp%}#UW3J8j
zlz@(o%Yy>Os<bmxKawMZT;0Xs!ws%t?cW?Pb-w3Bzd2q_Dn^n=#3;l?N6P+gMNO@0
zDwm**oR}|<2u6T%y#51?zc7vnaf$IzaQ;-?O4F1v!D@_eKVn2!Z&)n&OVLcZA6^7g
z^1GlRdf~75;9(4Hv~E(_yWB^uGA5C)BVpR~;QU9gG!~D0RQIh9h)BtZ`Iy-2q=pn^
zm`W2|jZ?buRuhR%_j!r3B^Bf%XG|jB^m%GVEVth8Vi=z!79)xKNXs3#R#f-%Ljd?4
za_}5S`C!3=Nnn)CKp)KM3`)};yj<yp_>>M;EnVk`*dmgPtt-|#J1L3}WO0n8KhYAj
zubqz1UYMU-+M^@JRGGy?g8rb>A?6mRdpy!atB~OEyv~jp>db#8RktNh1HDR4j^DdV
z`Sc+`Z~Y6cvBeQ(L|j@_O642E>{l33Ws+rE^*tjimd5I(tQ_`w%j*ZV4_!D&p6%#<
z`e=bogCm+&s5+wKnCtwt{gt*;M5r%$#`RX7ys3Ic%>$O2izX*tv<6(!9F@Y{frn<#
z=H8wxyhQpwI2e)q8X1SZWoftVp@6Lf6p^IAH1Uy~%b@vY!B*a2@V<_)T=Jr2;vz+R
zrD3@!PB56iROM{JkA(rjS;p7n3YT2Wha7j<B>m%W+86U=>p$=a*@iW|>>_a8@d#e|
zQt)Mp%*<~w_SB%m6;^Num|263laqF*6{jz0Jw5e&elk_cR@`LeC$HNv{=jWmTe}@5
z^pHHOcH4E?L;%V$o&8PKcoe#LPpi}h4cbo^AX!nshoECxK2%ro8zfJ1bi3=5yEwFS
zv>gsJ_>S4d!?(9JqqUaY)kYgWV>QL`kqLCBbHBV(1#d0K>MNtp!eFsfQs~pu(*w^@
zWTf|k6P+cm_}&S-%PeNm?(f7FP{l=R8PY>MU^+ZP$)8%}pT!N1{`e76QGxg4$B&UA
zORR0Xa-(P8kqBRpQ1BgIo@V)O3<z4;+UCB@)Mf7zJhwZf?m9iOU0>RTf;h#Ho>jCu
z+d`1h*(*A4lN~`LqJ~`@*{{EM&wRY-X{6lo>_u^Vj>s#qNK|D=E&LWw#1yosoW8s%
zdV7BN58=ypr3ibK2VU-Ws9RLY6cQgRm1rxu^^EftWi#+QkRXInq2cOzORC1vg3-18
z>{CN=c$`8Z9_R2>8)L=Gj!@*_yG9P$n6neyK@AOLJ|6Zl>5aRllkLn+SEsm8XX$&h
zZ`p!$<0bD9n@GRI8=o<_qjR*2l8r2Ge}BZ3MLYn@wN`21>?Xb$^M!~U&0IYZ8rnsX
zP9fPxpSUlc;w(g%P>#8)Cr6errSu?2Je$i9?N}v$1nx$#n5U`wXf7?+%a-W6Iyc3F
z3!9-<w^dO)Tis8c()Id@Lu?(qAHfMK(J}4W%Hv}kt$U8q9fO9S%f)VUl2zPchHc^4
z<fcZ(FDVV(t%_aB!GY7^vA0%*7G0|lcLaEzip7sHD|d&Mr@nLy*V^jEt=x|diLY!~
z6v_J$!fysEQ07eEbaE~M&%D<K+-gd28?L_iP5VVeiM0Xl$>!MSq;+b=$B(<hV|aOl
zOHnNQL{V+l?3*zs^Uv-M^IGTVJIvJYVFYEE_vz!(+H{pEJzC$~ythbAv7RsMt%+E^
z$$=Kn-5w;!&h|R}S5vEKk-qOq%lyFBW3!WLpLvI*!-e@-+lL|E^$z1GkddhY>BWT)
z0gB9y3oZ2i{rlzLJAuPF?FLzVD!p|Kre_`<$0sMl9YZ=$P`OwrB;CxhBUVIRSO2Wz
z(6!Rm(K4T7w!@$DWly%kP=!4<sj4xFnO~IBgTYsXNqoAxx({95_=OztyGMvEo&QuS
zUVU^RZ`i}@O{#)c-y}??aPoRCbJB=jiGipWIn-G(Kp7KKcl2TIsJukaX!Ymb;afdj
zE$y4K!ot#zgXw#&#K<xPZ{1x31Nhs8Qv~khD6L{y{hE+o1yAa-B7R_IVR1k3>Ep*=
zHM6$9r*YBJ+P^O>?LGbQU_|&;W@cOj-XHG)0m{*<-u)f(;l@irHz&_4%W*QhS<0}z
z!uZYxgHOW~6Crz@4&E~Zv|XMjsQtJ6{$g4B@8UVtst#D$%TvK)$wowI#P07z5w=Ub
z1~<JUS7<z2!H^;0sV<WL6XcTLTvw>+jceP&n^S*kW$Tflv=<_`=f4NBSS9`OhS&yq
z1bH>AE2~c5)HKwfKyyvr`1kKy^9a2CS=s2|I}Chg{l|uD+zh`UZwQP@#>WS3cRoQ5
z_ra5lvupia6JNdE2sd|rGwB=CcZ(Fi3oHCp1gw9-K^|F_DivB;&hI-bk;AUXbjzF(
zf?O;H`1osc^7C;QD=m%I7P?Z!j;Ld4rz<-TNY<v>@1J_c7u6Zb%4-c|;KfO2%Ot9g
zwosvYdq&8<j>0C-&&|&-f5Xz$JQf-5Z622K5L-gRpzdZazjNnpN;(An=G2X(Gng@Y
z<!R~VKaGVR`ZTY6lE>@xhDbHLtvfoqQO3b0mKlALq(s$$>qLFF0S!1u<X~GL!aG;r
z=o?#Tyw~u5C{)$g^F-&s{IqgptP4{o&yl31O?Z{fZ1c}EYrYSEJSO&NyIeaQ6?(7^
zPkVU~Ci9lWS{!<L2clRW)wGxJ)Is<Ay%9Z{OSrx(K?j_|^lQA_tIe(abe%2P9?c9>
z?4sLDW_H}B$k?K{)(c~(#C>?MpQCFO{2L0&Y3&p)&Adn+719Qm?*@E`qELWi2Y>s<
z0d9%)LZl0+k>5Q8pX1wum2Jb<h~x%UnRdx4Q%a#=CS;p@Zp5x~Iq?uUb$irVv3kx%
zw8!*XvC94$NubCv5=>|cxavgN*&T3OO3G;QuPN`Qs(kSDGd6z?wxKr>`6H)K42I|C
zl3+cu$esD>zA@n5uM#&tsAzpL?YB<xXL|;Zt(WiphY$Hag06M8JLiKfAj-&R)6qIz
zBsg(AZ=qA668ZVdaqC%f3O1Fha~x;R4X~)dD-8XjyX?Flo@QbpXPSM>5Gqlep?+vb
zg>b}@f>B-@t34*`#C6S@wN7=r8D|=qPaRRTSR<GBn#>++p&7Ke(1Ls#4%}U>S;HG=
zdyCaW5e74-O5una$N?d=8e|U}U7fB4`zPuZ8NpMGgoH`f8H~*Ap)GC~G}fxjJ$RvT
z_)P)`cgG{YB-eP3D}Sn>8Gcj_0hzkvmXJ#q2L?m^1aOn&yF(XZ8nI(+n$6-41)UdB
z!SHo^{Ti0M1bJ0ea>Kgg{tlD-35b*6_IU}vzpu)MGZ6zI1+YcbgduLY%p>wK7puyT
zjc+e4+j#xTItI?$4TpjhN&}!EkY@8EPf@h09pVQB-+d~bq_{d-dOfqX&~k*Y%t>Xs
z`fkTNnd2yC#qZ4gq3}+yOOnAz&9%|?LLdnkfrYh0+qeAvugO>ao2Ey9qy=n7(9uW@
zhO3-)l2|qDSJ0+vRtPqmeR9E;kGo8KdqvgNcab0M?n<HMCga~YcxK-9(%gHlt8abA
zlP2~%Rjx~%1>&D3D@1QsWg=C(u4@+nE<t%gDlFhIt+V>_<#`gZ`hl^mJS?x@zo_Z<
zV>Yj4F9pk-1TJ}D3x!~S5R~J)CWImBqWi*-00o6sGVbO4%pC~iJQ-ad(L83npS=Z(
zIr-&r-0jDYw39dE6bw6_K1x|wSrRJ}lgHoF%Xx@E3)Qpt#!5Ab6C7^ioB2C}7xACC
z4vwmKbiVTS`}E`Fd8-K<oxW7OkGoB-X2QsTrRe6?mdU|kTq=(R1KGE<BIm$}xU8rr
zIu$Ek!<Fz3SE{3{j!$8Z<P2y1ln?^D0I=F8HJPw7k<`WWN@=8E=sDCmYRNrZzxNP_
zc8vDG^C|Pqp!FHfI#%UN)BUqAwSHftioAFknVHm2b{FX4=BPTS6w&q;43`1?dtXqH
zuaMFJ_dTN^=QcovGO$}?`&6@X!8ruZ0C*?$`kF$kj3Kf(iZCEm2us*;vF{xIm3;@F
zQiK+Sj^}49-AH}To5~bflD@$knhJ=UC&=TD)Q^%=o!Ck*KDAm`qb7aO&+EVGBp!Hx
z6`0k5!LY`-@;$xfv!#)afLl?ydLXb_mFu1{M=Jjvyc0WP6OJw&T3v?wj5xHjf(m1+
zwiwqBh+=*}4FQvgjWa`_M<%9x=kq;kuZwL|l4#}r)m{+aWwi$h<j_48H2f&ob=b2V
zMF>d|bqGtzJE8HnQXqjNLqC4-8yR#F4aU0@x;?Z^-Zt8Q?B(;Y>qj2n?wl_KRh3(x
zIEqb(?94S&mx?!-^{}C!WOi?^@-w_v#G>f~AO$)*UH%OX=L9TRYL#ftHbfj++Lo3e
zd?D*zg2-6yvzxNVfglQFLsgBn>b`9Ng&;!!x`TQEAK>|t*)^5~&%K_{723E65O(c<
zZ8TYxf5`Z=8Q=CxWd=MNR7FfgNevUN9T7fm)}cAK+<Ite*|L?pJ6K~LcKS$V<s7{J
z6Nj=rAT=h&TD7TLu<(D=RLz`o4GyF)$xL5gz2X=z%4{^ZuqctpqFyOIJ5u}D^!{*j
zteQ0_V@<kuQ6w(gLN%x?gOM$;5#y;!%gT9-4%OeTkzGb-Fw4ZmM-`aa5w<0~mz%C*
z3*8Q~%s08Kz7Y0|=x?xaU#))Rde?Y#ruliJGd*79mHN_FdipaY2*6Msx|pk5BAWn*
zMgN?u^PA8}D5!+YoBm-IvFpusvAr!W1aI-%X|wOvZ^H%PAt?nUU|n5Ny6)bt?&lF)
znUZ~hWPUNJ*uh>Tw<w<!27l>2h4sW>QWE;tfPg3$df~BuX?$N-z%}$mQZxkhq5T2q
z1OmA#*mB5_>0ravPs$f{bG#T8<gC?m0FMw~C-&k-3>8s=z49oyVsCkYpvENvlwrsk
znxoFkCOCgkX-3!QK(Y37Cax8M3_}XG)XPiKl<XXTyq9{$S(;-x*^qiQZvx<VY~j$$
zrN(?qhQ{O0c!`c&8GkXbe@p>3M__Op8`0#7Ih;ba`CK(KruBa7hdypyuT68oP36FM
zPj3l>C+`;*+3PVcx-hZ71O@GS;za%vJp?uY;O<%c-b@_^q&9zpJ?456k{e9Yhj*Rl
zQJH${X^6m{u{6T1(vw1b?2&D=$v=N>92IGG5%aHAd~PK6zf;6zTEY)<Hx3;yEou2X
zrp-ga?ZtMSnVCIFg~XdOgN+2XINF0}36;jyvslFK20@eo%p-*g=ul^T9JYF~hWD8J
zMwpVIcs2JDg*Im<o`C_a+uj^nZ99G3mqkwb0;;Sc{d~%+wQF*{iSLo=Pp<z8E00lj
zr&#_q5h`t~4aAO(xhb*)X}znx-I`RnTt4m65N|IGz!U&QAc*izXPq{PT+1uRD)@)y
zVYG@^JoCLX;c7WXA9_^FemH!AQA~{5-9XHEDmBgPoSo8hx7Va+(;fl4s^ysTG$O!$
z7!k9wwl-dDC}{HK#v`lO&H1u+z4TLyJZ4RWP)vY{-TaK>2~*ywlSf&MRJ{E}Q@d6P
zKI8eG37`^`m;rVMpQu=HA40;{{Qz_RbqM$dB?4MnT8>+9>V|C$KuGvJv9Mrsb304A
zDE7V<MU9gX@5T$gXZR7HQXTWn+qYrV!VYj+wBnH(^C#O2ZPZEZ&k#R~iHpPi<<bl|
zjJAXjFortetFNo@`1pwM@NhtUsDJ6A?jk~r826th@c-wbIxi+3UIdtFU0ofBZqa4)
zAr19T%d&OWqijP5!^3KBTNAj?O0~nQt9kVe46414ERsaa^%{Hg9>qxBTTp%7!i$NG
z-4%2PS*^{-JvBA8b9|f>tVb9F2K$N9R_d#M6egw%qYocG$m;873{>mZ+h8&>GRkUe
zYrlS3%3wH8Nl6*f+}sS<ql$*iA<0YShpxY4U%h$5)ZN{UVd!@d&SN{lVV=3a@APSI
zPQSmu|K6J^DbzhGVjUeF<Lir)&vDekVPj)jjH05tR-+%{c>FKil6(rBl@;A6iDbMU
zoZMx~LrVOQg+EM<kH-Tz@bzH)9T9%BcLDC`=;)>sWiK8E-uPwJd`Y}(`Y8mJ{XoKN
zAF8ORP*hY@qjUB2?E99+KawjKiI0Cnyx-32t*5U~LnUMf@9u^rtrXaU!LYbq5D}8{
zM!}GxU?F8?9IGy?>5qrrus$&|HAR+?keHg9T9Udw9}=7OKKzAwalC=ttRD}UvC{HZ
z<1RD-#|4^$g9GmYBxK}~QXTI49d7+59@QEvBcq^i-;|R~0l_A3WRxR+t-Us!E9d0w
z9IVA2o|HtYUHP(HL(*=F=j`I5gy!hr;M4wc7xvgwX=w<Ui!n(_z3?e*nPJCEd+|ML
zVt4T5S*GveF<<w>vhtXj*h$AYUzA)%&)1m8sI_|7FAquGlDtVw46n5u!fI$}_#96w
zb~uL0;I=)bKGp8uy1zZmzdTW{_qj+t|Lu;2r6smz;ZxF&ZEfMe0`<-!A|jZ^#>P~q
zroFM0h-<XsGo=DwI=Q$Eoa(z@OZc5t8QIvdZ_m^}@j5>&Krn_=)6<v=33SgU9s?js
zCG5Zf97qpT$y4>VDZ@?9ri`EzTJZp@5)Rf18(c~H=FOY1Qk_aHNl8hYl`%7AK0dy%
zCn;Q**?~9BJTAZb#a9u}7r}>cXVN<=#C*cS!i+2|u+^#Mu1Hi*&r@;tI~ZG&l{&sx
zCtH)UDO?6&-bcSzsdY?D^4JUrkdTm2Y;Cv1PqM|mnfg}`{f2ZV7eA<^V|`8G))65i
zAz`VroqW3b+|I7d$kCBIL(*Tjs<Cm1Kl!|VWqFwq1qJ07bw0x{DK_XW_uad98Nr&U
z(yH`@DawI3504J{fSFcYT)h9Y2Rq4hC|inLSw-attgyJ>nc9vsK0f}Zi3#mgslXfG
zl^+umWWZkS2lV1zYDF3a(FCNVNrfED%yPpcBkH~j>0iFia?22)AR{9)3JGbiW>^ko
zVJ0Uhd(Vgh7s@Fw=gbgsWmA0-utPyXfiaXN@wG8KBxgGHePJQ?>({SkkA8m-uQu)b
zeLrw9m4H+h?G!9n)b@^qg(Fxp9bdoQx#oxNn<Uy5`cXkaL7olvW@ce2+=lI^7p)#U
zAqffiAt52dRmNT7tKei9xZ{i~s*GCuSQ~m!$+J@S%X_aC)!O~M#eI(Nsp>5+FIUyo
z0me9N#@2e~X@CGFF>s29A|l4K4fazl?zUNnr*W9-#ykL^Ucl|_?Fq@qKDcbpHM>^T
z*K?|gaq89u6%?@I(TT%>8JXGHmFy*KZEfe;{Vy|jt`5I)Q;53V!=n{N0b!xu-C?mk
zj!Mvm<X*deb71wkMIIXlQcX>b)}}#|(;X0<U|L!vLUvO@Ae<o8udJ`b`7H;nNHhaX
z4?k>g+tsIENSP_a#}GBbF<~4fKbmP@e9!sO+QG$%ZHAa9-b!y=SCjJ!)_7KJEkB4I
z$lToA^|g;292_ukai96_hM;2e*o@t?TWqHV(J5d}P*zTEd3X0^(V4}!)L<}WCJqjq
z`}gmAo$WLJ*`3E$RaG_5{PoMs%h%Twu;(C6Jg>FDy*Sy51SjKW4~~wyrm9T|iHJhL
z@m!NLGP6Rw7WHUrZ};dZ@#UW#IXgQJ4NXl#O3J8UWc0ki+nYzCY%rUsYBeR8){Iq4
zq%r}DF$ilRNl8h7q+ovj;ss_58K;Kcp21qFSi8|Dq)*?!s{nYSE<#5`Q}zcR&1Kem
zatj2*0Us_dE?Fn1su>{x=bzn}xsPJVLX_EvL0%hf_xD{ME7lxvaddPv9(a47eN8z_
z{KfiWM_};GbVp#v()KpT`qmb<hlj`K2K(8u-lGa$5wJ6tR##b5)6=o}(v+Q?oCuOR
zUgUXnOh?9Jj_7%rK4;3y%h~O%%0>#84F)D$TKW{ar~k$;yQ+%EZFi3HbZ;@TqQZd}
zc6Q*byiVMWNTEp<EiEk+QUT&uS65i>Hz0NK7=I4aNb+)0Uf1lV<YUTX+AjvlUOlQ4
z9Dq+Xq6`A<3`zj9!RPhAb(j`Eb%%g33Ff)C@Ca<<!#3GmX*D&1UoIk0C-Btx_;{0W
z1sE&N-k2&(3j+ku-tFmHV<RI7>IYOij4Ajpj7ufzu?@ezJdL4YB}^jts3}FLZhX8x
zf($UK*U2X7%Ql~IU}F|m*5&b1o#DyJ$i~LTDMli7%+HADkgch$?fRZBd_<F?RN(bz
zJI&=!Ec_llDB79WISdUADX6GQXaHp`yEd4a7E7oejBqFR_mch>(z$9yH2eYr-LDws
zV9@~mup{!7KV)fXssGVS{d{3+ib6G8GCUsd7M=+g=w$`437;3_mA4Oc@F1{hLczA>
zqh!uQTEPLZ3mptj`R&`c9JPCD75XAHQUNqzr;~|sFtNXQC<okzaUg{oL^FISNSRG8
zUp@{N55{CdG>z!3)`xSUAh1zonO?(baKVxym<S@r-2|zhW5tPi22u|mU<Za}g{POs
zxJac@*x5{UzZ0~5)GA3x`VIl4lDs(e1R^8TB{HaHV#olbrozE_pJ#CU_^0dHkX~q5
zSYKX`G%WnXQZ^Eydhyc6au}X{dJJuZ6(IORZ$Ao}M9RRzyCuL}Km*GZI5`Z)!iShz
zHXO8EMjZRK-d4__^jgI6I86xvegg4W7Z`|q(zZNwqz;IR75%A#gn*r8Qwx*JU8AYV
z2KjkW!D??`hF;~2%aIj^yo3ZW&k<@o6gu+N7FD8bQ%7kGP>d#wDhMr)IZ_+hv2-;U
z$ap2a<xo<F9UlNQ<?*dl9;FNeVkA{pAfhaqT3q*}3-o-FR^#dBtE{HwAq3lEHR=8E
zGgC#*vq(lBUdPzOXX!bvd(~b9)RjMW7kPz8n#>JBPb|OU$z4!P1ZB+;0*1vr6L9c;
zYaKX3C$qAuyBPfGLp*lhlt20<CE7iL-NcoZ**z32Lk38nf?~ZZH;WTcnNG_l$_My(
zgi+CrZ47yQjQ{A{L;~z&5pXK#=2mww`o<8^w`uabfs|EZ_d%N`Hk}V2-(+Q3*!mt|
z-ts`V34z)H67QA5r!$@oZ2Wn$r3FZ+n3^5Q&<{&{sp(eJbF}4p-bTk^^q^9b)j3_P
zoNAZ*uq3^NdAvD+cVwy330V5n)_rpE=)e#;U+v}P{JT&P;IdXlR==)Y(VV_IC1Yma
z0j5z;+gIIY2G4{u`%Zg*a|&xhkb~F9%P>jQK-3@a*88?6bjr(Za~KIx^AomEZ){K^
zIvJqL(pz)u&_f^iQrg2q2!LP$Ldv)fQ-?f#5oDT~TCCLp%ABY6)NUL6c)GeGF$6l5
zi=To!i9yRC%zlepT2BvKqP3ytyWVNF?INK*VD#=67ehI3x;NIXko%iAI0%y*5DiP^
zB6CezuBYyZLep-uF&uPu{6=bc<rCIpTK))*XXO_b#$@{9na+Rk2gXbQNeGe#j5Hq~
z$t$H3=hFZVsI%b%=|B=c1PORJ7X27p?Qn!3x*n<E_{X8*lTqzH*c$%+P>}5FV)3lY
z+Ei5t?7>ikuVDU<%>mF_OJ2*6K#%`<IsHHlkkW&hGkB(^l-rr@TE&T%`_01i>^Fai
zH(b7!{j*V^UkI9AO&%+F(9-l#%D@Vspdm=BGFe!NiQV8YLl|4#>%myeqFA0K2E8^4
z9yh9n9jwpOuH+-FzP?E<X)j*D;jw6t-$D)Voc`v@S#ihP)n<{DXM(O!XPn;Y{)Ia`
zc+k$~s;}(!f<=z#kRoXIW~pQt+nBt)D@068Syx~0bnxTZJ(4uVq5jUK4o6w`@yHm{
zHYRFhrV9ZO%=7q`-K<b9aNfnfn;7TmZ{-KvkbV;df@(1TjB?dl9I%k*K0sL#Dsxx;
z`wtxI2D+d)_h*3YiCL9$?3wJk?3^FJ(;!&xbo9sHZ`z+k(s6`B?9bH)7kghZ+y9<|
z{|9;Q0*HC6^afg3tq}67tgPT)llLk3^Riv;zlAGtFZ>CC4}|?zG2n6DmSzE+Q{KdY
z?zbB;j49O2Mr&9}5@wor&pJPU<Qu#p#jIr~9RaPaj{%v{CwhNOmlG1J_WK?qwjOC|
z<8n_7iy{k=-C`AJOwaJ1y#HGZFpG#$Q`7_@;Zjdg_V+&cK~vSnj2~j@L&Ex0d6#EV
zpEvu6z4L8hGMaP&j2=2vrhiBadJ*#9#%DnlO~&l!Yw{@rlio82u1G?(yz?Co24hwJ
zO7@-C+m7DNYF59F;w39<7vT3Gcx-fVjHT+svD%*1BXr4ulReNu$xmKTR9xcZgDWwh
z0wx<S8N`6$<g^#EUfQ@cfB8hfemmAZ{SOj^cDl#p;s(>w04-1WIx={c?dcX2!-iWN
zK=>GiEUGH1sPxr@2T%wP=xy)Ai^7&b;!$U8^GZW$E<k@uyAT8dLKH0?VUp2b`H#)?
z?)NUxnMRP}N)RHP_x$=<P-+q>4P!+?BzjzHYT?dg+DNsbacujxh}HWY?rZcQ*!F@S
zjr=+ac<8&!#CE|618r>>JQ=P;v<s5wk5}#OTx8sfa7<IQ&*LvncF!vf3-g}rIqw6K
z70}*2>&yO#e*Fhk+N?Fk-!PaXBB8to0h3d}aT6;$*x=4DyUig%vtMpgvo9VvVm*Or
z5g;l7tj^pl`z+HZ+IF8olt0*?xStdmOH61TjgUKFb#_X>TYLT=Jf9086I0%gAVBnk
z^f@y3_@1Q|G&FHNQY`nR&T&+E`xRK8<-hVWpq^!!8_`k)9C-ZXzato72m*aHK(xhm
z7Y;p&e+8Fx|Emyz{~tDq8sf2Y!nd0VAfRoDClTRex)^f?Hc^!Og1OATr=k+ez;ave
zR|!JY17q~JdmWkUF^+dH0_x7-MZbQ6QU8@Z`JcH9L^9D>p2$Q8tg`$z59|o^nXBa(
z^6)!BlR`=SR6efSyU*Be!TEU|1)XHHLefAIqK?tU`JR6CS_Q_M1au-Y+YA6oh=S^Q
zeckH$^XG6{EW#vlEQGQCw~+3Ch5!Eji`iGnxb)#d_A|dk=*Y+-?jWP(_?&F=@bU(i
zmOc=2n8QHyR&^U4;sBWT|K=1mz!J6py9039>?Hs4RMA-BvUeUlcz}WiHs1KNf^Xly
z;{qTRQdoEwlvfdAp1Vd@X9rGzn*ccT4g{>QK2}V;yV!wmU|_)8BCSPs@2?U#SXGb_
z8xOCy>_x59&6RiDW?xTFu5nj{qO!8qzfv1Nu@Z~QG!f2N1g8~s!vMhll~O@fP0eRe
zc_*27Mc{^3R#qzc)6>)A&`avC2tf=C3<!<{Tveo5h&NGbSSgeYHtsRFUi#nx30BhS
zKUfQ+;2DOz5JWYl6&6n;5&{;)XmhOC>*|d6&(3UQ!IKmw78Vq!%4Jmvrl4R7Dpe?G
zzSWbNjScOAcG+-KoLnTHF(`Xd#XPx)h>4w-I`3SauVve;VB+H|)LMK$jMK|iTRL3*
zO7YN%0aQ(e8oxI-qN=K@WaH2YtrZynlC=P|Lw8RPrb@aHX)?EAg~s27{JA73ok0Ol
z{xn;Xb82=L+u7Nf{p85DtE)>60|R6DVFlo!PABf<_#w!RFJHc}uc~H=6N36jev&y)
z_RA6-qP%$38d;`YuG{2&#KytNnPd(M`^eBxWD`@<q`sT875qB8X`;fXnFIWx=2li`
z3qm-!xP;{7=*{|Bj{2gaqKZ$RgvQ4Y`fiz<nK6ipQZ4!&;nL93R@+VUnWxF-2Ib}&
zXB8+jvGdIVXstC?qFs&^1<UhG;x?p9pp(!jCZ?mqd-CK7z_BDPxGEHsl*_AMQ_d$w
zM@K^w6Ny3X6#*E#lDBPs=S1@I@~G`Xgx2xEQPl}u+}$6^$|9l2sCk>4o8RBk|1Zkp
z<-g10g!+0xP*|5cUxBplZSnb^MYh!(8X+kS2(Wof0;at<$2+s+fCB=><fpDk{A$m=
zmtH<TNDv^EmUnjI>TM@wxl&BOzY|=atfU7g1s%GEhVVgs{YX&}0~|ZA^y0?Sh-lc0
z|FfFbL)g;)@(-Xm$N+HykB#l_3`QR52n<Z}$<56L`=2{{nK93k(DsyyP~G}XYcc5B
zEq6x|%Yq6QB~6*Ff7K-y{Qh&XW+4h-Oa7x+efp1LwPT?Aw4M<oq$=<>;M4T<3s7^B
zZ*Omh+0Ql<$31xX@HrSkN6+K;H_A_6zdqp+7A802OIuo6V&HgD15>+4!hWK!uO9|Z
zgy5hPlHv%T5EGJytDf{$VTB_J+KhF63PnGfD>ftsYqCDq%nzzVt&dH`+3+HP(ed$~
zvxAl8wKbihqe7MR2uxx&9!h3*i@(wtQuZbYtw|V&0}$7!|2L)T-=S)Q<Twn_7Ark5
z<UNGgp#DvI_b$5GbxoEn5%i%+2|@99ygjYC%~KS6Zx{!$)3USaL5UgjfDVi~0(=l3
zuwLY1IP7v*$LlO09s$nA%*<@R*#acGrTj#t6kxeei;MKY5+;$d=E(G!U=zYvgb?W$
z6j#KYjDQ7y1n3E@Did9^EJ=S*dSdK`gGb6!4Y9&}QExM@R<0`uD5=1)Eei_^li?g0
zCs$WFdHG(2HX%f25k+m^dGweRP#a)7nJ%{bH+dc8O)V3E@9vY%;=BOc*U#Ty9o$5*
zKm(AhMnB#^MpV))L{T+a!NGT)W<0zDLY7vkHtxm61+X9B5G9<pCODIXCMyiEL4X}A
zd4?Sv9Q;a=h20)O`_8wx%dHM1saKmkI^J8P2ed2{l&_Fr@@IP*9u;-Jf{Pf8O{!Eq
z|0fR+;|Pk3hK2^go+7BB>gwwCk$iM6!}eIfF(N~N$zsGna+q%kk0yPPr=Bn0<a^3x
zVq&tizFw5^9Sajv2Jm0Gg@x#VD+G~-;r@M0hyephLqh{`N5Bda*w56-C@EnLW{8A>
zEW*ggN95z<bL(+&`&b_Ywf7p<pX6iVint4Z^4yl~x!0K=WX-<B2nhmw3Do&H9J|_f
zk}E^Pmkg|)!g$Fu=bafr^Lb#^{1>$r>*J;50hc?%D5$8$e?{G*qI;{7mD9DB$WSt;
zUWDt~pz-0aFYJ?Zb=JfnnDJT-Gtfx-Q533X_of&IM1cfM^Ux{hVasD+Y%P{(R>nj{
z7776?0w~9z)q{thzpHUEAcnjB3@L`3dr&hFtnB)9?cIRu6CDAYF$_SN4Ag*92h0{s
z=)o*<&|s!mX`S=x04dZ7;&{@NG#MEgD5&H1rnUbPNFxAk7j2I}J&^POu!9j%#CP*F
z3X}jdhVFB`9t<39tys*Y8w1g?Am@Gwt9;o;Ktz<M!G(bYP!R-)ii!kA?*DmXy=!Qz
zU95o$Vv)A@LFN4@IDB1G+wMtnBAbdVh(d_u4W2AR+?xm@pr9zy5C(jNn8!8**-h7=
z60<1>B`4cF2W3@NZ7uSvS`m5(u#!a@g}}&AP{8%Y@=U#LlgAEKgWYrp;Jb=ckiZCV
zNzxvdS!~c701g01V=8n!8tHOf&}#XN3P}Sh_723Ch6D1;{=q?TLjw>YfS6UJQ%M(a
zd+lkix3RGS((KvARwb{?FU43o3962piwD3-wJJo+`U$>eOVNK#=0xy-z<mh`2p~WT
z!{p`36oe6DN5iT)U+hj*BZs2n%lr9>|Jhqin5;B3-Cz3jywQOc>I5Fl#>Vy#Fts3y
zp@Oi`-Pgy=$ap6bk5(2CsStGM&K)QSfCgj0b{47SB7x0N9dPZFwDo1xB`hK$59HN{
z9@`Ya*@6KHy95wP5%3LX_e3!IdMN3vJ$LjQ28>ime^Efg4i{_Q_44vE0#qjjuL%nK
zvy!mB1p2_b=WzHK*uqNWph}YDdlc2A8MsSig|G<6^B^ozb_QNvLTDItM_%V6V&Vl)
zp2XLh9FN_(DBxGQHsd9VN=hLBE?!+<S6huRfhHm1Dh5`Q2%P>Gc+cx?NWs&wdfY>V
zrbi{+-vFTl6gAoiIQ&n2aS;Ik2YCGa{Hq`?U_X8Obl{X(K9)cX#>6h8^bL{fRUd<p
z^$PU--o7PSt$zQW1qy0!mvju2fua6`p<AD-W@aJ!BK8&VvX_MUjCpVVO0|sZ8ykoO
za=zXuJUugWh{*`kV)&~Lum)BDwq@@Fpn%tHUF|i9jc=k6>6sA>g$10Qy^oKdf27t@
z^<TcSwzkd%d>#AHA9r{6@U*lvxH_Tw<8A<>*O753c%;)_eKF(X(jijM{fkkDfE7cc
zqCjk6W=75w^CS}iXfq0d5B+mwLeXTHUgwy9P3934Bo(7!Vh;v9Y#!0(@9*g#k|u!$
zCIq4r@KUgR%OIqfM9TFyb4G=RhJvrGLHkr4b9JPNkmI{bZfRFwZ+6ILa#EG;EcaBK
ze<o;j1{HPeEdkQLNWZxT99oAh{(`Y;X=}6LIa1z<Vb^D3_DTP^3j><MXj-(_y+A$&
z%<-4b`){-SeR$~ndroD_%P;b*uacpfCVsd|?>tNMRSOJ;Sjj_Yrei9}(>ew3X2$rP
zD>OWJjw6Y+ofgxM#i%6er=*@mFfCaG)jQA^HC$>nK1S!$B6^nhf;N?c@|W-6tULG3
zbxu<kpdt|+;Spb!j;9J!J-$}sbqxc2@0s|qiM}pB^g1TeJ-xxlv6Ii&PTY9t!cG;m
z`Nll)snoLFnZ5GyV$7d~ua9=YvPL5ox2<o(RoF<U7OO;yPg|s-G#?k*H*~>p{oup6
z{DY}Upz3px_3TmIf#s5xR)tkqkCa>Aa=EFL(i}{y24Od!1meJ7+w{IE3ojk4ewpE#
zGT;B$D)@Omkmz-C#TlHCNZlGyIju`P4SOk9`eE;Bzm4uQjT<|Laa2SFtYw5)mxX0#
z6Cx7_NmvY<$6i@}`S(h7rVFPlHby3&$VAJ^PsIW5aW^HP2ABJ5$jG_N1X5HvWQp!M
zudr^*FOPoE5hii{btA@(Yg1I-GDCj5nIm%1V?%Y89YXaDCPEaM;kp`t9<s9NKsPR@
zv{Wy{nNVHw*N0xXq#!NXGvyw<@byIIN-@F_-bnz2)QgT1XvNS10|P<qAagc@+1y8v
z#(&eW|B03T$Dvkq`Jy+OMSS8N$X)XCPK<UWoJM`a=^q=SuwlEWlthsua^<wcf#k7o
zcF0yE@zR_Jo>{|Q0G_4uNpMG(mNs}i_MX@{93!o#SkSAa(a6`z>@Ki^uE@D;yX{l4
zYL~8J*~Y@%tDkk((iFOGhA3N`q>Fl$_x7g$u-)Kkz5q(PA`*V~LVV`5o7=!-_FL0@
zd{?Gpo7_EBkAppQ`mwB*qZrL^aS9J>1Nqu*=9k(|B+Zl;BL8FTnTDds{`}E9(A`sI
z=|wJ}5`X_o04KYJ^cmIDkl^oDV~(o{h7H%b;(NxQv5zSl(7<`wRkXw<!LyFDySr&h
zvoquJMqd|PizZ#zX8ssNG@X&JZ?;nP*7xPQgg!?6vpONGG$a3Ut4tqvSKEp>#Uvei
z+Rk%<8yCs=jA-rIj=c5AsOyJz)4q5HegP52-$!^n-^GG4gNxSDo$RG_rgzU{JnukX
zDn|)D4(N0R%ga4z7Cg2VOjBn9LxC6NJ}%6561oy%yV!f=ySHjH>uY$sC@CerN%zjv
z0A*!nMXi0;%Z<JPErB@k?WAPj0awQCpiHx_>2S@Z$+jfPov2kO7S_W1Tfa`5zo%`Y
z>TM0!^hxOin7(O^^}R|c9dJd8hsl_T&_sXZK-hC><cZb%r4&yUWt^_chX<Ee6^q7s
zKY;W@ol?MVKwCdLzURPTg)q>X@%Op=CzM+W3`u8H2(e&_PljN}#c551qS!zhaF#cz
zVP<arV0L(N^wUqlJ|5%ewj8MoxNQnINX6}VH<;OxdX{UQ(j_rml2WDm!W|yjl7Vp*
zlBK+Lm3M#UlQBu!F#25xgikKrmatGgn#MPvwg0B)jbiGryR1GYd%X1n1H_qd>m%eU
z?`b1(cxpn)Zx`j%W^~BuVh(p|yex!0DRw-*EB$5R`}~-pq5Yk$sF6^;pF^F+MfxKc
zF@fvxU3z`Lt+_jHI{e#*y1!S|7RNSWOELcT4D6Qli~mx4iUee9r0Y|GK-kpKnID7A
zJ6VZ+^_#YTqqd@fPhLf`@rnfOwhyI=#4)#T<Wl*^u`yG~J{1I$%B#%2%%K3B2?z=1
z%G>#CQ{Fr@*dIJYL)%!DV{!JMZJ{Z)RMXH(d3J_>JtcJBkhD<U2#a1d=Mfa@#wTv?
z{@$99R11T03JSu1$JsBB7TyQ%PgqTHa=aU%{m>i1BlO1Prmh0s<VK%T*^3k;za#0N
zh4aXQ?AM1?BdZ+r7b5;RJCit%g;R1}9_5>CphI5u_V8pCo38GDDAY$tMz;m2-CtaN
za*&4f>(}AgucW-fba$YqSGg@Zo8O(So;Q{#waT&CMfj`mb6nlbKmL-wL;C&}ayswE
zDbo{x<oWJ@W2es7Oph37zjj~7%L10$SP}g^rHF-3PVHvDSLPC+bsXv^C9Hy2p@PN~
zYATTzfWgGtbBJ>~&4#@%cpwlTT=f30mzge_Di)tY(9|TKre45WHVjgG@u9@}+5N)p
z0H$|M6IyhhRgFMS{_&CmGTIOqRQ2_|^^Qh!FR>Y`$W$TymOVjw-B;FE=Z!x6v6{2p
zN*mo^MvT-}%4YnmF}_THFreU_AbXp$a`ado4kVI3X{oaN-lcrb*=zKTV4u_RDTVmQ
zCWt5sW*_U=sPpOuxzq9PZSPf*g44B!IB3j(xG!CRB@(5#-IZak00Pw86Y4SbIL*W%
z72<dCUoL+E{i+eecW(hhu&5gTk{=QV&=6+Vve2GDZ!~5YM~1AfrIx+i{nHMgbJ_2B
z-eulYzHZ@^$FYh}%$)?ARYf_g4Zk)SZDsq@{a5J}zl#k?uGPr%8?+Zt!}_8g!<)|u
zINwbb(*(8-Ne|*=xu0OA-e^JrS&OPW?&I}^*0+v}fgxOS0TGL-9vIWScpCl&S9P2B
z0v7zJpjX$oeI&MzZ+7}-19P8~Wb4WF{!($|qF&Qaz!uVKI533NDK%RyNFiyhx(n9g
zIm!ZRPr3&QtAp>SW{MW)GJVB=|7Hf*y!fMwWu$<$FsDH<I({}{8-Yb$mb#H3Ji1gC
zSMrKlTG5Gaqdyn%{zH|qsS_FXTBhBd{QG*m%2zbg`FJ%N$@4~e#2#8!Kh5d?_PH^C
z_P*uo&v`cn(SntBNRZe5{-Tr#{NrJQ67@Sjhw~9LWtSCSS4_UsT82CtkP8P=fqNfc
z4Ui^U?)89(d2oDgd*yNH*uNFq7a!#GaH2Fq{^`V7z$Y1T-vg?sp*IKDA<|=|_IEt{
zsBC8K)C$?f=WUJiZt29m&S;9Qu{f?*A7;#a3ufZCM0=9x5gKn8Y`Qg#fEV|RDHT;T
zmyVmMy)xg#&j^<09KE{z8T0Z<Oga7e{r<KF(6buu|3Z~0Ul$C*hS$ZFAk;Z5jSpOi
z@!*9^)}O<z+w`?3C+?sO9gJ9%2ixLEhwc-A5C@0P*ujokUN%7n9?GHXj{_#6-{ePs
z84$y<zvi*`NpsG3p9D-E&?AS}U*BuR^}$Liu}e!xtK1j8KPoB7Js*<*F+F!Whd7B4
zG;!HOC%BG#-@ouZ81H-rnw!y7<LpMgVe#vu)3{KT?TMP7ggtsm>v?WQE}gE|SZ{Ua
z;z!R3v%WxoUW<#TWA+EgD0iI7bVy5o|53jo&1Bp0*jtYcyIaZQJ@|62IU9qM6LZ@(
z&G>6HqmyPLj8s8tVGXt}Sa$xUReJ4A^#ThdJ=0%}vsJ#|d2qHSacXagW8q&<U!QTj
zD3DOOxcz+&qIGWip3VBEjj7_^hpE%A7=9D>gf@bi@xE(oCVMl>XTKxoi+=GCa;A^<
zHX1f|1vyja6r4ET9$n6rQLAchsP0~R2N>+{tb0%;d?{)6=lOG)S@gq+=v~Wr_pvkW
zi2b?^z_Dw-T<R|v2*Yk21%`wE1s8pdONN=eNvC4I7;}5B#S7ksynq#axX<wVs@3dl
zE53F=-4jaS<|Y!U`FZz$0!!fa0hkt+xg~bd>`!!@^cqs`L=ES)04D7+skA-X(<nv6
z7KJN;CIsf6Yd$2;+s9$yqa*?c7noeQWmRX9yC#wHFdHX)P-EO*-BzOwq)FufuWr7-
z^FJse??u6|y9#%|oe~Pd%tyA~*2yk9#w+50fs~4HsfB^2PiC8E{r2~_v{1m|ed_O5
z+*ZTrOqo~6RZ3z99ryRVAPlj-O-V_aVjQLhuS`S(RRYO{{Ck*IgEN@Pzu!dopIZ$7
zPrpra!6xT|r3={~(%}C$g2sXW5I$No!OV#el&6MruA0%tj{-nVJ7m>VcHB^L>NNoJ
z@$RcvuY!P31JGl%sl28UHG?0$kE+bR5Zxn*PM{Q0Ps?ZafB>K2Co3z9Ai$bhT7KWh
z#>dz3Hf(e-0D3(-Txy~2zleRnuovmpvjZhw1SqZj-lj$kFd^(jS`BFNPdz=T8pR|)
zP5Hddr@qE+s>*o(<m6fL-pWcSD7kFs&>)~lLufL=RqmT(p8%~g-b+M50S8JG(t9_J
zmR&xlyK$YJok;bdgzW;wL=gt9hzklb8crt=_Z*xZm~PKD;sb#lf}n+r05Jw6ti4$h
zKqlYnxhJozjH6xlJlB~TPz9fXCW^;%SD%HA?I+-9&yI$q#(M!b9dGgd-70mXY;Gr@
zrFor}q>r~IRSUiW?GmU3!m02<lT8f*I#48tk(oK4p%4`1KK~Sq4%b<08lNAovYP`Y
zNEYbM-tL*2nxgvp`Ys=DjE1zewGoh$7ivg#2#Je}hXn;eaVtv7%6^Wt&_GIJV&bce
zj53XzUtfr2xKeE0+J1mO1I%isu6W8=ZTj`6zm!2FfLW|CXf2_!{qY{NLcclB&(YdC
z3UEURa_@Po2PX#y2iBN85RAPOcC1hrfBg6{=;U}i(#jBk?ruET=YVfFo~g5DUj-Bj
zU?6_1`@pmwA{;RKIUw8^Un{<?1igusk$eSq_s?Bj#^CmFI9#?d7n7M8C>GB77D0{g
z14NPtl~k4cmUdDNklB6i?=R|{WMle{s94!$|Di<%tyK0(ATBk}1e?_e$k5=?(Vru5
zsR<}4U*rgZmVq<ispEcDH#GF_%r*+fONohz4Sl$oZFB^kBPyy!VB)^NO#D5S7a0&t
zkDfoL0951t{<7Tmd@FfYRu&Wl<VXLF4sHLx)}bY&r&9xg+jz3KkB<o;XyJhI1<WK9
zGxJ}z-di**cxh#IZ*G1*#>5N0Zh%#{5}SSz1s@xjALGUdar&=iWg!e0Awc`YV?IEV
z<a$>%ivw`6hO1MTGYE0$f2A%XrJ><yYHcm$6#FkVW=!`$L+YPuHYb^g{O*+x0T=yz
zEFt^7{CtPGYWH#q3nOD=all)iWTx*FK>-dL2cR9bHl4#Q^nbKyHja4d|Dr|X)?B;<
zE*{#^aVus?9u=J$@+27sD@d)V;Ob4F$Cr}okj<2`pAk?_<;hiMHHDb~(i}wQ=EsR_
z#(<~}7d-_XfJZ<CRowLtY1+T1Mf;oJN9>LN)bwP}khskKTMH0IA9zIwz~s5l!B12~
zXKK&)c%9J$4$}%j)cWiQwImRDJ+)5*OgT{BUcF`p<P(DaP-pbJIbQ>BX=>{wCnbe1
zwD|`9g2Rhg5Z!Gp4A8S$pKld*b8|a<D<UfT`Nt29up)TTdlSUBipc1AVPGo_RJ*JW
z7z42v6VS`Ck|M&T?BV`C5QJ%pB)@(g47@Iy1o*lZ!dI{!GrczI47$T!YnJW*hZ3mA
zxJ|TRT11E^ynujUE;3nrP^b9yYeK;GKZ*xy_zy7|g1rJnGxAN}LT2Ci+uJ}WaQ=^f
z^<C4bH*8PXnP#WH@O^&8DlZ>e9BW>K`|f~xx|gDz|FaQ~2V2kN8w2GS*4S5NkEWIC
z7WDiB0?%6VtySIGE7w+>>GAys*N#N?j(F$2Mb_qA4}QCtcLZFsRKVfv%xK_QP6Zt1
z9`>8@frghbcuO7xWR}yl`Y5>43nL>2KxE%_r!@Z!0v>^^^s{HAKw$c|C4<itI6u(b
zDjA@uCv{89!^{UAzq1#aON5&zifW{2u*HrA1-I$usejjzb_p9>eH*og`DK5)Iw?4|
zD3%APoSG>%=E&qOr@;-9)XcPK;<F9GIIw4Adw=bOHx$T!Wzud6u%vJ}OD`A#uqwP@
zzTgwZ`xoQ+I5zk%hRp=W415VAGG#z)qJRBqkt{s$0*g=6GfclFeeF-z-AXx&&G=)S
zN3VZ-U9K%vt=F(O!+vJ58Be8bsdf3V+tjDVFB4BP?pkY91O(^}<rvRS58M9?R*m3L
z7@NNvK4_4^8*}T50`3UYPw=i>Va)sS2~6#ohM*}e%1&y?@9)Y5T&$7Ch81!yN}>*#
z*K~o|sR`iOozm(g6|$x94SHkuPJd25Vs<+E=2`Tt3kvOcuDSHFhtl<OLG$WrHcCT`
zjmanQ%Eg(f<c+}C_;8ykfAQCT#$|J?!H5L_G!64xs=1&}Q+*vj(OvS7KACvP{+v+f
z?X@2U-HN14cEtn~WazK3G<a<Z491qYD&nc$hrzht6U&*pxj;MGF{_yz`2^O}2{ag5
zjNuA%3R^F+b7#AechEWHkFN`RsBU*zpMaXz?8EL<;4ds6oLkHp3&Y&Um(36T4n?7*
z)l#i~<$34rZQNC_+b+UaX)UJTllgh-jz8CuSKfgVvOk775aZh|5WiUqz}~DZDM3n8
zjsWk+n%@F_UQtnhP6@l_gv-W^-0{|e>~!I~*Ie6rg5QK=NiDz4NDVUa^JA|>h>>}7
zMip%XGpmOuCMDsn9oP=%y^s)ZYr)w{X*L1lv1X|nsE|TSN2Uy9KKR{<555}B=G|fY
zzM#GS{8XKGWbOwEb}~H#eKYt-zhn1(Nwhn6>KgZ?p4TpjHu=hh<UrLBSeZ!M{$cPk
z@=k7PJ|;9!tE=vry|kiACfyi?E-J#^b)uJWR9;<VO4rlTJ=b%&+~`Ge_{9UpLI}2D
ziIXhXyqujrlSRNdb&Ke`sv4e8sku7~z6;=fBNHD8agOVGY@GDwe9u01;$tG@qg^ws
z`PJ5w-rH03@dm-<%Z+AQQJ1$(M)!VZvwrHfK---03tfx)^88}QX!XzJeM%@OPHbpp
zXpxQS;!0MF|A$NmZ|Q5sp>M9)k7)U=CxrZXYnUY+bQ|}3nDShDz&0d(3g!dlEGvvB
z*{e`Zd>gSG`t$@C=z*ax-b;43g<jm7G&#K|v=A1q8DwN`9CF{#tqcC8!?;0#epUQ@
z{FUJ?jyGG2e*;qdAC*^Lrl>@YWzvNWWb1rh%{B3jmPZ!;<J4pp^~M@s2_AG%M_lr9
z6Sy2WWL<LD;XvCsO+o!d5B<b?iicNN^A7t!YApKf?W?T-51iqvt#LixnErw_89$_R
zqrX^3r7`*ob+EKV_c$=r;@URwluj}-z5&f)K8m|4BIJTz%okbMp>MfT+L2<@78&xh
z#Q)6Qk^Q;4R(QD57kjMS9s}YL7}k!zEOHP8u}j?h2CJ?0`P$4{O!qIOKBzMbnViu7
z_P!fcVA4vHoex*H;#$L0i;e#4$q2X-JqRw(9)56-g`iW@to*cQOlZl%%`aXO?LxPz
z;hXnHd6jfBJ?Hm1%dZZLmuqq;3aSb}JNj;WH`+#rzj#yXM>fbc;w5`esHxpH*3{lU
ze&-naA$lOaYHB}!lc(G?tm^CO^6(4}L;$7`MqqWO9w&ZUTv_;Hi2|Ccv7r&FpeUtD
zJQl@0v1@ad?4&MFpX9#D0}|h#K&@QjG&B9~)07&zRGDZPh#VNrZsfB!I1g&Ct*uM)
zW!g5UT7*d|UluZR{FL-SeF;H;^x<)ypidR9r?=A+=!}h$I4C%!KYzK&Q55Lg+FSI(
zfW9{1jF{W7;OF?3+c!O`AYH-Zk%e8AS8u+Ur5-*KzFHi*?fG)l=mbKL*SGmQ)LRKg
zlX)`0tOFFBD(>qWHtdEiqEyg=e#`jSQpfkG_lR&z8V~G+B&5<i-mh@h@4)uq+ibW<
zmj4|H>yb8N{*&KQQcVn31O8(UBDA&S*HO(c9e3+5JiY`Jl@@<CodfDuN467Lp9myL
zDY|}Fx@>ynqa8=PqR_5Dub;bJmOQShp%M0$%NB0pc=jh@uY==V;;nZjmLyAvBUJSx
zh5X57o@mnENoSLL#Cn?`pKOLh_>6{+aiQ%=z7Y^CP*G8Vmk-o*bhy8^z>Bap*2aiU
z(S$w^2Q+A;$g+}9lA;$@Z#nG+l#La<jmgPjI6FII01}B!jrFdarGEgJe>=(iZ}U^?
zyD?M(^>IrptJtBrNss{B3X?g@3b=xc222=$<ny$zA@j_1_G$6gdz!tyy-fkvqMH-t
z58Us=v@j3eup$b~|Ced;e>>y<Z<6ufqiP|6A}k!#0f$L%-XOWUx~>j^1C10#SP~qu
zG=$IOfvg4@0{<HW_E{1v&{fvd)NIa#7v1xU0973d5D%cHDJQQ9F`@v)%0M#{Q^_|3
zOi+>r%5P9ghL@DsRM>+`(h3xj=j4xINo2s^)iL8}#mGRjTV%$~-Tk14+)z=Aknou{
z0z0sdRhueU+1UKH0`J#R@R`A3q=f3`h={5s%g)YD0balv8wW8J^m*k#tDB`P`fup8
zw7H2TST9Wfd~$SjWmSoZ9g!OHPK|7BW57Efke6$-3&4UzIxtugA(+I7FO`@FhZ!HG
z&!25f(Ah5j%9y7F$B$qIV#2kxNKh>)8APyvCO<=15O`0KjQb^ryT}_gP0g-fUlLvY
zH{ZgeBLL=6>OqJWigzV)E0Qmp^`B+32T5iNDA>;zD#m(qfnPkYUByAXnFpG`#ZMSZ
z-h$;R8uOFNmvXBUe9sliQpLYtGsa5r%;w`idX)b?g8JKN{}%Z2!H-mZ8ToCDc7qZN
zjGL!~0B9vRLyn$CC%uUpDKaoEJFwnb=K42c@|#4!WMSZff$?BdosnK^LY#L#GDCC3
zc-MZ;XTRJbY3jm9sr%n2Xs#uG?;;Mu<L#x4cn8B5KM7<@tn+VL0x>-%fCfgxW7ze&
z%8^HBg7CN}-*_8y3&<O`F+VXh8s?6kJxHDU*4YA(#ZMoc?TahOzP8e6ejGhFW$%7p
z*#8awpwd->1}VUI+fpv55)rp3;PT=3*ZSu3sI-$?zuW-ysrFXIm=Wa+X_(frn!ff$
ziF~v+rQp@=@8<FnE%d|7B8wBj2<82*(KUdE;%F?o9JeUV7u(ReWdQV~z3fV|r}oH@
zD<>PpE>DCH;DKF{lujOX-^oKSlw00S+OJ!qTY)1yJ%$-A;07Df0T>CTt=j8Id6kw{
zPD4!LM#_~vLoWKqFG$#Ce7NuMT+Yd=^e%{r=$tBo;y8w3{}*d-0*!Uswu|3X=0q}7
zR8&GTr80#KNeCfj9tsVTsmNI7DXC<rjF}}0WuE5>5k)9us?77ak6+*Z_TJzBzt&!B
zuf5;(uJ?KCal3!Rb)DCF9_Mi!=ZHOR{Hvq~r*4)Fr79su3c9e@H$`8!T9Ln|{*?94
zrN8Gs%+J*gg~#q6x-U2u#b!QszlY>WXeUCAy;weu{T%&r<zm?f=Ii;-Pn~N2qD@AU
zmZ30<Uyzk5cte+eWS7b3Kh{23%4X;JNG1(}O4+wZt*Q+sYwFb0giQW;JdEbn9j~(P
zvbY%er7|%nh|#%`GAEQtcwhxwNTU}rwGH;~p16g+D7p9a!rU#X#pE}Cs|)nmzGhsx
z=eS+-8xa8QX1IiRqHD&sdsI$If79K<=tZ;3O2wrm+w-oCm@mpo9w<3ig+zcv(zU7P
z8nPw#-I{&a;ZG4)R^2`^{#{K&TknP4qeuGnL$Z4(YnD{`m)$wy%k+P~Y>&;gp^<m9
z4qnSV`T6J$wu#SV7g)GcHPyCNQFd{P@X?bP>_+#%yFqv+qqpTtt9Q5$buFE>?o0E%
z(k*+et#?((8q+3HysIhkYYvNv=lN_~KyNFnl5v;#74{|1A4Wb2oM9d387{r+x~D_X
z-lsH%WvpGK+%x7#xaHikLtbrKS;7-HuTS60X9ZpQs|)UsUz${#{d>*O<ORUP_Ll;l
z{?hEouYTgf6HgvDnNN^uZKz=Hkvv`%Cw-jc8U1ChwJ7M=Z3+X~33chy<*gYbe@yNb
z=7o^r%5x?P-6lR>QE2PvEy(Y2StLIa{Y7j2`%BX!zhdVcj$tY8?r=>}qrEz6^XYU+
z$>2AnDigsQDHAbX5ke04W2c9EuJ;I6r_DVR-@V$VPGpG>agPpaq`0dC5{)t^(v3Hf
zCKr_-z4=>qXx(>Wtm?hvp*>Mi-_A5^#97RpFwN4ZR5@@Uc^{smMAt4TW{8Dq-njb0
ziD8ADH_fj2jOwX{2OnuNwN$iDcIs`{9Q}!dmQT0$u?y#V<9Ys=0lJfhM?NgN3nE?9
zHj3GO^5v1$ZA!9XQ9k8~x<Y0e&$vR}R1~>4k%|lRwg*y{4LNNc`NpMWtfO-&YnP7B
zwEOiB4=u?_-is+mj{c5q$~Y-`>1Wr}QloD3xeF724sE>au6%G<awXQyf8+0}^~J)O
zA3G^RR+tSrp7o#l%2oV+egBYKkNP)bbzLToF42m#vYVVEss{?OW>EGz*kzXo*uT5g
z|6R@DM)&6ByLvty$_iKf%A6InZ(=d|J3ptw(xMwP_lk9umLE*p;_vdv+p8{%j6^Ye
zgPL>m?eQ|t!(lmWt7S)36?d*YE%^5Atx?#!fw<)4M*{~R|DrchyrMV!F{*GyxH;VV
zMB+fW$MKfV`*~Lke>KS(XJ~f}e)6(xT;FD9Od?^|ZgR4hFGHj{S~m7dDu|iIR<KU`
zuE+F{^c!<an}iH=Et0GyrTufUJ4|(6HkD~EGiI;1fc=2eiSGpE14H?YJ$(a{4ZqK*
zJ>HMrQyZt|8Rd_%ZMAu1B)#Y{w$HDRC3}=nmK3_unajW63jNaBA&Vk?tmC+x-*Gje
zkCrFQ_8j8E2bq6As7M}`;}Lm#*1$tj|0vt;u^)aqev?w1J2@l9&AMYvuat6^O{~-6
zhQgw`>mC_D=ua%HwQ5V}^gL0aN_Efv=N&9FPhvSOOo~4;O5&AaZ%xTKMnrj}q%E(i
zo~b-G>^f01T9&}T&Jt2;xU=5>Wi7M?so&{ruZ0|HHZrZPJo$d*hq$)(<?I{hDfKUe
zc&%-aQ;>r9{PFC|kM(LwnXlO;X?j`7b))T+!TV*>N{0t^Xn~~3mn+iVBt18SZ5vA!
zic4vAk6Lh><;e|^QZACxZ=MApLJ8Hq6+G>76LKV-gq6%dI|Jk35&!10bq-xF^Ojs&
zjz9V`n$A~q<eza*I{Xf-80bU}!i@UWY@$%G)p=4x)b@GMO1w;5K@zXFj!s+xmzHla
z%SY9)M|^%^@%e8;{9o>8>hCGyq)7&D7avbnU_kHa*!x3SVFR?MGXX|hIIKe!Vh;Zp
zVFuDDX(lMJ9%sX?-mD?p{pT=y*H}PrtSd5vE!Wy_O4IL=pg(*#qf%0r91t_ucc-9s
zZBJ_PJ5@oH`lgrbkJ_$`YpF(+(YAeeacwb$n-V{9{__P-=(2me_3dr>lEYgX)vhvT
z2Vcys%|!8?)8azZ*G~$AY2=Y__lFt(<OoRpJn;W6MK%V}Hc1Ye`9d`*A~i`!NFe9n
z;7DuQm!3<cE!x#}GWQGwA_{}I6Umv7390LyO(=x!%7*8B?B>RFAgyL{Sr}KG8~Z}Y
zJn43dY<B$Jp);?kqvHcMthdf~ots3`!H2Xj9=Zj`od=I!{d@p|Uh{8nu4w4!gcm-i
zNdiNZU^T;qAY^8^*&G~1tG?2cK+5TXEWUsLUKXO%F_8eiW4++_>@5Zjy&r<!ucdC1
zRTs&$wYA}8K)JZI#3?Pk$H>TtijGbJ9MP$7ma&{dLJSZ<5T8AW-M1WPSYWpWpyJoJ
zmfNm%Wb!(Shr<Q%I9eiskQ{t3c4mUiIP#>+@v+X=p;z0If1=TW+*mses97uJVQ?8g
zefo5<(1G{Q-@i!$DW64-9jiIf=jwI6GwUZVqQ0?_Z~|z_x7LSFf&zl}Cxr?LG@;0|
zq|Xp4HgUTHL;?*jfwZPH5x7|R#JVq2gGyWpi8`T-cAafiYE+57bm<cDwVc3US}CuB
zv<stygXoZOI`Zl~^7W-yUYH04H<pu+j|TMD$fK6@gpEYhQOo}Eo+9Ft@&7K^a$|k%
zD@eDuCwjN4sj1;Rr&U!|p`7-C^??}>XF`8_<Hn7a5|=xxQ+0cxAb4D;z}4{YYY*a=
zgFR0WV<E*j<S4$ET}er4b-vriX?BDWjespOGBT0T(Pj{Bqh;gU{)<tW$d9Gjz&|DE
zyF;H|1OdTRG5kcSrmjw~^J{R0Ak&gV*5okOPK{?xv__hvTPgjB4^qid1@AsVPxQW?
z@M^sj@asiqhYat&y0*5myL&e}MZRfiyl4R|Ez&KU{JTZdss0*5FabM>Lyo*pw&6DE
zI3#vp6T*r^DmWyh6*N(Ykrpz1cu3wd?JRK01ilI2<rhm`#UUKgO)Kjil{dS3l^S0}
zFs0!DA^udrFc7caoOtq+Kknhy!X>bN(m(H!cJ&Y2uVmJitY-E3WkCBc4dKzTu}X+)
zaH(QWllx+1JRYzd(KD%k$Vpg`5TD#deDclbwl-m>NfXuQVvJyfo{x~9NW)G+GejQE
zFG9{OY+hSlTT6kZguX{QK3Kx~?}OaxF~Jg!V?VlW%EAkG@F`MIP)trwSAu>y*>k7Q
zbYZ;5sy&s_;?whh$Vj%drv3k_p!7!sJ^HzrEjfCT_XBDA#?rZ%nVAVDI`L@i2B{!{
zX)SiPcb)%cDRyW4IlhmXwlB#)wUL^dx&kf39GgCA?bk+zV|J<RxnPjGySt-JMA$tL
z^inY~F%wWz>py&WQYe)mM_`5F;CM3;&;GD(mUl=<2%e32hE4`c>Ds*h_cD*Yd-m*E
z#2PcbdGi58=`*Hpwd4PNEG#N20G!~TZ=0pP5Fx;VrUG>~H8mCZY4})apk&|YBo**h
zo7t@^Dk|8doP@9(DN(<{^urXFQ&2k(<vU`A%j>&`ql-H>kt!=IQ5q62u&Skn0jrGI
z1Ktec%gp)Qz$S=Yhz?rLl_nN;^eDIP5-o?-0$QyaV|7|a{R0D>j~f`!26E)p?otp&
z|AtH!4j%n<=yb3myi~$AV`<Nqm&#1Gvm=^e;o&-CD}0~2Qw#)H(YoV82eFf#;Ko{h
zdd>)`373e-d54K!L)V3#JL1beetxt}Opp0ydY|>(rQ-B{@!|#QWG_6~?cn0}<B}8L
zzhMT`4Dsdg%W4n+@ShIdb0j!8*gGX91wFBk?<UX!^hr!KZ{3#u94ZQb04P)F406pa
zOinUnTzJJdke<4u9tU;m*{}K5&(LOM4BabpAwMlWJrI%<k#EMf<lms1C%V*jd0_vZ
z)OFjoS9%9%!i`@#dwY%8rJS-CeJ;o@y;5=qLz{^0_IVKwYPhKVQYTLmah>ht-CXQC
zi!5p8V-J~i(Y0l(=c5!CytG|2=?=63s?nm<guMs2!l<|LU+}e`L>%653&0BS@Q#Yw
zDJm*zVqxKn@W<O+a7AP%TEP^otgLLicPE1U?mXY~-gZA$y*IESgKoH~2%#x$@E6#{
zN1cfL{M#`n;&ILFAe3*(l0OxpiREB={W>k7m$YgjUGK<j$Z@OmriPt^>x1J6w`l3H
zI@6OT7Z&_pyx<_nE}55(;#YF&#;$fG?sImtKCjtvKoHuIiv@NEaSRd{cl&QwJX|oS
zwrvxfH`szBtp;+2N!&rA?rS3m=|lHG>a!F35iE6<=PzC`?%tij&a`V+AcB#+t}bh=
z>ohff2k;VK@Z>kuyEROsp$&VXt#ovBXcSW7KZFp1M3`U@vJXTR`B<o1ayN>vCEK0P
zT&yLMhl&FS4)}AcMf)GS-Z9wqv`_y#E<*u7OPGl$+S$D!_AenRLW8#1o*pFY9P94m
zVGkefOGr$td8z#Pi9NXZw2&+b!%id&-Y&!I2>J?8J%&B7>@9XSLl3c_OI}{yCnQAe
zp81SqFMu4Pt(;>&d@k(C6Joc(ZOR8>!~c!?>C?W1;Rassb~!5ICw@Z41j25hl#;Bh
zXR2{oDe-eoYs-1WsQ?*Hla9J(r@TN!5CVfg<P8BJHaxXb3*_SERfgYCAht6tP8R45
zH25s*A<I_8X0E|jAPh1X`akYGjD-;v8Oa0Bo@#%_{lunWkn_*Y71e}U)W3VeHGYbf
z5rmb*X3{SYeW>rqJ;hw+Go98~3xGqiBB(OMDFxO6oo2w1&}WvHa-LS8;#9z&?4NTU
zw%S<wqWbGTl*Xykjg5`l5u(jtsNsCGSuhTIz91-fhO8tJ_+lbjN&a9}41SA&yA;LN
zT?Y{DwM||?5!a8`v1Oi7jtY$AR@fFvtw_7ft71j7ib<CZI664&kl9$Ze~^#HrawBN
z!&VSAG2?CYgM&cyK4Ec_dJ)E<o#z%;R#-14GAQbA0|5b{^vt<)pT4B<TtCl_qt&b?
zkU0Uoi^|5vv#?+(>2!r}3Eq(W(hT~9TRho+FQXApCTmb&r-%bUj#O_;?Fc+-iQ<j^
zyPMP`Gn^RW^DD;{Xv2;^WX}J$)T+>L)^=W6T>OFHf-~uG$9tmN4?Tu>7i39<Wsv0t
zan0ZGKX+Ew7W#bL`={|Vg+xX9v(;e}g+qC2IM!om>5nKL?yoBucS=gwSMq&5Ht0x5
ziSECBYyZF&Y=Sy)BJ6UbkT&4Sk96f7?#MC>Ds=qKavj}RDr5y|<pY}o^Y_S6A-4TM
z<cE@ukfz$tHQ1<~J&Sj#m8@EU_}Y@9z88k^toSumxM&qAOPmGa9`F}A?s?+(>ik41
z;t0tT$tkZO$MI|JXT*~slwJB{{U0d>A%0<DVIllpZvXij_M0h9vB$&cnAVah@`JOZ
z1o7logmE?wK{#`lEx0=OSk6BU2vCmsE3-Pe397#U9AZ^{eKLIob8~apBu^&haaBYn
zKxlHXf@l6be)43qo7<YfUpcB@hhN9`r6X)S$cFsk7(}GMq6MX-*g;Tv51+IwYsD9d
zLO!qR^l?6A=j2qN<9-im?od}uUv#nH)~#D1hovP9)4&Q6cAmbRYty#}akwVtchAQ0
zK6mqKBy@05u`8yaWAj9mXI~@jxa->6+v^`1TGw9_1Z|k#&Z8DYf)Nl9P_WGM@4Zh~
z0c8z8=ind;r!6ny`^27UXb%kyQPI*iwXz^nv$vly`xp?hQTU%+fVLzRRwC&`W(i57
z5<0&zYXDolAtW9wutwUw*dHVay%UwBWRdHF<M1aAQH0rxb0t?SE&V{i7^J$6S9|5k
zuaP@b{falba;X8Se?_ntFf7#06em(*G`V-^sh|2C7J(a)vKjM;J;qBDrAmQX0Ai&6
zCc(1mPGgS{LLr1S?qKx9Uk_vWMggd8nnF{h@yEvaf^F%_ok<($ouIY57az}wjp|LL
z+W0yDpr9(Kyn;$R9ud&A4j%#ok*>mjOl6f<2yQcwnsSMX?!ezuQB&WGh+r))E<P)2
z{JY~7ffM8C9CEI$@9mXtrgRp#^ky>zUj*j{;!TYo()Yc*><ulBq@zYMMX<tygtH9a
z9vS!GlP>ddh^vj#M0yNR8w;NnEF{z|ri1li*x~}y?2sW7%IpVwP6mQNqoAm0+Fu=@
zXta$4{=+7CJOzFIdJ!(GKd~>^j#|(mH84y^R2Ul@yXELu1MeIn?*TI)0beABWs);=
zwKZXjgu{p@iWyEQp^;=<%rV=7@Q>Bfl4U3fL6IpcF=YN#(04*;+v_?kdFuy>co7i$
z?T3~JpAmCg76rqH;8Br0Vc!B)&eZDCjNF3y_QM?<mc>w_9vB)M<C9*SZR0v=oEi7-
z{Xvzd{&?zC$BrHQH^%|0H?xmnx-0Oq^9JDxwhSLz-62|Xl@WT__ZwnC@#U_ruF_8X
z`UiVu1PUESxn^f)y$K;?TS_SI<)z&UVrn(2t;gmcf_EOZb2UlG7WZZ#xIziYq~*}3
zAawjP>x=t!k1W0NV~~S!*=ag<F%9?$QbBS`q`OlCp)x24!!jmTvXoEJEI+w|;|u|h
z2^*0}?4C<F@-@37pqgO^i+4d{S)CH=&PQAd+9bCS!{LdfbyEf&bTA^@fgemTE^{|S
z=ppx<KD~CwW{g$NACZ9;u43@x-cNjx$nkQ_{p?B+f2dJio7&hIzg!#EIT}vu-uTF$
zFBD-r2;Ojk(1E3?@Uj#b2%zQkZ20kL5SC$X<H@uQw+?y#H^z?>q~`mrg);QtWsUTf
z6u~9TZDI`<KIG)uNF0}F-1NB^rB5#MqLImt(#vmSrEH@LA<+b65=ZfxgsiLw1iKK+
zjIVVO&)gjGmgv*{YJ53W`kPEU_*iR8OSv~S)2)?xYa--;GNXj8ZVU3<_Ky)SUTj5E
z11uym@Ye_lDq@+>`r1l_-7js%2JiaenH*<`nOj;~JPib1i`dX9XiwGD)Kq->M31wd
zFpWY{Crv^H0)&LOBf<%}%7Dzq(l$aSip;<ix-gVg$~p5cqn{5tIXm<2UHCaT=#2+d
z1tQyfKiTl0`!MxPmDA$cL0Gj(<3RNlPH(|u{sCP$f_()d97NYXMMaX>bOwXsghK*~
z2d;w$w?Kot`1f5OTdgz$fl0)>&3(}YH_10NG_*a5fw`gE<o3*v8V>BLuC85(Le<cd
zCJBV_2@!QzHX+1>V;WKR{KGBS6U@>sz2ydx2v6q<*ou|kzq3Q3dRk8}x;;sA3qj0b
zKChs#8POvf0`~S)O?iMjXEVVyA~<mHMYBZ+#F`}}jQ=Vr(R5h?b*WT7bH)>%aD<9b
zUtb@6Dn90pjt-a^vf`||hx#}U;pHn%;?lm8%6nOe%hN!HEd<#ryzqX4F&R<Fo^XB`
zntR;38Tf;X>njt;(=`61tZRKCqCRsY5Q@pMFNgV!OAW@(`!{MMEwIH?e_v2QSc!p1
zD0lht%l0c_3jZz%nR6Y|+8mdKn^sm<XAJ2zqp;zsuvCy7_@IuiYHejSc3(Oe1H(hd
ztJ<H4PkpE6%tn=klbolU5HC*+)Dcux2n55kB@(7n;0Fe2>koXorM;cVXoc;ERDVSj
zX?>}~CH@kCp94G~?;&HyMx2Cgo|vSh`TFV-EGizOU{y{A3PI%SpugT)7&nBPmdGlA
z!aOPz<ufPV@i-xTO-)blhYB$pd`1`zw!kJ3y3sR+yEJ`FK%@eW@^hijqYfJ*5N;bk
zz*k+G-<a^&Xll7YAR(Fsjh{Z%VmA?mDqJ*+@6OR2I`>=_yve00j|7j=j#s+{jEV{L
z#q2|*FrnLC$J1taLmVTLanwS}34CdyfGac$P||2;QJPs?zD)3a5!$vPsXdS$oN9Jn
zQ?mjP65(8ca*+eMgfG@Go+e=fit<IC`>`obpj8LEg9HKK*EPf(XLm<coGt{Z7rq2%
zHJCMP@Ju%$(>Ex(y%lm!!gqr>D;F1?s5l=&wr^9m#)1X>xKNvq49kY^1lsj3^M4v<
zj99I$tqCJV;3?a+Pis53ztU$dTbtia$Y5;;PGi;t&%30gB;u^XsTh_m$4C9|7hp4M
zXf`b6C*oz|?g$a^%EH9(!iDY3t$49Bt95FpPg4N(@`2)lIz8dhzb?~T7{mT58$#hH
zdhD36#RoQUBok5jZr4@PcK%-INW1&^jry7CG6r&-!U%SfMy0O2ryRAn6E9T&SPEg^
zaoN&RUP+0P$XDP@B3QOc4$l%GAnDrpVoLZ7pels1@2{>Ha1ZeakY`ic6&T#7NqbMM
zP6KxMlORQC!EhG%P~uE8wX{6scu67rGqE>jN3{qxD=4zn02`6e@5eflGdA9ff)Dft
zRE2fmWG|kHIxEW^IQ8!3|AHaUy~zynCpmc><-oIjR2Y0d>|vxgSfTBinp>}3yOt#J
z&exaw_Mh)wh<i`Rif4b)(9ry|!u0Z*`D?#8X$lKO##Gr$N>pS8a%9fF?4UKnq)Hb4
z!DG?wut2`BZ*14t;@ZLytM2^2-Q0?!rH8j`rWLxc@o~TZn&_gWlBSZ@^4)U08g&a>
zeX2nZ66FhOyUi+YNIwh@v<zI>4y0?cN0x#@B!T8r=Bce;^R4zd?qrTGjmd96*g~0p
z+R^-L*F|MR3LO!kjRjp!|G};Qzob5-R*Hkg25uYLR%Z-p7}uJ9#+lU5W`@PY0NFe%
za`O5j<(_7H{nf|A4@WQUUwo}{C4b}dMJ8gQJsf@~nSFOa8Q64!l+!t5?=SA%F9j0i
zGAwTR$CW!;t>^f(C++YDj!5IMG{KgpvM<5apwv!&Y&#zv2n&`)zP=KL9-rxbDenF<
z(44|<)FDGJMiH%TA*-=1C+*e6W@l=CKJFwVSwCkntvsP`Kf4fFv<ZJ;mdIc8tPx{%
zr)+bbk84hi1<|hGxYBub7n|su9Gb~LrQEloa~W>GTko!EQw#&0-3qfrNZI{>k93(U
z1N`WXmS;6@YdO9`(_!ewaCa%jP8BWd-0?gH;O;H%<z@<f9(u{Y6}4mN*(E}bzwoPy
zJEuSLCEu^=(EeLuJOBuiXKtxZUVNBXR+qaMf0&f3%bz&DeOOMwyel(l<miYBsXVbx
z{ijqVErnxO!iA~_xAy$>`KqLD_rb=h-}6ZKCgJ)TT8U%Urk~%_c36M+^3OP7+BtR9
zsx#XsZ!LvtYZ(oRs%-Iuo+Q1`%_EYz_}#5{_OjglP}5V_z2-0`PC@)yy^?thEV?e`
z_B8JMx`g<a@fhjUp47*7tA!yhPr8i{9EczG6pS;hVi`KJ%-1>Eqw<tSk^A!9j;|g+
zHs77~XnUtTBi&f4Xjt_qQ`r<dkgwqXy7i8+NY#!lpS7#1CKdgq-!XLQjj;{RXV~3z
zJf;IJ5?jnoLq^t|9s4Qse6W6myF2$j({+CkNn4s~X%?JDdwUZJ=O*#`^h7iKQgkCs
z*F<zPzu6_bvWBGw7oTyW9%eLJH2cF)-FGr%u_)!|&{*)jDyhlYOXR1EX6s7V>Oc%g
zVrOz1*<s*2f5hR>(tt<Yg^$-RmReEJuN6>`gj_#3SY5r=4?VVj>20bmJw3L;{-{K5
zN5^CQdinG*OiEnipRNY8cWjF}%3?ZyKm2R)O-8eu9P%gIx*{d)8=mzwGa6Z$THi}q
z_++-`QCbx}S44Aiy#LR@k$1{{m6gS0dlX}32Wv>x((d<n+CSxer@nZNEX$zC$DGn#
zezm9V;^5IOT9yJ86;(F9g6`{%hfANWFz@M=^6hvPZQB22VkVQ8<jS%Z=rbcVIoNv@
zo8I(u=f>=j8(UQhxqVO!rw<w(;Fb@I+G4)naK!4mEE=@N!GHWa-{~e?*y={N*UIl@
z=T))W^B<E!GESH=&WMp!QG8{VnD6`FF#;OhH@W0hANu>OQp0$+xy<#@S-LH?MGl_m
z`Crp+tD3xb+dnvP6A8p&zpw8VKCGsnaBvhg1!q!NzB|0RpD{d#m0A#HkCk7)!jMC+
zrR_@vYwWg)--|-+>6f-v`OPYR&gc}oJuOHo|5BF7z_dHm6ywbPT~x2aq;W*{AHPu{
zk#@g(rF&e<R(4@pSsi}PZkFTg>%-Ec?Gy+SY?9aZeQrA{<o?Ix;-%xKL&j>^q+f31
zvgti_W|6sC`tJRxwpxIEyDvNq5w;jC=i+eDT$t+k(jt?yF4K3)Se@1JT4%XuX)I53
zTn&Dj!-d|op)w6&N}O)%Y)hF9Yq9%wij>|LB+`DrIWPHVPg5^du_YQ({8;x=TI#(l
z<9cRqZk`R<CbyHpyL$I7jF*k-KRM=#QkZJfPR)asrWbaXzI`FwWxk1D!Zm2B4H}{K
zTU1jPE+5C1M|#k5-6TLFkv}j}w4@{mo7zzP7J;IWL{Jn!N+p=s%kxLcNDF&PHRi8>
z&VD-G46X;svv%wC(zaxuTnBLykKmo-tEtP90~@0%+EJH8uTu3*l-6QuoJs3vY7EV)
zdT`Qj-}-{eg}1)KcNa!HU$|`BL?Wk;Q5dGboqGLzMoZ4d?UhfPNS<lVx(M=|ZEsJz
zH9@WJvS4mMYi)MHc**jlAqPoz;Pl?Lw&WDA+*!I`Nrk?1zlX$GNb`$(b;i|`EkjPO
zD+T3+zFT)0q?4Fq_v#9fh+kHEuvnJlex})JM%woG{4;%a{v#izrEZg~Zp=4-*VEfY
zieop{Ft)Z<yV94CX{y=r@&KYuI%%Szgu&wqFH5tnZ%h`8g=-n>@sq4v!o18Rp}S}F
z7xzB!L{I;o(rc6IxZ{d@Rs_N~dPG;oI?nR!S&bez7H3I&MMme#_Y<Az>4R&xA9FTu
z_GIT2I(k^Lxl|!MY(e`35hQB*)O}*I=q)~6qIfnh|8Q}dnPigNM8dh|hbc|v@+m_7
zM^nJ1h-ln!uQRIglbf18`=FDQqHZ^<qw{fXB~n+vc7t5)Q(yB3cDK8?uZLbY_24r;
zS(GQ(Ax--6sf3NrZc46Gz<TP(X$GU}=T*f~O!jk406xuUck?ZMZ;y>w?F|il<Ewb-
z@goyr_kR9Aphx^^FRVB3yK-}W=!5RyU$NA*v_Yp|3)Cr<ksZS1r0=25SvQJyau_ER
z`13_$+*&mTZ9pUHMd47Tu42J8ZAR+vkL8_k+tu=}34yD`&-Pc>5xVtUrLelvrefPo
zB-z0bNx(E8r}(BOEPGCr%`EJdKA+!H>?o+T7YqHOe$-)OishOOQS-%`GHh?NA?*`Z
zS4+grnQ#A$U5HB_3LzC2@asSQU+<5ey~y{%$<jKU+~7DUL718%pYZTe^u6Q|P?vK>
zzX-oHzOK6AzU{8#5?igWgyNoz#8>ygm6lRJb2`Xkt|eZLNp<F1NMv2W85LcVnnLsJ
z(E^6RJ2%e?Jh+{2A#}XGVp|6NPiHw1P|j=eWvb3v+WH^3{bTZK?zIzaeqQ&(qN5+=
z=F&Zvb|K?UyJ~f<7rsSFNdcT*cg>dnB#nIOVXQq(L40eXPyOyYldFncdKdNM<cm5Y
zk6-6CGaCRPe~&riL{;({1J90wl3s0DYKPf&@BHDHbbSgxELWLj(w*g%lp`wMe)QE=
z&dr~E3{Jz;)ivUET?u9A!zZ)5qM|OPTI%hN6<??f7H?wQ<<2a)-Kf7z=~MaFT#o#S
zb(^#=noo}LXB^XXnb_%n=DhrKy@7_ex{*1zwv9_W(K9pe<bT#)@l<EPq%S@GP2Wfb
z{i5}X_<PrD#+f-xr*Bs;$Z%BqWNc%&eG9Om$R61Jm8UnkQjz5@zu&Vy<3$Uenu>PW
ze<vgle(RnJ>ru_kP4@#KS-8u7(~dxXtE=f{&C?9Z*XmPFP7RLIeu#X_erKXiRxz2p
zDLEwjN{Qef>sR4xr;F&yZOSIRnp#Q`!G6xfFS<|df|i)WH06%TN^;U<<oc$}8<euL
zaXR)YtClqezfx#}RFsrx$%=H%r#oq<G~33lz7_Khxeh#l9j07Z6!j6S(mwJvb-&xM
zeu~>3pa_j5hto~4J%@LR$Er6m+)O!0`u$$#9oKbNOo-Pd;~-*Ga_&^svZJs~hr)Zh
zzd?+#9$I{kBp!#YP1n>ebCnfsngMq9Klmc0%G<;9+|Qj9wlLXG_t$cz*M19o$$eWb
z52ZgfH97)=uG8Q6K17zVK__>l_^2i$T(T<a>L}65T$*13#LTeXDSX4=@yZlU4fCzZ
z1GQ?aEIFEW;SqmQ$Hq=nZ!)h{t43Macbpge+tk3OhnD^GJt>hQ9<0d)3#oRd!Korm
zi+zVylATt}qKDahbGETT#FO4%YHZ6e@8%(^TbI0OabA$%y54aubK3exa;sA3C+n$?
zoj1{g-rm1cB!TZH_=Wtl?i+qA;DzanH8ar;JG1nLrAx*9Ka&G3eo<CnHmI*DD(Kn~
zbxA{4D?BbbaCCGAfLGkM_BG1T?3L#I;HZYH8mzV%Sfk2gj(prE`&??LcVyfl5{Yy3
zc#n(c@30fCi7u?D>B612>Sh@!J+2LbPmI=>y^Ir^7i%+<iFq5jNK|I^jO+LB^k}Ul
zUEHbp6Xt2QV}sO~6lOGbKK0Sn8#k#jnt|O~gwva6Z1aENtIv@K@OZEa7<l^mQNog)
zfVWUeMl4Cg4V@6!!q5sW<?QxhbyZab0FOjfxQb%m)i|DJKMxNTrb(a_eOkC<S%?QE
zljfEMOlSa(MVKtHNxO=nGu?PFm`v8mNeo7uO$UO>2&OSnzoYggnu#b!ue{mIl@Ry<
zTCMwyA3jvW2CNmmO5jWAByUImSwrVYnM>XJ@^3-3in3G}K&uHtONo$&xh>CDz%Q=J
z!9xKgYUBx99H8X<+SO$SU>>xXYM>yR0RQY>CrXj;B!P5o2KTyDpjd@>CLVZudyDiP
zV$@Wuls&C|4=suc2!7%9Rf|3z1G<{PxX)ft2l`X6S%d_PuN;rY)Y>{^&&j(#fF=HV
zV~p$e#C4Mc10-OX%vY~WZ`=q*-H%6bN>Q=UxD{;zc*vJmRwjI(CmPadAthq?2jMx2
zR&$eepMt{qese(tSdd|W!zTdYA-wUx1rl&nCV7G$lnB6PVoogZ5lC7DmJJBg3s0~g
z7^@ZRJqtQy6|{SC-XEAAY2E)J`WP)-!Rjz)MhNz9cH3mO@V;KDn;!W4cPoi7*#gua
z{X6QUf`Se;y4T@HVVxR&ST_Oqn$Yp%wa{Mw92?V%uVmZjwr^9f_Z$5E&&TT0r!HQM
ze3=Iy|AW{fd`g6N6DtO&ZP1S&NEa_D8=j8=UVaN;4!VabhBT$C(<+#sQQpu%y}rH<
z9QjG%0qDK~b7|9~ukOXGmAsFOi+p3jV}lZXjx-fM4TxPcGc(a92Cs$W$+-VCSWtTj
zK{XybVdIsi0`o1MV$1;a#ngrzj9&mD;wSL!TJ!<<T-i4Des3{0>Z8!m28de+UeM3}
z{`-hR%7*lW*aaJ31PX2{OpUmxuRnku5d@Hr3tw`r{C-_VAc+vZC1HUPz#ky+K*H$_
z@YeYV1+cmBc+Xyfm>JL}W*mhOt+0j$<*`SBid6St8JMY;cXsUj^z6J=1hFL1oBDyF
zCXVp;n+QRR^{g_S2njbftf&NlwXnI<OQJO=5q^r`eQ1vyy^E<aM9%>n{9u5;D!AlU
z7x3N^&ZD*D59BlvK4W0V%X(34eJPMujot8?=FY}NBRKr~0`lZ5vuNn-)E#>SmOE(h
zBPY=e-2wuN6Ncsh#q>k_RN3&eO9oZ*-oxowV!ZN~?CeCa-F1G(3`2OZgLtgu#6S{s
ze<bdV2Sa7rkDaK)6->rF!}N5Eu&{6i+Ss6p(A~Ln2SAjH;dVyN9KeOlUJT^VPT2Tj
z%t(KK|1FRq_%CLY(AGO2ae)sg7GZaod$UJx?0jGnzK~elfD3KlR=S;Fs^N+QeXxi8
z3GYXc2TalJ{aSQK5dYUFRC@W$*qgIDSQ&cxH;7gO+6Bkar^lJ{6U}F$iv{_@S<z<n
zw@fW8DA2Y&U$%Pb`4ad{(Zic=!E24+Ahl=cZUcw~<H0Hf1W3aGSptcg@146Ky7WpJ
zYHkeu(JXU!!yt%CVD|)thyiNB^ek!}&IC5N){^!O+Bw_$GU{AIGYix#ef%U1_)~yL
zc^#FnSOBA~giYO;NUzG>yM>FhZR(0>0uxQjz>}p=E%yT@<pN)_{rcfC{jC4VoM{%v
z!{!I;YCo2=BJgLT&#^dOH1WiZ;2@y?8h-b+fR!2=gVhkM!^!apI#*0so2+QB?EsHZ
zXP$RFn*HQmZ7~Unr+RA&J`a!Loxo!lzA3uugk=DbFO4y~Mgy?!su4F{3JjF+?w}FA
zJ8Ol;j3D@1MwvP3>FHc(V5*MsUE7Clm?t<JYBAl(>aj5yrGDG?2BJIm%jzxsekr%@
z;lC8mta0l4qX_ioKuDNlx30Ma#EQ?-&gjj7#wzr@iBU|d&yH_JXjVceCcH>$$p&md
z^aeAuPs|Q0sj0#G;-&(eW}k%C@C2)Jdtuteg$qxo?S2(Suz9RbDMdy_osyT|1bWKi
zXiDt#i($lDVtNw}4=@#DZThg~6A(wy?QL$|!@xk8EdCO=0K{A%;CAi$_5EN}DRpC}
z6G5_gIq*px{U98R@vve-kIn>*qeg33QkJ8iYCn6&-rlRI$R%u;L;{lmLFJT+3N3yF
z-p#wGGn3+uH8ht^9ONI1W>8MJI2B@9pBkv5rpAoW%nBBS8Qwh?#x0FKYW#?}poo(v
zNgz=h?cX3^)HE;{W@KX0dMWH&a^&W>H;SUxUE0s_%nuwo6ol7D4MkE8f|OL9q_}th
zVncwp_hv>8jw9f|JTV`K%_sbSk6_0h#6q|GXlic0A7^Ty>vN#tTH^z+Flr2cr#13*
zb^XMxkrqzV%a;$p+L0G1yMmL`d$>6>C_P{YM+1#uPB0s)v9Y}w<UnK90;LVMz`<P2
zct-p1R0Ux&&1F>Pe&pu&_nhCqf1l1wNxjY$(Nu%;LE+uao@%t>RdTuICh2yDOX5}E
zJ&Z+$X14~h$iPg{#UgtV8yky0RciZ{Cj`BaXoT7VewSMrV%7kKv<Acl`&`&$^E9hi
zk%$#N{X+8KK}EV<qG$N^a(Vi8;erBP)4ufe8N=$7M|Xo5&SY*rAXhicS`VX!8cf=H
zp7<ARg#>hN8)MN=_5nzb(3wlLC$Yr&I@r+?VZx!~)4`+A+OgSl`U)NzJd*8i2#!Tl
zK|uWrxdsn6_i2!K70}ub?DN<F>+itP+kY++?b5S`r=u<vJLSNg`@#FW<9GLa{3jP+
z?%KVzX&N4a`hp-W-UUjbPgs~{%)nk5_vaJeiSGqAU)kAtqHh-n*gkUcJlW?sy$Roi
zRKuct#P9k%HGv4)W5@Dbf7egUJw?<fC~m?6uz|sqfN=u~C7Nx_;L<hZ#a0fXTgL)^
zqR*Zb21Vn?K-7tj6~XZQIXW6;u7B$Kv<=;5?N3O(+}=aHMhu+-Jtq#mCxRo2sFoz4
zA`<@hUUtpg#}j=f7-mFJP(TOjb1C)cGoKd#H_x?hZL(?`I?e~cN8ak;u_3hry7GQr
z-n8<y3DBLvi4`Ln<oP$EuDhH+za0a&XV?#WYm`neFTFyagEv%*`*A!X1c(Mrt%v?6
z$s=ZkuaR95l^7WbgbreoTd2%>IgTUy8;7mbz^j)%z4v8Xih3d}LkQOs+xb72G7Sm{
zqu%oo2cuv{OZZ<}eMt|8Zju+r&g$w+Ghu*@-jwd3?f;jy(b@9<qiSSH!@!eZj!wTY
z|F2XHsTB~ADZy*vzwJiErk^-t#Vey3$iYNzl*U(Aqe0EU$aoKdrXTEsnrPxG!EjX#
z8{@s9wtfT_A)RV#6Ghw#R|4(@OY@-D3QB@cP!KJ66}HoZ%B~<7<2DN5I7^H7jE3Kn
z!Y3lb$Vu?6gl7YMW39q!(U~iUr3;*(;r)FIW-&-HKv>r4mp~(TD;URU=nHl3+z;=T
z&6JeG;x`)}9gGycx*e$m1tq1Q>+m*u`qMbD&KmT=D~HHqynTE)!D0XhlJJ{BEk#L^
z#bJ*a;*)oMqpW1*LEzZfI>kDNZ@kyOiwqiGT=&hCPHFxrQBcTXyq+Dez@OTB;Hgr8
z*>rTB@3Mk<zxsX?`5IsDoWxTH8H%hlayS+5c2Df}ZDqW7%5q5L=*nA`>%vEed*51)
zU-~fg-F~5GGc7GGEGo^=0VdkKE_)Fw>p)?+_2;YbWebabEP+UoD~&D#yc0*KCMRXl
zGbVV(&!4k{_)PQ^2{WD%%gV^}I%As;z2-E(mY$mGk5$|7{rhuFt2+CN^7Cz47XCP#
z3bY))XJ1G;KY~pMuauO*(9)ZAe)!Qm0?AGZYy~iSPr@$R*`{cEJ+pKo53%eKNVka2
zDzOB;E$Y}ijZe$3hnr(ny7O-KEGPbcsHmi*1=2%9b+tE4Y*JClfThLD#kK3?UD1zN
zdC6<wS=1xj8h2x0{QK>#AC|r%OtNve`@6tJaWThjEg_It!Ik?mKsm5v2mAZw`rH-_
z(~en&FR40h-KiyP)ZQ%G2MS6WSQ3LnL#M&~kn__z=s5b>2fh;C^zy&pt*?d?B?UYs
z8jir=)m7JYt&~qL8K0Yo>~+_rG~@7C>O+@RYn(J?+6>S#BaDKV=l=#F;rIy(nbo&9
zNiC*2;);rj?;S?Z7o?Plh9hf7oAv=Xw5!<ka(?>{hMf_@s)iNvhF89Ewh0-A2Eu%2
z2Yb}5#iORt=M-i?T{-rPhlhu-DV?5~an^XtcLaqQLEXd|l!GaZsJCc1&WAg~fEslV
zr?9Z*h{k67wPi=Rq%$40_)w1L<xTIWLq-%Pxbh~0ceRoCnMY_i$jk%LdfyMPrG4<J
z$10Ya=q>S~Pit(OwPT$oynRO7Qd-gXM>m#GOpiQdGuQJ~za$c(0p<(nq2(}gI)3~(
zBG15O)pK}@enmw^Ev8gi;KC94G%?x^XZj9SR$7kj=Bh!r<Z9cEVD}969?{t+Gyr<W
zTA6ReI9&)1L~Cm+Sd{#=4><J4e0ze0llh-N6wV8WVG%r%h`T|1v6i?b@Pgv2&L4*R
zcNGFypZ=(!{+G;4Oc+*B3Hx{CRwL(Y6nC1d?i9n~<;CN|Scvy`CidX;^~J9m8JWD5
zm5IC^BPy5+3yYu6S|gefR?tMkjAVBIp+ic<&F*?oRuQS^4E=#G-Ol@jB{=braK?ks
z<V~+)JvG|+X6NqR`~Sn<oM^8j(?95NCRliDE%i<<S{uQxcX@fg6jx{}sV^-dauW{V
zh}rQdbP#VCB@Wa^`u2MV>o^|_ny;#?d>J$k`lS!O%3tOkJMc~}9Hy<j;Cqq37LnT@
zDRX68+uL@xL%1`>9i_J}!-QQ7%%FrjO}Ut4$cP;p|N3<(SbwHSiU|4!BpmlpHkjeH
zUVL*opvCkWF$+-+O>C?mCW#&4t!-^p+hkTfv0ZhqN#<M(MnZ$3p_GP&4i#Weph2DT
zl4qxR*O{Nx-$1+}T%Zv7`0jS9(tda@&IH0r9X|P=3_%=~1T~rT1L-zHfWin^Mde}X
zWvD<Ps)++zM$Rum#Mo_)874ikXAfN_?b{vzea3wd`r<&;5OZG@Lyq)>;h?$dZr)#?
z)A72@(Eo4zdaUghk~KvPt^>t52jv?Udib@0@o{=YXtIPheyki2)PgU#Jw?vHKH^58
zUYHFB=?!5I4(0d`20XOxsl4&bMuH;;ih!NHJ>%ZJ8>il~sk&q3)<I>>>%exc0fYja
zfW$csX@EcKAZlXiezcXV-5l}!IUSa>0ZhoC)hDJM9x^{W53@0F<l?dGaeMiQj|7(+
zHgWrK6azb8CSLNcj5oTMq@nfzi+nR9H3yB>cCJdIum(r$Dle@LGtZa#DMuW@z*y+b
zaxRW&w09wWMrwMSkT?)Iqy+oFUqc-QdJ5{1hY=AeZwQ=72y6yG02SCjpsJn%zpQb&
zlN;<Bd8A{+(*-v#t@w#ge&}lg%|NnyfA-Z?LeT>PEI~`fkV`qgDmE=Go#UKLl?WEu
z_*M)y@>k%x@%=p`@SE)t{2}Mh|HuRFjbM|bRHOrFfE^f+E?SCgpl*vPb1GgC;p+uD
zOAg$?;;T%9(>N=(zk%z%8AydF{=DGUgd|khW&Q>jI<g10D|heQwTlZPD#Z92Fndfa
zEh*jH+yD=lgMawme)vJ|U!(yVI75)<GJxmmdFH^QZ@Nf=i0z2l8=PdC($Z3t*#Wb2
z7~4Wl0+pUP=14fyygOn#&gT;6KfwbAAYnWHT^xtFJRk^OH(qmBvR|RXjysK=ot+8e
z`-o&sA>0*exg7|sRru`)n!?F9Q@11RQj>lS4@Z0(YEzd<;*h+p{r)xhqYNZFTU$=B
zU*6>99VCh3IJ0wbI6y+1hMj!`m2Uex8)I@=coVe0HkPrweVd!qo}fs}#U+6yNwyCR
z!E2pa9H1tjT{xxiBs^RZY0AsQM0wl?j0PnbN!Q@*_UqR#%~PkykVgd~gHQx3{z+7n
zGO7Oa=SP7-L5F9AbM6cd4{P1JB^34S8SxKh7M7>qI&e?}Cet4J4H?ZW=+nAiQxfV}
zHJ8j)U(|MjIaH6CAxUl*nDKiPK$YXk3q`T`7%ucjjEXO&tqJ{tLWs?Aq~+9zP~?0)
z>jBQg0s`E~_Q_?j6yp;Txb9B=AXAGL4S)_vS>eE1LQ_KnCszX4L}8$|)Kph9Flx%l
z-Op7sGTP(p<itSg$~N7^$an<PN4Pol%iK?r#UZ??3}Ei23>h(YAv_Q>9`Zg5-kSgU
zDdwaK`0(vTcWeqV-o)oGbJ#<?EwGvXT|LGKSwU*SH}Q^7LlMqhPa-4FAf<bWGc{?U
z=7|@RNU~Yw0T?|X#65P8`jV>Ybvl^s6!cP`zumu6CKMDH$iu~T9|fKQ>b-*j3S8EY
zU%XI5t-IM16-9tQkAT2AZq8>SR|03Jie$jYc@kiak<A#*k&64nG4!_4RpE~@GSwYB
zb|?V#-LY#I-@@&{Xilxc#m0t)c;GO0b&(Pwn6E0>g&D<-E3as@!{K6e@X(>h$WYZ@
zNQ4Il25Nskq{V)&J~HqZZNBdf+&#F%6<`8sB%a<%=p3<cYXF7zcDqCA1fvQn<W=Mt
z3NpHj{fFa{H|9!{9zIpW01%Px2m>|Uj0;DAK{T#nIjAhW#Sk9V7ZS{Pj$*d`o3FK}
z#!oI}jiSUPhc*KOkA1kwhi4}P*^Omu{ykP7TGmAx6=oDl$BE$@2Boe$!G*(Pi*Ml+
zu1$Y)HpzxY>WVnVS`(FsLv24yDmHr}L-QZ`NOu}cAx6fi$VdiKAqpQx#x;P{B1hRk
z=s!sMys-)(=!!)>XmeDgEff@I2XLqH!0kXFl3--C?k$cYX&}t-pfD5JyLEp8rW8!i
z%^lpmd$+``ALW#P<uz0InNOC2;3u3cFz_3ifXg>;X5}3{o(?Gm`dOz@(h`<xn)utZ
zD;9enSmLQt-)RJI>oG|KEVhQaIzK2D&ya|mP+@k6_A~wh8$<!mXR{}Q(p3}$BDCoU
zr&fR+HhV%aQ{U5LIP`>xu@#40Lt|rLwV5!MSun~AWnJ9}3_u=5{8mu-T+<7QK{A%p
z8IQ$Ks~Y^J63COYIN`MP^tvb~l>W=bUk7&E4k<zSobDH@u!oE#(ms6vSI4^F2_h-Z
zDE7GEjGTv=Nr2M@gQigZJV2^(hAZqL#uyQQ0$y}ZK>>$cGA2ia6%>f~6gxi#Tag%C
zfv8F>>7+jQl@I_5>LjqWtRYubP<hJFiHC_H8;MXGUgAcZrO<YOVs5m}4==F3vhqF!
zJ^LA`SQKXOZVe-5I(3r5KRnF-3{<S4xj7V&_e{lGGaD^!x#W>4MYsV8JF*$0#?OT}
z=)XH5RyRUb7~o6zbq3(UZwa{95K8RDrTaZipK&;WC~Y3~nv#NoOGrp#r~uj&tsz@8
zGcM20>-NO(5(Je$7(+ikK2FHzNcEYmwhj)}s6hL=V?hDOhLIjAvC05RoS40YkgkN8
zAh>*QdgZfW1GG*jYYAn{IGdK=lp`jFA<&~XxqvIFLg*JZt=vpZSV8o<2f(7m6ib>a
z<bA>WGY2YxCD`J~AWC0sW+!+KlFIAqlzxnes-w4$anbOp3_xB)45%1+_~aZ@?L`dT
zgl?~3U#2HkMgGm6KqQrf!W0>{(hCVkZ~7qN3tOx{yn0N)sDPm=fg@nB3&{GL2#ERN
zLxy<yHXa~*rxB#k&<zCY^y*CQ+0+%bpn!l=pn3vM<#yoFQ#-KT6j0a*mIs7>mo3bY
zi>d6lsK=0;N^&ghDo9zp=@s{voIIQl)+E6`A9<*KuBYxR@Y$vHa2;>lAR?y8l`B3t
zs0V-{5n?I{{@O@SQ48N-UUfj44j1^PrHu|h7FH{#zVwA@#}02yTSBVIgcU(#222lY
zKRgt!8Mq`o2MLQWgizpz0)VGR=c*i;qYr&hi8;JP0qDyEsKVo-h6FBN-Yl5flSyRW
zNK;c21Y}@*l6Yu@h6?{G96^&nemJ%VY*yF|YA-Q%8i+YDMhVJ5Z~CycCd{<LzeU1A
z7=GeLxrxM@c|hx_UV5faHCk6hA<nHD>4^<UsEnQmr={VLL}X#W*t7bNA8U~COo4%I
z2F)X&I9c3l3+J167zD?T<#!ZYIR|>X^REvbI6%d~Y_6&!#@QwZqz+Mn45iC~nbo4}
zHH79$!&{XRQ3Bbu;EVx|W5~~lD2-RH99Mtw63Fm=xJ*+VOQ2~+NS8sXh>Z6Kc%0;?
z>)5oorLUx20VF5{OpSrCg0zKB#lObv!wX4PWHsgJpolZJF(AG2K{hj6JA4p09KmD;
zH=K6I&cmT-${?|6Df95a9xt!2r$SjrVkFe&IGDVUt4XM$q_dSvR-~b&odRUb1$kci
zZ@GARU%Cp^uPup6+YHLwIZ)-0D>dw>`SdBP-JZyDKPLrU_!6q61hD~;C=;~V*;$9H
z=hu+bLTghFsQm}kPV>Op6#l$=C@=`RFit%ZX?lA47TDy3oENIk-G|I~B?I;PJXi$X
zf&dDUErI?zr@<A*le%mn_7-GuP*eGAcMH@;n&CPRBEbP1(h1aCe`pEFL#F;adZdBO
zJR-^b2%jRx--!$xl4*p$&B1{UM9EDI=}z<BMKUUOx(85+hInOBcxB{h3P7TKcVh3I
zA9JeT(3sQNy+ca^{fbfMH(X&<#B(hxD=XI&b|%^$OG`@=ZbvXF2UKDnetvCR?O@?6
z{oblo%*@QDP>3X1)SktIC#b$amB8*kZ|k7??W{!=>bEJVfn@nvXxSMb*I|<g+4M>g
z{C$W8+J9p~VkCS9DNMNbi4T*=)&)R*Kfv;SwEoT-1GSMo0oO}JfWDY(#Yhasg8rg(
z?A#`|>4rn7mI!GWpp1hKVyfq`11f=fO+n#I=y;JlKQ7>Py>NjAT`Y|;8ok=c<?Vxf
zO~_3!dP~_qE3Xla&8gUpRZ6oQHoz`WMM?vGBpSIyKTz;R8H!(o!IW7i1ujP9{@XxR
zPMWs|WB?paDa|dFmWvS20(NF#Vc~WVJKKpKLR7V456*OAHd&;YEf-EUV(K9QAJsQE
zD<MFEzV3~3oR)*zT$OCIa=mn{7=2#4ibhYRg8z74ZQ@{rReSlayz9|bZwh&<B_w!0
z6o!7CSzvTAnwwIHJy#x6LiuBKG_Bp;V#_DlQ=e!rcD~WLCNs8A@G$GmSJJ00FH*$I
zYZe}5wdwcEi>KkG4tw<I{^LXHeEaxnmZzHp0c~3&8>0kta}mf1ASfUw-t=mJv9-|4
zB{YsB8f=^PX~><{4rZQNuF6w%<1Dl!zk0&tnE#p4H4R(gp_K*MzAUxyUe*kW<<Op&
z*;9Gub@Z8ZM&yV5(w!C4eS}+jzc8xDB$+lXGcyD^&naIqEL)?pA9nMByp4*3#+>wC
zh~GRo{JeoduzQaI!}4FMczM&aBD_|Ike~a|dkOQdzY7$uWiwYb!NHDy22*D?a$lAi
zmk8=QGDIRhmnu75Uu#aTRDIT}GN;vhAuet4t59vOX1H4Y2i2{n*H#Oq?g!*ZtExTG
z=eyUS&h#LJyO>g~rp{M5IVAmtoW-@wZCXrg9v&wiuHUn$Z1Xlxq@FmXHI-u;d^M5p
z*~7W9@0)X!SjkD}e7Bel{>UeJs_0H6KGvoBz`jYN$C<l$O>XK>&0$h`#s>rc8{DQY
zi(7Jkza#gZU$^RY<NZ`!%)6aW{h8OH{+9ecnn-bq@@i9x@5__}^=aNB<~oY16L)71
zY&Bv!QTaibbnMwj-_Gg~r^x4gZf*n39&vgDBq?=gj=F)At3o%$IJ&C@>+{y|MXEH*
zTk@ited9}HqHh}pf0R5I;c}y0*?A&9b0DqW{8E%~?SRT!EvtF3&ILS&MiJAF+oEq?
z2Pk>C2bFo~2m6I;30qzjBgt|(yTz7<{|+^4<1;>BNPn71={g;I5&bvuCA&Oj<&XC}
zy+amVUsA>x82TL2)itg3r)LwrSu(4l@kO|#d6M^;Y251|4}n+ZFWxqpSnaF$L2VQ0
zac)-+qd<uD<i{~DlBZAKxSz{)7uTV`+@168_8t{^-hN_Jzg49Q@@WnaZ9Dy=Ux+<$
zJ>!j^>fa}hQp}G0hb3#BT!m{RhqQ{k`305_-=JQiOXj9XHEg5X<Z`^O=5T<Bwe-ww
zd3#I!i#jJNDm~rLs5RFXG~M}i?eU}NfcuqP7b6i+G`4ZqE-$)jD-{=(P#k-ux+P%L
zP?zb^E$$(DxzcIhf+$8T4u;}#+KAUDWxvn)k&OD1t=i5S-{^LuFPb;59IuyQEVRot
z=$27ESCh3Ck!|;r;k{`7sbgC5bR(^FuWzn-V!86&DR0+MteY_py>g|FEmW|Ut<CkC
zF5CQMgVW~MC+|PI6C0PE%~s&NCDoL7<>1iQxcu1#^)Wp%(jFPLhzzxb2j{4aer)L*
zl`*RbEEyRb@*L-QA@p8drNZoP=ih2e66x86Q%OcDtB1CHe13zB^eH5Bs%E%H$gXQ6
z`^NY_(NtaetiQ1-m&r-HPGlO6Ia+J9POW}5|5jgmA*uF1FDLwAkJ}`>SDj7y>S&4W
z4NDT;?7_v`J(@SZt{15my~_}c_<pvgMV9N%v$(4zLQ8MYi8&8ZxR>49ZU6MNNyCEQ
zt=k(07qyRWKal)xbk#*`GWgkbjCVOS6Md2Yk@NG#W?HtLV?T#_4%yjwO#e|M$(m|v
zrj;IhAyucvSa-e`3o%HzHrGq<#hYS>IcXZ2Afe{66Lho29%0o6YW!cu$GwI>_wAKZ
zB_n;+)35)+ed0AqIaEvYV>^S_N^bRrz7(Cu#{AYtvB?810iS>CYcsYLvH!VFPFgR0
zK?e)NsJ&q$A6bWT`Zj8RjySFE5vKj=XU6C@<ZI9^c|3Is>3#HMwsv3ixtM{aoVqt6
z=D~HWT1op;w(olr<^8?*{zB>c;3W!$<BuCl_9>h>IA!Qxa>#)vSSMQV;N|=dmVI2$
zOB`77{-}&xHV14J%icXrPea?cy0D@3)%pATna$WJ7Yo+e{)}CW`zv`uL@?uH1(Qd-
zVrUYEc#z>=);Am}pJ2Vod00|?S#f%Fac*RMrlisA?z?7-bNQ22-3)J8{5VH#`Rwdy
zC)b9UtiIXrq@gixmKYplF=<@oSmeu=(L0ghC$4qZ%&vugaEMv^eaWl5Exuc=yu?+i
zY^Tn0oj?Ef*5YL;{^u5E!=);LQZIELNc~%oip0Hc^4uA8+w^aTmYg4FVxbS?gNbEw
zfpa=D$-jfsj^>@Mm+CrR9ZYQ~e7XPh*Ssjd_SqW>H)80tnA}AFWNUPd&xCOZ-yBlU
zzP8IhgIf9P+bcBHX5ZfFUD!S0{wn+OC)p2|SRU*Wc&qXD8$bX0_&)db38(j^Gh0&9
zBYQ1}mjhBwuhI;EGEVeu;#Xh~tSS7pe_tznynFg5xHwyx&6gJiNS*~+E}VGhL1mIW
zo%7Ewgq&VEzE#NNgT&X|=%8|&+XETp?rc+O*AIq9-whjfa{rT)`GIX<Dybx^`VcjT
z9Pi!jh7J=W-q(_S<@_omYc(^DT_$B)1Z?Zzp9*sxk5#E4?R#NibJ>`7c)yAukGsCJ
zb#lnx;H&165e0us_ok#vCEr=e&C4(E-B9DTH?E*9Modsy{)+ga9O3n=w=_D9^Z4uO
znjxLiU$vP5jS?|f3_`gJ8zbh_Ph=3O(n1m1vj<n?-`fsT2L@5Aas2-A?9!%|A{D0G
zzwh8H_tmtmOgEOieAcJv7G9Sb{YSw&-SeBuYJ9#bR2vk8%C~xOjz#Qr!YR<kI$jyj
z)@d3icu%R@chNL0^uyKRYayGmZ-1lu6Hs_RvFu=6bQI^)4|}LOS>}Xo=bO*GUt-%j
z)>*!B!Nd3V5t)jlj0Iud5mt;T+VSy)_2JB=d93bC{ZAF6CH6mB^EnZA<jWI`r|N3D
z_mO|s?;a>?@=eTAgMFml>El>J{fk+GEhULeB$K|d3^pm#O(U8-B-tA$c6OKU4f^4z
zWOCj5o>%u;ysi!3{F)f^^>;CqQIV3_Y1R+&Hg?|YHH`l8`O8XV-T`)m+PK3Vr*uPW
zFP6Dpj?%3-nk>+M%{LfjV_@J|!xFu1RZLZmNXpawp>?L!DOt=nUB+b@uIWXY&2{$r
zFJGbX47^@M=Bc0?%zQl*!(_6~lory!O|U9hvCQn$r1TBrqx5(|rnsJRn@SCBZMxS1
zyIVgrur&9}Wgi?odSi7d^sF0&SM4jMn?{`5&$)T&TRxT5)urrlD^=3ew5{2_p#si-
zhJ5J$me-UQ1lYkOFXFdih%ur)_1j`j$gyIBjHgUsulZOolSnPw3W@p4<K5D!TR$8B
z`cXalo8<Za_qMRv#e=RC`DqSEB%H5Rg|oG1h!^JGQNRfi%+aw2>m*XFauY(fsZP)4
zD$2ZyzITsoIgc}Ld#ojl5EvXX`}2GKE_2_)rnU8rU>DD(&OIih-|uCo-z2v`y5E)K
z>)v-vvEk{Db@w0<cd)ZB_h#g1`Tp&~^6KQNEUV6GrpTyWCbJK3pIIH=VmCuGnBD};
z?0k{d(_g|Z5ob~=WRgR;bZR2M`lSWdz2U2Ud4%ur(rq>piONY?;gojzA>FFaJ4z%^
z)V!t?NW2rlEq05aKIUeKM#@uhl6E@Fi{iYWq&U;H=+Av>!Nz?|xu@24*_^cWeE!{a
z^i}3q_odRjzt3)y7~FYS<kxzGUu+2M7Fb*BmBHY7`q<*p*DqOm;Nsa*s^+y&8nIw|
z)nJ+H-Xk|Mo5r^YVm}7IJ!9_pWv<FGMYq#D*ewnx&*WeipX*8zt7`C8A<L_q_2vzH
z5sgTmukT3yk+fsp;-ly<bz99M<bq;%>EFLyH@9p%UcXBB=bLKs-=e&Jl5D2dvbvj*
zJ16N!-y;W-XXTx9$L9YG2A3t2JzYmh_H^bkZ}-YM%ToQ<^yMysVg)W6j)tXK9PCs3
zEVi8AURtGlbj8C#HCSiM^M^X7Cnls7GmM%{`i102G$MVK-Jd=PYs)WBzq*hA+2*H(
zOD8fSrRD}H=5Nq*RlZ&k9O&xX2HN`Jf_HAu@Z9*SlIMTJn^0NsWpmH_8HMDKs5G+Z
z<5~OHgpWGgJ6>t{@b#5T^ULP&4};;=`sXDl{uWvsw3e<;y1wl{-eSLZX5eyJiSWoD
z4z7}#t>%HEPOB8()z4NmWXrCy2-6Zv2sr>cXs_zE-nPgZlTWO_5^}jJcGvMHR|&0`
zRQE2N$rJhwPE#UUSzWinfAx0lVfhlAy;`P;zhYuFoA|jgUt3?|hT)L^t*&bihcb=g
zqqHIoDzig0$!!^COg4|Kh%SoRl8np7HVjF^DwnKrDWWpuQjAgv<q~o!Oxuk6h(sDD
zg=TVTT?-?GZO>QFw$DD#_Wkqz@!j6{{oe1K^ZT9io`WnUonNYP#OG!2-?(dFii{&P
z;sbJKC%{g~^YFTObPHk20EOUM+|QkCZpCdNf}+0ON=XIozd_Pbes-?NZK>1){hjEz
zogb}9Ti6q8-|<Y&Wg>iUW?HhYlj19?%g&?e>@yqF9D~hc?idUfX}<lbVeP>Tk7k}j
zvd0n5A>}F1rlQ$pBJ$HyQWCQ^p-*0quHxWoi`$IpQ(Zpv?b$?BX68<|+B<$+#!A#E
z>#0RD;dKp2X>L%cioRE+&%$aaRv->+;-+)*A*FhmI27G_g}Se^NfR$|ukNV*)v{3m
zR&gJ77#oq%&8TM;-H{DimQ(EE*MU|-L?cQ-Ip%ZT8%1^O*o>;_v7*di)XBkDcCbMx
zz3CO}X%wz=CIR@nbSXF`YpZsF<7(7M$tkL*3*%r&WghRr%u)#LX1MRjz@-xp#cE>b
z-??q#SC;Dpn8gHf?B4%1$IAzqUKQw?_+%_QrUHNZQxt#AQ_FS5zduMZtm@<RGCu~K
zHskmZ$`*t1kR9Cg%H-P{%!fh#NhbEcI<x1zTbV3@LYa)UowCx!!P)QvJRjG1o5J45
zQetStcVi6$mCH^~i|s5nAU~8OvAew&*X}U#TNSvcrIomQDULh;W~`67EkDM;Et%Cq
z{GlPkPX>kRYKs$(k0!O%OZG_Q<)NQ?^!ps2Jh`TDRKo$=A(KDSV;Hnh{KRC?v%Vs^
zfXnBrBv#3W$c))DY)2P64Xik(;(T`Nv-^>%!v`h+cjLT$c@*h1tW*hGS2#%3^*3aA
zDw()1h@mqW#7cBLE%IgOYb(r<Y1lPFxlHg&y@{LxU_+UY)Raum-{3;IhGt%<E6x|b
zz)0uHp9T8&)`EPMGm>ul5!0SP>Fkq`=hte5c`2ipj||?)x#!{zkH~JB+7>D#jQ0jf
z!k#-bd@4&S6bE`nJI13~dj!;xe0Od2qM%wdCm{oQK8L@nnSS8%(t<L87p0os^ZKNo
z-iK4uEw2H9X=uF5Za-LkaL0nyxUo-f@VW7H`dz1R>A(P;oPc0UTi$S(jnt%OuAs4%
zESo6u`&g(X&pvYdL;?1wLdmJp_pg?jJE}EBv;MiXF}M<}I^?;tXQJ;W^%qB~CSD+g
zosmE+tacTZP9wvN%i|aP^uz1!bCLxwG7UbQOtTp^*erj4p~3qsc`=C#04b$<!%a^N
zg;6pS-rpFTn#Sa~5{FA(;LDwPM191{==#GEK(S4FLTCgmaS*OG9sRhtaW5g=ZR9$N
zQ*_I~$;u)`D})X}Hj0ZNLK3|t>A!%QanMma;Ve6+?y%W(h0A#87XSt!#|Ydeodwq|
z(rW0LxIf0y-gQ6)`<r?A`I!<6u(_@b*4BH>v-)JS>ZxSQgebCw1*4rkuK=59%>CQN
zPYrxf1v(*jE?X6&Dk%JoF262U#CGWN(<CVjXyT92fs{uBXD!w9eIW~K(dhWEX6%<t
zN|^Y#O$kDPFt@xkHiQ1VN`LGvy^Mpxd6}XxhpqvkFe_mhn4@gqrr=f@<MFP9s3#DR
z5BVO={o5)cfGGwqVifQPP1xj(#8D4e64>=vO*f>atr&><-2Tfcd{*<wV6}#{TcNy@
zn!36cjZdy08XmTLp<!gC2wqO@3(=m}!2d6$yn@Dflv=lbD|nM21Bn!Hr-wzwX&8j1
zh5T}9B{E8eh`UuV)o9WTDGaP3HW#LcQ3~lLc264+zDA=UWug?I_aqJG0QWKt_VOc1
z2s^U$Cai0`nvqFw5{Eztq-EAXEC$l){}}|%_QMtuNsh&`)N(;Sl_X*NcE>+unJM|U
zcIueeL*M|0G!a_(O>pwACDib#>`>9uwaGX7G8<%J75d9NI==mmf5?}w6ZLgf9Qam8
lnS==2tVk-->F2JiKH>akmxk0tm}(Rp`}Z8!U2IN0_cse13K;+Z

literal 0
HcmV?d00001

diff --git a/Documentation/devel/execution-flow.dot b/Documentation/devel/execution-flow.dot
new file mode 100644
index 0000000000..4e7df65e88
--- /dev/null
+++ b/Documentation/devel/execution-flow.dot
@@ -0,0 +1,43 @@
+digraph G {
+    graph [fontname = "helvetica"];
+    node [fontname = "Arial", fillcolor="#FFE599", style="filled"];
+    edge [fontname = "monospace"];
+  
+    {
+        invokingProcess [shape="node",
+                         label=<<B>bash/systemd/kubelet</B><BR/>invoking process>]
+        stage0 [shape="node",
+                label=<<B>stage0</B><BR/>rkt>]
+        entrypoint [shape="node",
+                    label=<entrypoint<BR/>"coreos.com/rkt/stage1/run">]
+        app1 [shape="node",
+              label=<"apps.app.exec"<BR/>app1>]
+        app2 [shape="node",
+              label=<"apps.app.exec"<BR/>app2>]
+    }
+
+    invokingProcess -> stage0 [label="fork(2)+exec(3)"]
+    stage0 -> entrypoint [label="exec(3)"]
+
+    subgraph cluster_1 {
+        label=<<B>stage1</B>>
+        labeljust="left"
+
+        entrypoint
+
+        subgraph cluster_2 {
+            label=<<B>stage2</B>>
+            labeljust="left"
+            app1
+        }
+
+        subgraph cluster_3 {
+            label=<<B>stage2</B>>
+            labeljust="right"
+            app2
+        }
+    }
+
+    entrypoint -> app1
+    entrypoint -> app2
+}
diff --git a/Documentation/devel/execution-flow.png b/Documentation/devel/execution-flow.png
new file mode 100644
index 0000000000000000000000000000000000000000..24148c176abaf7356700150e8d8c3b68f1ffd9f7
GIT binary patch
literal 19363
zcmbrm1yq(@xA%J~2q=Pqbcu?Hv`Ci{iqhR7-AFemhzLqbr+{>Kmmnb}-5s}dcb)0;
zzWdu}fBW0#jBySQpT}`?$91hW*IaY{{{MCRN=v@PxkhpgK@gl*qQbHWa!CgMI$~Xh
zM|8?GR^WdaI$|${k&C~7zSX3CMUcD5E8*wzj<IVKhRS#<gvd1B-Jsv-B6o~E@7@)|
zlfGkHkjTi6{$2Uj6_<wG;UjeXi2;Rd)8`uU`MQ^?Oj90x8^#aL#p=C!wc|k7zDVWu
zv)2!qQErF99pe=T<85RH52JV*?_yoPDOgPP+z!E_3jPuM@{{KGblhkCI=Z?7ZpXrQ
zcSO~hiN4G<`n0#T$&i2g!~Dmd-?DEkgyH8>dXlK!T~YdRr^98VKM9RKH`2Io_9RZY
z$KTByJjN;7=!;u^7NktXyzWrBw!i60LFL@=_wAWc7hWl>F^TIjXDQN8@$H|g=xr3{
zRE*w!KVGf#v64y5uyk73or!3<_PX8FhIa~1UcMDw^(`DK{tl;KdU_t+opkIgi9M@q
z0$)z*r4QUrcXf+~)aBaul9q%kC{%C3vmVrnV<K|Ni{0TiN_f#VU6sY^Owp2|D~b3G
zv3Wl~a}W>KndvNbuu~RpE$wvAH${GsLenTKV~w4vZTZ0>C)E37=V*cQrw7?|p+wu;
z_tods{P#ItPQ1!he4}chDUg;^II*aFQRpjv8xeI3#z5vN3Uf)^?Qsp#PbhFa&=JEt
zUfuMQef#ToCex3C{2N@7FMaE7?QCq`phvw`GUv}5GYl)<&+b|ja}B3pdh{6W-71s!
zbvrHcm@pZKkSb+*g^ddOWy$T5u{M(M_I~<s^-r(oF%wQ7_8AD@gz;(nws%8EKz=1!
zo9WQ8I`drDi+H)#N0R?8X~<B*%dX75)o+9NxQN{qru5t=1A{`HQc<PMDANMHxhNT2
zgEQw9np*LLNV}lBpJs0dc%4|5QP!%ga9D?!CSc3>%AEy-c(-$n&&)aSd&Cu3^t65p
zlU!0c>Wd)Dvd`o)T}YU)<1se1{Uj#7z!Z7-L_=2g$MCn$K_oA3uwlMy*`mC3_uT0*
z!imd%Yx0k3-K}Vi&`a7s$7it9ZfwV%wWP)=xkNee)tWBbN>vH`SeJ^l!9w)(z9V-x
zT-w5ejQGe0I$}3=hGIuIP4xoTO-8h?8Ri@oW%?nA=iPBba>s4@lsf-fRHSA*M_f*6
z?qSW%*z$Xu<62Ua3<<1enN{X<ikw_Exzkq$6jDc>jYNr_KChZWk?QPSZYii!4z($d
z>maB*i^PkGG_lCO<zP<j)5yyHM^;+CbZ)w{F1|V|^WK98L<y|h*Zh9%+R4AX!PeI!
z8#TxF&A_{l@8n4Q&jAZtnc9>>x90aSn{s+$gW2|{ZsZE=pO5x+B{kT-P?(e&xgCBr
zq(yEf>=Gknm{G{Ppcio;)v~83qQavDel--wT|OBfFf_?rlU&^n4-F;a=v~(M6(L7B
zcUvpf)U+7$-H)Vg81!h3(JU2uryVL9ZnO6qOf~ixJFGUfsCk0SjMC3i$EUM)snxL^
z-i<{g^r;2UBYHHcJT>MHJOviU2R=;K^e_hSaWGK!{lTAXuU^S=P_etxttBl=+_0zJ
zCs+19`1hqnR|e;U{!2*s^}cUvsNoM%3BA^T=f;U@eLCTw@5xRp`Q0>6rG|w9y+~&b
z1qO+dxv#QzC)vG2GUVgkMgc?bC?*Eb>Bz>ru@Ku51-<VnocPtAKMEf^&1(E2Bz!4`
z+>{mKSPN*z(1@?=dc=_RN$RzNocU0nu-M@}&k#+0<k?`vW!ju5&%UoydLdjl5QAot
zUUAyg&<7Dp#)Cp$ojUeLOc7@(`T6PU5+xHY-CCF4B@EPb*rBh`GGt93cv|lN61b$@
zbW;w)t0xqn@xkFoTWQ`p#XFdhJ3oS!7^tXjQ4rTTw|iTRl2dA_=BC%PuhxCkdLig(
zwXr(;`%??7Hp(XVVLa!9ZX1?v%N*((^sfrdjJLf*Lm#AhzP!14YWG3`|G7oP4^tw(
zezU%=4zZ!H);oSRd}eLJCZfs6vxjk|FMKpEYzSj5#?PjNtc+9ds8AuIVq%xyegA-t
z1Yr)(%diW$WPN(v;Ee9lz|lW>sAD_pCxL3lEt3v1490V+e!VSXtRf<$=!oWJDM~Dl
z1Jj~|$DeV7m5B~jdlrd?RH{BsV{E=u|IPj5;G%}*>7E~bbDf@CI0K)q&IK{viIT#t
zuZxuYR{L#U!w2ihIo?l$BV%!qRKEU|oHx7DI}$v3A3q9sdf={-4nGQ15^;}<k5Muk
z5|er*qsaUY<Geg4Ips29DX<tCuFzVTLizIy<&bAmbC>+wZaZo379^J8!?6X1^RCxx
z!`Csq<Qh&w_j9rgd}0o?hRjkHulabmW2dt@)_x3~*~&DDlT?e`xp<zsmD!2Xs%fv>
zo0gEVs>ld_A%&L%i57WF^;o7z?4&V`;*Uv|t9a+cQA^H<+$w|?p8@&mV98vlm0Lyi
zufy;1w6wm?9#!|GUUxbhU9O*aY3bdsZJs)j@>O=XCZbn7gX+vB2+y0TSMwDva@nJ9
znY-6|SGovNm=K@6_}kK>aIMpm#Iav%dXz62BSK7m50woXjABf1*Bk}08kn@ctHo&P
z=D+mb!``#zX0g>$`d30751zMuV~t(k)M#vU{SBFVUx-iYn@+49WnFI|Syr7vw9|(w
za;J}QuF@v=YHGga6DJ-jqdH4LJDoh&QcysTP`Zj#aX6hj@h?u!In*%N{t!&PR1Y`Q
z>|gwtc7crhNIR>pUD1P(ZNR>cvU0B`zqro-Jc(EcVhVNa!+^t?JTAF^nyA7im6P?#
zH7a#nGMx7gp(dJF0})qKXiL^{MPO}p>~$`g!+Y%pH`aPzEj?fLF)jPrD45C=$M%$_
ztkv>tNyEqTpsYv0!zlc<%MnH{9)_2dPDEKoaP!2=4M~kJV`Wa4y&BS|w_Cm5HfUlk
z_r7ZDHe`-a;_~REML17a?uf~)1!ia^)cxYDY!nM;=v+`xRJbLm$eBUafK7Y9oPuOn
zi~HMz^5|p@Jv$R=e`WK4M7#&*)7h<c35ueJV{+tTYOLDh8)AwU=L->9>A1qSo5Pyf
z)V1PMHoNOvMN;w#cOF*lCvubZ6HFJ>D4#?g@3k)ZOce9HSUm{)8uqVWxNBx};gmg+
z8j-NOlP=M4=DKq~kGYO=r?%qpsiyKT>4Tb`KjxoHJ&i8g)E<>6h1a-SzxNGxJ`?#_
zi{HOLUEsF!)!=n7;aKT=Md>lGlcU8Jf#t>R$FNZnCf)Wazi1weOCB0ZI87{%(EYYi
zICr|;N8qzhTtSRHv8k;(UR}{ERUWY2GRh0;CU#<@^SD_095UkxLpwBf4dHbP@3k>{
z7dttAiE&I)%MW&Y0{jT<K}C7>F6jdtf5-7LmY^J-7PHM44PURk>LhNtM?rc+nWNvv
zCurEuuiY(zd_%7^GKUA1_I~9??BVCw_~0|Q)#4gIj2#6D!oavv4!)I*o|a&a5N9ro
z$0QvQLkWhg_dZdYYxK$N{D`%DE>8OjQLa0atuO51@@)uD9W7EkzluQ0XPR=945z}n
zx7}=0CZmWjkJ5dQZ4|4mSzkNDk(IseHQ}C<ecEl8Or1hTv%%NLyM~V0J23E?%V&ji
z%R$$RQKh@oLUpG2-X<Bs92Iim8$^2*Q4>tsw~UJ<Ak;Ja#%}V<;+%TxNw4hKzQ(~0
zapBJ?6;U&Ou|S%KX;Yjf%sf`6)7NO~_GTh1`7x1$C`{!ivI)9qQvz7pMUj$|F37Z+
zdz<n`O&{M{AzrBgjoIFQKKUB{Hg#Eg?o#JP#&3#6*UvVT<`ZLrFJ<1dHB>nKLXBJF
z4%vOsf3bf6OA?vh>I-G65XrsI06Amswj2i|c?vAXS2FfFQ=c4YwOVD0UFFUMajNVl
zD@QA+a(MkN4jJm2JZh7ZE@uU%tPjudt@ynS`RuQ911D^M`+SFd2m3W;^O>9O^{ZEX
z&)JVBDN1=Y^)(7o3>OlrZ&v-B8flWQiM#AFf3q*CjE5XE>cNAwi9jdH>Shthpfd0A
zi>=MnbxeA*b}f&7s%xechQ!jVscK3Z93Q%iY}lt~KI&(y;S#utjzsR<`z=v*|HzXp
zK(%XT*(hW8X^&rZFggM;x$3->;h=bY$VG@i*>NS}I5N6D&+w#n1(ip=I>DPb$dbvX
z_Nu!B6CuyRowx0)tXpIKGZ^LiJRrTTgLb<635z@?LRA3C4GsC|9G5k4#JGTsq#vli
zn9P%HcjiLAyPgkfl*#@6Re*=0Shgs09-aLSDX$It`AT#^G&v0W*U)Tz>Z*YJFV*pI
zNy%SZ(N3IU5LS%rHm6)`-{;8RLPtcI&*Qr&2UX=12Buyv&3g}fa@1=VeJ8z5npapj
zdgm$z8ggxFbvku@=EC2a`N})}A|C@9i-~HJ>}oR8wq{lW+)GDSQUp_z7rnWpaE5}z
ztzKmW&I;5X1+ATmNgWz89q-Q(79tf1{X+^1Ot-6>7yjVpdA&Kvn{@68de|>NcIlbw
z;*?hD)k(wL=o=YYZG;(1Q^+%+oa0Dhssdu$6?Eik+tL7GkHVFA5gUcyzdtzixQ>w=
z+bGfAVVPEMPhzn(c5KD8k=_1_w%m2jNu!UnS8i8`8I{o^QI!ly(y!iT-|aeg*5k|X
zDhdoNvEv5R80X!X+B)epYZj8A&eB}eIQlFqD!N<xTZOl=!A0gz*=dM#%pcthIwl&t
z>H}vLE)IU$y^gRnyD(mo^FMnhtG$JO3{*W(311<lzUnI>B;hnJnng`|Kb}_%b}8$H
zL2UhG?>8u23IC@M1`Mi{@!?Tgid|=W^*Go*2xHz8Sj{_Bq<IsPj0{<i=unexr={OR
zb${o`!Q~fO2TLEG@an6-RL&iBb>CRrI;Bn9mrSU6BHr%o9h+V3M(MReL)g!2r&Z^u
zH}C&Fs$FVz{12`mZEMlJ{S!uIm&)X}q)To%;oTJM#^-Og-8l!u4^~knn?_LDdRfGE
zQ^cyQw0#O1h9r>hDAd&2R)zifSEY%)@*L_9OEU=qyIkj<z(}Jz!*dw3X4nQGJrTCV
zb7^5mpbNtu9~Pudv~0(}e<E+XlM6MBY25jJ(>rWf0V(F~zkXF*$H>=<L^fXzd*Q!F
z)jqg_P4EcycBIlKmm-0~>>Y~;i|m(=y2e|>wVj!n_ne3Gs5cJIS=bH^gvwsvvZQc7
z66WhTVi$v|Zn6GLXm^DMefU0k%}B4j%a|%*rk7xU<IYiOcAD>?7AhQzwm#&|ZQ>JQ
zf*ZFn%M<?TM{gw&b~t_b<86=Hk(KR@FS=1QVp~_HuCJf+;e&7^CDVYSzJZ7Clc>E2
zQz4^+6ITNR14TuG0U7D;v9Yn1mNbWrNqI~`7Gq;$U0vO6V-;vP&RioHH7acze4^f0
zS6A28)~2NBpNYtf2_}13Vo}vYA8f&l`uFEvvH8!|`2W*G2ok}hH8?O}K1;s6tYN=0
zn1hRp>nXQBRkyLanw^-Kn4WH=ua8ec@+*N&uQh0TdYZ)UQ?SW|udi>^Q{#~EaK$S7
zwe0Nd05Yz7j&ocr%ee22+6D*Nxw)e+6s4q?xVb9}3kzxOu1&>0e*Cz<|1TWKV%Xm4
z7MQAX$SW@1U1*Q+!n`q={|1eVj-6dmLLw(ADT$V<BsO}Yps<kJ_RsIJGE11~kgs3K
z$;eL6&W>z;rtw7XJXK&oQBzZAWoAYzr)|ate)+OGkfl`O`<al5!0ccL)t#A{d0I9&
zI0*M=p(D@meQ+J?wUpGx??kWZJ1k4M6k~nlUJcsJM5k(6JAvJ0mQ%S|S#%5xIaygJ
zW0rLT>dPxbc@z{BzkdBvRaIrfCgXQ4_qaG885udHC1ldHwXw-kG=t&tG(<OJk7=3P
znyRd-(yDfp5uG1MRj;&d>+KEssbg$vx-n4|Au!R>VmMlCd|Ea+ISDhm$7pwc>O@CJ
zNAOu+PY>=f(ZqaUG|r@4J$G7dX5tok=Ec%o6Zx@jrLo%q<U9u2+MAm*jkB|}m^Uc?
ztgQHWdtW6$ke4r81TIclnV2@tP7aC;I%kz+6%<O$MhdUuJq!&CyUM8Z=FKfUy!*VF
zY^H-j3c>NbPVk6~(u@g<R*kd5t5-|?8FE*yTq!6hn5c3H^z*xCXvIlJN*dFbCWVJ?
zwcJljN=l0BbKf-s2GzvaSVTkwA0NNQdGFWQSe5FEV5OXlOmJi*r_t|kQLKj7Bnc<U
zgBxPgXlJ-A&CMA&50(eA1_E?1P5(|58dyeu7ZP%th9<4PzCN1aF)i)F;^MWdOQ%OW
z+}zxr`nB$7nc3OuN=GIvW22+%;}u^o*q=PH9?pMrTDG*b^zq|ISSV~ypLVpiraNTt
zyB)_0cxZ|i+u8Zlag^leKVoDgh^4OPx#z_tCHKQd6K?I~VB@sx=;-M6>(`!Fkh`p`
zMXGVg?=&e&H@CBI-@ZjNz%Q&T#w%wl-p&Z7Nygp2eH)!dQC?p3)vE!sl)**?_L#W%
z_%5dKh={b@T*mV08kd6y)YLGWG@J#wDZ^&=nwpv#J=ZpHeHxvPca1O3&rqE)N|p}7
zH@Z<WXXxEKM-c5M;p4@|eQRT74r`+@<wqt(ckbM|cI}!;&IOD;1VeCeFr);}KJ07P
z;5V80i<VUbnrQDne#DrggqP***C!1RE8E%am6w;B;9t|qWE8Bt&%j{*=8e^ClkZ$h
z;LsR(Ph;%MlHWr^fxf;ob#AAJ1+}&ALIlNSWlBm)b#G@p^YSbO1wE(f$;snxQ1bVy
z&)2_4gDI}FT?z>cQz%iP<ahluT4IW(TUuE7tF7(Uc%p)$;x?+erG=8q`T-Ty48)#P
z0)LJJt&Po&%fb3p<J{c!O$GQl!QJqw?DJGTes<ZHW~OBy@&!y)Af*5!BcuE7pWyfJ
z8+`F-(6Rd~7qBFG9oA#R!^5Yy>H-71OU=hJ848_t3}|UH#3C36Nc7&m&4&xs&`2j}
z+*=vK#39+8Z~Gb&67uECm(9($YHDiMiV$vzi8IMB1F<|E4>#e%-oPW9Dd=^LE<1~z
zUx-;VOEimkN=r*`-MR%CH6<lwYinzNf8TTJ<>1(V#HQ5Erf>$e;*ye-@899SUS3{V
zojDw+Hj?a|95FGmwlYW<xkq01IVXvET6G~d3=9k&e=yf#I4noU#@gH4Vb#JYp6;)W
z&F{iOqt~bm)iP@fp~j<;%y!5qGVI=89g%zSA{7Q|;CumAHT=V$f=^XKLPAq>vZ+b$
zWPfcy^3bE0hXLItJ~eZp8cSYY-gc=sWz^15kk@HjSe#KkOJQXVH@^G+tv64iun8H}
z3v@)#+Vj*adb_)&%qVfEoU4SYP~G=K;^HP?=6tRb3j$8<e=87pvqrn?zA#hd4ptBL
zBCp`CC)a;_=$?ojB5GUfb^_U+VcX8aVjV)e*5d*fiQ~3go~jc_Nu=s&SlKk1AFr^<
z&CRv8wnn5C6hs1u^3v0P_xHP=>@y7XP~B=c<MqEz$sgOMM?gSuO;WEw8NxB`@q-7>
zj{H*h=?U6<dSnD=1t__n-;9rsm-qf4e8VPQGgUI~F$^JRidvZkPBkX32`Mvb>1RX3
z^UW@M*eM_`)0in9I7ja6-lL{oSYC!y@v3%V%MmW5|KkVY>o)QBsp3&TbP8IB;A5AU
zm;0N&{&{qDb+uK_nTv~yH$RQ4!)f#lGZEfHaqTBjkh3HuCFOm*gmG-*10G7owk}wE
zoFAcJ2Ia`HZ?jcDd`T9^X?5B<gT^rWAv=3DBDRCd%fq7L;jmf7<|mscPo6Lgp_`z0
zI9cufnepm+9Sb0IkI+2ZH`#WCeknYQ5_#CgqpqwxT%g-RV1DK7QHK+YzRC9)?jIq`
zkD{AQ-#i+i`ldR4^q<p_{PFRl$D{(Nz<oXf=+F{)FW$;naShx`Y_5;Bl%r^N(@sC(
zcRwzmete+ed<uLCigK4fS>7*r<5xTisa2md;Mmkka5=Cgo(uYK@2SZ&Eu>{WzUI))
zSW8|YD)ZiMcKqv)d*cIT{E<63-N}c6XzHc3#Ed~h2}6eSi|IUV^R`eDdL6t#dzKI!
z<KsVd6=AuWfKh2-X~<dU7U->;`tiH|;#X>|>aJqqTTQ)D6OHZ@08vs(3|ac!j`kvK
z%Cp!LhSrK+tGXx}?odMuM|dafCv~c#qN2*__n)C5dPR{BKQ8lXDxB`f2Om(d;h!rG
z{Q`j6*s>8C5~5sY^gT4RX>mdZ$go&t#fyJ6U`M8sDf)|fkvyk{q-X!a%U4A7#|A6i
zyIRMrHVs}G|J?hEjnwPzzbDLN#oT2h>YXwQ@F0p%Y6}gS=a}I-3A9m4sPHemrn<Cy
zs?eM|m1nSU=L@j`F0vMOPT?~3m-aj<td%RkmHw*TRrch+liGIz?Z)LlkJo~YqmGiv
z#Lb<T72i5p4Jlf4@<M|PSHpuldAib8mHBuU@IRBL;jgw|>fGFFl8ViuTAgh!fghTt
zyq1AoaXaiqMVnONRaHZk0tm-BVtb+gXSpOfKJxA&@A>Q3w~=4J=!9!8OUu21EBPN8
zsY!UK!Rxr{n+}`ZC&p1u0E&>ej~(&VHD9YTB7auW;q#Gq5>grsDgOnE3b-C$L)0~?
zkHXt?(BFmEhTJGY?>JKYpYi3uYLa@6o}=FBG6P|yv4g9taYfSQvHS}XYi_4B-SbXs
ztix{qz_z7P5_0>qZjHCcs4vw#fs>1FOw?2E?MxU5gB@8?-!Y6Tf1%kDkj3uE;krz}
z$fp;ZzC}_LO|=e`=ABISa|)N9sp~vOt}h!JnNRLDYvr}7pkIPFMW)wUm;fwrsYJDG
zT^zmX?iWQv0Bx-~FVWJTyP&G8H>h_M6P)*FSz)?oHh~Ijw=n}(R;{f{kNP`=4wN-}
zk#_lNLjiKldkfo-p~Fx4{-9OZ+oM($`}8bxMO2KO0Us&98J0ehayBD(1GqDP>f-w8
z++cQ_z{*N`t=Q2Mo!;E%XJ3AFwO|cerVly&k4!Lux%8lC^W|By*@FD0pBSf28t&b0
zT<Mj26&4fRnYzygG%BoBd^Jo=Cvq0)&HeYUW6ZgCoaFDYaBS2KDq2$B{?o=ZqN1=h
z=*2-PTX(s>Qsn-W+v)bU`Qlh0S3{Nt+3~?4gc*Q!JPostqoe{((c7ycqeGS=F-lw)
zPK+O^8`ZfiIaS*JBrd9JE_^jixX0K+QzO1%nOx`5-jo|nj&Z>H3)<9!d5!09q9W9$
z%uO{?&}-N7jQci*2<VkX`32E@Z@32db4Iheq}re4i5YMgtK)f#EcjicM;wn&ix%=P
zqKGnSCe-_?C0bXyrH*!qTYCLSc}vsCJ@1NRn2Wl9<!Y!X%PE;`5ZFL_7vZ9nIVX6}
zb7-aq*Q)_*3dO3EzqCNweKr`!NS8NU&|qGBaQB~QoH#ijX)0%$6>r)%C5gQ>ge;td
zv5vZh)K?GCIFQ!@wG+JqEe=v&L})DU^G+DurgrUXf2<Y#Y{Aw$J0U&?EXn_5Y6s*c
zM*uQKR_=e48h)h^B&xUR3QrFXA1&ReOz6Hz$7+7w6e1h&^&s9j-rlAfqhpKY_lT?S
z#i<th%hhkC*Z#hFP|zRC<c+mA*vJ(2MXk1brdIl!vMx0x9yt<{BxI47A(H4E^*nU!
zKqIhn=gH0pK?6$mesukglWIEqA2vQZt(RF|7mGXcKfNA(IC0{>ra5<yhEA8mp#2eM
z(F~eL5;xfc+46+6`v8e13AjHSayl|yI}6vkjKErnuq=W&&%nhg;p}iaR)s#>XWyDN
zA^|}Xw$1`R3LNXtZpdSLtC9s|;k~>^q(pO>Ggp###{K`H^V{U+WeE#D<Kxe;6Sx%O
z>WF)rBXVc9wW)u#z83Rfj;TZ)Ps^r`_Hk=_Yw<MBvdjL{h=>Twies6%X*RB>`i6#O
z_G_b5LLa5cv2L^R{+CYo|98jvSH=COReit>C4k-A!)~EN9UYyA64BpNQU-E0c<AV|
z?!OG!v>asrr{UCo{KIUH85R8LZN<2j$C+JUs)Q$=VRt;AcKtgj$`<G6KS0gt?VY1i
z^f4Bnh^QP28^#DRk$iLF$pZpkQCr*M)YR0lu(0VSsHD$VDEOSoxNTcII?U#p{Sj^G
z)Dsh}&W`uA+>b>13rdY)nyR28RZ&$fRHipKUxVT(1kcUYHB};}nQ3lqZEa<R&h=LB
z(GDsnJ6oAPJUF-~QOF0~P@~$hr?WF>(h=QZb$xvudPFnzI_WqpVKFF3dwP15@-!7>
zWud~7fByWrnVH$a`b2V45|-!mTTXU%_B5%4hgh@F6TrX8aDCMCb49Q`%N@6ppu>jp
zP)4RFODV6qrsj%Taen?MU*8P6ct1bCrlzLnUKpLRTwevY+P>02LDV_v5Zwqp*b|hw
zxw*r7^g5CHe|Q1L+Y*R~iMh;%nYZnnohzY|hOQ3>2Z!~^6Li9C)8Kz~RkgVUVWFYc
zHa4blKc~=Cl$Gxg67HmVoE<Bus8q<D3EBPl=iNul?46ytJ#;iR<0~t<FaD0wzq_OI
zZ$Tpe?vDPW$6B=JjD;KA-<a~4tadu}g^Em8R#u>wL0*72A&m#Fp;=(G%rYS?>}LW#
zDQQ-2E(Ias(5A=-X=&+4j~=C)<`x$hdwc(cULt@}pesRHS{hooO)ql6z53WRHVBy5
zSh9w=XZrfoTy*^W=dHo8(60L2pmc}EOo)JmgQL!2LsP?i>CYe6!_DW8ywJLMPR+PM
z4`Di#>%UG8eHU*I1W<EdAM3-1sl~-lSy@@{-TTqig^T!o{!AktneTDouCKq~cCznJ
zDNtKpu6%e8$=CVm=d`mZ^717iAz>Ya-C{?Sr@4xn+EkrKoho8)Z*SNY`wAck9i7YZ
z?h>>!G*EmdxIn9@S>s%yeX;baIPJEmdJt*{{rPycQ{Uty^pu(^Do%%+GXNwWV(I+&
za1~;4fl#whudT@!@5s_r<AW_U81Z~Azgk;uHzv>EQBMZVTGtAQuYn)s&?f)sNgn9$
zpI=yz5EpO#{Pyr~2g9UQJN~8S1^V-88)M_wyWJ@Z))g96_BGJ^mb6<h-^RmZHRy=!
z@0Wl0b)>hT=NiS>|Ecx3fmb^+;~t;7d9+jPeFE6)|1}vzU}${ByK`sv?8M=gu$S;6
zTrI2yPLmveD=VvvgWkpCgB^87ho64<FeROL@CDOF#;Y7Q01NC9nEr9Iyf~=4m<j7P
zZv(<nQ&Y1wI#${=HC0FT^FKWys?4aqzP`2?>Qdo_sam(spFcNR65l+QVTjy`{^y4b
zH*Lgpam!IIRlK0IG#7x@{;yjmW2z%XS@HaC&U?!PtcG2@F8g1Wm2aAaMZXb9`1+OA
zeDo<aYy_WEva+fiw`PC*5XA6$-lbnO!eKeNyT3o!-ya$rEF&jpV`t}fan9$l1s7;)
zYPzzt1bHC1+U*G!9|J?@2yF4tIf>{)uMXr0xrvWoVl~$c9VR=U*$1P{NuI^vmTp)M
zcKAfh+6WRE83}#9k&zMdE-NeR{rgKQbwG>a<0+8z^mI;c?)^VKXh=tAXPZ8x4&<4t
zY9-9~DNht0x{R!BQeq+%6%~uwaQ^w(3EI1Y0+x%dSEn0TK(L~1Ii8WsO`+kH5N9do
zsFs*0)clODOrXKK_wXSGQfe{byxgAwZ0Yd$*u==F+Wjn=J}5M_KTk`5gQJX2DOdQ#
zi;q4&XwL)%FCXQ7aJ{?)P>Mppy;`sBwtLCTKne*dse~u`zW~5(OxEz|G<}+%pSMAE
zv9YLrke0KFZ_pNxdU6H%h(kJ9VS@tVcY}i0ajewbQy-Utm(yarT;TjL8SZ3padEyW
zGxM?MUFiE;^)G36M6#TU#0z-fB0jj}_X79t-@kup`sZgti7y0H{nt@Dz#jd4eN~E$
zWLg5q8-M&z*U+e`u13d(*ENoe9E}tiT3A>>?mb;Xe;yhUf%Yym^bUfhiF)ZiHkBbq
zgLdhVflp9k=z7aO5UzlLfXPZbQ)}z(9JMm!*=E!XY#MLgyg}Zs4zmad2we5`Pz!}Z
z0qzh9GTei%e7gId)JaPq<;5`&i##n#9(($`cfXC+-Tokb|LI;CH-^_OLP7^f^e`4c
zv3|C+pdm*&G1b+sR#pXNWn~~RAkaaN4-X%9#qrF0LgN3a(+O)E5{b=X$I)D%0D6Kq
zr`>Wtq&spR`|oLKN(u^b0v_?52H5;;I8^<doo~%32?!P!7Q*7<+#oRkWMg8=1EPAl
z9xiIE#FP+14hRIisez#(YJMKjq%T<=^g-KOTO;{zgkWHM`}%H>b2sJ5si+)5=l}qQ
zo2i4$##DE@J>7t|ec}Pr__UFY%f!UQbLkiApP!et5COa%&aYozJMz5y3Fcl&Q4tnY
zC7>dJZ<y~OMnY_Gu3yhpuaH$rM(6iKOMH>I&CR=AeV3ctxjmeL9Jb-k&MOE92gfxb
z!Sv2#NA(HFk%pbouqDgL%YV<yt8+g)o}Sh=fnS>^A3D203WiM!f-Gi~`DW4$vi}7<
za?I!%O#C35OT=-9RriQGIaQ>k(Ksy$2U760e$Kc_uHDu539uF1nG<jPv@n=HfCXj>
z3MToq>_6>=?aN}KQX%FM4Gjk@{nxY4Lt$r$Sn5jy@7h&KDy+*JjuLbLC1z)48WyaN
zETO4u@h7EWV32qtD%u1HBL(vG!-o$~%jgL{SD#%<x&a6R=u>b+1dSG8rLmC_8PXfK
zS>RDCJ3HzP{vUczXr$ul9bcjeV;(y71pxbqi~CEYpG19qDDk&oG>P1?eF_)z>Qx({
z3N>YAX`mG)>~<28&d$z~lDGph#g`$$UB}P`Ogiu8AN2M*Mq@|EmuiCo93wd{fyq7w
zy88+;&%>9Wsb0b<!DR`w;QL%7W_LHIKIUMFkV)fV!rX6+;*8k5c`JvDZaYzr`<ZCZ
z&Hdu~EC(2sEe8HG#s0fs+eIs^yYr;qZKI_+ukO)prN|xgU;nDuC#?6%{zFFR_GbC^
z5M*Y#_!?2up5v4#S+5h~5;<)-A~chG9Zp+Nm;P^RHC;k%*Mb7PF_SPguGNKq4$sTH
zybCa}A-^5^7cmPc33397_}|bVq9$FO1Y5(7_1qsT^SXQIPEAn939Ac4%Kr!H{Qf>z
z!E*UexT6>p*)(`Z>E>--P;kY0m`&9a1rhy-CDdAHy^*i?oxcU6*5hWq0ZUx<K~P_m
zYzUI?ev<M|KiTHC7j&0~Ij49Cg{FFHW>UU+PW!;z4)W}Us>xXGiaWnhHJ@3xrqi!E
zh2YOxmGSc|&CzY4=<gV)WKPN?#Xn;|VV5Rl(|0f)nUXpOnOe4MhI&f#VE-Hg%qa~P
zb-+rlHV^*$YUHlA86W6QV&+-N$c8G&YhTGBBaMiR-hCXWRqs}8XNgTNa%B)5HA$Ob
z1O7S_w!a!;S<k_KK92f~ytKUiT%HmVwELKkfwkK_6ko;Qze&_?$h*Vu{pC&l{$ejP
ziX)U{Lp4@7z-tvj(=BU)p<;Pm^!l5w&l#YBBhPA3PrytmG@<lw>9?8bx5UW?=1GBy
zIFimbC4PP2(l=d9?>GAbag{`vf7M?1(xu6iueVj|zo{8+dk2JHL-ZE!AoVTX709=|
z<j2FmTl&YN_c$J4Jg^w;FDWzkMfbXdcw5@%t6WT$zm^T5+N?ak7&_IbsodSyaMrmP
zyc&^&mln9u!t`wNfaKh1ktV7VXDEm$sJx+DTzqLI^KyN=g9>;OP6aT$WHvlYNEWnT
z+-%Cgw(@1_iz9d0PV*2wdtECkae;x5nEcx8rZ@+@Fi*ez$?FSd$)(60onQT;jkyt%
zNqaLudh{2@wQh{(zr~u~e(cRe-5&0K#7@VNS3YVB{x*H#?w_Rhp$DfcJ8>AFfv!Jq
z$}l2a!R)H<;A+x%do>*rNou+eif+w<;N(Hbc=asEz9gi!REBKA8Z38N-g7b4g3M{R
z`t5h4yZOtnB8H3t6E$sKr={vx|JmZP8A{lewjHU0DysT+*0$SS6FV^TbUq>|)_#9l
z{Jh{eqo(iDGf-ur1%|E>RN1GeH-$v6i;^+7;&D-dbW~hyD<X2`>ya*vOOoMG+0dv{
zDQ9@8B4ILK+A+CA;8aJ*(a8yW>3VEd3kru+TiniQwySHYtmG0;(*-SZetwSJym|9(
zHIci|(7x4U#|?gWmHhqPds9?;Kkjok>YkKZ&gDhqc#J&#J*d5uohaYpneKCPRLZ11
z@(0#SmV{m#v+ozT&?c|+e~LqIMlO#(^IqUoMe6^cO2EmQf$MYmfTFH%ttfM}3GBIG
z(glRXuA|c9xI>kO`i(f9Eh}ws@I4r{xNY0!Byy$HlMEY~U(mZVuOjaw^d3xOHwszJ
zv}a6or&lyey_-9Lgfvf5M^-bIM^i3K<``AI`b~|(pNALdBhQ`(h`9IK+U%TXy)VU)
z2>D+xs&kF8+gJ?=77{n@I!;{g_bZJ-*RXa^ui5H*<bjmqucMawKgU8+S+81kq$&Do
zHo+x;qwX=?q$Pdu+v+A!Fn_-dW<Ou8hA7VeZn7b>(d-O-G0^q)yx>y{I9BwkI%SHK
zt>LAxz7-oef<J$qn*m(J(#?-k%$7caU3-vF`-qrv*zVB2gk{sSeUQYXWV_&M!f_yu
z;?qd*6blk2xM^8`MyA_}LgR(d=64ry-;UTH%aRFAl%<!)nw8}aU?G><U+nlCV`XOX
z%x7HV^1O+3X^8<s79@8dOSk*_4XtwCH3#g%QsR<zRwi%kX9w%?CEZsVnWkJB_5N^r
z2p<!87^b_px@fSuwlfj0)Hqb8Y1sc5T>X#(ewO4K!PZct*Ye`DZS@*Mi%vH>UJr9m
zW*k%xq$y&=-I$mOBOv^qn7UfVNQSKQyN}hVr2*wM-S?E2{bjX1$=cax0d`Lq{iF6l
ze7L*G&w^DenFdXk?oNho&Iacp{<jv$a_5?+{BbJv_{J)Yz5BpNfjq;VCM+cJPA}sb
z=w};Ei2oC_15RQZrY4Im2X+>D@MBPLH5LC^>*^xM_r6Y!3KZp7Nt78nw5Rgwu3I3q
zaSHqO+8PX*PFzt-b0_#UV~Lqbznjt#ZD4v}SQw?vPy4c>)-@x!lfTlVA(2v3ePWaa
zEC!ig)Vhd2ySDGC)hJ&l-DnY4mYYj$e%Q|bz#S2-tXS0Ed~n4{(NN(h$N*CDDgWIf
zbb-5_aln45B(sdC<VVl>gX44li$x(^1Z)fhvC2cgw`vt9T50D$+1@0YVk~$3g|Y;k
ztHEYFw05W1dbO#-M-d}_#WGo-JR!Jmb2;#nnYz5Q#zj0e6Ac<NQE7jQV#vy_zKmE*
zdeppWd*tqYsu@(eQAJ^g(qAlMDAAPf)+(jiLaPr`WAe1uaM_`XX~}wwddp)kE&6W<
zklrP^_i9FiB_tC5AE@&;*ZWfzjXaz+!$hafczu;rx<yM&4)6CK&5c!LxEy*UlbIZq
zzWQA_B2<J|W}(TZs2NbAH%E-^^X}BMH}xeoXD$Wu;NnE|2#i%sQ~IL^Ynnxb-*>ZJ
z!E1CL(>;`3F<Q9Sd_lFB)z{C5W{xAPd%2F<Qmg1KI`VH*P{8X=vF#Vx&CXSgN^9<#
zoTCZCQzhEJbMTM{4=zy5g)>4eD<o5l-#=R8axk#g#a$i)MsK;&Qd3>TNS8Lf?T_jt
zQpmC3b2Q)j8XgogfRSg#RoS?rJ$#l`rirBjqtWuvb$0u4L^tt^bwS<RvdA-u5_06b
z{`pzWTpudoVr?{V>ftj{hr>pn*0Om&!GYf#D7OC47XM<^LY7%rd6q}iN)|QJ?5c-g
zl0fqb7-Fl{Xr10^CGGC?F{`%csVL4)%8qq8*cuCw#f_Q={p7m+Ny(DTK;~pZAvH*1
zYJceCXQpc&?W(z7#rpD|P+d{<^mH4xCiLgLpU$MaW-!(&!?(H0zU6m}R%cbmif>M?
zz^(*aHmg$nU=>MQMM7__+v}6?7$xzW=tq^`(#1s`l%I&3`{TBB^U~5k4t#ZJdn~Jt
zrgSUk_kk+~@_+W*ROW@PuZF!*9i*GrOIbT1!XoCTAb4V)d(lR*Z+i7|hd<ll+?do_
zoTe!b_yKKd2^g<_I*g2_qiSI8UvXVM$QWdkE%TKbu-!Rdaf_kpS2H`C4TdCWz$jql
zoDkT3=uYZUMHUen9i!Bt_0KJ`L@0IaQ2gOFXZlLZH88Q?@t#<K2UCp`U3m3CBY)o(
zwnMaI68Z!_v)<Fj+qbXJWZgn+%@nsA?`vV^zP&veHxa|Tn8QEPW>%16$8m8K(A9Ua
z?Fb}occN_I!yGF3QD~SA@t3;5nhPwKd@%DzeAmwOGD&A=cc-|xNF-2F5ZTSwS}EFf
zd@eHrRmjwhiOjuT?gu21JLx}Pi86PQMFzvTfBxB9o6MmWZDOgmB4{VQE3&fV^xz4f
zMDaOy*@xvvHxb~|Nu+<RKL0QeV>Q&y^%wO4rkLlh!ggf+kC;$}?wd1mIP!{`GDCYg
zwwsGW2FVF`AAB5@@502mQs=zqxBMs_y7cY3i!;mZ`8Es;j807_5WO=pGQ7NmiiXA?
zUng$MFDOXl_A}^9wXW6r+xzTg)v3qGDJU%b`SWLS5k&LS@N|#q`u9Kyp{G1MLM5mr
zxj%UA$UjAptyad!#AFHTGJ||weEcMwyP24n0Jx``e)Yi<&;ci*@jh4`u>oHPF>zG5
zss4Ox@K+isdpo-vU?LTYL0BN(Sit4TrAhL+pE?fZYN%D_NW`$yK6*s2R+@dDB>Dw(
z7M+EKg|4nHaM)0C%ip<?5)u@|X}_v0EZhY0r|@qw6Ds(u;nk5MfKcH~T8xDRfIu1>
z8wu%^gJRX&$z5c!-f>N-l5@VD9?VgD89){sbaTnaNLRNAI<UVADgl9Cp+>(tGfFK5
z_$FL*0+&rH^r=afZeR?7JBN$TJy^v4Td<b#gT+I)B>)E(cOAO@vlO)#qN1(PetMj&
zab#Y8=0BL4+m`4BUZAbH79LJcM<*v4qK~n$<M8B@-6dUP<B>WKk8Agz3tT(c$>{(>
z0ezV2`gY96zM-KD=)cFu$DgpWW&~V0LpqKI=bQaWfw2I6)-PJAwkml9!oD*wI<Pya
zGfE^}?IVFpB1sVNfY#X6$S6G^0C%9^l<v_ZQB6&EfL!vJo+O|**a7o}A%qzuXE!5)
zXZU>oJ`cAp8OM!JK_O{JpZ*-~-iOO((RR7tc;Q#r9wB}O{L<UUr#q5m4u%A3uVo*u
zscU2c?x)b_1A@WdTHwGjgi&<fGpUwNQ@Gh@j<p3{YG({bU}n1|iA96w6|n9=*PqCJ
zQy#k0g66u@W-uu&D=!n?zP&yB^K%@JgDe1ljJ&p6TIkQk!3_YB2EmZR9gYEgtbohD
z82~m0dip<3jY*1^4t8eg?%usiO|1{`MILh-4PaCN;qoUgkiYG~j{$Gz*9{lN;k;|)
z;BWvFu;a*^sr$U7K9=w$*fYQs02YqQ%1Zf`ULv(pvy9A4AXE4Q@4u;PcYP*jj96J;
z=Qkb9hCl{e`2AO}Uc~{T27(Cg4!Hl!##llg7(#$F)Cts+&cTGsfUkP@ebIEVZ8WQ6
zIjv^FfCT&oSQ31KyxZ}vN`>_Ti1eTR{L*1U;aOicnd)R@WD>c<7iUl?LmeGYxc;z*
zXZ#*V+Y5E)$5|DEiCnloHuJ5wz!vrC(<cIM9D||}U}zyBndga9fDPa?7<%p@!0gC)
z>^mA7-v6jNE@lybXany6&Iy0D>Q^U6z+-0f{T8hke&O5M*?|`+-1HtZ^JaSl6I<E^
zEMkD64E^Z<xxaqx1CR(jQ!V{!B`|EKgLRE$Ld#`4N01a?z$CKK%}0xUI}HR}52Y0q
zOBYl}$}F`sie7vnD$s853^#TD{p~pzM!p0FD#^*2Rwx?Hf{8;yg{&Ku;Q($m5K#7D
zX);7__5<Q4<**>rOuvuIjG_f&&f?6B6->CI^N~cO`9x({%Uq6TP4x1!KLMVxQvdw4
zs3oHz5$$`Mo11%k<g5nQ2MUTgAASY<)6(zXzrp$<OD;B7@;)cRGj<5fPXM9ca(1e%
z9c)Yi>c|FPUur5la4kivosZzt%va7XF&&a6|Mbaref$XK6_g#9vtzb_f~T^i!_H$}
z1!p1DVuC_KQQ{B18ioP;B#C@Z4@jqgIR)Dkyrmgh#MIN+nwm2|d^%W}N~)@_?dWxc
zL)9#?7hNSKyTE$&l#NY=J{-Ug#5XoJHt}@~u82;9I>)VhG&C(^V`_48;MI8{A<;Q7
zum>Zr_x`_d+y?DULUA!M8+&_2NMbTFQJhvf_V(;tai>pqVB&!+B5xNvh^_b$7ch5a
zs}%kC@nf_DV!q6AO9u_j3;2;7xhS8BMLo`xb7BCFGJUCL5<l=>L>j`*W-yXPS2C7U
zX2=r_<2r)i;o*Uh0BQ*G*3OQNnfdP6z|fEftR&!Yml3c}0-@w{-bD}_8ynBNFr5EE
zfWc69DlPW<_0y+MA3S&fN$dqb|Igv!$i^Aa%wXMp)xw51MtcUV4>IBM8aeefY;5=(
zAd_^n_8|9w#l=MOU~B7WZ%9jo_|=;?i2%1nML#_vJ(FSM(B_{}W0GmX7*|)bgqI}n
zxhUEkXDa+9$qJTrs*h1%!fajnkgHLpsG<@T9lgA=QU$`oY{G@6zP>*Cb4a=s6%{|5
znr@;ucvQ3aG!_&Up}pgC*}sWi@TL*Nz02pr2c#afuQo-9<4Xw4>>V>_*nZ|OBAlyU
z_yQ3IbP4zIxz>2A&B^mFs3!y9UxGCMxqJd6(-h63bx`c4a1QBP8}k~SXi!r+;`w4$
zO&~Av@$&v?Y;5z;@HEXSEZpvhVg;ZMc~Iv`)O>btuPk^P5wQHhp$C962|J(!WILtL
zZfta0!ccx_&?X`waX;Elnaq{B_vle;e}D1!@4~whpB1|B&~FhCq-JE$mL|x<2iK@s
zs;K;h{r|cMiH;)z-h`<VQzdcn4hUOr`&A;qw9Ct?I|Y6qwY;^rci&%)iish0dWeSn
z3r-_W`kWr-myshkWAGzhM-RFP!}7$!!ir=w{VOv1lXAej3|niM7K0-e6BDy+4bpno
z#6(<mh9oFo0|os_lQ`vrIfToT?|$m9<Q&uqCI_w&GN|6UdGp!&nB_#}6|kKAY7#g(
znw{10ybB7^rD@n6KzpijiHHTy-+rHzz@_>IFU+f+Sl6!2`jC*3T}RyA-Sy~LSXgFe
zX7V&^?qSV>dl1n!F^Nt{(6UT>6dV>d0POSc;>UkizJ|K$2~tIVQITou<g2FT(RZYU
zd$-YLR{jQ0-XX=<#pzBrqHS!vw78g>mWGLdneXAbiX32iVq#)giO9FCEFSB5(Q_qo
zP|>D}3~wNiCm`={UP#<Vhg~QwDG8>E%VL}pLYkJA_R1A+;K8@hpS$x6SJ)WNc>w1h
z8siD3;#d!(Q<5d}B3k5qelsd63fT3XbGmFXm>{82P0za~6YpY7SMaA|yE{5|x3^`L
zlnkHzeG({eP<l~g>3~47Hd-PlE9<<o2vV9jNX`(>E_=&%sIE8&_RICb_g{jSjl*pC
z8@SUlGMqpsXb=hk#0&;ObqEJg^7_+dVB<o6F0ZIK=-P~ZM5!d+0UIOaSze03A4E;8
zFkt0&E8%{AzaX4xza*xra!h|Tt3iL>Uvi0~eUPq}Ysv`13Pc$7QnL}*NMHr;uTNkj
zpa+=ke-wTpUYmV;EEc33X6B&GJoXq3G0S=h@T$3{Uh!)91acV28io2|u=XM2U#joy
z^j|I~S%P_oDXRs6+0i}c(L-=V5)cxi=H_fp53MqFjUTg2z5BU4ItHayS2UZLkWg}Z
zx~LZH9>;t02b4LIpkKgN1vwW~=8OQ5Y!;#~aEQC5rDbEPE@4?Y`aP#*{cL#xCi0)a
ze)(DShr3uzOiW-RRVgx%As3?qRpTuvv@R|#keWd~%WO2hZ3V$=D=@{5j)@5p#K%)&
z47LxxzHJ+I7wfaLf)qEB!=ZYVrQmlZx^u@CHl7z#SwZo<e0=2O<UjWX<Jb|K+7WaN
z3<_@BPp)xsacj%Vl_1>;2??1boA|@}k<rxbsuSnq;TdaeM5A;bQE%FHtsTfnPrsWt
zQfap`I9cNYV4uUd_kp3IVdk7kSfsdtvT`I;8Q$I^Fo?}xh~<=(jVvr`%|@PN3YlWR
z6`10MTny?rm_s2(ObracZ%}GA_X66GpRoUc9o8KR2uw_$(^FT9K!?N4H}ISL%&3@`
zP&K@Ibrk`#w%hqB7i8flPePWzsTP3K8)Oa$!?<d6d<3HZf#b_-{YH^Ho$nfF)N5U%
z1b&CK%!P%AJ3BfS@1w+J7r-klaJDN4W{2ssBBJXr9345mWlD(Q6(F`$E}|tO)9Jrg
z!w>}f+28L40EK)$^7XC|l-yzQ@tWoXVG$8?Gj2s-Kg58NoXXNzScjR2o}hhV;taGc
z&@_J3t7Z_h8bGR05);cB?T&>i*Wwpz%+0GdwHcgbU7-K?daPsD8x(;k=L{<Z;^FHY
zqs;x`(NS=BJ45*icX!HS2u`TorM`ZQK@9CKjsbXC8=4DLIs~7=q@E2T_TKtL%yPLZ
zAHipQz>#=(x_WxT>zgpPfn;2QcIr8B#!HTz&$$>hcvw@z!<_v5{G6Q1pinM<8^x8A
z>-+El-NVC!J%#}?y3c{cknGU>_tezhnGj>B<e&lr$1&VUc~w;e_zhZG<VbIOH88WX
zn&zVP;AeBAK{64nFGNH{*_t)nTwG4jQ9)&r%zaOWnS~`dJlta6MC~!^rT=M4QnjdL
zslSKU&pCz1twoi#CLRZiDODUyGUT{O{ffiVP*PHx3j@c*{Hr-Rxycf_JD;i0=xKis
zO4qn<iLWNdKv_CFnWjh1e|vd;zJHaiOukD=aa+(MM%#R{#C!Rr-4dU*8Y}-sMM%p;
zLBmnRdjU2j@AUUC#7CwCyVsg`{-YcH=erRewH^u4P};JCspy439?m4GhNTm_PDO7M
z^MfrKTsnWxSS5LFy4C{ZnWp56=e7PG1ykxxZ&Q5Vh|WrpDUw{_%DYRGe3uE1U|G`_
zUZiX4l>gseN@-$w`t%niVgY2Ad++i)@THx#V9=3tSWf9Ce(tUX^n*zMHx;J&gvH}V
z0>Kly?H964Ezd-}j<%0?%wC{tRK=;YzB4eBl!jw@1%3NqfmH&H#(s1XsFC&Yr0&5e
zao5Fh4%XlEl<iBMa43@gyDOXohO?G%0>8)(b^7$}*?T;Xfy&-TN~WT0L*~g!W;K-5
z?g9Sy38rS8n69nmW<}qsJ6ed_TZ%doV}F4lU;q1I#P#07Yg9$G3lU%TCV3|M7<t~9
z+W%0ryfFsH;pbC--|ke%8gyH{6#k_jHC%si<MJ?l>emAb>&lG}?hijMuat^hes{5m
z?M81$Q!$K1y8(<r$NJb`4jVWbM(*2fHA?rR#hq}Kt<Jo~O7n3)^VXNX3A%HiM7qFK
zXT$6m;>nv;lsO9)G0<QRiyl@CNACTWHfGuom}05>w)<ur^Y6v|4<u8t^Xgy}XafR^
zZkr^8)FLV(R}|rRo|SLLtGwPz?;5mMr=D!V(O3Yc@wIpAEZfnk7W#^|r8GZH%x;+J
zq)$q|=d=D~+%pyz;3Xby=T`Qua&Rp$cle`g=ph$-fbuxn&aWK8=T*6ID6n%*0luz)
zoagkUhs1V8y!LmG?4@@dv6rcez+`w$mCJs1T!;>>d#|jAa=g3MxLl;2jYb(&70QHs
zo7@rLFcv>L?fh%!bhcGeV|EKdtqNQY4_Hr~kP$t~oASF<FP&$@mnE(~P-5X>`_q1C
zO@8B_fs#(x0dFL?#6*$Kdj6mMBYNURa16T$Zfv8rEjdMSr45TBe;6{v@YyzhKQCLa
zt35fK2=O;$KXpE8@J@lV+iK}t{Qo{ws9khUeus*-ZMshKD3%Tco*gPR$0M~HlL(S$
zH#w@&T4~<ohkq_JiyAiSryToVys$as&E;p}f_~HE|F`pk5-P3P{}YP5h!tkjweiGW
z{x2HU+=e;z@p?NQht@b>(WBYzK9Dl7X)XVSIMXhMU*EYQ_|Nb=3%ouhBlSOy9g>y<
zLl_tv;e(8ZO5kYP6>ojs$*GGkfgc5&&-kl~vvtHoiwy`DG%tJEn{@eAZ;iXQHp6*t
zvG&JsF3y3nj)8U|$kd~wKM2G|c1s)2foKxr;k{n9Vt!trsM)b6EAL6+NF}(0VF$7?
z%;hX-w)~Kiu^$qJ%NiaB$LLlb=Ow1{T6`Y>L=U7Jw1Eoi74O2HANe~4Nrw-j#ak=S
zdhpeT{?1mPOu~+R%`V6Tw(+G(eI`!s&zGXmSV4%{HM^+QUH#t$tygUxXt`YNKMPPF
zsguLeg>9dzd^f2yI@@p6t&_@OFU=#4$r=pK4>Bg_c?1A&tVgd0&K^2gZfn1O1>T0W
zh)CHGFx?{WQi?u?+mx@Ay}U+S=dtnu*!l~}$(%`>jH${#(^E3O=HdWM_G>C-0+l)|
zXOFgQ%${Ogys)sFv99Rt?S)oM{9(~3Jq-;F9F~!i>W&sW(=&VPm}Mi^+zW3D(vMPL
zHz|94`Am_jm<>bPL92O8*;-LqSss^|iVB=IsQ7z&CH3U^n1q;^K{@~1;ypC?QjI4Q
zg|u+$(8etGmfXHnd~L_TK*=IKbcBFYpz2qOk(^ZHyL<PUV`u*c>Xu;Ahrh=(q%YJo
zG=S;e)13<JGGXZK!E_Ip#W?uqD2J<V^-)kCoExt`=LMDCKVmNh&YC_COE~2wI=LF)
zZ@j~d@)%A)>8xsaw$X9OtSmgW>rN}SEc<b`9;*@>AGX1DawGHp?OPp3l>6J}gEd8B
z|D1ok+3yJI5`1Y%)j8^o$@e!p>FWX)5%5(ebc{37<PncRPK&WpcYvef$K08B_Po}k
zS8U`JWE>r>RHX12wi)DJhcsx*pWD#7kG+V9wam4e_@v6P%eBsLZ7AxIY=6z{mV*yy
zc}I&RL;mRlw-e?@r^Nyj+^=8FUa;<Ef92|tV5!;3mP;y=<s|UZ^DcqqCr*;{N8DzY
zxG3UrjS3QIT2yZovx)j&Jq@pR>-=%+RK=gd$X_^bM4+YOoTjm><=oEV>P6E(&$VoZ
zPZ#Vw;acZ$-+<G_n1tcM$vI121SdxZWJ5T}|4z`q_*wKwvbqO==lMK_3Hbco`wSxP
zpWta>VK%hOQKCIM0^O9RoqDe&?aKIUw41xT8a(GJ@w8ImsIdCVvz6$gzofc7C=X4E
z6TU!3yx1)%+2E86zWt{aPW;|-v=Eu*a&H@a(oyPb6ug7v>w1m-U+d$|`?Gz1a`TCc
zSAa+1*zVf0=9=rPS*?#vG_J(Ve;iPqe5<Z+i^Vo~j*p3;eLN+W+tzckM{Vc*Vfjzv
z&UxgWJ(rrEf7Wi&+ZH|vv~YJVupRMn{_aaW5<LfEFS`33H;HatkvLCnsZZvy^MMZD
zPyggwm(>IJhP7(BJ6ZHh+OREeTe^A<4@cF{PpQRM+obY7a7dVB1bAP$6J%*$@!^5k
zD#=dZ_97sVy&AaSS<7?mJBqx6_iwNN^u+UQdWiDJBTuhY`gZ^aZGjuM0@<3SfaA(5
zG`r0;p95FT0+()m{C@jd(t!rXQ>V7xdAK?sIJwy`4_Yeu!r7@e0oZC@x9;AHqmoa0
z8CxH~GUpC^caJ&1S!-qo2Zx3aNfmY&yO|IhoWB0I(^phHn6??X@5@zy*J*{OS?;Zn
z{F%S%=d%MhA5QAxs`+K*^vDl5@&a6aS}~LDsSR+^5pWGR5$hPin|#3||3B?pFO@z0
Uw=*CYc<L5|r>mdKI;Vst0F`qky8r+H

literal 0
HcmV?d00001


From 8b859cd2f65181adb9807ed5bd41e2f1c500779c Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 16 Aug 2016 14:50:32 +0200
Subject: [PATCH 0663/1304] docs: use diagram images for image lifecycle

---
 Documentation/devel/architecture.md          |  24 ++-----------------
 Documentation/devel/image-chain.dot          |  16 +++++++++++++
 Documentation/devel/image-chain.png          | Bin 0 -> 3058 bytes
 Documentation/devel/image-logical-blocks.dot |  21 ++++++++++++++++
 Documentation/devel/image-logical-blocks.png | Bin 0 -> 8536 bytes
 5 files changed, 39 insertions(+), 22 deletions(-)
 create mode 100644 Documentation/devel/image-chain.dot
 create mode 100644 Documentation/devel/image-chain.png
 create mode 100644 Documentation/devel/image-logical-blocks.dot
 create mode 100644 Documentation/devel/image-logical-blocks.png

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index 5fd75bd69d..24b80b9f91 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -170,14 +170,7 @@ rkt commands like prepare and run, as a first step, need to retrieve all the ima
 
 This is done with the following chain:
 
-```
- -----------            -----------            ------------
-|           |          |           |          |            |
-|   Fetch   |--------->|   Store   |--------->|   Render   |
-|           |          |           |          |            |
- -----------            -----------            ------------
-
-```
+![image-chain](image-chain.png)
 
 * Fetch: in the fetch phase rkt retrieves the requested images. The fetching implementation depends on the provided image argument such as an image string/hash/https URL/file (e.g. `example.com/app:v1.0`).
 * Store: in the store phase the fetched images are saved to the local store. The local store is a cache for fetched images and related data.
@@ -186,20 +179,7 @@ This is done with the following chain:
 
 These three logical blocks are implemented inside rkt in this way:
 
-```
- ------------            ---------------                -------------                    ------------------------
-|            |          |               |              |             |     overlayfs    |                        |
-|  Fetchers  |--------->|  Image Store  |<-------------|  TreeStore  |<-----------------|  Stage1-2 fs contents  |
-|            |          |               |<----         |             |           -------|                        |
- ------------            ---------------      \         -------------           /        ------------------------
-                                               \                               /
-                                                \       -----------------     /
-                                                 \     |                 |   /
-                                                  -----| Direct stage1-2 |---
-                                                       |   renderer      |
-                                                       |                 |
-                                                        -----------------
-```
+![image-logical-blocks](image-logical-blocks.png)
 
 Currently rkt implements the [appc][appc-spec] internally, converting to it from other container image formats for compatibility. In the future, additional formats like the [OCI image spec][oci-img-spec] may be added to rkt, keeping the same basic scheme for fetching, storing, and rendering application container images.
 
diff --git a/Documentation/devel/image-chain.dot b/Documentation/devel/image-chain.dot
new file mode 100644
index 0000000000..ec4f2ac801
--- /dev/null
+++ b/Documentation/devel/image-chain.dot
@@ -0,0 +1,16 @@
+digraph G {
+    rankdir="LR";
+
+    graph [fontname = "helvetica"];
+    node [fontname = "Arial", fillcolor="#FFE599", style="filled"];
+    edge [fontname = "monospace"];
+  
+    {
+        fetch [shape="node", label=<Fetch>]
+        store [shape="node", label=<Store>]
+        render [shape="node", label=<Render>]
+    }
+
+    fetch -> store
+    store -> render
+}
diff --git a/Documentation/devel/image-chain.png b/Documentation/devel/image-chain.png
new file mode 100644
index 0000000000000000000000000000000000000000..2855ad163eb60d355bb0e05f41ad93a4b298ad0e
GIT binary patch
literal 3058
zcmbVO`9Bl>ALrAdBD&iwSClesmJq{o<rt<dM>$sHC|V)sj6Rfml3T-Kt|g;n&XME@
zxkXIw&3&}o%y&J$|G@Y0eZL-$_v`uF>-~JZUa#l-8DVCsfAomx5k5Y?qlN~$Xg)sv
zgFFm5^!ILIl=bk^L3^aWF5lkYc+1F(=i?L1Gt||(?VGkR>}Pd*O8oQ6l4Sko;zN;u
z;QZ%qauHz2!=%f0^#`sfeKI-5$g*&OjENe)VHzmfwB)f38)&RAeINfgk&?136)u<E
zpg+|bm1|b6XClHQR*oqM)tjyFs=w-(@aw?0Z%+_JYE{`{9R<deE|+8bwelO<dif6p
zcW#A$l{^&u!f%0?m32Nw4DR&K>h22)MOyl1w1O8vjb_I%GBS#!)+@+iu~`4L`G>O#
z&(hSqBAHAZOjws(d3m{l@AAC``unwWI`;PGqq11A^4es>U`2X&_Yu>JSjyYt=HATd
z6tUy&Gnl5C#YMMSv*`0+S+Xfka~=`<VAkx}hA)1c<whh}yJEuZ(RzDVq`*ZlkjX_4
zTc0fgu8AJq#aD4UUa+mz=x0{uzMuDx4u^RGPKXji*%w7dbC#P-#3FCaYd#HSG~rUz
zgbovPBUg)v6rWe^xxx+E=<biHSACLAQ&SvxthHqhY8{i&wg2B?8;FK33v~G5v8e5o
zzJ21CkmFkPeG}n#npcw#2?r>I9oAwHJ-CQ{#GCa35wbrkIUt%NlNI>zz}n-&>A8`Y
zQ&6I#8P*3AwvqgMdh&V=mm6uCT8jQxKUuiV4_Dqr^LkE^?FJ|kq;qDL?5VM!!gK*8
zRT!T!sgtY})o9p~J~*Vbb&iv~RM*OoehvLZQxUf=@ggDEL?Zd4--4o$$b3vGx^4l!
zem!7Ezea;#P6FtTD3f^)^TYS`3@%hP<OFd0P`Wiq26`_eHx(rm??3zA@%HOIXNQ;0
zma-xLTn~bQpzAUIV$$*7gdUaT?CfwleDQb(rytcQH@pbhp)vbLM*6w@E1qu7Ay0gU
z%M?l7WkKGKj*gQo*7(?1*L!xUh1~RD1;aG8wg^l`OvU;tY(kR((P~YxcuII|@s$BT
z=;v=iQd0M=o4<j37bVnjVzTi;Qjb<O8;wT}eP)bbJ%45?d!k<OgU73EwnM?snmOxq
z&acbzPQ9Oe-!r9WG#{wyqq2dVCYLyn3T~9m)(;aFOF;x_I(K9|rhAt86ti|3+*-i5
zgRJssHM^@$$5G!0jhe#Fj!)Lcu0X5xEpY#?r6{L6bGm9IreXG{DP%tZ7hfT3Qg*hC
zx`xKe^0K6|a#CAcrGyU&2~q^kzLQ(<*4Z_uqNP0}MmyP5by(?^=-Rn+g^bX646Voc
znb4064uD6bpEeTr>1PUz>MFl_zxS(xSG%|TY1V@aO&$vmge;OgF18zYE+P^?0c7>9
z$1O}*CFvagl+{^NbdSe%?n*1ufDkp1bJEXo)h=ddTYteFgxHAVb^dkYIV9N**LJ58
z*-fWX`yQP-a)5VaWMmWqHlC)XrCEJ)Ii3u$y*kZAo)0lFY|Ukd_sJ7AK6jmbn81Yg
zQ!$n!F+pP*EiLBR=~fMiOF!=6aE;BEpHM6;u>(g0J;&+d6Nz_F#hU&nI+p=-<wvEW
z*4EbDJw10yoQ~Sr*==lW9Fvgf_)bzG6{h1G9A(6fojNj0)D`bPr&nik<49%v_f`>H
zy|(ccrt$C%>>gx?@DtZNE2sU1KDsp5QYZ-W4XQ73+nfd&4iSOzm5peLgBL;z;k8<<
z6H=R;;Z)b`Y{$RJ%?bv@!!LN#ld3D^UzAW&Z8lW%+Bs8`r$4gIuFg?pyIPxG(&-la
z5n~+;FbKHq3w_M!jQw~2ntPrO-rC7nym@sVo{(rM`kMksG|Cz0?rt+{2qY7d^6_KG
zo|8x*u*G{xX=$A$j)wBruqauJtKJWw!i0>Llo^owJg_0*=g_yd3Je>@hCJ|4R*LV(
ziiJ7ALGud<?*pa`X->@XKby0Fwzf9FnSu1wp3voDvTJ-}u~NQYuRIt`$;t|DO@^Kn
z6C?6U@$>V$4bh2JK1;J+?Y7&fIhzUZUxHR2y%DgerV`2bTQF@h_l;T&V&A^X`_8W4
z{uu82*4)A_SSpH*w``7UmVBRhWT!gKZ;`5{)}%xy3N)dy2fxFNf&H({Z`H;9hR_yN
z19tx5gAmRj*PI^=*Ns?;&QD?ADOSE>>#Wk}x^hC+mXs7r9j6kBZ%PZhUBbh|U5Ya@
zc`}~w%D?#g_bh5{e%@_-d_0^;Y^bXfZ=&v#@tT|H%GtM4P#{~6`&EPNK1=;t&AD8!
zt^9O`q-1qxc1_RULX&T}N_8e}pQMH&xo-Cz`5S(-++`j6J->$7=Pa~m5XenGGqYY@
zU9HxNG&15dFf^2slZ$L_HaK-eHBrus(hhew<^y5LS;OM+30wco%3_!HOOI1Ecg?p&
zX~2RvO`(IHzzo}<qP!=d(!ZoH9K^$?B)BI?yGf->c7Xz5q+mMX@nA2)FCX2HuyS%T
zAqOPzFD^FjsTF0SWKxYojW6nCnsw4_;qs?VBqC$P<`0PwUT89y(<)9^oZFoh0?c}n
z*aaFEq0wU@lOBFifAEfuyFM{27Aya@+&M8Z>LqB738``T8n{sYsh4*r?uivF^;XY#
zs)hqVN5J==tyN3gg`{N54qzWw{T8+0+3a*rW61XEeKY%fl+XGsDwj-S!4%$FQ({)u
z@-wthhOL<xeLUssh4^n))mCpFldN$#h`YOcoQJEcs~i{%)bPJHHa52Zz=7kcKEib6
zbs<~{Ye<AMlHuT5P=P6r3ygZ6(T7a!3)t$7PMl1+7(FKOaOek3Z%YFPdyUfE)Xn2f
zr4SN{<f#KD*I4S>wFD`h(9wy7%w4^n{*(0qK#moPrMEQ3?CMugj0ZBY5D{}Mr@w?#
zI-+1(nOh}e=NV&2h*sX5=B;cee}-=1FXUR$%Y-EJ-)n0V`=cYfDhQancb0n+)qe{{
zx_fz#&Wr}i`x7McI-H;86~92$R)>cywerM4*&_cYhI8q@gF}c7#Cfv$_58qx5T2=s
zi;FuXEPNBvza&vOdG=I~%Jk7QwI9fn33Cso&cwb>MDeCgz3QF-!N218K;Bj`b-0Xy
zf97=WhDuTqLRah7;mrdL@>sI2$dakh^l)iAT@)T#NW5Ek^J4tpT4<^akF>OYOe~p<
z($@Y*CrtQpQc<;vJh|;vvd7QL693@NPOfNghgcZh=m%~qdMDUEa08`QC6d-f?Lj-(
ze}W%;{&oFJ%2|d$t-fVe*Nr7{nwuTm1g<Ek0RD5_?iJ$8Pr=kQ)sG2}pO`q0y&>#J
zl%-a!8_f(>Xn^g2t)C9>5`m9OFqcl<Ha9;G02uiCUYC-R8W;ivo}C<M4>f^dB8L2<
zBNR_ILoeNgJP9Eo;TirPq0pBI8pDK8`~>mqL_5<lqI?w_S=t?}FW~3t)`48*#$9s~
zvObxEjxfrx-`QBH-WZRH7S|9JjLIEB_cwL4rWQZciLmnt&kNb^`c*ghmW#f7C-%>n
z4GV(I_N=|2KF@A(<?J;^Z^HB6-*#np-nBP=mh@_bfmgx%G<uHi7CX7VRifUxP+4qH
z3!KT7gF^K)&8}HN?JWQ`kah0w0$qvgzU6v@u5Pt>d<AEPW%j}7&yxaOY)u^P%1P)g
z;4KG;Y361`ph}v7P_U%Ie~sk-3EN%!Ju1>1u-LB-&2lGSI@mn&I_**6Zda%DqQb_s
zt&!rkwLBCG-aC9cIpM0?03}yg=L^%ubeUuQp;%#dc3+{L-peCZbYV3|wIbVs+j3|O
z##+5NX>xK>m)%}Cr!@5Ci#G3T1JO2QSv<!gKX>a|9!~{v!*P%f?p{77&-6NckGmH)
u{nsGwKjz6J)LVD%y7R2$ek~VUu7IN#{;BRFfWR~He1>|ax-{*3!T$jvRrpu{

literal 0
HcmV?d00001

diff --git a/Documentation/devel/image-logical-blocks.dot b/Documentation/devel/image-logical-blocks.dot
new file mode 100644
index 0000000000..a0a71ff017
--- /dev/null
+++ b/Documentation/devel/image-logical-blocks.dot
@@ -0,0 +1,21 @@
+digraph G {
+    rankdir="LR";
+
+    graph [fontname = "helvetica"];
+    node [fontname = "Arial", fillcolor="#FFE599", style="filled"];
+    edge [fontname = "monospace"];
+
+    {
+        fetchers [shape="node", label=<Fetchers>, pos="0,0!"]
+        image_store [shape="node", label=<Image Store>, pos="2,0!"]
+        tree_store [shape="node", label=<Tree Store>, pos="4,0!"]
+        fs_contents [shape="node", label=<Stage1-2 fs contents>, pos="6,0!"]
+        renderer [shape="node", label=<Direct Stage1-2 renderer>, pos="4,-1!"]
+    }
+
+    fetchers -> image_store
+    tree_store -> image_store
+    renderer -> image_store
+    fs_contents -> tree_store
+    renderer -> fs_contents [dir=none]
+}
diff --git a/Documentation/devel/image-logical-blocks.png b/Documentation/devel/image-logical-blocks.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cdfa4a7c1f79a1e9b6753238eae4034237ac4a1
GIT binary patch
literal 8536
zcmb`N2Q*#Zx9_*!&T;hKBN0UJL<`YHbfWhbghL{FKYIBgO7u=dOZ46)gy^Dk^e%e8
z+yDOG81Id7?;G#E@fZX1ti9G=_F8kU`Tfit{`!?X6qgDY005|>f~*Drph|#$f5gTF
ze~KKktAoEV&6VY4f%}K=?3SVg0AK(VWu>(|()Z?l45QEQu@0xU(lv{;5-nNP6<#t9
z?!ApNYta9(e%JI%)qDO`ymwwm_z%I}f8L*Wh5ksR9B64M${~O!6weh<H;yO@O&!Ee
zs<UNi7QJ#e9`5T3f)BYHWu2djWR>r@m+!!th|r}0LPA3I+vI}0E!;5h%N{of27Y1(
zRXoB{%Y5DufQH4dt(;+LV}rn_6}4@QqWW;QtKZ$%=g<g2Wgv^>aoc>YP@tijtl{|n
zU;)}-SiZ%({dJ+mtE;m!w|7R&brt)cgan5&@lmHBELdnxPR>eI@dZuRSA#n9%qf+V
zUHhW=mF+Yyn1-39d3cx)g5O9f8osrPPArpMRT5vQJmN`+$aA^rF7c#pPe@2GGdrT1
zTktU&D;QTM=UVI--!eY@`?s`8P*s&GM|W!S_tezaDnUgtTCrQ$ix+<Fhs#}&nLpWF
zdgKYv-S%uFO#&s$j#jpF7nyPin)lKQ2YzGcWCO|@Q0ZaLulz<4lMb^stlP&QNYJJI
zGs_eE3ha5i4#-JJNXBhH2fp@?OFGEYACnW9;k3&Nun1D7r5EW#fRF7v=D!~sCOs1q
z(<l{0LRMBbUx30JY*TRHz91kZjGr_;WCR<(b}Y$&jc<ZF{+Eu5J&}oD2bR`^{kEJ^
zD=;c3B1@3hT8+hj!=8x~-p%tj3l-<h)TvI$SZ;;?)<*K!sW_`9=MqU19L`TBVE=K2
z)UD7V_0Qn^_QkP7LmZX1G3=ghwG(dPCq%KVjMEJpFB&TRxXbWrG1SWA-w6AT=hdDg
zPp9Q6ZWmwA)n^0`es*9typtZ)^uX9{ziTUhLEtasHEp&x3Ny7b)7Tg78(!$1rd(uv
z%z?KxH6`_I{WPMq)a?+(f8@Zu=bw*VO5)B7(|RSRHXJjUVzY%QN9v2EiPHJ+*{2S=
zY#h$bZ~yXmeDk8_=l<P=OoZIH9P-9wwUh`ixk9Gsc0NV-Mua#4{tiO)=F^CsDvLZ8
z(b{jQ0EIx@gdPWt<hJ_f>!XcB_~DysH1VeIozb(3N?(y@F5GTzvck<4oU%-WPdptv
zQ??eDrz;lL%D?R+@@(fvX-2S$CV&3cr1deGKd?y(jIGL%cvHt;adJgo!Q4JnTcWfR
zCY!5NCtvX?IT>M4=hU&VU_4e}I~OB4WN{O=pRzP!bd;W2!bmftm#A0HYoVt(IyQE+
z`h!@{z`&s~(f%l{fyciSW|XQg0s!oha@wMD+B!Zol7S3MS$=l`EiFFLv<L^dq;bm;
z(C3?hNQkeiJlLGTO;%GH@{ftZ-jSe&+8{c)_l2&FAorWpmey<Sl>x@7I|ULy0`oF3
zRH&$mYkb{HVp=Qq&%eDvB3lq@OA>ZyQL{s#4c~<3SRAERg7^WcVKa6YUS2X|6f=tF
z<%dLOa)mUR5(dA&2ML`x+GP8*0l{}}&E0~Uqr68$n-$s4VrY(@951@#DGFxTnVcj@
zKX(mf8!f8wyc?tfSBA*=12ouW_7C@4KD>EE+0!ajN7t2Z9ARPM?2pImdd(g@PIL9@
z9DDrVv!Z{Q*(?e2P+)$wZqFTi4&H`Fod;)=*P~&jMbe80A0VJ~$MTsAGM#%bs6s0l
z(3eQS{MhDc?T0gS8beG@nV?C&ktquS-#@oPvY#^h`xDtesawA#nVQZ=;WSp18ai%v
zO=fj~Ec%_GKPn2&w!?Bx5%aRRkY8lDGqw*uHKq$Hoh-y{FpN1od{^Jt*f}@|+27x{
z|KntI>bi*bGaBkhD+v(L(n7hoxKciU?iv{(tg5QApMC$5Z8lb0-1_NQ(SUboUUc-|
zoSC^n>>}UufXJ~(7@bBq1yelsB?g97`B<Mgw)`ujzFv+#vuSIxzsGo55;ody#$Rm*
z*Vfk_+|lSdm&a6VxuMQoO;VO7ob}rQ`*xGABkbw*t=9R+#y3I3#dbMyTZ#nqlwk%e
z$<iiILT0;7f%cL`A5$mm;E6lB3;4h@pgr-@fPgk3ENE7;qia(e`^3F#&YyM~zFBSl
z*`ZA=>hW<XqXaJj=c~z-_3H$UJ<^e}Bvbc(l)(&MKw=E5(`N-!g>H-*mZ!69HqNF(
zGmqCLc~#gA3$N`T9!6AE@emOcA6;%_<;fuMD{E^*+u9^oR#wI*W3-s$mKw1K)23mt
zTphDA1EIk;-)Zr5Z$ecaBwlnbvV#F2upw(708~z9(8Ubkb7E~oy0MrHN4`|+98ff%
zAMUy=dgt)nVHN`8EbnwR5xT$(C9i!%%08n7E@qu+FN16kbGFYS0Dk^xMFCQsxt6F`
zSjO}GCeN8+_=n73yqXKLn@E9Kbo0I=xqsNt#gttFQ}UcT$JLRP_36|0aAKCFtt}il
z93Dk4N#}QW$>Iu!$0sCc9${`*C12CMc6w_&c7fu5apB>8xt3h{?VHT`{(P0wyeKmZ
zOILe4aCv#DJyXl}pNp;~pY_S=HddY|I~I+KYAgBjs>-D0NCzgSLV1qK>s;QGaPl^3
zSf4aQmz@f(p=g$c?p;L<ZWE-s8-b`;UArIoouT!j?)Zm_8M@b3w<?MQ8rL5il{#1~
z2YA3}t$ZuuvQL(4PV{bNjsu<JOzM#Z8U^)_O7k4CyO`EU<tZX%NA@FWs@lDX?hW5Z
zOP0>zp>kIgqV1HFLX(}Rjx0T{7V}LxO_3aF{DPexu}<{~ai||(m5=UiZEj|(oeQQ2
zH<Fh<Q;GYW3`>xMnr2tvbzyp@JU@e4&KaV?`SMELR5P^QaKu<xuv{BxaBy(2ad87%
zTEx>cGODb9Q9bv)ssFhLp`S+a@v40(^T@~h!dDGkLmoRfXW<$B_Q7$2ywDFF6VxyO
zNXF;rt&=7;wS3y;u-;2?_6n<KB71DZ`4M;w_<l1od&?{nJ5>9Qepe%xL%WX&IN7m^
zWtYEMo>|0cI(unxSYN~Ka1a733|(<DS4!PUZ*wE}lV9u^z3eizwhxo*#XQUsLl;8+
zLvo7xxG$Rln{7%bGbM$>!^^7+bY(DO=&f7yjf{$dSXx<06QC#6YMYQAT;s>+D1oj`
zDap#pI$iJbNc8<KwwRdM&4J&2*RRh)jL8E>H<xfgKyo6R_ZC}gFGW4|yovWF=sj{U
zWcK38yQtBf{CulYx1rL_=F;61G=KH3rd$ISYH*dfon(c&dst*L6Aa8LwXa^K?rB?R
zC8-yPNYF!e0@YeVKY6x>Xj?o)NuYhSr)Ye~<%l)HEB$48p9Cr}UFW-(<XCGzB75YV
znn@yM7T89aobTrK>g*E$fTyBf)o)s)jc;s7!1Cr;3-qdO8K~>XFxHoGfzdzd7#q{v
zT66g3b-tf;dGpO?7<~L(CZSnb^vx|TIb36!gL%bKE61D>`;K+?fAXi{yp{uauv#ye
zNk@b`VLjb7!N-pnaT}|-ipWlsERVKBqS9!0i=M_I{7;W(G_1g=TKbaMoAgiuSQ<gP
z-Ly(l4NUI7q(5i4fxpE$u^J^BSd3A_^e0Mgi|pOmYx=SIryyzNGM7j1&rF2!uy^R)
z?e!yecD#=tKlTr>-`7gn+uLVQSGYDb&l#X3sgIxgyWW~C_NmEzqS=|MKvYz4ot&JI
zNFJ=|g9iqcfW6l8dy~gPbvHa$yxP}<#WOrIv_80inHQ(&Y9c`ol9pP0d3hUEnqaAg
z8FF8T<Ue!H&|FE^A=LhtCu&o|dv=~}A14Pzu=(gNoJ9=nB+c7cX|Z1L^9nw#lX1Vh
zwT$!ifu2}3J~k$f9Jn8k)9tX*qRptD(k^IOskm054=W+QS~?8(JDf`WoKok;^2xga
zi{-;FU3=bCEnQrL*{h?8@j%>HoaR*&7#J9~<Hdw-vZ!v6^GX`p`W8}UnpdcnyYqeT
zu7xRD`LN9HC;xyUy~_1g0^RxQOXa#>h2>_LahZdq-rrfVB-+Rx0Y~$w9~O)LkqH8g
z5aSp)Ir7jNCRQ-Xp{!23U98GR*3}pS&CShaNca(#nySBFO%$F#6g^c|_AD&Bl^xo1
zt)F^VagLN{lKW=;>+obtb9G}w<{4Sr-}gGl>%T_w!~e4ERBN66jOV@8o3IEKy&?e?
zwvb^1h#S(_uN<l<0N-ux@>C1C%X4qz62+OH#e*VWa*s=S6EEdb*?fwA3XPX~X8P(U
z1rC4tUd5pjr|T>sRrgAelyk9Gdl|A{oFdEbP<mB_qdkj;JGO>QRN;5FMg@24l3+dY
zry*+0o$}Uc_#tm^^rp_TAl2uz_P!#w#;=i}N(iPEd!Oj>ikYaRzaJaiE)=|$*iY0l
zqd-@t=A@mK(XE>ajeTJ`PP@9kX3-HP9ifK0k!x%iSi|j%4Jg!S;Zi&B0qr3JM~`dO
zQ>)bJGW@zyWi>=kNPX-ZUBqxQW`wW~SBPJ$LklL=WgM@rJh5?bq$9~VD!tB~yzg(%
zg?+C0nTZrj)DC)kd)=LyC46rvOv;S4Ic9YV?{}^*;<pr+*9Fm8UZuB}Xckp|Jhpy2
z-$)9sxd$k1N@nvDSk&ZZYaQ7qbmB<^vb61Pbx$p{V=1>i+oGc_ZJig(y5WolF=n&n
z3h8redBPhdFDBqRFE=KBMm6ZFZwxCDx~CVJ=r|^P&Y&&(eSJE4h&vq+d~MhNX=7#J
zchKg^5bx?bX`vdLkC7pm7yc+ot*qwmxRz-$T^Qv~Z=paWet)(r?v3#TKg)E-Io{sx
zz{-!NIVuM26BBrLW?D(g*FGor%V-EFvk^(6N<5VwVG&0|L+iKX_3-d8y*}IXxH@62
zbzY1C9d>Hd$Cn+C7(38EA-)QX4dy+K*kE`=+Ib58{fqlM?;8h%dXv$%3&nB(?s7M3
zv^!_;H+i~5RPY~7zLAf=Z4NJYb!Fw|rEgla9=e_1j-+s3d({i;=QSxW!`zQ}=BkX~
zZabDiFS8C_Y$rTpF0wWs*=Wl%nzi<5u^8Yzui!=2K7aD$NeZ_aY7Cut#PqZtIy!p$
z&=5XvD&*?QN-cBz{m+xO+9-NjTH2HSd1^*RMg=9M&h=lPm$$cZjf{-=-|A72*}Iy<
zt*)y|`yf`=C$C=M?lb2zhzJk|GCZY|{MFA1_Z#I~Jv3;*ThLq#$Sjwwy2%J8u^dny
zc4Un#-6)F~`jSKm=VD(t-=>P~sne(3*s{OvZ$162n6gy|jd8w|A@GmcE35RqwCyR|
zXSG;tAFViBI#B-L;uOmzSWbm?@YsyvD(h5XxL<ByJ-W)HoL#PMN}FS^Ww2`kBbKhn
zVxgLQuJtp7mX>hWpe^*5iC<K?QtQ@fct8M(tE(&byCo@=G=7}&@^UIkvoqfo0c+J=
z1Yv@p6dNfLsoqk_=f<``Ll`{Sa`SFu*EQJjq?_j6<ahTEJn)3>3ET?eHamkoc8V<J
z6&zH79-UUJ>(RObPQ*d+>1jA6S`Y_i%_y2tO8Aquuk|X|e<>DP&3FsB=5Rq5wKdI-
ztn>Wd6W|CprX<s*t@~M7T^(3gCj_1;F1J_iZ~s(dNZuUEByCua%RekcG<~WHrjU?O
zeM1AIxHxUw?HTn885x)L!Bi@-Ct3ycUpxn27pgfnay?Ub9zjZ(2t7;TDIUK|m!OYa
z9ajMpJoeU?I;+DR-?)pNn{co5dH=`b?`fGk-=>J=a@L&Ru#11aE4n@`c^^e<(E8${
zE`hCv$MM)emL#ywsH^o>9u(p;tE;P0Y8AUC`Pzm>_<NPUTX94Qi~NrbGV$U!do0fn
zYBPhKO@;sA#IUQcP8+Em)_4n>jgFyZzpF4z^zm~@=!>QADl8BH^SKc>*3(f)o5}A^
zGX`*9=`L4qQ%OFFjv|D2S7?k;jZ4qQQqEW|O`EEG-itk7@T%A>DVsUJu29U|o>8pI
zmhwj$+@<jP;bmG|BG2Y6y>D;LAhb(mTch>`jc0cndm8k;uvp6OB^mcLP}7OY6ftp1
zQ2rAAB|p5(KJuplL+9GdwvnHyG{j>td;9(kzPbS1rMma%FoJ80m=NW;wXK-((f@`F
z{GTI*yly{z#v~<|r3!Z2i5*R7l4hNy)sK+|WnI<e973WJPB~9stW*_U5T1yY*looP
zz!{Swzzz)YVT?&6cN}ENcV+*)JK)LJD8Xd=N=X!s{^#$;b58Aq)x;ufJ>Gn|*+eDx
z5%>kURg8`5faeo=X<rmDH{&<LE$Il7FG)EaJyK`J4t#yWz{Ld{85t2U)-$rUut3w)
z)KpDYNAAxzArLTn`^G3wRyH==u|icDCnwHsbMStwpn}ho^uq^(KuTI#uKqXc%Bre>
z=xAtf6eSutIk{@G(bsaLrcj&VOgpf<;xn?Yg#|j^)Uw{0W}j=p(a}-+vX%%i%;m|)
zGV$}1fTvE1pd;1Q+1{6}Y6Ym9yZiFyCU%vc;fa<`ILKdWx|X{TJeK_gAlPbi6{*sT
z0;L1L!(>?~+oMuRbm?|_zncJmf8e>-83d2)S^IRAMPwFp$=#1qpDD_4?Axo;E^s>8
z6%{7?yc#7W$lhp+O-7A)2JGn;FQLZwd${!U^n+;vcwhq88;nCt;rSh?xFDD?2hrL)
zI6TOZlj}4sGm{P+1CyGX8mc9yb$*Bo3()lrv#*m5!dx!O@?{gaf1#^Oj){qRanwie
zFky(3I}@hsQ7nu}pZjKLexCNTpd%ZhFZkddVtswR@bt`#c}F0If~x9-X_9OW3=NhP
z(t#+(rx0;v4h#y)si=U3%Lb0*$y>DhqfCFdBYu@38ghMpkf;4c2O=eFx|E}fq@m9h
zwd@LortsO|mz%W3ka4_8^w^uJalnQ^y215Z-r5SkJl=3vt9Zk(*CX;gAKf=2qqzLz
z-&LH46mNeAB9-q*;h}($KBuBJ)y#GR_y+}{IS0h+EOBs@LcpneMxcakvt!bg;yxHL
zpn-=;r-21-a*hr_)}0g$Rze&Ei~nQ><TeHdAWG35409lNCIU46)nWk}V2eE}h}=+2
z0j6JOOF3zv_sKry2Gmu}mKaq*(3Z=~1E{+{80Mg%YYs4hM$U{s2;CAp0okOUc9|L+
zaDb9vl(57HgAg>danT5p5a7^!;B-ofFd5i7+hyEQ9xlT`i#s!4%4rM+2N;h)QSjnE
zd~Nh_(}_To;=6~ID6plJ6z%nGN4w1FL!Sw3%<RU<0K_)&!)WRdDR(S1*n~WY2J;Ca
zQZ?kDVe?>sEj3_^9ooZXq!j-A;0(S$%x!`VA|>!(Jj`uE2_iM|U{F37_7JJ<u67yp
zFm!1Gej{{3?KV)<PefM6rKE&qh<#uJ-HXp=C^#}QvQW8{c-2(|T*%;?8}BFz9#nC!
zvtR}0Q8#^ULGWCnpr!^<ZmC!`$SS`F$E%~A?5tsni<cBCt4E$hz1>vmiTmLuV5F20
zpLj!}N+l#K-Y*9D6Wdf+>@^aA35RVX3D}uAt=vD%K9m9b;{C)^e!I8%TN+{G=KToj
zj^X`$wxRz&;q8H#DtQc82!N<4LK3=XlXo3QdSQ-~UVT2S`RtsVm6l0aEnWD7vPBJU
zpue-9L_qlgCnCIy<+p<ft*V#@a{kB!d2%^R_2o-HNIu_D)<Z%atyybsg7S+f_-+kS
zYO*4G_traoMlqQs6uzvpv6HzlV}fIX;#j~4S3Qa6f<T@10J<Gk&o|(5ePSbgGhpb=
z-HfM$aUgSWE+G$MH^9{1+#hXrz5Pc=^~`okjV<-$?YsQBDc$l#gqp-H2A||Uq8QD$
z{)5@$n9z?o&cn6BzGsD_vnBYFh^#IHI_b(PK}}EEy4WBW7Df!jhryna3}XfFxKN(4
zwlBSG;oo8R2^vgn1pxtcZv>qo0C>5K%?25TNIoB^GVl)y%&_%E@EbL7KyCT@tGi+I
zKM%Tdt+f>ydrTpjEB3_0P4~HtwLLaMkc`c-Nc15C{cp)67CYd-xch+z#58fKNoXKt
zm@wi6U73`gNh2aD1gH5q*3!MN2=wDCrxF9Bm37T3kzL5l=`9IbUl|H8=XHU;pCH&?
zzxNh|cFB$I3Gu9mqG2-ry(Os6ET!!t7my=Kiv^s})Dp2gvREc12<<>le$v;pNWiT3
zc%0MCQJ<VtlhI!+wuz)eN7jBb+rGegUKq^4Dk4)g^e58gVF96UhGk7+CoZhc7YXz|
z*~;H*e>VXt2W^CBrc>DG+t#h+gio7bhUsOb!-|j1!(^FO$w?BM76xvO)g2o?UV?qh
zr&?_x6sM#Qr1U=lp87LlN_Y9HdvV0q?yq8sk3ouc&(25p^9@2_9`q6gJ7+hC==6<`
z_3w|(N~TWS9zSGb@FGY%NOJ%nuQ23AA&a!PC4*CjA*N3%37Dsm?x>`;VT|yE3)kNg
zKaVmF0rRFo=yZTMf)hD@Ai*uf*J<wuyJ;xc72(CRhP=>HL7h2=`h)omQ%pC*j{d7~
ztDiGNvK6Y8-vs(vj@eyKZ2_W#A~R4h0RGQe$jgy!a!s|r4wqKgo}Ie~f&Bn5wPdd`
z*{;6p%cJ<+hXRd088BL3^Q|ZrEXjXIkJ>sNZ6(ol^i&i(Bg0^+4bKk~Slu9R2e-bk
zm>%Pn20<${%^&(XHpx~q^|oTr<EaBJle-02z$l=kCd>5a`?gwOJT@{Sowe`C?c&De
z_U`+`q+g{sg=F{8*;>8@EFMwnJag+?9Qoj~^@fRvKL0^4dG8CMf-J<=Ha|88Ej`}F
zg2Qm}y+&!KZ_BRBT9~BawV2t%YS7h@S?{$Rc8tHCQ&nO8(4veWL(XR7aPuZE3&1TP
zUPWj_#!+ZMx`ZD!tDXMg=RI8TZeX<|<l2<Hr;&6ox$y#PuQwI1?nrehMVC{zc@abU
zbz|*+MR_9m$XDVn7@!YN9Suz!<X=mYkGzVT?@MD4)su{+_~}R)StYN;bbJ6@CC+1a
zmTPk24Ch|b1-dG?Bi0&2LvLKVB1=>N%=>i;(%#hA23DXhaFrdni25$lM_W0Z<;Hpu
z+=<kpU-8<NxS!Fr29oYDy%RrU1oaolK3^vE$^rh}*CBPrZ_B9JKYe)r+P5uYeM5`+
z?J!1EI#I4iGgu6HZfL}SjoO?XynO#Yz4z`b{CDZg1l&69@q^NF9q*=>KFq^EwC6n8
z(vTRySA$kPog_gmO4!RCQWHe6C|G@pA3eKwCk36scD_2Csh*^WYfSsbK%N;D$Tu<3
zT=@tPM7|XE{woSFa7mgtp8l8UqKRmrd%*_+My6#kH~~m!pdjG_t2;7>g>3+U5qRi)
z%f%T+P5Co%fy=68tdB4mcF9g>V339iSYJ7IRd{i&cw97VBzzyx)IzY;g!fpP9CD>`
zojMBvz~8?ngFG4qQ0-nB{T%{rtc7hRrh>UB<<3U>7}LKgLO;dr$fkO0-<cmwe1<W^
zZzf(mA`1Tva*DdLT=Ve{Ud3TCugrY@@!R-DLJk%jK*!eOwji+d4AB)GdfCHjT=#FX
zQ0lSYx#rQ+#y-PkMM?eR_d;vxN^Dg;<ll0h2Im;W3?xM{GtW#M&;gLUmU--F8E~z;
zY1cyCPpQ?l|8)ZB54*ktgYyR>4FVql!Ur^;*`<?f(X_6268=SF_TBr+7Y9=YUF@b<
zMEgaI2APpuGO*k+v4IC*3ySe($?td|H}3)?n1bR!=R%jR>B=Ea?Hw5o!2Nrw2js4C
z>2I#KHC*kVh{CQQ5?QwqU<?dvOOB|&uzbLF#MXW=aux@-4^^x+wEuVN-b;GxmQ7>a
z4}=Z`=+Z|Qc5?4iZ<8_^5sN>K4l}Rt!C)4#b^wZNgYr2pe68AA-K~*7WKW>b%9|ZY
zP;G|ukvk#5LY%gf3~dcz37WGzp*m~ZOWEbRu%|%Cu_Rbs>ua_<FdbU0%VF2PtE~Dj
zHMUUXe=Dj<0dA{ZYQ3uox*MM@&Y`^{jw(k!O&RZ&w<J0U8h@~E0wRVNY@}T?qa=?I
zZoTP0oY~7&TADNTiLcGN^PzD{Jr^EYT)U8r2qAg&9Ct3sIgutBGiq_3zI$?h7q%O#
zFuX!oXYe0MDS7$)abFaF)$@?Y+Z>)Wn>(Qxe3(hwU&b~p9(46$`@5dH{)n3fD>BSe
z$D&UX6=4CboWA!iqM)>nST`ce4$33F6WTF~$~qNyg&#AHCFnFpmrly%<1<M=^<_y0
z(_9%DwC)V!(v)uHwSi9?FPH;Ybf!NTsC5c)(<mkf@*7f;3axfUUkqE)N70CAj1|0|
zkMA)sl9fI0un-3T6qJW|0eVPCu-|zP&}*(ccZ@~71u;WZMVn+47(WG!s0d3QGEH?J
zQBkIce;M2${5$;g;)n`aFe%X6JIL7@4O4&$gEi{S$6(<|m`*}%%!)u=;Nb}Wf2&i2
zN$UU9@xnxhzz(NGHln=z3j^8lG5!P$Mqgky>Q|7)8MI9S3ZlTmNQT^Pa%$>G7PU;<
zMhH{Q$izelC<>T~d_!3ZtU!+fYvZ;3D+12{8kh*!5C9We@TCN3|DB(wT64Mnni&cB
Qssy0;@|A4)3)8^=0Pnsk(f|Me

literal 0
HcmV?d00001


From 29348a4b74184b3302839f6a82dfe40656931eb5 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 16 Aug 2016 17:44:24 +0200
Subject: [PATCH 0664/1304] dist: remove quotes from rkt-api.service ExecStart

Fixes #3078
---
 dist/init/systemd/rkt-api.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/init/systemd/rkt-api.service b/dist/init/systemd/rkt-api.service
index c4d8031b94..c07cc386d3 100644
--- a/dist/init/systemd/rkt-api.service
+++ b/dist/init/systemd/rkt-api.service
@@ -4,7 +4,7 @@ Documentation=http://github.com/coreos/rkt
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/rkt api-service --listen="127.0.0.1:15441"
+ExecStart=/usr/bin/rkt api-service --listen=127.0.0.1:15441
 
 [Install]
 WantedBy=multi-user.target

From 8367ae2befc1259b418a52c129a6e0c6e8285cc2 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 16 Aug 2016 15:19:24 +0200
Subject: [PATCH 0665/1304] docs: update app-level API proposal

Bunch o' changes collected over a read through. Various formatting
tweaks/consistency fixes. Some minor re-ordering in an attempt to
enhance reading flow. Purged small parts that didn't make sense to me
or that already seemed to be captured elsewhere.
---
 Documentation/proposals/app-level-api.md | 195 +++++++++++------------
 1 file changed, 90 insertions(+), 105 deletions(-)

diff --git a/Documentation/proposals/app-level-api.md b/Documentation/proposals/app-level-api.md
index db1769bc0f..4485392bc1 100644
--- a/Documentation/proposals/app-level-api.md
+++ b/Documentation/proposals/app-level-api.md
@@ -1,84 +1,96 @@
-# Fine-Grained Pod Manipulations
+# Imperative app-level API for pod manipulation
 
-To provide and API for imperative application operations (e.g. start|stop|add)
+To provide an API for imperative application operations (e.g. start|stop|add)
 inside a pod for finer-grained control over rkt containerization concepts and
 debugging needs, this proposal introduces new stage1 entrypoints and a
 subcommand CLI API that will be used for manipulating applications inside pods.
 
-The motivation behind this change is the direction orchestration systems are
-taking and to facilitate this new direction. For more details, see
+The primary motivation behind this change is to facilitate the new direction
+orchestration systems are taking in how they integrate with container runtimes.
+For more details, see
 [kubernetes#25899](https://github.com/yujuhong/kubernetes/blob/08dc66113399c89e31f6872f3c638695a6ec6a8d/docs/proposals/container-runtime-interface-v1.md).
 
 # API
 
-The envisioned workflow for the app-level CLI API is that after a pod has been started, 
-the users will be invoking the rkt CLI which consist of application logic on top of aforementioned stage1 entrypoints.
+The envisioned workflow for the app-level API is that after a pod has been
+started, users will invoke the rkt CLI to manipulate the pod. The
+implementation behaviour consists of application logic on top of the
+aforementioned stage1 entrypoints.
 
-## rkt app add
-Injects an application image into a running pod.
+The proposed app-level commands are described below.
 
-It first prepares an application rootfs in stage0 for the application image/images
-and then the prepared-app is injected via the entrypoint.
+## `rkt app add`
+Injects an application image into a running pod. After this has been called,
+the app is prepared and ready to be run via `rkt app start`.
+
+It first prepares an application rootfs for the application image, creates a
+runtime manifest for the app, and then injects the prepared app via an
+entrypoint.
 
 ```bash
 rkt app add <pod-uuid> --app=<app-name> <image-name/hash/address/registry-URL> <arguments>
 ```
 
-**Note:** Not every pod will be injectable and it will be enabled through an option.
+**Note:** Not every pod will be injectable; it will be configured through an
+option when the pod is created..
 
-## rkt app rm
-Removes an application image into a running pod, meaning that the leftover resources are removed from the pod.
+## `rkt app start`
+Starts an application that was previously added (injected) to a pod. This
+operation is idempotent; if the specified application is already started, it
+will have no effect.
 
 ```bash
-rkt app rm <pod-uuid> --app=<app-name> <arguments>
+rkt app start <pod-uuid> --app=<app-name> <arguments>
 ```
 
-**Note:** when a pod becomes empty, currently it will terminate, but this
-proposal will introduce a `--mutable` or `--allow-empty` or `--dumb` flag to be
-used when starting pods, so that the lifecycle management of the pod is left to
-the user. Meaning that empty pods won't be terminated.
-
-### Resources Leftover by an Application in Default Stage1 Flavor
-- Rootfs (e.g. `/opt/stage/<app-name>`)
-- Mounts from volumes (e.g. `/opt/stage/<app-name>/<volume-name>`)
-- Mounts related to rkt operations (e.g. `/opt/stage/<app-name>/dev/null`)
-- Systemd service files (e.g. `<app-name>.service` and `reaper-<app-name>.service`)
-- Miscellaneous files (e.g. `/rkt/<app-name>.env`, `/rkt/status...`)
-
-## rkt app start
-Starts an application that was injected.
-This operation is idempotent.
+## `rkt app stop`
+Stops a running application gracefully. Grace is defined in the `app/stop`
+entrypoint section. This does not remove associated resources (see `app rm`).
 
 ```bash
-rkt app start <pod-uuid> --app=<app-name> <arguments>
+rkt app stop <pod-uuid> --app=<app-name>
 ```
 
-## rkt app stop
-Stops a running application gracefully (grace is defined in the `app stop` entrypoint section).
+## `rkt app rm`
+Removes a stopped application from a running pod, including all associated
+resources.
 
 ```bash
-rkt app stop <pod-uuid> --app=<app-name>
+rkt app rm <pod-uuid> --app=<app-name> <arguments>
 ```
 
-## rkt app list
+**Note:** currently, when a pod becomes empty (no apps are running), it will
+terminate. This proposal will introduce a `--mutable` or `--allow-empty` or
+`--dumb` flag to be used when starting pods, so that the lifecycle management
+of the pod is configurable by the user (i.e. it will be possible to create a
+pod that won't be terminated when it is empty).
+
+### Resources left over by a stopped application (in default stage1 flavor)
+- Rootfs (e.g. `/opt/stage2/<app-name>`)
+- Mounts from volumes (e.g. `/opt/stage2/<app-name>/<volume-name>`)
+- Mounts related to rkt operations (e.g. `/opt/stage2/<app-name>/dev/null`)
+- systemd service files (e.g. `<app-name>.service` and `reaper-<app-name>.service`)
+- Miscellaneous files (e.g. `/rkt/<app-name>.env`, `/rkt/status...`)
+
+## `rkt app list`
 Lists the applications that are inside a pod, running or stopped.
 
 ```bash
 rkt app list <pod-uuid> <arguments>
 ```
 
-**Note:** List should consist of an app specifier and status at the very least,
-the rest is up for discussions.
+**Note:** The information returned by list should consist of an app specifier
+and status at the very least, the rest is up for discussion.
 
-## rkt app status
-Returns the execution status of application inside a pod.
+## `rkt app status`
+Returns the execution status of an application inside a pod.
 
 ```bash
 rkt app status <pod-uuid> --app=<app-name> <arguments>
 ```
 
-The returned status information for an example mysql application would contain
-the following details (output format is up for discussion):
+The returned status information for an application would contain the following
+details (output format is up for discussion):
 
 ```go
 type AppStatus struct {
@@ -91,10 +103,11 @@ type AppStatus struct {
 }
 ```
 
-**Note:** status will be obtained from an annotated json file residing in stage1
+**Note:** status will be obtained from an annotated JSON file residing in stage1
 that contains the required information.
+_**OPEN QUESTION**: what is responsible for updating this file? How is concurrent access handled?_
 
-## rkt app exec
+## `rkt app exec`
 Executes a command inside an application.
 
 ```bash
@@ -103,69 +116,42 @@ rkt app exec <pod-uuid> --app=<app-name> <arguments> -- <command> <command-argum
 
 # Entrypoints
 
-In order to facilitate the app-level operations API, 4 new entrypoints are introduced.
-
-For example, the `app start` entrypoint in default stage1 flavor sends a `start` signal
-(similar to `systemctl start`) for the service files of the application to the systemd which is the stage1.
-
-## rkt app add
+In order to facilitate the app-level operations API, four new stage1 entrypoints are introduced.
+Entrypoints are resolved via annotations found within a pod's stage1 manifest
+(e.g. `/var/lib/rkt/pods/run/$uuid/stage1/manifest`).
 
-`coreos.com/rkt/stage1/app/add`
+## `coreos.com/rkt/stage1/app/add`
 
-1. `coreos.com/rkt/stage1/add` entrypoint is resolved via annotations found within `/var/lib/rkt/pods/run/$uuid/stage1/manifest`.
-2. The entrypoint will be executed and passed a reference to the runtime-manifest of the app that was prepared.
-3. Perform setup based on the runtime-manifest of the app.
+The responsibility of this entrypoint is to receive a prepared app and inject it
+into the pod, where it will be started using the `app/start` entrypoint.
 
-The responsibility of this entrypoint is to receive a prepared app, inject it
-into the pod, where it will be started using `app/start` entrypoint.
+The entrypoint should receive a reference to a runtime manifest of the prepared
+app, and perform any necessary setup based on that runtime manifest.
 
-### Stage1 Default Flavor Example Workflow
+## `coreos.com/rkt/stage1/app/rm`
 
-1. Render the application rootfs.
-2. Prepare the application/s
-3. Start the injected application using the `app/start` entrypoint.
-
-This approach is similar to using `rkt run`, instead of creating a new pod,
-an existing pod will be used.
-
-## rkt app rm
-
-`coreos.com/rkt/stage1/app/rm`
+The responsibility of this entrypoint is to remove an app from a pod. After
+`rm`, starting the application again is not possible - the app must be
+re-injected to be re-used.
 
 1. receive a reference to an application that resides inside the pod (running or stopped)
 2. stop the application if its running.
 3. remove the contents of the application (rootfs) from the pod (keep the logs?) and delete references to it (e.g. service files).
-   - Delegate these steps by creating `app/install` and `app/rm` entrypoints?
-
-The responsibility of this entrypoint is to receive an app inside a pod and to remove it from the pod, so that it is ready to be started by the stage1 (e.g. systemd for the default flavor).
-After `rm`, starting the application again is not possible and requires injecting the same
-application using the `app/add` entrypoint.
-
-### Stage1 Default Flavor Example Workflow
-
-1. Stop the application using the `app stop` entrypoint.
-2. Collect the garbage left by the app (e.g. rootfs, unit files, etc.)
-3. Reload the systemd daemon for changes to take place without disturbing the other tennant applications.
-
-## rkt app start
 
-`coreos.com/rkt/stage1/app/start`
+## `coreos.com/rkt/stage1/app/start`
 
-1. given a reference to an application that's in the `Prepared` state, start the application.
+The responsibility of this entrypoint is to start an application that is in the
+`Prepared` state, which is an app that was recently injected.
 
-The responsibility of this entrypoint is to start an application that is in the `Prepared` state, 
-which is an app that was recently injected, instruct the stage1 to start the application.
+## `coreos.com/rkt/stage1/app/stop`
 
-## rkt app stop
+The responsibility of this entrypoint is to stop an application that is
+in the `Running` state, by instructing the stage1.
 
-`coreos.com/rkt/stage1/app/stop`
-
-1. given a reference to an application that's in the `Running` state (see below), instruct the stage1 to stop the application.
-
-The responsibility of this entrypoint is to stop an application that is `Running` by instructing the stage1. 
-
-**Note:** there is a graceful shutdown which sends the termination signal to application and waits for a grace period
-for application to terminate and then the application is shutdown if it doesn't terminate by the end of the grace period.
+rkt will attempt a _graceful shutdown_: sending a termination signal
+(i.e. `SIGTERM`) to application and waiting for a grace period for the
+application to exit. If the application does not terminate by the end of the
+grace period, rkt will forcefully shut it down (i.e. `SIGKILL`).
 
 # App States
 
@@ -190,41 +176,40 @@ const (
 	// Apps that finish their execution naturally.
 	ExitedAppState AppState = "exited"
 
-	// Once an app is marked for ejection, while the ejection is being
+	// Once an app is marked for removal, while the removal is being
 	// performed, no further operations can be done on that app.
 	DeletingAppState AppState = "deleting"
 )
 ```
 
-**Note:** State transitions are linear in that an app that is in state `Exited` cannot transition into `Running` state.
+**Note:** State transitions are linear; an app that is in state `Exited` cannot
+transition into `Running` state.
+_**OPEN QUESTION** can a stopped app not be restarted?_
 
 # Use Cases
 
-## Low-level  Pods
+## Low-level Pod Control
 
-Grant granular access to pods for orchestration systems and allow orchestration systems to develop their
-own pod concept on top of the exposed app-level operations.
+Grant granular access to pods for orchestration systems and allow orchestration
+systems to develop their own pod concept on top of the exposed app-level
+operations.
 
-### Workflow
+### Example Workflow
 
 1. Create an empty pod (specified via an option that allows empty pods to stay alive).
 2. Inject applications into the pod.
 3. Orchestrate the workflow of applications (e.g. app1 has to terminate successfully before app2).
 
-## Pod Mutability
+## Updates
 
 Enable in-place updates of a pod without disrupting the operations of the pod.
 
-### Workflow
+### Example Workflow
 
-1. Remove the old applications without disturbing/restarting the whole pod.
+1. Remove old applications without disturbing/restarting the whole pod.
 2. Inject updated applications.
 3. Start the updated applications.
 
-### Note
-
-Allows the consumers to perform rolling updates inside running pods.
-
 ## Debugging Pods
 
 Allow users to inject debug applications into a pod in production.
@@ -233,5 +218,5 @@ Allow users to inject debug applications into a pod in production.
 
 1. Deploy an application containing only a Go web service binary.
 2. Encounter an error not decipherable via the available information (e.g. status info, logs, etc.).
-3. Inject a debug ACI containing binaries (e.g. `lsof`) for debugging the service.
+3. Add a debug app image containing binaries (e.g. `lsof`) for debugging the service.
 4. Enter the pod namespace and use the debug binaries.

From 7983e0b6cd51d8218581140939a00d3d06c99f23 Mon Sep 17 00:00:00 2001
From: Tim Dettrick <t.dettrick@uq.edu.au>
Date: Tue, 16 Aug 2016 15:37:42 +1000
Subject: [PATCH 0666/1304] export: test export for multi-app pods

test uses app name specification and a patched test ACI which writes a
file with different content

Fixes #3054
---
 tests/rkt_export_container_test.go |  6 +++++-
 tests/rkt_export_test.go           | 31 +++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/tests/rkt_export_container_test.go b/tests/rkt_export_container_test.go
index 90ce704072..90d2b39d25 100644
--- a/tests/rkt_export_container_test.go
+++ b/tests/rkt_export_container_test.go
@@ -23,7 +23,11 @@ import (
 )
 
 func TestExport(t *testing.T) {
-	testCases := []ExportTestCase{noOverlaySimpleTest, specifiedAppTest}
+	testCases := []ExportTestCase{
+		noOverlaySimpleTest,
+		specifiedAppTest,
+		multiAppPodTest,
+	}
 
 	// Need to do both checks
 	if common.SupportsUserNS() && checkUserNS() == nil {
diff --git a/tests/rkt_export_test.go b/tests/rkt_export_test.go
index a96d4bb15b..e873a7d1e0 100644
--- a/tests/rkt_export_test.go
+++ b/tests/rkt_export_test.go
@@ -35,6 +35,7 @@ type ExportTestCase struct {
 	exportArgs     string
 	expectedResult string
 	unmountOverlay bool
+	multiAppPod    bool
 }
 
 type exportTest []ExportTestCase
@@ -47,6 +48,7 @@ var (
 		"",
 		testContent,
 		false,
+		false,
 	}
 
 	specifiedAppTest = ExportTestCase{
@@ -56,6 +58,17 @@ var (
 		"--app=rkt-inspect",
 		testContent,
 		false,
+		false,
+	}
+
+	multiAppPodTest = ExportTestCase{
+		"--no-overlay --insecure-options=image",
+		"--write-file --file-name=" + testFile + " --content=" + testContent,
+		"--read-file --file-name=" + testFile,
+		"--app=rkt-inspect",
+		testContent,
+		false,
+		true,
 	}
 
 	userNS = ExportTestCase{
@@ -65,6 +78,7 @@ var (
 		"",
 		testContent,
 		false,
+		false,
 	}
 
 	overlaySimpleTest = ExportTestCase{
@@ -74,6 +88,7 @@ var (
 		"",
 		testContent,
 		false,
+		false,
 	}
 
 	overlaySimulateReboot = ExportTestCase{
@@ -83,6 +98,7 @@ var (
 		"",
 		testContent,
 		true,
+		false,
 	}
 )
 
@@ -102,8 +118,17 @@ func (ct ExportTestCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
 	tmpTestAci := filepath.Join(tmpDir, "test.aci")
 
 	// Prepare the image with modifications
-	const runInspect = "%s %s %s %s --exec=/inspect -- %s"
-	prepareCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "prepare", ct.runArgs, getInspectImagePath(), ct.writeArgs)
+	var additionalRunArgs string
+	if ct.multiAppPod {
+		tmpAdditionalAci := patchTestACI("other.aci", "--name=other")
+		defer os.Remove(tmpAdditionalAci)
+		const otherArgs = "--write-file --file-name=test.txt --content=NotTheRightContent"
+		additionalRunArgs = fmt.Sprintf("%s --exec=/inspect -- %s", tmpAdditionalAci, otherArgs)
+	} else {
+		additionalRunArgs = ""
+	}
+	const runInspect = "%s %s %s %s --exec=/inspect -- %s --- %s"
+	prepareCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "prepare", ct.runArgs, getInspectImagePath(), ct.writeArgs, additionalRunArgs)
 	t.Logf("Preparing 'inspect --write-file'")
 	uuid := runRktAndGetUUID(t, prepareCmd)
 
@@ -123,7 +148,7 @@ func (ct ExportTestCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
 	waitOrFail(t, child, 0)
 
 	// Run the newly created ACI and check the output
-	readCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "run", ct.runArgs, tmpTestAci, ct.readArgs)
+	readCmd := fmt.Sprintf(runInspect, ctx.Cmd(), "run", ct.runArgs, tmpTestAci, ct.readArgs, "")
 	t.Logf("Running 'inspect --read-file'")
 	child = spawnOrFail(t, readCmd)
 	if ct.expectedResult != "" {

From 49e6b77698e85b4fba8155348319a418597762f5 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 17 Aug 2016 13:09:50 +0200
Subject: [PATCH 0667/1304] Documentation/trying-out-rkt: document the assigned
 pod IP address

The tutorial doesn't make it obvious why the started pod is available
under http://172.16.28.2. This fixes it by improving the documentation.

Supersedes #3080
---
 Documentation/trying-out-rkt.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index df155de6c6..065c6fffcb 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -121,7 +121,7 @@ UUID		APP	IMAGE NAME					STATE	CREATED		STARTED		NETWORKS
 0c3ab969	nginx	registry-1.docker.io/library/nginx:latest	running	2 minutes ago	2 minutes ago	default:ip4=172.16.28.2
 ```
 
-The nginx container is now accessible on the host under http://172.16.28.2.
+In this example, the nginx container was assigned the IP address 172.16.28.2 (the address assigned on your system may vary). Since we established a route from the host to the `172.16.28.0/24` pod network the nginx container is now accessible on the host under http://172.16.28.2.
 
 Success! The rest of the guide can now be followed normally.
 

From ad40b82e712c04a256ecce1456e2cfd8649c0ebf Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 17 Aug 2016 14:20:58 +0200
Subject: [PATCH 0668/1304] rkt/pubkey: use custom http client including
 timeout

Currently public keys are being loaded using the http#DefaultClient. While
this specifies some timeouts, it does not specify a total client
timeout.

This can cause rkt to hang forever when reading from a faulty remote
server.

Also, currently the http#DefaultClient struct is being shallow-copied to
optionally set the InsecureSkipVerify flag. This causes `go vet` to
complain starting from Go 1.7 because this copies the the internal mutex
lock value.

This fixes both of the above by using a custom http client
configuration, and setting a client timeout.

See
https://blog.cloudflare.com/the-complete-guide-to-golang-net-http-timeouts/#clienttimeouts

Supersedes #3062
---
 rkt/pubkey/pubkey.go | 57 +++++++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/rkt/pubkey/pubkey.go b/rkt/pubkey/pubkey.go
index ea53b6096f..6ff4df9838 100644
--- a/rkt/pubkey/pubkey.go
+++ b/rkt/pubkey/pubkey.go
@@ -21,10 +21,12 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/coreos/rkt/pkg/keystore"
 	rktlog "github.com/coreos/rkt/pkg/log"
@@ -52,8 +54,13 @@ const (
 	AcceptAsk
 )
 
-var log *rktlog.Logger
-var stdout *rktlog.Logger = rktlog.New(os.Stdout, "", false)
+var (
+	log    *rktlog.Logger
+	stdout *rktlog.Logger = rktlog.New(os.Stdout, "", false)
+
+	secureClient   = newClient(false)
+	insecureClient = newClient(true)
+)
 
 func ensureLogger(debug bool) {
 	if log == nil {
@@ -210,7 +217,13 @@ func downloadKey(u *url.URL, skipTLSCheck bool) (*os.File, error) {
 
 	// TODO(krnowak): we should probably apply credential headers
 	// from config here
-	client := getClient(skipTLSCheck)
+	var client *http.Client
+	if skipTLSCheck {
+		client = insecureClient
+	} else {
+		client = secureClient
+	}
+
 	res, err := client.Get(u.String())
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error getting key"), err)
@@ -234,22 +247,32 @@ func downloadKey(u *url.URL, skipTLSCheck bool) (*os.File, error) {
 	return retTf, nil
 }
 
-func getClient(skipTLSCheck bool) *http.Client {
-	if !skipTLSCheck {
-		return http.DefaultClient
+func newClient(skipTLSCheck bool) *http.Client {
+	dialer := &net.Dialer{
+		Timeout:   30 * time.Second,
+		KeepAlive: 30 * time.Second,
+	} // values taken from stdlib v1.5.3
+
+	tr := &http.Transport{
+		Proxy:               http.ProxyFromEnvironment,
+		Dial:                dialer.Dial,
+		TLSHandshakeTimeout: 10 * time.Second,
+	} // values taken from stdlib v1.5.3
+
+	if skipTLSCheck {
+		tr.TLSClientConfig = &tls.Config{
+			InsecureSkipVerify: true,
+		}
 	}
-	client := *http.DefaultClient
-	// Default transport is hidden behind the RoundTripper
-	// interface, so we can't easily make a copy of it. If this
-	// ever panics, we will have to adapt.
-	realTransport := http.DefaultTransport.(*http.Transport)
-	tr := *realTransport
-	if tr.TLSClientConfig == nil {
-		tr.TLSClientConfig = &tls.Config{}
+
+	return &http.Client{
+		Transport: tr,
+
+		// keys are rather small, long download times are not expected, hence setting a client timeout.
+		// firefox uses a 30s read timeout, being pessimistic bump to 2 minutes.
+		// Note that this includes connection, and tls handshake times, see https://blog.cloudflare.com/the-complete-guide-to-golang-net-http-timeouts/#clienttimeouts
+		Timeout: 2 * time.Minute,
 	}
-	tr.TLSClientConfig.InsecureSkipVerify = true
-	client.Transport = &tr
-	return &client
 }
 
 // displayKey shows the key summary

From 1c2bbdabcb460d33268d395a78ce65be026f6808 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 16 Aug 2016 15:22:21 +0200
Subject: [PATCH 0669/1304] travis: take go 1.7 for a whirl

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 32094d75be..f2872b6150 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ dist: trusty
 go:
   - 1.5.3
   - 1.6
+  - 1.7
 
 env:
   - TARGET=amd64

From bb40f0216ae1c2f679f35a12146d2dadcb510a1f Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 18 Aug 2016 14:14:44 +0200
Subject: [PATCH 0670/1304] travis: pin specific 1.6 version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f2872b6150..e7087cca7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ dist: trusty
 
 go:
   - 1.5.3
-  - 1.6
+  - 1.6.2
   - 1.7
 
 env:

From 2caa4a1dd791b45c9a2a01a44cca8dfdc79382eb Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 18 Aug 2016 14:16:09 +0200
Subject: [PATCH 0671/1304] travis: bump to go 1.5.4 and go 1.6.3

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e7087cca7f..7f30f9051d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ sudo: required
 dist: trusty
 
 go:
-  - 1.5.3
-  - 1.6.2
+  - 1.5.4
+  - 1.6.3
   - 1.7
 
 env:

From 4d403da1afc19aeeb37e484b4c60f9af44f7bffd Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 18 Aug 2016 13:51:42 +0000
Subject: [PATCH 0672/1304] version: bump to v1.13.0

---
 CHANGELOG.md                         | 33 ++++++++++++++++++++++++++
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-lkvm-stage1.md |  4 ++--
 Documentation/subcommands/prepare.md |  2 +-
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 ++---
 ROADMAP.md                           | 35 +++++++++++++++++++++-------
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 17 files changed, 78 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d482ac056c..3e6b728c71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,36 @@
+## 1.13.0
+
+This release introduces support for exporting single applications out of multi-app pods. Moreover, it adds additional support to control device manipulation inside pods. Finally all runtime security features can now be optionally disabled at the pod level via new insecure options. This version also contains multiple bugfixes and supports Go 1.7.
+
+### New features and UX changes
+
+- export: name flag for exporting multi-app pods ([#3030](https://github.com/coreos/rkt/pull/3030)).
+- stage1: limit device node creation/reading/writing with DevicePolicy= and DeviceAllow= ([#3027](https://github.com/coreos/rkt/pull/3027), [#3058](https://github.com/coreos/rkt/pull/3058)).
+- rkt: implements --insecure-options={capabilities,paths,seccomp,run-all} ([#2983](https://github.com/coreos/rkt/pull/2983)).
+
+#### Bug fixes
+
+- kvm: use a properly formatted comment for iptables chains ([#3038](https://github.com/coreos/rkt/pull/3038)). rkt was using the chain name as comment, which could lead to confusion.
+- pkg/label: supply mcsdir as function argument to InitLabels() ([#3045](https://github.com/coreos/rkt/pull/3045)).
+- api_service: improve machined call error output ([#3059](https://github.com/coreos/rkt/pull/3059)).
+- general: fix old appc/spec version in various files ([#3055](https://github.com/coreos/rkt/pull/3055)).
+- rkt/pubkey: use custom http client including timeout ([#3084](https://github.com/coreos/rkt/pull/3084)).
+- dist: remove quotes from rkt-api.service ExecStart ([#3079](https://github.com/coreos/rkt/pull/3079)).
+- build: multiple fixes ([#3042](https://github.com/coreos/rkt/pull/3042), [#3041](https://github.com/coreos/rkt/pull/3041), [#3046](https://github.com/coreos/rkt/pull/3046)).
+- configure: disable tests on host flavor with systemd <227 ([#3047](https://github.com/coreos/rkt/pull/3047)).
+
+#### Other changes
+
+- travis: add go 1.7, bump go 1.5/1.6 ([#3077](https://github.com/coreos/rkt/pull/3077)).
+- api_service: Add lru cache to cache image info ([#2910](https://github.com/coreos/rkt/pull/2910)).
+- scripts: add curl as build dependency ([#3070](https://github.com/coreos/rkt/pull/3070)).
+- vendor: use appc/spec 0.8.6 and k8s.io/kubernetes v1.3.0 ([#3063](https://github.com/coreos/rkt/pull/3063)).
+- common: use fileutil.IsExecutable() ([#3023](https://github.com/coreos/rkt/pull/3023)).
+- build: Stop printing irrelevant invalidation messages ([#3050](https://github.com/coreos/rkt/pull/3050)).
+- build: Make generating clean files simpler to do ([#3057](https://github.com/coreos/rkt/pull/3057)).
+- Documentation: misc changes ([#3053](https://github.com/coreos/rkt/pull/3053), [#2911](https://github.com/coreos/rkt/pull/2911), [#3035](https://github.com/coreos/rkt/pull/3035), [#3036](https://github.com/coreos/rkt/pull/3036), [#3037](https://github.com/coreos/rkt/pull/3037), [#2945](https://github.com/coreos/rkt/pull/2945), [#3083](https://github.com/coreos/rkt/pull/3083), [#3076](https://github.com/coreos/rkt/pull/3076), [#3033](https://github.com/coreos/rkt/pull/3033), [#3064](https://github.com/coreos/rkt/pull/3064), [#2932](https://github.com/coreos/rkt/pull/2932)).
+- functional tests: misc fixes ([#3049](https://github.com/coreos/rkt/pull/3049)).
+
 ## 1.12.0
 
 This release introduces support for seccomp filtering via two new seccomp isolators. It also gives a boost to api-service performance by introducing manifest caching. Finally it fixes several regressions related to Docker images handling.
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index e238fc7934..97cdd9d0ca 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.12.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.13.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.12.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.13.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index f80709fe2a..419c041ca9 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.12.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.13.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.12.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.13.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 3d5feec771..0ade2d3ba7 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -14,7 +14,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.12.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.13.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 36681e5578..722ec5a24b 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.12.0
+rkt Version: 1.13.0
 appc Version: 0.8.6
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 065c6fffcb..2bc0fa1b43 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.12.0/rkt-v1.12.0.tar.gz
-tar xzvf rkt-v1.12.0.tar.gz
-cd rkt-v1.12.0
+wget https://github.com/coreos/rkt/releases/download/v1.13.0/rkt-v1.13.0.tar.gz
+tar xzvf rkt-v1.13.0.tar.gz
+cd rkt-v1.13.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 35159dcb8c..88743651d7 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,15 +9,32 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-### rkt 1.12.0 (August)
+### rkt 1.14.0 (September)
 
-- stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
-- further improvements for SELinux environments, especially Fedora in enforcing mode
-- enhanced DNS configuration [#2044](https://github.com/coreos/rkt/issues/2044)
-- packaged for more distributions
-  - CentOS [#1305](https://github.com/coreos/rkt/issues/1305)
+Full plan at https://github.com/coreos/rkt/milestone/48.
 
-### rkt 1.13.0 (August)
+Highlights:
+- Introduce support for systemd v231 in stage1
+- Refactor distribution/storage handling
+- Improved native support for OCI
+- Cleanup/unify cgroup detection
 
-- `rkt fly` as top-level command [#1889](https://github.com/coreos/rkt/issues/1889)
-- user configuration for stage1 [#2013](https://github.com/coreos/rkt/issues/2013)
+### rkt 1.15.0 (September)
+
+Full plan at https://github.com/coreos/rkt/milestone/49.
+
+Highlights:
+- Enhanced DNS configuration
+- Further improvements for SELinux environments, especially Fedora in enforcing mode
+- Support for unified cgroups
+
+### Upcoming
+
+Full plan at https://github.com/coreos/rkt/milestone/30.
+
+Highlights:
+- `rkt fly` as top-level command
+- User configuration for stage1
+- Stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
+- Packaged for more distributions
+  - CentOS
diff --git a/configure.ac b/configure.ac
index 26c95cefc4..1feaa8f099 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.12.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.13.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 77288d657d..04e949b8e7 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.12.0"
+version="1.13.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 450b9d7228..b489d6a443 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.12.0"
+            "value": "1.13.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index bc483493db..421d684f86 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.12.0"
+            "value": "1.13.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 9c4654a027..e41e2a8092 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -28,7 +28,7 @@ trap acbuildEnd EXIT
 
 acbuild --debug set-name appc.io/rkt-"${1}"-stresser
 
-acbuild --debug copy build-rkt-1.12.0+git/target/bin/"${1}"-stresser /worker
+acbuild --debug copy build-rkt-1.13.0/target/bin/"${1}"-stresser /worker
 
 acbuild --debug set-exec -- /worker
 
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index fb50b01486..2dec988556 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 90ac780e78..3dcfb74d7a 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 81a4e6352d..c05eb34115 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 9f987cef37..bbbd456ac1 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 078e6d5f2f..bc1cc88076 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.12.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 82d9464f4e33cf35b25460b64fbaaea1f008dc01 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 18 Aug 2016 13:51:43 +0000
Subject: [PATCH 0673/1304] version: bump to v1.13.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1feaa8f099..a565a0440a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.13.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.13.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index e41e2a8092..1116be4332 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -28,7 +28,7 @@ trap acbuildEnd EXIT
 
 acbuild --debug set-name appc.io/rkt-"${1}"-stresser
 
-acbuild --debug copy build-rkt-1.13.0/target/bin/"${1}"-stresser /worker
+acbuild --debug copy build-rkt-1.13.0+git/target/bin/"${1}"-stresser /worker
 
 acbuild --debug set-exec -- /worker
 

From ec7d0cb4bfb79057f0f98d01792d123e381bd53e Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 18 Aug 2016 16:29:47 +0000
Subject: [PATCH 0674/1304] scripts: bump coreos.com/rkt/builder image version

This bumps rkt-builder version to 1.0.2, in order to work with
seccomp filtering.
---
 scripts/build-rir.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index dd8177293b..3335e41891 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.0.1}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.0.2}"
 
 mkdir -p $BUILDDIR
 

From d1b7e51c7cd955a66c1ba8fc8818160353a8432d Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Wed, 17 Aug 2016 15:04:31 -0700
Subject: [PATCH 0675/1304] Documentation/run: standardize the option table a
 bit

---
 Documentation/subcommands/run.md | 44 ++++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 049679b774..4ebfd4bd68 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -219,7 +219,7 @@ Let's say we want to read data from the host directory `/opt/tenant1/work` to po
 We'll call this app `example.com/reduce-worker`.
 
 We also want this data to be available to a backup application that runs alongside the worker (in the same pod).
-We'll call this app 'example.com/worker-backup`.
+We'll call this app `example.com/worker-backup`.
 The backup application only needs read-only access to the data.
 
 Below we show the abbreviated manifests for the respective applications (recall that the manifest is bundled into the application's ACI):
@@ -344,38 +344,38 @@ For more details see the [hacking documentation](../hacking.md).
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--caps-remove` | none | capability to remove (example: '--caps-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
-| `--caps-retain` | none | capability to retain (example: '--caps-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
-| `--cpu` | none | CPU units (ex. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
-| `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times |
-| `--dns-opt` | none | DNS option  | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
+| `--caps-remove` | none | capability to remove (e.g. `--caps-remove=CAP_SYS_CHROOT,CAP_MKNOD`) | Capabilities to remove from the process's capabilities bounding set; all others from the default set will be included. |
+| `--caps-retain` | none | capability to retain (e.g. `--caps-retain=CAP_SYS_ADMIN,CAP_NET_ADMIN`) | Capabilities to retain in the process's capabilities bounding set; all others will be removed. |
+| `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
+| `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times. |
+| `--dns-opt` | none | DNS option | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
-| `--group` | root | gid, groupname or file path | Group override for the preceding image (example: '--group=group') |
-| `--hostname` | "rkt-$PODUUID" | A host name | Set pod's host name. |
+| `--group` | root | gid, groupname or file path (e.g. `--group=core`) | Group override for the preceding image. |
+| `--hostname` | `rkt-$PODUUID` | A host name | Set pod's host name. |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
 | `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
 | `--mds-register` | `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net` as `default`, `default-restricted`, or `host`). |
-| `--memory` | none | Memory units (ex. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
-| `--mount` | none | Mount syntax (ex. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
-| `--net` | `default` | A comma-separated list of networks. (ex. `--net[=n[:args], ...]`) | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. |
+| `--memory` | none | Memory units (e.g. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
+| `--mount` | none | Mount syntax (e.g. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
+| `--net` | `default` | A comma-separated list of networks. (e.g. `--net[=n[:args], ...]`) | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
-| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
+| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md). |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
-| `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network](../networking/overview.md#contained-mode). Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080` |
-| `--private-users` |  `false` | `true` or `false` | Run within user namespaces. |
-| `--set-env` | none | An environment variable (ex. `--set-env=NAME=VALUE`) | An environment variable to set for apps. |
-| `--set-env-file` |  `` | Path of an environment variables file (ex. `--set-env-file=/path/to/env/file`) | Environment variables to set for apps |
-| `--signature` | none | A file path | Local signature file to use in validating the preceding image |
-| `--stage1-from-dir` | none | Image name (ex. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A stage1 image file name to search for inside the default stage1 images directory. |
-| `--stage1-hash` | none | Image hash (ex. `--stage1-hash=sha512-dedce9f5ea50`) | A hash of a stage1 image. The image must exist in the store. |
-| `--stage1-name` | none | Image name (ex. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A name of a stage1 image. Will perform a discovery if the image is not in the store. |
+| `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network](../networking/overview.md#contained-mode). Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080`. |
+| `--private-users` | `false` | `true` or `false` | Run within user namespaces. |
+| `--set-env` | none | An environment variable (e.g. `--set-env=NAME=VALUE`) | An environment variable to set for apps. |
+| `--set-env-file` | none | Path of an environment variables file (e.g. `--set-env-file=/path/to/env/file`) | Environment variables to set for apps. |
+| `--signature` | none | A file path | Local signature file to use in validating the preceding image. |
+| `--stage1-from-dir` | none | Image name (e.g. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A stage1 image file name to search for inside the default stage1 images directory. |
+| `--stage1-hash` | none | Image hash (e.g. `--stage1-hash=sha512-dedce9f5ea50`) | A hash of a stage1 image. The image must exist in the store. |
+| `--stage1-name` | none | Image name (e.g. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A name of a stage1 image. Will perform a discovery if the image is not in the store. |
 | `--stage1-path` | none | Absolute or relative path | A path to a stage1 image. |
 | `--stage1-url` | none | URL with protocol | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported. |
 | `--store-only` | `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md). |
-| `--user` | none | uid, username or file path | user override for the preceding image (example: '--user=user') |
+| `--user` | none | uid, username or file path (e.g. `--user=core`) | User override for the preceding image. |
 | `--uuid-file-save` | none | A file path | Write out the pod UUID to a file. |
-| `--volume` |  none | Volume syntax (ex. `--volume NAME,kind=KIND,source=PATH,readOnly=BOOL`) | Volumes to make available in the pod. See [Mount Volumes into a Pod](#mount-volumes-into-a-pod). |
+| `--volume` | none | Volume syntax (e.g. `--volume NAME,kind=KIND,source=PATH,readOnly=BOOL`) | Volumes to make available in the pod. See [Mount Volumes into a Pod](#mount-volumes-into-a-pod). |
 
 ## Global options
 

From 9a9e2982b50bc9bce0768b1feba4063a20be32d0 Mon Sep 17 00:00:00 2001
From: HuKeping <hukeping@huawei.com>
Date: Fri, 19 Aug 2016 11:33:21 +0800
Subject: [PATCH 0676/1304] Docs: minor typo

Signed-off-by: Hu Keping <hukeping@huawei.com>
---
 Documentation/devel/architecture.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index 24b80b9f91..8823c23a2c 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -67,7 +67,7 @@ where:
 - `stage1` is a copy of the stage1 ACI that is safe for read/write
 - `stage1/manifest` is the manifest of the stage1 ACI
 - `stage1/rootfs` is the rootfs of the stage1 ACI
-- `stage1/rootfs/init` is the actual stage1 binary to be executed (this path may vary according to the `coreos.com/rkt/stage1/run` Annotation of the stage1 ACI)
+- `stage1/rootfs/init` is the actual stage1 binary to be executed (this path may vary according to the `coreos.com/rkt/stage1/run` annotation of the stage1 ACI)
 - `stage1/rootfs/opt/stage2` are copies of the unpacked ACIs
 
 At this point the stage0 execs `/stage1/rootfs/init` with the current working directory set to the root of the new filesystem.

From 61ebe32eeab6d1356dc753d1cdce22bd4f980bc5 Mon Sep 17 00:00:00 2001
From: HuKeping <hukeping@huawei.com>
Date: Thu, 18 Aug 2016 19:22:55 +0800
Subject: [PATCH 0677/1304] docs: remove hyperlink from URL

The "http://172.28.128.3" should be shown as a link, and so does
the "http://172.28.128.2".

Signed-off-by: Hu Keping <hukeping@huawei.com>
---
 Documentation/trying-out-rkt.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 2bc0fa1b43..2696929c38 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -96,7 +96,7 @@ The following command starts an `nginx` container, for simplicity using [*host n
 sudo rkt run --net=host --insecure-options=image docker://nginx
 ```
 
-The nginx container is now accessible on the host under http://172.28.128.3.
+The nginx container is now accessible on the host under `http://172.28.128.3`.
 
 In order to use containers with the default [*contained network*][contained-network], a route to the 172.16.28.0/24 container network must be configured from the host through the VM:
 
@@ -121,7 +121,7 @@ UUID		APP	IMAGE NAME					STATE	CREATED		STARTED		NETWORKS
 0c3ab969	nginx	registry-1.docker.io/library/nginx:latest	running	2 minutes ago	2 minutes ago	default:ip4=172.16.28.2
 ```
 
-In this example, the nginx container was assigned the IP address 172.16.28.2 (the address assigned on your system may vary). Since we established a route from the host to the `172.16.28.0/24` pod network the nginx container is now accessible on the host under http://172.16.28.2.
+In this example, the nginx container was assigned the IP address 172.16.28.2 (the address assigned on your system may vary). Since we established a route from the host to the `172.16.28.0/24` pod network the nginx container is now accessible on the host under `http://172.16.28.2`.
 
 Success! The rest of the guide can now be followed normally.
 

From 1aca9f714f74a21bb8e7a91ce14634692f319dc4 Mon Sep 17 00:00:00 2001
From: HuKeping <hukeping@huawei.com>
Date: Fri, 19 Aug 2016 16:16:14 +0800
Subject: [PATCH 0678/1304] Docs: fix broken hyperlink

Signed-off-by: Hu Keping <hukeping@huawei.com>
---
 Documentation/devel/stage1-implementors-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index c193964b81..79636f1828 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -58,7 +58,7 @@ Stage1 implementors have two options for doing so; only one must be implemented:
 
 * `--debug` to activate debugging
 * `--net[=$NET1,$NET2,...]` to configure the creation of a contained network.
-  See the [rkt networking documentation](../networking.html) for details.
+  See the [rkt networking documentation](../networking/overview.md) for details.
 * `--mds-token=$TOKEN` passes the auth token to the apps via `AC_METADATA_URL` env var
 * `--interactive` to run a pod interactively, that is, pass standard input to the application (only for pods with one application)
 * `--local-config=$PATH` to override the local configuration directory

From 540ee077cd4ef08a114ab0a4957e7e88a4aca05b Mon Sep 17 00:00:00 2001
From: HuKeping <hukeping@huawei.com>
Date: Fri, 19 Aug 2016 16:16:14 +0800
Subject: [PATCH 0679/1304] Docs: some review on stage1-implementors-guide.md

This patch :
- Remove duplicate words
- Keep the format of "Entrypoints(run,enter,gc,stop)" consistent
- Fix typo

Signed-off-by: Hu Keping <hukeping@huawei.com>
---
 Documentation/devel/stage1-implementors-guide.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 79636f1828..5a66cb4803 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -62,7 +62,7 @@ Stage1 implementors have two options for doing so; only one must be implemented:
 * `--mds-token=$TOKEN` passes the auth token to the apps via `AC_METADATA_URL` env var
 * `--interactive` to run a pod interactively, that is, pass standard input to the application (only for pods with one application)
 * `--local-config=$PATH` to override the local configuration directory
-* `--private-users=$SHIFT` to define a UID/GID shift when using user namespaces. SHIFT is a two-value colon-separated parameter, the first value is the first host UID to assign to the container and the second one is the number of host UIDs to assign.
+* `--private-users=$SHIFT` to define a UID/GID shift when using user namespaces. SHIFT is a two-value colon-separated parameter, the first value is the host UID to assign to the container and the second one is the number of host UIDs to assign.
 
 #### Arguments added in interface version 2
 
@@ -110,11 +110,13 @@ For example, it removes the network namespace of a pod.
 * `--debug` to activate debugging
 * UUID of the pod
 
-### `rkt stop` => "coreos.com/rkt/stage1/stop"
+### rkt stop
+
+`coreos.com/rkt/stage1/stop`
 
 The optional stop entrypoint initiates an orderly shutdown of stage1.
 
-In the bundled rkt stage 1, the entrypoint is sending SIGTERM signal to systemd-nspawn. Fore kvm flavor, it is calling `systemctl halt` on the container (through SSH) for kvm flavor
+In the bundled rkt stage 1, the entrypoint is sending SIGTERM signal to systemd-nspawn. For kvm flavor, it is calling `systemctl halt` on the container (through SSH).
 
 #### Arguments
 

From f885fdf83072d322bc44ad696f6c5711e5e030ea Mon Sep 17 00:00:00 2001
From: HuKeping <hukeping@huawei.com>
Date: Fri, 19 Aug 2016 17:14:26 +0800
Subject: [PATCH 0680/1304] stage0: fix golint warnings

Signed-off-by: Hu Keping <hukeping@huawei.com>
---
 stage0/arch.go         | 1 +
 stage0/gc.go           | 4 ++--
 stage0/gc_test.go      | 4 ++--
 stage0/registration.go | 1 +
 stage0/run.go          | 7 ++++---
 stage0/stop.go         | 1 +
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/stage0/arch.go b/stage0/arch.go
index 441dacb742..589e7f455e 100644
--- a/stage0/arch.go
+++ b/stage0/arch.go
@@ -14,6 +14,7 @@
 
 package stage0
 
+// ValidOSArch contains the supported ACI image OS/architecture combinations.
 var ValidOSArch = map[string][]string{
 	"linux": {"amd64", "i386", "aarch64", "aarch64_be", "armv6l", "armv7l", "armv7b"},
 }
diff --git a/stage0/gc.go b/stage0/gc.go
index 3f548611a0..34e61517f5 100644
--- a/stage0/gc.go
+++ b/stage0/gc.go
@@ -83,7 +83,7 @@ func (m mounts) getMountDepth(i int) int {
 		found = false
 		for _, mnt := range m {
 			if mnt.id == current.parentID {
-				ancestorCount += 1
+				ancestorCount++
 				current = mnt
 				found = true
 				break
@@ -189,7 +189,7 @@ func MountGC(path, uuid string) error {
 		return errwrap.Wrap(fmt.Errorf("error getting mounts for pod %s from mountinfo", uuid), err)
 	}
 
-	for i := len(mnts) - 1; i >= 0; i -= 1 {
+	for i := len(mnts) - 1; i >= 0; i-- {
 		mnt := mnts[i]
 		if needsRemountPrivate(mnt) {
 			if err := syscall.Mount("", mnt.mountPoint, "", syscall.MS_PRIVATE, ""); err != nil {
diff --git a/stage0/gc_test.go b/stage0/gc_test.go
index 8be0381abc..405ec86505 100644
--- a/stage0/gc_test.go
+++ b/stage0/gc_test.go
@@ -104,11 +104,11 @@ func TestMountOrdering(t *testing.T) {
 		}
 
 		requestedRemounts := 0
-		for i := len(mnts) - 1; i >= 0; i -= 1 {
+		for i := len(mnts) - 1; i >= 0; i-- {
 			mnt := mnts[i]
 			if needsRemountPrivate(mnt) {
 				t.Logf("remounting: %+v", mnt)
-				requestedRemounts += 1
+				requestedRemounts++
 			}
 		}
 
diff --git a/stage0/registration.go b/stage0/registration.go
index 9a7cd6aad2..c1e7d744bc 100644
--- a/stage0/registration.go
+++ b/stage0/registration.go
@@ -192,6 +192,7 @@ func httpRequest(method, pth string, body io.Reader) error {
 	return err
 }
 
+// CheckMdsAvailability checks whether a local metadata service can be reached.
 func CheckMdsAvailability() error {
 	if conn, err := net.Dial("unix", common.MetadataServiceRegSock); err != nil {
 		return errUnreachable
diff --git a/stage0/run.go b/stage0/run.go
index d6ee323bb8..ade3e47c0e 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -57,7 +57,7 @@ import (
 
 var debugEnabled bool
 
-// configuration parameters required by Prepare
+// PrepareConfig defines the configuration parameters required by Prepare
 type PrepareConfig struct {
 	*CommonConfig
 	Apps               *apps.Apps          // apps to prepare
@@ -71,7 +71,7 @@ type PrepareConfig struct {
 	PrivateUsers       *user.UidRange      // User namespaces
 }
 
-// configuration parameters needed by Run
+// RunConfig defines the configuration parameters needed by Run
 type RunConfig struct {
 	*CommonConfig
 	Net                  common.NetList // pod should have its own network stack
@@ -90,7 +90,7 @@ type RunConfig struct {
 	InsecureSeccomp      bool           // Do not add seccomp restrictions
 }
 
-// configuration shared by both Run and Prepare
+// CommonConfig defines the configuration shared by both Run and Prepare
 type CommonConfig struct {
 	Store        *imagestore.Store // store containing all of the configured application images
 	TreeStore    *treestore.Store  // store containing all of the configured application images
@@ -110,6 +110,7 @@ func init() {
 	runtime.LockOSThread()
 }
 
+// InitDebug enables debugging
 func InitDebug() {
 	debugEnabled = true
 	log.SetDebug(true)
diff --git a/stage0/stop.go b/stage0/stop.go
index d0fa040108..904fd82af7 100644
--- a/stage0/stop.go
+++ b/stage0/stop.go
@@ -27,6 +27,7 @@ import (
 	"github.com/appc/spec/schema/types"
 )
 
+// StopPod stops the given pod.
 func StopPod(dir string, force bool, uuid *types.UUID) error {
 	s1rootfs := common.Stage1RootfsPath(dir)
 

From 53a04b0bd0cfb1050fa0a7d7a3f58faf438fc566 Mon Sep 17 00:00:00 2001
From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Mon, 22 Aug 2016 23:19:00 +0900
Subject: [PATCH 0681/1304] docs: add missed backslash

---
 Documentation/rkt-build-rkt.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/rkt-build-rkt.md b/Documentation/rkt-build-rkt.md
index 8861550afe..862aeb5172 100644
--- a/Documentation/rkt-build-rkt.md
+++ b/Documentation/rkt-build-rkt.md
@@ -62,8 +62,8 @@ The build output will be in `${SRC_DIR}/build-rkt-${RKT_VERSION}+git`.
 ## Debian Sid
 ```
 rkt run \
-    --volume rslvconf,kind=host,source=/etc/resolv.conf
-    --mount volume=rslvconf,target=/etc/resolv.conf
+    --volume rslvconf,kind=host,source=/etc/resolv.conf \
+    --mount volume=rslvconf,target=/etc/resolv.conf \
     --volume src-dir,kind=host,source=$SRC_DIR \
     --mount volume=src-dir,target=/opt/rkt \
     --interactive \
@@ -76,8 +76,8 @@ rkt run \
 ## Fedora 22
 ```
 rkt run \
-    --volume rslvconf,kind=host,source=/etc/resolv.conf
-    --mount volume=rslvconf,target=/etc/resolv.conf
+    --volume rslvconf,kind=host,source=/etc/resolv.conf \
+    --mount volume=rslvconf,target=/etc/resolv.conf \
     --volume src-dir,kind=host,source=$SRC_DIR \
     --mount volume=src-dir,target=/opt/rkt \
     --interactive \

From 818a1a39a55ca745aad1182a81c7286a0d972a0b Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Mon, 22 Aug 2016 12:54:05 +0200
Subject: [PATCH 0682/1304] rkt: Introduce Distribution Point concept

A Distribution Point represents the method to fetch an image starting from an
input string.

Before this concept was introduced, rkt used the ImageType concept, the
ImageType was mapped to the input image string format and internally
covered multiple concepts like distribution, transport and image type
(hidden since all are now appc ACIs).

The distribution point concept will be used as the primary information in the
different layers of rkt (fetching but also for references in a CAS/ref store).

This patch introduces the distribution point concept. See
Documentation/devel/distribution_point.md for a detailed description.
---
 Documentation/devel/distribution_point.md | 145 ++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 Documentation/devel/distribution_point.md

diff --git a/Documentation/devel/distribution_point.md b/Documentation/devel/distribution_point.md
new file mode 100644
index 0000000000..dc574226ee
--- /dev/null
+++ b/Documentation/devel/distribution_point.md
@@ -0,0 +1,145 @@
+
+A distribution point represents the method to fetch an image starting from an input string. It doesn't mandates the image types. Usually a distribution point can only provide one image type but some can provide different image types. For example:
+
+* Some docker registries also provides OCI images.
+* Rkt can internally implement the docker distribution to natively fetch a docker/OCI image from a registry or an ACI converted by docker2aci.
+
+Before this concept was introduced, rkt used the ImageType concept, the ImageType was mapped to the input image string format and internally covered multiple concepts like distribution, transport and image type (hidden since all are now appc ACIs).
+
+The distribution point concept is used as the primary information in the different layers of rkt (fetching but also for references in a CAS/ref store).
+
+## Distribution Points types
+
+Distribution points can be logically considered of two types:
+
+* Indirect distribution points
+* Direct distribution points
+
+Direct distribution points already provide the final information needed to fetch the image while Indirect distribution points will do some indirect steps (e.g. discovery) to get the final image location.
+
+It can happen, as explained below, that an Indirect distribution point will resolve to a Direct distribution point.
+
+## Distribution Points format
+A distribution point is represented as an URI with the uri scheme as "cimd" and the remaining parts (URI opaque data and query/fragments parts) as the distribution point data. See [rfc3986](https://tools.ietf.org/html/rfc3986)). Distribution points clearly maps to a resource name, instead they won't fit inside a resource locator (URL). We'll use the term URIs instead of URNs because it's the suggested name from the rfc (and URNs are defined, by rfc2141, to have the `urn` scheme).
+
+Every distribution starts with a common part: `cimd:DISTTYPE:v=uint32(VERSION):` where `cimd` is the container image distribution scheme, DISTTYPE is the distribution type, v=uint32(VERSION) is the distribution type format version.
+
+### Current rkt Distribution Points
+
+In rkt there are currently three kind of distribution points: `Appc`, `ACIArchive` and `Docker`. This is their formalization:
+
+**Appc**
+This is an Indirect distribution point.
+
+Appc defines a distribution point using appc image discovery
+
+The format is: `cimd:appc:v=0:name?label01=....&label02=....`
+The distribution type is "appc"
+the labels values must be Query escaped
+Example: `cimd:appc:v=0:coreos.com/etcd?version=v3.0.3&os=linux&arch=amd64`
+
+**ACIArchive**
+This is a Direct distribution point since it directly define the final image location.
+
+ACIArchive defines a distribution point using an archive file
+
+The format is: `cimd:aci-archive:v=0:ArchiveURL?query...`
+The distribution type is "aci-archive"
+ArchiveURL must be query escaped
+
+Examples:
+`cimd:aci-archive:v=0:file%3A%2F%2Fabsolute%2Fpath%2Fto%2Ffile`
+`cimd:aci-archive:v=0:https%3A%2F%2Fexample.com%2Fapp.aci`
+
+**Docker**
+This is an Indirect distribution point.
+
+Docker defines a distribution point using a docker registry
+
+The format is:
+`cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG|@DIGEST]`
+Removing the common distribution point part, the format is the same as the docker image string format (man docker-pull).
+
+Examples:
+`cimd:docker:v=0:busybox`
+`cimd:docker:v=0:busybox:latest`
+`cimd:docker:v=0:registry-1.docker.io/library/busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6`
+
+### Future distributions points
+
+**OCI Image distribution(s)**
+This is an Indirect distribution point.
+
+Currently oci images can be retrieved using a docker registry but in future the oci image spec will define one or more own kinds of distribution starting from an image name (with additional tags/labels).
+
+**OCI Image layout**
+This is a Direct distribution point.
+
+It can fetch an image starting from a [OCI image layout](https://github.com/opencontainers/image-spec/blob/master/image-layout.md) format. The location can point to a single file archive, to a local/remote directory based layout or other kind of locations.
+
+Probably it will be the final distribution used by the above OCI image distributionis (like ACIArchive is the final distribution point for the Appc distribution point).
+
+`cimd:oci-image-layout:v=0:file%3A%2F%2Fabsolute%2Fpath%2Fto%2Ffile?ref=refname`
+`cimd:oci-image-layout:v=0:https%3A%2F%2Fdir%2F?ref=refname`
+
+Since the OCI image layout can provide multiple images selectable by a ref there's the need to specify which ref to use in the archive distribution URI (see the above ref query parameter). Since distribution just covers one image it's not possible to import all the refs with just a distribution URI.
+
+TODO(sgotti). Define if oci-image-layout should internally handle both archive and directory based layouts or use two different distributions or a query parameter the explicitly define the layout (to avoid guessing if the url points to a single file or to a directory).
+
+**Note** Considering [this OCI image spec README section](https://github.com/opencontainers/image-spec#running-an-oci-image), probably the final distribution format will be similar to the Appc distribution. So there's a need to distinguish their User Friendly string (prepending an appc: or oci: ?).
+
+To sum it up:
+
+| Distribution Point | Type     | URI Format                                                                | Final Distribution Point |
+|--------------------|----------|---------------------------------------------------------------------------|--------------------------|
+| Appc               | Direct   | `cimd:appc:v=0:name?label01=....&label02=...`                             | ACIArchive               |
+| Docker             | Direct   | `cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG&#124;@DIGEST]` | <none>                   |
+| ACIArchive         | Indirect | `cimd:aci-archive:v=0:ArchiveURL?query...`                                |                          |
+| OCI                | Direct   | `cimd:oci:v=0:TODO`                                                       | OCIImageLayout           |
+| OCIImageLayout     | Indirect | `cimd:oci-image-layout:v=0:URL?ref=...`                                   |                          |
+
+## User friendly distribution strings
+
+Since the distribution URI can be complex there's a need to help the user to request an image via some user friendly string. rkt already has these kind of available input image strings (now mapped to an AppImageType):
+
+* appc discovery string: example.com/app01:v1.0.0,label01=value01,... or example.com/app01,version=v1.0.0,label01=value01,... etc...
+* file path: absolute /full/path/to/file or relative
+The above two may overlap so some heuristic is needed to distinguish them (removing this heuristic will break backward cli compatibility).
+* file URL: file:///full/path/to/file
+* http(s) URL: http(s)://host:port/path
+* docker URL: this is a strange URL since it the schemeful (docker://) version of the docker image string
+
+So, also the maintain backward compatibility, these image string will be converted to a distribution URI:
+
+| Current ImageType                      | Distribution Point URI                                                          |
+|----------------------------------------|---------------------------------------------------------------------------|
+| appc string                            | `cimd:appc:v=0:name?label01=....&label02=...`                             |
+| file path                              | `cimd:aci-archive:v=0:ArchiveURL`                                          |
+| file URL                               | `cimd:aci-archive:v=0:ArchiveURL`                                          |
+| https URL                              | `cimd:aci-archive:v=0:ArchiveURL`                                          |
+| docker URI/URL (docker: and docker://) | `cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG&#124;@DIGEST]` |
+
+The above table also adds docker URI (docker:) as a user friendly string and its clearer than the URL version (docker://)
+
+The parsing and generation of user friendly string is done outside the distribution package (to let distribution pkg users implement their own user friendly strings).
+
+rkt has two functions to:
+* parse a user friendly string to a distribution URI.
+* generate a user friendly string from a distribution URI. This is useful for example when showing the refs from a refs store (so they'll be easily understandable and if copy/pasted they'll continue to work).
+
+A user can provide as an input image both the "user friendly" strings or directly a distribution URI.
+
+## Comparing Distribution Points URIs
+
+A Distribution Point implementation will also provide:
+
+* a function to compare if two Distribution Point URIs are the same (e.g. ordering the query parameters).
+
+## Fetching logic with Distribution Points
+
+A Distribution Point will be the base for a future refactor of the fetchers logic (see #2964)
+
+This will also creates a better separation between the distribution points and the transport layers.
+
+For example there may exist multiple transport plugins (file, http, s3, bittorrent etc...) to be called by an ACIArchive distribution point.
+

From 0a2760f864d316b809d53ee7c017721686f18b41 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Tue, 23 Aug 2016 15:04:17 -0700
Subject: [PATCH 0683/1304] stage1-kvm: Avoid writing misleading subcgroup

Ref #2664

The `init.go` code does not run nspawn with --register=true for kvm, but
does write a subcgroup file of that form.

This makes it a little saner, and also simplifies it down to only one
dbus call rather than calling it several times in different places.
---
 .../devel/stage1-implementors-guide.md        |  6 +++++
 stage1/init/init.go                           | 23 ++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 5a66cb4803..56e7c6463b 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -54,6 +54,12 @@ Stage1 implementors have two options for doing so; only one must be implemented:
 * `/var/lib/rkt/pods/run/$uuid/pid`: the PID of the process that will be given to the "enter" entrypoint.
 * `/var/lib/rkt/pods/run/$uuid/ppid`: the PID of the parent of the process that will be given to the "enter" entrypoint. That parent process must have exactly one child process.
 
+The entrypoint of a stage1 may also optionally inform rkt of the "pod cgroup", the `name=systemd` cgroup the pod's applications are expected to reside under, via the `subcgroup` file. If this file is written, it must be written before the `pid` or `ppid` files are written. This information is useful for any external monitoring system that wishes to reliably link a given cgroup to its associated rkt pod. The file should be written in the pod directory at `/var/lib/rkt/pods/run/$uuid/subcgroup`.
+
+The file's contents should be a text string, for example of the form `machine-rkt\xuuid.scope`, which will match the control in the cgroup hierarchy of the `ppid` or `pid` of the pod.
+
+Any stage1 that supports and expects machined registration to occur will likely want to write such a file.
+
 #### Arguments
 
 * `--debug` to activate debugging
diff --git a/stage1/init/init.go b/stage1/init/init.go
index e3f859e651..b83aabe8b6 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -215,8 +215,9 @@ func installAssets() error {
 	return proj2aci.PrepareAssets(assets, "./stage1/rootfs/", nil)
 }
 
-// getArgsEnv returns the nspawn or lkvm args and env according to the flavor used
-func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networking.Networking, insecureOptions stage1initcommon.Stage1InsecureOptions) ([]string, []string, error) {
+// getArgsEnv returns the nspawn or lkvm args and env according to the flavor
+// as the first two return values respectively.
+func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister bool, debug bool, n *networking.Networking, insecureOptions stage1initcommon.Stage1InsecureOptions) ([]string, []string, error) {
 	var args []string
 	env := os.Environ()
 
@@ -298,7 +299,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 			args = append(args, fmt.Sprintf("-L%s", context))
 		}
 
-		if machinedRegister() {
+		if canMachinedRegister {
 			args = append(args, fmt.Sprintf("--register=true"))
 		} else {
 			args = append(args, fmt.Sprintf("--register=false"))
@@ -320,7 +321,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 			args = append(args, fmt.Sprintf("-L%s", context))
 		}
 
-		if machinedRegister() {
+		if canMachinedRegister {
 			args = append(args, fmt.Sprintf("--register=true"))
 		} else {
 			args = append(args, fmt.Sprintf("--register=false"))
@@ -581,7 +582,12 @@ func stage1() int {
 		return 1
 	}
 
-	args, env, err := getArgsEnv(p, flavor, debug, n, insecureOptions)
+	canMachinedRegister := false
+	if flavor != "kvm" {
+		// kvm doesn't register with systemd right now, see #2664.
+		canMachinedRegister = machinedRegister()
+	}
+	args, env, err := getArgsEnv(p, flavor, canMachinedRegister, debug, n, insecureOptions)
 	if err != nil {
 		log.Error(err)
 		return 1
@@ -622,13 +628,14 @@ func stage1() int {
 	}
 	s1Root := common.Stage1RootfsPath(p.Root)
 	machineID := stage1initcommon.GetMachineID(p)
-	subcgroup, err := getContainerSubCgroup(machineID)
+	subcgroup, err := getContainerSubCgroup(machineID, canMachinedRegister)
 	if err == nil {
 		if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
 			[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
 			log.FatalE("cannot write subcgroup file", err)
 			return 1
 		}
+
 		if err := mountContainerCgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
 			log.PrintE("couldn't mount the container cgroups", err)
 			return 1
@@ -720,7 +727,7 @@ func mountContainerCgroups(s1Root string, enabledCgroups map[int][]string, subcg
 	return nil
 }
 
-func getContainerSubCgroup(machineID string) (string, error) {
+func getContainerSubCgroup(machineID string, canMachinedRegister bool) (string, error) {
 	var subcgroup string
 	fromUnit, err := util.RunningFromSystemService()
 	if err != nil {
@@ -743,7 +750,7 @@ func getContainerSubCgroup(machineID string) (string, error) {
 	} else {
 		escapedmID := strings.Replace(machineID, "-", "\\x2d", -1)
 		machineDir := "machine-" + escapedmID + ".scope"
-		if machinedRegister() {
+		if canMachinedRegister {
 			// we are not in the final cgroup yet: systemd-nspawn will move us
 			// to the correct cgroup later during registration so we can't
 			// look it up in /proc/self/cgroup

From b0ffb4164593a1a0eb53ed9cff2ba507441de0de Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Wed, 24 Aug 2016 14:15:00 -0700
Subject: [PATCH 0684/1304] rkt: Avoid possible panic

Fixes #3109
---
 rkt/pods.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rkt/pods.go b/rkt/pods.go
index 4c802d90fd..ba81b01efd 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -873,6 +873,10 @@ func getChildPID(ppid int) (int, error) {
 		if err != nil {
 			return -1, err
 		}
+		if len(fi) == 0 {
+			// See https://github.com/coreos/rkt/issues/3109#issuecomment-242209246
+			continue
+		}
 		var pid64 int64
 		if pid64, err = strconv.ParseInt(fi[0].Name(), 10, 0); err != nil {
 			continue

From 1080b85951792272939f53c76b36345a2df6939c Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Thu, 25 Aug 2016 01:50:55 -0700
Subject: [PATCH 0685/1304] rkt/run: Allow --set-env-file files with comments

---
 rkt/run.go               | 17 +++++++++++------
 tests/env_file_test.conf |  3 ++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/rkt/run.go b/rkt/run.go
index 06414a5c0c..a02bafd1ef 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -440,6 +440,10 @@ type envFileMap struct {
 	mapping map[string]string
 }
 
+func commentLine(s string) bool {
+	return strings.HasPrefix(s, "#") || strings.HasPrefix(s, ";")
+}
+
 func (e *envFileMap) Set(s string) error {
 	if e.mapping == nil {
 		e.mapping = make(map[string]string)
@@ -452,19 +456,20 @@ func (e *envFileMap) Set(s string) error {
 
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
+		line := scanner.Text()
 		// Skip empty lines
-		if len(scanner.Text()) == 0 {
+		if len(line) == 0 {
+			continue
+		}
+		// Skip comments
+		if commentLine(line) {
 			continue
 		}
-		pair := strings.SplitN(scanner.Text(), "=", 2)
+		pair := strings.SplitN(line, "=", 2)
 		// Malformed lines
 		if len(pair) != 2 || len(pair[0]) == 0 {
 			return fmt.Errorf("environment variable must be specified as name=value (file %q)", file)
 		}
-		// Skip comments
-		if string(pair[0][0]) == "#" || string(pair[0][0]) == ";" {
-			continue
-		}
 		if _, exists := e.mapping[pair[0]]; exists {
 			return fmt.Errorf("environment variable %q already set (file %q)", pair[0], file)
 		}
diff --git a/tests/env_file_test.conf b/tests/env_file_test.conf
index 0d2a525f11..cc3b8898cd 100644
--- a/tests/env_file_test.conf
+++ b/tests/env_file_test.conf
@@ -1,3 +1,4 @@
+# Comment
 VAR_OTHER=file
-
+; Comment
 VAR_2=2

From dc3f76507f2220bec9b218284a74bc95032681ab Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 28 Aug 2016 02:57:37 +0200
Subject: [PATCH 0686/1304] install-rkt.sh: Added wget as build dependency

wget is not available in minimal debian installations (e.g. docker image debian:jessie)
---
 scripts/install-rkt.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 04e949b8e7..0fffcc4459 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -14,7 +14,8 @@ apt-get install -y --no-install-recommends \
         gnupg2 \
         bash-completion \
         checkinstall \
-        curl
+        curl \
+        wget
 
 curl -sSL https://coreos.com/dist/pubkeys/app-signing-pubkey.gpg | gpg2 --import -
 key=$(gpg2 --with-colons --keyid-format LONG -k security@coreos.com | egrep ^pub | cut -d ':' -f5)

From cec551f72c5d2af836783f1cb1cfe9f6b8677fc0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 29 Aug 2016 08:01:38 +0000
Subject: [PATCH 0687/1304] vendor: update go-systemd to v12

This go-systemd update fixes several memory leaks and races in journal
module.
---
 glide.lock                                    |   6 +-
 glide.yaml                                    |   2 +-
 .../coreos/go-systemd/activation/listeners.go |   2 -
 .../coreos/go-systemd/dbus/methods.go         |  81 ++++++++
 .../coreos/go-systemd/dbus/properties.go      |  10 +
 .../coreos/go-systemd/sdjournal/functions.go  |  66 +++++++
 .../coreos/go-systemd/sdjournal/journal.go    | 138 ++++----------
 .../github.com/coreos/go-systemd/util/util.go | 157 +---------------
 .../coreos/go-systemd/util/util_cgo.go        | 174 ++++++++++++++++++
 .../coreos/go-systemd/util/util_stub.go       |  23 +++
 10 files changed, 406 insertions(+), 253 deletions(-)
 create mode 100644 vendor/github.com/coreos/go-systemd/sdjournal/functions.go
 create mode 100644 vendor/github.com/coreos/go-systemd/util/util_cgo.go
 create mode 100644 vendor/github.com/coreos/go-systemd/util/util_stub.go

diff --git a/glide.lock b/glide.lock
index c8ffcb0582..60c4020789 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 641a1665288ef7ea9979edbab5541e39912a2a68f08a65c640ca4b29cd49e4bb
-updated: 2016-08-12T13:08:21.997452984+02:00
+hash: 85887ddac777e118486cde0a7d15ce8b2e1f05aeab1af97600d74d8f22ebb109
+updated: 2016-08-29T07:52:29.649451159Z
 imports:
 - name: github.com/appc/docker2aci
   version: 15d68b33bfee95a448c4da37dbe876baa8fcb5b6
@@ -91,7 +91,7 @@ imports:
   subpackages:
   - semver
 - name: github.com/coreos/go-systemd
-  version: d6c05a1dcbb5ac02b7653da4d99e5db340c20778
+  version: 43e4800a6165b4e02bb2a36673c54b230d6f7b26
   subpackages:
   - activation
   - dbus
diff --git a/glide.yaml b/glide.yaml
index 277dd72bf1..96df86908f 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -91,7 +91,7 @@ import:
   subpackages:
   - semver
 - package: github.com/coreos/go-systemd
-  version: v11
+  version: v12
   subpackages:
   - activation
   - dbus
diff --git a/vendor/github.com/coreos/go-systemd/activation/listeners.go b/vendor/github.com/coreos/go-systemd/activation/listeners.go
index df27c29e9e..fd5dfc709c 100644
--- a/vendor/github.com/coreos/go-systemd/activation/listeners.go
+++ b/vendor/github.com/coreos/go-systemd/activation/listeners.go
@@ -48,8 +48,6 @@ func TLSListeners(unsetEnv bool, tlsConfig *tls.Config) ([]net.Listener, error)
 	}
 
 	if tlsConfig != nil && err == nil {
-		tlsConfig.NextProtos = []string{"http/1.1"}
-
 		for i, l := range listeners {
 			// Activate TLS only for TCP sockets
 			if l.Addr().Network() == "tcp" {
diff --git a/vendor/github.com/coreos/go-systemd/dbus/methods.go b/vendor/github.com/coreos/go-systemd/dbus/methods.go
index 8f32fe8a7d..ab17f7cc75 100644
--- a/vendor/github.com/coreos/go-systemd/dbus/methods.go
+++ b/vendor/github.com/coreos/go-systemd/dbus/methods.go
@@ -473,6 +473,87 @@ type DisableUnitFileChange struct {
 	Destination string // Destination of the symlink
 }
 
+// MaskUnitFiles masks one or more units in the system
+//
+// It takes three arguments:
+//   * list of units to mask (either just file names or full
+//     absolute paths if the unit files are residing outside
+//     the usual unit search paths)
+//   * runtime to specify whether the unit was enabled for runtime
+//     only (true, /run/systemd/..), or persistently (false, /etc/systemd/..)
+//   * force flag
+func (c *Conn) MaskUnitFiles(files []string, runtime bool, force bool) ([]MaskUnitFileChange, error) {
+	result := make([][]interface{}, 0)
+	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.MaskUnitFiles", 0, files, runtime, force).Store(&result)
+	if err != nil {
+		return nil, err
+	}
+
+	resultInterface := make([]interface{}, len(result))
+	for i := range result {
+		resultInterface[i] = result[i]
+	}
+
+	changes := make([]MaskUnitFileChange, len(result))
+	changesInterface := make([]interface{}, len(changes))
+	for i := range changes {
+		changesInterface[i] = &changes[i]
+	}
+
+	err = dbus.Store(resultInterface, changesInterface...)
+	if err != nil {
+		return nil, err
+	}
+
+	return changes, nil
+}
+
+type MaskUnitFileChange struct {
+	Type        string // Type of the change (one of symlink or unlink)
+	Filename    string // File name of the symlink
+	Destination string // Destination of the symlink
+}
+
+// UnmaskUnitFiles unmasks one or more units in the system
+//
+// It takes two arguments:
+//   * list of unit files to mask (either just file names or full
+//     absolute paths if the unit files are residing outside
+//     the usual unit search paths)
+//   * runtime to specify whether the unit was enabled for runtime
+//     only (true, /run/systemd/..), or persistently (false, /etc/systemd/..)
+func (c *Conn) UnmaskUnitFiles(files []string, runtime bool) ([]UnmaskUnitFileChange, error) {
+	result := make([][]interface{}, 0)
+	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.UnmaskUnitFiles", 0, files, runtime).Store(&result)
+	if err != nil {
+		return nil, err
+	}
+
+	resultInterface := make([]interface{}, len(result))
+	for i := range result {
+		resultInterface[i] = result[i]
+	}
+
+	changes := make([]UnmaskUnitFileChange, len(result))
+	changesInterface := make([]interface{}, len(changes))
+	for i := range changes {
+		changesInterface[i] = &changes[i]
+	}
+
+	err = dbus.Store(resultInterface, changesInterface...)
+	if err != nil {
+		return nil, err
+	}
+
+	return changes, nil
+}
+
+type UnmaskUnitFileChange struct {
+	Type        string // Type of the change (one of symlink or unlink)
+	Filename    string // File name of the symlink
+	Destination string // Destination of the symlink
+}
+
 // Reload instructs systemd to scan for and reload unit files. This is
 // equivalent to a 'systemctl daemon-reload'.
 func (c *Conn) Reload() error {
diff --git a/vendor/github.com/coreos/go-systemd/dbus/properties.go b/vendor/github.com/coreos/go-systemd/dbus/properties.go
index 7520011564..c3d8c142a3 100644
--- a/vendor/github.com/coreos/go-systemd/dbus/properties.go
+++ b/vendor/github.com/coreos/go-systemd/dbus/properties.go
@@ -216,3 +216,13 @@ func PropSlice(slice string) Property {
 		Value: dbus.MakeVariant(slice),
 	}
 }
+
+// PropPids sets the PIDs field of scope units used in the initial construction
+// of the scope only and specifies the initial PIDs to add to the scope object.
+// See https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/#properties
+func PropPids(pids ...uint32) Property {
+	return Property{
+		Name:  "PIDs",
+		Value: dbus.MakeVariant(pids),
+	}
+}
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/functions.go b/vendor/github.com/coreos/go-systemd/sdjournal/functions.go
new file mode 100644
index 0000000000..e132369c12
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/functions.go
@@ -0,0 +1,66 @@
+// Copyright 2015 RedHat, Inc.
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package sdjournal
+
+import (
+	"github.com/coreos/pkg/dlopen"
+	"sync"
+	"unsafe"
+)
+
+var (
+	// lazy initialized
+	libsystemdHandle *dlopen.LibHandle
+
+	libsystemdMutex     = &sync.Mutex{}
+	libsystemdFunctions = map[string]unsafe.Pointer{}
+	libsystemdNames     = []string{
+		// systemd < 209
+		"libsystemd-journal.so.0",
+		"libsystemd-journal.so",
+
+		// systemd >= 209 merged libsystemd-journal into libsystemd proper
+		"libsystemd.so.0",
+		"libsystemd.so",
+	}
+)
+
+func getFunction(name string) (unsafe.Pointer, error) {
+	libsystemdMutex.Lock()
+	defer libsystemdMutex.Unlock()
+
+	if libsystemdHandle == nil {
+		h, err := dlopen.GetHandle(libsystemdNames)
+		if err != nil {
+			return nil, err
+		}
+
+		libsystemdHandle = h
+	}
+
+	f, ok := libsystemdFunctions[name]
+	if !ok {
+		var err error
+		f, err = libsystemdHandle.GetSymbolPointer(name)
+		if err != nil {
+			return nil, err
+		}
+
+		libsystemdFunctions[name] = f
+	}
+
+	return f, nil
+}
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/journal.go b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
index 51fe69ca20..cb26f6487b 100644
--- a/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
@@ -259,18 +259,13 @@ import "C"
 import (
 	"bytes"
 	"fmt"
-	"path/filepath"
 	"strings"
 	"sync"
 	"syscall"
 	"time"
 	"unsafe"
-
-	"github.com/coreos/pkg/dlopen"
 )
 
-var libsystemdFunctions = map[string]unsafe.Pointer{}
-
 // Journal entry field strings which correspond to:
 // http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
 const (
@@ -330,21 +325,10 @@ const (
 	IndefiniteWait time.Duration = 1<<63 - 1
 )
 
-var libsystemdNames = []string{
-	// systemd < 209
-	"libsystemd-journal.so.0",
-	"libsystemd-journal.so",
-
-	// systemd >= 209 merged libsystemd-journal into libsystemd proper
-	"libsystemd.so.0",
-	"libsystemd.so",
-}
-
 // Journal is a Go wrapper of an sd_journal structure.
 type Journal struct {
 	cjournal *C.sd_journal
 	mu       sync.Mutex
-	lib      *dlopen.LibHandle
 }
 
 // JournalEntry represents all fields of a journal entry plus address fields.
@@ -366,42 +350,11 @@ func (m *Match) String() string {
 	return m.Field + "=" + m.Value
 }
 
-func (j *Journal) getFunction(name string) (unsafe.Pointer, error) {
-	j.mu.Lock()
-	defer j.mu.Unlock()
-	f, ok := libsystemdFunctions[name]
-	if !ok {
-		var err error
-		f, err = j.lib.GetSymbolPointer(name)
-		if err != nil {
-			return nil, err
-		}
-
-		libsystemdFunctions[name] = f
-	}
-
-	return f, nil
-}
-
 // NewJournal returns a new Journal instance pointing to the local journal
 func NewJournal() (j *Journal, err error) {
-	h, err := dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err == nil {
-			return
-		}
-		err2 := h.Close()
-		if err2 != nil {
-			err = fmt.Errorf(`%q and "error closing handle: %v"`, err, err2)
-		}
-	}()
-
-	j = &Journal{lib: h}
+	j = &Journal{}
 
-	sd_journal_open, err := j.getFunction("sd_journal_open")
+	sd_journal_open, err := getFunction("sd_journal_open")
 	if err != nil {
 		return nil, err
 	}
@@ -419,28 +372,9 @@ func NewJournal() (j *Journal, err error) {
 // in a given directory. The supplied path may be relative or absolute; if
 // relative, it will be converted to an absolute path before being opened.
 func NewJournalFromDir(path string) (j *Journal, err error) {
-	h, err := dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err == nil {
-			return
-		}
-		err2 := h.Close()
-		if err2 != nil {
-			err = fmt.Errorf(`%q and "error closing handle: %v"`, err, err2)
-		}
-	}()
+	j = &Journal{}
 
-	path, err = filepath.Abs(path)
-	if err != nil {
-		return nil, err
-	}
-
-	j = &Journal{lib: h}
-
-	sd_journal_open_directory, err := j.getFunction("sd_journal_open_directory")
+	sd_journal_open_directory, err := getFunction("sd_journal_open_directory")
 	if err != nil {
 		return nil, err
 	}
@@ -458,7 +392,7 @@ func NewJournalFromDir(path string) (j *Journal, err error) {
 
 // Close closes a journal opened with NewJournal.
 func (j *Journal) Close() error {
-	sd_journal_close, err := j.getFunction("sd_journal_close")
+	sd_journal_close, err := getFunction("sd_journal_close")
 	if err != nil {
 		return err
 	}
@@ -467,14 +401,12 @@ func (j *Journal) Close() error {
 	C.my_sd_journal_close(sd_journal_close, j.cjournal)
 	j.mu.Unlock()
 
-	// we don't close the handle to reuse the symbol cache between Journal
-	// instances. It will go away when the process exits.
 	return nil
 }
 
 // AddMatch adds a match by which to filter the entries of the journal.
 func (j *Journal) AddMatch(match string) error {
-	sd_journal_add_match, err := j.getFunction("sd_journal_add_match")
+	sd_journal_add_match, err := getFunction("sd_journal_add_match")
 	if err != nil {
 		return err
 	}
@@ -495,7 +427,7 @@ func (j *Journal) AddMatch(match string) error {
 
 // AddDisjunction inserts a logical OR in the match list.
 func (j *Journal) AddDisjunction() error {
-	sd_journal_add_disjunction, err := j.getFunction("sd_journal_add_disjunction")
+	sd_journal_add_disjunction, err := getFunction("sd_journal_add_disjunction")
 	if err != nil {
 		return err
 	}
@@ -513,7 +445,7 @@ func (j *Journal) AddDisjunction() error {
 
 // AddConjunction inserts a logical AND in the match list.
 func (j *Journal) AddConjunction() error {
-	sd_journal_add_conjunction, err := j.getFunction("sd_journal_add_conjunction")
+	sd_journal_add_conjunction, err := getFunction("sd_journal_add_conjunction")
 	if err != nil {
 		return err
 	}
@@ -531,7 +463,7 @@ func (j *Journal) AddConjunction() error {
 
 // FlushMatches flushes all matches, disjunctions and conjunctions.
 func (j *Journal) FlushMatches() {
-	sd_journal_flush_matches, err := j.getFunction("sd_journal_flush_matches")
+	sd_journal_flush_matches, err := getFunction("sd_journal_flush_matches")
 	if err != nil {
 		return
 	}
@@ -543,7 +475,7 @@ func (j *Journal) FlushMatches() {
 
 // Next advances the read pointer into the journal by one entry.
 func (j *Journal) Next() (int, error) {
-	sd_journal_next, err := j.getFunction("sd_journal_next")
+	sd_journal_next, err := getFunction("sd_journal_next")
 	if err != nil {
 		return -1, err
 	}
@@ -562,7 +494,7 @@ func (j *Journal) Next() (int, error) {
 // NextSkip advances the read pointer by multiple entries at once,
 // as specified by the skip parameter.
 func (j *Journal) NextSkip(skip uint64) (uint64, error) {
-	sd_journal_next_skip, err := j.getFunction("sd_journal_next_skip")
+	sd_journal_next_skip, err := getFunction("sd_journal_next_skip")
 	if err != nil {
 		return 0, err
 	}
@@ -580,7 +512,7 @@ func (j *Journal) NextSkip(skip uint64) (uint64, error) {
 
 // Previous sets the read pointer into the journal back by one entry.
 func (j *Journal) Previous() (uint64, error) {
-	sd_journal_previous, err := j.getFunction("sd_journal_previous")
+	sd_journal_previous, err := getFunction("sd_journal_previous")
 	if err != nil {
 		return 0, err
 	}
@@ -599,7 +531,7 @@ func (j *Journal) Previous() (uint64, error) {
 // PreviousSkip sets back the read pointer by multiple entries at once,
 // as specified by the skip parameter.
 func (j *Journal) PreviousSkip(skip uint64) (uint64, error) {
-	sd_journal_previous_skip, err := j.getFunction("sd_journal_previous_skip")
+	sd_journal_previous_skip, err := getFunction("sd_journal_previous_skip")
 	if err != nil {
 		return 0, err
 	}
@@ -616,7 +548,7 @@ func (j *Journal) PreviousSkip(skip uint64) (uint64, error) {
 }
 
 func (j *Journal) getData(field string) (unsafe.Pointer, C.int, error) {
-	sd_journal_get_data, err := j.getFunction("sd_journal_get_data")
+	sd_journal_get_data, err := getFunction("sd_journal_get_data")
 	if err != nil {
 		return nil, 0, err
 	}
@@ -686,27 +618,27 @@ func (j *Journal) GetDataValueBytes(field string) ([]byte, error) {
 // all key-value pairs of data as well as address fields (cursor, realtime
 // timestamp and monotonic timestamp)
 func (j *Journal) GetEntry() (*JournalEntry, error) {
-	sd_journal_get_realtime_usec, err := j.getFunction("sd_journal_get_realtime_usec")
+	sd_journal_get_realtime_usec, err := getFunction("sd_journal_get_realtime_usec")
 	if err != nil {
 		return nil, err
 	}
 
-	sd_journal_get_monotonic_usec, err := j.getFunction("sd_journal_get_monotonic_usec")
+	sd_journal_get_monotonic_usec, err := getFunction("sd_journal_get_monotonic_usec")
 	if err != nil {
 		return nil, err
 	}
 
-	sd_journal_get_cursor, err := j.getFunction("sd_journal_get_cursor")
+	sd_journal_get_cursor, err := getFunction("sd_journal_get_cursor")
 	if err != nil {
 		return nil, err
 	}
 
-	sd_journal_restart_data, err := j.getFunction("sd_journal_restart_data")
+	sd_journal_restart_data, err := getFunction("sd_journal_restart_data")
 	if err != nil {
 		return nil, err
 	}
 
-	sd_journal_enumerate_data, err := j.getFunction("sd_journal_enumerate_data")
+	sd_journal_enumerate_data, err := getFunction("sd_journal_enumerate_data")
 	if err != nil {
 		return nil, err
 	}
@@ -736,7 +668,10 @@ func (j *Journal) GetEntry() (*JournalEntry, error) {
 	entry.MonotonicTimestamp = uint64(monotonicUsec)
 
 	var c *C.char
+	// since the pointer is mutated by sd_journal_get_cursor, need to wait
+	// until after the call to free the memory
 	r = C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &c)
+	defer C.free(unsafe.Pointer(c))
 	if r < 0 {
 		return nil, fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
 	}
@@ -774,7 +709,7 @@ func (j *Journal) GetEntry() (*JournalEntry, error) {
 // turned off by setting it to 0, so that the library always returns the
 // complete data objects.
 func (j *Journal) SetDataThreshold(threshold uint64) error {
-	sd_journal_set_data_threshold, err := j.getFunction("sd_journal_set_data_threshold")
+	sd_journal_set_data_threshold, err := getFunction("sd_journal_set_data_threshold")
 	if err != nil {
 		return err
 	}
@@ -795,7 +730,7 @@ func (j *Journal) SetDataThreshold(threshold uint64) error {
 func (j *Journal) GetRealtimeUsec() (uint64, error) {
 	var usec C.uint64_t
 
-	sd_journal_get_realtime_usec, err := j.getFunction("sd_journal_get_realtime_usec")
+	sd_journal_get_realtime_usec, err := getFunction("sd_journal_get_realtime_usec")
 	if err != nil {
 		return 0, err
 	}
@@ -816,7 +751,7 @@ func (j *Journal) GetMonotonicUsec() (uint64, error) {
 	var usec C.uint64_t
 	var boot_id C.sd_id128_t
 
-	sd_journal_get_monotonic_usec, err := j.getFunction("sd_journal_get_monotonic_usec")
+	sd_journal_get_monotonic_usec, err := getFunction("sd_journal_get_monotonic_usec")
 	if err != nil {
 		return 0, err
 	}
@@ -834,16 +769,19 @@ func (j *Journal) GetMonotonicUsec() (uint64, error) {
 
 // GetCursor gets the cursor of the current journal entry.
 func (j *Journal) GetCursor() (string, error) {
-	var d *C.char
-
-	sd_journal_get_cursor, err := j.getFunction("sd_journal_get_cursor")
+	sd_journal_get_cursor, err := getFunction("sd_journal_get_cursor")
 	if err != nil {
 		return "", err
 	}
 
+	var d *C.char
+	// since the pointer is mutated by sd_journal_get_cursor, need to wait
+	// until after the call to free the memory
+
 	j.mu.Lock()
 	r := C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &d)
 	j.mu.Unlock()
+	defer C.free(unsafe.Pointer(d))
 
 	if r < 0 {
 		return "", fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
@@ -857,7 +795,7 @@ func (j *Journal) GetCursor() (string, error) {
 // TestCursor checks whether the current position in the journal matches the
 // specified cursor
 func (j *Journal) TestCursor(cursor string) error {
-	sd_journal_test_cursor, err := j.getFunction("sd_journal_test_cursor")
+	sd_journal_test_cursor, err := getFunction("sd_journal_test_cursor")
 	if err != nil {
 		return err
 	}
@@ -879,7 +817,7 @@ func (j *Journal) TestCursor(cursor string) error {
 // SeekHead seeks to the beginning of the journal, i.e. the oldest available
 // entry.
 func (j *Journal) SeekHead() error {
-	sd_journal_seek_head, err := j.getFunction("sd_journal_seek_head")
+	sd_journal_seek_head, err := getFunction("sd_journal_seek_head")
 	if err != nil {
 		return err
 	}
@@ -898,7 +836,7 @@ func (j *Journal) SeekHead() error {
 // SeekTail may be used to seek to the end of the journal, i.e. the most recent
 // available entry.
 func (j *Journal) SeekTail() error {
-	sd_journal_seek_tail, err := j.getFunction("sd_journal_seek_tail")
+	sd_journal_seek_tail, err := getFunction("sd_journal_seek_tail")
 	if err != nil {
 		return err
 	}
@@ -917,7 +855,7 @@ func (j *Journal) SeekTail() error {
 // SeekRealtimeUsec seeks to the entry with the specified realtime (wallclock)
 // timestamp, i.e. CLOCK_REALTIME.
 func (j *Journal) SeekRealtimeUsec(usec uint64) error {
-	sd_journal_seek_realtime_usec, err := j.getFunction("sd_journal_seek_realtime_usec")
+	sd_journal_seek_realtime_usec, err := getFunction("sd_journal_seek_realtime_usec")
 	if err != nil {
 		return err
 	}
@@ -935,7 +873,7 @@ func (j *Journal) SeekRealtimeUsec(usec uint64) error {
 
 // SeekCursor seeks to a concrete journal cursor.
 func (j *Journal) SeekCursor(cursor string) error {
-	sd_journal_seek_cursor, err := j.getFunction("sd_journal_seek_cursor")
+	sd_journal_seek_cursor, err := getFunction("sd_journal_seek_cursor")
 	if err != nil {
 		return err
 	}
@@ -961,7 +899,7 @@ func (j *Journal) SeekCursor(cursor string) error {
 func (j *Journal) Wait(timeout time.Duration) int {
 	var to uint64
 
-	sd_journal_wait, err := j.getFunction("sd_journal_wait")
+	sd_journal_wait, err := getFunction("sd_journal_wait")
 	if err != nil {
 		return -1
 	}
@@ -985,7 +923,7 @@ func (j *Journal) Wait(timeout time.Duration) int {
 func (j *Journal) GetUsage() (uint64, error) {
 	var out C.uint64_t
 
-	sd_journal_get_usage, err := j.getFunction("sd_journal_get_usage")
+	sd_journal_get_usage, err := getFunction("sd_journal_get_usage")
 	if err != nil {
 		return 0, err
 	}
diff --git a/vendor/github.com/coreos/go-systemd/util/util.go b/vendor/github.com/coreos/go-systemd/util/util.go
index e4ed8b2639..7828ce6f04 100644
--- a/vendor/github.com/coreos/go-systemd/util/util.go
+++ b/vendor/github.com/coreos/go-systemd/util/util.go
@@ -18,96 +18,23 @@
 // than linking against them.
 package util
 
-// #include <stdlib.h>
-// #include <sys/types.h>
-// #include <unistd.h>
-//
-// int
-// my_sd_pid_get_owner_uid(void *f, pid_t pid, uid_t *uid)
-// {
-//   int (*sd_pid_get_owner_uid)(pid_t, uid_t *);
-//
-//   sd_pid_get_owner_uid = (int (*)(pid_t, uid_t *))f;
-//   return sd_pid_get_owner_uid(pid, uid);
-// }
-//
-// int
-// my_sd_pid_get_unit(void *f, pid_t pid, char **unit)
-// {
-//   int (*sd_pid_get_unit)(pid_t, char **);
-//
-//   sd_pid_get_unit = (int (*)(pid_t, char **))f;
-//   return sd_pid_get_unit(pid, unit);
-// }
-//
-// int
-// my_sd_pid_get_slice(void *f, pid_t pid, char **slice)
-// {
-//   int (*sd_pid_get_slice)(pid_t, char **);
-//
-//   sd_pid_get_slice = (int (*)(pid_t, char **))f;
-//   return sd_pid_get_slice(pid, slice);
-// }
-//
-// int
-// am_session_leader()
-// {
-//   return (getsid(0) == getpid());
-// }
-import "C"
 import (
 	"fmt"
 	"io/ioutil"
 	"os"
 	"strings"
-	"syscall"
-	"unsafe"
-
-	"github.com/coreos/pkg/dlopen"
 )
 
-var libsystemdNames = []string{
-	// systemd < 209
-	"libsystemd-login.so.0",
-	"libsystemd-login.so",
-
-	// systemd >= 209 merged libsystemd-login into libsystemd proper
-	"libsystemd.so.0",
-	"libsystemd.so",
-}
+var (
+	ErrNoCGO = fmt.Errorf("go-systemd built with CGO disabled")
+)
 
 // GetRunningSlice attempts to retrieve the name of the systemd slice in which
 // the current process is running.
 // This function is a wrapper around the libsystemd C library; if it cannot be
 // opened, an error is returned.
-func GetRunningSlice() (slice string, err error) {
-	var h *dlopen.LibHandle
-	h, err = dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err1 := h.Close(); err1 != nil {
-			err = err1
-		}
-	}()
-
-	sd_pid_get_slice, err := h.GetSymbolPointer("sd_pid_get_slice")
-	if err != nil {
-		return
-	}
-
-	var s string
-	sl := C.CString(s)
-	defer C.free(unsafe.Pointer(sl))
-
-	ret := C.my_sd_pid_get_slice(sd_pid_get_slice, 0, &sl)
-	if ret < 0 {
-		err = fmt.Errorf("error calling sd_pid_get_slice: %v", syscall.Errno(-ret))
-		return
-	}
-
-	return C.GoString(sl), nil
+func GetRunningSlice() (string, error) {
+	return getRunningSlice()
 }
 
 // RunningFromSystemService tries to detect whether the current process has
@@ -125,81 +52,17 @@ func GetRunningSlice() (slice string, err error) {
 //
 // This function is a wrapper around the libsystemd C library; if this is
 // unable to successfully open a handle to the library for any reason (e.g. it
-// cannot be found), an errr will be returned
-func RunningFromSystemService() (ret bool, err error) {
-	var h *dlopen.LibHandle
-	h, err = dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err1 := h.Close(); err1 != nil {
-			err = err1
-		}
-	}()
-
-	sd_pid_get_owner_uid, err := h.GetSymbolPointer("sd_pid_get_owner_uid")
-	if err != nil {
-		return
-	}
-
-	var uid C.uid_t
-	errno := C.my_sd_pid_get_owner_uid(sd_pid_get_owner_uid, 0, &uid)
-	serrno := syscall.Errno(-errno)
-	// when we're running from a unit file, sd_pid_get_owner_uid returns
-	// ENOENT (systemd <220) or ENXIO (systemd >=220)
-	switch {
-	case errno >= 0:
-		ret = false
-	case serrno == syscall.ENOENT, serrno == syscall.ENXIO:
-		// Since the implementation of sessions in systemd relies on
-		// the `pam_systemd` module, using the sd_pid_get_owner_uid
-		// heuristic alone can result in false positives if that module
-		// (or PAM itself) is not present or properly configured on the
-		// system. As such, we also check if we're the session leader,
-		// which should be the case if we're invoked from a unit file,
-		// but not if e.g. we're invoked from the command line from a
-		// user's login session
-		ret = C.am_session_leader() == 1
-	default:
-		err = fmt.Errorf("error calling sd_pid_get_owner_uid: %v", syscall.Errno(-errno))
-	}
-	return
+// cannot be found), an error will be returned.
+func RunningFromSystemService() (bool, error) {
+	return runningFromSystemService()
 }
 
 // CurrentUnitName attempts to retrieve the name of the systemd system unit
 // from which the calling process has been invoked. It wraps the systemd
 // `sd_pid_get_unit` call, with the same caveat: for processes not part of a
 // systemd system unit, this function will return an error.
-func CurrentUnitName() (unit string, err error) {
-	var h *dlopen.LibHandle
-	h, err = dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err1 := h.Close(); err1 != nil {
-			err = err1
-		}
-	}()
-
-	sd_pid_get_unit, err := h.GetSymbolPointer("sd_pid_get_unit")
-	if err != nil {
-		return
-	}
-
-	var s string
-	u := C.CString(s)
-	defer C.free(unsafe.Pointer(u))
-
-	ret := C.my_sd_pid_get_unit(sd_pid_get_unit, 0, &u)
-	if ret < 0 {
-		err = fmt.Errorf("error calling sd_pid_get_unit: %v", syscall.Errno(-ret))
-		return
-	}
-
-	unit = C.GoString(u)
-	return
+func CurrentUnitName() (string, error) {
+	return currentUnitName()
 }
 
 // IsRunningSystemd checks whether the host was booted with systemd as its init
diff --git a/vendor/github.com/coreos/go-systemd/util/util_cgo.go b/vendor/github.com/coreos/go-systemd/util/util_cgo.go
new file mode 100644
index 0000000000..22c0d6099d
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/util/util_cgo.go
@@ -0,0 +1,174 @@
+// Copyright 2016 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build cgo
+
+package util
+
+// #include <stdlib.h>
+// #include <sys/types.h>
+// #include <unistd.h>
+//
+// int
+// my_sd_pid_get_owner_uid(void *f, pid_t pid, uid_t *uid)
+// {
+//   int (*sd_pid_get_owner_uid)(pid_t, uid_t *);
+//
+//   sd_pid_get_owner_uid = (int (*)(pid_t, uid_t *))f;
+//   return sd_pid_get_owner_uid(pid, uid);
+// }
+//
+// int
+// my_sd_pid_get_unit(void *f, pid_t pid, char **unit)
+// {
+//   int (*sd_pid_get_unit)(pid_t, char **);
+//
+//   sd_pid_get_unit = (int (*)(pid_t, char **))f;
+//   return sd_pid_get_unit(pid, unit);
+// }
+//
+// int
+// my_sd_pid_get_slice(void *f, pid_t pid, char **slice)
+// {
+//   int (*sd_pid_get_slice)(pid_t, char **);
+//
+//   sd_pid_get_slice = (int (*)(pid_t, char **))f;
+//   return sd_pid_get_slice(pid, slice);
+// }
+//
+// int
+// am_session_leader()
+// {
+//   return (getsid(0) == getpid());
+// }
+import "C"
+import (
+	"fmt"
+	"syscall"
+	"unsafe"
+
+	"github.com/coreos/pkg/dlopen"
+)
+
+var libsystemdNames = []string{
+	// systemd < 209
+	"libsystemd-login.so.0",
+	"libsystemd-login.so",
+
+	// systemd >= 209 merged libsystemd-login into libsystemd proper
+	"libsystemd.so.0",
+	"libsystemd.so",
+}
+
+func getRunningSlice() (slice string, err error) {
+	var h *dlopen.LibHandle
+	h, err = dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err1 := h.Close(); err1 != nil {
+			err = err1
+		}
+	}()
+
+	sd_pid_get_slice, err := h.GetSymbolPointer("sd_pid_get_slice")
+	if err != nil {
+		return
+	}
+
+	var s string
+	sl := C.CString(s)
+	defer C.free(unsafe.Pointer(sl))
+
+	ret := C.my_sd_pid_get_slice(sd_pid_get_slice, 0, &sl)
+	if ret < 0 {
+		err = fmt.Errorf("error calling sd_pid_get_slice: %v", syscall.Errno(-ret))
+		return
+	}
+
+	return C.GoString(sl), nil
+}
+
+func runningFromSystemService() (ret bool, err error) {
+	var h *dlopen.LibHandle
+	h, err = dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err1 := h.Close(); err1 != nil {
+			err = err1
+		}
+	}()
+
+	sd_pid_get_owner_uid, err := h.GetSymbolPointer("sd_pid_get_owner_uid")
+	if err != nil {
+		return
+	}
+
+	var uid C.uid_t
+	errno := C.my_sd_pid_get_owner_uid(sd_pid_get_owner_uid, 0, &uid)
+	serrno := syscall.Errno(-errno)
+	// when we're running from a unit file, sd_pid_get_owner_uid returns
+	// ENOENT (systemd <220) or ENXIO (systemd >=220)
+	switch {
+	case errno >= 0:
+		ret = false
+	case serrno == syscall.ENOENT, serrno == syscall.ENXIO:
+		// Since the implementation of sessions in systemd relies on
+		// the `pam_systemd` module, using the sd_pid_get_owner_uid
+		// heuristic alone can result in false positives if that module
+		// (or PAM itself) is not present or properly configured on the
+		// system. As such, we also check if we're the session leader,
+		// which should be the case if we're invoked from a unit file,
+		// but not if e.g. we're invoked from the command line from a
+		// user's login session
+		ret = C.am_session_leader() == 1
+	default:
+		err = fmt.Errorf("error calling sd_pid_get_owner_uid: %v", syscall.Errno(-errno))
+	}
+	return
+}
+
+func currentUnitName() (unit string, err error) {
+	var h *dlopen.LibHandle
+	h, err = dlopen.GetHandle(libsystemdNames)
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err1 := h.Close(); err1 != nil {
+			err = err1
+		}
+	}()
+
+	sd_pid_get_unit, err := h.GetSymbolPointer("sd_pid_get_unit")
+	if err != nil {
+		return
+	}
+
+	var s string
+	u := C.CString(s)
+	defer C.free(unsafe.Pointer(u))
+
+	ret := C.my_sd_pid_get_unit(sd_pid_get_unit, 0, &u)
+	if ret < 0 {
+		err = fmt.Errorf("error calling sd_pid_get_unit: %v", syscall.Errno(-ret))
+		return
+	}
+
+	unit = C.GoString(u)
+	return
+}
diff --git a/vendor/github.com/coreos/go-systemd/util/util_stub.go b/vendor/github.com/coreos/go-systemd/util/util_stub.go
new file mode 100644
index 0000000000..477589e122
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/util/util_stub.go
@@ -0,0 +1,23 @@
+// Copyright 2016 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !cgo
+
+package util
+
+func getRunningSlice() (string, error) { return "", ErrNoCGO }
+
+func runningFromSystemService() (bool, error) { return false, ErrNoCGO }
+
+func currentUnitName() (string, error) { return "", ErrNoCGO }

From 5802c7797f183e5fcdefd502596cbfbcbd184fc9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 29 Aug 2016 10:12:22 +0000
Subject: [PATCH 0688/1304] seccomp/docker: update docker whitelist to include
 mlock

This updates the `@docker/default-whitelist` to include mlock-related
syscalls (mlock, mlock2, mlockall). They were mistakenly gated in the
1.12.0 release cycle.
---
 stage1/init/common/seccomp_wildcards.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/stage1/init/common/seccomp_wildcards.go b/stage1/init/common/seccomp_wildcards.go
index 22d2f1d8dc..afc5b75409 100644
--- a/stage1/init/common/seccomp_wildcards.go
+++ b/stage1/init/common/seccomp_wildcards.go
@@ -160,6 +160,9 @@ var (
 		"mkdirat",
 		"mknod",
 		"mknodat",
+		"mlock",
+		"mlock2",
+		"mlockall",
 		"mmap",
 		"mmap2",
 		"mprotect",

From df908dfbee336b84920a13a702839193d8aa4b57 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Mon, 29 Aug 2016 15:40:00 +0200
Subject: [PATCH 0689/1304] Documentation: document required journal
 compression

Fixes #3104
---
 Documentation/using-rkt-with-systemd.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index 6f7f57d348..f845009e4a 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -65,6 +65,16 @@ MACHINE CLASS SERVICE
 0 machines listed.
 ```
 
+Note that journald integration is only supported if systemd is compiled with `xz` compression enabled. To inspect this, use `systemctl`:
+
+```
+$ systemctl --version
+systemd v231
+[...] +XZ [...]
+```
+
+If the output contains `-XZ`, journal entries will not be available.
+
 ## Managing pods as systemd services
 
 ### Simple Unit File

From 9da32b17ab08647949ee3adb2b33ae6192bf3be5 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 29 Aug 2016 04:16:21 +0200
Subject: [PATCH 0690/1304] scripts: Fix missing files in .deb when using
 install-rkt.sh

Checkinstall (or rather installwatch) hooks into the mkdir process of
install and prefixes the given paths while creating them. Since mkdir
does a chdir($dir) after the process of creating the named directories
it detects, that the creation must have failed and bails. The
install-pak script continues with the next file in the list which is
placed in the fake directory as expected and doesn't fail since the
directory exists in the prefixed dir. Thus the first file in the loop is
missing from the prefix dir.
This is fixed with creating each directory that is required before the
normal install routine continues.

Fixes #3123
---
 scripts/install-rkt.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 0fffcc4459..64ed3097fd 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -29,6 +29,16 @@ tar xvzf rkt-v"${version}".tar.gz
 cat <<EOF >install-pak
 #!/bin/bash
 
+# fix mkdir issues with checkinstall and fstrans
+for dir in /usr/lib/rkt/stage1-images/\\
+        /usr/share/man/man1/\\
+        /usr/share/bash-completion/completions/\\
+        /usr/lib/tmpfiles.d/\\
+        /usr/lib/systemd/system/
+do
+    mkdir -p \$dir 2>/dev/null || :
+done
+
 for flavor in fly coreos kvm; do
     install -Dm644 rkt-v${version}/stage1-\${flavor}.aci /usr/lib/rkt/stage1-images/stage1-\${flavor}.aci
 done

From c1b9babdf0f6f756f71f6eb1845a6bd971853f66 Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Mon, 29 Aug 2016 12:31:25 -0700
Subject: [PATCH 0691/1304] stage1/init: prepare the coreos/kvm flavors for
 systemd v231

---
 stage1/init/init.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index e3f859e651..ebd03d60b6 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -283,6 +283,11 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 			return nil, nil, errwrap.Wrap(errors.New("error linking pod's journal"), err)
 		}
 
+		// use only dynamic libraries provided in the image
+		// from systemd v231 there's a new internal libsystemd-shared-v231.so
+		// which is present in /usr/lib/systemd
+		env = append(env, "LD_LIBRARY_PATH="+filepath.Join(common.Stage1RootfsPath(p.Root), "usr/lib/systemd"))
+
 		return args, env, nil
 
 	case "coreos":
@@ -305,7 +310,11 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, debug bool, n *networki
 		}
 
 		// use only dynamic libraries provided in the image
-		env = append(env, "LD_LIBRARY_PATH="+filepath.Join(common.Stage1RootfsPath(p.Root), "usr/lib"))
+		// from systemd v231 there's a new internal libsystemd-shared-v231.so
+		// which is present in /usr/lib/systemd
+		env = append(env, "LD_LIBRARY_PATH="+
+			filepath.Join(common.Stage1RootfsPath(p.Root), "usr/lib")+":"+
+			filepath.Join(common.Stage1RootfsPath(p.Root), "usr/lib/systemd"))
 
 	case "src":
 		args = append(args, filepath.Join(common.Stage1RootfsPath(p.Root), interpBin))

From eb6be9876760045289bb4de2fbfed1c87470bc06 Mon Sep 17 00:00:00 2001
From: Abhishek Chanda <abhishek.becs@gmail.com>
Date: Tue, 30 Aug 2016 04:32:08 +0000
Subject: [PATCH 0692/1304] rkt: Honor insecure-options in run-prepared

This subcommand was missing insecure options

Closes #3132
---
 rkt/run_prepared.go | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index 3b62f77b23..3591797ece 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -132,16 +132,19 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 			UUID:      p.uuid,
 			Debug:     globalFlags.Debug,
 		},
-		Net:         flagNet,
-		LockFd:      lfd,
-		Interactive: flagInteractive,
-		DNS:         flagDNS,
-		DNSSearch:   flagDNSSearch,
-		DNSOpt:      flagDNSOpt,
-		MDSRegister: flagMDSRegister,
-		Apps:        apps,
-		RktGid:      rktgid,
-		Hostname:    flagHostname,
+		Net:                  flagNet,
+		LockFd:               lfd,
+		Interactive:          flagInteractive,
+		DNS:                  flagDNS,
+		DNSSearch:            flagDNSSearch,
+		DNSOpt:               flagDNSOpt,
+		MDSRegister:          flagMDSRegister,
+		Apps:                 apps,
+		RktGid:               rktgid,
+		Hostname:             flagHostname,
+		InsecureCapabilities: globalFlags.InsecureFlags.SkipCapabilities(),
+		InsecurePaths:        globalFlags.InsecureFlags.SkipPaths(),
+		InsecureSeccomp:      globalFlags.InsecureFlags.SkipSeccomp(),
 	}
 	if globalFlags.Debug {
 		stage0.InitDebug()

From d16e0969859991059771c3f2e5d12e82e45ff275 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 30 Aug 2016 12:09:57 +0200
Subject: [PATCH 0693/1304] Documentation/devel: add make images target

This introduces the possibility to generate graphivz based PNG images using
a new `images` make target.

Fixes #3085
---
 Documentation/devel/devel.mk                  |  12 ++++++++++++
 Documentation/devel/execution-flow-fly.png    | Bin 20105 -> 19865 bytes
 .../devel/execution-flow-systemd.png          | Bin 43263 -> 42856 bytes
 Documentation/devel/execution-flow.png        | Bin 19363 -> 18976 bytes
 ...-blocks.dot => image-logical-blocks.neato} |   0
 Makefile.in                                   |   1 +
 6 files changed, 13 insertions(+)
 create mode 100644 Documentation/devel/devel.mk
 rename Documentation/devel/{image-logical-blocks.dot => image-logical-blocks.neato} (100%)

diff --git a/Documentation/devel/devel.mk b/Documentation/devel/devel.mk
new file mode 100644
index 0000000000..6526f0481a
--- /dev/null
+++ b/Documentation/devel/devel.mk
@@ -0,0 +1,12 @@
+%.png: %.neato
+	neato -Tpng -Gdpi=75 $< -o $@
+
+%.png: %.dot
+	dot -Tpng -Gdpi=75 $< -o $@
+
+images: \
+	Documentation/devel/image-logical-blocks.png \
+	Documentation/devel/image-chain.png \
+	Documentation/devel/execution-flow.png \
+	Documentation/devel/execution-flow-fly.png \
+	Documentation/devel/execution-flow-systemd.png
diff --git a/Documentation/devel/execution-flow-fly.png b/Documentation/devel/execution-flow-fly.png
index 35e3771fc8f002c0dba0e9fe3a50b93121824ccc..fe111307f23ee3a70c416864363872e00def3733 100644
GIT binary patch
literal 19865
zcmcG$bzGEPxGs#Mppt^p-QArENOw2V-Q9xHjdV96J#?$2ba!_*49!`*JI>zw>~qfd
z$9H^x{(NWVnde#SUiZ4=x~?@L^0Hz`Z*bngz`!6$h>IwKe@|gxp2fX_1OJBt@l^x=
zz!^x1iNHKQ{g>5J_#Fm@2u4EWqq1At{(`IWyQ#TfCr6{6m07QXKR;uC^NNN;S7yJZ
zdr`_DDm0`E=iZ!-xw1nYEnIZJrNfMkA{2@4i;m&PcP|wDiF7vaVKp=~j1=_sn=>8x
zg3>*=23f0axegYw1IQ%M{E6O~&N)@%`w_i5k|l!>^?b>wg?)vDw9yrTJBuugx;RUj
z=_M3`MqZ8cRcLOj=U}#WU1D5kzb}5=1k3+ebujHQk=qe-q+CzXI<Qh^&(lbvcR4IO
zVrOzvX)gPfP^&kO0X;T0Hn>+BDS|&<un5KrY$}crt93TCfCW2(PlB{8eKb0T&m)?A
z)Rs@)y=0a{m!C%J?lCutgzV3K)aS$lmpynUT*>x%>McQULkoY<a)fA)^Ld>Uf@|%H
zP4s^B@jD-KylGlVYp^SnPfW$Nwhr=F9Iq`e5Fu&Hk1j@m`Jqu`=liP(84h#z^fagR
zKwds{_HshGQfj@AlR&ZQLOVQ7bal~+1CwDvjT!~9wYz%(!*GWu0d1l+Yc1>jH?a<y
zKDo>`;qPTj`WrmRRlSBkrfdX)9$Ir;G*;fqnU9+jQ@j^b05{r*!XUbG;QHbq7pK<r
zIA#16469_$1?Nk8o1Tb1XIi86ra4}!XVnayraRUbkAuxI2vjjvY4pnD!6t3bJHl`6
zRd3@hi`6LH>gsnGw|Do5VESpzg?8IVv~g!i-*ieDxzC~RAGlmzdJZvGUK|?_WuwMB
zw>gkLKdN0aSZ9mH$?RV>8n&*P+rBu6*75Lw6G&&BnzKEVFs3t!@21*o-igLvyz}0w
zIV|rhZf!i!(tg(@a+%)p^>SdrOu3GQSdDPlv17<+;f<VIhR_*-pxypBl1aF&Sewno
zv?JBGk84xUlJ$&=7o{4U?ul6`tJmhJ)7?<9`{b9F#xsN?k{~fOgT{8%jDH)VnT&a(
z8z@I7CbAo)xFco{hX3GyVclXynHki31Dho?hJ(}1Vd$lW*Q)``<nBb<igok4MfBm%
zd_H{9nyw#GA3Srlny}BzyAPQPJ}_7~CX4!BH%pEfC0x?vl(-~04~F~a^j>H8K0j3|
zHx$lUMWq+TMMXDV;>bb>NGI(sS9QFaX~&8U@mo`xln$UV-n`8=r_DNPT%KX&qBTbH
zQE(~Vzsudnpy^YMZ4Bi%yS29V*%!Ax*X-8XxIA^2MBL;NEH>y3?v$Zf(M-GbYQKJc
zNObg-CMG9O-(}bc4wEzZJ0!+!e~E#OjRqwYAZHK=>6PVhGFu5$x>gLwnI@YuMmm@X
z*7wG-r=$xEy=dE9-LM0z&BQWJxo*J~pKis(F}k&x{)2B0*e2q2RjoZ3G|XU-$)U!q
zS8Q@mO2=eTJbV?#5hWi<!sURafw@h8*;mZUn#vB}>(5Tk&fANFVOp-aGY}{qSh!`g
z%$c=q4KJ1@*`05~4QSIIR}O0~?}9iZa`n?C)f>afNp=Nu3^MdB4gX#b-)grK_$3z+
zdrn4nOp9lN8ErG!eTuY>^X4_G+xyHErb<v?nX1`;|I<*QZ9~oBwsk-T=}a5CFZO!M
zhQGJ!VQ+4#Dd9}3TW2~{hh(aB<HeVlYypP%eQ58zqC8ialS4|%yEpl_uG|e_z%GgR
zOo|(KQXCsCQvMA$loFYSg4EuyIHl|Y$u`gZ39R+aLdD9Ft{A+4;o?pBGyEY6T)&z@
z9-~iTzh}dyGiT&tFp{?r8kt{os2C|VMHrhD*Lyw8WMxfPq>|g*W!=nhJ}V4ElDjrc
z`{*8dO3O(S7lOE~x<CNy&3}I3Bq8PNr^W6W9&t{s@h47fWXKI8GrTl{-1SfpPF`Y|
z=TMe=R!&+{Wd?aBA`SBPOYML~jy%<PS9!>M>ru%=u&pL^KLpR?;A879CTAx@OjVzx
zGJbkL>o@D$Ay(_(1T;JeoBgfj6-=C66Q+%j*2qZzHC{@H&n-6cy?4O(k9F7P_kvdQ
z?|bswOsG(bAxT)cRF9KmW8~!Q_!9n4^NAs*ZgZ3Q#}^u;NT;EuR3OA*%~$!Iie)TK
z!$3~kM_S4H9;Zmf+%IT;1~tLmc=Q@S!@}Bro^|VRYm5&uA(yy((I4$_sp|n2aVp2&
z`H}!x|8!o*$!5c^Avp#@$A2Gideo6Oj(4_6aSKhKNR=FOR?F&9yI(DsCU=lO=HJ(B
z{2rIqHNdL?!<ESR@>fH2|Jk4%PJ`lH%X2YVZKc7)i#0Z8j^(OW0k6rapm4+xAH%8D
zwlg})uMhcRL9;lWs16$&@v{~#z2+&^bJ+pBj)??D_k9Su8bK4+=A=>{9)YKl_Wffo
za3+hs#Ro`4sxNIm6pi&AxSz?s3y~-SX0f}`9-L#|trbqFS%RAWDLJ^Z7WlhQh+Og6
z0<(lJLV@aCUS5GC<K64`c#;lm%Qv`&e-Ca4Z{#jz_A+!-!&4^Z<feS;`tCrYNsABG
z8(JEu(TcfqK7~7Z{dc^?qMVO!;O5yO_d9>EM@kkP&`i4(=U<2E?=bqF#8`3%%HBnU
zzL#Xp^7I}Z)w2^|L*(aA_gWD6+vstiI`Hg^uk2FZR&eH-Rb6c==|-=*{neEU;`xQy
zrjm?CfjKUDiS)Cix_zRBS@+TG09;SxfZ?1iv>T_BO$n>#eRq-i*5-eb@Aa|^6Cd}I
zYZmbAi_`;g>vFfb%wEduHdW|vX)I4bvur@Dy3D(@T14+av5aJ?Hx<^VN%-B;$dAbw
zG*<iQfHPj!lb=`!UyiacvVJ>gxgZtKq*S}5SyUo=p|{iu+c-4@y&MZPu%F-|6(%{@
zSecG;^sKaZCF&lU&nXK+PgO-!n8Y1!Ay}AmKjCA3*)~9_!Bs<xQ0US**%fQ-<Ev2h
zlOJ8cQWPwdsN6zF9yf1AEt`JbQn2=r@Wkr|oXDE|kW;&<?k0%n0nNKNv+TtZAlW>s
zm9v->1opDX%w0JcA@s&qJ|!cNt^#Ce16j;P5ONGwu>~z@`=$umyPH^=?nQsxMV|?0
z%P+TiF|ilVo(=72S<QGxs+`?s$y15TNU0I5wzlHys+EPmUkhR<r@wz`SZMp~^8pn0
zxMZg%y`o#Y@iN+33eLd5>VxJDf^k!d&(gJytITd&t9KYeDT<-hTmknzFPAq{Zstvt
zPT$Re>6N{Woani2$${NB*Ylm=n(AGyv}dqzW~_(@D28|P-?Y7d$?ZMpw+~iL$FUUp
z)_Ke#OGL*Q*qhPAyZ#|K+nZEUcA^`&oM>leXYTi;_&6LrO^O*STgoTidYfC@j%p;i
zALBkj$W3&-^jvS!cL+^k8foijjI#zOh=`FS#t&_h;;z9RkNxLnGvN(!7x6p6)!~$W
z0y&KZ=1+J+_GFhmKL|z(^4mUudVxPk$ZT>AK0IAaq3A(*gTIr<dXxFC4~gasCAmHW
z)DN(zZ!ZWJ0!wqk=R~Y5Wb@j8y`T5JVw*C4^kl@LowBFX^Q6<Whe>O3OVp&_{H$rt
zCe!HCJ?Xs#sw_$YV(xB-RrFXeK-2q6)^TfA6vHirdiM16H74Du6;_`)pTJ!ilhK?h
zw1`P?b@GayO%`|%7|zK^ca{2@uaL&W@rbVz0R#;pv2uDmO?-=()*bcQ!ffY(G<)2f
z6$QMVq(bo3b<S30lC|97Bbfv8jYsl*lqvmUcN!xv>U+p5kPE`yxL;*~T!Y8uAfcfb
zOLj@v&{25M0s|7#%fHk++T0x9Q=ctm6&4DQ$+c~DhNbB|WKb3in;**|?o2Rsix)Pp
zipxsm$}AZxyHbm-cLwyQ&xiayb1@z)E>CrA(UsMzSVb+yyd=MyuTyrd%)kFasB*)L
zi?e;Q@KX?5uml^Sz-7eDJ5Xl!Lr*+B-puLCC?O0MTL;Rnq1i6K+~m2U?k!7@wby)x
z`5ySW;SEW>d5|7nf1#`#+Tn8}7xrXdS2z|Tc*$sFHw5Q|Rqwx@bj8;fAWahEIFc)D
zz3aiHuWuug$>7}JDHymO$JSVLvA&Y~Sbyd4;XWC`H6${mP>WY?FeuQTfh>IH`>fK>
zZ`i6B6#ZCB2_U=2w_{e}vib0rz3+qAX(oDg+uz*bXLJad?oM;4C*dj#jU^A3T5L4v
z-Zy%zsSac)lJ_U^)FM^dhotd9ce9`I@bFx@shNPG<rTK|IC>L^bV1zZP{EwD1B>w!
zHoK}VRli@QN|~QYAo-VnLr1-03@dQ$?EUis!I88zeKgsTSpS=@=dbV6FF-*2Y;7DG
zQuz$*a>Rp$;43Yu3TopF(}rjXG6x2b0#zT<+2a_w$&m_A^M9!1^4&&#dtR|6&xEw6
z{HLtsz3X8&Omh39uI-krdbs3mnA-i{LqUIyYsj9V&zjruX%VIDh93WPTLB#AUl8$B
z9?~Z``AKMG^JS5y`d!#GGI8rz;aTccX~KBw4n<)<tL;f`d_C@+dU*4t37RS2*?<UY
zAL*qLA7yi{2x9c9DtEbPNV&7_h7d(ePs8xUfcKb_<=)>1K~{A4qZRoLeP<uO;PB2O
zFNuP|rF&I-qvkvEJu2OJQ$m`g)O{4Cq22V`8{uc+5r{qI=a`J+vQzHYnd4QsQsM}=
z5*vEAo9ur54+Br$^0+scl#H{&>j_UVu!V}7_(P$A2<^Jm$#Uy&!!VO<W?Os2T-5d`
z&sj8w<&g84Y&FDYlAs7u6(NZWtZlpy>vz{o{pG8#&Y&w|El0wKO~+11^TQpBvrQ1c
z>I44e@@tsO+Ff{lGssho1%v9f@od*<qRE36jh`Ps-uF#_KX9x+qz092oCQj>C_YIO
z>BYW7WGpn1uwo1w8Vp8gA$J&HfeK7iJSm3eKCO8$#MM;7{Ay{0b>>e?s{M>2_vk4L
z!hHe#w3KtA!?=BU)@Wd4B=XazR~n9Ra_U3hr?;*{voi`=!Rpg#UQ<f^H3wy!VfPW{
zX`1aq?U?o>^esr?bn5n4K@OAL27NhyZ>Hxo$6C@cTdV3EL2(P*b_?3ZV5oC}z;S?_
z1I7Z%fR1k(bFZR;$*H*`j;8Q_=U(FhKdX4`A)ikj*o-n%6PK2J`pkE5e%;;R4VeA<
z({!LQONw>18D9LpoU~g|)#O&=4S7-78IkMR?;tW~+4EyQ%=0l!oh@si&s9E(Q)T*Y
z42{lkXKKgbI<k`1mJ<xtV{1`^-V>zV<B6VxbKEA?>ldibftMB?zZfUqI<Vs<h8oXY
zpKaOlMGPBxt1|Alci7gBl|4rBg~{dk3riG4*$NLuCZh;XR~x*_Ewm}nT*DSet5>Vr
z>Tcj4nHtLnAx(teC-5lk0Mr*B#l-w9^C5S&R;V=#wDNN;e{eyFFu*coPKZkj6pFd#
zqy3`Ck!}Q96p<i?UIk9Di9k5Un`a74kok$}@&lrx9LO9hyk|f|Dx3oz)w{*A1j?4=
zB|Wf#LA(80lL)OLX>>%P!f?QJzJ*YjJ4#~wh=~vcSTD}p;#y(!>JMq8n1(eLaa$b>
zdJ(%g*t?|s+A6=^zMdty?C~dpC5d_Y5l(~z!5`7=9#2DV=*x&w-N{6=_bl?K1l{JI
z583j~CyS8d%bXlT^CcO<qtKVqd(fEN+}zhFC{re{ARP9qA}Ji!l6?vEHTa=)J9~Rd
zH5Mx87d0vUv%Yv`5fMln931Xy?-oPj<KN55%DQ=kB6B)W4F3CL|G@`PL+D<y5TR+H
z8h!W&k`Oog82v2fKacPK*9)s3da+jS-yk6wZx3hZ6&AvxVq=FSCu47JZo<UTYbC(K
zBb%{`tlW=1&>DV&_RY?wIBpHb#KdIRHj75!1mMNUV|8TL^mB1>EpKiX)b@{$$LY5R
zzIPB2(g$-9ZVyCiA0KDyKCiB3YjoZ#2nhb>Pl2Wp*ywsBYhhs#x#PS$o-Lisq8Ths
zWkwQX{6i!Jjm>QMgK<hj1GjJx@`R#@&`0zTIwj#iL<QX<IB^MyZ1A>bxHy$KxcsMK
zcVut7Wq{Dfu>zUO>gsU^WucF6!Q}-71=VIF&jW<~z+Aw0M_j~(o}q=%8GeOB`ZGKn
zeSYqwS!0n8>Y(RjJm21BiA53EuXemHr57xARV&r3nXa?VoLpsMX3jS5OW5AswV;P<
zK-XbI80K8^`nojKSF~?bT!RHdP6dRibG~2QlKI68-L2J5RBaud8jP>~Aq*)msYyw{
z%FVfh=qL-Es5otRpr@wq$FWba<9}Gx0KU#n$`Q|T#<(AsFEJPlcLZJNL8(5AEY%}Q
z=D=*fJ8%8YrJdVxMK+t!^C}MsG*Q7|Cn*<OJ=Jqq{LYTq-Nfs%;L^&y&lRc(w^tH;
zb12%s3gWmQ_tSbR570qV_Q!WhBcn5{#X*4>t>G1y_X9Ghgo5JtxcX_LvUQuT@osKI
zA@eOWRv4vxh#y*9&dg^#sbTznL$B)R4Cr*a6?0}Wo$#vtkAu}Wyb{aBmKQFy0B)pM
zdLsS6?TrrG{g!G!u$WE|fClATM_r(`#o~(0DrsVDr?4gh$N)&9&2BM%-C`RcGIWB5
z8>h@Auh7))K~bI93jZVe>gD$Y^1{54pHM}xFiG6m_#PfS{f{T8!rs25=i5#tbka%8
zt@NP$B?e%?-(0N|-^F-|f5B)_F*7?{SsU#iSCkU&yyCV(ik>P=7=E#`mD7t?DdVo$
z$#N>9G7BQ0L_WVz<~2FTxkhM0)?FXF)b--cM^7x{H#&rT6%p+msm$kv0WD12g_OE+
zq_Yp!wH~oGIWeePYxW=73p+X~6=wbhBGb>?(ddOLz^48f-x=@ysu2c7CwMCbvf)YD
zhO~ty&(=edkfbEfgih~UFtpgrD2LU3dKMNk2JOb7jlH)?DOeEO1#xK^#3Id^1lg~?
zLSkasR=2aI;x72j!JsF9=!4HKE*6Hm=*~Cd4kWZ}Q7Q2_zEHVbpYptRRdg6+9`bhy
z7MX-dzPEbn0{{vD&@&lhO57BVpS?f)WPYfULkaXje{8kr7@5flhe~h~7arb^>_J_$
zlUI=M$jJxy1wb`m9M6|^`nbh-v!@82qhjL+>0S>x#x1o%vA$HFWA>Vxn<x9?;$k-s
z&>*}7!6;#8n~JN|kz}tfb7go*jSJf;HFNT@y-UYW`^FLud81@vu+I9?9b{19Pu-(w
zGtl=Kn_cxc(rO8&7tJcov)3dsRh%}e4Y}SD36JGsk*BvPnWxa5RK9yg1?~gTAHr-L
zNUnQ&2lzkvDAWI;&8Bf48)I$a$w2tqJbW%es%Fuow%ik9*~=3fmz)H{c_eZMnmQ$P
z;lZ>a_r0GW&B7RDPz+bdk^?tV?#+CFrZJDz+MS#}wYbr-v4i=0D9kM5-Bl*n(7LzZ
zTuIP0`hZt|&mi?FFbEh$+}6zm_5itFSWZqX+30xp`B<|t{LbVcIw<pC0513<$bnqF
zX@hJqGQS=jqkUBG!9e8kF&FY336yDLwMz~H=F0IhO|Xu1OErobJk@rF0JzjV*A~iT
zSmX<l`JBAOTtY9yRrN@F<5bqyXkBPNZchvri;PcB|2&JLSJ>s_ZN~v6{n<%b|F@x(
zw`XjABTAgi=7Y%KYtsjuLK}G3eKGV@YF(jENXy#vdpM_ZG2lOZa?-y6`iUWX(EF!I
z2OwugAYTGEt~}``23WvQk)!K$>mwgRq4P^!oswRNd8a%@gxN=BX}&d6Yvb!#!>7`@
zZt0a|Jd@$|qX!E>1<Dpf*AMTp1ormY{fl(oIP<=?r3hrk$Vz54jXl3AQ56&950mTq
zGym!fLgL}t%&G6VT@Bd5=X{%9z90ZD|N5P)T&!9;oN(>;wjFCjGM3E3>l8`NMr629
zN(VId9YeUVFj&*MtqHm4i=3eER074Fb#dTGt+@;`UPH%KvX+FTtnpvYOcs}8%2{MN
zx1kOKjjo@nwZ==0F#u|(dSMVnC;Z4S^#nP$$t{h$Pze#g4Y_-U!)nb6TJJFztUsP)
zXxFe#Cl2+s0Oe=3kEBCyM9w_fgTh{2b_+6jmgaV~L32(lxD&bcTt2UreHhfPms;-h
z#N+Y^`HI_RMs2X-jpk{T%)~al)}-Rg;-k(QKZrAguC&c|MHzT*(E~OiR}ECkN;3Iu
zA-s$v#8_lM#u#jKc*3Jz#KV~{j~OjE%S>i>9@?}C#w%<i=u(3sBz@vYYP|77PhCNF
zTRED&{j<>h_N*5(Z-XXTPH(Q3;bSVf;u-&rUpLjfi;-7<nl*;ZQD{*JF%mCBmbW9P
zruSV;tuWe~;Azsnr2nOM{jhnpRm@2m;+~SV@hSlNiR={q^JIrh9G!memfkfiQ;93-
zq&2V1UTa@9Uh;8ku&`yaczuoXbzOYG>(O?V-XRcBw0U@hudj<0=&vo5`-CFosMLY2
z|4-#g$3fw9P*Ze+OvUYST03db)ALkFnbnj#cjQuT?}TJ(eng9Er~fdN!M`?Hs-+pB
zzuFPPW<47RiYV75bu~3iPEJl{yWHjA?iCC&1Ox;=e*PMqum4g(X+{ZCsjuSwzp9n8
z*by)p^4!lhxeMUo;6?$>)0@Z`m7h<ptE+o=vsZ59OQTX{GN4{<rl23Fl@}s{QB6Wm
zA92+7n9<<4wMm7`?La1z!nU$Kk}LA*Q>D+n2Z!}+$NA1!yz}NjYWHeqn1qxRZGS}=
z-AO;gM_Ob;f$*<iVZqJ0d;R_Wl?Bv_RgnY*1?T7IllVP3V892{b8}}~nZBc-kP-@M
zphEXtN9k$xzCAua@961yB_<}OTBcn@hs$Aw^;9ht3A!DB4n!d=v&YqNIa-WJOvDrw
z6;&?Pd@m^2hUa{FxX@Ra>621^rMGl@xjpi=#S^+&j5HJbLSt{bGI#yxh!LO9O&$V)
z#MWBPkaTu-N__nIQ8AuIB@Yx}60u|w)YR0mb#-;s&U>ohr8y{kpI*kr#^zYjmUECv
z#DYiA#xv^a@;Gfrzau1M)M;{&!QpeWi>&A4<IDT?>lfdeoQzDokdRQGoWQln&E46M
zO7CC>Kdrl)Tl0iVOmZnG@fc`haM{d==ye*E^Q|5q?iImv;xh^P+=v<)8zmp_&Z5?L
zcWL;&uH^GuDXhnf)#PSdJY6&F0rMxp%*<?C0!#G>?kE2G^=q1qC_=%6lG4&M?MZl$
z(&mlHA(fSt=gYrg;~|A|nUXFpE;M72gn|q^yStLzQG`Py2^7{?xVTbsnF0f>3_3bG
z)b#Z9Lmpt}qX7t*WQ2r-=KV>`G{!|mMX?zfx*679FtwqM>nOo3EiI=P%pi85kxPP#
zx=4|dis}_FFYjPFFLct{?9cpsT77*z-ySv=*7C}VUt60XST=d;u&}W9`FXyjz68>k
z9>Q0QjEp%sIniVi8%trBjB(C`nSw**Z4Z)mc1)I2WgCA25Uy?77Z%djx}&zRqrQJf
zud}s$kSz%h568o7vRP`C33&6K%|;kR7hj?RxlGw|-IiB~h-A#nF~PyFYHgQfL3#d6
zTwFX0%&$bZ1;^6TQngg`)6rs!gt+){J<^xI-ziy5`mum-N(%`+=d@j1KN}JpdMkG@
zTl4zWD|uW?aD$mjLwFPdJ|b%B5U^o}+kAa*E)R+o8HtF#@Hp=_M-3?5nIBc?QXy(=
z^#HE{m3BN1rwv_la<ata<fJ0V26>>0e{v}AoAVe7nUp-1a`0!o&Q>qp+}47$57;ap
z6zdX!fq_r%7uPp*_{$GgF`dVGyvytE%DxErV{B<@sga2Z#l#N<Va;YY`$$I%IXSr<
zaNYF`o<ogFbA-Ys7>!7s&BFFXabm5oLQFz}C@{}-m1)$hEV27*M8v0Id<zK3E-%-E
zd5b|i2l|?<_cu2;UMHQH(iwc$rJI>7#&3YFF(vL|L6Fr}SRh3>il6>>a`*qzyq(_n
zmjS0jCnVHEt$g)z8FbeoVq&13!nY10G5cXP14&9sTDQ#by4d$PS$zpwm}}kOEPmj)
zSXfw}KYz|Tkbi-cS5Pq8>g~y4GoO?>Q@ddql@=58QBv~F$;nAhlqEB9qZtMxE~kyr
zT&?wWhTIeJjQCH#IBY>;$`392(cp1G1ESVyZj=BGg!zq-i$PS0D6mR2SxBi?odxf^
zkHf)k#^E?>W!fVyul%DKU)GBGTpbg`!Xf_p{redyDQQ}I`p!ZVC#7r}j6AotitAOQ
z`54896Zk}1TRVxv8V76!?u3n_Be{G~IIy#Kj*Wf4*qhq&5XVDB{Q#a_QBm=0bTk$Y
z3Fr9ssI6_Q2J_n=mCqsbO|G^e2XsS>`+_4PHV$+;75+^NaJ<saW;q%D8l3{>M>C0%
z$F=&zK8PAzZpTExI>3mmPTTUE{mJe9$*d~7_`ELR0^T>D4Gr5Tiq&Qs94Tp4OXP9K
zmV6&&zEjAE%gAhi;0qoX75bibv_J-TvRv=chw}^3yMjBupN#D6D$n!A$H)2hQc_YR
zzc>L81D%|(HNI{uvIsgTi_wU<d3lSaZAbG$UWh+?_N><&tg6~vZB$g$3-Rpi>|S#P
z1qC!Bl_JHBbVIsOh~OtBs++s}`}|0J-c8q9f6uXRK|$~^0s;a_$;m4#E5GaQ*MftC
zdmI<ReOT?5Kj7iv4NpypWy@3XW`SYK<=cphzk;!`vFSBGJUq0R8}RTH8c1P}4_Y+t
zjeFKJ)js+%`v-M}$YQ;HE(<m~I{Is5WRt(K<Tx#oRklm5Ps!^1U@ozzN1RN8gqs_?
zXJ6;CEGIYDv6-HjpZ`96?)?jE@O2kEyI(^?QMb?|bWF_d0-02pdbg7th^!6NR4$$8
zrIEmCwQ`XnOd7YNsP#e#zx^fc!0+F`E%r=W;y-*>OL-+^ulPAcyUoYD)@Gp>WD_P9
zmOrDTXkR=ocB%KKXJ?<=9n7-FyH}yvfWebdP@rL9^$ceVPcWFyR-40kU2h};yP#uW
z1cKc^+vvF2|NGZ37(G2bkP)N|3`nNR^-RGR$IEnX7gW_ztEmM|$FCcvoo~*~i%f?y
zVgVFmWM)Ri&BY}Sn*3M-eviD8DwhMzA^<ONGf;gJ5fNW#a!r(sqawz}!I1=(jBRW4
zEyK*<u$m@PDN$Eo;owLB*)|V2jntRC;^Nd?8+rNY@k&FnBBQ^tv3`DjVEW`mzK;*w
zx{Wfmu4g8XYV*NiI-PxUy8FFTOkDuuKtx0Y{zX5Uo5`TpDjk8tZf9@5a&xgai!4^$
zv0b=IZh1adrqguFn#xBYzXW_wHl3&QY-^~&ehn^HEDDZgsPg5CFj1HY0jM5YTU)26
zr{xP}@yR3%rpk2A_on0k)FqT1{Yh^RY?ZM_XG`lK;#ZoaVf+vxukC-(tDe<iO*e8L
zo|GEPDH=gBQBjBOVd6jS?a!zbazx6Y>jA4$WRU*(Hs4GT+>80xS&Iv`L`4I|jgkR8
z!unKY%+CJAPc!)Z`2)zdHK_6O!yViZL?kRG7-8XdyfJ5I=bgE_atso*H!0#q*uC@`
z)>c+m+qqG1xN)+Xf<+RD)zs902P+o<?MsNGA@;waH|{l2WD+@THQ^y52}Qas9z}d~
z*^==zT-@B|%p}=F;9Y8Xc=(?x#c*FjLPEGo61Zb}SissaNlQzMOG)K=LJxrzsXl<3
zphT<AhK!O@30P)B81ALJ#}U5JW`9QKp$_k&Yt<hu7EVr5781O2O?Cjq!DPu-+;ywC
zd3v@@nJjsdWC{|B6mAYyTWQ~WbJD-+T<n<ftasd!9g#DFp$t-Vn{=WJE_j)(UIk(M
z+cc_$y7j-HZ)~SjH`qYk^5VrqF^I|RA|#mTh6UCppkvb1@_B8E4#3w)9F+sMpXCQ`
zf@~x)VIg6O?KO>FfQ$!CdT4$_rRYTs{!tJ>c!=Gvwgq`mG(rOU)SpPKv*>sL%D*H6
zY#(^SKKDDJDgwdJ`+T927lo(YmHn7w6SjhxpwCNYvg9qjp?mq^Ka*9v)ydrz61d6<
z+#b6o;Dwl%5X+MgXUQiJ2ypcG`QFqORH-0;C(U`tovToZvri3{83=jeZ9qRx(^o~P
z*(TF0^cyWiTinB|6^>Mx{}6s)ZRxuskZTl<EoZ_EPmR6&Jh|%Ke+_|EAP#$iAcCoJ
zpZ$l12cWiaFv76>ty&k9fVedLJ<f1`usSff#2B6Nuv=4g`+%5l+C96yXIk6#xsw=R
z%TiYjwnc{qQn$|pfw1Athaf*%z-evuRwmCQUcmv3KgH*UpHX++E8<|TgZ3R=OiuvO
zl_b|Qzek9fhZ<<>0miiov^d<DXrkLS@Vy@VJmUp`>BZO-J>OAGY=Rns+bPWzfUZbj
zF&=xq>Y2^N{?5qnu=*>q$h01>Dr4}iZ(@8K02AtUzj40kDox?fmrP=Iw!$@7L*oV-
zt1aPnE=;tpeTf5Vl|P8I2<Si;)K}Ux0@y{)sf%8@C!3)x(Z2XsW~L9%*!4&-`w4t_
zB8Fr+IeNV$bR8sdL<4vAlGNHSCISja$p_45u1IV5`NjGuCT2Xj;vUb+gc?{>d)FO`
z)KxW>io7;G3rTZUgCnF~WI?`1K=^1Ac=egbp+A4PTwh11QE`#PAovaTVKxdjRlYDJ
zg^g#?(fL%{cINu!+(XN|Y0~(L%=ZbpZ*3<Agq3(cAL-hJzQd#xR~6c^^*X0+_HwXo
z4yv-t;QW|Q%lnXwjL2TW0HK)f`4r2gc_fM0X~@=-wq`hAhCcpuPCqK%H;CWu`InZ`
z8V5PACmM%ukBWrWCEE-=MEjM6YE2=K+DIqWL;##HHg@dFXW%Vg$`CRAeSoO-leFQ&
zgbau}97+w1e#lML)+BLx^3vm|b>Gw=-|W?<Z{D;;0k*^VcW66TTvb7&=gawGUiqo^
z5Oajf<MXzy4nCRBv;HklEGItnjcv_fN(XJTAh5vSg7?ByI-_Y85vKBuT`yel>VE;k
zpQapU%UJzL6iCogCcP6|Ds`6_76Bt6Iuu#s826-2^3yBH9T!`B-HJ8{3Trh20$Yvb
zYpSf%8cL;>ztYm-NLP+$^>qRU!)&@M_wwQzlu|e#4z>UK^<{iq`TSxcQ_FdGI>Bb3
zceGe39g2~c)zA_ojK$`Ik1{x<rt2grE73mf{tliqJlhzZSynrh2kAQ5#=C3dMr14k
zmlI+=$Ki4?8=q-X7ZRq!5)+#;SjsyRo?03Ix;-_7wwn+OpdaW}ZGs;TCLOQq{Sdy3
zRu8*y2@#_M=ppIM7=F`h=A(5okR5^c{0WCos)mSN&UwW`4qIWA@7u6}%uXFwzi0G>
zwa%^#>KwWAKS2?%t=iC7AiVf7VSsEBKjHe4zQ>tLvdyrR3=+`5yjdU$1L!;h8<V^U
zCZip*U(N#N+bKua<4C;ya$2)kwe|LDL=jC4ikFH?Th?_!6rrO>>a-zNHWtAR$t!(r
z5plS}ZmwdmWheGu?;h<Y{_SgSVEwyYZ$`^B4x?_o=MJ(%a?W`tB}wYcw9^rS3Z5TN
z)t=DQ{RE^u_QM8TZ@o+hFdv~eUl{uX<(KB5*^h%O-p8B7-%@Iu0Hx(T+u#1@A7S4U
z8og1$@4V>D53uUfxl2|joI7-&O4Q$5>BD(Mf1&rfyLdv|ICTb|9bjt2$E*ATHp@9K
zyhhNY7PAuV?n<u%=9+fos=D~8o8nYKsw)D4bWHsfmVZQ$dlf1o-5s=vzJS5As7d;2
zo<G92bAzu1O&10T)73Ylh*s8~W`^h%->W@cy`ZT&iOC(&$q(pX7JOgiR^TG9^EaQ%
zw5|P7T`$u_Nv-yarbXd`Y#<N>&>1bR%Z6vxM8JwMnzM}`Ui{1KqM@j*|2uA7XrudD
zU`kj|F44X3@pJ!jR0yK3_>rtLHmfy)QtQIN4LR&<K`8xY?PPdngADhOps9^wz5#Y`
zT&;W)J_Nvl*&u>rjTRH<!f`0@?lXC6xtF#zUc<|&%e^<nCCJDenrJgUAtJ$8nwj(K
zzn!(dVaNsYMG{5^qr-Js>5N48B{s_*W8I}>3P`!IO<M%#U(0$E1;sqH>yJissn8dd
zK&50+KdWzUBi&@e9@5qj2g#>r!?A$g9Je+HqFS(gI|4|r`3_@6ElX#|Gz=@?buMj0
z?n=pl-h?sw0%jX%0VytYD%dzpK0t5C3iFurOof5QF<<#LtB2F^>h6HJ@qI3(ZaNB(
z#z6k3GT=~fbKiQy_5PVql<d~lr+X$&)|`@vmj|g$)Kf?2*Svfo-h<<n)*w&h017u<
zt7R9nY^P$V*+?&_x%O}ByP%bnPrH|65pxPKfM8F}-5<Qi`cReaG7|*dVE@L%PR~E&
zQp}aO0+P%Q?`#zHnaj$WPI5uS&(WfIF~2gg{5R#hNy#P|VJao^JacTMv9U_=nNe`s
zTewS?7Inf2oy8C905uP(uV0Q>U<97FbOC>LU*6}{bcbRy?;`^ALw~8w;~0{Y&rwKN
zP-4=16O|{+HB`=y=q#sAb#<2rvV2n4^SKbG=oCHI>2?^|aK)oj_uFqFD8$nLO2?<P
zq3i%0*zFx8`dZJmtAG5}(hTphnSdB~f?B$(PSn0IUi_HTxUcaD^NDuL`;TikDsf}F
zgqyFD#SmmSq*$CE4z&}D%S!J`9uF$Iop8?42|4YE>FfyP%IHjPFs<V^uo*pH0);@S
z)Fo}}(HgH(9Woe|QQ=_-Ri}QvNlfT)zQHCg?AP*jJ}-~CY!`PV;_<wN{{uDuzSm=Y
zqx}2S$<+_943usywiepG1jO|%nP+%+dl1p51^w!O6qE4a4@9fVhc(Z?>ZNl`&#FHM
zoW}0+r2r{tyl-2SerAeQ)V}vfm611Qr%a5bk*AhrW8K*w*Grc{-R3?(+}}M+8J86M
z{I1c8TD16~qbvN19s5t+|Au4_WijVP*8B+6HjEV)Jz)h<DQ73AAA2hu9YZOsZht%g
zjSsIJgx|WDK(UwU?E@Z0Ch?^7dXh4`ToXQ#&+}DeqhqW;wsyjS#xzXzK|;|12NV#~
zC$}#n+N$WFe=_ZWf)C_E0PS3JGYClJ9_SnWhyv6I$39nI)s@lnuSb>6OATJu(3~9c
zbW+$7-RYo^C96W6M?!auOp%vCvC@P~ff@LgN=tpoF-jZ?t(QiCQ8LpW`jngP0t9aQ
z=i>v)mVB@h&!M}QG{UdyO7L#FT$*Z&K8>%LUJcF+rdMD&IlTkE-e=nfr@))IP8)pT
z_C5F6lm>fSRM&;6j8!*~F?l`23u>t$8G=08|F8nHCDa}a0OZksX8!OC_B%G~m0=^I
zMo4Qb!&eWs&)q3QS8WVoKgK`PKnDknZ+BOo^4Tam#c*CLf?kA`L|dih$jIM$ICpPT
z7}-T7<w@$jv*y3)Y>Nbfg9m?;%u}h?IAY*xXjwqv)rhF`B&+lA_+%jn6*a)h&3X?s
z7gX=ck!^ivoMM5*=`DVvcwfx>5`Ua7b+3oMw??2%e-Z~Ef-nmzyTfmt75zu$oR`CB
zi_&Be`E4-aef2YJ*Q0LvK|{0)-u~{Y0@9^{?Vkt3p`|3Qk#t^I786uMAv&#qNZ<en
z`+sEN{ho7+wc--AUk_LKn`xqk);ul_=R<Xxp(2;(B?DzTywlECgSR%CZU~R}P((12
z@NmR`x{u+`nVIVr&f7(F_uXo2>2!`YZ%*3ge9-uf0K`R`m*~|g(f?x=0L<dfONZHN
zyA`1nPTLGaj}ISUbQ+z0FD?=QNWHnaSsgU(kshGAHXO-WeQc$U=@E*FpYmk@V22l&
zO@BHsr<g{rXoTD8`s-8<YZ4lo&?TSSh^N0ZRi?$`shqY10HCA*;HVgGXNb5__B4;z
z6%#TtvYWg6230DTJxO;Yey&2UC;(HRWD$3Fcj~QP4U+r-;oLtsxCW>q0`2~DV!+El
zJfSvVNB}%ge5k16^||AE0!mU+6dRq)1@6z4o^XrmTzM+DyDMgX&&v*=NI2c-J8MS~
zr0T<D)D5qyVugc);{pgxoVj9|JXM_MT1nf)K|1tb@a~^3I+zUFNrnW5hK8eKV~*no
zBf0RPwN#mty-W&a0jO)R_w6OK%f9;NV7ipFG-8v>!RmOC5{+}~)hYtOn1r32*Z}MS
zAUP&*QOyAo9#{0`!Q2y!2k@OPu%s~475cEnYUN!^OPSNt>Y#=F1%RgMX7?)54VYN6
zn2Xs%Frt<&UMi|!prJ5tMoOU95{)9@caXN7t{?_D15TY12n^9FDKyU%fl9*11iktP
z04D)n(WYFk%Wn?m(l7~|S7kc%Q`+-<J4PAUrpEdH?rywRsmaB92jFEiW5@)2R1-x?
zV!5YNiDwk5s;Y|8(*3x5Ml&s*b?fWvd9@D!$|Se6+~XX~98z|-e0X?J1gmt$JEwZ0
zIe{VqKxSZh+mf}FmF&|70HW~u+^JhHfU*8e_t~4I-yJW?Wf_>8O9iWMp`1Yo5J+`R
z%}otk03Ra~3Zwy4Rsmx47jGjWA)%wYdn@VTX2t1pC^m)kg*95xq<<`cH@cjyt*zP1
zQs=nK3N{*;IXNjA7!D(x0pajx`S;hEHeW%2dRgpsbav|7*kl+sp3myv?`4LeJ%Qt{
zuC4&8*In)_(r$2wJR4v&9h7fyFplW08XFr^^0cQ3`v(wT8m#dGo{fml69*Qys0EU~
z0hUYohdlAr>FNhSgBhHz{|(1x4QvlW`5qnpYao^L8W0gnw+>)Q29lT!xjZlFhB5`W
z0Ja#8&#US_LRWsepO%(34RCKp-DdfwlGz$dbX3%=TC3mwFT=5z{XuoVdT?;xl?40z
zxdYxIChs+OE(T^(Xl6;64uH9NT@T|dCVrAXp-?J6l@(+Y^X3^hf23wi4Vi#DJONpN
zG^6C^;gJl(pzl?4PXK-{4kSadk&%(J#spk;9}Yf2O0XPnp;sq{@r@Z78KZu%@Qd}b
z0UOqgE&xbr*bkxO1Td^(gTqE%R#sM>&D#D<6~M@?W3FY|tVzOzEwiUbr>3^T7+XJs
z>Dw-J#ZfC^3Ho@oGMvBv1mqa<B{FGTF(K%btrvG<k$CP=BW6)gK=%`v92!3#NDubd
z|4NC`K)p6tj1=%e{HQ!B&<`UOi_DYwPJzeo5%=Q<6@XcX0IHZI;N1v`)DEQkNjex4
zV6Z0Bj`8(B^IdU<(N!oKRtt^J*&W(XOs88eSh|&+osgKAx4;G^+6{^tPsmUpB6g0V
z@A2|);BVS%9FTSP4zxu+D`w8}BX4$Wh&tWImPvell=fY7pZEG#coa#n3r2wh=hfG9
zQBzTg|5VHmbpr4hARnm7$v>T5UM2wSk_NoAo`L-HQc+P65Ga7%0#2=XeY%nV#C-uz
z9|h=I-tVvQTfyD!?ZR&m5&KyWL03pkMkaEz{#`C_NbpfRfB(toK|$SG)=__mc)q=|
zXpth}1mY&mMyI0Q>ib)$6unlhvX9U4vfmSjbq}IoY;ke%IoQ5lbum+@eRL^^T4Y)%
z3@9il)WpOe^R>Sdhs^@L(yOBdKtFBIH&pdj18~uCXOw)y6tGLG<+=migueZ|6UEd3
zz;B%!HVP&;<FHbQB?A+ww_AA*WL;n<f6C{pBM$3K7dKjo0O41KpiU`A<TVK?smkt)
zmoN2AO}hbux!8y#W5#0j7Vva1U;qHXo~h9PDyd;3j1k5QR=5mA>EO^%MeHD2iP&DV
zJb+@J?UlEo;o<dz4bcFS4S2p&u(57ChF&62jI9|Y;yo=onnuqAU_o~#iZMZ`d%}U=
zzWoihq&bLvFaXX6p9KL3*3jB|0DytpfNB75;?zA$L8<f_tLO|w!i5-igW%@&K~WJ6
z#PTcv$O3p<EkA<}-2QtetA%}K@s<13h}{1Ns!4HaYD#Sv;F(?4M($(4;<h-oAhY~;
zoKj_6LPCLJITezIvY2)a#(3-)Q<p1#t@`-Wq{=iAAkeaQjDOsJ1OWc3i^kJA|2X-7
zQ5XJS)O($+rc<N&QW_AWklJ=C2%!JCoOj;=b=#N=)u&jY>}3!aEtcRk(%#*Qw0c4r
z(s^AOqB#+If174{ivm#Ce5tjiR+u_=w${22#P?4mm@fg#2GXG=Z#c={@$q-KxVV+x
z4*F(hKMqhA5rFvNiNL>R*BFYYk@Wxi6`R!r5d@{*KqCi;nA4MP!ZSe9Sn{%E2cw2)
zBO(GAn39qbaEF6qg>rxc{2(V61$gZWiwPR*Aj)^oAY5VzP0P!l<H7w@RulDnvc0ZP
zy>1WcxEJ?{yxatm_)kHg#b){p1F8coZ0wc&eQB__xb0WJL1Zt5Eu4d<L4~0x%L&MX
z&dvbyv4WVCl%I-2AeRELSl_}T6okgTsq&$VXnw#jnhd1q>+AagRvrn5ZFoC+1`y$2
z0GZ-t4gWDiAW7s9xDT+3;S9vMqpQo|>R3O8-LmW3YxFqhJgf5MI9-8S_NM4)RNznI
zfZ-e&8F@+++>V<}j+@fP=^*Kj6v`1=Sy|Ns-V6k8qt4Lx7KS&#B<7=euR(~_2EsN_
zJ}6Wgd;%;+JJ^j&^#TYObTC<9xYrBs{P8xnUh922S@B%!iunEjZF}6%7y^;vc^+6D
zDFBf-Os;M0iLwDYlHyrxRaKRPCg7;ZKD+_+sw}8}>StZNy}ZC{BqSBtu+Y$0m?CiF
z1_sxY)z02a4%@}MF0767;}-wr!$XF2K6k}AeX5Y4qmAF~?XWO_pYHGPKR!PGJYR2*
zLzp7qbC(1%#p?3%m)2H+HvvM|sC8iQ)O!KnzQH`{H`6u`56fx?N;p}^OEi?+w{;4n
zvA<{&cC?y}kaR^6MhRtq-Wkom_TkMYk|UHRv7N71NDc;Q{R?>bDx<$>5$M_fE#Kso
z`@1PPGIH>QBJlkD9PeUtC^M?OoDtCD?3R;E9_QPxnq@?U;D)?FM!L1t4MJl`SePO3
zdKh3|g?wEbX!O5OP>MDGN<mSGwUqFm#M7#Q7Pf6SjeIWxKBbvq!}sx)P|y3~{gdwh
z`kLA8c$shOtpFalHK30&L2>4Aw8#(m@i^NHP@!c=@@r{n!2m+0fQ6rSXR<^?7!XY$
zDgh^8>vn*^QT`WJDhU*TU;X@^fzl<7-!q}3L!?ZvZ4kKB51po3$RZGjwu4%6WMaY?
zBrmX6mJc}miS$7FXBfn6lFbyLzu2Eqa&U5rLqtL%2W*G=aMs6B!22lgmg+RA(kK;3
zM}{fAefw4sRCxJ7Iv@@>@7SiMCZNVBza*Iiu`dsll9F9rU9qXDsns4A7O$hhQAo#*
z_wU}3Iqy#^&}cyNj6Q!R0$W&Ocd4zd7op|v<)EJP<D!W6z6WcA_WsRho^OB)SvxpL
zH*I+a3-@DTZDw{B?DYh^G0%(LctcIF9Ra~xcY3zbm+03YiC2Dhdiq2^*@jDa9B?EN
zH6MQEu4a(7o~>R1ljZY$NCSj36{BR!!>IK~H$A|He2F0yTix3W1EOc3@BJ7{27t~_
zZ9eza_$fq6g#Fph`W6d~>|iw}ff@@QsH6T(di^9ja(}qv_Psj^g4E4`NWtxSSpwlT
z2W;l`)ml^yc8)v@&`R|`rN7BiT#(K_m_SEBJa|eyK!OpOolOkH3=<A<e{O-!*aU~o
z><dr}0hI@LFL1r>vBD^f9Kc+GD20uWkMD80U&I$TI0&NM!~Lx#F->+BD4()@?r(}@
zj0_Fe@Vxt8x<Bcdo%beHkl*|Ttk^H0DF~ZK7Ycw1lR=~bE%sq!Wv{WZ@hJs`y?y;s
z0=(O@h+plrGdd2$2vQ@jUdn*CfLO)A))vJ`z+P!#+Weycn8b86u`m+{hiEKWynej@
z9iYxCGx$AY<KjdBac<|}FbdG#XE&g5xVp7nz7q7c<V7s4sHBdli6?IlLK<<Q(md(B
z3aM{wwBQYY4*f`WS`e{U$>JdjbY#{+irb=>#X)|p3~xRSX6QQ9*+aPp$8D+5G-QDQ
zF;`1V4iJa$auC!6(x!I)iy&F2>AeKdfmM{<yv(<h&H|7jkTvEWRD82~BDx9(7eoQ@
z$%=XSZr1@lqi`6UkV1ZNPTpmx<(f@2f)f6&#;r&@KX>(1i9CJ?7Ga=p!B>8qP4;&I
zCwIWfZa^4`|2mX-5{TwYr8ojinA1jZR8m?<mat!CFJ~Wsb<)XoVSq4`@QwKh=3*ji
zR(K~P41Pg?<LP$+q{6x;p4r)Qr2ccd9h^l66v7tDBl8QmrM2S6gY~<7CMRd7W1y9U
zaP!+!nIioHqFcn|`iy1T6>zq8v(UZe=~x-ieiHF(=WF`_PNvG2>sP_TN50_T{BJeX
z05hz#)5J`<Rwh5ZK{M6?^b;Zyi!aB?(02q&^w+>0N{j(kSH0Wv4txYg7nG5KeCEs7
z0ZxIx;^)EtS8ix}M+=<mFh1Q@y~}hpMgxXw?nVLP%aet08*of5j$Dv%!`*<!*M<Q8
z!%&Q6y%)bf06xJ<%6J7OP5^m5_vY7$$MT4{3($dQJT>=Z1gDWgq^1a1TxUL#<gQNF
z+2lzs0D12*5laGKlI+V5<;~_K+*o6JG+lre8d&<rzL9Vch7C{+b^=AB@~)G`#_y8O
z+t*RS`QB$KZc`2v?DXmXyEEP3_W-tlej0#EGk|L?pa@hhwUR3QEts8qW+8nF&Xn%+
zxV_cFmAXqr5mi$QIy`8ucjio?_Z)ibZ~@pg7I?jVE<3-s-#MRGxQTLxBRUE+e;7sv
zgHtW?N6KKw=O)AnbZjXHI(p$TQ59_Viq{iAr#E>r{aOi9p=oPd5zhc0M@~w5b}#?$
zy5+N<4nXECEyL1H?m6W!I3l}U69gk7+MTWTaE7-5M5N2$1ei?I*KN+psPl6~4B0&(
zv2|W@UkHGT{a*ykfu~+j=ef&F(^-H1rz4KZ-g@BJT6po0ld=0`*b+n#RfJ@#ZyC~y
ze;@_9^W}GlQ!7`DB&94Hu`MBF)D<t$9S+KF!EI^BL3jxc`n~;ZVD-z?+xx1d90eSZ
zzwavR^xe{sg}axELatHSHCZ?XR3+Rm$_VYE16@B-O5K(rjaU|R^ySTTGjO`^vxPxV
z@)@_S&O}Ly`!pU9{02JH=o{<jC_XGziQH5V&7%)JHdcwRl1PGi-8<e;@Qd9^cfQHT
z9&Ql;=sFiLE{KIJe_<rmlb<u$&U|dFIqN9$qK3J|d-FS6`}L#^cSw~X^%FvNp4f&p
z^7sgxr5(_j)dzKHayTl+V~4-+`dmwu6M)?P>8B4c_!EZ<!#L#((A76x5iO<AJ)C~X
z04NbAjq8>Xgap+=-jXPkQo)BGM4VAs#P)<5ec%TOSXZh{o@l%CaT)29Dp>F}m)i(=
zZn1~|d_MNs!rlltCIu9<$AG^IP-=qMS*U@d?HZd<O#2fFt2_Hw;C!s(?mT|&k>JoD
zbDd|yo(DfK0PUB|mh)19`2?^i@jwdo1j#S>kPd@9hCbs<76(p{#yuW><7Y^VAX}H%
zkExN)mS@s;W2Hc}z3lRMiW@5d*ED0bCH>b|8H1(#alUhNnvMpEjDR<W(XMwQgxN~;
zJfrIpz3G2!WIby;Ov`PF((Yq+6yhCF6&=O_`UG+bG<JdOKycoEdn}&;$wF-vcrFa$
zzJgxg$m^q2uIdEp0HNQtD(z--)fDiN+6H(1rDWuVko8nKY~Cw$P%<~0lEmnp{ukb^
z?`=!d&v@&nttVIRBe#06@pKN9`KzGn4yqzv&q<T}68M1+BjBM8=9>+90A=1Z5!H+o
z?;&YTZ4MFf`8z+3>d4xj=!;A3%jJI=aztSZo?<al&x469^K!Y|dTnQ-C=x>V-%(xY
znbF~YY`B2VKiekN9g8>WPw9@;^XHE$gT)f~J<T;rg#&za+Fb^!?ud)lZ5!Z>+IUxr
z7GDa3+*lIC^S@CucwKyGi*Lj49(CS-taF7bC``Cx{mRtGGE!!v`4C3;EO}hDQ#C3d
zQnE4kTS7rLuLyg6H*PwI`1eUgn8S0w31@V+(gl{KH*tKen+jp79P!h`Mw6Tv?i$~m
z4Bi^S!KL3DCd7<5FmUzTF%E6v4L&<O;)L>=4z{->dbUAVQwFugR0e!UXo+yN9A)36
z=q-Kzl~ZqhjQxNd=OcC8|BcLQ=D{^J6DgUw=eY>|Qs@Uk+q*(Lq-s6NY{*ZH%3{YX
z`J|!l0%Pxxft@q?6CIkspEqmyFO$v2IbpwKF*nYpCSljSM%W4$c2?l|88-Ts-IK1M
zEyMWrk7$o?WpX`9O)WVy&!GfmRE*-kH|~t67T&)Kn>EvDH9K^3yxqvWgoRNpn+e;>
zxM;sSX7=BFwCUtXqb}<h88VRfrog8@(N|B1i-7I++3pdWJYed1p2nXLjKaFvo?FLz
z;|~2T^*wNH9Gai7an|1b`3hB!@5auy#EbV`jdO&m+J_mO++yo5l^Ym*gu4M5lAPy<
z6R-$+_)#}fdn@-p#G3Xh#bm7CzgJuC*y-yLN9-2%_Q;6};#EX9S#4r92D{ravs#*>
zeY4vA>gvq*^VH&Vuhw!@!n}d^Y;C6&^ezYVA7*<st|rE!a?69zc0=0beNPx)dHW3&
zqxo;eyySAb!&BtM>k5dqsIHz5%>MhTT<q|L^v2TAsrO#~cNKPL)pGkbW<MVRahaqL
z_YvPuLXr&r-H3m}*5FC4EKq$SOFi}#l(Z5heP6)v39uYy80T;B^yTLXKfhgrBIx}}
zs}m494c$5R9hDlsvuuQe+3fpNWQb*iE7@B{Oy@wlnp?QsGg!B>DD20ctY@$`$=8=O
zS9dhu^s{D9e8*;?*wRvZUh8|Mn-5cDCRbGR_e9ht4^Gum-Y<78w97M4S<<i39{Vav
zw26;(;tTZ^1d^_t#l{W|7eytbr+eE)PF0Oa(WTejXN)i~nl=lKrVC_<uBFygRE^IK
z`{<jSj6(Bc9-Lw>Y^)?wEhGDAoMHMC#opi>nz7{M{KW9)k9(Dh^G%Sl1@U0Yw__rO
z2an6bJDe(yz;k?jl1R`N=F8=%3aIhay=%PfZesZ8kqLN%niu+F9G5e>TvnU2u4#M;
zVLm9>Z}9I?fIWrlb?f=Zh=sT<>qQ_1DX_e#`L*--!myU+8^OO17+Z{Lxe80+)g`2E
ztITrY;Aqgq-n?!9L$2WGj*bbgI~8V}i-BR>@E%_Gx16}CS*Ot7;XQQCSe3GN{Fgt9
z4tRo)E<5W-o~dWVMTGv;+(rWW3Ws+ezsKrZG24E+fFor)nTx5n!pXqDBr{<DUcqI<
zizp+SdgguWxoUh-{<et+zOa=spzM+YnLrSJ=r{B9^(Vh{K?U>GvKpi{QTWg1<1hL>
z4AI}c;U>|;4qMQ|SmUf>L1misk~CULJ8|RRL{A%0{jl*rcAvl6?uvun_J7iq`wbs1
zR1PeD%a$~`_`~~6uL}w%K783w_v6c7kDguHHQQcU{`Z{}o3-oqxi#hjdyB-|TK+Jq
z2^%D>&^Nk2J9p>*@JqL919qGel+E1dd$G%0{qf?tKRu#$%LDVB+4FqA`Q7DVPaXb7
zspVaH{qc%$zd~W8M%sCaubaP4FrB&b>jMvl#TPk%yA({!&7Bv%koun8)!EqyTx%~R
zBve;;X3GW7irilgyX}9UypYmzDW8)sH@Zu6zwE7thC%C3Mk?L=BfacgL<=jo*q=u;
z7A#Nzu3>)k^Z9N!<&(h4gb8!!_5v3qe)Bo~Y@O*u7K0NmLI;wcus^uxoLIW}dtcwi
z<?AAZOYQO|o_yrw$?N9l=l0&wdu}Y(R^etJh6dT4%LRqzCGI@beWcY<4VaD|h1P6V
z7X#+dIlzrO49z-BeHn{=`eyezGVhiBd+mguM2g^xH)dW!_H2<XR=ayA9qC^_-(|t(
z+ZvvKcDTNK6m?rny(e_xn-Z>)quCQBjL&BE*hY(a&XIVccTO;Oib@?%k@)itGcSf6
zK?@I0<&s_Z{|dw8lPN!Uu8Vtrpxj&bXfi}0gF!)0>Gz1&=YauSQGRlYU)}UC3xIY<
z?AKy?9qt<OcikR^tC#vDUOaEk|9-dHe$BR=-iKSSKROnht;Cryp;M({_cf(s(_FKT
z>KZ`<MM2opVY{W<y?xI`xXw?r+|5(8VDqgapScg;Xvr*&W~sdRDC5cV=hi^+4IerJ
zIXF2B%Ov?O>Nc$jTfH!B_1svtz~v7Okql#K_EBNv0Sb6L+J7xHG*m-Jr=(0$#i_Tq
z_nh8AJs0^Wz~hioQc@lOm#?1FYjrts^{OavuH>BF<Hk<A6H>iwQoYA+rV3b!_D=*l
z*HLW}1KUgwCW#cN`+))tWpnF_3JV)!^xD0aHu<Q%UNfs>*V?u=HsDCg_UgFZO*+$0
zFT9!+7$1NCov7eM1K{%OjPEkQ^mehvMJ4Q}jT;s-F)RTK{9`}F-+#eEmR}8c)*6GS
LtDnm{r-UW|IU5I@

literal 20105
zcmcG$Wk6NYzV^Em6$JqSr9-+wx<R@_Lb|)VQ<N_0?o_%vBp2N!-QC@Hu=hFd+2`DS
z&!_k52SnCdbIuX}cz(|yP*z$50S*fe0)Zfii3-YruO|@5v*_2az`u~ny_CS0SGp1+
zf{@3jzv)eRQ4q*Sh?pRsf^+iTypzKFsoB=!!_flomqMRk@X6}&eJOijD!cS+%F+!c
z4G<0`5!P~(WHJr;67qp_TDMd<D^QMFSr5VIb-+u$?fzR>op!ih-5<Wko`cKD^G!|%
zT#OA!V+Sc;L?ej_Uh|7pOGu0%zxFv=3=~9rfjK;457E)lxjUcIN<<WRw=hGN=FY!8
zn!}9soqwzwn!;JND%S5|P8mC*kKuD9J?Oijvv8O57LQ9gN@s8M3QZ-F;o4mvo{M8*
z%%0pwR@<Y?@*^Xo{FqLFo<84Cm<XuPM;H>)2!y@vjM582jtil(1f{yfDC3dcB>wO`
zwg9)pfVRKzFt;{!y|%@$zE$XOW^}17&gW?xm(9(Gmmg$olyp(*YF#kylWX$=$BQlH
zvrq4d)@Z@Y1~qDxvQIrwrHcI9<mM(z>IDf~vihcop5-eR8GE%p_|tvZzB|eKbuOzM
zG<&0{6ezJ);KiNo>3@we9iAn<Tc=)o@;QfVYjn|luk0;jTwrwZ1N*#R2`S-DLiyd$
zuv_KcIl=~Qn$8N-H{ld?<g3{#uFVg~=h24qaoP$7T<4tqN)N`*Xf;A1vX+4-W|v;v
zahatTx~s*!&!%ttgx*hTGVRrV-k;v7Ozj(G7J(R#yCCnsD*VV!5=w{ua%p%=;%u)=
zE@Mz%SZapfogW1<Qbs4M?51<blhV3a{AI)eZqlLU<57*-o$Cn}%XxEauLHyFbGicR
z+p3mK>%+=-VA#g*^bw7|A8yozX=)*{=j0iUHi}Hz-dge&gmiY8_>>RMI?gQbFFJYl
zJ=EXrY*u+n1fj%1qc#sRB$ECznQe8f??#+qH-zm;EC<rb8;@ObN<SQ<S2S@lPG=#5
zi!si*5&b+Ds>Uz%p<=~9naCcbPF_fXiVR_}yV#|6%j)G>W&IX#*)#8bXUncWgQ#y2
zSXot-zpVbH$g!ci2&T1exKN{dm}(hfZ>}i6KW*sd)K;DO5;DePF|<j<oAFqC-mhg7
z|H^@~!eHH6_`<5!wT1C5&LO;av*+Z8uDl_wa_4hooPC<WAeX@o70#=h+3yM^rb706
z@Lkfg!iI*EuF=GS&3axdcb&IPPEMI#HLoO7T3Ck;i8fuG=PO@6+<88*$amN1IWLm#
zc>F1GnY~O|EN`K0xp664jO1UPihwuWFv8s)`4h7i&D1+}u{_y?;X~&?mM(2@c2@c3
z+JS?DVtd@WSQN}q-xTiV<!Mb%f3)+_5ykNvF}4}C(JBjzJ*pUkyV6*z<SFRG00wg@
z=4IPz{^*qit!5~gZ3Gw(4O*@6)}93v0T>O-`QV<K`C<z*Mw3C>L9Irl&&JA=u{o<`
zDuIR4=JT@+3`R42gqf)$IZ`zJk_gAV?#NUUjMc?wf@*5P3n}xp9=x%*w*s~9+$fw$
zg?J)#D3K~`O`O#qB=puf5?T(rtUC@F6IrY~`dtXW&<_O$x_yhu!OYM>s&!?AL)G)R
zu)y%o_(sc|Of~8-y`#QMzUd0>c|0PCEoSF033Eu`tx|i|vhLNieapf;Ipj2BcR(^%
zi<@F~KQ&e2rs3}t){q}lD`=@ag$Du8m0Y0k@oIGO4i`Bt23pTyzKGsdZ($S=;QD*6
zEjv3mDls-p&p={lqMV3{8pmH)YenBmtiW&rgSU`mqCj;$Q3-qlu`Z<wZcas{__f{9
zB1$+WxN>o??CQ|J(~&9Npt#rjrM-?&$&zPHQI0Z0XIWV#@k@;%N!6^g#&oDZgexdi
zByTiceSPX7NRE`@^F9{K*7i<%L6(%N>#M4QS#9HViG<NE!S3cIA%2Fhv4(SQM;M<;
z_^`*zh9({gvK3;^e~#5|&qB7w>(StR35TvGj&lz=8+cb{W4Vn8{pSOyW$z<%J4kG$
zX99oc#5nvY-PI;%L_f?5(qJFNjTfho7f??elAD|wm9us&K}vE=BLZ7C8KJokDM`9)
zfH#1O%#g~dpd1r(heB(2%Qz}BF^u?6OcD}UMbTP~_4|$%YDw2rnQYcfAt1y#Uzlay
zMW8dWc<<enR#3F}KJF$JGzu$D%xiFK;I219z@mIM{9tr%a9D0gCN}t@Kic+E)767}
zZM<3t;R3&|zw-Lw%=j?qSKzmDYHn_U>l;Nm(_)iF;?2vH`6Tgq1EqBG|9GOKoR%_6
zCI9R-Ca@@<wPwhvK=^5maGg9y`+aX5DDCzxv3s}6y^@9fTto22lSjTMMkP?tJFmQ|
zKHwgjS>im~SJf)Qpw+tFl(cX#TQ}ONoUO9J-6&z}&-IdaHaPr>o*inwy`9j@*l8n!
zYVx-g`BYB0PS+!DH}B%Ha7gV^*EuFSC?W&T%Wth2Cu+(STD?3=AemT!y|{0ba63<c
zHnbI3mp}mL>k~b0{}ATPZ!pV%!)te1RMxnCJNQ6$TWv5z!71#po0n(SJZr!g9WOX2
z-2sBD_38zYbn<=hj}CoP#fmQnsfLe`%a@v6)w(7udu+kqHB=6KyUTR%-|*P}f{LaM
zDEv|n%V@%micRG+R%YYiP<>hN9_evW@93Zgk-m2c_SBnNpS8UI>!?6&H5f5AH8M7l
z;c&Xs%iu6eZejVh)#ngtb)*hYV|LO|Ysuj6h1y_i>H(KaEcCLOtn3rx%G{q{TU+n%
z+zr7;uqjatX*ua_vA8qSU~^U&9J(wm9ukzCAJx~%*Oz)|eOkP?#~JdJvMH8J<zP0i
zb!PUF7Wg`v?fIej&d&MhW*FC@`S32b$=n3hz>PNS!}#yVn;YD}4L0AV(nzBNDkc*W
zP)r{8!io|X(=49xCG$8X`4wMW72#zRvQ|0~xjH$nt{1#_uSqlL3DKlZ7=Z`jrTLPZ
zugH`|5^FvYtU-5<_Hc^R3vC@kLGQz9Ry_ZW^^^10)cqmR4GjbHDdVO}8M4E54m6`<
zjMrL3WRfB0F$O!;$DOs+Ps1~_)bNzBJPSk^49wMZS5S^pE23hsrAO!H10joLl)P&`
zvgGg0HMYgT6_amHSvW8Jk5)6kk-vwN8yk&js4Xe+pHif@3cJkznw?|x$z~D}!s5;u
z?OL^0i~bN##fn#MbNwmg?YXGLkZg6q!KKEqfl}VX?ru%?@YSa-Y24XQ*#-Boj5j9G
z4g~YR9$|{7xAcyp@KXLncOsxZN%vr-^Fze_-SdfwH{@8r=Gv8**PN>}wrR7B+N}3o
zxNst(*v|-*GBX<3%QpPe(?Q;RU8S&jv!+ihqeEVVe6mr~gy<0m`x;`+E#hN3uNg?H
zp?9<R*OJ32{Ap9C=p`VBAJ3-MFk$(Bq$7;@Hi{;UGyj0eT(I7ZcSF!c5Y44Kl~{-;
zGc!*wgu^dJTn)`X7|qQwN(Z$ASUjqi_lN@i$80RA8I8Hq>8sBho2N4w?q8=#G3_+I
z_Rf#rbPl<RIH~d|EnF9v(kXB`I@-qG^w>O9?$_YaTlb5483eNglHs@oCz4*bjLFO{
zwj<taKAn9beqGz*Yhq&3EO4Q*13OThK){8@Ety%TEE}u$jad$PL_%Y=Myelet76Fr
z=rK#^s%4w2k^B%>ueVm&?<&uo46fU^HqS81{Nx5v%fR)+k<9|!&kl!2zjwD858FJ;
zNhZ@>VS08c4X+r>*ka2^Y)f0up>iL-NzK{XNLP<y=R$FAIzxYv#s_KQm|Pz&qw2kh
zB(^!4{%~V&1Czd6IzgP5ZMVOsG{<qu47OqA&M6HhW?jQwlY0!m(-1z!NQ+5vg!FZ1
zL~^8XH{YT>NDbk%v^o!!2a;+_Y0O2%jtA>En-!e}Fe(lD?~n=Le=VB}#bp#I+;Hyh
zZXXSViyY%kBz7{o{;uN6$~9j;sS*v_ze?WflTiLt#JOPSXtU)!>AJ(YLH72{!TDXI
zH>c624oD&3+7RcHJrZuNsZZrz@|kor1UI87T(`^_;GR3WNY>P7^^pVbUU@W3=4BLc
z=SU)8Oji(G;&*@>^%Kc+<qGi}?DTpyp4MQUHeLIIi(?8T#N?lS%l#>%zU4VmpXdxa
z%nzmKn(+&8n&Zc;52b1qezis>aKqztr)69|U7C^9F+2L#v(O#(;Vh4N_c$|aIww=5
znhX#J3?=uV6<11k$R~$VFqM^+#s>#Kj9N&u^NiLSxFW(+%Rp2KHag4B4Q4jX^|QCs
z2>zi)wRI&XMXM3KBsq*5JGkTPLO~>+fK_Vkio{RrkLpMiNj8KcCNb37HitnZzzy~|
zCVM*Oo0>R1l}V;WTY_NGHCC`Mq^~*L$hB<6u`XhI<v?0S#Dj;?)><NYDnROe*e~%q
zo~g7yYFce-Iwy<Y_IYxNx0b{ypUO;i`*a~+4{6BkQQf=gJ*t`}6WbNb@m+H?Sh*@l
zHj1Yt(yHv|S8#dF4`4x;R+PUrf}w%;c9^G&W^F4_@S=oV;&Wwy$`eic@K3so$FINk
zq(ts4;6Y2vOB_7c`OzYvR_R6e8;YwVzwltg4M|QOh;(}AcYMHleS0fz5MM^Vl(GW7
z+l(vBxvJsXl>Nin<HC5pw@_EI_`Y@cbGVQA5EOc9SLF2|)^ugYZnDgqf9GH#4-eg0
z#PM)>6WqM_EwJnvsHFc?4RED)w#XHzzYDyRewtZg>SSJl!{e!WV^>G$-<*L3+xdF*
zg2JRGAzRy01rxpPLQQjZo)8C5BR2OH({FmE<xDW;2UM~9=eKd|>y}q~>$^u#GRU;@
zI`<Y|$~s5{c-|6Iggp|DO}jPt8Ch95Cwa2uqS9hSggcl|6KZwX>tyF@cVAQD{2p~E
zLr>|12E9B$&=dBldMZdn7(=@n%Zy<BKrQi1HqVa+L1RCm&KX}Ot%dl&gb>s+d46_6
zSmVD6NBv@B(ZElSG3Q?mi6wzmXYfteSYhZHs2f3jC@yD<1uC$;>vjI-F^jo#GS)-E
zQ%Z`M&Vq1lwGl!k^O<oKJZvg>kYe;s=H`=IoYTmLG*9{h3zQXZaaz2!K`zcPfe|4c
zm=O{jXN-&-ySm8JtF2BD0ks-zxJCwO%AQh3Nu->Zxb*6Hom!)NjE`N+$#pEeN{7Rm
z(;ApdEm}D3fy`%=X@|;;kv3!Z`3hcGUBa%F#%ui}`)N(bY|ddaMqnB0^^X@7#wXnl
zez4Lt)onef(sXBWBU?9>&NR?7$_+E?UJAsHc7pWuJ(cVi*TPQ~dY$;oi(>54$@bR{
zu}1rm->%%7k_H979upD-_EsCjug^z#&X-&IE!DWbNE@7%K1ZvFAkLR>_X8Ow15})#
zd=7NE^XWNtw4>ufq@j5Uvh(!az4gx2FUfn3m_=0(Bib<}N<qQ(KB(|k<yqk+XCG)$
zI{at`6j?!|0KzfO0>d{)8ngEf`Q?i0e)K^ayC{^5@|mu|GrhMAi}2yAZi}d3151o$
zyutd2QukwYRIYS0Z)DEvorusB1=B%&0LYV9hK_Vn{-nm<Y{ImEb|wou4j-Z>ew(G2
z1fLys^M{EJzb_L4&HuYV>emb(QB>aPe_ri|a&Wl1bLgSVqvH(Qlb1(FL<I6@IPX>&
zEYEj#@MH!1TRwb%Pv|Nk>h9`7K}OE#d8a?n-R=LiNOh!GgHy_%P@=xRUZLPCf`&#Y
zX~l+>znO_iU`~#~!v|j{T}#WbrY7$5oj^oZThg$Imwc}T3E_R-20Td+|8f_^<sYHm
zqChx!_7CBJ@c*9|GCe>smha)<;q}&_5!rcpFh^S>M3Rz{pO~3nrt|y4;c(cCMiIar
zrfuM35;ba}p`rcw@#AMgLV}UYKq7N68({`{fQDH@Syfez<NjZlSWIkeM$_?p!Z1;C
zIKl`6<MI427}(gGH(WF{2uMgs2!h1#St6he;|)$$a`N(a9t-JwFuiefCEo&mw2`8y
z_=(5SN=1=MDey2dGaG<g!U_^4HwPbN+7W=<%Qyj{prEkd|Eu^N`Him_ak-?!?xa+m
zTahfe@x<>BhK7b%VdCV};N`v3)A7|7vzfBwpXljzz<WU*LoNt@V19M9ytTU<m6|Gj
zd$G@q8zvhd=>L=dJudFRVasE2*|pK-!Ed!1T3AG!VPza)Vc|-%DMSkki_p%GPMN`m
z1UEOkCC3^yC}eI_p`GuLKlr;)=t)YwWkzdHNKaC4bjCzSM+dL91FzNT?eEW)*>t78
zDR0OX7$LtEu2`HlP;ln$p#PVt<!@d=jl}rm$(>W+B~7sz_%@;T8>rN!{7KfHmh{zs
z={swu7m4M*77u*2Y+uvsqdtJ{YIO{AHkb=>c|edb?i~<$O!S+>(}+uNhhI|nCEA*n
zAdxxAWP&`Yc0Y7V$Y&lC3?BjQYy~;g7*s-_L~8Fac^=9^M+lm<-V=_Z&2swzWC)gn
zreMP}D#+{lGgf>z>h^vE!l!$ySuO|+aLr9V*cl+7<D}_m^~9M_bMO4cYn5TdisoAt
z*LxQwKYC^R1%epbEI4FI{b5Jaa6Fo(gNzv2mOVKnL{gpi_mAQ*7Qa{Z<Mw5w+}u$>
z3K1%GeBlt#CxaCWikRDHRKp`9D+OXHBO@caBfmcjOD{-HAFIU2G3Zu1k&zDm<pZHI
z*W+*MV;yJ26@xE}M+*@TL7<hP+tJdpd~6BlV4u>jrvejl-*w+Hk@Tg~d{1(B1GL!f
z;gx4^?Hv?24bSjv@E+UIx5qj|ea9N?*1H5Yyu9K?=#TBqlwiF_H-vj{at128IC$O9
z8UrRHf8s|#u`a-;gK4rZugNx>{X4Bh*>|Nwqqy^wYmyCM!LSI&u~b=??0z;?<sfL0
zCL<w9!5aJ!C?l$SUBCJyx_~wWy_jnW3|&a*8GES>PM7eFf?auL!zPlk2}QKUV(tBF
za8qUFOnSTGGC(!jnx6@sz0{j2<Na~6UM?)VF6o)#rAbDziFZnE>?f*^U{`1^)}-qA
z!_RjWh-b-rG$s>;SgZb3*{&0;m#@dhCUkC_-%VO@3J8wNGcZ<gY~}nzff&3GV1s~H
z)3c1iwl)<D6g#$Aa=lpkV$Q`8)3rv~a(k%<869PeP6N@ZiG^v{Elvmx?i;w?*#FYf
z>w$zfwC#xd)?j1BL!peSyADR4!oV~@;#8&gWG}TQ$cwdEbnPHCNyE}e-Y@2HidE_Q
zyT8o!{*W4%$AkFwOq5X|M4_BkV`=>ZoWJOrZYxwa9CX->uCjIvj3lpQ=2|D4HrcV=
z{hKv*3&y2nhIV!^Y}t1O$H)fM^R@CAx;<Mm3W>y20^eBgYEsi_<!GB{57iCN#TA1r
z`|Kk~>{8flx|+SBId|Kqagy<M--DI#e}V>AT$}@_DIK4+;#{jJn_6N%-jNYTFz=10
z)oigk;wn<c=@}n(fyV0{7Ft+XSS&-&(juxPd^2x|$fhe;2Jo%Tt$ov9sR#UUjciJ(
z`kIc|z83QSnI?E_?^%ch^S909Op?Y_;HULjw)naM>|3yW_TU>OXFdBcr^ix2S$Vy1
zNsMMFoXp7<^Nky;+-53`X}9_ZXz@|Ba*wu;VtX|l`A$35$q>vA4mz?&iUQpdp?QpV
z@eEc-;B7Ci!W7wsA9U5#C}UYS&5txZxm`j*^FGp0fenUXso|bl!thKNG`B!1I&M0A
z16J{Lwdsqh-!n%dP;N*3w+21^nyoEl1?AU8cs<c&7J-2ht!{(TUoF|h?3~D+yLZb~
zSH7WoEWsCWW8Jvf7Xit&dy8*Cg)7S_qL^%XzvELE|Jj6+R>av=qp%2Xlc;De2sjY1
z+S4@~9<xA|t<!C^&bWT7w`k1bkBFb=dcGsXGK3U@(M7HlN&MwBs-*5h={<}aOSYJY
z2w1Q%t)<PO%s44W&4D1X$dSL_yRmtnqB^kx8YE}0s;KNWg;=k7|G?BVV-BumZd5gW
z%z_R5&TpZsOt^lsFFMdv{D5fg+x9nj@u4wiTlNPbA<8ujlg@@Cc&1<5pMG455}&|s
ztxUX@^8eUqw1S~RT4^D2dRil(QoExhskxhP1Nz6gzXL`K=o&K{_#Jidmv8E?SpCDa
zmXBiJU<D~Vr-6%*o}JrYZFFZjhnp6SsywL(^==QX0S{7`K+f~pdwkwkp6kxo5GSgO
ziL9odFg!Y%S=WG?dY^c7*VzJt<L748mLvW$w*NhM*_tGAc?bxJUtL=Ey0cz9IHu$W
z2Y*?^c|`&Zo34tDnCgZV;c@lz$YJPLexIHZ@FSD38p=>@|CJ5|6O+Fd^csK1bML$H
zO*n`%eg@E#hnSd{j0{iUrHxn|C07Q5vh%shYFf#ntKi(2Ac6>aBk06=A$IN@^0}4t
zdbyS_wa2{;%|Qu^`^uwa8T#W=Xiv3IaAp5P@6<+4$WOe7eD{*Pg7%ozikQQ^FsttI
z<NY8eo($_int#b-fNlKG5+yDTE+Q-p5#*`OtC<F@U;;))RA2s#k><%SBQnDy$h=i;
z#FqYQ0h*1@fA(i<0A>jfM=DaS%GBT-&|saMoXiC!h3=B@GIC8jjbx5^Or~a&D^}>A
zxj7s+H@DDkg7>sGA^)dp`@dW-4abv6#17|5C8?*uzI;jVe56gO`1?mf0;Z*<<=x%s
z&{`vv;_hUTO1-_w7eBQ^0FamnX=p;NTJB@7Pd7Iyu~{u~Xw<6Lu8vnbIyy>C#z^n(
z?&6uvV#^18UcxI^n`44m62f#WBRQBMG46;U5-F{!>KquLQBtwCF73VDnJ8G@-Idt?
zTb01+L<<2|ot~byKHK`jVZS9yOpk7)8+`YS-FgXfzBAF@+6v+1<eV&2$)d()HhoVd
z93uPcaC<v2E-vn`g+Bc2*R2Bs2rw`(zZDDoN=mGXIc_fx^JLO^UIsm$7g;Sfd(5<W
zd42o)lSb@kmF0ZBm|Bfx3?e=cbwW~-1gGQP&z05HoTVl0U#1hk<+QcaiNzwLBO?jx
z8X6=xoerYGw~l+$1W(_B@~pS|#7rQP*yQoyUJlGzc5CZr3IYPYdYe_hHK2b|(JCn^
zQIM09FJ8&Z%jfjP(MhDap9C@)_G849pKcCG6c-mCR%+@S=85Vj^hvLgN+pU?eJzxw
z;B-Dp9|zU-`YjYH+SA!7#Nn_Ly|%JK$nAb5o72o;!DKov3itXol$F-b&W?hX_MpfC
zvYu8@P!Js-pD*`tb*$IZ)<(GK;sFsP?9*^0#KyuBkBEq%Gynq;Q&?1_$iwMzQ<+^<
zM3chf!J(wKQ>kNYOwR3b!?ainGI9>k65Mxlva?0eY1MxwvRctf#ed?<p=M@Q932_y
zsR>1Dm9`1FdsbFf_JxN>I73zzEDbzv*K9d5HZ}}1Gc$gE{)IXOhxo)q6ny+ND{k;d
zT|;B0-hoQ3+WZSeaCmt4_;_XOX)I9$6#q3VE32-q?oVQ|bvhy<0TnVPrsy=UhXjc@
z+A^K?SG4N2vP&#G<G<Rs$MQ}?yB8Kx8=NM*NWX#_xHw9~>2M*(cD>iMhQJ7H^>-D9
z1DRfr4=-N6Jl>h0%FN81ZgOLlN@98Wk)A%{8w_l@<Gw02HTBhTH$LVkZAf5XplQvs
zPZocfNG0Q2!O9eslw6xEQVYRkBvs-%-<{g*PhfQE`deutf3Y_sps!CXCMKp{YyFKt
z!0(gs@W&Weqrv11zVELN_0FT+6K9LigZMA#%ZbHCk5{{M&}dXeNl8f~eSLk$n?2mN
z*LtEN!H-(M!Q@cL=jKatx}4~n45#x^rZp9Xn!8;d#OzEKQEh|0pjhx#agaApz#mZz
z0gDOBxG|O|BcajY7*kkSNQ{b#`pa-2akSi^&lXpHsz6ERX`}Fc^;h42FQXS-cQD_u
zy1dK>RwXlTP*7zh6Qxpdf3wH!$=>_OwDk0k^$xqj&dzM0Z}WYp6Id>>rwWgiQBcsg
zndUWEX)?B8asx(sb$_2G@(N!!nA)z>A(*;R3H<A|?LWK5|2_VYA8|L}@p?*vMWE9`
z_}(XuP74JayRXUZk_k5`Js0i+rMAAlLb?gucm)*^5saSR>hmGN;pC1E!Lzfo;jytN
zqKpMPCV->iXR9r!p!yAPl|qC4{lp|BzCV7v80oJ1@lJzDBGzKIy3A~<__++(f3=pz
z)Dc8PM1dh8f~en1Qn_6CMMYnO7EXxAijVv)mV~~Vnwq(V1(-yN(d*p2JVr2ZJ5wbx
zrlzJ5gKF>K`e09?@$l%h)>lV5V8YuwgV90b^s!ONw^}GHFz~6pn*RG&S6kcr`*#=~
z9-c<$<L4mG7aAEGL&1z6pPh9~PNI2ucz}62Iyzb!OyQ)oDAs5|12GE+7Z=2ymXp}R
z8A3wBt(gk4*x1-;8nsy3yaW3G^a6mTgp7-e@L5~?quu7<`px;SZxz%ho&9B9yOOEt
z?-!!Ke*L<hw3sQ+c_GSdHW>{{43e4YX;JUB<z)hPPEM+{k4tN7#Oxd#;@%3?<|@DR
zy2Io^+$8z@TRtzWya|M;H$TBRXZs;wi|6L%_OgJGrrGRH@$@08s;Y7gj{Dgg14$Cz
z3R%JkG2N+mcJu1bv%w!9YR|yv(+xNN;~IzEufIUte3?>cZ7EA9hQi0k_j!`h+G%h4
z&rF5U@ySVBSC?NBs}<$0pReyop$g;8*>*c!%U#=_@31jbBeWXz*<4`*o^XpN>wWA_
z2RKn=GG7xmyF#(Syy<TZXW;O-$IItQkNlD+17qjc(&D8<o%``Uwr?a9Frf?q|L4OX
zI#Md+w~qgkHv#SNqWh^-@eRmPSs)w~YPF<-r<2Q*#x+neG$f5AMn*%+HAhMZw@hiF
zUT6CfqNSy^PJ0RN=2<NmKsPO6K5}WeeGHfN-WU)$=uJk6dt<2l)6($q@bKPZvrsF|
zk7S9ART#<8YBq|d@p!P=t_6tK5sML%k-?;AMLBpLoTnPh7`1>9A6`*W(VND`Ndwi$
z*jK&1y0Tt_BF9pzv{ji+vDvJ=_*}d>W2mpcw7Ch}3dZ^P;zC$Lf|;6zhUWLzA~^k&
z%IDKHR%zlXASuFp(r$%VE;RNGB(cskx-gz@4D_9*`G16pWvF|CY7xj2);r@AclY-;
z_V&a~Oz*wH2f}FU>hkOA5~il68k?EH41>4>M2bHkS?8Klk&wIusSylxcRalw2CpaA
z?o`Rp`OmWDcK-_NW&T(?Eol(qz<zo0;)S-car`c(u+K+U-)gh{&CTvoo%VpRFvG)z
zrbhScNS$`SGRt`m$VPv{cTg&P`}VC+wJHdN78G1uDM`t<Kvj_CNv8Vv5#s$NOZXTV
zP2_VWF$sx?j?d2(6ViNrUp_@n5SekfU87gK!^biNU<XsVgR`>qbZEe2!~0GWboBO8
zDwVIV?eB-y)YP2Zdq0Cw=sjF)DRHL}Lt!);Bqk#Ip2F!gn*W7pvRDKDbDiya^m%eh
z%Jq7j)=8)o%H<lmey-rzUhje;ukG6FV05}%$pnUu&dz7Uc{2D2B4n=<m2`!9Ef$+o
z%JjN*_4EYz`JYQmOM{s2pCb`x%E81pT#HgB<X5P-1R`>o=>#PZyk2)o2hIQ)>&WmQ
zRiJo(aaDTi^t3XI`E<JbBhZwd!@vXv1VGa5w?{*8*yZGx-}nj=m-llyA9<UM<^Gyu
zJ{`@G`24lSAp&|rjG|&VH#b*WUQS3!NvV{Onu;gj_jcs70>2JwH<W=1#HX|Kb32dX
zqN0IxzVA%$B4npQP9IK+oEROA4ClGY56D6e@)6a?w6(GMGdcNnoe|8ijXAa6e<(?m
z;TI9aVq6ydUEpmBASZ~)$S5_Js8&&4TwGv<h>}Y_X-MFWE)_39<SbL8v3t^vp2RFn
z%!t@nVKCqS)Q$-I;{E+$dwP19jEB9!&Nbt}$#~aviAZp|F-XwrHFRtF)mbDrmy|0g
zsI|zF28<Mh{C%PNInlwv!C}?RWhyiy<Bz@7>gNVD<^`uQAK8`b{`qc@7J|G8VWwwe
zb2Moh+Kg4-i8I+TX5CRW!Tg(wm*$^d85`0q>4z9!LNXv5#ecHnq+(4TpT3h&!?3Zx
zH5xB8Ec)sp)qR_R9H`E(-iVbka=p8~GyGeH85k=jewS=J^D+@e1VjHF(|YR-#1mlQ
zdFotun-_JqKH+tDF<zaoF+;GNR5}3U1e`kQ0!9gvZo!#2&@l8RYh9^wza{w<F8U|a
zUbGk&PYyj!1P<Dd0Hgt56X*!Cbh=++aD?PJ7SvHT^Z;+hF~&L3y4kI^N}qpm``1$-
zxEQz$YV0}%Dv_&$`x0HG=haCsY5%_Ta*mx733x|9y9MzsmYx*Y+xYK5&GCi>@-Y4Q
zGS)!q8fd?WRtXSq;HX%<bAEsLr3f^xWZzxuD=y>U0TQCzbXhXSxUZiOQDQB)|9_D(
zfaK4iGvI!rk|PJJqO@#w`=_?Hj7NSC)#&Tr&1zQv=k2xTm?0;>sc#=uX#(_0kU|~?
zuoyn*x^<hSAm#4)zG@o4&e06a+S)^YPx7>_xN53}DQMH?=HCFkov$(P*Q_xgAS1dm
zeaH%V-GD3xWE+41<)s;G<2ZqJLl$)50D7&d+)+Keu9E;@o*=G0finl*Kq5(7vo~O7
zA*B|WVNTHxH`yP3x~M>FblOB{ed|dL0mdn)qT}Nq)F&+@J!rlKDVvcA>iW|Skg8WV
z^>w*0`P(OlfqAwDk|t9tM2>q%85(_9d%P%Jk8=fbWsP+Vb->voJ6ThrfCiAOGvGVV
zfqzF%B^CEc@W5(N?6G@z8LC9i1?I^+mj796a7(P7aeAIyZc!2RxL%u6w4{bPUrC@b
z*W3Vr1ROTogb0|#U(rT}4-HAl_kz89FWk}p@c}DI<j<uMRn+SL1?`+9sCs|~S2&W`
zaSwj^<XqI%v9LhSll89b#KCzD6=GgU9j&$k{1Y+jGj7N;W$>LzqHBb*fb;;(hXMGC
zfPW|=I=QQc7q=bIDIji*o3;aeX}1Os`I6~4)B(WF?TKHsJa$fFz%@dxxtrbsRG7I&
z)B)g#K`Y_$u@Hg>Ku9tLtD4Ea$_PkYK(vYk)_{KX#xx-FnaJjyaMDz89K#)kgDbB9
zAhO;YFW1y*-aC=pkt%?$%-oW8^48i@7{R!!OT%kaXZX^ph&4ZtlRjK)xJ2z<-GJzp
zRd0F|o8mTtHLh5w)M*}L{opu^S*7OrZ$NaIRXu%yF+`-s>tfLD?M@d}BR(9(t+p5f
z=peVYw<8i0gNiK|y1&jhIJ9Lsyu5L;I$H2~KVI_)H2^XLF@t@?Nwz$gY{0JB8x5ZC
zs|MMuB#wJ@aB#iyyy)Ugw4ALD1!eT|;i1+~L#Mzf4Tgxw#KC>HvL{Fs)u<ZG*o}_?
zEC8r>E!=|lh^N=JfsFE9)f4t?{K!ClNr=A`QrhqsVIE=tCa7$GUNjp){x73Yv>B&c
z70U61x1XyX2Mo6pi4tE6#7d_%gbHNQ*?BzNby9(la(A&=^f>p`=45IfW2ZXBKTv)_
zgAd*gGidBknJ7@bcl@2a9t;E!S9)gpVL^;?`@4QA9+MrprR@_eN9CW@O!Ve9NnY=0
zTxk?9<ofy=ijf@N=Pi~Aqs)ve<IAJodud{mEBPHQ;_}*k4^Mi3=btoH+U`@C6Q~nB
zWyQU6w$Nj5dB34{-@JPxD`InlYepO~Tb=*Mw-pnTJiT6I`-}45vj2~d8IC{Qobeky
zUT4(r<8h%0e-DEvU*|$b&3jYpq?(UY9T)dlk7G!SI@5TIGtceSn&0bOs7`h|Hn~`5
zPxHLy;xxu$184jv5V6yPy-saVH@T(+q@5nZI_K6Ifl!sOS=yd#v0iiMB8Bh1ZIyVb
zEDqqnlPj}H_+Hdp-N*J}lWrl;a@GZd(^I@pbFuXF^J`!PML~(0xEcJo+xU6#VY$T3
z15;CrY{nmZ21W|<+_UKi@RvfpoVRB^yM>CTQ>yTo4dCNSglx^bHwCpc+k8ysk5emx
z1-eV}na2;#mpzUy2!8y0eAf&lq|tUe1h7m=0O<$7|4)S$YCWP_(aEZNS|7lD13ob=
z41Z4b@HAB0ybll(KH0&Jp}#6Mx&B1RkEW|<@a<BmA$lyC!zuW;Vy}F&`Y-Ub)o~?q
zTL;%LL^rHYhCvrZ&i<LNo_%RkXQ@#vUnc%U`ey{!KFs0}W~I`*99Vwbt#|yNE{C5E
z^Gt3~1JA_-4qMvxBu{Lss7336m271a+qEnsV8H8N!Q}q6ts9!~iy%d9ig0-njxw4m
zXHvFd%Kvhm^@nT<fxAp9Nn~v5H{UvXVC{;>*k!c+%!p!1*Iiy{l0gmod8)d~WM&$Z
zQC`6B!cr3KBBC4S99KoE-dL6lD<#(AMc3>?ue(dHa9Ay1Iz_l#_#qJkN1brJfp0fh
z4Of2$0rF>=<+e6}METk(L9`a8RB?yEP|M|V5s8V)Dc3vhEqso%HS)0Nxx9mT+b=U{
z0JTbKloG=zRw<<Ay?0=J1wrqItLr`B4uBcQHjT4$*76j1Ek8DTYEkoF%s-*IHErWS
zy3+J(C~)JzJFw$WJ*stgu<a@rim%(U^Dus-U{}0;xJpQJ=dP1T-6fbU#}7xjnsvye
zrS&ws>`S)zV1ND0lieo9m&$9sq+tXk$4G!=>KIhS@G)bmg3Yylg_L_1neKQQ&9w8J
zp5EMeH%^Ipinm!0=vE00#-?U0eD-1OVQ-|{eAiZags<>WU-{+HMN})qOyX>v1VAuY
z(ymvMsSU7GET_?WE~h72aYUQ%MAnT|UAzp+Y~HB1;0gtIDaNEV@$@5?U!VaWsZLj>
zH|rp4Ni|&gol`shn8y{8`&>uDQTj`+y6O;>G$*-OqlYmnWr^d%@-?p2Tb|~M#@J^k
znq=(j4kFQ!pVTXqg|^g5b_2h~6|XONxK3p_ULz1F<jn(jE655uhNhyI7sc+Zd8|`j
zw?O~_;cz(Sh{h7}k_|3&oM(w&FW^}HH-Ex!)u&<lPIv!gs02n@dCMvv+IzQYZ3B~6
zp9RNT$gXJBUDDm}dHg(nSMb<g2o1&FYeX}3Qbt%5Qa>S`9y=$yhZT=hF1H>!vSQsY
z`*xOdVV-&ayf35Ii+}W#^2c0hTT&alK=J{m05*pMG$7=YM^(=rO#lawMFx$C=XjIm
z@0=VV0VOwg;hH~oqom;T-sB^4x;N1{#PV*Qv3x}njeIK0fPtvYdcEYS;<yVY1{O7w
zf8$^9`Mao6-9nUl<kW$>l1fS_7J1^~&L63|+x}S#oimBSe8w&n{Y}pcjhmztSbn(5
zh2UUahmg0Wjy<2<n-`=u2@0GeehLCNV*km3Xp7~!$=*h5?Y5`FZ(amFB5qYC+plK%
zDT_PE0H||LsPzj+rb{DW#}NGBoD6X{YXH_Kl8s|{(xKS_P)t--z6W$u`}DH?*Q4JW
zRmi$?(yEc=32?-jP667P0IXFQj1E+sUO1ik&j#XwEt0>j4Iq*H(O8bYG`pL0fwB0d
zYkF>xLOvy>q-Bq!CqKYl$)+4mQvcH7>FG?<WblyTVYd2!7(j#l<2L&kTsAPOsw%r5
zTMpm0E_l@UG8nXIeJX1ByQ?>G=Lt|z3b2<M%eBBgS&lZL%wS(+X2};;+gXwL(ZgYZ
z%EFKT`0!xgwWR{Mu4K%o<q$-^*20-#==EI35kZ9wa|MAl0uuyUV3D5tr)R-xKZB$(
zMN~fnYGOh$eL7}*z#EX2x%(c=Nkb4Yy(estD?n8iG*4fCq?4~!fzom-Gii@ePEh@H
zgy6qq_V>N?CxGYix3|G(nedU1q_*Tp9C{rupw?+N-CW%s{&|EpUCvh?A*S+rfnJp7
z)vKFCL?MW*@#@mj(L$2PVIY^@hPh#X@_lpChlMYf2lK~AN6vb%FZl5O8>9Yj7yZBD
zQ+VF$<?5YGN~2Q#gT><S+RYv4F3<L6P_ePG#bYRalajELSS)%KO90=e)=)i3V<kaR
zA+J8U-HeQl?W$Sy?7O=@wTl5-PY9VzDv%9CKywYW6+@r~^rvtt<t+S{#$NZATnrd2
zNGAV9Vov~|0lYC=rNR&c3rns@mD%0HL#56(N1PkzuIA?EY_4a<Uwk!yWx(t6^XJd4
z?d*WY{`tCnaQkd~jLB*NM^8@=s39Ui_6P_K9heB?&sYLd*V*nA5<EOSAO#&xiynE@
zT0rJUL_`Ed+Vav;x?HYw9e;+bWoU)gW|hN2ix;oQ%~_9~N*uLHq#2fgfWYY3nB4>*
zA#^~VAF4=6rvLB{`4*@K+AAG_{b{^uwY6+O*|=T}=T+Eof4JW4Pht%RT{aMpet;$!
zl}x(7q6vr)BRLZ2K=ADDi6X1>xMhI=fmsKT1oQd&7^9)oGJ`&}uO*rT7yGjll(0XE
z1NXWejamkG=@<U|`NL#3DY@@(bbq-xR%5lOp2lkNHyX&JRkIYa+0R9#q+%cx%*<6E
zquyYR7pbwD0C`C+OE@&!+uNIU5+)l6_yz80xVSViR7$i%_07%AF4giao*vuK2qMZf
zTpo92)8X`Qs_P{~n-={8139&|wKbDHXz$*AoSB{7RCxqr2!!EIwLCiQ-;EVTYBl2X
zKp)@I=j_x|<b4-MtC8t)x?xqcy0i29q}l!Ygv;}eZKxhRTHopEY>m|zaFfIg&CSo(
zIqb%&uD^`<`O`ZgL8bZp;&3rME)E@Rf@lhPQl&Z|&b)c^rjEzU!--?ljUt@;g%nD|
zq)#M(4}Tqs3Jb@JZ*%q39r_kK#>b<tuC8h(XUg<ofqaC+<^1z+mD#2W84nMhy!@DY
znncO|WXnS{8*n^+%a_kX1YCvo?3#_8eVt>03+Q-2Ix&se%+AV++U)sd4)ldN(A|fw
z^WLAK5{ZPZ0o~grb!O1<@<0P9(sx}ak)Hvc)CJ<YWc;UZ;1xgP<Dp<6Fc=N{-O`5g
z(mZ>Ayg_C2df=kdYF?YGvy)6_`{FW6-Exw=x4#dRMkGv3Oqam|&-<HXc01Cca-h~S
zI_@b0H;i9H!>yVgkKKl3@%%kX-baz~6@8_iD35XpfNOxFAqU2q1jw{cn5TD$WP5<j
z?&OB6C2e4(GnfQuwPGS7BIOkoQL(fds_7@@z&{fOE=fW|Q^d9D0u)LvnMi}~tK63E
zaQuStBBhd4d+?t%wDMnErlK@}enM+R*e3<_T7@!QAqqCOtCU&r7>)V{28!mMV~2@Q
z-6>V_GJ6MyYk=1hKv>|cq4&74Z)|FUx6dqLLy1fKfdX7sumGMor9MoT=^fHz4FI<K
z4~G<g;7P7dFwk7VajbX{LUarb{Xi7qeY~saW!9>DtI{6~;%$fXY-y*>YS&1)fkYTS
zuk=&YV6kW$8VU!IfMOSF0M*q5kxy2)(PCQne_*&6y`Of7Dtp5j0udeR3V;AR7r?+G
z%9dzyzkU0*w4y=}_@R2sfviWb+wnT)2CNll7nfi2!qs<v%5Ag$G|fG`YFZ9{)Ul#3
z>y$}~iQ>2(*Evpr$VdWkl}UFPuAIAj<9i$&YQ-W|MYy+bpRk&ooE))}latBjV9FCC
z3B%=l`j&!(L}>p>q6Vv)PVu*b*wd>~P*Ab~a})*Fty{5iaES5o@i__Q1azw2{kr_D
zhb&E0uPfvW1t%EtwVj<C>D?^y07L@*)CUPdR+CXd)iPb*UL#l}ylAkz^W5<<F)8Y5
zYen;<QzF&X)wBJP@X=~R!J`<;8%-0kyIR-P*NX#CM7h56R%M)cgh0^w5J0KV;dtB%
zJZ5vX^h(9*Uz%&Gs|~^CbiX_9F4Sm<4f;TZR*T@^r|jd}jz%Iz2+#$<3fiWoy&$S8
z_AWB%mt~^{Qa8qghKBa;I|47*K$b|j!p;j=SUn31DN#`<XH5p8gCEWFr--_<(+i-~
zOu0d@_)HQQS9`(;UshW?J0en2VFR3EVlm3B2z~*9>+8+5I{R%DY!>sSHedLcmICtx
zvDXM{?i&AOWwsdQ@#qoIHtZ)q+r#}W>ihQ{1xh6WK|#78Au?I~eeVq@%qv73C>WTs
z($b}Fd@uc0?`OoMq`&81<@0u&ShS-(Wvf(fw}6lkVhV~t@KB%hq3>QHU}ek6pb4Oz
z%KaoVwJ9%HyDrH}1M7~q%6NpI0kAg!-LgRxmH@fvX}ZBh$fXh(gmNAL6w3kB<7xTS
zAe8lARO<wTxDs3MxKF8~q9O+PnH;#?9D}}CF(3j^o(GNn>}&+b9r#n%m_m+Q5Y?zH
z!DR^tRpHAowft#%pBA<tx>SbXHC;Q}I)gqv-4nU`55MF8POko8Nt9i2b1YIW^I7kU
zGvf%+r6MKu<9)dLp1^2i$`P$AmLUt+&@xxrE0xITE5T;3M;>n1GxBIM_})KTBU#(S
z89=VHAF(Iz1pFbz`R=MrbZw=zt?fB1EUc9O7iwS{)B}~!<PbKn=9zK)xa7wn0***1
zK-@fn!ots0Sfk|0-(!Udzk?Gtk9gEEGYbZk7O-YuB-tEFV+3Q}8%q-$6Y~Kq@nsP3
zgjl@zcmxT}hQT<_RGOdyss~O~06yNHEf&Ru8!P+V<5M6GDr$QGGSL%u2mBn|io3hJ
z^YMyrZ*gTt27ywECJ8C&D;XIXfW}6qrn-B3;edhhV6HA}^x$bFR8+K&j6~euUQ$_I
z!@WaB<{L`oE~~7}HlHbfi^UWGWWx2zhldBq6So0j98zjDgcn2h8qSA<Cthz2glC(R
zH8Io4!oY?GPO!gMldPJT0eoTO<UF0y@_Gh<)l*7u_ea`{)AGy!pIT`-p9l(r3b#v3
za2HP$?pvXMkc*28#bFkg_0s3{J7A9xTI~uA3<}Bw4588WJP0@ttdCcOz|QmrZf39*
zVbTF4{Rg4RIsbEK^<g0kX+??XKWNpd!@s9hU#d(Mfk_i^a*r!O5!jrMJ^~{4ygW7N
zXJR5;x_j@xGOOwen^j?eG%z{r$wAcE05r;eXFL!vNgyzV13$=9G13=H13=8_=@2i>
z5unb&Q5O8)Jl+Ks%93M%w?V*-W&!i5WC}+N@YEg;ur98#4*-m^HQ&Gr=u93calprl
zsKh2D1QLt=@b#sbeX%uJlvFN#LG%Tbaxo3FAd<aU0=$Uw^k&%~|LSZ^#>U1*XX3Zw
zp;3k}QZH--6hfs`OiWH5AQnaXrC6OE*fRi})SfQYahb&Dc4gvryI2E>4@4#rm$yk$
zk;Ll<rD4*O$l`+yjD~6Vv|7zvgM)*VUNdU;Vv+HzR(Jp^=BQSg;&3{K0QTN=X@I_V
z_+3<AEb{31cp20`)S%b}qhPbr@y1(ysCU3KIuO7#2q;^-W@kC4$_l^?0ig2o<EKyW
zyghC&DEdGcLIjZprq<<@l+|iM|Eao7VwJfb(!0Mo?@wlr0++M7*i!-Kg~iKEc>DmQ
z75zB=jE}^`KL9Cw8t$wtqKu3TNN*k_F+Ltt5&?O6WMJ&uCnsY;viNTtjPBoYFeR6O
znWN=)m0D{8fbqx}7$W=oB|$;_iHS*p2j2wHXh=s_*KaO<67U}^8nC{Z$9(1y1ZMD@
z=F^`tv$AFyoajKEq7O#3P^|{ho84|h+t5%LfLxF}%;#z&{s$Yo`~P5LgF|g?J^*e3
zLk@Nr9(OOO6Q80AC}umsCIt6nx!8>G+1{RMs#rt*A+S$|pU>l+nm&YziYi9XEv2T0
zbzxzFGR?rMs$#yyOY2%SlGt!CSxi{?6)>=5gQN}86WV8&<lVi!e!yfSH}8PkLm^d^
z{PkleY!viR?c(4D^bg97&h!So(FC-#h~7LNH^yun%L1o=_EgdRK-K<KWr5Z~R8+LJ
zrza3RDS5cZ%Z&U0niDT=9i2bGd(%;+#kUG72jDUPN6ZE0t^{BNIN2>}iA+d%(+V~_
zJ4nyvQz{7z23J?B;mnwsvabQ6>IZoeEY8;P@%PXjbkEZbDbI&%BhW5@z_bZ`30Prr
z&Wqr6lE6CsiIsH|l!0}<_V)G)eyVUM1Yr>d0H+3nkn`*95;V7@WauY>0Momee?qgR
zKi^L!^+ET6#cZ1WpEhhP7V`i=JbR5?U0ng|m7J^moC`jG98^Dw!m=i2W{kk+fgnu$
zo)nn5nSnVf<`Q7yED&3;f`tEJ*zWD@d<nWa2q=y)*ln}@h*0370Fc9`*L~sV=Lh5o
zu&$Z@VZSEqQ*QCR7Zn$88yP_c#x8I+?R_RvrT`RVcQ%h5Rw;ix-llB`1d;UV_X1=f
z$HuOgeqwDm8wUoyOyo4T+ohG2%<WHb^I%VV&a&uO9{D8F;x7#BcOh8*NG)c86FNxM
zw5_4}_`@zVDM&Cj3Y<3v2Vqik+usEZ`<i`8M9hHx<AnZy8tr}E=WFi+5WhEfXa3!c
zE?^HlNaeMr<B}fJdBYwcNJ{_!Ofaw)+MyqO*mg(N${hxW#1PYJ#Sx6Cp3Z(B?UHaH
zX^6SH8b)*xHYSL!p|pV`#i9L|K=lJ==r1L)xJJ)&tq)oidSmF<Z;C|j99TIXU;Q9F
z{*zoqJNWRnsr&5Z13+|quEM0u8im)Ua%6w2^PhcAnY60|C!M{)0sIj_Dm>>ozNJfe
zF`hqOptzFYSkTZUHgF!_H+oKgt%N*TjfJnwS4OK|<LvbwxBGxoVYj#@+nAzAUJ8S}
z;MjfLB5oVq$9QPIQFQgETyO%OI$<Via-aa&%dW1xI4lh9##Mzk=|^0TP*u<m_W;4k
zQlOgsMN<9-exxO}69T>je|^bddt%rYHq_P_jSLRT(}VMgKv<*SAG^34nh)%Vqo~}z
z#RbBLJLBwkSfsRa_jw!5X7Tl{iy_Ds>j7EuLdeqz6jj!et}9GW;Ijp1m5WdW9&L8P
zQSS&IjX7m-np??|OaI~0-vylJ0VYp{o#I(XKXB-tT&XJ>90?6J=YC^FhN9Ar$K@^#
zj-^Xq#M)b^VS`gmz=)Y6o&wa+go?e7$X|xGMsv{)9B@UYB*@mLwt;!$>A)PgH)<`X
z<i(*yQbzfewisCTCQRS52p(9Lu=Z)uG*juX_Lq0hXo|eLiT^i`HuzNwzcjebjyeJE
z!QiyOhV&V_X{V>%ZoKp{1Vi_!yEk^cz(53GJ7A9Q0N&uQ1Hb7#l_h>FRk^O(yZ-B8
zadB{t|NEkx+?be@#HOd<q>2HVn?y)xc^65;lmm1^`hOnu&UAFZzI*P2$u$ypb|x9y
zzt_{6itu<^4i9M5|8Co+3U|_~`L_qSV~u!6=r<9-kwxBh`i8l|+_%61Y*l=MrATE9
z4nn_8-I5UY>-gIV1J1$Ccq!{<d;<I86*z{9!JW^Z1<OpvD6e}24xG-rrB?iL+M2Cu
z7N6gf-~q_;*;RG|{Q0iJ2H>304#X5x^v}R~>vdqCeKN+QC*F=K7MZFv4A}giGt!jn
zLt2fx+Hr+6$C-3)0mQT*5SdMbV+SKvdmO(NXuF3OLc!U*kKjx_&>ajSpGC8<zS914
z>3_VXjs%v$vuSi^%-NuvnbK8iL`Q=<biD4Mb21FhH81cB3v2-(O?g$a7G*eb1pm61
z*$YVRVEH6@e2X)gwPJ^Ht3O>+AzZvo?P%){0OoVl)2o+|mb8|3d;+JKu`sOZWJG)~
zh4=yy*{IsELLG1*IG(AV8QlD}y&t~(#{M7hwx@Hx-B6%|-#+fodnhP4;B_Bg9)0}j
zE%!!F-}gDsd+{6<(lVX~Q8?R5bw*SK`WPXBF=f<qYI5`9B=VdYQy!9dmvMJC9(}Q2
z0U56fC@8e^DI$EhLOE_>KQX8d3c>o-d1`H154PTU+O@2%uQtWGwKzF<6tSCZvzyOG
zbwUZ~J`r!R7sq}rHMhWeL!Uw1@nhxSZwOM{{)Vj$W<iwj>g?e6L&ST@osG9B56E!d
z12kS$nia-x<-5+;+j4YCJB#&}^W2UOcRJ(xx^(pHPL=de2eZuQJOv-m?G8Hqu0>FU
zd(dY3nXnL|+T9r08!vIY&k?p->HIgb?)FaCW~~-cPn3A?^^ly<o9Ew!Rzz__{KMCu
zEvYmymn>^r_03)K$KPr~ElMsGW<}!J*+plPkPV6WzEY$}caL!!ML1-7FMm(VQ`=;r
z)@VZVX4Uc->7RHbAEjXyGiuC~?S6&^<9c0gut`rkpe~}~LIQ7yK*CU%SJ#J1O3GJU
z4IZ0@QwV1GVEs}|azSS!=s<&$&WVM_D`~NOQ$DfcXCXIZ0>)(flFvJd^ezWIQ<OE+
zL1{!b<|2+*dvjC&sH~<0Dimh@c?>eX;*IffL^6?vo$iYpEgT)sa?6mYk4n4P!{6Fx
z^&rzJ41qd-G|q-{j8gyb5+fU>iQ<{#3vH?4AMfVq21)deaA6Gwjo)+OWB7mHbmq87
z9BBTYcV-t8^6j@gr^fSD>x;mS5i>#!*p3PdnMwS~8>4e_jnvUZ)7$mC!yh5iT{C1T
zN{ddfF;n_y>{zX~;_hZxnar?zI@^A8z|r1GkFlUCN7QSL+^s~~w&fLf6s>ZCQ-GVl
z@XDxF&WlDIh<=Oy{O~%d@wt_Zl4no6#KlxuG7UMQt0QG~wc@7UCe7c$?l&b-UgW8W
zJO_;o41uHN;t(M{xZq+Gl-T}w9XcBx#&4$yZ+<jQhJLf69feg8;}(z0)9)|R3|01N
zN<nbhwn-LG`u@F%=8sPB`H(--q2`3=b;$svqkkR>Kjg|lSXq#HZ6&4B6H!>PcgGcU
zDuNP_gw~%u{l0pS!;!UMuNh4I(pE7hwG_^`s4Q+8jTDz084<)gYt_fQfZ<|$^TR*w
zNE|4rn4%-=a^I=aLqaL2Df!&?IcNuxPP_$BagzShZ&=M!@YF%3{8M(+!zoOE(=bw{
zdBDm<un|RX3?eP<>C4=my+g$9S>Jm6eUr_Mg@8ZgmhxD98&-uqrcy)kJ$wT}iRp2#
zj&Raa(nzykJJs@*d>|R;_0GP;vCJbuX`Z`g42mtD%C{27N71`Bi)1MKP?Z@gdCBnT
zN=DMNQ<HhQ$J&k29v}EP1kF`xy+-c&fHb_eUDQ~5ZcCU4ji#-MCfq;w_g6$+JM=<Q
zRViHeRFH5U#`Ee;>CF#2bR-ss`-6+!XZq8#X`hUGKdbUC@Q>UD`;vT~SkGKJ5d9en
z?P(G{%I}m+8V<)bBP^?_Ft8kTL@Svtz_(lN8gNsZu*YSe#=h9W!e%_*Zw|p-9y;*o
zo@sa_9;ujOG<!fBWs&}qGczFkisU^0cP`e~2^u*iY3kNL&4GXHCMW&!%B43oR-XBj
zzN&e~z~bff_YI_2qs4Q!+?S!;%tFw01G93f`1Ih)^G5jQdxBp>8GBVR`yjX4YXuFw
zU-ptNzOi>cgo*6z@8<rW-S4kI&ZqeM^~^cD3ufwC^Y#l)y^`EDE9>*85>|!ZPb_nC
z*6{4hsxSD}xA$hv*4OUe*3I{MHSO@5TjenqYvy0eV@OGxyEpfylO*RRLAiH&FG{Q~
zT`C3!w9x(n>E)mG3V(Xd+_$u#^3-=3`_g&9)cQ>K*1_cd9T%2f7G_&tyxeehx!mI5
z_cwthp=)NOYU<OdZ}0whu3jqoV@p}`g%z$}q^#l#ZI`WB`OT>IcIAhl>1IBCzKZ)7
zbZjcp{XG56k@e?gwp?GeZ4pqT(z3Nl$CfbKy#8%*QLt9Rx>WS3Xw>4*ws&GBgucjJ
z+#GEA;czA}r+m8lPQEZx{OBzG%f5Tuu6mZO?X6hpEv?q}HQ~dHl$_kPl3%mTujxyk
zKHV&wd3o)tDJNzm-mNswvUK0{`D5nYN&3^=5^{5Y)IXVftcA_)aBFvX$Gpj>&hMPQ
zVbi4x+kCz4eiw+$&F7rIv8u0LID68pysc>$Gt`c(Sz3GG_luGXE1TIp|JV4||6hND
z-z+gZ`D{yI=yuInM(gzFuklp=)_nGeFSnW1|Hmy4_ZVwWU0^<GM^MZ$;eOjAJ)Vtw
z%vOAszoyKSSz^lW&Xut>YL-c+Q);T}wr#zS>wE(P1Gi*cYy$Q;{=b~T*jQVU{9v-$
z|2NA&aq05Sdwg?Ok<#CPmmaP=zGAOhv82_z;9vY)>A+2#^;XA#L##`dsKnK5EHs(4
zCT{PnDN{s%O9KO@XKHTB)@|YPn9v%)Xz8|({ae{KHuI|ew+)wFk;oSM>c8!T(|eb5
ztn*%4v%9bFe5U7mWg<%?!-lHEj!aI%U&AXnPb)c!F{J!2>C4~Op|)cC`kmf_<&I4`
zj8cnwi_TqXtgwA~>q5Toj1HEYOjpXKmu{#LO5qN;pF8Eyr;{($VJxwo6IW+Ozqxp}
z{Z4bCNLuZIo)wI2$v!tXY3NL5**P)0!^|u3r^<=m80Rg4Omj}^Kk=zkoL;Bxxcu_V
z{rh8Lt~I<5yQ6FAmiGi`tI&g!>)P%no8CX}%l+)`$G@+B#&%V!I&NbC)=8-c*DPeS
zKkeOreY<j1^{$V9m)(Bf9y)uYVbR;IslduiF~p%sr-kdpx~;5}r@00?1AV`ufhCed
zbb<o+LZ<I$4L_~Y=bKPya{W$f2V04Wb^pKSGqJ9Rcj!0C*p)E>M*^SeIh$;_uy8IX
z2ZuqqB=4hr97O>E0>EK$phQQN@^KXNgi@gPt$4Kl8Y?SnN=nL%-8_knUf$kkW1Bo9
zY9{R6yVujlCj~gk0}S~H1z>*;xGeKb>@nNTKNQ?uT!5oqiSLYB474rX#GF`Fup55m
z<(J98kvZUY9^gF6f{PiiR;ww#i&j-t{qg(v^~$)pO~COr-?B2ZqeqXH#!V1#nh6~7
zxmwxh7XJBSjT49WR3#ja1}7QLO#)g9j>wk(uow8QbuCRUuL*dz9D}E;pUXO@geCw+
C9_p+B

diff --git a/Documentation/devel/execution-flow-systemd.png b/Documentation/devel/execution-flow-systemd.png
index cd2fd252fb5ef121eb6cf380528f4cdeb756aab1..159b15d01774023bc7727b6d32eef863fabb4102 100644
GIT binary patch
literal 42856
zcmd431z44Bx9|JV-3<Z)3QBi}z$6rqnh4S%Aq`T}A>AUaAf3|PAt8u>q=2MImvo<d
z`h9Edwf9=z*=L`<&vl*oUhgH$IiKgbbBzD^jd2sM_EZ56n;IK}AiT$lFbxPoegXau
z!$b$~%qRbr1OK3#Dk;FATf~1KTMH5(=q~gaCJpy^zy0&IzRLM6#{QID>x5ln?=uED
zti10s{QXfsG0l>Fu*|3~UvSrT8dDB_)%k5n!*i0``%N*5980s8ZXoS`-p;eN(@+O@
zeS@aFI}=;y9!DPIBAJIGdxsBSOGsvpi4aQ@q7o7j5yk6}>Y8dlg27<$d7e1%22r@O
z!Zvc4;;Vy$gRrP5(q`Ojjl8EHM6E_X227h1wvwPwsXwgpJht8@n2Ek{wd>&wE`%#8
zdi$%grkVLUhE3=F^E-@~$W87qqo0q-hZ|t47gfC4W3ZiZgKzVOVSo1O4+Ae)?<0Be
z;CsC2yo{`gZ!^S$V85Xa7Q7x#xld1?WoFCG2AC$t$AUM*zakAMXny9DW6Jwvn4N8U
zmnoZ3jD!vayl=_G8D=n`aQ|SQ>7K-Ebe29*)8x0q^_n3ovk$u&CZ<T5NuyhybNT%)
zEL~Q)hQVKW1$k80h*EG~<3Lu6`v+)Mulf2S3}mwY?Mt{+>QqPWXJ{VvG^l)$y>VJj
zp_YSf!Y)TO&VGl2C=Br;#+n_HP)EkcoVflwBZYDf(U(pqSHwz54ycev-F9T%hieF;
zqDnn;J8_;Ct_jGPqtdcVGdoLpuIL*dfkBXPH(sQp$(QDis3$dfZL7)4S>n)`jNVQr
zlR}Fr;@`Ep#zy-G-czJr=c3eJrvXO^A&y7ufn$D|Q&#Lztj*GluR0nJohs}`=st<z
zX-+bfESK4y{wB7vx96;hqBT()C97X1Ie1xe!(I9d`_w|hY3X~Sdj{X{<&x`7i+=2j
zc~bt6y{59H9Sm7;tMYa`?G1;Cv`>i6lnsV?EBQZG&B$69aoB%+oX=e}gK6g-!nC_U
z6I{j;%WS5Xa^TZCUw{3TC=m_!1<YJoUY>cz^`JX%+9u_AM_WhOQk<BW-gtU_@7*od
zrOOdI^gi0VcKg+?H#_uEHr;~y^zg&&19<r}GH6liC1r2yE&;U8=Yjp3%MgP=Tfz3c
zou1oPP3USNUt*t@m+azJ&&~6KpDHrxlY(73b%XmYQLl=jzX*<>oW!NB$38b!PVca+
zy?t2~xisO3O~;Ej3Wl)i{Id129ErBnM&+D?xXmpTC?xs@pP89gXR0)R)Ja!YcVuEh
z8Z`U@KNVR_k4;Cb{t?`T9X<B_!8bE5{R@hj8Qnso`nmx(l{O)?=%wZ|o9U1CkpDtG
zTG4y=m83`D$Hm=q>zyBd#C2ChxO*0KX9MLzF&V;<lOIBsejHK+7Z+4S@U}TzrZTbO
zG`x5W@11+x5c`XwsN$13S|&b+iNP3g&h<rM&B4YrG08OrllUKEXmRdb7<v?1HzcrI
zpj0r-?bXTEkiHLnn5lncM!=%q=1k%h6w}#aeIK>d2-VJx<7j;beX4As_v9yr(?Mnl
z<WKRi2r>S}+9lYBx*U$Hy5jg4pMsJtWm9zdyIL<}_xDFhQnWwimhNRX*u+s$nJ%1Y
zadVF-TsPG&jlEJ1SYe1)1cqrye19eI3uHL7Y{j@Y9pEEocDA_N@R|*&_Rj3`Rq$Yc
zfBzeJarsFDPI6gCT@o2CF8tKyPwPV~TrT}4WUv9P%h~w&a5CZC-3v<;j@Q3w$Lop$
zrU$2-cD?Vge`Q;VJeg-*6Lpuw?^6xQan8e@ZaY`7vawkjsMQnpykd{Jb4w%9R5#j?
zk^Nx%tQawdY{Ihg@Lq5mB<*C+2DcSK+dDHI--=M=eI&Hasfv?aUB}DyXp&9K896vm
z*1q*2Mv330Os~*){vAcbu9OEZ?HKyNYW_|$0kTK!c1quuO8nwyMVJN#w5wC-=oe?X
zfmG0<+<=n#Z2AEf1kKLe2HznNQb>GNeq$H<$D246<=JhWthryg{SN<~&MVzoTV$xB
zvJBnFM*=hOqgx|B^!+=p<4!LvzhlK<y=npv$5+a>*9I3Cp6gSWI8aBDR3Or$Ms^98
z#pIF6XV;0D?uK4sG^=eAddVw2L12H+<SQPN%9->g12cuNKskAN!6UNim9K3G@oB}P
z$NUslrWWeVwqgkNBQW8d=VvZQy;nU`mA4&6ik^RPWzk)<zUh$WXHKosI%stxm-t=@
zF8C@%4h#$*AGsv1y}sURF}{l#SY<cARz7ul@s=5a7hPddHwvkpU${CqK5p}@s($q@
zvmnp>*KFq6aVjS*t=$WY;>pt{rAqDi^mH5+g-h>CeyXv+-u)r-5utL#mN?s3TOit3
z;I>ev4e;M#7@3^x8bLDpy~XB$yWqz0sB>XVXzNSP#x!y;jZt=0L_ky_E-(K()6XMx
zlsq*U&aYmL`c3nr+7k3`RIerSu}aeFn%*qCPPZIST+7qW@N;QML2(}rH>DO@o@eE<
z3@=XPGJI8z*1BNZtj;a{#Et}Mm-jG%84n53xVr8&BWQBDz%>x{$yfKY$nT9)yx0Hr
ztIX97Y`muGb7lKC@}fGS)t_-?_93_rJd|;$y939o%Y&Jt-#amjqf1@4P@V2dby4i-
z72=J!ZcRfT0-8x5KA?bcz`eF+zL|D~4lRA6E153In=;<snVnii*g!Ib4gC70;=vJ}
zFjZ}7iP=X7%Lk-Cgxw{{MMY;=89IMXAd&x0bUK@UxxTTHJz<#<yju`BM+#LKe{oo!
z&l5nua0^lGOPZ$ez60!RcfGcP`0KQ&#CG&Y_7;Ibmy@I$X>$g&YJGLgW%`i{Yldcv
zKflU0-qU`UN?HV`|Ax2ibkk+-vVB69=GnBUu|2_fdfL?TD1Wz&Ri$@){@cX|Gmn$<
zPladUS04m$X~yv^yUe)FcAr2UVGI)Eb%&0xV6V7@-s48f2rV2qI+q45)bE7Cjp&Uo
zYFITS?u*p<Uu248SNWgD5hd~rr8Su@Pa`4Ln;ElD?87m?H~RL09a7J-GkiGA#lm5M
zT)<Yjx#6dIHA-8&&{_A*e@cmrb2uP;?aq%+hlK*!&Q?%r_7e1VE2wfWrOWBmda|Xx
zZe(!0j6e?hJgaz*7?`#<==g5JROG>6ubK`G?A?u5j7!YxulFtr$17RuoXDfI?_KE0
zn=YBIag)Tw%Ts$$6*+E{0c;T%v1~W_Cu4g<moX->Wp*akjIy4d%+_!rh1q9@4tC8x
zhq3EFTP2=mM10OR-x|%0=Zm>*G&FzRSaJMrd>VPv?|0Y$a(G9uXSRmf=6DhJ$m5>U
zmpKu6?MU4PCWn)EuUc$H<?*((*nNn7l-+hE-l)vRFbe-ttyE(0q(Dn%4<E<^%~(Y2
z(?R;qLj59S^rHi!=6j6U&e2Lqu+@<vJ*?@5`-F&fqTRtuNktWAKuo0G*h|Hm?OX^<
ze%!%5U7(M`*8PCJgV8I`d*OHAaQ@&v6Bj`PCg?_#?4d3m3>Mr8bQ8TYTI0i*Z6l1n
zi_OeYEko<OjGiQ*4eLRpV`DvQ^BHJD>?;C<M6Ka`FJMQVEp7URYA+BDzin~F>bQrS
z67C{r*XK51sq~tE53RkjS}TVBVnP`R7#s-UW}7abJ|f$)DAYgHJUhA*B<8+XBC&Uz
z?rv-`N?9^#J5>MTxf<<KJjH0mOLs~ww;=as>FLTf!h5_Jxw&m{ud;XJ$v{z50Q*H<
zyN(wWQRZkpr)3@vpUp+`U8ti!{^>o^YuV5{mGJh0*w@T5C&HBvG$}a9%d&K~La9*-
z=sA}iK73{^nk?rb)zR8v;d}Qa;kyKqj>L3BUY)ttO#Q_TIhF48iI%U)YBIx~;G<9x
zg){EuEmu=qMF35=xb!K((X}X4ePs<9YI3!YjtgQ*+(DCmv>%YLer~P@`Ku1|^!I;-
z*^W!<x9+pJ)YKll?#t@`qVBW5KA60*{@vzI2>y1+sIL#UmI6=<qTV9d$6J$K*ED`6
zH>KrEw?C`2`!))VjQeNXtbTZw8i?Sym*0^C-gLC+(rQ(V_W0QKU?n0th1&umA4)Gg
zIL4)yz@gwY=p0?V?G8$3sWd*BO4%P`d~*jE4LYLc#?tWdnQL?=o#LYP4}eE-w)P=I
z8R9-MWj?(o(;fC6j)(W?=ETDpuA93G)+oh2uWCAgpsk|p4^xD<Hr2{9ouYH|Bz4wL
zQ8bWc0`0EsviBW5{FH79IBm$knuy|H{Xi4(9`KM1tfJ(vETg1*RDW^v3G}*;$uG@B
z&tk?l6@I^6j2|;`u#E0mP-S<aWszap|F!W-Ia3swxtG^N&{<~cX{L>f!S$s}V1gMf
z{0bJcp?ST(eU9@UONwA|La8@hz_mLL$zbW1jzZ4XV@2;UDL2}V?AIiVIt%3a%)H*C
zZD<;F@*ibqEy5blxVmm)df%QW7+YB5l9*AEf1`>mT-VXRT4M!0#}8(tac;x{yBwib
zfWuLIO&Bnc$V%D(=9?Tb-^EEPuB&UngG2sNU)go0YGAT!o|uyR)=9QT{Z1aQ1>fY!
zna@SF<3K=p9UDnamR~f!W|MBT+Za&6#FdPhV6%{6j3;f1*%I1=&h}P+Ln9pww_>al
zMP_=M=Z&>m0#FA~PKmR3wq{wSrha*r={KW674_BXUTro)_9zg$ot_NiD}UH;f9jL+
zu9Z(`sM8Z=;lZzZa~9P6rbS%U+F;^)<{W4{EZJ{+z_!i)KIwT`p0#VB%XH>9m?X`>
zGE%KKD|7rI?u>BqSyGCmrCj`G|Bw%ve2w9(B|G2Osiz-W%mQu=i$72t8TxQe6lMyU
zTUwU<%+Owm#8^@jZ~ypbv?xf(UwbdW8!Qmt6fq=TCRybhH!S@$m+tB{F8&!+*!|Fe
zs4z+0pUrjBK<M7!xBIhAEg$5mvO%{)_Y7L;%5BqyWMAl&ggDQFxu|%#<9$`<B!quQ
zQfvJ%UHcO%1cd0LMve<Vr9!kur>(L-hqLZ`NKo<fUw%txC22Tq8KQNQkbg?#ZCiD0
z!=TW|oSaX8fSQbpj}LFgA}|J)IQePjQi0sU-Ccb`pvR)(g0j$d|2Zb~pL8cDMmsw3
zZx%RYBUOK@*FKSh{9mDX@jE;CQ@zq&-l%>7V!IIVW47<lnSIAsaJq7!kK}jpxL?lQ
z#ibG;QO%I#8b6nicz>6V_w(CTnz)RN@K<Xq6=M5g@_qK$)1iLl^D?@+=;R!Fv6~ac
z#p5TUDrE&}=41#FozQ+w1T5JBSmsx+ACNjLsoKt-vrr39cMeuFFkf)>{(OU>s5<<)
zN-KTodoB%Wge@w)IF{uwm(#u?CD46{hb0tb@AGody4u>1|J&m983*xiP=bm2`e<$R
zz{yT}5(HUK`^8+?OLFtaE%)EJTJMpiU+-um)Tew*x?bTc8X6iC;2G{nQN=tFXyvxK
z89uXER)dNMQ#KLKJ4jwxL9Qepv29Ll4e;%D>gjX79G4mh(5O(0twin`b$+kA&+J`|
z$#<=g?S6U!`P<P@<Y?q!7p~1<C0cu$xGxeRoS2KN>&T~9HeXYDs1bb!pCD{34+uEU
zuIqyx-CZ9zN)aWphj)kxhChie(k$qD#6nh`A5Gl+&Y4L<f`l0BZem;0?bfZ}PQb1E
z;Qj-{Yho*4A#quomOJJrtY!zcWRsp)Z_jyQrq|KRIre9oCd(XgVt)gGp;ZpVshf?i
zUHd%MaaW9FLJs$hS2rPG6@sVph}5aN!6rE(2Qk_-Z3Qj}WKGnY(bBvpDatsHL0Iz8
zG+7>Ij=Ny~7<Pn@_hD;kJbs9}KKaQpL+*`cAQ_SR^UqYgjNldjPnZz}7JgWm;)|Bh
zs6x`w(b3KbBb5EiI^#;EETI>cma+<=?HW>oTt@j>l?4TWZ;*uzGcd8rX=rFT9&c(@
z4&D`LX>F}E>%)f^!yj*Jtm6p^3dRktnkGww{s3+PSVZz55e*FvcmW-d{XLW*<UV*l
zF%2+J0I&1|>-;~Uj{l-{Kt+NVquE_1#HCdKdzY$Xfmc9uG+s?j4Ny-JpBB1KYCR52
zYwUlDE}T?UaC@JxCKo>YM6Il>y!iWf$WXdaNzKcNVzMOm=YI^3eWS*sAH!g%7pHr%
z)B@HW<Kv|E_V&{aPE4rMYA>~)^}T^H6B3Pj@$vDI5R;H-)lHNc=m~qDRm3GEXqK+A
zel6cEEoJYVo6`p_2tKQN_<JaLWJHaDgF_`OGLl5{_Ue_%xA!6gg7NY3fsKugafyjq
z?6rQl^McIaIb9dWTfrsT<=7h=8#1=Gr6WzQHYOKG8>~A6%PDc|Rrdn-<&Rhxvt<$n
zSHq&CgTc!=JthX96kD$HTMSaUML+-b1T8UfpvbG=cg4lU7uvogu$YZz%dsB+Z1ti5
zPw+U~&vH%=4aKk+N((;OnQiwwpbv15{*n$lv-IoNo7~)ci96<Y%8D-7oX?4g$oRrx
z$Uxe@e}8Ayd37txa^rhmMP+3`Mh2a&t?mAps#I%jW?w9Qj{Dv`SQv%sIUzH3G=jE|
zsx5~07dwNzF9QPuN2)DVYp=NsTZD~t__?`(My?yEGi>!_c<?|mXX}~e?aj5Lt7|Zv
zH8?Sm>{+?trz*d*{Uu6Km%@QM2HB8~;o)+%YgBafuAw13jUrOlt;rrRP7{-dWjyK%
zS!%y#^EXlmUn>84D9V`4EB*6rUXxK}`|VA$TESD=rLU=cGS=3`ju%HSJ0~ZfP1o7!
zwbemy@M%Rc_3G`(G9-Oi_1k?7C<UzFRV{#NGXdH+u)Mq+n6<JxP6`SN21Z7im8}$!
zSNYu5;|~(;mX?+RBO{dp`ih(9Q84f^Ei5d$z(5B7`t^c=msg{rx|#&sJl8fMHT5CC
z{hZEprCBJ5Ju7@J-LjlkdSxs?basu3hK40zJr1H<(R;bMxtPgZM&u#5RM~Y;ReJBS
zu_-k;E(PxYu*}3_Qi%ClZ#2fk@Ldhz^3{1p_~ROzn{h%3=%4*?TkJsU?CxeV(t{8y
zXTsj^{7>FUo)U#gXCNBdWa7JbxnJ&M1_T5I*4DbVoy5{hk^gdj9ne?OJfE+Uj?MP0
zRP6`(ojdF`cC*jS^<-oMjU61g-iyE1sHm?W7D_@pUfI}q2nL>9C+9AyI5YH)o|BUk
zjHY#)U|I}Td<bH9M+D^ueEs@W+2iJ_aiGp}I0Fj|$oUL1;qK4o0=MRZf&yb38#Z?R
zhW!t&FKujau!FNZE>3r5S>Qz)a$(`&U+TF)e@8|~)xGAnmR5%d0GdTXL1AEEkX}tG
zP|d_nN=iDvz{bNPtEsI8TWQ4m5__|+qvMeWn9+c#hnQ*6kHL@<($aG9+e|7`in-ag
zUGGtoWHa_JO8~>d=yga}J(ZfCUh-4Y@5cMRuoH60vrjU{#*2EFz?#WBJO2?IZU>Wt
zOT~-Y+1csn>^x8}B_cxA+uLg$ONJ_ap0#TO0fUkDhx$G-7Aw5a|MGNiZHtYUml!lH
zEFwa~i&N$DVHmSnc0mCKSTLxlsK$dy9OozPHp*cUfxrZ>qg2(_%E4f72I{IUhr1>x
z>(s7mtVWT+_0#nZ^jB9`gd`+6bsuVL1?=Y<4kmpkKk0><bcdKAcE+n$nzO%qqiG7C
zS6gIl4knyZq?cm|ND~5slk<IduJIMZIGLK7R+x07!xR)Kis>yaE#HKMSi?1?&Hglj
zC0#3Y+&-K_SoGJqAVpL0p_}!^$a#1O8@73eg9e$-H8@cU+3Uw&*i2V2OqM=Jp{J*>
zt(M!}-NnSg(e&ERmWxEJecPW+WYIK2zFQ()U0sVyOX|577T?~7OZr^gWn@Ht`SN9h
z`yQR!&I}qC7ngbZ_&EIR;=*)irWP0mooWlbi<6y5@MiSo!Rcuq*cDD^`zE>h`OBLV
zC6pr0xie|N1{xX~PPcjq5fc-G{TH*oZiP$94P9RxvrY0aXedPmYcOV4$&Y#Uqe>H!
zbLigFdHx(rR8%xDF)^{?#TVk*oq4yGrkzM~4&u3=KZ9#(_!D=)LbAR!zFVGI?<4Me
zrSs$4#Do?m7MA*KD02+07&Dj#nYb@60`)m5W@>F%!19o3T$q~DPT@6=7~n}@Q6&c(
zOS{nbWcvpbzwNZz$kY_Y_V)H0e}Aa<xW!IcMphOLj26P+BW{zElT+ccp;3F9-ny4U
z*cyOvhphOUbhwv1Y7a=k6fy%-aXNYbi+gxj*rT;?ADk{v?AA9olO6@r)AhZPl=0?f
z2W~vSq$KiSrLTKop<S_0HC+&ogjxB4W@nI@3_TM<Mvw)?x`srBJwZeK0+JTd|Mc_!
zE1q;C%m5-%f9bL{$pMp-d)WT$0VyUveuzFN1~ff0)Ai%W^U^<Ih3}RUF2chijKM-n
z5p(Cn#l?jngxgZQhagP-{f|QNX)7#;>EcW7WorbgZn7}4Mu43!tE7Yj41Px>1y@{J
zTEx3|q%9r?$QKtE`^U#*%`iq*IYf*Phq<}AHMs5Qw(S7Bu9_*S^(_N*&L70=FgXF2
zbu~(A>SEim@84y>NKy5M6{`KUIEBF3fYD@~#l^$p@z^(xXJyR(9sw8wY%dG!8ezYi
zmOnNmBqZXm|DcMBUNN~bey0R%AZ)&Gf2rH##S2sjm>cO#NgqmZ%MnCFj_80Nh$z-7
zk;zi)=<ml=h^3QT>5cB;j0}51@mIISVw16UjE#{%cN4yh6sj}Dvw>%ZA@;Te9*rO_
z#BJOG0fG}>0z^<4XbOCD==R17EGPY%!?j<(7U9z`8=4zg_gF}RR6gl~?eNKJjU}5=
zlRJ(`y=d)cHkJ6#ou%a$T)KE08&urfaS?7eeUA|ooLb!bOtFSKtgxT-O7kuwD@lvE
z!AP45U*#a73ZQ#m4J+gUG${=8Aox#;>nI+Pa%l@H$d;*PM&vS3LR4j+Y${a_GG-I_
zBib$ifEdWfEZTk!Ch)ay=c%r6RlwZd(#bLWsXN^wfN943?RL?Xa5S_Jp-a<Rr4{5v
z_EvH&r^!4h6WO#nz67N^E)U~@xSPS)i`y_aH$sDi$VV6~L%97FtuNC24tnR;Y@Qcd
zb4x#}xbSHuKF#fIpWjbnU%-U+ZGTYMiCr=<ZW8O((c@|!_7<vr!V*2Djs!6i{NkEr
zm-?RxAcTHr>CXPh;vNF~{n0i7gjEifT%pmjH0xhJs88gJgv6!>|Dq`GdImp|>i_a3
zI8xI9>?z<Q=wpuU;y-){0>RJ|Uq=86ytmPa5^+F!%4({I09X!0)&?wwUIL|Cf^K=g
z(8wh(6ASC8y(<Nixp!!Y1jJ232m-t5x>JXM491yL=Zm>UFZw~hAA!kSV@@w_Ma>sl
zF`jlxIZXjJiSkL;)AZ=gUKW5&+NbSCl|JaIo%0{f5X6Q3Js%Qa^a#e=aJ$HJvUi0*
zuILavE}b>DNNs6iE&TM%mM6O^2F%Pruo%{9JO~i#YD*W#vhJ7K=$h6T(I*N5z#H-d
z$F~y%W$WW@Xw;%pvhZpA7Zw&-AT~ry_iDRsXA$389Dvpw9AIbnErWCiH!p9;%?GLO
z{(cC+-H%FpP9xtvYcZY92UNE4M9~k66A3GPiGYJ0$+4l)Z}z2`b*KLvtfU>6lz|Vi
zGCWmKpy?<H{YI?*1Cg{`l>x~p1Y82cYP>Rn4%)ci=x!E8H;Qq*ZBry6uc}Jnw=M3!
zAh?4F9{Y!e&>+x41~w%mKyB;oSs=*P=6NS*3^X#`{Wvc(@>U-Wn)BPI6wSx`^MU2$
zkE`PGF%pC=SLf_Czh>Ho<R2!9i%64F08vlqX~ie#fY+5}R^W88XLWTk>t_3tC{T$g
zpwRG>b(<LiO(J4tkQR9_QAq|8U(?Ml@Rtdve;TKZSZ{vQZ2UQSK2gz8Oy54_o^j!7
zv$9YkgaoN(-e;?qdVO&RQp@qYnF%YjH34~6=k5`;2qIZ8V?gaeKjdyr#t17UC<}%&
z6hJZrK4Y==>n>nP(0;1BSwpkv;(B;{;^iT4vX<*BsAFR5z~h{kR$d-mn8ryxuN<IV
z$p62Q{KE+gYu2E;I`VHu4Y+{yq&|P%a5OBSn0MjmT4rQx_6SDL^0(7ZL*%kfJH8Z}
z8_=Toh{<O4_ck6@f>rwroq4f6eUpOyTt!5-mg`KoSnpX+2#1%6nE@Umu<R+<+fOud
z@MsX}0*R`!pAFG5KjoLI$)hXn)-qYw>guciHGHr3vy%gKY=7q%O%QFnyWrC$6Ub^6
zagA|Xz>HQk9uOrO{9`ZuODtYICoAaMMW~aa-Mi7AgP<A++5lorv+F&tinGhdI#<{C
zKtk?KVhPIr)obi~#8`FqI)C{$d9e%gztsYe&;=O;gjSwihC?^a59y&gJDsS9D;O(F
zIV=czSgPAfHq<gl*x-Z4>dS}$mFiw_fUJW2+$s&gfc}W78*Ra&cl#KoNJ_jklujEK
z_JnGWe2DwCtwW8&m~ss@uv%T8b<m-(nDC$yZ35xR`ktQsR{CF82lXVQ{j(GV^nZw`
zV0m$Ye;o`^r^22t(%Y+B`#TdvDl|f$9n#&9AoSxcMrT(TT-Wi-Ti_CaC)l2=BBh-b
zQ0VVeQ{KNt+So|dX`7~Bkw1?xpd(5oe$T+f$eO+O<zbwj=kn(Oyy^Bs%gRB9Y>g;{
z^Sl3II~Pr-)}jQ&<mwMQz@CH4fK|foh6RH^0WO2+rQ&}_l0Dk4ryS-3QsvA_b*sr#
zB)1~REQigqZ%u2qcxB#LhZpiMA+#{{_o=C#ST;e^t`sCko5G8uD`3M$^QMGxX{Yf(
zM%EaZ7<lbV1k(J|`uTm>x(Y&2P=5ywxH{jSlJ_H<zqZiv8kM-S==M%&B0(?^H;8?i
zE#p|~knS-1Ju%&Jef{NJv#-qR{S_E2?XLn4Ha5OHRL{Y1zyPvVJU-vBiGaVZ`s?KP
zUVgcH%+1U1uU+E1K0Z&gqwB}&_80~qa0KdRT>?nTtavXJWojWzS^1&Q2?fJQ5Xg3Y
zHfRd~+Xz+`7bfY3XkpKblX|121Z)dR5qnO^`0V5Ebd4+hj63Z^XLHz5<;vUpMDZaS
z^zy~tb^x?89Mi8(d3rWAkXCA+9}AI$E~kgfO6mB(;GRz4u?SxB|42tko&<&syaDKR
z8Kka(J01e4^fPBb*gOgd)Dk`EqN&Xe>rkd!cKodb=9+IIEmrNoy1F_m0e+iaZ9$^M
zXNW44%1GeTcYZmGn3|cHn3yoQJ%qt89{d;1{GXK~|6k*i{{h;-dpQhSC_m}df2)@O
z8vpw8R3VyLz}VUvTS!RAcCLXa@a}`z8tVycr6l(AxK-jrCE}%Hzt^Ci=ALuooyy9}
zii!%tW>PZjVB}}do?&8R2d1Z|4@kPZyGKzAU<0*ZXxJ)hKi?9LP`lmTD6iJOp+P{7
zW@#2YZSc7i1gx&70X6&2BSg{%jw?C&i2UE_hJMaTcz8I7*JLy_-u_3Xkql3Tt$z5s
zUwdr-6I_@R@;-CKr4@zeUB@xVF0QQ=IMG9dl$4mDM~ZnG<Dc{>wx-Ip^_0}q2t7}>
zpBG+$)(=dzdLGNDsi|dM+|BL+o`I279)o}m2JX(|x(OHeJi=^t-|MY1A9Ms!4b%ao
zBq0q=<OeZ#WXNrMI-sFJxKzJUV@2|0Zy^>?0F#@mbHyi5y5?KGoPK|$sy&9u%P#|(
z!ck!#EE51!vuTGv()w(D`G6z{reH7_=}Yl2MOkD(5QPAGV&LIXx0<Obsxa-rPV@m$
ztITYjU7``oy?dA^CnsG1`k;Avc_F@)=OgXo;pvGDAOQ6g00Kwf1phsZFCMr7=my8R
zQ9tL9NIm|=0Ud(q#kmta2SJ<D&WwPLt}g4Tgx3jfOiYZTqN19;nCm7fAc9WIpToWR
zbV5Qx_O`o6MhL+)fEW*LGA}15C@KnfeSN*9+ThtUa<HZkj;D;efBc{tOy<(w)qFt8
z&Cma}{@r6(PY6h=5|PzgPZUct#y^nyXIx!U6CM@yCNJ-Pc6N5eTqtu?baedt_xi?S
z5)u*(4Gnki-i7q)Y}J1xzkiQwX0{@enI6WE(5CRHxw*Oh{UupYkMJiRM8>wScIQM8
z3zUb4XS%`!B|9evXCkz^nhykQ0>ynZGt@%%b0ZBm;4*JM6Y%q+p)>)3-Jme+SRlU&
zDTm&Rkoa62NdpuJ%%9`lyu|iQEe=?)kpI69Z1?}`z}6E4qeSH7`EHrX$rNsT^U-hK
zpyn17Fo}v%qoCtHYWKZ{&j6AKNKTG$NNCu+d};GkSlGbZmh=lWX~KUIr4ph_BVwt1
z<<xBF?O$IKf_<+qifp~K=>zX#dYx<&Q488WSl`;h0TGtWqeuQTO)@evs00KAwU_^O
z$SR$sR#@}O)s+l<51a1}3@+SKlo?hi>|II_qV?~gYx3UX>oi~@5uxjOt}n>yq=WEq
zfY-plAc|g!?&ju3PSkg%=4A@E334~3I@Ss<f?1vESoVh%!WY3Wz`jiXzktH2PfZAP
z8XOrir2GttYYB-Gbpatwk@Ay#!J9grr^fRVfD6x~bp|&o_)}8r5M>a?EiBN3K=r;B
z0eIy4^2$mj*ejKTADwg6%AaaHARQSSlLbq3!3G32)NP_gwj$2IFfE2Nq5&cXc>GU5
z`BPwP{~O7M;k_UZM<ou2eI*``h>Yys{!zWOxVS$$sR(wbIfiBb`1*XS7^-v!n6J;A
z!C;IA0%W94vc&<XC2K|nw_;UzVjIHF!$Sn9A?$c_f+6vViJ4hYo6qI)c#$Ubu?n})
z{<$OA$ODLI*mZNfGm452@ZrQgeIz8LLW5?(sHmvL&CLjatlM3Sc-Yx-Kk3#6hKFM*
ztEi0DywtopU(4+AJ_hZ9rLk2$nyhy)vYn~HV$&}B3@8u6Fd-~83CmMdsO6>xPnvN5
z_m~i;euF<~&|LumvRFEaE<lmE9p=TqrU@wJ{R}5zS=`!+97tqi;^f2!tE!W${VKaI
zzy0O{XMTRZe_){N{BVtko<3H$);dcz6o0zq^{WGX2r<hcPqszC<lu4{wZW{c9<;Qy
zjDLH!YB!eqW_#NfL}y*Sz35=uso6XHsJj33y>I{+cYeDWQpj<0{2?HD>_!Wqp9<ho
zPQw;V1qB7DBS#@tE$<20^p77)ph<gLOhk!B-uTadbgjjWVmxymW_ab~gam<Walvx|
zsXV*bDtFqOZ$*yvxjN%P$D@7&P?M~-HU*ePDrjY8MQg^e!4U~s{Pin$?)Ua~Y289$
z;REPV5IWvFr8KQ#I1-c?rvOIth#^tu?rf852`@Y^FOPwl86B82h2abd9Pv7%c3%X5
z1C%Hfa6wr@)E6&aK#wY0>NZAm6b8({x5NTmbh?`i7DVBLC+u-r<%YDtzw`mu5cmFl
zl-+C{67(%os@(RlZq4h1$SZV++ir#*UaCU`IRfufYj<eTYj``@pOQjZYbPNt4nbL2
zS;38@U_oUQYncX=K2Bf;FbxB&aKwTFo*CLdI)c~n2nk_8`fc9NSEpMR5y_8S&~o6y
zyF>6ay)vlyEFdWV>4ym5wUz;rN)dluHB$$Y6+wXPGplAq?e9B+3zioAZhM+sw-$GI
zZ+t0~!BD_q_sRQ{I1M5|bd5lm%*@RDhlkw&^;en?lAEXRwcpZ#k&_1Q5^gc*dwcDE
zv_6UgZY&#&O$MB8@?JUHp@)~386c#<r9Ao|>bkhH5(F?m1cCTdYeo>P0f2o&5)w#6
zUDlyS{TQycGi312x6|ZQ2T8#o)om8g^|u<Pe&!GJ{cg@NfO9I;EWp3HJ~cupXlH*v
z^XGN@<?I_MY>n+zS8?Dr{(P3-7FP$88=P0Md!wjO7AGXE5Zi>lnU|=)?P8NnIYXQ(
zkxe@UBu2m%23~oz-OsO536YRuRZI0qHorXC8Ey0N0x2=XTW@)J05t-mk@g=FZH1W6
zN_7H&=Vz62c6MG|Ue3Pq{2WGPnyd)RQ%r3L1&UU-1jrqbU5iUf%AZSm`xY4jJaKJ>
z3y`h9JPegq)Wu`1JNxoz;}8jfk`OGQ5cBBh2n<rfUi4iE!1PD}DkIg%fPh5ER5^aD
zk-I>*B-#OY?BH|CNi;f(h!Dus!3bvo{9eT&CPpLSc|=$Q8vf}oKvM*CuGQ=G+3Wi9
z^mLlyXP;P2wP0{+L|<A%Z>}%dP*RndSDfz?kzoNTJL+XMUPuIN3=;JG`SbO;#_E2M
zYJB+_xZR@+bo@J*AVuWh;E<A<8g773l!!o>>JMFkd;rK#W}6q&KQa;rRr(QVjuY_7
zV2WBi*~0-S1+mRbkf1Dl_s4b)GwHX*$i$M=N~|>A;FD>(3VgA;8)mnMsCR#7rX#R2
zt9BVX(8knD4$j#ctSl@v7{2sKk*xZROr8lX^DvOij5I)x@BP=pIUD&+Mk_kau*1RP
zD2^igH6giEYlj*3SW*~*;uS)DT{k_Jh9`x0g+9kiwS|}&3?j$AuHKoZ@-v<YA-QkB
zN|dO97;iLTayKfD^ch)IZH!DmU5fl(bTqm{i`m25IgSn9@Iq2V8q+g$JUKN?m_9a1
zWvh@~mbL2D-O8ixHd%_1;we?`3aaQCmHd^(a2=>vDM>~2+J7uwh}-Fev*yr%;SU+n
zXy0G3Nc%LS6}wqiOD*qh_<)-MtsT^{op;IOP)tB)sDnI({)|$<&ZbTB8>))jYDDkZ
zL9@MZh50r{Q959jh@i|}*lly-+RR~Wu#YxcztqH(J$NrU+HvbCF)uF}eT57oD-L2c
z%rEIow_E)<+6gF4(z*}INi+-~V}L$n{&pl%;qk+;W;X(kwCUE`=sH2aXyVb!6$fI*
z?0R9}3!?_%@sag%R=`#<5GzIRmxN!bFeUXm!|tZfJqZ<#q?><$6h_a;z+HN_s3jk%
zp8OAfIX>-)J>Thx5;+htkO~bODK;n&WME^%X=-Y^|D1w|3{e0$O)_Sp-lM#&5hf}6
z$CHGJ#vP5EoLo-yrazu3MZ!xEWFaCNc^PX-5yABTUFJBO*Y=veKz-shFZ9v=aIfOU
zu}M4|D~-&sVNmp1z4fVtUp#tv9{tV5rFG@eDNlp*3IlarDn{zg>_Yc*jj4`I6IL!T
zR0G^3W+;?2kC7l=CLhYdTt;oUV9W5~m)>t@C?$gLA2|DM#&A8>JC*+^SAV~vO#R@)
zPQ+oVUHQr|cOnH?JLV~s@sd&I7q^%C#aFS>^TU-DgL1x-KhFJj+qC~)>!iKM<TCui
zd$hPyY_@ecr3J??qzII*GO>2g)D*_9%Z?#IeeO>mWpdI%{_n<d&s2T}vOY~PHs+(o
z=dd(0=y<s5bV?_waJpop*7K5>RVW2DQ@VZe>9S^GTWv{f$6oWd?6y<(nvLo^;RG2u
zTO$+PMSS>)G|DnlStap~x2Xd>X-72PM~vd4?Ea5GIK};lkz0wuaoUHK&TO&8Y;o7p
zhc38(kV|H0@2Z%zN@-T^ZSvO)3vb1#cRNhH4#{jsgA{#I!@~{_tbWwQ%s6?B9iJ(1
zSKm^D@p+W+RBF-X7oPI_R-7Gg?ZTZsgQ?r!2k|@yR+Fw+%9~NL!JaFlc4yS$PoAh}
zh+SQA@Z0hc$k+CDG|$FPS4v?MD@o<%T0EE~J@QExn!u==Oq_`E%Lwef=RkG3UNksh
zhD^}=$aDik&JF)wlJB(pI<oHZ1s1wsj(YPKmsNrG9m|x$QV_ebhK8vA2*jzx5^nMl
zr_<MoLc1~GHaU6v=1wyzv`=+}!^>Mu<Yh`;7BUnN6GJY!*N7`3(l{V_bnLRflE#$6
z-9kpLa!cGQUls&6!f<D#SiIPH%^kOyJs4-C^-WK$T{WW>HpNiFQyNP__nEynD5Zz;
zd-FqY^y_S5{)j_RfKpRwJRu!L`<?jIj6BC7S)NkNOe~)R_w(=7AV(o<hT_yg9+SzZ
zP{)^QZ4*$>UJU0|7sD_2N=*vql=bZyku;=~=%=v^%+Gd~GrKx75V|wXD`@10W^kL{
zN08b;<tCUI@3D*V`C5Pm>omjU&zu1$5K~4IJ<<!maAkMAy)ylJx`%v==4E71T~=2m
zuhQm#_V8;;%VX^|EspBs-M*G0Ne>SbEPWaslku8Q!NmcEHNYCMS`zO{b<<xmR$5&o
zJJ!^{DXK(jvzmY&YHNS&wu}*WKM>63oa>!?_(82Q5Z8h^<jh`1LBIJ}QA7z90yQmG
zlhfp~o<hNQF)<?>V(#-bcYgg$$lR;J{(h27ox*-)c@<=43Kv+0HM07@1<ZZL3_<sd
zquMajSx}94wi991=I4yxf}l*nr~CFA7{KsSPUm0&TShrEi*vmFRUJIE)q9T6{a6xO
zoPIdrm1jtgQQ$cNzn~R2;oG*+>RG08Ah=(Cs-3ch;UC#&v0Q)u+JrqJ+uEGO#d;^V
zrLKMW=jQ}VE*>9!j1)?xr48$#vK{K;JM<)8^&NZZ%-DR)|Ftoto_YkI`I}Gk(b2XS
zM}?-R%8K1?hr}KORj;fySp2=jr#@li^QR=|=A731(BjM|1qd1p(L6kM-}*+vU#O>&
z<GW*9Y`j!cwk~8Lk<T$5X%TIAa9-d#n)g8|+)!aB?Y1_as<p|e=-JSda=QdZ2_~G5
zlJu!H<=tH8vKA+gpWg)(9M{W*=fv7EfxNYgb~yRlO{v)1px_ex<$-97{%_yp<nxge
zC0~=x5%0F@y492&gje|lH5I#B|M3}nlW+Ei^YsD^#2we>DPRP?so~R>A3K174(fAR
z#aPx_FTol|f@*Fkgbnqdm(3+9=w0rZz&;ci)pmy63^|H#8@(6z!b@1&?R{^~Al&MJ
z{VPA@e1@XWwXj58kL?z@D<_xqvq5txxym-YuKo2;M+ueq7Imia1wp`>tBFzVn$}ci
z{*>R!iJ1%4728!`P0y0u%H0W&sga`ZDo<BMhMaFt(@Z(O_)Q)BHhMtbclwDNWVol2
zqm4eq;t0aq4vZjm5zPW{y5^B`>Baq`7OK1wA^L~)t3$cdGllJqVh&z&wU>aLYn=C|
z(|*rg0GncW-V0sR48`T;T41Kd>7zNLYR6j>UYQs})`P7F{Rd;WT|HUo%F%e(w#_dr
zglu&sG288Mx&u~jt;UT^%A|Oi=_0o8c=I)VawdPs_`5w%=Wrk&@^3!9xnv4iS8|76
zjQqNMMhL1p%G;)r?;f^Mz>cuNAu<uoA^jLSqXxw0#FX;G0Vd;fX5Vc<%dUqlPSl%M
z*PB+qOrxnHPnI?glNCMFBB&w*)!Jjw#NXQ#?^H|wwBG+y7#&{izP#INsW_}={G%zy
z@udVo#I`n{&R-Kw{9bRUr<0^oQE6DlGX$As*sy1?MtQtQ3+)5OZQ!sMCtKy#14WaJ
zS`g6$%X3bq@MjBzD9=TKFCs&@ct?nB^fn{^_g4AGEx&7zqBc$-j5qpe`upL=OT|GA
zt}IwzxW0qr8jh+qO@Gu;<%?sYT+0WJyUTXlH+)Sa3-xEss)T;0Sl}iygs7`iUmk8y
z$A-g=D4tD7b|(E?@`!&M5SHSxJx!nY<0DBTiGI~R*3e1Llb&3W=KUW3%mc>zv;rl5
zfvF^-AKfk8p^lS@?)`}xyTYYi0w!6Bn*GusCO_}%Z_g9#+HreQHvB#sM(*9k^nZ12
zefHYdVby5#<#&gAe7uAG103aydK@7K7HK6V<jWbYgUf+VM{SbqC(EMqt3dqd90oaL
z#iUAX;GojChQ%+S8uz6wQO=)ge!YH(s!rj+wDGd|iC>!j?N(nbu-QiV26zSrcDTC}
zq|H;&j}Ez#Ke~-=gb`%M8rWR#AG?dGeQ{!JNgwYNGOCrkb)xy0cf4>+apY5NFRrrc
z`KQfraRF^1%D&_v<x0F=2q7M{-ZN(vd2uMyPazrM>qT#G&mqU&XC(mDUhOn^{2$dG
zd@Lvk1!ZOHn}6h$7<s-7DHD2`in14{fU|`@x!?In;}mc7c(2;+3YOZ9x#$e^8J*4V
zs~S2mny!>}baiDb_R)(tqXGsXucM>Gqb;AC^cRkrtJ#<NdvdgO??2Rwd;c~jy*{DB
z`T77kvq2TM3`7SbYfw$iz3EnaRQsQg1A_-i`47&K%J53}SKNPo=8O&-UqmDo%;B<q
z)WWsyRY1?jqa(tY{{mGbPEcqNhm&9B->5ILS%(eeB)_DR^PRsFPYHz8lOjACp{1qn
zP*7NS%Lnj76pau*sJ{VqlaQzzO)#rgaTr3~Bfk0&R9jRkeVkJMAW8;e7|uUIis6Oc
zD~Oi-AFCk*_~L)La*=g~oXao@6z;6e(h(5_fG8?QKAM_aKp+@|Sc3L*n9_vr>;NVS
zzOR(z-R~Sea37)3c>$?1{!wKPP?m3-kCD$Y83M0vPxFARKViC%LvNkkEcdJ5%I4{4
zION8l_zu)P&{x@JJ1ZcLsfHE)x+CdLIZ>h=nx3xL<^yU9S&gPZ5(@x^P!K@>{`LU}
z0tG~}wbm1kzxs)492RbZ#+Bi8h&)GO%FaSNeOXyq+>^YDs;Vx)MiMVW2<T$~$SJO&
z=Y4?*>XP_(Q6OX#l%?Ol(Tm^_fCQL=VjOE5ENpBU1pd&vO|Lfj{{<PBVR&I~js?9b
zEiLW319<T7)YMcgz@=rz@>PP#*q#+`<KW|y&(ztKT#16xGEm?~@iasH;q>e*4)_-9
z4$fxx*qA0JF79|k87RneuS5EH<>=%@q@k&)bs_}{hXCNF{!m_uDD@lxtPPOFKTMH`
zTwTutz;O+l-L!s8<~}CTZ*qBj4s7cE$ufh;Bn~}9{S(N6Jb=>!5N$PCnks(`ZV$>z
zk3QIepxDBK8IWlcTid9YWBEnfLIMJEPo6}`uQ6q31EI>uYB5o)6$E2c_k|a#A)W3m
zXul+(qQX*AQUW;=vPJ?GN*Wp_piMj6JUu-@bEO|Wg6eF4WLI(hqkt_~Qi$l~Uxq*l
zSSVtL0c^a=#KNNR<M)42IY#hrm1D90s6@+hx(1h>+i$izt)N>^mKHhD!{8o>D7eS!
z_t(_*u>t}RcLA6Y;&r-fGF4`<|K|@f1ZujvK$VouR9Ub-XJ49t%?JRI;7#kf(Drtz
z-Wb}*?oa|Iz#Fy84SPT+H!-=gyBh=WU+pEJgcV+=_V@1HyDK3<3ksGgxs4%!)(XCJ
z0@_JON7ut64m%PIZd!>FIwm11N_5w3zl+%gDwN-VaxhHZRAn$tGR<x~Zvf@Q1SGtz
zt*z_bLrr+h2LQN6%8jHF?e;bSq%#4lR|cRkG#?+I&TrqIVq#*d>1it}hJmuSEH@)7
zt3m)=m{LFy1-Pf9iwh}0UaSvDu@l|EhLHi_$|NLbd`0E@D8T$N>Qb%y3(`kfYL8S^
z2>>Ah$7?w{QxswFrv6pu&%M3Bo289xK>|#`X7V$Dz2lO1>h1zU3P1{<{X&~TneW~|
zt+VgeHlsR^CL)Dgh&whh(Q|gNvb48nl)F-(k{*IZ!u+m;TmBw;n`n4gVN^Q*OJZh~
zG<dEVz_z+yCkW$3|7T$^n5+L(8IG9D|K4t@6M5fWpMvVHf!MX-%<k{sHO^g6cYpS9
z#)my2Lf9-uU{QjAshROXM@P2;^@<o}AgRvx_oK7z>fw){K7DdCdioUK^LX<(08uA}
zC_^vAba8PRDbeNv*`Z&vYunqnU=<S;BPzELpN661QbHiflV~R|FHb3Go1%zdOyJB2
zze)S^f2#!m^f4nN1Jv2E&Q?`bjnvv`|D*Kl?+rlx04Uln=T({n5E^V3>CeSsh5X>K
zJfkN8Fj_%LlO;xZz^NeWivJtHqNC=w@(0Wg9E{cfQE8^|AM3j4#3=#t-<hrV+p7Ko
zK*{~v1sf6~vTBe8T{+qqGfh@E1^EbkX+qHBXot3Q`EBPXQLU{KfQdbDqk@?eBl5rv
z0wvlqENevDHriy(?}$zEQO;_d0$uYc9$80Cuf7Y*EhtL4?jr{xo45-QHG0@WS@cM2
z4#@ng5%n0f#+q49h8v)(r}q5kzZ&qbrt|3bKm7TG1qv_Tqz5mnav2ABPnZWWWgl4Z
zQY)LYC)ly``7+H?cDu_{;`V;aJ<HxU)nzw%^MYd_&8oHj;_7DKRbeb+leBzo#fhH4
z=i3_M?<es5d@Zsz_v*3fKh_QLKWg^hQi7fWr}-JdlfuI8A&P{wWWMK6#HD&NTwQ%a
zuBR7wL*v!tdSUVK34h;~RH$697W|9(+p`B~vhDgox|0cN1rwyWH1+7=u^NAlai+bA
zqi2Wx?fD$M`8^(*I!Lg)?S7AXewHbVxZ}l>D?M5QqC^6)<UCm>xF@C8>%y&mbip?@
z{!m`5Qs?HIFJBbx9h{Dec>G}}vtOC|y>Yk}fRl1@ZGY8dEL`^C3g6Y5%6NpLB;tKN
zznT4<@0(0NF<tvU7|bEoi1R6I?;f73z|s1+%qH(2j}vjc0!I7A{gZO_F&zqM@%pup
z_n&hvj{{y3^b1|c|Mv16YLU9d{PwdH32MI}=o=D?Wq9MS%*^Jv`!<G1W-+oTo%>4(
zM!t7_2_r#r*pmQ6Htb0RsLZQtU6ZX(6%su$3TqIHeIjr(q?820iGJnQiqjFfqdO-g
zHA8JO)iKqM`_p7l$05ZA=>O7wQOUqT07ec2-*H#53X6%=Mr5C=5i&$4?v4M`Vt%@T
zt)=6de8Nae3k@Vfe*6#_xB)&wO+8*(ODn&0^=j2?eKsetN)?aEV7mULz7-|gP|Aeg
zdl_(cRg(U<&T{R&><C0sRqN@~r=0qIr7|Vtc>C+$iAxQZ1GLhgCcTz)70`k@TIhp#
z791ctLw)4gXVKigy-B8hp3&QH0NYM!cA<xiC%anLjcw3lJMr^&9SX~%v#xh4){_bE
zNq7c)R(PmWx%(gluOhT8h8cP=Y~3^O8Ac$Lh66gVzTJeXT_*LQruS`3W9HGFYVuvV
zj;{Cz_hyOWVPJ_B4q!?7(O`vtNjcG?U*ELq8t6jJ332h*dL4>aq2QIy%sn#I)i1r{
zbUB~ED0L5lz$lbZG@5nC@J-hVVT%P0GZ>Hd^Pb*1?SjTU4G15CkJq20tG?B&Je!ps
z*x?$hf}pMX%+AdAXxX{c^Fou{pthW6j7k{>i;_yB7FS0cXQnU~@97rbgGf18BEo<b
zzkl-?<b75MtXXH%1j;@X43}N6feF%RbK8+J+HO&yx#kP4OA>`hY5JiK&|s4G^_V3R
z-)>w7%T@8<2{oNt_Sb?<eoeSBCqr@Gu2gT!Ic3*Q$k#=!imGC!ED!VjCNRh?Tun6k
z2nX9~BE$|<iF|jT1zfV*<3hFsqLC@nFmJKZyy=zu*#mtbDO))3+UJ=<nBPp*E9b+b
zjfo%F$+2J6Z{|j7(7*HjlKWOttoz3===YV4U;Um$KujHa*@7}_RY>*)y`(Fdw!^*U
za$_mVO&b*G$`bc8S37;*lBV`(y#m{KxeX@7%|G%i=JKO2UjGYTaqmCKK25r7vuk6&
z#u@vdjxwJ$LiaTymo(qRwFX<yp+3y1lj)Y_L*jBgqC_dMXN#Scx2TYy-Op0eIIl>c
zj@pJ?aUa~HT4TG^)9-pt0j1o!Y3IX9KO3%xLosEZeqL->xakf5nK1gp6-zwC<&itf
zAhOMa;#-@>#@l;CQ_`Apt6Dm?SJEmelYBD2g2f!IY(P0z^C6}TCjZSxFh=83W9-gg
zm~;<BCb?)n-AVYvi-Ko+?a16uV5cX@ew_`DAur!o0u2+LPV1aj!;mT!_6Hb>$oGc4
z?uzQU$>rF0xIzxPK;>(9RKu39uop+P+nAC#5F!|!JCfq|(lDB?vwl;w;<=>ME`{AX
z{v3WA<EEnCoG+PwyU&sVs<<PQQ&U=nF<q@Ua&mr_+`XUhh5I0K_pCkhHqy+pY^8Tc
zVLzi5PjHgHqf9FY`Skf)9^JIfk+BJQn~N(y)Y9ZqQq<{}PVyL0>Ro(?)(#KVF2!Go
z=ky@pCqE#nD11JW=+FaFk)9~d^xLb&kitlJwfbYyuR8lI7UykEQ=7ALURh=N*n7iL
z$dET*n-Fg`Y0BwJ8}eG}shMNebu^x<<30iXT+=C~1wP+s!?lZkq*7PFkR&(ni2664
zA0;d;@@~BqPBtUED`+ENI7ULS)YKnd<;0s)$-=ZkmBWPgzCTEl$?^{gK?n6r;}a8X
zRh%Fba^$)Ztd5dqtZ1ZHq?E-Q5w7xPa9yCmhedi*gH;aXcYhD1hXVBnK0FNy1g7!d
zJO~IQdBAD`uke3l*&hG%INSf+`TXlktu-hf!S*C&WzD=dYjrny*EwqK%{g4LV0-L{
zmFehb`y)oG&NjIz3fmm0a*#X!2ns7Sl4W2Mgk0c26cN$?iB|kiz30E~!2jl@<`v*9
z97w;j8iC?EZXqG<o9(3~2G?*HJi72P;y{4wc(xo4^a#|)RjFjDK@h)yK;mq8*pt6A
zGw=~{&g;tyG<y=6j-jDXZ-Kho{HyM8!F=<)=qD^JF8)1hVQwA_PONDAs>9%Rh`CD~
zT_4TK%F9bEPyy+8BkzM?7?5|ah$F#pd5{7Q%+I&T5Cpm2&L9jWI1!PSHlmy6x!Ku)
z@k|Obpt|J8WR@%jD3eg=0;*2*ud2fV@qn79*KvR=(2a&=_p*5rA(JN#sIe>5Dk1mR
zPG$occ`he87@QW-h}Jxik(Xso$O3T(Hz=`hy2Dr;a%QXp%8EgK1>*eDxVa)D6BCLI
zCJ3v{mb!v9l9{js1O${*xEU4-o`x5`KsX<L!~w#TUlTZ+*5{dn$7Pymi&yGO;}bq_
zex0#^E5d<`1g9scK)oASHgFE`X!XW(Uu&s#D;q@v^vA|t`)EZ<cZ(<gnXCMdqUnEQ
z+K<Tb>6(#KizvXp{<~Zenyi)2yX|L4;#TZq19WiC05oM(Y^7`AKqL7P49*P37+!Qj
z+xEtd6UTUDj>7Y|q~rQlY*1er1kE(EcT777u5Ii|*wBDq9=O@|-QYNhZZb0u&!Vlx
zORe~Rf7KB494+W~Tj7{BHbN%Im^x=P;&J#?zSI^*_q@UWkZ;ua*@AWQ$_aZ^d)Z{|
z3I(W{K-c=$VGWLYBFwB8_%kON1PF&e?Z>dZE6)1IgY1V0P&g)gS&{1^+bmY;KEW2W
zmJhc$HyaG|Eo3Y<gQJ_fM(53u5VB~CZh?uNmvdM$JA3bA^%gND|EU~aNjZ;)Ekq~r
z8Vj;o=0-tES7p82o%f>y;?s7PCeK!{eusavCQZZk0}Sqjn9lFwDo=w-)>yrH=CB@*
zM#hu2QfAo4Q11WW@;Lf+e-1;$c-U{4NlZ*zgjx8AcuumC%WXULuGDx@UToeg^py?^
zdW3A%O|x#GsD+#g)@1dRXi+5mhBRZF(pbq$#WCrJ?G>X8qli#uyVquSQkLk$q6ej9
zub%tybMy4(Hi{uZK%6<!R%3tC<?qN*QmSwZ$9QHZ8lGKPQiKfszNU;i_eI&?UnWL)
zm;=5#(q?9WQXzl2_B&mhJ-cC2Td@TH7i(_<jphEo3qK9Y5RoBdh@z4dr9tK)N-`%Q
zbBIDn$&eyLA|#~{GA2_cWXdcdLm4yAL*{up*WK@b&U@B*-*eV_*E(zMy;pm0p69;5
z!)Ls%>+|~c+l`@(y<##c?Oua@Pt%UQf3z~l#67Smx?fbGtZ~9|6UoVOiMITbzSg{$
z^9bKn9pS>jG|TUqG4ZL!k`uq>exH|Rd;-tHSKZL3aWKQq!0H_pe9X}Bjh-iT;gi#4
zw}}@v+%onIuG33dkBp?76ZT+nd+o7L1$ybmoeVBK9EO3mSA^~#^V?x>@HUlfgC*tk
z{V4$fJ*A2UM|{O%g0UUq3FFy#_P|%Mh0Lc8T+x2{_A<5Djy(om2wq5%i%V?^3Kz>h
zr7lZq$<tqE;$;?oC*$Mq(oDMl>5IkYEiOm=*cv$ytw>#e5iMKZFW9{4!v|L4BYsRf
zNZr05Qu8J+@y$woV9S-SC0mxAt|n-elh*Ekz8vw(?(g-dy>6v^D~}^`eGlo+7u7Xb
zZ_P-vT+Djy5a_T=wNx!Qhs5pVcID+S&y5{gS@%<m{m9&+KR!C+WPiim9hk`nt-^D4
z@$ZE*w};C`28he5RPfl_rb({loFl39HJ?JPG9nahp;O@8cB}Kg@8u(`2i<P{&hnqG
zb;=1NJ&1d1Sx^_}>Gwm+Easa2G-8$NQ)L?sj!o+`%t9w6mu6~yU1J`rpa1pd>H2W|
zhgcd?#Sb-XH0fuqg;;;&>l4XjB*=Zqwaj<MxD~tgOX(K80**=-`IO4nf%nIn{#5R&
z4QimJe@%{E6Lkxu`Jy}~Xj^lqUFojxC;KxIyzx=;@l0~R6Jrx2tdIC4tWE-pr^#19
zkr!xhE67x1?-`N86z5v7=Vac%;iI+LJ8uOPKB`kO8QgoikNfdXE3KaN)WixCsBATb
z%GfS6iKedSUF{!!pTt+C6_a$~oAp!eX)DqL+Ko@9gR6G;K5LmB))g0$UmE$<GV*kd
zVf~IyyKVo#`p2D91>prWil-*T%L;4V<W7|jWbMf&DW|S_x9Bfu&Nnsu@=*VJ{q%a1
zgGYp)RFi*oR8rEz8XBh4PRk<x5&4fVjlY)CSAO3t;*-!bc`Cr0PwD!L%~Lyr43S=7
zn-(oP;=Rv^@AlcLp0+V*N|M~T_JPZza6Zq>R*-koqjkr}iTjQ9kDt2l@cZz<Ic^|1
zr*lm*RyQTTyEvLBqV9NL-6v!Gs&3G9Ei${b%;Z#OmLbcKs<8Ill`Ab9w~EwBl3VDF
zNvXGnv`hvKTD4rBo27HdSP!<yM+RK`BY$VHQP|$jiiR}QW8jag)veGhoHc8%J@R>P
z^fck@LaujqSD81=+-E~RJj`<2#Dvd=Ta?LSSlhhglK@FlQJwwKN@nTv3CAeMrk#dX
z3F<xRBCV|6K1#AUX*M^Sb_5TO%dS2G#*8n`s@kx5Hf*QdolCDqCy-|u%doGe^*}R4
zQEqWbr+M1U#51*W;_ODz=dAtj%qr56dO53fGLN^O*fz=cl7h<y#vIOKQvV(;ajCvP
z+0pN{@6A{3Ui(HRwzGEZf5NZng^jhQpSiTk_$003v~xRRPlX%M5`dX72+h2^xJVXP
z)9I<>7%3?yx2@{>T$)AcVA_U$A&ImgMYDKw)FR8pNIwZx75kzEiShClMaOir@lYbp
zy{tDVN&dFli+VDWv;BFb6F*^Xh=`WrcxKO*uNLMve~}Q;KK@!Of|%Acr#5MS`CRGb
zrNyz)PHZJd_3Pio5ubaXhcbn?3O@=kJGF!LBjw0Q(xUUreRooqcIj<9B6Yl6JBxm5
z%hju4(#VAQ_=HR=EPoX-SPb80X1Q^=&09f4h^r%aPqaB|bF8eas2r+j4N^zQ&hC75
z@$siD#-DY+?~Z0alosfjIbX1^yS->(`TFz^elqwTA}$`9sq<0`Re#6JK47rnz7HjI
zzI;1jT2@xydou%E{QMV3)P~mHc0rIKNhqVQCChe{j<=@8z4Dq^=jgF>vJ<;I&??a^
zTd0~ZUhn1nS)G0+pQTf0<hHjrA9XEah7cmT9$2A%mgC1KgM-oIDmlgOlhE4xABl(m
z8!@qdxGczAU~A=6=f(;=+7Hn6W_EV=#HzhXng2qa{XAkGx&jD>g&;UE)L9@Qa%arD
z<)fLR-ldS+!}UB?o%!rQ5S{~eS`c*29jKVijW%h`t7>X`0&(u4xl7ZUh%y9#<Bxj(
z{;&g!=}FhsyTBzIR|fH@XljP!yy1&g3>6rvkEObtqU!^ko&hTML(S>?u4Y<M0I!^t
zoh_xWuRkK>lO#;6*hC&+p~k@7H|IDUF1|vip`ii%Cc($u&%^T#b!VXA6Z8wj#n)!l
zw{G7q6Q!b{$E*68K&wrB2C%-UynH(f#L}qC#|p%^Lba_7GyqyQHa`@sQ3|Fxe*K3e
zD#L>JrcHFSZ_ADB@=0PO3Qg7o5FXXvE4g<C$HvErUltM;E<M%h{0L~!-a_{+pdL!0
z2u|PxldpcJtc{ci&5@1fBLL+ciYTNr3mR>8TKG$?tgM_^b<gaRMFWJ_X6gTS76gFX
z-Hi}=vFp*!=b<O;Zr^?<5SVa*Q2Jb`hl0V>>XIG5P9~02$9Wvpp{7($f>qGmeC4!=
zh!INhD8mYZ(*GEe2Iuv-RYQnU;zT(5V@7zD=4`tI2;*Y~2E)yaj5cF6(WRgO(73p_
zJb-{8bBH;01xTz*o;&xrk!RO=qG8Z+7~~BANlVax`uSFB3m$j^-_`S_)3q4&Pr=)L
z3gEdD@))SJm!Ja`D-fU{guR~aP*74T#cBuw!)rfWFE?_#!xG&IW-+G|=(zX*SZWSh
z4~QO6N+?Ft>E3U@j<dusUZa)nnyHnLAN~D7(6&c5u`22m+LZ*38;TwT$h0Q>EP-zY
zAwpdIQOBNtze9k+Q}n(*MsZz1kCIVZU7cR$@eV1Zl~CE(Vr*<||F@k5bu3~HI7JjE
zP7qr;$c}a>PF-n)*!`rrrn7m<{6~(U(jI^|M)${B@#3D+Cv|CtGCx29K*AG}BN~01
zD2PpbBKjP_bP|jLG&Xo0&S+c!Vh!sgYhtpW;C38Pj(Ds2{xY-Z-D5<5$>E-C|6^h~
zwb74aK4DIaw206Mz{`DUgcJqVaId&H2U4ISXlEE;FR+vlnb8}W_U-^qfG+PN@5Pr7
zP)YA@vn~k9Vc?TT(H+45Qrv>6KaQP-0OFh1zoQ^Fe{u0{V%0uAdg2uitO5Ld+G+OS
zNvmcOBV+!ryeGIRL<a=Y06jmWWE3u4ItNJR)Np)c4~p4pq4FAh&Y?gJUV<>d^&c<Y
zaopcRBt$J#CgiQs>yzk^NLpF(<5v0rtXuf)+a{bfIY@al_S5|f9Xk%~<P<N#T}pFa
zy4~E|te{7unIYmZ(uD^v1=_i5eEcb=+bZ3_z`&L4+dP~n6*XD^r6?I6KN7~nd3iW~
za&oc|om0c>*S9e;GFF&m-2S6wF{pzZhZP8kKY}I@z}eFH+rYqpboT67Fgyf1o3V{X
zuqW1<)|%=+ok)_{3y7cm#14W$UW7XhMUn@!+{y(#zhz})w(L9SC#j*q0Hm=8FzZpO
zG3N+sJ3i#{-*R>Bpr9adylI)3cpVODbjTh;6K9iTMgMgDj(yxo3`9c-S`|wizmm0&
z)9u>D4XE#T7ya0KE6=O?i%LoW$d&7V9fQNw15ySzcCw_T#2XjPdm?{DK)C<_b3-Ge
z>6+XHrc4fLazit-1Lzqa08>T|w-5Ma-=SacLthG8UXE}z)eeSW8ac>PAg%9rc6OEp
zHzUeLMq1h<CdRmOXHpP)o<2~Qfq9tOHMcN7&jd-2gs!9nwhERC@1gKCK(g^|+#I5J
z-&(0_YBItIF=iChZ_RL7nfHNGL%(IDkm-f|Wia*+K=&j#H8n3UuNlziVX6-gDRlyh
z(24WLK_9R@I*K6Zp8DeAB01DKy8r$az^!|cs;o(E65HR`S0Z^?tl}OTS4nv=hQOpv
z5twvH>|iPJ7ok;=tGhIz=qIthxDRq6Z=<3%fycBu+n`KVb0oNOa&gKSmi}9FGc)M)
z{Am+t`qgFInZc&_w=pp=c%UggV5y&b*ET-~Fmb9}3K!f#@X7dYv-{@wv9hu4(9zK$
z3=4Mi%I6!J5#!LfD19ktJpJjOlT%Su)%y}Vk|dajK;yp!;sxzOgFiVAOUn$I9CC+-
zEQ2p(@RA80KVCfD|4+~e4`)C0a}ydzGPpO1gM7Y8NqoeK*(tF~3%k0F)L!65bk9*q
z_y=MKF9Wom{+Hg~<d9Qgf>l@?iU~-Ab`ol&xz0<wB-a&R07WhX=R+J`)GSV)KHUZ2
zJm~=_Bg7p92w&(;c(~%HjfXelE~q6fmZ86_Q7U?W{vsi50-wUynOW4)gU8q(cFI}+
z7H%K<)1|`=@t)XOI7CZ#JFuj@kLYB2Ly5%)tTREl+x~X^-=f-DWk0qvY6u+}vLqn2
zMaROT9o_p%?0zP*gsXG@JRTgrK)tWI$bSLmyQrc<0q$K7-D+>*(1M#t$l8nrhlKF3
zv9XolnLTKwiJ!o0c%$vUtCo&|VLw4TB1CN<EpjO3S{|RMnAprO_4+wPS3R(*(J-Kd
z+=%Jb;2?$b=jlKgiiVLPt`sD3LaJDVZr;3EhZjkQDg+%gT|DkOlzp$RR@#5yz!RuQ
z2!gvu+!+sA6l!D|leN`}cOsq<kpnq4ZIk3u=Vc?KXwqJ&cJoAt-s47LsuXTU4sqaJ
z$m3kebNUPw8Cn=C25EBDFSq`PnpOC=x)}<q$954l;C$R@k0(!_*f=^KwYhJ&skEcx
znumu+pT$|5E=l*$I+8a8h!~qAUcBHX8huRsS5!>G(X{LV>rQT-PTCvHh`M*@gEy~;
z12%w4((W_)X}u2UAxl8~DI$}&dXP-%vrtq}poIbqxODVI=(6HG6=>Mu&`A-BJK8a{
zJUTl`-$S21eF}$K-4wsyQjIk+G0_NUk!Yz$+lsz_zX17@ykE{ZYDH~rI!iO2RJ*r6
z5FK>_S#6V~Zth)GHZdm+QiUCb!}sThJhx>46+%Tag2T8szak<_6?p0y<ClL&t(Xw3
zaDhkJ35bEbq@-kG*`F-iEeMgS8V0($9>AJ!URl5~E1V}n1#mnB=IJ3>l<yH0Wf<rJ
ziKnjqeowsK$3nAs7FJfiqdIxRbN$Ut!mBH0B<OL7>gwsu_>Cf}6VT6p6JL$60V-GL
zu=r`vQg2Mv$D2dDCI(S~9LE8bj5%8Ay#Rxw|Lm2YFAi@Mn5t}OsdgE!`tr0bHwdE?
zfGV`-I8cEwA&GYUt3j)ljM(W~Fp5Z%H^TKd*oCc{X-PIvSLu%}MxXp(Ik-<rKeORN
zx+W%e!loj&F!=FO@Sh-*^1B!I8)UyOh7d}DNwL_X?ofT#Z*U1{?XLZvVYH8Iu>{qH
zEOTSBc<1RmW6VUbT3A>pJ@~t+N&dox3sG%ftUGBC*^RY**$KX^K$`M}3zV~Sb2Fc*
zxSppzbanlJO}kfg74+F>FJHd2&c~&C85Y(99@$c6h`oOg!xxTJ3v=^A@S@ySr?#K8
z?s#K;-_UY8^Tdf0KfgL!6IKP9B*h*S^goeOA+`;5N;$RB=DhZl4pJ)*q@yZkMi8Py
zSa@c3i^|y4($W&wp+gjKAs!(0fb2twTaSA*II7dWPL=eEZztTZ=2=@?TZmsV5Z^aw
zC4C-BN&AF^gp_p<2K=b5Ruoo7NQ<z`7e)_elnS5>vUy8H9M}Zyu1v&TT~ChYOWN2R
zgJq@s(}Yu0mu1_l_G=+5Je-|F-1+5!WC|`gfZ+JfY`ek#QYkWqVa2&{P8=|Ah@(cN
zq-`Z8_d#9?4^NewxN-CMyZt6YEO6owMtTI&*)DyzHQ_hkj>W0}cPzl0H$XH63RN#G
z7o>t4m5`X&f3MO+$aK<eX61C}>e<CF5Tz<9FDLk^;J1}1ORRa|=l1jR8X<Xz?T|Q6
z)Vq>GAQH5L?KG{ctE=fc!^<yUPQlO80>Fj;?&0NCjD!L%-!v>0L@k6sVC8P16g4)n
zw$|@@B)a>^RSyuC2`-b3jm^Q^oUoEh0v}&AVp9oA1yU~}0QQ|6qJ{951kG$L7-~2u
zX&Zt6cMR%N!0VjzV|H(BY}{2V=(21N|GIbo{;jy@pbeH{9WUf^kcj-|&sWENTwI%2
zSXhYb1Y{YRqvOJDz2JHkEiEswmSAfskuCXgh_NEt#R<KVI6$b{y?OKI7%~|w#6DEE
z@t}_&jmJPqMsTa(g7~#Fwi2J|_?HdDRJ|c*!b812dDCXHONyYV;&%>QdLw!DDk~fg
z%|G3oix+pmtg4NzpErvA4-O}=1RGUyAktYadhiM39Mc!`I_^4X<V3~A@j^pyKa};<
zlFm@x(Enr}NC2-u-MrTdOQS!ueH-O{G1t}8%KADwZC{*dTCg;-IB%YSd0=^%YHDhF
z5J-F<hYT7+r}K<bgdm9F)idrsJp;7T-Uv~>k)Kd1DJc>DX??Lb!1*&Ax-_}%bl-VF
zNb(TT57<+(c=1wXI6&~o<>y;}<&`@$qW%I{9qzq*C2<QW!7sE$(6V`D7=9elZokEo
zfPmeR&eJ~NiP94m79Q%2xXab-HF#{oT%(8L3p9@}1hFVd-}lUQ<|gWsbHOYeO8)S{
z6Pz^S7eT%?A_$#J@Dh80fAPr6bMcwiSE<%Gw0H=<Mx1~Z5w0AZuy+En8hy93k-NIO
zE5{v$K9slP-}7tMA33BoR>Pk6rSDFCq>XDM2fPm;J0&_3r?7#wz3M=k9lp_&0yCu+
zQm(AMOLdMAyIbwtSmT6h6{0mHZ-*Ei92}h2=9*rLyEwfnt9>cBC74&~VNQ<I87<zY
zU-Wjqy^-vL#vOsq+H>j_(dHqNOoG)2`|;c&ANp4CHil!(>2TZMVBiSq`7Aujo5S%*
z3cRvhkpV|wg8tL|TRJ;aCMm0_kHv>kAo2lJ2Cj_U9uoVn@<_;tVy?Qn`c&k`>UJmx
zNC96Y2y1{SCs|`f3<uoV#U&(Q1&Fq9^|6YGel=QU-j2w9BjTahLkyIJR$HXYJWDaN
zrUi0KA~^(1he&0?Wh{o3!j(HX#fCdu3jIz3paxyT)%iB-9mW$BM4zvoApJpg-?$_9
z9?_-YPJPt!*|N#N%4&zDrR7B^ZvD&NPb3u)b&&61G!vqJ9(Zrmk~C4Ixe$x+nc#cF
z>4L|(!_LkQ8h5m~OKPF#G-(OTdLE{d$kY&AtG>T{B(aK%?;|cQ7dY(Y{_Mpth6aX)
z?nJ(K_N>lGeF7!gSJ8ZfD6c>bv6Ogk2<JJRk?k)6Tm9^vu|gd6G>Zn_PgX6v&N}|(
zpZ$7Zc#TN(H7@{c1>`0T5=-a#7Bi%58h_c?*=@n3O}>)886-|Iglreq8r_^02*Ifk
zA($FMkPB%Fa>{7RUorAK-$=M|;MyVV@d9BFf^zQ!p6vhk@#hdW!#(&RiIbL*k-^*Z
zy$K6rCC&;e5cXrubU5yd(^W^OK)_E_jJZ&ThYGnw?v9HDPM2cKowa2LaGAH^Dm;Q|
z^Y}%lDULc5kzT`LKY*FQ9q<PN@=!s0c!vv7F&Zu^E*6C59LT<0NRWwG1N9?RIv$}4
zps2?YXaaZc2}<WaQBgL;5f1^mgmmOn2vy<<DE~dd--S*$FNE!|z1y&>(0pLPiSYdL
z<x68MohAjLzK0}*;Ha)5SvGG<VfW{hxMsewvA$5S<K{0mViS{a@QEr{OG^v*6J;nM
zVO)VKh|147Hx4X^VsCo^q<neuCM&kq69GdHqNAFILEsvR(+dP2Pg2l#LJ>qW3DuUt
z`+Kj0bq=WT4g@fWTNN}|RDThDP9)V`2vbo6+MZ)SyctCf0s?&I%o$)RA711wMwfhP
zxbFthY~}lfDgxE&$jjMTdp6*Iag&4I@<k^p%gb+vAIoxH5<*UGh$d`m!8+^t^XCyw
z!3}k~t{fp`>>Ls`wh>Eg0XKj{tl5<((AwHcJZ+ID6;Fa+!ZJ}mb6pufg+P?R`+_d2
zehY&y3ccy}(Q<GI7<y_j{rdo%hN$SEg`2RR+u_h;a8Bm`{;8Vyu%9mqSA}UY;5AU|
zvw#2WL6EUaL(cR+HE@)qzPnXdnFyKRxM9?opbBABnbd1}`&0ZAma|;fM34|`b@jV(
z5y}fcaWX~S)^#6_B=8egQ4K;;MxFUC5MzRor9p%OWrfH3u1jPv(nJyC1AOmxRCG}$
z`B`88{fpRv1KY6#Hh1no+Aj31G~W^8{xfW+VI#n|(32wQ?#R&#fdU=LK=6k!w-=3K
zLWXdlHZlNFTNEhPs8xC*6ovjBp?J&4=!raYDp2UxgNx65tj`1ciMj$5Pew*Y7(rj$
zG`Vt}5^Kxlz|!BNeVY<!MU}6YsS%`vjJC6~hBarp?7sTtmR`zC{mS7JCm0BRG~&@H
z7a9&xZwmUdO_~Qs$+`Aw9o$<Rv=4#sD{XC@zH=_YPOGlXe6o5n>;)V76a+Hy&%1-2
zj&j_5T3RW(MORMUpB*we<Zwtctm)HumfME-78cDU)M>sY-823X{%w1P+VI6$9S<a7
zc`Ox>71AhuC7eVC^wv9pm<tU}4KH%GIw}83ve==s=Wt@x+Z$y+B_;ItO#Gu){(ph|
z{{Qr=HP37h&~yLMh?k*EROE_wJHyPn?Nx-Z(D9G&1mw=gnLRD++DCRv(P?q3keH>%
znnQlkygr8|VS(hPm+tJjoFc*Nz#^+biabP>CS>rW(Nx1i*pHfyHFw()iBHdRo^unO
z_CSGE_M?DvXn0fYPQ9Qf9l{k{Nom#eQ$;=?K&0@eWNOf1K6ZdD9Sie|Lx0woZrTyH
zB3;|QoyKL&mcZCao(&~qUa1}sUCT4ODT9A0^&dxf`jY&glD>OiyF{nWNQG<f28n*{
zwrUqupcc^t_XPH<zy0xx{N_)G+0gv;yws3tV04_(a{aXD(BY{xyY)@2*Y&^Uw28{<
zW_@6zXLQ+q^M0)t;EncU1+=z~9GXK;beeH4+b_M<3pG5J(8S^7Fy1{`XT!FGdJ72}
zPCJbA1_#iJU)qj;Np4PO{~Ay@JW2IZ)J5>kc2^1#1m);-y;h3eUc29D(N2+4>;f{U
zVZ;)(5?h*u<*{u!OVaU~M=pllDGi(ZO6xMrIws;mIes-WEpuZlooXnFq&m2MPN$sf
z=Lcgi|3C73|NhQ13dsJnayKusChy!g;$zK!(mj%QekvajdFV^QMWsifwW5tT>$T6g
zRxj&)A6JfyeXF%`^sQbM)4&Ju%P9@7L-`qfttw`d(;YiiXU7(jtUtb}`JT_CSDcZ2
zo@l%$Wye=q*v#pA9({b4>yVRRQ1tHNhHAPk;wxkU5xE{Kd$*4*P24jv8{{kB>UHg5
z+kyE~e=+(#FOko)>Gm}SY|Ud^NX#d1QGYt|%jW2fO+A-t33we~2T5;q^pqH>E^~OG
zEwumK(K2uM@$Q-NJ3l6OmX!5Ja;+yzu)btAu5S+~J%F?fv3+RQcGbo55N+f4C&QE5
z<@P7-RgM(%8nw}P7IZombSqr4{saBwtWD{IsE)g{i!AMbmJMq=ig71Z{VBw4*lx*)
z3jh|d&+YA{an>t227END*_5PXR*eki7B_l2=8C<)I+I$jUS%E{2#)7<a1iFdlCe#^
z_uSs80SZ6n*4^UjyA8_P`<t__Z|X_qJh!DG=jDl;b?-ZCyYtOWZ@SBWQ8pZR%P&s)
zeAZX&Z~a)WaP3rQQBf}4-*R@jAK82Ni{AB4JRW-ROTgL<0fB4z{>3Y<GI-)E$E>+|
zm2^DTw(IBVuda?>cRn?Gxc%!L=9_Jw3bTAVcLUD)Luc~vK<#{4aoYg{OJmO|{f&k%
zS;G9IVGPKH6T<F?y`co3*6*o(RLqA>VtPu>g3<KXI<EL*9|Wx)u&Z6W-Zh!16?zhl
ze#zBGX3VXfDb48{O#cTwfXe)ypI?Q=N1E9lFSjzUS;(V{eXOjS0v-PZO_`m=+nTv}
zPtuWSUDr?U+7&D~{$Bj&uR4zqPl|KY!zyQ<$ZLFy5Wi0Y!8~Nj;PO3;NTJDJv^sW;
zS1uZ>&wO&x_+9Q@pW^cM%_QCBvrJPI=b1$kl+%qjjx5&;!>({By1v}JPsW9LX!P60
z*Hla|W5my$RPNm5^0hmrX57I1tykT??R%kjXMAqw!w^&T#v}_r!$;wCcH_K7F#_D(
z>oON#i*C!wX-&(p@>Sip?fFo%VopGlfZVFj=Zz(rWv843tuIW=ZmWUQJFXV3c{OK_
zVg^Q}#|zG|;-8W`*Tnz&hVI<gT_1m(1YyB^8}laC&z3C3e?Cb3ZO_vmQkpN`b~Yx@
z<uIPmurJLu%VkirGbp*cE&04EadXa4eaxAR?51>_a7eRRW-^YmD#^@KrS17O|Nnp#
z$Vgi~b)|Q2rvhG6W31WjtL@6KSlNb5SHNqefTMXl-#{Xv?W;L&`TvF~Ts%WMc+~Oa
z`rCm$y&J=d8sXX}EO%^7<Ud|{Ih<xb{!ozqx^Y{|7TS#!p7(lH%q~tMhAV$j$9%h1
z{<E}_W=?5@;p}|pt@d0h(lOx)!pNIA{Wdpm*@A-1CFzL#>L09p8_DtSw~)+R`yRQq
z&e}f%CL~v*Da&webNS}NltSA6b^J;*BePnPOYVH9%z?V>rh~9IEW#2tB^yU*B(MK|
zzu+@^>e`<k0}I2;UFlmS)jzro{I0Jjk@^>-mv2~F@~ylup;pY`HHCE8EY0NWpL@>l
z-fi4{Q463J!;yurh7FeDLF)Cup+0KcH)(K!q2&xYO}2OUmbQ?)W3M&V9UI1;j8;Wu
ztyo5A0Y>nAO+$00Q}=z6+GLy33(-BKX^+COH|?8Oc4^AH28#yTk8Wjhm7s9S5qT+M
zM`0yGb8dQOH;Lr<WgU|?HsiE@+wO0?7%#xXvBDd&vF4wr;QOFwsT4p80Zsx)5w@|A
z{x&mtgDfn!AhPA&^6W?lUFg0IjeIAEi7QDiq{8a9DVUEZxAfY2|Nc@DeJb&^rJ<~U
zG&DS1uW(39gEBj@V6SH$XUP9}X^m>r>xXDJ_OcMyY{=?S<baFs%U-*{#babEJN37b
zW+#5JN|Rf4-e=lvyz5v+>`kBY{L1#RU$0VM?(tDkSFfDm8>7EeD)_++6ENsEWLxeW
z5lFmfN2e+L>Xo*)vckhCcaClI6aJA*N-~5I;uX8xvC_EFo094(0r}9<swTmq;0WS<
zXX2icNP=3{(n?CgweNovM9%52)pTY%>bKk(Umhp0zjFpRO;Z522wiXRgD-k49r)BD
zSTrhjZp2Tsuf?t7QP}HKn<hsxtmODASznkaeTS@eLRg#QqEPGXDhC1!DW}J5EUzfv
zkO#<Jbz%xT^?`~6kZO5X{!PLD6}_Q9b27|(MxNhI2GH5ah<>V1oA2spb5i^r2tjsS
zDv?k)2flOFZ??xusY@!kw(7Sn?9+rFrAN`YUa=)9N5pbNjlgQ@c!o2Rmx9p>O@!oY
znnyOrPV9iJBSeskeALYXUqrYM3_RTgqI(##Xxi?$A6NW3#Mlh2OjLm35V`7|?SwfU
zyfGo4$=-;3D(xG7LKpeW!_SYOUniUHBs&__2isWQ(2TbhHdl}&_^&-Zpd3ucagR>t
z&e+j_*vc4p3q5i`HdZ$yUg|2aKXR)xFW~v}P`Dr|xQoTc&!^&QbbY-O6z?vNomsy>
zwBJwZtifo_#tR*G9_?b^tMs40M7VqJ7jBL{!XfVJo;c&!{rk@WkOIDCXp0fZ=&`mF
zm*?#``yO;=Mm&bQjYZB0ko!i1>zh3L-GM9d#-m4#yMP8v&Z%*ym3+N(PnU#5mXw~-
z=ZkZr=9YWSi??2Una;@BtR!Rke%s688Nqg!-%?Q(?l0n&+xT||zT4(jPqmX%thDi!
zqV4D<Q4IpZ(y{gR@8#l--&b2|Vf|cJTz0lUcGd-CL}JgwiQOqhEmT^x_l)*H7<9+P
zA&J88nG##Kwto6l;`X9i%{3?OlfC^X+D~?v`XR>2d1Au-_mS7e1E;Rpa2}`j9kVi*
zni*#ra>H_a)@IQ$pKvC60aMxKl4I+=2keKBQ&wL+(|hS6`Q_9%UWbk|#dJQS0I7re
z>7L)^W5c~&C;N<dY>d6Wow!9Z-SUd6B{#k2ANDIGPw7q6)YRw-CcK|f3QCBc`ycq`
zwl5Kf5B713N6wzzRdd97P`XAwGNrJQg=%W5oO5^QtAwpcm;{k-czAj;whp4gEY+y*
zmF}v!UVixb<)7=ui_Yy|6uiZvb4}zYQt}_=369LzG7FhhjPjBJ5t7&YzraYckDb#9
zH(i?ucA;Ne6>KqMC~m&*2c~UaZ@zve=RD`egIoU9Q`L(dC<w?}FS>T~H9K-VzNOdN
z`#M!DR={h23F;{mS%4QF>zo+pys9AEZ@q5C`6F^%-C5pgaOyvDZT~m$snAkO>M5%I
z^Svn!$__bUNn3wuC<R2kQ_$O-7Z0Bo5bnkil(Qr0`mSJ(eoN!M`;v-ub+>gjr>m5B
ziEkz0;IGW<>H1_pju6X{R#bdnWSMn$m@-WG=4L&;@Y|6qfAj8&x=imldGZ6Ajo(FU
zy^f3<SXgNLhtM(B{{GDb+IDG8p4mGA&!ksz1257tGiw@n>7~7cE)m>nv?8;0X&fBp
zZXbQ-P3Z{HE$CCp2!tA!`Z5BDV(d9_9A!{UYmih^+Xcz-DwlQ4dT?HyDkmE6MEM{;
zRV9S(e+B-4k*wL?5U<<~5kBPlJD?H{(p<={GSXf?K1y`K8S%$LG(0iNp$w&gZWI*J
z8KrF5NvEm_v;op(Gc#kP)#i24WI@5fboBIF0NqGPy4;ax?6x+y8zo$os1>jcOHqe>
zo0LR}Z$YCmLwZ48R)Z1Akfs#S2p%6k9D$_&qpmIkLJko{u9R63zJ1R&5oH$wL;^J_
z2&-}2#d~{B1bZj&p$wHIO^gHS?siA^+f86HAcNTY#rmkW7y$4gyDCUTx{JKh6FgC9
zWcolxQtP{`k9X2$q*i>OLK-Yh_hXqKr>6_{^z=YPj*5|S*j3INjT_t_Dyk<J+Tu}}
zAxN^Q=Ma4#G;tC>xzN*{_X)_`8`O*pyc@b;AWV0ohGLH9P9qP5(%zhTggRXAuik^-
zrFnx5(F;q^O635`zyqAp7*vo#u5O`IHN^=Esvux0sB^Ia>p{iD|KRJ_`>|e;(Hg(k
z5arIyY$4f?G*VzXz*0nujO?sHH;-cU1>VrAbW|&e3LBV$P^M=^WjjfOdCR+<CWY@+
zPTrrla-OY|$7q-5pP0C#eTfScG6Yrm$@%$nsFa`<vF-5T!-<M~Dkzx~HF?NzCMtfz
zRi{85mQb)fc8nI)GPO`yS&hF4=J>v$VM4%N(EjS(SfAJc0hP<)yqvGM_k)lSM%1p~
z36PPFp_u^CRE*okIstnE7=p(EQ)>EsA#2a4;^ZVkFuehXa9-^8%0fpiWT$cA`#sBt
zN83mjk_d%5pkJVLNeK0$42f!iC?<+ZJ$&>CYrF-eu{UQOX)v}!EmXsZI9aGA3OKMV
zVKe|WP+W_B!OD}<{fba*y)Y8w?fspM(64xc@iVEZN3pwUxBD;P%@p+163Mwx0rdgh
zT0!rE`!%<bdf?!R-V{-C;{gI+_!>kW4uE+;04{K#0#L5)MaTV@fZwJ<AjhJjF>bkb
zsHL@)=!z299-=^w8mO%GQ!qomOQFp~;9*c9BGfa{OAE?*C$ut}T9DMfW=v**n}W7)
z>}nW~o10srA_UJsOO5_wGu0!9JKYQZGckw)7_1`>=dC~RiMl1f3p-&Ey~7k$$t&qb
zav}F4_Ry)GpA6zrWkJ=64XqynnFikbW55~;=nZ!yghi(D`$BWkpF_+Std+a>?s0)d
zL9ELKz#|hFJZK3yK;Vf2U%vDvun?G>fPV9{oKLq26jw=UX%vc(YN2X;gu)}bM^mU$
z8Us@VX8*ra!H3csk9~I$8G%1Q-=Y{bMq&h$^W?YfYN47b;KLAOfk30hA}6BY%!LAy
za)jtNH0@zvRO9XehqM!|@Pvef=PUiS^*_Gco$A@l`CtzUWkfX#e*?7e0Npvr5@5s%
zsL<&ql|f%pz9b#8QbJ#yxcHB$_Y|RXh6V<Kb@HJ7E<Q05_VcXlb7E2k3828E)yJZ5
z91#}QTwGeBKvfv<siUYm#tI}B0k9^I(H|G|%5*A!{9quuC_}BE-{UFd63b5k$$)mc
zHyTs7Q$M`3&W8Lf`k}xWBy1kUVm~>3Z~C1AFp1#HN5d}le4WTwpZD?g-G%<^MB{x2
zRZFA)EokONhO$KyFe|cvs=d%zlP!IA{23i1F=q%Wd6Ki^ZCdSL9hFCJ^XcNHOHogM
zC(!!={R9Hf0!&{i=6zfczKjZg-@pLQFb}l}`eF3wgCDkO1C4z87y2S%s_~b?MQ=i9
zmuMuK9{xnhcSDIX=-IQqV939U|8RmRS%qAzK~J3w4ZLkQZBL0QO!ySc*Ki#aP+r%;
z5HPIs`(M;+o~r8V#RS+TN%L^Ov7qn1{~0ecz*9ybrf@THf*!nj#o`K#l=R>|s9EAR
zqgmmHZDMM5gykXF<UlS>f7(t)W;paSip*b|0Lv&wqO^+`v8Dkyuww+oVknD>{(nWw
zgxqd}pA$r%U33jSrSATI&7LzP!c<}ZQAL%;M3uB#e{wck9>S~6Ox&kX%;A*{I;iOk
zFsf5|Y<&C^44fiIw@}cmhAj|-j~vd244{J%{f|4Pnu4}&DIgIL_Ko!p2sm2z@?i(l
zss96trB_c^w*=}5CD1I9)zy7NAXFl<(PQz9jEp3P#USXeIOPRw1WYmilx<Cfm`-*;
z6Rw8G)2B-5##AevxDDGqa37lUUA_`X6IE4J=*3C1iP$TUbID%5`~n?YT69%trODGV
z{RdjEdr_smAS$n-^31$BE$X!W&@%!r0&|)Kd>?;WL{N$k&i?MB*BH=@-HlfK;f64B
zw4^kK?^Xs4eSZ6PFB;#*br3tS#Y~mNsziIxii|3rajAu>a;>hd$w3gL1nolKaUB)O
zbo4>teD1Z<u$@-v;yFPw0vgG)Cj5Uwm6%flRl<|s$jZ!o5LPNEbpug?XL`DAdM_1~
z37kmJV5D13L#B17cwM|QXMZhVl0;|n4QALtx!D)wr_dYzaF;-&6dGAFM4MP{mR!n6
zPp5;myO$YiujFB{H|7FD4F*omquX|J@I&LVlmK@)oC#tPbNaN1ur*d7rU;EKmB#m4
z%0P`KR=ARpF<_$!$eHNP%F0UMgc1s;h<=;>UwjuiHi^(IFsDvRO2RZ12JLuS>9Idw
zwV<o51s^xq1|RDg7IrntfnnZB37{=p*FKhov6kZi8HB};12spq*f51ksMFQ=wG4g&
z0I1~VUWVvC%OHS{AeMSm#PKi1Q*QhJjs@UH&wkqK@C~JPm|#AZ39guhQ0b^bI2Phs
z0bat1p7JBK$s0}2$K{C8W`4?F8rbtA{OoQlx(v}vtzDS7|D(gi$VhD{i_>*+6Vaf9
z#w;B(^A!V5Xhfh>!;rm!f;&_~=!qUVK&mr0mCv7d&(C*tH}<6ct|cW=@cXUQmVVps
zCPHXxY=NxEy=9;QzX9w5FxC+peV$h_`vEf}5fLY#7ziLa3BlZmn{pp00vnkthVtxt
zN+<|eFl0>+z>yLCEg4`+Ml$w;!mAG3wex1{r@)-&l>NZlM7piB0I5R2zZ6Al+S}Q1
z+V8cZZ)SMw*0mAVoIB%`=&@q$cSE+?+uy&YDISfCta~%pqwJEkKW+mJj|?FI;8a=$
zk<glnhAw$*%7ifD2(+G#DPN(N-b*Nj3=&Eq|B=v6cU^NrpD<s;j(AE$m;9<?r5`E_
z`Vr241#F|qBLP+Ty8Ar9oq(N32t`Cjasn#$7_d1Nyv9P4z8l7{F@=QzSgO`d#3YcW
zot^09#AV=N?HwPdhQ1Hl+k1~3p@ttq{}fS%^{Y|yw#*}&H*Y>>Q24;v%n!C2q1NTD
zEV(C4h6LC!!;}ggPReizAVdjsZRY~ZQHH<_C^sLp$wco?k^sDW2vHmoA$1HqK?%BT
zgzyTG<9^J7n{g+2B8)L>Z*po%N<o1fz&Z>ze1bJ$yrQgX+4H~0V9-ZXY9>*=0WTsc
z5$#7hTH3u3YA%6Ao%yqKHvhGt@nd3|6#5lO2(*0xr}TwfOuxm^v75FS%@>VM5(*<q
zCvG$<0FLpl&{Zz)1JkFQ_+LeUo&kk%xD6g%f9UuZm6A1m3~{?W|MBx@m(jszfHBM3
zqk{+SObS4qyT``(vDUmEv_^o&^t`stuWWDwtg~osqwVWVR@n5$&aTw9@jLHzRDWx{
zPyzbw#aLCv6{E4hBQxP@nX-@4sksKsb|23)WHzN%&3OJS?4)VDcg73pHl@J@uVH_U
zoVszl(1jTc(oJX^d^3|1UR&&Pwrb_H$b~!_|K2PtstsbBeh+Cbv+LK(ATLzV$gjWr
z+T-!#+mE*I96;`L25sM(`uZT`4thS8HGI>jqAV*E7-OC+`%FLa_U=NXy||^h*#@oi
z<lc%{pv`QM9$jaT`3`|}TlDnW(agOfe~4E?A`%F)Yl(Wpu}Ddxo`)~LpSG4JV@Wi!
zSCvq`251M64k8d0d4QyV3q4}cF_Voe!vXu-D<m}iB);IeW~hK3aQ{1S!K|9o+#T2`
z+$A5pI&NkJZGQdFxzK6{GLg((Ql+x8IjVp{^^U0j%2;ODQQ9Y^aL1CauHs5JxSMb&
zA@%zZ5veh30zfO*+0Wl9ML!V;Y4jbFV~*Lu8zA%`rY{2DY{2eS;f`dC*y<mnzsVC#
zj2wPbkSAWm_$$w^U(Z4gi10_a5|Ix3v*X9c1>OPMLa1XCeN-Uj9s{E^s^CG(C=<``
zqjvD%!9s)&h87kSu*!h>s0;GOVr4L7?uEmS0l+c6@vCn{94LWRJ;={*!tO&GEuFA;
zALUU5(4fk~&(WeRp_w0lMNU;}o)e)Q!ZQqyWCM<fhof1EoGSzCs(J+gc3=bK(R&rV
z)qWZ!j40Ep7s<wlp2H({K?Xebj+2%q(#tX+A~5=K3pBh^WbIU?$pgvwD!ipB$;ls}
zM-M=lH(;q*U%$#IJ&m)I^905U@P?5Q`!mDwNm{A?aHBZ##t30Rr!XX*wr_~u@8EMN
zKpVjd0nxh+9?u`QmYIbm-9I*M$lkO?mYWXy0K4iAlr@cYXTB-%izUQsb~ikkN1QMm
zy>>yGtR)obCjwR?1|Dkpc;H%rYqiKOF4^;{Qs?@v)yb`(eIE2=UXGh?^a`aiKNFIS
zt2}#(E^m#jEhpFqXsII%3c34tKbMEb;|m2gCP1#7Mv`fo`XYfG&{c%J(gzuO;3x=j
zdZL>PRcRx@F9|3<a+&WUacT%|y#Sxk)z!TspC|-62Vq>%Smyi07Fp|soC-N7(e?(y
zuNZ*xbB8Fnk`n5vGT{9QNinR9jA?3E!oQ=65(NPi1GLE-{sIFZ=#W)xBE1p2&m_vR
z6UtmhZ#1SnJv<8Q>vsXbcbz@<JO9;B<S-&BHd5P2_!)6=ae^%kZ{dqm31EZ9HsT8v
zc)whp8*8CAF7pd4P4WqPjf4$YULf8d0@VSIO;iapT=VI(XOAny>jIa4%&=%{$g&Qu
z=ltuYZWyFM1rMxMH`?)OpFSmfn0U}?$}i;5XLk<{5?XeMu(`Roy5IX7(GKh7IWYn~
zdVG|bvhvq2MuOpj%^}z#FlQP5vgE2Z8qeqk00$uC?}0h-mgP>?FNp9JWKl%O0^ju$
zr1jsb3@<R?0V(q&h!Nkw8v#D--+3?WTNhB|2-waMP%d&#5X2V3F(I6Wp&I%9;R#S1
z_0>BVOKjPIUU-6=taw#h!{L#dX1G3F5K2J%7M)#VKd3Vz-=swE9D0<i4}dpL^Oqr4
zHMp(+tP+Y^2VlR+0cXbUmcwmFrKHdx_s4n2@Q<e@PCYQch2S0`d5FHu6q(?=<bV;o
zs6iyE{f-?0lGqy+3}Zl}0V*<M_o9t{o3M9<63_bbj2$n^AY@oi;8+Qs4vB<h_V}d(
zoxZHOnU+m7IBoLaGXQs{T^@8;Q?MXKH(Q$8@USWlCn6Z{NY`ZwI6oueQy;u!G$AYv
z93jy8Zxa(K5F_}ppJjrP2@;HqxWG5wSdY+of2!q;8$}2z0RNK3tw^^;I4KXL$=+Q)
zKU4J1BCPoGLtPUf;By$HN9Yp*k3+C})WZ4d8ymMyPPMYB<q%LZ0QLwQgJ&XC!p+Ui
zD@=4w6nuXX8tMf@a6?JG5)W>R>eCP4j{zwA_wojKOaj1<tx2=(JqOVG-h&6pF_7aM
z&J&OEY5&9XYw;3WBz1M!HgDN7_4m(N0?vf5Dn-zj4vB-xmw0dkEGIEHffz6Y=R{29
zjJ=+7cZwUMBHUM3odNsU3!yZ`<c}fSgw0<mUHFLd2?@EDw%i881(*P1D6kPsB>-0e
zUZcdI<5#zW2eewimBSdE3#Tqs5Oo>>y_~HGTy7X#Bu`{c**rZnbB3ggWqW0esjfwY
zCv1nt0yhn5H!JIRMkb~gXJ|+VZeC2k@?%pMqHdnlxuLp8TMG4{*FSv~Ym_+p`Qyi4
zlFiiAR8SK{rfN2Ip*Hxv{Vz%p`$x~-oqVgItx1gVG&3~(HV0p!2&o=NXH*NbVJKfL
z-A66(FSuHV9mTNLnb)gXZ%y}AcII-(0Y6g)_f+A07T!r08+sc4@0InFigTEE(*(-J
zZ$a;o3bQ*NKfZsbBpH~QZHLPypnuTKSBng~w=~Ved+7~1#w(I<-8^|$6#pbi-oBk-
z0(-_rdJAlPP!qhk`iMwObTo;C2^B$aZu5=MZU8r_7K-=zhS;;PcZvW46WINv)$alj
zs0RY3_^s5VW5#7WfI1=o?wXk{Vfv;q+kLC90Wd_Md{9g+E-fWPB#^w1PP&in<HIok
zoPwOYP$=C8v?vZw=<=5Gx;i>=5+BFJ?1RB5v}Hr`xvA^*#?<|(9?w38%XL~(Qc^y)
z7y|ncxY@g+97GWmF|=F5osd$v|DOoSffD8x7mql9;4U5kSBLeFp*9&|DuDmuM)j5$
z$LYXHFReg#o$M8gL3jSP6E#qbNTUa^h(yA{V%Vc~IUoW0AtVx1?NmNqS0Zsrn2T%K
z_i+mfs!m_U_~gV<{+x<4Cr*57U&Ta?!$5d#huXwgdp14l5CV=YrlFXDO5ls(KZv3d
zT%1bkH8EaobJq|7MA*QjLBS*S`CQ=9<6xm+|4;!SN`-y>{pqlpf$BdfGortaqj(&Z
znCOEGx=GSU{Sf8^kRBiaW4xa?RD2Ve4(bDCD86BkQRA*QZ4})e1k^?<0_KTu73E0P
z8*xM)f{HIfdZ1D<zxgDD>z=Zoy~AKxO^iF`zmi6B7U#r(5clBVhNd;T=M{MDx(riA
zAiVIpbOZviLG(ny1ugp=HKnH_9U38c8q{UT0dPYiE(ri55!2k$h&o)uHx<2(2<A4v
zeE{lgg>cz5B_$q&;2qM$k4C)!R+at&uCqk09#MNcP-&-8T)l+Z^~jF8iCB50v=K>K
zFJ}DwK(WylShN8I4Y))w<UYE{liI;k%K|pp2EK;41X)nmvuR4z5A{3LdQMwEY5%@`
zkL>Q;89<Iu9)8-k=XH~o_U^fcRlabb5Wj%dXnoa-`+d@rWyRpo(DE~<PurkUq6<J-
z@D5ogM4*XAOFt-uUSOK<H{9InYHfK{b6EZ!BnCu&>8_}(oci41@@1*AAko@XypSzi
zYO?XM;*7n$Fm4AAcA?B!_}RKM;{MzS<43l4&Kl1G`O5wZR3!m>9)M%jh4OZm-JpM8
zk2$b{Wt9vKaD&9?kc+Q`$gsPmU`)MDO|2DSI_@h}fXZCpvuBdjhAcfZOU<7xcU#@O
ziNsI-={pLpU3{v~va_-ZF@6i-+c^w$#ib$2o7lsT{&6;!BE_Gg7DEtj1X37-x8vhd
z^b7nE97`!H2RJZ<l;JibF(gLy>gCu=p-V#S<(aoNB9fYffFq*tLXpSP_h$yEi4cO8
z_5rd4L$FGd_f=BMz0z-VyXXo_Lgb{N6Uf4A5rZNKjHLs=G`S3)t%slUYp`l6RntMS
z;wxidU^JO7M<PzpMS%UJ<>agtq2co23OOx(E}w>-QQZor_b$GUcuNG&=y@0-D@-;H
ztVN-kkZB||OM$(|CA=cf?Qu+!jOCCf(2HPS0d)HW-{M63dGj>DyC5g;r6tFLfWe&Z
zIB^YIPlmD4K^;~eVt_ru`Vp^<uLEswH(vW0-??~xO%3hcyO07I!4MLpuK!{hstU%v
zg%!sXF#wO)5CHYyUV*H}2nxU^6d7RnGW-?93D_$!%7<Cp`7{AY?OBKvr+!Eq?VPYz
zT?!>7g6oT5PjhUpHkEM?h^8?f?}PwiN8rhHUkO1g0D};GeTV{YjLAEG6e<bA3WmDu
zKvBGM6g4j*5Jz-Xd5oP)_QlZiSYNn;Z^&1_*|HI^;f-~d$t7o^JOb=LfjUm0Ro?{z
z;iYnre`-}0Veabs$^@;CtY1*z(c#}8_P_-Tf*b`lqLhx#9^^S)r)e+%{vpuruWAi=
zJPr!*RcI(kNo|5Nd<Z}-iF1!9IGH<8O_f9RV1oonBlTLi?FBV$1SJ=8;}FOr^;6k6
zea7tO&8JA^qtV2u`0?X8!!O);Xs{kbi=yT<7uUOtx<iVLLcor<=ez7NN@pfLLtFtW
z8!?RvULelsVkPQ7`fAR*RY8<Ma2+H2jvM?I%vI7HBOgRiLzFC?7bo2z`t8lHA{EC?
zOhh7(%V*DiZ61YvLXGA);erpc1TxCV6dQ52a|e=xX!#&8kgixmmKFIY^JyCcpNFg@
z47K+J+2ojl9C;uQ-kBgy{6k)svoGF#_oK2h@rDfDD@0tu?Oav8Qz`|nE?GG_LYL&;
zq4>(&hw(VeUqOr@icDl=WSVb$X}J|Oo*l|Y)@p#bpU2;ik<LdJ*bHz$H+K}c>6Z?B
zCo{5B(^Gm9gTxn|#W8h}6;RM`x%Xxese!$u*Rz1kjkxlU5Q1w*J-k>+jPwKU`q`?r
z4(QT&8R;lm@Tdv_|FvD3Hbt%Lr=H^l@R84TP2GJ7vkTeWDiNAMHPDpPtXhOnkK2J<
z_mPj!`E;+M0=Eqg6qtDaz9lxA*HQc0*E`gQ4jtk@`9Tc{fG3zcjBpM>#-gl>5s)8<
znjDVng<Iini<4XkjStR<A`!v5dBnxVUHpR3;t}?x%6^aU!`{>Aa}bm$+%OabbTKQ<
zmr=kM18KKICZHHKc^il&gBt(uEFmSw=pHY`!$ct`*?5;U-=^S)RwK`S5{&mgaL=cC
zQvKd9-eUNerImNi=l3y>-31nJ+&FkQ(r@T}rFZ_-xqH$@yKMW0DA4&*ifel%Rz=<O
zM(bE|%+ZGNgAa2TvePWu$TzL)Xv+s?SJ64983tR&e)71xwk(XIq&`I=UsJ8bh95G7
zZot1$aeIs!!i~m+P41F~B4I_{GfP9bEcg%KL@2pP%#0>%THYZu+lq3OWSCwb@Uvfa
zJ#yMVc<D}7k@OG8@kg7)biO<5$hz*ZZ@p$QV~J+NmGL|VCZ+xve+?J9pOvj_wbydL
zP3T;HSR4OdnQ!EGUi{0m)^w<;U6JS7N)mp|<MC`40#?J$s$Kc-&wcclHZchs+{D1d
zl;JPsy>;!2FKXXh9)f%o_$RG2b8y>3tHEzJjW>HYk<y0dshl&(1TV?@9xTpReZ25C
z*}RihS|hNX$;2t=>Q6=&tAMxrc1df=XMWh_J^S3S^I-9PmCK*3$&otVq7u>zq|Fg2
zaw}+hzPd%JS^cp~%#H~u?Yev}6bQ4AR4hAKyAOS&B9R8yt{eXNNke*2(QMLuW>K=X
zoqb!inNik9bPb)TNOxBRc8kVXG>^JbvyW>@S2Z$zxPP>`e{@5bBINpyO1r5cgMwX7
z1Al*7jBI=D-f`NFEB!~ZX5g@$a%7%+@$;KMk2}hbU$*NyX1XWhovDIr!Fa8ThUI{N
zXsX13g3J20Xx@hOrj0O-ssfkLCl(PaD)Dn{=C5+1O>22DaAfSs%DF)2VX^0*B@Wx^
zUpDctTUE<lk|XD0<oQCTt<788L3O;L_3m;lUwdxWR%Ny0UFknKNqcFXoiBBc95G9G
zdAd(6I=8N<o%Ye2ll#sd&`%OfJ>F4lIDPUWdjnamQB#-p80$rjKP-<9+zNCizw8iK
z@3-7ZV@~;N>hx`%zg|bZUc`}P4s0~7+O=k-q*-0}D7C~81g2yWnzlP}%o6SAlKR63
z|H|n0(7#!^&l^$t;oJ8m89_@Q&P$%{2}1(vr%lIezqf`mh8v$KK+|LCkggOHX9jt}
ziXWl6Ir95=@!R|lbacTQRzDWIPn!Q}XBMWmPb>Vx!SbplYuB9Qzvq?Go!qqiOYZ0I
z`Un0B-igLvd&cwT67<wV&&So4^2T*d&#g>qpJ4kn_bDp=J%#nr?Xsm}(yJd1ki^B~
z%vWy6kBQrpZ4Z#|Q7M#|)Dydu)F1iIw5w}MA^F;|9WSc=RFt%+Iu|TFzc`*M%nvm!
zz4LN2pS7FoXnyh#TMV(--<7*rizCD%NfSzDHiO@eGcYi4pHlX_D(vg#{pwW8;iY`l
zHApNq4!%-*I{fF?=8kJLHgEFjuN@93s);+~<oLPp=S1>L)8+QOcfjMtWJd6~hR!Yu
zU)5&bLJE7$VpP_6jk$Mv`-@t3zcT6@=RdDjHBFF6)nScCrtWL1bgZxbcComAHD21z
zZ(ui<$3Y2Cz6uUeC!eU`Or!PLb#jp|8l@=G`;(ESzw<(UpRRmbxm_2d@#zGaTELY3
zuoq`}TlZ>zTbBJehv*CTvii<TT&s(^Ls|{jgND^_Y=|?6j@CE<B+RhF9$9;M-mbn^
z3oBh1zP<L{wRPu3c9P^bubn)ZAI9FbM24gvjs35!6h7E^s0w$+n@Zdu!qUy0Qo{9_
zZh#V>;NNdCp+OUzV)v*?$4)ke-ne)xg85J)OG4ax&!|rA?u{3Ih1E}<1kQ`n$Jd19
z=Ew30xuhgoV6;^AeG5<t56_qOt}VE;*bnnw^4i~3-`z4P!T9u9)tA_-9l5r68mpe*
zU2T`|)Q{C#{|RM$g@dJ_DPqS(hg(`vO&_|vVs<p6@OapK=^p7TeBT|9EOU(>^w4-I
z&1h2gco|_qci_%vuMa$4h&!&}v`YC(`^>?EixX}e_g7PT=GV+BYAVY|jz}F#j1QoR
z6syQh7Ccb<NAk6JmCb-OcZS_`VDRCxSWCw#@w3X)QbH#6OtTzIIw7XZ&aXf4`_;wD
z(EqsB<Au3MeSN-DZT@y?BVXBi9tOy>-@aYC*txoP<%H$l*3UOc0UL9r0TC;KuMY?~
z-ZPeQ@mtIn6MeC?kDHeQ7qoYFY3q>Aj}mv|z>sXke*Y6IGdc^V_lW)9MEc^nJ>8;-
z?6;t=;LoOWliyg<K0T}TN}-RgU`X0KS|3Hx&bv^OcBsvu-jxGmglzAY2mJg+7kz$^
zEXY>9+`hEr)qRzZ{rn}kI298cTO##WKfDmWp5>y$KgYZ^pnpBV^vs^mI@M)C4hN<N
z%g(2*k8Mdw5(*h8d~pci=-t&{Hy&Pn@zHis<HX5SW@`84^0Ol^lBpg@h6fA>JCR5O
z>y10J?-}uHJE|r1e@SKWx-`D0cZK4$VdEWv>qo>r<UWoGI(a*gVT?-P^?$dl0=FzS
z$7q+@75RfwGH?Am^p4<4K5<}>e(o==C$o(-8tPxN9J}vH-u&tMJ*53!E!7uCyKYEU
zQu#{E#R>{s`qSOhnD@gpV0<<4`*D|iC9EggTCbaFN>y9cCS1m#$j_foJloZOWN!MG
z{pU2}r~B?C+pZd2H`VyP{-c^+rmAu7^#adi|Cw_$ineb=cL&54gcpsk)T&&mh>E=@
z#vidJw!C2OPBVWP3ThOY8}}CukuK`n(9#K>&vL!7zB_dMggIl1+<|VVi$bt_l3n7b
zL|x{$HSA_9$xhSx$w2uN=fdjB$&6-;!5h`>=@v`oY!rUqTAuhM#Kn6;!|xmX@5NU$
z2X;-oi?%Jkx@bIp*Z$KD58SScGwohyF(=ExuJ`u+e6jn1WHN_$da%z)hSDfKTVADZ
z-@X3yr}zD?(}kJghfWG`dM=;aMtX2cyXEJXmp)yOj{p4no(!XiUR~J{p3B&-u1_L$
z_Q{W}S5tJnt}Sd<;XJUABOUWi`E=&Y0jpMrO`)lsUaEganrBDNXD8}52c}oP%xmOK
z_c^38_&&-k^m=oK(ZyGe-{_+cGK`S3aCuZbnO?3uL-X-lU_)K$r6b$7mK)E~j@}N<
zyIn;8*>c2a{Ae*<RxP#UQr;hu<lCC^?@DG}C$kUK8#Nh>{q(odSv-}S8(=uG?4#f_
z{Wv{J{Q8l3)F3@=US?3^I!$qRY=@^P&y<ikJbQ{+)RyY@4CS-ChJt^uU84kr0atGi
zVmE%bZZ`_y#`NE(m_NQ*F_?R3Sn6LSu)yXwXe(~sl(flpdYP&)bY+?@x&q~Rk7ubW
z*Ceu40lA*JNmJwbXEUj!)9K;!Mtf-c<wGy}-7vM5iA}-pp}I;o9G9*W(e$@xN?r=(
zP{CG5$GOv-qrMgJ+OfgrhzNypz0k4R&l0k&(kD(GFY(~Cign%CD3OrXXy3>G`Ybto
znTnqBo`N5&-uKTRy)aw3vJ2&v=9UwseRbh=IoaubbE=O%)YT=?&DskK-nt^cU(D6B
zT{K<8Wr<u>meTS2wBiZR&6S3e)-39;`UL5hM5eQj_6r6l9ZZeX{lJ<t)S1V#E>7pU
zE_Ss`Rz)<Y<z>{h@DY+q)HVD1`Nvxx@KReU<~Px~IP;qKKK?9zPl^6a_EM0%w(yC>
zsmhFvr&~xH>UE3XmI|^z+AbZeT-eE3u$gq?=4|J@uT!0v^DJd}>nVY`yys;Z+Lf=j
z`u-+cZHnN5=bPzv{61bK@68>(4-x%zh^XFjw{|;g@^Z^25pJcs{AYK(&#wv$d__&N
zVe6nPuPKp+2j3)RTbfeGXWgRg(%Po9YHpdHD&?ZXxM$^F>S<Ef`;gUm@uLMK(xkPb
z2waX?JnKrUaQV|``up`=z6ys<A63t+zhvgxkxC<(c<PO)!g_OPs+pOcXiomFRQe{v
zx*zVHZ+vL)Ns_%{`#RHgrgdJ2COqy|GDIwb=eg;PbzSAFUwl-FDNWwBbAz`(I4-gs
zkq6Svb#V^Qtk=rNe&l~>ta823+F`?JsIkx+nA7)ME2!yKr`u&Kzlapxt0&(dSgLPW
zn)v%YdY`c)Xa2L?%l7+I4_d2E<SMU(m5Dp|kx1LR&&x__Fg{&k4YUn-H}Y?V9$vh(
z<}fRgvvVO(wCC}&?<ef*FYk}fExT8soptx_Nd$!kepQ_4Vlh}aG2NgfV-`<4GQdA0
zU-0+Her3aF*R^jRp>EH8{a9;w;@t?fmTKns#VCEuD?GWaM|1hC?h{w<0{?5FPD>|`
zT>OcH#FQfLKYMCoif@e_e{^RWnA^WLjze_fSc<!g*S=?SCwDg)2iqRpJMw;d^MiCl
zhs0%E4DW=!!Rn_b;<#qLx93kZB&~k)&?tPOWgQh)Rvf1<9~0s!$p4zf(0zsEA=h5~
zb>Uue@1Y$QEB~(kOsICLQ}X$b$urF<&ApC{Ti8x*K3MQYN6y01qO0WA?vhSt%Ha8#
zW5#t{t79htm|#-W>RZdZ$wzvdKj-{uD4n_WDl578>6m8Kuhoao?GqAUakyIR-t;}@
zO4qHOBz;ZE^KGF4v~uq>cF$>rWGr`?TTs3=`|B?@dcbHVh042Nj^TQoL)yJkbNk_+
zn4UMUcPrbNWRN{*K$5)s&RIO#qr(5cZO!xWx3hNbC|dO6=tHJbJK&J3oyeuYwl0nJ
z>52>~`_4M@)(W<L$q!zb`h4fN<2Kj-O`3oD^;<TE^+MM~fA3uA*(+pT!m~ZU`{Dn2
zR&Rk-?4xtKI^TX59=4jcvyM+*-$Gk!hm^$i11I;ci$9YB?CgBotJA&y`DCB>?{YPE
z&OLAR{auz~<y-ICpI*_^1Y8~6PwaDwtSw+^>i-`cyZ5Qiw)KTBUQ^7YW=JPZxSW>q
z{0VbINODJ3vf+NS_xn2R%C0o-HG29~T;XAvR@$E;j?K%zPK^1yWW}eWtUuKM2{Ig5
zu*>YRNsETO7SP<v+Ja;J+Z|s&JGLToK{M;SZzoQiIW~0#`_XHPXC)TRT2)o|_mOZz
z_C@}UsZS+l?$Zz5{APRb2DuGPw$`(g-}(QIIQ}!uojKVsr%PXkE#ly!m5Q$|S~O&>
zQh$p2&G-M2Bro&%SgGoL@z^Qzf7xulVYNikIV3prtbX5PgY=d5-+sipUTBm&`pa%&
z{`Nb?8=hQZPBkbBs0Nm;^GbP~rijTZu3o_2f9id6@Q;(F7I*gh)^$lqho$fY+J;*0
zU#4%-!F*gvu<QzRuI}sbSHBfn1cD4pTGlivB~L#6w)yjei{2-{12^ZfH6-yfOe+KF
zGTmSEz4Z~WHQyrteae<dppHX)KuZ*oo&Og7e(>hw?ylS4=PO#P%dg(fa&XDKeM|KH
zCw@8x%z<u2r?U5W)wB0KR<TdtcXs8Wa_?19p=Z{w*}gMk!z+tte{P67@s^&v<K<V`
zJ152v*h3AmwQ>q`od4~hAjgjxCaaA3-v1E1+xFAr*8^a0N>n)go#UOeA~Vd_bt~`x
zzy3(F!zt;@CyuSY@ng~a@N@D}Z^9}T#jHxIi~akYF>dMp!+)l_8`eL)m~@);U9t0j
zIo(yy&I$pisuwi9(VlXZUESQDM>jZp#>{I6uQp8LXZ#mZnY?0p->XSq|Gc`sm-VbZ
zP^odrsY$3E=*7X)rg{WxXnYTuV3N$C$qP~z7+2ELgP{yqY)b+UWB|28?9JzG0`|<G
zT%0WaW9egqYla*X6M`nJT=~(k?$~^R%<N4!Y!aV*+q?Y1=buLR`=sXce|P;C@kChT
zbFSdeLVHc#$#rYy{4@nFAii<yR@kXs9e;qU5G7x8w0Ib3p5XiUwjX%Lsn~2a9^kN9
z=*jjwX7}wsytt@5Gr#@BeBhi_$f+ve)H!ekc(~?kr51rqpdQdpeBeyP<{Kt~jKEPa
zSKu&9<Z)oUIxTS%|0)a`Ffedq1vWl_eo6*T%3>E#o4i|xnTct_q)AHMp~9-ufwxn=
zn=xU60B~X=)KO|t&ZWzjBi$8RCIp36Ihp~F5{v;}!wnqcTJt7USoFc0H$A{LGShzk
z22KJ!1TF(M*?%Hj5_ohXa4o|LD>lWJDF=W<<de%bMCbr#GT4AqZHfXMDKoo)4oXzB
zu#f<rCvgxst{UmCxXRJzIxZJt_~Bb<u0C-3WWhSU$zo|B-xULA4%R3Ohz2iQ)ph>)
zVxVI-Y}`086nMCZqKh7Qc?QcOC#@^(kk}2edgbf}8b>)KB?_#Sfr@&7YYM;uz=0mJ
m1y(YjNRVv;8Ryd4`CtC`FYRTUpBiQ}0D-5gpUXO@geCydVf8%#

literal 43263
zcmce;1z1&Gw?De1ySrOOI;Cq1h#)B_A>G~GwP_V8X%OjdkWf-oLb^djx<MN5-0%0j
z=l?zDo^zh>+<Tw9ecngc+H0>l*Bo<<@f*MKTW^%wQw3ZsDl7<sa33qeG$07c4EzVj
zKm%tMQhq-If1#N?QGh|Wh(9@Pg^3Wv06m7uXnAF9&wFZVDNv*BTNYz;nU|B0%E)ls
zGf)?>F;VS)SsfynJQd0-KUP#7(7<gI+ol79M{`mslMtvQ{~?o+sSc?_-91I8r`FMa
zLGTf2XfHz|vW?$!SFE<F-O{2-hY2GDVgetc7}+P=7;x|z5M?uife+Itp%}#UW3J8j
zlz@(o%Yy>Os<bmxKawMZT;0Xs!ws%t?cW?Pb-w3Bzd2q_Dn^n=#3;l?N6P+gMNO@0
zDwm**oR}|<2u6T%y#51?zc7vnaf$IzaQ;-?O4F1v!D@_eKVn2!Z&)n&OVLcZA6^7g
z^1GlRdf~75;9(4Hv~E(_yWB^uGA5C)BVpR~;QU9gG!~D0RQIh9h)BtZ`Iy-2q=pn^
zm`W2|jZ?buRuhR%_j!r3B^Bf%XG|jB^m%GVEVth8Vi=z!79)xKNXs3#R#f-%Ljd?4
za_}5S`C!3=Nnn)CKp)KM3`)};yj<yp_>>M;EnVk`*dmgPtt-|#J1L3}WO0n8KhYAj
zubqz1UYMU-+M^@JRGGy?g8rb>A?6mRdpy!atB~OEyv~jp>db#8RktNh1HDR4j^DdV
z`Sc+`Z~Y6cvBeQ(L|j@_O642E>{l33Ws+rE^*tjimd5I(tQ_`w%j*ZV4_!D&p6%#<
z`e=bogCm+&s5+wKnCtwt{gt*;M5r%$#`RX7ys3Ic%>$O2izX*tv<6(!9F@Y{frn<#
z=H8wxyhQpwI2e)q8X1SZWoftVp@6Lf6p^IAH1Uy~%b@vY!B*a2@V<_)T=Jr2;vz+R
zrD3@!PB56iROM{JkA(rjS;p7n3YT2Wha7j<B>m%W+86U=>p$=a*@iW|>>_a8@d#e|
zQt)Mp%*<~w_SB%m6;^Num|263laqF*6{jz0Jw5e&elk_cR@`LeC$HNv{=jWmTe}@5
z^pHHOcH4E?L;%V$o&8PKcoe#LPpi}h4cbo^AX!nshoECxK2%ro8zfJ1bi3=5yEwFS
zv>gsJ_>S4d!?(9JqqUaY)kYgWV>QL`kqLCBbHBV(1#d0K>MNtp!eFsfQs~pu(*w^@
zWTf|k6P+cm_}&S-%PeNm?(f7FP{l=R8PY>MU^+ZP$)8%}pT!N1{`e76QGxg4$B&UA
zORR0Xa-(P8kqBRpQ1BgIo@V)O3<z4;+UCB@)Mf7zJhwZf?m9iOU0>RTf;h#Ho>jCu
z+d`1h*(*A4lN~`LqJ~`@*{{EM&wRY-X{6lo>_u^Vj>s#qNK|D=E&LWw#1yosoW8s%
zdV7BN58=ypr3ibK2VU-Ws9RLY6cQgRm1rxu^^EftWi#+QkRXInq2cOzORC1vg3-18
z>{CN=c$`8Z9_R2>8)L=Gj!@*_yG9P$n6neyK@AOLJ|6Zl>5aRllkLn+SEsm8XX$&h
zZ`p!$<0bD9n@GRI8=o<_qjR*2l8r2Ge}BZ3MLYn@wN`21>?Xb$^M!~U&0IYZ8rnsX
zP9fPxpSUlc;w(g%P>#8)Cr6errSu?2Je$i9?N}v$1nx$#n5U`wXf7?+%a-W6Iyc3F
z3!9-<w^dO)Tis8c()Id@Lu?(qAHfMK(J}4W%Hv}kt$U8q9fO9S%f)VUl2zPchHc^4
z<fcZ(FDVV(t%_aB!GY7^vA0%*7G0|lcLaEzip7sHD|d&Mr@nLy*V^jEt=x|diLY!~
z6v_J$!fysEQ07eEbaE~M&%D<K+-gd28?L_iP5VVeiM0Xl$>!MSq;+b=$B(<hV|aOl
zOHnNQL{V+l?3*zs^Uv-M^IGTVJIvJYVFYEE_vz!(+H{pEJzC$~ythbAv7RsMt%+E^
z$$=Kn-5w;!&h|R}S5vEKk-qOq%lyFBW3!WLpLvI*!-e@-+lL|E^$z1GkddhY>BWT)
z0gB9y3oZ2i{rlzLJAuPF?FLzVD!p|Kre_`<$0sMl9YZ=$P`OwrB;CxhBUVIRSO2Wz
z(6!Rm(K4T7w!@$DWly%kP=!4<sj4xFnO~IBgTYsXNqoAxx({95_=OztyGMvEo&QuS
zUVU^RZ`i}@O{#)c-y}??aPoRCbJB=jiGipWIn-G(Kp7KKcl2TIsJukaX!Ymb;afdj
zE$y4K!ot#zgXw#&#K<xPZ{1x31Nhs8Qv~khD6L{y{hE+o1yAa-B7R_IVR1k3>Ep*=
zHM6$9r*YBJ+P^O>?LGbQU_|&;W@cOj-XHG)0m{*<-u)f(;l@irHz&_4%W*QhS<0}z
z!uZYxgHOW~6Crz@4&E~Zv|XMjsQtJ6{$g4B@8UVtst#D$%TvK)$wowI#P07z5w=Ub
z1~<JUS7<z2!H^;0sV<WL6XcTLTvw>+jceP&n^S*kW$Tflv=<_`=f4NBSS9`OhS&yq
z1bH>AE2~c5)HKwfKyyvr`1kKy^9a2CS=s2|I}Chg{l|uD+zh`UZwQP@#>WS3cRoQ5
z_ra5lvupia6JNdE2sd|rGwB=CcZ(Fi3oHCp1gw9-K^|F_DivB;&hI-bk;AUXbjzF(
zf?O;H`1osc^7C;QD=m%I7P?Z!j;Ld4rz<-TNY<v>@1J_c7u6Zb%4-c|;KfO2%Ot9g
zwosvYdq&8<j>0C-&&|&-f5Xz$JQf-5Z622K5L-gRpzdZazjNnpN;(An=G2X(Gng@Y
z<!R~VKaGVR`ZTY6lE>@xhDbHLtvfoqQO3b0mKlALq(s$$>qLFF0S!1u<X~GL!aG;r
z=o?#Tyw~u5C{)$g^F-&s{IqgptP4{o&yl31O?Z{fZ1c}EYrYSEJSO&NyIeaQ6?(7^
zPkVU~Ci9lWS{!<L2clRW)wGxJ)Is<Ay%9Z{OSrx(K?j_|^lQA_tIe(abe%2P9?c9>
z?4sLDW_H}B$k?K{)(c~(#C>?MpQCFO{2L0&Y3&p)&Adn+719Qm?*@E`qELWi2Y>s<
z0d9%)LZl0+k>5Q8pX1wum2Jb<h~x%UnRdx4Q%a#=CS;p@Zp5x~Iq?uUb$irVv3kx%
zw8!*XvC94$NubCv5=>|cxavgN*&T3OO3G;QuPN`Qs(kSDGd6z?wxKr>`6H)K42I|C
zl3+cu$esD>zA@n5uM#&tsAzpL?YB<xXL|;Zt(WiphY$Hag06M8JLiKfAj-&R)6qIz
zBsg(AZ=qA668ZVdaqC%f3O1Fha~x;R4X~)dD-8XjyX?Flo@QbpXPSM>5Gqlep?+vb
zg>b}@f>B-@t34*`#C6S@wN7=r8D|=qPaRRTSR<GBn#>++p&7Ke(1Ls#4%}U>S;HG=
zdyCaW5e74-O5una$N?d=8e|U}U7fB4`zPuZ8NpMGgoH`f8H~*Ap)GC~G}fxjJ$RvT
z_)P)`cgG{YB-eP3D}Sn>8Gcj_0hzkvmXJ#q2L?m^1aOn&yF(XZ8nI(+n$6-41)UdB
z!SHo^{Ti0M1bJ0ea>Kgg{tlD-35b*6_IU}vzpu)MGZ6zI1+YcbgduLY%p>wK7puyT
zjc+e4+j#xTItI?$4TpjhN&}!EkY@8EPf@h09pVQB-+d~bq_{d-dOfqX&~k*Y%t>Xs
z`fkTNnd2yC#qZ4gq3}+yOOnAz&9%|?LLdnkfrYh0+qeAvugO>ao2Ey9qy=n7(9uW@
zhO3-)l2|qDSJ0+vRtPqmeR9E;kGo8KdqvgNcab0M?n<HMCga~YcxK-9(%gHlt8abA
zlP2~%Rjx~%1>&D3D@1QsWg=C(u4@+nE<t%gDlFhIt+V>_<#`gZ`hl^mJS?x@zo_Z<
zV>Yj4F9pk-1TJ}D3x!~S5R~J)CWImBqWi*-00o6sGVbO4%pC~iJQ-ad(L83npS=Z(
zIr-&r-0jDYw39dE6bw6_K1x|wSrRJ}lgHoF%Xx@E3)Qpt#!5Ab6C7^ioB2C}7xACC
z4vwmKbiVTS`}E`Fd8-K<oxW7OkGoB-X2QsTrRe6?mdU|kTq=(R1KGE<BIm$}xU8rr
zIu$Ek!<Fz3SE{3{j!$8Z<P2y1ln?^D0I=F8HJPw7k<`WWN@=8E=sDCmYRNrZzxNP_
zc8vDG^C|Pqp!FHfI#%UN)BUqAwSHftioAFknVHm2b{FX4=BPTS6w&q;43`1?dtXqH
zuaMFJ_dTN^=QcovGO$}?`&6@X!8ruZ0C*?$`kF$kj3Kf(iZCEm2us*;vF{xIm3;@F
zQiK+Sj^}49-AH}To5~bflD@$knhJ=UC&=TD)Q^%=o!Ck*KDAm`qb7aO&+EVGBp!Hx
z6`0k5!LY`-@;$xfv!#)afLl?ydLXb_mFu1{M=Jjvyc0WP6OJw&T3v?wj5xHjf(m1+
zwiwqBh+=*}4FQvgjWa`_M<%9x=kq;kuZwL|l4#}r)m{+aWwi$h<j_48H2f&ob=b2V
zMF>d|bqGtzJE8HnQXqjNLqC4-8yR#F4aU0@x;?Z^-Zt8Q?B(;Y>qj2n?wl_KRh3(x
zIEqb(?94S&mx?!-^{}C!WOi?^@-w_v#G>f~AO$)*UH%OX=L9TRYL#ftHbfj++Lo3e
zd?D*zg2-6yvzxNVfglQFLsgBn>b`9Ng&;!!x`TQEAK>|t*)^5~&%K_{723E65O(c<
zZ8TYxf5`Z=8Q=CxWd=MNR7FfgNevUN9T7fm)}cAK+<Ite*|L?pJ6K~LcKS$V<s7{J
z6Nj=rAT=h&TD7TLu<(D=RLz`o4GyF)$xL5gz2X=z%4{^ZuqctpqFyOIJ5u}D^!{*j
zteQ0_V@<kuQ6w(gLN%x?gOM$;5#y;!%gT9-4%OeTkzGb-Fw4ZmM-`aa5w<0~mz%C*
z3*8Q~%s08Kz7Y0|=x?xaU#))Rde?Y#ruliJGd*79mHN_FdipaY2*6Msx|pk5BAWn*
zMgN?u^PA8}D5!+YoBm-IvFpusvAr!W1aI-%X|wOvZ^H%PAt?nUU|n5Ny6)bt?&lF)
znUZ~hWPUNJ*uh>Tw<w<!27l>2h4sW>QWE;tfPg3$df~BuX?$N-z%}$mQZxkhq5T2q
z1OmA#*mB5_>0ravPs$f{bG#T8<gC?m0FMw~C-&k-3>8s=z49oyVsCkYpvENvlwrsk
znxoFkCOCgkX-3!QK(Y37Cax8M3_}XG)XPiKl<XXTyq9{$S(;-x*^qiQZvx<VY~j$$
zrN(?qhQ{O0c!`c&8GkXbe@p>3M__Op8`0#7Ih;ba`CK(KruBa7hdypyuT68oP36FM
zPj3l>C+`;*+3PVcx-hZ71O@GS;za%vJp?uY;O<%c-b@_^q&9zpJ?456k{e9Yhj*Rl
zQJH${X^6m{u{6T1(vw1b?2&D=$v=N>92IGG5%aHAd~PK6zf;6zTEY)<Hx3;yEou2X
zrp-ga?ZtMSnVCIFg~XdOgN+2XINF0}36;jyvslFK20@eo%p-*g=ul^T9JYF~hWD8J
zMwpVIcs2JDg*Im<o`C_a+uj^nZ99G3mqkwb0;;Sc{d~%+wQF*{iSLo=Pp<z8E00lj
zr&#_q5h`t~4aAO(xhb*)X}znx-I`RnTt4m65N|IGz!U&QAc*izXPq{PT+1uRD)@)y
zVYG@^JoCLX;c7WXA9_^FemH!AQA~{5-9XHEDmBgPoSo8hx7Va+(;fl4s^ysTG$O!$
z7!k9wwl-dDC}{HK#v`lO&H1u+z4TLyJZ4RWP)vY{-TaK>2~*ywlSf&MRJ{E}Q@d6P
zKI8eG37`^`m;rVMpQu=HA40;{{Qz_RbqM$dB?4MnT8>+9>V|C$KuGvJv9Mrsb304A
zDE7V<MU9gX@5T$gXZR7HQXTWn+qYrV!VYj+wBnH(^C#O2ZPZEZ&k#R~iHpPi<<bl|
zjJAXjFortetFNo@`1pwM@NhtUsDJ6A?jk~r826th@c-wbIxi+3UIdtFU0ofBZqa4)
zAr19T%d&OWqijP5!^3KBTNAj?O0~nQt9kVe46414ERsaa^%{Hg9>qxBTTp%7!i$NG
z-4%2PS*^{-JvBA8b9|f>tVb9F2K$N9R_d#M6egw%qYocG$m;873{>mZ+h8&>GRkUe
zYrlS3%3wH8Nl6*f+}sS<ql$*iA<0YShpxY4U%h$5)ZN{UVd!@d&SN{lVV=3a@APSI
zPQSmu|K6J^DbzhGVjUeF<Lir)&vDekVPj)jjH05tR-+%{c>FKil6(rBl@;A6iDbMU
zoZMx~LrVOQg+EM<kH-Tz@bzH)9T9%BcLDC`=;)>sWiK8E-uPwJd`Y}(`Y8mJ{XoKN
zAF8ORP*hY@qjUB2?E99+KawjKiI0Cnyx-32t*5U~LnUMf@9u^rtrXaU!LYbq5D}8{
zM!}GxU?F8?9IGy?>5qrrus$&|HAR+?keHg9T9Udw9}=7OKKzAwalC=ttRD}UvC{HZ
z<1RD-#|4^$g9GmYBxK}~QXTI49d7+59@QEvBcq^i-;|R~0l_A3WRxR+t-Us!E9d0w
z9IVA2o|HtYUHP(HL(*=F=j`I5gy!hr;M4wc7xvgwX=w<Ui!n(_z3?e*nPJCEd+|ML
zVt4T5S*GveF<<w>vhtXj*h$AYUzA)%&)1m8sI_|7FAquGlDtVw46n5u!fI$}_#96w
zb~uL0;I=)bKGp8uy1zZmzdTW{_qj+t|Lu;2r6smz;ZxF&ZEfMe0`<-!A|jZ^#>P~q
zroFM0h-<XsGo=DwI=Q$Eoa(z@OZc5t8QIvdZ_m^}@j5>&Krn_=)6<v=33SgU9s?js
zCG5Zf97qpT$y4>VDZ@?9ri`EzTJZp@5)Rf18(c~H=FOY1Qk_aHNl8hYl`%7AK0dy%
zCn;Q**?~9BJTAZb#a9u}7r}>cXVN<=#C*cS!i+2|u+^#Mu1Hi*&r@;tI~ZG&l{&sx
zCtH)UDO?6&-bcSzsdY?D^4JUrkdTm2Y;Cv1PqM|mnfg}`{f2ZV7eA<^V|`8G))65i
zAz`VroqW3b+|I7d$kCBIL(*Tjs<Cm1Kl!|VWqFwq1qJ07bw0x{DK_XW_uad98Nr&U
z(yH`@DawI3504J{fSFcYT)h9Y2Rq4hC|inLSw-attgyJ>nc9vsK0f}Zi3#mgslXfG
zl^+umWWZkS2lV1zYDF3a(FCNVNrfED%yPpcBkH~j>0iFia?22)AR{9)3JGbiW>^ko
zVJ0Uhd(Vgh7s@Fw=gbgsWmA0-utPyXfiaXN@wG8KBxgGHePJQ?>({SkkA8m-uQu)b
zeLrw9m4H+h?G!9n)b@^qg(Fxp9bdoQx#oxNn<Uy5`cXkaL7olvW@ce2+=lI^7p)#U
zAqffiAt52dRmNT7tKei9xZ{i~s*GCuSQ~m!$+J@S%X_aC)!O~M#eI(Nsp>5+FIUyo
z0me9N#@2e~X@CGFF>s29A|l4K4fazl?zUNnr*W9-#ykL^Ucl|_?Fq@qKDcbpHM>^T
z*K?|gaq89u6%?@I(TT%>8JXGHmFy*KZEfe;{Vy|jt`5I)Q;53V!=n{N0b!xu-C?mk
zj!Mvm<X*deb71wkMIIXlQcX>b)}}#|(;X0<U|L!vLUvO@Ae<o8udJ`b`7H;nNHhaX
z4?k>g+tsIENSP_a#}GBbF<~4fKbmP@e9!sO+QG$%ZHAa9-b!y=SCjJ!)_7KJEkB4I
z$lToA^|g;292_ukai96_hM;2e*o@t?TWqHV(J5d}P*zTEd3X0^(V4}!)L<}WCJqjq
z`}gmAo$WLJ*`3E$RaG_5{PoMs%h%Twu;(C6Jg>FDy*Sy51SjKW4~~wyrm9T|iHJhL
z@m!NLGP6Rw7WHUrZ};dZ@#UW#IXgQJ4NXl#O3J8UWc0ki+nYzCY%rUsYBeR8){Iq4
zq%r}DF$ilRNl8h7q+ovj;ss_58K;Kcp21qFSi8|Dq)*?!s{nYSE<#5`Q}zcR&1Kem
zatj2*0Us_dE?Fn1su>{x=bzn}xsPJVLX_EvL0%hf_xD{ME7lxvaddPv9(a47eN8z_
z{KfiWM_};GbVp#v()KpT`qmb<hlj`K2K(8u-lGa$5wJ6tR##b5)6=o}(v+Q?oCuOR
zUgUXnOh?9Jj_7%rK4;3y%h~O%%0>#84F)D$TKW{ar~k$;yQ+%EZFi3HbZ;@TqQZd}
zc6Q*byiVMWNTEp<EiEk+QUT&uS65i>Hz0NK7=I4aNb+)0Uf1lV<YUTX+AjvlUOlQ4
z9Dq+Xq6`A<3`zj9!RPhAb(j`Eb%%g33Ff)C@Ca<<!#3GmX*D&1UoIk0C-Btx_;{0W
z1sE&N-k2&(3j+ku-tFmHV<RI7>IYOij4Ajpj7ufzu?@ezJdL4YB}^jts3}FLZhX8x
zf($UK*U2X7%Ql~IU}F|m*5&b1o#DyJ$i~LTDMli7%+HADkgch$?fRZBd_<F?RN(bz
zJI&=!Ec_llDB79WISdUADX6GQXaHp`yEd4a7E7oejBqFR_mch>(z$9yH2eYr-LDws
zV9@~mup{!7KV)fXssGVS{d{3+ib6G8GCUsd7M=+g=w$`437;3_mA4Oc@F1{hLczA>
zqh!uQTEPLZ3mptj`R&`c9JPCD75XAHQUNqzr;~|sFtNXQC<okzaUg{oL^FISNSRG8
zUp@{N55{CdG>z!3)`xSUAh1zonO?(baKVxym<S@r-2|zhW5tPi22u|mU<Za}g{POs
zxJac@*x5{UzZ0~5)GA3x`VIl4lDs(e1R^8TB{HaHV#olbrozE_pJ#CU_^0dHkX~q5
zSYKX`G%WnXQZ^Eydhyc6au}X{dJJuZ6(IORZ$Ao}M9RRzyCuL}Km*GZI5`Z)!iShz
zHXO8EMjZRK-d4__^jgI6I86xvegg4W7Z`|q(zZNwqz;IR75%A#gn*r8Qwx*JU8AYV
z2KjkW!D??`hF;~2%aIj^yo3ZW&k<@o6gu+N7FD8bQ%7kGP>d#wDhMr)IZ_+hv2-;U
z$ap2a<xo<F9UlNQ<?*dl9;FNeVkA{pAfhaqT3q*}3-o-FR^#dBtE{HwAq3lEHR=8E
zGgC#*vq(lBUdPzOXX!bvd(~b9)RjMW7kPz8n#>JBPb|OU$z4!P1ZB+;0*1vr6L9c;
zYaKX3C$qAuyBPfGLp*lhlt20<CE7iL-NcoZ**z32Lk38nf?~ZZH;WTcnNG_l$_My(
zgi+CrZ47yQjQ{A{L;~z&5pXK#=2mww`o<8^w`uabfs|EZ_d%N`Hk}V2-(+Q3*!mt|
z-ts`V34z)H67QA5r!$@oZ2Wn$r3FZ+n3^5Q&<{&{sp(eJbF}4p-bTk^^q^9b)j3_P
zoNAZ*uq3^NdAvD+cVwy330V5n)_rpE=)e#;U+v}P{JT&P;IdXlR==)Y(VV_IC1Yma
z0j5z;+gIIY2G4{u`%Zg*a|&xhkb~F9%P>jQK-3@a*88?6bjr(Za~KIx^AomEZ){K^
zIvJqL(pz)u&_f^iQrg2q2!LP$Ldv)fQ-?f#5oDT~TCCLp%ABY6)NUL6c)GeGF$6l5
zi=To!i9yRC%zlepT2BvKqP3ytyWVNF?INK*VD#=67ehI3x;NIXko%iAI0%y*5DiP^
zB6CezuBYyZLep-uF&uPu{6=bc<rCIpTK))*XXO_b#$@{9na+Rk2gXbQNeGe#j5Hq~
z$t$H3=hFZVsI%b%=|B=c1PORJ7X27p?Qn!3x*n<E_{X8*lTqzH*c$%+P>}5FV)3lY
z+Ei5t?7>ikuVDU<%>mF_OJ2*6K#%`<IsHHlkkW&hGkB(^l-rr@TE&T%`_01i>^Fai
zH(b7!{j*V^UkI9AO&%+F(9-l#%D@Vspdm=BGFe!NiQV8YLl|4#>%myeqFA0K2E8^4
z9yh9n9jwpOuH+-FzP?E<X)j*D;jw6t-$D)Voc`v@S#ihP)n<{DXM(O!XPn;Y{)Ia`
zc+k$~s;}(!f<=z#kRoXIW~pQt+nBt)D@068Syx~0bnxTZJ(4uVq5jUK4o6w`@yHm{
zHYRFhrV9ZO%=7q`-K<b9aNfnfn;7TmZ{-KvkbV;df@(1TjB?dl9I%k*K0sL#Dsxx;
z`wtxI2D+d)_h*3YiCL9$?3wJk?3^FJ(;!&xbo9sHZ`z+k(s6`B?9bH)7kghZ+y9<|
z{|9;Q0*HC6^afg3tq}67tgPT)llLk3^Riv;zlAGtFZ>CC4}|?zG2n6DmSzE+Q{KdY
z?zbB;j49O2Mr&9}5@wor&pJPU<Qu#p#jIr~9RaPaj{%v{CwhNOmlG1J_WK?qwjOC|
z<8n_7iy{k=-C`AJOwaJ1y#HGZFpG#$Q`7_@;Zjdg_V+&cK~vSnj2~j@L&Ex0d6#EV
zpEvu6z4L8hGMaP&j2=2vrhiBadJ*#9#%DnlO~&l!Yw{@rlio82u1G?(yz?Co24hwJ
zO7@-C+m7DNYF59F;w39<7vT3Gcx-fVjHT+svD%*1BXr4ulReNu$xmKTR9xcZgDWwh
z0wx<S8N`6$<g^#EUfQ@cfB8hfemmAZ{SOj^cDl#p;s(>w04-1WIx={c?dcX2!-iWN
zK=>GiEUGH1sPxr@2T%wP=xy)Ai^7&b;!$U8^GZW$E<k@uyAT8dLKH0?VUp2b`H#)?
z?)NUxnMRP}N)RHP_x$=<P-+q>4P!+?BzjzHYT?dg+DNsbacujxh}HWY?rZcQ*!F@S
zjr=+ac<8&!#CE|618r>>JQ=P;v<s5wk5}#OTx8sfa7<IQ&*LvncF!vf3-g}rIqw6K
z70}*2>&yO#e*Fhk+N?Fk-!PaXBB8to0h3d}aT6;$*x=4DyUig%vtMpgvo9VvVm*Or
z5g;l7tj^pl`z+HZ+IF8olt0*?xStdmOH61TjgUKFb#_X>TYLT=Jf9086I0%gAVBnk
z^f@y3_@1Q|G&FHNQY`nR&T&+E`xRK8<-hVWpq^!!8_`k)9C-ZXzato72m*aHK(xhm
z7Y;p&e+8Fx|Emyz{~tDq8sf2Y!nd0VAfRoDClTRex)^f?Hc^!Og1OATr=k+ez;ave
zR|!JY17q~JdmWkUF^+dH0_x7-MZbQ6QU8@Z`JcH9L^9D>p2$Q8tg`$z59|o^nXBa(
z^6)!BlR`=SR6efSyU*Be!TEU|1)XHHLefAIqK?tU`JR6CS_Q_M1au-Y+YA6oh=S^Q
zeckH$^XG6{EW#vlEQGQCw~+3Ch5!Eji`iGnxb)#d_A|dk=*Y+-?jWP(_?&F=@bU(i
zmOc=2n8QHyR&^U4;sBWT|K=1mz!J6py9039>?Hs4RMA-BvUeUlcz}WiHs1KNf^Xly
z;{qTRQdoEwlvfdAp1Vd@X9rGzn*ccT4g{>QK2}V;yV!wmU|_)8BCSPs@2?U#SXGb_
z8xOCy>_x59&6RiDW?xTFu5nj{qO!8qzfv1Nu@Z~QG!f2N1g8~s!vMhll~O@fP0eRe
zc_*27Mc{^3R#qzc)6>)A&`avC2tf=C3<!<{Tveo5h&NGbSSgeYHtsRFUi#nx30BhS
zKUfQ+;2DOz5JWYl6&6n;5&{;)XmhOC>*|d6&(3UQ!IKmw78Vq!%4Jmvrl4R7Dpe?G
zzSWbNjScOAcG+-KoLnTHF(`Xd#XPx)h>4w-I`3SauVve;VB+H|)LMK$jMK|iTRL3*
zO7YN%0aQ(e8oxI-qN=K@WaH2YtrZynlC=P|Lw8RPrb@aHX)?EAg~s27{JA73ok0Ol
z{xn;Xb82=L+u7Nf{p85DtE)>60|R6DVFlo!PABf<_#w!RFJHc}uc~H=6N36jev&y)
z_RA6-qP%$38d;`YuG{2&#KytNnPd(M`^eBxWD`@<q`sT875qB8X`;fXnFIWx=2li`
z3qm-!xP;{7=*{|Bj{2gaqKZ$RgvQ4Y`fiz<nK6ipQZ4!&;nL93R@+VUnWxF-2Ib}&
zXB8+jvGdIVXstC?qFs&^1<UhG;x?p9pp(!jCZ?mqd-CK7z_BDPxGEHsl*_AMQ_d$w
zM@K^w6Ny3X6#*E#lDBPs=S1@I@~G`Xgx2xEQPl}u+}$6^$|9l2sCk>4o8RBk|1Zkp
z<-g10g!+0xP*|5cUxBplZSnb^MYh!(8X+kS2(Wof0;at<$2+s+fCB=><fpDk{A$m=
zmtH<TNDv^EmUnjI>TM@wxl&BOzY|=atfU7g1s%GEhVVgs{YX&}0~|ZA^y0?Sh-lc0
z|FfFbL)g;)@(-Xm$N+HykB#l_3`QR52n<Z}$<56L`=2{{nK93k(DsyyP~G}XYcc5B
zEq6x|%Yq6QB~6*Ff7K-y{Qh&XW+4h-Oa7x+efp1LwPT?Aw4M<oq$=<>;M4T<3s7^B
zZ*Omh+0Ql<$31xX@HrSkN6+K;H_A_6zdqp+7A802OIuo6V&HgD15>+4!hWK!uO9|Z
zgy5hPlHv%T5EGJytDf{$VTB_J+KhF63PnGfD>ftsYqCDq%nzzVt&dH`+3+HP(ed$~
zvxAl8wKbihqe7MR2uxx&9!h3*i@(wtQuZbYtw|V&0}$7!|2L)T-=S)Q<Twn_7Ark5
z<UNGgp#DvI_b$5GbxoEn5%i%+2|@99ygjYC%~KS6Zx{!$)3USaL5UgjfDVi~0(=l3
zuwLY1IP7v*$LlO09s$nA%*<@R*#acGrTj#t6kxeei;MKY5+;$d=E(G!U=zYvgb?W$
z6j#KYjDQ7y1n3E@Did9^EJ=S*dSdK`gGb6!4Y9&}QExM@R<0`uD5=1)Eei_^li?g0
zCs$WFdHG(2HX%f25k+m^dGweRP#a)7nJ%{bH+dc8O)V3E@9vY%;=BOc*U#Ty9o$5*
zKm(AhMnB#^MpV))L{T+a!NGT)W<0zDLY7vkHtxm61+X9B5G9<pCODIXCMyiEL4X}A
zd4?Sv9Q;a=h20)O`_8wx%dHM1saKmkI^J8P2ed2{l&_Fr@@IP*9u;-Jf{Pf8O{!Eq
z|0fR+;|Pk3hK2^go+7BB>gwwCk$iM6!}eIfF(N~N$zsGna+q%kk0yPPr=Bn0<a^3x
zVq&tizFw5^9Sajv2Jm0Gg@x#VD+G~-;r@M0hyephLqh{`N5Bda*w56-C@EnLW{8A>
zEW*ggN95z<bL(+&`&b_Ywf7p<pX6iVint4Z^4yl~x!0K=WX-<B2nhmw3Do&H9J|_f
zk}E^Pmkg|)!g$Fu=bafr^Lb#^{1>$r>*J;50hc?%D5$8$e?{G*qI;{7mD9DB$WSt;
zUWDt~pz-0aFYJ?Zb=JfnnDJT-Gtfx-Q533X_of&IM1cfM^Ux{hVasD+Y%P{(R>nj{
z7776?0w~9z)q{thzpHUEAcnjB3@L`3dr&hFtnB)9?cIRu6CDAYF$_SN4Ag*92h0{s
z=)o*<&|s!mX`S=x04dZ7;&{@NG#MEgD5&H1rnUbPNFxAk7j2I}J&^POu!9j%#CP*F
z3X}jdhVFB`9t<39tys*Y8w1g?Am@Gwt9;o;Ktz<M!G(bYP!R-)ii!kA?*DmXy=!Qz
zU95o$Vv)A@LFN4@IDB1G+wMtnBAbdVh(d_u4W2AR+?xm@pr9zy5C(jNn8!8**-h7=
z60<1>B`4cF2W3@NZ7uSvS`m5(u#!a@g}}&AP{8%Y@=U#LlgAEKgWYrp;Jb=ckiZCV
zNzxvdS!~c701g01V=8n!8tHOf&}#XN3P}Sh_723Ch6D1;{=q?TLjw>YfS6UJQ%M(a
zd+lkix3RGS((KvARwb{?FU43o3962piwD3-wJJo+`U$>eOVNK#=0xy-z<mh`2p~WT
z!{p`36oe6DN5iT)U+hj*BZs2n%lr9>|Jhqin5;B3-Cz3jywQOc>I5Fl#>Vy#Fts3y
zp@Oi`-Pgy=$ap6bk5(2CsStGM&K)QSfCgj0b{47SB7x0N9dPZFwDo1xB`hK$59HN{
z9@`Ya*@6KHy95wP5%3LX_e3!IdMN3vJ$LjQ28>ime^Efg4i{_Q_44vE0#qjjuL%nK
zvy!mB1p2_b=WzHK*uqNWph}YDdlc2A8MsSig|G<6^B^ozb_QNvLTDItM_%V6V&Vl)
zp2XLh9FN_(DBxGQHsd9VN=hLBE?!+<S6huRfhHm1Dh5`Q2%P>Gc+cx?NWs&wdfY>V
zrbi{+-vFTl6gAoiIQ&n2aS;Ik2YCGa{Hq`?U_X8Obl{X(K9)cX#>6h8^bL{fRUd<p
z^$PU--o7PSt$zQW1qy0!mvju2fua6`p<AD-W@aJ!BK8&VvX_MUjCpVVO0|sZ8ykoO
za=zXuJUugWh{*`kV)&~Lum)BDwq@@Fpn%tHUF|i9jc=k6>6sA>g$10Qy^oKdf27t@
z^<TcSwzkd%d>#AHA9r{6@U*lvxH_Tw<8A<>*O753c%;)_eKF(X(jijM{fkkDfE7cc
zqCjk6W=75w^CS}iXfq0d5B+mwLeXTHUgwy9P3934Bo(7!Vh;v9Y#!0(@9*g#k|u!$
zCIq4r@KUgR%OIqfM9TFyb4G=RhJvrGLHkr4b9JPNkmI{bZfRFwZ+6ILa#EG;EcaBK
ze<o;j1{HPeEdkQLNWZxT99oAh{(`Y;X=}6LIa1z<Vb^D3_DTP^3j><MXj-(_y+A$&
z%<-4b`){-SeR$~ndroD_%P;b*uacpfCVsd|?>tNMRSOJ;Sjj_Yrei9}(>ew3X2$rP
zD>OWJjw6Y+ofgxM#i%6er=*@mFfCaG)jQA^HC$>nK1S!$B6^nhf;N?c@|W-6tULG3
zbxu<kpdt|+;Spb!j;9J!J-$}sbqxc2@0s|qiM}pB^g1TeJ-xxlv6Ii&PTY9t!cG;m
z`Nll)snoLFnZ5GyV$7d~ua9=YvPL5ox2<o(RoF<U7OO;yPg|s-G#?k*H*~>p{oup6
z{DY}Upz3px_3TmIf#s5xR)tkqkCa>Aa=EFL(i}{y24Od!1meJ7+w{IE3ojk4ewpE#
zGT;B$D)@Omkmz-C#TlHCNZlGyIju`P4SOk9`eE;Bzm4uQjT<|Laa2SFtYw5)mxX0#
z6Cx7_NmvY<$6i@}`S(h7rVFPlHby3&$VAJ^PsIW5aW^HP2ABJ5$jG_N1X5HvWQp!M
zudr^*FOPoE5hii{btA@(Yg1I-GDCj5nIm%1V?%Y89YXaDCPEaM;kp`t9<s9NKsPR@
zv{Wy{nNVHw*N0xXq#!NXGvyw<@byIIN-@F_-bnz2)QgT1XvNS10|P<qAagc@+1y8v
z#(&eW|B03T$Dvkq`Jy+OMSS8N$X)XCPK<UWoJM`a=^q=SuwlEWlthsua^<wcf#k7o
zcF0yE@zR_Jo>{|Q0G_4uNpMG(mNs}i_MX@{93!o#SkSAa(a6`z>@Ki^uE@D;yX{l4
zYL~8J*~Y@%tDkk((iFOGhA3N`q>Fl$_x7g$u-)Kkz5q(PA`*V~LVV`5o7=!-_FL0@
zd{?Gpo7_EBkAppQ`mwB*qZrL^aS9J>1Nqu*=9k(|B+Zl;BL8FTnTDds{`}E9(A`sI
z=|wJ}5`X_o04KYJ^cmIDkl^oDV~(o{h7H%b;(NxQv5zSl(7<`wRkXw<!LyFDySr&h
zvoquJMqd|PizZ#zX8ssNG@X&JZ?;nP*7xPQgg!?6vpONGG$a3Ut4tqvSKEp>#Uvei
z+Rk%<8yCs=jA-rIj=c5AsOyJz)4q5HegP52-$!^n-^GG4gNxSDo$RG_rgzU{JnukX
zDn|)D4(N0R%ga4z7Cg2VOjBn9LxC6NJ}%6561oy%yV!f=ySHjH>uY$sC@CerN%zjv
z0A*!nMXi0;%Z<JPErB@k?WAPj0awQCpiHx_>2S@Z$+jfPov2kO7S_W1Tfa`5zo%`Y
z>TM0!^hxOin7(O^^}R|c9dJd8hsl_T&_sXZK-hC><cZb%r4&yUWt^_chX<Ee6^q7s
zKY;W@ol?MVKwCdLzURPTg)q>X@%Op=CzM+W3`u8H2(e&_PljN}#c551qS!zhaF#cz
zVP<arV0L(N^wUqlJ|5%ewj8MoxNQnINX6}VH<;OxdX{UQ(j_rml2WDm!W|yjl7Vp*
zlBK+Lm3M#UlQBu!F#25xgikKrmatGgn#MPvwg0B)jbiGryR1GYd%X1n1H_qd>m%eU
z?`b1(cxpn)Zx`j%W^~BuVh(p|yex!0DRw-*EB$5R`}~-pq5Yk$sF6^;pF^F+MfxKc
zF@fvxU3z`Lt+_jHI{e#*y1!S|7RNSWOELcT4D6Qli~mx4iUee9r0Y|GK-kpKnID7A
zJ6VZ+^_#YTqqd@fPhLf`@rnfOwhyI=#4)#T<Wl*^u`yG~J{1I$%B#%2%%K3B2?z=1
z%G>#CQ{Fr@*dIJYL)%!DV{!JMZJ{Z)RMXH(d3J_>JtcJBkhD<U2#a1d=Mfa@#wTv?
z{@$99R11T03JSu1$JsBB7TyQ%PgqTHa=aU%{m>i1BlO1Prmh0s<VK%T*^3k;za#0N
zh4aXQ?AM1?BdZ+r7b5;RJCit%g;R1}9_5>CphI5u_V8pCo38GDDAY$tMz;m2-CtaN
za*&4f>(}AgucW-fba$YqSGg@Zo8O(So;Q{#waT&CMfj`mb6nlbKmL-wL;C&}ayswE
zDbo{x<oWJ@W2es7Oph37zjj~7%L10$SP}g^rHF-3PVHvDSLPC+bsXv^C9Hy2p@PN~
zYATTzfWgGtbBJ>~&4#@%cpwlTT=f30mzge_Di)tY(9|TKre45WHVjgG@u9@}+5N)p
z0H$|M6IyhhRgFMS{_&CmGTIOqRQ2_|^^Qh!FR>Y`$W$TymOVjw-B;FE=Z!x6v6{2p
zN*mo^MvT-}%4YnmF}_THFreU_AbXp$a`ado4kVI3X{oaN-lcrb*=zKTV4u_RDTVmQ
zCWt5sW*_U=sPpOuxzq9PZSPf*g44B!IB3j(xG!CRB@(5#-IZak00Pw86Y4SbIL*W%
z72<dCUoL+E{i+eecW(hhu&5gTk{=QV&=6+Vve2GDZ!~5YM~1AfrIx+i{nHMgbJ_2B
z-eulYzHZ@^$FYh}%$)?ARYf_g4Zk)SZDsq@{a5J}zl#k?uGPr%8?+Zt!}_8g!<)|u
zINwbb(*(8-Ne|*=xu0OA-e^JrS&OPW?&I}^*0+v}fgxOS0TGL-9vIWScpCl&S9P2B
z0v7zJpjX$oeI&MzZ+7}-19P8~Wb4WF{!($|qF&Qaz!uVKI533NDK%RyNFiyhx(n9g
zIm!ZRPr3&QtAp>SW{MW)GJVB=|7Hf*y!fMwWu$<$FsDH<I({}{8-Yb$mb#H3Ji1gC
zSMrKlTG5Gaqdyn%{zH|qsS_FXTBhBd{QG*m%2zbg`FJ%N$@4~e#2#8!Kh5d?_PH^C
z_P*uo&v`cn(SntBNRZe5{-Tr#{NrJQ67@Sjhw~9LWtSCSS4_UsT82CtkP8P=fqNfc
z4Ui^U?)89(d2oDgd*yNH*uNFq7a!#GaH2Fq{^`V7z$Y1T-vg?sp*IKDA<|=|_IEt{
zsBC8K)C$?f=WUJiZt29m&S;9Qu{f?*A7;#a3ufZCM0=9x5gKn8Y`Qg#fEV|RDHT;T
zmyVmMy)xg#&j^<09KE{z8T0Z<Oga7e{r<KF(6buu|3Z~0Ul$C*hS$ZFAk;Z5jSpOi
z@!*9^)}O<z+w`?3C+?sO9gJ9%2ixLEhwc-A5C@0P*ujokUN%7n9?GHXj{_#6-{ePs
z84$y<zvi*`NpsG3p9D-E&?AS}U*BuR^}$Liu}e!xtK1j8KPoB7Js*<*F+F!Whd7B4
zG;!HOC%BG#-@ouZ81H-rnw!y7<LpMgVe#vu)3{KT?TMP7ggtsm>v?WQE}gE|SZ{Ua
z;z!R3v%WxoUW<#TWA+EgD0iI7bVy5o|53jo&1Bp0*jtYcyIaZQJ@|62IU9qM6LZ@(
z&G>6HqmyPLj8s8tVGXt}Sa$xUReJ4A^#ThdJ=0%}vsJ#|d2qHSacXagW8q&<U!QTj
zD3DOOxcz+&qIGWip3VBEjj7_^hpE%A7=9D>gf@bi@xE(oCVMl>XTKxoi+=GCa;A^<
zHX1f|1vyja6r4ET9$n6rQLAchsP0~R2N>+{tb0%;d?{)6=lOG)S@gq+=v~Wr_pvkW
zi2b?^z_Dw-T<R|v2*Yk21%`wE1s8pdONN=eNvC4I7;}5B#S7ksynq#axX<wVs@3dl
zE53F=-4jaS<|Y!U`FZz$0!!fa0hkt+xg~bd>`!!@^cqs`L=ES)04D7+skA-X(<nv6
z7KJN;CIsf6Yd$2;+s9$yqa*?c7noeQWmRX9yC#wHFdHX)P-EO*-BzOwq)FufuWr7-
z^FJse??u6|y9#%|oe~Pd%tyA~*2yk9#w+50fs~4HsfB^2PiC8E{r2~_v{1m|ed_O5
z+*ZTrOqo~6RZ3z99ryRVAPlj-O-V_aVjQLhuS`S(RRYO{{Ck*IgEN@Pzu!dopIZ$7
zPrpra!6xT|r3={~(%}C$g2sXW5I$No!OV#el&6MruA0%tj{-nVJ7m>VcHB^L>NNoJ
z@$RcvuY!P31JGl%sl28UHG?0$kE+bR5Zxn*PM{Q0Ps?ZafB>K2Co3z9Ai$bhT7KWh
z#>dz3Hf(e-0D3(-Txy~2zleRnuovmpvjZhw1SqZj-lj$kFd^(jS`BFNPdz=T8pR|)
zP5Hddr@qE+s>*o(<m6fL-pWcSD7kFs&>)~lLufL=RqmT(p8%~g-b+M50S8JG(t9_J
zmR&xlyK$YJok;bdgzW;wL=gt9hzklb8crt=_Z*xZm~PKD;sb#lf}n+r05Jw6ti4$h
zKqlYnxhJozjH6xlJlB~TPz9fXCW^;%SD%HA?I+-9&yI$q#(M!b9dGgd-70mXY;Gr@
zrFor}q>r~IRSUiW?GmU3!m02<lT8f*I#48tk(oK4p%4`1KK~Sq4%b<08lNAovYP`Y
zNEYbM-tL*2nxgvp`Ys=DjE1zewGoh$7ivg#2#Je}hXn;eaVtv7%6^Wt&_GIJV&bce
zj53XzUtfr2xKeE0+J1mO1I%isu6W8=ZTj`6zm!2FfLW|CXf2_!{qY{NLcclB&(YdC
z3UEURa_@Po2PX#y2iBN85RAPOcC1hrfBg6{=;U}i(#jBk?ruET=YVfFo~g5DUj-Bj
zU?6_1`@pmwA{;RKIUw8^Un{<?1igusk$eSq_s?Bj#^CmFI9#?d7n7M8C>GB77D0{g
z14NPtl~k4cmUdDNklB6i?=R|{WMle{s94!$|Di<%tyK0(ATBk}1e?_e$k5=?(Vru5
zsR<}4U*rgZmVq<ispEcDH#GF_%r*+fONohz4Sl$oZFB^kBPyy!VB)^NO#D5S7a0&t
zkDfoL0951t{<7Tmd@FfYRu&Wl<VXLF4sHLx)}bY&r&9xg+jz3KkB<o;XyJhI1<WK9
zGxJ}z-di**cxh#IZ*G1*#>5N0Zh%#{5}SSz1s@xjALGUdar&=iWg!e0Awc`YV?IEV
z<a$>%ivw`6hO1MTGYE0$f2A%XrJ><yYHcm$6#FkVW=!`$L+YPuHYb^g{O*+x0T=yz
zEFt^7{CtPGYWH#q3nOD=all)iWTx*FK>-dL2cR9bHl4#Q^nbKyHja4d|Dr|X)?B;<
zE*{#^aVus?9u=J$@+27sD@d)V;Ob4F$Cr}okj<2`pAk?_<;hiMHHDb~(i}wQ=EsR_
z#(<~}7d-_XfJZ<CRowLtY1+T1Mf;oJN9>LN)bwP}khskKTMH0IA9zIwz~s5l!B12~
zXKK&)c%9J$4$}%j)cWiQwImRDJ+)5*OgT{BUcF`p<P(DaP-pbJIbQ>BX=>{wCnbe1
zwD|`9g2Rhg5Z!Gp4A8S$pKld*b8|a<D<UfT`Nt29up)TTdlSUBipc1AVPGo_RJ*JW
z7z42v6VS`Ck|M&T?BV`C5QJ%pB)@(g47@Iy1o*lZ!dI{!GrczI47$T!YnJW*hZ3mA
zxJ|TRT11E^ynujUE;3nrP^b9yYeK;GKZ*xy_zy7|g1rJnGxAN}LT2Ci+uJ}WaQ=^f
z^<C4bH*8PXnP#WH@O^&8DlZ>e9BW>K`|f~xx|gDz|FaQ~2V2kN8w2GS*4S5NkEWIC
z7WDiB0?%6VtySIGE7w+>>GAys*N#N?j(F$2Mb_qA4}QCtcLZFsRKVfv%xK_QP6Zt1
z9`>8@frghbcuO7xWR}yl`Y5>43nL>2KxE%_r!@Z!0v>^^^s{HAKw$c|C4<itI6u(b
zDjA@uCv{89!^{UAzq1#aON5&zifW{2u*HrA1-I$usejjzb_p9>eH*og`DK5)Iw?4|
zD3%APoSG>%=E&qOr@;-9)XcPK;<F9GIIw4Adw=bOHx$T!Wzud6u%vJ}OD`A#uqwP@
zzTgwZ`xoQ+I5zk%hRp=W415VAGG#z)qJRBqkt{s$0*g=6GfclFeeF-z-AXx&&G=)S
zN3VZ-U9K%vt=F(O!+vJ58Be8bsdf3V+tjDVFB4BP?pkY91O(^}<rvRS58M9?R*m3L
z7@NNvK4_4^8*}T50`3UYPw=i>Va)sS2~6#ohM*}e%1&y?@9)Y5T&$7Ch81!yN}>*#
z*K~o|sR`iOozm(g6|$x94SHkuPJd25Vs<+E=2`Tt3kvOcuDSHFhtl<OLG$WrHcCT`
zjmanQ%Eg(f<c+}C_;8ykfAQCT#$|J?!H5L_G!64xs=1&}Q+*vj(OvS7KACvP{+v+f
z?X@2U-HN14cEtn~WazK3G<a<Z491qYD&nc$hrzht6U&*pxj;MGF{_yz`2^O}2{ag5
zjNuA%3R^F+b7#AechEWHkFN`RsBU*zpMaXz?8EL<;4ds6oLkHp3&Y&Um(36T4n?7*
z)l#i~<$34rZQNC_+b+UaX)UJTllgh-jz8CuSKfgVvOk775aZh|5WiUqz}~DZDM3n8
zjsWk+n%@F_UQtnhP6@l_gv-W^-0{|e>~!I~*Ie6rg5QK=NiDz4NDVUa^JA|>h>>}7
zMip%XGpmOuCMDsn9oP=%y^s)ZYr)w{X*L1lv1X|nsE|TSN2Uy9KKR{<555}B=G|fY
zzM#GS{8XKGWbOwEb}~H#eKYt-zhn1(Nwhn6>KgZ?p4TpjHu=hh<UrLBSeZ!M{$cPk
z@=k7PJ|;9!tE=vry|kiACfyi?E-J#^b)uJWR9;<VO4rlTJ=b%&+~`Ge_{9UpLI}2D
ziIXhXyqujrlSRNdb&Ke`sv4e8sku7~z6;=fBNHD8agOVGY@GDwe9u01;$tG@qg^ws
z`PJ5w-rH03@dm-<%Z+AQQJ1$(M)!VZvwrHfK---03tfx)^88}QX!XzJeM%@OPHbpp
zXpxQS;!0MF|A$NmZ|Q5sp>M9)k7)U=CxrZXYnUY+bQ|}3nDShDz&0d(3g!dlEGvvB
z*{e`Zd>gSG`t$@C=z*ax-b;43g<jm7G&#K|v=A1q8DwN`9CF{#tqcC8!?;0#epUQ@
z{FUJ?jyGG2e*;qdAC*^Lrl>@YWzvNWWb1rh%{B3jmPZ!;<J4pp^~M@s2_AG%M_lr9
z6Sy2WWL<LD;XvCsO+o!d5B<b?iicNN^A7t!YApKf?W?T-51iqvt#LixnErw_89$_R
zqrX^3r7`*ob+EKV_c$=r;@URwluj}-z5&f)K8m|4BIJTz%okbMp>MfT+L2<@78&xh
z#Q)6Qk^Q;4R(QD57kjMS9s}YL7}k!zEOHP8u}j?h2CJ?0`P$4{O!qIOKBzMbnViu7
z_P!fcVA4vHoex*H;#$L0i;e#4$q2X-JqRw(9)56-g`iW@to*cQOlZl%%`aXO?LxPz
z;hXnHd6jfBJ?Hm1%dZZLmuqq;3aSb}JNj;WH`+#rzj#yXM>fbc;w5`esHxpH*3{lU
ze&-naA$lOaYHB}!lc(G?tm^CO^6(4}L;$7`MqqWO9w&ZUTv_;Hi2|Ccv7r&FpeUtD
zJQl@0v1@ad?4&MFpX9#D0}|h#K&@QjG&B9~)07&zRGDZPh#VNrZsfB!I1g&Ct*uM)
zW!g5UT7*d|UluZR{FL-SeF;H;^x<)ypidR9r?=A+=!}h$I4C%!KYzK&Q55Lg+FSI(
zfW9{1jF{W7;OF?3+c!O`AYH-Zk%e8AS8u+Ur5-*KzFHi*?fG)l=mbKL*SGmQ)LRKg
zlX)`0tOFFBD(>qWHtdEiqEyg=e#`jSQpfkG_lR&z8V~G+B&5<i-mh@h@4)uq+ibW<
zmj4|H>yb8N{*&KQQcVn31O8(UBDA&S*HO(c9e3+5JiY`Jl@@<CodfDuN467Lp9myL
zDY|}Fx@>ynqa8=PqR_5Dub;bJmOQShp%M0$%NB0pc=jh@uY==V;;nZjmLyAvBUJSx
zh5X57o@mnENoSLL#Cn?`pKOLh_>6{+aiQ%=z7Y^CP*G8Vmk-o*bhy8^z>Bap*2aiU
z(S$w^2Q+A;$g+}9lA;$@Z#nG+l#La<jmgPjI6FII01}B!jrFdarGEgJe>=(iZ}U^?
zyD?M(^>IrptJtBrNss{B3X?g@3b=xc222=$<ny$zA@j_1_G$6gdz!tyy-fkvqMH-t
z58Us=v@j3eup$b~|Ced;e>>y<Z<6ufqiP|6A}k!#0f$L%-XOWUx~>j^1C10#SP~qu
zG=$IOfvg4@0{<HW_E{1v&{fvd)NIa#7v1xU0973d5D%cHDJQQ9F`@v)%0M#{Q^_|3
zOi+>r%5P9ghL@DsRM>+`(h3xj=j4xINo2s^)iL8}#mGRjTV%$~-Tk14+)z=Aknou{
z0z0sdRhueU+1UKH0`J#R@R`A3q=f3`h={5s%g)YD0balv8wW8J^m*k#tDB`P`fup8
zw7H2TST9Wfd~$SjWmSoZ9g!OHPK|7BW57Efke6$-3&4UzIxtugA(+I7FO`@FhZ!HG
z&!25f(Ah5j%9y7F$B$qIV#2kxNKh>)8APyvCO<=15O`0KjQb^ryT}_gP0g-fUlLvY
zH{ZgeBLL=6>OqJWigzV)E0Qmp^`B+32T5iNDA>;zD#m(qfnPkYUByAXnFpG`#ZMSZ
z-h$;R8uOFNmvXBUe9sliQpLYtGsa5r%;w`idX)b?g8JKN{}%Z2!H-mZ8ToCDc7qZN
zjGL!~0B9vRLyn$CC%uUpDKaoEJFwnb=K42c@|#4!WMSZff$?BdosnK^LY#L#GDCC3
zc-MZ;XTRJbY3jm9sr%n2Xs#uG?;;Mu<L#x4cn8B5KM7<@tn+VL0x>-%fCfgxW7ze&
z%8^HBg7CN}-*_8y3&<O`F+VXh8s?6kJxHDU*4YA(#ZMoc?TahOzP8e6ejGhFW$%7p
z*#8awpwd->1}VUI+fpv55)rp3;PT=3*ZSu3sI-$?zuW-ysrFXIm=Wa+X_(frn!ff$
ziF~v+rQp@=@8<FnE%d|7B8wBj2<82*(KUdE;%F?o9JeUV7u(ReWdQV~z3fV|r}oH@
zD<>PpE>DCH;DKF{lujOX-^oKSlw00S+OJ!qTY)1yJ%$-A;07Df0T>CTt=j8Id6kw{
zPD4!LM#_~vLoWKqFG$#Ce7NuMT+Yd=^e%{r=$tBo;y8w3{}*d-0*!Uswu|3X=0q}7
zR8&GTr80#KNeCfj9tsVTsmNI7DXC<rjF}}0WuE5>5k)9us?77ak6+*Z_TJzBzt&!B
zuf5;(uJ?KCal3!Rb)DCF9_Mi!=ZHOR{Hvq~r*4)Fr79su3c9e@H$`8!T9Ln|{*?94
zrN8Gs%+J*gg~#q6x-U2u#b!QszlY>WXeUCAy;weu{T%&r<zm?f=Ii;-Pn~N2qD@AU
zmZ30<Uyzk5cte+eWS7b3Kh{23%4X;JNG1(}O4+wZt*Q+sYwFb0giQW;JdEbn9j~(P
zvbY%er7|%nh|#%`GAEQtcwhxwNTU}rwGH;~p16g+D7p9a!rU#X#pE}Cs|)nmzGhsx
z=eS+-8xa8QX1IiRqHD&sdsI$If79K<=tZ;3O2wrm+w-oCm@mpo9w<3ig+zcv(zU7P
z8nPw#-I{&a;ZG4)R^2`^{#{K&TknP4qeuGnL$Z4(YnD{`m)$wy%k+P~Y>&;gp^<m9
z4qnSV`T6J$wu#SV7g)GcHPyCNQFd{P@X?bP>_+#%yFqv+qqpTtt9Q5$buFE>?o0E%
z(k*+et#?((8q+3HysIhkYYvNv=lN_~KyNFnl5v;#74{|1A4Wb2oM9d387{r+x~D_X
z-lsH%WvpGK+%x7#xaHikLtbrKS;7-HuTS60X9ZpQs|)UsUz${#{d>*O<ORUP_Ll;l
z{?hEouYTgf6HgvDnNN^uZKz=Hkvv`%Cw-jc8U1ChwJ7M=Z3+X~33chy<*gYbe@yNb
z=7o^r%5x?P-6lR>QE2PvEy(Y2StLIa{Y7j2`%BX!zhdVcj$tY8?r=>}qrEz6^XYU+
z$>2AnDigsQDHAbX5ke04W2c9EuJ;I6r_DVR-@V$VPGpG>agPpaq`0dC5{)t^(v3Hf
zCKr_-z4=>qXx(>Wtm?hvp*>Mi-_A5^#97RpFwN4ZR5@@Uc^{smMAt4TW{8Dq-njb0
ziD8ADH_fj2jOwX{2OnuNwN$iDcIs`{9Q}!dmQT0$u?y#V<9Ys=0lJfhM?NgN3nE?9
zHj3GO^5v1$ZA!9XQ9k8~x<Y0e&$vR}R1~>4k%|lRwg*y{4LNNc`NpMWtfO-&YnP7B
zwEOiB4=u?_-is+mj{c5q$~Y-`>1Wr}QloD3xeF724sE>au6%G<awXQyf8+0}^~J)O
zA3G^RR+tSrp7o#l%2oV+egBYKkNP)bbzLToF42m#vYVVEss{?OW>EGz*kzXo*uT5g
z|6R@DM)&6ByLvty$_iKf%A6InZ(=d|J3ptw(xMwP_lk9umLE*p;_vdv+p8{%j6^Ye
zgPL>m?eQ|t!(lmWt7S)36?d*YE%^5Atx?#!fw<)4M*{~R|DrchyrMV!F{*GyxH;VV
zMB+fW$MKfV`*~Lke>KS(XJ~f}e)6(xT;FD9Od?^|ZgR4hFGHj{S~m7dDu|iIR<KU`
zuE+F{^c!<an}iH=Et0GyrTufUJ4|(6HkD~EGiI;1fc=2eiSGpE14H?YJ$(a{4ZqK*
zJ>HMrQyZt|8Rd_%ZMAu1B)#Y{w$HDRC3}=nmK3_unajW63jNaBA&Vk?tmC+x-*Gje
zkCrFQ_8j8E2bq6As7M}`;}Lm#*1$tj|0vt;u^)aqev?w1J2@l9&AMYvuat6^O{~-6
zhQgw`>mC_D=ua%HwQ5V}^gL0aN_Efv=N&9FPhvSOOo~4;O5&AaZ%xTKMnrj}q%E(i
zo~b-G>^f01T9&}T&Jt2;xU=5>Wi7M?so&{ruZ0|HHZrZPJo$d*hq$)(<?I{hDfKUe
zc&%-aQ;>r9{PFC|kM(LwnXlO;X?j`7b))T+!TV*>N{0t^Xn~~3mn+iVBt18SZ5vA!
zic4vAk6Lh><;e|^QZACxZ=MApLJ8Hq6+G>76LKV-gq6%dI|Jk35&!10bq-xF^Ojs&
zjz9V`n$A~q<eza*I{Xf-80bU}!i@UWY@$%G)p=4x)b@GMO1w;5K@zXFj!s+xmzHla
z%SY9)M|^%^@%e8;{9o>8>hCGyq)7&D7avbnU_kHa*!x3SVFR?MGXX|hIIKe!Vh;Zp
zVFuDDX(lMJ9%sX?-mD?p{pT=y*H}PrtSd5vE!Wy_O4IL=pg(*#qf%0r91t_ucc-9s
zZBJ_PJ5@oH`lgrbkJ_$`YpF(+(YAeeacwb$n-V{9{__P-=(2me_3dr>lEYgX)vhvT
z2Vcys%|!8?)8azZ*G~$AY2=Y__lFt(<OoRpJn;W6MK%V}Hc1Ye`9d`*A~i`!NFe9n
z;7DuQm!3<cE!x#}GWQGwA_{}I6Umv7390LyO(=x!%7*8B?B>RFAgyL{Sr}KG8~Z}Y
zJn43dY<B$Jp);?kqvHcMthdf~ots3`!H2Xj9=Zj`od=I!{d@p|Uh{8nu4w4!gcm-i
zNdiNZU^T;qAY^8^*&G~1tG?2cK+5TXEWUsLUKXO%F_8eiW4++_>@5Zjy&r<!ucdC1
zRTs&$wYA}8K)JZI#3?Pk$H>TtijGbJ9MP$7ma&{dLJSZ<5T8AW-M1WPSYWpWpyJoJ
zmfNm%Wb!(Shr<Q%I9eiskQ{t3c4mUiIP#>+@v+X=p;z0If1=TW+*mses97uJVQ?8g
zefo5<(1G{Q-@i!$DW64-9jiIf=jwI6GwUZVqQ0?_Z~|z_x7LSFf&zl}Cxr?LG@;0|
zq|Xp4HgUTHL;?*jfwZPH5x7|R#JVq2gGyWpi8`T-cAafiYE+57bm<cDwVc3US}CuB
zv<stygXoZOI`Zl~^7W-yUYH04H<pu+j|TMD$fK6@gpEYhQOo}Eo+9Ft@&7K^a$|k%
zD@eDuCwjN4sj1;Rr&U!|p`7-C^??}>XF`8_<Hn7a5|=xxQ+0cxAb4D;z}4{YYY*a=
zgFR0WV<E*j<S4$ET}er4b-vriX?BDWjespOGBT0T(Pj{Bqh;gU{)<tW$d9Gjz&|DE
zyF;H|1OdTRG5kcSrmjw~^J{R0Ak&gV*5okOPK{?xv__hvTPgjB4^qid1@AsVPxQW?
z@M^sj@asiqhYat&y0*5myL&e}MZRfiyl4R|Ez&KU{JTZdss0*5FabM>Lyo*pw&6DE
zI3#vp6T*r^DmWyh6*N(Ykrpz1cu3wd?JRK01ilI2<rhm`#UUKgO)Kjil{dS3l^S0}
zFs0!DA^udrFc7caoOtq+Kknhy!X>bN(m(H!cJ&Y2uVmJitY-E3WkCBc4dKzTu}X+)
zaH(QWllx+1JRYzd(KD%k$Vpg`5TD#deDclbwl-m>NfXuQVvJyfo{x~9NW)G+GejQE
zFG9{OY+hSlTT6kZguX{QK3Kx~?}OaxF~Jg!V?VlW%EAkG@F`MIP)trwSAu>y*>k7Q
zbYZ;5sy&s_;?whh$Vj%drv3k_p!7!sJ^HzrEjfCT_XBDA#?rZ%nVAVDI`L@i2B{!{
zX)SiPcb)%cDRyW4IlhmXwlB#)wUL^dx&kf39GgCA?bk+zV|J<RxnPjGySt-JMA$tL
z^inY~F%wWz>py&WQYe)mM_`5F;CM3;&;GD(mUl=<2%e32hE4`c>Ds*h_cD*Yd-m*E
z#2PcbdGi58=`*Hpwd4PNEG#N20G!~TZ=0pP5Fx;VrUG>~H8mCZY4})apk&|YBo**h
zo7t@^Dk|8doP@9(DN(<{^urXFQ&2k(<vU`A%j>&`ql-H>kt!=IQ5q62u&Skn0jrGI
z1Ktec%gp)Qz$S=Yhz?rLl_nN;^eDIP5-o?-0$QyaV|7|a{R0D>j~f`!26E)p?otp&
z|AtH!4j%n<=yb3myi~$AV`<Nqm&#1Gvm=^e;o&-CD}0~2Qw#)H(YoV82eFf#;Ko{h
zdd>)`373e-d54K!L)V3#JL1beetxt}Opp0ydY|>(rQ-B{@!|#QWG_6~?cn0}<B}8L
zzhMT`4Dsdg%W4n+@ShIdb0j!8*gGX91wFBk?<UX!^hr!KZ{3#u94ZQb04P)F406pa
zOinUnTzJJdke<4u9tU;m*{}K5&(LOM4BabpAwMlWJrI%<k#EMf<lms1C%V*jd0_vZ
z)OFjoS9%9%!i`@#dwY%8rJS-CeJ;o@y;5=qLz{^0_IVKwYPhKVQYTLmah>ht-CXQC
zi!5p8V-J~i(Y0l(=c5!CytG|2=?=63s?nm<guMs2!l<|LU+}e`L>%653&0BS@Q#Yw
zDJm*zVqxKn@W<O+a7AP%TEP^otgLLicPE1U?mXY~-gZA$y*IESgKoH~2%#x$@E6#{
zN1cfL{M#`n;&ILFAe3*(l0OxpiREB={W>k7m$YgjUGK<j$Z@OmriPt^>x1J6w`l3H
zI@6OT7Z&_pyx<_nE}55(;#YF&#;$fG?sImtKCjtvKoHuIiv@NEaSRd{cl&QwJX|oS
zwrvxfH`szBtp;+2N!&rA?rS3m=|lHG>a!F35iE6<=PzC`?%tij&a`V+AcB#+t}bh=
z>ohff2k;VK@Z>kuyEROsp$&VXt#ovBXcSW7KZFp1M3`U@vJXTR`B<o1ayN>vCEK0P
zT&yLMhl&FS4)}AcMf)GS-Z9wqv`_y#E<*u7OPGl$+S$D!_AenRLW8#1o*pFY9P94m
zVGkefOGr$td8z#Pi9NXZw2&+b!%id&-Y&!I2>J?8J%&B7>@9XSLl3c_OI}{yCnQAe
zp81SqFMu4Pt(;>&d@k(C6Joc(ZOR8>!~c!?>C?W1;Rassb~!5ICw@Z41j25hl#;Bh
zXR2{oDe-eoYs-1WsQ?*Hla9J(r@TN!5CVfg<P8BJHaxXb3*_SERfgYCAht6tP8R45
zH25s*A<I_8X0E|jAPh1X`akYGjD-;v8Oa0Bo@#%_{lunWkn_*Y71e}U)W3VeHGYbf
z5rmb*X3{SYeW>rqJ;hw+Go98~3xGqiBB(OMDFxO6oo2w1&}WvHa-LS8;#9z&?4NTU
zw%S<wqWbGTl*Xykjg5`l5u(jtsNsCGSuhTIz91-fhO8tJ_+lbjN&a9}41SA&yA;LN
zT?Y{DwM||?5!a8`v1Oi7jtY$AR@fFvtw_7ft71j7ib<CZI664&kl9$Ze~^#HrawBN
z!&VSAG2?CYgM&cyK4Ec_dJ)E<o#z%;R#-14GAQbA0|5b{^vt<)pT4B<TtCl_qt&b?
zkU0Uoi^|5vv#?+(>2!r}3Eq(W(hT~9TRho+FQXApCTmb&r-%bUj#O_;?Fc+-iQ<j^
zyPMP`Gn^RW^DD;{Xv2;^WX}J$)T+>L)^=W6T>OFHf-~uG$9tmN4?Tu>7i39<Wsv0t
zan0ZGKX+Ew7W#bL`={|Vg+xX9v(;e}g+qC2IM!om>5nKL?yoBucS=gwSMq&5Ht0x5
ziSECBYyZF&Y=Sy)BJ6UbkT&4Sk96f7?#MC>Ds=qKavj}RDr5y|<pY}o^Y_S6A-4TM
z<cE@ukfz$tHQ1<~J&Sj#m8@EU_}Y@9z88k^toSumxM&qAOPmGa9`F}A?s?+(>ik41
z;t0tT$tkZO$MI|JXT*~slwJB{{U0d>A%0<DVIllpZvXij_M0h9vB$&cnAVah@`JOZ
z1o7logmE?wK{#`lEx0=OSk6BU2vCmsE3-Pe397#U9AZ^{eKLIob8~apBu^&haaBYn
zKxlHXf@l6be)43qo7<YfUpcB@hhN9`r6X)S$cFsk7(}GMq6MX-*g;Tv51+IwYsD9d
zLO!qR^l?6A=j2qN<9-im?od}uUv#nH)~#D1hovP9)4&Q6cAmbRYty#}akwVtchAQ0
zK6mqKBy@05u`8yaWAj9mXI~@jxa->6+v^`1TGw9_1Z|k#&Z8DYf)Nl9P_WGM@4Zh~
z0c8z8=ind;r!6ny`^27UXb%kyQPI*iwXz^nv$vly`xp?hQTU%+fVLzRRwC&`W(i57
z5<0&zYXDolAtW9wutwUw*dHVay%UwBWRdHF<M1aAQH0rxb0t?SE&V{i7^J$6S9|5k
zuaP@b{falba;X8Se?_ntFf7#06em(*G`V-^sh|2C7J(a)vKjM;J;qBDrAmQX0Ai&6
zCc(1mPGgS{LLr1S?qKx9Uk_vWMggd8nnF{h@yEvaf^F%_ok<($ouIY57az}wjp|LL
z+W0yDpr9(Kyn;$R9ud&A4j%#ok*>mjOl6f<2yQcwnsSMX?!ezuQB&WGh+r))E<P)2
z{JY~7ffM8C9CEI$@9mXtrgRp#^ky>zUj*j{;!TYo()Yc*><ulBq@zYMMX<tygtH9a
z9vS!GlP>ddh^vj#M0yNR8w;NnEF{z|ri1li*x~}y?2sW7%IpVwP6mQNqoAm0+Fu=@
zXta$4{=+7CJOzFIdJ!(GKd~>^j#|(mH84y^R2Ul@yXELu1MeIn?*TI)0beABWs);=
zwKZXjgu{p@iWyEQp^;=<%rV=7@Q>Bfl4U3fL6IpcF=YN#(04*;+v_?kdFuy>co7i$
z?T3~JpAmCg76rqH;8Br0Vc!B)&eZDCjNF3y_QM?<mc>w_9vB)M<C9*SZR0v=oEi7-
z{Xvzd{&?zC$BrHQH^%|0H?xmnx-0Oq^9JDxwhSLz-62|Xl@WT__ZwnC@#U_ruF_8X
z`UiVu1PUESxn^f)y$K;?TS_SI<)z&UVrn(2t;gmcf_EOZb2UlG7WZZ#xIziYq~*}3
zAawjP>x=t!k1W0NV~~S!*=ag<F%9?$QbBS`q`OlCp)x24!!jmTvXoEJEI+w|;|u|h
z2^*0}?4C<F@-@37pqgO^i+4d{S)CH=&PQAd+9bCS!{LdfbyEf&bTA^@fgemTE^{|S
z=ppx<KD~CwW{g$NACZ9;u43@x-cNjx$nkQ_{p?B+f2dJio7&hIzg!#EIT}vu-uTF$
zFBD-r2;Ojk(1E3?@Uj#b2%zQkZ20kL5SC$X<H@uQw+?y#H^z?>q~`mrg);QtWsUTf
z6u~9TZDI`<KIG)uNF0}F-1NB^rB5#MqLImt(#vmSrEH@LA<+b65=ZfxgsiLw1iKK+
zjIVVO&)gjGmgv*{YJ53W`kPEU_*iR8OSv~S)2)?xYa--;GNXj8ZVU3<_Ky)SUTj5E
z11uym@Ye_lDq@+>`r1l_-7js%2JiaenH*<`nOj;~JPib1i`dX9XiwGD)Kq->M31wd
zFpWY{Crv^H0)&LOBf<%}%7Dzq(l$aSip;<ix-gVg$~p5cqn{5tIXm<2UHCaT=#2+d
z1tQyfKiTl0`!MxPmDA$cL0Gj(<3RNlPH(|u{sCP$f_()d97NYXMMaX>bOwXsghK*~
z2d;w$w?Kot`1f5OTdgz$fl0)>&3(}YH_10NG_*a5fw`gE<o3*v8V>BLuC85(Le<cd
zCJBV_2@!QzHX+1>V;WKR{KGBS6U@>sz2ydx2v6q<*ou|kzq3Q3dRk8}x;;sA3qj0b
zKChs#8POvf0`~S)O?iMjXEVVyA~<mHMYBZ+#F`}}jQ=Vr(R5h?b*WT7bH)>%aD<9b
zUtb@6Dn90pjt-a^vf`||hx#}U;pHn%;?lm8%6nOe%hN!HEd<#ryzqX4F&R<Fo^XB`
zntR;38Tf;X>njt;(=`61tZRKCqCRsY5Q@pMFNgV!OAW@(`!{MMEwIH?e_v2QSc!p1
zD0lht%l0c_3jZz%nR6Y|+8mdKn^sm<XAJ2zqp;zsuvCy7_@IuiYHejSc3(Oe1H(hd
ztJ<H4PkpE6%tn=klbolU5HC*+)Dcux2n55kB@(7n;0Fe2>koXorM;cVXoc;ERDVSj
zX?>}~CH@kCp94G~?;&HyMx2Cgo|vSh`TFV-EGizOU{y{A3PI%SpugT)7&nBPmdGlA
z!aOPz<ufPV@i-xTO-)blhYB$pd`1`zw!kJ3y3sR+yEJ`FK%@eW@^hijqYfJ*5N;bk
zz*k+G-<a^&Xll7YAR(Fsjh{Z%VmA?mDqJ*+@6OR2I`>=_yve00j|7j=j#s+{jEV{L
z#q2|*FrnLC$J1taLmVTLanwS}34CdyfGac$P||2;QJPs?zD)3a5!$vPsXdS$oN9Jn
zQ?mjP65(8ca*+eMgfG@Go+e=fit<IC`>`obpj8LEg9HKK*EPf(XLm<coGt{Z7rq2%
zHJCMP@Ju%$(>Ex(y%lm!!gqr>D;F1?s5l=&wr^9m#)1X>xKNvq49kY^1lsj3^M4v<
zj99I$tqCJV;3?a+Pis53ztU$dTbtia$Y5;;PGi;t&%30gB;u^XsTh_m$4C9|7hp4M
zXf`b6C*oz|?g$a^%EH9(!iDY3t$49Bt95FpPg4N(@`2)lIz8dhzb?~T7{mT58$#hH
zdhD36#RoQUBok5jZr4@PcK%-INW1&^jry7CG6r&-!U%SfMy0O2ryRAn6E9T&SPEg^
zaoN&RUP+0P$XDP@B3QOc4$l%GAnDrpVoLZ7pels1@2{>Ha1ZeakY`ic6&T#7NqbMM
zP6KxMlORQC!EhG%P~uE8wX{6scu67rGqE>jN3{qxD=4zn02`6e@5eflGdA9ff)Dft
zRE2fmWG|kHIxEW^IQ8!3|AHaUy~zynCpmc><-oIjR2Y0d>|vxgSfTBinp>}3yOt#J
z&exaw_Mh)wh<i`Rif4b)(9ry|!u0Z*`D?#8X$lKO##Gr$N>pS8a%9fF?4UKnq)Hb4
z!DG?wut2`BZ*14t;@ZLytM2^2-Q0?!rH8j`rWLxc@o~TZn&_gWlBSZ@^4)U08g&a>
zeX2nZ66FhOyUi+YNIwh@v<zI>4y0?cN0x#@B!T8r=Bce;^R4zd?qrTGjmd96*g~0p
z+R^-L*F|MR3LO!kjRjp!|G};Qzob5-R*Hkg25uYLR%Z-p7}uJ9#+lU5W`@PY0NFe%
za`O5j<(_7H{nf|A4@WQUUwo}{C4b}dMJ8gQJsf@~nSFOa8Q64!l+!t5?=SA%F9j0i
zGAwTR$CW!;t>^f(C++YDj!5IMG{KgpvM<5apwv!&Y&#zv2n&`)zP=KL9-rxbDenF<
z(44|<)FDGJMiH%TA*-=1C+*e6W@l=CKJFwVSwCkntvsP`Kf4fFv<ZJ;mdIc8tPx{%
zr)+bbk84hi1<|hGxYBub7n|su9Gb~LrQEloa~W>GTko!EQw#&0-3qfrNZI{>k93(U
z1N`WXmS;6@YdO9`(_!ewaCa%jP8BWd-0?gH;O;H%<z@<f9(u{Y6}4mN*(E}bzwoPy
zJEuSLCEu^=(EeLuJOBuiXKtxZUVNBXR+qaMf0&f3%bz&DeOOMwyel(l<miYBsXVbx
z{ijqVErnxO!iA~_xAy$>`KqLD_rb=h-}6ZKCgJ)TT8U%Urk~%_c36M+^3OP7+BtR9
zsx#XsZ!LvtYZ(oRs%-Iuo+Q1`%_EYz_}#5{_OjglP}5V_z2-0`PC@)yy^?thEV?e`
z_B8JMx`g<a@fhjUp47*7tA!yhPr8i{9EczG6pS;hVi`KJ%-1>Eqw<tSk^A!9j;|g+
zHs77~XnUtTBi&f4Xjt_qQ`r<dkgwqXy7i8+NY#!lpS7#1CKdgq-!XLQjj;{RXV~3z
zJf;IJ5?jnoLq^t|9s4Qse6W6myF2$j({+CkNn4s~X%?JDdwUZJ=O*#`^h7iKQgkCs
z*F<zPzu6_bvWBGw7oTyW9%eLJH2cF)-FGr%u_)!|&{*)jDyhlYOXR1EX6s7V>Oc%g
zVrOz1*<s*2f5hR>(tt<Yg^$-RmReEJuN6>`gj_#3SY5r=4?VVj>20bmJw3L;{-{K5
zN5^CQdinG*OiEnipRNY8cWjF}%3?ZyKm2R)O-8eu9P%gIx*{d)8=mzwGa6Z$THi}q
z_++-`QCbx}S44Aiy#LR@k$1{{m6gS0dlX}32Wv>x((d<n+CSxer@nZNEX$zC$DGn#
zezm9V;^5IOT9yJ86;(F9g6`{%hfANWFz@M=^6hvPZQB22VkVQ8<jS%Z=rbcVIoNv@
zo8I(u=f>=j8(UQhxqVO!rw<w(;Fb@I+G4)naK!4mEE=@N!GHWa-{~e?*y={N*UIl@
z=T))W^B<E!GESH=&WMp!QG8{VnD6`FF#;OhH@W0hANu>OQp0$+xy<#@S-LH?MGl_m
z`Crp+tD3xb+dnvP6A8p&zpw8VKCGsnaBvhg1!q!NzB|0RpD{d#m0A#HkCk7)!jMC+
zrR_@vYwWg)--|-+>6f-v`OPYR&gc}oJuOHo|5BF7z_dHm6ywbPT~x2aq;W*{AHPu{
zk#@g(rF&e<R(4@pSsi}PZkFTg>%-Ec?Gy+SY?9aZeQrA{<o?Ix;-%xKL&j>^q+f31
zvgti_W|6sC`tJRxwpxIEyDvNq5w;jC=i+eDT$t+k(jt?yF4K3)Se@1JT4%XuX)I53
zTn&Dj!-d|op)w6&N}O)%Y)hF9Yq9%wij>|LB+`DrIWPHVPg5^du_YQ({8;x=TI#(l
z<9cRqZk`R<CbyHpyL$I7jF*k-KRM=#QkZJfPR)asrWbaXzI`FwWxk1D!Zm2B4H}{K
zTU1jPE+5C1M|#k5-6TLFkv}j}w4@{mo7zzP7J;IWL{Jn!N+p=s%kxLcNDF&PHRi8>
z&VD-G46X;svv%wC(zaxuTnBLykKmo-tEtP90~@0%+EJH8uTu3*l-6QuoJs3vY7EV)
zdT`Qj-}-{eg}1)KcNa!HU$|`BL?Wk;Q5dGboqGLzMoZ4d?UhfPNS<lVx(M=|ZEsJz
zH9@WJvS4mMYi)MHc**jlAqPoz;Pl?Lw&WDA+*!I`Nrk?1zlX$GNb`$(b;i|`EkjPO
zD+T3+zFT)0q?4Fq_v#9fh+kHEuvnJlex})JM%woG{4;%a{v#izrEZg~Zp=4-*VEfY
zieop{Ft)Z<yV94CX{y=r@&KYuI%%Szgu&wqFH5tnZ%h`8g=-n>@sq4v!o18Rp}S}F
z7xzB!L{I;o(rc6IxZ{d@Rs_N~dPG;oI?nR!S&bez7H3I&MMme#_Y<Az>4R&xA9FTu
z_GIT2I(k^Lxl|!MY(e`35hQB*)O}*I=q)~6qIfnh|8Q}dnPigNM8dh|hbc|v@+m_7
zM^nJ1h-ln!uQRIglbf18`=FDQqHZ^<qw{fXB~n+vc7t5)Q(yB3cDK8?uZLbY_24r;
zS(GQ(Ax--6sf3NrZc46Gz<TP(X$GU}=T*f~O!jk406xuUck?ZMZ;y>w?F|il<Ewb-
z@goyr_kR9Aphx^^FRVB3yK-}W=!5RyU$NA*v_Yp|3)Cr<ksZS1r0=25SvQJyau_ER
z`13_$+*&mTZ9pUHMd47Tu42J8ZAR+vkL8_k+tu=}34yD`&-Pc>5xVtUrLelvrefPo
zB-z0bNx(E8r}(BOEPGCr%`EJdKA+!H>?o+T7YqHOe$-)OishOOQS-%`GHh?NA?*`Z
zS4+grnQ#A$U5HB_3LzC2@asSQU+<5ey~y{%$<jKU+~7DUL718%pYZTe^u6Q|P?vK>
zzX-oHzOK6AzU{8#5?igWgyNoz#8>ygm6lRJb2`Xkt|eZLNp<F1NMv2W85LcVnnLsJ
z(E^6RJ2%e?Jh+{2A#}XGVp|6NPiHw1P|j=eWvb3v+WH^3{bTZK?zIzaeqQ&(qN5+=
z=F&Zvb|K?UyJ~f<7rsSFNdcT*cg>dnB#nIOVXQq(L40eXPyOyYldFncdKdNM<cm5Y
zk6-6CGaCRPe~&riL{;({1J90wl3s0DYKPf&@BHDHbbSgxELWLj(w*g%lp`wMe)QE=
z&dr~E3{Jz;)ivUET?u9A!zZ)5qM|OPTI%hN6<??f7H?wQ<<2a)-Kf7z=~MaFT#o#S
zb(^#=noo}LXB^XXnb_%n=DhrKy@7_ex{*1zwv9_W(K9pe<bT#)@l<EPq%S@GP2Wfb
z{i5}X_<PrD#+f-xr*Bs;$Z%BqWNc%&eG9Om$R61Jm8UnkQjz5@zu&Vy<3$Uenu>PW
ze<vgle(RnJ>ru_kP4@#KS-8u7(~dxXtE=f{&C?9Z*XmPFP7RLIeu#X_erKXiRxz2p
zDLEwjN{Qef>sR4xr;F&yZOSIRnp#Q`!G6xfFS<|df|i)WH06%TN^;U<<oc$}8<euL
zaXR)YtClqezfx#}RFsrx$%=H%r#oq<G~33lz7_Khxeh#l9j07Z6!j6S(mwJvb-&xM
zeu~>3pa_j5hto~4J%@LR$Er6m+)O!0`u$$#9oKbNOo-Pd;~-*Ga_&^svZJs~hr)Zh
zzd?+#9$I{kBp!#YP1n>ebCnfsngMq9Klmc0%G<;9+|Qj9wlLXG_t$cz*M19o$$eWb
z52ZgfH97)=uG8Q6K17zVK__>l_^2i$T(T<a>L}65T$*13#LTeXDSX4=@yZlU4fCzZ
z1GQ?aEIFEW;SqmQ$Hq=nZ!)h{t43Macbpge+tk3OhnD^GJt>hQ9<0d)3#oRd!Korm
zi+zVylATt}qKDahbGETT#FO4%YHZ6e@8%(^TbI0OabA$%y54aubK3exa;sA3C+n$?
zoj1{g-rm1cB!TZH_=Wtl?i+qA;DzanH8ar;JG1nLrAx*9Ka&G3eo<CnHmI*DD(Kn~
zbxA{4D?BbbaCCGAfLGkM_BG1T?3L#I;HZYH8mzV%Sfk2gj(prE`&??LcVyfl5{Yy3
zc#n(c@30fCi7u?D>B612>Sh@!J+2LbPmI=>y^Ir^7i%+<iFq5jNK|I^jO+LB^k}Ul
zUEHbp6Xt2QV}sO~6lOGbKK0Sn8#k#jnt|O~gwva6Z1aENtIv@K@OZEa7<l^mQNog)
zfVWUeMl4Cg4V@6!!q5sW<?QxhbyZab0FOjfxQb%m)i|DJKMxNTrb(a_eOkC<S%?QE
zljfEMOlSa(MVKtHNxO=nGu?PFm`v8mNeo7uO$UO>2&OSnzoYggnu#b!ue{mIl@Ry<
zTCMwyA3jvW2CNmmO5jWAByUImSwrVYnM>XJ@^3-3in3G}K&uHtONo$&xh>CDz%Q=J
z!9xKgYUBx99H8X<+SO$SU>>xXYM>yR0RQY>CrXj;B!P5o2KTyDpjd@>CLVZudyDiP
zV$@Wuls&C|4=suc2!7%9Rf|3z1G<{PxX)ft2l`X6S%d_PuN;rY)Y>{^&&j(#fF=HV
zV~p$e#C4Mc10-OX%vY~WZ`=q*-H%6bN>Q=UxD{;zc*vJmRwjI(CmPadAthq?2jMx2
zR&$eepMt{qese(tSdd|W!zTdYA-wUx1rl&nCV7G$lnB6PVoogZ5lC7DmJJBg3s0~g
z7^@ZRJqtQy6|{SC-XEAAY2E)J`WP)-!Rjz)MhNz9cH3mO@V;KDn;!W4cPoi7*#gua
z{X6QUf`Se;y4T@HVVxR&ST_Oqn$Yp%wa{Mw92?V%uVmZjwr^9f_Z$5E&&TT0r!HQM
ze3=Iy|AW{fd`g6N6DtO&ZP1S&NEa_D8=j8=UVaN;4!VabhBT$C(<+#sQQpu%y}rH<
z9QjG%0qDK~b7|9~ukOXGmAsFOi+p3jV}lZXjx-fM4TxPcGc(a92Cs$W$+-VCSWtTj
zK{XybVdIsi0`o1MV$1;a#ngrzj9&mD;wSL!TJ!<<T-i4Des3{0>Z8!m28de+UeM3}
z{`-hR%7*lW*aaJ31PX2{OpUmxuRnku5d@Hr3tw`r{C-_VAc+vZC1HUPz#ky+K*H$_
z@YeYV1+cmBc+Xyfm>JL}W*mhOt+0j$<*`SBid6St8JMY;cXsUj^z6J=1hFL1oBDyF
zCXVp;n+QRR^{g_S2njbftf&NlwXnI<OQJO=5q^r`eQ1vyy^E<aM9%>n{9u5;D!AlU
z7x3N^&ZD*D59BlvK4W0V%X(34eJPMujot8?=FY}NBRKr~0`lZ5vuNn-)E#>SmOE(h
zBPY=e-2wuN6Ncsh#q>k_RN3&eO9oZ*-oxowV!ZN~?CeCa-F1G(3`2OZgLtgu#6S{s
ze<bdV2Sa7rkDaK)6->rF!}N5Eu&{6i+Ss6p(A~Ln2SAjH;dVyN9KeOlUJT^VPT2Tj
z%t(KK|1FRq_%CLY(AGO2ae)sg7GZaod$UJx?0jGnzK~elfD3KlR=S;Fs^N+QeXxi8
z3GYXc2TalJ{aSQK5dYUFRC@W$*qgIDSQ&cxH;7gO+6Bkar^lJ{6U}F$iv{_@S<z<n
zw@fW8DA2Y&U$%Pb`4ad{(Zic=!E24+Ahl=cZUcw~<H0Hf1W3aGSptcg@146Ky7WpJ
zYHkeu(JXU!!yt%CVD|)thyiNB^ek!}&IC5N){^!O+Bw_$GU{AIGYix#ef%U1_)~yL
zc^#FnSOBA~giYO;NUzG>yM>FhZR(0>0uxQjz>}p=E%yT@<pN)_{rcfC{jC4VoM{%v
z!{!I;YCo2=BJgLT&#^dOH1WiZ;2@y?8h-b+fR!2=gVhkM!^!apI#*0so2+QB?EsHZ
zXP$RFn*HQmZ7~Unr+RA&J`a!Loxo!lzA3uugk=DbFO4y~Mgy?!su4F{3JjF+?w}FA
zJ8Ol;j3D@1MwvP3>FHc(V5*MsUE7Clm?t<JYBAl(>aj5yrGDG?2BJIm%jzxsekr%@
z;lC8mta0l4qX_ioKuDNlx30Ma#EQ?-&gjj7#wzr@iBU|d&yH_JXjVceCcH>$$p&md
z^aeAuPs|Q0sj0#G;-&(eW}k%C@C2)Jdtuteg$qxo?S2(Suz9RbDMdy_osyT|1bWKi
zXiDt#i($lDVtNw}4=@#DZThg~6A(wy?QL$|!@xk8EdCO=0K{A%;CAi$_5EN}DRpC}
z6G5_gIq*px{U98R@vve-kIn>*qeg33QkJ8iYCn6&-rlRI$R%u;L;{lmLFJT+3N3yF
z-p#wGGn3+uH8ht^9ONI1W>8MJI2B@9pBkv5rpAoW%nBBS8Qwh?#x0FKYW#?}poo(v
zNgz=h?cX3^)HE;{W@KX0dMWH&a^&W>H;SUxUE0s_%nuwo6ol7D4MkE8f|OL9q_}th
zVncwp_hv>8jw9f|JTV`K%_sbSk6_0h#6q|GXlic0A7^Ty>vN#tTH^z+Flr2cr#13*
zb^XMxkrqzV%a;$p+L0G1yMmL`d$>6>C_P{YM+1#uPB0s)v9Y}w<UnK90;LVMz`<P2
zct-p1R0Ux&&1F>Pe&pu&_nhCqf1l1wNxjY$(Nu%;LE+uao@%t>RdTuICh2yDOX5}E
zJ&Z+$X14~h$iPg{#UgtV8yky0RciZ{Cj`BaXoT7VewSMrV%7kKv<Acl`&`&$^E9hi
zk%$#N{X+8KK}EV<qG$N^a(Vi8;erBP)4ufe8N=$7M|Xo5&SY*rAXhicS`VX!8cf=H
zp7<ARg#>hN8)MN=_5nzb(3wlLC$Yr&I@r+?VZx!~)4`+A+OgSl`U)NzJd*8i2#!Tl
zK|uWrxdsn6_i2!K70}ub?DN<F>+itP+kY++?b5S`r=u<vJLSNg`@#FW<9GLa{3jP+
z?%KVzX&N4a`hp-W-UUjbPgs~{%)nk5_vaJeiSGqAU)kAtqHh-n*gkUcJlW?sy$Roi
zRKuct#P9k%HGv4)W5@Dbf7egUJw?<fC~m?6uz|sqfN=u~C7Nx_;L<hZ#a0fXTgL)^
zqR*Zb21Vn?K-7tj6~XZQIXW6;u7B$Kv<=;5?N3O(+}=aHMhu+-Jtq#mCxRo2sFoz4
zA`<@hUUtpg#}j=f7-mFJP(TOjb1C)cGoKd#H_x?hZL(?`I?e~cN8ak;u_3hry7GQr
z-n8<y3DBLvi4`Ln<oP$EuDhH+za0a&XV?#WYm`neFTFyagEv%*`*A!X1c(Mrt%v?6
z$s=ZkuaR95l^7WbgbreoTd2%>IgTUy8;7mbz^j)%z4v8Xih3d}LkQOs+xb72G7Sm{
zqu%oo2cuv{OZZ<}eMt|8Zju+r&g$w+Ghu*@-jwd3?f;jy(b@9<qiSSH!@!eZj!wTY
z|F2XHsTB~ADZy*vzwJiErk^-t#Vey3$iYNzl*U(Aqe0EU$aoKdrXTEsnrPxG!EjX#
z8{@s9wtfT_A)RV#6Ghw#R|4(@OY@-D3QB@cP!KJ66}HoZ%B~<7<2DN5I7^H7jE3Kn
z!Y3lb$Vu?6gl7YMW39q!(U~iUr3;*(;r)FIW-&-HKv>r4mp~(TD;URU=nHl3+z;=T
z&6JeG;x`)}9gGycx*e$m1tq1Q>+m*u`qMbD&KmT=D~HHqynTE)!D0XhlJJ{BEk#L^
z#bJ*a;*)oMqpW1*LEzZfI>kDNZ@kyOiwqiGT=&hCPHFxrQBcTXyq+Dez@OTB;Hgr8
z*>rTB@3Mk<zxsX?`5IsDoWxTH8H%hlayS+5c2Df}ZDqW7%5q5L=*nA`>%vEed*51)
zU-~fg-F~5GGc7GGEGo^=0VdkKE_)Fw>p)?+_2;YbWebabEP+UoD~&D#yc0*KCMRXl
zGbVV(&!4k{_)PQ^2{WD%%gV^}I%As;z2-E(mY$mGk5$|7{rhuFt2+CN^7Cz47XCP#
z3bY))XJ1G;KY~pMuauO*(9)ZAe)!Qm0?AGZYy~iSPr@$R*`{cEJ+pKo53%eKNVka2
zDzOB;E$Y}ijZe$3hnr(ny7O-KEGPbcsHmi*1=2%9b+tE4Y*JClfThLD#kK3?UD1zN
zdC6<wS=1xj8h2x0{QK>#AC|r%OtNve`@6tJaWThjEg_It!Ik?mKsm5v2mAZw`rH-_
z(~en&FR40h-KiyP)ZQ%G2MS6WSQ3LnL#M&~kn__z=s5b>2fh;C^zy&pt*?d?B?UYs
z8jir=)m7JYt&~qL8K0Yo>~+_rG~@7C>O+@RYn(J?+6>S#BaDKV=l=#F;rIy(nbo&9
zNiC*2;);rj?;S?Z7o?Plh9hf7oAv=Xw5!<ka(?>{hMf_@s)iNvhF89Ewh0-A2Eu%2
z2Yb}5#iORt=M-i?T{-rPhlhu-DV?5~an^XtcLaqQLEXd|l!GaZsJCc1&WAg~fEslV
zr?9Z*h{k67wPi=Rq%$40_)w1L<xTIWLq-%Pxbh~0ceRoCnMY_i$jk%LdfyMPrG4<J
z$10Ya=q>S~Pit(OwPT$oynRO7Qd-gXM>m#GOpiQdGuQJ~za$c(0p<(nq2(}gI)3~(
zBG15O)pK}@enmw^Ev8gi;KC94G%?x^XZj9SR$7kj=Bh!r<Z9cEVD}969?{t+Gyr<W
zTA6ReI9&)1L~Cm+Sd{#=4><J4e0ze0llh-N6wV8WVG%r%h`T|1v6i?b@Pgv2&L4*R
zcNGFypZ=(!{+G;4Oc+*B3Hx{CRwL(Y6nC1d?i9n~<;CN|Scvy`CidX;^~J9m8JWD5
zm5IC^BPy5+3yYu6S|gefR?tMkjAVBIp+ic<&F*?oRuQS^4E=#G-Ol@jB{=braK?ks
z<V~+)JvG|+X6NqR`~Sn<oM^8j(?95NCRliDE%i<<S{uQxcX@fg6jx{}sV^-dauW{V
zh}rQdbP#VCB@Wa^`u2MV>o^|_ny;#?d>J$k`lS!O%3tOkJMc~}9Hy<j;Cqq37LnT@
zDRX68+uL@xL%1`>9i_J}!-QQ7%%FrjO}Ut4$cP;p|N3<(SbwHSiU|4!BpmlpHkjeH
zUVL*opvCkWF$+-+O>C?mCW#&4t!-^p+hkTfv0ZhqN#<M(MnZ$3p_GP&4i#Weph2DT
zl4qxR*O{Nx-$1+}T%Zv7`0jS9(tda@&IH0r9X|P=3_%=~1T~rT1L-zHfWin^Mde}X
zWvD<Ps)++zM$Rum#Mo_)874ikXAfN_?b{vzea3wd`r<&;5OZG@Lyq)>;h?$dZr)#?
z)A72@(Eo4zdaUghk~KvPt^>t52jv?Udib@0@o{=YXtIPheyki2)PgU#Jw?vHKH^58
zUYHFB=?!5I4(0d`20XOxsl4&bMuH;;ih!NHJ>%ZJ8>il~sk&q3)<I>>>%exc0fYja
zfW$csX@EcKAZlXiezcXV-5l}!IUSa>0ZhoC)hDJM9x^{W53@0F<l?dGaeMiQj|7(+
zHgWrK6azb8CSLNcj5oTMq@nfzi+nR9H3yB>cCJdIum(r$Dle@LGtZa#DMuW@z*y+b
zaxRW&w09wWMrwMSkT?)Iqy+oFUqc-QdJ5{1hY=AeZwQ=72y6yG02SCjpsJn%zpQb&
zlN;<Bd8A{+(*-v#t@w#ge&}lg%|NnyfA-Z?LeT>PEI~`fkV`qgDmE=Go#UKLl?WEu
z_*M)y@>k%x@%=p`@SE)t{2}Mh|HuRFjbM|bRHOrFfE^f+E?SCgpl*vPb1GgC;p+uD
zOAg$?;;T%9(>N=(zk%z%8AydF{=DGUgd|khW&Q>jI<g10D|heQwTlZPD#Z92Fndfa
zEh*jH+yD=lgMawme)vJ|U!(yVI75)<GJxmmdFH^QZ@Nf=i0z2l8=PdC($Z3t*#Wb2
z7~4Wl0+pUP=14fyygOn#&gT;6KfwbAAYnWHT^xtFJRk^OH(qmBvR|RXjysK=ot+8e
z`-o&sA>0*exg7|sRru`)n!?F9Q@11RQj>lS4@Z0(YEzd<;*h+p{r)xhqYNZFTU$=B
zU*6>99VCh3IJ0wbI6y+1hMj!`m2Uex8)I@=coVe0HkPrweVd!qo}fs}#U+6yNwyCR
z!E2pa9H1tjT{xxiBs^RZY0AsQM0wl?j0PnbN!Q@*_UqR#%~PkykVgd~gHQx3{z+7n
zGO7Oa=SP7-L5F9AbM6cd4{P1JB^34S8SxKh7M7>qI&e?}Cet4J4H?ZW=+nAiQxfV}
zHJ8j)U(|MjIaH6CAxUl*nDKiPK$YXk3q`T`7%ucjjEXO&tqJ{tLWs?Aq~+9zP~?0)
z>jBQg0s`E~_Q_?j6yp;Txb9B=AXAGL4S)_vS>eE1LQ_KnCszX4L}8$|)Kph9Flx%l
z-Op7sGTP(p<itSg$~N7^$an<PN4Pol%iK?r#UZ??3}Ei23>h(YAv_Q>9`Zg5-kSgU
zDdwaK`0(vTcWeqV-o)oGbJ#<?EwGvXT|LGKSwU*SH}Q^7LlMqhPa-4FAf<bWGc{?U
z=7|@RNU~Yw0T?|X#65P8`jV>Ybvl^s6!cP`zumu6CKMDH$iu~T9|fKQ>b-*j3S8EY
zU%XI5t-IM16-9tQkAT2AZq8>SR|03Jie$jYc@kiak<A#*k&64nG4!_4RpE~@GSwYB
zb|?V#-LY#I-@@&{Xilxc#m0t)c;GO0b&(Pwn6E0>g&D<-E3as@!{K6e@X(>h$WYZ@
zNQ4Il25Nskq{V)&J~HqZZNBdf+&#F%6<`8sB%a<%=p3<cYXF7zcDqCA1fvQn<W=Mt
z3NpHj{fFa{H|9!{9zIpW01%Px2m>|Uj0;DAK{T#nIjAhW#Sk9V7ZS{Pj$*d`o3FK}
z#!oI}jiSUPhc*KOkA1kwhi4}P*^Omu{ykP7TGmAx6=oDl$BE$@2Boe$!G*(Pi*Ml+
zu1$Y)HpzxY>WVnVS`(FsLv24yDmHr}L-QZ`NOu}cAx6fi$VdiKAqpQx#x;P{B1hRk
z=s!sMys-)(=!!)>XmeDgEff@I2XLqH!0kXFl3--C?k$cYX&}t-pfD5JyLEp8rW8!i
z%^lpmd$+``ALW#P<uz0InNOC2;3u3cFz_3ifXg>;X5}3{o(?Gm`dOz@(h`<xn)utZ
zD;9enSmLQt-)RJI>oG|KEVhQaIzK2D&ya|mP+@k6_A~wh8$<!mXR{}Q(p3}$BDCoU
zr&fR+HhV%aQ{U5LIP`>xu@#40Lt|rLwV5!MSun~AWnJ9}3_u=5{8mu-T+<7QK{A%p
z8IQ$Ks~Y^J63COYIN`MP^tvb~l>W=bUk7&E4k<zSobDH@u!oE#(ms6vSI4^F2_h-Z
zDE7GEjGTv=Nr2M@gQigZJV2^(hAZqL#uyQQ0$y}ZK>>$cGA2ia6%>f~6gxi#Tag%C
zfv8F>>7+jQl@I_5>LjqWtRYubP<hJFiHC_H8;MXGUgAcZrO<YOVs5m}4==F3vhqF!
zJ^LA`SQKXOZVe-5I(3r5KRnF-3{<S4xj7V&_e{lGGaD^!x#W>4MYsV8JF*$0#?OT}
z=)XH5RyRUb7~o6zbq3(UZwa{95K8RDrTaZipK&;WC~Y3~nv#NoOGrp#r~uj&tsz@8
zGcM20>-NO(5(Je$7(+ikK2FHzNcEYmwhj)}s6hL=V?hDOhLIjAvC05RoS40YkgkN8
zAh>*QdgZfW1GG*jYYAn{IGdK=lp`jFA<&~XxqvIFLg*JZt=vpZSV8o<2f(7m6ib>a
z<bA>WGY2YxCD`J~AWC0sW+!+KlFIAqlzxnes-w4$anbOp3_xB)45%1+_~aZ@?L`dT
zgl?~3U#2HkMgGm6KqQrf!W0>{(hCVkZ~7qN3tOx{yn0N)sDPm=fg@nB3&{GL2#ERN
zLxy<yHXa~*rxB#k&<zCY^y*CQ+0+%bpn!l=pn3vM<#yoFQ#-KT6j0a*mIs7>mo3bY
zi>d6lsK=0;N^&ghDo9zp=@s{voIIQl)+E6`A9<*KuBYxR@Y$vHa2;>lAR?y8l`B3t
zs0V-{5n?I{{@O@SQ48N-UUfj44j1^PrHu|h7FH{#zVwA@#}02yTSBVIgcU(#222lY
zKRgt!8Mq`o2MLQWgizpz0)VGR=c*i;qYr&hi8;JP0qDyEsKVo-h6FBN-Yl5flSyRW
zNK;c21Y}@*l6Yu@h6?{G96^&nemJ%VY*yF|YA-Q%8i+YDMhVJ5Z~CycCd{<LzeU1A
z7=GeLxrxM@c|hx_UV5faHCk6hA<nHD>4^<UsEnQmr={VLL}X#W*t7bNA8U~COo4%I
z2F)X&I9c3l3+J167zD?T<#!ZYIR|>X^REvbI6%d~Y_6&!#@QwZqz+Mn45iC~nbo4}
zHH79$!&{XRQ3Bbu;EVx|W5~~lD2-RH99Mtw63Fm=xJ*+VOQ2~+NS8sXh>Z6Kc%0;?
z>)5oorLUx20VF5{OpSrCg0zKB#lObv!wX4PWHsgJpolZJF(AG2K{hj6JA4p09KmD;
zH=K6I&cmT-${?|6Df95a9xt!2r$SjrVkFe&IGDVUt4XM$q_dSvR-~b&odRUb1$kci
zZ@GARU%Cp^uPup6+YHLwIZ)-0D>dw>`SdBP-JZyDKPLrU_!6q61hD~;C=;~V*;$9H
z=hu+bLTghFsQm}kPV>Op6#l$=C@=`RFit%ZX?lA47TDy3oENIk-G|I~B?I;PJXi$X
zf&dDUErI?zr@<A*le%mn_7-GuP*eGAcMH@;n&CPRBEbP1(h1aCe`pEFL#F;adZdBO
zJR-^b2%jRx--!$xl4*p$&B1{UM9EDI=}z<BMKUUOx(85+hInOBcxB{h3P7TKcVh3I
zA9JeT(3sQNy+ca^{fbfMH(X&<#B(hxD=XI&b|%^$OG`@=ZbvXF2UKDnetvCR?O@?6
z{oblo%*@QDP>3X1)SktIC#b$amB8*kZ|k7??W{!=>bEJVfn@nvXxSMb*I|<g+4M>g
z{C$W8+J9p~VkCS9DNMNbi4T*=)&)R*Kfv;SwEoT-1GSMo0oO}JfWDY(#Yhasg8rg(
z?A#`|>4rn7mI!GWpp1hKVyfq`11f=fO+n#I=y;JlKQ7>Py>NjAT`Y|;8ok=c<?Vxf
zO~_3!dP~_qE3Xla&8gUpRZ6oQHoz`WMM?vGBpSIyKTz;R8H!(o!IW7i1ujP9{@XxR
zPMWs|WB?paDa|dFmWvS20(NF#Vc~WVJKKpKLR7V456*OAHd&;YEf-EUV(K9QAJsQE
zD<MFEzV3~3oR)*zT$OCIa=mn{7=2#4ibhYRg8z74ZQ@{rReSlayz9|bZwh&<B_w!0
z6o!7CSzvTAnwwIHJy#x6LiuBKG_Bp;V#_DlQ=e!rcD~WLCNs8A@G$GmSJJ00FH*$I
zYZe}5wdwcEi>KkG4tw<I{^LXHeEaxnmZzHp0c~3&8>0kta}mf1ASfUw-t=mJv9-|4
zB{YsB8f=^PX~><{4rZQNuF6w%<1Dl!zk0&tnE#p4H4R(gp_K*MzAUxyUe*kW<<Op&
z*;9Gub@Z8ZM&yV5(w!C4eS}+jzc8xDB$+lXGcyD^&naIqEL)?pA9nMByp4*3#+>wC
zh~GRo{JeoduzQaI!}4FMczM&aBD_|Ike~a|dkOQdzY7$uWiwYb!NHDy22*D?a$lAi
zmk8=QGDIRhmnu75Uu#aTRDIT}GN;vhAuet4t59vOX1H4Y2i2{n*H#Oq?g!*ZtExTG
z=eyUS&h#LJyO>g~rp{M5IVAmtoW-@wZCXrg9v&wiuHUn$Z1Xlxq@FmXHI-u;d^M5p
z*~7W9@0)X!SjkD}e7Bel{>UeJs_0H6KGvoBz`jYN$C<l$O>XK>&0$h`#s>rc8{DQY
zi(7Jkza#gZU$^RY<NZ`!%)6aW{h8OH{+9ecnn-bq@@i9x@5__}^=aNB<~oY16L)71
zY&Bv!QTaibbnMwj-_Gg~r^x4gZf*n39&vgDBq?=gj=F)At3o%$IJ&C@>+{y|MXEH*
zTk@ited9}HqHh}pf0R5I;c}y0*?A&9b0DqW{8E%~?SRT!EvtF3&ILS&MiJAF+oEq?
z2Pk>C2bFo~2m6I;30qzjBgt|(yTz7<{|+^4<1;>BNPn71={g;I5&bvuCA&Oj<&XC}
zy+amVUsA>x82TL2)itg3r)LwrSu(4l@kO|#d6M^;Y251|4}n+ZFWxqpSnaF$L2VQ0
zac)-+qd<uD<i{~DlBZAKxSz{)7uTV`+@168_8t{^-hN_Jzg49Q@@WnaZ9Dy=Ux+<$
zJ>!j^>fa}hQp}G0hb3#BT!m{RhqQ{k`305_-=JQiOXj9XHEg5X<Z`^O=5T<Bwe-ww
zd3#I!i#jJNDm~rLs5RFXG~M}i?eU}NfcuqP7b6i+G`4ZqE-$)jD-{=(P#k-ux+P%L
zP?zb^E$$(DxzcIhf+$8T4u;}#+KAUDWxvn)k&OD1t=i5S-{^LuFPb;59IuyQEVRot
z=$27ESCh3Ck!|;r;k{`7sbgC5bR(^FuWzn-V!86&DR0+MteY_py>g|FEmW|Ut<CkC
zF5CQMgVW~MC+|PI6C0PE%~s&NCDoL7<>1iQxcu1#^)Wp%(jFPLhzzxb2j{4aer)L*
zl`*RbEEyRb@*L-QA@p8drNZoP=ih2e66x86Q%OcDtB1CHe13zB^eH5Bs%E%H$gXQ6
z`^NY_(NtaetiQ1-m&r-HPGlO6Ia+J9POW}5|5jgmA*uF1FDLwAkJ}`>SDj7y>S&4W
z4NDT;?7_v`J(@SZt{15my~_}c_<pvgMV9N%v$(4zLQ8MYi8&8ZxR>49ZU6MNNyCEQ
zt=k(07qyRWKal)xbk#*`GWgkbjCVOS6Md2Yk@NG#W?HtLV?T#_4%yjwO#e|M$(m|v
zrj;IhAyucvSa-e`3o%HzHrGq<#hYS>IcXZ2Afe{66Lho29%0o6YW!cu$GwI>_wAKZ
zB_n;+)35)+ed0AqIaEvYV>^S_N^bRrz7(Cu#{AYtvB?810iS>CYcsYLvH!VFPFgR0
zK?e)NsJ&q$A6bWT`Zj8RjySFE5vKj=XU6C@<ZI9^c|3Is>3#HMwsv3ixtM{aoVqt6
z=D~HWT1op;w(olr<^8?*{zB>c;3W!$<BuCl_9>h>IA!Qxa>#)vSSMQV;N|=dmVI2$
zOB`77{-}&xHV14J%icXrPea?cy0D@3)%pATna$WJ7Yo+e{)}CW`zv`uL@?uH1(Qd-
zVrUYEc#z>=);Am}pJ2Vod00|?S#f%Fac*RMrlisA?z?7-bNQ22-3)J8{5VH#`Rwdy
zC)b9UtiIXrq@gixmKYplF=<@oSmeu=(L0ghC$4qZ%&vugaEMv^eaWl5Exuc=yu?+i
zY^Tn0oj?Ef*5YL;{^u5E!=);LQZIELNc~%oip0Hc^4uA8+w^aTmYg4FVxbS?gNbEw
zfpa=D$-jfsj^>@Mm+CrR9ZYQ~e7XPh*Ssjd_SqW>H)80tnA}AFWNUPd&xCOZ-yBlU
zzP8IhgIf9P+bcBHX5ZfFUD!S0{wn+OC)p2|SRU*Wc&qXD8$bX0_&)db38(j^Gh0&9
zBYQ1}mjhBwuhI;EGEVeu;#Xh~tSS7pe_tznynFg5xHwyx&6gJiNS*~+E}VGhL1mIW
zo%7Ewgq&VEzE#NNgT&X|=%8|&+XETp?rc+O*AIq9-whjfa{rT)`GIX<Dybx^`VcjT
z9Pi!jh7J=W-q(_S<@_omYc(^DT_$B)1Z?Zzp9*sxk5#E4?R#NibJ>`7c)yAukGsCJ
zb#lnx;H&165e0us_ok#vCEr=e&C4(E-B9DTH?E*9Modsy{)+ga9O3n=w=_D9^Z4uO
znjxLiU$vP5jS?|f3_`gJ8zbh_Ph=3O(n1m1vj<n?-`fsT2L@5Aas2-A?9!%|A{D0G
zzwh8H_tmtmOgEOieAcJv7G9Sb{YSw&-SeBuYJ9#bR2vk8%C~xOjz#Qr!YR<kI$jyj
z)@d3icu%R@chNL0^uyKRYayGmZ-1lu6Hs_RvFu=6bQI^)4|}LOS>}Xo=bO*GUt-%j
z)>*!B!Nd3V5t)jlj0Iud5mt;T+VSy)_2JB=d93bC{ZAF6CH6mB^EnZA<jWI`r|N3D
z_mO|s?;a>?@=eTAgMFml>El>J{fk+GEhULeB$K|d3^pm#O(U8-B-tA$c6OKU4f^4z
zWOCj5o>%u;ysi!3{F)f^^>;CqQIV3_Y1R+&Hg?|YHH`l8`O8XV-T`)m+PK3Vr*uPW
zFP6Dpj?%3-nk>+M%{LfjV_@J|!xFu1RZLZmNXpawp>?L!DOt=nUB+b@uIWXY&2{$r
zFJGbX47^@M=Bc0?%zQl*!(_6~lory!O|U9hvCQn$r1TBrqx5(|rnsJRn@SCBZMxS1
zyIVgrur&9}Wgi?odSi7d^sF0&SM4jMn?{`5&$)T&TRxT5)urrlD^=3ew5{2_p#si-
zhJ5J$me-UQ1lYkOFXFdih%ur)_1j`j$gyIBjHgUsulZOolSnPw3W@p4<K5D!TR$8B
z`cXalo8<Za_qMRv#e=RC`DqSEB%H5Rg|oG1h!^JGQNRfi%+aw2>m*XFauY(fsZP)4
zD$2ZyzITsoIgc}Ld#ojl5EvXX`}2GKE_2_)rnU8rU>DD(&OIih-|uCo-z2v`y5E)K
z>)v-vvEk{Db@w0<cd)ZB_h#g1`Tp&~^6KQNEUV6GrpTyWCbJK3pIIH=VmCuGnBD};
z?0k{d(_g|Z5ob~=WRgR;bZR2M`lSWdz2U2Ud4%ur(rq>piONY?;gojzA>FFaJ4z%^
z)V!t?NW2rlEq05aKIUeKM#@uhl6E@Fi{iYWq&U;H=+Av>!Nz?|xu@24*_^cWeE!{a
z^i}3q_odRjzt3)y7~FYS<kxzGUu+2M7Fb*BmBHY7`q<*p*DqOm;Nsa*s^+y&8nIw|
z)nJ+H-Xk|Mo5r^YVm}7IJ!9_pWv<FGMYq#D*ewnx&*WeipX*8zt7`C8A<L_q_2vzH
z5sgTmukT3yk+fsp;-ly<bz99M<bq;%>EFLyH@9p%UcXBB=bLKs-=e&Jl5D2dvbvj*
zJ16N!-y;W-XXTx9$L9YG2A3t2JzYmh_H^bkZ}-YM%ToQ<^yMysVg)W6j)tXK9PCs3
zEVi8AURtGlbj8C#HCSiM^M^X7Cnls7GmM%{`i102G$MVK-Jd=PYs)WBzq*hA+2*H(
zOD8fSrRD}H=5Nq*RlZ&k9O&xX2HN`Jf_HAu@Z9*SlIMTJn^0NsWpmH_8HMDKs5G+Z
z<5~OHgpWGgJ6>t{@b#5T^ULP&4};;=`sXDl{uWvsw3e<;y1wl{-eSLZX5eyJiSWoD
z4z7}#t>%HEPOB8()z4NmWXrCy2-6Zv2sr>cXs_zE-nPgZlTWO_5^}jJcGvMHR|&0`
zRQE2N$rJhwPE#UUSzWinfAx0lVfhlAy;`P;zhYuFoA|jgUt3?|hT)L^t*&bihcb=g
zqqHIoDzig0$!!^COg4|Kh%SoRl8np7HVjF^DwnKrDWWpuQjAgv<q~o!Oxuk6h(sDD
zg=TVTT?-?GZO>QFw$DD#_Wkqz@!j6{{oe1K^ZT9io`WnUonNYP#OG!2-?(dFii{&P
z;sbJKC%{g~^YFTObPHk20EOUM+|QkCZpCdNf}+0ON=XIozd_Pbes-?NZK>1){hjEz
zogb}9Ti6q8-|<Y&Wg>iUW?HhYlj19?%g&?e>@yqF9D~hc?idUfX}<lbVeP>Tk7k}j
zvd0n5A>}F1rlQ$pBJ$HyQWCQ^p-*0quHxWoi`$IpQ(Zpv?b$?BX68<|+B<$+#!A#E
z>#0RD;dKp2X>L%cioRE+&%$aaRv->+;-+)*A*FhmI27G_g}Se^NfR$|ukNV*)v{3m
zR&gJ77#oq%&8TM;-H{DimQ(EE*MU|-L?cQ-Ip%ZT8%1^O*o>;_v7*di)XBkDcCbMx
zz3CO}X%wz=CIR@nbSXF`YpZsF<7(7M$tkL*3*%r&WghRr%u)#LX1MRjz@-xp#cE>b
z-??q#SC;Dpn8gHf?B4%1$IAzqUKQw?_+%_QrUHNZQxt#AQ_FS5zduMZtm@<RGCu~K
zHskmZ$`*t1kR9Cg%H-P{%!fh#NhbEcI<x1zTbV3@LYa)UowCx!!P)QvJRjG1o5J45
zQetStcVi6$mCH^~i|s5nAU~8OvAew&*X}U#TNSvcrIomQDULh;W~`67EkDM;Et%Cq
z{GlPkPX>kRYKs$(k0!O%OZG_Q<)NQ?^!ps2Jh`TDRKo$=A(KDSV;Hnh{KRC?v%Vs^
zfXnBrBv#3W$c))DY)2P64Xik(;(T`Nv-^>%!v`h+cjLT$c@*h1tW*hGS2#%3^*3aA
zDw()1h@mqW#7cBLE%IgOYb(r<Y1lPFxlHg&y@{LxU_+UY)Raum-{3;IhGt%<E6x|b
zz)0uHp9T8&)`EPMGm>ul5!0SP>Fkq`=hte5c`2ipj||?)x#!{zkH~JB+7>D#jQ0jf
z!k#-bd@4&S6bE`nJI13~dj!;xe0Od2qM%wdCm{oQK8L@nnSS8%(t<L87p0os^ZKNo
z-iK4uEw2H9X=uF5Za-LkaL0nyxUo-f@VW7H`dz1R>A(P;oPc0UTi$S(jnt%OuAs4%
zESo6u`&g(X&pvYdL;?1wLdmJp_pg?jJE}EBv;MiXF}M<}I^?;tXQJ;W^%qB~CSD+g
zosmE+tacTZP9wvN%i|aP^uz1!bCLxwG7UbQOtTp^*erj4p~3qsc`=C#04b$<!%a^N
zg;6pS-rpFTn#Sa~5{FA(;LDwPM191{==#GEK(S4FLTCgmaS*OG9sRhtaW5g=ZR9$N
zQ*_I~$;u)`D})X}Hj0ZNLK3|t>A!%QanMma;Ve6+?y%W(h0A#87XSt!#|Ydeodwq|
z(rW0LxIf0y-gQ6)`<r?A`I!<6u(_@b*4BH>v-)JS>ZxSQgebCw1*4rkuK=59%>CQN
zPYrxf1v(*jE?X6&Dk%JoF262U#CGWN(<CVjXyT92fs{uBXD!w9eIW~K(dhWEX6%<t
zN|^Y#O$kDPFt@xkHiQ1VN`LGvy^Mpxd6}XxhpqvkFe_mhn4@gqrr=f@<MFP9s3#DR
z5BVO={o5)cfGGwqVifQPP1xj(#8D4e64>=vO*f>atr&><-2Tfcd{*<wV6}#{TcNy@
zn!36cjZdy08XmTLp<!gC2wqO@3(=m}!2d6$yn@Dflv=lbD|nM21Bn!Hr-wzwX&8j1
zh5T}9B{E8eh`UuV)o9WTDGaP3HW#LcQ3~lLc264+zDA=UWug?I_aqJG0QWKt_VOc1
z2s^U$Cai0`nvqFw5{Eztq-EAXEC$l){}}|%_QMtuNsh&`)N(;Sl_X*NcE>+unJM|U
zcIueeL*M|0G!a_(O>pwACDib#>`>9uwaGX7G8<%J75d9NI==mmf5?}w6ZLgf9Qam8
lnS==2tVk-->F2JiKH>akmxk0tm}(Rp`}Z8!U2IN0_cse13K;+Z

diff --git a/Documentation/devel/execution-flow.png b/Documentation/devel/execution-flow.png
index 24148c176abaf7356700150e8d8c3b68f1ffd9f7..97decbd9d2de33da2bb1ec548f699c126fd401fb 100644
GIT binary patch
literal 18976
zcmb@u1yo$mmp=$GELaF`X$TNJ!5z}UU4pv>_uv*R5S$R)LU4C?cXxM}#$C4ZotfXv
z{%7Xwo;@2OIo<vGy;pVX*8RwRKV+pvP>~6c;o#s<#Y6?=;o#uqz+WfCC*T#mD$PCc
z&kH>X5ka`ezrTMsWJSWky@3-G{P@`^@nFH3=kp#R+>s+*|8&kTUT%Af)PQt991FFP
zWbxZVvI7sf99Q+iIR^zY>XFuh&onu7)UOX_rUV_ne80Z8IZWbqeD52_oVay++||zs
zb6(owH6qzcj5|&Kq{kG82q%CCbwYrHTc+)Hh70fuc7(f&PE1TpN(ym&Eg%~%nvR4;
zDJm+uOpN##9^k-d#n~S$Zn;0DOaK%3Cg5~;x6tvs4~tT=nH%E)GVhVxW4_p6QlAvX
zu;>Nn_1^RX>CeH%vKtAUo>wBmH<dSAk3N4&;?wuFG}Jm$kZ<uVD-)d4>t<JdN>2!W
zmU0W}v)&3SF^cvczBRlgRkSBADz>Ao$3lh2>2{uf{rd48ZP5pk^w9%We$Q*a^!?<c
zU9+mG`ByNP5&Jt0bY8@D9?MatQ%tDvi-i>W2uJz4hQZ3CLR`(Rq4QxMfx)WP1OF#M
zKM>v#<Vo#cHn~IwNlA(iknrwh2S2!6e<aMJN9v}{*NO6sII$n^CojDrd}}|cD#hmn
zvw0!n=j^vZo`@D?R!|b_1Sj#zS9W)f#}}j0-#qVo1oNF(?;&ncg8-t?-8r~FzW$LI
z*EGtD+k2UgH@^9lq(uCePM^r#yIKh2mAC~blu_Rwt2DA!m)4R%K5M86$vaFHpVeM+
zeCqj{cM@)KNn$kb{wr0lQfg#;ZL@(z=?I?`nV#xejzx(ubmo@s8bxGk+O?%shh<Ls
zl8U-6rRn6QnW(%GF<ah5nU9h(2Q<52d8R_~yFPFEe6R0w&L!lq`>8AryfD1X$mlp&
z=`K-ZPkxTYSL=s^kyG?Kb}6m*eY=|t<rE1FdVYiiJ6M|}o~MmELz_JwTGH1-*nK<<
zHi@Q%C$;%`GuoONLw)5$lintA*R8EkpYvbU<L~Vgk)ZD&8??}O8&YV{Zkv3_rLdz_
ze0uI%e~c3iZr!!g4~2P;Jl1!EvXNdbR55gR71zux9*gm(h>#B-n4sBrA_uA8@GMaM
zT7Q!6Ir<&kvYLh$>e-k~&<ynr3`qK7MD~2uvS&NCk1ogv-78O>Ll?Bpr&VH{rgFIv
z=99WBcOST-7@SN}Uzt9u^fsDO!Vf(kj(CsgZQV5F*gl9FIz|=G#xi<KXmx#6@s^Xm
z%b>WouTCo@B)G*zJZj>+YmnD1{wk*?j{2=&Fa5is{KBab*;uYYl}`n*_>MF+rRskB
z_7i9F#?4<Qs7uE;7FwUklgKE4M#p8Pr3z#OxZSCZDxoTL;ae@b(jVL7K;KdD;zHIr
zIx!&a8FE=jnXX~N8`w&cHt&B%{1IMsF35g^WjiXRqGEhua4Mskp<AVuX}Fn}*G=x5
zn@f0CpZGay9b1Z*&yD&A(t-~2XLVsKcio<_pQSWH&*Ofb%~!!tC@9)3UleA_3%=N+
zmeM3@USw5bR8b&<rQf6k#_e#dH(!_}X{~&cdeM0Md0goz|9Q<XU2XK}Pb}PcNSI(X
z=uKmw`eF!43d)!X*qS;xXw87RQMPR4apdGHDkhqPXB)+1;qoD){KG5T(l5$O!7DOm
z>L2>ObsF=98BQ2MdS18I3iv-FMC!az@6Wn0L0V~Uqw3FV>b$R+Y533p2~@S+dvI|L
z&f2odG7@4#a-YNT^|CwNF&%bb$QV$ej3|SOsQoc!zSnx3VHiv#`D8Ru90<x7zEr2r
z=j_)Jd?&9uG87djPy>;fwC$Q8zACD`<AOd7$+a#7dAM|W4GiSIlrw}8qUnYC)(kC<
z=|0}q6@T7*OWb-PVFiJtn#oafqc4oh!(yym>&jm%E;-=l1&3o$Gw4akI<+=*;Sc?6
zy2CtMw>20|m|mFnq7Y7`32b;1=|^btk`fDC_V9dvJ73Ja83=@{=Hu46%dx&*vw4mD
z62V>3G(-s9&bZ=D;#~^!?O99hBS~OTV0Z~KCiKsrRz!#{1mcU~@GXScu&lHyZl+%g
z-IY<La|X2$J95+cjqS}d1!^&5wulzvR;}@gF|N{9Zag=UUO2Sy(*jZH0VNVE`6YqJ
ztBPlk^qfid{YeSm;aJQY9LlGpJnsJ3`kJNG(%70GmK-|V<~F}<dY^kiFn<jF<mZ;D
zSRNHr6Xt_<8;9H0u}Tsf*)Crt{WfD9=0~_7HviRP+}SA2NLy5bpG!|mKS&~g;5k1j
zyBCCUb5)UEm`o{+?S6d1-{fj@_5|x{uXVt+ZAja>^08|B(;~BhVfNcsIT4-RgSULL
z6+>-Tm-Ol;HLWB3P0z~-cqBx6-{TDwNK?^uUq3dFI)PjV<HPRYyOq@((=qtX)GkX;
z%}NOQda4zl`_oNlni)imwq0-NBYvGrgr>MlXkV_K+S6P5c;3W8V{x$|NTlEF{Q)vJ
zH7iMaAco7yDtQb6UGPNIO<!lbVPIhRfdzstRt+N=Bdr(439pUOq(NEETCmlk1mTvg
z`Qpny7&a@_Apg%uOqqaLX-dcKJ#`d)d)|Tv(#Bts>aX6LR%=-clIh(VbuFSe+*V1~
z*fL*Nm7y<an4gv3B)n8|zGt%<ZH=77QL|daE}j~mL>58ZF+(?|byE7I(R&sZW1x*5
z^aULz>iGk%vFcITjyZDB7>aoB(R_Xql3wjA(<aFZeHu;Xi!)Fe&pT6JS$KRGW#r#r
zL~@awll{hS)onj4mrGqDX@GVg1l6RAzvX!i0~NW)+FfpR)+7<w$kq+oOFr2gvVvW>
z=R)|U@Tn**u^7?^bFxdJ$^w$CaqSD$lbE_NCU6=HP1eHne3!AsJgTRpGitl@98I}J
z^#%x2NIwLTId{Go{61Ol$SPK6lp#$NA&W5n`oaNY5Zt)<y&*e2se}<r!4md&4CFie
zh`5NGsYEMq&l)_HDv31WMl7uC%r*Jek|N$)^55NgzZN$M3RIVrw|$Q%nP<y13dvKi
z=6nB+XXWxKLmtlT3bBM0GuZdhi+r%Cq}xGR;HB^C6&)S-*wsPRg82j4Jp*SD1Uu0%
zVRK1?z-|2LLF>d8$P=wY)e-?gE5vBqs5<<N!-<r!YzFtCj<0_!d)>QTwiUh)lewAK
z#D2)mC8w_A_c)HoDuDC;mI(7Wv0c3^GJnq^YuS|DT=m3-l%o>n@rTS{UvExp7<t=W
zhkxl_MP%WtFqYWNJ=jcLx0bTw&C2~<_4!|;+n?Dl;q=oqeU%8GSoc9p1-nmKbjqPs
zy-<sB-*^Xn&GQX<+Q&pqn!KhJgXJ^_^^b@Yje`VCgCbDZgX}nw!bJ};d55Ax6P==h
z+DxzXeUjJ7@4@DuThr;Z?{N|NTz3LHrWNZ&*evtlIbO_kt{K66)$>dCMd*aaY2S8(
z(Whj+F_b`0No^N#HLC{ik?0)>nGM`~-W!hHk2kU++9nO>Ke_hksIE)?SeS8bYlWZk
zyoKTjBOdU&%o)v%|77uGCO=oyiot|36Z;GDJNZQEGR4WEFZRdjg<{0la{Nw>h&VPL
z>bi0_C>@^WY+_@*->My%tre!K;*YMKEk;i_%ZvIhT)TFM1$Od4EmFSao%J2U9~iGN
zF&|`n$yyOpKfzxP5+$cxj#?Ebul^EhDr5M8i$y`o>FzmZdkfM+b$g|onYEhmgHLft
zhl#&CZxY)<1J3;sDzw{qLp2bOlYQp$l$n%9sJ-U^-FNshaCXNsE4pU(bruPOH1GbV
z9<RNPfQhQT`dFQ39tO!e&k(0f1>Toj2)$4oyS|E&r7EbLCf}BMuaXumZ9;rsX&FXE
zD-Ok*NB>MdWuiBFoTPT&pfJqn00qYxb>3@2p}tZBh49A7Z*AO0U(=&-skNJw$6bmX
ze?|XMi8GN-d7oZ@h}&Pz0!m3`tx?woeIdhz(-_YsyicN{-IMZN10C@##-_BDcYgwD
z*(1@Nhu)7XM@RgTu4K=BaGJLX)-@H@avL>z)MN%H&B%D?p*5zRxsl$~_oyZJ$%v(=
zM?6452<*<$1H^LoJF!shoXSkct!OwzNVhZJusqDaq4|3nC`MSvZ_qw`4sr<(#i(^=
zocNMmc>*_6RAYz;Ax3?EkpW7Ll3h-hn}?9PoGi3KGy7oEKBW^BS_~+GseAE`u!ZMb
zRu(Iqt5--iHC>Lu0Mod#Frv+mgSMDgzTu4*aG_lMhEZg`zx>VH4wZAhln_IHMcryD
zmo=qKon4y^?al6M)KYBs4jAl1hbuFEED<<|>{?q3^4C=(`~Mtfk^5S9r0XMG9P~2g
z4$JPXxgQB5sGEFY!h}N8o3hHjS5%JA-(AXaIY8KMQQv339tmylG&Wt0B@-lr_~!Bv
zrET4{+$5~(_+rdfx@g$UuJ~|gN{GwyTxhe~ALV4{uQ3sSW$bo#>yJ0TVB*~p>YYN@
z4m6S^@_v{J^0-qA#BRQb<cdem7rJvCsCP0yt{J}KF0tYs_5I`h68f&_2*x-!4P)+F
zkr-s(7m|K(^bHRr+ls|!DA_SN7eUPUvTn!lC+8bR@7-rXN|cfZ(YNxS$a#y3p~8W?
zEG=hM4Q0%vFlw5dV2`8Bf*s-=>MQE-(<?ALMh3rEcL+_4GS~$^5<m=?RP1AOItM?o
z_j!&-M@{YXd^Iah9tD+BzL2l4@Ao)UbJdmQO3rOpA&WXG5MJWq0oN(D+Dig5Vna0#
zQ+bu*TJ;yJ_gkyAF0-J*Rixm&5dNT{ry%z$fp=zJ-_vPzFCT_o;n~p`#XODYLO#<i
z(D5bvVzXiD1etc1aJwnlU1xV0gq0AllfGWl<6&BGt&5ub(|fVjF0hQjhGroJ>+gN8
z(E>ZIj$`dH2m3CF7DFi{?h5k?<?MLBEZ^$vq^QMvT0*ttTG#>;C&(<l2av8yZt}wP
zx6~^}^X&VLvqRRW*()w{%3<2Yd>D14X#R$U<TzIKv7o@sVtunZ->W1eT;1-lc~nn-
z+e*cF*N|K5@!K>-Gl57mQ}vB6*n<ks8=1N-*&}~QzR0`tXcqFN;~BFN?Wv+cPdO^$
zG=xImx*x#DNYj<P$2ZnxDxTQkFBAUg->fpbnBV9nO$G^!MTBk-4I3plMr7<f>^~<U
z*!eub>gYWcLduGlg=Zt&TvBdrzGMdWBZQfQ&cn+G)~x;Z>uInzIw3qiLf~97Lqduu
zOwo*pQqMG~wZ9to`69e4;xN?C{q7q-M+$7<J6<kt$l0>|H!{jrI*x%Vr*Ch*-Sfb;
zKjB1&D-jrcDnRGUokA5Uq^XP`pCi~*rJ<k@86Ga%Manp#j*a7qi-~E{q`?TSUfM!I
zK?w>BJPLi{X=!QM7sE)(W{$V$wJiDh^Vg&0mg%ul06cD;DgOR)ipBr=>(}_m$OmR-
zv!-|3nuupGRJd<%w&33o{KeeQZT}M<!@mJY_y5yNP(&dS5i?U$hhsG70|wWtBV7ap
zgbV89<74J8{jzd$5z*0X?Cj{s$a({%RaKXlmsWEAa4Xx=^75nJ&r!z5#|;b&`UeIW
zHL9CE);QsJ(XcRnR#ezaO1|7HsH}95l$2CZP*C1of3W#8VjLJ4*wfQP6ckLv$;7}=
zSXjuw%xt$mU2=PI(DsFbii(zoX4JU6(6^nNzE0oL(&ORoI*gQma%#%Rz<`5;!^zdP
zY!g}9@y!-eAo-S`pI<^kLY)fLWnx%hAOY9ccU|rD>XpS+;MKg}znfjmbagR_i5EJu
zozf=`i~EL#U}IV6x3A%M(1_-+h<^x@MTq9BYnO!%g^}>)=HyV*(14%Ub5>0i8oP5<
zRtyXbwzjsWrl#~L&tANkot?$O#VyO6ueCQDOynf$KqKYr_YfAykjH=dVy~dA?6g3=
zs#<XH!^XwI+?Ow3ULy->YTl3MDCF;eY1Xd&O1)R`_j2o8>m(McZQADN6QQYiczB8Y
zp2=wiN_A~s(phCq8;isbEw?FX%?Mo{$!n3;JEIi5ybW7JDO2O)Jgyg#A|g~QEWaAy
zpxq-Q$0r+o8yg!b{GM7Brr3EuH#ave<|+pg*ozt)lie{D6vooi-yX^x%vPY}AxFl>
z8k?HVD(QyC!sctpX=w>@aFkS4;}R3|^YUC_i@fGa`ub@Z85<LM%5jokR8(R!G7R<g
z$uBc37iu#yGaX=y4ZFL$j<Cg=ni`w(!3=H|0(yFSi~iUTw917BDT58%ZcjO7WasS`
zTU))||FTCMq57CmaOqpwSdh=^>U-<!>w9~1r9!HzGo__W3=l91pFVx^Y3Q%AS_1FQ
z(hOmiRaBfGuXU+frTzKS8Adwfl8};8R8;i1-h<`te(&w=?GRI1T3Tzf_9Di3ZWqnW
z3e1k0f<hZ#kgMa>3)|%1)m!!X`THPdRIETO85kPQpuF)#MnU1+6+~23Ro&U%zPi4y
zFqZ@OC!JM=Jp@MU_7av7AK%LtA)FS`vmRYg?outDA%A*$s@l=p*B2EPHG>-*6oiF?
z6B-nxpE5lu|Cy$uzP`S|xW+N7q~sWkS7l}8-eiGU755#&*6DBe{jF;{5a{$0BplYu
zBWWU3GRgJeio58jsdIXJdzJRkQBdsc>_8e|Vq^P~qNS=zO+nEi7kfUl;S_=)FDD1N
z|D>gryyhhY)(SX)QM++HJN#DOVr7(APEHQYYj}A0^767nU7Kh4>2GW<E-o=KvHU6|
zBqZ=(V%6cnL1|Uh>&=0L!^6XzoSgkK78aI9x9d^ch%%!g2KCB)5TPJgh|0i=OxDZI
zXr1PkmRj=it&N{RBG4O<5)-SjUV(zK)zMkbQ!bj->}_v<%fJvSVP|3QpHWj2x5izc
zvWtd(d?WA#k@B$X;^W7UH#axn0$5pD8MW$%$Hq{QkaQV`cd7i{^$ZNs<Kqc#j~_w2
zh7obLmUOrHAoLiV9L!azqmC{uEiEiG6fjt~TR%SBf6(uIOG!C7If?W7wML!8!0aqR
zf}*Bo0f>Rs4iw7B>$__^5DB}xriT(Gp8l6BZT{G_O4j9zrQG14m6a7|XJ>nRdunQG
z2M34!C6UTG;zqATs&|K+Lk3Lf#9Zlxh0>If6B85n_xGHel?kURs5m${;E3tD?d|Po
ze&ecI(wmC|Lbj>?{{1YEVUMe$)TE@O^z`(^#CcyNED~N9U#S#!tHsFzb=3|Y9-hsi
zl%+#?OiavA-(O;4VU0~pY+S`mnL4hnu4YOn<z{EUqoy`7Hg-DOmJ7vtNI5_Y6BxvL
zEi!ltA0n(EFTYxi78carE(l*^U7*NY#cj=pekCX<Xt359lAN4OOb6T8s4y9$^m6BL
z8#+K+N#;j?&&I}9=LoB;s_Np#XtpX&`G+3;f5`ukHDb8s6xdQzS7)bQQD1K_xIB-$
zD=&=QrKYBW0{X&K_y@1OBgD5%OtzExs;^$XLQLJ<{9@kD0j^R}@&4+Vd~pPx&+DGY
zOEUKTM?t~#+}uESGCyb>w<CiV1pdM2)cHxO?7Ps=P$=|qW?PaH3<P#jINamML9D)?
z6cX(n9Wz<RCMNbrBpkmTza>)P{M}`^=Y9kQF{)R->~i|&lPGbL$*gA4#l`P0qFZ$O
z<5^Lb!r@ZDR}B6U3VQb%`C@i_{IjYm{*u!_uZD(%pgM>%LLl%67tfw?%5c1WWwKcB
zOh!h=LNL(Ng9NjNYXS$4++CmUe7)(8AP3p<IQ01up++Qm02J!Y_$+zD1PcsB28G{+
zzQ{=-5{=@jnp1jgEFLT#E(wm4F+hvQlTDz~CeX*`R*2i|;k6Wv&@abxa^KA&l>FS>
z-Kio{8FhGm6k9C;eEjVGc!TebuQf}Z^f4A8-;|oK|Fc5y3C+zfOsU(H0c>%``6QzT
zsfy;<H%GzW%x|__qqZ2E!hbDbX}NC*Z5*omFp5wD!T>Kl4exbw@#HNsqZ)ku3(loH
z!9_8PCfO{vTP<Red-2qw@yG!BuvT^n2{|YkR$i{I^3tim;3W^Ed}C<5v!IfvPx>HN
zUJn9{cd$7#VH$SHkL`m|8t-O(H@}9Mnm)ciQWn~~T@*uFZZrGyTYW2X{`%adUv%Uh
zpt(Vv<b1N4mVHA5*!8@J@4`2sKI|+74gtAE1UjoF0Ja(0-}jX#W@dgF(;gS>Zv7k>
zklM)PGm>~h=?`l_(0txBasD1P<P6C!EV2jc$|ge@>4)~<VHMYvapqrV@DJuH_fS^R
z()HV#MIxuSH#H?BPV~&nFXS(ERkHkeU1EoBwr30gx&UHLKHu$y`wFNsFDhS{)qmOv
zro=3LpNBLx;Ry&)UZcR8l$fyu$L9#r^PnzIWLta&dCPcvIqmAKisUQ%aRi-b5`Ozt
z_caM+)$jV!S}l=Jy1N|us1=QXjMN*jjn}EYH2$om+wmHKyblu3!nL-cS=1@qsl%Jm
zyL+R*MFLpj@%etYbIQwuTPTuE$sDdSU>xwb-*MI4L*AZU{=RWc2_%EnD}4?};@qL6
zqhoO`z0S%X1+2;KWh4}_<bgH32jJnG7X(YnaN9KCN`zg1d&fn%0P-qx0*x5euY~;N
zBpnH>sB(#+m>lLwR089WX6O(tot5PmGG79dmjp=>QOe&jMn`1BF>pU2s-le;Xw%$l
z!b7vO%YWuq{&c^I*|$Q3aHS!+N@TG^e4X4WNSB}gJ&|a@YupkFK(j2a1snBfKOnl;
zax(2m?OOss5&CoLkGum(ZBE7_<I07D33YDc0fRZ0Lze#JfNktHKRaJ%W?tSI=QY34
z#SUOJ!nED!9_9QS?zQB6Fys}!L%4X+*WHH5|2IZa2V3WTJSLQJ%oYQxFTAZD`_k>`
zjF>H`M{t+M9Ro_*6g@e~DjpC-k$$)3&rALk+gDcAIb=ZALUqRzmZ<!Y=CCkWJY{9K
z6PyX=BjNJ->kpXB<gAO1xL=vUy>0dcg)!s}nxO7i8DCg)rBPGx`b*-pzQVpgors71
z;4Y&~Fv&g_LR_ei$;^FAigzKY&;XlCEM4>LEL7u=7x}cJptO_zoT@AMJz_&dyH-=<
z#kc>J3FNc7DGr*_3XXNCj_AzJvCyb9c<tZ-=Yq4s>w2+F{B-$jN_(VqoXZTQAi8W^
zab4`KyxZv3FrgUw+EN~EAHr2_sW_T!c&PiuU*PFGoIDW8?@m8(r*d^{_TzCd4z1EB
znbJdCdLWs9%r<dhxm{TmkQVN@TJF|e!F>^8;MR-mv5LhrLzz>V<6mhT`HN(w8*R?1
z?Iv=vcmhBLLMTw2X6+TfqS6FoGV@*cp{hZp)vY?0_3GhwRKgMwW4IRhp%P3%Go_->
zF^`)iqh5|upB33fCFC%mMT_h4A&)7kjkY&!nhSHj>4P`<`x<x>w8qQR$=0!wnJcmG
zKuX#g!24p6>V9a;12rx=wXR=#;`U@}1rzOuV6B78b$W^L2>PP=tX)N;mxK9I;<=^%
zQ7Fn0(*D+u4H3np#FkExl>{qojSxpVI8v~2AwtS6x1u7w!T=mPdb-XdfS5XEb$Wyb
ze}uH|2BXTaU6prgU6yn0tRc})dEl)3tmN6&(=5`KMdTKJXL!1JgmfCZhW&P#5J0s1
zcEKJI>7}Le`NesaB-WD3!jYbXu#7@Bu*TKOoW|j>&|&9TGa~!n7LjcmFR@;|Dy<l|
zu`3ZqywAS5^}eP^@II?}LA1#EbZQt54FHT5*++i#KRkd%Y3PdcD?%^fk0HQ#mN<m<
zr0e(8-5+Gs3cf`It7UBTW=wE@-JVmDNH!l5O#CxB@MQ4rQ5IL=8olp%FhNa($~-Y$
z+S+1a2N*0h-*65^mQ#H>RcF-2RQP0{M5@9Db;`?#7?m2{XOMEY!vGLul8K&AV87vp
zTB^A|w)@-IyTPsPKEv7v!0&%Wd4+9Qvd=sC<wspFu-=sTZ^3<h3bwD8A;Ck*9ylqs
z364^3w6_fO6x5WRZG_|K_<Cg2)ID`KAGexWIiG<-zs&X0($&?q{we(3i>*^Q43zc%
z+`It14gde+rK_!@l{PfAM`uLs{{cPLswOlvG&D8wljvU9hM#_u+5UP{)b!x8+zfy5
z15}|Ttfu2_{^%0o;s6IgKYemMnDrYtIX~xhIeV8R-9<jV`0~&d<qDLK!a(@}@XB4!
z)|P4S{P#zn!4!TgbMt!7M-Sg{0AB(Fd+%>AsiYITVJfby(?eJbpcEbG?|=6?u(tLl
zM<J{D$G=0iyx@Nz8~3Hqdv?qD_w4LhvhQBJcmY6-QHnjN`8n-2%L&nMLl<Udu0chZ
zw1;bq^&j}RA3z`gK-yYcX=rI9BO^hP30tV^GGHPkBm~H*NUNdOfC;=yM^6u4DS1Ap
z=G$YiSZgmKC3Uda;0kI~0J#88(6<^HA7=sBp}@(QMNLg@Hui(QQlUmqeC)qLx&wDA
zj&5h~R@=qd*_*55wfr9dB&?<B90~o07oaPwOKWRuYj1Cl-}yvPTf6D^?{Drcl{h8;
zKq+B$dH^z_qoOLff+`T0SXm2la&)C0FAfqC6E(7K5N1JTC95*1kTZUF=Qi1Xa$;*}
zXgE1nUCp7Zy8?b*Jg=dHX2|#T_05_7JFa4_`mex9Un+gX*nsKUsP_3R07!yafBryk
z{Ojx8<m52Tlx%GQqB{ZO&E1HID=#k(0GGu8Ha0du5~yJDprL({%FoaL_4DUV51N+)
zD4yeMYMjNykZz@a=j0$IME(3}yVB|hc!=iaX5}I+djn8~M^;x?SI&+O4_}>Zpj<k|
zCnU@?wcP^v(d_k<dx3kHrrQ}hS78>DmuCjfsHv%`tE=neR1L~WXf~*5Kn-a$m>3Zm
z$?bk~HeX{0Kv6ZLH^#}?nMReRCSWwAqz1aeNR`1PEJpkJ3AwrPh`@oee5y!$XlMxF
zRnPO?iB>-p5GF(MgrubWU$<pRE>dEzTxsB+J$K*(P=u7v&Dh9@3g8qfDt6sgUy(49
z4{`m@r<)cFwNZ-GZEgC1`pB;;VDSDC5P-*I5CA5-u+UOe6wx(kWMt%%KiUQ&IRk^`
z?syJ>nm>R3{Qmv>v=B#r4PYL?`wP=%%?3;>HRaDb9=AqEch0<?B7nP!Tq{kid`m$g
zmB2<%MI|CA=sQ({iA*&2ln(%ynQEJ~tSlphK38XFi`jCdSB-Nm9?8F#uTOoS-~PYh
zmZH%#BiFXJF4wxy`2?R{QNDfK4&a+`!8sGN(V+R|=;p=c=~u3Wv9U6+1{3}~fjbh^
z(3lS)WS^y<9JyV5fO$Up(5ARXUR^n{v$I!URI(pmTpWsi;P@BBS={7t=wnG{Yk>gT
z2&|5#yAzbhgcrX>wk>Y2Rm;ABAq0tHl^7B3Np2Ny9Su48Qy2yuhVepi3gf$XD&@uz
zxw$lcP_Uj7xg8J3vScu!`Jc=}+xCZtWzCVn8)IX0HFi`X!umz;-@X-8S67EZTl@Rz
z-o4A-kaKZ!s|N|Hyu3U(I2iC0+Mf3l=UQ+A7z^R2c3XoDPRFZ1u&8KgX!P{-_74sK
zMhwQ#(>(B5a1K-Cqo+R@OyUMHosp5z7fpY9d^}TTgl=}2CK3j4de-mX;c;>JU=lDe
znn&i>y23<42!zr`w3<8s_$&ad%=R|k>(}Gwp>P6-2a6O~b4X*x<(0_5U-QNn;1>|!
zoL?&Do;fhvNl8gf{*p@*hWM_ot(8>e-)58{PtVSh`Hqf_l~e&%5fP%PxsYNJzpQfE
z@Vucjl$hILe|p5S#BzElAwHhW*WAJad<uLGyZN-NipsRoiq%phy;i-7qM{-Q7(p`K
zscQoxqcY_5j0}ixa7ai=6(uDl5vxv^;s++C*3fIfr-WgcUg{#j!AY{O-);28l&}=$
z<$<)u>#&a(BZ4-R!v6?X$LZD(BN!~EI8;<r#8hdGX>~QV-iM-~7M-s-=x`Xq?CbRa
zVO^hYfgDInOADwXOlXmIQ|Fh8J3oNvwh$qVj75#^w`9Hmu5uvjxH?Tv!2sPs^t>1$
z!P;5)72LNV%kFEy5NJ2JuyS)JKvTQByMd`DKfhQNEE>dAKxUO7>*Kp#?9bHJ)&h)g
z*cWXxUTL=_?K@m)F?Rw|ovkgv_#DVrS62anfi6x?f60l7i3ZQdhy9r{z#M485aE1>
z5Ai+gmR3Lnw03j=*6(kMP*k+<`AN~y(J`Ih+$^x~mM|d;(j_<uV9<{CcJK)(6sq<e
zlZYrkBSR=dJ|rY$D3Q|#;}s6h7sl|!L>{mN`P^^7SxwE%0J-{}n)(N86_)$kH&<vy
zmpjXjP6uHrSz|kY{`_GfK#j4n2eZV=!ZJQK=KA=+`=}1<SdPPKKxZo)?CSD&{qV8=
zViGWhVAv`uDnRm4sdJ!*cK7w6fHGs7;@O8SkU9@mR#L&vz}v|JSb!Gq=YSg*V1xur
z&B-Kk*sQkya1wzRfV~X>xd0CK59jUeWRC8%ez;I45lz=p=wfbcY;A9kjRQnRR05WF
zY-~8NZMYPWu>&$QHvz}TQK&!(7+14wILzh}UaxIH;+UA&Nd5{BR{`uO!!eu&_-tRP
zVPA2{5S=6?R$)Knb+@ygjg3vqq3SnG9Gqlc*GfRBghJr?K;47`!W0C>q&l)+sqqNe
zT`N2X;1v=<ynzxyuSiHp$im$GC<NgMf1PLLFPA__OHD>r3WzNT<mx2`in&!QNbzMQ
zB`ubcFP`EfBHAVgL^Ej8(9zK`GKMYmVPJ?C)lyRN^OM%0GAv6gDn<#Cg^=>|QBXXG
zskp$s`e9&h9;{h5jdGTon6k%}mHkFUO`HfO-~tD{3u26V+En~4+~Fk4ZCiKhRcR%4
z#g|VSXtomY&Xyk8`xYm`7zz~Wt(~b`)s`?N4*efBmIu_v1Y2x|mv4u8(d*lwPa;fl
z@}S<9=?D|H8xw=o<Z0-W>ctfL;TwZDcuT8kV9n(I57|1v00!yV9G!5rh_+hR*smXB
z8_#}~FS<NWqaTY&26|j`Ch*7rk6gm#=zfxCnrYz($)WqD+zY7j)h{1lYB66V<kMZW
z@eMED4U||x@)0?JP}eao5%lLe6kJB7hBi*HqJqPJANlHrHUg2QQ~$Dzv;;T$F1F(C
ztLGX$vaot416nuzyROW#&;xF~rx*g^r`~=4UCuSHMO4LulwWRJq*y3OjNT0dk1IQC
z3M2A1RY(D5BVvIW_N?d=;*TFc!x9^tOlleug6!M1i|~S*NFQ8pJ!<<{P%trdeTP%O
zxf-Dj4Y}^HtH{{&{#n}FHBpJn33^IEfR7(`;TF6kLWvTRbZVwB=9x@9--7oI&N~rT
zHV5DNSS;n<ao|@JPE7QlD`zRsxai0Sh7`qS=iH9>3aBR3z4iEQrM7)QOCn-LL_z}A
zi0T@ZTNf@xr73==8#KtT2L}G4Vz<H9cKQ9@anZncbki#VwBr2ieAkB)l)pBvEkm`z
zhXMugdarm8Y>{P0LCFM&cF`Xz3I7?FC%Xzt)KF39ZZ<%&h|OpY=y5~e(Oz=reT#PC
z-+vxO=8a*>y7clq3KM#NBN|e5OYx7Lry%w$BDxkBFiM`ds68#l1)?q{)Q=(xG4)>(
z@OK~qSL8R5e}MZqmRHztAmuCi)>n4IU;lG&6MNw+9Lkag%g0AnvzcpV{~9Y)PCKW?
zgV=IIJCR~!oy!JcMBOl&4*9Azu2)YnSc(Up{R+)|0)2O?fEh>EenTE1dcZK9OO4hk
zNy)sw*;n3whadV$Wvpr4txaov-BScH=Us2A=fx3#_j+Z;<Y;sx!zcoSDDMEiPe`3j
zxYX*S&Cj;_{pfPxmE(h+G}7))ZIf%f+4To_IYW0|e~5^S{BAx&$~S0PoY>#AhQ_Gn
zdi-E#qse<9D-fLfa~?>jh>*yZT;P)d+=c2xT4jFym#tKFU_&TYB_2_FDIfq&S2+AF
z1B@DK>D&TPD9^W*n@Fu&8tJ$6uIDj<;WC!vQLs<-)JP@TEzdUYOADV(++IKjA>+lp
zp#o6p+iRlo_0NkH`Y@oTILTlcU}gm_HkGEX`QvHm0sDw=Qn$^=tTB*eOjzOrx`&eX
zk5dMYQtPHv+f-(i76Qf8OLz1<dOrqEFD+Hcu};k+X|a2Z>(qb3`pPEVba25*c_jmX
zba5e!cztzc&G=$z<=i8Lr8BE2gU~^HVc#;0g69nr@T1&cJQ7%ZIBqsJYbeO;Tp>nj
zCf(n1<p*oVy;5o;RumIU7bmfkg5(?H^xqUB*mHfVoD4jo0*Ls*^9P<ZFJRWz7%@j;
zW2OjQ?Z6ld)@~OgpM#$2!_`rSK{p4f81Z1<WgW>YUH(^sJ<fmu`t|HN<SjLXl0vM7
zn}~=f*pt6gxXH(lv$MIXjxMaTUprK?G+`%96SsdQt9Fd0)#Giz&r|tVdh$Q@5Fyk^
z$dwsCHg)gnMka}+UWI-*I$-Ea`*0dZ8njBrLpeuSk$A4KV1oV6*{*FIe6$x%g%LZn
z=GJ#vUMB!bbh(kfy6G4vcQamF7{*I@^16ceD^W>^DCw5V%L?AcBnebG^ihAV8}Yq@
zm~mAj&K`6^yTKKsw4Wo|p42=oz$ao;z#5oI0_-uFU)JMfIKI(`hWO{@SV+1g@y@Ch
z88WKy8O8MOT5;fC1?a!zxh*Z|9FpVXWSw)UZ32lB(6dGi{F-V?AsFIrNvsBmVZIl$
za?D{G4fj8R`xtPx6?2oOf{54V3B3fnZG{DgI$1Q+h)~~Q;I(*b=s4a<jG%TeiUBWY
z+o;%A^&-n~ogZ;dCDCDeYRqJ8(QE{L$r_()kRZaN+x3O1tDCDjt6Nca(xHQCT%MH8
z?#k+Tn<c}f0xp6M^+;4U;8h!`V1;&sn!j9}3df4=x!daRET0jpCti-q2+3KFC7U6p
zQX!GrSKM5}s1{0bWB=vP$yenG1ovk)Q@OhJ4pzx2s;rRuW<zIlt>M}ao8-0)cy&Wh
zWnNAy(73o?eani>vU&?eBy1isWVIc!bmS;!olS`iNH_%+US&&4(vxJ}>>@gHp(Jyw
z&-cey-#kV&zK50xrxT*fo0z$A$FyuM(VA`tQ*x>z+2m%Y`%ahEkmvFfD{RwFbYx>d
zfx9(~ppc4ONR!3&ubVk1XyA=zN8`!QL4^TkejJD|3E%zYeoO;yK0&lO^5_(SwUZI8
zNt;?F`7ycgDCr^BR+E7EPbPtnE`W#!8T7vybB<tdQXH(XhI1Y2#%S;k!XSsRQ()J7
z<9k+tP%L9^wtZ!7M{kbIMn+r`Vr8Vw1CngWpmE*{&4CBt!PzR}g>4X;nB_1#_<D^!
z8x#?AV4ykh@*Mj43*!?apcgNP)WzMOqC(EzKiu<$QRgG8HZ&9Qx<4+i^|wy>t2JaN
zSD1^eiXh%&-%i5T7l0iFKX~)IuuBu4JQ!_62;hoT;K?i1jVmh%LS9x=yuUmw&)6{b
z)YFO*oxkV#J~BQi%8Hhcxs!i<aF)og;;BHSc3t^np>kp^a14!f{)48x_iD*wZH|wO
zkfG*OnjWcg7{;py82N@oUoJC0_AKg@#SDt1hn(McHBy)lyV_)biFw_zXV3L!`FhyM
zqzk85;}Ub|;VcIdWW3*i%-2`cQ>5d8!kJ1*zit7b_!QjWi!KaD`t5&nz}#)UFJ1f8
zHAk>CnDHIl2O#N#Ur(5L?^wAS8SyPDe3r+*UzTDQp2(dxf=PMGt=X2T0aFtriMksD
z%Y*d3Izyks+lTdWbFMU#+xX*Y1{P{o6i9mZ8y}2b+PhoVE@dm*$Aj6SCCYCSjw)^b
z#Z}XRPl!Oc(FEF-Q6;$UqszD@oj3fsD4MRaeL=Y7PII_Cd|cUCWry!Za=sk$<Ng7-
z7k76}&QZ@m_?zt!l)O!;e5<pcs9i^*m^XV*tu88R4BR)-*l3msK8?!bWR)L|_WNvq
zq$p|$$%Xb9@JT$34vSuLJG0YP<(K9zwi^6S_l<qbxdq?&>nw54v%%DnRnM;Mw9#nG
z9k^bBH*R{bch`ksAvNGfcHS9MW3r0kLin$E_w$QBv_di{<nWpYy4}CxtbXAqqjlw~
zXn!v-!B@w|Su0tFXIWS?OZ$1CRRO9oJ}4g6H+&2>C$om4m!)$924s;fG+^F!v!W~1
z+9bOm6ic~0Zmmt5zknwNgs%oyN&6q6U55|3(IlNs{O;CTbsZO$aYW~D+&3=5^Ri+X
zQ@HgWtwtEf?0S36RQ|a~KI&P!q`7T;37H=Oh>SLsjUEmi-S`igXng;JXGc~vpxvF7
z%$J3(L1jg^2)OX79k+ldbI(C*$Ev<#7TV|9uoi5Xg%|vVDX#jqGFs=3XW9Se1=o+W
z%aY5K)FB>sa*46~W3=2fmzgW)t49Q<!kReFZp+J)f)-$q2UcC_#4wBVQLbiEK<jOR
z;F}sM?CzykU|QgE+x-Y^h~#xftHiHuFmK#Qjs`G3Rb)kw0I-1p_)|E+r~k6pH0-%0
z3!ZQ~T<&k+I(2!4eSg8VK}E_p@$nqByt2@W!W&&1nfv}31b#fvc5!OxaiPx9NyIA*
z7&jj8VV)?s3;-PMUGxIwHzYWih={1RVUwiAgQ;h9^cCz~tyEF(H72=mFy4nh_qGkv
zc6McHX={m`cA-GA4!QySjD?9wjl;og1i8q`ACG1kYrZ8y0Ozvm>+iNl(s**U)z!J*
zzaO5NsR0;DL<$bb&amS@X=#sFYhggp{P5w!Vg-})$+{m3?qED?kZ{^@A$BuD_$jZt
zwDcfQNWFc05YULa_bSndINnfDQ~)c-MbHy?p!@j%TnB6x`u8{IYn{hysh<IIjA773
zMn`Y@y7P)O{wdEB@Sy^&1~oZ38{njIGn4!Hab>o`jF8Q|yW4mpwBff1@Vn*=Ci4QK
z(RHQuIRw&ZDJUV)2b2rR6ut(a<)$2XAA)Zo2lRx+QX@Fi9-zKfJon6|3M<OXHL9(3
z>)5s7o*>#bZslZW$MU(?HZ?tlLq5$i4iLh_!vhb>!$H;35i;CYH2|9Y5dkByHJG%w
zyj<*btVh%a3=07P0mZ=f!ORRi9vvTE9hCulZQK4_RZ(_!fMd+k*Tm4!!4%I2PQbi@
z=8$@Qcz$@>Mk?o{<&U786BK+FHM<#-cWnX)uT#L7aN1EONe>&fo(X~x6t=WH1T>wG
zw>L049EEOZdw6&NN(>0-P6$u90Nrn7Y;K+itOa090B;xONcRY#qjTFC%_uG|26qU`
zs%?z!>tx-5cve6RU!I(pHoaRqhb=vV189}<yZigwxp9X1faLUsgX8Mq{uY-}YyEVC
zo!AJ(1fUD5WwS&uhKDe8#AIZ&t1OAN!2Qev&E-29ajo06Eg;noz9r%s=l5Cl_xB%#
zX1IeP19+X+<BkKgJ6SHr6SZ_0FvZZRGP#^>Q%FQF6HEAuii-;i3ce)en;#$l70XVy
ziwWG#)oyNXfG!23&3DH){2!H-K~Q5_ho3&#1vCe^HQdBLE3Ut!;NajO;G_)S<2iLb
zQG*9c03b6oG&TPY5i9F)Xa+MHG1vI~e7$}b8o0UwaCIDjnwyz%p2$`Frz<O3nk=#h
zkOF@>SakF*Zk%Q$Tdn1M%{nCw4I<ZQry)Ph?6t!~>1ir7M7nP07Qn&Sf*A)y8sJjv
z^>+a0O$+#$ov|!sW#u(ulq=lzdN^H8kFhE%ZSXcp0-FUB3yUv`{WI|xkCd>`P>-84
z6GuO&H6TK888nK^%U`0SZ;hC|j}l)f(MO2uuNg_<aR#R#)+!J9Ym%w?y7SY==V_?p
z`HmrQOjKGeF+d<AH63;3Dg2IyL@)EU89eXL|JsF0N<P5ikIv8k+Lbu(0So-sP$LH%
zMt`KGrGd}w`udv3)Z6&UlP7?18Q<xsb0JPHD=P!!FfJ`TSd+iya{y(9i;KIZNt-2;
zVre#+E*8mVKHXfG*%gdmX0z7$>(^_51Qsix7!eT>nyN&DTgSMBgtvP|O<)R-SXPc%
zK~w|6ug#Ck8_t%*2$)oWxy)!N`5^Ugq=31@f7uE6!DBSvZR<YgSAVT(SCbm1rn|NF
zdtdGC0b%swCEj}w98C{5K~@D-e$rWWfa9*KlSyDhg{e463kt69PUHa_4&V@-x>}`*
z9t~a@@;3oq1Qj*p=;#PcKcH2a;`X<<yEpEl`N8E2q{;$QSBMp!8?#RHH?Tr8Bw`vp
zA4y;;&z?W>#|h#~06wtSrJ$hTek;ZEuQTrYx~8sf4O`yW*!c73&*I|ZjMaCUYy12A
zJiNT%W|G3ghl84$wmBX=nVhTt2ga3Qugh(+1gp#Dv$63zHa}?U_Rh}1d`;xN$rc0x
z0eKn(5#X=EUC@WM0Q&Oa-~i+!Lj!~Sf`S?%a=CY}eKA7Uc$ey(%S<P7hlhu??5?G{
zEM`iDWMr&nN)4T!3!KSNmhq}A0imQ%bu3c~xR6ZDT0qJs^CcrE-`m{<GyED4&sbNt
zC4SCyZ?4j!4lG|lb{ZOPfLXwVf}Am(KRvDD8y*#<2rNVn4j09`Z5*b+zk?YkSy@qW
z4-81o&cKEQx&=WNFlVg<mcuu`9@iT&4s}B)fFuP*s4VHERl7P6de5Ifr_Tc6b~mN%
zxncAcybIJLu=wxHe`REOG66|QyUAn0_U1oW*h}Zw(`kDspu7eK1`1f_7d?sgKOn`&
z$4}4wC#MVE1$3*7thkI!*JAW9Q00OUQJ?I0LF|vBRjz*4Ob!kP=FM2(&3R0~NlY|i
ziUVYMWK4{ag{;T!PKsp9fHT+$@}C0g7;v|HQ$<FP%@rDDV6cO5=)v03ZQ}S0q=p2r
zg2OO!3ky3JOAm{B)#@iAKY`U9nqBNU`u5ch(3%b|l5p?t?f@YUSjy|Aa)Aw=$ex#|
zsNhDyYTK}@<GqihuI5YuzDKYRfLE3H0V(%jQQZ+w%x*~p?H(ID1x`yz%Cgi{uLenk
zDY{Ga@RStNO0}UR?kUSIX9yb`SlNwWf9cGy|JdhD8CmmXARd_NnDJhEu+5I~$9X55
z(gDpVH8m9x0&>-);JyUfg&vS~_V*5fm2iI#joVvXRJ3`qlE=HWtn3q_pTB<<_V=(b
z^a~j0`}f5QvCgU4*`i`%fE;`hGa2_J?i9F(Iy*DTQ$A~Lr~Wfow6u9(rvSupXQ%Lf
zP;ZHTSLr4VH8sQ+Y-g$pox%7%7+fxA#ugS9dU}6CL(y()+Zw6yIc*Jq$2V{3S9@0%
zF#DMr8^3+~c6@TO(e?7MKaLqV@TTV*TrdB4l9Z2I#yG>@S_9=}Wt2-8&Mvvf0FcW-
zOE@{z)|GiQK(-ug`XAZl{2DJWFR*7BX>$WREU@=Q$Hd@bVKIOB0LEfP#j&NO1xSXU
zX(pzpufRF!WdeUjMrKJROlHZD0-4al;sDemloS;A3qx$>bN7d(4hL!vr0upC{fR~=
z_rJ10kUnSMa^3|#Nkj-QFRzB$qpFj;YR5;Nzt;#tef50e%jIetRap?{Qe<I+{nxK<
z4|mSsd;QT#Ckr)$FkbZ=vDsb$;TPm5K-b=$@A*5@d7FWy2h57RXQ5oYdyzAdwjMw-
zBOxI{Mn(qOmLXFdNTet@bj{q^4nW%D;N(15YFYwn5=c%2pfTy?OGz=Yme3H_=;ZUB
zeX;*SQ6FQ)N^Y)pfCgPjr2;iSM>^hbz(Wm8ng{#)K)0i(qdP*|qB_f$`64qrbjk7X
z@Br9w4%Z91MXxhFAff?PIF{4y3ow~2mYk`DpVps%1<%jl1au{b8!f-~bzp)8PQm?s
zur2#K(lubMyHy<n5!&;C=c2Z{+6lPlK&~H|n(AWDP2Qd^(Ff|rUw88&Fb{*2-TaBM
zPC|w&1=j!sSyxw9O${d-+XZk5gQ?Rh)@cdGXFdwe69GLmNT{f+Kn7!FJs8UxDmNL+
z&CLa(0gxrWI~q5@?{C$0f!Oi&15LLC!0-li7@(P6!j{4uWqD(Bb4{(SkHE}=Di;J1
z-b-N}oi~dg&tHX~E|3E;tFjUY@>yFOEK5Rg6gIXWI7kJEny{uv4`9Ol{{01I<PVJA
z!9gHGGB4VkzW~Sm2HPkXS8YuVzH6V(doT(b8X7J)c9h2_V3lcmTvJd|W)>EPvPKA!
zY1TQQc4fPuc3)d!088YFmn>o`D8Gw4HN8WFLP7?HhPG7f!MIpEEz!T(s%rrk3cRK&
zRwZ?roZQ?^U=ONmz`vpfm6y}W`VZh8?HWo1lA)&a7p!K1K}SV>{WYMi$3DIc|0AFC
z6amfc?#f0-=QnUWH<p}h03RqYIxZFK`T)%|e0V8E{?(7K=evq-PxqdKv+aU?cG{~U
zJRHLhs#;+>0lbtdKG`3$!0tjyngYJ#>C>m?{!7Ed)}T<XU)w$YdkhFDpxuFV>4ShS
zEhct+c?lL-8+Z0%TX*+6R@RBRxdibHU^8x8ai2QgjR$@3L}VIFAq&QSl9WX%C9MDz
zG&cTK4wk}2-~KEqv2o<3O8fo$H`v3~b9a$}@nXO51RozCzzj{Gg)Cwo`+$U&oo!sD
z+?SV_!sJX=kg5i)kMZ>B&|wi1lmB(o$M5WP+tW7Z<nMz4h4F7JHQ=_@R+!<^YrJQt
z+KUV>7kG*PJ3OK`5PDVs3-~w%2Zz+~_qhOjJ&Yu)#3)1VgEYwX7{GQte!zMPWQlmZ
zk4*z*@A13SZa%7im*N`@8FIDM8xA{2_+WF!xS$Bx{w)?Xc(h%!04%Ei-t+K}DFltv
z^P#s4o{|I+;uBE^+SZTwza@*pDaXToe|z;zH)AFIbX5K`AO@kL@=!_f(iqQ@CCz8n
z8Av*!-ZB_U1ZbR$6o74{{*LkU=Wm^Rgo9VjQIy{xNPHhvOgPr>IO<x84xPz;^@=QP
z?Fj-gfI+G<>5#FYO3P!oGp<i2CR!0RKARDM*8h(yNNq&!Iq_z}U5B9O&-IEWM)m(-
z3t^xMCK~>$zTH0Ze`}pn)ESe}42&Gnemrnxg=QD8`vdCl_t7(kjlBQfdskUIYCUBt
zN<U?hrEFf8@TyXO3$fkN36Kq6S+SAj(Z294CTOdyl<*Tl-h$PM!S&i2*1vM?%=ovh
zSz7hXRg*WQ?{E9g*n%{@T?Mr?uSTNF^gxHp?ke1VT654QN3Ok=b2ORopwz|vUBACL
zrj70G(}Y7lE8o<{lVox^L<rz{3i??<JKDOu$MxiLdGH;AE@99Z8qg>#W?kuTRtOjK
zuMVed7aS}*91Ij%9rlU5y03xxa`2il{Ac=0+3@65oy04yAXc*$Nr|<OG@uu*VTxPn
z^CT~LNW$NXWBn=|nV9d(q4-%IYCbcMIgt`deHOJUXSZ(;$kh%i_lqS~1tm2NwZPRa
z)_X%W>6<z?UyL7uTz19}etAPh^OB7&+#6@9&KkX2xQZGzac<qN-%}e)gJ0X1HprcK
zt%d5pth0ANl~v!nFj6)bVWTkb8pI56)p_`DJldnB8gBvoGzu_n{_V9CXDI6oeSdTs
z&*ypI%(x^9x?zFz1zJB(3OO(SqkHXci!wyDW+~+5XAG#%S8R4V!nN8PnUn&Bit$?;
zYB0;FP*H7H0q#6W*@_BFPlt|O(+exde+KH#?g5zevM4;A3W-UvYLm$*ZI3QpJ)iOF
z4j3+2BNP6X&IqthsjxV&#zryMUt8iAyIL=KylK=<OIetwp&}nl+f?~4l8X<Sub)`{
zlxmIP>gN%_4%WnkxnICT+PCAX9JWd=xl8nFti-27lfFNexZ9etC5?cG5;*<sYI;Y_
z8svT$lV~*^lz0b2gkTGCGL!*H%GnQ_N&Yi<I6%`uQqr}PjGUO^na^XQpgo9elwD(*
zH@-~#*bzO@eEwHEup#mO$o?jhMt56xJEyZe|6^Fquc@)!Fbwg5?#G&_cX-wLb19l7
z2bTX_g6Ck~yIx?V0A5jWA`dFqmyKxPC}hU-d}MBPI_S6^>aagA{{;UbSKRi~%!`Ba
zMC|{Wk*nah5NigFqYhSf`x6BC+0!p47V9t7v~-0)586~2x+Jk1V2pib-JiN=7<Cs)
zMfL}e^D1%WPvZb)&ML1y@X!2y&nBR%v9yici?Z)&FA9KzaG0>?Zu*sGr{TiGexQZf
z-`V22vs(m>Z(LO)%+bm6tV>#Qs*d;j$kbvVEcTjUcy-|U3#%cxw-2S%tmKTV^WwTI
zo=+_~%`(@*-ANPx)drp>qV#^Y{?d3n151LV^8ySa5it^~%4|{C_?x<g`<Lw6VIJqV
z@VLNq3^j(0%#j(aR7e1aMP(tu)UfE1D@&jR(9yO~*{9;`j~q83>g)$KwPulNedWo=
z&B6@-1ouBVA}d0L-PQ~xNg5X$J7dHc?At_TV6Olb?Z)oztZk0=i@oP0$s<uE<)|TF
zfd<0evey|#Fn_Gdo58t=&vxD2LY@Wc7_~uA#PxM|%Yy!aSkU8PsiOlx%J=A?U;>ka
zlKy;JeG^@7hrx6qBOHb~HnYk6=(4l3v)0yDP(W~G>R&2d9v`o0F+coO^7%jh?OwZj
zRGPv80avzsHZ-_PJ%EW|F7ol|zqx)InZdIp@Im7;cudG&Et;05;H##4A&fEM=H+5L
zA6w>>PvWCV40+`Kmm7U$OYh`9lOEC;=Oz6j3l}$cJ3vbB?eZUo2FSeG@>ByVUo~Rb
zKaF=!xQfd2)kFino_I0{zo7Yk)4RAw1+3Pe73KmQHSPp{CBiyw7Wn2eca7gIkE8$D
zD?G>^R^GiXu=w<HqPU98K=;*;@w1_fs|G?Kw$ydnKXp4c=6>*4DQPJ13Vt0mw9xYW
zUvKDfA6_&ifycglv!acOyb$-ky>+|XEwovH(_W|}j+5Msc3%OiU;xs>w-A4-C(!+^
zl9I`^f^*xSZcRo+3l%o6%#^Ya)Sf=<T^v+T-imLBtOJrVAIp{OO}j@UVVC_=B72wv
z4>6JB#+Q?_gt_98$@Y%{_ipT=d%}o@Tkb=Hw^~YCZ3avwQ-Bh6`Wj?iYs0Oi$nHd1
zUt{R!6Z;N-E&z<#9^p2}d2kV8Ns3WO1r8>r)~dPt{eB>LOw3G|eU{<ojtQ!<{crm|
zRf1@(e5PqLZJDeCv(D2h8Nu<8xnrT;7$Bj_EQx|YN<GO;{gpw85vPc$`nQ`zbL{@-
zZ0s}Wgi-~0Gmjky76lBWlXQ4lUTKH3p=<juupGEwtxl7`HUHDnh_Nx<NP%a(z}@U{
zr}}?yG4b=?I!*SdS~sL{R^~UJ*vcoHv{SBy|FQ1MwAnh5ZkdPiwLkAHUudD4c;<*^
z%ai-!|JrZhy12>^%Lj)NyC$@{Znw2g+}|G$?B|zXWwXkAqhgYFMk4OYnbmXTt;=-!
zv)KNmB!fURa0kEjL8L7d$SWi+U48#nSXemPZm|@Hn$_O3)lR_GNWf-i@BD)eeyi85
zdw1$l?5Rp?>)pWRB0v6aTP|UmHDykWcKHt}yP67M(|D$F`VV=b7c4+~fIWXdeZNC_
zJSSLT`Er9jyTgRa>T2Z{;Beaxap2w-+&e2X|9`Ip4qj+Y1-7$KwP!Fe#1=j{&{%eQ
z%m3dtPQZrtG`HsE>zNf^0Nn@dpzWOgGT<CDLlrM#O&d|$HmCh(-r2|()i%vS9C+jt
NgQu&X%Q~loCIHGM(?9?K

literal 19363
zcmbrm1yq(@xA%J~2q=Pqbcu?Hv`Ci{iqhR7-AFemhzLqbr+{>Kmmnb}-5s}dcb)0;
zzWdu}fBW0#jBySQpT}`?$91hW*IaY{{{MCRN=v@PxkhpgK@gl*qQbHWa!CgMI$~Xh
zM|8?GR^WdaI$|${k&C~7zSX3CMUcD5E8*wzj<IVKhRS#<gvd1B-Jsv-B6o~E@7@)|
zlfGkHkjTi6{$2Uj6_<wG;UjeXi2;Rd)8`uU`MQ^?Oj90x8^#aL#p=C!wc|k7zDVWu
zv)2!qQErF99pe=T<85RH52JV*?_yoPDOgPP+z!E_3jPuM@{{KGblhkCI=Z?7ZpXrQ
zcSO~hiN4G<`n0#T$&i2g!~Dmd-?DEkgyH8>dXlK!T~YdRr^98VKM9RKH`2Io_9RZY
z$KTByJjN;7=!;u^7NktXyzWrBw!i60LFL@=_wAWc7hWl>F^TIjXDQN8@$H|g=xr3{
zRE*w!KVGf#v64y5uyk73or!3<_PX8FhIa~1UcMDw^(`DK{tl;KdU_t+opkIgi9M@q
z0$)z*r4QUrcXf+~)aBaul9q%kC{%C3vmVrnV<K|Ni{0TiN_f#VU6sY^Owp2|D~b3G
zv3Wl~a}W>KndvNbuu~RpE$wvAH${GsLenTKV~w4vZTZ0>C)E37=V*cQrw7?|p+wu;
z_tods{P#ItPQ1!he4}chDUg;^II*aFQRpjv8xeI3#z5vN3Uf)^?Qsp#PbhFa&=JEt
zUfuMQef#ToCex3C{2N@7FMaE7?QCq`phvw`GUv}5GYl)<&+b|ja}B3pdh{6W-71s!
zbvrHcm@pZKkSb+*g^ddOWy$T5u{M(M_I~<s^-r(oF%wQ7_8AD@gz;(nws%8EKz=1!
zo9WQ8I`drDi+H)#N0R?8X~<B*%dX75)o+9NxQN{qru5t=1A{`HQc<PMDANMHxhNT2
zgEQw9np*LLNV}lBpJs0dc%4|5QP!%ga9D?!CSc3>%AEy-c(-$n&&)aSd&Cu3^t65p
zlU!0c>Wd)Dvd`o)T}YU)<1se1{Uj#7z!Z7-L_=2g$MCn$K_oA3uwlMy*`mC3_uT0*
z!imd%Yx0k3-K}Vi&`a7s$7it9ZfwV%wWP)=xkNee)tWBbN>vH`SeJ^l!9w)(z9V-x
zT-w5ejQGe0I$}3=hGIuIP4xoTO-8h?8Ri@oW%?nA=iPBba>s4@lsf-fRHSA*M_f*6
z?qSW%*z$Xu<62Ua3<<1enN{X<ikw_Exzkq$6jDc>jYNr_KChZWk?QPSZYii!4z($d
z>maB*i^PkGG_lCO<zP<j)5yyHM^;+CbZ)w{F1|V|^WK98L<y|h*Zh9%+R4AX!PeI!
z8#TxF&A_{l@8n4Q&jAZtnc9>>x90aSn{s+$gW2|{ZsZE=pO5x+B{kT-P?(e&xgCBr
zq(yEf>=Gknm{G{Ppcio;)v~83qQavDel--wT|OBfFf_?rlU&^n4-F;a=v~(M6(L7B
zcUvpf)U+7$-H)Vg81!h3(JU2uryVL9ZnO6qOf~ixJFGUfsCk0SjMC3i$EUM)snxL^
z-i<{g^r;2UBYHHcJT>MHJOviU2R=;K^e_hSaWGK!{lTAXuU^S=P_etxttBl=+_0zJ
zCs+19`1hqnR|e;U{!2*s^}cUvsNoM%3BA^T=f;U@eLCTw@5xRp`Q0>6rG|w9y+~&b
z1qO+dxv#QzC)vG2GUVgkMgc?bC?*Eb>Bz>ru@Ku51-<VnocPtAKMEf^&1(E2Bz!4`
z+>{mKSPN*z(1@?=dc=_RN$RzNocU0nu-M@}&k#+0<k?`vW!ju5&%UoydLdjl5QAot
zUUAyg&<7Dp#)Cp$ojUeLOc7@(`T6PU5+xHY-CCF4B@EPb*rBh`GGt93cv|lN61b$@
zbW;w)t0xqn@xkFoTWQ`p#XFdhJ3oS!7^tXjQ4rTTw|iTRl2dA_=BC%PuhxCkdLig(
zwXr(;`%??7Hp(XVVLa!9ZX1?v%N*((^sfrdjJLf*Lm#AhzP!14YWG3`|G7oP4^tw(
zezU%=4zZ!H);oSRd}eLJCZfs6vxjk|FMKpEYzSj5#?PjNtc+9ds8AuIVq%xyegA-t
z1Yr)(%diW$WPN(v;Ee9lz|lW>sAD_pCxL3lEt3v1490V+e!VSXtRf<$=!oWJDM~Dl
z1Jj~|$DeV7m5B~jdlrd?RH{BsV{E=u|IPj5;G%}*>7E~bbDf@CI0K)q&IK{viIT#t
zuZxuYR{L#U!w2ihIo?l$BV%!qRKEU|oHx7DI}$v3A3q9sdf={-4nGQ15^;}<k5Muk
z5|er*qsaUY<Geg4Ips29DX<tCuFzVTLizIy<&bAmbC>+wZaZo379^J8!?6X1^RCxx
z!`Csq<Qh&w_j9rgd}0o?hRjkHulabmW2dt@)_x3~*~&DDlT?e`xp<zsmD!2Xs%fv>
zo0gEVs>ld_A%&L%i57WF^;o7z?4&V`;*Uv|t9a+cQA^H<+$w|?p8@&mV98vlm0Lyi
zufy;1w6wm?9#!|GUUxbhU9O*aY3bdsZJs)j@>O=XCZbn7gX+vB2+y0TSMwDva@nJ9
znY-6|SGovNm=K@6_}kK>aIMpm#Iav%dXz62BSK7m50woXjABf1*Bk}08kn@ctHo&P
z=D+mb!``#zX0g>$`d30751zMuV~t(k)M#vU{SBFVUx-iYn@+49WnFI|Syr7vw9|(w
za;J}QuF@v=YHGga6DJ-jqdH4LJDoh&QcysTP`Zj#aX6hj@h?u!In*%N{t!&PR1Y`Q
z>|gwtc7crhNIR>pUD1P(ZNR>cvU0B`zqro-Jc(EcVhVNa!+^t?JTAF^nyA7im6P?#
zH7a#nGMx7gp(dJF0})qKXiL^{MPO}p>~$`g!+Y%pH`aPzEj?fLF)jPrD45C=$M%$_
ztkv>tNyEqTpsYv0!zlc<%MnH{9)_2dPDEKoaP!2=4M~kJV`Wa4y&BS|w_Cm5HfUlk
z_r7ZDHe`-a;_~REML17a?uf~)1!ia^)cxYDY!nM;=v+`xRJbLm$eBUafK7Y9oPuOn
zi~HMz^5|p@Jv$R=e`WK4M7#&*)7h<c35ueJV{+tTYOLDh8)AwU=L->9>A1qSo5Pyf
z)V1PMHoNOvMN;w#cOF*lCvubZ6HFJ>D4#?g@3k)ZOce9HSUm{)8uqVWxNBx};gmg+
z8j-NOlP=M4=DKq~kGYO=r?%qpsiyKT>4Tb`KjxoHJ&i8g)E<>6h1a-SzxNGxJ`?#_
zi{HOLUEsF!)!=n7;aKT=Md>lGlcU8Jf#t>R$FNZnCf)Wazi1weOCB0ZI87{%(EYYi
zICr|;N8qzhTtSRHv8k;(UR}{ERUWY2GRh0;CU#<@^SD_095UkxLpwBf4dHbP@3k>{
z7dttAiE&I)%MW&Y0{jT<K}C7>F6jdtf5-7LmY^J-7PHM44PURk>LhNtM?rc+nWNvv
zCurEuuiY(zd_%7^GKUA1_I~9??BVCw_~0|Q)#4gIj2#6D!oavv4!)I*o|a&a5N9ro
z$0QvQLkWhg_dZdYYxK$N{D`%DE>8OjQLa0atuO51@@)uD9W7EkzluQ0XPR=945z}n
zx7}=0CZmWjkJ5dQZ4|4mSzkNDk(IseHQ}C<ecEl8Or1hTv%%NLyM~V0J23E?%V&ji
z%R$$RQKh@oLUpG2-X<Bs92Iim8$^2*Q4>tsw~UJ<Ak;Ja#%}V<;+%TxNw4hKzQ(~0
zapBJ?6;U&Ou|S%KX;Yjf%sf`6)7NO~_GTh1`7x1$C`{!ivI)9qQvz7pMUj$|F37Z+
zdz<n`O&{M{AzrBgjoIFQKKUB{Hg#Eg?o#JP#&3#6*UvVT<`ZLrFJ<1dHB>nKLXBJF
z4%vOsf3bf6OA?vh>I-G65XrsI06Amswj2i|c?vAXS2FfFQ=c4YwOVD0UFFUMajNVl
zD@QA+a(MkN4jJm2JZh7ZE@uU%tPjudt@ynS`RuQ911D^M`+SFd2m3W;^O>9O^{ZEX
z&)JVBDN1=Y^)(7o3>OlrZ&v-B8flWQiM#AFf3q*CjE5XE>cNAwi9jdH>Shthpfd0A
zi>=MnbxeA*b}f&7s%xechQ!jVscK3Z93Q%iY}lt~KI&(y;S#utjzsR<`z=v*|HzXp
zK(%XT*(hW8X^&rZFggM;x$3->;h=bY$VG@i*>NS}I5N6D&+w#n1(ip=I>DPb$dbvX
z_Nu!B6CuyRowx0)tXpIKGZ^LiJRrTTgLb<635z@?LRA3C4GsC|9G5k4#JGTsq#vli
zn9P%HcjiLAyPgkfl*#@6Re*=0Shgs09-aLSDX$It`AT#^G&v0W*U)Tz>Z*YJFV*pI
zNy%SZ(N3IU5LS%rHm6)`-{;8RLPtcI&*Qr&2UX=12Buyv&3g}fa@1=VeJ8z5npapj
zdgm$z8ggxFbvku@=EC2a`N})}A|C@9i-~HJ>}oR8wq{lW+)GDSQUp_z7rnWpaE5}z
ztzKmW&I;5X1+ATmNgWz89q-Q(79tf1{X+^1Ot-6>7yjVpdA&Kvn{@68de|>NcIlbw
z;*?hD)k(wL=o=YYZG;(1Q^+%+oa0Dhssdu$6?Eik+tL7GkHVFA5gUcyzdtzixQ>w=
z+bGfAVVPEMPhzn(c5KD8k=_1_w%m2jNu!UnS8i8`8I{o^QI!ly(y!iT-|aeg*5k|X
zDhdoNvEv5R80X!X+B)epYZj8A&eB}eIQlFqD!N<xTZOl=!A0gz*=dM#%pcthIwl&t
z>H}vLE)IU$y^gRnyD(mo^FMnhtG$JO3{*W(311<lzUnI>B;hnJnng`|Kb}_%b}8$H
zL2UhG?>8u23IC@M1`Mi{@!?Tgid|=W^*Go*2xHz8Sj{_Bq<IsPj0{<i=unexr={OR
zb${o`!Q~fO2TLEG@an6-RL&iBb>CRrI;Bn9mrSU6BHr%o9h+V3M(MReL)g!2r&Z^u
zH}C&Fs$FVz{12`mZEMlJ{S!uIm&)X}q)To%;oTJM#^-Og-8l!u4^~knn?_LDdRfGE
zQ^cyQw0#O1h9r>hDAd&2R)zifSEY%)@*L_9OEU=qyIkj<z(}Jz!*dw3X4nQGJrTCV
zb7^5mpbNtu9~Pudv~0(}e<E+XlM6MBY25jJ(>rWf0V(F~zkXF*$H>=<L^fXzd*Q!F
z)jqg_P4EcycBIlKmm-0~>>Y~;i|m(=y2e|>wVj!n_ne3Gs5cJIS=bH^gvwsvvZQc7
z66WhTVi$v|Zn6GLXm^DMefU0k%}B4j%a|%*rk7xU<IYiOcAD>?7AhQzwm#&|ZQ>JQ
zf*ZFn%M<?TM{gw&b~t_b<86=Hk(KR@FS=1QVp~_HuCJf+;e&7^CDVYSzJZ7Clc>E2
zQz4^+6ITNR14TuG0U7D;v9Yn1mNbWrNqI~`7Gq;$U0vO6V-;vP&RioHH7acze4^f0
zS6A28)~2NBpNYtf2_}13Vo}vYA8f&l`uFEvvH8!|`2W*G2ok}hH8?O}K1;s6tYN=0
zn1hRp>nXQBRkyLanw^-Kn4WH=ua8ec@+*N&uQh0TdYZ)UQ?SW|udi>^Q{#~EaK$S7
zwe0Nd05Yz7j&ocr%ee22+6D*Nxw)e+6s4q?xVb9}3kzxOu1&>0e*Cz<|1TWKV%Xm4
z7MQAX$SW@1U1*Q+!n`q={|1eVj-6dmLLw(ADT$V<BsO}Yps<kJ_RsIJGE11~kgs3K
z$;eL6&W>z;rtw7XJXK&oQBzZAWoAYzr)|ate)+OGkfl`O`<al5!0ccL)t#A{d0I9&
zI0*M=p(D@meQ+J?wUpGx??kWZJ1k4M6k~nlUJcsJM5k(6JAvJ0mQ%S|S#%5xIaygJ
zW0rLT>dPxbc@z{BzkdBvRaIrfCgXQ4_qaG885udHC1ldHwXw-kG=t&tG(<OJk7=3P
znyRd-(yDfp5uG1MRj;&d>+KEssbg$vx-n4|Au!R>VmMlCd|Ea+ISDhm$7pwc>O@CJ
zNAOu+PY>=f(ZqaUG|r@4J$G7dX5tok=Ec%o6Zx@jrLo%q<U9u2+MAm*jkB|}m^Uc?
ztgQHWdtW6$ke4r81TIclnV2@tP7aC;I%kz+6%<O$MhdUuJq!&CyUM8Z=FKfUy!*VF
zY^H-j3c>NbPVk6~(u@g<R*kd5t5-|?8FE*yTq!6hn5c3H^z*xCXvIlJN*dFbCWVJ?
zwcJljN=l0BbKf-s2GzvaSVTkwA0NNQdGFWQSe5FEV5OXlOmJi*r_t|kQLKj7Bnc<U
zgBxPgXlJ-A&CMA&50(eA1_E?1P5(|58dyeu7ZP%th9<4PzCN1aF)i)F;^MWdOQ%OW
z+}zxr`nB$7nc3OuN=GIvW22+%;}u^o*q=PH9?pMrTDG*b^zq|ISSV~ypLVpiraNTt
zyB)_0cxZ|i+u8Zlag^leKVoDgh^4OPx#z_tCHKQd6K?I~VB@sx=;-M6>(`!Fkh`p`
zMXGVg?=&e&H@CBI-@ZjNz%Q&T#w%wl-p&Z7Nygp2eH)!dQC?p3)vE!sl)**?_L#W%
z_%5dKh={b@T*mV08kd6y)YLGWG@J#wDZ^&=nwpv#J=ZpHeHxvPca1O3&rqE)N|p}7
zH@Z<WXXxEKM-c5M;p4@|eQRT74r`+@<wqt(ckbM|cI}!;&IOD;1VeCeFr);}KJ07P
z;5V80i<VUbnrQDne#DrggqP***C!1RE8E%am6w;B;9t|qWE8Bt&%j{*=8e^ClkZ$h
z;LsR(Ph;%MlHWr^fxf;ob#AAJ1+}&ALIlNSWlBm)b#G@p^YSbO1wE(f$;snxQ1bVy
z&)2_4gDI}FT?z>cQz%iP<ahluT4IW(TUuE7tF7(Uc%p)$;x?+erG=8q`T-Ty48)#P
z0)LJJt&Po&%fb3p<J{c!O$GQl!QJqw?DJGTes<ZHW~OBy@&!y)Af*5!BcuE7pWyfJ
z8+`F-(6Rd~7qBFG9oA#R!^5Yy>H-71OU=hJ848_t3}|UH#3C36Nc7&m&4&xs&`2j}
z+*=vK#39+8Z~Gb&67uECm(9($YHDiMiV$vzi8IMB1F<|E4>#e%-oPW9Dd=^LE<1~z
zUx-;VOEimkN=r*`-MR%CH6<lwYinzNf8TTJ<>1(V#HQ5Erf>$e;*ye-@899SUS3{V
zojDw+Hj?a|95FGmwlYW<xkq01IVXvET6G~d3=9k&e=yf#I4noU#@gH4Vb#JYp6;)W
z&F{iOqt~bm)iP@fp~j<;%y!5qGVI=89g%zSA{7Q|;CumAHT=V$f=^XKLPAq>vZ+b$
zWPfcy^3bE0hXLItJ~eZp8cSYY-gc=sWz^15kk@HjSe#KkOJQXVH@^G+tv64iun8H}
z3v@)#+Vj*adb_)&%qVfEoU4SYP~G=K;^HP?=6tRb3j$8<e=87pvqrn?zA#hd4ptBL
zBCp`CC)a;_=$?ojB5GUfb^_U+VcX8aVjV)e*5d*fiQ~3go~jc_Nu=s&SlKk1AFr^<
z&CRv8wnn5C6hs1u^3v0P_xHP=>@y7XP~B=c<MqEz$sgOMM?gSuO;WEw8NxB`@q-7>
zj{H*h=?U6<dSnD=1t__n-;9rsm-qf4e8VPQGgUI~F$^JRidvZkPBkX32`Mvb>1RX3
z^UW@M*eM_`)0in9I7ja6-lL{oSYC!y@v3%V%MmW5|KkVY>o)QBsp3&TbP8IB;A5AU
zm;0N&{&{qDb+uK_nTv~yH$RQ4!)f#lGZEfHaqTBjkh3HuCFOm*gmG-*10G7owk}wE
zoFAcJ2Ia`HZ?jcDd`T9^X?5B<gT^rWAv=3DBDRCd%fq7L;jmf7<|mscPo6Lgp_`z0
zI9cufnepm+9Sb0IkI+2ZH`#WCeknYQ5_#CgqpqwxT%g-RV1DK7QHK+YzRC9)?jIq`
zkD{AQ-#i+i`ldR4^q<p_{PFRl$D{(Nz<oXf=+F{)FW$;naShx`Y_5;Bl%r^N(@sC(
zcRwzmete+ed<uLCigK4fS>7*r<5xTisa2md;Mmkka5=Cgo(uYK@2SZ&Eu>{WzUI))
zSW8|YD)ZiMcKqv)d*cIT{E<63-N}c6XzHc3#Ed~h2}6eSi|IUV^R`eDdL6t#dzKI!
z<KsVd6=AuWfKh2-X~<dU7U->;`tiH|;#X>|>aJqqTTQ)D6OHZ@08vs(3|ac!j`kvK
z%Cp!LhSrK+tGXx}?odMuM|dafCv~c#qN2*__n)C5dPR{BKQ8lXDxB`f2Om(d;h!rG
z{Q`j6*s>8C5~5sY^gT4RX>mdZ$go&t#fyJ6U`M8sDf)|fkvyk{q-X!a%U4A7#|A6i
zyIRMrHVs}G|J?hEjnwPzzbDLN#oT2h>YXwQ@F0p%Y6}gS=a}I-3A9m4sPHemrn<Cy
zs?eM|m1nSU=L@j`F0vMOPT?~3m-aj<td%RkmHw*TRrch+liGIz?Z)LlkJo~YqmGiv
z#Lb<T72i5p4Jlf4@<M|PSHpuldAib8mHBuU@IRBL;jgw|>fGFFl8ViuTAgh!fghTt
zyq1AoaXaiqMVnONRaHZk0tm-BVtb+gXSpOfKJxA&@A>Q3w~=4J=!9!8OUu21EBPN8
zsY!UK!Rxr{n+}`ZC&p1u0E&>ej~(&VHD9YTB7auW;q#Gq5>grsDgOnE3b-C$L)0~?
zkHXt?(BFmEhTJGY?>JKYpYi3uYLa@6o}=FBG6P|yv4g9taYfSQvHS}XYi_4B-SbXs
ztix{qz_z7P5_0>qZjHCcs4vw#fs>1FOw?2E?MxU5gB@8?-!Y6Tf1%kDkj3uE;krz}
z$fp;ZzC}_LO|=e`=ABISa|)N9sp~vOt}h!JnNRLDYvr}7pkIPFMW)wUm;fwrsYJDG
zT^zmX?iWQv0Bx-~FVWJTyP&G8H>h_M6P)*FSz)?oHh~Ijw=n}(R;{f{kNP`=4wN-}
zk#_lNLjiKldkfo-p~Fx4{-9OZ+oM($`}8bxMO2KO0Us&98J0ehayBD(1GqDP>f-w8
z++cQ_z{*N`t=Q2Mo!;E%XJ3AFwO|cerVly&k4!Lux%8lC^W|By*@FD0pBSf28t&b0
zT<Mj26&4fRnYzygG%BoBd^Jo=Cvq0)&HeYUW6ZgCoaFDYaBS2KDq2$B{?o=ZqN1=h
z=*2-PTX(s>Qsn-W+v)bU`Qlh0S3{Nt+3~?4gc*Q!JPostqoe{((c7ycqeGS=F-lw)
zPK+O^8`ZfiIaS*JBrd9JE_^jixX0K+QzO1%nOx`5-jo|nj&Z>H3)<9!d5!09q9W9$
z%uO{?&}-N7jQci*2<VkX`32E@Z@32db4Iheq}re4i5YMgtK)f#EcjicM;wn&ix%=P
zqKGnSCe-_?C0bXyrH*!qTYCLSc}vsCJ@1NRn2Wl9<!Y!X%PE;`5ZFL_7vZ9nIVX6}
zb7-aq*Q)_*3dO3EzqCNweKr`!NS8NU&|qGBaQB~QoH#ijX)0%$6>r)%C5gQ>ge;td
zv5vZh)K?GCIFQ!@wG+JqEe=v&L})DU^G+DurgrUXf2<Y#Y{Aw$J0U&?EXn_5Y6s*c
zM*uQKR_=e48h)h^B&xUR3QrFXA1&ReOz6Hz$7+7w6e1h&^&s9j-rlAfqhpKY_lT?S
z#i<th%hhkC*Z#hFP|zRC<c+mA*vJ(2MXk1brdIl!vMx0x9yt<{BxI47A(H4E^*nU!
zKqIhn=gH0pK?6$mesukglWIEqA2vQZt(RF|7mGXcKfNA(IC0{>ra5<yhEA8mp#2eM
z(F~eL5;xfc+46+6`v8e13AjHSayl|yI}6vkjKErnuq=W&&%nhg;p}iaR)s#>XWyDN
zA^|}Xw$1`R3LNXtZpdSLtC9s|;k~>^q(pO>Ggp###{K`H^V{U+WeE#D<Kxe;6Sx%O
z>WF)rBXVc9wW)u#z83Rfj;TZ)Ps^r`_Hk=_Yw<MBvdjL{h=>Twies6%X*RB>`i6#O
z_G_b5LLa5cv2L^R{+CYo|98jvSH=COReit>C4k-A!)~EN9UYyA64BpNQU-E0c<AV|
z?!OG!v>asrr{UCo{KIUH85R8LZN<2j$C+JUs)Q$=VRt;AcKtgj$`<G6KS0gt?VY1i
z^f4Bnh^QP28^#DRk$iLF$pZpkQCr*M)YR0lu(0VSsHD$VDEOSoxNTcII?U#p{Sj^G
z)Dsh}&W`uA+>b>13rdY)nyR28RZ&$fRHipKUxVT(1kcUYHB};}nQ3lqZEa<R&h=LB
z(GDsnJ6oAPJUF-~QOF0~P@~$hr?WF>(h=QZb$xvudPFnzI_WqpVKFF3dwP15@-!7>
zWud~7fByWrnVH$a`b2V45|-!mTTXU%_B5%4hgh@F6TrX8aDCMCb49Q`%N@6ppu>jp
zP)4RFODV6qrsj%Taen?MU*8P6ct1bCrlzLnUKpLRTwevY+P>02LDV_v5Zwqp*b|hw
zxw*r7^g5CHe|Q1L+Y*R~iMh;%nYZnnohzY|hOQ3>2Z!~^6Li9C)8Kz~RkgVUVWFYc
zHa4blKc~=Cl$Gxg67HmVoE<Bus8q<D3EBPl=iNul?46ytJ#;iR<0~t<FaD0wzq_OI
zZ$Tpe?vDPW$6B=JjD;KA-<a~4tadu}g^Em8R#u>wL0*72A&m#Fp;=(G%rYS?>}LW#
zDQQ-2E(Ias(5A=-X=&+4j~=C)<`x$hdwc(cULt@}pesRHS{hooO)ql6z53WRHVBy5
zSh9w=XZrfoTy*^W=dHo8(60L2pmc}EOo)JmgQL!2LsP?i>CYe6!_DW8ywJLMPR+PM
z4`Di#>%UG8eHU*I1W<EdAM3-1sl~-lSy@@{-TTqig^T!o{!AktneTDouCKq~cCznJ
zDNtKpu6%e8$=CVm=d`mZ^717iAz>Ya-C{?Sr@4xn+EkrKoho8)Z*SNY`wAck9i7YZ
z?h>>!G*EmdxIn9@S>s%yeX;baIPJEmdJt*{{rPycQ{Uty^pu(^Do%%+GXNwWV(I+&
za1~;4fl#whudT@!@5s_r<AW_U81Z~Azgk;uHzv>EQBMZVTGtAQuYn)s&?f)sNgn9$
zpI=yz5EpO#{Pyr~2g9UQJN~8S1^V-88)M_wyWJ@Z))g96_BGJ^mb6<h-^RmZHRy=!
z@0Wl0b)>hT=NiS>|Ecx3fmb^+;~t;7d9+jPeFE6)|1}vzU}${ByK`sv?8M=gu$S;6
zTrI2yPLmveD=VvvgWkpCgB^87ho64<FeROL@CDOF#;Y7Q01NC9nEr9Iyf~=4m<j7P
zZv(<nQ&Y1wI#${=HC0FT^FKWys?4aqzP`2?>Qdo_sam(spFcNR65l+QVTjy`{^y4b
zH*Lgpam!IIRlK0IG#7x@{;yjmW2z%XS@HaC&U?!PtcG2@F8g1Wm2aAaMZXb9`1+OA
zeDo<aYy_WEva+fiw`PC*5XA6$-lbnO!eKeNyT3o!-ya$rEF&jpV`t}fan9$l1s7;)
zYPzzt1bHC1+U*G!9|J?@2yF4tIf>{)uMXr0xrvWoVl~$c9VR=U*$1P{NuI^vmTp)M
zcKAfh+6WRE83}#9k&zMdE-NeR{rgKQbwG>a<0+8z^mI;c?)^VKXh=tAXPZ8x4&<4t
zY9-9~DNht0x{R!BQeq+%6%~uwaQ^w(3EI1Y0+x%dSEn0TK(L~1Ii8WsO`+kH5N9do
zsFs*0)clODOrXKK_wXSGQfe{byxgAwZ0Yd$*u==F+Wjn=J}5M_KTk`5gQJX2DOdQ#
zi;q4&XwL)%FCXQ7aJ{?)P>Mppy;`sBwtLCTKne*dse~u`zW~5(OxEz|G<}+%pSMAE
zv9YLrke0KFZ_pNxdU6H%h(kJ9VS@tVcY}i0ajewbQy-Utm(yarT;TjL8SZ3padEyW
zGxM?MUFiE;^)G36M6#TU#0z-fB0jj}_X79t-@kup`sZgti7y0H{nt@Dz#jd4eN~E$
zWLg5q8-M&z*U+e`u13d(*ENoe9E}tiT3A>>?mb;Xe;yhUf%Yym^bUfhiF)ZiHkBbq
zgLdhVflp9k=z7aO5UzlLfXPZbQ)}z(9JMm!*=E!XY#MLgyg}Zs4zmad2we5`Pz!}Z
z0qzh9GTei%e7gId)JaPq<;5`&i##n#9(($`cfXC+-Tokb|LI;CH-^_OLP7^f^e`4c
zv3|C+pdm*&G1b+sR#pXNWn~~RAkaaN4-X%9#qrF0LgN3a(+O)E5{b=X$I)D%0D6Kq
zr`>Wtq&spR`|oLKN(u^b0v_?52H5;;I8^<doo~%32?!P!7Q*7<+#oRkWMg8=1EPAl
z9xiIE#FP+14hRIisez#(YJMKjq%T<=^g-KOTO;{zgkWHM`}%H>b2sJ5si+)5=l}qQ
zo2i4$##DE@J>7t|ec}Pr__UFY%f!UQbLkiApP!et5COa%&aYozJMz5y3Fcl&Q4tnY
zC7>dJZ<y~OMnY_Gu3yhpuaH$rM(6iKOMH>I&CR=AeV3ctxjmeL9Jb-k&MOE92gfxb
z!Sv2#NA(HFk%pbouqDgL%YV<yt8+g)o}Sh=fnS>^A3D203WiM!f-Gi~`DW4$vi}7<
za?I!%O#C35OT=-9RriQGIaQ>k(Ksy$2U760e$Kc_uHDu539uF1nG<jPv@n=HfCXj>
z3MToq>_6>=?aN}KQX%FM4Gjk@{nxY4Lt$r$Sn5jy@7h&KDy+*JjuLbLC1z)48WyaN
zETO4u@h7EWV32qtD%u1HBL(vG!-o$~%jgL{SD#%<x&a6R=u>b+1dSG8rLmC_8PXfK
zS>RDCJ3HzP{vUczXr$ul9bcjeV;(y71pxbqi~CEYpG19qDDk&oG>P1?eF_)z>Qx({
z3N>YAX`mG)>~<28&d$z~lDGph#g`$$UB}P`Ogiu8AN2M*Mq@|EmuiCo93wd{fyq7w
zy88+;&%>9Wsb0b<!DR`w;QL%7W_LHIKIUMFkV)fV!rX6+;*8k5c`JvDZaYzr`<ZCZ
z&Hdu~EC(2sEe8HG#s0fs+eIs^yYr;qZKI_+ukO)prN|xgU;nDuC#?6%{zFFR_GbC^
z5M*Y#_!?2up5v4#S+5h~5;<)-A~chG9Zp+Nm;P^RHC;k%*Mb7PF_SPguGNKq4$sTH
zybCa}A-^5^7cmPc33397_}|bVq9$FO1Y5(7_1qsT^SXQIPEAn939Ac4%Kr!H{Qf>z
z!E*UexT6>p*)(`Z>E>--P;kY0m`&9a1rhy-CDdAHy^*i?oxcU6*5hWq0ZUx<K~P_m
zYzUI?ev<M|KiTHC7j&0~Ij49Cg{FFHW>UU+PW!;z4)W}Us>xXGiaWnhHJ@3xrqi!E
zh2YOxmGSc|&CzY4=<gV)WKPN?#Xn;|VV5Rl(|0f)nUXpOnOe4MhI&f#VE-Hg%qa~P
zb-+rlHV^*$YUHlA86W6QV&+-N$c8G&YhTGBBaMiR-hCXWRqs}8XNgTNa%B)5HA$Ob
z1O7S_w!a!;S<k_KK92f~ytKUiT%HmVwELKkfwkK_6ko;Qze&_?$h*Vu{pC&l{$ejP
ziX)U{Lp4@7z-tvj(=BU)p<;Pm^!l5w&l#YBBhPA3PrytmG@<lw>9?8bx5UW?=1GBy
zIFimbC4PP2(l=d9?>GAbag{`vf7M?1(xu6iueVj|zo{8+dk2JHL-ZE!AoVTX709=|
z<j2FmTl&YN_c$J4Jg^w;FDWzkMfbXdcw5@%t6WT$zm^T5+N?ak7&_IbsodSyaMrmP
zyc&^&mln9u!t`wNfaKh1ktV7VXDEm$sJx+DTzqLI^KyN=g9>;OP6aT$WHvlYNEWnT
z+-%Cgw(@1_iz9d0PV*2wdtECkae;x5nEcx8rZ@+@Fi*ez$?FSd$)(60onQT;jkyt%
zNqaLudh{2@wQh{(zr~u~e(cRe-5&0K#7@VNS3YVB{x*H#?w_Rhp$DfcJ8>AFfv!Jq
z$}l2a!R)H<;A+x%do>*rNou+eif+w<;N(Hbc=asEz9gi!REBKA8Z38N-g7b4g3M{R
z`t5h4yZOtnB8H3t6E$sKr={vx|JmZP8A{lewjHU0DysT+*0$SS6FV^TbUq>|)_#9l
z{Jh{eqo(iDGf-ur1%|E>RN1GeH-$v6i;^+7;&D-dbW~hyD<X2`>ya*vOOoMG+0dv{
zDQ9@8B4ILK+A+CA;8aJ*(a8yW>3VEd3kru+TiniQwySHYtmG0;(*-SZetwSJym|9(
zHIci|(7x4U#|?gWmHhqPds9?;Kkjok>YkKZ&gDhqc#J&#J*d5uohaYpneKCPRLZ11
z@(0#SmV{m#v+ozT&?c|+e~LqIMlO#(^IqUoMe6^cO2EmQf$MYmfTFH%ttfM}3GBIG
z(glRXuA|c9xI>kO`i(f9Eh}ws@I4r{xNY0!Byy$HlMEY~U(mZVuOjaw^d3xOHwszJ
zv}a6or&lyey_-9Lgfvf5M^-bIM^i3K<``AI`b~|(pNALdBhQ`(h`9IK+U%TXy)VU)
z2>D+xs&kF8+gJ?=77{n@I!;{g_bZJ-*RXa^ui5H*<bjmqucMawKgU8+S+81kq$&Do
zHo+x;qwX=?q$Pdu+v+A!Fn_-dW<Ou8hA7VeZn7b>(d-O-G0^q)yx>y{I9BwkI%SHK
zt>LAxz7-oef<J$qn*m(J(#?-k%$7caU3-vF`-qrv*zVB2gk{sSeUQYXWV_&M!f_yu
z;?qd*6blk2xM^8`MyA_}LgR(d=64ry-;UTH%aRFAl%<!)nw8}aU?G><U+nlCV`XOX
z%x7HV^1O+3X^8<s79@8dOSk*_4XtwCH3#g%QsR<zRwi%kX9w%?CEZsVnWkJB_5N^r
z2p<!87^b_px@fSuwlfj0)Hqb8Y1sc5T>X#(ewO4K!PZct*Ye`DZS@*Mi%vH>UJr9m
zW*k%xq$y&=-I$mOBOv^qn7UfVNQSKQyN}hVr2*wM-S?E2{bjX1$=cax0d`Lq{iF6l
ze7L*G&w^DenFdXk?oNho&Iacp{<jv$a_5?+{BbJv_{J)Yz5BpNfjq;VCM+cJPA}sb
z=w};Ei2oC_15RQZrY4Im2X+>D@MBPLH5LC^>*^xM_r6Y!3KZp7Nt78nw5Rgwu3I3q
zaSHqO+8PX*PFzt-b0_#UV~Lqbznjt#ZD4v}SQw?vPy4c>)-@x!lfTlVA(2v3ePWaa
zEC!ig)Vhd2ySDGC)hJ&l-DnY4mYYj$e%Q|bz#S2-tXS0Ed~n4{(NN(h$N*CDDgWIf
zbb-5_aln45B(sdC<VVl>gX44li$x(^1Z)fhvC2cgw`vt9T50D$+1@0YVk~$3g|Y;k
ztHEYFw05W1dbO#-M-d}_#WGo-JR!Jmb2;#nnYz5Q#zj0e6Ac<NQE7jQV#vy_zKmE*
zdeppWd*tqYsu@(eQAJ^g(qAlMDAAPf)+(jiLaPr`WAe1uaM_`XX~}wwddp)kE&6W<
zklrP^_i9FiB_tC5AE@&;*ZWfzjXaz+!$hafczu;rx<yM&4)6CK&5c!LxEy*UlbIZq
zzWQA_B2<J|W}(TZs2NbAH%E-^^X}BMH}xeoXD$Wu;NnE|2#i%sQ~IL^Ynnxb-*>ZJ
z!E1CL(>;`3F<Q9Sd_lFB)z{C5W{xAPd%2F<Qmg1KI`VH*P{8X=vF#Vx&CXSgN^9<#
zoTCZCQzhEJbMTM{4=zy5g)>4eD<o5l-#=R8axk#g#a$i)MsK;&Qd3>TNS8Lf?T_jt
zQpmC3b2Q)j8XgogfRSg#RoS?rJ$#l`rirBjqtWuvb$0u4L^tt^bwS<RvdA-u5_06b
z{`pzWTpudoVr?{V>ftj{hr>pn*0Om&!GYf#D7OC47XM<^LY7%rd6q}iN)|QJ?5c-g
zl0fqb7-Fl{Xr10^CGGC?F{`%csVL4)%8qq8*cuCw#f_Q={p7m+Ny(DTK;~pZAvH*1
zYJceCXQpc&?W(z7#rpD|P+d{<^mH4xCiLgLpU$MaW-!(&!?(H0zU6m}R%cbmif>M?
zz^(*aHmg$nU=>MQMM7__+v}6?7$xzW=tq^`(#1s`l%I&3`{TBB^U~5k4t#ZJdn~Jt
zrgSUk_kk+~@_+W*ROW@PuZF!*9i*GrOIbT1!XoCTAb4V)d(lR*Z+i7|hd<ll+?do_
zoTe!b_yKKd2^g<_I*g2_qiSI8UvXVM$QWdkE%TKbu-!Rdaf_kpS2H`C4TdCWz$jql
zoDkT3=uYZUMHUen9i!Bt_0KJ`L@0IaQ2gOFXZlLZH88Q?@t#<K2UCp`U3m3CBY)o(
zwnMaI68Z!_v)<Fj+qbXJWZgn+%@nsA?`vV^zP&veHxa|Tn8QEPW>%16$8m8K(A9Ua
z?Fb}occN_I!yGF3QD~SA@t3;5nhPwKd@%DzeAmwOGD&A=cc-|xNF-2F5ZTSwS}EFf
zd@eHrRmjwhiOjuT?gu21JLx}Pi86PQMFzvTfBxB9o6MmWZDOgmB4{VQE3&fV^xz4f
zMDaOy*@xvvHxb~|Nu+<RKL0QeV>Q&y^%wO4rkLlh!ggf+kC;$}?wd1mIP!{`GDCYg
zwwsGW2FVF`AAB5@@502mQs=zqxBMs_y7cY3i!;mZ`8Es;j807_5WO=pGQ7NmiiXA?
zUng$MFDOXl_A}^9wXW6r+xzTg)v3qGDJU%b`SWLS5k&LS@N|#q`u9Kyp{G1MLM5mr
zxj%UA$UjAptyad!#AFHTGJ||weEcMwyP24n0Jx``e)Yi<&;ci*@jh4`u>oHPF>zG5
zss4Ox@K+isdpo-vU?LTYL0BN(Sit4TrAhL+pE?fZYN%D_NW`$yK6*s2R+@dDB>Dw(
z7M+EKg|4nHaM)0C%ip<?5)u@|X}_v0EZhY0r|@qw6Ds(u;nk5MfKcH~T8xDRfIu1>
z8wu%^gJRX&$z5c!-f>N-l5@VD9?VgD89){sbaTnaNLRNAI<UVADgl9Cp+>(tGfFK5
z_$FL*0+&rH^r=afZeR?7JBN$TJy^v4Td<b#gT+I)B>)E(cOAO@vlO)#qN1(PetMj&
zab#Y8=0BL4+m`4BUZAbH79LJcM<*v4qK~n$<M8B@-6dUP<B>WKk8Agz3tT(c$>{(>
z0ezV2`gY96zM-KD=)cFu$DgpWW&~V0LpqKI=bQaWfw2I6)-PJAwkml9!oD*wI<Pya
zGfE^}?IVFpB1sVNfY#X6$S6G^0C%9^l<v_ZQB6&EfL!vJo+O|**a7o}A%qzuXE!5)
zXZU>oJ`cAp8OM!JK_O{JpZ*-~-iOO((RR7tc;Q#r9wB}O{L<UUr#q5m4u%A3uVo*u
zscU2c?x)b_1A@WdTHwGjgi&<fGpUwNQ@Gh@j<p3{YG({bU}n1|iA96w6|n9=*PqCJ
zQy#k0g66u@W-uu&D=!n?zP&yB^K%@JgDe1ljJ&p6TIkQk!3_YB2EmZR9gYEgtbohD
z82~m0dip<3jY*1^4t8eg?%usiO|1{`MILh-4PaCN;qoUgkiYG~j{$Gz*9{lN;k;|)
z;BWvFu;a*^sr$U7K9=w$*fYQs02YqQ%1Zf`ULv(pvy9A4AXE4Q@4u;PcYP*jj96J;
z=Qkb9hCl{e`2AO}Uc~{T27(Cg4!Hl!##llg7(#$F)Cts+&cTGsfUkP@ebIEVZ8WQ6
zIjv^FfCT&oSQ31KyxZ}vN`>_Ti1eTR{L*1U;aOicnd)R@WD>c<7iUl?LmeGYxc;z*
zXZ#*V+Y5E)$5|DEiCnloHuJ5wz!vrC(<cIM9D||}U}zyBndga9fDPa?7<%p@!0gC)
z>^mA7-v6jNE@lybXany6&Iy0D>Q^U6z+-0f{T8hke&O5M*?|`+-1HtZ^JaSl6I<E^
zEMkD64E^Z<xxaqx1CR(jQ!V{!B`|EKgLRE$Ld#`4N01a?z$CKK%}0xUI}HR}52Y0q
zOBYl}$}F`sie7vnD$s853^#TD{p~pzM!p0FD#^*2Rwx?Hf{8;yg{&Ku;Q($m5K#7D
zX);7__5<Q4<**>rOuvuIjG_f&&f?6B6->CI^N~cO`9x({%Uq6TP4x1!KLMVxQvdw4
zs3oHz5$$`Mo11%k<g5nQ2MUTgAASY<)6(zXzrp$<OD;B7@;)cRGj<5fPXM9ca(1e%
z9c)Yi>c|FPUur5la4kivosZzt%va7XF&&a6|Mbaref$XK6_g#9vtzb_f~T^i!_H$}
z1!p1DVuC_KQQ{B18ioP;B#C@Z4@jqgIR)Dkyrmgh#MIN+nwm2|d^%W}N~)@_?dWxc
zL)9#?7hNSKyTE$&l#NY=J{-Ug#5XoJHt}@~u82;9I>)VhG&C(^V`_48;MI8{A<;Q7
zum>Zr_x`_d+y?DULUA!M8+&_2NMbTFQJhvf_V(;tai>pqVB&!+B5xNvh^_b$7ch5a
zs}%kC@nf_DV!q6AO9u_j3;2;7xhS8BMLo`xb7BCFGJUCL5<l=>L>j`*W-yXPS2C7U
zX2=r_<2r)i;o*Uh0BQ*G*3OQNnfdP6z|fEftR&!Yml3c}0-@w{-bD}_8ynBNFr5EE
zfWc69DlPW<_0y+MA3S&fN$dqb|Igv!$i^Aa%wXMp)xw51MtcUV4>IBM8aeefY;5=(
zAd_^n_8|9w#l=MOU~B7WZ%9jo_|=;?i2%1nML#_vJ(FSM(B_{}W0GmX7*|)bgqI}n
zxhUEkXDa+9$qJTrs*h1%!fajnkgHLpsG<@T9lgA=QU$`oY{G@6zP>*Cb4a=s6%{|5
znr@;ucvQ3aG!_&Up}pgC*}sWi@TL*Nz02pr2c#afuQo-9<4Xw4>>V>_*nZ|OBAlyU
z_yQ3IbP4zIxz>2A&B^mFs3!y9UxGCMxqJd6(-h63bx`c4a1QBP8}k~SXi!r+;`w4$
zO&~Av@$&v?Y;5z;@HEXSEZpvhVg;ZMc~Iv`)O>btuPk^P5wQHhp$C962|J(!WILtL
zZfta0!ccx_&?X`waX;Elnaq{B_vle;e}D1!@4~whpB1|B&~FhCq-JE$mL|x<2iK@s
zs;K;h{r|cMiH;)z-h`<VQzdcn4hUOr`&A;qw9Ct?I|Y6qwY;^rci&%)iish0dWeSn
z3r-_W`kWr-myshkWAGzhM-RFP!}7$!!ir=w{VOv1lXAej3|niM7K0-e6BDy+4bpno
z#6(<mh9oFo0|os_lQ`vrIfToT?|$m9<Q&uqCI_w&GN|6UdGp!&nB_#}6|kKAY7#g(
znw{10ybB7^rD@n6KzpijiHHTy-+rHzz@_>IFU+f+Sl6!2`jC*3T}RyA-Sy~LSXgFe
zX7V&^?qSV>dl1n!F^Nt{(6UT>6dV>d0POSc;>UkizJ|K$2~tIVQITou<g2FT(RZYU
zd$-YLR{jQ0-XX=<#pzBrqHS!vw78g>mWGLdneXAbiX32iVq#)giO9FCEFSB5(Q_qo
zP|>D}3~wNiCm`={UP#<Vhg~QwDG8>E%VL}pLYkJA_R1A+;K8@hpS$x6SJ)WNc>w1h
z8siD3;#d!(Q<5d}B3k5qelsd63fT3XbGmFXm>{82P0za~6YpY7SMaA|yE{5|x3^`L
zlnkHzeG({eP<l~g>3~47Hd-PlE9<<o2vV9jNX`(>E_=&%sIE8&_RICb_g{jSjl*pC
z8@SUlGMqpsXb=hk#0&;ObqEJg^7_+dVB<o6F0ZIK=-P~ZM5!d+0UIOaSze03A4E;8
zFkt0&E8%{AzaX4xza*xra!h|Tt3iL>Uvi0~eUPq}Ysv`13Pc$7QnL}*NMHr;uTNkj
zpa+=ke-wTpUYmV;EEc33X6B&GJoXq3G0S=h@T$3{Uh!)91acV28io2|u=XM2U#joy
z^j|I~S%P_oDXRs6+0i}c(L-=V5)cxi=H_fp53MqFjUTg2z5BU4ItHayS2UZLkWg}Z
zx~LZH9>;t02b4LIpkKgN1vwW~=8OQ5Y!;#~aEQC5rDbEPE@4?Y`aP#*{cL#xCi0)a
ze)(DShr3uzOiW-RRVgx%As3?qRpTuvv@R|#keWd~%WO2hZ3V$=D=@{5j)@5p#K%)&
z47LxxzHJ+I7wfaLf)qEB!=ZYVrQmlZx^u@CHl7z#SwZo<e0=2O<UjWX<Jb|K+7WaN
z3<_@BPp)xsacj%Vl_1>;2??1boA|@}k<rxbsuSnq;TdaeM5A;bQE%FHtsTfnPrsWt
zQfap`I9cNYV4uUd_kp3IVdk7kSfsdtvT`I;8Q$I^Fo?}xh~<=(jVvr`%|@PN3YlWR
z6`10MTny?rm_s2(ObracZ%}GA_X66GpRoUc9o8KR2uw_$(^FT9K!?N4H}ISL%&3@`
zP&K@Ibrk`#w%hqB7i8flPePWzsTP3K8)Oa$!?<d6d<3HZf#b_-{YH^Ho$nfF)N5U%
z1b&CK%!P%AJ3BfS@1w+J7r-klaJDN4W{2ssBBJXr9345mWlD(Q6(F`$E}|tO)9Jrg
z!w>}f+28L40EK)$^7XC|l-yzQ@tWoXVG$8?Gj2s-Kg58NoXXNzScjR2o}hhV;taGc
z&@_J3t7Z_h8bGR05);cB?T&>i*Wwpz%+0GdwHcgbU7-K?daPsD8x(;k=L{<Z;^FHY
zqs;x`(NS=BJ45*icX!HS2u`TorM`ZQK@9CKjsbXC8=4DLIs~7=q@E2T_TKtL%yPLZ
zAHipQz>#=(x_WxT>zgpPfn;2QcIr8B#!HTz&$$>hcvw@z!<_v5{G6Q1pinM<8^x8A
z>-+El-NVC!J%#}?y3c{cknGU>_tezhnGj>B<e&lr$1&VUc~w;e_zhZG<VbIOH88WX
zn&zVP;AeBAK{64nFGNH{*_t)nTwG4jQ9)&r%zaOWnS~`dJlta6MC~!^rT=M4QnjdL
zslSKU&pCz1twoi#CLRZiDODUyGUT{O{ffiVP*PHx3j@c*{Hr-Rxycf_JD;i0=xKis
zO4qn<iLWNdKv_CFnWjh1e|vd;zJHaiOukD=aa+(MM%#R{#C!Rr-4dU*8Y}-sMM%p;
zLBmnRdjU2j@AUUC#7CwCyVsg`{-YcH=erRewH^u4P};JCspy439?m4GhNTm_PDO7M
z^MfrKTsnWxSS5LFy4C{ZnWp56=e7PG1ykxxZ&Q5Vh|WrpDUw{_%DYRGe3uE1U|G`_
zUZiX4l>gseN@-$w`t%niVgY2Ad++i)@THx#V9=3tSWf9Ce(tUX^n*zMHx;J&gvH}V
z0>Kly?H964Ezd-}j<%0?%wC{tRK=;YzB4eBl!jw@1%3NqfmH&H#(s1XsFC&Yr0&5e
zao5Fh4%XlEl<iBMa43@gyDOXohO?G%0>8)(b^7$}*?T;Xfy&-TN~WT0L*~g!W;K-5
z?g9Sy38rS8n69nmW<}qsJ6ed_TZ%doV}F4lU;q1I#P#07Yg9$G3lU%TCV3|M7<t~9
z+W%0ryfFsH;pbC--|ke%8gyH{6#k_jHC%si<MJ?l>emAb>&lG}?hijMuat^hes{5m
z?M81$Q!$K1y8(<r$NJb`4jVWbM(*2fHA?rR#hq}Kt<Jo~O7n3)^VXNX3A%HiM7qFK
zXT$6m;>nv;lsO9)G0<QRiyl@CNACTWHfGuom}05>w)<ur^Y6v|4<u8t^Xgy}XafR^
zZkr^8)FLV(R}|rRo|SLLtGwPz?;5mMr=D!V(O3Yc@wIpAEZfnk7W#^|r8GZH%x;+J
zq)$q|=d=D~+%pyz;3Xby=T`Qua&Rp$cle`g=ph$-fbuxn&aWK8=T*6ID6n%*0luz)
zoagkUhs1V8y!LmG?4@@dv6rcez+`w$mCJs1T!;>>d#|jAa=g3MxLl;2jYb(&70QHs
zo7@rLFcv>L?fh%!bhcGeV|EKdtqNQY4_Hr~kP$t~oASF<FP&$@mnE(~P-5X>`_q1C
zO@8B_fs#(x0dFL?#6*$Kdj6mMBYNURa16T$Zfv8rEjdMSr45TBe;6{v@YyzhKQCLa
zt35fK2=O;$KXpE8@J@lV+iK}t{Qo{ws9khUeus*-ZMshKD3%Tco*gPR$0M~HlL(S$
zH#w@&T4~<ohkq_JiyAiSryToVys$as&E;p}f_~HE|F`pk5-P3P{}YP5h!tkjweiGW
z{x2HU+=e;z@p?NQht@b>(WBYzK9Dl7X)XVSIMXhMU*EYQ_|Nb=3%ouhBlSOy9g>y<
zLl_tv;e(8ZO5kYP6>ojs$*GGkfgc5&&-kl~vvtHoiwy`DG%tJEn{@eAZ;iXQHp6*t
zvG&JsF3y3nj)8U|$kd~wKM2G|c1s)2foKxr;k{n9Vt!trsM)b6EAL6+NF}(0VF$7?
z%;hX-w)~Kiu^$qJ%NiaB$LLlb=Ow1{T6`Y>L=U7Jw1Eoi74O2HANe~4Nrw-j#ak=S
zdhpeT{?1mPOu~+R%`V6Tw(+G(eI`!s&zGXmSV4%{HM^+QUH#t$tygUxXt`YNKMPPF
zsguLeg>9dzd^f2yI@@p6t&_@OFU=#4$r=pK4>Bg_c?1A&tVgd0&K^2gZfn1O1>T0W
zh)CHGFx?{WQi?u?+mx@Ay}U+S=dtnu*!l~}$(%`>jH${#(^E3O=HdWM_G>C-0+l)|
zXOFgQ%${Ogys)sFv99Rt?S)oM{9(~3Jq-;F9F~!i>W&sW(=&VPm}Mi^+zW3D(vMPL
zHz|94`Am_jm<>bPL92O8*;-LqSss^|iVB=IsQ7z&CH3U^n1q;^K{@~1;ypC?QjI4Q
zg|u+$(8etGmfXHnd~L_TK*=IKbcBFYpz2qOk(^ZHyL<PUV`u*c>Xu;Ahrh=(q%YJo
zG=S;e)13<JGGXZK!E_Ip#W?uqD2J<V^-)kCoExt`=LMDCKVmNh&YC_COE~2wI=LF)
zZ@j~d@)%A)>8xsaw$X9OtSmgW>rN}SEc<b`9;*@>AGX1DawGHp?OPp3l>6J}gEd8B
z|D1ok+3yJI5`1Y%)j8^o$@e!p>FWX)5%5(ebc{37<PncRPK&WpcYvef$K08B_Po}k
zS8U`JWE>r>RHX12wi)DJhcsx*pWD#7kG+V9wam4e_@v6P%eBsLZ7AxIY=6z{mV*yy
zc}I&RL;mRlw-e?@r^Nyj+^=8FUa;<Ef92|tV5!;3mP;y=<s|UZ^DcqqCr*;{N8DzY
zxG3UrjS3QIT2yZovx)j&Jq@pR>-=%+RK=gd$X_^bM4+YOoTjm><=oEV>P6E(&$VoZ
zPZ#Vw;acZ$-+<G_n1tcM$vI121SdxZWJ5T}|4z`q_*wKwvbqO==lMK_3Hbco`wSxP
zpWta>VK%hOQKCIM0^O9RoqDe&?aKIUw41xT8a(GJ@w8ImsIdCVvz6$gzofc7C=X4E
z6TU!3yx1)%+2E86zWt{aPW;|-v=Eu*a&H@a(oyPb6ug7v>w1m-U+d$|`?Gz1a`TCc
zSAa+1*zVf0=9=rPS*?#vG_J(Ve;iPqe5<Z+i^Vo~j*p3;eLN+W+tzckM{Vc*Vfjzv
z&UxgWJ(rrEf7Wi&+ZH|vv~YJVupRMn{_aaW5<LfEFS`33H;HatkvLCnsZZvy^MMZD
zPyggwm(>IJhP7(BJ6ZHh+OREeTe^A<4@cF{PpQRM+obY7a7dVB1bAP$6J%*$@!^5k
zD#=dZ_97sVy&AaSS<7?mJBqx6_iwNN^u+UQdWiDJBTuhY`gZ^aZGjuM0@<3SfaA(5
zG`r0;p95FT0+()m{C@jd(t!rXQ>V7xdAK?sIJwy`4_Yeu!r7@e0oZC@x9;AHqmoa0
z8CxH~GUpC^caJ&1S!-qo2Zx3aNfmY&yO|IhoWB0I(^phHn6??X@5@zy*J*{OS?;Zn
z{F%S%=d%MhA5QAxs`+K*^vDl5@&a6aS}~LDsSR+^5pWGR5$hPin|#3||3B?pFO@z0
Uw=*CYc<L5|r>mdKI;Vst0F`qky8r+H

diff --git a/Documentation/devel/image-logical-blocks.dot b/Documentation/devel/image-logical-blocks.neato
similarity index 100%
rename from Documentation/devel/image-logical-blocks.dot
rename to Documentation/devel/image-logical-blocks.neato
diff --git a/Makefile.in b/Makefile.in
index dd976c3281..f42addde62 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,6 +83,7 @@ TOPLEVEL_SUBDIRS := rkt tests stage1 stage1_fly
 RKT_MONITOR_STAMPS :=
 
 $(call inc-one,tools/tools.mk)
+$(call inc-one,Documentation/devel/devel.mk)
 $(call inc-many,$(foreach sd,$(TOPLEVEL_SUBDIRS),$(sd)/$(sd).mk))
 
 all: $(TOPLEVEL_STAMPS)

From ff7bb1b26ff3542d1e90d46e486607d60fa83592 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 30 Aug 2016 08:44:46 +0000
Subject: [PATCH 0694/1304] tests: check for run-prepared with insecure options

---
 tests/rkt_caps_test.go  | 32 ++++++++++++++++++++++----------
 tests/rkt_paths_test.go | 34 ++++++++++++++++++++++++++++------
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index be6ef348f7..2c63859eac 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -570,21 +570,33 @@ func TestCapsInsecureOption(t *testing.T) {
 	}, ", ")
 
 	// Without --insecure-options=capabilities
+	expectedDefault := fmt.Sprintf("Capability set: bounding: %s", defaultCaps)
 	for _, insecureOption := range []string{"image", "image,ondisk,paths", "all-fetch"} {
-		cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run %s`,
-			ctx.Cmd(), insecureOption, imageFile)
-		t.Logf("Check caps with --insecure-options=%s\n", insecureOption)
-		expected := fmt.Sprintf("Capability set: bounding: %s", defaultCaps)
-		runRktAndCheckOutput(t, cmd, expected, false)
+		// run
+		t.Logf("run: check caps with --insecure-options=%s\n", insecureOption)
+		cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run %s`, ctx.Cmd(), insecureOption, imageFile)
+		runRktAndCheckOutput(t, cmd, expectedDefault, false)
+		// run-prepared
+		t.Logf("run-prepared: check caps with --insecure-options=%s\n", insecureOption)
+		cmd = fmt.Sprintf(`%s --insecure-options=%s prepare %s`, ctx.Cmd(), insecureOption, imageFile)
+		uuid := runRktAndGetUUID(t, cmd)
+		cmd = fmt.Sprintf("%s --insecure-options=%s --debug run-prepared %s", ctx.Cmd(), insecureOption, uuid)
+		runRktAndCheckOutput(t, cmd, expectedDefault, false)
 	}
 
 	// With --insecure-options=capabilities
+	expectedAll := fmt.Sprintf("Capability set: bounding: %s", allCaps)
 	for _, insecureOption := range []string{"image,capabilities", "image,ondisk,paths,capabilities", "all-fetch,capabilities", "all"} {
-		cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run %s`,
-			ctx.Cmd(), insecureOption, imageFile)
-		t.Logf("Check caps with --insecure-options=%s\n", insecureOption)
-		expected := fmt.Sprintf("Capability set: bounding: %s", allCaps)
-		runRktAndCheckOutput(t, cmd, expected, false)
+		// run
+		t.Logf("run: check caps with --insecure-options=%s\n", insecureOption)
+		cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run %s`, ctx.Cmd(), insecureOption, imageFile)
+		runRktAndCheckOutput(t, cmd, expectedAll, false)
+		// run-prepared
+		t.Logf("run-prepared: check caps with --insecure-options=%s\n", insecureOption)
+		cmd = fmt.Sprintf(`%s --insecure-options=%s prepare %s`, ctx.Cmd(), insecureOption, imageFile)
+		uuid := runRktAndGetUUID(t, cmd)
+		cmd = fmt.Sprintf("%s --insecure-options=%s --debug run-prepared %s", ctx.Cmd(), insecureOption, uuid)
+		runRktAndCheckOutput(t, cmd, expectedAll, false)
 	}
 }
 
diff --git a/tests/rkt_paths_test.go b/tests/rkt_paths_test.go
index 949a24fde3..a1dc850dd6 100644
--- a/tests/rkt_paths_test.go
+++ b/tests/rkt_paths_test.go
@@ -46,20 +46,37 @@ func TestPathsWrite(t *testing.T) {
 
 	for _, tt := range tests {
 		// Without --insecure-options=paths
+		expectErr := fmt.Sprintf("open %s: read-only file system", tt.Path)
 		for _, insecureOption := range []string{"image", "image,ondisk,capabilities", "all-fetch"} {
+			// run
 			cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run --set-env=FILE=%s --set-env=CONTENT=%s %s`,
 				ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
-			t.Logf("Attempting to write on %q with --insecure-options=%s (expecting error)\n", tt.Path, insecureOption)
-			expect := fmt.Sprintf("open %s: read-only file system", tt.Path)
-			runRktAndCheckOutput(t, cmd, expect, true)
+			t.Logf("run: attempting to write on %q with --insecure-options=%s (expecting error)\n", tt.Path, insecureOption)
+			runRktAndCheckOutput(t, cmd, expectErr, true)
+			// run-prepared
+			t.Logf("run-prepared: attempting to write on %q with --insecure-options=%s (expecting error)\n", tt.Path, insecureOption)
+			cmd = fmt.Sprintf(`%s --insecure-options=%s prepare --set-env=FILE=%s --set-env=CONTENT=%s %s`,
+				ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
+			uuid := runRktAndGetUUID(t, cmd)
+			cmd = fmt.Sprintf("%s --debug --insecure-options=%s run-prepared --mds-register=false %s", ctx.Cmd(), insecureOption, uuid)
+			runRktAndCheckOutput(t, cmd, expectErr, true)
 		}
 
 		// With --insecure-options=paths
+		expectOk := "testing-insecure-option"
 		for _, insecureOption := range []string{"image,paths", "image,paths,ondisk,capabilities", "image,all-run", "all"} {
+			// run
+			t.Logf("run: attempting to write on %q with --insecure-options=%s (expecting success)\n", tt.Path, insecureOption)
 			cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run --set-env=FILE=%s --set-env=CONTENT=%s %s`,
 				ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
-			t.Logf("Attempting to write on %q with --insecure-options=%s (expecting success)\n", tt.Path, insecureOption)
-			runRktAndCheckOutput(t, cmd, "testing-insecure-option", false)
+			runRktAndCheckOutput(t, cmd, expectOk, false)
+			// run-prepared
+			t.Logf("run-prepared: attempting to write on %q with --insecure-options=%s (expecting success)\n", tt.Path, insecureOption)
+			cmd = fmt.Sprintf(`%s --insecure-options=%s prepare --set-env=FILE=%s --set-env=CONTENT=%s %s`,
+				ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
+			uuid := runRktAndGetUUID(t, cmd)
+			cmd = fmt.Sprintf("%s --debug --insecure-options=%s run-prepared --mds-register=false %s", ctx.Cmd(), insecureOption, uuid)
+			runRktAndCheckOutput(t, cmd, expectOk, false)
 		}
 	}
 }
@@ -75,8 +92,13 @@ func TestPathsStat(t *testing.T) {
 	hiddenCtx := testutils.NewRktRunCtx()
 	defer hiddenCtx.Cleanup()
 
+	//run
 	hiddenCmd := fmt.Sprintf("%s --insecure-options=image run %s", hiddenCtx.Cmd(), hiddenImage)
-
 	hiddenExpectedLine := fmt.Sprintf("%s: mode: d---------", hiddenEntry)
 	runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
+	// run-prepared
+	hiddenCmd = fmt.Sprintf(`%s --insecure-options=image prepare %s`, hiddenCtx.Cmd(), hiddenImage)
+	uuid := runRktAndGetUUID(t, hiddenCmd)
+	hiddenCmd = fmt.Sprintf("%s run-prepared --mds-register=false %s", hiddenCtx.Cmd(), uuid)
+	runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
 }

From f3e466a55dd6b85f1bf487e5f26af3835e475bf9 Mon Sep 17 00:00:00 2001
From: Pawel Skrzynski <pawel.skrzynski@intel.com>
Date: Wed, 10 Aug 2016 16:56:37 +0200
Subject: [PATCH 0695/1304] Documentation: description of known logging issues

Description of known issues with logging and instructions how to handle
them.

related to #2640 and #2417
---
 Documentation/commands.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 4cf4911969..eeba33ca5a 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -129,6 +129,28 @@ $ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4 -t redis
 
 Additionaly, logs can be programmatically accessed via the [sd-journal API](https://www.freedesktop.org/software/systemd/man/sd-journal.html).
 
+Currently there are two known main issues with logging in rkt:
+* In some rare situations when an application inside the pod is writing to `/dev/stdout` and `/dev/stderr` (i.e. nginx) there is no way to obtain logs.
+ The app should be modified so it will write to `stdout` or `syslog`. In the case of nginx:
+ ```
+ error_log stderr;
+ 
+ http {
+     access_log syslog:server=unix:/dev/log main;
+     [...]
+ }
+ ```
+ should be added to ```/etc/nginx/nginx.conf```
+
+* Some applications, like newer version of etcd, write directly to journald. Such log entries will not be written to stdout or stderr.
+ These logs can be retrieved by passing the machine ID to journalctl:
+
+ ```
+ $ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4
+ ```
+
+ Etcd case will be solved when [flag allowing forcing output to stdout](https://github.com/coreos/etcd/issues/5449) is added.
+
 ##### Stopped pod
 
 To read the logs of a stopped pod, use:

From ae71223383a8cb2a23e70c9f3b293df2e8295641 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 23 Aug 2016 19:59:31 +0200
Subject: [PATCH 0696/1304] common: fall back to non-overlay with ftype=0

Previously FSSupportsOverlay only supported detection of filesystems
(aufs, zfs).

This adds support for detection of unknown file types which prevents
overlay to function properly.

Finally it prints a diagnostic message if overlay could not be
auto-detected during run and prepare.

Fixes #3040
Supersedes #3052
---
 Documentation/subcommands/prepare.md |  18 +++++
 Documentation/subcommands/run.md     |  10 +++
 common/common.go                     | 111 ++++++++++++++++++++-------
 rkt/image/fetcher.go                 |   7 +-
 rkt/pods.go                          |  14 ++++
 rkt/prepare.go                       |  13 +++-
 rkt/run.go                           |  16 +++-
 rkt/run_prepared.go                  |  25 ++++++
 stage0/run.go                        |  26 +------
 tests/rkt_export_container_test.go   |   2 +-
 tests/rkt_export_fly_test.go         |   4 +-
 tests/rkt_gc_test.go                 |   4 +-
 tests/rkt_image_dependencies_test.go |   4 +-
 tests/rkt_image_gc_test.go           |   2 +-
 tests/rkt_image_list_test.go         |   2 +-
 15 files changed, 193 insertions(+), 65 deletions(-)

diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 0ade2d3ba7..cd022d2223 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -4,6 +4,24 @@ rkt can prepare images to run in a pod.
 This means it will fetch (if necessary) the images, extract them in its internal tree store, and allocate a pod UUID.
 If overlay fs is not supported or disabled, it will also copy the tree in the pod rootfs.
 
+Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`. If an unsupported filesystem is detected, rkt will print a warning message and continue preparing the pod by falling back in non-overlay mode as described above:
+
+```
+# rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.13.0
+image: remote fetching from URL "docker://busybox"
+Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
+prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
+```
+
+The following conditions can lead to non-overlay mode:
+
+The data directory (usually `/var/lib/rkt`) is on ...
+- an AUFS filesystem
+- a ZFS filesystem
+- a XFS filesystem having `ftype=0`
+- a file system where the `d_type` field is set to `DT_UNKNOWN`, see getdents(2)
+
 In this way, the pod is ready to be launched immediately by the [run-prepared](run-prepared.md) command.
 
 Running `rkt prepare` + `rkt run-prepared` is semantically equivalent to running [rkt run](run.md).
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 4ebfd4bd68..f3079d7c75 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -340,6 +340,16 @@ rkt expects stage1 images to be signed except in the following cases:
 
 For more details see the [hacking documentation](../hacking.md).
 
+## Disabling overlay
+
+rkt uses overlayfs by default when running application containers. This provides immense benefits to performance and efficiency: start times for large containers are much faster, and multiple pods using the same images will consume less disk space and can share page cache entries.
+
+This feature will be disabled automatically if the underlying filesystem does not support overlay fs, see the [prepare](prepare.md) subcommand for details. This feature can also be explicitly disabled with the `--no-overlay` option:
+
+```
+# rkt run --no-overlay=true --insecure-options=image coreos.com/etcd:v2.0.0
+```
+
 ## Options
 
 | Flag | Default | Options | Description |
diff --git a/common/common.go b/common/common.go
index 5b3af215e7..4b2792b481 100644
--- a/common/common.go
+++ b/common/common.go
@@ -26,6 +26,7 @@ import (
 	"strconv"
 	"strings"
 	"syscall"
+	"unsafe"
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema/types"
@@ -73,6 +74,13 @@ const (
 	FsMagicZFS  = 0x2FC12FC1 // https://goo.gl/xTvzO5
 )
 
+// ErrOverlayUnsupported is the error determining whether OverlayFS is supported.
+type ErrOverlayUnsupported string
+
+func (e ErrOverlayUnsupported) Error() string {
+	return string(e)
+}
+
 // Stage1ImagePath returns the path where the stage1 app image (unpacked ACI) is rooted,
 // (i.e. where its contents are extracted during stage0).
 func Stage1ImagePath(root string) string {
@@ -165,26 +173,6 @@ func GetRktLockFD() (int, error) {
 	return -1, fmt.Errorf("%v env var is not set", EnvLockFd)
 }
 
-// SupportsOverlay returns whether the system supports overlay filesystem
-func SupportsOverlay() bool {
-	exec.Command("modprobe", "overlay").Run()
-
-	f, err := os.Open("/proc/filesystems")
-	if err != nil {
-		fmt.Println("error opening /proc/filesystems")
-		return false
-	}
-	defer f.Close()
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		if s.Text() == "nodev\toverlay" {
-			return true
-		}
-	}
-	return false
-}
-
 // SupportsUserNS returns whether the kernel has CONFIG_USER_NS set
 func SupportsUserNS() bool {
 	if _, err := os.Stat("/proc/self/uid_map"); err == nil {
@@ -327,21 +315,86 @@ func SystemdVersion(systemdBinaryPath string) (int, error) {
 	return version, nil
 }
 
-// FSSupportsOverlay checks whether the filesystem under which
-// a specified path resides is compatible with OverlayFS
-func FSSupportsOverlay(path string) bool {
+// SupportsOverlay returns whether the operating system generally supports OverlayFS,
+// returning an instance of ErrOverlayUnsupported which encodes the reason.
+// It is sufficient to check for nil if the reason is not of interest.
+func SupportsOverlay() error {
+	// ignore exec.Command error, modprobe may not be present on the system,
+	// or the kernel module will fail to load.
+	// we'll find out by reading the side effect in /proc/filesystems
+	_ = exec.Command("modprobe", "overlay").Run()
+
+	f, err := os.Open("/proc/filesystems")
+	if err != nil {
+		// don't use errwrap so consumers can type-check on ErrOverlayUnsupported
+		return ErrOverlayUnsupported(fmt.Sprintf("cannot open /proc/filesystems: %v", err))
+	}
+	defer f.Close()
+
+	s := bufio.NewScanner(f)
+	for s.Scan() {
+		if s.Text() == "nodev\toverlay" {
+			return nil
+		}
+	}
+
+	return ErrOverlayUnsupported("overlay entry not present in /proc/filesystems")
+}
+
+// PathSupportsOverlay checks whether the given path is compatible with OverlayFS.
+// This method also calls SupportsOverlay().
+//
+// It returns an instance of ErrOverlayUnsupported if OverlayFS is not supported
+// or any other error if determining overlay support failed.
+func PathSupportsOverlay(path string) error {
+	if err := SupportsOverlay(); err != nil {
+		// don't wrap since SupportsOverlay already returns ErrOverlayUnsupported
+		return err
+	}
+
 	var data syscall.Statfs_t
-	err := syscall.Statfs(path, &data)
+	if err := syscall.Statfs(path, &data); err != nil {
+		return errwrap.Wrap(fmt.Errorf("cannot statfs %q", path), err)
+	}
+
+	switch data.Type {
+	case FsMagicAUFS:
+		return ErrOverlayUnsupported("unsupported filesystem: aufs")
+	case FsMagicZFS:
+		return ErrOverlayUnsupported("unsupported filesystem: zfs")
+	}
+
+	dir, err := os.OpenFile(path, syscall.O_RDONLY|syscall.O_DIRECTORY, 0755)
 	if err != nil {
-		return false
+		return errwrap.Wrap(fmt.Errorf("cannot open %q", dir), err)
 	}
+	defer dir.Close()
 
-	if data.Type == FsMagicAUFS ||
-		data.Type == FsMagicZFS {
-		return false
+	buf := make([]byte, 4096)
+	// ReadDirent forwards to the raw syscall getdents(3),
+	// passing the buffer size.
+	n, err := syscall.ReadDirent(int(dir.Fd()), buf)
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("cannot read directory %q", dir), err)
 	}
 
-	return true
+	offset := 0
+	for offset < n {
+		// offset overflow cannot happen, because Reclen
+		// is being maintained by getdents(3), considering the buffer size.
+		dirent := (*syscall.Dirent)(unsafe.Pointer(&buf[offset]))
+		offset += int(dirent.Reclen)
+
+		if dirent.Ino == 0 { // File absent in directory.
+			continue
+		}
+
+		if dirent.Type == syscall.DT_UNKNOWN {
+			return ErrOverlayUnsupported("unsupported filesystem: missing d_type support")
+		}
+	}
+
+	return nil
 }
 
 // RemoveEmptyLines removes empty lines from the given string
diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index 245f082b0f..b96d449bc2 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -53,9 +53,12 @@ func (f *Fetcher) FetchImage(img string, ascPath string, imgType apps.AppImageTy
 			return "", err
 		}
 	}
+
 	// we need to be able to do a chroot and access to the tree store
-	// directories, check if we're root
-	if common.SupportsOverlay() && os.Geteuid() == 0 {
+	// directories, we need to
+	// 1) check if the system supports OverlayFS
+	// 2) check if we're root
+	if common.SupportsOverlay() == nil && os.Geteuid() == 0 {
 		if _, _, err := f.Ts.Render(hash, false); err != nil {
 			return "", errwrap.Wrap(errors.New("error rendering tree store"), err)
 		}
diff --git a/rkt/pods.go b/rkt/pods.go
index ba81b01efd..e44c38ae57 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -1134,3 +1134,17 @@ func (p *pod) sync() error {
 	}
 	return nil
 }
+
+// overlayPrepared returns true if the given pod was prepared using overlay else false.
+// It returns an error if the operation failed.
+func (p *pod) overlayPrepared() (bool, error) {
+	_, err := os.Stat(filepath.Join(p.path(), common.OverlayPreparedFilename))
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 7019b1d6cf..07fed953fa 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -182,9 +182,20 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		Debug:       globalFlags.Debug,
 	}
 
+	ovlOk := true
+	if err := common.PathSupportsOverlay(getDataDir()); err != nil {
+		if oerr, ok := err.(common.ErrOverlayUnsupported); ok {
+			stderr.Printf("disabling overlay support: %q", oerr.Error())
+			ovlOk = false
+		} else {
+			stderr.PrintE("error determining overlay support", err)
+			return 1
+		}
+	}
+
 	pcfg := stage0.PrepareConfig{
 		CommonConfig:       &cfg,
-		UseOverlay:         !flagNoOverlay && common.SupportsOverlay() && common.FSSupportsOverlay(getDataDir()),
+		UseOverlay:         !flagNoOverlay && ovlOk,
 		PrivateUsers:       privateUsers,
 		SkipTreeStoreCheck: globalFlags.InsecureFlags.SkipOnDiskCheck(),
 	}
diff --git a/rkt/run.go b/rkt/run.go
index a02bafd1ef..eec843ecf3 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -257,9 +257,22 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		Debug:        globalFlags.Debug,
 	}
 
+	ovlOk := true
+	if err := common.PathSupportsOverlay(getDataDir()); err != nil {
+		if oerr, ok := err.(common.ErrOverlayUnsupported); ok {
+			stderr.Printf("disabling overlay support: %q", oerr.Error())
+			ovlOk = false
+		} else {
+			stderr.PrintE("error determining overlay support", err)
+			return 1
+		}
+	}
+
+	useOverlay := !flagNoOverlay && ovlOk
+
 	pcfg := stage0.PrepareConfig{
 		CommonConfig:       &cfg,
-		UseOverlay:         !flagNoOverlay && common.SupportsOverlay() && common.FSSupportsOverlay(getDataDir()),
+		UseOverlay:         useOverlay,
 		PrivateUsers:       privateUsers,
 		SkipTreeStoreCheck: globalFlags.InsecureFlags.SkipOnDiskCheck(),
 	}
@@ -325,6 +338,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		InsecureCapabilities: globalFlags.InsecureFlags.SkipCapabilities(),
 		InsecurePaths:        globalFlags.InsecureFlags.SkipPaths(),
 		InsecureSeccomp:      globalFlags.InsecureFlags.SkipSeccomp(),
+		UseOverlay:           useOverlay,
 	}
 
 	apps, err := p.getApps()
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index 3591797ece..8bf7c9e76e 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -125,6 +125,30 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		rktgid = -1
 	}
 
+	ovlOk := true
+	if err := common.PathSupportsOverlay(getDataDir()); err != nil {
+		if oerr, ok := err.(common.ErrOverlayUnsupported); ok {
+			stderr.Printf("disabling overlay support: %q", oerr.Error())
+			ovlOk = false
+		} else {
+			stderr.PrintE("error determining overlay support", err)
+			return 1
+		}
+	}
+
+	ovlPrep, err := p.overlayPrepared()
+	if err != nil {
+		stderr.PrintE("unable to determine prepared overlay state", err)
+		return 1
+	}
+
+	// should not happen, maybe the data directory moved from an overlay-enabled fs to another location
+	// between prepare and run-prepared
+	if ovlPrep && !ovlOk {
+		stderr.Print("unable to run prepared overlay-enabled pod: overlay not supported")
+		return 1
+	}
+
 	rcfg := stage0.RunConfig{
 		CommonConfig: &stage0.CommonConfig{
 			Store:     s,
@@ -145,6 +169,7 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		InsecureCapabilities: globalFlags.InsecureFlags.SkipCapabilities(),
 		InsecurePaths:        globalFlags.InsecureFlags.SkipPaths(),
 		InsecureSeccomp:      globalFlags.InsecureFlags.SkipSeccomp(),
+		UseOverlay:           ovlPrep && ovlOk,
 	}
 	if globalFlags.Debug {
 		stage0.InitDebug()
diff --git a/stage0/run.go b/stage0/run.go
index ade3e47c0e..4084bc07f1 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -88,6 +88,7 @@ type RunConfig struct {
 	InsecureCapabilities bool           // Do not restrict capabilities
 	InsecurePaths        bool           // Do not restrict access to files in sysfs or procfs
 	InsecureSeccomp      bool           // Do not add seccomp restrictions
+	UseOverlay           bool           // run pod with overlay fs
 }
 
 // CommonConfig defines the configuration shared by both Run and Prepare
@@ -423,22 +424,6 @@ func Prepare(cfg PrepareConfig, dir string, uuid *types.UUID) error {
 	return nil
 }
 
-func preparedWithOverlay(dir string) (bool, error) {
-	_, err := os.Stat(filepath.Join(dir, common.OverlayPreparedFilename))
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	if err != nil {
-		return false, err
-	}
-
-	if !common.SupportsOverlay() {
-		return false, fmt.Errorf("the pod was prepared with overlay but overlay is not supported")
-	}
-
-	return true, nil
-}
-
 func preparedWithPrivateUsers(dir string) (string, error) {
 	bytes, err := ioutil.ReadFile(filepath.Join(dir, common.PrivateUsersPreparedFilename))
 	if os.IsNotExist(err) {
@@ -486,24 +471,19 @@ func addResolvConf(cfg RunConfig, rootfs string) {
 // Run mounts the right overlay filesystems and actually runs the prepared
 // pod by exec()ing the stage1 init inside the pod filesystem.
 func Run(cfg RunConfig, dir string, dataDir string) {
-	useOverlay, err := preparedWithOverlay(dir)
-	if err != nil {
-		log.FatalE("error preparing overlay", err)
-	}
-
 	privateUsers, err := preparedWithPrivateUsers(dir)
 	if err != nil {
 		log.FatalE("error preparing private users", err)
 	}
 
 	debug("Setting up stage1")
-	if err := setupStage1Image(cfg, dir, useOverlay); err != nil {
+	if err := setupStage1Image(cfg, dir, cfg.UseOverlay); err != nil {
 		log.FatalE("error setting up stage1", err)
 	}
 	debug("Wrote filesystem to %s\n", dir)
 
 	for _, app := range cfg.Apps {
-		if err := setupAppImage(cfg, app.Name, app.Image.ID, dir, useOverlay); err != nil {
+		if err := setupAppImage(cfg, app.Name, app.Image.ID, dir, cfg.UseOverlay); err != nil {
 			log.FatalE("error setting up app image", err)
 		}
 	}
diff --git a/tests/rkt_export_container_test.go b/tests/rkt_export_container_test.go
index 90d2b39d25..a8fde0fa57 100644
--- a/tests/rkt_export_container_test.go
+++ b/tests/rkt_export_container_test.go
@@ -34,7 +34,7 @@ func TestExport(t *testing.T) {
 		testCases = append(testCases, userNS)
 	}
 
-	if common.SupportsOverlay() {
+	if common.SupportsOverlay() == nil {
 		testCases = append(testCases, overlaySimpleTest)
 		testCases = append(testCases, overlaySimulateReboot)
 	}
diff --git a/tests/rkt_export_fly_test.go b/tests/rkt_export_fly_test.go
index c6383b83fa..78c39c9945 100644
--- a/tests/rkt_export_fly_test.go
+++ b/tests/rkt_export_fly_test.go
@@ -23,8 +23,8 @@ import (
 )
 
 func TestExport(t *testing.T) {
-	if !common.SupportsOverlay() {
-		t.Skip("Overlay fs not supported.")
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Overlay fs not supported: %v", err)
 	}
 
 	// TODO(iaguis): we need a new function to unmount the fly pod so we can also test
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 4cfc55ba45..11451ff2ee 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -80,8 +80,8 @@ func podsRemaining(t *testing.T, ctx *testutils.RktRunCtx) []os.FileInfo {
 }
 
 func TestGCAfterUnmount(t *testing.T) {
-	if !common.SupportsOverlay() {
-		t.Skip("Overlay fs not supported.")
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Overlay fs not supported: %v", err)
 	}
 
 	ctx := testutils.NewRktRunCtx()
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 8375fa1543..720b8a9ab8 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -221,8 +221,8 @@ func TestImageDependencies(t *testing.T) {
 
 func TestRenderOnFetch(t *testing.T) {
 	// If overlayfs is not supported, we don't render images on fetch
-	if !common.SupportsOverlay() {
-		t.Skip("Overlay fs not supported.")
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Overlay fs not supported: %v", err)
 	}
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
diff --git a/tests/rkt_image_gc_test.go b/tests/rkt_image_gc_test.go
index 918e8ae114..7a090d26a3 100644
--- a/tests/rkt_image_gc_test.go
+++ b/tests/rkt_image_gc_test.go
@@ -34,7 +34,7 @@ func TestImageGCTreeStore(t *testing.T) {
 
 	expectedTreeStores := 2
 	// If overlayfs is not supported only the stage1 image is rendered in the treeStore
-	if !common.SupportsOverlay() {
+	if common.SupportsOverlay() != nil {
 		expectedTreeStores = 1
 	}
 
diff --git a/tests/rkt_image_list_test.go b/tests/rkt_image_list_test.go
index 038634a351..0d27d375a2 100644
--- a/tests/rkt_image_list_test.go
+++ b/tests/rkt_image_list_test.go
@@ -81,7 +81,7 @@ func TestImageSize(t *testing.T) {
 	imageListCmd := fmt.Sprintf("%s image list --no-legend --full", ctx.Cmd())
 
 	// if we don't support overlay fs, we don't render the image on fetch
-	if !common.SupportsOverlay() {
+	if common.SupportsOverlay() != nil {
 		// check that the printed size is the same as the actual image size
 		expectedStr := fmt.Sprintf("(?s)%s.*%d.*", imageHash, imageSize)
 

From c31f3fa5504088bb02ee7cd8dce1b9c477751f1d Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 30 Aug 2016 12:05:32 +0000
Subject: [PATCH 0697/1304] vendor: update appc/spec to 0.8.7

---
 glide.lock                                    |  6 +-
 glide.yaml                                    |  2 +-
 .../appc/spec/ace/image_manifest_main.json.in |  4 +-
 .../spec/ace/image_manifest_sidekick.json.in  |  4 +-
 vendor/github.com/appc/spec/ace/validator.go  | 10 +--
 .../github.com/appc/spec/actool/manifest.go   | 50 +++++------
 vendor/github.com/appc/spec/discovery/http.go |  2 +-
 .../appc/spec/schema/types/isolator_unix.go   | 83 +++++++++++++++++++
 .../appc/spec/schema/types/labels.go          |  2 +-
 vendor/github.com/appc/spec/schema/version.go |  2 +-
 10 files changed, 118 insertions(+), 47 deletions(-)
 create mode 100644 vendor/github.com/appc/spec/schema/types/isolator_unix.go

diff --git a/glide.lock b/glide.lock
index 60c4020789..0f316f329c 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 85887ddac777e118486cde0a7d15ce8b2e1f05aeab1af97600d74d8f22ebb109
-updated: 2016-08-29T07:52:29.649451159Z
+hash: f9a3d5488f0ccf2c1d7e3ee1d725a3c6bf4f4b5128950b44df34c3eee657c2e6
+updated: 2016-08-30T12:00:39.148220845Z
 imports:
 - name: github.com/appc/docker2aci
   version: 15d68b33bfee95a448c4da37dbe876baa8fcb5b6
@@ -20,7 +20,7 @@ imports:
   subpackages:
   - proj2aci
 - name: github.com/appc/spec
-  version: 01b1a0221620c2f394c0684686dcf111c484873e
+  version: f329150233aa3ac6c83ab5ba02a2b5a8bd03d365
   subpackages:
   - ace
   - aci
diff --git a/glide.yaml b/glide.yaml
index 96df86908f..6a81cc8f49 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,7 +20,7 @@ import:
   subpackages:
   - proj2aci
 - package: github.com/appc/spec
-  version: v0.8.6
+  version: v0.8.7
   subpackages:
   - ace
   - aci
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
index 9f3f02c360..1d6968c221 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.6" },
+        { "name": "version", "value": "0.8.7" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index 93ebb61d7c..f58b77966a 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.6" },
+        { "name": "version", "value": "0.8.7" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/ace/validator.go b/vendor/github.com/appc/spec/ace/validator.go
index fdd27ac222..f92652cde2 100644
--- a/vendor/github.com/appc/spec/ace/validator.go
+++ b/vendor/github.com/appc/spec/ace/validator.go
@@ -328,14 +328,10 @@ func validatePodMetadata(metadataURL string, pm *schema.PodManifest) results {
 func validateAppAnnotations(metadataURL string, pm *schema.PodManifest, app *schema.RuntimeApp, img *schema.ImageManifest) results {
 	r := results{}
 
-	// build a map of expected annotations by merging app.Annotations
+	// build a map of expected annotations by merging img.Annotations
 	// with PodManifest overrides
-	expectedAnnots := app.Annotations
-	a := pm.Apps.Get(app.Name)
-	if a == nil {
-		panic("could not find app in manifest!")
-	}
-	for _, annot := range a.Annotations {
+	expectedAnnots := img.Annotations
+	for _, annot := range app.Annotations {
 		expectedAnnots.Set(annot.Name, annot.Value)
 	}
 	if len(expectedAnnots) == 0 {
diff --git a/vendor/github.com/appc/spec/actool/manifest.go b/vendor/github.com/appc/spec/actool/manifest.go
index cfc69f159a..feae1144ac 100644
--- a/vendor/github.com/appc/spec/actool/manifest.go
+++ b/vendor/github.com/appc/spec/actool/manifest.go
@@ -18,6 +18,7 @@ import (
 	"archive/tar"
 	"compress/gzip"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -205,41 +206,32 @@ func patchManifest(im *schema.ImageManifest) error {
 		}
 	}
 
-	if patchCaps != "" {
-		isolator := app.Isolators.GetByName(types.LinuxCapabilitiesRetainSetName)
-		if isolator != nil {
-			return fmt.Errorf("isolator already exists (os/linux/capabilities-retain-set)")
-		}
-
-		// Instantiate a Isolator with the content specified by the --capability
-		// parameter.
-		caps, err := types.NewLinuxCapabilitiesRetainSet(strings.Split(patchCaps, ",")...)
-		if err != nil {
-			return fmt.Errorf("cannot parse capability %q: %v", patchCaps, err)
-		}
-		isolator, err = caps.AsIsolator()
-		if err != nil {
-			return err
-		}
-		app.Isolators = append(app.Isolators, *isolator)
+	if patchCaps != "" && patchRevokeCaps != "" {
+		return errors.New("conflicting capabilities isolators provided")
 	}
-	if patchRevokeCaps != "" {
-		isolator := app.Isolators.GetByName(types.LinuxCapabilitiesRevokeSetName)
-		if isolator != nil {
-			return fmt.Errorf("isolator already exists (os/linux/capabilities-remove-set)")
+	if patchCaps != "" || patchRevokeCaps != "" {
+		var capsAsIsolator types.AsIsolator
+		var err error
+		if patchCaps != "" {
+			// Instantiate Isolator with content specified by --capability
+			capsAsIsolator, err = types.NewLinuxCapabilitiesRetainSet(strings.Split(patchCaps, ",")...)
+			if err != nil {
+				return fmt.Errorf("cannot parse capability retain set %q: %v", patchCaps, err)
+			}
 		}
-
-		// Instantiate a Isolator with the content specified by the --revoke-capability
-		// parameter.
-		caps, err := types.NewLinuxCapabilitiesRevokeSet(strings.Split(patchRevokeCaps, ",")...)
-		if err != nil {
-			return fmt.Errorf("cannot parse capability %q: %v", patchRevokeCaps, err)
+		if patchRevokeCaps != "" {
+			// Instantiate Isolator with content specified by --revoke-capability
+			capsAsIsolator, err = types.NewLinuxCapabilitiesRevokeSet(strings.Split(patchRevokeCaps, ",")...)
+			if err != nil {
+				return fmt.Errorf("cannot parse capability remove set %q: %v", patchRevokeCaps, err)
+			}
 		}
-		isolator, err = caps.AsIsolator()
+		capsIsolator, err := capsAsIsolator.AsIsolator()
 		if err != nil {
 			return err
 		}
-		app.Isolators = append(app.Isolators, *isolator)
+		capsKeys := []types.ACIdentifier{types.LinuxCapabilitiesRevokeSetName, types.LinuxCapabilitiesRetainSetName}
+		app.Isolators.ReplaceIsolatorsByName(*capsIsolator, capsKeys)
 	}
 
 	if patchMounts != "" {
diff --git a/vendor/github.com/appc/spec/discovery/http.go b/vendor/github.com/appc/spec/discovery/http.go
index b6ed644bd3..7f30e66819 100644
--- a/vendor/github.com/appc/spec/discovery/http.go
+++ b/vendor/github.com/appc/spec/discovery/http.go
@@ -28,7 +28,7 @@ import (
 type InsecureOption int
 
 const (
-	defaultDialTimeout = 5 * time.Second
+	defaultDialTimeout = 20 * time.Second
 )
 
 const (
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_unix.go b/vendor/github.com/appc/spec/schema/types/isolator_unix.go
new file mode 100644
index 0000000000..ac0111a7de
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/isolator_unix.go
@@ -0,0 +1,83 @@
+// Copyright 2016 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+import (
+	"encoding/json"
+)
+
+var (
+	UnixIsolatorNames = make(map[ACIdentifier]struct{})
+)
+
+const (
+	//TODO(lucab): add "ulimit" isolators
+	UnixSysctlName = "os/unix/sysctl"
+)
+
+func init() {
+	for name, con := range map[ACIdentifier]IsolatorValueConstructor{
+		UnixSysctlName: func() IsolatorValue { return &UnixSysctl{} },
+	} {
+		AddIsolatorName(name, UnixIsolatorNames)
+		AddIsolatorValueConstructor(name, con)
+	}
+}
+
+type UnixSysctl map[string]string
+
+func (s *UnixSysctl) UnmarshalJSON(b []byte) error {
+	var v map[string]string
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+	*s = UnixSysctl(v)
+	return err
+}
+
+func (s UnixSysctl) AssertValid() error {
+	return nil
+}
+
+func (s UnixSysctl) multipleAllowed() bool {
+	return false
+}
+func (s UnixSysctl) Conflicts() []ACIdentifier {
+	return nil
+}
+
+func (s UnixSysctl) AsIsolator() Isolator {
+	isol := isolatorMap[UnixSysctlName]()
+
+	b, err := json.Marshal(s)
+	if err != nil {
+		panic(err)
+	}
+	valRaw := json.RawMessage(b)
+	return Isolator{
+		Name:     UnixSysctlName,
+		ValueRaw: &valRaw,
+		value:    isol,
+	}
+}
+
+func NewUnixSysctlIsolator(cfg map[string]string) (*UnixSysctl, error) {
+	s := UnixSysctl(cfg)
+	if err := s.AssertValid(); err != nil {
+		return nil, err
+	}
+	return &s, nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/labels.go b/vendor/github.com/appc/spec/schema/types/labels.go
index ebd2bb1a98..32d703cd10 100644
--- a/vendor/github.com/appc/spec/schema/types/labels.go
+++ b/vendor/github.com/appc/spec/schema/types/labels.go
@@ -21,7 +21,7 @@ import (
 )
 
 var ValidOSArch = map[string][]string{
-	"linux":   {"amd64", "i386", "aarch64", "aarch64_be", "armv6l", "armv7l", "armv7b"},
+	"linux":   {"amd64", "i386", "aarch64", "aarch64_be", "armv6l", "armv7l", "armv7b", "ppc64", "ppc64le", "s390x"},
 	"freebsd": {"amd64", "i386", "arm"},
 	"darwin":  {"x86_64", "i386"},
 }
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go
index 4d4e1f1fba..7b0e2da6e5 100644
--- a/vendor/github.com/appc/spec/schema/version.go
+++ b/vendor/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.6"
+	version string = "0.8.7"
 )
 
 var (

From ad9e367156638b0f9353c4b2ff712271a56e9feb Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 30 Aug 2016 12:10:09 +0000
Subject: [PATCH 0698/1304] rkt: update all appc/spec references to 0.8.7

---
 Documentation/app-container.md                   |  4 ++--
 Documentation/devel/stage1-implementors-guide.md |  2 +-
 Documentation/subcommands/cat-manifest.md        |  2 +-
 Documentation/subcommands/image.md               |  2 +-
 Documentation/subcommands/version.md             |  2 +-
 pkg/aci/aci.go                                   |  2 +-
 stage1/aci/aci-manifest.in                       |  2 +-
 stage1_fly/aci/aci-manifest.in                   |  2 +-
 store/imagestore/store_test.go                   | 12 ++++++------
 store/treestore/tree_test.go                     |  4 ++--
 tests/empty-image/manifest                       |  2 +-
 tests/image/manifest                             |  2 +-
 tests/rkt-monitor/build-too-many-apps.sh         |  2 +-
 tests/rkt_exec_test.go                           |  2 +-
 tests/rkt_fetch_test.go                          |  2 +-
 tests/rkt_image_cat_manifest_test.go             |  2 +-
 tests/rkt_image_dependencies_test.go             |  2 +-
 tests/rkt_image_export_test.go                   |  2 +-
 tests/rkt_image_render_test.go                   |  2 +-
 tests/rkt_os_arch_test.go                        |  2 +-
 tests/stub-stage1/manifest                       |  2 +-
 21 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index cb54478628..b50a5532db 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -33,8 +33,8 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 # rkt --insecure-options=image run \
 	--mds-register \
 	--volume=database,kind=host,source=/tmp \
-	https://github.com/appc/spec/releases/download/v0.8.6/ace-validator-main.aci \
-	https://github.com/appc/spec/releases/download/v0.8.6/ace-validator-sidekick.aci
+	https://github.com/appc/spec/releases/download/v0.8.7/ace-validator-main.aci \
+	https://github.com/appc/spec/releases/download/v0.8.7/ace-validator-sidekick.aci
 ```
 
 [appc-repo]: https://github.com/appc/spec/
diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 5a66cb4803..d6838519ba 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -137,7 +137,7 @@ The current version of the stage1 interface is 3.
 ```json
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "foo.com/rkt/stage1",
     "labels": [
         {
diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index c39d6253dc..733aa0573b 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -5,7 +5,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 ```
 # rkt cat-manifest UUID
 {
-  "acVersion":"0.8.6",
+  "acVersion":"0.8.7",
   "acKind":"PodManifest"
 ...
 ```
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index c83da83117..1bb50d404a 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -7,7 +7,7 @@ For debugging or inspection you may want to extract an ACI manifest to stdout.
 ```
 # rkt image cat-manifest coreos.com/etcd
 {
-  "acVersion": "0.8.6",
+  "acVersion": "0.8.7",
   "acKind": "ImageManifest",
 ...
 ```
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 722ec5a24b..e6a2af9d16 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -7,6 +7,6 @@ This command prints the rkt version, the appc version rkt is built against, and
 ```
 $ rkt version
 rkt Version: 1.13.0
-appc Version: 0.8.6
+appc Version: 0.8.7
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/pkg/aci/aci.go b/pkg/aci/aci.go
index f760fa615b..aa672f358a 100644
--- a/pkg/aci/aci.go
+++ b/pkg/aci/aci.go
@@ -107,7 +107,7 @@ func (aw *imageArchiveWriter) Close() error {
 // NewBasicACI creates a new ACI in the given directory with the given name.
 // Used for testing.
 func NewBasicACI(dir string, name string) (*os.File, error) {
-	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.6","name":"%s"}`, name)
+	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.7","name":"%s"}`, name)
 	return NewACI(dir, manifest, nil)
 }
 
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index c3e2753e2c..554009f39c 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index 69cd279b3a..49c67d5350 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "coreos.com/rkt/stage1-fly",
     "labels": [
         {
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index 4243e4e9b9..13f0619cc2 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -163,7 +163,7 @@ func TestGetImageManifest(t *testing.T) {
 
 	imj := `{
 			"acKind": "ImageManifest",
-			"acVersion": "0.8.6",
+			"acVersion": "0.8.7",
 			"name": "example.com/test01"
 		}`
 
@@ -228,7 +228,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.6",
+						"acVersion": "0.8.7",
 						"name": "example.com/test01"
 					}`,
 					false,
@@ -236,7 +236,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.6",
+						"acVersion": "0.8.7",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.6",
+						"acVersion": "0.8.7",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -358,7 +358,7 @@ func TestRemoveACI(t *testing.T) {
 
 	imj := `{
                     "acKind": "ImageManifest",
-                    "acVersion": "0.8.6",
+                    "acVersion": "0.8.7",
                     "name": "example.com/test01"
                 }`
 
@@ -403,7 +403,7 @@ func TestRemoveACI(t *testing.T) {
 	// Simulate error removing from the
 	imj = `{
                    "acKind": "ImageManifest",
-                   "acVersion": "0.8.6",
+                   "acVersion": "0.8.7",
                    "name": "example.com/test01"
                }`
 
diff --git a/store/treestore/tree_test.go b/store/treestore/tree_test.go
index 49b81c1c9c..a471cf8309 100644
--- a/store/treestore/tree_test.go
+++ b/store/treestore/tree_test.go
@@ -34,7 +34,7 @@ func testStoreWriteACI(dir string, s *imagestore.Store) (string, error) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.6",
+		    "acVersion": "0.8.7",
 		    "name": "example.com/test01"
 		}
 	`
@@ -202,7 +202,7 @@ func TestTreeStore(t *testing.T) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.6",
+		    "acVersion": "0.8.7",
 		    "name": "example.com/test01"
 		}
 	`
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index b489d6a443..ab9557a99d 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "coreos.com/rkt-empty",
     "labels": [
         {
diff --git a/tests/image/manifest b/tests/image/manifest
index 421d684f86..323039891b 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "coreos.com/rkt-inspect",
     "labels": [
         {
diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
index 36affa97f6..76e870fdce 100755
--- a/tests/rkt-monitor/build-too-many-apps.sh
+++ b/tests/rkt-monitor/build-too-many-apps.sh
@@ -45,7 +45,7 @@ OUTPUT=${PWD}/too-many-apps.podmanifest
 
 cat <<EOF >${OUTPUT}
 {
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "acKind": "PodManifest",
     "apps": [
 EOF
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 2dec988556..ef4bc00de7 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 0fb60487a6..a82b4bf1a9 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -536,7 +536,7 @@ func TestDeferredSignatureDownload(t *testing.T) {
 }
 
 func TestDifferentDiscoveryLabels(t *testing.T) {
-	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 	emptyImage := getEmptyImagePath()
 	imageName := "localhost/rkt-test-different-discovery-labels-image"
 	manifest := strings.Replace(manifestTemplate, "IMG_NAME", imageName, -1)
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 3dcfb74d7a..415cdfcd34 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 8375fa1543..d7ed8d269b 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -33,7 +33,7 @@ const (
 	manifestDepsTemplate = `
 {
    "acKind" : "ImageManifest",
-   "acVersion" : "0.8.6",
+   "acVersion" : "0.8.7",
    "dependencies" : [
       DEPENDENCIES
    ],
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index c05eb34115..73869552ed 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index bbbd456ac1..4b15652ada 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index bc1cc88076..46e4286f7c 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.6","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {
diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest
index d405570161..c849b8cc47 100644
--- a/tests/stub-stage1/manifest
+++ b/tests/stub-stage1/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.6",
+    "acVersion": "0.8.7",
     "name": "localhost/rkt-stub-stage1",
     "labels": [
         {

From b4b4059577be1a828e33d5c27c8b597a573fcbb8 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 30 Aug 2016 22:09:38 +0200
Subject: [PATCH 0699/1304] scripts: install-rkt.sh: fail install-pak on errors

When install-pak (called from install-rkt.sh) fails at some point
abort packaging.

This is based on a discussion in
https://github.com/coreos/rkt/pull/3127#discussion-diff-76763179 where
it was agreed upon that aborting on unexpected failures would be
desirable.
---
 scripts/install-rkt.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 64ed3097fd..6e82cd4976 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -29,6 +29,9 @@ tar xvzf rkt-v"${version}".tar.gz
 cat <<EOF >install-pak
 #!/bin/bash
 
+# abort/fail on any error
+set -e
+
 # fix mkdir issues with checkinstall and fstrans
 for dir in /usr/lib/rkt/stage1-images/\\
         /usr/share/man/man1/\\

From 39de3a1b2b09068d05764a87fb18fff331c25ab7 Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Fri, 26 Aug 2016 16:19:00 -0700
Subject: [PATCH 0700/1304] stage1: update to CoreOS 1151.0.0 and systemd v231

Note that Gentoo masks kerberos support on arm64, so sshd only has
those dependencies on amd64.
---
 stage1/usr_from_coreos/coreos-common.mk               |  4 ++--
 .../manifest-amd64-usr.d/systemd.manifest             | 11 +++++------
 .../manifest-arm64-usr.d/systemd.manifest             |  9 ++++-----
 .../usr_from_kvm/manifest-amd64-usr.d/sshd.manifest   | 10 ++++++++++
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index e812c9f853..9ad79d9a71 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -9,9 +9,9 @@ _CCN_INCLUDED_ := x
 $(call setup-tmp-dir,CCN_TMPDIR)
 
 # systemd version in coreos image
-CCN_SYSTEMD_VERSION := v229
+CCN_SYSTEMD_VERSION := v231
 # coreos image version
-CCN_IMG_RELEASE := 1097.0.0
+CCN_IMG_RELEASE := 1151.0.0
 # coreos image URL
 CCN_IMG_URL := https://alpha.release.core-os.net/$(RKT_STAGE1_COREOS_BOARD)/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image
diff --git a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
index 4b36cecda4..be867bab29 100644
--- a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
@@ -15,6 +15,7 @@ bin/systemd-notify
 bin/systemd-nspawn
 bin/systemd-path
 bin/systemd-run
+bin/systemd-socket-activate
 bin/systemd-stdio-bridge
 bin/systemd-sysusers
 bin/systemd-tmpfiles
@@ -43,7 +44,7 @@ lib64/libgcrypt.so.20
 lib64/libgcrypt.so.20.0.5
 lib64/libgpg-error.so
 lib64/libgpg-error.so.0
-lib64/libgpg-error.so.0.10.0
+lib64/libgpg-error.so.0.15.0
 lib64/libip4tc.so
 lib64/libip4tc.so.0
 lib64/libip4tc.so.0.1.0
@@ -55,7 +56,7 @@ lib64/libkmod.so.2
 lib64/libkmod.so.2.2.11
 lib64/liblzma.so
 lib64/liblzma.so.5
-lib64/liblzma.so.5.0.8
+lib64/liblzma.so.5.2.2
 lib64/libmount.so
 lib64/libmount.so.1
 lib64/libmount.so.1.1.0
@@ -66,7 +67,7 @@ lib64/libpam.so.0
 lib64/libpam.so.0.84.1
 lib64/libpcre.so
 lib64/libpcre.so.1
-lib64/libpcre.so.1.2.4
+lib64/libpcre.so.1.2.6
 lib64/libpthread-2.21.so
 lib64/libpthread.so
 lib64/libpthread.so.0
@@ -84,14 +85,12 @@ lib64/libuuid.so.1.3.0
 lib64/libz.so
 lib64/libz.so.1
 lib64/libz.so.1.2.8
+lib64/systemd/libsystemd-shared-231.so
 lib64/systemd/system-sleep
 lib64/systemd/systemd
 lib64/systemd/systemd-ac-power
-lib64/systemd/systemd-activate
 lib64/systemd/systemd-backlight
 lib64/systemd/systemd-binfmt
-lib64/systemd/systemd-bootchart
-lib64/systemd/systemd-bus-proxyd
 lib64/systemd/systemd-cgroups-agent
 lib64/systemd/systemd-coredump
 lib64/systemd/systemd-fsck
diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
index f47fe361c8..47d87b73b9 100644
--- a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
@@ -16,6 +16,7 @@ bin/systemd-notify
 bin/systemd-nspawn
 bin/systemd-path
 bin/systemd-run
+bin/systemd-socket-activate
 bin/systemd-stdio-bridge
 bin/systemd-sysusers
 bin/systemd-tmpfiles
@@ -36,12 +37,12 @@ lib64/libdl.so.2
 lib64/libgcrypt.so.20
 lib64/libgcrypt.so.20.0.5
 lib64/libgpg-error.so.0
-lib64/libgpg-error.so.0.10.0
+lib64/libgpg-error.so.0.15.0
 lib64/libip4tc.so.0
 lib64/libip4tc.so.0.1.0
 lib64/libkmod.so.2
 lib64/libkmod.so.2.2.11
-lib64/liblzma.so.5.0.8
+lib64/liblzma.so.5.2.2
 lib64/liblzma.so.5
 lib64/libmount.so.1
 lib64/libmount.so.1.1.0
@@ -62,11 +63,8 @@ lib64/libz.so.1.2.8
 lib/ld-linux-aarch64.so.1
 lib/systemd/systemd
 lib/systemd/systemd-ac-power
-lib/systemd/systemd-activate
 lib/systemd/systemd-backlight
 lib/systemd/systemd-binfmt
-lib/systemd/systemd-bootchart
-lib/systemd/systemd-bus-proxyd
 lib/systemd/systemd-cgroups-agent
 lib/systemd/systemd-coredump
 lib/systemd/systemd-fsck
@@ -91,5 +89,6 @@ lib/systemd/systemd-udevd
 lib/systemd/systemd-update-done
 lib/systemd/systemd-update-utmp
 lib/systemd/systemd-vconsole-setup
+lib/systemd/libsystemd-shared-231.so
 lib/systemd/system-sleep
 lib/systemd/user-generators
diff --git a/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest b/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
index eece908803..0975f8b0d9 100644
--- a/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
+++ b/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
@@ -1,9 +1,19 @@
 bin/chmod
 bin/chown
 bin/ssh-keygen
+lib64/libcom_err.so.2
+lib64/libcom_err.so.2.1
 lib64/libcrypt-2.21.so
 lib64/libcrypt.so.1
 lib64/libcrypto.so.1.0.0
+lib64/libgssapi_krb5.so.2
+lib64/libgssapi_krb5.so.2.2
+lib64/libk5crypto.so.3
+lib64/libk5crypto.so.3.1
+lib64/libkrb5.so.3
+lib64/libkrb5.so.3.3
+lib64/libkrb5support.so.0
+lib64/libkrb5support.so.0.1
 lib64/libnsl-2.21.so
 lib64/libnsl.so.1
 lib64/libnss_compat-2.21.so

From a96052e70e2513729c52506859798c74a1ebcba1 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 31 Aug 2016 14:31:12 +0200
Subject: [PATCH 0701/1304] Documentation/packaging: document rkt-admin group

Fixes #2864
---
 Documentation/packaging.md | 9 +++++----
 common/group.go            | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Documentation/packaging.md b/Documentation/packaging.md
index d59282b0f0..b20c309fb6 100644
--- a/Documentation/packaging.md
+++ b/Documentation/packaging.md
@@ -40,17 +40,18 @@ Please see [the list of run-time dependencies][run-deps].
 
 ### Ownership and permissions of rkt directories
 
-In general, subdirectories of `/var/lib/rkt` should be created with the same ownership and permissions as described in the [directory list](https://github.com/coreos/rkt/blob/master/dist/init/systemd/tmpfiles.d/rkt.conf).
+In general, subdirectories of `/var/lib/rkt`, and `/etc/rkt` should be created with the same ownership and permissions as described in the [directory list](https://github.com/coreos/rkt/blob/master/dist/init/systemd/tmpfiles.d/rkt.conf).
 
-Any rkt package should create a system group `rkt`, and `/var/lib/rkt` should belong to group `rkt` with the `setgid` bit set (`chmod g+s`)
+Any rkt package should create a system group `rkt`, and `rkt-admin`. The directory `/var/lib/rkt` should belong to group `rkt` with the `setgid` bit set (`chmod g+s`). The directory `/etc/rkt` should belong to group `rkt-admin` with the `setgid` bit set (`chmod g+s`).
 
-When the ownership and permissions of `/var/lib/rkt` are set up correctly, members of group `rkt` should be able to fetch ACIs without using `sudo`. Root privilege is still required to run pods.
+When the ownership and permissions of `/var/lib/rkt` are set up correctly, members of group `rkt` should be able to fetch ACIs. Members of group `rkt-admin` should be able to trust GPG keys, and add additional configurations in `/etc/rkt`. Root privilege is still required to run pods.
+
+The motivation to have separate `rkt`, and `rkt-admin` groups is that the person who makes administrative changes would likely be different than the unprivileged user who is able to fetch.
 
 ### systemd units
 
 A few [example systemd unit files for rkt helper services][rkt-units] are included in the rkt sources. These units demonstrate systemd-managed units to run the rkt [metadata-service][rkt-metadata-svc] with socket-activation, the rkt [api-service][api-service], and a periodic [garbage collection][rkt-gc] service invoked at 12-hour intervals to purge dead pods.
 
-
 [build-config]: build-configure.md
 [rkt-gc]: subcommands/gc.md
 [rkt-metadata-svc]: subcommands/metadata-service.md
diff --git a/common/group.go b/common/group.go
index 2f6732027d..07b5c3f572 100644
--- a/common/group.go
+++ b/common/group.go
@@ -19,7 +19,8 @@ import (
 )
 
 const (
-	RktGroup = "rkt"
+	RktGroup      = "rkt"       // owns /var/lib/rkt
+	RktAdminGroup = "rkt-admin" // owns /etc/rkt
 )
 
 // LookupGid reads the group file and returns the gid of the group

From 65bbd8d7b5fd057dc230a97c37c049384a0c39db Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Wed, 6 Jul 2016 17:39:28 +0200
Subject: [PATCH 0702/1304] store: refactor GetRemote

Removes the 2nd argument signalling whether the remote is found or not
and returns a distinct error instead.
---
 rkt/fetch_test.go               | 31 +++++++++++++++++--------------
 rkt/image/common.go             | 12 ++++++++----
 store/imagestore/remote.go      | 32 ++++++++++++++++++++------------
 store/imagestore/remote_test.go | 17 ++++++++---------
 store/imagestore/store.go       | 18 ++++++++++++------
 store/imagestore/store_test.go  |  8 ++------
 6 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index c173429f49..cd101c160e 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -230,10 +230,10 @@ func TestDownloading(t *testing.T) {
 		denyAuthTS.URL: "deny auth",
 	}
 	tests := []struct {
-		ACIURL   string
-		hit      bool
-		options  http.Header
-		authFail bool
+		ACIURL       string
+		remoteExists bool
+		options      http.Header
+		authFail     bool
 	}{
 		{noAuthTS.URL, false, noAuth, false},
 		{noAuthTS.URL, true, noAuth, false},
@@ -259,16 +259,19 @@ func TestDownloading(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		_, ok, err := s.GetRemote(tt.ACIURL)
+		_, err := s.GetRemote(tt.ACIURL)
 		if err != nil {
-			t.Fatalf("unexpected err: %v", err)
-		}
-		if tt.hit == false && ok {
-			t.Fatalf("expected miss got a hit")
-		}
-		if tt.hit == true && !ok {
-			t.Fatalf("expected a hit got a miss")
+			if err != imagestore.ErrRemoteNotFound {
+				t.Fatalf("unexpected err: %v", err)
+			}
+
+			if tt.remoteExists {
+				t.Fatalf("should've found the remote, got %v", err)
+			}
+		} else if !tt.remoteExists {
+			t.Fatalf("should've gotten a remote not found error")
 		}
+
 		parsed, err := url.Parse(tt.ACIURL)
 		if err != nil {
 			panic(fmt.Sprintf("Invalid url from test server: %s", tt.ACIURL))
@@ -547,7 +550,7 @@ func TestFetchImageCache(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		rem, _, err := s.GetRemote(aciURL)
+		rem, err := s.GetRemote(aciURL)
 		if err != nil {
 			t.Fatalf("Error getting remote info: %v\n", err)
 		}
@@ -563,7 +566,7 @@ func TestFetchImageCache(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		rem, _, err = s.GetRemote(aciURL)
+		rem, err = s.GetRemote(aciURL)
 		if err != nil {
 			t.Fatalf("Error getting remote info: %v\n", err)
 		}
diff --git a/rkt/image/common.go b/rkt/image/common.go
index 15ce861de8..82cfe3e44c 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -223,10 +223,14 @@ func maybeUseCached(rem *imagestore.Remote, cd *cacheData) string {
 
 func remoteForURL(s *imagestore.Store, u *url.URL) (*imagestore.Remote, error) {
 	urlStr := u.String()
-	if rem, ok, err := s.GetRemote(urlStr); err != nil {
+	rem, err := s.GetRemote(urlStr)
+	if err != nil {
+		if err == imagestore.ErrRemoteNotFound {
+			return nil, nil
+		}
+
 		return nil, errwrap.Wrap(fmt.Errorf("failed to fetch remote for URL %q", urlStr), err)
-	} else if ok {
-		return rem, nil
 	}
-	return nil, nil
+
+	return rem, nil
 }
diff --git a/store/imagestore/remote.go b/store/imagestore/remote.go
index 382bc5c98f..0475396beb 100644
--- a/store/imagestore/remote.go
+++ b/store/imagestore/remote.go
@@ -19,9 +19,14 @@ package imagestore
 
 import (
 	"database/sql"
+	"errors"
 	"time"
 )
 
+var (
+	ErrRemoteNotFound = errors.New("remote target not found")
+)
+
 func NewRemote(aciurl, sigurl string) *Remote {
 	r := &Remote{
 		ACIURL: aciurl,
@@ -46,25 +51,28 @@ func remoteRowScan(rows *sql.Rows, remote *Remote) error {
 	return rows.Scan(&remote.ACIURL, &remote.SigURL, &remote.ETag, &remote.BlobKey, &remote.CacheMaxAge, &remote.DownloadTime)
 }
 
-// GetRemote tries to retrieve a remote with the given aciURL. found will be
-// false if remote doesn't exist.
-func GetRemote(tx *sql.Tx, aciURL string) (remote *Remote, found bool, err error) {
-	remote = &Remote{}
+// GetRemote tries to retrieve a remote with the given aciURL.
+// If remote doesn't exist, it returns ErrRemoteNotFound error.
+func GetRemote(tx *sql.Tx, aciURL string) (*Remote, error) {
 	rows, err := tx.Query("SELECT * FROM remote WHERE aciurl == $1", aciURL)
 	if err != nil {
-		return nil, false, err
+		return nil, err
 	}
-	for rows.Next() {
-		found = true
-		if err := rows.Scan(&remote.ACIURL, &remote.SigURL, &remote.ETag, &remote.BlobKey, &remote.CacheMaxAge, &remote.DownloadTime); err != nil {
-			return nil, false, err
-		}
+
+	if ok := rows.Next(); !ok {
+		return nil, ErrRemoteNotFound
 	}
+
+	remote := &Remote{}
+	if err := remoteRowScan(rows, remote); err != nil {
+		return nil, err
+	}
+
 	if err := rows.Err(); err != nil {
-		return nil, false, err
+		return nil, err
 	}
 
-	return remote, found, err
+	return remote, nil
 }
 
 // GetAllRemotes returns all the ACIInfos sorted by optional sortfields and
diff --git a/store/imagestore/remote_test.go b/store/imagestore/remote_test.go
index 307fa47203..4f2267497d 100644
--- a/store/imagestore/remote_test.go
+++ b/store/imagestore/remote_test.go
@@ -42,25 +42,24 @@ func TestNewRemote(t *testing.T) {
 	s.WriteRemote(na)
 
 	// Get a new remote w the same parameters, reading from table should be fine
-	nb, ok, err := s.GetRemote(u1)
+	nb, err := s.GetRemote(u1)
 	if err != nil {
 		t.Fatalf("unexpected error reading index: %v", err)
 	}
-	if !ok {
-		t.Fatalf("unexpected index not found")
-	}
+
 	if nb.BlobKey != data {
 		t.Fatalf("bad data returned from store: got %v, want %v", nb.BlobKey, data)
 	}
 
 	// Get a remote with a different URI
-	nc, ok, err := s.GetRemote(u2)
+	nc, err := s.GetRemote(u2)
 	// Should get an error, since the URI shouldn't be present in the table
-	if ok {
-		t.Fatalf("unexpected index found")
+	if err == nil {
+		t.Fatalf("expected error, got nil")
 	}
+
 	// Remote shouldn't be populated
-	if nc.BlobKey != "" {
-		t.Errorf("unexpected blob: got %v", nc.BlobKey)
+	if nc != nil {
+		t.Errorf("unexpected remote: got %v", nc)
 	}
 }
diff --git a/store/imagestore/store.go b/store/imagestore/store.go
index 1d1613052e..ca6185bd3e 100644
--- a/store/imagestore/store.go
+++ b/store/imagestore/store.go
@@ -549,17 +549,23 @@ func (s *Store) RemoveACI(key string) error {
 	return nil
 }
 
-// GetRemote tries to retrieve a remote with the given ACIURL. found will be
-// false if remote doesn't exist.
-func (s *Store) GetRemote(aciURL string) (*Remote, bool, error) {
+// GetRemote tries to retrieve a remote with the given ACIURL.
+// If remote doesn't exist, it returns ErrRemoteNotFound error.
+func (s *Store) GetRemote(aciURL string) (*Remote, error) {
 	var remote *Remote
-	found := false
+
 	err := s.db.Do(func(tx *sql.Tx) error {
 		var err error
-		remote, found, err = GetRemote(tx, aciURL)
+
+		remote, err = GetRemote(tx, aciURL)
+
 		return err
 	})
-	return remote, found, err
+	if err != nil {
+		return nil, err
+	}
+
+	return remote, nil
 }
 
 // WriteRemote adds or updates the provided Remote.
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index 6dd368d18e..1de70555ca 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -386,13 +386,10 @@ func TestRemoveACI(t *testing.T) {
 	}
 
 	// Verify that no remote for the specified key exists
-	_, found, err := s.GetRemote(aciURL)
-	if err != nil {
+	_, err = s.GetRemote(aciURL)
+	if err != ErrRemoteNotFound {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if found {
-		t.Fatalf("expected to find no remote, but a remote was found")
-	}
 
 	// Try to remove a non-existent key
 	err = s.RemoveACI("sha512-aaaaaaaaaaaaaaaaa")
@@ -437,5 +434,4 @@ func TestRemoveACI(t *testing.T) {
 	if _, ok := err.(*StoreRemovalError); !ok {
 		t.Fatalf("expected StoreRemovalError got: %v", err)
 	}
-
 }

From 7ec53d714f8d28ae9eaa240608c9944755e38d1c Mon Sep 17 00:00:00 2001
From: Tamer Tas <contact@tmrts.com>
Date: Thu, 18 Aug 2016 10:32:36 +0300
Subject: [PATCH 0703/1304] rkt/fetch_test: unexport table test struct members

---
 rkt/fetch_test.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index cd101c160e..dc820ae7e3 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -230,7 +230,7 @@ func TestDownloading(t *testing.T) {
 		denyAuthTS.URL: "deny auth",
 	}
 	tests := []struct {
-		ACIURL       string
+		aciURL       string
 		remoteExists bool
 		options      http.Header
 		authFail     bool
@@ -259,7 +259,7 @@ func TestDownloading(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		_, err := s.GetRemote(tt.ACIURL)
+		_, err := s.GetRemote(tt.aciURL)
 		if err != nil {
 			if err != imagestore.ErrRemoteNotFound {
 				t.Fatalf("unexpected err: %v", err)
@@ -272,9 +272,9 @@ func TestDownloading(t *testing.T) {
 			t.Fatalf("should've gotten a remote not found error")
 		}
 
-		parsed, err := url.Parse(tt.ACIURL)
+		parsed, err := url.Parse(tt.aciURL)
 		if err != nil {
-			panic(fmt.Sprintf("Invalid url from test server: %s", tt.ACIURL))
+			panic(fmt.Sprintf("Invalid url from test server: %s", tt.aciURL))
 		}
 		headers := map[string]config.Headerer{
 			parsed.Host: &testHeaderer{tt.options},
@@ -284,12 +284,12 @@ func TestDownloading(t *testing.T) {
 			Headers:       headers,
 			InsecureFlags: insecureFlags,
 		}
-		_, err = ft.FetchImage(tt.ACIURL, "", apps.AppImageURL)
+		_, err = ft.FetchImage(tt.aciURL, "", apps.AppImageURL)
 		if err != nil && !tt.authFail {
-			t.Fatalf("expected download to succeed, it failed: %v (server: %q, headers: `%v`)", err, urlToName[tt.ACIURL], tt.options)
+			t.Fatalf("expected download to succeed, it failed: %v (server: %q, headers: `%v`)", err, urlToName[tt.aciURL], tt.options)
 		}
 		if err == nil && tt.authFail {
-			t.Fatalf("expected download to fail, it succeeded (server: %q, headers: `%v`)", urlToName[tt.ACIURL], tt.options)
+			t.Fatalf("expected download to fail, it succeeded (server: %q, headers: `%v`)", urlToName[tt.aciURL], tt.options)
 		}
 	}
 

From f0b35567b80c0c39ceeeddab5f1c7bfe949877ed Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 22 Jun 2016 17:42:43 +0200
Subject: [PATCH 0704/1304] stage1: volumes: implement recursive option

The volumes defined in the pod manifest now have a 'recursive' bool
field.

The default is recursive for nspawn containers and non-recursive for fly
containers.
---
 stage1/init/common/pod.go | 16 +++++++++++++++-
 stage1_fly/run/main.go    |  7 ++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index ce341150fc..73fc2e23f9 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -940,7 +940,7 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp, insecureOp
 			return nil, err
 		}
 
-		opt := make([]string, 4)
+		opt := make([]string, 6)
 
 		if IsMountReadOnly(vol, app.MountPoints) {
 			opt[0] = "--bind-ro="
@@ -958,6 +958,20 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp, insecureOp
 		}
 		opt[2] = ":"
 		opt[3] = filepath.Join(common.RelAppRootfsPath(appName), mntPath)
+		opt[4] = ":"
+
+		// If Recursive is not set, default to recursive.
+		recursive := true
+		if vol.Recursive != nil {
+			recursive = *vol.Recursive
+		}
+
+		// rbind/norbind options exist since systemd-nspawn v226
+		if recursive {
+			opt[5] = "rbind"
+		} else {
+			opt[5] = "norbind"
+		}
 		args = append(args, strings.Join(opt, ""))
 	}
 
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 2f24f30a14..3b4a5c7b5c 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -191,7 +191,6 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 	}
 
 	argFlyMounts := []flyMount{}
-	var flags uintptr = syscall.MS_BIND // TODO: allow optional | syscall.MS_REC
 	for _, tuple := range namedVolumeMounts {
 		if _, isHostMount := hostMounts[tuple.V.Source]; isHostMount {
 			// Mark the host mount as SHARED so the container's changes to the mount are propagated to the host
@@ -199,6 +198,12 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 				flyMount{"", "", tuple.V.Source, "none", syscall.MS_REC | syscall.MS_SHARED},
 			)
 		}
+
+		var flags uintptr = syscall.MS_BIND
+		// If Recursive is not set, default to non-recursive.
+		if tuple.V.Recursive != nil && *tuple.V.Recursive {
+			flags |= syscall.MS_REC
+		}
 		argFlyMounts = append(argFlyMounts,
 			flyMount{tuple.V.Source, rfs, tuple.M.Path, "none", flags},
 		)

From 6801e0a5c8947ed0a6d4e9f718b40214612d0c19 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 8 Jul 2016 15:30:51 -0700
Subject: [PATCH 0705/1304] stage1/kvm: volumes: implement recursive option

---
 stage1/init/kvm.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index cc9d5d8051..cd13d37135 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -105,21 +105,24 @@ func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.Runtim
 			return errwrap.Wrap(fmt.Errorf("could not resolve symlink for source: %v", source), err)
 		} else if err := ensureDestinationExists(cleanedSource, absDestination); err != nil {
 			return errwrap.Wrap(fmt.Errorf("could not create destination mount point: %v", absDestination), err)
-		} else if err := doBindMount(cleanedSource, absDestination, readOnly); err != nil {
+		} else if err := doBindMount(cleanedSource, absDestination, readOnly, vol.Recursive); err != nil {
 			return errwrap.Wrap(fmt.Errorf("could not bind mount path %v (s: %v, d: %v)", m.Path, source, absDestination), err)
 		}
 	}
 	return nil
 }
 
-func doBindMount(source, destination string, readOnly bool) error {
-	if err := syscall.Mount(source, destination, "bind", syscall.MS_BIND, ""); err != nil {
-		return err
-	}
+func doBindMount(source, destination string, readOnly bool, recursive *bool) error {
+	var flags uintptr = syscall.MS_BIND | syscall.MS_REC
 	if readOnly {
-		return syscall.Mount(source, destination, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
+		flags |= syscall.MS_RDONLY
 	}
-	return nil
+
+	// Enable recursive by default and remove it if explicitly requested
+	if recursive != nil && *recursive == false {
+		flags ^= syscall.MS_REC
+	}
+	return syscall.Mount(source, destination, "bind", flags, "")
 }
 
 func ensureDestinationExists(source, destination string) error {

From 7d37b97c2fdda1a5db6d1fa769026876a517d876 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 6 Jul 2016 20:00:42 -0700
Subject: [PATCH 0706/1304] *: update --volume examples

---
 Documentation/subcommands/prepare.md | 2 +-
 Documentation/subcommands/run.md     | 3 ++-
 rkt/cli_apps.go                      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index cd022d2223..1e6b08c2e5 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -74,7 +74,7 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--stage1-from-dir` |  `` | A stage1 image file inside the default stage1 images directory | Image to use as stage1 |
 | `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md) |
 | `--user` | none | uid, username or file path | user override for the preceding image (example: '--user=user') |
-| `--volume` |  `` | Volume syntax (`NAME,kind=KIND,source=PATH,readOnly=BOOL`). See [Mount Volumes into a Pod](run.md#mount-volumes-into-a-pod) | Volumes to make available in the pod |
+| `--volume` |  `` | Volume syntax (`NAME,kind=KIND,source=PATH,readOnly=BOOL,recursive=BOOL`). See [Mount Volumes into a Pod](run.md#mount-volumes-into-a-pod) | Volumes to make available in the pod |
 
 ## Global options
 
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index f3079d7c75..6e26f869f8 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -124,7 +124,8 @@ Each ACI can define a [list of mount points](https://github.com/appc/spec/blob/m
             {
                 "name": "data",
                 "path": "/var/data",
-                "readOnly": false
+                "readOnly": false,
+                "recursive": true
             }
         ]
     }
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index ede8fa25c6..1533f9c79a 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -218,7 +218,7 @@ func (al *appMount) Type() string {
 	return "appMount"
 }
 
-// appsVolume is for --volume flags in the form name,kind=host,source=/tmp,readOnly=true (defined by appc)
+// appsVolume is for --volume flags in the form name,kind=host,source=/tmp,readOnly=true,recursive=true (defined by appc)
 type appsVolume apps.Apps
 
 func (al *appsVolume) Set(s string) error {

From 9a483460f5272d09dabd0279861b07f18a2c584a Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Mon, 15 Aug 2016 11:01:39 -0700
Subject: [PATCH 0707/1304] api_service: Rework cgroup detection

Use the `subcgroup` file hint provided by some stage1s rather than
machined registration.

Fixes #3060
---
 rkt/api_service.go            | 87 +++++++++++++++++++++--------------
 tests/rkt_api_service_test.go |  2 +
 2 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 93af5f875b..42aeb60375 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -35,7 +35,6 @@ import (
 	"github.com/coreos/rkt/pkg/set"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/coreos/rkt/version"
-	"github.com/godbus/dbus"
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/golang-lru"
 	"github.com/spf13/cobra"
@@ -333,6 +332,57 @@ func (s *v1AlphaAPIServer) getPodManifest(p *pod) (*schema.PodManifest, []byte,
 	return &manifest, data, nil
 }
 
+// getPodCgroup gets the cgroup path for a pod. This can be done in one of a couple ways:
+//
+// 1) stage1-coreos
+//
+// This one can be tricky because after machined registration, the cgroup might change.
+// For these flavors, the cgroup it will end up in after machined moves it is
+// written to a file named `subcgroup`, so we use that instead.
+//
+// 2) All others
+//
+// Assume that we can simply get the cgroup of the pod's init PID, and use that.
+func getPodCgroup(p *pod, pid int) (string, error) {
+	// Note, this file should always exist if the pid is known since it is
+	// written before the pid file
+	// The contents are of the form:
+	// machined-registration (whether it has happened or not, but if stage1 plans to do so):
+	//   'machine.slice/machine-rkt\x2dbfb67ff1\x2dc745\x2d4aec\x2db1e1\x2d7ce85a1fd42b.scope'
+	// no registration, ran as systemd-unit 'foo.service':
+	//   'system.slice/foo.service'
+	// stage1-fly: file does not exist
+	data, err := p.readFile("subcgroup")
+	// normalize cgroup to include a leading '/'
+	if err == nil {
+		strCgroup := string(data)
+		if strings.HasPrefix(strCgroup, "/") {
+			return strCgroup, nil
+		}
+		return "/" + strCgroup, nil
+	}
+
+	if !os.IsNotExist(err) {
+		return "", err
+	}
+	// if it is an "isNotExist", assume this is a stage1 flavor that won't change
+	// cgroups. Just give the systemd cgroup of its pid
+	// Get cgroup for the "name=systemd" controller; we assume the api-server is
+	// running on a system using systemd for returning cgroups, and will just not
+	// set it otherwise.
+	cgroup, err := cgroup.GetCgroupPathByPid(pid, "name=systemd")
+	if err != nil {
+		return "", err
+	}
+	// If the stage1 systemd > v226, it will put the PID1 into "init.scope"
+	// implicit scope unit in the root slice.
+	// See https://github.com/coreos/rkt/pull/2331#issuecomment-203540543
+	//
+	// TODO(yifan): Revisit this when using unified cgroup hierarchy.
+	cgroup = strings.TrimSuffix(cgroup, "/init.scope")
+	return cgroup, nil
+}
+
 // getApplist returns a list of apps in the pod.
 func getApplist(manifest *schema.PodManifest) []*v1alpha.App {
 	var apps []*v1alpha.App
@@ -470,26 +520,6 @@ func (s *v1AlphaAPIServer) getBasicPod(p *pod) *v1alpha.Pod {
 	return copyPod(cacheItem.pod)
 }
 
-func waitForMachinedRegistration(uuid string) error {
-	conn, err := dbus.SystemBus()
-	if err != nil {
-		return err
-	}
-	machined := conn.Object("org.freedesktop.machine1", "/org/freedesktop/machine1")
-	machineName := "rkt-" + uuid
-
-	var machinedErr error
-	var o dbus.ObjectPath
-	for i := 0; i < 10; i++ {
-		if machinedErr = machined.Call("org.freedesktop.machine1.Manager.GetMachine", 0, machineName).Store(&o); machinedErr == nil {
-			return nil
-		}
-		time.Sleep(time.Millisecond * 50)
-	}
-
-	return fmt.Errorf("pod %v not found in machined: %v", uuid, machinedErr)
-}
-
 // fillPodDetails fills the v1pod's dynamic info in place, e.g. the pod's state,
 // the pod's network info, the apps' state, etc. Such information can change
 // during the lifecycle of the pod, so we need to read it in every request.
@@ -552,26 +582,15 @@ func fillPodDetails(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
 	}
 
 	if v1pod.State == v1alpha.PodState_POD_STATE_RUNNING {
-		if err := waitForMachinedRegistration(v1pod.Id); err != nil {
-			// If there's an error, it means we're not registered to machined
-			// in a reasonable time. Just output the cgroup we're in.
-			stderr.PrintE("checking for machined registration failed: ", err)
-		}
-		// Get cgroup for the "name=systemd" controller.
 		pid, err := p.getContainerPID1()
 		if err != nil {
 			stderr.PrintE(fmt.Sprintf("failed to get the container PID1 for pod %q", p.uuid), err)
 		} else {
-			cgroup, err := cgroup.GetCgroupPathByPid(pid, "name=systemd")
+			cgroup, err := getPodCgroup(p, pid)
 			if err != nil {
 				stderr.PrintE(fmt.Sprintf("failed to get the cgroup path for pod %q", p.uuid), err)
 			} else {
-				// If the stage1 systemd > v226, it will put the PID1 into "init.scope"
-				// implicit scope unit in the root slice.
-				// See https://github.com/coreos/rkt/pull/2331#issuecomment-203540543
-				//
-				// TODO(yifan): Revisit this when using unified cgroup hierarchy.
-				v1pod.Cgroup = strings.TrimSuffix(cgroup, "/init.scope")
+				v1pod.Cgroup = cgroup
 			}
 		}
 	}
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 163cd67f6b..463a0d196c 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -617,6 +617,7 @@ func NewAPIServiceCgroupTest() testutils.Test {
 		}
 
 		// ListPods(detail=true). Filter according to the cgroup.
+		t.Logf("Calling ListPods with cgroup filter %v", cgroups)
 		resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{
 			Detail:  true,
 			Filters: []*v1alpha.PodFilter{{Cgroups: cgroups}},
@@ -633,6 +634,7 @@ func NewAPIServiceCgroupTest() testutils.Test {
 			checkPodDetails(t, ctx, p)
 		}
 
+		t.Logf("Calling ListPods with subcgroup filter %v", subcgroups)
 		resp, err = c.ListPods(context.Background(), &v1alpha.ListPodsRequest{
 			Detail:  true,
 			Filters: []*v1alpha.PodFilter{{PodSubCgroups: subcgroups}},

From 1eea16cc98fb241389ac82715baf841084840a20 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 31 Aug 2016 17:21:15 -0400
Subject: [PATCH 0708/1304] stage1: shutdown.service: don't use /dev/console

The default stdout for shutdown.service is /dev/console (the tty created
by nspawn). But that tty might be destroyed if rkt is executed via ssh
and the user terminates the ssh session. We still want shutdown.service
to succeed in that case, so don't use /dev/console.

Fixes https://github.com/coreos/rkt/issues/2232
---
 stage1/init/common/pod.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index ce341150fc..de3187c5b4 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -769,6 +769,15 @@ func writeShutdownService(p *stage1commontypes.Pod) error {
 		unit.NewUnitOption("Unit", "StopWhenUnneeded", "yes"),
 		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
 		unit.NewUnitOption("Service", "RemainAfterExit", "yes"),
+
+		// The default stdout is /dev/console (the tty created by nspawn).
+		// But the tty might be destroyed if rkt is executed via ssh and
+		// the user terminates the ssh session. We still want
+		// shutdown.service to succeed in that case, so don't use
+		// /dev/console.
+		unit.NewUnitOption("Service", "StandardInput", "null"),
+		unit.NewUnitOption("Service", "StandardOutput", "null"),
+		unit.NewUnitOption("Service", "StandardError", "null"),
 	}
 
 	shutdownVerb := "exit"

From 461903d46d9fe507457ea462c5fa63fa9fe4e07a Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Wed, 31 Aug 2016 14:22:15 -0700
Subject: [PATCH 0709/1304] build: Add powerpc to configure

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 configure.ac | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index a565a0440a..1990ba75fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,11 +42,13 @@ AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 
 AS_CASE([${host_cpu}],
-        [aarch64],    [RKT_ACI_ARCH=aarch64; GOARCH=arm64;],
-        [armv6l],     [RKT_ACI_ARCH=armv6l;  GOARCH=arm; GOARM=6;],
-        [armv7l],     [RKT_ACI_ARCH=armv7l;  GOARCH=arm; GOARM=7;],
-        [i?86 | x86], [RKT_ACI_ARCH=i386;    GOARCH=386;],
-        [x86_64],     [RKT_ACI_ARCH=amd64;   GOARCH=amd64;],
+        [aarch64],             [RKT_ACI_ARCH=aarch64; GOARCH=arm64;],
+        [armv6l],              [RKT_ACI_ARCH=armv6l;  GOARCH=arm; GOARM=6;],
+        [armv7l],              [RKT_ACI_ARCH=armv7l;  GOARCH=arm; GOARM=7;],
+        [i?86 | x86],          [RKT_ACI_ARCH=i386;    GOARCH=386;],
+        [powerpc | powerpc64], [RKT_ACI_ARCH=ppc64;   GOARCH=ppc64;],
+        [powerpc64le],         [RKT_ACI_ARCH=ppc64le; GOARCH=ppc64le;],
+        [x86_64],              [RKT_ACI_ARCH=amd64;   GOARCH=amd64;],
         [AC_MSG_ERROR([*** unsupported host arch specified: ${host_cpu}])])
 
 #### FLAGS

From fa47e1b1ef996a935b8d2368e7b840d17356fa4b Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Fri, 19 Aug 2016 13:43:15 +0200
Subject: [PATCH 0710/1304] stage0: don't copy image annotations to pod
 manifest RuntimeApp annotations.

When generating the pod manifest, RuntimeApp annotations shouldn't be copied
from the image annotations but, as explained in the appc spec, they should be
merged only when required by the metadata service.
---
 stage0/run.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/stage0/run.go b/stage0/run.go
index 4084bc07f1..3ca4893c7e 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -212,8 +212,7 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 				ID:     img,
 				Labels: am.Labels,
 			},
-			Annotations: am.Annotations,
-			Mounts:      MergeMounts(cfg.Apps.Mounts, app.Mounts),
+			Mounts: MergeMounts(cfg.Apps.Mounts, app.Mounts),
 		}
 
 		if execOverride := app.Exec; execOverride != "" {

From 67574c798f9f07c06f63c6874906b121092cd892 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 1 Sep 2016 10:25:24 +0200
Subject: [PATCH 0711/1304] CHANGELOG: add v1.14.0

---
 CHANGELOG.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e6b728c71..23b052cb4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+## 1.14.0
+
+This release updates the coreos and kvm flavors, bringing in a newer stable systemd (v231). Several fixes and cgroups-related changes landed in `api-service`, and better heuristics have been introduced to avoid using overlays in non-supported environments. Finally, `run-prepared` now honors options for insecure/privileged pods too.
+
+### New features and UX changes
+- stage1: update to CoreOS 1151.0.0 and systemd v231 ([#3122](https://github.com/coreos/rkt/pull/3122)).
+- common: fall back to non-overlay with ftype=0 ([#3105](https://github.com/coreos/rkt/pull/3105)).
+- rkt: honor insecure-options in run-prepared ([#3138](https://github.com/coreos/rkt/pull/3138)).
+
+#### Bug fixes
+- stage0: fix golint warnings ([#3099](https://github.com/coreos/rkt/pull/3099)).
+- rkt: avoid possible panic in api-server ([#3111](https://github.com/coreos/rkt/pull/3111)).
+- rkt/run: allow --set-env-file files with comments ([#3115](https://github.com/coreos/rkt/pull/3115)).
+- scripts/install-rkt: add wget as dependency ([#3124](https://github.com/coreos/rkt/pull/3124)).
+- install-rkt.sh: scripts: Fix missing files in .deb when using install-rkt.sh ([#3127](https://github.com/coreos/rkt/pull/3127)). 
+- tests: check for run-prepared with insecure options ([#3139](https://github.com/coreos/rkt/pull/3139)).
+
+#### Other changes
+- seccomp/docker: update docker whitelist to include mlock ([#3126](https://github.com/coreos/rkt/pull/3126)). This updates the `@docker/default-whitelist` to include mlock-related
+syscalls (mlock, mlock2, mlockall).
+- build: add PowerPC ([#2936](https://github.com/coreos/rkt/pull/2936)).
+- scripts: install-rkt.sh: fail install-pak on errors ([#3150](https://github.com/coreos/rkt/pull/3150)). When install-pak (called from install-rkt.sh) fails at some point
+abort packaging.
+- api_service: Rework cgroup detection ([#3072](https://github.com/coreos/rkt/pull/3072)). Use the `subcgroup` file hint provided by some stage1s rather than
+machined registration.
+- Documentation/devel: add make images target ([#3142](https://github.com/coreos/rkt/pull/3142)). This introduces the possibility to generate graphivz based PNG images using
+a new `images` make target.
+- vendor: update appc/spec to 0.8.7 ([#3143](https://github.com/coreos/rkt/pull/3143)).
+- stage1/kvm: avoid writing misleading subcgroup ([#3107](https://github.com/coreos/rkt/pull/3107)).
+- vendor: update go-systemd to v12 ([#3125](https://github.com/coreos/rkt/pull/3125)).
+- scripts: bump coreos.com/rkt/builder image version ([#3092](https://github.com/coreos/rkt/pull/3092)). This bumps rkt-builder version to 1.0.2, in order to work with
+seccomp filtering.
+- export: test export for multi-app pods ([#3075](https://github.com/coreos/rkt/pull/3075)).
+- Documentation updates: ([#3146](https://github.com/coreos/rkt/pull/3146), [#2954](https://github.com/coreos/rkt/pull/2954), [#3128](https://github.com/coreos/rkt/pull/3128), [#2953](https://github.com/coreos/rkt/pull/2953), [#3103](https://github.com/coreos/rkt/pull/3103), [#3087](https://github.com/coreos/rkt/pull/3087), [#3097](https://github.com/coreos/rkt/pull/3097), [#3096](https://github.com/coreos/rkt/pull/3096), [#3095](https://github.com/coreos/rkt/pull/3095), [#3089](https://github.com/coreos/rkt/pull/3089))
+
 ## 1.13.0
 
 This release introduces support for exporting single applications out of multi-app pods. Moreover, it adds additional support to control device manipulation inside pods. Finally all runtime security features can now be optionally disabled at the pod level via new insecure options. This version also contains multiple bugfixes and supports Go 1.7.

From 89ca8decf5ec2465da60275240771a3d858c4d53 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 1 Sep 2016 10:25:48 +0200
Subject: [PATCH 0712/1304] ROADMAP: update

---
 ROADMAP.md | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 88743651d7..9332025c64 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -9,21 +9,14 @@ The version of the spec that rkt implements can be seen in the output of `rkt ve
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
 
-### rkt 1.14.0 (September)
-
-Full plan at https://github.com/coreos/rkt/milestone/48.
-
-Highlights:
-- Introduce support for systemd v231 in stage1
-- Refactor distribution/storage handling
-- Improved native support for OCI
-- Cleanup/unify cgroup detection
-
 ### rkt 1.15.0 (September)
 
 Full plan at https://github.com/coreos/rkt/milestone/49.
 
 Highlights:
+- initial CRI support, replacing the existing gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha).
+- Refactor distribution/storage handling
+- Improved native support for OCI
 - Enhanced DNS configuration
 - Further improvements for SELinux environments, especially Fedora in enforcing mode
 - Support for unified cgroups

From b5f64960d113fee79686dd549c4fad1eda578016 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 1 Sep 2016 10:38:10 +0200
Subject: [PATCH 0713/1304] version: bump to v1.14.0

---
 Documentation/running-fly-stage1.md  | 4 ++--
 Documentation/running-lkvm-stage1.md | 4 ++--
 Documentation/subcommands/prepare.md | 4 ++--
 Documentation/subcommands/version.md | 2 +-
 Documentation/trying-out-rkt.md      | 6 +++---
 configure.ac                         | 2 +-
 scripts/install-rkt.sh               | 2 +-
 tests/empty-image/manifest           | 2 +-
 tests/image/manifest                 | 2 +-
 tests/rkt-monitor/build-stresser.sh  | 2 +-
 tests/rkt_exec_test.go               | 2 +-
 tests/rkt_image_cat_manifest_test.go | 2 +-
 tests/rkt_image_export_test.go       | 2 +-
 tests/rkt_image_render_test.go       | 2 +-
 tests/rkt_os_arch_test.go            | 2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 97cdd9d0ca..2ee51c5b0d 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.13.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.14.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.13.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.14.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-lkvm-stage1.md
index 419c041ca9..4a8edf390a 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-lkvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.13.0+git/bin/`.
+This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.14.0+git/bin/`.
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official lkvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.13.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.14.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index cd022d2223..0f2417acdf 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.13.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.14.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.13.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.14.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index e6a2af9d16..a375099475 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.13.0
+rkt Version: 1.14.0
 appc Version: 0.8.7
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 2696929c38..7108c2faa7 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.13.0/rkt-v1.13.0.tar.gz
-tar xzvf rkt-v1.13.0.tar.gz
-cd rkt-v1.13.0
+wget https://github.com/coreos/rkt/releases/download/v1.14.0/rkt-v1.14.0.tar.gz
+tar xzvf rkt-v1.14.0.tar.gz
+cd rkt-v1.14.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 1990ba75fb..4f8d61c86e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.13.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.14.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 6e82cd4976..86f966dcf6 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.13.0"
+version="1.14.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index ab9557a99d..d645708d27 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.13.0"
+            "value": "1.14.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 323039891b..7f8838e741 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.13.0"
+            "value": "1.14.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 1116be4332..3f741b8ad5 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -28,7 +28,7 @@ trap acbuildEnd EXIT
 
 acbuild --debug set-name appc.io/rkt-"${1}"-stresser
 
-acbuild --debug copy build-rkt-1.13.0+git/target/bin/"${1}"-stresser /worker
+acbuild --debug copy build-rkt-1.14.0/target/bin/"${1}"-stresser /worker
 
 acbuild --debug set-exec -- /worker
 
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index ef4bc00de7..5becbb0771 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.14.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 415cdfcd34..b8e3422260 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.14.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 73869552ed..8ca2e059c1 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.14.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 4b15652ada..80b40f67e3 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.14.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 46e4286f7c..e151cc52d2 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.13.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.14.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 423e11ffa5df908b6c1d2f8a9e72cd84c8c72170 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 1 Sep 2016 10:38:13 +0200
Subject: [PATCH 0714/1304] version: bump to v1.14.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4f8d61c86e..06618f6fa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.14.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.14.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 3f741b8ad5..9ffa832914 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -28,7 +28,7 @@ trap acbuildEnd EXIT
 
 acbuild --debug set-name appc.io/rkt-"${1}"-stresser
 
-acbuild --debug copy build-rkt-1.14.0/target/bin/"${1}"-stresser /worker
+acbuild --debug copy build-rkt-1.14.0+git/target/bin/"${1}"-stresser /worker
 
 acbuild --debug set-exec -- /worker
 

From c5a7fbf6080d20d8c9643c8305fca4e7f995430e Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 6 Jul 2016 20:05:17 -0700
Subject: [PATCH 0715/1304] tests: cover recursive volume/mounts

Refactors:
- move duplicate verifyHostFile implementation from rkt_fly_test.go and
  rkt_run_pod_manifest_test.go to rkt_tests.go
- Refactor TestFlyMount{CLI,PodManifest} to new tests using a TestVolumeMount
-

New Tests:
- Recursive mount functionality for flavors kvm, fly, coreos
- New test cases use the volumeMountTestCase struct type
  This practically duplicates some of the cases for kvm and coreos
  flavors
---
 stage1/init/common/pod_test.go         |  88 ++++++-
 tests/rkt_fly_test.go                  | 197 --------------
 tests/rkt_run_pod_manifest_test.go     | 185 +++++++------
 tests/rkt_tests.go                     |  30 +++
 tests/rkt_volume_mount_fly_test.go     |  49 ++++
 tests/rkt_volume_mount_generic_test.go |  49 ++++
 tests/rkt_volume_mount_test.go         | 343 +++++++++++++++++++++++++
 7 files changed, 667 insertions(+), 274 deletions(-)
 create mode 100644 tests/rkt_volume_mount_fly_test.go
 create mode 100644 tests/rkt_volume_mount_generic_test.go
 create mode 100644 tests/rkt_volume_mount_test.go

diff --git a/stage1/init/common/pod_test.go b/stage1/init/common/pod_test.go
index 142fbbe3e1..c5022ee220 100644
--- a/stage1/init/common/pod_test.go
+++ b/stage1/init/common/pod_test.go
@@ -71,12 +71,15 @@ func TestQuoteExec(t *testing.T) {
 	}
 }
 
+var (
+	falseVar = false
+	trueVar  = true
+)
+
 // TestAppToNspawnArgsOverridesImageManifestReadOnly tests
 // that the ImageManifest's `readOnly` volume setting will be
 // overrided by PodManifest.
 func TestAppToNspawnArgsOverridesImageManifestReadOnly(t *testing.T) {
-	falseVar := false
-	trueVar := true
 	tests := []struct {
 		imageManifestVolumeReadOnly bool
 		podManifestVolumeReadOnly   *bool
@@ -160,13 +163,13 @@ func TestAppToNspawnArgsOverridesImageManifestReadOnly(t *testing.T) {
 		}
 
 		if ro := hasBindROArg(output); ro != tt.expectReadOnly {
-			t.Errorf("#%d: expected: readOnly: %v, saw: %v", i, tt.expectReadOnly, ro)
+			t.Errorf("#%d: expected: readOnly: %v, saw: %v \nOutput:\n%v", i, tt.expectReadOnly, ro, output)
 		}
 	}
 }
 
 func hasBindROArg(output []string) bool {
-	roRegexp := regexp.MustCompile("^--bind-ro=/host/foo:.*/app/foo$")
+	roRegexp := regexp.MustCompile("^--bind-ro=/host/foo:.*/app/foo(:rbind)?$")
 	for i := len(output) - 1; i >= 0; i-- {
 		if roRegexp.MatchString(output[i]) {
 			return true
@@ -174,3 +177,80 @@ func hasBindROArg(output []string) bool {
 	}
 	return false
 }
+
+func TestAppToNspawnArgsRecursive(t *testing.T) {
+	tests := []struct {
+		podManifestVolumeRecursive *bool
+		expectRecursive            bool
+	}{
+		{
+			nil,
+			true,
+		},
+		{
+			&trueVar,
+			true,
+		},
+		{
+			&falseVar,
+			false,
+		},
+	}
+
+	for i, tt := range tests {
+		podManifest := &schema.PodManifest{
+			Volumes: []types.Volume{
+				{
+					Name:      *types.MustACName("foo-mount"),
+					Kind:      "host",
+					Source:    "/host/foo",
+					Recursive: tt.podManifestVolumeRecursive,
+				},
+			},
+		}
+		appManifest := &schema.RuntimeApp{
+			Mounts: []schema.Mount{
+				{
+					Volume: *types.MustACName("foo-mount"),
+					Path:   "/app/foo",
+				},
+			},
+			App: &types.App{
+				Exec:  []string{"/bin/foo"},
+				User:  "0",
+				Group: "0",
+				MountPoints: []types.MountPoint{
+					{
+						Name: *types.MustACName("foo-mount"),
+						Path: "/app/foo",
+					},
+				},
+			},
+		}
+
+		tmpDir, err := ioutil.TempDir("", tstprefix)
+		if err != nil {
+			t.Errorf("error creating tempdir: %v", err)
+		}
+		defer os.RemoveAll(tmpDir)
+
+		p := &stage1commontypes.Pod{Manifest: podManifest, Root: tmpDir}
+		output, err := appToNspawnArgs(p, appManifest, Stage1InsecureOptions{})
+		if err != nil {
+			t.Errorf("#%d: unexpected error: `%v`", i, err)
+		}
+		if rbind := hasRbindArg(output); rbind != tt.expectRecursive {
+			t.Errorf("#%d: expected: recursive: %v, saw: %v \nOutput:\n%v", i, tt.expectRecursive, rbind, output)
+		}
+	}
+}
+
+func hasRbindArg(output []string) bool {
+	rbindRegexp := regexp.MustCompile("^--bind(-ro)?=/host/foo:.*/app/foo:rbind$")
+	for i := len(output) - 1; i >= 0; i-- {
+		if rbindRegexp.MatchString(output[i]) {
+			return true
+		}
+	}
+	return false
+}
diff --git a/tests/rkt_fly_test.go b/tests/rkt_fly_test.go
index 9f0bbdc265..7001a3580b 100644
--- a/tests/rkt_fly_test.go
+++ b/tests/rkt_fly_test.go
@@ -18,15 +18,9 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
-	"path"
-	"path/filepath"
-	"strings"
 	"testing"
 
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/tests/testutils"
 )
 
@@ -58,194 +52,3 @@ func TestFlyNetns(t *testing.T) {
 		t.Fatalf("container left host netns")
 	}
 }
-
-func TestFlyMountCLI(t *testing.T) {
-	tmpDir := createTempDirOrPanic("rkt-mount-test-")
-	defer os.RemoveAll(tmpDir)
-	mountSrcFile := filepath.Join(tmpDir, "hello")
-	if err := ioutil.WriteFile(mountSrcFile, []byte("world"), 0600); err != nil {
-		t.Fatalf("Cannot write file: %v", err)
-	}
-
-	testImageArgs := []string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", mountSrcFile)}
-	testImage := patchTestACI("rkt-inspect-stage1-fly.aci", testImageArgs...)
-	defer os.Remove(testImage)
-
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	testParams := []struct {
-		mountParam   string
-		expectedExit int
-	}{
-		{
-			fmt.Sprintf(
-				"--volume=test,kind=host,source=%s --mount volume=test,target=%s",
-				mountSrcFile, mountSrcFile,
-			),
-			0,
-		},
-		{
-			fmt.Sprintf(
-				"--volume=test1,kind=host,source=%s --mount volume=test1,target=%s --volume=test2,kind=host,source=%s --mount volume=test1,target=%s",
-				mountSrcFile, mountSrcFile,
-				mountSrcFile, mountSrcFile,
-			),
-			1, /* TODO: decide on consistency with other stage1s */
-		},
-	}
-
-	for _, testParam := range testParams {
-		cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s %s", ctx.Cmd(), testImage, testParam.mountParam)
-		child := spawnOrFail(t, cmd)
-		ctx.RegisterChild(child)
-		waitOrFail(t, child, testParam.expectedExit)
-	}
-}
-
-// TODO: unite this with rkt_run_pod_manifest_test.go
-type imagePatch struct {
-	name    string
-	patches []string
-}
-
-const baseAppName = "rkt-inspect"
-
-func verifyHostFile(t *testing.T, tmpdir, filename string, i int, expectedResult string) {
-	filePath := path.Join(tmpdir, filename)
-	defer os.Remove(filePath)
-
-	// Verify the file is written to host.
-	if strings.Contains(expectedResult, "host:") {
-		data, err := ioutil.ReadFile(filePath)
-		if err != nil {
-			t.Fatalf("%d: Cannot read the host file: %v", i, err)
-		}
-		if string(data) != expectedResult {
-			t.Fatalf("%d: Expecting %q in the host file, but saw %q", i, expectedResult, data)
-		}
-	}
-}
-
-func TestFlyMountPodManifest(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	tmpdir := createTempDirOrPanic("rkt-tests.")
-	defer os.RemoveAll(tmpdir)
-
-	tests := []struct {
-		// [image name]:[image patches]
-		images         []imagePatch
-		podManifest    *schema.PodManifest
-		expectedExit   int
-		expectedResult string
-	}{
-		{
-			// Simple read after write with volume mounted in a read-only rootfs.
-			[]imagePatch{
-				{"rkt-test-run-pod-manifest-read-only-rootfs-vol-rw.aci", []string{}},
-			},
-			&schema.PodManifest{
-				Apps: []schema.RuntimeApp{
-					{
-						Name: baseAppName,
-						App: &types.App{
-							Exec:  []string{"/inspect", "--write-file", "--read-file"},
-							User:  "0",
-							Group: "0",
-							Environment: []types.EnvironmentVariable{
-								{"FILE", "/dir1/file"},
-								{"CONTENT", "host:foo"},
-							},
-							MountPoints: []types.MountPoint{
-								{
-									Name:     "dir1",
-									Path:     "/dir1",
-									ReadOnly: false,
-								},
-							},
-						},
-						ReadOnlyRootFS: true,
-					},
-				},
-				Volumes: []types.Volume{
-					{
-						Name:   "dir1",
-						Kind:   "host",
-						Source: tmpdir,
-					},
-				},
-			},
-			0,
-			"host:foo",
-		},
-	}
-
-	for i, tt := range tests {
-		var hashesToRemove []string
-		for j, v := range tt.images {
-			hash, err := patchImportAndFetchHash(v.name, v.patches, t, ctx)
-			if err != nil {
-				t.Fatalf("%v", err)
-			}
-			hashesToRemove = append(hashesToRemove, hash)
-			imgName := types.MustACIdentifier(v.name)
-			imgID, err := types.NewHash(hash)
-			if err != nil {
-				t.Fatalf("Cannot generate types.Hash from %v: %v", hash, err)
-			}
-
-			ra := &tt.podManifest.Apps[j]
-			ra.Image.Name = imgName
-			ra.Image.ID = *imgID
-		}
-
-		tt.podManifest.ACKind = schema.PodManifestKind
-		tt.podManifest.ACVersion = schema.AppContainerVersion
-
-		manifestFile := generatePodManifestFile(t, tt.podManifest)
-		defer os.Remove(manifestFile)
-
-		// 1. Test 'rkt run'.
-		runCmd := fmt.Sprintf("%s run --mds-register=false --pod-manifest=%s", ctx.Cmd(), manifestFile)
-		t.Logf("Running 'run' test #%v", i)
-		child := spawnOrFail(t, runCmd)
-		ctx.RegisterChild(child)
-
-		if tt.expectedResult != "" {
-			if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
-				t.Errorf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
-				continue
-			}
-		}
-		waitOrFail(t, child, tt.expectedExit)
-		verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
-
-		// 2. Test 'rkt prepare' + 'rkt run-prepared'.
-		rktCmd := fmt.Sprintf("%s --insecure-options=image prepare --pod-manifest=%s",
-			ctx.Cmd(), manifestFile)
-		uuid := runRktAndGetUUID(t, rktCmd)
-
-		runPreparedCmd := fmt.Sprintf("%s run-prepared --mds-register=false %s", ctx.Cmd(), uuid)
-		t.Logf("Running 'run-prepared' test #%v", i)
-		child = spawnOrFail(t, runPreparedCmd)
-
-		if tt.expectedResult != "" {
-			if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
-				t.Errorf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
-				continue
-			}
-		}
-
-		waitOrFail(t, child, tt.expectedExit)
-		verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
-
-		// we run the garbage collector and remove the imported images to save
-		// space
-		runGC(t, ctx)
-		for _, h := range hashesToRemove {
-			removeFromCas(t, ctx, h)
-		}
-	}
-}
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index d536a8d9ed..090dee5ee6 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -18,11 +18,8 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
-	"path"
 	"strconv"
-	"strings"
 	"testing"
 
 	"github.com/appc/spec/schema"
@@ -33,8 +30,6 @@ import (
 	"github.com/coreos/rkt/common/cgroup"
 )
 
-const baseAppName = "rkt-inspect"
-
 func intP(i int) *int {
 	return &i
 }
@@ -42,22 +37,6 @@ func stringP(s string) *string {
 	return &s
 }
 
-func verifyHostFile(t *testing.T, tmpdir, filename string, i int, expectedResult string) {
-	filePath := path.Join(tmpdir, filename)
-	defer os.Remove(filePath)
-
-	// Verify the file is written to host.
-	if strings.Contains(expectedResult, "host:") {
-		data, err := ioutil.ReadFile(filePath)
-		if err != nil {
-			t.Fatalf("%d: Cannot read the host file: %v", i, err)
-		}
-		if string(data) != expectedResult {
-			t.Fatalf("%d: Expecting %q in the host file, but saw %q", i, expectedResult, data)
-		}
-	}
-}
-
 func mustNewIsolator(body string) (i types.Isolator) {
 	err := i.UnmarshalJSON([]byte(body))
 	if err != nil {
@@ -66,11 +45,6 @@ func mustNewIsolator(body string) (i types.Isolator) {
 	return
 }
 
-type imagePatch struct {
-	name    string
-	patches []string
-}
-
 // Test running pod manifests that contains just one app.
 // TODO(yifan): Figure out a way to test port mapping on single host.
 func TestPodManifest(t *testing.T) {
@@ -375,9 +349,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:   "dir1",
-						Kind:   "host",
-						Source: tmpdir,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  nil,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -415,9 +394,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:   "dir1",
-						Kind:   "host",
-						Source: tmpdir,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  nil,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -454,9 +438,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:   "dir1",
-						Kind:   "host",
-						Source: tmpdir,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  nil,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -494,9 +483,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:   "dir1",
-						Kind:   "host",
-						Source: tmpdir,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  nil,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -535,10 +529,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:     "dir1",
-						Kind:     "host",
-						Source:   tmpdir,
-						ReadOnly: &boolTrue,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  &boolTrue,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -578,10 +576,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:     "dir1",
-						Kind:     "host",
-						Source:   tmpdir,
-						ReadOnly: &boolTrue,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  &boolTrue,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -619,9 +621,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:   "dir1",
-						Kind:   "host",
-						Source: tmpdir,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  nil,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -660,9 +667,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:   "dir1",
-						Kind:   "host",
-						Source: tmpdir,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  nil,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -687,9 +699,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:   "dir1",
-						Kind:   "host",
-						Source: tmpdir,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  nil,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -717,9 +734,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:   "dir1",
-						Kind:   "host",
-						Source: tmpdir,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  nil,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -746,10 +768,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:     "dir1",
-						Kind:     "host",
-						Source:   tmpdir,
-						ReadOnly: &boolFalse,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  &boolFalse,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -775,10 +801,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:     "dir1",
-						Kind:     "host",
-						Source:   tmpdir,
-						ReadOnly: &boolTrue,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  &boolTrue,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -807,10 +837,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:     "dir1",
-						Kind:     "host",
-						Source:   tmpdir,
-						ReadOnly: &boolTrue,
+						Name:      "dir1",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  &boolTrue,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
@@ -930,9 +964,14 @@ func TestPodManifest(t *testing.T) {
 				},
 				Volumes: []types.Volume{
 					{
-						Name:   "dir",
-						Kind:   "host",
-						Source: tmpdir,
+						Name:      "dir",
+						Kind:      "host",
+						Source:    tmpdir,
+						ReadOnly:  nil,
+						Recursive: nil,
+						Mode:      nil,
+						UID:       nil,
+						GID:       nil,
 					},
 				},
 			},
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index bdb78de817..ca2074a166 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -48,6 +48,8 @@ const (
 	defaultTimeLayout = "2006-01-02 15:04:05.999 -0700 MST"
 	nobodyUid         = 65534
 	nobodyGid         = 65534
+
+	baseAppName = "rkt-inspect"
 )
 
 func expectCommon(p *gexpect.ExpectSubprocess, searchString string, timeout time.Duration) error {
@@ -482,6 +484,11 @@ type podInfo struct {
 	startedAt int64
 }
 
+type imagePatch struct {
+	name    string
+	patches []string
+}
+
 // parsePodInfo parses the 'rkt status $UUID' result into podInfo struct.
 // For example, the 'result' can be:
 // state=running
@@ -818,6 +825,29 @@ func writeConfig(t *testing.T, dir, filename, contents string) {
 	}
 }
 
+func verifyHostFile(t *testing.T, tmpdir, filename string, i int, expectedResult string) {
+	filePath := path.Join(tmpdir, filename)
+	defer os.Remove(filePath)
+
+	// Verify the file is written to host.
+	if strings.Contains(expectedResult, "host:") {
+		data, err := ioutil.ReadFile(filePath)
+		if err != nil {
+			t.Fatalf("%d: Cannot read the host file: %v", i, err)
+		}
+		if string(data) != expectedResult {
+			t.Fatalf("%d: Expecting %q in the host file, but saw %q", i, expectedResult, data)
+		}
+	}
+}
+
+func executeFuncsReverse(funcs []func()) {
+	n := len(funcs)
+	for i := n - 1; i >= 0; i-- {
+		funcs[i]()
+	}
+}
+
 func unmountPod(t *testing.T, ctx *testutils.RktRunCtx, uuid string, rmNetns bool) {
 	podDir := filepath.Join(ctx.DataDir(), "pods", "run", uuid)
 	stage1MntPath := filepath.Join(podDir, "stage1", "rootfs")
diff --git a/tests/rkt_volume_mount_fly_test.go b/tests/rkt_volume_mount_fly_test.go
new file mode 100644
index 0000000000..aa9282903c
--- /dev/null
+++ b/tests/rkt_volume_mount_fly_test.go
@@ -0,0 +1,49 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build fly
+
+package main
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestVolumeMount(t *testing.T) {
+	NewTestVolumeMount([][]volumeMountTestCase{
+		volumeMountTestCasesRecursiveCLI,
+		volumeMountTestCasesNonRecursiveCLI,
+		volumeMountTestCasesRecursivePodManifest,
+		volumeMountTestCasesNonRecursivePodManifest,
+		{
+			{
+				"CLI: duplicate mount given",
+				[]imagePatch{
+					{
+						"rkt-test-run-read-file.aci",
+						[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", tmpdir2filepathpod)},
+					},
+				},
+				fmt.Sprintf(
+					"--volume=test1,kind=host,source=%s --mount volume=test1,target=%s --volume=test2,kind=host,source=%s --mount volume=test1,target=%s",
+					tmpdir, tmpdirpathpod,
+					tmpdir, tmpdirpathpod,
+				),
+				nil,
+				1, /* TODO: decide on consistency with other stage1s */
+				`run: can't evaluate mounts: missing mount for volume "test2"`,
+			},
+		}}).Execute(t)
+}
diff --git a/tests/rkt_volume_mount_generic_test.go b/tests/rkt_volume_mount_generic_test.go
new file mode 100644
index 0000000000..6cd630baaf
--- /dev/null
+++ b/tests/rkt_volume_mount_generic_test.go
@@ -0,0 +1,49 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build coreos host kvm
+
+package main
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestVolumeMount(t *testing.T) {
+	NewTestVolumeMount([][]volumeMountTestCase{
+		volumeMountTestCasesRecursiveCLI,
+		volumeMountTestCasesNonRecursiveCLI,
+		volumeMountTestCasesRecursivePodManifest,
+		volumeMountTestCasesNonRecursivePodManifest,
+		{
+			{
+				"CLI: duplicate mount given",
+				[]imagePatch{
+					{
+						"rkt-test-run-read-file.aci",
+						[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", tmpdir2filepathpod)},
+					},
+				},
+				fmt.Sprintf(
+					"--volume=test1,kind=host,source=%s --mount volume=test1,target=%s --volume=test2,kind=host,source=%s --mount volume=test1,target=%s",
+					tmpdir, tmpdirpathpod,
+					tmpdir, tmpdirpathpod,
+				),
+				nil,
+				0,
+				tmpdir2innerfilecontent,
+			},
+		}}).Execute(t)
+}
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
new file mode 100644
index 0000000000..f8e6339433
--- /dev/null
+++ b/tests/rkt_volume_mount_test.go
@@ -0,0 +1,343 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build coreos kvm host fly
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"path"
+	"syscall"
+	"testing"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+// TODO: unite these tests with rkt_run_pod_manifest_test.go
+
+var (
+	boolTrue                             = true
+	boolFalse                            = false
+	tmpdir                               = createTempDirOrPanic("rkt-tests-fly")
+	tmpdirmountname         types.ACName = "dir1"
+	tmpdirpathpod                        = "/dir1"
+	tmpdir2path                          = path.Join(tmpdir, "dir2")
+	tmpdir2filepath                      = path.Join(tmpdir2path, "file")
+	tmpdir2filepathpod                   = "/dir1/dir2/file"
+	tmpdir2innerfilecontent              = "inner"
+	tmpdir2outerfilecontent              = "outer"
+)
+
+func prepareTmpDirWithRecursiveMountsAndFiles(t *testing.T) []func() {
+	cleanupFuncs := make([]func(), 0)
+
+	// create directory for /dir1
+	if err := os.MkdirAll(tmpdir2path, 0); err != nil {
+		t.Fatalf("Can't recreate inner temp directory %q: %v", tmpdir2path, err)
+	}
+	cleanupFuncs = append(cleanupFuncs, func() { os.RemoveAll(tmpdir) })
+
+	// create the file in dir2 before the mount
+	tmpdir2outerfile, err := os.Create(tmpdir2filepath)
+	if err != nil {
+		executeFuncsReverse(cleanupFuncs)
+		t.Fatalf("Can't create outer file %q: %v", tmpdir2path, err)
+	}
+	cleanupFuncs = append(cleanupFuncs, func() { tmpdir2outerfile.Close() })
+
+	if _, err := tmpdir2outerfile.WriteString(tmpdir2outerfilecontent); err != nil {
+		executeFuncsReverse(cleanupFuncs)
+		t.Fatalf("Can't write to file %q after mounting: %v", tmpdir2outerfile, err)
+	}
+
+	// mount tmpfs for /dir1/dir2
+	if err := syscall.Mount("", tmpdir2path, "tmpfs", 0, ""); err != nil {
+		executeFuncsReverse(cleanupFuncs)
+		t.Fatalf("Can't mount tmpfs on inner temp directory %q: %v", tmpdir2path, err)
+	}
+	cleanupFuncs = append(cleanupFuncs, func() {
+		if err := syscall.Unmount(tmpdir2path, syscall.MNT_DETACH); err != nil {
+			t.Errorf("could not unmount %q: %v", tmpdir2path, err)
+		}
+	})
+	cleanupFuncs = append(cleanupFuncs, func() { os.RemoveAll(tmpdir) })
+
+	// create the file in dir2 after the mount
+	tmpdir2innerfile, err := os.Create(tmpdir2filepath)
+	if err != nil {
+		executeFuncsReverse(cleanupFuncs)
+		t.Fatalf("Can't create inner file %q: %v", tmpdir2path, err)
+	}
+	cleanupFuncs = append(cleanupFuncs, func() { tmpdir2innerfile.Close() })
+
+	if _, err := tmpdir2innerfile.WriteString(tmpdir2innerfilecontent); err != nil {
+		executeFuncsReverse(cleanupFuncs)
+		t.Fatalf("Can't write to file %q after mounting: %v", tmpdir2innerfile, err)
+	}
+
+	return cleanupFuncs
+}
+
+type volumeMountTestCase struct {
+	description string
+	// [image name]:[image patches]
+	images         []imagePatch
+	cmdArgs        string
+	podManifest    *schema.PodManifest
+	expectedExit   int
+	expectedResult string
+}
+
+var (
+	volumeMountTestCasesRecursiveCLI = []volumeMountTestCase{
+		{
+			"CLI: recursive mount read file",
+			[]imagePatch{
+				{
+					"rkt-test-run-read-file.aci",
+					[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", tmpdir2filepathpod)},
+				},
+			},
+			fmt.Sprintf(
+				"--volume=test1,kind=host,source=%s,recursive=true --mount volume=test1,target=%s",
+				tmpdir, tmpdirpathpod,
+			),
+			nil,
+			0,
+			tmpdir2innerfilecontent,
+		},
+	}
+
+	volumeMountTestCasesNonRecursiveCLI = []volumeMountTestCase{
+		{
+			"CLI: read file with non-recursive mount",
+			[]imagePatch{
+				{
+					"rkt-test-run-read-file.aci",
+					[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", tmpdir2filepathpod)},
+				},
+			},
+			fmt.Sprintf(
+				"--volume=test,kind=host,source=%s,recursive=false --mount volume=test,target=%s",
+				tmpdir, tmpdirpathpod,
+			),
+			nil,
+			0,
+			tmpdir2outerfilecontent,
+		},
+	}
+
+	volumeMountTestCasesRecursivePodManifest = []volumeMountTestCase{
+		{
+			"Read of nested file for recursive mount",
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-recursive-mount-stat.aci", []string{}},
+			},
+			"",
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", tmpdir2filepathpod},
+							},
+							MountPoints: []types.MountPoint{
+								{tmpdirmountname, tmpdirpathpod, false},
+							},
+						},
+					},
+				},
+				Volumes: []types.Volume{
+					{Name: tmpdirmountname, Kind: "host", Source: tmpdir,
+						ReadOnly: nil, Recursive: &boolTrue,
+						Mode: nil, UID: nil, GID: nil},
+				},
+			},
+			0,
+			tmpdir2innerfilecontent,
+		},
+	}
+
+	volumeMountTestCasesNonRecursivePodManifest = []volumeMountTestCase{
+		{
+			"PodManifest: Simple read after write with volume non-recursive mounted in a read-only rootfs.",
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-read-only-rootfs-vol-rw.aci", []string{}},
+			},
+			"",
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--write-file", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", path.Join(tmpdirpathpod, "file")},
+								{"CONTENT", "host:foo"},
+							},
+							MountPoints: []types.MountPoint{
+								{tmpdirmountname, tmpdirpathpod, false},
+							},
+						},
+						ReadOnlyRootFS: true,
+					},
+				},
+				Volumes: []types.Volume{
+					{Name: tmpdirmountname, Kind: "host", Source: tmpdir,
+						ReadOnly: nil, Recursive: &boolFalse,
+						Mode: nil, UID: nil, GID: nil},
+				},
+			},
+			0,
+			"host:foo",
+		},
+	}
+
+	volumeMountTestCasesNonRecursive = []volumeMountTestCase{
+		{
+			"Read of nested file for non-recursive mount",
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-recursive-mount-stat.aci", []string{}},
+			},
+			"",
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--read-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", tmpdir2filepathpod},
+							},
+							MountPoints: []types.MountPoint{
+								{"dir1", tmpdirpathpod, false},
+							},
+						},
+					},
+				},
+				Volumes: []types.Volume{
+					{Name: tmpdirmountname, Kind: "host", Source: tmpdir,
+						ReadOnly: nil, Recursive: &boolFalse,
+						Mode: nil, UID: nil, GID: nil},
+				},
+			},
+			0,
+			tmpdir2outerfilecontent,
+		},
+	}
+)
+
+func NewTestVolumeMount(volumeMountTestCases [][]volumeMountTestCase) testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		deferredFuncs := prepareTmpDirWithRecursiveMountsAndFiles(t)
+		defer executeFuncsReverse(deferredFuncs)
+
+		for _, testCases := range volumeMountTestCases {
+			for i, tt := range testCases {
+				var hashesToRemove []string
+				for j, v := range tt.images {
+					hash, err := patchImportAndFetchHash(v.name, v.patches, t, ctx)
+					if err != nil {
+						t.Fatalf("error running patchImportAndFetchHash: %v", err)
+					}
+
+					hashesToRemove = append(hashesToRemove, hash)
+					if tt.podManifest != nil {
+						imgName := types.MustACIdentifier(v.name)
+						imgID, err := types.NewHash(hash)
+						if err != nil {
+							t.Fatalf("Cannot generate types.Hash from %v: %v", hash, err)
+						}
+						tt.podManifest.Apps[j].Image.Name = imgName
+						tt.podManifest.Apps[j].Image.ID = *imgID
+					}
+				}
+
+				manifestFile := ""
+				if tt.podManifest != nil {
+					tt.podManifest.ACKind = schema.PodManifestKind
+					tt.podManifest.ACVersion = schema.AppContainerVersion
+
+					manifestFile = generatePodManifestFile(t, tt.podManifest)
+					defer os.Remove(manifestFile)
+				}
+
+				// 1. Test 'rkt run'.
+				runCmd := fmt.Sprintf("%s run --mds-register=false", ctx.Cmd())
+				if manifestFile != "" {
+					runCmd += fmt.Sprintf(" --pod-manifest=%s", manifestFile)
+				} else {
+					// TODO: run the tests for more than just the first image
+					runCmd += fmt.Sprintf(" %s %s", tt.cmdArgs, hashesToRemove[0])
+				}
+				t.Logf("Running 'run' test #%v: %q", i, tt.description)
+				child := spawnOrFail(t, runCmd)
+				ctx.RegisterChild(child)
+
+				if tt.expectedResult != "" {
+					if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
+						t.Fatalf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
+					}
+				}
+				waitOrFail(t, child, tt.expectedExit)
+				verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
+
+				// 2. Test 'rkt prepare' + 'rkt run-prepared'.
+				prepareCmd := fmt.Sprintf("%s prepare", ctx.Cmd())
+				if manifestFile != "" {
+					prepareCmd += fmt.Sprintf(" --pod-manifest=%s", manifestFile)
+				} else {
+					// TODO: run the tests for more than just the first image
+					prepareCmd += fmt.Sprintf(" %s %s", tt.cmdArgs, hashesToRemove[0])
+				}
+				uuid := runRktAndGetUUID(t, prepareCmd)
+
+				runPreparedCmd := fmt.Sprintf("%s run-prepared --mds-register=false %s", ctx.Cmd(), uuid)
+				t.Logf("Running 'run-prepared' test #%v: %q", i, tt.description)
+				child = spawnOrFail(t, runPreparedCmd)
+
+				if tt.expectedResult != "" {
+					if _, out, err := expectRegexWithOutput(child, tt.expectedResult); err != nil {
+						t.Fatalf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
+					}
+				}
+
+				waitOrFail(t, child, tt.expectedExit)
+				verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
+
+				// we run the garbage collector and remove the imported images to save
+				// space
+				runGC(t, ctx)
+				for _, h := range hashesToRemove {
+					removeFromCas(t, ctx, h)
+				}
+			}
+		}
+	})
+}

From 25d30211a3bd797c0bf2a226b7854a831c3e9df1 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 3 Aug 2016 12:05:57 -0700
Subject: [PATCH 0716/1304] stage1: ensure read-only for recursive volumes

* remount every recursive sub-mount read-only
* modify stage0 code to export GetMountsForPrefix
* add tests to cover recursive/read-only mounts
---
 stage0/gc.go                   | 29 +++++++++++++++-----
 stage0/gc_test.go              |  6 ++---
 stage1/init/kvm.go             | 33 ++++++++++++++++++++---
 stage1_fly/run/main.go         | 34 ++++++++++++++++++++---
 tests/rkt_volume_mount_test.go | 49 ++++++++++++++++++++++++++++++++++
 5 files changed, 134 insertions(+), 17 deletions(-)

diff --git a/stage0/gc.go b/stage0/gc.go
index 34e61517f5..77db6cace0 100644
--- a/stage0/gc.go
+++ b/stage0/gc.go
@@ -69,7 +69,7 @@ func GC(pdir string, uuid *types.UUID) error {
 type mount struct {
 	id         int
 	parentID   int
-	mountPoint string
+	MountPoint string
 	opt        map[string]struct{}
 }
 
@@ -99,6 +99,21 @@ func (m mounts) Less(i, j int) (result bool) { return m.getMountDepth(i) >= m.ge
 func (m mounts) Len() int                    { return len(m) }
 func (m mounts) Swap(i, j int)               { m[i], m[j] = m[j], m[i] }
 
+func GetMountsForPrefix(path string) (mounts, error) {
+	mi, err := os.Open("/proc/self/mountinfo")
+	if err != nil {
+		return nil, err
+	}
+	defer mi.Close()
+
+	mnts, err := getMountsForPrefix(path, mi)
+	if err != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("error getting sub-mounts under %q from mountinfo", path), err)
+	}
+
+	return mnts, nil
+}
+
 // getMountsForPrefix parses mi (/proc/PID/mountinfo) and returns mounts for path prefix
 func getMountsForPrefix(path string, mi io.Reader) (mounts, error) {
 	var podMounts mounts
@@ -147,11 +162,11 @@ func getMountsForPrefix(path string, mi io.Reader) (mounts, error) {
 			}
 		}
 
-		if strings.Contains(mountPoint, path) {
+		if strings.HasPrefix(mountPoint, path) {
 			mnt := &mount{
 				id:         mountID,
 				parentID:   parentID,
-				mountPoint: mountPoint,
+				MountPoint: mountPoint,
 				opt:        opt,
 			}
 			podMounts = append(podMounts, mnt)
@@ -192,16 +207,16 @@ func MountGC(path, uuid string) error {
 	for i := len(mnts) - 1; i >= 0; i-- {
 		mnt := mnts[i]
 		if needsRemountPrivate(mnt) {
-			if err := syscall.Mount("", mnt.mountPoint, "", syscall.MS_PRIVATE, ""); err != nil {
-				return errwrap.Wrap(fmt.Errorf("could not remount at %v", mnt.mountPoint), err)
+			if err := syscall.Mount("", mnt.MountPoint, "", syscall.MS_PRIVATE, ""); err != nil {
+				return errwrap.Wrap(fmt.Errorf("could not remount at %v", mnt.MountPoint), err)
 			}
 		}
 	}
 
 	for _, mnt := range mnts {
-		if err := syscall.Unmount(mnt.mountPoint, 0); err != nil {
+		if err := syscall.Unmount(mnt.MountPoint, 0); err != nil {
 			if err != syscall.ENOENT && err != syscall.EINVAL {
-				return errwrap.Wrap(fmt.Errorf("could not unmount %v", mnt.mountPoint), err)
+				return errwrap.Wrap(fmt.Errorf("could not unmount %v", mnt.MountPoint), err)
 			}
 		}
 	}
diff --git a/stage0/gc_test.go b/stage0/gc_test.go
index 405ec86505..bf9f22f1cf 100644
--- a/stage0/gc_test.go
+++ b/stage0/gc_test.go
@@ -121,7 +121,7 @@ func TestMountOrdering(t *testing.T) {
 		}
 
 		for _, mntCur := range mnts {
-			t.Logf("Unmounting %d: %q", mntCur.id, mntCur.mountPoint)
+			t.Logf("Unmounting %d: %q", mntCur.id, mntCur.MountPoint)
 		}
 
 		if err := safeOrder(mnts); err != nil {
@@ -138,8 +138,8 @@ func safeOrder(m mounts) error {
 			if !m.Less(i, j) {
 				return fmt.Errorf("Transitivity check failed for %d(%d) and %d(%d)", i, mntCur.id, j, mntNext.id)
 			}
-			if strings.HasPrefix(mntNext.mountPoint, mntCur.mountPoint) {
-				return fmt.Errorf("Must not unmount \n%q before\n%q.", mntCur.mountPoint, mntNext.mountPoint)
+			if strings.HasPrefix(mntNext.MountPoint, mntCur.MountPoint) {
+				return fmt.Errorf("Must not unmount \n%q before\n%q.", mntCur.MountPoint, mntNext.MountPoint)
 			}
 		}
 	}
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index cd13d37135..4e75c32b5e 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 	"syscall"
 
 	"github.com/appc/spec/schema"
@@ -28,6 +29,7 @@ import (
 	"github.com/coreos/go-systemd/util"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/networking"
+	"github.com/coreos/rkt/stage0"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 	"github.com/coreos/rkt/stage1/init/kvm"
@@ -113,16 +115,39 @@ func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.Runtim
 }
 
 func doBindMount(source, destination string, readOnly bool, recursive *bool) error {
-	var flags uintptr = syscall.MS_BIND | syscall.MS_REC
+	var flags uintptr = syscall.MS_BIND
+
 	if readOnly {
 		flags |= syscall.MS_RDONLY
 	}
 
 	// Enable recursive by default and remove it if explicitly requested
-	if recursive != nil && *recursive == false {
-		flags ^= syscall.MS_REC
+	recursiveBool := recursive == nil || *recursive == true
+	if recursiveBool {
+		flags |= syscall.MS_REC
+	}
+
+	if err := syscall.Mount(source, destination, "bind", flags, ""); err != nil {
+		return err
 	}
-	return syscall.Mount(source, destination, "bind", flags, "")
+
+	if readOnly && recursiveBool {
+		// Sub-mounts are still read-write, so find them and remount them read-only
+
+		mnts, err := stage0.GetMountsForPrefix(source + "/")
+		if err != nil {
+			return errwrap.Wrap(fmt.Errorf("error getting mounts under %q from mountinfo", source), err)
+		}
+
+		for _, mnt := range mnts {
+			innerAbsPath := destination + strings.Replace(mnt.MountPoint, source, "", -1)
+			if err := syscall.Mount("", innerAbsPath, "none", syscall.MS_REMOUNT|syscall.MS_RDONLY, ""); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
 }
 
 func ensureDestinationExists(source, destination string) error {
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 3b4a5c7b5c..628d7b1dfa 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -35,6 +35,7 @@ import (
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/pkg/user"
+	"github.com/coreos/rkt/stage0"
 	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 )
@@ -199,19 +200,40 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 			)
 		}
 
-		var flags uintptr = syscall.MS_BIND
+		var (
+			flags     uintptr = syscall.MS_BIND
+			recursive         = tuple.V.Recursive != nil && *tuple.V.Recursive
+			ro                = tuple.V.ReadOnly != nil && *tuple.V.ReadOnly
+		)
+
 		// If Recursive is not set, default to non-recursive.
-		if tuple.V.Recursive != nil && *tuple.V.Recursive {
+		if recursive {
 			flags |= syscall.MS_REC
 		}
+
 		argFlyMounts = append(argFlyMounts,
 			flyMount{tuple.V.Source, rfs, tuple.M.Path, "none", flags},
 		)
 
-		if tuple.V.ReadOnly != nil && *tuple.V.ReadOnly {
+		if ro {
 			argFlyMounts = append(argFlyMounts,
 				flyMount{"", rfs, tuple.M.Path, "none", flags | syscall.MS_REMOUNT | syscall.MS_RDONLY},
 			)
+
+			if recursive {
+				// Every sub-mount needs to be remounted read-only separately
+				mnts, err := stage0.GetMountsForPrefix(tuple.V.Source + "/")
+				if err != nil {
+					return nil, errwrap.Wrap(fmt.Errorf("error getting mounts under %q from mountinfo", tuple.V.Source), err)
+				}
+
+				for _, mnt := range mnts {
+					innerRelPath := tuple.M.Path + strings.Replace(mnt.MountPoint, tuple.V.Source, "", -1)
+					argFlyMounts = append(argFlyMounts,
+						flyMount{"", rfs, innerRelPath, "none", flags | syscall.MS_REMOUNT | syscall.MS_RDONLY},
+					)
+				}
+			}
 		}
 	}
 	return argFlyMounts, nil
@@ -298,6 +320,8 @@ func stage1() int {
 	)
 
 	for _, mount := range effectiveMounts {
+		log.Printf("Processing %+v", mount)
+
 		var (
 			err            error
 			hostPathInfo   os.FileInfo
@@ -320,6 +344,10 @@ func stage1() int {
 		}
 
 		switch {
+		case (mount.Flags & syscall.MS_REMOUNT) != 0:
+			{
+				log.Printf("don't attempt to create files for remount of %q", absTargetPath)
+			}
 		case targetPathInfo == nil:
 			absTargetPathParent, _ := filepath.Split(absTargetPath)
 			if err := os.MkdirAll(absTargetPathParent, 0755); err != nil {
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
index f8e6339433..09667adc0d 100644
--- a/tests/rkt_volume_mount_test.go
+++ b/tests/rkt_volume_mount_test.go
@@ -121,6 +121,22 @@ var (
 			0,
 			tmpdir2innerfilecontent,
 		},
+		{
+			"CLI: recursive read-only mount write file must fail",
+			[]imagePatch{
+				{
+					"rkt-test-run-write-file.aci",
+					[]string{fmt.Sprintf("--exec=/inspect --write-file --file-name %s", tmpdir2filepathpod)},
+				},
+			},
+			fmt.Sprintf(
+				"--volume=test1,kind=host,source=%s,recursive=true,readOnly=true --mount volume=test1,target=%s",
+				tmpdir, tmpdirpathpod,
+			),
+			nil,
+			1,
+			"",
+		},
 	}
 
 	volumeMountTestCasesNonRecursiveCLI = []volumeMountTestCase{
@@ -175,6 +191,39 @@ var (
 			0,
 			tmpdir2innerfilecontent,
 		},
+		{
+			"Write of nested file for recursive/read-only mount must fail",
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-recursive-mount-write.aci", []string{}},
+			},
+			"",
+			&schema.PodManifest{
+				Apps: []schema.RuntimeApp{
+					{
+						Name: baseAppName,
+						App: &types.App{
+							Exec:  []string{"/inspect", "--write-file"},
+							User:  "0",
+							Group: "0",
+							Environment: []types.EnvironmentVariable{
+								{"FILE", tmpdir2filepathpod},
+								{"CONTENT", "should-not-see-me"},
+							},
+							MountPoints: []types.MountPoint{
+								{tmpdirmountname, tmpdirpathpod, false},
+							},
+						},
+					},
+				},
+				Volumes: []types.Volume{
+					{Name: tmpdirmountname, Kind: "host", Source: tmpdir,
+						ReadOnly: &boolTrue, Recursive: &boolTrue,
+						Mode: nil, UID: nil, GID: nil},
+				},
+			},
+			1,
+			"",
+		},
 	}
 
 	volumeMountTestCasesNonRecursivePodManifest = []volumeMountTestCase{

From 4cdb4ca5c9cc7a94a8acf7890717de483e560bc6 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 31 Aug 2016 15:26:15 +0200
Subject: [PATCH 0717/1304] proposals/app-level-api: add rkt app sandbox
 subcommand

This adds a new subcommand `app sandbox` to create an initial empty pod.

Follows #2932
---
 Documentation/proposals/app-level-api.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Documentation/proposals/app-level-api.md b/Documentation/proposals/app-level-api.md
index 4485392bc1..2ccb90a33a 100644
--- a/Documentation/proposals/app-level-api.md
+++ b/Documentation/proposals/app-level-api.md
@@ -19,6 +19,15 @@ aforementioned stage1 entrypoints.
 
 The proposed app-level commands are described below.
 
+## `rkt app sandbox`
+Initializes an empty pod having no applications. This returns a single line
+containing the `pod-uuid` which can be used to perform application
+operations specified below. This also implies the started pod will be injectable.
+
+```bash
+rkt app sandbox
+```
+
 ## `rkt app add`
 Injects an application image into a running pod. After this has been called,
 the app is prepared and ready to be run via `rkt app start`.
@@ -196,7 +205,7 @@ operations.
 
 ### Example Workflow
 
-1. Create an empty pod (specified via an option that allows empty pods to stay alive).
+1. Create an empty pod.
 2. Inject applications into the pod.
 3. Orchestrate the workflow of applications (e.g. app1 has to terminate successfully before app2).
 

From 367b414ee8ce9e72113ad2f034afa7c5fd1871cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=C5=BBy=C5=82owski?=
 <michal.zylowski@intel.com>
Date: Thu, 18 Aug 2016 19:30:21 +0200
Subject: [PATCH 0718/1304] rkt-monitor: bunch of improvements * Container
 start time is measured by reading output from app * Using rkt stop instead of
 killing all processes * Using rkt gc when container is in exit state * Using
 milliseconds instead of nanoseconds * Added test image name to output csv
 filename * Option for build all test images by one command * Readme updated *
 Minor fixes

---
 tests/rkt-monitor/README.md            |  47 ++++++--
 tests/rkt-monitor/build-stresser.sh    |  35 +++---
 tests/rkt-monitor/cpu-stresser/main.go |   3 +
 tests/rkt-monitor/log-stresser/main.go |   1 +
 tests/rkt-monitor/main.go              | 143 +++++++++++++++----------
 tests/rkt-monitor/mem-stresser/main.go |   2 +
 tests/rkt-monitor/sleeper/main.go      |   2 +
 7 files changed, 154 insertions(+), 79 deletions(-)

diff --git a/tests/rkt-monitor/README.md b/tests/rkt-monitor/README.md
index 9cc2471d16..4cd3ba535e 100644
--- a/tests/rkt-monitor/README.md
+++ b/tests/rkt-monitor/README.md
@@ -31,21 +31,46 @@ attempt to eat up resources in different ways.
 An example usage:
 
 ```
-$ ./tests/rkt-monitor/build-stresser.sh log
+$ ./tests/rkt-monitor/build-stresser.sh all
 Building worker...
 Beginning build with an empty ACI
+Setting name of ACI to appc.io/rkt-cpu-stresser
+Copying host:build-rkt-1.13.0+git/target/bin/cpu-stresser to aci:/worker
+Setting exec command [/worker]
+Writing ACI to cpu-stresser.aci
+Ending the build
+Beginning build with an empty ACI
+Setting name of ACI to appc.io/rkt-mem-stresser
+Copying host:build-rkt-1.13.0+git/target/bin/mem-stresser to aci:/worker
+Setting exec command [/worker]
+Writing ACI to mem-stresser.aci
+Ending the build
+Beginning build with an empty ACI
 Setting name of ACI to appc.io/rkt-log-stresser
-Copying host:worker-binary to aci:/worker
+Copying host:build-rkt-1.13.0+git/target/bin/log-stresser to aci:/worker
 Setting exec command [/worker]
 Writing ACI to log-stresser.aci
 Ending the build
-$ sudo ./build-rkt-1.10.0+git/target/bin/rkt-monitor log-stresser.aci 
-[sudo] password for derek: 
-rkt(13261): seconds alive: 10  avg CPU: 33.113897%  avg Mem: 4 kB  peak Mem: 4 kB
-systemd(13302): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
-systemd-journal(13303): seconds alive: 9  avg CPU: 68.004584%  avg Mem: 7 mB  peak Mem: 7 mB
-worker(13307): seconds alive: 9  avg CPU: 13.004088%  avg Mem: 1 mB  peak Mem: 1 mB
-load average in a container: Load1: 0.280000 Load5: 0.250000 Load15: 0.200000
-container start time: 315621ns
-container stop time: 17280555ns
+$ sudo ./build-rkt-1.13.0+git/target/bin/rkt-monitor log-stresser.aci -r 3 -d 10s
+ld-linux-x86-64(29641): seconds alive: 10  avg CPU: 28.948348%  avg Mem: 3 mB  peak Mem: 3 mB
+systemd(29698): seconds alive: 10  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
+systemd-journal(29700): seconds alive: 10  avg CPU: 89.878237%  avg Mem: 7 mB  peak Mem: 7 mB
+worker(29705): seconds alive: 10  avg CPU: 8.703743%  avg Mem: 5 mB  peak Mem: 6 mB
+load average: Load1: 2.430000 Load5: 1.560000 Load15: 1.100000
+container start time: 2539.947085ms
+container stop time: 14.724007ms
+systemd-journal(29984): seconds alive: 10  avg CPU: 88.553202%  avg Mem: 7 mB  peak Mem: 7 mB
+worker(29989): seconds alive: 10  avg CPU: 8.415344%  avg Mem: 5 mB  peak Mem: 6 mB
+ld-linux-x86-64(29890): seconds alive: 10  avg CPU: 28.863746%  avg Mem: 3 mB  peak Mem: 3 mB
+systemd(29982): seconds alive: 10  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
+load average: Load1: 2.410000 Load5: 1.600000 Load15: 1.120000
+container start time: 2771.857209ms
+container stop time: 15.30096ms
+systemd(30270): seconds alive: 10  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
+systemd-journal(30272): seconds alive: 10  avg CPU: 88.863170%  avg Mem: 7 mB  peak Mem: 7 mB
+worker(30277): seconds alive: 10  avg CPU: 8.503793%  avg Mem: 5 mB  peak Mem: 6 mB
+ld-linux-x86-64(30155): seconds alive: 10  avg CPU: 29.522864%  avg Mem: 3 mB  peak Mem: 3 mB
+load average: Load1: 2.270000 Load5: 1.600000 Load15: 1.120000
+container start time: 2641.468717ms
+container stop time: 14.610641ms
 ```
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 9ffa832914..624e8d548e 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -6,30 +6,37 @@ if ! [[ "$0" =~ "tests/rkt-monitor/build-stresser.sh" ]]; then
 	exit 255
 fi
 
-stressers=(cpu mem log)
+stressers="cpu mem log"
 
 if [ -z "${1}" ]; then
-    echo Specify one of \""${stressers[@]}"\"
+    echo Specify one of \""${stressers[@]}"\" or all
     exit 1
 fi
 
-
 echo "Building worker..."
 make rkt-monitor
 
 acbuildEnd() {
     export EXIT=$?
-    acbuild --debug end && exit $EXIT
+    if [ -d ".acbuild" ]; then
+        acbuild --debug end && exit $EXIT
+    fi
 }
 
-acbuild --debug begin
-
-trap acbuildEnd EXIT
-
-acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-
-acbuild --debug copy build-rkt-1.14.0+git/target/bin/"${1}"-stresser /worker
-
-acbuild --debug set-exec -- /worker
+buildImages() {
+    acbuild --debug begin
+    trap acbuildEnd EXIT
+    acbuild --debug set-name appc.io/rkt-"${1}"-stresser
+    acbuild --debug copy build-rkt-1.14.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug set-exec -- /worker
+    acbuild --debug write --overwrite "${1}"-stresser.aci
+    acbuild --debug end
+}
 
-acbuild --debug write --overwrite "${1}"-stresser.aci
+if [ "${1}" = "all" ]; then
+    for stresser in ${stressers}; do
+        buildImages ${stresser}
+    done
+else
+    buildImages ${1}
+fi
diff --git a/tests/rkt-monitor/cpu-stresser/main.go b/tests/rkt-monitor/cpu-stresser/main.go
index 4874f5a888..54f8c86d38 100644
--- a/tests/rkt-monitor/cpu-stresser/main.go
+++ b/tests/rkt-monitor/cpu-stresser/main.go
@@ -14,7 +14,10 @@
 
 package main
 
+import "fmt"
+
 func main() {
+	fmt.Print("APP-STARTED!\n")
 	for {
 		var x uint64
 		for i := 0; i < 1000000000; i++ {
diff --git a/tests/rkt-monitor/log-stresser/main.go b/tests/rkt-monitor/log-stresser/main.go
index af1ebc379d..cfb1edc237 100644
--- a/tests/rkt-monitor/log-stresser/main.go
+++ b/tests/rkt-monitor/log-stresser/main.go
@@ -20,6 +20,7 @@ import (
 )
 
 func main() {
+	fmt.Print("APP-STARTED!\n")
 	for {
 		fmt.Printf("%s\n", time.Now().Format("Mon Jan 2 15:04:05 -0700 MST 2006"))
 	}
diff --git a/tests/rkt-monitor/main.go b/tests/rkt-monitor/main.go
index 158fdd33db..e1805b7e3c 100644
--- a/tests/rkt-monitor/main.go
+++ b/tests/rkt-monitor/main.go
@@ -15,15 +15,16 @@
 package main
 
 import (
+	"bufio"
 	"encoding/csv"
 	"encoding/json"
 	"flag"
 	"fmt"
 	"os"
 	"os/exec"
-	"os/signal"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/appc/spec/schema"
@@ -39,6 +40,7 @@ type ProcessStatus struct {
 	VMS  uint64  // Virtual memory size
 	RSS  uint64  // Resident set size
 	Swap uint64  // Swap size
+	ID   string  // Container ID
 }
 
 var (
@@ -111,14 +113,19 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 		podManifest = true
 	}
 
-	var flavorType string
+	var flavorType, testImage string
 	if flagStage1Path == "" {
 		flavorType = "stage1-coreos.aci"
 	} else {
+		if !fileExist(flagStage1Path) {
+			fmt.Fprintln(os.Stderr, "Given stage1 file path doesn't exist")
+			os.Exit(1)
+		}
 		_, flavorType = filepath.Split(flagStage1Path)
 	}
 
-	var execCmd *exec.Cmd
+	var containerId string
+	var stopCmd, execCmd, gcCmd *exec.Cmd
 	var loadAvg *load.AvgStat
 	var containerStarting, containerStarted, containerStopping, containerStopped time.Time
 
@@ -127,16 +134,18 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 
 	var rktBinary string
 	if flagRktDir != "" {
-		rktBinary = flagRktDir + "/rkt"
+		rktBinary = filepath.Join(flagRktDir, "rkt")
+		if !fileExist(rktBinary) {
+			fmt.Fprintln(os.Stderr, "rkt binary not found!")
+			os.Exit(1)
+		}
 	} else {
 		rktBinary = "rkt"
 	}
 
 	for i := 0; i < flagRepetitionNumber; i++ {
-		containerStarting = time.Now()
-
 		// build argument list for execCmd
-		argv := []string{"run"}
+		argv := []string{"run", "--debug"}
 
 		if flagStage1Path != "" {
 			argv = append(argv, fmt.Sprintf("--stage1-path=%v", flagStage1Path))
@@ -152,28 +161,47 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 		execCmd = exec.Command(rktBinary, argv...)
 
 		if flagShowOutput {
-			execCmd.Stdout = os.Stdout
 			execCmd.Stderr = os.Stderr
 		}
 
-		err = execCmd.Start()
-		containerStarted = time.Now()
+		cmdReader, err := execCmd.StdoutPipe()
 		if err != nil {
-			fmt.Printf("%v\n", err)
+			fmt.Fprintln(os.Stderr, "Error creating StdoutPipe for execCmd", err)
 			os.Exit(1)
 		}
 
-		c := make(chan os.Signal, 1)
-		signal.Notify(c, os.Interrupt)
+		execCmdScanner := bufio.NewScanner(cmdReader)
+
+		startConfirmation := make(chan string, 1)
 		go func() {
-			for range c {
-				err := killAllChildren(int32(execCmd.Process.Pid))
-				if err != nil {
-					fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
+			var containerId string
+			for execCmdScanner.Scan() {
+				if flagShowOutput {
+					fmt.Println(execCmdScanner.Text())
+				}
+				if strings.Contains(execCmdScanner.Text(), "APP-STARTED!") {
+					startConfirmation <- containerId
+				} else if strings.Contains(execCmdScanner.Text(), "Set hostname to") {
+					sl := strings.SplitAfter(execCmdScanner.Text(), "<rkt-")
+					containerId = sl[len(sl)-1]
+					containerId = containerId[:len(containerId)-2]
 				}
-				os.Exit(1)
 			}
 		}()
+		containerStarting = time.Now()
+		err = execCmd.Start()
+		containerId = <-startConfirmation
+		containerStarted = time.Now() //here we are sure - container is running (issue: #3019)
+		close(startConfirmation)
+
+		if flagShowOutput {
+			execCmd.Stdout = os.Stdout
+		}
+
+		if err != nil {
+			fmt.Printf("%v\n", err)
+			os.Exit(1)
+		}
 
 		usages := make(map[int32][]*ProcessStatus)
 
@@ -211,13 +239,41 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 			fmt.Fprintf(os.Stderr, "measure load avg failed: %v\n", err)
 		}
 
+		stopCmd = exec.Command(rktBinary, "stop", containerId)
+
+		cmdStopReader, err := stopCmd.StdoutPipe()
+		if err != nil {
+			fmt.Fprintln(os.Stderr, "Error creating StdoutPipe for stopCmd", err)
+			os.Exit(1)
+		}
+		cmdStopScanner := bufio.NewScanner(cmdStopReader)
+
 		containerStopping = time.Now()
-		err = killAllChildren(int32(execCmd.Process.Pid))
+		stopConfirmation := make(chan bool, 1)
+		go func() {
+			for cmdStopScanner.Scan() {
+				if strings.Contains(cmdStopScanner.Text(), containerId) {
+					stopConfirmation <- true
+					return
+				}
+			}
+			stopConfirmation <- false
+		}()
+		err = stopCmd.Start()
+		if !<-stopConfirmation {
+			fmt.Println("WARNING: There was a problem stopping the container! (Container already stopped?)")
+		}
 		containerStopped = time.Now()
+		close(stopConfirmation)
+
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "cleanup failed: %v\n", err)
+			fmt.Printf("%v\n", err)
+			os.Exit(1)
 		}
 
+		gcCmd = exec.Command(rktBinary, "gc", "--grace-period=0")
+		gcCmd.Start()
+
 		for _, processHistory := range usages {
 			var avgCPU float64
 			var avgMem uint64
@@ -244,56 +300,35 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 				strconv.FormatFloat(loadAvg.Load1, 'g', 3, 64),
 				strconv.FormatFloat(loadAvg.Load5, 'g', 3, 64),
 				strconv.FormatFloat(loadAvg.Load15, 'g', 3, 64),
-				strconv.FormatInt(containerStarted.Sub(containerStarting).Nanoseconds(), 10),
-				strconv.FormatInt(containerStopped.Sub(containerStopping).Nanoseconds(), 10)})
+				strconv.FormatFloat(float64(containerStarted.Sub(containerStarting).Nanoseconds())/float64(time.Millisecond), 'g', -1, 64),
+				strconv.FormatFloat(float64(containerStopped.Sub(containerStopping).Nanoseconds())/float64(time.Millisecond), 'g', -1, 64)})
 		}
 
 		fmt.Printf("load average: Load1: %f Load5: %f Load15: %f\n", loadAvg.Load1, loadAvg.Load5, loadAvg.Load15)
-		fmt.Printf("container start time: %dns\n", containerStarted.Sub(containerStarting).Nanoseconds())
-		fmt.Printf("container stop time: %dns\n", containerStopped.Sub(containerStopping).Nanoseconds())
+		fmt.Printf("container start time: %sms\n", strconv.FormatFloat(float64(containerStarted.Sub(containerStarting).Nanoseconds())/float64(time.Millisecond), 'g', -1, 64))
+		fmt.Printf("container stop time: %sms\n", strconv.FormatFloat(float64(containerStopped.Sub(containerStopping).Nanoseconds())/float64(time.Millisecond), 'g', -1, 64))
 	}
 
 	t := time.Now()
-	prefix := fmt.Sprintf("%d-%02d-%02d_%02d-%02d_%s_", t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), flavorType)
+	_, testImage = filepath.Split(args[0])
+	prefix := fmt.Sprintf("%d-%02d-%02d_%02d-%02d_%s_%s", t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), flavorType, testImage)
 	if flagSaveToCsv {
-		err = saveRecords(records, flagCsvDir, prefix+"rkt_benchmark_interval.csv")
+		err = saveRecords(records, flagCsvDir, prefix+"_rkt_benchmark_interval.csv")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Can't write to a file: %v\n", err)
 		}
-		err = saveRecords(summaryRecords, flagCsvDir, prefix+"rkt_benchmark_summary.csv")
+		err = saveRecords(summaryRecords, flagCsvDir, prefix+"_rkt_benchmark_summary.csv")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Can't write to a summary file: %v\n", err)
 		}
 	}
 }
 
-func killAllChildren(pid int32) error {
-	p, err := process.NewProcess(pid)
-	if err != nil {
-		return err
-	}
-	processes := []*process.Process{p}
-	for i := 0; i < len(processes); i++ {
-		children, err := processes[i].Children()
-		if err != nil && err != process.ErrorNoChildren {
-			return err
-		}
-		processes = append(processes, children...)
-	}
-	for _, p := range processes {
-		osProcess, err := os.FindProcess(int(p.Pid))
-		if err != nil {
-			if err.Error() == "os: process already finished" {
-				continue
-			}
-			return err
-		}
-		err = osProcess.Kill()
-		if err != nil {
-			return err
-		}
+func fileExist(filename string) bool {
+	if _, err := os.Stat(filename); err == nil {
+		return true
 	}
-	return nil
+	return false
 }
 
 func getUsage(pid int32) ([]*ProcessStatus, error) {
@@ -379,7 +414,7 @@ func printUsage(statuses []*ProcessStatus) {
 
 func addRecords(statuses []*ProcessStatus, records [][]string) [][]string {
 	for _, s := range statuses {
-		records = append(records, []string{time.Now().String(), s.Name, strconv.Itoa(int(s.Pid)), formatSize(s.RSS), strconv.FormatFloat(s.CPU, 'g', 1, 64)})
+		records = append(records, []string{time.Now().String(), s.Name, strconv.Itoa(int(s.Pid)), formatSize(s.RSS), strconv.FormatFloat(s.CPU, 'g', -1, 64)})
 	}
 	return records
 }
diff --git a/tests/rkt-monitor/mem-stresser/main.go b/tests/rkt-monitor/mem-stresser/main.go
index 32d3c06787..66bd1d07c8 100644
--- a/tests/rkt-monitor/mem-stresser/main.go
+++ b/tests/rkt-monitor/mem-stresser/main.go
@@ -15,10 +15,12 @@
 package main
 
 import (
+	"fmt"
 	"time"
 )
 
 func main() {
+	fmt.Print("APP-STARTED!\n")
 	var counter uint64
 	var numbers []uint64
 	for {
diff --git a/tests/rkt-monitor/sleeper/main.go b/tests/rkt-monitor/sleeper/main.go
index 4778638060..cf33651356 100644
--- a/tests/rkt-monitor/sleeper/main.go
+++ b/tests/rkt-monitor/sleeper/main.go
@@ -15,10 +15,12 @@
 package main
 
 import (
+	"fmt"
 	"time"
 )
 
 func main() {
+	fmt.Print("APP-STARTED!\n")
 	for {
 		time.Sleep(time.Hour)
 	}

From 427f47a3ddde4c3c8d167ba3133215540354cf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Thu, 1 Sep 2016 15:44:51 +0200
Subject: [PATCH 0719/1304] kvm/pod: disable insecure-options=paths for kvm
 flavor

---
 stage1/init/common/pod.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 0a51c37d62..04029c4c0c 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -564,8 +564,9 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		}
 	}
 
-	// Restrict access to sensitive paths (eg. procfs) and devices
-	if !insecureOptions.DisablePaths {
+	// Restrict access to sensitive paths (eg. procfs) and devices. For kvm flavor,
+	// these paths are stored inside the vm, without influence to the host.
+	if !insecureOptions.DisablePaths && flavor != "kvm" {
 		opts = protectSystemFiles(opts, appName)
 		opts = append(opts, unit.NewUnitOption("Service", "DevicePolicy", "closed"))
 		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(absRoot), appName, app.MountPoints, mounts, vols, uidRange)

From 3cd069b3ddf6bf9ab124d93cf80e1c5e256e8ec9 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 6 Sep 2016 14:23:41 -0400
Subject: [PATCH 0720/1304] tests: volumes: add missing test

---
 tests/rkt_volume_mount_fly_test.go     | 1 +
 tests/rkt_volume_mount_generic_test.go | 1 +
 tests/rkt_volume_mount_test.go         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/rkt_volume_mount_fly_test.go b/tests/rkt_volume_mount_fly_test.go
index aa9282903c..c3814fae59 100644
--- a/tests/rkt_volume_mount_fly_test.go
+++ b/tests/rkt_volume_mount_fly_test.go
@@ -27,6 +27,7 @@ func TestVolumeMount(t *testing.T) {
 		volumeMountTestCasesNonRecursiveCLI,
 		volumeMountTestCasesRecursivePodManifest,
 		volumeMountTestCasesNonRecursivePodManifest,
+		volumeMountTestCasesNonRecursive,
 		{
 			{
 				"CLI: duplicate mount given",
diff --git a/tests/rkt_volume_mount_generic_test.go b/tests/rkt_volume_mount_generic_test.go
index 6cd630baaf..cdf5bbdb2e 100644
--- a/tests/rkt_volume_mount_generic_test.go
+++ b/tests/rkt_volume_mount_generic_test.go
@@ -27,6 +27,7 @@ func TestVolumeMount(t *testing.T) {
 		volumeMountTestCasesNonRecursiveCLI,
 		volumeMountTestCasesRecursivePodManifest,
 		volumeMountTestCasesNonRecursivePodManifest,
+		volumeMountTestCasesNonRecursive,
 		{
 			{
 				"CLI: duplicate mount given",
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
index 09667adc0d..a90902759a 100644
--- a/tests/rkt_volume_mount_test.go
+++ b/tests/rkt_volume_mount_test.go
@@ -33,7 +33,7 @@ import (
 var (
 	boolTrue                             = true
 	boolFalse                            = false
-	tmpdir                               = createTempDirOrPanic("rkt-tests-fly")
+	tmpdir                               = createTempDirOrPanic("rkt-tests-volume-mount")
 	tmpdirmountname         types.ACName = "dir1"
 	tmpdirpathpod                        = "/dir1"
 	tmpdir2path                          = path.Join(tmpdir, "dir2")

From 5b6e53570edddd36ebc803ea374d373073b59a35 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 6 Sep 2016 14:51:31 -0400
Subject: [PATCH 0721/1304] tests: volumes: rename variables

---
 tests/rkt_volume_mount_fly_test.go     |   6 +-
 tests/rkt_volume_mount_generic_test.go |   8 +-
 tests/rkt_volume_mount_test.go         | 107 +++++++++++++------------
 3 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/tests/rkt_volume_mount_fly_test.go b/tests/rkt_volume_mount_fly_test.go
index c3814fae59..5d28187839 100644
--- a/tests/rkt_volume_mount_fly_test.go
+++ b/tests/rkt_volume_mount_fly_test.go
@@ -34,13 +34,13 @@ func TestVolumeMount(t *testing.T) {
 				[]imagePatch{
 					{
 						"rkt-test-run-read-file.aci",
-						[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", tmpdir2filepathpod)},
+						[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", mountFilePath)},
 					},
 				},
 				fmt.Sprintf(
 					"--volume=test1,kind=host,source=%s --mount volume=test1,target=%s --volume=test2,kind=host,source=%s --mount volume=test1,target=%s",
-					tmpdir, tmpdirpathpod,
-					tmpdir, tmpdirpathpod,
+					volDir, mountDir,
+					volDir, mountDir,
 				),
 				nil,
 				1, /* TODO: decide on consistency with other stage1s */
diff --git a/tests/rkt_volume_mount_generic_test.go b/tests/rkt_volume_mount_generic_test.go
index cdf5bbdb2e..30682a3c21 100644
--- a/tests/rkt_volume_mount_generic_test.go
+++ b/tests/rkt_volume_mount_generic_test.go
@@ -34,17 +34,17 @@ func TestVolumeMount(t *testing.T) {
 				[]imagePatch{
 					{
 						"rkt-test-run-read-file.aci",
-						[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", tmpdir2filepathpod)},
+						[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", mountFilePath)},
 					},
 				},
 				fmt.Sprintf(
 					"--volume=test1,kind=host,source=%s --mount volume=test1,target=%s --volume=test2,kind=host,source=%s --mount volume=test1,target=%s",
-					tmpdir, tmpdirpathpod,
-					tmpdir, tmpdirpathpod,
+					volDir, mountDir,
+					volDir, mountDir,
 				),
 				nil,
 				0,
-				tmpdir2innerfilecontent,
+				innerFileContent,
 			},
 		}}).Execute(t)
 }
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
index a90902759a..42d1f8eda2 100644
--- a/tests/rkt_volume_mount_test.go
+++ b/tests/rkt_volume_mount_test.go
@@ -31,61 +31,64 @@ import (
 // TODO: unite these tests with rkt_run_pod_manifest_test.go
 
 var (
-	boolTrue                             = true
-	boolFalse                            = false
-	tmpdir                               = createTempDirOrPanic("rkt-tests-volume-mount")
-	tmpdirmountname         types.ACName = "dir1"
-	tmpdirpathpod                        = "/dir1"
-	tmpdir2path                          = path.Join(tmpdir, "dir2")
-	tmpdir2filepath                      = path.Join(tmpdir2path, "file")
-	tmpdir2filepathpod                   = "/dir1/dir2/file"
-	tmpdir2innerfilecontent              = "inner"
-	tmpdir2outerfilecontent              = "outer"
+	boolTrue  = true
+	boolFalse = false
+
+	mountName     types.ACName = "mnt"
+	mountDir                   = "/mnt"
+	mountFilePath              = "/mnt/subDirRW/file"
+
+	volDir      = createTempDirOrPanic("rkt-tests-volume-data")
+	volSubDirRW = path.Join(volDir, "subDirRW")
+	volFilePath = path.Join(volSubDirRW, "file")
+
+	innerFileContent = "inner"
+	outerFileContent = "outer"
 )
 
 func prepareTmpDirWithRecursiveMountsAndFiles(t *testing.T) []func() {
 	cleanupFuncs := make([]func(), 0)
 
-	// create directory for /dir1
-	if err := os.MkdirAll(tmpdir2path, 0); err != nil {
-		t.Fatalf("Can't recreate inner temp directory %q: %v", tmpdir2path, err)
+	// create directories on the host
+	if err := os.MkdirAll(volSubDirRW, 0); err != nil {
+		t.Fatalf("Can't create directory %q: %v", volSubDirRW, err)
 	}
-	cleanupFuncs = append(cleanupFuncs, func() { os.RemoveAll(tmpdir) })
+	cleanupFuncs = append(cleanupFuncs, func() { os.RemoveAll(volDir) })
 
-	// create the file in dir2 before the mount
-	tmpdir2outerfile, err := os.Create(tmpdir2filepath)
+	// create the file in subDirRW before the mount
+	tmpdir2outerfile, err := os.Create(volFilePath)
 	if err != nil {
 		executeFuncsReverse(cleanupFuncs)
-		t.Fatalf("Can't create outer file %q: %v", tmpdir2path, err)
+		t.Fatalf("Can't create outer file %q: %v", volSubDirRW, err)
 	}
 	cleanupFuncs = append(cleanupFuncs, func() { tmpdir2outerfile.Close() })
 
-	if _, err := tmpdir2outerfile.WriteString(tmpdir2outerfilecontent); err != nil {
+	if _, err := tmpdir2outerfile.WriteString(outerFileContent); err != nil {
 		executeFuncsReverse(cleanupFuncs)
 		t.Fatalf("Can't write to file %q after mounting: %v", tmpdir2outerfile, err)
 	}
 
-	// mount tmpfs for /dir1/dir2
-	if err := syscall.Mount("", tmpdir2path, "tmpfs", 0, ""); err != nil {
+	// mount tmpfs for /dir1/subDirRW
+	if err := syscall.Mount("", volSubDirRW, "tmpfs", 0, ""); err != nil {
 		executeFuncsReverse(cleanupFuncs)
-		t.Fatalf("Can't mount tmpfs on inner temp directory %q: %v", tmpdir2path, err)
+		t.Fatalf("Can't mount tmpfs on inner temp directory %q: %v", volSubDirRW, err)
 	}
 	cleanupFuncs = append(cleanupFuncs, func() {
-		if err := syscall.Unmount(tmpdir2path, syscall.MNT_DETACH); err != nil {
-			t.Errorf("could not unmount %q: %v", tmpdir2path, err)
+		if err := syscall.Unmount(volSubDirRW, syscall.MNT_DETACH); err != nil {
+			t.Errorf("could not unmount %q: %v", volSubDirRW, err)
 		}
 	})
-	cleanupFuncs = append(cleanupFuncs, func() { os.RemoveAll(tmpdir) })
+	cleanupFuncs = append(cleanupFuncs, func() { os.RemoveAll(volDir) })
 
-	// create the file in dir2 after the mount
-	tmpdir2innerfile, err := os.Create(tmpdir2filepath)
+	// create the file in subDirRW after the mount
+	tmpdir2innerfile, err := os.Create(volFilePath)
 	if err != nil {
 		executeFuncsReverse(cleanupFuncs)
-		t.Fatalf("Can't create inner file %q: %v", tmpdir2path, err)
+		t.Fatalf("Can't create inner file %q: %v", volSubDirRW, err)
 	}
 	cleanupFuncs = append(cleanupFuncs, func() { tmpdir2innerfile.Close() })
 
-	if _, err := tmpdir2innerfile.WriteString(tmpdir2innerfilecontent); err != nil {
+	if _, err := tmpdir2innerfile.WriteString(innerFileContent); err != nil {
 		executeFuncsReverse(cleanupFuncs)
 		t.Fatalf("Can't write to file %q after mounting: %v", tmpdir2innerfile, err)
 	}
@@ -110,28 +113,28 @@ var (
 			[]imagePatch{
 				{
 					"rkt-test-run-read-file.aci",
-					[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", tmpdir2filepathpod)},
+					[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", mountFilePath)},
 				},
 			},
 			fmt.Sprintf(
 				"--volume=test1,kind=host,source=%s,recursive=true --mount volume=test1,target=%s",
-				tmpdir, tmpdirpathpod,
+				volDir, mountDir,
 			),
 			nil,
 			0,
-			tmpdir2innerfilecontent,
+			innerFileContent,
 		},
 		{
 			"CLI: recursive read-only mount write file must fail",
 			[]imagePatch{
 				{
 					"rkt-test-run-write-file.aci",
-					[]string{fmt.Sprintf("--exec=/inspect --write-file --file-name %s", tmpdir2filepathpod)},
+					[]string{fmt.Sprintf("--exec=/inspect --write-file --file-name %s", mountFilePath)},
 				},
 			},
 			fmt.Sprintf(
 				"--volume=test1,kind=host,source=%s,recursive=true,readOnly=true --mount volume=test1,target=%s",
-				tmpdir, tmpdirpathpod,
+				volDir, mountDir,
 			),
 			nil,
 			1,
@@ -145,16 +148,16 @@ var (
 			[]imagePatch{
 				{
 					"rkt-test-run-read-file.aci",
-					[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", tmpdir2filepathpod)},
+					[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", mountFilePath)},
 				},
 			},
 			fmt.Sprintf(
 				"--volume=test,kind=host,source=%s,recursive=false --mount volume=test,target=%s",
-				tmpdir, tmpdirpathpod,
+				volDir, mountDir,
 			),
 			nil,
 			0,
-			tmpdir2outerfilecontent,
+			outerFileContent,
 		},
 	}
 
@@ -174,22 +177,22 @@ var (
 							User:  "0",
 							Group: "0",
 							Environment: []types.EnvironmentVariable{
-								{"FILE", tmpdir2filepathpod},
+								{"FILE", mountFilePath},
 							},
 							MountPoints: []types.MountPoint{
-								{tmpdirmountname, tmpdirpathpod, false},
+								{mountName, mountDir, false},
 							},
 						},
 					},
 				},
 				Volumes: []types.Volume{
-					{Name: tmpdirmountname, Kind: "host", Source: tmpdir,
+					{Name: mountName, Kind: "host", Source: volDir,
 						ReadOnly: nil, Recursive: &boolTrue,
 						Mode: nil, UID: nil, GID: nil},
 				},
 			},
 			0,
-			tmpdir2innerfilecontent,
+			innerFileContent,
 		},
 		{
 			"Write of nested file for recursive/read-only mount must fail",
@@ -206,17 +209,17 @@ var (
 							User:  "0",
 							Group: "0",
 							Environment: []types.EnvironmentVariable{
-								{"FILE", tmpdir2filepathpod},
+								{"FILE", mountFilePath},
 								{"CONTENT", "should-not-see-me"},
 							},
 							MountPoints: []types.MountPoint{
-								{tmpdirmountname, tmpdirpathpod, false},
+								{mountName, mountDir, false},
 							},
 						},
 					},
 				},
 				Volumes: []types.Volume{
-					{Name: tmpdirmountname, Kind: "host", Source: tmpdir,
+					{Name: mountName, Kind: "host", Source: volDir,
 						ReadOnly: &boolTrue, Recursive: &boolTrue,
 						Mode: nil, UID: nil, GID: nil},
 				},
@@ -242,18 +245,18 @@ var (
 							User:  "0",
 							Group: "0",
 							Environment: []types.EnvironmentVariable{
-								{"FILE", path.Join(tmpdirpathpod, "file")},
+								{"FILE", path.Join(mountDir, "file")},
 								{"CONTENT", "host:foo"},
 							},
 							MountPoints: []types.MountPoint{
-								{tmpdirmountname, tmpdirpathpod, false},
+								{mountName, mountDir, false},
 							},
 						},
 						ReadOnlyRootFS: true,
 					},
 				},
 				Volumes: []types.Volume{
-					{Name: tmpdirmountname, Kind: "host", Source: tmpdir,
+					{Name: mountName, Kind: "host", Source: volDir,
 						ReadOnly: nil, Recursive: &boolFalse,
 						Mode: nil, UID: nil, GID: nil},
 				},
@@ -279,22 +282,22 @@ var (
 							User:  "0",
 							Group: "0",
 							Environment: []types.EnvironmentVariable{
-								{"FILE", tmpdir2filepathpod},
+								{"FILE", mountFilePath},
 							},
 							MountPoints: []types.MountPoint{
-								{"dir1", tmpdirpathpod, false},
+								{mountName, mountDir, false},
 							},
 						},
 					},
 				},
 				Volumes: []types.Volume{
-					{Name: tmpdirmountname, Kind: "host", Source: tmpdir,
+					{Name: mountName, Kind: "host", Source: volDir,
 						ReadOnly: nil, Recursive: &boolFalse,
 						Mode: nil, UID: nil, GID: nil},
 				},
 			},
 			0,
-			tmpdir2outerfilecontent,
+			outerFileContent,
 		},
 	}
 )
@@ -355,7 +358,7 @@ func NewTestVolumeMount(volumeMountTestCases [][]volumeMountTestCase) testutils.
 					}
 				}
 				waitOrFail(t, child, tt.expectedExit)
-				verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
+				verifyHostFile(t, volDir, "file", i, tt.expectedResult)
 
 				// 2. Test 'rkt prepare' + 'rkt run-prepared'.
 				prepareCmd := fmt.Sprintf("%s prepare", ctx.Cmd())
@@ -378,7 +381,7 @@ func NewTestVolumeMount(volumeMountTestCases [][]volumeMountTestCase) testutils.
 				}
 
 				waitOrFail(t, child, tt.expectedExit)
-				verifyHostFile(t, tmpdir, "file", i, tt.expectedResult)
+				verifyHostFile(t, volDir, "file", i, tt.expectedResult)
 
 				// we run the garbage collector and remove the imported images to save
 				// space

From 9a68707c3dbd770e4c07026e4b16637db088d97f Mon Sep 17 00:00:00 2001
From: Aaron Wood <aaronjwood@gmail.com>
Date: Tue, 6 Sep 2016 15:12:02 -0400
Subject: [PATCH 0722/1304] Fix small typo

---
 Documentation/devel/architecture.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index 8823c23a2c..c7e046936a 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -104,7 +104,7 @@ These flavors will:
 
 This process is slightly different for the qemu-kvm stage1 but a similar workflow starting at `exec()`'ing kvm instead of an nspawn.
 
-We will now detail how the starting, shutdown, and exist status collection of the apps in a pod are implemented internally.
+We will now detail how the starting, shutdown, and exit status collection of the apps in a pod are implemented internally.
 
 ![rkt-systemd](rkt-systemd.png)
 

From 55f980c4a7a8c2b442d9df6c1fc7c872edb6052a Mon Sep 17 00:00:00 2001
From: Patrick Baxter <pb@coreos.com>
Date: Fri, 9 Sep 2016 19:39:03 +0000
Subject: [PATCH 0723/1304] Documentation: update rktnetes docs

---
 Documentation/using-rkt-with-kubernetes.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Documentation/using-rkt-with-kubernetes.md b/Documentation/using-rkt-with-kubernetes.md
index 904e9ea446..0f8521b797 100644
--- a/Documentation/using-rkt-with-kubernetes.md
+++ b/Documentation/using-rkt-with-kubernetes.md
@@ -18,6 +18,13 @@ The kubelet provides several flags to use rkt as the container runtime:
 
 Check the [rktnetes getting started guide](http://kubernetes.io/docs/getting-started-guides/rkt/) for information about setting up and using a rktnetes cluster.
 
+## Configuring rkt using supported setup tools
+The [coreos-kubernetes](https://github.com/coreos/coreos-kubernetes) and [coreos-baremetal](https://github.com/coreos/coreos-baremetal) repos both support configuring rkt as the Kubernetes runtime out of the box. 
+
+Check out the coreos-kubernetes repo if you want to spin up a cluster on [AWS](https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html) or [locally with vagrant](https://coreos.com/kubernetes/docs/latest/kubernetes-on-vagrant-single.html). The common configuration option here is setting `CONTAINER_RUNTMIE` environment variable to rkt. 
+
+For baremetal, check out the Kubernetes guides [here](https://github.com/coreos/coreos-baremetal/blob/master/Documentation/kubernetes.md)
+
 ### Current Status
 
 Integration of rkt as a container runtime was officially [announced in the Kubernetes 1.3 release](http://blog.kubernetes.io/2016/07/rktnetes-brings-rkt-container-engine-to-Kubernetes.html).

From 7b7616d19a4f0ef730ad7dbe1b606feb82c0f602 Mon Sep 17 00:00:00 2001
From: Ben Spoon <ben.spoon@coreos.com>
Date: Fri, 9 Sep 2016 15:42:41 -0700
Subject: [PATCH 0724/1304] docs: fix small typo

---
 Documentation/using-rkt-with-kubernetes.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/using-rkt-with-kubernetes.md b/Documentation/using-rkt-with-kubernetes.md
index 0f8521b797..ea54d029f7 100644
--- a/Documentation/using-rkt-with-kubernetes.md
+++ b/Documentation/using-rkt-with-kubernetes.md
@@ -19,9 +19,9 @@ The kubelet provides several flags to use rkt as the container runtime:
 Check the [rktnetes getting started guide](http://kubernetes.io/docs/getting-started-guides/rkt/) for information about setting up and using a rktnetes cluster.
 
 ## Configuring rkt using supported setup tools
-The [coreos-kubernetes](https://github.com/coreos/coreos-kubernetes) and [coreos-baremetal](https://github.com/coreos/coreos-baremetal) repos both support configuring rkt as the Kubernetes runtime out of the box. 
+The [coreos-kubernetes](https://github.com/coreos/coreos-kubernetes) and [coreos-baremetal](https://github.com/coreos/coreos-baremetal) repos both support configuring rkt as the Kubernetes runtime out of the box.
 
-Check out the coreos-kubernetes repo if you want to spin up a cluster on [AWS](https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html) or [locally with vagrant](https://coreos.com/kubernetes/docs/latest/kubernetes-on-vagrant-single.html). The common configuration option here is setting `CONTAINER_RUNTMIE` environment variable to rkt. 
+Check out the coreos-kubernetes repo if you want to spin up a cluster on [AWS](https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html) or [locally with vagrant](https://coreos.com/kubernetes/docs/latest/kubernetes-on-vagrant-single.html). The common configuration option here is setting `CONTAINER_RUNTIME` environment variable to rkt.
 
 For baremetal, check out the Kubernetes guides [here](https://github.com/coreos/coreos-baremetal/blob/master/Documentation/kubernetes.md)
 

From 67d7fd922961fe9a9c24743624f94fc0d06b0ca2 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Mon, 12 Sep 2016 16:08:32 +0200
Subject: [PATCH 0725/1304] Documentation/using-rkt-with-kubernetes: add
 minikube

---
 Documentation/using-rkt-with-kubernetes.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/using-rkt-with-kubernetes.md b/Documentation/using-rkt-with-kubernetes.md
index ea54d029f7..1d57345813 100644
--- a/Documentation/using-rkt-with-kubernetes.md
+++ b/Documentation/using-rkt-with-kubernetes.md
@@ -25,6 +25,10 @@ Check out the coreos-kubernetes repo if you want to spin up a cluster on [AWS](h
 
 For baremetal, check out the Kubernetes guides [here](https://github.com/coreos/coreos-baremetal/blob/master/Documentation/kubernetes.md)
 
+## Using [Minikube](https://github.com/kubernetes/minikube)
+
+Minikube is a tool that makes it easy to run Kubernetes locally. It launches a single-node cluster inside a VM aimed at users looking to try out Kubernetes. Follow the instructions in the Minikube [Quickstart](https://github.com/kubernetes/minikube/blob/master/README.md#quickstart) section on how to get started with rktnetes.
+
 ### Current Status
 
 Integration of rkt as a container runtime was officially [announced in the Kubernetes 1.3 release](http://blog.kubernetes.io/2016/07/rktnetes-brings-rkt-container-engine-to-Kubernetes.html).

From 1368a92c8e768b35d4eadc279adb883a14d21efc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Wed, 3 Aug 2016 14:36:24 +0200
Subject: [PATCH 0726/1304] configure: rename functions for reuse

---
 configure.ac | 60 ++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/configure.ac b/configure.ac
index 06618f6fa5..f19f749907 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,15 +255,6 @@ AS_CASE([${RKT_STAGE1_DEFAULT_IMAGES_DIR}],
 dnl a list of all flavors
 RKT_STAGE1_ALL_FLAVORS=coreos,kvm,host,src,fly
 
-dnl RKT_ITERATE_FLAVORS iterates all comma-separated flavors stored in
-dnl $1 using an iterator variable $2 and executes body $3.
-AC_DEFUN([RKT_ITERATE_FLAVORS],
-         [for $2 in `AS_ECHO(["$1"]) | tr ',' ' '`
-          do
-              :
-              $3
-          done])
-
 dnl RKT_IS_VALID_FLAVOR checks if $1 is a valid flavor, $2 is an
 dnl additional string to an error message.
 AC_DEFUN([RKT_IS_VALID_FLAVOR],
@@ -274,16 +265,25 @@ AC_DEFUN([RKT_IS_VALID_FLAVOR],
                   dnl Bogus flavor, bail out.
                   [AC_MSG_ERROR([*** Unknown stage1 flavor "$1" $2])])])
 
-dnl RKT_IF_HAS_FLAVOR checks if the comma-separated list of flavors in
-dnl $1 contains any flavor in the comma-separated list of flavors in
+dnl RKT_ITERATE iterates all comma-separated values stored in
+dnl $1 using an iterator variable $2 and executes body $3.
+AC_DEFUN([RKT_ITERATE],
+         [for $2 in `AS_ECHO(["$1"]) | tr ',' ' '`
+          do
+              :
+              $3
+          done])
+
+dnl RKT_IF_HAS_VALUE checks if the comma-separated list of values in
+dnl $1 contains any value in the comma-separated list of values in
 dnl $2; if yes, executes $3, otherwise - $4.
-AC_DEFUN([RKT_IF_HAS_FLAVOR],
-         [flavor_found=0
-          RKT_ITERATE_FLAVORS([$2],[flavor],
-                              [AS_IF([AS_ECHO([",$1,"]) | grep --silent ",${flavor},"],
-                                     [flavor_found=1
+AC_DEFUN([RKT_IF_HAS_VALUE],
+         [value_found=0
+          RKT_ITERATE([$2],[value],
+                              [AS_IF([AS_ECHO([",$1,"]) | grep --silent ",${value},"],
+                                     [value_found=1
                                       break])])
-          AS_IF([test ${flavor_found} -eq 1],[:;$3],[:;$4])])
+          AS_IF([test ${value_found} -eq 1],[:;$3],[:;$4])])
 
 dnl common deps for flavors using CoreOS PXE image; not checking for
 dnl gpg - it will be checked when we will actually download the image
@@ -304,9 +304,9 @@ dnl Validate passed flavors to build - make sure that valid flavors
 dnl were passed and each flavor was specified only once. Also, do some
 dnl basic program checks for each requested flavor.
 RKT_SPECIFIED_FLAVORS=''
-RKT_ITERATE_FLAVORS([${RKT_STAGE1_FLAVORS}],[flavor],
+RKT_ITERATE([${RKT_STAGE1_FLAVORS}],[flavor],
                     [RKT_IS_VALID_FLAVOR([${flavor}],[in --with-stage1-flavors])
-                     RKT_IF_HAS_FLAVOR([${RKT_SPECIFIED_FLAVORS}],[${flavor}],
+                     RKT_IF_HAS_VALUE([${RKT_SPECIFIED_FLAVORS}],[${flavor}],
                                        [AC_MSG_ERROR([*** "${flavor}" flavor specified twice in --with-stage1-flavors])])
                      RKT_SPECIFIED_FLAVORS="${RKT_SPECIFIED_FLAVORS},${flavor}"
                      AS_CASE([${flavor}],
@@ -379,7 +379,7 @@ dnl stage1 flavors
 
 AS_VAR_IF([RKT_STAGE1_SETUP_KIND],['flavor'],
           [RKT_IS_VALID_FLAVOR([${RKT_STAGE1_DEFAULT_FLAVOR}],[in --with-stage1-default-flavor])
-           RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}],[${RKT_STAGE1_DEFAULT_FLAVOR}],
+           RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}],[${RKT_STAGE1_DEFAULT_FLAVOR}],
                              dnl valid default flavor, alright
                              [],
                              dnl not a part of built flavors, bail out
@@ -388,7 +388,7 @@ AS_VAR_IF([RKT_STAGE1_SETUP_KIND],['flavor'],
 ## Options specific for src flavor
 
 # Process systemd src repo and version for src flavor.
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}],[src],
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}],[src],
                   dnl we are building src flavor
                   [AS_VAR_IF([RKT_STAGE1_SYSTEMD_SRC], [auto],
                              dnl systemd source not specified, use default
@@ -418,7 +418,7 @@ AS_VAR_IF([RKT_STAGE1_SYSTEMD_VER], [HEAD],
            RKT_STAGE1_SYSTEMD_VER='master'])
 
 KVM_HV_TAG='hv_none'
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [kvm],
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [kvm],
                   dnl for kvm check hypervisor
                   AS_CASE([${RKT_STAGE1_KVM_HV}],
                           [lkvm],
@@ -429,7 +429,7 @@ RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [kvm],
 
 # Process local CoreOS PXE image path and its systemd version for
 # coreos/kvm flavors.
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}],[coreos,kvm],
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}],[coreos,kvm],
                   dnl for kvm and coreos check if both pxe image path and
                   dnl systemd version are specified or neither
                   [AS_VAR_IF([RKT_LOCAL_COREOS_PXE_IMAGE_PATH], [],
@@ -575,12 +575,12 @@ AS_CASE([${RKT_ACI_ARCH}],
         dnl supported arches
         [aarch64 | amd64], [],
         dnl unsupported arches
-        [RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos,kvm,src],
+        [RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [coreos,kvm,src],
                            [AC_MSG_ERROR([*** ${RKT_ACI_ARCH}: no arch support for stage1 flavors {coreos,kvm,src}])],
                            [AC_MSG_WARN([* ${RKT_ACI_ARCH}: unsupported arch])])])
 
 # Set the path to the interpreter binary for coreos flavor.
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos],
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [coreos],
                   [AS_CASE([${RKT_ACI_ARCH}],
                            [aarch64],
                                     [RKT_STAGE1_INTERPRETER="/usr/lib/ld-linux-aarch64.so.1"],
@@ -588,7 +588,7 @@ RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos],
                                     [RKT_STAGE1_INTERPRETER="/usr/lib/ld-linux-x86-64.so.2"])])
 
 # Set the path to the interpreter binary for src flavor.
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [src],
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [src],
                   [AS_CASE([${RKT_ACI_ARCH}],
                            [aarch64],
                                     [RKT_STAGE1_INTERPRETER="/lib64/ld-linux-aarch64.so.1"],
@@ -810,7 +810,7 @@ AS_CASE([${RKT_STAGE1_SETUP_KIND}],
         default stage1 version:                 '${RKT_STAGE1_DEFAULT_VERSION}'])],
         [AC_MSG_ERROR([*** Unknown setup kind, should not happen])])
 
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos,kvm],
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [coreos,kvm],
                   [AC_MSG_RESULT([
         coreos/kvm flavor specific build parameters
 
@@ -818,20 +818,20 @@ RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos,kvm],
         local CoreOS PXE image systemd version: '${RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER}'
         stage1 CoreOS board:                    '${RKT_STAGE1_COREOS_BOARD}'])])
 
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [src],
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [src],
                   [AC_MSG_RESULT([
         src flavor specific build parameters
 
         systemd git repo:                       '${RKT_STAGE1_SYSTEMD_SRC}'
         systemd version:                        '${RKT_STAGE1_SYSTEMD_VER}'])])
 
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [kvm],
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [kvm],
                   [AC_MSG_RESULT([
         kvm flavor specific build parameters
 
         hypervisor:                             '${RKT_STAGE1_KVM_HV}'])])
 
-RKT_IF_HAS_FLAVOR([${RKT_STAGE1_FLAVORS}], [coreos,src],
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [coreos,src],
                   [AC_MSG_RESULT([
         coreos flavor specific build parameters
 

From 7a27e4de20ee96e99fb625d4f319ba24c683c4b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Wed, 3 Aug 2016 15:53:11 +0200
Subject: [PATCH 0727/1304] configure: add multi value configure option for
 hypervisors

---
 Makefile.in  |  3 +++
 configure.ac | 55 ++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f42addde62..2668586b3e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,6 +33,9 @@ RKT_STAGE1_ALL_FLAVORS := @RKT_STAGE1_ALL_FLAVORS@
 RKT_STAGE1_FLAVORS := @RKT_STAGE1_FLAVORS@
 RKT_STAGE1_DEFAULT_FLAVOR := @RKT_STAGE1_DEFAULT_FLAVOR@
 
+RKT_STAGE1_KVM_HV := @RKT_STAGE1_KVM_HV@
+RKT_STAGE1_KVM_ALL_HV := @RKT_STAGE1_KVM_ALL_HV@
+
 RKT_STAGE1_DEFAULT_LOCATION := @RKT_STAGE1_DEFAULT_LOCATION@
 RKT_STAGE1_DEFAULT_IMAGES_DIR := @RKT_STAGE1_DEFAULT_IMAGES_DIR@
 RKT_STAGE1_DEFAULT_IMAGE_FILENAME_IN_RKT_DIRECTORY := @RKT_STAGE1_DEFAULT_IMAGE_FILENAME_IN_RKT_DIRECTORY@
diff --git a/configure.ac b/configure.ac
index f19f749907..d984267df0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,10 +115,11 @@ AC_ARG_WITH([stage1-systemd-version],
             [RKT_STAGE1_SYSTEMD_VER="${withval}"],
             [RKT_STAGE1_SYSTEMD_VER='auto'])
 
-# STAGE1 - KVM hypervisor. LKVM is the only choice for now
-AC_ARG_WITH([stage1-kvm-hypervisor],
-            [AS_HELP_STRING([--with-stage1-kvm-hypervisor],
-                            [hypervisor used by 'kvm' flavor; default and only option for now: 'lkvm'])],
+# STAGE1 - kvm hypervisor. lkvm or/and qemu can be chosen
+KVM_HV_TAG=hv_lkvm
+AC_ARG_WITH([stage1-kvm-hypervisors],
+            [AS_HELP_STRING([--with-stage1-kvm-hypervisors],
+                            [select hypervisors for kvm flavor; build stage1 aci for each of them. select "lkvm", "qemu" or both (default: 'lkvm')])],
             [RKT_STAGE1_KVM_HV="${withval}"],
             [RKT_STAGE1_KVM_HV='lkvm'])
 
@@ -250,11 +251,14 @@ AS_CASE([${RKT_STAGE1_DEFAULT_IMAGES_DIR}],
                 [:],
         [AC_MSG_ERROR([*** Path to the stage1 images directory must be absolute])])
 
-## Built stage1 flavors verification
+## Built stage1 flavors and hypervisors verification
 
 dnl a list of all flavors
 RKT_STAGE1_ALL_FLAVORS=coreos,kvm,host,src,fly
 
+dnl a list of all kvm hypervisors
+RKT_STAGE1_KVM_ALL_HV=lkvm,qemu
+
 dnl RKT_IS_VALID_FLAVOR checks if $1 is a valid flavor, $2 is an
 dnl additional string to an error message.
 AC_DEFUN([RKT_IS_VALID_FLAVOR],
@@ -265,6 +269,16 @@ AC_DEFUN([RKT_IS_VALID_FLAVOR],
                   dnl Bogus flavor, bail out.
                   [AC_MSG_ERROR([*** Unknown stage1 flavor "$1" $2])])])
 
+dnl RKT_IS_VALID_HYPERVISOR checks if $1 is a valid kvm hypervisor, $2 is an
+dnl additional string to an error message.
+AC_DEFUN([RKT_IS_VALID_HYPERVISOR],
+         [AS_CASE([$1],
+                  dnl Correct hypervisor, nothing to do.
+                  [lkvm|qemu],
+                          [],
+                  dnl Bogus hypervisor, bail out.
+                  [AC_MSG_ERROR([*** Unknown stage1 kvm hypervisor "$1" $2])])])
+
 dnl RKT_ITERATE iterates all comma-separated values stored in
 dnl $1 using an iterator variable $2 and executes body $3.
 AC_DEFUN([RKT_ITERATE],
@@ -315,7 +329,7 @@ RKT_ITERATE([${RKT_STAGE1_FLAVORS}],[flavor],
                              [coreos],
                                      [RKT_COMMON_COREOS_PROGS],
                              [kvm],
-                                     [AC_MSG_NOTICE([will build linux kernel and ${RKT_STAGE1_KVM_HV} from source, make sure that all their build requirements are fulfilled])
+                                     [AC_MSG_NOTICE([will build linux kernel and kvm hypervisors (${RKT_STAGE1_KVM_HV}) from source, make sure that all their build requirements are fulfilled])
                                       RKT_COMMON_COREOS_PROGS
                                       RKT_REQ_PROG([PATCH],[patch],[patch])
                                       RKT_REQ_PROG([TAR],[tar],[tar])
@@ -417,13 +431,21 @@ AS_VAR_IF([RKT_STAGE1_SYSTEMD_VER], [HEAD],
           [AC_MSG_WARN([* 'HEAD' is not a systemd version, setting it to 'master' instead])
            RKT_STAGE1_SYSTEMD_VER='master'])
 
-KVM_HV_TAG='hv_none'
-RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [kvm],
-                  dnl for kvm check hypervisor
-                  AS_CASE([${RKT_STAGE1_KVM_HV}],
-                          [lkvm],
-                                  KVM_HV_TAG='hv_lkvm',
-                          [AC_MSG_ERROR([*** Invalid value passed to --with-stage1-kvm-hypervisor; lkvm is the only supported tool right now])]))
+## Options specific for kvm flavor
+
+RKT_SPECIFIED_HYPERVISORS=''
+RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}],[kvm],
+          [RKT_ITERATE([${RKT_STAGE1_KVM_HV}],[hypervisor],
+                     [RKT_IS_VALID_HYPERVISOR([${hypervisor}],[in --with-stage1-kvm-hypervisors])
+                      RKT_IF_HAS_VALUE([${RKT_SPECIFIED_HYPERVISORS}],[${hypervisor}],
+                                [AC_MSG_ERROR([*** "${hypervisor}" hypervisor specified twice in --with-stage1-kvm-hypervisors])])
+                                RKT_SPECIFIED_HYPERVISORS="${RKT_SPECIFIED_HYPERVISORS},${hypervisor}"
+                                AS_CASE([${hypervisor}],
+                                          [lkvm],
+                                                    [AC_MSG_NOTICE([including lkvm...])],
+                                          [qemu],
+                                                    [AC_MSG_NOTICE([including qemu...])],
+                                          [AC_MSG_ERROR([*** Unhandled hypervisor "${hypervisor}". should not happen])])])])
 
 ## Options specific to coreos/kvm flavors
 
@@ -773,10 +795,13 @@ AC_SUBST(RKT_STAGE1_INTERPRETER_LDFLAGS)
 AC_SUBST(RKT_VERSION_LDFLAGS)
 AC_SUBST(RKT_FEATURES_LDFLAGS)
 
-AC_SUBST(KVM_HV_TAG)
+AC_SUBST(RKT_STAGE1_KVM_ALL_HV)
+AC_SUBST(RKT_STAGE1_KVM_HV)
 AC_SUBST(TPM_TAGS)
 AC_SUBST(SDJOURNAL_TAGS)
 
+AC_SUBST(KVM_HV_TAG)
+
 AC_SUBST(RKT_DEFINES_FOR_ENTER)
 
 #### FILE GENERATION AND REPORTING
@@ -829,7 +854,7 @@ RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [kvm],
                   [AC_MSG_RESULT([
         kvm flavor specific build parameters
 
-        hypervisor:                             '${RKT_STAGE1_KVM_HV}'])])
+        hypervisors:                            '${RKT_STAGE1_KVM_HV}'])])
 
 RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [coreos,src],
                   [AC_MSG_RESULT([

From 6b48e938e0ef8f5dbbf79779dfdf7cabdbba3673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Mon, 22 Aug 2016 15:19:34 +0200
Subject: [PATCH 0728/1304] makefile: add multi-image support

---
 stage1/stage1.mk                    | 70 ++++++++++++++++++++++++++---
 stage1/usr_from_kvm/lkvm.mk         |  2 +-
 stage1/usr_from_kvm/usr_from_kvm.mk |  8 +++-
 3 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/stage1/stage1.mk b/stage1/stage1.mk
index 7a12d94c69..d7d76cff3e 100644
--- a/stage1/stage1.mk
+++ b/stage1/stage1.mk
@@ -56,6 +56,11 @@
 #
 # STAGE1_STOP_CMD_$(flavor) - a stop command in stage1 to be used
 # for the "rkt stop" command.
+# 
+# STAGE1_IMAGES_$(flavor) - list of stage1 images we want to build for
+# each flavor. Need to be parsed here. If empty, single $(STAGE1_ACI_IMAGE_$f)
+# will be built. Variables $(STAGE1_ACI_IMAGE_$f-$(image)) will be used
+# only for aci build rules.
 
 STAGE1_FLAVORS := $(call commas-to-spaces,$(RKT_STAGE1_ALL_FLAVORS))
 STAGE1_BUILT_FLAVORS := $(call commas-to-spaces,$(RKT_STAGE1_FLAVORS))
@@ -63,6 +68,9 @@ STAGE1_BUILT_FLAVORS := $(call commas-to-spaces,$(RKT_STAGE1_FLAVORS))
 STAGE1_FLAVORS := $(filter-out fly,$(STAGE1_FLAVORS))
 STAGE1_BUILT_FLAVORS := $(filter-out fly,$(STAGE1_BUILT_FLAVORS))
 
+# hypervisors for kvm stage1
+STAGE1_BUILT_KVM_HV := $(call commas-to-spaces,$(RKT_STAGE1_KVM_HV))
+
 $(foreach f,$(STAGE1_FLAVORS), \
 	$(eval STAGE1_COPY_SO_DEPS_$f :=) \
 	$(eval STAGE1_USR_STAMPS_$f :=) \
@@ -84,6 +92,19 @@ $(call setup-stamp-file,_STAGE1_BUILT_ACI_STAMP_,built_aci)
 _STAGE1_ALL_ACI_ := $(foreach f,$(STAGE1_FLAVORS),$(STAGE1_ACI_IMAGE_$f))
 _STAGE1_BUILT_ACI_ := $(foreach f,$(STAGE1_BUILT_FLAVORS),$(STAGE1_ACI_IMAGE_$f))
 
+# Assign rules for selected kvm hypervisors, fill STAGE1_IMAGES_kvm variable 
+# needed by _STAGE1_BUILT_ACI_ variable and _STAGE1_ACI_RULE_ function
+$(foreach h,$(STAGE1_BUILT_KVM_HV), \
+	$(eval STAGE1_ACI_IMAGE_kvm-$h := $(TARGET_BINDIR)/stage1-kvm-$h.aci) \
+	$(eval STAGE1_IMAGES_kvm += $h))
+
+# Replace stage1-flavor.aci with stage1-flavor-image1.aci,stage1-flavor-image2.aci,...
+# for every flavor with more than one image
+$(foreach f,$(STAGE1_BUILT_FLAVORS), \
+	$(if $(STAGE1_IMAGES_$f), \
+		$(eval _STAGE1_BUILT_ACI_ := \
+		$(subst $(STAGE1_ACI_IMAGE_$f), $(foreach i,$(STAGE1_IMAGES_$f),$(STAGE1_ACI_IMAGE_$f-$i)), $(_STAGE1_BUILT_ACI_)))))
+
 # The rootfs.mk file takes care of preparing the initial /usr contents
 # of the ACI rootfs of a specific flavor. Basically fills
 # STAGE1_USR_STAMPS_$(flavor) variables. Might add something to the
@@ -107,9 +128,13 @@ $(call generate-stamp-rule,$(_STAGE1_BUILT_ACI_STAMP_),$(_STAGE1_BUILT_ACI_))
 # A rule template for building an ACI. To build the ACI we need to
 # have the /usr contents prepared and the additional stuff in place as
 # well. If a flavor wants to have missing libraries copied, it is done
-# here too.
-#
+# here too. If we want to build more than one image for single flavor 
+# (with differences in rootfs - i.e. hypervisor binary for kvm flavor), 
+# rootfs common part has to be stored in STAGE1_ACIROOTFSDIR_$1, and 
+# additional files in STAGE1_ACIROOTFSDIR_$1_$(image), for each $(image)
+# entry from $2.
 # 1 - flavor
+# 2 - images
 define _STAGE1_ACI_RULE_
 
 STAGE1_ALL_STAMPS_$1 := $$(STAGE1_USR_STAMPS_$1) $$(STAGE1_SECONDARY_STAMPS_$1)
@@ -122,6 +147,10 @@ ifeq ($$(STAGE1_COPY_SO_DEPS_$1),)
 
 $$(STAGE1_ACI_IMAGE_$1): $$(STAGE1_ALL_STAMPS_$1)
 
+# Same dependencies has to be fulfilled for every image in given flavor
+$(foreach i,$2, \
+$$(eval $$(STAGE1_ACI_IMAGE_$1-$i): $$(STAGE1_ALL_STAMPS_$1)))
+
 else
 
 # The flavor requires libraries from the host, so depend on the stamp
@@ -138,17 +167,46 @@ endif
 
 # The actual rule that builds the ACI. Additional dependencies are
 # above.
+
+# Forward variables to rules that build acis. If more than one image,
+# forward to every rule.
 $$(call forward-vars,$$(STAGE1_ACI_IMAGE_$1), \
 	ACTOOL STAGE1_ACIDIR_$1)
-$$(STAGE1_ACI_IMAGE_$1): $$(ACTOOL_STAMP) | $$(TARGET_BINDIR)
+$(foreach i,$2, \
+$$(call forward-vars,$$(STAGE1_ACI_IMAGE_$1-$i), \
+	ACTOOL STAGE1_ACIDIR_$1))
+
+# Prepare targets to build images. Also copy common rootfs to each image directory
+# and ensure that all of them will be removed
+$(if $(strip $2), \
+        $(eval IMG := $(foreach h,$2,$1-$h)) \
+        $(foreach s,$(IMG), \
+                $(call setup-stamp-file,STAGE1_COPY_IMAGE_FILES_$s,/copy-files-$s) \
+		$$(STAGE1_COPY_IMAGE_FILES_$s): $$(STAGE1_ALL_STAMPS_$1)
+			$(VQ) $(call vb,vt,COPY FILES,$$(call vsp,$s)) cp -rn $(STAGE1_ACIDIR_$1)/rootfs $(STAGE1_ACIDIR_$1)/manifest $(STAGE1_ACIDIR_$1)/$s \
+		$(eval CLEAN_DIRS += $(STAGE1_ACIDIR_$1)/$s)
+		$(call generate-clean-mk-simple, \
+		        $(STAGE1_ACI_IMAGE_$s), \
+		        $(STAGE1_ACIDIR_$1)/$s, \
+		        $(STAGE1_ACIDIR_$1)/$s, \
+		        $(STAGE1_COPY_IMAGE_FILES_$s), \
+		        copy-$s)), \
+        $(eval IMG := $1))
+
+# Build images. Common files are stored in STAGE1_ACIDIR_$1,
+# image specific files in STAGE1_ACIDIR_$1/flavor-image/...
+$(foreach s,$(IMG),
+$$(STAGE1_ACI_IMAGE_$s): $$(ACTOOL_STAMP) | $$(TARGET_BINDIR)
+	$(eval ACI_OUTPUT := "$(if $(filter 1,$(words $2)),$(STAGE1_ACI_IMAGE_$1),$(STAGE1_ACI_IMAGE_$s))")
 	$(VQ) \
-	$(call vb,vt,ACTOOL,$$(call vsp,$$@)) \
-	"$$(ACTOOL)" build --overwrite --owner-root "$$(STAGE1_ACIDIR_$1)" "$$@"
+	$(call vb,vt,ACTOOL,$$(call vsp,$(ACI_OUTPUT))) \
+	"$$(ACTOOL)" build --overwrite --owner-root "$$(STAGE1_ACIDIR_$1)$(if $(strip $2),/$s,)" $(ACI_OUTPUT)
+)
 
 endef
 
 $(foreach f,$(STAGE1_FLAVORS), \
-	$(eval $(call _STAGE1_ACI_RULE_,$f)))
+	$(eval $(call _STAGE1_ACI_RULE_,$f,$(STAGE1_IMAGES_$f))))
 
 
 # The following piece of wizardry takes the variables
diff --git a/stage1/usr_from_kvm/lkvm.mk b/stage1/usr_from_kvm/lkvm.mk
index 9e6997b1f4..472ad2914b 100644
--- a/stage1/usr_from_kvm/lkvm.mk
+++ b/stage1/usr_from_kvm/lkvm.mk
@@ -2,7 +2,7 @@ $(call setup-stamp-file,LKVM_STAMP)
 LKVM_TMPDIR := $(UFK_TMPDIR)/lkvm
 LKVM_SRCDIR := $(LKVM_TMPDIR)/src
 LKVM_BINARY := $(LKVM_SRCDIR)/lkvm-static
-LKVM_ACI_BINARY := $(S1_RF_ACIROOTFSDIR)/lkvm
+LKVM_ACI_BINARY := $(HV_ACIROOTFSDIR)/lkvm
 LKVM_GIT := https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool
 # just last published version (for reproducible builds), not for any other reason
 LKVM_VERSION := d62653e177597251c24494a6dda60acd6d846671
diff --git a/stage1/usr_from_kvm/usr_from_kvm.mk b/stage1/usr_from_kvm/usr_from_kvm.mk
index d74bb0bbb9..a2298fe6c1 100644
--- a/stage1/usr_from_kvm/usr_from_kvm.mk
+++ b/stage1/usr_from_kvm/usr_from_kvm.mk
@@ -3,8 +3,7 @@ $(call setup-tmp-dir,UFK_TMPDIR)
 
 UFK_INCLUDES := \
 	kernel.mk \
-	files.mk \
-	lkvm.mk
+	files.mk
 # This directory will be used by the build-usr.mk
 UFK_CBUDIR := $(UFK_TMPDIR)/cbu
 
@@ -24,4 +23,9 @@ CBU_FLAVOR := kvm
 
 $(call inc-one,../usr_from_coreos/build-usr.mk)
 
+$(foreach h,$(STAGE1_BUILT_KVM_HV), \
+	$(eval HV_ACIROOTFSDIR := $(S1_RF_ACIDIR)/kvm-$h/rootfs) \
+	$(eval INSTALL_DIRS += $(HV_ACIROOTFSDIR):-) \
+	$(call inc-one,$h.mk))
+
 $(call undefine-namespaces,UFK)

From 3a07f887fcca433057a926bf66d05960adfcd210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Mon, 22 Aug 2016 15:19:51 +0200
Subject: [PATCH 0729/1304] kvm: add qemu makefile

---
 stage1/usr_from_kvm/qemu.mk | 75 +++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 stage1/usr_from_kvm/qemu.mk

diff --git a/stage1/usr_from_kvm/qemu.mk b/stage1/usr_from_kvm/qemu.mk
new file mode 100644
index 0000000000..07dd876ef0
--- /dev/null
+++ b/stage1/usr_from_kvm/qemu.mk
@@ -0,0 +1,75 @@
+$(call setup-stamp-file,QEMU_STAMP)
+QEMU_TMPDIR := $(UFK_TMPDIR)/qemu
+QEMU_SRCDIR := $(QEMU_TMPDIR)/src
+QEMU_BINARY := $(QEMU_SRCDIR)/x86_64-softmmu/qemu-system-x86_64
+QEMU_BIOS_BINARIES := bios-256k.bin \
+    kvmvapic.bin \
+    linuxboot.bin \
+    vgabios-stdvga.bin \
+    efi-virtio.rom
+
+QEMU_CONFIGURATION_OPTS := --disable-bsd-user --disable-docs --disable-guest-agent --disable-guest-agent-msi \
+    --disable-sdl --disable-gtk --disable-vte --disable-curses --disable-cocoa --disable-brlapi --disable-vnc \
+    --disable-seccomp --disable-curl --disable-bluez --disable-cap-ng --disable-rbd --disable-libiscsi \
+    --disable-libnfs --disable-smartcard --disable-libusb --disable-glusterfs --disable-archipelago --disable-vhdx \
+    --disable-tcmalloc --disable-jemalloc --disable-debug-info --static --enable-virtfs --target-list=x86_64-softmmu \
+    --python=/usr/bin/python2 --disable-werror
+QEMU_ACI_BINARY := $(HV_ACIROOTFSDIR)/qemu
+
+# Using 2.6.0 stable release from official repository
+QEMU_GIT := git://git.qemu-project.org/qemu.git
+QEMU_GIT_COMMIT := v2.6.1
+
+$(call setup-stamp-file,QEMU_BUILD_STAMP,/build)
+$(call setup-stamp-file,QEMU_BIOS_BUILD_STAMP,/bios_build)
+$(call setup-stamp-file,QEMU_CONF_STAMP,/conf)
+$(call setup-stamp-file,QEMU_CLONE_STAMP,/clone)
+$(call setup-stamp-file,QEMU_DIR_CLEAN_STAMP,/dir-clean)
+$(call setup-filelist-file,QEMU_DIR_FILELIST,/dir)
+$(call setup-clean-file,QEMU_CLEANMK,/src)
+
+S1_RF_SECONDARY_STAMPS += $(QEMU_STAMP)
+S1_RF_INSTALL_FILES += $(QEMU_BINARY):$(QEMU_ACI_BINARY):-
+INSTALL_DIRS += \
+    $(QEMU_SRCDIR) :- \
+    $(QEMU_TMPDIR) :-
+
+# Bios files needs to be removed (source will be removed by QEMU_DIR_CLEAN_STAMP)
+CLEAN_FILES += $(foreach bios,$(QEMU_BIOS_BINARIES),$(HV_ACIROOTFSDIR)/${bios})
+
+$(call generate-stamp-rule,$(QEMU_STAMP),$(QEMU_CLONE_STAMP) $(QEMU_CONF_STAMP) $(QEMU_BUILD_STAMP) $(QEMU_ACI_BINARY) $(QEMU_BIOS_BUILD_STAMP) $(QEMU_DIR_CLEAN_STAMP),,)
+
+$(QEMU_BINARY): $(QEMU_BUILD_STAMP)
+
+$(call generate-stamp-rule,$(QEMU_BIOS_BUILD_STAMP),$(QEMU_CONF_STAMP) $(UFK_CBU_STAMP),, \
+	for bios in $(QEMU_BIOS_BINARIES); do \
+		$(call vb,vt,COPY BIOS,$$$${bios}) \
+		cp $(QEMU_SRCDIR)/pc-bios/$$$${bios} $(HV_ACIROOTFSDIR)/$$$${bios} $(call vl2,>/dev/null); \
+	done)
+
+$(call generate-stamp-rule,$(QEMU_BUILD_STAMP),$(QEMU_CONF_STAMP),, \
+    $(call vb,vt,BUILD EXT,qemu) \
+	$$(MAKE) $(call vl2,--silent) -C "$(QEMU_SRCDIR)" $(call vl2,>/dev/null))
+
+$(call generate-stamp-rule,$(QEMU_CONF_STAMP),$(QEMU_CLONE_STAMP),, \
+	$(call vb,vt,CONFIG EXT,qemu) \
+	cd $(QEMU_SRCDIR); ./configure $(QEMU_CONFIGURATION_OPTS) $(call vl2,>/dev/null))
+
+# Generate filelist of qemu directory (this is both srcdir and
+# builddir). Can happen after build finished.
+$(QEMU_DIR_FILELIST): $(QEMU_BUILD_STAMP)
+$(call generate-deep-filelist,$(QEMU_DIR_FILELIST),$(QEMU_SRCDIR))
+
+# Generate clean.mk cleaning qemu directory
+$(call generate-clean-mk,$(QEMU_DIR_CLEAN_STAMP),$(QEMU_CLEANMK),$(QEMU_DIR_FILELIST),$(QEMU_SRCDIR))
+
+GCL_REPOSITORY := $(QEMU_GIT)
+GCL_DIRECTORY := $(QEMU_SRCDIR)
+GCL_COMMITTISH := $(QEMU_GIT_COMMIT)
+GCL_EXPECTED_FILE := Makefile
+GCL_TARGET := $(QEMU_CLONE_STAMP)
+GCL_DO_CHECK :=
+
+include makelib/git.mk
+
+$(call undefine-namespaces,QEMU)

From 80030ee033bd9f139d680e8715d5425f2f42f20c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Wed, 8 Jun 2016 11:36:16 +0200
Subject: [PATCH 0730/1304] kvm: add qemu driver

---
 stage1/init/kvm/hypervisor/qemu_driver.go | 80 +++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 stage1/init/kvm/hypervisor/qemu_driver.go

diff --git a/stage1/init/kvm/hypervisor/qemu_driver.go b/stage1/init/kvm/hypervisor/qemu_driver.go
new file mode 100644
index 0000000000..967153aece
--- /dev/null
+++ b/stage1/init/kvm/hypervisor/qemu_driver.go
@@ -0,0 +1,80 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build hv_qemu
+
+package hypervisor
+
+import (
+	"fmt"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/coreos/rkt/stage1/init/kvm"
+)
+
+// StartCmd takes path to stage1, name of the machine, path to kernel, network describers, memory in megabytes
+// and quantity of cpus and prepares command line to run QEMU process
+func StartCmd(wdPath, name, kernelPath string, nds []kvm.NetDescriber, cpu, mem int64, debug bool) []string {
+	var (
+		driverConfiguration = KvmHypervisor{
+			Bin: "./qemu",
+			KernelParams: []string{
+				"root=/dev/root",
+				"rootfstype=9p",
+				"rootflags=trans=virtio,version=9p2000.L,cache=mmap",
+				"rw",
+				"systemd.default_standard_error=journal+console",
+				"systemd.default_standard_output=journal+console",
+			},
+		}
+	)
+
+	driverConfiguration.InitKernelParams(debug)
+
+	cmd := []string{
+		filepath.Join(wdPath, driverConfiguration.Bin),
+		"-L", wdPath,
+		"-no-reboot",
+		"-display", "none",
+		"-enable-kvm",
+		"-smp", strconv.FormatInt(cpu, 10),
+		"-m", strconv.FormatInt(mem, 10),
+		"-kernel", kernelPath,
+		"-fsdev", "local,id=root,path=stage1/rootfs,security_model=none",
+		"-device", "virtio-9p-pci,fsdev=root,mount_tag=/dev/root",
+		"-append", fmt.Sprintf("%s", strings.Join(driverConfiguration.KernelParams, " ")),
+		"-chardev", "stdio,id=virtiocon0,signal=off",
+		"-device", "virtio-serial",
+		"-device", "virtconsole,chardev=virtiocon0",
+	}
+	return append(cmd, kvmNetArgs(nds)...)
+}
+
+// kvmNetArgs returns additional arguments that need to be passed
+// to qemu to configure networks properly. Logic is based on
+// network configuration extracted from Networking struct
+// and essentially from activeNets that expose NetDescriber behavior
+func kvmNetArgs(nds []kvm.NetDescriber) []string {
+	var qemuArgs []string
+
+	for _, nd := range nds {
+		qemuArgs = append(qemuArgs, []string{"-net", "nic,model=virtio"}...)
+		qemuNic := fmt.Sprintf("tap,ifname=%s,script=no,downscript=no,vhost=on", nd.IfName())
+		qemuArgs = append(qemuArgs, []string{"-net", qemuNic}...)
+	}
+
+	return qemuArgs
+}

From 9a8de75dce34bef5899f93906dcce7174b1837b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Fri, 19 Aug 2016 15:15:26 +0200
Subject: [PATCH 0731/1304] kvm/configure: remove none_driver and kv_hv tag

---
 Makefile.in                               |  2 +-
 configure.ac                              |  3 ---
 stage1/init/kvm/hypervisor/none_driver.go | 24 -----------------------
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 stage1/init/kvm/hypervisor/none_driver.go

diff --git a/Makefile.in b/Makefile.in
index 2668586b3e..c095684252 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@ ABS_GO := @ABS_GO@
 # [STAGE1] build settings
 
 # selinux tags for rkt and functional tests
-RKT_TAGS := -tags "selinux @TPM_TAGS@ @SDJOURNAL_TAGS@ @KVM_HV_TAG@"
+RKT_TAGS := -tags "selinux @TPM_TAGS@ @SDJOURNAL_TAGS@"
 # stage1 build mode
 
 RKT_VERSION := @RKT_VERSION@
diff --git a/configure.ac b/configure.ac
index d984267df0..046ed24a15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,6 @@ AC_ARG_WITH([stage1-systemd-version],
             [RKT_STAGE1_SYSTEMD_VER='auto'])
 
 # STAGE1 - kvm hypervisor. lkvm or/and qemu can be chosen
-KVM_HV_TAG=hv_lkvm
 AC_ARG_WITH([stage1-kvm-hypervisors],
             [AS_HELP_STRING([--with-stage1-kvm-hypervisors],
                             [select hypervisors for kvm flavor; build stage1 aci for each of them. select "lkvm", "qemu" or both (default: 'lkvm')])],
@@ -800,8 +799,6 @@ AC_SUBST(RKT_STAGE1_KVM_HV)
 AC_SUBST(TPM_TAGS)
 AC_SUBST(SDJOURNAL_TAGS)
 
-AC_SUBST(KVM_HV_TAG)
-
 AC_SUBST(RKT_DEFINES_FOR_ENTER)
 
 #### FILE GENERATION AND REPORTING
diff --git a/stage1/init/kvm/hypervisor/none_driver.go b/stage1/init/kvm/hypervisor/none_driver.go
deleted file mode 100644
index 9549b0e4f0..0000000000
--- a/stage1/init/kvm/hypervisor/none_driver.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2016 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build hv_none
-
-package hypervisor
-
-import "github.com/coreos/rkt/stage1/init/kvm"
-
-// StartCmd always returns nil in case of no hypervisor is set.
-func StartCmd(wdPath, name, kernelPath string, nds []kvm.NetDescriber, cpu, mem int64, debug bool) []string {
-	return nil
-}

From 9bd828380795a78c80cac9afee4bcfb9d1951013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Mon, 22 Aug 2016 15:09:08 +0200
Subject: [PATCH 0732/1304] kvm: add hypervisor check in init

---
 stage1/init/init.go                           | 22 +++++++++++++++++--
 stage1/init/kvm.go                            | 12 ++++++++++
 .../hypervisor/{ => hvlkvm}/lkvm_driver.go    |  7 +++---
 .../hypervisor/{ => hvqemu}/qemu_driver.go    |  7 +++---
 4 files changed, 38 insertions(+), 10 deletions(-)
 rename stage1/init/kvm/hypervisor/{ => hvlkvm}/lkvm_driver.go (95%)
 rename stage1/init/kvm/hypervisor/{ => hvqemu}/qemu_driver.go (95%)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 0e45d3540f..9ea1b12937 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -50,7 +50,8 @@ import (
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/stage1/init/kvm"
-	"github.com/coreos/rkt/stage1/init/kvm/hypervisor"
+	"github.com/coreos/rkt/stage1/init/kvm/hypervisor/hvlkvm"
+	"github.com/coreos/rkt/stage1/init/kvm/hypervisor/hvqemu"
 )
 
 const (
@@ -258,7 +259,24 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 
 		cpu, mem := kvm.GetAppsResources(p.Manifest.Apps)
 
-		hvStartCmd := hypervisor.StartCmd(
+		// Parse hypervisor
+		hv, err := KvmCheckHypervisor(common.Stage1RootfsPath(p.Root))
+		if err != nil {
+			return nil, nil, err
+		}
+
+		// Set start command for hypervisor
+		StartCmd := hvlkvm.StartCmd
+		switch hv {
+		case "lkvm":
+			StartCmd = hvlkvm.StartCmd
+		case "qemu":
+			StartCmd = hvqemu.StartCmd
+		default:
+			return nil, nil, fmt.Errorf("unrecognized hypervisor")
+		}
+
+		hvStartCmd := StartCmd(
 			common.Stage1RootfsPath(p.Root),
 			p.UUID.String(),
 			kernelPath,
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index 4e75c32b5e..a911bacc1c 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -38,6 +38,9 @@ import (
 
 const journalDir = "/var/log/journal"
 
+// Supported hypervisors
+var hypervisors = [...]string{"lkvm", "qemu"}
+
 // KvmNetworkingToSystemd generates systemd unit files for a pod according to network configuration
 func KvmNetworkingToSystemd(p *stage1commontypes.Pod, n *networking.Networking) error {
 	podRoot := common.Stage1RootfsPath(p.Root)
@@ -195,6 +198,15 @@ func KvmPrepareMounts(s1Root string, p *stage1commontypes.Pod) error {
 	return nil
 }
 
+func KvmCheckHypervisor(s1Root string) (string, error) {
+	for _, hv := range hypervisors {
+		if _, err := os.Stat(filepath.Join(s1Root, hv)); err == nil {
+			return hv, nil
+		}
+	}
+	return "", fmt.Errorf("unrecognized hypervisor")
+}
+
 func linkJournal(s1Root, machineID string) error {
 	if !util.IsRunningSystemd() {
 		return nil
diff --git a/stage1/init/kvm/hypervisor/lkvm_driver.go b/stage1/init/kvm/hypervisor/hvlkvm/lkvm_driver.go
similarity index 95%
rename from stage1/init/kvm/hypervisor/lkvm_driver.go
rename to stage1/init/kvm/hypervisor/hvlkvm/lkvm_driver.go
index b29468aea4..0406e36b34 100644
--- a/stage1/init/kvm/hypervisor/lkvm_driver.go
+++ b/stage1/init/kvm/hypervisor/hvlkvm/lkvm_driver.go
@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build hv_lkvm
-
-package hypervisor
+package hvlkvm
 
 import (
 	"fmt"
@@ -23,6 +21,7 @@ import (
 	"strings"
 
 	"github.com/coreos/rkt/stage1/init/kvm"
+	"github.com/coreos/rkt/stage1/init/kvm/hypervisor"
 )
 
 // StartCmd takes path to stage1, UUID of the pod, path to kernel, network
@@ -30,7 +29,7 @@ import (
 // line to run LKVM process
 func StartCmd(wdPath, uuid, kernelPath string, nds []kvm.NetDescriber, cpu, mem int64, debug bool) []string {
 	machineID := strings.Replace(uuid, "-", "", -1)
-	driverConfiguration := KvmHypervisor{
+	driverConfiguration := hypervisor.KvmHypervisor{
 		Bin: "./lkvm",
 		KernelParams: []string{
 			"systemd.default_standard_error=journal+console",
diff --git a/stage1/init/kvm/hypervisor/qemu_driver.go b/stage1/init/kvm/hypervisor/hvqemu/qemu_driver.go
similarity index 95%
rename from stage1/init/kvm/hypervisor/qemu_driver.go
rename to stage1/init/kvm/hypervisor/hvqemu/qemu_driver.go
index 967153aece..f120db14fe 100644
--- a/stage1/init/kvm/hypervisor/qemu_driver.go
+++ b/stage1/init/kvm/hypervisor/hvqemu/qemu_driver.go
@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build hv_qemu
-
-package hypervisor
+package hvqemu
 
 import (
 	"fmt"
@@ -23,13 +21,14 @@ import (
 	"strings"
 
 	"github.com/coreos/rkt/stage1/init/kvm"
+	"github.com/coreos/rkt/stage1/init/kvm/hypervisor"
 )
 
 // StartCmd takes path to stage1, name of the machine, path to kernel, network describers, memory in megabytes
 // and quantity of cpus and prepares command line to run QEMU process
 func StartCmd(wdPath, name, kernelPath string, nds []kvm.NetDescriber, cpu, mem int64, debug bool) []string {
 	var (
-		driverConfiguration = KvmHypervisor{
+		driverConfiguration = hypervisor.KvmHypervisor{
 			Bin: "./qemu",
 			KernelParams: []string{
 				"root=/dev/root",

From 3af5dac98bf5cc7ef1a15c89b244dd36bc5dbe69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Wed, 8 Jun 2016 12:05:10 +0200
Subject: [PATCH 0733/1304] tests: bump version of gcc to build qemu

---
 tests/install-deps.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/install-deps.sh b/tests/install-deps.sh
index d9c40a6bae..d15a3c967a 100755
--- a/tests/install-deps.sh
+++ b/tests/install-deps.sh
@@ -35,6 +35,9 @@ if [ "${CI-}" == true ] ; then
 		# building systemd v229 crashes with the gcc 4.8, update to gcc 5
 		sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 		sudo apt-get update -qq
-		sudo apt-get install gcc-5 gcc-5-base libgcc-5-dev -y -qq
+		sudo apt-get install gcc-5 gcc-5-base libgcc-5-dev g++-5 libstdc++-5-dev libseccomp-dev -y -qq
+		sudo update-alternatives --remove-all gcc
+		sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 20
+		sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 20
 	fi
 fi

From 035e3924f526703c5743fbb30c5403716ff5763c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Mon, 12 Sep 2016 11:12:16 +0200
Subject: [PATCH 0734/1304] Documentation: add qemu to KVM stage1 doc

---
 Documentation/rkt-vs-other-projects.md        |  2 +-
 ...g-lkvm-stage1.md => running-kvm-stage1.md} | 24 +++++++++----------
 README.md                                     |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename Documentation/{running-lkvm-stage1.md => running-kvm-stage1.md} (76%)

diff --git a/Documentation/rkt-vs-other-projects.md b/Documentation/rkt-vs-other-projects.md
index 233ee9122b..bcf21e9442 100644
--- a/Documentation/rkt-vs-other-projects.md
+++ b/Documentation/rkt-vs-other-projects.md
@@ -135,4 +135,4 @@ qemu-kvm and lkvm do not have a centralized daemon and can be integrated with in
 rkt can download, cryptographically verify, and run application container images.
 It is not designed to run "full system images" but instead individual applications such as web apps, databases, or caches.
 As rkt does not have a centralized daemon it can be integrated with init systems such as upstart and systemd.
-rkt can optionally use lkvm as an additional security measure over a Linux container, at a slight cost to performance and flexibility; this feature can be configured using the [lkvm (aka Clear Containers) stage1](running-lkvm-stage1.md).
+rkt can optionally use lkvm or qemu-kvm as an additional security measure over a Linux container, at a slight cost to performance and flexibility; this feature can be configured using the [kvm (aka Clear Containers) stage1](running-lkvm-stage1.md).
diff --git a/Documentation/running-lkvm-stage1.md b/Documentation/running-kvm-stage1.md
similarity index 76%
rename from Documentation/running-lkvm-stage1.md
rename to Documentation/running-kvm-stage1.md
index 4a8edf390a..c838cb9bd6 100644
--- a/Documentation/running-lkvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -1,19 +1,19 @@
-# Running rkt with an LKVM stage1
+# Running rkt with KVM stage1
 
-rkt has support for executing pods with an [LKVM](https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+/master/README) [stage1](devel/architecture.md#stage-1). rkt employs this [alternative stage1](devel/stage1-implementors-guide.md) to run a pod within a virtual machine with its own operating system kernel and hypervisor isolation, rather than creating a container using Linux cgroups and namespaces.
+rkt has support for executing pods with KVM hypervisor - [LKVM](https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+/master/README) or [QEMU](https://github.com/qemu/qemu/blob/master/README) as a [stage1](devel/architecture.md#stage-1). rkt employs this [alternative stage1](devel/stage1-implementors-guide.md) to run a pod within a virtual machine with its own operating system kernel and hypervisor isolation, rather than creating a container using Linux cgroups and namespaces.
 
-The LKVM stage1 does not yet implement all of the default stage1's features and semantics. While the same app container can be executed under isolation by either stage1, it may require different configuration, especially for networking. However, several deployments of the LKVM stage1 are operational outside of CoreOS, and we encourage testing of this feature and welcome your contributions.
+The KVM stage1 does not yet implement all of the default stage1's features and semantics. While the same app container can be executed under isolation by either stage1, it may require different configuration, especially for networking. However, several deployments of the KVM stage1 are operational outside of CoreOS, and we encourage testing of this feature and welcome your contributions.
 
 ## Getting started
 
-You can either use `stage1-kvm.aci` (or `stage1-lkvm.aci`) from the official release, or build rkt yourself with the right options:
+For LKVM you can use `stage1-kvm.aci` or `stage1-kvm-lkvm.aci`, for QEMU - `stage1-kvm-qemu.aci` from the official release. You can also build rkt yourself with the right options:
 
 ```
-$ ./autogen.sh && ./configure --with-stage1-flavors=kvm && make
+$ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hypervisors=lkvm,qemu && make
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the LKVM stage1-kvm.aci in `build-rkt-1.14.0+git/bin/`.
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.14.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -81,7 +81,7 @@ Currently, the memory allocated to the virtual machine is a sum of memory requir
 
 If you want to run software that requires hypervisor isolation along with trusted software that only needs container isolation, you can [choose which stage1 to use at runtime](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/run.md#use-a-custom-stage-1).
 
-For example, to use the official lkvm stage1:
+For example, to use the official kvm stage1:
 
 ```
 # rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.14.0 coreos.com/etcd:v2.0.9
@@ -93,12 +93,12 @@ If the image is not in the store, `--stage1-name` will perform discovery and fet
 ## How does it work?
 
 It leverages the work done by Intel with their [Clear Containers system](https://lwn.net/Articles/644675/).
-Stage1 contains a Linux kernel that is executed under LKVM.
+Stage1 contains a Linux kernel that is executed under hypervisor (LKVM or QEMU).
 This kernel will then start systemd, which in turn will start the applications in the pod.
 
-A LKVM-based rkt is very similar to a container-based one, it just uses lkvm to execute pods instead of systemd-nspawn.
+A KVM-based rkt is very similar to a container-based one, it just uses hypervisor to execute pods instead of systemd-nspawn.
 
-Here's a comparison of the components involved between a container-based and a LKVM based rkt.
+Here's a comparison of the components involved between a container-based and a KVM based rkt.
 
 Container-based:
 
@@ -112,12 +112,12 @@ host OS
 ```
 
 
-LKVM based:
+KVM based:
 
 ```
 host OS
   └─ rkt
-    └─ lkvm
+    └─ hypervisor
       └─ kernel
         └─ systemd
           └─ chroot
diff --git a/README.md b/README.md
index 732c8af4c3..2bc177ee41 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ rkt (pronounced _"rock-it"_) is a CLI for running app containers on Linux. rkt i
 
 Some of rkt's key features and goals include:
 
-- _Security_: rkt is developed with a principle of "secure-by-default", and includes a number of important security features like support for [SELinux][selinux], [TPM measurement][tpm], and running app containers in [hardware-isolated VMs][lkvm].
+- _Security_: rkt is developed with a principle of "secure-by-default", and includes a number of important security features like support for [SELinux][selinux], [TPM measurement][tpm], and running app containers in [hardware-isolated VMs][kvm].
 - _Composability_: rkt is designed for first-class integration with init systems ([systemd][systemd], upstart) and cluster orchestration tools (fleet, [Kubernetes][kubernetes], [Nomad][nomad]), and supports [swappable execution engines][architecture].
 - _Open standards and compatibility_: rkt implements the [appc specification][rkt-and-appc], supports the [Container Networking Interface specification][CNI], and can also run [Docker images][docker].
 
@@ -23,7 +23,7 @@ For more on the background and motivation behind rkt, read the original [launch
 [nomad]: Documentation/using-rkt-with-nomad.md
 [docker]: Documentation/running-docker-images.md
 [networking]: Documentation/networking.md
-[lkvm]: Documentation/running-lkvm-stage1.md
+[kvm]: Documentation/running-kvm-stage1.md
 [rkt-and-appc]: Documentation/app-container.md
 [cni]: https://github.com/appc/cni
 [selinux]: Documentation/selinux.md

From 5932877715cfd326ed6030b81ab7ecb6e1babb75 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Wed, 24 Aug 2016 15:12:52 +0000
Subject: [PATCH 0735/1304] Move rkt/flag to pkg/flag, add pairlist flag
 structure

---
 {rkt => pkg}/flag/bitflags.go     |  30 ++---
 {rkt => pkg}/flag/optionlist.go   |   5 +-
 pkg/flag/pairlist.go              | 183 ++++++++++++++++++++++++++++++
 {rkt => pkg}/flag/rktflag_test.go | 168 +++++++++++++--------------
 rkt/flag/secflags.go              |  38 ++++---
 rkt/flag/secflags_test.go         | 120 ++++++++++++++++++++
 rkt/image/httpfetcher.go          |   3 +-
 rkt/image/namefetcher.go          |   3 +-
 rkt/image_list.go                 |   2 +-
 9 files changed, 426 insertions(+), 126 deletions(-)
 rename {rkt => pkg}/flag/bitflags.go (64%)
 rename {rkt => pkg}/flag/optionlist.go (89%)
 create mode 100644 pkg/flag/pairlist.go
 rename {rkt => pkg}/flag/rktflag_test.go (54%)
 create mode 100644 rkt/flag/secflags_test.go

diff --git a/rkt/flag/bitflags.go b/pkg/flag/bitflags.go
similarity index 64%
rename from rkt/flag/bitflags.go
rename to pkg/flag/bitflags.go
index 368decdd6b..9349dedf60 100644
--- a/rkt/flag/bitflags.go
+++ b/pkg/flag/bitflags.go
@@ -21,24 +21,26 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
-// bitFlags is a flag value type supporting a csv list of options stored as bits
-type bitFlags struct {
+// BitFlags is a flag value type supporting a csv list of options stored as bits
+type BitFlags struct {
 	*OptionList
-	flags   int
-	flagMap map[string]int
+	Flags   int
+	FlagMap map[string]int
 }
 
-func newBitFlags(permissibleOptions []string, defaultOptions string, flagMap map[string]int) (*bitFlags, error) {
+// NewBitFlags initializes a simple bitflag version of the OptionList Type.
+// flagMap is the mapping from option names to the integer value
+func NewBitFlags(permissibleOptions []string, defaultOptions string, flagMap map[string]int) (*BitFlags, error) {
 	ol, err := NewOptionList(permissibleOptions, defaultOptions)
 	if err != nil {
 		return nil, err
 	}
 
-	bf := &bitFlags{
+	bf := &BitFlags{
 		OptionList: ol,
-		flagMap:    flagMap,
+		FlagMap:    flagMap,
 	}
-	bf.typeName = "bitFlags"
+	bf.typeName = "BitFlags"
 
 	if err := bf.Set(defaultOptions); err != nil {
 		return nil, errwrap.Wrap(errors.New("problem setting defaults"), err)
@@ -47,14 +49,14 @@ func newBitFlags(permissibleOptions []string, defaultOptions string, flagMap map
 	return bf, nil
 }
 
-func (bf *bitFlags) Set(s string) error {
+func (bf *BitFlags) Set(s string) error {
 	if err := bf.OptionList.Set(s); err != nil {
 		return err
 	}
-	bf.flags = 0
+	bf.Flags = 0
 	for _, o := range bf.Options {
-		if b, ok := bf.flagMap[o]; ok {
-			bf.flags |= b
+		if b, ok := bf.FlagMap[o]; ok {
+			bf.Flags |= b
 		} else {
 			return fmt.Errorf("couldn't find flag for %v", o)
 		}
@@ -62,6 +64,6 @@ func (bf *bitFlags) Set(s string) error {
 	return nil
 }
 
-func (bf *bitFlags) hasFlag(f int) bool {
-	return (bf.flags & f) == f
+func (bf *BitFlags) HasFlag(f int) bool {
+	return (bf.Flags & f) == f
 }
diff --git a/rkt/flag/optionlist.go b/pkg/flag/optionlist.go
similarity index 89%
rename from rkt/flag/optionlist.go
rename to pkg/flag/optionlist.go
index a2510a0b54..33f9450e77 100644
--- a/rkt/flag/optionlist.go
+++ b/pkg/flag/optionlist.go
@@ -35,12 +35,15 @@ type OptionList struct {
 
 var _ pflag.Value = (*OptionList)(nil)
 
+// NewOptionList initializes an OptionList. PermissibleOptions is the complete
+// set of allowable options. It will set all options specified in defaultOptions
+// as provided; they will all be cleared if this flag is passed in the CLI
 func NewOptionList(permissibleOptions []string, defaultOptions string) (*OptionList, error) {
 	permissible := make(map[string]struct{})
 	ol := &OptionList{
 		allOptions:  permissibleOptions,
 		permissible: permissible,
-		typeName:    "optionList",
+		typeName:    "OptionList",
 	}
 
 	for _, o := range permissibleOptions {
diff --git a/pkg/flag/pairlist.go b/pkg/flag/pairlist.go
new file mode 100644
index 0000000000..42971e8943
--- /dev/null
+++ b/pkg/flag/pairlist.go
@@ -0,0 +1,183 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package flag
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+
+	"github.com/spf13/pflag"
+)
+
+// PairList is a flag value supporting a list of key=value pairs
+// It will optionally validate the supplied keys and / or values
+// It would parse something like "--arg foo=bar --arg baz=bar"
+type PairList struct {
+	Pairs       map[string]string
+	permissible map[string](map[string]struct{}) // map of allowed keys and, optionally, allowed values
+	typeName    string
+}
+
+var _ pflag.Value = (*PairList)(nil)
+
+// NewPairList initializes a new pair list
+// If permissiblePairs is not empty, then it will validate keys and values. For
+// every key in permissiblePairs, if the value is an empty list, then any value
+// is allowed. If there is a list, then only those values are allowed for that.
+// for example, { "a": {"1", "two", "cheese"}, "b" : {}} would accept
+// a=1 and any b, but no other keys
+// defaults is a list of default parameters
+func NewPairList(permissiblePairs map[string][]string, defaults map[string]string) (*PairList, error) {
+	pl := &PairList{
+		Pairs:       make(map[string]string),
+		permissible: make(map[string]map[string]struct{}),
+		typeName:    "PairList",
+	}
+
+	// invert the list of allowed vals for fast lookup
+	for key, vals := range permissiblePairs {
+		pl.permissible[key] = make(map[string]struct{})
+
+		for _, val := range vals {
+			pl.permissible[key][val] = struct{}{}
+		}
+	}
+
+	for key, val := range defaults {
+		err := pl.SetOne(key, val)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return pl, nil
+}
+
+// MustNewPairList is the same as NewPairList, but panics instead of returning error
+// So check that your defaults are correct :-)
+func MustNewPairList(permissiblePairs map[string][]string, defaults map[string]string) *PairList {
+	pl, err := NewPairList(permissiblePairs, defaults)
+	if err != nil {
+		panic(err)
+	}
+	return pl
+}
+
+// Set parses a "k=v[,kk=vv...]" string
+func (pl *PairList) Set(s string) error {
+	entries := strings.Split(s, ",")
+
+	for _, e := range entries {
+		p := strings.SplitN(e, "=", 2)
+		if len(p) != 2 {
+			return fmt.Errorf("could not parse key=value pair %v", s)
+		}
+		key := p[0]
+		val := p[1]
+		err := pl.SetOne(key, val)
+		if err != nil {
+			return err
+		}
+
+	}
+	return nil
+}
+
+// SetOne validates and sets an individual key-value pair
+// It will overwrite an existing value
+func (pl *PairList) SetOne(key, val string) error {
+	// Check that key is allowed
+	if len(pl.permissible) > 0 {
+		permVals, ok := pl.permissible[key]
+		if !ok {
+			return fmt.Errorf("key %v is not allowed", key)
+		}
+
+		// Check that value is allowed
+		if len(permVals) > 0 {
+			_, ok = permVals[val]
+			if !ok {
+				return fmt.Errorf("key %v does not allow value %v", key, val)
+			}
+		}
+	}
+
+	pl.Pairs[key] = val
+	return nil
+}
+
+// Keys returns a sorted list of all present keys
+func (pl *PairList) Keys() []string {
+	keys := make([]string, 0, len(pl.Pairs))
+	for k := range pl.Pairs {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	return keys
+}
+
+// String presents a k=v list in key=sorted order
+func (pl *PairList) String() string {
+	ps := make([]string, 0, len(pl.Pairs))
+	for _, k := range pl.Keys() {
+		ps = append(ps, fmt.Sprintf("%v=%v", k, pl.Pairs[k]))
+	}
+	return strings.Join(ps, " ")
+}
+
+func (pl *PairList) Type() string {
+	return pl.typeName
+}
+
+// PermissibleString generates a posix-cli-doc style string.
+// For example, a=[b|c|d] w=[x|y|z] l=*
+func (pl *PairList) PermissibleString() string {
+	ps := make([]string, 0, len(pl.permissible))
+
+	keys := make([]string, 0, len(pl.permissible))
+	for k := range pl.permissible {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	for _, k := range keys {
+		vss := pl.permissible[k]
+		//re-invert the index
+		vs := make([]string, 0, len(vss))
+		for v := range vss {
+			vs = append(vs, v)
+		}
+		sort.Strings(vs)
+
+		vstr := "*"
+		if len(vs) > 0 {
+			vstr = "[" + strings.Join(vs, "|") + "]"
+		}
+		ps = append(ps, fmt.Sprintf("%v=%v", k, vstr))
+	}
+
+	return strings.Join(ps, " ")
+}
+
+// Serialize takes a map and generates a string that can be parsed by Set
+func SerializePairs(pairs map[string]string) string {
+	tmp := make([]string, 0, len(pairs))
+
+	for k, v := range pairs {
+		tmp = append(tmp, fmt.Sprintf("%s=%s", k, v))
+	}
+	return strings.Join(tmp, ",")
+}
diff --git a/rkt/flag/rktflag_test.go b/pkg/flag/rktflag_test.go
similarity index 54%
rename from rkt/flag/rktflag_test.go
rename to pkg/flag/rktflag_test.go
index 425d8b992e..248bb664bf 100644
--- a/rkt/flag/rktflag_test.go
+++ b/pkg/flag/rktflag_test.go
@@ -15,6 +15,7 @@
 package flag
 
 import (
+	"reflect"
 	"strings"
 	"testing"
 )
@@ -110,12 +111,12 @@ func TestBitFlags(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		// test newBitFlags
-		if _, err := newBitFlags(options, tt.opts, bfMap); (err != nil) != tt.parseErr {
-			t.Errorf("test %d: unexpected error in newBitFlags: %v", i, err)
+		// test NewBitFlags
+		if _, err := NewBitFlags(options, tt.opts, bfMap); (err != nil) != tt.parseErr {
+			t.Errorf("test %d: unexpected error in NewBitFlags: %v", i, err)
 		}
 
-		bf, err := newBitFlags(options, strings.Join(options, ","), bfMap)
+		bf, err := NewBitFlags(options, strings.Join(options, ","), bfMap)
 		if err != nil {
 			t.Errorf("test %d: unexpected error preparing test: %v", i, err)
 		}
@@ -124,112 +125,97 @@ func TestBitFlags(t *testing.T) {
 		if err := bf.Set(tt.opts); (err != nil) != tt.parseErr {
 			t.Errorf("test %d: Could not parse options as expected: %v", i, err)
 		}
-		if tt.ex >= 0 && bf.hasFlag(tt.ex) == tt.logicErr {
+		if tt.ex >= 0 && bf.HasFlag(tt.ex) == tt.logicErr {
 			t.Errorf("test %d: Result was unexpected: %d != %d",
-				i, tt.ex, bf.flags)
+				i, tt.ex, bf.Flags)
 		}
 	}
 }
 
-func TestSecFlags(t *testing.T) {
+type ss []string
+type sm map[string]string
+
+func TestPairList(t *testing.T) {
+	options := map[string][]string{
+		"one":   {"a", "b", "ll"},
+		"two":   {},
+		"three": nil,
+	}
+
 	tests := []struct {
-		opts   string
-		image  bool
-		tls    bool
-		onDisk bool
-		http   bool
-		err    bool
+		args     ss
+		expected sm
+		hasError bool
 	}{
 		{
-			opts:   "none",
-			image:  false,
-			tls:    false,
-			onDisk: false,
-			http:   false,
-		},
-		{
-			opts:   "image",
-			image:  true,
-			tls:    false,
-			onDisk: false,
-			http:   false,
-		},
-		{
-			opts:   "tls",
-			image:  false,
-			tls:    true,
-			onDisk: false,
-			http:   false,
-		},
-		{
-			opts:   "onDisk",
-			image:  false,
-			tls:    false,
-			onDisk: true,
-			http:   false,
-		},
-		{
-			opts:   "http",
-			image:  false,
-			tls:    false,
-			onDisk: false,
-			http:   true,
-		},
-		{
-			opts:   "all",
-			image:  true,
-			tls:    true,
-			onDisk: true,
-			http:   true,
-		},
-		{
-			opts:   "image,tls",
-			image:  true,
-			tls:    true,
-			onDisk: false,
-			http:   false,
-		},
-		{
-			opts: "i-am-sure-we-will-not-get-this-insecure-flag",
-			err:  true,
+			args:     ss{},
+			expected: sm{},
+			hasError: false,
+		}, {
+			args:     ss{"one=a"},
+			expected: sm{"one": "a"},
+			hasError: false,
+		}, {
+			args:     ss{"one=a", "two=bar"},
+			expected: sm{"one": "a", "two": "bar"},
+			hasError: false,
+		}, {
+			args:     ss{"one=ll,two=bar"},
+			expected: sm{"one": "ll", "two": "bar"},
+			hasError: false,
+		}, {
+			args:     ss{"one=bar,two=bar"},
+			expected: sm{},
+			hasError: true,
+		}, {
+			args:     ss{"one=ll,two=bar", "one=a"},
+			expected: sm{"one": "a", "two": "bar"},
+			hasError: false,
 		},
 	}
 
 	for i, tt := range tests {
-		sf, err := NewSecFlags(tt.opts)
-		if err != nil && !tt.err {
-			t.Errorf("test %d: unexpected error in NewSecFlags: %v", i, err)
-		} else if err == nil && tt.err {
-			t.Errorf("test %d: unexpected success in NewSecFlags for options %q", i, tt.opts)
-		}
-		if err != nil {
-			continue
-		}
 
-		if got := sf.SkipImageCheck(); tt.image != got {
-			t.Errorf("test %d: expected image skip to be %v, got %v", i, tt.image, got)
-		}
+		pl := MustNewPairList(options, nil)
 
-		if got := sf.SkipTLSCheck(); tt.tls != got {
-			t.Errorf("test %d: expected tls skip to be %v, got %v", i, tt.tls, got)
+		var argErr error
+		for _, arg := range tt.args {
+			err := pl.Set(arg)
+			if err != nil {
+				argErr = err
+			}
 		}
-
-		if got := sf.SkipOnDiskCheck(); tt.onDisk != got {
-			t.Errorf("test %d: expected on disk skip to be %v, got %v", i, tt.onDisk, got)
+		if argErr != nil {
+			if !tt.hasError {
+				t.Errorf("test %d: pl.Set unexpected error %v", i, argErr)
+			} else {
+				continue // no point in testing equality
+			}
 		}
 
-		if got := sf.AllowHTTP(); tt.http != got {
-			t.Errorf("test %d: expected http allowed to be %v, got %v", i, tt.http, got)
+		if !reflect.DeepEqual(map[string]string(tt.expected), pl.Pairs) {
+			t.Errorf("test %d: pl.Pairs expected %v got %v", i, tt.expected, pl.Pairs)
 		}
+	}
 
-		all := tt.http && tt.onDisk && tt.tls && tt.image
-		if got := sf.SkipAllSecurityChecks(); all != got {
-			t.Errorf("test %d: expected all skip to be %v, got %v", i, all, got)
-		}
+	pl := MustNewPairList(options, nil)
+	got := pl.PermissibleString()
+	expected := "one=[a|b|ll] three=* two=*" // order!
+	if got != expected {
+		t.Errorf("pl.PermissibleString() expected %v got %v", expected, got)
+	}
 
-		any := tt.http || tt.onDisk || tt.tls || tt.image
-		if got := sf.SkipAnySecurityChecks(); any != got {
-			t.Errorf("test %d: expected all skip to be %v, got %v", i, any, got)
-		}
+	pl = MustNewPairList(options, sm{"one": "a", "two": "bar"})
+	got = pl.String()
+	expected = "one=a two=bar"
+	if got != expected {
+		t.Errorf("pl.String expected %v got %v", expected, got)
+	}
+
+	ser := SerializePairs(pl.Pairs)
+	pl2 := MustNewPairList(options, nil)
+	pl2.Set(ser)
+	if !reflect.DeepEqual(pl.Pairs, pl2.Pairs) {
+		t.Errorf("serialize - unserialize did not match")
 	}
 }
diff --git a/rkt/flag/secflags.go b/rkt/flag/secflags.go
index 3807682788..3f02b3d77e 100644
--- a/rkt/flag/secflags.go
+++ b/rkt/flag/secflags.go
@@ -14,7 +14,11 @@
 
 package flag
 
-import "strings"
+import (
+	"strings"
+
+	pkgflag "github.com/coreos/rkt/pkg/flag"
+)
 
 const (
 	insecureNone  = 0
@@ -65,78 +69,78 @@ var (
 )
 
 type SecFlags struct {
-	*bitFlags
+	*pkgflag.BitFlags
 }
 
 func NewSecFlagsFromValue(val int) (*SecFlags, error) {
 	sf := &SecFlags{
-		bitFlags: &bitFlags{flags: val},
+		&pkgflag.BitFlags{Flags: val},
 	}
 
 	return sf, nil
 }
 
 func NewSecFlags(defOpts string) (*SecFlags, error) {
-	bf, err := newBitFlags(insecureOptions, defOpts, insecureOptionsMap)
+	bf, err := pkgflag.NewBitFlags(insecureOptions, defOpts, insecureOptionsMap)
 	if err != nil {
 		return nil, err
 	}
 
 	sf := &SecFlags{
-		bitFlags: bf,
+		BitFlags: bf,
 	}
 	return sf, nil
 }
 
 func (sf *SecFlags) SkipImageCheck() bool {
-	return sf.hasFlag(insecureImage)
+	return sf.HasFlag(insecureImage)
 }
 
 func (sf *SecFlags) SkipTLSCheck() bool {
-	return sf.hasFlag(insecureTLS)
+	return sf.HasFlag(insecureTLS)
 }
 
 func (sf *SecFlags) SkipOnDiskCheck() bool {
-	return sf.hasFlag(insecureOnDisk)
+	return sf.HasFlag(insecureOnDisk)
 }
 
 func (sf *SecFlags) AllowHTTP() bool {
-	return sf.hasFlag(insecureHTTP)
+	return sf.HasFlag(insecureHTTP)
 }
 
 func (sf *SecFlags) ConsiderInsecurePubKeys() bool {
-	return sf.hasFlag(insecurePubKey)
+	return sf.HasFlag(insecurePubKey)
 }
 
 func (sf *SecFlags) SkipCapabilities() bool {
-	return sf.hasFlag(insecureCapabilities)
+	return sf.HasFlag(insecureCapabilities)
 }
 
 func (sf *SecFlags) SkipPaths() bool {
-	return sf.hasFlag(insecurePaths)
+	return sf.HasFlag(insecurePaths)
 }
 
 func (sf *SecFlags) SkipSeccomp() bool {
-	return sf.hasFlag(insecureSeccomp)
+	return sf.HasFlag(insecureSeccomp)
 }
 
 func (sf *SecFlags) SkipAllSecurityChecks() bool {
-	return sf.hasFlag(insecureAll)
+	return sf.HasFlag(insecureAll)
 }
 
 func (sf *SecFlags) SkipAnySecurityChecks() bool {
-	return sf.flags != 0
+	return sf.Flags != 0
 }
 
 func (sf *SecFlags) Value() int {
-	return sf.flags
+	return sf.Flags
 }
 
 func (sf *SecFlags) String() string {
 	opts := []string{}
 
 	for optstr, opt := range insecureOptionsMap {
-		if sf.hasFlag(opt) {
+		if sf.HasFlag(opt) {
 			if opt == insecureNone || opt == insecureAll {
 				continue
 			}
diff --git a/rkt/flag/secflags_test.go b/rkt/flag/secflags_test.go
new file mode 100644
index 0000000000..ab1c5fb015
--- /dev/null
+++ b/rkt/flag/secflags_test.go
@@ -0,0 +1,120 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package flag
+
+import "testing"
+
+func TestSecFlags(t *testing.T) {
+	tests := []struct {
+		opts   string
+		image  bool
+		tls    bool
+		onDisk bool
+		http   bool
+		err    bool
+	}{
+		{
+			opts:   "none",
+			image:  false,
+			tls:    false,
+			onDisk: false,
+			http:   false,
+		},
+		{
+			opts:   "image",
+			image:  true,
+			tls:    false,
+			onDisk: false,
+			http:   false,
+		},
+		{
+			opts:   "tls",
+			image:  false,
+			tls:    true,
+			onDisk: false,
+			http:   false,
+		},
+		{
+			opts:   "onDisk",
+			image:  false,
+			tls:    false,
+			onDisk: true,
+			http:   false,
+		},
+		{
+			opts:   "http",
+			image:  false,
+			tls:    false,
+			onDisk: false,
+			http:   true,
+		},
+		{
+			opts:   "all",
+			image:  true,
+			tls:    true,
+			onDisk: true,
+			http:   true,
+		},
+		{
+			opts:   "image,tls",
+			image:  true,
+			tls:    true,
+			onDisk: false,
+			http:   false,
+		},
+		{
+			opts: "i-am-sure-we-will-not-get-this-insecure-flag",
+			err:  true,
+		},
+	}
+
+	for i, tt := range tests {
+		sf, err := NewSecFlags(tt.opts)
+		if err != nil && !tt.err {
+			t.Errorf("test %d: unexpected error in NewSecFlags: %v", i, err)
+		} else if err == nil && tt.err {
+			t.Errorf("test %d: unexpected success in NewSecFlags for options %q", i, tt.opts)
+		}
+		if err != nil {
+			continue
+		}
+
+		if got := sf.SkipImageCheck(); tt.image != got {
+			t.Errorf("test %d: expected image skip to be %v, got %v", i, tt.image, got)
+		}
+
+		if got := sf.SkipTLSCheck(); tt.tls != got {
+			t.Errorf("test %d: expected tls skip to be %v, got %v", i, tt.tls, got)
+		}
+
+		if got := sf.SkipOnDiskCheck(); tt.onDisk != got {
+			t.Errorf("test %d: expected on disk skip to be %v, got %v", i, tt.onDisk, got)
+		}
+
+		if got := sf.AllowHTTP(); tt.http != got {
+			t.Errorf("test %d: expected http allowed to be %v, got %v", i, tt.http, got)
+		}
+
+		all := tt.http && tt.onDisk && tt.tls && tt.image
+		if got := sf.SkipAllSecurityChecks(); all != got {
+			t.Errorf("test %d: expected all skip to be %v, got %v", i, all, got)
+		}
+
+		any := tt.http || tt.onDisk || tt.tls || tt.image
+		if got := sf.SkipAnySecurityChecks(); any != got {
+			t.Errorf("test %d: expected all skip to be %v, got %v", i, any, got)
+		}
+	}
+}
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index b93741c9fe..654bd4bbbd 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -20,9 +20,10 @@ import (
 	"net/url"
 	"time"
 
+	rktflag "github.com/coreos/rkt/rkt/flag"
+
 	"github.com/coreos/rkt/pkg/keystore"
 	"github.com/coreos/rkt/rkt/config"
-	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
 )
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 218ca990dc..6037f80ba4 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -22,9 +22,10 @@ import (
 	"net/url"
 	"time"
 
+	rktflag "github.com/coreos/rkt/rkt/flag"
+
 	"github.com/coreos/rkt/pkg/keystore"
 	"github.com/coreos/rkt/rkt/config"
-	rktflag "github.com/coreos/rkt/rkt/flag"
 	"github.com/coreos/rkt/rkt/pubkey"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
diff --git a/rkt/image_list.go b/rkt/image_list.go
index a0848f1452..31e0a76c41 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	rktflag "github.com/coreos/rkt/rkt/flag"
+	rktflag "github.com/coreos/rkt/pkg/flag"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/dustin/go-humanize"
 

From ad4cf093d1ee5702039832dc65683f4670c99b04 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 1 Sep 2016 19:46:23 +0200
Subject: [PATCH 0736/1304] functional tests: add small build magic to tell
 what flavor we're testing

---
 tests/rkt_flavor.go         | 24 ++++++++++++++++++++++++
 tests/rkt_flavor_coreos.go  | 26 ++++++++++++++++++++++++++
 tests/rkt_flavor_default.go | 26 ++++++++++++++++++++++++++
 tests/rkt_flavor_fly.go     | 26 ++++++++++++++++++++++++++
 tests/rkt_flavor_host.go    | 26 ++++++++++++++++++++++++++
 tests/rkt_flavor_kvm.go     | 26 ++++++++++++++++++++++++++
 tests/rkt_flavor_src.go     | 26 ++++++++++++++++++++++++++
 7 files changed, 180 insertions(+)
 create mode 100644 tests/rkt_flavor.go
 create mode 100644 tests/rkt_flavor_coreos.go
 create mode 100644 tests/rkt_flavor_default.go
 create mode 100644 tests/rkt_flavor_fly.go
 create mode 100644 tests/rkt_flavor_host.go
 create mode 100644 tests/rkt_flavor_kvm.go
 create mode 100644 tests/rkt_flavor_src.go

diff --git a/tests/rkt_flavor.go b/tests/rkt_flavor.go
new file mode 100644
index 0000000000..cf75723bf6
--- /dev/null
+++ b/tests/rkt_flavor.go
@@ -0,0 +1,24 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+type Flavor struct {
+	Coreos              bool
+	Host                bool
+	Src                 bool
+	Kvm                 bool
+	Fly                 bool
+	ExitStatusPreserved bool // KVM flavor does not preserve exit status
+}
diff --git a/tests/rkt_flavor_coreos.go b/tests/rkt_flavor_coreos.go
new file mode 100644
index 0000000000..9627d6d910
--- /dev/null
+++ b/tests/rkt_flavor_coreos.go
@@ -0,0 +1,26 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build coreos
+
+package main
+
+var TestedFlavor = Flavor{
+	true,
+	false,
+	false,
+	false,
+	false,
+	true,
+}
diff --git a/tests/rkt_flavor_default.go b/tests/rkt_flavor_default.go
new file mode 100644
index 0000000000..73a473a808
--- /dev/null
+++ b/tests/rkt_flavor_default.go
@@ -0,0 +1,26 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !coreos,!host,!src,!kvm,!fly
+
+package main
+
+var TestedFlavor = Flavor{
+	false,
+	false,
+	false,
+	false,
+	false,
+	false,
+}
diff --git a/tests/rkt_flavor_fly.go b/tests/rkt_flavor_fly.go
new file mode 100644
index 0000000000..6b47891984
--- /dev/null
+++ b/tests/rkt_flavor_fly.go
@@ -0,0 +1,26 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build fly
+
+package main
+
+var TestedFlavor = Flavor{
+	false,
+	false,
+	false,
+	false,
+	true,
+	true,
+}
diff --git a/tests/rkt_flavor_host.go b/tests/rkt_flavor_host.go
new file mode 100644
index 0000000000..08a63e917f
--- /dev/null
+++ b/tests/rkt_flavor_host.go
@@ -0,0 +1,26 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host
+
+package main
+
+var TestedFlavor = Flavor{
+	false,
+	true,
+	false,
+	false,
+	false,
+	true,
+}
diff --git a/tests/rkt_flavor_kvm.go b/tests/rkt_flavor_kvm.go
new file mode 100644
index 0000000000..bb10691dab
--- /dev/null
+++ b/tests/rkt_flavor_kvm.go
@@ -0,0 +1,26 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build kvm
+
+package main
+
+var TestedFlavor = Flavor{
+	false,
+	false,
+	false,
+	false,
+	true,
+	false,
+}
diff --git a/tests/rkt_flavor_src.go b/tests/rkt_flavor_src.go
new file mode 100644
index 0000000000..0df587eac6
--- /dev/null
+++ b/tests/rkt_flavor_src.go
@@ -0,0 +1,26 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build src
+
+package main
+
+var TestedFlavor = Flavor{
+	false,
+	false,
+	true,
+	false,
+	false,
+	true,
+}

From d4314e06d630382baee8fe672a4db7d1bf1f6615 Mon Sep 17 00:00:00 2001
From: Ben Spoon <ben.spoon@coreos.com>
Date: Tue, 13 Sep 2016 13:41:16 -0700
Subject: [PATCH 0737/1304] docs: use absolute url in api-service doc

---
 Documentation/subcommands/api-service.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/subcommands/api-service.md b/Documentation/subcommands/api-service.md
index ace2116a09..2fe58b90d2 100644
--- a/Documentation/subcommands/api-service.md
+++ b/Documentation/subcommands/api-service.md
@@ -17,8 +17,8 @@ Typically, the API service will be run via a unit file similar to the one includ
 
 ## Using the API service
 
-The interfaces are defined in the [protobuf here](../../api/v1alpha/api.proto).
-Here is a small [Go program](../../api/v1alpha/client_example.go) that illustrates how to use the API service.
+The interfaces are defined in the [protobuf here](https://github.com/coreos/rkt/blob/master/api/v1alpha/api.proto).
+Here is a small [Go program](https://github.com/coreos/rkt/blob/master/api/v1alpha/client_example.go) that illustrates how to use the API service.
 
 ## Options
 

From 2cd16d605ee3f1bbc2601b7b7406338fd37eb588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 12 Sep 2016 17:31:07 +0200
Subject: [PATCH 0738/1304] build,stage1: include systemd dir when checking
 libs

In the src flavor, we have some code to copy missing libraries from the
host to stage1 if they're not already present after building systemd.

In systemd v231, libshared was converted into a private shared library
living in `/usr/lib/systemd` (https://github.com/systemd/systemd/pull/3516).

However, the logic that detects if a library is present or not was not
taking into account `$ROOTFS/usr/lib/systemd`, only `$ROOTFS/usr/lib`.
So the host's library overwrote the `libsystemd-shared-231.so` generated
by the systemd build, causing general madness.

Add the systemd directory to the list of paths to check.
---
 stage1/stdlibdirs.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage1/stdlibdirs.mk b/stage1/stdlibdirs.mk
index ae5af5abd8..490d358b90 100644
--- a/stage1/stdlibdirs.mk
+++ b/stage1/stdlibdirs.mk
@@ -10,6 +10,7 @@ ifeq ($(SLD_INCLUDED),)
 
 SLD_INCLUDED := x
 SLD_LOCATIONS := $(shell ld --verbose | grep SEARCH_DIR | sed -e 's/SEARCH_DIR("=*\([^"]*\)");*/\1/g')
+SLD_LOCATIONS += $(foreach l,$(SLD_LOCATIONS),$l/systemd)
 
 endif
 

From 8de4af609ca5b6a1a28053a6715195a0f537b939 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 14 Sep 2016 12:22:08 +0200
Subject: [PATCH 0739/1304] Documentation: remove --cap-retain/remove mentions

Partially fixes #3179 (the documentation part)
---
 Documentation/capabilities-guide.md  | 2 +-
 Documentation/subcommands/prepare.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/capabilities-guide.md b/Documentation/capabilities-guide.md
index 9da3302bc8..edcc0bab9e 100644
--- a/Documentation/capabilities-guide.md
+++ b/Documentation/capabilities-guide.md
@@ -301,7 +301,7 @@ The `--caps-retain` option to `rkt run` manipulates the `retain` capabilities se
 The `--caps-remove` option manipulates the `remove` set.
 
 Capabilities specified from the command-line will replace all capability settings in the image manifest.
-Also as stated above the options `--cap-retain`, and `--cap-remove` are mutually exclusive.
+Also as stated above the options `--caps-retain`, and `--caps-remove` are mutually exclusive.
 Only one can be specified at a time.
 
 Capabilities isolators can be added on the command line at run time by
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 08778e647c..ec5977888a 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -52,8 +52,8 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--cap-remove` | none | capability to remove (example: '--cap-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
-| `--cap-retain` | none | capability to retain (example: '--cap-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
+| `--caps-remove` | none | capability to remove (example: '--cap-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
+| `--caps-retain` | none | capability to retain (example: '--cap-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
 | `--group` | root | gid, groupname or file path | Group override for the preceding image (example: '--group=group') |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |

From 5aca11465c72d36743b90e788dd443d508530112 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Tue, 23 Aug 2016 16:03:39 +0000
Subject: [PATCH 0740/1304] rkt/run: improve DNS configuration:   * Respect DNS
 results from CNI   * Add --dns=host mode to bind-mount the host's
 /etc/resolv.conf   * Add --dns=none mode to ignore CNI DNS   * Add
 --hosts-entry (IP=HOSTNAME) to tweak the pod's /etc/hosts   * Add
 --hosts-entry=host to bind-mount the host's /etc/hosts

---
 .../devel/stage1-implementors-guide.md        |   9 +
 Documentation/networking/dns.md               | 106 +++++-
 .../networking/resolv-conf-logic.dot          |  42 +++
 .../networking/resolv-conf-logic.png          | Bin 0 -> 53287 bytes
 common/resolv_conf.go                         |  57 +++
 common/resolv_conf_test.go                    |  85 +++++
 makelib/misc.mk                               |  20 ++
 networking/kvm.go                             |  32 +-
 networking/net_plugin.go                      |  16 +-
 networking/netinfo/netinfo.go                 |  18 +
 networking/networking.go                      |   6 +-
 networking/podenv.go                          |  32 +-
 pkg/flag/discard.go                           |  43 +++
 pkg/flag/optionlist.go                        |   3 -
 pkg/flag/pairlist.go                          |   4 -
 pkg/flag/rktflag_test.go                      |   9 +
 rkt/run.go                                    | 122 ++++++-
 rkt/run_prepared.go                           |  17 +-
 stage0/interface.go                           |   5 +
 stage0/run.go                                 | 123 +++++--
 stage1/aci/aci-manifest.in                    |   2 +-
 stage1/init/common/dns_config.go              |  43 +++
 stage1/init/common/mount.go                   |  62 ++++
 stage1/init/init.go                           |  20 +-
 stage1/net/README.md                          |   5 +
 stage1/net/net-install.mk                     |  52 +--
 stage1/net/rootfs/etc/hosts-fallback          |   9 +
 .../etc/rkt/net.d}/99-default-restricted.conf |   0
 .../etc/rkt/net.d}/99-default.conf            |   0
 stage1/prepare-app/prepare-app.c              |  81 +----
 stage1_fly/aci/aci-manifest.in                |   4 +
 stage1_fly/run/main.go                        |  81 ++++-
 tests/cniproxy/main.go                        | 209 +++++++++++
 tests/functional.mk                           |  28 +-
 tests/inspect/inspect.go                      |  18 +
 tests/rkt_dns_test.go                         |  51 ++-
 tests/rkt_etc_hosts_test.go                   |  79 +++--
 tests/rkt_net_nspawn_test.go                  |  16 +
 tests/rkt_net_test.go                         | 324 +++++++++++++++++-
 39 files changed, 1628 insertions(+), 205 deletions(-)
 create mode 100644 Documentation/networking/resolv-conf-logic.dot
 create mode 100644 Documentation/networking/resolv-conf-logic.png
 create mode 100644 common/resolv_conf.go
 create mode 100644 common/resolv_conf_test.go
 create mode 100644 pkg/flag/discard.go
 create mode 100644 stage1/init/common/dns_config.go
 create mode 100644 stage1/net/README.md
 create mode 100644 stage1/net/rootfs/etc/hosts-fallback
 rename stage1/net/{conf => rootfs/etc/rkt/net.d}/99-default-restricted.conf (100%)
 rename stage1/net/{conf => rootfs/etc/rkt/net.d}/99-default.conf (100%)
 create mode 100644 tests/cniproxy/main.go

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index a78ff4d70d..935740521a 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -80,6 +80,15 @@ Any stage1 that supports and expects machined registration to occur will likely
 * `--disable-paths` disables inaccessible and read-only paths (such as `/proc/sysrq-trigger`)
 * `--disable-seccomp` disables seccomp (overrides `retain-set` and `remove-set`)
 
+#### Arguments added in interface version 4
+
+* `--dns-conf-mode=resolv=(host|stage0|none|default),hosts=(host|stage0|default)`: Configures how the stage1 should set up
+	the DNS configuration files `/etc/resolv.conf` and `/etc/hosts`. For all, `host` means to bind-mount the host's
+	version of that file. `none` means the stage1 should not create it. `stage0` means the stage0 has created an entry
+	in the stage1's rootfs, which should be exposed in the apps. `default` means the standard behavior, which for 
+	`resolv.conf` is to create /etc/rkt-resolv.conf iff a CNI plugin specifies it, and for `hosts` is to create 
+	a fallback if the app does not provide it.
+
 ### rkt enter
 
 `coreos.com/rkt/stage1/enter`
diff --git a/Documentation/networking/dns.md b/Documentation/networking/dns.md
index e23d880c0b..6231509d63 100644
--- a/Documentation/networking/dns.md
+++ b/Documentation/networking/dns.md
@@ -1,33 +1,113 @@
-## DNS support
+# DNS configuration
 
-rkt can automatically prepare `/etc/resolv.conf` for the apps in the pod. The simplest configuration is:
+rkt can automatically prepare `/etc/resolv.conf` and `/etc/hosts` for the apps in the pod. 
+They can either be generated at runtime, or the host's configuration can be used.
 
-```bash
+## `/etc/resolv.conf`
+
+Four options affect how this file is created:
+
+* `--dns` : Specify either a DNS server, or one of the "magic" values `host` or `none`
+* `--dns-domain` : The resolv.conf `domain` parameter
+* `--dns-opt` : One or more resolv.conf `option` parameters
+* `--dns-search` : One or more domains for the search list
+
+The simplest configuration is:
+
+```sh
 $ sudo rkt run --dns=8.8.8.8 pod.aci
 ```
 
 Other parameters can be given:
 
-```bash
-$ sudo rkt run --dns=8.8.8.8 --dns=8.8.4.4 --dns-search=foo.com --dns-opt=debug pod.aci
+```sh
+$ sudo rkt run \
+	--dns=8.8.8.8 --dns=4.2.2.2 \
+	--dns-domain=example.org \
+	--dns-opt=debug --dns-opt=rotate \
+	--dns-search=example.com --dns-search=example.gov \
+	pod.aci
 ```
 
 This will generate the following `/etc/resolv.conf` for the applications:
 
 ```
-# Generated by rkt
+# Generated by rkt run
 
-search foo.com
+search example.com example.gov
 nameserver 8.8.8.8
-nameserver 8.8.4.4
-options debug
+nameserver 4.2.2.2
+options debug rotate
+domain example.org
 ```
 
-The following example shows that the DNS options allow the pod to resolve names successfully:
+### "Magic" parameters
+
+#### `host`
+The magic parameter `host` will bind-mount the host's `/etc/resolv.conf` in to the applications.
+This will be a read-only mount.
+
+#### `none`
+The magic parameter `none` will ignore any DNS configuration from CNI. This will ensure that
+the image's `/etc/resolv.conf` has precedence.
+
+### Precedence
+`resolv.conf` can be generated by multiple components. The order of precedence is:
+
+1. If `--dns`, et al. are passed to `rkt run`
+2. If a CNI plugin returns DNS information, unless `--dns=none` is passed
+3. If a volume is mounted on `/etc/resolv.conf`
+4. If the application container includes `/etc/resolv.conf`
+
+![resolv-conf-logic](resolv-conf-logic.png)
+
+## `/etc/hosts`
+`rkt run` provides one option with two modes:
+
+* `--hosts-entry <IP>=<HOST>`  
+* `--hosts-entry host`
+
+Passing `--hosts-entry=host` will bind-mount (read-only) the hosts's `/etc/hosts`
+in to every application.
+
+When passing IP=HOST pairs:
 
 ```sh
-$ sudo rkt run --dns 8.8.8.8  --net=host kinvolk.io/aci/busybox:1.24 --exec /bin/busybox -- ping -c1 coreos.com
+$ rkt run ... --hosts-entry 198.51.100.0=host1,198.51.100.1=host2 --hosts-entry 198.51.100.0=host3
+```
+
+rkt will take some [standard defaults](../../stage1/net/rootfs/etc/hosts-fallback)
+and append the requested entries.
+
+```
+< the default entries >
+
+198.51.100.0 host1 host3
+198.51.100.1 host2
+```
+
+
+### Precedence
+`/etc/hosts` can be generated by multiple components. The order of precedence is:
+
+1. If `--hosts-entry` is passed to `rkt run`
+2. If a volume is mounted on `/etc/hosts`
+3. If the app image includes `/etc/hosts`
+4. Otherwise, a fallback stub `/etc/hosts` is created
+
+
+
+## Example
+The following example shows that the DNS options allow the pod to resolve names successfully:
+
+```
+$ sudo rkt run --net=host --dns=8.8.8.8 quay.io/coreos/alpine-sh --exec=/bin/ping --interactive -- -c 1 coreos.com
 ...
-[57724.185917] busybox[4]: PING coreos.com (141.101.112.174): 56 data bytes
-[57724.186222] busybox[4]: 64 bytes from 141.101.112.174: seq=0 ttl=55 time=22.394 ms
+
+PING coreos.com (104.20.47.236): 56 data bytes
+64 bytes from 104.20.47.236: seq=0 ttl=63 time=5.421 ms
+
+--- coreos.com ping statistics ---
+1 packets transmitted, 1 packets received, 0% packet loss
+round-trip min/avg/max = 5.421/5.421/5.421 ms
 ```
diff --git a/Documentation/networking/resolv-conf-logic.dot b/Documentation/networking/resolv-conf-logic.dot
new file mode 100644
index 0000000000..fa4c1bc8c3
--- /dev/null
+++ b/Documentation/networking/resolv-conf-logic.dot
@@ -0,0 +1,42 @@
+digraph rkt_dns {
+    graph [nodesep=.5, ranksep=.5];
+
+
+    /* terminal states */
+     { 
+        node [style = rounded shape = rect ];
+
+        node [label=<<FONT face="monospace">rkt run ...</FONT>> val=0]; start;
+        node [label=<pod-wide <FONT face="monospace">resolv.conf</FONT><BR/>created by rkt> ] created
+        node [label=<App's <FONT face="monospace">resolv.conf</FONT> used>] app_term
+        node [label=<No <FONT face="monospace">resolv.conf</FONT>>] none_term
+    }
+
+    /*The conditions */
+    node [shape = diamond height=1.5] {
+        node [label=<<FONT face="monospace">--dns(-domain, etc.)</FONT> passed?<br/>(except <FONT face="monospace">--dns=none)</FONT>>] stage0; 
+        node [label="Did any CNI plugin return DNS?"]; cni;
+        node [label=<<FONT face="monospace">--dns=none</FONT> passed?> ] none; 
+        node [label=<App image contains <FONT face="monospace">resolv.conf</FONT>?>]; app;
+
+    }
+
+    start -> stage0; 
+    { rank=same stage0 -> created [label="Yes"]; }
+
+    stage0 -> cni [label=" No"];
+    { rank=same cni -> none [label=" Yes"]; }
+
+    none -> created [label=" No"];
+    cni -> app [label=" No"];
+    none -> app [label=" Yes" weight=0];
+    
+       
+    subgraph cluster_1 {
+        label="per-app"
+        labeljust="left"
+
+        app -> none_term [label=" No"]
+        { rank=same; app -> app_term [label=" Yes"]; }
+    }
+}
diff --git a/Documentation/networking/resolv-conf-logic.png b/Documentation/networking/resolv-conf-logic.png
new file mode 100644
index 0000000000000000000000000000000000000000..61503b42d5f42329aa05b57e196d1242448e8c74
GIT binary patch
literal 53287
zcmdRWi9eQW+wN1Tgk)AqW->%X$y6lsP-YEgMJf@QDMchx<`R{8C_^dAn1ocuNP}60
zWGImg`?y-`-QV}^z5ju|-rxGI7teFw_jO(8aGb|^oOkF!J@xf895fUPWxb|`ssV+v
zG7$epQ?J2qs*4-A@t-v|+Uly5W%9q<6<IM93O7YlRoTch`P(P2qee4-l$K~!sf<*Q
zG9OT`8MhU72<xk~S3XH|gXRY7@%SOOzB4y&IB$O_mho}lgXgRVUn&YD=%m#NG_C%4
zkVVDZ?&hCab<59di`VnLN*eZ7+NyYc=aoHOJ6`SCU2yJumn1Xe3P${sbYsW43}y!W
zzi25lY9{iVZL}GyqWTSUj7t3%<(Qb6qhn*!-L|9|KRth1R!;6&clRa}6BDg^9$sF)
zYL%#m=cfh^<Xcv4J@V+3^6}$>haWmz%+$U4tgX#p#6fN3*Z2nw9Uaw^Cq*p$f7@T%
zs>mTx@ssJ*t5>lRYO1PhUS506Yjh|lCnr(fLwwii_m?GYU-Xr9S=2sgR?2e|i*Xt2
z-0nO3$%C4fcK_o1Op)ubmfL8D=7^c9s-5RMF%{NxpI>cq``WT%!&ZgrvU6W1N3v3j
zsXK}Ub#GWr4>is$&h|>4dbi`}_y_hockXD_^YZepdd{faW@co>ViB<D?)$6z#Kt|Y
z>1{4wmw*46sOldc4(h4!v3;9sykqy5UJq5(^ynRIf$7nM^^vt7K5TyKF%g`Vm4%N>
z;-SCxR_&di8M|^Ij7^yHN=OLZD*g3_zwcXCMVMOpv0D1gu!ikZG=6;MnCgK8*6o?P
z?;bkFw7G<YH0(R88ufB`aB!87kdWB1Cq^UNj3Q!$^q=7l>=G8L72Y$k5&KnD=fkst
zb55y8Y^ljUly(;T+;RWdkrCPSi!OsNYTm!+$TPWTAV<T<II^29(C87*{@~mCsY;&M
zuDA#ljwfC}1m8b&ymWK7^Rv!QlMz|0rOGp$J5F3ihV{?v#Fc`Ag0@51E4OUfGWm>F
z!s^SLTUzQkRK<FgC@uH7No$4KkLMiT72d&z0)y!`1#<b%DUWQ#Rlb-}8|2(S_H+$9
zJ9~z06x-pFlR=j+Q)SpPFh-}?@@Ql{aT#25L&nKOxVi36|7d(#8XxxLz8f7cZ`(OB
zsvM&|d-fDQeAqFv%Y27P1c%H?Zh845|GDx%CW!So!br}}em_?J>%CL<k;md3(he6|
zT3VR8j#c?9KJl1{NKfaVnPt1ShHc@GrrKKVCWH6q*euQ*KOUT>9(mVi_ItMZ13~ho
z{@N>p-#<M)`~{0^Q^)-c!Z+`xFDRd;xqq}QaPQLGs(|H1kLdaXR5dj<vc7XWeogd7
zz6jr(m%y&$Xg)b1bZelvT+BX6!Apuw{AdVFfLBRrYkYh>H65MrT?JK~Q*aQsaqgY{
zS8~<+Id-2pI`o|_DJf~AoZGf<-@Y+y-AdNDEj~lR(*Jjcw`xmG&5EY@?X@+R*5>Wl
z4#)dm#E`BvGY}>bKX2As={NNyHDENKCp}+mc%&o8FuGu~%*o3`LqkI0xK+BTSS<a%
z7sEMODIzmPFua<&y4B5lmlX~_J`;{BipFOYe*E~+rYYC7z@i(r7V?u`ol5hB_pfj3
z)~;Rqt*2r$Oj+I6*SE-BOiU~)A;Hvs)9Bkg)BKUaZ`}`!A1T5`{9dR;xxIP)dc9L;
ze$8#=OC85*S0^VY7yA7<KlJ5`Y2zd8Zg`Gi)<EaIBMq-!JukAY-{CUwT%_A%g|6J~
zrXyc8pJs=KglIieiDHrToU|(c^ZlvkaGYsWTwI1l<*9C|%a<=#x3v{((WJ(Sn)1ra
zZ`R+tC_UO$5E&K4;5*$Y6j#ZK$JlQrs4u6!cGEqNUO)ENH+R?n9BGGTv$~DHmm$Vk
zdhSa^+o6yUjesB*)hH~rK@~e`(EaWm_s*S$BOB9$u3e*h_wL;`&P&*aEwsua#t)9a
zj!I0-cB5-kQBhfWW4H5vv&!v99z910iH%S`EE}+-kbLV_T!gZ!s&_;XcU-Q=M9<t<
zLDgB@IwS4i>eHW|uwGiT-au{*yl)SzRYX)&l#WB1y1&0)OZ^TFxxmuzFR4OL>b4@J
zuF>P#Z!d@6DJUwE<GrgHBZvsPzWisK_T=Pb^{b?vSQv5m_WFa}?@OGnw5F-s!h7M7
z>reGoav~}`hb{d5(3%T)Ag7wZ)gh6Q^~Ls0u@NfvbAyq4cla-Ol0f{Q=)B76jvJ*d
zz<snsSx1M?!n1$1v_lKU_QkbBa!iV!+cLB#r>CFQa|IwMdvE(2zNla+d~e>ond`s8
zwZo}X?9~k!T9G)d5sjbATNFGQQc_Y9cb(?w@f=*AF$iB@Va=n#G4`&APw$po(Bhxj
z!60^vYM4cAgk9V9m>5O|2I70RgD=88Cn{!RBVfL3h^J`82<o0)m~$y#njf3|^-FDe
zX|c$<cFo61zat|Kf;@_foNG61eSXuqa-FHEX<|}R|Fa<4jk0HNx3%JkDK7IH+uqk+
z*#M)XKh<5l+Qr4?V2+W)$5P3^StT>Nyj;O3&*Zh$bY?~d&-U%>PrrY7v7kUgEn-V(
z{PrUvoM8ymrW<LMbERj$f2xIDMJFU=xv_+o&yVJr72B;ldhA$S#NFuN^_$5tWt-f)
zL5!?H_HvO^qKGcC(4i`SzYJT4S1(`Eoc{3WKz#(~-*ZW)w&2si8tv}>Cy}xR;zw1%
zt3li(zlPfI{D1K0>y2~sV+Gd7k7q7Tz(&4y<iyO6{k4#2cv_Yj_4P*ljyXR+U&}Y&
zduG%V8Pq))&Zl86M%8Fn`t)g<b#1VK(s66+6#)SOoI-G912$S^DPdTiu!~Wl@})Ij
zTkc$1i2xB2TdNYK^D<G=mYerLyt%n~|GmdO2HVJHx#C8ej@`uqz!Qh;lC(0Og)s8P
zuETbwbF&57x%POEZSTl8H(V^q%M(Qc%CN$Hc<l=r_+x&&cPil7y_=n4Wouj8{tO3F
zOrF}YEqz^z*XK=?eHIp5ef|7c^~lBOaIx#;Vu?3z)_(fLiPT^sM~?^KB@Zw?Jsp^o
zv?+K4*L^n@T)!@{aqyfY!={`o8@PCP?P8Pn`2HMl!P?0wtfRxIw5-f}vae>NlpQsq
zWo(2dt}kl6g^@q){PL3D<ttZeySmuv>FLeNTm|ILe+y~P(jNqT(9qL+fyl<l#kFDg
z?%fZad$%GFg@lEP?&^izL>KjkaBsSW{QB*E39Y20q^#F8e@eiTm#3GP_1t8?y~T#a
z)YM33Aw6y>DW(sPov#E1tzNU9gUZ?2`RBK8W;Ql9IbT*R)mZ#m5cj5_b6?)@2nw!g
zZEZ#PP%p5k=o=iogv3$X+4<;MbCyBQB*Gl8oE%55-z+D*c&bfXqNcunE&N+OoI@tJ
z&lq5Fgarqx6GU6$T(!tHJJDNTeQ{M@{=uiN!!&o((ik^wGEZ;WBJIF1ikOx20UOuG
zh<%o&NqzF^(do@%+qX}>6fO9=&~e(vhPQHg$wyUPeXt>#Z`824va-^1G$+gL`o)lt
zY$hD%Vti6k=%uwAc(J-ehYp=Rd-g(P<c9K!ivI84@4G3ar>ApcIoKBxwE6}HR!T@n
z5Xj*0=}Af36m0Azve3_FJbuxM=B>}4Kkoy~t8dreyB-@vw@HfX{{8z}^`gcmCT#Ru
zWG^%{Xy9Se;P{A4!3hcM3JMBVa0WM3Uf#RUU=#i=kJ?Qwi&iBeicn~k4fO0i=0`=(
zb29_`z`>uSjp<qX)zRBw&CI|WCr7li3My^ZN-;7DhamPT`Az(MYx-@UATKW`pi*4z
zL3zML`KZtkjkUP?uWR@IbM;(mgs6>%BmaK<uGVvvsFyGFEEivpi+iuc#bwXWa|n`K
zA6kvXw_MoXRa!_MOuAa7CAO%&OZx9mS~V&y9r)YBzYk4g&Er7xZbVza8qXBnXv^bp
z4L`lN`uh|9CWfElLOB}{w=M?V=CRF^7+Fak?;3n~f32RS0n^`~Xz)|Do@JXlS&EdW
z7!?-b*BC`^*uY)H(82!gr-1D<@}!rlRSs(6C&Oy;Q$?N1!7kh)^BTE@cTmu6@xu0m
zY+14j;fNqBW9ux5=+Eyi>ZqnuvjxV5-l|m9k02kFt5uoQBp)3m%gBCN$dJG7{5+HJ
z74pZpt3kH~an<wy^39*m&8Xvp@y*~%oDD|i1_lO&r$6jU-g9nEXlN+B%|woA(~ixX
zH$QY}T`4Xu?m6?;w6)UDCxcHB4`7W)mGZ@^PA{N%KxkTHV{6;`)WiAb=v!JOiz}Bd
ztqM4y;ndjJh{EPM93U7rBkkBm_2cvF+P<1gaS<lmbT$J^3qSPDi|s-^Jv}vE-;k+m
zYSP|y=HoU;N91(AyF#(4sS;HS(_yb}$(th2^UaLDW!}4YZ|K#l*VQAp3UfC1CChv0
z0WPe*;P&m^A^)Y{Cm4TEd|Bu|k-CoJwY)ex+#9fLESvM$_1rlDetuN|O}p<O%Uls?
zGWepSU%q}FhuowIoS9)+<$paY>b4s{W3-ImZr%nxOWyW6`XQl&`1mylICjU64@?g?
z6&4k(ppbkzH8nK{IKiryUH0&y^xWJWH)84L-DfVRrKPn+H&EG~IAM#7Z1(j0_VeFA
zhJH!$(QA~=bUB%b4gZOAbec%8^sk|nD8B$OWz(5&P7vZ`e=W(^Mg<nfMm#yZCi_-A
zaUTm7KlY@rNuo+R@uQu>qcfkbu45J?Wysf_il+vW*B&!SXX;t*+_}@}?T4RL%ZnTS
z{2H%aTKpqA{5w}FkLQ$S>d&#R4Xf7BRX=oWkBu;}*3{H2EGaRL++{3tp4;?ezWD<N
z4vwo;%S)TBt*tliu%eK#IWvfSO&*5SQ$W?+Vq$cU9z7yS&*jgr(;v&dm;s=u*ROx;
z^=o0lmu{=VMx0G8&_M1f`6u&=oikrDq!fD^>~;Q3RQSveeDdh6D{<=L<`t-X^zNP6
zHBNapAd<5#E{C`?qL1-;PV^{tm%5~3A2r6`m(<nP?vEEU=M7k#NoZ?Lp*|?%Y^bLf
zp)k{7=sN#%M9b$*?#q+gK6J&3yQV1l9ZvBc6^5bZOrJK6|M}A`NzvyKC5o0^9B`zd
zYDr|G^3Q!zJ}xXQ3=PzU8Q<Um?!9~W?(^nmeHcXgv8U&mSXlV6VCFb2<BSix_#;6B
zJUad1C3aoRFiUUy^gEceef5PEh;9Zs>E;iPOPzi%&B$2v;6V(Mn}&r&ikL;Y*_W~d
zs-K%vB|bfIkHLjSyq2!}N0!80zs}1k=axM^{&m&<?f|D;<2;jM=U%18=4Od=70Zhg
z0n@K`Hj`^aTxTtM(HAh<b^lmQOUuEL5048va*eg;e~pWxEO*7eXQUb5$elln_}qZf
z|42@=<0-D8+`D<Hh6&=w?3z;)<+@Gmu@%CuRzRF-M=QLIRaGk&rnSB1N3z`G1tcU8
zCgcTyESXT|IJVvm(zzk6iAqkQtgK9~=}rNN2q6l;j7&)bj6Fdc8(}v!P*?0ZWitXa
zGVeF`vFrg{TpNUk03YA}FG<YI%yn<x+<&>2dh4=crwLYZ>cgXZFCV9ExHdj_=-y$O
z@Fh>99HW7e5#iK;r80U0R@=m&+mashsC6xXA?v_^poXx=o*huyLKy<mjy?0~NoaU@
zct?SyB@oE)n_Kdu?(kYZW<ebWPyt1c9<d!ca%7~ps_NUPr;i&Rtz5a%?)UVtalG+R
z)vCalm>A+fz!pQuU)!f;DN{2uad4!UAIr{>Lo@)@U|!{4;e9JRd)vtSl037+hqVA$
z?Z3S%x_<q-!8b3OC7)!$y$@b8v9b!BIdjG!O>Mo4n_DbGQE^9dhJ8=jxhx<!Z6x}1
zuOFX_&yOFz_e0FG^5~05u7a6a(TvH9uX}ndo;?Gq8bWS2$TQh~K&og}St*P%b}osQ
znmX$C?b`-b_1)d(Cvn=RQqyUH`=UqMv&QU>JP~P0v6H6^Vck+T&#8%#0spXf>nA+c
zZy)kB>~Xn$HvalUr!GCc6a{m;?#39Q48K3WSp6%8$1P>{9FOx*XtmqBT#EfRN3|#c
z#K`KetKYDLrskP^ABs_JEH>PA?G{eX?e~s6jt3~x@b-T4ysj=ZEKIvdrRDW&UH^qC
zbxnQ!1VprkudQkJ&qEkT-LZ#)TmcJ3qy#}g9R^)cjAD1>(^HS=aTHLRii`V=?ZQJs
zqHvR@slj>yMa5(O^CLoV^=Q<MEMAI5MMb00L5e=V8c_3O=-%8l>h3-JefwJaEm5yt
z>1gWd#aCDF!+C9&G<6KJ^1>M~Y~Cz-{`~oAL=erxhi@dq-(fcPU;sFVS$;cbjeY&P
zZSTV5B?aHPgW^X^xt+_Wf;*E?YYE(va~JWbK+)a=Ul9f7OYmQu*My<fb#<94wmq<^
zqcN}aEz`j!etwmdwp3YAIj^O(Fu8xzUjK5cHEZI_7O?c`R&}n>)YMcuE~WAYt}_5v
z#lF8?%^x~M>m*5KG+Z1<*)=+%fx~`YU#~uvs&4<p_jmE-;9#~tmpY;{^}Gx+SOWo7
z+pyKVO*Cp0iDOUr!HP+_eLV<Ej>oc()y1I%&pGz=(b1>p?{&DpoEOVB66r3s56eGX
zqNTEbzkNscp<@3<@0o0U^Q!vD5BLiu3Q?#Lh|lg_p|uU5SC6GH^4-Aa&w_cT1#J5I
z&AiQqo#$W9C&y7;C|{Uvntr{zS3^tdDmlC!uP>a8t*25=dZyH32KV)g2_)?esQkO0
zVpvnt!tWnVzNaHaotJY*B(>WIH4muEK0QA!5*;1QI-jC-yDG@4-%v{ThO}g;q14u`
zTkEa{gFvte>O)z3H9sacmVZ5m^ud7BPEMjoRH7a}I6&8lo(hqs_Ziv=OkKjhavT@z
z?Cmv?L!txV%Lz}$kwuG2O14iGwb9f}`yY?1K@Kpvf7IO0Tu0|x`P@Jlj+@b|KZxB9
z4igtIyl0R3Xy?7WR`1noGxGDrG<9@XPMkR5^=JIC0R9BhMm58L7z~L8ey5EcyL=QY
z%k!OH0KRg=;*A2Fm0b?Ct@s&dY9aiC`+h7+2kdA#>IK#^)nOR0mU^CnkbVjaWg2Oj
zw@E))mWN`8lzu%qS*$*i%e1O@HD3n^4_4&fTW>zhjz8|zLcDx=G%LSZ#nZD?%&c%<
z#ThsjY88u06!A2RTf-J+_nbX<&M@E%!k;*$BP%}uj`sWe(}^KO-UBIF`Qx!Odqme$
z%n_qPBOQzNMJGJd8vi={(bBWZpbIm_ON~Y1q*1Ov>!M9~9PsvMV#df+`rV+u6RCcJ
z`>)X7Yne4#xhO)lQ%b6X-LWgjP#sK(5DJ<&5NiiU95~wTwv|3~M}oQ<E|{K~$tFsr
z{ba6cQtro><^)i18jsI>vTIA%Wa8jBe9G+DP}LawOVQj^ekaGVcir7_iBHo5veMHV
z(lukABYdI4?briKLF@IAw&K6%_Wu3hGapM2*_p%GWMyR?%3%g$Hdz&^sz~8xW@Zi#
zzYngx2e;Hl8X||}>suZYvPJ&94y6Isp_=}4tYWLBMW>7{$)lh!5|R$64uShAwylq#
zS*CLv2f7)}l!4i}cz7fLKACvMgx$ZT;AMacRGdPdz3%EoWLZt{Sm}raQs=*!0ZgG*
zf|WLa3$jDSRd@ATE*ldQFFu1P(WXR;9KEgc=<HilOHJ6i^pc|Zw;#=W6V8vn57o-J
zj_?syQc~g_D=I5%=Jz6R@<(jRtzxAU_7$CNOIEFR|K&>=B-ajSrTQ~5Mwgb#-n-8#
z{$G9+DGA`%1_(gor!R1@l0mvt&+_!U4<DS2sN;vGhE4Aujh>u5n<VdX-_yqjH*_z$
zGb6N#v4h{qo+YrSr-v+MPry?7{QFQ8*C!XwZ98pl-c(|L`t-2@cb?CmKXW)gEv8l0
zRi~nrVpVb=o1!@F{d?LzNy+aC0u;Oa=_7437LgJXV>gOm7wqz-@otpxu(0;8?q8YD
zbB`q)N>j@z*u7obF?BV-{~koCXm|Y-1>usDZ$)NjOVjt}PV`nu$eiqmLSfz%xSDn-
zMqh~$95;4YIXbZ9zi*7g6MfM!Peb#dJ_Jd7oC`1SbdS$OqdJ#g`jnH{g11N-gP0~(
zhImMl?6HZ>or(KbtXsFvtjK0H=^3zXKg`X`yAm;`)NO=mU|@iOg@p=ym%v@&T;#kt
zkcVMn@?O*FCe6b`LsX~@UftZi0YO^U=a(2zwc)8-O$idF<|gdy2{vQNa_+e*6XVf*
z>ZAj57tp`3xOgRHi=3NA-YesK@DW0mdRJx#E>HjX5q8hX+WKO7dAUuKJa`E3<tB$S
zakVt?$%p+4Li&<Uq+ATCZfc@kT3Yh_oOI%9z99e)si06t*SFl+9~~EGJmBi&<g^7D
zrD4{h%AXUAH_&$-3L=v;TM@ACSzNiEfA3!Z_;@%D{^L`R4PcX%QD&=M+qeRMM;;mg
zZ6L5DesEY@PfrbWs>p)h>eSWPapb}$4Yp_#fGOHvhQu(zPO0wc*}6ZNPT9<CBcUbU
z$WQdaT@sNBL1t_DrW8N2b#}HK{i3t^#`pG@ay>>vvR0>0hohQ`OSA`3@(#=c_#9FS
z&dtx8%+16;4!C#Cwlk*i!GlZSmymJXiWOy!#U;P^IC8}N*SBsyY-1cya*l+NySw|n
z$q*|9XnQ~mlvCV*m9A(`CG9zv2|l`{VOBx2t5DFqwzifef7j_DO@cBA0vYSPXOG%Y
z;IsHhF91cto^ziyPM*v~fO-iij!;vkrA~F|h2vuJx85pCQ~`Whdbh44Z))o5#@&+l
z&;m(w_1@UP0B^7VpVLKNX<Mrje*^wsf86W;wBvMqf;$o_hsXL=QHXPSRTf1yK_p=!
zEh)~}RxSRzNr`%JqFD=YFNdTGUx4Whi=DgdU$VHIKOaBVRS?z?aIR%V)Xo!cvL6h6
z{`|7bGT>h8*bb_1`%DNoYmZDfeBbo_32Ri717E+I4VB8cj~W5UzWq8|%1<B)<>2n`
z6(ITB%Fdmb8SL)vUb)X7JrzdbKR*mQOOi+^aroa6zZ$_u0ukFj=f?=aR-~}N!wpwv
zUbisy`qOoF>w~SmnSxC(Z5<uWPswG9n7C&J>t?h+E(Xxh14POI?Ktr5o7m=Er?SuT
zcn&o%ZbB7;SQ8c(7bhz(uWe;@`(uUA<AzyuG`@s>W)zdiL!d(l*1|c|J$t4CQjrIX
z5tZ@KT-MXkiAB547&%w8v$J!czyD69-o42u8H=-XKjI&auM`#*Ub*k^qf<F``l>@H
z@Y^1o(9bc>i$}=S09X^)wd>J4Z*+y&fZ!!}@0N&1H0LC61uddB6robIx2I{8Jv=<Z
zzc5m9D=RCzqN~;T>Xn$QNM~=aCBb}nthUF_mLn*9`2_^xyemvKo3x)E7egT;sF%DA
z{6Wl$Rcjj9Eq!^A9-~pS<>^Pmr3yMU-NRSNN0mHw>Js+?$$s@%wdM7zEP(=kY(^q+
zzCT{?mO9z7%^W5{0GFTUWx=X?fySmL(KeT5@L<}is+U6+X4keLsEbhS02Z&`ym{pN
zd96RmaWjXT40@FAl@Eps)?ZwirJouPYrUG3WFA^ZDp;hs1Oe^%*grS4e2&?VTZ($W
z5^*lO!x9+h9k!>Zy{izGbQkgDU4_qXIgju8Zd)oQ5z}m8-?A<PRNz0e-I9f-VGFk4
zOf@t#TD~gf9zTA(^lbl15F%-p+>AJSR+ZT(&GoGkJMxGQarwfnTb$_2k={reT(ho|
z6E(e{PT~d7mkGa<7sR3rPIhEpMBQ5b=8c}|O*)?eCn{hVMo!N4prSkSOgE6;7m_a{
zD{BzIq)pvb)~_EPOQ1_@RN?Ioyu68rheu1jb+c2~{W|0_x=L!Q3!8Qxw|W^X%)xqb
zb=N|+QEqO;f#I`mZmRqCQ9yP^M@3N(oELt!>pQe(uE$cZp>pbne;UYTS}-yyc>kmZ
zF=1Bey9a%_zOP?H;QvN*at{7%4IK_Lyot%l*ANwK5n4#^@rm1r&Zy1*)&c~gscVJ(
zap)=cG9Kc;D}pM$&~3y34K%BTxv9h*)+$Ar3<eh7-g1OT{r0hp+2_}{i!m|GYc_1X
z2C6;jr@zP2!f#}q1EG=TM~?9A-OGi&JAjABaR!6ujFaPSXkIC-8_KABkERCja1gY=
zLvN*`NrA<BpzU00b)yX6po5{NY8#VLXjr4tL>~xUk?cSeua_L#Gf8uM2e_n>R#A0z
zb$&s?lMl}zC^Bx{YVkeCx=qKxfa%of)7G}OhTn?NJFI!}BJ+8DimJcA5@{U)h>R4Q
zwQahzM`q!JbCoq>&e!&=4G8Nk#rE3B6TIT$Z_+p92lv5DpVfu2qc7)eh3b6{89M6b
z%{(`jwtcRyQqO8@k!{w)4M7jEf>;1SC$_8NityrY-?>SHfaBn4f-^D%5I%yy^ACVa
zd)qI6yj)63YR8E;TL=jwz}AoNIdo)4zgYbw)790r(4mzV6dt#*aE?Lhhge5r>ci&d
zcbt1GNgf9pyod`uLn|IluKoD8e_|r?>sN=ZRzG!ARjIIRKSx)7UA30J4=q-$`W>1G
z=W5uiqJU+8v=N0#1DaLTq`JMGSx-+d<l42%k00+wXFVA33hRDWQ=>eR=$&!=^$qmP
zpYLo|xU`y<jTE}FZeJM|78eN(kuf-uarOHZB-haH2PYEd=blbf9uY|EK=c{5Xn$j?
zRj26kKm#DBZ)7AC9@~fGC0_?OAsMjbD}CnUMv(5*8#btWdwbgt32gsV>aq%DfI6v0
zBJQ3ac)pI1U<m5QmG{<f-gVo3tP^sCHHe6zGh<!sULRk*qC=KFfNt8M2gh|ulM&dq
z9!C9k3}KjkqWlLvZidspB<DVA1?vex>X5x6_~AFsukYJ8I&E!jgl#@)>4(pnS5VNJ
zIP2kYB`%H?{n-e_8TO`~U<;t3a7<3k1x4{?hjWjD+xL%~jy-X!N!odWVdKUShylRc
z^Ko-i@Q6n6yd0Bz9Hh|@usj=J_RxV5ybd}nk=51v5C`-}JiT>4ES@#jbujMUa=7!{
z*mR<e(Zf{lOkV)iL(Sp#wzhm078b?FUvuDodd6qswRW8ODBE4(;}LC7AVs9oyas4D
zI{=I8@$rHunp5I%EZV@_L-?<h_fH3}FSk58&Z&@`rL;6>o3z_G<=W=m_Zt*W2q^Z#
z9EM?japNBzYghR%rh^z77#kA>S}gXSIk|!xVi1#F&k7N&NgMcK_<1Pv^^_EG&<#L}
z2B*YT;B3FA>bVFH0W0JIgo|h7Q_Joe>AZK-cVViYaB7VpfsvP9q5#W4IXC)c+t^;+
zN6d_jJcJxUD9jTYJ^v4ZVYJQZ)Tw+_L5=9O3xT8t8|moc?!Nu}{uv-3O&}7H<tus|
zO-)TPNN<`44@Nya`Bn>6o8XESE5Ifh4=C#9WCI;G0T2(rj1wKcpEsfqIG>&FHv#T6
z9RZbaP9%Gw$ImG2Whpk@`}`e1X9B6q0WDQkwLWf0__g?d@DR_BD6>&W|CA7IFul0l
zy}pL<Sbk|~BMM<~1Ox;QfU_YSmw=wH<@+(wcV|!?qobw{)=HvkX+G~wgs^dAwqUIP
zQCHXEQz+p8eLI*}T?r1(J)xeJ`!-#Z8CAAXfZvbLx|?=bT?kp&9eNx`*|D=FRnf-;
zi9irFNjym7T%rBwVBOS7RXV1+baO{J5?nFbol>b1D9tGi$oBlAqJ%@NLj|dL)5l!?
z`b!{+L-~}e;o;j&sFjp>P8%3phmY)AEV*~@9!UQ0p~bO}Z-EMrO)Qyw-h0DtW^!_y
zRLz4BM6bW}zyYv-7SD~mii?Z+MMSi~38tfzApi(v=73^IUg90Lz>IMp3Cl_`iXC(T
zOk7+NcwX^ymZz+(dC<UbYimnK(7S%?)^^?lv$Yw1%NJLzwHtUII;z7iestSo20D6r
z!Y`Md?GJ>+>*ZQ5U(_Z5x}pYiy5NGI4`iixnaWPUvWL-@7k>09S1Hp-AWfW#R$E`+
zv^V4v1V;bX;(h~{#Nyz1x)egad3S?t&49xYqSd_Ivj|!(<rM#U$C*Jw)uIjqCJ5+g
zLfYfqyZF;E`pavO$Fsk;E?eEVs5pE>+R<RZHbdCaO}E`$>uL1dV33t&nnX|+VRb+q
z?I*+?E_5BF@*b~gyRvSsfXd=WX(PJLO-(0HpWeP3EthG}f9iD>^Z1w;KJ-Ibz1OGT
zij8IIe&U`t_xradGS%BZ70(_^rRB<4Ra3f)Y_GIQisa|}Nl<<RpS+EXdn93!V??%<
z_im+pJAh<I^Pxg6@$o-T-N!P;pVP#eQnM|6vZ(Mb!S-Ek2=FL@&BV{Uvs6CN(rh-I
zn_(5ZiIV1WP*7ZHB@cTbf?C%MXHe%hsit!PcO+|}8%dx7JUk>KLM>Iv58dlk=w+gD
zP+eQQ3dl%HRa#_q*9o@D%t4@wXLz#6zCJ6;!R4w8si|CGltMvaGJ=hyq9kK`8vdXy
zoj3J^wG(zrW4Tj=!!0f0QAAnU@q}mbyQik%a(!RETtTKeTIst9iVIZ@4Qhg>K#wQ<
zd3rcXKW1G@s<bGDFf#9o>jT&j7P5~${l)y{&UFDHAwKlKL7T~XPI41qgDx^M^Ml6y
zD-eL6BhSS~9J00__gTT>7%1#y3I6Z2?_|x|jWQ=$E-VL3e|x6&#~(xo+5mYfWwa;0
zLsPJ{IBQ9%4wI;)289ndWkgi~AfTVrY-kYEj5S|Hn6rVO#}(_pU5mCeTHObVW*_Gw
z!8OF#taW|sgVwPXn(?6AW~6+4eEwFa-dzQj>QE*ciLiFwKNbd4ArDd-u&hM6jUxl<
zIvYJ9oLEwo|HUUcge586IEHsZll0;DE-##mwg*+#F<J)JoopAd9gm0z4dQ(rf*<Af
zM@Mn#euQMPF))OEqoarKBxCI_@b6W7Pv80g5EN)L-c@PVwYSYGSUTBLzK4m4>EFHK
zGJRhu%g470nPzf!R>I}_w?IE5$6jX?=P31b$GW0!-3kXnS}`}Vp>4J|fD3}ZXOVlC
zLQo7C&HV-p4~&hCWqO*BH=k%=jOzkkX8&2S<5<LAlMayN!l?UMQFs(Re$39r#YOs1
zgiIcBSd(?+@flZ0aAvxM^pY7U#b^6f2t`eDLILB^l9O>;_PDB|T7C}3oaiJO8Q0O!
zT!+r05k;pcXpCYgF=ujuic>a3-r@xo`df0M=be3suN!p<sZCy5{7F&tNe9|=9qkZy
zUlp8}=Tu}^D<E86j%+|!Urh~-sE;3ymbs6`ze?U?_~iU}u1oy%Bj&AJ#Yv(-64XKr
zNtSg{fx2xwgpBtOb|S@S!#ha#;d*p556PHF&?E4u=n3;jr_4jy9S!RgDhoh!#30SN
zT4tO;n^L%0aW<Ja^+P{r3yTy=6l8z<E6zCn82}v3nXUUDWpec5S;yYJ|J27OmR$kJ
z3M;rzyh#?8+)4S3rtn)!{hPaVBev|hyCjDSjgYlUda>#0T?whF1xkxPKukr2g;D4Z
z=5lq_NoM4te$j#aC}-@o$hq*_yWU+~up^x*S~jt5#it-OMU}V{<`aSDp~+SSPi`Cz
zD{wTn2P&(_J>J?B)JGv`)N1Y9cL7Nn-Hb3GgM>f6yvySZfq{WTXjoiNN)kr&7@b&0
zN5>*0l*JpQXKeQP%&pQVPqfg%BnfHPsdoqaRVJad_{-75Dxg{;Bmhv6yLyS>%MTI%
z&pJ7;<s1wA{5JF?h9}?VqT<~}%2hA`+lwQfK7EQZTYYfhCl}-hncu#hg1MP4uW;I?
z^?vsAmoH7go2xJAB<{G=AXAeu9=5o+Soij=@h;~cG4Nb*cyeuY=!+K5YWAk$K*5;A
z0`E3nSg~pdp&$yP;D*nyZ)%@9djnL<wT+T0Y+`2I1UJAE*pCQtbKmY5%h&ey13)c?
zw9x&IH;51Pn<CAQ9BCpIGyWhapJ}ujkO}?&)|um74(?%lGJsDv;PAJf|MVIplXkiI
z)ukUxe<o~O?;eQrZ%Up1S9s<v6D_j>fnX;os6eHsmA%LmQADJMgjOB8y7Ln~;fMs&
z-p5x-y9}s?P*=_k&}O71mWMJ64IoB;IkC1HwA>Dq;fR5{U4LxHzsuz71HqjA+QOr%
zre*`&?C}1fFv^|2v9T}|L&BW;1qz;%6o8(MyU%O^iRNDX8og*x%zfze`R@IxLu8^5
zj80qB+H2_Q)*+oUaB_yD-+KpC|K!wE4VeAbN2iZu3`Vnk@2Lnwtv7&G3RsA$KSA-k
z8dWi9SW(UcF28^O25(=B7CORP*4XRK{yb)8{q#fdo#ItxRG_(t3>^49&-aK(9F2B@
z_yObzAgf4p>(AC}dlx*^>jeZVYOK{jZ^#BkkSwU&AbIPN#{6SX*_<nX3tD)O2%xh&
zSxRU1;@T$sd1J&@#oXu3wWVm>!BL?dU5CG0fj806)~?0TlXQZ!i_Ur$qA?CMNphl{
z9sj`KU~8VK1RkA`2IaSIGBPn<+p>oVjlg%v+Aj=sT4R_QL807%LRxI)3TUou!Icup
z6rjXiRjR@5R9qh4KkmW4^FlTRjqCvglRl`vK>@`DFft|GuAg0pcBm8-Mv`ay_I+p8
zsYcdmsR{@H!DNft&9_<ei^;viLC6HwIEK+2cNQx-=tju3pepC(<C}tl>Mj8H!dPlU
z1FMoY(ajRoL|^qqNG=D=S2E9hZRI2C$5PKJUN~j7wyA~?$$nI;SNDTq3JDE8^d!1X
znzrT{^elGeP__&+GUgvGV}b^o2fcs@M2p;sOjV;Kgo_KHgKSab6D9*KwSUx!MGRs@
zVG|sAt1>+tAhWM_!`|od+m9ecT}9HXX>C2kMc?5q3hgZ{KrZ$At0=Us`T^qR(C#Tj
z7ay!9QP*F*a^*@}D@`GT*m?+m=+?^n<rHHvB>N)?9)ODWOmF4s!pCBHCn0KJ2S{xx
zvQ^JW`+5(>-fe8sS$Fq3Xoy=%U2Oj<Y#`LRr~{!6)H=zKY7$lk$ETsGY5gF)--ai9
zJ)}UwmmnsY?<Y#FLhD+qGiM@jBur^);RbR{j#q;EknE)ny(Lm1e~w+JHX^{Ui_;3i
zy82<{TI#&xPzUKi!{hA=HBXx}p{5@{RzH7!7v(l^Fq(yd6%`fF8Z~IesPbsAEa`fP
zVrq-LejG=fTCsskiHZVoA+xCI{pY1FgDiS#hpl+BX>mc32qG)W0icydi5G1TkE?@r
zIsM>YL6&<sXM^2Ktjz8mDC+*cz6(G`yiMD;Z+BUoclVE2zkyac1M(%rdB4zW^{{J<
zJJ8wL*|C^gpmK(kg9XKMgi51^HUw4c<f9rlLh;n#SpqEb1uW?l=*8W@ZEE$QU)Moo
zMRa8QpW)F5JwQdHC3PEy2_D9@*QE|cIox&ArcDq$sbQdiMNf+rvM>fHw0<(;_Bvr9
zeSi}C4j<+ye(+!l&7m6TS^fR}DN8riG7%UTYMToS8Kk9g4}qfggb*4OJ)B@rUf=;B
zIeri2SOZS-2~=RbB8^DLhtS!BVpw}*Te>1!;ET&ddxgDF9VW_oBE$!gwv99BVZBO=
z88$&A5L;<<XrgLa3B9??s0uUEqJEiC-&lE`+fb8yQQroQ6$t+Jq1tRaq~T-DrX_Sc
z*A(j8xj%nudwZ)i))Ex^?&2vMt+AhqV9&6wY!%hZ0XsNWumuWcB99Oi-{Z#~(ey(~
ze)EN^x;5fDN1mb<fpjdo6NvB?YUBuI{gABSbrkui@b%;hxw<d{2*VPk?5~phma9c+
zL3CFO^&4+n1_01z1jiRcjWLk@VjDDuZPyn2+hj>F3JZgOKuNC-0-Agg5<Q!D7xTr)
z%_==X#!f*G(^oOuV<<=C7<sJLNb=jhPDS!pC7Z577b_l(!?r-NuxrK<`Sa^HuT9~|
z)T*bq8;2Ey&^02&O?^DqZ2j!=I_Sd3r#O^zy}#`fC&tup@He&ubpjBaDY<wM_egw>
z2loSf@md|KWN@Y%%4a&!`{fxgV&ET6)LJV=zPAxl4;q-qGt_lC;L)}|4c6TA;^W0v
zSgX|eQ*4s-VpN(E8~6Y7=~x&9y@HI6w{EX|R5y+&^Ccv$BwQk{r;)E0F!I;l-N4xZ
zzvEqr!ao=sWDVp<{}_c`soUGXm%cj?OwW0hkeffhw*LD}g9p3+`JTv!D4zW!10ZjT
z5QDjIEkz&K`uB^xuZzr|%R(2LW{5L|nG(~~pyhq`fKTm0R&b*o1{4OdQSZvm2_cmR
zp{hl+8mwcte2$AwPB%%^f*T%5gcQ97{VixyE=ER1lEcEXGSh%?zji+m!n8yvcsX)Z
z`+=RN8ii7~afXL9^i6gYy7b9w2<Bl~f0f~qkbyGk<EWr-Erv1OG04FHfvR1UEU&|s
zIr{63MD(4m7(vbP&nI5Js<sg3<sCn(+9Es2$sbe4sEnVAu&usp8|@INa5%he|NV+y
zClf<7w6`$+^NFdB9gNZN5{|W%m+Xo$0fmdFaO}b<HQJFO2o0bAeDd#wwyINwuYy+B
z9IN~HG0691dC5b;NiR-tCy5c6`uo8g>p_fj>9FaqXJ&Ma<oow;5ts>sHQoNZ>M*|l
z@kw>6(2$4qjLL)69{3(DS%?dkMKsvPZ8`k`OTX75bp}H~o#OY)9LJEy_0)Stqz7Fr
zfGb$V29Ry7?nD)O$Wt}yk6x|4V7bOs9V1Yu1XiJPU^N%#ML@e!R<;L?kPu9Z<Z@~2
z>IPL*C;~WMK`<YYlVXhSA=LY$Q{922Sn8{6-$w>QbW9wxf@$^KAz<5>iU){RX?^pC
zo?_+fTyQfA+SAb~!`hD?9D*2kV-U_LzuyngIEda?9YQ|IVT9nSNE4mwfy|B`O`wL?
zuj}xURv_PNn|20wy=I7R6}@ME8P5%gv5tw?YhG08X3#}Kw%HH!1(dCR`BH0f4)btP
zQBfBF%~ntV{3hYVJmBFW=uwONBE)N8;26X`dn-7I*e^^V?t{!Jkfo?02hi^DL@zH)
z;TI7=N>t9>ogV|*96%LPFO=$QAm9}m@>A3N7+DB?1XS))yLWdvsEhzH+kSX-nm_`K
zO5Mlo-LySQzruzm5CiP9v9ZZGA;8<Vd-ye9gI|_)UkG<new*HUc9ttaVb3A<=a!ac
z0k1b|k0>bXH}4ib@w%~5`3gN}?lwur=p|3zzo!L3GWPg2FGv;&<tTJ#4bvVyUTgW(
zt{n{E+_L2wgbMv=&5YWEgd|zxe}37p)~;BKgRvZ%aiEqJ6p$B^ftN0|q86eovqq3o
z_xF!4D+rf-C8Y0`M^6pJPPF(3%wASQiG-@^i`=t3c>Ml>%WZbWkUdU<Q6<d-#1mdA
zS%`RQz<iJv0!b{gcchc<Pk(0Q=e^q&*CnPBOiVxj-(UR4|Ni=nh4~Na>-`AEf?-*~
z|J}m>%if8f{MS#!`v3V!<zJ^(A&#gZb7~7D-Hih|*8h6O|8)5Bt{q9SC~A3yh1XFg
zQQq?@DsrOCJhZpxiMtcgN9K4UOkK(f4qr7Pqa!%Hyfm>qiCM4eX9HDL7ZGeAYhA&p
zOnN^{^G>iywf<Pl5H+{8F+nMrje_!T_QGxAF`M@6<Hs$40}Txg)!5SL8#k^7EHAP{
zSn+qXhA}jRZsothLKt2D2GDR*MPMaw1KZ1CRKhONGyI<@kYV2x?|`bcXjsOn^Z91y
z@;m#W@UMOT@8W;_`ryp&M2#mPqhl;u_^KJrds@$v?<TRmF@(xTC}1}SnYbH}S~M17
z)<PDY3Pi%%dTga0gaBk9F}n(lkX`z;%#6nSYC^ba|M{x{D&YB_XZ7^xExd+VgFt3)
ziU?#>MhNsp2;^T6K|e|s$^~TmvrLY>cWL@UZcmYj-T30g8t^QX3#bf)lY?<jgkVn+
ztI`c}`o4dshh_2e^Ak-003@#zHOfY4vm_2?>2acqVLBrF^D<6Tlkk;0e14rG;&BXn
zk;$gBKffN5cJA2%k#H>-56skMx#=LN#oW9ZhApbbgdP%AU0y-uRV<p1pPvfRM5~@}
zJN6?jAucWm0&*f{hQq4?PvbLJ(8(W!`lJS1a2C+<=R_|Tu(&cfY0~VNoAb;_gI-=Q
z!+-~45#TS0KDiK#3K`QvzhJ+wuL6o{^j5BcB3uBD)~e5-k%|cvRSLZZ!O;l@Hnw0g
zyMbtMp{i=HS~y1#!b<#aKlJ)BcuIw5SPKRM?5H(p)@;kF%82W@p}uM%<P)z_6gQ*0
zl&I*li%2hy&VuqcEBBOyP+k%xFw}Odp{SPA(>Y8Hbfh+nAoi}@YiA|qBp|r98fu8%
zxYu6+gqq00QD{8K;09(&E<!y`w?&o#5EK>(S+-a%w<2S-zwFsQ3Mh_AluSecgO#>t
zOAf&eo?qee58+dfu!80(QQDD-)X7na4-u8<dXaZXK@8yuh%72J;7GR?t!G0=&eM;b
zdtYFEMc6KWA)#8NA=IpwKu%>S>}8BrBKJG~D)AzYj7L^>BZBlAaFizfU-r0<vXB8#
z5Nn$ZGj)`$thk{O%jK3-<U#T;eUrTB67F~E{lj(W<xx{pSA%EC^VO>k9QOzGLkD*c
z8b&Cx>yLCWM%O?}l}cvpj-pk$^Z2W3Bps3ASM|`AO2WDpz#Js*Id?omQNox5S2sh0
zC@3U^npD)NmI#a5<NHIGq^K|E!0)K(jqUi`uojG0UpEO*W@a3DkH*RrG@d+|Rz=-f
zi`FW@-bthR^XMV%IQLlxeOg|O4va;s<+=goEpJk(F*dk3-+9FO4qO~#3cMnpQ6f}B
z3gza%J@rx7R)aW<{LMEV)URQ46LrS00ETDe<n47;jZ$E-wrEn5&SH<>?6Ct+d=5}y
zDu);eVD|Cml-Gd=_uwv7sLuP*qBPuXPq%p&9ia#0+`is+dq^YdV6%>vwiY`u1(;^)
z%}mP}Er>3_RnoM?H~uaF<_rQ%_=aYNfi>m<ut$R5#>XYG8p3DXXrzKq4J#_?YD48h
znz4YG8($x&3(6`%H>}R7pdxeT;VxCx8(Ns%AYv_X%3cTzD&+GZd<X+~ZiPac3?LO+
z)vP3P@Da02-fJFgJay>Q&_nD>m>LLHHsBv}a_CipZIQge%RsrY>-5#zx4Fs50e`MF
zFf?ohi176G=EZ~o0<V@jKQEu_;EVNW?B+IS9xeA|)Q%TxeTuJQR+k<E1?V7GAoOlj
z^p++HF)-hvNA3>3{m**=IA8N4T;0;r)ja?W)W=Vs2ogcjPFRS!;RH)W1_vgO3G`0u
z;mc96v6n&Xf#|r420iHIdXPlb%HF(fCN&EIC{pU-BWITuywI~+^LOg)a2eV*WM~s*
zZ#5>q$b>X`4v2?DIA3Q2c^a32h1#OzyAg@!fZifK+QQ&nP32N7(5oWsLLvI4(45;q
zRPDJq)74t;buJ?fgQBSJYf$YLL6}SeT^PH>t~qmB0)>bqWTY+Q>-!Q>rTMRX3X4D6
zwd$pI0j?T<L0F-trw_)!&B|4)Fzyur)-O+gv6y;cd5@f2u0AIShptk;Kf7Q+7a&aF
zQBc?d_(V2ZF*YS70=B#H-r*7gBV52hpZfIVZC}_vN;c-g5m3k|FHYw!Sd7V;nL3Qq
z+;fvo1CkSYi;<DA!onT+D<lQ0Krz32>LCHq`W2k7G&t0e5bxK>rkIB{dvJU`1h4c^
zfMCR~8k5~9z|@Z(O>Sch)!2Z_-U<>EBuiGf9O3)OGi-DAF-JFqa6Kq~gC9KD3DF20
zIsY<Os94o5W(ALg<`{`Uyhp}~NhL!DSE#6{tXgg>LkM6bmvV?ON0p1ej+}Z|xB_(S
z#+}FMUPN$)A&?8BP;uKPB(xUtsOoaBA1xSd5;HHR`u_d9R()H}(2yMj{ac{F5>UIg
z@gln0{|qBb86_(PKb!^rwT3cEOwTRk!0u>A%n{YW2Br|AiI|5p(g~h)6FYz@d`^6j
zBnyPK9pEvx28du(+V~ZObcK*3VL$pX2}DM3N!%M5$#Ij8`GFPNAVEQHP>*9FC>j1<
zi!Q^6gQ}4xjo>l*b?cN7<BQOd`1$?Qkr6X*0Un+eVQkwCn&URIuv|vRPlU7SU?D^L
zG})uQ{#!tkzALt;P4W4@hvX}$#xcuuNN#I?)d#g85P-N^wrRmu$R#Av!Y8d)+$%jO
zaOGK0gOEu+g9o76Omh>fAn&peJN%FuZcS1YX2ePQ&#)bl$B6e6NaY4mCilk*uDNVD
z!?39mdBqAzg%k$hWxcq1XmFBS5FR3du*mo}K?kx9hve{WBPbt%yGi0DbDt1rUqs@a
zh;+JuNP&sTP<Rp_kf4&15+Qxbq$*tJ&^j`d2yP@jD~kXJP+%&Ma>Pd17ZQP;*wIo3
zbTardb&>+%>}KZX!kpT@*qdd*?KSYyIe@X&JNwsyFtH_x-26diTWdBG31-+fv<Emb
zE76a>7COpF&u<+K`FZT<(JkOjg3zL|Mp2JvNj~(+#?TRcqH6H`E+cIMI=AFl0UmZi
zY<0&?%n##*u|zWhDEk5|YEW|W7Q)G*emHynyonr#aWsCjFj>0+!<hR{of2C^zl9q9
zf?OZ9b}ObJFWx;8$^Mb#S@oml)HhN<uJK_06s9lhIz)|6hg`ToNtu^X{=XA9`O?v&
zNAWHZyAB#X^R3ABP%8`zYjesI)NtuiG=@i!GRS*JAjtCxSkD%iIRF4e><?90-_X!y
zT>S4VCNQMX)~d0AWx@YcPx+?phadJ$tUbhP#e8Xrfsv5Y$nOnJO|{rqof6?InDjyK
zmkn%h5r$+ig-VDFLh-cb8jEJ6MW?)c^G40c$S9i87HcJQ{t7`V=>mFAcdKah+ig#r
zxPof1=EDaV_!A)KcYwsUh~stlR}5ZE78ynThL?pflYS*e0Iq?fajuw&KlJfciUzxE
zYf=9;1s4z40?AT_Nu~0y?DVg0z6k**_l_M5ke}9J&H?*(5&a5899GDy#a8A#!<#-J
zGQJE7-x}H;^bHO`*3kmVCi>Etx<57&qUt>YutrTs_nZvK_Ej;~Aomthci5s#AYFwZ
zTJ{~sUu`7x8zf6OC}X+9aUcS#F<n%M;Es2*tRrcI(gz;)-<(8^K5P*4^`d|C5_zQu
zLLb4cKqG;O4zO@aiW&DxP^OHi8lhGh1Y1RPfbh>tcpg#CaA~5?Lj>$Y79qKev^NSY
z_u??rMjVWTvx3*Z8f*_>`MAfXA&Mt?>5^OS<j?&m1U$z}y2yJGWcTbrT-3<=-dh#f
ztn`Nte846Y#r8myk?m(Ug+guXi)2DjETjm5SSQDa^aWIK+ep}l1xY(~(jonmMZC>h
z=JN5_%5L1fv|(Wt??ABF@v=UZzTm{G!onvpcVM#QdiGMQ`bo7PH%l+<yhxq%_1f`u
z_Ah+3S07d8(iZcv)6)KEz#`L4b(G<t@>y%k&-07@310h@l`rnBp7F2n7I={S0}%bq
z(R1Jbe4Ld*9Novy<igm%aTN0l4|VIo=40T1p3HcoPmXz-q2b|moY6(zq^qzkP78f6
z!p=jnsfJDs`$b(1FaaceLL&u^*a{7FIHsD7&E1yPQ9AZOIWZ&)aK#v9A<zS&x5?Dy
zg|*;jF6syln)4*;wRClnu~#I`s2ewELRABSbKS-|*V_~&-i$DhiAhLUn_&<N`kl1K
zVHE_QMAmd)23t%ol|%>mBY9H}`WE!ieFJmTa*k)Xv=>GQi;C9bsKJ?u$SnG!4shr$
z&S;t1m{){YLi%FVG&F&C?(h&e9<VrO2_ExGOY24-p1Qiaca?tfn4yz|U;}H$Ah+sQ
zGaU-B@f^Tok$n@}t3=6FKr*T@^`M9u-cm<1Qw)MBizlQZv=M<B)TA)E65Xn!RK+g{
z<Ne;U1!Cq^fF;ln&_YHCl_mGyy_R1?uDu0<SqB_Tq=Q)e0#F{*dPBU0o5=ewSZG#5
z$+wb^kB<~;201K<RBUpG@44`7yNx#C{tN?{&I*(&<lOv!53`?ccZTa-j%awN?NdDR
z?(JKmR{Yv|Z*#hVFo+EN!7NToTbq%IDUjeAlp)aR??VF&WuBm$bS59NU@!s~QEpIL
z00SF_T~S(5C+B}Ibu7K;D9r&07#H=rbu|EeAiOr<%r+>^QG$bmRqAc?YcMZi3xG`a
z@cpCHv_)pufCC2517MZoaQZCrW|#HJlQhoG6Q6f|pz=}14qj5Z(?ZYNLw!8DKj{F6
z7OGT2&;doJA=)JFJV6iXaP6RW(ecQDEt1C$DJ|z?NdM)_mp6VaJoqM1_u|DflqRr@
zI$*jYbZL*>dU}htX8z}7|9+yJ#kg%9o`7fpF#-W2rREHmyyZsTnt;%Ryoc#JhEUZg
zt&ETCVQ=M24zDje8UZYdWtWzg?z2qw(Jx9k2aYS>qJo3W_hJ-=C^sLT`E>ZJ8S7LX
zue)wqD>tkYhXeiZeg}tb&|OEz#|Hz_iLcz`vj*dy8vINU84?@L%*-UIn@DhA*cfEH
z!#A2wrh5^Hp_1IF;JM>XiXv^_l;jAis-TpVtwf6f4Gnd&(PQ$mCm0_Qr*cPYoW)ax
z)Y*uyG{1%M2;v!l&D14_!|~n-B3C?c;DCyH`@qgXcMPYpVm>EOD?<gqigboB9L|o3
zLKZm=+i;EzIY#HmTdqK3N8yDJz;Wo=uAvnA%$`Ad+LvQQlYG!4S;3152%;1;t4Y4u
zMYP|hsu%Kma1-(l2Xc@J2?^rgJVY3LtkL&lVPjK^h=}L_LU46=&j1h6<{+)2Zkw-(
z^p%ON;lN5Up_+tg6;)JoD)nu`z{>)wR;@Z*;Vr|+I6OSuibhCIX{lMC-IIP~R%ytv
zP>?eVv(Sia+r}Wr<P?k~>4-s&4%jITJ$)wTV(;9gn%Y#ujuL%6`gT}ib!R7=P0>b_
z8fpkuK@l&^9=Hs@WF-w{phXOX%j3A9vsroW+_^hx>&^gGll+M4kOmhZ5E5glKFjz&
zE>N|=ywgfcHzKCJc=3XAoAZYxUIU}1riQP?9F$1YTSSd!R&tURU1%B<a>u^q)!pF1
zkwE!Gz6Uw1%F*QKC#al6WMtyt+=wdCc&kREos^cI9-ADS?Q07N>o^rWqf~hr5#%E9
zAM%ryme%D6!9)xgU^<lx1SEOkjLAqP<VYNVlZ=dT%;LgAZrpQxQBY9O?aLcZk?q?v
zAZwIy_&$$;P;C^{b~ZLDQc2f{5X6oDg-EM|G&v@}`JZ>-%mxqv?7yGVOs%AiM*#1}
zfEWQqrZv=jQ5yUNI&KiEPNaX?(6A4-Ml{|qUuZy{y?%Yq{LPBZK$_%rO5j~~NJ_T$
zEWzpf(Q<~8d?kg<x3sjk*Fwm(f<h|u_m7>4#tiR9ar(1q*DeUD>JfP!4wf|zPiuX+
zD0$3K$v*=x$sk-DaXk<zc@uA^Cnb$T(XdDMIsfh5MdSr#-e@aCh$nJu7;N)thEoSY
zb&<mB_4jjIAj(CI>u=m&ZX^<vlLNasP||!8e2&!4okboK7COnYMLYwYNqE7E@9*J+
z_l%pN-t>%e?aYSu$qGqg^2d+;7!vP8wGXH1=o<B$OLQF>86gx528^a^)^ZWevh2Cf
zbV%lFLsi>ORVr+B62Y7x1FBsdPJ^8kvg~aDBP7P)!}t7i_nj1nc>63~A*b~?BQx{l
z7ymP@cUMF1KZS|LfwV{^6{KqhNvG{QcQU({ZNW<j_Te~)oEuRYzMj?&+8J&SOWZHU
zW{b6-b#;A)5I1V?_xcHgn23l93MZ&4TC?=IAaGiVx*rVC8W<ZmCB*-YKAI?912y=`
z=OBBq24X~`nFXqqD@VoEp<``f96Rva^CCb_+?nOROB=`=l>p56L`7+lTU5}3e6-FJ
z2ZCd+ff*h&Gt2%F)CW-#cS4i3y*=rSA#QMQ+eVGUU_*$JsB39qU<#!|x=uvLR!~2M
zj!5ZC&)zv>+7YG5<X#6E%zjuVW;Zkd77%^}5#pKP5BV!_jR=0Gb?#qVE<)*~i76N0
zVZJ-IZ$nY-w1cu=M**Y`!44UWEJ3gk1AihP{`}^aHu~)yJzbf)o9B_b@y;K6mW><V
zwX`~Y!z6Y3!EFs49kFn*V;K4Ws^NY&$$$G;Iq=%crY2_TT96nTcMe9O#}ul{do?n$
zAgpdzYS;m262h@m8&E{0KC|M0`s7s?C^-&(b#VU<h`D3et}_pBm2Yy=7-kPbAxQ!!
zk<*4fb2B@0MjYy-YY?~Fek^q{L!d*E$LE$WmzI^)b?WK%uXmwa0O%kV55*N}vY@h?
z#4EVSYv)RRe-rV@W;d=^C;>ncLa<Bf48(~_9opmVTa_}iv$NX@nILb=1j}%1iwWK*
zmx2|p;AUrM$7m8G&a@RkS6E0${ZA<bRmCMG_gpvOw?l)2`zhPR#qZy_YieL(qK0=a
z-holIfuYmjjc!39i_wKc>8%c5AuyK)kGOIlabs3Cwv(whuU}U&$T51l9s}JDK-N?j
zKp{CTgzeqEI|2O42*%L;MjlW#zwZe**8NrTzFZ#^ek{I3G$(uH<=esLQ&YC%WdMJY
zG40>7ywJSd0&bx3?c0+3{*9ew)7E#1RB#l*nnX%XO-4DkwE9)H&hH<FTKLTvySllh
zgC(Tp%(1x8Og)+mN<^zS4{ZNk05V3#Rv4)RBr<_RFJHalPts9C?B<Ww04h2nQJi>N
zu&h3A_u~1{j?nqp34NNNK!gY2x}zYh`6%y`G!c6pQ0bE-bGqH#(NP%Sq~N{1LRsxD
z{&2PZAVAXy%XQ<JfPzBu&zYH=>}-ucvXu0K0)5gP%&<oV#!ML>3y+8pq{LzhDo+eC
z#J!j^<#ENB0hpXitei64T_=Aip=`Md#Yv7|N>-K-4#knHKy>Y!8+Zd;8pxj*RbC!j
zTies^E~jT}Ki?nN5W;S3WTXm*=*ZA!Cwl;P=_&p7kzlkp4`Fn?v85#n#G51XTpW!u
z<tO?JP*J9316Xx{Ky*ESJ`;$afw2`X<^Xj!1TzvRKRuDzw0UzoSW#^V+@0>ZDmW{u
zs^Xmn>4>(603UK7NBTL_W!dFTq`m2&K@Xy%mJR!S2yU0X`&3}|oFAs^)kNa1hHPy%
zYQKL>o+pjmLxlA*7GC1z-7ZYkl$8Q<nGb5Q>l*xS{m)jzp|wzO$5pL4cI=pA<8=WU
zi-?0keR%bT15^pdJwkX}96BiPt5!rA<nU8iwr;&&QBgj(P2yng2SFL0p`_OLau8#c
zVC^;2oo<$SBY!%OQMA_1K%=g8g35io+I%xm&TV8J>=i#yS&CM1Fr=*w)zufkN9+d>
z&URmJ8W^wvmJr0`2*(~*eojU2hyH;y{Jgw@aMk^Ye|MoPy?XU3FDA6JXlk(h7SQ&Z
zI4#sI+g)8;?m&#f&^pLv1;HZ#e|CEMW$5Izf!4Fo!^~=vN|~|L?PTWQ&?1Q!u4;g&
za7)%D5M2gGBpsPI-grf(l%(Vxgqb!_USC0ubl^2Xa;`%faUZ^*<&uTYSt~XJZWOAc
ztJ??x=7*EuSND-)LS5Yg7Z+8WB?BssXs7YVX*GWORPp{pNC=c+64SG@Lcqc|AR9kl
zJ%t;zp%QjPtLLHHNSjtKdGo~kiJfs;2Y92iO(y*O%3KD6ANBqKODDqG-`rA4TLYYR
z_1ZPKkSgRVg6QVZ(9$|RJa^J$cGwqGB%YlIj)BT#sITu}j+JL8{h#z)B?VL>KVNKi
zZb7zDMf=z8%o#njWK>m2xIfKo1rb$TY-|hoE=`d*rIJ%f5##1}gaiZyO-3D#Sf~Q|
zUIJ{e%vtw%V3(%}&s_Pc19jsJTejpc%J1A61DtH&SccabrUPUcB04q>yW&lynZLYP
zAJ0B`^fu;^bFUsc$hWa#0}vu3fNDZ_b2lh}pH*COn`|5GB_-)`?r^7I*Mmn+b$<7D
zO~l|8qwoh)?`6^Nm!5d{<=+GIF+DSrfp#3ZN@G`70(mcio7gQDX6F467xPd$Adi%i
zmd3QdU@N*w`KLLvwam>o1qB5~mz2nKfB4Xj-u31k?zNltxDFW}XhAYc6`^W|PI*KU
z^<Ac^g%>(9*TTb7pD=tq0RKazJsxL%W&LK8L3<Ej(>Y<0^qg`=<BgYqz*g=PHOapn
z7`T$Wmeu_5;WjWd!q^WwIy#NC))uTb8-5x0D<}7Oea`5k(c|5R^4>lK2|7OgGBUx~
zuK?qHf8;#q{ugU!9+vaouKgP!AtggvN-88{mJCUhkhxig(qOD*4v|QMiUw2Wp`<iQ
z$dIXlA~Ox9Wo}7kONI=+pDXKm_TKNi_x|fWj%OeHIi9t+@B8=rey`y?&+EL7FMhrK
zsP3kVQ)9BXIL6Iy6-Z}fu<>FAp1HUB{3t#6p=4HxfB%Qsi`FWxbD0hG_2X}<PS~M+
zG`ra~K*>f5e=sUZ5XkBE{Qdo3w?4LUqkTf&TtIloH_rT#L=tvcMb_rCSIKfx|KoUJ
zJ>aX~n8vv?v<-{4*q_lZy5<&B<4=A5dO>3ql_Uze7A;#2wX!0RZu?YrC?jKT!t;T1
zCpm7~xpTB)CIT9H=yZSne|>Z{xiYC_f%nFj6Yga_IpehBGZ?_y#Id_le%!EmZ&cjr
z#gkQsj~eyS<_Yfxn(W-K-&O>oAyJ9HlVX`ZSR8ZJoba?hGt)S0)~&yilNBafO{Mk*
zC$xrjY&!5tY2)O|R};sy^YrleQ2hM&PMw}7TOLf&_^mwpD|~JeTwZU)xRPf%2gwD6
zk2-DnoL1$qrR3bXeFc~BjjOWvzfIUnCM{jN?D+oVE4j>2;p>LQ$8FuJsi$YU;(Nb3
zvFFZNy?%;}X(Z)$0)U0rxWNvK?#V6X4$yg;B3jqJbNB8|iqKi4<#D@K9jNp(F*V)(
z6KkaLJEqJmztx2Tc|9;j>JC@q3yR1Kh+5tgwV$HH6y{8|ow*EgHquUg&_+wEu7cBo
z866!3N|3t5^P4~a<Ux6D@kAks*56{>xMozsmS7bOg~jb!ap}elb?H})J(PNDH6_jg
z%QX}|4DYy*+<k+nzll-){*Ly{VoH3dx(jR_B)~Quo4{dm?z9FS<2Nb-m@mw~a6y?7
z8X0F55iE?E!?IT!$FHn>S+hj>iqO{lwY6Sih#XrXtN)E*s5)j33d)Nbw#t|@$#Lqe
zS&bA-?WZihBL>NQX4YZTty{M~f-MEQ9}@YuQ`Y?jCKs!^w)~v6X7^|FZ98^&BI*Fl
zK#JN>jELpi<pk7;(P6T6X>E_Z>|@gWjxOZ#W*}m~2Xw;%9|`Ncxx336fj*>gW?bdE
zas8O}>)#ibWLO0=BUM)+X1|aj^?^ownb<?8qZl}FAk)$+)IIL;$34DXEE~V0(Bb>&
zL8Hj4si)^M-G-)Bw7%j)z}a|8j4GrAJ2?O8FvYlbqf#z$o{EeA-h6|=yMIpVi^Yln
z-lBL?@-k$!c5{y@Q9R6g3hL)0(Tzbr2t%L^@w>G5r`#jk31)L*vZ~^44I@(V9Q$im
z>}_lUko}hSTR8+Gq8;2sEqjM3m<+TUE&;8n(ZB<?Edxn7h(2Y~m3I+JLC{D$*<y0G
zPos>}pYGZZ)m2dU7tai>|L%UXaVO~P9jg6E-a^5Fm>W;Mu+HnbIsQ|9`5s;aTaLy0
zMfAW-HhECfXDxfPv8Y*#EZd(UyEbf)`Q%u>9>{p=jfH#eJ6-b|y{O^t*6-66l^Kk8
z+?|y%@U8z%T1t@Gp0jQmh!e2L&A~T~1`aE0wzJ1xj9oY{7QEv5KqbFg_v3e(J@lbA
zn$c>cR%8Q(aR28D3Z786%R9O*(59`@nXWt=G3leVy7^!+iGN~`{ggd1XBt0!`qUVI
zkJ;^=H+obpC1vj^T82?Lgwn}^OXADS-xP{g?DRZUy*v~wb@cK;G1ObN`cxb}=F!>1
zPnUzAeW{3#o+sWubE$vwk@Fi3><dKGpg{v6-?;eIm(9ut6)ke%q}@Ot{v9q8;HC0b
zvzf8KZ(2lcfAHqIp5yxT=smr}q>RG(lwF~pL%*SaW_gdVhEOvasN=XZuj8`&A8!I>
zXD|Qy!9LpWL;rC<PlH}oG60RFbNs!t&ry>nqJ*>qg@}3C{q2%Z&q5lM3-{**R1&#k
zb!yR4*iD%I;)PS}&nG&O)Zt!wBVMnD{h0+R{}EQt@nqEVA3xHTFE}xIN5<r(_Vr~V
z(SOc^%F+otCQD&kZ4O!H{W*C7#yt&D9REx%FZ<xtXV+p1COg9x5Y0om_~aTxMjb1h
zP2*D%-4)cuR@|Ioy4Y$Q^g8S72Zj9{;5_H6;s!%Pb<YM?S79}0!-#7I*wEd^J@Lf)
zQT+UrQTefGP2)h|iD9V6VmEAPK62c+PRzh*8GBfzA0nGFh%dFgseg6v^1uGN$;nT`
z+&rdQY0%s@++)U;`<c?w13=jVs%rO}7XbhH?egT7(c%31kHB)aPEMOYoq=m^t}w+|
z=BTRS+ae#>2aaPrb+F^od;F!!iu4JGSJO+p-~c>({MZ5zpaWGUEPIE&h5n7|*!cJy
z=`(7?h>P|QPiOyi(W0zNpFQKR_xq;2nbF7n6zMkz?~*EbGAVv>k(OWA>6C|TB2`FX
zNY8X+{QZ_KTdFJI6`HHtMlQa+pv2#ou-Bz!)AE-|w;T2E(IcAjFzd&i6u=#8P-262
z?e>feS&FW!8%|3Dg0ImpH&Xnm=Ht5lUs?brxo-YV=A)o>G>zRfcVp#&eraz8^OHXn
z`-5J7q#3odu&4uuuts6S18Uj2^(_W*_7vIApR{T2TdM8nb5a+SN2fa*I4*hAUT+yD
zm@hacC8`(gTppxsp0s0f%VRGOf6Cf^W*j=PzD;$^j@zBRA!YgE#Roo~Dwy|Z`EJS?
zen>nz6YrH_A6lMsOhuTgrNvy9I$T5$1_J5YBa@7{ANo_KOp$_<Vib6xY3uA&IB3Uk
z7{-u640zsmVX3hnAkCmy@wY-qDMt&H(X%&i#xhHh?ilqveK?g8Ax-4>Q{CJKgB$J>
z=Q^iLx_Z^bffr0JBqI8?-O*?Eg&Q~4lRdv*o(y0il|5+Z-4*w(tl%u<V`-@jD2cTo
zJpMf6zauPVxAy+*HVad>PwT|{K;~o3VebudR1M&h#Jv9zrp#W?7|3+*jKZx~u3Ra(
zI=B~5=j@e5UcKK~9^6a%WpZfkh5Pq+0xTIC8dhx6E?qRn(lT)IyQ%c`)vpd;gD8%a
z@u1nyzjNZ{!r<lU=V#9&;asdqseT85qoMfl{(T&c$SuJBBkk}>w|l*?L-UIZ2k7zF
z+(OzxTr%GaeRu;f9WRejer~{$rLGb0kra7lT<tcVV+38;N`2spaWgJ&wa9ro>rjeT
z+w7EjLpc)l8#HLHV6^XMD?^Hwj`XTp0~U9sTaG5TS~7Z;0MaHXrM<oVp`%9=0UdAF
zd|O!)edg<5wFpg@*>6dWal`JVq@_iaW=t8UkhV0&bj0|+r?;FuIe>a^)VD4tQ%*sq
z42ijvKI_2tH{MxG_Y@5{zJ&JO{OdD~i4+zncmSCXd~EAtKF@sI*Y`{;q}l3B2^PTo
z^@_(YUVJT{@br0deC~n?`k&IAntnP0uBxJ<vbW6DFOt$Q)vUckNTR*+<}O{kKAZBY
zN<0xuPP}$*-Ea-=hj*Fn{lqc16EGob;uxOi$~$3c>tR*=QqIREU!HMKjgkmv;><^5
zePCYl;J$9kmv(HJaLegIk!|bzr@a^T=wGqS=1PyUSqA9B>#w&CMuA0wLP4&&XGL{q
zln|=$5Fqh!`h7;yW}gdgq~VjIvE*w=_wrp=rxeo?GVLC~h%FS|V}J~?g<tWbYW%6M
zf9+VL9%IrRU>;UH01XJ~O9aDij067y0?%K%{QS<ViWe{9FmUbRe_7}upd@)bis<3P
z)?F&UfHUaYt)m-)D!;Z?S+!~vd1-G>xDV&45#_;=@eSYJ&a6kU%&K{ilA+>Q2JJs~
zK#s>(AKNVL7ian#&0Vk@mcys=4>uYgYLzI(ItL?v*LGnu?jD}e42akkF6AQd8z*`u
zUo7j*jC`$(53@Scg#QZxoIPbs;v}?&UcWnc_Z&0!yhRyh)z3pg2O7RmFUid+kF@@U
zQ^(pR&-?Uh!YRs0wYBF(Rxozg>zggDg7F`FO84^gb^dlf=Z{zSjx__;%B2(0Z65yU
zufJAv09CXjOGG+=kmMacnvYige7;g_P&9x0t+Dpn%w<EYM0bW5(Z<PXH6n2jir60C
z{!H^)9O5=q^gH;0!QN3mi|&m~wEs@TxC_n;?fKV15G@nz9>Xa6VzJl0)mmdriS{?R
zF+DOLJ^)tL3kSC*lz#bKZ<<f<I8S4z{l#7;Q+u`HID)3aOW3969^VtUv~^%PhYIt`
zaHfoT`wi(x__b2X!?ShqF)O$|D*Kn<ITIlz&c5of9*jBPy)(=C>5}S?vjo9qFb!L<
zt%FvYbL=|!bS-clNwEp0IG;(><*XH;g7SOZs9s7glTbS5%fmQ~jcD8ZAwEF~k~gL>
z!o-rdhsYrmV=I8io|wAg+7~-v^r$;K{|gz^8l^$u48IBS3vsOag4r(;6yyR`C)zD+
z|D`MQlJe*%3*Dzq4Muk@5<l3Old!O!j!Cya`T-<}*aO&D%H>^`6N<E&LC-O`PQd`#
zT2{ENMM33#>OIkhNwwyj?b8|L@ulB`1>KdrE#q(0jv>Jnh@U22lx?9v;QH>j4l&kN
zYu#GNcX;l6=9zd@HPvNjUA<iGOM54kc!`dQ9|QiMy7p>SM9B%6I1t@9oHFW%8|(aC
zPN=1&b1@$Qsttql1Hf<3p{lG@p-+g5H!e++IZKKGnQ276`t|UIl%ZC)kIikzS#p~>
zQ<<shFe^RYxHz(;O**E^;VvNTh8(YkzuY2@B4i;q3bC1G2ei+57=vf86*sAhnGq%<
zmM`9Yx=G})ASPAw88*=#u=pI|TZ}~FJTs?Pkjg}X^Xbi>Ytcdt>AoeOmNLw6vT|w2
znki#(4h>+;;qxeuG}VE3rZBa5LWovZzt<*l@tMOwtd!8zuV(b0%AzjvF%f`QIH$Fd
zflxl?AlwNjy&<A!%ROdxCMP=o6&y>4MAj2tn@U!1y)vbeNF;P)M$Q*>Prp}b1!Dqg
z6kozua3_c!t2oQToOj%a2*K5vo4_Rzw|Zz}-fP~)i;VzbHDHeSl4u(f5gAWc_}({Y
ztEQ&wqpqxYWO*=Z+t#gv_0|gmi?vKBG!IS#3hH-Ybmp2>wAUN&O1LpojnPzyOr+Q_
ze|ga2SPq~8c=B^)+E^N3Oa2DVCup2ZUp;>I?A)LS6Lxhz>-8rNJfH&1O<LI4s3F4Y
z>eIVhccquMbQN(nhU*Xm!pm3<AD)jkUbMTuzWvAqAyF5$j^%NM*d+&p`OrX#8fG%e
zOnx@^mZ_4+>*^CUO5rB3#T9uLZ0S57pI`zu-BEB<ftC~_v!Z9A=$08(#<a&?om>#&
zR*#|o`eZ43iq+tKVjv~&T2clB`Fw<JMOcK%aVjWgRP%X+M2h1?1~e9GJX$nEGHhKD
zmbPsc2a8Z6LRi2=cupNQbTGo$oCj`z@kyM6(G48Q_;F96Sy+@5gbUjB8!6}c5;QJB
zR(iRdE>W0~faH^CxWxX6UZ|6gRY9erk56x82Xd|u*dR5LL?zuem|FDv0;L(#r#Im1
zh}xBMOw96}yA}{r`0+jtpa$e5w`tSrbLnAF;WNZ|rDEo_^C7VTfBf-BEKeWJ2<4x!
zT-+6TbkLT^Uu-pL!`r<(eFIf^UU6{?oJa-}<{**8NrZ2<`zG+WVG9-cWO4eTmgb!D
zX4;DaV$IsM=tjihkKY3kT9<#IY36(I`VFs$(C8b+C~kQc`TUmo%!8v6$YGxi{%*o<
zJ8{C0zpX-7C$XKh8*HWbc<IRr@r#JCgy5GqueTemJ5JT&2tn)Ak5Bh33zw;zMa6dS
z@^*4Ig`g}}Amky^v4UX|x;o4E?6fhvRGT)qtaW>1&;~!2Gw{m!V{IlY_i3<vddQ1x
z2shsKc+-tP&}O{!X*jFEb+hW|W(8W-8oLwMHO?*Q2un?7&1p91d%)hkda`|G&+-qA
zgjC_iPlq;AW*3wNaZGR_8dA9-Byb(Evm>`?U520w60JG{Wap!Qw4tUsXRp(zy;qhN
zG8~XiLZwW4Z@)Q0v%Au7hjFSxKJ=gRl!<q%C8uUoRf0^5Bm)6$7}G#Gd<;l1b6BmR
z2?M3=5@i-V#&2{>A(VU(I9ElTcU?Czos|h&7Te71+xJ-F7yT`ba}#4vy>KSI@*y(F
zMC3T}Vr$8^|0U5I?^?(>xTK=~{o9a=w)UN?L*nM|_e$D!dL@t3<p0g+y9R7&_<ULx
zuDkzzK2Kb3Gd1lhIRllrEQ9)jfM-W#n}m*XXAqRhB)^%NSx*eHL{nekTouW8A4zf|
z(8!|zNbboZF^F`jEzDe6`z3xzd<cyZN6R89o^L5ExFi+Bp~Hq*8pY%Rl}%axeyIIR
z&(aDPlsY)h%{kz2=4ck{qml3ns}dy~k(iXnhYW>&=K;kzr4pEYfN)f)SrF~@WYidS
z&m$&J^C@n0H(orhJoQz5ZPboPkl}X)7(?Fr9@t(N4fJxIVa~w9aM=YM1c4^d+!MY{
z_M<g#X87kTg#R9VmWZoq)e^_;i9#q6M;hdEG)?ok^_Fp=p70n5VwV4hD$BbV#!f5>
zh`%0yV0WiK{xH9Svc!GPoChrm;=Fx)+g=#?CBkjtEqD;5xb1m?510Sll<Kf2GA%TC
zBIT)HzrN-0sa0K>N`N^>j1$BGqQI0n7u4#OwOY5^qpZh`3w1C$KWXmi5W?P5_)O#t
zch9V<uCAs!kWh&aL;xg0KGG^;aLay6Z!O{WS|`}a9wyWtXwri%<7Qq3@Y?Nt{LW28
zY=krlV+ly>t(6dtFkZup(!*7WNUJ)~_ub%o9|tg?BzpnO%qHLa2t?3HvSJcAgGI6f
zi_}^v1R@+X=&aX{Hq@z&NP?6GQ2i2Oh^~O)voGAfk_X<{e#@n-w`0)L5+c7G|Ge_J
z+EhT*dPF!hUT6zOY~8+{pNkt_gOLd+_aC%0)$^+Z;KhBV)}aBF3eHN;f*Eb{!lOrz
zbP0=E1F0y8T*&-}q&q!@y0Egbv59=H+oyML!kER#kt%S>4_4Or^S~cNGgR$7^`c9=
znrq}pibA~ChW<N8?#lC5nh;a;Et>spP_Olvl7IfwGg9euy=iIgQek1d2)rYbI%7n5
zTU@8JJ4c`=*)s)8BeO%%WfMj*D}`uOW^8t{CJg9%w}0v~v*k_v&d_)1GygzA!A2X2
zJ#xkHlXI?^`Km@r4P2iznE#uPDMP;j1M*8sVy;yiJ2j(HqXi5{vY6(aSyyHQKUTdw
zy6QEh-4{CYSO=rW6&1=<Jv@f87pB{{!}p197ihGQ{z-~Wk&jn6XGisD<$i4jYRB28
z=HT`~EynJ7O7OGOrzc)l-_e1mNx#UkL0KbnkKD!kA1^r%#FeHMc~KmZkQM108>=@D
z-*=Vy0ReD-C1e$VizeEpEqGbv|3zmG6m;*=qZu{T!J|hJ|F#f`HUhT!>dr$ZD<7JO
zum2zf9^g+hWkK+jQ3<jHZ+ZBvS;>5vQ?%YxMEoWs@l9!g3OL}TZcf?ddaHkTDkR^d
z)^14Qq=+uuv+?58roEyMG91faiv;&N46}IkA#$S{syZ{rW&GsHO=3pY7o%RL3CMYL
zn>i%X;HXlpQ!lt$BdixsO7b>RhkBGoxzKCZvALt(5hF;;;eXgkw$#y4h3UI}_wEzP
z4Js;@OqkJ)`KnkHR9gJfMj~91nJYK|eM3X*b#+Ro5D&@UG7;0WSFb#=^+1IR^3vP4
zRb0&39+VT*8M%aGsZNMFD%$C`Ps{_;#>R{r_etaw+-sorkhN<YGwm1>MPwa595tmo
z+C{{4ArvA=9<D=TNZ8$%%z=g5ka0K$50V$Ubb|$1MXBP|aOmcXQ+pC<O`T2~wTrk%
zF)lJ?0IEpF0ijnipROJ1{KL@5C=aAnwuXp+A4!#%SKz(p4pHf2wu>*knj-!YgJ*+n
zZPk&<*AKU<%OQ}Df3|C&Un}}H1}wQ2XRlssEYc=Eooc5pZv_6iKZ7c|=tvx071dw9
z#FDASMbZl8M&@>v?n)DWT>3|~#V!=0v8?u!lV7U{O8ou5D_U|n>ps<^!ZH(|(8$T(
zCh!7-D<0TmGItVlJ=5zIZ%if`WlRw(%SVjSdN=<OQsQMIGz3ICcF2{>-5)5wcg#=w
ziQ2CXqap%vuVCp+ixw?%#CSPWHH21@UO70*a4Scb;}H*5WMdSAOM;3V=~k^8&{~*3
zGIqKKd6so}EYVFyTYGIwvu(LbmT?7f%JA#&5w>QHC7#CIVOwWsL!Tq9_d2D%|7*wG
zCw#Mf_L$6P3WKi8ykluSbNvfSH+EhNa9p&y81Sr68L1IarYBXG=+Rlv!`~v7FbEU2
zA^mqp7%1XLv?Qykdi$<<(ubA<>NN*7k1Y2j(am47xBC2;{L#Kw;>NZ8ylv{}zG~|5
z0S#$f$nqYDNZ8;Nc0IFl%>UDM58=85M^$a&lSEHRdmNcEZ+2Y*dv-#yONUG2ZGTT3
zFm{i5QxtyUcuh0v<<z<@kyHe_&ue?U^XC&>8{{2G7a2a7in!tMZ5u3E^0`5qJ?m%9
zZ-2qZ9+(d5STYofNE!AHb?!Q+#Td3~+>z!~tX|o6@EZ*r*n!y;L(jVS7oJ<wvdg?z
zw~Z-rWI@lB52MZ0#ScZ+jnVAL?$q4wXJ)3fKGxfEvU0CKw=e<>bz^}#IVVR!Eqe}9
zf0373`JqF-+74XS0{NtLyCCUJNpe)_eJ=HATi}xmu8k>611d-A1GWm}B8;tY4(!q{
zY8p>p<Ys)4p3{mpHJGsE>%6{#i;;zPJe$`yvdI*a%RYN3L>FJZ!pY{^xAA=%*;nLI
zWHcU7<IUZWu2UCK@UQw+7p#M20(av;pwrb5nfzj{0^Iv#S`Hb|+MJqrYAL`u(lE!{
z4N(dkT@8M+!)V#0=V*Rt8r<j3jfTK|L}y`R*kZC$rGncQANN1iU@;?^r!3L!&$K`@
zq9<5^2!BbQ;*B#8-W$Q7MdBWhh=Fsen-ILE%XCVe&;26W#}Twp^p0rRI1i`a!ChNP
zfx@KP_+9Bw=|)hVmo1JAkB$zdHu-Qkws*(-y)SE>rt_EmZm2ONR8o{0i^nPK)74Vj
z2Oob!<O%C3H}MzJ(jNEK2{T^0N1Wb@FhZL$P+}K=f-xjpoW6-^`H)JkwFfjQKbWS?
zFK*hj>C?rXNoJ+U<#lMuP?97>X&g4q8Izy({w0hb5q%wg#3&gWkkD9}6may#@z~f$
zAzQS6HKk;%JhtR9aVEAh2+}DvTCa*|)U|teRoc>8B{<_xobCDQUjmynZ3^PgB%%_L
zA)?(N9my|bH1AUp65f!6;{Y}ko`dx!0kuNxMVhSx(=N)q!T(jNIlfGM%1N5JW5sZ$
z){y_bx_`pHwm#dxY(<BN%;y+t2XkO#l^<VHHncVmx9U`Q!TS$UxNjT1n#w@l1m${&
zbnhA(ss2}qXGebY0s@~8^ad)@JNdoa4kOOSMv+AS(t|&y10Z#TSQ`XJMmF6vvI8K;
zq!;i1*D~#T7xxIqO~1w>&iH@Zd+?ymz2|9}Q6?#uID-36+hnY)`RV&I{g`g6wM<8)
z`H%kkO`@21+<u$(Vf2W|hM(1^UKxgrO<Fy`d0CGqkPIM?nubOYkPO(TCzueMrYwM8
zLZU8drVft3As$*l!!WA3z)<yZSd8;D>4He0fV?h7R8*?4xb<W>5O^n(-3OG*)|9`W
zeA`--noXNF&7HqaCIhI+-(h^>hQ+OAp+|(HMY@wG;>@1Cd!K`ucn7zLly8E#aZm-K
zEqH{}Ka!_L+To}B@d*F!!{%2h$*2?6OjSHzHDaP97dud)dH*TuGRKZyTi~pbH@@lb
z1)8_IG2g-_)$>GkX?f^U0DR`DUvM7yXk1Ir2;*INJvRo5z<6EZYql_YbjKi?{+x@N
z-r2rCyA)`81{!tloC~LTkWeQOJBZ9`0Yfr1y;~8ZBaAz0f>EF$iiNk65ioRi!BOX&
z59fvGdPZb6SOP#z?tCJ^9P)4^=W$5<0AROkztO*-$>79&)`L;)ff$^lED-N+Dzl-w
zo^>Bvt}`xhK7Hxp#Z{BLho+}@qt0Y;wh{*qokSz;$js@HjV<_&Rfzz1gjPBEl<G1P
zsHUbs=SB@tkmIk^#xtU1Bk@i~Hrex&2m0;%XmNp$TI;|F<ATa!5VuE6b|EPeI8qOR
zq;*85*SuRj`2nWuw{BHt#72zFW#St+AfGR18ddwrJ<1t5kh5{@SSZ>6aj3%fpkBQ>
zJ|3gXNIROIuR>b1ZY@Iz;3P7#%NP{+jT^wbPwxWfrthzr@B^|eYXMR!U;!p%&P22K
z%ym3t&mIA_pJVa~h+ZtM>GbFd&T)T2qRwghH6qaQ87ELPKW5M))455q!x~0<7xIQR
za%$gz7soI6&p%!K+FR2$(J0j-8+^9*BYD2J?a=~(ce#W5FjFYv>NuNNo+N#1L`nPF
zcQks`f4KxxR{r>P33zsm_NY%y3#6rxnGvKiWcnetw(CEgfxUHS?i=YlHUM2{SCvK=
zIsa*&S|Y1F(Z*&1`N$wO6R<LQ|MBC;o}BHS)O$Hk1K<DO6Ck^dKk0o83kz1w-D)GI
zfv~sZx7Uja6Yv$qmCS6y)!hBYpcP`C)y(&yuWzirEz`91Z@;aDb9hP(B-IU%v5EhW
zn%$jz*_S867baeqo|2IpMF9P!5CtO>?2;-XGPlGtK@u@g1V9Suzr^{UN@33@b552b
zfT?KRJDRDZ0Nj|N5jl|9FM&sJ!5ob0)`_LQlNo2++ukt{P{;Rv=sW-drkf+xZnW`S
z6#PxOmlJ02<0R?Io<mv)K)-};&8t3s9BftlM-LyiwX+MPUdcmrgjvN6^C)8%VqmEF
zOwiv_tWYnpJNDM^dwxfpK@O!kU}vfnAS^zI2u}NW90l#uFYlkqZqoVljln+<*uBTQ
zP8XY0zP%(z#N3sCcj#5%6~=K(;f97vDZyS<aDje!Gyp~&`7F#A%7Pq95rx^$1={Az
z`=PagPU`6JM?s3?#EEO*y9C9Mna%f@ujCgMr4(HI%wxxCXRa)v7F{>q0$u*xvwOFU
z=YJ>S>FP=F<iQmX0>w}rogr^eW{em8xXBd=+p)Th-)c-NrJX)b3)!lN>*N<_@WgdP
zV{`W`Ou<^ofIF^g-s(V~kMOTRU^Yr)Mi7cq*f&7DXwMy#?U0`u+6=|d-vSDa4v*Y3
zdi3ad?7L9Z%{b!rFD*a-PU$is2foPca?)5=4bNBQ@7q`u>?XbGNWBOSZA?IY{TgME
zFI7rH;awUz8iuBf4SLaLs>&Lg#jmx*@_+pJvMrU_Zdl7aI{RZ<myy=iLPI=T&|fjL
zrkMhoNxU{dc7<PHHsgKB?>!4DRk>QP8kM)cIsR1a3gmAxoMX^D{8Jw~&(}6u<)F1o
zFPkK4FzehtW@N2P$j*N1oClz@s=F&oV0W<DU2ZfSK$$zgiVj1hLL$Kd+_0J3U(?g1
zkPtCW9%(?~6t|ZC7-*0vR)3mH-Od$ziazu1J!x6+Nj&5p*vm-<ktw^IX!cZq21!>y
z%z{yK>~yI|yB?sKpOe4Ib_tmw7ss2TqCARR@mJyXx&4>Pi3@zRX&|pQRTsB$Ka+R}
zgUQ{?`h?JCyK^4^Rq89mAI~aShBP=0L915PK?*oN`Jt|7(*#03FFv0}Ox}ZBB3j8s
z*-;eTkC6AkmiYM%F^btsRdDy)>({TviIB@7!~L`xB~kg1A1XXbG!eSGx&fhX9;1i9
z3&1uu)obvq0<9gAFE9@jf{71Zx^j9%$)+{elzSC8>n}q0Bsq;PTdb+1*<7#b8QFyT
zA|i9xU*Kwj6B47PazrE+zIJfI?Z&m~Oe-9iR-Pa}9eiK0O(f-V0)+jGY#|9L@hNW>
zG(&-rEJM(bpvI^-LAioz|DCq-DaP8rD7AlO3`|yQfqF8=80Ff(BnT;12=dp*AboU{
z_ZzM=cIt6_)>h*JA8SSpce1Gf0#lTJTY60SOOJm#w>F(?vrxW1bc(Qsd_jVSpk=i^
zT7jl_UhThAr<}G6<nABzYwcP_83+FY?KQm{9FHdPH<G%E8vfnKk3s{<=GNLt5$6a%
z_fq@IvoShhMkOu7EW#v-F?+F(t{p|Sb^d(=HXG!amI(V~V(=ZBj>g*I#--LcRODT~
z`ex`J*OQ(9VmLweGUbsJtE=y)T-G{^GC}OV=_xFSyI&cMIRF~^)ew5M-Wl{nvHSNI
zerrccX0?+F_1lVVmhaAQUyXb24Tc+AyLR@>eln=$YcoMXasF4<4l!{jKuX;r;x=N;
zkd7PUn0u1i&13;7Zs_#se~s!EH0~vZ%0P4@K^$TVm4Lz_`GB=>dz!b}EYDOXlV<Ym
zWNw^6I9Zz-)ozd~h!ZR*8CV`_rs+PX)J);u+q7|~M`3LEh@7gliS(5uYpJ_{q)DU)
zq0hn0ElC{}&Jo6+M&BP!9(T3$@-q4dTf;?G7lQ|6IUGFa_}V()G`^XW#mj;AMG-)I
zNv`0d8ttS4@~SOnQbQ2X(1GH3(4K}7bIjp@n*RXs1<vUuquPsE1To?1!<wIc#gPWf
zId?=BwZ7kvNHKC7AZ#Ua(&p+hV=Du?Oj}X?HSEzN!)S{(p@7Ya;&~f_ra7|o>nXDc
zV<$YP)McJoX6s;ffj1*&)OU|Cnd8uyxn!jPZp5Ci$NwkIceielnCFhOveJrNjmOc2
z{QMv)u||q?*VEf61}ivNj@`=`c0fn~ARR!XHv*FTn#=RUZ#=KuBk@*Hd0G~_nZAMD
z6(w^ejhm>}hsCR#HusEJPc`1n_0*SXt<)WQ%us?*QdWonfwV|aUnTVg^M1DxcmOCt
zjsl>#dw2x$<B=LQSM+4H(<zt)5ku^mcmQlshUSpOihz_|3jj_93(LNyedBeTl3@b?
z;SjHixKpN)_11^=P~u^<X<9mb9(E;2p2Q=TJPI1lf5bmR*w1grMR>Z5#&!3nK~zOz
zw@xiMoSRukK^1t-Wyb8co)IQ<fjp>L2^g{(M~XK&3q(T(gbOMif+F>;tpq}lN{Xu7
zA-e}CA8rLD<{3}U&i>;M{5BF#+hufonfBU0BJ(c>RW(Ijf}@kr@c88Gz)7}Xge{_E
z$FhO?&Y5A~Q1r^uG7$|6SIy(3ESiVJ662n|V0H?faaSC65gH-I<0uJbf184>r?EE|
zrc9hM<_+I^id8UE;$n5fS+Pkifr)%d*eZQi;@w^oj{^>e0Bh)osCPn1uQG2&1I%%z
z8WIreOJ!<?LLocYk?N&P-pza9u$rT&5;zqK`kVk|B9T3CxZ`Kzg6;bSlcK+6<Q>){
zU}Aa!Z#g9DyrySU%V?wB9sQ!XF+8}vJON6r<(~qpK8n18_VkR;h3(5qO+zl^`#j_i
zN%9e&?Fz%RRjig4D<GQ6AU4w=i&L&wZ}*~&#-+aEL`7LCdy}X5sHZIJukXB~PUx`s
z<mmHd%XV2lbB}nDNNEdB=t%>KYmF64fY5!MP@WoLGHQ{lvR7{{$!|GNbN6&{Ri8X%
zch=bUA9@z}jH3jg(m}Mle&fa<Kphfct<HxRu4F%VOn!t(gZsVje?;}fzO;56Akg*#
z(w^8g*T$$(scRG6=QQRNPN2dPY=pLu>9)|%5B$c_E*U3E6uTm#nieV{iw)zXazaaj
z8Ja=?#BCX8qugeF$tpe@4CM*dwp8P*cI>!kA5=o0`qXlr$?sgrFV|N7w4e3rB0<}$
z=11B#udQ#8gcf33y$Xm-09XjNVT^Uvz6I0N+{CS(qgx}3cN#G8@kSY~9cTV^-ztsF
zY#ie-P-sN6u80m@{r>O2<**d&4r**snpW`=`Y>&Rqw6b&i4%+bFKD&-hyLNH{G0w!
zlleMnAZr7t_u_LN@9jfk&zvzA8pu4TIBe53#Rsq}4}f!g3({`1eMTt#x%Qj#q3JVF
z-2>WLtXOg8(^08>koeS1^e}13a5iBZ>QG=xf#G?Q(&nYv(rctm*p3*5YAWH!B$^Jf
zEe;63{rCOsMUBC_In{-PSZPOp^~VvXm4E~e8?;)RRnw<u&m2P6(ly4~G5@)t?;Y{)
zhTb#ny*%Yn(j)^4C=_DjgoIpa?77_zc6N0EM$xKjW78vwI=HcSMO`w)GoWC56ZxDf
zy3%|=P54=15Igv^b+RC`OVzsQrIQ>R?xi?X)xMfBs(?;+wi6?PNfC49{kZIN4tYMg
zK@&tV=i$S4Oq3yl3ab727oYIe20*Y%u4PL0d(EAbe;+g|`nmGa+j?u16YFZ}>8{<Y
z>|s>txn|AC6Z02n=Qwor+j~>xN|R;F9E|$*YT4Cj>E#7u%$!wPw6Zynv~5<ay@|TI
z$77!qseXPNedcnse$n0>#q%H8-7}tC?)i6{&EHOKJJDJk2F10>)%S6I#2)dnv4dZH
z@Ua6u6B`W5N}!<z6w$#3BbroLSuKjNSm$HOt{JmOvOw%Zu|5Rjc|-%(A!q*)RB=1d
zrktadjOl*z;z{O@#b}EudzwZGjWAgg^|QmnlHT-Gw%h2~>gPZ56|uWvEwxO#veO<j
zgQge)aB=c@QplEaD5C|V5SI|vy{LwuU9zoSuzeE(P81L#z7}+W?;=bKN6yeiOMU&=
z$IIIk?-QmP)*YKA3kL2O_zPmwk}{3VfzppX!9xNG$57ou5q!r|==#jwlG}(Y?ME~x
z1{CIe2n$x@h+Dzf{4smBIvq7ukcKX;)Yo72P}?^w{m79Pv>l=p0=;BHP~2f;t{f2K
zx@VQ~;X{W4kyHVM3Ljm&N71k?H4v7r#%zQzV`WvA@6a)2R2J{)2W8qtW?>9Q*kv<)
zxT|n@esRU7&6}Ul{UIv|rJNLcok=ROml01JxX#Ca{pFNeuPFoO!lu*e>`O?H(nRW4
z3NmC!@?6M<Wp}@B-yj_|d=(2U+8T_=gGIWiW^GkGm^Tt{V`rxqItc!0Y26B10A5S+
zh%bJc2zUFpKtU~@8!Tl7@7XfM9cjd_vK!aMwhQz@$~tngu&&5m7S?aAx3@uXw_YaB
zWO$KMQhZ2xgP7W4g8}0rNI)E4d{8JbEx;^|YN!WHq`+SUBT%9|n5qp1?u^TeJy~|~
zGAv<2vA)!$sv>Gg=Rk#Wa~e~=_4wjJ8!)gSy3Xva1>(t|Vsrj5xs0^tkbP<-tN@`6
za$6rZl^?)Mc0TA<hm62WW>!qZdkLe`H4+jM#A#1<K7(Y}r(tfqds$`Ygi9>5AK6oR
z!;_-WL<kP?HQ!+Hn1CSyi<s_j*B|-gj-6^qdH!tX5}wT)z<XsXbj%AoZz)y8z6)8_
za{5bLSJG~FP*=A#;cwF`8Z?a2jn)V<r11wwj-xOfxn+DRFn76)Gvhg;!^9;+iWS0p
zvk@CuEKncXlrNi!N?4r5ID5{==e3uO2t@WSoJ(~_jfQJ&PM=^dkf+XF7QZgJpr~#L
zJ9)q-n3TkJY+d(l+1{az;gTfvGUk;Blq@NdqnLl^P8;4T)|CM_r#UfFS4(foo+TVs
zYb7p!|Lv)4pyxGJQz>~Y`(!Vq`il6JUQQTJFvTOo>b#VBz@?ku#XE}c6lYe*9eg!h
zUt1~LW-MyiqJ<k{Y+Rk>gRg-SMLq&Et9S%kA$LGp>kJcS99}<)cTZVV-f7BMYwN+R
zSI`~N9O9!P)*T6#yw??3#_ibgn^3QC9-IJ_KCy_|#ks;@#Ijc-4yD>noT!3;R7`ec
za|7gng80I%@}SiQQ4|T8h$fLH6;IH%vT_*2uX2*@8m>{Z$#7!sL;b_mym7|gkI!@f
zv3q7i@nh6u$7h((y|J+hjgF%O3`S_;H2U$Q*XP8aOaZO>^2N7B%a)JnpT1y9BdR)a
z9A)6=cJ`t!GA&=V)5>aJ+nA)>h5Hd`X=-Z5Vv!H{kZ~zHNnM<Ek?5>tM6j*-a%b1I
zOTK@3&p2V$&2p0w)8giV0LUthVbMBGM{Gzry?MbjVJT_U^l|K8afNh60g?kijw_yh
z4~@kd>b6zV)l&iEK~NR1qqoyvDR~(6;4?=vB5@R7S1<?Wf~4W%P7ZO?W;$aSoe&&k
zB!#UIMg(!`$4}iI!Dh9{Xk5#jq=B8-UhT{CH_sMc8yMQzKC!1#b9EDoQ~K79VlPQy
zBr@im{Z@hJ697hU@7;)L{E=IRe|bLE9jTP;y@V&iUfFVkf#`pEMlmbiFpLq11qYr<
zHLLDT0>+_SXHVaW?jt+t?Hzt@K%m2nqKt<xSwX?=5sV8%ku7h(8!Po`3wb1d9iZLs
zz*BQM`xLVuc3Bc%NEeP@PEk@^+UPoHG^ikQn#x1V_4MqNgLE$<dyvh^px%_*<5X9I
z5NzHbFzd!%!i`-^IE-h>Go*oKmRdBW*f#!0))NzCZjbjs)l#5eq)_xo^xX~7p9-Wv
zOXTowO;}jcfp<3!Ms@jZxf+^58tIEc&G1<~|8~B{Muer}4h|VatI+V>HI*L!O!%RL
zxz1FV?39GIv1A0M&G+yyt%G-cdtZLx>0>kD%RSB%V;JJ6w*2Fb;aR;tY|=Ua5Ryw0
z6*%hZ)q)KjMhT%S02RyFf;g^R669y`KFOT=abFH()T3gd$_nGm2|$fPP)aXO{>$Zo
z9$s6e$b?u`+|>x+Ui^klNdSa~xCM%N_~VhJ_U@U{ZW`dBMm-)+2UbVpEm0Rp!-RXM
z+f2z_*#H&k(#mc4q{wNLgp!pN(<$rB@~?+(PUE_3yQ%$Q3Bqxt^zANV&jt!vYmGv$
z$x4R~|2Y%E-ia4ixy{y?m;|3~{D4tkW*%SPh1wkH$Fq`-gtLYtHo$Jx<6R|OiXV3Q
z+&Lv62olavY60}Nu{UNOWF%VPd$=gF&CV(7!jjZI)&2;E7+_U*!(U<^2tdvyBaE$)
z>vC$xtmECH*yleyanaZE??D6Q01A<Luq$HAgiW@Co?c3w2D!ube&6vHWtga1M{IZ}
z%UpQr{57Wgz^E1&cC8scLK4TIk@6rh=I!iaL=<0Taj;I8ntpTmjr?u$oCVQ=bvAU-
zQU7;}5WoO)Ll#-DKiOI0>&1&BUf6|)Rn*Z``fV!%IqW)BrLMh=>nB?X8jaX+aQW8-
z#A@3YAHsA}XgA-zdlvw>0!rNBvy0%`Amm7;_%}hf6Xj%lT-nd-cpaug)^C|7_GD6W
zaOVIUFT@A5shezkgK_xbZ4mZ~*g>Hn){-VJje1n#=C02(sCP;~Y2Am7Upg8X#4>ZY
z&Y%%ZOc0}HH_O#awjZ*oU?@Y}Dv?BS@Uff1PNWUR7jLiMiT>*A>uM^!yn*nA`fQLu
zYyVA1)=yc;MOk3TbBWn9VEOy=t!>GlU_tU?X-Hsz$7fI0+uJeP;$YOYsZ$>j6owLb
zU_+Y#_*riVriT?*A70BoLoPqsF;N|<hA`J|%BX)7La`wm3=XWqn>h6L@Pn$<SQklp
zZy(4B-fHe|N>eZXQ_$e62k-s1seT?a(PD}wn_>{MiBu<Jv7Lj%J~^vnRD#^Pbv_%s
zgVZDZ)$`|}G};#)zYXuS+a`PT-eGZFTkHm?BUTB!Os|k-iT!4rTo99GMz%rjesqjI
zd-fEYAl90?Zdqia@=G(mdRTle1@p5P#<C^h$jlp-yy@*bQG!t$T|B!GXdYnloD2xF
zqSI%ol~t7&yuHK+z}t3JYLA-)nmCk3kDzQOc~G--rA~w{Mzj>mziz7E4O#J$H^F=k
zCAX+pd3^jg!7_M!kvZZM4XE%G@K#ECLP|{c@a_G$_TuMA<VlUOnBOF@YG2pyG*n|!
zHNL@{`c%FgTx=85v<Szre(37N-EYJOsir>_cIXBW_66WA6k3DD0NO&jW4A~D^~E5x
z(gD4gKq^ceNRF4JNZBLKO0u{<+UN3J<-oRUKC4Z8JePwfrkeo$VlNrxX5bY-8HllS
zGYA<RTl4|{ID^#4n}=6M|JGNPk$&532fOPe5^>i?%&Q_3Az|wJ{l=(w{tKL2L{f0!
ztGUbW_%f|2&dt@U*-u+Q=Q5bCL0~3HVwfT#8DJ@{Db-Nptch3Dtc!D)i*?npS->~9
z-k=mYtR9(S>CZg)AS0LQ@nSM8@;lgF0DuBcV4d%`rZd*E-zM2%>wqQQi4_U+5@OIz
zY0CmF*(4+C7-UbE)U4N3vUr4MC>TCQ9H#QRWSrW2;j*&nkD15!?Xz-iW`boVdDi#M
ziRZ_Q>ey=d;3Z9I?%;f-5c-VT!6y4ugV$7AvOJmcd_L3hpr&;cGPoz|dorrZc;^#T
z9G=K-r3GTNdsFw&q(GPweh)<!8kE$#ZBqN_G<|trI~T-g=?_<+eHfj33bJ3EN&O~6
zbZu{WfZsmse7UGddL{hq!U&f|OH^o{Hg!L2;l(lzL~mlSEOYb<X#2Iowt<MKj30kO
z$Qm}gNv_wdo1Dv7s09qOv|><Q%LX1Bdtbfl%I9<cnW-@t5s1MU>2y=~=&%+T^Q?t(
zqihtl45D<vH8HDV<b$ixv}k3`w<+j29$_;)j2RECsKOaWxp0qVk<o-+DTNKYcD3Rk
zVa^aq{CJGU@dDD3xVZKxgDVprV5id<HuO9^juKSZvi_ZJJSCLo@^wX$^Znbynga_~
zMrj?8?bT17JRv8^)Cx@)Pmpn;ex{~I1bmahOP4N{hK^eYfC^(x(I?m{?gWM|yPq&Q
zCXG08Hy^qb0yFbeH_CQVVZqe24-P<Ug0xy3v&9?%yrd^X=&+gaQ_elASU%YN*NoVT
z(>tS+`p6gqez19@Z}(b*h$exbJ3kD2%R{2^BZ4CnHk18|1cc(SchMIcvO+MQgSVDf
zpWeBLcsZbg6`7MlAQGT;VfHI98rbdoq>%u1G?WY4<!58%5yVQu#weOvKle=-HiI7B
z7q*mdx@P2OPc@}>FV$@S>|$t`1DV6-_4L3093|B#zv}7FV^O%K)TfE0U-(*Y&<w0d
ziDScnW~ho?o-d;0gv*FX`ux+$Dof<!yosUwfP}*_6|daZiz_I+981(J*+qh<jJQR@
zh(G1!P(8XS8|<BUiyjHk=0d%Z(!}uVfHLcHrNkitr`cGaZEJd&m<&Y^T<T4u2|gVH
zP9~{(#vcDxSb$kFFtw|60a9}CU3LVej=eU-VZ0z8zcxe^e?6f!M(q?}$uI09l0U15
z>K-GjJV2vz+Z<>(2XcZbEa8!#CMM!3O0Nx3T^5@$j(nptZ8`9TJX3`<i1_37Z&CWl
zeN?<%pDB+3W3pV^QRj&<1vQFj)}$i`1FVO^s4RgKREvQ&3^2c&HVXvuk-Caj=bP!k
zarWnrCeD#z1DOne(-$rKcM#e|uH%AK1Et!|-ve7Li_*boNHP7tn-qUNE2|55r>R$?
z_Rvovf-JrB{<qY`?~BweFVt+;Bh*UENlc$u=F4n`&;t@h3EJ~v7we}MFJ5Vgd{|#0
zSTW9UW4gD%irH#~Qq=>$w~xV3KOE&2veKc6&``9lYC1Ymzy@^{67Lvk5cY*$6q!}}
zEz?`KZn3#`Qv9{#wSB(P;KReuP1iYWUg0&#zKmlODu6>?UR}6X$2W74l~T25_ZVGF
zYK>FqLTY$_m}RnoUB_(J(*?H~N&*PpzkfevMUafl9$r{lpPzJtQO^0$4W|89%%7hr
zsOUz|z7E(b>2>IkaMRzX{H0y~ls|`A@WN<4oqSJYEum*(;;7vI91p)c#o2^wF$1>~
zFGkVWTZ?Ha46W!`*8pwUO5reT%mXwWT^X&)(()hca^w#DJ2N|3rBVBpT)ez1hfIiK
za{Iu7hk!Sfa1&mbvk^eF6H9k)DD4wAAdmz4!Rjh%J0K7)F?jp0PVcRLj|*wR6dTg3
z_H7kc`7bR1iROcL;N8TGjA(p~N-k#pCjJ`kG@?wTC;6Ps{+Z3ymWe8)c&oz08_^+T
zm~@)R3>a!BcP1Vo`lKBDaFnFx!J!ki5Y@A|!XS;->(j^SWm_I73-ktx8_nFgQ=axO
zgQ1;|EFry&xMcVAq7Q&yIOj1BLqX=+oX@WC5Aiojb%ff$j7dZ_)U48*Lwk>Revtm^
zJtNEE-;)x*Kiv)%&%LW7%Q}KEc+_$Uwc~GBhs-0%^YN{S9)jFbU9}(gNBX%1cG<Bc
z?`6wMR{Eu;_BqKMeze)vq(es&4=rxsHtFxA*<<{ZE)Jd)GtzO;lCIv(fAju3>JcZ1
zZO36ET*3%&^V{zwCE7=-aVzW2571+VvkS4(h@R%zY$kX@VEfK;5JP?c+BPE?1cw0B
z9OgD=&dG<!K!SJd*ztY*d761E^65F=$oWw{P8*=wJ|~N`Q5u4mWmMcharg^1jYp!?
z!6Dez+*v*bM#b>#PYy{KTG22NvoQGO^=x{d%c0-nd}wMorD`@y>{<bXFMCwxMm5G|
zab}7p9MonF5mBXmuwl1uEg7_lgl5uU(!zs=<_X(ongft|paXl7ynlCdD!>-}cMZb0
z9)<GH>^f?)9hhlOznMQiuXHgQkf>(){q4#cjdsi5t@16886SN1?8=yjlN7RXSzK6U
z8PyZgrJM>&<@Sur4kbrp`xJ~QV>9~@ldzCU{Q}P&tY#@A9)MVDfylyvO6FHpI)WCc
z8nbNq>lgePnp1&j@F+!>@C4E+FE`ghL`y9zeYc{<nIgODCT3jOHDJ6<j61qc*+zQ0
z!8Fc$<^tC6W5NK`-rpS6W7cbX$8?1iFw;3Osq=)-^AtGenKTKGj=om!+Sh~L+_B9o
zR}l0<3`UfkiCUfXYOFgAc?j1@o-T6qlv|y;jggUaMrqdd<2%NDTR~6m@#)o_67$8=
zW*=3HE}PS?-@L)fwtln6IKGZh`@>r&E4}kv`lk=OPQnEmFL^UL{hHtP&wsnWjRt5D
zX^{tI`jhly4^lp9=OW=;%L8!A9yj~GdRm$8)(sngZo%2xkJuoA375(@`q~-ov4d@i
z-5SrAs-csEQ4G?Om}4|JjTKK2CS_0!YY_PIfaOkASEkAlWF7gD6<dK>^c7)rU27ok
z=QEbgbmTdtQoM`rC@%6iS18iQ9f${O+Y3kwQ!@%mVKO{q7*HP(w@Y7F{Pb5VbQNLs
z8@CGMwilJnVuw2W+Fq+<G1ImNMSWvVTj$Q|-0CMZ#;q)sGci4SkDE==Hy;0Z+OV}$
zRpFdozAzh%)a49v=|uscTBkhYvwPLUnnlT#TS;Oq5rnFfRTku=HBqpRr@G;s-?)*Y
zIxF=CNA&=0<Uz>pXHXuafh*{`k7)U{|Ji6OwOocxVZL~Y6Li1ckog%_IW)%^=)lMO
z<pWtG;(?4c+OdnGHZZ*g7HY*iSo!FE%B_BbKHp#Xgl@<2O_}p|?6y20Gdv)x8AEkY
z4MDaza!ctWn22yDJjB9xji4nA$C`cooZQjkU`n4!VRvU8^G;1qPT8d%I6G1;`e7+K
z!t3-F{?IJ{2R|NO1Ke+TW>7(4q4$rj9XoY;>8jTC;dO?fFEn-G^+u-7ZbI2?C>d(y
zs~0aiQ~so9UHdUesW#jYYhv!bSyFSRe9)P*?JVyU@>4V{zyBSyjO^P!SdF2o)(T;$
z&SOzmU-32L4j{3UWT5uJsQnXgI7(vvbDR7h`rxH*E7N(p;b_f@+F=bh>SyD7=g$vC
z<L}^IQ-c>7BizY(CTKss{U`sdY3H=kamto&(RZ-lF{WFTa1{EiNTCMM*zA5O#<s$~
zq?a*V(;nl>5Ve}`Rrjg7jL}5arauPcRF?D=!-LS`Uc^c1>RMJNji$LSf169$?{z=p
z0PU9ql$bYM-)7!jbe#Mg%YZqI-$PS!OFR=BuQVJami6v52Q}_@`2f<BA>H43thSyV
z9TT>_es1NFJC<fEPP$C`*QG2nqexhB_Rw4J2?1Re*3{lces(LkflEW8CvB@%30!n@
zcu&SsFys{B6Y~+sbY%$y>V*k9_4y%dv-@Q|G5_}Jce<V-Z~R1VjRXa?=cl+mx5$br
z_Qnn~CQW<uHq_?R{0V#TZ4BwO+qW(hsH)V;ikh^Ge~?HO3kIc8RzK!iD1Nqa?8^is
z0s_6BJ=Lh#&QbB(KE4mWf3tFlR3azNUgdVp#}GRG2P-&q`UQ@hGNmT2?DN6u)CD!h
zeW{ZG;J99%@Fb2a%oR+lnfdHM-CTO4F@`_2A_O<aKG5YCV7b(U(84-1H)0E;sjgX9
zCuvaEGX14cpmE8$ckg8BHCyeh{_mGF(Z`INjd!8<%%bRCG9t%j0g*4DYlMUGq~MM&
zZq?h7Yr#^u;lqYC5NC11wlpqe8<T3&fg^V`Ek5<<fh+$cUHf)#YF3!P`tcs6ifoEI
zUFu}tY|nve^(*)hQ0FZubi!PI<iqPbHXspT?8AG}8`%TM#^7K$aV4gnFV-70PI=Y-
z-OEx6?&*Z8)rCbulYY{v@Bz<LpD{fg@boBv-=Wr!O^1q~+j@Q?k4!AQc;Q0Q!Ks^Y
z1Qw@#St#_uTl7KPA=$_amFU4k`EV365+Kpx<eQ?(jO0V%bL1j;vT#=52t+qutqUs=
zfZ|>L9wT>ipLPQV3}Exr#dc&GEqLkki23R$P@R4ufXH6g3*T5ZwlA-FILH*e;hDDg
z-#$l10=6l+fco+r6_J-uH(9pIe?xw9JoJtIpA)^;o<8lrtL?G&hcYu|C5*6}&~mb5
zP4<EjWmWzCe{}4BY?31diO${m=B$p)so7I^Sc08nmvv@dzn*>i(L~eNO>&MV9*rRq
z`7f{eeCyh^x2rT#`m(uV<@fi)^LGzR>iD@?>fbZJP@;H{_&peK%j0NEuBK_8*|gux
z6xk|9*XHuLiXzulW}!h@8n^#>qT6!Njir7wXC~cdIxyy55iOpY;vCpfh+4~bOE+)Y
zq^x*?lJ)vs*Tt^{ByU$k16eoV3)4%$w+Cd}!D`~fi6IMhOns~sYWQ-sg4xhBHh#a#
zU#VW*x>i(`=O7*Vm$pj^_<s8nEU-G9?@g_#y=cARawk33Dmsvvma&%ZhQZ`^=g4<D
z6Kg<QjDBR_UwN7CawzpV;3U&(&FObC<_#=&{M1FGb?Z)SJ8Cc09VfRF((7{wLOM~s
zbqrSXK&x9@FQK0ULbt}bBwVB-A_6oQWl2bUd^}abL6Y<Vda-p_@$6uXW^L(-22C_|
z&1=3dw4FTp`}JiQOLY^)1*YD6j51#Qe3^Z=-e<}*qmN5dQc6Sp)4i&*)hwZy!pV`2
z%e2Rg;G9s=x8g;sQP<WMYEpiE0ggLQJXrMMA&)evYUc6pgJMQ@pwX#)N>X03QOzZN
zcz((3!y&%k7oR+OcYDg+Htn^hPx?D{@vyMfWu=>#dDT1f{llpBTefr(ooo6W`_C%}
zou!;2Go7Knk|F{{DM<qaq=n)f^+}4^%8eEJ-25(#D4zo@8A{<7vT@@^=OZ)M<Dh<7
z-|^nM*S9l=K&GvcDgmM1*D4ChaAssL>E{%!P==k67a;H4tmhDA+ZRWB0eyPl3RO2i
zB$8INX^efYZ|K96wdkJf43<jf34N{yv7&AO1~JK#_ejZ1IVq1B#9Ix(Tpc&b9cX=|
z1CVl23^EWP+s;v@8$`I7C3YRYk3(AP^eY+wrG|hoobx1Xar)|`lsrfp9Y^mnb%Y06
z!{>^uToUH7IlGoO?K}5D3&sT3oz<ZrLB}vf?)us9pUVcJDpJ?fG+gOYls9BrVQ)Y<
zL2D$ahN#|dX6IOM!@704kb|{tCi5tK+jRqWzrAyKIJB9Jc&iK<GK2xN9$f76JeaIA
z=I#7Hu4h6=9bJuvR8o|*2j+=ddku%Pam>i7>)RR4><&)co&WDzZZfb!^Wlnb=>U7t
zV908WXS57-cFZcB{&YDY8;T9P7mIo?260;8cL%SM6Q|Qy-|RAPWjhOnTyTg=L>lQP
zAF@sTmAr3GZ*05t-sD}2PxiUDz387qb5IUVN$IB6ty*=If=g}&v2Q5R?pYnPX4Naq
zD}KBu^h!yLmUbefpWX6LcV-~=xBY{yEk!4qyzHW!5}fqYz~tXZw|nHC!spMQ>qBV(
z(oz+p4nUqFYO45n&&a5f+c>XN!wq_u-Q}KBEs#i)_k?B5O7E^c-3oXkAe2bHS^k@3
z?P4{?mTU$79tRP`OooiW!%nh}ia0!SOIfUFWr?qrNPtm|D_{ylMN0qDQYZ5ObL3ob
zVRpS=e{Xu?&%{I^b2ln@kkF+S=5#7U7cV|~>d7^I<%}xxz-FE#@n5bc$N@w%BwNAo
zj{L<_f!tJG*f_UOt7-ML-n^Y_Q*yMr7x3Ocz7;aLLu{G{Jo24EMCRh6JQk^&v?Oj>
zBd7-y1TlSt(uR2?IGs3d5Z~WTyiO^4Wf_Cy<czgVdVgHJqhh|{p+mKk+JH7pei5JC
z8FCg>5?os>YnDEnY;Vs@13Rk~3fi-HlP5<H&93SUtipXC!0bp}%4DH&nFtsP$W0m5
zGC4dc^CYSRfw7=~km}R{Aw~}{bismNvUZH3XmySex>;F?LcaAly*j7h`W%gcQOo>#
zPuBhqsR#!JvLWF4Za-D%Gzw|c{&rDeTKf?f=`y3jyT=StP-(ziWQ0&F5EEnW()LDB
zaWga7*+u1serm?>{H7l1k9%S9fWwvSXkn`CAhy$r0Jh1X<|!W#VshaC1jt`7oF679
zgA9s80&JKJ5Xyk$!-sp?AJpM1Kjz;Uxy9n6GqcFG(Ac1Hr>oS{IwNFd<m6(mlz@CM
z@K(Wb#f*qo&3R$ZlUt9Vu<c^IkL4)#RR5x{3`U5ZY%Tk`)D*&Ito5i-_SsGL7H(iF
z9NxC%>r$;^?c5@2G?*x5d?1EWxiYXJn(%z^DyU3i{pRskboEk3f$ZS;5rPte-^Fo8
zBY_DenfDhVRUiMvde{QCbTZcS8qF+lu%L2$!Wgx#8Bk5sAb{no0AWyU{hMmC)!@5y
z3_VK}(PsdXMgyOWHEn-#q0@b~1+N^Y`58$nJ7(;%TkIXa0rFa`JScM)tvE2Ojnbtq
zjYIfMndTA51)VA%d?D_jD9w6>C#fS1h{>Nq{W%{&nabmgxD5T2R6syRzYEOEiw%+Z
zxKmO@pL#ZHOz$My{H)Gsak=$?S15q;e!pf`k1p^(!~|AN(egEy2{>#6Xy?T-nDfJa
zSc05QwpmId1O)1F>7iK^mT|LO&G8;tQTAR6Cr;>$d2{dCu%=}lDbAK|dN1_W%<H;n
z%<})u^G~f&*Q@((+!u_h12=Bekhv$C3Ys|~%RU&oaioV%nbM9z76f_lvSr!wDY9E-
z`qiD`fHDqTolzT`2A1EsefvUOPcUh4cX4b0fqrJ=`|Z>0gi8i{mpQch$&`(3*<v&q
z;6uC<7JTup7-ycefN}cTJ!CNb(sjRB5SH>0m{8C$@}cYLU5784YaNK9XriQ9k<{~b
zKB|oI8NZil*#0owvD%9iymR%);mYl0%cAJ=L>9bz`G*k+qx4c@(euh0Jh`yk00+O)
zI_6p{MiU=4HrynWCL0V8)WyQUefS<i!)=>AT5p*ZT{*xa_ebbLsv+4OytKtZZqg7p
zjYPX-nF15_{g<+{KSR(#7`ilHzZuoCEYjm-pC=Q%^snr^OEs_@6y;*vI~iGH4-2jk
zBDt{fWyVvUixCjs%#gE(R@J3Ozok|Ga)&O9Lc!a?zrxWwi%|g_+^fFUYfiGqQ}i&1
zdSXFZDKh&qLizHv>d!Xc6*M^i$j;_GI28^O1n=dB>0||z88O9RM8)mQ_?rpM)sK{Q
z25b;NBGG8k@Yk-E{E)N?2C)J3KcaIbTr}D2+87xKL*^Dpo0$X8@Ch$I=W=2}eXtb*
zbPhL2-X*Ogz43_5?LOJjZe#GF)ninFupw)jkUsGjqW_Elsp;aPvwm#nf0G`vx;_r+
z8JI0y*P1>l#r>Y~hY6zuLY!@+i+a8@!8C!9Kv)F^T4OPJTxakivrH!=(mb$9V6@>c
z?b`ywBPbFLM)+d;2d9oMLf>n{e<OAv@8pn*p^n2U9cL?9a0aYsM1pZ-nwVa?Y+>cY
zvx6S)4D+)6Iw+gv6^%#-u)vfYQc205(lTj~I}yt}!_d4B(WzV$qd^DkQcFk&j@b@-
zhdp-xv!~ce&C#^7$_leMxH*gc*FsIddzXWl{+a44I<y517lUT4+Erm*-f%h+u}L~x
zvrsRnUPe@)ztcQX^~KAVm+Y@i#$b*4V}(pTd3Re?IP}Jd@qZqlKg9KXJjYb#a+z`v
zv&f|?nyUxv?aj^~Amnq4>=P&4DI={%kG4VzAUaq|X~DL6%&;#{zE3aS=K|X-s{+t3
zAsE3ax*b0gUDAeBb2asn-y2xe$5HcQ94?yW9}bO|@J~eng(Z=R!@a$Wj?Kn(yLLtL
zN>ncO=d_)8FyjX5rJCsI)xRmg;Xq!+%u3ED;~U~;LnnSAbr)Zyvr9+YND6Aib)q7V
zzcF}&0p@mk=sk%2O;%Z1sUTHxE3$kHO_w?2nhxxrKII(L?YbfVs09Yv+^If|se`P%
z`p-gxj9RV32rH|aP|=yx25KNz*<wbZPHU;sU&Fj}`uFP7!aRctbqPKT_`o+(S0AVt
z-)dH{Y#D{8MED{uqjbPLG}tcLA8@mLy($6P@_!I^p%Jj!r{U!}P5puTAHhZA25w}o
z8H0=e5@yc<o^I;Car;&YuJ!99YpL~_BfirQh-c|P@3J7o;^6wjnVIW{xKm}AnVCs`
z7kP_n2t!Uz*`vMo73J+=_@9b;J<bofKc>Gc++WYiDzbHun}!EGD%=eWf!Jo%hBld6
z;VwgHK_$vx@QA;FZG}K;G9)ZIPQZ~3ZGZMlN6C3Br}R{~7nXYDt;a84rkbpJi>~}x
zqvie>KGL%IB=0*2fGV@+q<(_KKiZa127%US?9@;<nU6ZA9`N2X+X6!0e+qgX-XZou
zE#eR@#6gGq5CG_V8!K)foxP)!M8io=j9j9$C<54f`Tlo|Ut)<g1m;CXxJd6vmaI3N
zt8&>PcGzOqL!d#X4neURF%f$)R9Ruf{nyj0-&48rAgxVNZVx=!2q~hFMOFHbG?jhN
zzoe-nqmxiNf))<vQ~pEGE20ZTX?EFWXy`P9bn7TY_vVy}hXuW2D6&HMby*qqOE`<I
z`S4odY)pzQp8LObyTn`RhtUS9+t$m|wQl*3x^~D=M(WCK5Hr@p{UKpgLXExoskiq}
zXwbcI_9#R{P}KkWW9N0PW7x&9X^8t*^XU*)G3|a&DUrc3BbSt`ooo876j9au`KwTM
zg3n3CE6-u?umFp7DPzdqTo`ecmq290{cZ$NN^0SOs+uJY0fD6M8pi2nXJNNy?<SmC
z-oN1&HN3dzS8Faam==elK?`0bccPvGWNeamqf=U4r;TaGq*K$SdNZK*IqII2wf+1)
zrJ0EWf=i|HKz(0fA}{7)XXrE&SRQqN!q%?7b!dNNd9cBVC(q8A*sN&&jt43;a2pIn
zXD(cM3{r-$?aB=-QXI>NJf;p2rvPpyP=Ov{-?JcM6@M`Y_{y}RHydlCk+Vo1FqEa1
z;Ne0041+`wNkrIoU30BO)ACoZWPoTVGwI?A%62W0MgOPJl<0v;Pr0Mne_L)6pMP%>
z=rFg)Qf?(JUOh-@&`Kc>5xjNn>X3cebc@uMgOD?e1v1idii!34Qz%Yix?@=2qX^RN
zytiwMj;wcQhE3XtdGiiB8Fn=^w8_3a(SF4bLGEPqtYzL5pdNw+e<)&Pv77S@yp-S)
z*-#e7r6`-`vM>IBjaDVr|7+Q(r|0!dwmwk7v!Scnwwe0X0fEJ_oAxa0NYVeRdJAQq
zitJ7669$)L=<?SPx|#Nr?PJG|l^#!2rFe9q!M|jmBjQ-wA-THNO*cnIMz&P}4iWmC
zF?=!qTVQy~|J%`<(~2Hn0}$o?Fxy}uKmE&7Z6Cf%7~*7GU<(l-pcfJIxe*&sjkvK0
zgYFNY6@;y9(!gntuQ9$wMjnRopZSlE_Qbsx^HHD1c`~=KpK9Vmzy=m?kyOOUw4h*^
z>+5HLkXg&F60nxGY=%xpDrk<o439mt&Ecn_qsu7yySci0Nrwg&Ud0l&Z0L>};iB=&
z$a<`52z>mqeV$vSP#Xl<t;iu#AO~NV)q-!I_T|-@?E)q<36)n?)*76|3Tp-gz?tkG
z79UJ1_FuaH<rT&RKG|~4Srw3(p>6^*R8T1Ev<A91B|!YiZ|Rs!b;KdwU?3YY{-@{#
zU!8*nCm3bx^3Q)R5z{qfZOB+;DP2MjR_`QTm8p~&Q>QBZ>e6A*WEK<%Mp{kIxvcl3
z&Gz8yiGre5BXp53Ru#x-%o;YxNbv@MDS}s|MDo;n&VOQ+FiJ#_OWJm|G);x2@O={A
zN!F$$jKXEqPAQ1Xuf9IYLyd6{y_>d80{IKAOxIYf16#KqZmi6+R)1mGz=D6Or%hbr
zpYDs-R0`)G`?UD~{D;di^j3w`4Ps>|!4?VS(*rd>6pCh>Mp#)m=+4EP<vcvFtjH8y
zFQe<ZNPfd~+6C#__NVyGg&$NXNOJiYG?mXrxgoBh3SC?pKYjYNrkF49Fp2N}1|^F^
z0b-mF5f;dn(4~_o=j%vWzNQ%Uj>C@aom~{RLrkcKq%o7S3WG1Pqw8;w;$WoQUX;_I
z0kL9XO5mr@VD7g4+u>LqtmByt48~jx&$dQnIO;W`PA)jdgELGbqT757@!3Q1i11O{
zj*uNsu}^zs%osj-_VV7N9VFh%AraFu+KKqA*-TL4)UoM1)r~R#i<qL8EJ4R<6&<`p
zDLh5Y$oLuPgxuH{{oy72Kp_Rpkxz?o(?OW(zlERv(b{+Tx(ahk<@B1mIh+8t@z&+u
zd^G`36z=ThLP~eR-Ufy6(g${IV6pd`l(q`g#&K2EzqZQjuWZW{F=*rcGyaoS%qEYK
zsNH|G7|Gwi^~=nyNjvEm0pAs}tsI<DG$e|eCOVDqt_5UJC>}g`pl0a?rXwTA*gCI9
zAT_h<H%_0|1zt^2=CNai;`R(x*>KKWOoz!tb-rsf*^f3EVSn+AaDH{x>gd(~|4!hO
z<_q`PbJf?85LQkmYD3~Md!$eRcDQ+X>~%n+YE{LR@F@a37m{8K#uU22Ik57I?;6du
zwYA?vFBnbGBP5)5S2Ni4gm}s?h-1(tuMavz@v>f(!kyWaYaY1I9=HlMWpu+ix5~;2
zL8V`wkn2^>RL)hVC5Mnsj84sQcYl9<9q+BUg|YnaA3mhKn|YfayT|E|8!TILEjtJC
zm7?&Tmcf|xvS2l=>(>0oKe-8QmR99^9C;>&S@s9{guT^;y4I$%aPGiftFD4E)TiZJ
zrZ^q{_dmLL`?idYb9^mHV*gBm?Oi5+%A0ei2!MCZ1tWj##c!!>*J)E?C`%6te*XAI
zm|6wo*x6-lIudvbCR=W>kc^yb#Q*X;H6H@NWgjb6)lRResv{^QL0eG72;Cskc7kJX
zdTkt#yY;wKx=Ao}JS}Lh&)iHX&W5LaB4StOrbw;g|Bi&PVXZp0H%CWTQ)$Fvz)5jQ
z65DtgkO#)CPh@t??z(I=_&`73ce()U;tq+z;7Lep*8t3BviZ|?n%|V0D;~kT6^bfy
z>IF4u@5jh}`vM+_9}E45aB^ZIW&ZPv=c#vjjhjuLyNw9gI7rtW<%cf{Bawrgf@Y!m
za>zDF(WlogU>IXQfVSDUSBDYiIm$?#omx<A)IGW_`HKHkKqI#dsd|L+TKu9hhBWrC
z_JMvka^V_w4z{of#c#t6ppL@(w_4$7Xytk^2gvpSjKi>qbOwS6vu@uc&=h~FrM1`$
zLOB9_eQH+;;LO{YT-`G$!>2#dThYKmTejGU|E~9jzn|My!CO6s^+P5ea5F&-!Fxad
zh$t2MRt)r@tJ8cs?>i{sUhow$svYm#Uhk$cZ9@>SLMYNy9WM3AEtX9OQ^SeR?jH}&
zxV*3<qwO|Uu8algZwj7WJ4x5VOIP|Bo{f<U&44tp+MBSW0q;t<WV3T*!p-WkO)>~6
zGOgXaU9%2c!J-zJyUL~wXU2e^SOF5nDk9&CPk_wsJQg%!B4{dAX~C3+FMD55iuB|W
z%J|^$i;GZP)OdSAR%9-IJrPa7_?OkN{Oj2g)+~nWIwVgwDF};$8)<j)3mYwB?v5W(
zS0MsaoIkf5<Jq|55~c`X?u7ofY<A{HYpOX4raA*pSN>S@^5x5TJ}D}d+qHVN#X6m&
zSM#6XXdzZ(y1jbYJ#aeOATv4nh36je{1tOaqRRC%{(c0>3-=)67-bMfg$Df*D&lp=
z*bCe8@boJpNTZE;R;L*;f8ukQ%|&zxEUloFO@BH*6j?s>-`=Xb2wScbOtiFTKnaV<
z4?_sZU)JIfIsW$kl!=Z;wGJ9=w#wmlgCT{2S!2JRk`>K07onQ-@#KM@I_mAcn@``e
zebE1D?d)TsuH!g<8cn(xVJbdkqTYPMhO`7*bdZ<{Y{rvXT#=YF;7%7goev8U#HZ3}
zhFWfci4R8zi0haSKw1cs8YYu-V5NYD=uGhe4h-n^Cg)sR{T2W52gmOB@cDi|@25{{
z5ZeN@SVG6~$)0C6E$kT_qMZOPcD~5U$w1Zsk6Yk0ouS2VJl32wo#-#+jA$W(p*yy-
zn$`-VmO^T@G8vjkq=~_g4KqLqkfZ|?;l`?08J#b~7wz0y%HgQFgkxDu0G)GdT|)MJ
z{%vj9YUp)iP7-|#G{u~o3)C=TE27?<hLzCDa0XoKP1t8Hf%1rStzZ7A(T!Tc9_7g&
zPVTXvm>As2ceISLVseW#c!KWwcTBOyv%yh^Y|Pcw3xh`@qZ$a};05XOEcBD*B5W#x
zfkvpc%-}NUQZyD`j0kymT!`sYFBh{1Z4)xL#8R(;15LQ7#%6f#1==7eG`FS+bUH%o
z;4OvhWl`FF@Zp{P!dSV@$SBQ{`{>vIMduUuQ0J54JFn~oG>!8bR`~x}>jhM)(0c#Q
z5fqZS%PyUrRJ3!sTW&acKuQr#M#n-~JotSZ#EHC(cPg>DDZ~)$WX{#1A5-63`5pX;
z*r)sT)H<D7eO(DFOQ_1~9F!cMn3%Y3CaEG_Q&~(~c)y;QTd=D-pBp|+Boxy*Ym_%^
z!wQcZ3ZH3yeWk86oJ@2}P;I^gTeig;385)4@I<|XMrjA9M=k0)btsw`F(2kRi?v!0
zpwUuz?C8-^W^-v()7*enbyZd2wpBy;;CD&qFvuJwIW%X~dbFJYU~+rlVZ1e<pkT>E
z{m1RI3+9g<-zaG7{bp|PfepNbp_w-l=6--r5N0+lJ3HH1Mg@|j&uQbnOG9+!Zu`xP
zLzwx_U2h(j@$>LHD;ufRRWdYz@r&kH!N@<Z0NVT}^uKP5EcwZ0fVyL32y}q<nP5-h
zS0%QM>Uqs@tu}86T7<V+g8XxLQ2vVj+-shQ`)3Q4bKe4E#Zi<D*xupbQ|F^|+4^xe
zD$Yj0iApR#pK!)1n~!0xoLIv?2C1=e{BA)`N(~blFZM?E;ErCnTsjBz8g4wmKXB^c
zC@J(my7#A;2(uhSooO+4S&9h~fsLNX08B5tYlE|EPt<Yze!lu^J*e6(U7cnAl$AuY
zY}vcd)78y>XJpWqBU%p8)~&q09r%hPUExC~gQty00FB~jdwY9Z+j`Hw6fJe_=MKfb
zghsvb>#m+}au#`%tXX4F(iob~(|Y2n18*4&8fPVpp-Y&K6^;emFq2#8SgR_(2v|Iv
zhrU0%)4&=9*~kHvmD=55Y<_@pMHX`;f9B+U`AYBrYGS>>;ff1n?jl;)tX=Su@^g$9
zC7v6TpJI)kM3rA0wduj7Rv%Q%a)q#e{zzf8shGqcX4M5?usXfU!C4jfcxHJzKEj5)
zb?tYPgNBczH+pO=itNX(U(KYDaZfAKo@$=yyOw5X*xEfF2vuVozq?GoYE*+moA~IE
zLmQ9*IVCwpOSC;rDY;1S3ziP!3ZEV7wrm^a9y^hiZu`U;{S6`R^qh>wn$q^Jsu*R@
zVYWHoF!pOHKoTm^<6!42dfK;6i=0_XuOx{@5rt5vK8eCjUoHRb6ePx^LmSz+KFgb?
z!&-M_EcCmg-~Og;LPsOdPRq?r+HxU6AC*R{(cy9lOqC@86?x6oNb>`3UT-Bvs$240
zXz%p5>=#;e;TyE{AUqK*OYB)1SXS_Q7uhcOVv>!0)RR=xETet|b}1)kSHr~8u-O~v
zx3%%8q^;hDU{zt-nZC62gUUyRf)KL%F7P%Yq&-wTRKri*@(7s5JUjz%4%By@G~nP@
z;k&p<M%#g<ea`y<lQmGK%ee#cwJ4BNmS}J%=H&ihUQ=up-n%NUz@tJ~RPv4#;S1rm
z#AD+Tn{w}-Ybvwwi|#ckFkh{_|1yxtDXkS}`wkv7na$6$bq)Bqc3*U^Mrh9LlQ`As
zO)Gdwduf*>`t>z>?OBxCn`hO1H@jy-oRKE1c0iCf57XmM(|-=x)+s5Q!}q5%NrFEe
z3pMi*pQXz@?yz*dP1L97B5aCUGQ^j7)fuLF=vu4!kKL_4qciOLE&RIC-s+y<{lARv
suATtn8>c1=eKIG0(B||gzmPtL&m*qKCVlJSZr~?u#+$Dfgv6)+1+`Bm6aWAK

literal 0
HcmV?d00001

diff --git a/common/resolv_conf.go b/common/resolv_conf.go
new file mode 100644
index 0000000000..75b4ab0dc4
--- /dev/null
+++ b/common/resolv_conf.go
@@ -0,0 +1,57 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"fmt"
+	"strings"
+
+	cnitypes "github.com/containernetworking/cni/pkg/types"
+)
+
+// MakeResolvConf generates resolv.conf contents given a cni DNS configuration
+func MakeResolvConf(dns cnitypes.DNS, comment string) string {
+	content := ""
+	if len(comment) > 0 {
+		content += fmt.Sprintf("# %s\n\n", comment)
+	}
+
+	if len(dns.Search) > 0 {
+		content += fmt.Sprintf("search %s\n", strings.Join(dns.Search, " "))
+	}
+
+	for _, ns := range dns.Nameservers {
+		content += fmt.Sprintf("nameserver %s\n", ns)
+	}
+	if len(dns.Options) > 0 {
+		content += fmt.Sprintf("options %s\n", strings.Join(dns.Options, " "))
+	}
+
+	if len(dns.Domain) > 0 {
+		content += fmt.Sprintf("domain %s\n", dns.Domain)
+	}
+	return content
+}
+
+/*
+ * TODO(cdc) move this to cnitypes
+ */
+// IsDNSZero checks if the DNS configuration has any information
+func IsDNSZero(dns *cnitypes.DNS) bool {
+	return len(dns.Nameservers) == 0 &&
+		len(dns.Domain) == 0 &&
+		len(dns.Search) == 0 &&
+		len(dns.Options) == 0
+}
diff --git a/common/resolv_conf_test.go b/common/resolv_conf_test.go
new file mode 100644
index 0000000000..d9323c6212
--- /dev/null
+++ b/common/resolv_conf_test.go
@@ -0,0 +1,85 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"strings"
+	"testing"
+
+	cnitypes "github.com/containernetworking/cni/pkg/types"
+)
+
+func TestMakeResolvConf(t *testing.T) {
+	tests := []struct {
+		dns     cnitypes.DNS
+		comment string
+		result  string
+	}{
+		{
+			cnitypes.DNS{
+				Nameservers: []string{"1.2.3.4"},
+				Domain:      "mydomain",
+				Search:      []string{"example.com"},
+				Options:     []string{"testoption"},
+			},
+			"foobar",
+			`
+# foobar
+
+search example.com
+nameserver 1.2.3.4
+options testoption
+domain mydomain
+`,
+		},
+		{
+			cnitypes.DNS{
+				Nameservers: []string{"1.2.3.4", "1.2.3.5"},
+				Domain:      "mydomain",
+				Search:      []string{"example.com", "example.org"},
+				Options:     []string{"testoption", "ipv6"},
+			},
+			"this is a comment",
+			`
+# this is a comment
+
+search example.com example.org
+nameserver 1.2.3.4
+nameserver 1.2.3.5
+options testoption ipv6
+domain mydomain
+`,
+		},
+		{
+			cnitypes.DNS{
+				Nameservers: []string{"1.2.3.4", "1.2.3.5"},
+			},
+			"",
+			`
+nameserver 1.2.3.4
+nameserver 1.2.3.5
+`,
+		},
+	}
+
+	// trim whitespace for legibility
+	for i, tt := range tests {
+		result := strings.TrimSpace(MakeResolvConf(tt.dns, tt.comment))
+		want := strings.TrimSpace(tt.result)
+		if result != want {
+			t.Errorf("#%d: got %v, want %v", i, result, want)
+		}
+	}
+}
diff --git a/makelib/misc.mk b/makelib/misc.mk
index e8b69b5c60..c28cb35c03 100644
--- a/makelib/misc.mk
+++ b/makelib/misc.mk
@@ -569,3 +569,23 @@ $(strip \
 		$(call generate-empty-filelist,$(_MISC_GPF_FILELIST)))) \
 	$(call undefine-namespaces,_MISC_GPF))
 endef
+
+# Recursive wildcard - recursively generate a list of files
+#
+# 1 - root directory
+# 2 - filter pattern
+define rwildcard
+$(foreach d, $(wildcard $1/*), \
+	$(filter $(subst *, %, $2), $d) $(call rwildcard, $d, $2))
+endef
+
+# Recursively list all files in a given path
+# This just shells out to `find`.
+#
+# 1 - the path (file or directory)
+define rlist-files
+$(strip \
+	$(eval _MISC_RLIST_OP1_ := $(call sq_escape,$1)) \
+	$(eval _MISC_RLIST_FILES_ := $(shell find $(_MISC_RLIST_OP1_) -type f)) \
+	$(_MISC_RLIST_FILES_))
+endef
diff --git a/networking/kvm.go b/networking/kvm.go
index 9c478c1a7a..d09485bdbf 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -21,8 +21,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"net"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"syscall"
@@ -169,7 +171,7 @@ func kvmSetupNetAddressing(network *Networking, n activeNet, ifName string) erro
 		return fmt.Errorf("net-plugin returned no IPv4 configuration")
 	}
 
-	n.runtime.IP, n.runtime.Mask, n.runtime.HostIP, n.runtime.IP4 = result.IP4.IP.IP, net.IP(result.IP4.IP.Mask), result.IP4.Gateway, result.IP4
+	n.runtime.MergeCNIResult(result)
 
 	return nil
 }
@@ -431,7 +433,7 @@ func kvmTransformFlannelNetwork(net *activeNet) error {
 
 // kvmSetup prepare new Networking to be used in kvm environment based on tuntap pair interfaces
 // to allow communication with virtual machine created by lkvm tool
-func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common.NetList, localConfig string) (*Networking, error) {
+func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common.NetList, localConfig string, noDNS bool) (*Networking, error) {
 	network := Networking{
 		podEnv: podEnv{
 			podRoot:      podRoot,
@@ -455,6 +457,14 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 		return nil, errwrap.Wrap(errors.New("error loading network definitions"), e)
 	}
 
+	// did stage0 already make /etc/rkt-resolv.conf (i.e. --dns passed)
+	resolvPath := filepath.Join(common.Stage1RootfsPath(podRoot), "etc/rkt-resolv.conf")
+	_, err = os.Stat(resolvPath)
+	if err != nil && !os.IsNotExist(err) {
+		return nil, errwrap.Wrap(fmt.Errorf("error statting /etc/rkt-resolv.conf"), err)
+	}
+	podHasResolvConf := err == nil
+
 	for i, n := range network.nets {
 		if n.conf.Type == "flannel" {
 			if err := kvmTransformFlannelNetwork(&n); err != nil {
@@ -584,6 +594,24 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 			}
 		}
 
+		// Generate rkt-resolv.conf if it's not already there.
+		// The first network plugin that supplies a non-emtpy
+		// DNS response will win, unless noDNS is true (--dns passed to rkt run)
+		if !common.IsDNSZero(&n.runtime.DNS) && !noDNS {
+			if !podHasResolvConf {
+				err := ioutil.WriteFile(
+					resolvPath,
+					[]byte(common.MakeResolvConf(n.runtime.DNS, "Generated by rkt from network "+n.conf.Name)),
+					0644)
+				if err != nil {
+					return nil, errwrap.Wrap(fmt.Errorf("error creating resolv.conf"), err)
+				}
+				podHasResolvConf = true
+			} else {
+				stderr.Printf("Warning: network %v plugin specified DNS configuration, but DNS already supplied", n.conf.Name)
+			}
+		}
+
 		if n.conf.IPMasq {
 			chain := cniutils.FormatChainName(n.conf.Name, podID.String())
 			comment := cniutils.FormatComment(n.conf.Name, podID.String())
diff --git a/networking/net_plugin.go b/networking/net_plugin.go
index 652233984b..76689c8ca6 100644
--- a/networking/net_plugin.go
+++ b/networking/net_plugin.go
@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"net"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -50,23 +49,27 @@ func pluginErr(err error, output []byte) error {
 	return err
 }
 
-func (e *podEnv) netPluginAdd(n *activeNet, netns string) (ip, hostIP net.IP, err error) {
+// Executes a given network plugin. If successful, mutates n.runtime with
+// the runtime information
+func (e *podEnv) netPluginAdd(n *activeNet, netns string) error {
 	output, err := e.execNetPlugin("ADD", n, netns)
 	if err != nil {
-		return nil, nil, pluginErr(err, output)
+		return pluginErr(err, output)
 	}
 
 	pr := cnitypes.Result{}
 	if err = json.Unmarshal(output, &pr); err != nil {
 		err = errwrap.Wrap(fmt.Errorf("parsing %q", string(output)), err)
-		return nil, nil, errwrap.Wrap(fmt.Errorf("error parsing %q result", n.conf.Name), err)
+		return errwrap.Wrap(fmt.Errorf("error parsing %q result", n.conf.Name), err)
 	}
 
 	if pr.IP4 == nil {
-		return nil, nil, nil
+		return nil // TODO(casey) should this be an error?
 	}
 
-	return pr.IP4.IP.IP, pr.IP4.Gateway, nil
+	// All is well - mutate the runtime
+	n.runtime.MergeCNIResult(pr)
+	return nil
 }
 
 func (e *podEnv) netPluginDel(n *activeNet, netns string) error {
@@ -116,6 +119,7 @@ func (e *podEnv) execNetPlugin(cmd string, n *activeNet, netns string) ([]byte,
 	}
 
 	vars := [][2]string{
+		{"CNI_VERSION", "0.3.0"},
 		{"CNI_COMMAND", cmd},
 		{"CNI_CONTAINERID", e.podID.String()},
 		{"CNI_NETNS", netns},
diff --git a/networking/netinfo/netinfo.go b/networking/netinfo/netinfo.go
index fcfa5908c7..02d9f6f1d1 100644
--- a/networking/netinfo/netinfo.go
+++ b/networking/netinfo/netinfo.go
@@ -26,6 +26,14 @@ import (
 
 const filename = "net-info.json"
 
+// A type and some structure to represent rkt's view of a *runtime*
+// network instance.
+//
+// Each instance represents a network configuration that has been enabled,
+// along with runtime information from the network plugin.
+//
+// This information is also serialized in the pod's runtime directory so that
+// `rkt list` and other stage0 programs can access the runtime state.
 type NetInfo struct {
 	NetName    string          `json:"netName"`
 	ConfPath   string          `json:"netConf"`
@@ -36,6 +44,7 @@ type NetInfo struct {
 	Mask       net.IP          `json:"mask"` // we used IP instead of IPMask because support for json serialization (we don't need specific functionalities)
 	HostIP     net.IP          `json:"-"`
 	IP4        *types.IPConfig `json:"-"`
+	DNS        types.DNS       `json:"-"`
 }
 
 func LoadAt(cdirfd int) ([]NetInfo, error) {
@@ -60,3 +69,12 @@ func Save(root string, info []NetInfo) error {
 
 	return json.NewEncoder(f).Encode(info)
 }
+
+// MergeCNIResult will incorporate the result of a CNI plugin's execution
+func (ni *NetInfo) MergeCNIResult(result types.Result) {
+	ni.IP = result.IP4.IP.IP
+	ni.Mask = net.IP(result.IP4.IP.Mask)
+	ni.HostIP = result.IP4.Gateway
+	ni.IP4 = result.IP4
+	ni.DNS = result.DNS
+}
diff --git a/networking/networking.go b/networking/networking.go
index 572ed19fa9..49e0af3a9e 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -62,12 +62,12 @@ var stderr *log.Logger
 
 // Setup creates a new networking namespace and executes network plugins to
 // set up networking. It returns in the new pod namespace
-func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common.NetList, localConfig, flavor string, debug bool) (*Networking, error) {
+func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common.NetList, localConfig, flavor string, noDNS, debug bool) (*Networking, error) {
 
 	stderr = log.New(os.Stderr, "networking", debug)
 
 	if flavor == "kvm" {
-		return kvmSetup(podRoot, podID, fps, netList, localConfig)
+		return kvmSetup(podRoot, podID, fps, netList, localConfig, noDNS)
 	}
 
 	// Create namespace for Pod and write path to a file
@@ -93,7 +93,7 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 		return nil, errwrap.Wrap(errors.New("error loading network definitions"), err)
 	}
 
-	if err := n.setupNets(n.nets); err != nil {
+	if err := n.setupNets(n.nets, noDNS); err != nil {
 		return nil, err
 	}
 
diff --git a/networking/podenv.go b/networking/podenv.go
index ebde48b91a..6b296bd3ef 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -158,7 +158,7 @@ func (e *podEnv) netDir() string {
 	return filepath.Join(e.podRoot, "net")
 }
 
-func (e *podEnv) setupNets(nets []activeNet) error {
+func (e *podEnv) setupNets(nets []activeNet, noDNS bool) error {
 	err := os.MkdirAll(e.netDir(), 0755)
 	if err != nil {
 		return err
@@ -172,6 +172,15 @@ func (e *podEnv) setupNets(nets []activeNet) error {
 	}()
 
 	n := activeNet{}
+
+	// did stage0 already make /etc/rkt-resolv.conf (i.e. --dns passed)
+	resolvPath := filepath.Join(common.Stage1RootfsPath(e.podRoot), "etc/rkt-resolv.conf")
+	_, err = os.Stat(resolvPath)
+	if err != nil && !os.IsNotExist(err) {
+		return errwrap.Wrap(fmt.Errorf("error statting /etc/rkt-resolv.conf"), err)
+	}
+	podHasResolvConf := err == nil
+
 	for i, n = range nets {
 		stderr.Printf("loading network %v with type %v", n.conf.Name, n.conf.Type)
 
@@ -180,10 +189,29 @@ func (e *podEnv) setupNets(nets []activeNet) error {
 			return errwrap.Wrap(fmt.Errorf("error copying %q to %q", n.runtime.ConfPath, e.netDir()), err)
 		}
 
-		n.runtime.IP, n.runtime.HostIP, err = e.netPluginAdd(&n, e.podNS.Path())
+		// Actually shell out to the plugin
+		err = e.netPluginAdd(&n, e.podNS.Path())
 		if err != nil {
 			return errwrap.Wrap(fmt.Errorf("error adding network %q", n.conf.Name), err)
 		}
+
+		// Generate rkt-resolv.conf if it's not already there.
+		// The first network plugin that supplies a non-emtpy
+		// DNS response will win, unless noDNS is true (--dns passed to rkt run)
+		if !common.IsDNSZero(&n.runtime.DNS) && !noDNS {
+			if !podHasResolvConf {
+				err := ioutil.WriteFile(
+					resolvPath,
+					[]byte(common.MakeResolvConf(n.runtime.DNS, "Generated by rkt from network "+n.conf.Name)),
+					0644)
+				if err != nil {
+					return errwrap.Wrap(fmt.Errorf("error creating resolv.conf"), err)
+				}
+				podHasResolvConf = true
+			} else {
+				stderr.Printf("Warning: network %v plugin specified DNS configuration, but DNS already supplied", n.conf.Name)
+			}
+		}
 	}
 	return nil
 }
diff --git a/pkg/flag/discard.go b/pkg/flag/discard.go
new file mode 100644
index 0000000000..f79abdf5b5
--- /dev/null
+++ b/pkg/flag/discard.go
@@ -0,0 +1,43 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package flag
+
+import "fmt"
+
+// DiscardFlag is a flag type that discards all options with a warning
+type DiscardFlag struct {
+	Name string
+	used bool // pflag calls .set at least once always
+}
+
+func NewDiscardFlag(name string) *DiscardFlag {
+	df := DiscardFlag{
+		Name: name,
+	}
+	return &df
+}
+
+func (df *DiscardFlag) Set(_ string) error {
+	fmt.Printf("Warning: -%s not supported; ignoring\n", df.Name)
+	return nil
+}
+
+func (df *DiscardFlag) String() string {
+	return ""
+}
+
+func (df *DiscardFlag) Type() string {
+	return "DiscardFlag"
+}
diff --git a/pkg/flag/optionlist.go b/pkg/flag/optionlist.go
index 33f9450e77..58c3600c00 100644
--- a/pkg/flag/optionlist.go
+++ b/pkg/flag/optionlist.go
@@ -20,7 +20,6 @@ import (
 	"strings"
 
 	"github.com/hashicorp/errwrap"
-	"github.com/spf13/pflag"
 )
 
 // OptionList is a flag value type supporting a csv list of options
@@ -33,8 +32,6 @@ type OptionList struct {
 	typeName    string
 }
 
-var _ pflag.Value = (*OptionList)(nil)
-
 // NewOptionList initializes an OptionList. PermissibleOptions is the complete
 // set of allowable options. It will set all options specified in defaultOptions
 // as provided; they will all be cleared if this flag is passed in the CLI
diff --git a/pkg/flag/pairlist.go b/pkg/flag/pairlist.go
index 42971e8943..44cb62edd5 100644
--- a/pkg/flag/pairlist.go
+++ b/pkg/flag/pairlist.go
@@ -18,8 +18,6 @@ import (
 	"fmt"
 	"sort"
 	"strings"
-
-	"github.com/spf13/pflag"
 )
 
 // PairList is a flag value supporting a list of key=value pairs
@@ -31,8 +29,6 @@ type PairList struct {
 	typeName    string
 }
 
-var _ pflag.Value = (*PairList)(nil)
-
 // NewPairList initializes a new pair list
 // If permissiblePairs is not empty, then it will validate keys and values. For
 // every key in permissiblePairs, if the value is an empty list, then any value
diff --git a/pkg/flag/rktflag_test.go b/pkg/flag/rktflag_test.go
index 248bb664bf..57d338b2c5 100644
--- a/pkg/flag/rktflag_test.go
+++ b/pkg/flag/rktflag_test.go
@@ -15,11 +15,20 @@
 package flag
 
 import (
+	"flag"
 	"reflect"
 	"strings"
 	"testing"
+
+	"github.com/spf13/pflag"
 )
 
+// Ensure all these types implement the pflag.Value and flag.Value interface
+var _ pflag.Value = (*OptionList)(nil)
+var _ pflag.Value = (*PairList)(nil)
+var _ flag.Value = (*OptionList)(nil)
+var _ flag.Value = (*PairList)(nil)
+
 var options = []string{"zero", "one", "two"}
 
 func TestOptionList(t *testing.T) {
diff --git a/rkt/run.go b/rkt/run.go
index eec843ecf3..f90153f43c 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -19,11 +19,13 @@ package main
 import (
 	"bufio"
 	"fmt"
+	"net"
 	"os"
 	"strconv"
 	"strings"
 
 	"github.com/appc/spec/schema/types"
+	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/label"
 	"github.com/coreos/rkt/pkg/lock"
@@ -65,6 +67,7 @@ image arguments with a lone "---" to resume argument parsing.`,
 	flagDNS          flagStringList
 	flagDNSSearch    flagStringList
 	flagDNSOpt       flagStringList
+	flagDNSDomain    string
 	flagNoOverlay    bool
 	flagStoreOnly    bool
 	flagNoStore      bool
@@ -72,11 +75,17 @@ image arguments with a lone "---" to resume argument parsing.`,
 	flagMDSRegister  bool
 	flagUUIDFileSave string
 	flagHostname     string
+	flagHostsEntries flagStringList
 )
 
 func init() {
 	cmdRkt.AddCommand(cmdRun)
 
+	/*
+	   Careful!
+	   Be sure to add common flags to run-prepared as well!
+	*/
+
 	addStage1ImageFlags(cmdRun.Flags())
 	cmdRun.Flags().Var(&flagPorts, "port", "ports to expose on the host (requires contained network). Syntax: --port=NAME:HOSTPORT")
 	cmdRun.Flags().Var(&flagNet, "net", "configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. Syntax: --net[=n[:args], ...]")
@@ -87,9 +96,11 @@ func init() {
 	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for apps in the form name=value")
 	cmdRun.Flags().Var(&flagEnvFromFile, "set-env-file", "path to an environment variables file")
 	cmdRun.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively. If true, only one image may be supplied.")
-	cmdRun.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf")
+	cmdRun.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf. Pass 'host' to use host's resolv.conf. Pass 'none' to ignore CNI DNS config")
 	cmdRun.Flags().Var(&flagDNSSearch, "dns-search", "DNS search domains to write in /etc/resolv.conf")
 	cmdRun.Flags().Var(&flagDNSOpt, "dns-opt", "DNS options to write in /etc/resolv.conf")
+	cmdRun.Flags().StringVar(&flagDNSDomain, "dns-domain", "", "DNS domain to write in /etc/resolv.conf")
+	cmdRun.Flags().Var(&flagHostsEntries, "hosts-entry", "Entries to add to the pod-wide /etc/hosts. Pass 'host' to use the host's /etc/hosts")
 	cmdRun.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
 	cmdRun.Flags().BoolVar(&flagNoStore, "no-store", false, "fetch images ignoring the local store")
 	cmdRun.Flags().StringVar(&flagPodManifest, "pod-manifest", "", "the path to the pod manifest. If it's non-empty, then only '--net', '--no-overlay' and '--interactive' will have effect")
@@ -120,6 +131,7 @@ func init() {
 	flagDNS = flagStringList{}
 	flagDNSSearch = flagStringList{}
 	flagDNSOpt = flagStringList{}
+	flagHostsEntries = flagStringList{}
 
 	// Disable interspersed flags to stop parsing after the first non flag
 	// argument. All the subsequent parsing will be done by parseApps.
@@ -323,14 +335,19 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		rktgid = -1
 	}
 
+	DNSConfMode, DNSConfig, HostsEntries, err := parseDNSFlags(flagHostsEntries, flagDNS, flagDNSSearch, flagDNSOpt, flagDNSDomain)
+	if err != nil {
+		stderr.PrintE("error with dns flags", err)
+		return 1
+	}
+
 	rcfg := stage0.RunConfig{
 		CommonConfig:         &cfg,
 		Net:                  flagNet,
 		LockFd:               lfd,
 		Interactive:          flagInteractive,
-		DNS:                  flagDNS,
-		DNSSearch:            flagDNSSearch,
-		DNSOpt:               flagDNSOpt,
+		DNSConfMode:          DNSConfMode,
+		DNSConfig:            DNSConfig,
 		MDSRegister:          flagMDSRegister,
 		LocalConfig:          globalFlags.LocalConfigDir,
 		RktGid:               rktgid,
@@ -339,6 +356,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		InsecurePaths:        globalFlags.InsecureFlags.SkipPaths(),
 		InsecureSeccomp:      globalFlags.InsecureFlags.SkipSeccomp(),
 		UseOverlay:           useOverlay,
+		HostsEntries:         *HostsEntries,
 	}
 
 	apps, err := p.getApps()
@@ -511,3 +529,99 @@ func (e *envFileMap) Strings() []string {
 func (e *envFileMap) Type() string {
 	return "envFileMap"
 }
+
+/*
+ * Parse out the --hosts-entries, --dns, --dns-search, and --dns-opt flags
+ * This includes decoding the "magic" values for hosts-entries and dns.
+ * Try to detect any obvious insanity, namely invalid IPs or more than one
+ * magic option
+ */
+func parseDNSFlags(flagHostsEntries, flagDNS, flagDNSSearch, flagDNSOpt []string, flagDNSDomain string) (stage0.DNSConfMode, cnitypes.DNS, *stage0.HostsEntries, error) {
+	DNSConfMode := stage0.DNSConfMode{
+		Resolv: "default",
+		Hosts:  "default",
+	}
+	DNSConfig := cnitypes.DNS{}
+	HostsEntries := make(stage0.HostsEntries)
+
+	// Loop through --dns and look for magic option
+	// Check for obvious insanity - only one magic option allowed
+	for _, d := range flagDNS {
+		// parse magic values
+		if d == "host" || d == "none" {
+			if len(flagDNS) > 1 {
+				return DNSConfMode, DNSConfig, &HostsEntries,
+					fmt.Errorf("no other --dns options allowed when --dns=%s is passed", d)
+			}
+			DNSConfMode.Resolv = d
+			break
+
+		} else {
+			// parse list of IPS
+			for _, d := range strings.Split(d, ",") {
+				if net.ParseIP(d) == nil {
+					return DNSConfMode, DNSConfig, &HostsEntries,
+						fmt.Errorf("Invalid IP passed to --dns: %s", d)
+				}
+				DNSConfig.Nameservers = append(DNSConfig.Nameservers, d)
+			}
+		}
+	}
+
+	DNSConfig.Search = flagDNSSearch
+	DNSConfig.Options = flagDNSOpt
+	DNSConfig.Domain = flagDNSDomain
+
+	if !common.IsDNSZero(&DNSConfig) {
+		if DNSConfMode.Resolv == "default" {
+			DNSConfMode.Resolv = "stage0"
+		}
+
+		if DNSConfMode.Resolv != "stage0" {
+			return DNSConfMode, DNSConfig, &HostsEntries,
+				fmt.Errorf("Cannot call --dns-opt, --dns-search, or --dns-domain with --dns=%v", DNSConfMode.Resolv)
+		}
+	}
+
+	// Parse out --hosts-entries, also looking for the magic value "host"
+	for _, entry := range flagHostsEntries {
+		if entry == "host" {
+			if len(flagHostsEntries) == 1 {
+				DNSConfMode.Hosts = "host"
+			} else {
+				return DNSConfMode, DNSConfig, &HostsEntries,
+					fmt.Errorf("cannot pass --hosts-entry=host with multiple hosts-entries")
+			}
+			break
+		}
+		for _, entry := range strings.Split(entry, ",") {
+			vals := strings.SplitN(entry, "=", 2)
+			if len(vals) != 2 {
+				return DNSConfMode, DNSConfig, &HostsEntries,
+					fmt.Errorf("Did not understand --hosts-entry %s", entry)
+			}
+			ipStr := vals[0]
+			hostname := vals[1]
+
+			// validate IP address
+			ip := net.ParseIP(ipStr)
+			if ip == nil {
+				return DNSConfMode, DNSConfig, &HostsEntries,
+					fmt.Errorf("Invalid IP passed to --hosts-entry: %s", ipStr)
+			}
+
+			_, exists := HostsEntries[ipStr]
+			if !exists {
+				HostsEntries[ipStr] = []string{hostname}
+			} else {
+				HostsEntries[ipStr] = append(HostsEntries[ipStr], hostname)
+			}
+		}
+	}
+
+	if len(HostsEntries) > 0 {
+		DNSConfMode.Hosts = "stage0"
+	}
+
+	return DNSConfMode, DNSConfig, &HostsEntries, nil
+}
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index 8bf7c9e76e..d432a250d0 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -42,9 +42,12 @@ func init() {
 
 	cmdRunPrepared.Flags().Var(&flagNet, "net", "configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. Syntax: --net[=n[:args]][,]")
 	cmdRunPrepared.Flags().Lookup("net").NoOptDefVal = "default"
-	cmdRunPrepared.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf")
+	cmdRunPrepared.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf. Pass 'host' to use host's resolv.conf. Pass 'none' to ignore CNI DNS config")
 	cmdRunPrepared.Flags().Var(&flagDNSSearch, "dns-search", "DNS search domains to write in /etc/resolv.conf")
 	cmdRunPrepared.Flags().Var(&flagDNSOpt, "dns-opt", "DNS options to write in /etc/resolv.conf")
+	cmdRunPrepared.Flags().StringVar(&flagDNSDomain, "dns-domain", "", "DNS domain to write in /etc/resolv.conf")
+	cmdRunPrepared.Flags().Var(&flagHostsEntries, "hosts-entry", "Entries to add to the pod-wide /etc/hosts. Pass 'host' to use the host's /etc/hosts")
+
 	cmdRunPrepared.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively")
 	cmdRunPrepared.Flags().BoolVar(&flagMDSRegister, "mds-register", false, "register pod with metadata service")
 	cmdRunPrepared.Flags().StringVar(&flagHostname, "hostname", "", `pod's hostname. If empty, it will be "rkt-$PODUUID"`)
@@ -149,6 +152,12 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
+	DNSConfMode, DNSConfig, HostsEntries, err := parseDNSFlags(flagHostsEntries, flagDNS, flagDNSSearch, flagDNSOpt, flagDNSDomain)
+	if err != nil {
+		stderr.PrintE("error with dns flags", err)
+		return 1
+	}
+
 	rcfg := stage0.RunConfig{
 		CommonConfig: &stage0.CommonConfig{
 			Store:     s,
@@ -159,9 +168,9 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		Net:                  flagNet,
 		LockFd:               lfd,
 		Interactive:          flagInteractive,
-		DNS:                  flagDNS,
-		DNSSearch:            flagDNSSearch,
-		DNSOpt:               flagDNSOpt,
+		DNSConfMode:          DNSConfMode,
+		DNSConfig:            DNSConfig,
+		HostsEntries:         *HostsEntries,
 		MDSRegister:          flagMDSRegister,
 		Apps:                 apps,
 		RktGid:               rktgid,
diff --git a/stage0/interface.go b/stage0/interface.go
index 08e26edb16..b1868a63f1 100644
--- a/stage0/interface.go
+++ b/stage0/interface.go
@@ -63,3 +63,8 @@ func interfaceVersionSupportsHostname(version int) bool {
 func interfaceVersionSupportsInsecureOptions(version int) bool {
 	return version > 2
 }
+
+// support --dns-mode and --hostentry
+func interfaceVersionSupportsDNSConfMode(version int) bool {
+	return version > 3
+}
diff --git a/stage0/run.go b/stage0/run.go
index 3ca4893c7e..b22ee07b26 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -28,7 +28,6 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"net"
 	"os"
 	"path"
 	"path/filepath"
@@ -40,6 +39,7 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
+	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
 	"github.com/coreos/rkt/common/overlay"
@@ -81,14 +81,14 @@ type RunConfig struct {
 	Apps                 schema.AppList // applications (prepare gets them via Apps)
 	LocalConfig          string         // Path to local configuration
 	Hostname             string         // hostname of the pod
-	RktGid               int            // group id of the 'rkt' group, -1 if there's no rkt group.
-	DNS                  []string       // DNS name servers to write in /etc/resolv.conf
-	DNSSearch            []string       // DNS search domains to write in /etc/resolv.conf
-	DNSOpt               []string       // DNS options to write in /etc/resolv.conf
+	RktGid               int            // group id of the 'rkt' group, -1 ere's no rkt group.
+	DNSConfMode          DNSConfMode    // dns configuration file mode - for stAage1
+	DNSConfig            cnitypes.DNS   // the DNS configuration (nameservers, search, options)
 	InsecureCapabilities bool           // Do not restrict capabilities
 	InsecurePaths        bool           // Do not restrict access to files in sysfs or procfs
 	InsecureSeccomp      bool           // Do not add seccomp restrictions
 	UseOverlay           bool           // run pod with overlay fs
+	HostsEntries         HostsEntries   // The entries in /etc/hosts
 }
 
 // CommonConfig defines the configuration shared by both Run and Prepare
@@ -101,7 +101,22 @@ type CommonConfig struct {
 	ManifestData string            // The pod manifest data
 	Debug        bool
 	MountLabel   string // selinux label to use for fs
-	ProcessLabel string // selinux label to use for process
+	ProcessLabel string // selinux label to use
+}
+
+// An etc-hosts file: mapping from IP to arbitrary list of hostnames
+type HostsEntries map[string][]string
+
+// DNSConfMode indicates what the stage1 should do with dns config files
+// The values and meanings are:
+// 'host': bind-mount from host
+// 'stage0': the stage0 has generated it
+// 'none' : do not generate it
+// 'default' : do whatever was the default
+
+type DNSConfMode struct {
+	Resolv string // /etc/rkt-resolv.conf
+	Hosts  string // /etc/rkt-hosts
 }
 
 func init() {
@@ -435,35 +450,74 @@ func preparedWithPrivateUsers(dir string) (string, error) {
 	return string(bytes), nil
 }
 
-func addResolvConf(cfg RunConfig, rootfs string) {
-	content := "# Generated by rkt\n\n"
-	if len(cfg.DNSSearch) > 0 {
-		content += fmt.Sprintf("search %s\n", strings.Join(cfg.DNSSearch, " "))
-	}
-	for _, server := range cfg.DNS {
-		// skip empty entries
-		if server == "" {
-			continue
-		}
-		// comment invalid entries
-		if net.ParseIP(server) == nil {
-			content += "# "
-		}
-		content += "nameserver " + server + "\n"
-	}
-	if len(cfg.DNSOpt) > 0 {
-		content += fmt.Sprintf("options %s\n", strings.Join(cfg.DNSOpt, " "))
+func writeDnsConfig(cfg *RunConfig, rootfs string) {
+	writeResolvConf(cfg, rootfs)
+	writeEtcHosts(cfg, rootfs)
+}
+
+// writeResolvConf will generate <stage1>/etc/rkt-resolv.conf if needed
+func writeResolvConf(cfg *RunConfig, rootfs string) {
+	if cfg.DNSConfMode.Resolv != "stage0" {
+		return
 	}
-	content += "\n"
 
 	if err := os.Mkdir(filepath.Join(rootfs, "etc"), common.DefaultRegularDirPerm); err != nil {
 		if !os.IsExist(err) {
 			log.Fatalf("error creating dir %q: %v\n", "/etc", err)
 		}
 	}
+	resolvPath := filepath.Join(rootfs, "etc/rkt-resolv.conf")
+	f, err := os.Create(resolvPath)
+	if err != nil {
+		log.Fatalf("error writing etc/rkt-resolv.conf: %v\n", err)
+	}
+	defer f.Close()
 
-	if err := ioutil.WriteFile(filepath.Join(rootfs, "etc/rkt-resolv.conf"), []byte(content), 0644); err != nil {
-		log.Fatalf("error writing /etc/rkt-resolv.conf: %v\n", err)
+	_, err = f.WriteString(common.MakeResolvConf(cfg.DNSConfig, "Generated by rkt run"))
+	if err != nil {
+		log.Fatalf("error writing etc/rkt-resolv.conf: %v\n", err)
+	}
+}
+
+/*
+ * Write /etc/rkt-hosts in to the stage1 rootfs, if there is anything there
+ * This will read defaults from <rootfs>/etc/hosts-fallback if it exists.
+ * Therefore, this should be called after the stage1 is mounted
+ */
+func writeEtcHosts(cfg *RunConfig, rootfs string) {
+	if cfg.DNSConfMode.Hosts != "stage0" {
+		return
+	}
+
+	// Read <stage1>/rootfs/etc/hosts-fallback to get some sane defaults
+	hostsTextb, err := ioutil.ReadFile(filepath.Join(rootfs, "etc/hosts-fallback"))
+	if err != nil {
+		// fallback-fallback :-)
+		hostsTextb = []byte("#created by rkt stage0\n127.0.0.1 localhost localhost.localdomain\n")
+	}
+	hostsText := string(hostsTextb)
+
+	hostsText += "\n\n# Added by rkt run --hosts-entry\n"
+
+	for ip, hostnames := range cfg.HostsEntries {
+		hostsText = fmt.Sprintf("%s%s %s\n", hostsText, ip, strings.Join(hostnames, " "))
+	}
+
+	// Create /etc if it does not exists
+	etcPath := filepath.Join(rootfs, "etc")
+	if _, err := os.Stat(etcPath); err != nil && os.IsNotExist(err) {
+		err = os.Mkdir(etcPath, 0755)
+		if err != nil {
+			log.FatalE("failed to make stage1 etc directory", err)
+		}
+	} else if err != nil {
+		log.FatalE("Failed to stat stage1 etc", err)
+	}
+
+	hostsPath := filepath.Join(etcPath, "rkt-hosts")
+	err = ioutil.WriteFile(hostsPath, []byte(hostsText), 0644)
+	if err != nil {
+		log.FatalE("failed to write etc/rkt-hosts", err)
 	}
 }
 
@@ -489,9 +543,7 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 
 	destRootfs := common.Stage1RootfsPath(dir)
 
-	if len(cfg.DNS) > 0 || len(cfg.DNSSearch) > 0 || len(cfg.DNSOpt) > 0 {
-		addResolvConf(cfg, destRootfs)
-	}
+	writeDnsConfig(&cfg, destRootfs)
 
 	if err := os.Setenv(common.EnvLockFd, fmt.Sprintf("%v", cfg.LockFd)); err != nil {
 		log.FatalE("setting lock fd environment", err)
@@ -515,7 +567,6 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 		log.FatalE("error determining 'run' entrypoint", err)
 	}
 	args := []string{filepath.Join(destRootfs, ep)}
-	debug("Execing %s", ep)
 
 	if cfg.Debug {
 		args = append(args, "--debug")
@@ -555,6 +606,14 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 		}
 	}
 
+	if cfg.DNSConfMode.Hosts != "default" || cfg.DNSConfMode.Resolv != "default" {
+		if interfaceVersionSupportsDNSConfMode(s1v) {
+			args = append(args, fmt.Sprintf("--dns-conf-mode=resolv=%s,hosts=%s", cfg.DNSConfMode.Resolv, cfg.DNSConfMode.Hosts))
+		} else {
+			log.Printf("warning: --dns-conf-mode option not supported by stage1")
+		}
+	}
+
 	if interfaceVersionSupportsInsecureOptions(s1v) {
 		if cfg.InsecureCapabilities {
 			args = append(args, "--disable-capabilities-restriction")
@@ -580,6 +639,8 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 	// that enforces TPM behaviour, but we don't have any infrastructure
 	// around that yet.
 	_ = tpm.Extend(tpmEvent)
+
+	debug("Execing %s", args)
 	if err := syscall.Exec(args[0], args, os.Environ()); err != nil {
 		log.FatalE("error execing init", err)
 	}
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index 554009f39c..a5d54ab289 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -35,7 +35,7 @@
         },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
-            "value": "3"
+            "value": "4"
         }
     ]
 }
diff --git a/stage1/init/common/dns_config.go b/stage1/init/common/dns_config.go
new file mode 100644
index 0000000000..996f84512e
--- /dev/null
+++ b/stage1/init/common/dns_config.go
@@ -0,0 +1,43 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"path/filepath"
+
+	_common "github.com/coreos/rkt/common"
+)
+
+/*
+ Bind-mount the hosts /etc/resolv.conf in to the stage1's /etc/rkt-resolv.conf.
+ That file will then be bind-mounted in to the stage2 by perpare-app.c
+*/
+func UseHostResolv(podRoot string) error {
+	return BindMount(
+		"/etc/resolv.conf",
+		filepath.Join(_common.Stage1RootfsPath(podRoot), "etc/rkt-resolv.conf"),
+		true)
+}
+
+/*
+ Bind-mount the hosts /etc/hosts in to the stage1's /etc/rkt-hosts
+ That file will then be bind-mounted in to the stage2 by perpare-app.c
+*/
+func UseHostHosts(podRoot string) error {
+	return BindMount(
+		"/etc/hosts",
+		filepath.Join(_common.Stage1RootfsPath(podRoot), "etc/rkt-hosts"),
+		true)
+}
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 43c8f8d011..749b9014c9 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -17,6 +17,7 @@ package common
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"strconv"
 	"syscall"
 
@@ -28,6 +29,12 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
+/*
+ * Some common stage1 mount tasks
+ *
+ * TODO(cdc) De-duplicate code from stage0/gc.go
+ */
+
 // mountWrapper is a wrapper around a schema.Mount with an additional field indicating
 // whether it is an implicit empty volume converted from a Docker image.
 type mountWrapper struct {
@@ -176,3 +183,58 @@ func PrepareMountpoints(volPath string, targetPath string, vol *types.Volume, do
 
 	return nil
 }
+
+// BindMount, well, bind mounts a source in to a destination. This will
+// do some bookkeeping:
+// * evaluate all symlinks
+// * ensure the source exists
+// * recursively create the destination
+func BindMount(source, destination string, readOnly bool) error {
+	absSource, err := filepath.EvalSymlinks(source)
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("Could not resolve symlink for source %v", source), err)
+	}
+
+	if err := ensureDestinationExists(absSource, destination); err != nil {
+		return errwrap.Wrap(fmt.Errorf("Could not create destination mount point: %v", destination), err)
+	} else if err := syscall.Mount(absSource, destination, "bind", syscall.MS_BIND, ""); err != nil {
+		return errwrap.Wrap(fmt.Errorf("Could not bind mount %v to %v", absSource, destination), err)
+	}
+	if readOnly {
+		err := syscall.Mount(source, destination, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
+
+		// If we failed to remount ro, unmount
+		if err != nil {
+			syscall.Unmount(destination, 0) // if this fails, oh well
+			return errwrap.Wrap(fmt.Errorf("Could not remount %v read-only", destination), err)
+		}
+	}
+	return nil
+}
+
+// ensureDestinationExists will recursively create a given mountpoint. If directories
+// are created, their permissions are initialized to stage1/init/common.SharedVolPerm
+func ensureDestinationExists(source, destination string) error {
+	fileInfo, err := os.Stat(source)
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not stat source location: %v", source), err)
+	}
+
+	targetPathParent, _ := filepath.Split(destination)
+	if err := os.MkdirAll(targetPathParent, SharedVolPerm); err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not create parent directory: %v", targetPathParent), err)
+	}
+
+	if fileInfo.IsDir() {
+		if err := os.Mkdir(destination, SharedVolPerm); !os.IsExist(err) {
+			return err
+		}
+	} else {
+		if file, err := os.OpenFile(destination, os.O_CREATE, SharedVolPerm); err != nil {
+			return err
+		} else {
+			file.Close()
+		}
+	}
+	return nil
+}
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 9ea1b12937..9455e4b23e 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -47,6 +47,7 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/networking"
+	pkgflag "github.com/coreos/rkt/pkg/flag"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/stage1/init/kvm"
@@ -110,6 +111,7 @@ var (
 	disableCapabilities bool
 	disablePaths        bool
 	disableSeccomp      bool
+	dnsConfMode         *pkgflag.PairList
 )
 
 func init() {
@@ -123,6 +125,14 @@ func init() {
 	flag.BoolVar(&disableCapabilities, "disable-capabilities-restriction", false, "Disable capability restrictions")
 	flag.BoolVar(&disablePaths, "disable-paths", false, "Disable paths restrictions")
 	flag.BoolVar(&disableSeccomp, "disable-seccomp", false, "Disable seccomp restrictions")
+	dnsConfMode = pkgflag.MustNewPairList(map[string][]string{
+		"resolv": {"host", "stage0", "none", "default"},
+		"hosts":  {"host", "stage0", "default"},
+	}, map[string]string{
+		"resolv": "default",
+		"hosts":  "default",
+	})
+	flag.Var(dnsConfMode, "dns-conf-mode", "DNS config file modes")
 
 	// this ensures that main runs only on main thread (thread group leader).
 	// since namespace ops (unshare, setns) are done for a single thread, we
@@ -545,7 +555,8 @@ func stage1() int {
 			return 1
 		}
 
-		n, err = networking.Setup(root, p.UUID, fps, netList, localConfig, flavor, debug)
+		noDNS := dnsConfMode.Pairs["resolv"] != "default" // force ignore CNI DNS results
+		n, err = networking.Setup(root, p.UUID, fps, netList, localConfig, flavor, noDNS, debug)
 		if err != nil {
 			log.PrintE("failed to setup network", err)
 			return 1
@@ -576,6 +587,13 @@ func stage1() int {
 		}
 	}
 
+	if dnsConfMode.Pairs["resolv"] == "host" {
+		stage1initcommon.UseHostResolv(root)
+	}
+	if dnsConfMode.Pairs["hosts"] == "host" {
+		stage1initcommon.UseHostHosts(root)
+	}
+
 	if err = stage1initcommon.WriteDefaultTarget(p); err != nil {
 		log.PrintE("failed to write default.target", err)
 		return 1
diff --git a/stage1/net/README.md b/stage1/net/README.md
new file mode 100644
index 0000000000..83c6783aae
--- /dev/null
+++ b/stage1/net/README.md
@@ -0,0 +1,5 @@
+Some network configuration files that are copied in to the stage1's rootfs.
+
+## NOTE:
+Due to a small bug in the makefile, if you rename or remove any files here,
+you will have to `make clean`.
diff --git a/stage1/net/net-install.mk b/stage1/net/net-install.mk
index 1b319fdeb8..201a775595 100644
--- a/stage1/net/net-install.mk
+++ b/stage1/net/net-install.mk
@@ -1,6 +1,8 @@
 # Inputs:
 #
 # NMI_FLAVOR - flavor for which config files should be installed
+#
+# Copies directory rootfs to the ACI's rootfs
 
 # main stamp ensuring that configuration is copied
 $(call setup-stamp-file,NMI_COPY_STAMP,$(NMI_FLAVOR)-copy)
@@ -14,38 +16,48 @@ $(call setup-filelist-file,NMI_SRC_CONF_FILELIST,$(NMI_FLAVOR)-conf)
 # stamp for removing the config dir in the ACI rootfs
 $(call setup-stamp-file,NMI_CLEAN_DIR_STAMP,$(NMI_FLAVOR)-cleandir)
 
-# directory with config files in source tree
-NMI_SRC_CONFDIR := $(MK_SRCDIR)/conf
-NMI_SUFFIX := .conf
-NMI_SRC_CONFFILES := $(wildcard $(NMI_SRC_CONFDIR)/*$(NMI_SUFFIX))
-
-# an etc directory in the ACI rootfs, we expect it to exist
-NMI_DIRS_BASE := $(STAGE1_ACIROOTFSDIR_$(NMI_FLAVOR))/etc
-# subdirectories of the etc directory created by this Makefile
-NMI_DIRS_REST := rkt/net.d
-NMI_DIR_CHAIN := $(call dir-chain,$(NMI_DIRS_BASE),$(NMI_DIRS_REST))
-NMI_CONFDIR := $(NMI_DIRS_BASE)/$(NMI_DIRS_REST)
-# configuration files in the ACI rootfs
-NMI_CONFFILES := $(addprefix $(NMI_CONFDIR)/,$(notdir $(NMI_SRC_CONFFILES)))
-# triplets for INSTALL_FILES
-NMI_TRIPLETS := $(call install-file-triplets,$(NMI_SRC_CONFFILES),$(NMI_CONFFILES),-)
+
+# Get source lists
+NMI_SRC_DIR := $(MK_SRCDIR)/rootfs
+NMI_SRC_FILES := $(call rlist-files,$(NMI_SRC_DIR))
+# List of files relative to rootfs
+NMI_FILES_REL := $(NMI_SRC_FILES:$(NMI_SRC_DIR)/%=%)
+
+NMI_SRC_DIRS := $(sort $(dir $(NMI_SRC_FILES)))
+NMI_DIRS_REL := $(sort $(NMI_SRC_DIRS:$(NMI_SRC_DIR)/%=%))
+# $(info REL $(NMI_DIRS_REL))
+
+# The ACI rootfs directory
+NMI_DST_BASE := $(STAGE1_ACIROOTFSDIR_$(NMI_FLAVOR))
+
+# Generate lists for INSTALL_FILES and INSTALL_DIRS
+NMI_DST_FILES := $(addprefix $(NMI_DST_BASE)/,$(NMI_FILES_REL))
+NMI_TRIPLETS := $(call install-file-triplets,$(NMI_SRC_FILES),$(NMI_DST_FILES),0644)
+# $(info $$NMI_TRIPLETS is [${NMI_TRIPLETS}])
+
+NMI_DST_DIRS_CHAIN := $(sort $(foreach d,$(NMI_DIRS_REL),$(call dir-chain,$(NMI_DST_BASE),$d)))
+# $(info $$NMI_DST_DIRS_CHAIN is [$(NMI_DST_DIRS_CHAIN)])
 
 # this makes sure that config files were copied to the ACI rootfs
-$(call generate-stamp-rule,$(NMI_COPY_STAMP),$(NMI_CONFFILES) $(NMI_CONF_DEPS_STAMP))
+$(call generate-stamp-rule,$(NMI_COPY_STAMP),$(NMI_DST_FILES) $(NMI_CONF_DEPS_STAMP))
 
 # this removes the config directory in the ACI rootfs, will be invalidated
 # when something changes in source config files
-$(call generate-rm-dir-rule,$(NMI_CLEAN_DIR_STAMP),$(NMI_CONFDIR))
+# TODO(CDC) This is no longer the case, as we put some files in rootfs/etc but don't control the dir
+# This rule is now disabled
+#$(call generate-rm-dir-rule,$(NMI_CLEAN_DIR_STAMP),$(NMI_CONFDIR))
 
-STAGE1_INSTALL_DIRS_$(NMI_FLAVOR) += $(foreach d,$(NMI_DIR_CHAIN),$d:0755)
+STAGE1_INSTALL_DIRS_$(NMI_FLAVOR) += $(foreach d,$(NMI_DST_DIRS_CHAIN),$d:0755)
 STAGE1_INSTALL_FILES_$(NMI_FLAVOR) += $(NMI_TRIPLETS)
 STAGE1_SECONDARY_STAMPS_$(NMI_FLAVOR) += $(NMI_COPY_STAMP)
 
+# $(info $$STAGE1_INSTALL_DIRS_$(NMI_FLAVOR) is ${STAGE1_INSTALL_DIRS_$(NMI_FLAVOR)} )
+
 # This filelist of all config files can be generated any time.
-$(call generate-shallow-filelist,$(NMI_SRC_CONF_FILELIST),$(NMI_SRC_CONFDIR),$(NMI_SUFFIX))
+$(call generate-deep-filelist,$(NMI_SRC_CONF_FILELIST),$(NMI_SRC_DIR))
 # This dep.mk can be generated only after the filelist above was
 # generated. Will trigger the removal of the config directory in all
 # ACI rootfses if source config files change.
-$(call generate-glob-deps,$(NMI_CONF_DEPS_STAMP),$(NMI_CLEAN_DIR_STAMP),$(NMI_DEPMK),$(NMI_SUFFIX),$(NMI_SRC_CONF_FILELIST),$(NMI_SRC_CONFDIR),normal)
+$(call generate-glob-deps,$(NMI_CONF_DEPS_STAMP),$(NMI_CLEAN_DIR_STAMP),$(NMI_DEPMK),,$(NMI_SRC_CONF_FILELIST),$(NMI_SRC_DIR),)
 
 $(call undefine-namespaces,NMI)
diff --git a/stage1/net/rootfs/etc/hosts-fallback b/stage1/net/rootfs/etc/hosts-fallback
new file mode 100644
index 0000000000..f7f0615ee1
--- /dev/null
+++ b/stage1/net/rootfs/etc/hosts-fallback
@@ -0,0 +1,9 @@
+# This is the default rkt /etc/hosts
+127.0.0.1 localhost localhost.domain localhost4 localhost4.localdomain4
+
+::1 ip6-localhost ip6-loopback localhost6 localhost6.localdomain6
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
diff --git a/stage1/net/conf/99-default-restricted.conf b/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
similarity index 100%
rename from stage1/net/conf/99-default-restricted.conf
rename to stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
diff --git a/stage1/net/conf/99-default.conf b/stage1/net/rootfs/etc/rkt/net.d/99-default.conf
similarity index 100%
rename from stage1/net/conf/99-default.conf
rename to stage1/net/rootfs/etc/rkt/net.d/99-default.conf
diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 7420eb35a1..f187abb79c 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -25,6 +25,7 @@
 #include <sys/vfs.h>
 #include <dirent.h>
 #include <inttypes.h>
+#include <stdbool.h>
 
 #define err_out(_fmt, _args...)						\
 		fprintf(stderr, "Error: " _fmt "\n", ##_args);
@@ -71,64 +72,12 @@ typedef struct _mount_point_t {
 	const char	*type;
 	const char	*options;
 	unsigned long	flags;
+	const bool	skip_if_dst_exists; // Only respected for files_mount_table
 } mount_point;
 
 #define dir(_name, _mode) \
 	{ .name = _name, .mode = _mode }
 
-static int get_machine_name(char *out, int out_len) {
-	int	fd;
-	char	buf[MACHINE_ID_LEN + 1];
-
-	pgoto_if((fd = open("/etc/machine-id", O_RDONLY)) == -1,
-		_fail, "Error opening \"/etc/machine-id\"");
-	pgoto_if(read(fd, buf, MACHINE_ID_LEN) == -1,
-		_fail_fd, "Error reading \"/etc/machine-id\"");
-	pgoto_if(close(fd) != 0,
-		_fail, "Error closing \"/etc/machine-id\"");
-	goto_if(snprintf(out, out_len,
-			"rkt-%.8s-%.4s-%.4s-%.4s-%.12s",
-			buf, buf+8, buf+12, buf+16, buf+20) >= out_len,
-		_fail, "Error constructing machine name");
-
-	return 1;
-
-_fail_fd:
-	close(fd);
-_fail:
-	return 0;
-}
-
-static int ensure_etc_hosts_exists(const char *root, int rootfd) {
-	char	name[MACHINE_NAME_LEN + 1];
-	char	hosts[128];
-	int	fd, len;
-
-	if(faccessat(rootfd, "etc/hosts", F_OK, AT_EACCESS) == 0)
-		return 1;
-
-	goto_if(!get_machine_name(name, sizeof(name)),
-		_fail, "Failed to get machine name");
-	goto_if((len = snprintf(hosts, sizeof(hosts),
-			"%s\t%s\t%s\t%s\n",
-			"127.0.0.1", name,
-			"localhost", "localhost.localdomain")) >= sizeof(hosts),
-		_fail, "/etc/hosts line too long: \"%s\"", hosts);
-	pgoto_if((fd = openat(rootfd, "etc/hosts", O_WRONLY|O_CREAT, 0644)) == -1,
-		_fail, "Failed to create \"%s/etc/hosts\"", root);
-	pgoto_if(write(fd, hosts, len) != len,
-		_fail_fd, "Failed to write \"%s/etc/hosts\"", root);
-	pgoto_if(close(fd) != 0,
-		_fail, "Failed to close \"%s/etc/hosts\"", root);
-
-	return 1;
-
-_fail_fd:
-	close(fd);
-_fail:
-	return 0;
-}
-
 static void mount_at(const char *root, const mount_point *mnt)
 {
 	char to[4096];
@@ -181,8 +130,8 @@ static int mount_sys_required(const char *root)
 static void mount_sys(const char *root)
 {
 	struct statfs fs;
-	const mount_point sys_bind_rec = { "/sys", "sys", "bind", NULL, MS_BIND|MS_REC };
-	const mount_point sys_bind = { "/sys", "sys", "bind", NULL, MS_BIND };
+	const mount_point sys_bind_rec = { "/sys", "sys", "bind", NULL, MS_BIND|MS_REC, false };
+	const mount_point sys_bind = { "/sys", "sys", "bind", NULL, MS_BIND, false };
 
 	pexit_if(statfs("/sys/fs/cgroup", &fs) != 0,
 	         "Cannot statfs /sys/fs/cgroup");
@@ -303,15 +252,17 @@ int main(int argc, char *argv[])
 		NULL
 	};
 	static const mount_point dirs_mount_table[] = {
-		{ "/proc", "/proc", "bind", NULL, MS_BIND|MS_REC },
-		{ "/dev/shm", "/dev/shm", "bind", NULL, MS_BIND },
-		{ "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND },
-		{ "/run/systemd/journal", "/run/systemd/journal", "bind", NULL, MS_BIND },
+		{ "/proc", "/proc", "bind", NULL, MS_BIND|MS_REC, false },
+		{ "/dev/shm", "/dev/shm", "bind", NULL, MS_BIND, false },
+		{ "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND, false },
+		{ "/run/systemd/journal", "/run/systemd/journal", "bind", NULL, MS_BIND, false },
 		/* /sys is handled separately */
 	};
 	static const mount_point files_mount_table[] = {
-		{ "/etc/rkt-resolv.conf", "/etc/resolv.conf", "bind", NULL, MS_BIND },
-		{ "/proc/sys/kernel/hostname", "/etc/hostname", "bind", NULL, MS_BIND },
+		{ "/etc/rkt-resolv.conf", "/etc/resolv.conf", "bind", NULL, MS_BIND, false },
+		{ "/etc/rkt-hosts", "/etc/hosts", "bind", NULL, MS_BIND, false },
+		{ "/etc/hosts-fallback", "/etc/hosts", "bind", NULL, MS_BIND, true }, // only create as fallback
+		{ "/proc/sys/kernel/hostname", "/etc/hostname", "bind", NULL, MS_BIND, false },
 	};
 	const char *root;
 	int rootfd;
@@ -356,9 +307,6 @@ int main(int argc, char *argv[])
 			"Failed to create directory \"%s/%s\"", root, d->name);
 	}
 
-	exit_if(!ensure_etc_hosts_exists(root, rootfd),
-		"Failed to ensure \"%s/etc/hosts\" exists", root);
-
 	close(rootfd);
 
 	/* systemd-nspawn already creates few /dev entries in the container
@@ -411,7 +359,8 @@ int main(int argc, char *argv[])
 	if (mount_sys_required(root))
 		mount_sys(root);
 
-	/* Bind mount files, if the source exists */
+	/* Bind mount files, if the source exists.
+	 * By default, overwrite dst unless skip_if_dst_exists is true. */
 	for (i = 0; i < nelems(files_mount_table); i++) {
 		const mount_point *mnt = &files_mount_table[i];
 		int fd;
@@ -420,6 +369,8 @@ int main(int argc, char *argv[])
 			"Path too long: \"%s\"", to);
 		if (access(mnt->source, F_OK) != 0)
 			continue;
+		if( mnt->skip_if_dst_exists && access(to, F_OK) == 0)
+			continue;
 		if (access(to, F_OK) != 0) {
 			pexit_if((fd = creat(to, 0644)) == -1,
 				"Cannot create file: \"%s\"", to);
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index 49c67d5350..0a68fad988 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -32,6 +32,10 @@
         {
             "name": "coreos.com/rkt/stage1/stop",
             "value": "/stop"
+        },
+        {
+            "name": "coreos.com/rkt/stage1/interface-version",
+            "value": "4"
         }
     ]
 }
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 628d7b1dfa..8b140fa561 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -32,6 +32,7 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/fileutil"
+	pkgflag "github.com/coreos/rkt/pkg/flag"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/pkg/user"
@@ -64,8 +65,9 @@ var (
 	discardBool    bool
 	discardString  string
 
-	log  *rktlog.Logger
-	diag *rktlog.Logger
+	log         *rktlog.Logger
+	diag        *rktlog.Logger
+	dnsConfMode *pkgflag.PairList
 )
 
 func getHostMounts() (map[string]struct{}, error) {
@@ -105,11 +107,30 @@ func init() {
 
 	// The following flags need to be supported by stage1 according to
 	// https://github.com/coreos/rkt/blob/master/Documentation/devel/stage1-implementors-guide.md
-	// TODO: either implement functionality or give not implemented warnings
+	// Most of them are ignored
+	// These are ignored, but stage0 always passes them
 	flag.Var(&discardNetlist, "net", "Setup networking")
-	flag.BoolVar(&discardBool, "interactive", true, "The pod is interactive")
-	flag.StringVar(&discardString, "mds-token", "", "MDS auth token")
 	flag.StringVar(&discardString, "local-config", common.DefaultLocalConfigDir, "Local config path")
+
+	// These are discarded with a warning
+	// TODO either implement these, or stop passing them
+	flag.Bool("interactive", true, "The pod is interactive (ignored, always true)")
+	flag.Var(pkgflag.NewDiscardFlag("mds-token"), "mds-token", "MDS auth token (not implemented)")
+
+	flag.Var(pkgflag.NewDiscardFlag("hostname"), "hostname", "Set hostname (not implemented)")
+	flag.Bool("disable-capabilities-restriction", true, "ignored")
+	flag.Bool("disable-paths", true, "ignored")
+	flag.Bool("disable-seccomp", true, "ignored")
+
+	dnsConfMode = pkgflag.MustNewPairList(map[string][]string{
+		"resolv": {"host", "stage0", "none", "default"},
+		"hosts":  {"host", "stage0", "default"},
+	}, map[string]string{
+		"resolv": "default",
+		"hosts":  "default",
+	})
+	flag.Var(dnsConfMode, "dns-conf-mode", "DNS config file modes")
+
 }
 
 func addMountPoints(namedVolumeMounts map[types.ACName]volumeMountTuple, mountpoints []types.MountPoint) error {
@@ -292,11 +313,6 @@ func stage1() int {
 
 	rfs := filepath.Join(common.AppPath(p.Root, ra.Name), "rootfs")
 
-	if err := copyResolv(p); err != nil {
-		log.PrintE("can't copy /etc/resolv.conf", err)
-		return 1
-	}
-
 	argFlyMounts, err := evaluateMounts(rfs, string(ra.Name), p)
 	if err != nil {
 		log.PrintE("can't evaluate mounts", err)
@@ -319,6 +335,51 @@ func stage1() int {
 		argFlyMounts...,
 	)
 
+	/* Process DNS config files
+	 *
+	 * /etc/resolv.conf: four modes
+	 * 'host' - bind-mount host's file
+	 * 'stage0' - bind-mount the file created by stage0
+	 * 'default' - do nothing (we would respect CNI if fly had networking)
+	 * 'none' - do nothing
+	 */
+	switch dnsConfMode.Pairs["resolv"] {
+	case "host":
+		effectiveMounts = append(effectiveMounts,
+			flyMount{"/etc/resolv.conf", rfs, "/etc/resolv.conf", "none", syscall.MS_BIND | syscall.MS_RDONLY})
+	case "stage0":
+		if err := copyResolv(p); err != nil {
+			log.PrintE("can't copy /etc/resolv.conf", err)
+			return 1
+		}
+	}
+
+	/*
+	 * /etc/hosts: three modes:
+	 * 'host' - bind-mount hosts's file
+	 * 'stage0' - bind mount the file created by stage1
+	 * 'default' - create a stub /etc/hosts if needed
+	 */
+
+	switch dnsConfMode.Pairs["hosts"] {
+	case "host":
+		effectiveMounts = append(effectiveMounts,
+			flyMount{"/etc/hosts", rfs, "/etc/hosts", "none", syscall.MS_BIND | syscall.MS_RDONLY})
+	case "stage0":
+		effectiveMounts = append(effectiveMounts, flyMount{
+			filepath.Join(common.Stage1RootfsPath(p.Root), "etc", "rkt-hosts"),
+			rfs,
+			"/etc/hosts",
+			"none",
+			syscall.MS_BIND | syscall.MS_RDONLY})
+	case "default":
+		stage2HostsPath := filepath.Join(common.AppRootfsPath(p.Root, ra.Name), "etc", "hosts")
+		if _, err := os.Stat(stage2HostsPath); err != nil && os.IsNotExist(err) {
+			fallbackHosts := []byte("127.0.0.1 localhost localdomain\n")
+			ioutil.WriteFile(stage2HostsPath, fallbackHosts, 0644)
+		}
+	}
+
 	for _, mount := range effectiveMounts {
 		log.Printf("Processing %+v", mount)
 
diff --git a/tests/cniproxy/main.go b/tests/cniproxy/main.go
new file mode 100644
index 0000000000..c3666483b1
--- /dev/null
+++ b/tests/cniproxy/main.go
@@ -0,0 +1,209 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+// cniproxy proxies commands through to the real container plugin
+// and logs output for later inspection.
+
+// For an example execution, see NewNetCNIDNSTest
+
+// The following CNI arguments influence its behavior:
+//
+// X_REAL_PLUGIN=<<name>>: The name of the real plugin to execute
+// X_ADD_DNS=1: populate a DNS response
+// X_FAIL=exit / crash: "exit" = fail with error message, "crash" = fail without error message
+// X_LOG=<<filename>>: write a logfile of what happens in the same directory as the binary
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"syscall"
+
+	"github.com/containernetworking/cni/pkg/invoke"
+)
+
+var cniArgs map[string]string
+
+func main() {
+	parseCniArgs()
+
+	x_fail := cniArgs["X_FAIL"]
+	if x_fail == "exit" {
+		os.Stdout.WriteString(`{"cniVersion": "0.1.0", "code": 100, "msg": "this is a failure message"}`)
+		os.Exit(1)
+	} else if x_fail == "crash" {
+		os.Exit(1)
+	}
+
+	realPluginPath := findRealPlugin()
+
+	stdin, plugout, plugerr, exitCode := proxyPlugin(realPluginPath)
+	logResult(realPluginPath, stdin, plugout, plugerr, exitCode)
+
+	// Mutate the response
+	if exitCode == 0 && cniArgs["X_ADD_DNS"] == "1" {
+		addDns(plugout)
+	}
+
+	// Pass through the response to rkt
+	os.Stdout.Write(plugout.Bytes())
+	os.Stderr.Write(plugerr.Bytes())
+
+	os.Exit(exitCode) // pass through exit code
+}
+
+// mutate the response to add DNS info
+func addDns(data *bytes.Buffer) {
+	var result interface{}
+
+	err := json.Unmarshal(data.Bytes(), &result)
+	if err != nil {
+		fail("could not parse json", err)
+	}
+
+	switch result := result.(type) {
+	case map[string]interface{}:
+		result["dns"] = map[string]interface{}{
+			"nameservers": []string{"1.2.3.4", "4.3.2.1"},
+			"domain":      "dotawesome.awesome",
+			"search":      []string{"cniproxy1, cniproxy2"},
+			"options":     []string{"option1", "option2"},
+		}
+		newbytes, err := json.Marshal(result)
+		if err != nil {
+			fail("Failed to write json", err)
+		}
+
+		data.Reset()
+		data.Write(newbytes)
+
+	default:
+		fail("json not expected format")
+	}
+}
+
+func logResult(pluginPath string, stdin, stdout, stderr *bytes.Buffer, exitCode int) {
+	logfile, exists := cniArgs["X_LOG"]
+	if !exists {
+		return
+	}
+
+	logfile = filepath.Join(filepath.Dir(os.Args[0]), logfile)
+	fp, err := os.Create(logfile)
+	if err != nil {
+		fail("Could not open log file", logfile, err)
+	}
+	defer fp.Close()
+
+	result := map[string]interface{}{
+		"pluginPath": pluginPath,
+		"stdin":      stdin.String(),
+		"stdout":     stdout.String(),
+		"stderr":     stderr.String(),
+		"exitCode":   exitCode,
+		"env":        os.Environ(),
+	}
+
+	enc := json.NewEncoder(fp)
+	err = enc.Encode(result)
+	if err != nil {
+		fail("Could not write logfile", err)
+	}
+}
+
+// Proxy execution through the **real** plugin
+func proxyPlugin(path string) (stdin, stdout, stderr *bytes.Buffer, exitCode int) {
+
+	// Filter all X_ arguments from the cni argument variable
+	filteredArgs := make([]string, 0, len(cniArgs))
+	for k, v := range cniArgs {
+		if !strings.HasPrefix(k, "X_") {
+			filteredArgs = append(filteredArgs, fmt.Sprintf("%s=%s", k, v))
+		}
+	}
+	os.Setenv("CNI_ARGS", strings.Join(filteredArgs, ";"))
+
+	stdin = bytes.NewBuffer([]byte{})
+	stdout = bytes.NewBuffer([]byte{})
+	stderr = bytes.NewBuffer([]byte{})
+
+	teeIn := io.TeeReader(os.Stdin, stdin)
+
+	cmd := exec.Command(path)
+	cmd.Stdin = teeIn
+	cmd.Stdout = stdout
+	cmd.Stderr = stderr
+
+	exitStatus := cmd.Run()
+
+	if exitStatus == nil {
+		exitCode = 0
+	} else {
+		switch exitStatus := exitStatus.(type) {
+		case *exec.ExitError:
+			exitCode = exitStatus.Sys().(syscall.WaitStatus).ExitStatus()
+		default:
+			fail("exec", exitStatus)
+		}
+	}
+	return
+}
+
+// Find the proxied plugin from the CNI_PATH environment var
+func findRealPlugin() string {
+	pluginName := getArgOrFail("X_REAL_PLUGIN")
+	paths := strings.Split(os.Getenv("CNI_PATH"), ":")
+
+	pluginPath, err := invoke.FindInPath(pluginName, paths)
+
+	if err != nil {
+		fail("Could not find plugin in CNI_PATH", err)
+	}
+	return pluginPath
+}
+
+func fail(msgs ...interface{}) {
+	fmt.Fprintln(os.Stderr, append([]interface{}{"CNIPROXY fail:"}, msgs...)...)
+	os.Exit(1)
+}
+
+func getArgOrFail(key string) string {
+	val, exists := cniArgs[key]
+
+	if !exists {
+		fail("Needed CNI_ARG", key)
+	}
+	return val
+}
+
+func parseCniArgs() {
+	cniArgs = make(map[string]string)
+
+	argStr := os.Getenv("CNI_ARGS")
+
+	for _, arg := range strings.Split(argStr, ";") {
+		argkv := strings.Split(arg, "=")
+		if len(argkv) != 2 {
+			fail("Invalid CNI arg", arg)
+		}
+		cniArgs[argkv[0]] = argkv[1]
+	}
+}
diff --git a/tests/functional.mk b/tests/functional.mk
index d22095ba3f..462ac33714 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -21,6 +21,7 @@ FTST_ACI_INSPECT := $(FTST_IMAGE_ROOTFSDIR)/inspect
 FTST_ACE_BINARY := $(FTST_TMPDIR)/ace-validator
 FTST_ECHO_SERVER_BINARY := $(FTST_TMPDIR)/echo-socket-activated
 FTST_ACI_ECHO_SERVER := $(FTST_IMAGE_ROOTFSDIR)/echo-socket-activated
+FTST_CNI_PROXY_BINARY := $(FTST_TMPDIR)/cniproxy
 FTST_EMPTY_IMAGE_DIR := $(FTST_TMPDIR)/empty-image
 FTST_EMPTY_IMAGE_ROOTFSDIR := $(FTST_EMPTY_IMAGE_DIR)/rootfs
 FTST_EMPTY_IMAGE := $(FTST_TMPDIR)/rkt-empty.aci
@@ -53,6 +54,7 @@ INSTALL_SYMLINKS += \
 CLEAN_FILES += \
 	$(FTST_IMAGE) \
 	$(FTST_ECHO_SERVER_BINARY) \
+	$(FTST_CNI_PROXY_BINARY) \
 	$(FTST_INSPECT_BINARY) \
 	$(FTST_EMPTY_IMAGE) \
 	$(FTST_IMAGE_ROOTFSDIR)/dir1/file \
@@ -75,13 +77,25 @@ FTST_FUNCTIONAL_TESTS_TIMEOUT := 60m
 
 $(call forward-vars,$(FTST_FUNCTIONAL_TESTS_STAMP), \
 	FTST_RKT_PATH ACTOOL FTST_IMAGE FTST_EMPTY_IMAGE FTST_TEST_TMP ABS_GO \
-	FTST_INSPECT_BINARY GO_ENV GO_TEST_FUNC_ARGS REPO_PATH \
+	FTST_INSPECT_BINARY GO_ENV GO_TEST_FUNC_ARGS REPO_PATH FTST_CNI_PROXY_BINARY \
 	FTST_ACE_MAIN_IMAGE FTST_ACE_SIDEKICK_IMAGE RKT_STAGE1_DEFAULT_FLAVOR FTST_SS1_IMAGE \
 	FTST_FUNCTIONAL_TESTS_TIMEOUT)
 $(FTST_FUNCTIONAL_TESTS_STAMP): $(FTST_IMAGE) $(FTST_EMPTY_IMAGE) $(ACTOOL_STAMP) $(RKT_STAMP) $(FTST_ACE_MAIN_IMAGE) $(FTST_ACE_SIDEKICK_IMAGE) $(FTST_SS1_STAMP) | $(FTST_TEST_TMP) $(FTST_RKT_PATH) $(FTST_STAGE1_ALL_FLAVOR_SYMLINKS)
 	$(VQ) \
 	$(call vb,vt,GO TEST,$(REPO_PATH)/tests) \
-	sudo RKT_STAGE1_DEFAULT_FLAVOR="$(RKT_STAGE1_DEFAULT_FLAVOR)" RKT="$(FTST_RKT_PATH)" ACTOOL="$(ACTOOL)" RKT_INSPECT_IMAGE="$(FTST_IMAGE)" RKT_EMPTY_IMAGE="$(FTST_EMPTY_IMAGE)" RKT_ACE_MAIN_IMAGE=$(FTST_ACE_MAIN_IMAGE) RKT_ACE_SIDEKICK_IMAGE=$(FTST_ACE_SIDEKICK_IMAGE) FUNCTIONAL_TMP="$(FTST_TEST_TMP)" INSPECT_BINARY="$(FTST_INSPECT_BINARY)" STUB_STAGE1="$(FTST_SS1_IMAGE)" $(GO_ENV) "$(ABS_GO)" test -tags $(RKT_STAGE1_DEFAULT_FLAVOR) -timeout $(FTST_FUNCTIONAL_TESTS_TIMEOUT) -v $(GO_TEST_FUNC_ARGS) $(REPO_PATH)/tests
+	sudo RKT_STAGE1_DEFAULT_FLAVOR="$(RKT_STAGE1_DEFAULT_FLAVOR)" \
+		RKT="$(FTST_RKT_PATH)" \
+		ACTOOL="$(ACTOOL)" \
+		RKT_INSPECT_IMAGE="$(FTST_IMAGE)" \
+		RKT_EMPTY_IMAGE="$(FTST_EMPTY_IMAGE)" \
+		RKT_ACE_MAIN_IMAGE=$(FTST_ACE_MAIN_IMAGE) \
+		RKT_ACE_SIDEKICK_IMAGE=$(FTST_ACE_SIDEKICK_IMAGE) \
+		RKT_CNI_PROXY=$(FTST_CNI_PROXY_BINARY) \
+		FUNCTIONAL_TMP="$(FTST_TEST_TMP)" \
+		INSPECT_BINARY="$(FTST_INSPECT_BINARY)" \
+		STUB_STAGE1="$(FTST_SS1_IMAGE)" \
+		$(GO_ENV) "$(ABS_GO)" \
+		test -tags $(RKT_STAGE1_DEFAULT_FLAVOR) -timeout $(FTST_FUNCTIONAL_TESTS_TIMEOUT) -v $(GO_TEST_FUNC_ARGS) $(REPO_PATH)/tests
 
 $(call forward-vars,$(FTST_IMAGE), \
 	FTST_IMAGE_ROOTFSDIR ACTOOL FTST_IMAGE_DIR)
@@ -142,6 +156,16 @@ BGB_ADDITIONAL_GO_ENV := CGO_ENABLED=0
 
 include makelib/build_go_bin.mk
 
+
+BGB_STAMP := $(FTST_FUNCTIONAL_TESTS_STAMP)
+BGB_BINARY := $(FTST_CNI_PROXY_BINARY)
+BGB_PKG_IN_REPO := $(call go-pkg-from-dir)/cniproxy
+BGB_GO_FLAGS := -a -installsuffix cgo
+BGB_ADDITIONAL_GO_ENV := CGO_ENABLED=0
+
+include makelib/build_go_bin.mk
+
+
 # 1 - image
 # 2 - aci directory
 # 3 - ace validator
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 629acc652e..f958a01ba6 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -17,6 +17,7 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"crypto/sha1"
 	"flag"
 	"fmt"
 	"io/ioutil"
@@ -56,6 +57,7 @@ var (
 		ReadFile           bool
 		WriteFile          bool
 		StatFile           bool
+		HashFile           bool
 		Sleep              int
 		PreSleep           int
 		PrintMemoryLimit   bool
@@ -99,6 +101,7 @@ func init() {
 	globalFlagset.BoolVar(&globalFlags.ReadFile, "read-file", false, "Print the content of the file $FILE")
 	globalFlagset.BoolVar(&globalFlags.WriteFile, "write-file", false, "Write $CONTENT in the file $FILE")
 	globalFlagset.BoolVar(&globalFlags.StatFile, "stat-file", false, "Print the ownership and mode of the file $FILE")
+	globalFlagset.BoolVar(&globalFlags.HashFile, "hash-file", false, "Print the SHA1SUM of the file $FILE")
 	globalFlagset.IntVar(&globalFlags.Sleep, "sleep", -1, "Sleep before exiting (in seconds)")
 	globalFlagset.IntVar(&globalFlags.PreSleep, "pre-sleep", -1, "Sleep before executing (in seconds)")
 	globalFlagset.BoolVar(&globalFlags.PrintMemoryLimit, "print-memorylimit", false, "Print cgroup memory limit")
@@ -371,6 +374,21 @@ func main() {
 		fmt.Printf("%s: group: %v\n", fileName, fi.Sys().(*syscall.Stat_t).Gid)
 	}
 
+	if globalFlags.HashFile {
+		fileName := os.Getenv("FILE")
+		if globalFlags.FileName != "" {
+			fileName = globalFlags.FileName
+		}
+
+		dat, err := ioutil.ReadFile(fileName)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Cannot read file %q: %v\n", fileName, err)
+			os.Exit(1)
+		}
+
+		fmt.Printf("sha1sum: %x\n", sha1.Sum(dat))
+	}
+
 	if globalFlags.PrintCwd {
 		wd, err := os.Getwd()
 		if err != nil {
diff --git a/tests/rkt_dns_test.go b/tests/rkt_dns_test.go
index dacbd394b6..e7287e217f 100644
--- a/tests/rkt_dns_test.go
+++ b/tests/rkt_dns_test.go
@@ -12,26 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build host coreos src fly
-
 package main
 
 import (
+	"crypto/sha1"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/coreos/rkt/tests/testutils"
 )
 
 // TestDNS is checking how rkt fills /etc/resolv.conf
-func TestDNS(t *testing.T) {
+func TestDNSParam(t *testing.T) {
 	imageFile := patchTestACI("rkt-inspect-exit.aci", "--exec=/inspect --print-msg=Hello --read-file")
 	defer os.Remove(imageFile)
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	for _, tt := range []struct {
+	for i, tt := range []struct {
 		paramDNS      string
 		expectedLine  string
 		expectedError bool
@@ -39,7 +40,7 @@ func TestDNS(t *testing.T) {
 		{
 			paramDNS:      "",
 			expectedLine:  "Cannot read file",
-			expectedError: true,
+			expectedError: TestedFlavor.ExitStatusPreserved,
 		},
 		{
 			paramDNS:      "--dns=8.8.4.4",
@@ -66,11 +67,49 @@ func TestDNS(t *testing.T) {
 			expectedLine:  "options debug use-vc rotate",
 			expectedError: false,
 		},
+		{
+			paramDNS:      "--dns-opt=debug --dns-opt=use-vc --dns-opt=rotate --dns-domain=example.net",
+			expectedLine:  "domain example.net",
+			expectedError: false,
+		},
 	} {
 
 		rktCmd := fmt.Sprintf(`%s --insecure-options=image run --set-env=FILE=/etc/resolv.conf %s %s`,
 			ctx.Cmd(), tt.paramDNS, imageFile)
-		t.Logf("%s\n", rktCmd)
+		_ = i
+		// t.Logf("%d: %s\n", i, rktCmd)
 		runRktAndCheckOutput(t, rktCmd, tt.expectedLine, tt.expectedError)
 	}
 }
+
+// TestHostDNS checks that --dns=host reflects the host's /etc/resolv.conf
+func TestDNSHost(t *testing.T) {
+	dat, err := ioutil.ReadFile("/etc/resolv.conf")
+	if err != nil {
+		t.Fatal("Could not read host's resolv.conf", err)
+	}
+
+	sum := fmt.Sprintf("%x", sha1.Sum(dat))
+	t.Log("Expecting sum", sum)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	appCmd := "--exec=/inspect -- --hash-file"
+	rktCmd := fmt.Sprintf("%s --insecure-options=image run --dns=host --set-env=FILE=/etc/resolv.conf %s %s",
+		ctx.Cmd(), getInspectImagePath(), appCmd)
+
+	child := spawnOrFail(t, rktCmd)
+	ctx.RegisterChild(child)
+	defer waitOrFail(t, child, 0)
+
+	expectedRegex := `sha1sum: ([0-9a-f]+)`
+	result, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
+	if err != nil {
+		t.Fatalf("Error: %v\nOutput: %v", err, out)
+	}
+
+	if result[1] != sum {
+		t.Fatalf("container's /etc/host has sha1sum %s expected %s", result[1], sum)
+	}
+}
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index f19e91e65b..cb09fafebc 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build host coreos src
+// +build !fly
 
 package main
 
 import (
+	"crypto/sha1"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -31,25 +32,14 @@ import (
 
 // stage1/prepare-app will populate /etc/hosts with a 127.0.0.1 entry when absent,
 // or leave it alone when present.  These tests verify that behavior.
-var etcHostsTests = []struct {
-	rktCmd      string
-	expectRegEx string
-}{
-	{
-		`/bin/sh -c "export FILE=/etc/hosts; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true ^ETC_HOSTS_CREATE^"`,
-		`127\.0\.0\.1.*`,
-	},
-	{
-		`/bin/sh -c "export FILE=/etc/hosts; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=etc,kind=host,source=^TMPETC^ ^ETC_HOSTS_EXISTS^"`,
-		`<<<preexisting etc>>>`,
-	},
-}
 
-func TestPrepareAppEnsureEtcHosts(t *testing.T) {
-	etcHostsCreateImage := patchTestACI("rkt-inspect-etc-hosts-create.aci", "--exec=/inspect --read-file")
-	defer os.Remove(etcHostsCreateImage)
-	etcHostsExistsImage := patchTestACI("rkt-inspect-etc-hosts-exists.aci", "--exec=/inspect --read-file", "--mounts=etc,path=/etc,readOnly=false")
-	defer os.Remove(etcHostsExistsImage)
+/*
+	The stage0 can create an etc hosts
+
+	prepare-app will overwrite the app's /etc/hosts if the stage0 created one
+	Otherwise, it will create a fallback /etc/hosts if the stage2 does not have one
+*/
+func TestEtcHosts(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
@@ -63,12 +53,47 @@ func TestPrepareAppEnsureEtcHosts(t *testing.T) {
 		t.Fatalf("Cannot create etc/hosts file: %v", err)
 	}
 
-	for i, tt := range etcHostsTests {
-		cmd := strings.Replace(tt.rktCmd, "^TMPDIR^", tmpdir, -1)
-		cmd = strings.Replace(cmd, "^RKT_BIN^", ctx.Cmd(), -1)
-		cmd = strings.Replace(cmd, "^ETC_HOSTS_CREATE^", etcHostsCreateImage, -1)
-		cmd = strings.Replace(cmd, "^ETC_HOSTS_EXISTS^", etcHostsExistsImage, -1)
-		cmd = strings.Replace(cmd, "^TMPETC^", tmpetc, -1)
+	dat, err := ioutil.ReadFile("/etc/hosts")
+	if err != nil {
+		t.Fatal("Could not read host's /etc/hosts", err)
+	}
+
+	sum := fmt.Sprintf("%x", sha1.Sum(dat))
+
+	tests := []struct {
+		rktArgs     string
+		inspectArgs string
+		expectRegEx string
+	}{
+		{
+			fmt.Sprintf("--volume hosts,kind=host,source=%s", tmpfile),
+			"--mount volume=hosts,target=/etc/hosts --exec=/inspect -- -file-name=/etc/hosts -read-file",
+			"<<<preexisting etc>>>",
+		},
+		{ // Test that with no /etc/hosts, the fallback is created
+			"",
+			"--exec=/inspect -- -file-name=/etc/hosts -hash-file",
+			"192f716fb0db669de1c537b845b632f03c9aeb40",
+		},
+		{ // Test that with --hosts-entry=host, the host's is copied
+			"--hosts-entry=host",
+			"--exec=/inspect -- -file-name=/etc/hosts -hash-file",
+			sum,
+		},
+		{ // test that we create our own
+			"--hosts-entry=128.66.0.99=host1",
+			"--exec=/inspect -- -file-name=/etc/hosts -read-file",
+			"128.66.0.99 host1",
+		},
+	}
+
+	for i, tt := range tests {
+		cmd := fmt.Sprintf(
+			"%s run --insecure-options=image %s %s %s",
+			ctx.Cmd(),
+			tt.rktArgs,
+			getInspectImagePath(),
+			tt.inspectArgs)
 
 		t.Logf("Running test #%v: %v", i, cmd)
 
@@ -77,9 +102,9 @@ func TestPrepareAppEnsureEtcHosts(t *testing.T) {
 			t.Fatalf("Cannot exec rkt #%v: %v", i, err)
 		}
 
-		_, _, err = expectRegexTimeoutWithOutput(child, tt.expectRegEx, time.Minute)
+		_, out, err := expectRegexTimeoutWithOutput(child, tt.expectRegEx, 30*time.Second)
 		if err != nil {
-			t.Fatalf("Expected %q but not found #%v: %v", tt.expectRegEx, i, err)
+			t.Fatalf("Test %d %v %v", i, err, out)
 		}
 
 		err = child.Wait()
diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index e327cdd073..1d28d19bdf 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -87,3 +87,19 @@ func TestNetDefaultRestrictedConnectivity(t *testing.T) {
 func TestNetDefaultGW(t *testing.T) {
 	NewNetDefaultGWTest().Execute(t)
 }
+
+func TestNetCNIEnv(t *testing.T) {
+	NewNetCNIEnvTest().Execute(t)
+}
+
+func TestNetCNIDNS(t *testing.T) {
+	NewNetCNIDNSTest().Execute(t)
+}
+
+func TestNetCNIDNSArg(t *testing.T) {
+	NewNetCNIDNSArgTest().Execute(t)
+}
+
+func TestNetCNIDNSArgNone(t *testing.T) {
+	NewNetCNIDNSArgNoneTest().Execute(t)
+}
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index 344705f53d..b56d2096ae 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -22,6 +22,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 	"syscall"
@@ -29,6 +30,7 @@ import (
 	"time"
 
 	"github.com/coreos/rkt/networking/netinfo"
+	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/tests/testutils"
 	"github.com/coreos/rkt/tests/testutils/logger"
 	"github.com/vishvananda/netlink"
@@ -499,6 +501,17 @@ func writeNetwork(t *testing.T, net networkTemplateT, netd string) error {
 	return nil
 }
 
+// Compute what we should pass to the --net parameter at runtime
+func (nt *networkTemplateT) NetParameter() string {
+	out := nt.Name
+
+	if len(nt.Args) > 0 {
+		out += ":" + strings.Join(nt.Args, ";")
+	}
+
+	return out
+}
+
 type networkTemplateT struct {
 	Name       string
 	Type       string
@@ -509,6 +522,7 @@ type networkTemplateT struct {
 	Bridge     string             `json:"bridge,omitempty"`
 	Ipam       *ipamTemplateT     `json:",omitempty"`
 	Delegate   *delegateTemplateT `json:",omitempty"`
+	Args       []string           `json:"args,omitempty"` // Arguments to the CNI plugin, array of "foo=bar" pairs
 }
 
 type ipamTemplateT struct {
@@ -526,6 +540,7 @@ func TestNetTemplates(t *testing.T) {
 	net := networkTemplateT{
 		Name: "ptp0",
 		Type: "ptp",
+		Args: []string{"two=three", "black=white"},
 		Ipam: &ipamTemplateT{
 			Type:   "host-local",
 			Subnet: "11.11.3.0/24",
@@ -537,12 +552,47 @@ func TestNetTemplates(t *testing.T) {
 	if err != nil {
 		t.Fatalf("%v", err)
 	}
-	expected := `{"Name":"ptp0","Type":"ptp","IpMasq":false,"IsGateway":false,"Ipam":{"Type":"host-local","subnet":"11.11.3.0/24","routes":[{"dst":"0.0.0.0/0"}]}}`
+	expected := `{"Name":"ptp0","Type":"ptp","IpMasq":false,"IsGateway":false,"Ipam":{"Type":"host-local","subnet":"11.11.3.0/24","routes":[{"dst":"0.0.0.0/0"}]},"args":["two=three","black=white"]}`
 	if string(b) != expected {
 		t.Fatalf("Template extected:\n%v\ngot:\n%v\n", expected, string(b))
 	}
 }
 
+// The format of the logfile from cniproxy
+type cniProxyResult struct {
+	PluginPath string            `json:"pluginPath"`
+	Stdin      string            `json:"stdin"`
+	Stdout     string            `json:"stdout"`
+	Stderr     string            `json:"stderr"`
+	ExitCode   int               `json:"exitCode"`
+	Env        []string          `json:"env"`
+	EnvMap     map[string]string `json:"-"`
+}
+
+func parseCNIProxyLog(filepath string) (*cniProxyResult, error) {
+	fp, err := os.Open(filepath)
+	defer fp.Close()
+	if err != nil {
+		return nil, err
+	}
+	res := new(cniProxyResult)
+	err = json.NewDecoder(fp).Decode(res)
+	if err != nil {
+		return nil, err
+	}
+	res.EnvMap = make(map[string]string)
+
+	for _, envstr := range res.Env {
+		vals := strings.SplitN(envstr, "=", 2)
+		if len(vals) != 2 {
+			continue
+		}
+		res.EnvMap[vals[0]] = vals[1]
+	}
+
+	return res, nil
+}
+
 func prepareTestNet(t *testing.T, ctx *testutils.RktRunCtx, nt networkTemplateT) (netdir string) {
 	configdir := ctx.LocalDir()
 	netdir = filepath.Join(configdir, "net.d")
@@ -554,6 +604,19 @@ func prepareTestNet(t *testing.T, ctx *testutils.RktRunCtx, nt networkTemplateT)
 	if err != nil {
 		t.Fatalf("Cannot write network file: %v", err)
 	}
+
+	// If we're proxying the CNI call, then make sure it's in the netdir
+	if nt.Type == "cniproxy" {
+		dest := filepath.Join(netdir, "cniproxy")
+		err := fileutil.CopyRegularFile(testutils.GetValueFromEnvOrPanic("RKT_CNI_PROXY"), dest)
+		if err != nil {
+			t.Fatalf("Cannot copy cniproxy")
+		}
+		os.Chmod(dest, 0755)
+		if err != nil {
+			t.Fatalf("Cannot chmod cniproxy")
+		}
+	}
 	return netdir
 }
 
@@ -709,6 +772,265 @@ func testNetCustomNatConnectivity(t *testing.T, nt networkTemplateT) {
 	ga.Wait()
 }
 
+//Test that the CNI execution environment matches the spec
+func NewNetCNIEnvTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
+		if err != nil {
+			t.Fatalf("Error while getting non-lo host interface: %v\n", err)
+		}
+		if iface.Name == "" {
+			t.Skipf("Cannot run test without non-lo host interface")
+		}
+
+		// Declares a network of type cniproxy, which will record state and
+		// proxy through to $X_REAL_PLUGIN
+		nt := networkTemplateT{
+			Name:      "bridge0",
+			Type:      "cniproxy",
+			Args:      []string{"X_LOG=output.json", "X_REAL_PLUGIN=bridge"},
+			IpMasq:    true,
+			IsGateway: true,
+			Master:    iface.Name,
+			Ipam: &ipamTemplateT{
+				Type:   "host-local",
+				Subnet: "11.11.3.0/24",
+				Routes: []map[string]string{
+					{"dst": "0.0.0.0/0"},
+				},
+			},
+		}
+
+		// bring the networking up, copy the proxy
+		netdir := prepareTestNet(t, ctx, nt)
+		defer os.RemoveAll(netdir)
+
+		ga := testutils.NewGoroutineAssistant(t)
+		ga.Add(1)
+
+		go func() {
+			defer ga.Done()
+			appCmd := "--exec=/inspect -- --print-defaultgwv4 "
+			cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false %s %s",
+				ctx.Cmd(), nt.NetParameter(), getInspectImagePath(), appCmd)
+			child := ga.SpawnOrFail(cmd)
+			defer ga.WaitOrFail(child)
+
+			expectedRegex := "DefaultGWv4: 11.11.3.1"
+
+			_, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
+			if err != nil {
+				ga.Fatalf("Error: %v\nOutput: %v", err, out)
+			}
+		}()
+
+		ga.Wait()
+
+		// Parse the log file
+		proxyLog, err := parseCNIProxyLog(filepath.Join(netdir, "output.json"))
+		if err != nil {
+			t.Fatal("Failed to read cniproxy log", err)
+		}
+
+		// Check that the stdin matches the network config file
+		expectedConfig, err := ioutil.ReadFile(filepath.Join(netdir, nt.Name+".conf"))
+		if err != nil {
+			t.Fatal("Failed to read network configuration", err)
+		}
+
+		if string(expectedConfig) != proxyLog.Stdin {
+			t.Fatalf("CNI plugin stdin incorrect, expected <<%v>>, actual <<%v>>", expectedConfig, proxyLog.Stdin)
+		}
+
+		// Check that the environment is sane - these are regexes
+		expectedEnv := map[string]string{
+			"CNI_VERSION":     "0.3.0",
+			"CNI_COMMAND":     "ADD",
+			"CNI_IFNAME":      `eth\d`,
+			"CNI_PATH":        netdir,
+			"CNI_NETNS":       `/var/run/netns/cni-`,
+			"CNI_CONTAINERID": `^[a-fA-F0-9-]{36}`, //UUID, close enough
+		}
+
+		for k, v := range expectedEnv {
+			actual, exists := proxyLog.EnvMap[k]
+			if !exists {
+				t.Fatalf("Expected proxy CNI arg %s but not found", k)
+			}
+
+			re, err := regexp.Compile(v)
+			if err != nil {
+				t.Fatal("Invalid CNI env regex", v, err)
+			}
+			found := re.FindString(actual)
+			if found == "" {
+				t.Fatalf("CNI_ARG %s was %s but expected pattern %s", k, actual, v)
+			}
+		}
+	})
+}
+
+// Test that CNI invocations which return DNS information are carried through to /etc/resolv.conf
+func NewNetCNIDNSTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
+		if err != nil {
+			t.Fatalf("Error while getting non-lo host interface: %v\n", err)
+		}
+		if iface.Name == "" {
+			t.Skipf("Cannot run test without non-lo host interface")
+		}
+
+		nt := networkTemplateT{
+			Name:      "bridge0",
+			Type:      "cniproxy",
+			Args:      []string{"X_LOG=output.json", "X_REAL_PLUGIN=bridge", "X_ADD_DNS=1"},
+			IpMasq:    true,
+			IsGateway: true,
+			Master:    iface.Name,
+			Ipam: &ipamTemplateT{
+				Type:   "host-local",
+				Subnet: "11.11.3.0/24",
+				Routes: []map[string]string{
+					{"dst": "0.0.0.0/0"},
+				},
+			},
+		}
+
+		// bring the networking up, copy the proxy
+		netdir := prepareTestNet(t, ctx, nt)
+		defer os.RemoveAll(netdir)
+
+		ga := testutils.NewGoroutineAssistant(t)
+		ga.Add(1)
+
+		go func() {
+			defer ga.Done()
+
+			appCmd := "--exec=/inspect -- --read-file --file-name=/etc/resolv.conf"
+			cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false %s %s",
+				ctx.Cmd(), nt.NetParameter(), getInspectImagePath(), appCmd)
+			child := ga.SpawnOrFail(cmd)
+			defer ga.WaitOrFail(child)
+
+			expectedRegex := "nameserver 1.2.3.4"
+
+			_, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
+			if err != nil {
+				ga.Fatalf("Error: %v\nOutput: %v", err, out)
+			}
+		}()
+
+		ga.Wait()
+	})
+}
+
+// Test that `rkt run --dns` overrides CNI DNS
+func NewNetCNIDNSArgTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
+		if err != nil {
+			t.Fatalf("Error while getting non-lo host interface: %v\n", err)
+		}
+		if iface.Name == "" {
+			t.Skipf("Cannot run test without non-lo host interface")
+		}
+
+		nt := networkTemplateT{
+			Name:      "bridge0",
+			Type:      "cniproxy",
+			Args:      []string{"X_LOG=output.json", "X_REAL_PLUGIN=bridge", "X_ADD_DNS=1"},
+			IpMasq:    true,
+			IsGateway: true,
+			Master:    iface.Name,
+			Ipam: &ipamTemplateT{
+				Type:   "host-local",
+				Subnet: "11.11.3.0/24",
+				Routes: []map[string]string{
+					{"dst": "0.0.0.0/0"},
+				},
+			},
+		}
+
+		// bring the networking up, copy the proxy
+		netdir := prepareTestNet(t, ctx, nt)
+		defer os.RemoveAll(netdir)
+
+		appCmd := "--exec=/inspect -- --read-file --file-name=/etc/resolv.conf"
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false --dns=244.244.244.244 %s %s",
+			ctx.Cmd(), nt.NetParameter(), getInspectImagePath(), appCmd)
+		child := spawnOrFail(t, cmd)
+		defer waitOrFail(t, child, 0)
+
+		expectedRegex := "nameserver 244.244.244.244"
+
+		_, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+		}
+	})
+}
+
+// Test that `rkt run --dns=none` means no resolv.conf is created, even when
+// CNI returns DNS informationparseHostsEntries(flagHosts)
+func NewNetCNIDNSArgNoneTest() testutils.Test {
+	return testutils.TestFunc(func(t *testing.T) {
+		ctx := testutils.NewRktRunCtx()
+		defer ctx.Cleanup()
+
+		iface, _, err := testutils.GetNonLoIfaceWithAddrs(netlink.FAMILY_V4)
+		if err != nil {
+			t.Fatalf("Error while getting non-lo host interface: %v\n", err)
+		}
+		if iface.Name == "" {
+			t.Skipf("Cannot run test without non-lo host interface")
+		}
+
+		nt := networkTemplateT{
+			Name:      "bridge0",
+			Type:      "cniproxy",
+			Args:      []string{"X_LOG=output.json", "X_REAL_PLUGIN=bridge", "X_ADD_DNS=1"},
+			IpMasq:    true,
+			IsGateway: true,
+			Master:    iface.Name,
+			Ipam: &ipamTemplateT{
+				Type:   "host-local",
+				Subnet: "11.11.3.0/24",
+				Routes: []map[string]string{
+					{"dst": "0.0.0.0/0"},
+				},
+			},
+		}
+
+		// bring the networking up, copy the proxy
+		netdir := prepareTestNet(t, ctx, nt)
+		defer os.RemoveAll(netdir)
+
+		appCmd := "--exec=/inspect -- --stat-file --file-name=/etc/resolv.conf"
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false --dns=none %s %s",
+			ctx.Cmd(), nt.NetParameter(), getInspectImagePath(), appCmd)
+		child := spawnOrFail(t, cmd)
+		ctx.RegisterChild(child)
+		defer waitOrFail(t, child, 1)
+
+		expectedRegex := `Cannot stat file "/etc/resolv.conf": stat /etc/resolv.conf: no such file or directory`
+
+		_, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+		}
+	})
+}
+
 func NewNetCustomPtpTest(runCustomDual bool) testutils.Test {
 	return testutils.TestFunc(func(t *testing.T) {
 		nt := networkTemplateT{

From 7ea6f40ae885d242bdc8172c7cf53d51bb8bc8aa Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 8 Sep 2016 17:12:07 +0200
Subject: [PATCH 0741/1304] build: build simple .deb and .rpm packages

---
 Documentation/devel/release.md |  23 ++++---
 scripts/build-rir.sh           |   6 +-
 scripts/pkg/after-install      |   2 +
 scripts/pkg/after-remove       |   2 +
 scripts/pkg/before-install     |   2 +
 scripts/pkg/before-remove      |  11 ++++
 scripts/pkg/build-pkgs.sh      | 109 +++++++++++++++++++++++++++++++++
 7 files changed, 145 insertions(+), 10 deletions(-)
 create mode 100644 scripts/pkg/after-install
 create mode 100644 scripts/pkg/after-remove
 create mode 100644 scripts/pkg/before-install
 create mode 100644 scripts/pkg/before-remove
 create mode 100755 scripts/pkg/build-pkgs.sh

diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index 609ca6b14b..126d3d8907 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -46,15 +46,22 @@ The rkt version is [hardcoded in the repository](https://github.com/coreos/rkt/b
 - File a PR and get a review from another [MAINTAINER](https://github.com/coreos/rkt/blob/master/MAINTAINERS).
   This is useful to a) sanity check the diff, and b) be very explicit/public that a release is happening
 - Ensure the CI on the release PR is green!
+- Merge the PR
 
-After merging and going back to master branch, we check out the release version and tag it:
+Check out the release commit and build it!
 
-- `git checkout HEAD^` should work; sanity check configure.ac (2nd line) after doing this
-- Build rkt inside rkt (so make sure you have rkt in your $PATH), we'll use this in a minute:
+- `git checkout HEAD^` should work. You want to be at the commit where the version is without "+git". Sanity check configure.ac (2nd line).
+- Build rkt inside rkt (so make sure you have rkt in your $PATH):
   - `export BUILDDIR=$PWD/release-build && mkdir -p $BUILDDIR && sudo BUILDDIR=$BUILDDIR ./scripts/build-rir.sh`
-  - Sanity check `release-build/target/bin/rkt version`
-  - Sanity check `ldd release-build/target/bin/rkt`: it can contain linux-vdso.so, libpthread.so, libc.so, libdl.so and ld-linux-x86-64.so but nothing else.
-  - Sanity check `ldd release-build/target/tools/init`: same as above.
+- Sanity check the binary:
+  - Check `release-build/target/bin/rkt version`
+  - Check `ldd release-build/target/bin/rkt`: it can contain linux-vdso.so, libpthread.so, libc.so, libdl.so and ld-linux-x86-64.so but nothing else.
+  - Check `ldd release-build/target/tools/init`: same as above.
+- Build convenience packages:
+  - `sudo BUILDDIR=$BUILDDIR ./scripts/build-rir.sh --exec=./scripts/pkg/build-pkgs.sh -- 1.2.0` (add correct version)
+
+Sign a tagged release and push it to GitHub:
+
 - Grab the release key (see details below) and add a signed tag: `GIT_COMMITTER_NAME="CoreOS Application Signing Key" GIT_COMMITTER_EMAIL="security@coreos.com" git tag -u $RKTSUBKEYID'!' -s v1.2.0 -m "rkt v1.2.0"`
 - Push the tag to GitHub: `git push --tags`
 
@@ -93,8 +100,8 @@ The public key for GPG signing can be found at [CoreOS Application Signing Key](
 The following commands are used for public release signing:
 
 ```
-for i in $NAME.tar.gz stage1-*.aci; do gpg2 -u $RKTSUBKEYID'!' --armor --output ${i}.asc --detach-sign ${i}; done
-for i in $NAME.tar.gz stage1-*.aci; do gpg2 --verify ${i}.asc ${i}; done
+for i in $NAME.tar.gz stage1-*.aci *.deb *.rpm; do gpg2 -u $RKTSUBKEYID'!' --armor --output ${i}.asc --detach-sign ${i}; done
+for i in $NAME.tar.gz stage1-*.aci *.deb *.rpm; do gpg2 --verify ${i}.asc ${i}; done
 ```
 
 - Once signed and uploaded, double-check that all artifacts and signatures are on github. There should be 8 files in attachments (1x tar.gz, 3x ACI, 4x armored signatures).
diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 3335e41891..d2406fb1f6 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,11 +4,13 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.0.2}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.1.0}"
+RKT_CMD="${RKT_CMD:-rkt}"
 
 mkdir -p $BUILDDIR
 
-rkt run \
+$RKT_CMD run \
+    --dns=8.8.8.8 \
     --volume src-dir,kind=host,source="${SRC_DIR}" \
     --volume build-dir,kind=host,source="${BUILDDIR}" \
     --interactive \
diff --git a/scripts/pkg/after-install b/scripts/pkg/after-install
new file mode 100644
index 0000000000..6e6634d874
--- /dev/null
+++ b/scripts/pkg/after-install
@@ -0,0 +1,2 @@
+systemd-tmpfiles --create /usr/lib/tmpfiles.d/rkt.conf
+systemctl daemon-reload || true
diff --git a/scripts/pkg/after-remove b/scripts/pkg/after-remove
new file mode 100644
index 0000000000..88a40f5a82
--- /dev/null
+++ b/scripts/pkg/after-remove
@@ -0,0 +1,2 @@
+rm -rf /var/lib/rkt
+systemctl daemon-reload || true
diff --git a/scripts/pkg/before-install b/scripts/pkg/before-install
new file mode 100644
index 0000000000..30ec41ba96
--- /dev/null
+++ b/scripts/pkg/before-install
@@ -0,0 +1,2 @@
+groupadd --force --system rkt-admin
+groupadd --force --system rkt
diff --git a/scripts/pkg/before-remove b/scripts/pkg/before-remove
new file mode 100644
index 0000000000..afaa4a170f
--- /dev/null
+++ b/scripts/pkg/before-remove
@@ -0,0 +1,11 @@
+if [ -f /usr/bin/rkt ]; then
+    if [ -n "$(/usr/bin/rkt list --no-legend | awk '{print $4}' | grep running)" ]; then
+        printf "rkt/before-remove error: detected running containers.\n"
+        exit 1
+    fi
+    /usr/bin/rkt gc --grace-period=0s
+    if [ -n "$(grep "/var/lib/rkt" /proc/mounts)" ]; then
+        printf "rkt/before-remove error: detected active mounts in [/var/lib/rkt].\n"
+        exit 1
+    fi
+fi
diff --git a/scripts/pkg/build-pkgs.sh b/scripts/pkg/build-pkgs.sh
new file mode 100755
index 0000000000..3cbb43534c
--- /dev/null
+++ b/scripts/pkg/build-pkgs.sh
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+##
+## build .deb and .rpm packages from an already-built
+## version of rkt
+
+set -e
+set -x
+
+version=$1
+
+MAINTAINER=security@coreos.com
+LICENSE="APLv2"
+VENDOR="CoreOS, Inc."
+HOMEPAGE="https://www.github.com/coreos/rkt"
+#iteration is the package version; bump if you need to repackage without
+#changing the rkt version
+ITERATION="${ITERATION:-1}" 
+builddir="${BUILDDIR:-/opt/build-rkt}"
+
+function usage {
+    echo "usage: BUILDDIR=<builddir> $0 <version>" >&2 
+    exit 1
+}
+
+if [ ! -d $builddir ]; then
+    echo "could not find build dir $builddir" >&2
+    usage
+fi
+
+if [ -z $version ]; then
+    echo "version not specified" >&2
+    usage
+fi
+
+srcdir=`dirname "$0"`
+projectdir=$srcdir/../..
+
+###################################
+## INSTALL RKT
+#################################
+workdir=$(mktemp -d /tmp/rkt-pkg.XXXXXX)
+prefix=$workdir/rootfs
+mkdir -p $prefix
+
+## install binary
+install -Dm755 $builddir/target/bin/rkt $prefix/usr/bin/rkt
+
+## install stage1s
+for flavor in fly coreos kvm; do
+    install -Dm644 $builddir/target/bin/stage1-${flavor}.aci $prefix/usr/lib/rkt/stage1-images/stage1-${flavor}.aci
+done
+
+## manpages & doc
+for f in $projectdir/dist/manpages/*; do 
+    install -Dm644 -t $prefix/usr/share/man/man1 "${f}" 
+done
+
+for dir in . subcommands networking performance; do
+    for f in $projectdir/Documentation/$dir/*.*; do
+        install -Dm644 -t $prefix/usr/share/doc/rkt "${f}"
+    done
+done
+
+install -Dm644 $projectdir/dist/bash_completion/rkt.bash $prefix/usr/share/bash-completion/completions/rkt
+install -Dm644 $projectdir/dist/init/systemd/tmpfiles.d/rkt.conf $prefix/usr/lib/tmpfiles.d/rkt.conf
+
+for unit in rkt-gc.{timer,service} rkt-metadata.{socket,service}; do
+    install -Dm644 -t $prefix/usr/lib/systemd/system/  $projectdir/dist/init/systemd/${unit}
+done
+
+## Copy before and after-install
+cp $srcdir/*-{install,remove} $workdir/
+
+
+#######################
+## BUILD THE PACKAGES
+#######################
+cd $builddir/target/bin
+fpm -s dir -t deb \
+    -n "rkt" -v "$version" --iteration "$ITERATION" \
+    --after-install $workdir/after-install \
+    --before-install $workdir/before-install \
+	--after-remove $workdir/after-remove \
+	--before-remove $workdir/before-remove \
+	--after-upgrade $workdir/after-install \
+	--before-upgrade $workdir/before-remove \
+    --license "$LICENSE" --vendor "$VENDOR" --url "$HOMEPAGE" -m "$MAINTAINER" --category utils \
+    -d adduser \
+    -d dbus \
+    -d libc6 \
+    -d systemd \
+    --deb-suggests ca-certificates \
+    -C ${prefix} 
+
+fpm -s dir -t rpm \
+    -n "rkt" -v "$version" --iteration "$ITERATION" \
+    --after-install $workdir/after-install \
+    --before-install $workdir/before-install \
+	--after-remove $workdir/after-remove \
+	--before-remove $workdir/before-remove \
+	--after-upgrade $workdir/after-install \
+	--before-upgrade $workdir/before-remove \
+    --license "$LICENSE" --vendor "$VENDOR" --url "$HOMEPAGE" -m "$MAINTAINER" --category utils \
+    --provides rkt \
+    -d 'shadow-utils' \
+    -C ${prefix} 
+
+rm -rf $workdir

From 3a6276ae23807ea00e0e468b79c6d560a6cbd472 Mon Sep 17 00:00:00 2001
From: Rob Phoenix <robertphoenix@gmail.com>
Date: Thu, 15 Sep 2016 11:25:32 +0100
Subject: [PATCH 0742/1304] Documentation: update Ubuntu installation

The documentation was unclear as to where to get the `install-rkt.sh`
script. This makes it clear, and also describes how to install without
having to clone the entire rkt repo
---
 Documentation/distributions.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 9faf390798..564ad39651 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -25,12 +25,24 @@ If you prefer to install the newest version of rkt follow the instructions in th
 
 ## Ubuntu
 
-rkt is not packaged currently in Ubuntu. If you want the newest version of rkt the easiest method to install it is using the `install-rkt.sh` script:
+rkt is not packaged currently in Ubuntu. If you want the newest version of rkt the easiest method to install it is using the `install-rkt.sh` script. This script can be found in the *scripts* directory of the [rkt Github repository](https://github.com/coreos/rkt).
+
+Either clone the repository and run the script:
 
 ```
+git clone https://github.com/coreos/rkt
+cd rkt
 sudo ./scripts/install-rkt.sh
 ```
 
+Or just get the script:
+
+```
+wget https://raw.githubusercontent.com/coreos/rkt/master/scripts/install-rkt.sh
+chmod +x install-rkt.sh
+sudo ./install-rkt.sh
+```
+
 The above script will install the "gnupg2", and "checkinstall" packages, download rkt, verify it, and finally invoke "checkinstall" to create a deb pakage and install rkt. To uninstall rkt, execute:
 
 ```

From 794a1e17b755a309febbb8f59b6dc395de25d5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Thu, 15 Sep 2016 12:33:24 +0200
Subject: [PATCH 0743/1304] makefile/kvm: add dependency for copied files

---
 stage1/stage1.mk | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/stage1/stage1.mk b/stage1/stage1.mk
index d7d76cff3e..32ee29a1fd 100644
--- a/stage1/stage1.mk
+++ b/stage1/stage1.mk
@@ -180,23 +180,24 @@ $$(call forward-vars,$$(STAGE1_ACI_IMAGE_$1-$i), \
 # and ensure that all of them will be removed
 $(if $(strip $2), \
         $(eval IMG := $(foreach h,$2,$1-$h)) \
-        $(foreach s,$(IMG), \
+        $(foreach s,$(IMG),
                 $(call setup-stamp-file,STAGE1_COPY_IMAGE_FILES_$s,/copy-files-$s) \
 		$$(STAGE1_COPY_IMAGE_FILES_$s): $$(STAGE1_ALL_STAMPS_$1)
-			$(VQ) $(call vb,vt,COPY FILES,$$(call vsp,$s)) cp -rn $(STAGE1_ACIDIR_$1)/rootfs $(STAGE1_ACIDIR_$1)/manifest $(STAGE1_ACIDIR_$1)/$s \
+			$(VQ) $(call vb,vt,COPY FILES,$$(call vsp,$s)) cp -rn $(STAGE1_ACIDIR_$1)/rootfs $(STAGE1_ACIDIR_$1)/manifest $(STAGE1_ACIDIR_$1)/$s
 		$(eval CLEAN_DIRS += $(STAGE1_ACIDIR_$1)/$s)
-		$(call generate-clean-mk-simple, \
-		        $(STAGE1_ACI_IMAGE_$s), \
-		        $(STAGE1_ACIDIR_$1)/$s, \
-		        $(STAGE1_ACIDIR_$1)/$s, \
-		        $(STAGE1_COPY_IMAGE_FILES_$s), \
+		$(call generate-clean-mk-simple,
+		        $(STAGE1_ACI_IMAGE_$s),
+		        $(STAGE1_ACIDIR_$1)/$s,
+		        $(STAGE1_ACIDIR_$1)/$s,
+		        $(STAGE1_COPY_IMAGE_FILES_$s),
 		        copy-$s)), \
         $(eval IMG := $1))
 
 # Build images. Common files are stored in STAGE1_ACIDIR_$1,
 # image specific files in STAGE1_ACIDIR_$1/flavor-image/...
+# Add dependency for copying image-specific files, if any ($2 is not empty)
 $(foreach s,$(IMG),
-$$(STAGE1_ACI_IMAGE_$s): $$(ACTOOL_STAMP) | $$(TARGET_BINDIR)
+$$(STAGE1_ACI_IMAGE_$s): $$(ACTOOL_STAMP) | $$(TARGET_BINDIR) $$(if $(strip $2),$$(STAGE1_COPY_IMAGE_FILES_$s),)
 	$(eval ACI_OUTPUT := "$(if $(filter 1,$(words $2)),$(STAGE1_ACI_IMAGE_$1),$(STAGE1_ACI_IMAGE_$s))")
 	$(VQ) \
 	$(call vb,vt,ACTOOL,$$(call vsp,$(ACI_OUTPUT))) \

From aae6ea2b45091fbdd87973bffc5f872acd065139 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Tue, 28 Jun 2016 17:42:21 +0200
Subject: [PATCH 0744/1304] stage1: Implemented notifications from the app in
 the container to the host

After this patch, systemd on the host marks the container as "active"
when the init systemd in the container sends the ready message
instead of doing it after the container is created.
After this patch, rkt adds the switch `--notify-ready=yes` when it runs the pod
with systemd-nspawn.

Fixes: https://github.com/coreos/rkt/issues/1464

Warning:
If the application launched by rkt does not notify (with sd_notify())
that it is ready, then the application may be killed after a timeout.
---
 stage1/init/init.go              | 9 +++++++--
 stage1/prepare-app/prepare-app.c | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 9455e4b23e..62b6103059 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -322,7 +322,8 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 	case "coreos":
 		args = append(args, filepath.Join(common.Stage1RootfsPath(p.Root), interpBin))
 		args = append(args, filepath.Join(common.Stage1RootfsPath(p.Root), nspawnBin))
-		args = append(args, "--boot") // Launch systemd in the pod
+		args = append(args, "--boot")             // Launch systemd in the pod
+		args = append(args, "--notify-ready=yes") // From systemd v231
 
 		if context := os.Getenv(common.EnvSELinuxContext); context != "" {
 			args = append(args, fmt.Sprintf("-Z%s", context))
@@ -348,7 +349,8 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 	case "src":
 		args = append(args, filepath.Join(common.Stage1RootfsPath(p.Root), interpBin))
 		args = append(args, filepath.Join(common.Stage1RootfsPath(p.Root), nspawnBin))
-		args = append(args, "--boot") // Launch systemd in the pod
+		args = append(args, "--boot")             // Launch systemd in the pod
+		args = append(args, "--notify-ready=yes") // From systemd v231
 
 		if context := os.Getenv(common.EnvSELinuxContext); context != "" {
 			args = append(args, fmt.Sprintf("-Z%s", context))
@@ -390,6 +392,9 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 		if n != 1 || version < 220 {
 			return nil, nil, fmt.Errorf("rkt needs systemd-nspawn >= 220. %s version not supported: %v", hostNspawnBin, versionStr)
 		}
+		if version >= 231 {
+			args = append(args, "--notify-ready=yes") // From systemd v231
+		}
 
 		// Copy systemd, bash, etc. in stage1 at run-time
 		if err := installAssets(); err != nil {
diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index f187abb79c..466ab1a488 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -263,6 +263,8 @@ int main(int argc, char *argv[])
 		{ "/etc/rkt-hosts", "/etc/hosts", "bind", NULL, MS_BIND, false },
 		{ "/etc/hosts-fallback", "/etc/hosts", "bind", NULL, MS_BIND, true }, // only create as fallback
 		{ "/proc/sys/kernel/hostname", "/etc/hostname", "bind", NULL, MS_BIND, false },
+		// TODO @alepuccetti this could be removed when https://github.com/systemd/systemd/issues/3544 is solved
+		{ "/run/systemd/notify", "/run/systemd/notify", "bind", NULL, MS_BIND, false },
 	};
 	const char *root;
 	int rootfd;

From 6c92a038f0d2a5823c34ba6853b4aca4f5aaf5c9 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Wed, 7 Sep 2016 13:41:08 +0200
Subject: [PATCH 0745/1304] stage1: Parse pod manifest annotation to enable
 --notify-ready option

This patch parses the image manifest and if the annotation
"appc.io/executor/supports-systemd-notify" is set to true,
it sets the service type to `notify` in the systemd unit file.
---
 stage1/init/common/pod.go | 18 ++++++++++++++++++
 tests/image/manifest      |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 04029c4c0c..1ba56efae2 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -427,6 +427,20 @@ func generateDeviceAllows(root string, appName types.ACName, mountPoints []types
 	return devAllow, nil
 }
 
+// supportsNotify returns true if in the image manifest appc.io/executor/supports-systemd-notify is set to true
+func supportsNotify(p *stage1commontypes.Pod, appName string) bool {
+	appImg := p.Images[appName]
+	if appImg == nil {
+		return false
+	}
+	supportNotifyAnnotation, ok := appImg.Annotations.Get("appc.io/executor/supports-systemd-notify")
+	supportNotify, err := strconv.ParseBool(supportNotifyAnnotation)
+	if ok && supportNotify && err == nil {
+		return true
+	}
+	return false
+}
+
 // appToSystemd transforms the provided RuntimeApp+ImageManifest into systemd units
 func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive bool, flavor string, privateUsers string, insecureOptions Stage1InsecureOptions) error {
 	app := ra.App
@@ -508,6 +522,10 @@ func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive b
 		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
 	}
 
+	if supportsNotify(p, appName.String()) {
+		opts = append(opts, unit.NewUnitOption("Service", "Type", "notify"))
+	}
+
 	if !insecureOptions.DisableCapabilities {
 		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
 	}
diff --git a/tests/image/manifest b/tests/image/manifest
index 7f8838e741..399299ebd9 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -70,6 +70,10 @@
         {
             "name": "coreos.com/rkt/stage1/gc",
             "value": "/ex/gc"
+        },
+        {
+            "name": "appc.io/executor/supports-systemd-notify",
+            "value": "true"
         }
     ]
 }

From b20aaec703f355938bc832ef84fdfd3df6b5e343 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Tue, 13 Sep 2016 17:36:54 +0200
Subject: [PATCH 0746/1304] docs/using-rkt-with-systemd: notification example

Show how to run a pod with notifications enabled.
---
 Documentation/using-rkt-with-systemd.md | 73 +++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index f845009e4a..bf41adea68 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -77,6 +77,78 @@ If the output contains `-XZ`, journal entries will not be available.
 
 ## Managing pods as systemd services
 
+### Notifications
+
+systemd inside stage1 can notify systemd on the host that it is ready, to make sure that stage1 systemd send the notification at the right time you can use the [sd_notify][sd_notify] mechanism.
+To make use of this feature, you need to set the annotation `appc.io/executor/supports-systemd-notify` to true in the image manifest whenever the app supports sd\_notify (see example manifest below).
+If you build your image with acbuild you can use the command: `acbuild annotation add appc.io/executor/supports-systemd-notify true`.
+
+```
+{
+	"acKind": "ImageManifest",
+	"acVersion": "0.8.4",
+	"name": "coreos.com/etcd",
+	...
+	"app": {
+		"exec": [
+			"/etcd"
+		],
+		...
+	},
+	"annotations": [
+	    "name": "appc.io/executor/supports-systemd-notify",
+	    "value": "true"
+	]
+}
+```
+
+This feature is always available when using the "coreos" stage1 flavor.
+If you use the "host" stage1 flavor (e.g. Fedora RPM or Debian deb package), you will need systemd >= v231.
+To verify how it works, run in a terminal the command: `sudo systemd-run --unit=test --service-type=notify rkt run --insecure-options=image /path/to/your/app/image`, then periodically check the status with `systemctl status test`.
+
+If the pod uses a stage1 image with systemd v231 (or greater), then the pod will be seen active form the host when systemd inside stage1 will reach default target.
+Instead, before it was marked as active as soon as it started.
+In this way it is possible to easily set up dependencies between pods and host services.
+Moreover, using [`SdNotify()`](https://github.com/coreos/go-systemd/blob/master/daemon/sdnotify.go) in the application it is possible to make the pod marked as ready when all the apps or a particular one is ready.
+For more information check [systemd services unit](https://www.freedesktop.org/software/systemd/man/systemd.unit.html) documentation.
+Below there is a simple example of an app using the systemd notification mechanism via [go-systemd](https://github.com/coreos/go-systemd) binding library.
+
+```go
+package main
+
+import (
+		"log"
+		"net"
+		"net/http"
+
+		"github.com/coreos/go-systemd/daemon"
+)
+
+func main() {
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		log.Printf("request from %v\n", r.RemoteAddr)
+		w.Write([]byte("hello\n"))
+	})
+	ln, err := net.Listen("tcp", ":5000")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		os.Exit(1)
+	}
+	err = daemon.SdNotify("READY=1")
+	if err != nil {
+		log.Printf("daemon.SdNotify READY=1 return: %s", err)
+	}
+	log.Fatal(http.Serve(ln, nil))
+}
+```
+
+You can run an app that supports `sd\_notify()` with this command:
+
+```
+# systemd-run --slice=machine --service-type=notify rkt run coreos.com/etcd:v2.2.5
+Running as unit run-29486.service.
+```
+
 ### Simple Unit File
 
 The following is a simple example of a unit file using `rkt` to run an `etcd` instance under systemd service management:
@@ -403,3 +475,4 @@ $ systemd-cgls --all
 [systemd-run]: http://www.freedesktop.org/software/systemd/man/systemd-run.html
 [systemd-socket-activated]: http://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
 [systemd-socket-proxyd]: https://www.freedesktop.org/software/systemd/man/systemd-socket-proxyd.html
+[sd_notify]: https://www.freedesktop.org/software/systemd/man/sd_notify.html

From b16572395ea9a69975c61042ff0a0ad494b916a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=C5=9Awi=C4=99tek?=
 <michalswietek88@gmail.com>
Date: Tue, 31 May 2016 14:28:55 +0200
Subject: [PATCH 0747/1304] stage1: support for unified cgroups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this implements support for cgroups v2 along support for legacy version.

Half of #1757

Signed-off-by: Michał Świętek <michalswietek88@gmail.com>
---
 common/cgroup/cgroup.go            | 270 ++++++++++++++++++++++++-----
 common/cgroup/cgroup_test.go       |   2 +-
 rkt/api_service.go                 |   2 +-
 stage1/gc/gc.go                    |   2 +-
 stage1/init/init.go                |  83 +++++----
 tests/inspect/inspect.go           |  31 +++-
 tests/rkt_app_isolator_test.go     |  20 ++-
 tests/rkt_run_pod_manifest_test.go |  12 +-
 8 files changed, 329 insertions(+), 93 deletions(-)

diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index a9fa04ef06..e13a4a1393 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -35,16 +35,26 @@ import (
 
 type addIsolatorFunc func(opts []*unit.UnitOption, limit *resource.Quantity) ([]*unit.UnitOption, error)
 
+const (
+	// The following const comes from
+	// #define CGROUP2_SUPER_MAGIC  0x63677270
+	// https://github.com/torvalds/linux/blob/v4.6/include/uapi/linux/magic.h#L58
+	Cgroup2fsMagicNumber = 0x63677270
+)
+
 var (
 	isolatorFuncs = map[string]addIsolatorFunc{
 		"cpu":    addCpuLimit,
 		"memory": addMemoryLimit,
 	}
-	cgroupControllerRWFiles = map[string][]string{
+	legacyCgroupControllerRWFiles = map[string][]string{
 		"memory":  {"memory.limit_in_bytes"},
 		"cpu":     {"cpu.cfs_quota_us"},
 		"devices": {"devices.allow", "devices.deny"},
 	}
+	cgroupControllerRWFiles = map[string][]string{
+		"memory": {"memory.low", "memory.high", "memory.max", "memory.swap.max"},
+	}
 )
 
 func addCpuLimit(opts []*unit.UnitOption, limit *resource.Quantity) ([]*unit.UnitOption, error) {
@@ -70,32 +80,61 @@ func MaybeAddIsolator(opts []*unit.UnitOption, isolator string, limit *resource.
 	if limit == nil {
 		return opts, nil
 	}
-	if IsIsolatorSupported(isolator) {
+	isSupported, err := IsIsolatorSupported(isolator)
+	if err != nil {
+		return nil, err
+	}
+
+	if isSupported {
 		opts, err = isolatorFuncs[isolator](opts, limit)
-		if err != nil {
-			return nil, err
-		}
 	} else {
 		fmt.Fprintf(os.Stderr, "warning: resource/%s isolator set but support disabled in the kernel, skipping\n", isolator)
 	}
+
+	if err != nil {
+		return nil, err
+	}
 	return opts, nil
 }
 
 // IsIsolatorSupported returns whether an isolator is supported in the kernel
-func IsIsolatorSupported(isolator string) bool {
-	if files, ok := cgroupControllerRWFiles[isolator]; ok {
-		for _, f := range files {
-			isolatorPath := filepath.Join("/sys/fs/cgroup/", isolator, f)
-			if _, err := os.Stat(isolatorPath); os.IsNotExist(err) {
-				return false
-			}
+func IsIsolatorSupported(isolator string) (bool, error) {
+	procCgroupFile, err := os.Open("/proc/cgroups")
+	if err != nil {
+		return false, err
+	}
+	defer procCgroupFile.Close()
+
+	sc := bufio.NewScanner(procCgroupFile)
+
+	sc.Scan()
+
+	for sc.Scan() {
+		if strings.HasPrefix(sc.Text(), isolator) {
+			return true, nil
 		}
-		return true
 	}
-	return false
+
+	if err := sc.Err(); err != nil {
+		return false, err
+	}
+
+	return false, nil
+}
+
+// IsCgroupUnified checks if cgroup mounted at /sys/fs/cgroup is
+// the new unified version (cgroup v2)
+func IsCgroupUnified(root string) (bool, error) {
+	cgroupFsPath := filepath.Join(root, "/sys/fs/cgroup")
+	var statfs syscall.Statfs_t
+	if err := syscall.Statfs(cgroupFsPath, &statfs); err != nil {
+		return false, err
+	}
+
+	return statfs.Type == Cgroup2fsMagicNumber, nil
 }
 
-func parseCgroups(f io.Reader) (map[int][]string, error) {
+func parseLegacyCgroups(f io.Reader) (map[int][]string, error) {
 	sc := bufio.NewScanner(f)
 
 	// skip first line since it is a comment
@@ -125,16 +164,16 @@ func parseCgroups(f io.Reader) (map[int][]string, error) {
 	return cgroups, nil
 }
 
-// GetEnabledCgroups returns a map with the enabled cgroup controllers grouped by
+// GetEnabledLegacyCgroups returns a map with the enabled cgroup controllers grouped by
 // hierarchy
-func GetEnabledCgroups() (map[int][]string, error) {
+func GetEnabledLegacyCgroups() (map[int][]string, error) {
 	cgroupsFile, err := os.Open("/proc/cgroups")
 	if err != nil {
 		return nil, err
 	}
 	defer cgroupsFile.Close()
 
-	cgroups, err := parseCgroups(cgroupsFile)
+	cgroups, err := parseLegacyCgroups(cgroupsFile)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error parsing /proc/cgroups"), err)
 	}
@@ -142,10 +181,28 @@ func GetEnabledCgroups() (map[int][]string, error) {
 	return cgroups, nil
 }
 
-// GetControllerDirs takes a map with the enabled cgroup controllers grouped by
+// GetEnabledControllers raturns a list of enabled cgroup controllers
+func GetEnabledControllers() ([]string, error) {
+	controllersFile, err := os.Open("/sys/fs/cgroup/cgroup.controllers")
+	if err != nil {
+		return nil, err
+	}
+	defer controllersFile.Close()
+
+	sc := bufio.NewScanner(controllersFile)
+
+	sc.Scan()
+	if err := sc.Err(); err != nil {
+		return nil, err
+	}
+
+	return strings.Split(sc.Text(), " "), nil
+}
+
+// GetLegacyControllerDirs takes a map with the enabled cgroup controllers grouped by
 // hierarchy and returns the directory names as they should be in
 // /sys/fs/cgroup
-func GetControllerDirs(cgroups map[int][]string) []string {
+func GetLegacyControllerDirs(cgroups map[int][]string) []string {
 	var controllers []string
 	for _, cs := range cgroups {
 		controllers = append(controllers, strings.Join(cs, ","))
@@ -154,7 +211,7 @@ func GetControllerDirs(cgroups map[int][]string) []string {
 	return controllers
 }
 
-func getControllerSymlinks(cgroups map[int][]string) map[string]string {
+func getLegacyControllerSymlinks(cgroups map[int][]string) map[string]string {
 	symlinks := make(map[string]string)
 
 	for _, cs := range cgroups {
@@ -169,10 +226,10 @@ func getControllerSymlinks(cgroups map[int][]string) map[string]string {
 	return symlinks
 }
 
-func getControllerRWFiles(controller string) []string {
+func getLegacyControllerRWFiles(controller string) []string {
 	parts := strings.Split(controller, ",")
 	for _, p := range parts {
-		if files, ok := cgroupControllerRWFiles[p]; ok {
+		if files, ok := legacyCgroupControllerRWFiles[p]; ok {
 			// cgroup.procs always needs to be RW for allowing systemd to add
 			// processes to the controller
 			files = append(files, "cgroup.procs")
@@ -183,7 +240,16 @@ func getControllerRWFiles(controller string) []string {
 	return nil
 }
 
-func parseCgroupController(cgroupPath, controller string) ([]string, error) {
+func getControllersRWFiles() []string {
+	files := []string{"cgroup.procs", "cgroup.controllers", "cgroup.subtree_control", "cgroup.events"}
+	for _, controllerRWFiles := range cgroupControllerRWFiles {
+		files = append(files, controllerRWFiles...)
+	}
+
+	return files
+}
+
+func parseLegacyCgroupController(cgroupPath, controller string) ([]string, error) {
 	cg, err := os.Open(cgroupPath)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
@@ -207,29 +273,56 @@ func parseCgroupController(cgroupPath, controller string) ([]string, error) {
 	return nil, fmt.Errorf("controller %q not found", controller)
 }
 
-// GetOwnCgroupPath returns the cgroup path of this process in controller
+func parseProcCgroupInfo(procCgroupInfoPath string) (string, error) {
+	cg, err := os.Open(procCgroupInfoPath)
+	if err != nil {
+		return "", errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
+	}
+	defer cg.Close()
+
+	s := bufio.NewScanner(cg)
+	s.Scan()
+	parts := strings.SplitN(s.Text(), ":", 3)
+	if len(parts) < 3 {
+		return "", fmt.Errorf("error parsing /proc/self/cgroup")
+	}
+
+	return parts[2], nil
+}
+
+// GetOwnLegacyCgroupPath returns the cgroup path of this process in controller
 // hierarchy
-func GetOwnCgroupPath(controller string) (string, error) {
-	parts, err := parseCgroupController("/proc/self/cgroup", controller)
+func GetOwnLegacyCgroupPath(controller string) (string, error) {
+	parts, err := parseLegacyCgroupController("/proc/self/cgroup", controller)
 	if err != nil {
 		return "", err
 	}
 	return parts[2], nil
 }
 
-// GetCgroupPathByPid returns the cgroup path of the process with the given pid
+// GetOwnCgroupPath returns the cgroup path of this process
+func GetOwnCgroupPath() (string, error) {
+	return parseProcCgroupInfo("/proc/self/cgroup")
+}
+
+// GetLegacyCgroupPathByPid returns the cgroup path of the process with the given pid
 // and given controller.
-func GetCgroupPathByPid(pid int, controller string) (string, error) {
-	parts, err := parseCgroupController(fmt.Sprintf("/proc/%d/cgroup", pid), controller)
+func GetLegacyCgroupPathByPid(pid int, controller string) (string, error) {
+	parts, err := parseLegacyCgroupController(fmt.Sprintf("/proc/%d/cgroup", pid), controller)
 	if err != nil {
 		return "", err
 	}
 	return parts[2], nil
 }
 
+// GetCgroupPathByPid returns the cgroup path of the process
+func GetCgroupPathByPid(pid int) (string, error) {
+	return parseProcCgroupInfo(fmt.Sprintf("/proc/%d/cgroup", pid))
+}
+
 // JoinCgroup makes the calling process join the subcgroup hierarchy on a
 // particular controller
-func JoinSubcgroup(controller string, subcgroup string) error {
+func JoinLegacySubcgroup(controller string, subcgroup string) error {
 	subcgroupPath := filepath.Join("/sys/fs/cgroup", controller, subcgroup)
 	if err := os.MkdirAll(subcgroupPath, 0600); err != nil {
 		return errwrap.Wrap(fmt.Errorf("error creating %q subcgroup", subcgroup), err)
@@ -242,6 +335,20 @@ func JoinSubcgroup(controller string, subcgroup string) error {
 	return nil
 }
 
+// JoinCgroup makes the calling process join the subcgroup hierarchy
+func JoinSubcgroup(subcgroup string) error {
+	subcgroupPath := filepath.Join("/sys/fs/cgroup", subcgroup)
+	if err := os.MkdirAll(subcgroupPath, 0600); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error creating %q subcgroup", subcgroup), err)
+	}
+	pidBytes := []byte(strconv.Itoa(os.Getpid()))
+	if err := ioutil.WriteFile(filepath.Join(subcgroupPath, "cgroup.procs"), pidBytes, 0600); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error adding ourselves to the %q subcgroup", subcgroup), err)
+	}
+
+	return nil
+}
+
 // If /system.slice does not exist in the cpuset controller, create it and
 // configure it.
 // Since this is a workaround, we ignore errors
@@ -272,9 +379,9 @@ func fixCpusetKnobs(cpusetPath string) {
 	}
 }
 
-// IsControllerMounted returns whether a controller is mounted by checking that
+// IsLegacyControllerMounted returns whether a controller is mounted by checking that
 // cgroup.procs is accessible
-func IsControllerMounted(c string) bool {
+func IsLegacyControllerMounted(c string) bool {
 	cgroupProcsPath := filepath.Join("/sys/fs/cgroup", c, "cgroup.procs")
 	if _, err := os.Stat(cgroupProcsPath); err != nil {
 		return false
@@ -283,10 +390,10 @@ func IsControllerMounted(c string) bool {
 	return true
 }
 
-// CreateCgroups mounts the cgroup controllers hierarchy in /sys/fs/cgroup
+// CreateLegacyCgroups mounts the cgroup controllers hierarchy in /sys/fs/cgroup
 // under root
-func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext string) error {
-	controllers := GetControllerDirs(enabledCgroups)
+func CreateLegacyCgroups(root string, enabledCgroups map[int][]string, mountContext string) error {
+	controllers := GetLegacyControllerDirs(enabledCgroups)
 	var flags uintptr
 
 	sys := filepath.Join(root, "/sys")
@@ -336,7 +443,7 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 	}
 
 	// Create symlinks for combined controllers
-	symlinks := getControllerSymlinks(enabledCgroups)
+	symlinks := getLegacyControllerSymlinks(enabledCgroups)
 	for ln, tgt := range symlinks {
 		lnPath := filepath.Join(cgroupTmpfs, ln)
 		if err := os.Symlink(tgt, lnPath); err != nil {
@@ -353,11 +460,50 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 	return mountFsRO(cgroupTmpfs)
 }
 
+// CreateCgroups mounts the unigfied cgroup hierarchy in /sys/fs/cgroup
+// under root
+func CreateCgroups(root string) error {
+	var flags uintptr
+
+	sys := filepath.Join(root, "/sys")
+	if err := os.MkdirAll(sys, 0700); err != nil {
+		return err
+	}
+	flags = syscall.MS_NOSUID |
+		syscall.MS_NOEXEC |
+		syscall.MS_NODEV
+
+	if err := syscall.Mount("sysfs", sys, "sysfs", flags, ""); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error mounting %q", sys), err)
+	}
+
+	cgroupFs := filepath.Join(root, "/sys/fs/cgroup")
+	if err := os.MkdirAll(cgroupFs, 0700); err != nil {
+		return err
+	}
+
+	flags = syscall.MS_NOSUID |
+		syscall.MS_NOEXEC |
+		syscall.MS_NODEV |
+		syscall.MS_STRICTATIME
+
+	if err := syscall.Mount("cgroup2", cgroupFs, "cgroup2", flags, ""); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error mounting %q", cgroupFs), err)
+	}
+
+	machinePath := filepath.Join(root, "/sys/fs/cgroup/machine.slice")
+	if err := os.MkdirAll(machinePath, 0700); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // RemountCgroupsRO remounts the cgroup hierarchy under root read-only, leaving
 // the needed knobs in the subcgroup for each app read-write so the systemd
 // inside stage1 can apply isolators to them
-func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
-	controllers := GetControllerDirs(enabledCgroups)
+func RemountLegacyCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
+	controllers := GetLegacyControllerDirs(enabledCgroups)
 	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
 	sysPath := filepath.Join(root, "/sys")
 
@@ -378,7 +524,7 @@ func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup st
 			if err := os.MkdirAll(appCgroup, 0755); err != nil {
 				return err
 			}
-			for _, f := range getControllerRWFiles(c) {
+			for _, f := range getLegacyControllerRWFiles(c) {
 				cgroupFilePath := filepath.Join(appCgroup, f)
 				// the file may not be there if kernel doesn't support the
 				// feature, skip it in that case
@@ -414,3 +560,47 @@ func mountFsRO(mountPoint string) error {
 
 	return nil
 }
+
+// RemountCgroupsRO remounts the cgroup hierarchy under root read-only, leaving
+// the needed knobs in the subcgroup for each app read-write so the systemd
+// inside stage1 can apply isolators to them
+func RemountCgroupsRO(root string, subcgroup string, serviceNames []string) error {
+	cgroupFsPath := filepath.Join(root, "sys/fs/cgroup")
+	subcgroupPath := filepath.Join(root, "sys/fs/cgroup", subcgroup)
+	sysPath := filepath.Join(root, "/sys")
+
+	var flags uintptr
+
+	if err := os.MkdirAll(subcgroupPath, 0700); err != nil {
+		return err
+	}
+
+	machineDir := strings.TrimSuffix(subcgroupPath, "/system.slice")
+	if err := syscall.Mount(machineDir, machineDir, "", syscall.MS_BIND, ""); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error bind mounting %q", subcgroupPath), err)
+	}
+
+	// Bind-mount cgroup filesystem read-only
+	flags = syscall.MS_BIND |
+		syscall.MS_REMOUNT |
+		syscall.MS_NOSUID |
+		syscall.MS_NOEXEC |
+		syscall.MS_NODEV |
+		syscall.MS_RDONLY
+	if err := syscall.Mount(cgroupFsPath, cgroupFsPath, "", flags, ""); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", cgroupFsPath), err)
+	}
+
+	// Bind-mount sys filesystem read-only
+	flags = syscall.MS_BIND |
+		syscall.MS_REMOUNT |
+		syscall.MS_NOSUID |
+		syscall.MS_NOEXEC |
+		syscall.MS_NODEV |
+		syscall.MS_RDONLY
+	if err := syscall.Mount(sysPath, sysPath, "", flags, ""); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", sysPath), err)
+	}
+
+	return nil
+}
diff --git a/common/cgroup/cgroup_test.go b/common/cgroup/cgroup_test.go
index 92ec647532..562cafc1bc 100644
--- a/common/cgroup/cgroup_test.go
+++ b/common/cgroup/cgroup_test.go
@@ -100,7 +100,7 @@ net_prio	6	432	1`
 	}
 
 	for i, tt := range tests {
-		o, err := parseCgroups(tt.input)
+		o, err := parseLegacyCgroups(tt.input)
 		if err != nil {
 			t.Errorf("#%d: unexpected error `%v`", i, err)
 		}
diff --git a/rkt/api_service.go b/rkt/api_service.go
index 42aeb60375..0f6cc50428 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -370,7 +370,7 @@ func getPodCgroup(p *pod, pid int) (string, error) {
 	// Get cgroup for the "name=systemd" controller; we assume the api-server is
 	// running on a system using systemd for returning cgroups, and will just not
 	// set it otherwise.
-	cgroup, err := cgroup.GetCgroupPathByPid(pid, "name=systemd")
+	cgroup, err := cgroup.GetV1CgroupPathByPid(pid, "name=systemd")
 	if err != nil {
 		return "", err
 	}
diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index 3d25ab76a0..fe0de3af26 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -132,7 +132,7 @@ func cleanupCgroups() error {
 	// if we're trying to clean up our own cgroup it means we're running in the
 	// same unit file as the rkt pod. We don't have to do anything, systemd
 	// will do the cleanup for us
-	ourCgroupPath, err := cgroup.GetOwnCgroupPath("name=systemd")
+	ourCgroupPath, err := cgroup.GetOwnLegacyCgroupPath("name=systemd")
 	if err == nil {
 		if strings.HasPrefix(ourCgroupPath, "/"+subcgroup) {
 			return nil
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 62b6103059..d1b8764a0f 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -661,37 +661,44 @@ func stage1() int {
 		log.FatalE("error making / a shared and slave mount", err)
 	}
 
-	enabledCgroups, err := cgroup.GetEnabledCgroups()
+	unifiedCgroup, err := cgroup.IsCgroupUnified("/")
 	if err != nil {
-		log.FatalE("error getting cgroups", err)
+		log.FatalE("error determing cgroup version", err)
 		return 1
 	}
 
-	if err := mountHostCgroups(enabledCgroups); err != nil {
-		log.FatalE("couldn't mount the host cgroups", err)
-		return 1
-	}
-
-	var serviceNames []string
-	for _, app := range p.Manifest.Apps {
-		serviceNames = append(serviceNames, stage1initcommon.ServiceUnitName(app.Name))
-	}
 	s1Root := common.Stage1RootfsPath(p.Root)
 	machineID := stage1initcommon.GetMachineID(p)
-	subcgroup, err := getContainerSubCgroup(machineID, canMachinedRegister)
-	if err == nil {
-		if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
-			[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
-			log.FatalE("cannot write subcgroup file", err)
+	if !unifiedCgroup {
+		enabledCgroups, err := cgroup.GetEnabledLegacyCgroups()
+		if err != nil {
+			log.FatalE("error getting legacy cgroups", err)
 			return 1
 		}
 
-		if err := mountContainerCgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
-			log.PrintE("couldn't mount the container cgroups", err)
+		if err := mountHostLegacyCgroups(enabledCgroups); err != nil {
+			log.FatalE("couldn't mount the host legacy cgroups", err)
 			return 1
 		}
-	} else {
-		log.PrintE("continuing with per-app isolators disabled", err)
+
+		var serviceNames []string
+		for _, app := range p.Manifest.Apps {
+			serviceNames = append(serviceNames, stage1initcommon.ServiceUnitName(app.Name))
+		}
+		subcgroup, err := getContainerLegacySubCgroup(machineID, canMachinedRegister)
+		if err == nil {
+			if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
+				[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
+				log.FatalE("cannot write subcgroup file", err)
+				return 1
+			}
+			if err := mountContainerLegacyCgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
+				log.PrintE("couldn't mount the container legacy cgroups", err)
+				return 1
+			}
+		} else {
+			log.PrintE("continuing with per-app isolators disabled", err)
+		}
 	}
 
 	// KVM flavor has a bit different logic in handling pid vs ppid, for details look into #2389
@@ -725,10 +732,10 @@ func stage1() int {
 	return 0
 }
 
-func areHostCgroupsMounted(enabledCgroups map[int][]string) bool {
-	controllers := cgroup.GetControllerDirs(enabledCgroups)
+func areHostLegacyCgroupsMounted(enabledLegacyCgroups map[int][]string) bool {
+	controllers := cgroup.GetLegacyControllerDirs(enabledLegacyCgroups)
 	for _, c := range controllers {
-		if !cgroup.IsControllerMounted(c) {
+		if !cgroup.IsLegacyControllerMounted(c) {
 			return false
 		}
 	}
@@ -736,21 +743,21 @@ func areHostCgroupsMounted(enabledCgroups map[int][]string) bool {
 	return true
 }
 
-// mountHostCgroups mounts the host cgroup hierarchy as required by
+// mountHostLegacyCgroups mounts the host legacy cgroup hierarchy as required by
 // systemd-nspawn. We need this because some distributions don't have the
 // "name=systemd" cgroup or don't mount the cgroup controllers in
 // "/sys/fs/cgroup", and systemd-nspawn needs this. Since this is mounted
 // inside the rkt mount namespace, it doesn't affect the host.
-func mountHostCgroups(enabledCgroups map[int][]string) error {
+func mountHostLegacyCgroups(enabledCgroups map[int][]string) error {
 	systemdControllerPath := "/sys/fs/cgroup/systemd"
-	if !areHostCgroupsMounted(enabledCgroups) {
+	if !areHostLegacyCgroupsMounted(enabledCgroups) {
 		mountContext := os.Getenv(common.EnvSELinuxMountContext)
-		if err := cgroup.CreateCgroups("/", enabledCgroups, mountContext); err != nil {
+		if err := cgroup.CreateLegacyCgroups("/", enabledCgroups, mountContext); err != nil {
 			return errwrap.Wrap(errors.New("error creating host cgroups"), err)
 		}
 	}
 
-	if !cgroup.IsControllerMounted("systemd") {
+	if !cgroup.IsLegacyControllerMounted("systemd") {
 		if err := os.MkdirAll(systemdControllerPath, 0700); err != nil {
 			return err
 		}
@@ -762,22 +769,22 @@ func mountHostCgroups(enabledCgroups map[int][]string) error {
 	return nil
 }
 
-// mountContainerCgroups mounts the cgroup controllers hierarchy in the container's
+// mountContainerLegacyCgroups mounts the cgroup controllers hierarchy in the container's
 // namespace read-only, leaving the needed knobs in the subcgroup for each-app
 // read-write so systemd inside stage1 can apply isolators to them
-func mountContainerCgroups(s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
+func mountContainerLegacyCgroups(s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
 	mountContext := os.Getenv(common.EnvSELinuxMountContext)
-	if err := cgroup.CreateCgroups(s1Root, enabledCgroups, mountContext); err != nil {
+	if err := cgroup.CreateLegacyCgroups(s1Root, enabledCgroups, mountContext); err != nil {
 		return errwrap.Wrap(errors.New("error creating container cgroups"), err)
 	}
-	if err := cgroup.RemountCgroupsRO(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
+	if err := cgroup.RemountLegacyCgroupsRO(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
 		return errwrap.Wrap(errors.New("error restricting container cgroups"), err)
 	}
 
 	return nil
 }
 
-func getContainerSubCgroup(machineID string, canMachinedRegister bool) (string, error) {
+func getContainerLegacySubCgroup(machineID string, canMachinedRegister bool) (string, error) {
 	var subcgroup string
 	fromUnit, err := util.RunningFromSystemService()
 	if err != nil {
@@ -808,16 +815,16 @@ func getContainerSubCgroup(machineID string, canMachinedRegister bool) (string,
 		} else {
 			// when registration is disabled the container will be directly
 			// under the current cgroup so we can look it up in /proc/self/cgroup
-			ownCgroupPath, err := cgroup.GetOwnCgroupPath("name=systemd")
+			ownLegacyCgroupPath, err := cgroup.GetOwnLegacyCgroupPath("name=systemd")
 			if err != nil {
-				return "", errwrap.Wrap(errors.New("could not get own cgroup path"), err)
+				return "", errwrap.Wrap(errors.New("could not get own legacy cgroup path"), err)
 			}
 			// systemd-nspawn won't work if we are in the root cgroup. In addition,
 			// we want all rkt instances to be in distinct cgroups. Create a
 			// subcgroup and add ourselves to it.
-			subcgroup = filepath.Join(ownCgroupPath, machineDir)
-			if err := cgroup.JoinSubcgroup("systemd", subcgroup); err != nil {
-				return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", subcgroup), err)
+			subcgroup = filepath.Join(ownLegacyCgroupPath, machineDir)
+			if err := cgroup.JoinLegacySubcgroup("systemd", subcgroup); err != nil {
+				return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", ownLegacyCgroupPath), err)
 			}
 		}
 	}
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index f958a01ba6..489db889b4 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -403,17 +403,34 @@ func main() {
 	}
 
 	if globalFlags.PrintMemoryLimit {
-		memCgroupPath, err := cgroup.GetOwnCgroupPath("memory")
+		// we use /proc/1/root to escape the chroot we're in and read the file
+		isUnified, err := cgroup.IsCgroupUnified("/proc/1/root/")
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error getting own memory cgroup path: %v\n", err)
+			fmt.Fprintf(os.Stderr, "Error getting cgroup type: %v\n", err)
 			os.Exit(1)
 		}
-		// we use /proc/1/root to escape the chroot we're in and read our
-		// memory limit
-		limitPath := filepath.Join("/proc/1/root/sys/fs/cgroup/memory", memCgroupPath, "memory.limit_in_bytes")
+
+		var limitPath string
+		if isUnified {
+			cgroupPath, err := cgroup.GetOwnCgroupPath()
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "Error getting own memory cgroup path: %v\n", err)
+				os.Exit(1)
+			}
+			limitPath = filepath.Join("/proc/1/root/sys/fs/cgroup/", cgroupPath, "memory.max")
+			fmt.Fprintln(os.Stderr, "limitPath:", limitPath)
+		} else {
+			memCgroupPath, err := cgroup.GetOwnLegacyCgroupPath("memory")
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "Error getting own memory cgroup path: %v\n", err)
+				os.Exit(1)
+			}
+			limitPath = filepath.Join("/proc/1/root/sys/fs/cgroup/memory", memCgroupPath, "memory.limit_in_bytes")
+			fmt.Fprintln(os.Stderr, limitPath)
+		}
 		limit, err := ioutil.ReadFile(limitPath)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Can't read memory.limit_in_bytes\n")
+			fmt.Fprintf(os.Stderr, "Can't read %s\n", limitPath)
 			os.Exit(1)
 		}
 
@@ -421,7 +438,7 @@ func main() {
 	}
 
 	if globalFlags.PrintCPUQuota {
-		cpuCgroupPath, err := cgroup.GetOwnCgroupPath("cpu")
+		cpuCgroupPath, err := cgroup.GetOwnLegacyCgroupPath("cpu")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error getting own cpu cgroup path: %v\n", err)
 			os.Exit(1)
diff --git a/tests/rkt_app_isolator_test.go b/tests/rkt_app_isolator_test.go
index 8ef4cd8234..6f4451b249 100644
--- a/tests/rkt_app_isolator_test.go
+++ b/tests/rkt_app_isolator_test.go
@@ -58,7 +58,10 @@ var cgroupsTest = struct {
 }
 
 func TestAppIsolatorMemory(t *testing.T) {
-	ok := cgroup.IsIsolatorSupported("memory")
+	ok, err := cgroup.IsIsolatorSupported("memory")
+	if err != nil {
+		t.Fatalf("Error checking memory isolator support: %v", err)
+	}
 	if !ok {
 		t.Skip("Memory isolator not supported.")
 	}
@@ -81,7 +84,20 @@ func TestAppIsolatorMemory(t *testing.T) {
 }
 
 func TestAppIsolatorCPU(t *testing.T) {
-	ok := cgroup.IsIsolatorSupported("cpu")
+	isUnified, err := cgroup.IsCgroupUnified("/")
+	if err != nil {
+		t.Fatalf("Error determining the cgroup version: %v", err)
+	}
+
+	if isUnified {
+		// TODO: for now kernel does not support cpu isolator in cgroup2.
+		// Write a test when it does.
+		t.Skip("kernel does not support cpu isolator in cgroup2.")
+	}
+	ok, err := cgroup.IsIsolatorSupported("cpu")
+	if err != nil {
+		t.Fatalf("Error checking cpu isolator support: %v", err)
+	}
 	if !ok {
 		t.Skip("CPU isolator not supported.")
 	}
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 090dee5ee6..e7d7b9f996 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -1205,9 +1205,15 @@ func TestPodManifest(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		if tt.cgroup != "" && !cgroup.IsIsolatorSupported(tt.cgroup) {
-			t.Logf("Skip test #%v: cgroup %s not supported", i, tt.cgroup)
-			continue
+		if tt.cgroup != "" {
+			ok, err := cgroup.IsIsolatorSupported(tt.cgroup)
+			if err != nil {
+				t.Fatalf("Error checking memory isolator support: %v", err)
+			}
+			if !ok {
+				t.Logf("Skip test #%v: cgroup %s not supported", i, tt.cgroup)
+				continue
+			}
 		}
 
 		var hashesToRemove []string

From e918226ca15351a2cdab5a9772ac400004161441 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 5 Aug 2016 14:11:48 +0200
Subject: [PATCH 0748/1304] gc: do not clean up cgroups with cgroup-v2

---
 stage1/gc/gc.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index fe0de3af26..77a0395f82 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -123,6 +123,14 @@ func (c dirsByLength) Less(i, j int) bool { return len(c[i]) < len(c[j]) }
 func (c dirsByLength) Swap(i, j int)      { c[i], c[j] = c[j], c[i] }
 
 func cleanupCgroups() error {
+	isUnified, err := cgroup.IsCgroupUnified("/")
+	if err != nil {
+		return errwrap.Wrap(errors.New("failed to determine the cgroup version"), err)
+	}
+	if isUnified {
+		return nil
+	}
+
 	b, err := ioutil.ReadFile("subcgroup")
 	if err != nil {
 		return errwrap.Wrap(errors.New("error reading subcgroup file"), err)

From 673e48070650ed8a92d89ca788094206b13c3b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 9 Aug 2016 13:26:57 +0200
Subject: [PATCH 0749/1304] common/cgroup: misc fixes

Removing unused functions, fixed checking if a controller is supported,
fixed typos.
---
 common/cgroup/cgroup.go | 156 +++++++---------------------------------
 stage1/gc/gc.go         |   4 +-
 stage1/init/init.go     |   2 +-
 3 files changed, 30 insertions(+), 132 deletions(-)

diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index e13a4a1393..0e88851913 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -52,9 +52,6 @@ var (
 		"cpu":     {"cpu.cfs_quota_us"},
 		"devices": {"devices.allow", "devices.deny"},
 	}
-	cgroupControllerRWFiles = map[string][]string{
-		"memory": {"memory.low", "memory.high", "memory.max", "memory.swap.max"},
-	}
 )
 
 func addCpuLimit(opts []*unit.UnitOption, limit *resource.Quantity) ([]*unit.UnitOption, error) {
@@ -87,38 +84,45 @@ func MaybeAddIsolator(opts []*unit.UnitOption, isolator string, limit *resource.
 
 	if isSupported {
 		opts, err = isolatorFuncs[isolator](opts, limit)
+		if err != nil {
+			return nil, err
+		}
 	} else {
 		fmt.Fprintf(os.Stderr, "warning: resource/%s isolator set but support disabled in the kernel, skipping\n", isolator)
 	}
 
-	if err != nil {
-		return nil, err
-	}
 	return opts, nil
 }
 
 // IsIsolatorSupported returns whether an isolator is supported in the kernel
 func IsIsolatorSupported(isolator string) (bool, error) {
-	procCgroupFile, err := os.Open("/proc/cgroups")
+	isUnified, err := IsCgroupUnified("/")
 	if err != nil {
-		return false, err
+		return false, errwrap.Wrap(errors.New("error determining cgroup version"), err)
 	}
-	defer procCgroupFile.Close()
-
-	sc := bufio.NewScanner(procCgroupFile)
-
-	sc.Scan()
 
-	for sc.Scan() {
-		if strings.HasPrefix(sc.Text(), isolator) {
-			return true, nil
+	if isUnified {
+		controllers, err := GetEnabledControllers()
+		if err != nil {
+			return false, errwrap.Wrap(errors.New("error determining enabled controllers"), err)
 		}
+		for _, c := range controllers {
+			if c == isolator {
+				return true, nil
+			}
+		}
+		return false, nil
 	}
 
-	if err := sc.Err(); err != nil {
-		return false, err
+	if files, ok := legacyCgroupControllerRWFiles[isolator]; ok {
+		for _, f := range files {
+			isolatorPath := filepath.Join("/sys/fs/cgroup/", isolator, f)
+			if _, err := os.Stat(isolatorPath); os.IsNotExist(err) {
+				return false, nil
+			}
+		}
+		return true, nil
 	}
-
 	return false, nil
 }
 
@@ -181,7 +185,7 @@ func GetEnabledLegacyCgroups() (map[int][]string, error) {
 	return cgroups, nil
 }
 
-// GetEnabledControllers raturns a list of enabled cgroup controllers
+// GetEnabledControllers returns a list of enabled cgroup controllers
 func GetEnabledControllers() ([]string, error) {
 	controllersFile, err := os.Open("/sys/fs/cgroup/cgroup.controllers")
 	if err != nil {
@@ -240,15 +244,6 @@ func getLegacyControllerRWFiles(controller string) []string {
 	return nil
 }
 
-func getControllersRWFiles() []string {
-	files := []string{"cgroup.procs", "cgroup.controllers", "cgroup.subtree_control", "cgroup.events"}
-	for _, controllerRWFiles := range cgroupControllerRWFiles {
-		files = append(files, controllerRWFiles...)
-	}
-
-	return files
-}
-
 func parseLegacyCgroupController(cgroupPath, controller string) ([]string, error) {
 	cg, err := os.Open(cgroupPath)
 	if err != nil {
@@ -335,20 +330,6 @@ func JoinLegacySubcgroup(controller string, subcgroup string) error {
 	return nil
 }
 
-// JoinCgroup makes the calling process join the subcgroup hierarchy
-func JoinSubcgroup(subcgroup string) error {
-	subcgroupPath := filepath.Join("/sys/fs/cgroup", subcgroup)
-	if err := os.MkdirAll(subcgroupPath, 0600); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error creating %q subcgroup", subcgroup), err)
-	}
-	pidBytes := []byte(strconv.Itoa(os.Getpid()))
-	if err := ioutil.WriteFile(filepath.Join(subcgroupPath, "cgroup.procs"), pidBytes, 0600); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error adding ourselves to the %q subcgroup", subcgroup), err)
-	}
-
-	return nil
-}
-
 // If /system.slice does not exist in the cpuset controller, create it and
 // configure it.
 // Since this is a workaround, we ignore errors
@@ -460,48 +441,9 @@ func CreateLegacyCgroups(root string, enabledCgroups map[int][]string, mountCont
 	return mountFsRO(cgroupTmpfs)
 }
 
-// CreateCgroups mounts the unigfied cgroup hierarchy in /sys/fs/cgroup
-// under root
-func CreateCgroups(root string) error {
-	var flags uintptr
-
-	sys := filepath.Join(root, "/sys")
-	if err := os.MkdirAll(sys, 0700); err != nil {
-		return err
-	}
-	flags = syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV
-
-	if err := syscall.Mount("sysfs", sys, "sysfs", flags, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error mounting %q", sys), err)
-	}
-
-	cgroupFs := filepath.Join(root, "/sys/fs/cgroup")
-	if err := os.MkdirAll(cgroupFs, 0700); err != nil {
-		return err
-	}
-
-	flags = syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV |
-		syscall.MS_STRICTATIME
-
-	if err := syscall.Mount("cgroup2", cgroupFs, "cgroup2", flags, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error mounting %q", cgroupFs), err)
-	}
-
-	machinePath := filepath.Join(root, "/sys/fs/cgroup/machine.slice")
-	if err := os.MkdirAll(machinePath, 0700); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// RemountCgroupsRO remounts the cgroup hierarchy under root read-only, leaving
-// the needed knobs in the subcgroup for each app read-write so the systemd
-// inside stage1 can apply isolators to them
+// RemountLegacyCgroupsRO remounts the cgroup hierarchy under root read-only,
+// leaving the needed knobs in the subcgroup for each app read-write so the
+// systemd inside stage1 can apply isolators to them
 func RemountLegacyCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
 	controllers := GetLegacyControllerDirs(enabledCgroups)
 	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
@@ -560,47 +502,3 @@ func mountFsRO(mountPoint string) error {
 
 	return nil
 }
-
-// RemountCgroupsRO remounts the cgroup hierarchy under root read-only, leaving
-// the needed knobs in the subcgroup for each app read-write so the systemd
-// inside stage1 can apply isolators to them
-func RemountCgroupsRO(root string, subcgroup string, serviceNames []string) error {
-	cgroupFsPath := filepath.Join(root, "sys/fs/cgroup")
-	subcgroupPath := filepath.Join(root, "sys/fs/cgroup", subcgroup)
-	sysPath := filepath.Join(root, "/sys")
-
-	var flags uintptr
-
-	if err := os.MkdirAll(subcgroupPath, 0700); err != nil {
-		return err
-	}
-
-	machineDir := strings.TrimSuffix(subcgroupPath, "/system.slice")
-	if err := syscall.Mount(machineDir, machineDir, "", syscall.MS_BIND, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error bind mounting %q", subcgroupPath), err)
-	}
-
-	// Bind-mount cgroup filesystem read-only
-	flags = syscall.MS_BIND |
-		syscall.MS_REMOUNT |
-		syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV |
-		syscall.MS_RDONLY
-	if err := syscall.Mount(cgroupFsPath, cgroupFsPath, "", flags, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", cgroupFsPath), err)
-	}
-
-	// Bind-mount sys filesystem read-only
-	flags = syscall.MS_BIND |
-		syscall.MS_REMOUNT |
-		syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV |
-		syscall.MS_RDONLY
-	if err := syscall.Mount(sysPath, sysPath, "", flags, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", sysPath), err)
-	}
-
-	return nil
-}
diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index 77a0395f82..dd27311a94 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -67,7 +67,7 @@ func main() {
 		log.PrintE("error removing journal link", err)
 	}
 
-	if err := cleanupCgroups(); err != nil {
+	if err := cleanupLegacyCgroups(); err != nil {
 		log.PrintE("error cleaning up cgroups", err)
 	}
 
@@ -122,7 +122,7 @@ func (c dirsByLength) Len() int           { return len(c) }
 func (c dirsByLength) Less(i, j int) bool { return len(c[i]) < len(c[j]) }
 func (c dirsByLength) Swap(i, j int)      { c[i], c[j] = c[j], c[i] }
 
-func cleanupCgroups() error {
+func cleanupLegacyCgroups() error {
 	isUnified, err := cgroup.IsCgroupUnified("/")
 	if err != nil {
 		return errwrap.Wrap(errors.New("failed to determine the cgroup version"), err)
diff --git a/stage1/init/init.go b/stage1/init/init.go
index d1b8764a0f..053ff2419c 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -663,7 +663,7 @@ func stage1() int {
 
 	unifiedCgroup, err := cgroup.IsCgroupUnified("/")
 	if err != nil {
-		log.FatalE("error determing cgroup version", err)
+		log.FatalE("error determining cgroup version", err)
 		return 1
 	}
 

From 2e7d3d45e57b31987d0769e4b2c168b051075299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 11 Aug 2016 13:57:24 +0200
Subject: [PATCH 0750/1304] cgroup: rename v1 and v2 functions

Instead of calling v1 "Legacy" and don't call v2 functions anything
special, let's name v1 functions "v1" and v2 functions "v2".

Also, group them together.
---
 common/cgroup/cgroup.go      | 188 ++++++++++++++++++-----------------
 common/cgroup/cgroup_test.go |   2 +-
 stage1/gc/gc.go              |   6 +-
 stage1/init/init.go          |  50 +++++-----
 tests/inspect/inspect.go     |   6 +-
 5 files changed, 130 insertions(+), 122 deletions(-)

diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index 0e88851913..b71a0edf92 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -47,7 +47,7 @@ var (
 		"cpu":    addCpuLimit,
 		"memory": addMemoryLimit,
 	}
-	legacyCgroupControllerRWFiles = map[string][]string{
+	v1CgroupControllerRWFiles = map[string][]string{
 		"memory":  {"memory.limit_in_bytes"},
 		"cpu":     {"cpu.cfs_quota_us"},
 		"devices": {"devices.allow", "devices.deny"},
@@ -68,6 +68,20 @@ func addMemoryLimit(opts []*unit.UnitOption, limit *resource.Quantity) ([]*unit.
 	return opts, nil
 }
 
+func mountFsRO(mountPoint string) error {
+	var flags uintptr = syscall.MS_BIND |
+		syscall.MS_REMOUNT |
+		syscall.MS_NOSUID |
+		syscall.MS_NOEXEC |
+		syscall.MS_NODEV |
+		syscall.MS_RDONLY
+	if err := syscall.Mount(mountPoint, mountPoint, "", flags, ""); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", mountPoint), err)
+	}
+
+	return nil
+}
+
 // MaybeAddIsolator considers the given isolator; if the type is known
 // (i.e. IsIsolatorSupported is true) and the limit is non-nil, the supplied
 // opts will be extended with an appropriate option implementing the desired
@@ -102,7 +116,7 @@ func IsIsolatorSupported(isolator string) (bool, error) {
 	}
 
 	if isUnified {
-		controllers, err := GetEnabledControllers()
+		controllers, err := GetEnabledV2Controllers()
 		if err != nil {
 			return false, errwrap.Wrap(errors.New("error determining enabled controllers"), err)
 		}
@@ -114,7 +128,7 @@ func IsIsolatorSupported(isolator string) (bool, error) {
 		return false, nil
 	}
 
-	if files, ok := legacyCgroupControllerRWFiles[isolator]; ok {
+	if files, ok := v1CgroupControllerRWFiles[isolator]; ok {
 		for _, f := range files {
 			isolatorPath := filepath.Join("/sys/fs/cgroup/", isolator, f)
 			if _, err := os.Stat(isolatorPath); os.IsNotExist(err) {
@@ -138,7 +152,60 @@ func IsCgroupUnified(root string) (bool, error) {
 	return statfs.Type == Cgroup2fsMagicNumber, nil
 }
 
-func parseLegacyCgroups(f io.Reader) (map[int][]string, error) {
+/*
+ * cgroup v2 functions
+ */
+
+// GetEnabledV2Controllers returns a list of enabled cgroup controllers
+func GetEnabledV2Controllers() ([]string, error) {
+	controllersFile, err := os.Open("/sys/fs/cgroup/cgroup.controllers")
+	if err != nil {
+		return nil, err
+	}
+	defer controllersFile.Close()
+
+	sc := bufio.NewScanner(controllersFile)
+
+	sc.Scan()
+	if err := sc.Err(); err != nil {
+		return nil, err
+	}
+
+	return strings.Split(sc.Text(), " "), nil
+}
+
+func parseV2ProcCgroupInfo(procCgroupInfoPath string) (string, error) {
+	cg, err := os.Open(procCgroupInfoPath)
+	if err != nil {
+		return "", errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
+	}
+	defer cg.Close()
+
+	s := bufio.NewScanner(cg)
+	s.Scan()
+	parts := strings.SplitN(s.Text(), ":", 3)
+	if len(parts) < 3 {
+		return "", fmt.Errorf("error parsing /proc/self/cgroup")
+	}
+
+	return parts[2], nil
+}
+
+// GetOwnCgroupPath returns the cgroup path of this process
+func GetOwnV2CgroupPath() (string, error) {
+	return parseV2ProcCgroupInfo("/proc/self/cgroup")
+}
+
+// GetCgroupPathByPid returns the cgroup path of the process
+func GetV2CgroupPathByPid(pid int) (string, error) {
+	return parseV2ProcCgroupInfo(fmt.Sprintf("/proc/%d/cgroup", pid))
+}
+
+/*
+ * cgroup v1 functions
+ */
+
+func parseV1Cgroups(f io.Reader) (map[int][]string, error) {
 	sc := bufio.NewScanner(f)
 
 	// skip first line since it is a comment
@@ -168,16 +235,16 @@ func parseLegacyCgroups(f io.Reader) (map[int][]string, error) {
 	return cgroups, nil
 }
 
-// GetEnabledLegacyCgroups returns a map with the enabled cgroup controllers grouped by
+// GetEnabledV1Cgroups returns a map with the enabled cgroup controllers grouped by
 // hierarchy
-func GetEnabledLegacyCgroups() (map[int][]string, error) {
+func GetEnabledV1Cgroups() (map[int][]string, error) {
 	cgroupsFile, err := os.Open("/proc/cgroups")
 	if err != nil {
 		return nil, err
 	}
 	defer cgroupsFile.Close()
 
-	cgroups, err := parseLegacyCgroups(cgroupsFile)
+	cgroups, err := parseV1Cgroups(cgroupsFile)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error parsing /proc/cgroups"), err)
 	}
@@ -185,28 +252,10 @@ func GetEnabledLegacyCgroups() (map[int][]string, error) {
 	return cgroups, nil
 }
 
-// GetEnabledControllers returns a list of enabled cgroup controllers
-func GetEnabledControllers() ([]string, error) {
-	controllersFile, err := os.Open("/sys/fs/cgroup/cgroup.controllers")
-	if err != nil {
-		return nil, err
-	}
-	defer controllersFile.Close()
-
-	sc := bufio.NewScanner(controllersFile)
-
-	sc.Scan()
-	if err := sc.Err(); err != nil {
-		return nil, err
-	}
-
-	return strings.Split(sc.Text(), " "), nil
-}
-
-// GetLegacyControllerDirs takes a map with the enabled cgroup controllers grouped by
+// GetV1ControllerDirs takes a map with the enabled cgroup controllers grouped by
 // hierarchy and returns the directory names as they should be in
 // /sys/fs/cgroup
-func GetLegacyControllerDirs(cgroups map[int][]string) []string {
+func GetV1ControllerDirs(cgroups map[int][]string) []string {
 	var controllers []string
 	for _, cs := range cgroups {
 		controllers = append(controllers, strings.Join(cs, ","))
@@ -215,7 +264,7 @@ func GetLegacyControllerDirs(cgroups map[int][]string) []string {
 	return controllers
 }
 
-func getLegacyControllerSymlinks(cgroups map[int][]string) map[string]string {
+func getV1ControllerSymlinks(cgroups map[int][]string) map[string]string {
 	symlinks := make(map[string]string)
 
 	for _, cs := range cgroups {
@@ -230,10 +279,10 @@ func getLegacyControllerSymlinks(cgroups map[int][]string) map[string]string {
 	return symlinks
 }
 
-func getLegacyControllerRWFiles(controller string) []string {
+func getV1ControllerRWFiles(controller string) []string {
 	parts := strings.Split(controller, ",")
 	for _, p := range parts {
-		if files, ok := legacyCgroupControllerRWFiles[p]; ok {
+		if files, ok := v1CgroupControllerRWFiles[p]; ok {
 			// cgroup.procs always needs to be RW for allowing systemd to add
 			// processes to the controller
 			files = append(files, "cgroup.procs")
@@ -244,7 +293,7 @@ func getLegacyControllerRWFiles(controller string) []string {
 	return nil
 }
 
-func parseLegacyCgroupController(cgroupPath, controller string) ([]string, error) {
+func parseV1CgroupController(cgroupPath, controller string) ([]string, error) {
 	cg, err := os.Open(cgroupPath)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
@@ -268,56 +317,29 @@ func parseLegacyCgroupController(cgroupPath, controller string) ([]string, error
 	return nil, fmt.Errorf("controller %q not found", controller)
 }
 
-func parseProcCgroupInfo(procCgroupInfoPath string) (string, error) {
-	cg, err := os.Open(procCgroupInfoPath)
-	if err != nil {
-		return "", errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
-	}
-	defer cg.Close()
-
-	s := bufio.NewScanner(cg)
-	s.Scan()
-	parts := strings.SplitN(s.Text(), ":", 3)
-	if len(parts) < 3 {
-		return "", fmt.Errorf("error parsing /proc/self/cgroup")
-	}
-
-	return parts[2], nil
-}
-
-// GetOwnLegacyCgroupPath returns the cgroup path of this process in controller
+// GetOwnV1CgroupPath returns the cgroup path of this process in controller
 // hierarchy
-func GetOwnLegacyCgroupPath(controller string) (string, error) {
-	parts, err := parseLegacyCgroupController("/proc/self/cgroup", controller)
+func GetOwnV1CgroupPath(controller string) (string, error) {
+	parts, err := parseV1CgroupController("/proc/self/cgroup", controller)
 	if err != nil {
 		return "", err
 	}
 	return parts[2], nil
 }
 
-// GetOwnCgroupPath returns the cgroup path of this process
-func GetOwnCgroupPath() (string, error) {
-	return parseProcCgroupInfo("/proc/self/cgroup")
-}
-
-// GetLegacyCgroupPathByPid returns the cgroup path of the process with the given pid
+// GetV1CgroupPathByPid returns the cgroup path of the process with the given pid
 // and given controller.
-func GetLegacyCgroupPathByPid(pid int, controller string) (string, error) {
-	parts, err := parseLegacyCgroupController(fmt.Sprintf("/proc/%d/cgroup", pid), controller)
+func GetV1CgroupPathByPid(pid int, controller string) (string, error) {
+	parts, err := parseV1CgroupController(fmt.Sprintf("/proc/%d/cgroup", pid), controller)
 	if err != nil {
 		return "", err
 	}
 	return parts[2], nil
 }
 
-// GetCgroupPathByPid returns the cgroup path of the process
-func GetCgroupPathByPid(pid int) (string, error) {
-	return parseProcCgroupInfo(fmt.Sprintf("/proc/%d/cgroup", pid))
-}
-
-// JoinCgroup makes the calling process join the subcgroup hierarchy on a
+// JoinV1Subcgroup makes the calling process join the subcgroup hierarchy on a
 // particular controller
-func JoinLegacySubcgroup(controller string, subcgroup string) error {
+func JoinV1Subcgroup(controller string, subcgroup string) error {
 	subcgroupPath := filepath.Join("/sys/fs/cgroup", controller, subcgroup)
 	if err := os.MkdirAll(subcgroupPath, 0600); err != nil {
 		return errwrap.Wrap(fmt.Errorf("error creating %q subcgroup", subcgroup), err)
@@ -360,9 +382,9 @@ func fixCpusetKnobs(cpusetPath string) {
 	}
 }
 
-// IsLegacyControllerMounted returns whether a controller is mounted by checking that
+// IsV1ControllerMounted returns whether a controller is mounted by checking that
 // cgroup.procs is accessible
-func IsLegacyControllerMounted(c string) bool {
+func IsV1ControllerMounted(c string) bool {
 	cgroupProcsPath := filepath.Join("/sys/fs/cgroup", c, "cgroup.procs")
 	if _, err := os.Stat(cgroupProcsPath); err != nil {
 		return false
@@ -371,10 +393,10 @@ func IsLegacyControllerMounted(c string) bool {
 	return true
 }
 
-// CreateLegacyCgroups mounts the cgroup controllers hierarchy in /sys/fs/cgroup
+// CreateV1Cgroups mounts the v1 cgroup controllers hierarchy in /sys/fs/cgroup
 // under root
-func CreateLegacyCgroups(root string, enabledCgroups map[int][]string, mountContext string) error {
-	controllers := GetLegacyControllerDirs(enabledCgroups)
+func CreateV1Cgroups(root string, enabledCgroups map[int][]string, mountContext string) error {
+	controllers := GetV1ControllerDirs(enabledCgroups)
 	var flags uintptr
 
 	sys := filepath.Join(root, "/sys")
@@ -424,7 +446,7 @@ func CreateLegacyCgroups(root string, enabledCgroups map[int][]string, mountCont
 	}
 
 	// Create symlinks for combined controllers
-	symlinks := getLegacyControllerSymlinks(enabledCgroups)
+	symlinks := getV1ControllerSymlinks(enabledCgroups)
 	for ln, tgt := range symlinks {
 		lnPath := filepath.Join(cgroupTmpfs, ln)
 		if err := os.Symlink(tgt, lnPath); err != nil {
@@ -441,11 +463,11 @@ func CreateLegacyCgroups(root string, enabledCgroups map[int][]string, mountCont
 	return mountFsRO(cgroupTmpfs)
 }
 
-// RemountLegacyCgroupsRO remounts the cgroup hierarchy under root read-only,
+// RemountV1CgroupsRO remounts the v1 cgroup hierarchy under root read-only,
 // leaving the needed knobs in the subcgroup for each app read-write so the
 // systemd inside stage1 can apply isolators to them
-func RemountLegacyCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
-	controllers := GetLegacyControllerDirs(enabledCgroups)
+func RemountV1CgroupsRO(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
+	controllers := GetV1ControllerDirs(enabledCgroups)
 	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
 	sysPath := filepath.Join(root, "/sys")
 
@@ -466,7 +488,7 @@ func RemountLegacyCgroupsRO(root string, enabledCgroups map[int][]string, subcgr
 			if err := os.MkdirAll(appCgroup, 0755); err != nil {
 				return err
 			}
-			for _, f := range getLegacyControllerRWFiles(c) {
+			for _, f := range getV1ControllerRWFiles(c) {
 				cgroupFilePath := filepath.Join(appCgroup, f)
 				// the file may not be there if kernel doesn't support the
 				// feature, skip it in that case
@@ -488,17 +510,3 @@ func RemountLegacyCgroupsRO(root string, enabledCgroups map[int][]string, subcgr
 	// Bind-mount sys filesystem read-only
 	return mountFsRO(sysPath)
 }
-
-func mountFsRO(mountPoint string) error {
-	var flags uintptr = syscall.MS_BIND |
-		syscall.MS_REMOUNT |
-		syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV |
-		syscall.MS_RDONLY
-	if err := syscall.Mount(mountPoint, mountPoint, "", flags, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", mountPoint), err)
-	}
-
-	return nil
-}
diff --git a/common/cgroup/cgroup_test.go b/common/cgroup/cgroup_test.go
index 562cafc1bc..614db8748f 100644
--- a/common/cgroup/cgroup_test.go
+++ b/common/cgroup/cgroup_test.go
@@ -100,7 +100,7 @@ net_prio	6	432	1`
 	}
 
 	for i, tt := range tests {
-		o, err := parseLegacyCgroups(tt.input)
+		o, err := parseV1Cgroups(tt.input)
 		if err != nil {
 			t.Errorf("#%d: unexpected error `%v`", i, err)
 		}
diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index dd27311a94..f102e97eff 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -67,7 +67,7 @@ func main() {
 		log.PrintE("error removing journal link", err)
 	}
 
-	if err := cleanupLegacyCgroups(); err != nil {
+	if err := cleanupV1Cgroups(); err != nil {
 		log.PrintE("error cleaning up cgroups", err)
 	}
 
@@ -122,7 +122,7 @@ func (c dirsByLength) Len() int           { return len(c) }
 func (c dirsByLength) Less(i, j int) bool { return len(c[i]) < len(c[j]) }
 func (c dirsByLength) Swap(i, j int)      { c[i], c[j] = c[j], c[i] }
 
-func cleanupLegacyCgroups() error {
+func cleanupV1Cgroups() error {
 	isUnified, err := cgroup.IsCgroupUnified("/")
 	if err != nil {
 		return errwrap.Wrap(errors.New("failed to determine the cgroup version"), err)
@@ -140,7 +140,7 @@ func cleanupLegacyCgroups() error {
 	// if we're trying to clean up our own cgroup it means we're running in the
 	// same unit file as the rkt pod. We don't have to do anything, systemd
 	// will do the cleanup for us
-	ourCgroupPath, err := cgroup.GetOwnLegacyCgroupPath("name=systemd")
+	ourCgroupPath, err := cgroup.GetOwnV1CgroupPath("name=systemd")
 	if err == nil {
 		if strings.HasPrefix(ourCgroupPath, "/"+subcgroup) {
 			return nil
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 053ff2419c..fc1c87ea54 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -670,14 +670,14 @@ func stage1() int {
 	s1Root := common.Stage1RootfsPath(p.Root)
 	machineID := stage1initcommon.GetMachineID(p)
 	if !unifiedCgroup {
-		enabledCgroups, err := cgroup.GetEnabledLegacyCgroups()
+		enabledCgroups, err := cgroup.GetEnabledV1Cgroups()
 		if err != nil {
-			log.FatalE("error getting legacy cgroups", err)
+			log.FatalE("error getting v1 cgroups", err)
 			return 1
 		}
 
-		if err := mountHostLegacyCgroups(enabledCgroups); err != nil {
-			log.FatalE("couldn't mount the host legacy cgroups", err)
+		if err := mountHostV1Cgroups(enabledCgroups); err != nil {
+			log.FatalE("couldn't mount the host v1 cgroups", err)
 			return 1
 		}
 
@@ -685,15 +685,15 @@ func stage1() int {
 		for _, app := range p.Manifest.Apps {
 			serviceNames = append(serviceNames, stage1initcommon.ServiceUnitName(app.Name))
 		}
-		subcgroup, err := getContainerLegacySubCgroup(machineID, canMachinedRegister)
+		subcgroup, err := getContainerV1SubCgroup(machineID, canMachinedRegister)
 		if err == nil {
 			if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
 				[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
 				log.FatalE("cannot write subcgroup file", err)
 				return 1
 			}
-			if err := mountContainerLegacyCgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
-				log.PrintE("couldn't mount the container legacy cgroups", err)
+			if err := mountContainerV1Cgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
+				log.PrintE("couldn't mount the container v1 cgroups", err)
 				return 1
 			}
 		} else {
@@ -732,10 +732,10 @@ func stage1() int {
 	return 0
 }
 
-func areHostLegacyCgroupsMounted(enabledLegacyCgroups map[int][]string) bool {
-	controllers := cgroup.GetLegacyControllerDirs(enabledLegacyCgroups)
+func areHostV1CgroupsMounted(enabledV1Cgroups map[int][]string) bool {
+	controllers := cgroup.GetV1ControllerDirs(enabledV1Cgroups)
 	for _, c := range controllers {
-		if !cgroup.IsLegacyControllerMounted(c) {
+		if !cgroup.IsV1ControllerMounted(c) {
 			return false
 		}
 	}
@@ -743,21 +743,21 @@ func areHostLegacyCgroupsMounted(enabledLegacyCgroups map[int][]string) bool {
 	return true
 }
 
-// mountHostLegacyCgroups mounts the host legacy cgroup hierarchy as required by
+// mountHostV1Cgroups mounts the host v1 cgroup hierarchy as required by
 // systemd-nspawn. We need this because some distributions don't have the
 // "name=systemd" cgroup or don't mount the cgroup controllers in
 // "/sys/fs/cgroup", and systemd-nspawn needs this. Since this is mounted
 // inside the rkt mount namespace, it doesn't affect the host.
-func mountHostLegacyCgroups(enabledCgroups map[int][]string) error {
+func mountHostV1Cgroups(enabledCgroups map[int][]string) error {
 	systemdControllerPath := "/sys/fs/cgroup/systemd"
-	if !areHostLegacyCgroupsMounted(enabledCgroups) {
+	if !areHostV1CgroupsMounted(enabledCgroups) {
 		mountContext := os.Getenv(common.EnvSELinuxMountContext)
-		if err := cgroup.CreateLegacyCgroups("/", enabledCgroups, mountContext); err != nil {
+		if err := cgroup.CreateV1Cgroups("/", enabledCgroups, mountContext); err != nil {
 			return errwrap.Wrap(errors.New("error creating host cgroups"), err)
 		}
 	}
 
-	if !cgroup.IsLegacyControllerMounted("systemd") {
+	if !cgroup.IsV1ControllerMounted("systemd") {
 		if err := os.MkdirAll(systemdControllerPath, 0700); err != nil {
 			return err
 		}
@@ -769,22 +769,22 @@ func mountHostLegacyCgroups(enabledCgroups map[int][]string) error {
 	return nil
 }
 
-// mountContainerLegacyCgroups mounts the cgroup controllers hierarchy in the container's
+// mountContainerV1Cgroups mounts the cgroup controllers hierarchy in the container's
 // namespace read-only, leaving the needed knobs in the subcgroup for each-app
 // read-write so systemd inside stage1 can apply isolators to them
-func mountContainerLegacyCgroups(s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
+func mountContainerV1Cgroups(s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
 	mountContext := os.Getenv(common.EnvSELinuxMountContext)
-	if err := cgroup.CreateLegacyCgroups(s1Root, enabledCgroups, mountContext); err != nil {
+	if err := cgroup.CreateV1Cgroups(s1Root, enabledCgroups, mountContext); err != nil {
 		return errwrap.Wrap(errors.New("error creating container cgroups"), err)
 	}
-	if err := cgroup.RemountLegacyCgroupsRO(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
+	if err := cgroup.RemountV1CgroupsRO(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
 		return errwrap.Wrap(errors.New("error restricting container cgroups"), err)
 	}
 
 	return nil
 }
 
-func getContainerLegacySubCgroup(machineID string, canMachinedRegister bool) (string, error) {
+func getContainerV1SubCgroup(machineID string, canMachinedRegister bool) (string, error) {
 	var subcgroup string
 	fromUnit, err := util.RunningFromSystemService()
 	if err != nil {
@@ -815,16 +815,16 @@ func getContainerLegacySubCgroup(machineID string, canMachinedRegister bool) (st
 		} else {
 			// when registration is disabled the container will be directly
 			// under the current cgroup so we can look it up in /proc/self/cgroup
-			ownLegacyCgroupPath, err := cgroup.GetOwnLegacyCgroupPath("name=systemd")
+			ownV1CgroupPath, err := cgroup.GetOwnV1CgroupPath("name=systemd")
 			if err != nil {
-				return "", errwrap.Wrap(errors.New("could not get own legacy cgroup path"), err)
+				return "", errwrap.Wrap(errors.New("could not get own v1 cgroup path"), err)
 			}
 			// systemd-nspawn won't work if we are in the root cgroup. In addition,
 			// we want all rkt instances to be in distinct cgroups. Create a
 			// subcgroup and add ourselves to it.
-			subcgroup = filepath.Join(ownLegacyCgroupPath, machineDir)
-			if err := cgroup.JoinLegacySubcgroup("systemd", subcgroup); err != nil {
-				return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", ownLegacyCgroupPath), err)
+			subcgroup = filepath.Join(ownV1CgroupPath, machineDir)
+			if err := cgroup.JoinV1Subcgroup("systemd", subcgroup); err != nil {
+				return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", ownV1CgroupPath), err)
 			}
 		}
 	}
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 489db889b4..ac55795d40 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -412,7 +412,7 @@ func main() {
 
 		var limitPath string
 		if isUnified {
-			cgroupPath, err := cgroup.GetOwnCgroupPath()
+			cgroupPath, err := cgroup.GetOwnV2CgroupPath()
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Error getting own memory cgroup path: %v\n", err)
 				os.Exit(1)
@@ -420,7 +420,7 @@ func main() {
 			limitPath = filepath.Join("/proc/1/root/sys/fs/cgroup/", cgroupPath, "memory.max")
 			fmt.Fprintln(os.Stderr, "limitPath:", limitPath)
 		} else {
-			memCgroupPath, err := cgroup.GetOwnLegacyCgroupPath("memory")
+			memCgroupPath, err := cgroup.GetOwnV1CgroupPath("memory")
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Error getting own memory cgroup path: %v\n", err)
 				os.Exit(1)
@@ -438,7 +438,7 @@ func main() {
 	}
 
 	if globalFlags.PrintCPUQuota {
-		cpuCgroupPath, err := cgroup.GetOwnLegacyCgroupPath("cpu")
+		cpuCgroupPath, err := cgroup.GetOwnV1CgroupPath("cpu")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error getting own cpu cgroup path: %v\n", err)
 			os.Exit(1)

From 70a0cc43a3ef5c55f59872e0ff6329ed87cb2b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 15 Sep 2016 15:18:07 +0200
Subject: [PATCH 0751/1304] stage1/init: write "subcgroup" file in v2 too

---
 stage1/init/init.go | 69 ++++++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 26 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index fc1c87ea54..3f79d22569 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -669,6 +669,19 @@ func stage1() int {
 
 	s1Root := common.Stage1RootfsPath(p.Root)
 	machineID := stage1initcommon.GetMachineID(p)
+
+	subcgroup, err := getContainerSubCgroup(machineID, canMachinedRegister, unifiedCgroup)
+	if err != nil {
+		log.FatalE("error getting container subcgroup", err)
+		return 1
+	}
+
+	if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
+		[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
+		log.FatalE("cannot write subcgroup file", err)
+		return 1
+	}
+
 	if !unifiedCgroup {
 		enabledCgroups, err := cgroup.GetEnabledV1Cgroups()
 		if err != nil {
@@ -685,20 +698,12 @@ func stage1() int {
 		for _, app := range p.Manifest.Apps {
 			serviceNames = append(serviceNames, stage1initcommon.ServiceUnitName(app.Name))
 		}
-		subcgroup, err := getContainerV1SubCgroup(machineID, canMachinedRegister)
-		if err == nil {
-			if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
-				[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
-				log.FatalE("cannot write subcgroup file", err)
-				return 1
-			}
-			if err := mountContainerV1Cgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
-				log.PrintE("couldn't mount the container v1 cgroups", err)
-				return 1
-			}
-		} else {
-			log.PrintE("continuing with per-app isolators disabled", err)
+
+		if err := mountContainerV1Cgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
+			log.PrintE("couldn't mount the container v1 cgroups", err)
+			return 1
 		}
+
 	}
 
 	// KVM flavor has a bit different logic in handling pid vs ppid, for details look into #2389
@@ -784,7 +789,7 @@ func mountContainerV1Cgroups(s1Root string, enabledCgroups map[int][]string, sub
 	return nil
 }
 
-func getContainerV1SubCgroup(machineID string, canMachinedRegister bool) (string, error) {
+func getContainerSubCgroup(machineID string, canMachinedRegister, unified bool) (string, error) {
 	var subcgroup string
 	fromUnit, err := util.RunningFromSystemService()
 	if err != nil {
@@ -804,6 +809,10 @@ func getContainerV1SubCgroup(machineID string, canMachinedRegister bool) (string
 			return "", errwrap.Wrap(errors.New("could not get unit name"), err)
 		}
 		subcgroup = filepath.Join(slicePath, unit)
+
+		if unified {
+			subcgroup = filepath.Join(subcgroup, "payload")
+		}
 	} else {
 		escapedmID := strings.Replace(machineID, "-", "\\x2d", -1)
 		machineDir := "machine-" + escapedmID + ".scope"
@@ -813,18 +822,26 @@ func getContainerV1SubCgroup(machineID string, canMachinedRegister bool) (string
 			// look it up in /proc/self/cgroup
 			subcgroup = filepath.Join("machine.slice", machineDir)
 		} else {
-			// when registration is disabled the container will be directly
-			// under the current cgroup so we can look it up in /proc/self/cgroup
-			ownV1CgroupPath, err := cgroup.GetOwnV1CgroupPath("name=systemd")
-			if err != nil {
-				return "", errwrap.Wrap(errors.New("could not get own v1 cgroup path"), err)
-			}
-			// systemd-nspawn won't work if we are in the root cgroup. In addition,
-			// we want all rkt instances to be in distinct cgroups. Create a
-			// subcgroup and add ourselves to it.
-			subcgroup = filepath.Join(ownV1CgroupPath, machineDir)
-			if err := cgroup.JoinV1Subcgroup("systemd", subcgroup); err != nil {
-				return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", ownV1CgroupPath), err)
+			if unified {
+				var err error
+				subcgroup, err = cgroup.GetOwnV2CgroupPath()
+				if err != nil {
+					return "", errwrap.Wrap(errors.New("could not get own v2 cgroup path"), err)
+				}
+			} else {
+				// when registration is disabled the container will be directly
+				// under the current cgroup so we can look it up in /proc/self/cgroup
+				ownV1CgroupPath, err := cgroup.GetOwnV1CgroupPath("name=systemd")
+				if err != nil {
+					return "", errwrap.Wrap(errors.New("could not get own v1 cgroup path"), err)
+				}
+				// systemd-nspawn won't work if we are in the root cgroup. In addition,
+				// we want all rkt instances to be in distinct cgroups. Create a
+				// subcgroup and add ourselves to it.
+				subcgroup = filepath.Join(ownV1CgroupPath, machineDir)
+				if err := cgroup.JoinV1Subcgroup("systemd", subcgroup); err != nil {
+					return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", ownV1CgroupPath), err)
+				}
 			}
 		}
 	}

From 90c82df30317317620f5f5bc38b5c605180b26f2 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 15 Sep 2016 15:23:19 +0200
Subject: [PATCH 0752/1304] version: bump to v1.15.0

---
 CHANGELOG.md                         | 28 +++++++++++++++++++++++
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  4 ++--
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 ++---
 ROADMAP.md                           | 33 ----------------------------
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 17 files changed, 48 insertions(+), 53 deletions(-)
 delete mode 100644 ROADMAP.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23b052cb4e..a810269545 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.15.0
+
+This relase brings some expanded DNS configuration options, beta support for QEMU, recursive volume mounts, and improved sd_notify support.
+
+### New features
+- DNS configuration improvements ([#3161](https://github.com/coreos/rkt/pull/3161)):
+    - Respect DNS results from CNI
+    - Add --dns=host mode to bind-mount the host's /etc/resolv.conf
+    - Add --dns=none mode to ignore CNI DNS
+    - Add --hosts-entry (IP=HOSTNAME) to tweak the pod's /etc/hosts
+    - Add --hosts-entry=host to bind-mount the host's /etc/hosts
+- Introduce QEMU support as an alternative KVM hypervisor ([#2952](https://github.com/coreos/rkt/pull/2952))
+- add support for recursive volume/mounts ([#2880](https://github.com/coreos/rkt/pull/2880))
+- stage1: allow sd_notify from the app in the container to the host ([#2826](https://github.com/coreos/rkt/pull/2826)).
+
+### Other changes
+- rkt-monitor: bunch of improvements ([#3093](https://github.com/coreos/rkt/pull/3093))
+- makefile/kvm: add dependency for copied files ([#3197](https://github.com/coreos/rkt/pull/3197))
+- store: refactor GetRemote ([#2975](https://github.com/coreos/rkt/pull/2975)).
+- build,stage1: include systemd dir when checking libs ([#3186](https://github.com/coreos/rkt/pull/3186))
+- tests: volumes: add missing test `volumeMountTestCasesNonRecursive` ([#3165](https://github.com/coreos/rkt/pull/3165))
+- kvm/pod: disable insecure-options=paths for kvm flavor ([#3155](https://github.com/coreos/rkt/pull/3155))
+- stage0: don't copy image annotations to pod manifest RuntimeApp annotations ([#3100](https://github.com/coreos/rkt/pull/3100))
+- stage1: shutdown.service: don't use /dev/console ([#3148](https://github.com/coreos/rkt/pull/3148))
+- build: build simple .deb and .rpm packages ([#3177](https://github.com/coreos/rkt/pull/3177)). Add a simple script to build .deb and .rpm packages. This is not a substitute for a proper distro-maintained package.
+- Documentation updates: ([#3196](https://github.com/coreos/rkt/pull/3196)) ([#3192](https://github.com/coreos/rkt/pull/3192)) ([#3187](https://github.com/coreos/rkt/pull/3187)) ([#3185](https://github.com/coreos/rkt/pull/3185)) ([#3182](https://github.com/coreos/rkt/pull/3182)) ([#3180](https://github.com/coreos/rkt/pull/3180)) ([#3166](https://github.com/coreos/rkt/pull/3166))
+- proposals/app-level-api: add rkt app sandbox subcommand ([#3147](https://github.com/coreos/rkt/pull/3147)). This adds a new subcommand `app init` to create an initial empty pod.
+
 ## 1.14.0
 
 This release updates the coreos and kvm flavors, bringing in a newer stable systemd (v231). Several fixes and cgroups-related changes landed in `api-service`, and better heuristics have been introduced to avoid using overlays in non-supported environments. Finally, `run-prepared` now honors options for insecure/privileged pods too.
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 2ee51c5b0d..6cff595121 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.14.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.15.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.14.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.15.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index c838cb9bd6..9ec7350b8f 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.14.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.15.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.14.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.15.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index ec5977888a..9d655ab7e0 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.14.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.15.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.14.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.15.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index a375099475..2809d1ff80 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.14.0
+rkt Version: 1.15.0
 appc Version: 0.8.7
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 7108c2faa7..f5d3cfd6d3 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.14.0/rkt-v1.14.0.tar.gz
-tar xzvf rkt-v1.14.0.tar.gz
-cd rkt-v1.14.0
+wget https://github.com/coreos/rkt/releases/download/v1.15.0/rkt-v1.15.0.tar.gz
+tar xzvf rkt-v1.15.0.tar.gz
+cd rkt-v1.15.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
deleted file mode 100644
index 9332025c64..0000000000
--- a/ROADMAP.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# rkt roadmap
-
-This document defines a high level roadmap for rkt development.
-The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project.
-The [milestones defined in GitHub](https://github.com/coreos/rkt/milestones) represent the most up-to-date state of affairs.
-
-rkt is an implementation of the [App Container spec](https://github.com/appc/spec), which is still under active development on an approximately similar timeframe.
-The version of the spec that rkt implements can be seen in the output of `rkt version`.
-
-rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
-
-### rkt 1.15.0 (September)
-
-Full plan at https://github.com/coreos/rkt/milestone/49.
-
-Highlights:
-- initial CRI support, replacing the existing gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha).
-- Refactor distribution/storage handling
-- Improved native support for OCI
-- Enhanced DNS configuration
-- Further improvements for SELinux environments, especially Fedora in enforcing mode
-- Support for unified cgroups
-
-### Upcoming
-
-Full plan at https://github.com/coreos/rkt/milestone/30.
-
-Highlights:
-- `rkt fly` as top-level command
-- User configuration for stage1
-- Stable gRPC [API](https://github.com/coreos/rkt/tree/master/api/v1alpha)
-- Packaged for more distributions
-  - CentOS
diff --git a/configure.ac b/configure.ac
index 046ed24a15..2ebdfcd7b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.14.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.15.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 86f966dcf6..5873c1ccce 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.14.0"
+version="1.15.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index d645708d27..ce7bbb8ca5 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.14.0"
+            "value": "1.15.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 399299ebd9..5fef83644b 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.14.0"
+            "value": "1.15.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 624e8d548e..5f7a3e7bd6 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.14.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.15.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 5becbb0771..613435ee1c 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.14.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.15.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index b8e3422260..515e662d2d 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.14.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.15.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 8ca2e059c1..363f0af5fe 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.14.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.15.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 80b40f67e3..6a293ce92e 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.14.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.15.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index e151cc52d2..50ffb4b221 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.14.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.15.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From e17966c32c45e7dc1430aa60dacbc0757bd058b5 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 15 Sep 2016 15:23:19 +0200
Subject: [PATCH 0753/1304] version: bump to v1.15.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2ebdfcd7b8..e14c07aad0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.15.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.15.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 5f7a3e7bd6..d6f6e4ad2a 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.15.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.15.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 32571c2bc57a0d8d57e185942ea73928ef7374bd Mon Sep 17 00:00:00 2001
From: Dany Marcoux <danymarcoux@gmail.com>
Date: Fri, 16 Sep 2016 15:17:02 +0200
Subject: [PATCH 0754/1304] rkt: Correct typos listed by the tool misspell

---
 networking/kvm.go                  |  2 +-
 networking/podenv.go               |  2 +-
 pkg/user/resolver.go               |  4 ++--
 rkt/api_service.go                 |  2 +-
 rkt/rkt_test.go                    | 10 +++++-----
 stage0/run.go                      |  2 +-
 tests/rkt_run_pod_manifest_test.go |  2 +-
 tests/rkt_run_user_group_test.go   |  4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index d09485bdbf..aa3c6fb3ae 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -595,7 +595,7 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 		}
 
 		// Generate rkt-resolv.conf if it's not already there.
-		// The first network plugin that supplies a non-emtpy
+		// The first network plugin that supplies a non-empty
 		// DNS response will win, unless noDNS is true (--dns passed to rkt run)
 		if !common.IsDNSZero(&n.runtime.DNS) && !noDNS {
 			if !podHasResolvConf {
diff --git a/networking/podenv.go b/networking/podenv.go
index 6b296bd3ef..a48279ca4d 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -196,7 +196,7 @@ func (e *podEnv) setupNets(nets []activeNet, noDNS bool) error {
 		}
 
 		// Generate rkt-resolv.conf if it's not already there.
-		// The first network plugin that supplies a non-emtpy
+		// The first network plugin that supplies a non-empty
 		// DNS response will win, unless noDNS is true (--dns passed to rkt run)
 		if !common.IsDNSZero(&n.runtime.DNS) && !noDNS {
 			if !podHasResolvConf {
diff --git a/pkg/user/resolver.go b/pkg/user/resolver.go
index 855c59a430..5a4206b7f1 100644
--- a/pkg/user/resolver.go
+++ b/pkg/user/resolver.go
@@ -40,8 +40,8 @@ type idsFromEtc struct {
 
 // IDsFromEtc returns a new UID/GID resolver by parsing etc/passwd, and etc/group
 // relative from the given rootPath looking for the given username, or group.
-// If username is empty string the etc/passwd lookup will be ommitted.
-// If group is empty string the etc/group lookup will be ommitted.
+// If username is empty string the etc/passwd lookup will be omitted.
+// If group is empty string the etc/group lookup will be omitted.
 func IDsFromEtc(rootPath, username, group string) (Resolver, error) {
 	return idsFromEtc{
 		rootPath: rootPath,
diff --git a/rkt/api_service.go b/rkt/api_service.go
index 42aeb60375..36ecd77022 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -431,7 +431,7 @@ func (e errs) Error() string {
 	return fmt.Sprintf("%v", e.errs)
 }
 
-// fillStaticAppInfo will modify the 'v1pod' in place with the infomation retrived with 'pod'.
+// fillStaticAppInfo will modify the 'v1pod' in place with the information retrieved with 'pod'.
 // Today, these information are static and will not change during the pod's lifecycle.
 func fillStaticAppInfo(store *imagestore.Store, pod *pod, v1pod *v1alpha.Pod) error {
 	var errlist []error
diff --git a/rkt/rkt_test.go b/rkt/rkt_test.go
index 098b3f1d49..041c4a24eb 100644
--- a/rkt/rkt_test.go
+++ b/rkt/rkt_test.go
@@ -59,12 +59,12 @@ func TestCalculateDataDir(t *testing.T) {
 
 	// TODO(tmrts): Write a utility function that generates unused random paths.
 	// Example signature would be fileutils.GenerateUniquePath(prefix string) (string, error).
-	nonExistantDir, err := ioutil.TempDir("", "non-existant-")
+	nonExistentDir, err := ioutil.TempDir("", "non-existent-")
 	if err != nil {
 		panic(fmt.Errorf("ioutil.TempDir(%q, %q) got error %q", "", "", err))
 	}
-	if err := os.Remove(nonExistantDir); err != nil {
-		panic(fmt.Errorf("os.Remove(%q) got error %q", nonExistantDir, err))
+	if err := os.Remove(nonExistentDir); err != nil {
+		panic(fmt.Errorf("os.Remove(%q) got error %q", nonExistentDir, err))
 	}
 
 	testCases := []struct {
@@ -75,8 +75,8 @@ func TestCalculateDataDir(t *testing.T) {
 		{"", "", defaultDataDir},
 		{"", tmpDir, tmpDir},
 		{tmpDir, "", tmpDir},
-		{nonExistantDir, "", nonExistantDir},
-		{"", nonExistantDir, nonExistantDir},
+		{nonExistentDir, "", nonExistentDir},
+		{"", nonExistentDir, nonExistentDir},
 	}
 
 	for _, tc := range testCases {
diff --git a/stage0/run.go b/stage0/run.go
index b22ee07b26..97353e83ee 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -554,7 +554,7 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 	}
 
 	if err := os.Setenv(common.EnvSELinuxMountContext, fmt.Sprintf("%v", cfg.MountLabel)); err != nil {
-		log.FatalE("setting SELinux mount context enviroment", err)
+		log.FatalE("setting SELinux mount context environment", err)
 	}
 
 	debug("Pivoting to filesystem %s", dir)
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 090dee5ee6..b59854c2c5 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -752,7 +752,7 @@ func TestPodManifest(t *testing.T) {
 		{
 			// Simple read after write with volume mounted, no apps in pod manifest.
 			// This should succeed even the mount point in image manifest is readOnly,
-			// because it is overriden by the volume's readOnly.
+			// because it is overridden by the volume's readOnly.
 			[]imagePatch{
 				{
 					"rkt-test-run-pod-manifest-vol-ro-no-app.aci",
diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
index 8b8981a9b3..820580f9d6 100644
--- a/tests/rkt_run_user_group_test.go
+++ b/tests/rkt_run_user_group_test.go
@@ -110,7 +110,7 @@ func TestAppUserGroup(t *testing.T) {
 			}
 
 			for _, userNSOpt := range userNSOpts {
-				// run the user/group overriden app first
+				// run the user/group overridden app first
 				rktCmd := fmt.Sprintf(
 					"%s --debug --insecure-options=image run %s %s %s %s",
 					ctx.Cmd(),
@@ -120,7 +120,7 @@ func TestAppUserGroup(t *testing.T) {
 				)
 				runRktAndCheckOutput(t, rktCmd, tt.expected, false)
 
-				// run the user/group overriden app last
+				// run the user/group overridden app last
 				rktCmd = fmt.Sprintf(
 					"%s --debug --insecure-options=image run %s %s %s %s",
 					ctx.Cmd(),

From 8fec0cb09b7bc76af69290a4ebb5da086733cef0 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Sat, 17 Sep 2016 02:59:17 +0200
Subject: [PATCH 0755/1304] docs/distributions: rearrange, add centos

---
 Documentation/distributions.md | 85 ++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 564ad39651..1132401c50 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -1,15 +1,36 @@
 # Installing rkt on popular Linux distributions
 
+- [Arch](#arch)
+- [CentOS](#centos)
+- [CoreOS](#coreos)
+- [Debian](#debian)
+- [Fedora](#fedora)
+- [NixOS](#nixos)
+- [openSUSE](#opensuse)
+- [Ubuntu](#ubuntu)
+- [Void](#void)
+
+## Arch
+
+rkt is available in the [Community Repository](https://www.archlinux.org/packages/community/x86_64/rkt/) and can be installed using pacman:
+```
+sudo pacman -S rkt
+```
+
+## CentOS
+
+rkt is available in the [CentOS Community Build Service](https://cbs.centos.org/koji/packageinfo?packageID=4464) for CentOS 7.
+
 ## CoreOS
 
 rkt is an integral part of CoreOS, installed with the operating system.
 The [CoreOS releases page](https://coreos.com/releases/) lists the version of rkt available in each CoreOS release channel.
 
-If the version of rkt included in CoreOS is too old, it's fairly trivial to fetch the desired version [via a systemd unit](install-rkt-in-coreos.md)
+If the version of rkt included in CoreOS is too old, it's fairly trivial to fetch the desired version [via a systemd unit](install-rkt-in-coreos.md).
 
 ## Debian
 
-rkt currently is packaged in Debian sid (unstable) available at https://packages.debian.org/sid/utils/rkt:
+rkt is currently packaged in Debian sid (unstable) available at https://packages.debian.org/sid/utils/rkt:
 
 ```
 sudo apt-get install rkt
@@ -23,32 +44,6 @@ sudo rkt run --insecure-options=image --stage1-name=coreos.com/rkt/stage1-coreos
 
 If you prefer to install the newest version of rkt follow the instructions in the Ubuntu section below.
 
-## Ubuntu
-
-rkt is not packaged currently in Ubuntu. If you want the newest version of rkt the easiest method to install it is using the `install-rkt.sh` script. This script can be found in the *scripts* directory of the [rkt Github repository](https://github.com/coreos/rkt).
-
-Either clone the repository and run the script:
-
-```
-git clone https://github.com/coreos/rkt
-cd rkt
-sudo ./scripts/install-rkt.sh
-```
-
-Or just get the script:
-
-```
-wget https://raw.githubusercontent.com/coreos/rkt/master/scripts/install-rkt.sh
-chmod +x install-rkt.sh
-sudo ./install-rkt.sh
-```
-
-The above script will install the "gnupg2", and "checkinstall" packages, download rkt, verify it, and finally invoke "checkinstall" to create a deb pakage and install rkt. To uninstall rkt, execute:
-
-```
-sudo apt-get remove rkt
-```
-
 ## Fedora
 
 rkt is packaged in the development version of Fedora, [Rawhide](https://fedoraproject.org/wiki/Releases/Rawhide):
@@ -90,14 +85,6 @@ sudo firewall-cmd --add-source=172.16.28.0/24 --zone=trusted
 
 172.16.28.0/24 is the subnet of the [default pod network](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md#the-default-network). The command must be adapted when rkt is configured to use a [different network](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md#setting-up-additional-networks) with a different subnet.
 
-
-## Arch
-
-rkt is available in the [Community Repository](https://www.archlinux.org/packages/community/x86_64/rkt/) and can be installed using pacman:
-```
-sudo pacman -S rkt
-```
-
 ## NixOS
 
 rkt can be installed on NixOS using the following command:
@@ -125,6 +112,32 @@ Install rkt using zypper:
 sudo zypper in rkt
 ```
 
+## Ubuntu
+
+rkt is not packaged currently in Ubuntu. If you want the newest version of rkt the easiest method to install it is using the `install-rkt.sh` script. This script can be found in the *scripts* directory of the [rkt Github repository](https://github.com/coreos/rkt).
+
+Either clone the repository and run the script:
+
+```
+git clone https://github.com/coreos/rkt
+cd rkt
+sudo ./scripts/install-rkt.sh
+```
+
+Or just get the script:
+
+```
+wget https://raw.githubusercontent.com/coreos/rkt/master/scripts/install-rkt.sh
+chmod +x install-rkt.sh
+sudo ./install-rkt.sh
+```
+
+The above script will install the "gnupg2", and "checkinstall" packages, download rkt, verify it, and finally invoke "checkinstall" to create a deb package and install rkt. To uninstall rkt, execute:
+
+```
+sudo apt-get remove rkt
+```
+
 ## Void
 
 rkt is available in the [official binary packages](http://www.voidlinux.eu/packages/) for the Void Linux distribution.

From 01e2e37dcb9d4c000991fa8be5708e6dab877e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20F=C3=BCrmetz?= <fuermetz@mailbox.org>
Date: Sat, 17 Sep 2016 11:38:35 +0200
Subject: [PATCH 0756/1304] stage1/host: reorder systemd-nspawn args

This fixes #3215.
---
 stage1/init/init.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 62b6103059..56255fc974 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -392,9 +392,6 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 		if n != 1 || version < 220 {
 			return nil, nil, fmt.Errorf("rkt needs systemd-nspawn >= 220. %s version not supported: %v", hostNspawnBin, versionStr)
 		}
-		if version >= 231 {
-			args = append(args, "--notify-ready=yes") // From systemd v231
-		}
 
 		// Copy systemd, bash, etc. in stage1 at run-time
 		if err := installAssets(); err != nil {
@@ -405,6 +402,10 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 		args = append(args, "--boot") // Launch systemd in the pod
 		args = append(args, fmt.Sprintf("--register=true"))
 
+		if version >= 231 {
+			args = append(args, "--notify-ready=yes") // From systemd v231
+		}
+
 		if context := os.Getenv(common.EnvSELinuxContext); context != "" {
 			args = append(args, fmt.Sprintf("-Z%s", context))
 		}

From b6a2550d9e6436b369840fda10a4f949694df001 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Fri, 16 Sep 2016 12:36:35 +0200
Subject: [PATCH 0757/1304] stage0: Factor out isolator preparation to a
 separate function

We will use it in CRI for setting up isolators with "rkt app add".
---
 stage0/run.go | 143 ++++++++++++++++++++++++++------------------------
 1 file changed, 75 insertions(+), 68 deletions(-)

diff --git a/stage0/run.go b/stage0/run.go
index b22ee07b26..c92208d688 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -245,74 +245,8 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 			ra.App.Exec = append(ra.App.Exec, execAppends...)
 		}
 
-		if memoryOverride := app.MemoryLimit; memoryOverride != nil {
-			isolator := memoryOverride.AsIsolator()
-			ra.App.Isolators = append(ra.App.Isolators, isolator)
-		}
-
-		if cpuOverride := app.CPULimit; cpuOverride != nil {
-			isolator := cpuOverride.AsIsolator()
-			ra.App.Isolators = append(ra.App.Isolators, isolator)
-		}
-
-		if app.CapsRetain != nil && app.CapsRemove != nil {
-			return fmt.Errorf("error: cannot use both --caps-retain and --caps-remove on the same image")
-		}
-
-		// Delete existing caps isolators if the user wants to override
-		// them with either --caps-retain or --caps-remove
-		if app.CapsRetain != nil || app.CapsRemove != nil {
-			for i := len(ra.App.Isolators) - 1; i >= 0; i-- {
-				isolator := ra.App.Isolators[i]
-				if _, ok := isolator.Value().(types.LinuxCapabilitiesSet); ok {
-					ra.App.Isolators = append(ra.App.Isolators[:i],
-						ra.App.Isolators[i+1:]...)
-				}
-			}
-		}
-
-		if capsRetain := app.CapsRetain; capsRetain != nil {
-			isolator, err := capsRetain.AsIsolator()
-			if err != nil {
-				return err
-			}
-			ra.App.Isolators = append(ra.App.Isolators, *isolator)
-		} else if capsRemove := app.CapsRemove; capsRemove != nil {
-			isolator, err := capsRemove.AsIsolator()
-			if err != nil {
-				return err
-			}
-			ra.App.Isolators = append(ra.App.Isolators, *isolator)
-		}
-
-		// Override seccomp isolators via --seccomp CLI switch
-		if app.SeccompFilter != "" {
-			var is *types.Isolator
-			mode, errno, set, err := app.SeccompOverride()
-			if err != nil {
-				return err
-			}
-			switch mode {
-			case "retain":
-				lss, err := types.NewLinuxSeccompRetainSet(errno, set...)
-				if err != nil {
-					return err
-				}
-				if is, err = lss.AsIsolator(); err != nil {
-					return err
-				}
-			case "remove":
-				lss, err := types.NewLinuxSeccompRemoveSet(errno, set...)
-				if err != nil {
-					return err
-				}
-				if is, err = lss.AsIsolator(); err != nil {
-					return err
-				}
-			default:
-				return apps.ErrInvalidSeccompMode
-			}
-			ra.App.Isolators.ReplaceIsolatorsByName(*is, []types.ACIdentifier{types.LinuxSeccompRemoveSetName, types.LinuxSeccompRetainSetName})
+		if err := prepareIsolators(app, ra.App); err != nil {
+			return err
 		}
 
 		if user := app.User; user != "" {
@@ -349,6 +283,79 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 	return pmb, nil
 }
 
+func prepareIsolators(setup *apps.App, app *types.App) error {
+	if memoryOverride := setup.MemoryLimit; memoryOverride != nil {
+		isolator := memoryOverride.AsIsolator()
+		app.Isolators = append(app.Isolators, isolator)
+	}
+
+	if cpuOverride := setup.CPULimit; cpuOverride != nil {
+		isolator := cpuOverride.AsIsolator()
+		app.Isolators = append(app.Isolators, isolator)
+	}
+
+	if setup.CapsRetain != nil && setup.CapsRemove != nil {
+		return fmt.Errorf("error: cannot use both --caps-retain and --caps-remove on the same image")
+	}
+
+	// Delete existing caps isolators if the user wants to override
+	// them with either --caps-retain or --caps-remove
+	if setup.CapsRetain != nil || setup.CapsRemove != nil {
+		for i := len(app.Isolators) - 1; i >= 0; i-- {
+			isolator := app.Isolators[i]
+			if _, ok := isolator.Value().(types.LinuxCapabilitiesSet); ok {
+				app.Isolators = append(app.Isolators[:i],
+					app.Isolators[i+1:]...)
+			}
+		}
+	}
+
+	if capsRetain := setup.CapsRetain; capsRetain != nil {
+		isolator, err := capsRetain.AsIsolator()
+		if err != nil {
+			return err
+		}
+		app.Isolators = append(app.Isolators, *isolator)
+	} else if capsRemove := setup.CapsRemove; capsRemove != nil {
+		isolator, err := capsRemove.AsIsolator()
+		if err != nil {
+			return err
+		}
+		app.Isolators = append(app.Isolators, *isolator)
+	}
+
+	// Override seccomp isolators via --seccomp CLI switch
+	if setup.SeccompFilter != "" {
+		var is *types.Isolator
+		mode, errno, set, err := setup.SeccompOverride()
+		if err != nil {
+			return err
+		}
+		switch mode {
+		case "retain":
+			lss, err := types.NewLinuxSeccompRetainSet(errno, set...)
+			if err != nil {
+				return err
+			}
+			if is, err = lss.AsIsolator(); err != nil {
+				return err
+			}
+		case "remove":
+			lss, err := types.NewLinuxSeccompRemoveSet(errno, set...)
+			if err != nil {
+				return err
+			}
+			if is, err = lss.AsIsolator(); err != nil {
+				return err
+			}
+		default:
+			return apps.ErrInvalidSeccompMode
+		}
+		app.Isolators.ReplaceIsolatorsByName(*is, []types.ACIdentifier{types.LinuxSeccompRemoveSetName, types.LinuxSeccompRetainSetName})
+	}
+	return nil
+}
+
 // validatePodManifest reads the user-specified pod manifest, prepares the app images
 // and validates the pod manifest. If the pod manifest passes validation, it returns
 // the manifest as []byte.

From b5cd8b9894836324aba6a6d3fdac7fac44e7e51c Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Fri, 16 Sep 2016 12:43:29 +0200
Subject: [PATCH 0758/1304] cli: refactor flags for app isolators

Based on work from Krzesimir, rebased by Alban
---
 rkt/run.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/rkt/run.go b/rkt/run.go
index f90153f43c..e1f699ffe8 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -78,6 +78,14 @@ image arguments with a lone "---" to resume argument parsing.`,
 	flagHostsEntries flagStringList
 )
 
+func addIsolatorFlags(cmd *cobra.Command) {
+	cmd.Flags().Var((*appMemoryLimit)(&rktApps), "memory", "memory limit for the preceding image (example: '--memory=16Mi', '--memory=50M', '--memory=1G')")
+	cmd.Flags().Var((*appCPULimit)(&rktApps), "cpu", "cpu limit for the preceding image (example: '--cpu=500m')")
+	cmd.Flags().Var((*appCapsRetain)(&rktApps), "caps-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")
+	cmd.Flags().Var((*appCapsRemove)(&rktApps), "caps-remove", "capability to remove (example: '--caps-remove=CAP_MKNOD')")
+	cmd.Flags().Var((*appSeccompFilter)(&rktApps), "seccomp", "seccomp filter override (example: '--seccomp mode=retain,errno=EPERM,chmod,chown')")
+}
+
 func init() {
 	cmdRkt.AddCommand(cmdRun)
 
@@ -113,13 +121,9 @@ func init() {
 	cmdRun.Flags().Var((*appAsc)(&rktApps), "signature", "local signature file to use in validating the preceding image")
 	cmdRun.Flags().Var((*appExec)(&rktApps), "exec", "override the exec command for the preceding image")
 	cmdRun.Flags().Var((*appMount)(&rktApps), "mount", "mount point binding a volume to a path within an app")
-	cmdRun.Flags().Var((*appMemoryLimit)(&rktApps), "memory", "memory limit for the preceding image (example: '--memory=16Mi', '--memory=50M', '--memory=1G')")
-	cmdRun.Flags().Var((*appCPULimit)(&rktApps), "cpu", "cpu limit for the preceding image (example: '--cpu=500m')")
 	cmdRun.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
 	cmdRun.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
-	cmdRun.Flags().Var((*appCapsRetain)(&rktApps), "caps-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")
-	cmdRun.Flags().Var((*appCapsRemove)(&rktApps), "caps-remove", "capability to remove (example: '--caps-remove=CAP_MKNOD')")
-	cmdRun.Flags().Var((*appSeccompFilter)(&rktApps), "seccomp", "seccomp filter override (example: '--seccomp mode=retain,errno=EPERM,chmod,chown')")
+	addIsolatorFlags(cmdRun)
 
 	// For backwards compatibility
 	cmdRun.Flags().Var((*appCapsRetain)(&rktApps), "cap-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")

From 8e942d89f4fca04c8acdcfa823fa84ec9ee4e28b Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 16 Sep 2016 15:28:40 +0200
Subject: [PATCH 0759/1304] rkt run/prepare: use addAppFlags and
 addIsolatorFlags

---
 rkt/prepare.go |  8 ++------
 rkt/run.go     | 30 ++++++++++++++++++------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/rkt/prepare.go b/rkt/prepare.go
index 07fed953fa..40ff404227 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -68,13 +68,9 @@ func init() {
 	cmdPrepare.Flags().Var((*appsVolume)(&rktApps), "volume", "volumes to make available in the pod")
 
 	// per-app flags
-	cmdPrepare.Flags().Var((*appExec)(&rktApps), "exec", "override the exec command for the preceding image")
-	cmdPrepare.Flags().Var((*appMount)(&rktApps), "mount", "mount point binding a volume to a path within an app")
 	cmdPrepare.Flags().Var((*appAsc)(&rktApps), "signature", "local signature file to use in validating the preceding image")
-	cmdPrepare.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
-	cmdPrepare.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
-	cmdPrepare.Flags().Var((*appCapsRetain)(&rktApps), "cap-retain", "capability to retain (example: '--cap-retain=CAP_SYS_ADMIN')")
-	cmdPrepare.Flags().Var((*appCapsRemove)(&rktApps), "cap-remove", "capability to remove (example: '--cap-remove=CAP_MKNOD')")
+	addAppFlags(cmdPrepare)
+	addIsolatorFlags(cmdPrepare, true)
 
 	// Disable interspersed flags to stop parsing after the first non flag
 	// argument. This is need to permit to correctly handle
diff --git a/rkt/run.go b/rkt/run.go
index e1f699ffe8..ec1cd760f0 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -78,12 +78,27 @@ image arguments with a lone "---" to resume argument parsing.`,
 	flagHostsEntries flagStringList
 )
 
-func addIsolatorFlags(cmd *cobra.Command) {
+func addIsolatorFlags(cmd *cobra.Command, compat bool) {
 	cmd.Flags().Var((*appMemoryLimit)(&rktApps), "memory", "memory limit for the preceding image (example: '--memory=16Mi', '--memory=50M', '--memory=1G')")
 	cmd.Flags().Var((*appCPULimit)(&rktApps), "cpu", "cpu limit for the preceding image (example: '--cpu=500m')")
 	cmd.Flags().Var((*appCapsRetain)(&rktApps), "caps-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")
 	cmd.Flags().Var((*appCapsRemove)(&rktApps), "caps-remove", "capability to remove (example: '--caps-remove=CAP_MKNOD')")
 	cmd.Flags().Var((*appSeccompFilter)(&rktApps), "seccomp", "seccomp filter override (example: '--seccomp mode=retain,errno=EPERM,chmod,chown')")
+
+	// For backwards compatibility
+	if compat {
+		cmd.Flags().Var((*appCapsRetain)(&rktApps), "cap-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")
+		cmd.Flags().Var((*appCapsRemove)(&rktApps), "cap-remove", "capability to remove (example: '--caps-remove=CAP_MKNOD')")
+		cmd.Flags().MarkDeprecated("cap-retain", "use --caps-retain instead")
+		cmd.Flags().MarkDeprecated("cap-remove", "use --caps-remove instead")
+	}
+}
+
+func addAppFlags(cmd *cobra.Command) {
+	cmd.Flags().Var((*appExec)(&rktApps), "exec", "override the exec command for the preceding image")
+	cmd.Flags().Var((*appMount)(&rktApps), "mount", "mount point binding a volume to a path within an app")
+	cmd.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
+	cmd.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
 }
 
 func init() {
@@ -119,17 +134,8 @@ func init() {
 
 	// per-app flags
 	cmdRun.Flags().Var((*appAsc)(&rktApps), "signature", "local signature file to use in validating the preceding image")
-	cmdRun.Flags().Var((*appExec)(&rktApps), "exec", "override the exec command for the preceding image")
-	cmdRun.Flags().Var((*appMount)(&rktApps), "mount", "mount point binding a volume to a path within an app")
-	cmdRun.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
-	cmdRun.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
-	addIsolatorFlags(cmdRun)
-
-	// For backwards compatibility
-	cmdRun.Flags().Var((*appCapsRetain)(&rktApps), "cap-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")
-	cmdRun.Flags().Var((*appCapsRemove)(&rktApps), "cap-remove", "capability to remove (example: '--caps-remove=CAP_MKNOD')")
-	cmdRun.Flags().MarkDeprecated("cap-retain", "use --caps-retain instead")
-	cmdRun.Flags().MarkDeprecated("cap-remove", "use --caps-remove instead")
+	addAppFlags(cmdRun)
+	addIsolatorFlags(cmdRun, true)
 
 	flagPorts = portList{}
 	flagDNS = flagStringList{}

From 5aae45e2b2a4c6886056a5acc5db9b1f31fe47e1 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Mon, 19 Sep 2016 12:06:15 +0200
Subject: [PATCH 0760/1304] documentation: prepare: use --caps-retain
 --caps-remove

---
 Documentation/subcommands/prepare.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 9d655ab7e0..97b05bd330 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -52,8 +52,8 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--caps-remove` | none | capability to remove (example: '--cap-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
-| `--caps-retain` | none | capability to retain (example: '--cap-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
+| `--caps-remove` | none | capability to remove (example: '--caps-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
+| `--caps-retain` | none | capability to retain (example: '--caps-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
 | `--group` | root | gid, groupname or file path | Group override for the preceding image (example: '--group=group') |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |

From 5491fefb2ee2a80675e1dfd953905a39ae69578d Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Mon, 19 Sep 2016 14:03:06 +0200
Subject: [PATCH 0761/1304] doc/using-rkt-with-systemd: fix the go app example

`daemon.SdNotify` returns 2 variables.
---
 Documentation/using-rkt-with-systemd.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index bf41adea68..adb136fee0 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -131,12 +131,14 @@ func main() {
 	})
 	ln, err := net.Listen("tcp", ":5000")
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
+		log.Fatalf("Listen failed: %s", err)
 	}
-	err = daemon.SdNotify("READY=1")
+	sent, err := daemon.SdNotify("READY=1")
 	if err != nil {
-		log.Printf("daemon.SdNotify READY=1 return: %s", err)
+		log.Fatalf("Notification failed: %s", err)
+	}
+	if !sent {
+		log.Fatalf("Notification not supported: %s", err)
 	}
 	log.Fatal(http.Serve(ln, nil))
 }

From 4fd7f0741319d1609f6d9227c219c40753434834 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Mon, 19 Sep 2016 14:57:45 +0200
Subject: [PATCH 0762/1304] cri: initial implementation of stage1 changes

---
 common/common.go               |  22 +
 common/environment.go          |  60 +++
 lib/app.go                     | 193 ++++++++
 lib/doc.go                     |  17 +
 lib/types.go                   |  76 +++
 pkg/pod/doc.go                 |  17 +
 {rkt => pkg/pod}/pods.go       | 824 +++++++++++++++++----------------
 {rkt => pkg/pod}/pods_test.go  |  22 +-
 {rkt => pkg/pod}/uuid.go       |  24 +-
 pkg/user/util.go               |  29 ++
 rkt/api_service.go             | 130 +++---
 rkt/api_service_sdjournal.go   |  22 +-
 rkt/cat_manifest.go            |   5 +-
 rkt/enter.go                   |  29 +-
 rkt/export.go                  |  32 +-
 rkt/gc.go                      |  72 +--
 rkt/help.go                    |  15 +
 rkt/image_gc.go                |  11 +-
 rkt/image_list.go              |  13 +-
 rkt/list.go                    | 134 +++---
 rkt/prepare.go                 |  13 +-
 rkt/rm.go                      |  61 ++-
 rkt/run.go                     |  22 +-
 rkt/run_prepared.go            |  40 +-
 rkt/status.go                  |  82 +++-
 rkt/stop.go                    |  33 +-
 stage0/app.go                  | 490 ++++++++++++++++++++
 stage0/entrypoint.go           |   4 +
 stage0/run.go                  |  24 +-
 stage1/aci/aci-manifest.in     |  12 +
 stage1/app-rm/app-rm.go        | 114 +++++
 stage1/app-rm/app-rm.mk        |   1 +
 stage1/app-start/app-start.go  | 158 +++++++
 stage1/app-start/app-start.mk  |   1 +
 stage1/app-stop/app-stop.go    |  79 ++++
 stage1/app-stop/app-stop.mk    |   1 +
 stage1/enter/enter.c           |  53 ++-
 stage1/enter_kvm/enter_kvm.go  |   7 +-
 stage1/init/common/path.go     |   6 +
 stage1/init/common/pod.go      | 486 +------------------
 stage1/init/common/units.go    | 583 +++++++++++++++++++++++
 stage1/init/init.go            |  42 +-
 stage1/secondary-stuff.mk      |   3 +
 stage1/units/units/halt.target |   4 -
 tests/rkt_api_service_test.go  |   2 +-
 45 files changed, 2754 insertions(+), 1314 deletions(-)
 create mode 100644 common/environment.go
 create mode 100644 lib/app.go
 create mode 100644 lib/doc.go
 create mode 100644 lib/types.go
 create mode 100644 pkg/pod/doc.go
 rename {rkt => pkg/pod}/pods.go (64%)
 rename {rkt => pkg/pod}/pods_test.go (88%)
 rename {rkt => pkg/pod}/uuid.go (75%)
 create mode 100644 pkg/user/util.go
 create mode 100644 stage0/app.go
 create mode 100644 stage1/app-rm/app-rm.go
 create mode 100644 stage1/app-rm/app-rm.mk
 create mode 100644 stage1/app-start/app-start.go
 create mode 100644 stage1/app-start/app-start.mk
 create mode 100644 stage1/app-stop/app-stop.go
 create mode 100644 stage1/app-stop/app-stop.mk
 create mode 100644 stage1/init/common/units.go
 delete mode 100644 stage1/units/units/halt.target

diff --git a/common/common.go b/common/common.go
index 4b2792b481..90a2c8b762 100644
--- a/common/common.go
+++ b/common/common.go
@@ -102,6 +102,28 @@ func PodManifestPath(root string) string {
 	return filepath.Join(root, "pod")
 }
 
+// AppsStatusesPath returns the path of the status dir for all apps.
+func AppsStatusesPath(root string) string {
+	return filepath.Join(Stage1RootfsPath(root), "/rkt/status")
+}
+
+// AppStatusPath returns the path of the status file of an app.
+func AppStatusPath(root, appName string) string {
+	return filepath.Join(AppsStatusesPath(root), appName)
+}
+
+// AppCreatedPath returns the path of the ${appname}-created file, which is used to record
+// the creation timestamp of the app.
+func AppCreatedPath(root, appName string) string {
+	return filepath.Join(AppsStatusesPath(root), fmt.Sprintf("%s-created", appName))
+}
+
+// AppStartedPath returns the path of the ${appname}-started file, which is used to record
+// the start timestamp of the app.
+func AppStartedPath(root, appName string) string {
+	return filepath.Join(AppsStatusesPath(root), fmt.Sprintf("%s-started", appName))
+}
+
 // AppsPath returns the path where the apps within a pod live.
 func AppsPath(root string) string {
 	return filepath.Join(Stage1RootfsPath(root), stage2Dir)
diff --git a/common/environment.go b/common/environment.go
new file mode 100644
index 0000000000..1e5516ebaf
--- /dev/null
+++ b/common/environment.go
@@ -0,0 +1,60 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+
+	"github.com/coreos/rkt/pkg/user"
+
+	"github.com/appc/spec/schema/types"
+)
+
+var defaultEnv = map[string]string{
+	"PATH":    "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+	"SHELL":   "/bin/sh",
+	"USER":    "root",
+	"LOGNAME": "root",
+	"HOME":    "/root",
+}
+
+// WriteEnvFile creates an environment file for given app name, the minimum
+// required environment variables by the appc spec will be set to sensible
+// defaults here if they're not provided by env.
+func WriteEnvFile(env types.Environment, uidRange *user.UidRange, envFilePath string) error {
+	ef := bytes.Buffer{}
+
+	for dk, dv := range defaultEnv {
+		if _, exists := env.Get(dk); !exists {
+			fmt.Fprintf(&ef, "%s=%s\n", dk, dv)
+		}
+	}
+
+	for _, e := range env {
+		fmt.Fprintf(&ef, "%s=%s\n", e.Name, e.Value)
+	}
+
+	if err := ioutil.WriteFile(envFilePath, ef.Bytes(), 0644); err != nil {
+		return err
+	}
+
+	if err := user.ShiftFiles([]string{envFilePath}, uidRange); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/lib/app.go b/lib/app.go
new file mode 100644
index 0000000000..54abdb3d30
--- /dev/null
+++ b/lib/app.go
@@ -0,0 +1,193 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package rkt
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+
+	"github.com/appc/spec/schema"
+	"github.com/coreos/rkt/common"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+)
+
+// AppsForPod returns the apps of the pod with the given uuid in the given data directory.
+// If appName is non-empty, then only the app with the given name will be returned.
+func AppsForPod(uuid, dataDir string, appName string) ([]*App, error) {
+	p, err := pkgPod.PodFromUUIDString(dataDir, uuid)
+	if err != nil {
+		return nil, err
+	}
+	defer p.Close()
+
+	_, podManifest, err := p.PodManifest()
+	if err != nil {
+		return nil, err
+	}
+
+	var apps []*App
+	for _, ra := range podManifest.Apps {
+		if appName != "" && appName != ra.Name.String() {
+			continue
+		}
+
+		app, err := newApp(&ra, podManifest, p)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Cannot get app status: %v", err)
+			continue
+		}
+
+		apps = append(apps, app)
+	}
+
+	return apps, nil
+}
+
+// newApp constructs the App object with the runtime app and pod manifest.
+func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.Pod) (*App, error) {
+	app := &App{
+		Name:        ra.Name.String(),
+		ImageID:     ra.Image.ID.String(),
+		Annotations: make(map[string]string),
+	}
+
+	// Generate mounts
+	for _, mnt := range ra.App.MountPoints {
+		name := mnt.Name.String()
+		containerPath := mnt.Path
+		readOnly := mnt.ReadOnly
+
+		var hostPath string
+		for _, vol := range podManifest.Volumes {
+			if vol.Name != mnt.Name {
+				continue
+			}
+
+			hostPath = vol.Source
+			if vol.ReadOnly != nil && !readOnly {
+				readOnly = *vol.ReadOnly
+			}
+			break
+		}
+
+		if hostPath == "" { // This should not happen.
+			return nil, fmt.Errorf("cannot find corresponded volume for mount %v", mnt)
+		}
+
+		app.Mounts = append(app.Mounts, &Mount{
+			Name:          name,
+			ContainerPath: containerPath,
+			HostPath:      hostPath,
+			ReadOnly:      readOnly,
+		})
+	}
+
+	// Generate annotations.
+	for _, anno := range ra.Annotations {
+		app.Annotations[anno.Name.String()] = anno.Value
+	}
+
+	// Generate state.
+	if err := appState(app, pod); err != nil {
+		return nil, fmt.Errorf("error getting app's state: %v", err)
+	}
+
+	return app, nil
+}
+
+func appState(app *App, pod *pkgPod.Pod) error {
+	app.State = AppStateUnknown
+
+	defer func() {
+		if pod.AfterRun() {
+			// If the pod is hard killed, set the app to 'exited' state.
+			// Other than this case, status file is guaranteed to be written.
+			if app.State != AppStateExited {
+				app.State = AppStateExited
+				t, err := pod.GCMarkedTime()
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "Cannot get GC marked time: %v", err)
+				}
+				if !t.IsZero() {
+					finishedAt := t.UnixNano()
+					app.FinishedAt = &finishedAt
+				}
+			}
+		}
+	}()
+
+	// Check if the app is created.
+	fi, err := os.Stat(common.AppCreatedPath(pod.Path(), app.Name))
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return fmt.Errorf("cannot stat app creation file: %v", err)
+		}
+		return nil
+	}
+
+	app.State = AppStateCreated
+	createdAt := fi.ModTime().UnixNano()
+	app.CreatedAt = &createdAt
+
+	// Check if the app is started.
+	fi, err = os.Stat(common.AppStartedPath(pod.Path(), app.Name))
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return fmt.Errorf("cannot stat app started file: %v", err)
+		}
+		return nil
+	}
+
+	app.State = AppStateRunning
+	startedAt := fi.ModTime().UnixNano()
+	app.StartedAt = &startedAt
+
+	// Check if the app is exited.
+	appStatusFile := common.AppStatusPath(pod.Path(), app.Name)
+	fi, err = os.Stat(appStatusFile)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return fmt.Errorf("cannot stat app exited file: %v", err)
+		}
+		return nil
+	}
+
+	app.State = AppStateExited
+	finishedAt := fi.ModTime().UnixNano()
+	app.FinishedAt = &finishedAt
+
+	// Read exit code.
+	exitCode, err := readExitCode(appStatusFile)
+	if err != nil {
+		return fmt.Errorf("cannot read exit code: %v", err)
+	}
+	app.ExitCode = &exitCode
+
+	return nil
+}
+
+func readExitCode(path string) (int32, error) {
+	var exitCode int32
+
+	b, err := ioutil.ReadFile(path)
+	if err != nil {
+		return -1, fmt.Errorf("cannot read app exited file: %v", err)
+	}
+	if _, err := fmt.Sscanf(string(b), "%d", &exitCode); err != nil {
+		return -1, fmt.Errorf("cannot parse exit code: %v", err)
+	}
+	return exitCode, nil
+}
diff --git a/lib/doc.go b/lib/doc.go
new file mode 100644
index 0000000000..e384c3d877
--- /dev/null
+++ b/lib/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package rkt is expected to be used by other projects who want to integrate with rkt.
+// See https://peter.bourgon.org/go-best-practices-2016/#repository-structure for the rationale of calling this package "rkt" located in the "lib" subdirectory.
+package rkt
diff --git a/lib/types.go b/lib/types.go
new file mode 100644
index 0000000000..f29dcce999
--- /dev/null
+++ b/lib/types.go
@@ -0,0 +1,76 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package rkt
+
+import "github.com/coreos/rkt/networking/netinfo"
+
+// AppState defines the state of the app.
+type AppState string
+
+const (
+	AppStateUnknown AppState = "unknown"
+	AppStateCreated AppState = "created"
+	AppStateRunning AppState = "running"
+	AppStateExited  AppState = "exited"
+)
+
+type (
+	// Mount defines the mount point.
+	Mount struct {
+		// Name of the mount.
+		Name string `json:"name"`
+		// Container path of the mount.
+		ContainerPath string `json:"container_path"`
+		// Host path of the mount.
+		HostPath string `json:"host_path"`
+		// Whether the mount is read-only.
+		ReadOnly bool `json:"read_only"`
+		// TODO(yifan): What about 'SelinuxRelabel bool'?
+	}
+
+	// App defines the app object.
+	App struct {
+		// Name of the app.
+		Name string `json:"name"`
+		// State of the app, can be created, running, exited, or unknown.
+		State AppState `json:"state"`
+		// Creation time of the container, nanoseconds since epoch.
+		CreatedAt *int64 `json:"created_at,omitempty"`
+		// Start time of the container, nanoseconds since epoch.
+		StartedAt *int64 `json:"started_at,omitempty"`
+		// Finish time of the container, nanoseconds since epoch.
+		FinishedAt *int64 `json:"finished_at,omitempty"`
+		// Exit code of the container.
+		ExitCode *int32 `json:"exit_code,omitempty"`
+		// Image ID of the container.
+		ImageID string `json:"image_id"`
+		// Mount points of the container.
+		Mounts []*Mount `json:"mounts,omitempty"`
+		// Annotations of the container.
+		Annotations map[string]string `json:"annotations,omitempty"`
+	}
+
+	// Pod defines the pod object.
+	Pod struct {
+		// UUID of the pod.
+		UUID string `json:"name"`
+		// State of the pod, all valid values are defined in pkg/pod/pods.go.
+		State string `json:"state"`
+		// Networks are the information of the networks.
+		Networks []netinfo.NetInfo `json:"networks,omitempty"`
+		// AppNames are the names of the apps.
+		AppNames []string `json:"app_names,omitempty"`
+	}
+)
diff --git a/pkg/pod/doc.go b/pkg/pod/doc.go
new file mode 100644
index 0000000000..3e1368498f
--- /dev/null
+++ b/pkg/pod/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// package pod contains the data structure for the pod and functions to get information
+// of the pod. It is shared by other packages, including the CLI implementation, api service, and the library.
+package pod
diff --git a/rkt/pods.go b/pkg/pod/pods.go
similarity index 64%
rename from rkt/pods.go
rename to pkg/pod/pods.go
index e44c38ae57..fbd70ce5d1 100644
--- a/rkt/pods.go
+++ b/pkg/pod/pods.go
@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//+build linux
-
-package main
+package pod
 
 import (
 	"errors"
@@ -42,23 +40,26 @@ import (
 
 // see Documentation/devel/pod-lifecycle.md for some explanation
 
-type pod struct {
+type Pod struct {
+	UUID       *types.UUID
+	Nets       []netinfo.NetInfo // list of networks (name, IP, iface) this pod is using
+	MountLabel string            // Label to use for container image
+
 	*lock.FileLock
-	uuid        *types.UUID
-	createdByMe bool              // true if we're the creator of this pod (only the creator can xToPrepare or xToRun directly from preparing)
-	nets        []netinfo.NetInfo // list of networks (name, IP, iface) this pod is using
-
-	isEmbryo         bool   // directory starts as embryo before entering preparing state, serves as stage for acquiring lock before rename to prepare/.
-	isPreparing      bool   // when locked at pods/prepare/$uuid the pod is actively being prepared
-	isAbortedPrepare bool   // when unlocked at pods/prepare/$uuid the pod never finished preparing
-	isPrepared       bool   // when at pods/prepared/$uuid the pod is prepared, serves as stage for acquiring lock before rename to run/.
-	isExited         bool   // when locked at pods/run/$uuid the pod is running, when unlocked it's exited.
-	isExitedGarbage  bool   // when unlocked at pods/exited-garbage/$uuid the pod is exited and is garbage
-	isExitedDeleting bool   // when locked at pods/exited-garbage/$uuid the pod is exited, garbage, and is being actively deleted
-	isGarbage        bool   // when unlocked at pods/garbage/$uuid the pod is garbage that never ran
-	isDeleting       bool   // when locked at pods/garbage/$uuid the pod is garbage that never ran, and is being actively deleted
-	isGone           bool   // when a pod no longer can be located at its uuid anywhere XXX: only set by refreshState()
-	mountLabel       string // Label to use for container image
+	dataDir string // The data directory where the pod lives in.
+
+	createdByMe bool // true if we're the creator of this pod (only the creator can ToPrepare or ToRun directly from preparing)
+
+	isEmbryo         bool // directory starts as embryo before entering preparing state, serves as stage for acquiring lock before rename to prepare/.
+	isPreparing      bool // when locked at pods/prepare/$uuid the pod is actively being prepared
+	isAbortedPrepare bool // when unlocked at pods/prepare/$uuid the pod never finished preparing
+	isPrepared       bool // when at pods/prepared/$uuid the pod is prepared, serves as stage for acquiring lock before rename to run/.
+	isExited         bool // when locked at pods/run/$uuid the pod is running, when unlocked it's exited.
+	isExitedGarbage  bool // when unlocked at pods/exited-garbage/$uuid the pod is exited and is garbage
+	isExitedDeleting bool // when locked at pods/exited-garbage/$uuid the pod is exited, garbage, and is being actively deleted
+	isGarbage        bool // when unlocked at pods/garbage/$uuid the pod is garbage that never ran
+	isDeleting       bool // when locked at pods/garbage/$uuid the pod is garbage that never ran, and is being actively deleted
+	isGone           bool // when a pod no longer can be located at its uuid anywhere XXX: only set by refreshState()
 }
 
 // Exported state. See Documentation/devel/pod-lifecycle.md for some explanation
@@ -68,33 +69,65 @@ const (
 	AbortedPrepare = "aborted prepare"
 	Prepared       = "prepared"
 	Running        = "running"
-	Deleting       = "deleting" // This covers pod.isExitedDeleting and pod.isDeleting.
-	Exited         = "exited"   // This covers pod.isExited and pod.isExitedGarbage.
+	Deleting       = "deleting"
+	ExitedDeleting = "exited deleting"
+	Exited         = "exited"
+	ExitedGarbage  = "exited garbage"
 	Garbage        = "garbage"
 )
 
-type includeMask byte
+type IncludeMask byte
 
 const (
-	includeEmbryoDir includeMask = 1 << iota
-	includePrepareDir
-	includePreparedDir
-	includeRunDir
-	includeExitedGarbageDir
-	includeGarbageDir
-
-	includeMostDirs includeMask = (includeRunDir | includeExitedGarbageDir | includePrepareDir | includePreparedDir)
-	includeAllDirs  includeMask = (includeMostDirs | includeEmbryoDir | includeGarbageDir)
+	IncludeEmbryoDir IncludeMask = 1 << iota
+	IncludePrepareDir
+	IncludePreparedDir
+	IncludeRunDir
+	IncludeExitedGarbageDir
+	IncludeGarbageDir
+
+	IncludeMostDirs IncludeMask = (IncludeRunDir | IncludeExitedGarbageDir | IncludePrepareDir | IncludePreparedDir)
+	IncludeAllDirs  IncludeMask = (IncludeMostDirs | IncludeEmbryoDir | IncludeGarbageDir)
 )
 
 var (
 	podsInitialized = false
 )
 
+// embryoDir returns where pod directories are created and locked before moving to prepared
+func embryoDir(dataDir string) string {
+	return filepath.Join(dataDir, "pods", "embryo")
+}
+
+// prepareDir returns where pod trees reside during (locked) and after failing to complete preparation (unlocked)
+func prepareDir(dataDir string) string {
+	return filepath.Join(dataDir, "pods", "prepare")
+}
+
+// prepareDir returns where pod trees reside upon successful preparation
+func preparedDir(dataDir string) string {
+	return filepath.Join(dataDir, "pods", "prepared")
+}
+
+// runDir returns where pod trees reside once run
+func runDir(dataDir string) string {
+	return filepath.Join(dataDir, "pods", "run")
+}
+
+// exitedGarbageDir returns where pod trees reside once exited & marked as garbage by a gc pass
+func exitedGarbageDir(dataDir string) string {
+	return filepath.Join(dataDir, "pods", "exited-garbage")
+}
+
+// garbageDir returns where never-executed pod trees reside once marked as garbage by a gc pass (failed prepares, expired prepareds)
+func garbageDir(dataDir string) string {
+	return filepath.Join(dataDir, "pods", "garbage")
+}
+
 // initPods creates the required global directories
-func initPods() error {
+func initPods(dataDir string) error {
 	if !podsInitialized {
-		dirs := []string{embryoDir(), prepareDir(), preparedDir(), runDir(), exitedGarbageDir(), garbageDir()}
+		dirs := []string{embryoDir(dataDir), prepareDir(dataDir), preparedDir(dataDir), runDir(dataDir), exitedGarbageDir(dataDir), garbageDir(dataDir)}
 		for _, d := range dirs {
 			if err := os.MkdirAll(d, 0750); err != nil {
 				return errwrap.Wrap(errors.New("error creating directory"), err)
@@ -105,66 +138,23 @@ func initPods() error {
 	return nil
 }
 
-// walkPods iterates over the included directories calling function f for every pod found.
-func walkPods(include includeMask, f func(*pod)) error {
-	if err := initPods(); err != nil {
-		return err
-	}
-
-	ls, err := listPods(include)
-	if err != nil {
-		return errwrap.Wrap(errors.New("failed to get pods"), err)
-	}
-	sort.Strings(ls)
-
-	for _, uuid := range ls {
-		u, err := types.NewUUID(uuid)
-		if err != nil {
-			stderr.PrintE(fmt.Sprintf("skipping %q", uuid), err)
-			continue
-		}
-		p, err := getPod(u)
-		if err != nil {
-			stderr.PrintE(fmt.Sprintf("skipping %q", uuid), err)
-			continue
-		}
-
-		// omit pods found in unrequested states
-		// this is to cover a race between listPods finding the uuids and pod states changing
-		// it's preferable to keep these operations lock-free, for example a `rkt gc` shouldn't block `rkt run`.
-		if p.isEmbryo && include&includeEmbryoDir == 0 ||
-			p.isExitedGarbage && include&includeExitedGarbageDir == 0 ||
-			p.isGarbage && include&includeGarbageDir == 0 ||
-			p.isPrepared && include&includePreparedDir == 0 ||
-			((p.isPreparing || p.isAbortedPrepare) && include&includePrepareDir == 0) ||
-			p.isRunning() && include&includeRunDir == 0 {
-			p.Close()
-			continue
-		}
-
-		f(p)
-		p.Close()
-	}
-
-	return nil
-}
-
-// newPod creates a new pod directory in the "preparing" state, allocating a unique uuid for it in the process.
+// NewPod creates a new pod directory in the "preparing" state, allocating a unique uuid for it in the process.
 // The returned pod is always left in an exclusively locked state (preparing is locked in the prepared directory)
 // The pod must be closed using pod.Close()
-func newPod() (*pod, error) {
-	if err := initPods(); err != nil {
+func NewPod(dataDir string) (*Pod, error) {
+	if err := initPods(dataDir); err != nil {
 		return nil, err
 	}
 
-	p := &pod{
+	p := &Pod{
+		dataDir:     dataDir,
 		createdByMe: true,
-		isEmbryo:    true, // starts as an embryo, then xToPreparing locks, renames, and sets isPreparing
+		isEmbryo:    true, // starts as an embryo, then ToPreparing locks, renames, and sets isPreparing
 		// rest start false.
 	}
 
 	var err error
-	p.uuid, err = types.NewUUID(uuid.New())
+	p.UUID, err = types.NewUUID(uuid.New())
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error creating UUID"), err)
 	}
@@ -180,7 +170,7 @@ func newPod() (*pod, error) {
 		return nil, err
 	}
 
-	err = p.xToPreparing()
+	err = p.ToPreparing()
 	if err != nil {
 		return nil, err
 	}
@@ -194,12 +184,12 @@ func newPod() (*pod, error) {
 // getPod returns a pod struct representing the given pod.
 // The returned lock is always left in an open but unlocked state.
 // The pod must be closed using pod.Close()
-func getPod(uuid *types.UUID) (*pod, error) {
-	if err := initPods(); err != nil {
+func getPod(dataDir string, uuid *types.UUID) (*Pod, error) {
+	if err := initPods(dataDir); err != nil {
 		return nil, err
 	}
 
-	p := &pod{uuid: uuid}
+	p := &Pod{UUID: uuid, dataDir: dataDir}
 
 	// we try open the pod in all possible directories, in the same order the states occur
 	l, err := lock.NewLock(p.embryoPath(), lock.Dir)
@@ -275,7 +265,7 @@ func getPod(uuid *types.UUID) (*pod, error) {
 		if err != nil {
 			return nil, errwrap.Wrap(fmt.Errorf("error acquiring pod %v dir fd", uuid), err)
 		}
-		p.nets, err = netinfo.LoadAt(cfd)
+		p.Nets, err = netinfo.LoadAt(cfd)
 		// ENOENT is ok -- assume running with --net=host
 		if err != nil && !os.IsNotExist(err) {
 			return nil, errwrap.Wrap(fmt.Errorf("error opening pod %v netinfo", uuid), err)
@@ -285,15 +275,15 @@ func getPod(uuid *types.UUID) (*pod, error) {
 	return p, nil
 }
 
-// getPodFromUUIDString attempts to resolve the supplied UUID and return a pod.
+// PodFromUUIDString attempts to resolve the supplied UUID and return a pod.
 // The pod must be closed using pod.Close()
-func getPodFromUUIDString(uuid string) (*pod, error) {
-	podUUID, err := resolveUUID(uuid)
+func PodFromUUIDString(dataDir, uuid string) (*Pod, error) {
+	podUUID, err := resolveUUID(dataDir, uuid)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("unable to resolve UUID"), err)
 	}
 
-	p, err := getPod(podUUID)
+	p, err := getPod(dataDir, podUUID)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("unable to get pod"), err)
 	}
@@ -301,58 +291,39 @@ func getPodFromUUIDString(uuid string) (*pod, error) {
 	return p, nil
 }
 
-// path returns the path to the pod according to the current (cached) state.
-func (p *pod) path() string {
-	if p.isEmbryo {
-		return p.embryoPath()
-	} else if p.isPreparing || p.isAbortedPrepare {
-		return p.preparePath()
-	} else if p.isPrepared {
-		return p.preparedPath()
-	} else if p.isExitedGarbage {
-		return p.exitedGarbagePath()
-	} else if p.isGarbage {
-		return p.garbagePath()
-	} else if p.isGone {
-		return "" // TODO(vc): anything better?
-	}
-
-	return p.runPath()
-}
-
 // embryoPath returns the path to the pod where it would be in the embryoDir in its embryonic state.
-func (p *pod) embryoPath() string {
-	return filepath.Join(embryoDir(), p.uuid.String())
+func (p *Pod) embryoPath() string {
+	return filepath.Join(embryoDir(p.dataDir), p.UUID.String())
 }
 
 // preparePath returns the path to the pod where it would be in the prepareDir in its preparing state.
-func (p *pod) preparePath() string {
-	return filepath.Join(prepareDir(), p.uuid.String())
+func (p *Pod) preparePath() string {
+	return filepath.Join(prepareDir(p.dataDir), p.UUID.String())
 }
 
 // preparedPath returns the path to the pod where it would be in the preparedDir.
-func (p *pod) preparedPath() string {
-	return filepath.Join(preparedDir(), p.uuid.String())
+func (p *Pod) preparedPath() string {
+	return filepath.Join(preparedDir(p.dataDir), p.UUID.String())
 }
 
 // runPath returns the path to the pod where it would be in the runDir.
-func (p *pod) runPath() string {
-	return filepath.Join(runDir(), p.uuid.String())
+func (p *Pod) runPath() string {
+	return filepath.Join(runDir(p.dataDir), p.UUID.String())
 }
 
 // exitedGarbagePath returns the path to the pod where it would be in the exitedGarbageDir.
-func (p *pod) exitedGarbagePath() string {
-	return filepath.Join(exitedGarbageDir(), p.uuid.String())
+func (p *Pod) exitedGarbagePath() string {
+	return filepath.Join(exitedGarbageDir(p.dataDir), p.UUID.String())
 }
 
 // garbagePath returns the path to the pod where it would be in the garbageDir.
-func (p *pod) garbagePath() string {
-	return filepath.Join(garbageDir(), p.uuid.String())
+func (p *Pod) garbagePath() string {
+	return filepath.Join(garbageDir(p.dataDir), p.UUID.String())
 }
 
-// xToPrepare transitions a pod from embryo -> preparing, leaves the pod locked in the prepare directory.
+// ToPrepare transitions a pod from embryo -> preparing, leaves the pod locked in the prepare directory.
 // only the creator of the pod (via newPod()) may do this, nobody to race with.
-func (p *pod) xToPreparing() error {
+func (p *Pod) ToPreparing() error {
 	if !p.createdByMe {
 		return fmt.Errorf("bug: only pods created by me may transition to preparing")
 	}
@@ -369,7 +340,7 @@ func (p *pod) xToPreparing() error {
 		return err
 	}
 
-	df, err := os.Open(prepareDir())
+	df, err := os.Open(prepareDir(p.dataDir))
 	if err != nil {
 		return err
 	}
@@ -384,9 +355,9 @@ func (p *pod) xToPreparing() error {
 	return nil
 }
 
-// xToPrepared transitions a pod from preparing -> prepared, leaves the pod unlocked in the prepared directory.
+// ToPrepared transitions a pod from preparing -> prepared, leaves the pod unlocked in the prepared directory.
 // only the creator of the pod (via newPod()) may do this, nobody to race with.
-func (p *pod) xToPrepared() error {
+func (p *Pod) ToPrepared() error {
 	if !p.createdByMe {
 		return fmt.Errorf("bug: only pods created by me may transition to prepared")
 	}
@@ -395,14 +366,14 @@ func (p *pod) xToPrepared() error {
 		return fmt.Errorf("bug: only preparing pods may transition to prepared")
 	}
 
-	if err := os.Rename(p.path(), p.preparedPath()); err != nil {
+	if err := os.Rename(p.Path(), p.preparedPath()); err != nil {
 		return err
 	}
 	if err := p.Unlock(); err != nil {
 		return err
 	}
 
-	df, err := os.Open(preparedDir())
+	df, err := os.Open(preparedDir(p.dataDir))
 	if err != nil {
 		return err
 	}
@@ -417,9 +388,9 @@ func (p *pod) xToPrepared() error {
 	return nil
 }
 
-// xToRun transitions a pod from prepared -> run, leaves the pod locked in the run directory.
+// ToRun transitions a pod from prepared -> run, leaves the pod locked in the run directory.
 // the creator of the pod (via newPod()) may also jump directly from preparing -> run
-func (p *pod) xToRun() error {
+func (p *Pod) ToRun() error {
 	if !p.createdByMe && !p.isPrepared {
 		return fmt.Errorf("bug: only prepared pods may transition to run")
 	}
@@ -432,13 +403,13 @@ func (p *pod) xToRun() error {
 		return err
 	}
 
-	label.Relabel(p.path(), p.mountLabel, "Z")
-	if err := os.Rename(p.path(), p.runPath()); err != nil {
-		// TODO(vc): we could race here with a concurrent xToRun(), let caller deal with the error.
+	label.Relabel(p.Path(), p.MountLabel, "Z")
+	if err := os.Rename(p.Path(), p.runPath()); err != nil {
+		// TODO(vc): we could race here with a concurrent ToRun(), let caller deal with the error.
 		return err
 	}
 
-	df, err := os.Open(runDir())
+	df, err := os.Open(runDir(p.dataDir))
 	if err != nil {
 		return err
 	}
@@ -453,18 +424,18 @@ func (p *pod) xToRun() error {
 	return nil
 }
 
-// xToExitedGarbage transitions a pod from run -> exitedGarbage
-func (p *pod) xToExitedGarbage() error {
+// ToExitedGarbage transitions a pod from run -> exitedGarbage
+func (p *Pod) ToExitedGarbage() error {
 	if !p.isExited || p.isExitedGarbage {
 		return fmt.Errorf("bug: only exited non-garbage pods may transition to exited-garbage")
 	}
 
 	if err := os.Rename(p.runPath(), p.exitedGarbagePath()); err != nil {
-		// TODO(vc): another case where we could race with a concurrent xToExitedGarbage(), let caller deal with the error.
+		// TODO(vc): another case where we could race with a concurrent ToExitedGarbage(), let caller deal with the error.
 		return err
 	}
 
-	df, err := os.Open(exitedGarbageDir())
+	df, err := os.Open(exitedGarbageDir(p.dataDir))
 	if err != nil {
 		return err
 	}
@@ -478,17 +449,17 @@ func (p *pod) xToExitedGarbage() error {
 	return nil
 }
 
-// xToGarbage transitions a pod from abortedPrepared -> garbage or prepared -> garbage
-func (p *pod) xToGarbage() error {
+// ToGarbage transitions a pod from abortedPrepared -> garbage or prepared -> garbage
+func (p *Pod) ToGarbage() error {
 	if !p.isAbortedPrepare && !p.isPrepared {
 		return fmt.Errorf("bug: only failed prepare or prepared pods may transition to garbage")
 	}
 
-	if err := os.Rename(p.path(), p.garbagePath()); err != nil {
+	if err := os.Rename(p.Path(), p.garbagePath()); err != nil {
 		return err
 	}
 
-	df, err := os.Open(garbageDir())
+	df, err := os.Open(garbageDir(p.dataDir))
 	if err != nil {
 		return err
 	}
@@ -504,44 +475,32 @@ func (p *pod) xToGarbage() error {
 	return nil
 }
 
-// isRunning does the annoying tests to infer if a pod is in a running state
-func (p *pod) isRunning() bool {
-	// when none of these things, running!
-	return !p.isEmbryo && !p.isAbortedPrepare && !p.isPreparing && !p.isPrepared &&
-		!p.isExited && !p.isExitedGarbage && !p.isExitedDeleting && !p.isGarbage && !p.isDeleting && !p.isGone
-}
-
-// afterRun tests if a pod is in a post-running state
-func (p *pod) afterRun() bool {
-	return p.isExitedDeleting || p.isDeleting || p.isExited || p.isGarbage
-}
-
 // listPods returns a list of pod uuids in string form.
-func listPods(include includeMask) ([]string, error) {
+func listPods(dataDir string, include IncludeMask) ([]string, error) {
 	// uniqued due to the possibility of a pod being renamed from across directories during the list operation
 	ups := make(map[string]struct{})
 	dirs := []struct {
-		kind includeMask
+		kind IncludeMask
 		path string
 	}{
 		{ // the order here is significant: embryo -> preparing -> prepared -> running -> exitedGarbage
-			kind: includeEmbryoDir,
-			path: embryoDir(),
+			kind: IncludeEmbryoDir,
+			path: embryoDir(dataDir),
 		}, {
-			kind: includePrepareDir,
-			path: prepareDir(),
+			kind: IncludePrepareDir,
+			path: prepareDir(dataDir),
 		}, {
-			kind: includePreparedDir,
-			path: preparedDir(),
+			kind: IncludePreparedDir,
+			path: preparedDir(dataDir),
 		}, {
-			kind: includeRunDir,
-			path: runDir(),
+			kind: IncludeRunDir,
+			path: runDir(dataDir),
 		}, {
-			kind: includeExitedGarbageDir,
-			path: exitedGarbageDir(),
+			kind: IncludeExitedGarbageDir,
+			path: exitedGarbageDir(dataDir),
 		}, {
-			kind: includeGarbageDir,
-			path: garbageDir(),
+			kind: IncludeGarbageDir,
+			path: garbageDir(dataDir),
 		},
 	}
 
@@ -579,7 +538,7 @@ func listPodsFromDir(cdir string) ([]string, error) {
 
 	for _, p := range ls {
 		if !p.IsDir() {
-			stderr.Printf("unrecognized entry: %q, ignoring", p.Name())
+			fmt.Fprintf(os.Stderr, "unrecognized entry: %q, ignoring", p.Name())
 			continue
 		}
 		ps = append(ps, p.Name())
@@ -590,7 +549,7 @@ func listPodsFromDir(cdir string) ([]string, error) {
 
 // refreshState() updates the cached members of c to reflect current reality
 // assumes p.FileLock is currently unlocked, and always returns with it unlocked.
-func (p *pod) refreshState() error {
+func (p *Pod) refreshState() error {
 	//  TODO(vc): this overlaps substantially with newPod(), could probably unify.
 	p.isEmbryo = false
 	p.isPreparing = false
@@ -641,7 +600,7 @@ func (p *pod) refreshState() error {
 	}
 
 	if err != nil && !os.IsNotExist(err) {
-		return errwrap.Wrap(fmt.Errorf("error refreshing state of pod %q", p.uuid.String()), err)
+		return errwrap.Wrap(fmt.Errorf("error refreshing state of pod %q", p.UUID.String()), err)
 	}
 
 	if !p.isPrepared && !p.isEmbryo && !p.isGone {
@@ -674,8 +633,8 @@ func (p *pod) refreshState() error {
 	return nil
 }
 
-// waitExited waits for a pod to (run and) exit.
-func (p *pod) waitExited() error {
+// WaitExited waits for a pod to (run and) exit.
+func (p *Pod) WaitExited() error {
 	// isExited implies isExitedGarbage.
 	for !p.isExited && !p.isAbortedPrepare && !p.isGarbage && !p.isGone {
 		if err := p.SharedLock(); err != nil {
@@ -702,7 +661,7 @@ func (p *pod) waitExited() error {
 }
 
 // readFile reads an entire file from a pod's directory.
-func (p *pod) readFile(path string) ([]byte, error) {
+func (p *Pod) readFile(path string) ([]byte, error) {
 	f, err := p.openFile(path, syscall.O_RDONLY)
 	if err != nil {
 		return nil, err
@@ -713,7 +672,7 @@ func (p *pod) readFile(path string) ([]byte, error) {
 }
 
 // readIntFromFile reads an int from a file in a pod's directory.
-func (p *pod) readIntFromFile(path string) (i int, err error) {
+func (p *Pod) readIntFromFile(path string) (i int, err error) {
 	b, err := p.readFile(path)
 	if err != nil {
 		return
@@ -723,7 +682,7 @@ func (p *pod) readIntFromFile(path string) (i int, err error) {
 }
 
 // openFile opens a file from a pod's directory returning a file descriptor.
-func (p *pod) openFile(path string, flags int) (*os.File, error) {
+func (p *Pod) openFile(path string, flags int) (*os.File, error) {
 	cdirfd, err := p.Fd()
 	if err != nil {
 		return nil, err
@@ -737,30 +696,7 @@ func (p *pod) openFile(path string, flags int) (*os.File, error) {
 	return os.NewFile(uintptr(fd), path), nil
 }
 
-// getState returns the current state of the pod
-func (p *pod) getState() string {
-	state := "running"
-
-	if p.isEmbryo {
-		state = Embryo
-	} else if p.isPreparing {
-		state = Preparing
-	} else if p.isAbortedPrepare {
-		state = AbortedPrepare
-	} else if p.isPrepared {
-		state = Prepared
-	} else if p.isExitedDeleting || p.isDeleting {
-		state = Deleting
-	} else if p.isExited { // this covers p.isExitedGarbage
-		state = Exited
-	} else if p.isGarbage {
-		state = Garbage
-	}
-
-	return state
-}
-
-func (p *pod) getModTime(path string) (time.Time, error) {
+func (p *Pod) getModTime(path string) (time.Time, error) {
 	f, err := p.openFile(path, syscall.O_RDONLY)
 	if err != nil {
 		return time.Time{}, err
@@ -775,61 +711,6 @@ func (p *pod) getModTime(path string) (time.Time, error) {
 	return fi.ModTime(), nil
 }
 
-// getCreationTime returns the time when the pod was created.
-// This happens at prepare time.
-func (p *pod) getCreationTime() (time.Time, error) {
-	if p.isPrepared || p.isRunning() || p.afterRun() {
-		return p.getModTime("pod")
-	}
-	return time.Time{}, nil
-}
-
-// getStartTime returns the time when the pod was started.
-func (p *pod) getStartTime() (time.Time, error) {
-	var (
-		t   time.Time
-		err error
-	)
-	if p.isRunning() || p.afterRun() {
-		// check pid and ppid files, since stage1 implementations can choose
-		// which one to implement.
-		t, err = p.getModTime("pid")
-		if os.IsNotExist(err) {
-			t, err = p.getModTime("ppid")
-			// if there's an error starting the pod, it can be "exited" without
-			// the "ppid" (or "pid") files being created, return an error only
-			// if it's different than ENOENT.
-			if os.IsNotExist(err) {
-				err = nil
-			}
-		}
-	}
-	return t, err
-}
-
-func (p *pod) getGCMarkedTime() (time.Time, error) {
-	if !p.isGarbage && !p.isExitedGarbage {
-		return time.Time{}, nil
-	}
-
-	// At this point, the pod is in either exited-garbage dir, garbage dir or gone already.
-	podPath := p.path()
-	if podPath == "" {
-		// Pod is gone.
-		return time.Time{}, nil
-	}
-
-	st := &syscall.Stat_t{}
-	if err := syscall.Lstat(podPath, st); err != nil {
-		if err == syscall.ENOENT {
-			// Pod is gone.
-			err = nil
-		}
-		return time.Time{}, err
-	}
-	return time.Unix(st.Ctim.Unix()), nil
-}
-
 type ErrChildNotReady struct {
 }
 
@@ -899,64 +780,10 @@ func getChildPID(ppid int) (int, error) {
 	return -1, ErrChildNotReady{}
 }
 
-// getPID returns the pid of the stage1 process that started the pod.
-func (p *pod) getPID() (int, error) {
-	if pid, err := p.readIntFromFile("pid"); err == nil {
-		return pid, nil
-	}
-	if pid, err := p.readIntFromFile("ppid"); err != nil {
-		return -1, err
-	} else {
-		return pid, nil
-	}
-}
-
-// getContainerPID1 returns the pid of the process with pid 1 in the pod.
-func (p *pod) getContainerPID1() (pid int, err error) {
-	// rkt supports two methods to find the container's PID 1: the pid
-	// file and the ppid file.
-	// The ordering is not important and only one of them must be supplied.
-	// See Documentation/devel/stage1-implementors-guide.md
-	for {
-		var ppid int
-
-		pid, err = p.readIntFromFile("pid")
-		if err == nil {
-			return
-		}
-
-		ppid, err = p.readIntFromFile("ppid")
-		if err != nil && !os.IsNotExist(err) {
-			return -1, err
-		}
-		if err == nil {
-			pid, err = getChildPID(ppid)
-			if err == nil {
-				return pid, nil
-			}
-			if _, ok := err.(ErrChildNotReady); !ok {
-				return -1, err
-			}
-		}
-
-		// There's a window between a pod transitioning to run and the pid file being created by stage1.
-		// The window shouldn't be large so we just delay and retry here.  If stage1 fails to reach the
-		// point of pid file creation, it will exit and p.isRunning() becomes false since we refreshState below.
-		time.Sleep(time.Millisecond * 100)
-
-		if err := p.refreshState(); err != nil {
-			return -1, err
-		}
-
-		if !p.isRunning() {
-			return -1, fmt.Errorf("pod %v is not running anymore", p.uuid)
-		}
-	}
-}
-
-// getStage1TreeStoreID returns the treeStoreID of the stage1 image used in
+// GetStage1TreeStoreID returns the treeStoreID of the stage1 image used in
 // this pod
-func (p *pod) getStage1TreeStoreID() (string, error) {
+// TODO(yifan): Maybe make this unexported.
+func (p *Pod) GetStage1TreeStoreID() (string, error) {
 	s1IDb, err := p.readFile(common.Stage1TreeStoreIDFilename)
 	if err != nil {
 		return "", err
@@ -964,8 +791,9 @@ func (p *pod) getStage1TreeStoreID() (string, error) {
 	return string(s1IDb), nil
 }
 
-// getAppTreeStoreID returns the treeStoreID of the provided app.
-func (p *pod) getAppTreeStoreID(app types.ACName) (string, error) {
+// GetAppTreeStoreID returns the treeStoreID of the provided app.
+// TODO(yifan): Maybe make this unexported.
+func (p *Pod) GetAppTreeStoreID(app types.ACName) (string, error) {
 	path, err := filepath.Rel("/", common.AppTreeStoreIDPath("", app))
 	if err != nil {
 		return "", err
@@ -974,23 +802,24 @@ func (p *pod) getAppTreeStoreID(app types.ACName) (string, error) {
 	if err != nil {
 		// When not using overlayfs, apps don't have a treeStoreID file. In
 		// other cases we've got a problem.
-		if !(os.IsNotExist(err) && !p.usesOverlay()) {
+		if !(os.IsNotExist(err) && !p.UsesOverlay()) {
 			return "", errwrap.Wrap(fmt.Errorf("no treeStoreID found for app %s", app), err)
 		}
 	}
 	return string(treeStoreID), nil
 }
 
-// getAppsTreeStoreIDs returns the treeStoreIDs of the apps images used in
+// GetAppsTreeStoreIDs returns the treeStoreIDs of the apps images used in
 // this pod.
-func (p *pod) getAppsTreeStoreIDs() ([]string, error) {
+// TODO(yifan): Maybe make this unexported.
+func (p *Pod) GetAppsTreeStoreIDs() ([]string, error) {
 	var treeStoreIDs []string
 	apps, err := p.getApps()
 	if err != nil {
 		return nil, err
 	}
 	for _, a := range apps {
-		id, err := p.getAppTreeStoreID(a.Name)
+		id, err := p.GetAppTreeStoreID(a.Name)
 		if err != nil {
 			return nil, err
 		}
@@ -1002,7 +831,7 @@ func (p *pod) getAppsTreeStoreIDs() ([]string, error) {
 }
 
 // getAppsHashes returns a list of the app hashes in the pod
-func (p *pod) getAppsHashes() ([]types.Hash, error) {
+func (p *Pod) getAppsHashes() ([]types.Hash, error) {
 	apps, err := p.getApps()
 	if err != nil {
 		return nil, err
@@ -1016,51 +845,17 @@ func (p *pod) getAppsHashes() ([]types.Hash, error) {
 	return hashes, nil
 }
 
-// getAppImageManifest returns an ImageManifest for the corresponding AppName.
-func (p *pod) getAppImageManifest(appName types.ACName) (*schema.ImageManifest, error) {
-	imb, err := ioutil.ReadFile(common.AppImageManifestPath(p.path(), appName))
-	if err != nil {
-		return nil, err
-	}
-
-	aim := &schema.ImageManifest{}
-	if err := aim.UnmarshalJSON(imb); err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("invalid image manifest for app %q", appName.String()), err)
-	}
-
-	return aim, nil
-}
-
-// getManifest returns the PodManifest of the pod
-func (p *pod) getManifest() (*schema.PodManifest, error) {
-	pmb, err := p.readFile("pod")
-	if err != nil {
-		return nil, errwrap.Wrap(errors.New("error reading pod manifest"), err)
-	}
-	pm := &schema.PodManifest{}
-	if err = pm.UnmarshalJSON(pmb); err != nil {
-		return nil, errwrap.Wrap(errors.New("invalid pod manifest"), err)
-	}
-	return pm, nil
-}
-
 // getApps returns a list of apps in the pod
-func (p *pod) getApps() (schema.AppList, error) {
-	pm, err := p.getManifest()
+func (p *Pod) getApps() (schema.AppList, error) {
+	_, pm, err := p.PodManifest()
 	if err != nil {
 		return nil, err
 	}
 	return pm.Apps, nil
 }
 
-// getAppCount returns the app count of a pod.
-func (p *pod) getAppCount() (int, error) {
-	apps, err := p.getApps()
-	return len(apps), err
-}
-
 // getDirNames returns the list of names from a pod's directory
-func (p *pod) getDirNames(path string) ([]string, error) {
+func (p *Pod) getDirNames(path string) ([]string, error) {
 	dir, err := p.openFile(path, syscall.O_RDONLY|syscall.O_DIRECTORY)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("unable to open directory"), err)
@@ -1075,76 +870,305 @@ func (p *pod) getDirNames(path string) ([]string, error) {
 	return ld, nil
 }
 
-func (p *pod) usesOverlay() bool {
+// UsesOverlay returns whether the pod Uses overlayfs.
+// TODO(yifan): Maybe make this function unexported.
+func (p *Pod) UsesOverlay() bool {
 	f, err := p.openFile(common.OverlayPreparedFilename, syscall.O_RDONLY)
 	defer f.Close()
 	return err == nil
 }
 
-func (p *pod) getStatusDir() (string, error) {
-	if p.usesOverlay() {
-		// the pod uses overlay. Since the mount is in another mount
-		// namespace (or gone), return the status directory from the overlay
-		// upper layer
-		stage1TreeStoreID, err := p.getStage1TreeStoreID()
+// Sync syncs the pod data. By now it calls a syncfs on the filesystem
+// containing the pod's directory.
+func (p *Pod) Sync() error {
+	cfd, err := p.Fd()
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("error acquiring pod %v dir fd", p.UUID.String()), err)
+	}
+	if err := sys.Syncfs(cfd); err != nil {
+		return errwrap.Wrap(fmt.Errorf("failed to sync pod %v data", p.UUID.String()), err)
+	}
+	return nil
+}
+
+// WalkPods iterates over the included directories calling function f for every pod found.
+// The pod will be closed after the function 'f' is executed.
+func WalkPods(dataDir string, include IncludeMask, f func(*Pod)) error {
+	if err := initPods(dataDir); err != nil {
+		return err
+	}
+
+	ls, err := listPods(dataDir, include)
+	if err != nil {
+		return errwrap.Wrap(errors.New("failed to get pods"), err)
+	}
+	sort.Strings(ls)
+
+	for _, uuid := range ls {
+		u, err := types.NewUUID(uuid)
 		if err != nil {
-			return "", err
+			fmt.Fprintf(os.Stderr, "skipping %q: %v", uuid, err)
+			continue
+		}
+		p, err := getPod(dataDir, u)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "skipping %q: %v", uuid, err)
+			continue
+		}
+
+		// omit pods found in unrequested states
+		// this is to cover a race between listPods finding the uuids and pod states changing
+		// it's preferable to keep these operations lock-free, for example a `rkt gc` shouldn't block `rkt run`.
+		if p.isEmbryo && include&IncludeEmbryoDir == 0 ||
+			p.isExitedGarbage && include&IncludeExitedGarbageDir == 0 ||
+			p.isGarbage && include&IncludeGarbageDir == 0 ||
+			p.isPrepared && include&IncludePreparedDir == 0 ||
+			((p.isPreparing || p.isAbortedPrepare) && include&IncludePrepareDir == 0) ||
+			p.isRunning() && include&IncludeRunDir == 0 {
+			p.Close()
+			continue
 		}
-		overlayStatusDir := fmt.Sprintf(overlayStatusDirTemplate, stage1TreeStoreID)
 
-		return overlayStatusDir, nil
+		f(p)
+		p.Close()
 	}
 
-	// not using overlay, return the regular status directory
-	return regularStatusDir, nil
+	return nil
 }
 
-// getExitStatuses returns a map of the statuses of the pod.
-func (p *pod) getExitStatuses() (map[string]int, error) {
-	statusDir, err := p.getStatusDir()
+// PodManifest reads the pod manifest, returns the raw bytes and the unmarshalled object.
+func (p *Pod) PodManifest() ([]byte, *schema.PodManifest, error) {
+	pmb, err := p.readFile("pod")
 	if err != nil {
-		return nil, errwrap.Wrap(errors.New("unable to get status directory"), err)
+		return nil, nil, errwrap.Wrap(errors.New("error reading pod manifest"), err)
+	}
+	pm := &schema.PodManifest{}
+	if err = pm.UnmarshalJSON(pmb); err != nil {
+		return nil, nil, errwrap.Wrap(errors.New("invalid pod manifest"), err)
 	}
-	ls, err := p.getDirNames(statusDir)
+	return pmb, pm, nil
+}
+
+// AppImageManifest returns an ImageManifest for the app.
+func (p *Pod) AppImageManifest(appName string) (*schema.ImageManifest, error) {
+	appACName, err := types.NewACName(appName)
 	if err != nil {
-		return nil, errwrap.Wrap(errors.New("unable to read status directory"), err)
+		return nil, err
+	}
+	imb, err := ioutil.ReadFile(common.AppImageManifestPath(p.Path(), *appACName))
+	if err != nil {
+		return nil, err
+	}
+
+	aim := &schema.ImageManifest{}
+	if err := aim.UnmarshalJSON(imb); err != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("invalid image manifest for app %q", appName), err)
+	}
+
+	return aim, nil
+}
+
+// CreationTime returns the time when the pod was created.
+// This happens at prepare time.
+func (p *Pod) CreationTime() (time.Time, error) {
+	if p.isPrepared || p.isRunning() || p.AfterRun() {
+		return p.getModTime("pod")
+	}
+	return time.Time{}, nil
+}
+
+// StartTime returns the time when the pod was started.
+func (p *Pod) StartTime() (time.Time, error) {
+	var (
+		t   time.Time
+		err error
+	)
+	if p.isRunning() || p.AfterRun() {
+		// check pid and ppid files, since stage1 implementations can choose
+		// which one to implement.
+		t, err = p.getModTime("pid")
+		if os.IsNotExist(err) {
+			t, err = p.getModTime("ppid")
+			// if there's an error starting the pod, it can be "exited" without
+			// the "ppid" (or "pid") files being created, return an error only
+			// if it's different than ENOENT.
+			if os.IsNotExist(err) {
+				err = nil
+			}
+		}
+	}
+	return t, err
+}
+
+// GCMarkedTime returns the time when the pod is marked by gc.
+func (p *Pod) GCMarkedTime() (time.Time, error) {
+	if !p.isGarbage && !p.isExitedGarbage {
+		return time.Time{}, nil
+	}
+
+	// At this point, the pod is in either exited-garbage dir, garbage dir or gone already.
+	podPath := p.Path()
+	if podPath == "" {
+		// Pod is gone.
+		return time.Time{}, nil
+	}
+
+	st := &syscall.Stat_t{}
+	if err := syscall.Lstat(podPath, st); err != nil {
+		if err == syscall.ENOENT {
+			// Pod is gone.
+			err = nil
+		}
+		return time.Time{}, err
+	}
+	return time.Unix(st.Ctim.Unix()), nil
+}
+
+// Pid returns the pid of the stage1 process that started the pod.
+func (p *Pod) Pid() (int, error) {
+	if pid, err := p.readIntFromFile("pid"); err == nil {
+		return pid, nil
+	}
+	if pid, err := p.readIntFromFile("ppid"); err != nil {
+		return -1, err
+	} else {
+		return pid, nil
+	}
+}
+
+// ContainerPid1 returns the pid of the process with pid 1 in the pod.
+func (p *Pod) ContainerPid1() (pid int, err error) {
+	// rkt supports two methods to find the container's PID 1: the pid
+	// file and the ppid file.
+	// The ordering is not important and only one of them must be supplied.
+	// See Documentation/devel/stage1-implementors-guide.md
+	for {
+		var ppid int
+
+		pid, err = p.readIntFromFile("pid")
+		if err == nil {
+			return
+		}
+
+		ppid, err = p.readIntFromFile("ppid")
+		if err != nil && !os.IsNotExist(err) {
+			return -1, err
+		}
+		if err == nil {
+			pid, err = getChildPID(ppid)
+			if err == nil {
+				return pid, nil
+			}
+			if _, ok := err.(ErrChildNotReady); !ok {
+				return -1, err
+			}
+		}
+
+		// There's a window between a pod transitioning to run and the pid file being created by stage1.
+		// The window shouldn't be large so we just delay and retry here.  If stage1 fails to reach the
+		// point of pid file creation, it will exit and p.isRunning() becomes false since we refreshState below.
+		time.Sleep(time.Millisecond * 100)
+
+		if err := p.refreshState(); err != nil {
+			return -1, err
+		}
+
+		if !p.isRunning() {
+			return -1, fmt.Errorf("pod %v is not running anymore", p.UUID)
+		}
 	}
+}
+
+// Path returns the path to the pod according to the current (cached) state.
+func (p *Pod) Path() string {
+	switch {
+	case p.isEmbryo:
+		return p.embryoPath()
+	case p.isPreparing || p.isAbortedPrepare:
+		return p.preparePath()
+	case p.isPrepared:
+		return p.preparedPath()
+	case p.isExitedGarbage:
+		return p.exitedGarbagePath()
+	case p.isGarbage:
+		return p.garbagePath()
+	case p.isGone:
+		return "" // TODO(vc): anything better?
+	}
+
+	return p.runPath()
+}
 
-	stats := make(map[string]int)
-	for _, name := range ls {
-		s, err := p.readIntFromFile(filepath.Join(statusDir, name))
+// Stage1RootfsPath returns the stage1 path of the pod.
+func (p *Pod) Stage1RootfsPath() (string, error) {
+	stage1RootfsPath := "stage1/rootfs"
+	if p.UsesOverlay() {
+		stage1TreeStoreID, err := p.GetStage1TreeStoreID()
 		if err != nil {
-			stderr.PrintE(fmt.Sprintf("unable to get status of app %q", name), err)
-			continue
+			return "", err
 		}
-		stats[name] = s
+		stage1RootfsPath = fmt.Sprintf("overlay/%s/upper/", stage1TreeStoreID)
 	}
-	return stats, nil
+
+	return filepath.Join(p.Path(), stage1RootfsPath), nil
 }
 
-// sync syncs the pod data. By now it calls a syncfs on the filesystem
-// containing the pod's directory.
-func (p *pod) sync() error {
-	cfd, err := p.Fd()
+// JournalLogPath returns the path to the journal log dir of the pod.
+func (p *Pod) JournalLogPath() (string, error) {
+	stage1RootfsPath, err := p.Stage1RootfsPath()
 	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("error acquiring pod %v dir fd", p.uuid.String()), err)
-	}
-	if err := sys.Syncfs(cfd); err != nil {
-		return errwrap.Wrap(fmt.Errorf("failed to sync pod %v data", p.uuid.String()), err)
+		return "", err
 	}
-	return nil
+	return filepath.Join(stage1RootfsPath, "/var/log/journal/"), nil
 }
 
-// overlayPrepared returns true if the given pod was prepared using overlay else false.
-// It returns an error if the operation failed.
-func (p *pod) overlayPrepared() (bool, error) {
-	_, err := os.Stat(filepath.Join(p.path(), common.OverlayPreparedFilename))
-	if os.IsNotExist(err) {
-		return false, nil
+// State returns the current state of the pod
+func (p *Pod) State() string {
+	switch {
+	case p.isEmbryo:
+		return Embryo
+	case p.isPreparing:
+		return Preparing
+	case p.isAbortedPrepare:
+		return AbortedPrepare
+	case p.isPrepared:
+		return Prepared
+	case p.isDeleting:
+		return Deleting
+	case p.isExitedDeleting:
+		return ExitedDeleting
+	case p.isExited: // this covers p.isExitedGarbage
+		if p.isExitedGarbage {
+			return ExitedGarbage
+		}
+		return Exited
+	case p.isGarbage:
+		return Garbage
 	}
+
+	return Running
+}
+
+// isRunning does the annoying tests to infer if a pod is in a running state
+func (p *Pod) isRunning() bool {
+	// when none of these things, running!
+	return !p.isEmbryo && !p.isAbortedPrepare && !p.isPreparing && !p.isPrepared &&
+		!p.isExited && !p.isExitedGarbage && !p.isExitedDeleting && !p.isGarbage && !p.isDeleting && !p.isGone
+}
+
+// AfterRun returns true if the pod is in a post-running state, otherwise it returns false.
+func (p *Pod) AfterRun() bool {
+	return p.isExitedDeleting || p.isDeleting || p.isExited || p.isGarbage
+}
+
+// AppExitCode returns the app's exit code.
+// It returns an error if the exit code file doesn't exit or the content of the file is invalid.
+func (p *Pod) AppExitCode(appName string) (int, error) {
+	stage1RootfsPath, err := p.Stage1RootfsPath()
 	if err != nil {
-		return false, err
+		return -1, err
 	}
 
-	return true, nil
+	statusFile := filepath.Join(stage1RootfsPath, "/rkt/status/", appName)
+	return p.readIntFromFile(statusFile)
 }
diff --git a/rkt/pods_test.go b/pkg/pod/pods_test.go
similarity index 88%
rename from rkt/pods_test.go
rename to pkg/pod/pods_test.go
index 5b91ef649b..edcd52d1d2 100644
--- a/rkt/pods_test.go
+++ b/pkg/pod/pods_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package pod
 
 import (
 	"io/ioutil"
@@ -119,11 +119,7 @@ func TestWalkPods(t *testing.T) {
 		}
 		defer os.RemoveAll(d)
 
-		// This will mark the flag as changed, so it will have
-		// precedence over the configuration and the default
-		// value.
-		cmdRkt.PersistentFlags().Set("dir", d)
-		if err := initPods(); err != nil {
+		if err := initPods(d); err != nil {
 			t.Fatalf("error initializing pods: %v", err)
 		}
 
@@ -131,18 +127,18 @@ func TestWalkPods(t *testing.T) {
 			n_expected int
 			n_walked   int
 			n_matched  int
-			included   includeMask
+			included   IncludeMask
 		)
 
 		// create the pod dirs as specified by the test
 		for _, ct := range tt {
 			var cp string
 			if ct.garbage {
-				cp = filepath.Join(exitedGarbageDir(), ct.uuid)
-				included |= includeExitedGarbageDir
+				cp = filepath.Join(exitedGarbageDir(d), ct.uuid)
+				included |= IncludeExitedGarbageDir
 			} else {
-				cp = filepath.Join(runDir(), ct.uuid)
-				included |= includeRunDir
+				cp = filepath.Join(runDir(d), ct.uuid)
+				included |= IncludeRunDir
 			}
 
 			if err := os.MkdirAll(cp, 0700); err != nil {
@@ -163,10 +159,10 @@ func TestWalkPods(t *testing.T) {
 		}
 
 		// match what walk provided against the set in the test
-		if err := walkPods(included, func(ch *pod) {
+		if err := WalkPods(d, included, func(ch *Pod) {
 			n_walked++
 			for _, ct := range tt {
-				if ch.uuid.String() == ct.uuid &&
+				if ch.UUID.String() == ct.uuid &&
 					ch.isExitedGarbage == ct.garbage &&
 					ch.isExited == ct.exited &&
 					ch.isExitedDeleting == ct.deleting {
diff --git a/rkt/uuid.go b/pkg/pod/uuid.go
similarity index 75%
rename from rkt/uuid.go
rename to pkg/pod/uuid.go
index 0ca536b6cd..d9dcd9fed7 100644
--- a/rkt/uuid.go
+++ b/pkg/pod/uuid.go
@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//+build linux
-
-package main
+package pod
 
 import (
 	"bytes"
@@ -29,12 +27,12 @@ import (
 
 // matchUUID attempts to match the uuid specified as uuid against all pods present.
 // An array of matches is returned, which may be empty when nothing matches.
-func matchUUID(uuid string) ([]string, error) {
+func matchUUID(dataDir, uuid string) ([]string, error) {
 	if uuid == "" {
 		return nil, types.ErrNoEmptyUUID
 	}
 
-	ls, err := listPods(includePrepareDir | includePreparedDir | includeRunDir | includeExitedGarbageDir)
+	ls, err := listPods(dataDir, IncludePrepareDir|IncludePreparedDir|IncludeRunDir|IncludeExitedGarbageDir)
 	if err != nil {
 		return nil, err
 	}
@@ -51,9 +49,9 @@ func matchUUID(uuid string) ([]string, error) {
 
 // resolveUUID attempts to resolve the uuid specified as uuid against all pods present.
 // An unambiguously matched uuid or nil is returned.
-func resolveUUID(uuid string) (*types.UUID, error) {
+func resolveUUID(dataDir, uuid string) (*types.UUID, error) {
 	uuid = strings.ToLower(uuid)
-	m, err := matchUUID(uuid)
+	m, err := matchUUID(dataDir, uuid)
 	if err != nil {
 		return nil, err
 	}
@@ -74,16 +72,16 @@ func resolveUUID(uuid string) (*types.UUID, error) {
 	return u, nil
 }
 
-func readUUIDFromFile(path string) (*types.UUID, error) {
+// ReadUUIDFromFile reads the uuid string from the given path.
+func ReadUUIDFromFile(path string) (string, error) {
 	uuid, err := ioutil.ReadFile(path)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	uuid = bytes.TrimSpace(uuid)
-
-	return resolveUUID(string(uuid))
+	return string(bytes.TrimSpace(uuid)), nil
 }
 
-func writeUUIDToFile(uuid *types.UUID, path string) error {
+// WriteUUIDToFile writes the uuid string to the given path.
+func WriteUUIDToFile(uuid *types.UUID, path string) error {
 	return ioutil.WriteFile(path, []byte(uuid.String()), 0644)
 }
diff --git a/pkg/user/util.go b/pkg/user/util.go
new file mode 100644
index 0000000000..06a5a28744
--- /dev/null
+++ b/pkg/user/util.go
@@ -0,0 +1,29 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package user
+
+import "os"
+
+// ShiftFiles shifts filesToshift by the amounts specified in uidRange
+func ShiftFiles(filesToShift []string, uidRange *UidRange) error {
+	if uidRange.Shift != 0 && uidRange.Count != 0 {
+		for _, f := range filesToShift {
+			if err := os.Chown(f, int(uidRange.Shift), int(uidRange.Shift)); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
diff --git a/rkt/api_service.go b/rkt/api_service.go
index 36ecd77022..dc2290f5bb 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -17,6 +17,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"net"
 	"os"
 	"os/signal"
@@ -32,6 +33,7 @@ import (
 	"github.com/coreos/rkt/api/v1alpha"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/pkg/set"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/coreos/rkt/version"
@@ -312,26 +314,6 @@ func satisfiesAnyPodFilters(pod *v1alpha.Pod, filters []*v1alpha.PodFilter) bool
 	return false
 }
 
-// getPodManifest returns the pod manifest of the pod.
-// It will try to find the manifest in the LRU cache first, if not found or the manifest is stale,
-// then it will read the manifest from the disk.
-// Both marshaled and unmarshaled manifest are returned.
-func (s *v1AlphaAPIServer) getPodManifest(p *pod) (*schema.PodManifest, []byte, error) {
-	data, err := p.readFile("pod")
-	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to read pod manifest for pod %q", p.uuid), err)
-		return nil, nil, err
-	}
-
-	var manifest schema.PodManifest
-	if err := json.Unmarshal(data, &manifest); err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to unmarshal pod manifest for pod %q", p.uuid), err)
-		return nil, nil, err
-	}
-
-	return &manifest, data, nil
-}
-
 // getPodCgroup gets the cgroup path for a pod. This can be done in one of a couple ways:
 //
 // 1) stage1-coreos
@@ -343,7 +325,7 @@ func (s *v1AlphaAPIServer) getPodManifest(p *pod) (*schema.PodManifest, []byte,
 // 2) All others
 //
 // Assume that we can simply get the cgroup of the pod's init PID, and use that.
-func getPodCgroup(p *pod, pid int) (string, error) {
+func getPodCgroup(p *pkgPod.Pod, pid int) (string, error) {
 	// Note, this file should always exist if the pid is known since it is
 	// written before the pid file
 	// The contents are of the form:
@@ -352,7 +334,8 @@ func getPodCgroup(p *pod, pid int) (string, error) {
 	// no registration, ran as systemd-unit 'foo.service':
 	//   'system.slice/foo.service'
 	// stage1-fly: file does not exist
-	data, err := p.readFile("subcgroup")
+	subCgroupFile := filepath.Join(p.Path(), "subcgroup")
+	data, err := ioutil.ReadFile(subCgroupFile)
 	// normalize cgroup to include a leading '/'
 	if err == nil {
 		strCgroup := string(data)
@@ -410,9 +393,9 @@ func getApplist(manifest *schema.PodManifest) []*v1alpha.App {
 }
 
 // getNetworks returns the list of the info of the network that the pod belongs to.
-func getNetworks(p *pod) []*v1alpha.Network {
+func getNetworks(p *pkgPod.Pod) []*v1alpha.Network {
 	var networks []*v1alpha.Network
-	for _, n := range p.nets {
+	for _, n := range p.Nets {
 		networks = append(networks, &v1alpha.Network{
 			Name: n.NetName,
 			// There will be IPv6 support soon so distinguish between v4 and v6
@@ -433,7 +416,7 @@ func (e errs) Error() string {
 
 // fillStaticAppInfo will modify the 'v1pod' in place with the information retrieved with 'pod'.
 // Today, these information are static and will not change during the pod's lifecycle.
-func fillStaticAppInfo(store *imagestore.Store, pod *pod, v1pod *v1alpha.Pod) error {
+func fillStaticAppInfo(store *imagestore.Store, pod *pkgPod.Pod, v1pod *v1alpha.Pod) error {
 	var errlist []error
 
 	// Fill static app image info.
@@ -451,7 +434,7 @@ func fillStaticAppInfo(store *imagestore.Store, pod *pod, v1pod *v1alpha.Pod) er
 			// info from store. Some of it is filled in below if possible.
 		}
 
-		im, err := pod.getAppImageManifest(*types.MustACName(app.Name))
+		im, err := pod.AppImageManifest(app.Name)
 		if err != nil {
 			stderr.PrintE(fmt.Sprintf("failed to get image manifests for app %q", app.Name), err)
 			errlist = append(errlist, err)
@@ -472,12 +455,12 @@ func fillStaticAppInfo(store *imagestore.Store, pod *pod, v1pod *v1alpha.Pod) er
 	return nil
 }
 
-func (s *v1AlphaAPIServer) getBasicPodFromDisk(p *pod) (*v1alpha.Pod, error) {
-	pod := &v1alpha.Pod{Id: p.uuid.String()}
+func (s *v1AlphaAPIServer) getBasicPodFromDisk(p *pkgPod.Pod) (*v1alpha.Pod, error) {
+	pod := &v1alpha.Pod{Id: p.UUID.String()}
 
-	manifest, data, err := s.getPodManifest(p)
+	data, manifest, err := p.PodManifest()
 	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to get the pod manifest for pod %q", p.uuid), err)
+		stderr.PrintE(fmt.Sprintf("failed to get the pod manifest for pod %q", p.UUID), err)
 	} else {
 		pod.Annotations = convertAnnotationsToKeyValue(manifest.Annotations)
 		pod.Apps = getApplist(manifest)
@@ -488,15 +471,24 @@ func (s *v1AlphaAPIServer) getBasicPodFromDisk(p *pod) (*v1alpha.Pod, error) {
 	return pod, err
 }
 
+func getPodManifestModTime(p *pkgPod.Pod) (time.Time, error) {
+	podFile := filepath.Join(p.Path(), "pod")
+	fi, err := os.Stat(podFile)
+	if err != nil {
+		return time.Time{}, err
+	}
+	return fi.ModTime(), nil
+}
+
 // getBasicPod returns v1alpha.Pod with basic pod information.
-func (s *v1AlphaAPIServer) getBasicPod(p *pod) *v1alpha.Pod {
-	mtime, mtimeErr := p.getModTime("pod")
+func (s *v1AlphaAPIServer) getBasicPod(p *pkgPod.Pod) *v1alpha.Pod {
+	mtime, mtimeErr := getPodManifestModTime(p)
 	if mtimeErr != nil {
-		stderr.PrintE(fmt.Sprintf("failed to read the pod manifest's mtime for pod %q", p.uuid), mtimeErr)
+		stderr.PrintE(fmt.Sprintf("failed to read the pod manifest's mtime for pod %q", p.UUID), mtimeErr)
 	}
 
 	// Couldn't use pod.uuid directly as it's a pointer.
-	itemValue, found := s.podCache.Get(p.uuid.String())
+	itemValue, found := s.podCache.Get(p.UUID.String())
 	if found && mtimeErr == nil {
 		cacheItem := itemValue.(*podCacheItem)
 
@@ -514,7 +506,7 @@ func (s *v1AlphaAPIServer) getBasicPod(p *pod) *v1alpha.Pod {
 	}
 
 	cacheItem := &podCacheItem{pod, mtime}
-	s.podCache.Add(p.uuid.String(), cacheItem)
+	s.podCache.Add(p.UUID.String(), cacheItem)
 
 	// Return a copy of the pod, so the cached pod is not mutated later.
 	return copyPod(cacheItem.pod)
@@ -523,72 +515,72 @@ func (s *v1AlphaAPIServer) getBasicPod(p *pod) *v1alpha.Pod {
 // fillPodDetails fills the v1pod's dynamic info in place, e.g. the pod's state,
 // the pod's network info, the apps' state, etc. Such information can change
 // during the lifecycle of the pod, so we need to read it in every request.
-func fillPodDetails(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
+func fillPodDetails(store *imagestore.Store, p *pkgPod.Pod, v1pod *v1alpha.Pod) {
 	v1pod.Pid = -1
 
-	switch p.getState() {
-	case Embryo:
+	switch p.State() {
+	case pkgPod.Embryo:
 		v1pod.State = v1alpha.PodState_POD_STATE_EMBRYO
 		// When a pod is in embryo state, there is not much
 		// information to return.
 		return
-	case Preparing:
+	case pkgPod.Preparing:
 		v1pod.State = v1alpha.PodState_POD_STATE_PREPARING
-	case AbortedPrepare:
+	case pkgPod.AbortedPrepare:
 		v1pod.State = v1alpha.PodState_POD_STATE_ABORTED_PREPARE
-	case Prepared:
+	case pkgPod.Prepared:
 		v1pod.State = v1alpha.PodState_POD_STATE_PREPARED
-	case Running:
+	case pkgPod.Running:
 		v1pod.State = v1alpha.PodState_POD_STATE_RUNNING
 		v1pod.Networks = getNetworks(p)
-	case Deleting:
+	case pkgPod.Deleting:
 		v1pod.State = v1alpha.PodState_POD_STATE_DELETING
-	case Exited:
+	case pkgPod.Exited:
 		v1pod.State = v1alpha.PodState_POD_STATE_EXITED
-	case Garbage:
+	case pkgPod.Garbage, pkgPod.ExitedGarbage:
 		v1pod.State = v1alpha.PodState_POD_STATE_GARBAGE
 	default:
 		v1pod.State = v1alpha.PodState_POD_STATE_UNDEFINED
 		return
 	}
 
-	createdAt, err := p.getCreationTime()
+	createdAt, err := p.CreationTime()
 	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to get the creation time for pod %q", p.uuid), err)
+		stderr.PrintE(fmt.Sprintf("failed to get the creation time for pod %q", p.UUID), err)
 	} else if !createdAt.IsZero() {
 		v1pod.CreatedAt = createdAt.UnixNano()
 	}
 
-	startedAt, err := p.getStartTime()
+	startedAt, err := p.StartTime()
 	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to get the start time for pod %q", p.uuid), err)
+		stderr.PrintE(fmt.Sprintf("failed to get the start time for pod %q", p.UUID), err)
 	} else if !startedAt.IsZero() {
 		v1pod.StartedAt = startedAt.UnixNano()
 
 	}
 
-	gcMarkedAt, err := p.getGCMarkedTime()
+	gcMarkedAt, err := p.GCMarkedTime()
 	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to get the gc marked time for pod %q", p.uuid), err)
+		stderr.PrintE(fmt.Sprintf("failed to get the gc marked time for pod %q", p.UUID), err)
 	} else if !gcMarkedAt.IsZero() {
 		v1pod.GcMarkedAt = gcMarkedAt.UnixNano()
 	}
 
-	pid, err := p.getPID()
+	pid, err := p.Pid()
 	if err != nil {
-		stderr.PrintE(fmt.Sprintf("failed to get the PID for pod %q", p.uuid), err)
+		stderr.PrintE(fmt.Sprintf("failed to get the PID for pod %q", p.UUID), err)
 	} else {
 		v1pod.Pid = int32(pid)
 	}
 
 	if v1pod.State == v1alpha.PodState_POD_STATE_RUNNING {
-		pid, err := p.getContainerPID1()
+		pid, err := p.ContainerPid1()
 		if err != nil {
-			stderr.PrintE(fmt.Sprintf("failed to get the container PID1 for pod %q", p.uuid), err)
+			stderr.PrintE(fmt.Sprintf("failed to get the container PID1 for pod %q", p.UUID), err)
 		} else {
 			cgroup, err := getPodCgroup(p, pid)
 			if err != nil {
-				stderr.PrintE(fmt.Sprintf("failed to get the cgroup path for pod %q", p.uuid), err)
+				stderr.PrintE(fmt.Sprintf("failed to get the cgroup path for pod %q", p.UUID), err)
 			} else {
 				v1pod.Cgroup = cgroup
 			}
@@ -598,10 +590,10 @@ func fillPodDetails(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
 	for _, app := range v1pod.Apps {
 		readStatus := false
 
-		if p.isRunning() {
+		if p.State() == pkgPod.Running {
 			readStatus = true
 			app.State = v1alpha.AppState_APP_STATE_RUNNING
-		} else if p.afterRun() {
+		} else if p.AfterRun() {
 			readStatus = true
 			app.State = v1alpha.AppState_APP_STATE_EXITED
 		} else {
@@ -609,24 +601,18 @@ func fillPodDetails(store *imagestore.Store, p *pod, v1pod *v1alpha.Pod) {
 		}
 
 		if readStatus {
-			statusDir, err := p.getStatusDir()
+			exitCode, err := p.AppExitCode(app.Name)
 			if err != nil {
-				stderr.PrintE("failed to get pod exit status directory", err)
-			} else {
-				value, err := p.readIntFromFile(filepath.Join(statusDir, app.Name))
-				if err != nil && !os.IsNotExist(err) {
-					stderr.PrintE(fmt.Sprintf("failed to read status for app %q", app.Name), err)
-				} else {
-					app.ExitCode = int32(value)
-				}
+				stderr.PrintE(fmt.Sprintf("failed to read status for app %q", app.Name), err)
 			}
+			app.ExitCode = int32(exitCode)
 		}
 	}
 }
 
 func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPodsRequest) (*v1alpha.ListPodsResponse, error) {
 	var pods []*v1alpha.Pod
-	if err := walkPods(includeMostDirs, func(p *pod) {
+	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeMostDirs, func(p *pkgPod.Pod) {
 		pod := s.getBasicPod(p)
 
 		fillPodDetails(s.store, p, pod)
@@ -649,13 +635,7 @@ func (s *v1AlphaAPIServer) ListPods(ctx context.Context, request *v1alpha.ListPo
 }
 
 func (s *v1AlphaAPIServer) InspectPod(ctx context.Context, request *v1alpha.InspectPodRequest) (*v1alpha.InspectPodResponse, error) {
-	uuid, err := types.NewUUID(request.Id)
-	if err != nil {
-		stderr.PrintE(fmt.Sprintf("invalid pod id %q", request.Id), err)
-		return nil, err
-	}
-
-	p, err := getPod(uuid)
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), request.Id)
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("failed to get pod %q", request.Id), err)
 		return nil, err
diff --git a/rkt/api_service_sdjournal.go b/rkt/api_service_sdjournal.go
index a520d8ca91..fbb4e517d5 100644
--- a/rkt/api_service_sdjournal.go
+++ b/rkt/api_service_sdjournal.go
@@ -20,38 +20,24 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 	"time"
 
-	"github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/sdjournal"
 	"github.com/coreos/rkt/api/v1alpha"
 	"github.com/coreos/rkt/common"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 )
 
 func (s *v1AlphaAPIServer) constrainedGetLogs(request *v1alpha.GetLogsRequest, server v1alpha.PublicAPI_GetLogsServer) error {
-	uuid, err := types.NewUUID(request.PodId)
-	if err != nil {
-		return err
-	}
-	pod, err := getPod(uuid)
+	pod, err := pkgPod.PodFromUUIDString(getDataDir(), request.PodId)
 	if err != nil {
 		return err
 	}
 	defer pod.Close()
 
-	stage1Path := "stage1/rootfs"
-	if pod.usesOverlay() {
-		stage1TreeStoreID, err := pod.getStage1TreeStoreID()
-		if err != nil {
-			return err
-		}
-		stage1Path = fmt.Sprintf("/overlay/%s/upper/", stage1TreeStoreID)
-	}
-	path := filepath.Join(getDataDir(), "/pods/run/", request.PodId, stage1Path, "/var/log/journal/")
-
+	path, err := pod.JournalLogPath()
 	if _, err := os.Stat(path); os.IsNotExist(err) {
-		return fmt.Errorf("%s: logging unsupported", uuid.String())
+		return fmt.Errorf("logging unsupported for pod %q", request.PodId)
 	}
 
 	jconf := sdjournal.JournalReaderConfig{
diff --git a/rkt/cat_manifest.go b/rkt/cat_manifest.go
index 4a96c11cf8..ef86f2d264 100644
--- a/rkt/cat_manifest.go
+++ b/rkt/cat_manifest.go
@@ -17,6 +17,7 @@ package main
 import (
 	"encoding/json"
 
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 )
 
@@ -41,14 +42,14 @@ func runCatManifest(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	pod, err := getPodFromUUIDString(args[0])
+	pod, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
 		return 1
 	}
 	defer pod.Close()
 
-	manifest, err := pod.getManifest()
+	_, manifest, err := pod.PodManifest()
 	if err != nil {
 		return 1
 	}
diff --git a/rkt/enter.go b/rkt/enter.go
index 8c40e675c4..535cc6c107 100644
--- a/rkt/enter.go
+++ b/rkt/enter.go
@@ -19,11 +19,9 @@ package main
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 
-	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/stage0"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/coreos/rkt/store/treestore"
@@ -65,21 +63,21 @@ func runEnter(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	p, err := getPodFromUUIDString(args[0])
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
 		return 1
 	}
 	defer p.Close()
 
-	if !p.isRunning() {
-		stderr.Printf("pod %q isn't currently running", p.uuid)
+	if p.State() != pkgPod.Running {
+		stderr.Printf("pod %q isn't currently running", p.UUID)
 		return 1
 	}
 
-	podPID, err := p.getContainerPID1()
+	podPID, err := p.ContainerPid1()
 	if err != nil {
-		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.uuid), err)
+		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
 		return 1
 	}
 
@@ -107,7 +105,7 @@ func runEnter(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	stage1TreeStoreID, err := p.getStage1TreeStoreID()
+	stage1TreeStoreID, err := p.GetStage1TreeStoreID()
 	if err != nil {
 		stderr.PrintE("error getting stage1 treeStoreID", err)
 		return 1
@@ -115,7 +113,7 @@ func runEnter(cmd *cobra.Command, args []string) (exit int) {
 
 	stage1RootFS := ts.GetRootFS(stage1TreeStoreID)
 
-	if err = stage0.Enter(p.path(), podPID, *appName, stage1RootFS, argv); err != nil {
+	if err = stage0.Enter(p.Path(), podPID, *appName, stage1RootFS, argv); err != nil {
 		stderr.PrintE("enter failed", err)
 		return 1
 	}
@@ -127,22 +125,17 @@ func runEnter(cmd *cobra.Command, args []string) (exit int) {
 // If one was supplied in the flags then it's simply returned
 // If the PM contains a single app, that app's name is returned
 // If the PM has multiple apps, the names are printed and an error is returned
-func getAppName(p *pod) (*types.ACName, error) {
+func getAppName(p *pkgPod.Pod) (*types.ACName, error) {
 	if flagAppName != "" {
 		return types.NewACName(flagAppName)
 	}
 
 	// figure out the app name, or show a list if multiple are present
-	b, err := ioutil.ReadFile(common.PodManifestPath(p.path()))
+	_, m, err := p.PodManifest()
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error reading pod manifest"), err)
 	}
 
-	m := schema.PodManifest{}
-	if err = m.UnmarshalJSON(b); err != nil {
-		return nil, errwrap.Wrap(errors.New("invalid pod manifest"), err)
-	}
-
 	switch len(m.Apps) {
 	case 0:
 		return nil, fmt.Errorf("pod contains zero apps")
@@ -160,7 +153,7 @@ func getAppName(p *pod) (*types.ACName, error) {
 }
 
 // getEnterArgv returns the argv to use for entering the pod
-func getEnterArgv(p *pod, cmdArgs []string) ([]string, error) {
+func getEnterArgv(p *pkgPod.Pod, cmdArgs []string) ([]string, error) {
 	var argv []string
 	if len(cmdArgs) < 2 {
 		stderr.Printf("no command specified, assuming %q", defaultCmd)
diff --git a/rkt/export.go b/rkt/export.go
index bc60ef4ba4..a963591701 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -31,6 +31,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/overlay"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/coreos/rkt/store/treestore"
@@ -98,14 +99,15 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	p, err := getPodFromUUIDString(args[0])
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
 		return 1
 	}
 	defer p.Close()
 
-	if !p.isExited {
+	state := p.State()
+	if state != pkgPod.Exited && state != pkgPod.ExitedGarbage {
 		stderr.Print("pod is not exited. Only exited pods can be exported")
 		return 1
 	}
@@ -116,15 +118,15 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	root := common.AppPath(p.path(), app.Name)
-	manifestPath := filepath.Join(common.AppInfoPath(p.path(), app.Name), aci.ManifestFile)
-	if p.usesOverlay() {
+	root := common.AppPath(p.Path(), app.Name)
+	manifestPath := filepath.Join(common.AppInfoPath(p.Path(), app.Name), aci.ManifestFile)
+	if p.UsesOverlay() {
 		tmpDir := filepath.Join(getDataDir(), "tmp")
 		if err := os.MkdirAll(tmpDir, common.DefaultRegularDirPerm); err != nil {
 			stderr.PrintE("unable to create temp directory", err)
 			return 1
 		}
-		podDir, err := ioutil.TempDir(tmpDir, fmt.Sprintf("rkt-export-%s", p.uuid))
+		podDir, err := ioutil.TempDir(tmpDir, fmt.Sprintf("rkt-export-%s", p.UUID))
 		if err != nil {
 			stderr.PrintE("unable to create export temp directory", err)
 			return 1
@@ -153,7 +155,7 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		}()
 		root = podDir
 	} else {
-		hasMPs, err := appHasMountpoints(p.path(), app.Name)
+		hasMPs, err := appHasMountpoints(p.Path(), app.Name)
 		if err != nil {
 			stderr.PrintE("error parsing mountpoints", err)
 			return 1
@@ -166,7 +168,7 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 
 	// Check for user namespace (--private-user), if in use get uidRange
 	var uidRange *user.UidRange
-	privUserFile := filepath.Join(p.path(), common.PrivateUsersPreparedFilename)
+	privUserFile := filepath.Join(p.Path(), common.PrivateUsersPreparedFilename)
 	privUserContent, err := ioutil.ReadFile(privUserFile)
 	if err == nil {
 		uidRange = user.NewBlankUidRange()
@@ -188,12 +190,14 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 // If one was supplied in the flags then it's returned if present
 // If the PM contains a single app, that app is returned
 // If the PM has multiple apps, the names are printed and an error is returned
-func getApp(p *pod) (*schema.RuntimeApp, error) {
-	apps, err := p.getApps()
+func getApp(p *pkgPod.Pod) (*schema.RuntimeApp, error) {
+	_, manifest, err := p.PodManifest()
 	if err != nil {
-		return nil, errwrap.Wrap(errors.New("problem getting the pod's app list"), err)
+		return nil, errwrap.Wrap(errors.New("problem getting the pod's manifest"), err)
 	}
 
+	apps := manifest.Apps
+
 	if flagExportAppName != "" {
 		exportAppName, err := types.NewACName(flagExportAppName)
 		if err != nil {
@@ -224,7 +228,7 @@ func getApp(p *pod) (*schema.RuntimeApp, error) {
 }
 
 // mountOverlay mounts the app from the overlay-rendered pod to the destination directory.
-func mountOverlay(pod *pod, app *schema.RuntimeApp, dest string) error {
+func mountOverlay(pod *pkgPod.Pod, app *schema.RuntimeApp, dest string) error {
 	if _, err := os.Stat(dest); err != nil {
 		return err
 	}
@@ -239,12 +243,12 @@ func mountOverlay(pod *pod, app *schema.RuntimeApp, dest string) error {
 		return errwrap.Wrap(errors.New("cannot open treestore"), err)
 	}
 
-	treeStoreID, err := pod.getAppTreeStoreID(app.Name)
+	treeStoreID, err := pod.GetAppTreeStoreID(app.Name)
 	if err != nil {
 		return err
 	}
 	lower := ts.GetRootFS(treeStoreID)
-	imgDir := filepath.Join(filepath.Join(pod.path(), "overlay"), treeStoreID)
+	imgDir := filepath.Join(filepath.Join(pod.Path(), "overlay"), treeStoreID)
 	if _, err := os.Stat(imgDir); err != nil {
 		return err
 	}
diff --git a/rkt/gc.go b/rkt/gc.go
index 9bcca5abcc..6a6202c504 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/coreos/rkt/common"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/stage0"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/coreos/rkt/store/treestore"
@@ -98,10 +99,10 @@ func runGC(cmd *cobra.Command, args []string) (exit int) {
 
 // renameExited renames exited pods to the exitedGarbage directory
 func renameExited() error {
-	if err := walkPods(includeRunDir, func(p *pod) {
-		if p.isExited {
-			stderr.Printf("moving pod %q to garbage", p.uuid)
-			if err := p.xToExitedGarbage(); err != nil && err != os.ErrNotExist {
+	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeRunDir, func(p *pkgPod.Pod) {
+		if p.State() == pkgPod.Exited {
+			stderr.Printf("moving pod %q to garbage", p.UUID)
+			if err := p.ToExitedGarbage(); err != nil && err != os.ErrNotExist {
 				stderr.PrintE("rename error", err)
 			}
 		}
@@ -114,8 +115,8 @@ func renameExited() error {
 
 // emptyExitedGarbage discards sufficiently aged pods from exitedGarbageDir()
 func emptyExitedGarbage(gracePeriod time.Duration) error {
-	if err := walkPods(includeExitedGarbageDir, func(p *pod) {
-		gp := p.path()
+	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeExitedGarbageDir, func(p *pkgPod.Pod) {
+		gp := p.Path()
 		st := &syscall.Stat_t{}
 		if err := syscall.Lstat(gp, st); err != nil {
 			if err != syscall.ENOENT {
@@ -128,11 +129,11 @@ func emptyExitedGarbage(gracePeriod time.Duration) error {
 			if err := p.ExclusiveLock(); err != nil {
 				return
 			}
-			stdout.Printf("Garbage collecting pod %q", p.uuid)
+			stdout.Printf("Garbage collecting pod %q", p.UUID)
 
 			deletePod(p)
 		} else {
-			stderr.Printf("pod %q not removed: still within grace period (%s)", p.uuid, gracePeriod)
+			stderr.Printf("pod %q not removed: still within grace period (%s)", p.UUID, gracePeriod)
 		}
 	}); err != nil {
 		return err
@@ -143,10 +144,10 @@ func emptyExitedGarbage(gracePeriod time.Duration) error {
 
 // renameAborted renames failed prepares to the garbage directory
 func renameAborted() error {
-	if err := walkPods(includePrepareDir, func(p *pod) {
-		if p.isAbortedPrepare {
-			stderr.Printf("moving failed prepare %q to garbage", p.uuid)
-			if err := p.xToGarbage(); err != nil && err != os.ErrNotExist {
+	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludePrepareDir, func(p *pkgPod.Pod) {
+		if p.State() == pkgPod.AbortedPrepare {
+			stderr.Printf("moving failed prepare %q to garbage", p.UUID)
+			if err := p.ToGarbage(); err != nil && err != os.ErrNotExist {
 				stderr.PrintE("rename error", err)
 			}
 		}
@@ -158,9 +159,9 @@ func renameAborted() error {
 
 // renameExpired renames expired prepared pods to the garbage directory
 func renameExpired(preparedExpiration time.Duration) error {
-	if err := walkPods(includePreparedDir, func(p *pod) {
+	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludePreparedDir, func(p *pkgPod.Pod) {
 		st := &syscall.Stat_t{}
-		pp := p.path()
+		pp := p.Path()
 		if err := syscall.Lstat(pp, st); err != nil {
 			if err != syscall.ENOENT {
 				stderr.PrintE(fmt.Sprintf("unable to stat %q, ignoring", pp), err)
@@ -169,8 +170,8 @@ func renameExpired(preparedExpiration time.Duration) error {
 		}
 
 		if expiration := time.Unix(st.Ctim.Unix()).Add(preparedExpiration); time.Now().After(expiration) {
-			stderr.Printf("moving expired prepared pod %q to garbage", p.uuid)
-			if err := p.xToGarbage(); err != nil && err != os.ErrNotExist {
+			stderr.Printf("moving expired prepared pod %q to garbage", p.UUID)
+			if err := p.ToGarbage(); err != nil && err != os.ErrNotExist {
 				stderr.PrintE("rename error", err)
 			}
 		}
@@ -182,11 +183,11 @@ func renameExpired(preparedExpiration time.Duration) error {
 
 // emptyGarbage discards everything from garbageDir()
 func emptyGarbage() error {
-	if err := walkPods(includeGarbageDir, func(p *pod) {
+	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeGarbageDir, func(p *pkgPod.Pod) {
 		if err := p.ExclusiveLock(); err != nil {
 			return
 		}
-		stdout.Printf("Garbage collecting pod %q", p.uuid)
+		stdout.Printf("Garbage collecting pod %q", p.UUID)
 
 		deletePod(p)
 	}); err != nil {
@@ -196,19 +197,19 @@ func emptyGarbage() error {
 	return nil
 }
 
-func mountPodStage1(ts *treestore.Store, p *pod) error {
-	if !p.usesOverlay() {
+func mountPodStage1(ts *treestore.Store, p *pkgPod.Pod) error {
+	if !p.UsesOverlay() {
 		return nil
 	}
 
-	s1Id, err := p.getStage1TreeStoreID()
+	s1Id, err := p.GetStage1TreeStoreID()
 	if err != nil {
 		return errwrap.Wrap(errors.New("error getting stage1 treeStoreID"), err)
 	}
 	s1rootfs := ts.GetRootFS(s1Id)
 
-	stage1Dir := common.Stage1RootfsPath(p.path())
-	overlayDir := filepath.Join(p.path(), "overlay")
+	stage1Dir := common.Stage1RootfsPath(p.Path())
+	overlayDir := filepath.Join(p.Path(), "overlay")
 	imgDir := filepath.Join(overlayDir, s1Id)
 	upperDir := filepath.Join(imgDir, "upper")
 	workDir := filepath.Join(imgDir, "work")
@@ -224,12 +225,13 @@ func mountPodStage1(ts *treestore.Store, p *pod) error {
 // deletePod cleans up files and resource associated with the pod
 // pod must be under exclusive lock and be in either ExitedGarbage
 // or Garbage state
-func deletePod(p *pod) {
-	if !p.isExitedGarbage && !p.isGarbage {
-		stderr.Panicf("logic error: deletePod called with non-garbage pod %q (status %q)", p.uuid, p.getState())
+func deletePod(p *pkgPod.Pod) {
+	podState := p.State()
+	if podState != pkgPod.ExitedGarbage && podState != pkgPod.Garbage {
+		stderr.Panicf("logic error: deletePod called with non-garbage pod %q (status %q)", p.UUID, p.State())
 	}
 
-	if p.isExitedGarbage {
+	if podState == pkgPod.ExitedGarbage {
 		s, err := imagestore.NewStore(storeDir())
 		if err != nil {
 			stderr.PrintE("cannot open store", err)
@@ -248,14 +250,14 @@ func deletePod(p *pod) {
 		}
 
 		if err := mountPodStage1(ts, p); err == nil {
-			if err = stage0.GC(p.path(), p.uuid); err != nil {
-				stderr.PrintE(fmt.Sprintf("problem performing stage1 GC on %q", p.uuid), err)
+			if err = stage0.GC(p.Path(), p.UUID); err != nil {
+				stderr.PrintE(fmt.Sprintf("problem performing stage1 GC on %q", p.UUID), err)
 			}
 			// an overlay fs can be mounted over itself, let's unmount it here
 			// if we mounted it before to avoid problems when running
 			// stage0.MountGC
-			if p.usesOverlay() {
-				stage1Mnt := common.Stage1RootfsPath(p.path())
+			if p.UsesOverlay() {
+				stage1Mnt := common.Stage1RootfsPath(p.Path())
 				if err := syscall.Unmount(stage1Mnt, 0); err != nil {
 					stderr.PrintE("error unmounting stage1", err)
 				}
@@ -265,14 +267,14 @@ func deletePod(p *pod) {
 		}
 
 		// unmount all leftover mounts
-		if err := stage0.MountGC(p.path(), p.uuid.String()); err != nil {
-			stderr.PrintE(fmt.Sprintf("GC of leftover mounts for pod %q failed", p.uuid), err)
+		if err := stage0.MountGC(p.Path(), p.UUID.String()); err != nil {
+			stderr.PrintE(fmt.Sprintf("GC of leftover mounts for pod %q failed", p.UUID), err)
 			return
 		}
 	}
 
-	if err := os.RemoveAll(p.path()); err != nil {
-		stderr.PrintE(fmt.Sprintf("unable to remove pod %q", p.uuid), err)
+	if err := os.RemoveAll(p.Path()); err != nil {
+		stderr.PrintE(fmt.Sprintf("unable to remove pod %q", p.UUID), err)
 		os.Exit(1)
 	}
 }
diff --git a/rkt/help.go b/rkt/help.go
index 7a291e4e80..935322b998 100644
--- a/rkt/help.go
+++ b/rkt/help.go
@@ -21,6 +21,7 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/appc/spec/schema"
 	"github.com/coreos/rkt/version"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -156,3 +157,17 @@ func usageFunc(cmd *cobra.Command) error {
 	tabOut.Flush()
 	return nil
 }
+
+func printErrors(errors []error, operation string) {
+	sep := "----------------------------------------"
+	stderr.Printf("%d error(s) encountered when %s:", len(errors), operation)
+	stderr.Print(sep)
+	for _, err := range errors {
+		stderr.Error(err)
+		stderr.Print(sep)
+	}
+	stderr.Print("misc:")
+	stderr.Printf("  rkt's appc version: %s", schema.AppContainerVersion)
+	// make a visible break between errors and the listing
+	stderr.Print("")
+}
diff --git a/rkt/image_gc.go b/rkt/image_gc.go
index 8c3216c311..44d09c6170 100644
--- a/rkt/image_gc.go
+++ b/rkt/image_gc.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/lock"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
@@ -111,15 +112,15 @@ func gcTreeStore(ts *treestore.Store) error {
 func getReferencedTreeStoreIDs() (map[string]struct{}, error) {
 	treeStoreIDs := map[string]struct{}{}
 	// Consider pods in preparing, prepared, run, exitedgarbage state
-	if err := walkPods(includeMostDirs, func(p *pod) {
-		stage1TreeStoreID, err := p.getStage1TreeStoreID()
+	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeMostDirs, func(p *pkgPod.Pod) {
+		stage1TreeStoreID, err := p.GetStage1TreeStoreID()
 		if err != nil {
-			stderr.PrintE(fmt.Sprintf("cannot get stage1 treestoreID for pod %s", p.uuid), err)
+			stderr.PrintE(fmt.Sprintf("cannot get stage1 treestoreID for pod %s", p.UUID), err)
 			return
 		}
-		appsTreeStoreIDs, err := p.getAppsTreeStoreIDs()
+		appsTreeStoreIDs, err := p.GetAppsTreeStoreIDs()
 		if err != nil {
-			stderr.PrintE(fmt.Sprintf("cannot get apps treestoreID for pod %s", p.uuid), err)
+			stderr.PrintE(fmt.Sprintf("cannot get apps treestoreID for pod %s", p.UUID), err)
 			return
 		}
 		allTreeStoreIDs := append(appsTreeStoreIDs, stage1TreeStoreID)
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 31e0a76c41..1b2341f558 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -243,18 +243,9 @@ func runImages(cmd *cobra.Command, args []string) int {
 	}
 
 	if len(errors) > 0 {
-		sep := "----------------------------------------"
-		stderr.Printf("%d error(s) encountered when listing images:", len(errors))
-		stderr.Print(sep)
-		for _, err := range errors {
-			stderr.Error(err)
-			stderr.Print(sep)
-		}
-		stderr.Print("misc:")
-		stderr.Printf("  rkt's appc version: %s", schema.AppContainerVersion)
-		// make a visible break between errors and the listing
-		stderr.Print("")
+		printErrors(errors, "listing images")
 	}
+
 	tabOut.Flush()
 	stdout.Print(tabBuffer.String())
 	return 0
diff --git a/rkt/list.go b/rkt/list.go
index 6836013137..5effd2faa4 100644
--- a/rkt/list.go
+++ b/rkt/list.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"strings"
@@ -25,8 +26,9 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/lastditch"
 	"github.com/appc/spec/schema/types"
-	common "github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/lib"
 	"github.com/coreos/rkt/networking/netinfo"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/dustin/go-humanize"
 	"github.com/hashicorp/errwrap"
 	"github.com/spf13/cobra"
@@ -41,12 +43,14 @@ var (
 	}
 	flagNoLegend   bool
 	flagFullOutput bool
+	flagFormat     string
 )
 
 func init() {
 	cmdRkt.AddCommand(cmdList)
 	cmdList.Flags().BoolVar(&flagNoLegend, "no-legend", false, "suppress a legend with the list")
 	cmdList.Flags().BoolVar(&flagFullOutput, "full", false, "use long output format")
+	cmdList.Flags().StringVar(&flagFormat, "format", "", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
 }
 
 func runList(cmd *cobra.Command, args []string) int {
@@ -54,7 +58,7 @@ func runList(cmd *cobra.Command, args []string) int {
 	tabBuffer := new(bytes.Buffer)
 	tabOut := getTabOutWithWriter(tabBuffer)
 
-	if !flagNoLegend {
+	if !flagNoLegend && flagFormat == "" {
 		if flagFullOutput {
 			fmt.Fprintf(tabOut, "UUID\tAPP\tIMAGE NAME\tIMAGE ID\tSTATE\tCREATED\tSTARTED\tNETWORKS\n")
 		} else {
@@ -62,24 +66,33 @@ func runList(cmd *cobra.Command, args []string) int {
 		}
 	}
 
-	if err := walkPods(includeMostDirs, func(p *pod) {
-		pm := schema.PodManifest{}
+	var pods []*rkt.Pod
 
-		if !p.isPreparing && !p.isAbortedPrepare && !p.isExitedDeleting {
+	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeMostDirs, func(p *pkgPod.Pod) {
+		var pm schema.PodManifest
+		var err error
+
+		podState := p.State()
+		if podState != pkgPod.Preparing && podState != pkgPod.AbortedPrepare && podState != pkgPod.Deleting {
 			// TODO(vc): we should really hold a shared lock here to prevent gc of the pod
-			pmf, err := p.readFile(common.PodManifestPath(""))
+
+			_, manifest, err := p.PodManifest()
 			if err != nil {
 				errors = append(errors, newPodListReadError(p, err))
 				return
 			}
+			pm = *manifest
 
-			if err := pm.UnmarshalJSON(pmf); err != nil {
-				errors = append(errors, newPodListLoadError(p, err, pmf))
-				return
-			}
-
-			if len(pm.Apps) == 0 {
-				errors = append(errors, newPodListZeroAppsError(p))
+			if flagFormat != "" {
+				pod := &rkt.Pod{
+					UUID:     p.UUID.String(),
+					State:    podState,
+					Networks: p.Nets,
+				}
+				for _, app := range pm.Apps {
+					pod.AppNames = append(pod.AppNames, app.Name.String())
+				}
+				pods = append(pods, pod)
 				return
 			}
 		}
@@ -96,11 +109,11 @@ func runList(cmd *cobra.Command, args []string) int {
 		}
 
 		var appsToPrint []printedApp
-		uuid := p.uuid.String()
-		state := p.getState()
-		nets := fmtNets(p.nets)
+		uuid := p.UUID.String()
+		state := p.State()
+		nets := fmtNets(p.Nets)
 
-		created, err := p.getCreationTime()
+		created, err := p.CreationTime()
 		if err != nil {
 			errors = append(errors, errwrap.Wrap(fmt.Errorf("unable to get creation time for pod %q", uuid), err))
 		}
@@ -111,7 +124,7 @@ func runList(cmd *cobra.Command, args []string) int {
 			createdStr = humanize.Time(created)
 		}
 
-		started, err := p.getStartTime()
+		started, err := p.StartTime()
 		if err != nil {
 			errors = append(errors, errwrap.Wrap(fmt.Errorf("unable to get start time for pod %q", uuid), err))
 		}
@@ -127,6 +140,18 @@ func runList(cmd *cobra.Command, args []string) int {
 		if !flagFullOutput {
 			uuid = uuid[:8]
 		}
+		if len(pm.Apps) == 0 {
+			appsToPrint = append(appsToPrint, printedApp{
+				uuid:    uuid,
+				appName: "-",
+				imgName: "-",
+				imgID:   "-",
+				state:   state,
+				nets:    nets,
+				created: createdStr,
+				started: startedStr,
+			})
+		}
 		for _, app := range pm.Apps {
 			imageName, err := getImageName(p, app.Name)
 			if err != nil {
@@ -174,62 +199,47 @@ func runList(cmd *cobra.Command, args []string) int {
 		return 1
 	}
 
-	if len(errors) > 0 {
-		sep := "----------------------------------------"
-		stderr.Printf("%d error(s) encountered when listing pods:", len(errors))
-		stderr.Print(sep)
-		for _, err := range errors {
-			stderr.Error(err)
-			stderr.Print(sep)
+	switch flagFormat {
+	case "":
+		tabOut.Flush()
+		stdout.Print(tabBuffer)
+	case "json":
+		result, err := json.Marshal(pods)
+		if err != nil {
+			stderr.PrintE("error marshaling the pods", err)
+			return 1
 		}
-		stderr.Print("misc:")
-		stderr.Printf("  rkt's appc version: %s", schema.AppContainerVersion)
-		stderr.Print(sep)
-		// make a visible break between errors and the listing
-		stderr.Print("")
+		stdout.Print(string(result))
+	case "json-pretty":
+		result, err := json.MarshalIndent(pods, "", "\t")
+		if err != nil {
+			stderr.PrintE("error marshaling the pods", err)
+			return 1
+		}
+		stdout.Print(string(result))
 	}
 
-	tabOut.Flush()
-	stdout.Print(tabBuffer)
-	return 0
-}
-
-func newPodListReadError(p *pod, err error) error {
-	lines := []string{
-		fmt.Sprintf("Unable to read pod %s manifest:", p.uuid.String()),
-		fmt.Sprintf("  %v", err),
+	if len(errors) > 0 {
+		printErrors(errors, "listing pods")
 	}
-	return fmt.Errorf("%s", strings.Join(lines, "\n"))
+
+	return 0
 }
 
-func newPodListLoadError(p *pod, err error, pmj []byte) error {
+func newPodListReadError(p *pkgPod.Pod, err error) error {
 	lines := []string{
-		fmt.Sprintf("Unable to load pod %s manifest, because it is invalid:", p.uuid.String()),
+		fmt.Sprintf("Unable to read pod %s manifest:", p.UUID.String()),
 		fmt.Sprintf("  %v", err),
 	}
-	pm := lastditch.PodManifest{}
-	if err := pm.UnmarshalJSON(pmj); err != nil {
-		lines = append(lines, "  Also, failed to get any information about invalid pod manifest:")
-		lines = append(lines, fmt.Sprintf("    %v", err))
-	} else {
-		if len(pm.Apps) > 0 {
-			lines = append(lines, "Objects related to this error:")
-			for _, app := range pm.Apps {
-				lines = append(lines, fmt.Sprintf("  %s", appLine(app)))
-			}
-		} else {
-			lines = append(lines, "No other objects related to this error")
-		}
-	}
 	return fmt.Errorf("%s", strings.Join(lines, "\n"))
 }
 
-func newPodListZeroAppsError(p *pod) error {
-	return fmt.Errorf("pod %s contains zero apps", p.uuid.String())
+func newPodListZeroAppsError(p *pkgPod.Pod) error {
+	return fmt.Errorf("pod %s contains zero apps", p.UUID.String())
 }
 
-func newPodListLoadImageManifestError(p *pod, err error) error {
-	return errwrap.Wrap(fmt.Errorf("pod %s ImageManifest could not be loaded", p.uuid.String()), err)
+func newPodListLoadImageManifestError(p *pkgPod.Pod, err error) error {
+	return errwrap.Wrap(fmt.Errorf("pod %s ImageManifest could not be loaded", p.UUID.String()), err)
 }
 
 func appLine(app lastditch.RuntimeApp) string {
@@ -246,8 +256,8 @@ func fmtNets(nis []netinfo.NetInfo) string {
 	return strings.Join(parts, ", ")
 }
 
-func getImageName(p *pod, appName types.ACName) (string, error) {
-	aim, err := p.getAppImageManifest(appName)
+func getImageName(p *pkgPod.Pod, appName types.ACName) (string, error) {
+	aim, err := p.AppImageManifest(appName.String())
 	if err != nil {
 		return "", errwrap.Wrap(errors.New("problem retrieving ImageManifests from pod"), err)
 	}
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 40ff404227..44a57a1400 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -22,6 +22,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/lock"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/rkt/image"
 	"github.com/coreos/rkt/stage0"
@@ -164,7 +165,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	p, err := newPod()
+	p, err := pkgPod.NewPod(getDataDir())
 	if err != nil {
 		stderr.PrintE("error creating new pod", err)
 		return 1
@@ -174,7 +175,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		Store:       s,
 		TreeStore:   ts,
 		Stage1Image: *s1img,
-		UUID:        p.uuid,
+		UUID:        p.UUID,
 		Debug:       globalFlags.Debug,
 	}
 
@@ -215,25 +216,25 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		stderr.PrintE("cannot get shared prepare lock", err)
 		return 1
 	}
-	if err = stage0.Prepare(pcfg, p.path(), p.uuid); err != nil {
+	if err = stage0.Prepare(pcfg, p.Path(), p.UUID); err != nil {
 		stderr.PrintE("error setting up stage0", err)
 		keyLock.Close()
 		return 1
 	}
 	keyLock.Close()
 
-	if err := p.sync(); err != nil {
+	if err := p.Sync(); err != nil {
 		stderr.PrintE("error syncing pod data", err)
 		return 1
 	}
 
-	if err := p.xToPrepared(); err != nil {
+	if err := p.ToPrepared(); err != nil {
 		stderr.PrintE("error transitioning to prepared", err)
 		return 1
 	}
 
 	os.Stdout = origStdout // restore output in case of --quiet
-	stdout.Printf("%s", p.uuid.String())
+	stdout.Printf("%s", p.UUID.String())
 
 	return 0
 }
diff --git a/rkt/rm.go b/rkt/rm.go
index 74e7f433bf..4821bc1368 100644
--- a/rkt/rm.go
+++ b/rkt/rm.go
@@ -19,7 +19,7 @@ package main
 import (
 	"os"
 
-	"github.com/appc/spec/schema/types"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 )
 
@@ -39,14 +39,12 @@ func init() {
 }
 
 func runRm(cmd *cobra.Command, args []string) (exit int) {
-	var podUUID *types.UUID
-	var podUUIDs []*types.UUID
-	var err error
+	var podUUIDs []string
+	var ret int
 
-	ret := 0
 	switch {
 	case len(args) == 0 && flagUUIDFile != "":
-		podUUID, err = readUUIDFromFile(flagUUIDFile)
+		podUUID, err := pkgPod.ReadUUIDFromFile(flagUUIDFile)
 		if err != nil {
 			stderr.PrintE("unable to resolve UUID from file", err)
 			ret = 1
@@ -55,30 +53,23 @@ func runRm(cmd *cobra.Command, args []string) (exit int) {
 		}
 
 	case len(args) > 0 && flagUUIDFile == "":
-		for _, uuid := range args {
-			podUUID, err := resolveUUID(uuid)
-			if err != nil {
-				stderr.PrintE("unable to resolve UUID", err)
-				ret = 1
-			} else {
-				podUUIDs = append(podUUIDs, podUUID)
-			}
-		}
+		podUUIDs = args
 
 	default:
 		cmd.Usage()
 		return 1
 	}
 
-	for _, podUUID = range podUUIDs {
-		p, err := getPod(podUUID)
+	for _, podUUID := range podUUIDs {
+		p, err := pkgPod.PodFromUUIDString(getDataDir(), podUUID)
 		if err != nil {
 			ret = 1
 			stderr.PrintE("cannot get pod", err)
+			continue
 		}
 
 		if removePod(p) {
-			stdout.Printf("%q", p.uuid)
+			stdout.Printf("%q", p.UUID)
 		} else {
 			ret = 1
 		}
@@ -91,40 +82,40 @@ func runRm(cmd *cobra.Command, args []string) (exit int) {
 	return ret
 }
 
-func removePod(p *pod) bool {
-	switch {
-	case p.isRunning():
-		stderr.Printf("pod %q is currently running", p.uuid)
+func removePod(p *pkgPod.Pod) bool {
+	switch p.State() {
+	case pkgPod.Running:
+		stderr.Printf("pod %q is currently running", p.UUID)
 		return false
 
-	case p.isEmbryo, p.isPreparing:
-		stderr.Printf("pod %q is currently being prepared", p.uuid)
+	case pkgPod.Embryo, pkgPod.Preparing:
+		stderr.Printf("pod %q is currently being prepared", p.UUID)
 		return false
 
-	case p.isExitedDeleting, p.isDeleting:
-		stderr.Printf("pod %q is currently being deleted", p.uuid)
+	case pkgPod.Deleting:
+		stderr.Printf("pod %q is currently being deleted", p.UUID)
 		return false
 
-	case p.isAbortedPrepare:
-		stderr.Printf("moving failed prepare %q to garbage", p.uuid)
-		if err := p.xToGarbage(); err != nil && err != os.ErrNotExist {
+	case pkgPod.AbortedPrepare:
+		stderr.Printf("moving failed prepare %q to garbage", p.UUID)
+		if err := p.ToGarbage(); err != nil && err != os.ErrNotExist {
 			stderr.PrintE("rename error", err)
 			return false
 		}
 
-	case p.isPrepared:
-		stderr.Printf("moving expired prepared pod %q to garbage", p.uuid)
-		if err := p.xToGarbage(); err != nil && err != os.ErrNotExist {
+	case pkgPod.Prepared:
+		stderr.Printf("moving expired prepared pod %q to garbage", p.UUID)
+		if err := p.ToGarbage(); err != nil && err != os.ErrNotExist {
 			stderr.PrintE("rename error", err)
 			return false
 		}
 
 	// p.isExitedGarbage and p.isExited can be true at the same time. Test
 	// the most specific case first.
-	case p.isExitedGarbage, p.isGarbage:
+	case pkgPod.ExitedGarbage, pkgPod.Garbage:
 
-	case p.isExited:
-		if err := p.xToExitedGarbage(); err != nil && err != os.ErrNotExist {
+	case pkgPod.Exited:
+		if err := p.ToExitedGarbage(); err != nil && err != os.ErrNotExist {
 			stderr.PrintE("rename error", err)
 			return false
 		}
diff --git a/rkt/run.go b/rkt/run.go
index ec1cd760f0..d5750dcc93 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -29,6 +29,7 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/label"
 	"github.com/coreos/rkt/pkg/lock"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/rkt/image"
 	"github.com/coreos/rkt/stage0"
@@ -246,7 +247,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	p, err := newPod()
+	p, err := pkgPod.NewPod(getDataDir())
 	if err != nil {
 		stderr.PrintE("error creating new pod", err)
 		return 1
@@ -255,7 +256,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	// if requested, write out pod UUID early so "rkt rm" can
 	// clean it up even if something goes wrong
 	if flagUUIDFileSave != "" {
-		if err := writeUUIDToFile(p.uuid, flagUUIDFileSave); err != nil {
+		if err := pkgPod.WriteUUIDToFile(p.UUID, flagUUIDFileSave); err != nil {
 			stderr.PrintE("error saving pod UUID to file", err)
 			return 1
 		}
@@ -267,7 +268,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	p.mountLabel = mountLabel
+	p.MountLabel = mountLabel
 
 	cfg := stage0.CommonConfig{
 		MountLabel:   mountLabel,
@@ -275,8 +276,9 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		Store:        s,
 		TreeStore:    ts,
 		Stage1Image:  *s1img,
-		UUID:         p.uuid,
+		UUID:         p.UUID,
 		Debug:        globalFlags.Debug,
+		Mutable:      false,
 	}
 
 	ovlOk := true
@@ -318,7 +320,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		stderr.PrintE("cannot get shared prepare lock", err)
 		return 1
 	}
-	err = stage0.Prepare(pcfg, p.path(), p.uuid)
+	err = stage0.Prepare(pcfg, p.Path(), p.UUID)
 	if err != nil {
 		stderr.PrintE("error setting up stage0", err)
 		keyLock.Close()
@@ -334,7 +336,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	// skip prepared by jumping directly to run, we own this pod
-	if err := p.xToRun(); err != nil {
+	if err := p.ToRun(); err != nil {
 		stderr.PrintE("unable to transition to run", err)
 		return 1
 	}
@@ -369,13 +371,13 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		HostsEntries:         *HostsEntries,
 	}
 
-	apps, err := p.getApps()
+	_, manifest, err := p.PodManifest()
 	if err != nil {
-		stderr.PrintE("cannot get the appList in the pod manifest", err)
+		stderr.PrintE("cannot get the pod manifest", err)
 		return 1
 	}
-	rcfg.Apps = apps
-	stage0.Run(rcfg, p.path(), getDataDir()) // execs, never returns
+	rcfg.Apps = manifest.Apps
+	stage0.Run(rcfg, p.Path(), getDataDir()) // execs, never returns
 
 	return 1
 }
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index d432a250d0..add3bbaf66 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"github.com/coreos/rkt/common"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/stage0"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/coreos/rkt/store/treestore"
@@ -59,7 +60,7 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	p, err := getPodFromUUIDString(args[0])
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
 		return 1
@@ -78,18 +79,19 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	if !p.isPrepared {
-		stderr.Printf("pod %q is not prepared", p.uuid)
+	if p.State() != pkgPod.Prepared {
+		stderr.Printf("pod %q is not prepared", p.UUID)
+		return 1
+	}
+
+	_, manifest, err := p.PodManifest()
+	if err != nil {
+		stderr.PrintE("cannot read pod manifest", err)
 		return 1
 	}
 
 	if flagInteractive {
-		ac, err := p.getAppCount()
-		if err != nil {
-			stderr.PrintE("cannot get pod's app count", err)
-			return 1
-		}
-		if ac > 1 {
+		if len(manifest.Apps) > 1 {
 			stderr.Print("interactive option only supports pods with one app")
 			return 1
 		}
@@ -105,7 +107,7 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		}
 	}
 
-	if err := p.xToRun(); err != nil {
+	if err := p.ToRun(); err != nil {
 		stderr.PrintE("cannot transition to run", err)
 		return 1
 	}
@@ -116,12 +118,6 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	apps, err := p.getApps()
-	if err != nil {
-		stderr.PrintE("unable to get app list", err)
-		return 1
-	}
-
 	rktgid, err := common.LookupGid(common.RktGroup)
 	if err != nil {
 		stderr.Printf("group %q not found, will use default gid when rendering images", common.RktGroup)
@@ -139,11 +135,7 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		}
 	}
 
-	ovlPrep, err := p.overlayPrepared()
-	if err != nil {
-		stderr.PrintE("unable to determine prepared overlay state", err)
-		return 1
-	}
+	ovlPrep := p.UsesOverlay()
 
 	// should not happen, maybe the data directory moved from an overlay-enabled fs to another location
 	// between prepare and run-prepared
@@ -162,7 +154,7 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		CommonConfig: &stage0.CommonConfig{
 			Store:     s,
 			TreeStore: ts,
-			UUID:      p.uuid,
+			UUID:      p.UUID,
 			Debug:     globalFlags.Debug,
 		},
 		Net:                  flagNet,
@@ -172,7 +164,7 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		DNSConfig:            DNSConfig,
 		HostsEntries:         *HostsEntries,
 		MDSRegister:          flagMDSRegister,
-		Apps:                 apps,
+		Apps:                 manifest.Apps,
 		RktGid:               rktgid,
 		Hostname:             flagHostname,
 		InsecureCapabilities: globalFlags.InsecureFlags.SkipCapabilities(),
@@ -183,6 +175,6 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 	if globalFlags.Debug {
 		stage0.InitDebug()
 	}
-	stage0.Run(rcfg, p.path(), getDataDir()) // execs, never returns
+	stage0.Run(rcfg, p.Path(), getDataDir()) // execs, never returns
 	return 1
 }
diff --git a/rkt/status.go b/rkt/status.go
index ad4a34ff55..40a4f3a415 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -18,8 +18,9 @@ package main
 
 import (
 	"fmt"
+	"time"
 
-	"github.com/hashicorp/errwrap"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 )
 
@@ -51,7 +52,7 @@ func runStatus(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	p, err := getPodFromUUIDString(args[0])
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
 		return 1
@@ -59,7 +60,7 @@ func runStatus(cmd *cobra.Command, args []string) (exit int) {
 	defer p.Close()
 
 	if flagWait {
-		if err := p.waitExited(); err != nil {
+		if err := p.WaitExited(); err != nil {
 			stderr.PrintE("unable to wait for pod", err)
 			return 1
 		}
@@ -73,21 +74,40 @@ func runStatus(cmd *cobra.Command, args []string) (exit int) {
 	return 0
 }
 
+// getExitStatuses returns a map of the statuses of the pod.
+func getExitStatuses(p *pkgPod.Pod) (map[string]int, error) {
+	_, manifest, err := p.PodManifest()
+	if err != nil {
+		return nil, err
+	}
+
+	stats := make(map[string]int)
+	for _, app := range manifest.Apps {
+		exitCode, err := p.AppExitCode(app.Name.String())
+		if err != nil {
+			continue
+		}
+		stats[app.Name.String()] = exitCode
+	}
+	return stats, nil
+}
+
 // printStatus prints the pod's pid and per-app status codes
-func printStatus(p *pod) error {
-	stdout.Printf("state=%s", p.getState())
+func printStatus(p *pkgPod.Pod) error {
+	state := p.State()
+	stdout.Printf("state=%s", state)
 
-	created, err := p.getCreationTime()
+	created, err := p.CreationTime()
 	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("unable to get creation time for pod %q", p.uuid), err)
+		return fmt.Errorf("unable to get creation time for pod %q: %v", p.UUID, err)
 	}
 	createdStr := created.Format(defaultTimeLayout)
 
 	stdout.Printf("created=%s", createdStr)
 
-	started, err := p.getStartTime()
+	started, err := p.StartTime()
 	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("unable to get start time for pod %q", p.uuid), err)
+		return fmt.Errorf("unable to get start time for pod %q: %v", p.UUID, err)
 	}
 	var startedStr string
 	if !started.IsZero() {
@@ -95,24 +115,42 @@ func printStatus(p *pod) error {
 		stdout.Printf("started=%s", startedStr)
 	}
 
-	if p.isRunning() {
-		stdout.Printf("networks=%s", fmtNets(p.nets))
+	if state == pkgPod.Running {
+		stdout.Printf("networks=%s", fmtNets(p.Nets))
 	}
 
-	if !p.isEmbryo && !p.isPreparing && !p.isPrepared && !p.isAbortedPrepare && !p.isGarbage && !p.isGone {
-		pid, err := p.getPID()
-		if err != nil {
-			return err
+	if state == pkgPod.Running || state == pkgPod.Deleting || state == pkgPod.ExitedDeleting || state == pkgPod.Exited || state == pkgPod.ExitedGarbage {
+		var pid int
+		pidCh := make(chan int, 1)
+
+		// Wait slightly because the pid file might not be written yet when the state changes to 'Running'.
+		go func() {
+			for {
+				pid, err := p.Pid()
+				if err == nil {
+					pidCh <- pid
+					return
+				}
+				time.Sleep(time.Millisecond * 100)
+			}
+		}()
+
+		select {
+		case pid = <-pidCh:
+		case <-time.After(time.Second):
+			return fmt.Errorf("unable to get PID for pod %q: %v", p.UUID, err)
 		}
 
-		stats, err := p.getExitStatuses()
-		if err != nil {
-			return err
-		}
+		stdout.Printf("pid=%d\nexited=%t", pid, (state == pkgPod.Exited || state == pkgPod.ExitedGarbage))
 
-		stdout.Printf("pid=%d\nexited=%t", pid, p.isExited)
-		for app, stat := range stats {
-			stdout.Printf("app-%s=%d", app, stat)
+		if state != pkgPod.Running {
+			stats, err := getExitStatuses(p)
+			if err != nil {
+				return fmt.Errorf("unable to get exit statuses for pod %q: %v", p.UUID, err)
+			}
+			for app, stat := range stats {
+				stdout.Printf("app-%s=%d", app, stat)
+			}
 		}
 	}
 	return nil
diff --git a/rkt/stop.go b/rkt/stop.go
index 7750943c9a..36806be869 100644
--- a/rkt/stop.go
+++ b/rkt/stop.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/coreos/rkt/stage0"
 
-	"github.com/appc/spec/schema/types"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 )
 
@@ -41,15 +41,13 @@ func init() {
 }
 
 func runStop(cmd *cobra.Command, args []string) (exit int) {
-	var podUUID *types.UUID
-	var podUUIDs []*types.UUID
-	var err error
+	var podUUIDs []string
 	var errors int
 
 	ret := 0
 	switch {
 	case len(args) == 0 && flagUUIDFile != "":
-		podUUID, err = readUUIDFromFile(flagUUIDFile)
+		podUUID, err := pkgPod.ReadUUIDFromFile(flagUUIDFile)
 		if err != nil {
 			stderr.PrintE("unable to resolve UUID from file", err)
 			ret = 1
@@ -58,38 +56,31 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 		}
 
 	case len(args) > 0 && flagUUIDFile == "":
-		for _, uuid := range args {
-			podUUID, err := resolveUUID(uuid)
-			if err != nil {
-				stderr.PrintE("unable to resolve UUID", err)
-				ret = 1
-			} else {
-				podUUIDs = append(podUUIDs, podUUID)
-			}
-		}
+		podUUIDs = args
 
 	default:
 		cmd.Usage()
 		return 1
 	}
 
-	for _, podUUID = range podUUIDs {
-		p, err := getPod(podUUID)
+	for _, podUUID := range podUUIDs {
+		p, err := pkgPod.PodFromUUIDString(getDataDir(), podUUID)
 		if err != nil {
 			errors++
 			stderr.PrintE("cannot get pod", err)
+			continue
 		}
 
-		if !p.isRunning() {
-			stderr.Error(fmt.Errorf("pod %q is not running", p.uuid))
+		if p.State() != pkgPod.Running {
+			stderr.Error(fmt.Errorf("pod %q is not running", p.UUID))
 			errors++
 			continue
 		}
 
-		if err := stage0.StopPod(p.path(), flagForce, podUUID); err == nil {
-			stdout.Printf("%q", p.uuid)
+		if err := stage0.StopPod(p.Path(), flagForce, p.UUID); err == nil {
+			stdout.Printf("%q", p.UUID)
 		} else {
-			stderr.PrintE(fmt.Sprintf("error stopping %q", p.uuid), err)
+			stderr.PrintE(fmt.Sprintf("error stopping %q", p.UUID), err)
 			errors++
 		}
 	}
diff --git a/stage0/app.go b/stage0/app.go
new file mode 100644
index 0000000000..6f8498113e
--- /dev/null
+++ b/stage0/app.go
@@ -0,0 +1,490 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package stage0
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"syscall"
+
+	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/aci"
+	"github.com/coreos/rkt/pkg/user"
+	// FIXME this should not be in stage1 anymore
+	stage1types "github.com/coreos/rkt/stage1/common/types"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+	"github.com/hashicorp/errwrap"
+)
+
+type StartConfig struct {
+	*CommonConfig
+	Dir                  string
+	UsesOverlay          bool
+	AppName              *types.ACName
+	PodPID               int
+	InsecureCapabilities bool // Do not restrict capabilities
+	InsecurePaths        bool // Do not restrict access to files in sysfs or procfs
+	InsecureSeccomp      bool // Do not add seccomp restrictions
+}
+
+type StopConfig struct {
+	*CommonConfig
+	Dir     string
+	AppName *types.ACName
+	PodPID  int
+}
+
+// TODO(iaguis): add override options for Exec, Environment (à la patch-manifest)
+func AddApp(cfg RunConfig, dir string, img *types.Hash) error {
+	im, err := cfg.Store.GetImageManifest(img.String())
+	if err != nil {
+		return err
+	}
+	appName, err := imageNameToAppName(im.Name)
+	if err != nil {
+		return err
+	}
+
+	p, err := stage1types.LoadPod(dir, cfg.UUID)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
+	}
+
+	pm := p.Manifest
+
+	var mutable bool
+	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
+	if ok {
+		mutable, err = strconv.ParseBool(ms)
+		if err != nil {
+			return errwrap.Wrap(errors.New("error parsing mutable annotation"), err)
+		}
+	}
+
+	if !mutable {
+		return errors.New("immutable pod: cannot add application")
+	}
+
+	if pm.Apps.Get(*appName) != nil {
+		return fmt.Errorf("error: multiple apps with name %s", *appName)
+	}
+	if im.App == nil {
+		return fmt.Errorf("error: image %s has no app section)", img)
+	}
+
+	appInfoDir := common.AppInfoPath(dir, *appName)
+	if err := os.MkdirAll(appInfoDir, common.DefaultRegularDirPerm); err != nil {
+		return errwrap.Wrap(errors.New("error creating apps info directory"), err)
+	}
+
+	uidRange := user.NewBlankUidRange()
+	// TODO(iaguis): DRY: refactor this
+	var treeStoreID string
+	if cfg.UseOverlay {
+		treeStoreID, _, err := cfg.TreeStore.Render(img.String(), false)
+		if err != nil {
+			return errwrap.Wrap(errors.New("error rendering tree image"), err)
+		}
+
+		hash, err := cfg.TreeStore.Check(treeStoreID)
+		if err != nil {
+			log.PrintE("warning: tree cache is in a bad state.  Rebuilding...", err)
+			var err error
+			treeStoreID, hash, err = cfg.TreeStore.Render(img.String(), true)
+			if err != nil {
+				return errwrap.Wrap(errors.New("error rendering tree image"), err)
+			}
+		}
+		cfg.RootHash = hash
+
+		if err := ioutil.WriteFile(common.AppTreeStoreIDPath(dir, *appName), []byte(treeStoreID), common.DefaultRegularFilePerm); err != nil {
+			return errwrap.Wrap(errors.New("error writing app treeStoreID"), err)
+		}
+	} else {
+		ad := common.AppPath(dir, *appName)
+
+		err := os.MkdirAll(ad, common.DefaultRegularDirPerm)
+		if err != nil {
+			return errwrap.Wrap(errors.New("error creating image directory"), err)
+		}
+
+		privateUsers, err := preparedWithPrivateUsers(dir)
+		if err != nil {
+			log.FatalE("error reading user namespace information", err)
+		}
+
+		if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
+			return err
+		}
+
+		shiftedUid, shiftedGid, err := uidRange.ShiftRange(uint32(os.Getuid()), uint32(os.Getgid()))
+		if err != nil {
+			return errwrap.Wrap(errors.New("error getting uid, gid"), err)
+		}
+
+		if err := os.Chown(ad, int(shiftedUid), int(shiftedGid)); err != nil {
+			return errwrap.Wrap(fmt.Errorf("error shifting app %q's stage2 dir", *appName), err)
+		}
+
+		if err := aci.RenderACIWithImageID(*img, ad, cfg.Store, uidRange); err != nil {
+			return errwrap.Wrap(errors.New("error rendering ACI"), err)
+		}
+	}
+
+	if err := writeManifest(*cfg.CommonConfig, *img, appInfoDir); err != nil {
+		return errwrap.Wrap(errors.New("error writing manifest"), err)
+	}
+
+	if err := setupAppImage(cfg, *appName, *img, dir, cfg.UseOverlay); err != nil {
+		return fmt.Errorf("error setting up app image: %v", err)
+	}
+
+	if cfg.UseOverlay {
+		imgDir := filepath.Join(dir, "overlay", treeStoreID)
+		if err := os.Chown(imgDir, -1, cfg.RktGid); err != nil {
+			return err
+		}
+	}
+
+	ra := schema.RuntimeApp{
+		Name: *appName,
+		App:  im.App,
+		Image: schema.RuntimeImage{
+			Name:   &im.Name,
+			ID:     *img,
+			Labels: im.Labels,
+		},
+		// TODO(iaguis): default isolators
+	}
+
+	env := ra.App.Environment
+
+	env.Set("AC_APP_NAME", appName.String())
+	envFilePath := filepath.Join(common.Stage1RootfsPath(dir), "rkt", "env", appName.String())
+
+	if err := common.WriteEnvFile(env, uidRange, envFilePath); err != nil {
+		return err
+	}
+
+	apps := append(p.Manifest.Apps, ra)
+	p.Manifest.Apps = apps
+
+	if err := updatePodManifest(dir, p.Manifest); err != nil {
+		return err
+	}
+
+	if _, err := os.Create(common.AppCreatedPath(p.Root, appName.String())); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func updatePodManifest(dir string, newPodManifest *schema.PodManifest) error {
+	pmb, err := json.Marshal(newPodManifest)
+	if err != nil {
+		return err
+	}
+
+	debug("Writing pod manifest")
+	return updateFile(common.PodManifestPath(dir), pmb)
+}
+
+func updateFile(path string, contents []byte) error {
+	fi, err := os.Stat(path)
+	if err != nil {
+		return err
+	}
+
+	f, err := ioutil.TempFile(filepath.Dir(path), "")
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if err := f.Chmod(fi.Mode().Perm()); err != nil {
+		return err
+	}
+
+	if _, err := f.Write(contents); err != nil {
+		return errwrap.Wrap(errors.New("error writing to temp file"), err)
+	}
+
+	if err := os.Rename(f.Name(), path); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func callEntrypoint(dir, entrypoint string, args []string) error {
+	previousDir, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	debug("Pivoting to filesystem %s", dir)
+	if err := os.Chdir(dir); err != nil {
+		return errwrap.Wrap(errors.New("failed changing to dir"), err)
+	}
+
+	ep, err := getStage1Entrypoint(dir, entrypoint)
+	if err != nil {
+		return fmt.Errorf("%q not implemented for pod's stage1: %v", entrypoint, err)
+	}
+	execArgs := []string{filepath.Join(common.Stage1RootfsPath(dir), ep)}
+	debug("Execing %s", ep)
+	execArgs = append(execArgs, args...)
+
+	c := exec.Cmd{
+		Path:   execArgs[0],
+		Args:   execArgs,
+		Stdout: os.Stdout,
+		Stderr: os.Stderr,
+	}
+
+	if err := c.Run(); err != nil {
+		return fmt.Errorf("error executing stage1's app rm: %v", err)
+	}
+
+	if err := os.Chdir(previousDir); err != nil {
+		return errwrap.Wrap(errors.New("failed changing to dir"), err)
+	}
+
+	return nil
+}
+
+// TODO(iaguis): RmConfig?
+func RmApp(dir string, uuid *types.UUID, usesOverlay bool, appName *types.ACName, podPID int) error {
+	p, err := stage1types.LoadPod(dir, uuid)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
+	}
+
+	pm := p.Manifest
+
+	var mutable bool
+	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
+	if ok {
+		mutable, err = strconv.ParseBool(ms)
+		if err != nil {
+			return errwrap.Wrap(errors.New("error parsing mutable annotation"), err)
+		}
+	}
+
+	if !mutable {
+		return errors.New("immutable pod: cannot remove application")
+	}
+
+	app := pm.Apps.Get(*appName)
+	if app == nil {
+		return fmt.Errorf("error: nonexistent app %q", *appName)
+	}
+
+	treeStoreID, err := ioutil.ReadFile(common.AppTreeStoreIDPath(dir, *appName))
+	if err != nil {
+		return err
+	}
+
+	eep, err := getStage1Entrypoint(dir, enterEntrypoint)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
+	}
+
+	args := []string{
+		uuid.String(),
+		appName.String(),
+		filepath.Join(common.Stage1RootfsPath(dir), eep),
+		strconv.Itoa(podPID),
+	}
+
+	if err := callEntrypoint(dir, appStopEntrypoint, args); err != nil {
+		return err
+	}
+
+	if err := callEntrypoint(dir, appRmEntrypoint, args); err != nil {
+		return err
+	}
+
+	appInfoDir := common.AppInfoPath(dir, *appName)
+	if err := os.RemoveAll(appInfoDir); err != nil {
+		return errwrap.Wrap(errors.New("error removing app info directory"), err)
+	}
+
+	if usesOverlay {
+		appRootfs := common.AppRootfsPath(dir, *appName)
+		if err := syscall.Unmount(appRootfs, 0); err != nil {
+			return err
+		}
+
+		ts := filepath.Join(dir, "overlay", string(treeStoreID))
+		if err := os.RemoveAll(ts); err != nil {
+			return errwrap.Wrap(errors.New("error removing app info directory"), err)
+		}
+	}
+
+	if err := os.RemoveAll(common.AppPath(dir, *appName)); err != nil {
+		return err
+	}
+
+	appStatusPath := filepath.Join(common.Stage1RootfsPath(dir), "rkt", "status", appName.String())
+	if err := os.Remove(appStatusPath); err != nil && !os.IsNotExist(err) {
+		return err
+	}
+
+	envPath := filepath.Join(common.Stage1RootfsPath(dir), "rkt", "env", appName.String())
+	if err := os.Remove(envPath); err != nil && !os.IsNotExist(err) {
+		return err
+	}
+
+	removeAppFromPodManifest(pm, appName)
+
+	if err := updatePodManifest(dir, pm); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func removeAppFromPodManifest(pm *schema.PodManifest, appName *types.ACName) {
+	for i, app := range pm.Apps {
+		if app.Name == *appName {
+			pm.Apps = append(pm.Apps[:i], pm.Apps[i+1:]...)
+		}
+	}
+}
+
+func StartApp(cfg StartConfig) error {
+	p, err := stage1types.LoadPod(cfg.Dir, cfg.UUID)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
+	}
+
+	pm := p.Manifest
+
+	var mutable bool
+	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
+	if ok {
+		mutable, err = strconv.ParseBool(ms)
+		if err != nil {
+			return errwrap.Wrap(errors.New("error parsing mutable annotation"), err)
+		}
+	}
+
+	if !mutable {
+		return errors.New("immutable pod: cannot start application")
+	}
+
+	app := pm.Apps.Get(*cfg.AppName)
+	if app == nil {
+		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
+	}
+
+	eep, err := getStage1Entrypoint(cfg.Dir, enterEntrypoint)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
+	}
+
+	args := []string{
+		cfg.UUID.String(),
+		cfg.AppName.String(),
+		filepath.Join(common.Stage1RootfsPath(cfg.Dir), eep),
+		strconv.Itoa(cfg.PodPID),
+	}
+
+	if cfg.InsecureCapabilities {
+		args = append(args, "--disable-capabilities-restriction")
+	}
+	if cfg.InsecurePaths {
+		args = append(args, "--disable-paths")
+	}
+	if cfg.InsecureSeccomp {
+		args = append(args, "--disable-seccomp")
+	}
+
+	privateUsers, err := preparedWithPrivateUsers(cfg.Dir)
+	if err != nil {
+		log.FatalE("error reading user namespace information", err)
+	}
+
+	if privateUsers != "" {
+		args = append(args, fmt.Sprintf("--private-users=%s", privateUsers))
+	}
+
+	if _, err := os.Create(common.AppStartedPath(p.Root, cfg.AppName.String())); err != nil {
+		log.FatalE(fmt.Sprintf("error creating %s-started file", cfg.AppName.String()), err)
+	}
+
+	if err := callEntrypoint(cfg.Dir, appStartEntrypoint, args); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func StopApp(cfg StopConfig) error {
+	p, err := stage1types.LoadPod(cfg.Dir, cfg.UUID)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
+	}
+
+	pm := p.Manifest
+
+	var mutable bool
+	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
+	if ok {
+		mutable, err = strconv.ParseBool(ms)
+		if err != nil {
+			return errwrap.Wrap(errors.New("error parsing mutable annotation"), err)
+		}
+	}
+
+	if !mutable {
+		return errors.New("immutable pod: cannot start application")
+	}
+
+	app := pm.Apps.Get(*cfg.AppName)
+	if app == nil {
+		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
+	}
+
+	eep, err := getStage1Entrypoint(cfg.Dir, enterEntrypoint)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
+	}
+
+	args := []string{
+		cfg.UUID.String(),
+		cfg.AppName.String(),
+		filepath.Join(common.Stage1RootfsPath(cfg.Dir), eep),
+		strconv.Itoa(cfg.PodPID),
+	}
+
+	if err := callEntrypoint(cfg.Dir, appStopEntrypoint, args); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/stage0/entrypoint.go b/stage0/entrypoint.go
index 87e03f1b75..b4457a767d 100644
--- a/stage0/entrypoint.go
+++ b/stage0/entrypoint.go
@@ -32,6 +32,10 @@ const (
 	runEntrypoint   = "coreos.com/rkt/stage1/run"
 	gcEntrypoint    = "coreos.com/rkt/stage1/gc"
 	stopEntrypoint  = "coreos.com/rkt/stage1/stop"
+
+	appRmEntrypoint    = "coreos.com/rkt/stage1/app/rm"
+	appStartEntrypoint = "coreos.com/rkt/stage1/app/start"
+	appStopEntrypoint  = "coreos.com/rkt/stage1/app/stop"
 )
 
 // getStage1Entrypoint retrieves the named entrypoint from the stage1 manifest for a given pod
diff --git a/stage0/run.go b/stage0/run.go
index a9d71d78b0..767ddcea0d 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -102,6 +102,7 @@ type CommonConfig struct {
 	Debug        bool
 	MountLabel   string // selinux label to use for fs
 	ProcessLabel string // selinux label to use
+	Mutable      bool   // whether this pod is mutable
 }
 
 // An etc-hosts file: mapping from IP to arbitrary list of hostnames
@@ -276,6 +277,12 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 	pm.Volumes = cfg.Apps.Volumes
 	pm.Ports = cfg.Ports
 
+	// TODO(sur): add to stage1-implementors-guide and to the spec
+	pm.Annotations = append(pm.Annotations, types.Annotation{
+		Name:  "coreos.com/rkt/stage1/mutable",
+		Value: strconv.FormatBool(cfg.Mutable),
+	})
+
 	pmb, err := json.Marshal(pm)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error marshalling pod manifest"), err)
@@ -401,7 +408,7 @@ func Prepare(cfg PrepareConfig, dir string, uuid *types.UUID) error {
 		return errwrap.Wrap(errors.New("error creating apps info directory"), err)
 	}
 	debug("Preparing stage1")
-	if err := prepareStage1Image(cfg, cfg.Stage1Image, dir, cfg.UseOverlay); err != nil {
+	if err := prepareStage1Image(cfg, dir); err != nil {
 		return errwrap.Wrap(errors.New("error preparing stage1"), err)
 	}
 
@@ -633,6 +640,11 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 		}
 	}
 
+	// TODO(sur): spec out a boolean coreos.com/rkt/stage1/mutable, and introspect here
+	if cfg.Mutable {
+		args = append(args, "--mutable")
+	}
+
 	args = append(args, cfg.UUID.String())
 
 	// make sure the lock fd stays open across exec
@@ -759,13 +771,13 @@ func setupAppImage(cfg RunConfig, appName types.ACName, img types.Hash, cdir str
 // prepareStage1Image renders and verifies tree cache of the given hash
 // when using overlay.
 // When useOverlay is false, it attempts to render and expand the stage1.
-func prepareStage1Image(cfg PrepareConfig, img types.Hash, cdir string, useOverlay bool) error {
+func prepareStage1Image(cfg PrepareConfig, cdir string) error {
 	s1 := common.Stage1ImagePath(cdir)
 	if err := os.MkdirAll(s1, common.DefaultRegularDirPerm); err != nil {
 		return errwrap.Wrap(errors.New("error creating stage1 directory"), err)
 	}
 
-	treeStoreID, _, err := cfg.TreeStore.Render(img.String(), false)
+	treeStoreID, _, err := cfg.TreeStore.Render(cfg.Stage1Image.String(), false)
 	if err != nil {
 		return errwrap.Wrap(errors.New("error rendering tree image"), err)
 	}
@@ -775,7 +787,7 @@ func prepareStage1Image(cfg PrepareConfig, img types.Hash, cdir string, useOverl
 		if err != nil {
 			log.Printf("warning: tree cache is in a bad state: %v. Rebuilding...", err)
 			var err error
-			treeStoreID, hash, err = cfg.TreeStore.Render(img.String(), true)
+			treeStoreID, hash, err = cfg.TreeStore.Render(cfg.Stage1Image.String(), true)
 			if err != nil {
 				return errwrap.Wrap(errors.New("error rendering tree image"), err)
 			}
@@ -783,11 +795,11 @@ func prepareStage1Image(cfg PrepareConfig, img types.Hash, cdir string, useOverl
 		cfg.CommonConfig.RootHash = hash
 	}
 
-	if err := writeManifest(*cfg.CommonConfig, img, s1); err != nil {
+	if err := writeManifest(*cfg.CommonConfig, cfg.Stage1Image, s1); err != nil {
 		return errwrap.Wrap(errors.New("error writing manifest"), err)
 	}
 
-	if !useOverlay {
+	if !cfg.UseOverlay {
 		destRootfs := filepath.Join(s1, "rootfs")
 		cachedTreePath := cfg.TreeStore.GetRootFS(treeStoreID)
 		if err := fileutil.CopyTree(cachedTreePath, destRootfs, cfg.PrivateUsers); err != nil {
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index a5d54ab289..3b575d71dd 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -33,6 +33,18 @@
             "name": "coreos.com/rkt/stage1/stop",
             "value": "@RKT_STAGE1_STOP@"
         },
+        {
+            "name": "coreos.com/rkt/stage1/app/rm",
+            "value": "/app-rm"
+        },
+        {
+            "name": "coreos.com/rkt/stage1/app/start",
+            "value": "/app-start"
+        },
+        {
+            "name": "coreos.com/rkt/stage1/app/stop",
+            "value": "/app-stop"
+        },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
             "value": "4"
diff --git a/stage1/app-rm/app-rm.go b/stage1/app-rm/app-rm.go
new file mode 100644
index 0000000000..978c50115d
--- /dev/null
+++ b/stage1/app-rm/app-rm.go
@@ -0,0 +1,114 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/coreos/rkt/common"
+	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+
+	"github.com/appc/spec/schema/types"
+)
+
+var (
+	debug bool
+	log   *rktlog.Logger
+	diag  *rktlog.Logger
+)
+
+func init() {
+	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+}
+
+// TODO use named flags instead of positional
+func main() {
+	flag.Parse()
+
+	stage1initcommon.InitDebug(debug)
+
+	log, diag, _ = rktlog.NewLogSet("stage1", debug)
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
+	}
+
+	appName, err := types.NewACName(flag.Arg(1))
+	if err != nil {
+		log.PrintE("invalid app name", err)
+		os.Exit(1)
+	}
+
+	enterEP := flag.Arg(2)
+
+	args := []string{enterEP}
+
+	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args = append(args, "/usr/bin/systemctl")
+	args = append(args, "is-active")
+	args = append(args, appName.String())
+
+	cmd := exec.Cmd{
+		Path: args[0],
+		Args: args,
+	}
+
+	// rely only on the output, since it returns non-zero for inactive units
+	out, _ := cmd.Output()
+
+	if string(out) != "inactive\n" {
+		log.Printf("app %q is still running", appName.String())
+		os.Exit(1)
+	}
+
+	s1rootfs := common.Stage1RootfsPath(".")
+	serviceDir := filepath.Join(s1rootfs, "usr", "lib", "systemd", "system")
+	appServicePaths := []string{
+		filepath.Join(serviceDir, appName.String()+".service"),
+		filepath.Join(serviceDir, "reaper-"+appName.String()+".service"),
+	}
+
+	for _, p := range appServicePaths {
+		if err := os.Remove(p); err != nil && !os.IsNotExist(err) {
+			log.PrintE("error removing app service file", err)
+			os.Exit(1)
+		}
+	}
+
+	args = []string{enterEP}
+	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args = append(args, "/usr/bin/systemctl")
+	args = append(args, "daemon-reload")
+
+	cmd = exec.Cmd{
+		Path: args[0],
+		Args: args,
+	}
+	if err := cmd.Run(); err != nil {
+		log.PrintE(`error executing "systemctl daemon-reload"`, err)
+		os.Exit(1)
+	}
+
+	// TODO unmount all the volumes
+
+	os.Exit(0)
+}
diff --git a/stage1/app-rm/app-rm.mk b/stage1/app-rm/app-rm.mk
new file mode 100644
index 0000000000..b96c5ea77b
--- /dev/null
+++ b/stage1/app-rm/app-rm.mk
@@ -0,0 +1 @@
+include stage1/makelib/aci_simple_go_bin.mk
diff --git a/stage1/app-start/app-start.go b/stage1/app-start/app-start.go
new file mode 100644
index 0000000000..53827118ea
--- /dev/null
+++ b/stage1/app-start/app-start.go
@@ -0,0 +1,158 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+
+	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1types "github.com/coreos/rkt/stage1/common/types"
+	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/go-systemd/unit"
+)
+
+var (
+	debug               bool
+	disableCapabilities bool
+	disablePaths        bool
+	disableSeccomp      bool
+	privateUsers        string
+	log                 *rktlog.Logger
+	diag                *rktlog.Logger
+)
+
+func init() {
+	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+	flag.BoolVar(&disableCapabilities, "disable-capabilities-restriction", false, "Disable capability restrictions")
+	flag.BoolVar(&disablePaths, "disable-paths", false, "Disable paths restrictions")
+	flag.BoolVar(&disableSeccomp, "disable-seccomp", false, "Disable seccomp restrictions")
+	flag.StringVar(&privateUsers, "private-users", "", "Run within user namespace. Can be set to [=UIDBASE[:NUIDS]]")
+}
+
+// TODO use named flags instead of positional
+func main() {
+	flag.Parse()
+
+	stage1initcommon.InitDebug(debug)
+
+	log, diag, _ = rktlog.NewLogSet("stage1", debug)
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
+	}
+
+	uuid, err := types.NewUUID(flag.Arg(0))
+	if err != nil {
+		log.PrintE("UUID is missing or malformed", err)
+		os.Exit(1)
+	}
+
+	appName, err := types.NewACName(flag.Arg(1))
+	if err != nil {
+		log.PrintE("invalid app name", err)
+		os.Exit(1)
+	}
+
+	enterEP := flag.Arg(2)
+
+	root := "."
+	p, err := stage1types.LoadPod(root, uuid)
+	if err != nil {
+		log.PrintE("failed to load pod", err)
+		os.Exit(1)
+	}
+
+	insecureOptions := stage1initcommon.Stage1InsecureOptions{
+		DisablePaths:        disablePaths,
+		DisableCapabilities: disableCapabilities,
+		DisableSeccomp:      disableSeccomp,
+	}
+
+	ra := p.Manifest.Apps.Get(*appName)
+	if ra == nil {
+		log.Printf("failed to get app")
+		os.Exit(1)
+	}
+
+	if ra.App.WorkingDirectory == "" {
+		ra.App.WorkingDirectory = "/"
+	}
+
+	binPath, err := stage1initcommon.FindBinPath(p, ra)
+	if err != nil {
+		log.PrintE("failed to find bin path", err)
+		os.Exit(1)
+	}
+
+	w := stage1initcommon.NewUnitWriter(p)
+
+	w.AppUnit(ra, binPath, privateUsers, insecureOptions,
+		unit.NewUnitOption("Unit", "Before", "halt.target"),
+		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
+		unit.NewUnitOption("Service", "StandardOutput", "journal+console"),
+		unit.NewUnitOption("Service", "StandardError", "journal+console"),
+	)
+
+	w.AppReaperUnit(ra.Name, binPath)
+
+	if err := w.Error(); err != nil {
+		log.PrintE("error generating app units", err)
+		os.Exit(1)
+	}
+
+	args := []string{enterEP}
+
+	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args = append(args, "/usr/bin/systemctl")
+	args = append(args, "daemon-reload")
+
+	cmd := exec.Cmd{
+		Path: args[0],
+		Args: args,
+	}
+
+	if err := cmd.Run(); err != nil {
+		log.PrintE("error executing daemon-reload", err)
+		os.Exit(1)
+	}
+
+	args = []string{enterEP}
+
+	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args = append(args, "/usr/bin/systemctl")
+	args = append(args, "start")
+	args = append(args, appName.String())
+
+	cmd = exec.Cmd{
+		Path: args[0],
+		Args: args,
+	}
+
+	if err := cmd.Run(); err != nil {
+		log.PrintE(fmt.Sprintf("error starting app %q", appName.String()), err)
+		os.Exit(1)
+	}
+
+	// TODO unmount all the volumes
+
+	os.Exit(0)
+}
diff --git a/stage1/app-start/app-start.mk b/stage1/app-start/app-start.mk
new file mode 100644
index 0000000000..b96c5ea77b
--- /dev/null
+++ b/stage1/app-start/app-start.mk
@@ -0,0 +1 @@
+include stage1/makelib/aci_simple_go_bin.mk
diff --git a/stage1/app-stop/app-stop.go b/stage1/app-stop/app-stop.go
new file mode 100644
index 0000000000..f90d5457d7
--- /dev/null
+++ b/stage1/app-stop/app-stop.go
@@ -0,0 +1,79 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+
+	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+
+	"github.com/appc/spec/schema/types"
+)
+
+var (
+	debug bool
+	log   *rktlog.Logger
+	diag  *rktlog.Logger
+)
+
+func init() {
+	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+}
+
+// TODO use named flags instead of positional
+func main() {
+	flag.Parse()
+
+	stage1initcommon.InitDebug(debug)
+
+	log, diag, _ = rktlog.NewLogSet("stage1", debug)
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
+	}
+
+	appName, err := types.NewACName(flag.Arg(1))
+	if err != nil {
+		log.PrintE("invalid app name", err)
+		os.Exit(1)
+	}
+
+	enterEP := flag.Arg(2)
+
+	args := []string{enterEP}
+
+	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args = append(args, "/usr/bin/systemctl")
+	args = append(args, "stop")
+	args = append(args, appName.String())
+
+	cmd := exec.Cmd{
+		Path: args[0],
+		Args: args,
+	}
+
+	if err := cmd.Run(); err != nil {
+		log.PrintE(fmt.Sprintf("error stopping app %q", appName.String()), err)
+		os.Exit(1)
+	}
+
+	os.Exit(0)
+}
diff --git a/stage1/app-stop/app-stop.mk b/stage1/app-stop/app-stop.mk
new file mode 100644
index 0000000000..b96c5ea77b
--- /dev/null
+++ b/stage1/app-stop/app-stop.mk
@@ -0,0 +1 @@
+include stage1/makelib/aci_simple_go_bin.mk
diff --git a/stage1/enter/enter.c b/stage1/enter/enter.c
index 9d130e59c5..7a32608f4d 100644
--- a/stage1/enter/enter.c
+++ b/stage1/enter/enter.c
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 		int option_index = 0;
 		static struct option long_options[] = {
 		   {"pid",     required_argument, 0,  'p' },
-		   {"appname", required_argument, 0,  'a' },
+		   {"appname", optional_argument, 0,  'a' },
 		   {0,         0,                 0,  0 }
 		};
 
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 		case '?':
 		default:
 			fprintf(stderr, "Usage: %s --pid=1234 "
-					"--appname=name -- cmd [args...]",
+					"[--appname=name] -- cmd [args...]",
 					argv[0]);
 			exit(1);
 		}
@@ -139,28 +139,33 @@ int main(int argc, char *argv[])
 		char		*args[ENTEREXEC_ARGV_FWD_OFFSET + argc - optind + 1 /* NULL terminator */];
 		int		argsind;
 
-		/* Child goes on to execute /enterexec */
-
-		exit_if(snprintf(root, sizeof(root),
-				 "/opt/stage2/%s/rootfs", appname) == sizeof(root),
-			"Root path overflow");
-
-		exit_if(snprintf(env, sizeof(env),
-				 "/rkt/env/%s", appname) == sizeof(env),
-			"Env path overflow");
-
-		args[0] = "/enterexec";
-		args[1] = root;
-		args[2] = "/";	/* TODO(vc): plumb this into app.WorkingDirectory */
-		args[3] = env;
-		args[4] = "0"; /* uid */
-		args[5] = "0"; /* gid */
-		args[6] = "-e"; /* entering phase */
-		args[7] = "--";
-		argsind = ENTEREXEC_ARGV_FWD_OFFSET;
-		while (optind < argc)
-			args[argsind++] = argv[optind++];
-
+		if (appname == NULL) {
+			argsind = 0;
+			while (optind < argc)
+				args[argsind++] = argv[optind++];
+		} else {
+			/* Child goes on to execute /enterexec */
+
+			exit_if(snprintf(root, sizeof(root),
+				     "/opt/stage2/%s/rootfs", appname) == sizeof(root),
+			    "Root path overflow");
+
+			exit_if(snprintf(env, sizeof(env),
+				     "/rkt/env/%s", appname) == sizeof(env),
+			    "Env path overflow");
+
+			args[0] = "/enterexec";
+			args[1] = root;
+			args[2] = "/";	/* TODO(vc): plumb this into app.WorkingDirectory */
+			args[3] = env;
+			args[4] = "0"; /* uid */
+			args[5] = "0"; /* gid */
+			args[6] = "-e"; /* entering phase */
+			args[7] = "--";
+			argsind = ENTEREXEC_ARGV_FWD_OFFSET;
+			while (optind < argc)
+				args[argsind++] = argv[optind++];
+		}
 		args[argsind] = NULL;
 
 		pexit_if(execv(args[0], args) == -1,
diff --git a/stage1/enter_kvm/enter_kvm.go b/stage1/enter_kvm/enter_kvm.go
index eae9bddb6b..d42cec1867 100644
--- a/stage1/enter_kvm/enter_kvm.go
+++ b/stage1/enter_kvm/enter_kvm.go
@@ -45,6 +45,9 @@ func init() {
 func getAppexecArgs() []string {
 	// Documentation/devel/stage1-implementors-guide.md#arguments-1
 	// also from ../enter/enter.c
+	if appName == "" {
+		return flag.Args()
+	}
 	args := []string{
 		"/enterexec",
 		fmt.Sprintf("/opt/stage2/%s/rootfs", appName),
@@ -68,10 +71,6 @@ func main() {
 		diag.SetOutput(ioutil.Discard)
 	}
 
-	if appName == "" {
-		log.Fatal("--appname not set to correct value")
-	}
-
 	// ExecSSH() should return only with error
 	log.Error(ssh.ExecSSH(getAppexecArgs()))
 
diff --git a/stage1/init/common/path.go b/stage1/init/common/path.go
index ba9605bb8e..c6fbc8764d 100644
--- a/stage1/init/common/path.go
+++ b/stage1/init/common/path.go
@@ -43,6 +43,12 @@ func ServiceUnitPath(root string, appName types.ACName) string {
 	return filepath.Join(common.Stage1RootfsPath(root), UnitsDir, ServiceUnitName(appName))
 }
 
+// ServiceUnitPath returns the path to the systemd service file for the given
+// app name.
+func TargetUnitPath(root string, name string) string {
+	return filepath.Join(common.Stage1RootfsPath(root), UnitsDir, name+".target")
+}
+
 // RelEnvFilePath returns the path to the environment file for the given
 // app name relative to the pod's root.
 func RelEnvFilePath(appName types.ACName) string {
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 1ba56efae2..b521c856b7 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -17,7 +17,6 @@
 package common
 
 import (
-	"bytes"
 	"errors"
 	"fmt"
 	"io"
@@ -38,7 +37,6 @@ import (
 	"github.com/hashicorp/errwrap"
 
 	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/pkg/user"
 )
@@ -49,16 +47,6 @@ const (
 	SharedVolPerm = os.FileMode(0755)
 )
 
-var (
-	defaultEnv = map[string]string{
-		"PATH":    "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-		"SHELL":   "/bin/sh",
-		"USER":    "root",
-		"LOGNAME": "root",
-		"HOME":    "/root",
-	}
-)
-
 type Stage1InsecureOptions struct {
 	DisablePaths        bool
 	DisableCapabilities bool
@@ -102,65 +90,6 @@ func quoteExec(exec []string) string {
 	return strings.Join(qexec, " ")
 }
 
-// WriteDefaultTarget writes the default.target unit file
-// which is responsible for bringing up the applications
-func WriteDefaultTarget(p *stage1commontypes.Pod) error {
-	opts := []*unit.UnitOption{
-		unit.NewUnitOption("Unit", "Description", "rkt apps target"),
-		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
-	}
-
-	for i := range p.Manifest.Apps {
-		ra := &p.Manifest.Apps[i]
-		serviceName := ServiceUnitName(ra.Name)
-		opts = append(opts, unit.NewUnitOption("Unit", "After", serviceName))
-		opts = append(opts, unit.NewUnitOption("Unit", "Wants", serviceName))
-	}
-
-	unitsPath := filepath.Join(common.Stage1RootfsPath(p.Root), UnitsDir)
-	file, err := os.OpenFile(filepath.Join(unitsPath, "default.target"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	if _, err = io.Copy(file, unit.Serialize(opts)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// WritePrepareAppTemplate writes service unit files for preparing the pod's applications
-func WritePrepareAppTemplate(p *stage1commontypes.Pod) error {
-	opts := []*unit.UnitOption{
-		unit.NewUnitOption("Unit", "Description", "Prepare minimum environment for chrooted applications"),
-		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
-		unit.NewUnitOption("Unit", "OnFailureJobMode", "fail"),
-		unit.NewUnitOption("Unit", "Requires", "systemd-journald.service"),
-		unit.NewUnitOption("Unit", "After", "systemd-journald.service"),
-		unit.NewUnitOption("Service", "Type", "oneshot"),
-		unit.NewUnitOption("Service", "Restart", "no"),
-		unit.NewUnitOption("Service", "ExecStart", "/prepare-app %I"),
-		unit.NewUnitOption("Service", "User", "0"),
-		unit.NewUnitOption("Service", "Group", "0"),
-		unit.NewUnitOption("Service", "CapabilityBoundingSet", "CAP_SYS_ADMIN CAP_DAC_OVERRIDE"),
-	}
-
-	unitsPath := filepath.Join(common.Stage1RootfsPath(p.Root), UnitsDir)
-	file, err := os.OpenFile(filepath.Join(unitsPath, "prepare-app@.service"), os.O_WRONLY|os.O_CREATE, 0644)
-	if err != nil {
-		return errwrap.Wrap(errors.New("failed to create service unit file"), err)
-	}
-	defer file.Close()
-
-	if _, err = io.Copy(file, unit.Serialize(opts)); err != nil {
-		return errwrap.Wrap(errors.New("failed to write service unit file"), err)
-	}
-
-	return nil
-}
-
 func writeAppReaper(p *stage1commontypes.Pod, appName string, appRootDirectory string, binPath string) error {
 	opts := []*unit.UnitOption{
 		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("%s Reaper", appName)),
@@ -286,7 +215,7 @@ func generateSysusers(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uid_ int,
 		return err
 	}
 
-	if err := shiftFiles(toShift, uidRange); err != nil {
+	if err := user.ShiftFiles(toShift, uidRange); err != nil {
 		return err
 	}
 
@@ -337,10 +266,16 @@ func appSearchPaths(p *stage1commontypes.Pod, workDir string, app types.App) []s
 	return []string{workDir, "/bin", "/usr/bin"}
 }
 
-// findBinPath takes a binary path and returns a the absolute path of the
+// FindBinPath takes a binary path and returns a the absolute path of the
 // binary relative to the app rootfs. This can be passed to ExecStart on the
 // app's systemd service file directly.
-func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App, workDir string, bin string) (string, error) {
+func FindBinPath(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (string, error) {
+	if len(ra.App.Exec) == 0 {
+		return "", errors.New("app has no executable")
+	}
+
+	bin := ra.App.Exec[0]
+
 	var binPath string
 	switch {
 	// absolute path, just use it
@@ -348,18 +283,18 @@ func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App,
 		binPath = bin
 	// non-absolute path containing a slash, look in the working dir
 	case strings.Contains(bin, "/"):
-		binPath = filepath.Join(workDir, bin)
+		binPath = filepath.Join(ra.App.WorkingDirectory, bin)
 	// filename, search in the app's $PATH
 	default:
 		absRoot, err := filepath.Abs(p.Root)
 		if err != nil {
 			return "", errwrap.Wrap(errors.New("could not get pod's root absolute path"), err)
 		}
-		appRootfs := common.AppRootfsPath(absRoot, appName)
-		appPathDirs := appSearchPaths(p, workDir, app)
+		appRootfs := common.AppRootfsPath(absRoot, ra.Name)
+		appPathDirs := appSearchPaths(p, ra.App.WorkingDirectory, *ra.App)
 		appPath := strings.Join(appPathDirs, ":")
 
-		binPath, err = lookupPathInsideApp(bin, appPath, appRootfs, workDir)
+		binPath, err = lookupPathInsideApp(bin, appPath, appRootfs, ra.App.WorkingDirectory)
 		if err != nil {
 			return "", errwrap.Wrap(fmt.Errorf("error looking up %q", bin), err)
 		}
@@ -368,18 +303,6 @@ func findBinPath(p *stage1commontypes.Pod, appName types.ACName, app types.App,
 	return binPath, nil
 }
 
-// shiftFiles shifts filesToshift by the amounts specified in uidRange
-func shiftFiles(filesToShift []string, uidRange *user.UidRange) error {
-	if uidRange.Shift != 0 && uidRange.Count != 0 {
-		for _, f := range filesToShift {
-			if err := os.Chown(f, int(uidRange.Shift), int(uidRange.Shift)); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
 // generateDeviceAllows generates a DeviceAllow= line for an app.
 // To make it work, the path needs to start with "/dev" but the device won't
 // exist inside the container. So for a given mount, if the volume is a device
@@ -393,7 +316,7 @@ func generateDeviceAllows(root string, appName types.ACName, mountPoints []types
 	if err := os.MkdirAll(rktVolumeLinksPath, 0600); err != nil {
 		return nil, err
 	}
-	if err := shiftFiles([]string{rktVolumeLinksPath}, uidRange); err != nil {
+	if err := user.ShiftFiles([]string{rktVolumeLinksPath}, uidRange); err != nil {
 		return nil, err
 	}
 
@@ -441,289 +364,6 @@ func supportsNotify(p *stage1commontypes.Pod, appName string) bool {
 	return false
 }
 
-// appToSystemd transforms the provided RuntimeApp+ImageManifest into systemd units
-func appToSystemd(p *stage1commontypes.Pod, ra *schema.RuntimeApp, interactive bool, flavor string, privateUsers string, insecureOptions Stage1InsecureOptions) error {
-	app := ra.App
-	appName := ra.Name
-	imgName := p.AppNameToImageName(appName)
-
-	if len(app.Exec) == 0 {
-		return fmt.Errorf(`image %q has an empty "exec" (try --exec=BINARY)`, imgName)
-	}
-
-	workDir := "/"
-	if app.WorkingDirectory != "" {
-		workDir = app.WorkingDirectory
-	}
-
-	env := app.Environment
-
-	env.Set("AC_APP_NAME", appName.String())
-	if p.MetadataServiceURL != "" {
-		env.Set("AC_METADATA_URL", p.MetadataServiceURL)
-	}
-
-	envFilePath := EnvFilePath(p.Root, appName)
-
-	uidRange := user.NewBlankUidRange()
-	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
-		return err
-	}
-
-	if err := writeEnvFile(p, env, appName, uidRange, '\n', envFilePath); err != nil {
-		return errwrap.Wrap(errors.New("unable to write environment file for systemd"), err)
-	}
-
-	u, g, err := parseUserGroup(p, ra, uidRange)
-	if err != nil {
-		return err
-	}
-
-	if err := generateSysusers(p, ra, u, g, uidRange); err != nil {
-		return errwrap.Wrap(errors.New("unable to generate sysusers"), err)
-	}
-
-	binPath, err := findBinPath(p, appName, *app, workDir, app.Exec[0])
-	if err != nil {
-		return err
-	}
-
-	var supplementaryGroups []string
-	for _, g := range app.SupplementaryGIDs {
-		supplementaryGroups = append(supplementaryGroups, strconv.Itoa(g))
-	}
-
-	capabilitiesStr, err := getAppCapabilities(app.Isolators)
-	if err != nil {
-		return err
-	}
-
-	execStart := append([]string{binPath}, app.Exec[1:]...)
-	execStartString := quoteExec(execStart)
-	opts := []*unit.UnitOption{
-		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Application=%v Image=%v", appName, imgName)),
-		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
-		unit.NewUnitOption("Unit", "Wants", fmt.Sprintf("reaper-%s.service", appName)),
-		unit.NewUnitOption("Service", "Restart", "no"),
-		unit.NewUnitOption("Service", "ExecStart", execStartString),
-		unit.NewUnitOption("Service", "RootDirectory", common.RelAppRootfsPath(appName)),
-		// MountFlags=shared creates a new mount namespace and (as unintuitive
-		// as it might seem) makes sure the mount is slave+shared.
-		unit.NewUnitOption("Service", "MountFlags", "shared"),
-		unit.NewUnitOption("Service", "WorkingDirectory", workDir),
-		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePath(appName)),
-		unit.NewUnitOption("Service", "User", strconv.Itoa(u)),
-		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
-		unit.NewUnitOption("Service", "SupplementaryGroups", strings.Join(supplementaryGroups, " ")),
-		// This helps working around a race
-		// (https://github.com/systemd/systemd/issues/2913) that causes the
-		// systemd unit name not getting written to the journal if the unit is
-		// short-lived and runs as non-root.
-		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
-	}
-
-	if supportsNotify(p, appName.String()) {
-		opts = append(opts, unit.NewUnitOption("Service", "Type", "notify"))
-	}
-
-	if !insecureOptions.DisableCapabilities {
-		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
-	}
-
-	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
-
-	// Apply seccomp isolator, if any and not opt-ing out;
-	// see https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
-	if !insecureOptions.DisableSeccomp {
-		var forceNoNewPrivileges bool
-
-		unprivileged := (u != 0)
-		opts, forceNoNewPrivileges, err = getSeccompFilter(opts, p, unprivileged, app.Isolators)
-		if err != nil {
-			return err
-		}
-
-		// Seccomp filters require NoNewPrivileges for unprivileged apps, that may override
-		// manifest annotation.
-		if forceNoNewPrivileges {
-			noNewPrivileges = true
-		}
-	}
-
-	opts = append(opts, unit.NewUnitOption("Service", "NoNewPrivileges", strconv.FormatBool(noNewPrivileges)))
-
-	if ra.ReadOnlyRootFS {
-		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", common.RelAppRootfsPath(appName)))
-	}
-
-	// TODO(tmrts): Extract this logic into a utility function.
-	vols := make(map[types.ACName]types.Volume)
-	for _, v := range p.Manifest.Volumes {
-		vols[v.Name] = v
-	}
-
-	absRoot, err := filepath.Abs(p.Root) // Absolute path to the pod's rootfs.
-	if err != nil {
-		return err
-	}
-	appRootfs := common.AppRootfsPath(absRoot, appName)
-
-	rwDirs := []string{}
-	imageManifest := p.Images[appName.String()]
-	mounts := GenerateMounts(ra, vols, imageManifest)
-	for _, m := range mounts {
-		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Path)
-		if err != nil {
-			return err
-		}
-
-		if !IsMountReadOnly(vols[m.Volume], app.MountPoints) {
-			rwDirs = append(rwDirs, filepath.Join(common.RelAppRootfsPath(appName), mntPath))
-		}
-	}
-
-	// Restrict access to sensitive paths (eg. procfs) and devices. For kvm flavor,
-	// these paths are stored inside the vm, without influence to the host.
-	if !insecureOptions.DisablePaths && flavor != "kvm" {
-		opts = protectSystemFiles(opts, appName)
-		opts = append(opts, unit.NewUnitOption("Service", "DevicePolicy", "closed"))
-		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(absRoot), appName, app.MountPoints, mounts, vols, uidRange)
-		if err != nil {
-			return err
-		}
-		for _, dev := range deviceAllows {
-			opts = append(opts, unit.NewUnitOption("Service", "DeviceAllow", dev))
-		}
-	}
-
-	opts = append(opts, unit.NewUnitOption("Service", "ReadWriteDirectories", strings.Join(rwDirs, " ")))
-
-	if interactive {
-		opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "tty"))
-		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "tty"))
-		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "tty"))
-	} else {
-		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "journal+console"))
-		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "journal+console"))
-	}
-
-	// When an app fails, we shut down the pod
-	opts = append(opts, unit.NewUnitOption("Unit", "OnFailure", "halt.target"))
-
-	for _, eh := range app.EventHandlers {
-		var typ string
-		switch eh.Name {
-		case "pre-start":
-			typ = "ExecStartPre"
-		case "post-stop":
-			typ = "ExecStopPost"
-		default:
-			return fmt.Errorf("unrecognized eventHandler: %v", eh.Name)
-		}
-		exec := quoteExec(eh.Exec)
-		opts = append(opts, unit.NewUnitOption("Service", typ, exec))
-	}
-
-	// Some pre-start jobs take a long time, set the timeout to 0
-	opts = append(opts, unit.NewUnitOption("Service", "TimeoutStartSec", "0"))
-
-	var saPorts []types.Port
-	for _, p := range app.Ports {
-		if p.SocketActivated {
-			saPorts = append(saPorts, p)
-		}
-	}
-
-	for _, i := range app.Isolators {
-		switch v := i.Value().(type) {
-		case *types.ResourceMemory:
-			opts, err = cgroup.MaybeAddIsolator(opts, "memory", v.Limit())
-			if err != nil {
-				return err
-			}
-		case *types.ResourceCPU:
-			opts, err = cgroup.MaybeAddIsolator(opts, "cpu", v.Limit())
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	if len(saPorts) > 0 {
-		sockopts := []*unit.UnitOption{
-			unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Application=%v Image=%v %s", appName, imgName, "socket-activated ports")),
-			unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
-			unit.NewUnitOption("Socket", "BindIPv6Only", "both"),
-			unit.NewUnitOption("Socket", "Service", ServiceUnitName(appName)),
-		}
-
-		for _, sap := range saPorts {
-			var proto string
-			switch sap.Protocol {
-			case "tcp":
-				proto = "ListenStream"
-			case "udp":
-				proto = "ListenDatagram"
-			default:
-				return fmt.Errorf("unrecognized protocol: %v", sap.Protocol)
-			}
-			// We find the host port for the pod's port and use that in the
-			// socket unit file.
-			// This is so because systemd inside the pod will match based on
-			// the socket port number, and since the socket was created on the
-			// host, it will have the host port number.
-			port := findHostPort(*p.Manifest, sap.Name)
-			if port == 0 {
-				log.Printf("warning: no --port option for socket-activated port %q, assuming port %d as specified in the manifest", sap.Name, sap.Port)
-				port = sap.Port
-			}
-			sockopts = append(sockopts, unit.NewUnitOption("Socket", proto, fmt.Sprintf("%v", port)))
-		}
-
-		file, err := os.OpenFile(SocketUnitPath(p.Root, appName), os.O_WRONLY|os.O_CREATE, 0644)
-		if err != nil {
-			return errwrap.Wrap(errors.New("failed to create socket file"), err)
-		}
-		defer file.Close()
-
-		if _, err = io.Copy(file, unit.Serialize(sockopts)); err != nil {
-			return errwrap.Wrap(errors.New("failed to write socket unit file"), err)
-		}
-
-		if err = os.Symlink(path.Join("..", SocketUnitName(appName)), SocketWantPath(p.Root, appName)); err != nil {
-			return errwrap.Wrap(errors.New("failed to link socket want"), err)
-		}
-
-		opts = append(opts, unit.NewUnitOption("Unit", "Requires", SocketUnitName(appName)))
-	}
-
-	opts = append(opts, unit.NewUnitOption("Unit", "Requires", InstantiatedPrepareAppUnitName(appName)))
-	opts = append(opts, unit.NewUnitOption("Unit", "After", InstantiatedPrepareAppUnitName(appName)))
-
-	opts = append(opts, unit.NewUnitOption("Unit", "Requires", "sysusers.service"))
-	opts = append(opts, unit.NewUnitOption("Unit", "After", "sysusers.service"))
-
-	file, err := os.OpenFile(ServiceUnitPath(p.Root, appName), os.O_WRONLY|os.O_CREATE, 0644)
-	if err != nil {
-		return errwrap.Wrap(errors.New("failed to create service unit file"), err)
-	}
-	defer file.Close()
-
-	if _, err = io.Copy(file, unit.Serialize(opts)); err != nil {
-		return errwrap.Wrap(errors.New("failed to write service unit file"), err)
-	}
-
-	if err = os.Symlink(path.Join("..", ServiceUnitName(appName)), ServiceWantPath(p.Root, appName)); err != nil {
-		return errwrap.Wrap(errors.New("failed to link service want"), err)
-	}
-
-	if err = writeAppReaper(p, appName.String(), common.RelAppRootfsPath(appName), binPath); err != nil {
-		return errwrap.Wrap(fmt.Errorf("failed to write app %q reaper service", appName), err)
-	}
-
-	return nil
-}
-
 // parseUserGroup parses the User and Group fields of an App and returns its
 // UID and GID.
 // The User and Group fields accept several formats:
@@ -776,104 +416,6 @@ func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uidRange *u
 	return uid, gid, nil
 }
 
-func writeShutdownService(p *stage1commontypes.Pod) error {
-	flavor, systemdVersion, err := GetFlavor(p)
-	if err != nil {
-		return err
-	}
-
-	opts := []*unit.UnitOption{
-		unit.NewUnitOption("Unit", "Description", "Pod shutdown"),
-		unit.NewUnitOption("Unit", "AllowIsolate", "true"),
-		unit.NewUnitOption("Unit", "StopWhenUnneeded", "yes"),
-		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
-		unit.NewUnitOption("Service", "RemainAfterExit", "yes"),
-
-		// The default stdout is /dev/console (the tty created by nspawn).
-		// But the tty might be destroyed if rkt is executed via ssh and
-		// the user terminates the ssh session. We still want
-		// shutdown.service to succeed in that case, so don't use
-		// /dev/console.
-		unit.NewUnitOption("Service", "StandardInput", "null"),
-		unit.NewUnitOption("Service", "StandardOutput", "null"),
-		unit.NewUnitOption("Service", "StandardError", "null"),
-	}
-
-	shutdownVerb := "exit"
-	// systemd <v227 doesn't allow the "exit" verb when running as PID 1, so
-	// use "halt".
-	// If systemdVersion is 0 it means it couldn't be guessed, assume it's new
-	// enough for "systemctl exit".
-	// This can happen, for example, when building rkt with:
-	//
-	// ./configure --with-stage1-flavors=src --with-stage1-systemd-version=master
-	//
-	// The patches for the "exit" verb are backported to the "coreos" flavor, so
-	// don't rely on the systemd version on the "coreos" flavor.
-	if flavor != "coreos" && systemdVersion != 0 && systemdVersion < 227 {
-		shutdownVerb = "halt"
-	}
-
-	opts = append(opts, unit.NewUnitOption("Service", "ExecStop", fmt.Sprintf("/usr/bin/systemctl --force %s", shutdownVerb)))
-
-	unitsPath := filepath.Join(common.Stage1RootfsPath(p.Root), UnitsDir)
-	file, err := os.OpenFile(filepath.Join(unitsPath, "shutdown.service"), os.O_WRONLY|os.O_CREATE, 0644)
-	if err != nil {
-		return errwrap.Wrap(errors.New("failed to create unit file"), err)
-	}
-	defer file.Close()
-
-	if _, err = io.Copy(file, unit.Serialize(opts)); err != nil {
-		return errwrap.Wrap(errors.New("failed to write unit file"), err)
-	}
-
-	return nil
-}
-
-// writeEnvFile creates an environment file for given app name, the minimum
-// required environment variables by the appc spec will be set to sensible
-// defaults here if they're not provided by env.
-func writeEnvFile(p *stage1commontypes.Pod, env types.Environment, appName types.ACName, uidRange *user.UidRange, separator byte, envFilePath string) error {
-	ef := bytes.Buffer{}
-
-	for dk, dv := range defaultEnv {
-		if _, exists := env.Get(dk); !exists {
-			fmt.Fprintf(&ef, "%s=%s%c", dk, dv, separator)
-		}
-	}
-
-	for _, e := range env {
-		fmt.Fprintf(&ef, "%s=%s%c", e.Name, e.Value, separator)
-	}
-
-	if err := ioutil.WriteFile(envFilePath, ef.Bytes(), 0644); err != nil {
-		return err
-	}
-
-	if err := shiftFiles([]string{envFilePath}, uidRange); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// PodToSystemd creates the appropriate systemd service unit files for
-// all the constituent apps of the Pod
-func PodToSystemd(p *stage1commontypes.Pod, interactive bool, flavor string, privateUsers string, insecureOptions Stage1InsecureOptions) error {
-	for i := range p.Manifest.Apps {
-		ra := &p.Manifest.Apps[i]
-		if err := appToSystemd(p, ra, interactive, flavor, privateUsers, insecureOptions); err != nil {
-			return errwrap.Wrap(fmt.Errorf("failed to transform app %q into systemd service", ra.Name), err)
-		}
-	}
-
-	if err := writeShutdownService(p); err != nil {
-		return errwrap.Wrap(errors.New("failed to write shutdown service"), err)
-	}
-
-	return nil
-}
-
 // EvaluateSymlinksInsideApp tries to resolve symlinks within the path.
 // It returns the actual path relative to the app rootfs for the given path.
 func EvaluateSymlinksInsideApp(appRootfs, path string) (string, error) {
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
new file mode 100644
index 0000000000..52884e80aa
--- /dev/null
+++ b/stage1/init/common/units.go
@@ -0,0 +1,583 @@
+// Copyright 2014 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package common
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common/cgroup"
+	"github.com/coreos/rkt/pkg/user"
+	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
+
+	"github.com/coreos/go-systemd/unit"
+	"github.com/coreos/rkt/common"
+	"github.com/hashicorp/errwrap"
+)
+
+func MutableEnv(p *stage1commontypes.Pod) error {
+	w := NewUnitWriter(p)
+
+	w.WriteUnit(
+		TargetUnitPath(p.Root, "default"),
+		"failed to write default.target",
+		unit.NewUnitOption("Unit", "Description", "rkt apps target"),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Unit", "Requires", "systemd-journald.service"),
+		unit.NewUnitOption("Unit", "After", "systemd-journald.service"),
+		unit.NewUnitOption("Unit", "Before", "halt.target"),
+		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
+	)
+
+	w.WriteUnit(
+		ServiceUnitPath(p.Root, "prepare-app@"),
+		"failed to write prepare-app service template",
+		unit.NewUnitOption("Unit", "Description", "Prepare minimum environment for chrooted applications"),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Unit", "OnFailureJobMode", "fail"),
+		unit.NewUnitOption("Service", "Type", "oneshot"),
+		unit.NewUnitOption("Service", "Restart", "no"),
+		unit.NewUnitOption("Service", "ExecStart", "/prepare-app %I"),
+		unit.NewUnitOption("Service", "User", "0"),
+		unit.NewUnitOption("Service", "Group", "0"),
+		unit.NewUnitOption("Service", "CapabilityBoundingSet", "CAP_SYS_ADMIN CAP_DAC_OVERRIDE"),
+	)
+
+	w.WriteUnit(
+		TargetUnitPath(p.Root, "halt"),
+		"failed to write halt target",
+		unit.NewUnitOption("Unit", "Description", "Halt"),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Unit", "AllowIsolate", "true"),
+		unit.NewUnitOption("Unit", "Requires", "shutdown.service"),
+		unit.NewUnitOption("Unit", "After", "shutdown.service"),
+	)
+
+	w.writeShutdownService(
+		"ExecStart",
+		unit.NewUnitOption("Unit", "Description", "Pod shutdown"),
+		unit.NewUnitOption("Unit", "AllowIsolate", "true"),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Service", "RemainAfterExit", "yes"),
+	)
+
+	return w.Error()
+}
+
+func ImmutableEnv(p *stage1commontypes.Pod, interactive bool, privateUsers string, insecureOptions Stage1InsecureOptions) error {
+	w := NewUnitWriter(p)
+
+	opts := []*unit.UnitOption{
+		unit.NewUnitOption("Unit", "Description", "rkt apps target"),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+	}
+
+	for i := range p.Manifest.Apps {
+		ra := &p.Manifest.Apps[i]
+		serviceName := ServiceUnitName(ra.Name)
+		opts = append(opts, unit.NewUnitOption("Unit", "After", serviceName))
+		opts = append(opts, unit.NewUnitOption("Unit", "Wants", serviceName))
+	}
+
+	w.WriteUnit(
+		TargetUnitPath(p.Root, "default"),
+		"failed to write default.target",
+		opts...,
+	)
+
+	w.WriteUnit(
+		ServiceUnitPath(p.Root, "prepare-app@"),
+		"failed to write prepare-app service template",
+		unit.NewUnitOption("Unit", "Description", "Prepare minimum environment for chrooted applications"),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Unit", "OnFailureJobMode", "fail"),
+		unit.NewUnitOption("Unit", "Requires", "systemd-journald.service"),
+		unit.NewUnitOption("Unit", "After", "systemd-journald.service"),
+		unit.NewUnitOption("Service", "Type", "oneshot"),
+		unit.NewUnitOption("Service", "Restart", "no"),
+		unit.NewUnitOption("Service", "ExecStart", "/prepare-app %I"),
+		unit.NewUnitOption("Service", "User", "0"),
+		unit.NewUnitOption("Service", "Group", "0"),
+		unit.NewUnitOption("Service", "CapabilityBoundingSet", "CAP_SYS_ADMIN CAP_DAC_OVERRIDE"),
+	)
+
+	w.WriteUnit(
+		TargetUnitPath(p.Root, "halt"),
+		"failed to write halt target",
+		unit.NewUnitOption("Unit", "Description", "Halt"),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Unit", "AllowIsolate", "true"),
+	)
+
+	w.writeShutdownService(
+		"ExecStop",
+		unit.NewUnitOption("Unit", "Description", "Pod shutdown"),
+		unit.NewUnitOption("Unit", "AllowIsolate", "true"),
+		unit.NewUnitOption("Unit", "StopWhenUnneeded", "yes"),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Service", "RemainAfterExit", "yes"),
+	)
+
+	if err := w.Error(); err != nil {
+		return err
+	}
+
+	for i := range p.Manifest.Apps {
+		ra := &p.Manifest.Apps[i]
+
+		if ra.App.WorkingDirectory == "" {
+			ra.App.WorkingDirectory = "/"
+		}
+
+		binPath, err := FindBinPath(p, ra)
+		if err != nil {
+			return err
+		}
+
+		var opts []*unit.UnitOption
+		if interactive {
+			opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "tty"))
+			opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "tty"))
+			opts = append(opts, unit.NewUnitOption("Service", "StandardError", "tty"))
+		} else {
+			opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "journal+console"))
+			opts = append(opts, unit.NewUnitOption("Service", "StandardError", "journal+console"))
+		}
+		w.AppUnit(ra, binPath, privateUsers, insecureOptions, opts...)
+
+		w.AppReaperUnit(ra.Name, binPath,
+			unit.NewUnitOption("Unit", "Wants", "shutdown.service"),
+			unit.NewUnitOption("Unit", "After", "shutdown.service"),
+		)
+	}
+
+	return w.Error()
+}
+
+// UnitWriter is the type that writes systemd units preserving the first previously occured error.
+// Any method of this type can be invoked multiple times without error checking.
+// If a previous invocation generated an error, any invoked method will be skipped.
+// If an error occured during method invocations, it can be retrieved using Error().
+type UnitWriter struct {
+	err error
+	p   *stage1commontypes.Pod
+}
+
+// NewUnitWriter returns a new UnitWriter for the given pod.
+func NewUnitWriter(p *stage1commontypes.Pod) *UnitWriter {
+	return &UnitWriter{p: p}
+}
+
+// WriteUnit writes a systemd unit in the given path with the given unit options
+// if no previous error occured.
+func (uw *UnitWriter) WriteUnit(path string, errmsg string, opts ...*unit.UnitOption) {
+	if uw.err != nil {
+		return
+	}
+
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	if err != nil {
+		uw.err = errwrap.Wrap(errors.New(errmsg), err)
+		return
+	}
+	defer file.Close()
+
+	if _, err = io.Copy(file, unit.Serialize(opts)); err != nil {
+		uw.err = errwrap.Wrap(errors.New(errmsg), err)
+	}
+}
+
+// writeShutdownService writes a shutdown.service unit with the given unit options
+// if no previous error occured.
+// exec specifies how systemctl should be invoked, i.e. ExecStart, or ExecStop.
+func (uw *UnitWriter) writeShutdownService(exec string, opts ...*unit.UnitOption) {
+	if uw.err != nil {
+		return
+	}
+
+	flavor, systemdVersion, err := GetFlavor(uw.p)
+	if err != nil {
+		uw.err = errwrap.Wrap(errors.New("failed to create shutdown service"), err)
+		return
+	}
+
+	opts = append(opts, []*unit.UnitOption{
+		// The default stdout is /dev/console (the tty created by nspawn).
+		// But the tty might be destroyed if rkt is executed via ssh and
+		// the user terminates the ssh session. We still want
+		// shutdown.service to succeed in that case, so don't use
+		// /dev/console.
+		unit.NewUnitOption("Service", "StandardInput", "null"),
+		unit.NewUnitOption("Service", "StandardOutput", "null"),
+		unit.NewUnitOption("Service", "StandardError", "null"),
+	}...)
+
+	shutdownVerb := "exit"
+	// systemd <v227 doesn't allow the "exit" verb when running as PID 1, so
+	// use "halt".
+	// If systemdVersion is 0 it means it couldn't be guessed, assume it's new
+	// enough for "systemctl exit".
+	// This can happen, for example, when building rkt with:
+	//
+	// ./configure --with-stage1-flavors=src --with-stage1-systemd-version=master
+	//
+	// The patches for the "exit" verb are backported to the "coreos" flavor, so
+	// don't rely on the systemd version on the "coreos" flavor.
+	if flavor != "coreos" && systemdVersion != 0 && systemdVersion < 227 {
+		shutdownVerb = "halt"
+	}
+
+	opts = append(
+		opts,
+		unit.NewUnitOption("Service", exec, fmt.Sprintf("/usr/bin/systemctl --force %s", shutdownVerb)),
+	)
+
+	uw.WriteUnit(
+		ServiceUnitPath(uw.p.Root, "shutdown"),
+		"failed to create shutdown service",
+		opts...,
+	)
+}
+
+// Activate actives the given unit in the given wantPath.
+func (uw *UnitWriter) Activate(unit, wantPath string) {
+	if uw.err != nil {
+		return
+	}
+
+	if err := os.Symlink(path.Join("..", unit), wantPath); err != nil && !os.IsExist(err) {
+		uw.err = errwrap.Wrap(errors.New("failed to link service want"), err)
+	}
+}
+
+// error returns the first error that occured during write* invocations.
+func (uw *UnitWriter) Error() error {
+	return uw.err
+}
+
+func (uw *UnitWriter) AppUnit(
+	ra *schema.RuntimeApp, binPath, privateUsers string, insecureOptions Stage1InsecureOptions,
+	opts ...*unit.UnitOption,
+) {
+	if uw.err != nil {
+		return
+	}
+
+	flavor, _, err := GetFlavor(uw.p)
+	if err != nil {
+		uw.err = errwrap.Wrap(errors.New("failed to create shutdown service"), err)
+		return
+	}
+
+	app := ra.App
+	appName := ra.Name
+	imgName := uw.p.AppNameToImageName(appName)
+
+	if len(app.Exec) == 0 {
+		uw.err = fmt.Errorf(`image %q has an empty "exec" (try --exec=BINARY)`, imgName)
+		return
+	}
+
+	env := app.Environment
+
+	env.Set("AC_APP_NAME", appName.String())
+	if uw.p.MetadataServiceURL != "" {
+		env.Set("AC_METADATA_URL", uw.p.MetadataServiceURL)
+	}
+
+	envFilePath := EnvFilePath(uw.p.Root, appName)
+
+	uidRange := user.NewBlankUidRange()
+	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
+		uw.err = err
+		return
+	}
+
+	if err := common.WriteEnvFile(env, uidRange, envFilePath); err != nil {
+		uw.err = errwrap.Wrap(errors.New("unable to write environment file for systemd"), err)
+		return
+	}
+
+	u, g, err := parseUserGroup(uw.p, ra, uidRange)
+	if err != nil {
+		uw.err = err
+		return
+	}
+
+	if err := generateSysusers(uw.p, ra, u, g, uidRange); err != nil {
+		uw.err = errwrap.Wrap(errors.New("unable to generate sysusers"), err)
+		return
+	}
+
+	var supplementaryGroups []string
+	for _, g := range app.SupplementaryGIDs {
+		supplementaryGroups = append(supplementaryGroups, strconv.Itoa(g))
+	}
+
+	capabilitiesStr, err := getAppCapabilities(app.Isolators)
+	if err != nil {
+		uw.err = err
+		return
+	}
+
+	execStart := append([]string{binPath}, app.Exec[1:]...)
+	execStartString := quoteExec(execStart)
+	opts = append(opts, []*unit.UnitOption{
+		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Application=%v Image=%v", appName, imgName)),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Unit", "Wants", fmt.Sprintf("reaper-%s.service", appName)),
+		unit.NewUnitOption("Service", "Restart", "no"),
+		unit.NewUnitOption("Service", "ExecStart", execStartString),
+		unit.NewUnitOption("Service", "RootDirectory", common.RelAppRootfsPath(appName)),
+		// MountFlags=shared creates a new mount namespace and (as unintuitive
+		// as it might seem) makes sure the mount is slave+shared.
+		unit.NewUnitOption("Service", "MountFlags", "shared"),
+		unit.NewUnitOption("Service", "WorkingDirectory", app.WorkingDirectory),
+		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePath(appName)),
+		unit.NewUnitOption("Service", "User", strconv.Itoa(u)),
+		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
+		unit.NewUnitOption("Service", "SupplementaryGroups", strings.Join(supplementaryGroups, " ")),
+
+		// This helps working around a race
+		// (https://github.com/systemd/systemd/issues/2913) that causes the
+		// systemd unit name not getting written to the journal if the unit is
+		// short-lived and runs as non-root.
+		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
+	}...)
+
+	if supportsNotify(uw.p, appName.String()) {
+		opts = append(opts, unit.NewUnitOption("Service", "Type", "notify"))
+	}
+
+	if !insecureOptions.DisableCapabilities {
+		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
+	}
+
+	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
+
+	// Apply seccomp isolator, if any and not opt-ing out;
+	// see https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
+	if !insecureOptions.DisableSeccomp {
+		var forceNoNewPrivileges bool
+
+		unprivileged := (u != 0)
+		opts, forceNoNewPrivileges, err = getSeccompFilter(opts, uw.p, unprivileged, app.Isolators)
+		if err != nil {
+			uw.err = err
+			return
+		}
+
+		// Seccomp filters require NoNewPrivileges for unprivileged apps, that may override
+		// manifest annotation.
+		if forceNoNewPrivileges {
+			noNewPrivileges = true
+		}
+	}
+
+	opts = append(opts, unit.NewUnitOption("Service", "NoNewPrivileges", strconv.FormatBool(noNewPrivileges)))
+
+	if ra.ReadOnlyRootFS {
+		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", common.RelAppRootfsPath(appName)))
+	}
+
+	// TODO(tmrts): Extract this logic into a utility function.
+	vols := make(map[types.ACName]types.Volume)
+	for _, v := range uw.p.Manifest.Volumes {
+		vols[v.Name] = v
+	}
+
+	absRoot, err := filepath.Abs(uw.p.Root) // Absolute path to the pod's rootfs.
+	if err != nil {
+		uw.err = err
+		return
+	}
+	appRootfs := common.AppRootfsPath(absRoot, appName)
+
+	rwDirs := []string{}
+	imageManifest := uw.p.Images[appName.String()]
+	mounts := GenerateMounts(ra, vols, imageManifest)
+	for _, m := range mounts {
+		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Path)
+		if err != nil {
+			uw.err = err
+			return
+		}
+
+		if !IsMountReadOnly(vols[m.Volume], app.MountPoints) {
+			rwDirs = append(rwDirs, filepath.Join(common.RelAppRootfsPath(appName), mntPath))
+		}
+	}
+
+	// Restrict access to sensitive paths (eg. procfs) and devices. For kvm flavor,
+	// these paths are stored inside the vm, without influence to the host.
+	if !insecureOptions.DisablePaths && flavor != "kvm" {
+		opts = protectSystemFiles(opts, appName)
+		opts = append(opts, unit.NewUnitOption("Service", "DevicePolicy", "closed"))
+		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(absRoot), appName, app.MountPoints, mounts, vols, uidRange)
+		if err != nil {
+			uw.err = err
+			return
+		}
+		for _, dev := range deviceAllows {
+			opts = append(opts, unit.NewUnitOption("Service", "DeviceAllow", dev))
+		}
+	}
+
+	opts = append(opts, unit.NewUnitOption("Service", "ReadWriteDirectories", strings.Join(rwDirs, " ")))
+	// When an app fails, we shut down the pod
+	opts = append(opts, unit.NewUnitOption("Unit", "OnFailure", "halt.target"))
+
+	for _, eh := range app.EventHandlers {
+		var typ string
+		switch eh.Name {
+		case "pre-start":
+			typ = "ExecStartPre"
+		case "post-stop":
+			typ = "ExecStopPost"
+		default:
+			uw.err = fmt.Errorf("unrecognized eventHandler: %v", eh.Name)
+			return
+		}
+		exec := quoteExec(eh.Exec)
+		opts = append(opts, unit.NewUnitOption("Service", typ, exec))
+	}
+
+	// Some pre-start jobs take a long time, set the timeout to 0
+	opts = append(opts, unit.NewUnitOption("Service", "TimeoutStartSec", "0"))
+
+	var saPorts []types.Port
+	for _, p := range app.Ports {
+		if p.SocketActivated {
+			saPorts = append(saPorts, p)
+		}
+	}
+
+	for _, i := range app.Isolators {
+		switch v := i.Value().(type) {
+		case *types.ResourceMemory:
+			opts, err = cgroup.MaybeAddIsolator(opts, "memory", v.Limit())
+			if err != nil {
+				uw.err = err
+				return
+			}
+		case *types.ResourceCPU:
+			opts, err = cgroup.MaybeAddIsolator(opts, "cpu", v.Limit())
+			if err != nil {
+				uw.err = err
+				return
+			}
+		}
+	}
+
+	if len(saPorts) > 0 {
+		sockopts := []*unit.UnitOption{
+			unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Application=%v Image=%v %s", appName, imgName, "socket-activated ports")),
+			unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+			unit.NewUnitOption("Socket", "BindIPv6Only", "both"),
+			unit.NewUnitOption("Socket", "Service", ServiceUnitName(appName)),
+		}
+
+		for _, sap := range saPorts {
+			var proto string
+			switch sap.Protocol {
+			case "tcp":
+				proto = "ListenStream"
+			case "udp":
+				proto = "ListenDatagram"
+			default:
+				uw.err = fmt.Errorf("unrecognized protocol: %v", sap.Protocol)
+				return
+			}
+			// We find the host port for the pod's port and use that in the
+			// socket unit file.
+			// This is so because systemd inside the pod will match based on
+			// the socket port number, and since the socket was created on the
+			// host, it will have the host port number.
+			port := findHostPort(*uw.p.Manifest, sap.Name)
+			if port == 0 {
+				log.Printf("warning: no --port option for socket-activated port %q, assuming port %d as specified in the manifest", sap.Name, sap.Port)
+				port = sap.Port
+			}
+			sockopts = append(sockopts, unit.NewUnitOption("Socket", proto, fmt.Sprintf("%v", port)))
+		}
+
+		file, err := os.OpenFile(SocketUnitPath(uw.p.Root, appName), os.O_WRONLY|os.O_CREATE, 0644)
+		if err != nil {
+			uw.err = errwrap.Wrap(errors.New("failed to create socket file"), err)
+			return
+		}
+		defer file.Close()
+
+		if _, err = io.Copy(file, unit.Serialize(sockopts)); err != nil {
+			uw.err = errwrap.Wrap(errors.New("failed to write socket unit file"), err)
+			return
+		}
+
+		if err = os.Symlink(path.Join("..", SocketUnitName(appName)), SocketWantPath(uw.p.Root, appName)); err != nil {
+			uw.err = errwrap.Wrap(errors.New("failed to link socket want"), err)
+			return
+		}
+
+		opts = append(opts, unit.NewUnitOption("Unit", "Requires", SocketUnitName(appName)))
+	}
+
+	opts = append(opts, unit.NewUnitOption("Unit", "Requires", InstantiatedPrepareAppUnitName(appName)))
+	opts = append(opts, unit.NewUnitOption("Unit", "After", InstantiatedPrepareAppUnitName(appName)))
+	opts = append(opts, unit.NewUnitOption("Unit", "Requires", "sysusers.service"))
+	opts = append(opts, unit.NewUnitOption("Unit", "After", "sysusers.service"))
+
+	uw.WriteUnit(ServiceUnitPath(uw.p.Root, appName), "failed to create service unit file", opts...)
+	uw.Activate(ServiceUnitName(appName), ServiceWantPath(uw.p.Root, appName))
+}
+
+// AppReaperUnit writes an app reaper service unit for the given app in the given path using the given unit options.
+func (uw *UnitWriter) AppReaperUnit(appName types.ACName, binPath string, opts ...*unit.UnitOption) {
+	if uw.err != nil {
+		return
+	}
+
+	opts = append(opts, []*unit.UnitOption{
+		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("%s Reaper", appName)),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Unit", "StopWhenUnneeded", "yes"),
+		unit.NewUnitOption("Unit", "Before", "halt.target"),
+		unit.NewUnitOption("Unit", "Conflicts", "exit.target"),
+		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
+		unit.NewUnitOption("Unit", "Conflicts", "poweroff.target"),
+		unit.NewUnitOption("Service", "RemainAfterExit", "yes"),
+		unit.NewUnitOption("Service", "ExecStop", fmt.Sprintf(
+			"/reaper.sh \"%s\" \"%s\" \"%s\"",
+			appName,
+			common.RelAppRootfsPath(appName),
+			binPath,
+		)),
+	}...)
+
+	uw.WriteUnit(
+		ServiceUnitPath(uw.p.Root, types.ACName(fmt.Sprintf("reaper-%s", appName))),
+		fmt.Sprintf("failed to write app %q reaper service", appName),
+		opts...,
+	)
+}
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 56255fc974..e25af377ce 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -112,6 +112,7 @@ var (
 	disablePaths        bool
 	disableSeccomp      bool
 	dnsConfMode         *pkgflag.PairList
+	mutable             bool
 )
 
 func init() {
@@ -133,6 +134,7 @@ func init() {
 		"hosts":  "default",
 	})
 	flag.Var(dnsConfMode, "dns-conf-mode", "DNS config file modes")
+	flag.BoolVar(&mutable, "mutable", false, "Enable mutable operations on this pod, including starting an empty one")
 
 	// this ensures that main runs only on main thread (thread group leader).
 	// since namespace ops (unshare, setns) are done for a single thread, we
@@ -261,6 +263,10 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 			return nil, nil, fmt.Errorf("flag --private-users cannot be used with an lkvm stage1")
 		}
 
+		if mutable {
+			return nil, nil, fmt.Errorf("flag --mutable is not implemented in lkvm stage1")
+		}
+
 		// kernel and hypervisor binaries are located relative to the working directory
 		// of init (/var/lib/rkt/..../uuid)
 		// TODO: move to path.go
@@ -593,21 +599,30 @@ func stage1() int {
 		}
 	}
 
+	insecureOptions := stage1initcommon.Stage1InsecureOptions{
+		DisablePaths:        disablePaths,
+		DisableCapabilities: disableCapabilities,
+		DisableSeccomp:      disableSeccomp,
+	}
+
 	if dnsConfMode.Pairs["resolv"] == "host" {
 		stage1initcommon.UseHostResolv(root)
 	}
+
 	if dnsConfMode.Pairs["hosts"] == "host" {
 		stage1initcommon.UseHostHosts(root)
 	}
 
-	if err = stage1initcommon.WriteDefaultTarget(p); err != nil {
-		log.PrintE("failed to write default.target", err)
-		return 1
-	}
-
-	if err = stage1initcommon.WritePrepareAppTemplate(p); err != nil {
-		log.PrintE("failed to write prepare-app service template", err)
-		return 1
+	if mutable {
+		if err = stage1initcommon.MutableEnv(p); err != nil {
+			log.Error(err)
+			return 1
+		}
+	} else {
+		if err = stage1initcommon.ImmutableEnv(p, interactive, privateUsers, insecureOptions); err != nil {
+			log.Error(err)
+			return 1
+		}
 	}
 
 	if err := stage1initcommon.SetJournalPermissions(p); err != nil {
@@ -622,17 +637,6 @@ func stage1() int {
 		}
 	}
 
-	insecureOptions := stage1initcommon.Stage1InsecureOptions{
-		DisablePaths:        disablePaths,
-		DisableCapabilities: disableCapabilities,
-		DisableSeccomp:      disableSeccomp,
-	}
-
-	if err = stage1initcommon.PodToSystemd(p, interactive, flavor, privateUsers, insecureOptions); err != nil {
-		log.PrintE("failed to configure systemd", err)
-		return 1
-	}
-
 	canMachinedRegister := false
 	if flavor != "kvm" {
 		// kvm doesn't register with systemd right now, see #2664.
diff --git a/stage1/secondary-stuff.mk b/stage1/secondary-stuff.mk
index 8fac67217a..f4b9e3723d 100644
--- a/stage1/secondary-stuff.mk
+++ b/stage1/secondary-stuff.mk
@@ -12,6 +12,9 @@ _S1_SS_SUBDIRS_ := \
 	reaper \
 	stop \
 	stop_kvm \
+	app-rm \
+	app-start \
+	app-stop \
 	units \
 	aci
 
diff --git a/stage1/units/units/halt.target b/stage1/units/units/halt.target
deleted file mode 100644
index 2d48963179..0000000000
--- a/stage1/units/units/halt.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Halt
-DefaultDependencies=no
-AllowIsolate=yes
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 463a0d196c..8c9b195c27 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -103,7 +103,7 @@ func checkPodState(t *testing.T, rawState string, apiState v1alpha.PodState) {
 		if apiState == v1alpha.PodState_POD_STATE_EXITED {
 			return
 		}
-	case "garbage":
+	case "garbage", "exited garbage":
 		if apiState == v1alpha.PodState_POD_STATE_GARBAGE {
 			return
 		}

From daeae7ea528ff30afe6aaea52df9cacd03e24eb9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 29 Sep 2016 14:42:58 +0000
Subject: [PATCH 0763/1304] version: bump to v1.16.0

---
 CHANGELOG.md                         | 18 ++++++++++++++++++
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  4 ++--
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 ROADMAP.md                           | 28 ++++++++++++++++++++++++++++
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 17 files changed, 66 insertions(+), 20 deletions(-)
 create mode 100644 ROADMAP.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a810269545..4326214952 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 1.16.0
+
+This release contains an important bugfix for the stage1-host flavor, as well as initial internal support for cgroup2 and pod sandboxes as specified by kubernetes CRI (Container Runtime Interface).
+
+### Bug fixes
+- stage1/host: fix systemd-nspawn args ordering ([#3216](https://github.com/coreos/rkt/pull/3216)). Fixes https://github.com/coreos/rkt/issues/3215.
+
+### New features
+- rkt: support for unified cgroups (cgroup2) ([#3032](https://github.com/coreos/rkt/pull/3032)). This implements support for cgroups v2 along support for legacy version.
+- cri: initial implementation of stage1 changes ([#3218](https://github.com/coreos/rkt/pull/3218)). This PR pulls the stage1-based changes from the CRI branch back into
+master, leaving out the changes in stage0 (new app subcommands).
+
+### Other changes
+- doc/using-rkt-with-systemd: fix the go app example ([#3217](https://github.com/coreos/rkt/pull/3217)).
+- rkt: refactor app-level flags handling ([#3209](https://github.com/coreos/rkt/pull/3209)). This is in preparation for https://github.com/coreos/rkt/pull/3205
+- docs/distributions: rearrange, add centos ([#3212](https://github.com/coreos/rkt/pull/3212)).
+- rkt: Correct typos listed by the tool misspell ([#3208](https://github.com/coreos/rkt/pull/3208)).
+
 ## 1.15.0
 
 This relase brings some expanded DNS configuration options, beta support for QEMU, recursive volume mounts, and improved sd_notify support.
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 6cff595121..eaf90ce763 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.15.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.16.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.15.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.16.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 9ec7350b8f..ff28c376e7 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.15.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.16.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.15.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.16.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 97b05bd330..994482d869 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.15.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.16.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.15.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.16.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 2809d1ff80..50857695a0 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.15.0
+rkt Version: 1.16.0
 appc Version: 0.8.7
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index f5d3cfd6d3..e224c32a9e 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.15.0/rkt-v1.15.0.tar.gz
-tar xzvf rkt-v1.15.0.tar.gz
-cd rkt-v1.15.0
+wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt-v1.16.0.tar.gz
+tar xzvf rkt-v1.16.0.tar.gz
+cd rkt-v1.16.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100644
index 0000000000..5367018183
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1,28 @@
+# rkt roadmap
+
+This document defines a high level roadmap for rkt development.
+The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project.
+The [milestones defined in GitHub](https://github.com/coreos/rkt/milestones) represent the most up-to-date state of affairs.
+
+rkt is an implementation of the [App Container spec](https://github.com/appc/spec), which is still under active development on an approximately similar timeframe.
+The version of the spec that rkt implements can be seen in the output of `rkt version`.
+
+rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
+
+## Ongoing projects
+
+- [CRI](https://github.com/coreos/rkt/projects/1): implementation of the new Container Runtime Interface from Kubernetes.
+
+## Next releases
+
+### rkt 1.17.0 (October)
+
+Up-to-date planning at https://github.com/coreos/rkt/milestone/51.
+
+### rkt 1.18.0 (October)
+
+Up-to-date planning at https://github.com/coreos/rkt/milestone/52.
+
+### Upcoming
+
+Future tasks without a specific timeline are tracked at https://github.com/coreos/rkt/milestone/30.
diff --git a/configure.ac b/configure.ac
index e14c07aad0..5408314d1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.15.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.16.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 5873c1ccce..bfb5f6cbb6 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.15.0"
+version="1.16.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index ce7bbb8ca5..37dadcaa51 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.15.0"
+            "value": "1.16.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 5fef83644b..7f4ffbb763 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.15.0"
+            "value": "1.16.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index d6f6e4ad2a..c5c6ce0328 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.15.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.16.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 613435ee1c..84660c412e 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.15.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.16.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 515e662d2d..b5e17eb8d9 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.15.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.16.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 363f0af5fe..2627c84f9b 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.15.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.16.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 6a293ce92e..ed473aaa48 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.15.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.16.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 50ffb4b221..1b8b72b3ac 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.15.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.16.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 2ad69beab919a9215dd1d45408e7b2fd93576ece Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 29 Sep 2016 14:42:59 +0000
Subject: [PATCH 0764/1304] version: bump to v1.16.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5408314d1a..04e8d27d19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.16.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.16.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index c5c6ce0328..29a28f7548 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.16.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.16.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From ed1d29e651994eea532d261ba00e187ee78107f0 Mon Sep 17 00:00:00 2001
From: "Elijah C. Voigt" <Elijah.Caine.MV@gmail.com>
Date: Tue, 4 Oct 2016 16:52:39 -0700
Subject: [PATCH 0765/1304] Docs: Mention style guide in CONTRIBUTING.md

---
 CONTRIBUTING.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3ef777e52b..0167613bd4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,6 +55,11 @@ CoreOS projects written in Go follow a set of style guidelines that we've docume
 [here](https://github.com/coreos/docs/tree/master/golang). Please follow them when
 working on your contributions.
 
+### Documentation Style
+
+CoreOS project docs should follow the [Documentation style and formatting
+guide](https://github.com/coreos/docs/tree/master/STYLE.md). Thank you for documenting!
+
 ### Format of the Commit Message
 
 We follow a rough convention for commit messages that is designed to answer two

From 7aa1d0cbc4d13c4286d2f027192d937c45d75436 Mon Sep 17 00:00:00 2001
From: Charlie Drage <charlie@charliedrage.com>
Date: Thu, 15 Sep 2016 08:37:05 -0400
Subject: [PATCH 0766/1304] docs: update acbuild link

The project has moved from appc/build to containers/build on Github and
thus the links should be changed.
---
 Documentation/getting-started-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index 0f83c5f3aa..b2a862f07a 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -42,7 +42,7 @@ $ ldd hello
 
 ## Create the image
 
-To create the image, we can use `acbuild`, which can be downloaded via one of the [releases in the acbuild repository](https://github.com/appc/acbuild/releases)
+To create the image, we can use `acbuild`, which can be downloaded via one of the [releases in the containers/build repository](https://github.com/containers/build/releases)
 
 The following commands will create an ACI containing our application and important metadata.
 

From 3e4c901e010ed85261e584b66b1242275d0e7f81 Mon Sep 17 00:00:00 2001
From: Elijah Caine <Elijah.Caine.MV@gmail.com>
Date: Mon, 3 Oct 2016 12:33:22 -0700
Subject: [PATCH 0767/1304] Docs: edited
 Documentation/devel/distribution-point.md

- Flow and word-choice edits.
- Technical edits to fit the CoreOS Docs style guide.
- Renamed the document to fit the style guide.
---
 Documentation/devel/distribution-point.md | 166 ++++++++++++++++++++++
 Documentation/devel/distribution_point.md | 145 -------------------
 2 files changed, 166 insertions(+), 145 deletions(-)
 create mode 100644 Documentation/devel/distribution-point.md
 delete mode 100644 Documentation/devel/distribution_point.md

diff --git a/Documentation/devel/distribution-point.md b/Documentation/devel/distribution-point.md
new file mode 100644
index 0000000000..737d925f69
--- /dev/null
+++ b/Documentation/devel/distribution-point.md
@@ -0,0 +1,166 @@
+# Distribution points 
+
+A *distribution point* represents a method for fetching a container image from an input string. This string does not specify an image's type.
+
+A distribution point can provide one or more image formats. Some *Docker* registries also provide *OCI Images*. *Rkt* can fetch a Docker/OCI image from a registry and convert it on the fly to its native image format, ACI. The [docker2aci][docker2aci_GH] tool can perform this conversion in advance.
+
+Before distribution points, rkt used *ImageTypes*. These mapped a specifically formatted input string to things like the distribution, transport and image type. This information is hidden now since all images are appc ACIs.
+
+Distribution points are used as the primary expression of container image information in the different layers of rkt.  This includes fetching and referencing in a CAS/ref store.
+
+## Distribution points types
+
+Distribution points are either direct or indirect. Direct distribution points provide the final information needed to fetch the image. Indirect distribution points take some indirect steps, like discovery, before getting the final image location. An indirect distribution point may resolve to a direct distribution point.
+
+## Distribution points format
+
+A distribution point is represented as a URI with the URI scheme as "cimd" and the remaining parts (URI opaque data and query/fragments parts) as the distribution point data. See [rfc3986][3986] for more information on this. Distribution points clearly map to a resource name, otherwise they will not fit inside a resource locator (URL). We will then use the term URIs instead of URNs because it's the suggested name from the rfc (and URNs are defined, by rfc2141, to have the `urn` scheme).
+
+Every distribution starts the same: `cimd:DISTTYPE:v=uint32(VERSION):` where
+
+* `cimd` is the *container image distribution scheme*
+* `DISTTYPE` is the *distribution type*
+* `v=uint32(VERSION)` is the *distribution type format version*
+
+## Current rkt distribution points
+
+Rkt has three types of distribution points:
+
+* `Appc`
+* `ACIArchive`
+* `Docker`
+
+### Appc
+
+This is an indirect distribution point.
+
+Appc defines a distribution point using appc image discovery
+
+* The format is: `cimd:appc:v=0:name?label01=....&label02=....`
+* The distribution type is "appc"
+* The labels values must be Query escaped
+
+**Example:** `cimd:appc:v=0:coreos.com/etcd?version=v3.0.3&os=linux&arch=amd64`
+
+### ACIArchive
+
+This is a direct distribution point since it directly define the final image location.
+
+ACIArchive defines a distribution point using an archive file
+
+* The format is: `cimd:aci-archive:v=0:ArchiveURL?query...`
+* The distribution type is "aci-archive"
+* ArchiveURL must be query escaped
+
+**Examples**:
+
+* `cimd:aci-archive:v=0:file%3A%2F%2Fabsolute%2Fpath%2Fto%2Ffile`
+* `cimd:aci-archive:v=0:https%3A%2F%2Fexample.com%2Fapp.aci`
+
+### Docker
+
+Docker is an indirect distribution point.
+
+This defines a distribution point using a docker registry
+
+The format is:
+
+* `cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG|@DIGEST]`
+* Removing the common distribution point section, the format is the same as the docker image string format (man docker-pull).
+
+**Examples**:
+
+* `cimd:docker:v=0:busybox`
+* `cimd:docker:v=0:busybox:latest`
+* `cimd:docker:v=0:registry-1.docker.io/library/busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6`
+
+### Future distribution points
+
+#### OCI Image distribution(s)
+
+This is an Indirect distribution point.
+
+OCI images can be retrieved using a Docker registry but in future the OCI image spec will define one or more own kinds of distribution starting from an image name (with additional tags/labels).
+
+#### OCI Image layout
+
+This is a Direct distribution point.
+
+This can fetch an image starting from a [OCI image layout][oci_layout] format. The 'location' can point to:
+
+* A single file archive
+* A local directory based layout
+* A remote directory based layout
+* Other types of locations
+
+This will probably end up being the final distribution used by the above OCI image distributions (like ACIArchive is the final distribution point for the Appc distribution point):
+
+* `cimd:oci-image-layout:v=0:file%3A%2F%2Fabsolute%2Fpath%2Fto%2Ffile?ref=refname`
+* `cimd:oci-image-layout:v=0:https%3A%2F%2Fdir%2F?ref=refname`
+
+Since the OCI image layout can provide multiple images selectable by a ref, one needs to specify which ref to use in the archive distribution URI (see the above ref query parameter). Since distribution only covers one image, it is not possible to import all refs with a single distribution URI.
+
+**TODO(sgotti)**: Define if oci-image-layout. It should internally handle both archive and directory based layouts or use two different distributions or a query parameter the explicitly define the layout (to avoid guessing if the URL points to a single file or to a directory).*
+
+**Note** Considering [this OCI image spec README section][oci_image_spec_readme], the final distribution format will probably be similar to the Appc distribution. There is a need to distinguish their User Friendly string (prepending an appc: or oci: ?).
+
+To sum it up:
+
+| Distribution Point | Type     | URI Format                                                                | Final Distribution Point |
+|--------------------|----------|---------------------------------------------------------------------------|--------------------------|
+| Appc               | Direct   | `cimd:appc:v=0:name?label01=....&label02=...`                             | ACIArchive               |
+| Docker             | Direct   | `cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG&#124;@DIGEST]` | <none>                   |
+| ACIArchive         | Indirect | `cimd:aci-archive:v=0:ArchiveURL?query...`                                |                          |
+| OCI                | Direct   | `cimd:oci:v=0:TODO`                                                       | OCIImageLayout           |
+| OCIImageLayout     | Indirect | `cimd:oci-image-layout:v=0:URL?ref=...`                                   |                          |
+
+## User-friendly distribution strings
+
+The distribution URI can be long and complex. It is helpful to have a friendly string for users to request an image with. Rkt supports a couple of image string input styles. These are mapped to an `AppImageType`:
+
+* Appc discovery string: `example.com/app01:v1.0.0,label01=value01,...` or `example.com/app01,version=v1.0.0,label01=value01,...` etc.
+* File paths are absolute (`/full/path/to/file`) or relative.
+
+The above two may overlap so some heuristic is needed to distinguish them (removing this heuristic will break backward compatibility in the CLI).
+
+* File URL: `file:///full/path/to/file`
+* Http(s) URL: `http(s)://host:port/path`
+* Docker URL: This is a strange URL since it the schemeful (`docker://`) version of the docker image string
+
+To maintain backward compatibility these image string will be converted to a distribution URI:
+
+| Current ImageType                      | Distribution Point URI                                                          |
+|----------------------------------------|---------------------------------------------------------------------------|
+| appc string                            | `cimd:appc:v=0:name?label01=....&label02=...`                             |
+| file path                              | `cimd:aci-archive:v=0:ArchiveURL`                                         |
+| file URL                               | `cimd:aci-archive:v=0:ArchiveURL`                                         |
+| https URL                              | `cimd:aci-archive:v=0:ArchiveURL`                                         |
+| docker URI/URL (docker: and docker://) | `cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG&#124;@DIGEST]` |
+
+The above table also adds Docker URI (`docker:`) as a user friendly string and its clearer than the URL version (`docker://`)
+
+The parsing and generation of user friendly string is done outside the distribution package (to let distribution pkg users implement their own user friendly strings).
+
+Rkt has two jobs:
+
+* Parse a user friendly string to a distribution URI.
+* Generate a user friendly string from a distribution URI. This is useful when showing the refs from a refs store. They can easily be understood and copy/pasted.
+
+A user can provide as an input image as a "user friendly" string or a complete distribution URI.
+
+## Comparing Distribution Points URIs
+
+A Distribution Point implementation will also provide a function to compare if Distribution Point URIs are the same (e.g. ordering the query parameters).
+
+## Fetching logic with Distribution Points
+
+A Distribution Point will be the base for a future refactor of the fetchers logic (see #2964)
+
+This also creates a better separation between the distribution points and the transport layers.
+
+For example there may exist multiple transport plugins (file, http, s3, bittorrent etc...) to be called by an ACIArchive distribution point.
+
+[docker2aci_GH]: https://github.com/appc/docker2aci
+[3986]: https://tools.ietf.org/html/rfc3986
+[oci_layout]: https://github.com/opencontainers/image-spec/blob/master/image-layout.md
+[oci_image_spec_readme]: https://github.com/opencontainers/image-spec#running-an-oci-imag://github.com/appc/docker2aci 
diff --git a/Documentation/devel/distribution_point.md b/Documentation/devel/distribution_point.md
deleted file mode 100644
index dc574226ee..0000000000
--- a/Documentation/devel/distribution_point.md
+++ /dev/null
@@ -1,145 +0,0 @@
-
-A distribution point represents the method to fetch an image starting from an input string. It doesn't mandates the image types. Usually a distribution point can only provide one image type but some can provide different image types. For example:
-
-* Some docker registries also provides OCI images.
-* Rkt can internally implement the docker distribution to natively fetch a docker/OCI image from a registry or an ACI converted by docker2aci.
-
-Before this concept was introduced, rkt used the ImageType concept, the ImageType was mapped to the input image string format and internally covered multiple concepts like distribution, transport and image type (hidden since all are now appc ACIs).
-
-The distribution point concept is used as the primary information in the different layers of rkt (fetching but also for references in a CAS/ref store).
-
-## Distribution Points types
-
-Distribution points can be logically considered of two types:
-
-* Indirect distribution points
-* Direct distribution points
-
-Direct distribution points already provide the final information needed to fetch the image while Indirect distribution points will do some indirect steps (e.g. discovery) to get the final image location.
-
-It can happen, as explained below, that an Indirect distribution point will resolve to a Direct distribution point.
-
-## Distribution Points format
-A distribution point is represented as an URI with the uri scheme as "cimd" and the remaining parts (URI opaque data and query/fragments parts) as the distribution point data. See [rfc3986](https://tools.ietf.org/html/rfc3986)). Distribution points clearly maps to a resource name, instead they won't fit inside a resource locator (URL). We'll use the term URIs instead of URNs because it's the suggested name from the rfc (and URNs are defined, by rfc2141, to have the `urn` scheme).
-
-Every distribution starts with a common part: `cimd:DISTTYPE:v=uint32(VERSION):` where `cimd` is the container image distribution scheme, DISTTYPE is the distribution type, v=uint32(VERSION) is the distribution type format version.
-
-### Current rkt Distribution Points
-
-In rkt there are currently three kind of distribution points: `Appc`, `ACIArchive` and `Docker`. This is their formalization:
-
-**Appc**
-This is an Indirect distribution point.
-
-Appc defines a distribution point using appc image discovery
-
-The format is: `cimd:appc:v=0:name?label01=....&label02=....`
-The distribution type is "appc"
-the labels values must be Query escaped
-Example: `cimd:appc:v=0:coreos.com/etcd?version=v3.0.3&os=linux&arch=amd64`
-
-**ACIArchive**
-This is a Direct distribution point since it directly define the final image location.
-
-ACIArchive defines a distribution point using an archive file
-
-The format is: `cimd:aci-archive:v=0:ArchiveURL?query...`
-The distribution type is "aci-archive"
-ArchiveURL must be query escaped
-
-Examples:
-`cimd:aci-archive:v=0:file%3A%2F%2Fabsolute%2Fpath%2Fto%2Ffile`
-`cimd:aci-archive:v=0:https%3A%2F%2Fexample.com%2Fapp.aci`
-
-**Docker**
-This is an Indirect distribution point.
-
-Docker defines a distribution point using a docker registry
-
-The format is:
-`cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG|@DIGEST]`
-Removing the common distribution point part, the format is the same as the docker image string format (man docker-pull).
-
-Examples:
-`cimd:docker:v=0:busybox`
-`cimd:docker:v=0:busybox:latest`
-`cimd:docker:v=0:registry-1.docker.io/library/busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6`
-
-### Future distributions points
-
-**OCI Image distribution(s)**
-This is an Indirect distribution point.
-
-Currently oci images can be retrieved using a docker registry but in future the oci image spec will define one or more own kinds of distribution starting from an image name (with additional tags/labels).
-
-**OCI Image layout**
-This is a Direct distribution point.
-
-It can fetch an image starting from a [OCI image layout](https://github.com/opencontainers/image-spec/blob/master/image-layout.md) format. The location can point to a single file archive, to a local/remote directory based layout or other kind of locations.
-
-Probably it will be the final distribution used by the above OCI image distributionis (like ACIArchive is the final distribution point for the Appc distribution point).
-
-`cimd:oci-image-layout:v=0:file%3A%2F%2Fabsolute%2Fpath%2Fto%2Ffile?ref=refname`
-`cimd:oci-image-layout:v=0:https%3A%2F%2Fdir%2F?ref=refname`
-
-Since the OCI image layout can provide multiple images selectable by a ref there's the need to specify which ref to use in the archive distribution URI (see the above ref query parameter). Since distribution just covers one image it's not possible to import all the refs with just a distribution URI.
-
-TODO(sgotti). Define if oci-image-layout should internally handle both archive and directory based layouts or use two different distributions or a query parameter the explicitly define the layout (to avoid guessing if the url points to a single file or to a directory).
-
-**Note** Considering [this OCI image spec README section](https://github.com/opencontainers/image-spec#running-an-oci-image), probably the final distribution format will be similar to the Appc distribution. So there's a need to distinguish their User Friendly string (prepending an appc: or oci: ?).
-
-To sum it up:
-
-| Distribution Point | Type     | URI Format                                                                | Final Distribution Point |
-|--------------------|----------|---------------------------------------------------------------------------|--------------------------|
-| Appc               | Direct   | `cimd:appc:v=0:name?label01=....&label02=...`                             | ACIArchive               |
-| Docker             | Direct   | `cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG&#124;@DIGEST]` | <none>                   |
-| ACIArchive         | Indirect | `cimd:aci-archive:v=0:ArchiveURL?query...`                                |                          |
-| OCI                | Direct   | `cimd:oci:v=0:TODO`                                                       | OCIImageLayout           |
-| OCIImageLayout     | Indirect | `cimd:oci-image-layout:v=0:URL?ref=...`                                   |                          |
-
-## User friendly distribution strings
-
-Since the distribution URI can be complex there's a need to help the user to request an image via some user friendly string. rkt already has these kind of available input image strings (now mapped to an AppImageType):
-
-* appc discovery string: example.com/app01:v1.0.0,label01=value01,... or example.com/app01,version=v1.0.0,label01=value01,... etc...
-* file path: absolute /full/path/to/file or relative
-The above two may overlap so some heuristic is needed to distinguish them (removing this heuristic will break backward cli compatibility).
-* file URL: file:///full/path/to/file
-* http(s) URL: http(s)://host:port/path
-* docker URL: this is a strange URL since it the schemeful (docker://) version of the docker image string
-
-So, also the maintain backward compatibility, these image string will be converted to a distribution URI:
-
-| Current ImageType                      | Distribution Point URI                                                          |
-|----------------------------------------|---------------------------------------------------------------------------|
-| appc string                            | `cimd:appc:v=0:name?label01=....&label02=...`                             |
-| file path                              | `cimd:aci-archive:v=0:ArchiveURL`                                          |
-| file URL                               | `cimd:aci-archive:v=0:ArchiveURL`                                          |
-| https URL                              | `cimd:aci-archive:v=0:ArchiveURL`                                          |
-| docker URI/URL (docker: and docker://) | `cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG&#124;@DIGEST]` |
-
-The above table also adds docker URI (docker:) as a user friendly string and its clearer than the URL version (docker://)
-
-The parsing and generation of user friendly string is done outside the distribution package (to let distribution pkg users implement their own user friendly strings).
-
-rkt has two functions to:
-* parse a user friendly string to a distribution URI.
-* generate a user friendly string from a distribution URI. This is useful for example when showing the refs from a refs store (so they'll be easily understandable and if copy/pasted they'll continue to work).
-
-A user can provide as an input image both the "user friendly" strings or directly a distribution URI.
-
-## Comparing Distribution Points URIs
-
-A Distribution Point implementation will also provide:
-
-* a function to compare if two Distribution Point URIs are the same (e.g. ordering the query parameters).
-
-## Fetching logic with Distribution Points
-
-A Distribution Point will be the base for a future refactor of the fetchers logic (see #2964)
-
-This will also creates a better separation between the distribution points and the transport layers.
-
-For example there may exist multiple transport plugins (file, http, s3, bittorrent etc...) to be called by an ACIArchive distribution point.
-

From 4dfb35edd7807d8a970362c9ac635b85df7304d3 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 6 Oct 2016 11:54:34 -0500
Subject: [PATCH 0768/1304] Docs: edited Documentation/distributions.md#centos

The CentOS community build for rkt is not ready due to pending systemd
upgrade issues. The docs should reflect this.
---
 Documentation/distributions.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 1132401c50..b0ea2348bc 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -20,6 +20,7 @@ sudo pacman -S rkt
 ## CentOS
 
 rkt is available in the [CentOS Community Build Service](https://cbs.centos.org/koji/packageinfo?packageID=4464) for CentOS 7.
+However, this is [not yet ready for production use](https://github.com/coreos/rkt/issues/1305) due to pending systemd upgrade issues.
 
 ## CoreOS
 

From db333d012a6e0924c37098857bc106b2f9ca8774 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Thu, 6 Oct 2016 12:15:26 -0700
Subject: [PATCH 0769/1304] stage0: Create an mtab symlink if not present

Several Linux tools expect this to exist, but several images do not
include it. This creates it when it does not exist.

Fixes #3264
---
 stage0/run.go | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/stage0/run.go b/stage0/run.go
index 767ddcea0d..a964a47d09 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -744,8 +744,9 @@ func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cd
 }
 
 // setupAppImage mounts the overlay filesystem for the app image that
-// corresponds to the given hash. Then, it creates the tmp directory.
-// When useOverlay is false it just creates the tmp directory for this app.
+// corresponds to the given hash if useOverlay is true.
+// It also creates an mtab file in the application's rootfs if one is not
+// present.
 func setupAppImage(cfg RunConfig, appName types.ACName, img types.Hash, cdir string, useOverlay bool) error {
 	ad := common.AppPath(cdir, appName)
 	if useOverlay {
@@ -764,7 +765,39 @@ func setupAppImage(cfg RunConfig, appName types.ACName, img types.Hash, cdir str
 			return errwrap.Wrap(errors.New("error rendering overlay filesystem"), err)
 		}
 	}
+	return ensureMtabExists(filepath.Join(ad, "rootfs"))
+}
+
+// ensureMtabExists creates a symlink from /etc/mtab -> /proc/self/mounts if
+// nothing exists at /etc/mtab.
+// Various tools, such as mount from util-linux 2.25, expect the mtab file to
+// be populated.
+func ensureMtabExists(rootfs string) error {
+	stat, err := os.Stat(filepath.Join(rootfs, "etc"))
+	if os.IsNotExist(err) {
+		// If your image has no /etc you don't get /etc/mtab either
+		return nil
+	}
+	if err != nil {
+		return errwrap.Wrap(errors.New("error determining if /etc existed in the image", err))
+	}
+	if !stat.IsDir() {
+		return nil
+	}
+	mtabPath := filepath.Join(rootfs, "etc", "mtab")
+	if _, err = os.Lstat(mtabPath); err == nil {
+		// If the image already has an mtab, don't replace it
+		return nil
+	}
+	if !os.IsNotExist(err) {
+		return errwrap.Wrap(errors.New("error determining if /etc/mtab exists in the image"), err)
+	}
 
+	target := "../proc/self/mounts"
+	err = os.Symlink(target, mtabPath)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error creating mtab symlink", err))
+	}
 	return nil
 }
 

From 0840388986b5c1e4c3587cdbdfbe83c284e85480 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Thu, 6 Oct 2016 13:53:49 -0700
Subject: [PATCH 0770/1304] tests: Add mtab test

---
 stage0/run.go            |  4 ++--
 tests/inspect/inspect.go | 17 +++++++++++++++++
 tests/rkt_mtab_test.go   | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 tests/rkt_mtab_test.go

diff --git a/stage0/run.go b/stage0/run.go
index a964a47d09..a8ceaae563 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -779,7 +779,7 @@ func ensureMtabExists(rootfs string) error {
 		return nil
 	}
 	if err != nil {
-		return errwrap.Wrap(errors.New("error determining if /etc existed in the image", err))
+		return errwrap.Wrap(errors.New("error determining if /etc existed in the image"), err)
 	}
 	if !stat.IsDir() {
 		return nil
@@ -796,7 +796,7 @@ func ensureMtabExists(rootfs string) error {
 	target := "../proc/self/mounts"
 	err = os.Symlink(target, mtabPath)
 	if err != nil {
-		return errwrap.Wrap(errors.New("error creating mtab symlink", err))
+		return errwrap.Wrap(errors.New("error creating mtab symlink"), err)
 	}
 	return nil
 }
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index ac55795d40..ead4fa4366 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -58,6 +58,7 @@ var (
 		WriteFile          bool
 		StatFile           bool
 		HashFile           bool
+		FileSymlinkTarget  bool
 		Sleep              int
 		PreSleep           int
 		PrintMemoryLimit   bool
@@ -102,6 +103,7 @@ func init() {
 	globalFlagset.BoolVar(&globalFlags.WriteFile, "write-file", false, "Write $CONTENT in the file $FILE")
 	globalFlagset.BoolVar(&globalFlags.StatFile, "stat-file", false, "Print the ownership and mode of the file $FILE")
 	globalFlagset.BoolVar(&globalFlags.HashFile, "hash-file", false, "Print the SHA1SUM of the file $FILE")
+	globalFlagset.BoolVar(&globalFlags.FileSymlinkTarget, "file-symlink-target", false, "Print the symlink target of $FILE")
 	globalFlagset.IntVar(&globalFlags.Sleep, "sleep", -1, "Sleep before exiting (in seconds)")
 	globalFlagset.IntVar(&globalFlags.PreSleep, "pre-sleep", -1, "Sleep before executing (in seconds)")
 	globalFlagset.BoolVar(&globalFlags.PrintMemoryLimit, "print-memorylimit", false, "Print cgroup memory limit")
@@ -389,6 +391,21 @@ func main() {
 		fmt.Printf("sha1sum: %x\n", sha1.Sum(dat))
 	}
 
+	if globalFlags.FileSymlinkTarget {
+		fileName := os.Getenv("FILE")
+		if globalFlags.FileName != "" {
+			fileName = globalFlags.FileName
+		}
+
+		dst, err := os.Readlink(fileName)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Cannot read file target %q: %v\n", fileName, err)
+			os.Exit(1)
+		}
+
+		fmt.Printf("symlink: %q -> %q\n", fileName, dst)
+	}
+
 	if globalFlags.PrintCwd {
 		wd, err := os.Getwd()
 		if err != nil {
diff --git a/tests/rkt_mtab_test.go b/tests/rkt_mtab_test.go
new file mode 100644
index 0000000000..c3ac85ee1b
--- /dev/null
+++ b/tests/rkt_mtab_test.go
@@ -0,0 +1,36 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+// TestMtabExistence tests the happy path for the creation of the /etc/mtab
+// symlink
+func TestMtabExistence(t *testing.T) {
+	imageFile := patchTestACI("rkt-inspect-exit.aci", "--exec=/inspect --print-msg=Hello --file-symlink-target")
+	defer os.Remove(imageFile)
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	expectedLine := `symlink: "/etc/mtab" -> "../proc/self/mounts"`
+	rktCmd := fmt.Sprintf(`%s --insecure-options=image run --set-env=FILE=/etc/mtab %s`, ctx.Cmd(), imageFile)
+	runRktAndCheckOutput(t, rktCmd, expectedLine, false)
+}

From 3f199c601f8a2636d7373b96257efce19325fce1 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 7 Oct 2016 14:44:16 +0200
Subject: [PATCH 0771/1304] stage0: fix typo and some docstring style

---
 stage0/run.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/stage0/run.go b/stage0/run.go
index 767ddcea0d..931277942b 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -105,7 +105,8 @@ type CommonConfig struct {
 	Mutable      bool   // whether this pod is mutable
 }
 
-// An etc-hosts file: mapping from IP to arbitrary list of hostnames
+// HostsEntries encapsulates the entries in an etc-hosts file: mapping from IP
+// to arbitrary list of hostnames
 type HostsEntries map[string][]string
 
 // DNSConfMode indicates what the stage1 should do with dns config files
@@ -114,7 +115,6 @@ type HostsEntries map[string][]string
 // 'stage0': the stage0 has generated it
 // 'none' : do not generate it
 // 'default' : do whatever was the default
-
 type DNSConfMode struct {
 	Resolv string // /etc/rkt-resolv.conf
 	Hosts  string // /etc/rkt-hosts
@@ -493,11 +493,9 @@ func writeResolvConf(cfg *RunConfig, rootfs string) {
 	}
 }
 
-/*
- * Write /etc/rkt-hosts in to the stage1 rootfs, if there is anything there
- * This will read defaults from <rootfs>/etc/hosts-fallback if it exists.
- * Therefore, this should be called after the stage1 is mounted
- */
+// writeEtcHosts writes the file /etc/rkt-hosts into the stage1 rootfs.
+// This will read defaults from <rootfs>/etc/hosts-fallback if it exists.
+// Therefore, this should be called after the stage1 is mounted
 func writeEtcHosts(cfg *RunConfig, rootfs string) {
 	if cfg.DNSConfMode.Hosts != "stage0" {
 		return
@@ -517,7 +515,7 @@ func writeEtcHosts(cfg *RunConfig, rootfs string) {
 		hostsText = fmt.Sprintf("%s%s %s\n", hostsText, ip, strings.Join(hostnames, " "))
 	}
 
-	// Create /etc if it does not exists
+	// Create /etc if it does not exist
 	etcPath := filepath.Join(rootfs, "etc")
 	if _, err := os.Stat(etcPath); err != nil && os.IsNotExist(err) {
 		err = os.Mkdir(etcPath, 0755)

From 3c1fa5ab494db3949261caa90a7ed2b3e60fd8c4 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 7 Oct 2016 17:09:06 +0200
Subject: [PATCH 0772/1304] MAINTAINERS: update emails, remove Tamer

Tamer is no longer with CoreOS or actively working on the project; fix
Alban/Iago's emails to refer to their Kinvolk addresses.
---
 MAINTAINERS | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 18df4b9f75..6ce678f6b8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,14 +1,13 @@
-Alban Crequy <alban.crequy@coreos.com> (@alban) pkg: *
+Alban Crequy <alban@kinvolk.io> (@alban) pkg: *
 Brandon Philips <brandon.philips@coreos.com> (@philips) pkg: *
 Derek Gonyeo <derek.gonyeo@coreos.com> (@dgonyeo) pkg: *
 Euan Kemp <euan.kemp@coreos.com> (@euank) pkg: *
-Iago López Galeiras <iago.lopez@coreos.com> (@iaguis) pkg: *
+Iago López Galeiras <iago@kinvolk.io> (@iaguis) pkg: *
 Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle) pkg: *
 Krzesimir Nowak <krzesimir@kinvolk.io> (@krnowak) pkg: *
 Luca Bruno <luca.bruno@coreos.com> (@lucab) pkg: *
 Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak) pkg: *
 Stefan Junker <stefan.junker@coreos.com> (@steveeJ) pkg: *
-Tamer Tas <tamer.tas@coreos.com> (@tmrts) pkg: *
 Yifan Gu <yifan.gu@coreos.com> (@yifan-gu) pkg: *
 
 Piotr Skamruk <piotr.skamruk@gmail.com> (@jellonek) pkg: *kvm*

From d377265a32dbc02b81f6e629b9e24847c08dec35 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 7 Oct 2016 17:10:33 +0200
Subject: [PATCH 0773/1304] MAINTAINERS: add Casey (@squeed)

---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 6ce678f6b8..99cc3343dc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,5 +1,6 @@
 Alban Crequy <alban@kinvolk.io> (@alban) pkg: *
 Brandon Philips <brandon.philips@coreos.com> (@philips) pkg: *
+Casey Callendrello <casey.callendrello@coreos.com> (@squeed) pkg: *
 Derek Gonyeo <derek.gonyeo@coreos.com> (@dgonyeo) pkg: *
 Euan Kemp <euan.kemp@coreos.com> (@euank) pkg: *
 Iago López Galeiras <iago@kinvolk.io> (@iaguis) pkg: *

From b517008bb09c4fba15319a5ebeef523267e3eecf Mon Sep 17 00:00:00 2001
From: Josh Wood <j@coreos.com>
Date: Mon, 10 Oct 2016 18:23:35 -0700
Subject: [PATCH 0774/1304] dist/: Add systemd rkt-api service and socket

---
 dist/init/systemd/rkt-api-tcp.socket | 12 ++++++++++++
 dist/init/systemd/rkt-api.service    |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 dist/init/systemd/rkt-api-tcp.socket

diff --git a/dist/init/systemd/rkt-api-tcp.socket b/dist/init/systemd/rkt-api-tcp.socket
new file mode 100644
index 0000000000..98138f3964
--- /dev/null
+++ b/dist/init/systemd/rkt-api-tcp.socket
@@ -0,0 +1,12 @@
+[Unit]
+Description=rkt api service socket
+PartOf=rkt-api.service
+
+[Socket]
+ListenStream=127.0.0.1:15441
+ListenStream=[::1]:15441
+Service=rkt-api.service
+BindIPv6Only=both
+
+[Install]
+WantedBy=sockets.target
diff --git a/dist/init/systemd/rkt-api.service b/dist/init/systemd/rkt-api.service
index c07cc386d3..378eece883 100644
--- a/dist/init/systemd/rkt-api.service
+++ b/dist/init/systemd/rkt-api.service
@@ -1,10 +1,11 @@
 [Unit]
 Description=rkt api service
 Documentation=http://github.com/coreos/rkt
-After=network.target
+After=network.target rkt-api-tcp.socket
+Requires=rkt-api-tcp.socket
 
 [Service]
-ExecStart=/usr/bin/rkt api-service --listen=127.0.0.1:15441
+ExecStart=/usr/bin/rkt api-service
 
 [Install]
 WantedBy=multi-user.target

From 5e0da728d993ca2c9469ae50489f04e53ffc83b5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 11 Oct 2016 14:52:52 +0000
Subject: [PATCH 0775/1304] stage1: don't emit empty `ReadWriteDirectories`
 properties

Cleanup unit generation by removing an empty property, which
could make debugging confusing.
See https://github.com/coreos/rkt/issues/3272#issuecomment-252826939
---
 stage1/init/common/units.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 52884e80aa..24475db36f 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -429,6 +429,9 @@ func (uw *UnitWriter) AppUnit(
 			rwDirs = append(rwDirs, filepath.Join(common.RelAppRootfsPath(appName), mntPath))
 		}
 	}
+	if len(rwDirs) > 0 {
+		opts = append(opts, unit.NewUnitOption("Service", "ReadWriteDirectories", strings.Join(rwDirs, " ")))
+	}
 
 	// Restrict access to sensitive paths (eg. procfs) and devices. For kvm flavor,
 	// these paths are stored inside the vm, without influence to the host.
@@ -445,7 +448,6 @@ func (uw *UnitWriter) AppUnit(
 		}
 	}
 
-	opts = append(opts, unit.NewUnitOption("Service", "ReadWriteDirectories", strings.Join(rwDirs, " ")))
 	// When an app fails, we shut down the pod
 	opts = append(opts, unit.NewUnitOption("Unit", "OnFailure", "halt.target"))
 

From ab346246b0e9557dafc6b519dc5915ef22ae27a9 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Wed, 12 Oct 2016 12:01:23 +0200
Subject: [PATCH 0776/1304] dist: package rkt-api unit files

---
 scripts/pkg/build-pkgs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pkg/build-pkgs.sh b/scripts/pkg/build-pkgs.sh
index 3cbb43534c..acea8941b1 100755
--- a/scripts/pkg/build-pkgs.sh
+++ b/scripts/pkg/build-pkgs.sh
@@ -65,7 +65,7 @@ done
 install -Dm644 $projectdir/dist/bash_completion/rkt.bash $prefix/usr/share/bash-completion/completions/rkt
 install -Dm644 $projectdir/dist/init/systemd/tmpfiles.d/rkt.conf $prefix/usr/lib/tmpfiles.d/rkt.conf
 
-for unit in rkt-gc.{timer,service} rkt-metadata.{socket,service}; do
+for unit in rkt-gc.{timer,service} rkt-metadata.{socket,service} rkt-api{.service,-tcp.socket}; do
     install -Dm644 -t $prefix/usr/lib/systemd/system/  $projectdir/dist/init/systemd/${unit}
 done
 

From 102e05de679f10042b39054b14da15d401cbcc34 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 11 Oct 2016 14:59:17 +0000
Subject: [PATCH 0777/1304] stage1: prepare for systemd
 `ProtectKernelTunables=` and `InacessiblePaths`

systemd recently introduced additional protections for procfs and sysfs paths,
available via `InacessiblePaths=` (in v231) and `ProtectKernelTunables=` (in v232)
properties.
This align rkt on it for improved procfs/sysfs limits.
---
 stage1/init/common/pod.go   | 38 ++++++++++++++++++++-----------
 stage1/init/common/units.go | 14 +++++++-----
 tests/rkt_paths_test.go     | 45 ++++++++++++++++++++++++-------------
 3 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index b521c856b7..b1d3cba5c2 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -741,9 +741,10 @@ func getAppNoNewPrivileges(isolators types.Isolators) bool {
 	return false
 }
 
-// restrictProcFS restricts access to some security-sensitive paths under
+// protectKernelTunables restricts access to some security-sensitive paths under
 // /proc and /sys. Entries are either hidden or just made read-only to app.
-func protectSystemFiles(opts []*unit.UnitOption, appName types.ACName) []*unit.UnitOption {
+// This protection is enabled by default.
+func protectKernelTunables(opts []*unit.UnitOption, appName types.ACName, systemdVersion int) []*unit.UnitOption {
 	roPaths := []string{
 		"/proc/bus/",
 		"/proc/sys/kernel/core_pattern",
@@ -757,27 +758,38 @@ func protectSystemFiles(opts []*unit.UnitOption, appName types.ACName) []*unit.U
 		"/sys/devices/",
 		"/sys/kernel/",
 	}
-	hiddenPaths := []string{
-		// TODO(lucab): file-paths restrictions need support in systemd first
-		//"/proc/config.gz",
-		//"/proc/kallsyms",
-		//"/proc/sched_debug",
-		//"/proc/kcore",
-		//"/proc/kmem",
-		//"/proc/mem",
+	hiddenDirs := []string{
 		"/sys/firmware/",
 		"/sys/fs/",
 		"/sys/hypervisor/",
 		"/sys/module/",
 		"/sys/power/",
 	}
+	hiddenPaths := []string{
+		"/proc/config.gz",
+		"/proc/kallsyms",
+		"/proc/sched_debug",
+		"/proc/kcore",
+		"/proc/kmem",
+		"/proc/mem",
+	}
+
 	// Paths prefixed with "-" are ignored if they do not exist:
 	// https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ReadWriteDirectories=
-	for _, p := range hiddenPaths {
-		opts = append(opts, unit.NewUnitOption("Service", "InaccessibleDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
-	}
 	for _, p := range roPaths {
 		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
 	}
+	for _, p := range hiddenDirs {
+		opts = append(opts, unit.NewUnitOption("Service", "InaccessibleDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
+	}
+	if systemdVersion >= 231 {
+		for _, p := range hiddenPaths {
+			opts = append(opts, unit.NewUnitOption("Service", "InaccessiblePaths", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
+		}
+	}
+	if systemdVersion >= 232 {
+		opts = append(opts, unit.NewUnitOption("Service", "ProtectKernelTunables", "true"))
+	}
+
 	return opts
 }
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 24475db36f..1bf212c234 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -285,9 +285,9 @@ func (uw *UnitWriter) AppUnit(
 		return
 	}
 
-	flavor, _, err := GetFlavor(uw.p)
+	flavor, systemdVersion, err := GetFlavor(uw.p)
 	if err != nil {
-		uw.err = errwrap.Wrap(errors.New("failed to create shutdown service"), err)
+		uw.err = errwrap.Wrap(errors.New("unable to determine stage1 flavor"), err)
 		return
 	}
 
@@ -433,10 +433,14 @@ func (uw *UnitWriter) AppUnit(
 		opts = append(opts, unit.NewUnitOption("Service", "ReadWriteDirectories", strings.Join(rwDirs, " ")))
 	}
 
-	// Restrict access to sensitive paths (eg. procfs) and devices. For kvm flavor,
-	// these paths are stored inside the vm, without influence to the host.
+	// Restrict access to sensitive paths (eg. procfs and sysfs entries).
+	if !insecureOptions.DisablePaths {
+		opts = protectKernelTunables(opts, appName, systemdVersion)
+	}
+
+	// Generate default device policy for the app, as well as the list of allowed devices.
+	// For kvm flavor, devices are VM-specific and restricting them is not strictly needed.
 	if !insecureOptions.DisablePaths && flavor != "kvm" {
-		opts = protectSystemFiles(opts, appName)
 		opts = append(opts, unit.NewUnitOption("Service", "DevicePolicy", "closed"))
 		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(absRoot), appName, app.MountPoints, mounts, vols, uidRange)
 		if err != nil {
diff --git a/tests/rkt_paths_test.go b/tests/rkt_paths_test.go
index a1dc850dd6..1ebebe3343 100644
--- a/tests/rkt_paths_test.go
+++ b/tests/rkt_paths_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build host coreos src
+// +build coreos src
 
 package main
 
@@ -85,20 +85,35 @@ func TestPathsWrite(t *testing.T) {
 // /proc or /sys is correctly restricted:
 // https://github.com/coreos/rkt/issues/2484
 func TestPathsStat(t *testing.T) {
-	hiddenEntry := "/sys/firmware/"
-	hiddenImage := patchTestACI("rkt-inspect-stat-procfs.aci", fmt.Sprintf("--exec=/inspect --stat-file --file-name %s", hiddenEntry))
-	defer os.Remove(hiddenImage)
+	tests := []struct {
+		Path         string
+		ExpectedMode string
+	}{
+		{
+			Path:         "/sys/firmware",
+			ExpectedMode: "d---------",
+		},
+		{
+			Path:         "/proc/kcore",
+			ExpectedMode: "----------",
+		},
+	}
 
-	hiddenCtx := testutils.NewRktRunCtx()
-	defer hiddenCtx.Cleanup()
+	for _, tt := range tests {
+		hiddenImage := patchTestACI("rkt-inspect-stat-procfs.aci", fmt.Sprintf("--exec=/inspect --stat-file --file-name %s", tt.Path))
+		defer os.Remove(hiddenImage)
 
-	//run
-	hiddenCmd := fmt.Sprintf("%s --insecure-options=image run %s", hiddenCtx.Cmd(), hiddenImage)
-	hiddenExpectedLine := fmt.Sprintf("%s: mode: d---------", hiddenEntry)
-	runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
-	// run-prepared
-	hiddenCmd = fmt.Sprintf(`%s --insecure-options=image prepare %s`, hiddenCtx.Cmd(), hiddenImage)
-	uuid := runRktAndGetUUID(t, hiddenCmd)
-	hiddenCmd = fmt.Sprintf("%s run-prepared --mds-register=false %s", hiddenCtx.Cmd(), uuid)
-	runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
+		hiddenCtx := testutils.NewRktRunCtx()
+		defer hiddenCtx.Cleanup()
+
+		//run
+		hiddenCmd := fmt.Sprintf("%s --insecure-options=image run %s", hiddenCtx.Cmd(), hiddenImage)
+		hiddenExpectedLine := fmt.Sprintf("%s: mode: %s", tt.Path, tt.ExpectedMode)
+		runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
+		// run-prepared
+		hiddenCmd = fmt.Sprintf(`%s --insecure-options=image prepare %s`, hiddenCtx.Cmd(), hiddenImage)
+		uuid := runRktAndGetUUID(t, hiddenCmd)
+		hiddenCmd = fmt.Sprintf("%s run-prepared --mds-register=false %s", hiddenCtx.Cmd(), uuid)
+		runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
+	}
 }

From dece112c3fe88fe1d87242e3f3e96b99b1191954 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 12 Oct 2016 17:38:51 +0200
Subject: [PATCH 0778/1304] cgroup: introduce proper cgroup/v1, cgroup/v2
 packages

Currently we have func .*V[1|2].* named function names in the cgroup
package.

This factors those functions into two separate packages cgroup/v1, and
cgroup/v2.

This is a prerequisite for #3242
---
 common/cgroup/cgroup.go               | 442 +-------------------------
 common/cgroup/v1/cgroup.go            | 419 ++++++++++++++++++++++++
 common/cgroup/{ => v1}/cgroup_test.go |   4 +-
 common/cgroup/v2/cgroup.go            |  72 +++++
 rkt/api_service.go                    |   4 +-
 stage1/gc/gc.go                       |   3 +-
 stage1/init/common/units.go           |  59 +++-
 stage1/init/init.go                   |  22 +-
 tests/inspect/inspect.go              |   8 +-
 9 files changed, 567 insertions(+), 466 deletions(-)
 create mode 100644 common/cgroup/v1/cgroup.go
 rename common/cgroup/{ => v1}/cgroup_test.go (97%)
 create mode 100644 common/cgroup/v2/cgroup.go

diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index b71a0edf92..71154a411e 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -17,24 +17,16 @@
 package cgroup
 
 import (
-	"bufio"
 	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strconv"
-	"strings"
 	"syscall"
 
-	"github.com/coreos/go-systemd/unit"
+	"github.com/coreos/rkt/common/cgroup/v1"
+	"github.com/coreos/rkt/common/cgroup/v2"
 	"github.com/hashicorp/errwrap"
-	"k8s.io/kubernetes/pkg/api/resource"
 )
 
-type addIsolatorFunc func(opts []*unit.UnitOption, limit *resource.Quantity) ([]*unit.UnitOption, error)
-
 const (
 	// The following const comes from
 	// #define CGROUP2_SUPER_MAGIC  0x63677270
@@ -42,72 +34,6 @@ const (
 	Cgroup2fsMagicNumber = 0x63677270
 )
 
-var (
-	isolatorFuncs = map[string]addIsolatorFunc{
-		"cpu":    addCpuLimit,
-		"memory": addMemoryLimit,
-	}
-	v1CgroupControllerRWFiles = map[string][]string{
-		"memory":  {"memory.limit_in_bytes"},
-		"cpu":     {"cpu.cfs_quota_us"},
-		"devices": {"devices.allow", "devices.deny"},
-	}
-)
-
-func addCpuLimit(opts []*unit.UnitOption, limit *resource.Quantity) ([]*unit.UnitOption, error) {
-	if limit.Value() > resource.MaxMilliValue {
-		return nil, fmt.Errorf("cpu limit exceeds the maximum millivalue: %v", limit.String())
-	}
-	quota := strconv.Itoa(int(limit.MilliValue()/10)) + "%"
-	opts = append(opts, unit.NewUnitOption("Service", "CPUQuota", quota))
-	return opts, nil
-}
-
-func addMemoryLimit(opts []*unit.UnitOption, limit *resource.Quantity) ([]*unit.UnitOption, error) {
-	opts = append(opts, unit.NewUnitOption("Service", "MemoryLimit", strconv.Itoa(int(limit.Value()))))
-	return opts, nil
-}
-
-func mountFsRO(mountPoint string) error {
-	var flags uintptr = syscall.MS_BIND |
-		syscall.MS_REMOUNT |
-		syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV |
-		syscall.MS_RDONLY
-	if err := syscall.Mount(mountPoint, mountPoint, "", flags, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", mountPoint), err)
-	}
-
-	return nil
-}
-
-// MaybeAddIsolator considers the given isolator; if the type is known
-// (i.e. IsIsolatorSupported is true) and the limit is non-nil, the supplied
-// opts will be extended with an appropriate option implementing the desired
-// isolation.
-func MaybeAddIsolator(opts []*unit.UnitOption, isolator string, limit *resource.Quantity) ([]*unit.UnitOption, error) {
-	var err error
-	if limit == nil {
-		return opts, nil
-	}
-	isSupported, err := IsIsolatorSupported(isolator)
-	if err != nil {
-		return nil, err
-	}
-
-	if isSupported {
-		opts, err = isolatorFuncs[isolator](opts, limit)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		fmt.Fprintf(os.Stderr, "warning: resource/%s isolator set but support disabled in the kernel, skipping\n", isolator)
-	}
-
-	return opts, nil
-}
-
 // IsIsolatorSupported returns whether an isolator is supported in the kernel
 func IsIsolatorSupported(isolator string) (bool, error) {
 	isUnified, err := IsCgroupUnified("/")
@@ -116,7 +42,7 @@ func IsIsolatorSupported(isolator string) (bool, error) {
 	}
 
 	if isUnified {
-		controllers, err := GetEnabledV2Controllers()
+		controllers, err := v2.GetEnabledControllers()
 		if err != nil {
 			return false, errwrap.Wrap(errors.New("error determining enabled controllers"), err)
 		}
@@ -128,7 +54,7 @@ func IsIsolatorSupported(isolator string) (bool, error) {
 		return false, nil
 	}
 
-	if files, ok := v1CgroupControllerRWFiles[isolator]; ok {
+	if files := v1.CgroupControllerRWFiles(isolator); len(files) > 0 {
 		for _, f := range files {
 			isolatorPath := filepath.Join("/sys/fs/cgroup/", isolator, f)
 			if _, err := os.Stat(isolatorPath); os.IsNotExist(err) {
@@ -137,6 +63,7 @@ func IsIsolatorSupported(isolator string) (bool, error) {
 		}
 		return true, nil
 	}
+
 	return false, nil
 }
 
@@ -151,362 +78,3 @@ func IsCgroupUnified(root string) (bool, error) {
 
 	return statfs.Type == Cgroup2fsMagicNumber, nil
 }
-
-/*
- * cgroup v2 functions
- */
-
-// GetEnabledV2Controllers returns a list of enabled cgroup controllers
-func GetEnabledV2Controllers() ([]string, error) {
-	controllersFile, err := os.Open("/sys/fs/cgroup/cgroup.controllers")
-	if err != nil {
-		return nil, err
-	}
-	defer controllersFile.Close()
-
-	sc := bufio.NewScanner(controllersFile)
-
-	sc.Scan()
-	if err := sc.Err(); err != nil {
-		return nil, err
-	}
-
-	return strings.Split(sc.Text(), " "), nil
-}
-
-func parseV2ProcCgroupInfo(procCgroupInfoPath string) (string, error) {
-	cg, err := os.Open(procCgroupInfoPath)
-	if err != nil {
-		return "", errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
-	}
-	defer cg.Close()
-
-	s := bufio.NewScanner(cg)
-	s.Scan()
-	parts := strings.SplitN(s.Text(), ":", 3)
-	if len(parts) < 3 {
-		return "", fmt.Errorf("error parsing /proc/self/cgroup")
-	}
-
-	return parts[2], nil
-}
-
-// GetOwnCgroupPath returns the cgroup path of this process
-func GetOwnV2CgroupPath() (string, error) {
-	return parseV2ProcCgroupInfo("/proc/self/cgroup")
-}
-
-// GetCgroupPathByPid returns the cgroup path of the process
-func GetV2CgroupPathByPid(pid int) (string, error) {
-	return parseV2ProcCgroupInfo(fmt.Sprintf("/proc/%d/cgroup", pid))
-}
-
-/*
- * cgroup v1 functions
- */
-
-func parseV1Cgroups(f io.Reader) (map[int][]string, error) {
-	sc := bufio.NewScanner(f)
-
-	// skip first line since it is a comment
-	sc.Scan()
-
-	cgroups := make(map[int][]string)
-	for sc.Scan() {
-		var controller string
-		var hierarchy int
-		var num int
-		var enabled int
-		fmt.Sscanf(sc.Text(), "%s %d %d %d", &controller, &hierarchy, &num, &enabled)
-
-		if enabled == 1 {
-			if _, ok := cgroups[hierarchy]; !ok {
-				cgroups[hierarchy] = []string{controller}
-			} else {
-				cgroups[hierarchy] = append(cgroups[hierarchy], controller)
-			}
-		}
-	}
-
-	if err := sc.Err(); err != nil {
-		return nil, err
-	}
-
-	return cgroups, nil
-}
-
-// GetEnabledV1Cgroups returns a map with the enabled cgroup controllers grouped by
-// hierarchy
-func GetEnabledV1Cgroups() (map[int][]string, error) {
-	cgroupsFile, err := os.Open("/proc/cgroups")
-	if err != nil {
-		return nil, err
-	}
-	defer cgroupsFile.Close()
-
-	cgroups, err := parseV1Cgroups(cgroupsFile)
-	if err != nil {
-		return nil, errwrap.Wrap(errors.New("error parsing /proc/cgroups"), err)
-	}
-
-	return cgroups, nil
-}
-
-// GetV1ControllerDirs takes a map with the enabled cgroup controllers grouped by
-// hierarchy and returns the directory names as they should be in
-// /sys/fs/cgroup
-func GetV1ControllerDirs(cgroups map[int][]string) []string {
-	var controllers []string
-	for _, cs := range cgroups {
-		controllers = append(controllers, strings.Join(cs, ","))
-	}
-
-	return controllers
-}
-
-func getV1ControllerSymlinks(cgroups map[int][]string) map[string]string {
-	symlinks := make(map[string]string)
-
-	for _, cs := range cgroups {
-		if len(cs) > 1 {
-			tgt := strings.Join(cs, ",")
-			for _, ln := range cs {
-				symlinks[ln] = tgt
-			}
-		}
-	}
-
-	return symlinks
-}
-
-func getV1ControllerRWFiles(controller string) []string {
-	parts := strings.Split(controller, ",")
-	for _, p := range parts {
-		if files, ok := v1CgroupControllerRWFiles[p]; ok {
-			// cgroup.procs always needs to be RW for allowing systemd to add
-			// processes to the controller
-			files = append(files, "cgroup.procs")
-			return files
-		}
-	}
-
-	return nil
-}
-
-func parseV1CgroupController(cgroupPath, controller string) ([]string, error) {
-	cg, err := os.Open(cgroupPath)
-	if err != nil {
-		return nil, errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
-	}
-	defer cg.Close()
-
-	s := bufio.NewScanner(cg)
-	for s.Scan() {
-		parts := strings.SplitN(s.Text(), ":", 3)
-		if len(parts) < 3 {
-			return nil, fmt.Errorf("error parsing /proc/self/cgroup")
-		}
-		controllerParts := strings.Split(parts[1], ",")
-		for _, c := range controllerParts {
-			if c == controller {
-				return parts, nil
-			}
-		}
-	}
-
-	return nil, fmt.Errorf("controller %q not found", controller)
-}
-
-// GetOwnV1CgroupPath returns the cgroup path of this process in controller
-// hierarchy
-func GetOwnV1CgroupPath(controller string) (string, error) {
-	parts, err := parseV1CgroupController("/proc/self/cgroup", controller)
-	if err != nil {
-		return "", err
-	}
-	return parts[2], nil
-}
-
-// GetV1CgroupPathByPid returns the cgroup path of the process with the given pid
-// and given controller.
-func GetV1CgroupPathByPid(pid int, controller string) (string, error) {
-	parts, err := parseV1CgroupController(fmt.Sprintf("/proc/%d/cgroup", pid), controller)
-	if err != nil {
-		return "", err
-	}
-	return parts[2], nil
-}
-
-// JoinV1Subcgroup makes the calling process join the subcgroup hierarchy on a
-// particular controller
-func JoinV1Subcgroup(controller string, subcgroup string) error {
-	subcgroupPath := filepath.Join("/sys/fs/cgroup", controller, subcgroup)
-	if err := os.MkdirAll(subcgroupPath, 0600); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error creating %q subcgroup", subcgroup), err)
-	}
-	pidBytes := []byte(strconv.Itoa(os.Getpid()))
-	if err := ioutil.WriteFile(filepath.Join(subcgroupPath, "cgroup.procs"), pidBytes, 0600); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error adding ourselves to the %q subcgroup", subcgroup), err)
-	}
-
-	return nil
-}
-
-// If /system.slice does not exist in the cpuset controller, create it and
-// configure it.
-// Since this is a workaround, we ignore errors
-func fixCpusetKnobs(cpusetPath string) {
-	cgroupPathFix := filepath.Join(cpusetPath, "system.slice")
-	_ = os.MkdirAll(cgroupPathFix, 0755)
-	knobs := []string{"cpuset.mems", "cpuset.cpus"}
-	for _, knob := range knobs {
-		parentFile := filepath.Join(filepath.Dir(cgroupPathFix), knob)
-		childFile := filepath.Join(cgroupPathFix, knob)
-
-		data, err := ioutil.ReadFile(childFile)
-		if err != nil {
-			continue
-		}
-		// If the file is already configured, don't change it
-		if strings.TrimSpace(string(data)) != "" {
-			continue
-		}
-
-		data, err = ioutil.ReadFile(parentFile)
-		if err == nil {
-			// Workaround: just write twice to workaround the kernel bug fixed by this commit:
-			// https://github.com/torvalds/linux/commit/24ee3cf89bef04e8bc23788aca4e029a3f0f06d9
-			ioutil.WriteFile(childFile, data, 0644)
-			ioutil.WriteFile(childFile, data, 0644)
-		}
-	}
-}
-
-// IsV1ControllerMounted returns whether a controller is mounted by checking that
-// cgroup.procs is accessible
-func IsV1ControllerMounted(c string) bool {
-	cgroupProcsPath := filepath.Join("/sys/fs/cgroup", c, "cgroup.procs")
-	if _, err := os.Stat(cgroupProcsPath); err != nil {
-		return false
-	}
-
-	return true
-}
-
-// CreateV1Cgroups mounts the v1 cgroup controllers hierarchy in /sys/fs/cgroup
-// under root
-func CreateV1Cgroups(root string, enabledCgroups map[int][]string, mountContext string) error {
-	controllers := GetV1ControllerDirs(enabledCgroups)
-	var flags uintptr
-
-	sys := filepath.Join(root, "/sys")
-	if err := os.MkdirAll(sys, 0700); err != nil {
-		return err
-	}
-	flags = syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV
-	// If we're mounting the host cgroups, /sys is probably mounted so we
-	// ignore EBUSY
-	if err := syscall.Mount("sysfs", sys, "sysfs", flags, ""); err != nil && err != syscall.EBUSY {
-		return errwrap.Wrap(fmt.Errorf("error mounting %q", sys), err)
-	}
-
-	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
-	if err := os.MkdirAll(cgroupTmpfs, 0700); err != nil {
-		return err
-	}
-	flags = syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV |
-		syscall.MS_STRICTATIME
-
-	options := "mode=755"
-	if mountContext != "" {
-		options = fmt.Sprintf("mode=755,context=\"%s\"", mountContext)
-	}
-
-	if err := syscall.Mount("tmpfs", cgroupTmpfs, "tmpfs", flags, options); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error mounting %q", cgroupTmpfs), err)
-	}
-
-	// Mount controllers
-	for _, c := range controllers {
-		cPath := filepath.Join(root, "/sys/fs/cgroup", c)
-		if err := os.MkdirAll(cPath, 0700); err != nil {
-			return err
-		}
-
-		flags = syscall.MS_NOSUID |
-			syscall.MS_NOEXEC |
-			syscall.MS_NODEV
-		if err := syscall.Mount("cgroup", cPath, "cgroup", flags, c); err != nil {
-			return errwrap.Wrap(fmt.Errorf("error mounting %q", cPath), err)
-		}
-	}
-
-	// Create symlinks for combined controllers
-	symlinks := getV1ControllerSymlinks(enabledCgroups)
-	for ln, tgt := range symlinks {
-		lnPath := filepath.Join(cgroupTmpfs, ln)
-		if err := os.Symlink(tgt, lnPath); err != nil {
-			return errwrap.Wrap(errors.New("error creating symlink"), err)
-		}
-	}
-
-	systemdControllerPath := filepath.Join(root, "/sys/fs/cgroup/systemd")
-	if err := os.MkdirAll(systemdControllerPath, 0700); err != nil {
-		return err
-	}
-
-	// Bind-mount cgroup tmpfs filesystem read-only
-	return mountFsRO(cgroupTmpfs)
-}
-
-// RemountV1CgroupsRO remounts the v1 cgroup hierarchy under root read-only,
-// leaving the needed knobs in the subcgroup for each app read-write so the
-// systemd inside stage1 can apply isolators to them
-func RemountV1CgroupsRO(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
-	controllers := GetV1ControllerDirs(enabledCgroups)
-	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
-	sysPath := filepath.Join(root, "/sys")
-
-	// Mount RW knobs we need to make the enabled isolators work
-	for _, c := range controllers {
-		cPath := filepath.Join(cgroupTmpfs, c)
-		subcgroupPath := filepath.Join(cPath, subcgroup, "system.slice")
-
-		// Workaround for https://github.com/coreos/rkt/issues/1210
-		if c == "cpuset" {
-			fixCpusetKnobs(cPath)
-		}
-
-		// Create cgroup directories and mount the files we need over
-		// themselves so they stay read-write
-		for _, serviceName := range serviceNames {
-			appCgroup := filepath.Join(subcgroupPath, serviceName)
-			if err := os.MkdirAll(appCgroup, 0755); err != nil {
-				return err
-			}
-			for _, f := range getV1ControllerRWFiles(c) {
-				cgroupFilePath := filepath.Join(appCgroup, f)
-				// the file may not be there if kernel doesn't support the
-				// feature, skip it in that case
-				if _, err := os.Stat(cgroupFilePath); os.IsNotExist(err) {
-					continue
-				}
-				if err := syscall.Mount(cgroupFilePath, cgroupFilePath, "", syscall.MS_BIND, ""); err != nil {
-					return errwrap.Wrap(fmt.Errorf("error bind mounting %q", cgroupFilePath), err)
-				}
-			}
-		}
-
-		// Re-mount controller read-only to prevent the container modifying host controllers
-		if err := mountFsRO(cPath); err != nil {
-			return err
-		}
-	}
-
-	// Bind-mount sys filesystem read-only
-	return mountFsRO(sysPath)
-}
diff --git a/common/cgroup/v1/cgroup.go b/common/cgroup/v1/cgroup.go
new file mode 100644
index 0000000000..a468dcf3cd
--- /dev/null
+++ b/common/cgroup/v1/cgroup.go
@@ -0,0 +1,419 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package v1
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"github.com/hashicorp/errwrap"
+)
+
+var (
+	cgroupControllerRWFiles = map[string][]string{
+		"memory":  {"memory.limit_in_bytes"},
+		"cpu":     {"cpu.cfs_quota_us", "cpu.shares"},
+		"devices": {"devices.allow", "devices.deny"},
+	}
+)
+
+func mountFsRO(mountPoint string) error {
+	var flags uintptr = syscall.MS_BIND |
+		syscall.MS_REMOUNT |
+		syscall.MS_NOSUID |
+		syscall.MS_NOEXEC |
+		syscall.MS_NODEV |
+		syscall.MS_RDONLY
+	if err := syscall.Mount(mountPoint, mountPoint, "", flags, ""); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", mountPoint), err)
+	}
+
+	return nil
+}
+
+func parseCgroups(f io.Reader) (map[int][]string, error) {
+	sc := bufio.NewScanner(f)
+
+	// skip first line since it is a comment
+	sc.Scan()
+
+	cgroups := make(map[int][]string)
+	for sc.Scan() {
+		var controller string
+		var hierarchy int
+		var num int
+		var enabled int
+		fmt.Sscanf(sc.Text(), "%s %d %d %d", &controller, &hierarchy, &num, &enabled)
+
+		if enabled == 1 {
+			if _, ok := cgroups[hierarchy]; !ok {
+				cgroups[hierarchy] = []string{controller}
+			} else {
+				cgroups[hierarchy] = append(cgroups[hierarchy], controller)
+			}
+		}
+	}
+
+	if err := sc.Err(); err != nil {
+		return nil, err
+	}
+
+	return cgroups, nil
+}
+
+// GetEnabledCgroups returns a map with the enabled cgroup controllers grouped by
+// hierarchy
+func GetEnabledCgroups() (map[int][]string, error) {
+	cgroupsFile, err := os.Open("/proc/cgroups")
+	if err != nil {
+		return nil, err
+	}
+	defer cgroupsFile.Close()
+
+	cgroups, err := parseCgroups(cgroupsFile)
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("error parsing /proc/cgroups"), err)
+	}
+
+	return cgroups, nil
+}
+
+// GetControllerDirs takes a map with the enabled cgroup controllers grouped by
+// hierarchy and returns the directory names as they should be in
+// /sys/fs/cgroup
+func GetControllerDirs(cgroups map[int][]string) []string {
+	var controllers []string
+	for _, cs := range cgroups {
+		controllers = append(controllers, strings.Join(cs, ","))
+	}
+
+	return controllers
+}
+
+func getControllerSymlinks(cgroups map[int][]string) map[string]string {
+	symlinks := make(map[string]string)
+
+	for _, cs := range cgroups {
+		if len(cs) > 1 {
+			tgt := strings.Join(cs, ",")
+			for _, ln := range cs {
+				symlinks[ln] = tgt
+			}
+		}
+	}
+
+	return symlinks
+}
+
+func CgroupControllerRWFiles(isolator string) []string {
+	files, _ := cgroupControllerRWFiles[isolator]
+	return files
+}
+
+func getControllerRWFiles(controller string) []string {
+	parts := strings.Split(controller, ",")
+	for _, p := range parts {
+		if files, ok := cgroupControllerRWFiles[p]; ok {
+			// cgroup.procs always needs to be RW for allowing systemd to add
+			// processes to the controller
+			files = append(files, "cgroup.procs")
+			return files
+		}
+	}
+
+	return nil
+}
+
+func parseCgroupController(cgroupPath, controller string) ([]string, error) {
+	cg, err := os.Open(cgroupPath)
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
+	}
+	defer cg.Close()
+
+	s := bufio.NewScanner(cg)
+	for s.Scan() {
+		parts := strings.SplitN(s.Text(), ":", 3)
+		if len(parts) < 3 {
+			return nil, fmt.Errorf("error parsing /proc/self/cgroup")
+		}
+		controllerParts := strings.Split(parts[1], ",")
+		for _, c := range controllerParts {
+			if c == controller {
+				return parts, nil
+			}
+		}
+	}
+
+	return nil, fmt.Errorf("controller %q not found", controller)
+}
+
+// GetOwnCgroupPath returns the cgroup path of this process in controller
+// hierarchy
+func GetOwnCgroupPath(controller string) (string, error) {
+	parts, err := parseCgroupController("/proc/self/cgroup", controller)
+	if err != nil {
+		return "", err
+	}
+	return parts[2], nil
+}
+
+// GetCgroupPathByPid returns the cgroup path of the process with the given pid
+// and given controller.
+func GetCgroupPathByPid(pid int, controller string) (string, error) {
+	parts, err := parseCgroupController(fmt.Sprintf("/proc/%d/cgroup", pid), controller)
+	if err != nil {
+		return "", err
+	}
+	return parts[2], nil
+}
+
+// JoinSubcgroup makes the calling process join the subcgroup hierarchy on a
+// particular controller
+func JoinSubcgroup(controller string, subcgroup string) error {
+	subcgroupPath := filepath.Join("/sys/fs/cgroup", controller, subcgroup)
+	if err := os.MkdirAll(subcgroupPath, 0600); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error creating %q subcgroup", subcgroup), err)
+	}
+	pidBytes := []byte(strconv.Itoa(os.Getpid()))
+	if err := ioutil.WriteFile(filepath.Join(subcgroupPath, "cgroup.procs"), pidBytes, 0600); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error adding ourselves to the %q subcgroup", subcgroup), err)
+	}
+
+	return nil
+}
+
+// If /system.slice does not exist in the cpuset controller, create it and
+// configure it.
+// Since this is a workaround, we ignore errors
+func fixCpusetKnobs(cpusetPath string) {
+	cgroupPathFix := filepath.Join(cpusetPath, "system.slice")
+	_ = os.MkdirAll(cgroupPathFix, 0755)
+	knobs := []string{"cpuset.mems", "cpuset.cpus"}
+	for _, knob := range knobs {
+		parentFile := filepath.Join(filepath.Dir(cgroupPathFix), knob)
+		childFile := filepath.Join(cgroupPathFix, knob)
+
+		data, err := ioutil.ReadFile(childFile)
+		if err != nil {
+			continue
+		}
+		// If the file is already configured, don't change it
+		if strings.TrimSpace(string(data)) != "" {
+			continue
+		}
+
+		data, err = ioutil.ReadFile(parentFile)
+		if err == nil {
+			// Workaround: just write twice to workaround the kernel bug fixed by this commit:
+			// https://github.com/torvalds/linux/commit/24ee3cf89bef04e8bc23788aca4e029a3f0f06d9
+			ioutil.WriteFile(childFile, data, 0644)
+			ioutil.WriteFile(childFile, data, 0644)
+		}
+	}
+}
+
+// IsControllerMounted returns whether a controller is mounted by checking that
+// cgroup.procs is accessible
+func IsControllerMounted(c string) bool {
+	cgroupProcsPath := filepath.Join("/sys/fs/cgroup", c, "cgroup.procs")
+	if _, err := os.Stat(cgroupProcsPath); err != nil {
+		return false
+	}
+
+	return true
+}
+
+// CreateCgroups mounts the v1 cgroup controllers hierarchy in /sys/fs/cgroup
+// under root
+func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext string) error {
+	controllers := GetControllerDirs(enabledCgroups)
+	var flags uintptr
+
+	sys := filepath.Join(root, "/sys")
+	if err := os.MkdirAll(sys, 0700); err != nil {
+		return err
+	}
+	flags = syscall.MS_NOSUID |
+		syscall.MS_NOEXEC |
+		syscall.MS_NODEV
+	// If we're mounting the host cgroups, /sys is probably mounted so we
+	// ignore EBUSY
+	if err := syscall.Mount("sysfs", sys, "sysfs", flags, ""); err != nil && err != syscall.EBUSY {
+		return errwrap.Wrap(fmt.Errorf("error mounting %q", sys), err)
+	}
+
+	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
+	if err := os.MkdirAll(cgroupTmpfs, 0700); err != nil {
+		return err
+	}
+	flags = syscall.MS_NOSUID |
+		syscall.MS_NOEXEC |
+		syscall.MS_NODEV |
+		syscall.MS_STRICTATIME
+
+	options := "mode=755"
+	if mountContext != "" {
+		options = fmt.Sprintf("mode=755,context=\"%s\"", mountContext)
+	}
+
+	if err := syscall.Mount("tmpfs", cgroupTmpfs, "tmpfs", flags, options); err != nil {
+		return errwrap.Wrap(fmt.Errorf("error mounting %q", cgroupTmpfs), err)
+	}
+
+	// Mount controllers
+	for _, c := range controllers {
+		cPath := filepath.Join(root, "/sys/fs/cgroup", c)
+		if err := os.MkdirAll(cPath, 0700); err != nil {
+			return err
+		}
+
+		flags = syscall.MS_NOSUID |
+			syscall.MS_NOEXEC |
+			syscall.MS_NODEV
+		if err := syscall.Mount("cgroup", cPath, "cgroup", flags, c); err != nil {
+			return errwrap.Wrap(fmt.Errorf("error mounting %q", cPath), err)
+		}
+	}
+
+	// Create symlinks for combined controllers
+	symlinks := getControllerSymlinks(enabledCgroups)
+	for ln, tgt := range symlinks {
+		lnPath := filepath.Join(cgroupTmpfs, ln)
+		if err := os.Symlink(tgt, lnPath); err != nil {
+			return errwrap.Wrap(errors.New("error creating symlink"), err)
+		}
+	}
+
+	systemdControllerPath := filepath.Join(root, "/sys/fs/cgroup/systemd")
+	if err := os.MkdirAll(systemdControllerPath, 0700); err != nil {
+		return err
+	}
+
+	// Bind-mount cgroup tmpfs filesystem read-only
+	return mountFsRO(cgroupTmpfs)
+}
+
+// RemountCgroupsRO remounts the v1 cgroup hierarchy under root read-only,
+// leaving the needed knobs in the subcgroup for each app read-write so the
+// systemd inside stage1 can apply isolators to them
+func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
+	controllers := GetControllerDirs(enabledCgroups)
+	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
+	sysPath := filepath.Join(root, "/sys")
+
+	// Mount RW knobs we need to make the enabled isolators work
+	for _, c := range controllers {
+		cPath := filepath.Join(cgroupTmpfs, c)
+		subcgroupPath := filepath.Join(cPath, subcgroup, "system.slice")
+
+		// Workaround for https://github.com/coreos/rkt/issues/1210
+		if c == "cpuset" {
+			fixCpusetKnobs(cPath)
+		}
+
+		// Create cgroup directories and mount the files we need over
+		// themselves so they stay read-write
+		for _, serviceName := range serviceNames {
+			appCgroup := filepath.Join(subcgroupPath, serviceName)
+			if err := os.MkdirAll(appCgroup, 0755); err != nil {
+				return err
+			}
+			for _, f := range getControllerRWFiles(c) {
+				cgroupFilePath := filepath.Join(appCgroup, f)
+				// the file may not be there if kernel doesn't support the
+				// feature, skip it in that case
+				if _, err := os.Stat(cgroupFilePath); os.IsNotExist(err) {
+					continue
+				}
+				if err := syscall.Mount(cgroupFilePath, cgroupFilePath, "", syscall.MS_BIND, ""); err != nil {
+					return errwrap.Wrap(fmt.Errorf("error bind mounting %q", cgroupFilePath), err)
+				}
+			}
+		}
+
+		// Re-mount controller read-only to prevent the container modifying host controllers
+		if err := mountFsRO(cPath); err != nil {
+			return err
+		}
+	}
+
+	// Bind-mount sys filesystem read-only
+	return mountFsRO(sysPath)
+}
+
+// RemountCgroupKnobsRW remounts the needed knobs in the subcgroup for one
+// specified app read-write so the systemd inside stage1 can apply isolators
+// to them.
+func RemountCgroupKnobsRW(enabledCgroups map[int][]string, subcgroup string, serviceName string, enterCmd []string) error {
+	controllers := GetControllerDirs(enabledCgroups)
+
+	// Mount RW knobs we need to make the enabled isolators work
+	for _, c := range controllers {
+		cPath := filepath.Join("/sys/fs/cgroup", c)
+		subcgroupPath := filepath.Join(cPath, subcgroup, "system.slice")
+
+		// Create cgroup directories and mount the files we need over
+		// themselves so they stay read-write
+		appCgroup := filepath.Join(subcgroupPath, serviceName)
+		if err := os.MkdirAll(appCgroup, 0755); err != nil {
+			return err
+		}
+		for _, f := range getControllerRWFiles(c) {
+			cgroupFilePath := filepath.Join(appCgroup, f)
+			// the file may not be there if kernel doesn't support the
+			// feature, skip it in that case
+			if _, err := os.Stat(cgroupFilePath); os.IsNotExist(err) {
+				continue
+			}
+
+			// Go applications cannot be  reassociated  with a new mount
+			// namespace because they are multithreaded. Instead of
+			// syscall.Mount, uses the enter entrypoint.
+			argsMountBind := append(enterCmd, "/bin/mount", "--bind", cgroupFilePath, cgroupFilePath)
+			cmdMountBind := exec.Cmd{
+				Path: argsMountBind[0],
+				Args: argsMountBind,
+			}
+
+			if err := cmdMountBind.Run(); err != nil {
+				return err
+			}
+
+			argsRemountRW := append(enterCmd, "/bin/mount", "-o", "remount,bind,rw", cgroupFilePath)
+			cmdRemountRW := exec.Cmd{
+				Path: argsRemountRW[0],
+				Args: argsRemountRW,
+			}
+
+			if err := cmdRemountRW.Run(); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/common/cgroup/cgroup_test.go b/common/cgroup/v1/cgroup_test.go
similarity index 97%
rename from common/cgroup/cgroup_test.go
rename to common/cgroup/v1/cgroup_test.go
index 614db8748f..65051efb45 100644
--- a/common/cgroup/cgroup_test.go
+++ b/common/cgroup/v1/cgroup_test.go
@@ -14,7 +14,7 @@
 
 //+build linux
 
-package cgroup
+package v1
 
 import (
 	"io"
@@ -100,7 +100,7 @@ net_prio	6	432	1`
 	}
 
 	for i, tt := range tests {
-		o, err := parseV1Cgroups(tt.input)
+		o, err := parseCgroups(tt.input)
 		if err != nil {
 			t.Errorf("#%d: unexpected error `%v`", i, err)
 		}
diff --git a/common/cgroup/v2/cgroup.go b/common/cgroup/v2/cgroup.go
new file mode 100644
index 0000000000..9a608af973
--- /dev/null
+++ b/common/cgroup/v2/cgroup.go
@@ -0,0 +1,72 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package v2
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/hashicorp/errwrap"
+)
+
+// GetEnabledControllers returns a list of enabled cgroup controllers
+func GetEnabledControllers() ([]string, error) {
+	controllersFile, err := os.Open("/sys/fs/cgroup/cgroup.controllers")
+	if err != nil {
+		return nil, err
+	}
+	defer controllersFile.Close()
+
+	sc := bufio.NewScanner(controllersFile)
+
+	sc.Scan()
+	if err := sc.Err(); err != nil {
+		return nil, err
+	}
+
+	return strings.Split(sc.Text(), " "), nil
+}
+
+func parseProcCgroupInfo(procCgroupInfoPath string) (string, error) {
+	cg, err := os.Open(procCgroupInfoPath)
+	if err != nil {
+		return "", errwrap.Wrap(errors.New("error opening /proc/self/cgroup"), err)
+	}
+	defer cg.Close()
+
+	s := bufio.NewScanner(cg)
+	s.Scan()
+	parts := strings.SplitN(s.Text(), ":", 3)
+	if len(parts) < 3 {
+		return "", fmt.Errorf("error parsing /proc/self/cgroup")
+	}
+
+	return parts[2], nil
+}
+
+// GetOwnCgroupPath returns the cgroup path of this process
+func GetOwnCgroupPath() (string, error) {
+	return parseProcCgroupInfo("/proc/self/cgroup")
+}
+
+// GetCgroupPathByPid returns the cgroup path of the process
+func GetCgroupPathByPid(pid int) (string, error) {
+	return parseProcCgroupInfo(fmt.Sprintf("/proc/%d/cgroup", pid))
+}
diff --git a/rkt/api_service.go b/rkt/api_service.go
index b1c4d21642..62e99abdfd 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -32,7 +32,7 @@ import (
 	"github.com/coreos/go-systemd/activation"
 	"github.com/coreos/rkt/api/v1alpha"
 	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/cgroup"
+	"github.com/coreos/rkt/common/cgroup/v1"
 	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/pkg/set"
 	"github.com/coreos/rkt/store/imagestore"
@@ -353,7 +353,7 @@ func getPodCgroup(p *pkgPod.Pod, pid int) (string, error) {
 	// Get cgroup for the "name=systemd" controller; we assume the api-server is
 	// running on a system using systemd for returning cgroups, and will just not
 	// set it otherwise.
-	cgroup, err := cgroup.GetV1CgroupPathByPid(pid, "name=systemd")
+	cgroup, err := v1.GetCgroupPathByPid(pid, "name=systemd")
 	if err != nil {
 		return "", err
 	}
diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index f102e97eff..484762ab69 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -33,6 +33,7 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
+	"github.com/coreos/rkt/common/cgroup/v1"
 	"github.com/coreos/rkt/networking"
 	rktlog "github.com/coreos/rkt/pkg/log"
 )
@@ -140,7 +141,7 @@ func cleanupV1Cgroups() error {
 	// if we're trying to clean up our own cgroup it means we're running in the
 	// same unit file as the rkt pod. We don't have to do anything, systemd
 	// will do the cleanup for us
-	ourCgroupPath, err := cgroup.GetOwnV1CgroupPath("name=systemd")
+	ourCgroupPath, err := v1.GetOwnCgroupPath("name=systemd")
 	if err == nil {
 		if strings.HasPrefix(ourCgroupPath, "/"+subcgroup) {
 			return nil
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 52884e80aa..49bb813fda 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -28,13 +28,14 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/pkg/user"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 
 	"github.com/coreos/go-systemd/unit"
-	"github.com/coreos/rkt/common"
 	"github.com/hashicorp/errwrap"
+	"k8s.io/kubernetes/pkg/api/resource"
 )
 
 func MutableEnv(p *stage1commontypes.Pod) error {
@@ -474,20 +475,56 @@ func (uw *UnitWriter) AppUnit(
 		}
 	}
 
+	doWithIsolator := func(isolator string, f func() error) bool {
+		ok, err := cgroup.IsIsolatorSupported(isolator)
+		if err != nil {
+			uw.err = err
+			return true
+		}
+
+		if !ok {
+			fmt.Fprintf(os.Stderr, "warning: resource/%s isolator set but support disabled in the kernel, skipping\n", isolator)
+		}
+
+		if err := f(); err != nil {
+			uw.err = err
+			return true
+		}
+
+		return false
+	}
+
+	exit := false
 	for _, i := range app.Isolators {
+		if exit {
+			return
+		}
+
 		switch v := i.Value().(type) {
 		case *types.ResourceMemory:
-			opts, err = cgroup.MaybeAddIsolator(opts, "memory", v.Limit())
-			if err != nil {
-				uw.err = err
-				return
-			}
+			exit = doWithIsolator("memory", func() error {
+				if v.Limit() == nil {
+					return nil
+				}
+
+				opts = append(opts, unit.NewUnitOption("Service", "MemoryLimit", strconv.Itoa(int(v.Limit().Value()))))
+				return nil
+			})
 		case *types.ResourceCPU:
-			opts, err = cgroup.MaybeAddIsolator(opts, "cpu", v.Limit())
-			if err != nil {
-				uw.err = err
-				return
-			}
+			exit = doWithIsolator("cpu", func() error {
+				if v.Limit() == nil {
+					return nil
+				}
+
+				if v.Limit().Value() > resource.MaxMilliValue {
+					return fmt.Errorf("cpu limit exceeds the maximum millivalue: %v", v.Limit().String())
+				}
+
+				quota := strconv.Itoa(int(v.Limit().MilliValue()/10)) + "%"
+				opts = append(opts, unit.NewUnitOption("Service", "CPUQuota", quota))
+
+				return nil
+			})
 		}
 	}
 
diff --git a/stage1/init/init.go b/stage1/init/init.go
index f1ae5ec772..0a8f81fce0 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -46,6 +46,8 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
+	"github.com/coreos/rkt/common/cgroup/v1"
+	"github.com/coreos/rkt/common/cgroup/v2"
 	"github.com/coreos/rkt/networking"
 	pkgflag "github.com/coreos/rkt/pkg/flag"
 	rktlog "github.com/coreos/rkt/pkg/log"
@@ -688,7 +690,7 @@ func stage1() int {
 	}
 
 	if !unifiedCgroup {
-		enabledCgroups, err := cgroup.GetEnabledV1Cgroups()
+		enabledCgroups, err := v1.GetEnabledCgroups()
 		if err != nil {
 			log.FatalE("error getting v1 cgroups", err)
 			return 1
@@ -743,9 +745,9 @@ func stage1() int {
 }
 
 func areHostV1CgroupsMounted(enabledV1Cgroups map[int][]string) bool {
-	controllers := cgroup.GetV1ControllerDirs(enabledV1Cgroups)
+	controllers := v1.GetControllerDirs(enabledV1Cgroups)
 	for _, c := range controllers {
-		if !cgroup.IsV1ControllerMounted(c) {
+		if !v1.IsControllerMounted(c) {
 			return false
 		}
 	}
@@ -762,12 +764,12 @@ func mountHostV1Cgroups(enabledCgroups map[int][]string) error {
 	systemdControllerPath := "/sys/fs/cgroup/systemd"
 	if !areHostV1CgroupsMounted(enabledCgroups) {
 		mountContext := os.Getenv(common.EnvSELinuxMountContext)
-		if err := cgroup.CreateV1Cgroups("/", enabledCgroups, mountContext); err != nil {
+		if err := v1.CreateCgroups("/", enabledCgroups, mountContext); err != nil {
 			return errwrap.Wrap(errors.New("error creating host cgroups"), err)
 		}
 	}
 
-	if !cgroup.IsV1ControllerMounted("systemd") {
+	if !v1.IsControllerMounted("systemd") {
 		if err := os.MkdirAll(systemdControllerPath, 0700); err != nil {
 			return err
 		}
@@ -784,10 +786,10 @@ func mountHostV1Cgroups(enabledCgroups map[int][]string) error {
 // read-write so systemd inside stage1 can apply isolators to them
 func mountContainerV1Cgroups(s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
 	mountContext := os.Getenv(common.EnvSELinuxMountContext)
-	if err := cgroup.CreateV1Cgroups(s1Root, enabledCgroups, mountContext); err != nil {
+	if err := v1.CreateCgroups(s1Root, enabledCgroups, mountContext); err != nil {
 		return errwrap.Wrap(errors.New("error creating container cgroups"), err)
 	}
-	if err := cgroup.RemountV1CgroupsRO(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
+	if err := v1.RemountCgroupsRO(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
 		return errwrap.Wrap(errors.New("error restricting container cgroups"), err)
 	}
 
@@ -829,14 +831,14 @@ func getContainerSubCgroup(machineID string, canMachinedRegister, unified bool)
 		} else {
 			if unified {
 				var err error
-				subcgroup, err = cgroup.GetOwnV2CgroupPath()
+				subcgroup, err = v2.GetOwnCgroupPath()
 				if err != nil {
 					return "", errwrap.Wrap(errors.New("could not get own v2 cgroup path"), err)
 				}
 			} else {
 				// when registration is disabled the container will be directly
 				// under the current cgroup so we can look it up in /proc/self/cgroup
-				ownV1CgroupPath, err := cgroup.GetOwnV1CgroupPath("name=systemd")
+				ownV1CgroupPath, err := v1.GetOwnCgroupPath("name=systemd")
 				if err != nil {
 					return "", errwrap.Wrap(errors.New("could not get own v1 cgroup path"), err)
 				}
@@ -844,7 +846,7 @@ func getContainerSubCgroup(machineID string, canMachinedRegister, unified bool)
 				// we want all rkt instances to be in distinct cgroups. Create a
 				// subcgroup and add ourselves to it.
 				subcgroup = filepath.Join(ownV1CgroupPath, machineDir)
-				if err := cgroup.JoinV1Subcgroup("systemd", subcgroup); err != nil {
+				if err := v1.JoinSubcgroup("systemd", subcgroup); err != nil {
 					return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", ownV1CgroupPath), err)
 				}
 			}
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index ead4fa4366..523de3dbd8 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -35,6 +35,8 @@ import (
 
 	"github.com/appc/spec/pkg/device"
 	"github.com/coreos/rkt/common/cgroup"
+	"github.com/coreos/rkt/common/cgroup/v1"
+	"github.com/coreos/rkt/common/cgroup/v2"
 	"github.com/coreos/rkt/tests/testutils"
 	"github.com/syndtr/gocapability/capability"
 )
@@ -429,7 +431,7 @@ func main() {
 
 		var limitPath string
 		if isUnified {
-			cgroupPath, err := cgroup.GetOwnV2CgroupPath()
+			cgroupPath, err := v2.GetOwnCgroupPath()
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Error getting own memory cgroup path: %v\n", err)
 				os.Exit(1)
@@ -437,7 +439,7 @@ func main() {
 			limitPath = filepath.Join("/proc/1/root/sys/fs/cgroup/", cgroupPath, "memory.max")
 			fmt.Fprintln(os.Stderr, "limitPath:", limitPath)
 		} else {
-			memCgroupPath, err := cgroup.GetOwnV1CgroupPath("memory")
+			memCgroupPath, err := v1.GetOwnCgroupPath("memory")
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Error getting own memory cgroup path: %v\n", err)
 				os.Exit(1)
@@ -455,7 +457,7 @@ func main() {
 	}
 
 	if globalFlags.PrintCPUQuota {
-		cpuCgroupPath, err := cgroup.GetOwnV1CgroupPath("cpu")
+		cpuCgroupPath, err := v1.GetOwnCgroupPath("cpu")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error getting own cpu cgroup path: %v\n", err)
 			os.Exit(1)

From 8bab5bb6a6c8788b24d5bf2c93203271210be75c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 12 Oct 2016 17:46:49 +0000
Subject: [PATCH 0779/1304] stage1: break down overlong property lines

This commit workarounds a systemd bug, which causes unit file
to be incorrectly parsed.
This is triggered by property lines longer than `LINE_MAX` (2048),
which frequently occur when passing a large set of values (eg. seccomp
and paths).
In this case, we will now split such values across multiple lines.

Reference: https://github.com/systemd/systemd/issues/3302
---
 stage1/init/common/seccomp.go | 13 ++-----------
 stage1/init/common/units.go   | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/stage1/init/common/seccomp.go b/stage1/init/common/seccomp.go
index 16bf422844..84faefec2c 100644
--- a/stage1/init/common/seccomp.go
+++ b/stage1/init/common/seccomp.go
@@ -18,7 +18,6 @@ package common
 
 import (
 	"errors"
-	"fmt"
 	"strings"
 
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
@@ -92,17 +91,9 @@ func getSeccompFilter(opts []*unit.UnitOption, p *stage1commontypes.Pod, unprivi
 	if seccompErrno != "" {
 		opts = append(opts, unit.NewUnitOption("Service", "SystemCallErrorNumber", seccompErrno))
 	}
-	// SystemCallFilter options are written down in batches of 50 entries per line, because
+	// SystemCallFilter options are written down one entry per line, because
 	// filtering sets may be quite large and overlong lines break unit serialization.
-	seccompStr := ""
-	for i, s := range seccompSet {
-		next := i + 1
-		seccompStr += (s + " ")
-		if next%50 == 0 || next == len(seccompSet) {
-			opts = append(opts, unit.NewUnitOption("Service", "SystemCallFilter", fmt.Sprintf("%s%s", filterMode, seccompStr)))
-			seccompStr = ""
-		}
-	}
+	opts = appendOptionsList(opts, "Service", "SystemCallFilter", filterMode, seccompSet)
 	// In order to install seccomp filters, unprivileged process must first set no-news-privs.
 	if unprivileged {
 		noNewPrivs = true
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 1bf212c234..fd7bfa2aeb 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -358,7 +358,6 @@ func (uw *UnitWriter) AppUnit(
 		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePath(appName)),
 		unit.NewUnitOption("Service", "User", strconv.Itoa(u)),
 		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
-		unit.NewUnitOption("Service", "SupplementaryGroups", strings.Join(supplementaryGroups, " ")),
 
 		// This helps working around a race
 		// (https://github.com/systemd/systemd/issues/2913) that causes the
@@ -367,6 +366,10 @@ func (uw *UnitWriter) AppUnit(
 		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
 	}...)
 
+	if len(supplementaryGroups) > 0 {
+		opts = appendOptionsList(opts, "Service", "SupplementaryGroups", "", supplementaryGroups)
+	}
+
 	if supportsNotify(uw.p, appName.String()) {
 		opts = append(opts, unit.NewUnitOption("Service", "Type", "notify"))
 	}
@@ -430,7 +433,7 @@ func (uw *UnitWriter) AppUnit(
 		}
 	}
 	if len(rwDirs) > 0 {
-		opts = append(opts, unit.NewUnitOption("Service", "ReadWriteDirectories", strings.Join(rwDirs, " ")))
+		opts = appendOptionsList(opts, "Service", "ReadWriteDirectories", "", rwDirs)
 	}
 
 	// Restrict access to sensitive paths (eg. procfs and sysfs entries).
@@ -587,3 +590,14 @@ func (uw *UnitWriter) AppReaperUnit(appName types.ACName, binPath string, opts .
 		opts...,
 	)
 }
+
+// appendOptionsList updates an existing unit options list appending
+// an array of new properties, one entry at a time.
+// This is the preferred method to avoid hitting line length limits
+// in unit files. Target property must support multi-line entries.
+func appendOptionsList(opts []*unit.UnitOption, section string, property string, prefix string, vals []string) []*unit.UnitOption {
+	for _, v := range vals {
+		opts = append(opts, unit.NewUnitOption(section, property, fmt.Sprintf("%s%s", prefix, v)))
+	}
+	return opts
+}

From 4cb6fa26ea9c0e99388a47b0535ddb4407ad5fcb Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 09:40:57 +0200
Subject: [PATCH 0780/1304] Documentation: configure resource restrictions for
 systemd

Fixes #2940
---
 Documentation/using-rkt-with-systemd.md | 41 ++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index adb136fee0..19c13c5cc3 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -228,6 +228,46 @@ In most cases, the parameters `Environment=` and `ExecStartPre=` can simply be u
 ExecStart=/bin/sh -c "foo ; exec rkt run ..."
 ```
 
+### Resource restrictions (CPU, IO, Memory)
+
+`rkt` inherits resource limits configured in the systemd service unit file. The systemd documentation explains various [execution environment](https://www.freedesktop.org/software/systemd/man/systemd.exec.html), and [resource control](https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html) settings to restrict the CPU, IO, and memory resources.
+
+For example to restrict the CPU time quota, configure the corresponding [CPUQuota](https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUQuota=) setting:
+
+```
+[Service]
+ExecStart=/usr/bin/rkt run s-urbaniak.github.io/images/stress:0.0.1
+CPUQuota=30%
+```
+
+```
+$ ps -p <PID> -o %cpu%
+CPU
+30.0
+```
+
+Moreover to pin the rkt pod to certain CPUs, configure the corresponding [CPUAffinity](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#CPUAffinity=) setting:
+
+```
+[Service]
+ExecStart=/usr/bin/rkt run s-urbaniak.github.io/images/stress:0.0.1
+CPUAffinity=0,3
+```
+
+```
+$ top
+Tasks: 235 total,   1 running, 234 sleeping,   0 stopped,   0 zombie
+%Cpu0  : 100.0/0.0   100[||||||||||||||||||||||||||||||||||||||||||||||
+%Cpu1  :   6.0/0.7     7[|||                                           
+%Cpu2  :   0.7/0.0     1[                                              
+%Cpu3  : 100.0/0.0   100[||||||||||||||||||||||||||||||||||||||||||||||
+GiB Mem : 25.7/19.484   [                                              
+GiB Swap:  0.0/8.000    [                                              
+
+  PID USER      PR  NI    VIRT    RES  %CPU %MEM     TIME+ S COMMAND   
+11684 root      20   0    3.6m   1.1m 200.0  0.0   8:58.63 S stress    
+```
+
 ### Socket-activated service
 
 `rkt` supports [socket-activated services][systemd-socket-activated]. This means systemd will listen on a port on behalf of a container, and start the container when receiving a connection. An application needs to be able to accept sockets from systemd's native socket passing interface in order to handle socket activation.
@@ -368,7 +408,6 @@ Now, a new connection to localhost port 6371 will start your container with redi
 $ curl http://localhost:6371/
 ```
 
-
 ## Other tools for managing pods
 
 Let us assume the service from the simple example unit file, above, is started on the host.

From 63f46bbdb77f09dd99c6e785eb21d73c2448bed4 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Wed, 12 Oct 2016 16:42:06 +0200
Subject: [PATCH 0781/1304] Documentation / pkg: update per-distro
 instructions, add iptables dependency

---
 Documentation/distributions.md | 62 +++++++++++++++++++++-------------
 scripts/pkg/build-pkgs.sh      |  1 +
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index b0ea2348bc..4abd828274 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -10,6 +10,15 @@
 - [Ubuntu](#ubuntu)
 - [Void](#void)
 
+## Upstream-maintained packages (manual installation from rkt project)
+- [rpm-based](#rpm-based)
+- [deb-based](#deb-based)
+
+
+## Distribution-maintained packages (automatic installation from repositories)
+If your distribution packages rkt, then you should generally use their version. However,
+if you need a newer version, you may choose to manually install the rkt-provided rpm and deb packages.
+
 ## Arch
 
 rkt is available in the [Community Repository](https://www.archlinux.org/packages/community/x86_64/rkt/) and can be installed using pacman:
@@ -40,20 +49,20 @@ sudo apt-get install rkt
 Note that due to an outstanding bug (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823322) one has to use the "coreos" stage1 image:
 
 ```
-sudo rkt run --insecure-options=image --stage1-name=coreos.com/rkt/stage1-coreos:1.5.1 docker://nginx
+sudo rkt run --insecure-options=image --stage1-name=coreos.com/rkt/stage1-coreos:1.16.0 docker://nginx
 ```
 
-If you prefer to install the newest version of rkt follow the instructions in the Ubuntu section below.
+If you don't run sid, or wish for a newer version, you can [install manually](#deb-based).
 
 ## Fedora
 
-rkt is packaged in the development version of Fedora, [Rawhide](https://fedoraproject.org/wiki/Releases/Rawhide):
+Since Fedora version 24, rkt packages are available in the main repository. We recommend using recent Fedora releases or a manually installed package in order to have an up-to-date rkt binary.
+
+
 ```
 sudo dnf install rkt
 ```
 
-Until the rkt package makes its way into the general Fedora releases, [download the latest rkt directly from the project](https://github.com/coreos/rkt/releases).
-
 rkt's entry in the [Fedora package database](https://admin.fedoraproject.org/pkgdb/package/rpms/rkt/) tracks packaging work for this distribution.
 
 #### Caveat: SELinux
@@ -115,31 +124,36 @@ sudo zypper in rkt
 
 ## Ubuntu
 
-rkt is not packaged currently in Ubuntu. If you want the newest version of rkt the easiest method to install it is using the `install-rkt.sh` script. This script can be found in the *scripts* directory of the [rkt Github repository](https://github.com/coreos/rkt).
+rkt is not packaged currently in Ubuntu. Instead, install manually using the 
+[rkt debian package](#deb-based).
 
-Either clone the repository and run the script:
+## Void
 
-```
-git clone https://github.com/coreos/rkt
-cd rkt
-sudo ./scripts/install-rkt.sh
-```
+rkt is available in the [official binary packages](http://www.voidlinux.eu/packages/) for the Void Linux distribution.
+The source for these packages is hosted on [GitHub](https://github.com/voidlinux/void-packages/tree/master/srcpkgs/rkt).
 
-Or just get the script:
 
-```
-wget https://raw.githubusercontent.com/coreos/rkt/master/scripts/install-rkt.sh
-chmod +x install-rkt.sh
-sudo ./install-rkt.sh
-```
+# rkt-maintained packages
+As part of the rkt build process, rpm and deb packages are built. If you need to use
+the latest rkt version, or your distribution does not bundle rkt, these are available.
 
-The above script will install the "gnupg2", and "checkinstall" packages, download rkt, verify it, and finally invoke "checkinstall" to create a deb package and install rkt. To uninstall rkt, execute:
+Currently the rkt upstream project does not maintain its own repository, so users of these packages must
+upgrade manually.
 
+### rpm-based 
 ```
-sudo apt-get remove rkt
+gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
+wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt-1.16.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt-1.16.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.16.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.16.0-1.x86_64.rpm
 ```
 
-## Void
-
-rkt is available in the [official binary packages](http://www.voidlinux.eu/packages/) for the Void Linux distribution.
-The source for these packages is hosted on [GitHub](https://github.com/voidlinux/void-packages/tree/master/srcpkgs/rkt).
+### deb-based
+```
+gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
+wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt_1.16.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt_1.16.0-1_amd64.deb.asc
+gpg --verify rkt_1.16.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.16.0-1_amd64.deb
+```
diff --git a/scripts/pkg/build-pkgs.sh b/scripts/pkg/build-pkgs.sh
index 3cbb43534c..f8aa9c4b2e 100755
--- a/scripts/pkg/build-pkgs.sh
+++ b/scripts/pkg/build-pkgs.sh
@@ -90,6 +90,7 @@ fpm -s dir -t deb \
     -d dbus \
     -d libc6 \
     -d systemd \
+    -d iptables \
     --deb-suggests ca-certificates \
     -C ${prefix} 
 

From dc0b3443c3af1c02ef07d9cf5be41b985f1f6d61 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 12:00:24 +0200
Subject: [PATCH 0782/1304] CHANGELOG: add v1.17.0

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4326214952..11638e2f5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 1.17.0
+
+This is a minor release packaging rkt-api systemd service units, and fixing a bug caused by overly long lines in generated stage1 unit files.
+
+### New features and UX changes
+- dist: Add systemd rkt-api service and socket ([#3271](https://github.com/coreos/rkt/pull/3271)).
+- dist: package rkt-api unit files ([#3275](https://github.com/coreos/rkt/pull/3275)).
+
+### Bug fixes
+- stage1: break down overlong property lines ([#3279](https://github.com/coreos/rkt/pull/3279)).
+
+### Other changes
+- stage0: fix typo and some docstring style ([#3266](https://github.com/coreos/rkt/pull/3266)).
+- stage0: Create an mtab symlink if not present ([#3265](https://github.com/coreos/rkt/pull/3265)).
+- stage1: use systemd protection for kernel tunables ([#3273](https://github.com/coreos/rkt/pull/3273)).
+- Documentation updates: ([#3280](https://github.com/coreos/rkt/pull/3280), [#3263](https://github.com/coreos/rkt/pull/3263), [#3268](https://github.com/coreos/rkt/pull/3268), [#3254](https://github.com/coreos/rkt/pull/3254), [#3199](https://github.com/coreos/rkt/pull/3199), [#3256](https://github.com/coreos/rkt/pull/3256))
+
 ## 1.16.0
 
 This release contains an important bugfix for the stage1-host flavor, as well as initial internal support for cgroup2 and pod sandboxes as specified by kubernetes CRI (Container Runtime Interface).

From ad42e3e007f543f82a42604a14a55f05186b44d8 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 12:28:50 +0200
Subject: [PATCH 0783/1304] ROADMAP: add 1.19.0, 1.20.0

---
 ROADMAP.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 5367018183..c213971142 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -15,14 +15,18 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 
 ## Next releases
 
-### rkt 1.17.0 (October)
-
-Up-to-date planning at https://github.com/coreos/rkt/milestone/51.
-
 ### rkt 1.18.0 (October)
 
 Up-to-date planning at https://github.com/coreos/rkt/milestone/52.
 
+### rkt 1.19.0 (November)
+
+Up-to-date planning at https://github.com/coreos/rkt/milestone/53.
+
+### rkt 1.20.0 (November)
+
+Up-to-date planning at https://github.com/coreos/rkt/milestone/54.
+
 ### Upcoming
 
 Future tasks without a specific timeline are tracked at https://github.com/coreos/rkt/milestone/30.

From dbdd0758d856b208d8d60f9c5303afb93bc3ca35 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 12:01:02 +0200
Subject: [PATCH 0784/1304] version: bump to v1.17.0

---
 Documentation/running-fly-stage1.md  | 4 ++--
 Documentation/running-kvm-stage1.md  | 4 ++--
 Documentation/subcommands/prepare.md | 4 ++--
 Documentation/subcommands/version.md | 2 +-
 Documentation/trying-out-rkt.md      | 6 +++---
 configure.ac                         | 2 +-
 scripts/install-rkt.sh               | 2 +-
 tests/empty-image/manifest           | 2 +-
 tests/image/manifest                 | 2 +-
 tests/rkt-monitor/build-stresser.sh  | 2 +-
 tests/rkt_exec_test.go               | 2 +-
 tests/rkt_image_cat_manifest_test.go | 2 +-
 tests/rkt_image_export_test.go       | 2 +-
 tests/rkt_image_render_test.go       | 2 +-
 tests/rkt_os_arch_test.go            | 2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index eaf90ce763..7588c0d189 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.16.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.17.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.16.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.17.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index ff28c376e7..4ae4cff60f 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.16.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.17.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.16.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.17.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 994482d869..3659c4862f 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.16.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.17.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.16.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.17.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 50857695a0..5e16729372 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.16.0
+rkt Version: 1.17.0
 appc Version: 0.8.7
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index e224c32a9e..817dff8618 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt-v1.16.0.tar.gz
-tar xzvf rkt-v1.16.0.tar.gz
-cd rkt-v1.16.0
+wget https://github.com/coreos/rkt/releases/download/v1.17.0/rkt-v1.17.0.tar.gz
+tar xzvf rkt-v1.17.0.tar.gz
+cd rkt-v1.17.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 04e8d27d19..e447547727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.16.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.17.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index bfb5f6cbb6..49ad39ea71 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.16.0"
+version="1.17.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 37dadcaa51..715b2ba07d 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.16.0"
+            "value": "1.17.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 7f4ffbb763..a3fb140e5c 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.16.0"
+            "value": "1.17.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 29a28f7548..41881fdb69 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.16.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.17.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 84660c412e..6ecca4a6ee 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.16.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index b5e17eb8d9..cc6c56f6d7 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.16.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 2627c84f9b..0b5b3b95c1 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.16.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index ed473aaa48..10aa0a2496 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.16.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 1b8b72b3ac..81d87fa348 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.16.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 20bd9228687a43d1f8818adb7ead5fc209d1d89f Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 12:01:02 +0200
Subject: [PATCH 0785/1304] version: bump to v1.17.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index e447547727..bb5d8a8077 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.17.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.17.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 41881fdb69..710520e7f3 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.17.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.17.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 63c6bad30f6c7e3c87489c3d1f61ff2acdb91de9 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 13 Oct 2016 11:49:42 +0200
Subject: [PATCH 0786/1304] stage1: update to CoreOS 1192.0.0 (and update
 sanity checks)

---
 Documentation/devel/update-coreos-stage1.md | 46 +++++++++++++++++++--
 stage1/usr_from_coreos/coreos-common.mk     |  2 +-
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/Documentation/devel/update-coreos-stage1.md b/Documentation/devel/update-coreos-stage1.md
index b51e138cb7..1eb70df0f7 100644
--- a/Documentation/devel/update-coreos-stage1.md
+++ b/Documentation/devel/update-coreos-stage1.md
@@ -66,7 +66,16 @@ You should have now the rootfs of the image in the `squashfs-root` directory.
 
 Back to the rkt repo, in the directory `stage1/usr_from_coreos/manifest.d`, there are some manifest files that define which files are copied from the CoreOS image to the stage1 image.
 
-You need to go through all of them and check that the files listed correspond to files that are in the actual rootfs of the image (which we extracted in the previous step).
+You need to go through all of them and check that the files listed correspond to files that are in the actual rootfs of the image (which we extracted in the previous step). Do this from your root directory:
+
+```bash
+for f in $(cat stage1/usr_from_coreos/manifest-amd64-usr.d/*.manifest); do
+	fspath=/tmp/coreos-image/squashfs-root/$f
+	if [ ! -e $fspath -a ! -h $fspath ]; then
+		echo missing: $f
+	fi
+done
+```
 
 Usually, there are some updated libraries which need an update on their version numbers.
 In our case, there are no updates and all the files mentioned in the manifest are present in the updated CoreOS image.
@@ -95,9 +104,38 @@ index b5bfa77..f864f56 100644
  # path to downloaded pxe image
 ```
 
-## Check that things work
+# Check that things work
+
+Once you're finished updating the manifest files and `coreos-common.mk`, we'll do some sanity checks.
+
+First, do a clean build.
+
+
+### Test all binaries
+Make sure that every binary links:
+
+```bash
+for f in $(cat stage1/usr_from_coreos/manifest-amd64-usr.d/*.manifest); do
+	if [[ $f =~ ^bin/ ]]; then
+		sudo chroot build*/aci-for-coreos-flavor/rootfs /usr/lib64/ld-linux-x86-64.so.2 --list $f >/dev/null
+		st=$?
+		if [ $st -ne 0 ] ; then
+			echo $f failed with exit code $st
+			break
+		fi
+	fi
+done
+```
+
+### run rkt
+Run a quick smoketest:
+
+```bash
+sudo build*/target/bin/rkt run quay.io/coreos/alpine-sh
+```
+
 
-Once you're finished updating the manifest files and `coreos-common.mk`, do a clean build and try to run rkt.
+## Fixing errors
 If there are some new libraries missing from the image, you need to add them to the correspoding manifest file.
 
 For example, this update breaks systemd.
@@ -126,4 +164,4 @@ index fca30bb..51d5fbc 100644
  lib64/libpcre.so.1.2.4
 ```
 
-After those two patches, the update is complete and rkt works fine with the new image.
+Then build and test again.
diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index 9ad79d9a71..c94ca85b54 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -11,7 +11,7 @@ $(call setup-tmp-dir,CCN_TMPDIR)
 # systemd version in coreos image
 CCN_SYSTEMD_VERSION := v231
 # coreos image version
-CCN_IMG_RELEASE := 1151.0.0
+CCN_IMG_RELEASE := 1192.0.0
 # coreos image URL
 CCN_IMG_URL := https://alpha.release.core-os.net/$(RKT_STAGE1_COREOS_BOARD)/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image

From 6bcc1b5c04bd0dc4363f35422e53a7f02711041b Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal.rostecki@gmail.com>
Date: Thu, 6 Oct 2016 13:18:17 +0200
Subject: [PATCH 0787/1304] rkt: Change exit codes to 254

rkt passes through the application exit code. To distinguish
exit code of application from exit code of rkt itself, rkt
should return some other code than 1 or 2.

Fixes #3129
---
 api/v1alpha/client_example.go                 | 10 +--
 pkg/log/log.go                                |  5 +-
 pkg/multicall/multicall.go                    |  2 +-
 rkt/api_service.go                            |  6 +-
 rkt/bash_completion_gen.go                    |  2 +-
 rkt/cat_manifest.go                           |  8 +-
 rkt/config.go                                 |  2 +-
 rkt/enter.go                                  | 20 ++---
 rkt/export.go                                 | 26 +++---
 rkt/fetch.go                                  | 14 ++--
 rkt/gc.go                                     | 12 +--
 rkt/image_cat_manifest.go                     | 10 +--
 rkt/image_export.go                           | 12 +--
 rkt/image_extract.go                          | 28 +++----
 rkt/image_gc.go                               |  6 +-
 rkt/image_list.go                             |  6 +-
 rkt/image_render.go                           | 26 +++---
 rkt/image_rm.go                               |  6 +-
 rkt/list.go                                   |  6 +-
 rkt/main.go                                   |  2 +-
 rkt/manpages_gen.go                           |  2 +-
 rkt/metadata_service.go                       |  6 +-
 rkt/prepare.go                                | 34 ++++----
 rkt/rkt.go                                    | 10 +--
 rkt/rm.go                                     | 10 +--
 rkt/run.go                                    | 50 ++++++------
 rkt/run_prepared.go                           | 28 +++----
 rkt/status.go                                 |  8 +-
 rkt/stop.go                                   |  4 +-
 rkt/trust.go                                  | 12 +--
 stage1/app-rm/app-rm.go                       |  8 +-
 stage1/app-start/app-start.go                 | 16 ++--
 stage1/app-stop/app-stop.go                   |  4 +-
 stage1/enter_kvm/enter_kvm.go                 |  2 +-
 stage1/init/init.go                           | 46 +++++------
 stage1/stop/stop.go                           | 12 +--
 stage1/stop_kvm/stop_kvm.go                   |  6 +-
 stage1_fly/run/main.go                        | 52 ++++++------
 stage1_fly/stop/stop.go                       |  8 +-
 store/imagestore/main_test.go                 |  2 +-
 tests/cniproxy/main.go                        |  6 +-
 .../echo-socket-activated.go                  | 14 ++--
 tests/inspect/inspect.go                      | 80 +++++++++----------
 tests/rkt-monitor/main.go                     | 18 ++---
 tests/rkt_api_service_test.go                 |  2 +-
 tests/rkt_fetch_test.go                       |  2 +-
 tests/rkt_gc_test.go                          |  2 +-
 tests/rkt_image_export_test.go                |  2 +-
 tests/rkt_image_extract_test.go               |  2 +-
 tests/rkt_image_render_test.go                |  2 +-
 tests/rkt_mount_test.go                       |  4 +-
 tests/rkt_net_test.go                         |  4 +-
 tests/rkt_run_pod_manifest_test.go            | 20 ++---
 tests/rkt_stage1_loading_test.go              |  2 +-
 tests/rkt_tests.go                            |  2 +-
 tests/rkt_volume_mount_fly_test.go            |  2 +-
 tests/rkt_volume_mount_test.go                |  4 +-
 tests/rkt_volume_test.go                      |  4 +-
 tests/stub-stage1/run/main.go                 |  6 +-
 59 files changed, 354 insertions(+), 353 deletions(-)

diff --git a/api/v1alpha/client_example.go b/api/v1alpha/client_example.go
index 81d3d15c7d..e3c4c53362 100644
--- a/api/v1alpha/client_example.go
+++ b/api/v1alpha/client_example.go
@@ -44,7 +44,7 @@ func getLogsWithoutFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
 
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	logsRecvResp, err := logsResp.Recv()
@@ -76,7 +76,7 @@ func getLogsWithFollow(c v1alpha.PublicAPIClient, p *v1alpha.Pod) {
 	})
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	for {
@@ -103,7 +103,7 @@ func main() {
 	conn, err := grpc.Dial("localhost:15441", grpc.WithInsecure())
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 	c := v1alpha.NewPublicAPIClient(conn)
 	defer conn.Close()
@@ -120,7 +120,7 @@ func main() {
 	})
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	for _, p := range podResp.Pods {
@@ -145,7 +145,7 @@ func main() {
 	})
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	for _, im := range imgResp.Images {
diff --git a/pkg/log/log.go b/pkg/log/log.go
index 479b1ac69c..80ac5c9593 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -111,9 +111,10 @@ func (l *Logger) Error(e error) {
 	l.Print(l.formatErr(e, ""))
 }
 
-// FatalE prints a string and error then calls os.Exit(1).
+// FatalE prints a string and error then calls os.Exit(254).
 func (l *Logger) FatalE(msg string, e error) {
-	l.Fatal(l.formatErr(e, msg))
+	l.Print(l.formatErr(e, msg))
+	os.Exit(254)
 }
 
 // PanicE prints a string and error then calls panic.
diff --git a/pkg/multicall/multicall.go b/pkg/multicall/multicall.go
index d16455f07c..f2a2dc5b42 100644
--- a/pkg/multicall/multicall.go
+++ b/pkg/multicall/multicall.go
@@ -67,7 +67,7 @@ func MaybeExec() {
 	if fn, ok := commands[name]; ok {
 		if err := fn(); err != nil {
 			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		os.Exit(0)
 	}
diff --git a/rkt/api_service.go b/rkt/api_service.go
index b1c4d21642..d920ea4da6 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -908,11 +908,11 @@ func runAPIService(cmd *cobra.Command, args []string) (exit int) {
 	listeners, err := openAPISockets()
 	if err != nil {
 		stderr.PrintE("Failed to open sockets", err)
-		return 1
+		return 254
 	}
 	if len(listeners) == 0 { // This is unlikely...
 		stderr.Println("No sockets to listen to. Quitting.")
-		return 1
+		return 254
 	}
 
 	publicServer := grpc.NewServer() // TODO(yifan): Add TLS credential option.
@@ -920,7 +920,7 @@ func runAPIService(cmd *cobra.Command, args []string) (exit int) {
 	v1AlphaAPIServer, err := newV1AlphaAPIServer()
 	if err != nil {
 		stderr.PrintE("failed to create API service", err)
-		return 1
+		return 254
 	}
 
 	v1alpha.RegisterPublicAPIServer(publicServer, v1AlphaAPIServer)
diff --git a/rkt/bash_completion_gen.go b/rkt/bash_completion_gen.go
index 67fe4bf5be..8a566d2715 100644
--- a/rkt/bash_completion_gen.go
+++ b/rkt/bash_completion_gen.go
@@ -27,6 +27,6 @@ func main() {
 	err := cmdRkt.GenBashCompletionFile("dist/bash_completion/rkt.bash")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to generate the bash completion file: %v\n", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 }
diff --git a/rkt/cat_manifest.go b/rkt/cat_manifest.go
index ef86f2d264..2c734cd975 100644
--- a/rkt/cat_manifest.go
+++ b/rkt/cat_manifest.go
@@ -39,19 +39,19 @@ func init() {
 func runCatManifest(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 1 {
 		cmd.Usage()
-		return 1
+		return 254
 	}
 
 	pod, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
-		return 1
+		return 254
 	}
 	defer pod.Close()
 
 	_, manifest, err := pod.PodManifest()
 	if err != nil {
-		return 1
+		return 254
 	}
 
 	var b []byte
@@ -62,7 +62,7 @@ func runCatManifest(cmd *cobra.Command, args []string) (exit int) {
 	}
 	if err != nil {
 		stderr.PrintE("cannot read the pod manifest", err)
-		return 1
+		return 254
 	}
 
 	stdout.Print(string(b))
diff --git a/rkt/config.go b/rkt/config.go
index 8b61b1bc6a..cb74814ae0 100644
--- a/rkt/config.go
+++ b/rkt/config.go
@@ -40,7 +40,7 @@ func runConfig(cmd *cobra.Command, args []string) int {
 	config, err := getConfig()
 	if err != nil {
 		stderr.PrintE("cannot get configuration", err)
-		return 1
+		return 254
 	}
 
 	var b []byte
diff --git a/rkt/enter.go b/rkt/enter.go
index 535cc6c107..268068001b 100644
--- a/rkt/enter.go
+++ b/rkt/enter.go
@@ -60,62 +60,62 @@ func init() {
 func runEnter(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) < 1 {
 		cmd.Usage()
-		return 1
+		return 254
 	}
 
 	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
-		return 1
+		return 254
 	}
 	defer p.Close()
 
 	if p.State() != pkgPod.Running {
 		stderr.Printf("pod %q isn't currently running", p.UUID)
-		return 1
+		return 254
 	}
 
 	podPID, err := p.ContainerPid1()
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
-		return 1
+		return 254
 	}
 
 	appName, err := getAppName(p)
 	if err != nil {
 		stderr.PrintE("unable to determine app name", err)
-		return 1
+		return 254
 	}
 
 	argv, err := getEnterArgv(p, args)
 	if err != nil {
 		stderr.PrintE("enter failed", err)
-		return 1
+		return 254
 	}
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	ts, err := treestore.NewStore(treeStoreDir(), s)
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	stage1TreeStoreID, err := p.GetStage1TreeStoreID()
 	if err != nil {
 		stderr.PrintE("error getting stage1 treeStoreID", err)
-		return 1
+		return 254
 	}
 
 	stage1RootFS := ts.GetRootFS(stage1TreeStoreID)
 
 	if err = stage0.Enter(p.Path(), podPID, *appName, stage1RootFS, argv); err != nil {
 		stderr.PrintE("enter failed", err)
-		return 1
+		return 254
 	}
 	// not reached when stage0.Enter execs /enter
 	return 0
diff --git a/rkt/export.go b/rkt/export.go
index a963591701..959ecc0880 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -89,33 +89,33 @@ func appHasMountpoints(podPath string, appName types.ACName) (bool, error) {
 func runExport(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 2 {
 		cmd.Usage()
-		return 1
+		return 254
 	}
 
 	outACI := args[1]
 	ext := filepath.Ext(outACI)
 	if ext != schema.ACIExtension {
 		stderr.Printf("extension must be %s (given %s)", schema.ACIExtension, outACI)
-		return 1
+		return 254
 	}
 
 	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
-		return 1
+		return 254
 	}
 	defer p.Close()
 
 	state := p.State()
 	if state != pkgPod.Exited && state != pkgPod.ExitedGarbage {
 		stderr.Print("pod is not exited. Only exited pods can be exported")
-		return 1
+		return 254
 	}
 
 	app, err := getApp(p)
 	if err != nil {
 		stderr.PrintE("unable to find app", err)
-		return 1
+		return 254
 	}
 
 	root := common.AppPath(p.Path(), app.Name)
@@ -124,12 +124,12 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		tmpDir := filepath.Join(getDataDir(), "tmp")
 		if err := os.MkdirAll(tmpDir, common.DefaultRegularDirPerm); err != nil {
 			stderr.PrintE("unable to create temp directory", err)
-			return 1
+			return 254
 		}
 		podDir, err := ioutil.TempDir(tmpDir, fmt.Sprintf("rkt-export-%s", p.UUID))
 		if err != nil {
 			stderr.PrintE("unable to create export temp directory", err)
-			return 1
+			return 254
 		}
 		defer func() {
 			if err := os.RemoveAll(podDir); err != nil {
@@ -140,12 +140,12 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		mntDir := filepath.Join(podDir, "rootfs")
 		if err := os.Mkdir(mntDir, common.DefaultRegularDirPerm); err != nil {
 			stderr.PrintE("unable to create rootfs directory inside temp directory", err)
-			return 1
+			return 254
 		}
 
 		if err := mountOverlay(p, app, mntDir); err != nil {
 			stderr.PrintE(fmt.Sprintf("couldn't mount directory at %s", mntDir), err)
-			return 1
+			return 254
 		}
 		defer func() {
 			if err := syscall.Unmount(mntDir, 0); err != nil {
@@ -158,11 +158,11 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		hasMPs, err := appHasMountpoints(p.Path(), app.Name)
 		if err != nil {
 			stderr.PrintE("error parsing mountpoints", err)
-			return 1
+			return 254
 		}
 		if hasMPs {
 			stderr.Printf("pod has remaining mountpoints. Only pods using overlayfs or with no mountpoints can be exported")
-			return 1
+			return 254
 		}
 	}
 
@@ -175,13 +175,13 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		// The file was found, save uid & gid shift and count
 		if err := uidRange.Deserialize(privUserContent); err != nil {
 			stderr.PrintE(fmt.Sprintf("problem deserializing the content of %s", common.PrivateUsersPreparedFilename), err)
-			return 1
+			return 254
 		}
 	}
 
 	if err = buildAci(root, manifestPath, outACI, uidRange); err != nil {
 		stderr.PrintE("error building aci", err)
-		return 1
+		return 254
 	}
 	return 0
 }
diff --git a/rkt/fetch.go b/rkt/fetch.go
index f3706366f2..ead32254b9 100644
--- a/rkt/fetch.go
+++ b/rkt/fetch.go
@@ -66,36 +66,36 @@ func init() {
 func runFetch(cmd *cobra.Command, args []string) (exit int) {
 	if err := parseApps(&rktApps, args, cmd.Flags(), false); err != nil {
 		stderr.PrintE("unable to parse arguments", err)
-		return 1
+		return 254
 	}
 
 	if rktApps.Count() < 1 {
 		stderr.Print("must provide at least one image")
-		return 1
+		return 254
 	}
 
 	if flagStoreOnly && flagNoStore {
 		stderr.Print("both --store-only and --no-store specified")
-		return 1
+		return 254
 	}
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	ts, err := treestore.NewStore(treeStoreDir(), s)
 	if err != nil {
 		stderr.PrintE("cannot open treestore", err)
-		return 1
+		return 254
 	}
 
 	ks := getKeystore()
 	config, err := getConfig()
 	if err != nil {
 		stderr.PrintE("cannot get configuration", err)
-		return 1
+		return 254
 	}
 	ft := &image.Fetcher{
 		S:                  s,
@@ -125,7 +125,7 @@ func runFetch(cmd *cobra.Command, args []string) (exit int) {
 	})
 	if err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	return
diff --git a/rkt/gc.go b/rkt/gc.go
index 6a6202c504..a613cdf2f2 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -67,12 +67,12 @@ func init() {
 func runGC(cmd *cobra.Command, args []string) (exit int) {
 	if err := renameExited(); err != nil {
 		stderr.PrintE("failed to rename exited pods", err)
-		return 1
+		return 254
 	}
 
 	if err := renameAborted(); err != nil {
 		stderr.PrintE("failed to rename aborted pods", err)
-		return 1
+		return 254
 	}
 
 	if flagMarkOnly {
@@ -81,17 +81,17 @@ func runGC(cmd *cobra.Command, args []string) (exit int) {
 
 	if err := renameExpired(flagPreparedExpiration); err != nil {
 		stderr.PrintE("failed to rename expired prepared pods", err)
-		return 1
+		return 254
 	}
 
 	if err := emptyExitedGarbage(flagGracePeriod); err != nil {
 		stderr.PrintE("failed to empty exitedGarbage", err)
-		return 1
+		return 254
 	}
 
 	if err := emptyGarbage(); err != nil {
 		stderr.PrintE("failed to empty garbage", err)
-		return 1
+		return 254
 	}
 
 	return
@@ -275,6 +275,6 @@ func deletePod(p *pkgPod.Pod) {
 
 	if err := os.RemoveAll(p.Path()); err != nil {
 		stderr.PrintE(fmt.Sprintf("unable to remove pod %q", p.UUID), err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 }
diff --git a/rkt/image_cat_manifest.go b/rkt/image_cat_manifest.go
index 352e370f40..2d9cde5795 100644
--- a/rkt/image_cat_manifest.go
+++ b/rkt/image_cat_manifest.go
@@ -40,25 +40,25 @@ func init() {
 func runImageCatManifest(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 1 {
 		cmd.Usage()
-		return 1
+		return 254
 	}
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	key, err := getStoreKeyFromAppOrHash(s, args[0])
 	if err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	manifest, err := s.GetImageManifest(key)
 	if err != nil {
 		stderr.PrintE("cannot get image manifest", err)
-		return 1
+		return 254
 	}
 
 	var b []byte
@@ -69,7 +69,7 @@ func runImageCatManifest(cmd *cobra.Command, args []string) (exit int) {
 	}
 	if err != nil {
 		stderr.PrintE("cannot read the image manifest", err)
-		return 1
+		return 254
 	}
 
 	stdout.Print(string(b))
diff --git a/rkt/image_export.go b/rkt/image_export.go
index 84dd682003..2eee67e272 100644
--- a/rkt/image_export.go
+++ b/rkt/image_export.go
@@ -45,25 +45,25 @@ func init() {
 func runImageExport(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 2 {
 		cmd.Usage()
-		return 1
+		return 254
 	}
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	key, err := getStoreKeyFromAppOrHash(s, args[0])
 	if err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	aci, err := s.ReadStream(key)
 	if err != nil {
 		stderr.PrintE("error reading image", err)
-		return 1
+		return 254
 	}
 	defer aci.Close()
 
@@ -80,7 +80,7 @@ func runImageExport(cmd *cobra.Command, args []string) (exit int) {
 		} else {
 			stderr.PrintE(fmt.Sprintf("unable to open output ACI file %s", args[1]), err)
 		}
-		return 1
+		return 254
 	}
 	defer func() {
 		err := f.Close()
@@ -93,7 +93,7 @@ func runImageExport(cmd *cobra.Command, args []string) (exit int) {
 	_, err = io.Copy(f, aci)
 	if err != nil {
 		stderr.PrintE("error writing to output ACI file", err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/rkt/image_extract.go b/rkt/image_extract.go
index a4bf651d57..6d7dc2add9 100644
--- a/rkt/image_extract.go
+++ b/rkt/image_extract.go
@@ -51,50 +51,50 @@ func init() {
 func runImageExtract(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 2 {
 		cmd.Usage()
-		return 1
+		return 254
 	}
 	outputDir := args[1]
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	key, err := getStoreKeyFromAppOrHash(s, args[0])
 	if err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	aci, err := s.ReadStream(key)
 	if err != nil {
 		stderr.PrintE("error reading ACI from the store", err)
-		return 1
+		return 254
 	}
 
 	// ExtractTar needs an absolute path
 	absOutputDir, err := filepath.Abs(outputDir)
 	if err != nil {
 		stderr.PrintE("error converting output to an absolute path", err)
-		return 1
+		return 254
 	}
 
 	if _, err := os.Stat(absOutputDir); err == nil {
 		if !flagExtractOverwrite {
 			stderr.Print("output directory exists (try --overwrite)")
-			return 1
+			return 254
 		}
 
 		// don't allow the user to delete the root filesystem by mistake
 		if absOutputDir == "/" {
 			stderr.Print("this would delete your root filesystem. Refusing.")
-			return 1
+			return 254
 		}
 
 		if err := os.RemoveAll(absOutputDir); err != nil {
 			stderr.PrintE("error removing existing output dir", err)
-			return 1
+			return 254
 		}
 	}
 
@@ -106,13 +106,13 @@ func runImageExtract(cmd *cobra.Command, args []string) (exit int) {
 		rktTmpDir, err := s.TmpDir()
 		if err != nil {
 			stderr.PrintE("error creating rkt temporary directory", err)
-			return 1
+			return 254
 		}
 
 		tmpDir, err := ioutil.TempDir(rktTmpDir, "rkt-image-extract-")
 		if err != nil {
 			stderr.PrintE("error creating temporary directory", err)
-			return 1
+			return 254
 		}
 		defer os.RemoveAll(tmpDir)
 
@@ -120,13 +120,13 @@ func runImageExtract(cmd *cobra.Command, args []string) (exit int) {
 	} else {
 		if err := os.MkdirAll(absOutputDir, 0755); err != nil {
 			stderr.PrintE("error creating output directory", err)
-			return 1
+			return 254
 		}
 	}
 
 	if err := tar.ExtractTar(aci, extractDir, false, user.NewBlankUidRange(), nil); err != nil {
 		stderr.PrintE("error extracting ACI", err)
-		return 1
+		return 254
 	}
 
 	if flagExtractRootfsOnly {
@@ -136,11 +136,11 @@ func runImageExtract(cmd *cobra.Command, args []string) (exit int) {
 				// it's on a different device, fall back to copying
 				if err := fileutil.CopyTree(rootfsDir, absOutputDir, user.NewBlankUidRange()); err != nil {
 					stderr.PrintE("error copying ACI rootfs", err)
-					return 1
+					return 254
 				}
 			} else {
 				stderr.PrintE("error moving ACI rootfs", err)
-				return 1
+				return 254
 			}
 		}
 	}
diff --git a/rkt/image_gc.go b/rkt/image_gc.go
index 44d09c6170..250d97e468 100644
--- a/rkt/image_gc.go
+++ b/rkt/image_gc.go
@@ -54,7 +54,7 @@ func runGCImage(cmd *cobra.Command, args []string) (exit int) {
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	ts, err := treestore.NewStore(treeStoreDir(), s)
@@ -65,12 +65,12 @@ func runGCImage(cmd *cobra.Command, args []string) (exit int) {
 
 	if err := gcTreeStore(ts); err != nil {
 		stderr.PrintE("failed to remove unreferenced treestores", err)
-		return 1
+		return 254
 	}
 
 	if err := gcStore(s, flagImageGracePeriod); err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 1b2341f558..4223db5365 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -158,13 +158,13 @@ func runImages(cmd *cobra.Command, args []string) int {
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	remotes, err := s.GetAllRemotes()
 	if err != nil {
 		stderr.PrintE("unable to get remotes", err)
-		return 1
+		return 254
 	}
 
 	remoteMap := make(map[string]*imagestore.Remote)
@@ -179,7 +179,7 @@ func runImages(cmd *cobra.Command, args []string) int {
 	aciInfos, err := s.GetAllACIInfos(sortAciinfoFields, bool(flagImagesSortAsc))
 	if err != nil {
 		stderr.PrintE("unable to get aci infos", err)
-		return 1
+		return 254
 	}
 
 	for _, aciInfo := range aciInfos {
diff --git a/rkt/image_render.go b/rkt/image_render.go
index e4999d0362..9f89937b46 100644
--- a/rkt/image_render.go
+++ b/rkt/image_render.go
@@ -54,14 +54,14 @@ func init() {
 func runImageRender(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 2 {
 		cmd.Usage()
-		return 1
+		return 254
 	}
 	outputDir := args[1]
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	ts, err := treestore.NewStore(treeStoreDir(), s)
@@ -73,70 +73,70 @@ func runImageRender(cmd *cobra.Command, args []string) (exit int) {
 	key, err := getStoreKeyFromAppOrHash(s, args[0])
 	if err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	id, _, err := ts.Render(key, false)
 	if err != nil {
 		stderr.PrintE("error rendering ACI", err)
-		return 1
+		return 254
 	}
 	if _, err := ts.Check(id); err != nil {
 		stderr.Print("warning: tree cache is in a bad state. Rebuilding...")
 		var err error
 		if id, _, err = ts.Render(key, true); err != nil {
 			stderr.PrintE("error rendering ACI", err)
-			return 1
+			return 254
 		}
 	}
 
 	if _, err := os.Stat(outputDir); err == nil {
 		if !flagRenderOverwrite {
 			stderr.Print("output directory exists (try --overwrite)")
-			return 1
+			return 254
 		}
 
 		// don't allow the user to delete the root filesystem by mistake
 		if outputDir == "/" {
 			stderr.Print("this would delete your root filesystem. Refusing.")
-			return 1
+			return 254
 		}
 
 		if err := os.RemoveAll(outputDir); err != nil {
 			stderr.PrintE("error removing existing output dir", err)
-			return 1
+			return 254
 		}
 	}
 	rootfsOutDir := outputDir
 	if !flagRenderRootfsOnly {
 		if err := os.MkdirAll(outputDir, 0755); err != nil {
 			stderr.PrintE("error creating output directory", err)
-			return 1
+			return 254
 		}
 		rootfsOutDir = filepath.Join(rootfsOutDir, "rootfs")
 
 		manifest, err := s.GetImageManifest(key)
 		if err != nil {
 			stderr.PrintE("error getting manifest", err)
-			return 1
+			return 254
 		}
 
 		mb, err := json.Marshal(manifest)
 		if err != nil {
 			stderr.PrintE("error marshalling image manifest", err)
-			return 1
+			return 254
 		}
 
 		if err := ioutil.WriteFile(filepath.Join(outputDir, "manifest"), mb, 0700); err != nil {
 			stderr.PrintE("error writing image manifest", err)
-			return 1
+			return 254
 		}
 	}
 
 	cachedTreePath := ts.GetRootFS(id)
 	if err := fileutil.CopyTree(cachedTreePath, rootfsOutDir, user.NewBlankUidRange()); err != nil {
 		stderr.PrintE("error copying ACI rootfs", err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/rkt/image_rm.go b/rkt/image_rm.go
index 2482625a52..1cb0896096 100644
--- a/rkt/image_rm.go
+++ b/rkt/image_rm.go
@@ -128,18 +128,18 @@ func rmImages(s *imagestore.Store, images []string) error {
 func runRmImage(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) < 1 {
 		stderr.Print("must provide at least one image ID")
-		return 1
+		return 254
 	}
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	if err := rmImages(s, args); err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/rkt/list.go b/rkt/list.go
index 5effd2faa4..d7ce53b48b 100644
--- a/rkt/list.go
+++ b/rkt/list.go
@@ -196,7 +196,7 @@ func runList(cmd *cobra.Command, args []string) int {
 
 	}); err != nil {
 		stderr.PrintE("failed to get pod handles", err)
-		return 1
+		return 254
 	}
 
 	switch flagFormat {
@@ -207,14 +207,14 @@ func runList(cmd *cobra.Command, args []string) int {
 		result, err := json.Marshal(pods)
 		if err != nil {
 			stderr.PrintE("error marshaling the pods", err)
-			return 1
+			return 254
 		}
 		stdout.Print(string(result))
 	case "json-pretty":
 		result, err := json.MarshalIndent(pods, "", "\t")
 		if err != nil {
 			stderr.PrintE("error marshaling the pods", err)
-			return 1
+			return 254
 		}
 		stdout.Print(string(result))
 	}
diff --git a/rkt/main.go b/rkt/main.go
index 9067e734ab..8e6cfd3c70 100644
--- a/rkt/main.go
+++ b/rkt/main.go
@@ -31,7 +31,7 @@ func main() {
 
 	if err := cmdRkt.Execute(); err != nil && cmdExitCode == 0 {
 		// err already printed by cobra on stderr
-		cmdExitCode = 2 // invalid argument
+		cmdExitCode = 254 // invalid argument
 	}
 	os.Exit(cmdExitCode)
 }
diff --git a/rkt/manpages_gen.go b/rkt/manpages_gen.go
index 0f07936816..3b7edc38e1 100644
--- a/rkt/manpages_gen.go
+++ b/rkt/manpages_gen.go
@@ -34,6 +34,6 @@ func main() {
 	err := doc.GenManTree(cmdRkt, header, "dist/manpages")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to generate the man pages: %v\n", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 }
diff --git a/rkt/metadata_service.go b/rkt/metadata_service.go
index b25a57ed7f..44e8f276d0 100644
--- a/rkt/metadata_service.go
+++ b/rkt/metadata_service.go
@@ -663,20 +663,20 @@ func runMetadataService(cmd *cobra.Command, args []string) (exit int) {
 	unixl, err := unixListener()
 	if err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 	defer unixl.Close()
 
 	tcpl, err := net.ListenTCP("tcp4", &net.TCPAddr{Port: flagListenPort})
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("error listening on port %v", flagListenPort), err)
-		return 1
+		return 254
 	}
 	defer tcpl.Close()
 
 	if err := initCrypto(); err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	go runRegistrationServer(unixl)
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 44a57a1400..41ea508a19 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -86,26 +86,26 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 	if flagQuiet {
 		if os.Stdout, err = os.Open("/dev/null"); err != nil {
 			stderr.PrintE("unable to open /dev/null", err)
-			return 1
+			return 254
 		}
 	}
 
 	if flagStoreOnly && flagNoStore {
 		stderr.Print("both --store-only and --no-store specified")
-		return 1
+		return 254
 	}
 
 	if flagPrivateUsers {
 		if !common.SupportsUserNS() {
 			stderr.Print("--private-users is not supported, kernel compiled without user namespace support")
-			return 1
+			return 254
 		}
 		privateUsers.SetRandomUidRange(user.DefaultRangeCount)
 	}
 
 	if err = parseApps(&rktApps, args, cmd.Flags(), true); err != nil {
 		stderr.PrintE("error parsing app image arguments", err)
-		return 1
+		return 254
 	}
 
 	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagStoreOnly || flagNoStore ||
@@ -114,36 +114,36 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "" ||
 		(*appCapsRetain)(&rktApps).String() != "" || (*appCapsRemove)(&rktApps).String() != "") {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
-		return 1
+		return 254
 	}
 
 	if rktApps.Count() < 1 && len(flagPodManifest) == 0 {
 		stderr.Print("must provide at least one image or specify the pod manifest")
-		return 1
+		return 254
 	}
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	ts, err := treestore.NewStore(treeStoreDir(), s)
 	if err != nil {
 		stderr.PrintE("cannot open treestore", err)
-		return 1
+		return 254
 	}
 
 	config, err := getConfig()
 	if err != nil {
 		stderr.PrintE("cannot get configuration", err)
-		return 1
+		return 254
 	}
 
 	s1img, err := getStage1Hash(s, ts, config)
 	if err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	fn := &image.Finder{
@@ -162,13 +162,13 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 	}
 	if err := fn.FindImages(&rktApps); err != nil {
 		stderr.PrintE("error finding images", err)
-		return 1
+		return 254
 	}
 
 	p, err := pkgPod.NewPod(getDataDir())
 	if err != nil {
 		stderr.PrintE("error creating new pod", err)
-		return 1
+		return 254
 	}
 
 	cfg := stage0.CommonConfig{
@@ -186,7 +186,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 			ovlOk = false
 		} else {
 			stderr.PrintE("error determining overlay support", err)
-			return 1
+			return 254
 		}
 	}
 
@@ -214,23 +214,23 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 	keyLock, err := lock.SharedKeyLock(lockDir(), common.PrepareLock)
 	if err != nil {
 		stderr.PrintE("cannot get shared prepare lock", err)
-		return 1
+		return 254
 	}
 	if err = stage0.Prepare(pcfg, p.Path(), p.UUID); err != nil {
 		stderr.PrintE("error setting up stage0", err)
 		keyLock.Close()
-		return 1
+		return 254
 	}
 	keyLock.Close()
 
 	if err := p.Sync(); err != nil {
 		stderr.PrintE("error syncing pod data", err)
-		return 1
+		return 254
 	}
 
 	if err := p.ToPrepared(); err != nil {
 		stderr.PrintE("error transitioning to prepared", err)
-		return 1
+		return 254
 	}
 
 	os.Stdout = origStdout // restore output in case of --quiet
diff --git a/rkt/rkt.go b/rkt/rkt.go
index 168edf7c7b..4208fcf356 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -161,7 +161,7 @@ func init() {
 	sf, err := rktflag.NewSecFlags("none")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "rkt: problem initializing: %v", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	globalFlags.InsecureFlags = sf
@@ -234,7 +234,7 @@ func runWrapper(cf func(cmd *cobra.Command, args []string) (exit int)) func(cmd
 		cpufile, memfile, err := startProfile()
 		if err != nil {
 			stderr.PrintE("cannot setup profiling", err)
-			cmdExitCode = 1
+			cmdExitCode = 254
 			return
 		}
 		defer stopProfile(cpufile, memfile)
@@ -249,7 +249,7 @@ func ensureSuperuser(cf func(cmd *cobra.Command, args []string)) func(cmd *cobra
 	return func(cmd *cobra.Command, args []string) {
 		if os.Geteuid() != 0 {
 			stderr.Print("cannot run as unprivileged user")
-			cmdExitCode = 1
+			cmdExitCode = 254
 			return
 		}
 
@@ -337,7 +337,7 @@ func calculateDataDir() string {
 		config, err := getConfig()
 		if err != nil {
 			stderr.PrintE("cannot get configuration", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		if config.Paths.DataDir != "" {
@@ -354,7 +354,7 @@ func calculateDataDir() string {
 			realDataDir = dataDir
 		} else {
 			stderr.PrintE(fmt.Sprintf("cannot evaluate dataDir %q real path", dataDir), err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 	}
 
diff --git a/rkt/rm.go b/rkt/rm.go
index 4821bc1368..50cf4ecee5 100644
--- a/rkt/rm.go
+++ b/rkt/rm.go
@@ -47,7 +47,7 @@ func runRm(cmd *cobra.Command, args []string) (exit int) {
 		podUUID, err := pkgPod.ReadUUIDFromFile(flagUUIDFile)
 		if err != nil {
 			stderr.PrintE("unable to resolve UUID from file", err)
-			ret = 1
+			ret = 254
 		} else {
 			podUUIDs = append(podUUIDs, podUUID)
 		}
@@ -57,13 +57,13 @@ func runRm(cmd *cobra.Command, args []string) (exit int) {
 
 	default:
 		cmd.Usage()
-		return 1
+		return 254
 	}
 
 	for _, podUUID := range podUUIDs {
 		p, err := pkgPod.PodFromUUIDString(getDataDir(), podUUID)
 		if err != nil {
-			ret = 1
+			ret = 254
 			stderr.PrintE("cannot get pod", err)
 			continue
 		}
@@ -71,11 +71,11 @@ func runRm(cmd *cobra.Command, args []string) (exit int) {
 		if removePod(p) {
 			stdout.Printf("%q", p.UUID)
 		} else {
-			ret = 1
+			ret = 254
 		}
 	}
 
-	if ret == 1 {
+	if ret == 254 {
 		stderr.Print("failed to remove one or more pods")
 	}
 
diff --git a/rkt/run.go b/rkt/run.go
index d5750dcc93..d0ad106e77 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -155,34 +155,34 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	err := parseApps(&rktApps, args, cmd.Flags(), true)
 	if err != nil {
 		stderr.PrintE("error parsing app image arguments", err)
-		return 1
+		return 254
 	}
 
 	if flagStoreOnly && flagNoStore {
 		stderr.Print("both --store-only and --no-store specified")
-		return 1
+		return 254
 	}
 
 	if flagPrivateUsers {
 		if !common.SupportsUserNS() {
 			stderr.Print("--private-users is not supported, kernel compiled without user namespace support")
-			return 1
+			return 254
 		}
 		privateUsers.SetRandomUidRange(user.DefaultRangeCount)
 	}
 
 	if len(flagPorts) > 0 && flagNet.None() {
 		stderr.Print("--port flag does not work with 'none' networking")
-		return 1
+		return 254
 	}
 	if len(flagPorts) > 0 && flagNet.Host() {
 		stderr.Print("--port flag does not work with 'host' networking")
-		return 1
+		return 254
 	}
 
 	if flagMDSRegister && flagNet.None() {
 		stderr.Print("--mds-register flag does not work with --net=none. Please use 'host', 'default' or an equivalent network")
-		return 1
+		return 254
 	}
 
 	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || rktApps.Count() > 0 || flagStoreOnly || flagNoStore ||
@@ -191,41 +191,41 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "" ||
 		(*appCapsRetain)(&rktApps).String() != "" || (*appCapsRemove)(&rktApps).String() != "") {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
-		return 1
+		return 254
 	}
 
 	if flagInteractive && rktApps.Count() > 1 {
 		stderr.Print("interactive option only supports one image")
-		return 1
+		return 254
 	}
 
 	if rktApps.Count() < 1 && len(flagPodManifest) == 0 {
 		stderr.Print("must provide at least one image or specify the pod manifest")
-		return 1
+		return 254
 	}
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	ts, err := treestore.NewStore(treeStoreDir(), s)
 	if err != nil {
 		stderr.PrintE("cannot open treestore", err)
-		return 1
+		return 254
 	}
 
 	config, err := getConfig()
 	if err != nil {
 		stderr.PrintE("cannot get configuration", err)
-		return 1
+		return 254
 	}
 
 	s1img, err := getStage1Hash(s, ts, config)
 	if err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	fn := &image.Finder{
@@ -244,13 +244,13 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	}
 	if err := fn.FindImages(&rktApps); err != nil {
 		stderr.Error(err)
-		return 1
+		return 254
 	}
 
 	p, err := pkgPod.NewPod(getDataDir())
 	if err != nil {
 		stderr.PrintE("error creating new pod", err)
-		return 1
+		return 254
 	}
 
 	// if requested, write out pod UUID early so "rkt rm" can
@@ -258,14 +258,14 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	if flagUUIDFileSave != "" {
 		if err := pkgPod.WriteUUIDToFile(p.UUID, flagUUIDFileSave); err != nil {
 			stderr.PrintE("error saving pod UUID to file", err)
-			return 1
+			return 254
 		}
 	}
 
 	processLabel, mountLabel, err := label.InitLabels("/var/run/rkt/mcs", []string{})
 	if err != nil {
 		stderr.PrintE("error initialising SELinux", err)
-		return 1
+		return 254
 	}
 
 	p.MountLabel = mountLabel
@@ -288,7 +288,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 			ovlOk = false
 		} else {
 			stderr.PrintE("error determining overlay support", err)
-			return 1
+			return 254
 		}
 	}
 
@@ -318,13 +318,13 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	keyLock, err := lock.SharedKeyLock(lockDir(), common.PrepareLock)
 	if err != nil {
 		stderr.PrintE("cannot get shared prepare lock", err)
-		return 1
+		return 254
 	}
 	err = stage0.Prepare(pcfg, p.Path(), p.UUID)
 	if err != nil {
 		stderr.PrintE("error setting up stage0", err)
 		keyLock.Close()
-		return 1
+		return 254
 	}
 	keyLock.Close()
 
@@ -332,13 +332,13 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	lfd, err := p.Fd()
 	if err != nil {
 		stderr.PrintE("error getting pod lock fd", err)
-		return 1
+		return 254
 	}
 
 	// skip prepared by jumping directly to run, we own this pod
 	if err := p.ToRun(); err != nil {
 		stderr.PrintE("unable to transition to run", err)
-		return 1
+		return 254
 	}
 
 	rktgid, err := common.LookupGid(common.RktGroup)
@@ -350,7 +350,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	DNSConfMode, DNSConfig, HostsEntries, err := parseDNSFlags(flagHostsEntries, flagDNS, flagDNSSearch, flagDNSOpt, flagDNSDomain)
 	if err != nil {
 		stderr.PrintE("error with dns flags", err)
-		return 1
+		return 254
 	}
 
 	rcfg := stage0.RunConfig{
@@ -374,12 +374,12 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	_, manifest, err := p.PodManifest()
 	if err != nil {
 		stderr.PrintE("cannot get the pod manifest", err)
-		return 1
+		return 254
 	}
 	rcfg.Apps = manifest.Apps
 	stage0.Run(rcfg, p.Path(), getDataDir()) // execs, never returns
 
-	return 1
+	return 254
 }
 
 // portList implements the flag.Value interface to contain a set of mappings
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index add3bbaf66..08e6f5d072 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -57,43 +57,43 @@ func init() {
 func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 1 {
 		cmd.Usage()
-		return 1
+		return 254
 	}
 
 	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
-		return 1
+		return 254
 	}
 	defer p.Close()
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	ts, err := treestore.NewStore(treeStoreDir(), s)
 	if err != nil {
 		stderr.PrintE("cannot open treestore", err)
-		return 1
+		return 254
 	}
 
 	if p.State() != pkgPod.Prepared {
 		stderr.Printf("pod %q is not prepared", p.UUID)
-		return 1
+		return 254
 	}
 
 	_, manifest, err := p.PodManifest()
 	if err != nil {
 		stderr.PrintE("cannot read pod manifest", err)
-		return 1
+		return 254
 	}
 
 	if flagInteractive {
 		if len(manifest.Apps) > 1 {
 			stderr.Print("interactive option only supports pods with one app")
-			return 1
+			return 254
 		}
 	}
 
@@ -103,19 +103,19 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 	if flagMDSRegister {
 		if err := stage0.CheckMdsAvailability(); err != nil {
 			stderr.Error(err)
-			return 1
+			return 254
 		}
 	}
 
 	if err := p.ToRun(); err != nil {
 		stderr.PrintE("cannot transition to run", err)
-		return 1
+		return 254
 	}
 
 	lfd, err := p.Fd()
 	if err != nil {
 		stderr.PrintE("unable to get lock fd", err)
-		return 1
+		return 254
 	}
 
 	rktgid, err := common.LookupGid(common.RktGroup)
@@ -131,7 +131,7 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 			ovlOk = false
 		} else {
 			stderr.PrintE("error determining overlay support", err)
-			return 1
+			return 254
 		}
 	}
 
@@ -141,13 +141,13 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 	// between prepare and run-prepared
 	if ovlPrep && !ovlOk {
 		stderr.Print("unable to run prepared overlay-enabled pod: overlay not supported")
-		return 1
+		return 254
 	}
 
 	DNSConfMode, DNSConfig, HostsEntries, err := parseDNSFlags(flagHostsEntries, flagDNS, flagDNSSearch, flagDNSOpt, flagDNSDomain)
 	if err != nil {
 		stderr.PrintE("error with dns flags", err)
-		return 1
+		return 254
 	}
 
 	rcfg := stage0.RunConfig{
@@ -176,5 +176,5 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 		stage0.InitDebug()
 	}
 	stage0.Run(rcfg, p.Path(), getDataDir()) // execs, never returns
-	return 1
+	return 254
 }
diff --git a/rkt/status.go b/rkt/status.go
index 40a4f3a415..6e579779a1 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -49,26 +49,26 @@ func init() {
 func runStatus(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 1 {
 		cmd.Usage()
-		return 1
+		return 254
 	}
 
 	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
-		return 1
+		return 254
 	}
 	defer p.Close()
 
 	if flagWait {
 		if err := p.WaitExited(); err != nil {
 			stderr.PrintE("unable to wait for pod", err)
-			return 1
+			return 254
 		}
 	}
 
 	if err = printStatus(p); err != nil {
 		stderr.PrintE("unable to print status", err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/rkt/stop.go b/rkt/stop.go
index 36806be869..677e97c9b2 100644
--- a/rkt/stop.go
+++ b/rkt/stop.go
@@ -60,7 +60,7 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 
 	default:
 		cmd.Usage()
-		return 1
+		return 254
 	}
 
 	for _, podUUID := range podUUIDs {
@@ -87,7 +87,7 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 
 	if errors > 0 {
 		stderr.Error(fmt.Errorf("failed to stop %d pod(s)", errors))
-		return 1
+		return 254
 	}
 
 	return ret
diff --git a/rkt/trust.go b/rkt/trust.go
index 0f02696623..b129c709c2 100644
--- a/rkt/trust.go
+++ b/rkt/trust.go
@@ -68,25 +68,25 @@ Otherwise, trust at the root domain (not recommended) must be explicitly request
 		} else {
 			cmd.Usage()
 		}
-		return 1
+		return 254
 	}
 
 	if flagPrefix != "" && flagRoot {
 		stderr.Print("--root and --prefix usage mutually exclusive")
-		return 1
+		return 254
 	}
 
 	ks := getKeystore()
 	if ks == nil {
 		stderr.Print("could not get the keystore")
-		return 1
+		return 254
 	}
 
 	// if the user included a scheme with the prefix, error on it
 	u, err := url.Parse(flagPrefix)
 	if err == nil && u.Scheme != "" {
 		stderr.Printf("--prefix must not contain a URL scheme, omit %s://", u.Scheme)
-		return 1
+		return 254
 	}
 
 	pkls := args
@@ -101,7 +101,7 @@ Otherwise, trust at the root domain (not recommended) must be explicitly request
 		pkls, err = m.GetPubKeyLocations(flagPrefix)
 		if err != nil {
 			stderr.PrintE("error determining key location", err)
-			return 1
+			return 254
 		}
 	}
 
@@ -112,7 +112,7 @@ Otherwise, trust at the root domain (not recommended) must be explicitly request
 
 	if err := m.AddKeys(pkls, flagPrefix, acceptOpt); err != nil {
 		stderr.PrintE("error adding keys", err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/stage1/app-rm/app-rm.go b/stage1/app-rm/app-rm.go
index 978c50115d..adace9b2e1 100644
--- a/stage1/app-rm/app-rm.go
+++ b/stage1/app-rm/app-rm.go
@@ -55,7 +55,7 @@ func main() {
 	appName, err := types.NewACName(flag.Arg(1))
 	if err != nil {
 		log.PrintE("invalid app name", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	enterEP := flag.Arg(2)
@@ -77,7 +77,7 @@ func main() {
 
 	if string(out) != "inactive\n" {
 		log.Printf("app %q is still running", appName.String())
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	s1rootfs := common.Stage1RootfsPath(".")
@@ -90,7 +90,7 @@ func main() {
 	for _, p := range appServicePaths {
 		if err := os.Remove(p); err != nil && !os.IsNotExist(err) {
 			log.PrintE("error removing app service file", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 	}
 
@@ -105,7 +105,7 @@ func main() {
 	}
 	if err := cmd.Run(); err != nil {
 		log.PrintE(`error executing "systemctl daemon-reload"`, err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	// TODO unmount all the volumes
diff --git a/stage1/app-start/app-start.go b/stage1/app-start/app-start.go
index 53827118ea..089199f200 100644
--- a/stage1/app-start/app-start.go
+++ b/stage1/app-start/app-start.go
@@ -63,13 +63,13 @@ func main() {
 	uuid, err := types.NewUUID(flag.Arg(0))
 	if err != nil {
 		log.PrintE("UUID is missing or malformed", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	appName, err := types.NewACName(flag.Arg(1))
 	if err != nil {
 		log.PrintE("invalid app name", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	enterEP := flag.Arg(2)
@@ -78,7 +78,7 @@ func main() {
 	p, err := stage1types.LoadPod(root, uuid)
 	if err != nil {
 		log.PrintE("failed to load pod", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	insecureOptions := stage1initcommon.Stage1InsecureOptions{
@@ -90,7 +90,7 @@ func main() {
 	ra := p.Manifest.Apps.Get(*appName)
 	if ra == nil {
 		log.Printf("failed to get app")
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	if ra.App.WorkingDirectory == "" {
@@ -100,7 +100,7 @@ func main() {
 	binPath, err := stage1initcommon.FindBinPath(p, ra)
 	if err != nil {
 		log.PrintE("failed to find bin path", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	w := stage1initcommon.NewUnitWriter(p)
@@ -116,7 +116,7 @@ func main() {
 
 	if err := w.Error(); err != nil {
 		log.PrintE("error generating app units", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	args := []string{enterEP}
@@ -132,7 +132,7 @@ func main() {
 
 	if err := cmd.Run(); err != nil {
 		log.PrintE("error executing daemon-reload", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	args = []string{enterEP}
@@ -149,7 +149,7 @@ func main() {
 
 	if err := cmd.Run(); err != nil {
 		log.PrintE(fmt.Sprintf("error starting app %q", appName.String()), err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	// TODO unmount all the volumes
diff --git a/stage1/app-stop/app-stop.go b/stage1/app-stop/app-stop.go
index f90d5457d7..fa8618047d 100644
--- a/stage1/app-stop/app-stop.go
+++ b/stage1/app-stop/app-stop.go
@@ -53,7 +53,7 @@ func main() {
 	appName, err := types.NewACName(flag.Arg(1))
 	if err != nil {
 		log.PrintE("invalid app name", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	enterEP := flag.Arg(2)
@@ -72,7 +72,7 @@ func main() {
 
 	if err := cmd.Run(); err != nil {
 		log.PrintE(fmt.Sprintf("error stopping app %q", appName.String()), err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	os.Exit(0)
diff --git a/stage1/enter_kvm/enter_kvm.go b/stage1/enter_kvm/enter_kvm.go
index d42cec1867..a842aab3a4 100644
--- a/stage1/enter_kvm/enter_kvm.go
+++ b/stage1/enter_kvm/enter_kvm.go
@@ -74,5 +74,5 @@ func main() {
 	// ExecSSH() should return only with error
 	log.Error(ssh.ExecSSH(getAppexecArgs()))
 
-	os.Exit(2)
+	os.Exit(254)
 }
diff --git a/stage1/init/init.go b/stage1/init/init.go
index f1ae5ec772..585c07a1d1 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -528,14 +528,14 @@ func stage1() int {
 	uuid, err := types.NewUUID(flag.Arg(0))
 	if err != nil {
 		log.PrintE("UUID is missing or malformed", err)
-		return 1
+		return 254
 	}
 
 	root := "."
 	p, err := stage1commontypes.LoadPod(root, uuid)
 	if err != nil {
 		log.PrintE("failed to load pod", err)
-		return 1
+		return 254
 	}
 
 	// set close-on-exec flag on RKT_LOCK_FD so it gets correctly closed when invoking
@@ -543,12 +543,12 @@ func stage1() int {
 	lfd, err := common.GetRktLockFD()
 	if err != nil {
 		log.PrintE("failed to get rkt lock fd", err)
-		return 1
+		return 254
 	}
 
 	if err := sys.CloseOnExec(lfd, true); err != nil {
 		log.PrintE("failed to set FD_CLOEXEC on rkt lock", err)
-		return 1
+		return 254
 	}
 
 	mirrorLocalZoneInfo(p.Root)
@@ -556,7 +556,7 @@ func stage1() int {
 	flavor, _, err := stage1initcommon.GetFlavor(p)
 	if err != nil {
 		log.PrintE("failed to get stage1 flavor", err)
-		return 1
+		return 254
 	}
 
 	var n *networking.Networking
@@ -564,27 +564,27 @@ func stage1() int {
 		fps, err := forwardedPorts(p)
 		if err != nil {
 			log.Error(err)
-			return 1
+			return 254
 		}
 
 		noDNS := dnsConfMode.Pairs["resolv"] != "default" // force ignore CNI DNS results
 		n, err = networking.Setup(root, p.UUID, fps, netList, localConfig, flavor, noDNS, debug)
 		if err != nil {
 			log.PrintE("failed to setup network", err)
-			return 1
+			return 254
 		}
 
 		if err = n.Save(); err != nil {
 			log.PrintE("failed to save networking state", err)
 			n.Teardown(flavor, debug)
-			return 1
+			return 254
 		}
 
 		if len(mdsToken) > 0 {
 			hostIP, err := n.GetForwardableNetHostIP()
 			if err != nil {
 				log.PrintE("failed to get default Host IP", err)
-				return 1
+				return 254
 			}
 
 			p.MetadataServiceURL = common.MetadataServicePublicURL(hostIP, mdsToken)
@@ -592,7 +592,7 @@ func stage1() int {
 	} else {
 		if flavor == "kvm" {
 			log.Print("flavor kvm requires private network configuration (try --net)")
-			return 1
+			return 254
 		}
 		if len(mdsToken) > 0 {
 			p.MetadataServiceURL = common.MetadataServicePublicURL(localhostIP, mdsToken)
@@ -616,12 +616,12 @@ func stage1() int {
 	if mutable {
 		if err = stage1initcommon.MutableEnv(p); err != nil {
 			log.Error(err)
-			return 1
+			return 254
 		}
 	} else {
 		if err = stage1initcommon.ImmutableEnv(p, interactive, privateUsers, insecureOptions); err != nil {
 			log.Error(err)
-			return 1
+			return 254
 		}
 	}
 
@@ -633,7 +633,7 @@ func stage1() int {
 		kvm.InitDebug(debug)
 		if err := KvmNetworkingToSystemd(p, n); err != nil {
 			log.PrintE("failed to configure systemd for kvm", err)
-			return 1
+			return 254
 		}
 	}
 
@@ -645,7 +645,7 @@ func stage1() int {
 	args, env, err := getArgsEnv(p, flavor, canMachinedRegister, debug, n, insecureOptions)
 	if err != nil {
 		log.Error(err)
-		return 1
+		return 254
 	}
 
 	// create a separate mount namespace so the cgroup filesystems
@@ -669,7 +669,7 @@ func stage1() int {
 	unifiedCgroup, err := cgroup.IsCgroupUnified("/")
 	if err != nil {
 		log.FatalE("error determining cgroup version", err)
-		return 1
+		return 254
 	}
 
 	s1Root := common.Stage1RootfsPath(p.Root)
@@ -678,25 +678,25 @@ func stage1() int {
 	subcgroup, err := getContainerSubCgroup(machineID, canMachinedRegister, unifiedCgroup)
 	if err != nil {
 		log.FatalE("error getting container subcgroup", err)
-		return 1
+		return 254
 	}
 
 	if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
 		[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
 		log.FatalE("cannot write subcgroup file", err)
-		return 1
+		return 254
 	}
 
 	if !unifiedCgroup {
 		enabledCgroups, err := cgroup.GetEnabledV1Cgroups()
 		if err != nil {
 			log.FatalE("error getting v1 cgroups", err)
-			return 1
+			return 254
 		}
 
 		if err := mountHostV1Cgroups(enabledCgroups); err != nil {
 			log.FatalE("couldn't mount the host v1 cgroups", err)
-			return 1
+			return 254
 		}
 
 		var serviceNames []string
@@ -706,7 +706,7 @@ func stage1() int {
 
 		if err := mountContainerV1Cgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
 			log.PrintE("couldn't mount the container v1 cgroups", err)
-			return 1
+			return 254
 		}
 
 	}
@@ -721,13 +721,13 @@ func stage1() int {
 
 	if err = stage1common.WritePid(os.Getpid(), pid_filename); err != nil {
 		log.Error(err)
-		return 1
+		return 254
 	}
 
 	if flavor == "kvm" {
 		if err := KvmPrepareMounts(s1Root, p); err != nil {
 			log.PrintE("could not prepare mounts", err)
-			return 1
+			return 254
 		}
 	}
 
@@ -736,7 +736,7 @@ func stage1() int {
 	})
 	if err != nil {
 		log.PrintE(fmt.Sprintf("failed to execute %q", args[0]), err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/stage1/stop/stop.go b/stage1/stop/stop.go
index d6a6f05761..c0fd51babc 100644
--- a/stage1/stop/stop.go
+++ b/stage1/stop/stop.go
@@ -48,37 +48,37 @@ func main() {
 	pid, err := readIntFromFile("ppid")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	process, err := process.NewProcess(pid)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "unable to create process %d instance: %v\n", pid, err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	if force {
 		children, err := process.Children()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "cannot get child processes from %d: %v\n", pid, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		for _, child := range children {
 			if err := child.Kill(); err != nil {
 				fmt.Fprintf(os.Stderr, "unable to kill process %d: %v\n", child.Pid, err)
-				os.Exit(1)
+				os.Exit(254)
 			}
 		}
 
 		if err := process.Kill(); err != nil {
 			fmt.Fprintf(os.Stderr, "unable to kill process %d: %v\n", pid, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 	} else {
 		if process.Terminate() != nil {
 			fmt.Fprintf(os.Stderr, "unable to terminate process %d: %v\n", pid, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 	}
 }
diff --git a/stage1/stop_kvm/stop_kvm.go b/stage1/stop_kvm/stop_kvm.go
index 1591456e6a..cd0cf5da5a 100644
--- a/stage1/stop_kvm/stop_kvm.go
+++ b/stage1/stop_kvm/stop_kvm.go
@@ -52,17 +52,17 @@ func main() {
 		pid, err := readIntFromFile("pid")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		if err := syscall.Kill(pid, syscall.SIGKILL); err != nil {
 			fmt.Fprintf(os.Stderr, "error sending %v: %v\n", syscall.SIGKILL, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		return
 	}
 
 	// ExecSSH() should return only with error
 	log.Error(ssh.ExecSSH([]string{"systemctl", "halt"}))
-	os.Exit(1)
+	os.Exit(254)
 }
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 8b140fa561..94904de330 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -264,20 +264,20 @@ func stage1() int {
 	uuid, err := types.NewUUID(flag.Arg(0))
 	if err != nil {
 		log.Print("UUID is missing or malformed\n")
-		return 1
+		return 254
 	}
 
 	root := "."
 	p, err := stage1commontypes.LoadPod(root, uuid)
 	if err != nil {
 		log.PrintE("can't load pod", err)
-		return 1
+		return 254
 	}
 
 	// Sanity checks
 	if len(p.Manifest.Apps) != 1 {
 		log.Printf("flavor %q only supports 1 application per Pod for now", flavor)
-		return 1
+		return 254
 	}
 
 	ra := p.Manifest.Apps[0]
@@ -286,19 +286,19 @@ func stage1() int {
 	args := ra.App.Exec
 	if len(args) == 0 {
 		log.Printf(`image %q has an empty "exec" (try --exec=BINARY)`, imgName)
-		return 1
+		return 254
 	}
 
 	lfd, err := common.GetRktLockFD()
 	if err != nil {
 		log.PrintE("can't get rkt lock fd", err)
-		return 1
+		return 254
 	}
 
 	// set close-on-exec flag on RKT_LOCK_FD so it gets correctly closed after execution is finished
 	if err := sys.CloseOnExec(lfd, true); err != nil {
 		log.PrintE("can't set FD_CLOEXEC on rkt lock", err)
-		return 1
+		return 254
 	}
 
 	workDir := "/"
@@ -316,7 +316,7 @@ func stage1() int {
 	argFlyMounts, err := evaluateMounts(rfs, string(ra.Name), p)
 	if err != nil {
 		log.PrintE("can't evaluate mounts", err)
-		return 1
+		return 254
 	}
 
 	effectiveMounts := append(
@@ -350,7 +350,7 @@ func stage1() int {
 	case "stage0":
 		if err := copyResolv(p); err != nil {
 			log.PrintE("can't copy /etc/resolv.conf", err)
-			return 1
+			return 254
 		}
 	}
 
@@ -392,7 +392,7 @@ func stage1() int {
 		if strings.HasPrefix(mount.HostPath, "/") {
 			if hostPathInfo, err = os.Stat(mount.HostPath); err != nil {
 				log.PrintE(fmt.Sprintf("stat of host path %s", mount.HostPath), err)
-				return 1
+				return 254
 			}
 		} else {
 			hostPathInfo = nil
@@ -401,7 +401,7 @@ func stage1() int {
 		absTargetPath := filepath.Join(mount.TargetPrefixPath, mount.RelTargetPath)
 		if targetPathInfo, err = os.Stat(absTargetPath); err != nil && !os.IsNotExist(err) {
 			log.PrintE(fmt.Sprintf("stat of target path %s", absTargetPath), err)
-			return 1
+			return 254
 		}
 
 		switch {
@@ -413,19 +413,19 @@ func stage1() int {
 			absTargetPathParent, _ := filepath.Split(absTargetPath)
 			if err := os.MkdirAll(absTargetPathParent, 0755); err != nil {
 				log.PrintE(fmt.Sprintf("can't create directory %q", absTargetPath), err)
-				return 1
+				return 254
 			}
 			switch {
 			case hostPathInfo == nil || hostPathInfo.IsDir():
 				if err := os.Mkdir(absTargetPath, 0755); err != nil {
 					log.PrintE(fmt.Sprintf("can't create directory %q", absTargetPath), err)
-					return 1
+					return 254
 				}
 			case !hostPathInfo.IsDir():
 				file, err := os.OpenFile(absTargetPath, os.O_CREATE, 0700)
 				if err != nil {
 					log.PrintE(fmt.Sprintf("can't create file %q", absTargetPath), err)
-					return 1
+					return 254
 				}
 				file.Close()
 			}
@@ -433,22 +433,22 @@ func stage1() int {
 			switch {
 			case hostPathInfo.IsDir() && !targetPathInfo.IsDir():
 				log.Printf("can't mount because %q is a directory while %q is not", mount.HostPath, absTargetPath)
-				return 1
+				return 254
 			case !hostPathInfo.IsDir() && targetPathInfo.IsDir():
 				log.Printf("can't mount because %q is not a directory while %q is", mount.HostPath, absTargetPath)
-				return 1
+				return 254
 			}
 		}
 
 		if err := syscall.Mount(mount.HostPath, absTargetPath, mount.Fs, mount.Flags, ""); err != nil {
 			log.PrintE(fmt.Sprintf("can't mount %q on %q with flags %v", mount.HostPath, absTargetPath, mount.Flags), err)
-			return 1
+			return 254
 		}
 	}
 
 	if err = stage1common.WritePid(os.Getpid(), "pid"); err != nil {
 		log.Error(err)
-		return 1
+		return 254
 	}
 
 	var uidResolver, gidResolver user.Resolver
@@ -461,12 +461,12 @@ func stage1() int {
 
 	if err != nil { // give up
 		log.PrintE(fmt.Sprintf("invalid user %q", ra.App.User), err)
-		return 1
+		return 254
 	}
 
 	if uid, _, err = uidResolver.IDs(); err != nil {
 		log.PrintE(fmt.Sprintf("failed to configure user %q", ra.App.User), err)
-		return 1
+		return 254
 	}
 
 	gidResolver, err = user.NumericIDs(ra.App.Group)
@@ -476,23 +476,23 @@ func stage1() int {
 
 	if err != nil { // give up
 		log.PrintE(fmt.Sprintf("invalid group %q", ra.App.Group), err)
-		return 1
+		return 254
 	}
 
 	if _, gid, err = gidResolver.IDs(); err != nil {
 		log.PrintE(fmt.Sprintf("failed to configure group %q", ra.App.Group), err)
-		return 1
+		return 254
 	}
 
 	diag.Printf("chroot to %q", rfs)
 	if err := syscall.Chroot(rfs); err != nil {
 		log.PrintE("can't chroot", err)
-		return 1
+		return 254
 	}
 
 	if err := os.Chdir(workDir); err != nil {
 		log.PrintE(fmt.Sprintf("can't change to working directory %q", workDir), err)
-		return 1
+		return 254
 	}
 
 	// lock the current goroutine to its current OS thread.
@@ -504,12 +504,12 @@ func stage1() int {
 
 	if err := syscall.Setresgid(gid, gid, gid); err != nil {
 		log.PrintE(fmt.Sprintf("can't set gid %d", gid), err)
-		return 1
+		return 254
 	}
 
 	if err := syscall.Setresuid(uid, uid, uid); err != nil {
 		log.PrintE(fmt.Sprintf("can't set uid %d", uid), err)
-		return 1
+		return 254
 	}
 
 	diag.Printf("execing %q in %q", args, rfs)
@@ -518,7 +518,7 @@ func stage1() int {
 	})
 	if err != nil {
 		log.PrintE(fmt.Sprintf("can't execute %q", args[0]), err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/stage1_fly/stop/stop.go b/stage1_fly/stop/stop.go
index 18c645dbed..0b231f25fb 100644
--- a/stage1_fly/stop/stop.go
+++ b/stage1_fly/stop/stop.go
@@ -48,24 +48,24 @@ func main() {
 	pid, err := readIntFromFile("pid")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	process, err := process.NewProcess(pid)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "unable to create process %d instance: %v\n", pid, err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	if force {
 		if process.Kill() != nil {
 			fmt.Fprintf(os.Stderr, "unable to kill process %d: %v\n", pid, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 	} else {
 		if process.Terminate() != nil {
 			fmt.Fprintf(os.Stderr, "unable to terminate process %d: %v\n", pid, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 	}
 }
diff --git a/store/imagestore/main_test.go b/store/imagestore/main_test.go
index c21d99062f..8a6c706b54 100644
--- a/store/imagestore/main_test.go
+++ b/store/imagestore/main_test.go
@@ -43,7 +43,7 @@ func interestingGoroutines() (gs []string) {
 func TestMain(m *testing.M) {
 	v := m.Run()
 	if v == 0 && goroutineLeaked() {
-		os.Exit(1)
+		os.Exit(254)
 	}
 	os.Exit(v)
 }
diff --git a/tests/cniproxy/main.go b/tests/cniproxy/main.go
index c3666483b1..7702362ff6 100644
--- a/tests/cniproxy/main.go
+++ b/tests/cniproxy/main.go
@@ -48,9 +48,9 @@ func main() {
 	x_fail := cniArgs["X_FAIL"]
 	if x_fail == "exit" {
 		os.Stdout.WriteString(`{"cniVersion": "0.1.0", "code": 100, "msg": "this is a failure message"}`)
-		os.Exit(1)
+		os.Exit(254)
 	} else if x_fail == "crash" {
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	realPluginPath := findRealPlugin()
@@ -182,7 +182,7 @@ func findRealPlugin() string {
 
 func fail(msgs ...interface{}) {
 	fmt.Fprintln(os.Stderr, append([]interface{}{"CNIPROXY fail:"}, msgs...)...)
-	os.Exit(1)
+	os.Exit(254)
 }
 
 func getArgOrFail(key string) string {
diff --git a/tests/echo-socket-activated/echo-socket-activated.go b/tests/echo-socket-activated/echo-socket-activated.go
index 1c0bcc1237..74c251b27d 100644
--- a/tests/echo-socket-activated/echo-socket-activated.go
+++ b/tests/echo-socket-activated/echo-socket-activated.go
@@ -75,17 +75,17 @@ func main() {
 	n, err := sdListenFDs(false)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error getting socket-activated FDs: %v\n", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 	switch {
 	case n == 1:
 		fd = SD_LISTEN_FDS_START
 	case n > 1:
 		fmt.Fprintf(os.Stderr, "Too many file descriptors received.\n")
-		os.Exit(1)
+		os.Exit(254)
 	default:
 		fmt.Fprintf(os.Stderr, "Not socket activated.\n")
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	f := os.NewFile(fd, "")
@@ -94,13 +94,13 @@ func main() {
 	l, err := net.FileListener(f)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "FileListener: %v.\n", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	conn, err := l.Accept()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Accept: %v.\n", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	buf := make([]byte, 1024)
@@ -109,7 +109,7 @@ func main() {
 		if err != nil {
 			if err != io.EOF {
 				fmt.Fprintf(os.Stderr, "Read: %v.\n", err)
-				os.Exit(1)
+				os.Exit(254)
 			}
 			break
 		}
@@ -117,7 +117,7 @@ func main() {
 		data := buf[0:nr]
 		if _, err := conn.Write(data); err != nil {
 			fmt.Fprintf(os.Stderr, "Write: %v.\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 	}
 }
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index ead4fa4366..325419c722 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -144,7 +144,7 @@ func main() {
 	args := globalFlagset.Args()
 	if len(args) > 0 {
 		fmt.Fprintln(os.Stderr, "Wrong parameters")
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	if globalFlags.PrintNoNewPrivs {
@@ -162,18 +162,18 @@ func main() {
 		dev := strings.SplitN(globalFlags.CheckMknod, ":", 4)
 		if len(dev) < 4 {
 			fmt.Fprintln(os.Stderr, "Not enough parameters for mknod")
-			os.Exit(1)
+			os.Exit(254)
 		}
 		typ := dev[0]
 		major, err := strconv.Atoi(dev[1])
 		if err != nil {
 			fmt.Fprintln(os.Stderr, "Wrong major")
-			os.Exit(1)
+			os.Exit(254)
 		}
 		minor, err := strconv.Atoi(dev[2])
 		if err != nil {
 			fmt.Fprintln(os.Stderr, "Wrong minor")
-			os.Exit(1)
+			os.Exit(254)
 		}
 		nodeName := dev[3]
 
@@ -186,12 +186,12 @@ func main() {
 			mode |= syscall.S_IFBLK
 		default:
 			fmt.Fprintln(os.Stderr, "Wrong device node type")
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		if err := syscall.Mknod(nodeName, mode, int(majorMinor)); err != nil {
 			fmt.Fprintf(os.Stderr, "mknod %s: fail: %v\n", nodeName, err)
-			os.Exit(1)
+			os.Exit(254)
 		} else {
 			fmt.Printf("mknod %s: succeed\n", nodeName)
 			os.Exit(0)
@@ -233,7 +233,7 @@ func main() {
 		envBytes, err := ioutil.ReadFile("/proc/self/environ")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error reading environment from \"/proc/self/environ\": %v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		for _, v := range bytes.Split(envBytes, []byte{0}) {
 			if len(v) == 0 {
@@ -242,7 +242,7 @@ func main() {
 			if strings.HasPrefix(string(v), "PATH=") {
 				if strings.Contains(string(v), "\n") {
 					fmt.Fprintf(os.Stderr, "Malformed PATH: found new line")
-					os.Exit(1)
+					os.Exit(254)
 				} else {
 					fmt.Printf("PATH is good\n")
 					os.Exit(0)
@@ -252,7 +252,7 @@ func main() {
 			}
 		}
 		fmt.Fprintf(os.Stderr, "PATH not found")
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	if globalFlags.PrintExec {
@@ -279,7 +279,7 @@ func main() {
 		caps, err := capability.NewPid(globalFlags.PrintCapsPid)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Cannot get caps: %v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("Capability set: effective: %s (%s)\n", caps.StringCap(capability.EFFECTIVE), globalFlags.SuffixMsg)
 		fmt.Printf("Capability set: permitted: %s (%s)\n", caps.StringCap(capability.PERMITTED), globalFlags.SuffixMsg)
@@ -290,7 +290,7 @@ func main() {
 			capInt, err := strconv.Atoi(capStr)
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Environment variable $CAPABILITY is not a valid capability number: %v\n", err)
-				os.Exit(1)
+				os.Exit(254)
 			}
 			c := capability.Cap(capInt)
 			if caps.Get(capability.BOUNDING, c) {
@@ -309,7 +309,7 @@ func main() {
 		gids, err := os.Getgroups()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error getting groups: %v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		// getgroups(2): It is unspecified whether the effective group ID of
 		// the calling process is included in the returned list. (Thus, an
@@ -340,7 +340,7 @@ func main() {
 		err := ioutil.WriteFile(fileName, []byte(content), 0600)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Cannot write to file %q: %v\n", fileName, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 	}
 
@@ -353,7 +353,7 @@ func main() {
 		dat, err := ioutil.ReadFile(fileName)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Cannot read file %q: %v\n", fileName, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Print("<<<")
 		fmt.Print(string(dat))
@@ -369,7 +369,7 @@ func main() {
 		fi, err := os.Stat(fileName)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Cannot stat file %q: %v\n", fileName, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("%s: mode: %s\n", fileName, fi.Mode().String())
 		fmt.Printf("%s: user: %v\n", fileName, fi.Sys().(*syscall.Stat_t).Uid)
@@ -385,7 +385,7 @@ func main() {
 		dat, err := ioutil.ReadFile(fileName)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Cannot read file %q: %v\n", fileName, err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		fmt.Printf("sha1sum: %x\n", sha1.Sum(dat))
@@ -410,7 +410,7 @@ func main() {
 		wd, err := os.Getwd()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Cannot get working directory: %v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("cwd: %s\n", wd)
 	}
@@ -424,7 +424,7 @@ func main() {
 		isUnified, err := cgroup.IsCgroupUnified("/proc/1/root/")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error getting cgroup type: %v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		var limitPath string
@@ -432,7 +432,7 @@ func main() {
 			cgroupPath, err := cgroup.GetOwnV2CgroupPath()
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Error getting own memory cgroup path: %v\n", err)
-				os.Exit(1)
+				os.Exit(254)
 			}
 			limitPath = filepath.Join("/proc/1/root/sys/fs/cgroup/", cgroupPath, "memory.max")
 			fmt.Fprintln(os.Stderr, "limitPath:", limitPath)
@@ -440,7 +440,7 @@ func main() {
 			memCgroupPath, err := cgroup.GetOwnV1CgroupPath("memory")
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Error getting own memory cgroup path: %v\n", err)
-				os.Exit(1)
+				os.Exit(254)
 			}
 			limitPath = filepath.Join("/proc/1/root/sys/fs/cgroup/memory", memCgroupPath, "memory.limit_in_bytes")
 			fmt.Fprintln(os.Stderr, limitPath)
@@ -448,7 +448,7 @@ func main() {
 		limit, err := ioutil.ReadFile(limitPath)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Can't read %s\n", limitPath)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		fmt.Printf("Memory Limit: %s\n", string(limit))
@@ -458,7 +458,7 @@ func main() {
 		cpuCgroupPath, err := cgroup.GetOwnV1CgroupPath("cpu")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error getting own cpu cgroup path: %v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		// we use /proc/1/root to escape the chroot we're in and read our
 		// cpu quota
@@ -466,24 +466,24 @@ func main() {
 		periodBytes, err := ioutil.ReadFile(periodPath)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Can't read cpu.cpu_period_us\n")
-			os.Exit(1)
+			os.Exit(254)
 		}
 		quotaPath := filepath.Join("/proc/1/root/sys/fs/cgroup/cpu", cpuCgroupPath, "cpu.cfs_quota_us")
 		quotaBytes, err := ioutil.ReadFile(quotaPath)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Can't read cpu.cpu_quota_us\n")
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		period, err := strconv.Atoi(strings.Trim(string(periodBytes), "\n"))
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		quota, err := strconv.Atoi(strings.Trim(string(quotaBytes), "\n"))
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		quotaMilliCores := quota * 1000 / period
@@ -505,7 +505,7 @@ func main() {
 		for _, p := range testPaths {
 			if err := syscall.Mkdir(filepath.Join(p, "test"), 0600); err == nil || err != syscall.EROFS {
 				fmt.Fprintf(os.Stderr, "check-cgroups: FAIL (%v)", err)
-				os.Exit(1)
+				os.Exit(254)
 			}
 		}
 
@@ -526,11 +526,11 @@ func main() {
 		ips, err := testutils.GetIPsv4(iface)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		if len(ips) == 0 {
 			fmt.Fprintf(os.Stderr, "No IPv4 found for interface %+v:\n", iface)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("%v IPv4: %s\n", iface, ips[0])
 	}
@@ -539,7 +539,7 @@ func main() {
 		gw, err := testutils.GetDefaultGWv4()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("DefaultGWv4: %s\n", gw)
 	}
@@ -548,7 +548,7 @@ func main() {
 		gw, err := testutils.GetDefaultGWv6()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("DefaultGWv6: %s\n", gw)
 	}
@@ -559,7 +559,7 @@ func main() {
 		gw, err := testutils.GetGWv4(iface)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("%v GWv4: %s\n", iface, gw)
 	}
@@ -576,7 +576,7 @@ func main() {
 		hostname, err := os.Hostname()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("Hostname: %s\n", hostname)
 	}
@@ -585,7 +585,7 @@ func main() {
 		err := testutils.HTTPServe(globalFlags.ServeHTTP, globalFlags.ServeHTTPTimeout)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 	}
 
@@ -593,7 +593,7 @@ func main() {
 		body, err := testutils.HTTPGet(globalFlags.GetHTTP)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("HTTP-Get received: %s\n", body)
 	}
@@ -602,7 +602,7 @@ func main() {
 		ifaceCount, err := testutils.GetIfaceCount()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("Interface count: %d\n", ifaceCount)
 	}
@@ -612,7 +612,7 @@ func main() {
 		body, err := testutils.HTTPGet(fmt.Sprintf("%s/acMetadata/v1/apps/%s/annotations/%s", mdsUrl, appName, globalFlags.PrintAppAnnotation))
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		fmt.Printf("Annotation %s=%s\n", globalFlags.PrintAppAnnotation, body)
 	}
@@ -621,18 +621,18 @@ func main() {
 		appMountNS, err := os.Readlink("/proc/self/ns/mnt")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		s1MountNS, err := os.Readlink("/proc/1/ns/mnt")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		if appMountNS != s1MountNS {
 			fmt.Println("check-mountns: DIFFERENT")
 		} else {
 			fmt.Println("check-mountns: IDENTICAL")
-			os.Exit(1)
+			os.Exit(254)
 		}
 	}
 
diff --git a/tests/rkt-monitor/main.go b/tests/rkt-monitor/main.go
index e1805b7e3c..ac5671d30c 100644
--- a/tests/rkt-monitor/main.go
+++ b/tests/rkt-monitor/main.go
@@ -85,24 +85,24 @@ func main() {
 func runRktMonitor(cmd *cobra.Command, args []string) {
 	if len(args) != 1 {
 		cmd.Usage()
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	d, err := time.ParseDuration(flagDuration)
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	if os.Getuid() != 0 {
 		fmt.Printf("need to be root to run rkt images\n")
-		os.Exit(1)
+		os.Exit(254)
 	}
 
 	f, err := os.Open(args[0])
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		os.Exit(1)
+		os.Exit(254)
 	}
 	decoder := json.NewDecoder(f)
 
@@ -119,7 +119,7 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 	} else {
 		if !fileExist(flagStage1Path) {
 			fmt.Fprintln(os.Stderr, "Given stage1 file path doesn't exist")
-			os.Exit(1)
+			os.Exit(254)
 		}
 		_, flavorType = filepath.Split(flagStage1Path)
 	}
@@ -167,7 +167,7 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 		cmdReader, err := execCmd.StdoutPipe()
 		if err != nil {
 			fmt.Fprintln(os.Stderr, "Error creating StdoutPipe for execCmd", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		execCmdScanner := bufio.NewScanner(cmdReader)
@@ -200,7 +200,7 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 
 		if err != nil {
 			fmt.Printf("%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		usages := make(map[int32][]*ProcessStatus)
@@ -244,7 +244,7 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 		cmdStopReader, err := stopCmd.StdoutPipe()
 		if err != nil {
 			fmt.Fprintln(os.Stderr, "Error creating StdoutPipe for stopCmd", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 		cmdStopScanner := bufio.NewScanner(cmdStopReader)
 
@@ -268,7 +268,7 @@ func runRktMonitor(cmd *cobra.Command, args []string) {
 
 		if err != nil {
 			fmt.Printf("%v\n", err)
-			os.Exit(1)
+			os.Exit(254)
 		}
 
 		gcCmd = exec.Command(rktBinary, "gc", "--grace-period=0")
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 8c9b195c27..e71843498d 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -398,7 +398,7 @@ func NewAPIServiceListInspectPodsTest() testutils.Test {
 					},
 				},
 				"non-existed-network",
-				1,
+				254,
 			},
 		}
 
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index a82b4bf1a9..2b31ea0f90 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -596,7 +596,7 @@ func testDifferentDiscoveryNameLabels(t *testing.T, imageName string, expectedMe
 	// and always get the same ACI
 	runCmd := fmt.Sprintf("%s --debug --insecure-options=tls fetch %s", ctx.Cmd(), imageName)
 	child := spawnOrFail(t, runCmd)
-	defer waitOrFail(t, child, 1)
+	defer waitOrFail(t, child, 254)
 
 	if err := expectWithOutput(child, expectedMessage); err != nil {
 		t.Fatalf("Could not find expected msg %q, output follows:\n%v", expectedMessage, err)
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 11451ff2ee..39139adfbe 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -40,7 +40,7 @@ func TestGC(t *testing.T) {
 
 	// Abort prepare.
 	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s %s", ctx.Cmd(), imagePath, imagePath)
-	spawnAndWaitOrFail(t, cmd, 1)
+	spawnAndWaitOrFail(t, cmd, 254)
 
 	gcCmd := fmt.Sprintf("%s gc --mark-only=true --expire-prepared=0 --grace-period=0", ctx.Cmd())
 	spawnAndWaitOrFail(t, gcCmd, 0)
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 2627c84f9b..5ac0afff36 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -95,7 +95,7 @@ func TestImageExport(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		expectedStatus := 1
+		expectedStatus := 254
 		if tt.shouldFind {
 			expectedStatus = 0
 		}
diff --git a/tests/rkt_image_extract_test.go b/tests/rkt_image_extract_test.go
index 9882a7d188..6e4fc5031b 100644
--- a/tests/rkt_image_extract_test.go
+++ b/tests/rkt_image_extract_test.go
@@ -74,7 +74,7 @@ func TestImageExtract(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		expectedStatus := 1
+		expectedStatus := 254
 		if tt.shouldFind {
 			expectedStatus = 0
 		}
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index ed473aaa48..7678259a0b 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -100,7 +100,7 @@ func TestImageRender(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		expectedStatus := 1
+		expectedStatus := 254
 		if tt.shouldFind {
 			expectedStatus = 0
 		}
diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index a1f3585540..8c693162ae 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -72,14 +72,14 @@ func TestMountSymlink(t *testing.T) {
 			"/dir1/../../../foo",
 			"/dir2/foo",
 			"path escapes app's root",
-			1,
+			254,
 		},
 		// '/dir1/link_invalid' is an invalid link because it tries to escape rootfs.
 		{
 			"/dir1/link_invalid/foo",
 			"/dir2/foo",
 			"escapes app's root with value",
-			1,
+			254,
 		},
 	}
 
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index b56d2096ae..9d51cf442b 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -1020,7 +1020,7 @@ func NewNetCNIDNSArgNoneTest() testutils.Test {
 			ctx.Cmd(), nt.NetParameter(), getInspectImagePath(), appCmd)
 		child := spawnOrFail(t, cmd)
 		ctx.RegisterChild(child)
-		defer waitOrFail(t, child, 1)
+		defer waitOrFail(t, child, 254)
 
 		expectedRegex := `Cannot stat file "/etc/resolv.conf": stat /etc/resolv.conf: no such file or directory`
 
@@ -1224,7 +1224,7 @@ func NewNetIPConflictTest() testutils.Test {
 		}
 
 		// Clean up
-		waitOrFail(t, child2, 1)
+		waitOrFail(t, child2, 254)
 		syscall.Kill(child1.Cmd.Process.Pid, syscall.SIGTERM)
 		waitOrFail(t, child1, 0)
 	})
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index bb3eaa3c7c..6dc4f51556 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -449,7 +449,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
@@ -494,7 +494,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
@@ -540,7 +540,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
@@ -587,7 +587,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
@@ -812,7 +812,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
@@ -848,7 +848,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
 			"",
 		},
@@ -1114,7 +1114,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`"user2" user not found`,
 			"",
 		},
@@ -1135,7 +1135,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`"group2" group not found`,
 			"",
 		},
@@ -1177,7 +1177,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`no such file or directory`,
 			"",
 		},
@@ -1198,7 +1198,7 @@ func TestPodManifest(t *testing.T) {
 					},
 				},
 			},
-			1,
+			254,
 			`no such file or directory`,
 			"",
 		},
diff --git a/tests/rkt_stage1_loading_test.go b/tests/rkt_stage1_loading_test.go
index ab4cbdeb3d..5e5383b8f3 100644
--- a/tests/rkt_stage1_loading_test.go
+++ b/tests/rkt_stage1_loading_test.go
@@ -232,7 +232,7 @@ func TestStage1LoadingFromConfigRelativePathFail(t *testing.T) {
 	setup.generateStage1Config(cfg)
 	cmd := fmt.Sprintf("%s --insecure-options=image,tls --debug run %s", setup.ctx.Cmd(), getInspectImagePath())
 	child := spawnOrFail(setup.t, cmd)
-	defer waitOrFail(setup.t, child, 1)
+	defer waitOrFail(setup.t, child, 254)
 	expectedLine := "default stage1 image location is either a relative path or a URL without scheme"
 	setup.getExpectedOrFail(child, expectedLine)
 }
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index ca2074a166..c79af76bd9 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -315,7 +315,7 @@ func runRktAsUidGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, exp
 	}
 	expectedStatus := 0
 	if expectError {
-		expectedStatus = 1
+		expectedStatus = 254
 	}
 	defer waitOrFail(t, child, expectedStatus)
 
diff --git a/tests/rkt_volume_mount_fly_test.go b/tests/rkt_volume_mount_fly_test.go
index 5d28187839..9b50ff5c78 100644
--- a/tests/rkt_volume_mount_fly_test.go
+++ b/tests/rkt_volume_mount_fly_test.go
@@ -43,7 +43,7 @@ func TestVolumeMount(t *testing.T) {
 					volDir, mountDir,
 				),
 				nil,
-				1, /* TODO: decide on consistency with other stage1s */
+				254, /* TODO: decide on consistency with other stage1s */
 				`run: can't evaluate mounts: missing mount for volume "test2"`,
 			},
 		}}).Execute(t)
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
index 42d1f8eda2..78618c0e02 100644
--- a/tests/rkt_volume_mount_test.go
+++ b/tests/rkt_volume_mount_test.go
@@ -137,7 +137,7 @@ var (
 				volDir, mountDir,
 			),
 			nil,
-			1,
+			254,
 			"",
 		},
 	}
@@ -224,7 +224,7 @@ var (
 						Mode: nil, UID: nil, GID: nil},
 				},
 			},
-			1,
+			254,
 			"",
 		},
 	}
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index d51ffe8e57..6a6255451d 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -83,7 +83,7 @@ var volTests = []struct {
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=3 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^ --mount=volume=dir1,target=dir1 ^VOL_RO_WRITE_FILE^"`,
 		`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
-		1,
+		254,
 	},
 	// Check that the volume still contains the file previously written
 	{
@@ -107,7 +107,7 @@ var volTests = []struct {
 	{
 		`/bin/sh -c "export FILE=/dir1/file CONTENT=1 ; ^RKT_BIN^ --debug --insecure-options=image run --mds-register=false --inherit-env=true --volume=dir1,kind=host,source=^TMPDIR^,readOnly=true ^VOL_ADD_MOUNT_RO^ --mount=volume=dir1,target=dir1"`,
 		`Cannot write to file "/dir1/file": open /dir1/file: read-only file system`,
-		1,
+		254,
 	},
 	// Check that an implicit empty volume is created if the user didn't provide it but there's a mount point in the app
 	{
diff --git a/tests/stub-stage1/run/main.go b/tests/stub-stage1/run/main.go
index 67227fdd70..8d2cb99378 100644
--- a/tests/stub-stage1/run/main.go
+++ b/tests/stub-stage1/run/main.go
@@ -31,17 +31,17 @@ func run() int {
 	lfd, err := common.GetRktLockFD()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to get rkt lock fd: %v\n", err)
-		return 1
+		return 254
 	}
 
 	if err := sys.CloseOnExec(lfd, true); err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to set FD_CLOEXEC on rkt lock: %v\n", err)
-		return 1
+		return 254
 	}
 
 	if err := stage1common.WritePid(os.Getpid(), "ppid"); err != nil {
 		fmt.Fprintf(os.Stderr, "write ppid: %v", err)
-		return 1
+		return 254
 	}
 	fmt.Println("success, stub stage1 would at this point switch to stage2")
 	return 0

From 31fb45710132e8ec06aacd439e8a1edf1ec3559e Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 20 Oct 2016 11:56:16 +0000
Subject: [PATCH 0788/1304] stage1/fly: move debug output to diagnostic logger

---
 stage1_fly/run/main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 94904de330..bb0b220ce4 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -381,7 +381,7 @@ func stage1() int {
 	}
 
 	for _, mount := range effectiveMounts {
-		log.Printf("Processing %+v", mount)
+		diag.Printf("Processing %+v", mount)
 
 		var (
 			err            error
@@ -407,7 +407,7 @@ func stage1() int {
 		switch {
 		case (mount.Flags & syscall.MS_REMOUNT) != 0:
 			{
-				log.Printf("don't attempt to create files for remount of %q", absTargetPath)
+				diag.Printf("don't attempt to create files for remount of %q", absTargetPath)
 			}
 		case targetPathInfo == nil:
 			absTargetPathParent, _ := filepath.Split(absTargetPath)

From e6862478a59a5c8793eecb791401614089430ab1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 20 Oct 2016 11:58:25 +0000
Subject: [PATCH 0789/1304] networking: gate diagnostic output behind `--debug`

---
 networking/networking.go |  7 ++++++-
 networking/podenv.go     | 12 +++++++++---
 tests/rkt_fetch_test.go  | 42 ++++++++++++++++++++--------------------
 tests/rkt_gc_test.go     |  2 +-
 tests/rkt_tests.go       |  2 +-
 5 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/networking/networking.go b/networking/networking.go
index 49e0af3a9e..8d8f5b03c8 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -58,13 +58,17 @@ type NetConf struct {
 	IsDefaultGateway bool `json:"isDefaultGateway"`
 }
 
-var stderr *log.Logger
+var (
+	stderr   *log.Logger
+	debuglog bool
+)
 
 // Setup creates a new networking namespace and executes network plugins to
 // set up networking. It returns in the new pod namespace
 func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common.NetList, localConfig, flavor string, noDNS, debug bool) (*Networking, error) {
 
 	stderr = log.New(os.Stderr, "networking", debug)
+	debuglog = debug
 
 	if flavor == "kvm" {
 		return kvmSetup(podRoot, podID, fps, netList, localConfig, noDNS)
@@ -260,6 +264,7 @@ func (n *Networking) GetIfacesByIP(ifaceIP net.IP) ([]net.Interface, error) {
 func (n *Networking) Teardown(flavor string, debug bool) {
 
 	stderr = log.New(os.Stderr, "networking", debug)
+	debuglog = debug
 
 	// Teardown everything in reverse order of setup.
 	// This should be idempotent -- be tolerant of missing stuff
diff --git a/networking/podenv.go b/networking/podenv.go
index a48279ca4d..2b813a4ebd 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -182,7 +182,9 @@ func (e *podEnv) setupNets(nets []activeNet, noDNS bool) error {
 	podHasResolvConf := err == nil
 
 	for i, n = range nets {
-		stderr.Printf("loading network %v with type %v", n.conf.Name, n.conf.Type)
+		if debuglog {
+			stderr.Printf("loading network %v with type %v", n.conf.Name, n.conf.Type)
+		}
 
 		n.runtime.IfName = fmt.Sprintf(IfNamePattern, i)
 		if n.runtime.ConfPath, err = copyFileToDir(n.runtime.ConfPath, e.netDir()); err != nil {
@@ -219,7 +221,9 @@ func (e *podEnv) setupNets(nets []activeNet, noDNS bool) error {
 func (e *podEnv) teardownNets(nets []activeNet) {
 
 	for i := len(nets) - 1; i >= 0; i-- {
-		stderr.Printf("teardown - executing net-plugin %v", nets[i].conf.Type)
+		if debuglog {
+			stderr.Printf("teardown - executing net-plugin %v", nets[i].conf.Type)
+		}
 
 		podNSpath := ""
 		if e.podNS != nil {
@@ -320,7 +324,9 @@ func loadUserNets(localConfig string, netsLoadList common.NetList) ([]activeNet,
 	}
 
 	userNetPath := filepath.Join(localConfig, UserNetPathSuffix)
-	stderr.Printf("loading networks from %v", userNetPath)
+	if debuglog {
+		stderr.Printf("loading networks from %v", userNetPath)
+	}
 
 	files, err := listFiles(userNetPath)
 	if err != nil {
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 2b31ea0f90..d05be81b66 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -48,15 +48,15 @@ func TestFetchFromFile(t *testing.T) {
 		args  string
 		image string
 	}{
-		{"--insecure-options=image fetch", imagePath},
-		{"--insecure-options=image fetch --store-only", imagePath},
-		{"--insecure-options=image fetch --no-store", imagePath},
-		{"--insecure-options=image run --mds-register=false", imagePath},
-		{"--insecure-options=image run --mds-register=false --store-only", imagePath},
-		{"--insecure-options=image run --mds-register=false --no-store", imagePath},
-		{"--insecure-options=image prepare", imagePath},
-		{"--insecure-options=image prepare --store-only", imagePath},
-		{"--insecure-options=image prepare --no-store", imagePath},
+		{"--insecure-options=image --debug fetch", imagePath},
+		{"--insecure-options=image --debug fetch --store-only", imagePath},
+		{"--insecure-options=image --debug fetch --no-store", imagePath},
+		{"--insecure-options=image --debug run --mds-register=false", imagePath},
+		{"--insecure-options=image --debug run --mds-register=false --store-only", imagePath},
+		{"--insecure-options=image --debug run --mds-register=false --no-store", imagePath},
+		{"--insecure-options=image --debug prepare", imagePath},
+		{"--insecure-options=image --debug prepare --store-only", imagePath},
+		{"--insecure-options=image --debug prepare --no-store", imagePath},
 	}
 
 	for _, tt := range tests {
@@ -98,20 +98,20 @@ func TestFetch(t *testing.T) {
 		imageArgs string
 		finalURL  string
 	}{
-		{"--insecure-options=image fetch", "coreos.com/etcd:v2.1.2", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image fetch", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image fetch", "docker://busybox", "", "docker://busybox"},
-		{"--insecure-options=image fetch", "docker://busybox:latest", "", "docker://busybox:latest"},
-		{"--insecure-options=image run --mds-register=false", "coreos.com/etcd:v2.1.2", "--exec /etcdctl", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image run --mds-register=false", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "--exec /etcdctl", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image run --mds-register=false", "docker://busybox", "", "docker://busybox"},
-		{"--insecure-options=image run --mds-register=false", "docker://busybox:latest", "", "docker://busybox:latest"},
-		{"--insecure-options=image prepare", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image prepare", "coreos.com/etcd:v2.1.2", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
+		{"--insecure-options=image --debug fetch", "coreos.com/etcd:v2.1.2", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
+		{"--insecure-options=image --debug fetch", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
+		{"--insecure-options=image --debug fetch", "docker://busybox", "", "docker://busybox"},
+		{"--insecure-options=image --debug fetch", "docker://busybox:latest", "", "docker://busybox:latest"},
+		{"--insecure-options=image --debug run --mds-register=false", "coreos.com/etcd:v2.1.2", "--exec /etcdctl", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
+		{"--insecure-options=image --debug run --mds-register=false", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "--exec /etcdctl", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
+		{"--insecure-options=image --debug run --mds-register=false", "docker://busybox", "", "docker://busybox"},
+		{"--insecure-options=image --debug run --mds-register=false", "docker://busybox:latest", "", "docker://busybox:latest"},
+		{"--insecure-options=image --debug prepare", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
+		{"--insecure-options=image --debug prepare", "coreos.com/etcd:v2.1.2", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
 		// test --insecure-options=tls to make sure
 		// https://github.com/coreos/rkt/issues/1829 is not an issue anymore
-		{"--insecure-options=image,tls prepare", "docker://busybox", "", "docker://busybox"},
-		{"--insecure-options=image prepare", "docker://busybox:latest", "", "docker://busybox:latest"},
+		{"--insecure-options=image,tls --debug prepare", "docker://busybox", "", "docker://busybox"},
+		{"--insecure-options=image --debug prepare", "docker://busybox:latest", "", "docker://busybox:latest"},
 	}
 
 	for _, tt := range tests {
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 39139adfbe..b7918089b1 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -107,7 +107,7 @@ func TestGCAfterUnmount(t *testing.T) {
 			t.Fatalf("pods should still be present in rkt's data directory")
 		}
 
-		gcCmd := fmt.Sprintf("%s gc --mark-only=false --expire-prepared=0 --grace-period=0", ctx.Cmd())
+		gcCmd := fmt.Sprintf("%s gc --debug --mark-only=false --expire-prepared=0 --grace-period=0", ctx.Cmd())
 		// check we don't get any output (an error) after "executing net-plugin..."
 		runRktAndCheckRegexOutput(t, gcCmd, `executing net-plugin .*\n\z`)
 
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index c79af76bd9..eae416ff53 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -281,7 +281,7 @@ func runRktAndGetUUID(t *testing.T, rktCmd string) string {
 	child := spawnOrFail(t, rktCmd)
 	defer waitOrFail(t, child, 0)
 
-	result, out, err := expectRegexWithOutput(child, "\n[0-9a-f-]{36}")
+	result, out, err := expectRegexWithOutput(child, "[0-9a-f-]{36}")
 	if err != nil || len(result) != 1 {
 		t.Fatalf("Error: %v\nOutput: %v", err, out)
 	}

From 82d6f3dee31f073663e76f0f2e5abfebdda3d1a7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 20 Oct 2016 12:00:03 +0000
Subject: [PATCH 0790/1304] rkt/image: move debug output to diagnostic logger

---
 rkt/image/common.go        | 11 ++++++++---
 rkt/image/dockerfetcher.go |  4 +---
 rkt/image/fetcher.go       | 10 +++++-----
 rkt/image/finder.go        |  2 +-
 rkt/image/httpfetcher.go   |  8 ++------
 rkt/image/httpops.go       |  2 +-
 rkt/image/namefetcher.go   | 12 ++++--------
 rkt/stage1hash.go          |  1 +
 8 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/rkt/image/common.go b/rkt/image/common.go
index 82cfe3e44c..de547c4b86 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -16,6 +16,7 @@ package image
 
 import (
 	"fmt"
+	"io/ioutil"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -78,12 +79,16 @@ type action struct {
 
 var (
 	log    *rktlog.Logger
-	stdout *rktlog.Logger = rktlog.New(os.Stdout, "", false)
+	diag   *rktlog.Logger
+	stdout *rktlog.Logger
 )
 
 func ensureLogger(debug bool) {
-	if log == nil {
-		log = rktlog.New(os.Stderr, "image", debug)
+	if log == nil || diag == nil || stdout == nil {
+		log, diag, stdout = rktlog.NewLogSet("image", debug)
+	}
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
 	}
 }
 
diff --git a/rkt/image/dockerfetcher.go b/rkt/image/dockerfetcher.go
index a978c13e0c..12377ebe1f 100644
--- a/rkt/image/dockerfetcher.go
+++ b/rkt/image/dockerfetcher.go
@@ -63,9 +63,7 @@ func (f *dockerFetcher) fetchImageFrom(u *url.URL, latest bool) (string, error)
 		return "", fmt.Errorf("signature verification for docker images is not supported (try --insecure-options=image)")
 	}
 
-	if f.Debug {
-		log.Printf("fetching image from %s", u.String())
-	}
+	diag.Printf("fetching image from %s", u.String())
 
 	aciFile, err := f.fetch(u)
 	if err != nil {
diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index b96d449bc2..eaa8bcc747 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -198,13 +198,13 @@ func (f *Fetcher) maybeCheckRemoteFromStore(rem *imagestore.Remote) string {
 	if f.NoStore || rem == nil {
 		return ""
 	}
-	log.Printf("using image from local store for url %s", rem.ACIURL)
+	diag.Printf("using image from local store for url %s", rem.ACIURL)
 	return rem.BlobKey
 }
 
 func (f *Fetcher) maybeFetchHTTPURLFromRemote(rem *imagestore.Remote, u *url.URL, a *asc) (string, error) {
 	if !f.StoreOnly {
-		log.Printf("remote fetching from URL %q", u.String())
+		diag.Printf("remote fetching from URL %q", u.String())
 		hf := &httpFetcher{
 			InsecureFlags: f.InsecureFlags,
 			S:             f.S,
@@ -220,7 +220,7 @@ func (f *Fetcher) maybeFetchHTTPURLFromRemote(rem *imagestore.Remote, u *url.URL
 
 func (f *Fetcher) maybeFetchDockerURLFromRemote(u *url.URL) (string, error) {
 	if !f.StoreOnly {
-		log.Printf("remote fetching from URL %q", u.String())
+		diag.Printf("remote fetching from URL %q", u.String())
 		df := &dockerFetcher{
 			InsecureFlags: f.InsecureFlags,
 			DockerAuth:    f.DockerAuth,
@@ -233,7 +233,7 @@ func (f *Fetcher) maybeFetchDockerURLFromRemote(u *url.URL) (string, error) {
 }
 
 func (f *Fetcher) fetchSingleImageByPath(path string, a *asc) (string, error) {
-	log.Printf("using image from file %s", path)
+	diag.Printf("using image from file %s", path)
 	ff := &fileFetcher{
 		InsecureFlags: f.InsecureFlags,
 		S:             f.S,
@@ -287,7 +287,7 @@ func (f *Fetcher) maybeCheckStoreForApp(app *appBundle) (string, error) {
 	if !f.NoStore {
 		key, err := f.getStoreKeyFromApp(app)
 		if err == nil {
-			log.Printf("using image from local store for image name %s", app.Str)
+			diag.Printf("using image from local store for image name %s", app.Str)
 			return key, nil
 		}
 		switch err.(type) {
diff --git a/rkt/image/finder.go b/rkt/image/finder.go
index b8bd20b00b..0cddd11845 100644
--- a/rkt/image/finder.go
+++ b/rkt/image/finder.go
@@ -80,6 +80,6 @@ func (f *Finder) getHashFromStore(img string) (*types.Hash, error) {
 		// should never happen
 		log.PanicE("got an invalid hash from the store, looks like it is corrupted", err)
 	}
-	log.Printf("using image from the store with hash %s", h.String())
+	diag.Printf("using image from the store with hash %s", h.String())
 	return h, nil
 }
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index 654bd4bbbd..2edd7ccf08 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -47,16 +47,12 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 
 	if !f.NoCache && f.Rem != nil {
 		if useCached(f.Rem.DownloadTime, f.Rem.CacheMaxAge) {
-			if f.Debug {
-				log.Printf("image for %s isn't expired, not fetching.", urlStr)
-			}
+			diag.Printf("image for %s isn't expired, not fetching.", urlStr)
 			return f.Rem.BlobKey, nil
 		}
 	}
 
-	if f.Debug {
-		log.Printf("fetching image from %s", urlStr)
-	}
+	diag.Printf("fetching image from %s", urlStr)
 
 	aciFile, cd, err := f.fetchURL(u, a, eTag(f.Rem))
 	if err != nil {
diff --git a/rkt/image/httpops.go b/rkt/image/httpops.go
index f400ea4f5a..0693b4bd82 100644
--- a/rkt/image/httpops.go
+++ b/rkt/image/httpops.go
@@ -42,7 +42,7 @@ type httpOps struct {
 // this function will return true and no error and no file.
 func (o *httpOps) DownloadSignature(a *asc) (readSeekCloser, bool, error) {
 	ensureLogger(o.Debug)
-	log.Printf("downloading signature from %v", a.Location)
+	diag.Printf("downloading signature from %v", a.Location)
 	ascFile, err := a.Get()
 	if err == nil {
 		return ascFile, false, nil
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 6037f80ba4..9dd471b461 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -50,7 +50,7 @@ type nameFetcher struct {
 func (f *nameFetcher) Hash(app *discovery.App, a *asc) (string, error) {
 	ensureLogger(f.Debug)
 	name := app.Name.String()
-	log.Printf("searching for app image %s", name)
+	diag.Printf("searching for app image %s", name)
 	ep, err := f.discoverApp(app)
 	if err != nil {
 		return "", errwrap.Wrap(fmt.Errorf("discovery failed for %q", name), err)
@@ -94,15 +94,13 @@ func (f *nameFetcher) fetchImageFromEndpoints(app *discovery.App, ep discovery.A
 	// maybeOverrideAscFetcherWithRemote on the clone
 	aciURL := ep[0].ACI
 	ascURL := ep[0].ASC
-	log.Printf("remote fetching from URL %q", aciURL)
+	diag.Printf("remote fetching from URL %q", aciURL)
 	f.maybeOverrideAscFetcherWithRemote(ascURL, a)
 	return f.fetchImageFromSingleEndpoint(app, aciURL, a, latest)
 }
 
 func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL string, a *asc, latest bool) (string, error) {
-	if f.Debug {
-		log.Printf("fetching image from %s", aciURL)
-	}
+	diag.Printf("fetching image from %s", aciURL)
 
 	u, err := url.Parse(aciURL)
 	if err != nil {
@@ -114,9 +112,7 @@ func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL st
 	}
 	if !f.NoCache && rem != nil {
 		if useCached(rem.DownloadTime, rem.CacheMaxAge) {
-			if f.Debug {
-				log.Printf("image for %s isn't expired, not fetching.", aciURL)
-			}
+			diag.Printf("image for %s isn't expired, not fetching.", aciURL)
 			return rem.BlobKey, nil
 		}
 	}
diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index 3462aef025..c2dd156568 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -340,6 +340,7 @@ func getStage1Finder(s *imagestore.Store, ts *treestore.Store, withKeystore bool
 	fn := &image.Finder{
 		S:                  s,
 		Ts:                 ts,
+		Debug:              globalFlags.Debug,
 		InsecureFlags:      globalFlags.InsecureFlags,
 		TrustKeysFromHTTPS: globalFlags.TrustKeysFromHTTPS,
 

From 4990191c55c77c83a20eb1af9faecb619a3f1f90 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 21 Oct 2016 14:39:38 +0200
Subject: [PATCH 0791/1304] stage0/image: set proxy if InsecureSkipVerify is
 set

If InsecureSkipVerify is set to true, we skip setting the Proxy argument
in http.Transport. This fixes it.

Fixes #2590
---
 rkt/image/resumablesession.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rkt/image/resumablesession.go b/rkt/image/resumablesession.go
index eabb5025c2..d890e3648e 100644
--- a/rkt/image/resumablesession.go
+++ b/rkt/image/resumablesession.go
@@ -278,6 +278,7 @@ func (s *resumableSession) getClient() *http.Client {
 	transport := http.DefaultTransport
 	if s.InsecureSkipTLSVerify {
 		transport = &http.Transport{
+			Proxy:           http.ProxyFromEnvironment,
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 		}
 	}

From db68cc05d2d86de8613f4adf0c53111d5e89d182 Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <pskamruk@mirantis.com>
Date: Mon, 24 Oct 2016 09:39:47 +0200
Subject: [PATCH 0792/1304] MAINTAINERS: remove @jellonek

---
 MAINTAINERS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 99cc3343dc..b671a51611 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10,5 +10,3 @@ Luca Bruno <luca.bruno@coreos.com> (@lucab) pkg: *
 Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak) pkg: *
 Stefan Junker <stefan.junker@coreos.com> (@steveeJ) pkg: *
 Yifan Gu <yifan.gu@coreos.com> (@yifan-gu) pkg: *
-
-Piotr Skamruk <piotr.skamruk@gmail.com> (@jellonek) pkg: *kvm*

From 8d835cc63ca15f04f420df386ed6776dbf3f205a Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 24 Oct 2016 08:25:35 +0000
Subject: [PATCH 0793/1304] scripts/install-rkt: add iptables dependency

---
 scripts/install-rkt.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 49ad39ea71..55a8f44433 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -15,6 +15,7 @@ apt-get install -y --no-install-recommends \
         bash-completion \
         checkinstall \
         curl \
+        iptables \
         wget
 
 curl -sSL https://coreos.com/dist/pubkeys/app-signing-pubkey.gpg | gpg2 --import -

From 483a4736551ba3842cbec2d5d5e03d29cc7c63a8 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Mon, 24 Oct 2016 13:59:44 +0200
Subject: [PATCH 0794/1304] vendor: update appc/spec to v0.8.8

---
 Documentation/app-container.md                |   4 +-
 .../devel/stage1-implementors-guide.md        |   2 +-
 Documentation/subcommands/cat-manifest.md     |   2 +-
 Documentation/subcommands/image.md            |   2 +-
 Documentation/subcommands/version.md          |   2 +-
 glide.lock                                    |   6 +-
 glide.yaml                                    |   2 +-
 pkg/aci/aci.go                                |   2 +-
 stage1/aci/aci-manifest.in                    |   2 +-
 stage1_fly/aci/aci-manifest.in                |   2 +-
 store/imagestore/store_test.go                |  12 +-
 store/treestore/tree_test.go                  |   4 +-
 tests/empty-image/manifest                    |   2 +-
 tests/image/manifest                          |   2 +-
 tests/rkt-monitor/build-too-many-apps.sh      |   2 +-
 tests/rkt_exec_test.go                        |   2 +-
 tests/rkt_fetch_test.go                       |   2 +-
 tests/rkt_image_cat_manifest_test.go          |   2 +-
 tests/rkt_image_dependencies_test.go          |   2 +-
 tests/rkt_image_export_test.go                |   2 +-
 tests/rkt_image_render_test.go                |   2 +-
 tests/rkt_os_arch_test.go                     |   2 +-
 tests/stub-stage1/manifest                    |   2 +-
 .../appc/spec/ace/image_manifest_main.json.in |   4 +-
 .../spec/ace/image_manifest_sidekick.json.in  |   4 +-
 .../github.com/appc/spec/actool/manifest.go   |   2 +-
 vendor/github.com/appc/spec/discovery/http.go |   9 +-
 vendor/github.com/appc/spec/schema/pod.go     |  23 ++--
 .../github.com/appc/spec/schema/types/app.go  |  22 ++--
 .../schema/types/isolator_linux_specific.go   | 109 ++++++++++++++++++
 .../appc/spec/schema/types/mountpoint.go      |   1 +
 .../github.com/appc/spec/schema/types/port.go |   8 ++
 .../spec/schema/types/user_annotations.go     |  18 +++
 .../appc/spec/schema/types/user_labels.go     |  18 +++
 .../appc/spec/schema/types/volume.go          |  12 +-
 vendor/github.com/appc/spec/schema/version.go |   2 +-
 36 files changed, 232 insertions(+), 64 deletions(-)
 create mode 100644 vendor/github.com/appc/spec/schema/types/user_annotations.go
 create mode 100644 vendor/github.com/appc/spec/schema/types/user_labels.go

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index b50a5532db..3df98358da 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -33,8 +33,8 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 # rkt --insecure-options=image run \
 	--mds-register \
 	--volume=database,kind=host,source=/tmp \
-	https://github.com/appc/spec/releases/download/v0.8.7/ace-validator-main.aci \
-	https://github.com/appc/spec/releases/download/v0.8.7/ace-validator-sidekick.aci
+	https://github.com/appc/spec/releases/download/v0.8.8/ace-validator-main.aci \
+	https://github.com/appc/spec/releases/download/v0.8.8/ace-validator-sidekick.aci
 ```
 
 [appc-repo]: https://github.com/appc/spec/
diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 935740521a..33efffef6d 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -152,7 +152,7 @@ The current version of the stage1 interface is 3.
 ```json
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.7",
+    "acVersion": "0.8.8",
     "name": "foo.com/rkt/stage1",
     "labels": [
         {
diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index 733aa0573b..4998f84f3c 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -5,7 +5,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 ```
 # rkt cat-manifest UUID
 {
-  "acVersion":"0.8.7",
+  "acVersion":"0.8.8",
   "acKind":"PodManifest"
 ...
 ```
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 1bb50d404a..5f60b6123d 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -7,7 +7,7 @@ For debugging or inspection you may want to extract an ACI manifest to stdout.
 ```
 # rkt image cat-manifest coreos.com/etcd
 {
-  "acVersion": "0.8.7",
+  "acVersion": "0.8.8",
   "acKind": "ImageManifest",
 ...
 ```
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 5e16729372..5618def874 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -7,6 +7,6 @@ This command prints the rkt version, the appc version rkt is built against, and
 ```
 $ rkt version
 rkt Version: 1.17.0
-appc Version: 0.8.7
+appc Version: 0.8.8
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/glide.lock b/glide.lock
index 0f316f329c..570e1847a3 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: f9a3d5488f0ccf2c1d7e3ee1d725a3c6bf4f4b5128950b44df34c3eee657c2e6
-updated: 2016-08-30T12:00:39.148220845Z
+hash: 88224391c1497feeb57991075fe6bf1c8efe8b06f501543f2bf2d802d67b0e7e
+updated: 2016-10-24T13:58:49.082453394+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: 15d68b33bfee95a448c4da37dbe876baa8fcb5b6
@@ -20,7 +20,7 @@ imports:
   subpackages:
   - proj2aci
 - name: github.com/appc/spec
-  version: f329150233aa3ac6c83ab5ba02a2b5a8bd03d365
+  version: 2a251f75b2520d7a1c6c10562a1ea4e303af3e67
   subpackages:
   - ace
   - aci
diff --git a/glide.yaml b/glide.yaml
index 6a81cc8f49..9993ad5646 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,7 +20,7 @@ import:
   subpackages:
   - proj2aci
 - package: github.com/appc/spec
-  version: v0.8.7
+  version: v0.8.8
   subpackages:
   - ace
   - aci
diff --git a/pkg/aci/aci.go b/pkg/aci/aci.go
index aa672f358a..b75e1abf1b 100644
--- a/pkg/aci/aci.go
+++ b/pkg/aci/aci.go
@@ -107,7 +107,7 @@ func (aw *imageArchiveWriter) Close() error {
 // NewBasicACI creates a new ACI in the given directory with the given name.
 // Used for testing.
 func NewBasicACI(dir string, name string) (*os.File, error) {
-	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.7","name":"%s"}`, name)
+	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.8","name":"%s"}`, name)
 	return NewACI(dir, manifest, nil)
 }
 
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index 3b575d71dd..bb9c9c30fd 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.7",
+    "acVersion": "0.8.8",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index 0a68fad988..e6a01a1c5c 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.7",
+    "acVersion": "0.8.8",
     "name": "coreos.com/rkt/stage1-fly",
     "labels": [
         {
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index a6529d0837..9fe818abf8 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -163,7 +163,7 @@ func TestGetImageManifest(t *testing.T) {
 
 	imj := `{
 			"acKind": "ImageManifest",
-			"acVersion": "0.8.7",
+			"acVersion": "0.8.8",
 			"name": "example.com/test01"
 		}`
 
@@ -228,7 +228,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.7",
+						"acVersion": "0.8.8",
 						"name": "example.com/test01"
 					}`,
 					false,
@@ -236,7 +236,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.7",
+						"acVersion": "0.8.8",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.7",
+						"acVersion": "0.8.8",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -358,7 +358,7 @@ func TestRemoveACI(t *testing.T) {
 
 	imj := `{
                     "acKind": "ImageManifest",
-                    "acVersion": "0.8.7",
+                    "acVersion": "0.8.8",
                     "name": "example.com/test01"
                 }`
 
@@ -400,7 +400,7 @@ func TestRemoveACI(t *testing.T) {
 	// Simulate error removing from the
 	imj = `{
                    "acKind": "ImageManifest",
-                   "acVersion": "0.8.7",
+                   "acVersion": "0.8.8",
                    "name": "example.com/test01"
                }`
 
diff --git a/store/treestore/tree_test.go b/store/treestore/tree_test.go
index a471cf8309..9d7151147a 100644
--- a/store/treestore/tree_test.go
+++ b/store/treestore/tree_test.go
@@ -34,7 +34,7 @@ func testStoreWriteACI(dir string, s *imagestore.Store) (string, error) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.7",
+		    "acVersion": "0.8.8",
 		    "name": "example.com/test01"
 		}
 	`
@@ -202,7 +202,7 @@ func TestTreeStore(t *testing.T) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.7",
+		    "acVersion": "0.8.8",
 		    "name": "example.com/test01"
 		}
 	`
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 715b2ba07d..5ba9d771c8 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.7",
+    "acVersion": "0.8.8",
     "name": "coreos.com/rkt-empty",
     "labels": [
         {
diff --git a/tests/image/manifest b/tests/image/manifest
index a3fb140e5c..3ea1c8a610 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.7",
+    "acVersion": "0.8.8",
     "name": "coreos.com/rkt-inspect",
     "labels": [
         {
diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
index 76e870fdce..cc99a14b0f 100755
--- a/tests/rkt-monitor/build-too-many-apps.sh
+++ b/tests/rkt-monitor/build-too-many-apps.sh
@@ -45,7 +45,7 @@ OUTPUT=${PWD}/too-many-apps.podmanifest
 
 cat <<EOF >${OUTPUT}
 {
-    "acVersion": "0.8.7",
+    "acVersion": "0.8.8",
     "acKind": "PodManifest",
     "apps": [
 EOF
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 6ecca4a6ee..ae9d6e22ff 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 2b31ea0f90..cbffd1408e 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -536,7 +536,7 @@ func TestDeferredSignatureDownload(t *testing.T) {
 }
 
 func TestDifferentDiscoveryLabels(t *testing.T) {
-	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 	emptyImage := getEmptyImagePath()
 	imageName := "localhost/rkt-test-different-discovery-labels-image"
 	manifest := strings.Replace(manifestTemplate, "IMG_NAME", imageName, -1)
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index cc6c56f6d7..f5cd510c5b 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 16c9b31f98..1d74758363 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -33,7 +33,7 @@ const (
 	manifestDepsTemplate = `
 {
    "acKind" : "ImageManifest",
-   "acVersion" : "0.8.7",
+   "acVersion" : "0.8.8",
    "dependencies" : [
       DEPENDENCIES
    ],
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 0285e3dc7f..af82c18f25 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 5109e0027b..354b97370f 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 81d87fa348..89bd43c5f1 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.7","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {
diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest
index c849b8cc47..54de7e38ca 100644
--- a/tests/stub-stage1/manifest
+++ b/tests/stub-stage1/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.7",
+    "acVersion": "0.8.8",
     "name": "localhost/rkt-stub-stage1",
     "labels": [
         {
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
index 1d6968c221..71671bfe96 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.7",
+    "acVersion": "0.8.8",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.7" },
+        { "name": "version", "value": "0.8.8" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index f58b77966a..567eed6241 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.7",
+    "acVersion": "0.8.8",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.7" },
+        { "name": "version", "value": "0.8.8" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/actool/manifest.go b/vendor/github.com/appc/spec/actool/manifest.go
index feae1144ac..98b9eaf20d 100644
--- a/vendor/github.com/appc/spec/actool/manifest.go
+++ b/vendor/github.com/appc/spec/actool/manifest.go
@@ -279,7 +279,7 @@ func patchManifest(im *schema.ImageManifest) error {
 			_, ok := types.ResourceIsolatorNames[name]
 
 			switch name {
-			case types.LinuxNoNewPrivilegesName:
+			case types.LinuxNoNewPrivilegesName, types.LinuxOOMScoreAdjName:
 				ok = true
 				kv := strings.Split(is, ",")
 				if len(kv) != 2 {
diff --git a/vendor/github.com/appc/spec/discovery/http.go b/vendor/github.com/appc/spec/discovery/http.go
index 7f30e66819..66a144b95c 100644
--- a/vendor/github.com/appc/spec/discovery/http.go
+++ b/vendor/github.com/appc/spec/discovery/http.go
@@ -68,8 +68,13 @@ func init() {
 	httpDo = Client
 
 	// copy for InsecureTLS
-	tInsecureTLS := *t
-	tInsecureTLS.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+	tInsecureTLS := http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		Dial: func(n, a string) (net.Conn, error) {
+			return net.DialTimeout(n, a, defaultDialTimeout)
+		},
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
 	ClientInsecureTLS = &http.Client{
 		Transport: &tInsecureTLS,
 	}
diff --git a/vendor/github.com/appc/spec/schema/pod.go b/vendor/github.com/appc/spec/schema/pod.go
index d4792ff3b4..9ed6c9e0a6 100644
--- a/vendor/github.com/appc/spec/schema/pod.go
+++ b/vendor/github.com/appc/spec/schema/pod.go
@@ -28,13 +28,15 @@ import (
 const PodManifestKind = types.ACKind("PodManifest")
 
 type PodManifest struct {
-	ACVersion   types.SemVer        `json:"acVersion"`
-	ACKind      types.ACKind        `json:"acKind"`
-	Apps        AppList             `json:"apps"`
-	Volumes     []types.Volume      `json:"volumes"`
-	Isolators   []types.Isolator    `json:"isolators"`
-	Annotations types.Annotations   `json:"annotations"`
-	Ports       []types.ExposedPort `json:"ports"`
+	ACVersion       types.SemVer          `json:"acVersion"`
+	ACKind          types.ACKind          `json:"acKind"`
+	Apps            AppList               `json:"apps"`
+	Volumes         []types.Volume        `json:"volumes"`
+	Isolators       []types.Isolator      `json:"isolators"`
+	Annotations     types.Annotations     `json:"annotations"`
+	Ports           []types.ExposedPort   `json:"ports"`
+	UserAnnotations types.UserAnnotations `json:"userAnnotations,omitempty"`
+	UserLabels      types.UserLabels      `json:"userLabels,omitempty"`
 }
 
 // podManifest is a model to facilitate extra validation during the
@@ -135,9 +137,12 @@ func (al AppList) Get(name types.ACName) *RuntimeApp {
 
 // Mount describes the mapping between a volume and the path it is mounted
 // inside of an app's filesystem.
+// The AppVolume is optional. If missing, the pod-level Volume of the
+// same name shall be used.
 type Mount struct {
-	Volume types.ACName `json:"volume"`
-	Path   string       `json:"path"`
+	Volume    types.ACName  `json:"volume"`
+	Path      string        `json:"path"`
+	AppVolume *types.Volume `json:"appVolume,omitempty"`
 }
 
 func (r Mount) assertValid() error {
diff --git a/vendor/github.com/appc/spec/schema/types/app.go b/vendor/github.com/appc/spec/schema/types/app.go
index a97ca0250f..0ef68c892f 100644
--- a/vendor/github.com/appc/spec/schema/types/app.go
+++ b/vendor/github.com/appc/spec/schema/types/app.go
@@ -22,16 +22,18 @@ import (
 )
 
 type App struct {
-	Exec              Exec           `json:"exec"`
-	EventHandlers     []EventHandler `json:"eventHandlers,omitempty"`
-	User              string         `json:"user"`
-	Group             string         `json:"group"`
-	SupplementaryGIDs []int          `json:"supplementaryGIDs,omitempty"`
-	WorkingDirectory  string         `json:"workingDirectory,omitempty"`
-	Environment       Environment    `json:"environment,omitempty"`
-	MountPoints       []MountPoint   `json:"mountPoints,omitempty"`
-	Ports             []Port         `json:"ports,omitempty"`
-	Isolators         Isolators      `json:"isolators,omitempty"`
+	Exec              Exec            `json:"exec"`
+	EventHandlers     []EventHandler  `json:"eventHandlers,omitempty"`
+	User              string          `json:"user"`
+	Group             string          `json:"group"`
+	SupplementaryGIDs []int           `json:"supplementaryGIDs,omitempty"`
+	WorkingDirectory  string          `json:"workingDirectory,omitempty"`
+	Environment       Environment     `json:"environment,omitempty"`
+	MountPoints       []MountPoint    `json:"mountPoints,omitempty"`
+	Ports             []Port          `json:"ports,omitempty"`
+	Isolators         Isolators       `json:"isolators,omitempty"`
+	UserAnnotations   UserAnnotations `json:"userAnnotations,omitempty"`
+	UserLabels        UserLabels      `json:"userLabels,omitempty"`
 }
 
 // app is a model to facilitate extra validation during the
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
index 6cb9a86730..df500bd5f7 100644
--- a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
+++ b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
@@ -17,6 +17,7 @@ package types
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"unicode"
 )
 
@@ -26,6 +27,8 @@ const (
 	LinuxNoNewPrivilegesName       = "os/linux/no-new-privileges"
 	LinuxSeccompRemoveSetName      = "os/linux/seccomp-remove-set"
 	LinuxSeccompRetainSetName      = "os/linux/seccomp-retain-set"
+	LinuxOOMScoreAdjName           = "os/linux/oom-score-adj"
+	LinuxCPUSharesName             = "os/linux/cpu-shares"
 )
 
 var LinuxIsolatorNames = make(map[ACIdentifier]struct{})
@@ -35,6 +38,8 @@ func init() {
 		LinuxCapabilitiesRevokeSetName: func() IsolatorValue { return &LinuxCapabilitiesRevokeSet{} },
 		LinuxCapabilitiesRetainSetName: func() IsolatorValue { return &LinuxCapabilitiesRetainSet{} },
 		LinuxNoNewPrivilegesName:       func() IsolatorValue { v := LinuxNoNewPrivileges(false); return &v },
+		LinuxOOMScoreAdjName:           func() IsolatorValue { v := LinuxOOMScoreAdj(0); return &v },
+		LinuxCPUSharesName:             func() IsolatorValue { v := LinuxCPUShares(1024); return &v },
 		LinuxSeccompRemoveSetName:      func() IsolatorValue { return &LinuxSeccompRemoveSet{} },
 		LinuxSeccompRetainSetName:      func() IsolatorValue { return &LinuxSeccompRetainSet{} },
 	} {
@@ -321,3 +326,107 @@ func (l LinuxSeccompRemoveSet) AsIsolator() (*Isolator, error) {
 		value:    &l,
 	}, nil
 }
+
+// LinuxCPUShares assigns the CPU time share weight to the processes executed.
+// See https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight,
+// https://www.kernel.org/doc/Documentation/scheduler/sched-design-CFS.txt
+type LinuxCPUShares int
+
+func NewLinuxCPUShares(val int) (*LinuxCPUShares, error) {
+	l := LinuxCPUShares(val)
+	if err := l.AssertValid(); err != nil {
+		return nil, err
+	}
+
+	return &l, nil
+}
+
+func (l LinuxCPUShares) AssertValid() error {
+	if l < 2 || l > 262144 {
+		return fmt.Errorf("%s must be between 2 and 262144, got %d", LinuxCPUSharesName, l)
+	}
+	return nil
+}
+
+func (l LinuxCPUShares) multipleAllowed() bool {
+	return false
+}
+
+func (l LinuxCPUShares) Conflicts() []ACIdentifier {
+	return nil
+}
+
+func (l *LinuxCPUShares) UnmarshalJSON(b []byte) error {
+	var v int
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	*l = LinuxCPUShares(v)
+	return nil
+}
+
+func (l LinuxCPUShares) AsIsolator() Isolator {
+	b, err := json.Marshal(l)
+	if err != nil {
+		panic(err)
+	}
+	rm := json.RawMessage(b)
+	return Isolator{
+		Name:     LinuxCPUSharesName,
+		ValueRaw: &rm,
+		value:    &l,
+	}
+}
+
+// LinuxOOMScoreAdj is equivalent to /proc/[pid]/oom_score_adj
+type LinuxOOMScoreAdj int // -1000 to 1000
+
+func NewLinuxOOMScoreAdj(val int) (*LinuxOOMScoreAdj, error) {
+	l := LinuxOOMScoreAdj(val)
+	if err := l.AssertValid(); err != nil {
+		return nil, err
+	}
+
+	return &l, nil
+}
+
+func (l LinuxOOMScoreAdj) AssertValid() error {
+	if l < -1000 || l > 1000 {
+		return fmt.Errorf("%s must be between -1000 and 1000, got %d", LinuxOOMScoreAdjName, l)
+	}
+	return nil
+}
+
+func (l LinuxOOMScoreAdj) multipleAllowed() bool {
+	return false
+}
+
+func (l LinuxOOMScoreAdj) Conflicts() []ACIdentifier {
+	return nil
+}
+
+func (l *LinuxOOMScoreAdj) UnmarshalJSON(b []byte) error {
+	var v int
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	*l = LinuxOOMScoreAdj(v)
+	return nil
+}
+
+func (l LinuxOOMScoreAdj) AsIsolator() Isolator {
+	b, err := json.Marshal(l)
+	if err != nil {
+		panic(err)
+	}
+	rm := json.RawMessage(b)
+	return Isolator{
+		Name:     LinuxOOMScoreAdjName,
+		ValueRaw: &rm,
+		value:    &l,
+	}
+}
diff --git a/vendor/github.com/appc/spec/schema/types/mountpoint.go b/vendor/github.com/appc/spec/schema/types/mountpoint.go
index 80eab94563..9d4e52b3d0 100644
--- a/vendor/github.com/appc/spec/schema/types/mountpoint.go
+++ b/vendor/github.com/appc/spec/schema/types/mountpoint.go
@@ -23,6 +23,7 @@ import (
 	"github.com/appc/spec/schema/common"
 )
 
+// MountPoint is the application-side manifestation of a Volume.
 type MountPoint struct {
 	Name     ACName `json:"name"`
 	Path     string `json:"path"`
diff --git a/vendor/github.com/appc/spec/schema/types/port.go b/vendor/github.com/appc/spec/schema/types/port.go
index 78d6de4ce1..2d54515037 100644
--- a/vendor/github.com/appc/spec/schema/types/port.go
+++ b/vendor/github.com/appc/spec/schema/types/port.go
@@ -18,12 +18,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net"
 	"net/url"
 	"strconv"
 
 	"github.com/appc/spec/schema/common"
 )
 
+// Port represents a port as offered by an application *inside*
+// the pod.
 type Port struct {
 	Name            ACName `json:"name"`
 	Protocol        string `json:"protocol"`
@@ -32,9 +35,14 @@ type Port struct {
 	SocketActivated bool   `json:"socketActivated"`
 }
 
+// ExposedPort represents a port listening on the host side.
+// The PodPort is optional -- if missing, then try and find the pod-side
+// information by matching names
 type ExposedPort struct {
 	Name     ACName `json:"name"`
 	HostPort uint   `json:"hostPort"`
+	HostIP   net.IP `json:"hostIP,omitempty"`  // optional
+	PodPort  *Port  `json:"podPort,omitempty"` // optional. If missing, try and find a corresponding App's port
 }
 
 type port Port
diff --git a/vendor/github.com/appc/spec/schema/types/user_annotations.go b/vendor/github.com/appc/spec/schema/types/user_annotations.go
new file mode 100644
index 0000000000..63ba434ea5
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/user_annotations.go
@@ -0,0 +1,18 @@
+// Copyright 2016 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+// UserAnnotations are arbitrary key-value pairs, to be supplied and interpreted by the user
+type UserAnnotations map[string]string
diff --git a/vendor/github.com/appc/spec/schema/types/user_labels.go b/vendor/github.com/appc/spec/schema/types/user_labels.go
new file mode 100644
index 0000000000..5ed927c9e8
--- /dev/null
+++ b/vendor/github.com/appc/spec/schema/types/user_labels.go
@@ -0,0 +1,18 @@
+// Copyright 2015 The appc Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package types
+
+// UserLabels are arbitrary key-value pairs, to be supplied and interpreted by the user
+type UserLabels map[string]string
diff --git a/vendor/github.com/appc/spec/schema/types/volume.go b/vendor/github.com/appc/spec/schema/types/volume.go
index c2c429dcf7..0986a61d25 100644
--- a/vendor/github.com/appc/spec/schema/types/volume.go
+++ b/vendor/github.com/appc/spec/schema/types/volume.go
@@ -156,8 +156,6 @@ func (v Volume) String() string {
 // Example volume parameters:
 // 	database,kind=host,source=/tmp,readOnly=true,recursive=true
 func VolumeFromString(vp string) (*Volume, error) {
-	var vol Volume
-
 	vp = "name=" + vp
 	vpQuery, err := common.MakeQueryString(vp)
 	if err != nil {
@@ -168,7 +166,12 @@ func VolumeFromString(vp string) (*Volume, error) {
 	if err != nil {
 		return nil, err
 	}
-	for key, val := range v {
+	return VolumeFromParams(v)
+}
+
+func VolumeFromParams(params map[string][]string) (*Volume, error) {
+	var vol Volume
+	for key, val := range params {
 		val := val
 		if len(val) > 1 {
 			return nil, fmt.Errorf("label %s with multiple values %q", key, val)
@@ -218,8 +221,7 @@ func VolumeFromString(vp string) (*Volume, error) {
 
 	maybeSetDefaults(&vol)
 
-	err = vol.assertValid()
-	if err != nil {
+	if err := vol.assertValid(); err != nil {
 		return nil, err
 	}
 
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go
index 7b0e2da6e5..82cc650952 100644
--- a/vendor/github.com/appc/spec/schema/version.go
+++ b/vendor/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.7"
+	version string = "0.8.8"
 )
 
 var (

From ee54b699f0806fb22cf8e227e97685e57b0157f2 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Mon, 24 Oct 2016 16:38:10 -0700
Subject: [PATCH 0795/1304] scripts: Update glide vendor script

Most of the glide update flags we're using are deprecated and default
behavior now.

glide-vc also deleted far more than it was supposed to on my machine
without the additional flag.
---
 scripts/glide-update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/glide-update.sh b/scripts/glide-update.sh
index 607e79134c..c918ad783d 100755
--- a/scripts/glide-update.sh
+++ b/scripts/glide-update.sh
@@ -19,5 +19,5 @@ if [ ! $(command -v glide-vc) ]; then
 	exit 255
 fi
 
-glide update --strip-vcs --strip-vendor --update-vendored --delete
-glide-vc --only-code --no-tests --keep="**/*.json.in"
+glide update --strip-vendor
+glide-vc --only-code --no-tests --keep="**/*.json.in" --use-lock-file

From 5eb0b9e427587fdfd9689d46025b4d152c5e456a Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Mon, 24 Oct 2016 16:39:07 -0700
Subject: [PATCH 0796/1304] vendor: Add missing file

---
 .../ql/vendored/github.com/camlistore/LICENSE | 202 ++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100644 vendor/github.com/cznic/ql/vendored/github.com/camlistore/LICENSE

diff --git a/vendor/github.com/cznic/ql/vendored/github.com/camlistore/LICENSE b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/github.com/cznic/ql/vendored/github.com/camlistore/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

From 4a1f1871a3b2dfd8b498f5225fe6db670990cb84 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Sun, 23 Oct 2016 16:59:06 +0200
Subject: [PATCH 0797/1304] stage0/cas: apply xattr attributes

Currently the xattr field is ignored, when untarring files. This fixes
it.

Fixes #3179
---
 pkg/tar/tar.go      | 38 +++++++++++++++++---
 pkg/tar/tar_test.go | 88 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+), 4 deletions(-)

diff --git a/pkg/tar/tar.go b/pkg/tar/tar.go
index 3c7889492f..a7d4f09cc5 100644
--- a/pkg/tar/tar.go
+++ b/pkg/tar/tar.go
@@ -23,6 +23,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 	"syscall"
 
 	"github.com/appc/spec/pkg/device"
@@ -34,22 +35,27 @@ const DEFAULT_DIR_MODE os.FileMode = 0755
 
 var ErrNotSupportedPlatform = errors.New("platform and architecture is not supported")
 
+var xattrPrefixWhitelist = []string{
+	"security.capability",
+	"user",
+}
+
 // Map of paths that should be whitelisted. The paths should be relative to the
 // root of the tar file and should be cleaned (for example using filepath.Clean)
 type PathWhitelistMap map[string]struct{}
 
-type FilePermissionsEditor func(string, int, int, byte, os.FileInfo) error
+type FilePermissionsEditor func(path string, uid, gid int, typ byte, _ os.FileInfo, xattr map[string]string) error
 
 func NewUidShiftingFilePermEditor(uidRange *user.UidRange) (FilePermissionsEditor, error) {
 	if os.Geteuid() != 0 {
-		return func(_ string, _, _ int, _ byte, _ os.FileInfo) error {
+		return func(_ string, _, _ int, _ byte, _ os.FileInfo, _ map[string]string) error {
 			// The files are owned by the current user on creation.
 			// If we do nothing, they will remain so.
 			return nil
 		}, nil
 	}
 
-	return func(path string, uid, gid int, typ byte, fi os.FileInfo) error {
+	return func(path string, uid, gid int, typ byte, fi os.FileInfo, xattr map[string]string) error {
 		shiftedUid, shiftedGid, err := uidRange.ShiftRange(uint32(uid), uint32(gid))
 		if err != nil {
 			return err
@@ -66,6 +72,20 @@ func NewUidShiftingFilePermEditor(uidRange *user.UidRange) (FilePermissionsEdito
 				return err
 			}
 		}
+
+		if typ == tar.TypeReg || typ == tar.TypeRegA {
+			for k, v := range xattr {
+				if !isXattrAllowed(k) {
+					continue
+				}
+
+				err := syscall.Setxattr(path, k, []byte(v), 0)
+				if err != nil {
+					return err
+				}
+			}
+		}
+
 		return nil
 	}, nil
 }
@@ -201,7 +221,7 @@ func extractFile(tr *tar.Reader, target string, hdr *tar.Header, overwrite bool,
 	}
 
 	if editor != nil {
-		if err := editor(p, hdr.Uid, hdr.Gid, hdr.Typeflag, fi); err != nil {
+		if err := editor(p, hdr.Uid, hdr.Gid, hdr.Typeflag, fi, hdr.Xattrs); err != nil {
 			return err
 		}
 	}
@@ -255,3 +275,13 @@ func extractFileFromTar(tr *tar.Reader, file string) ([]byte, error) {
 func HdrToTimespec(hdr *tar.Header) []syscall.Timespec {
 	return []syscall.Timespec{fileutil.TimeToTimespec(hdr.AccessTime), fileutil.TimeToTimespec(hdr.ModTime)}
 }
+
+func isXattrAllowed(xattr string) bool {
+	for _, v := range xattrPrefixWhitelist {
+		if strings.HasPrefix(xattr, v) {
+			return true
+		}
+	}
+
+	return false
+}
diff --git a/pkg/tar/tar_test.go b/pkg/tar/tar_test.go
index db700b0027..54d2414bd3 100644
--- a/pkg/tar/tar_test.go
+++ b/pkg/tar/tar_test.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"syscall"
 	"testing"
 	"time"
@@ -787,6 +788,93 @@ func testExtractTarHardLink(t *testing.T, extractTar func(io.Reader, string) err
 	}
 }
 
+func TestExtractTarXattr(t *testing.T) {
+	if !sys.HasChrootCapability() {
+		t.Skipf("chroot capability not available. Disabling test.")
+	}
+
+	entries := []*testTarEntry{
+		{
+			contents: "foo",
+			header: &tar.Header{
+				Name: "folder/foo.txt",
+				Size: 3,
+				Mode: int64(0755),
+				Xattrs: map[string]string{
+					"security.capability": "foo",
+					"user.baz":            "bar",
+					"faulty":              "xattr",
+				},
+			},
+		},
+	}
+
+	expected := []struct {
+		Xattrs map[string]string
+	}{
+		{
+			Xattrs: map[string]string{
+				"security.capability": "foo",
+				"user.baz":            "bar",
+			},
+		},
+	}
+
+	testTarPath, err := newTestTar(entries)
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+	defer os.Remove(testTarPath)
+
+	containerTar, err := os.Open(testTarPath)
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+	defer containerTar.Close()
+
+	wd, err := os.Getwd()
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+
+	tmpdir, err := ioutil.TempDir(wd, "rkt-temp-dir")
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+	os.RemoveAll(tmpdir)
+
+	err = os.MkdirAll(tmpdir, 0755)
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+	defer os.RemoveAll(tmpdir)
+
+	err = ExtractTar(containerTar, tmpdir, true, user.NewBlankUidRange(), nil)
+	if err != nil {
+		if strings.Contains(err.Error(), "operation not supported") {
+			t.Skipf("xattr unsupported, disabling test, error %v", err)
+		}
+
+		t.Errorf("unexpected error: %v", err)
+	}
+
+	for i, expected := range expected {
+		for k, v := range expected.Xattrs {
+			p := filepath.Join(tmpdir, entries[i].header.Name)
+			dest := make([]byte, len(v))
+
+			_, err := syscall.Getxattr(p, k, dest)
+			if err != nil {
+				t.Errorf("unexpected error: %v", err)
+			}
+
+			if got := string(dest); got != v {
+				t.Errorf("Expected xattr %q=%q, got %q", k, v, got)
+			}
+		}
+	}
+}
+
 func extractTarOverwriteHelper(rdr io.Reader, target string) error {
 	return ExtractTar(rdr, target, true, user.NewBlankUidRange(), nil)
 }

From 78d9e7d7526addb704fb1682ed9fa3a3c9d5b2c3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 25 Oct 2016 09:33:17 +0000
Subject: [PATCH 0798/1304] glide: bump docker2aci to 0.13.0

---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index 9993ad5646..a499213bc7 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.12.3
+  version: v0.13.0
   subpackages:
   - lib
   - lib/common

From 61220e914def3f2e94a8b5a6b24b2223325fd544 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 25 Oct 2016 09:35:40 +0000
Subject: [PATCH 0799/1304] vendor: update after docker2aci bump

---
 glide.lock                                    |  10 +-
 .../appc/docker2aci/lib/common/common.go      |  15 ++
 .../lib/internal/backend/file/file.go         | 220 +++++++++++++++---
 .../internal/backend/repository/repository.go |  11 +-
 .../backend/repository/repository1.go         |   3 +
 .../backend/repository/repository2.go         |  22 +-
 .../lib/internal/docker/docker_functions.go   |   5 +-
 .../appc/docker2aci/lib/internal/internal.go  | 183 +++++++++------
 .../lib/internal/typesV2/docker_types.go      |   5 +-
 .../appc/docker2aci/lib/internal/util/util.go |  46 ++--
 .../github.com/appc/docker2aci/lib/version.go |   2 +-
 .../opencontainers/image-spec/LICENSE         | 191 +++++++++++++++
 .../image-spec/specs-go/descriptor.go         |  27 +++
 .../image-spec/specs-go/version.go            |  32 +++
 .../image-spec/specs-go/versioned.go          |  26 +++
 15 files changed, 652 insertions(+), 146 deletions(-)
 create mode 100644 vendor/github.com/opencontainers/image-spec/LICENSE
 create mode 100644 vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go
 create mode 100644 vendor/github.com/opencontainers/image-spec/specs-go/version.go
 create mode 100644 vendor/github.com/opencontainers/image-spec/specs-go/versioned.go

diff --git a/glide.lock b/glide.lock
index 570e1847a3..0cf63a3ad0 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: 88224391c1497feeb57991075fe6bf1c8efe8b06f501543f2bf2d802d67b0e7e
-updated: 2016-10-24T13:58:49.082453394+02:00
+hash: 4355187753fd2b36529621c88ffd3b28cc8d1960ff6947ff305a7d10d7510542
+updated: 2016-10-25T09:27:11.804401231Z
 imports:
 - name: github.com/appc/docker2aci
-  version: 15d68b33bfee95a448c4da37dbe876baa8fcb5b6
+  version: 0cac1a3ecc114941cf643ec25f4daaeee8c3d538
   subpackages:
   - lib
   - lib/common
@@ -208,6 +208,10 @@ imports:
   version: 95e8170c5d4da28db9c64dfc9ec3138ea4466fd4
 - name: github.com/kr/pty
   version: f7ee69f31298ecbe5d2b349c711e2547a617d398
+- name: github.com/opencontainers/image-spec
+  version: b472d5f4067ddca5cfbfea148dfaf7b42d43c5f0
+  subpackages:
+  - specs-go
 - name: github.com/pborman/uuid
   version: cccd189d45f7ac3368a0d127efb7f4d08ae0b655
 - name: github.com/peterbourgon/diskv
diff --git a/vendor/github.com/appc/docker2aci/lib/common/common.go b/vendor/github.com/appc/docker2aci/lib/common/common.go
index 5fd1d46050..5275d5a4e9 100644
--- a/vendor/github.com/appc/docker2aci/lib/common/common.go
+++ b/vendor/github.com/appc/docker2aci/lib/common/common.go
@@ -16,6 +16,9 @@
 package common
 
 import (
+	"fmt"
+	"regexp"
+
 	"github.com/appc/docker2aci/lib/internal/docker"
 	"github.com/appc/docker2aci/lib/internal/types"
 )
@@ -27,6 +30,10 @@ const (
 	GzipCompression
 )
 
+var (
+	validId = regexp.MustCompile(`^(\w+:)?([A-Fa-f0-9]+)$`)
+)
+
 type ParsedDockerURL types.ParsedDockerURL
 
 const (
@@ -60,3 +67,11 @@ func ParseDockerURL(arg string) (*ParsedDockerURL, error) {
 	p, err := docker.ParseDockerURL(arg)
 	return (*ParsedDockerURL)(p), err
 }
+
+// ValidateLayerId validates a layer ID
+func ValidateLayerId(id string) error {
+	if ok := validId.MatchString(id); !ok {
+		return fmt.Errorf("invalid layer ID %q", id)
+	}
+	return nil
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
index a83402dfcd..b872984de2 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
@@ -28,14 +28,17 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 
 	"github.com/appc/docker2aci/lib/common"
 	"github.com/appc/docker2aci/lib/internal"
 	"github.com/appc/docker2aci/lib/internal/docker"
 	"github.com/appc/docker2aci/lib/internal/tarball"
 	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/appc/docker2aci/lib/internal/typesV2"
 	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/schema"
+	spec "github.com/opencontainers/image-spec/specs-go"
 )
 
 type FileBackend struct {
@@ -55,33 +58,48 @@ func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *types.ParsedDo
 		// image, so we ignore the error here, we'll handle it in getImageID
 	}
 
-	appImageID, parsedDockerURL, err := getImageID(lb.file, parsedDockerURL)
+	var ancestry []string
+	// default file name is the tar name stripped
+	name := strings.Split(filepath.Base(lb.file.Name()), ".")[0]
+	appImageID, ancestry, parsedDockerURL, err := getImageID(lb.file, parsedDockerURL, name)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	ancestry, err := getAncestry(lb.file, appImageID)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error getting ancestry: %v", err)
+	if len(ancestry) == 0 {
+		ancestry, err = getAncestry(lb.file, appImageID)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error getting ancestry: %v", err)
+		}
+	} else {
+		// for oci the first image is the config
+		ancestry = append([]string{appImageID}, ancestry...)
 	}
 
 	return ancestry, parsedDockerURL, nil
 }
 
 func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	if strings.Contains(layerIDs[0], ":") {
+		return lb.BuildACIV22(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+	}
 	var aciLayerPaths []string
 	var aciManifests []*schema.ImageManifest
 	var curPwl []string
+
+	tmpDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
+	if err != nil {
+		return nil, nil, fmt.Errorf("error creating dir: %v", err)
+	}
+	defer os.RemoveAll(tmpDir)
+
 	for i := len(layerIDs) - 1; i >= 0; i-- {
-		tmpDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
-		if err != nil {
-			return nil, nil, fmt.Errorf("error creating dir: %v", err)
+		if err := common.ValidateLayerId(layerIDs[i]); err != nil {
+			return nil, nil, err
 		}
-		defer os.RemoveAll(tmpDir)
-
 		j, err := getJson(lb.file, layerIDs[i])
 		if err != nil {
-			return nil, nil, fmt.Errorf("error getting image json: %v", err)
+			return nil, nil, fmt.Errorf("error getting layer json: %v", err)
 		}
 
 		layerData := types.DockerImageData{}
@@ -92,7 +110,8 @@ func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDocker
 		tmpLayerPath := path.Join(tmpDir, layerIDs[i])
 		tmpLayerPath += ".tar"
 
-		layerFile, err := extractEmbeddedLayer(lb.file, layerIDs[i], tmpLayerPath)
+		layerTarPath := path.Join(layerIDs[i], "layer.tar")
+		layerFile, err := extractEmbeddedLayer(lb.file, layerTarPath, tmpLayerPath)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error getting layer from file: %v", err)
 		}
@@ -112,19 +131,82 @@ func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDocker
 	return aciLayerPaths, aciManifests, nil
 }
 
-func getImageID(file *os.File, dockerURL *types.ParsedDockerURL) (string, *types.ParsedDockerURL, error) {
+func (lb *FileBackend) BuildACIV22(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	if len(layerIDs) < 2 {
+		return nil, nil, fmt.Errorf("insufficient layers for oci image")
+	}
+	var aciLayerPaths []string
+	var aciManifests []*schema.ImageManifest
+	var curPwl []string
+
+	imageID := layerIDs[0]
+	layerIDs = layerIDs[1:]
+
+	j, err := getJsonV22(lb.file, imageID)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error getting layer from file: %v", err)
+	}
+	imageConfig := typesV2.ImageConfig{}
+	if err := json.Unmarshal(j, &imageConfig); err != nil {
+		return nil, nil, fmt.Errorf("error unmarshaling image data: %v", err)
+	}
+
+	tmpDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
+	if err != nil {
+		return nil, nil, fmt.Errorf("error creating dir: %v", err)
+	}
+	defer os.RemoveAll(tmpDir)
+	for i := len(layerIDs) - 1; i >= 0; i-- {
+		parts := strings.Split(layerIDs[i], ":")
+		tmpLayerPath := path.Join(tmpDir, parts[1])
+		tmpLayerPath += ".tar"
+		layerTarPath := path.Join(append([]string{"blobs"}, parts...)...)
+		layerFile, err := extractEmbeddedLayer(lb.file, layerTarPath, tmpLayerPath)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error getting layer from file: %v", err)
+		}
+		defer layerFile.Close()
+		log.Debug("Generating layer ACI...")
+		var aciPath string
+		var manifest *schema.ImageManifest
+		if i != 0 {
+			aciPath, manifest, err = internal.GenerateACI22LowerLayer(dockerURL, parts[1], outputDir, layerFile, curPwl, compression)
+		} else {
+			aciPath, manifest, err = internal.GenerateACI22TopLayer(dockerURL, &imageConfig, parts[1], outputDir, layerFile, curPwl, compression, aciManifests)
+		}
+		if err != nil {
+			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
+		}
+
+		aciLayerPaths = append(aciLayerPaths, aciPath)
+		aciManifests = append(aciManifests, manifest)
+		curPwl = manifest.PathWhitelist
+	}
+
+	return aciLayerPaths, aciManifests, nil
+}
+
+func getImageID(file *os.File, dockerURL *types.ParsedDockerURL, name string) (string, []string, *types.ParsedDockerURL, error) {
+	log.Debug("getting image id...")
 	type tags map[string]string
 	type apps map[string]tags
 
 	_, err := file.Seek(0, 0)
 	if err != nil {
-		return "", nil, fmt.Errorf("error seeking file: %v", err)
+		return "", nil, nil, fmt.Errorf("error seeking file: %v", err)
+	}
+
+	tag := "latest"
+	if dockerURL != nil {
+		tag = dockerURL.Tag
 	}
 
 	var imageID string
+	var ancestry []string
 	var appName string
 	reposWalker := func(t *tarball.TarFile) error {
-		if filepath.Clean(t.Name()) == "repositories" {
+		clean := filepath.Clean(t.Name())
+		if clean == "repositories" {
 			repob, err := ioutil.ReadAll(t.TarStream)
 			if err != nil {
 				return fmt.Errorf("error reading repositories file: %v", err)
@@ -158,11 +240,6 @@ func getImageID(file *os.File, dockerURL *types.ParsedDockerURL) (string, *types
 				appName = dockerURL.ImageName
 			}
 
-			tag := "latest"
-			if dockerURL != nil {
-				tag = dockerURL.Tag
-			}
-
 			app, ok := repositories[appName]
 			if !ok {
 				return fmt.Errorf("app %q not found", appName)
@@ -190,19 +267,87 @@ func getImageID(file *os.File, dockerURL *types.ParsedDockerURL) (string, *types
 			imageID = string(app[tag])
 		}
 
+		if clean == "refs/"+tag {
+			refb, err := ioutil.ReadAll(t.TarStream)
+			if err != nil {
+				return fmt.Errorf("error reading ref descriptor for tag %s: %v", tag, err)
+			}
+
+			if dockerURL == nil {
+				dockerURL = &types.ParsedDockerURL{
+					IndexURL:  "",
+					Tag:       tag,
+					ImageName: name,
+				}
+			}
+
+			var ref spec.Descriptor
+			if err := json.Unmarshal(refb, &ref); err != nil {
+				return fmt.Errorf("error unmarshaling ref descriptor for tag %s", tag)
+			}
+			imageID, ancestry, err = getDataFromManifest(file, ref.Digest)
+			if err != nil {
+				return err
+			}
+			return io.EOF
+		}
 		return nil
 	}
 
 	tr := tar.NewReader(file)
-	if err := tarball.Walk(*tr, reposWalker); err != nil {
-		return "", nil, err
+	if err := tarball.Walk(*tr, reposWalker); err != nil && err != io.EOF {
+		return "", nil, nil, err
 	}
 
 	if imageID == "" {
-		return "", nil, fmt.Errorf("repositories file not found")
+		return "", nil, nil, fmt.Errorf("Could not find image")
+	}
+
+	return imageID, ancestry, dockerURL, nil
+}
+
+func getDataFromManifest(file *os.File, manifestID string) (string, []string, error) {
+	_, err := file.Seek(0, 0)
+	if err != nil {
+		return "", nil, fmt.Errorf("error seeking file: %v", err)
+	}
+
+	parts := append([]string{"blobs"}, strings.Split(manifestID, ":")...)
+	jsonPath := path.Join(parts...)
+
+	var imageID string
+	var ancestry []string
+	reposWalker := func(t *tarball.TarFile) error {
+		clean := filepath.Clean(t.Name())
+		if clean == jsonPath {
+
+			manb, err := ioutil.ReadAll(t.TarStream)
+			if err != nil {
+				return fmt.Errorf("error reading image manifest: %v", err)
+			}
+
+			var manifest typesV2.ImageManifest
+			if err := json.Unmarshal(manb, &manifest); err != nil {
+				return fmt.Errorf("error unmarshaling image manifest")
+			}
+			if manifest.Config == nil {
+				return fmt.Errorf("manifest does not contain a config")
+			}
+			imageID = manifest.Config.Digest
+			// put them in reverse order
+			for i := len(manifest.Layers) - 1; i >= 0; i-- {
+				ancestry = append(ancestry, manifest.Layers[i].Digest)
+			}
+		}
+		return nil
 	}
 
-	return imageID, dockerURL, nil
+	tr := tar.NewReader(file)
+	if err := tarball.Walk(*tr, reposWalker); err != nil {
+		return "", nil, err
+	}
+
+	return imageID, ancestry, nil
 }
 
 func getJson(file *os.File, layerID string) ([]byte, error) {
@@ -210,10 +355,16 @@ func getJson(file *os.File, layerID string) ([]byte, error) {
 	return getTarFileBytes(file, jsonPath)
 }
 
+func getJsonV22(file *os.File, layerID string) ([]byte, error) {
+	parts := append([]string{"blobs"}, strings.Split(layerID, ":")...)
+	jsonPath := path.Join(parts...)
+	return getTarFileBytes(file, jsonPath)
+}
+
 func getTarFileBytes(file *os.File, path string) ([]byte, error) {
 	_, err := file.Seek(0, 0)
 	if err != nil {
-		fmt.Errorf("error seeking file: %v", err)
+		return nil, fmt.Errorf("error seeking file: %v", err)
 	}
 
 	var fileBytes []byte
@@ -240,16 +391,13 @@ func getTarFileBytes(file *os.File, path string) ([]byte, error) {
 	return fileBytes, nil
 }
 
-func extractEmbeddedLayer(file *os.File, layerID string, outputPath string) (*os.File, error) {
-	log.Info("Extracting ", layerID[:12], "\n")
-
+func extractEmbeddedLayer(file *os.File, layerTarPath string, outputPath string) (*os.File, error) {
+	log.Info("Extracting ", layerTarPath, "\n")
 	_, err := file.Seek(0, 0)
 	if err != nil {
-		fmt.Errorf("error seeking file: %v", err)
+		return nil, fmt.Errorf("error seeking file: %v", err)
 	}
 
-	layerTarPath := path.Join(layerID, "layer.tar")
-
 	var layerFile *os.File
 	fileWalker := func(t *tarball.TarFile) error {
 		if filepath.Clean(t.Name()) == layerTarPath {
@@ -279,20 +427,29 @@ func extractEmbeddedLayer(file *os.File, layerID string, outputPath string) (*os
 	return layerFile, nil
 }
 
+// getAncestry computes an image ancestry, returning an ordered list
+// of dependencies starting from the topmost image to the base.
+// It checks for dependency loops via duplicate detection in the image
+// chain and errors out in such cases.
 func getAncestry(file *os.File, imgID string) ([]string, error) {
 	var ancestry []string
+	deps := make(map[string]bool)
 
 	curImgID := imgID
 
 	var err error
 	for curImgID != "" {
+		if deps[curImgID] {
+			return nil, fmt.Errorf("dependency loop detected at image %q", curImgID)
+		}
+		deps[curImgID] = true
 		ancestry = append(ancestry, curImgID)
+		log.Debug(fmt.Sprintf("Getting ancestry for layer %q", curImgID))
 		curImgID, err = getParent(file, curImgID)
 		if err != nil {
 			return nil, err
 		}
 	}
-
 	return ancestry, nil
 }
 
@@ -328,5 +485,6 @@ func getParent(file *os.File, imgID string) (string, error) {
 		return "", err
 	}
 
+	log.Debug(fmt.Sprintf("Layer %q depends on layer %q", imgID, parent))
 	return parent, nil
 }
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
index 0b5b495199..12da855262 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
@@ -108,27 +108,26 @@ func (rb *RepositoryBackend) BuildACI(layerIDs []string, dockerURL *types.Parsed
 	}
 }
 
+// checkRegistryStatus determines registry API version compatibility according to spec:
+// https://docs.docker.com/registry/spec/api/#/api-version-check
 func checkRegistryStatus(statusCode int, hdr http.Header, version registryVersion) (bool, error) {
 	switch statusCode {
 	case http.StatusOK, http.StatusUnauthorized:
 		ok := true
 		if version == registryV2 {
-			// v2 API requires this check
+			// According to v2 spec, registries SHOULD set this header value
+			// and clients MAY fallback to v1 if missing, as done here.
 			ok = hdr.Get("Docker-Distribution-API-Version") == "registry/2.0"
 		}
 		return ok, nil
-	case http.StatusNotFound:
-		return false, nil
 	}
-
-	return false, fmt.Errorf("unexpected http code: %d", statusCode)
+	return false, nil
 }
 
 func (rb *RepositoryBackend) supportsRegistry(indexURL string, version registryVersion) (schema string, ok bool, err error) {
 	var URLPath string
 	switch version {
 	case registryV1:
-		// the v1 API defines this URL to check if the registry's status
 		URLPath = "v1/_ping"
 	case registryV2:
 		URLPath = "v2"
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
index bc54e47c7b..7d4fe91734 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
@@ -75,6 +75,9 @@ func (rb *RepositoryBackend) buildACIV1(layerIDs []string, dockerURL *types.Pars
 
 	var doneChannels []chan error
 	for i, layerID := range layerIDs {
+		if err := common.ValidateLayerId(layerID); err != nil {
+			return nil, nil, err
+		}
 		doneChan := make(chan error)
 		doneChannels = append(doneChannels, doneChan)
 		// https://github.com/golang/go/wiki/CommonMistakes
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
index d074e9a02c..e34a8de434 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -23,7 +23,6 @@ import (
 	"net/http"
 	"os"
 	"path"
-	"regexp"
 	"strconv"
 	"strings"
 	"sync"
@@ -43,8 +42,6 @@ const (
 	defaultIndexURL = "registry-1.docker.io"
 )
 
-var validHex = regexp.MustCompile(`^([a-f0-9]{64})$`)
-
 // A manifest conforming to the docker v2.1 spec
 type v2Manifest struct {
 	Name     string `json:"name"`
@@ -91,6 +88,9 @@ func (rb *RepositoryBackend) buildACIV21(layerIDs []string, dockerURL *types.Par
 	closers := make([]io.ReadCloser, len(layerIDs))
 	var wg sync.WaitGroup
 	for i, layerID := range layerIDs {
+		if err := common.ValidateLayerId(layerID); err != nil {
+			return nil, nil, err
+		}
 		wg.Add(1)
 		errChan := make(chan error, 1)
 		errChannels = append(errChannels, errChan)
@@ -195,6 +195,9 @@ func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *types.Par
 
 	resultChan := make(chan layer, len(layerIDs))
 	for i, layerID := range layerIDs {
+		if err := common.ValidateLayerId(layerID); err != nil {
+			return nil, nil, err
+		}
 		// https://github.com/golang/go/wiki/CommonMistakes
 		i := i // golang--
 		layerID := layerID
@@ -334,7 +337,7 @@ func (rb *RepositoryBackend) getManifestV21(dockerURL *types.ParsedDockerURL, re
 		return nil, fmt.Errorf("name doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.ImageName, manifest.Name)
 	}
 
-	if manifest.Tag != dockerURL.Tag {
+	if dockerURL.Tag != "" && manifest.Tag != dockerURL.Tag {
 		return nil, fmt.Errorf("tag doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.Tag, manifest.Tag)
 	}
 
@@ -436,7 +439,7 @@ func fixManifestLayers(manifest *v2Manifest) error {
 		}
 
 		imgs[i] = img
-		if err := validateV1ID(img.ID); err != nil {
+		if err := common.ValidateLayerId(img.ID); err != nil {
 			return err
 		}
 	}
@@ -471,13 +474,6 @@ func fixManifestLayers(manifest *v2Manifest) error {
 	return nil
 }
 
-func validateV1ID(id string) error {
-	if ok := validHex.MatchString(id); !ok {
-		return fmt.Errorf("image ID %q is invalid", id)
-	}
-	return nil
-}
-
 func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedDockerURL, tmpDir string, copier *progressutil.CopyProgressPrinter) (*os.File, io.ReadCloser, error) {
 	var (
 		err error
@@ -493,7 +489,7 @@ func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedD
 
 	accepting := []string{
 		typesV2.MediaTypeDockerV22RootFS,
-		typesV2.MediaTypeOCIRootFS,
+		typesV2.MediaTypeOCILayer,
 	}
 
 	res, err = rb.makeRequest(req, dockerURL.ImageName, accepting)
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go b/vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
index 70bca8e476..a6e955b8be 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
@@ -140,13 +140,14 @@ func ParseDockerURL(arg string) (*types.ParsedDockerURL, error) {
 		return nil, err
 	}
 
-	tag := defaultTag
-	var digest string
+	var tag, digest string
 	switch x := r.(type) {
 	case reference.Canonical:
 		digest = x.Digest().String()
 	case reference.NamedTagged:
 		tag = x.Tag()
+	default:
+		tag = defaultTag
 	}
 
 	indexURL, remoteName := SplitReposName(r.Name())
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/internal.go b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
index e116cc119c..e9d1f71d6f 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/internal.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
@@ -146,6 +146,26 @@ func generateACIPath(outputDir, imageName, digest, tag, osString, arch string, l
 	return path.Join(outputDir, aciPath)
 }
 
+func generateEPCmdAnnotation(dockerEP, dockerCmd []string) (string, string, error) {
+	var entrypointAnnotation, cmdAnnotation string
+	if len(dockerEP) > 0 {
+		entry, err := json.Marshal(dockerEP)
+		if err != nil {
+			return "", "", err
+		}
+		entrypointAnnotation = string(entry)
+	}
+	if len(dockerCmd) > 0 {
+		cmd, err := json.Marshal(dockerCmd)
+		if err != nil {
+			return "", "", err
+		}
+		cmdAnnotation = string(cmd)
+	}
+
+	return entrypointAnnotation, cmdAnnotation, nil
+}
+
 // GenerateManifest converts the docker manifest format to an appc
 // ImageManifest.
 func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDockerURL) (*schema.ImageManifest, error) {
@@ -170,68 +190,48 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDo
 
 	genManifest.ACKind = appctypes.ACKind(schema.ImageManifestKind)
 
-	var (
-		labels       appctypes.Labels
-		parentLabels appctypes.Labels
-		annotations  appctypes.Annotations
-	)
-
-	layer := appctypes.MustACIdentifier("layer")
-	labels = append(labels, appctypes.Label{Name: *layer, Value: layerData.ID})
+	var annotations appctypes.Annotations
 
-	tag := dockerURL.Tag
-	version := appctypes.MustACIdentifier("version")
-	labels = append(labels, appctypes.Label{Name: *version, Value: tag})
+	labels := make(map[appctypes.ACIdentifier]string)
+	parentLabels := make(map[appctypes.ACIdentifier]string)
 
-	if layerData.OS != "" {
-		os := appctypes.MustACIdentifier("os")
-		labels = append(labels, appctypes.Label{Name: *os, Value: layerData.OS})
-		parentLabels = append(parentLabels, appctypes.Label{Name: *os, Value: layerData.OS})
+	addLabel := func(key, val string) {
+		if key != "" && val != "" {
+			labels[*appctypes.MustACIdentifier(key)] = val
+		}
+	}
 
-		if layerData.Architecture != "" {
-			arch := appctypes.MustACIdentifier("arch")
-			labels = append(labels, appctypes.Label{Name: *arch, Value: layerData.Architecture})
-			parentLabels = append(parentLabels, appctypes.Label{Name: *arch, Value: layerData.Architecture})
+	addParentLabel := func(key, val string) {
+		if key != "" && val != "" {
+			parentLabels[*appctypes.MustACIdentifier(key)] = val
 		}
 	}
 
-	if layerData.Author != "" {
-		authorsKey := appctypes.MustACIdentifier("authors")
-		annotations = append(annotations, appctypes.Annotation{Name: *authorsKey, Value: layerData.Author})
+	addAnno := func(key, val string) {
+		if key != "" && val != "" {
+			annotations.Set(*appctypes.MustACIdentifier(key), val)
+		}
 	}
+
+	addLabel("layer", layerData.ID)
+	addLabel("version", dockerURL.Tag)
+	addLabel("os", layerData.OS)
+	addParentLabel("os", layerData.OS)
+	addLabel("arch", layerData.Architecture)
+	addParentLabel("arch", layerData.OS)
+
+	addAnno("authors", layerData.Author)
 	epoch := time.Unix(0, 0)
 	if !layerData.Created.Equal(epoch) {
-		createdKey := appctypes.MustACIdentifier("created")
-		annotations = append(annotations, appctypes.Annotation{Name: *createdKey, Value: layerData.Created.Format(time.RFC3339)})
-	}
-	if layerData.Comment != "" {
-		commentKey := appctypes.MustACIdentifier("docker-comment")
-		annotations = append(annotations, appctypes.Annotation{Name: *commentKey, Value: layerData.Comment})
+		addAnno("created", layerData.Created.Format(time.RFC3339))
 	}
-
-	if dockerURL.IndexURL != "" {
-		annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerRegistryURL), Value: dockerURL.IndexURL})
-	}
-	annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerRepository), Value: dockerURL.ImageName})
-	annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerImageID), Value: layerData.ID})
-	annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerParentImageID), Value: layerData.Parent})
+	addAnno("docker-comment", layerData.Comment)
+	addAnno(common.AppcDockerRegistryURL, dockerURL.IndexURL)
+	addAnno(common.AppcDockerRepository, dockerURL.ImageName)
+	addAnno(common.AppcDockerImageID, layerData.ID)
+	addAnno(common.AppcDockerParentImageID, layerData.Parent)
 
 	if dockerConfig != nil {
-		if len(dockerConfig.Entrypoint) > 0 {
-			entry, err := json.Marshal(dockerConfig.Entrypoint)
-			if err != nil {
-				return nil, err
-			}
-			annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerEntrypoint), Value: string(entry)})
-		}
-		if len(dockerConfig.Cmd) > 0 {
-			cmd, err := json.Marshal(dockerConfig.Cmd)
-			if err != nil {
-				return nil, err
-			}
-			annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerCmd), Value: string(cmd)})
-		}
-
 		exec := getExecCommand(dockerConfig.Entrypoint, dockerConfig.Cmd)
 		if exec != nil {
 			user, group := parseDockerUser(dockerConfig.User)
@@ -258,6 +258,17 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDo
 				return nil, err
 			}
 
+			ep, cmd, err := generateEPCmdAnnotation(dockerConfig.Entrypoint, dockerConfig.Cmd)
+			if err != nil {
+				return nil, err
+			}
+			if len(ep) > 0 {
+				addAnno(common.AppcDockerEntrypoint, ep)
+			}
+			if len(cmd) > 0 {
+				addAnno(common.AppcDockerCmd, cmd)
+			}
+
 			genManifest.App = app
 		}
 	}
@@ -273,12 +284,20 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDo
 		}
 		parentImageName := appctypes.MustACIdentifier(parentImageNameString)
 
-		genManifest.Dependencies = append(genManifest.Dependencies, appctypes.Dependency{ImageName: *parentImageName, Labels: parentLabels})
+		plbl, err := appctypes.LabelsFromMap(labels)
+		if err != nil {
+			return nil, err
+		}
+
+		genManifest.Dependencies = append(genManifest.Dependencies, appctypes.Dependency{ImageName: *parentImageName, Labels: plbl})
 
-		annotations = append(annotations, appctypes.Annotation{Name: *appctypes.MustACIdentifier(common.AppcDockerTag), Value: dockerURL.Tag})
+		addAnno(common.AppcDockerTag, dockerURL.Tag)
 	}
 
-	genManifest.Labels = labels
+	genManifest.Labels, err = appctypes.LabelsFromMap(labels)
+	if err != nil {
+		return nil, err
+	}
 	genManifest.Annotations = annotations
 
 	return genManifest, nil
@@ -290,20 +309,22 @@ func GenerateEmptyManifest(name string) (*schema.ImageManifest, error) {
 		return nil, err
 	}
 
+	labels := appctypes.Labels{
+		appctypes.Label{
+			Name:  *appctypes.MustACIdentifier("arch"),
+			Value: runtime.GOARCH,
+		},
+		appctypes.Label{
+			Name:  *appctypes.MustACIdentifier("os"),
+			Value: runtime.GOOS,
+		},
+	}
+
 	return &schema.ImageManifest{
 		ACKind:    schema.ImageManifestKind,
 		ACVersion: schema.AppContainerVersion,
 		Name:      *acid,
-		Labels: appctypes.Labels{
-			appctypes.Label{
-				*appctypes.MustACIdentifier("arch"),
-				runtime.GOARCH,
-			},
-			appctypes.Label{
-				*appctypes.MustACIdentifier("os"),
-				runtime.GOOS,
-			},
-		},
+		Labels:    labels,
 	}, nil
 }
 
@@ -341,10 +362,11 @@ func GenerateManifestV22(name string, dockerURL *types.ParsedDockerURL, config *
 	addAnno("created", config.Created)
 
 	if config.Config != nil {
-		exec := getExecCommand(config.Config.Entrypoint, config.Config.Cmd)
-		user, group := parseDockerUser(config.Config.User)
+		innerCfg := config.Config
+		exec := getExecCommand(innerCfg.Entrypoint, innerCfg.Cmd)
+		user, group := parseDockerUser(innerCfg.User)
 		var env appctypes.Environment
-		for _, v := range config.Config.Env {
+		for _, v := range innerCfg.Env {
 			parts := strings.SplitN(v, "=", 2)
 			env.Set(parts[0], parts[1])
 		}
@@ -353,16 +375,27 @@ func GenerateManifestV22(name string, dockerURL *types.ParsedDockerURL, config *
 			User:             user,
 			Group:            group,
 			Environment:      env,
-			WorkingDirectory: config.Config.WorkingDir,
+			WorkingDirectory: innerCfg.WorkingDir,
+		}
+		manifest.App.MountPoints, err = convertVolumesToMPs(innerCfg.Volumes)
+		if err != nil {
+			return nil, err
 		}
-		manifest.App.MountPoints, err = convertVolumesToMPs(config.Config.Volumes)
+		manifest.App.Ports, err = convertPorts(innerCfg.ExposedPorts, nil)
 		if err != nil {
 			return nil, err
 		}
-		manifest.App.Ports, err = convertPorts(config.Config.ExposedPorts, nil)
+
+		ep, cmd, err := generateEPCmdAnnotation(innerCfg.Entrypoint, innerCfg.Cmd)
 		if err != nil {
 			return nil, err
 		}
+		if len(ep) > 0 {
+			addAnno(common.AppcDockerEntrypoint, ep)
+		}
+		if len(cmd) > 0 {
+			addAnno(common.AppcDockerCmd, cmd)
+		}
 	}
 
 	for _, lowerLayer := range lowerLayers {
@@ -520,9 +553,11 @@ func convertVolumesToMPs(dockerVolumes map[string]struct{}) ([]appctypes.MountPo
 
 func writeACI(layer io.ReadSeeker, manifest schema.ImageManifest, curPwl []string, output string, compression common.Compression) (*schema.ImageManifest, error) {
 	dir, _ := path.Split(output)
-	err := os.MkdirAll(dir, 0755)
-	if err != nil {
-		return nil, fmt.Errorf("error creating ACI parent dir: %v", err)
+	if dir != "" {
+		err := os.MkdirAll(dir, 0755)
+		if err != nil {
+			return nil, fmt.Errorf("error creating ACI parent dir: %v", err)
+		}
 	}
 	aciFile, err := os.Create(output)
 	if err != nil {
@@ -623,9 +658,9 @@ func parseDockerUser(dockerUser string) (string, string) {
 
 	// when only the user is given, the docker spec says that the default and
 	// supplementary groups of the user in /etc/passwd should be applied.
-	// Assume root group for now in this case.
+	// To avoid inspecting image content, we set gid to the same value as uid.
 	if len(dockerUserParts) < 2 {
-		return dockerUserParts[0], "0"
+		return dockerUserParts[0], dockerUserParts[0]
 	}
 
 	return dockerUserParts[0], dockerUserParts[1]
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go b/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
index 3a10cd5422..7c43c50159 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
@@ -31,9 +31,8 @@ const (
 
 	MediaTypeOCIManifest     = "application/vnd.oci.image.manifest.v1+json"
 	MediaTypeOCIManifestList = "application/vnd.oci.image.manifest.list.v1+json"
-	MediaTypeOCIConfig       = "application/vnd.oci.image.serialization.config.v1+json"
-	MediaTypeOCIRootFS       = "application/vnd.oci.image.serialization.rootfs.tar.gzip"
-	MediaTypeOCICombined     = "application/vnd.oci.image.serialization.combined.v1+json"
+	MediaTypeOCIConfig       = "application/vnd.oci.image.config.v1+json"
+	MediaTypeOCILayer        = "application/vnd.oci.image.layer.tar+gzip"
 )
 
 var (
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/util/util.go b/vendor/github.com/appc/docker2aci/lib/internal/util/util.go
index ebaafca62c..e17c8d6f14 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/util/util.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/util/util.go
@@ -21,11 +21,18 @@ package util
 import (
 	"crypto/tls"
 	"fmt"
+	"net"
 	"net/http"
+	"time"
 
 	"github.com/appc/spec/pkg/acirenderer"
 )
 
+var (
+	secureClient   = newClient(false)
+	insecureClient = newClient(true)
+)
+
 // Quote takes a slice of strings and returns another slice with them quoted.
 func Quote(l []string) []string {
 	var quoted []string
@@ -65,19 +72,32 @@ func IndexOf(list []string, el string) int {
 // GetTLSClient gets an HTTP client that behaves like the default HTTP
 // client, but optionally skips the TLS certificate verification.
 func GetTLSClient(skipTLSCheck bool) *http.Client {
-	if !skipTLSCheck {
-		return http.DefaultClient
+	if skipTLSCheck {
+		return insecureClient
+	}
+
+	return secureClient
+}
+
+func newClient(skipTLSCheck bool) *http.Client {
+	dialer := &net.Dialer{
+		Timeout:   30 * time.Second,
+		KeepAlive: 30 * time.Second,
+	} // values taken from stdlib v1.5.3
+
+	tr := &http.Transport{
+		Proxy:               http.ProxyFromEnvironment,
+		Dial:                dialer.Dial,
+		TLSHandshakeTimeout: 10 * time.Second,
+	} // values taken from stdlib v1.5.3
+
+	if skipTLSCheck {
+		tr.TLSClientConfig = &tls.Config{
+			InsecureSkipVerify: true,
+		}
 	}
-	client := *http.DefaultClient
-	// Default transport is hidden behind the RoundTripper
-	// interface, so we can't easily make a copy of it. If this
-	// ever panics, we will have to adapt.
-	realTransport := http.DefaultTransport.(*http.Transport)
-	tr := *realTransport
-	if tr.TLSClientConfig == nil {
-		tr.TLSClientConfig = &tls.Config{}
+
+	return &http.Client{
+		Transport: tr,
 	}
-	tr.TLSClientConfig.InsecureSkipVerify = true
-	client.Transport = &tr
-	return &client
 }
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index bb86085c19..48a416d106 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.12.3"
+var Version = "0.13.0"
 var AppcVersion = schema.AppContainerVersion
diff --git a/vendor/github.com/opencontainers/image-spec/LICENSE b/vendor/github.com/opencontainers/image-spec/LICENSE
new file mode 100644
index 0000000000..9fdc20fdb6
--- /dev/null
+++ b/vendor/github.com/opencontainers/image-spec/LICENSE
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2016 The Linux Foundation.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go b/vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go
new file mode 100644
index 0000000000..7a2065598b
--- /dev/null
+++ b/vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go
@@ -0,0 +1,27 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package specs
+
+// Descriptor describes the disposition of targeted content.
+type Descriptor struct {
+	// MediaType contains the MIME type of the referenced object.
+	MediaType string `json:"mediaType"`
+
+	// Digest is the digest of the targeted content.
+	Digest string `json:"digest"`
+
+	// Size specifies the size in bytes of the blob.
+	Size int64 `json:"size"`
+}
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/version.go b/vendor/github.com/opencontainers/image-spec/specs-go/version.go
new file mode 100644
index 0000000000..0815d055e1
--- /dev/null
+++ b/vendor/github.com/opencontainers/image-spec/specs-go/version.go
@@ -0,0 +1,32 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package specs
+
+import "fmt"
+
+const (
+	// VersionMajor is for an API incompatible changes
+	VersionMajor = 1
+	// VersionMinor is for functionality in a backwards-compatible manner
+	VersionMinor = 0
+	// VersionPatch is for backwards-compatible bug fixes
+	VersionPatch = 0
+
+	// VersionDev indicates development branch. Releases will be empty string.
+	VersionDev = "-rc1"
+)
+
+// Version is the specification version that the package types support.
+var Version = fmt.Sprintf("%d.%d.%d%s", VersionMajor, VersionMinor, VersionPatch, VersionDev)
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/versioned.go b/vendor/github.com/opencontainers/image-spec/specs-go/versioned.go
new file mode 100644
index 0000000000..ca0bd412c1
--- /dev/null
+++ b/vendor/github.com/opencontainers/image-spec/specs-go/versioned.go
@@ -0,0 +1,26 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package specs
+
+// Versioned provides a struct with the manifest schemaVersion and mediaType.
+// Incoming content with unknown schema version can be decoded against this
+// struct to check the version.
+type Versioned struct {
+	// SchemaVersion is the image manifest schema that this image follows
+	SchemaVersion int `json:"schemaVersion"`
+
+	// MediaType is the media type of this schema.
+	MediaType string `json:"mediaType,omitempty"`
+}

From a22557af9aae9abac09dc7d4a990e6722de94478 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 19 Sep 2016 13:07:03 -0700
Subject: [PATCH 0800/1304] stop: Don't treat 'rkt stop already-stopped-pods'
 as errors.

Since 'rkt stop' is idempotent, 'rkt stop' on an already stopped
pod should not return error.
---
 rkt/stop.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rkt/stop.go b/rkt/stop.go
index 36806be869..88ab6da405 100644
--- a/rkt/stop.go
+++ b/rkt/stop.go
@@ -71,6 +71,11 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 			continue
 		}
 
+		if p.AfterRun() {
+			stdout.Printf("pod %q is already stopped", p.UUID)
+			continue
+		}
+
 		if p.State() != pkgPod.Running {
 			stderr.Error(fmt.Errorf("pod %q is not running", p.UUID))
 			errors++

From e15b7100615b7380081e6e180a5b723df2fefecc Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 19 Sep 2016 14:20:01 -0700
Subject: [PATCH 0801/1304] Allow `rkt app rm` on a stopped pod.

When the pod is stopped, don't call app-add/app-rm entrypoint
because there is not much we can/need to do when the whole pod
is stopped.
---
 stage0/app.go | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/stage0/app.go b/stage0/app.go
index 6f8498113e..1bf8e67b2d 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -313,19 +313,24 @@ func RmApp(dir string, uuid *types.UUID, usesOverlay bool, appName *types.ACName
 		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
 	}
 
-	args := []string{
-		uuid.String(),
-		appName.String(),
-		filepath.Join(common.Stage1RootfsPath(dir), eep),
-		strconv.Itoa(podPID),
-	}
+	if podPID > 0 {
+		// Call app-stop and app-rm entrypoint only if the pod is still running.
+		// Otherwise, there's not much we can do about it except unmounting/removing
+		// the file system.
+		args := []string{
+			uuid.String(),
+			appName.String(),
+			filepath.Join(common.Stage1RootfsPath(dir), eep),
+			strconv.Itoa(podPID),
+		}
 
-	if err := callEntrypoint(dir, appStopEntrypoint, args); err != nil {
-		return err
-	}
+		if err := callEntrypoint(dir, appStopEntrypoint, args); err != nil {
+			return err
+		}
 
-	if err := callEntrypoint(dir, appRmEntrypoint, args); err != nil {
-		return err
+		if err := callEntrypoint(dir, appRmEntrypoint, args); err != nil {
+			return err
+		}
 	}
 
 	appInfoDir := common.AppInfoPath(dir, *appName)

From 4e4e662572d2b82947ea0c7fbdac9cff3e6f67d7 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 19 Sep 2016 19:44:17 -0700
Subject: [PATCH 0802/1304] rkt status: Add '--format=json' flag to print json
 format for pods.

Also add annotations, startedAt in the json definition of the pod.
---
 lib/app.go    |  8 ++++----
 lib/pod.go    | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/types.go  |  4 ++++
 rkt/list.go   | 26 +++++++++++---------------
 rkt/status.go | 25 +++++++++++++++++++++++++
 5 files changed, 94 insertions(+), 19 deletions(-)
 create mode 100644 lib/pod.go

diff --git a/lib/app.go b/lib/app.go
index 54abdb3d30..97eb99a7fb 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -122,7 +122,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 					fmt.Fprintf(os.Stderr, "Cannot get GC marked time: %v", err)
 				}
 				if !t.IsZero() {
-					finishedAt := t.UnixNano()
+					finishedAt := t.Unix()
 					app.FinishedAt = &finishedAt
 				}
 			}
@@ -139,7 +139,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 	}
 
 	app.State = AppStateCreated
-	createdAt := fi.ModTime().UnixNano()
+	createdAt := fi.ModTime().Unix()
 	app.CreatedAt = &createdAt
 
 	// Check if the app is started.
@@ -152,7 +152,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 	}
 
 	app.State = AppStateRunning
-	startedAt := fi.ModTime().UnixNano()
+	startedAt := fi.ModTime().Unix()
 	app.StartedAt = &startedAt
 
 	// Check if the app is exited.
@@ -166,7 +166,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 	}
 
 	app.State = AppStateExited
-	finishedAt := fi.ModTime().UnixNano()
+	finishedAt := fi.ModTime().Unix()
 	app.FinishedAt = &finishedAt
 
 	// Read exit code.
diff --git a/lib/pod.go b/lib/pod.go
new file mode 100644
index 0000000000..f868bf14cb
--- /dev/null
+++ b/lib/pod.go
@@ -0,0 +1,50 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package rkt
+
+import pkgPod "github.com/coreos/rkt/pkg/pod"
+
+// NewPodFromInternalPod converts *pkgPod.Pod to *Pod
+func NewPodFromInternalPod(p *pkgPod.Pod) (*Pod, error) {
+	_, manifest, err := p.PodManifest()
+	if err != nil {
+		return nil, err
+	}
+
+	pod := &Pod{
+		UUID:        p.UUID.String(),
+		State:       p.State(),
+		Networks:    p.Nets,
+		Annotations: make(map[string]string),
+	}
+	for _, app := range manifest.Apps {
+		pod.AppNames = append(pod.AppNames, app.Name.String())
+	}
+	for _, anno := range manifest.Annotations {
+		pod.Annotations[anno.Name.String()] = anno.Value
+	}
+
+	startTime, err := p.StartTime()
+	if err != nil {
+		return nil, err
+	}
+
+	if !startTime.IsZero() {
+		startedAt := startTime.Unix()
+		pod.StartedAt = &startedAt
+	}
+
+	return pod, nil
+}
diff --git a/lib/types.go b/lib/types.go
index f29dcce999..85ac1338d4 100644
--- a/lib/types.go
+++ b/lib/types.go
@@ -72,5 +72,9 @@ type (
 		Networks []netinfo.NetInfo `json:"networks,omitempty"`
 		// AppNames are the names of the apps.
 		AppNames []string `json:"app_names,omitempty"`
+		// Annotations are annotations of the pod.
+		Annotations map[string]string `json:"annotations,omitempty"`
+		// The start time of the pod.
+		StartedAt *int64 `json:"started_at,omitempty"`
 	}
 )
diff --git a/rkt/list.go b/rkt/list.go
index 5effd2faa4..776f9e134f 100644
--- a/rkt/list.go
+++ b/rkt/list.go
@@ -26,7 +26,7 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/lastditch"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/lib"
+	lib "github.com/coreos/rkt/lib"
 	"github.com/coreos/rkt/networking/netinfo"
 	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/dustin/go-humanize"
@@ -66,9 +66,18 @@ func runList(cmd *cobra.Command, args []string) int {
 		}
 	}
 
-	var pods []*rkt.Pod
+	var pods []*lib.Pod
 
 	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeMostDirs, func(p *pkgPod.Pod) {
+		if flagFormat != "" {
+			pod, err := lib.NewPodFromInternalPod(p)
+			if err != nil {
+				errors = append(errors, err)
+			}
+			pods = append(pods, pod)
+			return
+		}
+
 		var pm schema.PodManifest
 		var err error
 
@@ -82,19 +91,6 @@ func runList(cmd *cobra.Command, args []string) int {
 				return
 			}
 			pm = *manifest
-
-			if flagFormat != "" {
-				pod := &rkt.Pod{
-					UUID:     p.UUID.String(),
-					State:    podState,
-					Networks: p.Nets,
-				}
-				for _, app := range pm.Apps {
-					pod.AppNames = append(pod.AppNames, app.Name.String())
-				}
-				pods = append(pods, pod)
-				return
-			}
 		}
 
 		type printedApp struct {
diff --git a/rkt/status.go b/rkt/status.go
index 40a4f3a415..a0104dd33f 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -17,9 +17,11 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"time"
 
+	lib "github.com/coreos/rkt/lib"
 	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 )
@@ -44,6 +46,7 @@ const (
 func init() {
 	cmdRkt.AddCommand(cmdStatus)
 	cmdStatus.Flags().BoolVar(&flagWait, "wait", false, "toggle waiting for the pod to exit")
+	cmdStatus.Flags().StringVar(&flagFormat, "format", "", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
 }
 
 func runStatus(cmd *cobra.Command, args []string) (exit int) {
@@ -94,6 +97,28 @@ func getExitStatuses(p *pkgPod.Pod) (map[string]int, error) {
 
 // printStatus prints the pod's pid and per-app status codes
 func printStatus(p *pkgPod.Pod) error {
+	if flagFormat != "" {
+		pod, err := lib.NewPodFromInternalPod(p)
+		if err != nil {
+			return fmt.Errorf("error converting pod: %v", err)
+		}
+		switch flagFormat {
+		case "json":
+			result, err := json.Marshal(pod)
+			if err != nil {
+				return fmt.Errorf("error marshaling the pod: %v", err)
+			}
+			stdout.Print(string(result))
+		case "json-pretty":
+			result, err := json.MarshalIndent(pod, "", "\t")
+			if err != nil {
+				return fmt.Errorf("error marshaling the pod: %v", err)
+			}
+			stdout.Print(string(result))
+		}
+		return nil
+	}
+
 	state := p.State()
 	stdout.Printf("state=%s", state)
 

From f2c70f0f875685ac7a4071d5c92658832b336e7a Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Fri, 16 Sep 2016 12:40:23 +0200
Subject: [PATCH 0803/1304] cri: Prepare isolators

---
 stage0/app.go | 50 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/stage0/app.go b/stage0/app.go
index 1bf8e67b2d..e838af9ab6 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -57,12 +57,18 @@ type StopConfig struct {
 }
 
 // TODO(iaguis): add override options for Exec, Environment (à la patch-manifest)
-func AddApp(cfg RunConfig, dir string, img *types.Hash) error {
-	im, err := cfg.Store.GetImageManifest(img.String())
+func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) error {
+	// there should be only one app in the config
+	app := pcfg.Apps.Last()
+	if app == nil {
+		return errors.New("no image specified")
+	}
+
+	am, err := cfg.Store.GetImageManifest(img.String())
 	if err != nil {
 		return err
 	}
-	appName, err := imageNameToAppName(im.Name)
+	appName, err := imageNameToAppName(am.Name)
 	if err != nil {
 		return err
 	}
@@ -90,8 +96,8 @@ func AddApp(cfg RunConfig, dir string, img *types.Hash) error {
 	if pm.Apps.Get(*appName) != nil {
 		return fmt.Errorf("error: multiple apps with name %s", *appName)
 	}
-	if im.App == nil {
-		return fmt.Errorf("error: image %s has no app section)", img)
+	if am.App == nil && app.Exec == "" {
+		return fmt.Errorf("error: image %s has no app section and --exec argument is not provided", img)
 	}
 
 	appInfoDir := common.AppInfoPath(dir, *appName)
@@ -170,13 +176,39 @@ func AddApp(cfg RunConfig, dir string, img *types.Hash) error {
 
 	ra := schema.RuntimeApp{
 		Name: *appName,
-		App:  im.App,
+		App:  am.App,
 		Image: schema.RuntimeImage{
-			Name:   &im.Name,
+			Name:   &am.Name,
 			ID:     *img,
-			Labels: im.Labels,
+			Labels: am.Labels,
 		},
-		// TODO(iaguis): default isolators
+	}
+
+	if execOverride := app.Exec; execOverride != "" {
+		// Create a minimal App section if not present
+		if am.App == nil {
+			ra.App = &types.App{
+				User:  strconv.Itoa(os.Getuid()),
+				Group: strconv.Itoa(os.Getgid()),
+			}
+		}
+		ra.App.Exec = []string{execOverride}
+	}
+
+	if execAppends := app.Args; execAppends != nil {
+		ra.App.Exec = append(ra.App.Exec, execAppends...)
+	}
+
+	if err := prepareIsolators(app, ra.App); err != nil {
+		return err
+	}
+
+	if user := app.User; user != "" {
+		ra.App.User = user
+	}
+
+	if group := app.Group; group != "" {
+		ra.App.Group = group
 	}
 
 	env := ra.App.Environment

From fe396ff75b4ed98c1b87b9879fa980f977893d8e Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Mon, 19 Sep 2016 16:59:53 +0200
Subject: [PATCH 0804/1304] stage1: mount cgroup knobs RW for new app

---
 common/cgroup/cgroup.go       | 54 +++++++++++++++++++++++++++++++++++
 stage1/app-start/app-start.go | 34 +++++++++++++++++-----
 2 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index a9fa04ef06..62dfac0055 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -23,6 +23,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -401,6 +402,59 @@ func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup st
 	return mountFsRO(sysPath)
 }
 
+// RemountCgroupKnobsRW remounts the needed knobs in the subcgroup for one
+// specified app read-write so the systemd inside stage1 can apply isolators
+// to them.
+func RemountCgroupKnobsRW(enabledCgroups map[int][]string, subcgroup string, serviceName string, enterCmd []string) error {
+	controllers := GetControllerDirs(enabledCgroups)
+
+	// Mount RW knobs we need to make the enabled isolators work
+	for _, c := range controllers {
+		cPath := filepath.Join("/sys/fs/cgroup", c)
+		subcgroupPath := filepath.Join(cPath, subcgroup, "system.slice")
+
+		// Create cgroup directories and mount the files we need over
+		// themselves so they stay read-write
+		appCgroup := filepath.Join(subcgroupPath, serviceName)
+		if err := os.MkdirAll(appCgroup, 0755); err != nil {
+			return err
+		}
+		for _, f := range getControllerRWFiles(c) {
+			cgroupFilePath := filepath.Join(appCgroup, f)
+			// the file may not be there if kernel doesn't support the
+			// feature, skip it in that case
+			if _, err := os.Stat(cgroupFilePath); os.IsNotExist(err) {
+				continue
+			}
+
+			// Go applications cannot be  reassociated  with a new mount
+			// namespace because they are multithreaded. Instead of
+			// syscall.Mount, uses the enter entrypoint.
+			argsMountBind := append(enterCmd, "/bin/mount", "--bind", cgroupFilePath, cgroupFilePath)
+			cmdMountBind := exec.Cmd{
+				Path: argsMountBind[0],
+				Args: argsMountBind,
+			}
+
+			if err := cmdMountBind.Run(); err != nil {
+				return err
+			}
+
+			argsRemountRW := append(enterCmd, "/bin/mount", "-o", "remount,bind,rw", cgroupFilePath)
+			cmdRemountRW := exec.Cmd{
+				Path: argsRemountRW[0],
+				Args: argsRemountRW,
+			}
+
+			if err := cmdRemountRW.Run(); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
 func mountFsRO(mountPoint string) error {
 	var flags uintptr = syscall.MS_BIND |
 		syscall.MS_REMOUNT |
diff --git a/stage1/app-start/app-start.go b/stage1/app-start/app-start.go
index 53827118ea..439951ee24 100644
--- a/stage1/app-start/app-start.go
+++ b/stage1/app-start/app-start.go
@@ -22,6 +22,9 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path/filepath"
+
+	"github.com/coreos/rkt/common/cgroup"
 
 	rktlog "github.com/coreos/rkt/pkg/log"
 	stage1types "github.com/coreos/rkt/stage1/common/types"
@@ -72,7 +75,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	enterEP := flag.Arg(2)
+	enterCmd := []string{flag.Arg(2)}
+	enterCmd = append(enterCmd, fmt.Sprintf("--pid=%s", flag.Arg(3)), "--")
 
 	root := "."
 	p, err := stage1types.LoadPod(root, uuid)
@@ -97,6 +101,26 @@ func main() {
 		ra.App.WorkingDirectory = "/"
 	}
 
+	/* prepare cgroups */
+	enabledCgroups, err := cgroup.GetEnabledCgroups()
+	if err != nil {
+		log.FatalE("error getting cgroups", err)
+		os.Exit(1)
+	}
+	b, err := ioutil.ReadFile(filepath.Join(p.Root, "subcgroup"))
+	if err == nil {
+		subcgroup := string(b)
+		serviceName := stage1initcommon.ServiceUnitName(ra.Name)
+
+		if err := cgroup.RemountCgroupKnobsRW(enabledCgroups, subcgroup, serviceName, enterCmd); err != nil {
+			log.FatalE("error restricting container cgroups", err)
+			os.Exit(1)
+		}
+	} else {
+		log.PrintE("continuing with per-app isolators disabled", err)
+	}
+
+	/* write service file */
 	binPath, err := stage1initcommon.FindBinPath(p, ra)
 	if err != nil {
 		log.PrintE("failed to find bin path", err)
@@ -119,9 +143,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	args := []string{enterEP}
-
-	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args := enterCmd
 	args = append(args, "/usr/bin/systemctl")
 	args = append(args, "daemon-reload")
 
@@ -135,9 +157,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	args = []string{enterEP}
-
-	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args = enterCmd
 	args = append(args, "/usr/bin/systemctl")
 	args = append(args, "start")
 	args = append(args, appName.String())

From d48c521994283f5536652c0f6ea069ffb0c747bd Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 20 Sep 2016 15:32:27 +0200
Subject: [PATCH 0805/1304] stage1: add mount/umount in all flavors

---
 stage1/init/init.go                                | 10 ++++++++++
 .../manifest-amd64-usr.d/systemd.manifest          |  1 +
 .../manifest-arm64-usr.d/systemd.manifest          |  1 +
 stage1/usr_from_src/mount.mk                       | 14 ++++++++++++++
 stage1/usr_from_src/usr_from_src.mk                |  1 +
 5 files changed, 27 insertions(+)
 create mode 100644 stage1/usr_from_src/mount.mk

diff --git a/stage1/init/init.go b/stage1/init/init.go
index e25af377ce..de8012dc22 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -193,6 +193,14 @@ func installAssets() error {
 	if err != nil {
 		return err
 	}
+	mountBin, err := common.LookupPath("mount", os.Getenv("PATH"))
+	if err != nil {
+		return err
+	}
+	umountBin, err := common.LookupPath("umount", os.Getenv("PATH"))
+	if err != nil {
+		return err
+	}
 	// More paths could be added in that list if some Linux distributions install it in a different path
 	// Note that we look in /usr/lib/... first because of the merge:
 	// http://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/
@@ -216,6 +224,8 @@ func installAssets() error {
 		proj2aci.GetAssetString("/usr/bin/systemd-sysusers", systemdSysusersBin),
 		proj2aci.GetAssetString("/usr/lib/systemd/systemd-journald", systemdJournaldBin),
 		proj2aci.GetAssetString("/usr/bin/bash", bashBin),
+		proj2aci.GetAssetString("/bin/mount", mountBin),
+		proj2aci.GetAssetString("/bin/umount", umountBin),
 		proj2aci.GetAssetString(fmt.Sprintf("%s/systemd-journald.service", systemdUnitsPath), fmt.Sprintf("%s/systemd-journald.service", systemdUnitsPath)),
 		proj2aci.GetAssetString(fmt.Sprintf("%s/systemd-journald.socket", systemdUnitsPath), fmt.Sprintf("%s/systemd-journald.socket", systemdUnitsPath)),
 		proj2aci.GetAssetString(fmt.Sprintf("%s/systemd-journald-dev-log.socket", systemdUnitsPath), fmt.Sprintf("%s/systemd-journald-dev-log.socket", systemdUnitsPath)),
diff --git a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
index be867bab29..bbed2987a1 100644
--- a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
@@ -1,6 +1,7 @@
 bin/coredumpctl
 bin/journalctl
 bin/mount
+bin/umount
 bin/systemctl
 bin/systemd-analyze
 bin/systemd-ask-password
diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
index 47d87b73b9..ad9ca299b7 100644
--- a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
@@ -2,6 +2,7 @@ bin/bash
 bin/coredumpctl
 bin/journalctl
 bin/mount
+bin/umount
 bin/systemctl
 bin/systemd-analyze
 bin/systemd-ask-password
diff --git a/stage1/usr_from_src/mount.mk b/stage1/usr_from_src/mount.mk
new file mode 100644
index 0000000000..6f263f8f38
--- /dev/null
+++ b/stage1/usr_from_src/mount.mk
@@ -0,0 +1,14 @@
+$(call setup-stamp-file,UFSM_STAMP)
+UFSM_MOUNT_ON_ACI := $(S1_RF_ACIROOTFSDIR)/usr/bin/mount
+UFSM_UMOUNT_ON_ACI := $(S1_RF_ACIROOTFSDIR)/usr/bin/umount
+
+S1_RF_SECONDARY_STAMPS += $(UFSM_STAMP)
+S1_RF_INSTALL_FILES += /bin/mount:$(UFSM_MOUNT_ON_ACI):-
+S1_RF_INSTALL_FILES += /bin/umount:$(UFSM_UMOUNT_ON_ACI):-
+S1_RF_INSTALL_DIRS += $(S1_RF_ACIROOTFSDIR)/usr/bin:-
+S1_RF_INSTALL_SYMLINKS += usr/bin:$(S1_RF_ACIROOTFSDIR)/bin
+
+$(call generate-stamp-rule,$(UFSM_STAMP),$(UFSM_MOUNT_ON_ACI),$(S1_RF_ACIROOTFSDIR)/bin)
+# TODO(krzesimir): add a stamp for umount
+
+$(call undefine-namespaces,UFSM)
diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index 9aa259c3f5..8fb3ab3cb3 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -80,6 +80,7 @@ CLEAN_DIRS += \
 CLEAN_SYMLINKS += $(S1_RF_ACIROOTFSDIR)/flavor
 
 $(call inc-one,bash.mk)
+$(call inc-one,mount.mk)
 $(call inc-one,libnss.mk)
 
 # this makes sure everything is done - ACI rootfs is populated,

From 3d1c6e161c05d7724a067cbc718525d767044c3c Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 21 Sep 2016 13:47:00 +0200
Subject: [PATCH 0806/1304] cgroup: resolve merge conflict

---
 common/cgroup/cgroup.go       | 4 ++--
 stage1/app-start/app-start.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index 62dfac0055..3cb864674b 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -406,7 +406,7 @@ func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup st
 // specified app read-write so the systemd inside stage1 can apply isolators
 // to them.
 func RemountCgroupKnobsRW(enabledCgroups map[int][]string, subcgroup string, serviceName string, enterCmd []string) error {
-	controllers := GetControllerDirs(enabledCgroups)
+	controllers := GetV1ControllerDirs(enabledCgroups)
 
 	// Mount RW knobs we need to make the enabled isolators work
 	for _, c := range controllers {
@@ -419,7 +419,7 @@ func RemountCgroupKnobsRW(enabledCgroups map[int][]string, subcgroup string, ser
 		if err := os.MkdirAll(appCgroup, 0755); err != nil {
 			return err
 		}
-		for _, f := range getControllerRWFiles(c) {
+		for _, f := range getV1ControllerRWFiles(c) {
 			cgroupFilePath := filepath.Join(appCgroup, f)
 			// the file may not be there if kernel doesn't support the
 			// feature, skip it in that case
diff --git a/stage1/app-start/app-start.go b/stage1/app-start/app-start.go
index 439951ee24..ee5d5ecc32 100644
--- a/stage1/app-start/app-start.go
+++ b/stage1/app-start/app-start.go
@@ -102,7 +102,7 @@ func main() {
 	}
 
 	/* prepare cgroups */
-	enabledCgroups, err := cgroup.GetEnabledCgroups()
+	enabledCgroups, err := cgroup.GetEnabledV1Cgroups()
 	if err != nil {
 		log.FatalE("error getting cgroups", err)
 		os.Exit(1)

From c37e6b81f6772f31e80f8cd591b7a566d500324e Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Wed, 21 Sep 2016 15:32:45 +0200
Subject: [PATCH 0807/1304] CRI: Allow the pod sandbox to accept port forwards

Fixes: #3156
---
 common/networking/doc.go   |  17 +++++
 common/networking/ports.go | 119 ++++++++++++++++++++++++++++++++++
 networking/kvm.go          |  10 ++-
 networking/networking.go   |  11 +++-
 networking/portfwd.go      | 129 ++++++++++++++++++++++++-------------
 5 files changed, 236 insertions(+), 50 deletions(-)
 create mode 100644 common/networking/doc.go
 create mode 100644 common/networking/ports.go

diff --git a/common/networking/doc.go b/common/networking/doc.go
new file mode 100644
index 0000000000..86c98648a4
--- /dev/null
+++ b/common/networking/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// networking is the package that implements small functionality shared
+// between state0 and stage1.
+package networking
diff --git a/common/networking/ports.go b/common/networking/ports.go
new file mode 100644
index 0000000000..ce703d691c
--- /dev/null
+++ b/common/networking/ports.go
@@ -0,0 +1,119 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package networking
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+// ForwardedPort describes a port that will be
+// forwarded (mapped) from the host to the pod
+type ForwardedPort struct {
+	PodPort  types.Port
+	HostPort types.ExposedPort
+}
+
+// findAppPort looks through the manifest to find a port with a given name.
+// If multiple apps expose the same port name, it will fail
+func findAppPort(manifest *schema.PodManifest, portName types.ACName) (*types.Port, error) {
+	var foundPort *types.Port
+
+	for _, app := range manifest.Apps {
+		for _, port := range app.App.Ports {
+			if portName == port.Name {
+				if foundPort != nil { // error: ambiguous
+					return nil, fmt.Errorf("port name %q defined multiple apps", portName)
+				}
+				p := port // duplicate b/c port gets overwritten
+				foundPort = &p
+			}
+		}
+	}
+	return foundPort, nil
+}
+
+// ForwardedPorts matches up ExposedPorts (host ports) with Ports on the app side.
+// By default, it tries to match up by name - apps expose ports, and the podspec
+// maps them. The podspec can also map from host to pod, without a corresponding app
+// (which is needed for CRI)
+// This will error if:
+// - a name is ambiguous
+// - the same port:proto combination is forwarded
+func ForwardedPorts(manifest *schema.PodManifest) ([]ForwardedPort, error) {
+	var fps []ForwardedPort
+	var err error
+
+	// For every ExposedPort, find its corresponding PodPort
+	for _, ep := range manifest.Ports {
+		podPort := ep.PodPort
+
+		// If there is no direct mapping, search for the port by name
+		if podPort == nil {
+			podPort, err = findAppPort(manifest, ep.Name)
+			if err != nil {
+				return nil, err
+			}
+			if podPort == nil {
+				return nil, fmt.Errorf("port name %q could not be found in any apps", ep.Name)
+			}
+		}
+		fp := ForwardedPort{
+			HostPort: ep,
+			PodPort:  *podPort,
+		}
+		fp.HostPort.PodPort = &fp.PodPort
+		if fp.HostPort.HostIP == nil {
+			fp.HostPort.HostIP = net.IPv4(0, 0, 0, 0)
+		}
+
+		// Check all already-existing ports for conflicts
+		for idx := range fps {
+			if fp.conflicts(&fps[idx]) {
+				return nil, fmt.Errorf("port %s-%s:%d already mapped to pod port %d",
+					fp.PodPort.Protocol, fp.HostPort.HostIP.String(), fp.HostPort.HostPort, fps[idx].PodPort.Port)
+			}
+		}
+
+		fps = append(fps, fp)
+	}
+	return fps, nil
+}
+
+// conflicts checks if two ports conflict with each other
+func (fp *ForwardedPort) conflicts(fp1 *ForwardedPort) bool {
+	if fp.PodPort.Protocol != fp1.PodPort.Protocol {
+		return false
+	}
+
+	if fp.HostPort.HostPort != fp1.HostPort.HostPort {
+		return false
+	}
+
+	// If either port has the 0.0.0.0 address, they conflict
+	zeroAddr := net.IPv4(0, 0, 0, 0)
+	if fp.HostPort.HostIP.Equal(zeroAddr) || fp1.HostPort.HostIP.Equal(zeroAddr) {
+		return true
+	}
+
+	if fp.HostPort.HostIP.Equal(fp1.HostPort.HostIP) {
+		return true
+	}
+
+	return false
+}
diff --git a/networking/kvm.go b/networking/kvm.go
index aa3c6fb3ae..1e702a6450 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -38,6 +38,7 @@ import (
 	"github.com/vishvananda/netlink"
 
 	"github.com/coreos/rkt/common"
+	commonnet "github.com/coreos/rkt/common/networking"
 	"github.com/coreos/rkt/networking/tuntap"
 )
 
@@ -433,7 +434,7 @@ func kvmTransformFlannelNetwork(net *activeNet) error {
 
 // kvmSetup prepare new Networking to be used in kvm environment based on tuntap pair interfaces
 // to allow communication with virtual machine created by lkvm tool
-func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common.NetList, localConfig string, noDNS bool) (*Networking, error) {
+func kvmSetup(podRoot string, podID types.UUID, fps []commonnet.ForwardedPort, netList common.NetList, localConfig string, noDNS bool) (*Networking, error) {
 	network := Networking{
 		podEnv: podEnv{
 			podRoot:      podRoot,
@@ -628,7 +629,12 @@ func kvmSetup(podRoot string, podID types.UUID, fps []ForwardedPort, netList com
 	if err != nil {
 		return nil, err
 	}
+	if err := network.setupForwarding(); err != nil {
+		network.teardownForwarding()
+		return nil, err
+	}
 	if err := network.forwardPorts(fps, podIP); err != nil {
+		network.teardownForwarding()
 		return nil, err
 	}
 
@@ -698,7 +704,7 @@ func (n *Networking) teardownKvmNets() {
 // similar to Networking.Teardown but without host namespaces
 func (n *Networking) kvmTeardown() {
 
-	if err := n.unforwardPorts(); err != nil {
+	if err := n.teardownForwarding(); err != nil {
 		stderr.PrintE("error removing forwarded ports (kvm)", err)
 	}
 	n.teardownKvmNets()
diff --git a/networking/networking.go b/networking/networking.go
index 49e0af3a9e..2da07b08cc 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -31,6 +31,7 @@ import (
 	"github.com/vishvananda/netlink"
 
 	"github.com/coreos/rkt/common"
+	commonnet "github.com/coreos/rkt/common/networking"
 	"github.com/coreos/rkt/networking/netinfo"
 	"github.com/coreos/rkt/pkg/log"
 
@@ -62,7 +63,7 @@ var stderr *log.Logger
 
 // Setup creates a new networking namespace and executes network plugins to
 // set up networking. It returns in the new pod namespace
-func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common.NetList, localConfig, flavor string, noDNS, debug bool) (*Networking, error) {
+func Setup(podRoot string, podID types.UUID, fps []commonnet.ForwardedPort, netList common.NetList, localConfig, flavor string, noDNS, debug bool) (*Networking, error) {
 
 	stderr = log.New(os.Stderr, "networking", debug)
 
@@ -105,8 +106,12 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 		if err != nil {
 			return nil, err
 		}
+		if err := n.setupForwarding(); err != nil {
+			n.teardownForwarding()
+			return nil, err
+		}
 		if err := n.forwardPorts(fps, podIP); err != nil {
-			n.unforwardPorts()
+			n.teardownForwarding()
 			return nil, err
 		}
 	}
@@ -269,7 +274,7 @@ func (n *Networking) Teardown(flavor string, debug bool) {
 		return
 	}
 
-	if err := n.unforwardPorts(); err != nil {
+	if err := n.teardownForwarding(); err != nil {
 		stderr.PrintE("error removing forwarded ports", err)
 	}
 
diff --git a/networking/portfwd.go b/networking/portfwd.go
index 3eb1bf4110..74021d8370 100644
--- a/networking/portfwd.go
+++ b/networking/portfwd.go
@@ -20,14 +20,13 @@ import (
 	"strconv"
 
 	"github.com/coreos/go-iptables/iptables"
+
+	commonnet "github.com/coreos/rkt/common/networking"
 )
 
-// ForwardedPort describes a port that will be
-// forwarded (mapped) from the host to the pod
-type ForwardedPort struct {
-	Protocol string
-	HostPort uint
-	PodPort  uint
+type iptablesRule struct {
+	Chain string
+	Rule  []string
 }
 
 // GetForwardableNet iterates through all loaded networks and returns either
@@ -67,11 +66,8 @@ func (n *Networking) GetForwardableNetHostIP() (net.IP, error) {
 	return net.runtime.HostIP, nil
 }
 
-func (e *podEnv) forwardPorts(fps []ForwardedPort, podIP net.IP) error {
-	if len(fps) == 0 {
-		return nil
-	}
-
+// setupForwarding creates the iptables chains
+func (e *podEnv) setupForwarding() error {
 	ipt, err := iptables.New()
 	if err != nil {
 		return err
@@ -97,9 +93,9 @@ func (e *podEnv) forwardPorts(fps []ForwardedPort, podIP net.IP) error {
 		chain           string
 		customChainRule []string
 	}{
-		{"POSTROUTING", chainRuleSNAT}, // traffic originating from this host
+		{"POSTROUTING", chainRuleSNAT}, // traffic originating from this host from loopback
 		{"PREROUTING", chainRuleDNAT},  // outside traffic hitting this host
-		{"OUTPUT", chainRuleDNAT},      // traffic originating from this host
+		{"OUTPUT", chainRuleDNAT},      // traffic originating from this host on non-loopback
 	} {
 		exists, err := ipt.Exists("nat", entry.chain, entry.customChainRule...)
 		if err != nil {
@@ -112,38 +108,23 @@ func (e *podEnv) forwardPorts(fps []ForwardedPort, podIP net.IP) error {
 			}
 		}
 	}
+	return nil
+}
 
-	for _, p := range fps {
-
-		socketPod := fmt.Sprintf("%v:%v", podIP, p.PodPort)
-		dstPortHost := strconv.Itoa(int(p.HostPort))
-		dstPortPod := strconv.Itoa(int(p.PodPort))
-
-		for _, r := range []struct {
-			chain string
-			rule  []string
-		}{
-			{ // Rewrite the destination
-				chainDNAT,
-				[]string{
-					"-p", p.Protocol,
-					"--dport", dstPortHost,
-					"-j", "DNAT",
-					"--to-destination", socketPod,
-				},
-			},
-			{ // Rewrite the source for connections to localhost on the host
-				chainSNAT,
-				[]string{
-					"-p", p.Protocol,
-					"-s", "127.0.0.1",
-					"-d", podIP.String(),
-					"--dport", dstPortPod,
-					"-j", "MASQUERADE",
-				},
-			},
-		} {
-			if err := ipt.AppendUnique("nat", r.chain, r.rule...); err != nil {
+func (e *podEnv) forwardPorts(fps []commonnet.ForwardedPort, podIP net.IP) error {
+	if len(fps) == 0 {
+		return nil
+	}
+	ipt, err := iptables.New()
+	if err != nil {
+		return err
+	}
+	chainDNAT := e.portFwdChain("DNAT")
+	chainSNAT := e.portFwdChain("SNAT")
+
+	for _, fp := range fps {
+		for _, r := range portRules(fp, podIP, chainDNAT, chainSNAT) {
+			if err := ipt.AppendUnique("nat", r.Chain, r.Rule...); err != nil {
 				return err
 			}
 		}
@@ -151,7 +132,63 @@ func (e *podEnv) forwardPorts(fps []ForwardedPort, podIP net.IP) error {
 	return nil
 }
 
-func (e *podEnv) unforwardPorts() error {
+func (e *podEnv) unforwardPorts(fps []commonnet.ForwardedPort, podIP net.IP) error {
+	if len(fps) == 0 {
+		return nil
+	}
+
+	ipt, err := iptables.New()
+	if err != nil {
+		return err
+	}
+	chainDNAT := e.portFwdChain("DNAT")
+	chainSNAT := e.portFwdChain("SNAT")
+
+	for _, fp := range fps {
+		for _, r := range portRules(fp, podIP, chainDNAT, chainSNAT) {
+			if err := ipt.Delete("nat", r.Chain, r.Rule...); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func portRules(fp commonnet.ForwardedPort, podIP net.IP, chainDNAT, chainSNAT string) []iptablesRule {
+	socketPod := fmt.Sprintf("%v:%v", podIP, fp.PodPort.Port)
+	dstPortHost := strconv.Itoa(int(fp.HostPort.HostPort))
+	dstPortPod := strconv.Itoa(int(fp.PodPort.Port))
+	dstIPHost := fp.HostPort.HostIP.String()
+
+	if fp.HostPort.HostIP == nil || dstIPHost == "0.0.0.0" {
+		dstIPHost = "0.0.0.0/0"
+	}
+
+	return []iptablesRule{
+		{ // nat the destination
+			chainDNAT,
+			[]string{
+				"-d", dstIPHost,
+				"-p", fp.PodPort.Protocol,
+				"--dport", dstPortHost,
+				"-j", "DNAT",
+				"--to-destination", socketPod,
+			},
+		},
+		{ // Rewrite the source for connections to localhost on the host
+			chainSNAT,
+			[]string{
+				"-p", fp.PodPort.Protocol,
+				"-s", "127.0.0.1",
+				"-d", podIP.String(),
+				"--dport", dstPortPod,
+				"-j", "MASQUERADE",
+			},
+		},
+	}
+}
+
+func (e *podEnv) teardownForwarding() error {
 	ipt, err := iptables.New()
 	if err != nil {
 		return err
@@ -187,6 +224,8 @@ func (e *podEnv) unforwardPorts() error {
 	return nil
 }
 
+// portFwdChain generates the *name* of the chain for pod port forwarding.
+// This name must be stable.
 func (e *podEnv) portFwdChain(name string) string {
 	return fmt.Sprintf("RKT-PFWD-%s-%s", name, e.podID.String()[0:8])
 }

From 70d5ed8151496dbedf125200a697e3c238a11ea0 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Wed, 21 Sep 2016 15:33:05 +0200
Subject: [PATCH 0808/1304] run: allow port forwards *from* a specific IP

Fixes: #2252
---
 rkt/run.go                   | 21 +++++++++++++-----
 stage0/run.go                | 11 ++++++++++
 stage1/init/init.go          | 42 ++----------------------------------
 tests/rkt_net_nspawn_test.go |  2 ++
 tests/rkt_net_test.go        | 26 +++++++++++-----------
 5 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/rkt/run.go b/rkt/run.go
index d5750dcc93..a615a18f7d 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -111,7 +111,7 @@ func init() {
 	*/
 
 	addStage1ImageFlags(cmdRun.Flags())
-	cmdRun.Flags().Var(&flagPorts, "port", "ports to expose on the host (requires contained network). Syntax: --port=NAME:HOSTPORT")
+	cmdRun.Flags().Var(&flagPorts, "port", "ports to expose on the host (requires contained network). Syntax: --port=NAME:[HOSTIP:]HOSTPORT")
 	cmdRun.Flags().Var(&flagNet, "net", "configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. Syntax: --net[=n[:args], ...]")
 	cmdRun.Flags().Lookup("net").NoOptDefVal = "default"
 	cmdRun.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
@@ -387,9 +387,9 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 type portList []types.ExposedPort
 
 func (pl *portList) Set(s string) error {
-	parts := strings.SplitN(s, ":", 2)
-	if len(parts) != 2 {
-		return fmt.Errorf("%q is not in name:port format", s)
+	parts := strings.SplitN(s, ":", 3)
+	if len(parts) < 2 {
+		return fmt.Errorf("%q is not in name:[ip:]port format", s)
 	}
 
 	name, err := types.NewACName(parts[0])
@@ -397,7 +397,17 @@ func (pl *portList) Set(s string) error {
 		return errwrap.Wrap(fmt.Errorf("%q is not a valid port name", parts[0]), err)
 	}
 
-	port, err := strconv.ParseUint(parts[1], 10, 16)
+	portStr := parts[1]
+	var ip net.IP
+	if len(parts) == 3 {
+		portStr = parts[2]
+		ip = net.ParseIP(parts[1])
+		if ip == nil {
+			return fmt.Errorf("%q is not a valid IP", parts[1])
+		}
+	}
+
+	port, err := strconv.ParseUint(portStr, 10, 16)
 	if err != nil {
 		return fmt.Errorf("%q is not a valid port number", parts[1])
 	}
@@ -405,6 +415,7 @@ func (pl *portList) Set(s string) error {
 	p := types.ExposedPort{
 		Name:     *name,
 		HostPort: uint(port),
+		HostIP:   ip,
 	}
 
 	*pl = append(*pl, p)
diff --git a/stage0/run.go b/stage0/run.go
index 767ddcea0d..99fc01a557 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -42,6 +42,7 @@ import (
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
+	commonnet "github.com/coreos/rkt/common/networking"
 	"github.com/coreos/rkt/common/overlay"
 	"github.com/coreos/rkt/pkg/aci"
 	"github.com/coreos/rkt/pkg/fileutil"
@@ -275,7 +276,12 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 	// TODO(jonboulle): check that app mountpoint expectations are
 	// satisfied here, rather than waiting for stage1
 	pm.Volumes = cfg.Apps.Volumes
+
+	// Check to see if ports have any errors
 	pm.Ports = cfg.Ports
+	if _, err := commonnet.ForwardedPorts(&pm); err != nil {
+		return nil, err
+	}
 
 	// TODO(sur): add to stage1-implementors-guide and to the spec
 	pm.Annotations = append(pm.Annotations, types.Annotation{
@@ -399,6 +405,11 @@ func validatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 			return nil, fmt.Errorf("no app section in the pod manifest or the image manifest")
 		}
 	}
+
+	// Validate forwarded ports
+	if _, err := commonnet.ForwardedPorts(&pm); err != nil {
+		return nil, err
+	}
 	return pmb, nil
 }
 
diff --git a/stage1/init/init.go b/stage1/init/init.go
index de8012dc22..fca8d9ed1b 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -46,6 +46,7 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
+	commonnet "github.com/coreos/rkt/common/networking"
 	"github.com/coreos/rkt/networking"
 	pkgflag "github.com/coreos/rkt/pkg/flag"
 	rktlog "github.com/coreos/rkt/pkg/log"
@@ -495,45 +496,6 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 	return args, env, nil
 }
 
-func forwardedPorts(pod *stage1commontypes.Pod) ([]networking.ForwardedPort, error) {
-	var fps []networking.ForwardedPort
-
-NextPort:
-	for _, ep := range pod.Manifest.Ports {
-		n := ""
-		fp := networking.ForwardedPort{}
-
-		for _, a := range pod.Manifest.Apps {
-			for _, p := range a.App.Ports {
-				if p.Name == ep.Name {
-					if n == "" {
-						// skip socket-activated ports, they don't need port forwarding
-						if p.SocketActivated {
-							continue NextPort
-						}
-						fp.Protocol = p.Protocol
-						fp.HostPort = ep.HostPort
-						fp.PodPort = p.Port
-						n = a.Name.String()
-					} else {
-						return nil, fmt.Errorf("ambiguous exposed port in PodManifest: %q and %q both define port %q", n, a.Name, p.Name)
-					}
-				}
-			}
-		}
-
-		if n == "" {
-			return nil, fmt.Errorf("port name %q is not defined by any apps", ep.Name)
-		}
-
-		fps = append(fps, fp)
-	}
-
-	// TODO(eyakubovich): validate that there're no conflicts
-
-	return fps, nil
-}
-
 func stage1() int {
 	uuid, err := types.NewUUID(flag.Arg(0))
 	if err != nil {
@@ -571,7 +533,7 @@ func stage1() int {
 
 	var n *networking.Networking
 	if netList.Contained() {
-		fps, err := forwardedPorts(p)
+		fps, err := commonnet.ForwardedPorts(p.Manifest)
 		if err != nil {
 			log.Error(err)
 			return 1
diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index 1d28d19bdf..bacac3078f 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -30,6 +30,8 @@ func TestNetPortFwdConnectivity(t *testing.T) {
 	NewNetPortFwdConnectivityTest(
 		defaultSamePortFwdCase,
 		defaultDiffPortFwdCase,
+		defaultSpecificIPFwdCase,
+		defaultSpecificIPFwdFailCase,
 		defaultLoSamePortFwdCase,
 		defaultLoDiffPortFwdCase,
 		bridgeSamePortFwdCase,
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index b56d2096ae..fe737dee60 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -361,6 +361,7 @@ func NewTestNetDefaultRestrictedConnectivity() testutils.Test {
 type PortFwdCase struct {
 	HttpGetIP     string
 	HttpServePort int
+	ListenAddress string
 	RktArg        string
 	ShouldSucceed bool
 }
@@ -368,10 +369,12 @@ type PortFwdCase struct {
 var (
 	bannedPorts = make(map[int]struct{}, 0)
 
-	defaultSamePortFwdCase   = PortFwdCase{"172.16.28.1", 0, "--net=default", true}
-	defaultDiffPortFwdCase   = PortFwdCase{"172.16.28.1", 1024, "--net=default", true}
-	defaultLoSamePortFwdCase = PortFwdCase{"127.0.0.1", 0, "--net=default", true}
-	defaultLoDiffPortFwdCase = PortFwdCase{"127.0.0.1", 1014, "--net=default", true}
+	defaultSamePortFwdCase       = PortFwdCase{"172.16.28.1", 0, "", "--net=default", true}
+	defaultDiffPortFwdCase       = PortFwdCase{"172.16.28.1", 1024, "", "--net=default", true}
+	defaultSpecificIPFwdCase     = PortFwdCase{"172.16.28.1", 1024, "172.16.28.1:", "--net=default", true}
+	defaultSpecificIPFwdFailCase = PortFwdCase{"127.0.0.1", 1024, "172.16.28.1:", "--net=default", false}
+	defaultLoSamePortFwdCase     = PortFwdCase{"127.0.0.1", 0, "", "--net=default", true}
+	defaultLoDiffPortFwdCase     = PortFwdCase{"127.0.0.1", 1014, "", "--net=default", true}
 
 	portFwdBridge = networkTemplateT{
 		Name:      "bridge1",
@@ -387,10 +390,10 @@ var (
 			},
 		},
 	}
-	bridgeSamePortFwdCase   = PortFwdCase{"11.11.5.1", 0, "--net=" + portFwdBridge.Name, true}
-	bridgeDiffPortFwdCase   = PortFwdCase{"11.11.5.1", 1024, "--net=" + portFwdBridge.Name, true}
-	bridgeLoSamePortFwdCase = PortFwdCase{"127.0.0.1", 0, "--net=" + portFwdBridge.Name, true}
-	bridgeLoDiffPortFwdCase = PortFwdCase{"127.0.0.1", 1024, "--net=" + portFwdBridge.Name, true}
+	bridgeSamePortFwdCase   = PortFwdCase{"11.11.5.1", 0, "", "--net=" + portFwdBridge.Name, true}
+	bridgeDiffPortFwdCase   = PortFwdCase{"11.11.5.1", 1024, "", "--net=" + portFwdBridge.Name, true}
+	bridgeLoSamePortFwdCase = PortFwdCase{"127.0.0.1", 0, "", "--net=" + portFwdBridge.Name, true}
+	bridgeLoDiffPortFwdCase = PortFwdCase{"127.0.0.1", 1024, "", "--net=" + portFwdBridge.Name, true}
 )
 
 func (ct PortFwdCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
@@ -418,8 +421,8 @@ func (ct PortFwdCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
 	defer os.Remove(testImage)
 
 	cmd := fmt.Sprintf(
-		"%s --debug --insecure-options=image run --port=http:%d %s --mds-register=false %s",
-		ctx.Cmd(), httpPort, ct.RktArg, testImage)
+		"%s --debug --insecure-options=image run --port=http:%s%d %s --mds-register=false %s",
+		ctx.Cmd(), ct.ListenAddress, httpPort, ct.RktArg, testImage)
 	child := spawnOrFail(t, cmd)
 
 	httpGetAddr := fmt.Sprintf("http://%v:%v", ct.HttpGetIP, httpPort)
@@ -448,8 +451,7 @@ func (ct PortFwdCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
 		case err == nil && !ct.ShouldSucceed:
 			ga.Fatalf("HTTP-Get to %q should have failed! But received %q", httpGetAddr, body)
 		case err != nil && !ct.ShouldSucceed:
-			child.Close()
-			fallthrough
+			t.Logf("HTTP-Get failed, as expected: %v", err)
 		default:
 			t.Logf("HTTP-Get received: %s", body)
 		}

From db210571994f94c51241babb6c38de6e69ac5a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20J=2E=20=C5=81akis?= <jacek.lakis@intel.com>
Date: Thu, 22 Sep 2016 10:11:56 +0200
Subject: [PATCH 0809/1304] kvm/init: remove condition for kvm mutable pods

---
 stage1/init/init.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index fca8d9ed1b..f040f587da 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -274,10 +274,6 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 			return nil, nil, fmt.Errorf("flag --private-users cannot be used with an lkvm stage1")
 		}
 
-		if mutable {
-			return nil, nil, fmt.Errorf("flag --mutable is not implemented in lkvm stage1")
-		}
-
 		// kernel and hypervisor binaries are located relative to the working directory
 		// of init (/var/lib/rkt/..../uuid)
 		// TODO: move to path.go

From 463fdbfb804a797d7b7a07cad53c8a90124ae199 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 21 Sep 2016 13:58:41 +0200
Subject: [PATCH 0810/1304] cri: don't remount cgroup knobs RW with cgroup2

---
 stage1/app-start/app-start.go | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/stage1/app-start/app-start.go b/stage1/app-start/app-start.go
index ee5d5ecc32..be51e09eaf 100644
--- a/stage1/app-start/app-start.go
+++ b/stage1/app-start/app-start.go
@@ -102,22 +102,29 @@ func main() {
 	}
 
 	/* prepare cgroups */
-	enabledCgroups, err := cgroup.GetEnabledV1Cgroups()
+	isUnified, err := cgroup.IsCgroupUnified("/")
 	if err != nil {
-		log.FatalE("error getting cgroups", err)
+		log.FatalE("failed to determine the cgroup version", err)
 		os.Exit(1)
 	}
-	b, err := ioutil.ReadFile(filepath.Join(p.Root, "subcgroup"))
-	if err == nil {
-		subcgroup := string(b)
-		serviceName := stage1initcommon.ServiceUnitName(ra.Name)
-
-		if err := cgroup.RemountCgroupKnobsRW(enabledCgroups, subcgroup, serviceName, enterCmd); err != nil {
-			log.FatalE("error restricting container cgroups", err)
+	if !isUnified {
+		enabledCgroups, err := cgroup.GetEnabledV1Cgroups()
+		if err != nil {
+			log.FatalE("error getting cgroups", err)
 			os.Exit(1)
 		}
-	} else {
-		log.PrintE("continuing with per-app isolators disabled", err)
+		b, err := ioutil.ReadFile(filepath.Join(p.Root, "subcgroup"))
+		if err == nil {
+			subcgroup := string(b)
+			serviceName := stage1initcommon.ServiceUnitName(ra.Name)
+
+			if err := cgroup.RemountCgroupKnobsRW(enabledCgroups, subcgroup, serviceName, enterCmd); err != nil {
+				log.FatalE("error restricting container cgroups", err)
+				os.Exit(1)
+			}
+		} else {
+			log.PrintE("continuing with per-app isolators disabled", err)
+		}
 	}
 
 	/* write service file */

From 6982a7342edbc2215115781983046e3251bbfd6c Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Mon, 19 Sep 2016 16:50:46 -0700
Subject: [PATCH 0811/1304] CRI: Add '--annotation' and '--label' flag for 'rkt
 app sandbox'.

This enables injecting user-defined pod level labels and annotations.
---
 lib/pod.go    | 23 +++++++++++++++++------
 lib/types.go  |  6 ++++--
 rkt/run.go    | 24 ++++++++++++------------
 stage0/run.go | 23 ++++++++++++++---------
 4 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/lib/pod.go b/lib/pod.go
index f868bf14cb..04d604dc0a 100644
--- a/lib/pod.go
+++ b/lib/pod.go
@@ -24,16 +24,27 @@ func NewPodFromInternalPod(p *pkgPod.Pod) (*Pod, error) {
 	}
 
 	pod := &Pod{
-		UUID:        p.UUID.String(),
-		State:       p.State(),
-		Networks:    p.Nets,
-		Annotations: make(map[string]string),
+		UUID:     p.UUID.String(),
+		State:    p.State(),
+		Networks: p.Nets,
 	}
+
 	for _, app := range manifest.Apps {
 		pod.AppNames = append(pod.AppNames, app.Name.String())
 	}
-	for _, anno := range manifest.Annotations {
-		pod.Annotations[anno.Name.String()] = anno.Value
+
+	if len(manifest.CRIAnnotations) > 0 {
+		pod.CRIAnnotations = make(map[string]string)
+		for name, value := range manifest.CRIAnnotations {
+			pod.CRIAnnotations[name] = value
+		}
+	}
+
+	if len(manifest.CRILabels) > 0 {
+		pod.CRILabels = make(map[string]string)
+		for name, value := range manifest.CRILabels {
+			pod.CRILabels[name] = value
+		}
 	}
 
 	startTime, err := p.StartTime()
diff --git a/lib/types.go b/lib/types.go
index 85ac1338d4..b66a3cd365 100644
--- a/lib/types.go
+++ b/lib/types.go
@@ -72,9 +72,11 @@ type (
 		Networks []netinfo.NetInfo `json:"networks,omitempty"`
 		// AppNames are the names of the apps.
 		AppNames []string `json:"app_names,omitempty"`
-		// Annotations are annotations of the pod.
-		Annotations map[string]string `json:"annotations,omitempty"`
 		// The start time of the pod.
 		StartedAt *int64 `json:"started_at,omitempty"`
+		// CRIAnnotations are the pod annotations used for CRI.
+		CRIAnnotations map[string]string `json:"cri_annotations,omitempty"`
+		// CRILabels are the pod labels used for CRI.
+		CRILabels map[string]string `json:"cri_labels,omitempty"`
 	}
 )
diff --git a/rkt/run.go b/rkt/run.go
index a615a18f7d..ae60b4d545 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -62,7 +62,7 @@ image arguments with a lone "---" to resume argument parsing.`,
 	flagNet          common.NetList
 	flagPrivateUsers bool
 	flagInheritEnv   bool
-	flagExplicitEnv  envMap
+	flagExplicitEnv  kvMap
 	flagEnvFromFile  envFileMap
 	flagInteractive  bool
 	flagDNS          flagStringList
@@ -117,7 +117,7 @@ func init() {
 	cmdRun.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
 	cmdRun.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
 	cmdRun.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
-	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for apps in the form name=value")
+	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for apps in the form key=value")
 	cmdRun.Flags().Var(&flagEnvFromFile, "set-env-file", "path to an environment variables file")
 	cmdRun.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively. If true, only one image may be supplied.")
 	cmdRun.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf. Pass 'host' to use host's resolv.conf. Pass 'none' to ignore CNI DNS config")
@@ -450,35 +450,35 @@ func (dns *flagStringList) Type() string {
 	return "flagStringList"
 }
 
-// envMap implements the flag.Value interface to contain a set of name=value mappings
-type envMap struct {
+// kvMap implements the flag.Value interface to contain a set of key=value mappings
+type kvMap struct {
 	mapping map[string]string
 }
 
-func (e *envMap) Set(s string) error {
+func (e *kvMap) Set(s string) error {
 	if e.mapping == nil {
 		e.mapping = make(map[string]string)
 	}
 	pair := strings.SplitN(s, "=", 2)
 	if len(pair) != 2 {
-		return fmt.Errorf("environment variable must be specified as name=value")
+		return fmt.Errorf("must be specified as key=value")
 	}
 	if _, exists := e.mapping[pair[0]]; exists {
-		return fmt.Errorf("environment variable %q already set", pair[0])
+		return fmt.Errorf("key %q already set", pair[0])
 	}
 	e.mapping[pair[0]] = pair[1]
 	return nil
 }
 
-func (e *envMap) IsEmpty() bool {
+func (e *kvMap) IsEmpty() bool {
 	return len(e.mapping) == 0
 }
 
-func (e *envMap) String() string {
+func (e *kvMap) String() string {
 	return strings.Join(e.Strings(), "\n")
 }
 
-func (e *envMap) Strings() []string {
+func (e *kvMap) Strings() []string {
 	var env []string
 	for n, v := range e.mapping {
 		env = append(env, n+"="+v)
@@ -486,8 +486,8 @@ func (e *envMap) Strings() []string {
 	return env
 }
 
-func (e *envMap) Type() string {
-	return "envMap"
+func (e *kvMap) Type() string {
+	return "kvMap"
 }
 
 // envFileMap
diff --git a/stage0/run.go b/stage0/run.go
index 99fc01a557..c8d7b3e6a6 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -61,15 +61,17 @@ var debugEnabled bool
 // PrepareConfig defines the configuration parameters required by Prepare
 type PrepareConfig struct {
 	*CommonConfig
-	Apps               *apps.Apps          // apps to prepare
-	InheritEnv         bool                // inherit parent environment into apps
-	ExplicitEnv        []string            // always set these environment variables for all the apps
-	EnvFromFile        []string            // environment variables loaded from files, set for all the apps
-	Ports              []types.ExposedPort // list of ports that rkt will expose on the host
-	UseOverlay         bool                // prepare pod with overlay fs
-	SkipTreeStoreCheck bool                // skip checking the treestore before rendering
-	PodManifest        string              // use the pod manifest specified by the user, this will ignore flags such as '--volume', '--port', etc.
-	PrivateUsers       *user.UidRange      // User namespaces
+	Apps               *apps.Apps           // apps to prepare
+	InheritEnv         bool                 // inherit parent environment into apps
+	ExplicitEnv        []string             // always set these environment variables for all the apps
+	EnvFromFile        []string             // environment variables loaded from files, set for all the apps
+	Ports              []types.ExposedPort  // list of ports that rkt will expose on the host
+	UseOverlay         bool                 // prepare pod with overlay fs
+	SkipTreeStoreCheck bool                 // skip checking the treestore before rendering
+	PodManifest        string               // use the pod manifest specified by the user, this will ignore flags such as '--volume', '--port', etc.
+	PrivateUsers       *user.UidRange       // user namespaces
+	CRIAnnotations     types.CRIAnnotations // CRI annotations for the pod.
+	CRILabels          types.CRILabels      // CRI labels for the pod.
 }
 
 // RunConfig defines the configuration parameters needed by Run
@@ -289,6 +291,9 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		Value: strconv.FormatBool(cfg.Mutable),
 	})
 
+	pm.CRIAnnotations = cfg.CRIAnnotations
+	pm.CRILabels = cfg.CRILabels
+
 	pmb, err := json.Marshal(pm)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error marshalling pod manifest"), err)

From 348facde19c8405d4dc3a0b8563fa15b7ca3c242 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 15 Sep 2016 18:07:16 -0700
Subject: [PATCH 0812/1304] CRI: Add '--name', '--annotation', '--label',
 '--environment' for 'rkt app add'.

---
 common/apps/apps.go |  28 ++++----
 lib/app.go          |  12 ++--
 lib/types.go        |   6 +-
 rkt/cli_apps.go     | 160 ++++++++++++++++++++++++++++++++++++++++----
 rkt/run.go          |   4 ++
 stage0/app.go       |  38 +++++++++--
 6 files changed, 209 insertions(+), 39 deletions(-)

diff --git a/common/apps/apps.go b/common/apps/apps.go
index 925d29c51a..4b01216ee6 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -45,18 +45,22 @@ const (
 )
 
 type App struct {
-	Image         string                            // the image reference as supplied by the user on the cli
-	ImType        AppImageType                      // the type of the image reference (to be guessed, url, path or hash)
-	Args          []string                          // any arguments the user supplied for this app
-	Asc           string                            // signature file override for image verification (if fetching occurs)
-	Exec          string                            // exec override for image
-	Mounts        []schema.Mount                    // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
-	MemoryLimit   *types.ResourceMemory             // memory isolator override
-	CPULimit      *types.ResourceCPU                // cpu isolator override
-	User, Group   string                            // user, group overrides
-	CapsRetain    *types.LinuxCapabilitiesRetainSet // os/linux/capabilities-retain-set overrides
-	CapsRemove    *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
-	SeccompFilter string                            // seccomp CLI overrides
+	Name           string                            // the name of the app. If not set, the the image's name will be used.
+	Image          string                            // the image reference as supplied by the user on the cli
+	ImType         AppImageType                      // the type of the image reference (to be guessed, url, path or hash)
+	Args           []string                          // any arguments the user supplied for this app
+	Asc            string                            // signature file override for image verification (if fetching occurs)
+	Exec           string                            // exec override for image
+	Mounts         []schema.Mount                    // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
+	MemoryLimit    *types.ResourceMemory             // memory isolator override
+	CPULimit       *types.ResourceCPU                // cpu isolator override
+	User, Group    string                            // user, group overrides
+	CapsRetain     *types.LinuxCapabilitiesRetainSet // os/linux/capabilities-retain-set overrides
+	CapsRemove     *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
+	SeccompFilter  string                            // seccomp CLI overrides
+	CRIAnnotations map[string]string                 // the CRI annotations of the app.
+	CRILabels      map[string]string                 // the CRI labels of the app.
+	Environments   map[string]string                 // the environments of the app.
 
 	// TODO(jonboulle): These images are partially-populated hashes, this should be clarified.
 	ImageID types.Hash // resolved image identifier
diff --git a/lib/app.go b/lib/app.go
index 97eb99a7fb..41991a9823 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -59,9 +59,10 @@ func AppsForPod(uuid, dataDir string, appName string) ([]*App, error) {
 // newApp constructs the App object with the runtime app and pod manifest.
 func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.Pod) (*App, error) {
 	app := &App{
-		Name:        ra.Name.String(),
-		ImageID:     ra.Image.ID.String(),
-		Annotations: make(map[string]string),
+		Name:           ra.Name.String(),
+		ImageID:        ra.Image.ID.String(),
+		CRIAnnotations: ra.App.CRIAnnotations,
+		CRILabels:      ra.App.CRILabels,
 	}
 
 	// Generate mounts
@@ -95,11 +96,6 @@ func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.
 		})
 	}
 
-	// Generate annotations.
-	for _, anno := range ra.Annotations {
-		app.Annotations[anno.Name.String()] = anno.Value
-	}
-
 	// Generate state.
 	if err := appState(app, pod); err != nil {
 		return nil, fmt.Errorf("error getting app's state: %v", err)
diff --git a/lib/types.go b/lib/types.go
index b66a3cd365..55879b2d68 100644
--- a/lib/types.go
+++ b/lib/types.go
@@ -58,8 +58,10 @@ type (
 		ImageID string `json:"image_id"`
 		// Mount points of the container.
 		Mounts []*Mount `json:"mounts,omitempty"`
-		// Annotations of the container.
-		Annotations map[string]string `json:"annotations,omitempty"`
+		// CRIAnnotations of the container.
+		CRIAnnotations map[string]string `json:"cri_annotations,omitempty"`
+		// CRILabels of the container.
+		CRILabels map[string]string `json:"cri_labels,omitempty"`
 	}
 
 	// Pod defines the pod object.
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 1533f9c79a..f0925c41d4 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -151,6 +151,18 @@ func (ae *appExec) Set(s string) error {
 	return nil
 }
 
+func (ae *appExec) String() string {
+	app := (*apps.Apps)(ae).Last()
+	if app == nil {
+		return ""
+	}
+	return app.Exec
+}
+
+func (ae *appExec) Type() string {
+	return "appExec"
+}
+
 // appMount is for --mount flags in the form of: --mount volume=VOLNAME,target=PATH
 type appMount apps.Apps
 
@@ -193,19 +205,6 @@ func (al *appMount) Set(s string) error {
 	return nil
 }
 
-func (ae *appExec) String() string {
-	app := (*apps.Apps)(ae).Last()
-	if app == nil {
-		return ""
-	}
-	return app.Exec
-}
-
-func (ae *appExec) Type() string {
-	return "appExec"
-}
-
-// TODO(vc): --set-env should also be per-app and should implement the flags.Value interface.
 func (al *appMount) String() string {
 	var ms []string
 	for _, m := range ((*apps.Apps)(al)).Mounts {
@@ -440,3 +439,138 @@ func (au *appSeccompFilter) String() string {
 func (au *appSeccompFilter) Type() string {
 	return "appSeccompFilter"
 }
+
+// appName is for --name flags in the form of: --name=APPNAME.
+type appName apps.Apps
+
+func (au *appName) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--name must follow an image")
+	}
+	app.Name = s
+	return nil
+}
+
+func (au *appName) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	return app.Name
+}
+
+func (au *appName) Type() string {
+	return "appName"
+}
+
+// appAnnotation is for --annotation flags in the form of: --annotation=NAME=VALUE.
+type appAnnotation apps.Apps
+
+func (au *appAnnotation) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--annotation must follow an image")
+	}
+
+	fields := strings.SplitN(s, "=", 2)
+	if len(fields) != 2 {
+		return fmt.Errorf("invalid format of --annotation flag %q", s)
+	}
+
+	if app.CRIAnnotations == nil {
+		app.CRIAnnotations = make(map[string]string)
+	}
+	app.CRIAnnotations[fields[0]] = fields[1]
+	return nil
+}
+
+func (au *appAnnotation) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	var annotations []string
+	for name, value := range app.CRIAnnotations {
+		annotations = append(annotations, fmt.Sprintf("%s=%s", name, value))
+	}
+	return strings.Join(annotations, ",")
+}
+
+func (au *appAnnotation) Type() string {
+	return "appAnnotation"
+}
+
+// appLabel is for --label flags in the form of: --label=NAME=VALUE.
+type appLabel apps.Apps
+
+func (au *appLabel) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--label must follow an image")
+	}
+
+	fields := strings.SplitN(s, "=", 2)
+	if len(fields) != 2 {
+		return fmt.Errorf("invalid format of --Label flag %q", s)
+	}
+
+	if app.CRILabels == nil {
+		app.CRILabels = make(map[string]string)
+	}
+	app.CRILabels[fields[0]] = fields[1]
+	return nil
+}
+
+func (au *appLabel) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	var labels []string
+	for name, value := range app.CRILabels {
+		labels = append(labels, fmt.Sprintf("%s=%s", name, value))
+	}
+	return strings.Join(labels, ",")
+}
+
+func (au *appLabel) Type() string {
+	return "appLabel"
+}
+
+// appEnv is for --environment flags in the form of --environment=NAME=VALUE.
+type appEnv apps.Apps
+
+func (au *appEnv) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--environment must follow an image")
+	}
+
+	fields := strings.SplitN(s, "=", 2)
+	if len(fields) != 2 {
+		return fmt.Errorf("invalid format of --environment flag %q", s)
+	}
+
+	if app.Environments == nil {
+		app.Environments = make(map[string]string)
+	}
+	app.Environments[fields[0]] = fields[1]
+	return nil
+}
+
+func (au *appEnv) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	var environments []string
+	for name, value := range app.Environments {
+		environments = append(environments, fmt.Sprintf("%s=%s", name, value))
+	}
+	return strings.Join(environments, ",")
+}
+
+func (au *appEnv) Type() string {
+	return "appEnv"
+}
diff --git a/rkt/run.go b/rkt/run.go
index ae60b4d545..23d7c8c702 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -100,6 +100,10 @@ func addAppFlags(cmd *cobra.Command) {
 	cmd.Flags().Var((*appMount)(&rktApps), "mount", "mount point binding a volume to a path within an app")
 	cmd.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
 	cmd.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
+	cmd.Flags().Var((*appName)(&rktApps), "name", "set the name of the app (example: '--name=foo'). If not set, then the app name default to the image's name")
+	cmd.Flags().Var((*appAnnotation)(&rktApps), "annotation", "set the app's annotations (example: '--annotation=foo=bar')")
+	cmd.Flags().Var((*appLabel)(&rktApps), "label", "set the app's labels (example: '--label=foo=bar')")
+	cmd.Flags().Var((*appEnv)(&rktApps), "environment", "set the app's environment variables (example: '--environment=foo=bar')")
 }
 
 func init() {
diff --git a/stage0/app.go b/stage0/app.go
index e838af9ab6..77374b1ddb 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -56,7 +56,11 @@ type StopConfig struct {
 	PodPID  int
 }
 
-// TODO(iaguis): add override options for Exec, Environment (à la patch-manifest)
+type AddConfig struct {
+	Name        *types.ACName
+	Annotations types.Annotations
+}
+
 func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) error {
 	// there should be only one app in the config
 	app := pcfg.Apps.Last()
@@ -68,9 +72,18 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 	if err != nil {
 		return err
 	}
-	appName, err := imageNameToAppName(am.Name)
-	if err != nil {
-		return err
+
+	var appName *types.ACName
+	if app.Name != "" {
+		appName, err = types.NewACName(app.Name)
+		if err != nil {
+			return err
+		}
+	} else {
+		appName, err = imageNameToAppName(am.Name)
+		if err != nil {
+			return err
+		}
 	}
 
 	p, err := stage1types.LoadPod(dir, cfg.UUID)
@@ -211,6 +224,23 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 		ra.App.Group = group
 	}
 
+	if app.CRIAnnotations != nil {
+		ra.App.CRIAnnotations = app.CRIAnnotations
+	}
+
+	if app.CRILabels != nil {
+		ra.App.CRILabels = app.CRILabels
+	}
+
+	if app.Environments != nil {
+		envs := make([]string, 0, len(app.Environments))
+		for name, value := range app.Environments {
+			envs = append(envs, fmt.Sprintf("%s=%s", name, value))
+		}
+		// Let the app level environment override the environment variables.
+		mergeEnvs(&ra.App.Environment, envs, true)
+	}
+
 	env := ra.App.Environment
 
 	env.Set("AC_APP_NAME", appName.String())

From 04a407701813006fed34ae11cd968396d91f73fc Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 23 Sep 2016 13:11:09 +0200
Subject: [PATCH 0813/1304] cri/sandbox: autodect mutable stage1 capabilities

This documents and autodetects stage1 mutable cabability detection. It
is needed for stage1 images which do not support mutable operations, and
retains backwards compatibility with old stage1 images.
---
 .../devel/stage1-implementors-guide.md        | 45 +++++++++++++-
 stage0/entrypoint.go                          | 58 -------------------
 stage0/{interface.go => manifest.go}          | 51 ++++++++++++++++
 stage0/run.go                                 | 10 +++-
 4 files changed, 104 insertions(+), 60 deletions(-)
 delete mode 100644 stage0/entrypoint.go
 rename stage0/{interface.go => manifest.go} (51%)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 935740521a..59431c3e1b 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -69,6 +69,7 @@ Any stage1 that supports and expects machined registration to occur will likely
 * `--interactive` to run a pod interactively, that is, pass standard input to the application (only for pods with one application)
 * `--local-config=$PATH` to override the local configuration directory
 * `--private-users=$SHIFT` to define a UID/GID shift when using user namespaces. SHIFT is a two-value colon-separated parameter, the first value is the host UID to assign to the container and the second one is the number of host UIDs to assign.
+* `--mutable` activates a mutable environment in stage1. If the stage1 image manifest has no `app` entrypoint annotations declared, this flag will be unset to retain backwards compatibility.
 
 #### Arguments added in interface version 2
 
@@ -138,7 +139,49 @@ In the bundled rkt stage 1, the entrypoint is sending SIGTERM signal to systemd-
 * `--force` to force the stopping of the pod. E.g. in the bundled rkt stage 1, stop sends SIGKILL
 * UUID of the pod
 
-## Versioning
+### rkt app start
+
+`coreos.com/rkt/stage1/app/start`
+
+#### Arguments
+
+`start $OPTIONS UUID APPNAME ENTERENTRYPOINT PID`
+
+* `--debug` to activate debugging
+* `--disable-capabilities-restriction` gives all capabilities to apps (overrides `retain-set` and `remove-set`)
+* `--disable-paths` disables inaccessible and read-only paths (such as `/proc/sysrq-trigger`)
+* `--disable-seccomp` disables seccomp (overrides `retain-set` and `remove-set`)
+* `--private-users=$SHIFT` to define a UID/GID shift when using user namespaces. SHIFT is a two-value colon-separated parameter, the first value is the host UID to assign to the container and the second one is the number of host UIDs to assign.
+
+### rkt app stop
+
+`coreos.com/rkt/stage1/app/stop`
+
+#### Arguments
+
+`stop $OPTIONS UUID APPNAME ENTERENTRYPOINT PID`
+
+* `--debug` to activate debugging
+
+### rkt app rm
+
+`coreos.com/rkt/stage1/app/rm`
+
+#### Arguments
+
+`rm $OPTIONS UUID APPNAME ENTERENTRYPOINT PID`
+
+* `--debug` to activate debugging
+
+## Metadata
+
+### Mutable pods
+
+Stage1 images can support mutable pod environments, where, once a pod has been started, applications can be added/started/stopped/removed while the actual pod is running. This information is persisted at runtime in the pod manifest using the `coreos.com/rkt/stage1/mutable` annotation.
+
+If the annotation is not present, `false` is assumed.
+
+### Versioning
 
 The stage1 command line interface is versioned using an annotation with the name `coreos.com/rkt/stage1/interface-version`.
 If the annotation is not present, rkt assumes the version is 1.
diff --git a/stage0/entrypoint.go b/stage0/entrypoint.go
deleted file mode 100644
index b4457a767d..0000000000
--- a/stage0/entrypoint.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//+build linux
-
-package stage0
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-
-	"github.com/appc/spec/schema"
-	"github.com/coreos/rkt/common"
-	"github.com/hashicorp/errwrap"
-)
-
-const (
-	enterEntrypoint = "coreos.com/rkt/stage1/enter"
-	runEntrypoint   = "coreos.com/rkt/stage1/run"
-	gcEntrypoint    = "coreos.com/rkt/stage1/gc"
-	stopEntrypoint  = "coreos.com/rkt/stage1/stop"
-
-	appRmEntrypoint    = "coreos.com/rkt/stage1/app/rm"
-	appStartEntrypoint = "coreos.com/rkt/stage1/app/start"
-	appStopEntrypoint  = "coreos.com/rkt/stage1/app/stop"
-)
-
-// getStage1Entrypoint retrieves the named entrypoint from the stage1 manifest for a given pod
-func getStage1Entrypoint(cdir string, entrypoint string) (string, error) {
-	b, err := ioutil.ReadFile(common.Stage1ManifestPath(cdir))
-	if err != nil {
-		return "", errwrap.Wrap(errors.New("error reading pod manifest"), err)
-	}
-
-	s1m := schema.ImageManifest{}
-	if err := json.Unmarshal(b, &s1m); err != nil {
-		return "", errwrap.Wrap(errors.New("error unmarshaling stage1 manifest"), err)
-	}
-
-	if ep, ok := s1m.Annotations.Get(entrypoint); ok {
-		return ep, nil
-	}
-
-	return "", fmt.Errorf("entrypoint %q not found", entrypoint)
-}
diff --git a/stage0/interface.go b/stage0/manifest.go
similarity index 51%
rename from stage0/interface.go
rename to stage0/manifest.go
index b1868a63f1..35b92fc4f4 100644
--- a/stage0/interface.go
+++ b/stage0/manifest.go
@@ -19,6 +19,7 @@ package stage0
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"strconv"
 
@@ -27,10 +28,60 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
+const (
+	enterEntrypoint = "coreos.com/rkt/stage1/enter"
+	runEntrypoint   = "coreos.com/rkt/stage1/run"
+	gcEntrypoint    = "coreos.com/rkt/stage1/gc"
+	stopEntrypoint  = "coreos.com/rkt/stage1/stop"
+
+	appRmEntrypoint    = "coreos.com/rkt/stage1/app/rm"
+	appStartEntrypoint = "coreos.com/rkt/stage1/app/start"
+	appStopEntrypoint  = "coreos.com/rkt/stage1/app/stop"
+)
+
 const (
 	interfaceVersion = "coreos.com/rkt/stage1/interface-version"
 )
 
+// supportsMutableEnvironment returns whether the given stage1 image supports mutable pod operations.
+// It introspects the stage1 manifest and checks the presence of app* entrypoints.
+func supportsMutableEnvironment(cdir string) (bool, error) {
+	b, err := ioutil.ReadFile(common.Stage1ManifestPath(cdir))
+	if err != nil {
+		return false, errwrap.Wrap(errors.New("error reading pod manifest"), err)
+	}
+
+	s1m := schema.ImageManifest{}
+	if err := json.Unmarshal(b, &s1m); err != nil {
+		return false, errwrap.Wrap(errors.New("error unmarshaling stage1 manifest"), err)
+	}
+
+	_, appRmOk := s1m.Annotations.Get(appRmEntrypoint)
+	_, appStartOk := s1m.Annotations.Get(appStartEntrypoint)
+	_, appStopOk := s1m.Annotations.Get(appStopEntrypoint)
+
+	return appRmOk && appStartOk && appStopOk, nil
+}
+
+// getStage1Entrypoint retrieves the named entrypoint from the stage1 manifest for a given pod
+func getStage1Entrypoint(cdir string, entrypoint string) (string, error) {
+	b, err := ioutil.ReadFile(common.Stage1ManifestPath(cdir))
+	if err != nil {
+		return "", errwrap.Wrap(errors.New("error reading pod manifest"), err)
+	}
+
+	s1m := schema.ImageManifest{}
+	if err := json.Unmarshal(b, &s1m); err != nil {
+		return "", errwrap.Wrap(errors.New("error unmarshaling stage1 manifest"), err)
+	}
+
+	if ep, ok := s1m.Annotations.Get(entrypoint); ok {
+		return ep, nil
+	}
+
+	return "", fmt.Errorf("entrypoint %q not found", entrypoint)
+}
+
 // getStage1InterfaceVersion retrieves the interface version from the stage1
 // manifest for a given pod
 func getStage1InterfaceVersion(cdir string) (int, error) {
diff --git a/stage0/run.go b/stage0/run.go
index c8d7b3e6a6..b3488c9fc7 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -656,8 +656,16 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 		}
 	}
 
-	// TODO(sur): spec out a boolean coreos.com/rkt/stage1/mutable, and introspect here
 	if cfg.Mutable {
+		mutable, err := supportsMutableEnvironment(dir)
+
+		switch {
+		case err != nil:
+			log.FatalE("error determining stage1 mutable support", err)
+		case !mutable:
+			log.Fatalln("stage1 does not support mutable pods")
+		}
+
 		args = append(args, "--mutable")
 	}
 

From 1468df88578d4f4b6fff3a0d9242570b865c10f0 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Fri, 23 Sep 2016 16:20:38 -0700
Subject: [PATCH 0814/1304] CRI: Add '--working-dir', '--supplementary-gids',
 '--readonly-rootfs' flags.

Add these flags for 'rkt app add', 'rkt run', 'rkt prepare'.
---
 common/apps/apps.go | 35 ++++++++++---------
 rkt/cli_apps.go     | 85 +++++++++++++++++++++++++++++++++++++++++++++
 rkt/run.go          |  3 ++
 stage0/app.go       | 25 ++++++++-----
 stage0/run.go       | 27 +++++++++-----
 5 files changed, 142 insertions(+), 33 deletions(-)

diff --git a/common/apps/apps.go b/common/apps/apps.go
index 4b01216ee6..57aafd1c51 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -45,22 +45,25 @@ const (
 )
 
 type App struct {
-	Name           string                            // the name of the app. If not set, the the image's name will be used.
-	Image          string                            // the image reference as supplied by the user on the cli
-	ImType         AppImageType                      // the type of the image reference (to be guessed, url, path or hash)
-	Args           []string                          // any arguments the user supplied for this app
-	Asc            string                            // signature file override for image verification (if fetching occurs)
-	Exec           string                            // exec override for image
-	Mounts         []schema.Mount                    // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
-	MemoryLimit    *types.ResourceMemory             // memory isolator override
-	CPULimit       *types.ResourceCPU                // cpu isolator override
-	User, Group    string                            // user, group overrides
-	CapsRetain     *types.LinuxCapabilitiesRetainSet // os/linux/capabilities-retain-set overrides
-	CapsRemove     *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
-	SeccompFilter  string                            // seccomp CLI overrides
-	CRIAnnotations map[string]string                 // the CRI annotations of the app.
-	CRILabels      map[string]string                 // the CRI labels of the app.
-	Environments   map[string]string                 // the environments of the app.
+	Name              string                            // the name of the app. If not set, the the image's name will be used.
+	Image             string                            // the image reference as supplied by the user on the cli
+	ImType            AppImageType                      // the type of the image reference (to be guessed, url, path or hash)
+	Args              []string                          // any arguments the user supplied for this app
+	Asc               string                            // signature file override for image verification (if fetching occurs)
+	Exec              string                            // exec override for image
+	WorkingDir        string                            // working directory override for image
+	ReadOnlyRootFS    bool                              // read-only rootfs override.
+	Mounts            []schema.Mount                    // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
+	MemoryLimit       *types.ResourceMemory             // memory isolator override
+	CPULimit          *types.ResourceCPU                // cpu isolator override
+	User, Group       string                            // user, group overrides
+	SupplementaryGIDs []int                             // supplementary gids override
+	CapsRetain        *types.LinuxCapabilitiesRetainSet // os/linux/capabilities-retain-set overrides
+	CapsRemove        *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
+	SeccompFilter     string                            // seccomp CLI overrides
+	CRIAnnotations    map[string]string                 // the CRI annotations of the app.
+	CRILabels         map[string]string                 // the CRI labels of the app.
+	Environments      map[string]string                 // the environments of the app.
 
 	// TODO(jonboulle): These images are partially-populated hashes, this should be clarified.
 	ImageID types.Hash // resolved image identifier
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index f0925c41d4..2bde27429e 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -19,6 +19,7 @@ package main
 import (
 	"fmt"
 	"net/url"
+	"strconv"
 	"strings"
 
 	"github.com/coreos/rkt/common/apps"
@@ -574,3 +575,87 @@ func (au *appEnv) String() string {
 func (au *appEnv) Type() string {
 	return "appEnv"
 }
+
+type appWorkingDir apps.Apps
+
+func (au *appWorkingDir) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--working-dir must follow an image")
+	}
+	app.WorkingDir = s
+	return nil
+}
+
+func (au *appWorkingDir) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	return app.WorkingDir
+}
+
+func (au *appWorkingDir) Type() string {
+	return "appWorkingDir"
+}
+
+type appReadOnlyRootFS apps.Apps
+
+func (au *appReadOnlyRootFS) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--readonly-rootfs must follow an image")
+	}
+	value, err := strconv.ParseBool(s)
+	if err != nil {
+		return fmt.Errorf("--readonly-rootfs must be set with a boolean")
+	}
+	app.ReadOnlyRootFS = value
+	return nil
+}
+
+func (au *appReadOnlyRootFS) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	return fmt.Sprintf("%v", app.ReadOnlyRootFS)
+}
+
+func (au *appReadOnlyRootFS) Type() string {
+	return "appReadOnlyRootFS"
+}
+
+type appSupplementaryGIDs apps.Apps
+
+func (au *appSupplementaryGIDs) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--supplementary-gids must follow an image")
+	}
+	values := strings.Split(s, ",")
+	for _, v := range values {
+		gid, err := strconv.Atoi(v)
+		if err != nil {
+			return fmt.Errorf("--supplementary-gids must be integers")
+		}
+		app.SupplementaryGIDs = append(app.SupplementaryGIDs, gid)
+	}
+	return nil
+}
+
+func (au *appSupplementaryGIDs) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	var gids []string
+	for _, gid := range app.SupplementaryGIDs {
+		gids = append(gids, strconv.Itoa(gid))
+	}
+	return strings.Join(gids, ",")
+}
+
+func (au *appSupplementaryGIDs) Type() string {
+	return "appSupplementaryGIDs"
+}
diff --git a/rkt/run.go b/rkt/run.go
index 23d7c8c702..fb19b275f9 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -97,9 +97,12 @@ func addIsolatorFlags(cmd *cobra.Command, compat bool) {
 
 func addAppFlags(cmd *cobra.Command) {
 	cmd.Flags().Var((*appExec)(&rktApps), "exec", "override the exec command for the preceding image")
+	cmd.Flags().Var((*appWorkingDir)(&rktApps), "working-dir", "override the working directory of the preceding image")
+	cmd.Flags().Var((*appReadOnlyRootFS)(&rktApps), "readonly-rootfs", "if set, the app's rootfs will be mounted read-only")
 	cmd.Flags().Var((*appMount)(&rktApps), "mount", "mount point binding a volume to a path within an app")
 	cmd.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
 	cmd.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
+	cmd.Flags().Var((*appSupplementaryGIDs)(&rktApps), "supplementary-gids", "supplementary group IDs override for the preceding image (examples: '--supplementary-gids=1024,2048'")
 	cmd.Flags().Var((*appName)(&rktApps), "name", "set the name of the app (example: '--name=foo'). If not set, then the app name default to the image's name")
 	cmd.Flags().Var((*appAnnotation)(&rktApps), "annotation", "set the app's annotations (example: '--annotation=foo=bar')")
 	cmd.Flags().Var((*appLabel)(&rktApps), "label", "set the app's labels (example: '--label=foo=bar')")
diff --git a/stage0/app.go b/stage0/app.go
index 77374b1ddb..cefe84a83d 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -195,9 +195,10 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 			ID:     *img,
 			Labels: am.Labels,
 		},
+		ReadOnlyRootFS: app.ReadOnlyRootFS,
 	}
 
-	if execOverride := app.Exec; execOverride != "" {
+	if app.Exec != "" {
 		// Create a minimal App section if not present
 		if am.App == nil {
 			ra.App = &types.App{
@@ -205,23 +206,31 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 				Group: strconv.Itoa(os.Getgid()),
 			}
 		}
-		ra.App.Exec = []string{execOverride}
+		ra.App.Exec = []string{app.Exec}
 	}
 
-	if execAppends := app.Args; execAppends != nil {
-		ra.App.Exec = append(ra.App.Exec, execAppends...)
+	if app.Args != nil {
+		ra.App.Exec = append(ra.App.Exec, app.Args...)
+	}
+
+	if app.WorkingDir != "" {
+		ra.App.WorkingDirectory = app.WorkingDir
 	}
 
 	if err := prepareIsolators(app, ra.App); err != nil {
 		return err
 	}
 
-	if user := app.User; user != "" {
-		ra.App.User = user
+	if app.User != "" {
+		ra.App.User = app.User
+	}
+
+	if app.Group != "" {
+		ra.App.Group = app.Group
 	}
 
-	if group := app.Group; group != "" {
-		ra.App.Group = group
+	if app.SupplementaryGIDs != nil {
+		ra.App.SupplementaryGIDs = app.SupplementaryGIDs
 	}
 
 	if app.CRIAnnotations != nil {
diff --git a/stage0/run.go b/stage0/run.go
index b3488c9fc7..729c54a3d3 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -231,10 +231,11 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 				ID:     img,
 				Labels: am.Labels,
 			},
-			Mounts: MergeMounts(cfg.Apps.Mounts, app.Mounts),
+			Mounts:         MergeMounts(cfg.Apps.Mounts, app.Mounts),
+			ReadOnlyRootFS: app.ReadOnlyRootFS,
 		}
 
-		if execOverride := app.Exec; execOverride != "" {
+		if app.Exec != "" {
 			// Create a minimal App section if not present
 			if am.App == nil {
 				ra.App = &types.App{
@@ -242,23 +243,31 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 					Group: strconv.Itoa(os.Getgid()),
 				}
 			}
-			ra.App.Exec = []string{execOverride}
+			ra.App.Exec = []string{app.Exec}
 		}
 
-		if execAppends := app.Args; execAppends != nil {
-			ra.App.Exec = append(ra.App.Exec, execAppends...)
+		if app.Args != nil {
+			ra.App.Exec = append(ra.App.Exec, app.Args...)
+		}
+
+		if app.WorkingDir != "" {
+			ra.App.WorkingDirectory = app.WorkingDir
 		}
 
 		if err := prepareIsolators(app, ra.App); err != nil {
 			return err
 		}
 
-		if user := app.User; user != "" {
-			ra.App.User = user
+		if app.User != "" {
+			ra.App.User = app.User
+		}
+
+		if app.Group != "" {
+			ra.App.Group = app.Group
 		}
 
-		if group := app.Group; group != "" {
-			ra.App.Group = group
+		if app.SupplementaryGIDs != nil {
+			ra.App.SupplementaryGIDs = app.SupplementaryGIDs
 		}
 
 		// loading the environment from the lowest priority to highest

From 1ae5d195786d43d8aa49f3d0b71e5067c6b77c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 21 Sep 2016 15:03:16 +0200
Subject: [PATCH 0815/1304] common,tests: refactor GetExitStatus

It will be used in more places.
---
 common/common.go   | 15 +++++++++++++++
 tests/rkt_tests.go | 21 +++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/common/common.go b/common/common.go
index 90a2c8b762..dbf553ddf1 100644
--- a/common/common.go
+++ b/common/common.go
@@ -432,3 +432,18 @@ func RemoveEmptyLines(str string) []string {
 
 	return lines
 }
+
+// GetExitStatus converts an error to an exit status. If it wasn't an exit
+// status != 0 it returns the same error that it was called with
+func GetExitStatus(err error) (int, error) {
+	if err == nil {
+		return 0, nil
+	}
+	if exiterr, ok := err.(*exec.ExitError); ok {
+		// the program has exited with an exit code != 0
+		if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
+			return status.ExitStatus(), nil
+		}
+	}
+	return -1, err
+}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index ca2074a166..363e839d07 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -39,6 +39,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/gexpect"
 	"github.com/coreos/rkt/api/v1alpha"
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/tests/testutils"
 	taas "github.com/coreos/rkt/tests/testutils/aci-server"
 	"google.golang.org/grpc"
@@ -122,22 +123,9 @@ func spawnOrFail(t *testing.T, cmd string) *gexpect.ExpectSubprocess {
 	return child
 }
 
-func getExitStatus(err error) int {
-	if err == nil {
-		return 0
-	}
-	if exiterr, ok := err.(*exec.ExitError); ok {
-		// the program has exited with an exit code != 0
-		if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
-			return status.ExitStatus()
-		}
-	}
-	return -1
-}
-
 func waitOrFail(t *testing.T, child *gexpect.ExpectSubprocess, expectedStatus int) {
 	err := child.Wait()
-	status := getExitStatus(err)
+	status, _ := common.GetExitStatus(err)
 	if status != expectedStatus {
 		t.Fatalf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, expectedStatus, child.Collect())
 	}
@@ -348,7 +336,8 @@ func runRkt(t *testing.T, rktCmd string, uid, gid int) (string, int) {
 		buf.WriteString(line + "\n") // reappend newline
 	}
 
-	return buf.String(), getExitStatus(child.Wait())
+	status, _ := common.GetExitStatus(child.Wait())
+	return buf.String(), status
 }
 
 func startRktAsGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, gid int) *gexpect.ExpectSubprocess {
@@ -878,7 +867,7 @@ func unmountPod(t *testing.T, ctx *testutils.RktRunCtx, uuid string, rmNetns boo
 
 func checkExitStatus(child *gexpect.ExpectSubprocess) error {
 	err := child.Wait()
-	status := getExitStatus(err)
+	status, _ := common.GetExitStatus(err)
 	if status != 0 {
 		return fmt.Errorf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, 0, child.Collect())
 	}

From 178c33819c5e67c3b46d2d581ad5576679403a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 21 Sep 2016 15:03:38 +0200
Subject: [PATCH 0816/1304] stage0,stage1: handle exit status from stop
 entrypoint

If we try to stop an app that doesn't have a service file (either
because it was not started or because the starting failed) we should
give an appropriate error message.

Also, since `app rm` calls the stop entrypoint, we should identify this
error and continue removing the app.
---
 stage0/app.go               | 17 +++++++++++++++--
 stage1/app-stop/app-stop.go |  8 ++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/stage0/app.go b/stage0/app.go
index cefe84a83d..62de66fefc 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -337,7 +337,7 @@ func callEntrypoint(dir, entrypoint string, args []string) error {
 	}
 
 	if err := c.Run(); err != nil {
-		return fmt.Errorf("error executing stage1's app rm: %v", err)
+		return err
 	}
 
 	if err := os.Chdir(previousDir); err != nil {
@@ -396,7 +396,14 @@ func RmApp(dir string, uuid *types.UUID, usesOverlay bool, appName *types.ACName
 		}
 
 		if err := callEntrypoint(dir, appStopEntrypoint, args); err != nil {
-			return err
+			status, err := common.GetExitStatus(err)
+			// ignore nonexistent units failing to stop. Exit status 5
+			// comes from systemctl and means the unit doesn't exist
+			if err != nil {
+				return err
+			} else if status != 5 {
+				return fmt.Errorf("exit status %d", status)
+			}
 		}
 
 		if err := callEntrypoint(dir, appRmEntrypoint, args); err != nil {
@@ -559,6 +566,12 @@ func StopApp(cfg StopConfig) error {
 	}
 
 	if err := callEntrypoint(cfg.Dir, appStopEntrypoint, args); err != nil {
+		status, err := common.GetExitStatus(err)
+		// exit status 5 comes from systemctl and means the unit doesn't exist
+		if status == 5 {
+			return fmt.Errorf("app %q is not running", app.Name)
+		}
+
 		return err
 	}
 
diff --git a/stage1/app-stop/app-stop.go b/stage1/app-stop/app-stop.go
index f90d5457d7..8ae2c09718 100644
--- a/stage1/app-stop/app-stop.go
+++ b/stage1/app-stop/app-stop.go
@@ -23,6 +23,7 @@ import (
 	"os"
 	"os/exec"
 
+	"github.com/coreos/rkt/common"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 
@@ -71,8 +72,11 @@ func main() {
 	}
 
 	if err := cmd.Run(); err != nil {
-		log.PrintE(fmt.Sprintf("error stopping app %q", appName.String()), err)
-		os.Exit(1)
+		status, err := common.GetExitStatus(err)
+		if err != nil {
+			os.Exit(1)
+		}
+		os.Exit(status)
 	}
 
 	os.Exit(0)

From c517764b338d51ee1baada5946d3578e35eccff1 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 22 Sep 2016 18:31:15 +0200
Subject: [PATCH 0817/1304] CRI: add oom_score_adj isolator

---
 common/apps/apps.go             |  1 +
 rkt/cli_apps.go                 | 37 ++++++++++++++++
 rkt/run.go                      |  1 +
 stage0/run.go                   |  5 +++
 stage1/init/common/units.go     |  2 +
 tests/rkt_oom_score_adj_test.go | 76 +++++++++++++++++++++++++++++++++
 6 files changed, 122 insertions(+)
 create mode 100644 tests/rkt_oom_score_adj_test.go

diff --git a/common/apps/apps.go b/common/apps/apps.go
index 57aafd1c51..fd5911008b 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -61,6 +61,7 @@ type App struct {
 	CapsRetain        *types.LinuxCapabilitiesRetainSet // os/linux/capabilities-retain-set overrides
 	CapsRemove        *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
 	SeccompFilter     string                            // seccomp CLI overrides
+	OOMScoreAdj       *types.LinuxOOMScoreAdj           // oom-score-adj isolator override
 	CRIAnnotations    map[string]string                 // the CRI annotations of the app.
 	CRILabels         map[string]string                 // the CRI labels of the app.
 	Environments      map[string]string                 // the environments of the app.
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 2bde27429e..96fb645a55 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -441,6 +441,43 @@ func (au *appSeccompFilter) Type() string {
 	return "appSeccompFilter"
 }
 
+// appOOMScoreAdj is to adjust /proc/$pid/oom_score_adj
+type appOOMScoreAdj apps.Apps
+
+func (aml *appOOMScoreAdj) Set(s string) error {
+	app := (*apps.Apps)(aml).Last()
+	if app == nil {
+		return fmt.Errorf("--oom-score-adj must follow an image")
+	}
+	limit, err := strconv.Atoi(s)
+	if err != nil {
+		return err
+	}
+	score, err := types.NewLinuxOOMScoreAdj(limit)
+	if err != nil {
+		return err
+	}
+
+	app.OOMScoreAdj = score
+	return nil
+}
+
+func (aml *appOOMScoreAdj) String() string {
+	app := (*apps.Apps)(aml).Last()
+	if app == nil {
+		return ""
+	}
+	adj := app.OOMScoreAdj
+	if adj == nil {
+		return ""
+	}
+	return strconv.Itoa(int(*adj))
+}
+
+func (aml *appOOMScoreAdj) Type() string {
+	return "appOOMScoreAdj"
+}
+
 // appName is for --name flags in the form of: --name=APPNAME.
 type appName apps.Apps
 
diff --git a/rkt/run.go b/rkt/run.go
index fb19b275f9..dfcfd91e9f 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -85,6 +85,7 @@ func addIsolatorFlags(cmd *cobra.Command, compat bool) {
 	cmd.Flags().Var((*appCapsRetain)(&rktApps), "caps-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")
 	cmd.Flags().Var((*appCapsRemove)(&rktApps), "caps-remove", "capability to remove (example: '--caps-remove=CAP_MKNOD')")
 	cmd.Flags().Var((*appSeccompFilter)(&rktApps), "seccomp", "seccomp filter override (example: '--seccomp mode=retain,errno=EPERM,chmod,chown')")
+	cmd.Flags().Var((*appOOMScoreAdj)(&rktApps), "oom-score-adj", "oom-score-adj isolator override")
 
 	// For backwards compatibility
 	if compat {
diff --git a/stage0/run.go b/stage0/run.go
index 729c54a3d3..2ccae20baf 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -310,6 +310,7 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 	return pmb, nil
 }
 
+// prepareIsolators merges the CLI app parameters with the manifest's app
 func prepareIsolators(setup *apps.App, app *types.App) error {
 	if memoryOverride := setup.MemoryLimit; memoryOverride != nil {
 		isolator := memoryOverride.AsIsolator()
@@ -321,6 +322,10 @@ func prepareIsolators(setup *apps.App, app *types.App) error {
 		app.Isolators = append(app.Isolators, isolator)
 	}
 
+	if oomAdjOverride := setup.OOMScoreAdj; oomAdjOverride != nil {
+		app.Isolators.ReplaceIsolatorsByName(oomAdjOverride.AsIsolator(), []types.ACIdentifier{types.LinuxOOMScoreAdjName})
+	}
+
 	if setup.CapsRetain != nil && setup.CapsRemove != nil {
 		return fmt.Errorf("error: cannot use both --caps-retain and --caps-remove on the same image")
 	}
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 52884e80aa..768fe6588d 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -488,6 +488,8 @@ func (uw *UnitWriter) AppUnit(
 				uw.err = err
 				return
 			}
+		case *types.LinuxOOMScoreAdj:
+			opts = append(opts, unit.NewUnitOption("Service", "OOMScoreAdjust", strconv.Itoa(int(*v))))
 		}
 	}
 
diff --git a/tests/rkt_oom_score_adj_test.go b/tests/rkt_oom_score_adj_test.go
new file mode 100644
index 0000000000..ae6adc8012
--- /dev/null
+++ b/tests/rkt_oom_score_adj_test.go
@@ -0,0 +1,76 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+func TestOOMScoreAdjust(t *testing.T) {
+	for _, tt := range []struct {
+		patch    []string
+		appArgs  string
+		expected string
+	}{
+		{
+			patch:    []string{"--isolators=os/linux/oom-score-adj,99"},
+			expected: "<<<99",
+		},
+		{
+			patch:    []string{"--isolators=os/linux/oom-score-adj,-50"},
+			expected: "<<<-50",
+		},
+		{
+			patch:    nil,
+			expected: "<<<0",
+		},
+		{
+			patch:    nil,
+			appArgs:  "--oom-score-adj 42",
+			expected: "<<<42",
+		},
+	} {
+		func() {
+			ctx := testutils.NewRktRunCtx()
+			defer ctx.Cleanup()
+
+			ps := []string{}
+			if len(tt.patch) > 0 {
+				ps = append(ps, tt.patch...)
+			}
+
+			image := patchTestACI("rkt-oom-adj.aci", ps...)
+			defer os.Remove(image)
+
+			imageParams := "--exec=/inspect -- -read-file -file-name /proc/self/oom_score_adj"
+
+			rktCmd := fmt.Sprintf(
+				"%s --debug --insecure-options=image run %s %s %s",
+				ctx.Cmd(),
+				image,
+				tt.appArgs,
+				imageParams,
+			)
+
+			runRktAndCheckOutput(t, rktCmd, tt.expected, false)
+		}()
+	}
+}

From 49699816e5ee0e3947154023622cd2d623ff5777 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 22 Sep 2016 12:27:58 -0700
Subject: [PATCH 0818/1304] run/repare: Support mutating the app for 'rkt
 run/prepare' as well.

Also removed unneccessary flag conflict checks for --pod-manifest
v.s. other flags (--name, --environment, etc) because they are already
taken care of since they all need to follow an image.
---
 common/apps/apps.go |  4 ++--
 lib/app.go          |  8 ++++----
 lib/pod.go          |  8 ++++----
 lib/types.go        | 16 ++++++++--------
 rkt/cli_apps.go     | 28 ++++++++++++++--------------
 rkt/prepare.go      | 11 +++++------
 rkt/run.go          | 15 +++++++--------
 stage0/app.go       |  8 ++++----
 stage0/run.go       | 40 +++++++++++++++++++++++++++++++++-------
 9 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/common/apps/apps.go b/common/apps/apps.go
index fd5911008b..c9e8421ee8 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -62,8 +62,8 @@ type App struct {
 	CapsRemove        *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
 	SeccompFilter     string                            // seccomp CLI overrides
 	OOMScoreAdj       *types.LinuxOOMScoreAdj           // oom-score-adj isolator override
-	CRIAnnotations    map[string]string                 // the CRI annotations of the app.
-	CRILabels         map[string]string                 // the CRI labels of the app.
+	UserAnnotations   map[string]string                 // the user annotations of the app.
+	UserLabels        map[string]string                 // the user labels of the app.
 	Environments      map[string]string                 // the environments of the app.
 
 	// TODO(jonboulle): These images are partially-populated hashes, this should be clarified.
diff --git a/lib/app.go b/lib/app.go
index 41991a9823..eed6d74ddf 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -59,10 +59,10 @@ func AppsForPod(uuid, dataDir string, appName string) ([]*App, error) {
 // newApp constructs the App object with the runtime app and pod manifest.
 func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.Pod) (*App, error) {
 	app := &App{
-		Name:           ra.Name.String(),
-		ImageID:        ra.Image.ID.String(),
-		CRIAnnotations: ra.App.CRIAnnotations,
-		CRILabels:      ra.App.CRILabels,
+		Name:            ra.Name.String(),
+		ImageID:         ra.Image.ID.String(),
+		UserAnnotations: ra.App.CRIAnnotations,
+		UserLabels:      ra.App.CRILabels,
 	}
 
 	// Generate mounts
diff --git a/lib/pod.go b/lib/pod.go
index 04d604dc0a..e4ad6f5e0a 100644
--- a/lib/pod.go
+++ b/lib/pod.go
@@ -34,16 +34,16 @@ func NewPodFromInternalPod(p *pkgPod.Pod) (*Pod, error) {
 	}
 
 	if len(manifest.CRIAnnotations) > 0 {
-		pod.CRIAnnotations = make(map[string]string)
+		pod.UserAnnotations = make(map[string]string)
 		for name, value := range manifest.CRIAnnotations {
-			pod.CRIAnnotations[name] = value
+			pod.UserAnnotations[name] = value
 		}
 	}
 
 	if len(manifest.CRILabels) > 0 {
-		pod.CRILabels = make(map[string]string)
+		pod.UserLabels = make(map[string]string)
 		for name, value := range manifest.CRILabels {
-			pod.CRILabels[name] = value
+			pod.UserLabels[name] = value
 		}
 	}
 
diff --git a/lib/types.go b/lib/types.go
index 55879b2d68..a42308ad00 100644
--- a/lib/types.go
+++ b/lib/types.go
@@ -58,10 +58,10 @@ type (
 		ImageID string `json:"image_id"`
 		// Mount points of the container.
 		Mounts []*Mount `json:"mounts,omitempty"`
-		// CRIAnnotations of the container.
-		CRIAnnotations map[string]string `json:"cri_annotations,omitempty"`
-		// CRILabels of the container.
-		CRILabels map[string]string `json:"cri_labels,omitempty"`
+		// User annotations of the container.
+		UserAnnotations map[string]string `json:"user_annotations,omitempty"`
+		// User labels of the container.
+		UserLabels map[string]string `json:"user_labels,omitempty"`
 	}
 
 	// Pod defines the pod object.
@@ -76,9 +76,9 @@ type (
 		AppNames []string `json:"app_names,omitempty"`
 		// The start time of the pod.
 		StartedAt *int64 `json:"started_at,omitempty"`
-		// CRIAnnotations are the pod annotations used for CRI.
-		CRIAnnotations map[string]string `json:"cri_annotations,omitempty"`
-		// CRILabels are the pod labels used for CRI.
-		CRILabels map[string]string `json:"cri_labels,omitempty"`
+		// UserAnnotations are the pod user annotations.
+		UserAnnotations map[string]string `json:"user_annotations,omitempty"`
+		// UserLabels are the pod user labels.
+		UserLabels map[string]string `json:"user_labels,omitempty"`
 	}
 )
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 96fb645a55..4a20235737 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -502,24 +502,24 @@ func (au *appName) Type() string {
 	return "appName"
 }
 
-// appAnnotation is for --annotation flags in the form of: --annotation=NAME=VALUE.
+// appAnnotation is for --user-annotation flags in the form of: --user-annotation=NAME=VALUE.
 type appAnnotation apps.Apps
 
 func (au *appAnnotation) Set(s string) error {
 	app := (*apps.Apps)(au).Last()
 	if app == nil {
-		return fmt.Errorf("--annotation must follow an image")
+		return fmt.Errorf("--user-annotation must follow an image")
 	}
 
 	fields := strings.SplitN(s, "=", 2)
 	if len(fields) != 2 {
-		return fmt.Errorf("invalid format of --annotation flag %q", s)
+		return fmt.Errorf("invalid format of --user-annotation flag %q", s)
 	}
 
-	if app.CRIAnnotations == nil {
-		app.CRIAnnotations = make(map[string]string)
+	if app.UserAnnotations == nil {
+		app.UserAnnotations = make(map[string]string)
 	}
-	app.CRIAnnotations[fields[0]] = fields[1]
+	app.UserAnnotations[fields[0]] = fields[1]
 	return nil
 }
 
@@ -529,7 +529,7 @@ func (au *appAnnotation) String() string {
 		return ""
 	}
 	var annotations []string
-	for name, value := range app.CRIAnnotations {
+	for name, value := range app.UserAnnotations {
 		annotations = append(annotations, fmt.Sprintf("%s=%s", name, value))
 	}
 	return strings.Join(annotations, ",")
@@ -539,24 +539,24 @@ func (au *appAnnotation) Type() string {
 	return "appAnnotation"
 }
 
-// appLabel is for --label flags in the form of: --label=NAME=VALUE.
+// appLabel is for --user-label flags in the form of: --user-label=NAME=VALUE.
 type appLabel apps.Apps
 
 func (au *appLabel) Set(s string) error {
 	app := (*apps.Apps)(au).Last()
 	if app == nil {
-		return fmt.Errorf("--label must follow an image")
+		return fmt.Errorf("--user-label must follow an image")
 	}
 
 	fields := strings.SplitN(s, "=", 2)
 	if len(fields) != 2 {
-		return fmt.Errorf("invalid format of --Label flag %q", s)
+		return fmt.Errorf("invalid format of --user-label flag %q", s)
 	}
 
-	if app.CRILabels == nil {
-		app.CRILabels = make(map[string]string)
+	if app.UserLabels == nil {
+		app.UserLabels = make(map[string]string)
 	}
-	app.CRILabels[fields[0]] = fields[1]
+	app.UserLabels[fields[0]] = fields[1]
 	return nil
 }
 
@@ -566,7 +566,7 @@ func (au *appLabel) String() string {
 		return ""
 	}
 	var labels []string
-	for name, value := range app.CRILabels {
+	for name, value := range app.UserLabels {
 		labels = append(labels, fmt.Sprintf("%s=%s", name, value))
 	}
 	return strings.Join(labels, ",")
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 44a57a1400..14a5015662 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -61,7 +61,7 @@ func init() {
 	cmdPrepare.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
 	cmdPrepare.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
 	cmdPrepare.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
-	cmdPrepare.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for apps in the form name=value")
+	cmdPrepare.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for all the apps in the form key=value, this will be overriden by --environment")
 	cmdPrepare.Flags().Var(&flagEnvFromFile, "set-env-file", "the path to an environment variables file")
 	cmdPrepare.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
 	cmdPrepare.Flags().BoolVar(&flagNoStore, "no-store", false, "fetch images ignoring the local store")
@@ -108,11 +108,10 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || flagStoreOnly || flagNoStore ||
-		flagInheritEnv || !flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty() ||
-		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" || (*appExec)(&rktApps).String() != "" ||
-		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "" ||
-		(*appCapsRetain)(&rktApps).String() != "" || (*appCapsRemove)(&rktApps).String() != "") {
+	if len(flagPodManifest) > 0 && (rktApps.Count() > 0 ||
+		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" ||
+		len(flagPorts) > 0 || flagStoreOnly || flagNoStore ||
+		flagInheritEnv || !flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty()) {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
 		return 1
 	}
diff --git a/rkt/run.go b/rkt/run.go
index dfcfd91e9f..acbc190a50 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -105,8 +105,8 @@ func addAppFlags(cmd *cobra.Command) {
 	cmd.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
 	cmd.Flags().Var((*appSupplementaryGIDs)(&rktApps), "supplementary-gids", "supplementary group IDs override for the preceding image (examples: '--supplementary-gids=1024,2048'")
 	cmd.Flags().Var((*appName)(&rktApps), "name", "set the name of the app (example: '--name=foo'). If not set, then the app name default to the image's name")
-	cmd.Flags().Var((*appAnnotation)(&rktApps), "annotation", "set the app's annotations (example: '--annotation=foo=bar')")
-	cmd.Flags().Var((*appLabel)(&rktApps), "label", "set the app's labels (example: '--label=foo=bar')")
+	cmd.Flags().Var((*appAnnotation)(&rktApps), "user-annotation", "set the app's annotations (example: '--user-annotation=foo=bar')")
+	cmd.Flags().Var((*appLabel)(&rktApps), "user-label", "set the app's labels (example: '--user-label=foo=bar')")
 	cmd.Flags().Var((*appEnv)(&rktApps), "environment", "set the app's environment variables (example: '--environment=foo=bar')")
 }
 
@@ -125,7 +125,7 @@ func init() {
 	cmdRun.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
 	cmdRun.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
 	cmdRun.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
-	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for apps in the form key=value")
+	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for all the apps in the form key=value, this will be overriden by --environment")
 	cmdRun.Flags().Var(&flagEnvFromFile, "set-env-file", "path to an environment variables file")
 	cmdRun.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively. If true, only one image may be supplied.")
 	cmdRun.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf. Pass 'host' to use host's resolv.conf. Pass 'none' to ignore CNI DNS config")
@@ -193,11 +193,10 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		return 1
 	}
 
-	if len(flagPodManifest) > 0 && (len(flagPorts) > 0 || rktApps.Count() > 0 || flagStoreOnly || flagNoStore ||
-		flagInheritEnv || !flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty() ||
-		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" || (*appExec)(&rktApps).String() != "" ||
-		(*appUser)(&rktApps).String() != "" || (*appGroup)(&rktApps).String() != "" ||
-		(*appCapsRetain)(&rktApps).String() != "" || (*appCapsRemove)(&rktApps).String() != "") {
+	if len(flagPodManifest) > 0 && (rktApps.Count() > 0 ||
+		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" ||
+		len(flagPorts) > 0 || flagStoreOnly || flagNoStore ||
+		flagInheritEnv || !flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty()) {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
 		return 1
 	}
diff --git a/stage0/app.go b/stage0/app.go
index 62de66fefc..2d72c42c59 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -233,12 +233,12 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 		ra.App.SupplementaryGIDs = app.SupplementaryGIDs
 	}
 
-	if app.CRIAnnotations != nil {
-		ra.App.CRIAnnotations = app.CRIAnnotations
+	if app.UserAnnotations != nil {
+		ra.App.CRIAnnotations = app.UserAnnotations
 	}
 
-	if app.CRILabels != nil {
-		ra.App.CRILabels = app.CRILabels
+	if app.UserLabels != nil {
+		ra.App.CRILabels = app.UserLabels
 	}
 
 	if app.Environments != nil {
diff --git a/stage0/run.go b/stage0/run.go
index 2ccae20baf..9cb991c561 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -70,8 +70,8 @@ type PrepareConfig struct {
 	SkipTreeStoreCheck bool                 // skip checking the treestore before rendering
 	PodManifest        string               // use the pod manifest specified by the user, this will ignore flags such as '--volume', '--port', etc.
 	PrivateUsers       *user.UidRange       // user namespaces
-	CRIAnnotations     types.CRIAnnotations // CRI annotations for the pod.
-	CRILabels          types.CRILabels      // CRI labels for the pod.
+	UserAnnotations    types.CRIAnnotations // user annotations for the pod.
+	UserLabels         types.CRILabels      // user labels for the pod.
 }
 
 // RunConfig defines the configuration parameters needed by Run
@@ -208,9 +208,18 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		if err != nil {
 			return errwrap.Wrap(errors.New("error getting the manifest"), err)
 		}
-		appName, err := imageNameToAppName(am.Name)
-		if err != nil {
-			return errwrap.Wrap(errors.New("error converting image name to app name"), err)
+
+		var appName *types.ACName
+		if app.Name != "" {
+			appName, err = types.NewACName(app.Name)
+			if err != nil {
+				return errwrap.Wrap(errors.New("invalid app name format"), err)
+			}
+		} else {
+			appName, err = imageNameToAppName(am.Name)
+			if err != nil {
+				return errwrap.Wrap(errors.New("error converting image name to app name"), err)
+			}
 		}
 
 		if err := prepareAppImage(cfg, *appName, img, dir, cfg.UseOverlay); err != nil {
@@ -270,6 +279,14 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 			ra.App.SupplementaryGIDs = app.SupplementaryGIDs
 		}
 
+		if app.UserAnnotations != nil {
+			ra.App.CRIAnnotations = app.UserAnnotations
+		}
+
+		if app.UserLabels != nil {
+			ra.App.CRILabels = app.UserLabels
+		}
+
 		// loading the environment from the lowest priority to highest
 		if cfg.InheritEnv {
 			// Inherit environment does not override app image environment
@@ -278,6 +295,15 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 
 		mergeEnvs(&ra.App.Environment, cfg.EnvFromFile, true)
 		mergeEnvs(&ra.App.Environment, cfg.ExplicitEnv, true)
+
+		if app.Environments != nil {
+			envs := make([]string, 0, len(app.Environments))
+			for name, value := range app.Environments {
+				envs = append(envs, fmt.Sprintf("%s=%s", name, value))
+			}
+			mergeEnvs(&ra.App.Environment, envs, true)
+		}
+
 		pm.Apps = append(pm.Apps, ra)
 		return nil
 	}); err != nil {
@@ -300,8 +326,8 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		Value: strconv.FormatBool(cfg.Mutable),
 	})
 
-	pm.CRIAnnotations = cfg.CRIAnnotations
-	pm.CRILabels = cfg.CRILabels
+	pm.CRIAnnotations = cfg.UserAnnotations
+	pm.CRILabels = cfg.UserLabels
 
 	pmb, err := json.Marshal(pm)
 	if err != nil {

From 4d735db628ab805ada9d42fb4c0765f6e71075b8 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 22 Sep 2016 17:15:34 -0700
Subject: [PATCH 0819/1304] Documentation: Update docs for rkt run/prepare.

---
 Documentation/subcommands/prepare.md |  4 +++
 Documentation/subcommands/run.md     | 46 +++++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 97b05bd330..81471274b1 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -52,12 +52,16 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
+| `--user-annotation` | none | annotation add to the app's UserAnnotations field | Set the app's annotations (example: '--annotation=foo=bar'). |
 | `--caps-remove` | none | capability to remove (example: '--caps-remove=CAP\_SYS\_CHROOT,CAP\_MKNOD') | Capabilities to remove from the process's capabilities bounding set, all others from the default set will be included |
 | `--caps-retain` | none | capability to retain (example: '--caps-remove=CAP\_SYS\_ADMIN,CAP\_NET\_ADMIN') | Capabilities to retain in the process's capabilities bounding set, all others will be removed |
+| `--environment` | none | environment variables add to the app's environment variables | Set the app's environment variables (example: '--environment=foo=bar'). |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
 | `--group` | root | gid, groupname or file path | Group override for the preceding image (example: '--group=group') |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
+| `--user-label` | none | label add to the apps' UserLabels field | Set the app's labels (example: '--label=foo=bar'). |
 | `--mount` | none | Mount syntax (ex. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
+| `--name` | none | Name of the app | Set the name of the app (example: '--name=foo'). If not set, then the app name default to the image's name |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
 | `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 6e26f869f8..b10d55524f 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -32,6 +32,16 @@ Multiple applications can be run in a pod by passing multiple images to the run
 # rkt run example.com/app1 example.com/app2
 ```
 
+## Overriding the app's name
+
+Be default, the image's name will be used as the app's name.
+It can be overridden by rkt using the `--name` flag.
+This comes handy when we want to run multiple apps using the same image:
+
+```
+# rkt --insecure-options=image run docker://busybox --name=busybox1 docker://busybox --name=busybox2
+```
+
 ## Overriding Executable to launch
 
 Application images include an `exec` field that specifies the executable to launch.
@@ -74,19 +84,34 @@ This can be combined with overridden executables:
 # rkt run example.com/worker --exec /bin/ov -- --loglevel verbose --- example.com/syncer --exec /bin/syncer2 -- --interval 30s
 ```
 
+## Adding user annotations and user labels
+
+Additional annotations and labels can be added to the app by using `--user-annotation` and `--user-label` flag.
+The annotations and labels will appear in the app's `UserAnnotations` and `UserLabels` field.
+
+```
+# rkt run example.com/example --user-annotation=foo=bar --user-label=hello=world
+```
+
 ## Influencing Environment Variables
 
-To inherit all environment variables from the parent use the `--inherit-env` flag.
+To inherit all environment variables from the parent, use the `--inherit-env` flag.
+
+To explicitly set environment variables for all apps, use the `--set-env` flag.
 
-To explicitly set individual environment variables use the `--set-env` flag.
+To explicitly set environment variables for all apps from a file, use the `--set-env-file` flag.
+Variables are expected to be in the format `VAR_NAME=VALUE` separated by the new line character `\n`.
+Lines starting with `#` or `;` and empty ones will be ignored.
+
+To explicitly set environment variables for each app individually, use the `--environment` flag.
 
-To explicitly set environment variables from a file use the `--set-env-file` flag. Variables are expected to be in the format `VAR_NAME=VALUE` separated by the new line character `\n`. Lines starting with `#` or `;` and empty ones will be ignored.
 The precedence is as follows with the last item replacing previous environment entries:
 
 - Parent environment
 - App image environment
-- Explicitly set environment variables from file (`--set-env-file`)
-- Explicitly set environment variables on command line (`--set-env`)
+- Explicitly set environment variables for all apps from file (`--set-env-file`)
+- Explicitly set environment variables for all apps on command line (`--set-env`)
+- Explicitly set environment variables for each app on command line (`--environment`)
 
 ```
 # export EXAMPLE_ENV=hello
@@ -95,6 +120,13 @@ The precedence is as follows with the last item replacing previous environment e
 EXAMPLE_ENV=hello
 FOO=bar
 EXAMPLE_OVERRIDE=over
+
+# export EXAMPLE_ENV=hello
+# export EXAMPLE_OVERRIDE=under
+# rkt run --inherit-env --set-env=FOO=bar --set-env=EXAMPLE_OVERRIDE=over example.com/env-printer --environment=EXAMPLE_OVERRIDE=ride
+EXAMPLE_ENV=hello
+FOO=bar
+EXAMPLE_OVERRIDE=ride
 ```
 
 ## Disable Signature Verification
@@ -355,20 +387,24 @@ This feature will be disabled automatically if the underlying filesystem does no
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
+| `--user-annotation` | none | annotation add to the app's UserAnnotations field | Set the app's annotations (example: '--user-annotation=foo=bar'). |
 | `--caps-remove` | none | capability to remove (e.g. `--caps-remove=CAP_SYS_CHROOT,CAP_MKNOD`) | Capabilities to remove from the process's capabilities bounding set; all others from the default set will be included. |
 | `--caps-retain` | none | capability to retain (e.g. `--caps-retain=CAP_SYS_ADMIN,CAP_NET_ADMIN`) | Capabilities to retain in the process's capabilities bounding set; all others will be removed. |
 | `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
 | `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-opt` | none | DNS option | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |
+| `--environment` | none | environment variables add to the app's environment variables | Set the app's environment variables (example: '--environment=foo=bar'). |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
 | `--group` | root | gid, groupname or file path (e.g. `--group=core`) | Group override for the preceding image. |
 | `--hostname` | `rkt-$PODUUID` | A host name | Set pod's host name. |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
 | `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
+| `--user-label` | none | label add to the apps' UserLabels field | Set the app's labels (example: '--user-label=foo=bar'). |
 | `--mds-register` | `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net` as `default`, `default-restricted`, or `host`). |
 | `--memory` | none | Memory units (e.g. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
 | `--mount` | none | Mount syntax (e.g. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
+| `--name` | none | Name of the app | Set the name of the app (example: '--name=foo'). If not set, then the app name default to the image's name |
 | `--net` | `default` | A comma-separated list of networks. (e.g. `--net[=n[:args], ...]`) | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
 | `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md). |

From 62dd49d2e758e4fbbe3ba613ff8cfbe644fa4884 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Mon, 26 Sep 2016 11:26:48 +0200
Subject: [PATCH 0820/1304] app-start: set up unit files/cgroups during app-add

Currently we set up the app's service during app-start which is not the
right place.

This implements the proper logic to set up systemd service files, as
well as any remounts of cgroups during app-add.
---
 .../devel/stage1-implementors-guide.md        |  14 +-
 stage0/app.go                                 | 129 ++++++++-----
 stage0/manifest.go                            |   1 +
 stage1/aci/aci-manifest.in                    |   4 +
 stage1/app-add/app-add.go                     | 169 ++++++++++++++++++
 stage1/app-add/app-add.mk                     |   1 +
 stage1/app-start/app-start.go                 | 116 +-----------
 stage1/secondary-stuff.mk                     |   1 +
 8 files changed, 272 insertions(+), 163 deletions(-)
 create mode 100644 stage1/app-add/app-add.go
 create mode 100644 stage1/app-add/app-add.mk

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 59431c3e1b..3c483cfd65 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -139,9 +139,9 @@ In the bundled rkt stage 1, the entrypoint is sending SIGTERM signal to systemd-
 * `--force` to force the stopping of the pod. E.g. in the bundled rkt stage 1, stop sends SIGKILL
 * UUID of the pod
 
-### rkt app start
+### rkt app add
 
-`coreos.com/rkt/stage1/app/start`
+`coreos.com/rkt/stage1/app/add`
 
 #### Arguments
 
@@ -153,6 +153,16 @@ In the bundled rkt stage 1, the entrypoint is sending SIGTERM signal to systemd-
 * `--disable-seccomp` disables seccomp (overrides `retain-set` and `remove-set`)
 * `--private-users=$SHIFT` to define a UID/GID shift when using user namespaces. SHIFT is a two-value colon-separated parameter, the first value is the host UID to assign to the container and the second one is the number of host UIDs to assign.
 
+### rkt app start
+
+`coreos.com/rkt/stage1/app/start`
+
+#### Arguments
+
+`start $OPTIONS UUID APPNAME ENTERENTRYPOINT PID`
+
+* `--debug` to activate debugging
+
 ### rkt app stop
 
 `coreos.com/rkt/stage1/app/stop`
diff --git a/stage0/app.go b/stage0/app.go
index 2d72c42c59..b3b9d26ed6 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -28,6 +28,7 @@ import (
 	"syscall"
 
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/common/apps"
 	"github.com/coreos/rkt/pkg/aci"
 	"github.com/coreos/rkt/pkg/user"
 	// FIXME this should not be in stage1 anymore
@@ -40,13 +41,10 @@ import (
 
 type StartConfig struct {
 	*CommonConfig
-	Dir                  string
-	UsesOverlay          bool
-	AppName              *types.ACName
-	PodPID               int
-	InsecureCapabilities bool // Do not restrict capabilities
-	InsecurePaths        bool // Do not restrict access to files in sysfs or procfs
-	InsecureSeccomp      bool // Do not add seccomp restrictions
+	Dir         string
+	UsesOverlay bool
+	AppName     *types.ACName
+	PodPID      int
 }
 
 type StopConfig struct {
@@ -57,18 +55,26 @@ type StopConfig struct {
 }
 
 type AddConfig struct {
-	Name        *types.ACName
-	Annotations types.Annotations
+	*CommonConfig
+	Image                types.Hash
+	Apps                 *apps.Apps
+	RktGid               int
+	UsesOverlay          bool
+	PodPath              string
+	PodPID               int
+	InsecureCapabilities bool
+	InsecurePaths        bool
+	InsecureSeccomp      bool
 }
 
-func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) error {
+func AddApp(cfg AddConfig) error {
 	// there should be only one app in the config
-	app := pcfg.Apps.Last()
+	app := cfg.Apps.Last()
 	if app == nil {
 		return errors.New("no image specified")
 	}
 
-	am, err := cfg.Store.GetImageManifest(img.String())
+	am, err := cfg.Store.GetImageManifest(cfg.Image.String())
 	if err != nil {
 		return err
 	}
@@ -86,7 +92,7 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 		}
 	}
 
-	p, err := stage1types.LoadPod(dir, cfg.UUID)
+	p, err := stage1types.LoadPod(cfg.PodPath, cfg.UUID)
 	if err != nil {
 		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
 	}
@@ -109,11 +115,12 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 	if pm.Apps.Get(*appName) != nil {
 		return fmt.Errorf("error: multiple apps with name %s", *appName)
 	}
+
 	if am.App == nil && app.Exec == "" {
-		return fmt.Errorf("error: image %s has no app section and --exec argument is not provided", img)
+		return fmt.Errorf("error: image %s has no app section and --exec argument is not provided", cfg.Image)
 	}
 
-	appInfoDir := common.AppInfoPath(dir, *appName)
+	appInfoDir := common.AppInfoPath(cfg.PodPath, *appName)
 	if err := os.MkdirAll(appInfoDir, common.DefaultRegularDirPerm); err != nil {
 		return errwrap.Wrap(errors.New("error creating apps info directory"), err)
 	}
@@ -121,8 +128,8 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 	uidRange := user.NewBlankUidRange()
 	// TODO(iaguis): DRY: refactor this
 	var treeStoreID string
-	if cfg.UseOverlay {
-		treeStoreID, _, err := cfg.TreeStore.Render(img.String(), false)
+	if cfg.UsesOverlay {
+		treeStoreID, _, err := cfg.TreeStore.Render(cfg.Image.String(), false)
 		if err != nil {
 			return errwrap.Wrap(errors.New("error rendering tree image"), err)
 		}
@@ -131,25 +138,25 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 		if err != nil {
 			log.PrintE("warning: tree cache is in a bad state.  Rebuilding...", err)
 			var err error
-			treeStoreID, hash, err = cfg.TreeStore.Render(img.String(), true)
+			treeStoreID, hash, err = cfg.TreeStore.Render(cfg.Image.String(), true)
 			if err != nil {
 				return errwrap.Wrap(errors.New("error rendering tree image"), err)
 			}
 		}
 		cfg.RootHash = hash
 
-		if err := ioutil.WriteFile(common.AppTreeStoreIDPath(dir, *appName), []byte(treeStoreID), common.DefaultRegularFilePerm); err != nil {
+		if err := ioutil.WriteFile(common.AppTreeStoreIDPath(cfg.PodPath, *appName), []byte(treeStoreID), common.DefaultRegularFilePerm); err != nil {
 			return errwrap.Wrap(errors.New("error writing app treeStoreID"), err)
 		}
 	} else {
-		ad := common.AppPath(dir, *appName)
+		ad := common.AppPath(cfg.PodPath, *appName)
 
 		err := os.MkdirAll(ad, common.DefaultRegularDirPerm)
 		if err != nil {
 			return errwrap.Wrap(errors.New("error creating image directory"), err)
 		}
 
-		privateUsers, err := preparedWithPrivateUsers(dir)
+		privateUsers, err := preparedWithPrivateUsers(cfg.PodPath)
 		if err != nil {
 			log.FatalE("error reading user namespace information", err)
 		}
@@ -167,21 +174,27 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 			return errwrap.Wrap(fmt.Errorf("error shifting app %q's stage2 dir", *appName), err)
 		}
 
-		if err := aci.RenderACIWithImageID(*img, ad, cfg.Store, uidRange); err != nil {
+		if err := aci.RenderACIWithImageID(cfg.Image, ad, cfg.Store, uidRange); err != nil {
 			return errwrap.Wrap(errors.New("error rendering ACI"), err)
 		}
 	}
 
-	if err := writeManifest(*cfg.CommonConfig, *img, appInfoDir); err != nil {
+	if err := writeManifest(*cfg.CommonConfig, cfg.Image, appInfoDir); err != nil {
 		return errwrap.Wrap(errors.New("error writing manifest"), err)
 	}
 
-	if err := setupAppImage(cfg, *appName, *img, dir, cfg.UseOverlay); err != nil {
+	rcfg := RunConfig{
+		CommonConfig: cfg.CommonConfig,
+		UseOverlay:   cfg.UsesOverlay,
+		RktGid:       cfg.RktGid,
+	}
+
+	if err := setupAppImage(rcfg, *appName, cfg.Image, cfg.PodPath, cfg.UsesOverlay); err != nil {
 		return fmt.Errorf("error setting up app image: %v", err)
 	}
 
-	if cfg.UseOverlay {
-		imgDir := filepath.Join(dir, "overlay", treeStoreID)
+	if cfg.UsesOverlay {
+		imgDir := filepath.Join(cfg.PodPath, "overlay", treeStoreID)
 		if err := os.Chown(imgDir, -1, cfg.RktGid); err != nil {
 			return err
 		}
@@ -192,7 +205,7 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 		App:  am.App,
 		Image: schema.RuntimeImage{
 			Name:   &am.Name,
-			ID:     *img,
+			ID:     cfg.Image,
 			Labels: am.Labels,
 		},
 		ReadOnlyRootFS: app.ReadOnlyRootFS,
@@ -253,7 +266,7 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 	env := ra.App.Environment
 
 	env.Set("AC_APP_NAME", appName.String())
-	envFilePath := filepath.Join(common.Stage1RootfsPath(dir), "rkt", "env", appName.String())
+	envFilePath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "env", appName.String())
 
 	if err := common.WriteEnvFile(env, uidRange, envFilePath); err != nil {
 		return err
@@ -262,14 +275,51 @@ func AddApp(pcfg PrepareConfig, cfg RunConfig, dir string, img *types.Hash) erro
 	apps := append(p.Manifest.Apps, ra)
 	p.Manifest.Apps = apps
 
-	if err := updatePodManifest(dir, p.Manifest); err != nil {
+	if err := updatePodManifest(cfg.PodPath, p.Manifest); err != nil {
 		return err
 	}
 
+	eep, err := getStage1Entrypoint(cfg.PodPath, enterEntrypoint)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
+	}
+
+	args := []string{
+		cfg.UUID.String(),
+		app.Name,
+		filepath.Join(common.Stage1RootfsPath(cfg.PodPath), eep),
+		strconv.Itoa(cfg.PodPID),
+	}
+
+	if cfg.InsecureCapabilities {
+		args = append(args, "--disable-capabilities-restriction")
+	}
+
+	if cfg.InsecurePaths {
+		args = append(args, "--disable-paths")
+	}
+
+	if cfg.InsecureSeccomp {
+		args = append(args, "--disable-seccomp")
+	}
+
+	privateUsers, err := preparedWithPrivateUsers(cfg.PodPath)
+	if err != nil {
+		log.FatalE("error reading user namespace information", err)
+	}
+
+	if privateUsers != "" {
+		args = append(args, fmt.Sprintf("--private-users=%s", privateUsers))
+	}
+
 	if _, err := os.Create(common.AppCreatedPath(p.Root, appName.String())); err != nil {
 		return err
 	}
 
+	if err := callEntrypoint(cfg.PodPath, appAddEntrypoint, args); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -337,7 +387,7 @@ func callEntrypoint(dir, entrypoint string, args []string) error {
 	}
 
 	if err := c.Run(); err != nil {
-		return err
+		return fmt.Errorf("error executing stage1's entrypoint %q: %v", entrypoint, err)
 	}
 
 	if err := os.Chdir(previousDir); err != nil {
@@ -497,25 +547,6 @@ func StartApp(cfg StartConfig) error {
 		strconv.Itoa(cfg.PodPID),
 	}
 
-	if cfg.InsecureCapabilities {
-		args = append(args, "--disable-capabilities-restriction")
-	}
-	if cfg.InsecurePaths {
-		args = append(args, "--disable-paths")
-	}
-	if cfg.InsecureSeccomp {
-		args = append(args, "--disable-seccomp")
-	}
-
-	privateUsers, err := preparedWithPrivateUsers(cfg.Dir)
-	if err != nil {
-		log.FatalE("error reading user namespace information", err)
-	}
-
-	if privateUsers != "" {
-		args = append(args, fmt.Sprintf("--private-users=%s", privateUsers))
-	}
-
 	if _, err := os.Create(common.AppStartedPath(p.Root, cfg.AppName.String())); err != nil {
 		log.FatalE(fmt.Sprintf("error creating %s-started file", cfg.AppName.String()), err)
 	}
diff --git a/stage0/manifest.go b/stage0/manifest.go
index 35b92fc4f4..651918919b 100644
--- a/stage0/manifest.go
+++ b/stage0/manifest.go
@@ -34,6 +34,7 @@ const (
 	gcEntrypoint    = "coreos.com/rkt/stage1/gc"
 	stopEntrypoint  = "coreos.com/rkt/stage1/stop"
 
+	appAddEntrypoint   = "coreos.com/rkt/stage1/app/add"
 	appRmEntrypoint    = "coreos.com/rkt/stage1/app/rm"
 	appStartEntrypoint = "coreos.com/rkt/stage1/app/start"
 	appStopEntrypoint  = "coreos.com/rkt/stage1/app/stop"
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index 3b575d71dd..0023564a6f 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -33,6 +33,10 @@
             "name": "coreos.com/rkt/stage1/stop",
             "value": "@RKT_STAGE1_STOP@"
         },
+        {
+            "name": "coreos.com/rkt/stage1/app/add",
+            "value": "/app-add"
+        },
         {
             "name": "coreos.com/rkt/stage1/app/rm",
             "value": "/app-rm"
diff --git a/stage1/app-add/app-add.go b/stage1/app-add/app-add.go
new file mode 100644
index 0000000000..e3a235442c
--- /dev/null
+++ b/stage1/app-add/app-add.go
@@ -0,0 +1,169 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/coreos/go-systemd/unit"
+	"github.com/coreos/rkt/common/cgroup"
+	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1types "github.com/coreos/rkt/stage1/common/types"
+	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+
+	"github.com/appc/spec/schema/types"
+)
+
+var (
+	debug               bool
+	disableCapabilities bool
+	disablePaths        bool
+	disableSeccomp      bool
+	privateUsers        string
+	log                 *rktlog.Logger
+	diag                *rktlog.Logger
+)
+
+func init() {
+	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+	flag.BoolVar(&disableCapabilities, "disable-capabilities-restriction", false, "Disable capability restrictions")
+	flag.BoolVar(&disablePaths, "disable-paths", false, "Disable paths restrictions")
+	flag.BoolVar(&disableSeccomp, "disable-seccomp", false, "Disable seccomp restrictions")
+	flag.StringVar(&privateUsers, "private-users", "", "Run within user namespace. Can be set to [=UIDBASE[:NUIDS]]")
+}
+
+// TODO use named flags instead of positional
+func main() {
+	flag.Parse()
+
+	stage1initcommon.InitDebug(debug)
+
+	log, diag, _ = rktlog.NewLogSet("stage1", debug)
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
+	}
+
+	uuid, err := types.NewUUID(flag.Arg(0))
+	if err != nil {
+		log.PrintE("UUID is missing or malformed", err)
+		os.Exit(1)
+	}
+
+	appName, err := types.NewACName(flag.Arg(1))
+	if err != nil {
+		log.PrintE("invalid app name", err)
+		os.Exit(1)
+	}
+
+	enterCmd := []string{flag.Arg(2)}
+	enterCmd = append(enterCmd, fmt.Sprintf("--pid=%s", flag.Arg(3)), "--")
+
+	root := "."
+	p, err := stage1types.LoadPod(root, uuid)
+	if err != nil {
+		log.PrintE("failed to load pod", err)
+		os.Exit(1)
+	}
+
+	insecureOptions := stage1initcommon.Stage1InsecureOptions{
+		DisablePaths:        disablePaths,
+		DisableCapabilities: disableCapabilities,
+		DisableSeccomp:      disableSeccomp,
+	}
+
+	ra := p.Manifest.Apps.Get(*appName)
+	if ra == nil {
+		log.Printf("failed to get app")
+		os.Exit(1)
+	}
+
+	if ra.App.WorkingDirectory == "" {
+		ra.App.WorkingDirectory = "/"
+	}
+
+	/* prepare cgroups */
+	isUnified, err := cgroup.IsCgroupUnified("/")
+	if err != nil {
+		log.FatalE("failed to determine the cgroup version", err)
+		os.Exit(1)
+	}
+
+	if !isUnified {
+		enabledCgroups, err := cgroup.GetEnabledV1Cgroups()
+		if err != nil {
+			log.FatalE("error getting cgroups", err)
+			os.Exit(1)
+		}
+
+		b, err := ioutil.ReadFile(filepath.Join(p.Root, "subcgroup"))
+		if err == nil {
+			subcgroup := string(b)
+			serviceName := stage1initcommon.ServiceUnitName(ra.Name)
+
+			if err := cgroup.RemountCgroupKnobsRW(enabledCgroups, subcgroup, serviceName, enterCmd); err != nil {
+				log.FatalE("error restricting container cgroups", err)
+				os.Exit(1)
+			}
+		} else {
+			log.PrintE("continuing with per-app isolators disabled", err)
+		}
+	}
+
+	/* write service file */
+	binPath, err := stage1initcommon.FindBinPath(p, ra)
+	if err != nil {
+		log.PrintE("failed to find bin path", err)
+		os.Exit(1)
+	}
+
+	w := stage1initcommon.NewUnitWriter(p)
+
+	w.AppUnit(ra, binPath, privateUsers, insecureOptions,
+		unit.NewUnitOption("Unit", "Before", "halt.target"),
+		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
+		unit.NewUnitOption("Service", "StandardOutput", "journal+console"),
+		unit.NewUnitOption("Service", "StandardError", "journal+console"),
+	)
+
+	w.AppReaperUnit(ra.Name, binPath)
+
+	if err := w.Error(); err != nil {
+		log.PrintE("error generating app units", err)
+		os.Exit(1)
+	}
+
+	args := enterCmd
+	args = append(args, "/usr/bin/systemctl")
+	args = append(args, "daemon-reload")
+
+	cmd := exec.Cmd{
+		Path: args[0],
+		Args: args,
+	}
+
+	if err := cmd.Run(); err != nil {
+		log.PrintE(`error executing "systemctl daemon-reload"`, err)
+		os.Exit(1)
+	}
+
+	os.Exit(0)
+}
diff --git a/stage1/app-add/app-add.mk b/stage1/app-add/app-add.mk
new file mode 100644
index 0000000000..b96c5ea77b
--- /dev/null
+++ b/stage1/app-add/app-add.mk
@@ -0,0 +1 @@
+include stage1/makelib/aci_simple_go_bin.mk
diff --git a/stage1/app-start/app-start.go b/stage1/app-start/app-start.go
index be51e09eaf..2dc9b7423c 100644
--- a/stage1/app-start/app-start.go
+++ b/stage1/app-start/app-start.go
@@ -22,37 +22,23 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"path/filepath"
-
-	"github.com/coreos/rkt/common/cgroup"
 
 	rktlog "github.com/coreos/rkt/pkg/log"
-	stage1types "github.com/coreos/rkt/stage1/common/types"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/go-systemd/unit"
 )
 
 var (
-	debug               bool
-	disableCapabilities bool
-	disablePaths        bool
-	disableSeccomp      bool
-	privateUsers        string
-	log                 *rktlog.Logger
-	diag                *rktlog.Logger
+	debug bool
+	log   *rktlog.Logger
+	diag  *rktlog.Logger
 )
 
 func init() {
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
-	flag.BoolVar(&disableCapabilities, "disable-capabilities-restriction", false, "Disable capability restrictions")
-	flag.BoolVar(&disablePaths, "disable-paths", false, "Disable paths restrictions")
-	flag.BoolVar(&disableSeccomp, "disable-seccomp", false, "Disable seccomp restrictions")
-	flag.StringVar(&privateUsers, "private-users", "", "Run within user namespace. Can be set to [=UIDBASE[:NUIDS]]")
 }
 
-// TODO use named flags instead of positional
 func main() {
 	flag.Parse()
 
@@ -63,12 +49,6 @@ func main() {
 		diag.SetOutput(ioutil.Discard)
 	}
 
-	uuid, err := types.NewUUID(flag.Arg(0))
-	if err != nil {
-		log.PrintE("UUID is missing or malformed", err)
-		os.Exit(1)
-	}
-
 	appName, err := types.NewACName(flag.Arg(1))
 	if err != nil {
 		log.PrintE("invalid app name", err)
@@ -78,98 +58,12 @@ func main() {
 	enterCmd := []string{flag.Arg(2)}
 	enterCmd = append(enterCmd, fmt.Sprintf("--pid=%s", flag.Arg(3)), "--")
 
-	root := "."
-	p, err := stage1types.LoadPod(root, uuid)
-	if err != nil {
-		log.PrintE("failed to load pod", err)
-		os.Exit(1)
-	}
-
-	insecureOptions := stage1initcommon.Stage1InsecureOptions{
-		DisablePaths:        disablePaths,
-		DisableCapabilities: disableCapabilities,
-		DisableSeccomp:      disableSeccomp,
-	}
-
-	ra := p.Manifest.Apps.Get(*appName)
-	if ra == nil {
-		log.Printf("failed to get app")
-		os.Exit(1)
-	}
-
-	if ra.App.WorkingDirectory == "" {
-		ra.App.WorkingDirectory = "/"
-	}
-
-	/* prepare cgroups */
-	isUnified, err := cgroup.IsCgroupUnified("/")
-	if err != nil {
-		log.FatalE("failed to determine the cgroup version", err)
-		os.Exit(1)
-	}
-	if !isUnified {
-		enabledCgroups, err := cgroup.GetEnabledV1Cgroups()
-		if err != nil {
-			log.FatalE("error getting cgroups", err)
-			os.Exit(1)
-		}
-		b, err := ioutil.ReadFile(filepath.Join(p.Root, "subcgroup"))
-		if err == nil {
-			subcgroup := string(b)
-			serviceName := stage1initcommon.ServiceUnitName(ra.Name)
-
-			if err := cgroup.RemountCgroupKnobsRW(enabledCgroups, subcgroup, serviceName, enterCmd); err != nil {
-				log.FatalE("error restricting container cgroups", err)
-				os.Exit(1)
-			}
-		} else {
-			log.PrintE("continuing with per-app isolators disabled", err)
-		}
-	}
-
-	/* write service file */
-	binPath, err := stage1initcommon.FindBinPath(p, ra)
-	if err != nil {
-		log.PrintE("failed to find bin path", err)
-		os.Exit(1)
-	}
-
-	w := stage1initcommon.NewUnitWriter(p)
-
-	w.AppUnit(ra, binPath, privateUsers, insecureOptions,
-		unit.NewUnitOption("Unit", "Before", "halt.target"),
-		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
-		unit.NewUnitOption("Service", "StandardOutput", "journal+console"),
-		unit.NewUnitOption("Service", "StandardError", "journal+console"),
-	)
-
-	w.AppReaperUnit(ra.Name, binPath)
-
-	if err := w.Error(); err != nil {
-		log.PrintE("error generating app units", err)
-		os.Exit(1)
-	}
-
 	args := enterCmd
 	args = append(args, "/usr/bin/systemctl")
-	args = append(args, "daemon-reload")
-
-	cmd := exec.Cmd{
-		Path: args[0],
-		Args: args,
-	}
-
-	if err := cmd.Run(); err != nil {
-		log.PrintE("error executing daemon-reload", err)
-		os.Exit(1)
-	}
-
-	args = enterCmd
-	args = append(args, "/usr/bin/systemctl")
 	args = append(args, "start")
 	args = append(args, appName.String())
 
-	cmd = exec.Cmd{
+	cmd := exec.Cmd{
 		Path: args[0],
 		Args: args,
 	}
@@ -179,7 +73,5 @@ func main() {
 		os.Exit(1)
 	}
 
-	// TODO unmount all the volumes
-
 	os.Exit(0)
 }
diff --git a/stage1/secondary-stuff.mk b/stage1/secondary-stuff.mk
index f4b9e3723d..449bf4a5f2 100644
--- a/stage1/secondary-stuff.mk
+++ b/stage1/secondary-stuff.mk
@@ -12,6 +12,7 @@ _S1_SS_SUBDIRS_ := \
 	reaper \
 	stop \
 	stop_kvm \
+	app-add \
 	app-rm \
 	app-start \
 	app-stop \

From 5eab251cb17113bbba4d7848d80752839b9cc5cc Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 27 Sep 2016 12:38:26 +0200
Subject: [PATCH 0821/1304] app: remove code duplication for preparing the
 stage1 image

This removes some duplicated code in AddApp which was previously copied
over.
---
 stage0/app.go | 60 ++++++++++-----------------------------------------
 stage0/run.go | 51 ++++++++++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 71 deletions(-)

diff --git a/stage0/app.go b/stage0/app.go
index b3b9d26ed6..eeb923b19a 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -29,7 +29,6 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
-	"github.com/coreos/rkt/pkg/aci"
 	"github.com/coreos/rkt/pkg/user"
 	// FIXME this should not be in stage1 anymore
 	stage1types "github.com/coreos/rkt/stage1/common/types"
@@ -125,62 +124,25 @@ func AddApp(cfg AddConfig) error {
 		return errwrap.Wrap(errors.New("error creating apps info directory"), err)
 	}
 
-	uidRange := user.NewBlankUidRange()
-	// TODO(iaguis): DRY: refactor this
-	var treeStoreID string
-	if cfg.UsesOverlay {
-		treeStoreID, _, err := cfg.TreeStore.Render(cfg.Image.String(), false)
-		if err != nil {
-			return errwrap.Wrap(errors.New("error rendering tree image"), err)
-		}
-
-		hash, err := cfg.TreeStore.Check(treeStoreID)
-		if err != nil {
-			log.PrintE("warning: tree cache is in a bad state.  Rebuilding...", err)
-			var err error
-			treeStoreID, hash, err = cfg.TreeStore.Render(cfg.Image.String(), true)
-			if err != nil {
-				return errwrap.Wrap(errors.New("error rendering tree image"), err)
-			}
-		}
-		cfg.RootHash = hash
-
-		if err := ioutil.WriteFile(common.AppTreeStoreIDPath(cfg.PodPath, *appName), []byte(treeStoreID), common.DefaultRegularFilePerm); err != nil {
-			return errwrap.Wrap(errors.New("error writing app treeStoreID"), err)
-		}
-	} else {
-		ad := common.AppPath(cfg.PodPath, *appName)
-
-		err := os.MkdirAll(ad, common.DefaultRegularDirPerm)
-		if err != nil {
-			return errwrap.Wrap(errors.New("error creating image directory"), err)
-		}
+	pcfg := PrepareConfig{
+		CommonConfig: cfg.CommonConfig,
+		PrivateUsers: user.NewBlankUidRange(),
+	}
 
+	if cfg.UsesOverlay {
 		privateUsers, err := preparedWithPrivateUsers(cfg.PodPath)
 		if err != nil {
 			log.FatalE("error reading user namespace information", err)
 		}
 
-		if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
+		if err := pcfg.PrivateUsers.Deserialize([]byte(privateUsers)); err != nil {
 			return err
 		}
-
-		shiftedUid, shiftedGid, err := uidRange.ShiftRange(uint32(os.Getuid()), uint32(os.Getgid()))
-		if err != nil {
-			return errwrap.Wrap(errors.New("error getting uid, gid"), err)
-		}
-
-		if err := os.Chown(ad, int(shiftedUid), int(shiftedGid)); err != nil {
-			return errwrap.Wrap(fmt.Errorf("error shifting app %q's stage2 dir", *appName), err)
-		}
-
-		if err := aci.RenderACIWithImageID(cfg.Image, ad, cfg.Store, uidRange); err != nil {
-			return errwrap.Wrap(errors.New("error rendering ACI"), err)
-		}
 	}
 
-	if err := writeManifest(*cfg.CommonConfig, cfg.Image, appInfoDir); err != nil {
-		return errwrap.Wrap(errors.New("error writing manifest"), err)
+	treeStoreID, err := prepareAppImage(pcfg, *appName, cfg.Image, cfg.PodPath, cfg.UsesOverlay)
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("error preparing image %s", cfg.Image), err)
 	}
 
 	rcfg := RunConfig{
@@ -268,7 +230,7 @@ func AddApp(cfg AddConfig) error {
 	env.Set("AC_APP_NAME", appName.String())
 	envFilePath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "env", appName.String())
 
-	if err := common.WriteEnvFile(env, uidRange, envFilePath); err != nil {
+	if err := common.WriteEnvFile(env, pcfg.PrivateUsers, envFilePath); err != nil {
 		return err
 	}
 
@@ -286,7 +248,7 @@ func AddApp(cfg AddConfig) error {
 
 	args := []string{
 		cfg.UUID.String(),
-		app.Name,
+		appName.String(),
 		filepath.Join(common.Stage1RootfsPath(cfg.PodPath), eep),
 		strconv.Itoa(cfg.PodPID),
 	}
diff --git a/stage0/run.go b/stage0/run.go
index 9cb991c561..0502452cfd 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -222,8 +222,8 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 			}
 		}
 
-		if err := prepareAppImage(cfg, *appName, img, dir, cfg.UseOverlay); err != nil {
-			return errwrap.Wrap(fmt.Errorf("error setting up image %s", img), err)
+		if _, err := prepareAppImage(cfg, *appName, img, dir, cfg.UseOverlay); err != nil {
+			return errwrap.Wrap(fmt.Errorf("error preparing image %s", img), err)
 		}
 		if pm.Apps.Get(*appName) != nil {
 			return fmt.Errorf("error: multiple apps with name %s", am.Name)
@@ -439,8 +439,8 @@ func validatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		if err != nil {
 			return nil, errwrap.Wrap(errors.New("error getting the image manifest from store"), err)
 		}
-		if err := prepareAppImage(cfg, ra.Name, img.ID, dir, cfg.UseOverlay); err != nil {
-			return nil, errwrap.Wrap(fmt.Errorf("error setting up image %s", img), err)
+		if _, err := prepareAppImage(cfg, ra.Name, img.ID, dir, cfg.UseOverlay); err != nil {
+			return nil, errwrap.Wrap(fmt.Errorf("error preparing image %s", img), err)
 		}
 		if _, ok := appNames[ra.Name]; ok {
 			return nil, fmt.Errorf("multiple apps with same name %s", ra.Name)
@@ -731,38 +731,42 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 
 // prepareAppImage renders and verifies the tree cache of the app image that
 // corresponds to the given app name.
-// When useOverlay is false, it attempts to render and expand the app image
-func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cdir string, useOverlay bool) error {
+// When useOverlay is false, it attempts to render and expand the app image.
+// It returns the tree store ID if overlay is being used.
+func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cdir string, useOverlay bool) (string, error) {
 	debug("Loading image %s", img.String())
 
 	am, err := cfg.Store.GetImageManifest(img.String())
 	if err != nil {
-		return errwrap.Wrap(errors.New("error getting the manifest"), err)
+		return "", errwrap.Wrap(errors.New("error getting the manifest"), err)
 	}
 
 	if _, hasOS := am.Labels.Get("os"); !hasOS {
-		return fmt.Errorf("missing os label in the image manifest")
+		return "", fmt.Errorf("missing os label in the image manifest")
 	}
+
 	if _, hasArch := am.Labels.Get("arch"); !hasArch {
-		return fmt.Errorf("missing arch label in the image manifest")
+		return "", fmt.Errorf("missing arch label in the image manifest")
 	}
 
 	if err := types.IsValidOSArch(am.Labels.ToMap(), ValidOSArch); err != nil {
-		return err
+		return "", err
 	}
 
 	appInfoDir := common.AppInfoPath(cdir, appName)
 	if err := os.MkdirAll(appInfoDir, common.DefaultRegularDirPerm); err != nil {
-		return errwrap.Wrap(errors.New("error creating apps info directory"), err)
+		return "", errwrap.Wrap(errors.New("error creating apps info directory"), err)
 	}
 
+	var treeStoreID string
 	if useOverlay {
 		if cfg.PrivateUsers.Shift > 0 {
-			return fmt.Errorf("cannot use both overlay and user namespace: not implemented yet. (Try --no-overlay)")
+			return "", fmt.Errorf("cannot use both overlay and user namespace: not implemented yet. (Try --no-overlay)")
 		}
-		treeStoreID, _, err := cfg.TreeStore.Render(img.String(), false)
+
+		treeStoreID, _, err = cfg.TreeStore.Render(img.String(), false)
 		if err != nil {
-			return errwrap.Wrap(errors.New("error rendering tree image"), err)
+			return "", errwrap.Wrap(errors.New("error rendering tree image"), err)
 		}
 
 		if !cfg.SkipTreeStoreCheck {
@@ -772,39 +776,42 @@ func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cd
 				var err error
 				treeStoreID, hash, err = cfg.TreeStore.Render(img.String(), true)
 				if err != nil {
-					return errwrap.Wrap(errors.New("error rendering tree image"), err)
+					return "", errwrap.Wrap(errors.New("error rendering tree image"), err)
 				}
 			}
 			cfg.CommonConfig.RootHash = hash
 		}
 
 		if err := ioutil.WriteFile(common.AppTreeStoreIDPath(cdir, appName), []byte(treeStoreID), common.DefaultRegularFilePerm); err != nil {
-			return errwrap.Wrap(errors.New("error writing app treeStoreID"), err)
+			return "", errwrap.Wrap(errors.New("error writing app treeStoreID"), err)
 		}
 	} else {
 		ad := common.AppPath(cdir, appName)
+
 		err := os.MkdirAll(ad, common.DefaultRegularDirPerm)
 		if err != nil {
-			return errwrap.Wrap(errors.New("error creating image directory"), err)
+			return "", errwrap.Wrap(errors.New("error creating image directory"), err)
 		}
 
 		shiftedUid, shiftedGid, err := cfg.PrivateUsers.ShiftRange(uint32(os.Getuid()), uint32(os.Getgid()))
 		if err != nil {
-			return errwrap.Wrap(errors.New("error getting uid, gid"), err)
+			return "", errwrap.Wrap(errors.New("error getting uid, gid"), err)
 		}
 
 		if err := os.Chown(ad, int(shiftedUid), int(shiftedGid)); err != nil {
-			return errwrap.Wrap(fmt.Errorf("error shifting app %q's stage2 dir", appName), err)
+			return "", errwrap.Wrap(fmt.Errorf("error shifting app %q's stage2 dir", appName), err)
 		}
 
 		if err := aci.RenderACIWithImageID(img, ad, cfg.Store, cfg.PrivateUsers); err != nil {
-			return errwrap.Wrap(errors.New("error rendering ACI"), err)
+			return "", errwrap.Wrap(errors.New("error rendering ACI"), err)
 		}
 	}
+
 	if err := writeManifest(*cfg.CommonConfig, img, appInfoDir); err != nil {
-		return err
+		return "", errwrap.Wrap(errors.New("error writing manifest"), err)
 	}
-	return nil
+
+	return treeStoreID, nil
 }
 
 // setupAppImage mounts the overlay filesystem for the app image that

From 1babb4fb2188e0b32a3b6b28d5b74401ee29541a Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 29 Sep 2016 11:11:15 +0200
Subject: [PATCH 0822/1304] app-rm: introduce RmConfig

This introduces a dedicated RmConfig synchronous to all the other *App
methods.
---
 stage0/app.go | 53 +++++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/stage0/app.go b/stage0/app.go
index eeb923b19a..de346349bb 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -66,6 +66,14 @@ type AddConfig struct {
 	InsecureSeccomp      bool
 }
 
+type RmConfig struct {
+	*CommonConfig
+	PodPath     string
+	UsesOverlay bool
+	AppName     *types.ACName
+	PodPID      int
+}
+
 func AddApp(cfg AddConfig) error {
 	// there should be only one app in the config
 	app := cfg.Apps.Last()
@@ -359,9 +367,8 @@ func callEntrypoint(dir, entrypoint string, args []string) error {
 	return nil
 }
 
-// TODO(iaguis): RmConfig?
-func RmApp(dir string, uuid *types.UUID, usesOverlay bool, appName *types.ACName, podPID int) error {
-	p, err := stage1types.LoadPod(dir, uuid)
+func RmApp(cfg RmConfig) error {
+	p, err := stage1types.LoadPod(cfg.PodPath, cfg.UUID)
 	if err != nil {
 		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
 	}
@@ -381,33 +388,33 @@ func RmApp(dir string, uuid *types.UUID, usesOverlay bool, appName *types.ACName
 		return errors.New("immutable pod: cannot remove application")
 	}
 
-	app := pm.Apps.Get(*appName)
+	app := pm.Apps.Get(*cfg.AppName)
 	if app == nil {
-		return fmt.Errorf("error: nonexistent app %q", *appName)
+		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
 	}
 
-	treeStoreID, err := ioutil.ReadFile(common.AppTreeStoreIDPath(dir, *appName))
+	treeStoreID, err := ioutil.ReadFile(common.AppTreeStoreIDPath(cfg.PodPath, *cfg.AppName))
 	if err != nil {
 		return err
 	}
 
-	eep, err := getStage1Entrypoint(dir, enterEntrypoint)
+	eep, err := getStage1Entrypoint(cfg.PodPath, enterEntrypoint)
 	if err != nil {
 		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
 	}
 
-	if podPID > 0 {
+	if cfg.PodPID > 0 {
 		// Call app-stop and app-rm entrypoint only if the pod is still running.
 		// Otherwise, there's not much we can do about it except unmounting/removing
 		// the file system.
 		args := []string{
-			uuid.String(),
-			appName.String(),
-			filepath.Join(common.Stage1RootfsPath(dir), eep),
-			strconv.Itoa(podPID),
+			cfg.UUID.String(),
+			cfg.AppName.String(),
+			filepath.Join(common.Stage1RootfsPath(cfg.PodPath), eep),
+			strconv.Itoa(cfg.PodPID),
 		}
 
-		if err := callEntrypoint(dir, appStopEntrypoint, args); err != nil {
+		if err := callEntrypoint(cfg.PodPath, appStopEntrypoint, args); err != nil {
 			status, err := common.GetExitStatus(err)
 			// ignore nonexistent units failing to stop. Exit status 5
 			// comes from systemctl and means the unit doesn't exist
@@ -418,45 +425,45 @@ func RmApp(dir string, uuid *types.UUID, usesOverlay bool, appName *types.ACName
 			}
 		}
 
-		if err := callEntrypoint(dir, appRmEntrypoint, args); err != nil {
+		if err := callEntrypoint(cfg.PodPath, appRmEntrypoint, args); err != nil {
 			return err
 		}
 	}
 
-	appInfoDir := common.AppInfoPath(dir, *appName)
+	appInfoDir := common.AppInfoPath(cfg.PodPath, *cfg.AppName)
 	if err := os.RemoveAll(appInfoDir); err != nil {
 		return errwrap.Wrap(errors.New("error removing app info directory"), err)
 	}
 
-	if usesOverlay {
-		appRootfs := common.AppRootfsPath(dir, *appName)
+	if cfg.UsesOverlay {
+		appRootfs := common.AppRootfsPath(cfg.PodPath, *cfg.AppName)
 		if err := syscall.Unmount(appRootfs, 0); err != nil {
 			return err
 		}
 
-		ts := filepath.Join(dir, "overlay", string(treeStoreID))
+		ts := filepath.Join(cfg.PodPath, "overlay", string(treeStoreID))
 		if err := os.RemoveAll(ts); err != nil {
 			return errwrap.Wrap(errors.New("error removing app info directory"), err)
 		}
 	}
 
-	if err := os.RemoveAll(common.AppPath(dir, *appName)); err != nil {
+	if err := os.RemoveAll(common.AppPath(cfg.PodPath, *cfg.AppName)); err != nil {
 		return err
 	}
 
-	appStatusPath := filepath.Join(common.Stage1RootfsPath(dir), "rkt", "status", appName.String())
+	appStatusPath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "status", cfg.AppName.String())
 	if err := os.Remove(appStatusPath); err != nil && !os.IsNotExist(err) {
 		return err
 	}
 
-	envPath := filepath.Join(common.Stage1RootfsPath(dir), "rkt", "env", appName.String())
+	envPath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "env", cfg.AppName.String())
 	if err := os.Remove(envPath); err != nil && !os.IsNotExist(err) {
 		return err
 	}
 
-	removeAppFromPodManifest(pm, appName)
+	removeAppFromPodManifest(pm, cfg.AppName)
 
-	if err := updatePodManifest(dir, pm); err != nil {
+	if err := updatePodManifest(cfg.PodPath, pm); err != nil {
 		return err
 	}
 

From 22517acb3416e4a7524e1bc4a8a28f0a13dca527 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 4 Oct 2016 13:42:16 +0200
Subject: [PATCH 0823/1304] Documentation: specify app subcommands
 synchronization

This specifies the synchronization of pod mutation operations using a
file lock.
---
 Documentation/devel/pod-lifecycle.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Documentation/devel/pod-lifecycle.md b/Documentation/devel/pod-lifecycle.md
index 7d1c6003da..6fe748d359 100644
--- a/Documentation/devel/pod-lifecycle.md
+++ b/Documentation/devel/pod-lifecycle.md
@@ -37,6 +37,25 @@ To prevent the period between first creating a pod's directory and acquiring its
 | ExitedGarbage   | "$var/exited-garbage/$uuid" | exited+deleting         | exited+gc-marked         |
 | Garbage         | "$var/garbage/$uuid"        | prepare-failed+deleting | prepare-failed+gc-marked |
 
+## App
+
+The `rkt app` family of subcommands allow mutating operations on a running pod, namely adding, starting, stopping, and removing applications.
+The `rkt app sandbox` subcommand transitions to the Run phase as described above, whereas the remaining subcommands mutate the pod while staying in the Run phase.
+To synchronize operations inside the Run phase an additional advisory lock `$var/run/$uuid/pod.lck` is being introduced.
+Locking on the `$var/run/$uuid/pod` manifest won't work because changes on it need to be atomic, realized by overwriting the original manifest.
+If this file is locked, the pod is undergoing a mutation. Note that only `rkt add/rm` operations are synchronized.
+To retain consistency for all other operations (i.e. `rkt list`) that need to read the `$var/run/$uuid/pod` manifest all mutating operations are atomic.
+
+The `app add/start/stop/rm` subcommands all run within the Run phase where the exclusive advisory lock on the `$var/run/$uuid` directory is held by the systemd-nspawn process.
+The following table gives an overview of the states when a lock on `$var/run/$uuid/pod.lck` is being held:
+
+| Phase  | Locked exclusively | Unlocked |
+|--------|--------------------|----------|
+| Add    | adding             | added    |
+| Start  | -                  | -        |
+| Stop   | -                  | -        |
+| Remove | removing           | removed  |
+
 These phases, their function, and how they proceed through their respective states is explained in more detail below.
 
 ## Embryo

From 953282c025d78fd6d044347b270563b7dd572d0a Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 4 Oct 2016 13:43:46 +0200
Subject: [PATCH 0824/1304] app: implement synchronization of pod mutation
 operations

---
 common/common.go |  7 +++++++
 stage0/app.go    | 15 +++++++++++++++
 stage0/run.go    |  7 +++++++
 3 files changed, 29 insertions(+)

diff --git a/common/common.go b/common/common.go
index dbf553ddf1..7bb86077a2 100644
--- a/common/common.go
+++ b/common/common.go
@@ -102,6 +102,13 @@ func PodManifestPath(root string) string {
 	return filepath.Join(root, "pod")
 }
 
+// PodManifestLockPath returns the path in root to the Pod Manifest lock file.
+// This must be different from the PodManifestPath since mutations on the pod manifest file
+// happen by overwriting the original file.
+func PodManifestLockPath(root string) string {
+	return filepath.Join(root, "pod.lck")
+}
+
 // AppsStatusesPath returns the path of the status dir for all apps.
 func AppsStatusesPath(root string) string {
 	return filepath.Join(Stage1RootfsPath(root), "/rkt/status")
diff --git a/stage0/app.go b/stage0/app.go
index de346349bb..689b26ccae 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -29,6 +29,7 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
+	"github.com/coreos/rkt/pkg/lock"
 	"github.com/coreos/rkt/pkg/user"
 	// FIXME this should not be in stage1 anymore
 	stage1types "github.com/coreos/rkt/stage1/common/types"
@@ -99,6 +100,13 @@ func AddApp(cfg AddConfig) error {
 		}
 	}
 
+	debug("locking pod")
+	l, err := lock.ExclusiveLock(common.PodManifestLockPath(cfg.PodPath), lock.RegFile)
+	if err != nil {
+		return errwrap.Wrap(errors.New("failed to lock pod"), err)
+	}
+	defer l.Close()
+
 	p, err := stage1types.LoadPod(cfg.PodPath, cfg.UUID)
 	if err != nil {
 		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
@@ -368,6 +376,13 @@ func callEntrypoint(dir, entrypoint string, args []string) error {
 }
 
 func RmApp(cfg RmConfig) error {
+	debug("locking pod")
+	l, err := lock.ExclusiveLock(common.PodManifestLockPath(cfg.PodPath), lock.RegFile)
+	if err != nil {
+		return errwrap.Wrap(errors.New("failed to lock pod"), err)
+	}
+	defer l.Close()
+
 	p, err := stage1types.LoadPod(cfg.PodPath, cfg.UUID)
 	if err != nil {
 		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
diff --git a/stage0/run.go b/stage0/run.go
index 0502452cfd..86d3a3df72 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -481,6 +481,13 @@ func Prepare(cfg PrepareConfig, dir string, uuid *types.UUID) error {
 
 	cfg.CommonConfig.ManifestData = string(pmb)
 
+	// create pod lock file for app add/rm operations.
+	f, err := os.OpenFile(common.PodManifestLockPath(dir), os.O_CREATE|os.O_RDWR, 0600)
+	if err != nil {
+		return err
+	}
+	f.Close()
+
 	debug("Writing pod manifest")
 	fn := common.PodManifestPath(dir)
 	if err := ioutil.WriteFile(fn, pmb, common.DefaultRegularFilePerm); err != nil {

From 3fcc507f54cad5f9df8e9f590cc7ca27e05abf60 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Fri, 21 Oct 2016 17:07:06 +0200
Subject: [PATCH 0825/1304] stage1/kvm: correctly bind-mount read-only volumes

Fixes #3302
---
 stage1/init/kvm.go                     | 17 ++++++++------
 tests/rkt_volume_mount_fly_test.go     |  1 -
 tests/rkt_volume_mount_generic_test.go |  4 ++--
 tests/rkt_volume_mount_test.go         | 32 +++++++++++++++-----------
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index a911bacc1c..16a677af38 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -120,10 +120,6 @@ func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.Runtim
 func doBindMount(source, destination string, readOnly bool, recursive *bool) error {
 	var flags uintptr = syscall.MS_BIND
 
-	if readOnly {
-		flags |= syscall.MS_RDONLY
-	}
-
 	// Enable recursive by default and remove it if explicitly requested
 	recursiveBool := recursive == nil || *recursive == true
 	if recursiveBool {
@@ -131,7 +127,14 @@ func doBindMount(source, destination string, readOnly bool, recursive *bool) err
 	}
 
 	if err := syscall.Mount(source, destination, "bind", flags, ""); err != nil {
-		return err
+		return errwrap.Wrap(fmt.Errorf("error mounting %s", destination), err)
+	}
+
+	// Linux can't bind-mount with readonly in a single operation, so remount +ro
+	if readOnly {
+		if err := syscall.Mount("", destination, "none", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, ""); err != nil {
+			return errwrap.Wrap(fmt.Errorf("error remounting read-only %s", destination), err)
+		}
 	}
 
 	if readOnly && recursiveBool {
@@ -144,8 +147,8 @@ func doBindMount(source, destination string, readOnly bool, recursive *bool) err
 
 		for _, mnt := range mnts {
 			innerAbsPath := destination + strings.Replace(mnt.MountPoint, source, "", -1)
-			if err := syscall.Mount("", innerAbsPath, "none", syscall.MS_REMOUNT|syscall.MS_RDONLY, ""); err != nil {
-				return err
+			if err := syscall.Mount("", innerAbsPath, "none", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, ""); err != nil {
+				return errwrap.Wrap(fmt.Errorf("error remounting child mount %s read-only", innerAbsPath), err)
 			}
 		}
 	}
diff --git a/tests/rkt_volume_mount_fly_test.go b/tests/rkt_volume_mount_fly_test.go
index 9b50ff5c78..af9b703da5 100644
--- a/tests/rkt_volume_mount_fly_test.go
+++ b/tests/rkt_volume_mount_fly_test.go
@@ -43,7 +43,6 @@ func TestVolumeMount(t *testing.T) {
 					volDir, mountDir,
 				),
 				nil,
-				254, /* TODO: decide on consistency with other stage1s */
 				`run: can't evaluate mounts: missing mount for volume "test2"`,
 			},
 		}}).Execute(t)
diff --git a/tests/rkt_volume_mount_generic_test.go b/tests/rkt_volume_mount_generic_test.go
index 30682a3c21..5cf495d774 100644
--- a/tests/rkt_volume_mount_generic_test.go
+++ b/tests/rkt_volume_mount_generic_test.go
@@ -43,8 +43,8 @@ func TestVolumeMount(t *testing.T) {
 					volDir, mountDir,
 				),
 				nil,
-				0,
 				innerFileContent,
 			},
-		}}).Execute(t)
+		},
+	}).Execute(t)
 }
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
index 78618c0e02..0afec5b2f3 100644
--- a/tests/rkt_volume_mount_test.go
+++ b/tests/rkt_volume_mount_test.go
@@ -102,7 +102,6 @@ type volumeMountTestCase struct {
 	images         []imagePatch
 	cmdArgs        string
 	podManifest    *schema.PodManifest
-	expectedExit   int
 	expectedResult string
 }
 
@@ -121,7 +120,6 @@ var (
 				volDir, mountDir,
 			),
 			nil,
-			0,
 			innerFileContent,
 		},
 		{
@@ -137,8 +135,7 @@ var (
 				volDir, mountDir,
 			),
 			nil,
-			254,
-			"",
+			"read-only file system",
 		},
 	}
 
@@ -156,9 +153,23 @@ var (
 				volDir, mountDir,
 			),
 			nil,
-			0,
 			outerFileContent,
 		},
+		{
+			"CLI: read-only non-recursive write file must fail",
+			[]imagePatch{
+				{
+					"rkt-test-run-write-file.aci",
+					[]string{fmt.Sprintf("--exec=/inspect --write-file --file-name %s", "/mnt/lol")},
+				},
+			},
+			fmt.Sprintf(
+				"--volume=test1,kind=host,source=%s,readOnly=true,recursive=false --mount volume=test1,target=%s",
+				volDir, mountDir,
+			),
+			nil,
+			"read-only file system",
+		},
 	}
 
 	volumeMountTestCasesRecursivePodManifest = []volumeMountTestCase{
@@ -191,7 +202,6 @@ var (
 						Mode: nil, UID: nil, GID: nil},
 				},
 			},
-			0,
 			innerFileContent,
 		},
 		{
@@ -224,8 +234,7 @@ var (
 						Mode: nil, UID: nil, GID: nil},
 				},
 			},
-			254,
-			"",
+			"read-only file system",
 		},
 	}
 
@@ -261,7 +270,6 @@ var (
 						Mode: nil, UID: nil, GID: nil},
 				},
 			},
-			0,
 			"host:foo",
 		},
 	}
@@ -296,7 +304,6 @@ var (
 						Mode: nil, UID: nil, GID: nil},
 				},
 			},
-			0,
 			outerFileContent,
 		},
 	}
@@ -357,7 +364,7 @@ func NewTestVolumeMount(volumeMountTestCases [][]volumeMountTestCase) testutils.
 						t.Fatalf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
 					}
 				}
-				waitOrFail(t, child, tt.expectedExit)
+				child.Wait()
 				verifyHostFile(t, volDir, "file", i, tt.expectedResult)
 
 				// 2. Test 'rkt prepare' + 'rkt run-prepared'.
@@ -379,8 +386,7 @@ func NewTestVolumeMount(volumeMountTestCases [][]volumeMountTestCase) testutils.
 						t.Fatalf("Expected %q but not found: %v\n%s", tt.expectedResult, err, out)
 					}
 				}
-
-				waitOrFail(t, child, tt.expectedExit)
+				child.Wait()
 				verifyHostFile(t, volDir, "file", i, tt.expectedResult)
 
 				// we run the garbage collector and remove the imported images to save

From 31a4f0c8a67f02d4435dc4ed93a759c7e6426ba9 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 26 Oct 2016 15:47:01 +0200
Subject: [PATCH 0826/1304] Documentation: remove rkt-builder instructions.

Fixes #3316
---
 Documentation/rkt-build-rkt.md | 67 +---------------------------------
 1 file changed, 1 insertion(+), 66 deletions(-)

diff --git a/Documentation/rkt-build-rkt.md b/Documentation/rkt-build-rkt.md
index 862aeb5172..9e6dc99cd1 100644
--- a/Documentation/rkt-build-rkt.md
+++ b/Documentation/rkt-build-rkt.md
@@ -5,31 +5,8 @@ It currently can be built in: _Debian Sid_.
 
 All commands assume you are running them in your local git checkout of rkt.
 
-## Building coreos.com/rkt/builder using acbuild
-
-Requirements:
-- rkt
-
-The file `scripts/acbuild-rkt-builder.sh` contains a simple bash script which generates a Debian Sid tree and creates an ACI ready to build `rkt`.
-
-Running the build script:
-
-```
-./scripts/acbuild-rkt-builder.sh
-```
-
-Once that is finished there should be a `rkt-builder.aci` file in the current directory.
-
 ## Building rkt in rkt
 
-Now that `rkt-builder.aci` has been built you have a container which will compile `rkt`.
-
-Put it into the rkt CAS:
-
-```
-rkt fetch --insecure-options=image ./rkt-builder.aci
-```
-
 Configure the path to your git checkout of `rkt` and the build output directory respectively:
 
 ```
@@ -38,51 +15,9 @@ export BUILDDIR=
 mkdir -p $BUILDDIR
 ```
 
-Start the container which will compile rkt:
+Start the container which will run the [rkt builder](https://github.com/coreos/rkt-builder), and compile rkt:
 ```
 ./scripts/build-rir.sh
 ```
 
 You should see rkt building in your rkt container, and once it's finished, the output should be in `$BUILD_DIR` on your host.
-
-# Building rkt in rkt one liners (sort of)
-
-If you don't want to bother with acbuild and want a simple one liner that uses rkt to build rkt,  you can install all the dependencies and build rkt from source in one line using bash in a container.
-Note that this fetches images from the Docker hub and doesn't check signatures.
-
-Set `SRC_DIR` to the absolute path to your git checkout of `rkt`:
-
-```
-export SRC_DIR=
-```
-
-Now pick a base OS you want to use, and run the appropriate command.
-The build output will be in `${SRC_DIR}/build-rkt-${RKT_VERSION}+git`.
-
-## Debian Sid
-```
-rkt run \
-    --volume rslvconf,kind=host,source=/etc/resolv.conf \
-    --mount volume=rslvconf,target=/etc/resolv.conf \
-    --volume src-dir,kind=host,source=$SRC_DIR \
-    --mount volume=src-dir,target=/opt/rkt \
-    --interactive \
-    --insecure-options=image \
-    docker://debian:sid \
-    --exec /bin/bash \
-    -- -c 'cd /opt/rkt && ./scripts/install-deps-debian-sid.sh && ./autogen.sh && ./configure --disable-tpm && make'
-```
-
-## Fedora 22
-```
-rkt run \
-    --volume rslvconf,kind=host,source=/etc/resolv.conf \
-    --mount volume=rslvconf,target=/etc/resolv.conf \
-    --volume src-dir,kind=host,source=$SRC_DIR \
-    --mount volume=src-dir,target=/opt/rkt \
-    --interactive \
-    --insecure-options=image \
-    docker://fedora:22 \
-    --exec /bin/bash \
-    -- -c 'cd /opt/rkt && ./scripts/install-deps-fedora-22.sh && ./autogen.sh && ./configure --disable-tpm && make'
-```

From 28f97453ce53a0f9d439432f18bd5dc24fea3b68 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon.philips@coreos.com>
Date: Wed, 26 Oct 2016 14:20:24 -0700
Subject: [PATCH 0827/1304] Documentation: remove docker2aci mention

docker2aci is not critical to this user facing doc, just remove it.
---
 Documentation/running-docker-images.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Documentation/running-docker-images.md b/Documentation/running-docker-images.md
index 84db2570db..26075312c3 100644
--- a/Documentation/running-docker-images.md
+++ b/Documentation/running-docker-images.md
@@ -67,8 +67,3 @@ After the image has been retrieved, it can be run by referencing this hash:
 ```
 # rkt --insecure-options=image run sha512-c6d6efd98f506380ff128e473ca239ed
 ```
-
-## How does it work?
-
-rkt leverages the [`docker2aci`](https://github.com/appc/docker2aci) library to transparently convert Docker images into rkt's native ACI format.
-To convert Docker images to ACI without necessarily having to run them, refer to the [docker2aci documentation](https://github.com/appc/docker2aci/blob/master/README.md).

From 2b7867ab7d98e3c0a3445258573a4b4e0faa0187 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 27 Oct 2016 14:50:48 +0200
Subject: [PATCH 0828/1304] version: bump to v1.18.0

---
 CHANGELOG.md                         | 24 ++++++++++++++++++++++++
 Documentation/distributions.md       | 16 ++++++++--------
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  4 ++--
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 17 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11638e2f5d..ee896916da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.18.0
+
+This minor release contains bugfixes, UX enhancements, and other improvements.
+
+### UX changes:
+- rkt: gate diagnostic output behind `--debug` ([#3297](https://github.com/coreos/rkt/pull/3297)).
+- rkt: Change exit codes to 254 ([#3261](https://github.com/coreos/rkt/pull/3261)). 
+
+
+### Bug fixes:
+- stage1/kvm: correctly bind-mount read-only volumes ([#3304](https://github.com/coreos/rkt/pull/3304)). 
+- stage0/cas: apply xattr attributes ([#3305](https://github.com/coreos/rkt/pull/3305)). 
+- scripts/install-rkt: add iptables dependency ([#3309](https://github.com/coreos/rkt/pull/3309)). 
+- stage0/image: set proxy if InsecureSkipVerify is set ([#3303](https://github.com/coreos/rkt/pull/3303)).
+
+### Other changes
+- vendor: update docker2aci to 0.13.0 ([#3314](https://github.com/coreos/rkt/pull/3314)). This fixes multiple fetching and conversion bugs, including two security issues.
+- scripts: update glide vendor script ([#3313](https://github.com/coreos/rkt/pull/3313)). 
+- vendor: update appc/spec to v0.8.8 ([#3310](https://github.com/coreos/rkt/pull/3310)). 
+- stage1: update to CoreOS 1192.0.0 (and update sanity checks) ([#3283](https://github.com/coreos/rkt/pull/3283)). 
+- cgroup: introduce proper cgroup/v1, cgroup/v2 packages ([#3277](https://github.com/coreos/rkt/pull/3277)).
+- Documentation updates: ([#3281](https://github.com/coreos/rkt/pull/3281)), ([#3319](https://github.com/coreos/rkt/pull/3319)), ([#3308](https://github.com/coreos/rkt/pull/3308)).
+
+
 ## 1.17.0
 
 This is a minor release packaging rkt-api systemd service units, and fixing a bug caused by overly long lines in generated stage1 unit files.
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 4abd828274..18f4fef8bf 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -143,17 +143,17 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt-1.16.0-1.x86_64.rpm
-wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt-1.16.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.16.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.16.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt-1.18.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt-1.18.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.18.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.18.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt_1.16.0-1_amd64.deb
-wget https://github.com/coreos/rkt/releases/download/v1.16.0/rkt_1.16.0-1_amd64.deb.asc
-gpg --verify rkt_1.16.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.16.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt_1.18.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt_1.18.0-1_amd64.deb.asc
+gpg --verify rkt_1.18.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.18.0-1_amd64.deb
 ```
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 7588c0d189..c836b0d626 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.17.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.18.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.17.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.18.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 4ae4cff60f..df5cb2b708 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.17.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.18.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.17.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.18.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 3659c4862f..07e3570c6b 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.17.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.18.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.17.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.18.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 5618def874..38fea027c7 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.17.0
+rkt Version: 1.18.0
 appc Version: 0.8.8
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 817dff8618..d0b95205a8 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.17.0/rkt-v1.17.0.tar.gz
-tar xzvf rkt-v1.17.0.tar.gz
-cd rkt-v1.17.0
+wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt-v1.18.0.tar.gz
+tar xzvf rkt-v1.18.0.tar.gz
+cd rkt-v1.18.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index bb5d8a8077..2bb654d59b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.17.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.18.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 55a8f44433..d9219b8e50 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.17.0"
+version="1.18.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 5ba9d771c8..966f00c9e9 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.17.0"
+            "value": "1.18.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 3ea1c8a610..2e57d36071 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.17.0"
+            "value": "1.18.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 710520e7f3..2fd64698d7 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.17.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.18.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index ae9d6e22ff..7e57449867 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.18.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index f5cd510c5b..68be2d692d 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.18.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index af82c18f25..4723094baa 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.18.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 354b97370f..1ee65d5709 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.18.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 89bd43c5f1..7d9a654aba 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.17.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.18.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From e22f5f8b34c8610a2e2662a502558c613a5a6dc3 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 27 Oct 2016 14:50:48 +0200
Subject: [PATCH 0829/1304] version: bump to v1.18.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2bb654d59b..543de38e86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.18.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.18.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 2fd64698d7..63e2becde2 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.18.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.18.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 80508d6ee7baa143fa4dcb4928f4edebc2882ced Mon Sep 17 00:00:00 2001
From: Breno Leitao <breno.leitao@gmail.com>
Date: Fri, 28 Oct 2016 13:09:26 -0400
Subject: [PATCH 0830/1304] Initial support for ppc64le

After rkt's dependencies implementing ppc64le code, it is now time
to enable it on rkt.
With this patch, and upgrading rkt's dependencies (gopsutils, appc),
I am able to run a container image on rkt on Power processors.
---
 stage0/arch.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage0/arch.go b/stage0/arch.go
index 589e7f455e..5cbe24a168 100644
--- a/stage0/arch.go
+++ b/stage0/arch.go
@@ -16,5 +16,5 @@ package stage0
 
 // ValidOSArch contains the supported ACI image OS/architecture combinations.
 var ValidOSArch = map[string][]string{
-	"linux": {"amd64", "i386", "aarch64", "aarch64_be", "armv6l", "armv7l", "armv7b"},
+	"linux": {"amd64", "i386", "aarch64", "aarch64_be", "armv6l", "armv7l", "armv7b", "ppc64le"},
 }

From 23f9cd5973a8cc48f6fa0ad92e6ca19e53be668d Mon Sep 17 00:00:00 2001
From: Julia Evans <julia@jvns.ca>
Date: Sat, 29 Oct 2016 01:14:06 -0400
Subject: [PATCH 0831/1304] documentation: Explain how to use rkt-builder to
 build rkt

---
 Documentation/hacking.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index d9f7358daa..d9b7211c8c 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -7,7 +7,9 @@ For more information on the rkt internals, see the [`devel`](devel/) documentati
 
 ## Building rkt
 
-You should be able build rkt on any modern Linux system with [Go](https://golang.org/) (1.5+) installed.
+The easiest way to build rkt is by using the coreos.com/rkt/builder ACI image. See instructions for how to use it in the README at [github.com/coreos/rkt-builder](https://github.com/coreos/rkt-builder).
+
+Alternatively, you should be able build rkt on any modern Linux system with [Go](https://golang.org/) (1.5+) installed.
 For the most part the codebase is self-contained (e.g. all dependencies are vendored), but assembly of the stage1 requires some other tools to be installed on the system.
 Please see [the list of the build-time dependencies](dependencies.md#build-time-dependencies).
 Once the dependencies have been satisfied you can build rkt with a default configuration by running the following commands:

From 86b2ac91001db36b9791aea3f78f7493c7592d46 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Fri, 7 Oct 2016 17:21:06 +0200
Subject: [PATCH 0832/1304] glide: pull in kr/pretty for unit tests

---
 glide.lock                               |   6 +-
 glide.yaml                               |   2 +
 vendor/github.com/kr/pretty/License      |  21 ++
 vendor/github.com/kr/pretty/diff.go      | 265 ++++++++++++++++++
 vendor/github.com/kr/pretty/formatter.go | 328 +++++++++++++++++++++++
 vendor/github.com/kr/pretty/pretty.go    | 108 ++++++++
 vendor/github.com/kr/pretty/zero.go      |  41 +++
 7 files changed, 769 insertions(+), 2 deletions(-)
 create mode 100644 vendor/github.com/kr/pretty/License
 create mode 100644 vendor/github.com/kr/pretty/diff.go
 create mode 100644 vendor/github.com/kr/pretty/formatter.go
 create mode 100644 vendor/github.com/kr/pretty/pretty.go
 create mode 100644 vendor/github.com/kr/pretty/zero.go

diff --git a/glide.lock b/glide.lock
index 0cf63a3ad0..3ecf0cc225 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 4355187753fd2b36529621c88ffd3b28cc8d1960ff6947ff305a7d10d7510542
-updated: 2016-10-25T09:27:11.804401231Z
+hash: bbc3d4989ff4b5a1643ba6f3830314a3aea89f9d06cf030a22aac0856bfa5760
+updated: 2016-10-31T11:08:20.737588464Z
 imports:
 - name: github.com/appc/docker2aci
   version: 0cac1a3ecc114941cf643ec25f4daaeee8c3d538
@@ -206,6 +206,8 @@ imports:
   version: 19b0b332c9e4516a6370a0456e6182c3b5036720
 - name: github.com/klauspost/pgzip
   version: 95e8170c5d4da28db9c64dfc9ec3138ea4466fd4
+- name: github.com/kr/pretty
+  version: cfb55aafdaf3ec08f0db22699ab822c50091b1c4
 - name: github.com/kr/pty
   version: f7ee69f31298ecbe5d2b349c711e2547a617d398
 - name: github.com/opencontainers/image-spec
diff --git a/glide.yaml b/glide.yaml
index a499213bc7..0fafce5f80 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -290,3 +290,5 @@ import:
   - spew
 - package: github.com/hashicorp/golang-lru
   version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
+- package: github.com/kr/pretty
+  version: cfb55aafdaf3ec08f0db22699ab822c50091b1c4
diff --git a/vendor/github.com/kr/pretty/License b/vendor/github.com/kr/pretty/License
new file mode 100644
index 0000000000..05c783ccf6
--- /dev/null
+++ b/vendor/github.com/kr/pretty/License
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright 2012 Keith Rarick
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/github.com/kr/pretty/diff.go b/vendor/github.com/kr/pretty/diff.go
new file mode 100644
index 0000000000..6aa7f743a2
--- /dev/null
+++ b/vendor/github.com/kr/pretty/diff.go
@@ -0,0 +1,265 @@
+package pretty
+
+import (
+	"fmt"
+	"io"
+	"reflect"
+)
+
+type sbuf []string
+
+func (p *sbuf) Printf(format string, a ...interface{}) {
+	s := fmt.Sprintf(format, a...)
+	*p = append(*p, s)
+}
+
+// Diff returns a slice where each element describes
+// a difference between a and b.
+func Diff(a, b interface{}) (desc []string) {
+	Pdiff((*sbuf)(&desc), a, b)
+	return desc
+}
+
+// wprintfer calls Fprintf on w for each Printf call
+// with a trailing newline.
+type wprintfer struct{ w io.Writer }
+
+func (p *wprintfer) Printf(format string, a ...interface{}) {
+	fmt.Fprintf(p.w, format+"\n", a...)
+}
+
+// Fdiff writes to w a description of the differences between a and b.
+func Fdiff(w io.Writer, a, b interface{}) {
+	Pdiff(&wprintfer{w}, a, b)
+}
+
+type Printfer interface {
+	Printf(format string, a ...interface{})
+}
+
+// Pdiff prints to p a description of the differences between a and b.
+// It calls Printf once for each difference, with no trailing newline.
+// The standard library log.Logger is a Printfer.
+func Pdiff(p Printfer, a, b interface{}) {
+	diffPrinter{w: p}.diff(reflect.ValueOf(a), reflect.ValueOf(b))
+}
+
+type Logfer interface {
+	Logf(format string, a ...interface{})
+}
+
+// logprintfer calls Fprintf on w for each Printf call
+// with a trailing newline.
+type logprintfer struct{ l Logfer }
+
+func (p *logprintfer) Printf(format string, a ...interface{}) {
+	p.l.Logf(format, a...)
+}
+
+// Ldiff prints to l a description of the differences between a and b.
+// It calls Logf once for each difference, with no trailing newline.
+// The standard library testing.T and testing.B are Logfers.
+func Ldiff(l Logfer, a, b interface{}) {
+	Pdiff(&logprintfer{l}, a, b)
+}
+
+type diffPrinter struct {
+	w Printfer
+	l string // label
+}
+
+func (w diffPrinter) printf(f string, a ...interface{}) {
+	var l string
+	if w.l != "" {
+		l = w.l + ": "
+	}
+	w.w.Printf(l+f, a...)
+}
+
+func (w diffPrinter) diff(av, bv reflect.Value) {
+	if !av.IsValid() && bv.IsValid() {
+		w.printf("nil != %# v", formatter{v: bv, quote: true})
+		return
+	}
+	if av.IsValid() && !bv.IsValid() {
+		w.printf("%# v != nil", formatter{v: av, quote: true})
+		return
+	}
+	if !av.IsValid() && !bv.IsValid() {
+		return
+	}
+
+	at := av.Type()
+	bt := bv.Type()
+	if at != bt {
+		w.printf("%v != %v", at, bt)
+		return
+	}
+
+	switch kind := at.Kind(); kind {
+	case reflect.Bool:
+		if a, b := av.Bool(), bv.Bool(); a != b {
+			w.printf("%v != %v", a, b)
+		}
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		if a, b := av.Int(), bv.Int(); a != b {
+			w.printf("%d != %d", a, b)
+		}
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		if a, b := av.Uint(), bv.Uint(); a != b {
+			w.printf("%d != %d", a, b)
+		}
+	case reflect.Float32, reflect.Float64:
+		if a, b := av.Float(), bv.Float(); a != b {
+			w.printf("%v != %v", a, b)
+		}
+	case reflect.Complex64, reflect.Complex128:
+		if a, b := av.Complex(), bv.Complex(); a != b {
+			w.printf("%v != %v", a, b)
+		}
+	case reflect.Array:
+		n := av.Len()
+		for i := 0; i < n; i++ {
+			w.relabel(fmt.Sprintf("[%d]", i)).diff(av.Index(i), bv.Index(i))
+		}
+	case reflect.Chan, reflect.Func, reflect.UnsafePointer:
+		if a, b := av.Pointer(), bv.Pointer(); a != b {
+			w.printf("%#x != %#x", a, b)
+		}
+	case reflect.Interface:
+		w.diff(av.Elem(), bv.Elem())
+	case reflect.Map:
+		ak, both, bk := keyDiff(av.MapKeys(), bv.MapKeys())
+		for _, k := range ak {
+			w := w.relabel(fmt.Sprintf("[%#v]", k))
+			w.printf("%q != (missing)", av.MapIndex(k))
+		}
+		for _, k := range both {
+			w := w.relabel(fmt.Sprintf("[%#v]", k))
+			w.diff(av.MapIndex(k), bv.MapIndex(k))
+		}
+		for _, k := range bk {
+			w := w.relabel(fmt.Sprintf("[%#v]", k))
+			w.printf("(missing) != %q", bv.MapIndex(k))
+		}
+	case reflect.Ptr:
+		switch {
+		case av.IsNil() && !bv.IsNil():
+			w.printf("nil != %# v", formatter{v: bv, quote: true})
+		case !av.IsNil() && bv.IsNil():
+			w.printf("%# v != nil", formatter{v: av, quote: true})
+		case !av.IsNil() && !bv.IsNil():
+			w.diff(av.Elem(), bv.Elem())
+		}
+	case reflect.Slice:
+		lenA := av.Len()
+		lenB := bv.Len()
+		if lenA != lenB {
+			w.printf("%s[%d] != %s[%d]", av.Type(), lenA, bv.Type(), lenB)
+			break
+		}
+		for i := 0; i < lenA; i++ {
+			w.relabel(fmt.Sprintf("[%d]", i)).diff(av.Index(i), bv.Index(i))
+		}
+	case reflect.String:
+		if a, b := av.String(), bv.String(); a != b {
+			w.printf("%q != %q", a, b)
+		}
+	case reflect.Struct:
+		for i := 0; i < av.NumField(); i++ {
+			w.relabel(at.Field(i).Name).diff(av.Field(i), bv.Field(i))
+		}
+	default:
+		panic("unknown reflect Kind: " + kind.String())
+	}
+}
+
+func (d diffPrinter) relabel(name string) (d1 diffPrinter) {
+	d1 = d
+	if d.l != "" && name[0] != '[' {
+		d1.l += "."
+	}
+	d1.l += name
+	return d1
+}
+
+// keyEqual compares a and b for equality.
+// Both a and b must be valid map keys.
+func keyEqual(av, bv reflect.Value) bool {
+	if !av.IsValid() && !bv.IsValid() {
+		return true
+	}
+	if !av.IsValid() || !bv.IsValid() || av.Type() != bv.Type() {
+		return false
+	}
+	switch kind := av.Kind(); kind {
+	case reflect.Bool:
+		a, b := av.Bool(), bv.Bool()
+		return a == b
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		a, b := av.Int(), bv.Int()
+		return a == b
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		a, b := av.Uint(), bv.Uint()
+		return a == b
+	case reflect.Float32, reflect.Float64:
+		a, b := av.Float(), bv.Float()
+		return a == b
+	case reflect.Complex64, reflect.Complex128:
+		a, b := av.Complex(), bv.Complex()
+		return a == b
+	case reflect.Array:
+		for i := 0; i < av.Len(); i++ {
+			if !keyEqual(av.Index(i), bv.Index(i)) {
+				return false
+			}
+		}
+		return true
+	case reflect.Chan, reflect.UnsafePointer, reflect.Ptr:
+		a, b := av.Pointer(), bv.Pointer()
+		return a == b
+	case reflect.Interface:
+		return keyEqual(av.Elem(), bv.Elem())
+	case reflect.String:
+		a, b := av.String(), bv.String()
+		return a == b
+	case reflect.Struct:
+		for i := 0; i < av.NumField(); i++ {
+			if !keyEqual(av.Field(i), bv.Field(i)) {
+				return false
+			}
+		}
+		return true
+	default:
+		panic("invalid map key type " + av.Type().String())
+	}
+}
+
+func keyDiff(a, b []reflect.Value) (ak, both, bk []reflect.Value) {
+	for _, av := range a {
+		inBoth := false
+		for _, bv := range b {
+			if keyEqual(av, bv) {
+				inBoth = true
+				both = append(both, av)
+				break
+			}
+		}
+		if !inBoth {
+			ak = append(ak, av)
+		}
+	}
+	for _, bv := range b {
+		inBoth := false
+		for _, av := range a {
+			if keyEqual(av, bv) {
+				inBoth = true
+				break
+			}
+		}
+		if !inBoth {
+			bk = append(bk, bv)
+		}
+	}
+	return
+}
diff --git a/vendor/github.com/kr/pretty/formatter.go b/vendor/github.com/kr/pretty/formatter.go
new file mode 100644
index 0000000000..a317d7b8ee
--- /dev/null
+++ b/vendor/github.com/kr/pretty/formatter.go
@@ -0,0 +1,328 @@
+package pretty
+
+import (
+	"fmt"
+	"io"
+	"reflect"
+	"strconv"
+	"text/tabwriter"
+
+	"github.com/kr/text"
+)
+
+type formatter struct {
+	v     reflect.Value
+	force bool
+	quote bool
+}
+
+// Formatter makes a wrapper, f, that will format x as go source with line
+// breaks and tabs. Object f responds to the "%v" formatting verb when both the
+// "#" and " " (space) flags are set, for example:
+//
+//     fmt.Sprintf("%# v", Formatter(x))
+//
+// If one of these two flags is not set, or any other verb is used, f will
+// format x according to the usual rules of package fmt.
+// In particular, if x satisfies fmt.Formatter, then x.Format will be called.
+func Formatter(x interface{}) (f fmt.Formatter) {
+	return formatter{v: reflect.ValueOf(x), quote: true}
+}
+
+func (fo formatter) String() string {
+	return fmt.Sprint(fo.v.Interface()) // unwrap it
+}
+
+func (fo formatter) passThrough(f fmt.State, c rune) {
+	s := "%"
+	for i := 0; i < 128; i++ {
+		if f.Flag(i) {
+			s += string(i)
+		}
+	}
+	if w, ok := f.Width(); ok {
+		s += fmt.Sprintf("%d", w)
+	}
+	if p, ok := f.Precision(); ok {
+		s += fmt.Sprintf(".%d", p)
+	}
+	s += string(c)
+	fmt.Fprintf(f, s, fo.v.Interface())
+}
+
+func (fo formatter) Format(f fmt.State, c rune) {
+	if fo.force || c == 'v' && f.Flag('#') && f.Flag(' ') {
+		w := tabwriter.NewWriter(f, 4, 4, 1, ' ', 0)
+		p := &printer{tw: w, Writer: w, visited: make(map[visit]int)}
+		p.printValue(fo.v, true, fo.quote)
+		w.Flush()
+		return
+	}
+	fo.passThrough(f, c)
+}
+
+type printer struct {
+	io.Writer
+	tw      *tabwriter.Writer
+	visited map[visit]int
+	depth   int
+}
+
+func (p *printer) indent() *printer {
+	q := *p
+	q.tw = tabwriter.NewWriter(p.Writer, 4, 4, 1, ' ', 0)
+	q.Writer = text.NewIndentWriter(q.tw, []byte{'\t'})
+	return &q
+}
+
+func (p *printer) printInline(v reflect.Value, x interface{}, showType bool) {
+	if showType {
+		io.WriteString(p, v.Type().String())
+		fmt.Fprintf(p, "(%#v)", x)
+	} else {
+		fmt.Fprintf(p, "%#v", x)
+	}
+}
+
+// printValue must keep track of already-printed pointer values to avoid
+// infinite recursion.
+type visit struct {
+	v   uintptr
+	typ reflect.Type
+}
+
+func (p *printer) printValue(v reflect.Value, showType, quote bool) {
+	if p.depth > 10 {
+		io.WriteString(p, "!%v(DEPTH EXCEEDED)")
+		return
+	}
+
+	switch v.Kind() {
+	case reflect.Bool:
+		p.printInline(v, v.Bool(), showType)
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		p.printInline(v, v.Int(), showType)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		p.printInline(v, v.Uint(), showType)
+	case reflect.Float32, reflect.Float64:
+		p.printInline(v, v.Float(), showType)
+	case reflect.Complex64, reflect.Complex128:
+		fmt.Fprintf(p, "%#v", v.Complex())
+	case reflect.String:
+		p.fmtString(v.String(), quote)
+	case reflect.Map:
+		t := v.Type()
+		if showType {
+			io.WriteString(p, t.String())
+		}
+		writeByte(p, '{')
+		if nonzero(v) {
+			expand := !canInline(v.Type())
+			pp := p
+			if expand {
+				writeByte(p, '\n')
+				pp = p.indent()
+			}
+			keys := v.MapKeys()
+			for i := 0; i < v.Len(); i++ {
+				showTypeInStruct := true
+				k := keys[i]
+				mv := v.MapIndex(k)
+				pp.printValue(k, false, true)
+				writeByte(pp, ':')
+				if expand {
+					writeByte(pp, '\t')
+				}
+				showTypeInStruct = t.Elem().Kind() == reflect.Interface
+				pp.printValue(mv, showTypeInStruct, true)
+				if expand {
+					io.WriteString(pp, ",\n")
+				} else if i < v.Len()-1 {
+					io.WriteString(pp, ", ")
+				}
+			}
+			if expand {
+				pp.tw.Flush()
+			}
+		}
+		writeByte(p, '}')
+	case reflect.Struct:
+		t := v.Type()
+		if v.CanAddr() {
+			addr := v.UnsafeAddr()
+			vis := visit{addr, t}
+			if vd, ok := p.visited[vis]; ok && vd < p.depth {
+				p.fmtString(t.String()+"{(CYCLIC REFERENCE)}", false)
+				break // don't print v again
+			}
+			p.visited[vis] = p.depth
+		}
+
+		if showType {
+			io.WriteString(p, t.String())
+		}
+		writeByte(p, '{')
+		if nonzero(v) {
+			expand := !canInline(v.Type())
+			pp := p
+			if expand {
+				writeByte(p, '\n')
+				pp = p.indent()
+			}
+			for i := 0; i < v.NumField(); i++ {
+				showTypeInStruct := true
+				if f := t.Field(i); f.Name != "" {
+					io.WriteString(pp, f.Name)
+					writeByte(pp, ':')
+					if expand {
+						writeByte(pp, '\t')
+					}
+					showTypeInStruct = labelType(f.Type)
+				}
+				pp.printValue(getField(v, i), showTypeInStruct, true)
+				if expand {
+					io.WriteString(pp, ",\n")
+				} else if i < v.NumField()-1 {
+					io.WriteString(pp, ", ")
+				}
+			}
+			if expand {
+				pp.tw.Flush()
+			}
+		}
+		writeByte(p, '}')
+	case reflect.Interface:
+		switch e := v.Elem(); {
+		case e.Kind() == reflect.Invalid:
+			io.WriteString(p, "nil")
+		case e.IsValid():
+			pp := *p
+			pp.depth++
+			pp.printValue(e, showType, true)
+		default:
+			io.WriteString(p, v.Type().String())
+			io.WriteString(p, "(nil)")
+		}
+	case reflect.Array, reflect.Slice:
+		t := v.Type()
+		if showType {
+			io.WriteString(p, t.String())
+		}
+		if v.Kind() == reflect.Slice && v.IsNil() && showType {
+			io.WriteString(p, "(nil)")
+			break
+		}
+		if v.Kind() == reflect.Slice && v.IsNil() {
+			io.WriteString(p, "nil")
+			break
+		}
+		writeByte(p, '{')
+		expand := !canInline(v.Type())
+		pp := p
+		if expand {
+			writeByte(p, '\n')
+			pp = p.indent()
+		}
+		for i := 0; i < v.Len(); i++ {
+			showTypeInSlice := t.Elem().Kind() == reflect.Interface
+			pp.printValue(v.Index(i), showTypeInSlice, true)
+			if expand {
+				io.WriteString(pp, ",\n")
+			} else if i < v.Len()-1 {
+				io.WriteString(pp, ", ")
+			}
+		}
+		if expand {
+			pp.tw.Flush()
+		}
+		writeByte(p, '}')
+	case reflect.Ptr:
+		e := v.Elem()
+		if !e.IsValid() {
+			writeByte(p, '(')
+			io.WriteString(p, v.Type().String())
+			io.WriteString(p, ")(nil)")
+		} else {
+			pp := *p
+			pp.depth++
+			writeByte(pp, '&')
+			pp.printValue(e, true, true)
+		}
+	case reflect.Chan:
+		x := v.Pointer()
+		if showType {
+			writeByte(p, '(')
+			io.WriteString(p, v.Type().String())
+			fmt.Fprintf(p, ")(%#v)", x)
+		} else {
+			fmt.Fprintf(p, "%#v", x)
+		}
+	case reflect.Func:
+		io.WriteString(p, v.Type().String())
+		io.WriteString(p, " {...}")
+	case reflect.UnsafePointer:
+		p.printInline(v, v.Pointer(), showType)
+	case reflect.Invalid:
+		io.WriteString(p, "nil")
+	}
+}
+
+func canInline(t reflect.Type) bool {
+	switch t.Kind() {
+	case reflect.Map:
+		return !canExpand(t.Elem())
+	case reflect.Struct:
+		for i := 0; i < t.NumField(); i++ {
+			if canExpand(t.Field(i).Type) {
+				return false
+			}
+		}
+		return true
+	case reflect.Interface:
+		return false
+	case reflect.Array, reflect.Slice:
+		return !canExpand(t.Elem())
+	case reflect.Ptr:
+		return false
+	case reflect.Chan, reflect.Func, reflect.UnsafePointer:
+		return false
+	}
+	return true
+}
+
+func canExpand(t reflect.Type) bool {
+	switch t.Kind() {
+	case reflect.Map, reflect.Struct,
+		reflect.Interface, reflect.Array, reflect.Slice,
+		reflect.Ptr:
+		return true
+	}
+	return false
+}
+
+func labelType(t reflect.Type) bool {
+	switch t.Kind() {
+	case reflect.Interface, reflect.Struct:
+		return true
+	}
+	return false
+}
+
+func (p *printer) fmtString(s string, quote bool) {
+	if quote {
+		s = strconv.Quote(s)
+	}
+	io.WriteString(p, s)
+}
+
+func writeByte(w io.Writer, b byte) {
+	w.Write([]byte{b})
+}
+
+func getField(v reflect.Value, i int) reflect.Value {
+	val := v.Field(i)
+	if val.Kind() == reflect.Interface && !val.IsNil() {
+		val = val.Elem()
+	}
+	return val
+}
diff --git a/vendor/github.com/kr/pretty/pretty.go b/vendor/github.com/kr/pretty/pretty.go
new file mode 100644
index 0000000000..49423ec7f5
--- /dev/null
+++ b/vendor/github.com/kr/pretty/pretty.go
@@ -0,0 +1,108 @@
+// Package pretty provides pretty-printing for Go values. This is
+// useful during debugging, to avoid wrapping long output lines in
+// the terminal.
+//
+// It provides a function, Formatter, that can be used with any
+// function that accepts a format string. It also provides
+// convenience wrappers for functions in packages fmt and log.
+package pretty
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"reflect"
+)
+
+// Errorf is a convenience wrapper for fmt.Errorf.
+//
+// Calling Errorf(f, x, y) is equivalent to
+// fmt.Errorf(f, Formatter(x), Formatter(y)).
+func Errorf(format string, a ...interface{}) error {
+	return fmt.Errorf(format, wrap(a, false)...)
+}
+
+// Fprintf is a convenience wrapper for fmt.Fprintf.
+//
+// Calling Fprintf(w, f, x, y) is equivalent to
+// fmt.Fprintf(w, f, Formatter(x), Formatter(y)).
+func Fprintf(w io.Writer, format string, a ...interface{}) (n int, error error) {
+	return fmt.Fprintf(w, format, wrap(a, false)...)
+}
+
+// Log is a convenience wrapper for log.Printf.
+//
+// Calling Log(x, y) is equivalent to
+// log.Print(Formatter(x), Formatter(y)), but each operand is
+// formatted with "%# v".
+func Log(a ...interface{}) {
+	log.Print(wrap(a, true)...)
+}
+
+// Logf is a convenience wrapper for log.Printf.
+//
+// Calling Logf(f, x, y) is equivalent to
+// log.Printf(f, Formatter(x), Formatter(y)).
+func Logf(format string, a ...interface{}) {
+	log.Printf(format, wrap(a, false)...)
+}
+
+// Logln is a convenience wrapper for log.Printf.
+//
+// Calling Logln(x, y) is equivalent to
+// log.Println(Formatter(x), Formatter(y)), but each operand is
+// formatted with "%# v".
+func Logln(a ...interface{}) {
+	log.Println(wrap(a, true)...)
+}
+
+// Print pretty-prints its operands and writes to standard output.
+//
+// Calling Print(x, y) is equivalent to
+// fmt.Print(Formatter(x), Formatter(y)), but each operand is
+// formatted with "%# v".
+func Print(a ...interface{}) (n int, errno error) {
+	return fmt.Print(wrap(a, true)...)
+}
+
+// Printf is a convenience wrapper for fmt.Printf.
+//
+// Calling Printf(f, x, y) is equivalent to
+// fmt.Printf(f, Formatter(x), Formatter(y)).
+func Printf(format string, a ...interface{}) (n int, errno error) {
+	return fmt.Printf(format, wrap(a, false)...)
+}
+
+// Println pretty-prints its operands and writes to standard output.
+//
+// Calling Print(x, y) is equivalent to
+// fmt.Println(Formatter(x), Formatter(y)), but each operand is
+// formatted with "%# v".
+func Println(a ...interface{}) (n int, errno error) {
+	return fmt.Println(wrap(a, true)...)
+}
+
+// Sprint is a convenience wrapper for fmt.Sprintf.
+//
+// Calling Sprint(x, y) is equivalent to
+// fmt.Sprint(Formatter(x), Formatter(y)), but each operand is
+// formatted with "%# v".
+func Sprint(a ...interface{}) string {
+	return fmt.Sprint(wrap(a, true)...)
+}
+
+// Sprintf is a convenience wrapper for fmt.Sprintf.
+//
+// Calling Sprintf(f, x, y) is equivalent to
+// fmt.Sprintf(f, Formatter(x), Formatter(y)).
+func Sprintf(format string, a ...interface{}) string {
+	return fmt.Sprintf(format, wrap(a, false)...)
+}
+
+func wrap(a []interface{}, force bool) []interface{} {
+	w := make([]interface{}, len(a))
+	for i, x := range a {
+		w[i] = formatter{v: reflect.ValueOf(x), force: force}
+	}
+	return w
+}
diff --git a/vendor/github.com/kr/pretty/zero.go b/vendor/github.com/kr/pretty/zero.go
new file mode 100644
index 0000000000..abb5b6fc14
--- /dev/null
+++ b/vendor/github.com/kr/pretty/zero.go
@@ -0,0 +1,41 @@
+package pretty
+
+import (
+	"reflect"
+)
+
+func nonzero(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.Bool:
+		return v.Bool()
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return v.Int() != 0
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		return v.Uint() != 0
+	case reflect.Float32, reflect.Float64:
+		return v.Float() != 0
+	case reflect.Complex64, reflect.Complex128:
+		return v.Complex() != complex(0, 0)
+	case reflect.String:
+		return v.String() != ""
+	case reflect.Struct:
+		for i := 0; i < v.NumField(); i++ {
+			if nonzero(getField(v, i)) {
+				return true
+			}
+		}
+		return false
+	case reflect.Array:
+		for i := 0; i < v.Len(); i++ {
+			if nonzero(v.Index(i)) {
+				return true
+			}
+		}
+		return false
+	case reflect.Map, reflect.Interface, reflect.Slice, reflect.Ptr, reflect.Chan, reflect.Func:
+		return !v.IsNil()
+	case reflect.UnsafePointer:
+		return v.Pointer() != 0
+	}
+	return true
+}

From 147a1e12b3da2b0bd4878eea77055b81cef65e33 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Mon, 31 Oct 2016 11:10:02 +0000
Subject: [PATCH 0833/1304] glide: bump go-systemd to v13

---
 glide.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index 0fafce5f80..175450795b 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -91,9 +91,10 @@ import:
   subpackages:
   - semver
 - package: github.com/coreos/go-systemd
-  version: v12
+  version: v13
   subpackages:
   - activation
+  - daemon
   - dbus
   - sdjournal
   - unit

From 9731ae8effbb1d98f7232dd7b894a8f878d2defd Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Mon, 31 Oct 2016 11:14:24 +0000
Subject: [PATCH 0834/1304] vendor: update after go-systemd bump

---
 glide.lock                                    |  7 +-
 .../coreos/go-systemd/daemon/sdnotify.go      | 38 +++++++
 .../coreos/go-systemd/dbus/properties.go      |  9 ++
 .../coreos/go-systemd/sdjournal/journal.go    | 98 +++++++++++++++++--
 .../coreos/go-systemd/sdjournal/read.go       |  2 +-
 5 files changed, 143 insertions(+), 11 deletions(-)
 create mode 100644 vendor/github.com/coreos/go-systemd/daemon/sdnotify.go

diff --git a/glide.lock b/glide.lock
index 3ecf0cc225..91821982e4 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: bbc3d4989ff4b5a1643ba6f3830314a3aea89f9d06cf030a22aac0856bfa5760
-updated: 2016-10-31T11:08:20.737588464Z
+hash: 3db4d7c6fc89de6c3454b8a74846d0286ab1a3eeb281322010055cea8a12fa4f
+updated: 2016-10-31T11:10:26.586363363Z
 imports:
 - name: github.com/appc/docker2aci
   version: 0cac1a3ecc114941cf643ec25f4daaeee8c3d538
@@ -91,9 +91,10 @@ imports:
   subpackages:
   - semver
 - name: github.com/coreos/go-systemd
-  version: 43e4800a6165b4e02bb2a36673c54b230d6f7b26
+  version: 61c7ee68bddeb1e66b491c3e1045c4f72b2cd6e3
   subpackages:
   - activation
+  - daemon
   - dbus
   - sdjournal
   - unit
diff --git a/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go b/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
new file mode 100644
index 0000000000..a61673805f
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
@@ -0,0 +1,38 @@
+// Code forked from Docker project
+package daemon
+
+import (
+	"net"
+	"os"
+)
+
+// SdNotify sends a message to the init daemon. It is common to ignore the error.
+// It returns one of the following:
+// (false, nil) - notification not supported (i.e. NOTIFY_SOCKET is unset)
+// (false, err) - notification supported, but failure happened (e.g. error connecting to NOTIFY_SOCKET or while sending data)
+// (true, nil) - notification supported, data has been sent
+func SdNotify(state string) (sent bool, err error) {
+	socketAddr := &net.UnixAddr{
+		Name: os.Getenv("NOTIFY_SOCKET"),
+		Net:  "unixgram",
+	}
+
+	// NOTIFY_SOCKET not set
+	if socketAddr.Name == "" {
+		return false, nil
+	}
+
+	conn, err := net.DialUnix(socketAddr.Net, nil, socketAddr)
+	// Error connecting to NOTIFY_SOCKET
+	if err != nil {
+		return false, err
+	}
+	defer conn.Close()
+
+	_, err = conn.Write([]byte(state))
+	// Error sending the message
+	if err != nil {
+		return false, err
+	}
+	return true, nil
+}
diff --git a/vendor/github.com/coreos/go-systemd/dbus/properties.go b/vendor/github.com/coreos/go-systemd/dbus/properties.go
index c3d8c142a3..6c81895876 100644
--- a/vendor/github.com/coreos/go-systemd/dbus/properties.go
+++ b/vendor/github.com/coreos/go-systemd/dbus/properties.go
@@ -78,6 +78,15 @@ func PropRemainAfterExit(b bool) Property {
 	}
 }
 
+// PropType sets the Type service property. See
+// http://www.freedesktop.org/software/systemd/man/systemd.service.html#Type=
+func PropType(t string) Property {
+	return Property{
+		Name:  "Type",
+		Value: dbus.MakeVariant(t),
+	}
+}
+
 // PropDescription sets the Description unit property. See
 // http://www.freedesktop.org/software/systemd/man/systemd.unit#Description=
 func PropDescription(desc string) Property {
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/journal.go b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
index cb26f6487b..b00d606c1a 100644
--- a/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
@@ -255,6 +255,33 @@ package sdjournal
 //   return sd_journal_enumerate_data(j, data, length);
 // }
 //
+// int
+// my_sd_journal_query_unique(void *f, sd_journal *j, const char *field)
+// {
+//   int(*sd_journal_query_unique)(sd_journal *, const char *);
+//
+//   sd_journal_query_unique = f;
+//   return sd_journal_query_unique(j, field);
+// }
+//
+// int
+// my_sd_journal_enumerate_unique(void *f, sd_journal *j, const void **data, size_t *length)
+// {
+//   int(*sd_journal_enumerate_unique)(sd_journal *, const void **, size_t *);
+//
+//   sd_journal_enumerate_unique = f;
+//   return sd_journal_enumerate_unique(j, data, length);
+// }
+//
+// void
+// my_sd_journal_restart_unique(void *f, sd_journal *j)
+// {
+//   void(*sd_journal_restart_unique)(sd_journal *);
+//
+//   sd_journal_restart_unique = f;
+//   sd_journal_restart_unique(j);
+// }
+//
 import "C"
 import (
 	"bytes"
@@ -474,10 +501,10 @@ func (j *Journal) FlushMatches() {
 }
 
 // Next advances the read pointer into the journal by one entry.
-func (j *Journal) Next() (int, error) {
+func (j *Journal) Next() (uint64, error) {
 	sd_journal_next, err := getFunction("sd_journal_next")
 	if err != nil {
-		return -1, err
+		return 0, err
 	}
 
 	j.mu.Lock()
@@ -485,10 +512,10 @@ func (j *Journal) Next() (int, error) {
 	j.mu.Unlock()
 
 	if r < 0 {
-		return int(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
 	}
 
-	return int(r), nil
+	return uint64(r), nil
 }
 
 // NextSkip advances the read pointer by multiple entries at once,
@@ -504,7 +531,7 @@ func (j *Journal) NextSkip(skip uint64) (uint64, error) {
 	j.mu.Unlock()
 
 	if r < 0 {
-		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
 	}
 
 	return uint64(r), nil
@@ -522,7 +549,7 @@ func (j *Journal) Previous() (uint64, error) {
 	j.mu.Unlock()
 
 	if r < 0 {
-		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
 	}
 
 	return uint64(r), nil
@@ -541,7 +568,7 @@ func (j *Journal) PreviousSkip(skip uint64) (uint64, error) {
 	j.mu.Unlock()
 
 	if r < 0 {
-		return uint64(r), fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
+		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
 	}
 
 	return uint64(r), nil
@@ -938,3 +965,60 @@ func (j *Journal) GetUsage() (uint64, error) {
 
 	return uint64(out), nil
 }
+
+// GetUniqueValues returns all unique values for a given field.
+func (j *Journal) GetUniqueValues(field string) ([]string, error) {
+	var result []string
+
+	sd_journal_query_unique, err := getFunction("sd_journal_query_unique")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_enumerate_unique, err := getFunction("sd_journal_enumerate_unique")
+	if err != nil {
+		return nil, err
+	}
+
+	sd_journal_restart_unique, err := getFunction("sd_journal_restart_unique")
+	if err != nil {
+		return nil, err
+	}
+
+	j.mu.Lock()
+	defer j.mu.Unlock()
+
+	f := C.CString(field)
+	defer C.free(unsafe.Pointer(f))
+
+	r := C.my_sd_journal_query_unique(sd_journal_query_unique, j.cjournal, f)
+
+	if r < 0 {
+		return nil, fmt.Errorf("failed to query journal: %d", syscall.Errno(-r))
+	}
+
+	// Implements the SD_JOURNAL_FOREACH_UNIQUE macro from sd-journal.h
+	var d unsafe.Pointer
+	var l C.size_t
+	C.my_sd_journal_restart_unique(sd_journal_restart_unique, j.cjournal)
+	for {
+		r = C.my_sd_journal_enumerate_unique(sd_journal_enumerate_unique, j.cjournal, &d, &l)
+		if r == 0 {
+			break
+		}
+
+		if r < 0 {
+			return nil, fmt.Errorf("failed to read message field: %d", syscall.Errno(-r))
+		}
+
+		msg := C.GoStringN((*C.char)(d), C.int(l))
+		kv := strings.SplitN(msg, "=", 2)
+		if len(kv) < 2 {
+			return nil, fmt.Errorf("failed to parse field")
+		}
+
+		result = append(result, kv[1])
+	}
+
+	return result, nil
+}
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/read.go b/vendor/github.com/coreos/go-systemd/sdjournal/read.go
index c9c44bac32..b581f03b4f 100644
--- a/vendor/github.com/coreos/go-systemd/sdjournal/read.go
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/read.go
@@ -121,7 +121,7 @@ func (r *JournalReader) Read(b []byte) (int, error) {
 	var err error
 
 	if r.msgReader == nil {
-		var c int
+		var c uint64
 
 		// Advance the journal cursor. It has to be called at least one time
 		// before reading

From 5b3f4db78825d0e8ac9faca1765d8251f9766fdf Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Fri, 7 Oct 2016 15:22:34 +0200
Subject: [PATCH 0835/1304] CRI: Support volume creation at app add time

Squashed commit of the following:

commit 0b348ab71a2b3a5a576a1129458487fb957f0e43
Merge: ce991fc 2ef0885
Author: Casey Callendrello <c1@caseyc.net>
Date:   Fri Oct 7 15:08:00 2016 +0200

    Merge remote-tracking branch 'origin/cri' into cri-volumes

commit ce991fcf1bbce5fb22b519e88eb0f0cfd6dbaca6
Author: Casey Callendrello <c1@caseyc.net>
Date:   Tue Oct 4 20:24:59 2016 +0200

    WIP: support app volumes

commit dca86e7a7e31238e0891ade140ed4a470243bf17
Merge: 081300c b9ddcc6
Author: Casey Callendrello <c1@caseyc.net>
Date:   Tue Oct 4 12:23:06 2016 +0200

    Merge remote-tracking branch 'origin/cri' into cri-volumes

commit 081300c68b68dd5a2b212d530f852585b64de5bd
Author: Alban Crequy <alban@kinvolk.io>
Date:   Thu Sep 22 12:45:32 2016 +0200

    cri: mount volumes in the app

    This requires systemd with the following fix:
    https://github.com/systemd/systemd/pull/4152
---
 common/apps/apps.go              |   3 +
 rkt/cli_apps.go                  |  62 ++++++++
 stage0/app.go                    |   1 +
 stage1/app-add/app-add.go        |   2 +
 stage1/init/common/mount.go      | 244 +++++++++++++++++++++++++++----
 stage1/init/common/mount_test.go | 189 ++++++++++++++++++++++++
 stage1/init/common/pod.go        |  43 +++---
 stage1/init/common/units.go      |  19 ++-
 stage1/init/init.go              |   1 +
 stage1/init/kvm.go               |  35 ++---
 10 files changed, 517 insertions(+), 82 deletions(-)
 create mode 100644 stage1/init/common/mount_test.go

diff --git a/common/apps/apps.go b/common/apps/apps.go
index c9e8421ee8..71aebdd148 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -135,6 +135,9 @@ func (al *Apps) Validate() error {
 
 	f := func(mnts []schema.Mount) error {
 		for _, m := range mnts {
+			if m.AppVolume != nil { // allow app-specific volumes
+				continue
+			}
 			if _, ok := vs[m.Volume]; !ok {
 				return fmt.Errorf("dangling mount point %q: volume %q not found", m.Path, m.Volume)
 			}
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 4a20235737..dc56183e2b 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -23,6 +23,7 @@ import (
 	"strings"
 
 	"github.com/coreos/rkt/common/apps"
+	"github.com/hashicorp/errwrap"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -243,6 +244,67 @@ func (al *appsVolume) String() string {
 	return strings.Join(vs, " ")
 }
 
+// appMountVolume is for CRI style per-app-volumes
+// this is a mount and volume in a single argument
+// It is exactly like --volume, but with a "target" param
+type appMountVolume apps.Apps
+
+func (am *appMountVolume) Set(s string) error {
+	pairs, err := url.ParseQuery(strings.Replace(s, ",", "&", -1))
+	if err != nil {
+		return err
+	}
+
+	mount := schema.Mount{}
+
+	target, ok := pairs["target"]
+	if !ok {
+		return fmt.Errorf("missing target= parameter")
+	}
+	if len(target) != 1 {
+		return fmt.Errorf("label %s with multiple values %q", "target", target)
+	}
+	mount.Path = target[0]
+
+	delete(pairs, "target")
+
+	vol, err := types.VolumeFromParams(pairs)
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("error parsing volume component of MountVolume"), err)
+	}
+
+	mount.AppVolume = vol
+	mount.Volume = vol.Name
+
+	as := (*apps.Apps)(am)
+	if as.Count() == 0 {
+		return fmt.Errorf("an image is required before any MountVolumes")
+	}
+	app := as.Last()
+	app.Mounts = append(app.Mounts, mount)
+	return nil
+}
+
+func (am *appMountVolume) String() string {
+	as := (*apps.Apps)(am)
+	app := as.Last()
+	if app == nil {
+		return ""
+	}
+	out := ""
+	for _, mnt := range app.Mounts {
+		if mnt.AppVolume == nil {
+			continue
+		}
+		out = fmt.Sprintf("%s target=%s,%s", out, mnt.Path, mnt.AppVolume.String())
+	}
+	return out
+}
+
+func (am *appMountVolume) Type() string {
+	return "appMountVolume"
+}
+
 // appMemoryLimit is for --memory flags in the form of: --memory=128M
 type appMemoryLimit apps.Apps
 
diff --git a/stage0/app.go b/stage0/app.go
index 689b26ccae..4d172f9124 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -186,6 +186,7 @@ func AddApp(cfg AddConfig) error {
 			ID:     cfg.Image,
 			Labels: am.Labels,
 		},
+		Mounts:         MergeMounts(cfg.Apps.Mounts, app.Mounts),
 		ReadOnlyRootFS: app.ReadOnlyRootFS,
 	}
 
diff --git a/stage1/app-add/app-add.go b/stage1/app-add/app-add.go
index e3a235442c..473aaa0186 100644
--- a/stage1/app-add/app-add.go
+++ b/stage1/app-add/app-add.go
@@ -128,6 +128,8 @@ func main() {
 		}
 	}
 
+	stage1initcommon.AppAddMounts(p, ra, enterCmd)
+
 	/* write service file */
 	binPath, err := stage1initcommon.FindBinPath(p, ra)
 	if err != nil {
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 749b9014c9..8dc80c0cf1 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -16,7 +16,9 @@ package common
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
 	"syscall"
@@ -27,6 +29,8 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
+
+	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 )
 
 /*
@@ -38,32 +42,19 @@ import (
 // mountWrapper is a wrapper around a schema.Mount with an additional field indicating
 // whether it is an implicit empty volume converted from a Docker image.
 type mountWrapper struct {
-	schema.Mount
+	Mount          schema.Mount
+	Volume         types.Volume
 	DockerImplicit bool
+	ReadOnly       bool
 }
 
-func isMPReadOnly(mountPoints []types.MountPoint, name types.ACName) bool {
-	for _, mp := range mountPoints {
-		if mp.Name == name {
-			return mp.ReadOnly
-		}
+// ConvertedFromDocker determines if an app's image has been converted
+// from docker. This is needed because implicit docker empty volumes have
+// different behavior from AppC
+func ConvertedFromDocker(im *schema.ImageManifest) bool {
+	if im == nil { // nil sometimes sneaks in here due to unit tests
+		return false
 	}
-
-	return false
-}
-
-// IsMountReadOnly returns if a mount should be readOnly.
-// If the readOnly flag in the pod manifest is not nil, it overrides the
-// readOnly flag in the image manifest.
-func IsMountReadOnly(vol types.Volume, mountPoints []types.MountPoint) bool {
-	if vol.ReadOnly != nil {
-		return *vol.ReadOnly
-	}
-
-	return isMPReadOnly(mountPoints, vol.Name)
-}
-
-func convertedFromDocker(im *schema.ImageManifest) bool {
 	ann := im.Annotations
 	_, ok := ann.Get("appc.io/docker/repository")
 	return ok
@@ -72,27 +63,69 @@ func convertedFromDocker(im *schema.ImageManifest) bool {
 // GenerateMounts maps MountPoint paths to volumes, returning a list of mounts,
 // each with a parameter indicating if it's an implicit empty volume from a
 // Docker image.
-func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume, imageManifest *schema.ImageManifest) []mountWrapper {
+func GenerateMounts(ra *schema.RuntimeApp, podVolumes []types.Volume, convertedFromDocker bool) ([]mountWrapper, error) {
 	app := ra.App
 
 	var genMnts []mountWrapper
 
+	vols := make(map[types.ACName]types.Volume)
+	for _, v := range podVolumes {
+		vols[v.Name] = v
+	}
+
+	// RuntimeApps have mounts, whereas Apps have mountPoints. mountPoints are partially for
+	// Docker compat; since apps can declare mountpoints. However, if we just run with rkt run,
+	// then we'll only have a Mount and no corresponding MountPoint.
+	// Furthermore, Mounts can have embedded volumes in the case of the CRI.
+	// So, we generate a pile of Mounts and their corresponding Volume
+
+	// Map of hostpath -> Mount
 	mnts := make(map[string]schema.Mount)
+
+	// Check runtimeApp's Mounts
 	for _, m := range ra.Mounts {
 		mnts[m.Path] = m
+
+		vol := m.AppVolume // Mounts can supply a volume
+		if vol == nil {
+			vv, ok := vols[m.Volume]
+			if !ok {
+				return nil, fmt.Errorf("could not find volume %s", m.Volume)
+			}
+			vol = &vv
+		}
+
+		// Find a corresponding MountPoint, which is optional
+		ro := false
+		for _, mp := range ra.App.MountPoints {
+			if mp.Name == m.Volume {
+				ro = mp.ReadOnly
+				break
+			}
+		}
+		if vol.ReadOnly != nil {
+			ro = *vol.ReadOnly
+		}
+
 		genMnts = append(genMnts,
 			mountWrapper{
 				Mount:          m,
 				DockerImplicit: false,
+				ReadOnly:       ro,
+				Volume:         *vol,
 			})
 	}
 
+	// Now, match up MountPoints with Mounts or Volumes
+	// If there's no Mount and no Volume, generate an empty volume
 	for _, mp := range app.MountPoints {
-		// there's already an injected mount for this target path, skip
+		// there's already a Mount for this MountPoint, stop
 		if _, ok := mnts[mp.Path]; ok {
 			continue
 		}
-		vol, ok := volumes[mp.Name]
+
+		// No Mount, try to match based on volume name
+		vol, ok := vols[mp.Name]
 		// there is no volume for this mount point, creating an "empty" volume
 		// implicitly
 		if !ok {
@@ -108,34 +141,41 @@ func GenerateMounts(ra *schema.RuntimeApp, volumes map[types.ACName]types.Volume
 				GID:  &defaultGID,
 			}
 
-			dockerImplicit := convertedFromDocker(imageManifest)
 			log.Printf("warning: no volume specified for mount point %q, implicitly creating an \"empty\" volume. This volume will be removed when the pod is garbage-collected.", mp.Name)
-			if dockerImplicit {
+			if convertedFromDocker {
 				log.Printf("Docker converted image, initializing implicit volume with data contained at the mount point %q.", mp.Name)
 			}
 
-			volumes[uniqName] = emptyVol
+			vols[uniqName] = emptyVol
 			genMnts = append(genMnts,
 				mountWrapper{
 					Mount: schema.Mount{
 						Volume: uniqName,
 						Path:   mp.Path,
 					},
-					DockerImplicit: dockerImplicit,
+					Volume:         emptyVol,
+					ReadOnly:       mp.ReadOnly,
+					DockerImplicit: convertedFromDocker,
 				})
 		} else {
+			ro := mp.ReadOnly
+			if vol.ReadOnly != nil {
+				ro = *vol.ReadOnly
+			}
 			genMnts = append(genMnts,
 				mountWrapper{
 					Mount: schema.Mount{
 						Volume: vol.Name,
 						Path:   mp.Path,
 					},
+					Volume:         vol,
+					ReadOnly:       ro,
 					DockerImplicit: false,
 				})
 		}
 	}
 
-	return genMnts
+	return genMnts, nil
 }
 
 // PrepareMountpoints creates and sets permissions for empty volumes.
@@ -238,3 +278,147 @@ func ensureDestinationExists(source, destination string) error {
 	}
 	return nil
 }
+
+func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []string) {
+	vols := make(map[types.ACName]types.Volume)
+	for _, v := range p.Manifest.Volumes {
+		vols[v.Name] = v
+	}
+
+	imageManifest := p.Images[ra.Name.String()]
+
+	mounts, err := GenerateMounts(ra, p.Manifest.Volumes, ConvertedFromDocker(imageManifest))
+	if err != nil {
+		log.FatalE("Could not generate mounts", err)
+		os.Exit(1)
+	}
+
+	for _, m := range mounts {
+		AppAddOneMount(p, ra, m.Volume.Source, m.Mount.Path, m.ReadOnly, enterCmd)
+	}
+}
+
+/* AppAddOneMount bind-mounts "sourcePath" from the host into "dstPath" in
+ * the container.
+ *
+ * We use the propagation mechanism of systemd-nspawn. In all systemd-nspawn
+ * containers, the directory "/run/systemd/nspawn/propagate/$MACHINE_ID" on
+ * the host is propagating mounts to the directory
+ * "/run/systemd/nspawn/incoming/" in the container mount namespace. Once a
+ * bind mount is propagated, we simply move to its correct location.
+ *
+ * The algorithm is the same as in "machinectl bind":
+ * https://github.com/systemd/systemd/blob/v231/src/machine/machine-dbus.c#L865
+ * except that we don't use setns() to enter the mount namespace of the pod
+ * because Linux does not allow multithreaded applications (such as Go
+ * programs) to change mount namespaces with setns. Instead, we fork another
+ * process written in C (single-threaded) to enter the mount namespace. The
+ * command used is specified by the "enterCmd" parameter.
+ *
+ * Users might request a bind mount to be set up read-only. This complicates
+ * things a bit because on Linux, setting up a read-only bind mount involves
+ * two mount() calls, so it is not atomic. We don't want the container to see
+ * the mount in read-write mode, even for a short time, so we don't create the
+ * bind mount directly in "/run/systemd/nspawn/propagate/$MACHINE_ID" to avoid
+ * an immediate propagation to the container. Instead, we create a temporary
+ * playground in "/tmp/rkt.propagate.XXXX" and create the bind mount in
+ * "/tmp/rkt.propagate.XXXX/mount" with the correct read-only attribute before
+ * moving it.
+ *
+ * Another complication is that the playground cannot be on a shared mount
+ * because Linux does not allow MS_MOVE to be applied to mounts with MS_SHARED
+ * parent mounts. But by default, systemd mounts everything as shared, see:
+ * https://github.com/systemd/systemd/blob/v231/src/core/mount-setup.c#L392
+ * We set up the temporary playground as a slave bind mount to avoid this
+ * limitation.
+ */
+func AppAddOneMount(p *stage1commontypes.Pod, ra *schema.RuntimeApp, sourcePath string, dstPath string, readOnly bool, enterCmd []string) {
+	/* The general plan:
+	 * - bind-mount sourcePath to mountTmp
+	 * - MS_MOVE mountTmp to mountOutside, the systemd propagate dir
+	 * - systemd moves mountOutside to mountInside
+	 * - in the stage1 namespace, bind mountInside to the app's rootfs
+	 */
+
+	/* Prepare a temporary playground that is not a shared mount */
+	playgroundMount, err := ioutil.TempDir("", "rkt.propagate.")
+	if err != nil {
+		log.FatalE("error creating temporary propagation directory", err)
+		os.Exit(1)
+	}
+	defer os.Remove(playgroundMount)
+
+	err = syscall.Mount(playgroundMount, playgroundMount, "bind", syscall.MS_BIND, "")
+	if err != nil {
+		log.FatalE("error mounting temporary directory", err)
+		os.Exit(1)
+	}
+	defer syscall.Unmount(playgroundMount, 0)
+
+	err = syscall.Mount("", playgroundMount, "none", syscall.MS_SLAVE, "")
+	if err != nil {
+		log.FatalE("error mounting temporary directory", err)
+		os.Exit(1)
+	}
+
+	/* Bind mount the source into the playground, possibly read-only */
+	mountTmp := filepath.Join(playgroundMount, "mount")
+	if err := ensureDestinationExists(sourcePath, mountTmp); err != nil {
+		log.FatalE("error creating temporary mountpoint", err)
+		os.Exit(1)
+	}
+	defer os.Remove(mountTmp)
+
+	err = syscall.Mount(sourcePath, mountTmp, "bind", syscall.MS_BIND, "")
+	if err != nil {
+		log.FatalE("error mounting temporary mountpoint", err)
+		os.Exit(1)
+	}
+	defer syscall.Unmount(mountTmp, 0)
+
+	if readOnly {
+		err = syscall.Mount("", mountTmp, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
+		if err != nil {
+			log.FatalE("error remounting temporary mountpoint read-only", err)
+			os.Exit(1)
+		}
+	}
+
+	/* Now that the bind mount has the correct attributes (RO or RW), move
+	 * it to the propagation directory prepared by systemd-nspawn */
+	mountOutside := filepath.Join("/run/systemd/nspawn/propagate/", "rkt-"+p.UUID.String(), "rkt.mount")
+	mountInside := filepath.Join("/run/systemd/nspawn/incoming/", filepath.Base(mountOutside))
+	if err := ensureDestinationExists(sourcePath, mountOutside); err != nil {
+		log.FatalE("error creating propagate mountpoint", err)
+		os.Exit(1)
+	}
+	defer os.Remove(mountOutside)
+
+	err = syscall.Mount(mountTmp, mountOutside, "", syscall.MS_MOVE, "")
+	if err != nil {
+		log.FatalE("error moving temporary mountpoint to propagate directory", err)
+		os.Exit(1)
+	}
+	defer syscall.Unmount(mountOutside, 0)
+
+	/* Finally move the bind mount at the correct place inside the container. */
+	mountDst := filepath.Join("/opt/stage2", ra.Name.String(), "rootfs", dstPath)
+	mountDstOutside := filepath.Join(p.Root, "stage1/rootfs", mountDst)
+	if err := ensureDestinationExists(sourcePath, mountDstOutside); err != nil {
+		log.FatalE("error creating destination directory", err)
+		os.Exit(1)
+	}
+
+	args := enterCmd
+	args = append(args, "/bin/mount", "--move", mountInside, mountDst)
+
+	cmd := exec.Cmd{
+		Path: args[0],
+		Args: args,
+	}
+
+	if err := cmd.Run(); err != nil {
+		log.PrintE("error executing mount move", err)
+		os.Exit(1)
+	}
+}
diff --git a/stage1/init/common/mount_test.go b/stage1/init/common/mount_test.go
new file mode 100644
index 0000000000..da87d2bee8
--- /dev/null
+++ b/stage1/init/common/mount_test.go
@@ -0,0 +1,189 @@
+// Copyright 2014 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/kr/pretty"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+func TestGenerateMounts(t *testing.T) {
+	tests := []struct {
+		ra         *schema.RuntimeApp
+		vols       []types.Volume
+		fromDocker bool
+		hasErr     bool
+		expected   []mountWrapper
+	}{
+		{ // Test matching ra.mount to volume via name w/o/ mountpoint
+			ra: &schema.RuntimeApp{
+				Mounts: []schema.Mount{
+					{
+						Volume: *types.MustACName("foo-mount"),
+						Path:   "/app/foo",
+					},
+				},
+				App: &types.App{
+					MountPoints: nil,
+				},
+			},
+			vols: []types.Volume{
+				{
+					Name:     *types.MustACName("foo-mount"),
+					Kind:     "host",
+					Source:   "/host/foo",
+					ReadOnly: &falseVar,
+				},
+			},
+			fromDocker: false,
+			hasErr:     false,
+			expected: []mountWrapper{
+				{
+					Mount: schema.Mount{
+						Volume: *types.MustACName("foo-mount"),
+						Path:   "/app/foo",
+					},
+					Volume: types.Volume{
+						Name:     *types.MustACName("foo-mount"),
+						Kind:     "host",
+						Source:   "/host/foo",
+						ReadOnly: &falseVar,
+					},
+					DockerImplicit: false,
+					ReadOnly:       false,
+				},
+			},
+		},
+		{ // Test matching app's mountpoint to a volume w/o a mount
+			ra: &schema.RuntimeApp{
+				Mounts: nil,
+				App: &types.App{
+					MountPoints: []types.MountPoint{
+						{
+							Name:     *types.MustACName("foo-mp"),
+							Path:     "/app/foo-mp",
+							ReadOnly: false,
+						},
+					},
+				},
+			},
+			vols: []types.Volume{
+				{
+					Name:     *types.MustACName("foo-mount"),
+					Kind:     "host",
+					Source:   "/host/foo",
+					ReadOnly: &falseVar,
+				},
+				{
+					Name:     *types.MustACName("foo-mp"),
+					Kind:     "host",
+					Source:   "/host/bar",
+					ReadOnly: &falseVar,
+				},
+			},
+			fromDocker: false,
+			hasErr:     false,
+			expected: []mountWrapper{
+				{
+					Mount: schema.Mount{
+						Volume: *types.MustACName("foo-mp"),
+						Path:   "/app/foo-mp",
+					},
+					Volume: types.Volume{
+						Name:     *types.MustACName("foo-mp"),
+						Kind:     "host",
+						Source:   "/host/bar",
+						ReadOnly: &falseVar,
+					},
+					DockerImplicit: false,
+					ReadOnly:       false,
+				},
+			},
+		},
+		{ // Test that app's Mount can override the volume
+			ra: &schema.RuntimeApp{
+				Mounts: []schema.Mount{
+					{
+						Volume: *types.MustACName("foo-mount"),
+						Path:   "/app/foo",
+						AppVolume: &types.Volume{
+							Name:     *types.MustACName("foo-mount"),
+							Kind:     "host",
+							Source:   "/host/overridden",
+							ReadOnly: nil,
+						},
+					},
+				},
+
+				App: &types.App{
+					MountPoints: nil,
+				},
+			},
+			vols: []types.Volume{
+				{
+					Name:     *types.MustACName("foo-mount"),
+					Kind:     "host",
+					Source:   "/host/foo",
+					ReadOnly: &falseVar,
+				},
+				{
+					Name:     *types.MustACName("foo-mp"),
+					Kind:     "host",
+					Source:   "/host/bar",
+					ReadOnly: &falseVar,
+				},
+			},
+			fromDocker: false,
+			hasErr:     false,
+			expected: []mountWrapper{
+				{
+					Mount: schema.Mount{
+						Volume: *types.MustACName("foo-mount"),
+						Path:   "/app/foo",
+						AppVolume: &types.Volume{
+							Name:     *types.MustACName("foo-mount"),
+							Kind:     "host",
+							Source:   "/host/overridden",
+							ReadOnly: nil,
+						},
+					},
+					Volume: types.Volume{
+						Name:     *types.MustACName("foo-mount"),
+						Kind:     "host",
+						Source:   "/host/overridden",
+						ReadOnly: nil,
+					},
+					DockerImplicit: false,
+					ReadOnly:       false,
+				},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		result, err := GenerateMounts(tt.ra, tt.vols, tt.fromDocker)
+		if (err != nil) != tt.hasErr {
+			t.Errorf("test %d expected error status %t, didn't get it", i, tt.hasErr)
+		}
+		if !reflect.DeepEqual(result, tt.expected) {
+			t.Errorf("test %d, result != expected, %+v", i, pretty.Diff(tt.expected, result))
+		}
+	}
+}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index b521c856b7..f0b0d53d15 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -309,7 +309,7 @@ func FindBinPath(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (string, error
 // node, we create a symlink to its target in "/rkt/volumes". Later,
 // prepare-app will copy those to "/dev/.rkt/" so that's what we use in the
 // DeviceAllow= line.
-func generateDeviceAllows(root string, appName types.ACName, mountPoints []types.MountPoint, mounts []mountWrapper, vols map[types.ACName]types.Volume, uidRange *user.UidRange) ([]string, error) {
+func generateDeviceAllows(root string, appName types.ACName, mountPoints []types.MountPoint, mounts []mountWrapper, uidRange *user.UidRange) ([]string, error) {
 	var devAllow []string
 
 	rktVolumeLinksPath := filepath.Join(root, "rkt", "volumes")
@@ -321,21 +321,20 @@ func generateDeviceAllows(root string, appName types.ACName, mountPoints []types
 	}
 
 	for _, m := range mounts {
-		v := vols[m.Volume]
-		if v.Kind != "host" {
+		if m.Volume.Kind != "host" {
 			continue
 		}
-		if fileutil.IsDeviceNode(v.Source) {
+		if fileutil.IsDeviceNode(m.Volume.Source) {
 			mode := "r"
-			if !IsMountReadOnly(v, mountPoints) {
+			if !m.ReadOnly {
 				mode += "w"
 			}
 
-			tgt := filepath.Join(common.RelAppRootfsPath(appName), m.Path)
+			tgt := filepath.Join(common.RelAppRootfsPath(appName), m.Mount.Path)
 			// the DeviceAllow= line needs the link path in /dev/.rkt/
-			linkRel := filepath.Join("/dev/.rkt", v.Name.String())
+			linkRel := filepath.Join("/dev/.rkt", m.Volume.Name.String())
 			// the real link should be in /rkt/volumes for now
-			link := filepath.Join(rktVolumeLinksPath, v.Name.String())
+			link := filepath.Join(rktVolumeLinksPath, m.Volume.Name.String())
 
 			err := os.Symlink(tgt, link)
 			// if the link already exists, we don't need to do anything
@@ -484,11 +483,13 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp, insecureOp
 	}
 
 	imageManifest := p.Images[appName.String()]
-	mounts := GenerateMounts(ra, vols, imageManifest)
+	mounts, err := GenerateMounts(ra, p.Manifest.Volumes, ConvertedFromDocker(imageManifest))
+	if err != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("could not generate app %q mounts", appName), err)
+	}
 	for _, m := range mounts {
-		vol := vols[m.Volume]
 
-		shPath := filepath.Join(sharedVolPath, vol.Name.String())
+		shPath := filepath.Join(sharedVolPath, m.Volume.Name.String())
 
 		absRoot, err := filepath.Abs(p.Root) // Absolute path to the pod's rootfs.
 		if err != nil {
@@ -500,31 +501,31 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp, insecureOp
 		// TODO(yifan): This is a temporary fix for systemd-nspawn not handling symlink mounts well.
 		// Could be removed when https://github.com/systemd/systemd/issues/2860 is resolved, and systemd
 		// version is bumped.
-		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Path)
+		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Mount.Path)
 		if err != nil {
-			return nil, errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Path), err)
+			return nil, errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Mount.Path), err)
 		}
 		mntAbsPath := filepath.Join(appRootfs, mntPath)
 
-		if err := PrepareMountpoints(shPath, mntAbsPath, &vol, m.DockerImplicit); err != nil {
+		if err := PrepareMountpoints(shPath, mntAbsPath, &m.Volume, m.DockerImplicit); err != nil {
 			return nil, err
 		}
 
 		opt := make([]string, 6)
 
-		if IsMountReadOnly(vol, app.MountPoints) {
+		if m.ReadOnly {
 			opt[0] = "--bind-ro="
 		} else {
 			opt[0] = "--bind="
 		}
 
-		switch vol.Kind {
+		switch m.Volume.Kind {
 		case "host":
-			opt[1] = vol.Source
+			opt[1] = m.Volume.Source
 		case "empty":
-			opt[1] = filepath.Join(common.SharedVolumesPath(absRoot), vol.Name.String())
+			opt[1] = filepath.Join(common.SharedVolumesPath(absRoot), m.Volume.Name.String())
 		default:
-			return nil, fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, vol.Kind)
+			return nil, fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, m.Volume.Kind)
 		}
 		opt[2] = ":"
 		opt[3] = filepath.Join(common.RelAppRootfsPath(appName), mntPath)
@@ -532,8 +533,8 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp, insecureOp
 
 		// If Recursive is not set, default to recursive.
 		recursive := true
-		if vol.Recursive != nil {
-			recursive = *vol.Recursive
+		if m.Volume.Recursive != nil {
+			recursive = *m.Volume.Recursive
 		}
 
 		// rbind/norbind options exist since systemd-nspawn v226
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 768fe6588d..24515b36d7 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -402,12 +402,6 @@ func (uw *UnitWriter) AppUnit(
 		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", common.RelAppRootfsPath(appName)))
 	}
 
-	// TODO(tmrts): Extract this logic into a utility function.
-	vols := make(map[types.ACName]types.Volume)
-	for _, v := range uw.p.Manifest.Volumes {
-		vols[v.Name] = v
-	}
-
 	absRoot, err := filepath.Abs(uw.p.Root) // Absolute path to the pod's rootfs.
 	if err != nil {
 		uw.err = err
@@ -417,15 +411,20 @@ func (uw *UnitWriter) AppUnit(
 
 	rwDirs := []string{}
 	imageManifest := uw.p.Images[appName.String()]
-	mounts := GenerateMounts(ra, vols, imageManifest)
+	mounts, err := GenerateMounts(ra, uw.p.Manifest.Volumes, ConvertedFromDocker(imageManifest))
+	if err != nil {
+		uw.err = err
+		return
+	}
+
 	for _, m := range mounts {
-		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Path)
+		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Mount.Path)
 		if err != nil {
 			uw.err = err
 			return
 		}
 
-		if !IsMountReadOnly(vols[m.Volume], app.MountPoints) {
+		if !m.ReadOnly {
 			rwDirs = append(rwDirs, filepath.Join(common.RelAppRootfsPath(appName), mntPath))
 		}
 	}
@@ -435,7 +434,7 @@ func (uw *UnitWriter) AppUnit(
 	if !insecureOptions.DisablePaths && flavor != "kvm" {
 		opts = protectSystemFiles(opts, appName)
 		opts = append(opts, unit.NewUnitOption("Service", "DevicePolicy", "closed"))
-		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(absRoot), appName, app.MountPoints, mounts, vols, uidRange)
+		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(absRoot), appName, app.MountPoints, mounts, uidRange)
 		if err != nil {
 			uw.err = err
 			return
diff --git a/stage1/init/init.go b/stage1/init/init.go
index f040f587da..c3f8269611 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -686,6 +686,7 @@ func stage1() int {
 			return 1
 		}
 	}
+	diag.Println(args)
 
 	err = stage1common.WithClearedCloExec(lfd, func() error {
 		return syscall.Exec(args[0], args, env)
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index a911bacc1c..31e7996ea1 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -25,7 +25,6 @@ import (
 	"syscall"
 
 	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/util"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/networking"
@@ -55,13 +54,7 @@ func KvmNetworkingToSystemd(p *stage1commontypes.Pod, n *networking.Networking)
 }
 
 func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
-	app := ra.App
 	appName := ra.Name
-	volumes := p.Manifest.Volumes
-	vols := make(map[types.ACName]types.Volume)
-	for _, v := range volumes {
-		vols[v.Name] = v
-	}
 
 	sharedVolPath := common.SharedVolumesPath(root)
 	if err := os.MkdirAll(sharedVolPath, stage1initcommon.SharedVolPerm); err != nil {
@@ -72,10 +65,11 @@ func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.Runtim
 	}
 
 	imageManifest := p.Images[appName.String()]
-	mounts := stage1initcommon.GenerateMounts(ra, vols, imageManifest)
+	mounts, err := stage1initcommon.GenerateMounts(ra, p.Manifest.Volumes, stage1initcommon.ConvertedFromDocker(imageManifest))
+	if err != nil {
+		return err
+	}
 	for _, m := range mounts {
-		vol := vols[m.Volume]
-
 		absRoot, err := filepath.Abs(p.Root) // Absolute path to the pod's rootfs.
 		if err != nil {
 			return errwrap.Wrap(errors.New("could not get pod's root absolute path"), err)
@@ -86,32 +80,31 @@ func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.Runtim
 			return fmt.Errorf(`could not evaluate absolute path for application rootfs in app: %v`, appName)
 		}
 
-		mntPath, err := stage1initcommon.EvaluateSymlinksInsideApp(absAppRootfs, m.Path)
+		mntPath, err := stage1initcommon.EvaluateSymlinksInsideApp(absAppRootfs, m.Mount.Path)
 		if err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Path), err)
+			return errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Mount.Path), err)
 		}
 		absDestination := filepath.Join(absAppRootfs, mntPath)
-		shPath := filepath.Join(sharedVolPath, vol.Name.String())
-		if err := stage1initcommon.PrepareMountpoints(shPath, absDestination, &vol, m.DockerImplicit); err != nil {
+		shPath := filepath.Join(sharedVolPath, m.Volume.Name.String())
+		if err := stage1initcommon.PrepareMountpoints(shPath, absDestination, &m.Volume, m.DockerImplicit); err != nil {
 			return err
 		}
 
-		readOnly := stage1initcommon.IsMountReadOnly(vol, app.MountPoints)
 		var source string
-		switch vol.Kind {
+		switch m.Volume.Kind {
 		case "host":
-			source = vol.Source
+			source = m.Volume.Source
 		case "empty":
-			source = filepath.Join(common.SharedVolumesPath(root), vol.Name.String())
+			source = filepath.Join(common.SharedVolumesPath(root), m.Volume.Name.String())
 		default:
-			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, vol.Kind)
+			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, m.Volume.Kind)
 		}
 		if cleanedSource, err := filepath.EvalSymlinks(source); err != nil {
 			return errwrap.Wrap(fmt.Errorf("could not resolve symlink for source: %v", source), err)
 		} else if err := ensureDestinationExists(cleanedSource, absDestination); err != nil {
 			return errwrap.Wrap(fmt.Errorf("could not create destination mount point: %v", absDestination), err)
-		} else if err := doBindMount(cleanedSource, absDestination, readOnly, vol.Recursive); err != nil {
-			return errwrap.Wrap(fmt.Errorf("could not bind mount path %v (s: %v, d: %v)", m.Path, source, absDestination), err)
+		} else if err := doBindMount(cleanedSource, absDestination, m.ReadOnly, m.Volume.Recursive); err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not bind mount path %v (s: %v, d: %v)", m.Mount.Path, source, absDestination), err)
 		}
 	}
 	return nil

From 57036ca5ba261a388f607b0bf1b54f518fe1e32a Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 13 Oct 2016 16:52:57 +0200
Subject: [PATCH 0836/1304] CRI: pick up appc annotation rename

---
 lib/app.go    |  4 ++--
 lib/pod.go    |  8 ++++----
 stage0/app.go |  4 ++--
 stage0/run.go | 30 +++++++++++++++---------------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/app.go b/lib/app.go
index eed6d74ddf..9b2cfd3f49 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -61,8 +61,8 @@ func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.
 	app := &App{
 		Name:            ra.Name.String(),
 		ImageID:         ra.Image.ID.String(),
-		UserAnnotations: ra.App.CRIAnnotations,
-		UserLabels:      ra.App.CRILabels,
+		UserAnnotations: ra.App.UserAnnotations,
+		UserLabels:      ra.App.UserLabels,
 	}
 
 	// Generate mounts
diff --git a/lib/pod.go b/lib/pod.go
index e4ad6f5e0a..4516bb1942 100644
--- a/lib/pod.go
+++ b/lib/pod.go
@@ -33,16 +33,16 @@ func NewPodFromInternalPod(p *pkgPod.Pod) (*Pod, error) {
 		pod.AppNames = append(pod.AppNames, app.Name.String())
 	}
 
-	if len(manifest.CRIAnnotations) > 0 {
+	if len(manifest.UserAnnotations) > 0 {
 		pod.UserAnnotations = make(map[string]string)
-		for name, value := range manifest.CRIAnnotations {
+		for name, value := range manifest.UserAnnotations {
 			pod.UserAnnotations[name] = value
 		}
 	}
 
-	if len(manifest.CRILabels) > 0 {
+	if len(manifest.UserLabels) > 0 {
 		pod.UserLabels = make(map[string]string)
-		for name, value := range manifest.CRILabels {
+		for name, value := range manifest.UserLabels {
 			pod.UserLabels[name] = value
 		}
 	}
diff --git a/stage0/app.go b/stage0/app.go
index 4d172f9124..ebd5ec31d9 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -226,11 +226,11 @@ func AddApp(cfg AddConfig) error {
 	}
 
 	if app.UserAnnotations != nil {
-		ra.App.CRIAnnotations = app.UserAnnotations
+		ra.App.UserAnnotations = app.UserAnnotations
 	}
 
 	if app.UserLabels != nil {
-		ra.App.CRILabels = app.UserLabels
+		ra.App.UserLabels = app.UserLabels
 	}
 
 	if app.Environments != nil {
diff --git a/stage0/run.go b/stage0/run.go
index 86d3a3df72..d6033624c0 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -61,17 +61,17 @@ var debugEnabled bool
 // PrepareConfig defines the configuration parameters required by Prepare
 type PrepareConfig struct {
 	*CommonConfig
-	Apps               *apps.Apps           // apps to prepare
-	InheritEnv         bool                 // inherit parent environment into apps
-	ExplicitEnv        []string             // always set these environment variables for all the apps
-	EnvFromFile        []string             // environment variables loaded from files, set for all the apps
-	Ports              []types.ExposedPort  // list of ports that rkt will expose on the host
-	UseOverlay         bool                 // prepare pod with overlay fs
-	SkipTreeStoreCheck bool                 // skip checking the treestore before rendering
-	PodManifest        string               // use the pod manifest specified by the user, this will ignore flags such as '--volume', '--port', etc.
-	PrivateUsers       *user.UidRange       // user namespaces
-	UserAnnotations    types.CRIAnnotations // user annotations for the pod.
-	UserLabels         types.CRILabels      // user labels for the pod.
+	Apps               *apps.Apps            // apps to prepare
+	InheritEnv         bool                  // inherit parent environment into apps
+	ExplicitEnv        []string              // always set these environment variables for all the apps
+	EnvFromFile        []string              // environment variables loaded from files, set for all the apps
+	Ports              []types.ExposedPort   // list of ports that rkt will expose on the host
+	UseOverlay         bool                  // prepare pod with overlay fs
+	SkipTreeStoreCheck bool                  // skip checking the treestore before rendering
+	PodManifest        string                // use the pod manifest specified by the user, this will ignore flags such as '--volume', '--port', etc.
+	PrivateUsers       *user.UidRange        // user namespaces
+	UserAnnotations    types.UserAnnotations // user annotations for the pod.
+	UserLabels         types.UserLabels      // user labels for the pod.
 }
 
 // RunConfig defines the configuration parameters needed by Run
@@ -280,11 +280,11 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		}
 
 		if app.UserAnnotations != nil {
-			ra.App.CRIAnnotations = app.UserAnnotations
+			ra.App.UserAnnotations = app.UserAnnotations
 		}
 
 		if app.UserLabels != nil {
-			ra.App.CRILabels = app.UserLabels
+			ra.App.UserLabels = app.UserLabels
 		}
 
 		// loading the environment from the lowest priority to highest
@@ -326,8 +326,8 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		Value: strconv.FormatBool(cfg.Mutable),
 	})
 
-	pm.CRIAnnotations = cfg.UserAnnotations
-	pm.CRILabels = cfg.UserLabels
+	pm.UserAnnotations = cfg.UserAnnotations
+	pm.UserLabels = cfg.UserLabels
 
 	pmb, err := json.Marshal(pm)
 	if err != nil {

From b59fa4be3c7f16400851d21c1ecf8800fc916a74 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 12 Oct 2016 13:24:00 +0200
Subject: [PATCH 0837/1304] CRI: add cpu-shares isolator

Fixes partially #3242
---
 common/apps/apps.go            |  1 +
 rkt/cli_apps.go                | 36 ++++++++++++++++++++++++++++++
 rkt/run.go                     |  1 +
 stage0/run.go                  |  6 ++++-
 stage1/init/common/units.go    |  5 +++++
 tests/inspect/inspect.go       | 20 +++++++++++++++++
 tests/rkt_app_isolator_test.go | 40 ++++++++++++++++++++++++++++++++++
 7 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/common/apps/apps.go b/common/apps/apps.go
index 71aebdd148..fe6f42b945 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -56,6 +56,7 @@ type App struct {
 	Mounts            []schema.Mount                    // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
 	MemoryLimit       *types.ResourceMemory             // memory isolator override
 	CPULimit          *types.ResourceCPU                // cpu isolator override
+	CPUShares         *types.LinuxCPUShares             // cpu-shares isolator override
 	User, Group       string                            // user, group overrides
 	SupplementaryGIDs []int                             // supplementary gids override
 	CapsRetain        *types.LinuxCapabilitiesRetainSet // os/linux/capabilities-retain-set overrides
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index dc56183e2b..a8fa444bef 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -367,6 +367,42 @@ func (aml *appCPULimit) Type() string {
 	return "appCPULimit"
 }
 
+// appCPUShares is for --cpu-shares flags in the form of: --cpu-shares=2048
+type appCPUShares apps.Apps
+
+func (aml *appCPUShares) Set(s string) error {
+	app := (*apps.Apps)(aml).Last()
+	if app == nil {
+		return fmt.Errorf("--cpu-shares must follow an image")
+	}
+	shares, err := strconv.Atoi(s)
+	if err != nil {
+		return err
+	}
+	isolator, err := types.NewLinuxCPUShares(shares)
+	if err != nil {
+		return err
+	}
+	app.CPUShares = isolator
+	return nil
+}
+
+func (aml *appCPUShares) String() string {
+	app := (*apps.Apps)(aml).Last()
+	if app == nil {
+		return ""
+	}
+	shares := app.CPUShares
+	if shares == nil {
+		return ""
+	}
+	return strconv.Itoa(int(*shares))
+}
+
+func (aml *appCPUShares) Type() string {
+	return "appCPUShares"
+}
+
 // appUser is for --user flags in the form of: --user=user
 type appUser apps.Apps
 
diff --git a/rkt/run.go b/rkt/run.go
index acbc190a50..721279f672 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -82,6 +82,7 @@ image arguments with a lone "---" to resume argument parsing.`,
 func addIsolatorFlags(cmd *cobra.Command, compat bool) {
 	cmd.Flags().Var((*appMemoryLimit)(&rktApps), "memory", "memory limit for the preceding image (example: '--memory=16Mi', '--memory=50M', '--memory=1G')")
 	cmd.Flags().Var((*appCPULimit)(&rktApps), "cpu", "cpu limit for the preceding image (example: '--cpu=500m')")
+	cmd.Flags().Var((*appCPUShares)(&rktApps), "cpu-shares", "cpu-shares assigns the specified CPU time share weight (example: '--cpu-shares=2048')")
 	cmd.Flags().Var((*appCapsRetain)(&rktApps), "caps-retain", "capability to retain (example: '--caps-retain=CAP_SYS_ADMIN')")
 	cmd.Flags().Var((*appCapsRemove)(&rktApps), "caps-remove", "capability to remove (example: '--caps-remove=CAP_MKNOD')")
 	cmd.Flags().Var((*appSeccompFilter)(&rktApps), "seccomp", "seccomp filter override (example: '--seccomp mode=retain,errno=EPERM,chmod,chown')")
diff --git a/stage0/run.go b/stage0/run.go
index d6033624c0..9e68e37c8d 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -320,7 +320,6 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		return nil, err
 	}
 
-	// TODO(sur): add to stage1-implementors-guide and to the spec
 	pm.Annotations = append(pm.Annotations, types.Annotation{
 		Name:  "coreos.com/rkt/stage1/mutable",
 		Value: strconv.FormatBool(cfg.Mutable),
@@ -348,6 +347,11 @@ func prepareIsolators(setup *apps.App, app *types.App) error {
 		app.Isolators = append(app.Isolators, isolator)
 	}
 
+	if cpuSharesOverride := setup.CPUShares; cpuSharesOverride != nil {
+		isolator := cpuSharesOverride.AsIsolator()
+		app.Isolators.ReplaceIsolatorsByName(isolator, []types.ACIdentifier{types.LinuxCPUSharesName})
+	}
+
 	if oomAdjOverride := setup.OOMScoreAdj; oomAdjOverride != nil {
 		app.Isolators.ReplaceIsolatorsByName(oomAdjOverride.AsIsolator(), []types.ACIdentifier{types.LinuxOOMScoreAdjName})
 	}
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 24515b36d7..6079553592 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -489,6 +489,11 @@ func (uw *UnitWriter) AppUnit(
 			}
 		case *types.LinuxOOMScoreAdj:
 			opts = append(opts, unit.NewUnitOption("Service", "OOMScoreAdjust", strconv.Itoa(int(*v))))
+		case *types.LinuxCPUShares:
+			exit = doWithIsolator("cpu", func() error {
+				opts = append(opts, unit.NewUnitOption("Service", "CPUShares", strconv.Itoa(int(*v))))
+				return nil
+			})
 		}
 	}
 
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index f958a01ba6..0d4fba4679 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -62,6 +62,7 @@ var (
 		PreSleep           int
 		PrintMemoryLimit   bool
 		PrintCPUQuota      bool
+		PrintCPUShares     bool
 		FileName           string
 		Content            string
 		CheckCgroupMounts  bool
@@ -106,6 +107,7 @@ func init() {
 	globalFlagset.IntVar(&globalFlags.PreSleep, "pre-sleep", -1, "Sleep before executing (in seconds)")
 	globalFlagset.BoolVar(&globalFlags.PrintMemoryLimit, "print-memorylimit", false, "Print cgroup memory limit")
 	globalFlagset.BoolVar(&globalFlags.PrintCPUQuota, "print-cpuquota", false, "Print cgroup cpu quota in milli-cores")
+	globalFlagset.BoolVar(&globalFlags.PrintCPUShares, "print-cpushares", false, "Print cgroup cpu shares")
 	globalFlagset.StringVar(&globalFlags.FileName, "file-name", "", "The file to read/write, $FILE will be ignored if this is specified")
 	globalFlagset.StringVar(&globalFlags.Content, "content", "", "The content to write, $CONTENT will be ignored if this is specified")
 	globalFlagset.BoolVar(&globalFlags.CheckCgroupMounts, "check-cgroups", false, "Try to write to the cgroup filesystem. Everything should be RO except some well-known files")
@@ -456,6 +458,24 @@ func main() {
 		fmt.Printf("CPU Quota: %s\n", strconv.Itoa(quotaMilliCores))
 	}
 
+	if globalFlags.PrintCPUShares {
+		cpuCgroupPath, err := v1.GetOwnCgroupPath("cpu")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error getting own cpu cgroup path: %v\n", err)
+			os.Exit(1)
+		}
+		// we use /proc/1/root to escape the chroot we're in and read our
+		// cpu quota
+		sharesPath := filepath.Join("/proc/1/root/sys/fs/cgroup/cpu", cpuCgroupPath, "cpu.shares")
+		sharesBytes, err := ioutil.ReadFile(sharesPath)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Can't read cpu.shares\n")
+			os.Exit(1)
+		}
+
+		fmt.Printf("CPU Shares: %s", string(sharesBytes))
+	}
+
 	if globalFlags.CheckCgroupMounts {
 		rootCgroupPath := "/proc/1/root/sys/fs/cgroup"
 		testPaths := []string{rootCgroupPath}
diff --git a/tests/rkt_app_isolator_test.go b/tests/rkt_app_isolator_test.go
index 8ef4cd8234..78a5e4eb8a 100644
--- a/tests/rkt_app_isolator_test.go
+++ b/tests/rkt_app_isolator_test.go
@@ -49,6 +49,14 @@ var cpuTest = struct {
 	[]string{"--exec=/inspect --print-cpuquota", "--capability=CAP_SYS_PTRACE"},
 }
 
+var cpuSharesTest = struct {
+	testName     string
+	aciBuildArgs []string
+}{
+	`Check CPU shares`,
+	[]string{"--exec=/inspect --print-cpushares", "--capability=CAP_SYS_PTRACE"},
+}
+
 var cgroupsTest = struct {
 	testName     string
 	aciBuildArgs []string
@@ -102,3 +110,35 @@ func TestAppIsolatorCPU(t *testing.T) {
 	expectedLine = "CPU Quota: " + strconv.Itoa(900)
 	runRktAndCheckOutput(t, rktCmd, expectedLine, false)
 }
+
+func TestAppIsolatorCPUShares(t *testing.T) {
+	isUnified, err := cgroup.IsCgroupUnified("/")
+	if err != nil {
+		t.Fatalf("Error determining the cgroup version: %v", err)
+	}
+
+	if isUnified {
+		t.Skip("kernel does not support cpu isolator in cgroup2.")
+	}
+
+	ok, err := cgroup.IsIsolatorSupported("cpu")
+	if err != nil {
+		t.Fatalf("Error checking cpu isolator support: %v", err)
+	}
+
+	if !ok {
+		t.Skip("CPU isolator not supported.")
+	}
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	t.Logf("Running test: %v", cpuSharesTest.testName)
+
+	aciFileName := patchTestACI("rkt-inspect-isolators.aci", cpuSharesTest.aciBuildArgs...)
+	defer os.Remove(aciFileName)
+
+	rktCmd := fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --cpu-shares 12345", ctx.Cmd(), aciFileName)
+	expectedLine := "CPU Shares: 12345"
+	runRktAndCheckOutput(t, rktCmd, expectedLine, false)
+}

From 4f5f81d4205ee5b1bf403b857025d7292c8fe3d4 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 1 Nov 2016 09:02:16 +0100
Subject: [PATCH 0838/1304] cri: add app subcommands

---
 rkt/app.go         |  28 ++++
 rkt/app_add.go     | 146 +++++++++++++++++++++
 rkt/app_exec.go    |  37 ++++++
 rkt/app_list.go    |  65 +++++++++
 rkt/app_rm.go      |  93 +++++++++++++
 rkt/app_sandbox.go | 321 +++++++++++++++++++++++++++++++++++++++++++++
 rkt/app_start.go   |  94 +++++++++++++
 rkt/app_status.go  | 134 +++++++++++++++++++
 rkt/app_stop.go    |  99 ++++++++++++++
 9 files changed, 1017 insertions(+)
 create mode 100644 rkt/app.go
 create mode 100644 rkt/app_add.go
 create mode 100644 rkt/app_exec.go
 create mode 100644 rkt/app_list.go
 create mode 100644 rkt/app_rm.go
 create mode 100644 rkt/app_sandbox.go
 create mode 100644 rkt/app_start.go
 create mode 100644 rkt/app_status.go
 create mode 100644 rkt/app_stop.go

diff --git a/rkt/app.go b/rkt/app.go
new file mode 100644
index 0000000000..02c4b0e97e
--- /dev/null
+++ b/rkt/app.go
@@ -0,0 +1,28 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "github.com/spf13/cobra"
+
+var (
+	cmdApp = &cobra.Command{
+		Use:   "app [command]",
+		Short: "Operate on app level operations",
+	}
+)
+
+func init() {
+	cmdRkt.AddCommand(cmdApp)
+}
diff --git a/rkt/app_add.go b/rkt/app_add.go
new file mode 100644
index 0000000000..0c7da65ef5
--- /dev/null
+++ b/rkt/app_add.go
@@ -0,0 +1,146 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/common/apps"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/coreos/rkt/rkt/image"
+	"github.com/coreos/rkt/stage0"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdAppAdd = &cobra.Command{
+		Use:   "add UUID IMAGEID ...",
+		Short: "Add an app to a pod",
+		Long:  `This allows addin an app that's present on the store to a running pod`,
+		Run:   runWrapper(runAppAdd),
+	}
+)
+
+func init() {
+	cmdApp.AddCommand(cmdAppAdd)
+	addAppFlags(cmdAppAdd)
+	addIsolatorFlags(cmdAppAdd, false)
+
+	// Add per-app volume mounts only for sandbox for now
+	cmdAppAdd.Flags().Var((*appMountVolume)(&rktApps), "mnt-volume", "Configure a per-app mount and volume directly")
+
+	// Disable interspersed flags to stop parsing after the first non flag
+	// argument. All the subsequent parsing will be done by parseApps.
+	// This is needed to correctly handle image args
+	cmdAppAdd.Flags().SetInterspersed(false)
+}
+
+func runAppAdd(cmd *cobra.Command, args []string) (exit int) {
+	if len(args) < 2 {
+		stderr.Print("must provide the pod UUID and an IMAGEID")
+		return 1
+	}
+
+	err := parseApps(&rktApps, args[1:], cmd.Flags(), true)
+	if err != nil {
+		stderr.PrintE("error parsing app image arguments", err)
+		return 1
+	}
+
+	if rktApps.Count() > 1 {
+		stderr.Print("must give only one app")
+		return 1
+	}
+
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
+	if err != nil {
+		stderr.PrintE("problem retrieving pod", err)
+		return 1
+	}
+	defer p.Close()
+
+	if p.State() != pkgPod.Running {
+		stderr.Printf("pod %q isn't currently running", p.UUID)
+		return 1
+	}
+
+	s, err := imagestore.NewStore(storeDir())
+	if err != nil {
+		stderr.PrintE("cannot open store", err)
+		return 1
+	}
+
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open treestore", err)
+		return 1
+	}
+
+	fn := &image.Finder{
+		S:  s,
+		Ts: ts,
+		Ks: getKeystore(),
+
+		StoreOnly: true,
+		NoStore:   false,
+	}
+
+	img, err := fn.FindImage(args[1], "", apps.AppImageGuess)
+	if err != nil {
+		stderr.PrintE("error finding images", err)
+		return 1
+	}
+
+	podPID, err := p.ContainerPid1()
+	if err != nil {
+		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
+		return 1
+	}
+
+	ccfg := stage0.CommonConfig{
+		Store:     s,
+		TreeStore: ts,
+		UUID:      p.UUID,
+		Debug:     globalFlags.Debug,
+	}
+
+	rktgid, err := common.LookupGid(common.RktGroup)
+	if err != nil {
+		stderr.Printf("group %q not found, will use default gid when rendering images", common.RktGroup)
+		rktgid = -1
+	}
+
+	cfg := stage0.AddConfig{
+		CommonConfig: &ccfg,
+		Image:        *img,
+		Apps:         &rktApps,
+		RktGid:       rktgid,
+		UsesOverlay:  p.UsesOverlay(),
+		PodPath:      p.Path(),
+		PodPID:       podPID,
+	}
+
+	err = stage0.AddApp(cfg)
+	if err != nil {
+		stderr.PrintE("error adding app to pod", err)
+		return 1
+	}
+
+	return 0
+}
diff --git a/rkt/app_exec.go b/rkt/app_exec.go
new file mode 100644
index 0000000000..d02b10242f
--- /dev/null
+++ b/rkt/app_exec.go
@@ -0,0 +1,37 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "github.com/spf13/cobra"
+
+var (
+	// Not using alias because we want 'rkt app exec' appears as
+	// a subcommand of 'rkt app'.
+	cmdAppExec = &cobra.Command{
+		Use:   "exec [--app=APP_NAME] UUID [CMD [ARGS ...]]",
+		Short: "Execute commands in the given app's namespace.",
+		Long:  "This executes the commands in the given app's namespace. The UUID is the UUID of a running pod. the app name is specified by --app. If CMD and ARGS are empty, then it will execute '/bin/bash' by default.",
+		Run:   ensureSuperuser(runWrapper(runEnter)),
+	}
+)
+
+func init() {
+	cmdApp.AddCommand(cmdAppExec)
+	cmdAppExec.Flags().StringVar(&flagAppName, "app", "", "name of the app to exec within the specified pod, can be empty if there is only one app in the pod.")
+	// Disable interspersed flags to stop parsing after the first non flag
+	// argument. This is need to permit to correctly handle
+	// ARGS for the CMD.
+	cmdAppExec.Flags().SetInterspersed(false)
+}
diff --git a/rkt/app_list.go b/rkt/app_list.go
new file mode 100644
index 0000000000..87e1361edb
--- /dev/null
+++ b/rkt/app_list.go
@@ -0,0 +1,65 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"bytes"
+	"fmt"
+
+	rkt "github.com/coreos/rkt/lib"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdAppList = &cobra.Command{
+		Use:   "list UUID",
+		Short: "List apps for the given pod",
+		Long:  "This only lists the name and state of the apps, app status will show more detailed info.",
+		Run:   runWrapper(runAppList),
+	}
+)
+
+func init() {
+	cmdApp.AddCommand(cmdAppList)
+	cmdAppList.Flags().BoolVar(&flagNoLegend, "no-legend", false, "suppress a legend with the list")
+}
+
+func runAppList(cmd *cobra.Command, args []string) int {
+	if len(args) != 1 {
+		cmd.Usage()
+		return 1
+	}
+
+	apps, err := rkt.AppsForPod(args[0], getDataDir(), "")
+	if err != nil {
+		stderr.PrintE("error listing apps", err)
+		return 1
+	}
+
+	tabBuffer := new(bytes.Buffer)
+	tabOut := getTabOutWithWriter(tabBuffer)
+
+	if !flagNoLegend {
+		fmt.Fprintf(tabOut, "NAME\tSTATE\n")
+	}
+
+	for _, app := range apps {
+		fmt.Fprintf(tabOut, "%s\t%s\n", app.Name, app.State)
+	}
+
+	tabOut.Flush()
+	stdout.Print(tabBuffer)
+	return 0
+}
diff --git a/rkt/app_rm.go b/rkt/app_rm.go
new file mode 100644
index 0000000000..10d4e9f601
--- /dev/null
+++ b/rkt/app_rm.go
@@ -0,0 +1,93 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/coreos/rkt/stage0"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdAppRm = &cobra.Command{
+		Use:   "rm UUID --app=NAME",
+		Short: "Remove an app from a pod",
+		Long:  `This allows removing an app from a running pod, it will stop it if it's still running`,
+		Run:   runWrapper(runAppRm),
+	}
+)
+
+func init() {
+	cmdAppRm.Flags().StringVar(&flagAppName, "app", "", "app to remove")
+	cmdApp.AddCommand(cmdAppRm)
+}
+
+func runAppRm(cmd *cobra.Command, args []string) (exit int) {
+	if len(args) < 1 {
+		stderr.Print("must provide the pod UUID")
+		return 1
+	}
+
+	if flagAppName == "" {
+		stderr.Print("must provide the app to remove")
+		return 1
+	}
+
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
+	if err != nil {
+		stderr.PrintE("problem retrieving pod", err)
+		return 1
+	}
+	defer p.Close()
+
+	appName, err := types.NewACName(flagAppName)
+	if err != nil {
+		stderr.PrintE("invalid app name", err)
+	}
+
+	podPID := -1
+	if p.State() == pkgPod.Running {
+		podPID, err = p.ContainerPid1()
+		if err != nil {
+			stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
+			return 1
+		}
+	}
+
+	ccfg := stage0.CommonConfig{
+		UUID:  p.UUID,
+		Debug: globalFlags.Debug,
+	}
+
+	cfg := stage0.RmConfig{
+		CommonConfig: &ccfg,
+		UsesOverlay:  p.UsesOverlay(),
+		AppName:      appName,
+		PodPath:      p.Path(),
+		PodPID:       podPID,
+	}
+
+	err = stage0.RmApp(cfg)
+	if err != nil {
+		stderr.PrintE("error removing app", err)
+		return 1
+	}
+
+	return 0
+}
diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
new file mode 100644
index 0000000000..67d634f852
--- /dev/null
+++ b/rkt/app_sandbox.go
@@ -0,0 +1,321 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"net"
+	"strconv"
+	"strings"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/label"
+	"github.com/coreos/rkt/pkg/lock"
+	"github.com/coreos/rkt/pkg/pod"
+	"github.com/coreos/rkt/pkg/user"
+	"github.com/coreos/rkt/stage0"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdAppSandbox = &cobra.Command{
+		Use:   "sandbox",
+		Short: "Create an empty pod application sandbox",
+		Long:  "Initializes an empty pod having no applications.",
+		Run:   runWrapper(runAppSandbox),
+	}
+	flagAppPorts    appPortList
+	flagAnnotations kvMap
+	flagLabels      kvMap
+)
+
+func init() {
+	cmdApp.AddCommand(cmdAppSandbox)
+
+	addStage1ImageFlags(cmdAppSandbox.Flags())
+	// TODO(sur)
+	cmdAppSandbox.Flags().StringVar(&flagUUIDFileSave, "uuid-file-save", "", "write out pod UUID to specified file")
+	cmdAppSandbox.Flags().Var(&flagNet, "net", "configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. Syntax: --net[=n[:args], ...]")
+	cmdAppSandbox.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
+	cmdAppSandbox.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf")
+	cmdAppSandbox.Flags().Var(&flagDNSSearch, "dns-search", "DNS search domains to write in /etc/resolv.conf")
+	cmdAppSandbox.Flags().Var(&flagDNSOpt, "dns-opt", "DNS options to write in /etc/resolv.conf")
+	cmdAppSandbox.Flags().StringVar(&flagHostname, "hostname", "", `pod's hostname. If empty, it will be "rkt-$PODUUID"`)
+	cmdAppSandbox.Flags().Var(&flagAppPorts, "port", "ports to forward. format: \"name:proto:podPort:hostIP:hostPort\"")
+
+	flagAppPorts = appPortList{}
+	cmdAppSandbox.Flags().Var(&flagAnnotations, "user-annotation", "optional, set the pod's annotations in the form of key=value")
+	cmdAppSandbox.Flags().Var(&flagLabels, "user-label", "optional, set the pod's label in the form of key=value")
+}
+
+func runAppSandbox(cmd *cobra.Command, args []string) int {
+	s, err := imagestore.NewStore(storeDir())
+	if err != nil {
+		stderr.PrintE("cannot open store", err)
+		return 1
+	}
+
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open treestore", err)
+		return 1
+	}
+
+	config, err := getConfig()
+	if err != nil {
+		stderr.PrintE("cannot get configuration", err)
+		return 1
+	}
+
+	s1img, err := getStage1Hash(s, ts, config)
+	if err != nil {
+		stderr.Error(err)
+		return 1
+	}
+
+	p, err := pod.NewPod(getDataDir())
+	if err != nil {
+		stderr.PrintE("error creating new pod", err)
+		return 1
+	}
+
+	if flagUUIDFileSave != "" {
+		if err := pod.WriteUUIDToFile(p.UUID, flagUUIDFileSave); err != nil {
+			stderr.PrintE("error saving pod UUID to file", err)
+			return 1
+		}
+	}
+
+	processLabel, mountLabel, err := label.InitLabels("/var/run/rkt/mcs", []string{})
+	if err != nil {
+		stderr.PrintE("error initialising SELinux", err)
+		return 1
+	}
+
+	p.MountLabel = mountLabel
+	cfg := stage0.CommonConfig{
+		MountLabel:   mountLabel,
+		ProcessLabel: processLabel,
+		Store:        s,
+		TreeStore:    ts,
+		Stage1Image:  *s1img,
+		UUID:         p.UUID,
+		Debug:        globalFlags.Debug,
+		Mutable:      true,
+	}
+
+	ovlOk := true
+	if err := common.PathSupportsOverlay(getDataDir()); err != nil {
+		if oerr, ok := err.(common.ErrOverlayUnsupported); ok {
+			stderr.Printf("disabling overlay support: %q", oerr.Error())
+			ovlOk = false
+		} else {
+			stderr.PrintE("error determining overlay support", err)
+			return 1
+		}
+	}
+
+	useOverlay := !flagNoOverlay && ovlOk
+
+	pcfg := stage0.PrepareConfig{
+		CommonConfig:       &cfg,
+		UseOverlay:         useOverlay,
+		PrivateUsers:       user.NewBlankUidRange(),
+		SkipTreeStoreCheck: globalFlags.InsecureFlags.SkipOnDiskCheck(),
+		Apps:               &rktApps,
+		Ports:              []types.ExposedPort(flagAppPorts),
+		UserAnnotations:    parseAnnotations(&flagAnnotations),
+		UserLabels:         parseLabels(&flagLabels),
+	}
+
+	if globalFlags.Debug {
+		stage0.InitDebug()
+	}
+
+	keyLock, err := lock.SharedKeyLock(lockDir(), common.PrepareLock)
+	if err != nil {
+		stderr.PrintE("cannot get shared prepare lock", err)
+		return 1
+	}
+
+	err = stage0.Prepare(pcfg, p.Path(), p.UUID)
+	if err != nil {
+		stderr.PrintE("error setting up stage0", err)
+		keyLock.Close()
+		return 1
+	}
+	keyLock.Close()
+
+	// get the lock fd for run
+	lfd, err := p.Fd()
+	if err != nil {
+		stderr.PrintE("error getting pod lock fd", err)
+		return 1
+	}
+
+	// skip prepared by jumping directly to run, we own this pod
+	if err := p.ToRun(); err != nil {
+		stderr.PrintE("unable to transition to run", err)
+		return 1
+	}
+
+	rktgid, err := common.LookupGid(common.RktGroup)
+	if err != nil {
+		stderr.Printf("group %q not found, will use default gid when rendering images", common.RktGroup)
+		rktgid = -1
+	}
+
+	DNSConfMode, DNSConfig, HostsEntries, err := parseDNSFlags(flagHostsEntries, flagDNS, flagDNSSearch, flagDNSOpt, flagDNSDomain)
+	if err != nil {
+		stderr.PrintE("error with dns flags", err)
+		return 1
+	}
+
+	rcfg := stage0.RunConfig{
+		CommonConfig:         &cfg,
+		Net:                  flagNet,
+		LockFd:               lfd,
+		Interactive:          true,
+		DNSConfMode:          DNSConfMode,
+		DNSConfig:            DNSConfig,
+		MDSRegister:          false,
+		LocalConfig:          globalFlags.LocalConfigDir,
+		RktGid:               rktgid,
+		Hostname:             flagHostname,
+		InsecureCapabilities: globalFlags.InsecureFlags.SkipCapabilities(),
+		InsecurePaths:        globalFlags.InsecureFlags.SkipPaths(),
+		InsecureSeccomp:      globalFlags.InsecureFlags.SkipSeccomp(),
+		UseOverlay:           useOverlay,
+		HostsEntries:         *HostsEntries,
+	}
+
+	_, manifest, err := p.PodManifest()
+	if err != nil {
+		stderr.PrintE("cannot get the pod manifest", err)
+		return 1
+	}
+	rcfg.Apps = manifest.Apps
+	stage0.Run(rcfg, p.Path(), getDataDir()) // execs, never returns
+
+	return 1
+}
+
+/*
+ * The sandbox uses a different style of port forwarding - instead of mapping
+ * from port to app (via name), we just map ports directly.
+ *
+ * The format is name:proto:podPort:hostIP:hostPort
+ * e.g. http:tcp:8080:0.0.0.0:80
+ */
+type appPortList []types.ExposedPort
+
+func (apl *appPortList) Set(s string) error {
+	parts := strings.SplitN(s, ":", 5)
+	if len(parts) != 5 {
+		return fmt.Errorf("--port invalid format")
+	}
+
+	// parsey parsey
+	name, err := types.NewACName(parts[0])
+	if err != nil {
+		return err
+	}
+
+	proto := parts[1]
+	switch proto {
+	case "tcp", "udp":
+	default:
+		return fmt.Errorf("invalid protocol %q", proto)
+	}
+
+	p, err := strconv.ParseUint(parts[2], 10, 16)
+	if err != nil {
+		return err
+	}
+	podPortNo := uint(p)
+
+	ip := net.ParseIP(parts[3])
+	if ip == nil {
+		return fmt.Errorf("could not parse IP %q", ip)
+	}
+
+	p, err = strconv.ParseUint(parts[4], 10, 16)
+	if err != nil {
+		return err
+	}
+	hostPortNo := uint(p)
+
+	podSide := types.Port{
+		Name:            *name,
+		Protocol:        proto,
+		Port:            podPortNo,
+		Count:           1,
+		SocketActivated: false,
+	}
+
+	hostSide := types.ExposedPort{
+		Name:     *name,
+		HostPort: hostPortNo,
+		HostIP:   ip,
+		PodPort:  &podSide,
+	}
+
+	*apl = append(*apl, hostSide)
+	return nil
+}
+
+func (apl *appPortList) String() string {
+	ss := make([]string, 0, len(*apl))
+	for _, p := range *apl {
+		ss = append(ss, fmt.Sprintf("%s:%s:%d:%s:%d",
+			p.Name, p.PodPort.Protocol, p.PodPort.Port,
+			p.HostIP, p.HostPort))
+
+	}
+	return strings.Join(ss, ",")
+}
+
+func (apl *appPortList) Type() string {
+	return "appPortList"
+}
+
+// parseAnnotations converts the annotations set by '--user-annotation' flag,
+// and returns types.UserAnnotations.
+func parseAnnotations(flagAnnotations *kvMap) types.UserAnnotations {
+	if flagAnnotations.IsEmpty() {
+		return nil
+	}
+	annotations := make(types.UserAnnotations)
+	for k, v := range flagAnnotations.mapping {
+		annotations[k] = v
+	}
+	return annotations
+}
+
+// parseLabels converts the labels set by '--user-label' flag,
+// and returns types.UserLabels.
+func parseLabels(flagLabels *kvMap) types.UserLabels {
+	if flagLabels.IsEmpty() {
+		return nil
+	}
+	labels := make(types.UserLabels)
+	for k, v := range flagLabels.mapping {
+		labels[k] = v
+	}
+	return labels
+}
diff --git a/rkt/app_start.go b/rkt/app_start.go
new file mode 100644
index 0000000000..e2669b6670
--- /dev/null
+++ b/rkt/app_start.go
@@ -0,0 +1,94 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/coreos/rkt/stage0"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdAppStart = &cobra.Command{
+		Use:   "start UUID --app=NAME",
+		Short: "Start an app in a pod",
+		Long:  `Start appz!`,
+		Run:   runWrapper(runAppStart),
+	}
+)
+
+func init() {
+	cmdAppStart.Flags().StringVar(&flagAppName, "app", "", "app to start")
+	cmdApp.AddCommand(cmdAppStart)
+}
+
+func runAppStart(cmd *cobra.Command, args []string) (exit int) {
+	if len(args) < 1 {
+		stderr.Print("must provide the pod UUID")
+		return 1
+	}
+
+	if flagAppName == "" {
+		stderr.Print("must provide the app to start")
+		return 1
+	}
+
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
+	if err != nil {
+		stderr.PrintE("problem retrieving pod", err)
+		return 1
+	}
+	defer p.Close()
+
+	if p.State() != pkgPod.Running {
+		stderr.Printf("pod %q isn't currently running", p.UUID)
+		return 1
+	}
+
+	appName, err := types.NewACName(flagAppName)
+	if err != nil {
+		stderr.PrintE("invalid app name", err)
+	}
+
+	podPID, err := p.ContainerPid1()
+	if err != nil {
+		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
+		return 1
+	}
+
+	cfg := stage0.CommonConfig{
+		UUID:  p.UUID,
+		Debug: globalFlags.Debug,
+	}
+
+	scfg := stage0.StartConfig{
+		CommonConfig: &cfg,
+		Dir:          p.Path(),
+		AppName:      appName,
+		PodPID:       podPID,
+	}
+
+	err = stage0.StartApp(scfg)
+	if err != nil {
+		stderr.PrintE("error starting app", err)
+		return 1
+	}
+
+	return 0
+}
diff --git a/rkt/app_status.go b/rkt/app_status.go
new file mode 100644
index 0000000000..35369f6a68
--- /dev/null
+++ b/rkt/app_status.go
@@ -0,0 +1,134 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+	"time"
+
+	rkt "github.com/coreos/rkt/lib"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdAppStatus = &cobra.Command{
+		Use:   "status UUID --app=APP_NAME [--format=json]",
+		Short: "Check the status of an app in the given pod",
+		Long:  "This will print detailed status of an app",
+		Run:   runWrapper(runAppStatus),
+	}
+)
+
+func init() {
+	cmdApp.AddCommand(cmdAppStatus)
+	cmdAppStatus.Flags().StringVar(&flagAppName, "app", "", "choose app within the pod, this flag must be set")
+	cmdAppStatus.Flags().StringVar(&flagFormat, "format", "", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
+}
+
+func printApp(app *rkt.App) {
+	stdout.Printf("name=%s\n", app.Name)
+	stdout.Printf("state=%s\n", app.State)
+	stdout.Printf("image_id=%s\n", app.ImageID)
+	if app.CreatedAt != nil {
+		stdout.Printf("created_at=%v\n", time.Unix(0, *(app.CreatedAt)))
+	}
+	if app.StartedAt != nil {
+		stdout.Printf("started_at=%v\n", time.Unix(0, *(app.StartedAt)))
+	}
+	if app.FinishedAt != nil {
+		stdout.Printf("finished_at=%v\n", time.Unix(0, *(app.FinishedAt)))
+	}
+	if app.ExitCode != nil {
+		stdout.Printf("exit_code=%d\n", *(app.ExitCode))
+	}
+
+	if len(app.Mounts) > 0 {
+		stdout.Printf("mounts=")
+		var mnts []string
+		for _, mnt := range app.Mounts {
+			mnts = append(mnts, fmt.Sprintf("%s:%s:(read_only:%v)", mnt.HostPath, mnt.ContainerPath, mnt.ReadOnly))
+		}
+		stdout.Printf(strings.Join(mnts, ","))
+		stdout.Println()
+	}
+
+	if len(app.UserAnnotations) > 0 {
+		stdout.Printf("user_annotations=")
+		var annos []string
+		for key, value := range app.UserAnnotations {
+			annos = append(annos, fmt.Sprintf("%s:%s", key, value))
+		}
+		stdout.Printf(strings.Join(annos, ","))
+		stdout.Println()
+	}
+
+	if len(app.UserLabels) > 0 {
+		stdout.Printf("user_labels=")
+		var labels []string
+		for key, value := range app.UserLabels {
+			labels = append(labels, fmt.Sprintf("%s:%s", key, value))
+		}
+		stdout.Printf(strings.Join(labels, ","))
+		stdout.Println()
+	}
+}
+
+func runAppStatus(cmd *cobra.Command, args []string) (exit int) {
+	if len(args) != 1 || flagAppName == "" {
+		cmd.Usage()
+		return 1
+	}
+
+	apps, err := rkt.AppsForPod(args[0], getDataDir(), flagAppName)
+	if err != nil {
+		stderr.PrintE("error getting app status", err)
+		return 1
+	}
+
+	if len(apps) == 0 {
+		stderr.Error(fmt.Errorf("cannot find app %q in the pod", flagAppName))
+		return 1
+	}
+
+	// Must have only 1 app.
+	if len(apps) != 1 {
+		stderr.Error(fmt.Errorf("find more than one app with the name %q", flagAppName))
+		return 1
+	}
+
+	// TODO(yifan): Print yamls.
+	switch flagFormat {
+	case "json":
+		result, err := json.Marshal(apps[0])
+		if err != nil {
+			stderr.PrintE("error marshaling the app status", err)
+			return 1
+		}
+		stdout.Print(string(result))
+	case "json-pretty":
+		result, err := json.MarshalIndent(apps[0], "", "\t")
+		if err != nil {
+			stderr.PrintE("error marshaling the app status", err)
+			return 1
+		}
+		stdout.Print(string(result))
+	default:
+		printApp(apps[0])
+	}
+
+	return 0
+}
diff --git a/rkt/app_stop.go b/rkt/app_stop.go
new file mode 100644
index 0000000000..2743fc5bb1
--- /dev/null
+++ b/rkt/app_stop.go
@@ -0,0 +1,99 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/coreos/rkt/stage0"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdAppStop = &cobra.Command{
+		Use:   "stop UUID --app=NAME",
+		Short: "Stop an app in a pod",
+		Long:  `Stop appz!`,
+		Run:   runWrapper(runAppStop),
+	}
+)
+
+func init() {
+	cmdAppStop.Flags().StringVar(&flagAppName, "app", "", "app to stop")
+	cmdApp.AddCommand(cmdAppStop)
+}
+
+func runAppStop(cmd *cobra.Command, args []string) (exit int) {
+	if len(args) < 1 {
+		stderr.Print("must provide the pod UUID")
+		return 1
+	}
+
+	if flagAppName == "" {
+		stderr.Print("must provide the app to remove")
+		return 1
+	}
+
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
+	if err != nil {
+		stderr.PrintE("problem retrieving pod", err)
+		return 1
+	}
+	defer p.Close()
+
+	if p.AfterRun() {
+		stdout.Printf("pod %q is already stopped", p.UUID)
+		return 0
+	}
+
+	if p.State() != pkgPod.Running {
+		stderr.Printf("pod %q isn't currently running", p.UUID)
+		return 1
+	}
+
+	appName, err := types.NewACName(flagAppName)
+	if err != nil {
+		stderr.PrintE("invalid app name", err)
+	}
+
+	podPID, err := p.ContainerPid1()
+	if err != nil {
+		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
+		return 1
+	}
+
+	cfg := stage0.CommonConfig{
+		UUID:  p.UUID,
+		Debug: globalFlags.Debug,
+	}
+
+	scfg := stage0.StopConfig{
+		CommonConfig: &cfg,
+		Dir:          p.Path(),
+		AppName:      appName,
+		PodPID:       podPID,
+	}
+
+	err = stage0.StopApp(scfg)
+	if err != nil {
+		stderr.PrintE("error stopping app", err)
+		return 1
+	}
+
+	return 0
+}

From d071d3446ba0e16ae59ec4f4ef8dc77450bb6b81 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 1 Nov 2016 09:17:40 +0100
Subject: [PATCH 0839/1304] stage0/app: mark app subcommands as hidden, gate
 behind app experiment.

This also introduces a common.IsExperimentEnabled function for querying
experiments in rkt.
---
 common/experiment.go | 47 ++++++++++++++++++++++++++++++++++++++++++++
 rkt/app.go           | 14 +++++++++----
 2 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 common/experiment.go

diff --git a/common/experiment.go b/common/experiment.go
new file mode 100644
index 0000000000..48650ea763
--- /dev/null
+++ b/common/experiment.go
@@ -0,0 +1,47 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"os"
+	"strconv"
+	"strings"
+)
+
+// a string set of known rkt experiments
+var experiments = map[string]struct{}{
+	"app": {}, // rkt app subcommands for CRI
+}
+
+// IsExperimentEnabled returns true if the given rkt experiment is enabled.
+// The given name is converted to upper case and a bool RKT_EXPERIMENT_{NAME}
+// environment variable is retrieved.
+// If the experiment name is unknown, false is returned.
+// If the environment variable does not contain a valid bool value
+// according to strconv.ParseBool, false is returned.
+func IsExperimentEnabled(name string) bool {
+	if _, ok := experiments[name]; !ok {
+		return false
+	}
+
+	v := os.Getenv("RKT_EXPERIMENT_" + strings.ToUpper(name))
+
+	enabled, err := strconv.ParseBool(v)
+	if err != nil {
+		return false // ignore errors from bool conversion
+	}
+
+	return enabled
+}
diff --git a/rkt/app.go b/rkt/app.go
index 02c4b0e97e..cca977a7d3 100644
--- a/rkt/app.go
+++ b/rkt/app.go
@@ -14,15 +14,21 @@
 
 package main
 
-import "github.com/spf13/cobra"
+import (
+	"github.com/coreos/rkt/common"
+	"github.com/spf13/cobra"
+)
 
 var (
 	cmdApp = &cobra.Command{
-		Use:   "app [command]",
-		Short: "Operate on app level operations",
+		Use:    "app [command]",
+		Short:  "Operate on app level operations",
+		Hidden: true,
 	}
 )
 
 func init() {
-	cmdRkt.AddCommand(cmdApp)
+	if common.IsExperimentEnabled("app") {
+		cmdRkt.AddCommand(cmdApp)
+	}
 }

From 2f192c55051182be8d4deed0667fa92fefc45192 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 27 Oct 2016 16:45:48 +0200
Subject: [PATCH 0840/1304] docs/networking: minor clarification to DHCP type

Make it explicit that the DHCP daemon being referred to is the one
that's part of the special CNI DHCP plugin.
---
 Documentation/networking/overview.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Documentation/networking/overview.md b/Documentation/networking/overview.md
index 02a280d338..1804a761e7 100644
--- a/Documentation/networking/overview.md
+++ b/Documentation/networking/overview.md
@@ -258,9 +258,11 @@ The gateway is configured for the default route, allowing the pod to access exte
 
 ### dhcp
 
-DHCP type requires a daemon to be running on the host.
+The DHCP type requires a special client daemon, part of the [CNI DHCP plugin][cni-dhcp], to be running on the host.
+This acts as a proxy between a DHCP client running inside the container and a DHCP service already running on the network, as well as renewing leases appropriately.
+
 The DHCP plugin binary can be executed in the daemon mode by launching it with `daemon` argument.
-However the DHCP plugin is bundled in stage1.aci so this requires extracting the binary from it:
+However in rkt the DHCP plugin is bundled in stage1.aci so this requires extracting the binary from it:
 
 ```
 $ sudo ./rkt fetch --insecure-options=image ./stage1.aci
@@ -287,7 +289,9 @@ It is now possible to use the DHCP type by specifying it in the ipam section of
 }
 ```
 
-For more information about DHCP plugin, see [CNI docs](https://github.com/appc/cni/blob/master/Documentation/dhcp.md).
+For more information about DHCP plugin, see the [CNI docs][cni-dhcp].
+
+[cni-dhcp]: https://github.com/appc/cni/blob/master/Documentation/dhcp.md
 
 ## Other plugins
 

From 71249678cc8cba7269ecb2f66ec67723c9c66d2c Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Sun, 30 Oct 2016 22:08:17 +0000
Subject: [PATCH 0841/1304] setup-data-dir.sh: try to apply directives from
 rkt.conf first

(and fallback to the `mkdir/chmod`s if this fails)

This is a follow-up for 65fc1fb935acda

Fixes:
```
$ sudo bash -x rkt-v1.18.0/scripts/setup-data-dir.sh
...
+ systemd-tmpfiles --create /usr/lib/tmpfiles.d/rkt.conf
Failed to open '/usr/lib/tmpfiles.d/rkt.conf', ignoring: No such file or directory

$ echo $?
1
```
---
 dist/scripts/setup-data-dir.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dist/scripts/setup-data-dir.sh b/dist/scripts/setup-data-dir.sh
index 167c69235b..c443de2d2f 100755
--- a/dist/scripts/setup-data-dir.sh
+++ b/dist/scripts/setup-data-dir.sh
@@ -55,8 +55,7 @@ getent group rkt-admin || groupadd --force --system rkt-admin
 getent group rkt || groupadd --force --system rkt
 
 if which systemd-tmpfiles; then
-    systemd-tmpfiles --create /usr/lib/tmpfiles.d/rkt.conf
-    exit
+    systemd-tmpfiles --create "$(realpath "$(dirname "$0")")/../init/systemd/tmpfiles.d/rkt.conf" && exit
 fi
 
 make_directory "${datadir}" 2750 "rkt"

From 6721d32dfa093b0f874cdeb96027071d241ea462 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Wed, 2 Nov 2016 12:25:19 +0100
Subject: [PATCH 0842/1304] docs/networking: fix minor grammar issues

---
 Documentation/networking/overview.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/networking/overview.md b/Documentation/networking/overview.md
index 1804a761e7..ffed83e94c 100644
--- a/Documentation/networking/overview.md
+++ b/Documentation/networking/overview.md
@@ -262,7 +262,7 @@ The DHCP type requires a special client daemon, part of the [CNI DHCP plugin][cn
 This acts as a proxy between a DHCP client running inside the container and a DHCP service already running on the network, as well as renewing leases appropriately.
 
 The DHCP plugin binary can be executed in the daemon mode by launching it with `daemon` argument.
-However in rkt the DHCP plugin is bundled in stage1.aci so this requires extracting the binary from it:
+However, in rkt the DHCP plugin is bundled in stage1.aci so this requires extracting the binary from it:
 
 ```
 $ sudo ./rkt fetch --insecure-options=image ./stage1.aci
@@ -289,7 +289,7 @@ It is now possible to use the DHCP type by specifying it in the ipam section of
 }
 ```
 
-For more information about DHCP plugin, see the [CNI docs][cni-dhcp].
+For more information about the DHCP plugin, see the [CNI docs][cni-dhcp].
 
 [cni-dhcp]: https://github.com/appc/cni/blob/master/Documentation/dhcp.md
 

From 265a03509919a703afc52a3a99e00a2377fdc7cd Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Mon, 31 Oct 2016 16:40:41 +0100
Subject: [PATCH 0843/1304] scripts: add gpg to Debian dependencies

This is required for the default build and is
included in the Fedora ones.
---
 scripts/install-deps-debian-sid.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install-deps-debian-sid.sh b/scripts/install-deps-debian-sid.sh
index a6755ecdfa..c33dacbe9a 100755
--- a/scripts/install-deps-debian-sid.sh
+++ b/scripts/install-deps-debian-sid.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libtspi-dev libsystemd-dev"
+DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev gpg make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libtspi-dev libsystemd-dev"
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update

From 2f5de7f341ca626a140ee9a43f06254fb53cb301 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 3 Nov 2016 10:05:38 +0100
Subject: [PATCH 0844/1304] lib: use nanoseconds for app state

This reintroduces nanosecond units for reporting the app state.
---
 lib/app.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/app.go b/lib/app.go
index 9b2cfd3f49..ba4114b459 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -118,7 +118,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 					fmt.Fprintf(os.Stderr, "Cannot get GC marked time: %v", err)
 				}
 				if !t.IsZero() {
-					finishedAt := t.Unix()
+					finishedAt := t.UnixNano()
 					app.FinishedAt = &finishedAt
 				}
 			}
@@ -135,7 +135,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 	}
 
 	app.State = AppStateCreated
-	createdAt := fi.ModTime().Unix()
+	createdAt := fi.ModTime().UnixNano()
 	app.CreatedAt = &createdAt
 
 	// Check if the app is started.
@@ -148,7 +148,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 	}
 
 	app.State = AppStateRunning
-	startedAt := fi.ModTime().Unix()
+	startedAt := fi.ModTime().UnixNano()
 	app.StartedAt = &startedAt
 
 	// Check if the app is exited.
@@ -162,7 +162,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 	}
 
 	app.State = AppStateExited
-	finishedAt := fi.ModTime().Unix()
+	finishedAt := fi.ModTime().UnixNano()
 	app.FinishedAt = &finishedAt
 
 	// Read exit code.

From e5df181fa77c2ecb3f53e3ad1b1a2a76cd6b5dc3 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Thu, 3 Nov 2016 10:07:30 +0000
Subject: [PATCH 0845/1304] tests: add the --debug option

All other tests use `--debug`
And this is very helpful: https://github.com/systemd/systemd/pull/4533#issuecomment-258327773

This is a follow-up for 102e05de679f10
---
 tests/rkt_paths_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_paths_test.go b/tests/rkt_paths_test.go
index 1ebebe3343..0f8d4187d4 100644
--- a/tests/rkt_paths_test.go
+++ b/tests/rkt_paths_test.go
@@ -107,13 +107,13 @@ func TestPathsStat(t *testing.T) {
 		defer hiddenCtx.Cleanup()
 
 		//run
-		hiddenCmd := fmt.Sprintf("%s --insecure-options=image run %s", hiddenCtx.Cmd(), hiddenImage)
+		hiddenCmd := fmt.Sprintf("%s --debug --insecure-options=image run %s", hiddenCtx.Cmd(), hiddenImage)
 		hiddenExpectedLine := fmt.Sprintf("%s: mode: %s", tt.Path, tt.ExpectedMode)
 		runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
 		// run-prepared
 		hiddenCmd = fmt.Sprintf(`%s --insecure-options=image prepare %s`, hiddenCtx.Cmd(), hiddenImage)
 		uuid := runRktAndGetUUID(t, hiddenCmd)
-		hiddenCmd = fmt.Sprintf("%s run-prepared --mds-register=false %s", hiddenCtx.Cmd(), uuid)
+		hiddenCmd = fmt.Sprintf("%s --debug run-prepared --mds-register=false %s", hiddenCtx.Cmd(), uuid)
 		runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
 	}
 }

From 6e3292bfa3d2d0238df3402ba9fe2f73327335f5 Mon Sep 17 00:00:00 2001
From: Seth Wright <seth@crosse.org>
Date: Thu, 27 Oct 2016 15:36:53 -0400
Subject: [PATCH 0846/1304] Docs: Update to reference-style markdown links

As per https://github.com/coreos/docs/blob/master/STYLE.md,
reference-style links should be used in documentation. This converts all
documentation to use this format instead of inline links.

Inline links that refer to anchors in the same file were left unchanged.
---
 Documentation/app-container.md                | 12 +++-
 Documentation/app-environment.md              |  7 ++-
 Documentation/build-configure.md              |  3 +-
 Documentation/capabilities-guide.md           | 21 ++++---
 Documentation/commands.md                     | 18 +++---
 Documentation/dependencies.md                 |  4 +-
 Documentation/devel/architecture.md           | 22 ++++---
 Documentation/devel/cgroups.md                | 20 ++++---
 Documentation/devel/distribution-point.md     |  8 ++-
 Documentation/devel/on-disk-format.md         | 14 +++--
 Documentation/devel/pod-lifecycle.md          |  9 ++-
 Documentation/devel/release.md                | 28 ++++++---
 .../devel/stage1-implementors-guide.md        |  5 +-
 Documentation/devel/tpm.md                    |  3 +-
 Documentation/devel/update-coreos-stage1.md   |  5 +-
 Documentation/devel/user-namespaces.md        |  6 +-
 Documentation/distributions.md                | 59 +++++++++++++------
 Documentation/getting-started-guide.md        | 17 ++++--
 Documentation/hacking.md                      | 33 +++++++----
 Documentation/image-fetching-behavior.md      |  5 +-
 Documentation/install-rkt-in-coreos.md        | 10 ++--
 Documentation/networking/dns.md               |  5 +-
 Documentation/networking/examples-bridge.md   |  8 ++-
 .../networking/overriding-defaults.md         | 11 +++-
 Documentation/networking/overview.md          | 35 +++++++----
 Documentation/packaging.md                    | 18 ++++--
 Documentation/performance/README.md           |  5 +-
 Documentation/proposals/app-level-api.md      |  5 +-
 Documentation/rkt-vs-other-projects.md        | 31 ++++++----
 Documentation/running-docker-images.md        | 12 +++-
 Documentation/running-fly-stage1.md           | 20 +++++--
 Documentation/running-kvm-stage1.md           | 20 +++++--
 Documentation/seccomp-guide.md                | 44 +++++++++-----
 Documentation/selinux.md                      |  5 +-
 .../signing-and-verification-guide.md         | 15 +++--
 Documentation/subcommands/api-service.md      | 17 ++++--
 Documentation/subcommands/cat-manifest.md     |  5 +-
 Documentation/subcommands/enter.md            |  5 +-
 Documentation/subcommands/export.md           |  5 +-
 Documentation/subcommands/fetch.md            | 14 +++--
 Documentation/subcommands/fly.md              |  5 +-
 Documentation/subcommands/gc.md               |  8 ++-
 Documentation/subcommands/image.md            |  5 +-
 Documentation/subcommands/list.md             |  5 +-
 Documentation/subcommands/metadata-service.md | 14 +++--
 Documentation/subcommands/prepare.md          | 25 +++++---
 Documentation/subcommands/rm.md               |  5 +-
 Documentation/subcommands/run-prepared.md     |  8 ++-
 Documentation/subcommands/run.md              | 49 +++++++++------
 Documentation/subcommands/status.md           |  5 +-
 Documentation/subcommands/trust.md            |  4 +-
 Documentation/trying-out-rkt.md               | 19 +++---
 Documentation/using-rkt-with-kubernetes.md    | 31 +++++++---
 Documentation/using-rkt-with-systemd.md       | 25 +++++---
 54 files changed, 545 insertions(+), 252 deletions(-)

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index 3df98358da..620368cfd2 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -8,8 +8,8 @@ rkt's native [image format](#aci) and [runtime environment](#pods) are those def
 
 The image format defined by appc and used in rkt is the [_Application Container Image_][appc-aci], or ACI.
 An ACI is a simple tarball bundle of a rootfs (containing all the files needed to execute an application) and an _Image Manifest_, which defines things like default execution parameters and default resource constraints.
-ACIs can be built with tools like [`acbuild`](https://github.com/appc/acbuild), [`actool`](https://github.com/appc/spec#building-acis), or [`goaci`](https://github.com/appc/goaci).
-Docker images can be converted to ACI using [`docker2aci`](https://github.com/appc/docker2aci), although rkt will [do this automatically](https://github.com/coreos/rkt/blob/master/Documentation/running-docker-images.md).
+ACIs can be built with tools like [`acbuild`][acbuild], [`actool`][actool], or [`goaci`][goaci].
+Docker images can be converted to ACI using [`docker2aci`][docker2aci], although rkt will [do this automatically][running-docker-images].
 
 Most parameters defined in an image can be overridden at runtime by rkt. For example, the `rkt run` command allows users to supply custom exec arguments to an image.
 
@@ -19,7 +19,7 @@ appc defines the [_pod_][appc-pods] as the basic unit of execution.
 A pod is a grouping of one or more app images (ACIs), with some additional metadata optionally applied to the pod as a whole - for example, a resource constraint can be applied at the pod level and then forms an "outer bound" for all the applications in the pod.
 The images in a pod execute with a shared context, including networking.
 
-A pod in rkt is conceptually identical to a pod [as defined in Kubernetes](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/user-guide/pods.md).
+A pod in rkt is conceptually identical to a pod [as defined in Kubernetes][k8s-pods].
 
 ## Validating rkt as an appc implementation
 
@@ -37,6 +37,8 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 	https://github.com/appc/spec/releases/download/v0.8.8/ace-validator-sidekick.aci
 ```
 
+[acbuild]: https://github.com/containers/build
+[actool]: https://github.com/appc/spec#building-acis
 [appc-repo]: https://github.com/appc/spec/
 [appc-spec]: https://github.com/appc/spec/blob/master/SPEC.md
 [appc-aci]: https://github.com/appc/spec/blob/master/spec/aci.md#app-container-image
@@ -44,3 +46,7 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 [appc-ace]: https://github.com/appc/spec/blob/master/spec/ace.md#app-container-executor
 [appc-meta]: https://github.com/appc/spec/blob/master/spec/ace.md#app-container-metadata-service
 [appc-val]: https://github.com/appc/spec/blob/master/README.md#validating-app-container-executors-aces
+[docker2aci]: https://github.com/appc/docker2aci
+[goaci]: https://github.com/appc/goaci
+[k8s-pods]: http://kubernetes.io/docs/user-guide/pods/
+[running-docker-images]: running-docker-images.md
diff --git a/Documentation/app-environment.md b/Documentation/app-environment.md
index 250ed8a545..808f0c0e21 100644
--- a/Documentation/app-environment.md
+++ b/Documentation/app-environment.md
@@ -1,6 +1,6 @@
 ## App Environment
 
-Apps launched by rkt have access to some basic devices and file systems as defined by the App Container spec in the [OS-SPEC](https://github.com/appc/spec/blob/master/spec/OS-SPEC.md) section.
+Apps launched by rkt have access to some basic devices and file systems as defined by the App Container spec in the [OS-SPEC][os-spec] section.
 
 In addition to the basic devices and file systems mandated by the App Container spec, rkt gives access to the following files.
 
@@ -10,7 +10,7 @@ Support for /etc/hosts is optional in the App Container spec. rkt creates it.
 
 #### /etc/resolv.conf
 
-/etc/resolv.conf is automatically prepared by rkt as described in the [DNS support](networking/dns.md).
+`/etc/resolv.conf` is automatically [prepared by rkt][networking-dns].
 
 #### /run/systemd/journal
 
@@ -22,3 +22,6 @@ Since rkt v1.2.0, rkt gives access to systemd-journald's sockets in the /run/sys
 #### /dev/log
 
 Since rkt v1.2.0, if /dev/log does not exist in the image, it will be created as a symlink to /run/systemd/journal/dev-log.
+
+[networking-dns]: networking/dns.md
+[os-spec]: https://github.com/appc/spec/blob/master/spec/OS-SPEC.md
diff --git a/Documentation/build-configure.md b/Documentation/build-configure.md
index 548750debe..276e021154 100644
--- a/Documentation/build-configure.md
+++ b/Documentation/build-configure.md
@@ -148,10 +148,11 @@ These flags are related to security.
 
 #### `--enable-tpm`
 
-This option to enable [logging to the TPM][rkt-tpm] is set by default. For logging to work, [TrouSerS](http://trousers.sourceforge.net/) is required. Set this option to `auto` to conditionally enable TPM features based on build support.
+This option to enable [logging to the TPM][rkt-tpm] is set by default. For logging to work, [TrouSerS][trousers] is required. Set this option to `auto` to conditionally enable TPM features based on build support.
 
 #### `--enable-insecure-go`
 
 This option to allow building rkt with go having known security issues is unset by default. Use it with caution.
 
 [rkt-tpm]: devel/tpm.md
+[trousers]: http://trousers.sourceforge.net/
diff --git a/Documentation/capabilities-guide.md b/Documentation/capabilities-guide.md
index edcc0bab9e..652f3c2e85 100644
--- a/Documentation/capabilities-guide.md
+++ b/Documentation/capabilities-guide.md
@@ -1,7 +1,7 @@
 # Capabilities Isolators Guide
 
 This document is a walk-through guide describing how to use rkt isolators for
-[Linux Capabilities](https://lwn.net/Kernel/Index/#Capabilities).
+[Linux Capabilities][capabilities].
 
 * [About Linux Capabilities](#about-linux-capabilities)
 * [Default Capabilities](#default-capabilities)
@@ -31,13 +31,11 @@ In the context of containers, capabilities are useful for:
    having to run them as root
 
 For the complete list of existing Linux capabilities and a detailed description
-of this security mechanism, see [capabilities(7)](http://man7.org/linux/man-pages/man7/capabilities.7.html).
+of this security mechanism, see the [capabilities(7) man page][man-capabilities].
 
 ## Default capabilities
 
-By default, rkt enforces [a default set of
-capabilities](https://github.com/appc/spec/blob/master/spec/ace.md#oslinuxcapabilities-remove-set)
-onto applications.
+By default, rkt enforces [a default set of capabilities][default-caps] onto applications.
 This default set is tailored to stop applications from performing a large
 variety of privileged actions, while not impacting their normal behavior.
 Operations which are typically not needed in containers and which may
@@ -68,7 +66,7 @@ completely subvert the sandbox: for example, `CAP_SYS_PTRACE` allows to access
 stage1 environment and `CAP_SYS_ADMIN` grants a broad range of privileges,
 effectively equivalent to root.
 Many other ways to maliciously transition across capabilities have already been
-[reported](https://forums.grsecurity.net/viewtopic.php?f=7&t=2522) too.
+[reported][grsec-forums].
 
 ### Retain-set
 
@@ -101,7 +99,7 @@ operations but is known to never open a raw socket, will have
 
 ## Usage Example
 
-The goal of these examples is to show how to build ACI images with acbuild,
+The goal of these examples is to show how to build ACIs with [`acbuild`][acbuild],
 where some capabilities are either explicitly blocked or allowed.
 For simplicity, the starting point will be the official Alpine Linux image from
 CoreOS which ships with `ping` and `nc` commands (from busybox). Those
@@ -234,7 +232,7 @@ by overriding capability isolators with command line options.
 ### Patching images
 
 Image manifests can be manipulated manually, by unpacking the image and editing
-the manifest file, or with helper tools like `actool`.
+the manifest file, or with helper tools like [`actool`][actool].
 To override an image's pre-defined capabilities set, replace the existing capabilities
 isolators in the image with new isolators defining the desired capabilities.
 
@@ -342,3 +340,10 @@ set of capabilities requirements and follow best practices:
     surfaces.
  4. Prefer a whitelisting approach, trying to keep the "retain-set" as small as
     possible.
+
+[acbuild]: https://github.com/containers/build
+[actool]: https://github.com/appc/spec#building-acis
+[capabilities]: https://lwn.net/Kernel/Index/#Capabilities
+[default-caps]: https://github.com/appc/spec/blob/master/spec/ace.md#oslinuxcapabilities-remove-set
+[grsec-forums]: https://forums.grsecurity.net/viewtopic.php?f=7&t=2522
+[man-capabilities]: http://man7.org/linux/man-pages/man7/capabilities.7.html
diff --git a/Documentation/commands.md b/Documentation/commands.md
index eeba33ca5a..d26f2a7ab7 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -5,9 +5,6 @@ Please contribute if you see an area that needs more detail.
 
 ## Downloading Images (ACIs)
 
-[aci-images]: https://github.com/appc/spec/blob/master/spec/aci.md#app-container-image
-[appc-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md#app-container-image-discovery
-
 rkt runs applications packaged according to the open-source [App Container Image][aci-images] specification.
 ACIs consist of the root filesystem of the application container, a manifest, and an optional signature.
 
@@ -20,9 +17,6 @@ rkt uses these hints to execute [meta discovery][appc-discovery].
 
 ## Running Pods
 
-[metadata-spec]: https://github.com/appc/spec/blob/master/spec/ace.md#app-container-metadata-service
-[rkt-mds]: subcommands/metadata-service.md
-
 rkt can execute ACIs identified by name, hash, local file path, or URL.
 If an ACI hasn't been cached on disk, rkt will attempt to find and download it.
 To use rkt's [metadata service][metadata-spec], enable registration with the `--mds-register` flag when [invoking it][rkt-mds].
@@ -127,7 +121,7 @@ $ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4 -t redis
 [...]
 ```
 
-Additionaly, logs can be programmatically accessed via the [sd-journal API](https://www.freedesktop.org/software/systemd/man/sd-journal.html).
+Additionaly, logs can be programmatically accessed via the [sd-journal API][sd-journal].
 
 Currently there are two known main issues with logging in rkt:
 * In some rare situations when an application inside the pod is writing to `/dev/stdout` and `/dev/stderr` (i.e. nginx) there is no way to obtain logs.
@@ -149,7 +143,7 @@ Currently there are two known main issues with logging in rkt:
  $ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4
  ```
 
- Etcd case will be solved when [flag allowing forcing output to stdout](https://github.com/coreos/etcd/issues/5449) is added.
+ Etcd case will be solved when [flag allowing forcing output to stdout][etcd-5449] is added.
 
 ##### Stopped pod
 
@@ -162,3 +156,11 @@ journalctl -m _MACHINE_ID=132f9d560e3f4d1eba8668efd488bb62
 ```
 
 On some distributions such as Ubuntu, persistent journal storage is not enabled by default. In this case, it is not possible to get the logs of a stopped pod. Persistent journal storage can be enabled with `sudo mkdir /var/log/journal` before starting the pods.
+
+
+[aci-images]: https://github.com/appc/spec/blob/master/spec/aci.md#app-container-image
+[appc-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md#app-container-image-discovery
+[etcd-5449]: https://github.com/coreos/etcd/issues/5449
+[metadata-spec]: https://github.com/appc/spec/blob/master/spec/ace.md#app-container-metadata-service
+[rkt-mds]: subcommands/metadata-service.md
+[sd-journal]: https://www.freedesktop.org/software/systemd/man/sd-journal.html
diff --git a/Documentation/dependencies.md b/Documentation/dependencies.md
index 00e7350b10..5558d1ed9c 100644
--- a/Documentation/dependencies.md
+++ b/Documentation/dependencies.md
@@ -54,7 +54,7 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
 * patch
 * tar
 * xz
-* [build dependencies for kernel](https://www.kernel.org/doc/Documentation/Changes)
+* [build dependencies for kernel][kernel-build-deps]
   * bc
   * binutils
   * openssl
@@ -88,3 +88,5 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
   * systemd-shutdown
   * systemd
   * systemd-journald
+
+[kernel-build-deps]: https://www.kernel.org/doc/Documentation/Changes
diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index c7e046936a..ea4e20ac86 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -23,7 +23,7 @@ After calling `rkt` the execution chain follows the numbering of stages, having
 The invoking process uses its own mechanism to invoke the rkt binary (stage0). When started via a regular shell or a supervisor, stage0 is usually forked and exec'ed becoming a child process of the invoking shell or supervisor.
 
 2. stage0 -> stage1:
-An ordinary `exec(3)` is being used to replace the stage0 process with the stage1 entrypoint. The entrypoint is referenced by the `coreos.com/rkt/stage1/run` annotation in the stage1 image manifest.
+An ordinary [`exec(3)`][man-exec] is being used to replace the stage0 process with the stage1 entrypoint. The entrypoint is referenced by the `coreos.com/rkt/stage1/run` annotation in the stage1 image manifest.
 
 3. stage1 -> stage2:
 The stage1 entrypoint uses its mechanism to invoke the stage2 app executables. The app executables are referenced by the `apps.app.exec` settings in the stage2 image manifest.
@@ -108,21 +108,21 @@ We will now detail how the starting, shutdown, and exit status collection of the
 
 ![rkt-systemd](rkt-systemd.png)
 
-There's a systemd rkt apps target (`default.target`) which has a [*Wants*](http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Wants=) and [*After*](http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Before=) dependency on each app's service file, making sure they all start.
+There's a systemd rkt apps target (`default.target`) which has a [*Wants*][systemd-wants] and [*After*][systemd-beforeafter] dependency on each app's service file, making sure they all start.
 
 Each app's service has a *Wants* dependency on an associated reaper service that deals with writing the app's status exit.
 Each reaper service has a *Wants* and *After* dependency with a shutdown service that simply shuts down the pod.
 
-The reaper services and the shutdown service all start at the beginning but do nothing and remain after exit (with the [*RemainAfterExit*](http://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit=) flag).
-By using the [*StopWhenUnneeded*](http://www.freedesktop.org/software/systemd/man/systemd.unit.html#StopWhenUnneeded=) flag, whenever they stop being referenced, they'll do the actual work via the *ExecStop* command.
+The reaper services and the shutdown service all start at the beginning but do nothing and remain after exit (with the [*RemainAfterExit*][systemd-remainafterexit] flag).
+By using the [*StopWhenUnneeded*][systemd-stopwhenunneeded] flag, whenever they stop being referenced, they'll do the actual work via the *ExecStop* command.
 
 This means that when an app service is stopped, its associated reaper will run and will write its exit status to `/rkt/status/${app}` and the other apps will continue running.
 When all apps' services stop, their associated reaper services will also stop and will cease referencing the shutdown service causing the pod to exit.
-Every app service has an [*OnFailure*](http://www.freedesktop.org/software/systemd/man/systemd.unit.html#OnFailure=) flag that starts the `halt.target`.
+Every app service has an [*OnFailure*][systemd-onfailure] flag that starts the `halt.target`.
 This means that if any app in the pod exits with a failed status, the systemd shutdown process will start, the other apps' services will automatically stop and the pod will exit.
 In this case, the failed app's exit status will get propagated to rkt.
 
-A [*Conflicts*](http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Conflicts=) dependency was also added between each reaper service and the halt and poweroff targets (they are triggered when the pod is stopped from the outside when rkt receives `SIGINT`).
+A [*Conflicts*][systemd-conflicts] dependency was also added between each reaper service and the halt and poweroff targets (they are triggered when the pod is stopped from the outside when rkt receives `SIGINT`).
 This will activate all the reaper services when one of the targets is activated, causing the exit statuses to be saved and the pod to finish like it was described in the previous paragraph.
 
 We will now detail the execution chain for the stage1 systemd/nspawn flavors. The entrypoint is implemented in the `stage1/init/init.go` binary and sets up the following execution chain:
@@ -193,15 +193,23 @@ When using stage1-2 with overlayfs a pod will contain references to the required
 
 *Aci Renderer*
 
-Both stage1-2 render modes internally uses the [aci renderer](https://github.com/appc/spec/tree/master/pkg/acirenderer).
+Both stage1-2 render modes internally uses the [aci renderer][acirenderer].
 Since an ACI may depend on other ones the acirenderer may require other ACIs.
 The acirenderer only relies on the ACIStore, so all the required ACIs must already be available in the store.
 Additionally, since appc dependencies can be found only via discovery, a dependency may be updated and so there can be multiple rendered images for the same ACI.
 
 Given this 1:N relation between an ACI and their rendered images, the ACIStore and TreeStore are decoupled.
 
+[acirenderer]: https://github.com/appc/spec/tree/master/pkg/acirenderer
 [appc-spec]: https://github.com/appc/spec
 [appc-dependencies]: https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
 [appc-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md
+[man-exec]: http://man7.org/linux/man-pages/man3/exec.3.html
 [oci-img-spec]: https://github.com/opencontainers/image-spec
 [rkt-image-fetching]: ../image-fetching-behavior.md
+[systemd-beforeafter]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Before=
+[systemd-conflicts]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Conflicts=
+[systemd-wants]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Wants=
+[systemd-onfailure]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#OnFailure=
+[systemd-remainafterexit]: http://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit=
+[systemd-stopwhenunneeded]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#StopWhenUnneeded=
diff --git a/Documentation/devel/cgroups.md b/Documentation/devel/cgroups.md
index fcf0486ca9..cfaa06e15f 100644
--- a/Documentation/devel/cgroups.md
+++ b/Documentation/devel/cgroups.md
@@ -4,22 +4,20 @@
 
 [Control Groups][cgroups] are a Linux feature for organizing processes in hierarchical groups and applying resources limits to them. Each rkt pod is placed in a different cgroup to separate the processes of the pod from the processes of the host. Memory and CPU isolators are also implemented with cgroups.
 
-[cgroups]: https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt
-
 ## Which cgroups are used
 
 ### `rkt` started from the command line
 
-When a recent version of systemd is running on the host and `rkt` is not started as a systemd service (typically, from the command line), `rkt` will call `systemd-nspawn` with `--register=true`. This will cause `systemd-nspawn` to call the D-Bus method `CreateMachineWithNetwork` on `systemd-machined` and the cgroup `/machine.slice/machine-rkt...` will be created. This requires systemd v216+ as detected by [machinedRegister](https://github.com/coreos/rkt/blob/master/stage1/init/init.go#L161).
+When a recent version of systemd is running on the host and `rkt` is not started as a systemd service (typically, from the command line), `rkt` will call `systemd-nspawn` with `--register=true`. This will cause `systemd-nspawn` to call the D-Bus method `CreateMachineWithNetwork` on `systemd-machined` and the cgroup `/machine.slice/machine-rkt...` will be created. This requires systemd v216+ as detected by the [machinedRegister][machinedRegister] function in stage1's `init`.
 
-When systemd is not running on the host, or the systemd version is too old (< v216) to support the D-Bus method `CreateMachineWithNetwork`, `rkt` uses `systemd-nspawn` with the `--register=false` parameter. In this case, `systemd-nspawn` or other systemd components will not create new cgroups for rkt. On older `rkt` versions (<= 0.13.0), the pod was staying in the same cgroup as the caller. For example, it could be something like `/user.slice/user-1000.slice/session-1.scope`. Since [#1844](https://github.com/coreos/rkt/pull/1844) (rkt >= 0.14.0), `rkt` creates a new cgroup for each pod, like `$CALLER_CGROUP/machine-some-id.slice`.
+When systemd is not running on the host, or the systemd version is too old (< v216) to support the D-Bus method `CreateMachineWithNetwork`, `rkt` uses `systemd-nspawn` with the `--register=false` parameter. In this case, `systemd-nspawn` or other systemd components will not create new cgroups for rkt. On older `rkt` versions (<= 0.13.0), the pod was staying in the same cgroup as the caller. For example, it could be something like `/user.slice/user-1000.slice/session-1.scope`. Since [#1844](rkt-1844) (rkt >= 0.14.0), `rkt` creates a new cgroup for each pod, like `$CALLER_CGROUP/machine-some-id.slice`.
 
 ### `rkt` started as a systemd service
 
 `rkt` is able to detect if it is started as a systemd service (from a `.service` file or from `systemd-run`).
 In that case, `systemd-nspawn` is started with the `--keep-unit` parameter.
 This will cause `systemd-nspawn` to use the D-Bus method call `RegisterMachineWithNetwork` instead of `CreateMachineWithNetwork` and the pod will remain in the cgroup of the service.
-By default, the slice is `systemd.slice` but [users are advised](https://github.com/coreos/rkt/blob/master/Documentation/using-rkt-with-systemd.md) to select `machine.slice` with `systemd-run --slice=machine` or `Slice=machine.slice` in the `.service` file.
+By default, the slice is `systemd.slice` but [users are advised][rkt-systemd] to select `machine.slice` with `systemd-run --slice=machine` or `Slice=machine.slice` in the `.service` file.
 It will result in `/machine.slice/servicename.service` when the user select that slice.
 
 ### Summary
@@ -34,17 +32,23 @@ It will result in `/machine.slice/servicename.service` when the user select that
 
 Unified hierarchy and cgroup2 is a new feature in Linux that will be available in Linux 4.4.
 
-This is tracked by [#1757](https://github.com/coreos/rkt/issues/1757).
+This is tracked by [#1757][rkt-1757].
 
 ### CGroup Namespaces
 
 CGroup Namespaces is a new feature being developed in Linux.
 
-This is tracked by [#1757](https://github.com/coreos/rkt/issues/1757).
+This is tracked by [#1757][rkt-1757].
 
 ### Network isolator
 
-Appc/spec defines a [network isolator](https://github.com/appc/spec/blob/master/spec/ace.md#resourcenetwork-bandwidth) "resource/network-bandwidth" to limit the network bandwidth used by each app in the pod.
+Appc/spec defines the [network isolator][network-isolator] `resource/network-bandwidth` to limit the network bandwidth used by each app in the pod.
 This is not implemented yet.
 This could be implemented with cgroups.
 
+[cgroups]: https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt
+[machinedRegister]: https://github.com/coreos/rkt/blob/master/stage1/init/init.go#L153
+[network-isolator]: https://github.com/appc/spec/blob/master/spec/ace.md#resourcenetwork-bandwidth
+[rkt-1757]: https://github.com/coreos/rkt/issues/1757
+[rkt-1844]: https://github.com/coreos/rkt/pull/1844
+[rkt-systemd]: ../using-rkt-with-systemd.md
diff --git a/Documentation/devel/distribution-point.md b/Documentation/devel/distribution-point.md
index 737d925f69..835de1cae0 100644
--- a/Documentation/devel/distribution-point.md
+++ b/Documentation/devel/distribution-point.md
@@ -154,13 +154,15 @@ A Distribution Point implementation will also provide a function to compare if D
 
 ## Fetching logic with Distribution Points
 
-A Distribution Point will be the base for a future refactor of the fetchers logic (see #2964)
+A Distribution Point will be the base for a future refactor of the fetchers logic (see [#2964][rkt-2964])
 
 This also creates a better separation between the distribution points and the transport layers.
 
 For example there may exist multiple transport plugins (file, http, s3, bittorrent etc...) to be called by an ACIArchive distribution point.
 
-[docker2aci_GH]: https://github.com/appc/docker2aci
+
 [3986]: https://tools.ietf.org/html/rfc3986
+[docker2aci_GH]: https://github.com/appc/docker2aci
+[oci_image_spec_readme]: https://github.com/opencontainers/image-spec#running-an-oci-imag://github.com/appc/docker2aci
 [oci_layout]: https://github.com/opencontainers/image-spec/blob/master/image-layout.md
-[oci_image_spec_readme]: https://github.com/opencontainers/image-spec#running-an-oci-imag://github.com/appc/docker2aci 
+[rkt-2964]: https://github.com/coreos/rkt/pull/2964
diff --git a/Documentation/devel/on-disk-format.md b/Documentation/devel/on-disk-format.md
index ac079c5fd9..de82682a92 100644
--- a/Documentation/devel/on-disk-format.md
+++ b/Documentation/devel/on-disk-format.md
@@ -2,13 +2,13 @@ On disk format
 ==============
 
 The data directory is `/var/lib/rkt`, unless configured otherwise.
-For details, see [the `paths` kind in configuration documentation](../configuration.md#rktkind-paths).
+For details, see [the `paths` kind in configuration documentation][rktkind-paths].
 The `--dir` command line option can be used to change this location.
 
 #### CAS database
 
 The CAS database is stored in `/var/lib/rkt/cas/db`.
-The database schema can be migrated to newer versions ([#706](https://github.com/coreos/rkt/issues/706)).
+The database schema can be migrated to newer versions ([#706][rkt-706]).
 
 #### CAS
 
@@ -18,10 +18,16 @@ Future version of rkt will retain compatibility with older CAS versions.
 
 #### Pods
 
-The pods are stored in `/var/lib/rkt/pods/` as explained in [Life-cycle of a pod](pod-lifecycle.md)
+The pods are stored in `/var/lib/rkt/pods/` as explained in [Life-cycle of a pod][pod-lifecycle]
 
 The stability of prepared and exited pods is desirable, but not as critical as the CAS.
 
 #### Configuration
 
-The [configuration](../configuration.md) on-disk format is documented separately.
+The [configuration][configuration] on-disk format is documented separately.
+
+
+[configuration]: ../configuration.md
+[pod-lifecycle]: pod-lifecycle.md
+[rkt-706]: https://github.com/coreos/rkt/issues/706
+[rktkind-paths]: ../configuration.md#rktkind-paths
diff --git a/Documentation/devel/pod-lifecycle.md b/Documentation/devel/pod-lifecycle.md
index 7d1c6003da..8b50b1abf1 100644
--- a/Documentation/devel/pod-lifecycle.md
+++ b/Documentation/devel/pod-lifecycle.md
@@ -2,12 +2,12 @@
 
 Throughout this document `$var` is used to refer to the directory `/var/lib/rkt/pods`, and `$uuid` refers to a pod's UUID e.g. "076292e6-54c4-4cc8-9fa7-679c5f7dcfd3".
 
-Due to rkt's [architecture](https://github.com/coreos/rkt/blob/master/Documentation/devel/architecture.md) - and specifically its lack of any management daemon process - a combination of advisory file locking and atomic directory renames (via rename(2)) is used to represent and transition the basic pod states.
+Due to rkt's [architecture][rkt-arch] - and specifically its lack of any management daemon process - a combination of advisory file locking and atomic directory renames (via [`rename(2)`][man-rename]) is used to represent and transition the basic pod states.
 
 At times where a state must be reliably coupled to an executing process, that process is executed with an open file descriptor possessing an exclusive advisory lock on the respective pod's directory.
 Should that process exit for any reason, its open file descriptors will automatically be closed by the kernel, implicitly unlocking the pod's directory.
 By attempting to acquire a shared non-blocking advisory lock on a pod directory we're able to poll for these process-bound states, additionally by employing a blocking acquisition mode we may reliably synchronize indirectly with the exit of such processes, effectively providing us with a wake-up event the moment such a state transitions.
-For more information on advisory locks see the flock(2) man page.
+For more information on advisory locks see the [`flock(2)`][man-flock] man page.
 
 At this time there are four distinct phases of a pod's life which involve process-bound states:
 
@@ -137,3 +137,8 @@ Another example would be two `rkt gc` commands finding the same exited pods and
 They can't both perform the transitions, one will lose the race at each pod.
 This needs to be considered in the error handling of the transition callers as perfectly normal.
 Simply ignoring ENOENT errors propagated from the loser's rename calls can suffice.
+
+
+[man-flock]: http://man7.org/linux/man-pages/man2/flock.2.html
+[man-rename]: http://man7.org/linux/man-pages/man2/rename.2.html
+[rkt-arch]: ../devel/architecture.md
diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index 126d3d8907..f450f5b10c 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -4,7 +4,7 @@
 
 This section describes the typical release cycle of rkt:
 
-1. A GitHub [milestone](https://github.com/coreos/rkt/milestones) sets the target date for a future rkt release. Releases occur approximately every two to three weeks.
+1. A GitHub [milestone][milestones] sets the target date for a future rkt release. Releases occur approximately every two to three weeks.
 2. Issues grouped into the next release milestone are worked on in order of priority.
 3. Changes are submitted for review in the form of a GitHub Pull Request (PR). Each PR undergoes review and must pass continuous integration (CI) tests before being accepted and merged into the main line of rkt source code.
 4. The day before each release is a short code freeze during which no new code or dependencies may be merged. Instead, this period focuses on polishing the release, with tasks concerning:
@@ -24,17 +24,17 @@ The following example assumes we're going from version 1.1.0 (`v1.1.0`) to 1.2.0
 Let's get started:
 
 - Start at the relevant milestone on GitHub (e.g. https://github.com/coreos/rkt/milestones/v1.2.0): ensure all referenced issues are closed (or moved elsewhere, if they're not done). Close the milestone.
-- Update the [roadmap](https://github.com/coreos/rkt/blob/master/ROADMAP.md) to remove the release you're performing, if necessary
+- Update the [roadmap][roadmap] to remove the release you're performing, if necessary
 - Ensure that `stage1/aci/aci-manifest.in` is the same version of appc/spec vendored with rkt. Otherwise, update it.
 - Branch from the latest master, make sure your git status is clean
 - Ensure the build is clean!
   - `git clean -ffdx && ./autogen.sh && ./configure --enable-tpm=no --enable-functional-tests && make && make check` should work
   - Integration tests on CI should be green
-- Update the [release notes](https://github.com/coreos/rkt/blob/master/CHANGELOG.md).
+- Update the [release notes][changelog].
   Try to capture most of the salient changes since the last release, but don't go into unnecessary detail (better to link/reference the documentation wherever possible).
   `scripts/changelog.sh` will help generating an initial list of changes. Correct/fix entries if necessary, and group them by category.
 
-The rkt version is [hardcoded in the repository](https://github.com/coreos/rkt/blob/master/configure.ac#L2), so the first thing to do is bump it:
+The rkt version is [hardcoded in the repository][configure_ac], so the first thing to do is bump it:
 
 - Run `scripts/bump-release v1.2.0`.
   This should generate two commits: a bump to the actual release (e.g. v1.2.0, including CHANGELOG updates), and then a bump to the release+git (e.g. v1.2.0+git).
@@ -43,7 +43,7 @@ The rkt version is [hardcoded in the repository](https://github.com/coreos/rkt/b
   As well as changing the actual version, it also attempts to fix a bunch of references in the documentation etc.
 - If the script didn't work, yell at the author and/or fix it.
   It can almost certainly be improved.
-- File a PR and get a review from another [MAINTAINER](https://github.com/coreos/rkt/blob/master/MAINTAINERS).
+- File a PR and get a review from another [maintainer][maintainers].
   This is useful to a) sanity check the diff, and b) be very explicit/public that a release is happening
 - Ensure the CI on the release PR is green!
 - Merge the PR
@@ -67,9 +67,9 @@ Sign a tagged release and push it to GitHub:
 
 Now we switch to the GitHub web UI to conduct the release:
 
-- https://github.com/coreos/rkt/releases/new
+- Start a [new release][gh-new-release] on Github
 - Tag "v1.2.0", release title "v1.2.0"
-- Copy-paste the release notes you added earlier in [CHANGELOG.md](https://github.com/coreos/rkt/blob/master/CHANGELOG.md)
+- Copy-paste the release notes you added earlier in [CHANGELOG.md][changelog]
 - You can also add a little more detail and polish to the release notes here if you wish, as it is more targeted towards users (vs the changelog being more for developers); use your best judgement and see previous releases on GH for examples.
 - Attach the release.
   This is a simple tarball:
@@ -95,7 +95,7 @@ cp release-build/target/bin/stage1-fly.aci stage1-fly-$RKTVER-linux-amd64.aci
 - Sign all release artifacts.
 
 rkt project key must be used to sign the generated binaries and images.`$RKTSUBKEYID` is the key ID of rkt project Yubikey. Connect the key and run `gpg2 --card-status` to get the ID.
-The public key for GPG signing can be found at [CoreOS Application Signing Key](https://coreos.com/security/app-signing-key) and is assumed as trusted.
+The public key for GPG signing can be found at [CoreOS Application Signing Key][coreos-key] and is assumed as trusted.
 
 The following commands are used for public release signing:
 
@@ -112,9 +112,19 @@ for i in $NAME.tar.gz stage1-*.aci *.deb *.rpm; do gpg2 --verify ${i}.asc ${i};
 
 Now it's announcement time: send an email to rkt-dev@googlegroups.com describing the release.
 Generally this is higher level overview outlining some of the major features, not a copy-paste of the release notes.
-Use your discretion and see [previous release emails](https://groups.google.com/forum/#!forum/rkt-dev) for examples.
+Use your discretion and see [previous release emails][rkt-dev-list] for examples.
 Make sure to include a list of authors that contributed since the previous release - something like the following might be handy:
 
 ```
 git log v1.1.0..v1.2.0 --pretty=format:"%an" | sort | uniq | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $#\n#'
 ```
+
+
+[changelog]: https://github.com/coreos/rkt/blob/master/CHANGELOG.md
+[configure_ac]: https://github.com/coreos/rkt/blob/master/configure.ac#L2
+[coreos-key]: https://coreos.com/security/app-signing-key
+[gh-new-release]: https://github.com/coreos/rkt/releases/new
+[milestones]: https://github.com/coreos/rkt/milestones
+[maintainers]: https://github.com/coreos/rkt/blob/master/MAINTAINERS
+[rkt-dev-list]: https://groups.google.com/forum/#!forum/rkt-dev
+[roadmap]: https://github.com/coreos/rkt/blob/master/ROADMAP.md
diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 33efffef6d..523b972c5b 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -64,7 +64,7 @@ Any stage1 that supports and expects machined registration to occur will likely
 
 * `--debug` to activate debugging
 * `--net[=$NET1,$NET2,...]` to configure the creation of a contained network.
-  See the [rkt networking documentation](../networking/overview.md) for details.
+  See the [rkt networking documentation][rkt-networking] for details.
 * `--mds-token=$TOKEN` passes the auth token to the apps via `AC_METADATA_URL` env var
 * `--interactive` to run a pod interactively, that is, pass standard input to the application (only for pods with one application)
 * `--local-config=$PATH` to override the local configuration directory
@@ -221,3 +221,6 @@ Later the exit status can be retrieved and shown by `rkt status $uuid`.
 
 This directory path is used for passing environment variables to each app.
 For example, environment variables for an app named `foo` will be stored in `rkt/env/foo`.
+
+
+[rkt-networking]: ../networking/overview.md
diff --git a/Documentation/devel/tpm.md b/Documentation/devel/tpm.md
index 6cb4aeac62..3871abc100 100644
--- a/Documentation/devel/tpm.md
+++ b/Documentation/devel/tpm.md
@@ -1,6 +1,6 @@
 # rkt and the Trusted Platform Module
 
-rkt supports *measuring* container state and configuration into the [Trusted Platform Module (TPM)](https://en.wikipedia.org/wiki/Trusted_Platform_Module) event log. Enable this functionality by building rkt with the [`--enable-tpm=yes` option to `./configure`][build-configure-tpm]. rkt accesses the TPM via the [`tpmd` executable available from the go-tspi project][go-tspi]. This `tpmd` is expected to listen on port 12041.
+rkt supports *measuring* container state and configuration into the [Trusted Platform Module (TPM)][wiki-tpm] event log. Enable this functionality by building rkt with the [`--enable-tpm=yes` option to `./configure`][build-configure-tpm]. rkt accesses the TPM via the [`tpmd` executable available from the go-tspi project][go-tspi]. This `tpmd` is expected to listen on port 12041.
 
 Events are logged to PCR 15, with event type `0x1000`. Each event contains the following data:
 
@@ -13,3 +13,4 @@ This provides a cryptographically verifiable audit log of the containers execute
 
 [build-configure-tpm]: ../build-configure.md#security
 [go-tspi]: https://github.com/coreos/go-tspi
+[wiki-tpm]: https://en.wikipedia.org/wiki/Trusted_Platform_Module
diff --git a/Documentation/devel/update-coreos-stage1.md b/Documentation/devel/update-coreos-stage1.md
index 1eb70df0f7..1c9c6ec7be 100644
--- a/Documentation/devel/update-coreos-stage1.md
+++ b/Documentation/devel/update-coreos-stage1.md
@@ -10,7 +10,7 @@ The process is quite manual because it's not done often, but improvements are we
 Let's assume you want to update from version 991.0.0 to version 1032.0.0.
 
 First, you need to download and verify the image.
-Make sure you trust the [CoreOS Image Signing Key](https://coreos.com/security/image-signing-key/).
+Make sure you trust the [CoreOS Image Signing Key][coreos-key].
 
 Since 1032.0.0 is currently only available in the Alpha channel, we'll use the alpha URL:
 
@@ -165,3 +165,6 @@ index fca30bb..51d5fbc 100644
 ```
 
 Then build and test again.
+
+
+[coreos-key]: https://coreos.com/security/image-signing-key/
diff --git a/Documentation/devel/user-namespaces.md b/Documentation/devel/user-namespaces.md
index 2281afc2e5..3cf342247d 100644
--- a/Documentation/devel/user-namespaces.md
+++ b/Documentation/devel/user-namespaces.md
@@ -28,10 +28,12 @@ In order to avoid collisions, it is planned to implement a locking mechanism so
 The initial implementation works only with `--no-overlay`.
 Ideally, preparing a pod should not have to iterate over all files to call `chown`.
 
-It is planned to add kernel support for a mount option to shift the user IDs in the correct range (https://github.com/coreos/rkt/issues/1057).
+It is planned to add kernel support for a mount option to shift the user IDs in the correct range (see [#1057][rkt-1057]).
 It would make it work with overlayfs.
 
 ### Inconvenient UID shift on volumes
 
 When mounting a volume from the host into the pod, the ownership of the files is not shifted, so it makes volumes difficult if not impossible to use with user namespaces.
-The same kernel support should help here too (https://github.com/coreos/rkt/issues/1057).
+The same kernel support should help here too ([#1057][rkt-1057]).
+
+[rkt-1057]: https://github.com/coreos/rkt/issues/1057
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 18f4fef8bf..f16996762d 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -21,32 +21,32 @@ if you need a newer version, you may choose to manually install the rkt-provided
 
 ## Arch
 
-rkt is available in the [Community Repository](https://www.archlinux.org/packages/community/x86_64/rkt/) and can be installed using pacman:
+rkt is available in the [Community Repository][pkg-arch] and can be installed using pacman:
 ```
 sudo pacman -S rkt
 ```
 
 ## CentOS
 
-rkt is available in the [CentOS Community Build Service](https://cbs.centos.org/koji/packageinfo?packageID=4464) for CentOS 7.
-However, this is [not yet ready for production use](https://github.com/coreos/rkt/issues/1305) due to pending systemd upgrade issues.
+rkt is available in the [CentOS Community Build Service][pkg-centos] for CentOS 7.
+However, this is [not yet ready for production use][rkt-1305] due to pending systemd upgrade issues.
 
 ## CoreOS
 
 rkt is an integral part of CoreOS, installed with the operating system.
-The [CoreOS releases page](https://coreos.com/releases/) lists the version of rkt available in each CoreOS release channel.
+The [CoreOS releases page][coreos-releases] lists the version of rkt available in each CoreOS release channel.
 
-If the version of rkt included in CoreOS is too old, it's fairly trivial to fetch the desired version [via a systemd unit](install-rkt-in-coreos.md).
+If the version of rkt included in CoreOS is too old, it's fairly trivial to fetch the desired version [via a systemd unit][coreos-install-rkt].
 
 ## Debian
 
-rkt is currently packaged in Debian sid (unstable) available at https://packages.debian.org/sid/utils/rkt:
+rkt is currently packaged in [Debian sid][pkg-debian] (unstable).
 
 ```
 sudo apt-get install rkt
 ```
 
-Note that due to an outstanding bug (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823322) one has to use the "coreos" stage1 image:
+Note that due to an [outstanding bug][debian-823322] one has to use the "coreos" stage1 image:
 
 ```
 sudo rkt run --insecure-options=image --stage1-name=coreos.com/rkt/stage1-coreos:1.16.0 docker://nginx
@@ -63,16 +63,16 @@ Since Fedora version 24, rkt packages are available in the main repository. We r
 sudo dnf install rkt
 ```
 
-rkt's entry in the [Fedora package database](https://admin.fedoraproject.org/pkgdb/package/rpms/rkt/) tracks packaging work for this distribution.
+rkt's entry in the [Fedora package database][pkg-fedora] tracks packaging work for this distribution.
 
 #### Caveat: SELinux
 
 rkt can integrate with SELinux on Fedora but in a limited way.
 This has the following caveats:
-- running as systemd service restricted (see [#2322](https://github.com/coreos/rkt/issues/2322))
-- access to host volumes restricted (see [#2325](https://github.com/coreos/rkt/issues/2325))
-- socket activation restricted (see [#2326](https://github.com/coreos/rkt/issues/2326))
-- metadata service restricted (see [#1978](https://github.com/coreos/rkt/issues/1978))
+- running as systemd service restricted (see [#2322][rkt-2322])
+- access to host volumes restricted (see [#2325][rkt-2325])
+- socket activation restricted (see [#2326][rkt-2326])
+- metadata service restricted (see [#1978][rkt-1978])
 
 As a workaround, SELinux can be temporarily disabled:
 ```
@@ -85,15 +85,15 @@ SELINUX=permissive
 
 #### Caveat: firewalld
 
-Fedora uses [firewalld](https://fedoraproject.org/wiki/FirewallD) to dynamically define firewall zones.
-rkt is [not yet fully integrated with firewalld](https://github.com/coreos/rkt/issues/2206).
+Fedora uses [firewalld][firewalld] to dynamically define firewall zones.
+rkt is [not yet fully integrated with firewalld][rkt-2206].
 The default firewalld rules may interfere with the network connectivity of rkt pods.
 To work around this, add a firewalld rule to allow pod traffic:
 ```
 sudo firewall-cmd --add-source=172.16.28.0/24 --zone=trusted
 ```
 
-172.16.28.0/24 is the subnet of the [default pod network](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md#the-default-network). The command must be adapted when rkt is configured to use a [different network](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md#setting-up-additional-networks) with a different subnet.
+172.16.28.0/24 is the subnet of the [default pod network][networking-overview-default]. The command must be adapted when rkt is configured to use a [different network][networking-overview-additional] with a different subnet.
 
 ## NixOS
 
@@ -103,12 +103,12 @@ rkt can be installed on NixOS using the following command:
 nix-env -iA rkt
 ```
 
-The source for the rkt.nix expression can be found on [GitHub](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/virtualization/rkt/default.nix)
+The source for the rkt.nix expression can be found on [GitHub][rkt-nixos]
 
 
 ## openSUSE
 
-rkt is available in the [Virtualization:containers](https://build.opensuse.org/package/show/Virtualization:containers/rkt) project on openSUSE Build Service.
+rkt is available in the [Virtualization:containers][rkt-opensuse] project on openSUSE Build Service.
 Before installing, the appropriate repository needs to be added (usually Tumbleweed or Leap):
 
 ```
@@ -129,8 +129,8 @@ rkt is not packaged currently in Ubuntu. Instead, install manually using the
 
 ## Void
 
-rkt is available in the [official binary packages](http://www.voidlinux.eu/packages/) for the Void Linux distribution.
-The source for these packages is hosted on [GitHub](https://github.com/voidlinux/void-packages/tree/master/srcpkgs/rkt).
+rkt is available in the [official binary packages][void-packages] for the Void Linux distribution.
+The source for these packages is hosted on [GitHub][rkt-void].
 
 
 # rkt-maintained packages
@@ -157,3 +157,24 @@ wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt_1.18.0-1_amd64.
 gpg --verify rkt_1.18.0-1_amd64.deb.asc
 sudo dpkg -i rkt_1.18.0-1_amd64.deb
 ```
+
+[coreos-install-rkt]: install-rkt-in-coreos.md
+[coreos-releases]: https://coreos.com/releases/
+[debian-823322]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823322
+[firewalld]: https://fedoraproject.org/wiki/FirewallD
+[networking-overview-additional]: networking/overview.md#setting-up-additional-networks
+[networking-overview-default]: networking/overview.md#the-default-network
+[pkg-arch]: https://www.archlinux.org/packages/community/x86_64/rkt/
+[pkg-centos]: https://cbs.centos.org/koji/packageinfo?packageID=4464
+[pkg-debian]: https://packages.debian.org/sid/utils/rkt
+[pkg-fedora]: https://admin.fedoraproject.org/pkgdb/package/rpms/rkt/
+[rkt-nixos]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/virtualization/rkt/default.nix
+[rkt-opensuse]: https://build.opensuse.org/package/show/Virtualization:containers/rkt
+[rkt-void]: https://github.com/voidlinux/void-packages/tree/master/srcpkgs/rkt
+[rkt-1305]: https://github.com/coreos/rkt/issues/1305
+[rkt-1978]: https://github.com/coreos/rkt/issues/1978
+[rkt-2206]: https://github.com/coreos/rkt/issues/2206
+[rkt-2322]: https://github.com/coreos/rkt/issues/2322
+[rkt-2325]: https://github.com/coreos/rkt/issues/2325
+[rkt-2326]: https://github.com/coreos/rkt/issues/2326
+[void-packages]: http://www.voidlinux.eu/packages/
diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index b2a862f07a..5649512e5f 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -1,7 +1,7 @@
 # Getting Started with rkt
 
-The following guide will show you how to build and run a self-contained Go app using rkt, the reference implementation of the [App Container Specification](https://github.com/appc/spec).
-If you're not on Linux, you should do all of this inside [the rkt Vagrant](https://github.com/coreos/rkt/blob/master/Documentation/trying-out-rkt.md#rkt-using-vagrant).
+The following guide will show you how to build and run a self-contained Go app using rkt, the reference implementation of the [App Container Specification][appc-spec].
+If you're not on Linux, you should do all of this inside [the rkt Vagrant][rkt-vagrant].
 
 ## Create a hello go application
 
@@ -42,7 +42,7 @@ $ ldd hello
 
 ## Create the image
 
-To create the image, we can use `acbuild`, which can be downloaded via one of the [releases in the containers/build repository](https://github.com/containers/build/releases)
+To create the image, we can use [`acbuild`][acbuild], which can be downloaded via one of the [releases in the containers/build repository][rkt-releases].
 
 The following commands will create an ACI containing our application and important metadata.
 
@@ -69,11 +69,11 @@ acbuild end
 ```
 
 Note that `--insecure-options=image` is required because, by default, rkt expects our images to be signed.
-See the [Signing and Verification Guide](https://github.com/coreos/rkt/blob/master/Documentation/signing-and-verification-guide.md) for more details.
+See the [Signing and Verification Guide][signing-guide] for more details.
 
 At this point our hello app is running and ready to handle HTTP requests.
 
-To stop the container, pass three escape characters (`^]^]^]`), which is generated by `Ctrl-]` on a US keyboard. You can also [run rkt as a daemon](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/run.md#run-rkt-as-a-daemon).
+To stop the container, pass three escape characters (`^]^]^]`), which is generated by `Ctrl-]` on a US keyboard. You can also [run rkt as a daemon][rkt-daemon].
 
 ### Test with curl
 
@@ -91,3 +91,10 @@ Then you can `curl` that IP on port 5000:
 $ curl 172.16.28.2:5000
 hello
 ```
+
+[acbuild]: https://github.com/containers/build
+[appc-spec]: https://github.com/appc/spec
+[rkt-daemon]: subcommands/run.md#run-rkt-as-a-daemon
+[rkt-releases]: https://github.com/containers/build/releases
+[rkt-vagrant]: https://github.com/coreos/rkt/blob/master/Documentation/trying-out-rkt.md#rkt-using-vagrant
+[signing-guide]: signing-and-verification-guide.md
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index d9b7211c8c..125c2db18c 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -7,11 +7,11 @@ For more information on the rkt internals, see the [`devel`](devel/) documentati
 
 ## Building rkt
 
-The easiest way to build rkt is by using the coreos.com/rkt/builder ACI image. See instructions for how to use it in the README at [github.com/coreos/rkt-builder](https://github.com/coreos/rkt-builder).
+The easiest way to build rkt is by using the coreos.com/rkt/builder ACI image. See instructions for how to use it in the README at [github.com/coreos/rkt-builder][rkt-builder].
 
 Alternatively, you should be able build rkt on any modern Linux system with [Go](https://golang.org/) (1.5+) installed.
 For the most part the codebase is self-contained (e.g. all dependencies are vendored), but assembly of the stage1 requires some other tools to be installed on the system.
-Please see [the list of the build-time dependencies](dependencies.md#build-time-dependencies).
+Please see [the list of the build-time dependencies][build-time-dependencies].
 Once the dependencies have been satisfied you can build rkt with a default configuration by running the following commands:
 
 ```
@@ -24,10 +24,10 @@ Build verbosity can be controlled with the V variable.
 Set V to 0 to have a silent build.
 Set V to either 1 or 2 to get short messages about what is being done (level 2 prints more of them).
 Set V to 3 to get raw output.
-Instead of a number, English words can be used: `quiet` or `silent` for level 0, `info` for level 1, `all` for level 2 and `raw` for level 3. 
+Instead of a number, English words can be used: `quiet` or `silent` for level 0, `info` for level 1, `all` for level 2 and `raw` for level 3.
 For example, `make V=raw` is equivalent to `make V=3`.
 
-To be able to run rkt, please see [the list of the run-time dependencies](dependencies.md#run-time-dependencies).
+To be able to run rkt, please see [the list of the run-time dependencies][run-time-dependencies].
 
 ### Building rkt with Docker
 
@@ -49,7 +49,7 @@ To do this, use the following `configure` parameters after running `./autogen.sh
 - `--with-stage1-systemd-version`
 - `--with-stage1-systemd-src`
 
-For more details, see [configure script parameters documentation](build-configure.md).
+For more details, see [configure script parameters documentation][build-configure].
 Example:
 
 ```
@@ -75,7 +75,7 @@ If building with docker, these must be added to the `apt-get install` command.
 
 ### Alternative stage1 paths
 
-rkt is designed and intended to be modular, using a [staged architecture](devel/architecture.md).
+rkt is designed and intended to be modular, using a [staged architecture][architecture].
 
 `rkt run` determines the stage1 image it should use via its `--stage1-{url,path,name,hash,from-dir}` flags.
 If this flag is not given to rkt, the stage1 image will default to the settings taken from the configuration.
@@ -84,7 +84,7 @@ It usually means that rkt will look for a file called `stage1-<default flavor>.a
 
 However, a default value can be set for this parameter at build time by setting the option `--with-stage1-default-location` when invoking `./configure`.
 It can be set with the `paths` kind of configuration.
-For more details, see [configure script parameters documentation](build-configure.md) and [configuration documentation](configuration.md).
+For more details, see [configure script parameters documentation][build-configure] and [configuration documentation][configuration].
 
 rkt expects stage1 images to be signed except in the following cases:
 
@@ -94,11 +94,11 @@ rkt expects stage1 images to be signed except in the following cases:
 
 ### Updating the coreos flavor stage1
 
-Follow the instructions on [Update coreos flavor stage1](devel/update-coreos-stage1.md).
+Follow the instructions on [Update coreos flavor stage1][update-coreos-stage1].
 
 ## Managing dependencies
 
-rkt uses [`glide`](https://github.com/Masterminds/glide) and [`glide-vc`](https://github.com/sgotti/glide-vc) to manage third-party dependencies.
+rkt uses [`glide`][glide] and [`glide-vc`][glide-vc] to manage third-party dependencies.
 The build process is crafted to make this transparent to most users (i.e. if you're just building rkt from source, or modifying any of the codebase without changing dependencies, you should have no need to interact with glide).
 But occasionally the need arises to either a) add a new dependency or b) update/remove an existing dependency.
 
@@ -120,7 +120,7 @@ $ glide get -u github.com/fizz/buzz#1.2.3
 $ ./scripts/glide-update.sh
 ```
 
-Note that although glide does support [versions and ranges](https://github.com/Masterminds/glide/blob/master/docs/versions.md) currently it is preferred to pin to concrete versions as described above.
+Note that although glide does support [versions and ranges][glide-versioning] currently it is preferred to pin to concrete versions as described above.
 
 *Note*: Do *not* use `go get` and `glide update` to add new dependencies. It will cause both `glide.lock` and `glide.yaml` files to diverge.
 
@@ -199,3 +199,16 @@ As well as a simple sanity check that the code actually builds and tests pass, h
 - `git diff` should show _all_ third-party import paths prefixed with `Godeps/_workspace`
 
 If something looks awry, restart, pray to your preferred deity, and try again.
+
+
+[architecture]: devel/architecture.md
+[build-configure]: build-configure.md
+[build-time-dependencies]: dependencies.md#build-time-dependencies
+[configuration]: configuration.md
+[glide]: https://glide.sh
+[glide-vc]: https://github.com/sgotti/glide-vc
+[glide-versioning]: https://glide.readthedocs.io/en/latest/versions/
+[go]: https://golang.org/
+[rkt-builer]: https://github.com/coreos/rkt-builder
+[run-time-dependencies]: dependencies.md#run-time-dependencies
+[update-coreos-stage1]: devel/update-coreos-stage1.md
diff --git a/Documentation/image-fetching-behavior.md b/Documentation/image-fetching-behavior.md
index cad2f4aef1..41eb68b02c 100644
--- a/Documentation/image-fetching-behavior.md
+++ b/Documentation/image-fetching-behavior.md
@@ -28,4 +28,7 @@ store        | image name         | Check local store. If found, use that image.
 remote       | file://            | Use the specified file
 remote       | http(s)://         | Search in the store if the URL is available. If it's available and the saved Cache-Control maxage > 0 determine if the image should be downloaded. If it's not expired use the image. Otherwise download (sending if available the saved ETag). If the download returns a `304 Not Modified` use the image already saved in the local store.
 remote       | docker://          | Fetch using docker2aci.
-remote       | image name         | Execute [discovery logic](https://github.com/appc/spec/blob/master/spec/discovery.md#app-container-image-discovery). If discovery is successful use the discovered URL doing the above `remote` http(s):// image case. If there's a file in the current directory named like the image name, use that file instead.
+remote       | image name         | Execute [discovery logic][discovery-logic]. If discovery is successful use the discovered URL doing the above `remote` http(s):// image case. If there's a file in the current directory named like the image name, use that file instead.
+
+
+[discovery-logic]: https://github.com/appc/spec/blob/master/spec/discovery.md#app-container-image-discovery
diff --git a/Documentation/install-rkt-in-coreos.md b/Documentation/install-rkt-in-coreos.md
index 484f09c3cc..7aafb75299 100644
--- a/Documentation/install-rkt-in-coreos.md
+++ b/Documentation/install-rkt-in-coreos.md
@@ -26,13 +26,13 @@ ExecStart=/usr/bin/tar --strip-components=1 -xf /opt/rkt.tar.gz -C /opt/rkt
 ```
 
 The URLs in this unit must be filled in before the unit is installed. Valid
-URLs can be found on [rkt's releases page][1].
+URLs can be found on [rkt's releases page][rkt-releases].
 
-This unit should be installed with either [ignition][2] or a [cloud config][3].
+This unit should be installed with either [ignition][ignition] or a [cloud config][cloud-config].
 Other units being added can then contain a `After=rkt-install.service` (or
 whatever the service was named) to delay their running until rkt has been
 installed.
 
-[1]: https://github.com/coreos/rkt/releases
-[2]: https://coreos.com/ignition/docs/latest/
-[3]: https://coreos.com/os/docs/latest/cloud-config.html
+[rkt-releases]: https://github.com/coreos/rkt/releases
+[ignition]: https://coreos.com/ignition/docs/latest/
+[cloud-config]: https://coreos.com/os/docs/latest/cloud-config.html
diff --git a/Documentation/networking/dns.md b/Documentation/networking/dns.md
index 6231509d63..fc2647f919 100644
--- a/Documentation/networking/dns.md
+++ b/Documentation/networking/dns.md
@@ -76,7 +76,7 @@ When passing IP=HOST pairs:
 $ rkt run ... --hosts-entry 198.51.100.0=host1,198.51.100.1=host2 --hosts-entry 198.51.100.0=host3
 ```
 
-rkt will take some [standard defaults](../../stage1/net/rootfs/etc/hosts-fallback)
+rkt will take some [standard defaults][standard-defaults]
 and append the requested entries.
 
 ```
@@ -111,3 +111,6 @@ PING coreos.com (104.20.47.236): 56 data bytes
 1 packets transmitted, 1 packets received, 0% packet loss
 round-trip min/avg/max = 5.421/5.421/5.421 ms
 ```
+
+
+[standard-defaults]: https://github.com/coreos/rkt/blob/master/stage1/net/rootfs/etc/hosts-fallback
diff --git a/Documentation/networking/examples-bridge.md b/Documentation/networking/examples-bridge.md
index be70e70c47..7ced15a1bf 100644
--- a/Documentation/networking/examples-bridge.md
+++ b/Documentation/networking/examples-bridge.md
@@ -1,6 +1,6 @@
 ## Using NAT with bridge
 
-The [bridge plugin](https://github.com/appc/cni/blob/master/Documentation/bridge.md) can be configured to create a separate network on the host that will be NAT'ed similar to the _default_ network.
+The [bridge plugin][cni-bridge] can be configured to create a separate network on the host that will be NAT'ed similar to the _default_ network.
 The difference to a ptp configured network is that the pods will be able to communicate directly through the bridge and don't have to pass the host as a gateway.
 
 ```json
@@ -46,4 +46,8 @@ default via 10.2.0.1 dev eth0
 172.16.28.1 dev eth1  src 172.16.28.2
 ```
 
-Note that the _[default-restricted](overview.md#the-default-restricted-network)_ network has been loaded in addition to the requested network.
+Note that the _[default-restricted][default-restricted]_ network has been loaded in addition to the requested network.
+
+
+[cni-bridge]: https://github.com/appc/cni/blob/master/Documentation/bridge.md
+[default-restricted]: overview.md#the-default-restricted-network
diff --git a/Documentation/networking/overriding-defaults.md b/Documentation/networking/overriding-defaults.md
index 4f44fbbfe8..8ceac79fd8 100644
--- a/Documentation/networking/overriding-defaults.md
+++ b/Documentation/networking/overriding-defaults.md
@@ -1,7 +1,7 @@
 # Overriding defaults
 
 This document holds information about modifying or replacing builtin defaults and is only recommended to advanced users.
-Please make sure to have read the [networking overview page](overview.md) before treading into these things.
+Please make sure to have read the [networking overview page][overview] before treading into these things.
 
 ## Overriding the "default" network
 
@@ -10,7 +10,7 @@ It is strongly recommended that such network also has type "ptp" as it protects
 
 ## Overriding network settings
 
-The network backend CNI allows the passing of [arguments as plugin parameters](https://github.com/appc/cni/blob/master/SPEC.md#parameters), specifically `CNI_ARGS`, at runtime.
+The network backend CNI allows the passing of [arguments as plugin parameters][cni-plugin-parameters], specifically `CNI_ARGS`, at runtime.
 These arguments can be used to reconfigure a network without changing the configuration file.
 rkt supports the `CNI_ARGS` variable through the command line argument `--net`.
 
@@ -42,4 +42,9 @@ rkt run --net="all,net1:IP=1.2.3.4" --net="net2:IP=1.2.4.5" pod.aci
 ### Supported CNI\_ARGS
 
 This is not documented yet.
-Please follow [this issue on CNI](https://github.com/appc/cni/issues/56) to track the progress of the documentation.
+Please follow CNI issue [#56][cni-56] to track the progress of the documentation.
+
+
+[cni-56]: https://github.com/appc/cni/issues/56
+[cni-plugin-parameters]: https://github.com/appc/cni/blob/master/SPEC.md#parameters
+[overview]: overview.md
diff --git a/Documentation/networking/overview.md b/Documentation/networking/overview.md
index ffed83e94c..feac5d6921 100644
--- a/Documentation/networking/overview.md
+++ b/Documentation/networking/overview.md
@@ -1,6 +1,6 @@
 # Networking
 
-On some of rkt's subcommands *([run](../subcommands/run.md), [run-prepared](../subcommands/run-prepared.md))*, the `--net` flag allows you to configure the pod's network.
+On some of rkt's subcommands *([run][rkt-run], [run-prepared][rkt-run-prepared])*, the `--net` flag allows you to configure the pod's network.
 The various options can be grouped by two categories:
 
 * [host mode](#host-mode)
@@ -22,7 +22,7 @@ This risk can be avoided by configuring a separate namespace for pod.
 
 ## Contained mode
 
-If anything other than `host` is passed to `--net=`, the pod will live in a separate network namespace with the help of [CNI](https://github.com/appc/cni) and its plugin system.
+If anything other than `host` is passed to `--net=`, the pod will live in a separate network namespace with the help of [CNI][cni] and its plugin system.
 The network setup for the pod's network namespace depends on the available CNI configuration files that are shipped with rkt and also configured by the user.
 
 ### Network selection
@@ -161,7 +161,7 @@ Before traffic gets sent to the underlying network it can be evaluated within th
   This field is required.
 - **mode** (string): one of "bridge", "private", "vepa", or "passthru".
   This controls how traffic is handled between different macvlan interfaces on the same host.
-  See [this guide](http://www.pocketnix.org/posts/Linux%20Networking:%20MAC%20VLANs%20and%20Virtual%20Ethernets) for discussion of modes.
+  See [this guide][macvlan-modes] for discussion of modes.
   Defaults to "bridge".
 - **mtu** (integer): the size of the MTU in bytes for the macvlan interface.
   Defaults to MTU of the master device.
@@ -183,7 +183,7 @@ ipvlan interfaces are able to have different IP addresses than the master interf
 - **master** (string): the name of the host interface to copy.
   This field is required.
 - **mode** (string): one of "l2", "l3".
-  See [kernel documentation on ipvlan](https://www.kernel.org/doc/Documentation/networking/ipvlan.txt).
+  See [kernel documentation on ipvlan][ipvlan].
   Defaults to "l2".
 - **mtu** (integer): the size of the MTU in bytes for the ipvlan interface.
   Defaults to MTU of the master device.
@@ -193,7 +193,7 @@ ipvlan interfaces are able to have different IP addresses than the master interf
 **Notes**
 
 * ipvlan can cause problems with duplicated IPv6 link-local addresses since they are partially constructed using the MAC address.
-  This issue is being currently [addressed by the ipvlan kernel module developers](http://thread.gmane.org/gmane.linux.network/363346/focus=363345)
+  This issue is being currently addressed by the ipvlan kernel module developers.
 
 ## IP Address Management
 
@@ -291,8 +291,6 @@ It is now possible to use the DHCP type by specifying it in the ipam section of
 
 For more information about the DHCP plugin, see the [CNI docs][cni-dhcp].
 
-[cni-dhcp]: https://github.com/appc/cni/blob/master/Documentation/dhcp.md
-
 ## Other plugins
 
 ### flannel
@@ -308,7 +306,7 @@ The basic network configuration is as follows:
 ```
 
 This will set up a linux-bridge, connect the container to the bridge and assign container IPs out of the subnet that flannel assigned to the host.
-For more information included advanced configuration options, see [CNI docs](https://github.com/appc/cni/blob/master/Documentation/flannel.md).
+For more information included advanced configuration options, see [CNI docs][cni-flannel].
 
 ## Exposing container ports on the host
 
@@ -345,13 +343,26 @@ As a reminder, the sort order of the loaded networks is detailed in the chapter
 
 ### Socket Activation
 rkt also supports socket activation.
-This is documented in [Socket-activated service](../using-rkt-with-systemd.md#socket-activated-service).
+This is documented in [Socket-activated service][socket-activated].
 
 ## More Docs
 
 ##### Examples
-* [bridge plugin](examples-bridge.md)
+* [bridge plugin][examples-bridge]
 
 ##### Other topics:
-* [DNS configuration](dns.md)
-* [Overriding defaults](overriding-defaults.md)
+* [DNS configuration][dns]
+* [Overriding defaults][overriding]
+
+
+[cni]: https://github.com/appc/cni
+[cni-dhcp]: https://github.com/appc/cni/blob/master/Documentation/dhcp.md
+[cni-flannel]: https://github.com/appc/cni/blob/master/Documentation/flannel.md
+[dns]: dns.md
+[examples-bridge]: examples-bridge.md
+[ipvlan]: https://www.kernel.org/doc/Documentation/networking/ipvlan.txt
+[macvlan-modes]: http://www.pocketnix.org/posts/Linux%20Networking:%20MAC%20VLANs%20and%20Virtual%20Ethernets
+[overriding]: overriding-defaults.md
+[rkt-run]: ../subcommands/run.md
+[rkt-run-prepared]: ../subcommands/run-prepared.md
+[socket-activated]: ../using-rkt-with-systemd.md#socket-activated-service
diff --git a/Documentation/packaging.md b/Documentation/packaging.md
index b20c309fb6..f93db80647 100644
--- a/Documentation/packaging.md
+++ b/Documentation/packaging.md
@@ -14,9 +14,9 @@ By default, the rkt build will download a CoreOS PXE image from the internet and
 
 Most Linux distributions don't allow the use of prebuilt binaries, or reuse of code that is already otherwise packaged. systemd falls in this category, as Debian and Fedora already package systemd, and rkt needs systemd.
 
-- [Debian Policy Manual, section 4.13 Convenience copies of code](https://www.debian.org/doc/debian-policy/ch-source.html#s-embeddedfiles)
-- [Fedora Packaging Guidelines](https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries)
-- [Fedora Packaging Committee](https://www.mail-archive.com/devel@lists.fedoraproject.org/msg88276.html)
+- [Debian Policy Manual, section 4.13 Convenience copies of code][debian-policy-4.13]
+- [Fedora Packaging Guidelines][fedora-packaging-guidelines]
+- [Fedora Packaging Committee][fedora-packaging-committee]
 
 The configure script's `--with-stage1-flavors` option can be set to `host` to avoid rkt's dependency on systemd in these environments:
 
@@ -30,7 +30,7 @@ For more details, see the [configure script parameters documentation][build-conf
 
 ### Glide
 
-rkt uses [Glide](https://github.com/Masterminds/glide) to maintain [a copy of dependencies in its source repository](https://github.com/coreos/rkt/tree/master/vendor).
+rkt uses [Glide][glide] to maintain [a copy of dependencies in its source repository][rkt-vendor].
 
 ## Run-time dependencies
 
@@ -40,7 +40,7 @@ Please see [the list of run-time dependencies][run-deps].
 
 ### Ownership and permissions of rkt directories
 
-In general, subdirectories of `/var/lib/rkt`, and `/etc/rkt` should be created with the same ownership and permissions as described in the [directory list](https://github.com/coreos/rkt/blob/master/dist/init/systemd/tmpfiles.d/rkt.conf).
+In general, subdirectories of `/var/lib/rkt`, and `/etc/rkt` should be created with the same ownership and permissions as described in the [directory list][rkt-dirs].
 
 Any rkt package should create a system group `rkt`, and `rkt-admin`. The directory `/var/lib/rkt` should belong to group `rkt` with the `setgid` bit set (`chmod g+s`). The directory `/etc/rkt` should belong to group `rkt-admin` with the `setgid` bit set (`chmod g+s`).
 
@@ -53,9 +53,15 @@ The motivation to have separate `rkt`, and `rkt-admin` groups is that the person
 A few [example systemd unit files for rkt helper services][rkt-units] are included in the rkt sources. These units demonstrate systemd-managed units to run the rkt [metadata-service][rkt-metadata-svc] with socket-activation, the rkt [api-service][api-service], and a periodic [garbage collection][rkt-gc] service invoked at 12-hour intervals to purge dead pods.
 
 [build-config]: build-configure.md
+[build-deps]: dependencies.md#build-time-dependencies
+[debian-policy-4.13]: https://www.debian.org/doc/debian-policy/ch-source.html#s-embeddedfiles
+[fedora-packaging-committee]: https://www.mail-archive.com/devel@lists.fedoraproject.org/msg88276.html
+[fedora-packaging-guidelines]: https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries
+[glide]: https://glide.sh
 [rkt-gc]: subcommands/gc.md
 [rkt-metadata-svc]: subcommands/metadata-service.md
 [api-service]: subcommands/api-service.md
 [rkt-units]: https://github.com/coreos/rkt/tree/master/dist/init/systemd
-[build-deps]: dependencies.md#build-time-dependencies
+[rkt-vendor]: https://github.com/coreos/rkt/tree/master/vendor
 [run-deps]: dependencies.md#run-time-dependencies
+[rkt-dirs]: https://github.com/coreos/rkt/blob/master/dist/init/systemd/tmpfiles.d/rkt.conf
diff --git a/Documentation/performance/README.md b/Documentation/performance/README.md
index c376f35872..971327178b 100644
--- a/Documentation/performance/README.md
+++ b/Documentation/performance/README.md
@@ -46,4 +46,7 @@ $ go tool pprof /usr/bin/rkt /tmp/cpu.profile
 $ go tool pprof /usr/bin/rkt /tmp/mem.profile
 ```
 
-For more profiling tips, please see https://blog.golang.org/profiling-go-programs
+For more profiling tips, please see [Profiling Go Programs][profiling].
+
+
+[profiling]: https://blog.golang.org/profiling-go-programs
diff --git a/Documentation/proposals/app-level-api.md b/Documentation/proposals/app-level-api.md
index 2ccb90a33a..7e882417d8 100644
--- a/Documentation/proposals/app-level-api.md
+++ b/Documentation/proposals/app-level-api.md
@@ -8,7 +8,7 @@ subcommand CLI API that will be used for manipulating applications inside pods.
 The primary motivation behind this change is to facilitate the new direction
 orchestration systems are taking in how they integrate with container runtimes.
 For more details, see
-[kubernetes#25899](https://github.com/yujuhong/kubernetes/blob/08dc66113399c89e31f6872f3c638695a6ec6a8d/docs/proposals/container-runtime-interface-v1.md).
+[kubernetes#25899][k8s-25899].
 
 # API
 
@@ -229,3 +229,6 @@ Allow users to inject debug applications into a pod in production.
 2. Encounter an error not decipherable via the available information (e.g. status info, logs, etc.).
 3. Add a debug app image containing binaries (e.g. `lsof`) for debugging the service.
 4. Enter the pod namespace and use the debug binaries.
+
+
+[k8s-25899]: https://github.com/yujuhong/kubernetes/blob/08dc66113399c89e31f6872f3c638695a6ec6a8d/docs/proposals/container-runtime-interface-v1.md
diff --git a/Documentation/rkt-vs-other-projects.md b/Documentation/rkt-vs-other-projects.md
index bcf21e9442..f22c37f08b 100644
--- a/Documentation/rkt-vs-other-projects.md
+++ b/Documentation/rkt-vs-other-projects.md
@@ -16,8 +16,8 @@ This document describes how rkt compares to various other projects in the contai
 ## rkt vs Docker
 
 The Docker Engine is an application container runtime implemented as a central API daemon.
-Docker can resolve a ["Docker Image"](https://github.com/docker/docker/blob/master/image/spec/v1.md) name, such as `quay.io/coreos/etcd`, and download, execute, and monitor the application container.
-Functionally, this is all similar to rkt; however, along with "Docker Images", rkt can also download and run "App Container Images" (ACIs) specified by the [App Container Specification](https://github.com/appc/spec) (appc).
+Docker can resolve a "[Docker Image][docker-image-spec]" name, such as `quay.io/coreos/etcd`, and download, execute, and monitor the application container.
+Functionally, this is all similar to rkt; however, along with "Docker Images", rkt can also download and run "App Container Images" (ACIs) specified by the [App Container Specification][appc-spec] (appc).
 
 Besides also supporting ACIs, rkt has a substantially different architecture that is designed with composability and security in mind.
 
@@ -28,8 +28,8 @@ Prior to Docker version 1.11, the Docker Engine daemon downloaded container imag
 While such a centralized architecture is convenient for deployment, it does not follow best practices for Unix process and privilege separation; further, it makes Docker difficult to properly integrate with Linux init systems such as upstart and systemd.
 
 Since version 1.11, the Docker daemon no longer handles the execution of containers itself.
-Instead, this is now handled by [containerd][containerd-github].
-More precisely, the Docker daemon prepares the image as an [Open Container Image](https://www.opencontainers.org/) (OCI) bundle and makes an API call to containerd to start the OCI bundle.
+Instead, this is now handled by [containerd][containerd].
+More precisely, the Docker daemon prepares the image as an [Open Container Image][oci] (OCI) bundle and makes an API call to containerd to start the OCI bundle.
 containerd then starts the container using [runC][runc-github].
 
 ![rkt-vs-docker-process-model](rkt-vs-docker-process-model.png)
@@ -53,15 +53,12 @@ It requires the user to separately download or cryptographically verify containe
 runC does not have a centralized daemon, and, given a properly configured "OCI bundle", can be integrated with init systems such as upstart and systemd.
 
 rkt includes the same functionality as runC but does not expect a user to understand low-level details of the operating system to use, and can be invoked as simply as `rkt run coreos.com/etcd,version=v2.2.0`.
-It can download both ["Docker Images"](https://github.com/docker/docker/blob/master/image/spec/v1.md) and ["App Container Images"](https://github.com/appc/spec).
+It can download both "[Docker Images][docker-image-spec]" and "[App Container Images][appc-spec]".
 As rkt does not have a centralized daemon it can also be easily integrated with init systems such as upstart and systemd.
 
-[runc-github]: https://github.com/opencontainers/runc
-[oci-spec-github]: https://github.com/opencontainers/specs
-
 ## rkt vs containerd
 
-[containerd][containerd-github] is a daemon to control runC.
+[containerd][containerd] is a daemon to control [runC][runc-github].
 It has a command-line tool called `ctr` which is used to interact with the containerd daemon.
 This makes the containerd process model similar to that of the Docker process model, illustrated above.
 
@@ -69,8 +66,6 @@ Unlike the Docker daemon it has a reduced feature set; not supporting image down
 
 rkt has no centralized daemon to manage containers, instead launching containers directly from client commands, making it compatible with init systems such as systemd, upstart, and others.
 
-[containerd-github]: https://github.com/docker/containerd
-
 ## rkt vs LXC/LXD
 
 LXC is a system container runtime designed to execute "full system containers", which generally consist of a full operating system image.
@@ -126,7 +121,7 @@ Furthermore, in addition to namespace isolation, rkt can set up various other ki
 
 ## rkt vs qemu-kvm, lkvm
 
-qemu-kvm and lkvm are userspace tools that execute a full system image inside of a Virtual Machine using the [Linux KVM infrastructure](https://en.wikipedia.org/wiki/Kernel-based_Virtual_Machine).
+qemu-kvm and lkvm are userspace tools that execute a full system image inside of a Virtual Machine using the [Linux KVM infrastructure][kvm-wiki].
 A system image will commonly include a boot loader, kernel, root filesystem and be pre-installed with applications to run on boot.
 Most commonly qemu-kvm is used for IaaS systems such as OpenStack, Eucalyptus, etc.
 The Linux KVM infrastructure is trusted for running multi-tenanted virtual machine infrastructures and is generally accepted as being secure enough to run untrusted system images.
@@ -135,4 +130,14 @@ qemu-kvm and lkvm do not have a centralized daemon and can be integrated with in
 rkt can download, cryptographically verify, and run application container images.
 It is not designed to run "full system images" but instead individual applications such as web apps, databases, or caches.
 As rkt does not have a centralized daemon it can be integrated with init systems such as upstart and systemd.
-rkt can optionally use lkvm or qemu-kvm as an additional security measure over a Linux container, at a slight cost to performance and flexibility; this feature can be configured using the [kvm (aka Clear Containers) stage1](running-lkvm-stage1.md).
+rkt can optionally use lkvm or qemu-kvm as an additional security measure over a Linux container, at a slight cost to performance and flexibility; this feature can be configured using the [kvm (aka Clear Containers) stage1][kvm-stage1].
+
+
+[appc-spec]: https://github.com/appc/spec
+[containerd]: https://containerd.tools
+[docker-image-spec]: https://github.com/docker/docker/blob/master/image/spec/v1.md
+[kvm-wiki]: https://en.wikipedia.org/wiki/Kernel-based_Virtual_Machine
+[kvm-stage1]: running-kvm-stage1.md
+[oci]: https://www.opencontainers.org/
+[oci-spec-github]: https://github.com/opencontainers/specs
+[runc-github]: https://github.com/opencontainers/runc
diff --git a/Documentation/running-docker-images.md b/Documentation/running-docker-images.md
index 26075312c3..7a91033dbe 100644
--- a/Documentation/running-docker-images.md
+++ b/Documentation/running-docker-images.md
@@ -8,7 +8,7 @@ To reference a Docker image, use the `docker://` prefix when fetching or running
 
 Note that Docker images do not support signature verification, and hence it's necessary to use the `--insecure-options=image` flag.
 
-As a simple example, let's run the latest `redis` container image from the default Docker registry:
+As a simple example, let's run the latest [`redis`][docker-redis] container image from the default Docker registry:
 
 ```
 # rkt --insecure-options=image run docker://redis
@@ -45,10 +45,10 @@ Downloading layer: f2fb89b0a711a7178528c7785d247ba3572924353b0d5e23e9b28f0518253
 4:M 19 Apr 06:09:02.375 * The server is now ready to accept connections on port 6379
 ```
 
-This behaves similarly to the Docker client: if no specific registry is named, the [Docker Hub](https://hub.docker.com) is used by default.
+This behaves similarly to the Docker client: if no specific registry is named, the [Docker Hub][docker-hub] is used by default.
 
 As with Docker, alternative registries can be used by specifying the registry as part of the image reference.
-For example, the following command will fetch an nginx Docker image hosted on quay.io:
+For example, the following command will fetch an [nginx][quay-nginx] Docker image hosted on [quay.io][quay]:
 
 ```
 # rkt --insecure-options=image fetch docker://quay.io/zanui/nginx
@@ -67,3 +67,9 @@ After the image has been retrieved, it can be run by referencing this hash:
 ```
 # rkt --insecure-options=image run sha512-c6d6efd98f506380ff128e473ca239ed
 ```
+
+
+[docker-redis]: https://hub.docker.com/_/redis/
+[docker-hub]: https://hub.docker.com
+[quay]: https://quay.io/
+[quay-nginx]: https://quay.io/repository/zanui/nginx
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index c836b0d626..fd54dbfea0 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -6,7 +6,7 @@ The *fly* stage1 is an alternative stage1 that runs a single-application ACI wit
 ## Motivation
 
 The motivation of the fly feature is to add the ability to run applications with full privileges on the host but still benefit from the image management and discovery from rkt.
-The Kubernetes `kubelet` is one candidate for rkt fly.
+The Kubernetes [`kubelet`][kubelet] is one candidate for rkt fly.
 
 
 ## How does it work?
@@ -42,7 +42,7 @@ After the mounts are set up, rkt `chroot`s to the application's RootFS and final
 
 ### Mount propagation modes
 
-The *fly* stage1 makes use of Linux [mount propagation modes](https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt).
+The *fly* stage1 makes use of Linux [mount propagation modes][sharedsubtree].
 If a volume source path is a mountpoint on the host, this mountpoint is made recursively shared before the host path is mounted on the target path in the container.
 Hence, changes to the mounts inside the container will be propagated back to the host.
 
@@ -59,7 +59,7 @@ You can either use `stage1-fly.aci` from the official release, or build rkt your
 $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
-For more details about configure parameters, see the [configure script parameters documentation](build-configure.md).
+For more details about configure parameters, see the [configure script parameters documentation][build-configure].
 This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.18.0+git/bin/`.
 
 ### Selecting stage1 at runtime
@@ -86,7 +86,15 @@ Specifically, the following constraints are not available when using the *fly* s
 
 ### Providing additional isolation with systemd
 
-When using systemd on the host it is possible to [wrap rkt with a systemd unit file](using-rkt-with-systemd.md#advanced-unit-file) to provide additional isolation.
+When using systemd on the host it is possible to [wrap rkt with a systemd unit file][systemd-unit] to provide additional isolation.
 For more information please consult the systemd manual.
-* [systemd.resource-control](http://www.freedesktop.org/software/systemd/man/systemd.resource-control.html)
-* [systemd.directives](http://www.freedesktop.org/software/systemd/man/systemd.directives.html)
+* [systemd.resource-control][systemd.resource-control]
+* [systemd.directives][systemd.directives]
+
+
+[build-configure]: build-configure.md
+[kubelet]: http://kubernetes.io/docs/admin/kubelet/
+[sharedsubtree]: https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt
+[systemd.directives]: http://www.freedesktop.org/software/systemd/man/systemd.directives.html
+[systemd.resource-control]: http://www.freedesktop.org/software/systemd/man/systemd.resource-control.html
+[systemd-unit]: using-rkt-with-systemd.md#advanced-unit-file
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index df5cb2b708..00fbe1df76 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -1,6 +1,6 @@
 # Running rkt with KVM stage1
 
-rkt has support for executing pods with KVM hypervisor - [LKVM](https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+/master/README) or [QEMU](https://github.com/qemu/qemu/blob/master/README) as a [stage1](devel/architecture.md#stage-1). rkt employs this [alternative stage1](devel/stage1-implementors-guide.md) to run a pod within a virtual machine with its own operating system kernel and hypervisor isolation, rather than creating a container using Linux cgroups and namespaces.
+rkt has support for executing pods with KVM hypervisor - [LKVM][lkvm] or [QEMU][qemu] as a [stage1][rkt-arch-stage1]. rkt employs this [alternative stage1][stage1-implementers-guide] to run a pod within a virtual machine with its own operating system kernel and hypervisor isolation, rather than creating a container using Linux cgroups and namespaces.
 
 The KVM stage1 does not yet implement all of the default stage1's features and semantics. While the same app container can be executed under isolation by either stage1, it may require different configuration, especially for networking. However, several deployments of the KVM stage1 are operational outside of CoreOS, and we encourage testing of this feature and welcome your contributions.
 
@@ -12,10 +12,10 @@ For LKVM you can use `stage1-kvm.aci` or `stage1-kvm-lkvm.aci`, for QEMU - `stag
 $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hypervisors=lkvm,qemu && make
 ```
 
-For more details about configure parameters, see [configure script parameters documentation](build-configure.md).
+For more details about configure parameters, see [configure script parameters documentation][build-configure].
 This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.18.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
-Provided you have hardware virtualization support and the [kernel KVM module](http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules) loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
+Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
 ```
 # rkt trust --prefix coreos.com/etcd
@@ -79,7 +79,7 @@ Currently, the memory allocated to the virtual machine is a sum of memory requir
 
 ### Selecting stage1 at runtime
 
-If you want to run software that requires hypervisor isolation along with trusted software that only needs container isolation, you can [choose which stage1 to use at runtime](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/run.md#use-a-custom-stage-1).
+If you want to run software that requires hypervisor isolation along with trusted software that only needs container isolation, you can [choose which stage1 to use at runtime][rkt-run].
 
 For example, to use the official kvm stage1:
 
@@ -92,7 +92,7 @@ If the image is not in the store, `--stage1-name` will perform discovery and fet
 
 ## How does it work?
 
-It leverages the work done by Intel with their [Clear Containers system](https://lwn.net/Articles/644675/).
+It leverages the work done by Intel with their [Clear Containers system][clear-containers].
 Stage1 contains a Linux kernel that is executed under hypervisor (LKVM or QEMU).
 This kernel will then start systemd, which in turn will start the applications in the pod.
 
@@ -123,3 +123,13 @@ host OS
           └─ chroot
             └─ user-app1
 ```
+
+
+[build-configure]: build-configure.md
+[clear-containers]: https://lwn.net/Articles/644675/
+[kvm-module]: http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules
+[lkvm]: https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+/master/README
+[qemu]: http://qemu-project.org/Main_Page
+[rkt-arch-stage1]: devel/architecture.md#stage-1
+[rkt-run]: subcommands/run.md#use-a-custom-stage-1
+[stage1-implementers-guide]: devel/stage1-implementors-guide.md
diff --git a/Documentation/seccomp-guide.md b/Documentation/seccomp-guide.md
index 9640483c02..1d9094abc7 100644
--- a/Documentation/seccomp-guide.md
+++ b/Documentation/seccomp-guide.md
@@ -1,7 +1,7 @@
 # Seccomp Isolators Guide
 
 This document is a walk-through guide describing how to use rkt isolators for
-[Linux seccomp filtering](https://lwn.net/Articles/656307/).
+[Linux seccomp filtering][lwn-seccomp].
 
 * [About Seccomp](#about-seccomp)
 * [Predefined Seccomp Filters](#predefined-seccomp-filter)
@@ -24,7 +24,7 @@ In the context of containers, seccomp filtering is useful for:
 * Reducing kernel attack surface in case of security bugs
 
 For more details on how Linux seccomp filtering works, see
-[seccomp(2)](http://man7.org/linux/man-pages/man2/seccomp.2.html).
+[seccomp(2)][man-seccomp].
 
 ## Predefined seccomp filters
 
@@ -37,7 +37,7 @@ system calls. To distinguish these predefined groups from real syscall names,
 wildcard labels are prefixed with a `@` symbols and are namespaced.
 
 The App Container Spec (appc) defines
-[two groups](https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators):
+[two groups][appc-isolators]:
 
  * `@appc.io/all` represents the set of all available syscalls.
  * `@appc.io/empty` represents the empty set.
@@ -47,14 +47,13 @@ rkt provides two default groups for generic usage:
  * `@rkt/default-blacklist` represents a broad-scope filter than can be used for generic blacklisting
  * `@rkt/default-whitelist` represents a broad-scope filter than can be used for generic whitelisting
 
-For compatibility reasons, two groups are provided mirroring [default Docker
-profiles](https://github.com/docker/docker/blob/v1.12.0/docs/security/seccomp.md):
+For compatibility reasons, two groups are provided mirroring [default Docker profiles][docker-seccomp]:
 
  * `@docker/default-blacklist`
  * `@docker/default-whitelist`
 
 When using stage1 images with systemd >= v231, some
-[predefined groups](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=)
+[predefined groups][systemd-seccomp]
 are also available:
 
  * `@systemd/clock` for syscalls manipulating the system clock
@@ -73,7 +72,7 @@ the same set defined by `@rkt/default-whitelist`.
 The default set is tailored to stop applications from performing a large
 variety of privileged actions, while not impacting their normal behavior.
 Operations which are typically not needed in containers and which may
-impact host state, eg. invoking `umount(2)`, are denied in this way.
+impact host state, eg. invoking [`umount(2)`][man-umount], are denied in this way.
 
 However, this default set is mostly meant as a safety precaution against erratic
 and misbehaving applications, and will not suffice against tailored attacks.
@@ -107,7 +106,7 @@ terminating it.
 
 For both isolators, this can be customized by specifying an additional `errno`
 parameter with the desired symbolic errno name. For a list of errno labels, check
-the [reference](http://man7.org/linux/man-pages/man3/errno.3.html) at `man 3 errno`.
+the [reference][man-errno] at `man 3 errno`.
 
 ### Retain-set
 
@@ -141,11 +140,11 @@ known to never touch mountpoints could have `@systemd/mount` specified in its
 
 ## Usage Example
 
-The goal of these examples is to show how to build ACI images with `acbuild`,
+The goal of these examples is to show how to build ACI images with [`acbuild`][acbuild],
 where some syscalls are either explicitly blocked or allowed.
 For simplicity, the starting point will be a bare Alpine Linux image which
 ships with `ping` and `umount` commands (from busybox). Those
-commands respectively requires `socket(2)` and `umount(2)` syscalls in order to
+commands respectively requires [`socket(2)`][man-socket] and [`umount(2)`][man-umount] syscalls in order to
 perform privileged operations.
 To block their usage, a syscalls filter can be installed via
 `os/linux/seccomp-remove-set` or `os/linux/seccomp-retain-set`; both approaches
@@ -216,8 +215,8 @@ $ acbuild end
 ```
 
 Once run, it can be easily verified that both `ping` and `umount` are now
-functional inside the container. These operations also require additional
-capabilities to be retained in order to work:
+functional inside the container. These operations also require [additional
+capabilities][capabilities-guide] to be retained in order to work:
 
 ```
 $ sudo rkt run --interactive --insecure-options=image seccomp-retain-set-example.aci --caps-retain=CAP_SYS_ADMIN,CAP_NET_RAW
@@ -270,7 +269,7 @@ or by overriding seccomp isolators with command line options.
 ### Patching images
 
 Image manifests can be manipulated manually, by unpacking the image and editing
-the manifest file, or with helper tools like `actool`.
+the manifest file, or with helper tools like [`actool`][actool].
 To override an image's pre-defined syscalls set, just replace the existing seccomp
 isolators in the image with new isolators defining the desired syscalls.
 
@@ -372,7 +371,22 @@ set of syscalls requirements and follow best practices:
  2. While it is possible to completely disable seccomp, it is rarely needed and
     should be generally avoided. Tweaking the syscalls set is a better approach
     instead.
- 3. Avoid granting access to dangerous syscalls. For example, `mount(2)` and
-    `ptrace(2)` are typically abused to escape containers.
+ 3. Avoid granting access to dangerous syscalls. For example, [`mount(2)`][man-mount] and
+    [`ptrace(2)`][man-ptrace] are typically abused to escape containers.
  4. Prefer a whitelisting approach, trying to keep the "retain-set" as small as
     possible.
+
+
+[acbuild]: https://github.com/containers/build
+[actool]: https://github.com/appc/spec#building-acis
+[appc-isolators]: https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators
+[capabilities-guide]: capabilities-guide.md
+[docker-seccomp]: https://docs.docker.com/engine/security/seccomp/
+[lwm-seccomp]: https://lwn.net/Articles/656307/
+[man-errno]: http://man7.org/linux/man-pages/man3/errno.3.html
+[man-mount]: http://man7.org/linux/man-pages/man2/mount.2.html
+[man-ptrace]: http://man7.org/linux/man-pages/man2/ptrace.2.html
+[man-seccomp]: http://man7.org/linux/man-pages/man2/seccomp.2.html
+[man-socket]: http://man7.org/linux/man-pages/man2/socket.2.html
+[man-umount]: http://man7.org/linux/man-pages/man2/umount.2.html
+[systemd-seccomp]: https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
diff --git a/Documentation/selinux.md b/Documentation/selinux.md
index 80e01c53cb..b3c614e42f 100644
--- a/Documentation/selinux.md
+++ b/Documentation/selinux.md
@@ -1,6 +1,6 @@
 # rkt and SELinux
 
-rkt supports running containers using SELinux [SVirt](http://selinuxproject.org/page/SVirt).
+rkt supports running containers using SELinux [SVirt][svirt].
 At start-up, rkt will attempt to read `/etc/selinux/(policy)/contexts/lxc_contexts`.
 If this file doesn't exist, no SELinux transitions will be performed.
 If it does, rkt will generate a per-instance context.
@@ -8,3 +8,6 @@ All mounts for the instance will be created using the file context defined in `l
 
 Processes started in these contexts will be unable to interact with processes or files in any other instance's context, even though they are running as the same user.
 Individual Linux distributions may impose additional isolation constraints on these contexts - please refer to your distribution documentation for further details.
+
+
+[svirt]: http://selinuxproject.org/page/SVirt
diff --git a/Documentation/signing-and-verification-guide.md b/Documentation/signing-and-verification-guide.md
index 48431c9a0e..d80d15704a 100644
--- a/Documentation/signing-and-verification-guide.md
+++ b/Documentation/signing-and-verification-guide.md
@@ -1,6 +1,6 @@
 # Signing and Verification Guide
 
-This guide will walk you through signing, distributing, and verifying the hello ACI created in the [getting started guide](getting-started-guide.md).
+This guide will walk you through signing, distributing, and verifying the hello ACI created in the [getting started guide][getting-started].
 
 ```
 hello-0.0.1-linux-amd64.aci
@@ -200,7 +200,7 @@ The image's name will be used to locate trusted public keys in the rkt keystore
 
 By default rkt does not trust any signing keys.
 Trust is established by storing public keys in the rkt keystore.
-This can be done using `rkt trust` or manually, using the procedures described in the next section.
+This can be done using [`rkt trust`][rkt-trust] or manually, using the procedures described in the next section.
 
 The following directories make up the default rkt keystore layout:
 
@@ -232,7 +232,7 @@ As an example, let's look at how we can trust a key used to sign images of the p
 
 #### Using rkt trust
 
-The easiest way to trust a key is to use the `rkt trust` subcommand.
+The easiest way to trust a key is to use the [`rkt trust`][rkt-trust] subcommand.
 In this case, we directly pass it the URI containing the public key we wish to trust:
 
 ```
@@ -250,7 +250,7 @@ Now the public key with fingerprint `b346e31de7e3c6f9d1d4603f4dfb61bf26ef7a14` w
 
 #### Manually adding keys
 
-An alternative to using `rkt trust` is to manually trust keys by adding them to rkt's database.
+An alternative to using [`rkt trust`][rkt-trust] is to manually trust keys by adding them to rkt's database.
 We do this by downloading the key, capturing its fingerprint, and storing it in the database using the fingerprint as filename
 
 ##### Download the public key
@@ -335,7 +335,7 @@ rkt: warning: image signature verification has been disabled
 
 #### Download and verify an ACI
 
-Using the fetch subcommand you can download and verify an ACI without immediately running a pod.
+Using the [`fetch`][rkt-fetch] subcommand you can download and verify an ACI without immediately running a pod.
 This can be useful to precache ACIs on a large number of hosts:
 
 ```
@@ -358,3 +358,8 @@ rkt: warning: image signature verification has been disabled
 Downloading aci: [                                             ] 4.34 KB/1.26 MB
 sha512-b3f138e10482d4b5f334294d69ae5c40
 ```
+
+
+[getting-started]: getting-started-guide.md
+[rkt-fetch]: subcommands/fetch.md
+[rkt-trust]: subcommands/trust.md
diff --git a/Documentation/subcommands/api-service.md b/Documentation/subcommands/api-service.md
index 2fe58b90d2..878c5c0fbc 100644
--- a/Documentation/subcommands/api-service.md
+++ b/Documentation/subcommands/api-service.md
@@ -3,7 +3,7 @@
 ## Overview
 
 The API service lists and introspects pods and images.
-The API service is implemented with [gRPC](http://www.grpc.io/).
+The API service is implemented with [gRPC][grpc].
 The API service is designed to run without root privileges, and currently provides a read-only interface.
 The API service is optional for running pods, the start/stop/crash of the API service won't affect any pods or images.
 
@@ -13,12 +13,12 @@ The API service listens for gRPC requests on the address and port specified by t
 The default is to listen on the loopback interface on port number `15441`, equivalent to invoking `rkt api-service --listen=localhost:15441`.
 Specify the address `0.0.0.0` to listen on all interfaces.
 
-Typically, the API service will be run via a unit file similar to the one included in the [dist directory](../../dist/init/systemd/rkt-api.service).
+Typically, the API service will be run via a unit file similar to the one included in the [dist directory][rkt-api].
 
 ## Using the API service
 
-The interfaces are defined in the [protobuf here](https://github.com/coreos/rkt/blob/master/api/v1alpha/api.proto).
-Here is a small [Go program](https://github.com/coreos/rkt/blob/master/api/v1alpha/client_example.go) that illustrates how to use the API service.
+The interfaces are defined in the [protobuf here][api_proto].
+Here is a small [Go program][client-example] that illustrates how to use the API service.
 
 ## Options
 
@@ -28,4 +28,11 @@ Here is a small [Go program](https://github.com/coreos/rkt/blob/master/api/v1alp
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[api_proto]: https://github.com/coreos/rkt/blob/master/api/v1alpha/api.proto
+[client-example]: https://github.com/coreos/rkt/blob/master/api/v1alpha/client_example.go
+[global-options]: ../commands.md#global-options
+[grpc]: http://www.grpc.io/
+[rkt-api]: https://github.com/coreos/rkt/blob/master/dist/init/systemd/rkt-api.service
diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index 4998f84f3c..ba421ef7fc 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -18,4 +18,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/subcommands/enter.md b/Documentation/subcommands/enter.md
index 758ade5782..34c7768461 100644
--- a/Documentation/subcommands/enter.md
+++ b/Documentation/subcommands/enter.md
@@ -24,4 +24,7 @@ boot  dev   etc            lib   media  opt  root  sbin  srv      tmp  var
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/subcommands/export.md b/Documentation/subcommands/export.md
index ae05165c1f..f09d4fe6f2 100644
--- a/Documentation/subcommands/export.md
+++ b/Documentation/subcommands/export.md
@@ -14,4 +14,7 @@ $ rkt export UUID .aci
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/subcommands/fetch.md b/Documentation/subcommands/fetch.md
index 460410b263..af95d40212 100644
--- a/Documentation/subcommands/fetch.md
+++ b/Documentation/subcommands/fetch.md
@@ -71,14 +71,14 @@ When fetching, rkt will try to avoid unnecessary network transfers.
 For example, if an image is already in the local store, rkt will use HTTP's ETag and Cache-Control to avoid downloading it again unless the image was updated on the remote server.
 
 This behavior can be changed by using the `--store-only` and `--no-store` flags.
-Their meanings are detailed in the [image fetching behavior](../image-fetching-behavior.md) documentation.
+Their meanings are detailed in the [image fetching behavior][img-fetch] documentation.
 
 ## Authentication
 
 If you want to download an image from a private repository, then you will often need to pass credentials to be able to access it.
 rkt currently supports authentication for fetching images via https:// or docker:// protocols.
 To specify credentials you will have to write some configuration files.
-You can find the format of the configuration file and examples in the [configuration documentation](../configuration.md).
+You can find the format of the configuration file and examples in the [configuration documentation][configuration].
 Note that the configuration kind for images downloaded via https:// and images downloaded via docker:// is different.
 
 ## Options
@@ -86,12 +86,16 @@ Note that the configuration kind for images downloaded via https:// and images d
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
 | `--full` |  `false` | `true` or `false` | Print the full image hash after fetching |
-| `--no-store` |  `false` | `true` or `false` | Fetch images ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
+| `--no-store` |  `false` | `true` or `false` | Fetch images ignoring the local store. See [image fetching behavior][img-fetch] |
 | `--signature` |  `` | A file path | Local signature file to use in validating the preceding image |
-| `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md) |
+| `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior][img-fetch] |
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
 
 [appc-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md
+[configuration]: ../configuration.md
+[global-options]: ../commands.md#global-options
+[img-fetch]: ../image-fetching-behavior.md
diff --git a/Documentation/subcommands/fly.md b/Documentation/subcommands/fly.md
index 66c308fd53..b782cd7a73 100644
--- a/Documentation/subcommands/fly.md
+++ b/Documentation/subcommands/fly.md
@@ -3,4 +3,7 @@
 ***This subcommand does not exist yet.***
 
 It will make use of the fly stage1 which is currently in an early phase of development.
-More information can be found in the document about [running rkt with the fly stage1](../running-fly-stage1.md).
+More information can be found in the document about [running rkt with the fly stage1][fly].
+
+
+[fly]: ../running-fly-stage1.md
diff --git a/Documentation/subcommands/gc.md b/Documentation/subcommands/gc.md
index 2d9de34b7a..5ea60d5038 100644
--- a/Documentation/subcommands/gc.md
+++ b/Documentation/subcommands/gc.md
@@ -5,8 +5,6 @@ Stopped pods are moved to the garbage and cleaned up during a subsequent garbage
 Each `gc` pass removes any pods remaining in the garbage past the grace period.
 [Read more about the pod lifecycle][gc-docs].
 
-[gc-docs]: ../devel/pod-lifecycle.md#garbage-collection
-
 ```
 # rkt gc --grace-period=30m0s
 Moving pod "21b1cb32-c156-4d26-82ae-eda1ab60f595" to garbage
@@ -33,4 +31,8 @@ Garbage collecting pod "f07a4070-79a9-4db0-ae65-a090c9c393a3"
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[gc-docs]: ../devel/pod-lifecycle.md#garbage-collection
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 5f60b6123d..7d630c87cb 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -143,4 +143,7 @@ rkt: 2 image(s) successfully removed
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/subcommands/list.md b/Documentation/subcommands/list.md
index fca4fccfd5..509f62c793 100644
--- a/Documentation/subcommands/list.md
+++ b/Documentation/subcommands/list.md
@@ -29,4 +29,7 @@ UUID                                   APP     IMAGE NAME              IMAGE ID
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/subcommands/metadata-service.md b/Documentation/subcommands/metadata-service.md
index 41839da1dc..929256995a 100644
--- a/Documentation/subcommands/metadata-service.md
+++ b/Documentation/subcommands/metadata-service.md
@@ -10,13 +10,13 @@ Finally, the metadata service provides a pod with cryptographically verifiable i
 
 The metadata service is implemented by the `rkt metadata-service` command.
 When started, it will listen for registration events over Unix socket on `/run/rkt/metadata-svc.sock`.
-For systemd-based distributions, it also supports [systemd socket activation](http://0pointer.de/blog/projects/socket-activation.html).
+For systemd-based distributions, it also supports [systemd socket activation][socket-activation].
 
 If using socket activation, ensure the socket is named `/run/rkt/metadata-svc.sock`, as `rkt run` uses this name during registration.
 Please note that when started under socket activation, the metadata service will not remove the socket on exit.
 Use the `RemoveOnStop` directive in the relevant `.socket` file to clean up.
 
-Example systemd unit files for running the metadata service are available in [dist](https://github.com/coreos/rkt/tree/master/dist/init/systemd).
+Example systemd unit files for running the metadata service are available in [dist][dist].
 
 In addition to listening on a Unix socket, the metadata service will also listen on a TCP port 2375.
 When contacting the metadata service, the apps utilize this port.
@@ -24,7 +24,7 @@ The IP and port of the metadata service are passed by rkt to pods via the `AC_ME
 
 ## Using the metadata service
 
-See [App Container specification](https://github.com/appc/spec/blob/master/spec/ace.md#app-container-metadata-service) for more information about the metadata service including a list of supported endpoints and their usage.
+See [App Container specification][appc-container-metadata] for more information about the metadata service including a list of supported endpoints and their usage.
 
 ## Options
 
@@ -34,4 +34,10 @@ See [App Container specification](https://github.com/appc/spec/blob/master/spec/
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[appc-container-metadata]: https://github.com/appc/spec/blob/master/spec/ace.md#app-container-metadata-service
+[dist]: https://github.com/coreos/rkt/tree/master/dist/init/systemd
+[global-options]: ../commands.md#global-options
+[socket-activation]: http://0pointer.de/blog/projects/socket-activation.html
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 07e3570c6b..74e34a4d83 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -22,9 +22,9 @@ The data directory (usually `/var/lib/rkt`) is on ...
 - a XFS filesystem having `ftype=0`
 - a file system where the `d_type` field is set to `DT_UNKNOWN`, see getdents(2)
 
-In this way, the pod is ready to be launched immediately by the [run-prepared](run-prepared.md) command.
+In this way, the pod is ready to be launched immediately by the [run-prepared][run-prepared] command.
 
-Running `rkt prepare` + `rkt run-prepared` is semantically equivalent to running [rkt run](run.md).
+Running `rkt prepare` + `rkt run-prepared` is semantically equivalent to running [rkt run][run].
 Therefore, the supported arguments are mostly the same as in `run` except runtime arguments like `--interactive` or `--mds-register`.
 
 ## Example
@@ -57,11 +57,11 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
 | `--group` | root | gid, groupname or file path | Group override for the preceding image (example: '--group=group') |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
-| `--mount` | none | Mount syntax (ex. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
+| `--mount` | none | Mount syntax (ex. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points][vol-no-mount]. |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
-| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
+| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior][img-fetch] |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
-| `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network](../networking/overview.md#contained-mode). Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080` |
+| `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network][contained]. Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080` |
 | `--private-users` |  `false` | `true` or `false` | Run within user namespaces |
 | `--quiet` |  `false` | `true` or `false` | Suppress superfluous output on stdout, print only the UUID on success |
 | `--set-env` |  `` | An environment variable. Syntax `NAME=VALUE` | An environment variable to set for apps |
@@ -72,10 +72,19 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--stage1-name` |  `` | A name of a stage1 image. Will perform a discovery if the image is not in the store | Image to use as stage1 |
 | `--stage1-hash` |  `` | A hash of a stage1 image. The image must exist in the store | Image to use as stage1 |
 | `--stage1-from-dir` |  `` | A stage1 image file inside the default stage1 images directory | Image to use as stage1 |
-| `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md) |
+| `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior][img-fetch] |
 | `--user` | none | uid, username or file path | user override for the preceding image (example: '--user=user') |
-| `--volume` |  `` | Volume syntax (`NAME,kind=KIND,source=PATH,readOnly=BOOL,recursive=BOOL`). See [Mount Volumes into a Pod](run.md#mount-volumes-into-a-pod) | Volumes to make available in the pod |
+| `--volume` |  `` | Volume syntax (`NAME,kind=KIND,source=PATH,readOnly=BOOL,recursive=BOOL`). See [Mount Volumes into a Pod][mount-vol] | Volumes to make available in the pod |
 
 ## Global options
 
-See the table with [global options in the general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[contained]: ../networking/overview.md#contained-mode
+[global-options]: ../commands.md#global-options
+[img-fetch]: ../image-fetching-behavior.md
+[mount-vol]: run.md#mount-volumes-into-a-pod
+[run]: run.md
+[run-prepared]: run-prepared.md
+[vol-no-mount]: run.md#mounting-volumes-without-mount-points
diff --git a/Documentation/subcommands/rm.md b/Documentation/subcommands/rm.md
index 005825870a..78ae8ee027 100644
--- a/Documentation/subcommands/rm.md
+++ b/Documentation/subcommands/rm.md
@@ -17,4 +17,7 @@ rkt rm --uuid-file=/run/rkt-uuids/mypod
 
 ### Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/subcommands/run-prepared.md b/Documentation/subcommands/run-prepared.md
index 7f8ba71eaa..b5aded4f4f 100644
--- a/Documentation/subcommands/run-prepared.md
+++ b/Documentation/subcommands/run-prepared.md
@@ -1,6 +1,6 @@
 # rkt run-prepared
 
-Once a pod is prepared with rkt [prepare](prepare.md), it can be run by executing `rkt run-prepared UUID`.
+Once a pod is prepared with rkt [prepare][prepare], it can be run by executing `rkt run-prepared UUID`.
 
 ## Example
 
@@ -55,4 +55,8 @@ c9fad0e6    etcd    coreos.com/etcd prepared
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[global-options]: ../commands.md#global-options
+[prepare]: prepare.md
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 6e26f869f8..4fb0f02cb2 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -3,7 +3,7 @@
 ## Image Addressing
 
 Images can be run by either their name, their hash, an explicit transport address, or a Docker registry URL.
-rkt will automatically [fetch](fetch.md) them if they're not present in the local store.
+rkt will automatically [fetch][fetch] them if they're not present in the local store.
 
 ### Run By Name
 ```
@@ -44,7 +44,7 @@ This executable can be overridden by rkt using the `--exec` flag:
 ## Overriding Isolators
 
 Application images can include per-app isolators and some of them can be overridden by rkt.
-The units come from [the Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md).
+The units come from [the Kubernetes resource model][k8s-resources].
 In the following example, the CPU isolator is defined to 750 milli-cores and the memory isolator limits the memory usage to 128MB.
 
 ```
@@ -53,7 +53,7 @@ In the following example, the CPU isolator is defined to 750 milli-cores and the
 
 ## Overriding User/Group
 
-Application images must specify the username/group or the UID/GID the app is to be run as as specified in the [Image Manifest Schema](https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema). The user/group can be overridden by rkt using the `--user` and `--group` flags:
+Application images must specify the username/group or the UID/GID the app is to be run as as specified in the [Image Manifest Schema][image-manifest-schema]. The user/group can be overridden by rkt using the `--user` and `--group` flags:
 
 ```
 # rkt --insecure-options=image run docker://busybox --user=1000 --group=100 --exec id
@@ -111,7 +111,7 @@ rkt: warning: signature verification has been disabled
 
 ## Mount Volumes into a Pod
 
-Each ACI can define a [list of mount points](https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema) that the app is expecting external data to be mounted into:
+Each ACI can define a [list of mount points][image-manifest-schema] that the app is expecting external data to be mounted into:
 
 ```json
 {
@@ -289,7 +289,7 @@ Now when the pod is running, the two apps will see the host's `/opt/tenant1/work
 
 ## Enabling metadata service registration
 
-By default, `rkt run` will not register the pod with the [metadata service](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/metadata-service.md).
+By default, `rkt run` will not register the pod with the [metadata service][metadata-service].
 You can enable registration with the `--mds-register` command line option.
 
 ## Pod Networking
@@ -312,20 +312,20 @@ Strictly seen, this is only true when `rkt run` is invoked on the host directly,
 
 ### Other Networking Examples
 
-More details about rkt's networking options and examples can be found in the [networking documentation](../networking/overview.md)
+More details about rkt's networking options and examples can be found in the [networking documentation][net-overview].
 
 ## Run rkt as a Daemon
 
 rkt doesn't include any built-in support for running as a daemon.
 However, since it is a regular process, you can use your init system to achieve the same effect.
 
-For example, if you use systemd, you can [run rkt using `systemd-run`](https://github.com/coreos/rkt/blob/master/Documentation/using-rkt-with-systemd.md#systemd-run).
+For example, if you use systemd, you can [run rkt using `systemd-run`][systemd-run].
 
-If you don't use systemd, you can use [daemon](http://www.libslack.org/daemon/) as an alternative.
+If you don't use systemd, you can use [daemon][daemon] as an alternative.
 
 ## Use a Custom Stage1
 
-rkt is designed and intended to be modular, using a [staged architecture](../devel/architecture.md).
+rkt is designed and intended to be modular, using a [staged architecture][rkt-arch].
 
 You can use a custom stage1 by using the `--stage1-{url,path,name,hash,from-dir}` flags.
 
@@ -339,13 +339,13 @@ rkt expects stage1 images to be signed except in the following cases:
 * `--stage1-{name,hash}` is used and the image is already in the store
 * `--stage1-{url,path,from-dir}` is used and the image is in the default directory configured at build time
 
-For more details see the [hacking documentation](../hacking.md).
+For more details see the [hacking documentation][rkt-hacking].
 
 ## Disabling overlay
 
 rkt uses overlayfs by default when running application containers. This provides immense benefits to performance and efficiency: start times for large containers are much faster, and multiple pods using the same images will consume less disk space and can share page cache entries.
 
-This feature will be disabled automatically if the underlying filesystem does not support overlay fs, see the [prepare](prepare.md) subcommand for details. This feature can also be explicitly disabled with the `--no-overlay` option:
+This feature will be disabled automatically if the underlying filesystem does not support overlay fs, see the [prepare][prepare] subcommand for details. This feature can also be explicitly disabled with the `--no-overlay` option:
 
 ```
 # rkt run --no-overlay=true --insecure-options=image coreos.com/etcd:v2.0.0
@@ -357,7 +357,7 @@ This feature will be disabled automatically if the underlying filesystem does no
 | --- | --- | --- | --- |
 | `--caps-remove` | none | capability to remove (e.g. `--caps-remove=CAP_SYS_CHROOT,CAP_MKNOD`) | Capabilities to remove from the process's capabilities bounding set; all others from the default set will be included. |
 | `--caps-retain` | none | capability to retain (e.g. `--caps-retain=CAP_SYS_ADMIN,CAP_NET_ADMIN`) | Capabilities to retain in the process's capabilities bounding set; all others will be removed. |
-| `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
+| `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
 | `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-opt` | none | DNS option | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |
@@ -367,13 +367,13 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
 | `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
 | `--mds-register` | `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net` as `default`, `default-restricted`, or `host`). |
-| `--memory` | none | Memory units (e.g. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md) format. |
+| `--memory` | none | Memory units (e.g. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
 | `--mount` | none | Mount syntax (e.g. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
 | `--net` | `default` | A comma-separated list of networks. (e.g. `--net[=n[:args], ...]`) | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
-| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md). |
+| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior][img-fetch]. |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
-| `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network](../networking/overview.md#contained-mode). Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080`. |
+| `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network][contained]. Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080`. |
 | `--private-users` | `false` | `true` or `false` | Run within user namespaces. |
 | `--set-env` | none | An environment variable (e.g. `--set-env=NAME=VALUE`) | An environment variable to set for apps. |
 | `--set-env-file` | none | Path of an environment variables file (e.g. `--set-env-file=/path/to/env/file`) | Environment variables to set for apps. |
@@ -383,11 +383,26 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--stage1-name` | none | Image name (e.g. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A name of a stage1 image. Will perform a discovery if the image is not in the store. |
 | `--stage1-path` | none | Absolute or relative path | A path to a stage1 image. |
 | `--stage1-url` | none | URL with protocol | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported. |
-| `--store-only` | `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior](../image-fetching-behavior.md). |
+| `--store-only` | `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior][img-fetch]. |
 | `--user` | none | uid, username or file path (e.g. `--user=core`) | User override for the preceding image. |
 | `--uuid-file-save` | none | A file path | Write out the pod UUID to a file. |
 | `--volume` | none | Volume syntax (e.g. `--volume NAME,kind=KIND,source=PATH,readOnly=BOOL`) | Volumes to make available in the pod. See [Mount Volumes into a Pod](#mount-volumes-into-a-pod). |
 
 ## Global options
 
-See the table with [global options in the general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[contained]: ../networking/overview.md#contained-mode
+[daemon]: http://www.libslack.org/daemon/
+[fetch]: fetch.md
+[global-options]: ../commands.md#global-options
+[image-manifest-schema]: https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
+[img-fetch]: ../image-fetching-behavior.md
+[k8s-resources]: https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/resources.md
+[metadata-service]: metadata-service.md
+[net-overview]: ../networking/overview.md
+[prepare]: prepare.md
+[rkt-arch]: ../devel/architecture.md
+[rkt-hacking]: ../hacking.md
+[systemd-run]: ../using-rkt-with-systemd.md#systemd-run
diff --git a/Documentation/subcommands/status.md b/Documentation/subcommands/status.md
index 0db25fb261..921f96fe7c 100644
--- a/Documentation/subcommands/status.md
+++ b/Documentation/subcommands/status.md
@@ -24,4 +24,7 @@ If the pod is still running, you can wait for it to finish and then get the stat
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
+
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/subcommands/trust.md b/Documentation/subcommands/trust.md
index 3841af8afb..384300b137 100644
--- a/Documentation/subcommands/trust.md
+++ b/Documentation/subcommands/trust.md
@@ -94,6 +94,8 @@ $ find /etc/rkt/trustedkeys/
 
 ## Global options
 
-See the table with [global options in general commands documentation](../commands.md#global-options).
+See the table with [global options in general commands documentation][global-options].
+
 
 [appc-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index d0b95205a8..e68df07b91 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -90,7 +90,7 @@ vagrant ssh -c 'ip address'
 
 In this example, the Vagrant machine has the IP address `172.28.128.3`.
 
-The following command starts an `nginx` container, for simplicity using [*host networking*][host-network] to make the pod directly accessible on the host's network address and ports. Signature validation isn't supported for Docker registries and images, so `--insecure-options=image` switches off the signature check:
+The following command starts an [`nginx`][docker-nginx] container, for simplicity using [*host networking*][host-network] to make the pod directly accessible on the host's network address and ports. Signature validation isn't supported for Docker registries and images, so `--insecure-options=image` switches off the signature check:
 
 ```
 sudo rkt run --net=host --insecure-options=image docker://nginx
@@ -135,9 +135,9 @@ rkt supports running under SELinux mandatory access controls, but an SELinux pol
 
 ### Optional: Set up privilege separation
 
-To allow different subcommands to use the least necessary privilege, rkt recognizes a `rkt` group that has read-write access to the rkt data directory. This allows `rkt fetch`, which downloads and verifies images, to run as an unprivileged user who is a member of the `rkt` group.
+To allow different subcommands to use the least necessary privilege, rkt recognizes a `rkt` group that has read-write access to the rkt data directory. This allows [`rkt fetch`][rkt-fetch], which downloads and verifies images, to run as an unprivileged user who is a member of the `rkt` group.
 
-If you skip this section, you can still run `sudo rkt fetch` instead, but setting up a `rkt` group is a good basic security practice for production use. The rkt repo includes a `setup-data-dir.sh` script that can help set up the appropriate permissions for unprivileged execution of subcommands that manipulate the local store, but not the execution environment:
+If you skip this section, you can still run `sudo rkt fetch` instead, but setting up a `rkt` group is a good basic security practice for production use. The rkt repo includes a [`setup-data-dir.sh`][setup-data-dir] script that can help set up the appropriate permissions for unprivileged execution of subcommands that manipulate the local store, but not the execution environment:
 
 ```
 sudo groupadd rkt
@@ -180,7 +180,7 @@ The example below uses an [etcd][etcd] ACI constructed with `acbuild` by the etc
 
 rkt uses content addressable storage (CAS) to store an ACI on disk. In this example, an image is downloaded and added to the CAS. Downloading an image before running it is not strictly necessary &ndash; if an image is not present in the store, [rkt will attempt to retrieve it][aci-discovery] &ndash; but it illustrates how rkt works.
 
-Since rkt verifies signatures by default, the first step is to [trust][signguide-establishing-trust] the [CoreOS public key][coreos-pubkey] used to sign the image, using the `rkt trust` subcommand:
+Since rkt verifies signatures by default, the first step is to [trust][signguide-establishing-trust] the [CoreOS public key][coreos-pubkey] used to sign the image, using the [`rkt trust`][rkt-trust] subcommand:
 
 #### Trusting the signing key
 
@@ -199,7 +199,7 @@ For more information, see the [detailed, step-by-step guide for the signing proc
 
 #### Fetching the ACI
 
-Now that the CoreOS public key is trusted, fetch the ACI using `rkt fetch`. This step doesn't need root privileges if the rkt host has been [configured for privilege separation][id-privsep]:
+Now that the CoreOS public key is trusted, fetch the ACI using [`rkt fetch`][rkt-fetch]. This step doesn't need root privileges if the rkt host has been [configured for privilege separation][id-privsep]:
 
 ```
 $ rkt fetch coreos.com/etcd:v2.3.7
@@ -240,7 +240,7 @@ $ sha512sum etcd-v2.3.7-linux-amd64.tar
 
 ### Running an ACI with rkt
 
-After it has been retrieved and stored locally, an ACI can be run by pointing `rkt run` at either the original image reference (in this case, `coreos.com/etcd:v2.3.7`), the ACI hash, or the full URL of the ACI. Therefore the following three examples are equivalent:
+After it has been retrieved and stored locally, an ACI can be run by pointing [`rkt run`][rkt-run] at either the original image reference (in this case, `coreos.com/etcd:v2.3.7`), the ACI hash, or the full URL of the ACI. Therefore the following three examples are equivalent:
 
 #### Running the container by ACI name and version
 
@@ -275,7 +275,7 @@ As shown above, repeating the `^]` escape character three times kills the pod an
 The escape character `^]` is generated by `Ctrl-]` on a US keyboard. The required key combination will differ on other keyboard layouts. For example, the Swedish keyboard layout uses ```Ctrl-å``` on OS X, or ```Ctrl-^``` on Windows, to generate the ```^]``` escape character.
 
 
-[acbuild]: https://github.com/appc/acbuild
+[acbuild]: https://github.com/containers/build
 [aci-archives]: https://github.com/appc/spec/blob/master/spec/aci.md#image-archives
 [aci-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md
 [appc]: app-container.md
@@ -288,6 +288,7 @@ The escape character `^]` is generated by `Ctrl-]` on a US keyboard. The require
 [distlist]: distributions.md
 [distro-pkg-help]: (https://github.com/coreos/rkt/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fdistribution++label%3Adependency%2Fexternal)
 [docker2aci]: https://github.com/appc/docker2aci
+[docker-nginx]: https://hub.docker.com/_/nginx/
 [etcd]: https://coreos.com/etcd/
 [getstart]: getting-started-guide.md
 [host-network]: networking/overview.md#host-mode
@@ -300,7 +301,11 @@ The escape character `^]` is generated by `Ctrl-]` on a US keyboard. The require
 [id-rkt-run-by-name]: #running-the-container-by-aci-name-and-version
 [id-vagrant-rkt]: #running-rkt-in-a-vagrant-virtual-machine
 [rktdocker]: running-docker-images.md
+[rkt-fetch]: subcommands/fetch.md
+[rkt-run]: subcommands/run.md
+[rkt-trust]: subcommands/trust.md
 [run-coreos]: https://coreos.com/os/docs/latest/#running-coreos
+[setup-data-dir]: https://github.com/coreos/rkt/blob/master/dist/scripts/setup-data-dir.sh
 [signguide]: signing-and-verification-guide.md
 [signguide-establishing-trust]: signing-and-verification-guide.md#establishing-trust
 [vagrant]: https://www.vagrantup.com/
diff --git a/Documentation/using-rkt-with-kubernetes.md b/Documentation/using-rkt-with-kubernetes.md
index 1d57345813..7154d98660 100644
--- a/Documentation/using-rkt-with-kubernetes.md
+++ b/Documentation/using-rkt-with-kubernetes.md
@@ -1,6 +1,6 @@
 # Using rkt with Kubernetes (aka "rktnetes")
 
-[Kubernetes](http://kubernetes.io) is a system for managing containerized applications across a cluster of machines.
+[Kubernetes][k8s] is a system for managing containerized applications across a cluster of machines.
 Kubernetes runs all applications in containers.
 In the default setup, this is performed using the Docker engine, but Kubernetes also features support for using rkt as its container runtime backend.
 This allows a Kubernetes cluster to leverage some of rkt's security features and native pod support.
@@ -16,20 +16,33 @@ The kubelet provides several flags to use rkt as the container runtime:
 - `--rkt-path=PATH_TO_RKT_BINARY` Sets the path of the rkt binary. If empty, it will search for rkt in `$PATH`.
 - `--rkt-stage1-image=STAGE1_NAME` Sets the name of the stage1 image, e.g. `coreos.com/rkt/stage1-coreos`. If not set, the default stage1 image (`coreos.com/rkt/stage1-coreos`) is used.
 
-Check the [rktnetes getting started guide](http://kubernetes.io/docs/getting-started-guides/rkt/) for information about setting up and using a rktnetes cluster.
+Check the [rktnetes getting started guide][rktnetes] for information about setting up and using a rktnetes cluster.
 
 ## Configuring rkt using supported setup tools
-The [coreos-kubernetes](https://github.com/coreos/coreos-kubernetes) and [coreos-baremetal](https://github.com/coreos/coreos-baremetal) repos both support configuring rkt as the Kubernetes runtime out of the box.
+The [coreos-kubernetes][coreos-kubernetes] and [coreos-baremetal][coreos-baremetal] repos both support configuring rkt as the Kubernetes runtime out of the box.
 
-Check out the coreos-kubernetes repo if you want to spin up a cluster on [AWS](https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html) or [locally with vagrant](https://coreos.com/kubernetes/docs/latest/kubernetes-on-vagrant-single.html). The common configuration option here is setting `CONTAINER_RUNTIME` environment variable to rkt.
+Check out the coreos-kubernetes repo if you want to spin up a cluster on [AWS][k8s-on-aws] or [locally with Vagrant][k8s-on-vagrant]. The common configuration option here is setting `CONTAINER_RUNTIME` environment variable to rkt.
 
-For baremetal, check out the Kubernetes guides [here](https://github.com/coreos/coreos-baremetal/blob/master/Documentation/kubernetes.md)
+For baremetal, check out the Kubernetes guides [here][k8s-baremetal].
 
-## Using [Minikube](https://github.com/kubernetes/minikube)
+## Using [Minikube][minikube]
 
-Minikube is a tool that makes it easy to run Kubernetes locally. It launches a single-node cluster inside a VM aimed at users looking to try out Kubernetes. Follow the instructions in the Minikube [Quickstart](https://github.com/kubernetes/minikube/blob/master/README.md#quickstart) section on how to get started with rktnetes.
+Minikube is a tool that makes it easy to run Kubernetes locally. It launches a single-node cluster inside a VM aimed at users looking to try out Kubernetes. Follow the instructions in the Minikube [Quickstart][minikube-quickstart] section on how to get started with rktnetes.
 
 ### Current Status
 
-Integration of rkt as a container runtime was officially [announced in the Kubernetes 1.3 release](http://blog.kubernetes.io/2016/07/rktnetes-brings-rkt-container-engine-to-Kubernetes.html).
-Known issues and tips for using rkt with Kubernetes can be found in the [rktnetes notes](http://kubernetes.io/docs/getting-started-guides/rkt/notes/).
+Integration of rkt as a container runtime was officially [announced in the Kubernetes 1.3 release][k8s-1.3-release].
+Known issues and tips for using rkt with Kubernetes can be found in the [rktnetes notes][rktnetes-notes].
+
+
+[coreos-baremetal]: https://github.com/coreos/coreos-baremetal
+[coreos-kubernetes]: https://github.com/coreos/coreos-kubernetes
+[k8s]: http://kubernetes.io
+[k8s-1.3-release]: http://blog.kubernetes.io/2016/07/rktnetes-brings-rkt-container-engine-to-Kubernetes.html
+[k8s-on-aws]: https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html
+[k8s-baremetal]: https://github.com/coreos/coreos-baremetal/blob/master/Documentation/kubernetes.md
+[k8s-on-vagrant]: https://coreos.com/kubernetes/docs/latest/kubernetes-on-vagrant-single.html
+[minikube]: https://github.com/kubernetes/minikube
+[minikube-quickstart]: https://github.com/kubernetes/minikube/blob/master/README.md#quickstart
+[rktnetes]: http://kubernetes.io/docs/getting-started-guides/rkt/
+[rktnetes-notes]: http://kubernetes.io/docs/getting-started-guides/rkt/notes/
diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index 19c13c5cc3..42b04d0540 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -37,7 +37,7 @@ $ systemctl status run-29486.service
                └─29539 /usr/lib/systemd/systemd-journald
 ```
 
-Since every pod is registered with `machined` with a machine name of the form `rkt-$UUID`, the systemd tools can inspect pod logs, or stop and restart pod "machines". Use the `machinectl` tool to print the list of rkt pods:
+Since every pod is registered with [`machined`][machined] with a machine name of the form `rkt-$UUID`, the systemd tools can inspect pod logs, or stop and restart pod "machines". Use the `machinectl` tool to print the list of rkt pods:
 
 ```
 $ machinectl list
@@ -81,7 +81,7 @@ If the output contains `-XZ`, journal entries will not be available.
 
 systemd inside stage1 can notify systemd on the host that it is ready, to make sure that stage1 systemd send the notification at the right time you can use the [sd_notify][sd_notify] mechanism.
 To make use of this feature, you need to set the annotation `appc.io/executor/supports-systemd-notify` to true in the image manifest whenever the app supports sd\_notify (see example manifest below).
-If you build your image with acbuild you can use the command: `acbuild annotation add appc.io/executor/supports-systemd-notify true`.
+If you build your image with [`acbuild`][acbuild] you can use the command: `acbuild annotation add appc.io/executor/supports-systemd-notify true`.
 
 ```
 {
@@ -109,9 +109,9 @@ To verify how it works, run in a terminal the command: `sudo systemd-run --unit=
 If the pod uses a stage1 image with systemd v231 (or greater), then the pod will be seen active form the host when systemd inside stage1 will reach default target.
 Instead, before it was marked as active as soon as it started.
 In this way it is possible to easily set up dependencies between pods and host services.
-Moreover, using [`SdNotify()`](https://github.com/coreos/go-systemd/blob/master/daemon/sdnotify.go) in the application it is possible to make the pod marked as ready when all the apps or a particular one is ready.
-For more information check [systemd services unit](https://www.freedesktop.org/software/systemd/man/systemd.unit.html) documentation.
-Below there is a simple example of an app using the systemd notification mechanism via [go-systemd](https://github.com/coreos/go-systemd) binding library.
+Moreover, using [`SdNotify()`][sdnotify-go] in the application it is possible to make the pod marked as ready when all the apps or a particular one is ready.
+For more information check [systemd services unit][systemd-unit] documentation.
+Below there is a simple example of an app using the systemd notification mechanism via [go-systemd][go-systemd] binding library.
 
 ```go
 package main
@@ -230,9 +230,9 @@ ExecStart=/bin/sh -c "foo ; exec rkt run ..."
 
 ### Resource restrictions (CPU, IO, Memory)
 
-`rkt` inherits resource limits configured in the systemd service unit file. The systemd documentation explains various [execution environment](https://www.freedesktop.org/software/systemd/man/systemd.exec.html), and [resource control](https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html) settings to restrict the CPU, IO, and memory resources.
+`rkt` inherits resource limits configured in the systemd service unit file. The systemd documentation explains various [execution environment][systemd.exec], and [resource control][systemd.resource-control] settings to restrict the CPU, IO, and memory resources.
 
-For example to restrict the CPU time quota, configure the corresponding [CPUQuota](https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUQuota=) setting:
+For example to restrict the CPU time quota, configure the corresponding [CPUQuota][systemd-cpuquota] setting:
 
 ```
 [Service]
@@ -246,7 +246,7 @@ CPU
 30.0
 ```
 
-Moreover to pin the rkt pod to certain CPUs, configure the corresponding [CPUAffinity](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#CPUAffinity=) setting:
+Moreover to pin the rkt pod to certain CPUs, configure the corresponding [CPUAffinity][systemd-cpuaffinity] setting:
 
 ```
 [Service]
@@ -508,12 +508,21 @@ $ systemd-cgls --all
 ```
 
 
+[acbuild]: https://github.com/containers/build
 [aci-socketActivated]: https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
+[go-systemd]: https://github.com/coreos/go-systemd
+[machined]: https://wiki.freedesktop.org/www/Software/systemd/machined/
 [systemd]: http://www.freedesktop.org/wiki/Software/systemd/
+[systemd.exec]: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
+[systemd.resource-control]: https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html
+[systemd-cpuquota]: https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUQuota=
+[systemd-cpuaffinity]: https://www.freedesktop.org/software/systemd/man/systemd.exec.html#CPUAffinity=
 [systemd-isolators]: https://github.com/appc/spec/blob/master/spec/ace.md#isolators
 [systemd-killmode-mixed]: http://www.freedesktop.org/software/systemd/man/systemd.kill.html#KillMode=
 [systemd-machined]: http://www.freedesktop.org/software/systemd/man/systemd-machined.service.html
 [systemd-run]: http://www.freedesktop.org/software/systemd/man/systemd-run.html
 [systemd-socket-activated]: http://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
 [systemd-socket-proxyd]: https://www.freedesktop.org/software/systemd/man/systemd-socket-proxyd.html
+[systemd-unit]: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
 [sd_notify]: https://www.freedesktop.org/software/systemd/man/sd_notify.html
+[sdnotify-go]: https://github.com/coreos/go-systemd/blob/master/daemon/sdnotify.go

From f147fabed9b53b081b3f53eac6e145fae7ab8dde Mon Sep 17 00:00:00 2001
From: Lukas Redynk <lukasz.redynk@intel.com>
Date: Fri, 4 Nov 2016 11:59:38 +0100
Subject: [PATCH 0847/1304] kvm: update QEMU version to 2.7.0

---
 stage1/usr_from_kvm/qemu.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/stage1/usr_from_kvm/qemu.mk b/stage1/usr_from_kvm/qemu.mk
index 07dd876ef0..fad6e97536 100644
--- a/stage1/usr_from_kvm/qemu.mk
+++ b/stage1/usr_from_kvm/qemu.mk
@@ -5,6 +5,7 @@ QEMU_BINARY := $(QEMU_SRCDIR)/x86_64-softmmu/qemu-system-x86_64
 QEMU_BIOS_BINARIES := bios-256k.bin \
     kvmvapic.bin \
     linuxboot.bin \
+    linuxboot_dma.bin \
     vgabios-stdvga.bin \
     efi-virtio.rom
 
@@ -16,9 +17,9 @@ QEMU_CONFIGURATION_OPTS := --disable-bsd-user --disable-docs --disable-guest-age
     --python=/usr/bin/python2 --disable-werror
 QEMU_ACI_BINARY := $(HV_ACIROOTFSDIR)/qemu
 
-# Using 2.6.0 stable release from official repository
+# Using 2.7.0 stable release from official repository
 QEMU_GIT := git://git.qemu-project.org/qemu.git
-QEMU_GIT_COMMIT := v2.6.1
+QEMU_GIT_COMMIT := v2.7.0
 
 $(call setup-stamp-file,QEMU_BUILD_STAMP,/build)
 $(call setup-stamp-file,QEMU_BIOS_BUILD_STAMP,/bios_build)

From c271922b8a1c731d8a47731f9b76d2a083b93ccd Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Wed, 26 Oct 2016 11:15:35 +0200
Subject: [PATCH 0848/1304] gc: don't fail if the subcgroup file doesn't exist

Fixes #2804
---
 stage1/gc/gc.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index 484762ab69..a489ae655e 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -44,7 +44,8 @@ const (
 
 var (
 	debug bool
-	log   *rktlog.Logger = rktlog.New(os.Stderr, "stage1 gc", debug)
+	log   *rktlog.Logger
+	diag  *rktlog.Logger
 )
 
 func init() {
@@ -59,6 +60,11 @@ func init() {
 func main() {
 	flag.Parse()
 
+	log, diag, _ = rktlog.NewLogSet("stage1 gc", debug)
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
+	}
+
 	podID, err := types.NewUUID(flag.Arg(0))
 	if err != nil {
 		log.Fatal("UUID is missing or malformed")
@@ -134,6 +140,10 @@ func cleanupV1Cgroups() error {
 
 	b, err := ioutil.ReadFile("subcgroup")
 	if err != nil {
+		if os.IsNotExist(err) {
+			diag.Printf("subcgroup file missing, probably a failed pod. Skipping cgroup cleanup.")
+			return nil // Probably a failed startup
+		}
 		return errwrap.Wrap(errors.New("error reading subcgroup file"), err)
 	}
 	subcgroup := string(b)

From d75546030dc31ce1ee3bf77e884fb64106977bbc Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Wed, 26 Oct 2016 12:02:49 +0200
Subject: [PATCH 0849/1304] networking/gc: don't leak namespaces when pod
 creation fails

Fixes #3114
---
 networking/networking.go | 56 ++++++++++++++++++----------------------
 networking/podenv.go     | 55 ++++++++++++++++++++++++++++++++++++---
 stage1/gc/gc.go          |  7 +++--
 3 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/networking/networking.go b/networking/networking.go
index 8d8f5b03c8..943867d81d 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -25,7 +25,6 @@ import (
 	"syscall"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/containernetworking/cni/pkg/ns"
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/hashicorp/errwrap"
 	"github.com/vishvananda/netlink"
@@ -33,8 +32,6 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/networking/netinfo"
 	"github.com/coreos/rkt/pkg/log"
-
-	"golang.org/x/sys/unix"
 )
 
 const (
@@ -74,12 +71,6 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 		return kvmSetup(podRoot, podID, fps, netList, localConfig, noDNS)
 	}
 
-	// Create namespace for Pod and write path to a file
-	podNS, err := ns.NewNS()
-	if err != nil {
-		return nil, err
-	}
-
 	// TODO(jonboulle): currently podRoot is _always_ ".", and behaviour in other
 	// circumstances is untested. This should be cleaned up.
 	n := Networking{
@@ -88,10 +79,15 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 			podID:        podID,
 			netsLoadList: netList,
 			localConfig:  localConfig,
-			podNS:        podNS,
 		},
 	}
 
+	// Create the network namespace (and save its name in a file)
+	err := n.podNSCreate()
+	if err != nil {
+		return nil, err
+	}
+
 	n.nets, err = n.loadNets()
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error loading network definitions"), err)
@@ -116,7 +112,7 @@ func Setup(podRoot string, podID types.UUID, fps []ForwardedPort, netList common
 	}
 
 	// Switch to the podNS
-	if err := podNS.Set(); err != nil {
+	if err := n.podNS.Set(); err != nil {
 		return nil, err
 	}
 
@@ -210,11 +206,10 @@ func Load(podRoot string, podID *types.UUID) (*Networking, error) {
 		podID:   *podID,
 	}
 
-	podNS, err := p.podNSLoad()
+	err = p.podNSLoad()
 	if err != nil {
 		return nil, err
 	}
-	p.podNS = podNS
 
 	return &Networking{
 		podEnv: p,
@@ -278,29 +273,13 @@ func (n *Networking) Teardown(flavor string, debug bool) {
 		stderr.PrintE("error removing forwarded ports", err)
 	}
 
-	podNS, err := n.podNSLoad()
+	err := n.podNSLoad()
 	if err != nil {
 		stderr.PrintE("error loading podNS", err)
 	}
-	if podNS != nil {
-		defer func() {
-			n.podNS.Close()
-
-			if err := syscall.Unmount(n.podNS.Path(), unix.MNT_DETACH); err != nil {
-				// if already unmounted, umount(2) returns EINVAL
-				if !os.IsNotExist(err) && err != syscall.EINVAL {
-					stderr.PrintE(fmt.Sprintf("error unmounting %q", n.podNS.Path()), err)
-				}
-			}
 
-			if err := os.RemoveAll(n.podNS.Path()); err != nil {
-				stderr.PrintE(fmt.Sprintf("failed to remove namespace %s", n.podNS.Path()), err)
-			}
-		}()
-	}
-
-	n.podNS = podNS
 	n.teardownNets(n.nets)
+	n.podNSDestroy()
 }
 
 // Save writes out the info about active nets
@@ -321,6 +300,21 @@ func (e *Networking) Save() error {
 	return netinfo.Save(e.podRoot, nis)
 }
 
+// CleanUpGarbage can be called when Load fails, but there may still
+// be some garbage lying around. Right now, this deletes the namespace.
+func CleanUpGarbage(podRoot string, podID *types.UUID) error {
+	p := podEnv{
+		podRoot: podRoot,
+		podID:   *podID,
+	}
+
+	err := p.podNSLoad()
+	if err != nil {
+		return err
+	}
+	return p.podNSDestroy()
+}
+
 func loUp() error {
 	lo, err := netlink.LinkByName("lo")
 	if err != nil {
diff --git a/networking/podenv.go b/networking/podenv.go
index 2b813a4ebd..bcd60b6fa4 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -24,6 +24,9 @@ import (
 	"path/filepath"
 	"sort"
 	"strings"
+	"syscall"
+
+	"golang.org/x/sys/unix"
 
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
@@ -99,6 +102,22 @@ func (e *podEnv) loadNets() ([]activeNet, error) {
 	return nets, nil
 }
 
+// podNSCreate creates the network namespace and saves a reference to its path.
+// NewNS will bind-mount the namespace in /run/netns, so we write that filename
+// to disk.
+func (e *podEnv) podNSCreate() error {
+	podNS, err := ns.NewNS()
+	if err != nil {
+		return err
+	}
+	e.podNS = podNS
+
+	if err := e.podNSPathSave(); err != nil {
+		return err
+	}
+	return nil
+}
+
 func (e *podEnv) podNSFilePath() string {
 	return filepath.Join(e.podRoot, "netns")
 }
@@ -127,16 +146,17 @@ func podNSerrorOK(podNSPath string, err error) bool {
 	}
 }
 
-func (e *podEnv) podNSLoad() (ns.NetNS, error) {
+func (e *podEnv) podNSLoad() error {
 	podNSPath, err := e.podNSPathLoad()
 	if err != nil && !podNSerrorOK(podNSPath, err) {
-		return nil, err
+		return err
 	} else {
 		podNS, err := ns.GetNS(podNSPath)
 		if err != nil && !podNSerrorOK(podNSPath, err) {
-			return nil, err
+			return err
 		}
-		return podNS, nil
+		e.podNS = podNS
+		return nil
 	}
 }
 
@@ -154,6 +174,33 @@ func (e *podEnv) podNSPathSave() error {
 	return nil
 }
 
+func (e *podEnv) podNSDestroy() error {
+	if e.podNS == nil {
+		return nil
+	}
+
+	// Close the namespace handle
+	// If this handle also *created* the namespace, it will delete it for us.
+	_ = e.podNS.Close()
+
+	// We still need to try and delete the namespace ourselves - no way to know
+	// if podNS.Close() did it for us.
+	// Unmount the ns bind-mount, and delete the mountpoint if successful
+
+	if err := syscall.Unmount(e.podNS.Path(), unix.MNT_DETACH); err != nil {
+		// if already unmounted, umount(2) returns EINVAL - continue
+		if !os.IsNotExist(err) && err != syscall.EINVAL {
+			return errwrap.Wrap(fmt.Errorf("error unmounting netns %q", e.podNS.Path()), err)
+		}
+	}
+	if err := os.RemoveAll(e.podNS.Path()); err != nil {
+		if !os.IsNotExist(err) {
+			return errwrap.Wrap(fmt.Errorf("failed to remove netns %s", e.podNS.Path()), err)
+		}
+	}
+	return nil
+}
+
 func (e *podEnv) netDir() string {
 	return filepath.Join(e.podRoot, "net")
 }
diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index a489ae655e..e4df5d1fda 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -102,7 +102,10 @@ func gcNetworking(podID *types.UUID) error {
 	case err == nil:
 		n.Teardown(flavor, debug)
 	case os.IsNotExist(err):
-		// probably ran with --net=host
+		// either ran with --net=host, or failed during setup
+		if err := networking.CleanUpGarbage(".", podID); err != nil {
+			diag.PrintE("failed cleaning up nework NS", err)
+		}
 	default:
 		return errwrap.Wrap(errors.New("failed loading networking state"), err)
 	}
@@ -142,7 +145,7 @@ func cleanupV1Cgroups() error {
 	if err != nil {
 		if os.IsNotExist(err) {
 			diag.Printf("subcgroup file missing, probably a failed pod. Skipping cgroup cleanup.")
-			return nil // Probably a failed startup
+			return nil
 		}
 		return errwrap.Wrap(errors.New("error reading subcgroup file"), err)
 	}

From 97d751f695dffc9ac8ef6b3ea603b2b5d9f095b5 Mon Sep 17 00:00:00 2001
From: Lukas Redynk <lukasz.redynk@intel.com>
Date: Fri, 4 Nov 2016 14:07:52 +0100
Subject: [PATCH 0850/1304] kvm: bump kernel version to 4.8.6, updated config

---
 stage1/usr_from_kvm/kernel.mk             |   2 +-
 stage1/usr_from_kvm/kernel/cutdown-config | 524 ++++++++++------------
 2 files changed, 248 insertions(+), 278 deletions(-)

diff --git a/stage1/usr_from_kvm/kernel.mk b/stage1/usr_from_kvm/kernel.mk
index e01502c97f..00548cf0ce 100644
--- a/stage1/usr_from_kvm/kernel.mk
+++ b/stage1/usr_from_kvm/kernel.mk
@@ -1,5 +1,5 @@
 # custom kernel compilation
-KERNEL_VERSION := 4.3.1
+KERNEL_VERSION := 4.8.6
 KERNEL_TMPDIR := $(UFK_TMPDIR)/kernel
 KERNEL_NAME := linux-$(KERNEL_VERSION)
 KERNEL_TARBALL := $(KERNEL_NAME).tar.xz
diff --git a/stage1/usr_from_kvm/kernel/cutdown-config b/stage1/usr_from_kvm/kernel/cutdown-config
index 24bf9e3ce2..542856bb04 100644
--- a/stage1/usr_from_kvm/kernel/cutdown-config
+++ b/stage1/usr_from_kvm/kernel/cutdown-config
@@ -1,21 +1,27 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.3.1 Kernel Configuration
+# Linux/x86 4.8.6 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
@@ -32,9 +38,9 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_64_SMP=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_DEBUG_RODATA=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
@@ -103,8 +109,9 @@ CONFIG_NO_HZ_COMMON=y
 # CONFIG_NO_HZ_IDLE is not set
 CONFIG_NO_HZ_FULL=y
 # CONFIG_NO_HZ_FULL_ALL is not set
-# CONFIG_NO_HZ_FULL_SYSIDLE is not set
-CONFIG_NO_HZ=y
+CONFIG_NO_HZ_FULL_SYSIDLE=y
+CONFIG_NO_HZ_FULL_SYSIDLE_SMALL=8
+# CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
 
 #
@@ -112,6 +119,7 @@ CONFIG_HIGH_RES_TIMERS=y
 #
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -138,32 +146,32 @@ CONFIG_RCU_NOCB_CPU_ALL=y
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=16
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_NMI_LOG_BUF_SHIFT=12
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CGROUP_PIDS is not set
-CONFIG_CGROUP_DEVICE=y
-# CONFIG_CPUSETS is not set
-CONFIG_CGROUP_CPUACCT=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
-# CONFIG_MEMCG_KMEM is not set
-# CONFIG_CGROUP_HUGETLB is not set
-CONFIG_CGROUP_PERF=y
+# CONFIG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_BLK_CGROUP is not set
-CONFIG_CHECKPOINT_RESTORE=y
+# CONFIG_CGROUP_PIDS is not set
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_HUGETLB is not set
+# CONFIG_CPUSETS is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -178,27 +186,31 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
-CONFIG_RD_XZ=y
+# CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BPF=y
-CONFIG_EXPERT=y
+# CONFIG_EXPERT is not set
 CONFIG_UID16=y
 CONFIG_MULTIUSER=y
 CONFIG_SGETMASK_SYSCALL=y
-# CONFIG_SYSFS_SYSCALL is not set
-CONFIG_SYSCTL_SYSCALL=y
-# CONFIG_KALLSYMS is not set
+CONFIG_SYSFS_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
-# CONFIG_BUG is not set
+CONFIG_PRINTK_NMI=y
+CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-# CONFIG_PCSPKR_PLATFORM is not set
+CONFIG_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -210,7 +222,7 @@ CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
 # CONFIG_USERFAULTFD is not set
-# CONFIG_PCI_QUIRKS is not set
+CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
@@ -219,18 +231,18 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_SYSTEM_DATA_VERIFICATION=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
+# CONFIG_SYSTEM_DATA_VERIFICATION is not set
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
 # CONFIG_UPROBES is not set
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -240,8 +252,8 @@ CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_NMI=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
@@ -261,11 +273,14 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 CONFIG_HAVE_CC_STACKPROTECTOR=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CC_STACKPROTECTOR_NONE is not set
 CONFIG_CC_STACKPROTECTOR_REGULAR=y
 # CONFIG_CC_STACKPROTECTOR_STRONG is not set
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -275,9 +290,18 @@ CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
 CONFIG_HAVE_COPY_THREAD_TLS=y
+CONFIG_HAVE_STACK_VALIDATION=y
+# CONFIG_HAVE_ARCH_HASH is not set
+# CONFIG_ISA_BUS_API is not set
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
+# CONFIG_CPU_NO_EFFICIENT_FFS is not set
 
 #
 # GCOV-based kernel profiling
@@ -295,17 +319,9 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_SIG_FORCE is not set
-# CONFIG_MODULE_SIG_ALL is not set
-# CONFIG_MODULE_SIG_SHA1 is not set
-# CONFIG_MODULE_SIG_SHA224 is not set
-# CONFIG_MODULE_SIG_SHA256 is not set
-# CONFIG_MODULE_SIG_SHA384 is not set
-# CONFIG_MODULE_SIG_SHA512 is not set
-# CONFIG_MODULE_SIG_HASH is not set
 # CONFIG_MODULE_COMPRESS is not set
+CONFIG_TRIM_UNUSED_KSYMS=y
 CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_BSGLIB is not set
@@ -370,16 +386,17 @@ CONFIG_FREEZER=y
 CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_FAST_FEATURE_TESTS=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_IOSF_MBI=m
-# CONFIG_IOSF_MBI_DEBUG is not set
+# CONFIG_IOSF_MBI is not set
 # CONFIG_SCHED_OMIT_FRAME_POINTER is not set
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_PARAVIRT_SPINLOCKS=y
+# CONFIG_QUEUED_LOCK_STAT is not set
 # CONFIG_XEN is not set
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -401,17 +418,16 @@ CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_PROCESSOR_SELECT=y
 CONFIG_CPU_SUP_INTEL=y
-# CONFIG_CPU_SUP_AMD is not set
-# CONFIG_CPU_SUP_CENTAUR is not set
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
+# CONFIG_GART_IOMMU is not set
 # CONFIG_CALGARY_IOMMU is not set
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
-# CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=24
 # CONFIG_SCHED_SMT is not set
 CONFIG_SCHED_MC=y
@@ -422,6 +438,14 @@ CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
 # CONFIG_X86_MCE is not set
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=y
+CONFIG_PERF_EVENTS_INTEL_CSTATE=y
+# CONFIG_PERF_EVENTS_AMD_POWER is not set
 # CONFIG_VM86 is not set
 CONFIG_X86_16BIT=y
 CONFIG_X86_ESPFIX64=y
@@ -451,7 +475,6 @@ CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 # CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_MEMORY_BALLOON=y
@@ -460,18 +483,17 @@ CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_KSM=y
+# CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 # CONFIG_CLEANCACHE is not set
 # CONFIG_FRONTSWAP is not set
 # CONFIG_CMA is not set
-# CONFIG_MEM_SOFT_DIRTY is not set
 # CONFIG_ZPOOL is not set
 # CONFIG_ZBUD is not set
 # CONFIG_ZSMALLOC is not set
@@ -486,10 +508,12 @@ CONFIG_MTRR=y
 CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-# CONFIG_X86_PAT is not set
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
 # CONFIG_X86_INTEL_MPX is not set
+# CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
@@ -500,7 +524,7 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x100000
+CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
 # CONFIG_RANDOMIZE_BASE is not set
 CONFIG_PHYSICAL_ALIGN=0x1000000
@@ -508,6 +532,9 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
+# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
+# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y
@@ -531,7 +558,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 # CPU Idle
 #
 CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
+CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 # CONFIG_INTEL_IDLE is not set
@@ -547,12 +574,10 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_PCI=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
-# CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_HT_IRQ is not set
@@ -560,13 +585,15 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 CONFIG_PCI_LABEL=y
+# CONFIG_HOTPLUG_PCI is not set
 
 #
 # PCI host controller drivers
 #
-# CONFIG_ISA_DMA_API is not set
+# CONFIG_PCIE_DW_PLAT is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
 # CONFIG_PCCARD is not set
-# CONFIG_HOTPLUG_PCI is not set
 # CONFIG_RAPIDIO is not set
 # CONFIG_X86_SYSFB is not set
 
@@ -575,6 +602,7 @@ CONFIG_PCI_LABEL=y
 #
 CONFIG_BINFMT_ELF=y
 CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
@@ -589,6 +617,7 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_KEYS_COMPAT=y
 CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_PMC_ATOM=y
+# CONFIG_VMD is not set
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 
@@ -633,10 +662,10 @@ CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_DIAG_DESTROY is not set
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -645,6 +674,7 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_CONG_HSTCP is not set
 # CONFIG_TCP_CONG_HYBLA is not set
 # CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_NV is not set
 # CONFIG_TCP_CONG_SCALABLE is not set
 # CONFIG_TCP_CONG_LP is not set
 # CONFIG_TCP_CONG_VENO is not set
@@ -675,7 +705,8 @@ CONFIG_IPV6_SIT=y
 # CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_GRE is not set
+# CONFIG_IPV6_FOU is not set
+# CONFIG_IPV6_FOU_TUNNEL is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
@@ -720,7 +751,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=y
 CONFIG_NF_CT_NETLINK_TIMEOUT=y
-# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
+# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
 CONFIG_NF_NAT=y
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_PROTO_DCCP=y
@@ -876,7 +907,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 # CONFIG_NF_DEFRAG_IPV6 is not set
 # CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_DUP_IPV6 is not set
+CONFIG_NF_DUP_IPV6=m
 # CONFIG_NF_REJECT_IPV6 is not set
 CONFIG_NF_LOG_IPV6=m
 # CONFIG_IP6_NF_IPTABLES is not set
@@ -951,6 +982,7 @@ CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=y
 # CONFIG_NET_CLS_BPF is not set
 # CONFIG_NET_CLS_FLOWER is not set
+# CONFIG_NET_CLS_MATCHALL is not set
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 # CONFIG_NET_EMATCH_CMP is not set
@@ -967,14 +999,18 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_OPENVSWITCH is not set
 CONFIG_VSOCKETS=y
-# CONFIG_NETLINK_MMAP is not set
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
 # CONFIG_NETLINK_DIAG is not set
 # CONFIG_MPLS is not set
 # CONFIG_HSR is not set
 # CONFIG_NET_SWITCHDEV is not set
+# CONFIG_NET_L3_MASTER_DEV is not set
+# CONFIG_NET_NCSI is not set
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+CONFIG_SOCK_CGROUP_DATA=y
 # CONFIG_CGROUP_NET_PRIO is not set
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
@@ -991,6 +1027,7 @@ CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
+# CONFIG_AF_KCM is not set
 # CONFIG_WIRELESS is not set
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
@@ -1001,7 +1038,10 @@ CONFIG_NET_9P_VIRTIO=y
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
 # CONFIG_LWTUNNEL is not set
-CONFIG_HAVE_BPF_JIT=y
+CONFIG_DST_CACHE=y
+# CONFIG_NET_DEVLINK is not set
+CONFIG_MAY_USE_DEVLINK=y
+CONFIG_HAVE_EBPF_JIT=y
 
 #
 # Device Drivers
@@ -1020,8 +1060,6 @@ CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_DEVRES=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
@@ -1038,6 +1076,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
+# CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -1048,20 +1087,19 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=y
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NVME is not set
 # CONFIG_BLK_DEV_SKD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_RAM_DAX=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_VIRTIO_BLK=y
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
-CONFIG_BLK_DEV_PLKVM=y
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_NVME_TARGET is not set
 
 #
 # Misc devices
@@ -1074,7 +1112,6 @@ CONFIG_BLK_DEV_PLKVM=y
 # CONFIG_TIFM_CORE is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_HP_ILO is not set
-# CONFIG_VMWARE_BALLOON is not set
 # CONFIG_SRAM is not set
 # CONFIG_C2PORT is not set
 
@@ -1091,6 +1128,9 @@ CONFIG_EEPROM_93CX6=m
 #
 # Altera FPGA firmware download module
 #
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MEI_TXE is not set
 # CONFIG_VMWARE_VMCI is not set
 
 #
@@ -1103,6 +1143,11 @@ CONFIG_EEPROM_93CX6=m
 #
 # CONFIG_SCIF_BUS is not set
 
+#
+# VOP Bus Driver
+#
+# CONFIG_VOP_BUS is not set
+
 #
 # Intel MIC Host Driver
 #
@@ -1114,11 +1159,18 @@ CONFIG_EEPROM_93CX6=m
 #
 # SCIF Driver
 #
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+
+#
+# VOP Driver
+#
 # CONFIG_GENWQE is not set
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
-# CONFIG_CXL_KERNEL_API is not set
-# CONFIG_CXL_EEH is not set
+# CONFIG_CXL_AFU_DRIVER_OPS is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1136,12 +1188,12 @@ CONFIG_MD=y
 # CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_MQ_DEFAULT is not set
+CONFIG_DM_MQ_DEFAULT=y
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=y
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_BIO_PRISON=y
 CONFIG_DM_PERSISTENT_DATA=y
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 # CONFIG_DM_CRYPT is not set
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_THIN_PROVISIONING=y
@@ -1171,16 +1223,16 @@ CONFIG_NET_CORE=y
 # CONFIG_DUMMY is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_TEAM is not set
-CONFIG_MACVLAN=y
-CONFIG_MACVTAP=y
+# CONFIG_MACVLAN is not set
 # CONFIG_IPVLAN is not set
 # CONFIG_VXLAN is not set
+# CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_TUN=y
+# CONFIG_TUN is not set
 # CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=y
+# CONFIG_VETH is not set
 CONFIG_VIRTIO_NET=y
 # CONFIG_NLMON is not set
 # CONFIG_ARCNET is not set
@@ -1188,103 +1240,14 @@ CONFIG_VIRTIO_NET=y
 #
 # CAIF transport drivers
 #
-# CONFIG_VHOST_NET is not set
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 #
 # Distributed Switch Architecture drivers
 #
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_ALTERA_TSE is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_CX_ECAT is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_IP1000 is not set
-# CONFIG_JME is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_ETHOC is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_SFC is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_ETHERNET is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AT803X_PHY is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BCM7XXX_PHY=m
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-CONFIG_FIXED_PHY=m
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_OCTEON is not set
-CONFIG_MDIO_BCM_UNIMAC=m
+# CONFIG_PHYLIB is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 
@@ -1299,6 +1262,7 @@ CONFIG_MDIO_BCM_UNIMAC=m
 # CONFIG_WAN is not set
 # CONFIG_VMXNET3 is not set
 # CONFIG_ISDN is not set
+# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -1335,9 +1299,11 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_UINPUT=m
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_CMA3000 is not set
+# CONFIG_RMI4_CORE is not set
 
 #
 # Hardware I/O ports
@@ -1353,6 +1319,7 @@ CONFIG_SERIO_RAW=y
 # CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_USERIO is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -1365,7 +1332,6 @@ CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_NOZOMI is not set
@@ -1390,7 +1356,6 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
-CONFIG_TTY_PRINTK=y
 CONFIG_HVC_DRIVER=y
 CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_IPMI_HANDLER is not set
@@ -1424,6 +1389,7 @@ CONFIG_DEVPORT=y
 #
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
+# CONFIG_NTP_PPS is not set
 
 #
 # PPS clients support
@@ -1444,10 +1410,10 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_GPIOLIB is not set
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_RESET is not set
 # CONFIG_POWER_AVS is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
@@ -1492,9 +1458,14 @@ CONFIG_LPC_ICH=m
 # Graphics support
 #
 # CONFIG_AGP is not set
-# CONFIG_VGA_ARB is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_DRM is not set
 
+#
+# ACP (Audio CoProcessor) Configuration
+#
+
 #
 # Frame buffer Devices
 #
@@ -1532,12 +1503,14 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CMEDIA is not set
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
 # CONFIG_HID_ELECOM is not set
 # CONFIG_HID_EZKEY is not set
 # CONFIG_HID_GEMBIRD is not set
+# CONFIG_HID_GFRM is not set
 # CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_WALTOP is not set
@@ -1574,6 +1547,7 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
 # CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_ALPS is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_UWB is not set
@@ -1586,6 +1560,7 @@ CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 # CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
 # CONFIG_RTC_SYSTOHC is not set
@@ -1600,10 +1575,18 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 # CONFIG_RTC_DRV_TEST is not set
 
+#
+# I2C RTC drivers
+#
+
 #
 # SPI RTC drivers
 #
 
+#
+# SPI and I2C RTC drivers
+#
+
 #
 # Platform RTC drivers
 #
@@ -1631,6 +1614,11 @@ CONFIG_RTC_DRV_CMOS=y
 # HID Sensor RTC drivers
 #
 # CONFIG_DMADEVICES is not set
+
+#
+# DMABUF options
+#
+# CONFIG_SYNC_FILE is not set
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 CONFIG_VIRT_DRIVERS=y
@@ -1642,7 +1630,7 @@ CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_BALLOON=y
-# CONFIG_VIRTIO_INPUT is not set
+CONFIG_VIRTIO_INPUT=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 
@@ -1652,8 +1640,9 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 # CONFIG_STAGING is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 # CONFIG_SENSORS_HDAPS is not set
+# CONFIG_INTEL_PMC_CORE is not set
 # CONFIG_IBM_RTL is not set
-# CONFIG_INTEL_PMC_IPC is not set
+# CONFIG_INTEL_PUNIT_IPC is not set
 # CONFIG_CHROME_PLATFORMS is not set
 
 #
@@ -1664,6 +1653,7 @@ CONFIG_X86_PLATFORM_DEVICES=y
 # Clock Source drivers
 #
 CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
 # CONFIG_ATMEL_PIT is not set
 # CONFIG_SH_TIMER_CMT is not set
@@ -1685,6 +1675,10 @@ CONFIG_CLKBLD_I8253=y
 #
 # SOC (System On Chip) specific Drivers
 #
+
+#
+# Broadcom SoC drivers
+#
 # CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
 # CONFIG_PM_DEVFREQ is not set
@@ -1694,6 +1688,7 @@ CONFIG_CLKBLD_I8253=y
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
+CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
 # CONFIG_FMC is not set
@@ -1719,7 +1714,15 @@ CONFIG_CLKBLD_I8253=y
 #
 # CONFIG_ANDROID is not set
 # CONFIG_LIBNVDIMM is not set
+# CONFIG_DEV_DAX is not set
 # CONFIG_NVMEM is not set
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
 
 #
 # Firmware Drivers
@@ -1731,28 +1734,29 @@ CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_FW_CFG_SYSFS=y
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-# CONFIG_EXT2_FS_POSIX_ACL is not set
-# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_ENCRYPTION is not set
 # CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
+CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=y
+CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_RT is not set
@@ -1760,13 +1764,21 @@ CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
+CONFIG_BTRFS_FS=m
+# CONFIG_BTRFS_FS_POSIX_ACL is not set
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_F2FS_FS is not set
-CONFIG_FS_DAX=y
+# CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
+# CONFIG_EXPORTFS_BLOCK_OPS is not set
 CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -1815,6 +1827,7 @@ CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ECRYPT_FS is not set
@@ -1833,10 +1846,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-CONFIG_PSTORE_RAM=m
+# CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -1913,84 +1923,54 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 #
 CONFIG_PRINTK_TIME=y
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
 
 #
 # Compile-time checks and compiler options
 #
-# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_PAGE_OWNER is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_SECTION_MISMATCH=y
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_STACK_VALIDATION is not set
 # CONFIG_MAGIC_SYSRQ is not set
-CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KERNEL is not set
 
 #
 # Memory Debugging
 #
 # CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_PAGE_POISONING is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_HAVE_ARCH_KASAN=y
-# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_KASAN is not set
+CONFIG_ARCH_HAS_KCOV=y
+# CONFIG_KCOV is not set
 
 #
 # Debug Lockups and Hangs
 #
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
-# CONFIG_SCHED_DEBUG is not set
 CONFIG_SCHED_INFO=y
-# CONFIG_SCHEDSTATS is not set
-CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_TIMER_STATS is not set
 
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PI_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 
 #
 # RCU Debugging
@@ -1998,16 +1978,7 @@ CONFIG_STACKTRACE=y
 # CONFIG_PROVE_RCU is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_TORTURE_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -2025,16 +1996,15 @@ CONFIG_TRACING_SUPPORT=y
 # Runtime Testing
 #
 # CONFIG_LKDTM is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
@@ -2046,18 +2016,19 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
+CONFIG_X86_PTDUMP_CORE=y
 # CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_DEBUG_WX=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
-# CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_IO_DELAY_TYPE_0X80=0
@@ -2069,13 +2040,7 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IO_DELAY_NONE is not set
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
-CONFIG_DEBUG_BOOT_PARAMS=y
-# CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_ENTRY is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-# CONFIG_X86_DEBUG_FPU is not set
 # CONFIG_PUNIT_ATOM_DEBUG is not set
 
 #
@@ -2085,17 +2050,21 @@ CONFIG_KEYS=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
-# CONFIG_CRYPTO_FIPS is not set
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
@@ -2107,10 +2076,12 @@ CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
 # CONFIG_CRYPTO_RSA is not set
+# CONFIG_CRYPTO_DH is not set
+# CONFIG_CRYPTO_ECDH is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
@@ -2146,6 +2117,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_LRW=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=y
+# CONFIG_CRYPTO_KEYWRAP is not set
 
 #
 # Hash modes
@@ -2178,8 +2150,11 @@ CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA1_MB=m
+CONFIG_CRYPTO_SHA256_MB=m
+CONFIG_CRYPTO_SHA512_MB=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 # CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
@@ -2228,7 +2203,6 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
 # CONFIG_CRYPTO_LZO is not set
 # CONFIG_CRYPTO_842 is not set
 # CONFIG_CRYPTO_LZ4 is not set
@@ -2253,27 +2227,24 @@ CONFIG_CRYPTO_HASH_INFO=y
 # CONFIG_CRYPTO_HW is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_PUBLIC_KEY_ALGO_RSA=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 
 #
 # Certificates for signature checking
 #
-CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 CONFIG_HAVE_KVM=y
-CONFIG_KVM_COMPAT=y
-CONFIG_VIRTUALIZATION=y
-# CONFIG_KVM is not set
+# CONFIG_VIRTUALIZATION is not set
 # CONFIG_BINARY_PRINTF is not set
 
 #
 # Library routines
 #
+CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 # CONFIG_HAVE_ARCH_BITREVERSE is not set
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
@@ -2301,27 +2272,24 @@ CONFIG_LIBCRC32C=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
-# CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_IA64 is not set
-# CONFIG_XZ_DEC_ARM is not set
-# CONFIG_XZ_DEC_ARMTHUMB is not set
-# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
+CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
@@ -2333,9 +2301,11 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_CLZ_TAB=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
+# CONFIG_IRQ_POLL is not set
 CONFIG_MPILIB=y
 CONFIG_OID_REGISTRY=y
 # CONFIG_SG_SPLIT is not set
+# CONFIG_SG_POOL is not set
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_MMIO_FLUSH=y

From ee41e22b60d55c5712894e077e01dfac33b8df71 Mon Sep 17 00:00:00 2001
From: Lucas Amorim <lucasamorim@protonmail.com>
Date: Fri, 28 Oct 2016 17:59:38 -0700
Subject: [PATCH 0851/1304] stage0/image: list images output in JSON format

These changes add the option of printing the image list in json and
json-pretty format. Now you can specify the output format when listing
images:
  rkt image list --format=json
  rkt image list --format=json-pretty

Fixes #3298
---
 rkt/image_list.go | 176 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 124 insertions(+), 52 deletions(-)

diff --git a/rkt/image_list.go b/rkt/image_list.go
index 4223db5365..b2aa7edcbd 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -78,6 +78,59 @@ var (
 	}
 )
 
+type printedImage struct {
+	ID         string `json:"id"`
+	Name       string `json:"name"`
+	ImportTime string `json:"import_time"`
+	LastUsed   string `json:"last_used"`
+	Size       string `json:"size"`
+}
+
+func (r *printedImage) attributes() []string {
+	return []string{r.ID, r.Name, r.Size, r.ImportTime, r.LastUsed}
+}
+
+func (r *printedImage) printableString() string {
+	return strings.Join(r.attributes(), "\t")
+}
+
+type outputFormat int
+
+const (
+	outputFormatTabbed = iota
+	outputFormatJSON
+	outputFormatPrettyJSON
+)
+
+func (e *outputFormat) Set(s string) error {
+	switch s {
+	case "":
+		*e = outputFormatTabbed
+	case "json":
+		*e = outputFormatJSON
+	case "json-pretty":
+		*e = outputFormatPrettyJSON
+	default:
+		return fmt.Errorf("Invalid format option: %s", s)
+	}
+	return nil
+}
+
+func (s *outputFormat) String() string {
+	switch int(*s) {
+	case outputFormatJSON:
+		return "json"
+	case outputFormatPrettyJSON:
+		return "json-pretty"
+	default:
+		return ""
+	}
+}
+
+func (s *outputFormat) Type() string {
+	return "outputFormat"
+}
+
 type ImagesSortAsc bool
 
 func (isa *ImagesSortAsc) Set(s string) error {
@@ -113,6 +166,7 @@ var (
 	flagImagesFields     *rktflag.OptionList
 	flagImagesSortFields *rktflag.OptionList
 	flagImagesSortAsc    ImagesSortAsc
+	flagImageFormat      outputFormat
 )
 
 func init() {
@@ -140,6 +194,7 @@ func init() {
 	cmdImageList.Flags().Var(&flagImagesSortAsc, "order", `choose the sorting order if at least one sort field is provided (--sort). Accepted values: "asc", "desc"`)
 	cmdImageList.Flags().BoolVar(&flagNoLegend, "no-legend", false, "suppress a legend with the list")
 	cmdImageList.Flags().BoolVar(&flagFullOutput, "full", false, "use long output format")
+	cmdImageList.Flags().Var(&flagImageFormat, "format", fmt.Sprintf("choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs"))
 }
 
 func runImages(cmd *cobra.Command, args []string) int {
@@ -147,14 +202,6 @@ func runImages(cmd *cobra.Command, args []string) int {
 	tabBuffer := new(bytes.Buffer)
 	tabOut := getTabOutWithWriter(tabBuffer)
 
-	if !flagNoLegend {
-		var headerFields []string
-		for _, f := range flagImagesFields.Options {
-			headerFields = append(headerFields, ImagesFieldHeaderMap[f])
-		}
-		fmt.Fprintf(tabOut, "%s\n", strings.Join(headerFields, "\t"))
-	}
-
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
@@ -182,6 +229,8 @@ func runImages(cmd *cobra.Command, args []string) int {
 		return 254
 	}
 
+	var imagesToPrint []printedImage
+
 	for _, aciInfo := range aciInfos {
 		imj, err := s.GetImageManifestJSON(aciInfo.BlobKey)
 		if err != nil {
@@ -194,52 +243,64 @@ func runImages(cmd *cobra.Command, args []string) int {
 			continue
 		}
 		version, ok := im.Labels.Get("version")
-		var fieldValues []string
-		for _, f := range flagImagesFields.Options {
-			fieldValue := ""
-			switch f {
-			case l(id):
-				hashKey := aciInfo.BlobKey
-				if !flagFullOutput {
-					// The short hash form is [HASH_ALGO]-[FIRST 12 CHAR]
-					// For example, sha512-123456789012
-					pos := strings.Index(hashKey, "-")
-					trimLength := pos + 13
-					if pos > 0 && trimLength < len(hashKey) {
-						hashKey = hashKey[:trimLength]
-					}
-				}
-				fieldValue = hashKey
-			case l(name):
-				fieldValue = aciInfo.Name
-				if ok {
-					fieldValue = fmt.Sprintf("%s:%s", fieldValue, version)
-				}
-			case l(importTime):
-				if flagFullOutput {
-					fieldValue = aciInfo.ImportTime.Format(defaultTimeLayout)
-				} else {
-					fieldValue = humanize.Time(aciInfo.ImportTime)
-				}
-			case l(lastUsed):
-				if flagFullOutput {
-					fieldValue = aciInfo.LastUsed.Format(defaultTimeLayout)
-				} else {
-					fieldValue = humanize.Time(aciInfo.LastUsed)
-				}
-			case l(size):
-				totalSize := aciInfo.Size + aciInfo.TreeStoreSize
-				if flagFullOutput {
-					fieldValue = fmt.Sprintf("%d", totalSize)
-				} else {
-					fieldValue = humanize.IBytes(uint64(totalSize))
-				}
-			case l(latest):
-				fieldValue = fmt.Sprintf("%t", aciInfo.Latest)
+
+		imageID := aciInfo.BlobKey
+		imageName := aciInfo.Name
+		if ok {
+			imageName = fmt.Sprintf("%s:%s", imageName, version)
+		}
+
+		totalSize := aciInfo.Size + aciInfo.TreeStoreSize
+
+		imageImportTime := humanize.Time(aciInfo.ImportTime)
+		imageLastUsed := humanize.Time(aciInfo.LastUsed)
+		imageSize := humanize.IBytes(uint64(totalSize))
+
+		if flagImageFormat != outputFormatTabbed || flagFullOutput {
+			imageImportTime = aciInfo.ImportTime.Format(defaultTimeLayout)
+			imageLastUsed = aciInfo.LastUsed.Format(defaultTimeLayout)
+			imageSize = fmt.Sprintf("%d", totalSize)
+		}
+
+		if !flagFullOutput && flagImageFormat == outputFormatTabbed {
+			imageID = trimImageID(imageID)
+		}
+
+		imagesToPrint = append(imagesToPrint, printedImage{
+			ID:         imageID,
+			Name:       imageName,
+			ImportTime: imageImportTime,
+			LastUsed:   imageLastUsed,
+			Size:       imageSize,
+		})
+	}
+
+	switch flagImageFormat {
+	case outputFormatTabbed:
+		if !flagNoLegend {
+			var headerFields []string
+			for _, f := range flagImagesFields.Options {
+				headerFields = append(headerFields, ImagesFieldHeaderMap[f])
 			}
-			fieldValues = append(fieldValues, fieldValue)
+			fmt.Fprintf(tabOut, "%s\n", strings.Join(headerFields, "\t"))
+		}
+		for _, image := range imagesToPrint {
+			fmt.Fprintf(tabOut, "%s\n", image.printableString())
+		}
+	case outputFormatJSON:
+		result, err := json.Marshal(imagesToPrint)
+		if err != nil {
+			errors = append(errors, err)
+		} else {
+			fmt.Fprintf(tabOut, "%s\n", result)
+		}
+	case outputFormatPrettyJSON:
+		result, err := json.MarshalIndent(imagesToPrint, "", "\t")
+		if err != nil {
+			errors = append(errors, err)
+		} else {
+			fmt.Fprintf(tabOut, "%s\n", result)
 		}
-		fmt.Fprintf(tabOut, "%s\n", strings.Join(fieldValues, "\t"))
 	}
 
 	if len(errors) > 0 {
@@ -251,6 +312,17 @@ func runImages(cmd *cobra.Command, args []string) int {
 	return 0
 }
 
+func trimImageID(imageID string) string {
+	// The short hash form is [HASH_ALGO]-[FIRST 12 CHAR]
+	// For example, sha512-123456789012
+	pos := strings.Index(imageID, "-")
+	trimLength := pos + 13
+	if pos > 0 && trimLength < len(imageID) {
+		imageID = imageID[:trimLength]
+	}
+	return imageID
+}
+
 func newImgListLoadError(err error, imj []byte, blobKey string) error {
 	var lines []string
 	im := lastditch.ImageManifest{}

From 7dd24cfe16641d5b5b37ac7a1129e2c296f331f1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Sun, 6 Nov 2016 22:00:56 +0000
Subject: [PATCH 0852/1304] stage1: document experimental interface v5

This commit introduces and unifies "crossing entrypoints"
for app and attach commands, defining an experimental
interface v5 (yet to be finalized).
---
 .../devel/stage1-implementors-guide.md        | 90 ++++++++++++++++---
 common/common.go                              |  7 ++
 stage0/app.go                                 | 89 +++---------------
 stage0/common.go                              | 74 +++++++++++++++
 stage1/app-add/app-add.go                     | 16 ++--
 stage1/app-rm/app-rm.go                       | 22 +++--
 stage1/app-start/app-start.go                 | 14 +--
 stage1/app-stop/app-stop.go                   | 19 ++--
 stage1/common/run.go                          | 18 ++++
 9 files changed, 221 insertions(+), 128 deletions(-)
 create mode 100644 stage0/common.go

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index a5cd3241ae..0dc3679d3f 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -90,6 +90,12 @@ Any stage1 that supports and expects machined registration to occur will likely
 	`resolv.conf` is to create /etc/rkt-resolv.conf iff a CNI plugin specifies it, and for `hosts` is to create 
 	a fallback if the app does not provide it.
 
+#### Arguments added in interface version 5 (experimental)
+
+This interface version is not yet finalized, thus marked as experimental.
+
+* `--mutable` to run a mutable pod
+
 ### rkt enter
 
 `coreos.com/rkt/stage1/enter`
@@ -139,15 +145,27 @@ In the bundled rkt stage 1, the entrypoint is sending SIGTERM signal to systemd-
 * `--force` to force the stopping of the pod. E.g. in the bundled rkt stage 1, stop sends SIGKILL
 * UUID of the pod
 
+## Crossing Entrypoints
+
+Some entrypoints need to perform actions in the context of stage1 or stage2. As such they need to cross stage boundaries (thus the name) and depend on the `enter` entrypoint existence. All crossing entrypoints receive additional options for entering via the following environmental flags:
+
+* `RKT_STAGE1_ENTERCMD` specify the command to be called to enter a stage1 or a stage2 environment
+* `RKT_STAGE1_ENTERPID` specify the PID of the stage1 to enter
+* `RKT_STAGE1_ENTERAPP` optionally specify the application name of the stage2 to enter
+
 ### rkt app add
 
+(Experimental, to be stabilized in version 5)
+
 `coreos.com/rkt/stage1/app/add`
 
-#### Arguments
+This is a crossing entrypoint.
 
-`start $OPTIONS UUID APPNAME ENTERENTRYPOINT PID`
+#### Arguments
 
+* `--app` application name
 * `--debug` to activate debugging
+* `--uuid` UUID of the pod
 * `--disable-capabilities-restriction` gives all capabilities to apps (overrides `retain-set` and `remove-set`)
 * `--disable-paths` disables inaccessible and read-only paths (such as `/proc/sysrq-trigger`)
 * `--disable-seccomp` disables seccomp (overrides `retain-set` and `remove-set`)
@@ -155,49 +173,69 @@ In the bundled rkt stage 1, the entrypoint is sending SIGTERM signal to systemd-
 
 ### rkt app start
 
+(Experimental, to be stabilized in version 5)
+
 `coreos.com/rkt/stage1/app/start`
 
-#### Arguments
+This is a crossing entrypoint.
 
-`start $OPTIONS UUID APPNAME ENTERENTRYPOINT PID`
+#### Arguments
 
+* `--app` application name
 * `--debug` to activate debugging
 
 ### rkt app stop
 
+(Experimental, to be stabilized in version 5)
+
 `coreos.com/rkt/stage1/app/stop`
 
-#### Arguments
+This is a crossing entrypoint.
 
-`stop $OPTIONS UUID APPNAME ENTERENTRYPOINT PID`
+#### Arguments
 
+* `--app` application name
 * `--debug` to activate debugging
 
 ### rkt app rm
 
+(Experimental, to be stabilized in version 5)
+
 `coreos.com/rkt/stage1/app/rm`
 
-#### Arguments
+This is a crossing entrypoint.
 
-`rm $OPTIONS UUID APPNAME ENTERENTRYPOINT PID`
+#### Arguments
 
+* `--app` application name
 * `--debug` to activate debugging
 
-## Metadata
+### rkt attach
 
-### Mutable pods
+(Experimental, to be stabilized in version 5)
 
-Stage1 images can support mutable pod environments, where, once a pod has been started, applications can be added/started/stopped/removed while the actual pod is running. This information is persisted at runtime in the pod manifest using the `coreos.com/rkt/stage1/mutable` annotation.
+`coreos.com/rkt/stage1/attach`
 
-If the annotation is not present, `false` is assumed.
+This is a crossing entrypoint.
+
+#### Arguments
+
+* `--action` action to perform (`auto-attach`, `custom-attach` or `list`)
+* `--app` application name
+* `--debug` to activate debugging
+* `--tty-in` whether to attach TTY input (`true` or `false`)
+* `--tty-out` whether to attach TTY output (`true` or `false`)
+* `--stdin` whether to attach stdin (`true` or `false`)
+* `--stdout` whether to attach stdout (`true` or `false`)
+* `--stderr` whether to attach stderr (`true` or `false`)
+
+## Stage1 Metadata
 
 ### Versioning
 
 The stage1 command line interface is versioned using an annotation with the name `coreos.com/rkt/stage1/interface-version`.
 If the annotation is not present, rkt assumes the version is 1.
 
-The current version of the stage1 interface is 3.
-
 ## Examples
 
 ### Stage1 ACI manifest
@@ -246,6 +284,24 @@ The current version of the stage1 interface is 3.
 }
 ```
 
+## Runtime Metadata
+
+Pods and applications can be annotated at runtime to signal support for specific features.
+
+### Mutable pods (experimental v5)
+
+Stage1 images can support mutable pod environments, where, once a pod has been started, applications can be added/started/stopped/removed while the actual pod is running. This information is persisted at runtime in the pod manifest using the `coreos.com/rkt/stage1/mutable` annotation.
+
+If the annotation is not present, `false` is assumed.
+
+### Attachable applications (experimental v5)
+
+Stage1 images can support attachable applications, where I/O and TTY from each applications can be dynamically redirected and attached to.
+In that case, this information is persisted at runtime in each application manifest using the following annotations:
+ - `coreos.com/rkt/stage2/stdin`
+ - `coreos.com/rkt/stage2/stdout`
+ - `coreos.com/rkt/stage2/stderr`
+
 ## Filesystem Layout Assumptions
 
 The following paths are reserved for the stage1 image, and they will be created during stage0.
@@ -275,5 +331,11 @@ Later the exit status can be retrieved and shown by `rkt status $uuid`.
 This directory path is used for passing environment variables to each app.
 For example, environment variables for an app named `foo` will be stored in `rkt/env/foo`.
 
+### iottymux (experimental v5)
+
+`rkt/iottymux`
+
+This directory path is used for TTY and streaming attach helper.
+When attach mode is enabled each application will have a `rkt/iottymux/$appname/` directory, used by the I/O and TTY mux sidecar.
 
 [rkt-networking]: ../networking/overview.md
diff --git a/common/common.go b/common/common.go
index 7bb86077a2..143f64358f 100644
--- a/common/common.go
+++ b/common/common.go
@@ -67,6 +67,13 @@ const (
 	// Default perm bits for the regular directories
 	// within the stage1 directory.
 	DefaultRegularDirPerm = os.FileMode(0750)
+
+	// Enter command for crossing entrypoints.
+	CrossingEnterCmd = "RKT_STAGE1_ENTERCMD"
+	// Stage1 (PID) to enter, used by crossing entrypoints.
+	CrossingEnterPID = "RKT_STAGE1_ENTERPID"
+	// Stage2 (application name) to enter, optionally used by crossing entrypoints.
+	CrossingEnterApp = "RKT_STAGE1_ENTERAPP"
 )
 
 const (
diff --git a/stage0/app.go b/stage0/app.go
index ebd5ec31d9..b7b2221935 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strconv"
 	"syscall"
@@ -258,16 +257,9 @@ func AddApp(cfg AddConfig) error {
 		return err
 	}
 
-	eep, err := getStage1Entrypoint(cfg.PodPath, enterEntrypoint)
-	if err != nil {
-		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
-	}
-
 	args := []string{
-		cfg.UUID.String(),
-		appName.String(),
-		filepath.Join(common.Stage1RootfsPath(cfg.PodPath), eep),
-		strconv.Itoa(cfg.PodPID),
+		fmt.Sprintf("--uuid=%s", cfg.UUID),
+		fmt.Sprintf("--app=%s", appName),
 	}
 
 	if cfg.InsecureCapabilities {
@@ -295,7 +287,7 @@ func AddApp(cfg AddConfig) error {
 		return err
 	}
 
-	if err := callEntrypoint(cfg.PodPath, appAddEntrypoint, args); err != nil {
+	if err := RunCrossingEntrypoint(cfg.PodPath, cfg.PodPID, appName.String(), appAddEntrypoint, args); err != nil {
 		return err
 	}
 
@@ -339,43 +331,6 @@ func updateFile(path string, contents []byte) error {
 	return nil
 }
 
-func callEntrypoint(dir, entrypoint string, args []string) error {
-	previousDir, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	debug("Pivoting to filesystem %s", dir)
-	if err := os.Chdir(dir); err != nil {
-		return errwrap.Wrap(errors.New("failed changing to dir"), err)
-	}
-
-	ep, err := getStage1Entrypoint(dir, entrypoint)
-	if err != nil {
-		return fmt.Errorf("%q not implemented for pod's stage1: %v", entrypoint, err)
-	}
-	execArgs := []string{filepath.Join(common.Stage1RootfsPath(dir), ep)}
-	debug("Execing %s", ep)
-	execArgs = append(execArgs, args...)
-
-	c := exec.Cmd{
-		Path:   execArgs[0],
-		Args:   execArgs,
-		Stdout: os.Stdout,
-		Stderr: os.Stderr,
-	}
-
-	if err := c.Run(); err != nil {
-		return fmt.Errorf("error executing stage1's entrypoint %q: %v", entrypoint, err)
-	}
-
-	if err := os.Chdir(previousDir); err != nil {
-		return errwrap.Wrap(errors.New("failed changing to dir"), err)
-	}
-
-	return nil
-}
-
 func RmApp(cfg RmConfig) error {
 	debug("locking pod")
 	l, err := lock.ExclusiveLock(common.PodManifestLockPath(cfg.PodPath), lock.RegFile)
@@ -414,23 +369,15 @@ func RmApp(cfg RmConfig) error {
 		return err
 	}
 
-	eep, err := getStage1Entrypoint(cfg.PodPath, enterEntrypoint)
-	if err != nil {
-		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
-	}
-
 	if cfg.PodPID > 0 {
 		// Call app-stop and app-rm entrypoint only if the pod is still running.
 		// Otherwise, there's not much we can do about it except unmounting/removing
 		// the file system.
 		args := []string{
-			cfg.UUID.String(),
-			cfg.AppName.String(),
-			filepath.Join(common.Stage1RootfsPath(cfg.PodPath), eep),
-			strconv.Itoa(cfg.PodPID),
+			fmt.Sprintf("--app=%s", cfg.AppName),
 		}
 
-		if err := callEntrypoint(cfg.PodPath, appStopEntrypoint, args); err != nil {
+		if err := RunCrossingEntrypoint(cfg.PodPath, cfg.PodPID, cfg.AppName.String(), appStopEntrypoint, args); err != nil {
 			status, err := common.GetExitStatus(err)
 			// ignore nonexistent units failing to stop. Exit status 5
 			// comes from systemctl and means the unit doesn't exist
@@ -441,7 +388,7 @@ func RmApp(cfg RmConfig) error {
 			}
 		}
 
-		if err := callEntrypoint(cfg.PodPath, appRmEntrypoint, args); err != nil {
+		if err := RunCrossingEntrypoint(cfg.PodPath, cfg.PodPID, cfg.AppName.String(), appRmEntrypoint, args); err != nil {
 			return err
 		}
 	}
@@ -520,23 +467,15 @@ func StartApp(cfg StartConfig) error {
 		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
 	}
 
-	eep, err := getStage1Entrypoint(cfg.Dir, enterEntrypoint)
-	if err != nil {
-		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
-	}
-
 	args := []string{
-		cfg.UUID.String(),
-		cfg.AppName.String(),
-		filepath.Join(common.Stage1RootfsPath(cfg.Dir), eep),
-		strconv.Itoa(cfg.PodPID),
+		fmt.Sprintf("--app=%s", cfg.AppName),
 	}
 
 	if _, err := os.Create(common.AppStartedPath(p.Root, cfg.AppName.String())); err != nil {
 		log.FatalE(fmt.Sprintf("error creating %s-started file", cfg.AppName.String()), err)
 	}
 
-	if err := callEntrypoint(cfg.Dir, appStartEntrypoint, args); err != nil {
+	if err := RunCrossingEntrypoint(cfg.Dir, cfg.PodPID, cfg.AppName.String(), appStartEntrypoint, args); err != nil {
 		return err
 	}
 
@@ -569,19 +508,11 @@ func StopApp(cfg StopConfig) error {
 		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
 	}
 
-	eep, err := getStage1Entrypoint(cfg.Dir, enterEntrypoint)
-	if err != nil {
-		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
-	}
-
 	args := []string{
-		cfg.UUID.String(),
-		cfg.AppName.String(),
-		filepath.Join(common.Stage1RootfsPath(cfg.Dir), eep),
-		strconv.Itoa(cfg.PodPID),
+		fmt.Sprintf("--app=%s", cfg.AppName),
 	}
 
-	if err := callEntrypoint(cfg.Dir, appStopEntrypoint, args); err != nil {
+	if err := RunCrossingEntrypoint(cfg.Dir, cfg.PodPID, cfg.AppName.String(), appStopEntrypoint, args); err != nil {
 		status, err := common.GetExitStatus(err)
 		// exit status 5 comes from systemctl and means the unit doesn't exist
 		if status == 5 {
diff --git a/stage0/common.go b/stage0/common.go
new file mode 100644
index 0000000000..94316dd34c
--- /dev/null
+++ b/stage0/common.go
@@ -0,0 +1,74 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package stage0
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/coreos/rkt/common"
+	"github.com/hashicorp/errwrap"
+)
+
+// RunCrossingEntrypoint wraps the execution of a stage1 entrypoint which
+// requires crossing the stage0/stage1/stage2 boundary during its execution,
+// by setting up proper environment variables for enter.
+func RunCrossingEntrypoint(dir string, podPID int, appName string, entrypoint string, entrypointArgs []string) error {
+	enterCmd, err := getStage1Entrypoint(dir, enterEntrypoint)
+	if err != nil {
+		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
+	}
+
+	previousDir, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	if err := os.Chdir(dir); err != nil {
+		return errwrap.Wrap(errors.New("failed changing to dir"), err)
+	}
+
+	ep, err := getStage1Entrypoint(dir, entrypoint)
+	if err != nil {
+		return fmt.Errorf("%q not implemented for pod's stage1: %v", entrypoint, err)
+	}
+	execArgs := []string{filepath.Join(common.Stage1RootfsPath(dir), ep)}
+	execArgs = append(execArgs, entrypointArgs...)
+
+	c := exec.Cmd{
+		Path:   execArgs[0],
+		Args:   execArgs,
+		Stdin:  os.Stdin,
+		Stdout: os.Stdout,
+		Stderr: os.Stderr,
+		Env: []string{
+			fmt.Sprintf("%s=%s", common.CrossingEnterCmd, filepath.Join(common.Stage1RootfsPath(dir), enterCmd)),
+			fmt.Sprintf("%s=%d", common.CrossingEnterPID, podPID),
+		},
+	}
+
+	if err := c.Run(); err != nil {
+		return fmt.Errorf("error executing stage1 entrypoint: %v", err)
+	}
+
+	if err := os.Chdir(previousDir); err != nil {
+		return errwrap.Wrap(errors.New("failed changing to dir"), err)
+	}
+
+	return nil
+}
diff --git a/stage1/app-add/app-add.go b/stage1/app-add/app-add.go
index 537ab8bf20..ddcc6e341b 100644
--- a/stage1/app-add/app-add.go
+++ b/stage1/app-add/app-add.go
@@ -18,7 +18,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -28,6 +27,7 @@ import (
 	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/common/cgroup/v1"
 	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1types "github.com/coreos/rkt/stage1/common/types"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 
@@ -35,6 +35,8 @@ import (
 )
 
 var (
+	flagApp             string
+	flagUUID            string
 	debug               bool
 	disableCapabilities bool
 	disablePaths        bool
@@ -45,6 +47,8 @@ var (
 )
 
 func init() {
+	flag.StringVar(&flagApp, "app", "", "Application name")
+	flag.StringVar(&flagUUID, "uuid", "", "Pod UUID")
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
 	flag.BoolVar(&disableCapabilities, "disable-capabilities-restriction", false, "Disable capability restrictions")
 	flag.BoolVar(&disablePaths, "disable-paths", false, "Disable paths restrictions")
@@ -52,7 +56,6 @@ func init() {
 	flag.StringVar(&privateUsers, "private-users", "", "Run within user namespace. Can be set to [=UIDBASE[:NUIDS]]")
 }
 
-// TODO use named flags instead of positional
 func main() {
 	flag.Parse()
 
@@ -63,21 +66,20 @@ func main() {
 		diag.SetOutput(ioutil.Discard)
 	}
 
-	uuid, err := types.NewUUID(flag.Arg(0))
+	enterCmd := stage1common.PrepareEnterCmd(false)
+
+	uuid, err := types.NewUUID(flagUUID)
 	if err != nil {
 		log.PrintE("UUID is missing or malformed", err)
 		os.Exit(254)
 	}
 
-	appName, err := types.NewACName(flag.Arg(1))
+	appName, err := types.NewACName(flagApp)
 	if err != nil {
 		log.PrintE("invalid app name", err)
 		os.Exit(254)
 	}
 
-	enterCmd := []string{flag.Arg(2)}
-	enterCmd = append(enterCmd, fmt.Sprintf("--pid=%s", flag.Arg(3)), "--")
-
 	root := "."
 	p, err := stage1types.LoadPod(root, uuid)
 	if err != nil {
diff --git a/stage1/app-rm/app-rm.go b/stage1/app-rm/app-rm.go
index adace9b2e1..7cb6568f2a 100644
--- a/stage1/app-rm/app-rm.go
+++ b/stage1/app-rm/app-rm.go
@@ -18,7 +18,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -26,22 +25,24 @@ import (
 
 	"github.com/coreos/rkt/common"
 	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 
 	"github.com/appc/spec/schema/types"
 )
 
 var (
-	debug bool
-	log   *rktlog.Logger
-	diag  *rktlog.Logger
+	flagApp string
+	debug   bool
+	log     *rktlog.Logger
+	diag    *rktlog.Logger
 )
 
 func init() {
+	flag.StringVar(&flagApp, "app", "", "Application name")
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
 }
 
-// TODO use named flags instead of positional
 func main() {
 	flag.Parse()
 
@@ -52,17 +53,15 @@ func main() {
 		diag.SetOutput(ioutil.Discard)
 	}
 
-	appName, err := types.NewACName(flag.Arg(1))
+	appName, err := types.NewACName(flagApp)
 	if err != nil {
 		log.PrintE("invalid app name", err)
 		os.Exit(254)
 	}
 
-	enterEP := flag.Arg(2)
+	enterCmd := stage1common.PrepareEnterCmd(false)
 
-	args := []string{enterEP}
-
-	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args := enterCmd
 	args = append(args, "/usr/bin/systemctl")
 	args = append(args, "is-active")
 	args = append(args, appName.String())
@@ -94,8 +93,7 @@ func main() {
 		}
 	}
 
-	args = []string{enterEP}
-	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args = enterCmd
 	args = append(args, "/usr/bin/systemctl")
 	args = append(args, "daemon-reload")
 
diff --git a/stage1/app-start/app-start.go b/stage1/app-start/app-start.go
index 1248014e93..1535fcd92d 100644
--- a/stage1/app-start/app-start.go
+++ b/stage1/app-start/app-start.go
@@ -24,18 +24,21 @@ import (
 	"os/exec"
 
 	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 
 	"github.com/appc/spec/schema/types"
 )
 
 var (
-	debug bool
-	log   *rktlog.Logger
-	diag  *rktlog.Logger
+	flagApp string
+	debug   bool
+	log     *rktlog.Logger
+	diag    *rktlog.Logger
 )
 
 func init() {
+	flag.StringVar(&flagApp, "app", "", "Application name")
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
 }
 
@@ -49,14 +52,13 @@ func main() {
 		diag.SetOutput(ioutil.Discard)
 	}
 
-	appName, err := types.NewACName(flag.Arg(1))
+	appName, err := types.NewACName(flagApp)
 	if err != nil {
 		log.PrintE("invalid app name", err)
 		os.Exit(254)
 	}
 
-	enterCmd := []string{flag.Arg(2)}
-	enterCmd = append(enterCmd, fmt.Sprintf("--pid=%s", flag.Arg(3)), "--")
+	enterCmd := stage1common.PrepareEnterCmd(false)
 
 	args := enterCmd
 	args = append(args, "/usr/bin/systemctl")
diff --git a/stage1/app-stop/app-stop.go b/stage1/app-stop/app-stop.go
index 48b52666e7..7637e4aaa3 100644
--- a/stage1/app-stop/app-stop.go
+++ b/stage1/app-stop/app-stop.go
@@ -18,29 +18,30 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
 
 	"github.com/coreos/rkt/common"
 	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 
 	"github.com/appc/spec/schema/types"
 )
 
 var (
-	debug bool
-	log   *rktlog.Logger
-	diag  *rktlog.Logger
+	flagApp string
+	debug   bool
+	log     *rktlog.Logger
+	diag    *rktlog.Logger
 )
 
 func init() {
+	flag.StringVar(&flagApp, "app", "", "Application name")
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
 }
 
-// TODO use named flags instead of positional
 func main() {
 	flag.Parse()
 
@@ -51,17 +52,15 @@ func main() {
 		diag.SetOutput(ioutil.Discard)
 	}
 
-	appName, err := types.NewACName(flag.Arg(1))
+	appName, err := types.NewACName(flagApp)
 	if err != nil {
 		log.PrintE("invalid app name", err)
 		os.Exit(254)
 	}
 
-	enterEP := flag.Arg(2)
+	enterCmd := stage1common.PrepareEnterCmd(false)
 
-	args := []string{enterEP}
-
-	args = append(args, fmt.Sprintf("--pid=%s", flag.Arg(3)))
+	args := enterCmd
 	args = append(args, "/usr/bin/systemctl")
 	args = append(args, "stop")
 	args = append(args, appName.String())
diff --git a/stage1/common/run.go b/stage1/common/run.go
index 4b71bd58ef..fdb148d47b 100644
--- a/stage1/common/run.go
+++ b/stage1/common/run.go
@@ -21,6 +21,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/hashicorp/errwrap"
 )
@@ -52,3 +53,20 @@ func WritePid(pid int, filename string) error {
 	}
 	return nil
 }
+
+// PrepareEnterCmd retrieves enter argument and prepare a command list
+// to further run a command in stage1 context
+func PrepareEnterCmd(enterStage2 bool) []string {
+	var args []string
+	enterCmd := os.Getenv(common.CrossingEnterCmd)
+	enterPID := os.Getenv(common.CrossingEnterPID)
+	if enterCmd != "" && enterPID != "" {
+		args = append(args, []string{enterCmd, fmt.Sprintf("--pid=%s", enterPID)}...)
+		enterApp := os.Getenv(common.CrossingEnterApp)
+		if enterApp != "" && enterStage2 {
+			args = append(args, fmt.Sprintf("--app=%s", enterApp))
+		}
+		args = append(args, "--")
+	}
+	return args
+}

From d2a9918b437d5e03547b4443a606cc5483091545 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 7 Nov 2016 14:37:38 +0100
Subject: [PATCH 0853/1304] cgroup/v1: introduce mount flags to mountFsRO

Currently mount flags are lost when remounting a mountpoint read-only.
This changes it such that mountFsRO takes a flags parameter, and adds
MS_BIND, MS_REMOUNT, MS_RDONLY.

Fixes #3286
---
 common/cgroup/v1/cgroup.go | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/common/cgroup/v1/cgroup.go b/common/cgroup/v1/cgroup.go
index a468dcf3cd..9fdb30c1da 100644
--- a/common/cgroup/v1/cgroup.go
+++ b/common/cgroup/v1/cgroup.go
@@ -40,15 +40,15 @@ var (
 	}
 )
 
-func mountFsRO(mountPoint string) error {
-	var flags uintptr = syscall.MS_BIND |
+// mountFsRO remounts the given mountPoint using the given flags read-only.
+func mountFsRO(mountPoint string, flags uintptr) error {
+	flags = flags |
+		syscall.MS_BIND |
 		syscall.MS_REMOUNT |
-		syscall.MS_NOSUID |
-		syscall.MS_NOEXEC |
-		syscall.MS_NODEV |
 		syscall.MS_RDONLY
+
 	if err := syscall.Mount(mountPoint, mountPoint, "", flags, ""); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error remounting RO %q", mountPoint), err)
+		return errwrap.Wrap(fmt.Errorf("error remounting read-only %q", mountPoint), err)
 	}
 
 	return nil
@@ -251,18 +251,19 @@ func IsControllerMounted(c string) bool {
 // under root
 func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext string) error {
 	controllers := GetControllerDirs(enabledCgroups)
-	var flags uintptr
 
 	sys := filepath.Join(root, "/sys")
 	if err := os.MkdirAll(sys, 0700); err != nil {
 		return err
 	}
-	flags = syscall.MS_NOSUID |
+
+	var sysfsFlags uintptr = syscall.MS_NOSUID |
 		syscall.MS_NOEXEC |
 		syscall.MS_NODEV
+
 	// If we're mounting the host cgroups, /sys is probably mounted so we
 	// ignore EBUSY
-	if err := syscall.Mount("sysfs", sys, "sysfs", flags, ""); err != nil && err != syscall.EBUSY {
+	if err := syscall.Mount("sysfs", sys, "sysfs", sysfsFlags, ""); err != nil && err != syscall.EBUSY {
 		return errwrap.Wrap(fmt.Errorf("error mounting %q", sys), err)
 	}
 
@@ -270,7 +271,8 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 	if err := os.MkdirAll(cgroupTmpfs, 0700); err != nil {
 		return err
 	}
-	flags = syscall.MS_NOSUID |
+
+	var cgroupTmpfsFlags uintptr = syscall.MS_NOSUID |
 		syscall.MS_NOEXEC |
 		syscall.MS_NODEV |
 		syscall.MS_STRICTATIME
@@ -280,7 +282,7 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 		options = fmt.Sprintf("mode=755,context=\"%s\"", mountContext)
 	}
 
-	if err := syscall.Mount("tmpfs", cgroupTmpfs, "tmpfs", flags, options); err != nil {
+	if err := syscall.Mount("tmpfs", cgroupTmpfs, "tmpfs", cgroupTmpfsFlags, options); err != nil {
 		return errwrap.Wrap(fmt.Errorf("error mounting %q", cgroupTmpfs), err)
 	}
 
@@ -291,9 +293,10 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 			return err
 		}
 
-		flags = syscall.MS_NOSUID |
+		var flags uintptr = syscall.MS_NOSUID |
 			syscall.MS_NOEXEC |
 			syscall.MS_NODEV
+
 		if err := syscall.Mount("cgroup", cPath, "cgroup", flags, c); err != nil {
 			return errwrap.Wrap(fmt.Errorf("error mounting %q", cPath), err)
 		}
@@ -314,7 +317,7 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 	}
 
 	// Bind-mount cgroup tmpfs filesystem read-only
-	return mountFsRO(cgroupTmpfs)
+	return mountFsRO(cgroupTmpfs, cgroupTmpfsFlags)
 }
 
 // RemountCgroupsRO remounts the v1 cgroup hierarchy under root read-only,
@@ -325,6 +328,10 @@ func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup st
 	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
 	sysPath := filepath.Join(root, "/sys")
 
+	var flags uintptr = syscall.MS_NOSUID |
+		syscall.MS_NOEXEC |
+		syscall.MS_NODEV
+
 	// Mount RW knobs we need to make the enabled isolators work
 	for _, c := range controllers {
 		cPath := filepath.Join(cgroupTmpfs, c)
@@ -356,13 +363,13 @@ func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup st
 		}
 
 		// Re-mount controller read-only to prevent the container modifying host controllers
-		if err := mountFsRO(cPath); err != nil {
+		if err := mountFsRO(cPath, flags); err != nil {
 			return err
 		}
 	}
 
 	// Bind-mount sys filesystem read-only
-	return mountFsRO(sysPath)
+	return mountFsRO(sysPath, flags)
 }
 
 // RemountCgroupKnobsRW remounts the needed knobs in the subcgroup for one

From 9f158615410ae4d48c5ca27722be3ed55cab83c7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 18 Oct 2016 10:14:43 +0000
Subject: [PATCH 0854/1304] stage1/init: leave privileged pods without stage2
 mount-ns

This commit removes `MountFlags` property from stage2 apps in pods
running with `--insecure-options=paths`.
This will leave the service without any properties with a mount-ns
requirement, so that stage2 rootfs can be nicely degraded to a chroot
with full mount propagation.
---
 stage1/init/common/units.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index de03f2f5a8..1c2bf1c50f 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -352,9 +352,6 @@ func (uw *UnitWriter) AppUnit(
 		unit.NewUnitOption("Service", "Restart", "no"),
 		unit.NewUnitOption("Service", "ExecStart", execStartString),
 		unit.NewUnitOption("Service", "RootDirectory", common.RelAppRootfsPath(appName)),
-		// MountFlags=shared creates a new mount namespace and (as unintuitive
-		// as it might seem) makes sure the mount is slave+shared.
-		unit.NewUnitOption("Service", "MountFlags", "shared"),
 		unit.NewUnitOption("Service", "WorkingDirectory", app.WorkingDirectory),
 		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePath(appName)),
 		unit.NewUnitOption("Service", "User", strconv.Itoa(u)),
@@ -436,9 +433,13 @@ func (uw *UnitWriter) AppUnit(
 		opts = appendOptionsList(opts, "Service", "ReadWriteDirectories", "", rwDirs)
 	}
 
-	// Restrict access to sensitive paths (eg. procfs and sysfs entries).
 	if !insecureOptions.DisablePaths {
+		// Restrict access to sensitive paths (eg. procfs and sysfs entries).
 		opts = protectKernelTunables(opts, appName, systemdVersion)
+
+		// MountFlags=shared creates a new mount namespace and (as unintuitive
+		// as it might seem) makes sure the mount is slave+shared.
+		opts = append(opts, unit.NewUnitOption("Service", "MountFlags", "shared"))
 	}
 
 	// Generate default device policy for the app, as well as the list of allowed devices.

From 13b7d2dc4f062c039a6d792adad1642296bd0b1b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 19 Oct 2016 12:08:15 +0000
Subject: [PATCH 0855/1304] stage1/init: fix logic for read-only/read-write
 mounts

This commit moves all the logic for RO/RW rootfs+volume mounts
into its own logic function, which is only triggered when a RO rootfs
is specified at runtime.
Before this, `ReadWriteDirectories` was always applied to R/W mounts,
resulting in additional remounts and unconditional activation of a
dedicated mount namespace.
---
 stage1/init/common/seccomp.go |  2 +-
 stage1/init/common/units.go   | 53 +++++++++++++++--------------------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/stage1/init/common/seccomp.go b/stage1/init/common/seccomp.go
index 84faefec2c..d5a2caecef 100644
--- a/stage1/init/common/seccomp.go
+++ b/stage1/init/common/seccomp.go
@@ -93,7 +93,7 @@ func getSeccompFilter(opts []*unit.UnitOption, p *stage1commontypes.Pod, unprivi
 	}
 	// SystemCallFilter options are written down one entry per line, because
 	// filtering sets may be quite large and overlong lines break unit serialization.
-	opts = appendOptionsList(opts, "Service", "SystemCallFilter", filterMode, seccompSet)
+	opts = appendOptionsList(opts, "Service", "SystemCallFilter", filterMode, seccompSet...)
 	// In order to install seccomp filters, unprivileged process must first set no-news-privs.
 	if unprivileged {
 		noNewPrivs = true
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 1c2bf1c50f..171c8f8eda 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -295,6 +295,13 @@ func (uw *UnitWriter) AppUnit(
 	app := ra.App
 	appName := ra.Name
 	imgName := uw.p.AppNameToImageName(appName)
+	imageManifest := uw.p.Images[appName.String()]
+
+	podAbsRoot, err := filepath.Abs(uw.p.Root)
+	if err != nil {
+		uw.err = err
+		return
+	}
 
 	if len(app.Exec) == 0 {
 		uw.err = fmt.Errorf(`image %q has an empty "exec" (try --exec=BINARY)`, imgName)
@@ -365,7 +372,7 @@ func (uw *UnitWriter) AppUnit(
 	}...)
 
 	if len(supplementaryGroups) > 0 {
-		opts = appendOptionsList(opts, "Service", "SupplementaryGroups", "", supplementaryGroups)
+		opts = appendOptionsList(opts, "Service", "SupplementaryGroups", "", supplementaryGroups...)
 	}
 
 	if supportsNotify(uw.p, appName.String()) {
@@ -376,10 +383,9 @@ func (uw *UnitWriter) AppUnit(
 		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
 	}
 
-	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
-
 	// Apply seccomp isolator, if any and not opt-ing out;
 	// see https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
+	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
 	if !insecureOptions.DisableSeccomp {
 		var forceNoNewPrivileges bool
 
@@ -396,41 +402,28 @@ func (uw *UnitWriter) AppUnit(
 			noNewPrivileges = true
 		}
 	}
-
 	opts = append(opts, unit.NewUnitOption("Service", "NoNewPrivileges", strconv.FormatBool(noNewPrivileges)))
 
-	if ra.ReadOnlyRootFS {
-		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", common.RelAppRootfsPath(appName)))
-	}
-
-	absRoot, err := filepath.Abs(uw.p.Root) // Absolute path to the pod's rootfs.
-	if err != nil {
-		uw.err = err
-		return
-	}
-	appRootfs := common.AppRootfsPath(absRoot, appName)
-
-	rwDirs := []string{}
-	imageManifest := uw.p.Images[appName.String()]
 	mounts, err := GenerateMounts(ra, uw.p.Manifest.Volumes, ConvertedFromDocker(imageManifest))
 	if err != nil {
 		uw.err = err
 		return
 	}
 
-	for _, m := range mounts {
-		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Mount.Path)
-		if err != nil {
-			uw.err = err
-			return
-		}
+	if ra.ReadOnlyRootFS {
+		for _, m := range mounts {
+			mntPath, err := EvaluateSymlinksInsideApp(podAbsRoot, m.Mount.Path)
+			if err != nil {
+				uw.err = err
+				return
+			}
 
-		if !m.ReadOnly {
-			rwDirs = append(rwDirs, filepath.Join(common.RelAppRootfsPath(appName), mntPath))
+			if !m.ReadOnly {
+				rwDir := filepath.Join(common.RelAppRootfsPath(ra.Name), mntPath)
+				opts = appendOptionsList(opts, "Service", "ReadWriteDirectories", "", rwDir)
+			}
 		}
-	}
-	if len(rwDirs) > 0 {
-		opts = appendOptionsList(opts, "Service", "ReadWriteDirectories", "", rwDirs)
+		opts = appendOptionsList(opts, "Service", "ReadOnlyDirectories", "", common.RelAppRootfsPath(ra.Name))
 	}
 
 	if !insecureOptions.DisablePaths {
@@ -446,7 +439,7 @@ func (uw *UnitWriter) AppUnit(
 	// For kvm flavor, devices are VM-specific and restricting them is not strictly needed.
 	if !insecureOptions.DisablePaths && flavor != "kvm" {
 		opts = append(opts, unit.NewUnitOption("Service", "DevicePolicy", "closed"))
-		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(absRoot), appName, app.MountPoints, mounts, uidRange)
+		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(podAbsRoot), appName, app.MountPoints, mounts, uidRange)
 		if err != nil {
 			uw.err = err
 			return
@@ -639,7 +632,7 @@ func (uw *UnitWriter) AppReaperUnit(appName types.ACName, binPath string, opts .
 // an array of new properties, one entry at a time.
 // This is the preferred method to avoid hitting line length limits
 // in unit files. Target property must support multi-line entries.
-func appendOptionsList(opts []*unit.UnitOption, section string, property string, prefix string, vals []string) []*unit.UnitOption {
+func appendOptionsList(opts []*unit.UnitOption, section, property, prefix string, vals ...string) []*unit.UnitOption {
 	for _, v := range vals {
 		opts = append(opts, unit.NewUnitOption(section, property, fmt.Sprintf("%s%s", prefix, v)))
 	}

From c95c61d459759fa56872c529e48284baf916e572 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 7 Nov 2016 15:58:23 +0000
Subject: [PATCH 0856/1304] tests: disable ace validator on kvm

This temporarily disables TestAceValidator on kvm, as it performs
some incorrect (overly strict) checks regarding volumes mountpoints.
---
 tests/rkt_ace_validator_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_ace_validator_test.go b/tests/rkt_ace_validator_test.go
index e59d760359..c4876ee334 100644
--- a/tests/rkt_ace_validator_test.go
+++ b/tests/rkt_ace_validator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !fly
+// +build !fly,!kvm
 
 package main
 

From 98fec700e5e22c5d63e76c0519e2e1e4d424c5b4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 7 Nov 2016 15:52:02 +0000
Subject: [PATCH 0857/1304] stage0: minor wording fixes

---
 rkt/app_add.go   | 2 +-
 rkt/app_rm.go    | 2 +-
 rkt/app_start.go | 6 ++++--
 rkt/app_stop.go  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/rkt/app_add.go b/rkt/app_add.go
index 0c7da65ef5..bb9256c71e 100644
--- a/rkt/app_add.go
+++ b/rkt/app_add.go
@@ -32,7 +32,7 @@ var (
 	cmdAppAdd = &cobra.Command{
 		Use:   "add UUID IMAGEID ...",
 		Short: "Add an app to a pod",
-		Long:  `This allows addin an app that's present on the store to a running pod`,
+		Long:  "This adds an application available in the local image store to a running mutable pod.",
 		Run:   runWrapper(runAppAdd),
 	}
 )
diff --git a/rkt/app_rm.go b/rkt/app_rm.go
index 10d4e9f601..4bb5c2cdc6 100644
--- a/rkt/app_rm.go
+++ b/rkt/app_rm.go
@@ -28,7 +28,7 @@ var (
 	cmdAppRm = &cobra.Command{
 		Use:   "rm UUID --app=NAME",
 		Short: "Remove an app from a pod",
-		Long:  `This allows removing an app from a running pod, it will stop it if it's still running`,
+		Long:  "This removes an appplication from a mutable pod, stopping it beforehand if still running.",
 		Run:   runWrapper(runAppRm),
 	}
 )
diff --git a/rkt/app_start.go b/rkt/app_start.go
index e2669b6670..4c81efe712 100644
--- a/rkt/app_start.go
+++ b/rkt/app_start.go
@@ -28,8 +28,10 @@ var (
 	cmdAppStart = &cobra.Command{
 		Use:   "start UUID --app=NAME",
 		Short: "Start an app in a pod",
-		Long:  `Start appz!`,
-		Run:   runWrapper(runAppStart),
+		Long: `This starts an existing application inside a mutable pod.
+In order to be started, the application must have been previously added to the
+pod, e.g. via "rkt app add".`,
+		Run: runWrapper(runAppStart),
 	}
 )
 
diff --git a/rkt/app_stop.go b/rkt/app_stop.go
index 2743fc5bb1..ae3c66e799 100644
--- a/rkt/app_stop.go
+++ b/rkt/app_stop.go
@@ -28,7 +28,7 @@ var (
 	cmdAppStop = &cobra.Command{
 		Use:   "stop UUID --app=NAME",
 		Short: "Stop an app in a pod",
-		Long:  `Stop appz!`,
+		Long:  "This stops an application running inside a mutable pod.",
 		Run:   runWrapper(runAppStop),
 	}
 )

From c47fbc28e69c09d6913bcf9602d4f0cc7abe29d5 Mon Sep 17 00:00:00 2001
From: Lukas Redynk <lukasz.redynk@intel.com>
Date: Tue, 8 Nov 2016 17:02:49 +0100
Subject: [PATCH 0858/1304] kvm: fix for breaking change in Debian Sid GCC
 default options

---
 .../kernel/patches/0002-for-debian-gcc.patch        | 13 +++++++++++++
 stage1/usr_from_kvm/lkvm.mk                         |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch

diff --git a/stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch b/stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch
new file mode 100644
index 0000000000..1bd254041a
--- /dev/null
+++ b/stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index b249529..bedd4ab 100644
+--- a/Makefile
++++ b/Makefile
+@@ -346,7 +346,7 @@ include scripts/Kbuild.include
+ # Make variables (CC, etc...)
+ AS		= $(CROSS_COMPILE)as
+ LD		= $(CROSS_COMPILE)ld
+-CC		= $(CROSS_COMPILE)gcc
++CC		= $(CROSS_COMPILE)gcc -no-pie -fno-pic
+ CPP		= $(CC) -E
+ AR		= $(CROSS_COMPILE)ar
+ NM		= $(CROSS_COMPILE)nm
diff --git a/stage1/usr_from_kvm/lkvm.mk b/stage1/usr_from_kvm/lkvm.mk
index 472ad2914b..ae5d4ae73b 100644
--- a/stage1/usr_from_kvm/lkvm.mk
+++ b/stage1/usr_from_kvm/lkvm.mk
@@ -5,7 +5,7 @@ LKVM_BINARY := $(LKVM_SRCDIR)/lkvm-static
 LKVM_ACI_BINARY := $(HV_ACIROOTFSDIR)/lkvm
 LKVM_GIT := https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool
 # just last published version (for reproducible builds), not for any other reason
-LKVM_VERSION := d62653e177597251c24494a6dda60acd6d846671
+LKVM_VERSION := 1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2
 
 LKVM_STUFFDIR := $(MK_SRCDIR)/lkvm
 LKVM_PATCHESDIR := $(LKVM_STUFFDIR)/patches

From 962148ebf6e1c757f4340268e9ef64d7ee7ee3c3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 8 Nov 2016 19:10:43 +0000
Subject: [PATCH 0859/1304] glide: bump docker2aci to 0.14.0

---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index 175450795b..c227f3266b 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.13.0
+  version: v0.14.0
   subpackages:
   - lib
   - lib/common

From 4eacad759a92513ce32c9c7aff622461ce59b4cb Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 8 Nov 2016 20:00:31 +0000
Subject: [PATCH 0860/1304] vendor: update after docker2aci bump

---
 glide.lock                                    |  9 +-
 .../appc/docker2aci/lib/common/common.go      | 47 ++++++++-
 .../appc/docker2aci/lib/docker2aci.go         | 79 ++++++++++-----
 .../lib/internal/backend/file/file.go         | 65 ++++++------
 .../internal/backend/repository/repository.go | 92 +++++++++++------
 .../backend/repository/repository1.go         | 19 ++--
 .../backend/repository/repository2.go         | 35 ++++---
 .../docker/{docker_functions.go => docker.go} | 32 ------
 .../appc/docker2aci/lib/internal/internal.go  | 92 ++++++++---------
 .../lib/internal/types/docker_types.go        |  1 +
 .../docker2aci/lib/internal/types/types.go    | 27 -----
 .../lib/internal/typesV2/docker_types.go      | 10 +-
 .../github.com/appc/docker2aci/lib/version.go |  2 +-
 vendor/github.com/appc/docker2aci/main.go     |  8 +-
 .../github.com/appc/docker2aci/pkg/log/log.go | 41 ++++----
 .../image-spec/specs-go/v1/config.go          | 99 +++++++++++++++++++
 .../specs-go/{ => v1}/descriptor.go           |  2 +-
 .../image-spec/specs-go/v1/manifest.go        | 32 ++++++
 .../image-spec/specs-go/v1/manifest_list.go   | 62 ++++++++++++
 .../image-spec/specs-go/v1/mediatype.go       | 36 +++++++
 .../image-spec/specs-go/version.go            |  2 +-
 21 files changed, 540 insertions(+), 252 deletions(-)
 rename vendor/github.com/appc/docker2aci/lib/internal/docker/{docker_functions.go => docker.go} (84%)
 delete mode 100644 vendor/github.com/appc/docker2aci/lib/internal/types/types.go
 create mode 100644 vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go
 rename vendor/github.com/opencontainers/image-spec/specs-go/{ => v1}/descriptor.go (98%)
 create mode 100644 vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go
 create mode 100644 vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go
 create mode 100644 vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go

diff --git a/glide.lock b/glide.lock
index 153cddef8e..80bc9fd3e5 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: 3db4d7c6fc89de6c3454b8a74846d0286ab1a3eeb281322010055cea8a12fa4f
-updated: 2016-11-01T08:47:55.25498114+01:00
+hash: 7876896e8d0dd84e6a10a9a0360a166488234254141cd772c9bdb0594c9c2ff2
+updated: 2016-11-08T19:17:19.934464985Z
 imports:
 - name: github.com/appc/docker2aci
-  version: 0cac1a3ecc114941cf643ec25f4daaeee8c3d538
+  version: 64543c1e0a7306b17d0d214549ec08049b234abc
   subpackages:
   - lib
   - lib/common
@@ -212,9 +212,10 @@ imports:
 - name: github.com/kr/pty
   version: f7ee69f31298ecbe5d2b349c711e2547a617d398
 - name: github.com/opencontainers/image-spec
-  version: b472d5f4067ddca5cfbfea148dfaf7b42d43c5f0
+  version: 6e820ec55259e89ccd7092f3131c63e8419a349b
   subpackages:
   - specs-go
+  - specs-go/v1
 - name: github.com/pborman/uuid
   version: cccd189d45f7ac3368a0d127efb7f4d08ae0b655
 - name: github.com/peterbourgon/diskv
diff --git a/vendor/github.com/appc/docker2aci/lib/common/common.go b/vendor/github.com/appc/docker2aci/lib/common/common.go
index 5275d5a4e9..698f03d44c 100644
--- a/vendor/github.com/appc/docker2aci/lib/common/common.go
+++ b/vendor/github.com/appc/docker2aci/lib/common/common.go
@@ -20,7 +20,7 @@ import (
 	"regexp"
 
 	"github.com/appc/docker2aci/lib/internal/docker"
-	"github.com/appc/docker2aci/lib/internal/types"
+	"github.com/docker/distribution/reference"
 )
 
 type Compression int
@@ -34,9 +34,13 @@ var (
 	validId = regexp.MustCompile(`^(\w+:)?([A-Fa-f0-9]+)$`)
 )
 
-type ParsedDockerURL types.ParsedDockerURL
-
 const (
+	// AppcDockerOriginalName is the unmodified name this image was originally
+	// referenced by for fetching, e.g. something like "nginx:tag" or
+	// "quay.io/user/image:latest" This is identical in most cases to
+	// 'registryurl/repository:tag' but may differ for the default Dockerhub
+	// registry or if the tag was inferred as latest.
+	AppcDockerOriginalName  = "appc.io/docker/originalname"
 	AppcDockerRegistryURL   = "appc.io/docker/registryurl"
 	AppcDockerRepository    = "appc.io/docker/repository"
 	AppcDockerTag           = "appc.io/docker/tag"
@@ -46,6 +50,17 @@ const (
 	AppcDockerCmd           = "appc.io/docker/cmd"
 )
 
+const defaultTag = "latest"
+
+// ParsedDockerURL represents a parsed Docker URL.
+type ParsedDockerURL struct {
+	OriginalName string
+	IndexURL     string
+	ImageName    string
+	Tag          string
+	Digest       string
+}
+
 type ErrSeveralImages struct {
 	Msg    string
 	Images []string
@@ -64,8 +79,30 @@ func (e *ErrSeveralImages) Error() string {
 // ParseDockerURL takes a Docker URL and returns a ParsedDockerURL with its
 // index URL, image name, and tag.
 func ParseDockerURL(arg string) (*ParsedDockerURL, error) {
-	p, err := docker.ParseDockerURL(arg)
-	return (*ParsedDockerURL)(p), err
+	r, err := reference.ParseNamed(arg)
+	if err != nil {
+		return nil, err
+	}
+
+	var tag, digest string
+	switch x := r.(type) {
+	case reference.Canonical:
+		digest = x.Digest().String()
+	case reference.NamedTagged:
+		tag = x.Tag()
+	default:
+		tag = defaultTag
+	}
+
+	indexURL, remoteName := docker.SplitReposName(r.Name())
+
+	return &ParsedDockerURL{
+		OriginalName: arg,
+		IndexURL:     indexURL,
+		ImageName:    remoteName,
+		Tag:          tag,
+		Digest:       digest,
+	}, nil
 }
 
 // ValidateLayerId validates a layer ID
diff --git a/vendor/github.com/appc/docker2aci/lib/docker2aci.go b/vendor/github.com/appc/docker2aci/lib/docker2aci.go
index 4cb0ecc9aa..c9eada7952 100644
--- a/vendor/github.com/appc/docker2aci/lib/docker2aci.go
+++ b/vendor/github.com/appc/docker2aci/lib/docker2aci.go
@@ -31,7 +31,6 @@ import (
 	"github.com/appc/docker2aci/lib/internal/backend/repository"
 	"github.com/appc/docker2aci/lib/internal/docker"
 	"github.com/appc/docker2aci/lib/internal/tarball"
-	"github.com/appc/docker2aci/lib/internal/types"
 	"github.com/appc/docker2aci/lib/internal/util"
 	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/pkg/acirenderer"
@@ -47,6 +46,19 @@ type CommonConfig struct {
 	OutputDir   string             // where to put the resulting ACI
 	TmpDir      string             // directory to use for temporary files
 	Compression common.Compression // which compression to use for the resulting file(s)
+
+	Info  log.Logger
+	Debug log.Logger
+}
+
+func (c *CommonConfig) initLogger() {
+	if c.Info == nil {
+		c.Info = log.NewStdLogger(os.Stderr)
+	}
+
+	if c.Debug == nil {
+		c.Debug = log.NewNopLogger()
+	}
 }
 
 // RemoteConfig represents the remote repository specific configuration for
@@ -74,8 +86,18 @@ type FileConfig struct {
 // them to ACI.
 // It returns the list of generated ACI paths.
 func ConvertRemoteRepo(dockerURL string, config RemoteConfig) ([]string, error) {
-	repositoryBackend := repository.NewRepositoryBackend(config.Username, config.Password, config.Insecure)
-	return convertReal(repositoryBackend, dockerURL, config.Squash, config.OutputDir, config.TmpDir, config.Compression)
+	config.initLogger()
+
+	return (&converter{
+		backend: repository.NewRepositoryBackend(
+			config.Username,
+			config.Password,
+			config.Insecure,
+			config.Debug,
+		),
+		dockerURL: dockerURL,
+		config:    config.CommonConfig,
+	}).convert()
 }
 
 // ConvertSavedFile generates ACI images from a file generated with "docker
@@ -84,14 +106,19 @@ func ConvertRemoteRepo(dockerURL string, config RemoteConfig) ([]string, error)
 //
 // It returns the list of generated ACI paths.
 func ConvertSavedFile(dockerSavedFile string, config FileConfig) ([]string, error) {
+	config.initLogger()
+
 	f, err := os.Open(dockerSavedFile)
 	if err != nil {
 		return nil, fmt.Errorf("error opening file: %v", err)
 	}
 	defer f.Close()
 
-	fileBackend := file.NewFileBackend(f)
-	return convertReal(fileBackend, config.DockerURL, config.Squash, config.OutputDir, config.TmpDir, config.Compression)
+	return (&converter{
+		backend:   file.NewFileBackend(f, config.Debug, config.Info),
+		dockerURL: config.DockerURL,
+		config:    config.CommonConfig,
+	}).convert()
 }
 
 // GetIndexName returns the docker index server from a docker URL.
@@ -106,16 +133,22 @@ func GetDockercfgAuth(indexServer string) (string, string, error) {
 	return docker.GetAuthInfo(indexServer)
 }
 
-func convertReal(backend internal.Docker2ACIBackend, dockerURL string, squash bool, outputDir string, tmpDir string, compression common.Compression) ([]string, error) {
-	log.Debug("Getting image info...")
-	ancestry, parsedDockerURL, err := backend.GetImageInfo(dockerURL)
+type converter struct {
+	backend   internal.Docker2ACIBackend
+	dockerURL string
+	config    CommonConfig
+}
+
+func (c *converter) convert() ([]string, error) {
+	c.config.Debug.Println("Getting image info...")
+	ancestry, parsedDockerURL, err := c.backend.GetImageInfo(c.dockerURL)
 	if err != nil {
 		return nil, err
 	}
 
-	layersOutputDir := outputDir
-	if squash {
-		layersOutputDir, err = ioutil.TempDir(tmpDir, "docker2aci-")
+	layersOutputDir := c.config.OutputDir
+	if c.config.Squash {
+		layersOutputDir, err = ioutil.TempDir(c.config.TmpDir, "docker2aci-")
 		if err != nil {
 			return nil, fmt.Errorf("error creating dir: %v", err)
 		}
@@ -125,12 +158,12 @@ func convertReal(backend internal.Docker2ACIBackend, dockerURL string, squash bo
 	conversionStore := newConversionStore()
 
 	// only compress individual layers if we're not squashing
-	layerCompression := compression
-	if squash {
+	layerCompression := c.config.Compression
+	if c.config.Squash {
 		layerCompression = common.NoCompression
 	}
 
-	aciLayerPaths, aciManifests, err := backend.BuildACI(ancestry, parsedDockerURL, layersOutputDir, tmpDir, layerCompression)
+	aciLayerPaths, aciManifests, err := c.backend.BuildACI(ancestry, parsedDockerURL, layersOutputDir, c.config.TmpDir, layerCompression)
 	if err != nil {
 		return nil, err
 	}
@@ -147,8 +180,8 @@ func convertReal(backend internal.Docker2ACIBackend, dockerURL string, squash bo
 
 	// acirenderer expects images in order from upper to base layer
 	images = util.ReverseImages(images)
-	if squash {
-		squashedImagePath, err := squashLayers(images, conversionStore, *parsedDockerURL, outputDir, compression)
+	if c.config.Squash {
+		squashedImagePath, err := squashLayers(images, conversionStore, *parsedDockerURL, c.config.OutputDir, c.config.Compression, c.config.Debug)
 		if err != nil {
 			return nil, fmt.Errorf("error squashing image: %v", err)
 		}
@@ -160,9 +193,9 @@ func convertReal(backend internal.Docker2ACIBackend, dockerURL string, squash bo
 
 // squashLayers receives a list of ACI layer file names ordered from base image
 // to application image and squashes them into one ACI
-func squashLayers(images []acirenderer.Image, aciRegistry acirenderer.ACIRegistry, parsedDockerURL types.ParsedDockerURL, outputDir string, compression common.Compression) (path string, err error) {
-	log.Debug("Squashing layers...")
-	log.Debug("Rendering ACI...")
+func squashLayers(images []acirenderer.Image, aciRegistry acirenderer.ACIRegistry, parsedDockerURL common.ParsedDockerURL, outputDir string, compression common.Compression, debug log.Logger) (path string, err error) {
+	debug.Println("Squashing layers...")
+	debug.Println("Rendering ACI...")
 	renderedACI, err := acirenderer.GetRenderedACIFromList(images, aciRegistry)
 	if err != nil {
 		return "", fmt.Errorf("error rendering squashed image: %v", err)
@@ -189,12 +222,12 @@ func squashLayers(images []acirenderer.Image, aciRegistry acirenderer.ACIRegistr
 		}
 	}()
 
-	log.Debug("Writing squashed ACI...")
+	debug.Println("Writing squashed ACI...")
 	if err := writeSquashedImage(squashedTempFile, renderedACI, aciRegistry, manifests, compression); err != nil {
 		return "", fmt.Errorf("error writing squashed image: %v", err)
 	}
 
-	log.Debug("Validating squashed ACI...")
+	debug.Println("Validating squashed ACI...")
 	if err := internal.ValidateACI(squashedTempFile.Name()); err != nil {
 		return "", fmt.Errorf("error validating image: %v", err)
 	}
@@ -203,11 +236,11 @@ func squashLayers(images []acirenderer.Image, aciRegistry acirenderer.ACIRegistr
 		return "", err
 	}
 
-	log.Debug("ACI squashed!")
+	debug.Println("ACI squashed!")
 	return squashedImagePath, nil
 }
 
-func getSquashedFilename(parsedDockerURL types.ParsedDockerURL) string {
+func getSquashedFilename(parsedDockerURL common.ParsedDockerURL) string {
 	squashedFilename := strings.Replace(parsedDockerURL.ImageName, "/", "-", -1)
 	if parsedDockerURL.Tag != "" {
 		squashedFilename += "-" + parsedDockerURL.Tag
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
index b872984de2..e0c16b5016 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
@@ -32,27 +32,29 @@ import (
 
 	"github.com/appc/docker2aci/lib/common"
 	"github.com/appc/docker2aci/lib/internal"
-	"github.com/appc/docker2aci/lib/internal/docker"
 	"github.com/appc/docker2aci/lib/internal/tarball"
 	"github.com/appc/docker2aci/lib/internal/types"
 	"github.com/appc/docker2aci/lib/internal/typesV2"
 	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/schema"
-	spec "github.com/opencontainers/image-spec/specs-go"
+	spec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 type FileBackend struct {
-	file *os.File
+	file        *os.File
+	debug, info log.Logger
 }
 
-func NewFileBackend(file *os.File) *FileBackend {
+func NewFileBackend(file *os.File, debug, info log.Logger) *FileBackend {
 	return &FileBackend{
-		file: file,
+		file:  file,
+		debug: debug,
+		info:  info,
 	}
 }
 
-func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *types.ParsedDockerURL, error) {
-	parsedDockerURL, err := docker.ParseDockerURL(dockerURL)
+func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *common.ParsedDockerURL, error) {
+	parsedDockerURL, err := common.ParseDockerURL(dockerURL)
 	if err != nil {
 		// a missing Docker URL could mean that the file only contains one
 		// image, so we ignore the error here, we'll handle it in getImageID
@@ -61,13 +63,13 @@ func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *types.ParsedDo
 	var ancestry []string
 	// default file name is the tar name stripped
 	name := strings.Split(filepath.Base(lb.file.Name()), ".")[0]
-	appImageID, ancestry, parsedDockerURL, err := getImageID(lb.file, parsedDockerURL, name)
+	appImageID, ancestry, parsedDockerURL, err := getImageID(lb.file, parsedDockerURL, name, lb.debug)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	if len(ancestry) == 0 {
-		ancestry, err = getAncestry(lb.file, appImageID)
+		ancestry, err = getAncestry(lb.file, appImageID, lb.debug)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error getting ancestry: %v", err)
 		}
@@ -79,7 +81,7 @@ func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *types.ParsedDo
 	return ancestry, parsedDockerURL, nil
 }
 
-func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	if strings.Contains(layerIDs[0], ":") {
 		return lb.BuildACIV22(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
 	}
@@ -111,14 +113,14 @@ func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDocker
 		tmpLayerPath += ".tar"
 
 		layerTarPath := path.Join(layerIDs[i], "layer.tar")
-		layerFile, err := extractEmbeddedLayer(lb.file, layerTarPath, tmpLayerPath)
+		layerFile, err := extractEmbeddedLayer(lb.file, layerTarPath, tmpLayerPath, lb.info)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error getting layer from file: %v", err)
 		}
 		defer layerFile.Close()
 
-		log.Debug("Generating layer ACI...")
-		aciPath, manifest, err := internal.GenerateACI(i, layerData, dockerURL, outputDir, layerFile, curPwl, compression)
+		lb.debug.Println("Generating layer ACI...")
+		aciPath, manifest, err := internal.GenerateACI(i, layerData, dockerURL, outputDir, layerFile, curPwl, compression, lb.debug)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
 		}
@@ -131,7 +133,7 @@ func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDocker
 	return aciLayerPaths, aciManifests, nil
 }
 
-func (lb *FileBackend) BuildACIV22(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (lb *FileBackend) BuildACIV22(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	if len(layerIDs) < 2 {
 		return nil, nil, fmt.Errorf("insufficient layers for oci image")
 	}
@@ -161,18 +163,18 @@ func (lb *FileBackend) BuildACIV22(layerIDs []string, dockerURL *types.ParsedDoc
 		tmpLayerPath := path.Join(tmpDir, parts[1])
 		tmpLayerPath += ".tar"
 		layerTarPath := path.Join(append([]string{"blobs"}, parts...)...)
-		layerFile, err := extractEmbeddedLayer(lb.file, layerTarPath, tmpLayerPath)
+		layerFile, err := extractEmbeddedLayer(lb.file, layerTarPath, tmpLayerPath, lb.info)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error getting layer from file: %v", err)
 		}
 		defer layerFile.Close()
-		log.Debug("Generating layer ACI...")
+		lb.debug.Println("Generating layer ACI...")
 		var aciPath string
 		var manifest *schema.ImageManifest
 		if i != 0 {
 			aciPath, manifest, err = internal.GenerateACI22LowerLayer(dockerURL, parts[1], outputDir, layerFile, curPwl, compression)
 		} else {
-			aciPath, manifest, err = internal.GenerateACI22TopLayer(dockerURL, &imageConfig, parts[1], outputDir, layerFile, curPwl, compression, aciManifests)
+			aciPath, manifest, err = internal.GenerateACI22TopLayer(dockerURL, &imageConfig, parts[1], outputDir, layerFile, curPwl, compression, aciManifests, lb.debug)
 		}
 		if err != nil {
 			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
@@ -186,8 +188,8 @@ func (lb *FileBackend) BuildACIV22(layerIDs []string, dockerURL *types.ParsedDoc
 	return aciLayerPaths, aciManifests, nil
 }
 
-func getImageID(file *os.File, dockerURL *types.ParsedDockerURL, name string) (string, []string, *types.ParsedDockerURL, error) {
-	log.Debug("getting image id...")
+func getImageID(file *os.File, dockerURL *common.ParsedDockerURL, name string, debug log.Logger) (string, []string, *common.ParsedDockerURL, error) {
+	debug.Println("getting image id...")
 	type tags map[string]string
 	type apps map[string]tags
 
@@ -257,10 +259,11 @@ func getImageID(file *os.File, dockerURL *types.ParsedDockerURL, name string) (s
 			}
 
 			if dockerURL == nil {
-				dockerURL = &types.ParsedDockerURL{
-					IndexURL:  "",
-					Tag:       tag,
-					ImageName: appName,
+				dockerURL = &common.ParsedDockerURL{
+					OriginalName: "",
+					IndexURL:     "",
+					Tag:          tag,
+					ImageName:    appName,
 				}
 			}
 
@@ -274,7 +277,7 @@ func getImageID(file *os.File, dockerURL *types.ParsedDockerURL, name string) (s
 			}
 
 			if dockerURL == nil {
-				dockerURL = &types.ParsedDockerURL{
+				dockerURL = &common.ParsedDockerURL{
 					IndexURL:  "",
 					Tag:       tag,
 					ImageName: name,
@@ -391,8 +394,8 @@ func getTarFileBytes(file *os.File, path string) ([]byte, error) {
 	return fileBytes, nil
 }
 
-func extractEmbeddedLayer(file *os.File, layerTarPath string, outputPath string) (*os.File, error) {
-	log.Info("Extracting ", layerTarPath, "\n")
+func extractEmbeddedLayer(file *os.File, layerTarPath string, outputPath string, info log.Logger) (*os.File, error) {
+	info.Println("Extracting ", layerTarPath)
 	_, err := file.Seek(0, 0)
 	if err != nil {
 		return nil, fmt.Errorf("error seeking file: %v", err)
@@ -431,7 +434,7 @@ func extractEmbeddedLayer(file *os.File, layerTarPath string, outputPath string)
 // of dependencies starting from the topmost image to the base.
 // It checks for dependency loops via duplicate detection in the image
 // chain and errors out in such cases.
-func getAncestry(file *os.File, imgID string) ([]string, error) {
+func getAncestry(file *os.File, imgID string, debug log.Logger) ([]string, error) {
 	var ancestry []string
 	deps := make(map[string]bool)
 
@@ -444,8 +447,8 @@ func getAncestry(file *os.File, imgID string) ([]string, error) {
 		}
 		deps[curImgID] = true
 		ancestry = append(ancestry, curImgID)
-		log.Debug(fmt.Sprintf("Getting ancestry for layer %q", curImgID))
-		curImgID, err = getParent(file, curImgID)
+		debug.Printf("Getting ancestry for layer %q", curImgID)
+		curImgID, err = getParent(file, curImgID, debug)
 		if err != nil {
 			return nil, err
 		}
@@ -453,7 +456,7 @@ func getAncestry(file *os.File, imgID string) ([]string, error) {
 	return ancestry, nil
 }
 
-func getParent(file *os.File, imgID string) (string, error) {
+func getParent(file *os.File, imgID string, debug log.Logger) (string, error) {
 	var parent string
 
 	_, err := file.Seek(0, 0)
@@ -485,6 +488,6 @@ func getParent(file *os.File, imgID string) (string, error) {
 		return "", err
 	}
 
-	log.Debug(fmt.Sprintf("Layer %q depends on layer %q", imgID, parent))
+	debug.Printf("Layer %q depends on layer %q", imgID, parent)
 	return parent, nil
 }
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
index 12da855262..8bbe1a1f3d 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
@@ -22,13 +22,12 @@ package repository
 import (
 	"fmt"
 	"net/http"
-	"path"
+	"net/url"
 
 	"github.com/appc/docker2aci/lib/common"
-	"github.com/appc/docker2aci/lib/internal/docker"
-	"github.com/appc/docker2aci/lib/internal/types"
 	"github.com/appc/docker2aci/lib/internal/typesV2"
 	"github.com/appc/docker2aci/lib/internal/util"
+	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/schema"
 )
 
@@ -39,42 +38,64 @@ const (
 	registryV2
 )
 
+type httpStatusErr struct {
+	StatusCode int
+	URL        *url.URL
+}
+
+func (e httpStatusErr) Error() string {
+	return fmt.Sprintf("Unexpected HTTP code: %d, URL: %s", e.StatusCode, e.URL.String())
+}
+
+func isErrHTTP404(err error) bool {
+	if httperr, ok := err.(*httpStatusErr); ok && httperr.StatusCode == http.StatusNotFound {
+		return true
+	}
+	return false
+}
+
 type RepositoryBackend struct {
 	repoData          *RepoData
 	username          string
 	password          string
 	insecure          common.InsecureConfig
+	hostsV1fallback   bool
 	hostsV2Support    map[string]bool
 	hostsV2AuthTokens map[string]map[string]string
 	schema            string
-	imageManifests    map[types.ParsedDockerURL]v2Manifest
-	imageV2Manifests  map[types.ParsedDockerURL]*typesV2.ImageManifest
-	imageConfigs      map[types.ParsedDockerURL]*typesV2.ImageConfig
+	imageManifests    map[common.ParsedDockerURL]v2Manifest
+	imageV2Manifests  map[common.ParsedDockerURL]*typesV2.ImageManifest
+	imageConfigs      map[common.ParsedDockerURL]*typesV2.ImageConfig
 	layersIndex       map[string]int
+
+	debug log.Logger
 }
 
-func NewRepositoryBackend(username string, password string, insecure common.InsecureConfig) *RepositoryBackend {
+func NewRepositoryBackend(username string, password string, insecure common.InsecureConfig, debug log.Logger) *RepositoryBackend {
 	return &RepositoryBackend{
 		username:          username,
 		password:          password,
 		insecure:          insecure,
+		hostsV1fallback:   false,
 		hostsV2Support:    make(map[string]bool),
 		hostsV2AuthTokens: make(map[string]map[string]string),
-		imageManifests:    make(map[types.ParsedDockerURL]v2Manifest),
-		imageV2Manifests:  make(map[types.ParsedDockerURL]*typesV2.ImageManifest),
-		imageConfigs:      make(map[types.ParsedDockerURL]*typesV2.ImageConfig),
+		imageManifests:    make(map[common.ParsedDockerURL]v2Manifest),
+		imageV2Manifests:  make(map[common.ParsedDockerURL]*typesV2.ImageManifest),
+		imageConfigs:      make(map[common.ParsedDockerURL]*typesV2.ImageConfig),
 		layersIndex:       make(map[string]int),
+		debug:             debug,
 	}
 }
 
-func (rb *RepositoryBackend) GetImageInfo(url string) ([]string, *types.ParsedDockerURL, error) {
-	dockerURL, err := docker.ParseDockerURL(url)
+func (rb *RepositoryBackend) GetImageInfo(url string) ([]string, *common.ParsedDockerURL, error) {
+	dockerURL, err := common.ParseDockerURL(url)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	var supportsV2, ok bool
+	var supportsV2, supportsV1, ok bool
 	var URLSchema string
+
 	if supportsV2, ok = rb.hostsV2Support[dockerURL.IndexURL]; !ok {
 		var err error
 		URLSchema, supportsV2, err = rb.supportsRegistry(dockerURL.IndexURL, registryV2)
@@ -85,26 +106,36 @@ func (rb *RepositoryBackend) GetImageInfo(url string) ([]string, *types.ParsedDo
 		rb.hostsV2Support[dockerURL.IndexURL] = supportsV2
 	}
 
+	// try v2
 	if supportsV2 {
-		return rb.getImageInfoV2(dockerURL)
-	} else {
-		URLSchema, supportsV1, err := rb.supportsRegistry(dockerURL.IndexURL, registryV1)
-		if err != nil {
-			return nil, nil, err
+		layers, dockerURL, err := rb.getImageInfoV2(dockerURL)
+		if !isErrHTTP404(err) {
+			return layers, dockerURL, err
 		}
-		if !supportsV1 {
-			return nil, nil, fmt.Errorf("registry doesn't support API v2 nor v1")
-		}
-		rb.schema = URLSchema + "://"
-		return rb.getImageInfoV1(dockerURL)
+		// fallback on 404 failure
+		rb.hostsV1fallback = true
+	}
+
+	URLSchema, supportsV1, err = rb.supportsRegistry(dockerURL.IndexURL, registryV1)
+	if err != nil {
+		return nil, nil, err
 	}
+	if !supportsV1 && rb.hostsV1fallback {
+		return nil, nil, fmt.Errorf("attempted fallback to API v1 but not supported")
+	}
+	if !supportsV1 && !supportsV2 {
+		return nil, nil, fmt.Errorf("registry doesn't support API v2 nor v1")
+	}
+	rb.schema = URLSchema + "://"
+	// try v1, hard fail on failure
+	return rb.getImageInfoV1(dockerURL)
 }
 
-func (rb *RepositoryBackend) BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
-	if rb.hostsV2Support[dockerURL.IndexURL] {
-		return rb.buildACIV2(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
-	} else {
+func (rb *RepositoryBackend) BuildACI(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+	if rb.hostsV1fallback || !rb.hostsV2Support[dockerURL.IndexURL] {
 		return rb.buildACIV1(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+	} else {
+		return rb.buildACIV2(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
 	}
 }
 
@@ -130,13 +161,12 @@ func (rb *RepositoryBackend) supportsRegistry(indexURL string, version registryV
 	case registryV1:
 		URLPath = "v1/_ping"
 	case registryV2:
-		URLPath = "v2"
+		URLPath = "v2/"
 	}
-	URLStr := path.Join(indexURL, URLPath)
 
 	fetch := func(schema string) (res *http.Response, err error) {
-		url := schema + "://" + URLStr
-		req, err := http.NewRequest("GET", url, nil)
+		u := url.URL{Scheme: schema, Host: indexURL, Path: URLPath}
+		req, err := http.NewRequest("GET", u.String(), nil)
 		if err != nil {
 			return nil, err
 		}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
index 7d4fe91734..69aad8565e 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
@@ -30,7 +30,6 @@ import (
 	"github.com/appc/docker2aci/lib/internal"
 	"github.com/appc/docker2aci/lib/internal/types"
 	"github.com/appc/docker2aci/lib/internal/util"
-	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/schema"
 	"github.com/coreos/ioprogress"
 )
@@ -41,7 +40,7 @@ type RepoData struct {
 	Cookie    []string
 }
 
-func (rb *RepositoryBackend) getImageInfoV1(dockerURL *types.ParsedDockerURL) ([]string, *types.ParsedDockerURL, error) {
+func (rb *RepositoryBackend) getImageInfoV1(dockerURL *common.ParsedDockerURL) ([]string, *common.ParsedDockerURL, error) {
 	repoData, err := rb.getRepoDataV1(dockerURL.IndexURL, dockerURL.ImageName)
 	if err != nil {
 		return nil, nil, fmt.Errorf("error getting repository data: %v", err)
@@ -63,7 +62,7 @@ func (rb *RepositoryBackend) getImageInfoV1(dockerURL *types.ParsedDockerURL) ([
 	return ancestry, dockerURL, nil
 }
 
-func (rb *RepositoryBackend) buildACIV1(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (rb *RepositoryBackend) buildACIV1(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	layerFiles := make([]*os.File, len(layerIDs))
 	layerDatas := make([]types.DockerImageData, len(layerIDs))
 
@@ -121,8 +120,8 @@ func (rb *RepositoryBackend) buildACIV1(layerIDs []string, dockerURL *types.Pars
 	var curPwl []string
 
 	for i := len(layerIDs) - 1; i >= 0; i-- {
-		log.Debug("Generating layer ACI...")
-		aciPath, manifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression)
+		rb.debug.Println("Generating layer ACI...")
+		aciPath, manifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression, rb.debug)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
 		}
@@ -158,7 +157,7 @@ func (rb *RepositoryBackend) getRepoDataV1(indexURL string, remote string) (*Rep
 	defer res.Body.Close()
 
 	if res.StatusCode != 200 {
-		return nil, fmt.Errorf("HTTP code: %d, URL: %s", res.StatusCode, req.URL)
+		return nil, &httpStatusErr{res.StatusCode, req.URL}
 	}
 
 	var tokens []string
@@ -206,7 +205,7 @@ func (rb *RepositoryBackend) getImageIDFromTagV1(registry string, appName string
 	defer res.Body.Close()
 
 	if res.StatusCode != 200 {
-		return "", fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
+		return "", &httpStatusErr{res.StatusCode, req.URL}
 	}
 
 	j, err := ioutil.ReadAll(res.Body)
@@ -245,7 +244,7 @@ func (rb *RepositoryBackend) getAncestryV1(imgID, registry string, repoData *Rep
 	defer res.Body.Close()
 
 	if res.StatusCode != 200 {
-		return nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
+		return nil, &httpStatusErr{res.StatusCode, req.URL}
 	}
 
 	var ancestry []string
@@ -277,7 +276,7 @@ func (rb *RepositoryBackend) getJsonV1(imgID, registry string, repoData *RepoDat
 	defer res.Body.Close()
 
 	if res.StatusCode != 200 {
-		return nil, -1, fmt.Errorf("HTTP code: %d, URL: %s", res.StatusCode, req.URL)
+		return nil, -1, &httpStatusErr{res.StatusCode, req.URL}
 	}
 
 	imageSize := int64(-1)
@@ -315,7 +314,7 @@ func (rb *RepositoryBackend) getLayerV1(imgID, registry string, repoData *RepoDa
 
 	if res.StatusCode != 200 {
 		res.Body.Close()
-		return nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
+		return nil, &httpStatusErr{res.StatusCode, req.URL}
 	}
 
 	// if we didn't receive the size via X-Docker-Size when we retrieved the
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
index e34a8de434..cd3bc2b4b8 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -33,7 +33,6 @@ import (
 	"github.com/appc/docker2aci/lib/internal/types"
 	"github.com/appc/docker2aci/lib/internal/typesV2"
 	"github.com/appc/docker2aci/lib/internal/util"
-	"github.com/appc/docker2aci/pkg/log"
 	"github.com/appc/spec/schema"
 	"github.com/coreos/pkg/progressutil"
 )
@@ -55,7 +54,7 @@ type v2Manifest struct {
 	Signature []byte `json:"signature"`
 }
 
-func (rb *RepositoryBackend) getImageInfoV2(dockerURL *types.ParsedDockerURL) ([]string, *types.ParsedDockerURL, error) {
+func (rb *RepositoryBackend) getImageInfoV2(dockerURL *common.ParsedDockerURL) ([]string, *common.ParsedDockerURL, error) {
 	layers, err := rb.getManifestV2(dockerURL)
 	if err != nil {
 		return nil, nil, err
@@ -64,7 +63,7 @@ func (rb *RepositoryBackend) getImageInfoV2(dockerURL *types.ParsedDockerURL) ([
 	return layers, dockerURL, nil
 }
 
-func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	_, isVersion22 := rb.imageV2Manifests[*dockerURL]
 	if isVersion22 {
 		return rb.buildACIV22(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
@@ -72,7 +71,7 @@ func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *types.Pars
 	return rb.buildACIV21(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
 }
 
-func (rb *RepositoryBackend) buildACIV21(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (rb *RepositoryBackend) buildACIV21(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	layerFiles := make([]*os.File, len(layerIDs))
 	layerDatas := make([]types.DockerImageData, len(layerIDs))
 
@@ -160,8 +159,8 @@ func (rb *RepositoryBackend) buildACIV21(layerIDs []string, dockerURL *types.Par
 	var aciManifests []*schema.ImageManifest
 	var curPwl []string
 	for i := len(layerIDs) - 1; i >= 0; i-- {
-		log.Debug("Generating layer ACI...")
-		aciPath, aciManifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression)
+		rb.debug.Println("Generating layer ACI...")
+		aciPath, aciManifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression, rb.debug)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
 		}
@@ -182,7 +181,7 @@ type layer struct {
 	err    error
 }
 
-func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	layerFiles := make([]*os.File, len(layerIDs))
 
 	tmpParentDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
@@ -259,7 +258,7 @@ func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *types.Par
 	var curPwl []string
 	var i int
 	for i = 0; i < len(layerIDs)-1; i++ {
-		log.Debug("Generating layer ACI...")
+		rb.debug.Println("Generating layer ACI...")
 		aciPath, aciManifest, err := internal.GenerateACI22LowerLayer(dockerURL, layerIDs[i], outputDir, layerFiles[i], curPwl, compression)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
@@ -268,8 +267,8 @@ func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *types.Par
 		aciManifests = append(aciManifests, aciManifest)
 		curPwl = aciManifest.PathWhitelist
 	}
-	log.Debug("Generating layer ACI...")
-	aciPath, aciManifest, err := internal.GenerateACI22TopLayer(dockerURL, rb.imageConfigs[*dockerURL], layerIDs[i], outputDir, layerFiles[i], curPwl, compression, aciManifests)
+	rb.debug.Println("Generating layer ACI...")
+	aciPath, aciManifest, err := internal.GenerateACI22TopLayer(dockerURL, rb.imageConfigs[*dockerURL], layerIDs[i], outputDir, layerFiles[i], curPwl, compression, aciManifests, rb.debug)
 	if err != nil {
 		return nil, nil, fmt.Errorf("error generating ACI: %v", err)
 	}
@@ -279,7 +278,7 @@ func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *types.Par
 	return aciLayerPaths, aciManifests, nil
 }
 
-func (rb *RepositoryBackend) getManifestV2(dockerURL *types.ParsedDockerURL) ([]string, error) {
+func (rb *RepositoryBackend) getManifestV2(dockerURL *common.ParsedDockerURL) ([]string, error) {
 	var reference string
 	if dockerURL.Digest != "" {
 		reference = dockerURL.Digest
@@ -308,7 +307,7 @@ func (rb *RepositoryBackend) getManifestV2(dockerURL *types.ParsedDockerURL) ([]
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("unexpected http code: %d, URL: %s", res.StatusCode, req.URL)
+		return nil, &httpStatusErr{res.StatusCode, req.URL}
 	}
 
 	switch res.Header.Get("content-type") {
@@ -320,7 +319,7 @@ func (rb *RepositoryBackend) getManifestV2(dockerURL *types.ParsedDockerURL) ([]
 	return rb.getManifestV21(dockerURL, res)
 }
 
-func (rb *RepositoryBackend) getManifestV21(dockerURL *types.ParsedDockerURL, res *http.Response) ([]string, error) {
+func (rb *RepositoryBackend) getManifestV21(dockerURL *common.ParsedDockerURL, res *http.Response) ([]string, error) {
 	manblob, err := ioutil.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
@@ -361,7 +360,7 @@ func (rb *RepositoryBackend) getManifestV21(dockerURL *types.ParsedDockerURL, re
 	return layers, nil
 }
 
-func (rb *RepositoryBackend) getManifestV22(dockerURL *types.ParsedDockerURL, res *http.Response) ([]string, error) {
+func (rb *RepositoryBackend) getManifestV22(dockerURL *common.ParsedDockerURL, res *http.Response) ([]string, error) {
 	manblob, err := ioutil.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
@@ -392,7 +391,7 @@ func (rb *RepositoryBackend) getManifestV22(dockerURL *types.ParsedDockerURL, re
 	return layers, nil
 }
 
-func (rb *RepositoryBackend) getConfigV22(dockerURL *types.ParsedDockerURL, configDigest string) error {
+func (rb *RepositoryBackend) getConfigV22(dockerURL *common.ParsedDockerURL, configDigest string) error {
 	url := rb.schema + path.Join(dockerURL.IndexURL, "v2", dockerURL.ImageName, "blobs", configDigest)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
@@ -474,7 +473,7 @@ func fixManifestLayers(manifest *v2Manifest) error {
 	return nil
 }
 
-func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedDockerURL, tmpDir string, copier *progressutil.CopyProgressPrinter) (*os.File, io.ReadCloser, error) {
+func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *common.ParsedDockerURL, tmpDir string, copier *progressutil.CopyProgressPrinter) (*os.File, io.ReadCloser, error) {
 	var (
 		err error
 		res *http.Response
@@ -520,7 +519,7 @@ func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *types.ParsedD
 	}
 
 	if res.StatusCode != http.StatusOK {
-		return nil, nil, fmt.Errorf("HTTP code: %d. URL: %s", res.StatusCode, req.URL)
+		return nil, nil, &httpStatusErr{res.StatusCode, req.URL}
 	}
 
 	var in io.Reader
@@ -638,7 +637,7 @@ func (rb *RepositoryBackend) makeRequest(req *http.Request, repo string, acceptH
 	case http.StatusOK:
 		break
 	default:
-		return nil, fmt.Errorf("unexpected http code: %d, URL: %s", res.StatusCode, authReq.URL)
+		return nil, &httpStatusErr{res.StatusCode, authReq.URL}
 	}
 
 	tokenBlob, err := ioutil.ReadAll(res.Body)
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go b/vendor/github.com/appc/docker2aci/lib/internal/docker/docker.go
similarity index 84%
rename from vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
rename to vendor/github.com/appc/docker2aci/lib/internal/docker/docker.go
index a6e955b8be..c1c3c08250 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/docker/docker_functions.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/docker/docker.go
@@ -25,8 +25,6 @@ import (
 	"strings"
 
 	"github.com/appc/docker2aci/lib/internal/types"
-
-	"github.com/docker/distribution/reference"
 )
 
 const (
@@ -34,7 +32,6 @@ const (
 	dockercfgFileNameOld = ".dockercfg"
 	defaultIndexURL      = "registry-1.docker.io"
 	defaultIndexURLAuth  = "https://index.docker.io/v1/"
-	defaultTag           = "latest"
 	defaultRepoPrefix    = "library/"
 )
 
@@ -131,32 +128,3 @@ func GetAuthInfo(indexServer string) (string, string, error) {
 	}
 	return "", "", nil
 }
-
-// ParseDockerURL takes a Docker URL and returns a ParsedDockerURL with its
-// index URL, image name, and tag.
-func ParseDockerURL(arg string) (*types.ParsedDockerURL, error) {
-	r, err := reference.ParseNamed(arg)
-	if err != nil {
-		return nil, err
-	}
-
-	var tag, digest string
-	switch x := r.(type) {
-	case reference.Canonical:
-		digest = x.Digest().String()
-	case reference.NamedTagged:
-		tag = x.Tag()
-	default:
-		tag = defaultTag
-	}
-
-	indexURL, remoteName := SplitReposName(r.Name())
-
-	p := &types.ParsedDockerURL{
-		IndexURL:  indexURL,
-		ImageName: remoteName,
-		Tag:       tag,
-		Digest:    digest,
-	}
-	return p, nil
-}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/internal.go b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
index e9d1f71d6f..2f115d94a2 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/internal.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
@@ -53,13 +53,13 @@ import (
 // BuildACI takes a Docker layer, converts it to ACI and returns its output
 // path and its converted ImageManifest.
 type Docker2ACIBackend interface {
-	GetImageInfo(dockerUrl string) ([]string, *types.ParsedDockerURL, error)
-	BuildACI(layerIDs []string, dockerURL *types.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error)
+	GetImageInfo(dockerUrl string) ([]string, *common.ParsedDockerURL, error)
+	BuildACI(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error)
 }
 
 // GenerateACI takes a Docker layer and generates an ACI from it.
-func GenerateACI(layerNumber int, layerData types.DockerImageData, dockerURL *types.ParsedDockerURL, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
-	manifest, err := GenerateManifest(layerData, dockerURL)
+func GenerateACI(layerNumber int, layerData types.DockerImageData, dockerURL *common.ParsedDockerURL, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression, debug log.Logger) (string, *schema.ImageManifest, error) {
+	manifest, err := GenerateManifest(layerData, dockerURL, debug)
 	if err != nil {
 		return "", nil, fmt.Errorf("error generating the manifest: %v", err)
 	}
@@ -79,7 +79,7 @@ func GenerateACI(layerNumber int, layerData types.DockerImageData, dockerURL *ty
 	return aciPath, manifest, nil
 }
 
-func GenerateACI22LowerLayer(dockerURL *types.ParsedDockerURL, layerDigest string, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
+func GenerateACI22LowerLayer(dockerURL *common.ParsedDockerURL, layerDigest string, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression) (string, *schema.ImageManifest, error) {
 	formattedDigest := strings.Replace(layerDigest, ":", "-", -1)
 	aciName := fmt.Sprintf("%s/%s-%s", dockerURL.IndexURL, dockerURL.ImageName, formattedDigest)
 	sanitizedAciName, err := appctypes.SanitizeACIdentifier(aciName)
@@ -104,13 +104,13 @@ func GenerateACI22LowerLayer(dockerURL *types.ParsedDockerURL, layerDigest strin
 	return aciPath, manifest, nil
 }
 
-func GenerateACI22TopLayer(dockerURL *types.ParsedDockerURL, imageConfig *typesV2.ImageConfig, layerDigest string, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression, lowerLayers []*schema.ImageManifest) (string, *schema.ImageManifest, error) {
+func GenerateACI22TopLayer(dockerURL *common.ParsedDockerURL, imageConfig *typesV2.ImageConfig, layerDigest string, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression, lowerLayers []*schema.ImageManifest, debug log.Logger) (string, *schema.ImageManifest, error) {
 	aciName := fmt.Sprintf("%s/%s-%s", dockerURL.IndexURL, dockerURL.ImageName, layerDigest)
 	sanitizedAciName, err := appctypes.SanitizeACIdentifier(aciName)
 	if err != nil {
 		return "", nil, err
 	}
-	manifest, err := GenerateManifestV22(sanitizedAciName, dockerURL, imageConfig, layerDigest, lowerLayers)
+	manifest, err := GenerateManifestV22(sanitizedAciName, dockerURL, imageConfig, layerDigest, lowerLayers, debug)
 	if err != nil {
 		return "", nil, err
 	}
@@ -168,7 +168,7 @@ func generateEPCmdAnnotation(dockerEP, dockerCmd []string) (string, string, erro
 
 // GenerateManifest converts the docker manifest format to an appc
 // ImageManifest.
-func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDockerURL) (*schema.ImageManifest, error) {
+func GenerateManifest(layerData types.DockerImageData, dockerURL *common.ParsedDockerURL, debug log.Logger) (*schema.ImageManifest, error) {
 	dockerConfig := layerData.Config
 	genManifest := &schema.ImageManifest{}
 
@@ -226,6 +226,7 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDo
 		addAnno("created", layerData.Created.Format(time.RFC3339))
 	}
 	addAnno("docker-comment", layerData.Comment)
+	addAnno(common.AppcDockerOriginalName, dockerURL.OriginalName)
 	addAnno(common.AppcDockerRegistryURL, dockerURL.IndexURL)
 	addAnno(common.AppcDockerRepository, dockerURL.ImageName)
 	addAnno(common.AppcDockerImageID, layerData.ID)
@@ -233,44 +234,44 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *types.ParsedDo
 
 	if dockerConfig != nil {
 		exec := getExecCommand(dockerConfig.Entrypoint, dockerConfig.Cmd)
-		if exec != nil {
-			user, group := parseDockerUser(dockerConfig.User)
-			var env appctypes.Environment
-			for _, v := range dockerConfig.Env {
-				parts := strings.SplitN(v, "=", 2)
-				env.Set(parts[0], parts[1])
-			}
-			app := &appctypes.App{
-				Exec:             exec,
-				User:             user,
-				Group:            group,
-				Environment:      env,
-				WorkingDirectory: dockerConfig.WorkingDir,
-			}
+		user, group := parseDockerUser(dockerConfig.User)
+		var env appctypes.Environment
+		for _, v := range dockerConfig.Env {
+			parts := strings.SplitN(v, "=", 2)
+			env.Set(parts[0], parts[1])
+		}
+		app := &appctypes.App{
+			Exec:             exec,
+			User:             user,
+			Group:            group,
+			Environment:      env,
+			WorkingDirectory: dockerConfig.WorkingDir,
+		}
 
-			app.MountPoints, err = convertVolumesToMPs(dockerConfig.Volumes)
-			if err != nil {
-				return nil, err
-			}
+		app.UserLabels = dockerConfig.Labels
 
-			app.Ports, err = convertPorts(dockerConfig.ExposedPorts, dockerConfig.PortSpecs)
-			if err != nil {
-				return nil, err
-			}
+		app.MountPoints, err = convertVolumesToMPs(dockerConfig.Volumes)
+		if err != nil {
+			return nil, err
+		}
 
-			ep, cmd, err := generateEPCmdAnnotation(dockerConfig.Entrypoint, dockerConfig.Cmd)
-			if err != nil {
-				return nil, err
-			}
-			if len(ep) > 0 {
-				addAnno(common.AppcDockerEntrypoint, ep)
-			}
-			if len(cmd) > 0 {
-				addAnno(common.AppcDockerCmd, cmd)
-			}
+		app.Ports, err = convertPorts(dockerConfig.ExposedPorts, dockerConfig.PortSpecs, debug)
+		if err != nil {
+			return nil, err
+		}
 
-			genManifest.App = app
+		ep, cmd, err := generateEPCmdAnnotation(dockerConfig.Entrypoint, dockerConfig.Cmd)
+		if err != nil {
+			return nil, err
+		}
+		if len(ep) > 0 {
+			addAnno(common.AppcDockerEntrypoint, ep)
 		}
+		if len(cmd) > 0 {
+			addAnno(common.AppcDockerCmd, cmd)
+		}
+
+		genManifest.App = app
 	}
 
 	if layerData.Parent != "" {
@@ -328,7 +329,7 @@ func GenerateEmptyManifest(name string) (*schema.ImageManifest, error) {
 	}, nil
 }
 
-func GenerateManifestV22(name string, dockerURL *types.ParsedDockerURL, config *typesV2.ImageConfig, imageDigest string, lowerLayers []*schema.ImageManifest) (*schema.ImageManifest, error) {
+func GenerateManifestV22(name string, dockerURL *common.ParsedDockerURL, config *typesV2.ImageConfig, imageDigest string, lowerLayers []*schema.ImageManifest, debug log.Logger) (*schema.ImageManifest, error) {
 	manifest, err := GenerateEmptyManifest(name)
 	if err != nil {
 		return nil, err
@@ -356,6 +357,7 @@ func GenerateManifestV22(name string, dockerURL *types.ParsedDockerURL, config *
 	addAnno("author", config.Author)
 	addAnno("created", config.Created)
 
+	addAnno(common.AppcDockerOriginalName, dockerURL.OriginalName)
 	addAnno(common.AppcDockerRegistryURL, dockerURL.IndexURL)
 	addAnno(common.AppcDockerRepository, dockerURL.ImageName)
 	addAnno(common.AppcDockerImageID, imageDigest)
@@ -381,7 +383,7 @@ func GenerateManifestV22(name string, dockerURL *types.ParsedDockerURL, config *
 		if err != nil {
 			return nil, err
 		}
-		manifest.App.Ports, err = convertPorts(innerCfg.ExposedPorts, nil)
+		manifest.App.Ports, err = convertPorts(innerCfg.ExposedPorts, nil, debug)
 		if err != nil {
 			return nil, err
 		}
@@ -448,7 +450,7 @@ func (s appcPortSorter) Less(i, j int) bool {
 	return s[i].Name.String() < s[j].Name.String()
 }
 
-func convertPorts(dockerExposedPorts map[string]struct{}, dockerPortSpecs []string) ([]appctypes.Port, error) {
+func convertPorts(dockerExposedPorts map[string]struct{}, dockerPortSpecs []string, debug log.Logger) ([]appctypes.Port, error) {
 	ports := []appctypes.Port{}
 
 	for ep := range dockerExposedPorts {
@@ -460,7 +462,7 @@ func convertPorts(dockerExposedPorts map[string]struct{}, dockerPortSpecs []stri
 	}
 
 	if dockerExposedPorts == nil && dockerPortSpecs != nil {
-		log.Debug("warning: docker image uses deprecated PortSpecs field")
+		debug.Println("warning: docker image uses deprecated PortSpecs field")
 		for _, ep := range dockerPortSpecs {
 			appcPort, err := parseDockerPort(ep)
 			if err != nil {
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/types/docker_types.go b/vendor/github.com/appc/docker2aci/lib/internal/types/docker_types.go
index 7af1e17e7a..35116b81f5 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/types/docker_types.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/types/docker_types.go
@@ -62,6 +62,7 @@ type DockerImageConfig struct {
 	NetworkDisabled bool
 	MacAddress      string
 	OnBuild         []string
+	Labels          map[string]string
 }
 
 // DockerAuthConfigOld represents the deprecated ~/.dockercfg auth
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/types/types.go b/vendor/github.com/appc/docker2aci/lib/internal/types/types.go
deleted file mode 100644
index cc4fc12ac8..0000000000
--- a/vendor/github.com/appc/docker2aci/lib/internal/types/types.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015 The appc Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package types defines Docker image, URL and configuration types.
-//
-// Note: this package is an implementation detail and shouldn't be used outside
-// of docker2aci.
-package types
-
-// ParsedDockerURL represents a parsed Docker URL.
-type ParsedDockerURL struct {
-	IndexURL  string
-	ImageName string
-	Tag       string
-	Digest    string
-}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go b/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
index 7c43c50159..f8305f757d 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
@@ -17,6 +17,8 @@ package typesV2
 import (
 	"encoding/json"
 	"errors"
+
+	spec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 const (
@@ -29,10 +31,10 @@ const (
 	MediaTypeDockerV22Config       = "application/vnd.docker.container.image.v1+json"
 	MediaTypeDockerV22RootFS       = "application/vnd.docker.image.rootfs.diff.tar.gzip"
 
-	MediaTypeOCIManifest     = "application/vnd.oci.image.manifest.v1+json"
-	MediaTypeOCIManifestList = "application/vnd.oci.image.manifest.list.v1+json"
-	MediaTypeOCIConfig       = "application/vnd.oci.image.config.v1+json"
-	MediaTypeOCILayer        = "application/vnd.oci.image.layer.tar+gzip"
+	MediaTypeOCIManifest     = spec.MediaTypeImageManifest
+	MediaTypeOCIManifestList = spec.MediaTypeImageManifestList
+	MediaTypeOCIConfig       = spec.MediaTypeImageConfig
+	MediaTypeOCILayer        = spec.MediaTypeImageLayer
 )
 
 var (
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index 48a416d106..831d47f690 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.13.0"
+var Version = "0.14.0"
 var AppcVersion = schema.AppContainerVersion
diff --git a/vendor/github.com/appc/docker2aci/main.go b/vendor/github.com/appc/docker2aci/main.go
index e52ca29769..7aaf4a3ce0 100644
--- a/vendor/github.com/appc/docker2aci/main.go
+++ b/vendor/github.com/appc/docker2aci/main.go
@@ -55,9 +55,13 @@ func printVersion() {
 }
 
 func runDocker2ACI(arg string) error {
+	debug := log.NewNopLogger()
+	info := log.NewStdLogger(os.Stderr)
+
 	if flagDebug {
-		log.InitDebug()
+		debug = log.NewStdLogger(os.Stderr)
 	}
+
 	squash := !flagNoSquash
 
 	var aciLayerPaths []string
@@ -83,6 +87,8 @@ func runDocker2ACI(arg string) error {
 		OutputDir:   ".",
 		TmpDir:      os.TempDir(),
 		Compression: compression,
+		Debug:       debug,
+		Info:        info,
 	}
 	if u.Scheme == "docker" {
 		if flagImage != "" {
diff --git a/vendor/github.com/appc/docker2aci/pkg/log/log.go b/vendor/github.com/appc/docker2aci/pkg/log/log.go
index 2a02c47414..152be50186 100644
--- a/vendor/github.com/appc/docker2aci/pkg/log/log.go
+++ b/vendor/github.com/appc/docker2aci/pkg/log/log.go
@@ -15,32 +15,37 @@
 package log
 
 import (
-	"fmt"
 	"io"
-	"os"
-	"strings"
+	stdlog "log"
 )
 
-var debugEnabled bool
+// Logger is the interface that enables logging.
+// It is compatible with the stdlib "log" methods.
+// It is also compatible with https://godoc.org/github.com/Sirupsen/logrus#StdLogger.
+type Logger interface {
+	Print(...interface{})
+	Printf(string, ...interface{})
+	Println(...interface{})
+}
+
+func NewStdLogger(out io.Writer) Logger {
+	return stdlog.New(out, "", 0)
+}
+
+type nopLogger struct{}
 
-func printTo(w io.Writer, i ...interface{}) {
-	s := fmt.Sprint(i...)
-	fmt.Fprintln(w, strings.TrimSuffix(s, "\n"))
+func NewNopLogger() Logger {
+	return &nopLogger{}
 }
 
-// Info prints a message to stderr.
-func Info(i ...interface{}) {
-	printTo(os.Stderr, i...)
+func (l *nopLogger) Print(...interface{}) {
+	// nop
 }
 
-// Debug prints a message to stderr if debug is enabled.
-func Debug(i ...interface{}) {
-	if debugEnabled {
-		printTo(os.Stderr, i...)
-	}
+func (l *nopLogger) Printf(string, ...interface{}) {
+	// nop
 }
 
-// InitDebug enables debug output.
-func InitDebug() {
-	debugEnabled = true
+func (l *nopLogger) Println(...interface{}) {
+	// nop
 }
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go
new file mode 100644
index 0000000000..ccf3af9f3f
--- /dev/null
+++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go
@@ -0,0 +1,99 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v1
+
+// ImageConfig defines the execution parameters which should be used as a base when running a container using an image.
+type ImageConfig struct {
+	// User defines the username or UID which the process in the container should run as.
+	User string `json:"User"`
+
+	// Memory defines the memory limit.
+	Memory int64 `json:"Memory"`
+
+	// MemorySwap defines the total memory usage limit (memory + swap).
+	MemorySwap int64 `json:"MemorySwap"`
+
+	// CPUShares is the CPU shares (relative weight vs. other containers).
+	CPUShares int64 `json:"CpuShares"`
+
+	// ExposedPorts a set of ports to expose from a container running this image.
+	ExposedPorts map[string]struct{} `json:"ExposedPorts"`
+
+	// Env is a list of environment variables to be used in a container.
+	Env []string `json:"Env"`
+
+	// Entrypoint defines a list of arguments to use as the command to execute when the container starts.
+	Entrypoint []string `json:"Entrypoint"`
+
+	// Cmd defines the default arguments to the entrypoint of the container.
+	Cmd []string `json:"Cmd"`
+
+	// Volumes is a set of directories which should be created as data volumes in a container running this image.
+	Volumes map[string]struct{} `json:"Volumes"`
+
+	// WorkingDir sets the current working directory of the entrypoint process in the container.
+	WorkingDir string `json:"WorkingDir"`
+}
+
+// RootFS describes a layer content addresses
+type RootFS struct {
+	// Type is the type of the rootfs.
+	Type string `json:"type"`
+
+	// DiffIDs is an array of layer content hashes (DiffIDs), in order from bottom-most to top-most.
+	DiffIDs []string `json:"diff_ids"`
+}
+
+// History describes the history of a layer.
+type History struct {
+	// Created is the creation time.
+	Created string `json:"created"`
+
+	// CreatedBy is the command which created the layer.
+	CreatedBy string `json:"created_by"`
+
+	// Author is the author of the build point.
+	Author string `json:"author"`
+
+	// Comment is a custom message set when creating the layer.
+	Comment string `json:"comment"`
+
+	// EmptyLayer is used to mark if the history item created a filesystem diff.
+	EmptyLayer bool `json:"empty_layer"`
+}
+
+// Image is the JSON structure which describes some basic information about the image.
+type Image struct {
+	// Created defines an ISO-8601 formatted combined date and time at which the image was created.
+	Created string `json:"created"`
+
+	// Author defines the name and/or email address of the person or entity which created and is responsible for maintaining the image.
+	Author string `json:"author"`
+
+	// Architecture is the CPU architecture which the binaries in this image are built to run on.
+	Architecture string `json:"architecture"`
+
+	// OS is the name of the operating system which the image is built to run on.
+	OS string `json:"os"`
+
+	// Config defines the execution parameters which should be used as a base when running a container using the image.
+	Config ImageConfig `json:"config"`
+
+	// RootFS references the layer content addresses used by the image.
+	RootFS RootFS `json:"rootfs"`
+
+	// History describes the history of each layer.
+	History []History `json:"history"`
+}
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go
similarity index 98%
rename from vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go
rename to vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go
index 7a2065598b..a086f1501b 100644
--- a/vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go
+++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package specs
+package v1
 
 // Descriptor describes the disposition of targeted content.
 type Descriptor struct {
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go
new file mode 100644
index 0000000000..d8b06306c2
--- /dev/null
+++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go
@@ -0,0 +1,32 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v1
+
+import "github.com/opencontainers/image-spec/specs-go"
+
+// Manifest defines a schema2 manifest
+type Manifest struct {
+	specs.Versioned
+
+	// Config references a configuration object for a container, by digest.
+	// The referenced configuration object is a JSON blob that the runtime uses to set up the container.
+	Config Descriptor `json:"config"`
+
+	// Layers is an indexed list of layers referenced by the manifest.
+	Layers []Descriptor `json:"layers"`
+
+	// Annotations contains arbitrary metadata for the manifest list.
+	Annotations map[string]string `json:"annotations"`
+}
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go
new file mode 100644
index 0000000000..0ad015d545
--- /dev/null
+++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go
@@ -0,0 +1,62 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v1
+
+import "github.com/opencontainers/image-spec/specs-go"
+
+// Platform describes the platform which the image in the manifest runs on.
+type Platform struct {
+	// Architecture field specifies the CPU architecture, for example
+	// `amd64` or `ppc64`.
+	Architecture string `json:"architecture"`
+
+	// OS specifies the operating system, for example `linux` or `windows`.
+	OS string `json:"os"`
+
+	// OSVersion is an optional field specifying the operating system
+	// version, for example `10.0.10586`.
+	OSVersion string `json:"os.version,omitempty"`
+
+	// OSFeatures is an optional field specifying an array of strings,
+	// each listing a required OS feature (for example on Windows `win32k`).
+	OSFeatures []string `json:"os.features,omitempty"`
+
+	// Variant is an optional field specifying a variant of the CPU, for
+	// example `ppc64le` to specify a little-endian version of a PowerPC CPU.
+	Variant string `json:"variant,omitempty"`
+
+	// Features is an optional field specifying an array of strings, each
+	// listing a required CPU feature (for example `sse4` or `aes`).
+	Features []string `json:"features,omitempty"`
+}
+
+// ManifestDescriptor describes a platform specific manifest.
+type ManifestDescriptor struct {
+	Descriptor
+
+	// Platform describes the platform which the image in the manifest runs on.
+	Platform Platform `json:"platform"`
+}
+
+// ManifestList  references manifests for various platforms.
+type ManifestList struct {
+	specs.Versioned
+
+	// Manifests references platform specific manifests.
+	Manifests []ManifestDescriptor `json:"manifests"`
+
+	// Annotations contains arbitrary metadata for the manifest list.
+	Annotations map[string]string `json:"annotations"`
+}
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go
new file mode 100644
index 0000000000..d6592f5494
--- /dev/null
+++ b/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go
@@ -0,0 +1,36 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v1
+
+const (
+	// MediaTypeDescriptor specifies the media type for a content descriptor.
+	MediaTypeDescriptor = "application/vnd.oci.descriptor.v1+json"
+
+	// MediaTypeImageManifest specifies the media type for an image manifest.
+	MediaTypeImageManifest = "application/vnd.oci.image.manifest.v1+json"
+
+	// MediaTypeImageManifestList specifies the media type for an image manifest list.
+	MediaTypeImageManifestList = "application/vnd.oci.image.manifest.list.v1+json"
+
+	// MediaTypeImageLayer is the media type used for layers referenced by the manifest.
+	MediaTypeImageLayer = "application/vnd.oci.image.layer.v1.tar+gzip"
+
+	// MediaTypeImageLayerNonDistributable is the media type for layers referenced by
+	// the manifest but with distribution restrictions.
+	MediaTypeImageLayerNonDistributable = "application/vnd.oci.image.layer.nondistributable.v1.tar+gzip"
+
+	// MediaTypeImageConfig specifies the media type for the image configuration.
+	MediaTypeImageConfig = "application/vnd.oci.image.config.v1+json"
+)
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/version.go b/vendor/github.com/opencontainers/image-spec/specs-go/version.go
index 0815d055e1..860cd3b4b1 100644
--- a/vendor/github.com/opencontainers/image-spec/specs-go/version.go
+++ b/vendor/github.com/opencontainers/image-spec/specs-go/version.go
@@ -25,7 +25,7 @@ const (
 	VersionPatch = 0
 
 	// VersionDev indicates development branch. Releases will be empty string.
-	VersionDev = "-rc1"
+	VersionDev = "-rc2"
 )
 
 // Version is the specification version that the package types support.

From f593fb8ac2d75c89a06d0a22dd30d397a884ed1b Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Mon, 7 Nov 2016 14:54:32 +0100
Subject: [PATCH 0861/1304] gc: make sure CNI_PATH is same for gc and init

We were not passing the --local-config flag through during gc.

Also passes the right CNI_VERSION environment variable.

Fixes #3133
---
 .../devel/stage1-implementors-guide.md        |  4 +
 networking/net_plugin.go                      |  2 +-
 networking/networking.go                      |  7 +-
 rkt/gc.go                                     |  2 +-
 stage0/gc.go                                  | 10 +-
 stage0/manifest.go                            |  4 +
 stage1/aci/aci-manifest.in                    |  2 +-
 stage1/gc/gc.go                               | 13 ++-
 .../etc/rkt/net.d/99-default-restricted.conf  |  1 +
 .../net/rootfs/etc/rkt/net.d/99-default.conf  |  1 +
 stage1_fly/aci/aci-manifest.in                |  2 +-
 stage1_fly/gc/main.go                         |  5 +-
 tests/rkt_net_test.go                         | 95 +++++++++++--------
 13 files changed, 93 insertions(+), 55 deletions(-)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 0dc3679d3f..e6ba2aa24d 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -132,6 +132,10 @@ For example, it removes the network namespace of a pod.
 * `--debug` to activate debugging
 * UUID of the pod
 
+
+#### Arguments added in interface version 5
+* `--local-config`: The rkt configuration directory - defaults to `/etc/rkt` if not supplied.
+
 ### rkt stop
 
 `coreos.com/rkt/stage1/stop`
diff --git a/networking/net_plugin.go b/networking/net_plugin.go
index 76689c8ca6..b200bc052e 100644
--- a/networking/net_plugin.go
+++ b/networking/net_plugin.go
@@ -119,7 +119,7 @@ func (e *podEnv) execNetPlugin(cmd string, n *activeNet, netns string) ([]byte,
 	}
 
 	vars := [][2]string{
-		{"CNI_VERSION", "0.3.0"},
+		{"CNI_VERSION", "0.1.0"},
 		{"CNI_COMMAND", cmd},
 		{"CNI_CONTAINERID", e.podID.String()},
 		{"CNI_NETNS", netns},
diff --git a/networking/networking.go b/networking/networking.go
index fc72ab1d41..5b35c00e1a 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -177,7 +177,7 @@ func (n *Networking) enableDefaultLocalnetRouting() error {
 
 // Load creates the Networking object from saved state.
 // Assumes the current netns is that of the host.
-func Load(podRoot string, podID *types.UUID) (*Networking, error) {
+func Load(podRoot string, podID *types.UUID, localConfig string) (*Networking, error) {
 	// the current directory is pod root
 	pdirfd, err := syscall.Open(podRoot, syscall.O_RDONLY|syscall.O_DIRECTORY, 0)
 	if err != nil {
@@ -207,8 +207,9 @@ func Load(podRoot string, podID *types.UUID) (*Networking, error) {
 	}
 
 	p := podEnv{
-		podRoot: podRoot,
-		podID:   *podID,
+		podRoot:     podRoot,
+		podID:       *podID,
+		localConfig: localConfig,
 	}
 
 	err = p.podNSLoad()
diff --git a/rkt/gc.go b/rkt/gc.go
index a613cdf2f2..8bff3cad2e 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -250,7 +250,7 @@ func deletePod(p *pkgPod.Pod) {
 		}
 
 		if err := mountPodStage1(ts, p); err == nil {
-			if err = stage0.GC(p.Path(), p.UUID); err != nil {
+			if err = stage0.GC(p.Path(), p.UUID, globalFlags.LocalConfigDir); err != nil {
 				stderr.PrintE(fmt.Sprintf("problem performing stage1 GC on %q", p.UUID), err)
 			}
 			// an overlay fs can be mounted over itself, let's unmount it here
diff --git a/stage0/gc.go b/stage0/gc.go
index 77db6cace0..ce908aac95 100644
--- a/stage0/gc.go
+++ b/stage0/gc.go
@@ -37,7 +37,7 @@ import (
 
 // GC enters the pod by fork/exec()ing the stage1's /gc similar to /init.
 // /gc can expect to have its CWD set to the pod root.
-func GC(pdir string, uuid *types.UUID) error {
+func GC(pdir string, uuid *types.UUID, localConfig string) error {
 	err := unregisterPod(pdir, uuid)
 	if err != nil {
 		// Probably not worth abandoning the rest
@@ -45,6 +45,10 @@ func GC(pdir string, uuid *types.UUID) error {
 	}
 
 	stage1Path := common.Stage1RootfsPath(pdir)
+	s1v, err := getStage1InterfaceVersion(pdir)
+	if err != nil {
+		return errwrap.Wrap(errors.New("Could not determine stage1 version"), err)
+	}
 
 	ep, err := getStage1Entrypoint(pdir, gcEntrypoint)
 	if err != nil {
@@ -55,8 +59,12 @@ func GC(pdir string, uuid *types.UUID) error {
 	if debugEnabled {
 		args = append(args, "--debug")
 	}
+	if interfaceVersionSupportsGCLocalConfig(s1v) && localConfig != "" {
+		args = append(args, "--local-config", localConfig)
+	}
 	args = append(args, uuid.String())
 
+	debug("Execing %v", args)
 	c := exec.Cmd{
 		Path:   args[0],
 		Args:   args,
diff --git a/stage0/manifest.go b/stage0/manifest.go
index 651918919b..ab03e87403 100644
--- a/stage0/manifest.go
+++ b/stage0/manifest.go
@@ -120,3 +120,7 @@ func interfaceVersionSupportsInsecureOptions(version int) bool {
 func interfaceVersionSupportsDNSConfMode(version int) bool {
 	return version > 3
 }
+
+func interfaceVersionSupportsGCLocalConfig(version int) bool {
+	return version >= 5
+}
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index f7aa49c0dd..dff0eb388c 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -51,7 +51,7 @@
         },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
-            "value": "4"
+            "value": "5"
         }
     ]
 }
diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index e4df5d1fda..c978c163b1 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -43,13 +43,15 @@ const (
 )
 
 var (
-	debug bool
-	log   *rktlog.Logger
-	diag  *rktlog.Logger
+	debug       bool
+	log         *rktlog.Logger
+	diag        *rktlog.Logger
+	localConfig string
 )
 
 func init() {
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+	flag.StringVar(&localConfig, "local-config", common.DefaultLocalConfigDir, "Local config path")
 
 	// this ensures that main runs only on main thread (thread group leader).
 	// since namespace ops (unshare, setns) are done for a single thread, we
@@ -70,14 +72,17 @@ func main() {
 		log.Fatal("UUID is missing or malformed")
 	}
 
+	diag.Printf("Removing journal link.")
 	if err := removeJournalLink(podID); err != nil {
 		log.PrintE("error removing journal link", err)
 	}
 
+	diag.Printf("Cleaning up cgroups.")
 	if err := cleanupV1Cgroups(); err != nil {
 		log.PrintE("error cleaning up cgroups", err)
 	}
 
+	diag.Printf("Tearing down networks.")
 	if err := gcNetworking(podID); err != nil {
 		log.FatalE("", err)
 	}
@@ -97,7 +102,7 @@ func gcNetworking(podID *types.UUID) error {
 		}
 	}
 
-	n, err := networking.Load(".", podID)
+	n, err := networking.Load(".", podID, localConfig)
 	switch {
 	case err == nil:
 		n.Teardown(flavor, debug)
diff --git a/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf b/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
index 1fbadb2f21..04c624c941 100644
--- a/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
+++ b/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
@@ -1,4 +1,5 @@
 {
+	"cniVersion": "0.1.0",
 	"name": "default-restricted",
 	"type": "ptp",
 	"ipMasq": false,
diff --git a/stage1/net/rootfs/etc/rkt/net.d/99-default.conf b/stage1/net/rootfs/etc/rkt/net.d/99-default.conf
index 73b2b43290..6d6b6c0b6d 100644
--- a/stage1/net/rootfs/etc/rkt/net.d/99-default.conf
+++ b/stage1/net/rootfs/etc/rkt/net.d/99-default.conf
@@ -1,4 +1,5 @@
 {
+	"cniVersion": "0.1.0",
 	"name": "default",
 	"type": "ptp",
 	"ipMasq": true,
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index e6a01a1c5c..fe5fdbd217 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -35,7 +35,7 @@
         },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
-            "value": "4"
+            "value": "5"
         }
     ]
 }
diff --git a/stage1_fly/gc/main.go b/stage1_fly/gc/main.go
index ee68074b8f..db4b54c846 100644
--- a/stage1_fly/gc/main.go
+++ b/stage1_fly/gc/main.go
@@ -19,6 +19,7 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/coreos/rkt/common"
 	rktlog "github.com/coreos/rkt/pkg/log"
 )
 
@@ -29,11 +30,13 @@ const (
 var (
 	debug bool
 
-	diag *rktlog.Logger
+	diag        *rktlog.Logger
+	localConfig string
 )
 
 func init() {
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+	flag.StringVar(&localConfig, "local-config", common.DefaultLocalConfigDir, "Local config path (ignored)")
 }
 
 func main() {
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index b7990f86c3..9787135243 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -810,32 +810,26 @@ func NewNetCNIEnvTest() testutils.Test {
 		netdir := prepareTestNet(t, ctx, nt)
 		defer os.RemoveAll(netdir)
 
-		ga := testutils.NewGoroutineAssistant(t)
-		ga.Add(1)
-
-		go func() {
-			defer ga.Done()
-			appCmd := "--exec=/inspect -- --print-defaultgwv4 "
-			cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false %s %s",
-				ctx.Cmd(), nt.NetParameter(), getInspectImagePath(), appCmd)
-			child := ga.SpawnOrFail(cmd)
-			defer ga.WaitOrFail(child)
+		appCmd := "--exec=/inspect -- --print-defaultgwv4 "
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false %s %s",
+			ctx.Cmd(), nt.NetParameter(), getInspectImagePath(), appCmd)
+		child := spawnOrFail(t, cmd)
+		waitOrFail(t, child, 0)
 
-			expectedRegex := "DefaultGWv4: 11.11.3.1"
+		expectedRegex := "DefaultGWv4: 11.11.3.1"
 
-			_, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
-			if err != nil {
-				ga.Fatalf("Error: %v\nOutput: %v", err, out)
-			}
-		}()
-
-		ga.Wait()
+		_, out, err := expectRegexTimeoutWithOutput(child, expectedRegex, 30*time.Second)
+		if err != nil {
+			t.Fatalf("Error: %v\nOutput: %v", err, out)
+		}
 
 		// Parse the log file
-		proxyLog, err := parseCNIProxyLog(filepath.Join(netdir, "output.json"))
+		cniLogFilename := filepath.Join(netdir, "output.json")
+		proxyLog, err := parseCNIProxyLog(cniLogFilename)
 		if err != nil {
-			t.Fatal("Failed to read cniproxy log", err)
+			t.Fatal("Failed to read cniproxy ADD log", err)
 		}
+		os.Remove(cniLogFilename)
 
 		// Check that the stdin matches the network config file
 		expectedConfig, err := ioutil.ReadFile(filepath.Join(netdir, nt.Name+".conf"))
@@ -847,31 +841,48 @@ func NewNetCNIEnvTest() testutils.Test {
 			t.Fatalf("CNI plugin stdin incorrect, expected <<%v>>, actual <<%v>>", expectedConfig, proxyLog.Stdin)
 		}
 
-		// Check that the environment is sane - these are regexes
-		expectedEnv := map[string]string{
-			"CNI_VERSION":     "0.3.0",
-			"CNI_COMMAND":     "ADD",
-			"CNI_IFNAME":      `eth\d`,
-			"CNI_PATH":        netdir,
-			"CNI_NETNS":       `/var/run/netns/cni-`,
-			"CNI_CONTAINERID": `^[a-fA-F0-9-]{36}`, //UUID, close enough
-		}
-
-		for k, v := range expectedEnv {
-			actual, exists := proxyLog.EnvMap[k]
-			if !exists {
-				t.Fatalf("Expected proxy CNI arg %s but not found", k)
-			}
+		// compare the CNI env against a set of regexes
+		checkEnv := func(step string, expectedEnv, actualEnv map[string]string) {
+			for k, v := range expectedEnv {
+				actual, exists := actualEnv[k]
+				if !exists {
+					t.Fatalf("Step %s, expected proxy CNI arg %s but not found", step, k)
+				}
 
-			re, err := regexp.Compile(v)
-			if err != nil {
-				t.Fatal("Invalid CNI env regex", v, err)
-			}
-			found := re.FindString(actual)
-			if found == "" {
-				t.Fatalf("CNI_ARG %s was %s but expected pattern %s", k, actual, v)
+				re, err := regexp.Compile(v)
+				if err != nil {
+					t.Fatalf("Step %s, invalid CNI env regex for key %s %v", step, k, err)
+				}
+				found := re.FindString(actual)
+				if found == "" {
+					t.Fatalf("step %s cni environment %s was %s but expected pattern %s", step, k, actual, v)
+				}
 			}
 		}
+
+		expectedEnv := map[string]string{
+			"CNI_VERSION":     `^0\.1\.0$`,
+			"CNI_COMMAND":     `^ADD$`,
+			"CNI_IFNAME":      `^eth\d$`,
+			"CNI_PATH":        "^" + netdir + ":/usr/lib/rkt/plugins/net:stage1/rootfs/usr/lib/rkt/plugins/net$",
+			"CNI_NETNS":       `^/var/run/netns/cni-`,
+			"CNI_CONTAINERID": `^[a-fA-F0-9-]{36}$`, //UUID, close enough
+		}
+		checkEnv("add", expectedEnv, proxyLog.EnvMap)
+
+		/*
+			Run rkt GC, ensure the CNI invocation looks sane
+		*/
+		ctx.RunGC()
+		proxyLog, err = parseCNIProxyLog(cniLogFilename)
+		if err != nil {
+			t.Fatal("Failed to read cniproxy DEL log", err)
+		}
+		os.Remove(cniLogFilename)
+
+		expectedEnv["CNI_COMMAND"] = `^DEL$`
+		checkEnv("del", expectedEnv, proxyLog.EnvMap)
+
 	})
 }
 

From e1a6754341c67d54e52d479c82018dc2cfd768aa Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 9 Nov 2016 14:02:50 +0100
Subject: [PATCH 0862/1304] scripts/build-rir: bump rkt-builder version to
 1.1.1

---
 scripts/build-rir.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index d2406fb1f6..75bad141dd 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.1.0}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.1.1}"
 RKT_CMD="${RKT_CMD:-rkt}"
 
 mkdir -p $BUILDDIR

From e4de7237fd90f2384516e5ca8b1f0a825d4efff4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 9 Nov 2016 14:58:05 +0000
Subject: [PATCH 0863/1304] image/list: bring back field filtering in plaintext
 mode

This fixes a regression introduced in https://github.com/coreos/rkt/pull/3334,
where the `--field` flag is not anymore working for plaintext output.
Tests around image listing are also introduced here to catch future regressions.
---
 rkt/image_list.go            | 30 ++++++++++----
 tests/rkt_image_list_test.go | 76 ++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/rkt/image_list.go b/rkt/image_list.go
index b2aa7edcbd..7643b9e94f 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -81,17 +81,33 @@ var (
 type printedImage struct {
 	ID         string `json:"id"`
 	Name       string `json:"name"`
-	ImportTime string `json:"import_time"`
-	LastUsed   string `json:"last_used"`
+	ImportTime string `json:"importtime"`
+	LastUsed   string `json:"lastused"`
 	Size       string `json:"size"`
 }
 
-func (r *printedImage) attributes() []string {
-	return []string{r.ID, r.Name, r.Size, r.ImportTime, r.LastUsed}
+func (pi *printedImage) attributes(fields *rktflag.OptionList) []string {
+	if fields == nil {
+		return []string{pi.ID, pi.Name, pi.Size, pi.ImportTime, pi.LastUsed}
+	}
+	optionMapping := map[string]string{
+		l(id):         pi.ID,
+		l(name):       pi.Name,
+		l(size):       pi.Size,
+		l(importTime): pi.ImportTime,
+		l(lastUsed):   pi.LastUsed,
+	}
+	attrs := []string{}
+	for _, f := range fields.Options {
+		if a, ok := optionMapping[f]; ok {
+			attrs = append(attrs, a)
+		}
+	}
+	return attrs
 }
 
-func (r *printedImage) printableString() string {
-	return strings.Join(r.attributes(), "\t")
+func (pi *printedImage) printableString(fields *rktflag.OptionList) string {
+	return strings.Join(pi.attributes(fields), "\t")
 }
 
 type outputFormat int
@@ -285,7 +301,7 @@ func runImages(cmd *cobra.Command, args []string) int {
 			fmt.Fprintf(tabOut, "%s\n", strings.Join(headerFields, "\t"))
 		}
 		for _, image := range imagesToPrint {
-			fmt.Fprintf(tabOut, "%s\n", image.printableString())
+			fmt.Fprintf(tabOut, "%s\n", image.printableString(flagImagesFields))
 		}
 	case outputFormatJSON:
 		result, err := json.Marshal(imagesToPrint)
diff --git a/tests/rkt_image_list_test.go b/tests/rkt_image_list_test.go
index 0d27d375a2..18731b5e84 100644
--- a/tests/rkt_image_list_test.go
+++ b/tests/rkt_image_list_test.go
@@ -60,6 +60,82 @@ func (imgID *ImageID) containsConflictingHash(imgIDs []ImageID) (imgIDPair []Ima
 	return
 }
 
+func TestImageList(t *testing.T) {
+	imageName := "coreos.com/rkt/test-image-list-plaintext"
+	imageFile := patchTestACI(unreferencedACI, fmt.Sprintf("--name=%s", imageName))
+	defer os.Remove(imageFile)
+	imageLongHash := "sha512-" + getHashOrPanic(imageFile)[:64]
+	imageShortHash := "sha512-" + getHashOrPanic(imageFile)[:32]
+	imageTruncatedHash := "sha512-" + getHashOrPanic(imageFile)[:12]
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+	fetchCmd := fmt.Sprintf("%s --insecure-options=image fetch %s", ctx.Cmd(), imageFile)
+	runRktAndCheckOutput(t, fetchCmd, imageShortHash, false)
+
+	tests := []struct {
+		testName      string
+		options       string
+		lookupKeyword string
+		expect        string
+		shouldFail    bool
+	}{
+		{
+			"--no-legend suppress header",
+			"--no-legend",
+			"ID",
+			"",
+			true,
+		},
+		{
+			"--fields emits selected fields (truncated hash)",
+			"--fields=id",
+			"",
+			imageTruncatedHash,
+			false,
+		},
+		{
+			"--fields does not emit unwanted fields",
+			"--no-legend --fields=name",
+			"sha",
+			"",
+			true,
+		},
+		{
+			"--full emits long hash",
+			"--fields=id --full",
+			"sha",
+			imageLongHash,
+			false,
+		},
+		{
+			"--format=json suppress header",
+			"--format=json",
+			"ID",
+			"",
+			true,
+		},
+		{
+			"--format=json prints a JSON array",
+			"--format=json",
+			"",
+			"[{",
+			false,
+		},
+		{
+			"--format=json-pretty introduces proper spacing",
+			"--format=json-pretty",
+			"",
+			`"id": "`,
+			false,
+		},
+	}
+	for i, tt := range tests {
+		t.Logf("image-list test #%d: %s", i, tt.testName)
+		runCmd := fmt.Sprintf(`/bin/sh -c '%s image list %s | grep "%s" || exit 254'`, ctx.Cmd(), tt.options, tt.lookupKeyword)
+		runRktAndCheckOutput(t, runCmd, tt.expect, tt.shouldFail)
+	}
+}
+
 func TestImageSize(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()

From 4f6ae7ce43f135616224a3364090228f387384fc Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 8 Nov 2016 14:21:51 +0100
Subject: [PATCH 0864/1304] rkt/image*: align image selection behavior for the
 rm subcommand

Currently the `rkt image rm` subcommand has a custom logic for selecting
images to be deleted.

This aligns the behavior of the `rm` subcommand with the other `rkt
image` subcommands, and updates the documentation.

Fixes #3329
---
 Documentation/subcommands/image.md |  2 +-
 rkt/image.go                       | 13 ++++++
 rkt/image_cat_manifest.go          |  2 +-
 rkt/image_export.go                |  2 +-
 rkt/image_extract.go               |  2 +-
 rkt/image_render.go                |  2 +-
 rkt/image_rm.go                    | 67 +++++++-----------------------
 tests/rkt_image_rm_test.go         |  2 +-
 8 files changed, 35 insertions(+), 57 deletions(-)

diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 7d630c87cb..9be1edd14c 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -132,7 +132,7 @@ sha512-96323da393621d846c632e71551b77089ac0b004ceb5c2362be4f5ced2212db9   regist
 
 ## rkt image rm
 
-Given an image ID or image name you can remove it from the local store.
+Given multiple image IDs or image names you can remove them from the local store.
 
 ```
 # rkt image rm sha512-a03f6bad952b coreos.com/etcd
diff --git a/rkt/image.go b/rkt/image.go
index d3cdb68eb4..a9ceb4db46 100644
--- a/rkt/image.go
+++ b/rkt/image.go
@@ -20,6 +20,19 @@ var (
 	cmdImage = &cobra.Command{
 		Use:   "image [command]",
 		Short: "Operate on image(s) in the local store",
+		Long: `This subcommand operates on image(s) in the local store.
+
+The "cat-manifest", "export", "extract", "render", and "rm" subcommands
+take the ID or image name to reference images in the local store.
+
+The ID can be specified using the long or short version, i.e. "sha512-78c08a541997",
+or "sha512-78c08a5419979fff71e615f27aad75b84362a3cd9a13703b9d47ec27d1cfd029".
+
+The image name can be specified including the version tag as stored in the local store,
+i.e. "quay.io/coreos/etcd:latest", or "quay.io/coreos/etcd:v3.0.13".
+
+The version tag may be left out, i.e. "quay.io/coreos/etcd".
+In case of ambiguity, the least recently fetched image with this name will be chosen.`,
 	}
 )
 
diff --git a/rkt/image_cat_manifest.go b/rkt/image_cat_manifest.go
index 2d9cde5795..525f06aded 100644
--- a/rkt/image_cat_manifest.go
+++ b/rkt/image_cat_manifest.go
@@ -26,7 +26,7 @@ var (
 	cmdImageCatManifest = &cobra.Command{
 		Use:   "cat-manifest IMAGE",
 		Short: "Inspect and print the image manifest",
-		Long:  `IMAGE should be a string referencing an image; either a hash or an image name.`,
+		Long:  `IMAGE should be a string referencing an image; either a ID or an image name.`,
 		Run:   runWrapper(runImageCatManifest),
 	}
 	flagPrettyPrint bool
diff --git a/rkt/image_export.go b/rkt/image_export.go
index 2eee67e272..c3a2fa532a 100644
--- a/rkt/image_export.go
+++ b/rkt/image_export.go
@@ -28,7 +28,7 @@ var (
 	cmdImageExport = &cobra.Command{
 		Use:   "export IMAGE OUTPUT_ACI_FILE",
 		Short: "Export a stored image to an ACI file",
-		Long: `IMAGE should be a string referencing an image: either a hash or an image name.
+		Long: `IMAGE should be a string referencing an image: either an ID or an image name.
 
 Note that images must be fetched prior to running export and that this command
 always returns uncompressed ACIs`,
diff --git a/rkt/image_extract.go b/rkt/image_extract.go
index 6d7dc2add9..6e5693d2a7 100644
--- a/rkt/image_extract.go
+++ b/rkt/image_extract.go
@@ -32,7 +32,7 @@ var (
 	cmdImageExtract = &cobra.Command{
 		Use:   "extract IMAGE OUTPUT_DIR",
 		Short: "Extract a stored image to a directory",
-		Long: `IMAGE should be a string referencing an image: either a hash or an image name.
+		Long: `IMAGE should be a string referencing an image: either a ID or an image name.
 
 Note that in order to make cleaning up easy (just rm -rf), extract does not use
 overlayfs or any other mechanism.`,
diff --git a/rkt/image_render.go b/rkt/image_render.go
index 9f89937b46..7c518ffe92 100644
--- a/rkt/image_render.go
+++ b/rkt/image_render.go
@@ -32,7 +32,7 @@ var (
 	cmdImageRender = &cobra.Command{
 		Use:   "render IMAGE OUTPUT_DIR",
 		Short: "Render a stored image to a directory with all its dependencies",
-		Long: `IMAGE should be a string referencing an image: either a hash or an image name.
+		Long: `IMAGE should be a string referencing an image: either a ID or an image name.
 
 This differs from extract in that the rendered image is in the state the app
 would see when running in rkt, dependencies and all.
diff --git a/rkt/image_rm.go b/rkt/image_rm.go
index 1cb0896096..38acafbd6e 100644
--- a/rkt/image_rm.go
+++ b/rkt/image_rm.go
@@ -17,7 +17,6 @@ package main
 import (
 	"fmt"
 
-	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/spf13/cobra"
 )
@@ -25,7 +24,7 @@ import (
 var (
 	cmdImageRm = &cobra.Command{
 		Use:   "rm IMAGE...",
-		Short: "Remove image(s) with the given ID(s) or name(s) from the local store",
+		Short: "Remove one or more images with the given IDs or image names from the local store",
 		Long:  `Unlike image gc, image rm allows users to remove specific images.`,
 		Run:   runWrapper(runRmImage),
 	}
@@ -36,74 +35,40 @@ func init() {
 }
 
 func rmImages(s *imagestore.Store, images []string) error {
-	done := 0
-	errors := 0
-	staleErrors := 0
 	imageMap := make(map[string]string)
-	imageCounter := make(map[string]int)
 
-	for _, pkey := range images {
-		errors++
-		h, err := types.NewHash(pkey)
+	for _, img := range images {
+		key, err := getStoreKeyFromAppOrHash(s, img)
 		if err != nil {
-			var found bool
-			keys, found, err := s.ResolveName(pkey)
-			if len(keys) > 0 {
-				errors += len(keys) - 1
-			}
-			if err != nil {
-				stderr.Error(err)
-				continue
-			}
-			if !found {
-				stderr.Printf("image name %q not found", pkey)
-				continue
-			}
-			for _, key := range keys {
-				imageMap[key] = pkey
-				imageCounter[key]++
-			}
-		} else {
-			key, err := s.ResolveKey(h.String())
-			if err != nil {
-				stderr.PrintE(fmt.Sprintf("image ID %q not valid", pkey), err)
-				continue
-			}
-			if key == "" {
-				stderr.Printf("image ID %q doesn't exist", pkey)
-				continue
-			}
-
-			aciinfo, err := s.GetACIInfoWithBlobKey(key)
-			if err != nil {
-				stderr.PrintE(fmt.Sprintf("error retrieving aci infos for image %q", key), err)
-				continue
-			}
-			imageMap[key] = aciinfo.Name
-			imageCounter[key]++
+			stderr.Error(err)
+			continue
 		}
-	}
 
-	// Adjust the error count by subtracting duplicate IDs from it,
-	// therefore allowing only one error per ID.
-	for _, c := range imageCounter {
-		if c > 1 {
-			errors -= c - 1
+		aciinfo, err := s.GetACIInfoWithBlobKey(key)
+		if err != nil {
+			stderr.PrintE(fmt.Sprintf("error retrieving aci infos for image %q", key), err)
+			continue
 		}
+
+		imageMap[key] = aciinfo.Name
 	}
 
+	done := 0
+	errors := 0
+	staleErrors := 0
+
 	for key, name := range imageMap {
 		if err := s.RemoveACI(key); err != nil {
 			if serr, ok := err.(*imagestore.StoreRemovalError); ok {
 				staleErrors++
 				stderr.PrintE(fmt.Sprintf("some files cannot be removed for image %q (%q)", key, name), serr)
 			} else {
+				errors++
 				stderr.PrintE(fmt.Sprintf("error removing aci for image %q (%q)", key, name), err)
 				continue
 			}
 		}
 		stdout.Printf("successfully removed aci for image: %q", key)
-		errors--
 		done++
 	}
 
diff --git a/tests/rkt_image_rm_test.go b/tests/rkt_image_rm_test.go
index 86e81ac281..3b6321e3c0 100644
--- a/tests/rkt_image_rm_test.go
+++ b/tests/rkt_image_rm_test.go
@@ -296,7 +296,7 @@ func TestImagePrepareRmDuplicate(t *testing.T) {
 }
 
 func getImageName(t *testing.T, ctx *testutils.RktRunCtx, name string) string {
-	cmd := fmt.Sprintf(`/bin/sh -c "%s image list --fields=name --no-legend | grep %s | cut -d: -f1"`, ctx.Cmd(), name)
+	cmd := fmt.Sprintf(`/bin/sh -c "%s image list --fields=name --no-legend | grep %s"`, ctx.Cmd(), name)
 	child := spawnOrFail(t, cmd)
 	imageName, err := child.ReadLine()
 	imageName = strings.TrimSpace(imageName)

From d2af1d86a25dc26adee4a5c1ce1aaeb5d6a7a004 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Wed, 9 Nov 2016 19:41:10 -0800
Subject: [PATCH 0865/1304] stage1: remove dependency on Kubernetes

We depended on a single const, so it's easier to copy it over.
---
 glide.lock                  | 6 +++---
 glide.yaml                  | 6 ------
 stage1/init/common/units.go | 6 ++++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/glide.lock b/glide.lock
index 80bc9fd3e5..d2868218cc 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 7876896e8d0dd84e6a10a9a0360a166488234254141cd772c9bdb0594c9c2ff2
-updated: 2016-11-08T19:17:19.934464985Z
+hash: 309278f619d7e1fbd1c0ba76a134929de1412d1065a088dee1f0e8ad40d3c7a3
+updated: 2016-11-09T19:40:53.22783374-08:00
 imports:
 - name: github.com/appc/docker2aci
   version: 64543c1e0a7306b17d0d214549ec08049b234abc
@@ -300,7 +300,7 @@ imports:
 - name: gopkg.in/inf.v0
   version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
 - name: k8s.io/kubernetes
-  version: 283137936a498aed572ee22af6774b6fb6e9fd94
+  version: 759dd0dfb826658c78db42d97b77b9594cd43333
   subpackages:
   - pkg/api/resource
   - pkg/conversion
diff --git a/glide.yaml b/glide.yaml
index c227f3266b..a3aa8a9283 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -267,12 +267,6 @@ import:
   - internal
 - package: gopkg.in/inf.v0
   version: v0.9.0
-- package: k8s.io/kubernetes
-  version: v1.3.0
-  subpackages:
-  - pkg/api/resource
-  - pkg/conversion
-  - third_party/forked/reflect
 - package: github.com/klauspost/pgzip
   version: v1.0
 - package: github.com/klauspost/compress
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 171c8f8eda..7bab1a3119 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -35,9 +35,11 @@ import (
 
 	"github.com/coreos/go-systemd/unit"
 	"github.com/hashicorp/errwrap"
-	"k8s.io/kubernetes/pkg/api/resource"
 )
 
+// The maximum value for the MilliValue of an appc resource limit.
+const MaxMilliValue = int64(((1 << 63) - 1) / 1000)
+
 func MutableEnv(p *stage1commontypes.Pod) error {
 	w := NewUnitWriter(p)
 
@@ -518,7 +520,7 @@ func (uw *UnitWriter) AppUnit(
 					return nil
 				}
 
-				if v.Limit().Value() > resource.MaxMilliValue {
+				if v.Limit().Value() > MaxMilliValue {
 					return fmt.Errorf("cpu limit exceeds the maximum millivalue: %v", v.Limit().String())
 				}
 

From b99977f7aa41890687565b081a8f637b57ad1c9a Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 10 Nov 2016 09:00:12 +0000
Subject: [PATCH 0866/1304] version: bump to v1.19.0

---
 CHANGELOG.md                         | 32 ++++++++++++++++++++++++++++
 Documentation/distributions.md       | 16 +++++++-------
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  4 ++--
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 ROADMAP.md                           | 12 ++++-------
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 18 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee896916da..75b6dd0ba3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+## 1.19.0
+
+This release contains multiple changes to rkt core, bringing it more in line with the new Container Runtime Interface (CRI) from Kubernetes.
+
+A new experimental `app` subcommand has been introduced, which allows creating a "pod sandbox" and dynamically mutating it at runtime. This feature is not yet completely stabilized, and is currently gated behind an experimental flag.
+
+### New features and UX changes
+- rkt: experimental support for pod sandbox ([#3318](https://github.com/coreos/rkt/pull/3318)). This PR introduces an experimental `app` subcommand and many additional app-level options.
+- rkt/image: align image selection behavior for the rm subcommand ([#3353](https://github.com/coreos/rkt/pull/3353)).
+- stage1/init: leave privileged pods without stage2 mount-ns ([#3290](https://github.com/coreos/rkt/pull/3290)).
+- stage0/image: list images output in JSON format ([#3334](https://github.com/coreos/rkt/pull/3334)).
+- stage0/arch: initial support for ppc64le platform ([#3315](https://github.com/coreos/rkt/pull/3315)).
+
+### Bug fixes:
+- gc: make sure `CNI_PATH` is same for gc and init ([#3348](https://github.com/coreos/rkt/pull/3348)).
+- gc: clean up some GC leaks ([#3317](https://github.com/coreos/rkt/pull/3317)).
+- stage0: minor wording fixes ([#3351](https://github.com/coreos/rkt/pull/3351)).
+- setup-data-dir.sh: fallback to the `mkdir/chmod`s if the rkt.conf doesn't exist ([#3335](https://github.com/coreos/rkt/pull/3335)).
+- scripts: add gpg to Debian dependencies ([#3339](https://github.com/coreos/rkt/pull/3339)).
+- kvm: fix for breaking change in Debian Sid GCC default options ([#3354](https://github.com/coreos/rkt/pull/3354)).
+- image/list: bring back field filtering in plaintext mode ([#3361](https://github.com/coreos/rkt/pull/3361)).
+
+### Other changes
+- cgroup/v1: introduce mount flags to mountFsRO ([#3350](https://github.com/coreos/rkt/pull/3350)).
+- kvm: update QEMU version to 2.7.0 ([#3341](https://github.com/coreos/rkt/pull/3341)).
+- kvm: bump kernel version to 4.8.6, updated config ([#3342](https://github.com/coreos/rkt/pull/3342)). 
+- vendor: introduce kr/pretty and bump go-systemd ([#3333](https://github.com/coreos/rkt/pull/3333)).
+- vendor: update docker2aci to 0.14.0 ([#3356](https://github.com/coreos/rkt/pull/3356)).
+- tests: add the --debug option to more tests ([#3340](https://github.com/coreos/rkt/pull/3340)).
+- scripts/build-rir: bump rkt-builder version to 1.1.1 ([#3360](https://github.com/coreos/rkt/pull/3360)).
+- Documentation updates: [#3321](https://github.com/coreos/rkt/pull/3321), [#3331](https://github.com/coreos/rkt/pull/3331), [#3325](https://github.com/coreos/rkt/pull/3325).
+
 ## 1.18.0
 
 This minor release contains bugfixes, UX enhancements, and other improvements.
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index f16996762d..f2727bf362 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -143,19 +143,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt-1.18.0-1.x86_64.rpm
-wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt-1.18.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.18.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.18.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt-1.19.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt-1.19.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.19.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.19.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt_1.18.0-1_amd64.deb
-wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt_1.18.0-1_amd64.deb.asc
-gpg --verify rkt_1.18.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.18.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt_1.19.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt_1.19.0-1_amd64.deb.asc
+gpg --verify rkt_1.19.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.19.0-1_amd64.deb
 ```
 
 [coreos-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index fd54dbfea0..ac0ae1ebe0 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.18.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.19.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.18.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.19.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 00fbe1df76..4d9e1d013a 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.18.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.19.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.18.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.19.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 9d6be24563..e0c14b99de 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.18.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.19.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.18.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.19.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 38fea027c7..1e5cfa9307 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.18.0
+rkt Version: 1.19.0
 appc Version: 0.8.8
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index e68df07b91..03213fc39c 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.18.0/rkt-v1.18.0.tar.gz
-tar xzvf rkt-v1.18.0.tar.gz
-cd rkt-v1.18.0
+wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt-v1.19.0.tar.gz
+tar xzvf rkt-v1.19.0.tar.gz
+cd rkt-v1.19.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
index c213971142..b6e1ea2567 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -15,18 +15,14 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 
 ## Next releases
 
-### rkt 1.18.0 (October)
-
-Up-to-date planning at https://github.com/coreos/rkt/milestone/52.
-
-### rkt 1.19.0 (November)
-
-Up-to-date planning at https://github.com/coreos/rkt/milestone/53.
-
 ### rkt 1.20.0 (November)
 
 Up-to-date planning at https://github.com/coreos/rkt/milestone/54.
 
+### rkt 1.21.0 (December)
+
+Up-to-date planning at https://github.com/coreos/rkt/milestone/55.
+
 ### Upcoming
 
 Future tasks without a specific timeline are tracked at https://github.com/coreos/rkt/milestone/30.
diff --git a/configure.ac b/configure.ac
index 543de38e86..0589fd00a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.18.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.19.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index d9219b8e50..2085da2fc6 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.18.0"
+version="1.19.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 966f00c9e9..537c0357e0 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.18.0"
+            "value": "1.19.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 2e57d36071..3993f2a974 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.18.0"
+            "value": "1.19.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 63e2becde2..79d930f7c0 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.18.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.19.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 7e57449867..4841c0e455 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.18.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 68be2d692d..9188cf5398 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.18.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 4723094baa..5c1db02465 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.18.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 1ee65d5709..966d0df5a8 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.18.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 7d9a654aba..a5e8ddcd6f 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.18.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From d2d00458209011b32c5d8acfac0902f8be593c1b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 10 Nov 2016 09:00:13 +0000
Subject: [PATCH 0867/1304] version: bump to v1.19.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0589fd00a0..9a3252ca2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.19.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.19.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 79d930f7c0..7c19ae5ea8 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.19.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.19.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From f7da3798a9c747df1d29068cfed1d5c9b3c00379 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 10 Nov 2016 15:41:53 +0000
Subject: [PATCH 0868/1304] docs: fix release steps

---
 Documentation/devel/release.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index f450f5b10c..d44d5713c7 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -84,9 +84,11 @@ sudo chown -R root:root $NAME/
 tar czvf $NAME.tar.gz --numeric-owner $NAME/
 ```
 
-- Attach each stage1 file individually so they can be fetched by the ACI discovery mechanism. The files must be named as follows:
+- Attach packages, as well as each stage1 file individually so they can be fetched by the ACI discovery mechanism:
 
 ```
+cp release-build/target/bin/*.deb .
+cp release-build/target/bin/*.rpm .
 cp release-build/target/bin/stage1-coreos.aci stage1-coreos-$RKTVER-linux-amd64.aci
 cp release-build/target/bin/stage1-kvm.aci stage1-kvm-$RKTVER-linux-amd64.aci
 cp release-build/target/bin/stage1-fly.aci stage1-fly-$RKTVER-linux-amd64.aci

From 9addbda2d01e52ae4a52ea266d0ee0abdac61f05 Mon Sep 17 00:00:00 2001
From: Lucas Amorim <lucasamorim@protonmail.com>
Date: Sat, 5 Nov 2016 23:22:32 -0700
Subject: [PATCH 0869/1304] rkt/run: Validates pod manifest to make sure it
 contains at least one app.

When using --pod-manifest we need to make sure that the pod manifest
contains at least one defined app.

Fixes: #3338
---
 rkt/run.go                         |  5 +++++
 tests/rkt_run_pod_manifest_test.go | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/rkt/run.go b/rkt/run.go
index c74e278208..cad1e9f54b 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -384,6 +384,11 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		stderr.PrintE("cannot get the pod manifest", err)
 		return 254
 	}
+
+	if len(manifest.Apps) == 0 {
+		stderr.Print("pod must contain at least one application")
+		return 254
+	}
 	rcfg.Apps = manifest.Apps
 	stage0.Run(rcfg, p.Path(), getDataDir()) // execs, never returns
 
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 6dc4f51556..8b531879f0 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -1281,3 +1281,24 @@ func TestPodManifest(t *testing.T) {
 		}
 	}
 }
+
+func TestPodManifestWithEmptyApps(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	tmpdir := createTempDirOrPanic("rkt-tests.")
+	defer os.RemoveAll(tmpdir)
+
+	manifest := &schema.PodManifest{
+		Apps:      []schema.RuntimeApp{},
+		ACKind:    schema.PodManifestKind,
+		ACVersion: schema.AppContainerVersion,
+	}
+
+	manifestFile := generatePodManifestFile(t, manifest)
+	defer os.Remove(manifestFile)
+
+	runCmd := fmt.Sprintf("%s run --mds-register=false --pod-manifest=%s", ctx.Cmd(), manifestFile)
+	runEmptyAppsMsg := "pod must contain at least one application"
+	runRktAndCheckOutput(t, runCmd, runEmptyAppsMsg, true)
+}

From 56c6a20263bb86d16997ddfc49644e8c7a2e4d3c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 14 Nov 2016 14:37:37 +0000
Subject: [PATCH 0870/1304] glide: dedup cni packages

---
 glide.yaml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/glide.yaml b/glide.yaml
index a3aa8a9283..6284ef4a37 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -50,12 +50,9 @@ import:
   - pkg/invoke
   - pkg/ip
   - pkg/ipam
-  - pkg/ipam
   - pkg/ns
   - pkg/skel
   - pkg/testutils
-  - pkg/skel
-  - pkg/testutils
   - pkg/types
   - pkg/utils
   - pkg/utils/sysctl
@@ -69,17 +66,6 @@ import:
   - plugins/main/ptp
   - plugins/meta/flannel
   - plugins/meta/tuning
-  - pkg/utils/sysctl
-  - plugins/ipam/dhcp
-  - plugins/ipam/host-local
-  - plugins/ipam/host-local/backend
-  - plugins/ipam/host-local/backend/disk
-  - plugins/main/bridge
-  - plugins/main/ipvlan
-  - plugins/main/macvlan
-  - plugins/main/ptp
-  - plugins/meta/flannel
-  - plugins/meta/tuning
 - package: github.com/coreos/gexpect
   version: v0.1.0
 - package: github.com/coreos/go-iptables

From 5f28201674c9afd56116dfefff03da8ec37c9d04 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 14 Nov 2016 14:38:34 +0000
Subject: [PATCH 0871/1304] glide: bump go-systemd to v14

---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index 6284ef4a37..49106af889 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -77,7 +77,7 @@ import:
   subpackages:
   - semver
 - package: github.com/coreos/go-systemd
-  version: v13
+  version: v14
   subpackages:
   - activation
   - daemon

From 0c5083602efb4eb460d58d2de255f159dd3144be Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 14 Nov 2016 14:45:13 +0000
Subject: [PATCH 0872/1304] vendor: update after go-systemd bump

---
 glide.lock                                    | 20 +-----
 .../coreos/go-systemd/daemon/sdnotify.go      | 27 ++++++-
 .../coreos/go-systemd/daemon/watchdog.go      | 72 +++++++++++++++++++
 .../github.com/coreos/go-systemd/dbus/dbus.go | 12 +++-
 4 files changed, 112 insertions(+), 19 deletions(-)
 create mode 100644 vendor/github.com/coreos/go-systemd/daemon/watchdog.go

diff --git a/glide.lock b/glide.lock
index d2868218cc..0aa0a5bb5e 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 309278f619d7e1fbd1c0ba76a134929de1412d1065a088dee1f0e8ad40d3c7a3
-updated: 2016-11-09T19:40:53.22783374-08:00
+hash: 7d6124bf5a7eb501cdcbe7521bce6c90c55cd20be2986a85797c3ba4b72f0ee3
+updated: 2016-11-14T14:39:35.870828214Z
 imports:
 - name: github.com/appc/docker2aci
   version: 64543c1e0a7306b17d0d214549ec08049b234abc
@@ -50,36 +50,22 @@ imports:
   - pkg/invoke
   - pkg/ip
   - pkg/ipam
-  - pkg/ipam
   - pkg/ns
   - pkg/skel
-  - pkg/skel
-  - pkg/testutils
   - pkg/testutils
   - pkg/types
   - pkg/utils
   - pkg/utils/sysctl
-  - pkg/utils/sysctl
   - plugins/ipam/dhcp
-  - plugins/ipam/dhcp
-  - plugins/ipam/host-local
   - plugins/ipam/host-local
   - plugins/ipam/host-local/backend
-  - plugins/ipam/host-local/backend
   - plugins/ipam/host-local/backend/disk
-  - plugins/ipam/host-local/backend/disk
-  - plugins/main/bridge
   - plugins/main/bridge
   - plugins/main/ipvlan
-  - plugins/main/ipvlan
-  - plugins/main/macvlan
   - plugins/main/macvlan
   - plugins/main/ptp
-  - plugins/main/ptp
-  - plugins/meta/flannel
   - plugins/meta/flannel
   - plugins/meta/tuning
-  - plugins/meta/tuning
 - name: github.com/coreos/gexpect
   version: ca42424d18c76d0d51a4cccd830d11878e9e5c17
 - name: github.com/coreos/go-iptables
@@ -91,7 +77,7 @@ imports:
   subpackages:
   - semver
 - name: github.com/coreos/go-systemd
-  version: 61c7ee68bddeb1e66b491c3e1045c4f72b2cd6e3
+  version: 48702e0da86bd25e76cfef347e2adeb434a0d0a6
   subpackages:
   - activation
   - daemon
diff --git a/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go b/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
index a61673805f..ba6d41d85b 100644
--- a/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
+++ b/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
@@ -1,3 +1,18 @@
+// Copyright 2014 Docker, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
 // Code forked from Docker project
 package daemon
 
@@ -7,11 +22,14 @@ import (
 )
 
 // SdNotify sends a message to the init daemon. It is common to ignore the error.
+// If `unsetEnvironment` is true, the environment variable `NOTIFY_SOCKET`
+// will be unconditionally unset.
+//
 // It returns one of the following:
 // (false, nil) - notification not supported (i.e. NOTIFY_SOCKET is unset)
 // (false, err) - notification supported, but failure happened (e.g. error connecting to NOTIFY_SOCKET or while sending data)
 // (true, nil) - notification supported, data has been sent
-func SdNotify(state string) (sent bool, err error) {
+func SdNotify(unsetEnvironment bool, state string) (sent bool, err error) {
 	socketAddr := &net.UnixAddr{
 		Name: os.Getenv("NOTIFY_SOCKET"),
 		Net:  "unixgram",
@@ -22,6 +40,13 @@ func SdNotify(state string) (sent bool, err error) {
 		return false, nil
 	}
 
+	if unsetEnvironment {
+		err = os.Unsetenv("NOTIFY_SOCKET")
+	}
+	if err != nil {
+		return false, err
+	}
+
 	conn, err := net.DialUnix(socketAddr.Net, nil, socketAddr)
 	// Error connecting to NOTIFY_SOCKET
 	if err != nil {
diff --git a/vendor/github.com/coreos/go-systemd/daemon/watchdog.go b/vendor/github.com/coreos/go-systemd/daemon/watchdog.go
new file mode 100644
index 0000000000..35a92e6e67
--- /dev/null
+++ b/vendor/github.com/coreos/go-systemd/daemon/watchdog.go
@@ -0,0 +1,72 @@
+// Copyright 2016 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package daemon
+
+import (
+	"fmt"
+	"os"
+	"strconv"
+	"time"
+)
+
+// SdWatchdogEnabled return watchdog information for a service.
+// Process should send daemon.SdNotify("WATCHDOG=1") every time / 2.
+// If `unsetEnvironment` is true, the environment variables `WATCHDOG_USEC`
+// and `WATCHDOG_PID` will be unconditionally unset.
+//
+// It returns one of the following:
+// (0, nil) - watchdog isn't enabled or we aren't the watched PID.
+// (0, err) - an error happened (e.g. error converting time).
+// (time, nil) - watchdog is enabled and we can send ping.
+//   time is delay before inactive service will be killed.
+func SdWatchdogEnabled(unsetEnvironment bool) (time.Duration, error) {
+	wusec := os.Getenv("WATCHDOG_USEC")
+	wpid := os.Getenv("WATCHDOG_PID")
+	if unsetEnvironment {
+		wusecErr := os.Unsetenv("WATCHDOG_USEC")
+		wpidErr := os.Unsetenv("WATCHDOG_PID")
+		if wusecErr != nil {
+			return 0, wusecErr
+		}
+		if wpidErr != nil {
+			return 0, wpidErr
+		}
+	}
+
+	if wusec == "" {
+		return 0, nil
+	}
+	s, err := strconv.Atoi(wusec)
+	if err != nil {
+		return 0, fmt.Errorf("error converting WATCHDOG_USEC: %s", err)
+	}
+	if s <= 0 {
+		return 0, fmt.Errorf("error WATCHDOG_USEC must be a positive number")
+	}
+	interval := time.Duration(s) * time.Microsecond
+
+	if wpid == "" {
+		return interval, nil
+	}
+	p, err := strconv.Atoi(wpid)
+	if err != nil {
+		return 0, fmt.Errorf("error converting WATCHDOG_PID: %s", err)
+	}
+	if os.Getpid() != p {
+		return 0, nil
+	}
+
+	return interval, nil
+}
diff --git a/vendor/github.com/coreos/go-systemd/dbus/dbus.go b/vendor/github.com/coreos/go-systemd/dbus/dbus.go
index 1699b90332..c1694fb522 100644
--- a/vendor/github.com/coreos/go-systemd/dbus/dbus.go
+++ b/vendor/github.com/coreos/go-systemd/dbus/dbus.go
@@ -83,9 +83,19 @@ type Conn struct {
 	}
 }
 
-// New establishes a connection to the system bus and authenticates.
+// New establishes a connection to any available bus and authenticates.
 // Callers should call Close() when done with the connection.
 func New() (*Conn, error) {
+	conn, err := NewSystemConnection()
+	if err != nil && os.Geteuid() == 0 {
+		return NewSystemdConnection()
+	}
+	return conn, err
+}
+
+// NewSystemConnection establishes a connection to the system bus and authenticates.
+// Callers should call Close() when done with the connection
+func NewSystemConnection() (*Conn, error) {
 	return NewConnection(func() (*dbus.Conn, error) {
 		return dbusAuthHelloConnection(dbus.SystemBusPrivate)
 	})

From a970068b398ee3c6d7d064763bbb9c6be25ed20c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 14 Nov 2016 14:55:57 +0000
Subject: [PATCH 0873/1304] docs: update sd-notify example

---
 Documentation/using-rkt-with-systemd.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index 42b04d0540..1f793afae6 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -133,7 +133,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("Listen failed: %s", err)
 	}
-	sent, err := daemon.SdNotify("READY=1")
+	sent, err := daemon.SdNotify(true, "READY=1")
 	if err != nil {
 		log.Fatalf("Notification failed: %s", err)
 	}

From a596f1ea1c7a85c4b307934ce7fdc58ec72c3354 Mon Sep 17 00:00:00 2001
From: Brad Ison <bison@coreos.com>
Date: Sun, 13 Nov 2016 20:14:12 -0800
Subject: [PATCH 0874/1304] namefetcher: Use ETag in fetchVerifiedURL()

Makes fetchVerifiedURL() in namefetcher ETag aware to prevent needlessly
re-fetching images.

Fixes #3355
---
 rkt/image/namefetcher.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 9dd471b461..83929b991d 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -170,10 +170,10 @@ func (f *nameFetcher) fetch(app *discovery.App, aciURL string, a *asc, etag stri
 		return aciFile, cd, nil
 	}
 
-	return f.fetchVerifiedURL(app, u, a)
+	return f.fetchVerifiedURL(app, u, a, etag)
 }
 
-func (f *nameFetcher) fetchVerifiedURL(app *discovery.App, u *url.URL, a *asc) (readSeekCloser, *cacheData, error) {
+func (f *nameFetcher) fetchVerifiedURL(app *discovery.App, u *url.URL, a *asc, etag string) (readSeekCloser, *cacheData, error) {
 	appName := app.Name.String()
 	f.maybeFetchPubKeys(appName)
 
@@ -190,11 +190,14 @@ func (f *nameFetcher) fetchVerifiedURL(app *discovery.App, u *url.URL, a *asc) (
 		}
 	}
 
-	aciFile, cd, err := o.DownloadImage(u)
+	aciFile, cd, err := o.DownloadImageWithETag(u, etag)
 	if err != nil {
 		return nil, nil, err
 	}
 	defer func() { maybeClose(aciFile) }()
+	if cd.UseCached {
+		return nil, cd, nil
+	}
 
 	if retry {
 		ascFile, err = o.DownloadSignatureAgain(a)

From 4a9a4a17bdc2d11d10cff05326f1957be63f0255 Mon Sep 17 00:00:00 2001
From: Francesco kurojishi Berni <kurojishi@gmail.com>
Date: Tue, 15 Nov 2016 13:46:19 +0100
Subject: [PATCH 0875/1304] docs: removed a passage from Debian section about a
 bug now solved

---
 Documentation/distributions.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index f2727bf362..ca0343eb60 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -46,12 +46,6 @@ rkt is currently packaged in [Debian sid][pkg-debian] (unstable).
 sudo apt-get install rkt
 ```
 
-Note that due to an [outstanding bug][debian-823322] one has to use the "coreos" stage1 image:
-
-```
-sudo rkt run --insecure-options=image --stage1-name=coreos.com/rkt/stage1-coreos:1.16.0 docker://nginx
-```
-
 If you don't run sid, or wish for a newer version, you can [install manually](#deb-based).
 
 ## Fedora

From b8325fd40cd03cdd60a9dfafdc6a2ef06f48e112 Mon Sep 17 00:00:00 2001
From: Brad Ison <bison@coreos.com>
Date: Tue, 15 Nov 2016 11:07:48 -0800
Subject: [PATCH 0876/1304] stage1/fly: Add a working enter implementation

Adds a working `rkt enter` implementation for the fly stage1.  It just
chroots into the pod's rootfs and execs its arguments.

Fixes #2957
---
 stage1_fly/enter/main.go | 69 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/stage1_fly/enter/main.go b/stage1_fly/enter/main.go
index d514649d3f..66861525ac 100644
--- a/stage1_fly/enter/main.go
+++ b/stage1_fly/enter/main.go
@@ -15,15 +15,76 @@
 package main
 
 import (
+	"flag"
+	"fmt"
+	"io/ioutil"
 	"os"
+	"syscall"
 
 	rktlog "github.com/coreos/rkt/pkg/log"
 )
 
-var log *rktlog.Logger
+var (
+	debug   bool
+	podPid  string
+	appName string
+
+	log  *rktlog.Logger
+	diag *rktlog.Logger
+)
+
+func init() {
+	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+	flag.StringVar(&podPid, "pid", "", "Pod PID")
+	flag.StringVar(&appName, "appname", "", "Application (Ignored in rkt fly)")
+
+	log, diag, _ = rktlog.NewLogSet("fly-enter", false)
+}
+
+func getRootDir(pid string) (string, error) {
+	rootLink := fmt.Sprintf("/proc/%s/root", pid)
+
+	return os.Readlink(rootLink)
+}
+
+func execArgs() error {
+	argv0 := flag.Arg(0)
+	argv := flag.Args()
+	envv := []string{}
+
+	return syscall.Exec(argv0, argv, envv)
+}
 
 func main() {
-	log = rktlog.New(os.Stderr, "enter", false)
-	log.Printf("not doing anything here! (%+v)", os.Args)
-	return
+	flag.Parse()
+
+	log.SetDebug(debug)
+	diag.SetDebug(debug)
+
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
+	}
+
+	root, err := getRootDir(podPid)
+	if err != nil {
+		log.FatalE("Failed to get pod root", err)
+	}
+
+	if err := os.Chdir(root); err != nil {
+		log.FatalE("Failed to change to new root", err)
+	}
+
+	if err := syscall.Chroot(root); err != nil {
+		log.FatalE("Failed to chroot", err)
+	}
+
+	diag.Println("PID:", podPid)
+	diag.Println("APP:", appName)
+	diag.Println("ARGS:", flag.Args())
+
+	if err := execArgs(); err != nil {
+		log.PrintE("exec failed", err)
+	}
+
+	os.Exit(254)
 }

From 968ef819f130ba9d74a42342654125aae31616bf Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 16 Nov 2016 12:33:06 +0000
Subject: [PATCH 0877/1304] docs: update roadmap with appc->oci projects

This commit updates the roadmap with more references and details related
to current appc->oci projects.
---
 ROADMAP.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index b6e1ea2567..7f27d6d012 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -4,14 +4,13 @@ This document defines a high level roadmap for rkt development.
 The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project.
 The [milestones defined in GitHub](https://github.com/coreos/rkt/milestones) represent the most up-to-date state of affairs.
 
-rkt is an implementation of the [App Container spec](https://github.com/appc/spec), which is still under active development on an approximately similar timeframe.
-The version of the spec that rkt implements can be seen in the output of `rkt version`.
-
-rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable.
+rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development.
 
 ## Ongoing projects
 
-- [CRI](https://github.com/coreos/rkt/projects/1): implementation of the new Container Runtime Interface from Kubernetes.
+- [Kuerbenetes CRI](https://github.com/coreos/rkt/projects/1): adapting rkt to offer first class implementation of Kubernetes Container Runtime Interface.
+- [OCI native support](https://github.com/coreos/rkt/projects/4): supporting OCI specs natively in rkt.
+- [AppC phasing-out](https://github.com/coreos/rkt/projects/5): following OCI evolution and stabilization, AppC will be naturally deprecated and phased-out.
 
 ## Next releases
 

From 813317c23b249657d8d18658a84c391bc407e1a5 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 17 Nov 2016 20:14:21 +0900
Subject: [PATCH 0878/1304] ROADMAP: typos

---
 ROADMAP.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 7f27d6d012..84b8e58ca4 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -8,9 +8,9 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 
 ## Ongoing projects
 
-- [Kuerbenetes CRI](https://github.com/coreos/rkt/projects/1): adapting rkt to offer first class implementation of Kubernetes Container Runtime Interface.
+- [Kubernetes CRI](https://github.com/coreos/rkt/projects/1): adapting rkt to offer first-class implementation of the Kubernetes Container Runtime Interface.
 - [OCI native support](https://github.com/coreos/rkt/projects/4): supporting OCI specs natively in rkt.
-- [AppC phasing-out](https://github.com/coreos/rkt/projects/5): following OCI evolution and stabilization, AppC will be naturally deprecated and phased-out.
+- [appc phase-out](https://github.com/coreos/rkt/projects/5): following OCI evolution and stabilization, appc will be naturally deprecated and phased-out.
 
 ## Next releases
 

From ee425ad9c8955e8eb7e185881ce80cac5e45c67f Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 9 Nov 2016 16:25:37 +0100
Subject: [PATCH 0879/1304] build: add --with-stage1-systemd-revision option
 for src build

Currently the systemd version can be specified using
--with-stage1-systemd-version. The build system uses this value to
chcek out the systemd revision and uses the same value to set the
systemd version.

While this works nicely for building `vXXX` based tags, it causes
problems with custom systemd branch builds where an arbitrary branch
name does not map to a qualified systemd version.

Since rkt uses heuristics internally to evaluate the systemd version,
this causes conflicts.

This fixes it by introducing a new --with-stage1-systemd-revision
configure parameter to distinguish the systemd version, and revision
being built.

Fixes #3344
---
 Documentation/build-configure.md    | 13 ++++++++++---
 Documentation/hacking.md            |  3 ++-
 Makefile.in                         |  1 +
 configure.ac                        | 20 +++++++++++++++++++-
 stage1/usr_from_src/usr_from_src.mk |  2 +-
 tests/build-and-run-tests.sh        | 10 +++++++++-
 6 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/Documentation/build-configure.md b/Documentation/build-configure.md
index 276e021154..19e4716bc5 100644
--- a/Documentation/build-configure.md
+++ b/Documentation/build-configure.md
@@ -101,10 +101,17 @@ You may want to change it to point the build system to use some local repository
 
 #### `--with-stage1-systemd-version`
 
+This parameter specifies the systemd version to be built.
+Version names are usually in form of `v<number>`, where number is a systemd version.
+The default is `v999`.
+
+#### `--with-stage1-systemd-revision`
+
 This parameter takes either a tag name or a branch name.
-Tag names are usually in form of `v<number>`, where number is a systemd version.
-The default is `v229`.
-You can use branch name `master` to test the bleeding edge version of systemd.
+You can use branch name `master` to test the bleeding edge version of systemd or any working branch, or tag name.
+Since arbitrary branch names do not imply which systemd version is being built, the actual systemd version
+is specified using `--with-stage1-systemd-version`.
+The default is `master`.
 
 ### `coreos` and `kvm` flavor
 
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 125c2db18c..01a28352ef 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -47,13 +47,14 @@ To do this, use the following `configure` parameters after running `./autogen.sh
 - `--with-stage1-flavors`
 - `--with-stage1-default-flavor` (optional)
 - `--with-stage1-systemd-version`
+- `--with-stage1-systemd-revision` (optional)
 - `--with-stage1-systemd-src`
 
 For more details, see [configure script parameters documentation][build-configure].
 Example:
 
 ```
-./autogen.sh && ./configure --with-stage1-flavors=src --with-stage1-systemd-version=master --with-stage1-systemd-src=$HOME/src/systemd && make
+./autogen.sh && ./configure --with-stage1-flavors=src --with-stage1-systemd-version=v231 --with-stage1-systemd-revision=master --with-stage1-systemd-src=$HOME/src/systemd && make
 ```
 
 ### Building stage1 with kvm as execution engine
diff --git a/Makefile.in b/Makefile.in
index c095684252..33a28cb011 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,6 +42,7 @@ RKT_STAGE1_DEFAULT_IMAGE_FILENAME_IN_RKT_DIRECTORY := @RKT_STAGE1_DEFAULT_IMAGE_
 
 RKT_STAGE1_SYSTEMD_SRC := @RKT_STAGE1_SYSTEMD_SRC@
 RKT_STAGE1_SYSTEMD_VER := @RKT_STAGE1_SYSTEMD_VER@
+RKT_STAGE1_SYSTEMD_REV := @RKT_STAGE1_SYSTEMD_REV@
 
 RKT_LOCAL_COREOS_PXE_IMAGE_PATH := @RKT_LOCAL_COREOS_PXE_IMAGE_PATH@
 RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER := @RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER@
diff --git a/configure.ac b/configure.ac
index 543de38e86..c715765422 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,6 +115,12 @@ AC_ARG_WITH([stage1-systemd-version],
             [RKT_STAGE1_SYSTEMD_VER="${withval}"],
             [RKT_STAGE1_SYSTEMD_VER='auto'])
 
+AC_ARG_WITH([stage1-systemd-revision],
+            [AS_HELP_STRING([--with-stage1-systemd-revision],
+                            [systemd revision to check out to build, used in 'src' stage1 flavor (default: the same value as --stage1-systemd-version)])],
+            [RKT_STAGE1_SYSTEMD_REV="${withval}"],
+            [RKT_STAGE1_SYSTEMD_REV='auto'])
+
 # STAGE1 - kvm hypervisor. lkvm or/and qemu can be chosen
 AC_ARG_WITH([stage1-kvm-hypervisors],
             [AS_HELP_STRING([--with-stage1-kvm-hypervisors],
@@ -410,8 +416,13 @@ RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}],[src],
                              [:])
                    AS_VAR_IF([RKT_STAGE1_SYSTEMD_VER], [auto],
                              dnl systemd version not specified, use default
-                             [RKT_STAGE1_SYSTEMD_VER='v229'],
+                             [RKT_STAGE1_SYSTEMD_VER='v999'],
                              dnl systemd version specified, use it
+                             [:])
+                   AS_VAR_IF([RKT_STAGE1_SYSTEMD_REV], [auto],
+                             dnl systemd revision not specified, use default
+                             [RKT_STAGE1_SYSTEMD_REV="master"],
+                             dnl systemd revision specified, use it
                              [:])],
                   dnl we are not building src flavor
                   [AS_VAR_IF([RKT_STAGE1_SYSTEMD_SRC], [auto],
@@ -419,6 +430,11 @@ RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}],[src],
                              [RKT_STAGE1_SYSTEMD_SRC=''],
                              dnl systemd source specified, warn about it being ignored
                              [AC_MSG_WARN([* --with-stage1-systemd-src is ignored, src flavor is not built])])
+                   AS_VAR_IF([RKT_STAGE1_SYSTEMD_REV], [auto],
+                             dnl systemd source not specified, alright, zero the value just in case
+                             [RKT_STAGE1_SYSTEMD_REV=''],
+                             dnl systemd source specified, warn about it being ignored
+                             [AC_MSG_WARN([* --with-stage1-systemd-revision is ignored, src flavor is not built])])
                    AS_VAR_IF([RKT_STAGE1_SYSTEMD_VER], [auto],
                              dnl systemd version not specified, alright, zero the value just in case
                              [RKT_STAGE1_SYSTEMD_VER=''],
@@ -772,6 +788,7 @@ AC_SUBST(RKT_STAGE1_DEFAULT_IMAGE_FILENAME_IN_RKT_DIRECTORY)
 
 AC_SUBST(RKT_STAGE1_SYSTEMD_SRC)
 AC_SUBST(RKT_STAGE1_SYSTEMD_VER)
+AC_SUBST(RKT_STAGE1_SYSTEMD_REV)
 
 AC_SUBST(RKT_LOCAL_COREOS_PXE_IMAGE_PATH)
 AC_SUBST(RKT_LOCAL_COREOS_PXE_IMAGE_SYSTEMD_VER)
@@ -845,6 +862,7 @@ RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [src],
         src flavor specific build parameters
 
         systemd git repo:                       '${RKT_STAGE1_SYSTEMD_SRC}'
+        systemd git revision:                   '${RKT_STAGE1_SYSTEMD_REV}'
         systemd version:                        '${RKT_STAGE1_SYSTEMD_VER}'])])
 
 RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [kvm],
diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index 8fb3ab3cb3..8acba911ee 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -236,7 +236,7 @@ $(call generate-glob-deps,$(UFS_PATCHES_DEPS_STAMP),$(UFS_SYSTEMD_CONFIGURE_AC),
 # parameters for makelib/git.mk
 GCL_REPOSITORY := $(RKT_STAGE1_SYSTEMD_SRC)
 GCL_DIRECTORY := $(UFS_SYSTEMD_SRCDIR)
-GCL_COMMITTISH := $(RKT_STAGE1_SYSTEMD_VER)
+GCL_COMMITTISH := $(RKT_STAGE1_SYSTEMD_REV)
 GCL_EXPECTED_FILE := $(notdir $(UFS_SYSTEMD_CONFIGURE_AC))
 GCL_TARGET := $(UFS_SYSTEMD_CONFIGURE)
 
diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index cc948eb336..811e8a4c8a 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -86,6 +86,13 @@ function parseParameters {
                 echo "Only \`src\` flavor requires systemd version"
             fi
             ;;
+        r)
+            if [[ $RKT_STAGE1_USR_FROM == "src" ]]; then
+                RKT_STAGE1_SYSTEMD_REV="${OPTARG}"
+            else
+                echo "Only \`src\` flavor requires systemd revision"
+            fi
+            ;;
         x)
             FORCE=true
             ;;
@@ -133,7 +140,8 @@ function configure {
         src)
         ./configure --with-stage1-flavors="${RKT_STAGE1_USR_FROM}" \
                 --with-stage1-default-flavor="${RKT_STAGE1_USR_FROM}" \
-                --with-stage1-systemd-version="${RKT_STAGE1_SYSTEMD_VER}" \
+                --with-stage1-systemd-version="${RKT_STAGE1_SYSTEMD_VER:-v999}" \
+                --with-stage1-systemd-revision="${RKT_STAGE1_SYSTEMD_REV:-master}" \
                 --enable-functional-tests --enable-tpm=auto \
                 --enable-insecure-go
         ;;

From e95b39c90bd8feda3cb2e6248510395a8ac0fe64 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 17 Nov 2016 14:59:51 +0000
Subject: [PATCH 0880/1304] glide: bump appc/spec to 0.8.9

---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index 49106af889..4ff3013fa7 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,7 +20,7 @@ import:
   subpackages:
   - proj2aci
 - package: github.com/appc/spec
-  version: v0.8.8
+  version: v0.8.9
   subpackages:
   - ace
   - aci

From d8a9d1eb6062de4970b370c63cbd6001b921aae8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 17 Nov 2016 17:26:24 +0000
Subject: [PATCH 0881/1304] vendor: update after appc bump

---
 glide.lock                                    |  10 +-
 .../appc/spec/ace/image_manifest_main.json.in |   4 +-
 .../spec/ace/image_manifest_sidekick.json.in  |   4 +-
 .../schema/types/isolator_linux_specific.go   |  97 ++
 .../appc/spec/schema/types/labels.go          |  72 ++
 vendor/github.com/appc/spec/schema/version.go |   2 +-
 vendor/k8s.io/kubernetes/LICENSE              |   2 +-
 .../kubernetes/pkg/api/resource/amount.go     |   2 +-
 .../kubernetes/pkg/api/resource/deep_copy.go  |  32 -
 .../pkg/api/resource/generated.pb.go          |  29 +-
 .../kubernetes/pkg/api/resource/math.go       |   2 +-
 .../kubernetes/pkg/api/resource/quantity.go   |  13 +-
 .../pkg/api/resource/quantity_proto.go        |   2 +-
 .../kubernetes/pkg/api/resource/scale_int.go  |   2 +-
 .../kubernetes/pkg/api/resource/suffix.go     |   2 +-
 .../kubernetes/pkg/conversion/cloner.go       | 237 -----
 .../kubernetes/pkg/conversion/converter.go    | 951 ------------------
 .../kubernetes/pkg/conversion/deep_equal.go   |  36 -
 .../k8s.io/kubernetes/pkg/conversion/doc.go   |  24 -
 .../kubernetes/pkg/conversion/helper.go       |  39 -
 .../third_party/forked/reflect/LICENSE        |  27 -
 .../third_party/forked/reflect/deep_equal.go  | 388 -------
 22 files changed, 221 insertions(+), 1756 deletions(-)
 delete mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy.go
 delete mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/cloner.go
 delete mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/converter.go
 delete mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/deep_equal.go
 delete mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/doc.go
 delete mode 100644 vendor/k8s.io/kubernetes/pkg/conversion/helper.go
 delete mode 100644 vendor/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
 delete mode 100644 vendor/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go

diff --git a/glide.lock b/glide.lock
index 0aa0a5bb5e..77382589bd 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 7d6124bf5a7eb501cdcbe7521bce6c90c55cd20be2986a85797c3ba4b72f0ee3
-updated: 2016-11-14T14:39:35.870828214Z
+hash: 3fa95da14ae3ac1b7fe893c005baacb4b967028f1d376f1b622ac28386f557f9
+updated: 2016-11-17T15:01:09.909898138Z
 imports:
 - name: github.com/appc/docker2aci
   version: 64543c1e0a7306b17d0d214549ec08049b234abc
@@ -20,7 +20,7 @@ imports:
   subpackages:
   - proj2aci
 - name: github.com/appc/spec
-  version: 2a251f75b2520d7a1c6c10562a1ea4e303af3e67
+  version: d7de4875ad542ca48f4ff1f1f0a487764a825fbd
   subpackages:
   - ace
   - aci
@@ -286,11 +286,9 @@ imports:
 - name: gopkg.in/inf.v0
   version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
 - name: k8s.io/kubernetes
-  version: 759dd0dfb826658c78db42d97b77b9594cd43333
+  version: fd8fac83034df346529c6e11aabceea2db48d663
   subpackages:
   - pkg/api/resource
-  - pkg/conversion
-  - third_party/forked/reflect
 testImports:
 - name: github.com/kr/text
   version: 7cafcd837844e784b526369c9bce262804aebc60
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
index 71671bfe96..ec7d9ab4ff 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.8",
+    "acVersion": "0.8.9",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.8" },
+        { "name": "version", "value": "0.8.9" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index 567eed6241..a867294140 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.8",
+    "acVersion": "0.8.9",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.8" },
+        { "name": "version", "value": "0.8.9" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
index df500bd5f7..3d5dc9fa28 100644
--- a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
+++ b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
@@ -18,6 +18,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
 	"unicode"
 )
 
@@ -29,6 +30,7 @@ const (
 	LinuxSeccompRetainSetName      = "os/linux/seccomp-retain-set"
 	LinuxOOMScoreAdjName           = "os/linux/oom-score-adj"
 	LinuxCPUSharesName             = "os/linux/cpu-shares"
+	LinuxSELinuxContextName        = "os/linux/selinux-context"
 )
 
 var LinuxIsolatorNames = make(map[ACIdentifier]struct{})
@@ -42,6 +44,7 @@ func init() {
 		LinuxCPUSharesName:             func() IsolatorValue { v := LinuxCPUShares(1024); return &v },
 		LinuxSeccompRemoveSetName:      func() IsolatorValue { return &LinuxSeccompRemoveSet{} },
 		LinuxSeccompRetainSetName:      func() IsolatorValue { return &LinuxSeccompRetainSet{} },
+		LinuxSELinuxContextName:        func() IsolatorValue { return &LinuxSELinuxContext{} },
 	} {
 		AddIsolatorName(name, LinuxIsolatorNames)
 		AddIsolatorValueConstructor(name, con)
@@ -430,3 +433,97 @@ func (l LinuxOOMScoreAdj) AsIsolator() Isolator {
 		value:    &l,
 	}
 }
+
+type LinuxSELinuxUser string
+type LinuxSELinuxRole string
+type LinuxSELinuxType string
+type LinuxSELinuxLevel string
+
+type linuxSELinuxValue struct {
+	User  LinuxSELinuxUser  `json:"user"`
+	Role  LinuxSELinuxRole  `json:"role"`
+	Type  LinuxSELinuxType  `json:"type"`
+	Level LinuxSELinuxLevel `json:"level"`
+}
+
+type LinuxSELinuxContext struct {
+	val linuxSELinuxValue
+}
+
+func (l LinuxSELinuxContext) AssertValid() error {
+	if l.val.User == "" || strings.Contains(string(l.val.User), ":") {
+		return fmt.Errorf("invalid user value %q", l.val.User)
+	}
+	if l.val.Role == "" || strings.Contains(string(l.val.Role), ":") {
+		return fmt.Errorf("invalid role value %q", l.val.Role)
+	}
+	if l.val.Type == "" || strings.Contains(string(l.val.Type), ":") {
+		return fmt.Errorf("invalid type value %q", l.val.Type)
+	}
+	if l.val.Level == "" {
+		return fmt.Errorf("invalid level value %q", l.val.Level)
+	}
+	return nil
+}
+
+func (l *LinuxSELinuxContext) UnmarshalJSON(b []byte) error {
+	var v linuxSELinuxValue
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+	l.val = v
+	return nil
+}
+
+func (l LinuxSELinuxContext) User() LinuxSELinuxUser {
+	return l.val.User
+}
+
+func (l LinuxSELinuxContext) Role() LinuxSELinuxRole {
+	return l.val.Role
+}
+
+func (l LinuxSELinuxContext) Type() LinuxSELinuxType {
+	return l.val.Type
+}
+
+func (l LinuxSELinuxContext) Level() LinuxSELinuxLevel {
+	return l.val.Level
+}
+
+func (l LinuxSELinuxContext) multipleAllowed() bool {
+	return false
+}
+
+func (l LinuxSELinuxContext) Conflicts() []ACIdentifier {
+	return nil
+}
+
+func NewLinuxSELinuxContext(selinuxUser, selinuxRole, selinuxType, selinuxLevel string) (*LinuxSELinuxContext, error) {
+	l := LinuxSELinuxContext{
+		linuxSELinuxValue{
+			LinuxSELinuxUser(selinuxUser),
+			LinuxSELinuxRole(selinuxRole),
+			LinuxSELinuxType(selinuxType),
+			LinuxSELinuxLevel(selinuxLevel),
+		},
+	}
+	if err := l.AssertValid(); err != nil {
+		return nil, err
+	}
+	return &l, nil
+}
+
+func (l LinuxSELinuxContext) AsIsolator() (*Isolator, error) {
+	b, err := json.Marshal(l.val)
+	if err != nil {
+		return nil, err
+	}
+	rm := json.RawMessage(b)
+	return &Isolator{
+		Name:     LinuxSELinuxContextName,
+		ValueRaw: &rm,
+		value:    &l,
+	}, nil
+}
diff --git a/vendor/github.com/appc/spec/schema/types/labels.go b/vendor/github.com/appc/spec/schema/types/labels.go
index 32d703cd10..89fa4285d4 100644
--- a/vendor/github.com/appc/spec/schema/types/labels.go
+++ b/vendor/github.com/appc/spec/schema/types/labels.go
@@ -35,6 +35,17 @@ type Label struct {
 	Value string       `json:"value"`
 }
 
+// {appc,go}ArchTuple are internal helper types used to translate arch tuple between go and appc
+type appcArchTuple struct {
+	appcOs   string
+	appcArch string
+}
+type goArchTuple struct {
+	goOs         string
+	goArch       string
+	goArchFlavor string
+}
+
 // IsValidOsArch checks if a OS-architecture combination is valid given a map
 // of valid OS-architectures
 func IsValidOSArch(labels map[ACIdentifier]string, validOSArch map[string][]string) error {
@@ -132,3 +143,64 @@ func LabelsFromMap(labelsMap map[ACIdentifier]string) (Labels, error) {
 	}
 	return labels, nil
 }
+
+// ToAppcOSArch translates a Golang arch tuple (OS, architecture, flavor) into
+// an appc arch tuple (OS, architecture)
+func ToAppcOSArch(goOs string, goArch string, goArchFlavor string) (appcOs string, appcArch string, e error) {
+	tabularAppcToGo := map[goArchTuple]appcArchTuple{
+		{"linux", "amd64", ""}:   {"linux", "amd64"},
+		{"linux", "386", ""}:     {"linux", "i386"},
+		{"linux", "arm64", ""}:   {"linux", "aarch64"},
+		{"linux", "arm", ""}:     {"linux", "armv6l"},
+		{"linux", "arm", "6"}:    {"linux", "armv6l"},
+		{"linux", "arm", "7"}:    {"linux", "armv7l"},
+		{"linux", "ppc64", ""}:   {"linux", "ppc64"},
+		{"linux", "ppc64le", ""}: {"linux", "ppc64le"},
+		{"linux", "s390x", ""}:   {"linux", "s390x"},
+
+		{"freebsd", "amd64", ""}: {"freebsd", "amd64"},
+		{"freebsd", "386", ""}:   {"freebsd", "i386"},
+		{"freebsd", "arm", ""}:   {"freebsd", "arm"},
+		{"freebsd", "arm", "5"}:  {"freebsd", "arm"},
+		{"freebsd", "arm", "6"}:  {"freebsd", "arm"},
+		{"freebsd", "arm", "7"}:  {"freebsd", "arm"},
+
+		{"darwin", "amd64", ""}: {"darwin", "x86_64"},
+		{"darwin", "386", ""}:   {"darwin", "i386"},
+	}
+	archTuple, ok := tabularAppcToGo[goArchTuple{goOs, goArch, goArchFlavor}]
+	if !ok {
+		return "", "", fmt.Errorf("unknown arch tuple: %q - %q - %q", goOs, goArch, goArchFlavor)
+	}
+	return archTuple.appcOs, archTuple.appcArch, nil
+}
+
+// ToGoOSArch translates an appc arch tuple (OS, architecture) into
+// a Golang arch tuple (OS, architecture, flavor)
+func ToGoOSArch(appcOs string, appcArch string) (goOs string, goArch string, goArchFlavor string, e error) {
+	tabularGoToAppc := map[appcArchTuple]goArchTuple{
+		// {"linux", "aarch64_be"}: nil,
+		// {"linux", "armv7b"}: nil,
+		{"linux", "aarch64"}: {"linux", "arm64", ""},
+		{"linux", "amd64"}:   {"linux", "amd64", ""},
+		{"linux", "armv6l"}:  {"linux", "arm", "6"},
+		{"linux", "armv7l"}:  {"linux", "arm", "7"},
+		{"linux", "i386"}:    {"linux", "386", ""},
+		{"linux", "ppc64"}:   {"linux", "ppc64", ""},
+		{"linux", "ppc64le"}: {"linux", "ppc64le", ""},
+		{"linux", "s390x"}:   {"linux", "s390x", ""},
+
+		{"freebsd", "amd64"}: {"freebsd", "amd64", ""},
+		{"freebsd", "arm"}:   {"freebsd", "arm", "6"},
+		{"freebsd", "386"}:   {"freebsd", "i386", ""},
+
+		{"darwin", "amd64"}: {"darwin", "x86_64", ""},
+		{"darwin", "386"}:   {"darwin", "i386", ""},
+	}
+
+	archTuple, ok := tabularGoToAppc[appcArchTuple{appcOs, appcArch}]
+	if !ok {
+		return "", "", "", fmt.Errorf("unknown arch tuple: %q - %q", appcOs, appcArch)
+	}
+	return archTuple.goOs, archTuple.goArch, archTuple.goArchFlavor, nil
+}
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go
index 82cc650952..a678f2068a 100644
--- a/vendor/github.com/appc/spec/schema/version.go
+++ b/vendor/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.8"
+	version string = "0.8.9"
 )
 
 var (
diff --git a/vendor/k8s.io/kubernetes/LICENSE b/vendor/k8s.io/kubernetes/LICENSE
index 6b4d837a44..00b2401109 100644
--- a/vendor/k8s.io/kubernetes/LICENSE
+++ b/vendor/k8s.io/kubernetes/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2014 The Kubernetes Authors All rights reserved.
+   Copyright 2014 The Kubernetes Authors.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go b/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go
index 6ae823a022..2d3012c875 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 The Kubernetes Authors All rights reserved.
+Copyright 2014 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy.go b/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy.go
deleted file mode 100644
index 4efc0406f0..0000000000
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/deep_copy.go
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package resource
-
-import (
-	inf "gopkg.in/inf.v0"
-
-	conversion "k8s.io/kubernetes/pkg/conversion"
-)
-
-func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error {
-	*out = in
-	if in.d.Dec != nil {
-		tmp := &inf.Dec{}
-		out.d.Dec = tmp.Set(in.d.Dec)
-	}
-	return nil
-}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go b/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
index cf9447a321..3bde152533 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Kubernetes Authors All rights reserved.
+Copyright 2016 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -38,9 +38,32 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
-func (m *Quantity) Reset()      { *m = Quantity{} }
-func (*Quantity) ProtoMessage() {}
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+const _ = proto.GoGoProtoPackageIsVersion1
+
+func (m *Quantity) Reset()                    { *m = Quantity{} }
+func (*Quantity) ProtoMessage()               {}
+func (*Quantity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} }
 
 func init() {
 	proto.RegisterType((*Quantity)(nil), "k8s.io.kubernetes.pkg.api.resource.Quantity")
 }
+
+var fileDescriptorGenerated = []byte{
+	// 222 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x32, 0xca, 0xb6, 0x28, 0xd6,
+	0xcb, 0xcc, 0xd7, 0xcf, 0x2e, 0x4d, 0x4a, 0x2d, 0xca, 0x4b, 0x2d, 0x49, 0x2d, 0xd6, 0x2f, 0xc8,
+	0x4e, 0xd7, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0x4a, 0x2d, 0xce, 0x2f, 0x2d, 0x4a, 0x4e, 0xd5, 0x4f,
+	0x4f, 0xcd, 0x4b, 0x2d, 0x4a, 0x2c, 0x49, 0x4d, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52,
+	0x82, 0xe8, 0xd1, 0x43, 0xe8, 0xd1, 0x03, 0xea, 0xd1, 0x03, 0xea, 0xd1, 0x83, 0xe9, 0x91, 0xd2,
+	0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, 0xd7,
+	0x07, 0x6b, 0x4d, 0x2a, 0x4d, 0x03, 0xf3, 0xc0, 0x1c, 0x30, 0x0b, 0x62, 0xa4, 0x94, 0x21, 0x76,
+	0x67, 0x94, 0x96, 0x64, 0xe6, 0xe8, 0x67, 0xe6, 0x95, 0x14, 0x97, 0x14, 0xa1, 0xbb, 0x42, 0xc9,
+	0x82, 0x8b, 0x23, 0xb0, 0x34, 0x31, 0xaf, 0x24, 0xb3, 0xa4, 0x52, 0x48, 0x8c, 0x8b, 0x0d, 0xa8,
+	0x24, 0x33, 0x2f, 0x5d, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, 0xca, 0xb3, 0x12, 0x99, 0xb1,
+	0x40, 0x9e, 0xa1, 0x63, 0xa1, 0x3c, 0xc3, 0x04, 0x20, 0x5e, 0x00, 0xc4, 0x0d, 0x77, 0x14, 0x18,
+	0x9c, 0xb4, 0x4e, 0x3c, 0x94, 0x63, 0xb8, 0x00, 0xc4, 0x37, 0x80, 0xb8, 0xe1, 0x91, 0x1c, 0xe3,
+	0x09, 0x20, 0xbe, 0x00, 0xc4, 0x0f, 0x80, 0x78, 0xc2, 0x63, 0x39, 0x86, 0x28, 0x0e, 0x98, 0x3f,
+	0x00, 0x01, 0x00, 0x00, 0xff, 0xff, 0x90, 0x1c, 0x7f, 0xff, 0x20, 0x01, 0x00, 0x00,
+}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/math.go b/vendor/k8s.io/kubernetes/pkg/api/resource/math.go
index 163aafa5db..887ac74c98 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/math.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/math.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 The Kubernetes Authors All rights reserved.
+Copyright 2014 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
index 96877b4c94..823dd5ef70 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 The Kubernetes Authors All rights reserved.
+Copyright 2014 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -87,7 +87,6 @@ import (
 // writing some sort of special handling code in the hopes that that will
 // cause implementors to also use a fixed point implementation.
 //
-// +gencopy=false
 // +protobuf=true
 // +protobuf.embed=string
 // +protobuf.options.marshal=false
@@ -386,6 +385,16 @@ func ParseQuantity(str string) (Quantity, error) {
 	return Quantity{d: infDecAmount{amount}, Format: format}, nil
 }
 
+// DeepCopy returns a deep-copy of the Quantity value.  Note that the method
+// receiver is a value, so we can mutate it in-place and return it.
+func (q Quantity) DeepCopy() Quantity {
+	if q.d.Dec != nil {
+		tmp := &inf.Dec{}
+		q.d.Dec = tmp.Set(q.d.Dec)
+	}
+	return q
+}
+
 // CanonicalizeBytes returns the canonical form of q and its suffix (see comment on Quantity).
 //
 // Note about BinarySI:
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
index 240294682c..74dfb4e4b7 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2015 The Kubernetes Authors All rights reserved.
+Copyright 2015 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go b/vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go
index 173de1a217..55e177b0e9 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2015 The Kubernetes Authors All rights reserved.
+Copyright 2015 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go b/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
index 0aa2ce2bf6..5ed7abe665 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 The Kubernetes Authors All rights reserved.
+Copyright 2014 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/cloner.go b/vendor/k8s.io/kubernetes/pkg/conversion/cloner.go
deleted file mode 100644
index a8c5747132..0000000000
--- a/vendor/k8s.io/kubernetes/pkg/conversion/cloner.go
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package conversion
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// Cloner knows how to copy one type to another.
-type Cloner struct {
-	// Map from the type to a function which can do the deep copy.
-	deepCopyFuncs          map[reflect.Type]reflect.Value
-	generatedDeepCopyFuncs map[reflect.Type]reflect.Value
-}
-
-// NewCloner creates a new Cloner object.
-func NewCloner() *Cloner {
-	c := &Cloner{
-		deepCopyFuncs:          map[reflect.Type]reflect.Value{},
-		generatedDeepCopyFuncs: map[reflect.Type]reflect.Value{},
-	}
-	if err := c.RegisterDeepCopyFunc(byteSliceDeepCopy); err != nil {
-		// If one of the deep-copy functions is malformed, detect it immediately.
-		panic(err)
-	}
-	return c
-}
-
-// Prevent recursing into every byte...
-func byteSliceDeepCopy(in []byte, out *[]byte, c *Cloner) error {
-	if in != nil {
-		*out = make([]byte, len(in))
-		copy(*out, in)
-	} else {
-		*out = nil
-	}
-	return nil
-}
-
-// Verifies whether a deep-copy function has a correct signature.
-func verifyDeepCopyFunctionSignature(ft reflect.Type) error {
-	if ft.Kind() != reflect.Func {
-		return fmt.Errorf("expected func, got: %v", ft)
-	}
-	if ft.NumIn() != 3 {
-		return fmt.Errorf("expected three 'in' params, got %v", ft)
-	}
-	if ft.NumOut() != 1 {
-		return fmt.Errorf("expected one 'out' param, got %v", ft)
-	}
-	if ft.In(1).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'in' param 1, got: %v", ft)
-	}
-	if ft.In(1).Elem() != ft.In(0) {
-		return fmt.Errorf("expected 'in' param 0 the same as param 1, got: %v", ft)
-	}
-	var forClonerType Cloner
-	if expected := reflect.TypeOf(&forClonerType); ft.In(2) != expected {
-		return fmt.Errorf("expected '%v' arg for 'in' param 2, got: '%v'", expected, ft.In(2))
-	}
-	var forErrorType error
-	// This convolution is necessary, otherwise TypeOf picks up on the fact
-	// that forErrorType is nil
-	errorType := reflect.TypeOf(&forErrorType).Elem()
-	if ft.Out(0) != errorType {
-		return fmt.Errorf("expected error return, got: %v", ft)
-	}
-	return nil
-}
-
-// RegisterGeneratedDeepCopyFunc registers a copying func with the Cloner.
-// deepCopyFunc must take three parameters: a type input, a pointer to a
-// type output, and a pointer to Cloner. It should return an error.
-//
-// Example:
-// c.RegisterGeneratedDeepCopyFunc(
-//         func(in Pod, out *Pod, c *Cloner) error {
-//                 // deep copy logic...
-//                 return nil
-//          })
-func (c *Cloner) RegisterDeepCopyFunc(deepCopyFunc interface{}) error {
-	fv := reflect.ValueOf(deepCopyFunc)
-	ft := fv.Type()
-	if err := verifyDeepCopyFunctionSignature(ft); err != nil {
-		return err
-	}
-	c.deepCopyFuncs[ft.In(0)] = fv
-	return nil
-}
-
-// Similar to RegisterDeepCopyFunc, but registers deep copy function that were
-// automatically generated.
-func (c *Cloner) RegisterGeneratedDeepCopyFunc(deepCopyFunc interface{}) error {
-	fv := reflect.ValueOf(deepCopyFunc)
-	ft := fv.Type()
-	if err := verifyDeepCopyFunctionSignature(ft); err != nil {
-		return err
-	}
-	c.generatedDeepCopyFuncs[ft.In(0)] = fv
-	return nil
-}
-
-// DeepCopy will perform a deep copy of a given object.
-func (c *Cloner) DeepCopy(in interface{}) (interface{}, error) {
-	// Can be invalid if we run DeepCopy(X) where X is a nil interface type.
-	// For example, we get an invalid value when someone tries to deep-copy
-	// a nil labels.Selector.
-	// This does not occur if X is nil and is a pointer to a concrete type.
-	if in == nil {
-		return nil, nil
-	}
-	inValue := reflect.ValueOf(in)
-	outValue, err := c.deepCopy(inValue)
-	if err != nil {
-		return nil, err
-	}
-	return outValue.Interface(), nil
-}
-
-func (c *Cloner) deepCopy(src reflect.Value) (reflect.Value, error) {
-	inType := src.Type()
-
-	if fv, ok := c.deepCopyFuncs[inType]; ok {
-		return c.customDeepCopy(src, fv)
-	}
-	if fv, ok := c.generatedDeepCopyFuncs[inType]; ok {
-		return c.customDeepCopy(src, fv)
-	}
-	return c.defaultDeepCopy(src)
-}
-
-func (c *Cloner) customDeepCopy(src, fv reflect.Value) (reflect.Value, error) {
-	outValue := reflect.New(src.Type())
-	args := []reflect.Value{src, outValue, reflect.ValueOf(c)}
-	result := fv.Call(args)[0].Interface()
-	// This convolution is necessary because nil interfaces won't convert
-	// to error.
-	if result == nil {
-		return outValue.Elem(), nil
-	}
-	return outValue.Elem(), result.(error)
-}
-
-func (c *Cloner) defaultDeepCopy(src reflect.Value) (reflect.Value, error) {
-	switch src.Kind() {
-	case reflect.Chan, reflect.Func, reflect.UnsafePointer, reflect.Uintptr:
-		return src, fmt.Errorf("cannot deep copy kind: %s", src.Kind())
-	case reflect.Array:
-		dst := reflect.New(src.Type())
-		for i := 0; i < src.Len(); i++ {
-			copyVal, err := c.deepCopy(src.Index(i))
-			if err != nil {
-				return src, err
-			}
-			dst.Elem().Index(i).Set(copyVal)
-		}
-		return dst.Elem(), nil
-	case reflect.Interface:
-		if src.IsNil() {
-			return src, nil
-		}
-		return c.deepCopy(src.Elem())
-	case reflect.Map:
-		if src.IsNil() {
-			return src, nil
-		}
-		dst := reflect.MakeMap(src.Type())
-		for _, k := range src.MapKeys() {
-			copyVal, err := c.deepCopy(src.MapIndex(k))
-			if err != nil {
-				return src, err
-			}
-			dst.SetMapIndex(k, copyVal)
-		}
-		return dst, nil
-	case reflect.Ptr:
-		if src.IsNil() {
-			return src, nil
-		}
-		dst := reflect.New(src.Type().Elem())
-		copyVal, err := c.deepCopy(src.Elem())
-		if err != nil {
-			return src, err
-		}
-		dst.Elem().Set(copyVal)
-		return dst, nil
-	case reflect.Slice:
-		if src.IsNil() {
-			return src, nil
-		}
-		dst := reflect.MakeSlice(src.Type(), 0, src.Len())
-		for i := 0; i < src.Len(); i++ {
-			copyVal, err := c.deepCopy(src.Index(i))
-			if err != nil {
-				return src, err
-			}
-			dst = reflect.Append(dst, copyVal)
-		}
-		return dst, nil
-	case reflect.Struct:
-		dst := reflect.New(src.Type())
-		for i := 0; i < src.NumField(); i++ {
-			if !dst.Elem().Field(i).CanSet() {
-				// Can't set private fields. At this point, the
-				// best we can do is a shallow copy. For
-				// example, time.Time is a value type with
-				// private members that can be shallow copied.
-				return src, nil
-			}
-			copyVal, err := c.deepCopy(src.Field(i))
-			if err != nil {
-				return src, err
-			}
-			dst.Elem().Field(i).Set(copyVal)
-		}
-		return dst.Elem(), nil
-
-	default:
-		// Value types like numbers, booleans, and strings.
-		return src, nil
-	}
-}
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/converter.go b/vendor/k8s.io/kubernetes/pkg/conversion/converter.go
deleted file mode 100644
index e045dcd2f7..0000000000
--- a/vendor/k8s.io/kubernetes/pkg/conversion/converter.go
+++ /dev/null
@@ -1,951 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package conversion
-
-import (
-	"fmt"
-	"reflect"
-)
-
-type typePair struct {
-	source reflect.Type
-	dest   reflect.Type
-}
-
-type typeNamePair struct {
-	fieldType reflect.Type
-	fieldName string
-}
-
-// DebugLogger allows you to get debugging messages if necessary.
-type DebugLogger interface {
-	Logf(format string, args ...interface{})
-}
-
-type NameFunc func(t reflect.Type) string
-
-var DefaultNameFunc = func(t reflect.Type) string { return t.Name() }
-
-type GenericConversionFunc func(a, b interface{}, scope Scope) (bool, error)
-
-// Converter knows how to convert one type to another.
-type Converter struct {
-	// Map from the conversion pair to a function which can
-	// do the conversion.
-	conversionFuncs          ConversionFuncs
-	generatedConversionFuncs ConversionFuncs
-
-	// genericConversions are called during normal conversion to offer a "fast-path"
-	// that avoids all reflection. These methods are not called outside of the .Convert()
-	// method.
-	genericConversions []GenericConversionFunc
-
-	// Set of conversions that should be treated as a no-op
-	ignoredConversions map[typePair]struct{}
-
-	// This is a map from a source field type and name, to a list of destination
-	// field type and name.
-	structFieldDests map[typeNamePair][]typeNamePair
-
-	// Allows for the opposite lookup of structFieldDests. So that SourceFromDest
-	// copy flag also works. So this is a map of destination field name, to potential
-	// source field name and type to look for.
-	structFieldSources map[typeNamePair][]typeNamePair
-
-	// Map from a type to a function which applies defaults.
-	defaultingFuncs map[reflect.Type]reflect.Value
-
-	// Similar to above, but function is stored as interface{}.
-	defaultingInterfaces map[reflect.Type]interface{}
-
-	// Map from an input type to a function which can apply a key name mapping
-	inputFieldMappingFuncs map[reflect.Type]FieldMappingFunc
-
-	// Map from an input type to a set of default conversion flags.
-	inputDefaultFlags map[reflect.Type]FieldMatchingFlags
-
-	// If non-nil, will be called to print helpful debugging info. Quite verbose.
-	Debug DebugLogger
-
-	// nameFunc is called to retrieve the name of a type; this name is used for the
-	// purpose of deciding whether two types match or not (i.e., will we attempt to
-	// do a conversion). The default returns the go type name.
-	nameFunc func(t reflect.Type) string
-}
-
-// NewConverter creates a new Converter object.
-func NewConverter(nameFn NameFunc) *Converter {
-	c := &Converter{
-		conversionFuncs:          NewConversionFuncs(),
-		generatedConversionFuncs: NewConversionFuncs(),
-		ignoredConversions:       make(map[typePair]struct{}),
-		defaultingFuncs:          make(map[reflect.Type]reflect.Value),
-		defaultingInterfaces:     make(map[reflect.Type]interface{}),
-		nameFunc:                 nameFn,
-		structFieldDests:         make(map[typeNamePair][]typeNamePair),
-		structFieldSources:       make(map[typeNamePair][]typeNamePair),
-
-		inputFieldMappingFuncs: make(map[reflect.Type]FieldMappingFunc),
-		inputDefaultFlags:      make(map[reflect.Type]FieldMatchingFlags),
-	}
-	c.RegisterConversionFunc(Convert_Slice_byte_To_Slice_byte)
-	return c
-}
-
-// AddGenericConversionFunc adds a function that accepts the ConversionFunc call pattern
-// (for two conversion types) to the converter. These functions are checked first during
-// a normal conversion, but are otherwise not called. Use AddConversionFuncs when registering
-// typed conversions.
-func (c *Converter) AddGenericConversionFunc(fn GenericConversionFunc) {
-	c.genericConversions = append(c.genericConversions, fn)
-}
-
-// WithConversions returns a Converter that is a copy of c but with the additional
-// fns merged on top.
-func (c *Converter) WithConversions(fns ConversionFuncs) *Converter {
-	copied := *c
-	copied.conversionFuncs = c.conversionFuncs.Merge(fns)
-	return &copied
-}
-
-// DefaultMeta returns the conversion FieldMappingFunc and meta for a given type.
-func (c *Converter) DefaultMeta(t reflect.Type) (FieldMatchingFlags, *Meta) {
-	return c.inputDefaultFlags[t], &Meta{
-		KeyNameMapping: c.inputFieldMappingFuncs[t],
-	}
-}
-
-// Convert_Slice_byte_To_Slice_byte prevents recursing into every byte
-func Convert_Slice_byte_To_Slice_byte(in *[]byte, out *[]byte, s Scope) error {
-	if *in == nil {
-		*out = nil
-		return nil
-	}
-	*out = make([]byte, len(*in))
-	copy(*out, *in)
-	return nil
-}
-
-// Scope is passed to conversion funcs to allow them to continue an ongoing conversion.
-// If multiple converters exist in the system, Scope will allow you to use the correct one
-// from a conversion function--that is, the one your conversion function was called by.
-type Scope interface {
-	// Call Convert to convert sub-objects. Note that if you call it with your own exact
-	// parameters, you'll run out of stack space before anything useful happens.
-	Convert(src, dest interface{}, flags FieldMatchingFlags) error
-
-	// DefaultConvert performs the default conversion, without calling a conversion func
-	// on the current stack frame. This makes it safe to call from a conversion func.
-	DefaultConvert(src, dest interface{}, flags FieldMatchingFlags) error
-
-	// If registered, returns a function applying defaults for objects of a given type.
-	// Used for automatically generating conversion functions.
-	DefaultingInterface(inType reflect.Type) (interface{}, bool)
-
-	// SrcTags and DestTags contain the struct tags that src and dest had, respectively.
-	// If the enclosing object was not a struct, then these will contain no tags, of course.
-	SrcTag() reflect.StructTag
-	DestTag() reflect.StructTag
-
-	// Flags returns the flags with which the conversion was started.
-	Flags() FieldMatchingFlags
-
-	// Meta returns any information originally passed to Convert.
-	Meta() *Meta
-}
-
-// FieldMappingFunc can convert an input field value into different values, depending on
-// the value of the source or destination struct tags.
-type FieldMappingFunc func(key string, sourceTag, destTag reflect.StructTag) (source string, dest string)
-
-func NewConversionFuncs() ConversionFuncs {
-	return ConversionFuncs{fns: make(map[typePair]reflect.Value)}
-}
-
-type ConversionFuncs struct {
-	fns map[typePair]reflect.Value
-}
-
-// Add adds the provided conversion functions to the lookup table - they must have the signature
-// `func(type1, type2, Scope) error`. Functions are added in the order passed and will override
-// previously registered pairs.
-func (c ConversionFuncs) Add(fns ...interface{}) error {
-	for _, fn := range fns {
-		fv := reflect.ValueOf(fn)
-		ft := fv.Type()
-		if err := verifyConversionFunctionSignature(ft); err != nil {
-			return err
-		}
-		c.fns[typePair{ft.In(0).Elem(), ft.In(1).Elem()}] = fv
-	}
-	return nil
-}
-
-// Merge returns a new ConversionFuncs that contains all conversions from
-// both other and c, with other conversions taking precedence.
-func (c ConversionFuncs) Merge(other ConversionFuncs) ConversionFuncs {
-	merged := NewConversionFuncs()
-	for k, v := range c.fns {
-		merged.fns[k] = v
-	}
-	for k, v := range other.fns {
-		merged.fns[k] = v
-	}
-	return merged
-}
-
-// Meta is supplied by Scheme, when it calls Convert.
-type Meta struct {
-	// KeyNameMapping is an optional function which may map the listed key (field name)
-	// into a source and destination value.
-	KeyNameMapping FieldMappingFunc
-}
-
-// scope contains information about an ongoing conversion.
-type scope struct {
-	converter *Converter
-	meta      *Meta
-	flags     FieldMatchingFlags
-
-	// srcStack & destStack are separate because they may not have a 1:1
-	// relationship.
-	srcStack  scopeStack
-	destStack scopeStack
-}
-
-type scopeStackElem struct {
-	tag   reflect.StructTag
-	value reflect.Value
-	key   string
-}
-
-type scopeStack []scopeStackElem
-
-func (s *scopeStack) pop() {
-	n := len(*s)
-	*s = (*s)[:n-1]
-}
-
-func (s *scopeStack) push(e scopeStackElem) {
-	*s = append(*s, e)
-}
-
-func (s *scopeStack) top() *scopeStackElem {
-	return &(*s)[len(*s)-1]
-}
-
-func (s scopeStack) describe() string {
-	desc := ""
-	if len(s) > 1 {
-		desc = "(" + s[1].value.Type().String() + ")"
-	}
-	for i, v := range s {
-		if i < 2 {
-			// First layer on stack is not real; second is handled specially above.
-			continue
-		}
-		if v.key == "" {
-			desc += fmt.Sprintf(".%v", v.value.Type())
-		} else {
-			desc += fmt.Sprintf(".%v", v.key)
-		}
-	}
-	return desc
-}
-
-func (s *scope) DefaultingInterface(inType reflect.Type) (interface{}, bool) {
-	value, found := s.converter.defaultingInterfaces[inType]
-	return value, found
-}
-
-// Formats src & dest as indices for printing.
-func (s *scope) setIndices(src, dest int) {
-	s.srcStack.top().key = fmt.Sprintf("[%v]", src)
-	s.destStack.top().key = fmt.Sprintf("[%v]", dest)
-}
-
-// Formats src & dest as map keys for printing.
-func (s *scope) setKeys(src, dest interface{}) {
-	s.srcStack.top().key = fmt.Sprintf(`["%v"]`, src)
-	s.destStack.top().key = fmt.Sprintf(`["%v"]`, dest)
-}
-
-// Convert continues a conversion.
-func (s *scope) Convert(src, dest interface{}, flags FieldMatchingFlags) error {
-	return s.converter.Convert(src, dest, flags, s.meta)
-}
-
-// DefaultConvert continues a conversion, performing a default conversion (no conversion func)
-// for the current stack frame.
-func (s *scope) DefaultConvert(src, dest interface{}, flags FieldMatchingFlags) error {
-	return s.converter.DefaultConvert(src, dest, flags, s.meta)
-}
-
-// SrcTag returns the tag of the struct containing the current source item, if any.
-func (s *scope) SrcTag() reflect.StructTag {
-	return s.srcStack.top().tag
-}
-
-// DestTag returns the tag of the struct containing the current dest item, if any.
-func (s *scope) DestTag() reflect.StructTag {
-	return s.destStack.top().tag
-}
-
-// Flags returns the flags with which the current conversion was started.
-func (s *scope) Flags() FieldMatchingFlags {
-	return s.flags
-}
-
-// Meta returns the meta object that was originally passed to Convert.
-func (s *scope) Meta() *Meta {
-	return s.meta
-}
-
-// describe prints the path to get to the current (source, dest) values.
-func (s *scope) describe() (src, dest string) {
-	return s.srcStack.describe(), s.destStack.describe()
-}
-
-// error makes an error that includes information about where we were in the objects
-// we were asked to convert.
-func (s *scope) errorf(message string, args ...interface{}) error {
-	srcPath, destPath := s.describe()
-	where := fmt.Sprintf("converting %v to %v: ", srcPath, destPath)
-	return fmt.Errorf(where+message, args...)
-}
-
-// Verifies whether a conversion function has a correct signature.
-func verifyConversionFunctionSignature(ft reflect.Type) error {
-	if ft.Kind() != reflect.Func {
-		return fmt.Errorf("expected func, got: %v", ft)
-	}
-	if ft.NumIn() != 3 {
-		return fmt.Errorf("expected three 'in' params, got: %v", ft)
-	}
-	if ft.NumOut() != 1 {
-		return fmt.Errorf("expected one 'out' param, got: %v", ft)
-	}
-	if ft.In(0).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'in' param 0, got: %v", ft)
-	}
-	if ft.In(1).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'in' param 1, got: %v", ft)
-	}
-	scopeType := Scope(nil)
-	if e, a := reflect.TypeOf(&scopeType).Elem(), ft.In(2); e != a {
-		return fmt.Errorf("expected '%v' arg for 'in' param 2, got '%v' (%v)", e, a, ft)
-	}
-	var forErrorType error
-	// This convolution is necessary, otherwise TypeOf picks up on the fact
-	// that forErrorType is nil.
-	errorType := reflect.TypeOf(&forErrorType).Elem()
-	if ft.Out(0) != errorType {
-		return fmt.Errorf("expected error return, got: %v", ft)
-	}
-	return nil
-}
-
-// RegisterConversionFunc registers a conversion func with the
-// Converter. conversionFunc must take three parameters: a pointer to the input
-// type, a pointer to the output type, and a conversion.Scope (which should be
-// used if recursive conversion calls are desired).  It must return an error.
-//
-// Example:
-// c.RegisterConversionFunc(
-//         func(in *Pod, out *v1.Pod, s Scope) error {
-//                 // conversion logic...
-//                 return nil
-//          })
-func (c *Converter) RegisterConversionFunc(conversionFunc interface{}) error {
-	return c.conversionFuncs.Add(conversionFunc)
-}
-
-// Similar to RegisterConversionFunc, but registers conversion function that were
-// automatically generated.
-func (c *Converter) RegisterGeneratedConversionFunc(conversionFunc interface{}) error {
-	return c.generatedConversionFuncs.Add(conversionFunc)
-}
-
-// RegisterIgnoredConversion registers a "no-op" for conversion, where any requested
-// conversion between from and to is ignored.
-func (c *Converter) RegisterIgnoredConversion(from, to interface{}) error {
-	typeFrom := reflect.TypeOf(from)
-	typeTo := reflect.TypeOf(to)
-	if reflect.TypeOf(from).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'from' param 0, got: %v", typeFrom)
-	}
-	if typeTo.Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'to' param 1, got: %v", typeTo)
-	}
-	c.ignoredConversions[typePair{typeFrom.Elem(), typeTo.Elem()}] = struct{}{}
-	return nil
-}
-
-// IsConversionIgnored returns true if the specified objects should be dropped during
-// conversion.
-func (c *Converter) IsConversionIgnored(inType, outType reflect.Type) bool {
-	_, found := c.ignoredConversions[typePair{inType, outType}]
-	return found
-}
-
-func (c *Converter) HasConversionFunc(inType, outType reflect.Type) bool {
-	_, found := c.conversionFuncs.fns[typePair{inType, outType}]
-	return found
-}
-
-func (c *Converter) ConversionFuncValue(inType, outType reflect.Type) (reflect.Value, bool) {
-	value, found := c.conversionFuncs.fns[typePair{inType, outType}]
-	return value, found
-}
-
-// SetStructFieldCopy registers a correspondence. Whenever a struct field is encountered
-// which has a type and name matching srcFieldType and srcFieldName, it wil be copied
-// into the field in the destination struct matching destFieldType & Name, if such a
-// field exists.
-// May be called multiple times, even for the same source field & type--all applicable
-// copies will be performed.
-func (c *Converter) SetStructFieldCopy(srcFieldType interface{}, srcFieldName string, destFieldType interface{}, destFieldName string) error {
-	st := reflect.TypeOf(srcFieldType)
-	dt := reflect.TypeOf(destFieldType)
-	srcKey := typeNamePair{st, srcFieldName}
-	destKey := typeNamePair{dt, destFieldName}
-	c.structFieldDests[srcKey] = append(c.structFieldDests[srcKey], destKey)
-	c.structFieldSources[destKey] = append(c.structFieldSources[destKey], srcKey)
-	return nil
-}
-
-// RegisterDefaultingFunc registers a value-defaulting func with the Converter.
-// defaultingFunc must take one parameters: a pointer to the input type.
-//
-// Example:
-// c.RegisteDefaultingFunc(
-//         func(in *v1.Pod) {
-//                 // defaulting logic...
-//          })
-func (c *Converter) RegisterDefaultingFunc(defaultingFunc interface{}) error {
-	fv := reflect.ValueOf(defaultingFunc)
-	ft := fv.Type()
-	if ft.Kind() != reflect.Func {
-		return fmt.Errorf("expected func, got: %v", ft)
-	}
-	if ft.NumIn() != 1 {
-		return fmt.Errorf("expected one 'in' param, got: %v", ft)
-	}
-	if ft.NumOut() != 0 {
-		return fmt.Errorf("expected zero 'out' params, got: %v", ft)
-	}
-	if ft.In(0).Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer arg for 'in' param 0, got: %v", ft)
-	}
-	inType := ft.In(0).Elem()
-	c.defaultingFuncs[inType] = fv
-	c.defaultingInterfaces[inType] = defaultingFunc
-	return nil
-}
-
-// RegisterInputDefaults registers a field name mapping function, used when converting
-// from maps to structs. Inputs to the conversion methods are checked for this type and a mapping
-// applied automatically if the input matches in. A set of default flags for the input conversion
-// may also be provided, which will be used when no explicit flags are requested.
-func (c *Converter) RegisterInputDefaults(in interface{}, fn FieldMappingFunc, defaultFlags FieldMatchingFlags) error {
-	fv := reflect.ValueOf(in)
-	ft := fv.Type()
-	if ft.Kind() != reflect.Ptr {
-		return fmt.Errorf("expected pointer 'in' argument, got: %v", ft)
-	}
-	c.inputFieldMappingFuncs[ft] = fn
-	c.inputDefaultFlags[ft] = defaultFlags
-	return nil
-}
-
-// FieldMatchingFlags contains a list of ways in which struct fields could be
-// copied. These constants may be | combined.
-type FieldMatchingFlags int
-
-const (
-	// Loop through destination fields, search for matching source
-	// field to copy it from. Source fields with no corresponding
-	// destination field will be ignored. If SourceToDest is
-	// specified, this flag is ignored. If neither is specified,
-	// or no flags are passed, this flag is the default.
-	DestFromSource FieldMatchingFlags = 0
-	// Loop through source fields, search for matching dest field
-	// to copy it into. Destination fields with no corresponding
-	// source field will be ignored.
-	SourceToDest FieldMatchingFlags = 1 << iota
-	// Don't treat it as an error if the corresponding source or
-	// dest field can't be found.
-	IgnoreMissingFields
-	// Don't require type names to match.
-	AllowDifferentFieldTypeNames
-)
-
-// IsSet returns true if the given flag or combination of flags is set.
-func (f FieldMatchingFlags) IsSet(flag FieldMatchingFlags) bool {
-	if flag == DestFromSource {
-		// The bit logic doesn't work on the default value.
-		return f&SourceToDest != SourceToDest
-	}
-	return f&flag == flag
-}
-
-// Convert will translate src to dest if it knows how. Both must be pointers.
-// If no conversion func is registered and the default copying mechanism
-// doesn't work on this type pair, an error will be returned.
-// Read the comments on the various FieldMatchingFlags constants to understand
-// what the 'flags' parameter does.
-// 'meta' is given to allow you to pass information to conversion functions,
-// it is not used by Convert() other than storing it in the scope.
-// Not safe for objects with cyclic references!
-func (c *Converter) Convert(src, dest interface{}, flags FieldMatchingFlags, meta *Meta) error {
-	if len(c.genericConversions) > 0 {
-		// TODO: avoid scope allocation
-		s := &scope{converter: c, flags: flags, meta: meta}
-		for _, fn := range c.genericConversions {
-			if ok, err := fn(src, dest, s); ok {
-				return err
-			}
-		}
-	}
-	return c.doConversion(src, dest, flags, meta, c.convert)
-}
-
-// DefaultConvert will translate src to dest if it knows how. Both must be pointers.
-// No conversion func is used. If the default copying mechanism
-// doesn't work on this type pair, an error will be returned.
-// Read the comments on the various FieldMatchingFlags constants to understand
-// what the 'flags' parameter does.
-// 'meta' is given to allow you to pass information to conversion functions,
-// it is not used by DefaultConvert() other than storing it in the scope.
-// Not safe for objects with cyclic references!
-func (c *Converter) DefaultConvert(src, dest interface{}, flags FieldMatchingFlags, meta *Meta) error {
-	return c.doConversion(src, dest, flags, meta, c.defaultConvert)
-}
-
-type conversionFunc func(sv, dv reflect.Value, scope *scope) error
-
-func (c *Converter) doConversion(src, dest interface{}, flags FieldMatchingFlags, meta *Meta, f conversionFunc) error {
-	dv, err := EnforcePtr(dest)
-	if err != nil {
-		return err
-	}
-	if !dv.CanAddr() && !dv.CanSet() {
-		return fmt.Errorf("can't write to dest")
-	}
-	sv, err := EnforcePtr(src)
-	if err != nil {
-		return err
-	}
-	s := &scope{
-		converter: c,
-		flags:     flags,
-		meta:      meta,
-	}
-	// Leave something on the stack, so that calls to struct tag getters never fail.
-	s.srcStack.push(scopeStackElem{})
-	s.destStack.push(scopeStackElem{})
-	return f(sv, dv, s)
-}
-
-// callCustom calls 'custom' with sv & dv. custom must be a conversion function.
-func (c *Converter) callCustom(sv, dv, custom reflect.Value, scope *scope) error {
-	if !sv.CanAddr() {
-		sv2 := reflect.New(sv.Type())
-		sv2.Elem().Set(sv)
-		sv = sv2
-	} else {
-		sv = sv.Addr()
-	}
-	if !dv.CanAddr() {
-		if !dv.CanSet() {
-			return scope.errorf("can't addr or set dest.")
-		}
-		dvOrig := dv
-		dv := reflect.New(dvOrig.Type())
-		defer func() { dvOrig.Set(dv) }()
-	} else {
-		dv = dv.Addr()
-	}
-	args := []reflect.Value{sv, dv, reflect.ValueOf(scope)}
-	ret := custom.Call(args)[0].Interface()
-	// This convolution is necessary because nil interfaces won't convert
-	// to errors.
-	if ret == nil {
-		return nil
-	}
-	return ret.(error)
-}
-
-// convert recursively copies sv into dv, calling an appropriate conversion function if
-// one is registered.
-func (c *Converter) convert(sv, dv reflect.Value, scope *scope) error {
-	dt, st := dv.Type(), sv.Type()
-	// Apply default values.
-	if fv, ok := c.defaultingFuncs[st]; ok {
-		if c.Debug != nil {
-			c.Debug.Logf("Applying defaults for '%v'", st)
-		}
-		args := []reflect.Value{sv.Addr()}
-		fv.Call(args)
-	}
-
-	pair := typePair{st, dt}
-
-	// ignore conversions of this type
-	if _, ok := c.ignoredConversions[pair]; ok {
-		if c.Debug != nil {
-			c.Debug.Logf("Ignoring conversion of '%v' to '%v'", st, dt)
-		}
-		return nil
-	}
-
-	// Convert sv to dv.
-	if fv, ok := c.conversionFuncs.fns[pair]; ok {
-		if c.Debug != nil {
-			c.Debug.Logf("Calling custom conversion of '%v' to '%v'", st, dt)
-		}
-		return c.callCustom(sv, dv, fv, scope)
-	}
-	if fv, ok := c.generatedConversionFuncs.fns[pair]; ok {
-		if c.Debug != nil {
-			c.Debug.Logf("Calling generated conversion of '%v' to '%v'", st, dt)
-		}
-		return c.callCustom(sv, dv, fv, scope)
-	}
-
-	return c.defaultConvert(sv, dv, scope)
-}
-
-// defaultConvert recursively copies sv into dv. no conversion function is called
-// for the current stack frame (but conversion functions may be called for nested objects)
-func (c *Converter) defaultConvert(sv, dv reflect.Value, scope *scope) error {
-	dt, st := dv.Type(), sv.Type()
-
-	if !dv.CanSet() {
-		return scope.errorf("Cannot set dest. (Tried to deep copy something with unexported fields?)")
-	}
-
-	if !scope.flags.IsSet(AllowDifferentFieldTypeNames) && c.nameFunc(dt) != c.nameFunc(st) {
-		return scope.errorf(
-			"type names don't match (%v, %v), and no conversion 'func (%v, %v) error' registered.",
-			c.nameFunc(st), c.nameFunc(dt), st, dt)
-	}
-
-	switch st.Kind() {
-	case reflect.Map, reflect.Ptr, reflect.Slice, reflect.Interface, reflect.Struct:
-		// Don't copy these via assignment/conversion!
-	default:
-		// This should handle all simple types.
-		if st.AssignableTo(dt) {
-			dv.Set(sv)
-			return nil
-		}
-		if st.ConvertibleTo(dt) {
-			dv.Set(sv.Convert(dt))
-			return nil
-		}
-	}
-
-	if c.Debug != nil {
-		c.Debug.Logf("Trying to convert '%v' to '%v'", st, dt)
-	}
-
-	scope.srcStack.push(scopeStackElem{value: sv})
-	scope.destStack.push(scopeStackElem{value: dv})
-	defer scope.srcStack.pop()
-	defer scope.destStack.pop()
-
-	switch dv.Kind() {
-	case reflect.Struct:
-		return c.convertKV(toKVValue(sv), toKVValue(dv), scope)
-	case reflect.Slice:
-		if sv.IsNil() {
-			// Don't make a zero-length slice.
-			dv.Set(reflect.Zero(dt))
-			return nil
-		}
-		dv.Set(reflect.MakeSlice(dt, sv.Len(), sv.Cap()))
-		for i := 0; i < sv.Len(); i++ {
-			scope.setIndices(i, i)
-			if err := c.convert(sv.Index(i), dv.Index(i), scope); err != nil {
-				return err
-			}
-		}
-	case reflect.Ptr:
-		if sv.IsNil() {
-			// Don't copy a nil ptr!
-			dv.Set(reflect.Zero(dt))
-			return nil
-		}
-		dv.Set(reflect.New(dt.Elem()))
-		switch st.Kind() {
-		case reflect.Ptr, reflect.Interface:
-			return c.convert(sv.Elem(), dv.Elem(), scope)
-		default:
-			return c.convert(sv, dv.Elem(), scope)
-		}
-	case reflect.Map:
-		if sv.IsNil() {
-			// Don't copy a nil ptr!
-			dv.Set(reflect.Zero(dt))
-			return nil
-		}
-		dv.Set(reflect.MakeMap(dt))
-		for _, sk := range sv.MapKeys() {
-			dk := reflect.New(dt.Key()).Elem()
-			if err := c.convert(sk, dk, scope); err != nil {
-				return err
-			}
-			dkv := reflect.New(dt.Elem()).Elem()
-			scope.setKeys(sk.Interface(), dk.Interface())
-			// TODO:  sv.MapIndex(sk) may return a value with CanAddr() == false,
-			// because a map[string]struct{} does not allow a pointer reference.
-			// Calling a custom conversion function defined for the map value
-			// will panic. Example is PodInfo map[string]ContainerStatus.
-			if err := c.convert(sv.MapIndex(sk), dkv, scope); err != nil {
-				return err
-			}
-			dv.SetMapIndex(dk, dkv)
-		}
-	case reflect.Interface:
-		if sv.IsNil() {
-			// Don't copy a nil interface!
-			dv.Set(reflect.Zero(dt))
-			return nil
-		}
-		tmpdv := reflect.New(sv.Elem().Type()).Elem()
-		if err := c.convert(sv.Elem(), tmpdv, scope); err != nil {
-			return err
-		}
-		dv.Set(reflect.ValueOf(tmpdv.Interface()))
-		return nil
-	default:
-		return scope.errorf("couldn't copy '%v' into '%v'; didn't understand types", st, dt)
-	}
-	return nil
-}
-
-var stringType = reflect.TypeOf("")
-
-func toKVValue(v reflect.Value) kvValue {
-	switch v.Kind() {
-	case reflect.Struct:
-		return structAdaptor(v)
-	case reflect.Map:
-		if v.Type().Key().AssignableTo(stringType) {
-			return stringMapAdaptor(v)
-		}
-	}
-
-	return nil
-}
-
-// kvValue lets us write the same conversion logic to work with both maps
-// and structs. Only maps with string keys make sense for this.
-type kvValue interface {
-	// returns all keys, as a []string.
-	keys() []string
-	// Will just return "" for maps.
-	tagOf(key string) reflect.StructTag
-	// Will return the zero Value if the key doesn't exist.
-	value(key string) reflect.Value
-	// Maps require explicit setting-- will do nothing for structs.
-	// Returns false on failure.
-	confirmSet(key string, v reflect.Value) bool
-}
-
-type stringMapAdaptor reflect.Value
-
-func (a stringMapAdaptor) len() int {
-	return reflect.Value(a).Len()
-}
-
-func (a stringMapAdaptor) keys() []string {
-	v := reflect.Value(a)
-	keys := make([]string, v.Len())
-	for i, v := range v.MapKeys() {
-		if v.IsNil() {
-			continue
-		}
-		switch t := v.Interface().(type) {
-		case string:
-			keys[i] = t
-		}
-	}
-	return keys
-}
-
-func (a stringMapAdaptor) tagOf(key string) reflect.StructTag {
-	return ""
-}
-
-func (a stringMapAdaptor) value(key string) reflect.Value {
-	return reflect.Value(a).MapIndex(reflect.ValueOf(key))
-}
-
-func (a stringMapAdaptor) confirmSet(key string, v reflect.Value) bool {
-	return true
-}
-
-type structAdaptor reflect.Value
-
-func (a structAdaptor) len() int {
-	v := reflect.Value(a)
-	return v.Type().NumField()
-}
-
-func (a structAdaptor) keys() []string {
-	v := reflect.Value(a)
-	t := v.Type()
-	keys := make([]string, t.NumField())
-	for i := range keys {
-		keys[i] = t.Field(i).Name
-	}
-	return keys
-}
-
-func (a structAdaptor) tagOf(key string) reflect.StructTag {
-	v := reflect.Value(a)
-	field, ok := v.Type().FieldByName(key)
-	if ok {
-		return field.Tag
-	}
-	return ""
-}
-
-func (a structAdaptor) value(key string) reflect.Value {
-	v := reflect.Value(a)
-	return v.FieldByName(key)
-}
-
-func (a structAdaptor) confirmSet(key string, v reflect.Value) bool {
-	return true
-}
-
-// convertKV can convert things that consist of key/value pairs, like structs
-// and some maps.
-func (c *Converter) convertKV(skv, dkv kvValue, scope *scope) error {
-	if skv == nil || dkv == nil {
-		// TODO: add keys to stack to support really understandable error messages.
-		return fmt.Errorf("Unable to convert %#v to %#v", skv, dkv)
-	}
-
-	lister := dkv
-	if scope.flags.IsSet(SourceToDest) {
-		lister = skv
-	}
-
-	var mapping FieldMappingFunc
-	if scope.meta != nil && scope.meta.KeyNameMapping != nil {
-		mapping = scope.meta.KeyNameMapping
-	}
-
-	for _, key := range lister.keys() {
-		if found, err := c.checkField(key, skv, dkv, scope); found {
-			if err != nil {
-				return err
-			}
-			continue
-		}
-		stag := skv.tagOf(key)
-		dtag := dkv.tagOf(key)
-		skey := key
-		dkey := key
-		if mapping != nil {
-			skey, dkey = scope.meta.KeyNameMapping(key, stag, dtag)
-		}
-
-		df := dkv.value(dkey)
-		sf := skv.value(skey)
-		if !df.IsValid() || !sf.IsValid() {
-			switch {
-			case scope.flags.IsSet(IgnoreMissingFields):
-				// No error.
-			case scope.flags.IsSet(SourceToDest):
-				return scope.errorf("%v not present in dest", dkey)
-			default:
-				return scope.errorf("%v not present in src", skey)
-			}
-			continue
-		}
-		scope.srcStack.top().key = skey
-		scope.srcStack.top().tag = stag
-		scope.destStack.top().key = dkey
-		scope.destStack.top().tag = dtag
-		if err := c.convert(sf, df, scope); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// checkField returns true if the field name matches any of the struct
-// field copying rules. The error should be ignored if it returns false.
-func (c *Converter) checkField(fieldName string, skv, dkv kvValue, scope *scope) (bool, error) {
-	replacementMade := false
-	if scope.flags.IsSet(DestFromSource) {
-		df := dkv.value(fieldName)
-		if !df.IsValid() {
-			return false, nil
-		}
-		destKey := typeNamePair{df.Type(), fieldName}
-		// Check each of the potential source (type, name) pairs to see if they're
-		// present in sv.
-		for _, potentialSourceKey := range c.structFieldSources[destKey] {
-			sf := skv.value(potentialSourceKey.fieldName)
-			if !sf.IsValid() {
-				continue
-			}
-			if sf.Type() == potentialSourceKey.fieldType {
-				// Both the source's name and type matched, so copy.
-				scope.srcStack.top().key = potentialSourceKey.fieldName
-				scope.destStack.top().key = fieldName
-				if err := c.convert(sf, df, scope); err != nil {
-					return true, err
-				}
-				dkv.confirmSet(fieldName, df)
-				replacementMade = true
-			}
-		}
-		return replacementMade, nil
-	}
-
-	sf := skv.value(fieldName)
-	if !sf.IsValid() {
-		return false, nil
-	}
-	srcKey := typeNamePair{sf.Type(), fieldName}
-	// Check each of the potential dest (type, name) pairs to see if they're
-	// present in dv.
-	for _, potentialDestKey := range c.structFieldDests[srcKey] {
-		df := dkv.value(potentialDestKey.fieldName)
-		if !df.IsValid() {
-			continue
-		}
-		if df.Type() == potentialDestKey.fieldType {
-			// Both the dest's name and type matched, so copy.
-			scope.srcStack.top().key = fieldName
-			scope.destStack.top().key = potentialDestKey.fieldName
-			if err := c.convert(sf, df, scope); err != nil {
-				return true, err
-			}
-			dkv.confirmSet(potentialDestKey.fieldName, df)
-			replacementMade = true
-		}
-	}
-	return replacementMade, nil
-}
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/deep_equal.go b/vendor/k8s.io/kubernetes/pkg/conversion/deep_equal.go
deleted file mode 100644
index 7c3ed7cda1..0000000000
--- a/vendor/k8s.io/kubernetes/pkg/conversion/deep_equal.go
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package conversion
-
-import (
-	"k8s.io/kubernetes/third_party/forked/reflect"
-)
-
-// The code for this type must be located in third_party, since it forks from
-// go std lib. But for convenience, we expose the type here, too.
-type Equalities struct {
-	reflect.Equalities
-}
-
-// For convenience, panics on errrors
-func EqualitiesOrDie(funcs ...interface{}) Equalities {
-	e := Equalities{reflect.Equalities{}}
-	if err := e.AddFuncs(funcs...); err != nil {
-		panic(err)
-	}
-	return e
-}
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/doc.go b/vendor/k8s.io/kubernetes/pkg/conversion/doc.go
deleted file mode 100644
index 3ef2eaba45..0000000000
--- a/vendor/k8s.io/kubernetes/pkg/conversion/doc.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package conversion provides go object versioning.
-//
-// Specifically, conversion provides a way for you to define multiple versions
-// of the same object. You may write functions which implement conversion logic,
-// but for the fields which did not change, copying is automated. This makes it
-// easy to modify the structures you use in memory without affecting the format
-// you store on disk or respond to in your external API calls.
-package conversion
diff --git a/vendor/k8s.io/kubernetes/pkg/conversion/helper.go b/vendor/k8s.io/kubernetes/pkg/conversion/helper.go
deleted file mode 100644
index 39f7826595..0000000000
--- a/vendor/k8s.io/kubernetes/pkg/conversion/helper.go
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package conversion
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// EnforcePtr ensures that obj is a pointer of some sort. Returns a reflect.Value
-// of the dereferenced pointer, ensuring that it is settable/addressable.
-// Returns an error if this is not possible.
-func EnforcePtr(obj interface{}) (reflect.Value, error) {
-	v := reflect.ValueOf(obj)
-	if v.Kind() != reflect.Ptr {
-		if v.Kind() == reflect.Invalid {
-			return reflect.Value{}, fmt.Errorf("expected pointer, but got invalid kind")
-		}
-		return reflect.Value{}, fmt.Errorf("expected pointer, but got %v type", v.Type())
-	}
-	if v.IsNil() {
-		return reflect.Value{}, fmt.Errorf("expected pointer, but got nil")
-	}
-	return v.Elem(), nil
-}
diff --git a/vendor/k8s.io/kubernetes/third_party/forked/reflect/LICENSE b/vendor/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
deleted file mode 100644
index 7448756763..0000000000
--- a/vendor/k8s.io/kubernetes/third_party/forked/reflect/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go b/vendor/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
deleted file mode 100644
index 9e45dbe1d2..0000000000
--- a/vendor/k8s.io/kubernetes/third_party/forked/reflect/deep_equal.go
+++ /dev/null
@@ -1,388 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package reflect is a fork of go's standard library reflection package, which
-// allows for deep equal with equality functions defined.
-package reflect
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// Equalities is a map from type to a function comparing two values of
-// that type.
-type Equalities map[reflect.Type]reflect.Value
-
-// For convenience, panics on errrors
-func EqualitiesOrDie(funcs ...interface{}) Equalities {
-	e := Equalities{}
-	if err := e.AddFuncs(funcs...); err != nil {
-		panic(err)
-	}
-	return e
-}
-
-// AddFuncs is a shortcut for multiple calls to AddFunc.
-func (e Equalities) AddFuncs(funcs ...interface{}) error {
-	for _, f := range funcs {
-		if err := e.AddFunc(f); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// AddFunc uses func as an equality function: it must take
-// two parameters of the same type, and return a boolean.
-func (e Equalities) AddFunc(eqFunc interface{}) error {
-	fv := reflect.ValueOf(eqFunc)
-	ft := fv.Type()
-	if ft.Kind() != reflect.Func {
-		return fmt.Errorf("expected func, got: %v", ft)
-	}
-	if ft.NumIn() != 2 {
-		return fmt.Errorf("expected three 'in' params, got: %v", ft)
-	}
-	if ft.NumOut() != 1 {
-		return fmt.Errorf("expected one 'out' param, got: %v", ft)
-	}
-	if ft.In(0) != ft.In(1) {
-		return fmt.Errorf("expected arg 1 and 2 to have same type, but got %v", ft)
-	}
-	var forReturnType bool
-	boolType := reflect.TypeOf(forReturnType)
-	if ft.Out(0) != boolType {
-		return fmt.Errorf("expected bool return, got: %v", ft)
-	}
-	e[ft.In(0)] = fv
-	return nil
-}
-
-// Below here is forked from go's reflect/deepequal.go
-
-// During deepValueEqual, must keep track of checks that are
-// in progress.  The comparison algorithm assumes that all
-// checks in progress are true when it reencounters them.
-// Visited comparisons are stored in a map indexed by visit.
-type visit struct {
-	a1  uintptr
-	a2  uintptr
-	typ reflect.Type
-}
-
-// unexportedTypePanic is thrown when you use this DeepEqual on something that has an
-// unexported type. It indicates a programmer error, so should not occur at runtime,
-// which is why it's not public and thus impossible to catch.
-type unexportedTypePanic []reflect.Type
-
-func (u unexportedTypePanic) Error() string { return u.String() }
-func (u unexportedTypePanic) String() string {
-	strs := make([]string, len(u))
-	for i, t := range u {
-		strs[i] = fmt.Sprintf("%v", t)
-	}
-	return "an unexported field was encountered, nested like this: " + strings.Join(strs, " -> ")
-}
-
-func makeUsefulPanic(v reflect.Value) {
-	if x := recover(); x != nil {
-		if u, ok := x.(unexportedTypePanic); ok {
-			u = append(unexportedTypePanic{v.Type()}, u...)
-			x = u
-		}
-		panic(x)
-	}
-}
-
-// Tests for deep equality using reflected types. The map argument tracks
-// comparisons that have already been seen, which allows short circuiting on
-// recursive types.
-func (e Equalities) deepValueEqual(v1, v2 reflect.Value, visited map[visit]bool, depth int) bool {
-	defer makeUsefulPanic(v1)
-
-	if !v1.IsValid() || !v2.IsValid() {
-		return v1.IsValid() == v2.IsValid()
-	}
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	if fv, ok := e[v1.Type()]; ok {
-		return fv.Call([]reflect.Value{v1, v2})[0].Bool()
-	}
-
-	hard := func(k reflect.Kind) bool {
-		switch k {
-		case reflect.Array, reflect.Map, reflect.Slice, reflect.Struct:
-			return true
-		}
-		return false
-	}
-
-	if v1.CanAddr() && v2.CanAddr() && hard(v1.Kind()) {
-		addr1 := v1.UnsafeAddr()
-		addr2 := v2.UnsafeAddr()
-		if addr1 > addr2 {
-			// Canonicalize order to reduce number of entries in visited.
-			addr1, addr2 = addr2, addr1
-		}
-
-		// Short circuit if references are identical ...
-		if addr1 == addr2 {
-			return true
-		}
-
-		// ... or already seen
-		typ := v1.Type()
-		v := visit{addr1, addr2, typ}
-		if visited[v] {
-			return true
-		}
-
-		// Remember for later.
-		visited[v] = true
-	}
-
-	switch v1.Kind() {
-	case reflect.Array:
-		// We don't need to check length here because length is part of
-		// an array's type, which has already been filtered for.
-		for i := 0; i < v1.Len(); i++ {
-			if !e.deepValueEqual(v1.Index(i), v2.Index(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Slice:
-		if (v1.IsNil() || v1.Len() == 0) != (v2.IsNil() || v2.Len() == 0) {
-			return false
-		}
-		if v1.IsNil() || v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		if v1.Pointer() == v2.Pointer() {
-			return true
-		}
-		for i := 0; i < v1.Len(); i++ {
-			if !e.deepValueEqual(v1.Index(i), v2.Index(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Interface:
-		if v1.IsNil() || v2.IsNil() {
-			return v1.IsNil() == v2.IsNil()
-		}
-		return e.deepValueEqual(v1.Elem(), v2.Elem(), visited, depth+1)
-	case reflect.Ptr:
-		return e.deepValueEqual(v1.Elem(), v2.Elem(), visited, depth+1)
-	case reflect.Struct:
-		for i, n := 0, v1.NumField(); i < n; i++ {
-			if !e.deepValueEqual(v1.Field(i), v2.Field(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Map:
-		if (v1.IsNil() || v1.Len() == 0) != (v2.IsNil() || v2.Len() == 0) {
-			return false
-		}
-		if v1.IsNil() || v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		if v1.Pointer() == v2.Pointer() {
-			return true
-		}
-		for _, k := range v1.MapKeys() {
-			if !e.deepValueEqual(v1.MapIndex(k), v2.MapIndex(k), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Func:
-		if v1.IsNil() && v2.IsNil() {
-			return true
-		}
-		// Can't do better than this:
-		return false
-	default:
-		// Normal equality suffices
-		if !v1.CanInterface() || !v2.CanInterface() {
-			panic(unexportedTypePanic{})
-		}
-		return v1.Interface() == v2.Interface()
-	}
-}
-
-// DeepEqual is like reflect.DeepEqual, but focused on semantic equality
-// instead of memory equality.
-//
-// It will use e's equality functions if it finds types that match.
-//
-// An empty slice *is* equal to a nil slice for our purposes; same for maps.
-//
-// Unexported field members cannot be compared and will cause an imformative panic; you must add an Equality
-// function for these types.
-func (e Equalities) DeepEqual(a1, a2 interface{}) bool {
-	if a1 == nil || a2 == nil {
-		return a1 == a2
-	}
-	v1 := reflect.ValueOf(a1)
-	v2 := reflect.ValueOf(a2)
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	return e.deepValueEqual(v1, v2, make(map[visit]bool), 0)
-}
-
-func (e Equalities) deepValueDerive(v1, v2 reflect.Value, visited map[visit]bool, depth int) bool {
-	defer makeUsefulPanic(v1)
-
-	if !v1.IsValid() || !v2.IsValid() {
-		return v1.IsValid() == v2.IsValid()
-	}
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	if fv, ok := e[v1.Type()]; ok {
-		return fv.Call([]reflect.Value{v1, v2})[0].Bool()
-	}
-
-	hard := func(k reflect.Kind) bool {
-		switch k {
-		case reflect.Array, reflect.Map, reflect.Slice, reflect.Struct:
-			return true
-		}
-		return false
-	}
-
-	if v1.CanAddr() && v2.CanAddr() && hard(v1.Kind()) {
-		addr1 := v1.UnsafeAddr()
-		addr2 := v2.UnsafeAddr()
-		if addr1 > addr2 {
-			// Canonicalize order to reduce number of entries in visited.
-			addr1, addr2 = addr2, addr1
-		}
-
-		// Short circuit if references are identical ...
-		if addr1 == addr2 {
-			return true
-		}
-
-		// ... or already seen
-		typ := v1.Type()
-		v := visit{addr1, addr2, typ}
-		if visited[v] {
-			return true
-		}
-
-		// Remember for later.
-		visited[v] = true
-	}
-
-	switch v1.Kind() {
-	case reflect.Array:
-		// We don't need to check length here because length is part of
-		// an array's type, which has already been filtered for.
-		for i := 0; i < v1.Len(); i++ {
-			if !e.deepValueDerive(v1.Index(i), v2.Index(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Slice:
-		if v1.IsNil() || v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() > v2.Len() {
-			return false
-		}
-		if v1.Pointer() == v2.Pointer() {
-			return true
-		}
-		for i := 0; i < v1.Len(); i++ {
-			if !e.deepValueDerive(v1.Index(i), v2.Index(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.String:
-		if v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() > v2.Len() {
-			return false
-		}
-		return v1.String() == v2.String()
-	case reflect.Interface:
-		if v1.IsNil() {
-			return true
-		}
-		return e.deepValueDerive(v1.Elem(), v2.Elem(), visited, depth+1)
-	case reflect.Ptr:
-		if v1.IsNil() {
-			return true
-		}
-		return e.deepValueDerive(v1.Elem(), v2.Elem(), visited, depth+1)
-	case reflect.Struct:
-		for i, n := 0, v1.NumField(); i < n; i++ {
-			if !e.deepValueDerive(v1.Field(i), v2.Field(i), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Map:
-		if v1.IsNil() || v1.Len() == 0 {
-			return true
-		}
-		if v1.Len() > v2.Len() {
-			return false
-		}
-		if v1.Pointer() == v2.Pointer() {
-			return true
-		}
-		for _, k := range v1.MapKeys() {
-			if !e.deepValueDerive(v1.MapIndex(k), v2.MapIndex(k), visited, depth+1) {
-				return false
-			}
-		}
-		return true
-	case reflect.Func:
-		if v1.IsNil() && v2.IsNil() {
-			return true
-		}
-		// Can't do better than this:
-		return false
-	default:
-		// Normal equality suffices
-		if !v1.CanInterface() || !v2.CanInterface() {
-			panic(unexportedTypePanic{})
-		}
-		return v1.Interface() == v2.Interface()
-	}
-}
-
-// DeepDerivative is similar to DeepEqual except that unset fields in a1 are
-// ignored (not compared). This allows us to focus on the fields that matter to
-// the semantic comparison.
-//
-// The unset fields include a nil pointer and an empty string.
-func (e Equalities) DeepDerivative(a1, a2 interface{}) bool {
-	if a1 == nil {
-		return true
-	}
-	v1 := reflect.ValueOf(a1)
-	v2 := reflect.ValueOf(a2)
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	return e.deepValueDerive(v1, v2, make(map[visit]bool), 0)
-}

From 69b3a764ff9f62a38366c11791bac6a7806922c2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 17 Nov 2016 17:28:10 +0000
Subject: [PATCH 0882/1304] rkt: update references to appc/spec 0.8.9

---
 Documentation/app-container.md                   |  4 ++--
 Documentation/devel/stage1-implementors-guide.md |  2 +-
 Documentation/subcommands/cat-manifest.md        |  2 +-
 Documentation/subcommands/image.md               |  2 +-
 Documentation/subcommands/version.md             |  2 +-
 pkg/aci/aci.go                                   |  2 +-
 stage1/aci/aci-manifest.in                       |  2 +-
 stage1_fly/aci/aci-manifest.in                   |  2 +-
 store/imagestore/store_test.go                   | 12 ++++++------
 store/treestore/tree_test.go                     |  4 ++--
 tests/empty-image/manifest                       |  2 +-
 tests/image/manifest                             |  2 +-
 tests/rkt-monitor/build-too-many-apps.sh         |  2 +-
 tests/rkt_exec_test.go                           |  2 +-
 tests/rkt_fetch_test.go                          |  2 +-
 tests/rkt_image_cat_manifest_test.go             |  2 +-
 tests/rkt_image_dependencies_test.go             |  2 +-
 tests/rkt_image_export_test.go                   |  2 +-
 tests/rkt_image_render_test.go                   |  2 +-
 tests/rkt_os_arch_test.go                        |  2 +-
 tests/stub-stage1/manifest                       |  2 +-
 21 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index 620368cfd2..d37ecbbed5 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -33,8 +33,8 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 # rkt --insecure-options=image run \
 	--mds-register \
 	--volume=database,kind=host,source=/tmp \
-	https://github.com/appc/spec/releases/download/v0.8.8/ace-validator-main.aci \
-	https://github.com/appc/spec/releases/download/v0.8.8/ace-validator-sidekick.aci
+	https://github.com/appc/spec/releases/download/v0.8.9/ace-validator-main.aci \
+	https://github.com/appc/spec/releases/download/v0.8.9/ace-validator-sidekick.aci
 ```
 
 [acbuild]: https://github.com/containers/build
diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index e6ba2aa24d..03006a6e5b 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -247,7 +247,7 @@ If the annotation is not present, rkt assumes the version is 1.
 ```json
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.8",
+    "acVersion": "0.8.9",
     "name": "foo.com/rkt/stage1",
     "labels": [
         {
diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index ba421ef7fc..dc953f9050 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -5,7 +5,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 ```
 # rkt cat-manifest UUID
 {
-  "acVersion":"0.8.8",
+  "acVersion":"0.8.9",
   "acKind":"PodManifest"
 ...
 ```
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 9be1edd14c..066fba3b07 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -7,7 +7,7 @@ For debugging or inspection you may want to extract an ACI manifest to stdout.
 ```
 # rkt image cat-manifest coreos.com/etcd
 {
-  "acVersion": "0.8.8",
+  "acVersion": "0.8.9",
   "acKind": "ImageManifest",
 ...
 ```
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 1e5cfa9307..ef2ca19147 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -7,6 +7,6 @@ This command prints the rkt version, the appc version rkt is built against, and
 ```
 $ rkt version
 rkt Version: 1.19.0
-appc Version: 0.8.8
+appc Version: 0.8.9
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/pkg/aci/aci.go b/pkg/aci/aci.go
index b75e1abf1b..d67a3e06b3 100644
--- a/pkg/aci/aci.go
+++ b/pkg/aci/aci.go
@@ -107,7 +107,7 @@ func (aw *imageArchiveWriter) Close() error {
 // NewBasicACI creates a new ACI in the given directory with the given name.
 // Used for testing.
 func NewBasicACI(dir string, name string) (*os.File, error) {
-	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.8","name":"%s"}`, name)
+	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.9","name":"%s"}`, name)
 	return NewACI(dir, manifest, nil)
 }
 
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index dff0eb388c..12ac16ca4f 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.8",
+    "acVersion": "0.8.9",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index fe5fdbd217..b9e45b05a6 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.8",
+    "acVersion": "0.8.9",
     "name": "coreos.com/rkt/stage1-fly",
     "labels": [
         {
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index 9fe818abf8..9620c9d126 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -163,7 +163,7 @@ func TestGetImageManifest(t *testing.T) {
 
 	imj := `{
 			"acKind": "ImageManifest",
-			"acVersion": "0.8.8",
+			"acVersion": "0.8.9",
 			"name": "example.com/test01"
 		}`
 
@@ -228,7 +228,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.8",
+						"acVersion": "0.8.9",
 						"name": "example.com/test01"
 					}`,
 					false,
@@ -236,7 +236,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.8",
+						"acVersion": "0.8.9",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.8",
+						"acVersion": "0.8.9",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -358,7 +358,7 @@ func TestRemoveACI(t *testing.T) {
 
 	imj := `{
                     "acKind": "ImageManifest",
-                    "acVersion": "0.8.8",
+                    "acVersion": "0.8.9",
                     "name": "example.com/test01"
                 }`
 
@@ -400,7 +400,7 @@ func TestRemoveACI(t *testing.T) {
 	// Simulate error removing from the
 	imj = `{
                    "acKind": "ImageManifest",
-                   "acVersion": "0.8.8",
+                   "acVersion": "0.8.9",
                    "name": "example.com/test01"
                }`
 
diff --git a/store/treestore/tree_test.go b/store/treestore/tree_test.go
index 9d7151147a..80abce9060 100644
--- a/store/treestore/tree_test.go
+++ b/store/treestore/tree_test.go
@@ -34,7 +34,7 @@ func testStoreWriteACI(dir string, s *imagestore.Store) (string, error) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.8",
+		    "acVersion": "0.8.9",
 		    "name": "example.com/test01"
 		}
 	`
@@ -202,7 +202,7 @@ func TestTreeStore(t *testing.T) {
 	imj := `
 		{
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.8",
+		    "acVersion": "0.8.9",
 		    "name": "example.com/test01"
 		}
 	`
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 537c0357e0..6c887e916d 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.8",
+    "acVersion": "0.8.9",
     "name": "coreos.com/rkt-empty",
     "labels": [
         {
diff --git a/tests/image/manifest b/tests/image/manifest
index 3993f2a974..4b5665eebc 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.8",
+    "acVersion": "0.8.9",
     "name": "coreos.com/rkt-inspect",
     "labels": [
         {
diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
index cc99a14b0f..d6619890c3 100755
--- a/tests/rkt-monitor/build-too-many-apps.sh
+++ b/tests/rkt-monitor/build-too-many-apps.sh
@@ -45,7 +45,7 @@ OUTPUT=${PWD}/too-many-apps.podmanifest
 
 cat <<EOF >${OUTPUT}
 {
-    "acVersion": "0.8.8",
+    "acVersion": "0.8.9",
     "acKind": "PodManifest",
     "apps": [
 EOF
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 4841c0e455..684abd4df1 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 62f93c7099..500c3016b5 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -536,7 +536,7 @@ func TestDeferredSignatureDownload(t *testing.T) {
 }
 
 func TestDifferentDiscoveryLabels(t *testing.T) {
-	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 	emptyImage := getEmptyImagePath()
 	imageName := "localhost/rkt-test-different-discovery-labels-image"
 	manifest := strings.Replace(manifestTemplate, "IMG_NAME", imageName, -1)
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 9188cf5398..7fe6406efe 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 1d74758363..6c47964e2e 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -33,7 +33,7 @@ const (
 	manifestDepsTemplate = `
 {
    "acKind" : "ImageManifest",
-   "acVersion" : "0.8.8",
+   "acVersion" : "0.8.9",
    "dependencies" : [
       DEPENDENCIES
    ],
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 5c1db02465..94b179e71b 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 966d0df5a8..f8690c6965 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index a5e8ddcd6f..a4a34e94fb 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {
diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest
index 54de7e38ca..ccbc3ed5f2 100644
--- a/tests/stub-stage1/manifest
+++ b/tests/stub-stage1/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.8",
+    "acVersion": "0.8.9",
     "name": "localhost/rkt-stub-stage1",
     "labels": [
         {

From b9ffaa4c1006067c46462ac9a7094466aab0cef5 Mon Sep 17 00:00:00 2001
From: Alessandro Puccetti <alessandro@kinvolk.io>
Date: Tue, 23 Aug 2016 15:20:42 +0200
Subject: [PATCH 0883/1304] image: remove isReallyNil()

isReallyNil uses reflection to evaluate whether a given readSeekCloser
is "really nil" to optionally close it. While it removes the burden of
explicitly closing resources it is not obvious when it happens.

This removes the function.

Fixes #2922
---
 rkt/image/asc.go         | 29 ++++++++++++++++--------
 rkt/image/common.go      | 31 -------------------------
 rkt/image/common_test.go | 49 ----------------------------------------
 rkt/image/downloader.go  |  7 ------
 rkt/image/filefetcher.go | 30 ++++++++++++++----------
 rkt/image/httpfetcher.go | 36 +++++++++++++++++++----------
 rkt/image/httpops.go     | 26 ++++++++++++++-------
 rkt/image/io.go          | 26 +++++++++++++--------
 rkt/image/namefetcher.go | 34 +++++++++++++++++++---------
 9 files changed, 119 insertions(+), 149 deletions(-)

diff --git a/rkt/image/asc.go b/rkt/image/asc.go
index 964385ceef..b5dfc7eba2 100644
--- a/rkt/image/asc.go
+++ b/rkt/image/asc.go
@@ -48,22 +48,31 @@ type remoteAscFetcher struct {
 }
 
 func (f *remoteAscFetcher) Get(location string) (readSeekCloser, error) {
+	var roc *removeOnClose // closed on error
+	var errClose error     // error signaling to close roc
+
 	roc, err := getTmpROC(f.S, location)
 	if err != nil {
 		return nil, err
 	}
-	defer func() { maybeClose(roc) }()
 
-	u, err := url.Parse(location)
-	if err != nil {
-		return nil, errwrap.Wrap(errors.New("invalid signature location"), err)
+	defer func() {
+		if errClose != nil {
+			roc.Close()
+		}
+	}()
+
+	u, errClose := url.Parse(location)
+	if errClose != nil {
+		return nil, errwrap.Wrap(errors.New("invalid signature location"), errClose)
 	}
-	if err := f.F(u, roc.File); err != nil {
-		return nil, err
+
+	errClose = f.F(u, roc.File)
+	if errClose != nil {
+		return nil, errClose
 	}
-	retRoc := roc
-	roc = nil
-	return retRoc, nil
+
+	return roc, nil
 }
 
 // asc is an abstraction for getting signature files.
@@ -81,5 +90,5 @@ func (a *asc) Get() (readSeekCloser, error) {
 	if a.Fetcher != nil {
 		return a.Fetcher.Get(a.Location)
 	}
-	return nil, nil
+	return NopReadSeekCloser(nil), nil
 }
diff --git a/rkt/image/common.go b/rkt/image/common.go
index de547c4b86..3a30915280 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -20,7 +20,6 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
-	"reflect"
 	"strings"
 	"time"
 
@@ -92,36 +91,6 @@ func ensureLogger(debug bool) {
 	}
 }
 
-// isReallyNil makes sure that the passed value is really really
-// nil. So it returns true if value is plain nil or if it is e.g. an
-// interface with non-nil type but nil-value (which normally is
-// different from nil itself).
-func isReallyNil(iface interface{}) bool {
-	// this catches the cases when you pass non-interface nil
-	// directly, like:
-	//
-	// isReallyNil(nil)
-	// var m map[string]string
-	// isReallyNil(m)
-	if iface == nil {
-		return true
-	}
-	// get a reflect value
-	v := reflect.ValueOf(iface)
-	// only channels, functions, interfaces, maps, pointers and
-	// slices are nillable
-	switch v.Kind() {
-	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		// this catches the cases when you pass some interface
-		// with nil value, like:
-		//
-		// var v io.Closer = func(){var f *os.File; return f}()
-		// isReallyNil(v)
-		return v.IsNil()
-	}
-	return false
-}
-
 // useCached checks if downloadTime plus maxAge is before/after the current time.
 // return true if the cached image should be used, false otherwise.
 func useCached(downloadTime time.Time, maxAge int) bool {
diff --git a/rkt/image/common_test.go b/rkt/image/common_test.go
index d12ca4bf80..7b4299aaff 100644
--- a/rkt/image/common_test.go
+++ b/rkt/image/common_test.go
@@ -15,10 +15,7 @@
 package image
 
 import (
-	"io"
-	"io/ioutil"
 	"net/url"
-	"os"
 	"testing"
 	"time"
 
@@ -182,49 +179,3 @@ func TestUseCached(t *testing.T) {
 		}
 	}
 }
-
-func TestIsReallyNil(t *testing.T) {
-	tests := []struct {
-		name  string
-		iface interface{}
-		isNil bool
-	}{
-		// plain nil
-		{
-			name:  "plain nil",
-			iface: nil,
-			isNil: true,
-		},
-		// some pointer
-		{
-			name:  "some pointer",
-			iface: &struct{}{},
-			isNil: false,
-		},
-		// a nil interface
-		{
-			name:  "a nil interface",
-			iface: func() io.Closer { return nil }(),
-			isNil: true,
-		},
-		// a non-nil interface with nil value
-		{
-			name:  "a non-nil interface with nil value",
-			iface: func() io.Closer { var v *os.File; return v }(),
-			isNil: true,
-		},
-		// a non-nil interface with non-nil value
-		{
-			name:  "a non-nil interface with non-nil value",
-			iface: func() io.Closer { return ioutil.NopCloser(nil) }(),
-			isNil: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Log(tt.name)
-		got := isReallyNil(tt.iface)
-		if tt.isNil != got {
-			t.Errorf("expected isReallyNil(%#v) to return %v, but got %v", tt.iface, tt.isNil, got)
-		}
-	}
-}
diff --git a/rkt/image/downloader.go b/rkt/image/downloader.go
index 06936b97f5..7f3419114b 100644
--- a/rkt/image/downloader.go
+++ b/rkt/image/downloader.go
@@ -52,7 +52,6 @@ type downloader struct {
 // Download tries to fetch the passed URL and write the contents into
 // a given writeSyncer instance.
 func (d *downloader) Download(u *url.URL, out writeSyncer) error {
-	d.ensureSession()
 	client, err := d.Session.Client()
 	if err != nil {
 		return err
@@ -86,12 +85,6 @@ func (d *downloader) Download(u *url.URL, out writeSyncer) error {
 	return nil
 }
 
-func (d *downloader) ensureSession() {
-	if isReallyNil(d.Session) {
-		d.Session = &defaultDownloadSession{}
-	}
-}
-
 // default DownloadSession is very simple implementation of
 // downloadSession interface. It returns a default client, a GET
 // request without additional headers and treats any HTTP status of a
diff --git a/rkt/image/filefetcher.go b/rkt/image/filefetcher.go
index 98c11ac2f2..6e3a16a4e6 100644
--- a/rkt/image/filefetcher.go
+++ b/rkt/image/filefetcher.go
@@ -80,33 +80,39 @@ func (f *fileFetcher) getFile(aciPath string, a *asc) (*os.File, error) {
 
 // fetch opens and verifies the ACI.
 func (f *fileFetcher) getVerifiedFile(aciPath string, a *asc) (*os.File, error) {
+	var aciFile *os.File // closed on error
+	var errClose error   // error signaling to close aciFile
+
 	f.maybeOverrideAsc(aciPath, a)
 	ascFile, err := a.Get()
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error opening signature file"), err)
 	}
-	defer func() { maybeClose(ascFile) }()
+	defer ascFile.Close()
 
-	aciFile, err := os.Open(aciPath)
+	aciFile, err = os.Open(aciPath)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error opening ACI file"), err)
 	}
-	defer func() { maybeClose(aciFile) }()
 
-	validator, err := newValidator(aciFile)
-	if err != nil {
-		return nil, err
+	defer func() {
+		if errClose != nil {
+			aciFile.Close()
+		}
+	}()
+
+	validator, errClose := newValidator(aciFile)
+	if errClose != nil {
+		return nil, errClose
 	}
 
-	entity, err := validator.ValidateWithSignature(f.Ks, ascFile)
-	if err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("image %q verification failed", validator.ImageName()), err)
+	entity, errClose := validator.ValidateWithSignature(f.Ks, ascFile)
+	if errClose != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("image %q verification failed", validator.ImageName()), errClose)
 	}
 	printIdentities(entity)
 
-	retAciFile := aciFile
-	aciFile = nil
-	return retAciFile, nil
+	return aciFile, nil
 }
 
 func (f *fileFetcher) maybeOverrideAsc(aciPath string, a *asc) {
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index 2edd7ccf08..20a5a5f885 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -58,7 +58,7 @@ func (f *httpFetcher) Hash(u *url.URL, a *asc) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	defer func() { maybeClose(aciFile) }()
+	defer aciFile.Close()
 
 	if key := maybeUseCached(f.Rem, cd); key != "" {
 		// TODO(krnowak): that does not update the store with
@@ -113,36 +113,48 @@ func (f *httpFetcher) fetchURL(u *url.URL, a *asc, etag string) (readSeekCloser,
 }
 
 func (f *httpFetcher) fetchVerifiedURL(u *url.URL, a *asc, etag string) (readSeekCloser, *cacheData, error) {
+	var aciFile readSeekCloser // closed on error
+	var errClose error         // error signaling to close aciFile
+
 	o := f.httpOps()
 	f.maybeOverrideAscFetcherWithRemote(o, u, a)
 	ascFile, retry, err := o.DownloadSignature(a)
 	if err != nil {
 		return nil, nil, err
 	}
-	defer func() { maybeClose(ascFile) }()
+	defer ascFile.Close()
 
 	aciFile, cd, err := o.DownloadImageWithETag(u, etag)
 	if err != nil {
 		return nil, nil, err
 	}
-	defer func() { maybeClose(aciFile) }()
+
+	defer func() {
+		if errClose != nil {
+			aciFile.Close()
+		}
+	}()
+
 	if cd.UseCached {
-		return nil, cd, nil
+		aciFile.Close()
+		return NopReadSeekCloser(nil), cd, nil
 	}
 
 	if retry {
-		ascFile, err = o.DownloadSignatureAgain(a)
-		if err != nil {
-			return nil, nil, err
+		ascFile.Close()
+		ascFile, errClose = o.DownloadSignatureAgain(a)
+		if errClose != nil {
+			ascFile = NopReadSeekCloser(nil)
+			return nil, nil, errClose
 		}
 	}
 
-	if err := f.validate(aciFile, ascFile); err != nil {
-		return nil, nil, err
+	errClose = f.validate(aciFile, ascFile)
+	if errClose != nil {
+		return nil, nil, errClose
 	}
-	retAciFile := aciFile
-	aciFile = nil
-	return retAciFile, cd, nil
+
+	return aciFile, cd, nil
 }
 
 func (f *httpFetcher) httpOps() *httpOps {
diff --git a/rkt/image/httpops.go b/rkt/image/httpops.go
index 0693b4bd82..07b8644c7a 100644
--- a/rkt/image/httpops.go
+++ b/rkt/image/httpops.go
@@ -49,7 +49,7 @@ func (o *httpOps) DownloadSignature(a *asc) (readSeekCloser, bool, error) {
 	}
 	if _, ok := err.(*statusAcceptedError); ok {
 		log.Printf("server requested deferring the signature download")
-		return nil, true, nil
+		return NopReadSeekCloser(nil), true, nil
 	}
 	return nil, false, errwrap.Wrap(errors.New("error downloading the signature file"), err)
 }
@@ -86,24 +86,34 @@ func (o *httpOps) DownloadImage(u *url.URL) (readSeekCloser, *cacheData, error)
 // DownloadImageWithETag might download an image or tell you to use
 // the cached image. In the latter case the returned file will be nil.
 func (o *httpOps) DownloadImageWithETag(u *url.URL, etag string) (readSeekCloser, *cacheData, error) {
+	var aciFile *removeOnClose // closed on error
+	var errClose error         // error signaling to close aciFile
+
 	ensureLogger(o.Debug)
 	aciFile, err := getTmpROC(o.S, u.String())
 	if err != nil {
 		return nil, nil, err
 	}
-	defer func() { maybeClose(aciFile) }()
+
+	defer func() {
+		if errClose != nil {
+			aciFile.Close()
+		}
+	}()
 
 	session := o.getSession(u, aciFile.File, "ACI", etag)
 	dl := o.getDownloader(session)
-	if err := dl.Download(u, aciFile.File); err != nil {
-		return nil, nil, errwrap.Wrap(errors.New("error downloading ACI"), err)
+	errClose = dl.Download(u, aciFile.File)
+	if errClose != nil {
+		return nil, nil, errwrap.Wrap(errors.New("error downloading ACI"), errClose)
 	}
+
 	if session.Cd.UseCached {
-		return nil, session.Cd, nil
+		aciFile.Close()
+		return NopReadSeekCloser(nil), session.Cd, nil
 	}
-	retAciFile := aciFile
-	aciFile = nil
-	return retAciFile, session.Cd, nil
+
+	return aciFile, session.Cd, nil
 }
 
 // AscRemoteFetcher provides a remoteAscFetcher for asc.
diff --git a/rkt/image/io.go b/rkt/image/io.go
index 0569b91651..e14ea24962 100644
--- a/rkt/image/io.go
+++ b/rkt/image/io.go
@@ -43,6 +43,18 @@ type readSeekCloser interface {
 	io.Closer
 }
 
+type nopReadSeekCloser struct {
+	io.ReadSeeker
+}
+
+func (nopReadSeekCloser) Close() error { return nil }
+
+// NopReadSeekCloser wraps the given ReadSeeker
+// and returns one that does nothing when Close() is being invoked.
+func NopReadSeekCloser(rs io.ReadSeeker) readSeekCloser {
+	return nopReadSeekCloser{rs}
+}
+
 // getIoProgressReader returns a reader that wraps the HTTP response
 // body, so it prints a pretty progress bar when reading data from it.
 func getIoProgressReader(label string, res *http.Response) io.Reader {
@@ -93,6 +105,9 @@ func (f *removeOnClose) Seek(offset int64, whence int) (int64, error) {
 // Close closes the file and then removes it from disk. No error is
 // returned if the file did not exist at the point of removal.
 func (f *removeOnClose) Close() error {
+	if f == nil || f.File == nil {
+		return nil
+	}
 	name := f.File.Name()
 	if err := f.File.Close(); err != nil {
 		return err
@@ -115,6 +130,7 @@ func getTmpROC(s *imagestore.Store, path string) (*removeOnClose, error) {
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error setting up temporary file"), err)
 	}
+
 	// let's lock the file to avoid concurrent writes to the temporary file, it
 	// will go away when removing the temp file
 	_, err = lock.TryExclusiveLock(tmp.Name(), lock.RegFile)
@@ -128,14 +144,6 @@ func getTmpROC(s *imagestore.Store, path string) (*removeOnClose, error) {
 			return nil, errwrap.Wrap(errors.New("failed to lock temporary file"), err)
 		}
 	}
-	roc := &removeOnClose{File: tmp}
-	return roc, nil
-}
 
-// maybeClose is a convenient function for closing io.Closers if they
-// are not nil. Useful in defers.
-func maybeClose(c io.Closer) {
-	if !isReallyNil(c) {
-		c.Close()
-	}
+	return &removeOnClose{File: tmp}, nil
 }
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 83929b991d..b9c7a8b427 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -121,7 +121,7 @@ func (f *nameFetcher) fetchImageFromSingleEndpoint(app *discovery.App, aciURL st
 	if err != nil {
 		return "", err
 	}
-	defer func() { maybeClose(aciFile) }()
+	defer aciFile.Close()
 
 	if key := maybeUseCached(rem, cd); key != "" {
 		return key, nil
@@ -174,6 +174,9 @@ func (f *nameFetcher) fetch(app *discovery.App, aciURL string, a *asc, etag stri
 }
 
 func (f *nameFetcher) fetchVerifiedURL(app *discovery.App, u *url.URL, a *asc, etag string) (readSeekCloser, *cacheData, error) {
+	var aciFile readSeekCloser // closed on error
+	var errClose error         // error signaling to close aciFile
+
 	appName := app.Name.String()
 	f.maybeFetchPubKeys(appName)
 
@@ -182,7 +185,7 @@ func (f *nameFetcher) fetchVerifiedURL(app *discovery.App, u *url.URL, a *asc, e
 	if err != nil {
 		return nil, nil, err
 	}
-	defer func() { maybeClose(ascFile) }()
+	defer ascFile.Close()
 
 	if !retry {
 		if err := f.checkIdentity(appName, ascFile); err != nil {
@@ -194,24 +197,33 @@ func (f *nameFetcher) fetchVerifiedURL(app *discovery.App, u *url.URL, a *asc, e
 	if err != nil {
 		return nil, nil, err
 	}
-	defer func() { maybeClose(aciFile) }()
+
+	defer func() {
+		if errClose != nil {
+			aciFile.Close()
+		}
+	}()
+
 	if cd.UseCached {
+		aciFile.Close()
 		return nil, cd, nil
 	}
 
 	if retry {
-		ascFile, err = o.DownloadSignatureAgain(a)
-		if err != nil {
-			return nil, nil, err
+		ascFile.Close()
+		ascFile, errClose = o.DownloadSignatureAgain(a)
+		if errClose != nil {
+			ascFile = NopReadSeekCloser(nil)
+			return nil, nil, errClose
 		}
 	}
 
-	if err := f.validate(app, aciFile, ascFile); err != nil {
-		return nil, nil, err
+	errClose = f.validate(app, aciFile, ascFile)
+	if errClose != nil {
+		return nil, nil, errClose
 	}
-	retAciFile := aciFile
-	aciFile = nil
-	return retAciFile, cd, nil
+
+	return aciFile, cd, nil
 }
 
 func (f *nameFetcher) maybeFetchPubKeys(appName string) {

From 52a0829b5c1baac425661611ee40826970aaa1d9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 18 Nov 2016 14:31:07 +0000
Subject: [PATCH 0884/1304] stage1: update coreos base to alpha 1235.0.0

---
 stage1/usr_from_coreos/coreos-common.mk                      | 2 +-
 stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest | 4 ++--
 stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index c94ca85b54..b4cff8fc94 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -11,7 +11,7 @@ $(call setup-tmp-dir,CCN_TMPDIR)
 # systemd version in coreos image
 CCN_SYSTEMD_VERSION := v231
 # coreos image version
-CCN_IMG_RELEASE := 1192.0.0
+CCN_IMG_RELEASE := 1235.0.0
 # coreos image URL
 CCN_IMG_URL := https://alpha.release.core-os.net/$(RKT_STAGE1_COREOS_BOARD)/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image
diff --git a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
index bbed2987a1..b4158e8c33 100644
--- a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
@@ -42,10 +42,10 @@ lib64/libgcc_s.so
 lib64/libgcc_s.so.1
 lib64/libgcrypt.so
 lib64/libgcrypt.so.20
-lib64/libgcrypt.so.20.0.5
+lib64/libgcrypt.so.20.1.3
 lib64/libgpg-error.so
 lib64/libgpg-error.so.0
-lib64/libgpg-error.so.0.15.0
+lib64/libgpg-error.so.0.19.1
 lib64/libip4tc.so
 lib64/libip4tc.so.0
 lib64/libip4tc.so.0.1.0
diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
index ad9ca299b7..21530fb9f7 100644
--- a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
@@ -36,9 +36,9 @@ lib64/libdl-2.21.so
 lib64/libdl.so
 lib64/libdl.so.2
 lib64/libgcrypt.so.20
-lib64/libgcrypt.so.20.0.5
+lib64/libgcrypt.so.20.1.3
 lib64/libgpg-error.so.0
-lib64/libgpg-error.so.0.15.0
+lib64/libgpg-error.so.0.19.1
 lib64/libip4tc.so.0
 lib64/libip4tc.so.0.1.0
 lib64/libkmod.so.2

From 9c58da8643572db2c0a70a9659bfc921bbf05dbd Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Wed, 16 Nov 2016 17:14:35 -0800
Subject: [PATCH 0885/1304] image: export `ImageListEntry` type for image list

This allows external consumers to just directly unmarshal json into this
exported type.

I modified the types of some of its values for consistency with other
exported types as well. This is unfortunately backwards incompatible.
---
 lib/types.go      |  15 +++++++
 rkt/image_list.go | 100 ++++++++++++++++++++++++++++------------------
 2 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/lib/types.go b/lib/types.go
index a42308ad00..77c43f60df 100644
--- a/lib/types.go
+++ b/lib/types.go
@@ -81,4 +81,19 @@ type (
 		// UserLabels are the pod user labels.
 		UserLabels map[string]string `json:"user_labels,omitempty"`
 	}
+
+	ImageListEntry struct {
+		// ID is the Image ID for this image
+		ID string `json:"id"`
+		// Name is the name of this image, such as example.com/some/image
+		Name string `json:"name"`
+		// ImportTime indicates when this image was imported in nanoseconds
+		// since the unix epoch
+		ImportTime int64 `json:"import_time"`
+		// LastUsedTime indicates when was last used in nanoseconds since the
+		// unix epoch
+		LastUsedTime int64 `json:"last_used_time"`
+		// Size is the size of this image in bytes
+		Size int64 `json:"size"`
+	}
 )
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 7643b9e94f..19ddcceed3 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -19,7 +19,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"strings"
+	"time"
 
+	rktlib "github.com/coreos/rkt/lib"
 	rktflag "github.com/coreos/rkt/pkg/flag"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/dustin/go-humanize"
@@ -30,8 +32,6 @@ import (
 )
 
 const (
-	defaultTimeLayout = "2006-01-02 15:04:05.999 -0700 MST"
-
 	id         = "id"
 	name       = "name"
 	importTime = "import time"
@@ -40,6 +40,8 @@ const (
 	latest     = "latest"
 )
 
+const defaultTimeLayout = "2006-01-02 15:04:05.999 -0700 MST"
+
 // Convenience methods for formatting fields
 func l(s string) string {
 	return strings.ToLower(strings.Replace(s, " ", "", -1))
@@ -78,24 +80,58 @@ var (
 	}
 )
 
-type printedImage struct {
-	ID         string `json:"id"`
-	Name       string `json:"name"`
-	ImportTime string `json:"importtime"`
-	LastUsed   string `json:"lastused"`
-	Size       string `json:"size"`
+type printableImage struct {
+	rktlib.ImageListEntry
+
+	format outputFormat
+	full   bool
+}
+
+func (pi *printableImage) MarshalJSON() ([]byte, error) {
+	return json.Marshal(pi.ImageListEntry)
 }
 
-func (pi *printedImage) attributes(fields *rktflag.OptionList) []string {
+type outputFormat int
+
+const (
+	outputFormatTabbed = iota
+	outputFormatJSON
+	outputFormatPrettyJSON
+)
+
+func (pi *printableImage) imageSize() string {
+	if pi.format != outputFormatTabbed || pi.full {
+		return fmt.Sprintf("%d", pi.Size)
+	}
+	return humanize.IBytes(uint64(pi.Size))
+}
+
+func (pi *printableImage) importTime() string {
+	t := time.Unix(0, pi.ImportTime)
+	if pi.format != outputFormatTabbed || pi.full {
+		return t.Format(defaultTimeLayout)
+	}
+	return humanize.Time(t)
+}
+
+func (pi *printableImage) lastUsedTime() string {
+	t := time.Unix(0, pi.LastUsedTime)
+	if pi.format != outputFormatTabbed || pi.full {
+		return t.Format(defaultTimeLayout)
+	}
+	return humanize.Time(t)
+}
+
+func (pi *printableImage) attributes(fields *rktflag.OptionList) []string {
 	if fields == nil {
-		return []string{pi.ID, pi.Name, pi.Size, pi.ImportTime, pi.LastUsed}
+		return []string{pi.ID, pi.Name, pi.imageSize(), pi.importTime(), pi.lastUsedTime()}
 	}
 	optionMapping := map[string]string{
 		l(id):         pi.ID,
 		l(name):       pi.Name,
-		l(size):       pi.Size,
-		l(importTime): pi.ImportTime,
-		l(lastUsed):   pi.LastUsed,
+		l(size):       pi.imageSize(),
+		l(importTime): pi.importTime(),
+		l(lastUsed):   pi.lastUsedTime(),
 	}
 	attrs := []string{}
 	for _, f := range fields.Options {
@@ -106,18 +142,10 @@ func (pi *printedImage) attributes(fields *rktflag.OptionList) []string {
 	return attrs
 }
 
-func (pi *printedImage) printableString(fields *rktflag.OptionList) string {
+func (pi *printableImage) printableString(fields *rktflag.OptionList) string {
 	return strings.Join(pi.attributes(fields), "\t")
 }
 
-type outputFormat int
-
-const (
-	outputFormatTabbed = iota
-	outputFormatJSON
-	outputFormatPrettyJSON
-)
-
 func (e *outputFormat) Set(s string) error {
 	switch s {
 	case "":
@@ -245,7 +273,7 @@ func runImages(cmd *cobra.Command, args []string) int {
 		return 254
 	}
 
-	var imagesToPrint []printedImage
+	var imagesToPrint []printableImage
 
 	for _, aciInfo := range aciInfos {
 		imj, err := s.GetImageManifestJSON(aciInfo.BlobKey)
@@ -268,26 +296,20 @@ func runImages(cmd *cobra.Command, args []string) int {
 
 		totalSize := aciInfo.Size + aciInfo.TreeStoreSize
 
-		imageImportTime := humanize.Time(aciInfo.ImportTime)
-		imageLastUsed := humanize.Time(aciInfo.LastUsed)
-		imageSize := humanize.IBytes(uint64(totalSize))
-
-		if flagImageFormat != outputFormatTabbed || flagFullOutput {
-			imageImportTime = aciInfo.ImportTime.Format(defaultTimeLayout)
-			imageLastUsed = aciInfo.LastUsed.Format(defaultTimeLayout)
-			imageSize = fmt.Sprintf("%d", totalSize)
-		}
-
 		if !flagFullOutput && flagImageFormat == outputFormatTabbed {
 			imageID = trimImageID(imageID)
 		}
 
-		imagesToPrint = append(imagesToPrint, printedImage{
-			ID:         imageID,
-			Name:       imageName,
-			ImportTime: imageImportTime,
-			LastUsed:   imageLastUsed,
-			Size:       imageSize,
+		imagesToPrint = append(imagesToPrint, printableImage{
+			ImageListEntry: rktlib.ImageListEntry{
+				ID:           imageID,
+				Name:         imageName,
+				ImportTime:   aciInfo.ImportTime.UnixNano(),
+				LastUsedTime: aciInfo.LastUsed.UnixNano(),
+				Size:         totalSize,
+			},
+			format: flagImageFormat,
+			full:   flagFullOutput,
 		})
 	}
 

From c13033a72a031dd7ec15b5f7d3df4cf852a4c91a Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 21 Nov 2016 15:57:24 +0100
Subject: [PATCH 0886/1304] tests/build-and-run-test.sh: fix systemd revision
 parameter

This script had the parameter handling in the case statement, but not in
usage, and getopts.
---
 tests/build-and-run-tests.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index 811e8a4c8a..a6b97feced 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -74,7 +74,7 @@ function checkFlavorValue {
 
 # Parse user provided parameters
 function parseParameters {
-    while getopts "f:s:cxujd" option; do
+    while getopts "f:s:r:cxujd" option; do
         case ${option} in
         f)
             RKT_STAGE1_USR_FROM="${OPTARG}"
@@ -228,6 +228,7 @@ function usage {
     echo -e "-f\tSelect flavor"
     echo -e "-j\tDon't run tests after build"
     echo -e "-s\tSystemd version"
+    echo -e "-r\tSystemd revision"
     echo -e "-u\tShow this message"
     echo -e "-x\tUse with '-c' to force cleanup on non-CI systems"
 }

From 6f08523dffcaa5d4dcc9c0b1f5b6619e4200427e Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 21 Nov 2016 08:54:36 +0100
Subject: [PATCH 0887/1304] glide: fix glide update errors

Currently glide errors out because some dependencies could not be found:

[ERROR] Error scanning google.golang.org/grpc/stats: open
/home/sur/.glide/cache/src/https-google.golang.org-grpc/stats: no such
file or directory
[ERROR] This error means the referenced package was not found.
[ERROR] Missing file or directory errors usually occur when multiple
packages
[ERROR] share a common dependency and the first reference encountered by
the scanner
[ERROR] sets the version to one that does not contain a subpackage
needed required
[ERROR] by another package that uses the shared dependency. Try setting
a
[ERROR] version in your glide.yaml that works for all packages that
share this
[ERROR] dependency.
[ERROR] Error scanning google.golang.org/grpc/tap: open
/home/sur/.glide/cache/src/https-google.golang.org-grpc/tap: no such
file or directory
...

This fixes it by introducing them manually.
---
 glide.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/glide.yaml b/glide.yaml
index 4ff3013fa7..b601625311 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -56,6 +56,7 @@ import:
   - pkg/types
   - pkg/utils
   - pkg/utils/sysctl
+  - pkg/utils/hwaddr
   - plugins/ipam/dhcp
   - plugins/ipam/host-local
   - plugins/ipam/host-local/backend
@@ -251,6 +252,8 @@ import:
   - peer
   - transport
   - internal
+  - tap
+  - stats
 - package: gopkg.in/inf.v0
   version: v0.9.0
 - package: github.com/klauspost/pgzip

From e04455cfdc70070e888d1a98b22da5e853937d37 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 21 Nov 2016 09:01:51 +0100
Subject: [PATCH 0888/1304] Documentation/hacking: update description for
 adding dependencies

This removes the `-u` parameter suggestion for `glide get` since it is
the default now.
---
 Documentation/hacking.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 01a28352ef..9ea3f5a63d 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -117,7 +117,7 @@ Ensure you have the **latest version** of `glide` and `glide-vc` available in yo
 
 Use the glide tool to add a new dependency. In order to add a dependency to a package i.e. `github.com/fizz/buzz` for version `1.2.3`, execute:
 ```
-$ glide get -u github.com/fizz/buzz#1.2.3
+$ glide get github.com/fizz/buzz#v1.2.3
 $ ./scripts/glide-update.sh
 ```
 

From f84d620773695028b83cda7332763ae8e88572b2 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 21 Nov 2016 09:04:03 +0100
Subject: [PATCH 0889/1304] glide: add github.com/PuerkitoBio/purell

---
 glide.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/glide.yaml b/glide.yaml
index b601625311..7e55d05377 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -276,3 +276,5 @@ import:
   version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
 - package: github.com/kr/pretty
   version: cfb55aafdaf3ec08f0db22699ab822c50091b1c4
+- package: github.com/PuerkitoBio/purell
+  version: v1.1.0

From e4c110a1bc5839a474036dd40a077d419177bbd8 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 21 Nov 2016 09:04:46 +0100
Subject: [PATCH 0890/1304] glide: vendor github.com/PuerkitoBio/purell

---
 glide.lock                                    |   9 +-
 vendor/github.com/PuerkitoBio/purell/LICENSE  |  12 +
 .../github.com/PuerkitoBio/purell/purell.go   | 379 ++++++++++++++++++
 3 files changed, 398 insertions(+), 2 deletions(-)
 create mode 100644 vendor/github.com/PuerkitoBio/purell/LICENSE
 create mode 100644 vendor/github.com/PuerkitoBio/purell/purell.go

diff --git a/glide.lock b/glide.lock
index 77382589bd..f8fc35a058 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 3fa95da14ae3ac1b7fe893c005baacb4b967028f1d376f1b622ac28386f557f9
-updated: 2016-11-17T15:01:09.909898138Z
+hash: 4ee26cc723790bfe9e984b7e646dbc5175432a16ef280402df1d507e014cc648
+updated: 2016-11-21T08:59:45.827536562+01:00
 imports:
 - name: github.com/appc/docker2aci
   version: 64543c1e0a7306b17d0d214549ec08049b234abc
@@ -55,6 +55,7 @@ imports:
   - pkg/testutils
   - pkg/types
   - pkg/utils
+  - pkg/utils/hwaddr
   - pkg/utils/sysctl
   - plugins/ipam/dhcp
   - plugins/ipam/host-local
@@ -206,6 +207,8 @@ imports:
   version: cccd189d45f7ac3368a0d127efb7f4d08ae0b655
 - name: github.com/peterbourgon/diskv
   version: 937c5a91d7fb1477fa6d2bb71410b2ae7a0f2143
+- name: github.com/PuerkitoBio/purell
+  version: 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4
 - name: github.com/russross/blackfriday
   version: 300106c228d52c8941d4b3de6054a6062a86dda3
 - name: github.com/shirou/gopsutil
@@ -282,6 +285,8 @@ imports:
   - metadata
   - naming
   - peer
+  - stats
+  - tap
   - transport
 - name: gopkg.in/inf.v0
   version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
diff --git a/vendor/github.com/PuerkitoBio/purell/LICENSE b/vendor/github.com/PuerkitoBio/purell/LICENSE
new file mode 100644
index 0000000000..4b9986dea7
--- /dev/null
+++ b/vendor/github.com/PuerkitoBio/purell/LICENSE
@@ -0,0 +1,12 @@
+Copyright (c) 2012, Martin Angers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+* Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/PuerkitoBio/purell/purell.go b/vendor/github.com/PuerkitoBio/purell/purell.go
new file mode 100644
index 0000000000..645e1b76f7
--- /dev/null
+++ b/vendor/github.com/PuerkitoBio/purell/purell.go
@@ -0,0 +1,379 @@
+/*
+Package purell offers URL normalization as described on the wikipedia page:
+http://en.wikipedia.org/wiki/URL_normalization
+*/
+package purell
+
+import (
+	"bytes"
+	"fmt"
+	"net/url"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/PuerkitoBio/urlesc"
+	"golang.org/x/net/idna"
+	"golang.org/x/text/unicode/norm"
+	"golang.org/x/text/width"
+)
+
+// A set of normalization flags determines how a URL will
+// be normalized.
+type NormalizationFlags uint
+
+const (
+	// Safe normalizations
+	FlagLowercaseScheme           NormalizationFlags = 1 << iota // HTTP://host -> http://host, applied by default in Go1.1
+	FlagLowercaseHost                                            // http://HOST -> http://host
+	FlagUppercaseEscapes                                         // http://host/t%ef -> http://host/t%EF
+	FlagDecodeUnnecessaryEscapes                                 // http://host/t%41 -> http://host/tA
+	FlagEncodeNecessaryEscapes                                   // http://host/!"#$ -> http://host/%21%22#$
+	FlagRemoveDefaultPort                                        // http://host:80 -> http://host
+	FlagRemoveEmptyQuerySeparator                                // http://host/path? -> http://host/path
+
+	// Usually safe normalizations
+	FlagRemoveTrailingSlash // http://host/path/ -> http://host/path
+	FlagAddTrailingSlash    // http://host/path -> http://host/path/ (should choose only one of these add/remove trailing slash flags)
+	FlagRemoveDotSegments   // http://host/path/./a/b/../c -> http://host/path/a/c
+
+	// Unsafe normalizations
+	FlagRemoveDirectoryIndex   // http://host/path/index.html -> http://host/path/
+	FlagRemoveFragment         // http://host/path#fragment -> http://host/path
+	FlagForceHTTP              // https://host -> http://host
+	FlagRemoveDuplicateSlashes // http://host/path//a///b -> http://host/path/a/b
+	FlagRemoveWWW              // http://www.host/ -> http://host/
+	FlagAddWWW                 // http://host/ -> http://www.host/ (should choose only one of these add/remove WWW flags)
+	FlagSortQuery              // http://host/path?c=3&b=2&a=1&b=1 -> http://host/path?a=1&b=1&b=2&c=3
+
+	// Normalizations not in the wikipedia article, required to cover tests cases
+	// submitted by jehiah
+	FlagDecodeDWORDHost           // http://1113982867 -> http://66.102.7.147
+	FlagDecodeOctalHost           // http://0102.0146.07.0223 -> http://66.102.7.147
+	FlagDecodeHexHost             // http://0x42660793 -> http://66.102.7.147
+	FlagRemoveUnnecessaryHostDots // http://.host../path -> http://host/path
+	FlagRemoveEmptyPortSeparator  // http://host:/path -> http://host/path
+
+	// Convenience set of safe normalizations
+	FlagsSafe NormalizationFlags = FlagLowercaseHost | FlagLowercaseScheme | FlagUppercaseEscapes | FlagDecodeUnnecessaryEscapes | FlagEncodeNecessaryEscapes | FlagRemoveDefaultPort | FlagRemoveEmptyQuerySeparator
+
+	// For convenience sets, "greedy" uses the "remove trailing slash" and "remove www. prefix" flags,
+	// while "non-greedy" uses the "add (or keep) the trailing slash" and "add www. prefix".
+
+	// Convenience set of usually safe normalizations (includes FlagsSafe)
+	FlagsUsuallySafeGreedy    NormalizationFlags = FlagsSafe | FlagRemoveTrailingSlash | FlagRemoveDotSegments
+	FlagsUsuallySafeNonGreedy NormalizationFlags = FlagsSafe | FlagAddTrailingSlash | FlagRemoveDotSegments
+
+	// Convenience set of unsafe normalizations (includes FlagsUsuallySafe)
+	FlagsUnsafeGreedy    NormalizationFlags = FlagsUsuallySafeGreedy | FlagRemoveDirectoryIndex | FlagRemoveFragment | FlagForceHTTP | FlagRemoveDuplicateSlashes | FlagRemoveWWW | FlagSortQuery
+	FlagsUnsafeNonGreedy NormalizationFlags = FlagsUsuallySafeNonGreedy | FlagRemoveDirectoryIndex | FlagRemoveFragment | FlagForceHTTP | FlagRemoveDuplicateSlashes | FlagAddWWW | FlagSortQuery
+
+	// Convenience set of all available flags
+	FlagsAllGreedy    = FlagsUnsafeGreedy | FlagDecodeDWORDHost | FlagDecodeOctalHost | FlagDecodeHexHost | FlagRemoveUnnecessaryHostDots | FlagRemoveEmptyPortSeparator
+	FlagsAllNonGreedy = FlagsUnsafeNonGreedy | FlagDecodeDWORDHost | FlagDecodeOctalHost | FlagDecodeHexHost | FlagRemoveUnnecessaryHostDots | FlagRemoveEmptyPortSeparator
+)
+
+const (
+	defaultHttpPort  = ":80"
+	defaultHttpsPort = ":443"
+)
+
+// Regular expressions used by the normalizations
+var rxPort = regexp.MustCompile(`(:\d+)/?$`)
+var rxDirIndex = regexp.MustCompile(`(^|/)((?:default|index)\.\w{1,4})$`)
+var rxDupSlashes = regexp.MustCompile(`/{2,}`)
+var rxDWORDHost = regexp.MustCompile(`^(\d+)((?:\.+)?(?:\:\d*)?)$`)
+var rxOctalHost = regexp.MustCompile(`^(0\d*)\.(0\d*)\.(0\d*)\.(0\d*)((?:\.+)?(?:\:\d*)?)$`)
+var rxHexHost = regexp.MustCompile(`^0x([0-9A-Fa-f]+)((?:\.+)?(?:\:\d*)?)$`)
+var rxHostDots = regexp.MustCompile(`^(.+?)(:\d+)?$`)
+var rxEmptyPort = regexp.MustCompile(`:+$`)
+
+// Map of flags to implementation function.
+// FlagDecodeUnnecessaryEscapes has no action, since it is done automatically
+// by parsing the string as an URL. Same for FlagUppercaseEscapes and FlagRemoveEmptyQuerySeparator.
+
+// Since maps have undefined traversing order, make a slice of ordered keys
+var flagsOrder = []NormalizationFlags{
+	FlagLowercaseScheme,
+	FlagLowercaseHost,
+	FlagRemoveDefaultPort,
+	FlagRemoveDirectoryIndex,
+	FlagRemoveDotSegments,
+	FlagRemoveFragment,
+	FlagForceHTTP, // Must be after remove default port (because https=443/http=80)
+	FlagRemoveDuplicateSlashes,
+	FlagRemoveWWW,
+	FlagAddWWW,
+	FlagSortQuery,
+	FlagDecodeDWORDHost,
+	FlagDecodeOctalHost,
+	FlagDecodeHexHost,
+	FlagRemoveUnnecessaryHostDots,
+	FlagRemoveEmptyPortSeparator,
+	FlagRemoveTrailingSlash, // These two (add/remove trailing slash) must be last
+	FlagAddTrailingSlash,
+}
+
+// ... and then the map, where order is unimportant
+var flags = map[NormalizationFlags]func(*url.URL){
+	FlagLowercaseScheme:           lowercaseScheme,
+	FlagLowercaseHost:             lowercaseHost,
+	FlagRemoveDefaultPort:         removeDefaultPort,
+	FlagRemoveDirectoryIndex:      removeDirectoryIndex,
+	FlagRemoveDotSegments:         removeDotSegments,
+	FlagRemoveFragment:            removeFragment,
+	FlagForceHTTP:                 forceHTTP,
+	FlagRemoveDuplicateSlashes:    removeDuplicateSlashes,
+	FlagRemoveWWW:                 removeWWW,
+	FlagAddWWW:                    addWWW,
+	FlagSortQuery:                 sortQuery,
+	FlagDecodeDWORDHost:           decodeDWORDHost,
+	FlagDecodeOctalHost:           decodeOctalHost,
+	FlagDecodeHexHost:             decodeHexHost,
+	FlagRemoveUnnecessaryHostDots: removeUnncessaryHostDots,
+	FlagRemoveEmptyPortSeparator:  removeEmptyPortSeparator,
+	FlagRemoveTrailingSlash:       removeTrailingSlash,
+	FlagAddTrailingSlash:          addTrailingSlash,
+}
+
+// MustNormalizeURLString returns the normalized string, and panics if an error occurs.
+// It takes an URL string as input, as well as the normalization flags.
+func MustNormalizeURLString(u string, f NormalizationFlags) string {
+	result, e := NormalizeURLString(u, f)
+	if e != nil {
+		panic(e)
+	}
+	return result
+}
+
+// NormalizeURLString returns the normalized string, or an error if it can't be parsed into an URL object.
+// It takes an URL string as input, as well as the normalization flags.
+func NormalizeURLString(u string, f NormalizationFlags) (string, error) {
+	parsed, err := url.Parse(u)
+	if err != nil {
+		return "", err
+	}
+
+	if f&FlagLowercaseHost == FlagLowercaseHost {
+		parsed.Host = strings.ToLower(parsed.Host)
+	}
+
+	// The idna package doesn't fully conform to RFC 5895
+	// (https://tools.ietf.org/html/rfc5895), so we do it here.
+	// Taken from Go 1.8 cycle source, courtesy of bradfitz.
+	// TODO: Remove when (if?) idna package conforms to RFC 5895.
+	parsed.Host = width.Fold.String(parsed.Host)
+	parsed.Host = norm.NFC.String(parsed.Host)
+	if parsed.Host, err = idna.ToASCII(parsed.Host); err != nil {
+		return "", err
+	}
+
+	return NormalizeURL(parsed, f), nil
+}
+
+// NormalizeURL returns the normalized string.
+// It takes a parsed URL object as input, as well as the normalization flags.
+func NormalizeURL(u *url.URL, f NormalizationFlags) string {
+	for _, k := range flagsOrder {
+		if f&k == k {
+			flags[k](u)
+		}
+	}
+	return urlesc.Escape(u)
+}
+
+func lowercaseScheme(u *url.URL) {
+	if len(u.Scheme) > 0 {
+		u.Scheme = strings.ToLower(u.Scheme)
+	}
+}
+
+func lowercaseHost(u *url.URL) {
+	if len(u.Host) > 0 {
+		u.Host = strings.ToLower(u.Host)
+	}
+}
+
+func removeDefaultPort(u *url.URL) {
+	if len(u.Host) > 0 {
+		scheme := strings.ToLower(u.Scheme)
+		u.Host = rxPort.ReplaceAllStringFunc(u.Host, func(val string) string {
+			if (scheme == "http" && val == defaultHttpPort) || (scheme == "https" && val == defaultHttpsPort) {
+				return ""
+			}
+			return val
+		})
+	}
+}
+
+func removeTrailingSlash(u *url.URL) {
+	if l := len(u.Path); l > 0 {
+		if strings.HasSuffix(u.Path, "/") {
+			u.Path = u.Path[:l-1]
+		}
+	} else if l = len(u.Host); l > 0 {
+		if strings.HasSuffix(u.Host, "/") {
+			u.Host = u.Host[:l-1]
+		}
+	}
+}
+
+func addTrailingSlash(u *url.URL) {
+	if l := len(u.Path); l > 0 {
+		if !strings.HasSuffix(u.Path, "/") {
+			u.Path += "/"
+		}
+	} else if l = len(u.Host); l > 0 {
+		if !strings.HasSuffix(u.Host, "/") {
+			u.Host += "/"
+		}
+	}
+}
+
+func removeDotSegments(u *url.URL) {
+	if len(u.Path) > 0 {
+		var dotFree []string
+		var lastIsDot bool
+
+		sections := strings.Split(u.Path, "/")
+		for _, s := range sections {
+			if s == ".." {
+				if len(dotFree) > 0 {
+					dotFree = dotFree[:len(dotFree)-1]
+				}
+			} else if s != "." {
+				dotFree = append(dotFree, s)
+			}
+			lastIsDot = (s == "." || s == "..")
+		}
+		// Special case if host does not end with / and new path does not begin with /
+		u.Path = strings.Join(dotFree, "/")
+		if u.Host != "" && !strings.HasSuffix(u.Host, "/") && !strings.HasPrefix(u.Path, "/") {
+			u.Path = "/" + u.Path
+		}
+		// Special case if the last segment was a dot, make sure the path ends with a slash
+		if lastIsDot && !strings.HasSuffix(u.Path, "/") {
+			u.Path += "/"
+		}
+	}
+}
+
+func removeDirectoryIndex(u *url.URL) {
+	if len(u.Path) > 0 {
+		u.Path = rxDirIndex.ReplaceAllString(u.Path, "$1")
+	}
+}
+
+func removeFragment(u *url.URL) {
+	u.Fragment = ""
+}
+
+func forceHTTP(u *url.URL) {
+	if strings.ToLower(u.Scheme) == "https" {
+		u.Scheme = "http"
+	}
+}
+
+func removeDuplicateSlashes(u *url.URL) {
+	if len(u.Path) > 0 {
+		u.Path = rxDupSlashes.ReplaceAllString(u.Path, "/")
+	}
+}
+
+func removeWWW(u *url.URL) {
+	if len(u.Host) > 0 && strings.HasPrefix(strings.ToLower(u.Host), "www.") {
+		u.Host = u.Host[4:]
+	}
+}
+
+func addWWW(u *url.URL) {
+	if len(u.Host) > 0 && !strings.HasPrefix(strings.ToLower(u.Host), "www.") {
+		u.Host = "www." + u.Host
+	}
+}
+
+func sortQuery(u *url.URL) {
+	q := u.Query()
+
+	if len(q) > 0 {
+		arKeys := make([]string, len(q))
+		i := 0
+		for k, _ := range q {
+			arKeys[i] = k
+			i++
+		}
+		sort.Strings(arKeys)
+		buf := new(bytes.Buffer)
+		for _, k := range arKeys {
+			sort.Strings(q[k])
+			for _, v := range q[k] {
+				if buf.Len() > 0 {
+					buf.WriteRune('&')
+				}
+				buf.WriteString(fmt.Sprintf("%s=%s", k, urlesc.QueryEscape(v)))
+			}
+		}
+
+		// Rebuild the raw query string
+		u.RawQuery = buf.String()
+	}
+}
+
+func decodeDWORDHost(u *url.URL) {
+	if len(u.Host) > 0 {
+		if matches := rxDWORDHost.FindStringSubmatch(u.Host); len(matches) > 2 {
+			var parts [4]int64
+
+			dword, _ := strconv.ParseInt(matches[1], 10, 0)
+			for i, shift := range []uint{24, 16, 8, 0} {
+				parts[i] = dword >> shift & 0xFF
+			}
+			u.Host = fmt.Sprintf("%d.%d.%d.%d%s", parts[0], parts[1], parts[2], parts[3], matches[2])
+		}
+	}
+}
+
+func decodeOctalHost(u *url.URL) {
+	if len(u.Host) > 0 {
+		if matches := rxOctalHost.FindStringSubmatch(u.Host); len(matches) > 5 {
+			var parts [4]int64
+
+			for i := 1; i <= 4; i++ {
+				parts[i-1], _ = strconv.ParseInt(matches[i], 8, 0)
+			}
+			u.Host = fmt.Sprintf("%d.%d.%d.%d%s", parts[0], parts[1], parts[2], parts[3], matches[5])
+		}
+	}
+}
+
+func decodeHexHost(u *url.URL) {
+	if len(u.Host) > 0 {
+		if matches := rxHexHost.FindStringSubmatch(u.Host); len(matches) > 2 {
+			// Conversion is safe because of regex validation
+			parsed, _ := strconv.ParseInt(matches[1], 16, 0)
+			// Set host as DWORD (base 10) encoded host
+			u.Host = fmt.Sprintf("%d%s", parsed, matches[2])
+			// The rest is the same as decoding a DWORD host
+			decodeDWORDHost(u)
+		}
+	}
+}
+
+func removeUnncessaryHostDots(u *url.URL) {
+	if len(u.Host) > 0 {
+		if matches := rxHostDots.FindStringSubmatch(u.Host); len(matches) > 1 {
+			// Trim the leading and trailing dots
+			u.Host = strings.Trim(matches[1], ".")
+			if len(matches) > 2 {
+				u.Host += matches[2]
+			}
+		}
+	}
+}
+
+func removeEmptyPortSeparator(u *url.URL) {
+	if len(u.Host) > 0 {
+		u.Host = rxEmptyPort.ReplaceAllString(u.Host, "")
+	}
+}

From 49c0a79ad80cd54a3bf349fb3ce02c92ff2a362c Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 21 Nov 2016 09:37:31 +0100
Subject: [PATCH 0891/1304] glide: add github.com/PuerkitoBio/urlesc

---
 glide.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/glide.yaml b/glide.yaml
index 7e55d05377..c08f62eab8 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -278,3 +278,5 @@ import:
   version: cfb55aafdaf3ec08f0db22699ab822c50091b1c4
 - package: github.com/PuerkitoBio/purell
   version: v1.1.0
+- package: github.com/PuerkitoBio/urlesc
+  version: 5bd2802263f21d8788851d5305584c82a5c75d7e

From 02f77eb813819f551cef636fb8d8261155bc52d2 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 21 Nov 2016 09:46:39 +0100
Subject: [PATCH 0892/1304] glide: vendor dependencies
 github.com/PuerkitoBio/urlesc

---
 glide.lock                                    |   13 +-
 vendor/github.com/PuerkitoBio/urlesc/LICENSE  |   27 +
 .../github.com/PuerkitoBio/urlesc/urlesc.go   |  180 +
 vendor/golang.org/x/net/idna/idna.go          |   68 +
 vendor/golang.org/x/net/idna/punycode.go      |  200 +
 vendor/golang.org/x/text/LICENSE              |   27 +
 vendor/golang.org/x/text/PATENTS              |   22 +
 vendor/golang.org/x/text/doc.go               |   13 +
 vendor/golang.org/x/text/gen.go               |  177 +
 .../golang.org/x/text/transform/transform.go  |  661 ++
 .../x/text/unicode/norm/composition.go        |  514 ++
 .../x/text/unicode/norm/forminfo.go           |  256 +
 .../golang.org/x/text/unicode/norm/input.go   |  105 +
 vendor/golang.org/x/text/unicode/norm/iter.go |  450 +
 .../x/text/unicode/norm/maketables.go         |  978 +++
 .../x/text/unicode/norm/normalize.go          |  576 ++
 .../x/text/unicode/norm/readwriter.go         |  126 +
 .../golang.org/x/text/unicode/norm/tables.go  | 7627 +++++++++++++++++
 .../x/text/unicode/norm/transform.go          |   88 +
 vendor/golang.org/x/text/unicode/norm/trie.go |   54 +
 .../golang.org/x/text/unicode/norm/triegen.go |  117 +
 vendor/golang.org/x/text/width/gen.go         |  115 +
 vendor/golang.org/x/text/width/gen_common.go  |   96 +
 vendor/golang.org/x/text/width/gen_trieval.go |   34 +
 vendor/golang.org/x/text/width/kind_string.go |   16 +
 vendor/golang.org/x/text/width/tables.go      | 1284 +++
 vendor/golang.org/x/text/width/transform.go   |  162 +
 vendor/golang.org/x/text/width/trieval.go     |   30 +
 vendor/golang.org/x/text/width/width.go       |  201 +
 29 files changed, 14215 insertions(+), 2 deletions(-)
 create mode 100644 vendor/github.com/PuerkitoBio/urlesc/LICENSE
 create mode 100644 vendor/github.com/PuerkitoBio/urlesc/urlesc.go
 create mode 100644 vendor/golang.org/x/net/idna/idna.go
 create mode 100644 vendor/golang.org/x/net/idna/punycode.go
 create mode 100644 vendor/golang.org/x/text/LICENSE
 create mode 100644 vendor/golang.org/x/text/PATENTS
 create mode 100644 vendor/golang.org/x/text/doc.go
 create mode 100644 vendor/golang.org/x/text/gen.go
 create mode 100644 vendor/golang.org/x/text/transform/transform.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/composition.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/forminfo.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/input.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/iter.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/maketables.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/normalize.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/readwriter.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/tables.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/transform.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/trie.go
 create mode 100644 vendor/golang.org/x/text/unicode/norm/triegen.go
 create mode 100644 vendor/golang.org/x/text/width/gen.go
 create mode 100644 vendor/golang.org/x/text/width/gen_common.go
 create mode 100644 vendor/golang.org/x/text/width/gen_trieval.go
 create mode 100644 vendor/golang.org/x/text/width/kind_string.go
 create mode 100644 vendor/golang.org/x/text/width/tables.go
 create mode 100644 vendor/golang.org/x/text/width/transform.go
 create mode 100644 vendor/golang.org/x/text/width/trieval.go
 create mode 100644 vendor/golang.org/x/text/width/width.go

diff --git a/glide.lock b/glide.lock
index f8fc35a058..026a553b3d 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 4ee26cc723790bfe9e984b7e646dbc5175432a16ef280402df1d507e014cc648
-updated: 2016-11-21T08:59:45.827536562+01:00
+hash: a35f3c5403e592b061fc61292c9d690d5a4779d014fcd632315e4560b7a9c3e7
+updated: 2016-11-21T09:45:33.766283869+01:00
 imports:
 - name: github.com/appc/docker2aci
   version: 64543c1e0a7306b17d0d214549ec08049b234abc
@@ -209,6 +209,8 @@ imports:
   version: 937c5a91d7fb1477fa6d2bb71410b2ae7a0f2143
 - name: github.com/PuerkitoBio/purell
   version: 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4
+- name: github.com/PuerkitoBio/urlesc
+  version: 5bd2802263f21d8788851d5305584c82a5c75d7e
 - name: github.com/russross/blackfriday
   version: 300106c228d52c8941d4b3de6054a6062a86dda3
 - name: github.com/shirou/gopsutil
@@ -264,6 +266,7 @@ imports:
   - html/atom
   - http2
   - http2/hpack
+  - idna
   - internal/timeseries
   - lex/httplex
   - trace
@@ -271,6 +274,12 @@ imports:
   version: b44883b474ffefa37335017174e397412b633a4f
   subpackages:
   - unix
+- name: golang.org/x/text
+  version: 2910a502d2bf9e43193af9d68ca516529614eed3
+  subpackages:
+  - transform
+  - unicode/norm
+  - width
 - name: golang.org/x/tools
   version: 27e692e6ec36d8f48be794f32553e1400c70dbf2
   subpackages:
diff --git a/vendor/github.com/PuerkitoBio/urlesc/LICENSE b/vendor/github.com/PuerkitoBio/urlesc/LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/vendor/github.com/PuerkitoBio/urlesc/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/PuerkitoBio/urlesc/urlesc.go b/vendor/github.com/PuerkitoBio/urlesc/urlesc.go
new file mode 100644
index 0000000000..1b84624594
--- /dev/null
+++ b/vendor/github.com/PuerkitoBio/urlesc/urlesc.go
@@ -0,0 +1,180 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package urlesc implements query escaping as per RFC 3986.
+// It contains some parts of the net/url package, modified so as to allow
+// some reserved characters incorrectly escaped by net/url.
+// See https://github.com/golang/go/issues/5684
+package urlesc
+
+import (
+	"bytes"
+	"net/url"
+	"strings"
+)
+
+type encoding int
+
+const (
+	encodePath encoding = 1 + iota
+	encodeUserPassword
+	encodeQueryComponent
+	encodeFragment
+)
+
+// Return true if the specified character should be escaped when
+// appearing in a URL string, according to RFC 3986.
+func shouldEscape(c byte, mode encoding) bool {
+	// §2.3 Unreserved characters (alphanum)
+	if 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9' {
+		return false
+	}
+
+	switch c {
+	case '-', '.', '_', '~': // §2.3 Unreserved characters (mark)
+		return false
+
+	// §2.2 Reserved characters (reserved)
+	case ':', '/', '?', '#', '[', ']', '@', // gen-delims
+		'!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=': // sub-delims
+		// Different sections of the URL allow a few of
+		// the reserved characters to appear unescaped.
+		switch mode {
+		case encodePath: // §3.3
+			// The RFC allows sub-delims and : @.
+			// '/', '[' and ']' can be used to assign meaning to individual path
+			// segments.  This package only manipulates the path as a whole,
+			// so we allow those as well.  That leaves only ? and # to escape.
+			return c == '?' || c == '#'
+
+		case encodeUserPassword: // §3.2.1
+			// The RFC allows : and sub-delims in
+			// userinfo.  The parsing of userinfo treats ':' as special so we must escape
+			// all the gen-delims.
+			return c == ':' || c == '/' || c == '?' || c == '#' || c == '[' || c == ']' || c == '@'
+
+		case encodeQueryComponent: // §3.4
+			// The RFC allows / and ?.
+			return c != '/' && c != '?'
+
+		case encodeFragment: // §4.1
+			// The RFC text is silent but the grammar allows
+			// everything, so escape nothing but #
+			return c == '#'
+		}
+	}
+
+	// Everything else must be escaped.
+	return true
+}
+
+// QueryEscape escapes the string so it can be safely placed
+// inside a URL query.
+func QueryEscape(s string) string {
+	return escape(s, encodeQueryComponent)
+}
+
+func escape(s string, mode encoding) string {
+	spaceCount, hexCount := 0, 0
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		if shouldEscape(c, mode) {
+			if c == ' ' && mode == encodeQueryComponent {
+				spaceCount++
+			} else {
+				hexCount++
+			}
+		}
+	}
+
+	if spaceCount == 0 && hexCount == 0 {
+		return s
+	}
+
+	t := make([]byte, len(s)+2*hexCount)
+	j := 0
+	for i := 0; i < len(s); i++ {
+		switch c := s[i]; {
+		case c == ' ' && mode == encodeQueryComponent:
+			t[j] = '+'
+			j++
+		case shouldEscape(c, mode):
+			t[j] = '%'
+			t[j+1] = "0123456789ABCDEF"[c>>4]
+			t[j+2] = "0123456789ABCDEF"[c&15]
+			j += 3
+		default:
+			t[j] = s[i]
+			j++
+		}
+	}
+	return string(t)
+}
+
+var uiReplacer = strings.NewReplacer(
+	"%21", "!",
+	"%27", "'",
+	"%28", "(",
+	"%29", ")",
+	"%2A", "*",
+)
+
+// unescapeUserinfo unescapes some characters that need not to be escaped as per RFC3986.
+func unescapeUserinfo(s string) string {
+	return uiReplacer.Replace(s)
+}
+
+// Escape reassembles the URL into a valid URL string.
+// The general form of the result is one of:
+//
+//	scheme:opaque
+//	scheme://userinfo@host/path?query#fragment
+//
+// If u.Opaque is non-empty, String uses the first form;
+// otherwise it uses the second form.
+//
+// In the second form, the following rules apply:
+//	- if u.Scheme is empty, scheme: is omitted.
+//	- if u.User is nil, userinfo@ is omitted.
+//	- if u.Host is empty, host/ is omitted.
+//	- if u.Scheme and u.Host are empty and u.User is nil,
+//	   the entire scheme://userinfo@host/ is omitted.
+//	- if u.Host is non-empty and u.Path begins with a /,
+//	   the form host/path does not add its own /.
+//	- if u.RawQuery is empty, ?query is omitted.
+//	- if u.Fragment is empty, #fragment is omitted.
+func Escape(u *url.URL) string {
+	var buf bytes.Buffer
+	if u.Scheme != "" {
+		buf.WriteString(u.Scheme)
+		buf.WriteByte(':')
+	}
+	if u.Opaque != "" {
+		buf.WriteString(u.Opaque)
+	} else {
+		if u.Scheme != "" || u.Host != "" || u.User != nil {
+			buf.WriteString("//")
+			if ui := u.User; ui != nil {
+				buf.WriteString(unescapeUserinfo(ui.String()))
+				buf.WriteByte('@')
+			}
+			if h := u.Host; h != "" {
+				buf.WriteString(h)
+			}
+		}
+		if u.Path != "" && u.Path[0] != '/' && u.Host != "" {
+			buf.WriteByte('/')
+		}
+		buf.WriteString(escape(u.Path, encodePath))
+	}
+	if u.RawQuery != "" {
+		buf.WriteByte('?')
+		buf.WriteString(u.RawQuery)
+	}
+	if u.Fragment != "" {
+		buf.WriteByte('#')
+		buf.WriteString(escape(u.Fragment, encodeFragment))
+	}
+	return buf.String()
+}
diff --git a/vendor/golang.org/x/net/idna/idna.go b/vendor/golang.org/x/net/idna/idna.go
new file mode 100644
index 0000000000..3daa8979e1
--- /dev/null
+++ b/vendor/golang.org/x/net/idna/idna.go
@@ -0,0 +1,68 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package idna implements IDNA2008 (Internationalized Domain Names for
+// Applications), defined in RFC 5890, RFC 5891, RFC 5892, RFC 5893 and
+// RFC 5894.
+package idna // import "golang.org/x/net/idna"
+
+import (
+	"strings"
+	"unicode/utf8"
+)
+
+// TODO(nigeltao): specify when errors occur. For example, is ToASCII(".") or
+// ToASCII("foo\x00") an error? See also http://www.unicode.org/faq/idn.html#11
+
+// acePrefix is the ASCII Compatible Encoding prefix.
+const acePrefix = "xn--"
+
+// ToASCII converts a domain or domain label to its ASCII form. For example,
+// ToASCII("bücher.example.com") is "xn--bcher-kva.example.com", and
+// ToASCII("golang") is "golang".
+func ToASCII(s string) (string, error) {
+	if ascii(s) {
+		return s, nil
+	}
+	labels := strings.Split(s, ".")
+	for i, label := range labels {
+		if !ascii(label) {
+			a, err := encode(acePrefix, label)
+			if err != nil {
+				return "", err
+			}
+			labels[i] = a
+		}
+	}
+	return strings.Join(labels, "."), nil
+}
+
+// ToUnicode converts a domain or domain label to its Unicode form. For example,
+// ToUnicode("xn--bcher-kva.example.com") is "bücher.example.com", and
+// ToUnicode("golang") is "golang".
+func ToUnicode(s string) (string, error) {
+	if !strings.Contains(s, acePrefix) {
+		return s, nil
+	}
+	labels := strings.Split(s, ".")
+	for i, label := range labels {
+		if strings.HasPrefix(label, acePrefix) {
+			u, err := decode(label[len(acePrefix):])
+			if err != nil {
+				return "", err
+			}
+			labels[i] = u
+		}
+	}
+	return strings.Join(labels, "."), nil
+}
+
+func ascii(s string) bool {
+	for i := 0; i < len(s); i++ {
+		if s[i] >= utf8.RuneSelf {
+			return false
+		}
+	}
+	return true
+}
diff --git a/vendor/golang.org/x/net/idna/punycode.go b/vendor/golang.org/x/net/idna/punycode.go
new file mode 100644
index 0000000000..92e733f6a7
--- /dev/null
+++ b/vendor/golang.org/x/net/idna/punycode.go
@@ -0,0 +1,200 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package idna
+
+// This file implements the Punycode algorithm from RFC 3492.
+
+import (
+	"fmt"
+	"math"
+	"strings"
+	"unicode/utf8"
+)
+
+// These parameter values are specified in section 5.
+//
+// All computation is done with int32s, so that overflow behavior is identical
+// regardless of whether int is 32-bit or 64-bit.
+const (
+	base        int32 = 36
+	damp        int32 = 700
+	initialBias int32 = 72
+	initialN    int32 = 128
+	skew        int32 = 38
+	tmax        int32 = 26
+	tmin        int32 = 1
+)
+
+// decode decodes a string as specified in section 6.2.
+func decode(encoded string) (string, error) {
+	if encoded == "" {
+		return "", nil
+	}
+	pos := 1 + strings.LastIndex(encoded, "-")
+	if pos == 1 {
+		return "", fmt.Errorf("idna: invalid label %q", encoded)
+	}
+	if pos == len(encoded) {
+		return encoded[:len(encoded)-1], nil
+	}
+	output := make([]rune, 0, len(encoded))
+	if pos != 0 {
+		for _, r := range encoded[:pos-1] {
+			output = append(output, r)
+		}
+	}
+	i, n, bias := int32(0), initialN, initialBias
+	for pos < len(encoded) {
+		oldI, w := i, int32(1)
+		for k := base; ; k += base {
+			if pos == len(encoded) {
+				return "", fmt.Errorf("idna: invalid label %q", encoded)
+			}
+			digit, ok := decodeDigit(encoded[pos])
+			if !ok {
+				return "", fmt.Errorf("idna: invalid label %q", encoded)
+			}
+			pos++
+			i += digit * w
+			if i < 0 {
+				return "", fmt.Errorf("idna: invalid label %q", encoded)
+			}
+			t := k - bias
+			if t < tmin {
+				t = tmin
+			} else if t > tmax {
+				t = tmax
+			}
+			if digit < t {
+				break
+			}
+			w *= base - t
+			if w >= math.MaxInt32/base {
+				return "", fmt.Errorf("idna: invalid label %q", encoded)
+			}
+		}
+		x := int32(len(output) + 1)
+		bias = adapt(i-oldI, x, oldI == 0)
+		n += i / x
+		i %= x
+		if n > utf8.MaxRune || len(output) >= 1024 {
+			return "", fmt.Errorf("idna: invalid label %q", encoded)
+		}
+		output = append(output, 0)
+		copy(output[i+1:], output[i:])
+		output[i] = n
+		i++
+	}
+	return string(output), nil
+}
+
+// encode encodes a string as specified in section 6.3 and prepends prefix to
+// the result.
+//
+// The "while h < length(input)" line in the specification becomes "for
+// remaining != 0" in the Go code, because len(s) in Go is in bytes, not runes.
+func encode(prefix, s string) (string, error) {
+	output := make([]byte, len(prefix), len(prefix)+1+2*len(s))
+	copy(output, prefix)
+	delta, n, bias := int32(0), initialN, initialBias
+	b, remaining := int32(0), int32(0)
+	for _, r := range s {
+		if r < 0x80 {
+			b++
+			output = append(output, byte(r))
+		} else {
+			remaining++
+		}
+	}
+	h := b
+	if b > 0 {
+		output = append(output, '-')
+	}
+	for remaining != 0 {
+		m := int32(0x7fffffff)
+		for _, r := range s {
+			if m > r && r >= n {
+				m = r
+			}
+		}
+		delta += (m - n) * (h + 1)
+		if delta < 0 {
+			return "", fmt.Errorf("idna: invalid label %q", s)
+		}
+		n = m
+		for _, r := range s {
+			if r < n {
+				delta++
+				if delta < 0 {
+					return "", fmt.Errorf("idna: invalid label %q", s)
+				}
+				continue
+			}
+			if r > n {
+				continue
+			}
+			q := delta
+			for k := base; ; k += base {
+				t := k - bias
+				if t < tmin {
+					t = tmin
+				} else if t > tmax {
+					t = tmax
+				}
+				if q < t {
+					break
+				}
+				output = append(output, encodeDigit(t+(q-t)%(base-t)))
+				q = (q - t) / (base - t)
+			}
+			output = append(output, encodeDigit(q))
+			bias = adapt(delta, h+1, h == b)
+			delta = 0
+			h++
+			remaining--
+		}
+		delta++
+		n++
+	}
+	return string(output), nil
+}
+
+func decodeDigit(x byte) (digit int32, ok bool) {
+	switch {
+	case '0' <= x && x <= '9':
+		return int32(x - ('0' - 26)), true
+	case 'A' <= x && x <= 'Z':
+		return int32(x - 'A'), true
+	case 'a' <= x && x <= 'z':
+		return int32(x - 'a'), true
+	}
+	return 0, false
+}
+
+func encodeDigit(digit int32) byte {
+	switch {
+	case 0 <= digit && digit < 26:
+		return byte(digit + 'a')
+	case 26 <= digit && digit < 36:
+		return byte(digit + ('0' - 26))
+	}
+	panic("idna: internal error in punycode encoding")
+}
+
+// adapt is the bias adaptation function specified in section 6.1.
+func adapt(delta, numPoints int32, firstTime bool) int32 {
+	if firstTime {
+		delta /= damp
+	} else {
+		delta /= 2
+	}
+	delta += delta / numPoints
+	k := int32(0)
+	for delta > ((base-tmin)*tmax)/2 {
+		delta /= base - tmin
+		k += base
+	}
+	return k + (base-tmin+1)*delta/(delta+skew)
+}
diff --git a/vendor/golang.org/x/text/LICENSE b/vendor/golang.org/x/text/LICENSE
new file mode 100644
index 0000000000..6a66aea5ea
--- /dev/null
+++ b/vendor/golang.org/x/text/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/text/PATENTS b/vendor/golang.org/x/text/PATENTS
new file mode 100644
index 0000000000..733099041f
--- /dev/null
+++ b/vendor/golang.org/x/text/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/text/doc.go b/vendor/golang.org/x/text/doc.go
new file mode 100644
index 0000000000..a48e2843fc
--- /dev/null
+++ b/vendor/golang.org/x/text/doc.go
@@ -0,0 +1,13 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:generate go run gen.go
+
+// text is a repository of text-related packages related to internationalization
+// (i18n) and localization (l10n), such as character encodings, text
+// transformations, and locale-specific text handling.
+package text
+
+// TODO: more documentation on general concepts, such as Transformers, use
+// of normalization, etc.
diff --git a/vendor/golang.org/x/text/gen.go b/vendor/golang.org/x/text/gen.go
new file mode 100644
index 0000000000..4ed42b814e
--- /dev/null
+++ b/vendor/golang.org/x/text/gen.go
@@ -0,0 +1,177 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+// gen runs go generate on Unicode- and CLDR-related package in the text
+// repositories, taking into account dependencies and versions.
+package main
+
+import (
+	"bytes"
+	"flag"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"sync"
+	"unicode"
+
+	"golang.org/x/text/internal/gen"
+)
+
+var (
+	verbose     = flag.Bool("v", false, "verbose output")
+	force       = flag.Bool("force", false, "ignore failing dependencies")
+	excludeList = flag.String("exclude", "",
+		"comma-separated list of packages to exclude")
+
+	// The user can specify a selection of packages to build on the command line.
+	args []string
+)
+
+func exclude(pkg string) bool {
+	if len(args) > 0 {
+		return !contains(args, pkg)
+	}
+	return contains(strings.Split(*excludeList, ","), pkg)
+}
+
+// TODO:
+// - Better version handling.
+// - Generate tables for the core unicode package?
+// - Add generation for encodings. This requires some retooling here and there.
+// - Running repo-wide "long" tests.
+
+var vprintf = fmt.Printf
+
+func main() {
+	gen.Init()
+	args = flag.Args()
+	if !*verbose {
+		// Set vprintf to a no-op.
+		vprintf = func(string, ...interface{}) (int, error) { return 0, nil }
+	}
+
+	// TODO: create temporary cache directory to load files and create and set
+	// a "cache" option if the user did not specify the UNICODE_DIR environment
+	// variable. This will prevent duplicate downloads and also will enable long
+	// tests, which really need to be run after each generated package.
+
+	if gen.UnicodeVersion() != unicode.Version {
+		fmt.Printf("Requested Unicode version %s; core unicode version is %s.\n",
+			gen.UnicodeVersion(),
+			unicode.Version)
+		// TODO: use collate to compare. Simple comparison will work, though,
+		// until Unicode reaches version 10. To avoid circular dependencies, we
+		// could use the NumericWeighter without using package collate using a
+		// trivial Weighter implementation.
+		if gen.UnicodeVersion() < unicode.Version && !*force {
+			os.Exit(2)
+		}
+	}
+	var (
+		cldr       = generate("unicode/cldr")
+		language   = generate("language", cldr)
+		internal   = generate("internal", language)
+		norm       = generate("unicode/norm")
+		rangetable = generate("unicode/rangetable")
+		cases      = generate("cases", norm, language, rangetable)
+		width      = generate("width")
+		bidi       = generate("unicode/bidi", norm, rangetable)
+		_          = generate("secure/precis", norm, rangetable, cases, width, bidi)
+		_          = generate("encoding/htmlindex", language)
+		_          = generate("currency", cldr, language, internal)
+		_          = generate("internal/number", cldr, language, internal)
+		_          = generate("language/display", cldr, language)
+		_          = generate("collate", norm, cldr, language, rangetable)
+		_          = generate("search", norm, cldr, language, rangetable)
+	)
+	all.Wait()
+
+	if hasErrors {
+		fmt.Println("FAIL")
+		os.Exit(1)
+	}
+	vprintf("SUCCESS\n")
+}
+
+var (
+	all       sync.WaitGroup
+	hasErrors bool
+)
+
+type dependency struct {
+	sync.WaitGroup
+	hasErrors bool
+}
+
+func generate(pkg string, deps ...*dependency) *dependency {
+	var wg dependency
+	if exclude(pkg) {
+		return &wg
+	}
+	wg.Add(1)
+	all.Add(1)
+	go func() {
+		defer wg.Done()
+		defer all.Done()
+		// Wait for dependencies to finish.
+		for _, d := range deps {
+			d.Wait()
+			if d.hasErrors && !*force {
+				fmt.Printf("--- ABORT: %s\n", pkg)
+				wg.hasErrors = true
+				return
+			}
+		}
+		vprintf("=== GENERATE %s\n", pkg)
+		args := []string{"generate"}
+		if *verbose {
+			args = append(args, "-v")
+		}
+		args = append(args, "./"+pkg)
+		cmd := exec.Command(filepath.Join(runtime.GOROOT(), "bin", "go"), args...)
+		w := &bytes.Buffer{}
+		cmd.Stderr = w
+		cmd.Stdout = w
+		if err := cmd.Run(); err != nil {
+			fmt.Printf("--- FAIL: %s:\n\t%v\n\tError: %v\n", pkg, indent(w), err)
+			hasErrors = true
+			wg.hasErrors = true
+			return
+		}
+
+		vprintf("=== TEST %s\n", pkg)
+		args[0] = "test"
+		cmd = exec.Command(filepath.Join(runtime.GOROOT(), "bin", "go"), args...)
+		wt := &bytes.Buffer{}
+		cmd.Stderr = wt
+		cmd.Stdout = wt
+		if err := cmd.Run(); err != nil {
+			fmt.Printf("--- FAIL: %s:\n\t%v\n\tError: %v\n", pkg, indent(wt), err)
+			hasErrors = true
+			wg.hasErrors = true
+			return
+		}
+		vprintf("--- SUCCESS: %s\n\t%v\n", pkg, indent(w))
+		fmt.Print(wt.String())
+	}()
+	return &wg
+}
+
+func contains(a []string, s string) bool {
+	for _, e := range a {
+		if s == e {
+			return true
+		}
+	}
+	return false
+}
+
+func indent(b *bytes.Buffer) string {
+	return strings.Replace(strings.TrimSpace(b.String()), "\n", "\n\t", -1)
+}
diff --git a/vendor/golang.org/x/text/transform/transform.go b/vendor/golang.org/x/text/transform/transform.go
new file mode 100644
index 0000000000..0c2f730ea0
--- /dev/null
+++ b/vendor/golang.org/x/text/transform/transform.go
@@ -0,0 +1,661 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package transform provides reader and writer wrappers that transform the
+// bytes passing through as well as various transformations. Example
+// transformations provided by other packages include normalization and
+// conversion between character sets.
+package transform // import "golang.org/x/text/transform"
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"unicode/utf8"
+)
+
+var (
+	// ErrShortDst means that the destination buffer was too short to
+	// receive all of the transformed bytes.
+	ErrShortDst = errors.New("transform: short destination buffer")
+
+	// ErrShortSrc means that the source buffer has insufficient data to
+	// complete the transformation.
+	ErrShortSrc = errors.New("transform: short source buffer")
+
+	// errInconsistentByteCount means that Transform returned success (nil
+	// error) but also returned nSrc inconsistent with the src argument.
+	errInconsistentByteCount = errors.New("transform: inconsistent byte count returned")
+
+	// errShortInternal means that an internal buffer is not large enough
+	// to make progress and the Transform operation must be aborted.
+	errShortInternal = errors.New("transform: short internal buffer")
+)
+
+// Transformer transforms bytes.
+type Transformer interface {
+	// Transform writes to dst the transformed bytes read from src, and
+	// returns the number of dst bytes written and src bytes read. The
+	// atEOF argument tells whether src represents the last bytes of the
+	// input.
+	//
+	// Callers should always process the nDst bytes produced and account
+	// for the nSrc bytes consumed before considering the error err.
+	//
+	// A nil error means that all of the transformed bytes (whether freshly
+	// transformed from src or left over from previous Transform calls)
+	// were written to dst. A nil error can be returned regardless of
+	// whether atEOF is true. If err is nil then nSrc must equal len(src);
+	// the converse is not necessarily true.
+	//
+	// ErrShortDst means that dst was too short to receive all of the
+	// transformed bytes. ErrShortSrc means that src had insufficient data
+	// to complete the transformation. If both conditions apply, then
+	// either error may be returned. Other than the error conditions listed
+	// here, implementations are free to report other errors that arise.
+	Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error)
+
+	// Reset resets the state and allows a Transformer to be reused.
+	Reset()
+}
+
+// NopResetter can be embedded by implementations of Transformer to add a nop
+// Reset method.
+type NopResetter struct{}
+
+// Reset implements the Reset method of the Transformer interface.
+func (NopResetter) Reset() {}
+
+// Reader wraps another io.Reader by transforming the bytes read.
+type Reader struct {
+	r   io.Reader
+	t   Transformer
+	err error
+
+	// dst[dst0:dst1] contains bytes that have been transformed by t but
+	// not yet copied out via Read.
+	dst        []byte
+	dst0, dst1 int
+
+	// src[src0:src1] contains bytes that have been read from r but not
+	// yet transformed through t.
+	src        []byte
+	src0, src1 int
+
+	// transformComplete is whether the transformation is complete,
+	// regardless of whether or not it was successful.
+	transformComplete bool
+}
+
+const defaultBufSize = 4096
+
+// NewReader returns a new Reader that wraps r by transforming the bytes read
+// via t. It calls Reset on t.
+func NewReader(r io.Reader, t Transformer) *Reader {
+	t.Reset()
+	return &Reader{
+		r:   r,
+		t:   t,
+		dst: make([]byte, defaultBufSize),
+		src: make([]byte, defaultBufSize),
+	}
+}
+
+// Read implements the io.Reader interface.
+func (r *Reader) Read(p []byte) (int, error) {
+	n, err := 0, error(nil)
+	for {
+		// Copy out any transformed bytes and return the final error if we are done.
+		if r.dst0 != r.dst1 {
+			n = copy(p, r.dst[r.dst0:r.dst1])
+			r.dst0 += n
+			if r.dst0 == r.dst1 && r.transformComplete {
+				return n, r.err
+			}
+			return n, nil
+		} else if r.transformComplete {
+			return 0, r.err
+		}
+
+		// Try to transform some source bytes, or to flush the transformer if we
+		// are out of source bytes. We do this even if r.r.Read returned an error.
+		// As the io.Reader documentation says, "process the n > 0 bytes returned
+		// before considering the error".
+		if r.src0 != r.src1 || r.err != nil {
+			r.dst0 = 0
+			r.dst1, n, err = r.t.Transform(r.dst, r.src[r.src0:r.src1], r.err == io.EOF)
+			r.src0 += n
+
+			switch {
+			case err == nil:
+				if r.src0 != r.src1 {
+					r.err = errInconsistentByteCount
+				}
+				// The Transform call was successful; we are complete if we
+				// cannot read more bytes into src.
+				r.transformComplete = r.err != nil
+				continue
+			case err == ErrShortDst && (r.dst1 != 0 || n != 0):
+				// Make room in dst by copying out, and try again.
+				continue
+			case err == ErrShortSrc && r.src1-r.src0 != len(r.src) && r.err == nil:
+				// Read more bytes into src via the code below, and try again.
+			default:
+				r.transformComplete = true
+				// The reader error (r.err) takes precedence over the
+				// transformer error (err) unless r.err is nil or io.EOF.
+				if r.err == nil || r.err == io.EOF {
+					r.err = err
+				}
+				continue
+			}
+		}
+
+		// Move any untransformed source bytes to the start of the buffer
+		// and read more bytes.
+		if r.src0 != 0 {
+			r.src0, r.src1 = 0, copy(r.src, r.src[r.src0:r.src1])
+		}
+		n, r.err = r.r.Read(r.src[r.src1:])
+		r.src1 += n
+	}
+}
+
+// TODO: implement ReadByte (and ReadRune??).
+
+// Writer wraps another io.Writer by transforming the bytes read.
+// The user needs to call Close to flush unwritten bytes that may
+// be buffered.
+type Writer struct {
+	w   io.Writer
+	t   Transformer
+	dst []byte
+
+	// src[:n] contains bytes that have not yet passed through t.
+	src []byte
+	n   int
+}
+
+// NewWriter returns a new Writer that wraps w by transforming the bytes written
+// via t. It calls Reset on t.
+func NewWriter(w io.Writer, t Transformer) *Writer {
+	t.Reset()
+	return &Writer{
+		w:   w,
+		t:   t,
+		dst: make([]byte, defaultBufSize),
+		src: make([]byte, defaultBufSize),
+	}
+}
+
+// Write implements the io.Writer interface. If there are not enough
+// bytes available to complete a Transform, the bytes will be buffered
+// for the next write. Call Close to convert the remaining bytes.
+func (w *Writer) Write(data []byte) (n int, err error) {
+	src := data
+	if w.n > 0 {
+		// Append bytes from data to the last remainder.
+		// TODO: limit the amount copied on first try.
+		n = copy(w.src[w.n:], data)
+		w.n += n
+		src = w.src[:w.n]
+	}
+	for {
+		nDst, nSrc, err := w.t.Transform(w.dst, src, false)
+		if _, werr := w.w.Write(w.dst[:nDst]); werr != nil {
+			return n, werr
+		}
+		src = src[nSrc:]
+		if w.n == 0 {
+			n += nSrc
+		} else if len(src) <= n {
+			// Enough bytes from w.src have been consumed. We make src point
+			// to data instead to reduce the copying.
+			w.n = 0
+			n -= len(src)
+			src = data[n:]
+			if n < len(data) && (err == nil || err == ErrShortSrc) {
+				continue
+			}
+		}
+		switch err {
+		case ErrShortDst:
+			// This error is okay as long as we are making progress.
+			if nDst > 0 || nSrc > 0 {
+				continue
+			}
+		case ErrShortSrc:
+			if len(src) < len(w.src) {
+				m := copy(w.src, src)
+				// If w.n > 0, bytes from data were already copied to w.src and n
+				// was already set to the number of bytes consumed.
+				if w.n == 0 {
+					n += m
+				}
+				w.n = m
+				err = nil
+			} else if nDst > 0 || nSrc > 0 {
+				// Not enough buffer to store the remainder. Keep processing as
+				// long as there is progress. Without this case, transforms that
+				// require a lookahead larger than the buffer may result in an
+				// error. This is not something one may expect to be common in
+				// practice, but it may occur when buffers are set to small
+				// sizes during testing.
+				continue
+			}
+		case nil:
+			if w.n > 0 {
+				err = errInconsistentByteCount
+			}
+		}
+		return n, err
+	}
+}
+
+// Close implements the io.Closer interface.
+func (w *Writer) Close() error {
+	src := w.src[:w.n]
+	for {
+		nDst, nSrc, err := w.t.Transform(w.dst, src, true)
+		if _, werr := w.w.Write(w.dst[:nDst]); werr != nil {
+			return werr
+		}
+		if err != ErrShortDst {
+			return err
+		}
+		src = src[nSrc:]
+	}
+}
+
+type nop struct{ NopResetter }
+
+func (nop) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	n := copy(dst, src)
+	if n < len(src) {
+		err = ErrShortDst
+	}
+	return n, n, err
+}
+
+type discard struct{ NopResetter }
+
+func (discard) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	return 0, len(src), nil
+}
+
+var (
+	// Discard is a Transformer for which all Transform calls succeed
+	// by consuming all bytes and writing nothing.
+	Discard Transformer = discard{}
+
+	// Nop is a Transformer that copies src to dst.
+	Nop Transformer = nop{}
+)
+
+// chain is a sequence of links. A chain with N Transformers has N+1 links and
+// N+1 buffers. Of those N+1 buffers, the first and last are the src and dst
+// buffers given to chain.Transform and the middle N-1 buffers are intermediate
+// buffers owned by the chain. The i'th link transforms bytes from the i'th
+// buffer chain.link[i].b at read offset chain.link[i].p to the i+1'th buffer
+// chain.link[i+1].b at write offset chain.link[i+1].n, for i in [0, N).
+type chain struct {
+	link []link
+	err  error
+	// errStart is the index at which the error occurred plus 1. Processing
+	// errStart at this level at the next call to Transform. As long as
+	// errStart > 0, chain will not consume any more source bytes.
+	errStart int
+}
+
+func (c *chain) fatalError(errIndex int, err error) {
+	if i := errIndex + 1; i > c.errStart {
+		c.errStart = i
+		c.err = err
+	}
+}
+
+type link struct {
+	t Transformer
+	// b[p:n] holds the bytes to be transformed by t.
+	b []byte
+	p int
+	n int
+}
+
+func (l *link) src() []byte {
+	return l.b[l.p:l.n]
+}
+
+func (l *link) dst() []byte {
+	return l.b[l.n:]
+}
+
+// Chain returns a Transformer that applies t in sequence.
+func Chain(t ...Transformer) Transformer {
+	if len(t) == 0 {
+		return nop{}
+	}
+	c := &chain{link: make([]link, len(t)+1)}
+	for i, tt := range t {
+		c.link[i].t = tt
+	}
+	// Allocate intermediate buffers.
+	b := make([][defaultBufSize]byte, len(t)-1)
+	for i := range b {
+		c.link[i+1].b = b[i][:]
+	}
+	return c
+}
+
+// Reset resets the state of Chain. It calls Reset on all the Transformers.
+func (c *chain) Reset() {
+	for i, l := range c.link {
+		if l.t != nil {
+			l.t.Reset()
+		}
+		c.link[i].p, c.link[i].n = 0, 0
+	}
+}
+
+// Transform applies the transformers of c in sequence.
+func (c *chain) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	// Set up src and dst in the chain.
+	srcL := &c.link[0]
+	dstL := &c.link[len(c.link)-1]
+	srcL.b, srcL.p, srcL.n = src, 0, len(src)
+	dstL.b, dstL.n = dst, 0
+	var lastFull, needProgress bool // for detecting progress
+
+	// i is the index of the next Transformer to apply, for i in [low, high].
+	// low is the lowest index for which c.link[low] may still produce bytes.
+	// high is the highest index for which c.link[high] has a Transformer.
+	// The error returned by Transform determines whether to increase or
+	// decrease i. We try to completely fill a buffer before converting it.
+	for low, i, high := c.errStart, c.errStart, len(c.link)-2; low <= i && i <= high; {
+		in, out := &c.link[i], &c.link[i+1]
+		nDst, nSrc, err0 := in.t.Transform(out.dst(), in.src(), atEOF && low == i)
+		out.n += nDst
+		in.p += nSrc
+		if i > 0 && in.p == in.n {
+			in.p, in.n = 0, 0
+		}
+		needProgress, lastFull = lastFull, false
+		switch err0 {
+		case ErrShortDst:
+			// Process the destination buffer next. Return if we are already
+			// at the high index.
+			if i == high {
+				return dstL.n, srcL.p, ErrShortDst
+			}
+			if out.n != 0 {
+				i++
+				// If the Transformer at the next index is not able to process any
+				// source bytes there is nothing that can be done to make progress
+				// and the bytes will remain unprocessed. lastFull is used to
+				// detect this and break out of the loop with a fatal error.
+				lastFull = true
+				continue
+			}
+			// The destination buffer was too small, but is completely empty.
+			// Return a fatal error as this transformation can never complete.
+			c.fatalError(i, errShortInternal)
+		case ErrShortSrc:
+			if i == 0 {
+				// Save ErrShortSrc in err. All other errors take precedence.
+				err = ErrShortSrc
+				break
+			}
+			// Source bytes were depleted before filling up the destination buffer.
+			// Verify we made some progress, move the remaining bytes to the errStart
+			// and try to get more source bytes.
+			if needProgress && nSrc == 0 || in.n-in.p == len(in.b) {
+				// There were not enough source bytes to proceed while the source
+				// buffer cannot hold any more bytes. Return a fatal error as this
+				// transformation can never complete.
+				c.fatalError(i, errShortInternal)
+				break
+			}
+			// in.b is an internal buffer and we can make progress.
+			in.p, in.n = 0, copy(in.b, in.src())
+			fallthrough
+		case nil:
+			// if i == low, we have depleted the bytes at index i or any lower levels.
+			// In that case we increase low and i. In all other cases we decrease i to
+			// fetch more bytes before proceeding to the next index.
+			if i > low {
+				i--
+				continue
+			}
+		default:
+			c.fatalError(i, err0)
+		}
+		// Exhausted level low or fatal error: increase low and continue
+		// to process the bytes accepted so far.
+		i++
+		low = i
+	}
+
+	// If c.errStart > 0, this means we found a fatal error.  We will clear
+	// all upstream buffers. At this point, no more progress can be made
+	// downstream, as Transform would have bailed while handling ErrShortDst.
+	if c.errStart > 0 {
+		for i := 1; i < c.errStart; i++ {
+			c.link[i].p, c.link[i].n = 0, 0
+		}
+		err, c.errStart, c.err = c.err, 0, nil
+	}
+	return dstL.n, srcL.p, err
+}
+
+// RemoveFunc returns a Transformer that removes from the input all runes r for
+// which f(r) is true. Illegal bytes in the input are replaced by RuneError.
+func RemoveFunc(f func(r rune) bool) Transformer {
+	return removeF(f)
+}
+
+type removeF func(r rune) bool
+
+func (removeF) Reset() {}
+
+// Transform implements the Transformer interface.
+func (t removeF) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	for r, sz := rune(0), 0; len(src) > 0; src = src[sz:] {
+
+		if r = rune(src[0]); r < utf8.RuneSelf {
+			sz = 1
+		} else {
+			r, sz = utf8.DecodeRune(src)
+
+			if sz == 1 {
+				// Invalid rune.
+				if !atEOF && !utf8.FullRune(src) {
+					err = ErrShortSrc
+					break
+				}
+				// We replace illegal bytes with RuneError. Not doing so might
+				// otherwise turn a sequence of invalid UTF-8 into valid UTF-8.
+				// The resulting byte sequence may subsequently contain runes
+				// for which t(r) is true that were passed unnoticed.
+				if !t(r) {
+					if nDst+3 > len(dst) {
+						err = ErrShortDst
+						break
+					}
+					nDst += copy(dst[nDst:], "\uFFFD")
+				}
+				nSrc++
+				continue
+			}
+		}
+
+		if !t(r) {
+			if nDst+sz > len(dst) {
+				err = ErrShortDst
+				break
+			}
+			nDst += copy(dst[nDst:], src[:sz])
+		}
+		nSrc += sz
+	}
+	return
+}
+
+// grow returns a new []byte that is longer than b, and copies the first n bytes
+// of b to the start of the new slice.
+func grow(b []byte, n int) []byte {
+	m := len(b)
+	if m <= 32 {
+		m = 64
+	} else if m <= 256 {
+		m *= 2
+	} else {
+		m += m >> 1
+	}
+	buf := make([]byte, m)
+	copy(buf, b[:n])
+	return buf
+}
+
+const initialBufSize = 128
+
+// String returns a string with the result of converting s[:n] using t, where
+// n <= len(s). If err == nil, n will be len(s). It calls Reset on t.
+func String(t Transformer, s string) (result string, n int, err error) {
+	t.Reset()
+	if s == "" {
+		// Fast path for the common case for empty input. Results in about a
+		// 86% reduction of running time for BenchmarkStringLowerEmpty.
+		if _, _, err := t.Transform(nil, nil, true); err == nil {
+			return "", 0, nil
+		}
+	}
+
+	// Allocate only once. Note that both dst and src escape when passed to
+	// Transform.
+	buf := [2 * initialBufSize]byte{}
+	dst := buf[:initialBufSize:initialBufSize]
+	src := buf[initialBufSize : 2*initialBufSize]
+
+	// The input string s is transformed in multiple chunks (starting with a
+	// chunk size of initialBufSize). nDst and nSrc are per-chunk (or
+	// per-Transform-call) indexes, pDst and pSrc are overall indexes.
+	nDst, nSrc := 0, 0
+	pDst, pSrc := 0, 0
+
+	// pPrefix is the length of a common prefix: the first pPrefix bytes of the
+	// result will equal the first pPrefix bytes of s. It is not guaranteed to
+	// be the largest such value, but if pPrefix, len(result) and len(s) are
+	// all equal after the final transform (i.e. calling Transform with atEOF
+	// being true returned nil error) then we don't need to allocate a new
+	// result string.
+	pPrefix := 0
+	for {
+		// Invariant: pDst == pPrefix && pSrc == pPrefix.
+
+		n := copy(src, s[pSrc:])
+		nDst, nSrc, err = t.Transform(dst, src[:n], pSrc+n == len(s))
+		pDst += nDst
+		pSrc += nSrc
+
+		// TODO:  let transformers implement an optional Spanner interface, akin
+		// to norm's QuickSpan. This would even allow us to avoid any allocation.
+		if !bytes.Equal(dst[:nDst], src[:nSrc]) {
+			break
+		}
+		pPrefix = pSrc
+		if err == ErrShortDst {
+			// A buffer can only be short if a transformer modifies its input.
+			break
+		} else if err == ErrShortSrc {
+			if nSrc == 0 {
+				// No progress was made.
+				break
+			}
+			// Equal so far and !atEOF, so continue checking.
+		} else if err != nil || pPrefix == len(s) {
+			return string(s[:pPrefix]), pPrefix, err
+		}
+	}
+	// Post-condition: pDst == pPrefix + nDst && pSrc == pPrefix + nSrc.
+
+	// We have transformed the first pSrc bytes of the input s to become pDst
+	// transformed bytes. Those transformed bytes are discontiguous: the first
+	// pPrefix of them equal s[:pPrefix] and the last nDst of them equal
+	// dst[:nDst]. We copy them around, into a new dst buffer if necessary, so
+	// that they become one contiguous slice: dst[:pDst].
+	if pPrefix != 0 {
+		newDst := dst
+		if pDst > len(newDst) {
+			newDst = make([]byte, len(s)+nDst-nSrc)
+		}
+		copy(newDst[pPrefix:pDst], dst[:nDst])
+		copy(newDst[:pPrefix], s[:pPrefix])
+		dst = newDst
+	}
+
+	// Prevent duplicate Transform calls with atEOF being true at the end of
+	// the input. Also return if we have an unrecoverable error.
+	if (err == nil && pSrc == len(s)) ||
+		(err != nil && err != ErrShortDst && err != ErrShortSrc) {
+		return string(dst[:pDst]), pSrc, err
+	}
+
+	// Transform the remaining input, growing dst and src buffers as necessary.
+	for {
+		n := copy(src, s[pSrc:])
+		nDst, nSrc, err := t.Transform(dst[pDst:], src[:n], pSrc+n == len(s))
+		pDst += nDst
+		pSrc += nSrc
+
+		// If we got ErrShortDst or ErrShortSrc, do not grow as long as we can
+		// make progress. This may avoid excessive allocations.
+		if err == ErrShortDst {
+			if nDst == 0 {
+				dst = grow(dst, pDst)
+			}
+		} else if err == ErrShortSrc {
+			if nSrc == 0 {
+				src = grow(src, 0)
+			}
+		} else if err != nil || pSrc == len(s) {
+			return string(dst[:pDst]), pSrc, err
+		}
+	}
+}
+
+// Bytes returns a new byte slice with the result of converting b[:n] using t,
+// where n <= len(b). If err == nil, n will be len(b). It calls Reset on t.
+func Bytes(t Transformer, b []byte) (result []byte, n int, err error) {
+	return doAppend(t, 0, make([]byte, len(b)), b)
+}
+
+// Append appends the result of converting src[:n] using t to dst, where
+// n <= len(src), If err == nil, n will be len(src). It calls Reset on t.
+func Append(t Transformer, dst, src []byte) (result []byte, n int, err error) {
+	if len(dst) == cap(dst) {
+		n := len(src) + len(dst) // It is okay for this to be 0.
+		b := make([]byte, n)
+		dst = b[:copy(b, dst)]
+	}
+	return doAppend(t, len(dst), dst[:cap(dst)], src)
+}
+
+func doAppend(t Transformer, pDst int, dst, src []byte) (result []byte, n int, err error) {
+	t.Reset()
+	pSrc := 0
+	for {
+		nDst, nSrc, err := t.Transform(dst[pDst:], src[pSrc:], true)
+		pDst += nDst
+		pSrc += nSrc
+		if err != ErrShortDst {
+			return dst[:pDst], pSrc, err
+		}
+
+		// Grow the destination buffer, but do not grow as long as we can make
+		// progress. This may avoid excessive allocations.
+		if nDst == 0 {
+			dst = grow(dst, pDst)
+		}
+	}
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/composition.go b/vendor/golang.org/x/text/unicode/norm/composition.go
new file mode 100644
index 0000000000..d17b278adc
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/composition.go
@@ -0,0 +1,514 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package norm
+
+import "unicode/utf8"
+
+const (
+	maxNonStarters = 30
+	// The maximum number of characters needed for a buffer is
+	// maxNonStarters + 1 for the starter + 1 for the GCJ
+	maxBufferSize    = maxNonStarters + 2
+	maxNFCExpansion  = 3  // NFC(0x1D160)
+	maxNFKCExpansion = 18 // NFKC(0xFDFA)
+
+	maxByteBufferSize = utf8.UTFMax * maxBufferSize // 128
+)
+
+// ssState is used for reporting the segment state after inserting a rune.
+// It is returned by streamSafe.next.
+type ssState int
+
+const (
+	// Indicates a rune was successfully added to the segment.
+	ssSuccess ssState = iota
+	// Indicates a rune starts a new segment and should not be added.
+	ssStarter
+	// Indicates a rune caused a segment overflow and a CGJ should be inserted.
+	ssOverflow
+)
+
+// streamSafe implements the policy of when a CGJ should be inserted.
+type streamSafe uint8
+
+// mkStreamSafe is a shorthand for declaring a streamSafe var and calling
+// first on it.
+func mkStreamSafe(p Properties) streamSafe {
+	return streamSafe(p.nTrailingNonStarters())
+}
+
+// first inserts the first rune of a segment.
+func (ss *streamSafe) first(p Properties) {
+	if *ss != 0 {
+		panic("!= 0")
+	}
+	*ss = streamSafe(p.nTrailingNonStarters())
+}
+
+// insert returns a ssState value to indicate whether a rune represented by p
+// can be inserted.
+func (ss *streamSafe) next(p Properties) ssState {
+	if *ss > maxNonStarters {
+		panic("streamSafe was not reset")
+	}
+	n := p.nLeadingNonStarters()
+	if *ss += streamSafe(n); *ss > maxNonStarters {
+		*ss = 0
+		return ssOverflow
+	}
+	// The Stream-Safe Text Processing prescribes that the counting can stop
+	// as soon as a starter is encountered. However, there are some starters,
+	// like Jamo V and T, that can combine with other runes, leaving their
+	// successive non-starters appended to the previous, possibly causing an
+	// overflow. We will therefore consider any rune with a non-zero nLead to
+	// be a non-starter. Note that it always hold that if nLead > 0 then
+	// nLead == nTrail.
+	if n == 0 {
+		*ss = 0
+		return ssStarter
+	}
+	return ssSuccess
+}
+
+// backwards is used for checking for overflow and segment starts
+// when traversing a string backwards. Users do not need to call first
+// for the first rune. The state of the streamSafe retains the count of
+// the non-starters loaded.
+func (ss *streamSafe) backwards(p Properties) ssState {
+	if *ss > maxNonStarters {
+		panic("streamSafe was not reset")
+	}
+	c := *ss + streamSafe(p.nTrailingNonStarters())
+	if c > maxNonStarters {
+		return ssOverflow
+	}
+	*ss = c
+	if p.nLeadingNonStarters() == 0 {
+		return ssStarter
+	}
+	return ssSuccess
+}
+
+func (ss streamSafe) isMax() bool {
+	return ss == maxNonStarters
+}
+
+// GraphemeJoiner is inserted after maxNonStarters non-starter runes.
+const GraphemeJoiner = "\u034F"
+
+// reorderBuffer is used to normalize a single segment.  Characters inserted with
+// insert are decomposed and reordered based on CCC. The compose method can
+// be used to recombine characters.  Note that the byte buffer does not hold
+// the UTF-8 characters in order.  Only the rune array is maintained in sorted
+// order. flush writes the resulting segment to a byte array.
+type reorderBuffer struct {
+	rune  [maxBufferSize]Properties // Per character info.
+	byte  [maxByteBufferSize]byte   // UTF-8 buffer. Referenced by runeInfo.pos.
+	nbyte uint8                     // Number or bytes.
+	ss    streamSafe                // For limiting length of non-starter sequence.
+	nrune int                       // Number of runeInfos.
+	f     formInfo
+
+	src      input
+	nsrc     int
+	tmpBytes input
+
+	out    []byte
+	flushF func(*reorderBuffer) bool
+}
+
+func (rb *reorderBuffer) init(f Form, src []byte) {
+	rb.f = *formTable[f]
+	rb.src.setBytes(src)
+	rb.nsrc = len(src)
+	rb.ss = 0
+}
+
+func (rb *reorderBuffer) initString(f Form, src string) {
+	rb.f = *formTable[f]
+	rb.src.setString(src)
+	rb.nsrc = len(src)
+	rb.ss = 0
+}
+
+func (rb *reorderBuffer) setFlusher(out []byte, f func(*reorderBuffer) bool) {
+	rb.out = out
+	rb.flushF = f
+}
+
+// reset discards all characters from the buffer.
+func (rb *reorderBuffer) reset() {
+	rb.nrune = 0
+	rb.nbyte = 0
+	rb.ss = 0
+}
+
+func (rb *reorderBuffer) doFlush() bool {
+	if rb.f.composing {
+		rb.compose()
+	}
+	res := rb.flushF(rb)
+	rb.reset()
+	return res
+}
+
+// appendFlush appends the normalized segment to rb.out.
+func appendFlush(rb *reorderBuffer) bool {
+	for i := 0; i < rb.nrune; i++ {
+		start := rb.rune[i].pos
+		end := start + rb.rune[i].size
+		rb.out = append(rb.out, rb.byte[start:end]...)
+	}
+	return true
+}
+
+// flush appends the normalized segment to out and resets rb.
+func (rb *reorderBuffer) flush(out []byte) []byte {
+	for i := 0; i < rb.nrune; i++ {
+		start := rb.rune[i].pos
+		end := start + rb.rune[i].size
+		out = append(out, rb.byte[start:end]...)
+	}
+	rb.reset()
+	return out
+}
+
+// flushCopy copies the normalized segment to buf and resets rb.
+// It returns the number of bytes written to buf.
+func (rb *reorderBuffer) flushCopy(buf []byte) int {
+	p := 0
+	for i := 0; i < rb.nrune; i++ {
+		runep := rb.rune[i]
+		p += copy(buf[p:], rb.byte[runep.pos:runep.pos+runep.size])
+	}
+	rb.reset()
+	return p
+}
+
+// insertOrdered inserts a rune in the buffer, ordered by Canonical Combining Class.
+// It returns false if the buffer is not large enough to hold the rune.
+// It is used internally by insert and insertString only.
+func (rb *reorderBuffer) insertOrdered(info Properties) {
+	n := rb.nrune
+	b := rb.rune[:]
+	cc := info.ccc
+	if cc > 0 {
+		// Find insertion position + move elements to make room.
+		for ; n > 0; n-- {
+			if b[n-1].ccc <= cc {
+				break
+			}
+			b[n] = b[n-1]
+		}
+	}
+	rb.nrune += 1
+	pos := uint8(rb.nbyte)
+	rb.nbyte += utf8.UTFMax
+	info.pos = pos
+	b[n] = info
+}
+
+// insertErr is an error code returned by insert. Using this type instead
+// of error improves performance up to 20% for many of the benchmarks.
+type insertErr int
+
+const (
+	iSuccess insertErr = -iota
+	iShortDst
+	iShortSrc
+)
+
+// insertFlush inserts the given rune in the buffer ordered by CCC.
+// If a decomposition with multiple segments are encountered, they leading
+// ones are flushed.
+// It returns a non-zero error code if the rune was not inserted.
+func (rb *reorderBuffer) insertFlush(src input, i int, info Properties) insertErr {
+	if rune := src.hangul(i); rune != 0 {
+		rb.decomposeHangul(rune)
+		return iSuccess
+	}
+	if info.hasDecomposition() {
+		return rb.insertDecomposed(info.Decomposition())
+	}
+	rb.insertSingle(src, i, info)
+	return iSuccess
+}
+
+// insertUnsafe inserts the given rune in the buffer ordered by CCC.
+// It is assumed there is sufficient space to hold the runes. It is the
+// responsibility of the caller to ensure this. This can be done by checking
+// the state returned by the streamSafe type.
+func (rb *reorderBuffer) insertUnsafe(src input, i int, info Properties) {
+	if rune := src.hangul(i); rune != 0 {
+		rb.decomposeHangul(rune)
+	}
+	if info.hasDecomposition() {
+		// TODO: inline.
+		rb.insertDecomposed(info.Decomposition())
+	} else {
+		rb.insertSingle(src, i, info)
+	}
+}
+
+// insertDecomposed inserts an entry in to the reorderBuffer for each rune
+// in dcomp. dcomp must be a sequence of decomposed UTF-8-encoded runes.
+// It flushes the buffer on each new segment start.
+func (rb *reorderBuffer) insertDecomposed(dcomp []byte) insertErr {
+	rb.tmpBytes.setBytes(dcomp)
+	for i := 0; i < len(dcomp); {
+		info := rb.f.info(rb.tmpBytes, i)
+		if info.BoundaryBefore() && rb.nrune > 0 && !rb.doFlush() {
+			return iShortDst
+		}
+		i += copy(rb.byte[rb.nbyte:], dcomp[i:i+int(info.size)])
+		rb.insertOrdered(info)
+	}
+	return iSuccess
+}
+
+// insertSingle inserts an entry in the reorderBuffer for the rune at
+// position i. info is the runeInfo for the rune at position i.
+func (rb *reorderBuffer) insertSingle(src input, i int, info Properties) {
+	src.copySlice(rb.byte[rb.nbyte:], i, i+int(info.size))
+	rb.insertOrdered(info)
+}
+
+// insertCGJ inserts a Combining Grapheme Joiner (0x034f) into rb.
+func (rb *reorderBuffer) insertCGJ() {
+	rb.insertSingle(input{str: GraphemeJoiner}, 0, Properties{size: uint8(len(GraphemeJoiner))})
+}
+
+// appendRune inserts a rune at the end of the buffer. It is used for Hangul.
+func (rb *reorderBuffer) appendRune(r rune) {
+	bn := rb.nbyte
+	sz := utf8.EncodeRune(rb.byte[bn:], rune(r))
+	rb.nbyte += utf8.UTFMax
+	rb.rune[rb.nrune] = Properties{pos: bn, size: uint8(sz)}
+	rb.nrune++
+}
+
+// assignRune sets a rune at position pos. It is used for Hangul and recomposition.
+func (rb *reorderBuffer) assignRune(pos int, r rune) {
+	bn := rb.rune[pos].pos
+	sz := utf8.EncodeRune(rb.byte[bn:], rune(r))
+	rb.rune[pos] = Properties{pos: bn, size: uint8(sz)}
+}
+
+// runeAt returns the rune at position n. It is used for Hangul and recomposition.
+func (rb *reorderBuffer) runeAt(n int) rune {
+	inf := rb.rune[n]
+	r, _ := utf8.DecodeRune(rb.byte[inf.pos : inf.pos+inf.size])
+	return r
+}
+
+// bytesAt returns the UTF-8 encoding of the rune at position n.
+// It is used for Hangul and recomposition.
+func (rb *reorderBuffer) bytesAt(n int) []byte {
+	inf := rb.rune[n]
+	return rb.byte[inf.pos : int(inf.pos)+int(inf.size)]
+}
+
+// For Hangul we combine algorithmically, instead of using tables.
+const (
+	hangulBase  = 0xAC00 // UTF-8(hangulBase) -> EA B0 80
+	hangulBase0 = 0xEA
+	hangulBase1 = 0xB0
+	hangulBase2 = 0x80
+
+	hangulEnd  = hangulBase + jamoLVTCount // UTF-8(0xD7A4) -> ED 9E A4
+	hangulEnd0 = 0xED
+	hangulEnd1 = 0x9E
+	hangulEnd2 = 0xA4
+
+	jamoLBase  = 0x1100 // UTF-8(jamoLBase) -> E1 84 00
+	jamoLBase0 = 0xE1
+	jamoLBase1 = 0x84
+	jamoLEnd   = 0x1113
+	jamoVBase  = 0x1161
+	jamoVEnd   = 0x1176
+	jamoTBase  = 0x11A7
+	jamoTEnd   = 0x11C3
+
+	jamoTCount   = 28
+	jamoVCount   = 21
+	jamoVTCount  = 21 * 28
+	jamoLVTCount = 19 * 21 * 28
+)
+
+const hangulUTF8Size = 3
+
+func isHangul(b []byte) bool {
+	if len(b) < hangulUTF8Size {
+		return false
+	}
+	b0 := b[0]
+	if b0 < hangulBase0 {
+		return false
+	}
+	b1 := b[1]
+	switch {
+	case b0 == hangulBase0:
+		return b1 >= hangulBase1
+	case b0 < hangulEnd0:
+		return true
+	case b0 > hangulEnd0:
+		return false
+	case b1 < hangulEnd1:
+		return true
+	}
+	return b1 == hangulEnd1 && b[2] < hangulEnd2
+}
+
+func isHangulString(b string) bool {
+	if len(b) < hangulUTF8Size {
+		return false
+	}
+	b0 := b[0]
+	if b0 < hangulBase0 {
+		return false
+	}
+	b1 := b[1]
+	switch {
+	case b0 == hangulBase0:
+		return b1 >= hangulBase1
+	case b0 < hangulEnd0:
+		return true
+	case b0 > hangulEnd0:
+		return false
+	case b1 < hangulEnd1:
+		return true
+	}
+	return b1 == hangulEnd1 && b[2] < hangulEnd2
+}
+
+// Caller must ensure len(b) >= 2.
+func isJamoVT(b []byte) bool {
+	// True if (rune & 0xff00) == jamoLBase
+	return b[0] == jamoLBase0 && (b[1]&0xFC) == jamoLBase1
+}
+
+func isHangulWithoutJamoT(b []byte) bool {
+	c, _ := utf8.DecodeRune(b)
+	c -= hangulBase
+	return c < jamoLVTCount && c%jamoTCount == 0
+}
+
+// decomposeHangul writes the decomposed Hangul to buf and returns the number
+// of bytes written.  len(buf) should be at least 9.
+func decomposeHangul(buf []byte, r rune) int {
+	const JamoUTF8Len = 3
+	r -= hangulBase
+	x := r % jamoTCount
+	r /= jamoTCount
+	utf8.EncodeRune(buf, jamoLBase+r/jamoVCount)
+	utf8.EncodeRune(buf[JamoUTF8Len:], jamoVBase+r%jamoVCount)
+	if x != 0 {
+		utf8.EncodeRune(buf[2*JamoUTF8Len:], jamoTBase+x)
+		return 3 * JamoUTF8Len
+	}
+	return 2 * JamoUTF8Len
+}
+
+// decomposeHangul algorithmically decomposes a Hangul rune into
+// its Jamo components.
+// See http://unicode.org/reports/tr15/#Hangul for details on decomposing Hangul.
+func (rb *reorderBuffer) decomposeHangul(r rune) {
+	r -= hangulBase
+	x := r % jamoTCount
+	r /= jamoTCount
+	rb.appendRune(jamoLBase + r/jamoVCount)
+	rb.appendRune(jamoVBase + r%jamoVCount)
+	if x != 0 {
+		rb.appendRune(jamoTBase + x)
+	}
+}
+
+// combineHangul algorithmically combines Jamo character components into Hangul.
+// See http://unicode.org/reports/tr15/#Hangul for details on combining Hangul.
+func (rb *reorderBuffer) combineHangul(s, i, k int) {
+	b := rb.rune[:]
+	bn := rb.nrune
+	for ; i < bn; i++ {
+		cccB := b[k-1].ccc
+		cccC := b[i].ccc
+		if cccB == 0 {
+			s = k - 1
+		}
+		if s != k-1 && cccB >= cccC {
+			// b[i] is blocked by greater-equal cccX below it
+			b[k] = b[i]
+			k++
+		} else {
+			l := rb.runeAt(s) // also used to compare to hangulBase
+			v := rb.runeAt(i) // also used to compare to jamoT
+			switch {
+			case jamoLBase <= l && l < jamoLEnd &&
+				jamoVBase <= v && v < jamoVEnd:
+				// 11xx plus 116x to LV
+				rb.assignRune(s, hangulBase+
+					(l-jamoLBase)*jamoVTCount+(v-jamoVBase)*jamoTCount)
+			case hangulBase <= l && l < hangulEnd &&
+				jamoTBase < v && v < jamoTEnd &&
+				((l-hangulBase)%jamoTCount) == 0:
+				// ACxx plus 11Ax to LVT
+				rb.assignRune(s, l+v-jamoTBase)
+			default:
+				b[k] = b[i]
+				k++
+			}
+		}
+	}
+	rb.nrune = k
+}
+
+// compose recombines the runes in the buffer.
+// It should only be used to recompose a single segment, as it will not
+// handle alternations between Hangul and non-Hangul characters correctly.
+func (rb *reorderBuffer) compose() {
+	// UAX #15, section X5 , including Corrigendum #5
+	// "In any character sequence beginning with starter S, a character C is
+	//  blocked from S if and only if there is some character B between S
+	//  and C, and either B is a starter or it has the same or higher
+	//  combining class as C."
+	bn := rb.nrune
+	if bn == 0 {
+		return
+	}
+	k := 1
+	b := rb.rune[:]
+	for s, i := 0, 1; i < bn; i++ {
+		if isJamoVT(rb.bytesAt(i)) {
+			// Redo from start in Hangul mode. Necessary to support
+			// U+320E..U+321E in NFKC mode.
+			rb.combineHangul(s, i, k)
+			return
+		}
+		ii := b[i]
+		// We can only use combineForward as a filter if we later
+		// get the info for the combined character. This is more
+		// expensive than using the filter. Using combinesBackward()
+		// is safe.
+		if ii.combinesBackward() {
+			cccB := b[k-1].ccc
+			cccC := ii.ccc
+			blocked := false // b[i] blocked by starter or greater or equal CCC?
+			if cccB == 0 {
+				s = k - 1
+			} else {
+				blocked = s != k-1 && cccB >= cccC
+			}
+			if !blocked {
+				combined := combine(rb.runeAt(s), rb.runeAt(i))
+				if combined != 0 {
+					rb.assignRune(s, combined)
+					continue
+				}
+			}
+		}
+		b[k] = b[i]
+		k++
+	}
+	rb.nrune = k
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/forminfo.go b/vendor/golang.org/x/text/unicode/norm/forminfo.go
new file mode 100644
index 0000000000..15a67c653a
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/forminfo.go
@@ -0,0 +1,256 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package norm
+
+// This file contains Form-specific logic and wrappers for data in tables.go.
+
+// Rune info is stored in a separate trie per composing form. A composing form
+// and its corresponding decomposing form share the same trie.  Each trie maps
+// a rune to a uint16. The values take two forms.  For v >= 0x8000:
+//   bits
+//   15:    1 (inverse of NFD_QD bit of qcInfo)
+//   13..7: qcInfo (see below). isYesD is always true (no decompostion).
+//    6..0: ccc (compressed CCC value).
+// For v < 0x8000, the respective rune has a decomposition and v is an index
+// into a byte array of UTF-8 decomposition sequences and additional info and
+// has the form:
+//    <header> <decomp_byte>* [<tccc> [<lccc>]]
+// The header contains the number of bytes in the decomposition (excluding this
+// length byte). The two most significant bits of this length byte correspond
+// to bit 5 and 4 of qcInfo (see below).  The byte sequence itself starts at v+1.
+// The byte sequence is followed by a trailing and leading CCC if the values
+// for these are not zero.  The value of v determines which ccc are appended
+// to the sequences.  For v < firstCCC, there are none, for v >= firstCCC,
+// the sequence is followed by a trailing ccc, and for v >= firstLeadingCC
+// there is an additional leading ccc. The value of tccc itself is the
+// trailing CCC shifted left 2 bits. The two least-significant bits of tccc
+// are the number of trailing non-starters.
+
+const (
+	qcInfoMask      = 0x3F // to clear all but the relevant bits in a qcInfo
+	headerLenMask   = 0x3F // extract the length value from the header byte
+	headerFlagsMask = 0xC0 // extract the qcInfo bits from the header byte
+)
+
+// Properties provides access to normalization properties of a rune.
+type Properties struct {
+	pos   uint8  // start position in reorderBuffer; used in composition.go
+	size  uint8  // length of UTF-8 encoding of this rune
+	ccc   uint8  // leading canonical combining class (ccc if not decomposition)
+	tccc  uint8  // trailing canonical combining class (ccc if not decomposition)
+	nLead uint8  // number of leading non-starters.
+	flags qcInfo // quick check flags
+	index uint16
+}
+
+// functions dispatchable per form
+type lookupFunc func(b input, i int) Properties
+
+// formInfo holds Form-specific functions and tables.
+type formInfo struct {
+	form                     Form
+	composing, compatibility bool // form type
+	info                     lookupFunc
+	nextMain                 iterFunc
+}
+
+var formTable []*formInfo
+
+func init() {
+	formTable = make([]*formInfo, 4)
+
+	for i := range formTable {
+		f := &formInfo{}
+		formTable[i] = f
+		f.form = Form(i)
+		if Form(i) == NFKD || Form(i) == NFKC {
+			f.compatibility = true
+			f.info = lookupInfoNFKC
+		} else {
+			f.info = lookupInfoNFC
+		}
+		f.nextMain = nextDecomposed
+		if Form(i) == NFC || Form(i) == NFKC {
+			f.nextMain = nextComposed
+			f.composing = true
+		}
+	}
+}
+
+// We do not distinguish between boundaries for NFC, NFD, etc. to avoid
+// unexpected behavior for the user.  For example, in NFD, there is a boundary
+// after 'a'.  However, 'a' might combine with modifiers, so from the application's
+// perspective it is not a good boundary. We will therefore always use the
+// boundaries for the combining variants.
+
+// BoundaryBefore returns true if this rune starts a new segment and
+// cannot combine with any rune on the left.
+func (p Properties) BoundaryBefore() bool {
+	if p.ccc == 0 && !p.combinesBackward() {
+		return true
+	}
+	// We assume that the CCC of the first character in a decomposition
+	// is always non-zero if different from info.ccc and that we can return
+	// false at this point. This is verified by maketables.
+	return false
+}
+
+// BoundaryAfter returns true if runes cannot combine with or otherwise
+// interact with this or previous runes.
+func (p Properties) BoundaryAfter() bool {
+	// TODO: loosen these conditions.
+	return p.isInert()
+}
+
+// We pack quick check data in 4 bits:
+//   5:    Combines forward  (0 == false, 1 == true)
+//   4..3: NFC_QC Yes(00), No (10), or Maybe (11)
+//   2:    NFD_QC Yes (0) or No (1). No also means there is a decomposition.
+//   1..0: Number of trailing non-starters.
+//
+// When all 4 bits are zero, the character is inert, meaning it is never
+// influenced by normalization.
+type qcInfo uint8
+
+func (p Properties) isYesC() bool { return p.flags&0x10 == 0 }
+func (p Properties) isYesD() bool { return p.flags&0x4 == 0 }
+
+func (p Properties) combinesForward() bool  { return p.flags&0x20 != 0 }
+func (p Properties) combinesBackward() bool { return p.flags&0x8 != 0 } // == isMaybe
+func (p Properties) hasDecomposition() bool { return p.flags&0x4 != 0 } // == isNoD
+
+func (p Properties) isInert() bool {
+	return p.flags&qcInfoMask == 0 && p.ccc == 0
+}
+
+func (p Properties) multiSegment() bool {
+	return p.index >= firstMulti && p.index < endMulti
+}
+
+func (p Properties) nLeadingNonStarters() uint8 {
+	return p.nLead
+}
+
+func (p Properties) nTrailingNonStarters() uint8 {
+	return uint8(p.flags & 0x03)
+}
+
+// Decomposition returns the decomposition for the underlying rune
+// or nil if there is none.
+func (p Properties) Decomposition() []byte {
+	// TODO: create the decomposition for Hangul?
+	if p.index == 0 {
+		return nil
+	}
+	i := p.index
+	n := decomps[i] & headerLenMask
+	i++
+	return decomps[i : i+uint16(n)]
+}
+
+// Size returns the length of UTF-8 encoding of the rune.
+func (p Properties) Size() int {
+	return int(p.size)
+}
+
+// CCC returns the canonical combining class of the underlying rune.
+func (p Properties) CCC() uint8 {
+	if p.index >= firstCCCZeroExcept {
+		return 0
+	}
+	return ccc[p.ccc]
+}
+
+// LeadCCC returns the CCC of the first rune in the decomposition.
+// If there is no decomposition, LeadCCC equals CCC.
+func (p Properties) LeadCCC() uint8 {
+	return ccc[p.ccc]
+}
+
+// TrailCCC returns the CCC of the last rune in the decomposition.
+// If there is no decomposition, TrailCCC equals CCC.
+func (p Properties) TrailCCC() uint8 {
+	return ccc[p.tccc]
+}
+
+// Recomposition
+// We use 32-bit keys instead of 64-bit for the two codepoint keys.
+// This clips off the bits of three entries, but we know this will not
+// result in a collision. In the unlikely event that changes to
+// UnicodeData.txt introduce collisions, the compiler will catch it.
+// Note that the recomposition map for NFC and NFKC are identical.
+
+// combine returns the combined rune or 0 if it doesn't exist.
+func combine(a, b rune) rune {
+	key := uint32(uint16(a))<<16 + uint32(uint16(b))
+	return recompMap[key]
+}
+
+func lookupInfoNFC(b input, i int) Properties {
+	v, sz := b.charinfoNFC(i)
+	return compInfo(v, sz)
+}
+
+func lookupInfoNFKC(b input, i int) Properties {
+	v, sz := b.charinfoNFKC(i)
+	return compInfo(v, sz)
+}
+
+// Properties returns properties for the first rune in s.
+func (f Form) Properties(s []byte) Properties {
+	if f == NFC || f == NFD {
+		return compInfo(nfcData.lookup(s))
+	}
+	return compInfo(nfkcData.lookup(s))
+}
+
+// PropertiesString returns properties for the first rune in s.
+func (f Form) PropertiesString(s string) Properties {
+	if f == NFC || f == NFD {
+		return compInfo(nfcData.lookupString(s))
+	}
+	return compInfo(nfkcData.lookupString(s))
+}
+
+// compInfo converts the information contained in v and sz
+// to a Properties.  See the comment at the top of the file
+// for more information on the format.
+func compInfo(v uint16, sz int) Properties {
+	if v == 0 {
+		return Properties{size: uint8(sz)}
+	} else if v >= 0x8000 {
+		p := Properties{
+			size:  uint8(sz),
+			ccc:   uint8(v),
+			tccc:  uint8(v),
+			flags: qcInfo(v >> 8),
+		}
+		if p.ccc > 0 || p.combinesBackward() {
+			p.nLead = uint8(p.flags & 0x3)
+		}
+		return p
+	}
+	// has decomposition
+	h := decomps[v]
+	f := (qcInfo(h&headerFlagsMask) >> 2) | 0x4
+	p := Properties{size: uint8(sz), flags: f, index: v}
+	if v >= firstCCC {
+		v += uint16(h&headerLenMask) + 1
+		c := decomps[v]
+		p.tccc = c >> 2
+		p.flags |= qcInfo(c & 0x3)
+		if v >= firstLeadingCCC {
+			p.nLead = c & 0x3
+			if v >= firstStarterWithNLead {
+				// We were tricked. Remove the decomposition.
+				p.flags &= 0x03
+				p.index = 0
+				return p
+			}
+			p.ccc = decomps[v+1]
+		}
+	}
+	return p
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/input.go b/vendor/golang.org/x/text/unicode/norm/input.go
new file mode 100644
index 0000000000..045d4ccce2
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/input.go
@@ -0,0 +1,105 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package norm
+
+import "unicode/utf8"
+
+type input struct {
+	str   string
+	bytes []byte
+}
+
+func inputBytes(str []byte) input {
+	return input{bytes: str}
+}
+
+func inputString(str string) input {
+	return input{str: str}
+}
+
+func (in *input) setBytes(str []byte) {
+	in.str = ""
+	in.bytes = str
+}
+
+func (in *input) setString(str string) {
+	in.str = str
+	in.bytes = nil
+}
+
+func (in *input) _byte(p int) byte {
+	if in.bytes == nil {
+		return in.str[p]
+	}
+	return in.bytes[p]
+}
+
+func (in *input) skipASCII(p, max int) int {
+	if in.bytes == nil {
+		for ; p < max && in.str[p] < utf8.RuneSelf; p++ {
+		}
+	} else {
+		for ; p < max && in.bytes[p] < utf8.RuneSelf; p++ {
+		}
+	}
+	return p
+}
+
+func (in *input) skipContinuationBytes(p int) int {
+	if in.bytes == nil {
+		for ; p < len(in.str) && !utf8.RuneStart(in.str[p]); p++ {
+		}
+	} else {
+		for ; p < len(in.bytes) && !utf8.RuneStart(in.bytes[p]); p++ {
+		}
+	}
+	return p
+}
+
+func (in *input) appendSlice(buf []byte, b, e int) []byte {
+	if in.bytes != nil {
+		return append(buf, in.bytes[b:e]...)
+	}
+	for i := b; i < e; i++ {
+		buf = append(buf, in.str[i])
+	}
+	return buf
+}
+
+func (in *input) copySlice(buf []byte, b, e int) int {
+	if in.bytes == nil {
+		return copy(buf, in.str[b:e])
+	}
+	return copy(buf, in.bytes[b:e])
+}
+
+func (in *input) charinfoNFC(p int) (uint16, int) {
+	if in.bytes == nil {
+		return nfcData.lookupString(in.str[p:])
+	}
+	return nfcData.lookup(in.bytes[p:])
+}
+
+func (in *input) charinfoNFKC(p int) (uint16, int) {
+	if in.bytes == nil {
+		return nfkcData.lookupString(in.str[p:])
+	}
+	return nfkcData.lookup(in.bytes[p:])
+}
+
+func (in *input) hangul(p int) (r rune) {
+	if in.bytes == nil {
+		if !isHangulString(in.str[p:]) {
+			return 0
+		}
+		r, _ = utf8.DecodeRuneInString(in.str[p:])
+	} else {
+		if !isHangul(in.bytes[p:]) {
+			return 0
+		}
+		r, _ = utf8.DecodeRune(in.bytes[p:])
+	}
+	return r
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/iter.go b/vendor/golang.org/x/text/unicode/norm/iter.go
new file mode 100644
index 0000000000..0a42a72de8
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/iter.go
@@ -0,0 +1,450 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package norm
+
+import (
+	"fmt"
+	"unicode/utf8"
+)
+
+// MaxSegmentSize is the maximum size of a byte buffer needed to consider any
+// sequence of starter and non-starter runes for the purpose of normalization.
+const MaxSegmentSize = maxByteBufferSize
+
+// An Iter iterates over a string or byte slice, while normalizing it
+// to a given Form.
+type Iter struct {
+	rb     reorderBuffer
+	buf    [maxByteBufferSize]byte
+	info   Properties // first character saved from previous iteration
+	next   iterFunc   // implementation of next depends on form
+	asciiF iterFunc
+
+	p        int    // current position in input source
+	multiSeg []byte // remainder of multi-segment decomposition
+}
+
+type iterFunc func(*Iter) []byte
+
+// Init initializes i to iterate over src after normalizing it to Form f.
+func (i *Iter) Init(f Form, src []byte) {
+	i.p = 0
+	if len(src) == 0 {
+		i.setDone()
+		i.rb.nsrc = 0
+		return
+	}
+	i.multiSeg = nil
+	i.rb.init(f, src)
+	i.next = i.rb.f.nextMain
+	i.asciiF = nextASCIIBytes
+	i.info = i.rb.f.info(i.rb.src, i.p)
+}
+
+// InitString initializes i to iterate over src after normalizing it to Form f.
+func (i *Iter) InitString(f Form, src string) {
+	i.p = 0
+	if len(src) == 0 {
+		i.setDone()
+		i.rb.nsrc = 0
+		return
+	}
+	i.multiSeg = nil
+	i.rb.initString(f, src)
+	i.next = i.rb.f.nextMain
+	i.asciiF = nextASCIIString
+	i.info = i.rb.f.info(i.rb.src, i.p)
+}
+
+// Seek sets the segment to be returned by the next call to Next to start
+// at position p.  It is the responsibility of the caller to set p to the
+// start of a UTF8 rune.
+func (i *Iter) Seek(offset int64, whence int) (int64, error) {
+	var abs int64
+	switch whence {
+	case 0:
+		abs = offset
+	case 1:
+		abs = int64(i.p) + offset
+	case 2:
+		abs = int64(i.rb.nsrc) + offset
+	default:
+		return 0, fmt.Errorf("norm: invalid whence")
+	}
+	if abs < 0 {
+		return 0, fmt.Errorf("norm: negative position")
+	}
+	if int(abs) >= i.rb.nsrc {
+		i.setDone()
+		return int64(i.p), nil
+	}
+	i.p = int(abs)
+	i.multiSeg = nil
+	i.next = i.rb.f.nextMain
+	i.info = i.rb.f.info(i.rb.src, i.p)
+	return abs, nil
+}
+
+// returnSlice returns a slice of the underlying input type as a byte slice.
+// If the underlying is of type []byte, it will simply return a slice.
+// If the underlying is of type string, it will copy the slice to the buffer
+// and return that.
+func (i *Iter) returnSlice(a, b int) []byte {
+	if i.rb.src.bytes == nil {
+		return i.buf[:copy(i.buf[:], i.rb.src.str[a:b])]
+	}
+	return i.rb.src.bytes[a:b]
+}
+
+// Pos returns the byte position at which the next call to Next will commence processing.
+func (i *Iter) Pos() int {
+	return i.p
+}
+
+func (i *Iter) setDone() {
+	i.next = nextDone
+	i.p = i.rb.nsrc
+}
+
+// Done returns true if there is no more input to process.
+func (i *Iter) Done() bool {
+	return i.p >= i.rb.nsrc
+}
+
+// Next returns f(i.input[i.Pos():n]), where n is a boundary of i.input.
+// For any input a and b for which f(a) == f(b), subsequent calls
+// to Next will return the same segments.
+// Modifying runes are grouped together with the preceding starter, if such a starter exists.
+// Although not guaranteed, n will typically be the smallest possible n.
+func (i *Iter) Next() []byte {
+	return i.next(i)
+}
+
+func nextASCIIBytes(i *Iter) []byte {
+	p := i.p + 1
+	if p >= i.rb.nsrc {
+		i.setDone()
+		return i.rb.src.bytes[i.p:p]
+	}
+	if i.rb.src.bytes[p] < utf8.RuneSelf {
+		p0 := i.p
+		i.p = p
+		return i.rb.src.bytes[p0:p]
+	}
+	i.info = i.rb.f.info(i.rb.src, i.p)
+	i.next = i.rb.f.nextMain
+	return i.next(i)
+}
+
+func nextASCIIString(i *Iter) []byte {
+	p := i.p + 1
+	if p >= i.rb.nsrc {
+		i.buf[0] = i.rb.src.str[i.p]
+		i.setDone()
+		return i.buf[:1]
+	}
+	if i.rb.src.str[p] < utf8.RuneSelf {
+		i.buf[0] = i.rb.src.str[i.p]
+		i.p = p
+		return i.buf[:1]
+	}
+	i.info = i.rb.f.info(i.rb.src, i.p)
+	i.next = i.rb.f.nextMain
+	return i.next(i)
+}
+
+func nextHangul(i *Iter) []byte {
+	p := i.p
+	next := p + hangulUTF8Size
+	if next >= i.rb.nsrc {
+		i.setDone()
+	} else if i.rb.src.hangul(next) == 0 {
+		i.info = i.rb.f.info(i.rb.src, i.p)
+		i.next = i.rb.f.nextMain
+		return i.next(i)
+	}
+	i.p = next
+	return i.buf[:decomposeHangul(i.buf[:], i.rb.src.hangul(p))]
+}
+
+func nextDone(i *Iter) []byte {
+	return nil
+}
+
+// nextMulti is used for iterating over multi-segment decompositions
+// for decomposing normal forms.
+func nextMulti(i *Iter) []byte {
+	j := 0
+	d := i.multiSeg
+	// skip first rune
+	for j = 1; j < len(d) && !utf8.RuneStart(d[j]); j++ {
+	}
+	for j < len(d) {
+		info := i.rb.f.info(input{bytes: d}, j)
+		if info.BoundaryBefore() {
+			i.multiSeg = d[j:]
+			return d[:j]
+		}
+		j += int(info.size)
+	}
+	// treat last segment as normal decomposition
+	i.next = i.rb.f.nextMain
+	return i.next(i)
+}
+
+// nextMultiNorm is used for iterating over multi-segment decompositions
+// for composing normal forms.
+func nextMultiNorm(i *Iter) []byte {
+	j := 0
+	d := i.multiSeg
+	for j < len(d) {
+		info := i.rb.f.info(input{bytes: d}, j)
+		if info.BoundaryBefore() {
+			i.rb.compose()
+			seg := i.buf[:i.rb.flushCopy(i.buf[:])]
+			i.rb.ss.first(info)
+			i.rb.insertUnsafe(input{bytes: d}, j, info)
+			i.multiSeg = d[j+int(info.size):]
+			return seg
+		}
+		i.rb.ss.next(info)
+		i.rb.insertUnsafe(input{bytes: d}, j, info)
+		j += int(info.size)
+	}
+	i.multiSeg = nil
+	i.next = nextComposed
+	return doNormComposed(i)
+}
+
+// nextDecomposed is the implementation of Next for forms NFD and NFKD.
+func nextDecomposed(i *Iter) (next []byte) {
+	outp := 0
+	inCopyStart, outCopyStart := i.p, 0
+	ss := mkStreamSafe(i.info)
+	for {
+		if sz := int(i.info.size); sz <= 1 {
+			p := i.p
+			i.p++ // ASCII or illegal byte.  Either way, advance by 1.
+			if i.p >= i.rb.nsrc {
+				i.setDone()
+				return i.returnSlice(p, i.p)
+			} else if i.rb.src._byte(i.p) < utf8.RuneSelf {
+				i.next = i.asciiF
+				return i.returnSlice(p, i.p)
+			}
+			outp++
+		} else if d := i.info.Decomposition(); d != nil {
+			// Note: If leading CCC != 0, then len(d) == 2 and last is also non-zero.
+			// Case 1: there is a leftover to copy.  In this case the decomposition
+			// must begin with a modifier and should always be appended.
+			// Case 2: no leftover. Simply return d if followed by a ccc == 0 value.
+			p := outp + len(d)
+			if outp > 0 {
+				i.rb.src.copySlice(i.buf[outCopyStart:], inCopyStart, i.p)
+				if p > len(i.buf) {
+					return i.buf[:outp]
+				}
+			} else if i.info.multiSegment() {
+				// outp must be 0 as multi-segment decompositions always
+				// start a new segment.
+				if i.multiSeg == nil {
+					i.multiSeg = d
+					i.next = nextMulti
+					return nextMulti(i)
+				}
+				// We are in the last segment.  Treat as normal decomposition.
+				d = i.multiSeg
+				i.multiSeg = nil
+				p = len(d)
+			}
+			prevCC := i.info.tccc
+			if i.p += sz; i.p >= i.rb.nsrc {
+				i.setDone()
+				i.info = Properties{} // Force BoundaryBefore to succeed.
+			} else {
+				i.info = i.rb.f.info(i.rb.src, i.p)
+			}
+			switch ss.next(i.info) {
+			case ssOverflow:
+				i.next = nextCGJDecompose
+				fallthrough
+			case ssStarter:
+				if outp > 0 {
+					copy(i.buf[outp:], d)
+					return i.buf[:p]
+				}
+				return d
+			}
+			copy(i.buf[outp:], d)
+			outp = p
+			inCopyStart, outCopyStart = i.p, outp
+			if i.info.ccc < prevCC {
+				goto doNorm
+			}
+			continue
+		} else if r := i.rb.src.hangul(i.p); r != 0 {
+			outp = decomposeHangul(i.buf[:], r)
+			i.p += hangulUTF8Size
+			inCopyStart, outCopyStart = i.p, outp
+			if i.p >= i.rb.nsrc {
+				i.setDone()
+				break
+			} else if i.rb.src.hangul(i.p) != 0 {
+				i.next = nextHangul
+				return i.buf[:outp]
+			}
+		} else {
+			p := outp + sz
+			if p > len(i.buf) {
+				break
+			}
+			outp = p
+			i.p += sz
+		}
+		if i.p >= i.rb.nsrc {
+			i.setDone()
+			break
+		}
+		prevCC := i.info.tccc
+		i.info = i.rb.f.info(i.rb.src, i.p)
+		if v := ss.next(i.info); v == ssStarter {
+			break
+		} else if v == ssOverflow {
+			i.next = nextCGJDecompose
+			break
+		}
+		if i.info.ccc < prevCC {
+			goto doNorm
+		}
+	}
+	if outCopyStart == 0 {
+		return i.returnSlice(inCopyStart, i.p)
+	} else if inCopyStart < i.p {
+		i.rb.src.copySlice(i.buf[outCopyStart:], inCopyStart, i.p)
+	}
+	return i.buf[:outp]
+doNorm:
+	// Insert what we have decomposed so far in the reorderBuffer.
+	// As we will only reorder, there will always be enough room.
+	i.rb.src.copySlice(i.buf[outCopyStart:], inCopyStart, i.p)
+	i.rb.insertDecomposed(i.buf[0:outp])
+	return doNormDecomposed(i)
+}
+
+func doNormDecomposed(i *Iter) []byte {
+	for {
+		if s := i.rb.ss.next(i.info); s == ssOverflow {
+			i.next = nextCGJDecompose
+			break
+		}
+		i.rb.insertUnsafe(i.rb.src, i.p, i.info)
+		if i.p += int(i.info.size); i.p >= i.rb.nsrc {
+			i.setDone()
+			break
+		}
+		i.info = i.rb.f.info(i.rb.src, i.p)
+		if i.info.ccc == 0 {
+			break
+		}
+	}
+	// new segment or too many combining characters: exit normalization
+	return i.buf[:i.rb.flushCopy(i.buf[:])]
+}
+
+func nextCGJDecompose(i *Iter) []byte {
+	i.rb.ss = 0
+	i.rb.insertCGJ()
+	i.next = nextDecomposed
+	buf := doNormDecomposed(i)
+	return buf
+}
+
+// nextComposed is the implementation of Next for forms NFC and NFKC.
+func nextComposed(i *Iter) []byte {
+	outp, startp := 0, i.p
+	var prevCC uint8
+	ss := mkStreamSafe(i.info)
+	for {
+		if !i.info.isYesC() {
+			goto doNorm
+		}
+		prevCC = i.info.tccc
+		sz := int(i.info.size)
+		if sz == 0 {
+			sz = 1 // illegal rune: copy byte-by-byte
+		}
+		p := outp + sz
+		if p > len(i.buf) {
+			break
+		}
+		outp = p
+		i.p += sz
+		if i.p >= i.rb.nsrc {
+			i.setDone()
+			break
+		} else if i.rb.src._byte(i.p) < utf8.RuneSelf {
+			i.next = i.asciiF
+			break
+		}
+		i.info = i.rb.f.info(i.rb.src, i.p)
+		if v := ss.next(i.info); v == ssStarter {
+			break
+		} else if v == ssOverflow {
+			i.next = nextCGJCompose
+			break
+		}
+		if i.info.ccc < prevCC {
+			goto doNorm
+		}
+	}
+	return i.returnSlice(startp, i.p)
+doNorm:
+	i.p = startp
+	i.info = i.rb.f.info(i.rb.src, i.p)
+	if i.info.multiSegment() {
+		d := i.info.Decomposition()
+		info := i.rb.f.info(input{bytes: d}, 0)
+		i.rb.insertUnsafe(input{bytes: d}, 0, info)
+		i.multiSeg = d[int(info.size):]
+		i.next = nextMultiNorm
+		return nextMultiNorm(i)
+	}
+	i.rb.ss.first(i.info)
+	i.rb.insertUnsafe(i.rb.src, i.p, i.info)
+	return doNormComposed(i)
+}
+
+func doNormComposed(i *Iter) []byte {
+	// First rune should already be inserted.
+	for {
+		if i.p += int(i.info.size); i.p >= i.rb.nsrc {
+			i.setDone()
+			break
+		}
+		i.info = i.rb.f.info(i.rb.src, i.p)
+		if s := i.rb.ss.next(i.info); s == ssStarter {
+			break
+		} else if s == ssOverflow {
+			i.next = nextCGJCompose
+			break
+		}
+		i.rb.insertUnsafe(i.rb.src, i.p, i.info)
+	}
+	i.rb.compose()
+	seg := i.buf[:i.rb.flushCopy(i.buf[:])]
+	return seg
+}
+
+func nextCGJCompose(i *Iter) []byte {
+	i.rb.ss = 0 // instead of first
+	i.rb.insertCGJ()
+	i.next = nextComposed
+	// Note that we treat any rune with nLeadingNonStarters > 0 as a non-starter,
+	// even if they are not. This is particularly dubious for U+FF9E and UFF9A.
+	// If we ever change that, insert a check here.
+	i.rb.ss.first(i.info)
+	i.rb.insertUnsafe(i.rb.src, i.p, i.info)
+	return doNormComposed(i)
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/maketables.go b/vendor/golang.org/x/text/unicode/norm/maketables.go
new file mode 100644
index 0000000000..07bdff6bdc
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/maketables.go
@@ -0,0 +1,978 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+// Normalization table generator.
+// Data read from the web.
+// See forminfo.go for a description of the trie values associated with each rune.
+
+package main
+
+import (
+	"bytes"
+	"flag"
+	"fmt"
+	"io"
+	"log"
+	"sort"
+	"strconv"
+	"strings"
+
+	"golang.org/x/text/internal/gen"
+	"golang.org/x/text/internal/triegen"
+	"golang.org/x/text/internal/ucd"
+)
+
+func main() {
+	gen.Init()
+	loadUnicodeData()
+	compactCCC()
+	loadCompositionExclusions()
+	completeCharFields(FCanonical)
+	completeCharFields(FCompatibility)
+	computeNonStarterCounts()
+	verifyComputed()
+	printChars()
+	if *test {
+		testDerived()
+		printTestdata()
+	} else {
+		makeTables()
+	}
+}
+
+var (
+	tablelist = flag.String("tables",
+		"all",
+		"comma-separated list of which tables to generate; "+
+			"can be 'decomp', 'recomp', 'info' and 'all'")
+	test = flag.Bool("test",
+		false,
+		"test existing tables against DerivedNormalizationProps and generate test data for regression testing")
+	verbose = flag.Bool("verbose",
+		false,
+		"write data to stdout as it is parsed")
+)
+
+const MaxChar = 0x10FFFF // anything above this shouldn't exist
+
+// Quick Check properties of runes allow us to quickly
+// determine whether a rune may occur in a normal form.
+// For a given normal form, a rune may be guaranteed to occur
+// verbatim (QC=Yes), may or may not combine with another
+// rune (QC=Maybe), or may not occur (QC=No).
+type QCResult int
+
+const (
+	QCUnknown QCResult = iota
+	QCYes
+	QCNo
+	QCMaybe
+)
+
+func (r QCResult) String() string {
+	switch r {
+	case QCYes:
+		return "Yes"
+	case QCNo:
+		return "No"
+	case QCMaybe:
+		return "Maybe"
+	}
+	return "***UNKNOWN***"
+}
+
+const (
+	FCanonical     = iota // NFC or NFD
+	FCompatibility        // NFKC or NFKD
+	FNumberOfFormTypes
+)
+
+const (
+	MComposed   = iota // NFC or NFKC
+	MDecomposed        // NFD or NFKD
+	MNumberOfModes
+)
+
+// This contains only the properties we're interested in.
+type Char struct {
+	name          string
+	codePoint     rune  // if zero, this index is not a valid code point.
+	ccc           uint8 // canonical combining class
+	origCCC       uint8
+	excludeInComp bool // from CompositionExclusions.txt
+	compatDecomp  bool // it has a compatibility expansion
+
+	nTrailingNonStarters uint8
+	nLeadingNonStarters  uint8 // must be equal to trailing if non-zero
+
+	forms [FNumberOfFormTypes]FormInfo // For FCanonical and FCompatibility
+
+	state State
+}
+
+var chars = make([]Char, MaxChar+1)
+var cccMap = make(map[uint8]uint8)
+
+func (c Char) String() string {
+	buf := new(bytes.Buffer)
+
+	fmt.Fprintf(buf, "%U [%s]:\n", c.codePoint, c.name)
+	fmt.Fprintf(buf, "  ccc: %v\n", c.ccc)
+	fmt.Fprintf(buf, "  excludeInComp: %v\n", c.excludeInComp)
+	fmt.Fprintf(buf, "  compatDecomp: %v\n", c.compatDecomp)
+	fmt.Fprintf(buf, "  state: %v\n", c.state)
+	fmt.Fprintf(buf, "  NFC:\n")
+	fmt.Fprint(buf, c.forms[FCanonical])
+	fmt.Fprintf(buf, "  NFKC:\n")
+	fmt.Fprint(buf, c.forms[FCompatibility])
+
+	return buf.String()
+}
+
+// In UnicodeData.txt, some ranges are marked like this:
+//	3400;<CJK Ideograph Extension A, First>;Lo;0;L;;;;;N;;;;;
+//	4DB5;<CJK Ideograph Extension A, Last>;Lo;0;L;;;;;N;;;;;
+// parseCharacter keeps a state variable indicating the weirdness.
+type State int
+
+const (
+	SNormal State = iota // known to be zero for the type
+	SFirst
+	SLast
+	SMissing
+)
+
+var lastChar = rune('\u0000')
+
+func (c Char) isValid() bool {
+	return c.codePoint != 0 && c.state != SMissing
+}
+
+type FormInfo struct {
+	quickCheck [MNumberOfModes]QCResult // index: MComposed or MDecomposed
+	verified   [MNumberOfModes]bool     // index: MComposed or MDecomposed
+
+	combinesForward  bool // May combine with rune on the right
+	combinesBackward bool // May combine with rune on the left
+	isOneWay         bool // Never appears in result
+	inDecomp         bool // Some decompositions result in this char.
+	decomp           Decomposition
+	expandedDecomp   Decomposition
+}
+
+func (f FormInfo) String() string {
+	buf := bytes.NewBuffer(make([]byte, 0))
+
+	fmt.Fprintf(buf, "    quickCheck[C]: %v\n", f.quickCheck[MComposed])
+	fmt.Fprintf(buf, "    quickCheck[D]: %v\n", f.quickCheck[MDecomposed])
+	fmt.Fprintf(buf, "    cmbForward: %v\n", f.combinesForward)
+	fmt.Fprintf(buf, "    cmbBackward: %v\n", f.combinesBackward)
+	fmt.Fprintf(buf, "    isOneWay: %v\n", f.isOneWay)
+	fmt.Fprintf(buf, "    inDecomp: %v\n", f.inDecomp)
+	fmt.Fprintf(buf, "    decomposition: %X\n", f.decomp)
+	fmt.Fprintf(buf, "    expandedDecomp: %X\n", f.expandedDecomp)
+
+	return buf.String()
+}
+
+type Decomposition []rune
+
+func parseDecomposition(s string, skipfirst bool) (a []rune, err error) {
+	decomp := strings.Split(s, " ")
+	if len(decomp) > 0 && skipfirst {
+		decomp = decomp[1:]
+	}
+	for _, d := range decomp {
+		point, err := strconv.ParseUint(d, 16, 64)
+		if err != nil {
+			return a, err
+		}
+		a = append(a, rune(point))
+	}
+	return a, nil
+}
+
+func loadUnicodeData() {
+	f := gen.OpenUCDFile("UnicodeData.txt")
+	defer f.Close()
+	p := ucd.New(f)
+	for p.Next() {
+		r := p.Rune(ucd.CodePoint)
+		char := &chars[r]
+
+		char.ccc = uint8(p.Uint(ucd.CanonicalCombiningClass))
+		decmap := p.String(ucd.DecompMapping)
+
+		exp, err := parseDecomposition(decmap, false)
+		isCompat := false
+		if err != nil {
+			if len(decmap) > 0 {
+				exp, err = parseDecomposition(decmap, true)
+				if err != nil {
+					log.Fatalf(`%U: bad decomp |%v|: "%s"`, r, decmap, err)
+				}
+				isCompat = true
+			}
+		}
+
+		char.name = p.String(ucd.Name)
+		char.codePoint = r
+		char.forms[FCompatibility].decomp = exp
+		if !isCompat {
+			char.forms[FCanonical].decomp = exp
+		} else {
+			char.compatDecomp = true
+		}
+		if len(decmap) > 0 {
+			char.forms[FCompatibility].decomp = exp
+		}
+	}
+	if err := p.Err(); err != nil {
+		log.Fatal(err)
+	}
+}
+
+// compactCCC converts the sparse set of CCC values to a continguous one,
+// reducing the number of bits needed from 8 to 6.
+func compactCCC() {
+	m := make(map[uint8]uint8)
+	for i := range chars {
+		c := &chars[i]
+		m[c.ccc] = 0
+	}
+	cccs := []int{}
+	for v, _ := range m {
+		cccs = append(cccs, int(v))
+	}
+	sort.Ints(cccs)
+	for i, c := range cccs {
+		cccMap[uint8(i)] = uint8(c)
+		m[uint8(c)] = uint8(i)
+	}
+	for i := range chars {
+		c := &chars[i]
+		c.origCCC = c.ccc
+		c.ccc = m[c.ccc]
+	}
+	if len(m) >= 1<<6 {
+		log.Fatalf("too many difference CCC values: %d >= 64", len(m))
+	}
+}
+
+// CompositionExclusions.txt has form:
+// 0958    # ...
+// See http://unicode.org/reports/tr44/ for full explanation
+func loadCompositionExclusions() {
+	f := gen.OpenUCDFile("CompositionExclusions.txt")
+	defer f.Close()
+	p := ucd.New(f)
+	for p.Next() {
+		c := &chars[p.Rune(0)]
+		if c.excludeInComp {
+			log.Fatalf("%U: Duplicate entry in exclusions.", c.codePoint)
+		}
+		c.excludeInComp = true
+	}
+	if e := p.Err(); e != nil {
+		log.Fatal(e)
+	}
+}
+
+// hasCompatDecomp returns true if any of the recursive
+// decompositions contains a compatibility expansion.
+// In this case, the character may not occur in NFK*.
+func hasCompatDecomp(r rune) bool {
+	c := &chars[r]
+	if c.compatDecomp {
+		return true
+	}
+	for _, d := range c.forms[FCompatibility].decomp {
+		if hasCompatDecomp(d) {
+			return true
+		}
+	}
+	return false
+}
+
+// Hangul related constants.
+const (
+	HangulBase = 0xAC00
+	HangulEnd  = 0xD7A4 // hangulBase + Jamo combinations (19 * 21 * 28)
+
+	JamoLBase = 0x1100
+	JamoLEnd  = 0x1113
+	JamoVBase = 0x1161
+	JamoVEnd  = 0x1176
+	JamoTBase = 0x11A8
+	JamoTEnd  = 0x11C3
+
+	JamoLVTCount = 19 * 21 * 28
+	JamoTCount   = 28
+)
+
+func isHangul(r rune) bool {
+	return HangulBase <= r && r < HangulEnd
+}
+
+func isHangulWithoutJamoT(r rune) bool {
+	if !isHangul(r) {
+		return false
+	}
+	r -= HangulBase
+	return r < JamoLVTCount && r%JamoTCount == 0
+}
+
+func ccc(r rune) uint8 {
+	return chars[r].ccc
+}
+
+// Insert a rune in a buffer, ordered by Canonical Combining Class.
+func insertOrdered(b Decomposition, r rune) Decomposition {
+	n := len(b)
+	b = append(b, 0)
+	cc := ccc(r)
+	if cc > 0 {
+		// Use bubble sort.
+		for ; n > 0; n-- {
+			if ccc(b[n-1]) <= cc {
+				break
+			}
+			b[n] = b[n-1]
+		}
+	}
+	b[n] = r
+	return b
+}
+
+// Recursively decompose.
+func decomposeRecursive(form int, r rune, d Decomposition) Decomposition {
+	dcomp := chars[r].forms[form].decomp
+	if len(dcomp) == 0 {
+		return insertOrdered(d, r)
+	}
+	for _, c := range dcomp {
+		d = decomposeRecursive(form, c, d)
+	}
+	return d
+}
+
+func completeCharFields(form int) {
+	// Phase 0: pre-expand decomposition.
+	for i := range chars {
+		f := &chars[i].forms[form]
+		if len(f.decomp) == 0 {
+			continue
+		}
+		exp := make(Decomposition, 0)
+		for _, c := range f.decomp {
+			exp = decomposeRecursive(form, c, exp)
+		}
+		f.expandedDecomp = exp
+	}
+
+	// Phase 1: composition exclusion, mark decomposition.
+	for i := range chars {
+		c := &chars[i]
+		f := &c.forms[form]
+
+		// Marks script-specific exclusions and version restricted.
+		f.isOneWay = c.excludeInComp
+
+		// Singletons
+		f.isOneWay = f.isOneWay || len(f.decomp) == 1
+
+		// Non-starter decompositions
+		if len(f.decomp) > 1 {
+			chk := c.ccc != 0 || chars[f.decomp[0]].ccc != 0
+			f.isOneWay = f.isOneWay || chk
+		}
+
+		// Runes that decompose into more than two runes.
+		f.isOneWay = f.isOneWay || len(f.decomp) > 2
+
+		if form == FCompatibility {
+			f.isOneWay = f.isOneWay || hasCompatDecomp(c.codePoint)
+		}
+
+		for _, r := range f.decomp {
+			chars[r].forms[form].inDecomp = true
+		}
+	}
+
+	// Phase 2: forward and backward combining.
+	for i := range chars {
+		c := &chars[i]
+		f := &c.forms[form]
+
+		if !f.isOneWay && len(f.decomp) == 2 {
+			f0 := &chars[f.decomp[0]].forms[form]
+			f1 := &chars[f.decomp[1]].forms[form]
+			if !f0.isOneWay {
+				f0.combinesForward = true
+			}
+			if !f1.isOneWay {
+				f1.combinesBackward = true
+			}
+		}
+		if isHangulWithoutJamoT(rune(i)) {
+			f.combinesForward = true
+		}
+	}
+
+	// Phase 3: quick check values.
+	for i := range chars {
+		c := &chars[i]
+		f := &c.forms[form]
+
+		switch {
+		case len(f.decomp) > 0:
+			f.quickCheck[MDecomposed] = QCNo
+		case isHangul(rune(i)):
+			f.quickCheck[MDecomposed] = QCNo
+		default:
+			f.quickCheck[MDecomposed] = QCYes
+		}
+		switch {
+		case f.isOneWay:
+			f.quickCheck[MComposed] = QCNo
+		case (i & 0xffff00) == JamoLBase:
+			f.quickCheck[MComposed] = QCYes
+			if JamoLBase <= i && i < JamoLEnd {
+				f.combinesForward = true
+			}
+			if JamoVBase <= i && i < JamoVEnd {
+				f.quickCheck[MComposed] = QCMaybe
+				f.combinesBackward = true
+				f.combinesForward = true
+			}
+			if JamoTBase <= i && i < JamoTEnd {
+				f.quickCheck[MComposed] = QCMaybe
+				f.combinesBackward = true
+			}
+		case !f.combinesBackward:
+			f.quickCheck[MComposed] = QCYes
+		default:
+			f.quickCheck[MComposed] = QCMaybe
+		}
+	}
+}
+
+func computeNonStarterCounts() {
+	// Phase 4: leading and trailing non-starter count
+	for i := range chars {
+		c := &chars[i]
+
+		runes := []rune{rune(i)}
+		// We always use FCompatibility so that the CGJ insertion points do not
+		// change for repeated normalizations with different forms.
+		if exp := c.forms[FCompatibility].expandedDecomp; len(exp) > 0 {
+			runes = exp
+		}
+		// We consider runes that combine backwards to be non-starters for the
+		// purpose of Stream-Safe Text Processing.
+		for _, r := range runes {
+			if cr := &chars[r]; cr.ccc == 0 && !cr.forms[FCompatibility].combinesBackward {
+				break
+			}
+			c.nLeadingNonStarters++
+		}
+		for i := len(runes) - 1; i >= 0; i-- {
+			if cr := &chars[runes[i]]; cr.ccc == 0 && !cr.forms[FCompatibility].combinesBackward {
+				break
+			}
+			c.nTrailingNonStarters++
+		}
+		if c.nTrailingNonStarters > 3 {
+			log.Fatalf("%U: Decomposition with more than 3 (%d) trailing modifiers (%U)", i, c.nTrailingNonStarters, runes)
+		}
+
+		if isHangul(rune(i)) {
+			c.nTrailingNonStarters = 2
+			if isHangulWithoutJamoT(rune(i)) {
+				c.nTrailingNonStarters = 1
+			}
+		}
+
+		if l, t := c.nLeadingNonStarters, c.nTrailingNonStarters; l > 0 && l != t {
+			log.Fatalf("%U: number of leading and trailing non-starters should be equal (%d vs %d)", i, l, t)
+		}
+		if t := c.nTrailingNonStarters; t > 3 {
+			log.Fatalf("%U: number of trailing non-starters is %d > 3", t)
+		}
+	}
+}
+
+func printBytes(w io.Writer, b []byte, name string) {
+	fmt.Fprintf(w, "// %s: %d bytes\n", name, len(b))
+	fmt.Fprintf(w, "var %s = [...]byte {", name)
+	for i, c := range b {
+		switch {
+		case i%64 == 0:
+			fmt.Fprintf(w, "\n// Bytes %x - %x\n", i, i+63)
+		case i%8 == 0:
+			fmt.Fprintf(w, "\n")
+		}
+		fmt.Fprintf(w, "0x%.2X, ", c)
+	}
+	fmt.Fprint(w, "\n}\n\n")
+}
+
+// See forminfo.go for format.
+func makeEntry(f *FormInfo, c *Char) uint16 {
+	e := uint16(0)
+	if r := c.codePoint; HangulBase <= r && r < HangulEnd {
+		e |= 0x40
+	}
+	if f.combinesForward {
+		e |= 0x20
+	}
+	if f.quickCheck[MDecomposed] == QCNo {
+		e |= 0x4
+	}
+	switch f.quickCheck[MComposed] {
+	case QCYes:
+	case QCNo:
+		e |= 0x10
+	case QCMaybe:
+		e |= 0x18
+	default:
+		log.Fatalf("Illegal quickcheck value %v.", f.quickCheck[MComposed])
+	}
+	e |= uint16(c.nTrailingNonStarters)
+	return e
+}
+
+// decompSet keeps track of unique decompositions, grouped by whether
+// the decomposition is followed by a trailing and/or leading CCC.
+type decompSet [7]map[string]bool
+
+const (
+	normalDecomp = iota
+	firstMulti
+	firstCCC
+	endMulti
+	firstLeadingCCC
+	firstCCCZeroExcept
+	firstStarterWithNLead
+	lastDecomp
+)
+
+var cname = []string{"firstMulti", "firstCCC", "endMulti", "firstLeadingCCC", "firstCCCZeroExcept", "firstStarterWithNLead", "lastDecomp"}
+
+func makeDecompSet() decompSet {
+	m := decompSet{}
+	for i := range m {
+		m[i] = make(map[string]bool)
+	}
+	return m
+}
+func (m *decompSet) insert(key int, s string) {
+	m[key][s] = true
+}
+
+func printCharInfoTables(w io.Writer) int {
+	mkstr := func(r rune, f *FormInfo) (int, string) {
+		d := f.expandedDecomp
+		s := string([]rune(d))
+		if max := 1 << 6; len(s) >= max {
+			const msg = "%U: too many bytes in decomposition: %d >= %d"
+			log.Fatalf(msg, r, len(s), max)
+		}
+		head := uint8(len(s))
+		if f.quickCheck[MComposed] != QCYes {
+			head |= 0x40
+		}
+		if f.combinesForward {
+			head |= 0x80
+		}
+		s = string([]byte{head}) + s
+
+		lccc := ccc(d[0])
+		tccc := ccc(d[len(d)-1])
+		cc := ccc(r)
+		if cc != 0 && lccc == 0 && tccc == 0 {
+			log.Fatalf("%U: trailing and leading ccc are 0 for non-zero ccc %d", r, cc)
+		}
+		if tccc < lccc && lccc != 0 {
+			const msg = "%U: lccc (%d) must be <= tcc (%d)"
+			log.Fatalf(msg, r, lccc, tccc)
+		}
+		index := normalDecomp
+		nTrail := chars[r].nTrailingNonStarters
+		if tccc > 0 || lccc > 0 || nTrail > 0 {
+			tccc <<= 2
+			tccc |= nTrail
+			s += string([]byte{tccc})
+			index = endMulti
+			for _, r := range d[1:] {
+				if ccc(r) == 0 {
+					index = firstCCC
+				}
+			}
+			if lccc > 0 {
+				s += string([]byte{lccc})
+				if index == firstCCC {
+					log.Fatalf("%U: multi-segment decomposition not supported for decompositions with leading CCC != 0", r)
+				}
+				index = firstLeadingCCC
+			}
+			if cc != lccc {
+				if cc != 0 {
+					log.Fatalf("%U: for lccc != ccc, expected ccc to be 0; was %d", r, cc)
+				}
+				index = firstCCCZeroExcept
+			}
+		} else if len(d) > 1 {
+			index = firstMulti
+		}
+		return index, s
+	}
+
+	decompSet := makeDecompSet()
+	const nLeadStr = "\x00\x01" // 0-byte length and tccc with nTrail.
+	decompSet.insert(firstStarterWithNLead, nLeadStr)
+
+	// Store the uniqued decompositions in a byte buffer,
+	// preceded by their byte length.
+	for _, c := range chars {
+		for _, f := range c.forms {
+			if len(f.expandedDecomp) == 0 {
+				continue
+			}
+			if f.combinesBackward {
+				log.Fatalf("%U: combinesBackward and decompose", c.codePoint)
+			}
+			index, s := mkstr(c.codePoint, &f)
+			decompSet.insert(index, s)
+		}
+	}
+
+	decompositions := bytes.NewBuffer(make([]byte, 0, 10000))
+	size := 0
+	positionMap := make(map[string]uint16)
+	decompositions.WriteString("\000")
+	fmt.Fprintln(w, "const (")
+	for i, m := range decompSet {
+		sa := []string{}
+		for s := range m {
+			sa = append(sa, s)
+		}
+		sort.Strings(sa)
+		for _, s := range sa {
+			p := decompositions.Len()
+			decompositions.WriteString(s)
+			positionMap[s] = uint16(p)
+		}
+		if cname[i] != "" {
+			fmt.Fprintf(w, "%s = 0x%X\n", cname[i], decompositions.Len())
+		}
+	}
+	fmt.Fprintln(w, "maxDecomp = 0x8000")
+	fmt.Fprintln(w, ")")
+	b := decompositions.Bytes()
+	printBytes(w, b, "decomps")
+	size += len(b)
+
+	varnames := []string{"nfc", "nfkc"}
+	for i := 0; i < FNumberOfFormTypes; i++ {
+		trie := triegen.NewTrie(varnames[i])
+
+		for r, c := range chars {
+			f := c.forms[i]
+			d := f.expandedDecomp
+			if len(d) != 0 {
+				_, key := mkstr(c.codePoint, &f)
+				trie.Insert(rune(r), uint64(positionMap[key]))
+				if c.ccc != ccc(d[0]) {
+					// We assume the lead ccc of a decomposition !=0 in this case.
+					if ccc(d[0]) == 0 {
+						log.Fatalf("Expected leading CCC to be non-zero; ccc is %d", c.ccc)
+					}
+				}
+			} else if c.nLeadingNonStarters > 0 && len(f.expandedDecomp) == 0 && c.ccc == 0 && !f.combinesBackward {
+				// Handle cases where it can't be detected that the nLead should be equal
+				// to nTrail.
+				trie.Insert(c.codePoint, uint64(positionMap[nLeadStr]))
+			} else if v := makeEntry(&f, &c)<<8 | uint16(c.ccc); v != 0 {
+				trie.Insert(c.codePoint, uint64(0x8000|v))
+			}
+		}
+		sz, err := trie.Gen(w, triegen.Compact(&normCompacter{name: varnames[i]}))
+		if err != nil {
+			log.Fatal(err)
+		}
+		size += sz
+	}
+	return size
+}
+
+func contains(sa []string, s string) bool {
+	for _, a := range sa {
+		if a == s {
+			return true
+		}
+	}
+	return false
+}
+
+func makeTables() {
+	w := &bytes.Buffer{}
+
+	size := 0
+	if *tablelist == "" {
+		return
+	}
+	list := strings.Split(*tablelist, ",")
+	if *tablelist == "all" {
+		list = []string{"recomp", "info"}
+	}
+
+	// Compute maximum decomposition size.
+	max := 0
+	for _, c := range chars {
+		if n := len(string(c.forms[FCompatibility].expandedDecomp)); n > max {
+			max = n
+		}
+	}
+
+	fmt.Fprintln(w, "const (")
+	fmt.Fprintln(w, "\t// Version is the Unicode edition from which the tables are derived.")
+	fmt.Fprintf(w, "\tVersion = %q\n", gen.UnicodeVersion())
+	fmt.Fprintln(w)
+	fmt.Fprintln(w, "\t// MaxTransformChunkSize indicates the maximum number of bytes that Transform")
+	fmt.Fprintln(w, "\t// may need to write atomically for any Form. Making a destination buffer at")
+	fmt.Fprintln(w, "\t// least this size ensures that Transform can always make progress and that")
+	fmt.Fprintln(w, "\t// the user does not need to grow the buffer on an ErrShortDst.")
+	fmt.Fprintf(w, "\tMaxTransformChunkSize = %d+maxNonStarters*4\n", len(string(0x034F))+max)
+	fmt.Fprintln(w, ")\n")
+
+	// Print the CCC remap table.
+	size += len(cccMap)
+	fmt.Fprintf(w, "var ccc = [%d]uint8{", len(cccMap))
+	for i := 0; i < len(cccMap); i++ {
+		if i%8 == 0 {
+			fmt.Fprintln(w)
+		}
+		fmt.Fprintf(w, "%3d, ", cccMap[uint8(i)])
+	}
+	fmt.Fprintln(w, "\n}\n")
+
+	if contains(list, "info") {
+		size += printCharInfoTables(w)
+	}
+
+	if contains(list, "recomp") {
+		// Note that we use 32 bit keys, instead of 64 bit.
+		// This clips the bits of three entries, but we know
+		// this won't cause a collision. The compiler will catch
+		// any changes made to UnicodeData.txt that introduces
+		// a collision.
+		// Note that the recomposition map for NFC and NFKC
+		// are identical.
+
+		// Recomposition map
+		nrentries := 0
+		for _, c := range chars {
+			f := c.forms[FCanonical]
+			if !f.isOneWay && len(f.decomp) > 0 {
+				nrentries++
+			}
+		}
+		sz := nrentries * 8
+		size += sz
+		fmt.Fprintf(w, "// recompMap: %d bytes (entries only)\n", sz)
+		fmt.Fprintln(w, "var recompMap = map[uint32]rune{")
+		for i, c := range chars {
+			f := c.forms[FCanonical]
+			d := f.decomp
+			if !f.isOneWay && len(d) > 0 {
+				key := uint32(uint16(d[0]))<<16 + uint32(uint16(d[1]))
+				fmt.Fprintf(w, "0x%.8X: 0x%.4X,\n", key, i)
+			}
+		}
+		fmt.Fprintf(w, "}\n\n")
+	}
+
+	fmt.Fprintf(w, "// Total size of tables: %dKB (%d bytes)\n", (size+512)/1024, size)
+	gen.WriteGoFile("tables.go", "norm", w.Bytes())
+}
+
+func printChars() {
+	if *verbose {
+		for _, c := range chars {
+			if !c.isValid() || c.state == SMissing {
+				continue
+			}
+			fmt.Println(c)
+		}
+	}
+}
+
+// verifyComputed does various consistency tests.
+func verifyComputed() {
+	for i, c := range chars {
+		for _, f := range c.forms {
+			isNo := (f.quickCheck[MDecomposed] == QCNo)
+			if (len(f.decomp) > 0) != isNo && !isHangul(rune(i)) {
+				log.Fatalf("%U: NF*D QC must be No if rune decomposes", i)
+			}
+
+			isMaybe := f.quickCheck[MComposed] == QCMaybe
+			if f.combinesBackward != isMaybe {
+				log.Fatalf("%U: NF*C QC must be Maybe if combinesBackward", i)
+			}
+			if len(f.decomp) > 0 && f.combinesForward && isMaybe {
+				log.Fatalf("%U: NF*C QC must be Yes or No if combinesForward and decomposes", i)
+			}
+
+			if len(f.expandedDecomp) != 0 {
+				continue
+			}
+			if a, b := c.nLeadingNonStarters > 0, (c.ccc > 0 || f.combinesBackward); a != b {
+				// We accept these runes to be treated differently (it only affects
+				// segment breaking in iteration, most likely on improper use), but
+				// reconsider if more characters are added.
+				// U+FF9E HALFWIDTH KATAKANA VOICED SOUND MARK;Lm;0;L;<narrow> 3099;;;;N;;;;;
+				// U+FF9F HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK;Lm;0;L;<narrow> 309A;;;;N;;;;;
+				// U+3133 HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<compat> 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;;
+				// U+318E HANGUL LETTER ARAEAE;Lo;0;L;<compat> 11A1;;;;N;HANGUL LETTER ALAE AE;;;;
+				// U+FFA3 HALFWIDTH HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<narrow> 3133;;;;N;HALFWIDTH HANGUL LETTER GIYEOG SIOS;;;;
+				// U+FFDC HALFWIDTH HANGUL LETTER I;Lo;0;L;<narrow> 3163;;;;N;;;;;
+				if i != 0xFF9E && i != 0xFF9F && !(0x3133 <= i && i <= 0x318E) && !(0xFFA3 <= i && i <= 0xFFDC) {
+					log.Fatalf("%U: nLead was %v; want %v", i, a, b)
+				}
+			}
+		}
+		nfc := c.forms[FCanonical]
+		nfkc := c.forms[FCompatibility]
+		if nfc.combinesBackward != nfkc.combinesBackward {
+			log.Fatalf("%U: Cannot combine combinesBackward\n", c.codePoint)
+		}
+	}
+}
+
+// Use values in DerivedNormalizationProps.txt to compare against the
+// values we computed.
+// DerivedNormalizationProps.txt has form:
+// 00C0..00C5    ; NFD_QC; N # ...
+// 0374          ; NFD_QC; N # ...
+// See http://unicode.org/reports/tr44/ for full explanation
+func testDerived() {
+	f := gen.OpenUCDFile("DerivedNormalizationProps.txt")
+	defer f.Close()
+	p := ucd.New(f)
+	for p.Next() {
+		r := p.Rune(0)
+		c := &chars[r]
+
+		var ftype, mode int
+		qt := p.String(1)
+		switch qt {
+		case "NFC_QC":
+			ftype, mode = FCanonical, MComposed
+		case "NFD_QC":
+			ftype, mode = FCanonical, MDecomposed
+		case "NFKC_QC":
+			ftype, mode = FCompatibility, MComposed
+		case "NFKD_QC":
+			ftype, mode = FCompatibility, MDecomposed
+		default:
+			continue
+		}
+		var qr QCResult
+		switch p.String(2) {
+		case "Y":
+			qr = QCYes
+		case "N":
+			qr = QCNo
+		case "M":
+			qr = QCMaybe
+		default:
+			log.Fatalf(`Unexpected quick check value "%s"`, p.String(2))
+		}
+		if got := c.forms[ftype].quickCheck[mode]; got != qr {
+			log.Printf("%U: FAILED %s (was %v need %v)\n", r, qt, got, qr)
+		}
+		c.forms[ftype].verified[mode] = true
+	}
+	if err := p.Err(); err != nil {
+		log.Fatal(err)
+	}
+	// Any unspecified value must be QCYes. Verify this.
+	for i, c := range chars {
+		for j, fd := range c.forms {
+			for k, qr := range fd.quickCheck {
+				if !fd.verified[k] && qr != QCYes {
+					m := "%U: FAIL F:%d M:%d (was %v need Yes) %s\n"
+					log.Printf(m, i, j, k, qr, c.name)
+				}
+			}
+		}
+	}
+}
+
+var testHeader = `const (
+	Yes = iota
+	No
+	Maybe
+)
+
+type formData struct {
+	qc              uint8
+	combinesForward bool
+	decomposition   string
+}
+
+type runeData struct {
+	r      rune
+	ccc    uint8
+	nLead  uint8
+	nTrail uint8
+	f      [2]formData // 0: canonical; 1: compatibility
+}
+
+func f(qc uint8, cf bool, dec string) [2]formData {
+	return [2]formData{{qc, cf, dec}, {qc, cf, dec}}
+}
+
+func g(qc, qck uint8, cf, cfk bool, d, dk string) [2]formData {
+	return [2]formData{{qc, cf, d}, {qck, cfk, dk}}
+}
+
+var testData = []runeData{
+`
+
+func printTestdata() {
+	type lastInfo struct {
+		ccc    uint8
+		nLead  uint8
+		nTrail uint8
+		f      string
+	}
+
+	last := lastInfo{}
+	w := &bytes.Buffer{}
+	fmt.Fprintf(w, testHeader)
+	for r, c := range chars {
+		f := c.forms[FCanonical]
+		qc, cf, d := f.quickCheck[MComposed], f.combinesForward, string(f.expandedDecomp)
+		f = c.forms[FCompatibility]
+		qck, cfk, dk := f.quickCheck[MComposed], f.combinesForward, string(f.expandedDecomp)
+		s := ""
+		if d == dk && qc == qck && cf == cfk {
+			s = fmt.Sprintf("f(%s, %v, %q)", qc, cf, d)
+		} else {
+			s = fmt.Sprintf("g(%s, %s, %v, %v, %q, %q)", qc, qck, cf, cfk, d, dk)
+		}
+		current := lastInfo{c.ccc, c.nLeadingNonStarters, c.nTrailingNonStarters, s}
+		if last != current {
+			fmt.Fprintf(w, "\t{0x%x, %d, %d, %d, %s},\n", r, c.origCCC, c.nLeadingNonStarters, c.nTrailingNonStarters, s)
+			last = current
+		}
+	}
+	fmt.Fprintln(w, "}")
+	gen.WriteGoFile("data_test.go", "norm", w.Bytes())
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/normalize.go b/vendor/golang.org/x/text/unicode/norm/normalize.go
new file mode 100644
index 0000000000..eb5596f86a
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/normalize.go
@@ -0,0 +1,576 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:generate go run maketables.go triegen.go
+//go:generate go run maketables.go triegen.go -test
+
+// Package norm contains types and functions for normalizing Unicode strings.
+package norm // import "golang.org/x/text/unicode/norm"
+
+import "unicode/utf8"
+
+// A Form denotes a canonical representation of Unicode code points.
+// The Unicode-defined normalization and equivalence forms are:
+//
+//   NFC   Unicode Normalization Form C
+//   NFD   Unicode Normalization Form D
+//   NFKC  Unicode Normalization Form KC
+//   NFKD  Unicode Normalization Form KD
+//
+// For a Form f, this documentation uses the notation f(x) to mean
+// the bytes or string x converted to the given form.
+// A position n in x is called a boundary if conversion to the form can
+// proceed independently on both sides:
+//   f(x) == append(f(x[0:n]), f(x[n:])...)
+//
+// References: http://unicode.org/reports/tr15/ and
+// http://unicode.org/notes/tn5/.
+type Form int
+
+const (
+	NFC Form = iota
+	NFD
+	NFKC
+	NFKD
+)
+
+// Bytes returns f(b). May return b if f(b) = b.
+func (f Form) Bytes(b []byte) []byte {
+	src := inputBytes(b)
+	ft := formTable[f]
+	n, ok := ft.quickSpan(src, 0, len(b), true)
+	if ok {
+		return b
+	}
+	out := make([]byte, n, len(b))
+	copy(out, b[0:n])
+	rb := reorderBuffer{f: *ft, src: src, nsrc: len(b), out: out, flushF: appendFlush}
+	return doAppendInner(&rb, n)
+}
+
+// String returns f(s).
+func (f Form) String(s string) string {
+	src := inputString(s)
+	ft := formTable[f]
+	n, ok := ft.quickSpan(src, 0, len(s), true)
+	if ok {
+		return s
+	}
+	out := make([]byte, n, len(s))
+	copy(out, s[0:n])
+	rb := reorderBuffer{f: *ft, src: src, nsrc: len(s), out: out, flushF: appendFlush}
+	return string(doAppendInner(&rb, n))
+}
+
+// IsNormal returns true if b == f(b).
+func (f Form) IsNormal(b []byte) bool {
+	src := inputBytes(b)
+	ft := formTable[f]
+	bp, ok := ft.quickSpan(src, 0, len(b), true)
+	if ok {
+		return true
+	}
+	rb := reorderBuffer{f: *ft, src: src, nsrc: len(b)}
+	rb.setFlusher(nil, cmpNormalBytes)
+	for bp < len(b) {
+		rb.out = b[bp:]
+		if bp = decomposeSegment(&rb, bp, true); bp < 0 {
+			return false
+		}
+		bp, _ = rb.f.quickSpan(rb.src, bp, len(b), true)
+	}
+	return true
+}
+
+func cmpNormalBytes(rb *reorderBuffer) bool {
+	b := rb.out
+	for i := 0; i < rb.nrune; i++ {
+		info := rb.rune[i]
+		if int(info.size) > len(b) {
+			return false
+		}
+		p := info.pos
+		pe := p + info.size
+		for ; p < pe; p++ {
+			if b[0] != rb.byte[p] {
+				return false
+			}
+			b = b[1:]
+		}
+	}
+	return true
+}
+
+// IsNormalString returns true if s == f(s).
+func (f Form) IsNormalString(s string) bool {
+	src := inputString(s)
+	ft := formTable[f]
+	bp, ok := ft.quickSpan(src, 0, len(s), true)
+	if ok {
+		return true
+	}
+	rb := reorderBuffer{f: *ft, src: src, nsrc: len(s)}
+	rb.setFlusher(nil, func(rb *reorderBuffer) bool {
+		for i := 0; i < rb.nrune; i++ {
+			info := rb.rune[i]
+			if bp+int(info.size) > len(s) {
+				return false
+			}
+			p := info.pos
+			pe := p + info.size
+			for ; p < pe; p++ {
+				if s[bp] != rb.byte[p] {
+					return false
+				}
+				bp++
+			}
+		}
+		return true
+	})
+	for bp < len(s) {
+		if bp = decomposeSegment(&rb, bp, true); bp < 0 {
+			return false
+		}
+		bp, _ = rb.f.quickSpan(rb.src, bp, len(s), true)
+	}
+	return true
+}
+
+// patchTail fixes a case where a rune may be incorrectly normalized
+// if it is followed by illegal continuation bytes. It returns the
+// patched buffer and whether the decomposition is still in progress.
+func patchTail(rb *reorderBuffer) bool {
+	info, p := lastRuneStart(&rb.f, rb.out)
+	if p == -1 || info.size == 0 {
+		return true
+	}
+	end := p + int(info.size)
+	extra := len(rb.out) - end
+	if extra > 0 {
+		// Potentially allocating memory. However, this only
+		// happens with ill-formed UTF-8.
+		x := make([]byte, 0)
+		x = append(x, rb.out[len(rb.out)-extra:]...)
+		rb.out = rb.out[:end]
+		decomposeToLastBoundary(rb)
+		rb.doFlush()
+		rb.out = append(rb.out, x...)
+		return false
+	}
+	buf := rb.out[p:]
+	rb.out = rb.out[:p]
+	decomposeToLastBoundary(rb)
+	if s := rb.ss.next(info); s == ssStarter {
+		rb.doFlush()
+		rb.ss.first(info)
+	} else if s == ssOverflow {
+		rb.doFlush()
+		rb.insertCGJ()
+		rb.ss = 0
+	}
+	rb.insertUnsafe(inputBytes(buf), 0, info)
+	return true
+}
+
+func appendQuick(rb *reorderBuffer, i int) int {
+	if rb.nsrc == i {
+		return i
+	}
+	end, _ := rb.f.quickSpan(rb.src, i, rb.nsrc, true)
+	rb.out = rb.src.appendSlice(rb.out, i, end)
+	return end
+}
+
+// Append returns f(append(out, b...)).
+// The buffer out must be nil, empty, or equal to f(out).
+func (f Form) Append(out []byte, src ...byte) []byte {
+	return f.doAppend(out, inputBytes(src), len(src))
+}
+
+func (f Form) doAppend(out []byte, src input, n int) []byte {
+	if n == 0 {
+		return out
+	}
+	ft := formTable[f]
+	// Attempt to do a quickSpan first so we can avoid initializing the reorderBuffer.
+	if len(out) == 0 {
+		p, _ := ft.quickSpan(src, 0, n, true)
+		out = src.appendSlice(out, 0, p)
+		if p == n {
+			return out
+		}
+		rb := reorderBuffer{f: *ft, src: src, nsrc: n, out: out, flushF: appendFlush}
+		return doAppendInner(&rb, p)
+	}
+	rb := reorderBuffer{f: *ft, src: src, nsrc: n}
+	return doAppend(&rb, out, 0)
+}
+
+func doAppend(rb *reorderBuffer, out []byte, p int) []byte {
+	rb.setFlusher(out, appendFlush)
+	src, n := rb.src, rb.nsrc
+	doMerge := len(out) > 0
+	if q := src.skipContinuationBytes(p); q > p {
+		// Move leading non-starters to destination.
+		rb.out = src.appendSlice(rb.out, p, q)
+		p = q
+		doMerge = patchTail(rb)
+	}
+	fd := &rb.f
+	if doMerge {
+		var info Properties
+		if p < n {
+			info = fd.info(src, p)
+			if !info.BoundaryBefore() || info.nLeadingNonStarters() > 0 {
+				if p == 0 {
+					decomposeToLastBoundary(rb)
+				}
+				p = decomposeSegment(rb, p, true)
+			}
+		}
+		if info.size == 0 {
+			rb.doFlush()
+			// Append incomplete UTF-8 encoding.
+			return src.appendSlice(rb.out, p, n)
+		}
+		if rb.nrune > 0 {
+			return doAppendInner(rb, p)
+		}
+	}
+	p = appendQuick(rb, p)
+	return doAppendInner(rb, p)
+}
+
+func doAppendInner(rb *reorderBuffer, p int) []byte {
+	for n := rb.nsrc; p < n; {
+		p = decomposeSegment(rb, p, true)
+		p = appendQuick(rb, p)
+	}
+	return rb.out
+}
+
+// AppendString returns f(append(out, []byte(s))).
+// The buffer out must be nil, empty, or equal to f(out).
+func (f Form) AppendString(out []byte, src string) []byte {
+	return f.doAppend(out, inputString(src), len(src))
+}
+
+// QuickSpan returns a boundary n such that b[0:n] == f(b[0:n]).
+// It is not guaranteed to return the largest such n.
+func (f Form) QuickSpan(b []byte) int {
+	n, _ := formTable[f].quickSpan(inputBytes(b), 0, len(b), true)
+	return n
+}
+
+// quickSpan returns a boundary n such that src[0:n] == f(src[0:n]) and
+// whether any non-normalized parts were found. If atEOF is false, n will
+// not point past the last segment if this segment might be become
+// non-normalized by appending other runes.
+func (f *formInfo) quickSpan(src input, i, end int, atEOF bool) (n int, ok bool) {
+	var lastCC uint8
+	ss := streamSafe(0)
+	lastSegStart := i
+	for n = end; i < n; {
+		if j := src.skipASCII(i, n); i != j {
+			i = j
+			lastSegStart = i - 1
+			lastCC = 0
+			ss = 0
+			continue
+		}
+		info := f.info(src, i)
+		if info.size == 0 {
+			if atEOF {
+				// include incomplete runes
+				return n, true
+			}
+			return lastSegStart, true
+		}
+		// This block needs to be before the next, because it is possible to
+		// have an overflow for runes that are starters (e.g. with U+FF9E).
+		switch ss.next(info) {
+		case ssStarter:
+			ss.first(info)
+			lastSegStart = i
+		case ssOverflow:
+			return lastSegStart, false
+		case ssSuccess:
+			if lastCC > info.ccc {
+				return lastSegStart, false
+			}
+		}
+		if f.composing {
+			if !info.isYesC() {
+				break
+			}
+		} else {
+			if !info.isYesD() {
+				break
+			}
+		}
+		lastCC = info.ccc
+		i += int(info.size)
+	}
+	if i == n {
+		if !atEOF {
+			n = lastSegStart
+		}
+		return n, true
+	}
+	return lastSegStart, false
+}
+
+// QuickSpanString returns a boundary n such that b[0:n] == f(s[0:n]).
+// It is not guaranteed to return the largest such n.
+func (f Form) QuickSpanString(s string) int {
+	n, _ := formTable[f].quickSpan(inputString(s), 0, len(s), true)
+	return n
+}
+
+// FirstBoundary returns the position i of the first boundary in b
+// or -1 if b contains no boundary.
+func (f Form) FirstBoundary(b []byte) int {
+	return f.firstBoundary(inputBytes(b), len(b))
+}
+
+func (f Form) firstBoundary(src input, nsrc int) int {
+	i := src.skipContinuationBytes(0)
+	if i >= nsrc {
+		return -1
+	}
+	fd := formTable[f]
+	ss := streamSafe(0)
+	// We should call ss.first here, but we can't as the first rune is
+	// skipped already. This means FirstBoundary can't really determine
+	// CGJ insertion points correctly. Luckily it doesn't have to.
+	for {
+		info := fd.info(src, i)
+		if info.size == 0 {
+			return -1
+		}
+		if s := ss.next(info); s != ssSuccess {
+			return i
+		}
+		i += int(info.size)
+		if i >= nsrc {
+			if !info.BoundaryAfter() && !ss.isMax() {
+				return -1
+			}
+			return nsrc
+		}
+	}
+}
+
+// FirstBoundaryInString returns the position i of the first boundary in s
+// or -1 if s contains no boundary.
+func (f Form) FirstBoundaryInString(s string) int {
+	return f.firstBoundary(inputString(s), len(s))
+}
+
+// NextBoundary reports the index of the boundary between the first and next
+// segment in b or -1 if atEOF is false and there are not enough bytes to
+// determine this boundary.
+func (f Form) NextBoundary(b []byte, atEOF bool) int {
+	return f.nextBoundary(inputBytes(b), len(b), atEOF)
+}
+
+// NextBoundaryInString reports the index of the boundary between the first and
+// next segment in b or -1 if atEOF is false and there are not enough bytes to
+// determine this boundary.
+func (f Form) NextBoundaryInString(s string, atEOF bool) int {
+	return f.nextBoundary(inputString(s), len(s), atEOF)
+}
+
+func (f Form) nextBoundary(src input, nsrc int, atEOF bool) int {
+	if nsrc == 0 {
+		if atEOF {
+			return 0
+		}
+		return -1
+	}
+	fd := formTable[f]
+	info := fd.info(src, 0)
+	if info.size == 0 {
+		if atEOF {
+			return 1
+		}
+		return -1
+	}
+	ss := streamSafe(0)
+	ss.first(info)
+
+	for i := int(info.size); i < nsrc; i += int(info.size) {
+		info = fd.info(src, i)
+		if info.size == 0 {
+			if atEOF {
+				return i
+			}
+			return -1
+		}
+		if s := ss.next(info); s != ssSuccess {
+			return i
+		}
+	}
+	if !atEOF && !info.BoundaryAfter() && !ss.isMax() {
+		return -1
+	}
+	return nsrc
+}
+
+// LastBoundary returns the position i of the last boundary in b
+// or -1 if b contains no boundary.
+func (f Form) LastBoundary(b []byte) int {
+	return lastBoundary(formTable[f], b)
+}
+
+func lastBoundary(fd *formInfo, b []byte) int {
+	i := len(b)
+	info, p := lastRuneStart(fd, b)
+	if p == -1 {
+		return -1
+	}
+	if info.size == 0 { // ends with incomplete rune
+		if p == 0 { // starts with incomplete rune
+			return -1
+		}
+		i = p
+		info, p = lastRuneStart(fd, b[:i])
+		if p == -1 { // incomplete UTF-8 encoding or non-starter bytes without a starter
+			return i
+		}
+	}
+	if p+int(info.size) != i { // trailing non-starter bytes: illegal UTF-8
+		return i
+	}
+	if info.BoundaryAfter() {
+		return i
+	}
+	ss := streamSafe(0)
+	v := ss.backwards(info)
+	for i = p; i >= 0 && v != ssStarter; i = p {
+		info, p = lastRuneStart(fd, b[:i])
+		if v = ss.backwards(info); v == ssOverflow {
+			break
+		}
+		if p+int(info.size) != i {
+			if p == -1 { // no boundary found
+				return -1
+			}
+			return i // boundary after an illegal UTF-8 encoding
+		}
+	}
+	return i
+}
+
+// decomposeSegment scans the first segment in src into rb. It inserts 0x034f
+// (Grapheme Joiner) when it encounters a sequence of more than 30 non-starters
+// and returns the number of bytes consumed from src or iShortDst or iShortSrc.
+func decomposeSegment(rb *reorderBuffer, sp int, atEOF bool) int {
+	// Force one character to be consumed.
+	info := rb.f.info(rb.src, sp)
+	if info.size == 0 {
+		return 0
+	}
+	if rb.nrune > 0 {
+		if s := rb.ss.next(info); s == ssStarter {
+			goto end
+		} else if s == ssOverflow {
+			rb.insertCGJ()
+			goto end
+		}
+	} else {
+		rb.ss.first(info)
+	}
+	if err := rb.insertFlush(rb.src, sp, info); err != iSuccess {
+		return int(err)
+	}
+	for {
+		sp += int(info.size)
+		if sp >= rb.nsrc {
+			if !atEOF && !info.BoundaryAfter() {
+				return int(iShortSrc)
+			}
+			break
+		}
+		info = rb.f.info(rb.src, sp)
+		if info.size == 0 {
+			if !atEOF {
+				return int(iShortSrc)
+			}
+			break
+		}
+		if s := rb.ss.next(info); s == ssStarter {
+			break
+		} else if s == ssOverflow {
+			rb.insertCGJ()
+			break
+		}
+		if err := rb.insertFlush(rb.src, sp, info); err != iSuccess {
+			return int(err)
+		}
+	}
+end:
+	if !rb.doFlush() {
+		return int(iShortDst)
+	}
+	return sp
+}
+
+// lastRuneStart returns the runeInfo and position of the last
+// rune in buf or the zero runeInfo and -1 if no rune was found.
+func lastRuneStart(fd *formInfo, buf []byte) (Properties, int) {
+	p := len(buf) - 1
+	for ; p >= 0 && !utf8.RuneStart(buf[p]); p-- {
+	}
+	if p < 0 {
+		return Properties{}, -1
+	}
+	return fd.info(inputBytes(buf), p), p
+}
+
+// decomposeToLastBoundary finds an open segment at the end of the buffer
+// and scans it into rb. Returns the buffer minus the last segment.
+func decomposeToLastBoundary(rb *reorderBuffer) {
+	fd := &rb.f
+	info, i := lastRuneStart(fd, rb.out)
+	if int(info.size) != len(rb.out)-i {
+		// illegal trailing continuation bytes
+		return
+	}
+	if info.BoundaryAfter() {
+		return
+	}
+	var add [maxNonStarters + 1]Properties // stores runeInfo in reverse order
+	padd := 0
+	ss := streamSafe(0)
+	p := len(rb.out)
+	for {
+		add[padd] = info
+		v := ss.backwards(info)
+		if v == ssOverflow {
+			// Note that if we have an overflow, it the string we are appending to
+			// is not correctly normalized. In this case the behavior is undefined.
+			break
+		}
+		padd++
+		p -= int(info.size)
+		if v == ssStarter || p < 0 {
+			break
+		}
+		info, i = lastRuneStart(fd, rb.out[:p])
+		if int(info.size) != p-i {
+			break
+		}
+	}
+	rb.ss = ss
+	// Copy bytes for insertion as we may need to overwrite rb.out.
+	var buf [maxBufferSize * utf8.UTFMax]byte
+	cp := buf[:copy(buf[:], rb.out[p:])]
+	rb.out = rb.out[:p]
+	for padd--; padd >= 0; padd-- {
+		info = add[padd]
+		rb.insertUnsafe(inputBytes(cp), 0, info)
+		cp = cp[info.size:]
+	}
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/readwriter.go b/vendor/golang.org/x/text/unicode/norm/readwriter.go
new file mode 100644
index 0000000000..4fa0e04b21
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/readwriter.go
@@ -0,0 +1,126 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package norm
+
+import "io"
+
+type normWriter struct {
+	rb  reorderBuffer
+	w   io.Writer
+	buf []byte
+}
+
+// Write implements the standard write interface.  If the last characters are
+// not at a normalization boundary, the bytes will be buffered for the next
+// write. The remaining bytes will be written on close.
+func (w *normWriter) Write(data []byte) (n int, err error) {
+	// Process data in pieces to keep w.buf size bounded.
+	const chunk = 4000
+
+	for len(data) > 0 {
+		// Normalize into w.buf.
+		m := len(data)
+		if m > chunk {
+			m = chunk
+		}
+		w.rb.src = inputBytes(data[:m])
+		w.rb.nsrc = m
+		w.buf = doAppend(&w.rb, w.buf, 0)
+		data = data[m:]
+		n += m
+
+		// Write out complete prefix, save remainder.
+		// Note that lastBoundary looks back at most 31 runes.
+		i := lastBoundary(&w.rb.f, w.buf)
+		if i == -1 {
+			i = 0
+		}
+		if i > 0 {
+			if _, err = w.w.Write(w.buf[:i]); err != nil {
+				break
+			}
+			bn := copy(w.buf, w.buf[i:])
+			w.buf = w.buf[:bn]
+		}
+	}
+	return n, err
+}
+
+// Close forces data that remains in the buffer to be written.
+func (w *normWriter) Close() error {
+	if len(w.buf) > 0 {
+		_, err := w.w.Write(w.buf)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// Writer returns a new writer that implements Write(b)
+// by writing f(b) to w.  The returned writer may use an
+// an internal buffer to maintain state across Write calls.
+// Calling its Close method writes any buffered data to w.
+func (f Form) Writer(w io.Writer) io.WriteCloser {
+	wr := &normWriter{rb: reorderBuffer{}, w: w}
+	wr.rb.init(f, nil)
+	return wr
+}
+
+type normReader struct {
+	rb           reorderBuffer
+	r            io.Reader
+	inbuf        []byte
+	outbuf       []byte
+	bufStart     int
+	lastBoundary int
+	err          error
+}
+
+// Read implements the standard read interface.
+func (r *normReader) Read(p []byte) (int, error) {
+	for {
+		if r.lastBoundary-r.bufStart > 0 {
+			n := copy(p, r.outbuf[r.bufStart:r.lastBoundary])
+			r.bufStart += n
+			if r.lastBoundary-r.bufStart > 0 {
+				return n, nil
+			}
+			return n, r.err
+		}
+		if r.err != nil {
+			return 0, r.err
+		}
+		outn := copy(r.outbuf, r.outbuf[r.lastBoundary:])
+		r.outbuf = r.outbuf[0:outn]
+		r.bufStart = 0
+
+		n, err := r.r.Read(r.inbuf)
+		r.rb.src = inputBytes(r.inbuf[0:n])
+		r.rb.nsrc, r.err = n, err
+		if n > 0 {
+			r.outbuf = doAppend(&r.rb, r.outbuf, 0)
+		}
+		if err == io.EOF {
+			r.lastBoundary = len(r.outbuf)
+		} else {
+			r.lastBoundary = lastBoundary(&r.rb.f, r.outbuf)
+			if r.lastBoundary == -1 {
+				r.lastBoundary = 0
+			}
+		}
+	}
+	panic("should not reach here")
+}
+
+// Reader returns a new reader that implements Read
+// by reading data from r and returning f(data).
+func (f Form) Reader(r io.Reader) io.Reader {
+	const chunk = 4000
+	buf := make([]byte, chunk)
+	rr := &normReader{rb: reorderBuffer{}, r: r, inbuf: buf}
+	rr.rb.init(f, buf)
+	return rr
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/tables.go b/vendor/golang.org/x/text/unicode/norm/tables.go
new file mode 100644
index 0000000000..a56697b571
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/tables.go
@@ -0,0 +1,7627 @@
+// This file was generated by go generate; DO NOT EDIT
+
+package norm
+
+const (
+	// Version is the Unicode edition from which the tables are derived.
+	Version = "9.0.0"
+
+	// MaxTransformChunkSize indicates the maximum number of bytes that Transform
+	// may need to write atomically for any Form. Making a destination buffer at
+	// least this size ensures that Transform can always make progress and that
+	// the user does not need to grow the buffer on an ErrShortDst.
+	MaxTransformChunkSize = 35 + maxNonStarters*4
+)
+
+var ccc = [55]uint8{
+	0, 1, 7, 8, 9, 10, 11, 12,
+	13, 14, 15, 16, 17, 18, 19, 20,
+	21, 22, 23, 24, 25, 26, 27, 28,
+	29, 30, 31, 32, 33, 34, 35, 36,
+	84, 91, 103, 107, 118, 122, 129, 130,
+	132, 202, 214, 216, 218, 220, 222, 224,
+	226, 228, 230, 232, 233, 234, 240,
+}
+
+const (
+	firstMulti            = 0x186D
+	firstCCC              = 0x2C9E
+	endMulti              = 0x2F60
+	firstLeadingCCC       = 0x4A44
+	firstCCCZeroExcept    = 0x4A5A
+	firstStarterWithNLead = 0x4A81
+	lastDecomp            = 0x4A83
+	maxDecomp             = 0x8000
+)
+
+// decomps: 19075 bytes
+var decomps = [...]byte{
+	// Bytes 0 - 3f
+	0x00, 0x41, 0x20, 0x41, 0x21, 0x41, 0x22, 0x41,
+	0x23, 0x41, 0x24, 0x41, 0x25, 0x41, 0x26, 0x41,
+	0x27, 0x41, 0x28, 0x41, 0x29, 0x41, 0x2A, 0x41,
+	0x2B, 0x41, 0x2C, 0x41, 0x2D, 0x41, 0x2E, 0x41,
+	0x2F, 0x41, 0x30, 0x41, 0x31, 0x41, 0x32, 0x41,
+	0x33, 0x41, 0x34, 0x41, 0x35, 0x41, 0x36, 0x41,
+	0x37, 0x41, 0x38, 0x41, 0x39, 0x41, 0x3A, 0x41,
+	0x3B, 0x41, 0x3C, 0x41, 0x3D, 0x41, 0x3E, 0x41,
+	// Bytes 40 - 7f
+	0x3F, 0x41, 0x40, 0x41, 0x41, 0x41, 0x42, 0x41,
+	0x43, 0x41, 0x44, 0x41, 0x45, 0x41, 0x46, 0x41,
+	0x47, 0x41, 0x48, 0x41, 0x49, 0x41, 0x4A, 0x41,
+	0x4B, 0x41, 0x4C, 0x41, 0x4D, 0x41, 0x4E, 0x41,
+	0x4F, 0x41, 0x50, 0x41, 0x51, 0x41, 0x52, 0x41,
+	0x53, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41,
+	0x57, 0x41, 0x58, 0x41, 0x59, 0x41, 0x5A, 0x41,
+	0x5B, 0x41, 0x5C, 0x41, 0x5D, 0x41, 0x5E, 0x41,
+	// Bytes 80 - bf
+	0x5F, 0x41, 0x60, 0x41, 0x61, 0x41, 0x62, 0x41,
+	0x63, 0x41, 0x64, 0x41, 0x65, 0x41, 0x66, 0x41,
+	0x67, 0x41, 0x68, 0x41, 0x69, 0x41, 0x6A, 0x41,
+	0x6B, 0x41, 0x6C, 0x41, 0x6D, 0x41, 0x6E, 0x41,
+	0x6F, 0x41, 0x70, 0x41, 0x71, 0x41, 0x72, 0x41,
+	0x73, 0x41, 0x74, 0x41, 0x75, 0x41, 0x76, 0x41,
+	0x77, 0x41, 0x78, 0x41, 0x79, 0x41, 0x7A, 0x41,
+	0x7B, 0x41, 0x7C, 0x41, 0x7D, 0x41, 0x7E, 0x42,
+	// Bytes c0 - ff
+	0xC2, 0xA2, 0x42, 0xC2, 0xA3, 0x42, 0xC2, 0xA5,
+	0x42, 0xC2, 0xA6, 0x42, 0xC2, 0xAC, 0x42, 0xC2,
+	0xB7, 0x42, 0xC3, 0x86, 0x42, 0xC3, 0xB0, 0x42,
+	0xC4, 0xA6, 0x42, 0xC4, 0xA7, 0x42, 0xC4, 0xB1,
+	0x42, 0xC5, 0x8B, 0x42, 0xC5, 0x93, 0x42, 0xC6,
+	0x8E, 0x42, 0xC6, 0x90, 0x42, 0xC6, 0xAB, 0x42,
+	0xC8, 0xA2, 0x42, 0xC8, 0xB7, 0x42, 0xC9, 0x90,
+	0x42, 0xC9, 0x91, 0x42, 0xC9, 0x92, 0x42, 0xC9,
+	// Bytes 100 - 13f
+	0x94, 0x42, 0xC9, 0x95, 0x42, 0xC9, 0x99, 0x42,
+	0xC9, 0x9B, 0x42, 0xC9, 0x9C, 0x42, 0xC9, 0x9F,
+	0x42, 0xC9, 0xA1, 0x42, 0xC9, 0xA3, 0x42, 0xC9,
+	0xA5, 0x42, 0xC9, 0xA6, 0x42, 0xC9, 0xA8, 0x42,
+	0xC9, 0xA9, 0x42, 0xC9, 0xAA, 0x42, 0xC9, 0xAB,
+	0x42, 0xC9, 0xAD, 0x42, 0xC9, 0xAF, 0x42, 0xC9,
+	0xB0, 0x42, 0xC9, 0xB1, 0x42, 0xC9, 0xB2, 0x42,
+	0xC9, 0xB3, 0x42, 0xC9, 0xB4, 0x42, 0xC9, 0xB5,
+	// Bytes 140 - 17f
+	0x42, 0xC9, 0xB8, 0x42, 0xC9, 0xB9, 0x42, 0xC9,
+	0xBB, 0x42, 0xCA, 0x81, 0x42, 0xCA, 0x82, 0x42,
+	0xCA, 0x83, 0x42, 0xCA, 0x89, 0x42, 0xCA, 0x8A,
+	0x42, 0xCA, 0x8B, 0x42, 0xCA, 0x8C, 0x42, 0xCA,
+	0x90, 0x42, 0xCA, 0x91, 0x42, 0xCA, 0x92, 0x42,
+	0xCA, 0x95, 0x42, 0xCA, 0x9D, 0x42, 0xCA, 0x9F,
+	0x42, 0xCA, 0xB9, 0x42, 0xCE, 0x91, 0x42, 0xCE,
+	0x92, 0x42, 0xCE, 0x93, 0x42, 0xCE, 0x94, 0x42,
+	// Bytes 180 - 1bf
+	0xCE, 0x95, 0x42, 0xCE, 0x96, 0x42, 0xCE, 0x97,
+	0x42, 0xCE, 0x98, 0x42, 0xCE, 0x99, 0x42, 0xCE,
+	0x9A, 0x42, 0xCE, 0x9B, 0x42, 0xCE, 0x9C, 0x42,
+	0xCE, 0x9D, 0x42, 0xCE, 0x9E, 0x42, 0xCE, 0x9F,
+	0x42, 0xCE, 0xA0, 0x42, 0xCE, 0xA1, 0x42, 0xCE,
+	0xA3, 0x42, 0xCE, 0xA4, 0x42, 0xCE, 0xA5, 0x42,
+	0xCE, 0xA6, 0x42, 0xCE, 0xA7, 0x42, 0xCE, 0xA8,
+	0x42, 0xCE, 0xA9, 0x42, 0xCE, 0xB1, 0x42, 0xCE,
+	// Bytes 1c0 - 1ff
+	0xB2, 0x42, 0xCE, 0xB3, 0x42, 0xCE, 0xB4, 0x42,
+	0xCE, 0xB5, 0x42, 0xCE, 0xB6, 0x42, 0xCE, 0xB7,
+	0x42, 0xCE, 0xB8, 0x42, 0xCE, 0xB9, 0x42, 0xCE,
+	0xBA, 0x42, 0xCE, 0xBB, 0x42, 0xCE, 0xBC, 0x42,
+	0xCE, 0xBD, 0x42, 0xCE, 0xBE, 0x42, 0xCE, 0xBF,
+	0x42, 0xCF, 0x80, 0x42, 0xCF, 0x81, 0x42, 0xCF,
+	0x82, 0x42, 0xCF, 0x83, 0x42, 0xCF, 0x84, 0x42,
+	0xCF, 0x85, 0x42, 0xCF, 0x86, 0x42, 0xCF, 0x87,
+	// Bytes 200 - 23f
+	0x42, 0xCF, 0x88, 0x42, 0xCF, 0x89, 0x42, 0xCF,
+	0x9C, 0x42, 0xCF, 0x9D, 0x42, 0xD0, 0xBD, 0x42,
+	0xD1, 0x8A, 0x42, 0xD1, 0x8C, 0x42, 0xD7, 0x90,
+	0x42, 0xD7, 0x91, 0x42, 0xD7, 0x92, 0x42, 0xD7,
+	0x93, 0x42, 0xD7, 0x94, 0x42, 0xD7, 0x9B, 0x42,
+	0xD7, 0x9C, 0x42, 0xD7, 0x9D, 0x42, 0xD7, 0xA2,
+	0x42, 0xD7, 0xA8, 0x42, 0xD7, 0xAA, 0x42, 0xD8,
+	0xA1, 0x42, 0xD8, 0xA7, 0x42, 0xD8, 0xA8, 0x42,
+	// Bytes 240 - 27f
+	0xD8, 0xA9, 0x42, 0xD8, 0xAA, 0x42, 0xD8, 0xAB,
+	0x42, 0xD8, 0xAC, 0x42, 0xD8, 0xAD, 0x42, 0xD8,
+	0xAE, 0x42, 0xD8, 0xAF, 0x42, 0xD8, 0xB0, 0x42,
+	0xD8, 0xB1, 0x42, 0xD8, 0xB2, 0x42, 0xD8, 0xB3,
+	0x42, 0xD8, 0xB4, 0x42, 0xD8, 0xB5, 0x42, 0xD8,
+	0xB6, 0x42, 0xD8, 0xB7, 0x42, 0xD8, 0xB8, 0x42,
+	0xD8, 0xB9, 0x42, 0xD8, 0xBA, 0x42, 0xD9, 0x81,
+	0x42, 0xD9, 0x82, 0x42, 0xD9, 0x83, 0x42, 0xD9,
+	// Bytes 280 - 2bf
+	0x84, 0x42, 0xD9, 0x85, 0x42, 0xD9, 0x86, 0x42,
+	0xD9, 0x87, 0x42, 0xD9, 0x88, 0x42, 0xD9, 0x89,
+	0x42, 0xD9, 0x8A, 0x42, 0xD9, 0xAE, 0x42, 0xD9,
+	0xAF, 0x42, 0xD9, 0xB1, 0x42, 0xD9, 0xB9, 0x42,
+	0xD9, 0xBA, 0x42, 0xD9, 0xBB, 0x42, 0xD9, 0xBE,
+	0x42, 0xD9, 0xBF, 0x42, 0xDA, 0x80, 0x42, 0xDA,
+	0x83, 0x42, 0xDA, 0x84, 0x42, 0xDA, 0x86, 0x42,
+	0xDA, 0x87, 0x42, 0xDA, 0x88, 0x42, 0xDA, 0x8C,
+	// Bytes 2c0 - 2ff
+	0x42, 0xDA, 0x8D, 0x42, 0xDA, 0x8E, 0x42, 0xDA,
+	0x91, 0x42, 0xDA, 0x98, 0x42, 0xDA, 0xA1, 0x42,
+	0xDA, 0xA4, 0x42, 0xDA, 0xA6, 0x42, 0xDA, 0xA9,
+	0x42, 0xDA, 0xAD, 0x42, 0xDA, 0xAF, 0x42, 0xDA,
+	0xB1, 0x42, 0xDA, 0xB3, 0x42, 0xDA, 0xBA, 0x42,
+	0xDA, 0xBB, 0x42, 0xDA, 0xBE, 0x42, 0xDB, 0x81,
+	0x42, 0xDB, 0x85, 0x42, 0xDB, 0x86, 0x42, 0xDB,
+	0x87, 0x42, 0xDB, 0x88, 0x42, 0xDB, 0x89, 0x42,
+	// Bytes 300 - 33f
+	0xDB, 0x8B, 0x42, 0xDB, 0x8C, 0x42, 0xDB, 0x90,
+	0x42, 0xDB, 0x92, 0x43, 0xE0, 0xBC, 0x8B, 0x43,
+	0xE1, 0x83, 0x9C, 0x43, 0xE1, 0x84, 0x80, 0x43,
+	0xE1, 0x84, 0x81, 0x43, 0xE1, 0x84, 0x82, 0x43,
+	0xE1, 0x84, 0x83, 0x43, 0xE1, 0x84, 0x84, 0x43,
+	0xE1, 0x84, 0x85, 0x43, 0xE1, 0x84, 0x86, 0x43,
+	0xE1, 0x84, 0x87, 0x43, 0xE1, 0x84, 0x88, 0x43,
+	0xE1, 0x84, 0x89, 0x43, 0xE1, 0x84, 0x8A, 0x43,
+	// Bytes 340 - 37f
+	0xE1, 0x84, 0x8B, 0x43, 0xE1, 0x84, 0x8C, 0x43,
+	0xE1, 0x84, 0x8D, 0x43, 0xE1, 0x84, 0x8E, 0x43,
+	0xE1, 0x84, 0x8F, 0x43, 0xE1, 0x84, 0x90, 0x43,
+	0xE1, 0x84, 0x91, 0x43, 0xE1, 0x84, 0x92, 0x43,
+	0xE1, 0x84, 0x94, 0x43, 0xE1, 0x84, 0x95, 0x43,
+	0xE1, 0x84, 0x9A, 0x43, 0xE1, 0x84, 0x9C, 0x43,
+	0xE1, 0x84, 0x9D, 0x43, 0xE1, 0x84, 0x9E, 0x43,
+	0xE1, 0x84, 0xA0, 0x43, 0xE1, 0x84, 0xA1, 0x43,
+	// Bytes 380 - 3bf
+	0xE1, 0x84, 0xA2, 0x43, 0xE1, 0x84, 0xA3, 0x43,
+	0xE1, 0x84, 0xA7, 0x43, 0xE1, 0x84, 0xA9, 0x43,
+	0xE1, 0x84, 0xAB, 0x43, 0xE1, 0x84, 0xAC, 0x43,
+	0xE1, 0x84, 0xAD, 0x43, 0xE1, 0x84, 0xAE, 0x43,
+	0xE1, 0x84, 0xAF, 0x43, 0xE1, 0x84, 0xB2, 0x43,
+	0xE1, 0x84, 0xB6, 0x43, 0xE1, 0x85, 0x80, 0x43,
+	0xE1, 0x85, 0x87, 0x43, 0xE1, 0x85, 0x8C, 0x43,
+	0xE1, 0x85, 0x97, 0x43, 0xE1, 0x85, 0x98, 0x43,
+	// Bytes 3c0 - 3ff
+	0xE1, 0x85, 0x99, 0x43, 0xE1, 0x85, 0xA0, 0x43,
+	0xE1, 0x86, 0x84, 0x43, 0xE1, 0x86, 0x85, 0x43,
+	0xE1, 0x86, 0x88, 0x43, 0xE1, 0x86, 0x91, 0x43,
+	0xE1, 0x86, 0x92, 0x43, 0xE1, 0x86, 0x94, 0x43,
+	0xE1, 0x86, 0x9E, 0x43, 0xE1, 0x86, 0xA1, 0x43,
+	0xE1, 0x87, 0x87, 0x43, 0xE1, 0x87, 0x88, 0x43,
+	0xE1, 0x87, 0x8C, 0x43, 0xE1, 0x87, 0x8E, 0x43,
+	0xE1, 0x87, 0x93, 0x43, 0xE1, 0x87, 0x97, 0x43,
+	// Bytes 400 - 43f
+	0xE1, 0x87, 0x99, 0x43, 0xE1, 0x87, 0x9D, 0x43,
+	0xE1, 0x87, 0x9F, 0x43, 0xE1, 0x87, 0xB1, 0x43,
+	0xE1, 0x87, 0xB2, 0x43, 0xE1, 0xB4, 0x82, 0x43,
+	0xE1, 0xB4, 0x96, 0x43, 0xE1, 0xB4, 0x97, 0x43,
+	0xE1, 0xB4, 0x9C, 0x43, 0xE1, 0xB4, 0x9D, 0x43,
+	0xE1, 0xB4, 0xA5, 0x43, 0xE1, 0xB5, 0xBB, 0x43,
+	0xE1, 0xB6, 0x85, 0x43, 0xE2, 0x80, 0x82, 0x43,
+	0xE2, 0x80, 0x83, 0x43, 0xE2, 0x80, 0x90, 0x43,
+	// Bytes 440 - 47f
+	0xE2, 0x80, 0x93, 0x43, 0xE2, 0x80, 0x94, 0x43,
+	0xE2, 0x82, 0xA9, 0x43, 0xE2, 0x86, 0x90, 0x43,
+	0xE2, 0x86, 0x91, 0x43, 0xE2, 0x86, 0x92, 0x43,
+	0xE2, 0x86, 0x93, 0x43, 0xE2, 0x88, 0x82, 0x43,
+	0xE2, 0x88, 0x87, 0x43, 0xE2, 0x88, 0x91, 0x43,
+	0xE2, 0x88, 0x92, 0x43, 0xE2, 0x94, 0x82, 0x43,
+	0xE2, 0x96, 0xA0, 0x43, 0xE2, 0x97, 0x8B, 0x43,
+	0xE2, 0xA6, 0x85, 0x43, 0xE2, 0xA6, 0x86, 0x43,
+	// Bytes 480 - 4bf
+	0xE2, 0xB5, 0xA1, 0x43, 0xE3, 0x80, 0x81, 0x43,
+	0xE3, 0x80, 0x82, 0x43, 0xE3, 0x80, 0x88, 0x43,
+	0xE3, 0x80, 0x89, 0x43, 0xE3, 0x80, 0x8A, 0x43,
+	0xE3, 0x80, 0x8B, 0x43, 0xE3, 0x80, 0x8C, 0x43,
+	0xE3, 0x80, 0x8D, 0x43, 0xE3, 0x80, 0x8E, 0x43,
+	0xE3, 0x80, 0x8F, 0x43, 0xE3, 0x80, 0x90, 0x43,
+	0xE3, 0x80, 0x91, 0x43, 0xE3, 0x80, 0x92, 0x43,
+	0xE3, 0x80, 0x94, 0x43, 0xE3, 0x80, 0x95, 0x43,
+	// Bytes 4c0 - 4ff
+	0xE3, 0x80, 0x96, 0x43, 0xE3, 0x80, 0x97, 0x43,
+	0xE3, 0x82, 0xA1, 0x43, 0xE3, 0x82, 0xA2, 0x43,
+	0xE3, 0x82, 0xA3, 0x43, 0xE3, 0x82, 0xA4, 0x43,
+	0xE3, 0x82, 0xA5, 0x43, 0xE3, 0x82, 0xA6, 0x43,
+	0xE3, 0x82, 0xA7, 0x43, 0xE3, 0x82, 0xA8, 0x43,
+	0xE3, 0x82, 0xA9, 0x43, 0xE3, 0x82, 0xAA, 0x43,
+	0xE3, 0x82, 0xAB, 0x43, 0xE3, 0x82, 0xAD, 0x43,
+	0xE3, 0x82, 0xAF, 0x43, 0xE3, 0x82, 0xB1, 0x43,
+	// Bytes 500 - 53f
+	0xE3, 0x82, 0xB3, 0x43, 0xE3, 0x82, 0xB5, 0x43,
+	0xE3, 0x82, 0xB7, 0x43, 0xE3, 0x82, 0xB9, 0x43,
+	0xE3, 0x82, 0xBB, 0x43, 0xE3, 0x82, 0xBD, 0x43,
+	0xE3, 0x82, 0xBF, 0x43, 0xE3, 0x83, 0x81, 0x43,
+	0xE3, 0x83, 0x83, 0x43, 0xE3, 0x83, 0x84, 0x43,
+	0xE3, 0x83, 0x86, 0x43, 0xE3, 0x83, 0x88, 0x43,
+	0xE3, 0x83, 0x8A, 0x43, 0xE3, 0x83, 0x8B, 0x43,
+	0xE3, 0x83, 0x8C, 0x43, 0xE3, 0x83, 0x8D, 0x43,
+	// Bytes 540 - 57f
+	0xE3, 0x83, 0x8E, 0x43, 0xE3, 0x83, 0x8F, 0x43,
+	0xE3, 0x83, 0x92, 0x43, 0xE3, 0x83, 0x95, 0x43,
+	0xE3, 0x83, 0x98, 0x43, 0xE3, 0x83, 0x9B, 0x43,
+	0xE3, 0x83, 0x9E, 0x43, 0xE3, 0x83, 0x9F, 0x43,
+	0xE3, 0x83, 0xA0, 0x43, 0xE3, 0x83, 0xA1, 0x43,
+	0xE3, 0x83, 0xA2, 0x43, 0xE3, 0x83, 0xA3, 0x43,
+	0xE3, 0x83, 0xA4, 0x43, 0xE3, 0x83, 0xA5, 0x43,
+	0xE3, 0x83, 0xA6, 0x43, 0xE3, 0x83, 0xA7, 0x43,
+	// Bytes 580 - 5bf
+	0xE3, 0x83, 0xA8, 0x43, 0xE3, 0x83, 0xA9, 0x43,
+	0xE3, 0x83, 0xAA, 0x43, 0xE3, 0x83, 0xAB, 0x43,
+	0xE3, 0x83, 0xAC, 0x43, 0xE3, 0x83, 0xAD, 0x43,
+	0xE3, 0x83, 0xAF, 0x43, 0xE3, 0x83, 0xB0, 0x43,
+	0xE3, 0x83, 0xB1, 0x43, 0xE3, 0x83, 0xB2, 0x43,
+	0xE3, 0x83, 0xB3, 0x43, 0xE3, 0x83, 0xBB, 0x43,
+	0xE3, 0x83, 0xBC, 0x43, 0xE3, 0x92, 0x9E, 0x43,
+	0xE3, 0x92, 0xB9, 0x43, 0xE3, 0x92, 0xBB, 0x43,
+	// Bytes 5c0 - 5ff
+	0xE3, 0x93, 0x9F, 0x43, 0xE3, 0x94, 0x95, 0x43,
+	0xE3, 0x9B, 0xAE, 0x43, 0xE3, 0x9B, 0xBC, 0x43,
+	0xE3, 0x9E, 0x81, 0x43, 0xE3, 0xA0, 0xAF, 0x43,
+	0xE3, 0xA1, 0xA2, 0x43, 0xE3, 0xA1, 0xBC, 0x43,
+	0xE3, 0xA3, 0x87, 0x43, 0xE3, 0xA3, 0xA3, 0x43,
+	0xE3, 0xA4, 0x9C, 0x43, 0xE3, 0xA4, 0xBA, 0x43,
+	0xE3, 0xA8, 0xAE, 0x43, 0xE3, 0xA9, 0xAC, 0x43,
+	0xE3, 0xAB, 0xA4, 0x43, 0xE3, 0xAC, 0x88, 0x43,
+	// Bytes 600 - 63f
+	0xE3, 0xAC, 0x99, 0x43, 0xE3, 0xAD, 0x89, 0x43,
+	0xE3, 0xAE, 0x9D, 0x43, 0xE3, 0xB0, 0x98, 0x43,
+	0xE3, 0xB1, 0x8E, 0x43, 0xE3, 0xB4, 0xB3, 0x43,
+	0xE3, 0xB6, 0x96, 0x43, 0xE3, 0xBA, 0xAC, 0x43,
+	0xE3, 0xBA, 0xB8, 0x43, 0xE3, 0xBC, 0x9B, 0x43,
+	0xE3, 0xBF, 0xBC, 0x43, 0xE4, 0x80, 0x88, 0x43,
+	0xE4, 0x80, 0x98, 0x43, 0xE4, 0x80, 0xB9, 0x43,
+	0xE4, 0x81, 0x86, 0x43, 0xE4, 0x82, 0x96, 0x43,
+	// Bytes 640 - 67f
+	0xE4, 0x83, 0xA3, 0x43, 0xE4, 0x84, 0xAF, 0x43,
+	0xE4, 0x88, 0x82, 0x43, 0xE4, 0x88, 0xA7, 0x43,
+	0xE4, 0x8A, 0xA0, 0x43, 0xE4, 0x8C, 0x81, 0x43,
+	0xE4, 0x8C, 0xB4, 0x43, 0xE4, 0x8D, 0x99, 0x43,
+	0xE4, 0x8F, 0x95, 0x43, 0xE4, 0x8F, 0x99, 0x43,
+	0xE4, 0x90, 0x8B, 0x43, 0xE4, 0x91, 0xAB, 0x43,
+	0xE4, 0x94, 0xAB, 0x43, 0xE4, 0x95, 0x9D, 0x43,
+	0xE4, 0x95, 0xA1, 0x43, 0xE4, 0x95, 0xAB, 0x43,
+	// Bytes 680 - 6bf
+	0xE4, 0x97, 0x97, 0x43, 0xE4, 0x97, 0xB9, 0x43,
+	0xE4, 0x98, 0xB5, 0x43, 0xE4, 0x9A, 0xBE, 0x43,
+	0xE4, 0x9B, 0x87, 0x43, 0xE4, 0xA6, 0x95, 0x43,
+	0xE4, 0xA7, 0xA6, 0x43, 0xE4, 0xA9, 0xAE, 0x43,
+	0xE4, 0xA9, 0xB6, 0x43, 0xE4, 0xAA, 0xB2, 0x43,
+	0xE4, 0xAC, 0xB3, 0x43, 0xE4, 0xAF, 0x8E, 0x43,
+	0xE4, 0xB3, 0x8E, 0x43, 0xE4, 0xB3, 0xAD, 0x43,
+	0xE4, 0xB3, 0xB8, 0x43, 0xE4, 0xB5, 0x96, 0x43,
+	// Bytes 6c0 - 6ff
+	0xE4, 0xB8, 0x80, 0x43, 0xE4, 0xB8, 0x81, 0x43,
+	0xE4, 0xB8, 0x83, 0x43, 0xE4, 0xB8, 0x89, 0x43,
+	0xE4, 0xB8, 0x8A, 0x43, 0xE4, 0xB8, 0x8B, 0x43,
+	0xE4, 0xB8, 0x8D, 0x43, 0xE4, 0xB8, 0x99, 0x43,
+	0xE4, 0xB8, 0xA6, 0x43, 0xE4, 0xB8, 0xA8, 0x43,
+	0xE4, 0xB8, 0xAD, 0x43, 0xE4, 0xB8, 0xB2, 0x43,
+	0xE4, 0xB8, 0xB6, 0x43, 0xE4, 0xB8, 0xB8, 0x43,
+	0xE4, 0xB8, 0xB9, 0x43, 0xE4, 0xB8, 0xBD, 0x43,
+	// Bytes 700 - 73f
+	0xE4, 0xB8, 0xBF, 0x43, 0xE4, 0xB9, 0x81, 0x43,
+	0xE4, 0xB9, 0x99, 0x43, 0xE4, 0xB9, 0x9D, 0x43,
+	0xE4, 0xBA, 0x82, 0x43, 0xE4, 0xBA, 0x85, 0x43,
+	0xE4, 0xBA, 0x86, 0x43, 0xE4, 0xBA, 0x8C, 0x43,
+	0xE4, 0xBA, 0x94, 0x43, 0xE4, 0xBA, 0xA0, 0x43,
+	0xE4, 0xBA, 0xA4, 0x43, 0xE4, 0xBA, 0xAE, 0x43,
+	0xE4, 0xBA, 0xBA, 0x43, 0xE4, 0xBB, 0x80, 0x43,
+	0xE4, 0xBB, 0x8C, 0x43, 0xE4, 0xBB, 0xA4, 0x43,
+	// Bytes 740 - 77f
+	0xE4, 0xBC, 0x81, 0x43, 0xE4, 0xBC, 0x91, 0x43,
+	0xE4, 0xBD, 0xA0, 0x43, 0xE4, 0xBE, 0x80, 0x43,
+	0xE4, 0xBE, 0x86, 0x43, 0xE4, 0xBE, 0x8B, 0x43,
+	0xE4, 0xBE, 0xAE, 0x43, 0xE4, 0xBE, 0xBB, 0x43,
+	0xE4, 0xBE, 0xBF, 0x43, 0xE5, 0x80, 0x82, 0x43,
+	0xE5, 0x80, 0xAB, 0x43, 0xE5, 0x81, 0xBA, 0x43,
+	0xE5, 0x82, 0x99, 0x43, 0xE5, 0x83, 0x8F, 0x43,
+	0xE5, 0x83, 0x9A, 0x43, 0xE5, 0x83, 0xA7, 0x43,
+	// Bytes 780 - 7bf
+	0xE5, 0x84, 0xAA, 0x43, 0xE5, 0x84, 0xBF, 0x43,
+	0xE5, 0x85, 0x80, 0x43, 0xE5, 0x85, 0x85, 0x43,
+	0xE5, 0x85, 0x8D, 0x43, 0xE5, 0x85, 0x94, 0x43,
+	0xE5, 0x85, 0xA4, 0x43, 0xE5, 0x85, 0xA5, 0x43,
+	0xE5, 0x85, 0xA7, 0x43, 0xE5, 0x85, 0xA8, 0x43,
+	0xE5, 0x85, 0xA9, 0x43, 0xE5, 0x85, 0xAB, 0x43,
+	0xE5, 0x85, 0xAD, 0x43, 0xE5, 0x85, 0xB7, 0x43,
+	0xE5, 0x86, 0x80, 0x43, 0xE5, 0x86, 0x82, 0x43,
+	// Bytes 7c0 - 7ff
+	0xE5, 0x86, 0x8D, 0x43, 0xE5, 0x86, 0x92, 0x43,
+	0xE5, 0x86, 0x95, 0x43, 0xE5, 0x86, 0x96, 0x43,
+	0xE5, 0x86, 0x97, 0x43, 0xE5, 0x86, 0x99, 0x43,
+	0xE5, 0x86, 0xA4, 0x43, 0xE5, 0x86, 0xAB, 0x43,
+	0xE5, 0x86, 0xAC, 0x43, 0xE5, 0x86, 0xB5, 0x43,
+	0xE5, 0x86, 0xB7, 0x43, 0xE5, 0x87, 0x89, 0x43,
+	0xE5, 0x87, 0x8C, 0x43, 0xE5, 0x87, 0x9C, 0x43,
+	0xE5, 0x87, 0x9E, 0x43, 0xE5, 0x87, 0xA0, 0x43,
+	// Bytes 800 - 83f
+	0xE5, 0x87, 0xB5, 0x43, 0xE5, 0x88, 0x80, 0x43,
+	0xE5, 0x88, 0x83, 0x43, 0xE5, 0x88, 0x87, 0x43,
+	0xE5, 0x88, 0x97, 0x43, 0xE5, 0x88, 0x9D, 0x43,
+	0xE5, 0x88, 0xA9, 0x43, 0xE5, 0x88, 0xBA, 0x43,
+	0xE5, 0x88, 0xBB, 0x43, 0xE5, 0x89, 0x86, 0x43,
+	0xE5, 0x89, 0x8D, 0x43, 0xE5, 0x89, 0xB2, 0x43,
+	0xE5, 0x89, 0xB7, 0x43, 0xE5, 0x8A, 0x89, 0x43,
+	0xE5, 0x8A, 0x9B, 0x43, 0xE5, 0x8A, 0xA3, 0x43,
+	// Bytes 840 - 87f
+	0xE5, 0x8A, 0xB3, 0x43, 0xE5, 0x8A, 0xB4, 0x43,
+	0xE5, 0x8B, 0x87, 0x43, 0xE5, 0x8B, 0x89, 0x43,
+	0xE5, 0x8B, 0x92, 0x43, 0xE5, 0x8B, 0x9E, 0x43,
+	0xE5, 0x8B, 0xA4, 0x43, 0xE5, 0x8B, 0xB5, 0x43,
+	0xE5, 0x8B, 0xB9, 0x43, 0xE5, 0x8B, 0xBA, 0x43,
+	0xE5, 0x8C, 0x85, 0x43, 0xE5, 0x8C, 0x86, 0x43,
+	0xE5, 0x8C, 0x95, 0x43, 0xE5, 0x8C, 0x97, 0x43,
+	0xE5, 0x8C, 0x9A, 0x43, 0xE5, 0x8C, 0xB8, 0x43,
+	// Bytes 880 - 8bf
+	0xE5, 0x8C, 0xBB, 0x43, 0xE5, 0x8C, 0xBF, 0x43,
+	0xE5, 0x8D, 0x81, 0x43, 0xE5, 0x8D, 0x84, 0x43,
+	0xE5, 0x8D, 0x85, 0x43, 0xE5, 0x8D, 0x89, 0x43,
+	0xE5, 0x8D, 0x91, 0x43, 0xE5, 0x8D, 0x94, 0x43,
+	0xE5, 0x8D, 0x9A, 0x43, 0xE5, 0x8D, 0x9C, 0x43,
+	0xE5, 0x8D, 0xA9, 0x43, 0xE5, 0x8D, 0xB0, 0x43,
+	0xE5, 0x8D, 0xB3, 0x43, 0xE5, 0x8D, 0xB5, 0x43,
+	0xE5, 0x8D, 0xBD, 0x43, 0xE5, 0x8D, 0xBF, 0x43,
+	// Bytes 8c0 - 8ff
+	0xE5, 0x8E, 0x82, 0x43, 0xE5, 0x8E, 0xB6, 0x43,
+	0xE5, 0x8F, 0x83, 0x43, 0xE5, 0x8F, 0x88, 0x43,
+	0xE5, 0x8F, 0x8A, 0x43, 0xE5, 0x8F, 0x8C, 0x43,
+	0xE5, 0x8F, 0x9F, 0x43, 0xE5, 0x8F, 0xA3, 0x43,
+	0xE5, 0x8F, 0xA5, 0x43, 0xE5, 0x8F, 0xAB, 0x43,
+	0xE5, 0x8F, 0xAF, 0x43, 0xE5, 0x8F, 0xB1, 0x43,
+	0xE5, 0x8F, 0xB3, 0x43, 0xE5, 0x90, 0x86, 0x43,
+	0xE5, 0x90, 0x88, 0x43, 0xE5, 0x90, 0x8D, 0x43,
+	// Bytes 900 - 93f
+	0xE5, 0x90, 0x8F, 0x43, 0xE5, 0x90, 0x9D, 0x43,
+	0xE5, 0x90, 0xB8, 0x43, 0xE5, 0x90, 0xB9, 0x43,
+	0xE5, 0x91, 0x82, 0x43, 0xE5, 0x91, 0x88, 0x43,
+	0xE5, 0x91, 0xA8, 0x43, 0xE5, 0x92, 0x9E, 0x43,
+	0xE5, 0x92, 0xA2, 0x43, 0xE5, 0x92, 0xBD, 0x43,
+	0xE5, 0x93, 0xB6, 0x43, 0xE5, 0x94, 0x90, 0x43,
+	0xE5, 0x95, 0x8F, 0x43, 0xE5, 0x95, 0x93, 0x43,
+	0xE5, 0x95, 0x95, 0x43, 0xE5, 0x95, 0xA3, 0x43,
+	// Bytes 940 - 97f
+	0xE5, 0x96, 0x84, 0x43, 0xE5, 0x96, 0x87, 0x43,
+	0xE5, 0x96, 0x99, 0x43, 0xE5, 0x96, 0x9D, 0x43,
+	0xE5, 0x96, 0xAB, 0x43, 0xE5, 0x96, 0xB3, 0x43,
+	0xE5, 0x96, 0xB6, 0x43, 0xE5, 0x97, 0x80, 0x43,
+	0xE5, 0x97, 0x82, 0x43, 0xE5, 0x97, 0xA2, 0x43,
+	0xE5, 0x98, 0x86, 0x43, 0xE5, 0x99, 0x91, 0x43,
+	0xE5, 0x99, 0xA8, 0x43, 0xE5, 0x99, 0xB4, 0x43,
+	0xE5, 0x9B, 0x97, 0x43, 0xE5, 0x9B, 0x9B, 0x43,
+	// Bytes 980 - 9bf
+	0xE5, 0x9B, 0xB9, 0x43, 0xE5, 0x9C, 0x96, 0x43,
+	0xE5, 0x9C, 0x97, 0x43, 0xE5, 0x9C, 0x9F, 0x43,
+	0xE5, 0x9C, 0xB0, 0x43, 0xE5, 0x9E, 0x8B, 0x43,
+	0xE5, 0x9F, 0x8E, 0x43, 0xE5, 0x9F, 0xB4, 0x43,
+	0xE5, 0xA0, 0x8D, 0x43, 0xE5, 0xA0, 0xB1, 0x43,
+	0xE5, 0xA0, 0xB2, 0x43, 0xE5, 0xA1, 0x80, 0x43,
+	0xE5, 0xA1, 0x9A, 0x43, 0xE5, 0xA1, 0x9E, 0x43,
+	0xE5, 0xA2, 0xA8, 0x43, 0xE5, 0xA2, 0xAC, 0x43,
+	// Bytes 9c0 - 9ff
+	0xE5, 0xA2, 0xB3, 0x43, 0xE5, 0xA3, 0x98, 0x43,
+	0xE5, 0xA3, 0x9F, 0x43, 0xE5, 0xA3, 0xAB, 0x43,
+	0xE5, 0xA3, 0xAE, 0x43, 0xE5, 0xA3, 0xB0, 0x43,
+	0xE5, 0xA3, 0xB2, 0x43, 0xE5, 0xA3, 0xB7, 0x43,
+	0xE5, 0xA4, 0x82, 0x43, 0xE5, 0xA4, 0x86, 0x43,
+	0xE5, 0xA4, 0x8A, 0x43, 0xE5, 0xA4, 0x95, 0x43,
+	0xE5, 0xA4, 0x9A, 0x43, 0xE5, 0xA4, 0x9C, 0x43,
+	0xE5, 0xA4, 0xA2, 0x43, 0xE5, 0xA4, 0xA7, 0x43,
+	// Bytes a00 - a3f
+	0xE5, 0xA4, 0xA9, 0x43, 0xE5, 0xA5, 0x84, 0x43,
+	0xE5, 0xA5, 0x88, 0x43, 0xE5, 0xA5, 0x91, 0x43,
+	0xE5, 0xA5, 0x94, 0x43, 0xE5, 0xA5, 0xA2, 0x43,
+	0xE5, 0xA5, 0xB3, 0x43, 0xE5, 0xA7, 0x98, 0x43,
+	0xE5, 0xA7, 0xAC, 0x43, 0xE5, 0xA8, 0x9B, 0x43,
+	0xE5, 0xA8, 0xA7, 0x43, 0xE5, 0xA9, 0xA2, 0x43,
+	0xE5, 0xA9, 0xA6, 0x43, 0xE5, 0xAA, 0xB5, 0x43,
+	0xE5, 0xAC, 0x88, 0x43, 0xE5, 0xAC, 0xA8, 0x43,
+	// Bytes a40 - a7f
+	0xE5, 0xAC, 0xBE, 0x43, 0xE5, 0xAD, 0x90, 0x43,
+	0xE5, 0xAD, 0x97, 0x43, 0xE5, 0xAD, 0xA6, 0x43,
+	0xE5, 0xAE, 0x80, 0x43, 0xE5, 0xAE, 0x85, 0x43,
+	0xE5, 0xAE, 0x97, 0x43, 0xE5, 0xAF, 0x83, 0x43,
+	0xE5, 0xAF, 0x98, 0x43, 0xE5, 0xAF, 0xA7, 0x43,
+	0xE5, 0xAF, 0xAE, 0x43, 0xE5, 0xAF, 0xB3, 0x43,
+	0xE5, 0xAF, 0xB8, 0x43, 0xE5, 0xAF, 0xBF, 0x43,
+	0xE5, 0xB0, 0x86, 0x43, 0xE5, 0xB0, 0x8F, 0x43,
+	// Bytes a80 - abf
+	0xE5, 0xB0, 0xA2, 0x43, 0xE5, 0xB0, 0xB8, 0x43,
+	0xE5, 0xB0, 0xBF, 0x43, 0xE5, 0xB1, 0xA0, 0x43,
+	0xE5, 0xB1, 0xA2, 0x43, 0xE5, 0xB1, 0xA4, 0x43,
+	0xE5, 0xB1, 0xA5, 0x43, 0xE5, 0xB1, 0xAE, 0x43,
+	0xE5, 0xB1, 0xB1, 0x43, 0xE5, 0xB2, 0x8D, 0x43,
+	0xE5, 0xB3, 0x80, 0x43, 0xE5, 0xB4, 0x99, 0x43,
+	0xE5, 0xB5, 0x83, 0x43, 0xE5, 0xB5, 0x90, 0x43,
+	0xE5, 0xB5, 0xAB, 0x43, 0xE5, 0xB5, 0xAE, 0x43,
+	// Bytes ac0 - aff
+	0xE5, 0xB5, 0xBC, 0x43, 0xE5, 0xB6, 0xB2, 0x43,
+	0xE5, 0xB6, 0xBA, 0x43, 0xE5, 0xB7, 0x9B, 0x43,
+	0xE5, 0xB7, 0xA1, 0x43, 0xE5, 0xB7, 0xA2, 0x43,
+	0xE5, 0xB7, 0xA5, 0x43, 0xE5, 0xB7, 0xA6, 0x43,
+	0xE5, 0xB7, 0xB1, 0x43, 0xE5, 0xB7, 0xBD, 0x43,
+	0xE5, 0xB7, 0xBE, 0x43, 0xE5, 0xB8, 0xA8, 0x43,
+	0xE5, 0xB8, 0xBD, 0x43, 0xE5, 0xB9, 0xA9, 0x43,
+	0xE5, 0xB9, 0xB2, 0x43, 0xE5, 0xB9, 0xB4, 0x43,
+	// Bytes b00 - b3f
+	0xE5, 0xB9, 0xBA, 0x43, 0xE5, 0xB9, 0xBC, 0x43,
+	0xE5, 0xB9, 0xBF, 0x43, 0xE5, 0xBA, 0xA6, 0x43,
+	0xE5, 0xBA, 0xB0, 0x43, 0xE5, 0xBA, 0xB3, 0x43,
+	0xE5, 0xBA, 0xB6, 0x43, 0xE5, 0xBB, 0x89, 0x43,
+	0xE5, 0xBB, 0x8A, 0x43, 0xE5, 0xBB, 0x92, 0x43,
+	0xE5, 0xBB, 0x93, 0x43, 0xE5, 0xBB, 0x99, 0x43,
+	0xE5, 0xBB, 0xAC, 0x43, 0xE5, 0xBB, 0xB4, 0x43,
+	0xE5, 0xBB, 0xBE, 0x43, 0xE5, 0xBC, 0x84, 0x43,
+	// Bytes b40 - b7f
+	0xE5, 0xBC, 0x8B, 0x43, 0xE5, 0xBC, 0x93, 0x43,
+	0xE5, 0xBC, 0xA2, 0x43, 0xE5, 0xBD, 0x90, 0x43,
+	0xE5, 0xBD, 0x93, 0x43, 0xE5, 0xBD, 0xA1, 0x43,
+	0xE5, 0xBD, 0xA2, 0x43, 0xE5, 0xBD, 0xA9, 0x43,
+	0xE5, 0xBD, 0xAB, 0x43, 0xE5, 0xBD, 0xB3, 0x43,
+	0xE5, 0xBE, 0x8B, 0x43, 0xE5, 0xBE, 0x8C, 0x43,
+	0xE5, 0xBE, 0x97, 0x43, 0xE5, 0xBE, 0x9A, 0x43,
+	0xE5, 0xBE, 0xA9, 0x43, 0xE5, 0xBE, 0xAD, 0x43,
+	// Bytes b80 - bbf
+	0xE5, 0xBF, 0x83, 0x43, 0xE5, 0xBF, 0x8D, 0x43,
+	0xE5, 0xBF, 0x97, 0x43, 0xE5, 0xBF, 0xB5, 0x43,
+	0xE5, 0xBF, 0xB9, 0x43, 0xE6, 0x80, 0x92, 0x43,
+	0xE6, 0x80, 0x9C, 0x43, 0xE6, 0x81, 0xB5, 0x43,
+	0xE6, 0x82, 0x81, 0x43, 0xE6, 0x82, 0x94, 0x43,
+	0xE6, 0x83, 0x87, 0x43, 0xE6, 0x83, 0x98, 0x43,
+	0xE6, 0x83, 0xA1, 0x43, 0xE6, 0x84, 0x88, 0x43,
+	0xE6, 0x85, 0x84, 0x43, 0xE6, 0x85, 0x88, 0x43,
+	// Bytes bc0 - bff
+	0xE6, 0x85, 0x8C, 0x43, 0xE6, 0x85, 0x8E, 0x43,
+	0xE6, 0x85, 0xA0, 0x43, 0xE6, 0x85, 0xA8, 0x43,
+	0xE6, 0x85, 0xBA, 0x43, 0xE6, 0x86, 0x8E, 0x43,
+	0xE6, 0x86, 0x90, 0x43, 0xE6, 0x86, 0xA4, 0x43,
+	0xE6, 0x86, 0xAF, 0x43, 0xE6, 0x86, 0xB2, 0x43,
+	0xE6, 0x87, 0x9E, 0x43, 0xE6, 0x87, 0xB2, 0x43,
+	0xE6, 0x87, 0xB6, 0x43, 0xE6, 0x88, 0x80, 0x43,
+	0xE6, 0x88, 0x88, 0x43, 0xE6, 0x88, 0x90, 0x43,
+	// Bytes c00 - c3f
+	0xE6, 0x88, 0x9B, 0x43, 0xE6, 0x88, 0xAE, 0x43,
+	0xE6, 0x88, 0xB4, 0x43, 0xE6, 0x88, 0xB6, 0x43,
+	0xE6, 0x89, 0x8B, 0x43, 0xE6, 0x89, 0x93, 0x43,
+	0xE6, 0x89, 0x9D, 0x43, 0xE6, 0x8A, 0x95, 0x43,
+	0xE6, 0x8A, 0xB1, 0x43, 0xE6, 0x8B, 0x89, 0x43,
+	0xE6, 0x8B, 0x8F, 0x43, 0xE6, 0x8B, 0x93, 0x43,
+	0xE6, 0x8B, 0x94, 0x43, 0xE6, 0x8B, 0xBC, 0x43,
+	0xE6, 0x8B, 0xBE, 0x43, 0xE6, 0x8C, 0x87, 0x43,
+	// Bytes c40 - c7f
+	0xE6, 0x8C, 0xBD, 0x43, 0xE6, 0x8D, 0x90, 0x43,
+	0xE6, 0x8D, 0x95, 0x43, 0xE6, 0x8D, 0xA8, 0x43,
+	0xE6, 0x8D, 0xBB, 0x43, 0xE6, 0x8E, 0x83, 0x43,
+	0xE6, 0x8E, 0xA0, 0x43, 0xE6, 0x8E, 0xA9, 0x43,
+	0xE6, 0x8F, 0x84, 0x43, 0xE6, 0x8F, 0x85, 0x43,
+	0xE6, 0x8F, 0xA4, 0x43, 0xE6, 0x90, 0x9C, 0x43,
+	0xE6, 0x90, 0xA2, 0x43, 0xE6, 0x91, 0x92, 0x43,
+	0xE6, 0x91, 0xA9, 0x43, 0xE6, 0x91, 0xB7, 0x43,
+	// Bytes c80 - cbf
+	0xE6, 0x91, 0xBE, 0x43, 0xE6, 0x92, 0x9A, 0x43,
+	0xE6, 0x92, 0x9D, 0x43, 0xE6, 0x93, 0x84, 0x43,
+	0xE6, 0x94, 0xAF, 0x43, 0xE6, 0x94, 0xB4, 0x43,
+	0xE6, 0x95, 0x8F, 0x43, 0xE6, 0x95, 0x96, 0x43,
+	0xE6, 0x95, 0xAC, 0x43, 0xE6, 0x95, 0xB8, 0x43,
+	0xE6, 0x96, 0x87, 0x43, 0xE6, 0x96, 0x97, 0x43,
+	0xE6, 0x96, 0x99, 0x43, 0xE6, 0x96, 0xA4, 0x43,
+	0xE6, 0x96, 0xB0, 0x43, 0xE6, 0x96, 0xB9, 0x43,
+	// Bytes cc0 - cff
+	0xE6, 0x97, 0x85, 0x43, 0xE6, 0x97, 0xA0, 0x43,
+	0xE6, 0x97, 0xA2, 0x43, 0xE6, 0x97, 0xA3, 0x43,
+	0xE6, 0x97, 0xA5, 0x43, 0xE6, 0x98, 0x93, 0x43,
+	0xE6, 0x98, 0xA0, 0x43, 0xE6, 0x99, 0x89, 0x43,
+	0xE6, 0x99, 0xB4, 0x43, 0xE6, 0x9A, 0x88, 0x43,
+	0xE6, 0x9A, 0x91, 0x43, 0xE6, 0x9A, 0x9C, 0x43,
+	0xE6, 0x9A, 0xB4, 0x43, 0xE6, 0x9B, 0x86, 0x43,
+	0xE6, 0x9B, 0xB0, 0x43, 0xE6, 0x9B, 0xB4, 0x43,
+	// Bytes d00 - d3f
+	0xE6, 0x9B, 0xB8, 0x43, 0xE6, 0x9C, 0x80, 0x43,
+	0xE6, 0x9C, 0x88, 0x43, 0xE6, 0x9C, 0x89, 0x43,
+	0xE6, 0x9C, 0x97, 0x43, 0xE6, 0x9C, 0x9B, 0x43,
+	0xE6, 0x9C, 0xA1, 0x43, 0xE6, 0x9C, 0xA8, 0x43,
+	0xE6, 0x9D, 0x8E, 0x43, 0xE6, 0x9D, 0x93, 0x43,
+	0xE6, 0x9D, 0x96, 0x43, 0xE6, 0x9D, 0x9E, 0x43,
+	0xE6, 0x9D, 0xBB, 0x43, 0xE6, 0x9E, 0x85, 0x43,
+	0xE6, 0x9E, 0x97, 0x43, 0xE6, 0x9F, 0xB3, 0x43,
+	// Bytes d40 - d7f
+	0xE6, 0x9F, 0xBA, 0x43, 0xE6, 0xA0, 0x97, 0x43,
+	0xE6, 0xA0, 0x9F, 0x43, 0xE6, 0xA0, 0xAA, 0x43,
+	0xE6, 0xA1, 0x92, 0x43, 0xE6, 0xA2, 0x81, 0x43,
+	0xE6, 0xA2, 0x85, 0x43, 0xE6, 0xA2, 0x8E, 0x43,
+	0xE6, 0xA2, 0xA8, 0x43, 0xE6, 0xA4, 0x94, 0x43,
+	0xE6, 0xA5, 0x82, 0x43, 0xE6, 0xA6, 0xA3, 0x43,
+	0xE6, 0xA7, 0xAA, 0x43, 0xE6, 0xA8, 0x82, 0x43,
+	0xE6, 0xA8, 0x93, 0x43, 0xE6, 0xAA, 0xA8, 0x43,
+	// Bytes d80 - dbf
+	0xE6, 0xAB, 0x93, 0x43, 0xE6, 0xAB, 0x9B, 0x43,
+	0xE6, 0xAC, 0x84, 0x43, 0xE6, 0xAC, 0xA0, 0x43,
+	0xE6, 0xAC, 0xA1, 0x43, 0xE6, 0xAD, 0x94, 0x43,
+	0xE6, 0xAD, 0xA2, 0x43, 0xE6, 0xAD, 0xA3, 0x43,
+	0xE6, 0xAD, 0xB2, 0x43, 0xE6, 0xAD, 0xB7, 0x43,
+	0xE6, 0xAD, 0xB9, 0x43, 0xE6, 0xAE, 0x9F, 0x43,
+	0xE6, 0xAE, 0xAE, 0x43, 0xE6, 0xAE, 0xB3, 0x43,
+	0xE6, 0xAE, 0xBA, 0x43, 0xE6, 0xAE, 0xBB, 0x43,
+	// Bytes dc0 - dff
+	0xE6, 0xAF, 0x8B, 0x43, 0xE6, 0xAF, 0x8D, 0x43,
+	0xE6, 0xAF, 0x94, 0x43, 0xE6, 0xAF, 0x9B, 0x43,
+	0xE6, 0xB0, 0x8F, 0x43, 0xE6, 0xB0, 0x94, 0x43,
+	0xE6, 0xB0, 0xB4, 0x43, 0xE6, 0xB1, 0x8E, 0x43,
+	0xE6, 0xB1, 0xA7, 0x43, 0xE6, 0xB2, 0x88, 0x43,
+	0xE6, 0xB2, 0xBF, 0x43, 0xE6, 0xB3, 0x8C, 0x43,
+	0xE6, 0xB3, 0x8D, 0x43, 0xE6, 0xB3, 0xA5, 0x43,
+	0xE6, 0xB3, 0xA8, 0x43, 0xE6, 0xB4, 0x96, 0x43,
+	// Bytes e00 - e3f
+	0xE6, 0xB4, 0x9B, 0x43, 0xE6, 0xB4, 0x9E, 0x43,
+	0xE6, 0xB4, 0xB4, 0x43, 0xE6, 0xB4, 0xBE, 0x43,
+	0xE6, 0xB5, 0x81, 0x43, 0xE6, 0xB5, 0xA9, 0x43,
+	0xE6, 0xB5, 0xAA, 0x43, 0xE6, 0xB5, 0xB7, 0x43,
+	0xE6, 0xB5, 0xB8, 0x43, 0xE6, 0xB6, 0x85, 0x43,
+	0xE6, 0xB7, 0x8B, 0x43, 0xE6, 0xB7, 0x9A, 0x43,
+	0xE6, 0xB7, 0xAA, 0x43, 0xE6, 0xB7, 0xB9, 0x43,
+	0xE6, 0xB8, 0x9A, 0x43, 0xE6, 0xB8, 0xAF, 0x43,
+	// Bytes e40 - e7f
+	0xE6, 0xB9, 0xAE, 0x43, 0xE6, 0xBA, 0x80, 0x43,
+	0xE6, 0xBA, 0x9C, 0x43, 0xE6, 0xBA, 0xBA, 0x43,
+	0xE6, 0xBB, 0x87, 0x43, 0xE6, 0xBB, 0x8B, 0x43,
+	0xE6, 0xBB, 0x91, 0x43, 0xE6, 0xBB, 0x9B, 0x43,
+	0xE6, 0xBC, 0x8F, 0x43, 0xE6, 0xBC, 0x94, 0x43,
+	0xE6, 0xBC, 0xA2, 0x43, 0xE6, 0xBC, 0xA3, 0x43,
+	0xE6, 0xBD, 0xAE, 0x43, 0xE6, 0xBF, 0x86, 0x43,
+	0xE6, 0xBF, 0xAB, 0x43, 0xE6, 0xBF, 0xBE, 0x43,
+	// Bytes e80 - ebf
+	0xE7, 0x80, 0x9B, 0x43, 0xE7, 0x80, 0x9E, 0x43,
+	0xE7, 0x80, 0xB9, 0x43, 0xE7, 0x81, 0x8A, 0x43,
+	0xE7, 0x81, 0xAB, 0x43, 0xE7, 0x81, 0xB0, 0x43,
+	0xE7, 0x81, 0xB7, 0x43, 0xE7, 0x81, 0xBD, 0x43,
+	0xE7, 0x82, 0x99, 0x43, 0xE7, 0x82, 0xAD, 0x43,
+	0xE7, 0x83, 0x88, 0x43, 0xE7, 0x83, 0x99, 0x43,
+	0xE7, 0x84, 0xA1, 0x43, 0xE7, 0x85, 0x85, 0x43,
+	0xE7, 0x85, 0x89, 0x43, 0xE7, 0x85, 0xAE, 0x43,
+	// Bytes ec0 - eff
+	0xE7, 0x86, 0x9C, 0x43, 0xE7, 0x87, 0x8E, 0x43,
+	0xE7, 0x87, 0x90, 0x43, 0xE7, 0x88, 0x90, 0x43,
+	0xE7, 0x88, 0x9B, 0x43, 0xE7, 0x88, 0xA8, 0x43,
+	0xE7, 0x88, 0xAA, 0x43, 0xE7, 0x88, 0xAB, 0x43,
+	0xE7, 0x88, 0xB5, 0x43, 0xE7, 0x88, 0xB6, 0x43,
+	0xE7, 0x88, 0xBB, 0x43, 0xE7, 0x88, 0xBF, 0x43,
+	0xE7, 0x89, 0x87, 0x43, 0xE7, 0x89, 0x90, 0x43,
+	0xE7, 0x89, 0x99, 0x43, 0xE7, 0x89, 0x9B, 0x43,
+	// Bytes f00 - f3f
+	0xE7, 0x89, 0xA2, 0x43, 0xE7, 0x89, 0xB9, 0x43,
+	0xE7, 0x8A, 0x80, 0x43, 0xE7, 0x8A, 0x95, 0x43,
+	0xE7, 0x8A, 0xAC, 0x43, 0xE7, 0x8A, 0xAF, 0x43,
+	0xE7, 0x8B, 0x80, 0x43, 0xE7, 0x8B, 0xBC, 0x43,
+	0xE7, 0x8C, 0xAA, 0x43, 0xE7, 0x8D, 0xB5, 0x43,
+	0xE7, 0x8D, 0xBA, 0x43, 0xE7, 0x8E, 0x84, 0x43,
+	0xE7, 0x8E, 0x87, 0x43, 0xE7, 0x8E, 0x89, 0x43,
+	0xE7, 0x8E, 0x8B, 0x43, 0xE7, 0x8E, 0xA5, 0x43,
+	// Bytes f40 - f7f
+	0xE7, 0x8E, 0xB2, 0x43, 0xE7, 0x8F, 0x9E, 0x43,
+	0xE7, 0x90, 0x86, 0x43, 0xE7, 0x90, 0x89, 0x43,
+	0xE7, 0x90, 0xA2, 0x43, 0xE7, 0x91, 0x87, 0x43,
+	0xE7, 0x91, 0x9C, 0x43, 0xE7, 0x91, 0xA9, 0x43,
+	0xE7, 0x91, 0xB1, 0x43, 0xE7, 0x92, 0x85, 0x43,
+	0xE7, 0x92, 0x89, 0x43, 0xE7, 0x92, 0x98, 0x43,
+	0xE7, 0x93, 0x8A, 0x43, 0xE7, 0x93, 0x9C, 0x43,
+	0xE7, 0x93, 0xA6, 0x43, 0xE7, 0x94, 0x86, 0x43,
+	// Bytes f80 - fbf
+	0xE7, 0x94, 0x98, 0x43, 0xE7, 0x94, 0x9F, 0x43,
+	0xE7, 0x94, 0xA4, 0x43, 0xE7, 0x94, 0xA8, 0x43,
+	0xE7, 0x94, 0xB0, 0x43, 0xE7, 0x94, 0xB2, 0x43,
+	0xE7, 0x94, 0xB3, 0x43, 0xE7, 0x94, 0xB7, 0x43,
+	0xE7, 0x94, 0xBB, 0x43, 0xE7, 0x94, 0xBE, 0x43,
+	0xE7, 0x95, 0x99, 0x43, 0xE7, 0x95, 0xA5, 0x43,
+	0xE7, 0x95, 0xB0, 0x43, 0xE7, 0x96, 0x8B, 0x43,
+	0xE7, 0x96, 0x92, 0x43, 0xE7, 0x97, 0xA2, 0x43,
+	// Bytes fc0 - fff
+	0xE7, 0x98, 0x90, 0x43, 0xE7, 0x98, 0x9D, 0x43,
+	0xE7, 0x98, 0x9F, 0x43, 0xE7, 0x99, 0x82, 0x43,
+	0xE7, 0x99, 0xA9, 0x43, 0xE7, 0x99, 0xB6, 0x43,
+	0xE7, 0x99, 0xBD, 0x43, 0xE7, 0x9A, 0xAE, 0x43,
+	0xE7, 0x9A, 0xBF, 0x43, 0xE7, 0x9B, 0x8A, 0x43,
+	0xE7, 0x9B, 0x9B, 0x43, 0xE7, 0x9B, 0xA3, 0x43,
+	0xE7, 0x9B, 0xA7, 0x43, 0xE7, 0x9B, 0xAE, 0x43,
+	0xE7, 0x9B, 0xB4, 0x43, 0xE7, 0x9C, 0x81, 0x43,
+	// Bytes 1000 - 103f
+	0xE7, 0x9C, 0x9E, 0x43, 0xE7, 0x9C, 0x9F, 0x43,
+	0xE7, 0x9D, 0x80, 0x43, 0xE7, 0x9D, 0x8A, 0x43,
+	0xE7, 0x9E, 0x8B, 0x43, 0xE7, 0x9E, 0xA7, 0x43,
+	0xE7, 0x9F, 0x9B, 0x43, 0xE7, 0x9F, 0xA2, 0x43,
+	0xE7, 0x9F, 0xB3, 0x43, 0xE7, 0xA1, 0x8E, 0x43,
+	0xE7, 0xA1, 0xAB, 0x43, 0xE7, 0xA2, 0x8C, 0x43,
+	0xE7, 0xA2, 0x91, 0x43, 0xE7, 0xA3, 0x8A, 0x43,
+	0xE7, 0xA3, 0x8C, 0x43, 0xE7, 0xA3, 0xBB, 0x43,
+	// Bytes 1040 - 107f
+	0xE7, 0xA4, 0xAA, 0x43, 0xE7, 0xA4, 0xBA, 0x43,
+	0xE7, 0xA4, 0xBC, 0x43, 0xE7, 0xA4, 0xBE, 0x43,
+	0xE7, 0xA5, 0x88, 0x43, 0xE7, 0xA5, 0x89, 0x43,
+	0xE7, 0xA5, 0x90, 0x43, 0xE7, 0xA5, 0x96, 0x43,
+	0xE7, 0xA5, 0x9D, 0x43, 0xE7, 0xA5, 0x9E, 0x43,
+	0xE7, 0xA5, 0xA5, 0x43, 0xE7, 0xA5, 0xBF, 0x43,
+	0xE7, 0xA6, 0x81, 0x43, 0xE7, 0xA6, 0x8D, 0x43,
+	0xE7, 0xA6, 0x8E, 0x43, 0xE7, 0xA6, 0x8F, 0x43,
+	// Bytes 1080 - 10bf
+	0xE7, 0xA6, 0xAE, 0x43, 0xE7, 0xA6, 0xB8, 0x43,
+	0xE7, 0xA6, 0xBE, 0x43, 0xE7, 0xA7, 0x8A, 0x43,
+	0xE7, 0xA7, 0x98, 0x43, 0xE7, 0xA7, 0xAB, 0x43,
+	0xE7, 0xA8, 0x9C, 0x43, 0xE7, 0xA9, 0x80, 0x43,
+	0xE7, 0xA9, 0x8A, 0x43, 0xE7, 0xA9, 0x8F, 0x43,
+	0xE7, 0xA9, 0xB4, 0x43, 0xE7, 0xA9, 0xBA, 0x43,
+	0xE7, 0xAA, 0x81, 0x43, 0xE7, 0xAA, 0xB1, 0x43,
+	0xE7, 0xAB, 0x8B, 0x43, 0xE7, 0xAB, 0xAE, 0x43,
+	// Bytes 10c0 - 10ff
+	0xE7, 0xAB, 0xB9, 0x43, 0xE7, 0xAC, 0xA0, 0x43,
+	0xE7, 0xAE, 0x8F, 0x43, 0xE7, 0xAF, 0x80, 0x43,
+	0xE7, 0xAF, 0x86, 0x43, 0xE7, 0xAF, 0x89, 0x43,
+	0xE7, 0xB0, 0xBE, 0x43, 0xE7, 0xB1, 0xA0, 0x43,
+	0xE7, 0xB1, 0xB3, 0x43, 0xE7, 0xB1, 0xBB, 0x43,
+	0xE7, 0xB2, 0x92, 0x43, 0xE7, 0xB2, 0xBE, 0x43,
+	0xE7, 0xB3, 0x92, 0x43, 0xE7, 0xB3, 0x96, 0x43,
+	0xE7, 0xB3, 0xA3, 0x43, 0xE7, 0xB3, 0xA7, 0x43,
+	// Bytes 1100 - 113f
+	0xE7, 0xB3, 0xA8, 0x43, 0xE7, 0xB3, 0xB8, 0x43,
+	0xE7, 0xB4, 0x80, 0x43, 0xE7, 0xB4, 0x90, 0x43,
+	0xE7, 0xB4, 0xA2, 0x43, 0xE7, 0xB4, 0xAF, 0x43,
+	0xE7, 0xB5, 0x82, 0x43, 0xE7, 0xB5, 0x9B, 0x43,
+	0xE7, 0xB5, 0xA3, 0x43, 0xE7, 0xB6, 0xA0, 0x43,
+	0xE7, 0xB6, 0xBE, 0x43, 0xE7, 0xB7, 0x87, 0x43,
+	0xE7, 0xB7, 0xB4, 0x43, 0xE7, 0xB8, 0x82, 0x43,
+	0xE7, 0xB8, 0x89, 0x43, 0xE7, 0xB8, 0xB7, 0x43,
+	// Bytes 1140 - 117f
+	0xE7, 0xB9, 0x81, 0x43, 0xE7, 0xB9, 0x85, 0x43,
+	0xE7, 0xBC, 0xB6, 0x43, 0xE7, 0xBC, 0xBE, 0x43,
+	0xE7, 0xBD, 0x91, 0x43, 0xE7, 0xBD, 0xB2, 0x43,
+	0xE7, 0xBD, 0xB9, 0x43, 0xE7, 0xBD, 0xBA, 0x43,
+	0xE7, 0xBE, 0x85, 0x43, 0xE7, 0xBE, 0x8A, 0x43,
+	0xE7, 0xBE, 0x95, 0x43, 0xE7, 0xBE, 0x9A, 0x43,
+	0xE7, 0xBE, 0xBD, 0x43, 0xE7, 0xBF, 0xBA, 0x43,
+	0xE8, 0x80, 0x81, 0x43, 0xE8, 0x80, 0x85, 0x43,
+	// Bytes 1180 - 11bf
+	0xE8, 0x80, 0x8C, 0x43, 0xE8, 0x80, 0x92, 0x43,
+	0xE8, 0x80, 0xB3, 0x43, 0xE8, 0x81, 0x86, 0x43,
+	0xE8, 0x81, 0xA0, 0x43, 0xE8, 0x81, 0xAF, 0x43,
+	0xE8, 0x81, 0xB0, 0x43, 0xE8, 0x81, 0xBE, 0x43,
+	0xE8, 0x81, 0xBF, 0x43, 0xE8, 0x82, 0x89, 0x43,
+	0xE8, 0x82, 0x8B, 0x43, 0xE8, 0x82, 0xAD, 0x43,
+	0xE8, 0x82, 0xB2, 0x43, 0xE8, 0x84, 0x83, 0x43,
+	0xE8, 0x84, 0xBE, 0x43, 0xE8, 0x87, 0x98, 0x43,
+	// Bytes 11c0 - 11ff
+	0xE8, 0x87, 0xA3, 0x43, 0xE8, 0x87, 0xA8, 0x43,
+	0xE8, 0x87, 0xAA, 0x43, 0xE8, 0x87, 0xAD, 0x43,
+	0xE8, 0x87, 0xB3, 0x43, 0xE8, 0x87, 0xBC, 0x43,
+	0xE8, 0x88, 0x81, 0x43, 0xE8, 0x88, 0x84, 0x43,
+	0xE8, 0x88, 0x8C, 0x43, 0xE8, 0x88, 0x98, 0x43,
+	0xE8, 0x88, 0x9B, 0x43, 0xE8, 0x88, 0x9F, 0x43,
+	0xE8, 0x89, 0xAE, 0x43, 0xE8, 0x89, 0xAF, 0x43,
+	0xE8, 0x89, 0xB2, 0x43, 0xE8, 0x89, 0xB8, 0x43,
+	// Bytes 1200 - 123f
+	0xE8, 0x89, 0xB9, 0x43, 0xE8, 0x8A, 0x8B, 0x43,
+	0xE8, 0x8A, 0x91, 0x43, 0xE8, 0x8A, 0x9D, 0x43,
+	0xE8, 0x8A, 0xB1, 0x43, 0xE8, 0x8A, 0xB3, 0x43,
+	0xE8, 0x8A, 0xBD, 0x43, 0xE8, 0x8B, 0xA5, 0x43,
+	0xE8, 0x8B, 0xA6, 0x43, 0xE8, 0x8C, 0x9D, 0x43,
+	0xE8, 0x8C, 0xA3, 0x43, 0xE8, 0x8C, 0xB6, 0x43,
+	0xE8, 0x8D, 0x92, 0x43, 0xE8, 0x8D, 0x93, 0x43,
+	0xE8, 0x8D, 0xA3, 0x43, 0xE8, 0x8E, 0xAD, 0x43,
+	// Bytes 1240 - 127f
+	0xE8, 0x8E, 0xBD, 0x43, 0xE8, 0x8F, 0x89, 0x43,
+	0xE8, 0x8F, 0x8A, 0x43, 0xE8, 0x8F, 0x8C, 0x43,
+	0xE8, 0x8F, 0x9C, 0x43, 0xE8, 0x8F, 0xA7, 0x43,
+	0xE8, 0x8F, 0xAF, 0x43, 0xE8, 0x8F, 0xB1, 0x43,
+	0xE8, 0x90, 0xBD, 0x43, 0xE8, 0x91, 0x89, 0x43,
+	0xE8, 0x91, 0x97, 0x43, 0xE8, 0x93, 0xAE, 0x43,
+	0xE8, 0x93, 0xB1, 0x43, 0xE8, 0x93, 0xB3, 0x43,
+	0xE8, 0x93, 0xBC, 0x43, 0xE8, 0x94, 0x96, 0x43,
+	// Bytes 1280 - 12bf
+	0xE8, 0x95, 0xA4, 0x43, 0xE8, 0x97, 0x8D, 0x43,
+	0xE8, 0x97, 0xBA, 0x43, 0xE8, 0x98, 0x86, 0x43,
+	0xE8, 0x98, 0x92, 0x43, 0xE8, 0x98, 0xAD, 0x43,
+	0xE8, 0x98, 0xBF, 0x43, 0xE8, 0x99, 0x8D, 0x43,
+	0xE8, 0x99, 0x90, 0x43, 0xE8, 0x99, 0x9C, 0x43,
+	0xE8, 0x99, 0xA7, 0x43, 0xE8, 0x99, 0xA9, 0x43,
+	0xE8, 0x99, 0xAB, 0x43, 0xE8, 0x9A, 0x88, 0x43,
+	0xE8, 0x9A, 0xA9, 0x43, 0xE8, 0x9B, 0xA2, 0x43,
+	// Bytes 12c0 - 12ff
+	0xE8, 0x9C, 0x8E, 0x43, 0xE8, 0x9C, 0xA8, 0x43,
+	0xE8, 0x9D, 0xAB, 0x43, 0xE8, 0x9D, 0xB9, 0x43,
+	0xE8, 0x9E, 0x86, 0x43, 0xE8, 0x9E, 0xBA, 0x43,
+	0xE8, 0x9F, 0xA1, 0x43, 0xE8, 0xA0, 0x81, 0x43,
+	0xE8, 0xA0, 0x9F, 0x43, 0xE8, 0xA1, 0x80, 0x43,
+	0xE8, 0xA1, 0x8C, 0x43, 0xE8, 0xA1, 0xA0, 0x43,
+	0xE8, 0xA1, 0xA3, 0x43, 0xE8, 0xA3, 0x82, 0x43,
+	0xE8, 0xA3, 0x8F, 0x43, 0xE8, 0xA3, 0x97, 0x43,
+	// Bytes 1300 - 133f
+	0xE8, 0xA3, 0x9E, 0x43, 0xE8, 0xA3, 0xA1, 0x43,
+	0xE8, 0xA3, 0xB8, 0x43, 0xE8, 0xA3, 0xBA, 0x43,
+	0xE8, 0xA4, 0x90, 0x43, 0xE8, 0xA5, 0x81, 0x43,
+	0xE8, 0xA5, 0xA4, 0x43, 0xE8, 0xA5, 0xBE, 0x43,
+	0xE8, 0xA6, 0x86, 0x43, 0xE8, 0xA6, 0x8B, 0x43,
+	0xE8, 0xA6, 0x96, 0x43, 0xE8, 0xA7, 0x92, 0x43,
+	0xE8, 0xA7, 0xA3, 0x43, 0xE8, 0xA8, 0x80, 0x43,
+	0xE8, 0xAA, 0xA0, 0x43, 0xE8, 0xAA, 0xAA, 0x43,
+	// Bytes 1340 - 137f
+	0xE8, 0xAA, 0xBF, 0x43, 0xE8, 0xAB, 0x8B, 0x43,
+	0xE8, 0xAB, 0x92, 0x43, 0xE8, 0xAB, 0x96, 0x43,
+	0xE8, 0xAB, 0xAD, 0x43, 0xE8, 0xAB, 0xB8, 0x43,
+	0xE8, 0xAB, 0xBE, 0x43, 0xE8, 0xAC, 0x81, 0x43,
+	0xE8, 0xAC, 0xB9, 0x43, 0xE8, 0xAD, 0x98, 0x43,
+	0xE8, 0xAE, 0x80, 0x43, 0xE8, 0xAE, 0x8A, 0x43,
+	0xE8, 0xB0, 0xB7, 0x43, 0xE8, 0xB1, 0x86, 0x43,
+	0xE8, 0xB1, 0x88, 0x43, 0xE8, 0xB1, 0x95, 0x43,
+	// Bytes 1380 - 13bf
+	0xE8, 0xB1, 0xB8, 0x43, 0xE8, 0xB2, 0x9D, 0x43,
+	0xE8, 0xB2, 0xA1, 0x43, 0xE8, 0xB2, 0xA9, 0x43,
+	0xE8, 0xB2, 0xAB, 0x43, 0xE8, 0xB3, 0x81, 0x43,
+	0xE8, 0xB3, 0x82, 0x43, 0xE8, 0xB3, 0x87, 0x43,
+	0xE8, 0xB3, 0x88, 0x43, 0xE8, 0xB3, 0x93, 0x43,
+	0xE8, 0xB4, 0x88, 0x43, 0xE8, 0xB4, 0x9B, 0x43,
+	0xE8, 0xB5, 0xA4, 0x43, 0xE8, 0xB5, 0xB0, 0x43,
+	0xE8, 0xB5, 0xB7, 0x43, 0xE8, 0xB6, 0xB3, 0x43,
+	// Bytes 13c0 - 13ff
+	0xE8, 0xB6, 0xBC, 0x43, 0xE8, 0xB7, 0x8B, 0x43,
+	0xE8, 0xB7, 0xAF, 0x43, 0xE8, 0xB7, 0xB0, 0x43,
+	0xE8, 0xBA, 0xAB, 0x43, 0xE8, 0xBB, 0x8A, 0x43,
+	0xE8, 0xBB, 0x94, 0x43, 0xE8, 0xBC, 0xA6, 0x43,
+	0xE8, 0xBC, 0xAA, 0x43, 0xE8, 0xBC, 0xB8, 0x43,
+	0xE8, 0xBC, 0xBB, 0x43, 0xE8, 0xBD, 0xA2, 0x43,
+	0xE8, 0xBE, 0x9B, 0x43, 0xE8, 0xBE, 0x9E, 0x43,
+	0xE8, 0xBE, 0xB0, 0x43, 0xE8, 0xBE, 0xB5, 0x43,
+	// Bytes 1400 - 143f
+	0xE8, 0xBE, 0xB6, 0x43, 0xE9, 0x80, 0xA3, 0x43,
+	0xE9, 0x80, 0xB8, 0x43, 0xE9, 0x81, 0x8A, 0x43,
+	0xE9, 0x81, 0xA9, 0x43, 0xE9, 0x81, 0xB2, 0x43,
+	0xE9, 0x81, 0xBC, 0x43, 0xE9, 0x82, 0x8F, 0x43,
+	0xE9, 0x82, 0x91, 0x43, 0xE9, 0x82, 0x94, 0x43,
+	0xE9, 0x83, 0x8E, 0x43, 0xE9, 0x83, 0x9E, 0x43,
+	0xE9, 0x83, 0xB1, 0x43, 0xE9, 0x83, 0xBD, 0x43,
+	0xE9, 0x84, 0x91, 0x43, 0xE9, 0x84, 0x9B, 0x43,
+	// Bytes 1440 - 147f
+	0xE9, 0x85, 0x89, 0x43, 0xE9, 0x85, 0x8D, 0x43,
+	0xE9, 0x85, 0xAA, 0x43, 0xE9, 0x86, 0x99, 0x43,
+	0xE9, 0x86, 0xB4, 0x43, 0xE9, 0x87, 0x86, 0x43,
+	0xE9, 0x87, 0x8C, 0x43, 0xE9, 0x87, 0x8F, 0x43,
+	0xE9, 0x87, 0x91, 0x43, 0xE9, 0x88, 0xB4, 0x43,
+	0xE9, 0x88, 0xB8, 0x43, 0xE9, 0x89, 0xB6, 0x43,
+	0xE9, 0x89, 0xBC, 0x43, 0xE9, 0x8B, 0x97, 0x43,
+	0xE9, 0x8B, 0x98, 0x43, 0xE9, 0x8C, 0x84, 0x43,
+	// Bytes 1480 - 14bf
+	0xE9, 0x8D, 0x8A, 0x43, 0xE9, 0x8F, 0xB9, 0x43,
+	0xE9, 0x90, 0x95, 0x43, 0xE9, 0x95, 0xB7, 0x43,
+	0xE9, 0x96, 0x80, 0x43, 0xE9, 0x96, 0x8B, 0x43,
+	0xE9, 0x96, 0xAD, 0x43, 0xE9, 0x96, 0xB7, 0x43,
+	0xE9, 0x98, 0x9C, 0x43, 0xE9, 0x98, 0xAE, 0x43,
+	0xE9, 0x99, 0x8B, 0x43, 0xE9, 0x99, 0x8D, 0x43,
+	0xE9, 0x99, 0xB5, 0x43, 0xE9, 0x99, 0xB8, 0x43,
+	0xE9, 0x99, 0xBC, 0x43, 0xE9, 0x9A, 0x86, 0x43,
+	// Bytes 14c0 - 14ff
+	0xE9, 0x9A, 0xA3, 0x43, 0xE9, 0x9A, 0xB6, 0x43,
+	0xE9, 0x9A, 0xB7, 0x43, 0xE9, 0x9A, 0xB8, 0x43,
+	0xE9, 0x9A, 0xB9, 0x43, 0xE9, 0x9B, 0x83, 0x43,
+	0xE9, 0x9B, 0xA2, 0x43, 0xE9, 0x9B, 0xA3, 0x43,
+	0xE9, 0x9B, 0xA8, 0x43, 0xE9, 0x9B, 0xB6, 0x43,
+	0xE9, 0x9B, 0xB7, 0x43, 0xE9, 0x9C, 0xA3, 0x43,
+	0xE9, 0x9C, 0xB2, 0x43, 0xE9, 0x9D, 0x88, 0x43,
+	0xE9, 0x9D, 0x91, 0x43, 0xE9, 0x9D, 0x96, 0x43,
+	// Bytes 1500 - 153f
+	0xE9, 0x9D, 0x9E, 0x43, 0xE9, 0x9D, 0xA2, 0x43,
+	0xE9, 0x9D, 0xA9, 0x43, 0xE9, 0x9F, 0x8B, 0x43,
+	0xE9, 0x9F, 0x9B, 0x43, 0xE9, 0x9F, 0xA0, 0x43,
+	0xE9, 0x9F, 0xAD, 0x43, 0xE9, 0x9F, 0xB3, 0x43,
+	0xE9, 0x9F, 0xBF, 0x43, 0xE9, 0xA0, 0x81, 0x43,
+	0xE9, 0xA0, 0x85, 0x43, 0xE9, 0xA0, 0x8B, 0x43,
+	0xE9, 0xA0, 0x98, 0x43, 0xE9, 0xA0, 0xA9, 0x43,
+	0xE9, 0xA0, 0xBB, 0x43, 0xE9, 0xA1, 0x9E, 0x43,
+	// Bytes 1540 - 157f
+	0xE9, 0xA2, 0xA8, 0x43, 0xE9, 0xA3, 0x9B, 0x43,
+	0xE9, 0xA3, 0x9F, 0x43, 0xE9, 0xA3, 0xA2, 0x43,
+	0xE9, 0xA3, 0xAF, 0x43, 0xE9, 0xA3, 0xBC, 0x43,
+	0xE9, 0xA4, 0xA8, 0x43, 0xE9, 0xA4, 0xA9, 0x43,
+	0xE9, 0xA6, 0x96, 0x43, 0xE9, 0xA6, 0x99, 0x43,
+	0xE9, 0xA6, 0xA7, 0x43, 0xE9, 0xA6, 0xAC, 0x43,
+	0xE9, 0xA7, 0x82, 0x43, 0xE9, 0xA7, 0xB1, 0x43,
+	0xE9, 0xA7, 0xBE, 0x43, 0xE9, 0xA9, 0xAA, 0x43,
+	// Bytes 1580 - 15bf
+	0xE9, 0xAA, 0xA8, 0x43, 0xE9, 0xAB, 0x98, 0x43,
+	0xE9, 0xAB, 0x9F, 0x43, 0xE9, 0xAC, 0x92, 0x43,
+	0xE9, 0xAC, 0xA5, 0x43, 0xE9, 0xAC, 0xAF, 0x43,
+	0xE9, 0xAC, 0xB2, 0x43, 0xE9, 0xAC, 0xBC, 0x43,
+	0xE9, 0xAD, 0x9A, 0x43, 0xE9, 0xAD, 0xAF, 0x43,
+	0xE9, 0xB1, 0x80, 0x43, 0xE9, 0xB1, 0x97, 0x43,
+	0xE9, 0xB3, 0xA5, 0x43, 0xE9, 0xB3, 0xBD, 0x43,
+	0xE9, 0xB5, 0xA7, 0x43, 0xE9, 0xB6, 0xB4, 0x43,
+	// Bytes 15c0 - 15ff
+	0xE9, 0xB7, 0xBA, 0x43, 0xE9, 0xB8, 0x9E, 0x43,
+	0xE9, 0xB9, 0xB5, 0x43, 0xE9, 0xB9, 0xBF, 0x43,
+	0xE9, 0xBA, 0x97, 0x43, 0xE9, 0xBA, 0x9F, 0x43,
+	0xE9, 0xBA, 0xA5, 0x43, 0xE9, 0xBA, 0xBB, 0x43,
+	0xE9, 0xBB, 0x83, 0x43, 0xE9, 0xBB, 0x8D, 0x43,
+	0xE9, 0xBB, 0x8E, 0x43, 0xE9, 0xBB, 0x91, 0x43,
+	0xE9, 0xBB, 0xB9, 0x43, 0xE9, 0xBB, 0xBD, 0x43,
+	0xE9, 0xBB, 0xBE, 0x43, 0xE9, 0xBC, 0x85, 0x43,
+	// Bytes 1600 - 163f
+	0xE9, 0xBC, 0x8E, 0x43, 0xE9, 0xBC, 0x8F, 0x43,
+	0xE9, 0xBC, 0x93, 0x43, 0xE9, 0xBC, 0x96, 0x43,
+	0xE9, 0xBC, 0xA0, 0x43, 0xE9, 0xBC, 0xBB, 0x43,
+	0xE9, 0xBD, 0x83, 0x43, 0xE9, 0xBD, 0x8A, 0x43,
+	0xE9, 0xBD, 0x92, 0x43, 0xE9, 0xBE, 0x8D, 0x43,
+	0xE9, 0xBE, 0x8E, 0x43, 0xE9, 0xBE, 0x9C, 0x43,
+	0xE9, 0xBE, 0x9F, 0x43, 0xE9, 0xBE, 0xA0, 0x43,
+	0xEA, 0x9C, 0xA7, 0x43, 0xEA, 0x9D, 0xAF, 0x43,
+	// Bytes 1640 - 167f
+	0xEA, 0xAC, 0xB7, 0x43, 0xEA, 0xAD, 0x92, 0x44,
+	0xF0, 0xA0, 0x84, 0xA2, 0x44, 0xF0, 0xA0, 0x94,
+	0x9C, 0x44, 0xF0, 0xA0, 0x94, 0xA5, 0x44, 0xF0,
+	0xA0, 0x95, 0x8B, 0x44, 0xF0, 0xA0, 0x98, 0xBA,
+	0x44, 0xF0, 0xA0, 0xA0, 0x84, 0x44, 0xF0, 0xA0,
+	0xA3, 0x9E, 0x44, 0xF0, 0xA0, 0xA8, 0xAC, 0x44,
+	0xF0, 0xA0, 0xAD, 0xA3, 0x44, 0xF0, 0xA1, 0x93,
+	0xA4, 0x44, 0xF0, 0xA1, 0x9A, 0xA8, 0x44, 0xF0,
+	// Bytes 1680 - 16bf
+	0xA1, 0x9B, 0xAA, 0x44, 0xF0, 0xA1, 0xA7, 0x88,
+	0x44, 0xF0, 0xA1, 0xAC, 0x98, 0x44, 0xF0, 0xA1,
+	0xB4, 0x8B, 0x44, 0xF0, 0xA1, 0xB7, 0xA4, 0x44,
+	0xF0, 0xA1, 0xB7, 0xA6, 0x44, 0xF0, 0xA2, 0x86,
+	0x83, 0x44, 0xF0, 0xA2, 0x86, 0x9F, 0x44, 0xF0,
+	0xA2, 0x8C, 0xB1, 0x44, 0xF0, 0xA2, 0x9B, 0x94,
+	0x44, 0xF0, 0xA2, 0xA1, 0x84, 0x44, 0xF0, 0xA2,
+	0xA1, 0x8A, 0x44, 0xF0, 0xA2, 0xAC, 0x8C, 0x44,
+	// Bytes 16c0 - 16ff
+	0xF0, 0xA2, 0xAF, 0xB1, 0x44, 0xF0, 0xA3, 0x80,
+	0x8A, 0x44, 0xF0, 0xA3, 0x8A, 0xB8, 0x44, 0xF0,
+	0xA3, 0x8D, 0x9F, 0x44, 0xF0, 0xA3, 0x8E, 0x93,
+	0x44, 0xF0, 0xA3, 0x8E, 0x9C, 0x44, 0xF0, 0xA3,
+	0x8F, 0x83, 0x44, 0xF0, 0xA3, 0x8F, 0x95, 0x44,
+	0xF0, 0xA3, 0x91, 0xAD, 0x44, 0xF0, 0xA3, 0x9A,
+	0xA3, 0x44, 0xF0, 0xA3, 0xA2, 0xA7, 0x44, 0xF0,
+	0xA3, 0xAA, 0x8D, 0x44, 0xF0, 0xA3, 0xAB, 0xBA,
+	// Bytes 1700 - 173f
+	0x44, 0xF0, 0xA3, 0xB2, 0xBC, 0x44, 0xF0, 0xA3,
+	0xB4, 0x9E, 0x44, 0xF0, 0xA3, 0xBB, 0x91, 0x44,
+	0xF0, 0xA3, 0xBD, 0x9E, 0x44, 0xF0, 0xA3, 0xBE,
+	0x8E, 0x44, 0xF0, 0xA4, 0x89, 0xA3, 0x44, 0xF0,
+	0xA4, 0x8B, 0xAE, 0x44, 0xF0, 0xA4, 0x8E, 0xAB,
+	0x44, 0xF0, 0xA4, 0x98, 0x88, 0x44, 0xF0, 0xA4,
+	0x9C, 0xB5, 0x44, 0xF0, 0xA4, 0xA0, 0x94, 0x44,
+	0xF0, 0xA4, 0xB0, 0xB6, 0x44, 0xF0, 0xA4, 0xB2,
+	// Bytes 1740 - 177f
+	0x92, 0x44, 0xF0, 0xA4, 0xBE, 0xA1, 0x44, 0xF0,
+	0xA4, 0xBE, 0xB8, 0x44, 0xF0, 0xA5, 0x81, 0x84,
+	0x44, 0xF0, 0xA5, 0x83, 0xB2, 0x44, 0xF0, 0xA5,
+	0x83, 0xB3, 0x44, 0xF0, 0xA5, 0x84, 0x99, 0x44,
+	0xF0, 0xA5, 0x84, 0xB3, 0x44, 0xF0, 0xA5, 0x89,
+	0x89, 0x44, 0xF0, 0xA5, 0x90, 0x9D, 0x44, 0xF0,
+	0xA5, 0x98, 0xA6, 0x44, 0xF0, 0xA5, 0x9A, 0x9A,
+	0x44, 0xF0, 0xA5, 0x9B, 0x85, 0x44, 0xF0, 0xA5,
+	// Bytes 1780 - 17bf
+	0xA5, 0xBC, 0x44, 0xF0, 0xA5, 0xAA, 0xA7, 0x44,
+	0xF0, 0xA5, 0xAE, 0xAB, 0x44, 0xF0, 0xA5, 0xB2,
+	0x80, 0x44, 0xF0, 0xA5, 0xB3, 0x90, 0x44, 0xF0,
+	0xA5, 0xBE, 0x86, 0x44, 0xF0, 0xA6, 0x87, 0x9A,
+	0x44, 0xF0, 0xA6, 0x88, 0xA8, 0x44, 0xF0, 0xA6,
+	0x89, 0x87, 0x44, 0xF0, 0xA6, 0x8B, 0x99, 0x44,
+	0xF0, 0xA6, 0x8C, 0xBE, 0x44, 0xF0, 0xA6, 0x93,
+	0x9A, 0x44, 0xF0, 0xA6, 0x94, 0xA3, 0x44, 0xF0,
+	// Bytes 17c0 - 17ff
+	0xA6, 0x96, 0xA8, 0x44, 0xF0, 0xA6, 0x9E, 0xA7,
+	0x44, 0xF0, 0xA6, 0x9E, 0xB5, 0x44, 0xF0, 0xA6,
+	0xAC, 0xBC, 0x44, 0xF0, 0xA6, 0xB0, 0xB6, 0x44,
+	0xF0, 0xA6, 0xB3, 0x95, 0x44, 0xF0, 0xA6, 0xB5,
+	0xAB, 0x44, 0xF0, 0xA6, 0xBC, 0xAC, 0x44, 0xF0,
+	0xA6, 0xBE, 0xB1, 0x44, 0xF0, 0xA7, 0x83, 0x92,
+	0x44, 0xF0, 0xA7, 0x8F, 0x8A, 0x44, 0xF0, 0xA7,
+	0x99, 0xA7, 0x44, 0xF0, 0xA7, 0xA2, 0xAE, 0x44,
+	// Bytes 1800 - 183f
+	0xF0, 0xA7, 0xA5, 0xA6, 0x44, 0xF0, 0xA7, 0xB2,
+	0xA8, 0x44, 0xF0, 0xA7, 0xBB, 0x93, 0x44, 0xF0,
+	0xA7, 0xBC, 0xAF, 0x44, 0xF0, 0xA8, 0x97, 0x92,
+	0x44, 0xF0, 0xA8, 0x97, 0xAD, 0x44, 0xF0, 0xA8,
+	0x9C, 0xAE, 0x44, 0xF0, 0xA8, 0xAF, 0xBA, 0x44,
+	0xF0, 0xA8, 0xB5, 0xB7, 0x44, 0xF0, 0xA9, 0x85,
+	0x85, 0x44, 0xF0, 0xA9, 0x87, 0x9F, 0x44, 0xF0,
+	0xA9, 0x88, 0x9A, 0x44, 0xF0, 0xA9, 0x90, 0x8A,
+	// Bytes 1840 - 187f
+	0x44, 0xF0, 0xA9, 0x92, 0x96, 0x44, 0xF0, 0xA9,
+	0x96, 0xB6, 0x44, 0xF0, 0xA9, 0xAC, 0xB0, 0x44,
+	0xF0, 0xAA, 0x83, 0x8E, 0x44, 0xF0, 0xAA, 0x84,
+	0x85, 0x44, 0xF0, 0xAA, 0x88, 0x8E, 0x44, 0xF0,
+	0xAA, 0x8A, 0x91, 0x44, 0xF0, 0xAA, 0x8E, 0x92,
+	0x44, 0xF0, 0xAA, 0x98, 0x80, 0x42, 0x21, 0x21,
+	0x42, 0x21, 0x3F, 0x42, 0x2E, 0x2E, 0x42, 0x30,
+	0x2C, 0x42, 0x30, 0x2E, 0x42, 0x31, 0x2C, 0x42,
+	// Bytes 1880 - 18bf
+	0x31, 0x2E, 0x42, 0x31, 0x30, 0x42, 0x31, 0x31,
+	0x42, 0x31, 0x32, 0x42, 0x31, 0x33, 0x42, 0x31,
+	0x34, 0x42, 0x31, 0x35, 0x42, 0x31, 0x36, 0x42,
+	0x31, 0x37, 0x42, 0x31, 0x38, 0x42, 0x31, 0x39,
+	0x42, 0x32, 0x2C, 0x42, 0x32, 0x2E, 0x42, 0x32,
+	0x30, 0x42, 0x32, 0x31, 0x42, 0x32, 0x32, 0x42,
+	0x32, 0x33, 0x42, 0x32, 0x34, 0x42, 0x32, 0x35,
+	0x42, 0x32, 0x36, 0x42, 0x32, 0x37, 0x42, 0x32,
+	// Bytes 18c0 - 18ff
+	0x38, 0x42, 0x32, 0x39, 0x42, 0x33, 0x2C, 0x42,
+	0x33, 0x2E, 0x42, 0x33, 0x30, 0x42, 0x33, 0x31,
+	0x42, 0x33, 0x32, 0x42, 0x33, 0x33, 0x42, 0x33,
+	0x34, 0x42, 0x33, 0x35, 0x42, 0x33, 0x36, 0x42,
+	0x33, 0x37, 0x42, 0x33, 0x38, 0x42, 0x33, 0x39,
+	0x42, 0x34, 0x2C, 0x42, 0x34, 0x2E, 0x42, 0x34,
+	0x30, 0x42, 0x34, 0x31, 0x42, 0x34, 0x32, 0x42,
+	0x34, 0x33, 0x42, 0x34, 0x34, 0x42, 0x34, 0x35,
+	// Bytes 1900 - 193f
+	0x42, 0x34, 0x36, 0x42, 0x34, 0x37, 0x42, 0x34,
+	0x38, 0x42, 0x34, 0x39, 0x42, 0x35, 0x2C, 0x42,
+	0x35, 0x2E, 0x42, 0x35, 0x30, 0x42, 0x36, 0x2C,
+	0x42, 0x36, 0x2E, 0x42, 0x37, 0x2C, 0x42, 0x37,
+	0x2E, 0x42, 0x38, 0x2C, 0x42, 0x38, 0x2E, 0x42,
+	0x39, 0x2C, 0x42, 0x39, 0x2E, 0x42, 0x3D, 0x3D,
+	0x42, 0x3F, 0x21, 0x42, 0x3F, 0x3F, 0x42, 0x41,
+	0x55, 0x42, 0x42, 0x71, 0x42, 0x43, 0x44, 0x42,
+	// Bytes 1940 - 197f
+	0x44, 0x4A, 0x42, 0x44, 0x5A, 0x42, 0x44, 0x7A,
+	0x42, 0x47, 0x42, 0x42, 0x47, 0x79, 0x42, 0x48,
+	0x50, 0x42, 0x48, 0x56, 0x42, 0x48, 0x67, 0x42,
+	0x48, 0x7A, 0x42, 0x49, 0x49, 0x42, 0x49, 0x4A,
+	0x42, 0x49, 0x55, 0x42, 0x49, 0x56, 0x42, 0x49,
+	0x58, 0x42, 0x4B, 0x42, 0x42, 0x4B, 0x4B, 0x42,
+	0x4B, 0x4D, 0x42, 0x4C, 0x4A, 0x42, 0x4C, 0x6A,
+	0x42, 0x4D, 0x42, 0x42, 0x4D, 0x43, 0x42, 0x4D,
+	// Bytes 1980 - 19bf
+	0x44, 0x42, 0x4D, 0x56, 0x42, 0x4D, 0x57, 0x42,
+	0x4E, 0x4A, 0x42, 0x4E, 0x6A, 0x42, 0x4E, 0x6F,
+	0x42, 0x50, 0x48, 0x42, 0x50, 0x52, 0x42, 0x50,
+	0x61, 0x42, 0x52, 0x73, 0x42, 0x53, 0x44, 0x42,
+	0x53, 0x4D, 0x42, 0x53, 0x53, 0x42, 0x53, 0x76,
+	0x42, 0x54, 0x4D, 0x42, 0x56, 0x49, 0x42, 0x57,
+	0x43, 0x42, 0x57, 0x5A, 0x42, 0x57, 0x62, 0x42,
+	0x58, 0x49, 0x42, 0x63, 0x63, 0x42, 0x63, 0x64,
+	// Bytes 19c0 - 19ff
+	0x42, 0x63, 0x6D, 0x42, 0x64, 0x42, 0x42, 0x64,
+	0x61, 0x42, 0x64, 0x6C, 0x42, 0x64, 0x6D, 0x42,
+	0x64, 0x7A, 0x42, 0x65, 0x56, 0x42, 0x66, 0x66,
+	0x42, 0x66, 0x69, 0x42, 0x66, 0x6C, 0x42, 0x66,
+	0x6D, 0x42, 0x68, 0x61, 0x42, 0x69, 0x69, 0x42,
+	0x69, 0x6A, 0x42, 0x69, 0x6E, 0x42, 0x69, 0x76,
+	0x42, 0x69, 0x78, 0x42, 0x6B, 0x41, 0x42, 0x6B,
+	0x56, 0x42, 0x6B, 0x57, 0x42, 0x6B, 0x67, 0x42,
+	// Bytes 1a00 - 1a3f
+	0x6B, 0x6C, 0x42, 0x6B, 0x6D, 0x42, 0x6B, 0x74,
+	0x42, 0x6C, 0x6A, 0x42, 0x6C, 0x6D, 0x42, 0x6C,
+	0x6E, 0x42, 0x6C, 0x78, 0x42, 0x6D, 0x32, 0x42,
+	0x6D, 0x33, 0x42, 0x6D, 0x41, 0x42, 0x6D, 0x56,
+	0x42, 0x6D, 0x57, 0x42, 0x6D, 0x62, 0x42, 0x6D,
+	0x67, 0x42, 0x6D, 0x6C, 0x42, 0x6D, 0x6D, 0x42,
+	0x6D, 0x73, 0x42, 0x6E, 0x41, 0x42, 0x6E, 0x46,
+	0x42, 0x6E, 0x56, 0x42, 0x6E, 0x57, 0x42, 0x6E,
+	// Bytes 1a40 - 1a7f
+	0x6A, 0x42, 0x6E, 0x6D, 0x42, 0x6E, 0x73, 0x42,
+	0x6F, 0x56, 0x42, 0x70, 0x41, 0x42, 0x70, 0x46,
+	0x42, 0x70, 0x56, 0x42, 0x70, 0x57, 0x42, 0x70,
+	0x63, 0x42, 0x70, 0x73, 0x42, 0x73, 0x72, 0x42,
+	0x73, 0x74, 0x42, 0x76, 0x69, 0x42, 0x78, 0x69,
+	0x43, 0x28, 0x31, 0x29, 0x43, 0x28, 0x32, 0x29,
+	0x43, 0x28, 0x33, 0x29, 0x43, 0x28, 0x34, 0x29,
+	0x43, 0x28, 0x35, 0x29, 0x43, 0x28, 0x36, 0x29,
+	// Bytes 1a80 - 1abf
+	0x43, 0x28, 0x37, 0x29, 0x43, 0x28, 0x38, 0x29,
+	0x43, 0x28, 0x39, 0x29, 0x43, 0x28, 0x41, 0x29,
+	0x43, 0x28, 0x42, 0x29, 0x43, 0x28, 0x43, 0x29,
+	0x43, 0x28, 0x44, 0x29, 0x43, 0x28, 0x45, 0x29,
+	0x43, 0x28, 0x46, 0x29, 0x43, 0x28, 0x47, 0x29,
+	0x43, 0x28, 0x48, 0x29, 0x43, 0x28, 0x49, 0x29,
+	0x43, 0x28, 0x4A, 0x29, 0x43, 0x28, 0x4B, 0x29,
+	0x43, 0x28, 0x4C, 0x29, 0x43, 0x28, 0x4D, 0x29,
+	// Bytes 1ac0 - 1aff
+	0x43, 0x28, 0x4E, 0x29, 0x43, 0x28, 0x4F, 0x29,
+	0x43, 0x28, 0x50, 0x29, 0x43, 0x28, 0x51, 0x29,
+	0x43, 0x28, 0x52, 0x29, 0x43, 0x28, 0x53, 0x29,
+	0x43, 0x28, 0x54, 0x29, 0x43, 0x28, 0x55, 0x29,
+	0x43, 0x28, 0x56, 0x29, 0x43, 0x28, 0x57, 0x29,
+	0x43, 0x28, 0x58, 0x29, 0x43, 0x28, 0x59, 0x29,
+	0x43, 0x28, 0x5A, 0x29, 0x43, 0x28, 0x61, 0x29,
+	0x43, 0x28, 0x62, 0x29, 0x43, 0x28, 0x63, 0x29,
+	// Bytes 1b00 - 1b3f
+	0x43, 0x28, 0x64, 0x29, 0x43, 0x28, 0x65, 0x29,
+	0x43, 0x28, 0x66, 0x29, 0x43, 0x28, 0x67, 0x29,
+	0x43, 0x28, 0x68, 0x29, 0x43, 0x28, 0x69, 0x29,
+	0x43, 0x28, 0x6A, 0x29, 0x43, 0x28, 0x6B, 0x29,
+	0x43, 0x28, 0x6C, 0x29, 0x43, 0x28, 0x6D, 0x29,
+	0x43, 0x28, 0x6E, 0x29, 0x43, 0x28, 0x6F, 0x29,
+	0x43, 0x28, 0x70, 0x29, 0x43, 0x28, 0x71, 0x29,
+	0x43, 0x28, 0x72, 0x29, 0x43, 0x28, 0x73, 0x29,
+	// Bytes 1b40 - 1b7f
+	0x43, 0x28, 0x74, 0x29, 0x43, 0x28, 0x75, 0x29,
+	0x43, 0x28, 0x76, 0x29, 0x43, 0x28, 0x77, 0x29,
+	0x43, 0x28, 0x78, 0x29, 0x43, 0x28, 0x79, 0x29,
+	0x43, 0x28, 0x7A, 0x29, 0x43, 0x2E, 0x2E, 0x2E,
+	0x43, 0x31, 0x30, 0x2E, 0x43, 0x31, 0x31, 0x2E,
+	0x43, 0x31, 0x32, 0x2E, 0x43, 0x31, 0x33, 0x2E,
+	0x43, 0x31, 0x34, 0x2E, 0x43, 0x31, 0x35, 0x2E,
+	0x43, 0x31, 0x36, 0x2E, 0x43, 0x31, 0x37, 0x2E,
+	// Bytes 1b80 - 1bbf
+	0x43, 0x31, 0x38, 0x2E, 0x43, 0x31, 0x39, 0x2E,
+	0x43, 0x32, 0x30, 0x2E, 0x43, 0x3A, 0x3A, 0x3D,
+	0x43, 0x3D, 0x3D, 0x3D, 0x43, 0x43, 0x6F, 0x2E,
+	0x43, 0x46, 0x41, 0x58, 0x43, 0x47, 0x48, 0x7A,
+	0x43, 0x47, 0x50, 0x61, 0x43, 0x49, 0x49, 0x49,
+	0x43, 0x4C, 0x54, 0x44, 0x43, 0x4C, 0xC2, 0xB7,
+	0x43, 0x4D, 0x48, 0x7A, 0x43, 0x4D, 0x50, 0x61,
+	0x43, 0x4D, 0xCE, 0xA9, 0x43, 0x50, 0x50, 0x4D,
+	// Bytes 1bc0 - 1bff
+	0x43, 0x50, 0x50, 0x56, 0x43, 0x50, 0x54, 0x45,
+	0x43, 0x54, 0x45, 0x4C, 0x43, 0x54, 0x48, 0x7A,
+	0x43, 0x56, 0x49, 0x49, 0x43, 0x58, 0x49, 0x49,
+	0x43, 0x61, 0x2F, 0x63, 0x43, 0x61, 0x2F, 0x73,
+	0x43, 0x61, 0xCA, 0xBE, 0x43, 0x62, 0x61, 0x72,
+	0x43, 0x63, 0x2F, 0x6F, 0x43, 0x63, 0x2F, 0x75,
+	0x43, 0x63, 0x61, 0x6C, 0x43, 0x63, 0x6D, 0x32,
+	0x43, 0x63, 0x6D, 0x33, 0x43, 0x64, 0x6D, 0x32,
+	// Bytes 1c00 - 1c3f
+	0x43, 0x64, 0x6D, 0x33, 0x43, 0x65, 0x72, 0x67,
+	0x43, 0x66, 0x66, 0x69, 0x43, 0x66, 0x66, 0x6C,
+	0x43, 0x67, 0x61, 0x6C, 0x43, 0x68, 0x50, 0x61,
+	0x43, 0x69, 0x69, 0x69, 0x43, 0x6B, 0x48, 0x7A,
+	0x43, 0x6B, 0x50, 0x61, 0x43, 0x6B, 0x6D, 0x32,
+	0x43, 0x6B, 0x6D, 0x33, 0x43, 0x6B, 0xCE, 0xA9,
+	0x43, 0x6C, 0x6F, 0x67, 0x43, 0x6C, 0xC2, 0xB7,
+	0x43, 0x6D, 0x69, 0x6C, 0x43, 0x6D, 0x6D, 0x32,
+	// Bytes 1c40 - 1c7f
+	0x43, 0x6D, 0x6D, 0x33, 0x43, 0x6D, 0x6F, 0x6C,
+	0x43, 0x72, 0x61, 0x64, 0x43, 0x76, 0x69, 0x69,
+	0x43, 0x78, 0x69, 0x69, 0x43, 0xC2, 0xB0, 0x43,
+	0x43, 0xC2, 0xB0, 0x46, 0x43, 0xCA, 0xBC, 0x6E,
+	0x43, 0xCE, 0xBC, 0x41, 0x43, 0xCE, 0xBC, 0x46,
+	0x43, 0xCE, 0xBC, 0x56, 0x43, 0xCE, 0xBC, 0x57,
+	0x43, 0xCE, 0xBC, 0x67, 0x43, 0xCE, 0xBC, 0x6C,
+	0x43, 0xCE, 0xBC, 0x6D, 0x43, 0xCE, 0xBC, 0x73,
+	// Bytes 1c80 - 1cbf
+	0x44, 0x28, 0x31, 0x30, 0x29, 0x44, 0x28, 0x31,
+	0x31, 0x29, 0x44, 0x28, 0x31, 0x32, 0x29, 0x44,
+	0x28, 0x31, 0x33, 0x29, 0x44, 0x28, 0x31, 0x34,
+	0x29, 0x44, 0x28, 0x31, 0x35, 0x29, 0x44, 0x28,
+	0x31, 0x36, 0x29, 0x44, 0x28, 0x31, 0x37, 0x29,
+	0x44, 0x28, 0x31, 0x38, 0x29, 0x44, 0x28, 0x31,
+	0x39, 0x29, 0x44, 0x28, 0x32, 0x30, 0x29, 0x44,
+	0x30, 0xE7, 0x82, 0xB9, 0x44, 0x31, 0xE2, 0x81,
+	// Bytes 1cc0 - 1cff
+	0x84, 0x44, 0x31, 0xE6, 0x97, 0xA5, 0x44, 0x31,
+	0xE6, 0x9C, 0x88, 0x44, 0x31, 0xE7, 0x82, 0xB9,
+	0x44, 0x32, 0xE6, 0x97, 0xA5, 0x44, 0x32, 0xE6,
+	0x9C, 0x88, 0x44, 0x32, 0xE7, 0x82, 0xB9, 0x44,
+	0x33, 0xE6, 0x97, 0xA5, 0x44, 0x33, 0xE6, 0x9C,
+	0x88, 0x44, 0x33, 0xE7, 0x82, 0xB9, 0x44, 0x34,
+	0xE6, 0x97, 0xA5, 0x44, 0x34, 0xE6, 0x9C, 0x88,
+	0x44, 0x34, 0xE7, 0x82, 0xB9, 0x44, 0x35, 0xE6,
+	// Bytes 1d00 - 1d3f
+	0x97, 0xA5, 0x44, 0x35, 0xE6, 0x9C, 0x88, 0x44,
+	0x35, 0xE7, 0x82, 0xB9, 0x44, 0x36, 0xE6, 0x97,
+	0xA5, 0x44, 0x36, 0xE6, 0x9C, 0x88, 0x44, 0x36,
+	0xE7, 0x82, 0xB9, 0x44, 0x37, 0xE6, 0x97, 0xA5,
+	0x44, 0x37, 0xE6, 0x9C, 0x88, 0x44, 0x37, 0xE7,
+	0x82, 0xB9, 0x44, 0x38, 0xE6, 0x97, 0xA5, 0x44,
+	0x38, 0xE6, 0x9C, 0x88, 0x44, 0x38, 0xE7, 0x82,
+	0xB9, 0x44, 0x39, 0xE6, 0x97, 0xA5, 0x44, 0x39,
+	// Bytes 1d40 - 1d7f
+	0xE6, 0x9C, 0x88, 0x44, 0x39, 0xE7, 0x82, 0xB9,
+	0x44, 0x56, 0x49, 0x49, 0x49, 0x44, 0x61, 0x2E,
+	0x6D, 0x2E, 0x44, 0x6B, 0x63, 0x61, 0x6C, 0x44,
+	0x70, 0x2E, 0x6D, 0x2E, 0x44, 0x76, 0x69, 0x69,
+	0x69, 0x44, 0xD5, 0xA5, 0xD6, 0x82, 0x44, 0xD5,
+	0xB4, 0xD5, 0xA5, 0x44, 0xD5, 0xB4, 0xD5, 0xAB,
+	0x44, 0xD5, 0xB4, 0xD5, 0xAD, 0x44, 0xD5, 0xB4,
+	0xD5, 0xB6, 0x44, 0xD5, 0xBE, 0xD5, 0xB6, 0x44,
+	// Bytes 1d80 - 1dbf
+	0xD7, 0x90, 0xD7, 0x9C, 0x44, 0xD8, 0xA7, 0xD9,
+	0xB4, 0x44, 0xD8, 0xA8, 0xD8, 0xAC, 0x44, 0xD8,
+	0xA8, 0xD8, 0xAD, 0x44, 0xD8, 0xA8, 0xD8, 0xAE,
+	0x44, 0xD8, 0xA8, 0xD8, 0xB1, 0x44, 0xD8, 0xA8,
+	0xD8, 0xB2, 0x44, 0xD8, 0xA8, 0xD9, 0x85, 0x44,
+	0xD8, 0xA8, 0xD9, 0x86, 0x44, 0xD8, 0xA8, 0xD9,
+	0x87, 0x44, 0xD8, 0xA8, 0xD9, 0x89, 0x44, 0xD8,
+	0xA8, 0xD9, 0x8A, 0x44, 0xD8, 0xAA, 0xD8, 0xAC,
+	// Bytes 1dc0 - 1dff
+	0x44, 0xD8, 0xAA, 0xD8, 0xAD, 0x44, 0xD8, 0xAA,
+	0xD8, 0xAE, 0x44, 0xD8, 0xAA, 0xD8, 0xB1, 0x44,
+	0xD8, 0xAA, 0xD8, 0xB2, 0x44, 0xD8, 0xAA, 0xD9,
+	0x85, 0x44, 0xD8, 0xAA, 0xD9, 0x86, 0x44, 0xD8,
+	0xAA, 0xD9, 0x87, 0x44, 0xD8, 0xAA, 0xD9, 0x89,
+	0x44, 0xD8, 0xAA, 0xD9, 0x8A, 0x44, 0xD8, 0xAB,
+	0xD8, 0xAC, 0x44, 0xD8, 0xAB, 0xD8, 0xB1, 0x44,
+	0xD8, 0xAB, 0xD8, 0xB2, 0x44, 0xD8, 0xAB, 0xD9,
+	// Bytes 1e00 - 1e3f
+	0x85, 0x44, 0xD8, 0xAB, 0xD9, 0x86, 0x44, 0xD8,
+	0xAB, 0xD9, 0x87, 0x44, 0xD8, 0xAB, 0xD9, 0x89,
+	0x44, 0xD8, 0xAB, 0xD9, 0x8A, 0x44, 0xD8, 0xAC,
+	0xD8, 0xAD, 0x44, 0xD8, 0xAC, 0xD9, 0x85, 0x44,
+	0xD8, 0xAC, 0xD9, 0x89, 0x44, 0xD8, 0xAC, 0xD9,
+	0x8A, 0x44, 0xD8, 0xAD, 0xD8, 0xAC, 0x44, 0xD8,
+	0xAD, 0xD9, 0x85, 0x44, 0xD8, 0xAD, 0xD9, 0x89,
+	0x44, 0xD8, 0xAD, 0xD9, 0x8A, 0x44, 0xD8, 0xAE,
+	// Bytes 1e40 - 1e7f
+	0xD8, 0xAC, 0x44, 0xD8, 0xAE, 0xD8, 0xAD, 0x44,
+	0xD8, 0xAE, 0xD9, 0x85, 0x44, 0xD8, 0xAE, 0xD9,
+	0x89, 0x44, 0xD8, 0xAE, 0xD9, 0x8A, 0x44, 0xD8,
+	0xB3, 0xD8, 0xAC, 0x44, 0xD8, 0xB3, 0xD8, 0xAD,
+	0x44, 0xD8, 0xB3, 0xD8, 0xAE, 0x44, 0xD8, 0xB3,
+	0xD8, 0xB1, 0x44, 0xD8, 0xB3, 0xD9, 0x85, 0x44,
+	0xD8, 0xB3, 0xD9, 0x87, 0x44, 0xD8, 0xB3, 0xD9,
+	0x89, 0x44, 0xD8, 0xB3, 0xD9, 0x8A, 0x44, 0xD8,
+	// Bytes 1e80 - 1ebf
+	0xB4, 0xD8, 0xAC, 0x44, 0xD8, 0xB4, 0xD8, 0xAD,
+	0x44, 0xD8, 0xB4, 0xD8, 0xAE, 0x44, 0xD8, 0xB4,
+	0xD8, 0xB1, 0x44, 0xD8, 0xB4, 0xD9, 0x85, 0x44,
+	0xD8, 0xB4, 0xD9, 0x87, 0x44, 0xD8, 0xB4, 0xD9,
+	0x89, 0x44, 0xD8, 0xB4, 0xD9, 0x8A, 0x44, 0xD8,
+	0xB5, 0xD8, 0xAD, 0x44, 0xD8, 0xB5, 0xD8, 0xAE,
+	0x44, 0xD8, 0xB5, 0xD8, 0xB1, 0x44, 0xD8, 0xB5,
+	0xD9, 0x85, 0x44, 0xD8, 0xB5, 0xD9, 0x89, 0x44,
+	// Bytes 1ec0 - 1eff
+	0xD8, 0xB5, 0xD9, 0x8A, 0x44, 0xD8, 0xB6, 0xD8,
+	0xAC, 0x44, 0xD8, 0xB6, 0xD8, 0xAD, 0x44, 0xD8,
+	0xB6, 0xD8, 0xAE, 0x44, 0xD8, 0xB6, 0xD8, 0xB1,
+	0x44, 0xD8, 0xB6, 0xD9, 0x85, 0x44, 0xD8, 0xB6,
+	0xD9, 0x89, 0x44, 0xD8, 0xB6, 0xD9, 0x8A, 0x44,
+	0xD8, 0xB7, 0xD8, 0xAD, 0x44, 0xD8, 0xB7, 0xD9,
+	0x85, 0x44, 0xD8, 0xB7, 0xD9, 0x89, 0x44, 0xD8,
+	0xB7, 0xD9, 0x8A, 0x44, 0xD8, 0xB8, 0xD9, 0x85,
+	// Bytes 1f00 - 1f3f
+	0x44, 0xD8, 0xB9, 0xD8, 0xAC, 0x44, 0xD8, 0xB9,
+	0xD9, 0x85, 0x44, 0xD8, 0xB9, 0xD9, 0x89, 0x44,
+	0xD8, 0xB9, 0xD9, 0x8A, 0x44, 0xD8, 0xBA, 0xD8,
+	0xAC, 0x44, 0xD8, 0xBA, 0xD9, 0x85, 0x44, 0xD8,
+	0xBA, 0xD9, 0x89, 0x44, 0xD8, 0xBA, 0xD9, 0x8A,
+	0x44, 0xD9, 0x81, 0xD8, 0xAC, 0x44, 0xD9, 0x81,
+	0xD8, 0xAD, 0x44, 0xD9, 0x81, 0xD8, 0xAE, 0x44,
+	0xD9, 0x81, 0xD9, 0x85, 0x44, 0xD9, 0x81, 0xD9,
+	// Bytes 1f40 - 1f7f
+	0x89, 0x44, 0xD9, 0x81, 0xD9, 0x8A, 0x44, 0xD9,
+	0x82, 0xD8, 0xAD, 0x44, 0xD9, 0x82, 0xD9, 0x85,
+	0x44, 0xD9, 0x82, 0xD9, 0x89, 0x44, 0xD9, 0x82,
+	0xD9, 0x8A, 0x44, 0xD9, 0x83, 0xD8, 0xA7, 0x44,
+	0xD9, 0x83, 0xD8, 0xAC, 0x44, 0xD9, 0x83, 0xD8,
+	0xAD, 0x44, 0xD9, 0x83, 0xD8, 0xAE, 0x44, 0xD9,
+	0x83, 0xD9, 0x84, 0x44, 0xD9, 0x83, 0xD9, 0x85,
+	0x44, 0xD9, 0x83, 0xD9, 0x89, 0x44, 0xD9, 0x83,
+	// Bytes 1f80 - 1fbf
+	0xD9, 0x8A, 0x44, 0xD9, 0x84, 0xD8, 0xA7, 0x44,
+	0xD9, 0x84, 0xD8, 0xAC, 0x44, 0xD9, 0x84, 0xD8,
+	0xAD, 0x44, 0xD9, 0x84, 0xD8, 0xAE, 0x44, 0xD9,
+	0x84, 0xD9, 0x85, 0x44, 0xD9, 0x84, 0xD9, 0x87,
+	0x44, 0xD9, 0x84, 0xD9, 0x89, 0x44, 0xD9, 0x84,
+	0xD9, 0x8A, 0x44, 0xD9, 0x85, 0xD8, 0xA7, 0x44,
+	0xD9, 0x85, 0xD8, 0xAC, 0x44, 0xD9, 0x85, 0xD8,
+	0xAD, 0x44, 0xD9, 0x85, 0xD8, 0xAE, 0x44, 0xD9,
+	// Bytes 1fc0 - 1fff
+	0x85, 0xD9, 0x85, 0x44, 0xD9, 0x85, 0xD9, 0x89,
+	0x44, 0xD9, 0x85, 0xD9, 0x8A, 0x44, 0xD9, 0x86,
+	0xD8, 0xAC, 0x44, 0xD9, 0x86, 0xD8, 0xAD, 0x44,
+	0xD9, 0x86, 0xD8, 0xAE, 0x44, 0xD9, 0x86, 0xD8,
+	0xB1, 0x44, 0xD9, 0x86, 0xD8, 0xB2, 0x44, 0xD9,
+	0x86, 0xD9, 0x85, 0x44, 0xD9, 0x86, 0xD9, 0x86,
+	0x44, 0xD9, 0x86, 0xD9, 0x87, 0x44, 0xD9, 0x86,
+	0xD9, 0x89, 0x44, 0xD9, 0x86, 0xD9, 0x8A, 0x44,
+	// Bytes 2000 - 203f
+	0xD9, 0x87, 0xD8, 0xAC, 0x44, 0xD9, 0x87, 0xD9,
+	0x85, 0x44, 0xD9, 0x87, 0xD9, 0x89, 0x44, 0xD9,
+	0x87, 0xD9, 0x8A, 0x44, 0xD9, 0x88, 0xD9, 0xB4,
+	0x44, 0xD9, 0x8A, 0xD8, 0xAC, 0x44, 0xD9, 0x8A,
+	0xD8, 0xAD, 0x44, 0xD9, 0x8A, 0xD8, 0xAE, 0x44,
+	0xD9, 0x8A, 0xD8, 0xB1, 0x44, 0xD9, 0x8A, 0xD8,
+	0xB2, 0x44, 0xD9, 0x8A, 0xD9, 0x85, 0x44, 0xD9,
+	0x8A, 0xD9, 0x86, 0x44, 0xD9, 0x8A, 0xD9, 0x87,
+	// Bytes 2040 - 207f
+	0x44, 0xD9, 0x8A, 0xD9, 0x89, 0x44, 0xD9, 0x8A,
+	0xD9, 0x8A, 0x44, 0xD9, 0x8A, 0xD9, 0xB4, 0x44,
+	0xDB, 0x87, 0xD9, 0xB4, 0x45, 0x28, 0xE1, 0x84,
+	0x80, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x82, 0x29,
+	0x45, 0x28, 0xE1, 0x84, 0x83, 0x29, 0x45, 0x28,
+	0xE1, 0x84, 0x85, 0x29, 0x45, 0x28, 0xE1, 0x84,
+	0x86, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x87, 0x29,
+	0x45, 0x28, 0xE1, 0x84, 0x89, 0x29, 0x45, 0x28,
+	// Bytes 2080 - 20bf
+	0xE1, 0x84, 0x8B, 0x29, 0x45, 0x28, 0xE1, 0x84,
+	0x8C, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x8E, 0x29,
+	0x45, 0x28, 0xE1, 0x84, 0x8F, 0x29, 0x45, 0x28,
+	0xE1, 0x84, 0x90, 0x29, 0x45, 0x28, 0xE1, 0x84,
+	0x91, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x92, 0x29,
+	0x45, 0x28, 0xE4, 0xB8, 0x80, 0x29, 0x45, 0x28,
+	0xE4, 0xB8, 0x83, 0x29, 0x45, 0x28, 0xE4, 0xB8,
+	0x89, 0x29, 0x45, 0x28, 0xE4, 0xB9, 0x9D, 0x29,
+	// Bytes 20c0 - 20ff
+	0x45, 0x28, 0xE4, 0xBA, 0x8C, 0x29, 0x45, 0x28,
+	0xE4, 0xBA, 0x94, 0x29, 0x45, 0x28, 0xE4, 0xBB,
+	0xA3, 0x29, 0x45, 0x28, 0xE4, 0xBC, 0x81, 0x29,
+	0x45, 0x28, 0xE4, 0xBC, 0x91, 0x29, 0x45, 0x28,
+	0xE5, 0x85, 0xAB, 0x29, 0x45, 0x28, 0xE5, 0x85,
+	0xAD, 0x29, 0x45, 0x28, 0xE5, 0x8A, 0xB4, 0x29,
+	0x45, 0x28, 0xE5, 0x8D, 0x81, 0x29, 0x45, 0x28,
+	0xE5, 0x8D, 0x94, 0x29, 0x45, 0x28, 0xE5, 0x90,
+	// Bytes 2100 - 213f
+	0x8D, 0x29, 0x45, 0x28, 0xE5, 0x91, 0xBC, 0x29,
+	0x45, 0x28, 0xE5, 0x9B, 0x9B, 0x29, 0x45, 0x28,
+	0xE5, 0x9C, 0x9F, 0x29, 0x45, 0x28, 0xE5, 0xAD,
+	0xA6, 0x29, 0x45, 0x28, 0xE6, 0x97, 0xA5, 0x29,
+	0x45, 0x28, 0xE6, 0x9C, 0x88, 0x29, 0x45, 0x28,
+	0xE6, 0x9C, 0x89, 0x29, 0x45, 0x28, 0xE6, 0x9C,
+	0xA8, 0x29, 0x45, 0x28, 0xE6, 0xA0, 0xAA, 0x29,
+	0x45, 0x28, 0xE6, 0xB0, 0xB4, 0x29, 0x45, 0x28,
+	// Bytes 2140 - 217f
+	0xE7, 0x81, 0xAB, 0x29, 0x45, 0x28, 0xE7, 0x89,
+	0xB9, 0x29, 0x45, 0x28, 0xE7, 0x9B, 0xA3, 0x29,
+	0x45, 0x28, 0xE7, 0xA4, 0xBE, 0x29, 0x45, 0x28,
+	0xE7, 0xA5, 0x9D, 0x29, 0x45, 0x28, 0xE7, 0xA5,
+	0xAD, 0x29, 0x45, 0x28, 0xE8, 0x87, 0xAA, 0x29,
+	0x45, 0x28, 0xE8, 0x87, 0xB3, 0x29, 0x45, 0x28,
+	0xE8, 0xB2, 0xA1, 0x29, 0x45, 0x28, 0xE8, 0xB3,
+	0x87, 0x29, 0x45, 0x28, 0xE9, 0x87, 0x91, 0x29,
+	// Bytes 2180 - 21bf
+	0x45, 0x30, 0xE2, 0x81, 0x84, 0x33, 0x45, 0x31,
+	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x31, 0x30, 0xE6,
+	0x9C, 0x88, 0x45, 0x31, 0x30, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x31, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	0x31, 0xE6, 0x9C, 0x88, 0x45, 0x31, 0x31, 0xE7,
+	0x82, 0xB9, 0x45, 0x31, 0x32, 0xE6, 0x97, 0xA5,
+	0x45, 0x31, 0x32, 0xE6, 0x9C, 0x88, 0x45, 0x31,
+	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x33, 0xE6,
+	// Bytes 21c0 - 21ff
+	0x97, 0xA5, 0x45, 0x31, 0x33, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x35, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x35, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x36, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	0x36, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x37, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x37, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x38, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	// Bytes 2200 - 223f
+	0x38, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x39, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x39, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0xE2, 0x81, 0x84, 0x32, 0x45, 0x31,
+	0xE2, 0x81, 0x84, 0x33, 0x45, 0x31, 0xE2, 0x81,
+	0x84, 0x34, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x35,
+	0x45, 0x31, 0xE2, 0x81, 0x84, 0x36, 0x45, 0x31,
+	0xE2, 0x81, 0x84, 0x37, 0x45, 0x31, 0xE2, 0x81,
+	0x84, 0x38, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x39,
+	// Bytes 2240 - 227f
+	0x45, 0x32, 0x30, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x30, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x31, 0xE6,
+	0x97, 0xA5, 0x45, 0x32, 0x31, 0xE7, 0x82, 0xB9,
+	0x45, 0x32, 0x32, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x33, 0xE6,
+	0x97, 0xA5, 0x45, 0x32, 0x33, 0xE7, 0x82, 0xB9,
+	0x45, 0x32, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x35, 0xE6,
+	// Bytes 2280 - 22bf
+	0x97, 0xA5, 0x45, 0x32, 0x36, 0xE6, 0x97, 0xA5,
+	0x45, 0x32, 0x37, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x38, 0xE6, 0x97, 0xA5, 0x45, 0x32, 0x39, 0xE6,
+	0x97, 0xA5, 0x45, 0x32, 0xE2, 0x81, 0x84, 0x33,
+	0x45, 0x32, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
+	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x33, 0x31, 0xE6,
+	0x97, 0xA5, 0x45, 0x33, 0xE2, 0x81, 0x84, 0x34,
+	0x45, 0x33, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
+	// Bytes 22c0 - 22ff
+	0xE2, 0x81, 0x84, 0x38, 0x45, 0x34, 0xE2, 0x81,
+	0x84, 0x35, 0x45, 0x35, 0xE2, 0x81, 0x84, 0x36,
+	0x45, 0x35, 0xE2, 0x81, 0x84, 0x38, 0x45, 0x37,
+	0xE2, 0x81, 0x84, 0x38, 0x45, 0x41, 0xE2, 0x88,
+	0x95, 0x6D, 0x45, 0x56, 0xE2, 0x88, 0x95, 0x6D,
+	0x45, 0x6D, 0xE2, 0x88, 0x95, 0x73, 0x46, 0x31,
+	0xE2, 0x81, 0x84, 0x31, 0x30, 0x46, 0x43, 0xE2,
+	0x88, 0x95, 0x6B, 0x67, 0x46, 0x6D, 0xE2, 0x88,
+	// Bytes 2300 - 233f
+	0x95, 0x73, 0x32, 0x46, 0xD8, 0xA8, 0xD8, 0xAD,
+	0xD9, 0x8A, 0x46, 0xD8, 0xA8, 0xD8, 0xAE, 0xD9,
+	0x8A, 0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x85,
+	0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x89, 0x46,
+	0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
+	0xAA, 0xD8, 0xAD, 0xD8, 0xAC, 0x46, 0xD8, 0xAA,
+	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8,
+	0xAE, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8, 0xAE,
+	// Bytes 2340 - 237f
+	0xD9, 0x89, 0x46, 0xD8, 0xAA, 0xD8, 0xAE, 0xD9,
+	0x8A, 0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAC,
+	0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAD, 0x46,
+	0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAE, 0x46, 0xD8,
+	0xAA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAA,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD8,
+	0xAD, 0xD9, 0x89, 0x46, 0xD8, 0xAC, 0xD8, 0xAD,
+	0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD8,
+	// Bytes 2380 - 23bf
+	0xAD, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x89,
+	0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
+	0xD8, 0xAD, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
+	0xAD, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAD,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB3, 0xD8,
+	0xAC, 0xD8, 0xAD, 0x46, 0xD8, 0xB3, 0xD8, 0xAC,
+	0xD9, 0x89, 0x46, 0xD8, 0xB3, 0xD8, 0xAD, 0xD8,
+	0xAC, 0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x89,
+	// Bytes 23c0 - 23ff
+	0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x8A, 0x46,
+	0xD8, 0xB3, 0xD9, 0x85, 0xD8, 0xAC, 0x46, 0xD8,
+	0xB3, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8, 0xB3,
+	0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8,
+	0xAC, 0xD9, 0x8A, 0x46, 0xD8, 0xB4, 0xD8, 0xAD,
+	0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8, 0xAD, 0xD9,
+	0x8A, 0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD8, 0xAE,
+	0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD9, 0x85, 0x46,
+	// Bytes 2400 - 243f
+	0xD8, 0xB5, 0xD8, 0xAD, 0xD8, 0xAD, 0x46, 0xD8,
+	0xB5, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD8, 0xB5,
+	0xD9, 0x84, 0xD9, 0x89, 0x46, 0xD8, 0xB5, 0xD9,
+	0x84, 0xDB, 0x92, 0x46, 0xD8, 0xB5, 0xD9, 0x85,
+	0xD9, 0x85, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9,
+	0x89, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9, 0x8A,
+	0x46, 0xD8, 0xB6, 0xD8, 0xAE, 0xD9, 0x85, 0x46,
+	0xD8, 0xB7, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8,
+	// Bytes 2440 - 247f
+	0xB7, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB7,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB9, 0xD8,
+	0xAC, 0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85,
+	0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9,
+	0x89, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9, 0x8A,
+	0x46, 0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x85, 0x46,
+	0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8,
+	0xBA, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x81,
+	// Bytes 2480 - 24bf
+	0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x81, 0xD9,
+	0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x82, 0xD9, 0x84,
+	0xDB, 0x92, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD8,
+	0xAD, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x85,
+	0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
+	0xD9, 0x83, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
+	0x83, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x84,
+	0xD8, 0xAC, 0xD8, 0xAC, 0x46, 0xD9, 0x84, 0xD8,
+	// Bytes 24c0 - 24ff
+	0xAC, 0xD9, 0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAC,
+	0xD9, 0x8A, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9,
+	0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x89,
+	0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x8A, 0x46,
+	0xD9, 0x84, 0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9,
+	0x84, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD9, 0x84,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD8,
+	0xAC, 0xD8, 0xAD, 0x46, 0xD9, 0x85, 0xD8, 0xAC,
+	// Bytes 2500 - 253f
+	0xD8, 0xAE, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9,
+	0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9, 0x8A,
+	0x46, 0xD9, 0x85, 0xD8, 0xAD, 0xD8, 0xAC, 0x46,
+	0xD9, 0x85, 0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9,
+	0x85, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x85,
+	0xD8, 0xAE, 0xD8, 0xAC, 0x46, 0xD9, 0x85, 0xD8,
+	0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAE,
+	0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD9, 0x85, 0xD9,
+	// Bytes 2540 - 257f
+	0x8A, 0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD8, 0xAD,
+	0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x85, 0x46,
+	0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x89, 0x46, 0xD9,
+	0x86, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x86,
+	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9, 0x86, 0xD8,
+	0xAD, 0xD9, 0x89, 0x46, 0xD9, 0x86, 0xD8, 0xAD,
+	0xD9, 0x8A, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9,
+	0x89, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9, 0x8A,
+	// Bytes 2580 - 25bf
+	0x46, 0xD9, 0x87, 0xD9, 0x85, 0xD8, 0xAC, 0x46,
+	0xD9, 0x87, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
+	0x8A, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x8A,
+	0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9,
+	0x85, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x85,
+	0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8,
+	0xA7, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAC,
+	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAD, 0x46,
+	// Bytes 25c0 - 25ff
+	0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAE, 0x46, 0xD9,
+	0x8A, 0xD9, 0x94, 0xD8, 0xB1, 0x46, 0xD9, 0x8A,
+	0xD9, 0x94, 0xD8, 0xB2, 0x46, 0xD9, 0x8A, 0xD9,
+	0x94, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
+	0xD9, 0x86, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9,
+	0x87, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x88,
+	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x89, 0x46,
+	0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x8A, 0x46, 0xD9,
+	// Bytes 2600 - 263f
+	0x8A, 0xD9, 0x94, 0xDB, 0x86, 0x46, 0xD9, 0x8A,
+	0xD9, 0x94, 0xDB, 0x87, 0x46, 0xD9, 0x8A, 0xD9,
+	0x94, 0xDB, 0x88, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
+	0xDB, 0x90, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xDB,
+	0x95, 0x46, 0xE0, 0xB9, 0x8D, 0xE0, 0xB8, 0xB2,
+	0x46, 0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0x99, 0x46,
+	0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0xA1, 0x46, 0xE0,
+	0xBB, 0x8D, 0xE0, 0xBA, 0xB2, 0x46, 0xE0, 0xBD,
+	// Bytes 2640 - 267f
+	0x80, 0xE0, 0xBE, 0xB5, 0x46, 0xE0, 0xBD, 0x82,
+	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x8C, 0xE0,
+	0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x91, 0xE0, 0xBE,
+	0xB7, 0x46, 0xE0, 0xBD, 0x96, 0xE0, 0xBE, 0xB7,
+	0x46, 0xE0, 0xBD, 0x9B, 0xE0, 0xBE, 0xB7, 0x46,
+	0xE0, 0xBE, 0x90, 0xE0, 0xBE, 0xB5, 0x46, 0xE0,
+	0xBE, 0x92, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE,
+	0x9C, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA1,
+	// Bytes 2680 - 26bf
+	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA6, 0xE0,
+	0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xAB, 0xE0, 0xBE,
+	0xB7, 0x46, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
+	0x46, 0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0x46,
+	0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB, 0x46, 0xE2,
+	0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x46, 0xE3, 0x81,
+	0xBB, 0xE3, 0x81, 0x8B, 0x46, 0xE3, 0x82, 0x88,
+	0xE3, 0x82, 0x8A, 0x46, 0xE3, 0x82, 0xAD, 0xE3,
+	// Bytes 26c0 - 26ff
+	0x83, 0xAD, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x82,
+	0xB3, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x83, 0x88,
+	0x46, 0xE3, 0x83, 0x88, 0xE3, 0x83, 0xB3, 0x46,
+	0xE3, 0x83, 0x8A, 0xE3, 0x83, 0x8E, 0x46, 0xE3,
+	0x83, 0x9B, 0xE3, 0x83, 0xB3, 0x46, 0xE3, 0x83,
+	0x9F, 0xE3, 0x83, 0xAA, 0x46, 0xE3, 0x83, 0xAA,
+	0xE3, 0x83, 0xA9, 0x46, 0xE3, 0x83, 0xAC, 0xE3,
+	0x83, 0xA0, 0x46, 0xE5, 0xA4, 0xA7, 0xE6, 0xAD,
+	// Bytes 2700 - 273f
+	0xA3, 0x46, 0xE5, 0xB9, 0xB3, 0xE6, 0x88, 0x90,
+	0x46, 0xE6, 0x98, 0x8E, 0xE6, 0xB2, 0xBB, 0x46,
+	0xE6, 0x98, 0xAD, 0xE5, 0x92, 0x8C, 0x47, 0x72,
+	0x61, 0x64, 0xE2, 0x88, 0x95, 0x73, 0x47, 0xE3,
+	0x80, 0x94, 0x53, 0xE3, 0x80, 0x95, 0x48, 0x28,
+	0xE1, 0x84, 0x80, 0xE1, 0x85, 0xA1, 0x29, 0x48,
+	0x28, 0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1, 0x29,
+	0x48, 0x28, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1,
+	// Bytes 2740 - 277f
+	0x29, 0x48, 0x28, 0xE1, 0x84, 0x85, 0xE1, 0x85,
+	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x86, 0xE1,
+	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x87,
+	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84,
+	0x89, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1,
+	0x84, 0x8B, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28,
+	0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xA1, 0x29, 0x48,
+	0x28, 0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xAE, 0x29,
+	// Bytes 2780 - 27bf
+	0x48, 0x28, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1,
+	0x29, 0x48, 0x28, 0xE1, 0x84, 0x8F, 0xE1, 0x85,
+	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x90, 0xE1,
+	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x91,
+	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84,
+	0x92, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x72, 0x61,
+	0x64, 0xE2, 0x88, 0x95, 0x73, 0x32, 0x48, 0xD8,
+	0xA7, 0xD9, 0x83, 0xD8, 0xA8, 0xD8, 0xB1, 0x48,
+	// Bytes 27c0 - 27ff
+	0xD8, 0xA7, 0xD9, 0x84, 0xD9, 0x84, 0xD9, 0x87,
+	0x48, 0xD8, 0xB1, 0xD8, 0xB3, 0xD9, 0x88, 0xD9,
+	0x84, 0x48, 0xD8, 0xB1, 0xDB, 0x8C, 0xD8, 0xA7,
+	0xD9, 0x84, 0x48, 0xD8, 0xB5, 0xD9, 0x84, 0xD8,
+	0xB9, 0xD9, 0x85, 0x48, 0xD8, 0xB9, 0xD9, 0x84,
+	0xD9, 0x8A, 0xD9, 0x87, 0x48, 0xD9, 0x85, 0xD8,
+	0xAD, 0xD9, 0x85, 0xD8, 0xAF, 0x48, 0xD9, 0x88,
+	0xD8, 0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x49, 0xE2,
+	// Bytes 2800 - 283f
+	0x80, 0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
+	0x49, 0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0xE2,
+	0x80, 0xB5, 0x49, 0xE2, 0x88, 0xAB, 0xE2, 0x88,
+	0xAB, 0xE2, 0x88, 0xAB, 0x49, 0xE2, 0x88, 0xAE,
+	0xE2, 0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x49, 0xE3,
+	0x80, 0x94, 0xE4, 0xB8, 0x89, 0xE3, 0x80, 0x95,
+	0x49, 0xE3, 0x80, 0x94, 0xE4, 0xBA, 0x8C, 0xE3,
+	0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE5, 0x8B,
+	// Bytes 2840 - 287f
+	0x9D, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94,
+	0xE5, 0xAE, 0x89, 0xE3, 0x80, 0x95, 0x49, 0xE3,
+	0x80, 0x94, 0xE6, 0x89, 0x93, 0xE3, 0x80, 0x95,
+	0x49, 0xE3, 0x80, 0x94, 0xE6, 0x95, 0x97, 0xE3,
+	0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE6, 0x9C,
+	0xAC, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94,
+	0xE7, 0x82, 0xB9, 0xE3, 0x80, 0x95, 0x49, 0xE3,
+	0x80, 0x94, 0xE7, 0x9B, 0x97, 0xE3, 0x80, 0x95,
+	// Bytes 2880 - 28bf
+	0x49, 0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0xAB, 0x49, 0xE3, 0x82, 0xA4, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x81, 0x49, 0xE3, 0x82, 0xA6,
+	0xE3, 0x82, 0xA9, 0xE3, 0x83, 0xB3, 0x49, 0xE3,
+	0x82, 0xAA, 0xE3, 0x83, 0xB3, 0xE3, 0x82, 0xB9,
+	0x49, 0xE3, 0x82, 0xAA, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0xA0, 0x49, 0xE3, 0x82, 0xAB, 0xE3, 0x82,
+	0xA4, 0xE3, 0x83, 0xAA, 0x49, 0xE3, 0x82, 0xB1,
+	// Bytes 28c0 - 28ff
+	0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xB9, 0x49, 0xE3,
+	0x82, 0xB3, 0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x8A,
+	0x49, 0xE3, 0x82, 0xBB, 0xE3, 0x83, 0xB3, 0xE3,
+	0x83, 0x81, 0x49, 0xE3, 0x82, 0xBB, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x88, 0x49, 0xE3, 0x83, 0x86,
+	0xE3, 0x82, 0x99, 0xE3, 0x82, 0xB7, 0x49, 0xE3,
+	0x83, 0x88, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB,
+	0x49, 0xE3, 0x83, 0x8E, 0xE3, 0x83, 0x83, 0xE3,
+	// Bytes 2900 - 293f
+	0x83, 0x88, 0x49, 0xE3, 0x83, 0x8F, 0xE3, 0x82,
+	0xA4, 0xE3, 0x83, 0x84, 0x49, 0xE3, 0x83, 0x92,
+	0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB, 0x49, 0xE3,
+	0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x82, 0xB3,
+	0x49, 0xE3, 0x83, 0x95, 0xE3, 0x83, 0xA9, 0xE3,
+	0x83, 0xB3, 0x49, 0xE3, 0x83, 0x98, 0xE3, 0x82,
+	0x9A, 0xE3, 0x82, 0xBD, 0x49, 0xE3, 0x83, 0x98,
+	0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x84, 0x49, 0xE3,
+	// Bytes 2940 - 297f
+	0x83, 0x9B, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0xAB,
+	0x49, 0xE3, 0x83, 0x9B, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0xB3, 0x49, 0xE3, 0x83, 0x9E, 0xE3, 0x82,
+	0xA4, 0xE3, 0x83, 0xAB, 0x49, 0xE3, 0x83, 0x9E,
+	0xE3, 0x83, 0x83, 0xE3, 0x83, 0x8F, 0x49, 0xE3,
+	0x83, 0x9E, 0xE3, 0x83, 0xAB, 0xE3, 0x82, 0xAF,
+	0x49, 0xE3, 0x83, 0xA4, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0xAB, 0x49, 0xE3, 0x83, 0xA6, 0xE3, 0x82,
+	// Bytes 2980 - 29bf
+	0xA2, 0xE3, 0x83, 0xB3, 0x49, 0xE3, 0x83, 0xAF,
+	0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88, 0x4C, 0xE2,
+	0x80, 0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
+	0xE2, 0x80, 0xB2, 0x4C, 0xE2, 0x88, 0xAB, 0xE2,
+	0x88, 0xAB, 0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB,
+	0x4C, 0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xAB, 0xE3,
+	0x83, 0x95, 0xE3, 0x82, 0xA1, 0x4C, 0xE3, 0x82,
+	0xA8, 0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xAB, 0xE3,
+	// Bytes 29c0 - 29ff
+	0x83, 0xBC, 0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x82,
+	0x99, 0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xB3, 0x4C,
+	0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x9E, 0x4C, 0xE3, 0x82, 0xAB,
+	0xE3, 0x83, 0xA9, 0xE3, 0x83, 0x83, 0xE3, 0x83,
+	0x88, 0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x83, 0xAD,
+	0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xBC, 0x4C, 0xE3,
+	0x82, 0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0x8B,
+	// Bytes 2a00 - 2a3f
+	0xE3, 0x83, 0xBC, 0x4C, 0xE3, 0x82, 0xAD, 0xE3,
+	0x83, 0xA5, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xBC,
+	0x4C, 0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3,
+	0x83, 0xA9, 0xE3, 0x83, 0xA0, 0x4C, 0xE3, 0x82,
+	0xAF, 0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0x8D, 0x4C, 0xE3, 0x82, 0xB5, 0xE3, 0x82,
+	0xA4, 0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C,
+	0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	// Bytes 2a40 - 2a7f
+	0xBC, 0xE3, 0x82, 0xB9, 0x4C, 0xE3, 0x83, 0x8F,
+	0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0x84, 0x4C, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A,
+	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C, 0xE3,
+	0x83, 0x95, 0xE3, 0x82, 0xA3, 0xE3, 0x83, 0xBC,
+	0xE3, 0x83, 0x88, 0x4C, 0xE3, 0x83, 0x98, 0xE3,
+	0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xBF,
+	0x4C, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3,
+	// Bytes 2a80 - 2abf
+	0x83, 0x8B, 0xE3, 0x83, 0x92, 0x4C, 0xE3, 0x83,
+	0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xB3, 0xE3,
+	0x82, 0xB9, 0x4C, 0xE3, 0x83, 0x9B, 0xE3, 0x82,
+	0x99, 0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x88, 0x4C,
+	0xE3, 0x83, 0x9E, 0xE3, 0x82, 0xA4, 0xE3, 0x82,
+	0xAF, 0xE3, 0x83, 0xAD, 0x4C, 0xE3, 0x83, 0x9F,
+	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAD, 0xE3, 0x83,
+	0xB3, 0x4C, 0xE3, 0x83, 0xA1, 0xE3, 0x83, 0xBC,
+	// Bytes 2ac0 - 2aff
+	0xE3, 0x83, 0x88, 0xE3, 0x83, 0xAB, 0x4C, 0xE3,
+	0x83, 0xAA, 0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88,
+	0xE3, 0x83, 0xAB, 0x4C, 0xE3, 0x83, 0xAB, 0xE3,
+	0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC,
+	0x4C, 0xE6, 0xA0, 0xAA, 0xE5, 0xBC, 0x8F, 0xE4,
+	0xBC, 0x9A, 0xE7, 0xA4, 0xBE, 0x4E, 0x28, 0xE1,
+	0x84, 0x8B, 0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x92,
+	0xE1, 0x85, 0xAE, 0x29, 0x4F, 0xD8, 0xAC, 0xD9,
+	// Bytes 2b00 - 2b3f
+	0x84, 0x20, 0xD8, 0xAC, 0xD9, 0x84, 0xD8, 0xA7,
+	0xD9, 0x84, 0xD9, 0x87, 0x4F, 0xE3, 0x82, 0xA2,
+	0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
+	0xBC, 0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xA2,
+	0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x98, 0xE3, 0x82,
+	0x9A, 0xE3, 0x82, 0xA2, 0x4F, 0xE3, 0x82, 0xAD,
+	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xAF, 0xE3, 0x83,
+	0x83, 0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xB5,
+	// Bytes 2b40 - 2b7f
+	0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x81, 0xE3, 0x83,
+	0xBC, 0xE3, 0x83, 0xA0, 0x4F, 0xE3, 0x83, 0x8F,
+	0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0xAC, 0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x98,
+	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0xBF, 0xE3, 0x83,
+	0xBC, 0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x9B,
+	0xE3, 0x82, 0x9A, 0xE3, 0x82, 0xA4, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x83, 0x9E,
+	// Bytes 2b80 - 2bbf
+	0xE3, 0x83, 0xB3, 0xE3, 0x82, 0xB7, 0xE3, 0x83,
+	0xA7, 0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xA1,
+	0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	0x88, 0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xAB,
+	0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x95, 0xE3, 0x82,
+	0x99, 0xE3, 0x83, 0xAB, 0x51, 0x28, 0xE1, 0x84,
+	0x8B, 0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x8C, 0xE1,
+	0x85, 0xA5, 0xE1, 0x86, 0xAB, 0x29, 0x52, 0xE3,
+	// Bytes 2bc0 - 2bff
+	0x82, 0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB,
+	0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	0xBC, 0x52, 0xE3, 0x82, 0xAD, 0xE3, 0x83, 0xAD,
+	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	0xA9, 0xE3, 0x83, 0xA0, 0x52, 0xE3, 0x82, 0xAD,
+	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xA1, 0xE3, 0x83,
+	0xBC, 0xE3, 0x83, 0x88, 0xE3, 0x83, 0xAB, 0x52,
+	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	// Bytes 2c00 - 2c3f
+	0xA9, 0xE3, 0x83, 0xA0, 0xE3, 0x83, 0x88, 0xE3,
+	0x83, 0xB3, 0x52, 0xE3, 0x82, 0xAF, 0xE3, 0x83,
+	0xAB, 0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99, 0xE3,
+	0x82, 0xA4, 0xE3, 0x83, 0xAD, 0x52, 0xE3, 0x83,
+	0x8F, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3,
+	0x82, 0xBB, 0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x88,
+	0x52, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3,
+	0x82, 0xA2, 0xE3, 0x82, 0xB9, 0xE3, 0x83, 0x88,
+	// Bytes 2c40 - 2c7f
+	0xE3, 0x83, 0xAB, 0x52, 0xE3, 0x83, 0x95, 0xE3,
+	0x82, 0x99, 0xE3, 0x83, 0x83, 0xE3, 0x82, 0xB7,
+	0xE3, 0x82, 0xA7, 0xE3, 0x83, 0xAB, 0x52, 0xE3,
+	0x83, 0x9F, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0x8F,
+	0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0xAB, 0x52, 0xE3, 0x83, 0xAC, 0xE3, 0x83, 0xB3,
+	0xE3, 0x83, 0x88, 0xE3, 0x82, 0xB1, 0xE3, 0x82,
+	0x99, 0xE3, 0x83, 0xB3, 0x61, 0xD8, 0xB5, 0xD9,
+	// Bytes 2c80 - 2cbf
+	0x84, 0xD9, 0x89, 0x20, 0xD8, 0xA7, 0xD9, 0x84,
+	0xD9, 0x84, 0xD9, 0x87, 0x20, 0xD8, 0xB9, 0xD9,
+	0x84, 0xD9, 0x8A, 0xD9, 0x87, 0x20, 0xD9, 0x88,
+	0xD8, 0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x06, 0xE0,
+	0xA7, 0x87, 0xE0, 0xA6, 0xBE, 0x01, 0x06, 0xE0,
+	0xA7, 0x87, 0xE0, 0xA7, 0x97, 0x01, 0x06, 0xE0,
+	0xAD, 0x87, 0xE0, 0xAC, 0xBE, 0x01, 0x06, 0xE0,
+	0xAD, 0x87, 0xE0, 0xAD, 0x96, 0x01, 0x06, 0xE0,
+	// Bytes 2cc0 - 2cff
+	0xAD, 0x87, 0xE0, 0xAD, 0x97, 0x01, 0x06, 0xE0,
+	0xAE, 0x92, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0,
+	0xAF, 0x86, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0,
+	0xAF, 0x86, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0,
+	0xAF, 0x87, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0,
+	0xB2, 0xBF, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0,
+	0xB3, 0x86, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0,
+	0xB3, 0x86, 0xE0, 0xB3, 0x96, 0x01, 0x06, 0xE0,
+	// Bytes 2d00 - 2d3f
+	0xB5, 0x86, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0,
+	0xB5, 0x86, 0xE0, 0xB5, 0x97, 0x01, 0x06, 0xE0,
+	0xB5, 0x87, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0,
+	0xB7, 0x99, 0xE0, 0xB7, 0x9F, 0x01, 0x06, 0xE1,
+	0x80, 0xA5, 0xE1, 0x80, 0xAE, 0x01, 0x06, 0xE1,
+	0xAC, 0x85, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0x87, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0x89, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	// Bytes 2d40 - 2d7f
+	0xAC, 0x8B, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0x8D, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0x91, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0xBA, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0xBC, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0xBE, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0xBF, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAD, 0x82, 0xE1, 0xAC, 0xB5, 0x01, 0x08, 0xF0,
+	// Bytes 2d80 - 2dbf
+	0x91, 0x84, 0xB1, 0xF0, 0x91, 0x84, 0xA7, 0x01,
+	0x08, 0xF0, 0x91, 0x84, 0xB2, 0xF0, 0x91, 0x84,
+	0xA7, 0x01, 0x08, 0xF0, 0x91, 0x8D, 0x87, 0xF0,
+	0x91, 0x8C, 0xBE, 0x01, 0x08, 0xF0, 0x91, 0x8D,
+	0x87, 0xF0, 0x91, 0x8D, 0x97, 0x01, 0x08, 0xF0,
+	0x91, 0x92, 0xB9, 0xF0, 0x91, 0x92, 0xB0, 0x01,
+	0x08, 0xF0, 0x91, 0x92, 0xB9, 0xF0, 0x91, 0x92,
+	0xBA, 0x01, 0x08, 0xF0, 0x91, 0x92, 0xB9, 0xF0,
+	// Bytes 2dc0 - 2dff
+	0x91, 0x92, 0xBD, 0x01, 0x08, 0xF0, 0x91, 0x96,
+	0xB8, 0xF0, 0x91, 0x96, 0xAF, 0x01, 0x08, 0xF0,
+	0x91, 0x96, 0xB9, 0xF0, 0x91, 0x96, 0xAF, 0x01,
+	0x09, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82, 0xE0,
+	0xB3, 0x95, 0x02, 0x09, 0xE0, 0xB7, 0x99, 0xE0,
+	0xB7, 0x8F, 0xE0, 0xB7, 0x8A, 0x12, 0x44, 0x44,
+	0x5A, 0xCC, 0x8C, 0xC9, 0x44, 0x44, 0x7A, 0xCC,
+	0x8C, 0xC9, 0x44, 0x64, 0x7A, 0xCC, 0x8C, 0xC9,
+	// Bytes 2e00 - 2e3f
+	0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x93, 0xC9,
+	0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x94, 0xC9,
+	0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x95, 0xB5,
+	0x46, 0xE1, 0x84, 0x80, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x85, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x86, 0xE1, 0x85, 0xA1, 0x01,
+	// Bytes 2e40 - 2e7f
+	0x46, 0xE1, 0x84, 0x87, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x89, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xAE, 0x01,
+	0x46, 0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x8F, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x90, 0xE1, 0x85, 0xA1, 0x01,
+	// Bytes 2e80 - 2ebf
+	0x46, 0xE1, 0x84, 0x91, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x92, 0xE1, 0x85, 0xA1, 0x01,
+	0x49, 0xE3, 0x83, 0xA1, 0xE3, 0x82, 0xAB, 0xE3,
+	0x82, 0x99, 0x0D, 0x4C, 0xE1, 0x84, 0x8C, 0xE1,
+	0x85, 0xAE, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xB4,
+	0x01, 0x4C, 0xE3, 0x82, 0xAD, 0xE3, 0x82, 0x99,
+	0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0x0D, 0x4C,
+	0xE3, 0x82, 0xB3, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	// Bytes 2ec0 - 2eff
+	0x9B, 0xE3, 0x82, 0x9A, 0x0D, 0x4C, 0xE3, 0x83,
+	0xA4, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x88, 0xE3,
+	0x82, 0x99, 0x0D, 0x4F, 0xE1, 0x84, 0x8E, 0xE1,
+	0x85, 0xA1, 0xE1, 0x86, 0xB7, 0xE1, 0x84, 0x80,
+	0xE1, 0x85, 0xA9, 0x01, 0x4F, 0xE3, 0x82, 0xA4,
+	0xE3, 0x83, 0x8B, 0xE3, 0x83, 0xB3, 0xE3, 0x82,
+	0xAF, 0xE3, 0x82, 0x99, 0x0D, 0x4F, 0xE3, 0x82,
+	0xB7, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xB3, 0xE3,
+	// Bytes 2f00 - 2f3f
+	0x82, 0xAF, 0xE3, 0x82, 0x99, 0x0D, 0x4F, 0xE3,
+	0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC,
+	0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99, 0x0D, 0x4F,
+	0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99, 0x0D,
+	0x52, 0xE3, 0x82, 0xA8, 0xE3, 0x82, 0xB9, 0xE3,
+	0x82, 0xAF, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x88,
+	0xE3, 0x82, 0x99, 0x0D, 0x52, 0xE3, 0x83, 0x95,
+	// Bytes 2f40 - 2f7f
+	0xE3, 0x82, 0xA1, 0xE3, 0x83, 0xA9, 0xE3, 0x83,
+	0x83, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99, 0x0D,
+	0x86, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82, 0x01,
+	0x86, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8F, 0x01,
+	0x03, 0x3C, 0xCC, 0xB8, 0x05, 0x03, 0x3D, 0xCC,
+	0xB8, 0x05, 0x03, 0x3E, 0xCC, 0xB8, 0x05, 0x03,
+	0x41, 0xCC, 0x80, 0xC9, 0x03, 0x41, 0xCC, 0x81,
+	0xC9, 0x03, 0x41, 0xCC, 0x83, 0xC9, 0x03, 0x41,
+	// Bytes 2f80 - 2fbf
+	0xCC, 0x84, 0xC9, 0x03, 0x41, 0xCC, 0x89, 0xC9,
+	0x03, 0x41, 0xCC, 0x8C, 0xC9, 0x03, 0x41, 0xCC,
+	0x8F, 0xC9, 0x03, 0x41, 0xCC, 0x91, 0xC9, 0x03,
+	0x41, 0xCC, 0xA5, 0xB5, 0x03, 0x41, 0xCC, 0xA8,
+	0xA5, 0x03, 0x42, 0xCC, 0x87, 0xC9, 0x03, 0x42,
+	0xCC, 0xA3, 0xB5, 0x03, 0x42, 0xCC, 0xB1, 0xB5,
+	0x03, 0x43, 0xCC, 0x81, 0xC9, 0x03, 0x43, 0xCC,
+	0x82, 0xC9, 0x03, 0x43, 0xCC, 0x87, 0xC9, 0x03,
+	// Bytes 2fc0 - 2fff
+	0x43, 0xCC, 0x8C, 0xC9, 0x03, 0x44, 0xCC, 0x87,
+	0xC9, 0x03, 0x44, 0xCC, 0x8C, 0xC9, 0x03, 0x44,
+	0xCC, 0xA3, 0xB5, 0x03, 0x44, 0xCC, 0xA7, 0xA5,
+	0x03, 0x44, 0xCC, 0xAD, 0xB5, 0x03, 0x44, 0xCC,
+	0xB1, 0xB5, 0x03, 0x45, 0xCC, 0x80, 0xC9, 0x03,
+	0x45, 0xCC, 0x81, 0xC9, 0x03, 0x45, 0xCC, 0x83,
+	0xC9, 0x03, 0x45, 0xCC, 0x86, 0xC9, 0x03, 0x45,
+	0xCC, 0x87, 0xC9, 0x03, 0x45, 0xCC, 0x88, 0xC9,
+	// Bytes 3000 - 303f
+	0x03, 0x45, 0xCC, 0x89, 0xC9, 0x03, 0x45, 0xCC,
+	0x8C, 0xC9, 0x03, 0x45, 0xCC, 0x8F, 0xC9, 0x03,
+	0x45, 0xCC, 0x91, 0xC9, 0x03, 0x45, 0xCC, 0xA8,
+	0xA5, 0x03, 0x45, 0xCC, 0xAD, 0xB5, 0x03, 0x45,
+	0xCC, 0xB0, 0xB5, 0x03, 0x46, 0xCC, 0x87, 0xC9,
+	0x03, 0x47, 0xCC, 0x81, 0xC9, 0x03, 0x47, 0xCC,
+	0x82, 0xC9, 0x03, 0x47, 0xCC, 0x84, 0xC9, 0x03,
+	0x47, 0xCC, 0x86, 0xC9, 0x03, 0x47, 0xCC, 0x87,
+	// Bytes 3040 - 307f
+	0xC9, 0x03, 0x47, 0xCC, 0x8C, 0xC9, 0x03, 0x47,
+	0xCC, 0xA7, 0xA5, 0x03, 0x48, 0xCC, 0x82, 0xC9,
+	0x03, 0x48, 0xCC, 0x87, 0xC9, 0x03, 0x48, 0xCC,
+	0x88, 0xC9, 0x03, 0x48, 0xCC, 0x8C, 0xC9, 0x03,
+	0x48, 0xCC, 0xA3, 0xB5, 0x03, 0x48, 0xCC, 0xA7,
+	0xA5, 0x03, 0x48, 0xCC, 0xAE, 0xB5, 0x03, 0x49,
+	0xCC, 0x80, 0xC9, 0x03, 0x49, 0xCC, 0x81, 0xC9,
+	0x03, 0x49, 0xCC, 0x82, 0xC9, 0x03, 0x49, 0xCC,
+	// Bytes 3080 - 30bf
+	0x83, 0xC9, 0x03, 0x49, 0xCC, 0x84, 0xC9, 0x03,
+	0x49, 0xCC, 0x86, 0xC9, 0x03, 0x49, 0xCC, 0x87,
+	0xC9, 0x03, 0x49, 0xCC, 0x89, 0xC9, 0x03, 0x49,
+	0xCC, 0x8C, 0xC9, 0x03, 0x49, 0xCC, 0x8F, 0xC9,
+	0x03, 0x49, 0xCC, 0x91, 0xC9, 0x03, 0x49, 0xCC,
+	0xA3, 0xB5, 0x03, 0x49, 0xCC, 0xA8, 0xA5, 0x03,
+	0x49, 0xCC, 0xB0, 0xB5, 0x03, 0x4A, 0xCC, 0x82,
+	0xC9, 0x03, 0x4B, 0xCC, 0x81, 0xC9, 0x03, 0x4B,
+	// Bytes 30c0 - 30ff
+	0xCC, 0x8C, 0xC9, 0x03, 0x4B, 0xCC, 0xA3, 0xB5,
+	0x03, 0x4B, 0xCC, 0xA7, 0xA5, 0x03, 0x4B, 0xCC,
+	0xB1, 0xB5, 0x03, 0x4C, 0xCC, 0x81, 0xC9, 0x03,
+	0x4C, 0xCC, 0x8C, 0xC9, 0x03, 0x4C, 0xCC, 0xA7,
+	0xA5, 0x03, 0x4C, 0xCC, 0xAD, 0xB5, 0x03, 0x4C,
+	0xCC, 0xB1, 0xB5, 0x03, 0x4D, 0xCC, 0x81, 0xC9,
+	0x03, 0x4D, 0xCC, 0x87, 0xC9, 0x03, 0x4D, 0xCC,
+	0xA3, 0xB5, 0x03, 0x4E, 0xCC, 0x80, 0xC9, 0x03,
+	// Bytes 3100 - 313f
+	0x4E, 0xCC, 0x81, 0xC9, 0x03, 0x4E, 0xCC, 0x83,
+	0xC9, 0x03, 0x4E, 0xCC, 0x87, 0xC9, 0x03, 0x4E,
+	0xCC, 0x8C, 0xC9, 0x03, 0x4E, 0xCC, 0xA3, 0xB5,
+	0x03, 0x4E, 0xCC, 0xA7, 0xA5, 0x03, 0x4E, 0xCC,
+	0xAD, 0xB5, 0x03, 0x4E, 0xCC, 0xB1, 0xB5, 0x03,
+	0x4F, 0xCC, 0x80, 0xC9, 0x03, 0x4F, 0xCC, 0x81,
+	0xC9, 0x03, 0x4F, 0xCC, 0x86, 0xC9, 0x03, 0x4F,
+	0xCC, 0x89, 0xC9, 0x03, 0x4F, 0xCC, 0x8B, 0xC9,
+	// Bytes 3140 - 317f
+	0x03, 0x4F, 0xCC, 0x8C, 0xC9, 0x03, 0x4F, 0xCC,
+	0x8F, 0xC9, 0x03, 0x4F, 0xCC, 0x91, 0xC9, 0x03,
+	0x50, 0xCC, 0x81, 0xC9, 0x03, 0x50, 0xCC, 0x87,
+	0xC9, 0x03, 0x52, 0xCC, 0x81, 0xC9, 0x03, 0x52,
+	0xCC, 0x87, 0xC9, 0x03, 0x52, 0xCC, 0x8C, 0xC9,
+	0x03, 0x52, 0xCC, 0x8F, 0xC9, 0x03, 0x52, 0xCC,
+	0x91, 0xC9, 0x03, 0x52, 0xCC, 0xA7, 0xA5, 0x03,
+	0x52, 0xCC, 0xB1, 0xB5, 0x03, 0x53, 0xCC, 0x82,
+	// Bytes 3180 - 31bf
+	0xC9, 0x03, 0x53, 0xCC, 0x87, 0xC9, 0x03, 0x53,
+	0xCC, 0xA6, 0xB5, 0x03, 0x53, 0xCC, 0xA7, 0xA5,
+	0x03, 0x54, 0xCC, 0x87, 0xC9, 0x03, 0x54, 0xCC,
+	0x8C, 0xC9, 0x03, 0x54, 0xCC, 0xA3, 0xB5, 0x03,
+	0x54, 0xCC, 0xA6, 0xB5, 0x03, 0x54, 0xCC, 0xA7,
+	0xA5, 0x03, 0x54, 0xCC, 0xAD, 0xB5, 0x03, 0x54,
+	0xCC, 0xB1, 0xB5, 0x03, 0x55, 0xCC, 0x80, 0xC9,
+	0x03, 0x55, 0xCC, 0x81, 0xC9, 0x03, 0x55, 0xCC,
+	// Bytes 31c0 - 31ff
+	0x82, 0xC9, 0x03, 0x55, 0xCC, 0x86, 0xC9, 0x03,
+	0x55, 0xCC, 0x89, 0xC9, 0x03, 0x55, 0xCC, 0x8A,
+	0xC9, 0x03, 0x55, 0xCC, 0x8B, 0xC9, 0x03, 0x55,
+	0xCC, 0x8C, 0xC9, 0x03, 0x55, 0xCC, 0x8F, 0xC9,
+	0x03, 0x55, 0xCC, 0x91, 0xC9, 0x03, 0x55, 0xCC,
+	0xA3, 0xB5, 0x03, 0x55, 0xCC, 0xA4, 0xB5, 0x03,
+	0x55, 0xCC, 0xA8, 0xA5, 0x03, 0x55, 0xCC, 0xAD,
+	0xB5, 0x03, 0x55, 0xCC, 0xB0, 0xB5, 0x03, 0x56,
+	// Bytes 3200 - 323f
+	0xCC, 0x83, 0xC9, 0x03, 0x56, 0xCC, 0xA3, 0xB5,
+	0x03, 0x57, 0xCC, 0x80, 0xC9, 0x03, 0x57, 0xCC,
+	0x81, 0xC9, 0x03, 0x57, 0xCC, 0x82, 0xC9, 0x03,
+	0x57, 0xCC, 0x87, 0xC9, 0x03, 0x57, 0xCC, 0x88,
+	0xC9, 0x03, 0x57, 0xCC, 0xA3, 0xB5, 0x03, 0x58,
+	0xCC, 0x87, 0xC9, 0x03, 0x58, 0xCC, 0x88, 0xC9,
+	0x03, 0x59, 0xCC, 0x80, 0xC9, 0x03, 0x59, 0xCC,
+	0x81, 0xC9, 0x03, 0x59, 0xCC, 0x82, 0xC9, 0x03,
+	// Bytes 3240 - 327f
+	0x59, 0xCC, 0x83, 0xC9, 0x03, 0x59, 0xCC, 0x84,
+	0xC9, 0x03, 0x59, 0xCC, 0x87, 0xC9, 0x03, 0x59,
+	0xCC, 0x88, 0xC9, 0x03, 0x59, 0xCC, 0x89, 0xC9,
+	0x03, 0x59, 0xCC, 0xA3, 0xB5, 0x03, 0x5A, 0xCC,
+	0x81, 0xC9, 0x03, 0x5A, 0xCC, 0x82, 0xC9, 0x03,
+	0x5A, 0xCC, 0x87, 0xC9, 0x03, 0x5A, 0xCC, 0x8C,
+	0xC9, 0x03, 0x5A, 0xCC, 0xA3, 0xB5, 0x03, 0x5A,
+	0xCC, 0xB1, 0xB5, 0x03, 0x61, 0xCC, 0x80, 0xC9,
+	// Bytes 3280 - 32bf
+	0x03, 0x61, 0xCC, 0x81, 0xC9, 0x03, 0x61, 0xCC,
+	0x83, 0xC9, 0x03, 0x61, 0xCC, 0x84, 0xC9, 0x03,
+	0x61, 0xCC, 0x89, 0xC9, 0x03, 0x61, 0xCC, 0x8C,
+	0xC9, 0x03, 0x61, 0xCC, 0x8F, 0xC9, 0x03, 0x61,
+	0xCC, 0x91, 0xC9, 0x03, 0x61, 0xCC, 0xA5, 0xB5,
+	0x03, 0x61, 0xCC, 0xA8, 0xA5, 0x03, 0x62, 0xCC,
+	0x87, 0xC9, 0x03, 0x62, 0xCC, 0xA3, 0xB5, 0x03,
+	0x62, 0xCC, 0xB1, 0xB5, 0x03, 0x63, 0xCC, 0x81,
+	// Bytes 32c0 - 32ff
+	0xC9, 0x03, 0x63, 0xCC, 0x82, 0xC9, 0x03, 0x63,
+	0xCC, 0x87, 0xC9, 0x03, 0x63, 0xCC, 0x8C, 0xC9,
+	0x03, 0x64, 0xCC, 0x87, 0xC9, 0x03, 0x64, 0xCC,
+	0x8C, 0xC9, 0x03, 0x64, 0xCC, 0xA3, 0xB5, 0x03,
+	0x64, 0xCC, 0xA7, 0xA5, 0x03, 0x64, 0xCC, 0xAD,
+	0xB5, 0x03, 0x64, 0xCC, 0xB1, 0xB5, 0x03, 0x65,
+	0xCC, 0x80, 0xC9, 0x03, 0x65, 0xCC, 0x81, 0xC9,
+	0x03, 0x65, 0xCC, 0x83, 0xC9, 0x03, 0x65, 0xCC,
+	// Bytes 3300 - 333f
+	0x86, 0xC9, 0x03, 0x65, 0xCC, 0x87, 0xC9, 0x03,
+	0x65, 0xCC, 0x88, 0xC9, 0x03, 0x65, 0xCC, 0x89,
+	0xC9, 0x03, 0x65, 0xCC, 0x8C, 0xC9, 0x03, 0x65,
+	0xCC, 0x8F, 0xC9, 0x03, 0x65, 0xCC, 0x91, 0xC9,
+	0x03, 0x65, 0xCC, 0xA8, 0xA5, 0x03, 0x65, 0xCC,
+	0xAD, 0xB5, 0x03, 0x65, 0xCC, 0xB0, 0xB5, 0x03,
+	0x66, 0xCC, 0x87, 0xC9, 0x03, 0x67, 0xCC, 0x81,
+	0xC9, 0x03, 0x67, 0xCC, 0x82, 0xC9, 0x03, 0x67,
+	// Bytes 3340 - 337f
+	0xCC, 0x84, 0xC9, 0x03, 0x67, 0xCC, 0x86, 0xC9,
+	0x03, 0x67, 0xCC, 0x87, 0xC9, 0x03, 0x67, 0xCC,
+	0x8C, 0xC9, 0x03, 0x67, 0xCC, 0xA7, 0xA5, 0x03,
+	0x68, 0xCC, 0x82, 0xC9, 0x03, 0x68, 0xCC, 0x87,
+	0xC9, 0x03, 0x68, 0xCC, 0x88, 0xC9, 0x03, 0x68,
+	0xCC, 0x8C, 0xC9, 0x03, 0x68, 0xCC, 0xA3, 0xB5,
+	0x03, 0x68, 0xCC, 0xA7, 0xA5, 0x03, 0x68, 0xCC,
+	0xAE, 0xB5, 0x03, 0x68, 0xCC, 0xB1, 0xB5, 0x03,
+	// Bytes 3380 - 33bf
+	0x69, 0xCC, 0x80, 0xC9, 0x03, 0x69, 0xCC, 0x81,
+	0xC9, 0x03, 0x69, 0xCC, 0x82, 0xC9, 0x03, 0x69,
+	0xCC, 0x83, 0xC9, 0x03, 0x69, 0xCC, 0x84, 0xC9,
+	0x03, 0x69, 0xCC, 0x86, 0xC9, 0x03, 0x69, 0xCC,
+	0x89, 0xC9, 0x03, 0x69, 0xCC, 0x8C, 0xC9, 0x03,
+	0x69, 0xCC, 0x8F, 0xC9, 0x03, 0x69, 0xCC, 0x91,
+	0xC9, 0x03, 0x69, 0xCC, 0xA3, 0xB5, 0x03, 0x69,
+	0xCC, 0xA8, 0xA5, 0x03, 0x69, 0xCC, 0xB0, 0xB5,
+	// Bytes 33c0 - 33ff
+	0x03, 0x6A, 0xCC, 0x82, 0xC9, 0x03, 0x6A, 0xCC,
+	0x8C, 0xC9, 0x03, 0x6B, 0xCC, 0x81, 0xC9, 0x03,
+	0x6B, 0xCC, 0x8C, 0xC9, 0x03, 0x6B, 0xCC, 0xA3,
+	0xB5, 0x03, 0x6B, 0xCC, 0xA7, 0xA5, 0x03, 0x6B,
+	0xCC, 0xB1, 0xB5, 0x03, 0x6C, 0xCC, 0x81, 0xC9,
+	0x03, 0x6C, 0xCC, 0x8C, 0xC9, 0x03, 0x6C, 0xCC,
+	0xA7, 0xA5, 0x03, 0x6C, 0xCC, 0xAD, 0xB5, 0x03,
+	0x6C, 0xCC, 0xB1, 0xB5, 0x03, 0x6D, 0xCC, 0x81,
+	// Bytes 3400 - 343f
+	0xC9, 0x03, 0x6D, 0xCC, 0x87, 0xC9, 0x03, 0x6D,
+	0xCC, 0xA3, 0xB5, 0x03, 0x6E, 0xCC, 0x80, 0xC9,
+	0x03, 0x6E, 0xCC, 0x81, 0xC9, 0x03, 0x6E, 0xCC,
+	0x83, 0xC9, 0x03, 0x6E, 0xCC, 0x87, 0xC9, 0x03,
+	0x6E, 0xCC, 0x8C, 0xC9, 0x03, 0x6E, 0xCC, 0xA3,
+	0xB5, 0x03, 0x6E, 0xCC, 0xA7, 0xA5, 0x03, 0x6E,
+	0xCC, 0xAD, 0xB5, 0x03, 0x6E, 0xCC, 0xB1, 0xB5,
+	0x03, 0x6F, 0xCC, 0x80, 0xC9, 0x03, 0x6F, 0xCC,
+	// Bytes 3440 - 347f
+	0x81, 0xC9, 0x03, 0x6F, 0xCC, 0x86, 0xC9, 0x03,
+	0x6F, 0xCC, 0x89, 0xC9, 0x03, 0x6F, 0xCC, 0x8B,
+	0xC9, 0x03, 0x6F, 0xCC, 0x8C, 0xC9, 0x03, 0x6F,
+	0xCC, 0x8F, 0xC9, 0x03, 0x6F, 0xCC, 0x91, 0xC9,
+	0x03, 0x70, 0xCC, 0x81, 0xC9, 0x03, 0x70, 0xCC,
+	0x87, 0xC9, 0x03, 0x72, 0xCC, 0x81, 0xC9, 0x03,
+	0x72, 0xCC, 0x87, 0xC9, 0x03, 0x72, 0xCC, 0x8C,
+	0xC9, 0x03, 0x72, 0xCC, 0x8F, 0xC9, 0x03, 0x72,
+	// Bytes 3480 - 34bf
+	0xCC, 0x91, 0xC9, 0x03, 0x72, 0xCC, 0xA7, 0xA5,
+	0x03, 0x72, 0xCC, 0xB1, 0xB5, 0x03, 0x73, 0xCC,
+	0x82, 0xC9, 0x03, 0x73, 0xCC, 0x87, 0xC9, 0x03,
+	0x73, 0xCC, 0xA6, 0xB5, 0x03, 0x73, 0xCC, 0xA7,
+	0xA5, 0x03, 0x74, 0xCC, 0x87, 0xC9, 0x03, 0x74,
+	0xCC, 0x88, 0xC9, 0x03, 0x74, 0xCC, 0x8C, 0xC9,
+	0x03, 0x74, 0xCC, 0xA3, 0xB5, 0x03, 0x74, 0xCC,
+	0xA6, 0xB5, 0x03, 0x74, 0xCC, 0xA7, 0xA5, 0x03,
+	// Bytes 34c0 - 34ff
+	0x74, 0xCC, 0xAD, 0xB5, 0x03, 0x74, 0xCC, 0xB1,
+	0xB5, 0x03, 0x75, 0xCC, 0x80, 0xC9, 0x03, 0x75,
+	0xCC, 0x81, 0xC9, 0x03, 0x75, 0xCC, 0x82, 0xC9,
+	0x03, 0x75, 0xCC, 0x86, 0xC9, 0x03, 0x75, 0xCC,
+	0x89, 0xC9, 0x03, 0x75, 0xCC, 0x8A, 0xC9, 0x03,
+	0x75, 0xCC, 0x8B, 0xC9, 0x03, 0x75, 0xCC, 0x8C,
+	0xC9, 0x03, 0x75, 0xCC, 0x8F, 0xC9, 0x03, 0x75,
+	0xCC, 0x91, 0xC9, 0x03, 0x75, 0xCC, 0xA3, 0xB5,
+	// Bytes 3500 - 353f
+	0x03, 0x75, 0xCC, 0xA4, 0xB5, 0x03, 0x75, 0xCC,
+	0xA8, 0xA5, 0x03, 0x75, 0xCC, 0xAD, 0xB5, 0x03,
+	0x75, 0xCC, 0xB0, 0xB5, 0x03, 0x76, 0xCC, 0x83,
+	0xC9, 0x03, 0x76, 0xCC, 0xA3, 0xB5, 0x03, 0x77,
+	0xCC, 0x80, 0xC9, 0x03, 0x77, 0xCC, 0x81, 0xC9,
+	0x03, 0x77, 0xCC, 0x82, 0xC9, 0x03, 0x77, 0xCC,
+	0x87, 0xC9, 0x03, 0x77, 0xCC, 0x88, 0xC9, 0x03,
+	0x77, 0xCC, 0x8A, 0xC9, 0x03, 0x77, 0xCC, 0xA3,
+	// Bytes 3540 - 357f
+	0xB5, 0x03, 0x78, 0xCC, 0x87, 0xC9, 0x03, 0x78,
+	0xCC, 0x88, 0xC9, 0x03, 0x79, 0xCC, 0x80, 0xC9,
+	0x03, 0x79, 0xCC, 0x81, 0xC9, 0x03, 0x79, 0xCC,
+	0x82, 0xC9, 0x03, 0x79, 0xCC, 0x83, 0xC9, 0x03,
+	0x79, 0xCC, 0x84, 0xC9, 0x03, 0x79, 0xCC, 0x87,
+	0xC9, 0x03, 0x79, 0xCC, 0x88, 0xC9, 0x03, 0x79,
+	0xCC, 0x89, 0xC9, 0x03, 0x79, 0xCC, 0x8A, 0xC9,
+	0x03, 0x79, 0xCC, 0xA3, 0xB5, 0x03, 0x7A, 0xCC,
+	// Bytes 3580 - 35bf
+	0x81, 0xC9, 0x03, 0x7A, 0xCC, 0x82, 0xC9, 0x03,
+	0x7A, 0xCC, 0x87, 0xC9, 0x03, 0x7A, 0xCC, 0x8C,
+	0xC9, 0x03, 0x7A, 0xCC, 0xA3, 0xB5, 0x03, 0x7A,
+	0xCC, 0xB1, 0xB5, 0x04, 0xC2, 0xA8, 0xCC, 0x80,
+	0xCA, 0x04, 0xC2, 0xA8, 0xCC, 0x81, 0xCA, 0x04,
+	0xC2, 0xA8, 0xCD, 0x82, 0xCA, 0x04, 0xC3, 0x86,
+	0xCC, 0x81, 0xC9, 0x04, 0xC3, 0x86, 0xCC, 0x84,
+	0xC9, 0x04, 0xC3, 0x98, 0xCC, 0x81, 0xC9, 0x04,
+	// Bytes 35c0 - 35ff
+	0xC3, 0xA6, 0xCC, 0x81, 0xC9, 0x04, 0xC3, 0xA6,
+	0xCC, 0x84, 0xC9, 0x04, 0xC3, 0xB8, 0xCC, 0x81,
+	0xC9, 0x04, 0xC5, 0xBF, 0xCC, 0x87, 0xC9, 0x04,
+	0xC6, 0xB7, 0xCC, 0x8C, 0xC9, 0x04, 0xCA, 0x92,
+	0xCC, 0x8C, 0xC9, 0x04, 0xCE, 0x91, 0xCC, 0x80,
+	0xC9, 0x04, 0xCE, 0x91, 0xCC, 0x81, 0xC9, 0x04,
+	0xCE, 0x91, 0xCC, 0x84, 0xC9, 0x04, 0xCE, 0x91,
+	0xCC, 0x86, 0xC9, 0x04, 0xCE, 0x91, 0xCD, 0x85,
+	// Bytes 3600 - 363f
+	0xD9, 0x04, 0xCE, 0x95, 0xCC, 0x80, 0xC9, 0x04,
+	0xCE, 0x95, 0xCC, 0x81, 0xC9, 0x04, 0xCE, 0x97,
+	0xCC, 0x80, 0xC9, 0x04, 0xCE, 0x97, 0xCC, 0x81,
+	0xC9, 0x04, 0xCE, 0x97, 0xCD, 0x85, 0xD9, 0x04,
+	0xCE, 0x99, 0xCC, 0x80, 0xC9, 0x04, 0xCE, 0x99,
+	0xCC, 0x81, 0xC9, 0x04, 0xCE, 0x99, 0xCC, 0x84,
+	0xC9, 0x04, 0xCE, 0x99, 0xCC, 0x86, 0xC9, 0x04,
+	0xCE, 0x99, 0xCC, 0x88, 0xC9, 0x04, 0xCE, 0x9F,
+	// Bytes 3640 - 367f
+	0xCC, 0x80, 0xC9, 0x04, 0xCE, 0x9F, 0xCC, 0x81,
+	0xC9, 0x04, 0xCE, 0xA1, 0xCC, 0x94, 0xC9, 0x04,
+	0xCE, 0xA5, 0xCC, 0x80, 0xC9, 0x04, 0xCE, 0xA5,
+	0xCC, 0x81, 0xC9, 0x04, 0xCE, 0xA5, 0xCC, 0x84,
+	0xC9, 0x04, 0xCE, 0xA5, 0xCC, 0x86, 0xC9, 0x04,
+	0xCE, 0xA5, 0xCC, 0x88, 0xC9, 0x04, 0xCE, 0xA9,
+	0xCC, 0x80, 0xC9, 0x04, 0xCE, 0xA9, 0xCC, 0x81,
+	0xC9, 0x04, 0xCE, 0xA9, 0xCD, 0x85, 0xD9, 0x04,
+	// Bytes 3680 - 36bf
+	0xCE, 0xB1, 0xCC, 0x84, 0xC9, 0x04, 0xCE, 0xB1,
+	0xCC, 0x86, 0xC9, 0x04, 0xCE, 0xB1, 0xCD, 0x85,
+	0xD9, 0x04, 0xCE, 0xB5, 0xCC, 0x80, 0xC9, 0x04,
+	0xCE, 0xB5, 0xCC, 0x81, 0xC9, 0x04, 0xCE, 0xB7,
+	0xCD, 0x85, 0xD9, 0x04, 0xCE, 0xB9, 0xCC, 0x80,
+	0xC9, 0x04, 0xCE, 0xB9, 0xCC, 0x81, 0xC9, 0x04,
+	0xCE, 0xB9, 0xCC, 0x84, 0xC9, 0x04, 0xCE, 0xB9,
+	0xCC, 0x86, 0xC9, 0x04, 0xCE, 0xB9, 0xCD, 0x82,
+	// Bytes 36c0 - 36ff
+	0xC9, 0x04, 0xCE, 0xBF, 0xCC, 0x80, 0xC9, 0x04,
+	0xCE, 0xBF, 0xCC, 0x81, 0xC9, 0x04, 0xCF, 0x81,
+	0xCC, 0x93, 0xC9, 0x04, 0xCF, 0x81, 0xCC, 0x94,
+	0xC9, 0x04, 0xCF, 0x85, 0xCC, 0x80, 0xC9, 0x04,
+	0xCF, 0x85, 0xCC, 0x81, 0xC9, 0x04, 0xCF, 0x85,
+	0xCC, 0x84, 0xC9, 0x04, 0xCF, 0x85, 0xCC, 0x86,
+	0xC9, 0x04, 0xCF, 0x85, 0xCD, 0x82, 0xC9, 0x04,
+	0xCF, 0x89, 0xCD, 0x85, 0xD9, 0x04, 0xCF, 0x92,
+	// Bytes 3700 - 373f
+	0xCC, 0x81, 0xC9, 0x04, 0xCF, 0x92, 0xCC, 0x88,
+	0xC9, 0x04, 0xD0, 0x86, 0xCC, 0x88, 0xC9, 0x04,
+	0xD0, 0x90, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0x90,
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x93, 0xCC, 0x81,
+	0xC9, 0x04, 0xD0, 0x95, 0xCC, 0x80, 0xC9, 0x04,
+	0xD0, 0x95, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0x95,
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x96, 0xCC, 0x86,
+	0xC9, 0x04, 0xD0, 0x96, 0xCC, 0x88, 0xC9, 0x04,
+	// Bytes 3740 - 377f
+	0xD0, 0x97, 0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x98,
+	0xCC, 0x80, 0xC9, 0x04, 0xD0, 0x98, 0xCC, 0x84,
+	0xC9, 0x04, 0xD0, 0x98, 0xCC, 0x86, 0xC9, 0x04,
+	0xD0, 0x98, 0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x9A,
+	0xCC, 0x81, 0xC9, 0x04, 0xD0, 0x9E, 0xCC, 0x88,
+	0xC9, 0x04, 0xD0, 0xA3, 0xCC, 0x84, 0xC9, 0x04,
+	0xD0, 0xA3, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0xA3,
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xA3, 0xCC, 0x8B,
+	// Bytes 3780 - 37bf
+	0xC9, 0x04, 0xD0, 0xA7, 0xCC, 0x88, 0xC9, 0x04,
+	0xD0, 0xAB, 0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xAD,
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xB0, 0xCC, 0x86,
+	0xC9, 0x04, 0xD0, 0xB0, 0xCC, 0x88, 0xC9, 0x04,
+	0xD0, 0xB3, 0xCC, 0x81, 0xC9, 0x04, 0xD0, 0xB5,
+	0xCC, 0x80, 0xC9, 0x04, 0xD0, 0xB5, 0xCC, 0x86,
+	0xC9, 0x04, 0xD0, 0xB5, 0xCC, 0x88, 0xC9, 0x04,
+	0xD0, 0xB6, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0xB6,
+	// Bytes 37c0 - 37ff
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xB7, 0xCC, 0x88,
+	0xC9, 0x04, 0xD0, 0xB8, 0xCC, 0x80, 0xC9, 0x04,
+	0xD0, 0xB8, 0xCC, 0x84, 0xC9, 0x04, 0xD0, 0xB8,
+	0xCC, 0x86, 0xC9, 0x04, 0xD0, 0xB8, 0xCC, 0x88,
+	0xC9, 0x04, 0xD0, 0xBA, 0xCC, 0x81, 0xC9, 0x04,
+	0xD0, 0xBE, 0xCC, 0x88, 0xC9, 0x04, 0xD1, 0x83,
+	0xCC, 0x84, 0xC9, 0x04, 0xD1, 0x83, 0xCC, 0x86,
+	0xC9, 0x04, 0xD1, 0x83, 0xCC, 0x88, 0xC9, 0x04,
+	// Bytes 3800 - 383f
+	0xD1, 0x83, 0xCC, 0x8B, 0xC9, 0x04, 0xD1, 0x87,
+	0xCC, 0x88, 0xC9, 0x04, 0xD1, 0x8B, 0xCC, 0x88,
+	0xC9, 0x04, 0xD1, 0x8D, 0xCC, 0x88, 0xC9, 0x04,
+	0xD1, 0x96, 0xCC, 0x88, 0xC9, 0x04, 0xD1, 0xB4,
+	0xCC, 0x8F, 0xC9, 0x04, 0xD1, 0xB5, 0xCC, 0x8F,
+	0xC9, 0x04, 0xD3, 0x98, 0xCC, 0x88, 0xC9, 0x04,
+	0xD3, 0x99, 0xCC, 0x88, 0xC9, 0x04, 0xD3, 0xA8,
+	0xCC, 0x88, 0xC9, 0x04, 0xD3, 0xA9, 0xCC, 0x88,
+	// Bytes 3840 - 387f
+	0xC9, 0x04, 0xD8, 0xA7, 0xD9, 0x93, 0xC9, 0x04,
+	0xD8, 0xA7, 0xD9, 0x94, 0xC9, 0x04, 0xD8, 0xA7,
+	0xD9, 0x95, 0xB5, 0x04, 0xD9, 0x88, 0xD9, 0x94,
+	0xC9, 0x04, 0xD9, 0x8A, 0xD9, 0x94, 0xC9, 0x04,
+	0xDB, 0x81, 0xD9, 0x94, 0xC9, 0x04, 0xDB, 0x92,
+	0xD9, 0x94, 0xC9, 0x04, 0xDB, 0x95, 0xD9, 0x94,
+	0xC9, 0x05, 0x41, 0xCC, 0x82, 0xCC, 0x80, 0xCA,
+	0x05, 0x41, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05,
+	// Bytes 3880 - 38bf
+	0x41, 0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x41,
+	0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05, 0x41, 0xCC,
+	0x86, 0xCC, 0x80, 0xCA, 0x05, 0x41, 0xCC, 0x86,
+	0xCC, 0x81, 0xCA, 0x05, 0x41, 0xCC, 0x86, 0xCC,
+	0x83, 0xCA, 0x05, 0x41, 0xCC, 0x86, 0xCC, 0x89,
+	0xCA, 0x05, 0x41, 0xCC, 0x87, 0xCC, 0x84, 0xCA,
+	0x05, 0x41, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05,
+	0x41, 0xCC, 0x8A, 0xCC, 0x81, 0xCA, 0x05, 0x41,
+	// Bytes 38c0 - 38ff
+	0xCC, 0xA3, 0xCC, 0x82, 0xCA, 0x05, 0x41, 0xCC,
+	0xA3, 0xCC, 0x86, 0xCA, 0x05, 0x43, 0xCC, 0xA7,
+	0xCC, 0x81, 0xCA, 0x05, 0x45, 0xCC, 0x82, 0xCC,
+	0x80, 0xCA, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x81,
+	0xCA, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x83, 0xCA,
+	0x05, 0x45, 0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05,
+	0x45, 0xCC, 0x84, 0xCC, 0x80, 0xCA, 0x05, 0x45,
+	0xCC, 0x84, 0xCC, 0x81, 0xCA, 0x05, 0x45, 0xCC,
+	// Bytes 3900 - 393f
+	0xA3, 0xCC, 0x82, 0xCA, 0x05, 0x45, 0xCC, 0xA7,
+	0xCC, 0x86, 0xCA, 0x05, 0x49, 0xCC, 0x88, 0xCC,
+	0x81, 0xCA, 0x05, 0x4C, 0xCC, 0xA3, 0xCC, 0x84,
+	0xCA, 0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x80, 0xCA,
+	0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05,
+	0x4F, 0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x4F,
+	0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05, 0x4F, 0xCC,
+	0x83, 0xCC, 0x81, 0xCA, 0x05, 0x4F, 0xCC, 0x83,
+	// Bytes 3940 - 397f
+	0xCC, 0x84, 0xCA, 0x05, 0x4F, 0xCC, 0x83, 0xCC,
+	0x88, 0xCA, 0x05, 0x4F, 0xCC, 0x84, 0xCC, 0x80,
+	0xCA, 0x05, 0x4F, 0xCC, 0x84, 0xCC, 0x81, 0xCA,
+	0x05, 0x4F, 0xCC, 0x87, 0xCC, 0x84, 0xCA, 0x05,
+	0x4F, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x4F,
+	0xCC, 0x9B, 0xCC, 0x80, 0xCA, 0x05, 0x4F, 0xCC,
+	0x9B, 0xCC, 0x81, 0xCA, 0x05, 0x4F, 0xCC, 0x9B,
+	0xCC, 0x83, 0xCA, 0x05, 0x4F, 0xCC, 0x9B, 0xCC,
+	// Bytes 3980 - 39bf
+	0x89, 0xCA, 0x05, 0x4F, 0xCC, 0x9B, 0xCC, 0xA3,
+	0xB6, 0x05, 0x4F, 0xCC, 0xA3, 0xCC, 0x82, 0xCA,
+	0x05, 0x4F, 0xCC, 0xA8, 0xCC, 0x84, 0xCA, 0x05,
+	0x52, 0xCC, 0xA3, 0xCC, 0x84, 0xCA, 0x05, 0x53,
+	0xCC, 0x81, 0xCC, 0x87, 0xCA, 0x05, 0x53, 0xCC,
+	0x8C, 0xCC, 0x87, 0xCA, 0x05, 0x53, 0xCC, 0xA3,
+	0xCC, 0x87, 0xCA, 0x05, 0x55, 0xCC, 0x83, 0xCC,
+	0x81, 0xCA, 0x05, 0x55, 0xCC, 0x84, 0xCC, 0x88,
+	// Bytes 39c0 - 39ff
+	0xCA, 0x05, 0x55, 0xCC, 0x88, 0xCC, 0x80, 0xCA,
+	0x05, 0x55, 0xCC, 0x88, 0xCC, 0x81, 0xCA, 0x05,
+	0x55, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x55,
+	0xCC, 0x88, 0xCC, 0x8C, 0xCA, 0x05, 0x55, 0xCC,
+	0x9B, 0xCC, 0x80, 0xCA, 0x05, 0x55, 0xCC, 0x9B,
+	0xCC, 0x81, 0xCA, 0x05, 0x55, 0xCC, 0x9B, 0xCC,
+	0x83, 0xCA, 0x05, 0x55, 0xCC, 0x9B, 0xCC, 0x89,
+	0xCA, 0x05, 0x55, 0xCC, 0x9B, 0xCC, 0xA3, 0xB6,
+	// Bytes 3a00 - 3a3f
+	0x05, 0x61, 0xCC, 0x82, 0xCC, 0x80, 0xCA, 0x05,
+	0x61, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05, 0x61,
+	0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x61, 0xCC,
+	0x82, 0xCC, 0x89, 0xCA, 0x05, 0x61, 0xCC, 0x86,
+	0xCC, 0x80, 0xCA, 0x05, 0x61, 0xCC, 0x86, 0xCC,
+	0x81, 0xCA, 0x05, 0x61, 0xCC, 0x86, 0xCC, 0x83,
+	0xCA, 0x05, 0x61, 0xCC, 0x86, 0xCC, 0x89, 0xCA,
+	0x05, 0x61, 0xCC, 0x87, 0xCC, 0x84, 0xCA, 0x05,
+	// Bytes 3a40 - 3a7f
+	0x61, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x61,
+	0xCC, 0x8A, 0xCC, 0x81, 0xCA, 0x05, 0x61, 0xCC,
+	0xA3, 0xCC, 0x82, 0xCA, 0x05, 0x61, 0xCC, 0xA3,
+	0xCC, 0x86, 0xCA, 0x05, 0x63, 0xCC, 0xA7, 0xCC,
+	0x81, 0xCA, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x80,
+	0xCA, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x81, 0xCA,
+	0x05, 0x65, 0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05,
+	0x65, 0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05, 0x65,
+	// Bytes 3a80 - 3abf
+	0xCC, 0x84, 0xCC, 0x80, 0xCA, 0x05, 0x65, 0xCC,
+	0x84, 0xCC, 0x81, 0xCA, 0x05, 0x65, 0xCC, 0xA3,
+	0xCC, 0x82, 0xCA, 0x05, 0x65, 0xCC, 0xA7, 0xCC,
+	0x86, 0xCA, 0x05, 0x69, 0xCC, 0x88, 0xCC, 0x81,
+	0xCA, 0x05, 0x6C, 0xCC, 0xA3, 0xCC, 0x84, 0xCA,
+	0x05, 0x6F, 0xCC, 0x82, 0xCC, 0x80, 0xCA, 0x05,
+	0x6F, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05, 0x6F,
+	0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x6F, 0xCC,
+	// Bytes 3ac0 - 3aff
+	0x82, 0xCC, 0x89, 0xCA, 0x05, 0x6F, 0xCC, 0x83,
+	0xCC, 0x81, 0xCA, 0x05, 0x6F, 0xCC, 0x83, 0xCC,
+	0x84, 0xCA, 0x05, 0x6F, 0xCC, 0x83, 0xCC, 0x88,
+	0xCA, 0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x80, 0xCA,
+	0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x81, 0xCA, 0x05,
+	0x6F, 0xCC, 0x87, 0xCC, 0x84, 0xCA, 0x05, 0x6F,
+	0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x6F, 0xCC,
+	0x9B, 0xCC, 0x80, 0xCA, 0x05, 0x6F, 0xCC, 0x9B,
+	// Bytes 3b00 - 3b3f
+	0xCC, 0x81, 0xCA, 0x05, 0x6F, 0xCC, 0x9B, 0xCC,
+	0x83, 0xCA, 0x05, 0x6F, 0xCC, 0x9B, 0xCC, 0x89,
+	0xCA, 0x05, 0x6F, 0xCC, 0x9B, 0xCC, 0xA3, 0xB6,
+	0x05, 0x6F, 0xCC, 0xA3, 0xCC, 0x82, 0xCA, 0x05,
+	0x6F, 0xCC, 0xA8, 0xCC, 0x84, 0xCA, 0x05, 0x72,
+	0xCC, 0xA3, 0xCC, 0x84, 0xCA, 0x05, 0x73, 0xCC,
+	0x81, 0xCC, 0x87, 0xCA, 0x05, 0x73, 0xCC, 0x8C,
+	0xCC, 0x87, 0xCA, 0x05, 0x73, 0xCC, 0xA3, 0xCC,
+	// Bytes 3b40 - 3b7f
+	0x87, 0xCA, 0x05, 0x75, 0xCC, 0x83, 0xCC, 0x81,
+	0xCA, 0x05, 0x75, 0xCC, 0x84, 0xCC, 0x88, 0xCA,
+	0x05, 0x75, 0xCC, 0x88, 0xCC, 0x80, 0xCA, 0x05,
+	0x75, 0xCC, 0x88, 0xCC, 0x81, 0xCA, 0x05, 0x75,
+	0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x75, 0xCC,
+	0x88, 0xCC, 0x8C, 0xCA, 0x05, 0x75, 0xCC, 0x9B,
+	0xCC, 0x80, 0xCA, 0x05, 0x75, 0xCC, 0x9B, 0xCC,
+	0x81, 0xCA, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0x83,
+	// Bytes 3b80 - 3bbf
+	0xCA, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0x89, 0xCA,
+	0x05, 0x75, 0xCC, 0x9B, 0xCC, 0xA3, 0xB6, 0x05,
+	0xE1, 0xBE, 0xBF, 0xCC, 0x80, 0xCA, 0x05, 0xE1,
+	0xBE, 0xBF, 0xCC, 0x81, 0xCA, 0x05, 0xE1, 0xBE,
+	0xBF, 0xCD, 0x82, 0xCA, 0x05, 0xE1, 0xBF, 0xBE,
+	0xCC, 0x80, 0xCA, 0x05, 0xE1, 0xBF, 0xBE, 0xCC,
+	0x81, 0xCA, 0x05, 0xE1, 0xBF, 0xBE, 0xCD, 0x82,
+	0xCA, 0x05, 0xE2, 0x86, 0x90, 0xCC, 0xB8, 0x05,
+	// Bytes 3bc0 - 3bff
+	0x05, 0xE2, 0x86, 0x92, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x86, 0x94, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x87, 0x90, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x87,
+	0x92, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x87, 0x94,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x88, 0x83, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x88, 0x88, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x88, 0x8B, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x88, 0xA3, 0xCC, 0xB8, 0x05, 0x05,
+	// Bytes 3c00 - 3c3f
+	0xE2, 0x88, 0xA5, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x88, 0xBC, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
+	0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x85,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x88, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x89, 0x8D, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x89, 0xA1, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x89, 0xA4, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x89, 0xA5, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	// Bytes 3c40 - 3c7f
+	0x89, 0xB2, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
+	0xB3, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xB6,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xB7, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x89, 0xBA, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x89, 0xBB, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x89, 0xBC, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x89, 0xBD, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x8A, 0x82, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
+	// Bytes 3c80 - 3cbf
+	0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x86,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x87, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x91, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x8A, 0x92, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x8A, 0xA2, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x8A, 0xA8, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x8A, 0xA9, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
+	0xAB, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB2,
+	// Bytes 3cc0 - 3cff
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB3, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB4, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x8A, 0xB5, 0xCC, 0xB8, 0x05,
+	0x06, 0xCE, 0x91, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0x91, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	// Bytes 3d00 - 3d3f
+	0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	// Bytes 3d40 - 3d7f
+	0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
+	// Bytes 3d80 - 3dbf
+	0x06, 0xCE, 0xA9, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xA9, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCC, 0x80, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCC, 0x81, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCD, 0x82, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	// Bytes 3dc0 - 3dff
+	0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xB7, 0xCC, 0x80, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB7, 0xCC, 0x81, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB7, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB7, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB7, 0xCD, 0x82, 0xCD, 0x85, 0xDA,
+	// Bytes 3e00 - 3e3f
+	0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	// Bytes 3e40 - 3e7f
+	0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x80, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x81, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCD, 0x82, 0xCA,
+	// Bytes 3e80 - 3ebf
+	0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCD, 0x82, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
+	0x06, 0xCF, 0x89, 0xCC, 0x80, 0xCD, 0x85, 0xDA,
+	0x06, 0xCF, 0x89, 0xCC, 0x81, 0xCD, 0x85, 0xDA,
+	// Bytes 3ec0 - 3eff
+	0x06, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCF, 0x89, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCF, 0x89, 0xCD, 0x82, 0xCD, 0x85, 0xDA,
+	0x06, 0xE0, 0xA4, 0xA8, 0xE0, 0xA4, 0xBC, 0x09,
+	0x06, 0xE0, 0xA4, 0xB0, 0xE0, 0xA4, 0xBC, 0x09,
+	0x06, 0xE0, 0xA4, 0xB3, 0xE0, 0xA4, 0xBC, 0x09,
+	0x06, 0xE0, 0xB1, 0x86, 0xE0, 0xB1, 0x96, 0x85,
+	0x06, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8A, 0x11,
+	// Bytes 3f00 - 3f3f
+	0x06, 0xE3, 0x81, 0x86, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x8B, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x8D, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x8F, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x91, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x93, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x95, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x97, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 3f40 - 3f7f
+	0x06, 0xE3, 0x81, 0x99, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x9B, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x9D, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x9F, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xA1, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xA4, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xA6, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xA8, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 3f80 - 3fbf
+	0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x9A, 0x0D,
+	// Bytes 3fc0 - 3fff
+	0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x82, 0x9D, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xA6, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xAD, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xB1, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 4000 - 403f
+	0x06, 0xE3, 0x82, 0xB3, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xB5, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xB9, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xBD, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x81, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 4040 - 407f
+	0x06, 0xE3, 0x83, 0x84, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x86, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 4080 - 40bf
+	0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0xAF, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0xB0, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0xB1, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 40c0 - 40ff
+	0x06, 0xE3, 0x83, 0xB2, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0xBD, 0xE3, 0x82, 0x99, 0x0D,
+	0x08, 0xCE, 0x91, 0xCC, 0x93, 0xCC, 0x80, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0x91, 0xCC, 0x93, 0xCC,
+	0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0x91, 0xCC,
+	0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x81, 0xCD,
+	// Bytes 4100 - 413f
+	0x85, 0xDB, 0x08, 0xCE, 0x91, 0xCC, 0x94, 0xCD,
+	0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0x97, 0xCC,
+	0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x82, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0x97, 0xCC, 0x94, 0xCC,
+	0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0x97, 0xCC,
+	0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	// Bytes 4140 - 417f
+	0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0xA9, 0xCC, 0x93, 0xCC, 0x80, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xA9, 0xCC, 0x93, 0xCC,
+	0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xA9, 0xCC,
+	0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x81, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xA9, 0xCC, 0x94, 0xCD,
+	// Bytes 4180 - 41bf
+	0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xB1, 0xCC,
+	0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x82, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xB1, 0xCC, 0x94, 0xCC,
+	0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xB1, 0xCC,
+	0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85, 0xDB,
+	// Bytes 41c0 - 41ff
+	0x08, 0xCE, 0xB7, 0xCC, 0x93, 0xCC, 0x80, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xB7, 0xCC, 0x93, 0xCC,
+	0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xB7, 0xCC,
+	0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x81, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xB7, 0xCC, 0x94, 0xCD,
+	0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCF, 0x89, 0xCC,
+	// Bytes 4200 - 423f
+	0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCF,
+	0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85, 0xDB,
+	0x08, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x82, 0xCD,
+	0x85, 0xDB, 0x08, 0xCF, 0x89, 0xCC, 0x94, 0xCC,
+	0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCF, 0x89, 0xCC,
+	0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCF,
+	0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85, 0xDB,
+	0x08, 0xF0, 0x91, 0x82, 0x99, 0xF0, 0x91, 0x82,
+	// Bytes 4240 - 427f
+	0xBA, 0x09, 0x08, 0xF0, 0x91, 0x82, 0x9B, 0xF0,
+	0x91, 0x82, 0xBA, 0x09, 0x08, 0xF0, 0x91, 0x82,
+	0xA5, 0xF0, 0x91, 0x82, 0xBA, 0x09, 0x42, 0xC2,
+	0xB4, 0x01, 0x43, 0x20, 0xCC, 0x81, 0xC9, 0x43,
+	0x20, 0xCC, 0x83, 0xC9, 0x43, 0x20, 0xCC, 0x84,
+	0xC9, 0x43, 0x20, 0xCC, 0x85, 0xC9, 0x43, 0x20,
+	0xCC, 0x86, 0xC9, 0x43, 0x20, 0xCC, 0x87, 0xC9,
+	0x43, 0x20, 0xCC, 0x88, 0xC9, 0x43, 0x20, 0xCC,
+	// Bytes 4280 - 42bf
+	0x8A, 0xC9, 0x43, 0x20, 0xCC, 0x8B, 0xC9, 0x43,
+	0x20, 0xCC, 0x93, 0xC9, 0x43, 0x20, 0xCC, 0x94,
+	0xC9, 0x43, 0x20, 0xCC, 0xA7, 0xA5, 0x43, 0x20,
+	0xCC, 0xA8, 0xA5, 0x43, 0x20, 0xCC, 0xB3, 0xB5,
+	0x43, 0x20, 0xCD, 0x82, 0xC9, 0x43, 0x20, 0xCD,
+	0x85, 0xD9, 0x43, 0x20, 0xD9, 0x8B, 0x59, 0x43,
+	0x20, 0xD9, 0x8C, 0x5D, 0x43, 0x20, 0xD9, 0x8D,
+	0x61, 0x43, 0x20, 0xD9, 0x8E, 0x65, 0x43, 0x20,
+	// Bytes 42c0 - 42ff
+	0xD9, 0x8F, 0x69, 0x43, 0x20, 0xD9, 0x90, 0x6D,
+	0x43, 0x20, 0xD9, 0x91, 0x71, 0x43, 0x20, 0xD9,
+	0x92, 0x75, 0x43, 0x41, 0xCC, 0x8A, 0xC9, 0x43,
+	0x73, 0xCC, 0x87, 0xC9, 0x43, 0xE1, 0x85, 0xA1,
+	0x01, 0x43, 0xE1, 0x85, 0xA2, 0x01, 0x43, 0xE1,
+	0x85, 0xA3, 0x01, 0x43, 0xE1, 0x85, 0xA4, 0x01,
+	0x43, 0xE1, 0x85, 0xA5, 0x01, 0x43, 0xE1, 0x85,
+	0xA6, 0x01, 0x43, 0xE1, 0x85, 0xA7, 0x01, 0x43,
+	// Bytes 4300 - 433f
+	0xE1, 0x85, 0xA8, 0x01, 0x43, 0xE1, 0x85, 0xA9,
+	0x01, 0x43, 0xE1, 0x85, 0xAA, 0x01, 0x43, 0xE1,
+	0x85, 0xAB, 0x01, 0x43, 0xE1, 0x85, 0xAC, 0x01,
+	0x43, 0xE1, 0x85, 0xAD, 0x01, 0x43, 0xE1, 0x85,
+	0xAE, 0x01, 0x43, 0xE1, 0x85, 0xAF, 0x01, 0x43,
+	0xE1, 0x85, 0xB0, 0x01, 0x43, 0xE1, 0x85, 0xB1,
+	0x01, 0x43, 0xE1, 0x85, 0xB2, 0x01, 0x43, 0xE1,
+	0x85, 0xB3, 0x01, 0x43, 0xE1, 0x85, 0xB4, 0x01,
+	// Bytes 4340 - 437f
+	0x43, 0xE1, 0x85, 0xB5, 0x01, 0x43, 0xE1, 0x86,
+	0xAA, 0x01, 0x43, 0xE1, 0x86, 0xAC, 0x01, 0x43,
+	0xE1, 0x86, 0xAD, 0x01, 0x43, 0xE1, 0x86, 0xB0,
+	0x01, 0x43, 0xE1, 0x86, 0xB1, 0x01, 0x43, 0xE1,
+	0x86, 0xB2, 0x01, 0x43, 0xE1, 0x86, 0xB3, 0x01,
+	0x43, 0xE1, 0x86, 0xB4, 0x01, 0x43, 0xE1, 0x86,
+	0xB5, 0x01, 0x44, 0x20, 0xE3, 0x82, 0x99, 0x0D,
+	0x44, 0x20, 0xE3, 0x82, 0x9A, 0x0D, 0x44, 0xC2,
+	// Bytes 4380 - 43bf
+	0xA8, 0xCC, 0x81, 0xCA, 0x44, 0xCE, 0x91, 0xCC,
+	0x81, 0xC9, 0x44, 0xCE, 0x95, 0xCC, 0x81, 0xC9,
+	0x44, 0xCE, 0x97, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
+	0x99, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0x9F, 0xCC,
+	0x81, 0xC9, 0x44, 0xCE, 0xA5, 0xCC, 0x81, 0xC9,
+	0x44, 0xCE, 0xA5, 0xCC, 0x88, 0xC9, 0x44, 0xCE,
+	0xA9, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xB1, 0xCC,
+	0x81, 0xC9, 0x44, 0xCE, 0xB5, 0xCC, 0x81, 0xC9,
+	// Bytes 43c0 - 43ff
+	0x44, 0xCE, 0xB7, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
+	0xB9, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xBF, 0xCC,
+	0x81, 0xC9, 0x44, 0xCF, 0x85, 0xCC, 0x81, 0xC9,
+	0x44, 0xCF, 0x89, 0xCC, 0x81, 0xC9, 0x44, 0xD7,
+	0x90, 0xD6, 0xB7, 0x31, 0x44, 0xD7, 0x90, 0xD6,
+	0xB8, 0x35, 0x44, 0xD7, 0x90, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x91, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0x91, 0xD6, 0xBF, 0x49, 0x44, 0xD7, 0x92, 0xD6,
+	// Bytes 4400 - 443f
+	0xBC, 0x41, 0x44, 0xD7, 0x93, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x94, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0x95, 0xD6, 0xB9, 0x39, 0x44, 0xD7, 0x95, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x96, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x98, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0x99, 0xD6, 0xB4, 0x25, 0x44, 0xD7, 0x99, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x9A, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x9B, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	// Bytes 4440 - 447f
+	0x9B, 0xD6, 0xBF, 0x49, 0x44, 0xD7, 0x9C, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x9E, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0xA0, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0xA1, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA3, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0xA4, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0xA4, 0xD6, 0xBF, 0x49, 0x44, 0xD7,
+	0xA6, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA7, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0xA8, 0xD6, 0xBC, 0x41,
+	// Bytes 4480 - 44bf
+	0x44, 0xD7, 0xA9, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0xA9, 0xD7, 0x81, 0x4D, 0x44, 0xD7, 0xA9, 0xD7,
+	0x82, 0x51, 0x44, 0xD7, 0xAA, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0xB2, 0xD6, 0xB7, 0x31, 0x44, 0xD8,
+	0xA7, 0xD9, 0x8B, 0x59, 0x44, 0xD8, 0xA7, 0xD9,
+	0x93, 0xC9, 0x44, 0xD8, 0xA7, 0xD9, 0x94, 0xC9,
+	0x44, 0xD8, 0xA7, 0xD9, 0x95, 0xB5, 0x44, 0xD8,
+	0xB0, 0xD9, 0xB0, 0x79, 0x44, 0xD8, 0xB1, 0xD9,
+	// Bytes 44c0 - 44ff
+	0xB0, 0x79, 0x44, 0xD9, 0x80, 0xD9, 0x8B, 0x59,
+	0x44, 0xD9, 0x80, 0xD9, 0x8E, 0x65, 0x44, 0xD9,
+	0x80, 0xD9, 0x8F, 0x69, 0x44, 0xD9, 0x80, 0xD9,
+	0x90, 0x6D, 0x44, 0xD9, 0x80, 0xD9, 0x91, 0x71,
+	0x44, 0xD9, 0x80, 0xD9, 0x92, 0x75, 0x44, 0xD9,
+	0x87, 0xD9, 0xB0, 0x79, 0x44, 0xD9, 0x88, 0xD9,
+	0x94, 0xC9, 0x44, 0xD9, 0x89, 0xD9, 0xB0, 0x79,
+	0x44, 0xD9, 0x8A, 0xD9, 0x94, 0xC9, 0x44, 0xDB,
+	// Bytes 4500 - 453f
+	0x92, 0xD9, 0x94, 0xC9, 0x44, 0xDB, 0x95, 0xD9,
+	0x94, 0xC9, 0x45, 0x20, 0xCC, 0x88, 0xCC, 0x80,
+	0xCA, 0x45, 0x20, 0xCC, 0x88, 0xCC, 0x81, 0xCA,
+	0x45, 0x20, 0xCC, 0x88, 0xCD, 0x82, 0xCA, 0x45,
+	0x20, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x45, 0x20,
+	0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x45, 0x20, 0xCC,
+	0x93, 0xCD, 0x82, 0xCA, 0x45, 0x20, 0xCC, 0x94,
+	0xCC, 0x80, 0xCA, 0x45, 0x20, 0xCC, 0x94, 0xCC,
+	// Bytes 4540 - 457f
+	0x81, 0xCA, 0x45, 0x20, 0xCC, 0x94, 0xCD, 0x82,
+	0xCA, 0x45, 0x20, 0xD9, 0x8C, 0xD9, 0x91, 0x72,
+	0x45, 0x20, 0xD9, 0x8D, 0xD9, 0x91, 0x72, 0x45,
+	0x20, 0xD9, 0x8E, 0xD9, 0x91, 0x72, 0x45, 0x20,
+	0xD9, 0x8F, 0xD9, 0x91, 0x72, 0x45, 0x20, 0xD9,
+	0x90, 0xD9, 0x91, 0x72, 0x45, 0x20, 0xD9, 0x91,
+	0xD9, 0xB0, 0x7A, 0x45, 0xE2, 0xAB, 0x9D, 0xCC,
+	0xB8, 0x05, 0x46, 0xCE, 0xB9, 0xCC, 0x88, 0xCC,
+	// Bytes 4580 - 45bf
+	0x81, 0xCA, 0x46, 0xCF, 0x85, 0xCC, 0x88, 0xCC,
+	0x81, 0xCA, 0x46, 0xD7, 0xA9, 0xD6, 0xBC, 0xD7,
+	0x81, 0x4E, 0x46, 0xD7, 0xA9, 0xD6, 0xBC, 0xD7,
+	0x82, 0x52, 0x46, 0xD9, 0x80, 0xD9, 0x8E, 0xD9,
+	0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9, 0x8F, 0xD9,
+	0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9, 0x90, 0xD9,
+	0x91, 0x72, 0x46, 0xE0, 0xA4, 0x95, 0xE0, 0xA4,
+	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x96, 0xE0, 0xA4,
+	// Bytes 45c0 - 45ff
+	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x97, 0xE0, 0xA4,
+	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x9C, 0xE0, 0xA4,
+	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA1, 0xE0, 0xA4,
+	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA2, 0xE0, 0xA4,
+	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAB, 0xE0, 0xA4,
+	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAF, 0xE0, 0xA4,
+	0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA1, 0xE0, 0xA6,
+	0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA2, 0xE0, 0xA6,
+	// Bytes 4600 - 463f
+	0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xAF, 0xE0, 0xA6,
+	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x96, 0xE0, 0xA8,
+	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x97, 0xE0, 0xA8,
+	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x9C, 0xE0, 0xA8,
+	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xAB, 0xE0, 0xA8,
+	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB2, 0xE0, 0xA8,
+	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB8, 0xE0, 0xA8,
+	0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA1, 0xE0, 0xAC,
+	// Bytes 4640 - 467f
+	0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA2, 0xE0, 0xAC,
+	0xBC, 0x09, 0x46, 0xE0, 0xBE, 0xB2, 0xE0, 0xBE,
+	0x80, 0x9D, 0x46, 0xE0, 0xBE, 0xB3, 0xE0, 0xBE,
+	0x80, 0x9D, 0x46, 0xE3, 0x83, 0x86, 0xE3, 0x82,
+	0x99, 0x0D, 0x48, 0xF0, 0x9D, 0x85, 0x97, 0xF0,
+	0x9D, 0x85, 0xA5, 0xAD, 0x48, 0xF0, 0x9D, 0x85,
+	0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xAD, 0x48, 0xF0,
+	0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85, 0xA5, 0xAD,
+	// Bytes 4680 - 46bf
+	0x48, 0xF0, 0x9D, 0x86, 0xBA, 0xF0, 0x9D, 0x85,
+	0xA5, 0xAD, 0x49, 0xE0, 0xBE, 0xB2, 0xE0, 0xBD,
+	0xB1, 0xE0, 0xBE, 0x80, 0x9E, 0x49, 0xE0, 0xBE,
+	0xB3, 0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E,
+	0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85,
+	0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE, 0x4C, 0xF0,
+	0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0,
+	0x9D, 0x85, 0xAF, 0xAE, 0x4C, 0xF0, 0x9D, 0x85,
+	// Bytes 46c0 - 46ff
+	0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85,
+	0xB0, 0xAE, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0,
+	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xB1, 0xAE,
+	0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85,
+	0xA5, 0xF0, 0x9D, 0x85, 0xB2, 0xAE, 0x4C, 0xF0,
+	0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85, 0xA5, 0xF0,
+	0x9D, 0x85, 0xAE, 0xAE, 0x4C, 0xF0, 0x9D, 0x86,
+	0xB9, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85,
+	// Bytes 4700 - 473f
+	0xAF, 0xAE, 0x4C, 0xF0, 0x9D, 0x86, 0xBA, 0xF0,
+	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE,
+	0x4C, 0xF0, 0x9D, 0x86, 0xBA, 0xF0, 0x9D, 0x85,
+	0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xAE, 0x83, 0x41,
+	0xCC, 0x82, 0xC9, 0x83, 0x41, 0xCC, 0x86, 0xC9,
+	0x83, 0x41, 0xCC, 0x87, 0xC9, 0x83, 0x41, 0xCC,
+	0x88, 0xC9, 0x83, 0x41, 0xCC, 0x8A, 0xC9, 0x83,
+	0x41, 0xCC, 0xA3, 0xB5, 0x83, 0x43, 0xCC, 0xA7,
+	// Bytes 4740 - 477f
+	0xA5, 0x83, 0x45, 0xCC, 0x82, 0xC9, 0x83, 0x45,
+	0xCC, 0x84, 0xC9, 0x83, 0x45, 0xCC, 0xA3, 0xB5,
+	0x83, 0x45, 0xCC, 0xA7, 0xA5, 0x83, 0x49, 0xCC,
+	0x88, 0xC9, 0x83, 0x4C, 0xCC, 0xA3, 0xB5, 0x83,
+	0x4F, 0xCC, 0x82, 0xC9, 0x83, 0x4F, 0xCC, 0x83,
+	0xC9, 0x83, 0x4F, 0xCC, 0x84, 0xC9, 0x83, 0x4F,
+	0xCC, 0x87, 0xC9, 0x83, 0x4F, 0xCC, 0x88, 0xC9,
+	0x83, 0x4F, 0xCC, 0x9B, 0xAD, 0x83, 0x4F, 0xCC,
+	// Bytes 4780 - 47bf
+	0xA3, 0xB5, 0x83, 0x4F, 0xCC, 0xA8, 0xA5, 0x83,
+	0x52, 0xCC, 0xA3, 0xB5, 0x83, 0x53, 0xCC, 0x81,
+	0xC9, 0x83, 0x53, 0xCC, 0x8C, 0xC9, 0x83, 0x53,
+	0xCC, 0xA3, 0xB5, 0x83, 0x55, 0xCC, 0x83, 0xC9,
+	0x83, 0x55, 0xCC, 0x84, 0xC9, 0x83, 0x55, 0xCC,
+	0x88, 0xC9, 0x83, 0x55, 0xCC, 0x9B, 0xAD, 0x83,
+	0x61, 0xCC, 0x82, 0xC9, 0x83, 0x61, 0xCC, 0x86,
+	0xC9, 0x83, 0x61, 0xCC, 0x87, 0xC9, 0x83, 0x61,
+	// Bytes 47c0 - 47ff
+	0xCC, 0x88, 0xC9, 0x83, 0x61, 0xCC, 0x8A, 0xC9,
+	0x83, 0x61, 0xCC, 0xA3, 0xB5, 0x83, 0x63, 0xCC,
+	0xA7, 0xA5, 0x83, 0x65, 0xCC, 0x82, 0xC9, 0x83,
+	0x65, 0xCC, 0x84, 0xC9, 0x83, 0x65, 0xCC, 0xA3,
+	0xB5, 0x83, 0x65, 0xCC, 0xA7, 0xA5, 0x83, 0x69,
+	0xCC, 0x88, 0xC9, 0x83, 0x6C, 0xCC, 0xA3, 0xB5,
+	0x83, 0x6F, 0xCC, 0x82, 0xC9, 0x83, 0x6F, 0xCC,
+	0x83, 0xC9, 0x83, 0x6F, 0xCC, 0x84, 0xC9, 0x83,
+	// Bytes 4800 - 483f
+	0x6F, 0xCC, 0x87, 0xC9, 0x83, 0x6F, 0xCC, 0x88,
+	0xC9, 0x83, 0x6F, 0xCC, 0x9B, 0xAD, 0x83, 0x6F,
+	0xCC, 0xA3, 0xB5, 0x83, 0x6F, 0xCC, 0xA8, 0xA5,
+	0x83, 0x72, 0xCC, 0xA3, 0xB5, 0x83, 0x73, 0xCC,
+	0x81, 0xC9, 0x83, 0x73, 0xCC, 0x8C, 0xC9, 0x83,
+	0x73, 0xCC, 0xA3, 0xB5, 0x83, 0x75, 0xCC, 0x83,
+	0xC9, 0x83, 0x75, 0xCC, 0x84, 0xC9, 0x83, 0x75,
+	0xCC, 0x88, 0xC9, 0x83, 0x75, 0xCC, 0x9B, 0xAD,
+	// Bytes 4840 - 487f
+	0x84, 0xCE, 0x91, 0xCC, 0x93, 0xC9, 0x84, 0xCE,
+	0x91, 0xCC, 0x94, 0xC9, 0x84, 0xCE, 0x95, 0xCC,
+	0x93, 0xC9, 0x84, 0xCE, 0x95, 0xCC, 0x94, 0xC9,
+	0x84, 0xCE, 0x97, 0xCC, 0x93, 0xC9, 0x84, 0xCE,
+	0x97, 0xCC, 0x94, 0xC9, 0x84, 0xCE, 0x99, 0xCC,
+	0x93, 0xC9, 0x84, 0xCE, 0x99, 0xCC, 0x94, 0xC9,
+	0x84, 0xCE, 0x9F, 0xCC, 0x93, 0xC9, 0x84, 0xCE,
+	0x9F, 0xCC, 0x94, 0xC9, 0x84, 0xCE, 0xA5, 0xCC,
+	// Bytes 4880 - 48bf
+	0x94, 0xC9, 0x84, 0xCE, 0xA9, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0xA9, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
+	0xB1, 0xCC, 0x80, 0xC9, 0x84, 0xCE, 0xB1, 0xCC,
+	0x81, 0xC9, 0x84, 0xCE, 0xB1, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0xB1, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
+	0xB1, 0xCD, 0x82, 0xC9, 0x84, 0xCE, 0xB5, 0xCC,
+	0x93, 0xC9, 0x84, 0xCE, 0xB5, 0xCC, 0x94, 0xC9,
+	0x84, 0xCE, 0xB7, 0xCC, 0x80, 0xC9, 0x84, 0xCE,
+	// Bytes 48c0 - 48ff
+	0xB7, 0xCC, 0x81, 0xC9, 0x84, 0xCE, 0xB7, 0xCC,
+	0x93, 0xC9, 0x84, 0xCE, 0xB7, 0xCC, 0x94, 0xC9,
+	0x84, 0xCE, 0xB7, 0xCD, 0x82, 0xC9, 0x84, 0xCE,
+	0xB9, 0xCC, 0x88, 0xC9, 0x84, 0xCE, 0xB9, 0xCC,
+	0x93, 0xC9, 0x84, 0xCE, 0xB9, 0xCC, 0x94, 0xC9,
+	0x84, 0xCE, 0xBF, 0xCC, 0x93, 0xC9, 0x84, 0xCE,
+	0xBF, 0xCC, 0x94, 0xC9, 0x84, 0xCF, 0x85, 0xCC,
+	0x88, 0xC9, 0x84, 0xCF, 0x85, 0xCC, 0x93, 0xC9,
+	// Bytes 4900 - 493f
+	0x84, 0xCF, 0x85, 0xCC, 0x94, 0xC9, 0x84, 0xCF,
+	0x89, 0xCC, 0x80, 0xC9, 0x84, 0xCF, 0x89, 0xCC,
+	0x81, 0xC9, 0x84, 0xCF, 0x89, 0xCC, 0x93, 0xC9,
+	0x84, 0xCF, 0x89, 0xCC, 0x94, 0xC9, 0x84, 0xCF,
+	0x89, 0xCD, 0x82, 0xC9, 0x86, 0xCE, 0x91, 0xCC,
+	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
+	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
+	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
+	// Bytes 4940 - 497f
+	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
+	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
+	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
+	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
+	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
+	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
+	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
+	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
+	// Bytes 4980 - 49bf
+	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
+	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
+	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
+	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
+	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
+	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
+	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
+	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
+	// Bytes 49c0 - 49ff
+	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
+	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
+	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
+	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
+	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
+	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
+	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
+	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
+	// Bytes 4a00 - 4a3f
+	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
+	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
+	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
+	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
+	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
+	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
+	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
+	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
+	// Bytes 4a40 - 4a7f
+	0x94, 0xCD, 0x82, 0xCA, 0x42, 0xCC, 0x80, 0xC9,
+	0x32, 0x42, 0xCC, 0x81, 0xC9, 0x32, 0x42, 0xCC,
+	0x93, 0xC9, 0x32, 0x44, 0xCC, 0x88, 0xCC, 0x81,
+	0xCA, 0x32, 0x43, 0xE3, 0x82, 0x99, 0x0D, 0x03,
+	0x43, 0xE3, 0x82, 0x9A, 0x0D, 0x03, 0x46, 0xE0,
+	0xBD, 0xB1, 0xE0, 0xBD, 0xB2, 0x9E, 0x26, 0x46,
+	0xE0, 0xBD, 0xB1, 0xE0, 0xBD, 0xB4, 0xA2, 0x26,
+	0x46, 0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E,
+	// Bytes 4a80 - 4abf
+	0x26, 0x00, 0x01,
+}
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfcTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfcTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfcValues[c0]
+	}
+	i := nfcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfcTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfcTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfcValues[c0]
+	}
+	i := nfcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// nfcTrie. Total size: 10332 bytes (10.09 KiB). Checksum: ad355b768fddb1b6.
+type nfcTrie struct{}
+
+func newNfcTrie(i int) *nfcTrie {
+	return &nfcTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *nfcTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	case n < 44:
+		return uint16(nfcValues[n<<6+uint32(b)])
+	default:
+		n -= 44
+		return uint16(nfcSparse.lookup(n, b))
+	}
+}
+
+// nfcValues: 46 blocks, 2944 entries, 5888 bytes
+// The third block is the zero block.
+var nfcValues = [2944]uint16{
+	// Block 0x0, offset 0x0
+	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
+	// Block 0x1, offset 0x40
+	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
+	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
+	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
+	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
+	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
+	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
+	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
+	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
+	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
+	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x471e, 0xc3: 0x2f79, 0xc4: 0x472d, 0xc5: 0x4732,
+	0xc6: 0xa000, 0xc7: 0x473c, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x4741, 0xcb: 0x2ffb,
+	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x4755, 0xd1: 0x3104,
+	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x475f, 0xd5: 0x4764, 0xd6: 0x4773,
+	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x47a5, 0xdd: 0x3235,
+	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x47af, 0xe3: 0x3285,
+	0xe4: 0x47be, 0xe5: 0x47c3, 0xe6: 0xa000, 0xe7: 0x47cd, 0xe8: 0x32ee, 0xe9: 0x32f3,
+	0xea: 0x47d2, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x47e6,
+	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x47f0, 0xf5: 0x47f5,
+	0xf6: 0x4804, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
+	0xfc: 0x4836, 0xfd: 0x3550, 0xff: 0x3569,
+	// Block 0x4, offset 0x100
+	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x4723, 0x103: 0x47b4, 0x104: 0x2f9c, 0x105: 0x32a8,
+	0x106: 0x2fb0, 0x107: 0x32bc, 0x108: 0x2fb5, 0x109: 0x32c1, 0x10a: 0x2fba, 0x10b: 0x32c6,
+	0x10c: 0x2fbf, 0x10d: 0x32cb, 0x10e: 0x2fc9, 0x10f: 0x32d5,
+	0x112: 0x4746, 0x113: 0x47d7, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
+	0x118: 0x3014, 0x119: 0x3320, 0x11a: 0x3005, 0x11b: 0x3311, 0x11c: 0x302d, 0x11d: 0x3339,
+	0x11e: 0x3037, 0x11f: 0x3343, 0x120: 0x303c, 0x121: 0x3348, 0x122: 0x3046, 0x123: 0x3352,
+	0x124: 0x304b, 0x125: 0x3357, 0x128: 0x307d, 0x129: 0x338e,
+	0x12a: 0x3082, 0x12b: 0x3393, 0x12c: 0x3087, 0x12d: 0x3398, 0x12e: 0x30aa, 0x12f: 0x33b6,
+	0x130: 0x308c, 0x134: 0x30b4, 0x135: 0x33c0,
+	0x136: 0x30c8, 0x137: 0x33d9, 0x139: 0x30d2, 0x13a: 0x33e3, 0x13b: 0x30dc,
+	0x13c: 0x33ed, 0x13d: 0x30d7, 0x13e: 0x33e8,
+	// Block 0x5, offset 0x140
+	0x143: 0x30ff, 0x144: 0x3410, 0x145: 0x3118,
+	0x146: 0x3429, 0x147: 0x310e, 0x148: 0x341f,
+	0x14c: 0x4769, 0x14d: 0x47fa, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
+	0x154: 0x3159, 0x155: 0x346a, 0x156: 0x3172, 0x157: 0x3483,
+	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x478c, 0x15b: 0x481d, 0x15c: 0x317c, 0x15d: 0x348d,
+	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x4791, 0x161: 0x4822, 0x162: 0x31a4, 0x163: 0x34ba,
+	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x479b, 0x169: 0x482c,
+	0x16a: 0x47a0, 0x16b: 0x4831, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
+	0x170: 0x31d1, 0x171: 0x34e7, 0x172: 0x31ef, 0x173: 0x3505, 0x174: 0x3212, 0x175: 0x3528,
+	0x176: 0x323a, 0x177: 0x3555, 0x178: 0x324e, 0x179: 0x325d, 0x17a: 0x357d, 0x17b: 0x3267,
+	0x17c: 0x3587, 0x17d: 0x326c, 0x17e: 0x358c, 0x17f: 0xa000,
+	// Block 0x6, offset 0x180
+	0x184: 0x8100, 0x185: 0x8100,
+	0x186: 0x8100,
+	0x18d: 0x2f88, 0x18e: 0x3294, 0x18f: 0x3096, 0x190: 0x33a2, 0x191: 0x3140,
+	0x192: 0x3451, 0x193: 0x31d6, 0x194: 0x34ec, 0x195: 0x39cf, 0x196: 0x3b5e, 0x197: 0x39c8,
+	0x198: 0x3b57, 0x199: 0x39d6, 0x19a: 0x3b65, 0x19b: 0x39c1, 0x19c: 0x3b50,
+	0x19e: 0x38b0, 0x19f: 0x3a3f, 0x1a0: 0x38a9, 0x1a1: 0x3a38, 0x1a2: 0x35b3, 0x1a3: 0x35c5,
+	0x1a6: 0x3041, 0x1a7: 0x334d, 0x1a8: 0x30be, 0x1a9: 0x33cf,
+	0x1aa: 0x4782, 0x1ab: 0x4813, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
+	0x1b0: 0x33c5, 0x1b4: 0x3028, 0x1b5: 0x3334,
+	0x1b8: 0x30fa, 0x1b9: 0x340b, 0x1ba: 0x38b7, 0x1bb: 0x3a46,
+	0x1bc: 0x35ad, 0x1bd: 0x35bf, 0x1be: 0x35b9, 0x1bf: 0x35cb,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x2f8d, 0x1c1: 0x3299, 0x1c2: 0x2f92, 0x1c3: 0x329e, 0x1c4: 0x300a, 0x1c5: 0x3316,
+	0x1c6: 0x300f, 0x1c7: 0x331b, 0x1c8: 0x309b, 0x1c9: 0x33a7, 0x1ca: 0x30a0, 0x1cb: 0x33ac,
+	0x1cc: 0x3145, 0x1cd: 0x3456, 0x1ce: 0x314a, 0x1cf: 0x345b, 0x1d0: 0x3168, 0x1d1: 0x3479,
+	0x1d2: 0x316d, 0x1d3: 0x347e, 0x1d4: 0x31db, 0x1d5: 0x34f1, 0x1d6: 0x31e0, 0x1d7: 0x34f6,
+	0x1d8: 0x3186, 0x1d9: 0x3497, 0x1da: 0x319f, 0x1db: 0x34b5,
+	0x1de: 0x305a, 0x1df: 0x3366,
+	0x1e6: 0x4728, 0x1e7: 0x47b9, 0x1e8: 0x4750, 0x1e9: 0x47e1,
+	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x476e, 0x1ef: 0x47ff,
+	0x1f0: 0x3958, 0x1f1: 0x3ae7, 0x1f2: 0x3244, 0x1f3: 0x355f,
+	// Block 0x8, offset 0x200
+	0x200: 0x9932, 0x201: 0x9932, 0x202: 0x9932, 0x203: 0x9932, 0x204: 0x9932, 0x205: 0x8132,
+	0x206: 0x9932, 0x207: 0x9932, 0x208: 0x9932, 0x209: 0x9932, 0x20a: 0x9932, 0x20b: 0x9932,
+	0x20c: 0x9932, 0x20d: 0x8132, 0x20e: 0x8132, 0x20f: 0x9932, 0x210: 0x8132, 0x211: 0x9932,
+	0x212: 0x8132, 0x213: 0x9932, 0x214: 0x9932, 0x215: 0x8133, 0x216: 0x812d, 0x217: 0x812d,
+	0x218: 0x812d, 0x219: 0x812d, 0x21a: 0x8133, 0x21b: 0x992b, 0x21c: 0x812d, 0x21d: 0x812d,
+	0x21e: 0x812d, 0x21f: 0x812d, 0x220: 0x812d, 0x221: 0x8129, 0x222: 0x8129, 0x223: 0x992d,
+	0x224: 0x992d, 0x225: 0x992d, 0x226: 0x992d, 0x227: 0x9929, 0x228: 0x9929, 0x229: 0x812d,
+	0x22a: 0x812d, 0x22b: 0x812d, 0x22c: 0x812d, 0x22d: 0x992d, 0x22e: 0x992d, 0x22f: 0x812d,
+	0x230: 0x992d, 0x231: 0x992d, 0x232: 0x812d, 0x233: 0x812d, 0x234: 0x8101, 0x235: 0x8101,
+	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812d, 0x23a: 0x812d, 0x23b: 0x812d,
+	0x23c: 0x812d, 0x23d: 0x8132, 0x23e: 0x8132, 0x23f: 0x8132,
+	// Block 0x9, offset 0x240
+	0x240: 0x4a44, 0x241: 0x4a49, 0x242: 0x9932, 0x243: 0x4a4e, 0x244: 0x4a53, 0x245: 0x9936,
+	0x246: 0x8132, 0x247: 0x812d, 0x248: 0x812d, 0x249: 0x812d, 0x24a: 0x8132, 0x24b: 0x8132,
+	0x24c: 0x8132, 0x24d: 0x812d, 0x24e: 0x812d, 0x250: 0x8132, 0x251: 0x8132,
+	0x252: 0x8132, 0x253: 0x812d, 0x254: 0x812d, 0x255: 0x812d, 0x256: 0x812d, 0x257: 0x8132,
+	0x258: 0x8133, 0x259: 0x812d, 0x25a: 0x812d, 0x25b: 0x8132, 0x25c: 0x8134, 0x25d: 0x8135,
+	0x25e: 0x8135, 0x25f: 0x8134, 0x260: 0x8135, 0x261: 0x8135, 0x262: 0x8134, 0x263: 0x8132,
+	0x264: 0x8132, 0x265: 0x8132, 0x266: 0x8132, 0x267: 0x8132, 0x268: 0x8132, 0x269: 0x8132,
+	0x26a: 0x8132, 0x26b: 0x8132, 0x26c: 0x8132, 0x26d: 0x8132, 0x26e: 0x8132, 0x26f: 0x8132,
+	0x274: 0x0170,
+	0x27a: 0x8100,
+	0x27e: 0x0037,
+	// Block 0xa, offset 0x280
+	0x284: 0x8100, 0x285: 0x35a1,
+	0x286: 0x35e9, 0x287: 0x00ce, 0x288: 0x3607, 0x289: 0x3613, 0x28a: 0x3625,
+	0x28c: 0x3643, 0x28e: 0x3655, 0x28f: 0x3673, 0x290: 0x3e08, 0x291: 0xa000,
+	0x295: 0xa000, 0x297: 0xa000,
+	0x299: 0xa000,
+	0x29f: 0xa000, 0x2a1: 0xa000,
+	0x2a5: 0xa000, 0x2a9: 0xa000,
+	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x4894, 0x2ad: 0x3697, 0x2ae: 0x48be, 0x2af: 0x36a9,
+	0x2b0: 0x3e70, 0x2b1: 0xa000, 0x2b5: 0xa000,
+	0x2b7: 0xa000, 0x2b9: 0xa000,
+	0x2bf: 0xa000,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x3721, 0x2c1: 0x372d, 0x2c3: 0x371b,
+	0x2c6: 0xa000, 0x2c7: 0x3709,
+	0x2cc: 0x375d, 0x2cd: 0x3745, 0x2ce: 0x376f, 0x2d0: 0xa000,
+	0x2d3: 0xa000, 0x2d5: 0xa000, 0x2d6: 0xa000, 0x2d7: 0xa000,
+	0x2d8: 0xa000, 0x2d9: 0x3751, 0x2da: 0xa000,
+	0x2de: 0xa000, 0x2e3: 0xa000,
+	0x2e7: 0xa000,
+	0x2eb: 0xa000, 0x2ed: 0xa000,
+	0x2f0: 0xa000, 0x2f3: 0xa000, 0x2f5: 0xa000,
+	0x2f6: 0xa000, 0x2f7: 0xa000, 0x2f8: 0xa000, 0x2f9: 0x37d5, 0x2fa: 0xa000,
+	0x2fe: 0xa000,
+	// Block 0xc, offset 0x300
+	0x301: 0x3733, 0x302: 0x37b7,
+	0x310: 0x370f, 0x311: 0x3793,
+	0x312: 0x3715, 0x313: 0x3799, 0x316: 0x3727, 0x317: 0x37ab,
+	0x318: 0xa000, 0x319: 0xa000, 0x31a: 0x3829, 0x31b: 0x382f, 0x31c: 0x3739, 0x31d: 0x37bd,
+	0x31e: 0x373f, 0x31f: 0x37c3, 0x322: 0x374b, 0x323: 0x37cf,
+	0x324: 0x3757, 0x325: 0x37db, 0x326: 0x3763, 0x327: 0x37e7, 0x328: 0xa000, 0x329: 0xa000,
+	0x32a: 0x3835, 0x32b: 0x383b, 0x32c: 0x378d, 0x32d: 0x3811, 0x32e: 0x3769, 0x32f: 0x37ed,
+	0x330: 0x3775, 0x331: 0x37f9, 0x332: 0x377b, 0x333: 0x37ff, 0x334: 0x3781, 0x335: 0x3805,
+	0x338: 0x3787, 0x339: 0x380b,
+	// Block 0xd, offset 0x340
+	0x351: 0x812d,
+	0x352: 0x8132, 0x353: 0x8132, 0x354: 0x8132, 0x355: 0x8132, 0x356: 0x812d, 0x357: 0x8132,
+	0x358: 0x8132, 0x359: 0x8132, 0x35a: 0x812e, 0x35b: 0x812d, 0x35c: 0x8132, 0x35d: 0x8132,
+	0x35e: 0x8132, 0x35f: 0x8132, 0x360: 0x8132, 0x361: 0x8132, 0x362: 0x812d, 0x363: 0x812d,
+	0x364: 0x812d, 0x365: 0x812d, 0x366: 0x812d, 0x367: 0x812d, 0x368: 0x8132, 0x369: 0x8132,
+	0x36a: 0x812d, 0x36b: 0x8132, 0x36c: 0x8132, 0x36d: 0x812e, 0x36e: 0x8131, 0x36f: 0x8132,
+	0x370: 0x8105, 0x371: 0x8106, 0x372: 0x8107, 0x373: 0x8108, 0x374: 0x8109, 0x375: 0x810a,
+	0x376: 0x810b, 0x377: 0x810c, 0x378: 0x810d, 0x379: 0x810e, 0x37a: 0x810e, 0x37b: 0x810f,
+	0x37c: 0x8110, 0x37d: 0x8111, 0x37f: 0x8112,
+	// Block 0xe, offset 0x380
+	0x388: 0xa000, 0x38a: 0xa000, 0x38b: 0x8116,
+	0x38c: 0x8117, 0x38d: 0x8118, 0x38e: 0x8119, 0x38f: 0x811a, 0x390: 0x811b, 0x391: 0x811c,
+	0x392: 0x811d, 0x393: 0x9932, 0x394: 0x9932, 0x395: 0x992d, 0x396: 0x812d, 0x397: 0x8132,
+	0x398: 0x8132, 0x399: 0x8132, 0x39a: 0x8132, 0x39b: 0x8132, 0x39c: 0x812d, 0x39d: 0x8132,
+	0x39e: 0x8132, 0x39f: 0x812d,
+	0x3b0: 0x811e,
+	// Block 0xf, offset 0x3c0
+	0x3c5: 0xa000,
+	0x3c6: 0x2d26, 0x3c7: 0xa000, 0x3c8: 0x2d2e, 0x3c9: 0xa000, 0x3ca: 0x2d36, 0x3cb: 0xa000,
+	0x3cc: 0x2d3e, 0x3cd: 0xa000, 0x3ce: 0x2d46, 0x3d1: 0xa000,
+	0x3d2: 0x2d4e,
+	0x3f4: 0x8102, 0x3f5: 0x9900,
+	0x3fa: 0xa000, 0x3fb: 0x2d56,
+	0x3fc: 0xa000, 0x3fd: 0x2d5e, 0x3fe: 0xa000, 0x3ff: 0xa000,
+	// Block 0x10, offset 0x400
+	0x400: 0x2f97, 0x401: 0x32a3, 0x402: 0x2fa1, 0x403: 0x32ad, 0x404: 0x2fa6, 0x405: 0x32b2,
+	0x406: 0x2fab, 0x407: 0x32b7, 0x408: 0x38cc, 0x409: 0x3a5b, 0x40a: 0x2fc4, 0x40b: 0x32d0,
+	0x40c: 0x2fce, 0x40d: 0x32da, 0x40e: 0x2fdd, 0x40f: 0x32e9, 0x410: 0x2fd3, 0x411: 0x32df,
+	0x412: 0x2fd8, 0x413: 0x32e4, 0x414: 0x38ef, 0x415: 0x3a7e, 0x416: 0x38f6, 0x417: 0x3a85,
+	0x418: 0x3019, 0x419: 0x3325, 0x41a: 0x301e, 0x41b: 0x332a, 0x41c: 0x3904, 0x41d: 0x3a93,
+	0x41e: 0x3023, 0x41f: 0x332f, 0x420: 0x3032, 0x421: 0x333e, 0x422: 0x3050, 0x423: 0x335c,
+	0x424: 0x305f, 0x425: 0x336b, 0x426: 0x3055, 0x427: 0x3361, 0x428: 0x3064, 0x429: 0x3370,
+	0x42a: 0x3069, 0x42b: 0x3375, 0x42c: 0x30af, 0x42d: 0x33bb, 0x42e: 0x390b, 0x42f: 0x3a9a,
+	0x430: 0x30b9, 0x431: 0x33ca, 0x432: 0x30c3, 0x433: 0x33d4, 0x434: 0x30cd, 0x435: 0x33de,
+	0x436: 0x475a, 0x437: 0x47eb, 0x438: 0x3912, 0x439: 0x3aa1, 0x43a: 0x30e6, 0x43b: 0x33f7,
+	0x43c: 0x30e1, 0x43d: 0x33f2, 0x43e: 0x30eb, 0x43f: 0x33fc,
+	// Block 0x11, offset 0x440
+	0x440: 0x30f0, 0x441: 0x3401, 0x442: 0x30f5, 0x443: 0x3406, 0x444: 0x3109, 0x445: 0x341a,
+	0x446: 0x3113, 0x447: 0x3424, 0x448: 0x3122, 0x449: 0x3433, 0x44a: 0x311d, 0x44b: 0x342e,
+	0x44c: 0x3935, 0x44d: 0x3ac4, 0x44e: 0x3943, 0x44f: 0x3ad2, 0x450: 0x394a, 0x451: 0x3ad9,
+	0x452: 0x3951, 0x453: 0x3ae0, 0x454: 0x314f, 0x455: 0x3460, 0x456: 0x3154, 0x457: 0x3465,
+	0x458: 0x315e, 0x459: 0x346f, 0x45a: 0x4787, 0x45b: 0x4818, 0x45c: 0x3997, 0x45d: 0x3b26,
+	0x45e: 0x3177, 0x45f: 0x3488, 0x460: 0x3181, 0x461: 0x3492, 0x462: 0x4796, 0x463: 0x4827,
+	0x464: 0x399e, 0x465: 0x3b2d, 0x466: 0x39a5, 0x467: 0x3b34, 0x468: 0x39ac, 0x469: 0x3b3b,
+	0x46a: 0x3190, 0x46b: 0x34a1, 0x46c: 0x319a, 0x46d: 0x34b0, 0x46e: 0x31ae, 0x46f: 0x34c4,
+	0x470: 0x31a9, 0x471: 0x34bf, 0x472: 0x31ea, 0x473: 0x3500, 0x474: 0x31f9, 0x475: 0x350f,
+	0x476: 0x31f4, 0x477: 0x350a, 0x478: 0x39b3, 0x479: 0x3b42, 0x47a: 0x39ba, 0x47b: 0x3b49,
+	0x47c: 0x31fe, 0x47d: 0x3514, 0x47e: 0x3203, 0x47f: 0x3519,
+	// Block 0x12, offset 0x480
+	0x480: 0x3208, 0x481: 0x351e, 0x482: 0x320d, 0x483: 0x3523, 0x484: 0x321c, 0x485: 0x3532,
+	0x486: 0x3217, 0x487: 0x352d, 0x488: 0x3221, 0x489: 0x353c, 0x48a: 0x3226, 0x48b: 0x3541,
+	0x48c: 0x322b, 0x48d: 0x3546, 0x48e: 0x3249, 0x48f: 0x3564, 0x490: 0x3262, 0x491: 0x3582,
+	0x492: 0x3271, 0x493: 0x3591, 0x494: 0x3276, 0x495: 0x3596, 0x496: 0x337a, 0x497: 0x34a6,
+	0x498: 0x3537, 0x499: 0x3573, 0x49b: 0x35d1,
+	0x4a0: 0x4737, 0x4a1: 0x47c8, 0x4a2: 0x2f83, 0x4a3: 0x328f,
+	0x4a4: 0x3878, 0x4a5: 0x3a07, 0x4a6: 0x3871, 0x4a7: 0x3a00, 0x4a8: 0x3886, 0x4a9: 0x3a15,
+	0x4aa: 0x387f, 0x4ab: 0x3a0e, 0x4ac: 0x38be, 0x4ad: 0x3a4d, 0x4ae: 0x3894, 0x4af: 0x3a23,
+	0x4b0: 0x388d, 0x4b1: 0x3a1c, 0x4b2: 0x38a2, 0x4b3: 0x3a31, 0x4b4: 0x389b, 0x4b5: 0x3a2a,
+	0x4b6: 0x38c5, 0x4b7: 0x3a54, 0x4b8: 0x474b, 0x4b9: 0x47dc, 0x4ba: 0x3000, 0x4bb: 0x330c,
+	0x4bc: 0x2fec, 0x4bd: 0x32f8, 0x4be: 0x38da, 0x4bf: 0x3a69,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x38d3, 0x4c1: 0x3a62, 0x4c2: 0x38e8, 0x4c3: 0x3a77, 0x4c4: 0x38e1, 0x4c5: 0x3a70,
+	0x4c6: 0x38fd, 0x4c7: 0x3a8c, 0x4c8: 0x3091, 0x4c9: 0x339d, 0x4ca: 0x30a5, 0x4cb: 0x33b1,
+	0x4cc: 0x477d, 0x4cd: 0x480e, 0x4ce: 0x3136, 0x4cf: 0x3447, 0x4d0: 0x3920, 0x4d1: 0x3aaf,
+	0x4d2: 0x3919, 0x4d3: 0x3aa8, 0x4d4: 0x392e, 0x4d5: 0x3abd, 0x4d6: 0x3927, 0x4d7: 0x3ab6,
+	0x4d8: 0x3989, 0x4d9: 0x3b18, 0x4da: 0x396d, 0x4db: 0x3afc, 0x4dc: 0x3966, 0x4dd: 0x3af5,
+	0x4de: 0x397b, 0x4df: 0x3b0a, 0x4e0: 0x3974, 0x4e1: 0x3b03, 0x4e2: 0x3982, 0x4e3: 0x3b11,
+	0x4e4: 0x31e5, 0x4e5: 0x34fb, 0x4e6: 0x31c7, 0x4e7: 0x34dd, 0x4e8: 0x39e4, 0x4e9: 0x3b73,
+	0x4ea: 0x39dd, 0x4eb: 0x3b6c, 0x4ec: 0x39f2, 0x4ed: 0x3b81, 0x4ee: 0x39eb, 0x4ef: 0x3b7a,
+	0x4f0: 0x39f9, 0x4f1: 0x3b88, 0x4f2: 0x3230, 0x4f3: 0x354b, 0x4f4: 0x3258, 0x4f5: 0x3578,
+	0x4f6: 0x3253, 0x4f7: 0x356e, 0x4f8: 0x323f, 0x4f9: 0x355a,
+	// Block 0x14, offset 0x500
+	0x500: 0x489a, 0x501: 0x48a0, 0x502: 0x49b4, 0x503: 0x49cc, 0x504: 0x49bc, 0x505: 0x49d4,
+	0x506: 0x49c4, 0x507: 0x49dc, 0x508: 0x4840, 0x509: 0x4846, 0x50a: 0x4924, 0x50b: 0x493c,
+	0x50c: 0x492c, 0x50d: 0x4944, 0x50e: 0x4934, 0x50f: 0x494c, 0x510: 0x48ac, 0x511: 0x48b2,
+	0x512: 0x3db8, 0x513: 0x3dc8, 0x514: 0x3dc0, 0x515: 0x3dd0,
+	0x518: 0x484c, 0x519: 0x4852, 0x51a: 0x3ce8, 0x51b: 0x3cf8, 0x51c: 0x3cf0, 0x51d: 0x3d00,
+	0x520: 0x48c4, 0x521: 0x48ca, 0x522: 0x49e4, 0x523: 0x49fc,
+	0x524: 0x49ec, 0x525: 0x4a04, 0x526: 0x49f4, 0x527: 0x4a0c, 0x528: 0x4858, 0x529: 0x485e,
+	0x52a: 0x4954, 0x52b: 0x496c, 0x52c: 0x495c, 0x52d: 0x4974, 0x52e: 0x4964, 0x52f: 0x497c,
+	0x530: 0x48dc, 0x531: 0x48e2, 0x532: 0x3e18, 0x533: 0x3e30, 0x534: 0x3e20, 0x535: 0x3e38,
+	0x536: 0x3e28, 0x537: 0x3e40, 0x538: 0x4864, 0x539: 0x486a, 0x53a: 0x3d18, 0x53b: 0x3d30,
+	0x53c: 0x3d20, 0x53d: 0x3d38, 0x53e: 0x3d28, 0x53f: 0x3d40,
+	// Block 0x15, offset 0x540
+	0x540: 0x48e8, 0x541: 0x48ee, 0x542: 0x3e48, 0x543: 0x3e58, 0x544: 0x3e50, 0x545: 0x3e60,
+	0x548: 0x4870, 0x549: 0x4876, 0x54a: 0x3d48, 0x54b: 0x3d58,
+	0x54c: 0x3d50, 0x54d: 0x3d60, 0x550: 0x48fa, 0x551: 0x4900,
+	0x552: 0x3e80, 0x553: 0x3e98, 0x554: 0x3e88, 0x555: 0x3ea0, 0x556: 0x3e90, 0x557: 0x3ea8,
+	0x559: 0x487c, 0x55b: 0x3d68, 0x55d: 0x3d70,
+	0x55f: 0x3d78, 0x560: 0x4912, 0x561: 0x4918, 0x562: 0x4a14, 0x563: 0x4a2c,
+	0x564: 0x4a1c, 0x565: 0x4a34, 0x566: 0x4a24, 0x567: 0x4a3c, 0x568: 0x4882, 0x569: 0x4888,
+	0x56a: 0x4984, 0x56b: 0x499c, 0x56c: 0x498c, 0x56d: 0x49a4, 0x56e: 0x4994, 0x56f: 0x49ac,
+	0x570: 0x488e, 0x571: 0x43b4, 0x572: 0x3691, 0x573: 0x43ba, 0x574: 0x48b8, 0x575: 0x43c0,
+	0x576: 0x36a3, 0x577: 0x43c6, 0x578: 0x36c1, 0x579: 0x43cc, 0x57a: 0x36d9, 0x57b: 0x43d2,
+	0x57c: 0x4906, 0x57d: 0x43d8,
+	// Block 0x16, offset 0x580
+	0x580: 0x3da0, 0x581: 0x3da8, 0x582: 0x4184, 0x583: 0x41a2, 0x584: 0x418e, 0x585: 0x41ac,
+	0x586: 0x4198, 0x587: 0x41b6, 0x588: 0x3cd8, 0x589: 0x3ce0, 0x58a: 0x40d0, 0x58b: 0x40ee,
+	0x58c: 0x40da, 0x58d: 0x40f8, 0x58e: 0x40e4, 0x58f: 0x4102, 0x590: 0x3de8, 0x591: 0x3df0,
+	0x592: 0x41c0, 0x593: 0x41de, 0x594: 0x41ca, 0x595: 0x41e8, 0x596: 0x41d4, 0x597: 0x41f2,
+	0x598: 0x3d08, 0x599: 0x3d10, 0x59a: 0x410c, 0x59b: 0x412a, 0x59c: 0x4116, 0x59d: 0x4134,
+	0x59e: 0x4120, 0x59f: 0x413e, 0x5a0: 0x3ec0, 0x5a1: 0x3ec8, 0x5a2: 0x41fc, 0x5a3: 0x421a,
+	0x5a4: 0x4206, 0x5a5: 0x4224, 0x5a6: 0x4210, 0x5a7: 0x422e, 0x5a8: 0x3d80, 0x5a9: 0x3d88,
+	0x5aa: 0x4148, 0x5ab: 0x4166, 0x5ac: 0x4152, 0x5ad: 0x4170, 0x5ae: 0x415c, 0x5af: 0x417a,
+	0x5b0: 0x3685, 0x5b1: 0x367f, 0x5b2: 0x3d90, 0x5b3: 0x368b, 0x5b4: 0x3d98,
+	0x5b6: 0x48a6, 0x5b7: 0x3db0, 0x5b8: 0x35f5, 0x5b9: 0x35ef, 0x5ba: 0x35e3, 0x5bb: 0x4384,
+	0x5bc: 0x35fb, 0x5bd: 0x8100, 0x5be: 0x01d3, 0x5bf: 0xa100,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0x8100, 0x5c1: 0x35a7, 0x5c2: 0x3dd8, 0x5c3: 0x369d, 0x5c4: 0x3de0,
+	0x5c6: 0x48d0, 0x5c7: 0x3df8, 0x5c8: 0x3601, 0x5c9: 0x438a, 0x5ca: 0x360d, 0x5cb: 0x4390,
+	0x5cc: 0x3619, 0x5cd: 0x3b8f, 0x5ce: 0x3b96, 0x5cf: 0x3b9d, 0x5d0: 0x36b5, 0x5d1: 0x36af,
+	0x5d2: 0x3e00, 0x5d3: 0x457a, 0x5d6: 0x36bb, 0x5d7: 0x3e10,
+	0x5d8: 0x3631, 0x5d9: 0x362b, 0x5da: 0x361f, 0x5db: 0x4396, 0x5dd: 0x3ba4,
+	0x5de: 0x3bab, 0x5df: 0x3bb2, 0x5e0: 0x36eb, 0x5e1: 0x36e5, 0x5e2: 0x3e68, 0x5e3: 0x4582,
+	0x5e4: 0x36cd, 0x5e5: 0x36d3, 0x5e6: 0x36f1, 0x5e7: 0x3e78, 0x5e8: 0x3661, 0x5e9: 0x365b,
+	0x5ea: 0x364f, 0x5eb: 0x43a2, 0x5ec: 0x3649, 0x5ed: 0x359b, 0x5ee: 0x437e, 0x5ef: 0x0081,
+	0x5f2: 0x3eb0, 0x5f3: 0x36f7, 0x5f4: 0x3eb8,
+	0x5f6: 0x491e, 0x5f7: 0x3ed0, 0x5f8: 0x363d, 0x5f9: 0x439c, 0x5fa: 0x366d, 0x5fb: 0x43ae,
+	0x5fc: 0x3679, 0x5fd: 0x4256, 0x5fe: 0xa100,
+	// Block 0x18, offset 0x600
+	0x601: 0x3c06, 0x603: 0xa000, 0x604: 0x3c0d, 0x605: 0xa000,
+	0x607: 0x3c14, 0x608: 0xa000, 0x609: 0x3c1b,
+	0x60d: 0xa000,
+	0x620: 0x2f65, 0x621: 0xa000, 0x622: 0x3c29,
+	0x624: 0xa000, 0x625: 0xa000,
+	0x62d: 0x3c22, 0x62e: 0x2f60, 0x62f: 0x2f6a,
+	0x630: 0x3c30, 0x631: 0x3c37, 0x632: 0xa000, 0x633: 0xa000, 0x634: 0x3c3e, 0x635: 0x3c45,
+	0x636: 0xa000, 0x637: 0xa000, 0x638: 0x3c4c, 0x639: 0x3c53, 0x63a: 0xa000, 0x63b: 0xa000,
+	0x63c: 0xa000, 0x63d: 0xa000,
+	// Block 0x19, offset 0x640
+	0x640: 0x3c5a, 0x641: 0x3c61, 0x642: 0xa000, 0x643: 0xa000, 0x644: 0x3c76, 0x645: 0x3c7d,
+	0x646: 0xa000, 0x647: 0xa000, 0x648: 0x3c84, 0x649: 0x3c8b,
+	0x651: 0xa000,
+	0x652: 0xa000,
+	0x662: 0xa000,
+	0x668: 0xa000, 0x669: 0xa000,
+	0x66b: 0xa000, 0x66c: 0x3ca0, 0x66d: 0x3ca7, 0x66e: 0x3cae, 0x66f: 0x3cb5,
+	0x672: 0xa000, 0x673: 0xa000, 0x674: 0xa000, 0x675: 0xa000,
+	// Block 0x1a, offset 0x680
+	0x686: 0xa000, 0x68b: 0xa000,
+	0x68c: 0x3f08, 0x68d: 0xa000, 0x68e: 0x3f10, 0x68f: 0xa000, 0x690: 0x3f18, 0x691: 0xa000,
+	0x692: 0x3f20, 0x693: 0xa000, 0x694: 0x3f28, 0x695: 0xa000, 0x696: 0x3f30, 0x697: 0xa000,
+	0x698: 0x3f38, 0x699: 0xa000, 0x69a: 0x3f40, 0x69b: 0xa000, 0x69c: 0x3f48, 0x69d: 0xa000,
+	0x69e: 0x3f50, 0x69f: 0xa000, 0x6a0: 0x3f58, 0x6a1: 0xa000, 0x6a2: 0x3f60,
+	0x6a4: 0xa000, 0x6a5: 0x3f68, 0x6a6: 0xa000, 0x6a7: 0x3f70, 0x6a8: 0xa000, 0x6a9: 0x3f78,
+	0x6af: 0xa000,
+	0x6b0: 0x3f80, 0x6b1: 0x3f88, 0x6b2: 0xa000, 0x6b3: 0x3f90, 0x6b4: 0x3f98, 0x6b5: 0xa000,
+	0x6b6: 0x3fa0, 0x6b7: 0x3fa8, 0x6b8: 0xa000, 0x6b9: 0x3fb0, 0x6ba: 0x3fb8, 0x6bb: 0xa000,
+	0x6bc: 0x3fc0, 0x6bd: 0x3fc8,
+	// Block 0x1b, offset 0x6c0
+	0x6d4: 0x3f00,
+	0x6d9: 0x9903, 0x6da: 0x9903, 0x6db: 0x8100, 0x6dc: 0x8100, 0x6dd: 0xa000,
+	0x6de: 0x3fd0,
+	0x6e6: 0xa000,
+	0x6eb: 0xa000, 0x6ec: 0x3fe0, 0x6ed: 0xa000, 0x6ee: 0x3fe8, 0x6ef: 0xa000,
+	0x6f0: 0x3ff0, 0x6f1: 0xa000, 0x6f2: 0x3ff8, 0x6f3: 0xa000, 0x6f4: 0x4000, 0x6f5: 0xa000,
+	0x6f6: 0x4008, 0x6f7: 0xa000, 0x6f8: 0x4010, 0x6f9: 0xa000, 0x6fa: 0x4018, 0x6fb: 0xa000,
+	0x6fc: 0x4020, 0x6fd: 0xa000, 0x6fe: 0x4028, 0x6ff: 0xa000,
+	// Block 0x1c, offset 0x700
+	0x700: 0x4030, 0x701: 0xa000, 0x702: 0x4038, 0x704: 0xa000, 0x705: 0x4040,
+	0x706: 0xa000, 0x707: 0x4048, 0x708: 0xa000, 0x709: 0x4050,
+	0x70f: 0xa000, 0x710: 0x4058, 0x711: 0x4060,
+	0x712: 0xa000, 0x713: 0x4068, 0x714: 0x4070, 0x715: 0xa000, 0x716: 0x4078, 0x717: 0x4080,
+	0x718: 0xa000, 0x719: 0x4088, 0x71a: 0x4090, 0x71b: 0xa000, 0x71c: 0x4098, 0x71d: 0x40a0,
+	0x72f: 0xa000,
+	0x730: 0xa000, 0x731: 0xa000, 0x732: 0xa000, 0x734: 0x3fd8,
+	0x737: 0x40a8, 0x738: 0x40b0, 0x739: 0x40b8, 0x73a: 0x40c0,
+	0x73d: 0xa000, 0x73e: 0x40c8,
+	// Block 0x1d, offset 0x740
+	0x740: 0x1377, 0x741: 0x0cfb, 0x742: 0x13d3, 0x743: 0x139f, 0x744: 0x0e57, 0x745: 0x06eb,
+	0x746: 0x08df, 0x747: 0x162b, 0x748: 0x162b, 0x749: 0x0a0b, 0x74a: 0x145f, 0x74b: 0x0943,
+	0x74c: 0x0a07, 0x74d: 0x0bef, 0x74e: 0x0fcf, 0x74f: 0x115f, 0x750: 0x1297, 0x751: 0x12d3,
+	0x752: 0x1307, 0x753: 0x141b, 0x754: 0x0d73, 0x755: 0x0dff, 0x756: 0x0eab, 0x757: 0x0f43,
+	0x758: 0x125f, 0x759: 0x1447, 0x75a: 0x1573, 0x75b: 0x070f, 0x75c: 0x08b3, 0x75d: 0x0d87,
+	0x75e: 0x0ecf, 0x75f: 0x1293, 0x760: 0x15c3, 0x761: 0x0ab3, 0x762: 0x0e77, 0x763: 0x1283,
+	0x764: 0x1317, 0x765: 0x0c23, 0x766: 0x11bb, 0x767: 0x12df, 0x768: 0x0b1f, 0x769: 0x0d0f,
+	0x76a: 0x0e17, 0x76b: 0x0f1b, 0x76c: 0x1427, 0x76d: 0x074f, 0x76e: 0x07e7, 0x76f: 0x0853,
+	0x770: 0x0c8b, 0x771: 0x0d7f, 0x772: 0x0ecb, 0x773: 0x0fef, 0x774: 0x1177, 0x775: 0x128b,
+	0x776: 0x12a3, 0x777: 0x13c7, 0x778: 0x14ef, 0x779: 0x15a3, 0x77a: 0x15bf, 0x77b: 0x102b,
+	0x77c: 0x106b, 0x77d: 0x1123, 0x77e: 0x1243, 0x77f: 0x147b,
+	// Block 0x1e, offset 0x780
+	0x780: 0x15cb, 0x781: 0x134b, 0x782: 0x09c7, 0x783: 0x0b3b, 0x784: 0x10db, 0x785: 0x119b,
+	0x786: 0x0eff, 0x787: 0x1033, 0x788: 0x1397, 0x789: 0x14e7, 0x78a: 0x09c3, 0x78b: 0x0a8f,
+	0x78c: 0x0d77, 0x78d: 0x0e2b, 0x78e: 0x0e5f, 0x78f: 0x1113, 0x790: 0x113b, 0x791: 0x14a7,
+	0x792: 0x084f, 0x793: 0x11a7, 0x794: 0x07f3, 0x795: 0x07ef, 0x796: 0x1097, 0x797: 0x1127,
+	0x798: 0x125b, 0x799: 0x14af, 0x79a: 0x1367, 0x79b: 0x0c27, 0x79c: 0x0d73, 0x79d: 0x1357,
+	0x79e: 0x06f7, 0x79f: 0x0a63, 0x7a0: 0x0b93, 0x7a1: 0x0f2f, 0x7a2: 0x0faf, 0x7a3: 0x0873,
+	0x7a4: 0x103b, 0x7a5: 0x075f, 0x7a6: 0x0b77, 0x7a7: 0x06d7, 0x7a8: 0x0deb, 0x7a9: 0x0ca3,
+	0x7aa: 0x110f, 0x7ab: 0x08c7, 0x7ac: 0x09b3, 0x7ad: 0x0ffb, 0x7ae: 0x1263, 0x7af: 0x133b,
+	0x7b0: 0x0db7, 0x7b1: 0x13f7, 0x7b2: 0x0de3, 0x7b3: 0x0c37, 0x7b4: 0x121b, 0x7b5: 0x0c57,
+	0x7b6: 0x0fab, 0x7b7: 0x072b, 0x7b8: 0x07a7, 0x7b9: 0x07eb, 0x7ba: 0x0d53, 0x7bb: 0x10fb,
+	0x7bc: 0x11f3, 0x7bd: 0x1347, 0x7be: 0x145b, 0x7bf: 0x085b,
+	// Block 0x1f, offset 0x7c0
+	0x7c0: 0x090f, 0x7c1: 0x0a17, 0x7c2: 0x0b2f, 0x7c3: 0x0cbf, 0x7c4: 0x0e7b, 0x7c5: 0x103f,
+	0x7c6: 0x1497, 0x7c7: 0x157b, 0x7c8: 0x15cf, 0x7c9: 0x15e7, 0x7ca: 0x0837, 0x7cb: 0x0cf3,
+	0x7cc: 0x0da3, 0x7cd: 0x13eb, 0x7ce: 0x0afb, 0x7cf: 0x0bd7, 0x7d0: 0x0bf3, 0x7d1: 0x0c83,
+	0x7d2: 0x0e6b, 0x7d3: 0x0eb7, 0x7d4: 0x0f67, 0x7d5: 0x108b, 0x7d6: 0x112f, 0x7d7: 0x1193,
+	0x7d8: 0x13db, 0x7d9: 0x126b, 0x7da: 0x1403, 0x7db: 0x147f, 0x7dc: 0x080f, 0x7dd: 0x083b,
+	0x7de: 0x0923, 0x7df: 0x0ea7, 0x7e0: 0x12f3, 0x7e1: 0x133b, 0x7e2: 0x0b1b, 0x7e3: 0x0b8b,
+	0x7e4: 0x0c4f, 0x7e5: 0x0daf, 0x7e6: 0x10d7, 0x7e7: 0x0f23, 0x7e8: 0x073b, 0x7e9: 0x097f,
+	0x7ea: 0x0a63, 0x7eb: 0x0ac7, 0x7ec: 0x0b97, 0x7ed: 0x0f3f, 0x7ee: 0x0f5b, 0x7ef: 0x116b,
+	0x7f0: 0x118b, 0x7f1: 0x1463, 0x7f2: 0x14e3, 0x7f3: 0x14f3, 0x7f4: 0x152f, 0x7f5: 0x0753,
+	0x7f6: 0x107f, 0x7f7: 0x144f, 0x7f8: 0x14cb, 0x7f9: 0x0baf, 0x7fa: 0x0717, 0x7fb: 0x0777,
+	0x7fc: 0x0a67, 0x7fd: 0x0a87, 0x7fe: 0x0caf, 0x7ff: 0x0d73,
+	// Block 0x20, offset 0x800
+	0x800: 0x0ec3, 0x801: 0x0fcb, 0x802: 0x1277, 0x803: 0x1417, 0x804: 0x1623, 0x805: 0x0ce3,
+	0x806: 0x14a3, 0x807: 0x0833, 0x808: 0x0d2f, 0x809: 0x0d3b, 0x80a: 0x0e0f, 0x80b: 0x0e47,
+	0x80c: 0x0f4b, 0x80d: 0x0fa7, 0x80e: 0x1027, 0x80f: 0x110b, 0x810: 0x153b, 0x811: 0x07af,
+	0x812: 0x0c03, 0x813: 0x14b3, 0x814: 0x0767, 0x815: 0x0aab, 0x816: 0x0e2f, 0x817: 0x13df,
+	0x818: 0x0b67, 0x819: 0x0bb7, 0x81a: 0x0d43, 0x81b: 0x0f2f, 0x81c: 0x14bb, 0x81d: 0x0817,
+	0x81e: 0x08ff, 0x81f: 0x0a97, 0x820: 0x0cd3, 0x821: 0x0d1f, 0x822: 0x0d5f, 0x823: 0x0df3,
+	0x824: 0x0f47, 0x825: 0x0fbb, 0x826: 0x1157, 0x827: 0x12f7, 0x828: 0x1303, 0x829: 0x1457,
+	0x82a: 0x14d7, 0x82b: 0x0883, 0x82c: 0x0e4b, 0x82d: 0x0903, 0x82e: 0x0ec7, 0x82f: 0x0f6b,
+	0x830: 0x1287, 0x831: 0x14bf, 0x832: 0x15ab, 0x833: 0x15d3, 0x834: 0x0d37, 0x835: 0x0e27,
+	0x836: 0x11c3, 0x837: 0x10b7, 0x838: 0x10c3, 0x839: 0x10e7, 0x83a: 0x0f17, 0x83b: 0x0e9f,
+	0x83c: 0x1363, 0x83d: 0x0733, 0x83e: 0x122b, 0x83f: 0x081b,
+	// Block 0x21, offset 0x840
+	0x840: 0x080b, 0x841: 0x0b0b, 0x842: 0x0c2b, 0x843: 0x10f3, 0x844: 0x0a53, 0x845: 0x0e03,
+	0x846: 0x0cef, 0x847: 0x13e7, 0x848: 0x12e7, 0x849: 0x14ab, 0x84a: 0x1323, 0x84b: 0x0b27,
+	0x84c: 0x0787, 0x84d: 0x095b, 0x850: 0x09af,
+	0x852: 0x0cdf, 0x855: 0x07f7, 0x856: 0x0f1f, 0x857: 0x0fe3,
+	0x858: 0x1047, 0x859: 0x1063, 0x85a: 0x1067, 0x85b: 0x107b, 0x85c: 0x14fb, 0x85d: 0x10eb,
+	0x85e: 0x116f, 0x860: 0x128f, 0x862: 0x1353,
+	0x865: 0x1407, 0x866: 0x1433,
+	0x86a: 0x154f, 0x86b: 0x1553, 0x86c: 0x1557, 0x86d: 0x15bb, 0x86e: 0x142b, 0x86f: 0x14c7,
+	0x870: 0x0757, 0x871: 0x077b, 0x872: 0x078f, 0x873: 0x084b, 0x874: 0x0857, 0x875: 0x0897,
+	0x876: 0x094b, 0x877: 0x0967, 0x878: 0x096f, 0x879: 0x09ab, 0x87a: 0x09b7, 0x87b: 0x0a93,
+	0x87c: 0x0a9b, 0x87d: 0x0ba3, 0x87e: 0x0bcb, 0x87f: 0x0bd3,
+	// Block 0x22, offset 0x880
+	0x880: 0x0beb, 0x881: 0x0c97, 0x882: 0x0cc7, 0x883: 0x0ce7, 0x884: 0x0d57, 0x885: 0x0e1b,
+	0x886: 0x0e37, 0x887: 0x0e67, 0x888: 0x0ebb, 0x889: 0x0edb, 0x88a: 0x0f4f, 0x88b: 0x102f,
+	0x88c: 0x104b, 0x88d: 0x1053, 0x88e: 0x104f, 0x88f: 0x1057, 0x890: 0x105b, 0x891: 0x105f,
+	0x892: 0x1073, 0x893: 0x1077, 0x894: 0x109b, 0x895: 0x10af, 0x896: 0x10cb, 0x897: 0x112f,
+	0x898: 0x1137, 0x899: 0x113f, 0x89a: 0x1153, 0x89b: 0x117b, 0x89c: 0x11cb, 0x89d: 0x11ff,
+	0x89e: 0x11ff, 0x89f: 0x1267, 0x8a0: 0x130f, 0x8a1: 0x1327, 0x8a2: 0x135b, 0x8a3: 0x135f,
+	0x8a4: 0x13a3, 0x8a5: 0x13a7, 0x8a6: 0x13ff, 0x8a7: 0x1407, 0x8a8: 0x14db, 0x8a9: 0x151f,
+	0x8aa: 0x1537, 0x8ab: 0x0b9b, 0x8ac: 0x171e, 0x8ad: 0x11e3,
+	0x8b0: 0x06df, 0x8b1: 0x07e3, 0x8b2: 0x07a3, 0x8b3: 0x074b, 0x8b4: 0x078b, 0x8b5: 0x07b7,
+	0x8b6: 0x0847, 0x8b7: 0x0863, 0x8b8: 0x094b, 0x8b9: 0x0937, 0x8ba: 0x0947, 0x8bb: 0x0963,
+	0x8bc: 0x09af, 0x8bd: 0x09bf, 0x8be: 0x0a03, 0x8bf: 0x0a0f,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x0a2b, 0x8c1: 0x0a3b, 0x8c2: 0x0b23, 0x8c3: 0x0b2b, 0x8c4: 0x0b5b, 0x8c5: 0x0b7b,
+	0x8c6: 0x0bab, 0x8c7: 0x0bc3, 0x8c8: 0x0bb3, 0x8c9: 0x0bd3, 0x8ca: 0x0bc7, 0x8cb: 0x0beb,
+	0x8cc: 0x0c07, 0x8cd: 0x0c5f, 0x8ce: 0x0c6b, 0x8cf: 0x0c73, 0x8d0: 0x0c9b, 0x8d1: 0x0cdf,
+	0x8d2: 0x0d0f, 0x8d3: 0x0d13, 0x8d4: 0x0d27, 0x8d5: 0x0da7, 0x8d6: 0x0db7, 0x8d7: 0x0e0f,
+	0x8d8: 0x0e5b, 0x8d9: 0x0e53, 0x8da: 0x0e67, 0x8db: 0x0e83, 0x8dc: 0x0ebb, 0x8dd: 0x1013,
+	0x8de: 0x0edf, 0x8df: 0x0f13, 0x8e0: 0x0f1f, 0x8e1: 0x0f5f, 0x8e2: 0x0f7b, 0x8e3: 0x0f9f,
+	0x8e4: 0x0fc3, 0x8e5: 0x0fc7, 0x8e6: 0x0fe3, 0x8e7: 0x0fe7, 0x8e8: 0x0ff7, 0x8e9: 0x100b,
+	0x8ea: 0x1007, 0x8eb: 0x1037, 0x8ec: 0x10b3, 0x8ed: 0x10cb, 0x8ee: 0x10e3, 0x8ef: 0x111b,
+	0x8f0: 0x112f, 0x8f1: 0x114b, 0x8f2: 0x117b, 0x8f3: 0x122f, 0x8f4: 0x1257, 0x8f5: 0x12cb,
+	0x8f6: 0x1313, 0x8f7: 0x131f, 0x8f8: 0x1327, 0x8f9: 0x133f, 0x8fa: 0x1353, 0x8fb: 0x1343,
+	0x8fc: 0x135b, 0x8fd: 0x1357, 0x8fe: 0x134f, 0x8ff: 0x135f,
+	// Block 0x24, offset 0x900
+	0x900: 0x136b, 0x901: 0x13a7, 0x902: 0x13e3, 0x903: 0x1413, 0x904: 0x144b, 0x905: 0x146b,
+	0x906: 0x14b7, 0x907: 0x14db, 0x908: 0x14fb, 0x909: 0x150f, 0x90a: 0x151f, 0x90b: 0x152b,
+	0x90c: 0x1537, 0x90d: 0x158b, 0x90e: 0x162b, 0x90f: 0x16b5, 0x910: 0x16b0, 0x911: 0x16e2,
+	0x912: 0x0607, 0x913: 0x062f, 0x914: 0x0633, 0x915: 0x1764, 0x916: 0x1791, 0x917: 0x1809,
+	0x918: 0x1617, 0x919: 0x1627,
+	// Block 0x25, offset 0x940
+	0x940: 0x06fb, 0x941: 0x06f3, 0x942: 0x0703, 0x943: 0x1647, 0x944: 0x0747, 0x945: 0x0757,
+	0x946: 0x075b, 0x947: 0x0763, 0x948: 0x076b, 0x949: 0x076f, 0x94a: 0x077b, 0x94b: 0x0773,
+	0x94c: 0x05b3, 0x94d: 0x165b, 0x94e: 0x078f, 0x94f: 0x0793, 0x950: 0x0797, 0x951: 0x07b3,
+	0x952: 0x164c, 0x953: 0x05b7, 0x954: 0x079f, 0x955: 0x07bf, 0x956: 0x1656, 0x957: 0x07cf,
+	0x958: 0x07d7, 0x959: 0x0737, 0x95a: 0x07df, 0x95b: 0x07e3, 0x95c: 0x1831, 0x95d: 0x07ff,
+	0x95e: 0x0807, 0x95f: 0x05bf, 0x960: 0x081f, 0x961: 0x0823, 0x962: 0x082b, 0x963: 0x082f,
+	0x964: 0x05c3, 0x965: 0x0847, 0x966: 0x084b, 0x967: 0x0857, 0x968: 0x0863, 0x969: 0x0867,
+	0x96a: 0x086b, 0x96b: 0x0873, 0x96c: 0x0893, 0x96d: 0x0897, 0x96e: 0x089f, 0x96f: 0x08af,
+	0x970: 0x08b7, 0x971: 0x08bb, 0x972: 0x08bb, 0x973: 0x08bb, 0x974: 0x166a, 0x975: 0x0e93,
+	0x976: 0x08cf, 0x977: 0x08d7, 0x978: 0x166f, 0x979: 0x08e3, 0x97a: 0x08eb, 0x97b: 0x08f3,
+	0x97c: 0x091b, 0x97d: 0x0907, 0x97e: 0x0913, 0x97f: 0x0917,
+	// Block 0x26, offset 0x980
+	0x980: 0x091f, 0x981: 0x0927, 0x982: 0x092b, 0x983: 0x0933, 0x984: 0x093b, 0x985: 0x093f,
+	0x986: 0x093f, 0x987: 0x0947, 0x988: 0x094f, 0x989: 0x0953, 0x98a: 0x095f, 0x98b: 0x0983,
+	0x98c: 0x0967, 0x98d: 0x0987, 0x98e: 0x096b, 0x98f: 0x0973, 0x990: 0x080b, 0x991: 0x09cf,
+	0x992: 0x0997, 0x993: 0x099b, 0x994: 0x099f, 0x995: 0x0993, 0x996: 0x09a7, 0x997: 0x09a3,
+	0x998: 0x09bb, 0x999: 0x1674, 0x99a: 0x09d7, 0x99b: 0x09db, 0x99c: 0x09e3, 0x99d: 0x09ef,
+	0x99e: 0x09f7, 0x99f: 0x0a13, 0x9a0: 0x1679, 0x9a1: 0x167e, 0x9a2: 0x0a1f, 0x9a3: 0x0a23,
+	0x9a4: 0x0a27, 0x9a5: 0x0a1b, 0x9a6: 0x0a2f, 0x9a7: 0x05c7, 0x9a8: 0x05cb, 0x9a9: 0x0a37,
+	0x9aa: 0x0a3f, 0x9ab: 0x0a3f, 0x9ac: 0x1683, 0x9ad: 0x0a5b, 0x9ae: 0x0a5f, 0x9af: 0x0a63,
+	0x9b0: 0x0a6b, 0x9b1: 0x1688, 0x9b2: 0x0a73, 0x9b3: 0x0a77, 0x9b4: 0x0b4f, 0x9b5: 0x0a7f,
+	0x9b6: 0x05cf, 0x9b7: 0x0a8b, 0x9b8: 0x0a9b, 0x9b9: 0x0aa7, 0x9ba: 0x0aa3, 0x9bb: 0x1692,
+	0x9bc: 0x0aaf, 0x9bd: 0x1697, 0x9be: 0x0abb, 0x9bf: 0x0ab7,
+	// Block 0x27, offset 0x9c0
+	0x9c0: 0x0abf, 0x9c1: 0x0acf, 0x9c2: 0x0ad3, 0x9c3: 0x05d3, 0x9c4: 0x0ae3, 0x9c5: 0x0aeb,
+	0x9c6: 0x0aef, 0x9c7: 0x0af3, 0x9c8: 0x05d7, 0x9c9: 0x169c, 0x9ca: 0x05db, 0x9cb: 0x0b0f,
+	0x9cc: 0x0b13, 0x9cd: 0x0b17, 0x9ce: 0x0b1f, 0x9cf: 0x1863, 0x9d0: 0x0b37, 0x9d1: 0x16a6,
+	0x9d2: 0x16a6, 0x9d3: 0x11d7, 0x9d4: 0x0b47, 0x9d5: 0x0b47, 0x9d6: 0x05df, 0x9d7: 0x16c9,
+	0x9d8: 0x179b, 0x9d9: 0x0b57, 0x9da: 0x0b5f, 0x9db: 0x05e3, 0x9dc: 0x0b73, 0x9dd: 0x0b83,
+	0x9de: 0x0b87, 0x9df: 0x0b8f, 0x9e0: 0x0b9f, 0x9e1: 0x05eb, 0x9e2: 0x05e7, 0x9e3: 0x0ba3,
+	0x9e4: 0x16ab, 0x9e5: 0x0ba7, 0x9e6: 0x0bbb, 0x9e7: 0x0bbf, 0x9e8: 0x0bc3, 0x9e9: 0x0bbf,
+	0x9ea: 0x0bcf, 0x9eb: 0x0bd3, 0x9ec: 0x0be3, 0x9ed: 0x0bdb, 0x9ee: 0x0bdf, 0x9ef: 0x0be7,
+	0x9f0: 0x0beb, 0x9f1: 0x0bef, 0x9f2: 0x0bfb, 0x9f3: 0x0bff, 0x9f4: 0x0c17, 0x9f5: 0x0c1f,
+	0x9f6: 0x0c2f, 0x9f7: 0x0c43, 0x9f8: 0x16ba, 0x9f9: 0x0c3f, 0x9fa: 0x0c33, 0x9fb: 0x0c4b,
+	0x9fc: 0x0c53, 0x9fd: 0x0c67, 0x9fe: 0x16bf, 0x9ff: 0x0c6f,
+	// Block 0x28, offset 0xa00
+	0xa00: 0x0c63, 0xa01: 0x0c5b, 0xa02: 0x05ef, 0xa03: 0x0c77, 0xa04: 0x0c7f, 0xa05: 0x0c87,
+	0xa06: 0x0c7b, 0xa07: 0x05f3, 0xa08: 0x0c97, 0xa09: 0x0c9f, 0xa0a: 0x16c4, 0xa0b: 0x0ccb,
+	0xa0c: 0x0cff, 0xa0d: 0x0cdb, 0xa0e: 0x05ff, 0xa0f: 0x0ce7, 0xa10: 0x05fb, 0xa11: 0x05f7,
+	0xa12: 0x07c3, 0xa13: 0x07c7, 0xa14: 0x0d03, 0xa15: 0x0ceb, 0xa16: 0x11ab, 0xa17: 0x0663,
+	0xa18: 0x0d0f, 0xa19: 0x0d13, 0xa1a: 0x0d17, 0xa1b: 0x0d2b, 0xa1c: 0x0d23, 0xa1d: 0x16dd,
+	0xa1e: 0x0603, 0xa1f: 0x0d3f, 0xa20: 0x0d33, 0xa21: 0x0d4f, 0xa22: 0x0d57, 0xa23: 0x16e7,
+	0xa24: 0x0d5b, 0xa25: 0x0d47, 0xa26: 0x0d63, 0xa27: 0x0607, 0xa28: 0x0d67, 0xa29: 0x0d6b,
+	0xa2a: 0x0d6f, 0xa2b: 0x0d7b, 0xa2c: 0x16ec, 0xa2d: 0x0d83, 0xa2e: 0x060b, 0xa2f: 0x0d8f,
+	0xa30: 0x16f1, 0xa31: 0x0d93, 0xa32: 0x060f, 0xa33: 0x0d9f, 0xa34: 0x0dab, 0xa35: 0x0db7,
+	0xa36: 0x0dbb, 0xa37: 0x16f6, 0xa38: 0x168d, 0xa39: 0x16fb, 0xa3a: 0x0ddb, 0xa3b: 0x1700,
+	0xa3c: 0x0de7, 0xa3d: 0x0def, 0xa3e: 0x0ddf, 0xa3f: 0x0dfb,
+	// Block 0x29, offset 0xa40
+	0xa40: 0x0e0b, 0xa41: 0x0e1b, 0xa42: 0x0e0f, 0xa43: 0x0e13, 0xa44: 0x0e1f, 0xa45: 0x0e23,
+	0xa46: 0x1705, 0xa47: 0x0e07, 0xa48: 0x0e3b, 0xa49: 0x0e3f, 0xa4a: 0x0613, 0xa4b: 0x0e53,
+	0xa4c: 0x0e4f, 0xa4d: 0x170a, 0xa4e: 0x0e33, 0xa4f: 0x0e6f, 0xa50: 0x170f, 0xa51: 0x1714,
+	0xa52: 0x0e73, 0xa53: 0x0e87, 0xa54: 0x0e83, 0xa55: 0x0e7f, 0xa56: 0x0617, 0xa57: 0x0e8b,
+	0xa58: 0x0e9b, 0xa59: 0x0e97, 0xa5a: 0x0ea3, 0xa5b: 0x1651, 0xa5c: 0x0eb3, 0xa5d: 0x1719,
+	0xa5e: 0x0ebf, 0xa5f: 0x1723, 0xa60: 0x0ed3, 0xa61: 0x0edf, 0xa62: 0x0ef3, 0xa63: 0x1728,
+	0xa64: 0x0f07, 0xa65: 0x0f0b, 0xa66: 0x172d, 0xa67: 0x1732, 0xa68: 0x0f27, 0xa69: 0x0f37,
+	0xa6a: 0x061b, 0xa6b: 0x0f3b, 0xa6c: 0x061f, 0xa6d: 0x061f, 0xa6e: 0x0f53, 0xa6f: 0x0f57,
+	0xa70: 0x0f5f, 0xa71: 0x0f63, 0xa72: 0x0f6f, 0xa73: 0x0623, 0xa74: 0x0f87, 0xa75: 0x1737,
+	0xa76: 0x0fa3, 0xa77: 0x173c, 0xa78: 0x0faf, 0xa79: 0x16a1, 0xa7a: 0x0fbf, 0xa7b: 0x1741,
+	0xa7c: 0x1746, 0xa7d: 0x174b, 0xa7e: 0x0627, 0xa7f: 0x062b,
+	// Block 0x2a, offset 0xa80
+	0xa80: 0x0ff7, 0xa81: 0x1755, 0xa82: 0x1750, 0xa83: 0x175a, 0xa84: 0x175f, 0xa85: 0x0fff,
+	0xa86: 0x1003, 0xa87: 0x1003, 0xa88: 0x100b, 0xa89: 0x0633, 0xa8a: 0x100f, 0xa8b: 0x0637,
+	0xa8c: 0x063b, 0xa8d: 0x1769, 0xa8e: 0x1023, 0xa8f: 0x102b, 0xa90: 0x1037, 0xa91: 0x063f,
+	0xa92: 0x176e, 0xa93: 0x105b, 0xa94: 0x1773, 0xa95: 0x1778, 0xa96: 0x107b, 0xa97: 0x1093,
+	0xa98: 0x0643, 0xa99: 0x109b, 0xa9a: 0x109f, 0xa9b: 0x10a3, 0xa9c: 0x177d, 0xa9d: 0x1782,
+	0xa9e: 0x1782, 0xa9f: 0x10bb, 0xaa0: 0x0647, 0xaa1: 0x1787, 0xaa2: 0x10cf, 0xaa3: 0x10d3,
+	0xaa4: 0x064b, 0xaa5: 0x178c, 0xaa6: 0x10ef, 0xaa7: 0x064f, 0xaa8: 0x10ff, 0xaa9: 0x10f7,
+	0xaaa: 0x1107, 0xaab: 0x1796, 0xaac: 0x111f, 0xaad: 0x0653, 0xaae: 0x112b, 0xaaf: 0x1133,
+	0xab0: 0x1143, 0xab1: 0x0657, 0xab2: 0x17a0, 0xab3: 0x17a5, 0xab4: 0x065b, 0xab5: 0x17aa,
+	0xab6: 0x115b, 0xab7: 0x17af, 0xab8: 0x1167, 0xab9: 0x1173, 0xaba: 0x117b, 0xabb: 0x17b4,
+	0xabc: 0x17b9, 0xabd: 0x118f, 0xabe: 0x17be, 0xabf: 0x1197,
+	// Block 0x2b, offset 0xac0
+	0xac0: 0x16ce, 0xac1: 0x065f, 0xac2: 0x11af, 0xac3: 0x11b3, 0xac4: 0x0667, 0xac5: 0x11b7,
+	0xac6: 0x0a33, 0xac7: 0x17c3, 0xac8: 0x17c8, 0xac9: 0x16d3, 0xaca: 0x16d8, 0xacb: 0x11d7,
+	0xacc: 0x11db, 0xacd: 0x13f3, 0xace: 0x066b, 0xacf: 0x1207, 0xad0: 0x1203, 0xad1: 0x120b,
+	0xad2: 0x083f, 0xad3: 0x120f, 0xad4: 0x1213, 0xad5: 0x1217, 0xad6: 0x121f, 0xad7: 0x17cd,
+	0xad8: 0x121b, 0xad9: 0x1223, 0xada: 0x1237, 0xadb: 0x123b, 0xadc: 0x1227, 0xadd: 0x123f,
+	0xade: 0x1253, 0xadf: 0x1267, 0xae0: 0x1233, 0xae1: 0x1247, 0xae2: 0x124b, 0xae3: 0x124f,
+	0xae4: 0x17d2, 0xae5: 0x17dc, 0xae6: 0x17d7, 0xae7: 0x066f, 0xae8: 0x126f, 0xae9: 0x1273,
+	0xaea: 0x127b, 0xaeb: 0x17f0, 0xaec: 0x127f, 0xaed: 0x17e1, 0xaee: 0x0673, 0xaef: 0x0677,
+	0xaf0: 0x17e6, 0xaf1: 0x17eb, 0xaf2: 0x067b, 0xaf3: 0x129f, 0xaf4: 0x12a3, 0xaf5: 0x12a7,
+	0xaf6: 0x12ab, 0xaf7: 0x12b7, 0xaf8: 0x12b3, 0xaf9: 0x12bf, 0xafa: 0x12bb, 0xafb: 0x12cb,
+	0xafc: 0x12c3, 0xafd: 0x12c7, 0xafe: 0x12cf, 0xaff: 0x067f,
+	// Block 0x2c, offset 0xb00
+	0xb00: 0x12d7, 0xb01: 0x12db, 0xb02: 0x0683, 0xb03: 0x12eb, 0xb04: 0x12ef, 0xb05: 0x17f5,
+	0xb06: 0x12fb, 0xb07: 0x12ff, 0xb08: 0x0687, 0xb09: 0x130b, 0xb0a: 0x05bb, 0xb0b: 0x17fa,
+	0xb0c: 0x17ff, 0xb0d: 0x068b, 0xb0e: 0x068f, 0xb0f: 0x1337, 0xb10: 0x134f, 0xb11: 0x136b,
+	0xb12: 0x137b, 0xb13: 0x1804, 0xb14: 0x138f, 0xb15: 0x1393, 0xb16: 0x13ab, 0xb17: 0x13b7,
+	0xb18: 0x180e, 0xb19: 0x1660, 0xb1a: 0x13c3, 0xb1b: 0x13bf, 0xb1c: 0x13cb, 0xb1d: 0x1665,
+	0xb1e: 0x13d7, 0xb1f: 0x13e3, 0xb20: 0x1813, 0xb21: 0x1818, 0xb22: 0x1423, 0xb23: 0x142f,
+	0xb24: 0x1437, 0xb25: 0x181d, 0xb26: 0x143b, 0xb27: 0x1467, 0xb28: 0x1473, 0xb29: 0x1477,
+	0xb2a: 0x146f, 0xb2b: 0x1483, 0xb2c: 0x1487, 0xb2d: 0x1822, 0xb2e: 0x1493, 0xb2f: 0x0693,
+	0xb30: 0x149b, 0xb31: 0x1827, 0xb32: 0x0697, 0xb33: 0x14d3, 0xb34: 0x0ac3, 0xb35: 0x14eb,
+	0xb36: 0x182c, 0xb37: 0x1836, 0xb38: 0x069b, 0xb39: 0x069f, 0xb3a: 0x1513, 0xb3b: 0x183b,
+	0xb3c: 0x06a3, 0xb3d: 0x1840, 0xb3e: 0x152b, 0xb3f: 0x152b,
+	// Block 0x2d, offset 0xb40
+	0xb40: 0x1533, 0xb41: 0x1845, 0xb42: 0x154b, 0xb43: 0x06a7, 0xb44: 0x155b, 0xb45: 0x1567,
+	0xb46: 0x156f, 0xb47: 0x1577, 0xb48: 0x06ab, 0xb49: 0x184a, 0xb4a: 0x158b, 0xb4b: 0x15a7,
+	0xb4c: 0x15b3, 0xb4d: 0x06af, 0xb4e: 0x06b3, 0xb4f: 0x15b7, 0xb50: 0x184f, 0xb51: 0x06b7,
+	0xb52: 0x1854, 0xb53: 0x1859, 0xb54: 0x185e, 0xb55: 0x15db, 0xb56: 0x06bb, 0xb57: 0x15ef,
+	0xb58: 0x15f7, 0xb59: 0x15fb, 0xb5a: 0x1603, 0xb5b: 0x160b, 0xb5c: 0x1613, 0xb5d: 0x1868,
+}
+
+// nfcIndex: 22 blocks, 1408 entries, 1408 bytes
+// Block 0 is the zero block.
+var nfcIndex = [1408]uint8{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x2c, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x2d, 0xc7: 0x04,
+	0xc8: 0x05, 0xca: 0x2e, 0xcb: 0x2f, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x30,
+	0xd0: 0x09, 0xd1: 0x31, 0xd2: 0x32, 0xd3: 0x0a, 0xd6: 0x0b, 0xd7: 0x33,
+	0xd8: 0x34, 0xd9: 0x0c, 0xdb: 0x35, 0xdc: 0x36, 0xdd: 0x37, 0xdf: 0x38,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
+	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
+	0xf0: 0x13,
+	// Block 0x4, offset 0x100
+	0x120: 0x39, 0x121: 0x3a, 0x123: 0x3b, 0x124: 0x3c, 0x125: 0x3d, 0x126: 0x3e, 0x127: 0x3f,
+	0x128: 0x40, 0x129: 0x41, 0x12a: 0x42, 0x12b: 0x43, 0x12c: 0x3e, 0x12d: 0x44, 0x12e: 0x45, 0x12f: 0x46,
+	0x131: 0x47, 0x132: 0x48, 0x133: 0x49, 0x134: 0x4a, 0x135: 0x4b, 0x137: 0x4c,
+	0x138: 0x4d, 0x139: 0x4e, 0x13a: 0x4f, 0x13b: 0x50, 0x13c: 0x51, 0x13d: 0x52, 0x13e: 0x53, 0x13f: 0x54,
+	// Block 0x5, offset 0x140
+	0x140: 0x55, 0x142: 0x56, 0x144: 0x57, 0x145: 0x58, 0x146: 0x59, 0x147: 0x5a,
+	0x14d: 0x5b,
+	0x15c: 0x5c, 0x15f: 0x5d,
+	0x162: 0x5e, 0x164: 0x5f,
+	0x168: 0x60, 0x169: 0x61, 0x16a: 0x62, 0x16c: 0x0d, 0x16d: 0x63, 0x16e: 0x64, 0x16f: 0x65,
+	0x170: 0x66, 0x173: 0x67, 0x177: 0x68,
+	0x178: 0x0e, 0x179: 0x0f, 0x17a: 0x10, 0x17b: 0x11, 0x17c: 0x12, 0x17d: 0x13, 0x17e: 0x14, 0x17f: 0x15,
+	// Block 0x6, offset 0x180
+	0x180: 0x69, 0x183: 0x6a, 0x184: 0x6b, 0x186: 0x6c, 0x187: 0x6d,
+	0x188: 0x6e, 0x189: 0x16, 0x18a: 0x17, 0x18b: 0x6f, 0x18c: 0x70,
+	0x1ab: 0x71,
+	0x1b3: 0x72, 0x1b5: 0x73, 0x1b7: 0x74,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x75, 0x1c1: 0x18, 0x1c2: 0x19, 0x1c3: 0x1a, 0x1c4: 0x76, 0x1c5: 0x77,
+	0x1c9: 0x78, 0x1cc: 0x79, 0x1cd: 0x7a,
+	// Block 0x8, offset 0x200
+	0x219: 0x7b, 0x21a: 0x7c, 0x21b: 0x7d,
+	0x220: 0x7e, 0x223: 0x7f, 0x224: 0x80, 0x225: 0x81, 0x226: 0x82, 0x227: 0x83,
+	0x22a: 0x84, 0x22b: 0x85, 0x22f: 0x86,
+	0x230: 0x87, 0x231: 0x88, 0x232: 0x89, 0x233: 0x8a, 0x234: 0x8b, 0x235: 0x8c, 0x236: 0x8d, 0x237: 0x87,
+	0x238: 0x88, 0x239: 0x89, 0x23a: 0x8a, 0x23b: 0x8b, 0x23c: 0x8c, 0x23d: 0x8d, 0x23e: 0x87, 0x23f: 0x88,
+	// Block 0x9, offset 0x240
+	0x240: 0x89, 0x241: 0x8a, 0x242: 0x8b, 0x243: 0x8c, 0x244: 0x8d, 0x245: 0x87, 0x246: 0x88, 0x247: 0x89,
+	0x248: 0x8a, 0x249: 0x8b, 0x24a: 0x8c, 0x24b: 0x8d, 0x24c: 0x87, 0x24d: 0x88, 0x24e: 0x89, 0x24f: 0x8a,
+	0x250: 0x8b, 0x251: 0x8c, 0x252: 0x8d, 0x253: 0x87, 0x254: 0x88, 0x255: 0x89, 0x256: 0x8a, 0x257: 0x8b,
+	0x258: 0x8c, 0x259: 0x8d, 0x25a: 0x87, 0x25b: 0x88, 0x25c: 0x89, 0x25d: 0x8a, 0x25e: 0x8b, 0x25f: 0x8c,
+	0x260: 0x8d, 0x261: 0x87, 0x262: 0x88, 0x263: 0x89, 0x264: 0x8a, 0x265: 0x8b, 0x266: 0x8c, 0x267: 0x8d,
+	0x268: 0x87, 0x269: 0x88, 0x26a: 0x89, 0x26b: 0x8a, 0x26c: 0x8b, 0x26d: 0x8c, 0x26e: 0x8d, 0x26f: 0x87,
+	0x270: 0x88, 0x271: 0x89, 0x272: 0x8a, 0x273: 0x8b, 0x274: 0x8c, 0x275: 0x8d, 0x276: 0x87, 0x277: 0x88,
+	0x278: 0x89, 0x279: 0x8a, 0x27a: 0x8b, 0x27b: 0x8c, 0x27c: 0x8d, 0x27d: 0x87, 0x27e: 0x88, 0x27f: 0x89,
+	// Block 0xa, offset 0x280
+	0x280: 0x8a, 0x281: 0x8b, 0x282: 0x8c, 0x283: 0x8d, 0x284: 0x87, 0x285: 0x88, 0x286: 0x89, 0x287: 0x8a,
+	0x288: 0x8b, 0x289: 0x8c, 0x28a: 0x8d, 0x28b: 0x87, 0x28c: 0x88, 0x28d: 0x89, 0x28e: 0x8a, 0x28f: 0x8b,
+	0x290: 0x8c, 0x291: 0x8d, 0x292: 0x87, 0x293: 0x88, 0x294: 0x89, 0x295: 0x8a, 0x296: 0x8b, 0x297: 0x8c,
+	0x298: 0x8d, 0x299: 0x87, 0x29a: 0x88, 0x29b: 0x89, 0x29c: 0x8a, 0x29d: 0x8b, 0x29e: 0x8c, 0x29f: 0x8d,
+	0x2a0: 0x87, 0x2a1: 0x88, 0x2a2: 0x89, 0x2a3: 0x8a, 0x2a4: 0x8b, 0x2a5: 0x8c, 0x2a6: 0x8d, 0x2a7: 0x87,
+	0x2a8: 0x88, 0x2a9: 0x89, 0x2aa: 0x8a, 0x2ab: 0x8b, 0x2ac: 0x8c, 0x2ad: 0x8d, 0x2ae: 0x87, 0x2af: 0x88,
+	0x2b0: 0x89, 0x2b1: 0x8a, 0x2b2: 0x8b, 0x2b3: 0x8c, 0x2b4: 0x8d, 0x2b5: 0x87, 0x2b6: 0x88, 0x2b7: 0x89,
+	0x2b8: 0x8a, 0x2b9: 0x8b, 0x2ba: 0x8c, 0x2bb: 0x8d, 0x2bc: 0x87, 0x2bd: 0x88, 0x2be: 0x89, 0x2bf: 0x8a,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x8b, 0x2c1: 0x8c, 0x2c2: 0x8d, 0x2c3: 0x87, 0x2c4: 0x88, 0x2c5: 0x89, 0x2c6: 0x8a, 0x2c7: 0x8b,
+	0x2c8: 0x8c, 0x2c9: 0x8d, 0x2ca: 0x87, 0x2cb: 0x88, 0x2cc: 0x89, 0x2cd: 0x8a, 0x2ce: 0x8b, 0x2cf: 0x8c,
+	0x2d0: 0x8d, 0x2d1: 0x87, 0x2d2: 0x88, 0x2d3: 0x89, 0x2d4: 0x8a, 0x2d5: 0x8b, 0x2d6: 0x8c, 0x2d7: 0x8d,
+	0x2d8: 0x87, 0x2d9: 0x88, 0x2da: 0x89, 0x2db: 0x8a, 0x2dc: 0x8b, 0x2dd: 0x8c, 0x2de: 0x8e,
+	// Block 0xc, offset 0x300
+	0x324: 0x1b, 0x325: 0x1c, 0x326: 0x1d, 0x327: 0x1e,
+	0x328: 0x1f, 0x329: 0x20, 0x32a: 0x21, 0x32b: 0x22, 0x32c: 0x8f, 0x32d: 0x90, 0x32e: 0x91,
+	0x331: 0x92, 0x332: 0x93, 0x333: 0x94, 0x334: 0x95,
+	0x338: 0x96, 0x339: 0x97, 0x33a: 0x98, 0x33b: 0x99, 0x33e: 0x9a, 0x33f: 0x9b,
+	// Block 0xd, offset 0x340
+	0x347: 0x9c,
+	0x34b: 0x9d, 0x34d: 0x9e,
+	0x368: 0x9f, 0x36b: 0xa0,
+	// Block 0xe, offset 0x380
+	0x381: 0xa1, 0x382: 0xa2, 0x384: 0xa3, 0x385: 0x82, 0x387: 0xa4,
+	0x388: 0xa5, 0x38b: 0xa6, 0x38c: 0x3e, 0x38d: 0xa7,
+	0x391: 0xa8, 0x392: 0xa9, 0x393: 0xaa, 0x396: 0xab, 0x397: 0xac,
+	0x398: 0x73, 0x39a: 0xad, 0x39c: 0xae,
+	0x3b0: 0x73,
+	// Block 0xf, offset 0x3c0
+	0x3eb: 0xaf, 0x3ec: 0xb0,
+	// Block 0x10, offset 0x400
+	0x432: 0xb1,
+	// Block 0x11, offset 0x440
+	0x445: 0xb2, 0x446: 0xb3, 0x447: 0xb4,
+	0x449: 0xb5,
+	// Block 0x12, offset 0x480
+	0x480: 0xb6,
+	0x4a3: 0xb7, 0x4a5: 0xb8,
+	// Block 0x13, offset 0x4c0
+	0x4c8: 0xb9,
+	// Block 0x14, offset 0x500
+	0x520: 0x23, 0x521: 0x24, 0x522: 0x25, 0x523: 0x26, 0x524: 0x27, 0x525: 0x28, 0x526: 0x29, 0x527: 0x2a,
+	0x528: 0x2b,
+	// Block 0x15, offset 0x540
+	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
+	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
+	0x56f: 0x12,
+}
+
+// nfcSparseOffset: 142 entries, 284 bytes
+var nfcSparseOffset = []uint16{0x0, 0x5, 0x9, 0xb, 0xd, 0x18, 0x28, 0x2a, 0x2f, 0x3a, 0x49, 0x56, 0x5e, 0x62, 0x67, 0x69, 0x7a, 0x82, 0x89, 0x8c, 0x93, 0x97, 0x9b, 0x9d, 0x9f, 0xa8, 0xac, 0xb3, 0xb8, 0xbb, 0xc5, 0xc7, 0xce, 0xd6, 0xd9, 0xdb, 0xdd, 0xdf, 0xe4, 0xf5, 0x101, 0x103, 0x109, 0x10b, 0x10d, 0x10f, 0x111, 0x113, 0x115, 0x118, 0x11b, 0x11d, 0x120, 0x123, 0x127, 0x12c, 0x135, 0x137, 0x13a, 0x13c, 0x147, 0x157, 0x15b, 0x169, 0x16c, 0x172, 0x178, 0x183, 0x187, 0x189, 0x18b, 0x18d, 0x18f, 0x191, 0x197, 0x19b, 0x19d, 0x19f, 0x1a7, 0x1ab, 0x1ae, 0x1b0, 0x1b2, 0x1b4, 0x1b7, 0x1b9, 0x1bb, 0x1bd, 0x1bf, 0x1c5, 0x1c8, 0x1ca, 0x1d1, 0x1d7, 0x1dd, 0x1e5, 0x1eb, 0x1f1, 0x1f7, 0x1fb, 0x209, 0x212, 0x215, 0x218, 0x21a, 0x21d, 0x21f, 0x223, 0x228, 0x22a, 0x22c, 0x231, 0x237, 0x239, 0x23b, 0x23d, 0x243, 0x246, 0x249, 0x251, 0x258, 0x25b, 0x25e, 0x260, 0x268, 0x26b, 0x272, 0x275, 0x27b, 0x27d, 0x280, 0x282, 0x284, 0x286, 0x288, 0x295, 0x29f, 0x2a1, 0x2a3, 0x2a9, 0x2ab, 0x2ae}
+
+// nfcSparseValues: 688 entries, 2752 bytes
+var nfcSparseValues = [688]valueRange{
+	// Block 0x0, offset 0x0
+	{value: 0x0000, lo: 0x04},
+	{value: 0xa100, lo: 0xa8, hi: 0xa8},
+	{value: 0x8100, lo: 0xaf, hi: 0xaf},
+	{value: 0x8100, lo: 0xb4, hi: 0xb4},
+	{value: 0x8100, lo: 0xb8, hi: 0xb8},
+	// Block 0x1, offset 0x5
+	{value: 0x0091, lo: 0x03},
+	{value: 0x4778, lo: 0xa0, hi: 0xa1},
+	{value: 0x47aa, lo: 0xaf, hi: 0xb0},
+	{value: 0xa000, lo: 0xb7, hi: 0xb7},
+	// Block 0x2, offset 0x9
+	{value: 0x0000, lo: 0x01},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	// Block 0x3, offset 0xb
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x98, hi: 0x9d},
+	// Block 0x4, offset 0xd
+	{value: 0x0006, lo: 0x0a},
+	{value: 0xa000, lo: 0x81, hi: 0x81},
+	{value: 0xa000, lo: 0x85, hi: 0x85},
+	{value: 0xa000, lo: 0x89, hi: 0x89},
+	{value: 0x48d6, lo: 0x8a, hi: 0x8a},
+	{value: 0x48f4, lo: 0x8b, hi: 0x8b},
+	{value: 0x36c7, lo: 0x8c, hi: 0x8c},
+	{value: 0x36df, lo: 0x8d, hi: 0x8d},
+	{value: 0x490c, lo: 0x8e, hi: 0x8e},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x36fd, lo: 0x93, hi: 0x94},
+	// Block 0x5, offset 0x18
+	{value: 0x0000, lo: 0x0f},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0xa000, lo: 0x8d, hi: 0x8d},
+	{value: 0x37a5, lo: 0x90, hi: 0x90},
+	{value: 0x37b1, lo: 0x91, hi: 0x91},
+	{value: 0x379f, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x96, hi: 0x96},
+	{value: 0x3817, lo: 0x97, hi: 0x97},
+	{value: 0x37e1, lo: 0x9c, hi: 0x9c},
+	{value: 0x37c9, lo: 0x9d, hi: 0x9d},
+	{value: 0x37f3, lo: 0x9e, hi: 0x9e},
+	{value: 0xa000, lo: 0xb4, hi: 0xb5},
+	{value: 0x381d, lo: 0xb6, hi: 0xb6},
+	{value: 0x3823, lo: 0xb7, hi: 0xb7},
+	// Block 0x6, offset 0x28
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x83, hi: 0x87},
+	// Block 0x7, offset 0x2a
+	{value: 0x0001, lo: 0x04},
+	{value: 0x8113, lo: 0x81, hi: 0x82},
+	{value: 0x8132, lo: 0x84, hi: 0x84},
+	{value: 0x812d, lo: 0x85, hi: 0x85},
+	{value: 0x810d, lo: 0x87, hi: 0x87},
+	// Block 0x8, offset 0x2f
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8132, lo: 0x90, hi: 0x97},
+	{value: 0x8119, lo: 0x98, hi: 0x98},
+	{value: 0x811a, lo: 0x99, hi: 0x99},
+	{value: 0x811b, lo: 0x9a, hi: 0x9a},
+	{value: 0x3841, lo: 0xa2, hi: 0xa2},
+	{value: 0x3847, lo: 0xa3, hi: 0xa3},
+	{value: 0x3853, lo: 0xa4, hi: 0xa4},
+	{value: 0x384d, lo: 0xa5, hi: 0xa5},
+	{value: 0x3859, lo: 0xa6, hi: 0xa6},
+	{value: 0xa000, lo: 0xa7, hi: 0xa7},
+	// Block 0x9, offset 0x3a
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x386b, lo: 0x80, hi: 0x80},
+	{value: 0xa000, lo: 0x81, hi: 0x81},
+	{value: 0x385f, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x3865, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x95, hi: 0x95},
+	{value: 0x8132, lo: 0x96, hi: 0x9c},
+	{value: 0x8132, lo: 0x9f, hi: 0xa2},
+	{value: 0x812d, lo: 0xa3, hi: 0xa3},
+	{value: 0x8132, lo: 0xa4, hi: 0xa4},
+	{value: 0x8132, lo: 0xa7, hi: 0xa8},
+	{value: 0x812d, lo: 0xaa, hi: 0xaa},
+	{value: 0x8132, lo: 0xab, hi: 0xac},
+	{value: 0x812d, lo: 0xad, hi: 0xad},
+	// Block 0xa, offset 0x49
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x811f, lo: 0x91, hi: 0x91},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	{value: 0x812d, lo: 0xb1, hi: 0xb1},
+	{value: 0x8132, lo: 0xb2, hi: 0xb3},
+	{value: 0x812d, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb5, hi: 0xb6},
+	{value: 0x812d, lo: 0xb7, hi: 0xb9},
+	{value: 0x8132, lo: 0xba, hi: 0xba},
+	{value: 0x812d, lo: 0xbb, hi: 0xbc},
+	{value: 0x8132, lo: 0xbd, hi: 0xbd},
+	{value: 0x812d, lo: 0xbe, hi: 0xbe},
+	{value: 0x8132, lo: 0xbf, hi: 0xbf},
+	// Block 0xb, offset 0x56
+	{value: 0x0005, lo: 0x07},
+	{value: 0x8132, lo: 0x80, hi: 0x80},
+	{value: 0x8132, lo: 0x81, hi: 0x81},
+	{value: 0x812d, lo: 0x82, hi: 0x83},
+	{value: 0x812d, lo: 0x84, hi: 0x85},
+	{value: 0x812d, lo: 0x86, hi: 0x87},
+	{value: 0x812d, lo: 0x88, hi: 0x89},
+	{value: 0x8132, lo: 0x8a, hi: 0x8a},
+	// Block 0xc, offset 0x5e
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8132, lo: 0xab, hi: 0xb1},
+	{value: 0x812d, lo: 0xb2, hi: 0xb2},
+	{value: 0x8132, lo: 0xb3, hi: 0xb3},
+	// Block 0xd, offset 0x62
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8132, lo: 0x96, hi: 0x99},
+	{value: 0x8132, lo: 0x9b, hi: 0xa3},
+	{value: 0x8132, lo: 0xa5, hi: 0xa7},
+	{value: 0x8132, lo: 0xa9, hi: 0xad},
+	// Block 0xe, offset 0x67
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x99, hi: 0x9b},
+	// Block 0xf, offset 0x69
+	{value: 0x0000, lo: 0x10},
+	{value: 0x8132, lo: 0x94, hi: 0xa1},
+	{value: 0x812d, lo: 0xa3, hi: 0xa3},
+	{value: 0x8132, lo: 0xa4, hi: 0xa5},
+	{value: 0x812d, lo: 0xa6, hi: 0xa6},
+	{value: 0x8132, lo: 0xa7, hi: 0xa8},
+	{value: 0x812d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8132, lo: 0xaa, hi: 0xac},
+	{value: 0x812d, lo: 0xad, hi: 0xaf},
+	{value: 0x8116, lo: 0xb0, hi: 0xb0},
+	{value: 0x8117, lo: 0xb1, hi: 0xb1},
+	{value: 0x8118, lo: 0xb2, hi: 0xb2},
+	{value: 0x8132, lo: 0xb3, hi: 0xb5},
+	{value: 0x812d, lo: 0xb6, hi: 0xb6},
+	{value: 0x8132, lo: 0xb7, hi: 0xb8},
+	{value: 0x812d, lo: 0xb9, hi: 0xba},
+	{value: 0x8132, lo: 0xbb, hi: 0xbf},
+	// Block 0x10, offset 0x7a
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0xa8, hi: 0xa8},
+	{value: 0x3ed8, lo: 0xa9, hi: 0xa9},
+	{value: 0xa000, lo: 0xb0, hi: 0xb0},
+	{value: 0x3ee0, lo: 0xb1, hi: 0xb1},
+	{value: 0xa000, lo: 0xb3, hi: 0xb3},
+	{value: 0x3ee8, lo: 0xb4, hi: 0xb4},
+	{value: 0x9902, lo: 0xbc, hi: 0xbc},
+	// Block 0x11, offset 0x82
+	{value: 0x0008, lo: 0x06},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x8132, lo: 0x91, hi: 0x91},
+	{value: 0x812d, lo: 0x92, hi: 0x92},
+	{value: 0x8132, lo: 0x93, hi: 0x93},
+	{value: 0x8132, lo: 0x94, hi: 0x94},
+	{value: 0x45b2, lo: 0x98, hi: 0x9f},
+	// Block 0x12, offset 0x89
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x13, offset 0x8c
+	{value: 0x0008, lo: 0x06},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2c9e, lo: 0x8b, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x45f2, lo: 0x9c, hi: 0x9d},
+	{value: 0x4602, lo: 0x9f, hi: 0x9f},
+	// Block 0x14, offset 0x93
+	{value: 0x0000, lo: 0x03},
+	{value: 0x462a, lo: 0xb3, hi: 0xb3},
+	{value: 0x4632, lo: 0xb6, hi: 0xb6},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	// Block 0x15, offset 0x97
+	{value: 0x0008, lo: 0x03},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x460a, lo: 0x99, hi: 0x9b},
+	{value: 0x4622, lo: 0x9e, hi: 0x9e},
+	// Block 0x16, offset 0x9b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	// Block 0x17, offset 0x9d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	// Block 0x18, offset 0x9f
+	{value: 0x0000, lo: 0x08},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2cb6, lo: 0x88, hi: 0x88},
+	{value: 0x2cae, lo: 0x8b, hi: 0x8b},
+	{value: 0x2cbe, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x96, hi: 0x97},
+	{value: 0x463a, lo: 0x9c, hi: 0x9c},
+	{value: 0x4642, lo: 0x9d, hi: 0x9d},
+	// Block 0x19, offset 0xa8
+	{value: 0x0000, lo: 0x03},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x2cc6, lo: 0x94, hi: 0x94},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x1a, offset 0xac
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2cce, lo: 0x8a, hi: 0x8a},
+	{value: 0x2cde, lo: 0x8b, hi: 0x8b},
+	{value: 0x2cd6, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x1b, offset 0xb3
+	{value: 0x1801, lo: 0x04},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x3ef0, lo: 0x88, hi: 0x88},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x8120, lo: 0x95, hi: 0x96},
+	// Block 0x1c, offset 0xb8
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	{value: 0xa000, lo: 0xbf, hi: 0xbf},
+	// Block 0x1d, offset 0xbb
+	{value: 0x0000, lo: 0x09},
+	{value: 0x2ce6, lo: 0x80, hi: 0x80},
+	{value: 0x9900, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x2cee, lo: 0x87, hi: 0x87},
+	{value: 0x2cf6, lo: 0x88, hi: 0x88},
+	{value: 0x2f50, lo: 0x8a, hi: 0x8a},
+	{value: 0x2dd8, lo: 0x8b, hi: 0x8b},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x95, hi: 0x96},
+	// Block 0x1e, offset 0xc5
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x1f, offset 0xc7
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2cfe, lo: 0x8a, hi: 0x8a},
+	{value: 0x2d0e, lo: 0x8b, hi: 0x8b},
+	{value: 0x2d06, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x20, offset 0xce
+	{value: 0x6bea, lo: 0x07},
+	{value: 0x9904, lo: 0x8a, hi: 0x8a},
+	{value: 0x9900, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x3ef8, lo: 0x9a, hi: 0x9a},
+	{value: 0x2f58, lo: 0x9c, hi: 0x9c},
+	{value: 0x2de3, lo: 0x9d, hi: 0x9d},
+	{value: 0x2d16, lo: 0x9e, hi: 0x9f},
+	// Block 0x21, offset 0xd6
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8122, lo: 0xb8, hi: 0xb9},
+	{value: 0x8104, lo: 0xba, hi: 0xba},
+	// Block 0x22, offset 0xd9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8123, lo: 0x88, hi: 0x8b},
+	// Block 0x23, offset 0xdb
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8124, lo: 0xb8, hi: 0xb9},
+	// Block 0x24, offset 0xdd
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8125, lo: 0x88, hi: 0x8b},
+	// Block 0x25, offset 0xdf
+	{value: 0x0000, lo: 0x04},
+	{value: 0x812d, lo: 0x98, hi: 0x99},
+	{value: 0x812d, lo: 0xb5, hi: 0xb5},
+	{value: 0x812d, lo: 0xb7, hi: 0xb7},
+	{value: 0x812b, lo: 0xb9, hi: 0xb9},
+	// Block 0x26, offset 0xe4
+	{value: 0x0000, lo: 0x10},
+	{value: 0x2644, lo: 0x83, hi: 0x83},
+	{value: 0x264b, lo: 0x8d, hi: 0x8d},
+	{value: 0x2652, lo: 0x92, hi: 0x92},
+	{value: 0x2659, lo: 0x97, hi: 0x97},
+	{value: 0x2660, lo: 0x9c, hi: 0x9c},
+	{value: 0x263d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8126, lo: 0xb1, hi: 0xb1},
+	{value: 0x8127, lo: 0xb2, hi: 0xb2},
+	{value: 0x4a66, lo: 0xb3, hi: 0xb3},
+	{value: 0x8128, lo: 0xb4, hi: 0xb4},
+	{value: 0x4a6f, lo: 0xb5, hi: 0xb5},
+	{value: 0x464a, lo: 0xb6, hi: 0xb6},
+	{value: 0x8200, lo: 0xb7, hi: 0xb7},
+	{value: 0x4652, lo: 0xb8, hi: 0xb8},
+	{value: 0x8200, lo: 0xb9, hi: 0xb9},
+	{value: 0x8127, lo: 0xba, hi: 0xbd},
+	// Block 0x27, offset 0xf5
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x8127, lo: 0x80, hi: 0x80},
+	{value: 0x4a78, lo: 0x81, hi: 0x81},
+	{value: 0x8132, lo: 0x82, hi: 0x83},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0x86, hi: 0x87},
+	{value: 0x266e, lo: 0x93, hi: 0x93},
+	{value: 0x2675, lo: 0x9d, hi: 0x9d},
+	{value: 0x267c, lo: 0xa2, hi: 0xa2},
+	{value: 0x2683, lo: 0xa7, hi: 0xa7},
+	{value: 0x268a, lo: 0xac, hi: 0xac},
+	{value: 0x2667, lo: 0xb9, hi: 0xb9},
+	// Block 0x28, offset 0x101
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x86, hi: 0x86},
+	// Block 0x29, offset 0x103
+	{value: 0x0000, lo: 0x05},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x2d1e, lo: 0xa6, hi: 0xa6},
+	{value: 0x9900, lo: 0xae, hi: 0xae},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	{value: 0x8104, lo: 0xb9, hi: 0xba},
+	// Block 0x2a, offset 0x109
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x8d, hi: 0x8d},
+	// Block 0x2b, offset 0x10b
+	{value: 0x0000, lo: 0x01},
+	{value: 0xa000, lo: 0x80, hi: 0x92},
+	// Block 0x2c, offset 0x10d
+	{value: 0x0000, lo: 0x01},
+	{value: 0xb900, lo: 0xa1, hi: 0xb5},
+	// Block 0x2d, offset 0x10f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xa8, hi: 0xbf},
+	// Block 0x2e, offset 0x111
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0x80, hi: 0x82},
+	// Block 0x2f, offset 0x113
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x9d, hi: 0x9f},
+	// Block 0x30, offset 0x115
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x94, hi: 0x94},
+	{value: 0x8104, lo: 0xb4, hi: 0xb4},
+	// Block 0x31, offset 0x118
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x92, hi: 0x92},
+	{value: 0x8132, lo: 0x9d, hi: 0x9d},
+	// Block 0x32, offset 0x11b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8131, lo: 0xa9, hi: 0xa9},
+	// Block 0x33, offset 0x11d
+	{value: 0x0004, lo: 0x02},
+	{value: 0x812e, lo: 0xb9, hi: 0xba},
+	{value: 0x812d, lo: 0xbb, hi: 0xbb},
+	// Block 0x34, offset 0x120
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x97, hi: 0x97},
+	{value: 0x812d, lo: 0x98, hi: 0x98},
+	// Block 0x35, offset 0x123
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8104, lo: 0xa0, hi: 0xa0},
+	{value: 0x8132, lo: 0xb5, hi: 0xbc},
+	{value: 0x812d, lo: 0xbf, hi: 0xbf},
+	// Block 0x36, offset 0x127
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8132, lo: 0xb0, hi: 0xb4},
+	{value: 0x812d, lo: 0xb5, hi: 0xba},
+	{value: 0x8132, lo: 0xbb, hi: 0xbc},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	// Block 0x37, offset 0x12c
+	{value: 0x0000, lo: 0x08},
+	{value: 0x2d66, lo: 0x80, hi: 0x80},
+	{value: 0x2d6e, lo: 0x81, hi: 0x81},
+	{value: 0xa000, lo: 0x82, hi: 0x82},
+	{value: 0x2d76, lo: 0x83, hi: 0x83},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0xab, hi: 0xab},
+	{value: 0x812d, lo: 0xac, hi: 0xac},
+	{value: 0x8132, lo: 0xad, hi: 0xb3},
+	// Block 0x38, offset 0x135
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xaa, hi: 0xab},
+	// Block 0x39, offset 0x137
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xa6, hi: 0xa6},
+	{value: 0x8104, lo: 0xb2, hi: 0xb3},
+	// Block 0x3a, offset 0x13a
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	// Block 0x3b, offset 0x13c
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8132, lo: 0x90, hi: 0x92},
+	{value: 0x8101, lo: 0x94, hi: 0x94},
+	{value: 0x812d, lo: 0x95, hi: 0x99},
+	{value: 0x8132, lo: 0x9a, hi: 0x9b},
+	{value: 0x812d, lo: 0x9c, hi: 0x9f},
+	{value: 0x8132, lo: 0xa0, hi: 0xa0},
+	{value: 0x8101, lo: 0xa2, hi: 0xa8},
+	{value: 0x812d, lo: 0xad, hi: 0xad},
+	{value: 0x8132, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb8, hi: 0xb9},
+	// Block 0x3c, offset 0x147
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x8132, lo: 0x80, hi: 0x81},
+	{value: 0x812d, lo: 0x82, hi: 0x82},
+	{value: 0x8132, lo: 0x83, hi: 0x89},
+	{value: 0x812d, lo: 0x8a, hi: 0x8a},
+	{value: 0x8132, lo: 0x8b, hi: 0x8c},
+	{value: 0x8135, lo: 0x8d, hi: 0x8d},
+	{value: 0x812a, lo: 0x8e, hi: 0x8e},
+	{value: 0x812d, lo: 0x8f, hi: 0x8f},
+	{value: 0x8129, lo: 0x90, hi: 0x90},
+	{value: 0x8132, lo: 0x91, hi: 0xb5},
+	{value: 0x8132, lo: 0xbb, hi: 0xbb},
+	{value: 0x8134, lo: 0xbc, hi: 0xbc},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	{value: 0x8132, lo: 0xbe, hi: 0xbe},
+	{value: 0x812d, lo: 0xbf, hi: 0xbf},
+	// Block 0x3d, offset 0x157
+	{value: 0x0004, lo: 0x03},
+	{value: 0x0433, lo: 0x80, hi: 0x81},
+	{value: 0x8100, lo: 0x97, hi: 0x97},
+	{value: 0x8100, lo: 0xbe, hi: 0xbe},
+	// Block 0x3e, offset 0x15b
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x8132, lo: 0x90, hi: 0x91},
+	{value: 0x8101, lo: 0x92, hi: 0x93},
+	{value: 0x8132, lo: 0x94, hi: 0x97},
+	{value: 0x8101, lo: 0x98, hi: 0x9a},
+	{value: 0x8132, lo: 0x9b, hi: 0x9c},
+	{value: 0x8132, lo: 0xa1, hi: 0xa1},
+	{value: 0x8101, lo: 0xa5, hi: 0xa6},
+	{value: 0x8132, lo: 0xa7, hi: 0xa7},
+	{value: 0x812d, lo: 0xa8, hi: 0xa8},
+	{value: 0x8132, lo: 0xa9, hi: 0xa9},
+	{value: 0x8101, lo: 0xaa, hi: 0xab},
+	{value: 0x812d, lo: 0xac, hi: 0xaf},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	// Block 0x3f, offset 0x169
+	{value: 0x427b, lo: 0x02},
+	{value: 0x01b8, lo: 0xa6, hi: 0xa6},
+	{value: 0x0057, lo: 0xaa, hi: 0xab},
+	// Block 0x40, offset 0x16c
+	{value: 0x0007, lo: 0x05},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	{value: 0x3bb9, lo: 0x9a, hi: 0x9b},
+	{value: 0x3bc7, lo: 0xae, hi: 0xae},
+	// Block 0x41, offset 0x172
+	{value: 0x000e, lo: 0x05},
+	{value: 0x3bce, lo: 0x8d, hi: 0x8e},
+	{value: 0x3bd5, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	// Block 0x42, offset 0x178
+	{value: 0x6408, lo: 0x0a},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0x3be3, lo: 0x84, hi: 0x84},
+	{value: 0xa000, lo: 0x88, hi: 0x88},
+	{value: 0x3bea, lo: 0x89, hi: 0x89},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0x3bf1, lo: 0x8c, hi: 0x8c},
+	{value: 0xa000, lo: 0xa3, hi: 0xa3},
+	{value: 0x3bf8, lo: 0xa4, hi: 0xa5},
+	{value: 0x3bff, lo: 0xa6, hi: 0xa6},
+	{value: 0xa000, lo: 0xbc, hi: 0xbc},
+	// Block 0x43, offset 0x183
+	{value: 0x0007, lo: 0x03},
+	{value: 0x3c68, lo: 0xa0, hi: 0xa1},
+	{value: 0x3c92, lo: 0xa2, hi: 0xa3},
+	{value: 0x3cbc, lo: 0xaa, hi: 0xad},
+	// Block 0x44, offset 0x187
+	{value: 0x0004, lo: 0x01},
+	{value: 0x048b, lo: 0xa9, hi: 0xaa},
+	// Block 0x45, offset 0x189
+	{value: 0x0000, lo: 0x01},
+	{value: 0x4573, lo: 0x9c, hi: 0x9c},
+	// Block 0x46, offset 0x18b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xaf, hi: 0xb1},
+	// Block 0x47, offset 0x18d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x48, offset 0x18f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xa0, hi: 0xbf},
+	// Block 0x49, offset 0x191
+	{value: 0x0000, lo: 0x05},
+	{value: 0x812c, lo: 0xaa, hi: 0xaa},
+	{value: 0x8131, lo: 0xab, hi: 0xab},
+	{value: 0x8133, lo: 0xac, hi: 0xac},
+	{value: 0x812e, lo: 0xad, hi: 0xad},
+	{value: 0x812f, lo: 0xae, hi: 0xaf},
+	// Block 0x4a, offset 0x197
+	{value: 0x0000, lo: 0x03},
+	{value: 0x4a81, lo: 0xb3, hi: 0xb3},
+	{value: 0x4a81, lo: 0xb5, hi: 0xb6},
+	{value: 0x4a81, lo: 0xba, hi: 0xbf},
+	// Block 0x4b, offset 0x19b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x4a81, lo: 0x8f, hi: 0xa3},
+	// Block 0x4c, offset 0x19d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0xae, hi: 0xbe},
+	// Block 0x4d, offset 0x19f
+	{value: 0x0000, lo: 0x07},
+	{value: 0x8100, lo: 0x84, hi: 0x84},
+	{value: 0x8100, lo: 0x87, hi: 0x87},
+	{value: 0x8100, lo: 0x90, hi: 0x90},
+	{value: 0x8100, lo: 0x9e, hi: 0x9e},
+	{value: 0x8100, lo: 0xa1, hi: 0xa1},
+	{value: 0x8100, lo: 0xb2, hi: 0xb2},
+	{value: 0x8100, lo: 0xbb, hi: 0xbb},
+	// Block 0x4e, offset 0x1a7
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8100, lo: 0x80, hi: 0x80},
+	{value: 0x8100, lo: 0x8b, hi: 0x8b},
+	{value: 0x8100, lo: 0x8e, hi: 0x8e},
+	// Block 0x4f, offset 0x1ab
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0xaf, hi: 0xaf},
+	{value: 0x8132, lo: 0xb4, hi: 0xbd},
+	// Block 0x50, offset 0x1ae
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x9e, hi: 0x9f},
+	// Block 0x51, offset 0x1b0
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb0, hi: 0xb1},
+	// Block 0x52, offset 0x1b2
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x86, hi: 0x86},
+	// Block 0x53, offset 0x1b4
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0xa0, hi: 0xb1},
+	// Block 0x54, offset 0x1b7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xab, hi: 0xad},
+	// Block 0x55, offset 0x1b9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x93, hi: 0x93},
+	// Block 0x56, offset 0x1bb
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb3, hi: 0xb3},
+	// Block 0x57, offset 0x1bd
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x80, hi: 0x80},
+	// Block 0x58, offset 0x1bf
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	{value: 0x8132, lo: 0xb2, hi: 0xb3},
+	{value: 0x812d, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb7, hi: 0xb8},
+	{value: 0x8132, lo: 0xbe, hi: 0xbf},
+	// Block 0x59, offset 0x1c5
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x81, hi: 0x81},
+	{value: 0x8104, lo: 0xb6, hi: 0xb6},
+	// Block 0x5a, offset 0x1c8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xad, hi: 0xad},
+	// Block 0x5b, offset 0x1ca
+	{value: 0x0000, lo: 0x06},
+	{value: 0xe500, lo: 0x80, hi: 0x80},
+	{value: 0xc600, lo: 0x81, hi: 0x9b},
+	{value: 0xe500, lo: 0x9c, hi: 0x9c},
+	{value: 0xc600, lo: 0x9d, hi: 0xb7},
+	{value: 0xe500, lo: 0xb8, hi: 0xb8},
+	{value: 0xc600, lo: 0xb9, hi: 0xbf},
+	// Block 0x5c, offset 0x1d1
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x93},
+	{value: 0xe500, lo: 0x94, hi: 0x94},
+	{value: 0xc600, lo: 0x95, hi: 0xaf},
+	{value: 0xe500, lo: 0xb0, hi: 0xb0},
+	{value: 0xc600, lo: 0xb1, hi: 0xbf},
+	// Block 0x5d, offset 0x1d7
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8b},
+	{value: 0xe500, lo: 0x8c, hi: 0x8c},
+	{value: 0xc600, lo: 0x8d, hi: 0xa7},
+	{value: 0xe500, lo: 0xa8, hi: 0xa8},
+	{value: 0xc600, lo: 0xa9, hi: 0xbf},
+	// Block 0x5e, offset 0x1dd
+	{value: 0x0000, lo: 0x07},
+	{value: 0xc600, lo: 0x80, hi: 0x83},
+	{value: 0xe500, lo: 0x84, hi: 0x84},
+	{value: 0xc600, lo: 0x85, hi: 0x9f},
+	{value: 0xe500, lo: 0xa0, hi: 0xa0},
+	{value: 0xc600, lo: 0xa1, hi: 0xbb},
+	{value: 0xe500, lo: 0xbc, hi: 0xbc},
+	{value: 0xc600, lo: 0xbd, hi: 0xbf},
+	// Block 0x5f, offset 0x1e5
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x97},
+	{value: 0xe500, lo: 0x98, hi: 0x98},
+	{value: 0xc600, lo: 0x99, hi: 0xb3},
+	{value: 0xe500, lo: 0xb4, hi: 0xb4},
+	{value: 0xc600, lo: 0xb5, hi: 0xbf},
+	// Block 0x60, offset 0x1eb
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8f},
+	{value: 0xe500, lo: 0x90, hi: 0x90},
+	{value: 0xc600, lo: 0x91, hi: 0xab},
+	{value: 0xe500, lo: 0xac, hi: 0xac},
+	{value: 0xc600, lo: 0xad, hi: 0xbf},
+	// Block 0x61, offset 0x1f1
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	{value: 0xe500, lo: 0xa4, hi: 0xa4},
+	{value: 0xc600, lo: 0xa5, hi: 0xbf},
+	// Block 0x62, offset 0x1f7
+	{value: 0x0000, lo: 0x03},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	// Block 0x63, offset 0x1fb
+	{value: 0x0006, lo: 0x0d},
+	{value: 0x4426, lo: 0x9d, hi: 0x9d},
+	{value: 0x8115, lo: 0x9e, hi: 0x9e},
+	{value: 0x4498, lo: 0x9f, hi: 0x9f},
+	{value: 0x4486, lo: 0xaa, hi: 0xab},
+	{value: 0x458a, lo: 0xac, hi: 0xac},
+	{value: 0x4592, lo: 0xad, hi: 0xad},
+	{value: 0x43de, lo: 0xae, hi: 0xb1},
+	{value: 0x43fc, lo: 0xb2, hi: 0xb4},
+	{value: 0x4414, lo: 0xb5, hi: 0xb6},
+	{value: 0x4420, lo: 0xb8, hi: 0xb8},
+	{value: 0x442c, lo: 0xb9, hi: 0xbb},
+	{value: 0x4444, lo: 0xbc, hi: 0xbc},
+	{value: 0x444a, lo: 0xbe, hi: 0xbe},
+	// Block 0x64, offset 0x209
+	{value: 0x0006, lo: 0x08},
+	{value: 0x4450, lo: 0x80, hi: 0x81},
+	{value: 0x445c, lo: 0x83, hi: 0x84},
+	{value: 0x446e, lo: 0x86, hi: 0x89},
+	{value: 0x4492, lo: 0x8a, hi: 0x8a},
+	{value: 0x440e, lo: 0x8b, hi: 0x8b},
+	{value: 0x43f6, lo: 0x8c, hi: 0x8c},
+	{value: 0x443e, lo: 0x8d, hi: 0x8d},
+	{value: 0x4468, lo: 0x8e, hi: 0x8e},
+	// Block 0x65, offset 0x212
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8100, lo: 0xa4, hi: 0xa5},
+	{value: 0x8100, lo: 0xb0, hi: 0xb1},
+	// Block 0x66, offset 0x215
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8100, lo: 0x9b, hi: 0x9d},
+	{value: 0x8200, lo: 0x9e, hi: 0xa3},
+	// Block 0x67, offset 0x218
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x90, hi: 0x90},
+	// Block 0x68, offset 0x21a
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8100, lo: 0x99, hi: 0x99},
+	{value: 0x8200, lo: 0xb2, hi: 0xb4},
+	// Block 0x69, offset 0x21d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0xbc, hi: 0xbd},
+	// Block 0x6a, offset 0x21f
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8132, lo: 0xa0, hi: 0xa6},
+	{value: 0x812d, lo: 0xa7, hi: 0xad},
+	{value: 0x8132, lo: 0xae, hi: 0xaf},
+	// Block 0x6b, offset 0x223
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8100, lo: 0x89, hi: 0x8c},
+	{value: 0x8100, lo: 0xb0, hi: 0xb2},
+	{value: 0x8100, lo: 0xb4, hi: 0xb4},
+	{value: 0x8100, lo: 0xb6, hi: 0xbf},
+	// Block 0x6c, offset 0x228
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x81, hi: 0x8c},
+	// Block 0x6d, offset 0x22a
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0xb5, hi: 0xba},
+	// Block 0x6e, offset 0x22c
+	{value: 0x0000, lo: 0x04},
+	{value: 0x4a81, lo: 0x9e, hi: 0x9f},
+	{value: 0x4a81, lo: 0xa3, hi: 0xa3},
+	{value: 0x4a81, lo: 0xa5, hi: 0xa6},
+	{value: 0x4a81, lo: 0xaa, hi: 0xaf},
+	// Block 0x6f, offset 0x231
+	{value: 0x0000, lo: 0x05},
+	{value: 0x4a81, lo: 0x82, hi: 0x87},
+	{value: 0x4a81, lo: 0x8a, hi: 0x8f},
+	{value: 0x4a81, lo: 0x92, hi: 0x97},
+	{value: 0x4a81, lo: 0x9a, hi: 0x9c},
+	{value: 0x8100, lo: 0xa3, hi: 0xa3},
+	// Block 0x70, offset 0x237
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	// Block 0x71, offset 0x239
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xa0, hi: 0xa0},
+	// Block 0x72, offset 0x23b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb6, hi: 0xba},
+	// Block 0x73, offset 0x23d
+	{value: 0x002c, lo: 0x05},
+	{value: 0x812d, lo: 0x8d, hi: 0x8d},
+	{value: 0x8132, lo: 0x8f, hi: 0x8f},
+	{value: 0x8132, lo: 0xb8, hi: 0xb8},
+	{value: 0x8101, lo: 0xb9, hi: 0xba},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x74, offset 0x243
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0xa5, hi: 0xa5},
+	{value: 0x812d, lo: 0xa6, hi: 0xa6},
+	// Block 0x75, offset 0x246
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x86, hi: 0x86},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x76, offset 0x249
+	{value: 0x17fe, lo: 0x07},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x4238, lo: 0x9a, hi: 0x9a},
+	{value: 0xa000, lo: 0x9b, hi: 0x9b},
+	{value: 0x4242, lo: 0x9c, hi: 0x9c},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x424c, lo: 0xab, hi: 0xab},
+	{value: 0x8104, lo: 0xb9, hi: 0xba},
+	// Block 0x77, offset 0x251
+	{value: 0x0000, lo: 0x06},
+	{value: 0x8132, lo: 0x80, hi: 0x82},
+	{value: 0x9900, lo: 0xa7, hi: 0xa7},
+	{value: 0x2d7e, lo: 0xae, hi: 0xae},
+	{value: 0x2d88, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb1, hi: 0xb2},
+	{value: 0x8104, lo: 0xb3, hi: 0xb4},
+	// Block 0x78, offset 0x258
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x80, hi: 0x80},
+	{value: 0x8102, lo: 0x8a, hi: 0x8a},
+	// Block 0x79, offset 0x25b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xb5, hi: 0xb5},
+	{value: 0x8102, lo: 0xb6, hi: 0xb6},
+	// Block 0x7a, offset 0x25e
+	{value: 0x0002, lo: 0x01},
+	{value: 0x8102, lo: 0xa9, hi: 0xaa},
+	// Block 0x7b, offset 0x260
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2d92, lo: 0x8b, hi: 0x8b},
+	{value: 0x2d9c, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x8132, lo: 0xa6, hi: 0xac},
+	{value: 0x8132, lo: 0xb0, hi: 0xb4},
+	// Block 0x7c, offset 0x268
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x82, hi: 0x82},
+	{value: 0x8102, lo: 0x86, hi: 0x86},
+	// Block 0x7d, offset 0x26b
+	{value: 0x6b5a, lo: 0x06},
+	{value: 0x9900, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xb9, hi: 0xb9},
+	{value: 0x9900, lo: 0xba, hi: 0xba},
+	{value: 0x2db0, lo: 0xbb, hi: 0xbb},
+	{value: 0x2da6, lo: 0xbc, hi: 0xbd},
+	{value: 0x2dba, lo: 0xbe, hi: 0xbe},
+	// Block 0x7e, offset 0x272
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x82, hi: 0x82},
+	{value: 0x8102, lo: 0x83, hi: 0x83},
+	// Block 0x7f, offset 0x275
+	{value: 0x0000, lo: 0x05},
+	{value: 0x9900, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb8, hi: 0xb9},
+	{value: 0x2dc4, lo: 0xba, hi: 0xba},
+	{value: 0x2dce, lo: 0xbb, hi: 0xbb},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x80, offset 0x27b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0x80, hi: 0x80},
+	// Block 0x81, offset 0x27d
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xb6, hi: 0xb6},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	// Block 0x82, offset 0x280
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xab, hi: 0xab},
+	// Block 0x83, offset 0x282
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0xb0, hi: 0xb4},
+	// Block 0x84, offset 0x284
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb0, hi: 0xb6},
+	// Block 0x85, offset 0x286
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0x9e, hi: 0x9e},
+	// Block 0x86, offset 0x288
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x4662, lo: 0x9e, hi: 0x9e},
+	{value: 0x466c, lo: 0x9f, hi: 0x9f},
+	{value: 0x46a0, lo: 0xa0, hi: 0xa0},
+	{value: 0x46ae, lo: 0xa1, hi: 0xa1},
+	{value: 0x46bc, lo: 0xa2, hi: 0xa2},
+	{value: 0x46ca, lo: 0xa3, hi: 0xa3},
+	{value: 0x46d8, lo: 0xa4, hi: 0xa4},
+	{value: 0x812b, lo: 0xa5, hi: 0xa6},
+	{value: 0x8101, lo: 0xa7, hi: 0xa9},
+	{value: 0x8130, lo: 0xad, hi: 0xad},
+	{value: 0x812b, lo: 0xae, hi: 0xb2},
+	{value: 0x812d, lo: 0xbb, hi: 0xbf},
+	// Block 0x87, offset 0x295
+	{value: 0x0000, lo: 0x09},
+	{value: 0x812d, lo: 0x80, hi: 0x82},
+	{value: 0x8132, lo: 0x85, hi: 0x89},
+	{value: 0x812d, lo: 0x8a, hi: 0x8b},
+	{value: 0x8132, lo: 0xaa, hi: 0xad},
+	{value: 0x4676, lo: 0xbb, hi: 0xbb},
+	{value: 0x4680, lo: 0xbc, hi: 0xbc},
+	{value: 0x46e6, lo: 0xbd, hi: 0xbd},
+	{value: 0x4702, lo: 0xbe, hi: 0xbe},
+	{value: 0x46f4, lo: 0xbf, hi: 0xbf},
+	// Block 0x88, offset 0x29f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x4710, lo: 0x80, hi: 0x80},
+	// Block 0x89, offset 0x2a1
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x82, hi: 0x84},
+	// Block 0x8a, offset 0x2a3
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8132, lo: 0x80, hi: 0x86},
+	{value: 0x8132, lo: 0x88, hi: 0x98},
+	{value: 0x8132, lo: 0x9b, hi: 0xa1},
+	{value: 0x8132, lo: 0xa3, hi: 0xa4},
+	{value: 0x8132, lo: 0xa6, hi: 0xaa},
+	// Block 0x8b, offset 0x2a9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x90, hi: 0x96},
+	// Block 0x8c, offset 0x2ab
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x84, hi: 0x89},
+	{value: 0x8102, lo: 0x8a, hi: 0x8a},
+	// Block 0x8d, offset 0x2ae
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x93, hi: 0x93},
+}
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfkcTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfkcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfkcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfkcTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfkcValues[c0]
+	}
+	i := nfkcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfkcTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfkcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfkcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfkcTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfkcValues[c0]
+	}
+	i := nfkcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// nfkcTrie. Total size: 16994 bytes (16.60 KiB). Checksum: 146925fc21092b17.
+type nfkcTrie struct{}
+
+func newNfkcTrie(i int) *nfkcTrie {
+	return &nfkcTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *nfkcTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	case n < 90:
+		return uint16(nfkcValues[n<<6+uint32(b)])
+	default:
+		n -= 90
+		return uint16(nfkcSparse.lookup(n, b))
+	}
+}
+
+// nfkcValues: 92 blocks, 5888 entries, 11776 bytes
+// The third block is the zero block.
+var nfkcValues = [5888]uint16{
+	// Block 0x0, offset 0x0
+	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
+	// Block 0x1, offset 0x40
+	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
+	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
+	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
+	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
+	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
+	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
+	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
+	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
+	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
+	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x471e, 0xc3: 0x2f79, 0xc4: 0x472d, 0xc5: 0x4732,
+	0xc6: 0xa000, 0xc7: 0x473c, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x4741, 0xcb: 0x2ffb,
+	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x4755, 0xd1: 0x3104,
+	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x475f, 0xd5: 0x4764, 0xd6: 0x4773,
+	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x47a5, 0xdd: 0x3235,
+	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x47af, 0xe3: 0x3285,
+	0xe4: 0x47be, 0xe5: 0x47c3, 0xe6: 0xa000, 0xe7: 0x47cd, 0xe8: 0x32ee, 0xe9: 0x32f3,
+	0xea: 0x47d2, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x47e6,
+	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x47f0, 0xf5: 0x47f5,
+	0xf6: 0x4804, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
+	0xfc: 0x4836, 0xfd: 0x3550, 0xff: 0x3569,
+	// Block 0x4, offset 0x100
+	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x4723, 0x103: 0x47b4, 0x104: 0x2f9c, 0x105: 0x32a8,
+	0x106: 0x2fb0, 0x107: 0x32bc, 0x108: 0x2fb5, 0x109: 0x32c1, 0x10a: 0x2fba, 0x10b: 0x32c6,
+	0x10c: 0x2fbf, 0x10d: 0x32cb, 0x10e: 0x2fc9, 0x10f: 0x32d5,
+	0x112: 0x4746, 0x113: 0x47d7, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
+	0x118: 0x3014, 0x119: 0x3320, 0x11a: 0x3005, 0x11b: 0x3311, 0x11c: 0x302d, 0x11d: 0x3339,
+	0x11e: 0x3037, 0x11f: 0x3343, 0x120: 0x303c, 0x121: 0x3348, 0x122: 0x3046, 0x123: 0x3352,
+	0x124: 0x304b, 0x125: 0x3357, 0x128: 0x307d, 0x129: 0x338e,
+	0x12a: 0x3082, 0x12b: 0x3393, 0x12c: 0x3087, 0x12d: 0x3398, 0x12e: 0x30aa, 0x12f: 0x33b6,
+	0x130: 0x308c, 0x132: 0x195d, 0x133: 0x19e7, 0x134: 0x30b4, 0x135: 0x33c0,
+	0x136: 0x30c8, 0x137: 0x33d9, 0x139: 0x30d2, 0x13a: 0x33e3, 0x13b: 0x30dc,
+	0x13c: 0x33ed, 0x13d: 0x30d7, 0x13e: 0x33e8, 0x13f: 0x1bac,
+	// Block 0x5, offset 0x140
+	0x140: 0x1c34, 0x143: 0x30ff, 0x144: 0x3410, 0x145: 0x3118,
+	0x146: 0x3429, 0x147: 0x310e, 0x148: 0x341f, 0x149: 0x1c5c,
+	0x14c: 0x4769, 0x14d: 0x47fa, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
+	0x154: 0x3159, 0x155: 0x346a, 0x156: 0x3172, 0x157: 0x3483,
+	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x478c, 0x15b: 0x481d, 0x15c: 0x317c, 0x15d: 0x348d,
+	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x4791, 0x161: 0x4822, 0x162: 0x31a4, 0x163: 0x34ba,
+	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x479b, 0x169: 0x482c,
+	0x16a: 0x47a0, 0x16b: 0x4831, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
+	0x170: 0x31d1, 0x171: 0x34e7, 0x172: 0x31ef, 0x173: 0x3505, 0x174: 0x3212, 0x175: 0x3528,
+	0x176: 0x323a, 0x177: 0x3555, 0x178: 0x324e, 0x179: 0x325d, 0x17a: 0x357d, 0x17b: 0x3267,
+	0x17c: 0x3587, 0x17d: 0x326c, 0x17e: 0x358c, 0x17f: 0x00a7,
+	// Block 0x6, offset 0x180
+	0x184: 0x2dee, 0x185: 0x2df4,
+	0x186: 0x2dfa, 0x187: 0x1972, 0x188: 0x1975, 0x189: 0x1a08, 0x18a: 0x1987, 0x18b: 0x198a,
+	0x18c: 0x1a3e, 0x18d: 0x2f88, 0x18e: 0x3294, 0x18f: 0x3096, 0x190: 0x33a2, 0x191: 0x3140,
+	0x192: 0x3451, 0x193: 0x31d6, 0x194: 0x34ec, 0x195: 0x39cf, 0x196: 0x3b5e, 0x197: 0x39c8,
+	0x198: 0x3b57, 0x199: 0x39d6, 0x19a: 0x3b65, 0x19b: 0x39c1, 0x19c: 0x3b50,
+	0x19e: 0x38b0, 0x19f: 0x3a3f, 0x1a0: 0x38a9, 0x1a1: 0x3a38, 0x1a2: 0x35b3, 0x1a3: 0x35c5,
+	0x1a6: 0x3041, 0x1a7: 0x334d, 0x1a8: 0x30be, 0x1a9: 0x33cf,
+	0x1aa: 0x4782, 0x1ab: 0x4813, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
+	0x1b0: 0x33c5, 0x1b1: 0x1942, 0x1b2: 0x1945, 0x1b3: 0x19cf, 0x1b4: 0x3028, 0x1b5: 0x3334,
+	0x1b8: 0x30fa, 0x1b9: 0x340b, 0x1ba: 0x38b7, 0x1bb: 0x3a46,
+	0x1bc: 0x35ad, 0x1bd: 0x35bf, 0x1be: 0x35b9, 0x1bf: 0x35cb,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x2f8d, 0x1c1: 0x3299, 0x1c2: 0x2f92, 0x1c3: 0x329e, 0x1c4: 0x300a, 0x1c5: 0x3316,
+	0x1c6: 0x300f, 0x1c7: 0x331b, 0x1c8: 0x309b, 0x1c9: 0x33a7, 0x1ca: 0x30a0, 0x1cb: 0x33ac,
+	0x1cc: 0x3145, 0x1cd: 0x3456, 0x1ce: 0x314a, 0x1cf: 0x345b, 0x1d0: 0x3168, 0x1d1: 0x3479,
+	0x1d2: 0x316d, 0x1d3: 0x347e, 0x1d4: 0x31db, 0x1d5: 0x34f1, 0x1d6: 0x31e0, 0x1d7: 0x34f6,
+	0x1d8: 0x3186, 0x1d9: 0x3497, 0x1da: 0x319f, 0x1db: 0x34b5,
+	0x1de: 0x305a, 0x1df: 0x3366,
+	0x1e6: 0x4728, 0x1e7: 0x47b9, 0x1e8: 0x4750, 0x1e9: 0x47e1,
+	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x476e, 0x1ef: 0x47ff,
+	0x1f0: 0x3958, 0x1f1: 0x3ae7, 0x1f2: 0x3244, 0x1f3: 0x355f,
+	// Block 0x8, offset 0x200
+	0x200: 0x9932, 0x201: 0x9932, 0x202: 0x9932, 0x203: 0x9932, 0x204: 0x9932, 0x205: 0x8132,
+	0x206: 0x9932, 0x207: 0x9932, 0x208: 0x9932, 0x209: 0x9932, 0x20a: 0x9932, 0x20b: 0x9932,
+	0x20c: 0x9932, 0x20d: 0x8132, 0x20e: 0x8132, 0x20f: 0x9932, 0x210: 0x8132, 0x211: 0x9932,
+	0x212: 0x8132, 0x213: 0x9932, 0x214: 0x9932, 0x215: 0x8133, 0x216: 0x812d, 0x217: 0x812d,
+	0x218: 0x812d, 0x219: 0x812d, 0x21a: 0x8133, 0x21b: 0x992b, 0x21c: 0x812d, 0x21d: 0x812d,
+	0x21e: 0x812d, 0x21f: 0x812d, 0x220: 0x812d, 0x221: 0x8129, 0x222: 0x8129, 0x223: 0x992d,
+	0x224: 0x992d, 0x225: 0x992d, 0x226: 0x992d, 0x227: 0x9929, 0x228: 0x9929, 0x229: 0x812d,
+	0x22a: 0x812d, 0x22b: 0x812d, 0x22c: 0x812d, 0x22d: 0x992d, 0x22e: 0x992d, 0x22f: 0x812d,
+	0x230: 0x992d, 0x231: 0x992d, 0x232: 0x812d, 0x233: 0x812d, 0x234: 0x8101, 0x235: 0x8101,
+	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812d, 0x23a: 0x812d, 0x23b: 0x812d,
+	0x23c: 0x812d, 0x23d: 0x8132, 0x23e: 0x8132, 0x23f: 0x8132,
+	// Block 0x9, offset 0x240
+	0x240: 0x4a44, 0x241: 0x4a49, 0x242: 0x9932, 0x243: 0x4a4e, 0x244: 0x4a53, 0x245: 0x9936,
+	0x246: 0x8132, 0x247: 0x812d, 0x248: 0x812d, 0x249: 0x812d, 0x24a: 0x8132, 0x24b: 0x8132,
+	0x24c: 0x8132, 0x24d: 0x812d, 0x24e: 0x812d, 0x250: 0x8132, 0x251: 0x8132,
+	0x252: 0x8132, 0x253: 0x812d, 0x254: 0x812d, 0x255: 0x812d, 0x256: 0x812d, 0x257: 0x8132,
+	0x258: 0x8133, 0x259: 0x812d, 0x25a: 0x812d, 0x25b: 0x8132, 0x25c: 0x8134, 0x25d: 0x8135,
+	0x25e: 0x8135, 0x25f: 0x8134, 0x260: 0x8135, 0x261: 0x8135, 0x262: 0x8134, 0x263: 0x8132,
+	0x264: 0x8132, 0x265: 0x8132, 0x266: 0x8132, 0x267: 0x8132, 0x268: 0x8132, 0x269: 0x8132,
+	0x26a: 0x8132, 0x26b: 0x8132, 0x26c: 0x8132, 0x26d: 0x8132, 0x26e: 0x8132, 0x26f: 0x8132,
+	0x274: 0x0170,
+	0x27a: 0x42a5,
+	0x27e: 0x0037,
+	// Block 0xa, offset 0x280
+	0x284: 0x425a, 0x285: 0x4511,
+	0x286: 0x35e9, 0x287: 0x00ce, 0x288: 0x3607, 0x289: 0x3613, 0x28a: 0x3625,
+	0x28c: 0x3643, 0x28e: 0x3655, 0x28f: 0x3673, 0x290: 0x3e08, 0x291: 0xa000,
+	0x295: 0xa000, 0x297: 0xa000,
+	0x299: 0xa000,
+	0x29f: 0xa000, 0x2a1: 0xa000,
+	0x2a5: 0xa000, 0x2a9: 0xa000,
+	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x4894, 0x2ad: 0x3697, 0x2ae: 0x48be, 0x2af: 0x36a9,
+	0x2b0: 0x3e70, 0x2b1: 0xa000, 0x2b5: 0xa000,
+	0x2b7: 0xa000, 0x2b9: 0xa000,
+	0x2bf: 0xa000,
+	// Block 0xb, offset 0x2c0
+	0x2c1: 0xa000, 0x2c5: 0xa000,
+	0x2c9: 0xa000, 0x2ca: 0x48d6, 0x2cb: 0x48f4,
+	0x2cc: 0x36c7, 0x2cd: 0x36df, 0x2ce: 0x490c, 0x2d0: 0x01be, 0x2d1: 0x01d0,
+	0x2d2: 0x01ac, 0x2d3: 0x43a2, 0x2d4: 0x43a8, 0x2d5: 0x01fa, 0x2d6: 0x01e8,
+	0x2f0: 0x01d6, 0x2f1: 0x01eb, 0x2f2: 0x01ee, 0x2f4: 0x0188, 0x2f5: 0x01c7,
+	0x2f9: 0x01a6,
+	// Block 0xc, offset 0x300
+	0x300: 0x3721, 0x301: 0x372d, 0x303: 0x371b,
+	0x306: 0xa000, 0x307: 0x3709,
+	0x30c: 0x375d, 0x30d: 0x3745, 0x30e: 0x376f, 0x310: 0xa000,
+	0x313: 0xa000, 0x315: 0xa000, 0x316: 0xa000, 0x317: 0xa000,
+	0x318: 0xa000, 0x319: 0x3751, 0x31a: 0xa000,
+	0x31e: 0xa000, 0x323: 0xa000,
+	0x327: 0xa000,
+	0x32b: 0xa000, 0x32d: 0xa000,
+	0x330: 0xa000, 0x333: 0xa000, 0x335: 0xa000,
+	0x336: 0xa000, 0x337: 0xa000, 0x338: 0xa000, 0x339: 0x37d5, 0x33a: 0xa000,
+	0x33e: 0xa000,
+	// Block 0xd, offset 0x340
+	0x341: 0x3733, 0x342: 0x37b7,
+	0x350: 0x370f, 0x351: 0x3793,
+	0x352: 0x3715, 0x353: 0x3799, 0x356: 0x3727, 0x357: 0x37ab,
+	0x358: 0xa000, 0x359: 0xa000, 0x35a: 0x3829, 0x35b: 0x382f, 0x35c: 0x3739, 0x35d: 0x37bd,
+	0x35e: 0x373f, 0x35f: 0x37c3, 0x362: 0x374b, 0x363: 0x37cf,
+	0x364: 0x3757, 0x365: 0x37db, 0x366: 0x3763, 0x367: 0x37e7, 0x368: 0xa000, 0x369: 0xa000,
+	0x36a: 0x3835, 0x36b: 0x383b, 0x36c: 0x378d, 0x36d: 0x3811, 0x36e: 0x3769, 0x36f: 0x37ed,
+	0x370: 0x3775, 0x371: 0x37f9, 0x372: 0x377b, 0x373: 0x37ff, 0x374: 0x3781, 0x375: 0x3805,
+	0x378: 0x3787, 0x379: 0x380b,
+	// Block 0xe, offset 0x380
+	0x387: 0x1d61,
+	0x391: 0x812d,
+	0x392: 0x8132, 0x393: 0x8132, 0x394: 0x8132, 0x395: 0x8132, 0x396: 0x812d, 0x397: 0x8132,
+	0x398: 0x8132, 0x399: 0x8132, 0x39a: 0x812e, 0x39b: 0x812d, 0x39c: 0x8132, 0x39d: 0x8132,
+	0x39e: 0x8132, 0x39f: 0x8132, 0x3a0: 0x8132, 0x3a1: 0x8132, 0x3a2: 0x812d, 0x3a3: 0x812d,
+	0x3a4: 0x812d, 0x3a5: 0x812d, 0x3a6: 0x812d, 0x3a7: 0x812d, 0x3a8: 0x8132, 0x3a9: 0x8132,
+	0x3aa: 0x812d, 0x3ab: 0x8132, 0x3ac: 0x8132, 0x3ad: 0x812e, 0x3ae: 0x8131, 0x3af: 0x8132,
+	0x3b0: 0x8105, 0x3b1: 0x8106, 0x3b2: 0x8107, 0x3b3: 0x8108, 0x3b4: 0x8109, 0x3b5: 0x810a,
+	0x3b6: 0x810b, 0x3b7: 0x810c, 0x3b8: 0x810d, 0x3b9: 0x810e, 0x3ba: 0x810e, 0x3bb: 0x810f,
+	0x3bc: 0x8110, 0x3bd: 0x8111, 0x3bf: 0x8112,
+	// Block 0xf, offset 0x3c0
+	0x3c8: 0xa000, 0x3ca: 0xa000, 0x3cb: 0x8116,
+	0x3cc: 0x8117, 0x3cd: 0x8118, 0x3ce: 0x8119, 0x3cf: 0x811a, 0x3d0: 0x811b, 0x3d1: 0x811c,
+	0x3d2: 0x811d, 0x3d3: 0x9932, 0x3d4: 0x9932, 0x3d5: 0x992d, 0x3d6: 0x812d, 0x3d7: 0x8132,
+	0x3d8: 0x8132, 0x3d9: 0x8132, 0x3da: 0x8132, 0x3db: 0x8132, 0x3dc: 0x812d, 0x3dd: 0x8132,
+	0x3de: 0x8132, 0x3df: 0x812d,
+	0x3f0: 0x811e, 0x3f5: 0x1d84,
+	0x3f6: 0x2013, 0x3f7: 0x204f, 0x3f8: 0x204a,
+	// Block 0x10, offset 0x400
+	0x405: 0xa000,
+	0x406: 0x2d26, 0x407: 0xa000, 0x408: 0x2d2e, 0x409: 0xa000, 0x40a: 0x2d36, 0x40b: 0xa000,
+	0x40c: 0x2d3e, 0x40d: 0xa000, 0x40e: 0x2d46, 0x411: 0xa000,
+	0x412: 0x2d4e,
+	0x434: 0x8102, 0x435: 0x9900,
+	0x43a: 0xa000, 0x43b: 0x2d56,
+	0x43c: 0xa000, 0x43d: 0x2d5e, 0x43e: 0xa000, 0x43f: 0xa000,
+	// Block 0x11, offset 0x440
+	0x440: 0x0069, 0x441: 0x006b, 0x442: 0x006f, 0x443: 0x0083, 0x444: 0x00f5, 0x445: 0x00f8,
+	0x446: 0x0413, 0x447: 0x0085, 0x448: 0x0089, 0x449: 0x008b, 0x44a: 0x0104, 0x44b: 0x0107,
+	0x44c: 0x010a, 0x44d: 0x008f, 0x44f: 0x0097, 0x450: 0x009b, 0x451: 0x00e0,
+	0x452: 0x009f, 0x453: 0x00fe, 0x454: 0x0417, 0x455: 0x041b, 0x456: 0x00a1, 0x457: 0x00a9,
+	0x458: 0x00ab, 0x459: 0x0423, 0x45a: 0x012b, 0x45b: 0x00ad, 0x45c: 0x0427, 0x45d: 0x01be,
+	0x45e: 0x01c1, 0x45f: 0x01c4, 0x460: 0x01fa, 0x461: 0x01fd, 0x462: 0x0093, 0x463: 0x00a5,
+	0x464: 0x00ab, 0x465: 0x00ad, 0x466: 0x01be, 0x467: 0x01c1, 0x468: 0x01eb, 0x469: 0x01fa,
+	0x46a: 0x01fd,
+	0x478: 0x020c,
+	// Block 0x12, offset 0x480
+	0x49b: 0x00fb, 0x49c: 0x0087, 0x49d: 0x0101,
+	0x49e: 0x00d4, 0x49f: 0x010a, 0x4a0: 0x008d, 0x4a1: 0x010d, 0x4a2: 0x0110, 0x4a3: 0x0116,
+	0x4a4: 0x011c, 0x4a5: 0x011f, 0x4a6: 0x0122, 0x4a7: 0x042b, 0x4a8: 0x016a, 0x4a9: 0x0128,
+	0x4aa: 0x042f, 0x4ab: 0x016d, 0x4ac: 0x0131, 0x4ad: 0x012e, 0x4ae: 0x0134, 0x4af: 0x0137,
+	0x4b0: 0x013a, 0x4b1: 0x013d, 0x4b2: 0x0140, 0x4b3: 0x014c, 0x4b4: 0x014f, 0x4b5: 0x00ec,
+	0x4b6: 0x0152, 0x4b7: 0x0155, 0x4b8: 0x041f, 0x4b9: 0x0158, 0x4ba: 0x015b, 0x4bb: 0x00b5,
+	0x4bc: 0x015e, 0x4bd: 0x0161, 0x4be: 0x0164, 0x4bf: 0x01d0,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x2f97, 0x4c1: 0x32a3, 0x4c2: 0x2fa1, 0x4c3: 0x32ad, 0x4c4: 0x2fa6, 0x4c5: 0x32b2,
+	0x4c6: 0x2fab, 0x4c7: 0x32b7, 0x4c8: 0x38cc, 0x4c9: 0x3a5b, 0x4ca: 0x2fc4, 0x4cb: 0x32d0,
+	0x4cc: 0x2fce, 0x4cd: 0x32da, 0x4ce: 0x2fdd, 0x4cf: 0x32e9, 0x4d0: 0x2fd3, 0x4d1: 0x32df,
+	0x4d2: 0x2fd8, 0x4d3: 0x32e4, 0x4d4: 0x38ef, 0x4d5: 0x3a7e, 0x4d6: 0x38f6, 0x4d7: 0x3a85,
+	0x4d8: 0x3019, 0x4d9: 0x3325, 0x4da: 0x301e, 0x4db: 0x332a, 0x4dc: 0x3904, 0x4dd: 0x3a93,
+	0x4de: 0x3023, 0x4df: 0x332f, 0x4e0: 0x3032, 0x4e1: 0x333e, 0x4e2: 0x3050, 0x4e3: 0x335c,
+	0x4e4: 0x305f, 0x4e5: 0x336b, 0x4e6: 0x3055, 0x4e7: 0x3361, 0x4e8: 0x3064, 0x4e9: 0x3370,
+	0x4ea: 0x3069, 0x4eb: 0x3375, 0x4ec: 0x30af, 0x4ed: 0x33bb, 0x4ee: 0x390b, 0x4ef: 0x3a9a,
+	0x4f0: 0x30b9, 0x4f1: 0x33ca, 0x4f2: 0x30c3, 0x4f3: 0x33d4, 0x4f4: 0x30cd, 0x4f5: 0x33de,
+	0x4f6: 0x475a, 0x4f7: 0x47eb, 0x4f8: 0x3912, 0x4f9: 0x3aa1, 0x4fa: 0x30e6, 0x4fb: 0x33f7,
+	0x4fc: 0x30e1, 0x4fd: 0x33f2, 0x4fe: 0x30eb, 0x4ff: 0x33fc,
+	// Block 0x14, offset 0x500
+	0x500: 0x30f0, 0x501: 0x3401, 0x502: 0x30f5, 0x503: 0x3406, 0x504: 0x3109, 0x505: 0x341a,
+	0x506: 0x3113, 0x507: 0x3424, 0x508: 0x3122, 0x509: 0x3433, 0x50a: 0x311d, 0x50b: 0x342e,
+	0x50c: 0x3935, 0x50d: 0x3ac4, 0x50e: 0x3943, 0x50f: 0x3ad2, 0x510: 0x394a, 0x511: 0x3ad9,
+	0x512: 0x3951, 0x513: 0x3ae0, 0x514: 0x314f, 0x515: 0x3460, 0x516: 0x3154, 0x517: 0x3465,
+	0x518: 0x315e, 0x519: 0x346f, 0x51a: 0x4787, 0x51b: 0x4818, 0x51c: 0x3997, 0x51d: 0x3b26,
+	0x51e: 0x3177, 0x51f: 0x3488, 0x520: 0x3181, 0x521: 0x3492, 0x522: 0x4796, 0x523: 0x4827,
+	0x524: 0x399e, 0x525: 0x3b2d, 0x526: 0x39a5, 0x527: 0x3b34, 0x528: 0x39ac, 0x529: 0x3b3b,
+	0x52a: 0x3190, 0x52b: 0x34a1, 0x52c: 0x319a, 0x52d: 0x34b0, 0x52e: 0x31ae, 0x52f: 0x34c4,
+	0x530: 0x31a9, 0x531: 0x34bf, 0x532: 0x31ea, 0x533: 0x3500, 0x534: 0x31f9, 0x535: 0x350f,
+	0x536: 0x31f4, 0x537: 0x350a, 0x538: 0x39b3, 0x539: 0x3b42, 0x53a: 0x39ba, 0x53b: 0x3b49,
+	0x53c: 0x31fe, 0x53d: 0x3514, 0x53e: 0x3203, 0x53f: 0x3519,
+	// Block 0x15, offset 0x540
+	0x540: 0x3208, 0x541: 0x351e, 0x542: 0x320d, 0x543: 0x3523, 0x544: 0x321c, 0x545: 0x3532,
+	0x546: 0x3217, 0x547: 0x352d, 0x548: 0x3221, 0x549: 0x353c, 0x54a: 0x3226, 0x54b: 0x3541,
+	0x54c: 0x322b, 0x54d: 0x3546, 0x54e: 0x3249, 0x54f: 0x3564, 0x550: 0x3262, 0x551: 0x3582,
+	0x552: 0x3271, 0x553: 0x3591, 0x554: 0x3276, 0x555: 0x3596, 0x556: 0x337a, 0x557: 0x34a6,
+	0x558: 0x3537, 0x559: 0x3573, 0x55a: 0x1be0, 0x55b: 0x42d7,
+	0x560: 0x4737, 0x561: 0x47c8, 0x562: 0x2f83, 0x563: 0x328f,
+	0x564: 0x3878, 0x565: 0x3a07, 0x566: 0x3871, 0x567: 0x3a00, 0x568: 0x3886, 0x569: 0x3a15,
+	0x56a: 0x387f, 0x56b: 0x3a0e, 0x56c: 0x38be, 0x56d: 0x3a4d, 0x56e: 0x3894, 0x56f: 0x3a23,
+	0x570: 0x388d, 0x571: 0x3a1c, 0x572: 0x38a2, 0x573: 0x3a31, 0x574: 0x389b, 0x575: 0x3a2a,
+	0x576: 0x38c5, 0x577: 0x3a54, 0x578: 0x474b, 0x579: 0x47dc, 0x57a: 0x3000, 0x57b: 0x330c,
+	0x57c: 0x2fec, 0x57d: 0x32f8, 0x57e: 0x38da, 0x57f: 0x3a69,
+	// Block 0x16, offset 0x580
+	0x580: 0x38d3, 0x581: 0x3a62, 0x582: 0x38e8, 0x583: 0x3a77, 0x584: 0x38e1, 0x585: 0x3a70,
+	0x586: 0x38fd, 0x587: 0x3a8c, 0x588: 0x3091, 0x589: 0x339d, 0x58a: 0x30a5, 0x58b: 0x33b1,
+	0x58c: 0x477d, 0x58d: 0x480e, 0x58e: 0x3136, 0x58f: 0x3447, 0x590: 0x3920, 0x591: 0x3aaf,
+	0x592: 0x3919, 0x593: 0x3aa8, 0x594: 0x392e, 0x595: 0x3abd, 0x596: 0x3927, 0x597: 0x3ab6,
+	0x598: 0x3989, 0x599: 0x3b18, 0x59a: 0x396d, 0x59b: 0x3afc, 0x59c: 0x3966, 0x59d: 0x3af5,
+	0x59e: 0x397b, 0x59f: 0x3b0a, 0x5a0: 0x3974, 0x5a1: 0x3b03, 0x5a2: 0x3982, 0x5a3: 0x3b11,
+	0x5a4: 0x31e5, 0x5a5: 0x34fb, 0x5a6: 0x31c7, 0x5a7: 0x34dd, 0x5a8: 0x39e4, 0x5a9: 0x3b73,
+	0x5aa: 0x39dd, 0x5ab: 0x3b6c, 0x5ac: 0x39f2, 0x5ad: 0x3b81, 0x5ae: 0x39eb, 0x5af: 0x3b7a,
+	0x5b0: 0x39f9, 0x5b1: 0x3b88, 0x5b2: 0x3230, 0x5b3: 0x354b, 0x5b4: 0x3258, 0x5b5: 0x3578,
+	0x5b6: 0x3253, 0x5b7: 0x356e, 0x5b8: 0x323f, 0x5b9: 0x355a,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0x489a, 0x5c1: 0x48a0, 0x5c2: 0x49b4, 0x5c3: 0x49cc, 0x5c4: 0x49bc, 0x5c5: 0x49d4,
+	0x5c6: 0x49c4, 0x5c7: 0x49dc, 0x5c8: 0x4840, 0x5c9: 0x4846, 0x5ca: 0x4924, 0x5cb: 0x493c,
+	0x5cc: 0x492c, 0x5cd: 0x4944, 0x5ce: 0x4934, 0x5cf: 0x494c, 0x5d0: 0x48ac, 0x5d1: 0x48b2,
+	0x5d2: 0x3db8, 0x5d3: 0x3dc8, 0x5d4: 0x3dc0, 0x5d5: 0x3dd0,
+	0x5d8: 0x484c, 0x5d9: 0x4852, 0x5da: 0x3ce8, 0x5db: 0x3cf8, 0x5dc: 0x3cf0, 0x5dd: 0x3d00,
+	0x5e0: 0x48c4, 0x5e1: 0x48ca, 0x5e2: 0x49e4, 0x5e3: 0x49fc,
+	0x5e4: 0x49ec, 0x5e5: 0x4a04, 0x5e6: 0x49f4, 0x5e7: 0x4a0c, 0x5e8: 0x4858, 0x5e9: 0x485e,
+	0x5ea: 0x4954, 0x5eb: 0x496c, 0x5ec: 0x495c, 0x5ed: 0x4974, 0x5ee: 0x4964, 0x5ef: 0x497c,
+	0x5f0: 0x48dc, 0x5f1: 0x48e2, 0x5f2: 0x3e18, 0x5f3: 0x3e30, 0x5f4: 0x3e20, 0x5f5: 0x3e38,
+	0x5f6: 0x3e28, 0x5f7: 0x3e40, 0x5f8: 0x4864, 0x5f9: 0x486a, 0x5fa: 0x3d18, 0x5fb: 0x3d30,
+	0x5fc: 0x3d20, 0x5fd: 0x3d38, 0x5fe: 0x3d28, 0x5ff: 0x3d40,
+	// Block 0x18, offset 0x600
+	0x600: 0x48e8, 0x601: 0x48ee, 0x602: 0x3e48, 0x603: 0x3e58, 0x604: 0x3e50, 0x605: 0x3e60,
+	0x608: 0x4870, 0x609: 0x4876, 0x60a: 0x3d48, 0x60b: 0x3d58,
+	0x60c: 0x3d50, 0x60d: 0x3d60, 0x610: 0x48fa, 0x611: 0x4900,
+	0x612: 0x3e80, 0x613: 0x3e98, 0x614: 0x3e88, 0x615: 0x3ea0, 0x616: 0x3e90, 0x617: 0x3ea8,
+	0x619: 0x487c, 0x61b: 0x3d68, 0x61d: 0x3d70,
+	0x61f: 0x3d78, 0x620: 0x4912, 0x621: 0x4918, 0x622: 0x4a14, 0x623: 0x4a2c,
+	0x624: 0x4a1c, 0x625: 0x4a34, 0x626: 0x4a24, 0x627: 0x4a3c, 0x628: 0x4882, 0x629: 0x4888,
+	0x62a: 0x4984, 0x62b: 0x499c, 0x62c: 0x498c, 0x62d: 0x49a4, 0x62e: 0x4994, 0x62f: 0x49ac,
+	0x630: 0x488e, 0x631: 0x43b4, 0x632: 0x3691, 0x633: 0x43ba, 0x634: 0x48b8, 0x635: 0x43c0,
+	0x636: 0x36a3, 0x637: 0x43c6, 0x638: 0x36c1, 0x639: 0x43cc, 0x63a: 0x36d9, 0x63b: 0x43d2,
+	0x63c: 0x4906, 0x63d: 0x43d8,
+	// Block 0x19, offset 0x640
+	0x640: 0x3da0, 0x641: 0x3da8, 0x642: 0x4184, 0x643: 0x41a2, 0x644: 0x418e, 0x645: 0x41ac,
+	0x646: 0x4198, 0x647: 0x41b6, 0x648: 0x3cd8, 0x649: 0x3ce0, 0x64a: 0x40d0, 0x64b: 0x40ee,
+	0x64c: 0x40da, 0x64d: 0x40f8, 0x64e: 0x40e4, 0x64f: 0x4102, 0x650: 0x3de8, 0x651: 0x3df0,
+	0x652: 0x41c0, 0x653: 0x41de, 0x654: 0x41ca, 0x655: 0x41e8, 0x656: 0x41d4, 0x657: 0x41f2,
+	0x658: 0x3d08, 0x659: 0x3d10, 0x65a: 0x410c, 0x65b: 0x412a, 0x65c: 0x4116, 0x65d: 0x4134,
+	0x65e: 0x4120, 0x65f: 0x413e, 0x660: 0x3ec0, 0x661: 0x3ec8, 0x662: 0x41fc, 0x663: 0x421a,
+	0x664: 0x4206, 0x665: 0x4224, 0x666: 0x4210, 0x667: 0x422e, 0x668: 0x3d80, 0x669: 0x3d88,
+	0x66a: 0x4148, 0x66b: 0x4166, 0x66c: 0x4152, 0x66d: 0x4170, 0x66e: 0x415c, 0x66f: 0x417a,
+	0x670: 0x3685, 0x671: 0x367f, 0x672: 0x3d90, 0x673: 0x368b, 0x674: 0x3d98,
+	0x676: 0x48a6, 0x677: 0x3db0, 0x678: 0x35f5, 0x679: 0x35ef, 0x67a: 0x35e3, 0x67b: 0x4384,
+	0x67c: 0x35fb, 0x67d: 0x4287, 0x67e: 0x01d3, 0x67f: 0x4287,
+	// Block 0x1a, offset 0x680
+	0x680: 0x42a0, 0x681: 0x4518, 0x682: 0x3dd8, 0x683: 0x369d, 0x684: 0x3de0,
+	0x686: 0x48d0, 0x687: 0x3df8, 0x688: 0x3601, 0x689: 0x438a, 0x68a: 0x360d, 0x68b: 0x4390,
+	0x68c: 0x3619, 0x68d: 0x451f, 0x68e: 0x4526, 0x68f: 0x452d, 0x690: 0x36b5, 0x691: 0x36af,
+	0x692: 0x3e00, 0x693: 0x457a, 0x696: 0x36bb, 0x697: 0x3e10,
+	0x698: 0x3631, 0x699: 0x362b, 0x69a: 0x361f, 0x69b: 0x4396, 0x69d: 0x4534,
+	0x69e: 0x453b, 0x69f: 0x4542, 0x6a0: 0x36eb, 0x6a1: 0x36e5, 0x6a2: 0x3e68, 0x6a3: 0x4582,
+	0x6a4: 0x36cd, 0x6a5: 0x36d3, 0x6a6: 0x36f1, 0x6a7: 0x3e78, 0x6a8: 0x3661, 0x6a9: 0x365b,
+	0x6aa: 0x364f, 0x6ab: 0x43a2, 0x6ac: 0x3649, 0x6ad: 0x450a, 0x6ae: 0x4511, 0x6af: 0x0081,
+	0x6b2: 0x3eb0, 0x6b3: 0x36f7, 0x6b4: 0x3eb8,
+	0x6b6: 0x491e, 0x6b7: 0x3ed0, 0x6b8: 0x363d, 0x6b9: 0x439c, 0x6ba: 0x366d, 0x6bb: 0x43ae,
+	0x6bc: 0x3679, 0x6bd: 0x425a, 0x6be: 0x428c,
+	// Block 0x1b, offset 0x6c0
+	0x6c0: 0x1bd8, 0x6c1: 0x1bdc, 0x6c2: 0x0047, 0x6c3: 0x1c54, 0x6c5: 0x1be8,
+	0x6c6: 0x1bec, 0x6c7: 0x00e9, 0x6c9: 0x1c58, 0x6ca: 0x008f, 0x6cb: 0x0051,
+	0x6cc: 0x0051, 0x6cd: 0x0051, 0x6ce: 0x0091, 0x6cf: 0x00da, 0x6d0: 0x0053, 0x6d1: 0x0053,
+	0x6d2: 0x0059, 0x6d3: 0x0099, 0x6d5: 0x005d, 0x6d6: 0x198d,
+	0x6d9: 0x0061, 0x6da: 0x0063, 0x6db: 0x0065, 0x6dc: 0x0065, 0x6dd: 0x0065,
+	0x6e0: 0x199f, 0x6e1: 0x1bc8, 0x6e2: 0x19a8,
+	0x6e4: 0x0075, 0x6e6: 0x01b8, 0x6e8: 0x0075,
+	0x6ea: 0x0057, 0x6eb: 0x42d2, 0x6ec: 0x0045, 0x6ed: 0x0047, 0x6ef: 0x008b,
+	0x6f0: 0x004b, 0x6f1: 0x004d, 0x6f3: 0x005b, 0x6f4: 0x009f, 0x6f5: 0x0215,
+	0x6f6: 0x0218, 0x6f7: 0x021b, 0x6f8: 0x021e, 0x6f9: 0x0093, 0x6fb: 0x1b98,
+	0x6fc: 0x01e8, 0x6fd: 0x01c1, 0x6fe: 0x0179, 0x6ff: 0x01a0,
+	// Block 0x1c, offset 0x700
+	0x700: 0x0463, 0x705: 0x0049,
+	0x706: 0x0089, 0x707: 0x008b, 0x708: 0x0093, 0x709: 0x0095,
+	0x710: 0x222e, 0x711: 0x223a,
+	0x712: 0x22ee, 0x713: 0x2216, 0x714: 0x229a, 0x715: 0x2222, 0x716: 0x22a0, 0x717: 0x22b8,
+	0x718: 0x22c4, 0x719: 0x2228, 0x71a: 0x22ca, 0x71b: 0x2234, 0x71c: 0x22be, 0x71d: 0x22d0,
+	0x71e: 0x22d6, 0x71f: 0x1cbc, 0x720: 0x0053, 0x721: 0x195a, 0x722: 0x1ba4, 0x723: 0x1963,
+	0x724: 0x006d, 0x725: 0x19ab, 0x726: 0x1bd0, 0x727: 0x1d48, 0x728: 0x1966, 0x729: 0x0071,
+	0x72a: 0x19b7, 0x72b: 0x1bd4, 0x72c: 0x0059, 0x72d: 0x0047, 0x72e: 0x0049, 0x72f: 0x005b,
+	0x730: 0x0093, 0x731: 0x19e4, 0x732: 0x1c18, 0x733: 0x19ed, 0x734: 0x00ad, 0x735: 0x1a62,
+	0x736: 0x1c4c, 0x737: 0x1d5c, 0x738: 0x19f0, 0x739: 0x00b1, 0x73a: 0x1a65, 0x73b: 0x1c50,
+	0x73c: 0x0099, 0x73d: 0x0087, 0x73e: 0x0089, 0x73f: 0x009b,
+	// Block 0x1d, offset 0x740
+	0x741: 0x3c06, 0x743: 0xa000, 0x744: 0x3c0d, 0x745: 0xa000,
+	0x747: 0x3c14, 0x748: 0xa000, 0x749: 0x3c1b,
+	0x74d: 0xa000,
+	0x760: 0x2f65, 0x761: 0xa000, 0x762: 0x3c29,
+	0x764: 0xa000, 0x765: 0xa000,
+	0x76d: 0x3c22, 0x76e: 0x2f60, 0x76f: 0x2f6a,
+	0x770: 0x3c30, 0x771: 0x3c37, 0x772: 0xa000, 0x773: 0xa000, 0x774: 0x3c3e, 0x775: 0x3c45,
+	0x776: 0xa000, 0x777: 0xa000, 0x778: 0x3c4c, 0x779: 0x3c53, 0x77a: 0xa000, 0x77b: 0xa000,
+	0x77c: 0xa000, 0x77d: 0xa000,
+	// Block 0x1e, offset 0x780
+	0x780: 0x3c5a, 0x781: 0x3c61, 0x782: 0xa000, 0x783: 0xa000, 0x784: 0x3c76, 0x785: 0x3c7d,
+	0x786: 0xa000, 0x787: 0xa000, 0x788: 0x3c84, 0x789: 0x3c8b,
+	0x791: 0xa000,
+	0x792: 0xa000,
+	0x7a2: 0xa000,
+	0x7a8: 0xa000, 0x7a9: 0xa000,
+	0x7ab: 0xa000, 0x7ac: 0x3ca0, 0x7ad: 0x3ca7, 0x7ae: 0x3cae, 0x7af: 0x3cb5,
+	0x7b2: 0xa000, 0x7b3: 0xa000, 0x7b4: 0xa000, 0x7b5: 0xa000,
+	// Block 0x1f, offset 0x7c0
+	0x7e0: 0x0023, 0x7e1: 0x0025, 0x7e2: 0x0027, 0x7e3: 0x0029,
+	0x7e4: 0x002b, 0x7e5: 0x002d, 0x7e6: 0x002f, 0x7e7: 0x0031, 0x7e8: 0x0033, 0x7e9: 0x1882,
+	0x7ea: 0x1885, 0x7eb: 0x1888, 0x7ec: 0x188b, 0x7ed: 0x188e, 0x7ee: 0x1891, 0x7ef: 0x1894,
+	0x7f0: 0x1897, 0x7f1: 0x189a, 0x7f2: 0x189d, 0x7f3: 0x18a6, 0x7f4: 0x1a68, 0x7f5: 0x1a6c,
+	0x7f6: 0x1a70, 0x7f7: 0x1a74, 0x7f8: 0x1a78, 0x7f9: 0x1a7c, 0x7fa: 0x1a80, 0x7fb: 0x1a84,
+	0x7fc: 0x1a88, 0x7fd: 0x1c80, 0x7fe: 0x1c85, 0x7ff: 0x1c8a,
+	// Block 0x20, offset 0x800
+	0x800: 0x1c8f, 0x801: 0x1c94, 0x802: 0x1c99, 0x803: 0x1c9e, 0x804: 0x1ca3, 0x805: 0x1ca8,
+	0x806: 0x1cad, 0x807: 0x1cb2, 0x808: 0x187f, 0x809: 0x18a3, 0x80a: 0x18c7, 0x80b: 0x18eb,
+	0x80c: 0x190f, 0x80d: 0x1918, 0x80e: 0x191e, 0x80f: 0x1924, 0x810: 0x192a, 0x811: 0x1b60,
+	0x812: 0x1b64, 0x813: 0x1b68, 0x814: 0x1b6c, 0x815: 0x1b70, 0x816: 0x1b74, 0x817: 0x1b78,
+	0x818: 0x1b7c, 0x819: 0x1b80, 0x81a: 0x1b84, 0x81b: 0x1b88, 0x81c: 0x1af4, 0x81d: 0x1af8,
+	0x81e: 0x1afc, 0x81f: 0x1b00, 0x820: 0x1b04, 0x821: 0x1b08, 0x822: 0x1b0c, 0x823: 0x1b10,
+	0x824: 0x1b14, 0x825: 0x1b18, 0x826: 0x1b1c, 0x827: 0x1b20, 0x828: 0x1b24, 0x829: 0x1b28,
+	0x82a: 0x1b2c, 0x82b: 0x1b30, 0x82c: 0x1b34, 0x82d: 0x1b38, 0x82e: 0x1b3c, 0x82f: 0x1b40,
+	0x830: 0x1b44, 0x831: 0x1b48, 0x832: 0x1b4c, 0x833: 0x1b50, 0x834: 0x1b54, 0x835: 0x1b58,
+	0x836: 0x0043, 0x837: 0x0045, 0x838: 0x0047, 0x839: 0x0049, 0x83a: 0x004b, 0x83b: 0x004d,
+	0x83c: 0x004f, 0x83d: 0x0051, 0x83e: 0x0053, 0x83f: 0x0055,
+	// Block 0x21, offset 0x840
+	0x840: 0x06bf, 0x841: 0x06e3, 0x842: 0x06ef, 0x843: 0x06ff, 0x844: 0x0707, 0x845: 0x0713,
+	0x846: 0x071b, 0x847: 0x0723, 0x848: 0x072f, 0x849: 0x0783, 0x84a: 0x079b, 0x84b: 0x07ab,
+	0x84c: 0x07bb, 0x84d: 0x07cb, 0x84e: 0x07db, 0x84f: 0x07fb, 0x850: 0x07ff, 0x851: 0x0803,
+	0x852: 0x0837, 0x853: 0x085f, 0x854: 0x086f, 0x855: 0x0877, 0x856: 0x087b, 0x857: 0x0887,
+	0x858: 0x08a3, 0x859: 0x08a7, 0x85a: 0x08bf, 0x85b: 0x08c3, 0x85c: 0x08cb, 0x85d: 0x08db,
+	0x85e: 0x0977, 0x85f: 0x098b, 0x860: 0x09cb, 0x861: 0x09df, 0x862: 0x09e7, 0x863: 0x09eb,
+	0x864: 0x09fb, 0x865: 0x0a17, 0x866: 0x0a43, 0x867: 0x0a4f, 0x868: 0x0a6f, 0x869: 0x0a7b,
+	0x86a: 0x0a7f, 0x86b: 0x0a83, 0x86c: 0x0a9b, 0x86d: 0x0a9f, 0x86e: 0x0acb, 0x86f: 0x0ad7,
+	0x870: 0x0adf, 0x871: 0x0ae7, 0x872: 0x0af7, 0x873: 0x0aff, 0x874: 0x0b07, 0x875: 0x0b33,
+	0x876: 0x0b37, 0x877: 0x0b3f, 0x878: 0x0b43, 0x879: 0x0b4b, 0x87a: 0x0b53, 0x87b: 0x0b63,
+	0x87c: 0x0b7f, 0x87d: 0x0bf7, 0x87e: 0x0c0b, 0x87f: 0x0c0f,
+	// Block 0x22, offset 0x880
+	0x880: 0x0c8f, 0x881: 0x0c93, 0x882: 0x0ca7, 0x883: 0x0cab, 0x884: 0x0cb3, 0x885: 0x0cbb,
+	0x886: 0x0cc3, 0x887: 0x0ccf, 0x888: 0x0cf7, 0x889: 0x0d07, 0x88a: 0x0d1b, 0x88b: 0x0d8b,
+	0x88c: 0x0d97, 0x88d: 0x0da7, 0x88e: 0x0db3, 0x88f: 0x0dbf, 0x890: 0x0dc7, 0x891: 0x0dcb,
+	0x892: 0x0dcf, 0x893: 0x0dd3, 0x894: 0x0dd7, 0x895: 0x0e8f, 0x896: 0x0ed7, 0x897: 0x0ee3,
+	0x898: 0x0ee7, 0x899: 0x0eeb, 0x89a: 0x0eef, 0x89b: 0x0ef7, 0x89c: 0x0efb, 0x89d: 0x0f0f,
+	0x89e: 0x0f2b, 0x89f: 0x0f33, 0x8a0: 0x0f73, 0x8a1: 0x0f77, 0x8a2: 0x0f7f, 0x8a3: 0x0f83,
+	0x8a4: 0x0f8b, 0x8a5: 0x0f8f, 0x8a6: 0x0fb3, 0x8a7: 0x0fb7, 0x8a8: 0x0fd3, 0x8a9: 0x0fd7,
+	0x8aa: 0x0fdb, 0x8ab: 0x0fdf, 0x8ac: 0x0ff3, 0x8ad: 0x1017, 0x8ae: 0x101b, 0x8af: 0x101f,
+	0x8b0: 0x1043, 0x8b1: 0x1083, 0x8b2: 0x1087, 0x8b3: 0x10a7, 0x8b4: 0x10b7, 0x8b5: 0x10bf,
+	0x8b6: 0x10df, 0x8b7: 0x1103, 0x8b8: 0x1147, 0x8b9: 0x114f, 0x8ba: 0x1163, 0x8bb: 0x116f,
+	0x8bc: 0x1177, 0x8bd: 0x117f, 0x8be: 0x1183, 0x8bf: 0x1187,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x119f, 0x8c1: 0x11a3, 0x8c2: 0x11bf, 0x8c3: 0x11c7, 0x8c4: 0x11cf, 0x8c5: 0x11d3,
+	0x8c6: 0x11df, 0x8c7: 0x11e7, 0x8c8: 0x11eb, 0x8c9: 0x11ef, 0x8ca: 0x11f7, 0x8cb: 0x11fb,
+	0x8cc: 0x129b, 0x8cd: 0x12af, 0x8ce: 0x12e3, 0x8cf: 0x12e7, 0x8d0: 0x12ef, 0x8d1: 0x131b,
+	0x8d2: 0x1323, 0x8d3: 0x132b, 0x8d4: 0x1333, 0x8d5: 0x136f, 0x8d6: 0x1373, 0x8d7: 0x137b,
+	0x8d8: 0x137f, 0x8d9: 0x1383, 0x8da: 0x13af, 0x8db: 0x13b3, 0x8dc: 0x13bb, 0x8dd: 0x13cf,
+	0x8de: 0x13d3, 0x8df: 0x13ef, 0x8e0: 0x13f7, 0x8e1: 0x13fb, 0x8e2: 0x141f, 0x8e3: 0x143f,
+	0x8e4: 0x1453, 0x8e5: 0x1457, 0x8e6: 0x145f, 0x8e7: 0x148b, 0x8e8: 0x148f, 0x8e9: 0x149f,
+	0x8ea: 0x14c3, 0x8eb: 0x14cf, 0x8ec: 0x14df, 0x8ed: 0x14f7, 0x8ee: 0x14ff, 0x8ef: 0x1503,
+	0x8f0: 0x1507, 0x8f1: 0x150b, 0x8f2: 0x1517, 0x8f3: 0x151b, 0x8f4: 0x1523, 0x8f5: 0x153f,
+	0x8f6: 0x1543, 0x8f7: 0x1547, 0x8f8: 0x155f, 0x8f9: 0x1563, 0x8fa: 0x156b, 0x8fb: 0x157f,
+	0x8fc: 0x1583, 0x8fd: 0x1587, 0x8fe: 0x158f, 0x8ff: 0x1593,
+	// Block 0x24, offset 0x900
+	0x906: 0xa000, 0x90b: 0xa000,
+	0x90c: 0x3f08, 0x90d: 0xa000, 0x90e: 0x3f10, 0x90f: 0xa000, 0x910: 0x3f18, 0x911: 0xa000,
+	0x912: 0x3f20, 0x913: 0xa000, 0x914: 0x3f28, 0x915: 0xa000, 0x916: 0x3f30, 0x917: 0xa000,
+	0x918: 0x3f38, 0x919: 0xa000, 0x91a: 0x3f40, 0x91b: 0xa000, 0x91c: 0x3f48, 0x91d: 0xa000,
+	0x91e: 0x3f50, 0x91f: 0xa000, 0x920: 0x3f58, 0x921: 0xa000, 0x922: 0x3f60,
+	0x924: 0xa000, 0x925: 0x3f68, 0x926: 0xa000, 0x927: 0x3f70, 0x928: 0xa000, 0x929: 0x3f78,
+	0x92f: 0xa000,
+	0x930: 0x3f80, 0x931: 0x3f88, 0x932: 0xa000, 0x933: 0x3f90, 0x934: 0x3f98, 0x935: 0xa000,
+	0x936: 0x3fa0, 0x937: 0x3fa8, 0x938: 0xa000, 0x939: 0x3fb0, 0x93a: 0x3fb8, 0x93b: 0xa000,
+	0x93c: 0x3fc0, 0x93d: 0x3fc8,
+	// Block 0x25, offset 0x940
+	0x954: 0x3f00,
+	0x959: 0x9903, 0x95a: 0x9903, 0x95b: 0x4372, 0x95c: 0x4378, 0x95d: 0xa000,
+	0x95e: 0x3fd0, 0x95f: 0x26b4,
+	0x966: 0xa000,
+	0x96b: 0xa000, 0x96c: 0x3fe0, 0x96d: 0xa000, 0x96e: 0x3fe8, 0x96f: 0xa000,
+	0x970: 0x3ff0, 0x971: 0xa000, 0x972: 0x3ff8, 0x973: 0xa000, 0x974: 0x4000, 0x975: 0xa000,
+	0x976: 0x4008, 0x977: 0xa000, 0x978: 0x4010, 0x979: 0xa000, 0x97a: 0x4018, 0x97b: 0xa000,
+	0x97c: 0x4020, 0x97d: 0xa000, 0x97e: 0x4028, 0x97f: 0xa000,
+	// Block 0x26, offset 0x980
+	0x980: 0x4030, 0x981: 0xa000, 0x982: 0x4038, 0x984: 0xa000, 0x985: 0x4040,
+	0x986: 0xa000, 0x987: 0x4048, 0x988: 0xa000, 0x989: 0x4050,
+	0x98f: 0xa000, 0x990: 0x4058, 0x991: 0x4060,
+	0x992: 0xa000, 0x993: 0x4068, 0x994: 0x4070, 0x995: 0xa000, 0x996: 0x4078, 0x997: 0x4080,
+	0x998: 0xa000, 0x999: 0x4088, 0x99a: 0x4090, 0x99b: 0xa000, 0x99c: 0x4098, 0x99d: 0x40a0,
+	0x9af: 0xa000,
+	0x9b0: 0xa000, 0x9b1: 0xa000, 0x9b2: 0xa000, 0x9b4: 0x3fd8,
+	0x9b7: 0x40a8, 0x9b8: 0x40b0, 0x9b9: 0x40b8, 0x9ba: 0x40c0,
+	0x9bd: 0xa000, 0x9be: 0x40c8, 0x9bf: 0x26c9,
+	// Block 0x27, offset 0x9c0
+	0x9c0: 0x0367, 0x9c1: 0x032b, 0x9c2: 0x032f, 0x9c3: 0x0333, 0x9c4: 0x037b, 0x9c5: 0x0337,
+	0x9c6: 0x033b, 0x9c7: 0x033f, 0x9c8: 0x0343, 0x9c9: 0x0347, 0x9ca: 0x034b, 0x9cb: 0x034f,
+	0x9cc: 0x0353, 0x9cd: 0x0357, 0x9ce: 0x035b, 0x9cf: 0x42dc, 0x9d0: 0x42e1, 0x9d1: 0x42e6,
+	0x9d2: 0x42eb, 0x9d3: 0x42f0, 0x9d4: 0x42f5, 0x9d5: 0x42fa, 0x9d6: 0x42ff, 0x9d7: 0x4304,
+	0x9d8: 0x4309, 0x9d9: 0x430e, 0x9da: 0x4313, 0x9db: 0x4318, 0x9dc: 0x431d, 0x9dd: 0x4322,
+	0x9de: 0x4327, 0x9df: 0x432c, 0x9e0: 0x4331, 0x9e1: 0x4336, 0x9e2: 0x433b, 0x9e3: 0x4340,
+	0x9e4: 0x03c3, 0x9e5: 0x035f, 0x9e6: 0x0363, 0x9e7: 0x03e7, 0x9e8: 0x03eb, 0x9e9: 0x03ef,
+	0x9ea: 0x03f3, 0x9eb: 0x03f7, 0x9ec: 0x03fb, 0x9ed: 0x03ff, 0x9ee: 0x036b, 0x9ef: 0x0403,
+	0x9f0: 0x0407, 0x9f1: 0x036f, 0x9f2: 0x0373, 0x9f3: 0x0377, 0x9f4: 0x037f, 0x9f5: 0x0383,
+	0x9f6: 0x0387, 0x9f7: 0x038b, 0x9f8: 0x038f, 0x9f9: 0x0393, 0x9fa: 0x0397, 0x9fb: 0x039b,
+	0x9fc: 0x039f, 0x9fd: 0x03a3, 0x9fe: 0x03a7, 0x9ff: 0x03ab,
+	// Block 0x28, offset 0xa00
+	0xa00: 0x03af, 0xa01: 0x03b3, 0xa02: 0x040b, 0xa03: 0x040f, 0xa04: 0x03b7, 0xa05: 0x03bb,
+	0xa06: 0x03bf, 0xa07: 0x03c7, 0xa08: 0x03cb, 0xa09: 0x03cf, 0xa0a: 0x03d3, 0xa0b: 0x03d7,
+	0xa0c: 0x03db, 0xa0d: 0x03df, 0xa0e: 0x03e3,
+	0xa12: 0x06bf, 0xa13: 0x071b, 0xa14: 0x06cb, 0xa15: 0x097b, 0xa16: 0x06cf, 0xa17: 0x06e7,
+	0xa18: 0x06d3, 0xa19: 0x0f93, 0xa1a: 0x0707, 0xa1b: 0x06db, 0xa1c: 0x06c3, 0xa1d: 0x09ff,
+	0xa1e: 0x098f, 0xa1f: 0x072f,
+	// Block 0x29, offset 0xa40
+	0xa40: 0x2054, 0xa41: 0x205a, 0xa42: 0x2060, 0xa43: 0x2066, 0xa44: 0x206c, 0xa45: 0x2072,
+	0xa46: 0x2078, 0xa47: 0x207e, 0xa48: 0x2084, 0xa49: 0x208a, 0xa4a: 0x2090, 0xa4b: 0x2096,
+	0xa4c: 0x209c, 0xa4d: 0x20a2, 0xa4e: 0x2726, 0xa4f: 0x272f, 0xa50: 0x2738, 0xa51: 0x2741,
+	0xa52: 0x274a, 0xa53: 0x2753, 0xa54: 0x275c, 0xa55: 0x2765, 0xa56: 0x276e, 0xa57: 0x2780,
+	0xa58: 0x2789, 0xa59: 0x2792, 0xa5a: 0x279b, 0xa5b: 0x27a4, 0xa5c: 0x2777, 0xa5d: 0x2bac,
+	0xa5e: 0x2aed, 0xa60: 0x20a8, 0xa61: 0x20c0, 0xa62: 0x20b4, 0xa63: 0x2108,
+	0xa64: 0x20c6, 0xa65: 0x20e4, 0xa66: 0x20ae, 0xa67: 0x20de, 0xa68: 0x20ba, 0xa69: 0x20f0,
+	0xa6a: 0x2120, 0xa6b: 0x213e, 0xa6c: 0x2138, 0xa6d: 0x212c, 0xa6e: 0x217a, 0xa6f: 0x210e,
+	0xa70: 0x211a, 0xa71: 0x2132, 0xa72: 0x2126, 0xa73: 0x2150, 0xa74: 0x20fc, 0xa75: 0x2144,
+	0xa76: 0x216e, 0xa77: 0x2156, 0xa78: 0x20ea, 0xa79: 0x20cc, 0xa7a: 0x2102, 0xa7b: 0x2114,
+	0xa7c: 0x214a, 0xa7d: 0x20d2, 0xa7e: 0x2174, 0xa7f: 0x20f6,
+	// Block 0x2a, offset 0xa80
+	0xa80: 0x215c, 0xa81: 0x20d8, 0xa82: 0x2162, 0xa83: 0x2168, 0xa84: 0x092f, 0xa85: 0x0b03,
+	0xa86: 0x0ca7, 0xa87: 0x10c7,
+	0xa90: 0x1bc4, 0xa91: 0x18a9,
+	0xa92: 0x18ac, 0xa93: 0x18af, 0xa94: 0x18b2, 0xa95: 0x18b5, 0xa96: 0x18b8, 0xa97: 0x18bb,
+	0xa98: 0x18be, 0xa99: 0x18c1, 0xa9a: 0x18ca, 0xa9b: 0x18cd, 0xa9c: 0x18d0, 0xa9d: 0x18d3,
+	0xa9e: 0x18d6, 0xa9f: 0x18d9, 0xaa0: 0x0313, 0xaa1: 0x031b, 0xaa2: 0x031f, 0xaa3: 0x0327,
+	0xaa4: 0x032b, 0xaa5: 0x032f, 0xaa6: 0x0337, 0xaa7: 0x033f, 0xaa8: 0x0343, 0xaa9: 0x034b,
+	0xaaa: 0x034f, 0xaab: 0x0353, 0xaac: 0x0357, 0xaad: 0x035b, 0xaae: 0x2e18, 0xaaf: 0x2e20,
+	0xab0: 0x2e28, 0xab1: 0x2e30, 0xab2: 0x2e38, 0xab3: 0x2e40, 0xab4: 0x2e48, 0xab5: 0x2e50,
+	0xab6: 0x2e60, 0xab7: 0x2e68, 0xab8: 0x2e70, 0xab9: 0x2e78, 0xaba: 0x2e80, 0xabb: 0x2e88,
+	0xabc: 0x2ed3, 0xabd: 0x2e9b, 0xabe: 0x2e58,
+	// Block 0x2b, offset 0xac0
+	0xac0: 0x06bf, 0xac1: 0x071b, 0xac2: 0x06cb, 0xac3: 0x097b, 0xac4: 0x071f, 0xac5: 0x07af,
+	0xac6: 0x06c7, 0xac7: 0x07ab, 0xac8: 0x070b, 0xac9: 0x0887, 0xaca: 0x0d07, 0xacb: 0x0e8f,
+	0xacc: 0x0dd7, 0xacd: 0x0d1b, 0xace: 0x145f, 0xacf: 0x098b, 0xad0: 0x0ccf, 0xad1: 0x0d4b,
+	0xad2: 0x0d0b, 0xad3: 0x104b, 0xad4: 0x08fb, 0xad5: 0x0f03, 0xad6: 0x1387, 0xad7: 0x105f,
+	0xad8: 0x0843, 0xad9: 0x108f, 0xada: 0x0f9b, 0xadb: 0x0a17, 0xadc: 0x140f, 0xadd: 0x077f,
+	0xade: 0x08ab, 0xadf: 0x0df7, 0xae0: 0x1527, 0xae1: 0x0743, 0xae2: 0x07d3, 0xae3: 0x0d9b,
+	0xae4: 0x06cf, 0xae5: 0x06e7, 0xae6: 0x06d3, 0xae7: 0x0adb, 0xae8: 0x08ef, 0xae9: 0x087f,
+	0xaea: 0x0a57, 0xaeb: 0x0a4b, 0xaec: 0x0feb, 0xaed: 0x073f, 0xaee: 0x139b, 0xaef: 0x089b,
+	0xaf0: 0x09f3, 0xaf1: 0x18dc, 0xaf2: 0x18df, 0xaf3: 0x18e2, 0xaf4: 0x18e5, 0xaf5: 0x18ee,
+	0xaf6: 0x18f1, 0xaf7: 0x18f4, 0xaf8: 0x18f7, 0xaf9: 0x18fa, 0xafa: 0x18fd, 0xafb: 0x1900,
+	0xafc: 0x1903, 0xafd: 0x1906, 0xafe: 0x1909, 0xaff: 0x1912,
+	// Block 0x2c, offset 0xb00
+	0xb00: 0x1cc6, 0xb01: 0x1cd5, 0xb02: 0x1ce4, 0xb03: 0x1cf3, 0xb04: 0x1d02, 0xb05: 0x1d11,
+	0xb06: 0x1d20, 0xb07: 0x1d2f, 0xb08: 0x1d3e, 0xb09: 0x218c, 0xb0a: 0x219e, 0xb0b: 0x21b0,
+	0xb0c: 0x1954, 0xb0d: 0x1c04, 0xb0e: 0x19d2, 0xb0f: 0x1ba8, 0xb10: 0x04cb, 0xb11: 0x04d3,
+	0xb12: 0x04db, 0xb13: 0x04e3, 0xb14: 0x04eb, 0xb15: 0x04ef, 0xb16: 0x04f3, 0xb17: 0x04f7,
+	0xb18: 0x04fb, 0xb19: 0x04ff, 0xb1a: 0x0503, 0xb1b: 0x0507, 0xb1c: 0x050b, 0xb1d: 0x050f,
+	0xb1e: 0x0513, 0xb1f: 0x0517, 0xb20: 0x051b, 0xb21: 0x0523, 0xb22: 0x0527, 0xb23: 0x052b,
+	0xb24: 0x052f, 0xb25: 0x0533, 0xb26: 0x0537, 0xb27: 0x053b, 0xb28: 0x053f, 0xb29: 0x0543,
+	0xb2a: 0x0547, 0xb2b: 0x054b, 0xb2c: 0x054f, 0xb2d: 0x0553, 0xb2e: 0x0557, 0xb2f: 0x055b,
+	0xb30: 0x055f, 0xb31: 0x0563, 0xb32: 0x0567, 0xb33: 0x056f, 0xb34: 0x0577, 0xb35: 0x057f,
+	0xb36: 0x0583, 0xb37: 0x0587, 0xb38: 0x058b, 0xb39: 0x058f, 0xb3a: 0x0593, 0xb3b: 0x0597,
+	0xb3c: 0x059b, 0xb3d: 0x059f, 0xb3e: 0x05a3,
+	// Block 0x2d, offset 0xb40
+	0xb40: 0x2b0c, 0xb41: 0x29a8, 0xb42: 0x2b1c, 0xb43: 0x2880, 0xb44: 0x2ee4, 0xb45: 0x288a,
+	0xb46: 0x2894, 0xb47: 0x2f28, 0xb48: 0x29b5, 0xb49: 0x289e, 0xb4a: 0x28a8, 0xb4b: 0x28b2,
+	0xb4c: 0x29dc, 0xb4d: 0x29e9, 0xb4e: 0x29c2, 0xb4f: 0x29cf, 0xb50: 0x2ea9, 0xb51: 0x29f6,
+	0xb52: 0x2a03, 0xb53: 0x2bbe, 0xb54: 0x26bb, 0xb55: 0x2bd1, 0xb56: 0x2be4, 0xb57: 0x2b2c,
+	0xb58: 0x2a10, 0xb59: 0x2bf7, 0xb5a: 0x2c0a, 0xb5b: 0x2a1d, 0xb5c: 0x28bc, 0xb5d: 0x28c6,
+	0xb5e: 0x2eb7, 0xb5f: 0x2a2a, 0xb60: 0x2b3c, 0xb61: 0x2ef5, 0xb62: 0x28d0, 0xb63: 0x28da,
+	0xb64: 0x2a37, 0xb65: 0x28e4, 0xb66: 0x28ee, 0xb67: 0x26d0, 0xb68: 0x26d7, 0xb69: 0x28f8,
+	0xb6a: 0x2902, 0xb6b: 0x2c1d, 0xb6c: 0x2a44, 0xb6d: 0x2b4c, 0xb6e: 0x2c30, 0xb6f: 0x2a51,
+	0xb70: 0x2916, 0xb71: 0x290c, 0xb72: 0x2f3c, 0xb73: 0x2a5e, 0xb74: 0x2c43, 0xb75: 0x2920,
+	0xb76: 0x2b5c, 0xb77: 0x292a, 0xb78: 0x2a78, 0xb79: 0x2934, 0xb7a: 0x2a85, 0xb7b: 0x2f06,
+	0xb7c: 0x2a6b, 0xb7d: 0x2b6c, 0xb7e: 0x2a92, 0xb7f: 0x26de,
+	// Block 0x2e, offset 0xb80
+	0xb80: 0x2f17, 0xb81: 0x293e, 0xb82: 0x2948, 0xb83: 0x2a9f, 0xb84: 0x2952, 0xb85: 0x295c,
+	0xb86: 0x2966, 0xb87: 0x2b7c, 0xb88: 0x2aac, 0xb89: 0x26e5, 0xb8a: 0x2c56, 0xb8b: 0x2e90,
+	0xb8c: 0x2b8c, 0xb8d: 0x2ab9, 0xb8e: 0x2ec5, 0xb8f: 0x2970, 0xb90: 0x297a, 0xb91: 0x2ac6,
+	0xb92: 0x26ec, 0xb93: 0x2ad3, 0xb94: 0x2b9c, 0xb95: 0x26f3, 0xb96: 0x2c69, 0xb97: 0x2984,
+	0xb98: 0x1cb7, 0xb99: 0x1ccb, 0xb9a: 0x1cda, 0xb9b: 0x1ce9, 0xb9c: 0x1cf8, 0xb9d: 0x1d07,
+	0xb9e: 0x1d16, 0xb9f: 0x1d25, 0xba0: 0x1d34, 0xba1: 0x1d43, 0xba2: 0x2192, 0xba3: 0x21a4,
+	0xba4: 0x21b6, 0xba5: 0x21c2, 0xba6: 0x21ce, 0xba7: 0x21da, 0xba8: 0x21e6, 0xba9: 0x21f2,
+	0xbaa: 0x21fe, 0xbab: 0x220a, 0xbac: 0x2246, 0xbad: 0x2252, 0xbae: 0x225e, 0xbaf: 0x226a,
+	0xbb0: 0x2276, 0xbb1: 0x1c14, 0xbb2: 0x19c6, 0xbb3: 0x1936, 0xbb4: 0x1be4, 0xbb5: 0x1a47,
+	0xbb6: 0x1a56, 0xbb7: 0x19cc, 0xbb8: 0x1bfc, 0xbb9: 0x1c00, 0xbba: 0x1960, 0xbbb: 0x2701,
+	0xbbc: 0x270f, 0xbbd: 0x26fa, 0xbbe: 0x2708, 0xbbf: 0x2ae0,
+	// Block 0x2f, offset 0xbc0
+	0xbc0: 0x1a4a, 0xbc1: 0x1a32, 0xbc2: 0x1c60, 0xbc3: 0x1a1a, 0xbc4: 0x19f3, 0xbc5: 0x1969,
+	0xbc6: 0x1978, 0xbc7: 0x1948, 0xbc8: 0x1bf0, 0xbc9: 0x1d52, 0xbca: 0x1a4d, 0xbcb: 0x1a35,
+	0xbcc: 0x1c64, 0xbcd: 0x1c70, 0xbce: 0x1a26, 0xbcf: 0x19fc, 0xbd0: 0x1957, 0xbd1: 0x1c1c,
+	0xbd2: 0x1bb0, 0xbd3: 0x1b9c, 0xbd4: 0x1bcc, 0xbd5: 0x1c74, 0xbd6: 0x1a29, 0xbd7: 0x19c9,
+	0xbd8: 0x19ff, 0xbd9: 0x19de, 0xbda: 0x1a41, 0xbdb: 0x1c78, 0xbdc: 0x1a2c, 0xbdd: 0x19c0,
+	0xbde: 0x1a02, 0xbdf: 0x1c3c, 0xbe0: 0x1bf4, 0xbe1: 0x1a14, 0xbe2: 0x1c24, 0xbe3: 0x1c40,
+	0xbe4: 0x1bf8, 0xbe5: 0x1a17, 0xbe6: 0x1c28, 0xbe7: 0x22e8, 0xbe8: 0x22fc, 0xbe9: 0x1996,
+	0xbea: 0x1c20, 0xbeb: 0x1bb4, 0xbec: 0x1ba0, 0xbed: 0x1c48, 0xbee: 0x2716, 0xbef: 0x27ad,
+	0xbf0: 0x1a59, 0xbf1: 0x1a44, 0xbf2: 0x1c7c, 0xbf3: 0x1a2f, 0xbf4: 0x1a50, 0xbf5: 0x1a38,
+	0xbf6: 0x1c68, 0xbf7: 0x1a1d, 0xbf8: 0x19f6, 0xbf9: 0x1981, 0xbfa: 0x1a53, 0xbfb: 0x1a3b,
+	0xbfc: 0x1c6c, 0xbfd: 0x1a20, 0xbfe: 0x19f9, 0xbff: 0x1984,
+	// Block 0x30, offset 0xc00
+	0xc00: 0x1c2c, 0xc01: 0x1bb8, 0xc02: 0x1d4d, 0xc03: 0x1939, 0xc04: 0x19ba, 0xc05: 0x19bd,
+	0xc06: 0x22f5, 0xc07: 0x1b94, 0xc08: 0x19c3, 0xc09: 0x194b, 0xc0a: 0x19e1, 0xc0b: 0x194e,
+	0xc0c: 0x19ea, 0xc0d: 0x196c, 0xc0e: 0x196f, 0xc0f: 0x1a05, 0xc10: 0x1a0b, 0xc11: 0x1a0e,
+	0xc12: 0x1c30, 0xc13: 0x1a11, 0xc14: 0x1a23, 0xc15: 0x1c38, 0xc16: 0x1c44, 0xc17: 0x1990,
+	0xc18: 0x1d57, 0xc19: 0x1bbc, 0xc1a: 0x1993, 0xc1b: 0x1a5c, 0xc1c: 0x19a5, 0xc1d: 0x19b4,
+	0xc1e: 0x22e2, 0xc1f: 0x22dc, 0xc20: 0x1cc1, 0xc21: 0x1cd0, 0xc22: 0x1cdf, 0xc23: 0x1cee,
+	0xc24: 0x1cfd, 0xc25: 0x1d0c, 0xc26: 0x1d1b, 0xc27: 0x1d2a, 0xc28: 0x1d39, 0xc29: 0x2186,
+	0xc2a: 0x2198, 0xc2b: 0x21aa, 0xc2c: 0x21bc, 0xc2d: 0x21c8, 0xc2e: 0x21d4, 0xc2f: 0x21e0,
+	0xc30: 0x21ec, 0xc31: 0x21f8, 0xc32: 0x2204, 0xc33: 0x2240, 0xc34: 0x224c, 0xc35: 0x2258,
+	0xc36: 0x2264, 0xc37: 0x2270, 0xc38: 0x227c, 0xc39: 0x2282, 0xc3a: 0x2288, 0xc3b: 0x228e,
+	0xc3c: 0x2294, 0xc3d: 0x22a6, 0xc3e: 0x22ac, 0xc3f: 0x1c10,
+	// Block 0x31, offset 0xc40
+	0xc40: 0x1377, 0xc41: 0x0cfb, 0xc42: 0x13d3, 0xc43: 0x139f, 0xc44: 0x0e57, 0xc45: 0x06eb,
+	0xc46: 0x08df, 0xc47: 0x162b, 0xc48: 0x162b, 0xc49: 0x0a0b, 0xc4a: 0x145f, 0xc4b: 0x0943,
+	0xc4c: 0x0a07, 0xc4d: 0x0bef, 0xc4e: 0x0fcf, 0xc4f: 0x115f, 0xc50: 0x1297, 0xc51: 0x12d3,
+	0xc52: 0x1307, 0xc53: 0x141b, 0xc54: 0x0d73, 0xc55: 0x0dff, 0xc56: 0x0eab, 0xc57: 0x0f43,
+	0xc58: 0x125f, 0xc59: 0x1447, 0xc5a: 0x1573, 0xc5b: 0x070f, 0xc5c: 0x08b3, 0xc5d: 0x0d87,
+	0xc5e: 0x0ecf, 0xc5f: 0x1293, 0xc60: 0x15c3, 0xc61: 0x0ab3, 0xc62: 0x0e77, 0xc63: 0x1283,
+	0xc64: 0x1317, 0xc65: 0x0c23, 0xc66: 0x11bb, 0xc67: 0x12df, 0xc68: 0x0b1f, 0xc69: 0x0d0f,
+	0xc6a: 0x0e17, 0xc6b: 0x0f1b, 0xc6c: 0x1427, 0xc6d: 0x074f, 0xc6e: 0x07e7, 0xc6f: 0x0853,
+	0xc70: 0x0c8b, 0xc71: 0x0d7f, 0xc72: 0x0ecb, 0xc73: 0x0fef, 0xc74: 0x1177, 0xc75: 0x128b,
+	0xc76: 0x12a3, 0xc77: 0x13c7, 0xc78: 0x14ef, 0xc79: 0x15a3, 0xc7a: 0x15bf, 0xc7b: 0x102b,
+	0xc7c: 0x106b, 0xc7d: 0x1123, 0xc7e: 0x1243, 0xc7f: 0x147b,
+	// Block 0x32, offset 0xc80
+	0xc80: 0x15cb, 0xc81: 0x134b, 0xc82: 0x09c7, 0xc83: 0x0b3b, 0xc84: 0x10db, 0xc85: 0x119b,
+	0xc86: 0x0eff, 0xc87: 0x1033, 0xc88: 0x1397, 0xc89: 0x14e7, 0xc8a: 0x09c3, 0xc8b: 0x0a8f,
+	0xc8c: 0x0d77, 0xc8d: 0x0e2b, 0xc8e: 0x0e5f, 0xc8f: 0x1113, 0xc90: 0x113b, 0xc91: 0x14a7,
+	0xc92: 0x084f, 0xc93: 0x11a7, 0xc94: 0x07f3, 0xc95: 0x07ef, 0xc96: 0x1097, 0xc97: 0x1127,
+	0xc98: 0x125b, 0xc99: 0x14af, 0xc9a: 0x1367, 0xc9b: 0x0c27, 0xc9c: 0x0d73, 0xc9d: 0x1357,
+	0xc9e: 0x06f7, 0xc9f: 0x0a63, 0xca0: 0x0b93, 0xca1: 0x0f2f, 0xca2: 0x0faf, 0xca3: 0x0873,
+	0xca4: 0x103b, 0xca5: 0x075f, 0xca6: 0x0b77, 0xca7: 0x06d7, 0xca8: 0x0deb, 0xca9: 0x0ca3,
+	0xcaa: 0x110f, 0xcab: 0x08c7, 0xcac: 0x09b3, 0xcad: 0x0ffb, 0xcae: 0x1263, 0xcaf: 0x133b,
+	0xcb0: 0x0db7, 0xcb1: 0x13f7, 0xcb2: 0x0de3, 0xcb3: 0x0c37, 0xcb4: 0x121b, 0xcb5: 0x0c57,
+	0xcb6: 0x0fab, 0xcb7: 0x072b, 0xcb8: 0x07a7, 0xcb9: 0x07eb, 0xcba: 0x0d53, 0xcbb: 0x10fb,
+	0xcbc: 0x11f3, 0xcbd: 0x1347, 0xcbe: 0x145b, 0xcbf: 0x085b,
+	// Block 0x33, offset 0xcc0
+	0xcc0: 0x090f, 0xcc1: 0x0a17, 0xcc2: 0x0b2f, 0xcc3: 0x0cbf, 0xcc4: 0x0e7b, 0xcc5: 0x103f,
+	0xcc6: 0x1497, 0xcc7: 0x157b, 0xcc8: 0x15cf, 0xcc9: 0x15e7, 0xcca: 0x0837, 0xccb: 0x0cf3,
+	0xccc: 0x0da3, 0xccd: 0x13eb, 0xcce: 0x0afb, 0xccf: 0x0bd7, 0xcd0: 0x0bf3, 0xcd1: 0x0c83,
+	0xcd2: 0x0e6b, 0xcd3: 0x0eb7, 0xcd4: 0x0f67, 0xcd5: 0x108b, 0xcd6: 0x112f, 0xcd7: 0x1193,
+	0xcd8: 0x13db, 0xcd9: 0x126b, 0xcda: 0x1403, 0xcdb: 0x147f, 0xcdc: 0x080f, 0xcdd: 0x083b,
+	0xcde: 0x0923, 0xcdf: 0x0ea7, 0xce0: 0x12f3, 0xce1: 0x133b, 0xce2: 0x0b1b, 0xce3: 0x0b8b,
+	0xce4: 0x0c4f, 0xce5: 0x0daf, 0xce6: 0x10d7, 0xce7: 0x0f23, 0xce8: 0x073b, 0xce9: 0x097f,
+	0xcea: 0x0a63, 0xceb: 0x0ac7, 0xcec: 0x0b97, 0xced: 0x0f3f, 0xcee: 0x0f5b, 0xcef: 0x116b,
+	0xcf0: 0x118b, 0xcf1: 0x1463, 0xcf2: 0x14e3, 0xcf3: 0x14f3, 0xcf4: 0x152f, 0xcf5: 0x0753,
+	0xcf6: 0x107f, 0xcf7: 0x144f, 0xcf8: 0x14cb, 0xcf9: 0x0baf, 0xcfa: 0x0717, 0xcfb: 0x0777,
+	0xcfc: 0x0a67, 0xcfd: 0x0a87, 0xcfe: 0x0caf, 0xcff: 0x0d73,
+	// Block 0x34, offset 0xd00
+	0xd00: 0x0ec3, 0xd01: 0x0fcb, 0xd02: 0x1277, 0xd03: 0x1417, 0xd04: 0x1623, 0xd05: 0x0ce3,
+	0xd06: 0x14a3, 0xd07: 0x0833, 0xd08: 0x0d2f, 0xd09: 0x0d3b, 0xd0a: 0x0e0f, 0xd0b: 0x0e47,
+	0xd0c: 0x0f4b, 0xd0d: 0x0fa7, 0xd0e: 0x1027, 0xd0f: 0x110b, 0xd10: 0x153b, 0xd11: 0x07af,
+	0xd12: 0x0c03, 0xd13: 0x14b3, 0xd14: 0x0767, 0xd15: 0x0aab, 0xd16: 0x0e2f, 0xd17: 0x13df,
+	0xd18: 0x0b67, 0xd19: 0x0bb7, 0xd1a: 0x0d43, 0xd1b: 0x0f2f, 0xd1c: 0x14bb, 0xd1d: 0x0817,
+	0xd1e: 0x08ff, 0xd1f: 0x0a97, 0xd20: 0x0cd3, 0xd21: 0x0d1f, 0xd22: 0x0d5f, 0xd23: 0x0df3,
+	0xd24: 0x0f47, 0xd25: 0x0fbb, 0xd26: 0x1157, 0xd27: 0x12f7, 0xd28: 0x1303, 0xd29: 0x1457,
+	0xd2a: 0x14d7, 0xd2b: 0x0883, 0xd2c: 0x0e4b, 0xd2d: 0x0903, 0xd2e: 0x0ec7, 0xd2f: 0x0f6b,
+	0xd30: 0x1287, 0xd31: 0x14bf, 0xd32: 0x15ab, 0xd33: 0x15d3, 0xd34: 0x0d37, 0xd35: 0x0e27,
+	0xd36: 0x11c3, 0xd37: 0x10b7, 0xd38: 0x10c3, 0xd39: 0x10e7, 0xd3a: 0x0f17, 0xd3b: 0x0e9f,
+	0xd3c: 0x1363, 0xd3d: 0x0733, 0xd3e: 0x122b, 0xd3f: 0x081b,
+	// Block 0x35, offset 0xd40
+	0xd40: 0x080b, 0xd41: 0x0b0b, 0xd42: 0x0c2b, 0xd43: 0x10f3, 0xd44: 0x0a53, 0xd45: 0x0e03,
+	0xd46: 0x0cef, 0xd47: 0x13e7, 0xd48: 0x12e7, 0xd49: 0x14ab, 0xd4a: 0x1323, 0xd4b: 0x0b27,
+	0xd4c: 0x0787, 0xd4d: 0x095b, 0xd50: 0x09af,
+	0xd52: 0x0cdf, 0xd55: 0x07f7, 0xd56: 0x0f1f, 0xd57: 0x0fe3,
+	0xd58: 0x1047, 0xd59: 0x1063, 0xd5a: 0x1067, 0xd5b: 0x107b, 0xd5c: 0x14fb, 0xd5d: 0x10eb,
+	0xd5e: 0x116f, 0xd60: 0x128f, 0xd62: 0x1353,
+	0xd65: 0x1407, 0xd66: 0x1433,
+	0xd6a: 0x154f, 0xd6b: 0x1553, 0xd6c: 0x1557, 0xd6d: 0x15bb, 0xd6e: 0x142b, 0xd6f: 0x14c7,
+	0xd70: 0x0757, 0xd71: 0x077b, 0xd72: 0x078f, 0xd73: 0x084b, 0xd74: 0x0857, 0xd75: 0x0897,
+	0xd76: 0x094b, 0xd77: 0x0967, 0xd78: 0x096f, 0xd79: 0x09ab, 0xd7a: 0x09b7, 0xd7b: 0x0a93,
+	0xd7c: 0x0a9b, 0xd7d: 0x0ba3, 0xd7e: 0x0bcb, 0xd7f: 0x0bd3,
+	// Block 0x36, offset 0xd80
+	0xd80: 0x0beb, 0xd81: 0x0c97, 0xd82: 0x0cc7, 0xd83: 0x0ce7, 0xd84: 0x0d57, 0xd85: 0x0e1b,
+	0xd86: 0x0e37, 0xd87: 0x0e67, 0xd88: 0x0ebb, 0xd89: 0x0edb, 0xd8a: 0x0f4f, 0xd8b: 0x102f,
+	0xd8c: 0x104b, 0xd8d: 0x1053, 0xd8e: 0x104f, 0xd8f: 0x1057, 0xd90: 0x105b, 0xd91: 0x105f,
+	0xd92: 0x1073, 0xd93: 0x1077, 0xd94: 0x109b, 0xd95: 0x10af, 0xd96: 0x10cb, 0xd97: 0x112f,
+	0xd98: 0x1137, 0xd99: 0x113f, 0xd9a: 0x1153, 0xd9b: 0x117b, 0xd9c: 0x11cb, 0xd9d: 0x11ff,
+	0xd9e: 0x11ff, 0xd9f: 0x1267, 0xda0: 0x130f, 0xda1: 0x1327, 0xda2: 0x135b, 0xda3: 0x135f,
+	0xda4: 0x13a3, 0xda5: 0x13a7, 0xda6: 0x13ff, 0xda7: 0x1407, 0xda8: 0x14db, 0xda9: 0x151f,
+	0xdaa: 0x1537, 0xdab: 0x0b9b, 0xdac: 0x171e, 0xdad: 0x11e3,
+	0xdb0: 0x06df, 0xdb1: 0x07e3, 0xdb2: 0x07a3, 0xdb3: 0x074b, 0xdb4: 0x078b, 0xdb5: 0x07b7,
+	0xdb6: 0x0847, 0xdb7: 0x0863, 0xdb8: 0x094b, 0xdb9: 0x0937, 0xdba: 0x0947, 0xdbb: 0x0963,
+	0xdbc: 0x09af, 0xdbd: 0x09bf, 0xdbe: 0x0a03, 0xdbf: 0x0a0f,
+	// Block 0x37, offset 0xdc0
+	0xdc0: 0x0a2b, 0xdc1: 0x0a3b, 0xdc2: 0x0b23, 0xdc3: 0x0b2b, 0xdc4: 0x0b5b, 0xdc5: 0x0b7b,
+	0xdc6: 0x0bab, 0xdc7: 0x0bc3, 0xdc8: 0x0bb3, 0xdc9: 0x0bd3, 0xdca: 0x0bc7, 0xdcb: 0x0beb,
+	0xdcc: 0x0c07, 0xdcd: 0x0c5f, 0xdce: 0x0c6b, 0xdcf: 0x0c73, 0xdd0: 0x0c9b, 0xdd1: 0x0cdf,
+	0xdd2: 0x0d0f, 0xdd3: 0x0d13, 0xdd4: 0x0d27, 0xdd5: 0x0da7, 0xdd6: 0x0db7, 0xdd7: 0x0e0f,
+	0xdd8: 0x0e5b, 0xdd9: 0x0e53, 0xdda: 0x0e67, 0xddb: 0x0e83, 0xddc: 0x0ebb, 0xddd: 0x1013,
+	0xdde: 0x0edf, 0xddf: 0x0f13, 0xde0: 0x0f1f, 0xde1: 0x0f5f, 0xde2: 0x0f7b, 0xde3: 0x0f9f,
+	0xde4: 0x0fc3, 0xde5: 0x0fc7, 0xde6: 0x0fe3, 0xde7: 0x0fe7, 0xde8: 0x0ff7, 0xde9: 0x100b,
+	0xdea: 0x1007, 0xdeb: 0x1037, 0xdec: 0x10b3, 0xded: 0x10cb, 0xdee: 0x10e3, 0xdef: 0x111b,
+	0xdf0: 0x112f, 0xdf1: 0x114b, 0xdf2: 0x117b, 0xdf3: 0x122f, 0xdf4: 0x1257, 0xdf5: 0x12cb,
+	0xdf6: 0x1313, 0xdf7: 0x131f, 0xdf8: 0x1327, 0xdf9: 0x133f, 0xdfa: 0x1353, 0xdfb: 0x1343,
+	0xdfc: 0x135b, 0xdfd: 0x1357, 0xdfe: 0x134f, 0xdff: 0x135f,
+	// Block 0x38, offset 0xe00
+	0xe00: 0x136b, 0xe01: 0x13a7, 0xe02: 0x13e3, 0xe03: 0x1413, 0xe04: 0x144b, 0xe05: 0x146b,
+	0xe06: 0x14b7, 0xe07: 0x14db, 0xe08: 0x14fb, 0xe09: 0x150f, 0xe0a: 0x151f, 0xe0b: 0x152b,
+	0xe0c: 0x1537, 0xe0d: 0x158b, 0xe0e: 0x162b, 0xe0f: 0x16b5, 0xe10: 0x16b0, 0xe11: 0x16e2,
+	0xe12: 0x0607, 0xe13: 0x062f, 0xe14: 0x0633, 0xe15: 0x1764, 0xe16: 0x1791, 0xe17: 0x1809,
+	0xe18: 0x1617, 0xe19: 0x1627,
+	// Block 0x39, offset 0xe40
+	0xe40: 0x19d5, 0xe41: 0x19d8, 0xe42: 0x19db, 0xe43: 0x1c08, 0xe44: 0x1c0c, 0xe45: 0x1a5f,
+	0xe46: 0x1a5f,
+	0xe53: 0x1d75, 0xe54: 0x1d66, 0xe55: 0x1d6b, 0xe56: 0x1d7a, 0xe57: 0x1d70,
+	0xe5d: 0x4426,
+	0xe5e: 0x8115, 0xe5f: 0x4498, 0xe60: 0x022d, 0xe61: 0x0215, 0xe62: 0x021e, 0xe63: 0x0221,
+	0xe64: 0x0224, 0xe65: 0x0227, 0xe66: 0x022a, 0xe67: 0x0230, 0xe68: 0x0233, 0xe69: 0x0017,
+	0xe6a: 0x4486, 0xe6b: 0x448c, 0xe6c: 0x458a, 0xe6d: 0x4592, 0xe6e: 0x43de, 0xe6f: 0x43e4,
+	0xe70: 0x43ea, 0xe71: 0x43f0, 0xe72: 0x43fc, 0xe73: 0x4402, 0xe74: 0x4408, 0xe75: 0x4414,
+	0xe76: 0x441a, 0xe78: 0x4420, 0xe79: 0x442c, 0xe7a: 0x4432, 0xe7b: 0x4438,
+	0xe7c: 0x4444, 0xe7e: 0x444a,
+	// Block 0x3a, offset 0xe80
+	0xe80: 0x4450, 0xe81: 0x4456, 0xe83: 0x445c, 0xe84: 0x4462,
+	0xe86: 0x446e, 0xe87: 0x4474, 0xe88: 0x447a, 0xe89: 0x4480, 0xe8a: 0x4492, 0xe8b: 0x440e,
+	0xe8c: 0x43f6, 0xe8d: 0x443e, 0xe8e: 0x4468, 0xe8f: 0x1d7f, 0xe90: 0x0299, 0xe91: 0x0299,
+	0xe92: 0x02a2, 0xe93: 0x02a2, 0xe94: 0x02a2, 0xe95: 0x02a2, 0xe96: 0x02a5, 0xe97: 0x02a5,
+	0xe98: 0x02a5, 0xe99: 0x02a5, 0xe9a: 0x02ab, 0xe9b: 0x02ab, 0xe9c: 0x02ab, 0xe9d: 0x02ab,
+	0xe9e: 0x029f, 0xe9f: 0x029f, 0xea0: 0x029f, 0xea1: 0x029f, 0xea2: 0x02a8, 0xea3: 0x02a8,
+	0xea4: 0x02a8, 0xea5: 0x02a8, 0xea6: 0x029c, 0xea7: 0x029c, 0xea8: 0x029c, 0xea9: 0x029c,
+	0xeaa: 0x02cf, 0xeab: 0x02cf, 0xeac: 0x02cf, 0xead: 0x02cf, 0xeae: 0x02d2, 0xeaf: 0x02d2,
+	0xeb0: 0x02d2, 0xeb1: 0x02d2, 0xeb2: 0x02b1, 0xeb3: 0x02b1, 0xeb4: 0x02b1, 0xeb5: 0x02b1,
+	0xeb6: 0x02ae, 0xeb7: 0x02ae, 0xeb8: 0x02ae, 0xeb9: 0x02ae, 0xeba: 0x02b4, 0xebb: 0x02b4,
+	0xebc: 0x02b4, 0xebd: 0x02b4, 0xebe: 0x02b7, 0xebf: 0x02b7,
+	// Block 0x3b, offset 0xec0
+	0xec0: 0x02b7, 0xec1: 0x02b7, 0xec2: 0x02c0, 0xec3: 0x02c0, 0xec4: 0x02bd, 0xec5: 0x02bd,
+	0xec6: 0x02c3, 0xec7: 0x02c3, 0xec8: 0x02ba, 0xec9: 0x02ba, 0xeca: 0x02c9, 0xecb: 0x02c9,
+	0xecc: 0x02c6, 0xecd: 0x02c6, 0xece: 0x02d5, 0xecf: 0x02d5, 0xed0: 0x02d5, 0xed1: 0x02d5,
+	0xed2: 0x02db, 0xed3: 0x02db, 0xed4: 0x02db, 0xed5: 0x02db, 0xed6: 0x02e1, 0xed7: 0x02e1,
+	0xed8: 0x02e1, 0xed9: 0x02e1, 0xeda: 0x02de, 0xedb: 0x02de, 0xedc: 0x02de, 0xedd: 0x02de,
+	0xede: 0x02e4, 0xedf: 0x02e4, 0xee0: 0x02e7, 0xee1: 0x02e7, 0xee2: 0x02e7, 0xee3: 0x02e7,
+	0xee4: 0x4504, 0xee5: 0x4504, 0xee6: 0x02ed, 0xee7: 0x02ed, 0xee8: 0x02ed, 0xee9: 0x02ed,
+	0xeea: 0x02ea, 0xeeb: 0x02ea, 0xeec: 0x02ea, 0xeed: 0x02ea, 0xeee: 0x0308, 0xeef: 0x0308,
+	0xef0: 0x44fe, 0xef1: 0x44fe,
+	// Block 0x3c, offset 0xf00
+	0xf13: 0x02d8, 0xf14: 0x02d8, 0xf15: 0x02d8, 0xf16: 0x02d8, 0xf17: 0x02f6,
+	0xf18: 0x02f6, 0xf19: 0x02f3, 0xf1a: 0x02f3, 0xf1b: 0x02f9, 0xf1c: 0x02f9, 0xf1d: 0x204f,
+	0xf1e: 0x02ff, 0xf1f: 0x02ff, 0xf20: 0x02f0, 0xf21: 0x02f0, 0xf22: 0x02fc, 0xf23: 0x02fc,
+	0xf24: 0x0305, 0xf25: 0x0305, 0xf26: 0x0305, 0xf27: 0x0305, 0xf28: 0x028d, 0xf29: 0x028d,
+	0xf2a: 0x25aa, 0xf2b: 0x25aa, 0xf2c: 0x261a, 0xf2d: 0x261a, 0xf2e: 0x25e9, 0xf2f: 0x25e9,
+	0xf30: 0x2605, 0xf31: 0x2605, 0xf32: 0x25fe, 0xf33: 0x25fe, 0xf34: 0x260c, 0xf35: 0x260c,
+	0xf36: 0x2613, 0xf37: 0x2613, 0xf38: 0x2613, 0xf39: 0x25f0, 0xf3a: 0x25f0, 0xf3b: 0x25f0,
+	0xf3c: 0x0302, 0xf3d: 0x0302, 0xf3e: 0x0302, 0xf3f: 0x0302,
+	// Block 0x3d, offset 0xf40
+	0xf40: 0x25b1, 0xf41: 0x25b8, 0xf42: 0x25d4, 0xf43: 0x25f0, 0xf44: 0x25f7, 0xf45: 0x1d89,
+	0xf46: 0x1d8e, 0xf47: 0x1d93, 0xf48: 0x1da2, 0xf49: 0x1db1, 0xf4a: 0x1db6, 0xf4b: 0x1dbb,
+	0xf4c: 0x1dc0, 0xf4d: 0x1dc5, 0xf4e: 0x1dd4, 0xf4f: 0x1de3, 0xf50: 0x1de8, 0xf51: 0x1ded,
+	0xf52: 0x1dfc, 0xf53: 0x1e0b, 0xf54: 0x1e10, 0xf55: 0x1e15, 0xf56: 0x1e1a, 0xf57: 0x1e29,
+	0xf58: 0x1e2e, 0xf59: 0x1e3d, 0xf5a: 0x1e42, 0xf5b: 0x1e47, 0xf5c: 0x1e56, 0xf5d: 0x1e5b,
+	0xf5e: 0x1e60, 0xf5f: 0x1e6a, 0xf60: 0x1ea6, 0xf61: 0x1eb5, 0xf62: 0x1ec4, 0xf63: 0x1ec9,
+	0xf64: 0x1ece, 0xf65: 0x1ed8, 0xf66: 0x1ee7, 0xf67: 0x1eec, 0xf68: 0x1efb, 0xf69: 0x1f00,
+	0xf6a: 0x1f05, 0xf6b: 0x1f14, 0xf6c: 0x1f19, 0xf6d: 0x1f28, 0xf6e: 0x1f2d, 0xf6f: 0x1f32,
+	0xf70: 0x1f37, 0xf71: 0x1f3c, 0xf72: 0x1f41, 0xf73: 0x1f46, 0xf74: 0x1f4b, 0xf75: 0x1f50,
+	0xf76: 0x1f55, 0xf77: 0x1f5a, 0xf78: 0x1f5f, 0xf79: 0x1f64, 0xf7a: 0x1f69, 0xf7b: 0x1f6e,
+	0xf7c: 0x1f73, 0xf7d: 0x1f78, 0xf7e: 0x1f7d, 0xf7f: 0x1f87,
+	// Block 0x3e, offset 0xf80
+	0xf80: 0x1f8c, 0xf81: 0x1f91, 0xf82: 0x1f96, 0xf83: 0x1fa0, 0xf84: 0x1fa5, 0xf85: 0x1faf,
+	0xf86: 0x1fb4, 0xf87: 0x1fb9, 0xf88: 0x1fbe, 0xf89: 0x1fc3, 0xf8a: 0x1fc8, 0xf8b: 0x1fcd,
+	0xf8c: 0x1fd2, 0xf8d: 0x1fd7, 0xf8e: 0x1fe6, 0xf8f: 0x1ff5, 0xf90: 0x1ffa, 0xf91: 0x1fff,
+	0xf92: 0x2004, 0xf93: 0x2009, 0xf94: 0x200e, 0xf95: 0x2018, 0xf96: 0x201d, 0xf97: 0x2022,
+	0xf98: 0x2031, 0xf99: 0x2040, 0xf9a: 0x2045, 0xf9b: 0x44b6, 0xf9c: 0x44bc, 0xf9d: 0x44f2,
+	0xf9e: 0x4549, 0xf9f: 0x4550, 0xfa0: 0x4557, 0xfa1: 0x455e, 0xfa2: 0x4565, 0xfa3: 0x456c,
+	0xfa4: 0x25c6, 0xfa5: 0x25cd, 0xfa6: 0x25d4, 0xfa7: 0x25db, 0xfa8: 0x25f0, 0xfa9: 0x25f7,
+	0xfaa: 0x1d98, 0xfab: 0x1d9d, 0xfac: 0x1da2, 0xfad: 0x1da7, 0xfae: 0x1db1, 0xfaf: 0x1db6,
+	0xfb0: 0x1dca, 0xfb1: 0x1dcf, 0xfb2: 0x1dd4, 0xfb3: 0x1dd9, 0xfb4: 0x1de3, 0xfb5: 0x1de8,
+	0xfb6: 0x1df2, 0xfb7: 0x1df7, 0xfb8: 0x1dfc, 0xfb9: 0x1e01, 0xfba: 0x1e0b, 0xfbb: 0x1e10,
+	0xfbc: 0x1f3c, 0xfbd: 0x1f41, 0xfbe: 0x1f50, 0xfbf: 0x1f55,
+	// Block 0x3f, offset 0xfc0
+	0xfc0: 0x1f5a, 0xfc1: 0x1f6e, 0xfc2: 0x1f73, 0xfc3: 0x1f78, 0xfc4: 0x1f7d, 0xfc5: 0x1f96,
+	0xfc6: 0x1fa0, 0xfc7: 0x1fa5, 0xfc8: 0x1faa, 0xfc9: 0x1fbe, 0xfca: 0x1fdc, 0xfcb: 0x1fe1,
+	0xfcc: 0x1fe6, 0xfcd: 0x1feb, 0xfce: 0x1ff5, 0xfcf: 0x1ffa, 0xfd0: 0x44f2, 0xfd1: 0x2027,
+	0xfd2: 0x202c, 0xfd3: 0x2031, 0xfd4: 0x2036, 0xfd5: 0x2040, 0xfd6: 0x2045, 0xfd7: 0x25b1,
+	0xfd8: 0x25b8, 0xfd9: 0x25bf, 0xfda: 0x25d4, 0xfdb: 0x25e2, 0xfdc: 0x1d89, 0xfdd: 0x1d8e,
+	0xfde: 0x1d93, 0xfdf: 0x1da2, 0xfe0: 0x1dac, 0xfe1: 0x1dbb, 0xfe2: 0x1dc0, 0xfe3: 0x1dc5,
+	0xfe4: 0x1dd4, 0xfe5: 0x1dde, 0xfe6: 0x1dfc, 0xfe7: 0x1e15, 0xfe8: 0x1e1a, 0xfe9: 0x1e29,
+	0xfea: 0x1e2e, 0xfeb: 0x1e3d, 0xfec: 0x1e47, 0xfed: 0x1e56, 0xfee: 0x1e5b, 0xfef: 0x1e60,
+	0xff0: 0x1e6a, 0xff1: 0x1ea6, 0xff2: 0x1eab, 0xff3: 0x1eb5, 0xff4: 0x1ec4, 0xff5: 0x1ec9,
+	0xff6: 0x1ece, 0xff7: 0x1ed8, 0xff8: 0x1ee7, 0xff9: 0x1efb, 0xffa: 0x1f00, 0xffb: 0x1f05,
+	0xffc: 0x1f14, 0xffd: 0x1f19, 0xffe: 0x1f28, 0xfff: 0x1f2d,
+	// Block 0x40, offset 0x1000
+	0x1000: 0x1f32, 0x1001: 0x1f37, 0x1002: 0x1f46, 0x1003: 0x1f4b, 0x1004: 0x1f5f, 0x1005: 0x1f64,
+	0x1006: 0x1f69, 0x1007: 0x1f6e, 0x1008: 0x1f73, 0x1009: 0x1f87, 0x100a: 0x1f8c, 0x100b: 0x1f91,
+	0x100c: 0x1f96, 0x100d: 0x1f9b, 0x100e: 0x1faf, 0x100f: 0x1fb4, 0x1010: 0x1fb9, 0x1011: 0x1fbe,
+	0x1012: 0x1fcd, 0x1013: 0x1fd2, 0x1014: 0x1fd7, 0x1015: 0x1fe6, 0x1016: 0x1ff0, 0x1017: 0x1fff,
+	0x1018: 0x2004, 0x1019: 0x44e6, 0x101a: 0x2018, 0x101b: 0x201d, 0x101c: 0x2022, 0x101d: 0x2031,
+	0x101e: 0x203b, 0x101f: 0x25d4, 0x1020: 0x25e2, 0x1021: 0x1da2, 0x1022: 0x1dac, 0x1023: 0x1dd4,
+	0x1024: 0x1dde, 0x1025: 0x1dfc, 0x1026: 0x1e06, 0x1027: 0x1e6a, 0x1028: 0x1e6f, 0x1029: 0x1e92,
+	0x102a: 0x1e97, 0x102b: 0x1f6e, 0x102c: 0x1f73, 0x102d: 0x1f96, 0x102e: 0x1fe6, 0x102f: 0x1ff0,
+	0x1030: 0x2031, 0x1031: 0x203b, 0x1032: 0x459a, 0x1033: 0x45a2, 0x1034: 0x45aa, 0x1035: 0x1ef1,
+	0x1036: 0x1ef6, 0x1037: 0x1f0a, 0x1038: 0x1f0f, 0x1039: 0x1f1e, 0x103a: 0x1f23, 0x103b: 0x1e74,
+	0x103c: 0x1e79, 0x103d: 0x1e9c, 0x103e: 0x1ea1, 0x103f: 0x1e33,
+	// Block 0x41, offset 0x1040
+	0x1040: 0x1e38, 0x1041: 0x1e1f, 0x1042: 0x1e24, 0x1043: 0x1e4c, 0x1044: 0x1e51, 0x1045: 0x1eba,
+	0x1046: 0x1ebf, 0x1047: 0x1edd, 0x1048: 0x1ee2, 0x1049: 0x1e7e, 0x104a: 0x1e83, 0x104b: 0x1e88,
+	0x104c: 0x1e92, 0x104d: 0x1e8d, 0x104e: 0x1e65, 0x104f: 0x1eb0, 0x1050: 0x1ed3, 0x1051: 0x1ef1,
+	0x1052: 0x1ef6, 0x1053: 0x1f0a, 0x1054: 0x1f0f, 0x1055: 0x1f1e, 0x1056: 0x1f23, 0x1057: 0x1e74,
+	0x1058: 0x1e79, 0x1059: 0x1e9c, 0x105a: 0x1ea1, 0x105b: 0x1e33, 0x105c: 0x1e38, 0x105d: 0x1e1f,
+	0x105e: 0x1e24, 0x105f: 0x1e4c, 0x1060: 0x1e51, 0x1061: 0x1eba, 0x1062: 0x1ebf, 0x1063: 0x1edd,
+	0x1064: 0x1ee2, 0x1065: 0x1e7e, 0x1066: 0x1e83, 0x1067: 0x1e88, 0x1068: 0x1e92, 0x1069: 0x1e8d,
+	0x106a: 0x1e65, 0x106b: 0x1eb0, 0x106c: 0x1ed3, 0x106d: 0x1e7e, 0x106e: 0x1e83, 0x106f: 0x1e88,
+	0x1070: 0x1e92, 0x1071: 0x1e6f, 0x1072: 0x1e97, 0x1073: 0x1eec, 0x1074: 0x1e56, 0x1075: 0x1e5b,
+	0x1076: 0x1e60, 0x1077: 0x1e7e, 0x1078: 0x1e83, 0x1079: 0x1e88, 0x107a: 0x1eec, 0x107b: 0x1efb,
+	0x107c: 0x449e, 0x107d: 0x449e,
+	// Block 0x42, offset 0x1080
+	0x1090: 0x2311, 0x1091: 0x2326,
+	0x1092: 0x2326, 0x1093: 0x232d, 0x1094: 0x2334, 0x1095: 0x2349, 0x1096: 0x2350, 0x1097: 0x2357,
+	0x1098: 0x237a, 0x1099: 0x237a, 0x109a: 0x239d, 0x109b: 0x2396, 0x109c: 0x23b2, 0x109d: 0x23a4,
+	0x109e: 0x23ab, 0x109f: 0x23ce, 0x10a0: 0x23ce, 0x10a1: 0x23c7, 0x10a2: 0x23d5, 0x10a3: 0x23d5,
+	0x10a4: 0x23ff, 0x10a5: 0x23ff, 0x10a6: 0x241b, 0x10a7: 0x23e3, 0x10a8: 0x23e3, 0x10a9: 0x23dc,
+	0x10aa: 0x23f1, 0x10ab: 0x23f1, 0x10ac: 0x23f8, 0x10ad: 0x23f8, 0x10ae: 0x2422, 0x10af: 0x2430,
+	0x10b0: 0x2430, 0x10b1: 0x2437, 0x10b2: 0x2437, 0x10b3: 0x243e, 0x10b4: 0x2445, 0x10b5: 0x244c,
+	0x10b6: 0x2453, 0x10b7: 0x2453, 0x10b8: 0x245a, 0x10b9: 0x2468, 0x10ba: 0x2476, 0x10bb: 0x246f,
+	0x10bc: 0x247d, 0x10bd: 0x247d, 0x10be: 0x2492, 0x10bf: 0x2499,
+	// Block 0x43, offset 0x10c0
+	0x10c0: 0x24ca, 0x10c1: 0x24d8, 0x10c2: 0x24d1, 0x10c3: 0x24b5, 0x10c4: 0x24b5, 0x10c5: 0x24df,
+	0x10c6: 0x24df, 0x10c7: 0x24e6, 0x10c8: 0x24e6, 0x10c9: 0x2510, 0x10ca: 0x2517, 0x10cb: 0x251e,
+	0x10cc: 0x24f4, 0x10cd: 0x2502, 0x10ce: 0x2525, 0x10cf: 0x252c,
+	0x10d2: 0x24fb, 0x10d3: 0x2580, 0x10d4: 0x2587, 0x10d5: 0x255d, 0x10d6: 0x2564, 0x10d7: 0x2548,
+	0x10d8: 0x2548, 0x10d9: 0x254f, 0x10da: 0x2579, 0x10db: 0x2572, 0x10dc: 0x259c, 0x10dd: 0x259c,
+	0x10de: 0x230a, 0x10df: 0x231f, 0x10e0: 0x2318, 0x10e1: 0x2342, 0x10e2: 0x233b, 0x10e3: 0x2365,
+	0x10e4: 0x235e, 0x10e5: 0x2388, 0x10e6: 0x236c, 0x10e7: 0x2381, 0x10e8: 0x23b9, 0x10e9: 0x2406,
+	0x10ea: 0x23ea, 0x10eb: 0x2429, 0x10ec: 0x24c3, 0x10ed: 0x24ed, 0x10ee: 0x2595, 0x10ef: 0x258e,
+	0x10f0: 0x25a3, 0x10f1: 0x253a, 0x10f2: 0x24a0, 0x10f3: 0x256b, 0x10f4: 0x2492, 0x10f5: 0x24ca,
+	0x10f6: 0x2461, 0x10f7: 0x24ae, 0x10f8: 0x2541, 0x10f9: 0x2533, 0x10fa: 0x24bc, 0x10fb: 0x24a7,
+	0x10fc: 0x24bc, 0x10fd: 0x2541, 0x10fe: 0x2373, 0x10ff: 0x238f,
+	// Block 0x44, offset 0x1100
+	0x1100: 0x2509, 0x1101: 0x2484, 0x1102: 0x2303, 0x1103: 0x24a7, 0x1104: 0x244c, 0x1105: 0x241b,
+	0x1106: 0x23c0, 0x1107: 0x2556,
+	0x1130: 0x2414, 0x1131: 0x248b, 0x1132: 0x27bf, 0x1133: 0x27b6, 0x1134: 0x27ec, 0x1135: 0x27da,
+	0x1136: 0x27c8, 0x1137: 0x27e3, 0x1138: 0x27f5, 0x1139: 0x240d, 0x113a: 0x2c7c, 0x113b: 0x2afc,
+	0x113c: 0x27d1,
+	// Block 0x45, offset 0x1140
+	0x1150: 0x0019, 0x1151: 0x0483,
+	0x1152: 0x0487, 0x1153: 0x0035, 0x1154: 0x0037, 0x1155: 0x0003, 0x1156: 0x003f, 0x1157: 0x04bf,
+	0x1158: 0x04c3, 0x1159: 0x1b5c,
+	0x1160: 0x8132, 0x1161: 0x8132, 0x1162: 0x8132, 0x1163: 0x8132,
+	0x1164: 0x8132, 0x1165: 0x8132, 0x1166: 0x8132, 0x1167: 0x812d, 0x1168: 0x812d, 0x1169: 0x812d,
+	0x116a: 0x812d, 0x116b: 0x812d, 0x116c: 0x812d, 0x116d: 0x812d, 0x116e: 0x8132, 0x116f: 0x8132,
+	0x1170: 0x1873, 0x1171: 0x0443, 0x1172: 0x043f, 0x1173: 0x007f, 0x1174: 0x007f, 0x1175: 0x0011,
+	0x1176: 0x0013, 0x1177: 0x00b7, 0x1178: 0x00bb, 0x1179: 0x04b7, 0x117a: 0x04bb, 0x117b: 0x04ab,
+	0x117c: 0x04af, 0x117d: 0x0493, 0x117e: 0x0497, 0x117f: 0x048b,
+	// Block 0x46, offset 0x1180
+	0x1180: 0x048f, 0x1181: 0x049b, 0x1182: 0x049f, 0x1183: 0x04a3, 0x1184: 0x04a7,
+	0x1187: 0x0077, 0x1188: 0x007b, 0x1189: 0x4269, 0x118a: 0x4269, 0x118b: 0x4269,
+	0x118c: 0x4269, 0x118d: 0x007f, 0x118e: 0x007f, 0x118f: 0x007f, 0x1190: 0x0019, 0x1191: 0x0483,
+	0x1192: 0x001d, 0x1194: 0x0037, 0x1195: 0x0035, 0x1196: 0x003f, 0x1197: 0x0003,
+	0x1198: 0x0443, 0x1199: 0x0011, 0x119a: 0x0013, 0x119b: 0x00b7, 0x119c: 0x00bb, 0x119d: 0x04b7,
+	0x119e: 0x04bb, 0x119f: 0x0007, 0x11a0: 0x000d, 0x11a1: 0x0015, 0x11a2: 0x0017, 0x11a3: 0x001b,
+	0x11a4: 0x0039, 0x11a5: 0x003d, 0x11a6: 0x003b, 0x11a8: 0x0079, 0x11a9: 0x0009,
+	0x11aa: 0x000b, 0x11ab: 0x0041,
+	0x11b0: 0x42aa, 0x11b1: 0x44c2, 0x11b2: 0x42af, 0x11b4: 0x42b4,
+	0x11b6: 0x42b9, 0x11b7: 0x44c8, 0x11b8: 0x42be, 0x11b9: 0x44ce, 0x11ba: 0x42c3, 0x11bb: 0x44d4,
+	0x11bc: 0x42c8, 0x11bd: 0x44da, 0x11be: 0x42cd, 0x11bf: 0x44e0,
+	// Block 0x47, offset 0x11c0
+	0x11c0: 0x0236, 0x11c1: 0x44a4, 0x11c2: 0x44a4, 0x11c3: 0x44aa, 0x11c4: 0x44aa, 0x11c5: 0x44ec,
+	0x11c6: 0x44ec, 0x11c7: 0x44b0, 0x11c8: 0x44b0, 0x11c9: 0x44f8, 0x11ca: 0x44f8, 0x11cb: 0x44f8,
+	0x11cc: 0x44f8, 0x11cd: 0x0239, 0x11ce: 0x0239, 0x11cf: 0x023c, 0x11d0: 0x023c, 0x11d1: 0x023c,
+	0x11d2: 0x023c, 0x11d3: 0x023f, 0x11d4: 0x023f, 0x11d5: 0x0242, 0x11d6: 0x0242, 0x11d7: 0x0242,
+	0x11d8: 0x0242, 0x11d9: 0x0245, 0x11da: 0x0245, 0x11db: 0x0245, 0x11dc: 0x0245, 0x11dd: 0x0248,
+	0x11de: 0x0248, 0x11df: 0x0248, 0x11e0: 0x0248, 0x11e1: 0x024b, 0x11e2: 0x024b, 0x11e3: 0x024b,
+	0x11e4: 0x024b, 0x11e5: 0x024e, 0x11e6: 0x024e, 0x11e7: 0x024e, 0x11e8: 0x024e, 0x11e9: 0x0251,
+	0x11ea: 0x0251, 0x11eb: 0x0254, 0x11ec: 0x0254, 0x11ed: 0x0257, 0x11ee: 0x0257, 0x11ef: 0x025a,
+	0x11f0: 0x025a, 0x11f1: 0x025d, 0x11f2: 0x025d, 0x11f3: 0x025d, 0x11f4: 0x025d, 0x11f5: 0x0260,
+	0x11f6: 0x0260, 0x11f7: 0x0260, 0x11f8: 0x0260, 0x11f9: 0x0263, 0x11fa: 0x0263, 0x11fb: 0x0263,
+	0x11fc: 0x0263, 0x11fd: 0x0266, 0x11fe: 0x0266, 0x11ff: 0x0266,
+	// Block 0x48, offset 0x1200
+	0x1200: 0x0266, 0x1201: 0x0269, 0x1202: 0x0269, 0x1203: 0x0269, 0x1204: 0x0269, 0x1205: 0x026c,
+	0x1206: 0x026c, 0x1207: 0x026c, 0x1208: 0x026c, 0x1209: 0x026f, 0x120a: 0x026f, 0x120b: 0x026f,
+	0x120c: 0x026f, 0x120d: 0x0272, 0x120e: 0x0272, 0x120f: 0x0272, 0x1210: 0x0272, 0x1211: 0x0275,
+	0x1212: 0x0275, 0x1213: 0x0275, 0x1214: 0x0275, 0x1215: 0x0278, 0x1216: 0x0278, 0x1217: 0x0278,
+	0x1218: 0x0278, 0x1219: 0x027b, 0x121a: 0x027b, 0x121b: 0x027b, 0x121c: 0x027b, 0x121d: 0x027e,
+	0x121e: 0x027e, 0x121f: 0x027e, 0x1220: 0x027e, 0x1221: 0x0281, 0x1222: 0x0281, 0x1223: 0x0281,
+	0x1224: 0x0281, 0x1225: 0x0284, 0x1226: 0x0284, 0x1227: 0x0284, 0x1228: 0x0284, 0x1229: 0x0287,
+	0x122a: 0x0287, 0x122b: 0x0287, 0x122c: 0x0287, 0x122d: 0x028a, 0x122e: 0x028a, 0x122f: 0x028d,
+	0x1230: 0x028d, 0x1231: 0x0290, 0x1232: 0x0290, 0x1233: 0x0290, 0x1234: 0x0290, 0x1235: 0x2e00,
+	0x1236: 0x2e00, 0x1237: 0x2e08, 0x1238: 0x2e08, 0x1239: 0x2e10, 0x123a: 0x2e10, 0x123b: 0x1f82,
+	0x123c: 0x1f82,
+	// Block 0x49, offset 0x1240
+	0x1240: 0x0081, 0x1241: 0x0083, 0x1242: 0x0085, 0x1243: 0x0087, 0x1244: 0x0089, 0x1245: 0x008b,
+	0x1246: 0x008d, 0x1247: 0x008f, 0x1248: 0x0091, 0x1249: 0x0093, 0x124a: 0x0095, 0x124b: 0x0097,
+	0x124c: 0x0099, 0x124d: 0x009b, 0x124e: 0x009d, 0x124f: 0x009f, 0x1250: 0x00a1, 0x1251: 0x00a3,
+	0x1252: 0x00a5, 0x1253: 0x00a7, 0x1254: 0x00a9, 0x1255: 0x00ab, 0x1256: 0x00ad, 0x1257: 0x00af,
+	0x1258: 0x00b1, 0x1259: 0x00b3, 0x125a: 0x00b5, 0x125b: 0x00b7, 0x125c: 0x00b9, 0x125d: 0x00bb,
+	0x125e: 0x00bd, 0x125f: 0x0477, 0x1260: 0x047b, 0x1261: 0x0487, 0x1262: 0x049b, 0x1263: 0x049f,
+	0x1264: 0x0483, 0x1265: 0x05ab, 0x1266: 0x05a3, 0x1267: 0x04c7, 0x1268: 0x04cf, 0x1269: 0x04d7,
+	0x126a: 0x04df, 0x126b: 0x04e7, 0x126c: 0x056b, 0x126d: 0x0573, 0x126e: 0x057b, 0x126f: 0x051f,
+	0x1270: 0x05af, 0x1271: 0x04cb, 0x1272: 0x04d3, 0x1273: 0x04db, 0x1274: 0x04e3, 0x1275: 0x04eb,
+	0x1276: 0x04ef, 0x1277: 0x04f3, 0x1278: 0x04f7, 0x1279: 0x04fb, 0x127a: 0x04ff, 0x127b: 0x0503,
+	0x127c: 0x0507, 0x127d: 0x050b, 0x127e: 0x050f, 0x127f: 0x0513,
+	// Block 0x4a, offset 0x1280
+	0x1280: 0x0517, 0x1281: 0x051b, 0x1282: 0x0523, 0x1283: 0x0527, 0x1284: 0x052b, 0x1285: 0x052f,
+	0x1286: 0x0533, 0x1287: 0x0537, 0x1288: 0x053b, 0x1289: 0x053f, 0x128a: 0x0543, 0x128b: 0x0547,
+	0x128c: 0x054b, 0x128d: 0x054f, 0x128e: 0x0553, 0x128f: 0x0557, 0x1290: 0x055b, 0x1291: 0x055f,
+	0x1292: 0x0563, 0x1293: 0x0567, 0x1294: 0x056f, 0x1295: 0x0577, 0x1296: 0x057f, 0x1297: 0x0583,
+	0x1298: 0x0587, 0x1299: 0x058b, 0x129a: 0x058f, 0x129b: 0x0593, 0x129c: 0x0597, 0x129d: 0x05a7,
+	0x129e: 0x4a5a, 0x129f: 0x4a60, 0x12a0: 0x03c3, 0x12a1: 0x0313, 0x12a2: 0x0317, 0x12a3: 0x4345,
+	0x12a4: 0x031b, 0x12a5: 0x434a, 0x12a6: 0x434f, 0x12a7: 0x031f, 0x12a8: 0x0323, 0x12a9: 0x0327,
+	0x12aa: 0x4354, 0x12ab: 0x4359, 0x12ac: 0x435e, 0x12ad: 0x4363, 0x12ae: 0x4368, 0x12af: 0x436d,
+	0x12b0: 0x0367, 0x12b1: 0x032b, 0x12b2: 0x032f, 0x12b3: 0x0333, 0x12b4: 0x037b, 0x12b5: 0x0337,
+	0x12b6: 0x033b, 0x12b7: 0x033f, 0x12b8: 0x0343, 0x12b9: 0x0347, 0x12ba: 0x034b, 0x12bb: 0x034f,
+	0x12bc: 0x0353, 0x12bd: 0x0357, 0x12be: 0x035b,
+	// Block 0x4b, offset 0x12c0
+	0x12c2: 0x42dc, 0x12c3: 0x42e1, 0x12c4: 0x42e6, 0x12c5: 0x42eb,
+	0x12c6: 0x42f0, 0x12c7: 0x42f5, 0x12ca: 0x42fa, 0x12cb: 0x42ff,
+	0x12cc: 0x4304, 0x12cd: 0x4309, 0x12ce: 0x430e, 0x12cf: 0x4313,
+	0x12d2: 0x4318, 0x12d3: 0x431d, 0x12d4: 0x4322, 0x12d5: 0x4327, 0x12d6: 0x432c, 0x12d7: 0x4331,
+	0x12da: 0x4336, 0x12db: 0x433b, 0x12dc: 0x4340,
+	0x12e0: 0x00bf, 0x12e1: 0x00c2, 0x12e2: 0x00cb, 0x12e3: 0x4264,
+	0x12e4: 0x00c8, 0x12e5: 0x00c5, 0x12e6: 0x0447, 0x12e8: 0x046b, 0x12e9: 0x044b,
+	0x12ea: 0x044f, 0x12eb: 0x0453, 0x12ec: 0x0457, 0x12ed: 0x046f, 0x12ee: 0x0473,
+	// Block 0x4c, offset 0x1300
+	0x1300: 0x0063, 0x1301: 0x0065, 0x1302: 0x0067, 0x1303: 0x0069, 0x1304: 0x006b, 0x1305: 0x006d,
+	0x1306: 0x006f, 0x1307: 0x0071, 0x1308: 0x0073, 0x1309: 0x0075, 0x130a: 0x0083, 0x130b: 0x0085,
+	0x130c: 0x0087, 0x130d: 0x0089, 0x130e: 0x008b, 0x130f: 0x008d, 0x1310: 0x008f, 0x1311: 0x0091,
+	0x1312: 0x0093, 0x1313: 0x0095, 0x1314: 0x0097, 0x1315: 0x0099, 0x1316: 0x009b, 0x1317: 0x009d,
+	0x1318: 0x009f, 0x1319: 0x00a1, 0x131a: 0x00a3, 0x131b: 0x00a5, 0x131c: 0x00a7, 0x131d: 0x00a9,
+	0x131e: 0x00ab, 0x131f: 0x00ad, 0x1320: 0x00af, 0x1321: 0x00b1, 0x1322: 0x00b3, 0x1323: 0x00b5,
+	0x1324: 0x00dd, 0x1325: 0x00f2, 0x1328: 0x0173, 0x1329: 0x0176,
+	0x132a: 0x0179, 0x132b: 0x017c, 0x132c: 0x017f, 0x132d: 0x0182, 0x132e: 0x0185, 0x132f: 0x0188,
+	0x1330: 0x018b, 0x1331: 0x018e, 0x1332: 0x0191, 0x1333: 0x0194, 0x1334: 0x0197, 0x1335: 0x019a,
+	0x1336: 0x019d, 0x1337: 0x01a0, 0x1338: 0x01a3, 0x1339: 0x0188, 0x133a: 0x01a6, 0x133b: 0x01a9,
+	0x133c: 0x01ac, 0x133d: 0x01af, 0x133e: 0x01b2, 0x133f: 0x01b5,
+	// Block 0x4d, offset 0x1340
+	0x1340: 0x01fd, 0x1341: 0x0200, 0x1342: 0x0203, 0x1343: 0x045b, 0x1344: 0x01c7, 0x1345: 0x01d0,
+	0x1346: 0x01d6, 0x1347: 0x01fa, 0x1348: 0x01eb, 0x1349: 0x01e8, 0x134a: 0x0206, 0x134b: 0x0209,
+	0x134e: 0x0021, 0x134f: 0x0023, 0x1350: 0x0025, 0x1351: 0x0027,
+	0x1352: 0x0029, 0x1353: 0x002b, 0x1354: 0x002d, 0x1355: 0x002f, 0x1356: 0x0031, 0x1357: 0x0033,
+	0x1358: 0x0021, 0x1359: 0x0023, 0x135a: 0x0025, 0x135b: 0x0027, 0x135c: 0x0029, 0x135d: 0x002b,
+	0x135e: 0x002d, 0x135f: 0x002f, 0x1360: 0x0031, 0x1361: 0x0033, 0x1362: 0x0021, 0x1363: 0x0023,
+	0x1364: 0x0025, 0x1365: 0x0027, 0x1366: 0x0029, 0x1367: 0x002b, 0x1368: 0x002d, 0x1369: 0x002f,
+	0x136a: 0x0031, 0x136b: 0x0033, 0x136c: 0x0021, 0x136d: 0x0023, 0x136e: 0x0025, 0x136f: 0x0027,
+	0x1370: 0x0029, 0x1371: 0x002b, 0x1372: 0x002d, 0x1373: 0x002f, 0x1374: 0x0031, 0x1375: 0x0033,
+	0x1376: 0x0021, 0x1377: 0x0023, 0x1378: 0x0025, 0x1379: 0x0027, 0x137a: 0x0029, 0x137b: 0x002b,
+	0x137c: 0x002d, 0x137d: 0x002f, 0x137e: 0x0031, 0x137f: 0x0033,
+	// Block 0x4e, offset 0x1380
+	0x1380: 0x0239, 0x1381: 0x023c, 0x1382: 0x0248, 0x1383: 0x0251, 0x1385: 0x028a,
+	0x1386: 0x025a, 0x1387: 0x024b, 0x1388: 0x0269, 0x1389: 0x0290, 0x138a: 0x027b, 0x138b: 0x027e,
+	0x138c: 0x0281, 0x138d: 0x0284, 0x138e: 0x025d, 0x138f: 0x026f, 0x1390: 0x0275, 0x1391: 0x0263,
+	0x1392: 0x0278, 0x1393: 0x0257, 0x1394: 0x0260, 0x1395: 0x0242, 0x1396: 0x0245, 0x1397: 0x024e,
+	0x1398: 0x0254, 0x1399: 0x0266, 0x139a: 0x026c, 0x139b: 0x0272, 0x139c: 0x0293, 0x139d: 0x02e4,
+	0x139e: 0x02cc, 0x139f: 0x0296, 0x13a1: 0x023c, 0x13a2: 0x0248,
+	0x13a4: 0x0287, 0x13a7: 0x024b, 0x13a9: 0x0290,
+	0x13aa: 0x027b, 0x13ab: 0x027e, 0x13ac: 0x0281, 0x13ad: 0x0284, 0x13ae: 0x025d, 0x13af: 0x026f,
+	0x13b0: 0x0275, 0x13b1: 0x0263, 0x13b2: 0x0278, 0x13b4: 0x0260, 0x13b5: 0x0242,
+	0x13b6: 0x0245, 0x13b7: 0x024e, 0x13b9: 0x0266, 0x13bb: 0x0272,
+	// Block 0x4f, offset 0x13c0
+	0x13c2: 0x0248,
+	0x13c7: 0x024b, 0x13c9: 0x0290, 0x13cb: 0x027e,
+	0x13cd: 0x0284, 0x13ce: 0x025d, 0x13cf: 0x026f, 0x13d1: 0x0263,
+	0x13d2: 0x0278, 0x13d4: 0x0260, 0x13d7: 0x024e,
+	0x13d9: 0x0266, 0x13db: 0x0272, 0x13dd: 0x02e4,
+	0x13df: 0x0296, 0x13e1: 0x023c, 0x13e2: 0x0248,
+	0x13e4: 0x0287, 0x13e7: 0x024b, 0x13e8: 0x0269, 0x13e9: 0x0290,
+	0x13ea: 0x027b, 0x13ec: 0x0281, 0x13ed: 0x0284, 0x13ee: 0x025d, 0x13ef: 0x026f,
+	0x13f0: 0x0275, 0x13f1: 0x0263, 0x13f2: 0x0278, 0x13f4: 0x0260, 0x13f5: 0x0242,
+	0x13f6: 0x0245, 0x13f7: 0x024e, 0x13f9: 0x0266, 0x13fa: 0x026c, 0x13fb: 0x0272,
+	0x13fc: 0x0293, 0x13fe: 0x02cc,
+	// Block 0x50, offset 0x1400
+	0x1400: 0x0239, 0x1401: 0x023c, 0x1402: 0x0248, 0x1403: 0x0251, 0x1404: 0x0287, 0x1405: 0x028a,
+	0x1406: 0x025a, 0x1407: 0x024b, 0x1408: 0x0269, 0x1409: 0x0290, 0x140b: 0x027e,
+	0x140c: 0x0281, 0x140d: 0x0284, 0x140e: 0x025d, 0x140f: 0x026f, 0x1410: 0x0275, 0x1411: 0x0263,
+	0x1412: 0x0278, 0x1413: 0x0257, 0x1414: 0x0260, 0x1415: 0x0242, 0x1416: 0x0245, 0x1417: 0x024e,
+	0x1418: 0x0254, 0x1419: 0x0266, 0x141a: 0x026c, 0x141b: 0x0272,
+	0x1421: 0x023c, 0x1422: 0x0248, 0x1423: 0x0251,
+	0x1425: 0x028a, 0x1426: 0x025a, 0x1427: 0x024b, 0x1428: 0x0269, 0x1429: 0x0290,
+	0x142b: 0x027e, 0x142c: 0x0281, 0x142d: 0x0284, 0x142e: 0x025d, 0x142f: 0x026f,
+	0x1430: 0x0275, 0x1431: 0x0263, 0x1432: 0x0278, 0x1433: 0x0257, 0x1434: 0x0260, 0x1435: 0x0242,
+	0x1436: 0x0245, 0x1437: 0x024e, 0x1438: 0x0254, 0x1439: 0x0266, 0x143a: 0x026c, 0x143b: 0x0272,
+	// Block 0x51, offset 0x1440
+	0x1440: 0x1879, 0x1441: 0x1876, 0x1442: 0x187c, 0x1443: 0x18a0, 0x1444: 0x18c4, 0x1445: 0x18e8,
+	0x1446: 0x190c, 0x1447: 0x1915, 0x1448: 0x191b, 0x1449: 0x1921, 0x144a: 0x1927,
+	0x1450: 0x1a8c, 0x1451: 0x1a90,
+	0x1452: 0x1a94, 0x1453: 0x1a98, 0x1454: 0x1a9c, 0x1455: 0x1aa0, 0x1456: 0x1aa4, 0x1457: 0x1aa8,
+	0x1458: 0x1aac, 0x1459: 0x1ab0, 0x145a: 0x1ab4, 0x145b: 0x1ab8, 0x145c: 0x1abc, 0x145d: 0x1ac0,
+	0x145e: 0x1ac4, 0x145f: 0x1ac8, 0x1460: 0x1acc, 0x1461: 0x1ad0, 0x1462: 0x1ad4, 0x1463: 0x1ad8,
+	0x1464: 0x1adc, 0x1465: 0x1ae0, 0x1466: 0x1ae4, 0x1467: 0x1ae8, 0x1468: 0x1aec, 0x1469: 0x1af0,
+	0x146a: 0x271e, 0x146b: 0x0047, 0x146c: 0x0065, 0x146d: 0x193c, 0x146e: 0x19b1,
+	0x1470: 0x0043, 0x1471: 0x0045, 0x1472: 0x0047, 0x1473: 0x0049, 0x1474: 0x004b, 0x1475: 0x004d,
+	0x1476: 0x004f, 0x1477: 0x0051, 0x1478: 0x0053, 0x1479: 0x0055, 0x147a: 0x0057, 0x147b: 0x0059,
+	0x147c: 0x005b, 0x147d: 0x005d, 0x147e: 0x005f, 0x147f: 0x0061,
+	// Block 0x52, offset 0x1480
+	0x1480: 0x26ad, 0x1481: 0x26c2, 0x1482: 0x0503,
+	0x1490: 0x0c0f, 0x1491: 0x0a47,
+	0x1492: 0x08d3, 0x1493: 0x465a, 0x1494: 0x071b, 0x1495: 0x09ef, 0x1496: 0x132f, 0x1497: 0x09ff,
+	0x1498: 0x0727, 0x1499: 0x0cd7, 0x149a: 0x0eaf, 0x149b: 0x0caf, 0x149c: 0x0827, 0x149d: 0x0b6b,
+	0x149e: 0x07bf, 0x149f: 0x0cb7, 0x14a0: 0x0813, 0x14a1: 0x1117, 0x14a2: 0x0f83, 0x14a3: 0x138b,
+	0x14a4: 0x09d3, 0x14a5: 0x090b, 0x14a6: 0x0e63, 0x14a7: 0x0c1b, 0x14a8: 0x0c47, 0x14a9: 0x06bf,
+	0x14aa: 0x06cb, 0x14ab: 0x140b, 0x14ac: 0x0adb, 0x14ad: 0x06e7, 0x14ae: 0x08ef, 0x14af: 0x0c3b,
+	0x14b0: 0x13b3, 0x14b1: 0x0c13, 0x14b2: 0x106f, 0x14b3: 0x10ab, 0x14b4: 0x08f7, 0x14b5: 0x0e43,
+	0x14b6: 0x0d0b, 0x14b7: 0x0d07, 0x14b8: 0x0f97, 0x14b9: 0x082b, 0x14ba: 0x0957, 0x14bb: 0x1443,
+	// Block 0x53, offset 0x14c0
+	0x14c0: 0x06fb, 0x14c1: 0x06f3, 0x14c2: 0x0703, 0x14c3: 0x1647, 0x14c4: 0x0747, 0x14c5: 0x0757,
+	0x14c6: 0x075b, 0x14c7: 0x0763, 0x14c8: 0x076b, 0x14c9: 0x076f, 0x14ca: 0x077b, 0x14cb: 0x0773,
+	0x14cc: 0x05b3, 0x14cd: 0x165b, 0x14ce: 0x078f, 0x14cf: 0x0793, 0x14d0: 0x0797, 0x14d1: 0x07b3,
+	0x14d2: 0x164c, 0x14d3: 0x05b7, 0x14d4: 0x079f, 0x14d5: 0x07bf, 0x14d6: 0x1656, 0x14d7: 0x07cf,
+	0x14d8: 0x07d7, 0x14d9: 0x0737, 0x14da: 0x07df, 0x14db: 0x07e3, 0x14dc: 0x1831, 0x14dd: 0x07ff,
+	0x14de: 0x0807, 0x14df: 0x05bf, 0x14e0: 0x081f, 0x14e1: 0x0823, 0x14e2: 0x082b, 0x14e3: 0x082f,
+	0x14e4: 0x05c3, 0x14e5: 0x0847, 0x14e6: 0x084b, 0x14e7: 0x0857, 0x14e8: 0x0863, 0x14e9: 0x0867,
+	0x14ea: 0x086b, 0x14eb: 0x0873, 0x14ec: 0x0893, 0x14ed: 0x0897, 0x14ee: 0x089f, 0x14ef: 0x08af,
+	0x14f0: 0x08b7, 0x14f1: 0x08bb, 0x14f2: 0x08bb, 0x14f3: 0x08bb, 0x14f4: 0x166a, 0x14f5: 0x0e93,
+	0x14f6: 0x08cf, 0x14f7: 0x08d7, 0x14f8: 0x166f, 0x14f9: 0x08e3, 0x14fa: 0x08eb, 0x14fb: 0x08f3,
+	0x14fc: 0x091b, 0x14fd: 0x0907, 0x14fe: 0x0913, 0x14ff: 0x0917,
+	// Block 0x54, offset 0x1500
+	0x1500: 0x091f, 0x1501: 0x0927, 0x1502: 0x092b, 0x1503: 0x0933, 0x1504: 0x093b, 0x1505: 0x093f,
+	0x1506: 0x093f, 0x1507: 0x0947, 0x1508: 0x094f, 0x1509: 0x0953, 0x150a: 0x095f, 0x150b: 0x0983,
+	0x150c: 0x0967, 0x150d: 0x0987, 0x150e: 0x096b, 0x150f: 0x0973, 0x1510: 0x080b, 0x1511: 0x09cf,
+	0x1512: 0x0997, 0x1513: 0x099b, 0x1514: 0x099f, 0x1515: 0x0993, 0x1516: 0x09a7, 0x1517: 0x09a3,
+	0x1518: 0x09bb, 0x1519: 0x1674, 0x151a: 0x09d7, 0x151b: 0x09db, 0x151c: 0x09e3, 0x151d: 0x09ef,
+	0x151e: 0x09f7, 0x151f: 0x0a13, 0x1520: 0x1679, 0x1521: 0x167e, 0x1522: 0x0a1f, 0x1523: 0x0a23,
+	0x1524: 0x0a27, 0x1525: 0x0a1b, 0x1526: 0x0a2f, 0x1527: 0x05c7, 0x1528: 0x05cb, 0x1529: 0x0a37,
+	0x152a: 0x0a3f, 0x152b: 0x0a3f, 0x152c: 0x1683, 0x152d: 0x0a5b, 0x152e: 0x0a5f, 0x152f: 0x0a63,
+	0x1530: 0x0a6b, 0x1531: 0x1688, 0x1532: 0x0a73, 0x1533: 0x0a77, 0x1534: 0x0b4f, 0x1535: 0x0a7f,
+	0x1536: 0x05cf, 0x1537: 0x0a8b, 0x1538: 0x0a9b, 0x1539: 0x0aa7, 0x153a: 0x0aa3, 0x153b: 0x1692,
+	0x153c: 0x0aaf, 0x153d: 0x1697, 0x153e: 0x0abb, 0x153f: 0x0ab7,
+	// Block 0x55, offset 0x1540
+	0x1540: 0x0abf, 0x1541: 0x0acf, 0x1542: 0x0ad3, 0x1543: 0x05d3, 0x1544: 0x0ae3, 0x1545: 0x0aeb,
+	0x1546: 0x0aef, 0x1547: 0x0af3, 0x1548: 0x05d7, 0x1549: 0x169c, 0x154a: 0x05db, 0x154b: 0x0b0f,
+	0x154c: 0x0b13, 0x154d: 0x0b17, 0x154e: 0x0b1f, 0x154f: 0x1863, 0x1550: 0x0b37, 0x1551: 0x16a6,
+	0x1552: 0x16a6, 0x1553: 0x11d7, 0x1554: 0x0b47, 0x1555: 0x0b47, 0x1556: 0x05df, 0x1557: 0x16c9,
+	0x1558: 0x179b, 0x1559: 0x0b57, 0x155a: 0x0b5f, 0x155b: 0x05e3, 0x155c: 0x0b73, 0x155d: 0x0b83,
+	0x155e: 0x0b87, 0x155f: 0x0b8f, 0x1560: 0x0b9f, 0x1561: 0x05eb, 0x1562: 0x05e7, 0x1563: 0x0ba3,
+	0x1564: 0x16ab, 0x1565: 0x0ba7, 0x1566: 0x0bbb, 0x1567: 0x0bbf, 0x1568: 0x0bc3, 0x1569: 0x0bbf,
+	0x156a: 0x0bcf, 0x156b: 0x0bd3, 0x156c: 0x0be3, 0x156d: 0x0bdb, 0x156e: 0x0bdf, 0x156f: 0x0be7,
+	0x1570: 0x0beb, 0x1571: 0x0bef, 0x1572: 0x0bfb, 0x1573: 0x0bff, 0x1574: 0x0c17, 0x1575: 0x0c1f,
+	0x1576: 0x0c2f, 0x1577: 0x0c43, 0x1578: 0x16ba, 0x1579: 0x0c3f, 0x157a: 0x0c33, 0x157b: 0x0c4b,
+	0x157c: 0x0c53, 0x157d: 0x0c67, 0x157e: 0x16bf, 0x157f: 0x0c6f,
+	// Block 0x56, offset 0x1580
+	0x1580: 0x0c63, 0x1581: 0x0c5b, 0x1582: 0x05ef, 0x1583: 0x0c77, 0x1584: 0x0c7f, 0x1585: 0x0c87,
+	0x1586: 0x0c7b, 0x1587: 0x05f3, 0x1588: 0x0c97, 0x1589: 0x0c9f, 0x158a: 0x16c4, 0x158b: 0x0ccb,
+	0x158c: 0x0cff, 0x158d: 0x0cdb, 0x158e: 0x05ff, 0x158f: 0x0ce7, 0x1590: 0x05fb, 0x1591: 0x05f7,
+	0x1592: 0x07c3, 0x1593: 0x07c7, 0x1594: 0x0d03, 0x1595: 0x0ceb, 0x1596: 0x11ab, 0x1597: 0x0663,
+	0x1598: 0x0d0f, 0x1599: 0x0d13, 0x159a: 0x0d17, 0x159b: 0x0d2b, 0x159c: 0x0d23, 0x159d: 0x16dd,
+	0x159e: 0x0603, 0x159f: 0x0d3f, 0x15a0: 0x0d33, 0x15a1: 0x0d4f, 0x15a2: 0x0d57, 0x15a3: 0x16e7,
+	0x15a4: 0x0d5b, 0x15a5: 0x0d47, 0x15a6: 0x0d63, 0x15a7: 0x0607, 0x15a8: 0x0d67, 0x15a9: 0x0d6b,
+	0x15aa: 0x0d6f, 0x15ab: 0x0d7b, 0x15ac: 0x16ec, 0x15ad: 0x0d83, 0x15ae: 0x060b, 0x15af: 0x0d8f,
+	0x15b0: 0x16f1, 0x15b1: 0x0d93, 0x15b2: 0x060f, 0x15b3: 0x0d9f, 0x15b4: 0x0dab, 0x15b5: 0x0db7,
+	0x15b6: 0x0dbb, 0x15b7: 0x16f6, 0x15b8: 0x168d, 0x15b9: 0x16fb, 0x15ba: 0x0ddb, 0x15bb: 0x1700,
+	0x15bc: 0x0de7, 0x15bd: 0x0def, 0x15be: 0x0ddf, 0x15bf: 0x0dfb,
+	// Block 0x57, offset 0x15c0
+	0x15c0: 0x0e0b, 0x15c1: 0x0e1b, 0x15c2: 0x0e0f, 0x15c3: 0x0e13, 0x15c4: 0x0e1f, 0x15c5: 0x0e23,
+	0x15c6: 0x1705, 0x15c7: 0x0e07, 0x15c8: 0x0e3b, 0x15c9: 0x0e3f, 0x15ca: 0x0613, 0x15cb: 0x0e53,
+	0x15cc: 0x0e4f, 0x15cd: 0x170a, 0x15ce: 0x0e33, 0x15cf: 0x0e6f, 0x15d0: 0x170f, 0x15d1: 0x1714,
+	0x15d2: 0x0e73, 0x15d3: 0x0e87, 0x15d4: 0x0e83, 0x15d5: 0x0e7f, 0x15d6: 0x0617, 0x15d7: 0x0e8b,
+	0x15d8: 0x0e9b, 0x15d9: 0x0e97, 0x15da: 0x0ea3, 0x15db: 0x1651, 0x15dc: 0x0eb3, 0x15dd: 0x1719,
+	0x15de: 0x0ebf, 0x15df: 0x1723, 0x15e0: 0x0ed3, 0x15e1: 0x0edf, 0x15e2: 0x0ef3, 0x15e3: 0x1728,
+	0x15e4: 0x0f07, 0x15e5: 0x0f0b, 0x15e6: 0x172d, 0x15e7: 0x1732, 0x15e8: 0x0f27, 0x15e9: 0x0f37,
+	0x15ea: 0x061b, 0x15eb: 0x0f3b, 0x15ec: 0x061f, 0x15ed: 0x061f, 0x15ee: 0x0f53, 0x15ef: 0x0f57,
+	0x15f0: 0x0f5f, 0x15f1: 0x0f63, 0x15f2: 0x0f6f, 0x15f3: 0x0623, 0x15f4: 0x0f87, 0x15f5: 0x1737,
+	0x15f6: 0x0fa3, 0x15f7: 0x173c, 0x15f8: 0x0faf, 0x15f9: 0x16a1, 0x15fa: 0x0fbf, 0x15fb: 0x1741,
+	0x15fc: 0x1746, 0x15fd: 0x174b, 0x15fe: 0x0627, 0x15ff: 0x062b,
+	// Block 0x58, offset 0x1600
+	0x1600: 0x0ff7, 0x1601: 0x1755, 0x1602: 0x1750, 0x1603: 0x175a, 0x1604: 0x175f, 0x1605: 0x0fff,
+	0x1606: 0x1003, 0x1607: 0x1003, 0x1608: 0x100b, 0x1609: 0x0633, 0x160a: 0x100f, 0x160b: 0x0637,
+	0x160c: 0x063b, 0x160d: 0x1769, 0x160e: 0x1023, 0x160f: 0x102b, 0x1610: 0x1037, 0x1611: 0x063f,
+	0x1612: 0x176e, 0x1613: 0x105b, 0x1614: 0x1773, 0x1615: 0x1778, 0x1616: 0x107b, 0x1617: 0x1093,
+	0x1618: 0x0643, 0x1619: 0x109b, 0x161a: 0x109f, 0x161b: 0x10a3, 0x161c: 0x177d, 0x161d: 0x1782,
+	0x161e: 0x1782, 0x161f: 0x10bb, 0x1620: 0x0647, 0x1621: 0x1787, 0x1622: 0x10cf, 0x1623: 0x10d3,
+	0x1624: 0x064b, 0x1625: 0x178c, 0x1626: 0x10ef, 0x1627: 0x064f, 0x1628: 0x10ff, 0x1629: 0x10f7,
+	0x162a: 0x1107, 0x162b: 0x1796, 0x162c: 0x111f, 0x162d: 0x0653, 0x162e: 0x112b, 0x162f: 0x1133,
+	0x1630: 0x1143, 0x1631: 0x0657, 0x1632: 0x17a0, 0x1633: 0x17a5, 0x1634: 0x065b, 0x1635: 0x17aa,
+	0x1636: 0x115b, 0x1637: 0x17af, 0x1638: 0x1167, 0x1639: 0x1173, 0x163a: 0x117b, 0x163b: 0x17b4,
+	0x163c: 0x17b9, 0x163d: 0x118f, 0x163e: 0x17be, 0x163f: 0x1197,
+	// Block 0x59, offset 0x1640
+	0x1640: 0x16ce, 0x1641: 0x065f, 0x1642: 0x11af, 0x1643: 0x11b3, 0x1644: 0x0667, 0x1645: 0x11b7,
+	0x1646: 0x0a33, 0x1647: 0x17c3, 0x1648: 0x17c8, 0x1649: 0x16d3, 0x164a: 0x16d8, 0x164b: 0x11d7,
+	0x164c: 0x11db, 0x164d: 0x13f3, 0x164e: 0x066b, 0x164f: 0x1207, 0x1650: 0x1203, 0x1651: 0x120b,
+	0x1652: 0x083f, 0x1653: 0x120f, 0x1654: 0x1213, 0x1655: 0x1217, 0x1656: 0x121f, 0x1657: 0x17cd,
+	0x1658: 0x121b, 0x1659: 0x1223, 0x165a: 0x1237, 0x165b: 0x123b, 0x165c: 0x1227, 0x165d: 0x123f,
+	0x165e: 0x1253, 0x165f: 0x1267, 0x1660: 0x1233, 0x1661: 0x1247, 0x1662: 0x124b, 0x1663: 0x124f,
+	0x1664: 0x17d2, 0x1665: 0x17dc, 0x1666: 0x17d7, 0x1667: 0x066f, 0x1668: 0x126f, 0x1669: 0x1273,
+	0x166a: 0x127b, 0x166b: 0x17f0, 0x166c: 0x127f, 0x166d: 0x17e1, 0x166e: 0x0673, 0x166f: 0x0677,
+	0x1670: 0x17e6, 0x1671: 0x17eb, 0x1672: 0x067b, 0x1673: 0x129f, 0x1674: 0x12a3, 0x1675: 0x12a7,
+	0x1676: 0x12ab, 0x1677: 0x12b7, 0x1678: 0x12b3, 0x1679: 0x12bf, 0x167a: 0x12bb, 0x167b: 0x12cb,
+	0x167c: 0x12c3, 0x167d: 0x12c7, 0x167e: 0x12cf, 0x167f: 0x067f,
+	// Block 0x5a, offset 0x1680
+	0x1680: 0x12d7, 0x1681: 0x12db, 0x1682: 0x0683, 0x1683: 0x12eb, 0x1684: 0x12ef, 0x1685: 0x17f5,
+	0x1686: 0x12fb, 0x1687: 0x12ff, 0x1688: 0x0687, 0x1689: 0x130b, 0x168a: 0x05bb, 0x168b: 0x17fa,
+	0x168c: 0x17ff, 0x168d: 0x068b, 0x168e: 0x068f, 0x168f: 0x1337, 0x1690: 0x134f, 0x1691: 0x136b,
+	0x1692: 0x137b, 0x1693: 0x1804, 0x1694: 0x138f, 0x1695: 0x1393, 0x1696: 0x13ab, 0x1697: 0x13b7,
+	0x1698: 0x180e, 0x1699: 0x1660, 0x169a: 0x13c3, 0x169b: 0x13bf, 0x169c: 0x13cb, 0x169d: 0x1665,
+	0x169e: 0x13d7, 0x169f: 0x13e3, 0x16a0: 0x1813, 0x16a1: 0x1818, 0x16a2: 0x1423, 0x16a3: 0x142f,
+	0x16a4: 0x1437, 0x16a5: 0x181d, 0x16a6: 0x143b, 0x16a7: 0x1467, 0x16a8: 0x1473, 0x16a9: 0x1477,
+	0x16aa: 0x146f, 0x16ab: 0x1483, 0x16ac: 0x1487, 0x16ad: 0x1822, 0x16ae: 0x1493, 0x16af: 0x0693,
+	0x16b0: 0x149b, 0x16b1: 0x1827, 0x16b2: 0x0697, 0x16b3: 0x14d3, 0x16b4: 0x0ac3, 0x16b5: 0x14eb,
+	0x16b6: 0x182c, 0x16b7: 0x1836, 0x16b8: 0x069b, 0x16b9: 0x069f, 0x16ba: 0x1513, 0x16bb: 0x183b,
+	0x16bc: 0x06a3, 0x16bd: 0x1840, 0x16be: 0x152b, 0x16bf: 0x152b,
+	// Block 0x5b, offset 0x16c0
+	0x16c0: 0x1533, 0x16c1: 0x1845, 0x16c2: 0x154b, 0x16c3: 0x06a7, 0x16c4: 0x155b, 0x16c5: 0x1567,
+	0x16c6: 0x156f, 0x16c7: 0x1577, 0x16c8: 0x06ab, 0x16c9: 0x184a, 0x16ca: 0x158b, 0x16cb: 0x15a7,
+	0x16cc: 0x15b3, 0x16cd: 0x06af, 0x16ce: 0x06b3, 0x16cf: 0x15b7, 0x16d0: 0x184f, 0x16d1: 0x06b7,
+	0x16d2: 0x1854, 0x16d3: 0x1859, 0x16d4: 0x185e, 0x16d5: 0x15db, 0x16d6: 0x06bb, 0x16d7: 0x15ef,
+	0x16d8: 0x15f7, 0x16d9: 0x15fb, 0x16da: 0x1603, 0x16db: 0x160b, 0x16dc: 0x1613, 0x16dd: 0x1868,
+}
+
+// nfkcIndex: 22 blocks, 1408 entries, 1408 bytes
+// Block 0 is the zero block.
+var nfkcIndex = [1408]uint8{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x5a, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x5b, 0xc7: 0x04,
+	0xc8: 0x05, 0xca: 0x5c, 0xcb: 0x5d, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x09,
+	0xd0: 0x0a, 0xd1: 0x5e, 0xd2: 0x5f, 0xd3: 0x0b, 0xd6: 0x0c, 0xd7: 0x60,
+	0xd8: 0x61, 0xd9: 0x0d, 0xdb: 0x62, 0xdc: 0x63, 0xdd: 0x64, 0xdf: 0x65,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
+	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
+	0xf0: 0x13,
+	// Block 0x4, offset 0x100
+	0x120: 0x66, 0x121: 0x67, 0x123: 0x68, 0x124: 0x69, 0x125: 0x6a, 0x126: 0x6b, 0x127: 0x6c,
+	0x128: 0x6d, 0x129: 0x6e, 0x12a: 0x6f, 0x12b: 0x70, 0x12c: 0x6b, 0x12d: 0x71, 0x12e: 0x72, 0x12f: 0x73,
+	0x131: 0x74, 0x132: 0x75, 0x133: 0x76, 0x134: 0x77, 0x135: 0x78, 0x137: 0x79,
+	0x138: 0x7a, 0x139: 0x7b, 0x13a: 0x7c, 0x13b: 0x7d, 0x13c: 0x7e, 0x13d: 0x7f, 0x13e: 0x80, 0x13f: 0x81,
+	// Block 0x5, offset 0x140
+	0x140: 0x82, 0x142: 0x83, 0x143: 0x84, 0x144: 0x85, 0x145: 0x86, 0x146: 0x87, 0x147: 0x88,
+	0x14d: 0x89,
+	0x15c: 0x8a, 0x15f: 0x8b,
+	0x162: 0x8c, 0x164: 0x8d,
+	0x168: 0x8e, 0x169: 0x8f, 0x16a: 0x90, 0x16c: 0x0e, 0x16d: 0x91, 0x16e: 0x92, 0x16f: 0x93,
+	0x170: 0x94, 0x173: 0x95, 0x174: 0x96, 0x175: 0x0f, 0x176: 0x10, 0x177: 0x97,
+	0x178: 0x11, 0x179: 0x12, 0x17a: 0x13, 0x17b: 0x14, 0x17c: 0x15, 0x17d: 0x16, 0x17e: 0x17, 0x17f: 0x18,
+	// Block 0x6, offset 0x180
+	0x180: 0x98, 0x181: 0x99, 0x182: 0x9a, 0x183: 0x9b, 0x184: 0x19, 0x185: 0x1a, 0x186: 0x9c, 0x187: 0x9d,
+	0x188: 0x9e, 0x189: 0x1b, 0x18a: 0x1c, 0x18b: 0x9f, 0x18c: 0xa0,
+	0x191: 0x1d, 0x192: 0x1e, 0x193: 0xa1,
+	0x1a8: 0xa2, 0x1a9: 0xa3, 0x1ab: 0xa4,
+	0x1b1: 0xa5, 0x1b3: 0xa6, 0x1b5: 0xa7, 0x1b7: 0xa8,
+	0x1ba: 0xa9, 0x1bb: 0xaa, 0x1bc: 0x1f, 0x1bd: 0x20, 0x1be: 0x21, 0x1bf: 0xab,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0xac, 0x1c1: 0x22, 0x1c2: 0x23, 0x1c3: 0x24, 0x1c4: 0xad, 0x1c5: 0x25, 0x1c6: 0x26,
+	0x1c8: 0x27, 0x1c9: 0x28, 0x1ca: 0x29, 0x1cb: 0x2a, 0x1cc: 0x2b, 0x1cd: 0x2c, 0x1ce: 0x2d, 0x1cf: 0x2e,
+	// Block 0x8, offset 0x200
+	0x219: 0xae, 0x21a: 0xaf, 0x21b: 0xb0, 0x21d: 0xb1, 0x21f: 0xb2,
+	0x220: 0xb3, 0x223: 0xb4, 0x224: 0xb5, 0x225: 0xb6, 0x226: 0xb7, 0x227: 0xb8,
+	0x22a: 0xb9, 0x22b: 0xba, 0x22d: 0xbb, 0x22f: 0xbc,
+	0x230: 0xbd, 0x231: 0xbe, 0x232: 0xbf, 0x233: 0xc0, 0x234: 0xc1, 0x235: 0xc2, 0x236: 0xc3, 0x237: 0xbd,
+	0x238: 0xbe, 0x239: 0xbf, 0x23a: 0xc0, 0x23b: 0xc1, 0x23c: 0xc2, 0x23d: 0xc3, 0x23e: 0xbd, 0x23f: 0xbe,
+	// Block 0x9, offset 0x240
+	0x240: 0xbf, 0x241: 0xc0, 0x242: 0xc1, 0x243: 0xc2, 0x244: 0xc3, 0x245: 0xbd, 0x246: 0xbe, 0x247: 0xbf,
+	0x248: 0xc0, 0x249: 0xc1, 0x24a: 0xc2, 0x24b: 0xc3, 0x24c: 0xbd, 0x24d: 0xbe, 0x24e: 0xbf, 0x24f: 0xc0,
+	0x250: 0xc1, 0x251: 0xc2, 0x252: 0xc3, 0x253: 0xbd, 0x254: 0xbe, 0x255: 0xbf, 0x256: 0xc0, 0x257: 0xc1,
+	0x258: 0xc2, 0x259: 0xc3, 0x25a: 0xbd, 0x25b: 0xbe, 0x25c: 0xbf, 0x25d: 0xc0, 0x25e: 0xc1, 0x25f: 0xc2,
+	0x260: 0xc3, 0x261: 0xbd, 0x262: 0xbe, 0x263: 0xbf, 0x264: 0xc0, 0x265: 0xc1, 0x266: 0xc2, 0x267: 0xc3,
+	0x268: 0xbd, 0x269: 0xbe, 0x26a: 0xbf, 0x26b: 0xc0, 0x26c: 0xc1, 0x26d: 0xc2, 0x26e: 0xc3, 0x26f: 0xbd,
+	0x270: 0xbe, 0x271: 0xbf, 0x272: 0xc0, 0x273: 0xc1, 0x274: 0xc2, 0x275: 0xc3, 0x276: 0xbd, 0x277: 0xbe,
+	0x278: 0xbf, 0x279: 0xc0, 0x27a: 0xc1, 0x27b: 0xc2, 0x27c: 0xc3, 0x27d: 0xbd, 0x27e: 0xbe, 0x27f: 0xbf,
+	// Block 0xa, offset 0x280
+	0x280: 0xc0, 0x281: 0xc1, 0x282: 0xc2, 0x283: 0xc3, 0x284: 0xbd, 0x285: 0xbe, 0x286: 0xbf, 0x287: 0xc0,
+	0x288: 0xc1, 0x289: 0xc2, 0x28a: 0xc3, 0x28b: 0xbd, 0x28c: 0xbe, 0x28d: 0xbf, 0x28e: 0xc0, 0x28f: 0xc1,
+	0x290: 0xc2, 0x291: 0xc3, 0x292: 0xbd, 0x293: 0xbe, 0x294: 0xbf, 0x295: 0xc0, 0x296: 0xc1, 0x297: 0xc2,
+	0x298: 0xc3, 0x299: 0xbd, 0x29a: 0xbe, 0x29b: 0xbf, 0x29c: 0xc0, 0x29d: 0xc1, 0x29e: 0xc2, 0x29f: 0xc3,
+	0x2a0: 0xbd, 0x2a1: 0xbe, 0x2a2: 0xbf, 0x2a3: 0xc0, 0x2a4: 0xc1, 0x2a5: 0xc2, 0x2a6: 0xc3, 0x2a7: 0xbd,
+	0x2a8: 0xbe, 0x2a9: 0xbf, 0x2aa: 0xc0, 0x2ab: 0xc1, 0x2ac: 0xc2, 0x2ad: 0xc3, 0x2ae: 0xbd, 0x2af: 0xbe,
+	0x2b0: 0xbf, 0x2b1: 0xc0, 0x2b2: 0xc1, 0x2b3: 0xc2, 0x2b4: 0xc3, 0x2b5: 0xbd, 0x2b6: 0xbe, 0x2b7: 0xbf,
+	0x2b8: 0xc0, 0x2b9: 0xc1, 0x2ba: 0xc2, 0x2bb: 0xc3, 0x2bc: 0xbd, 0x2bd: 0xbe, 0x2be: 0xbf, 0x2bf: 0xc0,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0xc1, 0x2c1: 0xc2, 0x2c2: 0xc3, 0x2c3: 0xbd, 0x2c4: 0xbe, 0x2c5: 0xbf, 0x2c6: 0xc0, 0x2c7: 0xc1,
+	0x2c8: 0xc2, 0x2c9: 0xc3, 0x2ca: 0xbd, 0x2cb: 0xbe, 0x2cc: 0xbf, 0x2cd: 0xc0, 0x2ce: 0xc1, 0x2cf: 0xc2,
+	0x2d0: 0xc3, 0x2d1: 0xbd, 0x2d2: 0xbe, 0x2d3: 0xbf, 0x2d4: 0xc0, 0x2d5: 0xc1, 0x2d6: 0xc2, 0x2d7: 0xc3,
+	0x2d8: 0xbd, 0x2d9: 0xbe, 0x2da: 0xbf, 0x2db: 0xc0, 0x2dc: 0xc1, 0x2dd: 0xc2, 0x2de: 0xc4,
+	// Block 0xc, offset 0x300
+	0x324: 0x2f, 0x325: 0x30, 0x326: 0x31, 0x327: 0x32,
+	0x328: 0x33, 0x329: 0x34, 0x32a: 0x35, 0x32b: 0x36, 0x32c: 0x37, 0x32d: 0x38, 0x32e: 0x39, 0x32f: 0x3a,
+	0x330: 0x3b, 0x331: 0x3c, 0x332: 0x3d, 0x333: 0x3e, 0x334: 0x3f, 0x335: 0x40, 0x336: 0x41, 0x337: 0x42,
+	0x338: 0x43, 0x339: 0x44, 0x33a: 0x45, 0x33b: 0x46, 0x33c: 0xc5, 0x33d: 0x47, 0x33e: 0x48, 0x33f: 0x49,
+	// Block 0xd, offset 0x340
+	0x347: 0xc6,
+	0x34b: 0xc7, 0x34d: 0xc8,
+	0x368: 0xc9, 0x36b: 0xca,
+	// Block 0xe, offset 0x380
+	0x381: 0xcb, 0x382: 0xcc, 0x384: 0xcd, 0x385: 0xb7, 0x387: 0xce,
+	0x388: 0xcf, 0x38b: 0xd0, 0x38c: 0x6b, 0x38d: 0xd1,
+	0x391: 0xd2, 0x392: 0xd3, 0x393: 0xd4, 0x396: 0xd5, 0x397: 0xd6,
+	0x398: 0xd7, 0x39a: 0xd8, 0x39c: 0xd9,
+	0x3b0: 0xd7,
+	// Block 0xf, offset 0x3c0
+	0x3eb: 0xda, 0x3ec: 0xdb,
+	// Block 0x10, offset 0x400
+	0x432: 0xdc,
+	// Block 0x11, offset 0x440
+	0x445: 0xdd, 0x446: 0xde, 0x447: 0xdf,
+	0x449: 0xe0,
+	0x450: 0xe1, 0x451: 0xe2, 0x452: 0xe3, 0x453: 0xe4, 0x454: 0xe5, 0x455: 0xe6, 0x456: 0xe7, 0x457: 0xe8,
+	0x458: 0xe9, 0x459: 0xea, 0x45a: 0x4a, 0x45b: 0xeb, 0x45c: 0xec, 0x45d: 0xed, 0x45e: 0xee, 0x45f: 0x4b,
+	// Block 0x12, offset 0x480
+	0x480: 0xef,
+	0x4a3: 0xf0, 0x4a5: 0xf1,
+	0x4b8: 0x4c, 0x4b9: 0x4d, 0x4ba: 0x4e,
+	// Block 0x13, offset 0x4c0
+	0x4c4: 0x4f, 0x4c5: 0xf2, 0x4c6: 0xf3,
+	0x4c8: 0x50, 0x4c9: 0xf4,
+	// Block 0x14, offset 0x500
+	0x520: 0x51, 0x521: 0x52, 0x522: 0x53, 0x523: 0x54, 0x524: 0x55, 0x525: 0x56, 0x526: 0x57, 0x527: 0x58,
+	0x528: 0x59,
+	// Block 0x15, offset 0x540
+	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
+	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
+	0x56f: 0x12,
+}
+
+// nfkcSparseOffset: 155 entries, 310 bytes
+var nfkcSparseOffset = []uint16{0x0, 0xe, 0x12, 0x1b, 0x25, 0x35, 0x37, 0x3c, 0x47, 0x56, 0x63, 0x6b, 0x6f, 0x74, 0x76, 0x87, 0x8f, 0x96, 0x99, 0xa0, 0xa4, 0xa8, 0xaa, 0xac, 0xb5, 0xb9, 0xc0, 0xc5, 0xc8, 0xd2, 0xd4, 0xdb, 0xe3, 0xe7, 0xe9, 0xec, 0xf0, 0xf6, 0x107, 0x113, 0x115, 0x11b, 0x11d, 0x11f, 0x121, 0x123, 0x125, 0x127, 0x129, 0x12c, 0x12f, 0x131, 0x134, 0x137, 0x13b, 0x140, 0x149, 0x14b, 0x14e, 0x150, 0x15b, 0x166, 0x176, 0x184, 0x192, 0x1a2, 0x1b0, 0x1b7, 0x1bd, 0x1cc, 0x1d0, 0x1d2, 0x1d6, 0x1d8, 0x1db, 0x1dd, 0x1e0, 0x1e2, 0x1e5, 0x1e7, 0x1e9, 0x1eb, 0x1f7, 0x201, 0x20b, 0x20e, 0x212, 0x214, 0x216, 0x218, 0x21a, 0x21d, 0x21f, 0x221, 0x223, 0x225, 0x22b, 0x22e, 0x232, 0x234, 0x23b, 0x241, 0x247, 0x24f, 0x255, 0x25b, 0x261, 0x265, 0x267, 0x269, 0x26b, 0x26d, 0x273, 0x276, 0x279, 0x281, 0x288, 0x28b, 0x28e, 0x290, 0x298, 0x29b, 0x2a2, 0x2a5, 0x2ab, 0x2ad, 0x2af, 0x2b2, 0x2b4, 0x2b6, 0x2b8, 0x2ba, 0x2c7, 0x2d1, 0x2d3, 0x2d5, 0x2d9, 0x2de, 0x2ea, 0x2ef, 0x2f8, 0x2fe, 0x303, 0x307, 0x30c, 0x310, 0x320, 0x32e, 0x33c, 0x34a, 0x350, 0x352, 0x355, 0x35f, 0x361}
+
+// nfkcSparseValues: 875 entries, 3500 bytes
+var nfkcSparseValues = [875]valueRange{
+	// Block 0x0, offset 0x0
+	{value: 0x0002, lo: 0x0d},
+	{value: 0x0001, lo: 0xa0, hi: 0xa0},
+	{value: 0x4278, lo: 0xa8, hi: 0xa8},
+	{value: 0x0083, lo: 0xaa, hi: 0xaa},
+	{value: 0x4264, lo: 0xaf, hi: 0xaf},
+	{value: 0x0025, lo: 0xb2, hi: 0xb3},
+	{value: 0x425a, lo: 0xb4, hi: 0xb4},
+	{value: 0x01dc, lo: 0xb5, hi: 0xb5},
+	{value: 0x4291, lo: 0xb8, hi: 0xb8},
+	{value: 0x0023, lo: 0xb9, hi: 0xb9},
+	{value: 0x009f, lo: 0xba, hi: 0xba},
+	{value: 0x221c, lo: 0xbc, hi: 0xbc},
+	{value: 0x2210, lo: 0xbd, hi: 0xbd},
+	{value: 0x22b2, lo: 0xbe, hi: 0xbe},
+	// Block 0x1, offset 0xe
+	{value: 0x0091, lo: 0x03},
+	{value: 0x4778, lo: 0xa0, hi: 0xa1},
+	{value: 0x47aa, lo: 0xaf, hi: 0xb0},
+	{value: 0xa000, lo: 0xb7, hi: 0xb7},
+	// Block 0x2, offset 0x12
+	{value: 0x0003, lo: 0x08},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x0091, lo: 0xb0, hi: 0xb0},
+	{value: 0x0119, lo: 0xb1, hi: 0xb1},
+	{value: 0x0095, lo: 0xb2, hi: 0xb2},
+	{value: 0x00a5, lo: 0xb3, hi: 0xb3},
+	{value: 0x0143, lo: 0xb4, hi: 0xb6},
+	{value: 0x00af, lo: 0xb7, hi: 0xb7},
+	{value: 0x00b3, lo: 0xb8, hi: 0xb8},
+	// Block 0x3, offset 0x1b
+	{value: 0x000a, lo: 0x09},
+	{value: 0x426e, lo: 0x98, hi: 0x98},
+	{value: 0x4273, lo: 0x99, hi: 0x9a},
+	{value: 0x4296, lo: 0x9b, hi: 0x9b},
+	{value: 0x425f, lo: 0x9c, hi: 0x9c},
+	{value: 0x4282, lo: 0x9d, hi: 0x9d},
+	{value: 0x0113, lo: 0xa0, hi: 0xa0},
+	{value: 0x0099, lo: 0xa1, hi: 0xa1},
+	{value: 0x00a7, lo: 0xa2, hi: 0xa3},
+	{value: 0x0167, lo: 0xa4, hi: 0xa4},
+	// Block 0x4, offset 0x25
+	{value: 0x0000, lo: 0x0f},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0xa000, lo: 0x8d, hi: 0x8d},
+	{value: 0x37a5, lo: 0x90, hi: 0x90},
+	{value: 0x37b1, lo: 0x91, hi: 0x91},
+	{value: 0x379f, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x96, hi: 0x96},
+	{value: 0x3817, lo: 0x97, hi: 0x97},
+	{value: 0x37e1, lo: 0x9c, hi: 0x9c},
+	{value: 0x37c9, lo: 0x9d, hi: 0x9d},
+	{value: 0x37f3, lo: 0x9e, hi: 0x9e},
+	{value: 0xa000, lo: 0xb4, hi: 0xb5},
+	{value: 0x381d, lo: 0xb6, hi: 0xb6},
+	{value: 0x3823, lo: 0xb7, hi: 0xb7},
+	// Block 0x5, offset 0x35
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x83, hi: 0x87},
+	// Block 0x6, offset 0x37
+	{value: 0x0001, lo: 0x04},
+	{value: 0x8113, lo: 0x81, hi: 0x82},
+	{value: 0x8132, lo: 0x84, hi: 0x84},
+	{value: 0x812d, lo: 0x85, hi: 0x85},
+	{value: 0x810d, lo: 0x87, hi: 0x87},
+	// Block 0x7, offset 0x3c
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8132, lo: 0x90, hi: 0x97},
+	{value: 0x8119, lo: 0x98, hi: 0x98},
+	{value: 0x811a, lo: 0x99, hi: 0x99},
+	{value: 0x811b, lo: 0x9a, hi: 0x9a},
+	{value: 0x3841, lo: 0xa2, hi: 0xa2},
+	{value: 0x3847, lo: 0xa3, hi: 0xa3},
+	{value: 0x3853, lo: 0xa4, hi: 0xa4},
+	{value: 0x384d, lo: 0xa5, hi: 0xa5},
+	{value: 0x3859, lo: 0xa6, hi: 0xa6},
+	{value: 0xa000, lo: 0xa7, hi: 0xa7},
+	// Block 0x8, offset 0x47
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x386b, lo: 0x80, hi: 0x80},
+	{value: 0xa000, lo: 0x81, hi: 0x81},
+	{value: 0x385f, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x3865, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x95, hi: 0x95},
+	{value: 0x8132, lo: 0x96, hi: 0x9c},
+	{value: 0x8132, lo: 0x9f, hi: 0xa2},
+	{value: 0x812d, lo: 0xa3, hi: 0xa3},
+	{value: 0x8132, lo: 0xa4, hi: 0xa4},
+	{value: 0x8132, lo: 0xa7, hi: 0xa8},
+	{value: 0x812d, lo: 0xaa, hi: 0xaa},
+	{value: 0x8132, lo: 0xab, hi: 0xac},
+	{value: 0x812d, lo: 0xad, hi: 0xad},
+	// Block 0x9, offset 0x56
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x811f, lo: 0x91, hi: 0x91},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	{value: 0x812d, lo: 0xb1, hi: 0xb1},
+	{value: 0x8132, lo: 0xb2, hi: 0xb3},
+	{value: 0x812d, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb5, hi: 0xb6},
+	{value: 0x812d, lo: 0xb7, hi: 0xb9},
+	{value: 0x8132, lo: 0xba, hi: 0xba},
+	{value: 0x812d, lo: 0xbb, hi: 0xbc},
+	{value: 0x8132, lo: 0xbd, hi: 0xbd},
+	{value: 0x812d, lo: 0xbe, hi: 0xbe},
+	{value: 0x8132, lo: 0xbf, hi: 0xbf},
+	// Block 0xa, offset 0x63
+	{value: 0x0005, lo: 0x07},
+	{value: 0x8132, lo: 0x80, hi: 0x80},
+	{value: 0x8132, lo: 0x81, hi: 0x81},
+	{value: 0x812d, lo: 0x82, hi: 0x83},
+	{value: 0x812d, lo: 0x84, hi: 0x85},
+	{value: 0x812d, lo: 0x86, hi: 0x87},
+	{value: 0x812d, lo: 0x88, hi: 0x89},
+	{value: 0x8132, lo: 0x8a, hi: 0x8a},
+	// Block 0xb, offset 0x6b
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8132, lo: 0xab, hi: 0xb1},
+	{value: 0x812d, lo: 0xb2, hi: 0xb2},
+	{value: 0x8132, lo: 0xb3, hi: 0xb3},
+	// Block 0xc, offset 0x6f
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8132, lo: 0x96, hi: 0x99},
+	{value: 0x8132, lo: 0x9b, hi: 0xa3},
+	{value: 0x8132, lo: 0xa5, hi: 0xa7},
+	{value: 0x8132, lo: 0xa9, hi: 0xad},
+	// Block 0xd, offset 0x74
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x99, hi: 0x9b},
+	// Block 0xe, offset 0x76
+	{value: 0x0000, lo: 0x10},
+	{value: 0x8132, lo: 0x94, hi: 0xa1},
+	{value: 0x812d, lo: 0xa3, hi: 0xa3},
+	{value: 0x8132, lo: 0xa4, hi: 0xa5},
+	{value: 0x812d, lo: 0xa6, hi: 0xa6},
+	{value: 0x8132, lo: 0xa7, hi: 0xa8},
+	{value: 0x812d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8132, lo: 0xaa, hi: 0xac},
+	{value: 0x812d, lo: 0xad, hi: 0xaf},
+	{value: 0x8116, lo: 0xb0, hi: 0xb0},
+	{value: 0x8117, lo: 0xb1, hi: 0xb1},
+	{value: 0x8118, lo: 0xb2, hi: 0xb2},
+	{value: 0x8132, lo: 0xb3, hi: 0xb5},
+	{value: 0x812d, lo: 0xb6, hi: 0xb6},
+	{value: 0x8132, lo: 0xb7, hi: 0xb8},
+	{value: 0x812d, lo: 0xb9, hi: 0xba},
+	{value: 0x8132, lo: 0xbb, hi: 0xbf},
+	// Block 0xf, offset 0x87
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0xa8, hi: 0xa8},
+	{value: 0x3ed8, lo: 0xa9, hi: 0xa9},
+	{value: 0xa000, lo: 0xb0, hi: 0xb0},
+	{value: 0x3ee0, lo: 0xb1, hi: 0xb1},
+	{value: 0xa000, lo: 0xb3, hi: 0xb3},
+	{value: 0x3ee8, lo: 0xb4, hi: 0xb4},
+	{value: 0x9902, lo: 0xbc, hi: 0xbc},
+	// Block 0x10, offset 0x8f
+	{value: 0x0008, lo: 0x06},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x8132, lo: 0x91, hi: 0x91},
+	{value: 0x812d, lo: 0x92, hi: 0x92},
+	{value: 0x8132, lo: 0x93, hi: 0x93},
+	{value: 0x8132, lo: 0x94, hi: 0x94},
+	{value: 0x45b2, lo: 0x98, hi: 0x9f},
+	// Block 0x11, offset 0x96
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x12, offset 0x99
+	{value: 0x0008, lo: 0x06},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2c9e, lo: 0x8b, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x45f2, lo: 0x9c, hi: 0x9d},
+	{value: 0x4602, lo: 0x9f, hi: 0x9f},
+	// Block 0x13, offset 0xa0
+	{value: 0x0000, lo: 0x03},
+	{value: 0x462a, lo: 0xb3, hi: 0xb3},
+	{value: 0x4632, lo: 0xb6, hi: 0xb6},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	// Block 0x14, offset 0xa4
+	{value: 0x0008, lo: 0x03},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x460a, lo: 0x99, hi: 0x9b},
+	{value: 0x4622, lo: 0x9e, hi: 0x9e},
+	// Block 0x15, offset 0xa8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	// Block 0x16, offset 0xaa
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	// Block 0x17, offset 0xac
+	{value: 0x0000, lo: 0x08},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2cb6, lo: 0x88, hi: 0x88},
+	{value: 0x2cae, lo: 0x8b, hi: 0x8b},
+	{value: 0x2cbe, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x96, hi: 0x97},
+	{value: 0x463a, lo: 0x9c, hi: 0x9c},
+	{value: 0x4642, lo: 0x9d, hi: 0x9d},
+	// Block 0x18, offset 0xb5
+	{value: 0x0000, lo: 0x03},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x2cc6, lo: 0x94, hi: 0x94},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x19, offset 0xb9
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2cce, lo: 0x8a, hi: 0x8a},
+	{value: 0x2cde, lo: 0x8b, hi: 0x8b},
+	{value: 0x2cd6, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x1a, offset 0xc0
+	{value: 0x1801, lo: 0x04},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x3ef0, lo: 0x88, hi: 0x88},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x8120, lo: 0x95, hi: 0x96},
+	// Block 0x1b, offset 0xc5
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	{value: 0xa000, lo: 0xbf, hi: 0xbf},
+	// Block 0x1c, offset 0xc8
+	{value: 0x0000, lo: 0x09},
+	{value: 0x2ce6, lo: 0x80, hi: 0x80},
+	{value: 0x9900, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x2cee, lo: 0x87, hi: 0x87},
+	{value: 0x2cf6, lo: 0x88, hi: 0x88},
+	{value: 0x2f50, lo: 0x8a, hi: 0x8a},
+	{value: 0x2dd8, lo: 0x8b, hi: 0x8b},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x95, hi: 0x96},
+	// Block 0x1d, offset 0xd2
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x1e, offset 0xd4
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2cfe, lo: 0x8a, hi: 0x8a},
+	{value: 0x2d0e, lo: 0x8b, hi: 0x8b},
+	{value: 0x2d06, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x1f, offset 0xdb
+	{value: 0x6bea, lo: 0x07},
+	{value: 0x9904, lo: 0x8a, hi: 0x8a},
+	{value: 0x9900, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x3ef8, lo: 0x9a, hi: 0x9a},
+	{value: 0x2f58, lo: 0x9c, hi: 0x9c},
+	{value: 0x2de3, lo: 0x9d, hi: 0x9d},
+	{value: 0x2d16, lo: 0x9e, hi: 0x9f},
+	// Block 0x20, offset 0xe3
+	{value: 0x0000, lo: 0x03},
+	{value: 0x2621, lo: 0xb3, hi: 0xb3},
+	{value: 0x8122, lo: 0xb8, hi: 0xb9},
+	{value: 0x8104, lo: 0xba, hi: 0xba},
+	// Block 0x21, offset 0xe7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8123, lo: 0x88, hi: 0x8b},
+	// Block 0x22, offset 0xe9
+	{value: 0x0000, lo: 0x02},
+	{value: 0x2636, lo: 0xb3, hi: 0xb3},
+	{value: 0x8124, lo: 0xb8, hi: 0xb9},
+	// Block 0x23, offset 0xec
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8125, lo: 0x88, hi: 0x8b},
+	{value: 0x2628, lo: 0x9c, hi: 0x9c},
+	{value: 0x262f, lo: 0x9d, hi: 0x9d},
+	// Block 0x24, offset 0xf0
+	{value: 0x0000, lo: 0x05},
+	{value: 0x030b, lo: 0x8c, hi: 0x8c},
+	{value: 0x812d, lo: 0x98, hi: 0x99},
+	{value: 0x812d, lo: 0xb5, hi: 0xb5},
+	{value: 0x812d, lo: 0xb7, hi: 0xb7},
+	{value: 0x812b, lo: 0xb9, hi: 0xb9},
+	// Block 0x25, offset 0xf6
+	{value: 0x0000, lo: 0x10},
+	{value: 0x2644, lo: 0x83, hi: 0x83},
+	{value: 0x264b, lo: 0x8d, hi: 0x8d},
+	{value: 0x2652, lo: 0x92, hi: 0x92},
+	{value: 0x2659, lo: 0x97, hi: 0x97},
+	{value: 0x2660, lo: 0x9c, hi: 0x9c},
+	{value: 0x263d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8126, lo: 0xb1, hi: 0xb1},
+	{value: 0x8127, lo: 0xb2, hi: 0xb2},
+	{value: 0x4a66, lo: 0xb3, hi: 0xb3},
+	{value: 0x8128, lo: 0xb4, hi: 0xb4},
+	{value: 0x4a6f, lo: 0xb5, hi: 0xb5},
+	{value: 0x464a, lo: 0xb6, hi: 0xb6},
+	{value: 0x468a, lo: 0xb7, hi: 0xb7},
+	{value: 0x4652, lo: 0xb8, hi: 0xb8},
+	{value: 0x4695, lo: 0xb9, hi: 0xb9},
+	{value: 0x8127, lo: 0xba, hi: 0xbd},
+	// Block 0x26, offset 0x107
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x8127, lo: 0x80, hi: 0x80},
+	{value: 0x4a78, lo: 0x81, hi: 0x81},
+	{value: 0x8132, lo: 0x82, hi: 0x83},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0x86, hi: 0x87},
+	{value: 0x266e, lo: 0x93, hi: 0x93},
+	{value: 0x2675, lo: 0x9d, hi: 0x9d},
+	{value: 0x267c, lo: 0xa2, hi: 0xa2},
+	{value: 0x2683, lo: 0xa7, hi: 0xa7},
+	{value: 0x268a, lo: 0xac, hi: 0xac},
+	{value: 0x2667, lo: 0xb9, hi: 0xb9},
+	// Block 0x27, offset 0x113
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x86, hi: 0x86},
+	// Block 0x28, offset 0x115
+	{value: 0x0000, lo: 0x05},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x2d1e, lo: 0xa6, hi: 0xa6},
+	{value: 0x9900, lo: 0xae, hi: 0xae},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	{value: 0x8104, lo: 0xb9, hi: 0xba},
+	// Block 0x29, offset 0x11b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x8d, hi: 0x8d},
+	// Block 0x2a, offset 0x11d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x030f, lo: 0xbc, hi: 0xbc},
+	// Block 0x2b, offset 0x11f
+	{value: 0x0000, lo: 0x01},
+	{value: 0xa000, lo: 0x80, hi: 0x92},
+	// Block 0x2c, offset 0x121
+	{value: 0x0000, lo: 0x01},
+	{value: 0xb900, lo: 0xa1, hi: 0xb5},
+	// Block 0x2d, offset 0x123
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xa8, hi: 0xbf},
+	// Block 0x2e, offset 0x125
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0x80, hi: 0x82},
+	// Block 0x2f, offset 0x127
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x9d, hi: 0x9f},
+	// Block 0x30, offset 0x129
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x94, hi: 0x94},
+	{value: 0x8104, lo: 0xb4, hi: 0xb4},
+	// Block 0x31, offset 0x12c
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x92, hi: 0x92},
+	{value: 0x8132, lo: 0x9d, hi: 0x9d},
+	// Block 0x32, offset 0x12f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8131, lo: 0xa9, hi: 0xa9},
+	// Block 0x33, offset 0x131
+	{value: 0x0004, lo: 0x02},
+	{value: 0x812e, lo: 0xb9, hi: 0xba},
+	{value: 0x812d, lo: 0xbb, hi: 0xbb},
+	// Block 0x34, offset 0x134
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x97, hi: 0x97},
+	{value: 0x812d, lo: 0x98, hi: 0x98},
+	// Block 0x35, offset 0x137
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8104, lo: 0xa0, hi: 0xa0},
+	{value: 0x8132, lo: 0xb5, hi: 0xbc},
+	{value: 0x812d, lo: 0xbf, hi: 0xbf},
+	// Block 0x36, offset 0x13b
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8132, lo: 0xb0, hi: 0xb4},
+	{value: 0x812d, lo: 0xb5, hi: 0xba},
+	{value: 0x8132, lo: 0xbb, hi: 0xbc},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	// Block 0x37, offset 0x140
+	{value: 0x0000, lo: 0x08},
+	{value: 0x2d66, lo: 0x80, hi: 0x80},
+	{value: 0x2d6e, lo: 0x81, hi: 0x81},
+	{value: 0xa000, lo: 0x82, hi: 0x82},
+	{value: 0x2d76, lo: 0x83, hi: 0x83},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0xab, hi: 0xab},
+	{value: 0x812d, lo: 0xac, hi: 0xac},
+	{value: 0x8132, lo: 0xad, hi: 0xb3},
+	// Block 0x38, offset 0x149
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xaa, hi: 0xab},
+	// Block 0x39, offset 0x14b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xa6, hi: 0xa6},
+	{value: 0x8104, lo: 0xb2, hi: 0xb3},
+	// Block 0x3a, offset 0x14e
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	// Block 0x3b, offset 0x150
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8132, lo: 0x90, hi: 0x92},
+	{value: 0x8101, lo: 0x94, hi: 0x94},
+	{value: 0x812d, lo: 0x95, hi: 0x99},
+	{value: 0x8132, lo: 0x9a, hi: 0x9b},
+	{value: 0x812d, lo: 0x9c, hi: 0x9f},
+	{value: 0x8132, lo: 0xa0, hi: 0xa0},
+	{value: 0x8101, lo: 0xa2, hi: 0xa8},
+	{value: 0x812d, lo: 0xad, hi: 0xad},
+	{value: 0x8132, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb8, hi: 0xb9},
+	// Block 0x3c, offset 0x15b
+	{value: 0x0002, lo: 0x0a},
+	{value: 0x0043, lo: 0xac, hi: 0xac},
+	{value: 0x00d1, lo: 0xad, hi: 0xad},
+	{value: 0x0045, lo: 0xae, hi: 0xae},
+	{value: 0x0049, lo: 0xb0, hi: 0xb1},
+	{value: 0x00e6, lo: 0xb2, hi: 0xb2},
+	{value: 0x004f, lo: 0xb3, hi: 0xba},
+	{value: 0x005f, lo: 0xbc, hi: 0xbc},
+	{value: 0x00ef, lo: 0xbd, hi: 0xbd},
+	{value: 0x0061, lo: 0xbe, hi: 0xbe},
+	{value: 0x0065, lo: 0xbf, hi: 0xbf},
+	// Block 0x3d, offset 0x166
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x8132, lo: 0x80, hi: 0x81},
+	{value: 0x812d, lo: 0x82, hi: 0x82},
+	{value: 0x8132, lo: 0x83, hi: 0x89},
+	{value: 0x812d, lo: 0x8a, hi: 0x8a},
+	{value: 0x8132, lo: 0x8b, hi: 0x8c},
+	{value: 0x8135, lo: 0x8d, hi: 0x8d},
+	{value: 0x812a, lo: 0x8e, hi: 0x8e},
+	{value: 0x812d, lo: 0x8f, hi: 0x8f},
+	{value: 0x8129, lo: 0x90, hi: 0x90},
+	{value: 0x8132, lo: 0x91, hi: 0xb5},
+	{value: 0x8132, lo: 0xbb, hi: 0xbb},
+	{value: 0x8134, lo: 0xbc, hi: 0xbc},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	{value: 0x8132, lo: 0xbe, hi: 0xbe},
+	{value: 0x812d, lo: 0xbf, hi: 0xbf},
+	// Block 0x3e, offset 0x176
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x0001, lo: 0x80, hi: 0x8a},
+	{value: 0x043b, lo: 0x91, hi: 0x91},
+	{value: 0x429b, lo: 0x97, hi: 0x97},
+	{value: 0x001d, lo: 0xa4, hi: 0xa4},
+	{value: 0x1873, lo: 0xa5, hi: 0xa5},
+	{value: 0x1b5c, lo: 0xa6, hi: 0xa6},
+	{value: 0x0001, lo: 0xaf, hi: 0xaf},
+	{value: 0x2691, lo: 0xb3, hi: 0xb3},
+	{value: 0x27fe, lo: 0xb4, hi: 0xb4},
+	{value: 0x2698, lo: 0xb6, hi: 0xb6},
+	{value: 0x2808, lo: 0xb7, hi: 0xb7},
+	{value: 0x186d, lo: 0xbc, hi: 0xbc},
+	{value: 0x4269, lo: 0xbe, hi: 0xbe},
+	// Block 0x3f, offset 0x184
+	{value: 0x0002, lo: 0x0d},
+	{value: 0x1933, lo: 0x87, hi: 0x87},
+	{value: 0x1930, lo: 0x88, hi: 0x88},
+	{value: 0x1870, lo: 0x89, hi: 0x89},
+	{value: 0x298e, lo: 0x97, hi: 0x97},
+	{value: 0x0001, lo: 0x9f, hi: 0x9f},
+	{value: 0x0021, lo: 0xb0, hi: 0xb0},
+	{value: 0x0093, lo: 0xb1, hi: 0xb1},
+	{value: 0x0029, lo: 0xb4, hi: 0xb9},
+	{value: 0x0017, lo: 0xba, hi: 0xba},
+	{value: 0x0467, lo: 0xbb, hi: 0xbb},
+	{value: 0x003b, lo: 0xbc, hi: 0xbc},
+	{value: 0x0011, lo: 0xbd, hi: 0xbe},
+	{value: 0x009d, lo: 0xbf, hi: 0xbf},
+	// Block 0x40, offset 0x192
+	{value: 0x0002, lo: 0x0f},
+	{value: 0x0021, lo: 0x80, hi: 0x89},
+	{value: 0x0017, lo: 0x8a, hi: 0x8a},
+	{value: 0x0467, lo: 0x8b, hi: 0x8b},
+	{value: 0x003b, lo: 0x8c, hi: 0x8c},
+	{value: 0x0011, lo: 0x8d, hi: 0x8e},
+	{value: 0x0083, lo: 0x90, hi: 0x90},
+	{value: 0x008b, lo: 0x91, hi: 0x91},
+	{value: 0x009f, lo: 0x92, hi: 0x92},
+	{value: 0x00b1, lo: 0x93, hi: 0x93},
+	{value: 0x0104, lo: 0x94, hi: 0x94},
+	{value: 0x0091, lo: 0x95, hi: 0x95},
+	{value: 0x0097, lo: 0x96, hi: 0x99},
+	{value: 0x00a1, lo: 0x9a, hi: 0x9a},
+	{value: 0x00a7, lo: 0x9b, hi: 0x9c},
+	{value: 0x1999, lo: 0xa8, hi: 0xa8},
+	// Block 0x41, offset 0x1a2
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x8132, lo: 0x90, hi: 0x91},
+	{value: 0x8101, lo: 0x92, hi: 0x93},
+	{value: 0x8132, lo: 0x94, hi: 0x97},
+	{value: 0x8101, lo: 0x98, hi: 0x9a},
+	{value: 0x8132, lo: 0x9b, hi: 0x9c},
+	{value: 0x8132, lo: 0xa1, hi: 0xa1},
+	{value: 0x8101, lo: 0xa5, hi: 0xa6},
+	{value: 0x8132, lo: 0xa7, hi: 0xa7},
+	{value: 0x812d, lo: 0xa8, hi: 0xa8},
+	{value: 0x8132, lo: 0xa9, hi: 0xa9},
+	{value: 0x8101, lo: 0xaa, hi: 0xab},
+	{value: 0x812d, lo: 0xac, hi: 0xaf},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	// Block 0x42, offset 0x1b0
+	{value: 0x0007, lo: 0x06},
+	{value: 0x2180, lo: 0x89, hi: 0x89},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	{value: 0x3bb9, lo: 0x9a, hi: 0x9b},
+	{value: 0x3bc7, lo: 0xae, hi: 0xae},
+	// Block 0x43, offset 0x1b7
+	{value: 0x000e, lo: 0x05},
+	{value: 0x3bce, lo: 0x8d, hi: 0x8e},
+	{value: 0x3bd5, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	// Block 0x44, offset 0x1bd
+	{value: 0x0173, lo: 0x0e},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0x3be3, lo: 0x84, hi: 0x84},
+	{value: 0xa000, lo: 0x88, hi: 0x88},
+	{value: 0x3bea, lo: 0x89, hi: 0x89},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0x3bf1, lo: 0x8c, hi: 0x8c},
+	{value: 0xa000, lo: 0xa3, hi: 0xa3},
+	{value: 0x3bf8, lo: 0xa4, hi: 0xa4},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x3bff, lo: 0xa6, hi: 0xa6},
+	{value: 0x269f, lo: 0xac, hi: 0xad},
+	{value: 0x26a6, lo: 0xaf, hi: 0xaf},
+	{value: 0x281c, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xbc, hi: 0xbc},
+	// Block 0x45, offset 0x1cc
+	{value: 0x0007, lo: 0x03},
+	{value: 0x3c68, lo: 0xa0, hi: 0xa1},
+	{value: 0x3c92, lo: 0xa2, hi: 0xa3},
+	{value: 0x3cbc, lo: 0xaa, hi: 0xad},
+	// Block 0x46, offset 0x1d0
+	{value: 0x0004, lo: 0x01},
+	{value: 0x048b, lo: 0xa9, hi: 0xaa},
+	// Block 0x47, offset 0x1d2
+	{value: 0x0002, lo: 0x03},
+	{value: 0x0057, lo: 0x80, hi: 0x8f},
+	{value: 0x0083, lo: 0x90, hi: 0xa9},
+	{value: 0x0021, lo: 0xaa, hi: 0xaa},
+	// Block 0x48, offset 0x1d6
+	{value: 0x0000, lo: 0x01},
+	{value: 0x299b, lo: 0x8c, hi: 0x8c},
+	// Block 0x49, offset 0x1d8
+	{value: 0x0263, lo: 0x02},
+	{value: 0x1b8c, lo: 0xb4, hi: 0xb4},
+	{value: 0x192d, lo: 0xb5, hi: 0xb6},
+	// Block 0x4a, offset 0x1db
+	{value: 0x0000, lo: 0x01},
+	{value: 0x4573, lo: 0x9c, hi: 0x9c},
+	// Block 0x4b, offset 0x1dd
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0095, lo: 0xbc, hi: 0xbc},
+	{value: 0x006d, lo: 0xbd, hi: 0xbd},
+	// Block 0x4c, offset 0x1e0
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xaf, hi: 0xb1},
+	// Block 0x4d, offset 0x1e2
+	{value: 0x0000, lo: 0x02},
+	{value: 0x047f, lo: 0xaf, hi: 0xaf},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x4e, offset 0x1e5
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xa0, hi: 0xbf},
+	// Block 0x4f, offset 0x1e7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x0dc3, lo: 0x9f, hi: 0x9f},
+	// Block 0x50, offset 0x1e9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x162f, lo: 0xb3, hi: 0xb3},
+	// Block 0x51, offset 0x1eb
+	{value: 0x0004, lo: 0x0b},
+	{value: 0x1597, lo: 0x80, hi: 0x82},
+	{value: 0x15af, lo: 0x83, hi: 0x83},
+	{value: 0x15c7, lo: 0x84, hi: 0x85},
+	{value: 0x15d7, lo: 0x86, hi: 0x89},
+	{value: 0x15eb, lo: 0x8a, hi: 0x8c},
+	{value: 0x15ff, lo: 0x8d, hi: 0x8d},
+	{value: 0x1607, lo: 0x8e, hi: 0x8e},
+	{value: 0x160f, lo: 0x8f, hi: 0x90},
+	{value: 0x161b, lo: 0x91, hi: 0x93},
+	{value: 0x162b, lo: 0x94, hi: 0x94},
+	{value: 0x1633, lo: 0x95, hi: 0x95},
+	// Block 0x52, offset 0x1f7
+	{value: 0x0004, lo: 0x09},
+	{value: 0x0001, lo: 0x80, hi: 0x80},
+	{value: 0x812c, lo: 0xaa, hi: 0xaa},
+	{value: 0x8131, lo: 0xab, hi: 0xab},
+	{value: 0x8133, lo: 0xac, hi: 0xac},
+	{value: 0x812e, lo: 0xad, hi: 0xad},
+	{value: 0x812f, lo: 0xae, hi: 0xae},
+	{value: 0x812f, lo: 0xaf, hi: 0xaf},
+	{value: 0x04b3, lo: 0xb6, hi: 0xb6},
+	{value: 0x0887, lo: 0xb8, hi: 0xba},
+	// Block 0x53, offset 0x201
+	{value: 0x0005, lo: 0x09},
+	{value: 0x0313, lo: 0xb1, hi: 0xb1},
+	{value: 0x0317, lo: 0xb2, hi: 0xb2},
+	{value: 0x4345, lo: 0xb3, hi: 0xb3},
+	{value: 0x031b, lo: 0xb4, hi: 0xb4},
+	{value: 0x434a, lo: 0xb5, hi: 0xb6},
+	{value: 0x031f, lo: 0xb7, hi: 0xb7},
+	{value: 0x0323, lo: 0xb8, hi: 0xb8},
+	{value: 0x0327, lo: 0xb9, hi: 0xb9},
+	{value: 0x4354, lo: 0xba, hi: 0xbf},
+	// Block 0x54, offset 0x20b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0xaf, hi: 0xaf},
+	{value: 0x8132, lo: 0xb4, hi: 0xbd},
+	// Block 0x55, offset 0x20e
+	{value: 0x0000, lo: 0x03},
+	{value: 0x020f, lo: 0x9c, hi: 0x9c},
+	{value: 0x0212, lo: 0x9d, hi: 0x9d},
+	{value: 0x8132, lo: 0x9e, hi: 0x9f},
+	// Block 0x56, offset 0x212
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb0, hi: 0xb1},
+	// Block 0x57, offset 0x214
+	{value: 0x0000, lo: 0x01},
+	{value: 0x163b, lo: 0xb0, hi: 0xb0},
+	// Block 0x58, offset 0x216
+	{value: 0x000c, lo: 0x01},
+	{value: 0x00d7, lo: 0xb8, hi: 0xb9},
+	// Block 0x59, offset 0x218
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x86, hi: 0x86},
+	// Block 0x5a, offset 0x21a
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0xa0, hi: 0xb1},
+	// Block 0x5b, offset 0x21d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xab, hi: 0xad},
+	// Block 0x5c, offset 0x21f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x93, hi: 0x93},
+	// Block 0x5d, offset 0x221
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb3, hi: 0xb3},
+	// Block 0x5e, offset 0x223
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x80, hi: 0x80},
+	// Block 0x5f, offset 0x225
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	{value: 0x8132, lo: 0xb2, hi: 0xb3},
+	{value: 0x812d, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb7, hi: 0xb8},
+	{value: 0x8132, lo: 0xbe, hi: 0xbf},
+	// Block 0x60, offset 0x22b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x81, hi: 0x81},
+	{value: 0x8104, lo: 0xb6, hi: 0xb6},
+	// Block 0x61, offset 0x22e
+	{value: 0x0008, lo: 0x03},
+	{value: 0x1637, lo: 0x9c, hi: 0x9d},
+	{value: 0x0125, lo: 0x9e, hi: 0x9e},
+	{value: 0x1643, lo: 0x9f, hi: 0x9f},
+	// Block 0x62, offset 0x232
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xad, hi: 0xad},
+	// Block 0x63, offset 0x234
+	{value: 0x0000, lo: 0x06},
+	{value: 0xe500, lo: 0x80, hi: 0x80},
+	{value: 0xc600, lo: 0x81, hi: 0x9b},
+	{value: 0xe500, lo: 0x9c, hi: 0x9c},
+	{value: 0xc600, lo: 0x9d, hi: 0xb7},
+	{value: 0xe500, lo: 0xb8, hi: 0xb8},
+	{value: 0xc600, lo: 0xb9, hi: 0xbf},
+	// Block 0x64, offset 0x23b
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x93},
+	{value: 0xe500, lo: 0x94, hi: 0x94},
+	{value: 0xc600, lo: 0x95, hi: 0xaf},
+	{value: 0xe500, lo: 0xb0, hi: 0xb0},
+	{value: 0xc600, lo: 0xb1, hi: 0xbf},
+	// Block 0x65, offset 0x241
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8b},
+	{value: 0xe500, lo: 0x8c, hi: 0x8c},
+	{value: 0xc600, lo: 0x8d, hi: 0xa7},
+	{value: 0xe500, lo: 0xa8, hi: 0xa8},
+	{value: 0xc600, lo: 0xa9, hi: 0xbf},
+	// Block 0x66, offset 0x247
+	{value: 0x0000, lo: 0x07},
+	{value: 0xc600, lo: 0x80, hi: 0x83},
+	{value: 0xe500, lo: 0x84, hi: 0x84},
+	{value: 0xc600, lo: 0x85, hi: 0x9f},
+	{value: 0xe500, lo: 0xa0, hi: 0xa0},
+	{value: 0xc600, lo: 0xa1, hi: 0xbb},
+	{value: 0xe500, lo: 0xbc, hi: 0xbc},
+	{value: 0xc600, lo: 0xbd, hi: 0xbf},
+	// Block 0x67, offset 0x24f
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x97},
+	{value: 0xe500, lo: 0x98, hi: 0x98},
+	{value: 0xc600, lo: 0x99, hi: 0xb3},
+	{value: 0xe500, lo: 0xb4, hi: 0xb4},
+	{value: 0xc600, lo: 0xb5, hi: 0xbf},
+	// Block 0x68, offset 0x255
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8f},
+	{value: 0xe500, lo: 0x90, hi: 0x90},
+	{value: 0xc600, lo: 0x91, hi: 0xab},
+	{value: 0xe500, lo: 0xac, hi: 0xac},
+	{value: 0xc600, lo: 0xad, hi: 0xbf},
+	// Block 0x69, offset 0x25b
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	{value: 0xe500, lo: 0xa4, hi: 0xa4},
+	{value: 0xc600, lo: 0xa5, hi: 0xbf},
+	// Block 0x6a, offset 0x261
+	{value: 0x0000, lo: 0x03},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	// Block 0x6b, offset 0x265
+	{value: 0x0002, lo: 0x01},
+	{value: 0x0003, lo: 0x81, hi: 0xbf},
+	// Block 0x6c, offset 0x267
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	// Block 0x6d, offset 0x269
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xa0, hi: 0xa0},
+	// Block 0x6e, offset 0x26b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb6, hi: 0xba},
+	// Block 0x6f, offset 0x26d
+	{value: 0x002c, lo: 0x05},
+	{value: 0x812d, lo: 0x8d, hi: 0x8d},
+	{value: 0x8132, lo: 0x8f, hi: 0x8f},
+	{value: 0x8132, lo: 0xb8, hi: 0xb8},
+	{value: 0x8101, lo: 0xb9, hi: 0xba},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x70, offset 0x273
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0xa5, hi: 0xa5},
+	{value: 0x812d, lo: 0xa6, hi: 0xa6},
+	// Block 0x71, offset 0x276
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x86, hi: 0x86},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x72, offset 0x279
+	{value: 0x17fe, lo: 0x07},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x4238, lo: 0x9a, hi: 0x9a},
+	{value: 0xa000, lo: 0x9b, hi: 0x9b},
+	{value: 0x4242, lo: 0x9c, hi: 0x9c},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x424c, lo: 0xab, hi: 0xab},
+	{value: 0x8104, lo: 0xb9, hi: 0xba},
+	// Block 0x73, offset 0x281
+	{value: 0x0000, lo: 0x06},
+	{value: 0x8132, lo: 0x80, hi: 0x82},
+	{value: 0x9900, lo: 0xa7, hi: 0xa7},
+	{value: 0x2d7e, lo: 0xae, hi: 0xae},
+	{value: 0x2d88, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb1, hi: 0xb2},
+	{value: 0x8104, lo: 0xb3, hi: 0xb4},
+	// Block 0x74, offset 0x288
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x80, hi: 0x80},
+	{value: 0x8102, lo: 0x8a, hi: 0x8a},
+	// Block 0x75, offset 0x28b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xb5, hi: 0xb5},
+	{value: 0x8102, lo: 0xb6, hi: 0xb6},
+	// Block 0x76, offset 0x28e
+	{value: 0x0002, lo: 0x01},
+	{value: 0x8102, lo: 0xa9, hi: 0xaa},
+	// Block 0x77, offset 0x290
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2d92, lo: 0x8b, hi: 0x8b},
+	{value: 0x2d9c, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x8132, lo: 0xa6, hi: 0xac},
+	{value: 0x8132, lo: 0xb0, hi: 0xb4},
+	// Block 0x78, offset 0x298
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x82, hi: 0x82},
+	{value: 0x8102, lo: 0x86, hi: 0x86},
+	// Block 0x79, offset 0x29b
+	{value: 0x6b5a, lo: 0x06},
+	{value: 0x9900, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xb9, hi: 0xb9},
+	{value: 0x9900, lo: 0xba, hi: 0xba},
+	{value: 0x2db0, lo: 0xbb, hi: 0xbb},
+	{value: 0x2da6, lo: 0xbc, hi: 0xbd},
+	{value: 0x2dba, lo: 0xbe, hi: 0xbe},
+	// Block 0x7a, offset 0x2a2
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x82, hi: 0x82},
+	{value: 0x8102, lo: 0x83, hi: 0x83},
+	// Block 0x7b, offset 0x2a5
+	{value: 0x0000, lo: 0x05},
+	{value: 0x9900, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb8, hi: 0xb9},
+	{value: 0x2dc4, lo: 0xba, hi: 0xba},
+	{value: 0x2dce, lo: 0xbb, hi: 0xbb},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x7c, offset 0x2ab
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0x80, hi: 0x80},
+	// Block 0x7d, offset 0x2ad
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x7e, offset 0x2af
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xb6, hi: 0xb6},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	// Block 0x7f, offset 0x2b2
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xab, hi: 0xab},
+	// Block 0x80, offset 0x2b4
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0xb0, hi: 0xb4},
+	// Block 0x81, offset 0x2b6
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb0, hi: 0xb6},
+	// Block 0x82, offset 0x2b8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0x9e, hi: 0x9e},
+	// Block 0x83, offset 0x2ba
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x4662, lo: 0x9e, hi: 0x9e},
+	{value: 0x466c, lo: 0x9f, hi: 0x9f},
+	{value: 0x46a0, lo: 0xa0, hi: 0xa0},
+	{value: 0x46ae, lo: 0xa1, hi: 0xa1},
+	{value: 0x46bc, lo: 0xa2, hi: 0xa2},
+	{value: 0x46ca, lo: 0xa3, hi: 0xa3},
+	{value: 0x46d8, lo: 0xa4, hi: 0xa4},
+	{value: 0x812b, lo: 0xa5, hi: 0xa6},
+	{value: 0x8101, lo: 0xa7, hi: 0xa9},
+	{value: 0x8130, lo: 0xad, hi: 0xad},
+	{value: 0x812b, lo: 0xae, hi: 0xb2},
+	{value: 0x812d, lo: 0xbb, hi: 0xbf},
+	// Block 0x84, offset 0x2c7
+	{value: 0x0000, lo: 0x09},
+	{value: 0x812d, lo: 0x80, hi: 0x82},
+	{value: 0x8132, lo: 0x85, hi: 0x89},
+	{value: 0x812d, lo: 0x8a, hi: 0x8b},
+	{value: 0x8132, lo: 0xaa, hi: 0xad},
+	{value: 0x4676, lo: 0xbb, hi: 0xbb},
+	{value: 0x4680, lo: 0xbc, hi: 0xbc},
+	{value: 0x46e6, lo: 0xbd, hi: 0xbd},
+	{value: 0x4702, lo: 0xbe, hi: 0xbe},
+	{value: 0x46f4, lo: 0xbf, hi: 0xbf},
+	// Block 0x85, offset 0x2d1
+	{value: 0x0000, lo: 0x01},
+	{value: 0x4710, lo: 0x80, hi: 0x80},
+	// Block 0x86, offset 0x2d3
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x82, hi: 0x84},
+	// Block 0x87, offset 0x2d5
+	{value: 0x0002, lo: 0x03},
+	{value: 0x0043, lo: 0x80, hi: 0x99},
+	{value: 0x0083, lo: 0x9a, hi: 0xb3},
+	{value: 0x0043, lo: 0xb4, hi: 0xbf},
+	// Block 0x88, offset 0x2d9
+	{value: 0x0002, lo: 0x04},
+	{value: 0x005b, lo: 0x80, hi: 0x8d},
+	{value: 0x0083, lo: 0x8e, hi: 0x94},
+	{value: 0x0093, lo: 0x96, hi: 0xa7},
+	{value: 0x0043, lo: 0xa8, hi: 0xbf},
+	// Block 0x89, offset 0x2de
+	{value: 0x0002, lo: 0x0b},
+	{value: 0x0073, lo: 0x80, hi: 0x81},
+	{value: 0x0083, lo: 0x82, hi: 0x9b},
+	{value: 0x0043, lo: 0x9c, hi: 0x9c},
+	{value: 0x0047, lo: 0x9e, hi: 0x9f},
+	{value: 0x004f, lo: 0xa2, hi: 0xa2},
+	{value: 0x0055, lo: 0xa5, hi: 0xa6},
+	{value: 0x005d, lo: 0xa9, hi: 0xac},
+	{value: 0x0067, lo: 0xae, hi: 0xb5},
+	{value: 0x0083, lo: 0xb6, hi: 0xb9},
+	{value: 0x008d, lo: 0xbb, hi: 0xbb},
+	{value: 0x0091, lo: 0xbd, hi: 0xbf},
+	// Block 0x8a, offset 0x2ea
+	{value: 0x0002, lo: 0x04},
+	{value: 0x0097, lo: 0x80, hi: 0x83},
+	{value: 0x00a1, lo: 0x85, hi: 0x8f},
+	{value: 0x0043, lo: 0x90, hi: 0xa9},
+	{value: 0x0083, lo: 0xaa, hi: 0xbf},
+	// Block 0x8b, offset 0x2ef
+	{value: 0x0002, lo: 0x08},
+	{value: 0x00af, lo: 0x80, hi: 0x83},
+	{value: 0x0043, lo: 0x84, hi: 0x85},
+	{value: 0x0049, lo: 0x87, hi: 0x8a},
+	{value: 0x0055, lo: 0x8d, hi: 0x94},
+	{value: 0x0067, lo: 0x96, hi: 0x9c},
+	{value: 0x0083, lo: 0x9e, hi: 0xb7},
+	{value: 0x0043, lo: 0xb8, hi: 0xb9},
+	{value: 0x0049, lo: 0xbb, hi: 0xbe},
+	// Block 0x8c, offset 0x2f8
+	{value: 0x0002, lo: 0x05},
+	{value: 0x0053, lo: 0x80, hi: 0x84},
+	{value: 0x005f, lo: 0x86, hi: 0x86},
+	{value: 0x0067, lo: 0x8a, hi: 0x90},
+	{value: 0x0083, lo: 0x92, hi: 0xab},
+	{value: 0x0043, lo: 0xac, hi: 0xbf},
+	// Block 0x8d, offset 0x2fe
+	{value: 0x0002, lo: 0x04},
+	{value: 0x006b, lo: 0x80, hi: 0x85},
+	{value: 0x0083, lo: 0x86, hi: 0x9f},
+	{value: 0x0043, lo: 0xa0, hi: 0xb9},
+	{value: 0x0083, lo: 0xba, hi: 0xbf},
+	// Block 0x8e, offset 0x303
+	{value: 0x0002, lo: 0x03},
+	{value: 0x008f, lo: 0x80, hi: 0x93},
+	{value: 0x0043, lo: 0x94, hi: 0xad},
+	{value: 0x0083, lo: 0xae, hi: 0xbf},
+	// Block 0x8f, offset 0x307
+	{value: 0x0002, lo: 0x04},
+	{value: 0x00a7, lo: 0x80, hi: 0x87},
+	{value: 0x0043, lo: 0x88, hi: 0xa1},
+	{value: 0x0083, lo: 0xa2, hi: 0xbb},
+	{value: 0x0043, lo: 0xbc, hi: 0xbf},
+	// Block 0x90, offset 0x30c
+	{value: 0x0002, lo: 0x03},
+	{value: 0x004b, lo: 0x80, hi: 0x95},
+	{value: 0x0083, lo: 0x96, hi: 0xaf},
+	{value: 0x0043, lo: 0xb0, hi: 0xbf},
+	// Block 0x91, offset 0x310
+	{value: 0x0003, lo: 0x0f},
+	{value: 0x01b8, lo: 0x80, hi: 0x80},
+	{value: 0x045f, lo: 0x81, hi: 0x81},
+	{value: 0x01bb, lo: 0x82, hi: 0x9a},
+	{value: 0x045b, lo: 0x9b, hi: 0x9b},
+	{value: 0x01c7, lo: 0x9c, hi: 0x9c},
+	{value: 0x01d0, lo: 0x9d, hi: 0x9d},
+	{value: 0x01d6, lo: 0x9e, hi: 0x9e},
+	{value: 0x01fa, lo: 0x9f, hi: 0x9f},
+	{value: 0x01eb, lo: 0xa0, hi: 0xa0},
+	{value: 0x01e8, lo: 0xa1, hi: 0xa1},
+	{value: 0x0173, lo: 0xa2, hi: 0xb2},
+	{value: 0x0188, lo: 0xb3, hi: 0xb3},
+	{value: 0x01a6, lo: 0xb4, hi: 0xba},
+	{value: 0x045f, lo: 0xbb, hi: 0xbb},
+	{value: 0x01bb, lo: 0xbc, hi: 0xbf},
+	// Block 0x92, offset 0x320
+	{value: 0x0003, lo: 0x0d},
+	{value: 0x01c7, lo: 0x80, hi: 0x94},
+	{value: 0x045b, lo: 0x95, hi: 0x95},
+	{value: 0x01c7, lo: 0x96, hi: 0x96},
+	{value: 0x01d0, lo: 0x97, hi: 0x97},
+	{value: 0x01d6, lo: 0x98, hi: 0x98},
+	{value: 0x01fa, lo: 0x99, hi: 0x99},
+	{value: 0x01eb, lo: 0x9a, hi: 0x9a},
+	{value: 0x01e8, lo: 0x9b, hi: 0x9b},
+	{value: 0x0173, lo: 0x9c, hi: 0xac},
+	{value: 0x0188, lo: 0xad, hi: 0xad},
+	{value: 0x01a6, lo: 0xae, hi: 0xb4},
+	{value: 0x045f, lo: 0xb5, hi: 0xb5},
+	{value: 0x01bb, lo: 0xb6, hi: 0xbf},
+	// Block 0x93, offset 0x32e
+	{value: 0x0003, lo: 0x0d},
+	{value: 0x01d9, lo: 0x80, hi: 0x8e},
+	{value: 0x045b, lo: 0x8f, hi: 0x8f},
+	{value: 0x01c7, lo: 0x90, hi: 0x90},
+	{value: 0x01d0, lo: 0x91, hi: 0x91},
+	{value: 0x01d6, lo: 0x92, hi: 0x92},
+	{value: 0x01fa, lo: 0x93, hi: 0x93},
+	{value: 0x01eb, lo: 0x94, hi: 0x94},
+	{value: 0x01e8, lo: 0x95, hi: 0x95},
+	{value: 0x0173, lo: 0x96, hi: 0xa6},
+	{value: 0x0188, lo: 0xa7, hi: 0xa7},
+	{value: 0x01a6, lo: 0xa8, hi: 0xae},
+	{value: 0x045f, lo: 0xaf, hi: 0xaf},
+	{value: 0x01bb, lo: 0xb0, hi: 0xbf},
+	// Block 0x94, offset 0x33c
+	{value: 0x0003, lo: 0x0d},
+	{value: 0x01eb, lo: 0x80, hi: 0x88},
+	{value: 0x045b, lo: 0x89, hi: 0x89},
+	{value: 0x01c7, lo: 0x8a, hi: 0x8a},
+	{value: 0x01d0, lo: 0x8b, hi: 0x8b},
+	{value: 0x01d6, lo: 0x8c, hi: 0x8c},
+	{value: 0x01fa, lo: 0x8d, hi: 0x8d},
+	{value: 0x01eb, lo: 0x8e, hi: 0x8e},
+	{value: 0x01e8, lo: 0x8f, hi: 0x8f},
+	{value: 0x0173, lo: 0x90, hi: 0xa0},
+	{value: 0x0188, lo: 0xa1, hi: 0xa1},
+	{value: 0x01a6, lo: 0xa2, hi: 0xa8},
+	{value: 0x045f, lo: 0xa9, hi: 0xa9},
+	{value: 0x01bb, lo: 0xaa, hi: 0xbf},
+	// Block 0x95, offset 0x34a
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8132, lo: 0x80, hi: 0x86},
+	{value: 0x8132, lo: 0x88, hi: 0x98},
+	{value: 0x8132, lo: 0x9b, hi: 0xa1},
+	{value: 0x8132, lo: 0xa3, hi: 0xa4},
+	{value: 0x8132, lo: 0xa6, hi: 0xaa},
+	// Block 0x96, offset 0x350
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x90, hi: 0x96},
+	// Block 0x97, offset 0x352
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x84, hi: 0x89},
+	{value: 0x8102, lo: 0x8a, hi: 0x8a},
+	// Block 0x98, offset 0x355
+	{value: 0x0002, lo: 0x09},
+	{value: 0x0063, lo: 0x80, hi: 0x89},
+	{value: 0x1951, lo: 0x8a, hi: 0x8a},
+	{value: 0x1981, lo: 0x8b, hi: 0x8b},
+	{value: 0x199c, lo: 0x8c, hi: 0x8c},
+	{value: 0x19a2, lo: 0x8d, hi: 0x8d},
+	{value: 0x1bc0, lo: 0x8e, hi: 0x8e},
+	{value: 0x19ae, lo: 0x8f, hi: 0x8f},
+	{value: 0x197b, lo: 0xaa, hi: 0xaa},
+	{value: 0x197e, lo: 0xab, hi: 0xab},
+	// Block 0x99, offset 0x35f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x193f, lo: 0x90, hi: 0x90},
+	// Block 0x9a, offset 0x361
+	{value: 0x0028, lo: 0x09},
+	{value: 0x2862, lo: 0x80, hi: 0x80},
+	{value: 0x2826, lo: 0x81, hi: 0x81},
+	{value: 0x2830, lo: 0x82, hi: 0x82},
+	{value: 0x2844, lo: 0x83, hi: 0x84},
+	{value: 0x284e, lo: 0x85, hi: 0x86},
+	{value: 0x283a, lo: 0x87, hi: 0x87},
+	{value: 0x2858, lo: 0x88, hi: 0x88},
+	{value: 0x0b6f, lo: 0x90, hi: 0x90},
+	{value: 0x08e7, lo: 0x91, hi: 0x91},
+}
+
+// recompMap: 7520 bytes (entries only)
+var recompMap = map[uint32]rune{
+	0x00410300: 0x00C0,
+	0x00410301: 0x00C1,
+	0x00410302: 0x00C2,
+	0x00410303: 0x00C3,
+	0x00410308: 0x00C4,
+	0x0041030A: 0x00C5,
+	0x00430327: 0x00C7,
+	0x00450300: 0x00C8,
+	0x00450301: 0x00C9,
+	0x00450302: 0x00CA,
+	0x00450308: 0x00CB,
+	0x00490300: 0x00CC,
+	0x00490301: 0x00CD,
+	0x00490302: 0x00CE,
+	0x00490308: 0x00CF,
+	0x004E0303: 0x00D1,
+	0x004F0300: 0x00D2,
+	0x004F0301: 0x00D3,
+	0x004F0302: 0x00D4,
+	0x004F0303: 0x00D5,
+	0x004F0308: 0x00D6,
+	0x00550300: 0x00D9,
+	0x00550301: 0x00DA,
+	0x00550302: 0x00DB,
+	0x00550308: 0x00DC,
+	0x00590301: 0x00DD,
+	0x00610300: 0x00E0,
+	0x00610301: 0x00E1,
+	0x00610302: 0x00E2,
+	0x00610303: 0x00E3,
+	0x00610308: 0x00E4,
+	0x0061030A: 0x00E5,
+	0x00630327: 0x00E7,
+	0x00650300: 0x00E8,
+	0x00650301: 0x00E9,
+	0x00650302: 0x00EA,
+	0x00650308: 0x00EB,
+	0x00690300: 0x00EC,
+	0x00690301: 0x00ED,
+	0x00690302: 0x00EE,
+	0x00690308: 0x00EF,
+	0x006E0303: 0x00F1,
+	0x006F0300: 0x00F2,
+	0x006F0301: 0x00F3,
+	0x006F0302: 0x00F4,
+	0x006F0303: 0x00F5,
+	0x006F0308: 0x00F6,
+	0x00750300: 0x00F9,
+	0x00750301: 0x00FA,
+	0x00750302: 0x00FB,
+	0x00750308: 0x00FC,
+	0x00790301: 0x00FD,
+	0x00790308: 0x00FF,
+	0x00410304: 0x0100,
+	0x00610304: 0x0101,
+	0x00410306: 0x0102,
+	0x00610306: 0x0103,
+	0x00410328: 0x0104,
+	0x00610328: 0x0105,
+	0x00430301: 0x0106,
+	0x00630301: 0x0107,
+	0x00430302: 0x0108,
+	0x00630302: 0x0109,
+	0x00430307: 0x010A,
+	0x00630307: 0x010B,
+	0x0043030C: 0x010C,
+	0x0063030C: 0x010D,
+	0x0044030C: 0x010E,
+	0x0064030C: 0x010F,
+	0x00450304: 0x0112,
+	0x00650304: 0x0113,
+	0x00450306: 0x0114,
+	0x00650306: 0x0115,
+	0x00450307: 0x0116,
+	0x00650307: 0x0117,
+	0x00450328: 0x0118,
+	0x00650328: 0x0119,
+	0x0045030C: 0x011A,
+	0x0065030C: 0x011B,
+	0x00470302: 0x011C,
+	0x00670302: 0x011D,
+	0x00470306: 0x011E,
+	0x00670306: 0x011F,
+	0x00470307: 0x0120,
+	0x00670307: 0x0121,
+	0x00470327: 0x0122,
+	0x00670327: 0x0123,
+	0x00480302: 0x0124,
+	0x00680302: 0x0125,
+	0x00490303: 0x0128,
+	0x00690303: 0x0129,
+	0x00490304: 0x012A,
+	0x00690304: 0x012B,
+	0x00490306: 0x012C,
+	0x00690306: 0x012D,
+	0x00490328: 0x012E,
+	0x00690328: 0x012F,
+	0x00490307: 0x0130,
+	0x004A0302: 0x0134,
+	0x006A0302: 0x0135,
+	0x004B0327: 0x0136,
+	0x006B0327: 0x0137,
+	0x004C0301: 0x0139,
+	0x006C0301: 0x013A,
+	0x004C0327: 0x013B,
+	0x006C0327: 0x013C,
+	0x004C030C: 0x013D,
+	0x006C030C: 0x013E,
+	0x004E0301: 0x0143,
+	0x006E0301: 0x0144,
+	0x004E0327: 0x0145,
+	0x006E0327: 0x0146,
+	0x004E030C: 0x0147,
+	0x006E030C: 0x0148,
+	0x004F0304: 0x014C,
+	0x006F0304: 0x014D,
+	0x004F0306: 0x014E,
+	0x006F0306: 0x014F,
+	0x004F030B: 0x0150,
+	0x006F030B: 0x0151,
+	0x00520301: 0x0154,
+	0x00720301: 0x0155,
+	0x00520327: 0x0156,
+	0x00720327: 0x0157,
+	0x0052030C: 0x0158,
+	0x0072030C: 0x0159,
+	0x00530301: 0x015A,
+	0x00730301: 0x015B,
+	0x00530302: 0x015C,
+	0x00730302: 0x015D,
+	0x00530327: 0x015E,
+	0x00730327: 0x015F,
+	0x0053030C: 0x0160,
+	0x0073030C: 0x0161,
+	0x00540327: 0x0162,
+	0x00740327: 0x0163,
+	0x0054030C: 0x0164,
+	0x0074030C: 0x0165,
+	0x00550303: 0x0168,
+	0x00750303: 0x0169,
+	0x00550304: 0x016A,
+	0x00750304: 0x016B,
+	0x00550306: 0x016C,
+	0x00750306: 0x016D,
+	0x0055030A: 0x016E,
+	0x0075030A: 0x016F,
+	0x0055030B: 0x0170,
+	0x0075030B: 0x0171,
+	0x00550328: 0x0172,
+	0x00750328: 0x0173,
+	0x00570302: 0x0174,
+	0x00770302: 0x0175,
+	0x00590302: 0x0176,
+	0x00790302: 0x0177,
+	0x00590308: 0x0178,
+	0x005A0301: 0x0179,
+	0x007A0301: 0x017A,
+	0x005A0307: 0x017B,
+	0x007A0307: 0x017C,
+	0x005A030C: 0x017D,
+	0x007A030C: 0x017E,
+	0x004F031B: 0x01A0,
+	0x006F031B: 0x01A1,
+	0x0055031B: 0x01AF,
+	0x0075031B: 0x01B0,
+	0x0041030C: 0x01CD,
+	0x0061030C: 0x01CE,
+	0x0049030C: 0x01CF,
+	0x0069030C: 0x01D0,
+	0x004F030C: 0x01D1,
+	0x006F030C: 0x01D2,
+	0x0055030C: 0x01D3,
+	0x0075030C: 0x01D4,
+	0x00DC0304: 0x01D5,
+	0x00FC0304: 0x01D6,
+	0x00DC0301: 0x01D7,
+	0x00FC0301: 0x01D8,
+	0x00DC030C: 0x01D9,
+	0x00FC030C: 0x01DA,
+	0x00DC0300: 0x01DB,
+	0x00FC0300: 0x01DC,
+	0x00C40304: 0x01DE,
+	0x00E40304: 0x01DF,
+	0x02260304: 0x01E0,
+	0x02270304: 0x01E1,
+	0x00C60304: 0x01E2,
+	0x00E60304: 0x01E3,
+	0x0047030C: 0x01E6,
+	0x0067030C: 0x01E7,
+	0x004B030C: 0x01E8,
+	0x006B030C: 0x01E9,
+	0x004F0328: 0x01EA,
+	0x006F0328: 0x01EB,
+	0x01EA0304: 0x01EC,
+	0x01EB0304: 0x01ED,
+	0x01B7030C: 0x01EE,
+	0x0292030C: 0x01EF,
+	0x006A030C: 0x01F0,
+	0x00470301: 0x01F4,
+	0x00670301: 0x01F5,
+	0x004E0300: 0x01F8,
+	0x006E0300: 0x01F9,
+	0x00C50301: 0x01FA,
+	0x00E50301: 0x01FB,
+	0x00C60301: 0x01FC,
+	0x00E60301: 0x01FD,
+	0x00D80301: 0x01FE,
+	0x00F80301: 0x01FF,
+	0x0041030F: 0x0200,
+	0x0061030F: 0x0201,
+	0x00410311: 0x0202,
+	0x00610311: 0x0203,
+	0x0045030F: 0x0204,
+	0x0065030F: 0x0205,
+	0x00450311: 0x0206,
+	0x00650311: 0x0207,
+	0x0049030F: 0x0208,
+	0x0069030F: 0x0209,
+	0x00490311: 0x020A,
+	0x00690311: 0x020B,
+	0x004F030F: 0x020C,
+	0x006F030F: 0x020D,
+	0x004F0311: 0x020E,
+	0x006F0311: 0x020F,
+	0x0052030F: 0x0210,
+	0x0072030F: 0x0211,
+	0x00520311: 0x0212,
+	0x00720311: 0x0213,
+	0x0055030F: 0x0214,
+	0x0075030F: 0x0215,
+	0x00550311: 0x0216,
+	0x00750311: 0x0217,
+	0x00530326: 0x0218,
+	0x00730326: 0x0219,
+	0x00540326: 0x021A,
+	0x00740326: 0x021B,
+	0x0048030C: 0x021E,
+	0x0068030C: 0x021F,
+	0x00410307: 0x0226,
+	0x00610307: 0x0227,
+	0x00450327: 0x0228,
+	0x00650327: 0x0229,
+	0x00D60304: 0x022A,
+	0x00F60304: 0x022B,
+	0x00D50304: 0x022C,
+	0x00F50304: 0x022D,
+	0x004F0307: 0x022E,
+	0x006F0307: 0x022F,
+	0x022E0304: 0x0230,
+	0x022F0304: 0x0231,
+	0x00590304: 0x0232,
+	0x00790304: 0x0233,
+	0x00A80301: 0x0385,
+	0x03910301: 0x0386,
+	0x03950301: 0x0388,
+	0x03970301: 0x0389,
+	0x03990301: 0x038A,
+	0x039F0301: 0x038C,
+	0x03A50301: 0x038E,
+	0x03A90301: 0x038F,
+	0x03CA0301: 0x0390,
+	0x03990308: 0x03AA,
+	0x03A50308: 0x03AB,
+	0x03B10301: 0x03AC,
+	0x03B50301: 0x03AD,
+	0x03B70301: 0x03AE,
+	0x03B90301: 0x03AF,
+	0x03CB0301: 0x03B0,
+	0x03B90308: 0x03CA,
+	0x03C50308: 0x03CB,
+	0x03BF0301: 0x03CC,
+	0x03C50301: 0x03CD,
+	0x03C90301: 0x03CE,
+	0x03D20301: 0x03D3,
+	0x03D20308: 0x03D4,
+	0x04150300: 0x0400,
+	0x04150308: 0x0401,
+	0x04130301: 0x0403,
+	0x04060308: 0x0407,
+	0x041A0301: 0x040C,
+	0x04180300: 0x040D,
+	0x04230306: 0x040E,
+	0x04180306: 0x0419,
+	0x04380306: 0x0439,
+	0x04350300: 0x0450,
+	0x04350308: 0x0451,
+	0x04330301: 0x0453,
+	0x04560308: 0x0457,
+	0x043A0301: 0x045C,
+	0x04380300: 0x045D,
+	0x04430306: 0x045E,
+	0x0474030F: 0x0476,
+	0x0475030F: 0x0477,
+	0x04160306: 0x04C1,
+	0x04360306: 0x04C2,
+	0x04100306: 0x04D0,
+	0x04300306: 0x04D1,
+	0x04100308: 0x04D2,
+	0x04300308: 0x04D3,
+	0x04150306: 0x04D6,
+	0x04350306: 0x04D7,
+	0x04D80308: 0x04DA,
+	0x04D90308: 0x04DB,
+	0x04160308: 0x04DC,
+	0x04360308: 0x04DD,
+	0x04170308: 0x04DE,
+	0x04370308: 0x04DF,
+	0x04180304: 0x04E2,
+	0x04380304: 0x04E3,
+	0x04180308: 0x04E4,
+	0x04380308: 0x04E5,
+	0x041E0308: 0x04E6,
+	0x043E0308: 0x04E7,
+	0x04E80308: 0x04EA,
+	0x04E90308: 0x04EB,
+	0x042D0308: 0x04EC,
+	0x044D0308: 0x04ED,
+	0x04230304: 0x04EE,
+	0x04430304: 0x04EF,
+	0x04230308: 0x04F0,
+	0x04430308: 0x04F1,
+	0x0423030B: 0x04F2,
+	0x0443030B: 0x04F3,
+	0x04270308: 0x04F4,
+	0x04470308: 0x04F5,
+	0x042B0308: 0x04F8,
+	0x044B0308: 0x04F9,
+	0x06270653: 0x0622,
+	0x06270654: 0x0623,
+	0x06480654: 0x0624,
+	0x06270655: 0x0625,
+	0x064A0654: 0x0626,
+	0x06D50654: 0x06C0,
+	0x06C10654: 0x06C2,
+	0x06D20654: 0x06D3,
+	0x0928093C: 0x0929,
+	0x0930093C: 0x0931,
+	0x0933093C: 0x0934,
+	0x09C709BE: 0x09CB,
+	0x09C709D7: 0x09CC,
+	0x0B470B56: 0x0B48,
+	0x0B470B3E: 0x0B4B,
+	0x0B470B57: 0x0B4C,
+	0x0B920BD7: 0x0B94,
+	0x0BC60BBE: 0x0BCA,
+	0x0BC70BBE: 0x0BCB,
+	0x0BC60BD7: 0x0BCC,
+	0x0C460C56: 0x0C48,
+	0x0CBF0CD5: 0x0CC0,
+	0x0CC60CD5: 0x0CC7,
+	0x0CC60CD6: 0x0CC8,
+	0x0CC60CC2: 0x0CCA,
+	0x0CCA0CD5: 0x0CCB,
+	0x0D460D3E: 0x0D4A,
+	0x0D470D3E: 0x0D4B,
+	0x0D460D57: 0x0D4C,
+	0x0DD90DCA: 0x0DDA,
+	0x0DD90DCF: 0x0DDC,
+	0x0DDC0DCA: 0x0DDD,
+	0x0DD90DDF: 0x0DDE,
+	0x1025102E: 0x1026,
+	0x1B051B35: 0x1B06,
+	0x1B071B35: 0x1B08,
+	0x1B091B35: 0x1B0A,
+	0x1B0B1B35: 0x1B0C,
+	0x1B0D1B35: 0x1B0E,
+	0x1B111B35: 0x1B12,
+	0x1B3A1B35: 0x1B3B,
+	0x1B3C1B35: 0x1B3D,
+	0x1B3E1B35: 0x1B40,
+	0x1B3F1B35: 0x1B41,
+	0x1B421B35: 0x1B43,
+	0x00410325: 0x1E00,
+	0x00610325: 0x1E01,
+	0x00420307: 0x1E02,
+	0x00620307: 0x1E03,
+	0x00420323: 0x1E04,
+	0x00620323: 0x1E05,
+	0x00420331: 0x1E06,
+	0x00620331: 0x1E07,
+	0x00C70301: 0x1E08,
+	0x00E70301: 0x1E09,
+	0x00440307: 0x1E0A,
+	0x00640307: 0x1E0B,
+	0x00440323: 0x1E0C,
+	0x00640323: 0x1E0D,
+	0x00440331: 0x1E0E,
+	0x00640331: 0x1E0F,
+	0x00440327: 0x1E10,
+	0x00640327: 0x1E11,
+	0x0044032D: 0x1E12,
+	0x0064032D: 0x1E13,
+	0x01120300: 0x1E14,
+	0x01130300: 0x1E15,
+	0x01120301: 0x1E16,
+	0x01130301: 0x1E17,
+	0x0045032D: 0x1E18,
+	0x0065032D: 0x1E19,
+	0x00450330: 0x1E1A,
+	0x00650330: 0x1E1B,
+	0x02280306: 0x1E1C,
+	0x02290306: 0x1E1D,
+	0x00460307: 0x1E1E,
+	0x00660307: 0x1E1F,
+	0x00470304: 0x1E20,
+	0x00670304: 0x1E21,
+	0x00480307: 0x1E22,
+	0x00680307: 0x1E23,
+	0x00480323: 0x1E24,
+	0x00680323: 0x1E25,
+	0x00480308: 0x1E26,
+	0x00680308: 0x1E27,
+	0x00480327: 0x1E28,
+	0x00680327: 0x1E29,
+	0x0048032E: 0x1E2A,
+	0x0068032E: 0x1E2B,
+	0x00490330: 0x1E2C,
+	0x00690330: 0x1E2D,
+	0x00CF0301: 0x1E2E,
+	0x00EF0301: 0x1E2F,
+	0x004B0301: 0x1E30,
+	0x006B0301: 0x1E31,
+	0x004B0323: 0x1E32,
+	0x006B0323: 0x1E33,
+	0x004B0331: 0x1E34,
+	0x006B0331: 0x1E35,
+	0x004C0323: 0x1E36,
+	0x006C0323: 0x1E37,
+	0x1E360304: 0x1E38,
+	0x1E370304: 0x1E39,
+	0x004C0331: 0x1E3A,
+	0x006C0331: 0x1E3B,
+	0x004C032D: 0x1E3C,
+	0x006C032D: 0x1E3D,
+	0x004D0301: 0x1E3E,
+	0x006D0301: 0x1E3F,
+	0x004D0307: 0x1E40,
+	0x006D0307: 0x1E41,
+	0x004D0323: 0x1E42,
+	0x006D0323: 0x1E43,
+	0x004E0307: 0x1E44,
+	0x006E0307: 0x1E45,
+	0x004E0323: 0x1E46,
+	0x006E0323: 0x1E47,
+	0x004E0331: 0x1E48,
+	0x006E0331: 0x1E49,
+	0x004E032D: 0x1E4A,
+	0x006E032D: 0x1E4B,
+	0x00D50301: 0x1E4C,
+	0x00F50301: 0x1E4D,
+	0x00D50308: 0x1E4E,
+	0x00F50308: 0x1E4F,
+	0x014C0300: 0x1E50,
+	0x014D0300: 0x1E51,
+	0x014C0301: 0x1E52,
+	0x014D0301: 0x1E53,
+	0x00500301: 0x1E54,
+	0x00700301: 0x1E55,
+	0x00500307: 0x1E56,
+	0x00700307: 0x1E57,
+	0x00520307: 0x1E58,
+	0x00720307: 0x1E59,
+	0x00520323: 0x1E5A,
+	0x00720323: 0x1E5B,
+	0x1E5A0304: 0x1E5C,
+	0x1E5B0304: 0x1E5D,
+	0x00520331: 0x1E5E,
+	0x00720331: 0x1E5F,
+	0x00530307: 0x1E60,
+	0x00730307: 0x1E61,
+	0x00530323: 0x1E62,
+	0x00730323: 0x1E63,
+	0x015A0307: 0x1E64,
+	0x015B0307: 0x1E65,
+	0x01600307: 0x1E66,
+	0x01610307: 0x1E67,
+	0x1E620307: 0x1E68,
+	0x1E630307: 0x1E69,
+	0x00540307: 0x1E6A,
+	0x00740307: 0x1E6B,
+	0x00540323: 0x1E6C,
+	0x00740323: 0x1E6D,
+	0x00540331: 0x1E6E,
+	0x00740331: 0x1E6F,
+	0x0054032D: 0x1E70,
+	0x0074032D: 0x1E71,
+	0x00550324: 0x1E72,
+	0x00750324: 0x1E73,
+	0x00550330: 0x1E74,
+	0x00750330: 0x1E75,
+	0x0055032D: 0x1E76,
+	0x0075032D: 0x1E77,
+	0x01680301: 0x1E78,
+	0x01690301: 0x1E79,
+	0x016A0308: 0x1E7A,
+	0x016B0308: 0x1E7B,
+	0x00560303: 0x1E7C,
+	0x00760303: 0x1E7D,
+	0x00560323: 0x1E7E,
+	0x00760323: 0x1E7F,
+	0x00570300: 0x1E80,
+	0x00770300: 0x1E81,
+	0x00570301: 0x1E82,
+	0x00770301: 0x1E83,
+	0x00570308: 0x1E84,
+	0x00770308: 0x1E85,
+	0x00570307: 0x1E86,
+	0x00770307: 0x1E87,
+	0x00570323: 0x1E88,
+	0x00770323: 0x1E89,
+	0x00580307: 0x1E8A,
+	0x00780307: 0x1E8B,
+	0x00580308: 0x1E8C,
+	0x00780308: 0x1E8D,
+	0x00590307: 0x1E8E,
+	0x00790307: 0x1E8F,
+	0x005A0302: 0x1E90,
+	0x007A0302: 0x1E91,
+	0x005A0323: 0x1E92,
+	0x007A0323: 0x1E93,
+	0x005A0331: 0x1E94,
+	0x007A0331: 0x1E95,
+	0x00680331: 0x1E96,
+	0x00740308: 0x1E97,
+	0x0077030A: 0x1E98,
+	0x0079030A: 0x1E99,
+	0x017F0307: 0x1E9B,
+	0x00410323: 0x1EA0,
+	0x00610323: 0x1EA1,
+	0x00410309: 0x1EA2,
+	0x00610309: 0x1EA3,
+	0x00C20301: 0x1EA4,
+	0x00E20301: 0x1EA5,
+	0x00C20300: 0x1EA6,
+	0x00E20300: 0x1EA7,
+	0x00C20309: 0x1EA8,
+	0x00E20309: 0x1EA9,
+	0x00C20303: 0x1EAA,
+	0x00E20303: 0x1EAB,
+	0x1EA00302: 0x1EAC,
+	0x1EA10302: 0x1EAD,
+	0x01020301: 0x1EAE,
+	0x01030301: 0x1EAF,
+	0x01020300: 0x1EB0,
+	0x01030300: 0x1EB1,
+	0x01020309: 0x1EB2,
+	0x01030309: 0x1EB3,
+	0x01020303: 0x1EB4,
+	0x01030303: 0x1EB5,
+	0x1EA00306: 0x1EB6,
+	0x1EA10306: 0x1EB7,
+	0x00450323: 0x1EB8,
+	0x00650323: 0x1EB9,
+	0x00450309: 0x1EBA,
+	0x00650309: 0x1EBB,
+	0x00450303: 0x1EBC,
+	0x00650303: 0x1EBD,
+	0x00CA0301: 0x1EBE,
+	0x00EA0301: 0x1EBF,
+	0x00CA0300: 0x1EC0,
+	0x00EA0300: 0x1EC1,
+	0x00CA0309: 0x1EC2,
+	0x00EA0309: 0x1EC3,
+	0x00CA0303: 0x1EC4,
+	0x00EA0303: 0x1EC5,
+	0x1EB80302: 0x1EC6,
+	0x1EB90302: 0x1EC7,
+	0x00490309: 0x1EC8,
+	0x00690309: 0x1EC9,
+	0x00490323: 0x1ECA,
+	0x00690323: 0x1ECB,
+	0x004F0323: 0x1ECC,
+	0x006F0323: 0x1ECD,
+	0x004F0309: 0x1ECE,
+	0x006F0309: 0x1ECF,
+	0x00D40301: 0x1ED0,
+	0x00F40301: 0x1ED1,
+	0x00D40300: 0x1ED2,
+	0x00F40300: 0x1ED3,
+	0x00D40309: 0x1ED4,
+	0x00F40309: 0x1ED5,
+	0x00D40303: 0x1ED6,
+	0x00F40303: 0x1ED7,
+	0x1ECC0302: 0x1ED8,
+	0x1ECD0302: 0x1ED9,
+	0x01A00301: 0x1EDA,
+	0x01A10301: 0x1EDB,
+	0x01A00300: 0x1EDC,
+	0x01A10300: 0x1EDD,
+	0x01A00309: 0x1EDE,
+	0x01A10309: 0x1EDF,
+	0x01A00303: 0x1EE0,
+	0x01A10303: 0x1EE1,
+	0x01A00323: 0x1EE2,
+	0x01A10323: 0x1EE3,
+	0x00550323: 0x1EE4,
+	0x00750323: 0x1EE5,
+	0x00550309: 0x1EE6,
+	0x00750309: 0x1EE7,
+	0x01AF0301: 0x1EE8,
+	0x01B00301: 0x1EE9,
+	0x01AF0300: 0x1EEA,
+	0x01B00300: 0x1EEB,
+	0x01AF0309: 0x1EEC,
+	0x01B00309: 0x1EED,
+	0x01AF0303: 0x1EEE,
+	0x01B00303: 0x1EEF,
+	0x01AF0323: 0x1EF0,
+	0x01B00323: 0x1EF1,
+	0x00590300: 0x1EF2,
+	0x00790300: 0x1EF3,
+	0x00590323: 0x1EF4,
+	0x00790323: 0x1EF5,
+	0x00590309: 0x1EF6,
+	0x00790309: 0x1EF7,
+	0x00590303: 0x1EF8,
+	0x00790303: 0x1EF9,
+	0x03B10313: 0x1F00,
+	0x03B10314: 0x1F01,
+	0x1F000300: 0x1F02,
+	0x1F010300: 0x1F03,
+	0x1F000301: 0x1F04,
+	0x1F010301: 0x1F05,
+	0x1F000342: 0x1F06,
+	0x1F010342: 0x1F07,
+	0x03910313: 0x1F08,
+	0x03910314: 0x1F09,
+	0x1F080300: 0x1F0A,
+	0x1F090300: 0x1F0B,
+	0x1F080301: 0x1F0C,
+	0x1F090301: 0x1F0D,
+	0x1F080342: 0x1F0E,
+	0x1F090342: 0x1F0F,
+	0x03B50313: 0x1F10,
+	0x03B50314: 0x1F11,
+	0x1F100300: 0x1F12,
+	0x1F110300: 0x1F13,
+	0x1F100301: 0x1F14,
+	0x1F110301: 0x1F15,
+	0x03950313: 0x1F18,
+	0x03950314: 0x1F19,
+	0x1F180300: 0x1F1A,
+	0x1F190300: 0x1F1B,
+	0x1F180301: 0x1F1C,
+	0x1F190301: 0x1F1D,
+	0x03B70313: 0x1F20,
+	0x03B70314: 0x1F21,
+	0x1F200300: 0x1F22,
+	0x1F210300: 0x1F23,
+	0x1F200301: 0x1F24,
+	0x1F210301: 0x1F25,
+	0x1F200342: 0x1F26,
+	0x1F210342: 0x1F27,
+	0x03970313: 0x1F28,
+	0x03970314: 0x1F29,
+	0x1F280300: 0x1F2A,
+	0x1F290300: 0x1F2B,
+	0x1F280301: 0x1F2C,
+	0x1F290301: 0x1F2D,
+	0x1F280342: 0x1F2E,
+	0x1F290342: 0x1F2F,
+	0x03B90313: 0x1F30,
+	0x03B90314: 0x1F31,
+	0x1F300300: 0x1F32,
+	0x1F310300: 0x1F33,
+	0x1F300301: 0x1F34,
+	0x1F310301: 0x1F35,
+	0x1F300342: 0x1F36,
+	0x1F310342: 0x1F37,
+	0x03990313: 0x1F38,
+	0x03990314: 0x1F39,
+	0x1F380300: 0x1F3A,
+	0x1F390300: 0x1F3B,
+	0x1F380301: 0x1F3C,
+	0x1F390301: 0x1F3D,
+	0x1F380342: 0x1F3E,
+	0x1F390342: 0x1F3F,
+	0x03BF0313: 0x1F40,
+	0x03BF0314: 0x1F41,
+	0x1F400300: 0x1F42,
+	0x1F410300: 0x1F43,
+	0x1F400301: 0x1F44,
+	0x1F410301: 0x1F45,
+	0x039F0313: 0x1F48,
+	0x039F0314: 0x1F49,
+	0x1F480300: 0x1F4A,
+	0x1F490300: 0x1F4B,
+	0x1F480301: 0x1F4C,
+	0x1F490301: 0x1F4D,
+	0x03C50313: 0x1F50,
+	0x03C50314: 0x1F51,
+	0x1F500300: 0x1F52,
+	0x1F510300: 0x1F53,
+	0x1F500301: 0x1F54,
+	0x1F510301: 0x1F55,
+	0x1F500342: 0x1F56,
+	0x1F510342: 0x1F57,
+	0x03A50314: 0x1F59,
+	0x1F590300: 0x1F5B,
+	0x1F590301: 0x1F5D,
+	0x1F590342: 0x1F5F,
+	0x03C90313: 0x1F60,
+	0x03C90314: 0x1F61,
+	0x1F600300: 0x1F62,
+	0x1F610300: 0x1F63,
+	0x1F600301: 0x1F64,
+	0x1F610301: 0x1F65,
+	0x1F600342: 0x1F66,
+	0x1F610342: 0x1F67,
+	0x03A90313: 0x1F68,
+	0x03A90314: 0x1F69,
+	0x1F680300: 0x1F6A,
+	0x1F690300: 0x1F6B,
+	0x1F680301: 0x1F6C,
+	0x1F690301: 0x1F6D,
+	0x1F680342: 0x1F6E,
+	0x1F690342: 0x1F6F,
+	0x03B10300: 0x1F70,
+	0x03B50300: 0x1F72,
+	0x03B70300: 0x1F74,
+	0x03B90300: 0x1F76,
+	0x03BF0300: 0x1F78,
+	0x03C50300: 0x1F7A,
+	0x03C90300: 0x1F7C,
+	0x1F000345: 0x1F80,
+	0x1F010345: 0x1F81,
+	0x1F020345: 0x1F82,
+	0x1F030345: 0x1F83,
+	0x1F040345: 0x1F84,
+	0x1F050345: 0x1F85,
+	0x1F060345: 0x1F86,
+	0x1F070345: 0x1F87,
+	0x1F080345: 0x1F88,
+	0x1F090345: 0x1F89,
+	0x1F0A0345: 0x1F8A,
+	0x1F0B0345: 0x1F8B,
+	0x1F0C0345: 0x1F8C,
+	0x1F0D0345: 0x1F8D,
+	0x1F0E0345: 0x1F8E,
+	0x1F0F0345: 0x1F8F,
+	0x1F200345: 0x1F90,
+	0x1F210345: 0x1F91,
+	0x1F220345: 0x1F92,
+	0x1F230345: 0x1F93,
+	0x1F240345: 0x1F94,
+	0x1F250345: 0x1F95,
+	0x1F260345: 0x1F96,
+	0x1F270345: 0x1F97,
+	0x1F280345: 0x1F98,
+	0x1F290345: 0x1F99,
+	0x1F2A0345: 0x1F9A,
+	0x1F2B0345: 0x1F9B,
+	0x1F2C0345: 0x1F9C,
+	0x1F2D0345: 0x1F9D,
+	0x1F2E0345: 0x1F9E,
+	0x1F2F0345: 0x1F9F,
+	0x1F600345: 0x1FA0,
+	0x1F610345: 0x1FA1,
+	0x1F620345: 0x1FA2,
+	0x1F630345: 0x1FA3,
+	0x1F640345: 0x1FA4,
+	0x1F650345: 0x1FA5,
+	0x1F660345: 0x1FA6,
+	0x1F670345: 0x1FA7,
+	0x1F680345: 0x1FA8,
+	0x1F690345: 0x1FA9,
+	0x1F6A0345: 0x1FAA,
+	0x1F6B0345: 0x1FAB,
+	0x1F6C0345: 0x1FAC,
+	0x1F6D0345: 0x1FAD,
+	0x1F6E0345: 0x1FAE,
+	0x1F6F0345: 0x1FAF,
+	0x03B10306: 0x1FB0,
+	0x03B10304: 0x1FB1,
+	0x1F700345: 0x1FB2,
+	0x03B10345: 0x1FB3,
+	0x03AC0345: 0x1FB4,
+	0x03B10342: 0x1FB6,
+	0x1FB60345: 0x1FB7,
+	0x03910306: 0x1FB8,
+	0x03910304: 0x1FB9,
+	0x03910300: 0x1FBA,
+	0x03910345: 0x1FBC,
+	0x00A80342: 0x1FC1,
+	0x1F740345: 0x1FC2,
+	0x03B70345: 0x1FC3,
+	0x03AE0345: 0x1FC4,
+	0x03B70342: 0x1FC6,
+	0x1FC60345: 0x1FC7,
+	0x03950300: 0x1FC8,
+	0x03970300: 0x1FCA,
+	0x03970345: 0x1FCC,
+	0x1FBF0300: 0x1FCD,
+	0x1FBF0301: 0x1FCE,
+	0x1FBF0342: 0x1FCF,
+	0x03B90306: 0x1FD0,
+	0x03B90304: 0x1FD1,
+	0x03CA0300: 0x1FD2,
+	0x03B90342: 0x1FD6,
+	0x03CA0342: 0x1FD7,
+	0x03990306: 0x1FD8,
+	0x03990304: 0x1FD9,
+	0x03990300: 0x1FDA,
+	0x1FFE0300: 0x1FDD,
+	0x1FFE0301: 0x1FDE,
+	0x1FFE0342: 0x1FDF,
+	0x03C50306: 0x1FE0,
+	0x03C50304: 0x1FE1,
+	0x03CB0300: 0x1FE2,
+	0x03C10313: 0x1FE4,
+	0x03C10314: 0x1FE5,
+	0x03C50342: 0x1FE6,
+	0x03CB0342: 0x1FE7,
+	0x03A50306: 0x1FE8,
+	0x03A50304: 0x1FE9,
+	0x03A50300: 0x1FEA,
+	0x03A10314: 0x1FEC,
+	0x00A80300: 0x1FED,
+	0x1F7C0345: 0x1FF2,
+	0x03C90345: 0x1FF3,
+	0x03CE0345: 0x1FF4,
+	0x03C90342: 0x1FF6,
+	0x1FF60345: 0x1FF7,
+	0x039F0300: 0x1FF8,
+	0x03A90300: 0x1FFA,
+	0x03A90345: 0x1FFC,
+	0x21900338: 0x219A,
+	0x21920338: 0x219B,
+	0x21940338: 0x21AE,
+	0x21D00338: 0x21CD,
+	0x21D40338: 0x21CE,
+	0x21D20338: 0x21CF,
+	0x22030338: 0x2204,
+	0x22080338: 0x2209,
+	0x220B0338: 0x220C,
+	0x22230338: 0x2224,
+	0x22250338: 0x2226,
+	0x223C0338: 0x2241,
+	0x22430338: 0x2244,
+	0x22450338: 0x2247,
+	0x22480338: 0x2249,
+	0x003D0338: 0x2260,
+	0x22610338: 0x2262,
+	0x224D0338: 0x226D,
+	0x003C0338: 0x226E,
+	0x003E0338: 0x226F,
+	0x22640338: 0x2270,
+	0x22650338: 0x2271,
+	0x22720338: 0x2274,
+	0x22730338: 0x2275,
+	0x22760338: 0x2278,
+	0x22770338: 0x2279,
+	0x227A0338: 0x2280,
+	0x227B0338: 0x2281,
+	0x22820338: 0x2284,
+	0x22830338: 0x2285,
+	0x22860338: 0x2288,
+	0x22870338: 0x2289,
+	0x22A20338: 0x22AC,
+	0x22A80338: 0x22AD,
+	0x22A90338: 0x22AE,
+	0x22AB0338: 0x22AF,
+	0x227C0338: 0x22E0,
+	0x227D0338: 0x22E1,
+	0x22910338: 0x22E2,
+	0x22920338: 0x22E3,
+	0x22B20338: 0x22EA,
+	0x22B30338: 0x22EB,
+	0x22B40338: 0x22EC,
+	0x22B50338: 0x22ED,
+	0x304B3099: 0x304C,
+	0x304D3099: 0x304E,
+	0x304F3099: 0x3050,
+	0x30513099: 0x3052,
+	0x30533099: 0x3054,
+	0x30553099: 0x3056,
+	0x30573099: 0x3058,
+	0x30593099: 0x305A,
+	0x305B3099: 0x305C,
+	0x305D3099: 0x305E,
+	0x305F3099: 0x3060,
+	0x30613099: 0x3062,
+	0x30643099: 0x3065,
+	0x30663099: 0x3067,
+	0x30683099: 0x3069,
+	0x306F3099: 0x3070,
+	0x306F309A: 0x3071,
+	0x30723099: 0x3073,
+	0x3072309A: 0x3074,
+	0x30753099: 0x3076,
+	0x3075309A: 0x3077,
+	0x30783099: 0x3079,
+	0x3078309A: 0x307A,
+	0x307B3099: 0x307C,
+	0x307B309A: 0x307D,
+	0x30463099: 0x3094,
+	0x309D3099: 0x309E,
+	0x30AB3099: 0x30AC,
+	0x30AD3099: 0x30AE,
+	0x30AF3099: 0x30B0,
+	0x30B13099: 0x30B2,
+	0x30B33099: 0x30B4,
+	0x30B53099: 0x30B6,
+	0x30B73099: 0x30B8,
+	0x30B93099: 0x30BA,
+	0x30BB3099: 0x30BC,
+	0x30BD3099: 0x30BE,
+	0x30BF3099: 0x30C0,
+	0x30C13099: 0x30C2,
+	0x30C43099: 0x30C5,
+	0x30C63099: 0x30C7,
+	0x30C83099: 0x30C9,
+	0x30CF3099: 0x30D0,
+	0x30CF309A: 0x30D1,
+	0x30D23099: 0x30D3,
+	0x30D2309A: 0x30D4,
+	0x30D53099: 0x30D6,
+	0x30D5309A: 0x30D7,
+	0x30D83099: 0x30D9,
+	0x30D8309A: 0x30DA,
+	0x30DB3099: 0x30DC,
+	0x30DB309A: 0x30DD,
+	0x30A63099: 0x30F4,
+	0x30EF3099: 0x30F7,
+	0x30F03099: 0x30F8,
+	0x30F13099: 0x30F9,
+	0x30F23099: 0x30FA,
+	0x30FD3099: 0x30FE,
+	0x109910BA: 0x1109A,
+	0x109B10BA: 0x1109C,
+	0x10A510BA: 0x110AB,
+	0x11311127: 0x1112E,
+	0x11321127: 0x1112F,
+	0x1347133E: 0x1134B,
+	0x13471357: 0x1134C,
+	0x14B914BA: 0x114BB,
+	0x14B914B0: 0x114BC,
+	0x14B914BD: 0x114BE,
+	0x15B815AF: 0x115BA,
+	0x15B915AF: 0x115BB,
+}
+
+// Total size of tables: 53KB (53976 bytes)
diff --git a/vendor/golang.org/x/text/unicode/norm/transform.go b/vendor/golang.org/x/text/unicode/norm/transform.go
new file mode 100644
index 0000000000..8589067cde
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/transform.go
@@ -0,0 +1,88 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package norm
+
+import (
+	"unicode/utf8"
+
+	"golang.org/x/text/transform"
+)
+
+// Reset implements the Reset method of the transform.Transformer interface.
+func (Form) Reset() {}
+
+// Transform implements the Transform method of the transform.Transformer
+// interface. It may need to write segments of up to MaxSegmentSize at once.
+// Users should either catch ErrShortDst and allow dst to grow or have dst be at
+// least of size MaxTransformChunkSize to be guaranteed of progress.
+func (f Form) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	n := 0
+	// Cap the maximum number of src bytes to check.
+	b := src
+	eof := atEOF
+	if ns := len(dst); ns < len(b) {
+		err = transform.ErrShortDst
+		eof = false
+		b = b[:ns]
+	}
+	i, ok := formTable[f].quickSpan(inputBytes(b), n, len(b), eof)
+	n += copy(dst[n:], b[n:i])
+	if !ok {
+		nDst, nSrc, err = f.transform(dst[n:], src[n:], atEOF)
+		return nDst + n, nSrc + n, err
+	}
+	if n < len(src) && !atEOF {
+		err = transform.ErrShortSrc
+	}
+	return n, n, err
+}
+
+func flushTransform(rb *reorderBuffer) bool {
+	// Write out (must fully fit in dst, or else it is a ErrShortDst).
+	if len(rb.out) < rb.nrune*utf8.UTFMax {
+		return false
+	}
+	rb.out = rb.out[rb.flushCopy(rb.out):]
+	return true
+}
+
+var errs = []error{nil, transform.ErrShortDst, transform.ErrShortSrc}
+
+// transform implements the transform.Transformer interface. It is only called
+// when quickSpan does not pass for a given string.
+func (f Form) transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	// TODO: get rid of reorderBuffer. See CL 23460044.
+	rb := reorderBuffer{}
+	rb.init(f, src)
+	for {
+		// Load segment into reorder buffer.
+		rb.setFlusher(dst[nDst:], flushTransform)
+		end := decomposeSegment(&rb, nSrc, atEOF)
+		if end < 0 {
+			return nDst, nSrc, errs[-end]
+		}
+		nDst = len(dst) - len(rb.out)
+		nSrc = end
+
+		// Next quickSpan.
+		end = rb.nsrc
+		eof := atEOF
+		if n := nSrc + len(dst) - nDst; n < end {
+			err = transform.ErrShortDst
+			end = n
+			eof = false
+		}
+		end, ok := rb.f.quickSpan(rb.src, nSrc, end, eof)
+		n := copy(dst[nDst:], rb.src.bytes[nSrc:end])
+		nSrc += n
+		nDst += n
+		if ok {
+			if n < rb.nsrc && !atEOF {
+				err = transform.ErrShortSrc
+			}
+			return nDst, nSrc, err
+		}
+	}
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/trie.go b/vendor/golang.org/x/text/unicode/norm/trie.go
new file mode 100644
index 0000000000..423386bf43
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/trie.go
@@ -0,0 +1,54 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package norm
+
+type valueRange struct {
+	value  uint16 // header: value:stride
+	lo, hi byte   // header: lo:n
+}
+
+type sparseBlocks struct {
+	values []valueRange
+	offset []uint16
+}
+
+var nfcSparse = sparseBlocks{
+	values: nfcSparseValues[:],
+	offset: nfcSparseOffset[:],
+}
+
+var nfkcSparse = sparseBlocks{
+	values: nfkcSparseValues[:],
+	offset: nfkcSparseOffset[:],
+}
+
+var (
+	nfcData  = newNfcTrie(0)
+	nfkcData = newNfkcTrie(0)
+)
+
+// lookupValue determines the type of block n and looks up the value for b.
+// For n < t.cutoff, the block is a simple lookup table. Otherwise, the block
+// is a list of ranges with an accompanying value. Given a matching range r,
+// the value for b is by r.value + (b - r.lo) * stride.
+func (t *sparseBlocks) lookup(n uint32, b byte) uint16 {
+	offset := t.offset[n]
+	header := t.values[offset]
+	lo := offset + 1
+	hi := lo + uint16(header.lo)
+	for lo < hi {
+		m := lo + (hi-lo)/2
+		r := t.values[m]
+		if r.lo <= b && b <= r.hi {
+			return r.value + uint16(b-r.lo)*header.value
+		}
+		if b < r.lo {
+			hi = m
+		} else {
+			lo = m + 1
+		}
+	}
+	return 0
+}
diff --git a/vendor/golang.org/x/text/unicode/norm/triegen.go b/vendor/golang.org/x/text/unicode/norm/triegen.go
new file mode 100644
index 0000000000..45d711900d
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/triegen.go
@@ -0,0 +1,117 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+// Trie table generator.
+// Used by make*tables tools to generate a go file with trie data structures
+// for mapping UTF-8 to a 16-bit value. All but the last byte in a UTF-8 byte
+// sequence are used to lookup offsets in the index table to be used for the
+// next byte. The last byte is used to index into a table with 16-bit values.
+
+package main
+
+import (
+	"fmt"
+	"io"
+)
+
+const maxSparseEntries = 16
+
+type normCompacter struct {
+	sparseBlocks [][]uint64
+	sparseOffset []uint16
+	sparseCount  int
+	name         string
+}
+
+func mostFrequentStride(a []uint64) int {
+	counts := make(map[int]int)
+	var v int
+	for _, x := range a {
+		if stride := int(x) - v; v != 0 && stride >= 0 {
+			counts[stride]++
+		}
+		v = int(x)
+	}
+	var maxs, maxc int
+	for stride, cnt := range counts {
+		if cnt > maxc || (cnt == maxc && stride < maxs) {
+			maxs, maxc = stride, cnt
+		}
+	}
+	return maxs
+}
+
+func countSparseEntries(a []uint64) int {
+	stride := mostFrequentStride(a)
+	var v, count int
+	for _, tv := range a {
+		if int(tv)-v != stride {
+			if tv != 0 {
+				count++
+			}
+		}
+		v = int(tv)
+	}
+	return count
+}
+
+func (c *normCompacter) Size(v []uint64) (sz int, ok bool) {
+	if n := countSparseEntries(v); n <= maxSparseEntries {
+		return (n+1)*4 + 2, true
+	}
+	return 0, false
+}
+
+func (c *normCompacter) Store(v []uint64) uint32 {
+	h := uint32(len(c.sparseOffset))
+	c.sparseBlocks = append(c.sparseBlocks, v)
+	c.sparseOffset = append(c.sparseOffset, uint16(c.sparseCount))
+	c.sparseCount += countSparseEntries(v) + 1
+	return h
+}
+
+func (c *normCompacter) Handler() string {
+	return c.name + "Sparse.lookup"
+}
+
+func (c *normCompacter) Print(w io.Writer) (retErr error) {
+	p := func(f string, x ...interface{}) {
+		if _, err := fmt.Fprintf(w, f, x...); retErr == nil && err != nil {
+			retErr = err
+		}
+	}
+
+	ls := len(c.sparseBlocks)
+	p("// %sSparseOffset: %d entries, %d bytes\n", c.name, ls, ls*2)
+	p("var %sSparseOffset = %#v\n\n", c.name, c.sparseOffset)
+
+	ns := c.sparseCount
+	p("// %sSparseValues: %d entries, %d bytes\n", c.name, ns, ns*4)
+	p("var %sSparseValues = [%d]valueRange {", c.name, ns)
+	for i, b := range c.sparseBlocks {
+		p("\n// Block %#x, offset %#x", i, c.sparseOffset[i])
+		var v int
+		stride := mostFrequentStride(b)
+		n := countSparseEntries(b)
+		p("\n{value:%#04x,lo:%#02x},", stride, uint8(n))
+		for i, nv := range b {
+			if int(nv)-v != stride {
+				if v != 0 {
+					p(",hi:%#02x},", 0x80+i-1)
+				}
+				if nv != 0 {
+					p("\n{value:%#04x,lo:%#02x", nv, 0x80+i)
+				}
+			}
+			v = int(nv)
+		}
+		if v != 0 {
+			p(",hi:%#02x},", 0x80+len(b)-1)
+		}
+	}
+	p("\n}\n\n")
+	return
+}
diff --git a/vendor/golang.org/x/text/width/gen.go b/vendor/golang.org/x/text/width/gen.go
new file mode 100644
index 0000000000..03d9f99ad6
--- /dev/null
+++ b/vendor/golang.org/x/text/width/gen.go
@@ -0,0 +1,115 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+// This program generates the trie for width operations. The generated table
+// includes width category information as well as the normalization mappings.
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"log"
+	"math"
+	"unicode/utf8"
+
+	"golang.org/x/text/internal/gen"
+	"golang.org/x/text/internal/triegen"
+)
+
+// See gen_common.go for flags.
+
+func main() {
+	gen.Init()
+	genTables()
+	genTests()
+	gen.Repackage("gen_trieval.go", "trieval.go", "width")
+	gen.Repackage("gen_common.go", "common_test.go", "width")
+}
+
+func genTables() {
+	t := triegen.NewTrie("width")
+	// fold and inverse mappings. See mapComment for a description of the format
+	// of each entry. Add dummy value to make an index of 0 mean no mapping.
+	inverse := [][4]byte{{}}
+	mapping := map[[4]byte]int{[4]byte{}: 0}
+
+	getWidthData(func(r rune, tag elem, alt rune) {
+		idx := 0
+		if alt != 0 {
+			var buf [4]byte
+			buf[0] = byte(utf8.EncodeRune(buf[1:], alt))
+			s := string(r)
+			buf[buf[0]] ^= s[len(s)-1]
+			var ok bool
+			if idx, ok = mapping[buf]; !ok {
+				idx = len(mapping)
+				if idx > math.MaxUint8 {
+					log.Fatalf("Index %d does not fit in a byte.", idx)
+				}
+				mapping[buf] = idx
+				inverse = append(inverse, buf)
+			}
+		}
+		t.Insert(r, uint64(tag|elem(idx)))
+	})
+
+	w := &bytes.Buffer{}
+	gen.WriteUnicodeVersion(w)
+
+	sz, err := t.Gen(w)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	sz += writeMappings(w, inverse)
+
+	fmt.Fprintf(w, "// Total table size %d bytes (%dKiB)\n", sz, sz/1024)
+
+	gen.WriteGoFile(*outputFile, "width", w.Bytes())
+}
+
+const inverseDataComment = `
+// inverseData contains 4-byte entries of the following format:
+//   <length> <modified UTF-8-encoded rune> <0 padding>
+// The last byte of the UTF-8-encoded rune is xor-ed with the last byte of the
+// UTF-8 encoding of the original rune. Mappings often have the following
+// pattern:
+//   Ａ -> A  (U+FF21 -> U+0041)
+//   Ｂ -> B  (U+FF22 -> U+0042)
+//   ...
+// By xor-ing the last byte the same entry can be shared by many mappings. This
+// reduces the total number of distinct entries by about two thirds.
+// The resulting entry for the aforementioned mappings is
+//   { 0x01, 0xE0, 0x00, 0x00 }
+// Using this entry to map U+FF21 (UTF-8 [EF BC A1]), we get
+//   E0 ^ A1 = 41.
+// Similarly, for U+FF22 (UTF-8 [EF BC A2]), we get
+//   E0 ^ A2 = 42.
+// Note that because of the xor-ing, the byte sequence stored in the entry is
+// not valid UTF-8.`
+
+func writeMappings(w io.Writer, data [][4]byte) int {
+	fmt.Fprintln(w, inverseDataComment)
+	fmt.Fprintf(w, "var inverseData = [%d][4]byte{\n", len(data))
+	for _, x := range data {
+		fmt.Fprintf(w, "{ 0x%02x, 0x%02x, 0x%02x, 0x%02x },\n", x[0], x[1], x[2], x[3])
+	}
+	fmt.Fprintln(w, "}")
+	return len(data) * 4
+}
+
+func genTests() {
+	w := &bytes.Buffer{}
+	fmt.Fprintf(w, "\nvar mapRunes = map[rune]struct{r rune; e elem}{\n")
+	getWidthData(func(r rune, tag elem, alt rune) {
+		if alt != 0 {
+			fmt.Fprintf(w, "\t0x%X: {0x%X, 0x%X},\n", r, alt, tag)
+		}
+	})
+	fmt.Fprintln(w, "}")
+	gen.WriteGoFile("runes_test.go", "width", w.Bytes())
+}
diff --git a/vendor/golang.org/x/text/width/gen_common.go b/vendor/golang.org/x/text/width/gen_common.go
new file mode 100644
index 0000000000..601e752684
--- /dev/null
+++ b/vendor/golang.org/x/text/width/gen_common.go
@@ -0,0 +1,96 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+package main
+
+// This code is shared between the main code generator and the test code.
+
+import (
+	"flag"
+	"log"
+	"strconv"
+	"strings"
+
+	"golang.org/x/text/internal/gen"
+	"golang.org/x/text/internal/ucd"
+)
+
+var (
+	outputFile = flag.String("out", "tables.go", "output file")
+)
+
+var typeMap = map[string]elem{
+	"A":  tagAmbiguous,
+	"N":  tagNeutral,
+	"Na": tagNarrow,
+	"W":  tagWide,
+	"F":  tagFullwidth,
+	"H":  tagHalfwidth,
+}
+
+// getWidthData calls f for every entry for which it is defined.
+//
+// f may be called multiple times for the same rune. The last call to f is the
+// correct value. f is not called for all runes. The default tag type is
+// Neutral.
+func getWidthData(f func(r rune, tag elem, alt rune)) {
+	// Set the default values for Unified Ideographs. In line with Annex 11,
+	// we encode full ranges instead of the defined runes in Unified_Ideograph.
+	for _, b := range []struct{ lo, hi rune }{
+		{0x4E00, 0x9FFF},   // the CJK Unified Ideographs block,
+		{0x3400, 0x4DBF},   // the CJK Unified Ideographs Externsion A block,
+		{0xF900, 0xFAFF},   // the CJK Compatibility Ideographs block,
+		{0x20000, 0x2FFFF}, // the Supplementary Ideographic Plane,
+		{0x30000, 0x3FFFF}, // the Tertiary Ideographic Plane,
+	} {
+		for r := b.lo; r <= b.hi; r++ {
+			f(r, tagWide, 0)
+		}
+	}
+
+	inverse := map[rune]rune{}
+	maps := map[string]bool{
+		"<wide>":   true,
+		"<narrow>": true,
+	}
+
+	// We cannot reuse package norm's decomposition, as we need an unexpanded
+	// decomposition. We make use of the opportunity to verify that the
+	// decomposition type is as expected.
+	ucd.Parse(gen.OpenUCDFile("UnicodeData.txt"), func(p *ucd.Parser) {
+		r := p.Rune(0)
+		s := strings.SplitN(p.String(ucd.DecompMapping), " ", 2)
+		if !maps[s[0]] {
+			return
+		}
+		x, err := strconv.ParseUint(s[1], 16, 32)
+		if err != nil {
+			log.Fatalf("Error parsing rune %q", s[1])
+		}
+		if inverse[r] != 0 || inverse[rune(x)] != 0 {
+			log.Fatalf("Circular dependency in mapping between %U and %U", r, x)
+		}
+		inverse[r] = rune(x)
+		inverse[rune(x)] = r
+	})
+
+	// <rune range>;<type>
+	ucd.Parse(gen.OpenUCDFile("EastAsianWidth.txt"), func(p *ucd.Parser) {
+		tag, ok := typeMap[p.String(1)]
+		if !ok {
+			log.Fatalf("Unknown width type %q", p.String(1))
+		}
+		r := p.Rune(0)
+		alt, ok := inverse[r]
+		if tag == tagFullwidth || tag == tagHalfwidth && r != wonSign {
+			tag |= tagNeedsFold
+			if !ok {
+				log.Fatalf("Narrow or wide rune %U has no decomposition", r)
+			}
+		}
+		f(r, tag, alt)
+	})
+}
diff --git a/vendor/golang.org/x/text/width/gen_trieval.go b/vendor/golang.org/x/text/width/gen_trieval.go
new file mode 100644
index 0000000000..c17334aa61
--- /dev/null
+++ b/vendor/golang.org/x/text/width/gen_trieval.go
@@ -0,0 +1,34 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+package main
+
+// elem is an entry of the width trie. The high byte is used to encode the type
+// of the rune. The low byte is used to store the index to a mapping entry in
+// the inverseData array.
+type elem uint16
+
+const (
+	tagNeutral elem = iota << typeShift
+	tagAmbiguous
+	tagWide
+	tagNarrow
+	tagFullwidth
+	tagHalfwidth
+)
+
+const (
+	numTypeBits = 3
+	typeShift   = 16 - numTypeBits
+
+	// tagNeedsFold is true for all fullwidth and halfwidth runes except for
+	// the Won sign U+20A9.
+	tagNeedsFold = 0x1000
+
+	// The Korean Won sign is halfwidth, but SHOULD NOT be mapped to a wide
+	// variant.
+	wonSign rune = 0x20A9
+)
diff --git a/vendor/golang.org/x/text/width/kind_string.go b/vendor/golang.org/x/text/width/kind_string.go
new file mode 100644
index 0000000000..ab4fee542f
--- /dev/null
+++ b/vendor/golang.org/x/text/width/kind_string.go
@@ -0,0 +1,16 @@
+// Code generated by "stringer -type=Kind"; DO NOT EDIT
+
+package width
+
+import "fmt"
+
+const _Kind_name = "NeutralEastAsianAmbiguousEastAsianWideEastAsianNarrowEastAsianFullwidthEastAsianHalfwidth"
+
+var _Kind_index = [...]uint8{0, 7, 25, 38, 53, 71, 89}
+
+func (i Kind) String() string {
+	if i < 0 || i >= Kind(len(_Kind_index)-1) {
+		return fmt.Sprintf("Kind(%d)", i)
+	}
+	return _Kind_name[_Kind_index[i]:_Kind_index[i+1]]
+}
diff --git a/vendor/golang.org/x/text/width/tables.go b/vendor/golang.org/x/text/width/tables.go
new file mode 100644
index 0000000000..242da0fdb9
--- /dev/null
+++ b/vendor/golang.org/x/text/width/tables.go
@@ -0,0 +1,1284 @@
+// This file was generated by go generate; DO NOT EDIT
+
+package width
+
+// UnicodeVersion is the Unicode version from which the tables in this package are derived.
+const UnicodeVersion = "9.0.0"
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *widthTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return widthValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = widthIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *widthTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return widthValues[c0]
+	}
+	i := widthIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *widthTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return widthValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = widthIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *widthTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return widthValues[c0]
+	}
+	i := widthIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// widthTrie. Total size: 14080 bytes (13.75 KiB). Checksum: 3b8aeb3dc03667a3.
+type widthTrie struct{}
+
+func newWidthTrie(i int) *widthTrie {
+	return &widthTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *widthTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	default:
+		return uint16(widthValues[n<<6+uint32(b)])
+	}
+}
+
+// widthValues: 99 blocks, 6336 entries, 12672 bytes
+// The third block is the zero block.
+var widthValues = [6336]uint16{
+	// Block 0x0, offset 0x0
+	0x20: 0x6001, 0x21: 0x6002, 0x22: 0x6002, 0x23: 0x6002,
+	0x24: 0x6002, 0x25: 0x6002, 0x26: 0x6002, 0x27: 0x6002, 0x28: 0x6002, 0x29: 0x6002,
+	0x2a: 0x6002, 0x2b: 0x6002, 0x2c: 0x6002, 0x2d: 0x6002, 0x2e: 0x6002, 0x2f: 0x6002,
+	0x30: 0x6002, 0x31: 0x6002, 0x32: 0x6002, 0x33: 0x6002, 0x34: 0x6002, 0x35: 0x6002,
+	0x36: 0x6002, 0x37: 0x6002, 0x38: 0x6002, 0x39: 0x6002, 0x3a: 0x6002, 0x3b: 0x6002,
+	0x3c: 0x6002, 0x3d: 0x6002, 0x3e: 0x6002, 0x3f: 0x6002,
+	// Block 0x1, offset 0x40
+	0x40: 0x6003, 0x41: 0x6003, 0x42: 0x6003, 0x43: 0x6003, 0x44: 0x6003, 0x45: 0x6003,
+	0x46: 0x6003, 0x47: 0x6003, 0x48: 0x6003, 0x49: 0x6003, 0x4a: 0x6003, 0x4b: 0x6003,
+	0x4c: 0x6003, 0x4d: 0x6003, 0x4e: 0x6003, 0x4f: 0x6003, 0x50: 0x6003, 0x51: 0x6003,
+	0x52: 0x6003, 0x53: 0x6003, 0x54: 0x6003, 0x55: 0x6003, 0x56: 0x6003, 0x57: 0x6003,
+	0x58: 0x6003, 0x59: 0x6003, 0x5a: 0x6003, 0x5b: 0x6003, 0x5c: 0x6003, 0x5d: 0x6003,
+	0x5e: 0x6003, 0x5f: 0x6003, 0x60: 0x6004, 0x61: 0x6004, 0x62: 0x6004, 0x63: 0x6004,
+	0x64: 0x6004, 0x65: 0x6004, 0x66: 0x6004, 0x67: 0x6004, 0x68: 0x6004, 0x69: 0x6004,
+	0x6a: 0x6004, 0x6b: 0x6004, 0x6c: 0x6004, 0x6d: 0x6004, 0x6e: 0x6004, 0x6f: 0x6004,
+	0x70: 0x6004, 0x71: 0x6004, 0x72: 0x6004, 0x73: 0x6004, 0x74: 0x6004, 0x75: 0x6004,
+	0x76: 0x6004, 0x77: 0x6004, 0x78: 0x6004, 0x79: 0x6004, 0x7a: 0x6004, 0x7b: 0x6004,
+	0x7c: 0x6004, 0x7d: 0x6004, 0x7e: 0x6004,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xe1: 0x2000, 0xe2: 0x6005, 0xe3: 0x6005,
+	0xe4: 0x2000, 0xe5: 0x6006, 0xe6: 0x6005, 0xe7: 0x2000, 0xe8: 0x2000,
+	0xea: 0x2000, 0xec: 0x6007, 0xed: 0x2000, 0xee: 0x2000, 0xef: 0x6008,
+	0xf0: 0x2000, 0xf1: 0x2000, 0xf2: 0x2000, 0xf3: 0x2000, 0xf4: 0x2000,
+	0xf6: 0x2000, 0xf7: 0x2000, 0xf8: 0x2000, 0xf9: 0x2000, 0xfa: 0x2000,
+	0xfc: 0x2000, 0xfd: 0x2000, 0xfe: 0x2000, 0xff: 0x2000,
+	// Block 0x4, offset 0x100
+	0x106: 0x2000,
+	0x110: 0x2000,
+	0x117: 0x2000,
+	0x118: 0x2000,
+	0x11e: 0x2000, 0x11f: 0x2000, 0x120: 0x2000, 0x121: 0x2000,
+	0x126: 0x2000, 0x128: 0x2000, 0x129: 0x2000,
+	0x12a: 0x2000, 0x12c: 0x2000, 0x12d: 0x2000,
+	0x130: 0x2000, 0x132: 0x2000, 0x133: 0x2000,
+	0x137: 0x2000, 0x138: 0x2000, 0x139: 0x2000, 0x13a: 0x2000,
+	0x13c: 0x2000, 0x13e: 0x2000,
+	// Block 0x5, offset 0x140
+	0x141: 0x2000,
+	0x151: 0x2000,
+	0x153: 0x2000,
+	0x15b: 0x2000,
+	0x166: 0x2000, 0x167: 0x2000,
+	0x16b: 0x2000,
+	0x171: 0x2000, 0x172: 0x2000, 0x173: 0x2000,
+	0x178: 0x2000,
+	0x17f: 0x2000,
+	// Block 0x6, offset 0x180
+	0x180: 0x2000, 0x181: 0x2000, 0x182: 0x2000, 0x184: 0x2000,
+	0x188: 0x2000, 0x189: 0x2000, 0x18a: 0x2000, 0x18b: 0x2000,
+	0x18d: 0x2000,
+	0x192: 0x2000, 0x193: 0x2000,
+	0x1a6: 0x2000, 0x1a7: 0x2000,
+	0x1ab: 0x2000,
+	// Block 0x7, offset 0x1c0
+	0x1ce: 0x2000, 0x1d0: 0x2000,
+	0x1d2: 0x2000, 0x1d4: 0x2000, 0x1d6: 0x2000,
+	0x1d8: 0x2000, 0x1da: 0x2000, 0x1dc: 0x2000,
+	// Block 0x8, offset 0x200
+	0x211: 0x2000,
+	0x221: 0x2000,
+	// Block 0x9, offset 0x240
+	0x244: 0x2000,
+	0x247: 0x2000, 0x249: 0x2000, 0x24a: 0x2000, 0x24b: 0x2000,
+	0x24d: 0x2000, 0x250: 0x2000,
+	0x258: 0x2000, 0x259: 0x2000, 0x25a: 0x2000, 0x25b: 0x2000, 0x25d: 0x2000,
+	0x25f: 0x2000,
+	// Block 0xa, offset 0x280
+	0x280: 0x2000, 0x281: 0x2000, 0x282: 0x2000, 0x283: 0x2000, 0x284: 0x2000, 0x285: 0x2000,
+	0x286: 0x2000, 0x287: 0x2000, 0x288: 0x2000, 0x289: 0x2000, 0x28a: 0x2000, 0x28b: 0x2000,
+	0x28c: 0x2000, 0x28d: 0x2000, 0x28e: 0x2000, 0x28f: 0x2000, 0x290: 0x2000, 0x291: 0x2000,
+	0x292: 0x2000, 0x293: 0x2000, 0x294: 0x2000, 0x295: 0x2000, 0x296: 0x2000, 0x297: 0x2000,
+	0x298: 0x2000, 0x299: 0x2000, 0x29a: 0x2000, 0x29b: 0x2000, 0x29c: 0x2000, 0x29d: 0x2000,
+	0x29e: 0x2000, 0x29f: 0x2000, 0x2a0: 0x2000, 0x2a1: 0x2000, 0x2a2: 0x2000, 0x2a3: 0x2000,
+	0x2a4: 0x2000, 0x2a5: 0x2000, 0x2a6: 0x2000, 0x2a7: 0x2000, 0x2a8: 0x2000, 0x2a9: 0x2000,
+	0x2aa: 0x2000, 0x2ab: 0x2000, 0x2ac: 0x2000, 0x2ad: 0x2000, 0x2ae: 0x2000, 0x2af: 0x2000,
+	0x2b0: 0x2000, 0x2b1: 0x2000, 0x2b2: 0x2000, 0x2b3: 0x2000, 0x2b4: 0x2000, 0x2b5: 0x2000,
+	0x2b6: 0x2000, 0x2b7: 0x2000, 0x2b8: 0x2000, 0x2b9: 0x2000, 0x2ba: 0x2000, 0x2bb: 0x2000,
+	0x2bc: 0x2000, 0x2bd: 0x2000, 0x2be: 0x2000, 0x2bf: 0x2000,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x2000, 0x2c1: 0x2000, 0x2c2: 0x2000, 0x2c3: 0x2000, 0x2c4: 0x2000, 0x2c5: 0x2000,
+	0x2c6: 0x2000, 0x2c7: 0x2000, 0x2c8: 0x2000, 0x2c9: 0x2000, 0x2ca: 0x2000, 0x2cb: 0x2000,
+	0x2cc: 0x2000, 0x2cd: 0x2000, 0x2ce: 0x2000, 0x2cf: 0x2000, 0x2d0: 0x2000, 0x2d1: 0x2000,
+	0x2d2: 0x2000, 0x2d3: 0x2000, 0x2d4: 0x2000, 0x2d5: 0x2000, 0x2d6: 0x2000, 0x2d7: 0x2000,
+	0x2d8: 0x2000, 0x2d9: 0x2000, 0x2da: 0x2000, 0x2db: 0x2000, 0x2dc: 0x2000, 0x2dd: 0x2000,
+	0x2de: 0x2000, 0x2df: 0x2000, 0x2e0: 0x2000, 0x2e1: 0x2000, 0x2e2: 0x2000, 0x2e3: 0x2000,
+	0x2e4: 0x2000, 0x2e5: 0x2000, 0x2e6: 0x2000, 0x2e7: 0x2000, 0x2e8: 0x2000, 0x2e9: 0x2000,
+	0x2ea: 0x2000, 0x2eb: 0x2000, 0x2ec: 0x2000, 0x2ed: 0x2000, 0x2ee: 0x2000, 0x2ef: 0x2000,
+	// Block 0xc, offset 0x300
+	0x311: 0x2000,
+	0x312: 0x2000, 0x313: 0x2000, 0x314: 0x2000, 0x315: 0x2000, 0x316: 0x2000, 0x317: 0x2000,
+	0x318: 0x2000, 0x319: 0x2000, 0x31a: 0x2000, 0x31b: 0x2000, 0x31c: 0x2000, 0x31d: 0x2000,
+	0x31e: 0x2000, 0x31f: 0x2000, 0x320: 0x2000, 0x321: 0x2000, 0x323: 0x2000,
+	0x324: 0x2000, 0x325: 0x2000, 0x326: 0x2000, 0x327: 0x2000, 0x328: 0x2000, 0x329: 0x2000,
+	0x331: 0x2000, 0x332: 0x2000, 0x333: 0x2000, 0x334: 0x2000, 0x335: 0x2000,
+	0x336: 0x2000, 0x337: 0x2000, 0x338: 0x2000, 0x339: 0x2000, 0x33a: 0x2000, 0x33b: 0x2000,
+	0x33c: 0x2000, 0x33d: 0x2000, 0x33e: 0x2000, 0x33f: 0x2000,
+	// Block 0xd, offset 0x340
+	0x340: 0x2000, 0x341: 0x2000, 0x343: 0x2000, 0x344: 0x2000, 0x345: 0x2000,
+	0x346: 0x2000, 0x347: 0x2000, 0x348: 0x2000, 0x349: 0x2000,
+	// Block 0xe, offset 0x380
+	0x381: 0x2000,
+	0x390: 0x2000, 0x391: 0x2000,
+	0x392: 0x2000, 0x393: 0x2000, 0x394: 0x2000, 0x395: 0x2000, 0x396: 0x2000, 0x397: 0x2000,
+	0x398: 0x2000, 0x399: 0x2000, 0x39a: 0x2000, 0x39b: 0x2000, 0x39c: 0x2000, 0x39d: 0x2000,
+	0x39e: 0x2000, 0x39f: 0x2000, 0x3a0: 0x2000, 0x3a1: 0x2000, 0x3a2: 0x2000, 0x3a3: 0x2000,
+	0x3a4: 0x2000, 0x3a5: 0x2000, 0x3a6: 0x2000, 0x3a7: 0x2000, 0x3a8: 0x2000, 0x3a9: 0x2000,
+	0x3aa: 0x2000, 0x3ab: 0x2000, 0x3ac: 0x2000, 0x3ad: 0x2000, 0x3ae: 0x2000, 0x3af: 0x2000,
+	0x3b0: 0x2000, 0x3b1: 0x2000, 0x3b2: 0x2000, 0x3b3: 0x2000, 0x3b4: 0x2000, 0x3b5: 0x2000,
+	0x3b6: 0x2000, 0x3b7: 0x2000, 0x3b8: 0x2000, 0x3b9: 0x2000, 0x3ba: 0x2000, 0x3bb: 0x2000,
+	0x3bc: 0x2000, 0x3bd: 0x2000, 0x3be: 0x2000, 0x3bf: 0x2000,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x2000, 0x3c1: 0x2000, 0x3c2: 0x2000, 0x3c3: 0x2000, 0x3c4: 0x2000, 0x3c5: 0x2000,
+	0x3c6: 0x2000, 0x3c7: 0x2000, 0x3c8: 0x2000, 0x3c9: 0x2000, 0x3ca: 0x2000, 0x3cb: 0x2000,
+	0x3cc: 0x2000, 0x3cd: 0x2000, 0x3ce: 0x2000, 0x3cf: 0x2000, 0x3d1: 0x2000,
+	// Block 0x10, offset 0x400
+	0x400: 0x4000, 0x401: 0x4000, 0x402: 0x4000, 0x403: 0x4000, 0x404: 0x4000, 0x405: 0x4000,
+	0x406: 0x4000, 0x407: 0x4000, 0x408: 0x4000, 0x409: 0x4000, 0x40a: 0x4000, 0x40b: 0x4000,
+	0x40c: 0x4000, 0x40d: 0x4000, 0x40e: 0x4000, 0x40f: 0x4000, 0x410: 0x4000, 0x411: 0x4000,
+	0x412: 0x4000, 0x413: 0x4000, 0x414: 0x4000, 0x415: 0x4000, 0x416: 0x4000, 0x417: 0x4000,
+	0x418: 0x4000, 0x419: 0x4000, 0x41a: 0x4000, 0x41b: 0x4000, 0x41c: 0x4000, 0x41d: 0x4000,
+	0x41e: 0x4000, 0x41f: 0x4000, 0x420: 0x4000, 0x421: 0x4000, 0x422: 0x4000, 0x423: 0x4000,
+	0x424: 0x4000, 0x425: 0x4000, 0x426: 0x4000, 0x427: 0x4000, 0x428: 0x4000, 0x429: 0x4000,
+	0x42a: 0x4000, 0x42b: 0x4000, 0x42c: 0x4000, 0x42d: 0x4000, 0x42e: 0x4000, 0x42f: 0x4000,
+	0x430: 0x4000, 0x431: 0x4000, 0x432: 0x4000, 0x433: 0x4000, 0x434: 0x4000, 0x435: 0x4000,
+	0x436: 0x4000, 0x437: 0x4000, 0x438: 0x4000, 0x439: 0x4000, 0x43a: 0x4000, 0x43b: 0x4000,
+	0x43c: 0x4000, 0x43d: 0x4000, 0x43e: 0x4000, 0x43f: 0x4000,
+	// Block 0x11, offset 0x440
+	0x440: 0x4000, 0x441: 0x4000, 0x442: 0x4000, 0x443: 0x4000, 0x444: 0x4000, 0x445: 0x4000,
+	0x446: 0x4000, 0x447: 0x4000, 0x448: 0x4000, 0x449: 0x4000, 0x44a: 0x4000, 0x44b: 0x4000,
+	0x44c: 0x4000, 0x44d: 0x4000, 0x44e: 0x4000, 0x44f: 0x4000, 0x450: 0x4000, 0x451: 0x4000,
+	0x452: 0x4000, 0x453: 0x4000, 0x454: 0x4000, 0x455: 0x4000, 0x456: 0x4000, 0x457: 0x4000,
+	0x458: 0x4000, 0x459: 0x4000, 0x45a: 0x4000, 0x45b: 0x4000, 0x45c: 0x4000, 0x45d: 0x4000,
+	0x45e: 0x4000, 0x45f: 0x4000,
+	// Block 0x12, offset 0x480
+	0x490: 0x2000,
+	0x493: 0x2000, 0x494: 0x2000, 0x495: 0x2000, 0x496: 0x2000,
+	0x498: 0x2000, 0x499: 0x2000, 0x49c: 0x2000, 0x49d: 0x2000,
+	0x4a0: 0x2000, 0x4a1: 0x2000, 0x4a2: 0x2000,
+	0x4a4: 0x2000, 0x4a5: 0x2000, 0x4a6: 0x2000, 0x4a7: 0x2000,
+	0x4b0: 0x2000, 0x4b2: 0x2000, 0x4b3: 0x2000, 0x4b5: 0x2000,
+	0x4bb: 0x2000,
+	0x4be: 0x2000,
+	// Block 0x13, offset 0x4c0
+	0x4f4: 0x2000,
+	0x4ff: 0x2000,
+	// Block 0x14, offset 0x500
+	0x501: 0x2000, 0x502: 0x2000, 0x503: 0x2000, 0x504: 0x2000,
+	0x529: 0xa009,
+	0x52c: 0x2000,
+	// Block 0x15, offset 0x540
+	0x543: 0x2000, 0x545: 0x2000,
+	0x549: 0x2000,
+	0x553: 0x2000, 0x556: 0x2000,
+	0x561: 0x2000, 0x562: 0x2000,
+	0x566: 0x2000,
+	0x56b: 0x2000,
+	// Block 0x16, offset 0x580
+	0x593: 0x2000, 0x594: 0x2000,
+	0x59b: 0x2000, 0x59c: 0x2000, 0x59d: 0x2000,
+	0x59e: 0x2000, 0x5a0: 0x2000, 0x5a1: 0x2000, 0x5a2: 0x2000, 0x5a3: 0x2000,
+	0x5a4: 0x2000, 0x5a5: 0x2000, 0x5a6: 0x2000, 0x5a7: 0x2000, 0x5a8: 0x2000, 0x5a9: 0x2000,
+	0x5aa: 0x2000, 0x5ab: 0x2000,
+	0x5b0: 0x2000, 0x5b1: 0x2000, 0x5b2: 0x2000, 0x5b3: 0x2000, 0x5b4: 0x2000, 0x5b5: 0x2000,
+	0x5b6: 0x2000, 0x5b7: 0x2000, 0x5b8: 0x2000, 0x5b9: 0x2000,
+	// Block 0x17, offset 0x5c0
+	0x5c9: 0x2000,
+	0x5d0: 0x200a, 0x5d1: 0x200b,
+	0x5d2: 0x200a, 0x5d3: 0x200c, 0x5d4: 0x2000, 0x5d5: 0x2000, 0x5d6: 0x2000, 0x5d7: 0x2000,
+	0x5d8: 0x2000, 0x5d9: 0x2000,
+	0x5f8: 0x2000, 0x5f9: 0x2000,
+	// Block 0x18, offset 0x600
+	0x612: 0x2000, 0x614: 0x2000,
+	0x627: 0x2000,
+	// Block 0x19, offset 0x640
+	0x640: 0x2000, 0x642: 0x2000, 0x643: 0x2000,
+	0x647: 0x2000, 0x648: 0x2000, 0x64b: 0x2000,
+	0x64f: 0x2000, 0x651: 0x2000,
+	0x655: 0x2000,
+	0x65a: 0x2000, 0x65d: 0x2000,
+	0x65e: 0x2000, 0x65f: 0x2000, 0x660: 0x2000, 0x663: 0x2000,
+	0x665: 0x2000, 0x667: 0x2000, 0x668: 0x2000, 0x669: 0x2000,
+	0x66a: 0x2000, 0x66b: 0x2000, 0x66c: 0x2000, 0x66e: 0x2000,
+	0x674: 0x2000, 0x675: 0x2000,
+	0x676: 0x2000, 0x677: 0x2000,
+	0x67c: 0x2000, 0x67d: 0x2000,
+	// Block 0x1a, offset 0x680
+	0x688: 0x2000,
+	0x68c: 0x2000,
+	0x692: 0x2000,
+	0x6a0: 0x2000, 0x6a1: 0x2000,
+	0x6a4: 0x2000, 0x6a5: 0x2000, 0x6a6: 0x2000, 0x6a7: 0x2000,
+	0x6aa: 0x2000, 0x6ab: 0x2000, 0x6ae: 0x2000, 0x6af: 0x2000,
+	// Block 0x1b, offset 0x6c0
+	0x6c2: 0x2000, 0x6c3: 0x2000,
+	0x6c6: 0x2000, 0x6c7: 0x2000,
+	0x6d5: 0x2000,
+	0x6d9: 0x2000,
+	0x6e5: 0x2000,
+	0x6ff: 0x2000,
+	// Block 0x1c, offset 0x700
+	0x712: 0x2000,
+	0x71a: 0x4000, 0x71b: 0x4000,
+	0x729: 0x4000,
+	0x72a: 0x4000,
+	// Block 0x1d, offset 0x740
+	0x769: 0x4000,
+	0x76a: 0x4000, 0x76b: 0x4000, 0x76c: 0x4000,
+	0x770: 0x4000, 0x773: 0x4000,
+	// Block 0x1e, offset 0x780
+	0x7a0: 0x2000, 0x7a1: 0x2000, 0x7a2: 0x2000, 0x7a3: 0x2000,
+	0x7a4: 0x2000, 0x7a5: 0x2000, 0x7a6: 0x2000, 0x7a7: 0x2000, 0x7a8: 0x2000, 0x7a9: 0x2000,
+	0x7aa: 0x2000, 0x7ab: 0x2000, 0x7ac: 0x2000, 0x7ad: 0x2000, 0x7ae: 0x2000, 0x7af: 0x2000,
+	0x7b0: 0x2000, 0x7b1: 0x2000, 0x7b2: 0x2000, 0x7b3: 0x2000, 0x7b4: 0x2000, 0x7b5: 0x2000,
+	0x7b6: 0x2000, 0x7b7: 0x2000, 0x7b8: 0x2000, 0x7b9: 0x2000, 0x7ba: 0x2000, 0x7bb: 0x2000,
+	0x7bc: 0x2000, 0x7bd: 0x2000, 0x7be: 0x2000, 0x7bf: 0x2000,
+	// Block 0x1f, offset 0x7c0
+	0x7c0: 0x2000, 0x7c1: 0x2000, 0x7c2: 0x2000, 0x7c3: 0x2000, 0x7c4: 0x2000, 0x7c5: 0x2000,
+	0x7c6: 0x2000, 0x7c7: 0x2000, 0x7c8: 0x2000, 0x7c9: 0x2000, 0x7ca: 0x2000, 0x7cb: 0x2000,
+	0x7cc: 0x2000, 0x7cd: 0x2000, 0x7ce: 0x2000, 0x7cf: 0x2000, 0x7d0: 0x2000, 0x7d1: 0x2000,
+	0x7d2: 0x2000, 0x7d3: 0x2000, 0x7d4: 0x2000, 0x7d5: 0x2000, 0x7d6: 0x2000, 0x7d7: 0x2000,
+	0x7d8: 0x2000, 0x7d9: 0x2000, 0x7da: 0x2000, 0x7db: 0x2000, 0x7dc: 0x2000, 0x7dd: 0x2000,
+	0x7de: 0x2000, 0x7df: 0x2000, 0x7e0: 0x2000, 0x7e1: 0x2000, 0x7e2: 0x2000, 0x7e3: 0x2000,
+	0x7e4: 0x2000, 0x7e5: 0x2000, 0x7e6: 0x2000, 0x7e7: 0x2000, 0x7e8: 0x2000, 0x7e9: 0x2000,
+	0x7eb: 0x2000, 0x7ec: 0x2000, 0x7ed: 0x2000, 0x7ee: 0x2000, 0x7ef: 0x2000,
+	0x7f0: 0x2000, 0x7f1: 0x2000, 0x7f2: 0x2000, 0x7f3: 0x2000, 0x7f4: 0x2000, 0x7f5: 0x2000,
+	0x7f6: 0x2000, 0x7f7: 0x2000, 0x7f8: 0x2000, 0x7f9: 0x2000, 0x7fa: 0x2000, 0x7fb: 0x2000,
+	0x7fc: 0x2000, 0x7fd: 0x2000, 0x7fe: 0x2000, 0x7ff: 0x2000,
+	// Block 0x20, offset 0x800
+	0x800: 0x2000, 0x801: 0x2000, 0x802: 0x200d, 0x803: 0x2000, 0x804: 0x2000, 0x805: 0x2000,
+	0x806: 0x2000, 0x807: 0x2000, 0x808: 0x2000, 0x809: 0x2000, 0x80a: 0x2000, 0x80b: 0x2000,
+	0x80c: 0x2000, 0x80d: 0x2000, 0x80e: 0x2000, 0x80f: 0x2000, 0x810: 0x2000, 0x811: 0x2000,
+	0x812: 0x2000, 0x813: 0x2000, 0x814: 0x2000, 0x815: 0x2000, 0x816: 0x2000, 0x817: 0x2000,
+	0x818: 0x2000, 0x819: 0x2000, 0x81a: 0x2000, 0x81b: 0x2000, 0x81c: 0x2000, 0x81d: 0x2000,
+	0x81e: 0x2000, 0x81f: 0x2000, 0x820: 0x2000, 0x821: 0x2000, 0x822: 0x2000, 0x823: 0x2000,
+	0x824: 0x2000, 0x825: 0x2000, 0x826: 0x2000, 0x827: 0x2000, 0x828: 0x2000, 0x829: 0x2000,
+	0x82a: 0x2000, 0x82b: 0x2000, 0x82c: 0x2000, 0x82d: 0x2000, 0x82e: 0x2000, 0x82f: 0x2000,
+	0x830: 0x2000, 0x831: 0x2000, 0x832: 0x2000, 0x833: 0x2000, 0x834: 0x2000, 0x835: 0x2000,
+	0x836: 0x2000, 0x837: 0x2000, 0x838: 0x2000, 0x839: 0x2000, 0x83a: 0x2000, 0x83b: 0x2000,
+	0x83c: 0x2000, 0x83d: 0x2000, 0x83e: 0x2000, 0x83f: 0x2000,
+	// Block 0x21, offset 0x840
+	0x840: 0x2000, 0x841: 0x2000, 0x842: 0x2000, 0x843: 0x2000, 0x844: 0x2000, 0x845: 0x2000,
+	0x846: 0x2000, 0x847: 0x2000, 0x848: 0x2000, 0x849: 0x2000, 0x84a: 0x2000, 0x84b: 0x2000,
+	0x850: 0x2000, 0x851: 0x2000,
+	0x852: 0x2000, 0x853: 0x2000, 0x854: 0x2000, 0x855: 0x2000, 0x856: 0x2000, 0x857: 0x2000,
+	0x858: 0x2000, 0x859: 0x2000, 0x85a: 0x2000, 0x85b: 0x2000, 0x85c: 0x2000, 0x85d: 0x2000,
+	0x85e: 0x2000, 0x85f: 0x2000, 0x860: 0x2000, 0x861: 0x2000, 0x862: 0x2000, 0x863: 0x2000,
+	0x864: 0x2000, 0x865: 0x2000, 0x866: 0x2000, 0x867: 0x2000, 0x868: 0x2000, 0x869: 0x2000,
+	0x86a: 0x2000, 0x86b: 0x2000, 0x86c: 0x2000, 0x86d: 0x2000, 0x86e: 0x2000, 0x86f: 0x2000,
+	0x870: 0x2000, 0x871: 0x2000, 0x872: 0x2000, 0x873: 0x2000,
+	// Block 0x22, offset 0x880
+	0x880: 0x2000, 0x881: 0x2000, 0x882: 0x2000, 0x883: 0x2000, 0x884: 0x2000, 0x885: 0x2000,
+	0x886: 0x2000, 0x887: 0x2000, 0x888: 0x2000, 0x889: 0x2000, 0x88a: 0x2000, 0x88b: 0x2000,
+	0x88c: 0x2000, 0x88d: 0x2000, 0x88e: 0x2000, 0x88f: 0x2000,
+	0x892: 0x2000, 0x893: 0x2000, 0x894: 0x2000, 0x895: 0x2000,
+	0x8a0: 0x200e, 0x8a1: 0x2000, 0x8a3: 0x2000,
+	0x8a4: 0x2000, 0x8a5: 0x2000, 0x8a6: 0x2000, 0x8a7: 0x2000, 0x8a8: 0x2000, 0x8a9: 0x2000,
+	0x8b2: 0x2000, 0x8b3: 0x2000,
+	0x8b6: 0x2000, 0x8b7: 0x2000,
+	0x8bc: 0x2000, 0x8bd: 0x2000,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x2000, 0x8c1: 0x2000,
+	0x8c6: 0x2000, 0x8c7: 0x2000, 0x8c8: 0x2000, 0x8cb: 0x200f,
+	0x8ce: 0x2000, 0x8cf: 0x2000, 0x8d0: 0x2000, 0x8d1: 0x2000,
+	0x8e2: 0x2000, 0x8e3: 0x2000,
+	0x8e4: 0x2000, 0x8e5: 0x2000,
+	0x8ef: 0x2000,
+	0x8fd: 0x4000, 0x8fe: 0x4000,
+	// Block 0x24, offset 0x900
+	0x905: 0x2000,
+	0x906: 0x2000, 0x909: 0x2000,
+	0x90e: 0x2000, 0x90f: 0x2000,
+	0x914: 0x4000, 0x915: 0x4000,
+	0x91c: 0x2000,
+	0x91e: 0x2000,
+	// Block 0x25, offset 0x940
+	0x940: 0x2000, 0x942: 0x2000,
+	0x948: 0x4000, 0x949: 0x4000, 0x94a: 0x4000, 0x94b: 0x4000,
+	0x94c: 0x4000, 0x94d: 0x4000, 0x94e: 0x4000, 0x94f: 0x4000, 0x950: 0x4000, 0x951: 0x4000,
+	0x952: 0x4000, 0x953: 0x4000,
+	0x960: 0x2000, 0x961: 0x2000, 0x963: 0x2000,
+	0x964: 0x2000, 0x965: 0x2000, 0x967: 0x2000, 0x968: 0x2000, 0x969: 0x2000,
+	0x96a: 0x2000, 0x96c: 0x2000, 0x96d: 0x2000, 0x96f: 0x2000,
+	0x97f: 0x4000,
+	// Block 0x26, offset 0x980
+	0x993: 0x4000,
+	0x99e: 0x2000, 0x99f: 0x2000, 0x9a1: 0x4000,
+	0x9aa: 0x4000, 0x9ab: 0x4000,
+	0x9bd: 0x4000, 0x9be: 0x4000, 0x9bf: 0x2000,
+	// Block 0x27, offset 0x9c0
+	0x9c4: 0x4000, 0x9c5: 0x4000,
+	0x9c6: 0x2000, 0x9c7: 0x2000, 0x9c8: 0x2000, 0x9c9: 0x2000, 0x9ca: 0x2000, 0x9cb: 0x2000,
+	0x9cc: 0x2000, 0x9cd: 0x2000, 0x9ce: 0x4000, 0x9cf: 0x2000, 0x9d0: 0x2000, 0x9d1: 0x2000,
+	0x9d2: 0x2000, 0x9d3: 0x2000, 0x9d4: 0x4000, 0x9d5: 0x2000, 0x9d6: 0x2000, 0x9d7: 0x2000,
+	0x9d8: 0x2000, 0x9d9: 0x2000, 0x9da: 0x2000, 0x9db: 0x2000, 0x9dc: 0x2000, 0x9dd: 0x2000,
+	0x9de: 0x2000, 0x9df: 0x2000, 0x9e0: 0x2000, 0x9e1: 0x2000, 0x9e3: 0x2000,
+	0x9e8: 0x2000, 0x9e9: 0x2000,
+	0x9ea: 0x4000, 0x9eb: 0x2000, 0x9ec: 0x2000, 0x9ed: 0x2000, 0x9ee: 0x2000, 0x9ef: 0x2000,
+	0x9f0: 0x2000, 0x9f1: 0x2000, 0x9f2: 0x4000, 0x9f3: 0x4000, 0x9f4: 0x2000, 0x9f5: 0x4000,
+	0x9f6: 0x2000, 0x9f7: 0x2000, 0x9f8: 0x2000, 0x9f9: 0x2000, 0x9fa: 0x4000, 0x9fb: 0x2000,
+	0x9fc: 0x2000, 0x9fd: 0x4000, 0x9fe: 0x2000, 0x9ff: 0x2000,
+	// Block 0x28, offset 0xa00
+	0xa05: 0x4000,
+	0xa0a: 0x4000, 0xa0b: 0x4000,
+	0xa28: 0x4000,
+	0xa3d: 0x2000,
+	// Block 0x29, offset 0xa40
+	0xa4c: 0x4000, 0xa4e: 0x4000,
+	0xa53: 0x4000, 0xa54: 0x4000, 0xa55: 0x4000, 0xa57: 0x4000,
+	0xa76: 0x2000, 0xa77: 0x2000, 0xa78: 0x2000, 0xa79: 0x2000, 0xa7a: 0x2000, 0xa7b: 0x2000,
+	0xa7c: 0x2000, 0xa7d: 0x2000, 0xa7e: 0x2000, 0xa7f: 0x2000,
+	// Block 0x2a, offset 0xa80
+	0xa95: 0x4000, 0xa96: 0x4000, 0xa97: 0x4000,
+	0xab0: 0x4000,
+	0xabf: 0x4000,
+	// Block 0x2b, offset 0xac0
+	0xae6: 0x6000, 0xae7: 0x6000, 0xae8: 0x6000, 0xae9: 0x6000,
+	0xaea: 0x6000, 0xaeb: 0x6000, 0xaec: 0x6000, 0xaed: 0x6000,
+	// Block 0x2c, offset 0xb00
+	0xb05: 0x6010,
+	0xb06: 0x6011,
+	// Block 0x2d, offset 0xb40
+	0xb5b: 0x4000, 0xb5c: 0x4000,
+	// Block 0x2e, offset 0xb80
+	0xb90: 0x4000,
+	0xb95: 0x4000, 0xb96: 0x2000, 0xb97: 0x2000,
+	0xb98: 0x2000, 0xb99: 0x2000,
+	// Block 0x2f, offset 0xbc0
+	0xbc0: 0x4000, 0xbc1: 0x4000, 0xbc2: 0x4000, 0xbc3: 0x4000, 0xbc4: 0x4000, 0xbc5: 0x4000,
+	0xbc6: 0x4000, 0xbc7: 0x4000, 0xbc8: 0x4000, 0xbc9: 0x4000, 0xbca: 0x4000, 0xbcb: 0x4000,
+	0xbcc: 0x4000, 0xbcd: 0x4000, 0xbce: 0x4000, 0xbcf: 0x4000, 0xbd0: 0x4000, 0xbd1: 0x4000,
+	0xbd2: 0x4000, 0xbd3: 0x4000, 0xbd4: 0x4000, 0xbd5: 0x4000, 0xbd6: 0x4000, 0xbd7: 0x4000,
+	0xbd8: 0x4000, 0xbd9: 0x4000, 0xbdb: 0x4000, 0xbdc: 0x4000, 0xbdd: 0x4000,
+	0xbde: 0x4000, 0xbdf: 0x4000, 0xbe0: 0x4000, 0xbe1: 0x4000, 0xbe2: 0x4000, 0xbe3: 0x4000,
+	0xbe4: 0x4000, 0xbe5: 0x4000, 0xbe6: 0x4000, 0xbe7: 0x4000, 0xbe8: 0x4000, 0xbe9: 0x4000,
+	0xbea: 0x4000, 0xbeb: 0x4000, 0xbec: 0x4000, 0xbed: 0x4000, 0xbee: 0x4000, 0xbef: 0x4000,
+	0xbf0: 0x4000, 0xbf1: 0x4000, 0xbf2: 0x4000, 0xbf3: 0x4000, 0xbf4: 0x4000, 0xbf5: 0x4000,
+	0xbf6: 0x4000, 0xbf7: 0x4000, 0xbf8: 0x4000, 0xbf9: 0x4000, 0xbfa: 0x4000, 0xbfb: 0x4000,
+	0xbfc: 0x4000, 0xbfd: 0x4000, 0xbfe: 0x4000, 0xbff: 0x4000,
+	// Block 0x30, offset 0xc00
+	0xc00: 0x4000, 0xc01: 0x4000, 0xc02: 0x4000, 0xc03: 0x4000, 0xc04: 0x4000, 0xc05: 0x4000,
+	0xc06: 0x4000, 0xc07: 0x4000, 0xc08: 0x4000, 0xc09: 0x4000, 0xc0a: 0x4000, 0xc0b: 0x4000,
+	0xc0c: 0x4000, 0xc0d: 0x4000, 0xc0e: 0x4000, 0xc0f: 0x4000, 0xc10: 0x4000, 0xc11: 0x4000,
+	0xc12: 0x4000, 0xc13: 0x4000, 0xc14: 0x4000, 0xc15: 0x4000, 0xc16: 0x4000, 0xc17: 0x4000,
+	0xc18: 0x4000, 0xc19: 0x4000, 0xc1a: 0x4000, 0xc1b: 0x4000, 0xc1c: 0x4000, 0xc1d: 0x4000,
+	0xc1e: 0x4000, 0xc1f: 0x4000, 0xc20: 0x4000, 0xc21: 0x4000, 0xc22: 0x4000, 0xc23: 0x4000,
+	0xc24: 0x4000, 0xc25: 0x4000, 0xc26: 0x4000, 0xc27: 0x4000, 0xc28: 0x4000, 0xc29: 0x4000,
+	0xc2a: 0x4000, 0xc2b: 0x4000, 0xc2c: 0x4000, 0xc2d: 0x4000, 0xc2e: 0x4000, 0xc2f: 0x4000,
+	0xc30: 0x4000, 0xc31: 0x4000, 0xc32: 0x4000, 0xc33: 0x4000,
+	// Block 0x31, offset 0xc40
+	0xc40: 0x4000, 0xc41: 0x4000, 0xc42: 0x4000, 0xc43: 0x4000, 0xc44: 0x4000, 0xc45: 0x4000,
+	0xc46: 0x4000, 0xc47: 0x4000, 0xc48: 0x4000, 0xc49: 0x4000, 0xc4a: 0x4000, 0xc4b: 0x4000,
+	0xc4c: 0x4000, 0xc4d: 0x4000, 0xc4e: 0x4000, 0xc4f: 0x4000, 0xc50: 0x4000, 0xc51: 0x4000,
+	0xc52: 0x4000, 0xc53: 0x4000, 0xc54: 0x4000, 0xc55: 0x4000,
+	0xc70: 0x4000, 0xc71: 0x4000, 0xc72: 0x4000, 0xc73: 0x4000, 0xc74: 0x4000, 0xc75: 0x4000,
+	0xc76: 0x4000, 0xc77: 0x4000, 0xc78: 0x4000, 0xc79: 0x4000, 0xc7a: 0x4000, 0xc7b: 0x4000,
+	// Block 0x32, offset 0xc80
+	0xc80: 0x9012, 0xc81: 0x4013, 0xc82: 0x4014, 0xc83: 0x4000, 0xc84: 0x4000, 0xc85: 0x4000,
+	0xc86: 0x4000, 0xc87: 0x4000, 0xc88: 0x4000, 0xc89: 0x4000, 0xc8a: 0x4000, 0xc8b: 0x4000,
+	0xc8c: 0x4015, 0xc8d: 0x4015, 0xc8e: 0x4000, 0xc8f: 0x4000, 0xc90: 0x4000, 0xc91: 0x4000,
+	0xc92: 0x4000, 0xc93: 0x4000, 0xc94: 0x4000, 0xc95: 0x4000, 0xc96: 0x4000, 0xc97: 0x4000,
+	0xc98: 0x4000, 0xc99: 0x4000, 0xc9a: 0x4000, 0xc9b: 0x4000, 0xc9c: 0x4000, 0xc9d: 0x4000,
+	0xc9e: 0x4000, 0xc9f: 0x4000, 0xca0: 0x4000, 0xca1: 0x4000, 0xca2: 0x4000, 0xca3: 0x4000,
+	0xca4: 0x4000, 0xca5: 0x4000, 0xca6: 0x4000, 0xca7: 0x4000, 0xca8: 0x4000, 0xca9: 0x4000,
+	0xcaa: 0x4000, 0xcab: 0x4000, 0xcac: 0x4000, 0xcad: 0x4000, 0xcae: 0x4000, 0xcaf: 0x4000,
+	0xcb0: 0x4000, 0xcb1: 0x4000, 0xcb2: 0x4000, 0xcb3: 0x4000, 0xcb4: 0x4000, 0xcb5: 0x4000,
+	0xcb6: 0x4000, 0xcb7: 0x4000, 0xcb8: 0x4000, 0xcb9: 0x4000, 0xcba: 0x4000, 0xcbb: 0x4000,
+	0xcbc: 0x4000, 0xcbd: 0x4000, 0xcbe: 0x4000,
+	// Block 0x33, offset 0xcc0
+	0xcc1: 0x4000, 0xcc2: 0x4000, 0xcc3: 0x4000, 0xcc4: 0x4000, 0xcc5: 0x4000,
+	0xcc6: 0x4000, 0xcc7: 0x4000, 0xcc8: 0x4000, 0xcc9: 0x4000, 0xcca: 0x4000, 0xccb: 0x4000,
+	0xccc: 0x4000, 0xccd: 0x4000, 0xcce: 0x4000, 0xccf: 0x4000, 0xcd0: 0x4000, 0xcd1: 0x4000,
+	0xcd2: 0x4000, 0xcd3: 0x4000, 0xcd4: 0x4000, 0xcd5: 0x4000, 0xcd6: 0x4000, 0xcd7: 0x4000,
+	0xcd8: 0x4000, 0xcd9: 0x4000, 0xcda: 0x4000, 0xcdb: 0x4000, 0xcdc: 0x4000, 0xcdd: 0x4000,
+	0xcde: 0x4000, 0xcdf: 0x4000, 0xce0: 0x4000, 0xce1: 0x4000, 0xce2: 0x4000, 0xce3: 0x4000,
+	0xce4: 0x4000, 0xce5: 0x4000, 0xce6: 0x4000, 0xce7: 0x4000, 0xce8: 0x4000, 0xce9: 0x4000,
+	0xcea: 0x4000, 0xceb: 0x4000, 0xcec: 0x4000, 0xced: 0x4000, 0xcee: 0x4000, 0xcef: 0x4000,
+	0xcf0: 0x4000, 0xcf1: 0x4000, 0xcf2: 0x4000, 0xcf3: 0x4000, 0xcf4: 0x4000, 0xcf5: 0x4000,
+	0xcf6: 0x4000, 0xcf7: 0x4000, 0xcf8: 0x4000, 0xcf9: 0x4000, 0xcfa: 0x4000, 0xcfb: 0x4000,
+	0xcfc: 0x4000, 0xcfd: 0x4000, 0xcfe: 0x4000, 0xcff: 0x4000,
+	// Block 0x34, offset 0xd00
+	0xd00: 0x4000, 0xd01: 0x4000, 0xd02: 0x4000, 0xd03: 0x4000, 0xd04: 0x4000, 0xd05: 0x4000,
+	0xd06: 0x4000, 0xd07: 0x4000, 0xd08: 0x4000, 0xd09: 0x4000, 0xd0a: 0x4000, 0xd0b: 0x4000,
+	0xd0c: 0x4000, 0xd0d: 0x4000, 0xd0e: 0x4000, 0xd0f: 0x4000, 0xd10: 0x4000, 0xd11: 0x4000,
+	0xd12: 0x4000, 0xd13: 0x4000, 0xd14: 0x4000, 0xd15: 0x4000, 0xd16: 0x4000,
+	0xd19: 0x4016, 0xd1a: 0x4017, 0xd1b: 0x4000, 0xd1c: 0x4000, 0xd1d: 0x4000,
+	0xd1e: 0x4000, 0xd1f: 0x4000, 0xd20: 0x4000, 0xd21: 0x4018, 0xd22: 0x4019, 0xd23: 0x401a,
+	0xd24: 0x401b, 0xd25: 0x401c, 0xd26: 0x401d, 0xd27: 0x401e, 0xd28: 0x401f, 0xd29: 0x4020,
+	0xd2a: 0x4021, 0xd2b: 0x4022, 0xd2c: 0x4000, 0xd2d: 0x4010, 0xd2e: 0x4000, 0xd2f: 0x4023,
+	0xd30: 0x4000, 0xd31: 0x4024, 0xd32: 0x4000, 0xd33: 0x4025, 0xd34: 0x4000, 0xd35: 0x4026,
+	0xd36: 0x4000, 0xd37: 0x401a, 0xd38: 0x4000, 0xd39: 0x4027, 0xd3a: 0x4000, 0xd3b: 0x4028,
+	0xd3c: 0x4000, 0xd3d: 0x4020, 0xd3e: 0x4000, 0xd3f: 0x4029,
+	// Block 0x35, offset 0xd40
+	0xd40: 0x4000, 0xd41: 0x402a, 0xd42: 0x4000, 0xd43: 0x402b, 0xd44: 0x402c, 0xd45: 0x4000,
+	0xd46: 0x4017, 0xd47: 0x4000, 0xd48: 0x402d, 0xd49: 0x4000, 0xd4a: 0x402e, 0xd4b: 0x402f,
+	0xd4c: 0x4030, 0xd4d: 0x4017, 0xd4e: 0x4016, 0xd4f: 0x4017, 0xd50: 0x4000, 0xd51: 0x4000,
+	0xd52: 0x4031, 0xd53: 0x4000, 0xd54: 0x4000, 0xd55: 0x4031, 0xd56: 0x4000, 0xd57: 0x4000,
+	0xd58: 0x4032, 0xd59: 0x4000, 0xd5a: 0x4000, 0xd5b: 0x4032, 0xd5c: 0x4000, 0xd5d: 0x4000,
+	0xd5e: 0x4033, 0xd5f: 0x402e, 0xd60: 0x4034, 0xd61: 0x4035, 0xd62: 0x4034, 0xd63: 0x4036,
+	0xd64: 0x4037, 0xd65: 0x4024, 0xd66: 0x4035, 0xd67: 0x4025, 0xd68: 0x4038, 0xd69: 0x4038,
+	0xd6a: 0x4039, 0xd6b: 0x4039, 0xd6c: 0x403a, 0xd6d: 0x403a, 0xd6e: 0x4000, 0xd6f: 0x4035,
+	0xd70: 0x4000, 0xd71: 0x4000, 0xd72: 0x403b, 0xd73: 0x403c, 0xd74: 0x4000, 0xd75: 0x4000,
+	0xd76: 0x4000, 0xd77: 0x4000, 0xd78: 0x4000, 0xd79: 0x4000, 0xd7a: 0x4000, 0xd7b: 0x403d,
+	0xd7c: 0x401c, 0xd7d: 0x4000, 0xd7e: 0x4000, 0xd7f: 0x4000,
+	// Block 0x36, offset 0xd80
+	0xd85: 0x4000,
+	0xd86: 0x4000, 0xd87: 0x4000, 0xd88: 0x4000, 0xd89: 0x4000, 0xd8a: 0x4000, 0xd8b: 0x4000,
+	0xd8c: 0x4000, 0xd8d: 0x4000, 0xd8e: 0x4000, 0xd8f: 0x4000, 0xd90: 0x4000, 0xd91: 0x4000,
+	0xd92: 0x4000, 0xd93: 0x4000, 0xd94: 0x4000, 0xd95: 0x4000, 0xd96: 0x4000, 0xd97: 0x4000,
+	0xd98: 0x4000, 0xd99: 0x4000, 0xd9a: 0x4000, 0xd9b: 0x4000, 0xd9c: 0x4000, 0xd9d: 0x4000,
+	0xd9e: 0x4000, 0xd9f: 0x4000, 0xda0: 0x4000, 0xda1: 0x4000, 0xda2: 0x4000, 0xda3: 0x4000,
+	0xda4: 0x4000, 0xda5: 0x4000, 0xda6: 0x4000, 0xda7: 0x4000, 0xda8: 0x4000, 0xda9: 0x4000,
+	0xdaa: 0x4000, 0xdab: 0x4000, 0xdac: 0x4000, 0xdad: 0x4000,
+	0xdb1: 0x403e, 0xdb2: 0x403e, 0xdb3: 0x403e, 0xdb4: 0x403e, 0xdb5: 0x403e,
+	0xdb6: 0x403e, 0xdb7: 0x403e, 0xdb8: 0x403e, 0xdb9: 0x403e, 0xdba: 0x403e, 0xdbb: 0x403e,
+	0xdbc: 0x403e, 0xdbd: 0x403e, 0xdbe: 0x403e, 0xdbf: 0x403e,
+	// Block 0x37, offset 0xdc0
+	0xdc0: 0x4037, 0xdc1: 0x4037, 0xdc2: 0x4037, 0xdc3: 0x4037, 0xdc4: 0x4037, 0xdc5: 0x4037,
+	0xdc6: 0x4037, 0xdc7: 0x4037, 0xdc8: 0x4037, 0xdc9: 0x4037, 0xdca: 0x4037, 0xdcb: 0x4037,
+	0xdcc: 0x4037, 0xdcd: 0x4037, 0xdce: 0x4037, 0xdcf: 0x400e, 0xdd0: 0x403f, 0xdd1: 0x4040,
+	0xdd2: 0x4041, 0xdd3: 0x4040, 0xdd4: 0x403f, 0xdd5: 0x4042, 0xdd6: 0x4043, 0xdd7: 0x4044,
+	0xdd8: 0x4040, 0xdd9: 0x4041, 0xdda: 0x4040, 0xddb: 0x4045, 0xddc: 0x4009, 0xddd: 0x4045,
+	0xdde: 0x4046, 0xddf: 0x4045, 0xde0: 0x4047, 0xde1: 0x400b, 0xde2: 0x400a, 0xde3: 0x400c,
+	0xde4: 0x4048, 0xde5: 0x4000, 0xde6: 0x4000, 0xde7: 0x4000, 0xde8: 0x4000, 0xde9: 0x4000,
+	0xdea: 0x4000, 0xdeb: 0x4000, 0xdec: 0x4000, 0xded: 0x4000, 0xdee: 0x4000, 0xdef: 0x4000,
+	0xdf0: 0x4000, 0xdf1: 0x4000, 0xdf2: 0x4000, 0xdf3: 0x4000, 0xdf4: 0x4000, 0xdf5: 0x4000,
+	0xdf6: 0x4000, 0xdf7: 0x4000, 0xdf8: 0x4000, 0xdf9: 0x4000, 0xdfa: 0x4000, 0xdfb: 0x4000,
+	0xdfc: 0x4000, 0xdfd: 0x4000, 0xdfe: 0x4000, 0xdff: 0x4000,
+	// Block 0x38, offset 0xe00
+	0xe00: 0x4000, 0xe01: 0x4000, 0xe02: 0x4000, 0xe03: 0x4000, 0xe04: 0x4000, 0xe05: 0x4000,
+	0xe06: 0x4000, 0xe07: 0x4000, 0xe08: 0x4000, 0xe09: 0x4000, 0xe0a: 0x4000, 0xe0b: 0x4000,
+	0xe0c: 0x4000, 0xe0d: 0x4000, 0xe0e: 0x4000, 0xe10: 0x4000, 0xe11: 0x4000,
+	0xe12: 0x4000, 0xe13: 0x4000, 0xe14: 0x4000, 0xe15: 0x4000, 0xe16: 0x4000, 0xe17: 0x4000,
+	0xe18: 0x4000, 0xe19: 0x4000, 0xe1a: 0x4000, 0xe1b: 0x4000, 0xe1c: 0x4000, 0xe1d: 0x4000,
+	0xe1e: 0x4000, 0xe1f: 0x4000, 0xe20: 0x4000, 0xe21: 0x4000, 0xe22: 0x4000, 0xe23: 0x4000,
+	0xe24: 0x4000, 0xe25: 0x4000, 0xe26: 0x4000, 0xe27: 0x4000, 0xe28: 0x4000, 0xe29: 0x4000,
+	0xe2a: 0x4000, 0xe2b: 0x4000, 0xe2c: 0x4000, 0xe2d: 0x4000, 0xe2e: 0x4000, 0xe2f: 0x4000,
+	0xe30: 0x4000, 0xe31: 0x4000, 0xe32: 0x4000, 0xe33: 0x4000, 0xe34: 0x4000, 0xe35: 0x4000,
+	0xe36: 0x4000, 0xe37: 0x4000, 0xe38: 0x4000, 0xe39: 0x4000, 0xe3a: 0x4000,
+	// Block 0x39, offset 0xe40
+	0xe40: 0x4000, 0xe41: 0x4000, 0xe42: 0x4000, 0xe43: 0x4000, 0xe44: 0x4000, 0xe45: 0x4000,
+	0xe46: 0x4000, 0xe47: 0x4000, 0xe48: 0x4000, 0xe49: 0x4000, 0xe4a: 0x4000, 0xe4b: 0x4000,
+	0xe4c: 0x4000, 0xe4d: 0x4000, 0xe4e: 0x4000, 0xe4f: 0x4000, 0xe50: 0x4000, 0xe51: 0x4000,
+	0xe52: 0x4000, 0xe53: 0x4000, 0xe54: 0x4000, 0xe55: 0x4000, 0xe56: 0x4000, 0xe57: 0x4000,
+	0xe58: 0x4000, 0xe59: 0x4000, 0xe5a: 0x4000, 0xe5b: 0x4000, 0xe5c: 0x4000, 0xe5d: 0x4000,
+	0xe5e: 0x4000, 0xe5f: 0x4000, 0xe60: 0x4000, 0xe61: 0x4000, 0xe62: 0x4000, 0xe63: 0x4000,
+	0xe70: 0x4000, 0xe71: 0x4000, 0xe72: 0x4000, 0xe73: 0x4000, 0xe74: 0x4000, 0xe75: 0x4000,
+	0xe76: 0x4000, 0xe77: 0x4000, 0xe78: 0x4000, 0xe79: 0x4000, 0xe7a: 0x4000, 0xe7b: 0x4000,
+	0xe7c: 0x4000, 0xe7d: 0x4000, 0xe7e: 0x4000, 0xe7f: 0x4000,
+	// Block 0x3a, offset 0xe80
+	0xe80: 0x4000, 0xe81: 0x4000, 0xe82: 0x4000, 0xe83: 0x4000, 0xe84: 0x4000, 0xe85: 0x4000,
+	0xe86: 0x4000, 0xe87: 0x4000, 0xe88: 0x4000, 0xe89: 0x4000, 0xe8a: 0x4000, 0xe8b: 0x4000,
+	0xe8c: 0x4000, 0xe8d: 0x4000, 0xe8e: 0x4000, 0xe8f: 0x4000, 0xe90: 0x4000, 0xe91: 0x4000,
+	0xe92: 0x4000, 0xe93: 0x4000, 0xe94: 0x4000, 0xe95: 0x4000, 0xe96: 0x4000, 0xe97: 0x4000,
+	0xe98: 0x4000, 0xe99: 0x4000, 0xe9a: 0x4000, 0xe9b: 0x4000, 0xe9c: 0x4000, 0xe9d: 0x4000,
+	0xe9e: 0x4000, 0xea0: 0x4000, 0xea1: 0x4000, 0xea2: 0x4000, 0xea3: 0x4000,
+	0xea4: 0x4000, 0xea5: 0x4000, 0xea6: 0x4000, 0xea7: 0x4000, 0xea8: 0x4000, 0xea9: 0x4000,
+	0xeaa: 0x4000, 0xeab: 0x4000, 0xeac: 0x4000, 0xead: 0x4000, 0xeae: 0x4000, 0xeaf: 0x4000,
+	0xeb0: 0x4000, 0xeb1: 0x4000, 0xeb2: 0x4000, 0xeb3: 0x4000, 0xeb4: 0x4000, 0xeb5: 0x4000,
+	0xeb6: 0x4000, 0xeb7: 0x4000, 0xeb8: 0x4000, 0xeb9: 0x4000, 0xeba: 0x4000, 0xebb: 0x4000,
+	0xebc: 0x4000, 0xebd: 0x4000, 0xebe: 0x4000, 0xebf: 0x4000,
+	// Block 0x3b, offset 0xec0
+	0xec0: 0x4000, 0xec1: 0x4000, 0xec2: 0x4000, 0xec3: 0x4000, 0xec4: 0x4000, 0xec5: 0x4000,
+	0xec6: 0x4000, 0xec7: 0x4000, 0xec8: 0x2000, 0xec9: 0x2000, 0xeca: 0x2000, 0xecb: 0x2000,
+	0xecc: 0x2000, 0xecd: 0x2000, 0xece: 0x2000, 0xecf: 0x2000, 0xed0: 0x4000, 0xed1: 0x4000,
+	0xed2: 0x4000, 0xed3: 0x4000, 0xed4: 0x4000, 0xed5: 0x4000, 0xed6: 0x4000, 0xed7: 0x4000,
+	0xed8: 0x4000, 0xed9: 0x4000, 0xeda: 0x4000, 0xedb: 0x4000, 0xedc: 0x4000, 0xedd: 0x4000,
+	0xede: 0x4000, 0xedf: 0x4000, 0xee0: 0x4000, 0xee1: 0x4000, 0xee2: 0x4000, 0xee3: 0x4000,
+	0xee4: 0x4000, 0xee5: 0x4000, 0xee6: 0x4000, 0xee7: 0x4000, 0xee8: 0x4000, 0xee9: 0x4000,
+	0xeea: 0x4000, 0xeeb: 0x4000, 0xeec: 0x4000, 0xeed: 0x4000, 0xeee: 0x4000, 0xeef: 0x4000,
+	0xef0: 0x4000, 0xef1: 0x4000, 0xef2: 0x4000, 0xef3: 0x4000, 0xef4: 0x4000, 0xef5: 0x4000,
+	0xef6: 0x4000, 0xef7: 0x4000, 0xef8: 0x4000, 0xef9: 0x4000, 0xefa: 0x4000, 0xefb: 0x4000,
+	0xefc: 0x4000, 0xefd: 0x4000, 0xefe: 0x4000, 0xeff: 0x4000,
+	// Block 0x3c, offset 0xf00
+	0xf00: 0x4000, 0xf01: 0x4000, 0xf02: 0x4000, 0xf03: 0x4000, 0xf04: 0x4000, 0xf05: 0x4000,
+	0xf06: 0x4000, 0xf07: 0x4000, 0xf08: 0x4000, 0xf09: 0x4000, 0xf0a: 0x4000, 0xf0b: 0x4000,
+	0xf0c: 0x4000, 0xf0d: 0x4000, 0xf0e: 0x4000, 0xf0f: 0x4000, 0xf10: 0x4000, 0xf11: 0x4000,
+	0xf12: 0x4000, 0xf13: 0x4000, 0xf14: 0x4000, 0xf15: 0x4000, 0xf16: 0x4000, 0xf17: 0x4000,
+	0xf18: 0x4000, 0xf19: 0x4000, 0xf1a: 0x4000, 0xf1b: 0x4000, 0xf1c: 0x4000, 0xf1d: 0x4000,
+	0xf1e: 0x4000, 0xf1f: 0x4000, 0xf20: 0x4000, 0xf21: 0x4000, 0xf22: 0x4000, 0xf23: 0x4000,
+	0xf24: 0x4000, 0xf25: 0x4000, 0xf26: 0x4000, 0xf27: 0x4000, 0xf28: 0x4000, 0xf29: 0x4000,
+	0xf2a: 0x4000, 0xf2b: 0x4000, 0xf2c: 0x4000, 0xf2d: 0x4000, 0xf2e: 0x4000, 0xf2f: 0x4000,
+	0xf30: 0x4000, 0xf31: 0x4000, 0xf32: 0x4000, 0xf33: 0x4000, 0xf34: 0x4000, 0xf35: 0x4000,
+	0xf36: 0x4000, 0xf37: 0x4000, 0xf38: 0x4000, 0xf39: 0x4000, 0xf3a: 0x4000, 0xf3b: 0x4000,
+	0xf3c: 0x4000, 0xf3d: 0x4000, 0xf3e: 0x4000,
+	// Block 0x3d, offset 0xf40
+	0xf40: 0x4000, 0xf41: 0x4000, 0xf42: 0x4000, 0xf43: 0x4000, 0xf44: 0x4000, 0xf45: 0x4000,
+	0xf46: 0x4000, 0xf47: 0x4000, 0xf48: 0x4000, 0xf49: 0x4000, 0xf4a: 0x4000, 0xf4b: 0x4000,
+	0xf4c: 0x4000, 0xf50: 0x4000, 0xf51: 0x4000,
+	0xf52: 0x4000, 0xf53: 0x4000, 0xf54: 0x4000, 0xf55: 0x4000, 0xf56: 0x4000, 0xf57: 0x4000,
+	0xf58: 0x4000, 0xf59: 0x4000, 0xf5a: 0x4000, 0xf5b: 0x4000, 0xf5c: 0x4000, 0xf5d: 0x4000,
+	0xf5e: 0x4000, 0xf5f: 0x4000, 0xf60: 0x4000, 0xf61: 0x4000, 0xf62: 0x4000, 0xf63: 0x4000,
+	0xf64: 0x4000, 0xf65: 0x4000, 0xf66: 0x4000, 0xf67: 0x4000, 0xf68: 0x4000, 0xf69: 0x4000,
+	0xf6a: 0x4000, 0xf6b: 0x4000, 0xf6c: 0x4000, 0xf6d: 0x4000, 0xf6e: 0x4000, 0xf6f: 0x4000,
+	0xf70: 0x4000, 0xf71: 0x4000, 0xf72: 0x4000, 0xf73: 0x4000, 0xf74: 0x4000, 0xf75: 0x4000,
+	0xf76: 0x4000, 0xf77: 0x4000, 0xf78: 0x4000, 0xf79: 0x4000, 0xf7a: 0x4000, 0xf7b: 0x4000,
+	0xf7c: 0x4000, 0xf7d: 0x4000, 0xf7e: 0x4000, 0xf7f: 0x4000,
+	// Block 0x3e, offset 0xf80
+	0xf80: 0x4000, 0xf81: 0x4000, 0xf82: 0x4000, 0xf83: 0x4000, 0xf84: 0x4000, 0xf85: 0x4000,
+	0xf86: 0x4000,
+	// Block 0x3f, offset 0xfc0
+	0xfe0: 0x4000, 0xfe1: 0x4000, 0xfe2: 0x4000, 0xfe3: 0x4000,
+	0xfe4: 0x4000, 0xfe5: 0x4000, 0xfe6: 0x4000, 0xfe7: 0x4000, 0xfe8: 0x4000, 0xfe9: 0x4000,
+	0xfea: 0x4000, 0xfeb: 0x4000, 0xfec: 0x4000, 0xfed: 0x4000, 0xfee: 0x4000, 0xfef: 0x4000,
+	0xff0: 0x4000, 0xff1: 0x4000, 0xff2: 0x4000, 0xff3: 0x4000, 0xff4: 0x4000, 0xff5: 0x4000,
+	0xff6: 0x4000, 0xff7: 0x4000, 0xff8: 0x4000, 0xff9: 0x4000, 0xffa: 0x4000, 0xffb: 0x4000,
+	0xffc: 0x4000,
+	// Block 0x40, offset 0x1000
+	0x1000: 0x4000, 0x1001: 0x4000, 0x1002: 0x4000, 0x1003: 0x4000, 0x1004: 0x4000, 0x1005: 0x4000,
+	0x1006: 0x4000, 0x1007: 0x4000, 0x1008: 0x4000, 0x1009: 0x4000, 0x100a: 0x4000, 0x100b: 0x4000,
+	0x100c: 0x4000, 0x100d: 0x4000, 0x100e: 0x4000, 0x100f: 0x4000, 0x1010: 0x4000, 0x1011: 0x4000,
+	0x1012: 0x4000, 0x1013: 0x4000, 0x1014: 0x4000, 0x1015: 0x4000, 0x1016: 0x4000, 0x1017: 0x4000,
+	0x1018: 0x4000, 0x1019: 0x4000, 0x101a: 0x4000, 0x101b: 0x4000, 0x101c: 0x4000, 0x101d: 0x4000,
+	0x101e: 0x4000, 0x101f: 0x4000, 0x1020: 0x4000, 0x1021: 0x4000, 0x1022: 0x4000, 0x1023: 0x4000,
+	// Block 0x41, offset 0x1040
+	0x1040: 0x2000, 0x1041: 0x2000, 0x1042: 0x2000, 0x1043: 0x2000, 0x1044: 0x2000, 0x1045: 0x2000,
+	0x1046: 0x2000, 0x1047: 0x2000, 0x1048: 0x2000, 0x1049: 0x2000, 0x104a: 0x2000, 0x104b: 0x2000,
+	0x104c: 0x2000, 0x104d: 0x2000, 0x104e: 0x2000, 0x104f: 0x2000, 0x1050: 0x4000, 0x1051: 0x4000,
+	0x1052: 0x4000, 0x1053: 0x4000, 0x1054: 0x4000, 0x1055: 0x4000, 0x1056: 0x4000, 0x1057: 0x4000,
+	0x1058: 0x4000, 0x1059: 0x4000,
+	0x1070: 0x4000, 0x1071: 0x4000, 0x1072: 0x4000, 0x1073: 0x4000, 0x1074: 0x4000, 0x1075: 0x4000,
+	0x1076: 0x4000, 0x1077: 0x4000, 0x1078: 0x4000, 0x1079: 0x4000, 0x107a: 0x4000, 0x107b: 0x4000,
+	0x107c: 0x4000, 0x107d: 0x4000, 0x107e: 0x4000, 0x107f: 0x4000,
+	// Block 0x42, offset 0x1080
+	0x1080: 0x4000, 0x1081: 0x4000, 0x1082: 0x4000, 0x1083: 0x4000, 0x1084: 0x4000, 0x1085: 0x4000,
+	0x1086: 0x4000, 0x1087: 0x4000, 0x1088: 0x4000, 0x1089: 0x4000, 0x108a: 0x4000, 0x108b: 0x4000,
+	0x108c: 0x4000, 0x108d: 0x4000, 0x108e: 0x4000, 0x108f: 0x4000, 0x1090: 0x4000, 0x1091: 0x4000,
+	0x1092: 0x4000, 0x1094: 0x4000, 0x1095: 0x4000, 0x1096: 0x4000, 0x1097: 0x4000,
+	0x1098: 0x4000, 0x1099: 0x4000, 0x109a: 0x4000, 0x109b: 0x4000, 0x109c: 0x4000, 0x109d: 0x4000,
+	0x109e: 0x4000, 0x109f: 0x4000, 0x10a0: 0x4000, 0x10a1: 0x4000, 0x10a2: 0x4000, 0x10a3: 0x4000,
+	0x10a4: 0x4000, 0x10a5: 0x4000, 0x10a6: 0x4000, 0x10a8: 0x4000, 0x10a9: 0x4000,
+	0x10aa: 0x4000, 0x10ab: 0x4000,
+	// Block 0x43, offset 0x10c0
+	0x10c1: 0x9012, 0x10c2: 0x9012, 0x10c3: 0x9012, 0x10c4: 0x9012, 0x10c5: 0x9012,
+	0x10c6: 0x9012, 0x10c7: 0x9012, 0x10c8: 0x9012, 0x10c9: 0x9012, 0x10ca: 0x9012, 0x10cb: 0x9012,
+	0x10cc: 0x9012, 0x10cd: 0x9012, 0x10ce: 0x9012, 0x10cf: 0x9012, 0x10d0: 0x9012, 0x10d1: 0x9012,
+	0x10d2: 0x9012, 0x10d3: 0x9012, 0x10d4: 0x9012, 0x10d5: 0x9012, 0x10d6: 0x9012, 0x10d7: 0x9012,
+	0x10d8: 0x9012, 0x10d9: 0x9012, 0x10da: 0x9012, 0x10db: 0x9012, 0x10dc: 0x9012, 0x10dd: 0x9012,
+	0x10de: 0x9012, 0x10df: 0x9012, 0x10e0: 0x9049, 0x10e1: 0x9049, 0x10e2: 0x9049, 0x10e3: 0x9049,
+	0x10e4: 0x9049, 0x10e5: 0x9049, 0x10e6: 0x9049, 0x10e7: 0x9049, 0x10e8: 0x9049, 0x10e9: 0x9049,
+	0x10ea: 0x9049, 0x10eb: 0x9049, 0x10ec: 0x9049, 0x10ed: 0x9049, 0x10ee: 0x9049, 0x10ef: 0x9049,
+	0x10f0: 0x9049, 0x10f1: 0x9049, 0x10f2: 0x9049, 0x10f3: 0x9049, 0x10f4: 0x9049, 0x10f5: 0x9049,
+	0x10f6: 0x9049, 0x10f7: 0x9049, 0x10f8: 0x9049, 0x10f9: 0x9049, 0x10fa: 0x9049, 0x10fb: 0x9049,
+	0x10fc: 0x9049, 0x10fd: 0x9049, 0x10fe: 0x9049, 0x10ff: 0x9049,
+	// Block 0x44, offset 0x1100
+	0x1100: 0x9049, 0x1101: 0x9049, 0x1102: 0x9049, 0x1103: 0x9049, 0x1104: 0x9049, 0x1105: 0x9049,
+	0x1106: 0x9049, 0x1107: 0x9049, 0x1108: 0x9049, 0x1109: 0x9049, 0x110a: 0x9049, 0x110b: 0x9049,
+	0x110c: 0x9049, 0x110d: 0x9049, 0x110e: 0x9049, 0x110f: 0x9049, 0x1110: 0x9049, 0x1111: 0x9049,
+	0x1112: 0x9049, 0x1113: 0x9049, 0x1114: 0x9049, 0x1115: 0x9049, 0x1116: 0x9049, 0x1117: 0x9049,
+	0x1118: 0x9049, 0x1119: 0x9049, 0x111a: 0x9049, 0x111b: 0x9049, 0x111c: 0x9049, 0x111d: 0x9049,
+	0x111e: 0x9049, 0x111f: 0x904a, 0x1120: 0x904b, 0x1121: 0xb04c, 0x1122: 0xb04d, 0x1123: 0xb04d,
+	0x1124: 0xb04e, 0x1125: 0xb04f, 0x1126: 0xb050, 0x1127: 0xb051, 0x1128: 0xb052, 0x1129: 0xb053,
+	0x112a: 0xb054, 0x112b: 0xb055, 0x112c: 0xb056, 0x112d: 0xb057, 0x112e: 0xb058, 0x112f: 0xb059,
+	0x1130: 0xb05a, 0x1131: 0xb05b, 0x1132: 0xb05c, 0x1133: 0xb05d, 0x1134: 0xb05e, 0x1135: 0xb05f,
+	0x1136: 0xb060, 0x1137: 0xb061, 0x1138: 0xb062, 0x1139: 0xb063, 0x113a: 0xb064, 0x113b: 0xb065,
+	0x113c: 0xb052, 0x113d: 0xb066, 0x113e: 0xb067, 0x113f: 0xb055,
+	// Block 0x45, offset 0x1140
+	0x1140: 0xb068, 0x1141: 0xb069, 0x1142: 0xb06a, 0x1143: 0xb06b, 0x1144: 0xb05a, 0x1145: 0xb056,
+	0x1146: 0xb06c, 0x1147: 0xb06d, 0x1148: 0xb06b, 0x1149: 0xb06e, 0x114a: 0xb06b, 0x114b: 0xb06f,
+	0x114c: 0xb06f, 0x114d: 0xb070, 0x114e: 0xb070, 0x114f: 0xb071, 0x1150: 0xb056, 0x1151: 0xb072,
+	0x1152: 0xb073, 0x1153: 0xb072, 0x1154: 0xb074, 0x1155: 0xb073, 0x1156: 0xb075, 0x1157: 0xb075,
+	0x1158: 0xb076, 0x1159: 0xb076, 0x115a: 0xb077, 0x115b: 0xb077, 0x115c: 0xb073, 0x115d: 0xb078,
+	0x115e: 0xb079, 0x115f: 0xb067, 0x1160: 0xb07a, 0x1161: 0xb07b, 0x1162: 0xb07b, 0x1163: 0xb07b,
+	0x1164: 0xb07b, 0x1165: 0xb07b, 0x1166: 0xb07b, 0x1167: 0xb07b, 0x1168: 0xb07b, 0x1169: 0xb07b,
+	0x116a: 0xb07b, 0x116b: 0xb07b, 0x116c: 0xb07b, 0x116d: 0xb07b, 0x116e: 0xb07b, 0x116f: 0xb07b,
+	0x1170: 0xb07c, 0x1171: 0xb07c, 0x1172: 0xb07c, 0x1173: 0xb07c, 0x1174: 0xb07c, 0x1175: 0xb07c,
+	0x1176: 0xb07c, 0x1177: 0xb07c, 0x1178: 0xb07c, 0x1179: 0xb07c, 0x117a: 0xb07c, 0x117b: 0xb07c,
+	0x117c: 0xb07c, 0x117d: 0xb07c, 0x117e: 0xb07c,
+	// Block 0x46, offset 0x1180
+	0x1182: 0xb07d, 0x1183: 0xb07e, 0x1184: 0xb07f, 0x1185: 0xb080,
+	0x1186: 0xb07f, 0x1187: 0xb07e, 0x118a: 0xb081, 0x118b: 0xb082,
+	0x118c: 0xb083, 0x118d: 0xb07f, 0x118e: 0xb080, 0x118f: 0xb07f,
+	0x1192: 0xb084, 0x1193: 0xb085, 0x1194: 0xb084, 0x1195: 0xb086, 0x1196: 0xb084, 0x1197: 0xb087,
+	0x119a: 0xb088, 0x119b: 0xb089, 0x119c: 0xb08a,
+	0x11a0: 0x908b, 0x11a1: 0x908b, 0x11a2: 0x908c, 0x11a3: 0x908d,
+	0x11a4: 0x908b, 0x11a5: 0x908e, 0x11a6: 0x908f, 0x11a8: 0xb090, 0x11a9: 0xb091,
+	0x11aa: 0xb092, 0x11ab: 0xb091, 0x11ac: 0xb093, 0x11ad: 0xb094, 0x11ae: 0xb095,
+	0x11bd: 0x2000,
+	// Block 0x47, offset 0x11c0
+	0x11e0: 0x4000,
+	// Block 0x48, offset 0x1200
+	0x1200: 0x4000, 0x1201: 0x4000, 0x1202: 0x4000, 0x1203: 0x4000, 0x1204: 0x4000, 0x1205: 0x4000,
+	0x1206: 0x4000, 0x1207: 0x4000, 0x1208: 0x4000, 0x1209: 0x4000, 0x120a: 0x4000, 0x120b: 0x4000,
+	0x120c: 0x4000, 0x120d: 0x4000, 0x120e: 0x4000, 0x120f: 0x4000, 0x1210: 0x4000, 0x1211: 0x4000,
+	0x1212: 0x4000, 0x1213: 0x4000, 0x1214: 0x4000, 0x1215: 0x4000, 0x1216: 0x4000, 0x1217: 0x4000,
+	0x1218: 0x4000, 0x1219: 0x4000, 0x121a: 0x4000, 0x121b: 0x4000, 0x121c: 0x4000, 0x121d: 0x4000,
+	0x121e: 0x4000, 0x121f: 0x4000, 0x1220: 0x4000, 0x1221: 0x4000, 0x1222: 0x4000, 0x1223: 0x4000,
+	0x1224: 0x4000, 0x1225: 0x4000, 0x1226: 0x4000, 0x1227: 0x4000, 0x1228: 0x4000, 0x1229: 0x4000,
+	0x122a: 0x4000, 0x122b: 0x4000, 0x122c: 0x4000,
+	// Block 0x49, offset 0x1240
+	0x1240: 0x4000, 0x1241: 0x4000, 0x1242: 0x4000, 0x1243: 0x4000, 0x1244: 0x4000, 0x1245: 0x4000,
+	0x1246: 0x4000, 0x1247: 0x4000, 0x1248: 0x4000, 0x1249: 0x4000, 0x124a: 0x4000, 0x124b: 0x4000,
+	0x124c: 0x4000, 0x124d: 0x4000, 0x124e: 0x4000, 0x124f: 0x4000, 0x1250: 0x4000, 0x1251: 0x4000,
+	0x1252: 0x4000, 0x1253: 0x4000, 0x1254: 0x4000, 0x1255: 0x4000, 0x1256: 0x4000, 0x1257: 0x4000,
+	0x1258: 0x4000, 0x1259: 0x4000, 0x125a: 0x4000, 0x125b: 0x4000, 0x125c: 0x4000, 0x125d: 0x4000,
+	0x125e: 0x4000, 0x125f: 0x4000, 0x1260: 0x4000, 0x1261: 0x4000, 0x1262: 0x4000, 0x1263: 0x4000,
+	0x1264: 0x4000, 0x1265: 0x4000, 0x1266: 0x4000, 0x1267: 0x4000, 0x1268: 0x4000, 0x1269: 0x4000,
+	0x126a: 0x4000, 0x126b: 0x4000, 0x126c: 0x4000, 0x126d: 0x4000, 0x126e: 0x4000, 0x126f: 0x4000,
+	0x1270: 0x4000, 0x1271: 0x4000, 0x1272: 0x4000,
+	// Block 0x4a, offset 0x1280
+	0x1280: 0x4000, 0x1281: 0x4000,
+	// Block 0x4b, offset 0x12c0
+	0x12c4: 0x4000,
+	// Block 0x4c, offset 0x1300
+	0x130f: 0x4000,
+	// Block 0x4d, offset 0x1340
+	0x1340: 0x2000, 0x1341: 0x2000, 0x1342: 0x2000, 0x1343: 0x2000, 0x1344: 0x2000, 0x1345: 0x2000,
+	0x1346: 0x2000, 0x1347: 0x2000, 0x1348: 0x2000, 0x1349: 0x2000, 0x134a: 0x2000,
+	0x1350: 0x2000, 0x1351: 0x2000,
+	0x1352: 0x2000, 0x1353: 0x2000, 0x1354: 0x2000, 0x1355: 0x2000, 0x1356: 0x2000, 0x1357: 0x2000,
+	0x1358: 0x2000, 0x1359: 0x2000, 0x135a: 0x2000, 0x135b: 0x2000, 0x135c: 0x2000, 0x135d: 0x2000,
+	0x135e: 0x2000, 0x135f: 0x2000, 0x1360: 0x2000, 0x1361: 0x2000, 0x1362: 0x2000, 0x1363: 0x2000,
+	0x1364: 0x2000, 0x1365: 0x2000, 0x1366: 0x2000, 0x1367: 0x2000, 0x1368: 0x2000, 0x1369: 0x2000,
+	0x136a: 0x2000, 0x136b: 0x2000, 0x136c: 0x2000, 0x136d: 0x2000,
+	0x1370: 0x2000, 0x1371: 0x2000, 0x1372: 0x2000, 0x1373: 0x2000, 0x1374: 0x2000, 0x1375: 0x2000,
+	0x1376: 0x2000, 0x1377: 0x2000, 0x1378: 0x2000, 0x1379: 0x2000, 0x137a: 0x2000, 0x137b: 0x2000,
+	0x137c: 0x2000, 0x137d: 0x2000, 0x137e: 0x2000, 0x137f: 0x2000,
+	// Block 0x4e, offset 0x1380
+	0x1380: 0x2000, 0x1381: 0x2000, 0x1382: 0x2000, 0x1383: 0x2000, 0x1384: 0x2000, 0x1385: 0x2000,
+	0x1386: 0x2000, 0x1387: 0x2000, 0x1388: 0x2000, 0x1389: 0x2000, 0x138a: 0x2000, 0x138b: 0x2000,
+	0x138c: 0x2000, 0x138d: 0x2000, 0x138e: 0x2000, 0x138f: 0x2000, 0x1390: 0x2000, 0x1391: 0x2000,
+	0x1392: 0x2000, 0x1393: 0x2000, 0x1394: 0x2000, 0x1395: 0x2000, 0x1396: 0x2000, 0x1397: 0x2000,
+	0x1398: 0x2000, 0x1399: 0x2000, 0x139a: 0x2000, 0x139b: 0x2000, 0x139c: 0x2000, 0x139d: 0x2000,
+	0x139e: 0x2000, 0x139f: 0x2000, 0x13a0: 0x2000, 0x13a1: 0x2000, 0x13a2: 0x2000, 0x13a3: 0x2000,
+	0x13a4: 0x2000, 0x13a5: 0x2000, 0x13a6: 0x2000, 0x13a7: 0x2000, 0x13a8: 0x2000, 0x13a9: 0x2000,
+	0x13b0: 0x2000, 0x13b1: 0x2000, 0x13b2: 0x2000, 0x13b3: 0x2000, 0x13b4: 0x2000, 0x13b5: 0x2000,
+	0x13b6: 0x2000, 0x13b7: 0x2000, 0x13b8: 0x2000, 0x13b9: 0x2000, 0x13ba: 0x2000, 0x13bb: 0x2000,
+	0x13bc: 0x2000, 0x13bd: 0x2000, 0x13be: 0x2000, 0x13bf: 0x2000,
+	// Block 0x4f, offset 0x13c0
+	0x13c0: 0x2000, 0x13c1: 0x2000, 0x13c2: 0x2000, 0x13c3: 0x2000, 0x13c4: 0x2000, 0x13c5: 0x2000,
+	0x13c6: 0x2000, 0x13c7: 0x2000, 0x13c8: 0x2000, 0x13c9: 0x2000, 0x13ca: 0x2000, 0x13cb: 0x2000,
+	0x13cc: 0x2000, 0x13cd: 0x2000, 0x13ce: 0x4000, 0x13cf: 0x2000, 0x13d0: 0x2000, 0x13d1: 0x4000,
+	0x13d2: 0x4000, 0x13d3: 0x4000, 0x13d4: 0x4000, 0x13d5: 0x4000, 0x13d6: 0x4000, 0x13d7: 0x4000,
+	0x13d8: 0x4000, 0x13d9: 0x4000, 0x13da: 0x4000, 0x13db: 0x2000, 0x13dc: 0x2000, 0x13dd: 0x2000,
+	0x13de: 0x2000, 0x13df: 0x2000, 0x13e0: 0x2000, 0x13e1: 0x2000, 0x13e2: 0x2000, 0x13e3: 0x2000,
+	0x13e4: 0x2000, 0x13e5: 0x2000, 0x13e6: 0x2000, 0x13e7: 0x2000, 0x13e8: 0x2000, 0x13e9: 0x2000,
+	0x13ea: 0x2000, 0x13eb: 0x2000, 0x13ec: 0x2000,
+	// Block 0x50, offset 0x1400
+	0x1400: 0x4000, 0x1401: 0x4000, 0x1402: 0x4000,
+	0x1410: 0x4000, 0x1411: 0x4000,
+	0x1412: 0x4000, 0x1413: 0x4000, 0x1414: 0x4000, 0x1415: 0x4000, 0x1416: 0x4000, 0x1417: 0x4000,
+	0x1418: 0x4000, 0x1419: 0x4000, 0x141a: 0x4000, 0x141b: 0x4000, 0x141c: 0x4000, 0x141d: 0x4000,
+	0x141e: 0x4000, 0x141f: 0x4000, 0x1420: 0x4000, 0x1421: 0x4000, 0x1422: 0x4000, 0x1423: 0x4000,
+	0x1424: 0x4000, 0x1425: 0x4000, 0x1426: 0x4000, 0x1427: 0x4000, 0x1428: 0x4000, 0x1429: 0x4000,
+	0x142a: 0x4000, 0x142b: 0x4000, 0x142c: 0x4000, 0x142d: 0x4000, 0x142e: 0x4000, 0x142f: 0x4000,
+	0x1430: 0x4000, 0x1431: 0x4000, 0x1432: 0x4000, 0x1433: 0x4000, 0x1434: 0x4000, 0x1435: 0x4000,
+	0x1436: 0x4000, 0x1437: 0x4000, 0x1438: 0x4000, 0x1439: 0x4000, 0x143a: 0x4000, 0x143b: 0x4000,
+	// Block 0x51, offset 0x1440
+	0x1440: 0x4000, 0x1441: 0x4000, 0x1442: 0x4000, 0x1443: 0x4000, 0x1444: 0x4000, 0x1445: 0x4000,
+	0x1446: 0x4000, 0x1447: 0x4000, 0x1448: 0x4000,
+	0x1450: 0x4000, 0x1451: 0x4000,
+	// Block 0x52, offset 0x1480
+	0x1480: 0x4000, 0x1481: 0x4000, 0x1482: 0x4000, 0x1483: 0x4000, 0x1484: 0x4000, 0x1485: 0x4000,
+	0x1486: 0x4000, 0x1487: 0x4000, 0x1488: 0x4000, 0x1489: 0x4000, 0x148a: 0x4000, 0x148b: 0x4000,
+	0x148c: 0x4000, 0x148d: 0x4000, 0x148e: 0x4000, 0x148f: 0x4000, 0x1490: 0x4000, 0x1491: 0x4000,
+	0x1492: 0x4000, 0x1493: 0x4000, 0x1494: 0x4000, 0x1495: 0x4000, 0x1496: 0x4000, 0x1497: 0x4000,
+	0x1498: 0x4000, 0x1499: 0x4000, 0x149a: 0x4000, 0x149b: 0x4000, 0x149c: 0x4000, 0x149d: 0x4000,
+	0x149e: 0x4000, 0x149f: 0x4000, 0x14a0: 0x4000,
+	0x14ad: 0x4000, 0x14ae: 0x4000, 0x14af: 0x4000,
+	0x14b0: 0x4000, 0x14b1: 0x4000, 0x14b2: 0x4000, 0x14b3: 0x4000, 0x14b4: 0x4000, 0x14b5: 0x4000,
+	0x14b7: 0x4000, 0x14b8: 0x4000, 0x14b9: 0x4000, 0x14ba: 0x4000, 0x14bb: 0x4000,
+	0x14bc: 0x4000, 0x14bd: 0x4000, 0x14be: 0x4000, 0x14bf: 0x4000,
+	// Block 0x53, offset 0x14c0
+	0x14c0: 0x4000, 0x14c1: 0x4000, 0x14c2: 0x4000, 0x14c3: 0x4000, 0x14c4: 0x4000, 0x14c5: 0x4000,
+	0x14c6: 0x4000, 0x14c7: 0x4000, 0x14c8: 0x4000, 0x14c9: 0x4000, 0x14ca: 0x4000, 0x14cb: 0x4000,
+	0x14cc: 0x4000, 0x14cd: 0x4000, 0x14ce: 0x4000, 0x14cf: 0x4000, 0x14d0: 0x4000, 0x14d1: 0x4000,
+	0x14d2: 0x4000, 0x14d3: 0x4000, 0x14d4: 0x4000, 0x14d5: 0x4000, 0x14d6: 0x4000, 0x14d7: 0x4000,
+	0x14d8: 0x4000, 0x14d9: 0x4000, 0x14da: 0x4000, 0x14db: 0x4000, 0x14dc: 0x4000, 0x14dd: 0x4000,
+	0x14de: 0x4000, 0x14df: 0x4000, 0x14e0: 0x4000, 0x14e1: 0x4000, 0x14e2: 0x4000, 0x14e3: 0x4000,
+	0x14e4: 0x4000, 0x14e5: 0x4000, 0x14e6: 0x4000, 0x14e7: 0x4000, 0x14e8: 0x4000, 0x14e9: 0x4000,
+	0x14ea: 0x4000, 0x14eb: 0x4000, 0x14ec: 0x4000, 0x14ed: 0x4000, 0x14ee: 0x4000, 0x14ef: 0x4000,
+	0x14f0: 0x4000, 0x14f1: 0x4000, 0x14f2: 0x4000, 0x14f3: 0x4000, 0x14f4: 0x4000, 0x14f5: 0x4000,
+	0x14f6: 0x4000, 0x14f7: 0x4000, 0x14f8: 0x4000, 0x14f9: 0x4000, 0x14fa: 0x4000, 0x14fb: 0x4000,
+	0x14fc: 0x4000, 0x14fe: 0x4000, 0x14ff: 0x4000,
+	// Block 0x54, offset 0x1500
+	0x1500: 0x4000, 0x1501: 0x4000, 0x1502: 0x4000, 0x1503: 0x4000, 0x1504: 0x4000, 0x1505: 0x4000,
+	0x1506: 0x4000, 0x1507: 0x4000, 0x1508: 0x4000, 0x1509: 0x4000, 0x150a: 0x4000, 0x150b: 0x4000,
+	0x150c: 0x4000, 0x150d: 0x4000, 0x150e: 0x4000, 0x150f: 0x4000, 0x1510: 0x4000, 0x1511: 0x4000,
+	0x1512: 0x4000, 0x1513: 0x4000,
+	0x1520: 0x4000, 0x1521: 0x4000, 0x1522: 0x4000, 0x1523: 0x4000,
+	0x1524: 0x4000, 0x1525: 0x4000, 0x1526: 0x4000, 0x1527: 0x4000, 0x1528: 0x4000, 0x1529: 0x4000,
+	0x152a: 0x4000, 0x152b: 0x4000, 0x152c: 0x4000, 0x152d: 0x4000, 0x152e: 0x4000, 0x152f: 0x4000,
+	0x1530: 0x4000, 0x1531: 0x4000, 0x1532: 0x4000, 0x1533: 0x4000, 0x1534: 0x4000, 0x1535: 0x4000,
+	0x1536: 0x4000, 0x1537: 0x4000, 0x1538: 0x4000, 0x1539: 0x4000, 0x153a: 0x4000, 0x153b: 0x4000,
+	0x153c: 0x4000, 0x153d: 0x4000, 0x153e: 0x4000, 0x153f: 0x4000,
+	// Block 0x55, offset 0x1540
+	0x1540: 0x4000, 0x1541: 0x4000, 0x1542: 0x4000, 0x1543: 0x4000, 0x1544: 0x4000, 0x1545: 0x4000,
+	0x1546: 0x4000, 0x1547: 0x4000, 0x1548: 0x4000, 0x1549: 0x4000, 0x154a: 0x4000,
+	0x154f: 0x4000, 0x1550: 0x4000, 0x1551: 0x4000,
+	0x1552: 0x4000, 0x1553: 0x4000,
+	0x1560: 0x4000, 0x1561: 0x4000, 0x1562: 0x4000, 0x1563: 0x4000,
+	0x1564: 0x4000, 0x1565: 0x4000, 0x1566: 0x4000, 0x1567: 0x4000, 0x1568: 0x4000, 0x1569: 0x4000,
+	0x156a: 0x4000, 0x156b: 0x4000, 0x156c: 0x4000, 0x156d: 0x4000, 0x156e: 0x4000, 0x156f: 0x4000,
+	0x1570: 0x4000, 0x1574: 0x4000,
+	0x1578: 0x4000, 0x1579: 0x4000, 0x157a: 0x4000, 0x157b: 0x4000,
+	0x157c: 0x4000, 0x157d: 0x4000, 0x157e: 0x4000, 0x157f: 0x4000,
+	// Block 0x56, offset 0x1580
+	0x1580: 0x4000, 0x1582: 0x4000, 0x1583: 0x4000, 0x1584: 0x4000, 0x1585: 0x4000,
+	0x1586: 0x4000, 0x1587: 0x4000, 0x1588: 0x4000, 0x1589: 0x4000, 0x158a: 0x4000, 0x158b: 0x4000,
+	0x158c: 0x4000, 0x158d: 0x4000, 0x158e: 0x4000, 0x158f: 0x4000, 0x1590: 0x4000, 0x1591: 0x4000,
+	0x1592: 0x4000, 0x1593: 0x4000, 0x1594: 0x4000, 0x1595: 0x4000, 0x1596: 0x4000, 0x1597: 0x4000,
+	0x1598: 0x4000, 0x1599: 0x4000, 0x159a: 0x4000, 0x159b: 0x4000, 0x159c: 0x4000, 0x159d: 0x4000,
+	0x159e: 0x4000, 0x159f: 0x4000, 0x15a0: 0x4000, 0x15a1: 0x4000, 0x15a2: 0x4000, 0x15a3: 0x4000,
+	0x15a4: 0x4000, 0x15a5: 0x4000, 0x15a6: 0x4000, 0x15a7: 0x4000, 0x15a8: 0x4000, 0x15a9: 0x4000,
+	0x15aa: 0x4000, 0x15ab: 0x4000, 0x15ac: 0x4000, 0x15ad: 0x4000, 0x15ae: 0x4000, 0x15af: 0x4000,
+	0x15b0: 0x4000, 0x15b1: 0x4000, 0x15b2: 0x4000, 0x15b3: 0x4000, 0x15b4: 0x4000, 0x15b5: 0x4000,
+	0x15b6: 0x4000, 0x15b7: 0x4000, 0x15b8: 0x4000, 0x15b9: 0x4000, 0x15ba: 0x4000, 0x15bb: 0x4000,
+	0x15bc: 0x4000, 0x15bd: 0x4000, 0x15be: 0x4000, 0x15bf: 0x4000,
+	// Block 0x57, offset 0x15c0
+	0x15c0: 0x4000, 0x15c1: 0x4000, 0x15c2: 0x4000, 0x15c3: 0x4000, 0x15c4: 0x4000, 0x15c5: 0x4000,
+	0x15c6: 0x4000, 0x15c7: 0x4000, 0x15c8: 0x4000, 0x15c9: 0x4000, 0x15ca: 0x4000, 0x15cb: 0x4000,
+	0x15cc: 0x4000, 0x15cd: 0x4000, 0x15ce: 0x4000, 0x15cf: 0x4000, 0x15d0: 0x4000, 0x15d1: 0x4000,
+	0x15d2: 0x4000, 0x15d3: 0x4000, 0x15d4: 0x4000, 0x15d5: 0x4000, 0x15d6: 0x4000, 0x15d7: 0x4000,
+	0x15d8: 0x4000, 0x15d9: 0x4000, 0x15da: 0x4000, 0x15db: 0x4000, 0x15dc: 0x4000, 0x15dd: 0x4000,
+	0x15de: 0x4000, 0x15df: 0x4000, 0x15e0: 0x4000, 0x15e1: 0x4000, 0x15e2: 0x4000, 0x15e3: 0x4000,
+	0x15e4: 0x4000, 0x15e5: 0x4000, 0x15e6: 0x4000, 0x15e7: 0x4000, 0x15e8: 0x4000, 0x15e9: 0x4000,
+	0x15ea: 0x4000, 0x15eb: 0x4000, 0x15ec: 0x4000, 0x15ed: 0x4000, 0x15ee: 0x4000, 0x15ef: 0x4000,
+	0x15f0: 0x4000, 0x15f1: 0x4000, 0x15f2: 0x4000, 0x15f3: 0x4000, 0x15f4: 0x4000, 0x15f5: 0x4000,
+	0x15f6: 0x4000, 0x15f7: 0x4000, 0x15f8: 0x4000, 0x15f9: 0x4000, 0x15fa: 0x4000, 0x15fb: 0x4000,
+	0x15fc: 0x4000, 0x15ff: 0x4000,
+	// Block 0x58, offset 0x1600
+	0x1600: 0x4000, 0x1601: 0x4000, 0x1602: 0x4000, 0x1603: 0x4000, 0x1604: 0x4000, 0x1605: 0x4000,
+	0x1606: 0x4000, 0x1607: 0x4000, 0x1608: 0x4000, 0x1609: 0x4000, 0x160a: 0x4000, 0x160b: 0x4000,
+	0x160c: 0x4000, 0x160d: 0x4000, 0x160e: 0x4000, 0x160f: 0x4000, 0x1610: 0x4000, 0x1611: 0x4000,
+	0x1612: 0x4000, 0x1613: 0x4000, 0x1614: 0x4000, 0x1615: 0x4000, 0x1616: 0x4000, 0x1617: 0x4000,
+	0x1618: 0x4000, 0x1619: 0x4000, 0x161a: 0x4000, 0x161b: 0x4000, 0x161c: 0x4000, 0x161d: 0x4000,
+	0x161e: 0x4000, 0x161f: 0x4000, 0x1620: 0x4000, 0x1621: 0x4000, 0x1622: 0x4000, 0x1623: 0x4000,
+	0x1624: 0x4000, 0x1625: 0x4000, 0x1626: 0x4000, 0x1627: 0x4000, 0x1628: 0x4000, 0x1629: 0x4000,
+	0x162a: 0x4000, 0x162b: 0x4000, 0x162c: 0x4000, 0x162d: 0x4000, 0x162e: 0x4000, 0x162f: 0x4000,
+	0x1630: 0x4000, 0x1631: 0x4000, 0x1632: 0x4000, 0x1633: 0x4000, 0x1634: 0x4000, 0x1635: 0x4000,
+	0x1636: 0x4000, 0x1637: 0x4000, 0x1638: 0x4000, 0x1639: 0x4000, 0x163a: 0x4000, 0x163b: 0x4000,
+	0x163c: 0x4000, 0x163d: 0x4000,
+	// Block 0x59, offset 0x1640
+	0x164b: 0x4000,
+	0x164c: 0x4000, 0x164d: 0x4000, 0x164e: 0x4000, 0x1650: 0x4000, 0x1651: 0x4000,
+	0x1652: 0x4000, 0x1653: 0x4000, 0x1654: 0x4000, 0x1655: 0x4000, 0x1656: 0x4000, 0x1657: 0x4000,
+	0x1658: 0x4000, 0x1659: 0x4000, 0x165a: 0x4000, 0x165b: 0x4000, 0x165c: 0x4000, 0x165d: 0x4000,
+	0x165e: 0x4000, 0x165f: 0x4000, 0x1660: 0x4000, 0x1661: 0x4000, 0x1662: 0x4000, 0x1663: 0x4000,
+	0x1664: 0x4000, 0x1665: 0x4000, 0x1666: 0x4000, 0x1667: 0x4000,
+	0x167a: 0x4000,
+	// Block 0x5a, offset 0x1680
+	0x1695: 0x4000, 0x1696: 0x4000,
+	0x16a4: 0x4000,
+	// Block 0x5b, offset 0x16c0
+	0x16fb: 0x4000,
+	0x16fc: 0x4000, 0x16fd: 0x4000, 0x16fe: 0x4000, 0x16ff: 0x4000,
+	// Block 0x5c, offset 0x1700
+	0x1700: 0x4000, 0x1701: 0x4000, 0x1702: 0x4000, 0x1703: 0x4000, 0x1704: 0x4000, 0x1705: 0x4000,
+	0x1706: 0x4000, 0x1707: 0x4000, 0x1708: 0x4000, 0x1709: 0x4000, 0x170a: 0x4000, 0x170b: 0x4000,
+	0x170c: 0x4000, 0x170d: 0x4000, 0x170e: 0x4000, 0x170f: 0x4000,
+	// Block 0x5d, offset 0x1740
+	0x1740: 0x4000, 0x1741: 0x4000, 0x1742: 0x4000, 0x1743: 0x4000, 0x1744: 0x4000, 0x1745: 0x4000,
+	0x174c: 0x4000, 0x1750: 0x4000, 0x1751: 0x4000,
+	0x1752: 0x4000,
+	0x176b: 0x4000, 0x176c: 0x4000,
+	0x1774: 0x4000, 0x1775: 0x4000,
+	0x1776: 0x4000,
+	// Block 0x5e, offset 0x1780
+	0x1790: 0x4000, 0x1791: 0x4000,
+	0x1792: 0x4000, 0x1793: 0x4000, 0x1794: 0x4000, 0x1795: 0x4000, 0x1796: 0x4000, 0x1797: 0x4000,
+	0x1798: 0x4000, 0x1799: 0x4000, 0x179a: 0x4000, 0x179b: 0x4000, 0x179c: 0x4000, 0x179d: 0x4000,
+	0x179e: 0x4000, 0x17a0: 0x4000, 0x17a1: 0x4000, 0x17a2: 0x4000, 0x17a3: 0x4000,
+	0x17a4: 0x4000, 0x17a5: 0x4000, 0x17a6: 0x4000, 0x17a7: 0x4000,
+	0x17b0: 0x4000, 0x17b3: 0x4000, 0x17b4: 0x4000, 0x17b5: 0x4000,
+	0x17b6: 0x4000, 0x17b7: 0x4000, 0x17b8: 0x4000, 0x17b9: 0x4000, 0x17ba: 0x4000, 0x17bb: 0x4000,
+	0x17bc: 0x4000, 0x17bd: 0x4000, 0x17be: 0x4000,
+	// Block 0x5f, offset 0x17c0
+	0x17c0: 0x4000, 0x17c1: 0x4000, 0x17c2: 0x4000, 0x17c3: 0x4000, 0x17c4: 0x4000, 0x17c5: 0x4000,
+	0x17c6: 0x4000, 0x17c7: 0x4000, 0x17c8: 0x4000, 0x17c9: 0x4000, 0x17ca: 0x4000, 0x17cb: 0x4000,
+	0x17d0: 0x4000, 0x17d1: 0x4000,
+	0x17d2: 0x4000, 0x17d3: 0x4000, 0x17d4: 0x4000, 0x17d5: 0x4000, 0x17d6: 0x4000, 0x17d7: 0x4000,
+	0x17d8: 0x4000, 0x17d9: 0x4000, 0x17da: 0x4000, 0x17db: 0x4000, 0x17dc: 0x4000, 0x17dd: 0x4000,
+	0x17de: 0x4000,
+	// Block 0x60, offset 0x1800
+	0x1800: 0x4000, 0x1801: 0x4000, 0x1802: 0x4000, 0x1803: 0x4000, 0x1804: 0x4000, 0x1805: 0x4000,
+	0x1806: 0x4000, 0x1807: 0x4000, 0x1808: 0x4000, 0x1809: 0x4000, 0x180a: 0x4000, 0x180b: 0x4000,
+	0x180c: 0x4000, 0x180d: 0x4000, 0x180e: 0x4000, 0x180f: 0x4000, 0x1810: 0x4000, 0x1811: 0x4000,
+	// Block 0x61, offset 0x1840
+	0x1840: 0x4000,
+	// Block 0x62, offset 0x1880
+	0x1880: 0x2000, 0x1881: 0x2000, 0x1882: 0x2000, 0x1883: 0x2000, 0x1884: 0x2000, 0x1885: 0x2000,
+	0x1886: 0x2000, 0x1887: 0x2000, 0x1888: 0x2000, 0x1889: 0x2000, 0x188a: 0x2000, 0x188b: 0x2000,
+	0x188c: 0x2000, 0x188d: 0x2000, 0x188e: 0x2000, 0x188f: 0x2000, 0x1890: 0x2000, 0x1891: 0x2000,
+	0x1892: 0x2000, 0x1893: 0x2000, 0x1894: 0x2000, 0x1895: 0x2000, 0x1896: 0x2000, 0x1897: 0x2000,
+	0x1898: 0x2000, 0x1899: 0x2000, 0x189a: 0x2000, 0x189b: 0x2000, 0x189c: 0x2000, 0x189d: 0x2000,
+	0x189e: 0x2000, 0x189f: 0x2000, 0x18a0: 0x2000, 0x18a1: 0x2000, 0x18a2: 0x2000, 0x18a3: 0x2000,
+	0x18a4: 0x2000, 0x18a5: 0x2000, 0x18a6: 0x2000, 0x18a7: 0x2000, 0x18a8: 0x2000, 0x18a9: 0x2000,
+	0x18aa: 0x2000, 0x18ab: 0x2000, 0x18ac: 0x2000, 0x18ad: 0x2000, 0x18ae: 0x2000, 0x18af: 0x2000,
+	0x18b0: 0x2000, 0x18b1: 0x2000, 0x18b2: 0x2000, 0x18b3: 0x2000, 0x18b4: 0x2000, 0x18b5: 0x2000,
+	0x18b6: 0x2000, 0x18b7: 0x2000, 0x18b8: 0x2000, 0x18b9: 0x2000, 0x18ba: 0x2000, 0x18bb: 0x2000,
+	0x18bc: 0x2000, 0x18bd: 0x2000,
+}
+
+// widthIndex: 22 blocks, 1408 entries, 1408 bytes
+// Block 0 is the zero block.
+var widthIndex = [1408]uint8{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x01, 0xc3: 0x02, 0xc4: 0x03, 0xc5: 0x04, 0xc7: 0x05,
+	0xc9: 0x06, 0xcb: 0x07, 0xcc: 0x08, 0xcd: 0x09, 0xce: 0x0a, 0xcf: 0x0b,
+	0xd0: 0x0c, 0xd1: 0x0d,
+	0xe1: 0x02, 0xe2: 0x03, 0xe3: 0x04, 0xe4: 0x05, 0xe5: 0x06, 0xe6: 0x06, 0xe7: 0x06,
+	0xe8: 0x06, 0xe9: 0x06, 0xea: 0x07, 0xeb: 0x06, 0xec: 0x06, 0xed: 0x08, 0xee: 0x09, 0xef: 0x0a,
+	0xf0: 0x0f, 0xf3: 0x12, 0xf4: 0x13,
+	// Block 0x4, offset 0x100
+	0x104: 0x0e, 0x105: 0x0f,
+	// Block 0x5, offset 0x140
+	0x140: 0x10, 0x141: 0x11, 0x142: 0x12, 0x144: 0x13, 0x145: 0x14, 0x146: 0x15, 0x147: 0x16,
+	0x148: 0x17, 0x149: 0x18, 0x14a: 0x19, 0x14c: 0x1a, 0x14f: 0x1b,
+	0x151: 0x1c, 0x152: 0x08, 0x153: 0x1d, 0x154: 0x1e, 0x155: 0x1f, 0x156: 0x20, 0x157: 0x21,
+	0x158: 0x22, 0x159: 0x23, 0x15a: 0x24, 0x15b: 0x25, 0x15c: 0x26, 0x15d: 0x27, 0x15e: 0x28, 0x15f: 0x29,
+	0x166: 0x2a,
+	0x16c: 0x2b, 0x16d: 0x2c,
+	0x17a: 0x2d, 0x17b: 0x2e, 0x17c: 0x0e, 0x17d: 0x0e, 0x17e: 0x0e, 0x17f: 0x2f,
+	// Block 0x6, offset 0x180
+	0x180: 0x30, 0x181: 0x31, 0x182: 0x32, 0x183: 0x33, 0x184: 0x34, 0x185: 0x35, 0x186: 0x36, 0x187: 0x37,
+	0x188: 0x38, 0x189: 0x39, 0x18a: 0x0e, 0x18b: 0x3a, 0x18c: 0x0e, 0x18d: 0x0e, 0x18e: 0x0e, 0x18f: 0x0e,
+	0x190: 0x0e, 0x191: 0x0e, 0x192: 0x0e, 0x193: 0x0e, 0x194: 0x0e, 0x195: 0x0e, 0x196: 0x0e, 0x197: 0x0e,
+	0x198: 0x0e, 0x199: 0x0e, 0x19a: 0x0e, 0x19b: 0x0e, 0x19c: 0x0e, 0x19d: 0x0e, 0x19e: 0x0e, 0x19f: 0x0e,
+	0x1a0: 0x0e, 0x1a1: 0x0e, 0x1a2: 0x0e, 0x1a3: 0x0e, 0x1a4: 0x0e, 0x1a5: 0x0e, 0x1a6: 0x0e, 0x1a7: 0x0e,
+	0x1a8: 0x0e, 0x1a9: 0x0e, 0x1aa: 0x0e, 0x1ab: 0x0e, 0x1ac: 0x0e, 0x1ad: 0x0e, 0x1ae: 0x0e, 0x1af: 0x0e,
+	0x1b0: 0x0e, 0x1b1: 0x0e, 0x1b2: 0x0e, 0x1b3: 0x0e, 0x1b4: 0x0e, 0x1b5: 0x0e, 0x1b6: 0x0e, 0x1b7: 0x0e,
+	0x1b8: 0x0e, 0x1b9: 0x0e, 0x1ba: 0x0e, 0x1bb: 0x0e, 0x1bc: 0x0e, 0x1bd: 0x0e, 0x1be: 0x0e, 0x1bf: 0x0e,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x0e, 0x1c1: 0x0e, 0x1c2: 0x0e, 0x1c3: 0x0e, 0x1c4: 0x0e, 0x1c5: 0x0e, 0x1c6: 0x0e, 0x1c7: 0x0e,
+	0x1c8: 0x0e, 0x1c9: 0x0e, 0x1ca: 0x0e, 0x1cb: 0x0e, 0x1cc: 0x0e, 0x1cd: 0x0e, 0x1ce: 0x0e, 0x1cf: 0x0e,
+	0x1d0: 0x0e, 0x1d1: 0x0e, 0x1d2: 0x0e, 0x1d3: 0x0e, 0x1d4: 0x0e, 0x1d5: 0x0e, 0x1d6: 0x0e, 0x1d7: 0x0e,
+	0x1d8: 0x0e, 0x1d9: 0x0e, 0x1da: 0x0e, 0x1db: 0x0e, 0x1dc: 0x0e, 0x1dd: 0x0e, 0x1de: 0x0e, 0x1df: 0x0e,
+	0x1e0: 0x0e, 0x1e1: 0x0e, 0x1e2: 0x0e, 0x1e3: 0x0e, 0x1e4: 0x0e, 0x1e5: 0x0e, 0x1e6: 0x0e, 0x1e7: 0x0e,
+	0x1e8: 0x0e, 0x1e9: 0x0e, 0x1ea: 0x0e, 0x1eb: 0x0e, 0x1ec: 0x0e, 0x1ed: 0x0e, 0x1ee: 0x0e, 0x1ef: 0x0e,
+	0x1f0: 0x0e, 0x1f1: 0x0e, 0x1f2: 0x0e, 0x1f3: 0x0e, 0x1f4: 0x0e, 0x1f5: 0x0e, 0x1f6: 0x0e,
+	0x1f8: 0x0e, 0x1f9: 0x0e, 0x1fa: 0x0e, 0x1fb: 0x0e, 0x1fc: 0x0e, 0x1fd: 0x0e, 0x1fe: 0x0e, 0x1ff: 0x0e,
+	// Block 0x8, offset 0x200
+	0x200: 0x0e, 0x201: 0x0e, 0x202: 0x0e, 0x203: 0x0e, 0x204: 0x0e, 0x205: 0x0e, 0x206: 0x0e, 0x207: 0x0e,
+	0x208: 0x0e, 0x209: 0x0e, 0x20a: 0x0e, 0x20b: 0x0e, 0x20c: 0x0e, 0x20d: 0x0e, 0x20e: 0x0e, 0x20f: 0x0e,
+	0x210: 0x0e, 0x211: 0x0e, 0x212: 0x0e, 0x213: 0x0e, 0x214: 0x0e, 0x215: 0x0e, 0x216: 0x0e, 0x217: 0x0e,
+	0x218: 0x0e, 0x219: 0x0e, 0x21a: 0x0e, 0x21b: 0x0e, 0x21c: 0x0e, 0x21d: 0x0e, 0x21e: 0x0e, 0x21f: 0x0e,
+	0x220: 0x0e, 0x221: 0x0e, 0x222: 0x0e, 0x223: 0x0e, 0x224: 0x0e, 0x225: 0x0e, 0x226: 0x0e, 0x227: 0x0e,
+	0x228: 0x0e, 0x229: 0x0e, 0x22a: 0x0e, 0x22b: 0x0e, 0x22c: 0x0e, 0x22d: 0x0e, 0x22e: 0x0e, 0x22f: 0x0e,
+	0x230: 0x0e, 0x231: 0x0e, 0x232: 0x0e, 0x233: 0x0e, 0x234: 0x0e, 0x235: 0x0e, 0x236: 0x0e, 0x237: 0x0e,
+	0x238: 0x0e, 0x239: 0x0e, 0x23a: 0x0e, 0x23b: 0x0e, 0x23c: 0x0e, 0x23d: 0x0e, 0x23e: 0x0e, 0x23f: 0x0e,
+	// Block 0x9, offset 0x240
+	0x240: 0x0e, 0x241: 0x0e, 0x242: 0x0e, 0x243: 0x0e, 0x244: 0x0e, 0x245: 0x0e, 0x246: 0x0e, 0x247: 0x0e,
+	0x248: 0x0e, 0x249: 0x0e, 0x24a: 0x0e, 0x24b: 0x0e, 0x24c: 0x0e, 0x24d: 0x0e, 0x24e: 0x0e, 0x24f: 0x0e,
+	0x250: 0x0e, 0x251: 0x0e, 0x252: 0x3b, 0x253: 0x3c,
+	0x265: 0x3d,
+	0x270: 0x0e, 0x271: 0x0e, 0x272: 0x0e, 0x273: 0x0e, 0x274: 0x0e, 0x275: 0x0e, 0x276: 0x0e, 0x277: 0x0e,
+	0x278: 0x0e, 0x279: 0x0e, 0x27a: 0x0e, 0x27b: 0x0e, 0x27c: 0x0e, 0x27d: 0x0e, 0x27e: 0x0e, 0x27f: 0x0e,
+	// Block 0xa, offset 0x280
+	0x280: 0x0e, 0x281: 0x0e, 0x282: 0x0e, 0x283: 0x0e, 0x284: 0x0e, 0x285: 0x0e, 0x286: 0x0e, 0x287: 0x0e,
+	0x288: 0x0e, 0x289: 0x0e, 0x28a: 0x0e, 0x28b: 0x0e, 0x28c: 0x0e, 0x28d: 0x0e, 0x28e: 0x0e, 0x28f: 0x0e,
+	0x290: 0x0e, 0x291: 0x0e, 0x292: 0x0e, 0x293: 0x0e, 0x294: 0x0e, 0x295: 0x0e, 0x296: 0x0e, 0x297: 0x0e,
+	0x298: 0x0e, 0x299: 0x0e, 0x29a: 0x0e, 0x29b: 0x0e, 0x29c: 0x0e, 0x29d: 0x0e, 0x29e: 0x3e,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x08, 0x2c1: 0x08, 0x2c2: 0x08, 0x2c3: 0x08, 0x2c4: 0x08, 0x2c5: 0x08, 0x2c6: 0x08, 0x2c7: 0x08,
+	0x2c8: 0x08, 0x2c9: 0x08, 0x2ca: 0x08, 0x2cb: 0x08, 0x2cc: 0x08, 0x2cd: 0x08, 0x2ce: 0x08, 0x2cf: 0x08,
+	0x2d0: 0x08, 0x2d1: 0x08, 0x2d2: 0x08, 0x2d3: 0x08, 0x2d4: 0x08, 0x2d5: 0x08, 0x2d6: 0x08, 0x2d7: 0x08,
+	0x2d8: 0x08, 0x2d9: 0x08, 0x2da: 0x08, 0x2db: 0x08, 0x2dc: 0x08, 0x2dd: 0x08, 0x2de: 0x08, 0x2df: 0x08,
+	0x2e0: 0x08, 0x2e1: 0x08, 0x2e2: 0x08, 0x2e3: 0x08, 0x2e4: 0x08, 0x2e5: 0x08, 0x2e6: 0x08, 0x2e7: 0x08,
+	0x2e8: 0x08, 0x2e9: 0x08, 0x2ea: 0x08, 0x2eb: 0x08, 0x2ec: 0x08, 0x2ed: 0x08, 0x2ee: 0x08, 0x2ef: 0x08,
+	0x2f0: 0x08, 0x2f1: 0x08, 0x2f2: 0x08, 0x2f3: 0x08, 0x2f4: 0x08, 0x2f5: 0x08, 0x2f6: 0x08, 0x2f7: 0x08,
+	0x2f8: 0x08, 0x2f9: 0x08, 0x2fa: 0x08, 0x2fb: 0x08, 0x2fc: 0x08, 0x2fd: 0x08, 0x2fe: 0x08, 0x2ff: 0x08,
+	// Block 0xc, offset 0x300
+	0x300: 0x08, 0x301: 0x08, 0x302: 0x08, 0x303: 0x08, 0x304: 0x08, 0x305: 0x08, 0x306: 0x08, 0x307: 0x08,
+	0x308: 0x08, 0x309: 0x08, 0x30a: 0x08, 0x30b: 0x08, 0x30c: 0x08, 0x30d: 0x08, 0x30e: 0x08, 0x30f: 0x08,
+	0x310: 0x08, 0x311: 0x08, 0x312: 0x08, 0x313: 0x08, 0x314: 0x08, 0x315: 0x08, 0x316: 0x08, 0x317: 0x08,
+	0x318: 0x08, 0x319: 0x08, 0x31a: 0x08, 0x31b: 0x08, 0x31c: 0x08, 0x31d: 0x08, 0x31e: 0x08, 0x31f: 0x08,
+	0x320: 0x08, 0x321: 0x08, 0x322: 0x08, 0x323: 0x08, 0x324: 0x0e, 0x325: 0x0e, 0x326: 0x0e, 0x327: 0x0e,
+	0x328: 0x0e, 0x329: 0x0e, 0x32a: 0x0e, 0x32b: 0x0e,
+	0x338: 0x3f, 0x339: 0x40, 0x33c: 0x41, 0x33d: 0x42, 0x33e: 0x43, 0x33f: 0x44,
+	// Block 0xd, offset 0x340
+	0x37f: 0x45,
+	// Block 0xe, offset 0x380
+	0x380: 0x0e, 0x381: 0x0e, 0x382: 0x0e, 0x383: 0x0e, 0x384: 0x0e, 0x385: 0x0e, 0x386: 0x0e, 0x387: 0x0e,
+	0x388: 0x0e, 0x389: 0x0e, 0x38a: 0x0e, 0x38b: 0x0e, 0x38c: 0x0e, 0x38d: 0x0e, 0x38e: 0x0e, 0x38f: 0x0e,
+	0x390: 0x0e, 0x391: 0x0e, 0x392: 0x0e, 0x393: 0x0e, 0x394: 0x0e, 0x395: 0x0e, 0x396: 0x0e, 0x397: 0x0e,
+	0x398: 0x0e, 0x399: 0x0e, 0x39a: 0x0e, 0x39b: 0x0e, 0x39c: 0x0e, 0x39d: 0x0e, 0x39e: 0x0e, 0x39f: 0x46,
+	0x3a0: 0x0e, 0x3a1: 0x0e, 0x3a2: 0x0e, 0x3a3: 0x0e, 0x3a4: 0x0e, 0x3a5: 0x0e, 0x3a6: 0x0e, 0x3a7: 0x0e,
+	0x3a8: 0x0e, 0x3a9: 0x0e, 0x3aa: 0x0e, 0x3ab: 0x47,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x48,
+	// Block 0x10, offset 0x400
+	0x400: 0x49, 0x403: 0x4a, 0x404: 0x4b, 0x405: 0x4c, 0x406: 0x4d,
+	0x408: 0x4e, 0x409: 0x4f, 0x40c: 0x50, 0x40d: 0x51, 0x40e: 0x52, 0x40f: 0x53,
+	0x410: 0x3a, 0x411: 0x54, 0x412: 0x0e, 0x413: 0x55, 0x414: 0x56, 0x415: 0x57, 0x416: 0x58, 0x417: 0x59,
+	0x418: 0x0e, 0x419: 0x5a, 0x41a: 0x0e, 0x41b: 0x5b,
+	0x424: 0x5c, 0x425: 0x5d, 0x426: 0x5e, 0x427: 0x5f,
+	// Block 0x11, offset 0x440
+	0x456: 0x0b, 0x457: 0x06,
+	0x458: 0x0c, 0x45b: 0x0d, 0x45f: 0x0e,
+	0x460: 0x06, 0x461: 0x06, 0x462: 0x06, 0x463: 0x06, 0x464: 0x06, 0x465: 0x06, 0x466: 0x06, 0x467: 0x06,
+	0x468: 0x06, 0x469: 0x06, 0x46a: 0x06, 0x46b: 0x06, 0x46c: 0x06, 0x46d: 0x06, 0x46e: 0x06, 0x46f: 0x06,
+	0x470: 0x06, 0x471: 0x06, 0x472: 0x06, 0x473: 0x06, 0x474: 0x06, 0x475: 0x06, 0x476: 0x06, 0x477: 0x06,
+	0x478: 0x06, 0x479: 0x06, 0x47a: 0x06, 0x47b: 0x06, 0x47c: 0x06, 0x47d: 0x06, 0x47e: 0x06, 0x47f: 0x06,
+	// Block 0x12, offset 0x480
+	0x484: 0x08, 0x485: 0x08, 0x486: 0x08, 0x487: 0x09,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x08, 0x4c1: 0x08, 0x4c2: 0x08, 0x4c3: 0x08, 0x4c4: 0x08, 0x4c5: 0x08, 0x4c6: 0x08, 0x4c7: 0x08,
+	0x4c8: 0x08, 0x4c9: 0x08, 0x4ca: 0x08, 0x4cb: 0x08, 0x4cc: 0x08, 0x4cd: 0x08, 0x4ce: 0x08, 0x4cf: 0x08,
+	0x4d0: 0x08, 0x4d1: 0x08, 0x4d2: 0x08, 0x4d3: 0x08, 0x4d4: 0x08, 0x4d5: 0x08, 0x4d6: 0x08, 0x4d7: 0x08,
+	0x4d8: 0x08, 0x4d9: 0x08, 0x4da: 0x08, 0x4db: 0x08, 0x4dc: 0x08, 0x4dd: 0x08, 0x4de: 0x08, 0x4df: 0x08,
+	0x4e0: 0x08, 0x4e1: 0x08, 0x4e2: 0x08, 0x4e3: 0x08, 0x4e4: 0x08, 0x4e5: 0x08, 0x4e6: 0x08, 0x4e7: 0x08,
+	0x4e8: 0x08, 0x4e9: 0x08, 0x4ea: 0x08, 0x4eb: 0x08, 0x4ec: 0x08, 0x4ed: 0x08, 0x4ee: 0x08, 0x4ef: 0x08,
+	0x4f0: 0x08, 0x4f1: 0x08, 0x4f2: 0x08, 0x4f3: 0x08, 0x4f4: 0x08, 0x4f5: 0x08, 0x4f6: 0x08, 0x4f7: 0x08,
+	0x4f8: 0x08, 0x4f9: 0x08, 0x4fa: 0x08, 0x4fb: 0x08, 0x4fc: 0x08, 0x4fd: 0x08, 0x4fe: 0x08, 0x4ff: 0x60,
+	// Block 0x14, offset 0x500
+	0x520: 0x10,
+	0x530: 0x09, 0x531: 0x09, 0x532: 0x09, 0x533: 0x09, 0x534: 0x09, 0x535: 0x09, 0x536: 0x09, 0x537: 0x09,
+	0x538: 0x09, 0x539: 0x09, 0x53a: 0x09, 0x53b: 0x09, 0x53c: 0x09, 0x53d: 0x09, 0x53e: 0x09, 0x53f: 0x11,
+	// Block 0x15, offset 0x540
+	0x540: 0x09, 0x541: 0x09, 0x542: 0x09, 0x543: 0x09, 0x544: 0x09, 0x545: 0x09, 0x546: 0x09, 0x547: 0x09,
+	0x548: 0x09, 0x549: 0x09, 0x54a: 0x09, 0x54b: 0x09, 0x54c: 0x09, 0x54d: 0x09, 0x54e: 0x09, 0x54f: 0x11,
+}
+
+// inverseData contains 4-byte entries of the following format:
+//   <length> <modified UTF-8-encoded rune> <0 padding>
+// The last byte of the UTF-8-encoded rune is xor-ed with the last byte of the
+// UTF-8 encoding of the original rune. Mappings often have the following
+// pattern:
+//   Ａ -> A  (U+FF21 -> U+0041)
+//   Ｂ -> B  (U+FF22 -> U+0042)
+//   ...
+// By xor-ing the last byte the same entry can be shared by many mappings. This
+// reduces the total number of distinct entries by about two thirds.
+// The resulting entry for the aforementioned mappings is
+//   { 0x01, 0xE0, 0x00, 0x00 }
+// Using this entry to map U+FF21 (UTF-8 [EF BC A1]), we get
+//   E0 ^ A1 = 41.
+// Similarly, for U+FF22 (UTF-8 [EF BC A2]), we get
+//   E0 ^ A2 = 42.
+// Note that because of the xor-ing, the byte sequence stored in the entry is
+// not valid UTF-8.
+var inverseData = [150][4]byte{
+	{0x00, 0x00, 0x00, 0x00},
+	{0x03, 0xe3, 0x80, 0xa0},
+	{0x03, 0xef, 0xbc, 0xa0},
+	{0x03, 0xef, 0xbc, 0xe0},
+	{0x03, 0xef, 0xbd, 0xe0},
+	{0x03, 0xef, 0xbf, 0x02},
+	{0x03, 0xef, 0xbf, 0x00},
+	{0x03, 0xef, 0xbf, 0x0e},
+	{0x03, 0xef, 0xbf, 0x0c},
+	{0x03, 0xef, 0xbf, 0x0f},
+	{0x03, 0xef, 0xbf, 0x39},
+	{0x03, 0xef, 0xbf, 0x3b},
+	{0x03, 0xef, 0xbf, 0x3f},
+	{0x03, 0xef, 0xbf, 0x2a},
+	{0x03, 0xef, 0xbf, 0x0d},
+	{0x03, 0xef, 0xbf, 0x25},
+	{0x03, 0xef, 0xbd, 0x1a},
+	{0x03, 0xef, 0xbd, 0x26},
+	{0x01, 0xa0, 0x00, 0x00},
+	{0x03, 0xef, 0xbd, 0x25},
+	{0x03, 0xef, 0xbd, 0x23},
+	{0x03, 0xef, 0xbd, 0x2e},
+	{0x03, 0xef, 0xbe, 0x07},
+	{0x03, 0xef, 0xbe, 0x05},
+	{0x03, 0xef, 0xbd, 0x06},
+	{0x03, 0xef, 0xbd, 0x13},
+	{0x03, 0xef, 0xbd, 0x0b},
+	{0x03, 0xef, 0xbd, 0x16},
+	{0x03, 0xef, 0xbd, 0x0c},
+	{0x03, 0xef, 0xbd, 0x15},
+	{0x03, 0xef, 0xbd, 0x0d},
+	{0x03, 0xef, 0xbd, 0x1c},
+	{0x03, 0xef, 0xbd, 0x02},
+	{0x03, 0xef, 0xbd, 0x1f},
+	{0x03, 0xef, 0xbd, 0x1d},
+	{0x03, 0xef, 0xbd, 0x17},
+	{0x03, 0xef, 0xbd, 0x08},
+	{0x03, 0xef, 0xbd, 0x09},
+	{0x03, 0xef, 0xbd, 0x0e},
+	{0x03, 0xef, 0xbd, 0x04},
+	{0x03, 0xef, 0xbd, 0x05},
+	{0x03, 0xef, 0xbe, 0x3f},
+	{0x03, 0xef, 0xbe, 0x00},
+	{0x03, 0xef, 0xbd, 0x2c},
+	{0x03, 0xef, 0xbe, 0x06},
+	{0x03, 0xef, 0xbe, 0x0c},
+	{0x03, 0xef, 0xbe, 0x0f},
+	{0x03, 0xef, 0xbe, 0x0d},
+	{0x03, 0xef, 0xbe, 0x0b},
+	{0x03, 0xef, 0xbe, 0x19},
+	{0x03, 0xef, 0xbe, 0x15},
+	{0x03, 0xef, 0xbe, 0x11},
+	{0x03, 0xef, 0xbe, 0x31},
+	{0x03, 0xef, 0xbe, 0x33},
+	{0x03, 0xef, 0xbd, 0x0f},
+	{0x03, 0xef, 0xbe, 0x30},
+	{0x03, 0xef, 0xbe, 0x3e},
+	{0x03, 0xef, 0xbe, 0x32},
+	{0x03, 0xef, 0xbe, 0x36},
+	{0x03, 0xef, 0xbd, 0x14},
+	{0x03, 0xef, 0xbe, 0x2e},
+	{0x03, 0xef, 0xbd, 0x1e},
+	{0x03, 0xef, 0xbe, 0x10},
+	{0x03, 0xef, 0xbf, 0x13},
+	{0x03, 0xef, 0xbf, 0x15},
+	{0x03, 0xef, 0xbf, 0x17},
+	{0x03, 0xef, 0xbf, 0x1f},
+	{0x03, 0xef, 0xbf, 0x1d},
+	{0x03, 0xef, 0xbf, 0x1b},
+	{0x03, 0xef, 0xbf, 0x09},
+	{0x03, 0xef, 0xbf, 0x0b},
+	{0x03, 0xef, 0xbf, 0x37},
+	{0x03, 0xef, 0xbe, 0x04},
+	{0x01, 0xe0, 0x00, 0x00},
+	{0x03, 0xe2, 0xa6, 0x1a},
+	{0x03, 0xe2, 0xa6, 0x26},
+	{0x03, 0xe3, 0x80, 0x23},
+	{0x03, 0xe3, 0x80, 0x2e},
+	{0x03, 0xe3, 0x80, 0x25},
+	{0x03, 0xe3, 0x83, 0x1e},
+	{0x03, 0xe3, 0x83, 0x14},
+	{0x03, 0xe3, 0x82, 0x06},
+	{0x03, 0xe3, 0x82, 0x0b},
+	{0x03, 0xe3, 0x82, 0x0c},
+	{0x03, 0xe3, 0x82, 0x0d},
+	{0x03, 0xe3, 0x82, 0x02},
+	{0x03, 0xe3, 0x83, 0x0f},
+	{0x03, 0xe3, 0x83, 0x08},
+	{0x03, 0xe3, 0x83, 0x09},
+	{0x03, 0xe3, 0x83, 0x2c},
+	{0x03, 0xe3, 0x83, 0x0c},
+	{0x03, 0xe3, 0x82, 0x13},
+	{0x03, 0xe3, 0x82, 0x16},
+	{0x03, 0xe3, 0x82, 0x15},
+	{0x03, 0xe3, 0x82, 0x1c},
+	{0x03, 0xe3, 0x82, 0x1f},
+	{0x03, 0xe3, 0x82, 0x1d},
+	{0x03, 0xe3, 0x82, 0x1a},
+	{0x03, 0xe3, 0x82, 0x17},
+	{0x03, 0xe3, 0x82, 0x08},
+	{0x03, 0xe3, 0x82, 0x09},
+	{0x03, 0xe3, 0x82, 0x0e},
+	{0x03, 0xe3, 0x82, 0x04},
+	{0x03, 0xe3, 0x82, 0x05},
+	{0x03, 0xe3, 0x82, 0x3f},
+	{0x03, 0xe3, 0x83, 0x00},
+	{0x03, 0xe3, 0x83, 0x06},
+	{0x03, 0xe3, 0x83, 0x05},
+	{0x03, 0xe3, 0x83, 0x0d},
+	{0x03, 0xe3, 0x83, 0x0b},
+	{0x03, 0xe3, 0x83, 0x07},
+	{0x03, 0xe3, 0x83, 0x19},
+	{0x03, 0xe3, 0x83, 0x15},
+	{0x03, 0xe3, 0x83, 0x11},
+	{0x03, 0xe3, 0x83, 0x31},
+	{0x03, 0xe3, 0x83, 0x33},
+	{0x03, 0xe3, 0x83, 0x30},
+	{0x03, 0xe3, 0x83, 0x3e},
+	{0x03, 0xe3, 0x83, 0x32},
+	{0x03, 0xe3, 0x83, 0x36},
+	{0x03, 0xe3, 0x83, 0x2e},
+	{0x03, 0xe3, 0x82, 0x07},
+	{0x03, 0xe3, 0x85, 0x04},
+	{0x03, 0xe3, 0x84, 0x10},
+	{0x03, 0xe3, 0x85, 0x30},
+	{0x03, 0xe3, 0x85, 0x0d},
+	{0x03, 0xe3, 0x85, 0x13},
+	{0x03, 0xe3, 0x85, 0x15},
+	{0x03, 0xe3, 0x85, 0x17},
+	{0x03, 0xe3, 0x85, 0x1f},
+	{0x03, 0xe3, 0x85, 0x1d},
+	{0x03, 0xe3, 0x85, 0x1b},
+	{0x03, 0xe3, 0x85, 0x09},
+	{0x03, 0xe3, 0x85, 0x0f},
+	{0x03, 0xe3, 0x85, 0x0b},
+	{0x03, 0xe3, 0x85, 0x37},
+	{0x03, 0xe3, 0x85, 0x3b},
+	{0x03, 0xe3, 0x85, 0x39},
+	{0x03, 0xe3, 0x85, 0x3f},
+	{0x02, 0xc2, 0x02, 0x00},
+	{0x02, 0xc2, 0x0e, 0x00},
+	{0x02, 0xc2, 0x0c, 0x00},
+	{0x02, 0xc2, 0x00, 0x00},
+	{0x03, 0xe2, 0x82, 0x0f},
+	{0x03, 0xe2, 0x94, 0x2a},
+	{0x03, 0xe2, 0x86, 0x39},
+	{0x03, 0xe2, 0x86, 0x3b},
+	{0x03, 0xe2, 0x86, 0x3f},
+	{0x03, 0xe2, 0x96, 0x0d},
+	{0x03, 0xe2, 0x97, 0x25},
+}
+
+// Total table size 14680 bytes (14KiB)
diff --git a/vendor/golang.org/x/text/width/transform.go b/vendor/golang.org/x/text/width/transform.go
new file mode 100644
index 0000000000..2ed25096ac
--- /dev/null
+++ b/vendor/golang.org/x/text/width/transform.go
@@ -0,0 +1,162 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package width
+
+import (
+	"unicode/utf8"
+
+	"golang.org/x/text/transform"
+)
+
+type foldTransform struct {
+	transform.NopResetter
+}
+
+func (foldTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	for nSrc < len(src) {
+		if src[nSrc] < utf8.RuneSelf {
+			// ASCII fast path.
+			start, end := nSrc, len(src)
+			if d := len(dst) - nDst; d < end-start {
+				end = nSrc + d
+			}
+			for nSrc++; nSrc < end && src[nSrc] < utf8.RuneSelf; nSrc++ {
+			}
+			n := copy(dst[nDst:], src[start:nSrc])
+			if nDst += n; nDst == len(dst) {
+				nSrc = start + n
+				if nSrc == len(src) {
+					return nDst, nSrc, nil
+				}
+				if src[nSrc] < utf8.RuneSelf {
+					return nDst, nSrc, transform.ErrShortDst
+				}
+			}
+			continue
+		}
+		v, size := trie.lookup(src[nSrc:])
+		if size == 0 { // incomplete UTF-8 encoding
+			if !atEOF {
+				return nDst, nSrc, transform.ErrShortSrc
+			}
+			size = 1 // gobble 1 byte
+		}
+		if elem(v)&tagNeedsFold == 0 {
+			if size != copy(dst[nDst:], src[nSrc:nSrc+size]) {
+				return nDst, nSrc, transform.ErrShortDst
+			}
+			nDst += size
+		} else {
+			data := inverseData[byte(v)]
+			if len(dst)-nDst < int(data[0]) {
+				return nDst, nSrc, transform.ErrShortDst
+			}
+			i := 1
+			for end := int(data[0]); i < end; i++ {
+				dst[nDst] = data[i]
+				nDst++
+			}
+			dst[nDst] = data[i] ^ src[nSrc+size-1]
+			nDst++
+		}
+		nSrc += size
+	}
+	return nDst, nSrc, nil
+}
+
+type narrowTransform struct {
+	transform.NopResetter
+}
+
+func (narrowTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	for nSrc < len(src) {
+		if src[nSrc] < utf8.RuneSelf {
+			// ASCII fast path.
+			start, end := nSrc, len(src)
+			if d := len(dst) - nDst; d < end-start {
+				end = nSrc + d
+			}
+			for nSrc++; nSrc < end && src[nSrc] < utf8.RuneSelf; nSrc++ {
+			}
+			n := copy(dst[nDst:], src[start:nSrc])
+			if nDst += n; nDst == len(dst) {
+				nSrc = start + n
+				if nSrc == len(src) {
+					return nDst, nSrc, nil
+				}
+				if src[nSrc] < utf8.RuneSelf {
+					return nDst, nSrc, transform.ErrShortDst
+				}
+			}
+			continue
+		}
+		v, size := trie.lookup(src[nSrc:])
+		if size == 0 { // incomplete UTF-8 encoding
+			if !atEOF {
+				return nDst, nSrc, transform.ErrShortSrc
+			}
+			size = 1 // gobble 1 byte
+		}
+		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianFullwidth && k != EastAsianWide && k != EastAsianAmbiguous {
+			if size != copy(dst[nDst:], src[nSrc:nSrc+size]) {
+				return nDst, nSrc, transform.ErrShortDst
+			}
+			nDst += size
+		} else {
+			data := inverseData[byte(v)]
+			if len(dst)-nDst < int(data[0]) {
+				return nDst, nSrc, transform.ErrShortDst
+			}
+			i := 1
+			for end := int(data[0]); i < end; i++ {
+				dst[nDst] = data[i]
+				nDst++
+			}
+			dst[nDst] = data[i] ^ src[nSrc+size-1]
+			nDst++
+		}
+		nSrc += size
+	}
+	return nDst, nSrc, nil
+}
+
+type wideTransform struct {
+	transform.NopResetter
+}
+
+func (wideTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	for nSrc < len(src) {
+		// TODO: Consider ASCII fast path. Special-casing ASCII handling can
+		// reduce the ns/op of BenchmarkWideASCII by about 30%. This is probably
+		// not enough to warrant the extra code and complexity.
+		v, size := trie.lookup(src[nSrc:])
+		if size == 0 { // incomplete UTF-8 encoding
+			if !atEOF {
+				return nDst, nSrc, transform.ErrShortSrc
+			}
+			size = 1 // gobble 1 byte
+		}
+		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianHalfwidth && k != EastAsianNarrow {
+			if size != copy(dst[nDst:], src[nSrc:nSrc+size]) {
+				return nDst, nSrc, transform.ErrShortDst
+			}
+			nDst += size
+		} else {
+			data := inverseData[byte(v)]
+			if len(dst)-nDst < int(data[0]) {
+				return nDst, nSrc, transform.ErrShortDst
+			}
+			i := 1
+			for end := int(data[0]); i < end; i++ {
+				dst[nDst] = data[i]
+				nDst++
+			}
+			dst[nDst] = data[i] ^ src[nSrc+size-1]
+			nDst++
+		}
+		nSrc += size
+	}
+	return nDst, nSrc, nil
+}
diff --git a/vendor/golang.org/x/text/width/trieval.go b/vendor/golang.org/x/text/width/trieval.go
new file mode 100644
index 0000000000..0ecffb4c64
--- /dev/null
+++ b/vendor/golang.org/x/text/width/trieval.go
@@ -0,0 +1,30 @@
+// This file was generated by go generate; DO NOT EDIT
+
+package width
+
+// elem is an entry of the width trie. The high byte is used to encode the type
+// of the rune. The low byte is used to store the index to a mapping entry in
+// the inverseData array.
+type elem uint16
+
+const (
+	tagNeutral elem = iota << typeShift
+	tagAmbiguous
+	tagWide
+	tagNarrow
+	tagFullwidth
+	tagHalfwidth
+)
+
+const (
+	numTypeBits = 3
+	typeShift   = 16 - numTypeBits
+
+	// tagNeedsFold is true for all fullwidth and halfwidth runes except for
+	// the Won sign U+20A9.
+	tagNeedsFold = 0x1000
+
+	// The Korean Won sign is halfwidth, but SHOULD NOT be mapped to a wide
+	// variant.
+	wonSign rune = 0x20A9
+)
diff --git a/vendor/golang.org/x/text/width/width.go b/vendor/golang.org/x/text/width/width.go
new file mode 100644
index 0000000000..dc026eef6b
--- /dev/null
+++ b/vendor/golang.org/x/text/width/width.go
@@ -0,0 +1,201 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:generate stringer -type=Kind
+//go:generate go run gen.go gen_common.go gen_trieval.go
+
+// Package width provides functionality for handling different widths in text.
+//
+// Wide characters behave like ideographs; they tend to allow line breaks after
+// each character and remain upright in vertical text layout. Narrow characters
+// are kept together in words or runs that are rotated sideways in vertical text
+// layout.
+//
+// For more information, see http://unicode.org/reports/tr11/.
+package width // import "golang.org/x/text/width"
+
+import (
+	"unicode/utf8"
+
+	"golang.org/x/text/transform"
+)
+
+// TODO
+// 1) Reduce table size by compressing blocks.
+// 2) API proposition for computing display length
+//    (approximation, fixed pitch only).
+// 3) Implement display length.
+
+// Kind indicates the type of width property as defined in http://unicode.org/reports/tr11/.
+type Kind int
+
+const (
+	// Neutral characters do not occur in legacy East Asian character sets.
+	Neutral Kind = iota
+
+	// EastAsianAmbiguous characters that can be sometimes wide and sometimes
+	// narrow and require additional information not contained in the character
+	// code to further resolve their width.
+	EastAsianAmbiguous
+
+	// EastAsianWide characters are wide in its usual form. They occur only in
+	// the context of East Asian typography. These runes may have explicit
+	// halfwidth counterparts.
+	EastAsianWide
+
+	// EastAsianNarrow characters are narrow in its usual form. They often have
+	// fullwidth counterparts.
+	EastAsianNarrow
+
+	// Note: there exist Narrow runes that do not have fullwidth or wide
+	// counterparts, despite what the definition says (e.g. U+27E6).
+
+	// EastAsianFullwidth characters have a compatibility decompositions of type
+	// wide that map to a narrow counterpart.
+	EastAsianFullwidth
+
+	// EastAsianHalfwidth characters have a compatibility decomposition of type
+	// narrow that map to a wide or ambiguous counterpart, plus U+20A9 ₩ WON
+	// SIGN.
+	EastAsianHalfwidth
+
+	// Note: there exist runes that have a halfwidth counterparts but that are
+	// classified as Ambiguous, rather than wide (e.g. U+2190).
+)
+
+// TODO: the generated tries need to return size 1 for invalid runes for the
+// width to be computed correctly (each byte should render width 1)
+
+var trie = newWidthTrie(0)
+
+// Lookup reports the Properties of the first rune in b and the number of bytes
+// of its UTF-8 encoding.
+func Lookup(b []byte) (p Properties, size int) {
+	v, sz := trie.lookup(b)
+	return Properties{elem(v), b[sz-1]}, sz
+}
+
+// LookupString reports the Properties of the first rune in s and the number of
+// bytes of its UTF-8 encoding.
+func LookupString(s string) (p Properties, size int) {
+	v, sz := trie.lookupString(s)
+	return Properties{elem(v), s[sz-1]}, sz
+}
+
+// LookupRune reports the Properties of rune r.
+func LookupRune(r rune) Properties {
+	var buf [4]byte
+	n := utf8.EncodeRune(buf[:], r)
+	v, _ := trie.lookup(buf[:n])
+	last := byte(r)
+	if r >= utf8.RuneSelf {
+		last = 0x80 + byte(r&0x3f)
+	}
+	return Properties{elem(v), last}
+}
+
+// Properties provides access to width properties of a rune.
+type Properties struct {
+	elem elem
+	last byte
+}
+
+func (e elem) kind() Kind {
+	return Kind(e >> typeShift)
+}
+
+// Kind returns the Kind of a rune as defined in Unicode TR #11.
+// See http://unicode.org/reports/tr11/ for more details.
+func (p Properties) Kind() Kind {
+	return p.elem.kind()
+}
+
+// Folded returns the folded variant of a rune or 0 if the rune is canonical.
+func (p Properties) Folded() rune {
+	if p.elem&tagNeedsFold != 0 {
+		buf := inverseData[byte(p.elem)]
+		buf[buf[0]] ^= p.last
+		r, _ := utf8.DecodeRune(buf[1 : 1+buf[0]])
+		return r
+	}
+	return 0
+}
+
+// Narrow returns the narrow variant of a rune or 0 if the rune is already
+// narrow or doesn't have a narrow variant.
+func (p Properties) Narrow() rune {
+	if k := p.elem.kind(); byte(p.elem) != 0 && (k == EastAsianFullwidth || k == EastAsianWide || k == EastAsianAmbiguous) {
+		buf := inverseData[byte(p.elem)]
+		buf[buf[0]] ^= p.last
+		r, _ := utf8.DecodeRune(buf[1 : 1+buf[0]])
+		return r
+	}
+	return 0
+}
+
+// Wide returns the wide variant of a rune or 0 if the rune is already
+// wide or doesn't have a wide variant.
+func (p Properties) Wide() rune {
+	if k := p.elem.kind(); byte(p.elem) != 0 && (k == EastAsianHalfwidth || k == EastAsianNarrow) {
+		buf := inverseData[byte(p.elem)]
+		buf[buf[0]] ^= p.last
+		r, _ := utf8.DecodeRune(buf[1 : 1+buf[0]])
+		return r
+	}
+	return 0
+}
+
+// TODO for Properties:
+// - Add Fullwidth/Halfwidth or Inverted methods for computing variants
+// mapping.
+// - Add width information (including information on non-spacing runes).
+
+// Transformer implements the transform.Transformer interface.
+type Transformer struct {
+	t transform.Transformer
+}
+
+// Reset implements the transform.Transformer interface.
+func (t Transformer) Reset() { t.t.Reset() }
+
+// Transform implements the Transformer interface.
+func (t Transformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	return t.t.Transform(dst, src, atEOF)
+}
+
+// Bytes returns a new byte slice with the result of applying t to b.
+func (t Transformer) Bytes(b []byte) []byte {
+	b, _, _ = transform.Bytes(t, b)
+	return b
+}
+
+// String returns a string with the result of applying t to s.
+func (t Transformer) String(s string) string {
+	s, _, _ = transform.String(t, s)
+	return s
+}
+
+var (
+	// Fold is a transform that maps all runes to their canonical width.
+	//
+	// Note that the NFKC and NFKD transforms in golang.org/x/text/unicode/norm
+	// provide a more generic folding mechanism.
+	Fold Transformer = Transformer{foldTransform{}}
+
+	// Widen is a transform that maps runes to their wide variant, if
+	// available.
+	Widen Transformer = Transformer{wideTransform{}}
+
+	// Narrow is a transform that maps runes to their narrow variant, if
+	// available.
+	Narrow Transformer = Transformer{narrowTransform{}}
+)
+
+// TODO: Consider the following options:
+// - Treat Ambiguous runes that have a halfwidth counterpart as wide, or some
+//   generalized variant of this.
+// - Consider a wide Won character to be the default width (or some generalized
+//   variant of this).
+// - Filter the set of characters that gets converted (the preferred approach is
+//   to allow applying filters to transforms).

From 46cedbd9487afae2bfd4e2539175dc3c748c1f2e Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Tue, 20 Sep 2016 10:55:44 +0200
Subject: [PATCH 0893/1304] rkt: Implement distribution points.

This patch implements the distribution point concept with the three initial
kind of distributions already used by rkt (appc, aci-archive, docker).

It just makes the smallest required changes to the fetchers logic to make them
work and pass the functional tests.

This is the base for future fetchers (a future patch will refactor the
fetcher logic to better fit the distribution concept) and store refactors.
---
 common/apps/apps.go                 |  15 ---
 common/labelsort/labelsort.go       |  84 ++++++++++++
 common/labelsort/labelsort_test.go  |  93 ++++++++++++++
 pkg/distribution/aciarchive.go      | 130 +++++++++++++++++++
 pkg/distribution/aciarchive_test.go |  93 ++++++++++++++
 pkg/distribution/appc.go            | 154 ++++++++++++++++++++++
 pkg/distribution/appc_test.go       | 132 +++++++++++++++++++
 pkg/distribution/cimd.go            |  56 ++++++++
 pkg/distribution/distribution.go    |  79 ++++++++++++
 pkg/distribution/docker.go          | 167 ++++++++++++++++++++++++
 pkg/distribution/docker_test.go     | 110 ++++++++++++++++
 rkt/app_add.go                      |   3 +-
 rkt/fetch.go                        |  10 +-
 rkt/fetch_test.go                   |  35 ++++-
 rkt/image/common.go                 | 108 +++++++++++++---
 rkt/image/common_test.go            | 193 +++++++++++++++++++++++-----
 rkt/image/fetcher.go                | 177 ++++++++++++++-----------
 rkt/image/finder.go                 |  26 ++--
 rkt/stage1hash.go                   |  29 +----
 store/imagestore/store.go           |   4 +-
 store/imagestore/utils.go           |  22 ----
 store/imagestore/utils_test.go      |  40 ------
 tests/rkt_fetch_test.go             |   4 +-
 tests/rkt_stage1_loading_test.go    |   4 +-
 24 files changed, 1518 insertions(+), 250 deletions(-)
 create mode 100644 common/labelsort/labelsort.go
 create mode 100644 common/labelsort/labelsort_test.go
 create mode 100644 pkg/distribution/aciarchive.go
 create mode 100644 pkg/distribution/aciarchive_test.go
 create mode 100644 pkg/distribution/appc.go
 create mode 100644 pkg/distribution/appc_test.go
 create mode 100644 pkg/distribution/cimd.go
 create mode 100644 pkg/distribution/distribution.go
 create mode 100644 pkg/distribution/docker.go
 create mode 100644 pkg/distribution/docker_test.go
 delete mode 100644 store/imagestore/utils_test.go

diff --git a/common/apps/apps.go b/common/apps/apps.go
index fe6f42b945..a7b5fa3092 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -25,29 +25,14 @@ import (
 	"github.com/appc/spec/schema/types"
 )
 
-// AppImageType describes a type of an image reference. The reference
-// can either be guessed or be a hash, a URL, a path, or a name. The
-// first option means that the application will have to deduce the
-// actual type (one of the last four).
-type AppImageType int
-
 var (
 	ErrInvalidSeccompMode     = errors.New("invalid seccomp mode command-line override")
 	ErrInvalidSeccompOverride = errors.New("invalid seccomp command-line override")
 )
 
-const (
-	AppImageGuess AppImageType = iota // image type to be guessed
-	AppImageHash                      // image hash
-	AppImageURL                       // image URL with a scheme
-	AppImagePath                      // absolute or relative path
-	AppImageName                      // image name
-)
-
 type App struct {
 	Name              string                            // the name of the app. If not set, the the image's name will be used.
 	Image             string                            // the image reference as supplied by the user on the cli
-	ImType            AppImageType                      // the type of the image reference (to be guessed, url, path or hash)
 	Args              []string                          // any arguments the user supplied for this app
 	Asc               string                            // signature file override for image verification (if fetching occurs)
 	Exec              string                            // exec override for image
diff --git a/common/labelsort/labelsort.go b/common/labelsort/labelsort.go
new file mode 100644
index 0000000000..a954afa6a4
--- /dev/null
+++ b/common/labelsort/labelsort.go
@@ -0,0 +1,84 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// TODO(sur) contribute this to the appc spec
+
+package labelsort
+
+import (
+	"sort"
+
+	"github.com/appc/spec/schema/types"
+)
+
+var ranks = map[types.ACIdentifier]int{
+	"version": 0,
+	"os":      1,
+	"arch":    2,
+}
+
+// By is a functional type which compares two labels li, lj,
+// returning true if li < lj, else false.
+type By func(li, lj types.Label) bool
+
+// RankedName compares the label names of li, lj lexically
+// returning true if li.Name < lj.Name, else false.
+// The names "version", "os", and "arch" always have lower ranks in that order,
+// hence "version" < "os" < "arch" < [any other label name]
+func RankedName(li, lj types.Label) bool {
+	ri := rank(li.Name)
+	rj := rank(lj.Name)
+
+	if ri != rj {
+		return ri < rj
+	}
+
+	return li.Name < lj.Name
+}
+
+func rank(name types.ACIdentifier) int {
+	if i, ok := ranks[name]; ok {
+		return i
+	}
+
+	return len(ranks) + 1
+}
+
+var _ sort.Interface = (*byLabelSorter)(nil)
+
+type byLabelSorter struct {
+	labels types.Labels
+	by     By
+}
+
+func (by By) Sort(ls types.Labels) {
+	s := byLabelSorter{
+		labels: ls,
+		by:     by,
+	}
+
+	sort.Sort(&s)
+}
+
+func (s *byLabelSorter) Len() int {
+	return len(s.labels)
+}
+
+func (s *byLabelSorter) Less(i int, j int) bool {
+	return s.by(s.labels[i], s.labels[j])
+}
+
+func (s *byLabelSorter) Swap(i int, j int) {
+	s.labels[i], s.labels[j] = s.labels[j], s.labels[i]
+}
diff --git a/common/labelsort/labelsort_test.go b/common/labelsort/labelsort_test.go
new file mode 100644
index 0000000000..83b324d2d8
--- /dev/null
+++ b/common/labelsort/labelsort_test.go
@@ -0,0 +1,93 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package labelsort
+
+import (
+	"testing"
+
+	"github.com/appc/spec/schema/types"
+)
+
+func TestRankedName(t *testing.T) {
+	tests := []struct {
+		li string
+		lj string
+
+		expected bool
+	}{
+		{
+			"version", "os",
+			true,
+		},
+		{
+			"os", "version",
+			false,
+		},
+		{
+			"version", "a",
+			true,
+		},
+		{
+			"a", "os",
+			false,
+		},
+		{
+			"os", "a",
+			true,
+		},
+		{
+			"", "os",
+			false,
+		},
+		{
+			"os", "",
+			true,
+		},
+		{
+			"a", "version",
+			false,
+		},
+		{
+			"a", "b",
+			true,
+		},
+		{
+			"b", "a",
+			false,
+		},
+		{
+			"a", "a",
+			false,
+		},
+		{
+			"version", "version",
+			false,
+		},
+	}
+
+	for i, tt := range tests {
+		li := types.Label{
+			Name: types.ACIdentifier(tt.li),
+		}
+
+		lj := types.Label{
+			Name: types.ACIdentifier(tt.lj),
+		}
+
+		if result := RankedName(li, lj); result != tt.expected {
+			t.Errorf("test %d expected %q < %q = %t but got %t", i, tt.li, tt.lj, tt.expected, result)
+		}
+	}
+}
diff --git a/pkg/distribution/aciarchive.go b/pkg/distribution/aciarchive.go
new file mode 100644
index 0000000000..9982254ae2
--- /dev/null
+++ b/pkg/distribution/aciarchive.go
@@ -0,0 +1,130 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package distribution
+
+import (
+	"fmt"
+	"net/url"
+	"path/filepath"
+
+	"github.com/PuerkitoBio/purell"
+	"github.com/appc/spec/schema"
+	"github.com/hashicorp/errwrap"
+)
+
+const (
+	distACIArchiveVersion = 0
+
+	// TypeACIArchive represents the ACIArchive distribution type
+	TypeACIArchive Type = "aci-archive"
+)
+
+func init() {
+	Register(TypeACIArchive, NewACIArchive)
+}
+
+// ACIArchive defines a distribution using an ACI file
+// The format is:
+// cimd:aci-archive:v=0:ArchiveURL?query...
+// The distribution type is "archive"
+// ArchiveURL must be query escaped
+// Examples:
+// cimd:aci-archive:v=0:file%3A%2F%2Fabsolute%2Fpath%2Fto%2Ffile
+// cimd:aci-archive:v=0:https%3A%2F%2Fexample.com%2Fapp.aci
+type ACIArchive struct {
+	cimdURL      *url.URL // the cimd URL as explained in the examples
+	transportURL *url.URL // the transport URL of the target ACI archive, i.e. https://example.com/app.aci
+
+	str string // the string representation
+}
+
+// NewACIArchive creates a new aci-archive distribution from the provided distribution uri.
+func NewACIArchive(u *url.URL) (Distribution, error) {
+	c, err := parseCIMD(u)
+	if err != nil {
+		return nil, fmt.Errorf("cannot parse URI: %q: %v", u.String(), err)
+	}
+	if c.Type != TypeACIArchive {
+		return nil, fmt.Errorf("illegal ACI archive distribution type: %q", c.Type)
+	}
+
+	// This should be a valid URL
+	data, err := url.QueryUnescape(c.Data)
+	if err != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("error unescaping url %q", c.Data), err)
+	}
+	aciu, err := url.Parse(data)
+	if err != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("error parsing url %q", c.Data), err)
+	}
+
+	// save the URI as sorted to make it ready for comparison
+	purell.NormalizeURL(u, purell.FlagSortQuery)
+
+	str := u.String()
+	if path := aciu.String(); filepath.Ext(path) == schema.ACIExtension {
+		str = path
+	}
+
+	return &ACIArchive{
+		cimdURL:      u,
+		transportURL: aciu,
+		str:          str,
+	}, nil
+}
+
+// NewACIArchiveFromTransportURL creates a new aci-archive distribution from the provided transport URL
+// Example: file:///full/path/to/aci/file.aci -> cimd:aci-archive:v=0:file%3A%2F%2F%2Ffull%2Fpath%2Fto%2Faci%2Ffile.aci
+func NewACIArchiveFromTransportURL(u *url.URL) (Distribution, error) {
+	urlStr := NewCIMDString(TypeACIArchive, distACIArchiveVersion, url.QueryEscape(u.String()))
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		return nil, err
+	}
+	return NewACIArchive(u)
+}
+
+func (a *ACIArchive) CIMD() *url.URL {
+	// Create a copy of the URL.
+	u, err := url.Parse(a.cimdURL.String())
+	if err != nil {
+		panic(err)
+	}
+	return u
+}
+
+func (a *ACIArchive) Equals(d Distribution) bool {
+	a2, ok := d.(*ACIArchive)
+	if !ok {
+		return false
+	}
+
+	return a.CIMD().String() == a2.CIMD().String()
+}
+
+func (a *ACIArchive) String() string {
+	return a.str
+}
+
+// TransportURL returns a copy of the transport URL.
+func (a *ACIArchive) TransportURL() *url.URL {
+	// Create a copy of the transport URL
+	tu, err := url.Parse(a.transportURL.String())
+	if err != nil {
+		panic(fmt.Errorf("invalid transport URL: %v", err))
+	}
+
+	return tu
+}
diff --git a/pkg/distribution/aciarchive_test.go b/pkg/distribution/aciarchive_test.go
new file mode 100644
index 0000000000..5444be2c41
--- /dev/null
+++ b/pkg/distribution/aciarchive_test.go
@@ -0,0 +1,93 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package distribution
+
+import (
+	"net/url"
+	"testing"
+)
+
+func TestACIArchive(t *testing.T) {
+	tests := []struct {
+		transportURL string
+		expectedCIMD string
+	}{
+		{
+			"file:///full/path/to/aci/file.aci",
+			"cimd:aci-archive:v=0:file%3A%2F%2F%2Ffull%2Fpath%2Fto%2Faci%2Ffile.aci",
+		},
+		{
+			"https://test.com/fileabc.aci",
+			"cimd:aci-archive:v=0:https%3A%2F%2Ftest.com%2Ffileabc.aci",
+		},
+		{
+			"https://test.com/filedef.aci?z=value1&a=value2",
+			"cimd:aci-archive:v=0:https%3A%2F%2Ftest.com%2Ffiledef.aci%3Fz%3Dvalue1%26a%3Dvalue2",
+		},
+	}
+
+	for _, tt := range tests {
+		u, err := url.Parse(tt.transportURL)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		d, err := NewACIArchiveFromTransportURL(u)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		u, err = url.Parse(tt.expectedCIMD)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		td, err := NewACIArchive(u)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if !d.Equals(td) {
+			t.Fatalf("expected identical distribution but got %q != %q", td.CIMD().String(), d.CIMD().String())
+		}
+	}
+}
+
+func TestTransportURL(t *testing.T) {
+	tests := []struct {
+		transportURL string
+	}{
+		{
+			"file:///full/path/to/aci/fileabc.aci",
+		},
+		{
+			"https://test.com/fileabc.aci",
+		},
+	}
+
+	for _, tt := range tests {
+		u, err := url.Parse(tt.transportURL)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		d, err := NewACIArchiveFromTransportURL(u)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		transportURL := d.(*ACIArchive).TransportURL()
+		if tt.transportURL != transportURL.String() {
+			t.Fatalf("expected transport url %q, but got %q", tt.transportURL, transportURL.String())
+		}
+	}
+}
diff --git a/pkg/distribution/appc.go b/pkg/distribution/appc.go
new file mode 100644
index 0000000000..b4c2cc89d9
--- /dev/null
+++ b/pkg/distribution/appc.go
@@ -0,0 +1,154 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package distribution
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+
+	"github.com/PuerkitoBio/purell"
+	"github.com/appc/spec/discovery"
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common/labelsort"
+)
+
+const (
+	distAppcVersion = 0
+
+	// TypeAppc represents the Appc distribution type
+	TypeAppc Type = "appc"
+)
+
+func init() {
+	Register(TypeAppc, NewAppc)
+}
+
+// Appc defines a distribution using appc image discovery
+// Its format is cimd:appc:v=0:name?label01=....&label02=....
+// The distribution type is "appc"
+// The labels values must be Query escaped
+// Example cimd:appc:v=0:coreos.com/etcd?version=v3.0.3&os=linux&arch=amd64
+type Appc struct {
+	cimd *url.URL
+	app  *discovery.App
+
+	str string // the string representation
+}
+
+// NewAppc returns an Appc distribution from an Appc distribution URI
+func NewAppc(u *url.URL) (Distribution, error) {
+	c, err := parseCIMD(u)
+	if err != nil {
+		return nil, fmt.Errorf("cannot parse URI: %q: %v", u.String(), err)
+	}
+	if c.Type != TypeAppc {
+		return nil, fmt.Errorf("wrong distribution type: %q", c.Type)
+	}
+
+	appcStr := c.Data
+	for n, v := range u.Query() {
+		appcStr += fmt.Sprintf(",%s=%s", n, v[0])
+	}
+	app, err := discovery.NewAppFromString(appcStr)
+	if err != nil {
+		return nil, fmt.Errorf("wrong appc image string %q: %v", u.String(), err)
+	}
+
+	return NewAppcFromApp(app), nil
+}
+
+// NewAppcFromApp returns an Appc distribution from an appc App discovery string
+func NewAppcFromApp(app *discovery.App) Distribution {
+	rawuri := NewCIMDString(TypeAppc, distAppcVersion, url.QueryEscape(app.Name.String()))
+
+	var version string
+	labels := types.Labels{}
+	for n, v := range app.Labels {
+		if n == "version" {
+			version = v
+		}
+
+		labels = append(labels, types.Label{Name: n, Value: v})
+	}
+
+	if len(labels) > 0 {
+		queries := make([]string, len(labels))
+		rawuri += "?"
+		for i, l := range labels {
+			queries[i] = fmt.Sprintf("%s=%s", l.Name, url.QueryEscape(l.Value))
+		}
+		rawuri += strings.Join(queries, "&")
+	}
+
+	u, err := url.Parse(rawuri)
+	if err != nil {
+		panic(fmt.Errorf("cannot parse URI %q: %v", rawuri, err))
+	}
+
+	// save the URI as sorted to make it ready for comparison
+	purell.NormalizeURL(u, purell.FlagSortQuery)
+
+	str := app.Name.String()
+	if version != "" {
+		str += fmt.Sprintf(":%s", version)
+	}
+
+	labelsort.By(labelsort.RankedName).Sort(labels)
+	for _, l := range labels {
+		if l.Name != "version" {
+			str += fmt.Sprintf(",%s=%s", l.Name, l.Value)
+		}
+	}
+
+	return &Appc{
+		cimd: u,
+		app:  app.Copy(),
+		str:  str,
+	}
+}
+
+// URI returns a copy of the Distribution URI
+func (a *Appc) CIMD() *url.URL {
+	// Create a copy of the URL
+	u, err := url.Parse(a.cimd.String())
+	if err != nil {
+		panic(err)
+	}
+	return u
+}
+
+// String returns the simplest appc image format string from the Appc
+// distribution.
+// To avoid random label position they are lexically ordered giving the
+// precedence to version, os, arch (in this order)
+func (d *Appc) String() string {
+	return d.str
+}
+
+func (a *Appc) Equals(d Distribution) bool {
+	a2, ok := d.(*Appc)
+	if !ok {
+		return false
+	}
+
+	return a.cimd.String() == a2.cimd.String()
+}
+
+// App returns the discovery.App for an Appc distribution. It'll fail
+// if the distribution is not of type Appc.
+func (a *Appc) App() *discovery.App {
+	return a.app.Copy()
+}
diff --git a/pkg/distribution/appc_test.go b/pkg/distribution/appc_test.go
new file mode 100644
index 0000000000..231f23b5de
--- /dev/null
+++ b/pkg/distribution/appc_test.go
@@ -0,0 +1,132 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package distribution
+
+import (
+	"net/url"
+	"reflect"
+	"testing"
+
+	"github.com/appc/spec/discovery"
+)
+
+func TestNewAppcFromAppString(t *testing.T) {
+	tests := []struct {
+		appcRef  string
+		expected string
+	}{
+		{
+			"example.com/app01",
+			"cimd:appc:v=0:example.com/app01",
+		},
+		{
+			"example.com/app01:v1.0.0",
+			"cimd:appc:v=0:example.com/app01?version=v1.0.0",
+		},
+		{
+			"example.com/app01,version=v1.0.0",
+			"cimd:appc:v=0:example.com/app01?version=v1.0.0",
+		},
+		{
+			"example.com/app01,version=v1.0.0,label01=?&*/",
+			"cimd:appc:v=0:example.com/app01?label01=%3F%26%2A%2F&version=v1.0.0",
+		},
+		{
+			"example-app01",
+			"cimd:appc:v=0:example-app01",
+		},
+		{
+			"example-app01:v1.0",
+			"cimd:appc:v=0:example-app01?version=v1.0",
+		},
+	}
+
+	for _, tt := range tests {
+		app, err := discovery.NewAppFromString(tt.appcRef)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		appc := NewAppcFromApp(app)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		u, err := url.Parse(tt.expected)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		td, err := NewAppc(u)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if !appc.Equals(td) {
+			t.Errorf("expected identical distribution but got %q != %q", td.CIMD().String(), appc.CIMD().String())
+			continue
+		}
+	}
+}
+
+func TestApp(t *testing.T) {
+	tests := []struct {
+		uriStr string
+		out    string
+	}{
+		{
+			"cimd:appc:v=0:example.com/app01",
+			"example.com/app01",
+		},
+		{
+			"cimd:appc:v=0:example.com/app01?version=v1.0.0",
+			"example.com/app01:v1.0.0",
+		},
+		{
+			"cimd:appc:v=0:example.com/app01?version=v1.0.0",
+			"example.com/app01,version=v1.0.0",
+		},
+		{
+			"cimd:appc:v=0:example.com/app01?label01=%3F%26%2A%2F&version=v1.0.0",
+			"example.com/app01,version=v1.0.0,label01=?&*/",
+		},
+		{
+			"cimd:appc:v=0:example-app01",
+			"example-app01",
+		},
+		{
+			"cimd:appc:v=0:example-app01?version=v1.0",
+			"example-app01:v1.0",
+		},
+	}
+
+	for _, tt := range tests {
+		u, err := url.Parse(tt.uriStr)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		appc, err := NewAppc(u)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		app := appc.(*Appc).App()
+
+		expectedApp, err := discovery.NewAppFromString(tt.out)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if !reflect.DeepEqual(app, expectedApp) {
+			t.Fatalf("expected app %s, but got %q", expectedApp.String(), app.String())
+		}
+	}
+}
diff --git a/pkg/distribution/cimd.go b/pkg/distribution/cimd.go
new file mode 100644
index 0000000000..69ea8b762b
--- /dev/null
+++ b/pkg/distribution/cimd.go
@@ -0,0 +1,56 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package distribution
+
+import (
+	"fmt"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// cimd (container image distribution) is the struct
+// that contains the information about a distribution point.
+// A cimd URL is encoded as cimd:DistType:Version:Data.
+type cimd struct {
+	Type    Type
+	Version uint32
+	Data    string
+}
+
+// parseCIMD parses the given url and returns a cimd.
+func parseCIMD(u *url.URL) (*cimd, error) {
+	if u.Scheme != Scheme {
+		return nil, fmt.Errorf("unsupported scheme: %q", u.Scheme)
+	}
+	parts := strings.SplitN(u.Opaque, ":", 3)
+	if len(parts) < 3 {
+		return nil, fmt.Errorf("malformed distribution uri: %q", u.String())
+	}
+	version, err := strconv.ParseUint(strings.TrimPrefix(parts[1], "v="), 10, 32)
+	if err != nil {
+		return nil, fmt.Errorf("malformed distribution version: %s", parts[1])
+	}
+	return &cimd{
+		Type:    Type(parts[0]),
+		Version: uint32(version),
+		Data:    parts[2],
+	}, nil
+}
+
+// NewCIMDString creates a new cimd URL string.
+func NewCIMDString(typ Type, version uint32, data string) string {
+	return fmt.Sprintf("%s:%s:v=%d:%s", Scheme, typ, version, data)
+}
diff --git a/pkg/distribution/distribution.go b/pkg/distribution/distribution.go
new file mode 100644
index 0000000000..a91db36cab
--- /dev/null
+++ b/pkg/distribution/distribution.go
@@ -0,0 +1,79 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package distribution
+
+import (
+	"fmt"
+	"net/url"
+)
+
+// Type represents the Distribution type
+type Type string
+
+const (
+	// Scheme represents the Distribution URI scheme
+	Scheme = "cimd"
+)
+
+// Distribution is the interface that represents a distribution point.
+type Distribution interface {
+	// URI returns a copy of the Distribution CIMD URI.
+	CIMD() *url.URL
+	// String returns a user friendly representation of the distribution point.
+	String() string
+	// Equals returns true if this distribution equals the given distribution, else false.
+	Equals(Distribution) bool
+}
+
+type newDistribution func(*url.URL) (Distribution, error)
+
+var distributions = make(map[Type]newDistribution)
+
+// Register registers a function that returns a new instance of the given
+// distribution. This is intended to be called from the init function in
+// packages that implement distribution functions.
+func Register(distType Type, f newDistribution) {
+	if _, ok := distributions[distType]; ok {
+		panic(fmt.Errorf("distribution %q already registered", distType))
+	}
+	distributions[distType] = f
+}
+
+// Get returns a Distribution from the input URI.
+// It returns an error if the uri string is wrong or referencing an unknown
+// distribution type.
+func Get(u *url.URL) (Distribution, error) {
+	c, err := parseCIMD(u)
+	if err != nil {
+		return nil, fmt.Errorf("malformed distribution uri %q: %v", u.String(), err)
+	}
+	if u.Scheme != Scheme {
+		return nil, fmt.Errorf("malformed distribution uri %q", u.String())
+	}
+	if _, ok := distributions[c.Type]; !ok {
+		return nil, fmt.Errorf("unknown distribution type: %q", c.Type)
+	}
+	return distributions[c.Type](u)
+}
+
+// Parse parses the provided distribution URI string and returns a
+// Distribution.
+func Parse(rawuri string) (Distribution, error) {
+	u, err := url.Parse(rawuri)
+	if err != nil {
+		return nil, fmt.Errorf("cannot parse uri: %q: %v", rawuri, err)
+	}
+	return Get(u)
+}
diff --git a/pkg/distribution/docker.go b/pkg/distribution/docker.go
new file mode 100644
index 0000000000..43f5deb0de
--- /dev/null
+++ b/pkg/distribution/docker.go
@@ -0,0 +1,167 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package distribution
+
+import (
+	"fmt"
+	"net/url"
+	"path"
+	"strings"
+
+	d2acommon "github.com/appc/docker2aci/lib/common"
+)
+
+const (
+	distDockerVersion = 0
+
+	// TypeDocker represents the Docker distribution type
+	TypeDocker Type = "docker"
+
+	defaultIndexURL   = "registry-1.docker.io"
+	defaultTag        = "latest"
+	defaultRepoPrefix = "library/"
+)
+
+func init() {
+	Register(TypeDocker, NewDocker)
+}
+
+// Docker defines a distribution using a docker registry.
+// The format after the docker distribution type prefix (cimd:docker:v=0:) is the same
+// as the docker image string format (man docker-pull):
+// cimd:docker:v=0:[REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG|@DIGEST]
+// Examples:
+// cimd:docker:v=0:busybox
+// cimd:docker:v=0:busybox:latest
+// cimd:docker:v=0:registry-1.docker.io/library/busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6
+type Docker struct {
+	url       string // a valid docker reference URL
+	parsedURL *d2acommon.ParsedDockerURL
+
+	full   string // the full string representation for equals operations
+	simple string // the user friendly (simple) string representation
+}
+
+// NewDocker creates a new docker distribution from the provided distribution uri string
+func NewDocker(u *url.URL) (Distribution, error) {
+	dp, err := parseCIMD(u)
+	if err != nil {
+		return nil, fmt.Errorf("cannot parse URI: %q: %v", u.String(), err)
+	}
+	if dp.Type != TypeDocker {
+		return nil, fmt.Errorf("wrong distribution type: %q", dp.Type)
+	}
+
+	parsed, err := d2acommon.ParseDockerURL(dp.Data)
+	if err != nil {
+		return nil, fmt.Errorf("bad docker URL %q: %v", dp.Data, err)
+	}
+
+	return &Docker{
+		url:       dp.Data,
+		parsedURL: parsed,
+		simple:    SimpleDockerRef(parsed),
+		full:      FullDockerRef(parsed),
+	}, nil
+}
+
+// NewDockerFromDockerString creates a new docker distribution from the provided
+// docker string (like "busybox", "busybox:1.0", "myregistry.example.com:4000/busybox" etc...)
+func NewDockerFromString(ds string) (Distribution, error) {
+	urlStr := NewCIMDString(TypeDocker, distDockerVersion, ds)
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		return nil, err
+	}
+	return NewDocker(u)
+}
+
+func (d *Docker) CIMD() *url.URL {
+	uriStr := NewCIMDString(TypeDocker, distDockerVersion, d.url)
+	// Create a copy of the URL
+	u, err := url.Parse(uriStr)
+	if err != nil {
+		panic(err)
+	}
+	return u
+}
+
+func (d *Docker) String() string {
+	return d.simple
+}
+
+func (d *Docker) Equals(dist Distribution) bool {
+	d2, ok := dist.(*Docker)
+	if !ok {
+		return false
+	}
+
+	return d.full == d2.full
+}
+
+// ReferenceURL returns the docker reference URL.
+func (d *Docker) ReferenceURL() string {
+	return d.url
+}
+
+// SimpleDockerRef returns a simplyfied docker reference. This means removing
+// the index url if it's the default docker registry (registry-1.docker.io),
+// removing the default repo (library) when using the default docker registry
+func SimpleDockerRef(p *d2acommon.ParsedDockerURL) string {
+	var sds string
+	if p.IndexURL != defaultIndexURL {
+		sds += p.IndexURL
+	}
+
+	imageName := p.ImageName
+	if p.IndexURL == defaultIndexURL && strings.HasPrefix(p.ImageName, defaultRepoPrefix) {
+		imageName = strings.TrimPrefix(p.ImageName, defaultRepoPrefix)
+	}
+
+	if sds == "" {
+		sds = imageName
+	} else {
+		sds = path.Join(sds, imageName)
+	}
+
+	digest := p.Digest
+	tag := p.Tag
+	if digest != "" {
+		sds += "@" + digest
+	} else {
+		if tag != defaultTag {
+			sds += ":" + tag
+		}
+	}
+
+	return sds
+}
+
+// FullDockerRef return the docker reference populated with all the default values.
+// References like "busybox" or "registry-1.docker.io/library/busybox:latest"
+// will become the same docker reference.
+func FullDockerRef(p *d2acommon.ParsedDockerURL) string {
+	fds := path.Join(p.IndexURL, p.ImageName)
+	digest := p.Digest
+	tag := p.Tag
+
+	if digest != "" {
+		fds += "@" + digest
+	} else {
+		fds += ":" + tag
+	}
+
+	return fds
+}
diff --git a/pkg/distribution/docker_test.go b/pkg/distribution/docker_test.go
new file mode 100644
index 0000000000..dd24c40860
--- /dev/null
+++ b/pkg/distribution/docker_test.go
@@ -0,0 +1,110 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package distribution
+
+import (
+	"net/url"
+	"testing"
+)
+
+func TestDocker(t *testing.T) {
+	tests := []struct {
+		dockerRef string
+
+		expectedCIMD string
+		expected     string
+	}{
+		{
+			"busybox",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox:latest",
+			"busybox",
+		},
+		{
+			"busybox:latest",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox:latest",
+			"busybox",
+		},
+		{
+			"registry-1.docker.io/library/busybox:latest",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox:latest",
+			"busybox",
+		},
+		{
+			"busybox:1.0",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox:1.0",
+			"busybox:1.0",
+		},
+		{
+			"repo/image",
+			"cimd:docker:v=0:registry-1.docker.io/repo/image:latest",
+			"repo/image",
+		},
+		{
+			"repo/image:latest",
+			"cimd:docker:v=0:registry-1.docker.io/repo/image:latest",
+			"repo/image",
+		},
+		{
+			"repo/image:1.0",
+			"cimd:docker:v=0:registry-1.docker.io/repo/image:1.0",
+			"repo/image:1.0",
+		},
+		{
+			"busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6",
+			"busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6",
+		},
+		{
+			"myregistry.example.com:4000/busybox",
+			"cimd:docker:v=0:myregistry.example.com:4000/busybox:latest",
+			"myregistry.example.com:4000/busybox",
+		},
+		{
+			"myregistry.example.com:4000/busybox:latest",
+			"cimd:docker:v=0:myregistry.example.com:4000/busybox:latest",
+			"myregistry.example.com:4000/busybox",
+		},
+		{
+			"myregistry.example.com:4000/busybox:1.0",
+			"cimd:docker:v=0:myregistry.example.com:4000/busybox:1.0",
+			"myregistry.example.com:4000/busybox:1.0",
+		},
+	}
+
+	for _, tt := range tests {
+		// Test NewDockerFromDockerString
+		d, err := NewDockerFromString(tt.dockerRef)
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+			continue
+		}
+
+		u, err := url.Parse(tt.expectedCIMD)
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+			continue
+		}
+
+		td, err := NewDocker(u)
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+			continue
+		}
+
+		if !d.Equals(td) {
+			t.Errorf("expected identical distribution but got %q != %q", td.CIMD().String(), d.CIMD().String())
+		}
+	}
+}
diff --git a/rkt/app_add.go b/rkt/app_add.go
index bb9256c71e..08b36ead87 100644
--- a/rkt/app_add.go
+++ b/rkt/app_add.go
@@ -18,7 +18,6 @@ import (
 	"fmt"
 
 	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/apps"
 	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/rkt/image"
 	"github.com/coreos/rkt/stage0"
@@ -101,7 +100,7 @@ func runAppAdd(cmd *cobra.Command, args []string) (exit int) {
 		NoStore:   false,
 	}
 
-	img, err := fn.FindImage(args[1], "", apps.AppImageGuess)
+	img, err := fn.FindImage(args[1], "")
 	if err != nil {
 		stderr.PrintE("error finding images", err)
 		return 1
diff --git a/rkt/fetch.go b/rkt/fetch.go
index ead32254b9..1a00f54925 100644
--- a/rkt/fetch.go
+++ b/rkt/fetch.go
@@ -112,11 +112,13 @@ func runFetch(cmd *cobra.Command, args []string) (exit int) {
 		WithDeps:  true,
 	}
 
+	err = ft.FetchImages(&rktApps)
+	if err != nil {
+		stderr.Error(err)
+		return 254
+	}
 	err = rktApps.Walk(func(app *apps.App) error {
-		hash, err := ft.FetchImage(app.Image, app.Asc, app.ImType)
-		if err != nil {
-			return err
-		}
+		hash := app.ImageID.String()
 		if !flagFullHash {
 			hash = types.ShortHash(hash)
 		}
diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index dc820ae7e3..61c2edf5cf 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -29,8 +29,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/common/apps"
 	"github.com/coreos/rkt/pkg/aci"
+	dist "github.com/coreos/rkt/pkg/distribution"
 	"github.com/coreos/rkt/pkg/keystore"
 	"github.com/coreos/rkt/pkg/keystore/keystoretest"
 	"github.com/coreos/rkt/rkt/config"
@@ -284,7 +284,15 @@ func TestDownloading(t *testing.T) {
 			Headers:       headers,
 			InsecureFlags: insecureFlags,
 		}
-		_, err = ft.FetchImage(tt.aciURL, "", apps.AppImageURL)
+		u, err := url.Parse(tt.aciURL)
+		if err != nil {
+			t.Fatalf("unexpected error %v", err)
+		}
+		d, err := dist.NewACIArchiveFromTransportURL(u)
+		if err != nil {
+			t.Fatalf("unexpected error %v", err)
+		}
+		_, err = ft.FetchImage(d, tt.aciURL, "")
 		if err != nil && !tt.authFail {
 			t.Fatalf("expected download to succeed, it failed: %v (server: %q, headers: `%v`)", err, urlToName[tt.aciURL], tt.options)
 		}
@@ -357,7 +365,16 @@ func TestFetchImage(t *testing.T) {
 		Ks:            ks,
 		InsecureFlags: secureFlags,
 	}
-	_, err = ft.FetchImage(fmt.Sprintf("%s/app.aci", ts.URL), "", apps.AppImageURL)
+
+	u, err := url.Parse(fmt.Sprintf("%s/app.aci", ts.URL))
+	if err != nil {
+		t.Fatalf("unexpected error %v", err)
+	}
+	d, err := dist.NewACIArchiveFromTransportURL(u)
+	if err != nil {
+		t.Fatalf("unexpected error %v", err)
+	}
+	_, err = ft.FetchImage(d, u.String(), "")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -546,7 +563,15 @@ func TestFetchImageCache(t *testing.T) {
 			// Skip local store
 			NoStore: true,
 		}
-		_, err = ft.FetchImage(aciURL, "", apps.AppImageURL)
+		u, err := url.Parse(aciURL)
+		if err != nil {
+			t.Fatalf("unexpected error %v", err)
+		}
+		d, err := dist.NewACIArchiveFromTransportURL(u)
+		if err != nil {
+			t.Fatalf("unexpected error %v", err)
+		}
+		_, err = ft.FetchImage(d, u.String(), "")
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
@@ -562,7 +587,7 @@ func TestFetchImageCache(t *testing.T) {
 		}
 
 		downloadTime := rem.DownloadTime
-		_, err = ft.FetchImage(aciURL, "", apps.AppImageURL)
+		_, err = ft.FetchImage(d, u.String(), "")
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
diff --git a/rkt/image/common.go b/rkt/image/common.go
index 3a30915280..a1d88750ac 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/rkt/common/apps"
+	dist "github.com/coreos/rkt/pkg/distribution"
 	"github.com/coreos/rkt/pkg/keystore"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/rkt/config"
@@ -32,11 +32,18 @@ import (
 	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
 
+	"github.com/appc/spec/discovery"
 	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
 	"golang.org/x/crypto/openpgp"
 )
 
+type imageStringType int
+
+const (
+	imageStringName imageStringType = iota // image type to be guessed
+	imageStringPath                        // absolute or relative path
+)
+
 // action is a common type for Finder and Fetcher
 type action struct {
 	// S is an aci store where images will be looked for or stored.
@@ -124,15 +131,78 @@ func printIdentities(entity *openpgp.Entity) {
 	log.Print(strings.Join(lines, "\n"))
 }
 
-func guessImageType(image string) apps.AppImageType {
-	if _, err := types.NewHash(image); err == nil {
-		return apps.AppImageHash
+// DistFromImageString return the distribution for the given input image string
+func DistFromImageString(is string) (dist.Distribution, error) {
+	u, err := url.Parse(is)
+	if err != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("failed to parse image url %q", is), err)
 	}
-	if u, err := url.Parse(image); err == nil && u.Scheme != "" {
-		return apps.AppImageURL
+
+	// Convert user friendly image string names to internal distribution URIs
+	// file:///full/path/to/aci/file.aci -> archive:aci:file%3A%2F%2F%2Ffull%2Fpath%2Fto%2Faci%2Ffile.aci
+	switch u.Scheme {
+	case "":
+		// no scheme given, hence should be an appc image path
+		appImageType := guessAppcOrPath(is, []string{schema.ACIExtension})
+
+		switch appImageType {
+		case imageStringName:
+			app, err := discovery.NewAppFromString(is)
+			if err != nil {
+				return nil, fmt.Errorf("invalid appc image string %q: %v", is, err)
+			}
+			return dist.NewAppcFromApp(app), nil
+		case imageStringPath:
+			absPath, err := filepath.Abs(is)
+			if err != nil {
+				return nil, errwrap.Wrap(fmt.Errorf("failed to get an absolute path for %q", is), err)
+			}
+			is = "file://" + absPath
+
+			// given a file:// image string, call this function again to return an ACI distribution
+			return DistFromImageString(is)
+		default:
+			return nil, fmt.Errorf("invalid image string type %q", appImageType)
+		}
+	case "file", "http", "https":
+		// An ACI archive with any transport type (file, http, s3 etc...) and final aci extension
+		if filepath.Ext(u.Path) == schema.ACIExtension {
+			dist, err := dist.NewACIArchiveFromTransportURL(u)
+			if err != nil {
+				return nil, fmt.Errorf("archive distribution creation error: %v", err)
+			}
+			return dist, nil
+		}
+	case "docker":
+		// Accept both docker: and docker:// uri
+		dockerStr := is
+		if strings.HasPrefix(dockerStr, "docker://") {
+			dockerStr = strings.TrimPrefix(dockerStr, "docker://")
+		} else if strings.HasPrefix(dockerStr, "docker:") {
+			dockerStr = strings.TrimPrefix(dockerStr, "docker:")
+		}
+
+		dist, err := dist.NewDockerFromString(dockerStr)
+		if err != nil {
+			return nil, fmt.Errorf("docker distribution creation error: %v", err)
+		}
+		return dist, nil
+	default:
+		// any other scheme is a an appc image name, i.e. "my-app:v1.0"
+		app, err := discovery.NewAppFromString(is)
+		if err != nil {
+			return nil, fmt.Errorf("invalid appc image string %q: %v", is, err)
+		}
+
+		return dist.NewAppcFromApp(app), nil
 	}
-	if filepath.IsAbs(image) {
-		return apps.AppImagePath
+
+	return nil, fmt.Errorf("invalid image string %q", is)
+}
+
+func guessAppcOrPath(is string, extensions []string) imageStringType {
+	if filepath.IsAbs(is) {
+		return imageStringPath
 	}
 
 	// Well, at this point is basically heuristics time. The image
@@ -140,9 +210,9 @@ func guessImageType(image string) apps.AppImageType {
 
 	// First, let's try to stat whatever file the URL would specify. If it
 	// exists, that's probably what the user wanted.
-	f, err := os.Stat(image)
+	f, err := os.Stat(is)
 	if err == nil && f.Mode().IsRegular() {
-		return apps.AppImagePath
+		return imageStringPath
 	}
 
 	// Second, let's check if there is a colon in the image
@@ -151,21 +221,23 @@ func guessImageType(image string) apps.AppImageType {
 	// highly unlikely that the image parameter is a path. Colon
 	// in this context is often used for specifying a version of
 	// an image, like in "example.com/reduce-worker:1.0.0".
-	if strings.ContainsRune(image, ':') {
-		return apps.AppImageName
+	if strings.ContainsRune(is, ':') {
+		return imageStringName
 	}
 
 	// Third, let's check if there is a dot followed by a slash
 	// (./) - if so, it is likely that the image parameter is path
 	// like ./aci-in-this-dir or ../aci-in-parent-dir
-	if strings.Contains(image, "./") {
-		return apps.AppImagePath
+	if strings.Contains(is, "./") {
+		return imageStringPath
 	}
 
 	// Fourth, let's check if the image parameter has an .aci
 	// extension. If so, likely a path like "stage1-coreos.aci".
-	if filepath.Ext(image) == schema.ACIExtension {
-		return apps.AppImagePath
+	for _, e := range extensions {
+		if filepath.Ext(is) == e {
+			return imageStringPath
+		}
 	}
 
 	// At this point, if the image parameter is something like
@@ -175,7 +247,7 @@ func guessImageType(image string) apps.AppImageType {
 	// "stage1-coreos" in this directory tree, then you better be
 	// off prepending the parameter with "./", because I'm gonna
 	// treat this as an image name otherwise.
-	return apps.AppImageName
+	return imageStringName
 }
 
 func eTag(rem *imagestore.Remote) string {
diff --git a/rkt/image/common_test.go b/rkt/image/common_test.go
index 7b4299aaff..86e142d40b 100644
--- a/rkt/image/common_test.go
+++ b/rkt/image/common_test.go
@@ -15,84 +15,70 @@
 package image
 
 import (
+	"fmt"
 	"net/url"
+	"path/filepath"
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/common/apps"
+	dist "github.com/coreos/rkt/pkg/distribution"
 )
 
-func TestGuessImageType(t *testing.T) {
+func TestGuessAppcOrPath(t *testing.T) {
 	tests := []struct {
 		image        string
-		expectedType apps.AppImageType
+		expectedType imageStringType
 	}{
-		// guess obvious hash as a hash
-		{
-			image:        "sha512-a8d0943eb94eb9da4a6dddfa51e5e3de84375de77271d26c41ac1ce6f588b618",
-			expectedType: apps.AppImageHash,
-		},
-		// guess obvious URL as a URL
-		{
-			image:        "http://example.com/image.aci",
-			expectedType: apps.AppImageURL,
-		},
 		// guess obvious absolute path as a path
 		{
 			image:        "/usr/libexec/rkt/stage1.aci",
-			expectedType: apps.AppImagePath,
+			expectedType: imageStringPath,
 		},
 		// guess stuff with colon as a name
 		{
 			image:        "example.com/stage1:1.2.3",
-			expectedType: apps.AppImageName,
+			expectedType: imageStringName,
 		},
 		// guess stuff with ./ as a path
 		{
 			image:        "some/relative/../path/with/dots/file",
-			expectedType: apps.AppImagePath,
+			expectedType: imageStringPath,
 		},
 		// the same
 		{
 			image:        "./another/obviously/relative/path",
-			expectedType: apps.AppImagePath,
+			expectedType: imageStringPath,
 		},
 		// guess stuff ending with .aci as a path
 		{
 			image:        "some/relative/path/with/aci/extension.aci",
-			expectedType: apps.AppImagePath,
+			expectedType: imageStringPath,
 		},
 		// guess stuff without .aci, ./ and : as a name
 		{
 			image:        "example.com/stage1",
-			expectedType: apps.AppImageName,
+			expectedType: imageStringName,
 		},
 		// another try
 		{
 			image:        "example.com/stage1,version=1.2.3,foo=bar",
-			expectedType: apps.AppImageName,
+			expectedType: imageStringName,
 		},
 	}
 	for _, tt := range tests {
-		guessed := guessImageType(tt.image)
+		guessed := guessAppcOrPath(tt.image, []string{".aci"})
 		if tt.expectedType != guessed {
 			t.Errorf("expected %q to be guessed as %q, but got %q", tt.image, imageTypeToString(tt.expectedType), imageTypeToString(guessed))
 		}
 	}
 }
 
-func imageTypeToString(imType apps.AppImageType) string {
+func imageTypeToString(imType imageStringType) string {
 	switch imType {
-	case apps.AppImageGuess:
-		return "to-be-guessed"
-	case apps.AppImageHash:
-		return "hash"
-	case apps.AppImageURL:
-		return "URL"
-	case apps.AppImagePath:
-		return "path"
-	case apps.AppImageName:
+	case imageStringName:
 		return "name"
+	case imageStringPath:
+		return "path"
 	default:
 		return "unknown"
 	}
@@ -179,3 +165,148 @@ func TestUseCached(t *testing.T) {
 		}
 	}
 }
+
+func TestDistFromImageString(t *testing.T) {
+	relPath1 := "some/relative/../path/with/dots/file.aci"
+	absPath1, err := filepath.Abs(relPath1)
+	if err != nil {
+
+		t.Fatalf("unexpected error: %v", err)
+	}
+	relPath2 := "some/relative/../path/with/dots/file"
+	absPath2, err := filepath.Abs(relPath2)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	tests := []struct {
+		in         string
+		distString string
+		err        error
+	}{
+		// Appc
+		{
+			"example.com/app01",
+			"cimd:appc:v=0:example.com/app01",
+			nil,
+		},
+		{
+			"example.com/app01:v1.0.0",
+			"cimd:appc:v=0:example.com/app01?version=v1.0.0",
+			nil,
+		},
+		{
+			"example.com/app01:v1.0.0,label01=?&*/",
+			"cimd:appc:v=0:example.com/app01?label01=%3F%26%2A%2F&version=v1.0.0",
+			nil,
+		},
+		// ACIArchive
+		{
+			"file:///absolute/path/to/file.aci",
+			"cimd:aci-archive:v=0:file%3A%2F%2F%2Fabsolute%2Fpath%2Fto%2Ffile.aci",
+			nil,
+		},
+		{
+			"/absolute/path/to/file.aci",
+			"cimd:aci-archive:v=0:file%3A%2F%2F%2Fabsolute%2Fpath%2Fto%2Ffile.aci",
+			nil,
+		},
+		{
+			relPath1,
+			"cimd:aci-archive:v=0:" + url.QueryEscape("file://"+absPath1),
+			nil,
+		},
+		{
+			"https://example.com/app.aci",
+			"cimd:aci-archive:v=0:https%3A%2F%2Fexample.com%2Fapp.aci",
+			nil,
+		},
+		// Path with no .aci extension
+		{
+			"/absolute/path/to/file",
+			"",
+			fmt.Errorf("invalid image string %q", "file:///absolute/path/to/file"),
+		},
+		{
+			"/absolute/path/to/file.tar",
+			"",
+			fmt.Errorf("invalid image string %q", "file:///absolute/path/to/file.tar"),
+		},
+		{
+			relPath2,
+			"",
+			fmt.Errorf("invalid image string %q", "file://"+absPath2),
+		},
+		// Docker
+		{
+			"docker:busybox",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox:latest",
+			nil,
+		},
+		{
+			"docker://busybox",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox:latest",
+			nil,
+		},
+		{
+			"docker:busybox:latest",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox:latest",
+			nil,
+		},
+		{
+			"docker://busybox:latest",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox:latest",
+			nil,
+		},
+		{
+			"docker:busybox:1.0",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox:1.0",
+			nil,
+		},
+		{
+			"docker:busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6",
+			"cimd:docker:v=0:registry-1.docker.io/library/busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6",
+			nil,
+		},
+		{
+			"docker:myregistry.example.com:4000/busybox",
+			"cimd:docker:v=0:myregistry.example.com:4000/busybox:latest",
+			nil,
+		},
+		{
+			"docker:myregistry.example.com:4000/busybox",
+			"cimd:docker:v=0:myregistry.example.com:4000/busybox:latest",
+			nil,
+		},
+		{
+			"docker:myregistry.example.com:4000/busybox:1.0",
+			"cimd:docker:v=0:myregistry.example.com:4000/busybox:1.0",
+			nil,
+		},
+	}
+
+	for _, tt := range tests {
+		d, err := DistFromImageString(tt.in)
+		if err != nil {
+			if tt.err == nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if tt.err.Error() != err.Error() {
+				t.Fatalf("expected error %v, but got error %v", tt.err, err)
+			}
+			continue
+		} else {
+			if tt.err != nil {
+				t.Fatalf("expected error %v, but got nil error", tt.err)
+			}
+		}
+		td, err := dist.Parse(tt.distString)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if !d.Equals(td) {
+			t.Fatalf("expected identical distribution but got %q != %q", tt.distString, d.CIMD().String())
+		}
+	}
+
+}
diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index eaa8bcc747..3578ee1a9a 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
+	dist "github.com/coreos/rkt/pkg/distribution"
 	"github.com/coreos/rkt/stage0"
 	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
@@ -32,25 +33,52 @@ import (
 	"github.com/appc/spec/schema/types"
 )
 
+// distBundle contains the distribution and the original image string
+// (primarily used for logging)
+type distBundle struct {
+	dist  dist.Distribution
+	image string
+}
+
 // Fetcher will try to fetch images into the store.
 type Fetcher action
 
+// FetchImages uses FetchImage to attain a list of image hashes
+func (f *Fetcher) FetchImages(al *apps.Apps) error {
+	return al.Walk(func(app *apps.App) error {
+		d, err := DistFromImageString(app.Image)
+		if err != nil {
+			return err
+		}
+		h, err := f.FetchImage(d, app.Image, app.Asc)
+		if err != nil {
+			return err
+		}
+		app.ImageID = *h
+		return nil
+	})
+}
+
 // FetchImage will take an image as either a path, a URL or a name
 // string and import it into the store if found. If ascPath is not "",
 // it must exist as a local file and will be used as the signature
 // file for verification, unless verification is disabled. If
 // f.WithDeps is true also image dependencies are fetched.
-func (f *Fetcher) FetchImage(img string, ascPath string, imgType apps.AppImageType) (string, error) {
+func (f *Fetcher) FetchImage(d dist.Distribution, image, ascPath string) (*types.Hash, error) {
 	ensureLogger(f.Debug)
+	db := &distBundle{
+		dist:  d,
+		image: image,
+	}
 	a := f.getAsc(ascPath)
-	hash, err := f.fetchSingleImage(img, a, imgType)
+	hash, err := f.fetchSingleImage(db, a)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	if f.WithDeps {
 		err = f.fetchImageDeps(hash)
 		if err != nil {
-			return "", err
+			return nil, err
 		}
 	}
 
@@ -60,10 +88,15 @@ func (f *Fetcher) FetchImage(img string, ascPath string, imgType apps.AppImageTy
 	// 2) check if we're root
 	if common.SupportsOverlay() == nil && os.Geteuid() == 0 {
 		if _, _, err := f.Ts.Render(hash, false); err != nil {
-			return "", errwrap.Wrap(errors.New("error rendering tree store"), err)
+			return nil, errwrap.Wrap(errors.New("error rendering tree store"), err)
 		}
 	}
-	return hash, nil
+	h, err := types.NewHash(hash)
+	if err != nil {
+		// should never happen
+		log.PanicE("invalid hash", err)
+	}
+	return h, nil
 }
 
 func (f *Fetcher) getAsc(ascPath string) *asc {
@@ -79,12 +112,17 @@ func (f *Fetcher) getAsc(ascPath string) *asc {
 // fetchImageDeps will recursively fetch all the image dependencies
 func (f *Fetcher) fetchImageDeps(hash string) error {
 	imgsl := list.New()
-	seen := map[string]struct{}{}
+	seen := map[string]dist.Distribution{}
 	f.addImageDeps(hash, imgsl, seen)
 	for el := imgsl.Front(); el != nil; el = el.Next() {
 		a := &asc{}
-		img := el.Value.(string)
-		hash, err := f.fetchSingleImage(img, a, apps.AppImageName)
+		d := el.Value.(*dist.Appc)
+		str := d.String()
+		db := &distBundle{
+			dist:  d,
+			image: str,
+		}
+		hash, err := f.fetchSingleImage(db, a)
 		if err != nil {
 			return err
 		}
@@ -93,7 +131,7 @@ func (f *Fetcher) fetchImageDeps(hash string) error {
 	return nil
 }
 
-func (f *Fetcher) addImageDeps(hash string, imgsl *list.List, seen map[string]struct{}) error {
+func (f *Fetcher) addImageDeps(hash string, imgsl *list.List, seen map[string]dist.Distribution) error {
 	dependencies, err := f.getImageDeps(hash)
 	if err != nil {
 		return errwrap.Wrap(fmt.Errorf("failed to get dependencies for image ID %q", hash), err)
@@ -104,12 +142,16 @@ func (f *Fetcher) addImageDeps(hash string, imgsl *list.List, seen map[string]st
 		if err != nil {
 			return errwrap.Wrap(fmt.Errorf("one of image ID's %q dependencies (image %q) is invalid", hash, imgName), err)
 		}
-		appStr := app.String()
-		if _, ok := seen[appStr]; ok {
-			continue
+		d := dist.NewAppcFromApp(app)
+		// To really catch already seen deps the saved string must be a
+		// reproducible string keeping the labels order
+		for _, sd := range seen {
+			if d.Equals(sd) {
+				continue
+			}
 		}
-		imgsl.PushBack(app.String())
-		seen[appStr] = struct{}{}
+		imgsl.PushBack(d)
+		seen[d.CIMD().String()] = d
 	}
 	return nil
 }
@@ -126,43 +168,31 @@ func (f *Fetcher) getImageDeps(hash string) (types.Dependencies, error) {
 	return im.Dependencies, nil
 }
 
-func (f *Fetcher) fetchSingleImage(img string, a *asc, imgType apps.AppImageType) (string, error) {
-	if imgType == apps.AppImageGuess {
-		imgType = guessImageType(img)
-	}
-	if imgType == apps.AppImageHash {
-		return "", fmt.Errorf("cannot fetch a hash %q, expected either a URL, a path or an image name", img)
-	}
-
-	switch imgType {
-	case apps.AppImageURL:
-		return f.fetchSingleImageByURL(img, a)
-	case apps.AppImagePath:
-		return f.fetchSingleImageByPath(img, a)
-	case apps.AppImageName:
-		return f.fetchSingleImageByName(img, a)
+func (f *Fetcher) fetchSingleImage(db *distBundle, a *asc) (string, error) {
+	switch v := db.dist.(type) {
+	case *dist.ACIArchive:
+		return f.fetchACIArchive(db, a)
+	case *dist.Appc:
+		return f.fetchSingleImageByName(db, a)
+	case *dist.Docker:
+		return f.fetchSingleImageByDockerURL(v)
 	default:
-		return "", fmt.Errorf("unknown image type %d", imgType)
+		return "", fmt.Errorf("unknown distribution type %T", v)
 	}
 }
 
-func (f *Fetcher) fetchSingleImageByURL(urlStr string, a *asc) (string, error) {
-	u, err := url.Parse(urlStr)
-	if err != nil {
-		return "", errwrap.Wrap(fmt.Errorf("invalid image URL %q", urlStr), err)
-	}
+func (f *Fetcher) fetchACIArchive(db *distBundle, a *asc) (string, error) {
+	u := db.dist.(*dist.ACIArchive).TransportURL()
 
 	switch u.Scheme {
 	case "http", "https":
 		return f.fetchSingleImageByHTTPURL(u, a)
-	case "docker":
-		return f.fetchSingleImageByDockerURL(u)
 	case "file":
 		return f.fetchSingleImageByPath(u.Path, a)
 	case "":
-		return "", fmt.Errorf("expected image URL %q to contain a scheme", urlStr)
+		return "", fmt.Errorf("expected image URL %q to contain a scheme", u.String())
 	default:
-		return "", fmt.Errorf("an unsupported URL scheme %q - the only URL schemes supported by rkt are docker, http, https and file", u.Scheme)
+		return "", fmt.Errorf("an unsupported URL scheme %q - the only URL schemes supported by rkt for an archive are http, https and file", u.Scheme)
 	}
 }
 
@@ -180,7 +210,15 @@ func (f *Fetcher) fetchSingleImageByHTTPURL(u *url.URL, a *asc) (string, error)
 	return "", fmt.Errorf("unable to fetch image from URL %q: either image was not found in the store or store was disabled and fetching from remote yielded nothing or it was disabled", u.String())
 }
 
-func (f *Fetcher) fetchSingleImageByDockerURL(u *url.URL) (string, error) {
+func (f *Fetcher) fetchSingleImageByDockerURL(d *dist.Docker) (string, error) {
+	ds := d.ReferenceURL()
+	// Convert to the docker2aci URL format
+	urlStr := "docker://" + ds
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		return "", err
+	}
+
 	rem, err := remoteForURL(f.S, u)
 	if err != nil {
 		return "", err
@@ -243,16 +281,11 @@ func (f *Fetcher) fetchSingleImageByPath(path string, a *asc) (string, error) {
 	return ff.Hash(path, a)
 }
 
-type appBundle struct {
-	App *discovery.App
-	Str string
-}
-
-func newAppBundle(name string) (*appBundle, error) {
-	app, err := discovery.NewAppFromString(name)
-	if err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("invalid image name %q", name), err)
-	}
+// TODO(sgotti) I'm not sure setting default os and arch also for image
+// dependencies is correct since it may break noarch dependencies. Reference:
+// https://github.com/coreos/rkt/pull/2317
+func (db *distBundle) setAppDefaults() error {
+	app := db.dist.(*dist.Appc).App()
 	if _, ok := app.Labels["arch"]; !ok {
 		app.Labels["arch"] = runtime.GOARCH
 	}
@@ -260,34 +293,30 @@ func newAppBundle(name string) (*appBundle, error) {
 		app.Labels["os"] = runtime.GOOS
 	}
 	if err := types.IsValidOSArch(app.Labels, stage0.ValidOSArch); err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("invalid image name %q", name), err)
-	}
-	bundle := &appBundle{
-		App: app,
-		Str: name,
+		return errwrap.Wrap(fmt.Errorf("invalid Appc distribution %q", db.image), err)
 	}
-	return bundle, nil
+	db.dist = dist.NewAppcFromApp(app)
+	return nil
 }
 
-func (f *Fetcher) fetchSingleImageByName(name string, a *asc) (string, error) {
-	app, err := newAppBundle(name)
-	if err != nil {
+func (f *Fetcher) fetchSingleImageByName(db *distBundle, a *asc) (string, error) {
+	if err := db.setAppDefaults(); err != nil {
 		return "", err
 	}
-	if h, err := f.maybeCheckStoreForApp(app); h != "" || err != nil {
+	if h, err := f.maybeCheckStoreForApp(db); h != "" || err != nil {
 		return h, err
 	}
-	if h, err := f.maybeFetchImageFromRemote(app, a); h != "" || err != nil {
+	if h, err := f.maybeFetchImageFromRemote(db, a); h != "" || err != nil {
 		return h, err
 	}
-	return "", fmt.Errorf("unable to fetch image from image name %q: either image was not found in the store or store was disabled and fetching from remote yielded nothing or it was disabled", name)
+	return "", fmt.Errorf("unable to fetch image from image name %q: either image was not found in the store or store was disabled and fetching from remote yielded nothing or it was disabled", db.image)
 }
 
-func (f *Fetcher) maybeCheckStoreForApp(app *appBundle) (string, error) {
+func (f *Fetcher) maybeCheckStoreForApp(db *distBundle) (string, error) {
 	if !f.NoStore {
-		key, err := f.getStoreKeyFromApp(app)
+		key, err := f.getStoreKeyFromApp(db)
 		if err == nil {
-			diag.Printf("using image from local store for image name %s", app.Str)
+			diag.Printf("using image from local store for image name %s", db.image)
 			return key, nil
 		}
 		switch err.(type) {
@@ -300,25 +329,27 @@ func (f *Fetcher) maybeCheckStoreForApp(app *appBundle) (string, error) {
 	return "", nil
 }
 
-func (f *Fetcher) getStoreKeyFromApp(app *appBundle) (string, error) {
-	labels, err := types.LabelsFromMap(app.App.Labels)
+func (f *Fetcher) getStoreKeyFromApp(db *distBundle) (string, error) {
+	app := db.dist.(*dist.Appc).App()
+	labels, err := types.LabelsFromMap(app.Labels)
 	if err != nil {
-		return "", errwrap.Wrap(fmt.Errorf("invalid labels in the name %q", app.Str), err)
+		return "", errwrap.Wrap(fmt.Errorf("invalid labels in the name %q", db.image), err)
 	}
-	key, err := f.S.GetACI(app.App.Name, labels)
+	key, err := f.S.GetACI(app.Name, labels)
 	if err != nil {
 		switch err.(type) {
 		case imagestore.ACINotFoundError:
 			return "", err
 		default:
-			return "", errwrap.Wrap(fmt.Errorf("cannot find image %q", app.Str), err)
+			return "", errwrap.Wrap(fmt.Errorf("cannot find image %q", db.image), err)
 		}
 	}
 	return key, nil
 }
 
-func (f *Fetcher) maybeFetchImageFromRemote(app *appBundle, a *asc) (string, error) {
+func (f *Fetcher) maybeFetchImageFromRemote(db *distBundle, a *asc) (string, error) {
 	if !f.StoreOnly {
+		app := db.dist.(*dist.Appc).App()
 		nf := &nameFetcher{
 			InsecureFlags:      f.InsecureFlags,
 			S:                  f.S,
@@ -328,7 +359,7 @@ func (f *Fetcher) maybeFetchImageFromRemote(app *appBundle, a *asc) (string, err
 			Headers:            f.Headers,
 			TrustKeysFromHTTPS: f.TrustKeysFromHTTPS,
 		}
-		return nf.Hash(app.App, a)
+		return nf.Hash(app, a)
 	}
 	return "", nil
 }
diff --git a/rkt/image/finder.go b/rkt/image/finder.go
index 0cddd11845..7abd33df49 100644
--- a/rkt/image/finder.go
+++ b/rkt/image/finder.go
@@ -30,7 +30,7 @@ type Finder action
 // FindImages uses FindImage to attain a list of image hashes
 func (f *Finder) FindImages(al *apps.Apps) error {
 	return al.Walk(func(app *apps.App) error {
-		h, err := f.FindImage(app.Image, app.Asc, app.ImType)
+		h, err := f.FindImage(app.Image, app.Asc)
 		if err != nil {
 			return err
 		}
@@ -42,27 +42,29 @@ func (f *Finder) FindImages(al *apps.Apps) error {
 // FindImage tries to get a hash of a passed image, ideally from
 // store. Otherwise this might involve fetching it from remote with
 // the Fetcher.
-func (f *Finder) FindImage(img string, asc string, imgType apps.AppImageType) (*types.Hash, error) {
+func (f *Finder) FindImage(img string, asc string) (*types.Hash, error) {
 	ensureLogger(f.Debug)
-	if imgType == apps.AppImageGuess {
-		imgType = guessImageType(img)
+
+	// Check if it's an hash
+	if _, err := types.NewHash(img); err == nil {
+		h, err := f.getHashFromStore(img)
+		if err != nil {
+			return nil, err
+		}
+		return h, nil
 	}
 
-	if imgType == apps.AppImageHash {
-		return f.getHashFromStore(img)
+	d, err := DistFromImageString(img)
+	if err != nil {
+		return nil, err
 	}
 
 	// urls, names, paths have to be fetched, potentially remotely
 	ft := (*Fetcher)(f)
-	key, err := ft.FetchImage(img, asc, imgType)
+	h, err := ft.FetchImage(d, img, asc)
 	if err != nil {
 		return nil, err
 	}
-	h, err := types.NewHash(key)
-	if err != nil {
-		// should never happen
-		log.PanicE("got an invalid hash from the store, looks like it is corrupted", err)
-	}
 	return h, nil
 }
 
diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index c2dd156568..dc048874aa 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -22,7 +22,6 @@ import (
 	"strings"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common/apps"
 	"github.com/coreos/rkt/rkt/config"
 	"github.com/coreos/rkt/rkt/image"
 	"github.com/coreos/rkt/store/imagestore"
@@ -244,31 +243,15 @@ func getStage1HashFromFlag(s *imagestore.Store, ts *treestore.Store, loc stage1I
 		return nil, err
 	}
 
-	imgType := apps.AppImageGuess
 	switch loc.kind {
-	case stage1ImageLocationURL:
-		imgType = apps.AppImageURL
+	case stage1ImageLocationURL, stage1ImageLocationPath, stage1ImageLocationFromDir:
 		if trustedLocation {
 			withKeystore = false
 		}
-	case stage1ImageLocationPath:
-		imgType = apps.AppImagePath
-		if trustedLocation {
-			withKeystore = false
-		}
-	case stage1ImageLocationName:
-		imgType = apps.AppImageName
-	case stage1ImageLocationHash:
-		imgType = apps.AppImageHash
-	case stage1ImageLocationFromDir:
-		if trustedLocation {
-			withKeystore = false
-		}
-		imgType = apps.AppImagePath
 	}
 
 	fn := getStage1Finder(s, ts, withKeystore)
-	return fn.FindImage(location, "", imgType)
+	return fn.FindImage(location, "")
 }
 
 func getStage1DataFromConfig(c *config.Config) (string, string, string) {
@@ -320,7 +303,7 @@ func getConfiguredStage1Hash(s *imagestore.Store, ts *treestore.Store, imgRef, i
 	fn := getStage1Finder(s, ts, !trusted)
 	if !strings.HasSuffix(imgRef, "-dirty") {
 		fn.StoreOnly = true
-		if hash, err := fn.FindImage(imgRef, "", apps.AppImageName); err == nil {
+		if hash, err := fn.FindImage(imgRef, ""); err == nil {
 			return hash, nil
 		}
 		fn.StoreOnly = false
@@ -331,7 +314,7 @@ func getConfiguredStage1Hash(s *imagestore.Store, ts *treestore.Store, imgRef, i
 	// If imgLoc is not an absolute path, then it is a URL
 	imgLocIsURL := imgLoc != "" && !filepath.IsAbs(imgLoc)
 	if imgLocIsURL {
-		return fn.FindImage(imgLoc, "", apps.AppImageURL)
+		return fn.FindImage(imgLoc, "")
 	}
 	return getStage1HashFromPath(fn, imgLoc, imgFileName)
 }
@@ -359,7 +342,7 @@ func getStage1HashFromPath(fn *image.Finder, imgLoc, imgFileName string) (*types
 	var fetchErr error
 	var fallbackErr error
 	if imgLoc != "" {
-		hash, err := fn.FindImage(imgLoc, "", apps.AppImagePath)
+		hash, err := fn.FindImage(imgLoc, "")
 		if err == nil {
 			return hash, nil
 		}
@@ -374,7 +357,7 @@ func getStage1HashFromPath(fn *image.Finder, imgLoc, imgFileName string) (*types
 			fn.Ks = nil
 			rktDir := filepath.Dir(exePath)
 			imgPath := filepath.Join(rktDir, imgFileName)
-			hash, err := fn.FindImage(imgPath, "", apps.AppImagePath)
+			hash, err := fn.FindImage(imgPath, "")
 			if err == nil {
 				return hash, nil
 			}
diff --git a/store/imagestore/store.go b/store/imagestore/store.go
index 35605de33c..31066baade 100644
--- a/store/imagestore/store.go
+++ b/store/imagestore/store.go
@@ -78,7 +78,9 @@ type ACINotFoundError struct {
 }
 
 func (e ACINotFoundError) Error() string {
-	return fmt.Sprintf("cannot find aci satisfying name: %q and labels: %s in the local store", e.name, labelsToString(e.labels))
+	return fmt.Sprintf(
+		"cannot find aci satisfying name: %q and labels: %q in the local store",
+		e.name, e.labels)
 }
 
 // StoreRemovalError defines an error removing a non transactional store (like
diff --git a/store/imagestore/utils.go b/store/imagestore/utils.go
index f98c2c6754..f4473037c9 100644
--- a/store/imagestore/utils.go
+++ b/store/imagestore/utils.go
@@ -17,7 +17,6 @@ package imagestore
 import (
 	"fmt"
 	"net/url"
-	"sort"
 	"strings"
 
 	"github.com/appc/spec/schema/types"
@@ -56,24 +55,3 @@ func getLabelPriority(name types.ACIdentifier) int {
 	}
 	return len(labelsPriority) + 1
 }
-
-// labelsSlice implements sort.Interface for types.Labels
-type labelsSlice types.Labels
-
-func (p labelsSlice) Len() int { return len(p) }
-func (p labelsSlice) Less(i, j int) bool {
-	return getLabelPriority(p[i].Name) < getLabelPriority(p[j].Name)
-}
-func (p labelsSlice) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
-
-func labelsToString(inLabels types.Labels) string {
-	// take a copy to avoid changing the original slice
-	labels := append(types.Labels(nil), inLabels...)
-	sort.Sort(labelsSlice(labels))
-
-	var out []string
-	for _, l := range labels {
-		out = append(out, fmt.Sprintf("%q:%q", l.Name, l.Value))
-	}
-	return "[" + strings.Join(out, ", ") + "]"
-}
diff --git a/store/imagestore/utils_test.go b/store/imagestore/utils_test.go
deleted file mode 100644
index 0ca7651547..0000000000
--- a/store/imagestore/utils_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package imagestore
-
-import (
-	"testing"
-
-	"github.com/appc/spec/schema/types"
-)
-
-func TestLabelsToString(t *testing.T) {
-	tests := []struct {
-		labels types.Labels
-		out    string
-	}{
-		{types.Labels{}, `[]`},
-		{[]types.Label{{"label1", "value1"}}, `["label1":"value1"]`},
-		{[]types.Label{{"label1", "value1"}, {"version", "2.1.1"}}, `["version":"2.1.1", "label1":"value1"]`},
-		{[]types.Label{{"arch", "amd64"}, {"label1", "value1"}, {"os", "linux"}, {"version", "2.1.1"}}, `["version":"2.1.1", "os":"linux", "arch":"amd64", "label1":"value1"]`},
-	}
-
-	for i, tt := range tests {
-		out := labelsToString(tt.labels)
-		if out != tt.out {
-			t.Errorf("#%d: got %v, want %v", i, out, tt.out)
-		}
-	}
-}
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 500c3016b5..66421c659f 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -313,7 +313,7 @@ func TestResumedFetch(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	cmd := fmt.Sprintf("%s --no-store --insecure-options=image fetch %s", ctx.Cmd(), server.URL)
+	cmd := fmt.Sprintf("%s --no-store --insecure-options=image fetch %s", ctx.Cmd(), server.URL+"/image.aci")
 	child := spawnOrFail(t, cmd)
 	<-kill
 	err := child.Close()
@@ -354,7 +354,7 @@ func TestResumedFetchInvalidCache(t *testing.T) {
 	// Fetch the first half of the image, and kill rkt once it reaches halfway.
 	server := httptest.NewServer(testServerHandler(t, shouldInterrupt, imagePath, kill, reportkill))
 	defer server.Close()
-	cmd := fmt.Sprintf("%s --no-store --insecure-options=image fetch %s", ctx.Cmd(), server.URL)
+	cmd := fmt.Sprintf("%s --no-store --insecure-options=image fetch %s", ctx.Cmd(), server.URL+"/image.aci")
 	child := spawnOrFail(t, cmd)
 	<-kill
 	err := child.Close()
diff --git a/tests/rkt_stage1_loading_test.go b/tests/rkt_stage1_loading_test.go
index 5e5383b8f3..95bb3a32ff 100644
--- a/tests/rkt_stage1_loading_test.go
+++ b/tests/rkt_stage1_loading_test.go
@@ -308,8 +308,8 @@ func TestStage1LoadingFromFlags(t *testing.T) {
 		// --stage1-path with a relative path
 		{
 			flag:              fmt.Sprintf("--stage1-path=%q", setup.getLocation(stubStage1PathRel)),
-			expectedFirstRun:  fmt.Sprintf("image: using image from file %s", setup.getLocation(stubStage1PathRel)),
-			expectedSecondRun: fmt.Sprintf("image: using image from file %s", setup.getLocation(stubStage1PathRel)),
+			expectedFirstRun:  fmt.Sprintf("image: using image from file %s", setup.getLocation(stubStage1PathAbs)),
+			expectedSecondRun: fmt.Sprintf("image: using image from file %s", setup.getLocation(stubStage1PathAbs)),
 		},
 
 		// --stage1-path with an absolute path

From e339ef3a5e7979968f59bce53e2ae47429deaf7a Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 15 Nov 2016 12:54:55 +0100
Subject: [PATCH 0894/1304] rkt/image: fix appc names without a slash '/' in
 their name

Currently if the user specifies an app name like "app-name:v1.0" it
won't be recognized because "app-name" is treated like an unknown URL
scheme.

This fixes it by assuming that unknown URL schemes imply appc images.

Fixes #3326
---
 pkg/distribution/appc.go |  1 -
 rkt/image/common.go      |  4 +++-
 rkt/image/common_test.go | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkg/distribution/appc.go b/pkg/distribution/appc.go
index b4c2cc89d9..cf4f4c4de1 100644
--- a/pkg/distribution/appc.go
+++ b/pkg/distribution/appc.go
@@ -120,7 +120,6 @@ func NewAppcFromApp(app *discovery.App) Distribution {
 	}
 }
 
-// URI returns a copy of the Distribution URI
 func (a *Appc) CIMD() *url.URL {
 	// Create a copy of the URL
 	u, err := url.Parse(a.cimd.String())
diff --git a/rkt/image/common.go b/rkt/image/common.go
index a1d88750ac..c3f4ef7884 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -142,7 +142,7 @@ func DistFromImageString(is string) (dist.Distribution, error) {
 	// file:///full/path/to/aci/file.aci -> archive:aci:file%3A%2F%2F%2Ffull%2Fpath%2Fto%2Faci%2Ffile.aci
 	switch u.Scheme {
 	case "":
-		// no scheme given, hence should be an appc image path
+		// no scheme given, hence it is an appc image name or path
 		appImageType := guessAppcOrPath(is, []string{schema.ACIExtension})
 
 		switch appImageType {
@@ -187,6 +187,8 @@ func DistFromImageString(is string) (dist.Distribution, error) {
 			return nil, fmt.Errorf("docker distribution creation error: %v", err)
 		}
 		return dist, nil
+	case dist.Scheme: // cimd
+		return dist.Parse(is)
 	default:
 		// any other scheme is a an appc image name, i.e. "my-app:v1.0"
 		app, err := discovery.NewAppFromString(is)
diff --git a/rkt/image/common_test.go b/rkt/image/common_test.go
index 86e142d40b..22420d6777 100644
--- a/rkt/image/common_test.go
+++ b/rkt/image/common_test.go
@@ -200,6 +200,21 @@ func TestDistFromImageString(t *testing.T) {
 			"cimd:appc:v=0:example.com/app01?label01=%3F%26%2A%2F&version=v1.0.0",
 			nil,
 		},
+		{
+			"some-image-name",
+			"cimd:appc:v=0:some-image-name",
+			nil,
+		},
+		{
+			"some-image-name:v1.0.0",
+			"cimd:appc:v=0:some-image-name?version=v1.0.0",
+			nil,
+		},
+		{
+			"some-image-name:f6432b725a9a5f27eaecfa47a0cbab3c0ea00f22",
+			"cimd:appc:v=0:some-image-name?version=f6432b725a9a5f27eaecfa47a0cbab3c0ea00f22",
+			nil,
+		},
 		// ACIArchive
 		{
 			"file:///absolute/path/to/file.aci",

From 717efb08767fda045a98b1e6357578f30576b8a2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 22 Nov 2016 13:16:28 +0000
Subject: [PATCH 0895/1304] tests: fix no-new-privs test on recent systemd

Systemd (v232+) provides multiple security features which automatically
set the no-new-privs bit to prevent bypass.
This commit opts-out paths protection, in order to test rkt no-new-privs
feature.
---
 tests/rkt_no_new_privs_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_no_new_privs_test.go b/tests/rkt_no_new_privs_test.go
index 9a1434e60a..2f4920bfa6 100644
--- a/tests/rkt_no_new_privs_test.go
+++ b/tests/rkt_no_new_privs_test.go
@@ -80,7 +80,7 @@ func TestNoNewPrivileges(t *testing.T) {
 			)
 
 			rktCmd := fmt.Sprintf(
-				"%s --debug --insecure-options=image run %s %s",
+				"%s --debug --insecure-options=image,paths run %s %s",
 				ctx.Cmd(),
 				image,
 				rktParams,

From cd5a41e1f80b7a750933553acfd7a34eee0cfa95 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thipp@suse.de>
Date: Tue, 22 Nov 2016 16:39:19 +0100
Subject: [PATCH 0896/1304] glide: bump gopsutil to v2.16.10

This new version includes fixes for ppc64le which prevent rkt from
failing at build time on this platform.

Signed-off-by: Thomas Hipp <thipp@suse.de>
---
 glide.lock                                    |   6 +-
 glide.yaml                                    |   2 +-
 vendor/github.com/shirou/gopsutil/LICENSE     |  34 +++
 vendor/github.com/shirou/gopsutil/cpu/cpu.go  |  83 ++++++
 .../shirou/gopsutil/cpu/cpu_darwin.go         |   4 +-
 .../shirou/gopsutil/cpu/cpu_darwin_cgo.go     |   4 +-
 .../shirou/gopsutil/cpu/cpu_freebsd.go        |  57 ++--
 .../shirou/gopsutil/cpu/cpu_linux.go          |  66 +++--
 .../shirou/gopsutil/cpu/cpu_unix.go           |  90 ------
 .../shirou/gopsutil/cpu/cpu_windows.go        |  19 --
 .../github.com/shirou/gopsutil/host/host.go   |  13 +-
 .../shirou/gopsutil/host/host_darwin.go       |  34 ++-
 .../shirou/gopsutil/host/host_freebsd.go      |  13 +
 .../shirou/gopsutil/host/host_linux.go        |  44 ++-
 .../shirou/gopsutil/host/host_windows.go      |   6 +-
 .../shirou/gopsutil/internal/common/common.go |   4 +-
 .../gopsutil/internal/common/common_linux.go  |  40 +++
 vendor/github.com/shirou/gopsutil/mem/mem.go  |   8 +-
 .../shirou/gopsutil/mem/mem_linux.go          |  10 +-
 vendor/github.com/shirou/gopsutil/net/net.go  |  15 +-
 .../shirou/gopsutil/net/net_darwin.go         | 263 ++++++++++++++----
 .../shirou/gopsutil/net/net_linux.go          |  55 ++++
 .../shirou/gopsutil/net/net_windows.go        |  61 ++--
 .../shirou/gopsutil/process/process_darwin.go |  30 +-
 .../shirou/gopsutil/process/process_linux.go  |  12 +-
 .../gopsutil/process/process_linux_386.go     |   9 -
 .../gopsutil/process/process_linux_amd64.go   |   9 -
 .../gopsutil/process/process_linux_arm.go     |   9 -
 .../gopsutil/process/process_linux_arm64.go   |   9 -
 .../gopsutil/process/process_windows.go       |  17 +-
 30 files changed, 694 insertions(+), 332 deletions(-)
 delete mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go
 delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux_386.go
 delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux_amd64.go
 delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux_arm.go
 delete mode 100644 vendor/github.com/shirou/gopsutil/process/process_linux_arm64.go

diff --git a/glide.lock b/glide.lock
index 026a553b3d..8d37b5239a 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: a35f3c5403e592b061fc61292c9d690d5a4779d014fcd632315e4560b7a9c3e7
-updated: 2016-11-21T09:45:33.766283869+01:00
+hash: 9c5ba5b4d8b105b7abb52deedfdc16c33f0e0449cbb130202dac3cf2bed88748
+updated: 2016-11-22T16:37:00.043435766+01:00
 imports:
 - name: github.com/appc/docker2aci
   version: 64543c1e0a7306b17d0d214549ec08049b234abc
@@ -214,7 +214,7 @@ imports:
 - name: github.com/russross/blackfriday
   version: 300106c228d52c8941d4b3de6054a6062a86dda3
 - name: github.com/shirou/gopsutil
-  version: 22a03b5be3f384f558742929065778aa26471033
+  version: 1516eb9ddc5e61ba58874047a98f8b44b5e585e8
   subpackages:
   - cpu
   - host
diff --git a/glide.yaml b/glide.yaml
index c08f62eab8..a5f66f2be9 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -181,7 +181,7 @@ import:
 - package: github.com/russross/blackfriday
   version: 300106c228d52c8941d4b3de6054a6062a86dda3
 - package: github.com/shirou/gopsutil
-  version: v2.1
+  version: v2.16.10
   subpackages:
   - cpu
   - host
diff --git a/vendor/github.com/shirou/gopsutil/LICENSE b/vendor/github.com/shirou/gopsutil/LICENSE
index 602b2c098e..da71a5e729 100644
--- a/vendor/github.com/shirou/gopsutil/LICENSE
+++ b/vendor/github.com/shirou/gopsutil/LICENSE
@@ -25,3 +25,37 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-------
+internal/common/binary.go in the gopsutil is copied and modifid from golang/encoding/binary.go.
+
+
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu.go b/vendor/github.com/shirou/gopsutil/cpu/cpu.go
index 6f76b764c0..b51e27ff60 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu.go
@@ -2,10 +2,12 @@ package cpu
 
 import (
 	"encoding/json"
+	"fmt"
 	"runtime"
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/shirou/gopsutil/internal/common"
 )
@@ -91,3 +93,84 @@ func (c InfoStat) String() string {
 	s, _ := json.Marshal(c)
 	return string(s)
 }
+
+func getAllBusy(t TimesStat) (float64, float64) {
+	busy := t.User + t.System + t.Nice + t.Iowait + t.Irq +
+		t.Softirq + t.Steal + t.Guest + t.GuestNice + t.Stolen
+	return busy + t.Idle, busy
+}
+
+func calculateBusy(t1, t2 TimesStat) float64 {
+	t1All, t1Busy := getAllBusy(t1)
+	t2All, t2Busy := getAllBusy(t2)
+
+	if t2Busy <= t1Busy {
+		return 0
+	}
+	if t2All <= t1All {
+		return 1
+	}
+	return (t2Busy - t1Busy) / (t2All - t1All) * 100
+}
+
+func calculateAllBusy(t1, t2 []TimesStat) ([]float64, error) {
+	// Make sure the CPU measurements have the same length.
+	if len(t1) != len(t2) {
+		return nil, fmt.Errorf(
+			"received two CPU counts: %d != %d",
+			len(t1), len(t2),
+		)
+	}
+
+	ret := make([]float64, len(t1))
+	for i, t := range t2 {
+		ret[i] = calculateBusy(t1[i], t)
+	}
+	return ret, nil
+}
+
+//Percent calculates the percentage of cpu used either per CPU or combined.
+//If an interval of 0 is given it will compare the current cpu times against the last call.
+func Percent(interval time.Duration, percpu bool) ([]float64, error) {
+	if interval <= 0 {
+		return percentUsedFromLastCall(percpu)
+	}
+
+	// Get CPU usage at the start of the interval.
+	cpuTimes1, err := Times(percpu)
+	if err != nil {
+		return nil, err
+	}
+
+	time.Sleep(interval)
+
+	// And at the end of the interval.
+	cpuTimes2, err := Times(percpu)
+	if err != nil {
+		return nil, err
+	}
+
+	return calculateAllBusy(cpuTimes1, cpuTimes2)
+}
+
+func percentUsedFromLastCall(percpu bool) ([]float64, error) {
+	cpuTimes, err := Times(percpu)
+	if err != nil {
+		return nil, err
+	}
+	lastCPUPercent.Lock()
+	defer lastCPUPercent.Unlock()
+	var lastTimes []TimesStat
+	if percpu {
+		lastTimes = lastCPUPercent.lastPerCPUTimes
+		lastCPUPercent.lastPerCPUTimes = cpuTimes
+	} else {
+		lastTimes = lastCPUPercent.lastCPUTimes
+		lastCPUPercent.lastCPUTimes = cpuTimes
+	}
+
+	if lastTimes == nil {
+		return nil, fmt.Errorf("Error getting times for cpu percent. LastTimes was nil")
+	}
+	return calculateAllBusy(lastTimes, cpuTimes)
+}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
index 4cb1d8ca88..af27e620e1 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
@@ -96,11 +96,11 @@ func Info() ([]InfoStat, error) {
 	}
 
 	values := strings.Fields(string(out))
-	mhz, err := strconv.ParseFloat(values[1], 64)
+	hz, err := strconv.ParseFloat(values[1], 64)
 	if err != nil {
 		return ret, err
 	}
-	c.Mhz = mhz / 1000000.0
+	c.Mhz = hz / 1000000.0
 
 	return append(ret, c), nil
 }
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
index d38dd627ed..6b813d78e3 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
@@ -84,9 +84,11 @@ func perCPUTimes() ([]TimesStat, error) {
 }
 
 func allCPUTimes() ([]TimesStat, error) {
-	var count C.mach_msg_type_number_t = C.HOST_CPU_LOAD_INFO_COUNT
+	var count C.mach_msg_type_number_t
 	var cpuload C.host_cpu_load_info_data_t
 
+	count = C.HOST_CPU_LOAD_INFO_COUNT
+
 	status := C.host_statistics(C.host_t(C.mach_host_self()),
 		C.HOST_CPU_LOAD_INFO,
 		C.host_info_t(unsafe.Pointer(&cpuload)),
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
index 2f8d3ace1d..edc962788e 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
@@ -1,5 +1,3 @@
-// +build freebsd
-
 package cpu
 
 import (
@@ -99,29 +97,46 @@ func Times(percpu bool) ([]TimesStat, error) {
 	return ret, nil
 }
 
-// Returns only one CPUInfoStat on FreeBSD
+// Returns only one InfoStat on FreeBSD.  The information regarding core
+// count, however is accurate and it is assumed that all InfoStat attributes
+// are the same across CPUs.
 func Info() ([]InfoStat, error) {
-	filename := "/var/run/dmesg.boot"
-	lines, _ := common.ReadLines(filename)
-
-	var ret []InfoStat
+	const dmesgBoot = "/var/run/dmesg.boot"
+	lines, _ := common.ReadLines(dmesgBoot)
 
 	c := InfoStat{}
+	var vals []string
+	var err error
+	if vals, err = common.DoSysctrl("hw.clockrate"); err != nil {
+		return nil, err
+	}
+	if c.Mhz, err = strconv.ParseFloat(vals[0], 64); err != nil {
+		return nil, fmt.Errorf("Unable to parse FreeBSD CPU clock rate: %v", err)
+	}
+	c.CPU = int32(c.Mhz)
+
+	if vals, err = common.DoSysctrl("hw.ncpu"); err != nil {
+		return nil, err
+	}
+	var i64 int64
+	if i64, err = strconv.ParseInt(vals[0], 10, 32); err != nil {
+		return nil, fmt.Errorf("Unable to parse FreeBSD cores: %v", err)
+	}
+	c.Cores = int32(i64)
+
+	if vals, err = common.DoSysctrl("hw.model"); err != nil {
+		return nil, err
+	}
+	c.ModelName = strings.Join(vals, " ")
+
 	for _, line := range lines {
-		if matches := regexp.MustCompile(`CPU:\s+(.+) \(([\d.]+).+\)`).FindStringSubmatch(line); matches != nil {
-			c.ModelName = matches[1]
-			t, err := strconv.ParseFloat(matches[2], 64)
-			if err != nil {
-				return ret, nil
-			}
-			c.Mhz = t
-		} else if matches := regexp.MustCompile(`Origin = "(.+)"  Id = (.+)  Family = (.+)  Model = (.+)  Stepping = (.+)`).FindStringSubmatch(line); matches != nil {
+		if matches := regexp.MustCompile(`Origin\s*=\s*"(.+)"\s+Id\s*=\s*(.+)\s+Family\s*=\s*(.+)\s+Model\s*=\s*(.+)\s+Stepping\s*=\s*(.+)`).FindStringSubmatch(line); matches != nil {
 			c.VendorID = matches[1]
 			c.Family = matches[3]
 			c.Model = matches[4]
 			t, err := strconv.ParseInt(matches[5], 10, 32)
 			if err != nil {
-				return ret, nil
+				return nil, fmt.Errorf("Unable to parse FreeBSD CPU stepping information from %q: %v", line, err)
 			}
 			c.Stepping = int32(t)
 		} else if matches := regexp.MustCompile(`Features=.+<(.+)>`).FindStringSubmatch(line); matches != nil {
@@ -132,16 +147,8 @@ func Info() ([]InfoStat, error) {
 			for _, v := range strings.Split(matches[1], ",") {
 				c.Flags = append(c.Flags, strings.ToLower(v))
 			}
-		} else if matches := regexp.MustCompile(`Logical CPUs per core: (\d+)`).FindStringSubmatch(line); matches != nil {
-			// FIXME: no this line?
-			t, err := strconv.ParseInt(matches[1], 10, 32)
-			if err != nil {
-				return ret, nil
-			}
-			c.Cores = int32(t)
 		}
-
 	}
 
-	return append(ret, c), nil
+	return []InfoStat{c}, nil
 }
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
index 6df542bdb8..1979ebc59e 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
@@ -65,22 +65,39 @@ func sysCPUPath(cpu int32, relPath string) string {
 }
 
 func finishCPUInfo(c *InfoStat) error {
-	if c.Mhz == 0 {
-		lines, err := common.ReadLines(sysCPUPath(c.CPU, "cpufreq/cpuinfo_max_freq"))
-		if err == nil {
-			value, err := strconv.ParseFloat(lines[0], 64)
-			if err != nil {
-				return err
-			}
-			c.Mhz = value
-		}
-	}
+	var lines []string
+	var err error
+	var value float64
+
 	if len(c.CoreID) == 0 {
-		lines, err := common.ReadLines(sysCPUPath(c.CPU, "topology/coreId"))
+		lines, err = common.ReadLines(sysCPUPath(c.CPU, "topology/core_id"))
 		if err == nil {
 			c.CoreID = lines[0]
 		}
 	}
+
+	// override the value of c.Mhz with cpufreq/cpuinfo_max_freq regardless
+	// of the value from /proc/cpuinfo because we want to report the maximum
+	// clock-speed of the CPU for c.Mhz, matching the behaviour of Windows
+	lines, err = common.ReadLines(sysCPUPath(c.CPU, "cpufreq/cpuinfo_max_freq"))
+	// if we encounter errors below but has a value from parsing /proc/cpuinfo
+	// then we ignore the error
+	if err != nil {
+		if c.Mhz == 0 {
+			return err
+		} else {
+			return nil
+		}
+	}
+	value, err = strconv.ParseFloat(lines[0], 64)
+	if err != nil {
+		if c.Mhz == 0 {
+			return err
+		} else {
+			return nil
+		}
+	}
+	c.Mhz = value/1000.0  // value is in kHz
 	return nil
 }
 
@@ -127,20 +144,31 @@ func Info() ([]InfoStat, error) {
 			c.Family = value
 		case "model":
 			c.Model = value
-		case "model name":
+		case "model name", "cpu":
 			c.ModelName = value
-		case "stepping":
-			t, err := strconv.ParseInt(value, 10, 64)
+			if strings.Contains(value, "POWER8") ||
+			   strings.Contains(value, "POWER7") {
+				c.Model = strings.Split(value, " ")[0]
+				c.Family = "POWER"
+				c.VendorID = "IBM"
+			}
+		case "stepping", "revision":
+			val := value
+
+			if key == "revision" {
+				val = strings.Split(value, ".")[0]
+			}
+
+			t, err := strconv.ParseInt(val, 10, 64)
 			if err != nil {
 				return ret, err
 			}
 			c.Stepping = int32(t)
-		case "cpu MHz":
-			t, err := strconv.ParseFloat(value, 64)
-			if err != nil {
-				return ret, err
+		case "cpu MHz", "clock":
+			// treat this as the fallback value, thus we ignore error
+			if t, err := strconv.ParseFloat(strings.Replace(value, "MHz", "", 1), 64); err == nil {
+				c.Mhz = t
 			}
-			c.Mhz = t
 		case "cache size":
 			t, err := strconv.ParseInt(strings.Replace(value, " KB", "", 1), 10, 64)
 			if err != nil {
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go
deleted file mode 100644
index 0ed7d62ad8..0000000000
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_unix.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// +build linux freebsd darwin
-
-package cpu
-
-import (
-	"fmt"
-	"time"
-)
-
-func getAllBusy(t TimesStat) (float64, float64) {
-	busy := t.User + t.System + t.Nice + t.Iowait + t.Irq +
-		t.Softirq + t.Steal + t.Guest + t.GuestNice + t.Stolen
-	return busy + t.Idle, busy
-}
-
-func calculateBusy(t1, t2 TimesStat) float64 {
-	t1All, t1Busy := getAllBusy(t1)
-	t2All, t2Busy := getAllBusy(t2)
-
-	if t2Busy <= t1Busy {
-		return 0
-	}
-	if t2All <= t1All {
-		return 1
-	}
-	return (t2Busy - t1Busy) / (t2All - t1All) * 100
-}
-
-func calculateAllBusy(t1, t2 []TimesStat) ([]float64, error) {
-	// Make sure the CPU measurements have the same length.
-	if len(t1) != len(t2) {
-		return nil, fmt.Errorf(
-			"received two CPU counts: %d != %d",
-			len(t1), len(t2),
-		)
-	}
-
-	ret := make([]float64, len(t1))
-	for i, t := range t2 {
-		ret[i] = calculateBusy(t1[i], t)
-	}
-	return ret, nil
-}
-
-//Percent calculates the percentage of cpu used either per CPU or combined.
-//If an interval of 0 is given it will compare the current cpu times against the last call.
-func Percent(interval time.Duration, percpu bool) ([]float64, error) {
-	if interval <= 0 {
-		return percentUsedFromLastCall(percpu)
-	}
-
-	// Get CPU usage at the start of the interval.
-	cpuTimes1, err := Times(percpu)
-	if err != nil {
-		return nil, err
-	}
-
-	time.Sleep(interval)
-
-	// And at the end of the interval.
-	cpuTimes2, err := Times(percpu)
-	if err != nil {
-		return nil, err
-	}
-
-	return calculateAllBusy(cpuTimes1, cpuTimes2)
-}
-
-func percentUsedFromLastCall(percpu bool) ([]float64, error) {
-	cpuTimes, err := Times(percpu)
-	if err != nil {
-		return nil, err
-	}
-	lastCPUPercent.Lock()
-	defer lastCPUPercent.Unlock()
-	var lastTimes []TimesStat
-	if percpu {
-		lastTimes = lastCPUPercent.lastPerCPUTimes
-		lastCPUPercent.lastPerCPUTimes = cpuTimes
-	} else {
-		lastTimes = lastCPUPercent.lastCPUTimes
-		lastCPUPercent.lastCPUTimes = cpuTimes
-	}
-
-	if lastTimes == nil {
-		return nil, fmt.Errorf("Error getting times for cpu percent. LastTimes was nil")
-	}
-	return calculateAllBusy(lastTimes, cpuTimes)
-
-}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go
index fbd25e6057..a32d2419af 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go
@@ -5,7 +5,6 @@ package cpu
 import (
 	"fmt"
 	"syscall"
-	"time"
 	"unsafe"
 
 	"github.com/StackExchange/wmi"
@@ -85,21 +84,3 @@ func Info() ([]InfoStat, error) {
 
 	return ret, nil
 }
-
-func Percent(interval time.Duration, percpu bool) ([]float64, error) {
-	var ret []float64
-	var dst []Win32_Processor
-	q := wmi.CreateQuery(&dst, "")
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return ret, err
-	}
-	for _, l := range dst {
-		// use range but windows can only get one percent.
-		if l.LoadPercentage == nil {
-			continue
-		}
-		ret = append(ret, float64(*l.LoadPercentage))
-	}
-	return ret, nil
-}
diff --git a/vendor/github.com/shirou/gopsutil/host/host.go b/vendor/github.com/shirou/gopsutil/host/host.go
index 1a6545b994..85d4053345 100644
--- a/vendor/github.com/shirou/gopsutil/host/host.go
+++ b/vendor/github.com/shirou/gopsutil/host/host.go
@@ -18,14 +18,15 @@ type InfoStat struct {
 	Hostname             string `json:"hostname"`
 	Uptime               uint64 `json:"uptime"`
 	BootTime             uint64 `json:"bootTime"`
-	Procs                uint64 `json:"procs"`          // number of processes
-	OS                   string `json:"os"`             // ex: freebsd, linux
-	Platform             string `json:"platform"`       // ex: ubuntu, linuxmint
-	PlatformFamily       string `json:"platformFamily"` // ex: debian, rhel
-	PlatformVersion      string `json:"platformVersion"`
+	Procs                uint64 `json:"procs"`           // number of processes
+	OS                   string `json:"os"`              // ex: freebsd, linux
+	Platform             string `json:"platform"`        // ex: ubuntu, linuxmint
+	PlatformFamily       string `json:"platformFamily"`  // ex: debian, rhel
+	PlatformVersion      string `json:"platformVersion"` // version of the complete OS
+	KernelVersion        string `json:"kernelVersion"`   // version of the OS kernel (if available)
 	VirtualizationSystem string `json:"virtualizationSystem"`
 	VirtualizationRole   string `json:"virtualizationRole"` // guest or host
-
+	HostID               string `json:"hostid"`             // ex: uuid
 }
 
 type UserStat struct {
diff --git a/vendor/github.com/shirou/gopsutil/host/host_darwin.go b/vendor/github.com/shirou/gopsutil/host/host_darwin.go
index ec2dc2ce8d..f802e40226 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_darwin.go
@@ -15,6 +15,7 @@ import (
 	"unsafe"
 
 	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/process"
 )
 
 // from utmpx.h
@@ -31,12 +32,14 @@ func Info() (*InfoStat, error) {
 		ret.Hostname = hostname
 	}
 
-	platform, family, version, err := PlatformInformation()
+	platform, family, pver, version, err := PlatformInformation()
 	if err == nil {
 		ret.Platform = platform
 		ret.PlatformFamily = family
-		ret.PlatformVersion = version
+		ret.PlatformVersion = pver
+		ret.KernelVersion = version
 	}
+
 	system, role, err := Virtualization()
 	if err == nil {
 		ret.VirtualizationSystem = system
@@ -49,6 +52,16 @@ func Info() (*InfoStat, error) {
 		ret.Uptime = uptime(boot)
 	}
 
+	procs, err := process.Pids()
+	if err == nil {
+		ret.Procs = uint64(len(procs))
+	}
+
+	values, err := common.DoSysctrl("kern.uuid")
+	if err == nil && len(values) == 1 && values[0] != "" {
+		ret.HostID = values[0]
+	}
+
 	return ret, nil
 }
 
@@ -122,26 +135,37 @@ func Users() ([]UserStat, error) {
 
 }
 
-func PlatformInformation() (string, string, string, error) {
+func PlatformInformation() (string, string, string, string, error) {
 	platform := ""
 	family := ""
 	version := ""
+	pver := ""
 
+	sw_vers, err := exec.LookPath("sw_vers")
+	if err != nil {
+		return "", "", "", "", err
+	}
 	uname, err := exec.LookPath("uname")
 	if err != nil {
-		return "", "", "", err
+		return "", "", "", "", err
 	}
+
 	out, err := invoke.Command(uname, "-s")
 	if err == nil {
 		platform = strings.ToLower(strings.TrimSpace(string(out)))
 	}
 
+	out, err = invoke.Command(sw_vers, "-productVersion")
+	if err == nil {
+		pver = strings.ToLower(strings.TrimSpace(string(out)))
+	}
+
 	out, err = invoke.Command(uname, "-r")
 	if err == nil {
 		version = strings.ToLower(strings.TrimSpace(string(out)))
 	}
 
-	return platform, family, version, nil
+	return platform, family, pver, version, nil
 }
 
 func Virtualization() (string, string, error) {
diff --git a/vendor/github.com/shirou/gopsutil/host/host_freebsd.go b/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
index 30206d2005..b764472868 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
@@ -15,6 +15,7 @@ import (
 	"unsafe"
 
 	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/process"
 )
 
 const (
@@ -39,7 +40,9 @@ func Info() (*InfoStat, error) {
 		ret.Platform = platform
 		ret.PlatformFamily = family
 		ret.PlatformVersion = version
+		ret.KernelVersion = version
 	}
+
 	system, role, err := Virtualization()
 	if err == nil {
 		ret.VirtualizationSystem = system
@@ -52,6 +55,16 @@ func Info() (*InfoStat, error) {
 		ret.Uptime = uptime(boot)
 	}
 
+	procs, err := process.Pids()
+	if err == nil {
+		ret.Procs = uint64(len(procs))
+	}
+
+	values, err := common.DoSysctrl("kern.hostuuid")
+	if err == nil && len(values) == 1 && values[0] != "" {
+		ret.HostID = values[0]
+	}
+
 	return ret, nil
 }
 
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux.go b/vendor/github.com/shirou/gopsutil/host/host_linux.go
index b56cc98a2f..1bae4a0642 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_linux.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	common "github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 type LSB struct {
@@ -44,17 +44,43 @@ func Info() (*InfoStat, error) {
 		ret.PlatformFamily = family
 		ret.PlatformVersion = version
 	}
+	kernelVersion, err := KernelVersion()
+	if err == nil {
+		ret.KernelVersion = kernelVersion
+	}
+
 	system, role, err := Virtualization()
 	if err == nil {
 		ret.VirtualizationSystem = system
 		ret.VirtualizationRole = role
 	}
+
 	boot, err := BootTime()
 	if err == nil {
 		ret.BootTime = boot
 		ret.Uptime = uptime(boot)
 	}
 
+	if numProcs, err := common.NumProcs(); err == nil {
+		ret.Procs = numProcs
+	}
+
+	sysProductUUID := common.HostSys("class/dmi/id/product_uuid")
+	switch {
+	case common.PathExists(sysProductUUID):
+		lines, err := common.ReadLines(sysProductUUID)
+		if err == nil && len(lines) > 0 && lines[0] != "" {
+			ret.HostID = lines[0]
+			break
+		}
+		fallthrough
+	default:
+		values, err := common.DoSysctrl("kernel.random.boot_id")
+		if err == nil && len(values) == 1 && values[0] != "" {
+			ret.HostID = values[0]
+		}
+	}
+
 	return ret, nil
 }
 
@@ -332,6 +358,22 @@ func PlatformInformation() (platform string, family string, version string, err
 
 }
 
+func KernelVersion() (version string, err error) {
+	filename := common.HostProc("sys/kernel/osrelease")
+	if common.PathExists(filename) {
+		contents, err := common.ReadLines(filename)
+		if err != nil {
+			return "", err
+		}
+
+		if len(contents) > 0 {
+			version = contents[0]
+		}
+	}
+
+	return version, nil
+}
+
 func getRedhatishVersion(contents []string) string {
 	c := strings.ToLower(strings.Join(contents, ""))
 
diff --git a/vendor/github.com/shirou/gopsutil/host/host_windows.go b/vendor/github.com/shirou/gopsutil/host/host_windows.go
index 18062dfe55..abf793e5d6 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_windows.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_windows.go
@@ -54,12 +54,10 @@ func Info() (*InfoStat, error) {
 	}
 
 	procs, err := process.Pids()
-	if err != nil {
-		return ret, err
+	if err == nil {
+		ret.Procs = uint64(len(procs))
 	}
 
-	ret.Procs = uint64(len(procs))
-
 	return ret, nil
 }
 
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common.go b/vendor/github.com/shirou/gopsutil/internal/common/common.go
index 42cbaf92a5..f0ea6dd36f 100644
--- a/vendor/github.com/shirou/gopsutil/internal/common/common.go
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common.go
@@ -26,7 +26,7 @@ import (
 
 var (
 	Timeout    = 3 * time.Second
-	TimeoutErr = errors.New("Command timed out.")
+	ErrTimeout = errors.New("Command timed out.")
 )
 
 type Invoker interface {
@@ -338,6 +338,6 @@ func WaitTimeout(c *exec.Cmd, timeout time.Duration) error {
 		}
 		// wait for the command to return after killing it
 		<-done
-		return TimeoutErr
+		return ErrTimeout
 	}
 }
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common_linux.go b/vendor/github.com/shirou/gopsutil/internal/common/common_linux.go
index 0a122e9d6a..9568106fbf 100644
--- a/vendor/github.com/shirou/gopsutil/internal/common/common_linux.go
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common_linux.go
@@ -1,3 +1,43 @@
 // +build linux
 
 package common
+
+import (
+	"os"
+	"os/exec"
+	"strings"
+)
+
+func DoSysctrl(mib string) ([]string, error) {
+	err := os.Setenv("LC_ALL", "C")
+	if err != nil {
+		return []string{}, err
+	}
+	sysctl, err := exec.LookPath("/sbin/sysctl")
+	if err != nil {
+		return []string{}, err
+	}
+	out, err := exec.Command(sysctl, "-n", mib).Output()
+	if err != nil {
+		return []string{}, err
+	}
+	v := strings.Replace(string(out), "{ ", "", 1)
+	v = strings.Replace(string(v), " }", "", 1)
+	values := strings.Fields(string(v))
+
+	return values, nil
+}
+
+func NumProcs() (uint64, error) {
+	f, err := os.Open(HostProc())
+	if err != nil {
+		return 0, err
+	}
+
+	list, err := f.Readdir(-1)
+	defer f.Close()
+	if err != nil {
+		return 0, err
+	}
+	return uint64(len(list)), err
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem.go b/vendor/github.com/shirou/gopsutil/mem/mem.go
index 32558908ae..a6c012387d 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem.go
@@ -48,8 +48,12 @@ type VirtualMemoryStat struct {
 
 	// Linux specific numbers
 	// https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s2-proc-meminfo.html
-	Buffers uint64 `json:"buffers"`
-	Cached  uint64 `json:"cached"`
+	// https://www.kernel.org/doc/Documentation/filesystems/proc.txt
+	Buffers      uint64 `json:"buffers"`
+	Cached       uint64 `json:"cached"`
+	Writeback    uint64 `json:"writeback"`
+	Dirty        uint64 `json:"dirty"`
+	WritebackTmp uint64 `json:"writebacktmp"`
 }
 
 type SwapMemoryStat struct {
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_linux.go b/vendor/github.com/shirou/gopsutil/mem/mem_linux.go
index 899da83dff..31ec3c50cc 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem_linux.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_linux.go
@@ -46,6 +46,12 @@ func VirtualMemory() (*VirtualMemoryStat, error) {
 			ret.Active = t * 1024
 		case "Inactive":
 			ret.Inactive = t * 1024
+		case "Writeback":
+			ret.Writeback = t * 1024
+		case "WritebackTmp":
+			ret.WritebackTmp = t * 1024
+		case "Dirty":
+			ret.Dirty = t * 1024
 		}
 	}
 	if !memavail {
@@ -64,8 +70,8 @@ func SwapMemory() (*SwapMemoryStat, error) {
 		return nil, err
 	}
 	ret := &SwapMemoryStat{
-		Total: uint64(sysinfo.Totalswap),
-		Free:  uint64(sysinfo.Freeswap),
+		Total: uint64(sysinfo.Totalswap) * uint64(sysinfo.Unit),
+		Free:  uint64(sysinfo.Freeswap) * uint64(sysinfo.Unit),
 	}
 	ret.Used = ret.Total - ret.Free
 	//check Infinity
diff --git a/vendor/github.com/shirou/gopsutil/net/net.go b/vendor/github.com/shirou/gopsutil/net/net.go
index 4d120dc7ed..48660ec747 100644
--- a/vendor/github.com/shirou/gopsutil/net/net.go
+++ b/vendor/github.com/shirou/gopsutil/net/net.go
@@ -39,13 +39,14 @@ type Addr struct {
 }
 
 type ConnectionStat struct {
-	Fd     uint32 `json:"fd"`
-	Family uint32 `json:"family"`
-	Type   uint32 `json:"type"`
-	Laddr  Addr   `json:"localaddr"`
-	Raddr  Addr   `json:"remoteaddr"`
-	Status string `json:"status"`
-	Pid    int32  `json:"pid"`
+	Fd     uint32  `json:"fd"`
+	Family uint32  `json:"family"`
+	Type   uint32  `json:"type"`
+	Laddr  Addr    `json:"localaddr"`
+	Raddr  Addr    `json:"remoteaddr"`
+	Status string  `json:"status"`
+	Uids   []int32 `json:"uids"`
+	Pid    int32   `json:"pid"`
 }
 
 // System wide stats about different network protocols
diff --git a/vendor/github.com/shirou/gopsutil/net/net_darwin.go b/vendor/github.com/shirou/gopsutil/net/net_darwin.go
index 78ccb665d3..771736b458 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_darwin.go
@@ -4,95 +4,248 @@ package net
 
 import (
 	"errors"
+	"fmt"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
+)
 
-	"github.com/shirou/gopsutil/internal/common"
+var (
+	errNetstatHeader  = errors.New("Can't parse header of netstat output")
+	netstatLinkRegexp = regexp.MustCompile(`^<Link#(\d+)>$`)
 )
 
-// example of netstat -idbn output on yosemite
+const endOfLine = "\n"
+
+func parseNetstatLine(line string) (stat *IOCountersStat, linkId *uint, err error) {
+	var (
+		numericValue uint64
+		columns      = strings.Fields(line)
+	)
+
+	if columns[0] == "Name" {
+		err = errNetstatHeader
+		return
+	}
+
+	// try to extract the numeric value from <Link#123>
+	if subMatch := netstatLinkRegexp.FindStringSubmatch(columns[2]); len(subMatch) == 2 {
+		numericValue, err = strconv.ParseUint(subMatch[1], 10, 64)
+		if err != nil {
+			return
+		}
+		linkIdUint := uint(numericValue)
+		linkId = &linkIdUint
+	}
+
+	base := 1
+	numberColumns := len(columns)
+	// sometimes Address is ommitted
+	if numberColumns < 12 {
+		base = 0
+	}
+	if numberColumns < 11 || numberColumns > 13 {
+		err = fmt.Errorf("Line %q do have an invalid number of columns %d", line, numberColumns)
+		return
+	}
+
+	parsed := make([]uint64, 0, 7)
+	vv := []string{
+		columns[base+3], // Ipkts == PacketsRecv
+		columns[base+4], // Ierrs == Errin
+		columns[base+5], // Ibytes == BytesRecv
+		columns[base+6], // Opkts == PacketsSent
+		columns[base+7], // Oerrs == Errout
+		columns[base+8], // Obytes == BytesSent
+	}
+	if len(columns) == 12 {
+		vv = append(vv, columns[base+10])
+	}
+
+	for _, target := range vv {
+		if target == "-" {
+			parsed = append(parsed, 0)
+			continue
+		}
+
+		if numericValue, err = strconv.ParseUint(target, 10, 64); err != nil {
+			return
+		}
+		parsed = append(parsed, numericValue)
+	}
+
+	stat = &IOCountersStat{
+		Name:        strings.Trim(columns[0], "*"), // remove the * that sometimes is on right on interface
+		PacketsRecv: parsed[0],
+		Errin:       parsed[1],
+		BytesRecv:   parsed[2],
+		PacketsSent: parsed[3],
+		Errout:      parsed[4],
+		BytesSent:   parsed[5],
+	}
+	if len(parsed) == 7 {
+		stat.Dropout = parsed[6]
+	}
+	return
+}
+
+type netstatInterface struct {
+	linkId *uint
+	stat   *IOCountersStat
+}
+
+func parseNetstatOutput(output string) ([]netstatInterface, error) {
+	var (
+		err   error
+		lines = strings.Split(strings.Trim(output, endOfLine), endOfLine)
+	)
+
+	// number of interfaces is number of lines less one for the header
+	numberInterfaces := len(lines) - 1
+
+	interfaces := make([]netstatInterface, numberInterfaces)
+	// no output beside header
+	if numberInterfaces == 0 {
+		return interfaces, nil
+	}
+
+	for index := 0; index < numberInterfaces; index++ {
+		nsIface := netstatInterface{}
+		if nsIface.stat, nsIface.linkId, err = parseNetstatLine(lines[index+1]); err != nil {
+			return nil, err
+		}
+		interfaces[index] = nsIface
+	}
+	return interfaces, nil
+}
+
+// map that hold the name of a network interface and the number of usage
+type mapInterfaceNameUsage map[string]uint
+
+func newMapInterfaceNameUsage(ifaces []netstatInterface) mapInterfaceNameUsage {
+	output := make(mapInterfaceNameUsage)
+	for index := range ifaces {
+		if ifaces[index].linkId != nil {
+			ifaceName := ifaces[index].stat.Name
+			usage, ok := output[ifaceName]
+			if ok {
+				output[ifaceName] = usage + 1
+			} else {
+				output[ifaceName] = 1
+			}
+		}
+	}
+	return output
+}
+
+func (min mapInterfaceNameUsage) isTruncated() bool {
+	for _, usage := range min {
+		if usage > 1 {
+			return true
+		}
+	}
+	return false
+}
+
+func (min mapInterfaceNameUsage) notTruncated() []string {
+	output := make([]string, 0)
+	for ifaceName, usage := range min {
+		if usage == 1 {
+			output = append(output, ifaceName)
+		}
+	}
+	return output
+}
+
+// example of `netstat -ibdnW` output on yosemite
 // Name  Mtu   Network       Address            Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
 // lo0   16384 <Link#1>                        869107     0  169411755   869107     0  169411755     0   0
 // lo0   16384 ::1/128     ::1                 869107     -  169411755   869107     -  169411755     -   -
 // lo0   16384 127           127.0.0.1         869107     -  169411755   869107     -  169411755     -   -
 func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	var (
+		ret      []IOCountersStat
+		retIndex int
+	)
+
 	netstat, err := exec.LookPath("/usr/sbin/netstat")
 	if err != nil {
 		return nil, err
 	}
+
+	// try to get all interface metrics, and hope there won't be any truncated
 	out, err := invoke.Command(netstat, "-ibdnW")
 	if err != nil {
 		return nil, err
 	}
 
-	lines := strings.Split(string(out), "\n")
-	ret := make([]IOCountersStat, 0, len(lines)-1)
-	exists := make([]string, 0, len(ret))
+	nsInterfaces, err := parseNetstatOutput(string(out))
+	if err != nil {
+		return nil, err
+	}
 
-	for _, line := range lines {
-		values := strings.Fields(line)
-		if len(values) < 1 || values[0] == "Name" {
-			// skip first line
-			continue
-		}
-		if common.StringsHas(exists, values[0]) {
-			// skip if already get
-			continue
-		}
-		exists = append(exists, values[0])
+	ifaceUsage := newMapInterfaceNameUsage(nsInterfaces)
+	notTruncated := ifaceUsage.notTruncated()
+	ret = make([]IOCountersStat, len(notTruncated))
 
-		base := 1
-		// sometimes Address is ommitted
-		if len(values) < 11 {
-			base = 0
+	if !ifaceUsage.isTruncated() {
+		// no truncated interface name, return stats of all interface with <Link#...>
+		for index := range nsInterfaces {
+			if nsInterfaces[index].linkId != nil {
+				ret[retIndex] = *nsInterfaces[index].stat
+				retIndex++
+			}
 		}
-
-		parsed := make([]uint64, 0, 7)
-		vv := []string{
-			values[base+3], // Ipkts == PacketsRecv
-			values[base+4], // Ierrs == Errin
-			values[base+5], // Ibytes == BytesRecv
-			values[base+6], // Opkts == PacketsSent
-			values[base+7], // Oerrs == Errout
-			values[base+8], // Obytes == BytesSent
+	} else {
+		// duplicated interface, list all interfaces
+		ifconfig, err := exec.LookPath("/sbin/ifconfig")
+		if err != nil {
+			return nil, err
 		}
-		if len(values) == 12 {
-			vv = append(vv, values[base+10])
+		if out, err = invoke.Command(ifconfig, "-l"); err != nil {
+			return nil, err
 		}
+		interfaceNames := strings.Fields(strings.TrimRight(string(out), endOfLine))
 
-		for _, target := range vv {
-			if target == "-" {
-				parsed = append(parsed, 0)
-				continue
+		// for each of the interface name, run netstat if we don't have any stats yet
+		for _, interfaceName := range interfaceNames {
+			truncated := true
+			for index := range nsInterfaces {
+				if nsInterfaces[index].linkId != nil && nsInterfaces[index].stat.Name == interfaceName {
+					// handle the non truncated name to avoid execute netstat for them again
+					ret[retIndex] = *nsInterfaces[index].stat
+					retIndex++
+					truncated = false
+					break
+				}
 			}
-
-			t, err := strconv.ParseUint(target, 10, 64)
-			if err != nil {
-				return nil, err
+			if truncated {
+				// run netstat with -I$ifacename
+				if out, err = invoke.Command(netstat, "-ibdnWI" + interfaceName);err != nil {
+					return nil, err
+				}
+				parsedIfaces, err := parseNetstatOutput(string(out))
+				if err != nil {
+					return nil, err
+				}
+				if len(parsedIfaces) == 0 {
+					// interface had been removed since `ifconfig -l` had been executed
+					continue
+				}
+				for index := range parsedIfaces {
+					if parsedIfaces[index].linkId != nil {
+						ret = append(ret, *parsedIfaces[index].stat)
+						break
+					}
+				}
 			}
-			parsed = append(parsed, t)
 		}
-
-		n := IOCountersStat{
-			Name:        values[0],
-			PacketsRecv: parsed[0],
-			Errin:       parsed[1],
-			BytesRecv:   parsed[2],
-			PacketsSent: parsed[3],
-			Errout:      parsed[4],
-			BytesSent:   parsed[5],
-		}
-		if len(parsed) == 7 {
-			n.Dropout = parsed[6]
-		}
-		ret = append(ret, n)
 	}
 
 	if pernic == false {
 		return getIOCountersAll(ret)
 	}
-
 	return ret, nil
 }
 
diff --git a/vendor/github.com/shirou/gopsutil/net/net_linux.go b/vendor/github.com/shirou/gopsutil/net/net_linux.go
index 0803d8e789..cb83e69a66 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_linux.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_linux.go
@@ -281,6 +281,7 @@ type connTmp struct {
 	laddr    Addr
 	raddr    Addr
 	status   string
+	uids     []int32
 	pid      int32
 	boundPid int32
 	path     string
@@ -338,6 +339,7 @@ func ConnectionsPid(kind string, pid int32) ([]ConnectionStat, error) {
 				Type:   c.sockType,
 				Laddr:  c.laddr,
 				Raddr:  c.raddr,
+				Uids:   c.uids,
 				Status: c.status,
 				Pid:    c.pid,
 			}
@@ -346,6 +348,11 @@ func ConnectionsPid(kind string, pid int32) ([]ConnectionStat, error) {
 			} else {
 				conn.Pid = c.pid
 			}
+
+			// fetch process owner Real, effective, saved set, and filesystem UIDs
+			proc := process{Pid: conn.Pid}
+			conn.Uids, _ = proc.getUids()
+
 			// check duplicate using JSON format
 			json := conn.String()
 			_, exists := dupCheckMap[json]
@@ -429,6 +436,54 @@ func Pids() ([]int32, error) {
 	return ret, nil
 }
 
+// Note: the following is based off process_linux structs and methods
+// we need these to fetch the owner of a process ID
+// FIXME: Import process occures import cycle.
+// see remarks on pids()
+type process struct {
+	Pid  int32 `json:"pid"`
+	uids []int32
+}
+
+// Uids returns user ids of the process as a slice of the int
+func (p *process) getUids() ([]int32, error) {
+	err := p.fillFromStatus()
+	if err != nil {
+		return []int32{}, err
+	}
+	return p.uids, nil
+}
+
+// Get status from /proc/(pid)/status
+func (p *process) fillFromStatus() error {
+	pid := p.Pid
+	statPath := common.HostProc(strconv.Itoa(int(pid)), "status")
+	contents, err := ioutil.ReadFile(statPath)
+	if err != nil {
+		return err
+	}
+	lines := strings.Split(string(contents), "\n")
+	for _, line := range lines {
+		tabParts := strings.SplitN(line, "\t", 2)
+		if len(tabParts) < 2 {
+			continue
+		}
+		value := tabParts[1]
+		switch strings.TrimRight(tabParts[0], ":") {
+		case "Uid":
+			p.uids = make([]int32, 0, 4)
+			for _, i := range strings.Split(value, "\t") {
+				v, err := strconv.ParseInt(i, 10, 32)
+				if err != nil {
+					return err
+				}
+				p.uids = append(p.uids, int32(v))
+			}
+		}
+	}
+	return nil
+}
+
 func getProcInodesAll(root string) (map[string][]inodeMap, error) {
 	pids, err := Pids()
 	if err != nil {
diff --git a/vendor/github.com/shirou/gopsutil/net/net_windows.go b/vendor/github.com/shirou/gopsutil/net/net_windows.go
index f125260c4d..4d97c6e4ff 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_windows.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_windows.go
@@ -7,7 +7,6 @@ import (
 	"net"
 	"os"
 	"syscall"
-	"unsafe"
 
 	"github.com/shirou/gopsutil/internal/common"
 )
@@ -35,37 +34,28 @@ func IOCounters(pernic bool) ([]IOCountersStat, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	ai, err := getAdapterList()
-	if err != nil {
-		return nil, err
-	}
 	var ret []IOCountersStat
 
 	for _, ifi := range ifs {
-		name := ifi.Name
-		for ; ai != nil; ai = ai.Next {
-			name = common.BytePtrToString(&ai.Description[0])
-			c := IOCountersStat{
-				Name: name,
-			}
-
-			row := syscall.MibIfRow{Index: ai.Index}
-			e := syscall.GetIfEntry(&row)
-			if e != nil {
-				return nil, os.NewSyscallError("GetIfEntry", e)
-			}
-			c.BytesSent = uint64(row.OutOctets)
-			c.BytesRecv = uint64(row.InOctets)
-			c.PacketsSent = uint64(row.OutUcastPkts)
-			c.PacketsRecv = uint64(row.InUcastPkts)
-			c.Errin = uint64(row.InErrors)
-			c.Errout = uint64(row.OutErrors)
-			c.Dropin = uint64(row.InDiscards)
-			c.Dropout = uint64(row.OutDiscards)
+		c := IOCountersStat{
+			Name: ifi.Name,
+		}
 
-			ret = append(ret, c)
+		row := syscall.MibIfRow{Index: uint32(ifi.Index)}
+		e := syscall.GetIfEntry(&row)
+		if e != nil {
+			return nil, os.NewSyscallError("GetIfEntry", e)
 		}
+		c.BytesSent = uint64(row.OutOctets)
+		c.BytesRecv = uint64(row.InOctets)
+		c.PacketsSent = uint64(row.OutUcastPkts)
+		c.PacketsRecv = uint64(row.InUcastPkts)
+		c.Errin = uint64(row.InErrors)
+		c.Errout = uint64(row.OutErrors)
+		c.Dropin = uint64(row.InDiscards)
+		c.Dropout = uint64(row.OutDiscards)
+
+		ret = append(ret, c)
 	}
 
 	if pernic == false {
@@ -86,23 +76,6 @@ func Connections(kind string) ([]ConnectionStat, error) {
 	return ret, common.ErrNotImplementedError
 }
 
-// borrowed from src/pkg/net/interface_windows.go
-func getAdapterList() (*syscall.IpAdapterInfo, error) {
-	b := make([]byte, 1000)
-	l := uint32(len(b))
-	a := (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
-	err := syscall.GetAdaptersInfo(a, &l)
-	if err == syscall.ERROR_BUFFER_OVERFLOW {
-		b = make([]byte, l)
-		a = (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
-		err = syscall.GetAdaptersInfo(a, &l)
-	}
-	if err != nil {
-		return nil, os.NewSyscallError("GetAdaptersInfo", err)
-	}
-	return a, nil
-}
-
 func FilterCounters() ([]FilterStat, error) {
 	return nil, errors.New("NetFilterCounters not implemented for windows")
 }
diff --git a/vendor/github.com/shirou/gopsutil/process/process_darwin.go b/vendor/github.com/shirou/gopsutil/process/process_darwin.go
index cea0803e6d..8ba1619bf7 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_darwin.go
@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 	"syscall"
+	"time"
 	"unsafe"
 
 	"github.com/shirou/gopsutil/cpu"
@@ -105,7 +106,34 @@ func (p *Process) CmdlineSlice() ([]string, error) {
 	return r[0], err
 }
 func (p *Process) CreateTime() (int64, error) {
-	return 0, common.ErrNotImplementedError
+	r, err := callPs("etime", p.Pid, false)
+	if err != nil {
+		return 0, err
+	}
+
+	elapsedSegments := strings.Split(strings.Replace(r[0][0], "-", ":", 1), ":")
+	var elapsedDurations []time.Duration
+	for i := len(elapsedSegments) - 1; i >= 0; i-- {
+		p, err := strconv.ParseInt(elapsedSegments[i], 10, 0)
+		if err != nil {
+			return 0, err
+		}
+		elapsedDurations = append(elapsedDurations, time.Duration(p))
+	}
+
+	var elapsed time.Duration = time.Duration(elapsedDurations[0]) * time.Second
+	if len(elapsedDurations) > 1 {
+		elapsed += time.Duration(elapsedDurations[1]) * time.Minute
+	}
+	if len(elapsedDurations) > 2 {
+		elapsed += time.Duration(elapsedDurations[2]) * time.Hour
+	}
+	if len(elapsedDurations) > 3 {
+		elapsed += time.Duration(elapsedDurations[3]) * time.Hour * 24
+	}
+
+	start := time.Now().Add(-elapsed)
+	return start.Unix() * 1000, nil
 }
 func (p *Process) Cwd() (string, error) {
 	return "", common.ErrNotImplementedError
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux.go b/vendor/github.com/shirou/gopsutil/process/process_linux.go
index ae300412c2..19c665591f 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_linux.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_linux.go
@@ -20,10 +20,14 @@ import (
 	"github.com/shirou/gopsutil/net"
 )
 
-var ErrorNoChildren = errors.New("process does not have children")
+var (
+	ErrorNoChildren = errors.New("process does not have children")
+	PageSize        = uint64(os.Getpagesize())
+)
 
 const (
-	PrioProcess = 0 // linux/resource.h
+	PrioProcess = 0   // linux/resource.h
+	ClockTicks  = 100 // C.sysconf(C._SC_CLK_TCK)
 )
 
 // MemoryInfoExStat is different between OSes
@@ -527,9 +531,9 @@ func (p *Process) fillFromIO() (*IOCountersStat, error) {
 			ret.ReadCount = t
 		case "syscw":
 			ret.WriteCount = t
-		case "readBytes":
+		case "read_bytes":
 			ret.ReadBytes = t
-		case "writeBytes":
+		case "write_bytes":
 			ret.WriteBytes = t
 		}
 	}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux_386.go b/vendor/github.com/shirou/gopsutil/process/process_linux_386.go
deleted file mode 100644
index 541b854c75..0000000000
--- a/vendor/github.com/shirou/gopsutil/process/process_linux_386.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build 386
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux_amd64.go b/vendor/github.com/shirou/gopsutil/process/process_linux_amd64.go
deleted file mode 100644
index b4a4ce8b7c..0000000000
--- a/vendor/github.com/shirou/gopsutil/process/process_linux_amd64.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build amd64
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux_arm.go b/vendor/github.com/shirou/gopsutil/process/process_linux_arm.go
deleted file mode 100644
index c6123a4891..0000000000
--- a/vendor/github.com/shirou/gopsutil/process/process_linux_arm.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build arm
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux_arm64.go b/vendor/github.com/shirou/gopsutil/process/process_linux_arm64.go
deleted file mode 100644
index 529aeaa9ad..0000000000
--- a/vendor/github.com/shirou/gopsutil/process/process_linux_arm64.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build arm64
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/vendor/github.com/shirou/gopsutil/process/process_windows.go b/vendor/github.com/shirou/gopsutil/process/process_windows.go
index c3d28376f9..7507ab036f 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_windows.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_windows.go
@@ -257,8 +257,8 @@ func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
 	}
 
 	ret := &MemoryInfoStat{
-		RSS: mem.WorkingSetSize,
-		VMS: mem.PagefileUsage,
+		RSS: uint64(mem.WorkingSetSize),
+		VMS: uint64(mem.PagefileUsage),
 	}
 
 	return ret, nil
@@ -308,9 +308,20 @@ func (p *Process) Suspend() error {
 func (p *Process) Resume() error {
 	return common.ErrNotImplementedError
 }
+
 func (p *Process) Terminate() error {
-	return common.ErrNotImplementedError
+	// PROCESS_TERMINATE = 0x0001
+	proc := w32.OpenProcess(0x0001, false, uint32(p.Pid))
+	ret := w32.TerminateProcess(proc, 0)
+	w32.CloseHandle(proc)
+
+	if ret == false {
+		return syscall.GetLastError()
+	} else {
+		return nil
+	}
 }
+
 func (p *Process) Kill() error {
 	return common.ErrNotImplementedError
 }

From 115aa21ba1fa647c64868ff02a4962672933f693 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 22 Nov 2016 16:29:44 +0000
Subject: [PATCH 0897/1304] tests: skip testing for insecure sysrq-trigger in
 TestPathsWrite

systemd v232 introduced an hardcoded protection for /proc/sysrq-trigger,
so rkt insecure mode does not work anymore for that path.
Disabling the insecure part of TestPathsWrite for now, can be re-enabled
once https://github.com/systemd/systemd/pull/4395 is available in stage1.
---
 tests/rkt_paths_test.go | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/tests/rkt_paths_test.go b/tests/rkt_paths_test.go
index 0f8d4187d4..c207b152a6 100644
--- a/tests/rkt_paths_test.go
+++ b/tests/rkt_paths_test.go
@@ -62,22 +62,25 @@ func TestPathsWrite(t *testing.T) {
 			runRktAndCheckOutput(t, cmd, expectErr, true)
 		}
 
-		// With --insecure-options=paths
-		expectOk := "testing-insecure-option"
-		for _, insecureOption := range []string{"image,paths", "image,paths,ondisk,capabilities", "image,all-run", "all"} {
-			// run
-			t.Logf("run: attempting to write on %q with --insecure-options=%s (expecting success)\n", tt.Path, insecureOption)
-			cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run --set-env=FILE=%s --set-env=CONTENT=%s %s`,
-				ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
-			runRktAndCheckOutput(t, cmd, expectOk, false)
-			// run-prepared
-			t.Logf("run-prepared: attempting to write on %q with --insecure-options=%s (expecting success)\n", tt.Path, insecureOption)
-			cmd = fmt.Sprintf(`%s --insecure-options=%s prepare --set-env=FILE=%s --set-env=CONTENT=%s %s`,
-				ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
-			uuid := runRktAndGetUUID(t, cmd)
-			cmd = fmt.Sprintf("%s --debug --insecure-options=%s run-prepared --mds-register=false %s", ctx.Cmd(), insecureOption, uuid)
-			runRktAndCheckOutput(t, cmd, expectOk, false)
-		}
+		/* TODO(lucab): re-enable once stage1 has https://github.com/systemd/systemd/pull/4395
+		 *
+		 * // With --insecure-options=paths
+		 * expectOk := "testing-insecure-option"
+		 * for _, insecureOption := range []string{"image,paths", "image,paths,ondisk,capabilities", "image,all-run", "all"} {
+		 * 	// run
+		 * 	t.Logf("run: attempting to write on %q with --insecure-options=%s (expecting success)\n", tt.Path, insecureOption)
+		 * 	cmd := fmt.Sprintf(`%s --debug --insecure-options=%s run --set-env=FILE=%s --set-env=CONTENT=%s %s`,
+		 * 		ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
+		 * 	runRktAndCheckOutput(t, cmd, expectOk, false)
+		 * 	// run-prepared
+		 * 	t.Logf("run-prepared: attempting to write on %q with --insecure-options=%s (expecting success)\n", tt.Path, insecureOption)
+		 * 	cmd = fmt.Sprintf(`%s --insecure-options=%s prepare --set-env=FILE=%s --set-env=CONTENT=%s %s`,
+		 * 		ctx.Cmd(), insecureOption, tt.Path, tt.Content, imageFile)
+		 * 	uuid := runRktAndGetUUID(t, cmd)
+		 * 	cmd = fmt.Sprintf("%s --debug --insecure-options=%s run-prepared --mds-register=false %s", ctx.Cmd(), insecureOption, uuid)
+		 * 	runRktAndCheckOutput(t, cmd, expectOk, false)
+		 * }
+		 */
 	}
 }
 

From 23957979acc5d1ef4ff1a480615755b2ba4d2ffb Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Tue, 22 Nov 2016 15:37:21 -0800
Subject: [PATCH 0898/1304] tests: add test for getPod and refreshState

---
 pkg/pod/pods_test.go | 157 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/pkg/pod/pods_test.go b/pkg/pod/pods_test.go
index edcd52d1d2..6a6ecb088f 100644
--- a/pkg/pod/pods_test.go
+++ b/pkg/pod/pods_test.go
@@ -18,8 +18,10 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"reflect"
 	"testing"
 
+	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/pkg/lock"
 )
 
@@ -192,5 +194,160 @@ func TestWalkPods(t *testing.T) {
 			}
 		}
 	}
+}
+
+type states struct {
+	isEmbryo         bool
+	isPreparing      bool
+	isAbortedPrepare bool
+	isPrepared       bool
+	isExited         bool
+	isExitedGarbage  bool
+	isExitedDeleting bool
+	isGarbage        bool
+	isDeleting       bool
+	isGone           bool
+}
+
+type dirFn func(string) string
+
+func TestGetPodAndRefreshState(t *testing.T) {
+	testCases := []struct {
+		paths    []dirFn
+		locks    []dirFn
+		expected states
+	}{
+		{
+			paths:    []dirFn{embryoDir},
+			expected: states{isEmbryo: true},
+		},
+		{
+			paths:    []dirFn{prepareDir},
+			locks:    []dirFn{prepareDir},
+			expected: states{isPreparing: true},
+		},
+		{
+			paths:    []dirFn{prepareDir},
+			expected: states{isAbortedPrepare: true},
+		},
+		{
+			paths:    []dirFn{runDir},
+			locks:    []dirFn{runDir},
+			expected: states{},
+		},
+		{
+			paths:    []dirFn{runDir},
+			expected: states{isExited: true},
+		},
+		{
+			paths:    []dirFn{garbageDir},
+			expected: states{isGarbage: true},
+		},
+		{
+			paths:    []dirFn{garbageDir},
+			locks:    []dirFn{garbageDir},
+			expected: states{isGarbage: true, isDeleting: true},
+		},
+	}
+
+	uuid, err := types.NewUUID("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa")
+	if err != nil {
+		panic(err)
+	}
+
+	for i, tcase := range testCases {
+		tmpDir, err := ioutil.TempDir("", "")
+		if err != nil {
+			panic(err)
+		}
+		defer os.RemoveAll(tmpDir)
+
+		for _, pfn := range tcase.paths {
+			podPath := filepath.Join(pfn(tmpDir), uuid.String())
+			if err := os.MkdirAll(podPath, 0777); err != nil {
+				panic(err)
+			}
+		}
+
+		for _, lfn := range tcase.locks {
+			podPath := filepath.Join(lfn(tmpDir), uuid.String())
+			l, err := lock.NewLock(podPath, lock.Dir)
+			if err != nil {
+				t.Fatalf("error taking lock on directory: %v", err)
+			}
+			err = l.ExclusiveLock()
+			if err != nil {
+				t.Fatalf("could not get exclusive lock on directory: %v", err)
+			}
+			defer l.Unlock()
+		}
+
+		p, err := getPod(tmpDir, uuid)
+		if err != nil {
+			t.Fatalf("%v: unable to get pod: %v", i, err)
+		}
+
+		pstate := podToStates(p)
+		if !reflect.DeepEqual(tcase.expected, pstate) {
+			t.Errorf("%v: expected %+v == %+v after getPod", i, tcase.expected, pstate)
+		}
+
+		err = p.refreshState()
+		if err != nil {
+			t.Errorf("error refreshing state: %v", err)
+			continue
+		}
+
+		pstate = podToStates(p)
+		if !reflect.DeepEqual(tcase.expected, pstate) {
+			t.Errorf("%v: expected %+v == %+v after refrshState", i, tcase.expected, pstate)
+		}
+	}
+}
 
+func TestRefreshPodIsGone(t *testing.T) {
+	uuid, err := types.NewUUID("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa")
+	if err != nil {
+		panic(err)
+	}
+	tmpDir, err := ioutil.TempDir("", "")
+	if err != nil {
+		panic(err)
+	}
+	defer os.RemoveAll(tmpDir)
+	podPath := filepath.Join(embryoDir(tmpDir), uuid.String())
+	os.MkdirAll(podPath, 0777)
+
+	p, err := getPod(tmpDir, uuid)
+	if err != nil {
+		t.Fatalf("unable to get pod: %v", err)
+	}
+
+	os.RemoveAll(tmpDir)
+
+	err = p.refreshState()
+	if err != nil {
+		t.Fatalf("error refreshing state: %v", err)
+	}
+
+	pstate := podToStates(p)
+	expected := states{isGone: true}
+	if !reflect.DeepEqual(expected, pstate) {
+		t.Errorf("expected %+v == %+v after refrshState", expected, pstate)
+	}
+}
+
+func podToStates(p *Pod) states {
+	return states{
+		isEmbryo:         p.isEmbryo,
+		isPreparing:      p.isPreparing,
+		isAbortedPrepare: p.isAbortedPrepare,
+		isPrepared:       p.isPrepared,
+		isExited:         p.isExited,
+		isExitedGarbage:  p.isExitedGarbage,
+		isExitedDeleting: p.isExitedDeleting,
+		isGarbage:        p.isGarbage,
+		isDeleting:       p.isDeleting,
+		isGone:           p.isGone,
+	}
 }

From 4ff8885b2e10491266d5738faaa110150a278b73 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 23 Nov 2016 15:03:53 +0000
Subject: [PATCH 0899/1304] pkg/log: add convenience error-printing helpers

This add `Errorf()`, `Fatalf()` and `Panicf()` as convience
helpers to format and print string errors.
---
 pkg/log/log.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkg/log/log.go b/pkg/log/log.go
index 80ac5c9593..a59a192c8c 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -111,13 +111,29 @@ func (l *Logger) Error(e error) {
 	l.Print(l.formatErr(e, ""))
 }
 
+// Errorf is a convenience function for formatting and printing errors.
+func (l *Logger) Errorf(format string, a ...interface{}) {
+	l.Print(l.formatErr(fmt.Errorf(format, a), ""))
+}
+
 // FatalE prints a string and error then calls os.Exit(254).
 func (l *Logger) FatalE(msg string, e error) {
 	l.Print(l.formatErr(e, msg))
 	os.Exit(254)
 }
 
+// Fatalf prints an error then calls os.Exit(254).
+func (l *Logger) Fatalf(format string, a ...interface{}) {
+	l.Print(l.formatErr(fmt.Errorf(format, a), ""))
+	os.Exit(254)
+}
+
 // PanicE prints a string and error then calls panic.
 func (l *Logger) PanicE(msg string, e error) {
 	l.Panic(l.formatErr(e, msg))
 }
+
+// Panicf prints an error then calls panic.
+func (l *Logger) Panicf(format string, a ...interface{}) {
+	l.Panic(l.formatErr(fmt.Errorf(format, a), ""))
+}

From a7451d3b9fd0369a320147867c3da7910bafe546 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 15 Nov 2016 13:07:20 +0000
Subject: [PATCH 0900/1304] stage1/app-add: do not remount host cgroups inside
 kvm

This fixes an incorrect behavior regarding cgroups remounting.
When running inside a kvm pod app-add should not try to tweak
host cgroups, as the pod already gets a dedicated and writable
cgroup hierarchy inside the VM.
---
 stage1/app-add/app-add.go | 105 +++++++++++++++++++++-----------------
 1 file changed, 59 insertions(+), 46 deletions(-)

diff --git a/stage1/app-add/app-add.go b/stage1/app-add/app-add.go
index ddcc6e341b..4128903154 100644
--- a/stage1/app-add/app-add.go
+++ b/stage1/app-add/app-add.go
@@ -17,6 +17,7 @@
 package main
 
 import (
+	"errors"
 	"flag"
 	"io/ioutil"
 	"os"
@@ -30,7 +31,9 @@ import (
 	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1types "github.com/coreos/rkt/stage1/common/types"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+	"github.com/hashicorp/errwrap"
 
+	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 )
 
@@ -66,25 +69,25 @@ func main() {
 		diag.SetOutput(ioutil.Discard)
 	}
 
-	enterCmd := stage1common.PrepareEnterCmd(false)
-
 	uuid, err := types.NewUUID(flagUUID)
 	if err != nil {
-		log.PrintE("UUID is missing or malformed", err)
-		os.Exit(254)
+		log.FatalE("UUID is missing or malformed", err)
 	}
 
 	appName, err := types.NewACName(flagApp)
 	if err != nil {
-		log.PrintE("invalid app name", err)
-		os.Exit(254)
+		log.FatalE("invalid app name", err)
 	}
 
 	root := "."
 	p, err := stage1types.LoadPod(root, uuid)
 	if err != nil {
-		log.PrintE("failed to load pod", err)
-		os.Exit(254)
+		log.FatalE("failed to load pod", err)
+	}
+
+	flavor, _, err := stage1initcommon.GetFlavor(p)
+	if err != nil {
+		log.FatalE("failed to get stage1 flavor", err)
 	}
 
 	insecureOptions := stage1initcommon.Stage1InsecureOptions{
@@ -95,67 +98,45 @@ func main() {
 
 	ra := p.Manifest.Apps.Get(*appName)
 	if ra == nil {
-		log.Printf("failed to get app")
+		log.Error(fmt.Errorf("failed to find app %q", *appName))
 		os.Exit(254)
 	}
 
-	if ra.App.WorkingDirectory == "" {
-		ra.App.WorkingDirectory = "/"
-	}
-
-	/* prepare cgroups */
-	isUnified, err := cgroup.IsCgroupUnified("/")
+	binPath, err := stage1initcommon.FindBinPath(p, ra)
 	if err != nil {
-		log.FatalE("failed to determine the cgroup version", err)
-		os.Exit(254)
+		log.FatalE("failed to find bin path", err)
 	}
 
-	if !isUnified {
-		enabledCgroups, err := v1.GetEnabledCgroups()
-		if err != nil {
-			log.FatalE("error getting cgroups", err)
-			os.Exit(254)
-		}
-
-		b, err := ioutil.ReadFile(filepath.Join(p.Root, "subcgroup"))
-		if err == nil {
-			subcgroup := string(b)
-			serviceName := stage1initcommon.ServiceUnitName(ra.Name)
-
-			if err := v1.RemountCgroupKnobsRW(enabledCgroups, subcgroup, serviceName, enterCmd); err != nil {
-				log.FatalE("error restricting container cgroups", err)
-				os.Exit(254)
-			}
-		} else {
-			log.PrintE("continuing with per-app isolators disabled", err)
-		}
+	if ra.App.WorkingDirectory == "" {
+		ra.App.WorkingDirectory = "/"
 	}
 
+	enterCmd := stage1common.PrepareEnterCmd(false)
 	stage1initcommon.AppAddMounts(p, ra, enterCmd)
 
-	/* write service file */
-	binPath, err := stage1initcommon.FindBinPath(p, ra)
-	if err != nil {
-		log.PrintE("failed to find bin path", err)
-		os.Exit(254)
+	// when using host cgroups, make the subgroup writable by pod systemd
+	if flavor != "kvm" {
+		err = prepareAppCgroups(p, ra, enterCmd)
+		if err != nil {
+			log.FatalE("error preparing cgroups", err)
+		}
 	}
 
+	// write service files
 	w := stage1initcommon.NewUnitWriter(p)
-
 	w.AppUnit(ra, binPath, privateUsers, insecureOptions,
 		unit.NewUnitOption("Unit", "Before", "halt.target"),
 		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
 		unit.NewUnitOption("Service", "StandardOutput", "journal+console"),
 		unit.NewUnitOption("Service", "StandardError", "journal+console"),
 	)
-
 	w.AppReaperUnit(ra.Name, binPath)
-
 	if err := w.Error(); err != nil {
-		log.PrintE("error generating app units", err)
-		os.Exit(254)
+		log.FatalE("error generating app units", err)
 	}
 
+	// stage2 environment is ready at this point, but systemd does not know
+	// about the new application yet
 	args := enterCmd
 	args = append(args, "/usr/bin/systemctl")
 	args = append(args, "daemon-reload")
@@ -172,3 +153,35 @@ func main() {
 
 	os.Exit(0)
 }
+
+// prepareAppCgroups makes the cgroups-v1 hierarchy for this application writable
+// by pod supervisor
+func prepareAppCgroups(p *stage1types.Pod, ra *schema.RuntimeApp, enterCmd []string) error {
+	isUnified, err := cgroup.IsCgroupUnified("/")
+	if err != nil {
+		return errwrap.Wrap(errors.New("failed to determine cgroup version"), err)
+	}
+
+	if isUnified {
+		return nil
+	}
+
+	enabledCgroups, err := v1.GetEnabledCgroups()
+	if err != nil {
+		return errwrap.Wrap(errors.New("error getting cgroups"), err)
+	}
+
+	b, err := ioutil.ReadFile(filepath.Join(p.Root, "subcgroup"))
+	if err != nil {
+		log.PrintE("continuing with per-app isolators disabled", err)
+		return nil
+	}
+
+	subcgroup := string(b)
+	serviceName := stage1initcommon.ServiceUnitName(ra.Name)
+	if err := v1.RemountCgroupKnobsRW(enabledCgroups, subcgroup, serviceName, enterCmd); err != nil {
+		return errwrap.Wrap(errors.New("error restricting application cgroups"), err)
+	}
+
+	return nil
+}

From ab0ab15b4289f96bc665e431b562dddf2913764b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 15 Nov 2016 13:27:23 +0000
Subject: [PATCH 0901/1304] stage0/app: do not try to read TreeStoreID when not
 using overlayfs

---
 stage0/app.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/stage0/app.go b/stage0/app.go
index b7b2221935..beb2293c97 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -364,11 +364,6 @@ func RmApp(cfg RmConfig) error {
 		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
 	}
 
-	treeStoreID, err := ioutil.ReadFile(common.AppTreeStoreIDPath(cfg.PodPath, *cfg.AppName))
-	if err != nil {
-		return err
-	}
-
 	if cfg.PodPID > 0 {
 		// Call app-stop and app-rm entrypoint only if the pod is still running.
 		// Otherwise, there's not much we can do about it except unmounting/removing
@@ -393,12 +388,12 @@ func RmApp(cfg RmConfig) error {
 		}
 	}
 
-	appInfoDir := common.AppInfoPath(cfg.PodPath, *cfg.AppName)
-	if err := os.RemoveAll(appInfoDir); err != nil {
-		return errwrap.Wrap(errors.New("error removing app info directory"), err)
-	}
-
 	if cfg.UsesOverlay {
+		treeStoreID, err := ioutil.ReadFile(common.AppTreeStoreIDPath(cfg.PodPath, *cfg.AppName))
+		if err != nil {
+			return err
+		}
+
 		appRootfs := common.AppRootfsPath(cfg.PodPath, *cfg.AppName)
 		if err := syscall.Unmount(appRootfs, 0); err != nil {
 			return err
@@ -410,6 +405,11 @@ func RmApp(cfg RmConfig) error {
 		}
 	}
 
+	appInfoDir := common.AppInfoPath(cfg.PodPath, *cfg.AppName)
+	if err := os.RemoveAll(appInfoDir); err != nil {
+		return errwrap.Wrap(errors.New("error removing app info directory"), err)
+	}
+
 	if err := os.RemoveAll(common.AppPath(cfg.PodPath, *cfg.AppName)); err != nil {
 		return err
 	}

From a5403f6535f5ebe67dadeb9bc46890ef3037e953 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 16 Nov 2016 10:30:45 +0000
Subject: [PATCH 0902/1304] stage0: ensure that entrypoints have a populated
 PATH

---
 common/environment.go         |  4 ++-
 stage0/app.go                 | 43 +++++++++++++++++++++---
 stage0/common.go              | 63 ++++++++++++++++++++++++-----------
 stage1/app-add/app-add.go     | 10 +++---
 stage1/app-rm/app-rm.go       | 19 +++++------
 stage1/app-start/app-start.go | 11 +++---
 stage1/app-stop/app-stop.go   |  5 ++-
 7 files changed, 103 insertions(+), 52 deletions(-)

diff --git a/common/environment.go b/common/environment.go
index 1e5516ebaf..24e365787c 100644
--- a/common/environment.go
+++ b/common/environment.go
@@ -24,8 +24,10 @@ import (
 	"github.com/appc/spec/schema/types"
 )
 
+const DefaultPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
 var defaultEnv = map[string]string{
-	"PATH":    "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+	"PATH":    DefaultPath,
 	"SHELL":   "/bin/sh",
 	"USER":    "root",
 	"LOGNAME": "root",
diff --git a/stage0/app.go b/stage0/app.go
index beb2293c97..f206a73c2c 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -287,7 +287,15 @@ func AddApp(cfg AddConfig) error {
 		return err
 	}
 
-	if err := RunCrossingEntrypoint(cfg.PodPath, cfg.PodPID, appName.String(), appAddEntrypoint, args); err != nil {
+	ce := CrossingEntrypoint{
+		PodPath:        cfg.PodPath,
+		PodPID:         cfg.PodPID,
+		AppName:        appName.String(),
+		EntrypointName: appAddEntrypoint,
+		EntrypointArgs: args,
+		Interactive:    false,
+	}
+	if err := ce.Run(); err != nil {
 		return err
 	}
 
@@ -372,7 +380,15 @@ func RmApp(cfg RmConfig) error {
 			fmt.Sprintf("--app=%s", cfg.AppName),
 		}
 
-		if err := RunCrossingEntrypoint(cfg.PodPath, cfg.PodPID, cfg.AppName.String(), appStopEntrypoint, args); err != nil {
+		ce := CrossingEntrypoint{
+			PodPath:        cfg.PodPath,
+			PodPID:         cfg.PodPID,
+			AppName:        cfg.AppName.String(),
+			EntrypointName: appStopEntrypoint,
+			EntrypointArgs: args,
+			Interactive:    false,
+		}
+		if err := ce.Run(); err != nil {
 			status, err := common.GetExitStatus(err)
 			// ignore nonexistent units failing to stop. Exit status 5
 			// comes from systemctl and means the unit doesn't exist
@@ -383,7 +399,8 @@ func RmApp(cfg RmConfig) error {
 			}
 		}
 
-		if err := RunCrossingEntrypoint(cfg.PodPath, cfg.PodPID, cfg.AppName.String(), appRmEntrypoint, args); err != nil {
+		ce.EntrypointName = appRmEntrypoint
+		if err := ce.Run(); err != nil {
 			return err
 		}
 	}
@@ -475,7 +492,15 @@ func StartApp(cfg StartConfig) error {
 		log.FatalE(fmt.Sprintf("error creating %s-started file", cfg.AppName.String()), err)
 	}
 
-	if err := RunCrossingEntrypoint(cfg.Dir, cfg.PodPID, cfg.AppName.String(), appStartEntrypoint, args); err != nil {
+	ce := CrossingEntrypoint{
+		PodPath:        cfg.Dir,
+		PodPID:         cfg.PodPID,
+		AppName:        cfg.AppName.String(),
+		EntrypointName: appStartEntrypoint,
+		EntrypointArgs: args,
+		Interactive:    false,
+	}
+	if err := ce.Run(); err != nil {
 		return err
 	}
 
@@ -512,7 +537,15 @@ func StopApp(cfg StopConfig) error {
 		fmt.Sprintf("--app=%s", cfg.AppName),
 	}
 
-	if err := RunCrossingEntrypoint(cfg.Dir, cfg.PodPID, cfg.AppName.String(), appStopEntrypoint, args); err != nil {
+	ce := CrossingEntrypoint{
+		PodPath:        cfg.Dir,
+		PodPID:         cfg.PodPID,
+		AppName:        cfg.AppName.String(),
+		EntrypointName: appStopEntrypoint,
+		EntrypointArgs: args,
+		Interactive:    false,
+	}
+	if err := ce.Run(); err != nil {
 		status, err := common.GetExitStatus(err)
 		// exit status 5 comes from systemctl and means the unit doesn't exist
 		if status == 5 {
diff --git a/stage0/common.go b/stage0/common.go
index 94316dd34c..55b6f551b9 100644
--- a/stage0/common.go
+++ b/stage0/common.go
@@ -25,11 +25,22 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
-// RunCrossingEntrypoint wraps the execution of a stage1 entrypoint which
+// CrossingEntrypoint represents a stage1 entrypoint whose execution
+// needs to cross the stage0/stage1/stage2 boundary.
+type CrossingEntrypoint struct {
+	PodPath        string
+	PodPID         int
+	AppName        string
+	EntrypointName string
+	EntrypointArgs []string
+	Interactive    bool
+}
+
+// Run wraps the execution of a stage1 entrypoint which
 // requires crossing the stage0/stage1/stage2 boundary during its execution,
 // by setting up proper environment variables for enter.
-func RunCrossingEntrypoint(dir string, podPID int, appName string, entrypoint string, entrypointArgs []string) error {
-	enterCmd, err := getStage1Entrypoint(dir, enterEntrypoint)
+func (ce CrossingEntrypoint) Run() error {
+	enterCmd, err := getStage1Entrypoint(ce.PodPath, enterEntrypoint)
 	if err != nil {
 		return errwrap.Wrap(errors.New("error determining 'enter' entrypoint"), err)
 	}
@@ -39,31 +50,45 @@ func RunCrossingEntrypoint(dir string, podPID int, appName string, entrypoint st
 		return err
 	}
 
-	if err := os.Chdir(dir); err != nil {
+	if err := os.Chdir(ce.PodPath); err != nil {
 		return errwrap.Wrap(errors.New("failed changing to dir"), err)
 	}
 
-	ep, err := getStage1Entrypoint(dir, entrypoint)
+	ep, err := getStage1Entrypoint(ce.PodPath, ce.EntrypointName)
 	if err != nil {
-		return fmt.Errorf("%q not implemented for pod's stage1: %v", entrypoint, err)
+		return fmt.Errorf("%q not implemented for pod's stage1: %v", ce.EntrypointName, err)
+	}
+	execArgs := []string{filepath.Join(common.Stage1RootfsPath(ce.PodPath), ep)}
+	execArgs = append(execArgs, ce.EntrypointArgs...)
+
+	pathEnv := os.Getenv("PATH")
+	if pathEnv == "" {
+		pathEnv = common.DefaultPath
+	}
+	execEnv := []string{
+		fmt.Sprintf("%s=%s", common.CrossingEnterCmd, filepath.Join(common.Stage1RootfsPath(ce.PodPath), enterCmd)),
+		fmt.Sprintf("%s=%d", common.CrossingEnterPID, ce.PodPID),
+		fmt.Sprintf("PATH=%s", pathEnv),
 	}
-	execArgs := []string{filepath.Join(common.Stage1RootfsPath(dir), ep)}
-	execArgs = append(execArgs, entrypointArgs...)
 
 	c := exec.Cmd{
-		Path:   execArgs[0],
-		Args:   execArgs,
-		Stdin:  os.Stdin,
-		Stdout: os.Stdout,
-		Stderr: os.Stderr,
-		Env: []string{
-			fmt.Sprintf("%s=%s", common.CrossingEnterCmd, filepath.Join(common.Stage1RootfsPath(dir), enterCmd)),
-			fmt.Sprintf("%s=%d", common.CrossingEnterPID, podPID),
-		},
+		Path: execArgs[0],
+		Args: execArgs,
+		Env:  execEnv,
 	}
 
-	if err := c.Run(); err != nil {
-		return fmt.Errorf("error executing stage1 entrypoint: %v", err)
+	if ce.Interactive {
+		c.Stdin = os.Stdin
+		c.Stdout = os.Stdout
+		c.Stderr = os.Stderr
+		if err := c.Run(); err != nil {
+			return fmt.Errorf("error executing stage1 entrypoint: %v", err)
+		}
+	} else {
+		out, err := c.CombinedOutput()
+		if err != nil {
+			return fmt.Errorf("error executing stage1 entrypoint: %s", string(out))
+		}
 	}
 
 	if err := os.Chdir(previousDir); err != nil {
diff --git a/stage1/app-add/app-add.go b/stage1/app-add/app-add.go
index 4128903154..96bdd39030 100644
--- a/stage1/app-add/app-add.go
+++ b/stage1/app-add/app-add.go
@@ -64,7 +64,7 @@ func main() {
 
 	stage1initcommon.InitDebug(debug)
 
-	log, diag, _ = rktlog.NewLogSet("stage1", debug)
+	log, diag, _ = rktlog.NewLogSet("app-add", debug)
 	if !debug {
 		diag.SetOutput(ioutil.Discard)
 	}
@@ -98,8 +98,7 @@ func main() {
 
 	ra := p.Manifest.Apps.Get(*appName)
 	if ra == nil {
-		log.Error(fmt.Errorf("failed to find app %q", *appName))
-		os.Exit(254)
+		log.Fatalf("failed to find app %q", *appName)
 	}
 
 	binPath, err := stage1initcommon.FindBinPath(p, ra)
@@ -146,9 +145,8 @@ func main() {
 		Args: args,
 	}
 
-	if err := cmd.Run(); err != nil {
-		log.PrintE(`error executing "systemctl daemon-reload"`, err)
-		os.Exit(254)
+	if out, err := cmd.CombinedOutput(); err != nil {
+		log.Fatalf("%q failed at daemon-reload:\n%s", appName, out)
 	}
 
 	os.Exit(0)
diff --git a/stage1/app-rm/app-rm.go b/stage1/app-rm/app-rm.go
index 7cb6568f2a..7961e86c46 100644
--- a/stage1/app-rm/app-rm.go
+++ b/stage1/app-rm/app-rm.go
@@ -48,15 +48,14 @@ func main() {
 
 	stage1initcommon.InitDebug(debug)
 
-	log, diag, _ = rktlog.NewLogSet("stage1", debug)
+	log, diag, _ = rktlog.NewLogSet("app-rm", debug)
 	if !debug {
 		diag.SetOutput(ioutil.Discard)
 	}
 
 	appName, err := types.NewACName(flagApp)
 	if err != nil {
-		log.PrintE("invalid app name", err)
-		os.Exit(254)
+		log.FatalE("invalid app name", err)
 	}
 
 	enterCmd := stage1common.PrepareEnterCmd(false)
@@ -71,12 +70,11 @@ func main() {
 		Args: args,
 	}
 
-	// rely only on the output, since it returns non-zero for inactive units
+	// rely only on the output, since is-active returns non-zero for inactive units
 	out, _ := cmd.Output()
 
 	if string(out) != "inactive\n" {
-		log.Printf("app %q is still running", appName.String())
-		os.Exit(254)
+		log.Fatalf("app %q is still running", appName.String())
 	}
 
 	s1rootfs := common.Stage1RootfsPath(".")
@@ -88,8 +86,7 @@ func main() {
 
 	for _, p := range appServicePaths {
 		if err := os.Remove(p); err != nil && !os.IsNotExist(err) {
-			log.PrintE("error removing app service file", err)
-			os.Exit(254)
+			log.FatalE("error removing app service file", err)
 		}
 	}
 
@@ -101,9 +98,9 @@ func main() {
 		Path: args[0],
 		Args: args,
 	}
-	if err := cmd.Run(); err != nil {
-		log.PrintE(`error executing "systemctl daemon-reload"`, err)
-		os.Exit(254)
+
+	if out, err := cmd.CombinedOutput(); err != nil {
+		log.Fatalf("%q failed at daemon-reload:\n%s", appName, out)
 	}
 
 	// TODO unmount all the volumes
diff --git a/stage1/app-start/app-start.go b/stage1/app-start/app-start.go
index 1535fcd92d..e1e3b94f28 100644
--- a/stage1/app-start/app-start.go
+++ b/stage1/app-start/app-start.go
@@ -18,7 +18,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -47,15 +46,14 @@ func main() {
 
 	stage1initcommon.InitDebug(debug)
 
-	log, diag, _ = rktlog.NewLogSet("stage1", debug)
+	log, diag, _ = rktlog.NewLogSet("app-start", debug)
 	if !debug {
 		diag.SetOutput(ioutil.Discard)
 	}
 
 	appName, err := types.NewACName(flagApp)
 	if err != nil {
-		log.PrintE("invalid app name", err)
-		os.Exit(254)
+		log.FatalE("invalid app name", err)
 	}
 
 	enterCmd := stage1common.PrepareEnterCmd(false)
@@ -70,9 +68,8 @@ func main() {
 		Args: args,
 	}
 
-	if err := cmd.Run(); err != nil {
-		log.PrintE(fmt.Sprintf("error starting app %q", appName.String()), err)
-		os.Exit(254)
+	if out, err := cmd.CombinedOutput(); err != nil {
+		log.Fatalf("%q failed to start:\n%s", appName, out)
 	}
 
 	os.Exit(0)
diff --git a/stage1/app-stop/app-stop.go b/stage1/app-stop/app-stop.go
index 7637e4aaa3..b4e3feaa61 100644
--- a/stage1/app-stop/app-stop.go
+++ b/stage1/app-stop/app-stop.go
@@ -47,15 +47,14 @@ func main() {
 
 	stage1initcommon.InitDebug(debug)
 
-	log, diag, _ = rktlog.NewLogSet("stage1", debug)
+	log, diag, _ = rktlog.NewLogSet("app-stop", debug)
 	if !debug {
 		diag.SetOutput(ioutil.Discard)
 	}
 
 	appName, err := types.NewACName(flagApp)
 	if err != nil {
-		log.PrintE("invalid app name", err)
-		os.Exit(254)
+		log.FatalE("invalid app name", err)
 	}
 
 	enterCmd := stage1common.PrepareEnterCmd(false)

From 24bbe1f8d7a26d2c6815b857ccdd21d4e2e39f83 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 23 Nov 2016 11:36:49 +0000
Subject: [PATCH 0903/1304] stage1: add /etc/mtab symlink

This commit adds a `/etc/mtab -> ../proc/self/mounts` symlink in stage1
in oder to make mount and other tools happy.
---
 stage1/aci/aci-install.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/stage1/aci/aci-install.mk b/stage1/aci/aci-install.mk
index 6262cdc7a7..ceaf738818 100644
--- a/stage1/aci/aci-install.mk
+++ b/stage1/aci/aci-install.mk
@@ -33,10 +33,11 @@ AMI_GEN_MANIFEST := $(AMI_TMPDIR)/aci-manifest-$(AMI_FLAVOR)
 AMI_SRC_MANIFEST := $(MK_SRCDIR)/aci-manifest.in
 # a name for this flavor
 AMI_NAME := coreos.com/rkt/stage1-$(AMI_FLAVOR)
-# list of installed files
+# list of installed files and symlinks
 AMI_INSTALLED_FILES := \
 	$(AMI_ACI_OS_RELEASE) \
-	$(AMI_ACI_MANIFEST)
+	$(AMI_ACI_MANIFEST) \
+	$(AMI_ACI_DIRS_BASE)/etc/mtab
 
 ifeq ($(AMI_FLAVOR),src)
 
@@ -115,6 +116,8 @@ STAGE1_INSTALL_DIRS_$(AMI_FLAVOR) += $(addsuffix :0755,$(AMI_ACI_DIR_CHAINS))
 STAGE1_INSTALL_FILES_$(AMI_FLAVOR) += \
 	$(AMI_GEN_MANIFEST):$(AMI_ACI_MANIFEST):0644 \
 	$(MK_SRCDIR)/os-release:$(AMI_ACI_OS_RELEASE):0644
+STAGE1_INSTALL_SYMLINKS_$(AMI_FLAVOR) += \
+	../proc/self/mounts:$(AMI_ACI_DIRS_BASE)/etc/mtab
 STAGE1_SECONDARY_STAMPS_$(AMI_FLAVOR) += $(AMI_STAMP)
 CLEAN_FILES += $(AMI_GEN_MANIFEST)
 

From c7b48e1ac13475ea40a330a27e024a8a136082ba Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 23 Nov 2016 13:55:07 +0100
Subject: [PATCH 0904/1304] Documentation/devel: document mutable pod
 environment

Fixes #3258
---
 Documentation/devel/architecture.md  |  37 +++++++++++++++++++++---
 Documentation/devel/devel.mk         |   4 ++-
 Documentation/devel/mutable-app.dot  |  41 +++++++++++++++++++++++++++
 Documentation/devel/mutable-app.png  | Bin 0 -> 69683 bytes
 Documentation/devel/mutable.dot      |  28 ++++++++++++++++++
 Documentation/devel/mutable.png      | Bin 0 -> 32313 bytes
 Documentation/devel/pod-lifecycle.md |   2 +-
 7 files changed, 106 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/devel/mutable-app.dot
 create mode 100644 Documentation/devel/mutable-app.png
 create mode 100644 Documentation/devel/mutable.dot
 create mode 100644 Documentation/devel/mutable.png

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index ea4e20ac86..6e22577a90 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -106,18 +106,26 @@ This process is slightly different for the qemu-kvm stage1 but a similar workflo
 
 We will now detail how the starting, shutdown, and exit status collection of the apps in a pod are implemented internally.
 
+rkt supports two kinds of pod runtime environments, an immutable, and a new experimental mutable runtime environment. The mutable runtime environment allows to add, and remove applications once a pod has been started. Currently the mutable runtime environment is only available in the experimental `rkt app` family of subcommands, see the [app pod lifecycle documentation](pod-lifecycle.md#app) for a more detailed description.
+
+The immutable runtime environment is currently the default one, i.e. when executing `rkt prepare`, or `rkt run`. Once a pod has been prepared in this environment, no modifications can be applied any more.
+
+Both runtime environments are supervised by systemd, and a custom dependency graph. The differences between both dependency graphs are described below.
+
+#### Immutable runtime environment
+
 ![rkt-systemd](rkt-systemd.png)
 
 There's a systemd rkt apps target (`default.target`) which has a [*Wants*][systemd-wants] and [*After*][systemd-beforeafter] dependency on each app's service file, making sure they all start.
 
 Each app's service has a *Wants* dependency on an associated reaper service that deals with writing the app's status exit.
-Each reaper service has a *Wants* and *After* dependency with a shutdown service that simply shuts down the pod.
+Each reaper service has a *Wants* and *After* dependency with `shutdown.service` that simply shuts down the pod.
 
-The reaper services and the shutdown service all start at the beginning but do nothing and remain after exit (with the [*RemainAfterExit*][systemd-remainafterexit] flag).
+The reaper services and the `shutdown.service` all start at the beginning but do nothing and remain after exit (with the [*RemainAfterExit*][systemd-remainafterexit] flag).
 By using the [*StopWhenUnneeded*][systemd-stopwhenunneeded] flag, whenever they stop being referenced, they'll do the actual work via the *ExecStop* command.
 
 This means that when an app service is stopped, its associated reaper will run and will write its exit status to `/rkt/status/${app}` and the other apps will continue running.
-When all apps' services stop, their associated reaper services will also stop and will cease referencing the shutdown service causing the pod to exit.
+When all apps' services stop, their associated reaper services will also stop and will cease referencing `shutdown.service` causing the pod to exit.
 Every app service has an [*OnFailure*][systemd-onfailure] flag that starts the `halt.target`.
 This means that if any app in the pod exits with a failed status, the systemd shutdown process will start, the other apps' services will automatically stop and the pod will exit.
 In this case, the failed app's exit status will get propagated to rkt.
@@ -125,6 +133,27 @@ In this case, the failed app's exit status will get propagated to rkt.
 A [*Conflicts*][systemd-conflicts] dependency was also added between each reaper service and the halt and poweroff targets (they are triggered when the pod is stopped from the outside when rkt receives `SIGINT`).
 This will activate all the reaper services when one of the targets is activated, causing the exit statuses to be saved and the pod to finish like it was described in the previous paragraph.
 
+#### Mutable runtime environment
+
+The initial mutable runtime environment is very simple and resembles a minimal empty systemd system. Once `default.target` has been reached, apps can be added/removed. Unlike the immutable runtime environment the `default.target` has no dependencies on any apps, but only on `systemd-journald.service` to ensure the journald daemon is started before apps are added.
+
+In order for the pod not to shut down immediately the `default.target` has a `Before`, and `Conflicts` dependency on `halt.target`. This "deadlock" state between `default.target` and `halt.target` keeps the mutable pod alive. `halt.target` has a `After`, and `Requires` dependency on `shutdown.service`.
+
+![rkt-mutable](mutable.png)
+
+When adding an app the corresponding application service unit `[app].service`, and `reaper-[app].service` are being generated, where `[app]` is being replaced with the actual app name. In order not to stop the whole pod when all apps stop, there is no dependency to `shutdown.service`. The `OnFailure` behavior is the same as in an immutable environment. When an app fails, `halt.target`, and `shutdown.service` will be started, and `default.target` will be stopped.
+
+![rkt-mutable-app](mutable-app.png)
+
+The following table enumerates the service unit behavior differences in the two environments:
+
+ Unit | Immutable | Mutable
+------|-----------|--------
+`shutdown.service`  | In **Started** state when the pod starts. *Stopped*, when there is no dependency on it (`StopWhenUnneeded`) or `OnFailure` of any app. | In **Stopped** state when the pod starts. *Started* at explicit shutdown or `OnFailure` of any app. |
+`reaper-app.service` | `Wants`, and `After` dependency on `shutdown.service`. `Conflicts`, and `Before` dependency on `halt.target`. | `Conflicts`, and `Before` dependency on `halt.target`. |
+
+#### Execution chain
+
 We will now detail the execution chain for the stage1 systemd/nspawn flavors. The entrypoint is implemented in the `stage1/init/init.go` binary and sets up the following execution chain:
 
 1. "ld-linux-*.so.*": Depending on the architecture the appropriate loader helper in the stage1 rootfs is invoked using "exec". This makes sure that subsequent binaries load shared libraries from the stage1 rootfs and not from the host file system.
@@ -164,7 +193,7 @@ $ ps auxf
     \_ nginx
 ```
 
-### Image lifecycle
+## Image lifecycle
 
 rkt commands like prepare and run, as a first step, need to retrieve all the images requested in the command line and prepare the stage2 directories with the application contents.
 
diff --git a/Documentation/devel/devel.mk b/Documentation/devel/devel.mk
index 6526f0481a..e59f222601 100644
--- a/Documentation/devel/devel.mk
+++ b/Documentation/devel/devel.mk
@@ -9,4 +9,6 @@ images: \
 	Documentation/devel/image-chain.png \
 	Documentation/devel/execution-flow.png \
 	Documentation/devel/execution-flow-fly.png \
-	Documentation/devel/execution-flow-systemd.png
+	Documentation/devel/execution-flow-systemd.png \
+	Documentation/devel/mutable.png \
+	Documentation/devel/mutable-app.png
diff --git a/Documentation/devel/mutable-app.dot b/Documentation/devel/mutable-app.dot
new file mode 100644
index 0000000000..8ed92b8160
--- /dev/null
+++ b/Documentation/devel/mutable-app.dot
@@ -0,0 +1,41 @@
+digraph systemd {
+    node [fontname = "Arial", fillcolor="#CFE2F3", style="filled"];
+
+    {
+        notes [
+            shape="note",
+            label=<
+black = Requires<BR ALIGN="LEFT"/>
+dark grey = Wants<BR ALIGN="LEFT"/>
+red = Conflicts<BR ALIGN="LEFT"/>
+green = After<BR ALIGN="LEFT"/>
+>
+        ]
+    }
+
+    "notes" [fillcolor="#FFE599"];
+
+	"[app].service"->"prepare-app@-opt-stage2-[app]-rootfs.service" [color="green"];
+	"[app].service"->"systemd-journald.socket" [color="green"];
+	"[app].service"->"prepare-app@-opt-stage2-[app]-rootfs.service" [color="black"];
+	"[app].service"->"reaper-[app].service" [color="grey66"];
+	"[app].service"->"halt.target" [color="red"];
+
+	"default.target"->"systemd-journald.service" [color="green"];
+	"default.target"->"systemd-journald.service" [color="black"];
+	"default.target"->"[app].service" [color="grey66"];
+	"default.target"->"halt.target" [color="red"];
+
+	"reaper-[app].service"->"halt.target" [color="red"];
+
+	"systemd-journald.service"->"systemd-journald.socket" [color="green"];
+	"systemd-journald.service"->"systemd-journald.socket" [color="black"];
+	"systemd-journald.service"->"systemd-journald.socket" [color="grey66"];
+
+	"halt.target"->"shutdown.service" [color="green"];
+	"halt.target"->"shutdown.service" [color="black"];
+	"halt.target"->"default.target" [color="green"];
+    // [app] dependencies
+    "halt.target"->"reaper-[app].service" [color="green"];
+	"halt.target"->"[app].service" [color="green"];
+}
diff --git a/Documentation/devel/mutable-app.png b/Documentation/devel/mutable-app.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bf7c0b297e83e7ca1b966d502430d52a7cb7a2f
GIT binary patch
literal 69683
zcmaI81yt8x6ekEGDcy|-N_V$(gLJoacY{GlOG+c%-QA6JcZYO0?8E=e&g`Dqm2;%O
zzgPF(Puxe)CpmE>1bhSt2nZxe2@ypI2q-HE2*@5d81NN1C%6;v4#rSgTm<6z<?VNK
zZZrhMTL?)JL1nk(gC%!uc@2`bQ~CQ;c4|6h1X0Q97;D9JTB8IeBO)ULnNVvJMwgyp
z#u^P;qmkJGqe14Y10gA?X-q7Q`Tg6>F$vKhUDt=sdJ#u_*U88A3Arn^jz?SwbKoBw
zsUNBk_|I)cgfh<Q^~;AZpCf#LPx|+DRH3Ha7-?<@@a5;Z24|Z5{QUPs0d6C1?(XS@
zg<9hV;1?(%5zdgok2jI5udg$*(8w=fJ4<t8o)UA}vBp$v$#8jX#*<qM!JVE4{q&QC
zBVEQQFE5`}t@uFY<supQZka5MKjmvdB6Y+B>s&dDL=-!z-%VX#1{oMfm!~Xb%l;H5
zk2G6TGp~e{6!qQ@Fu*3^s4{pkq+>2<Xy~WpIgNk611H(>0emy&Rd8@r6+CHIuLL@H
z6s3O*-F>;i!rn}a?&4uHRW19(C&vBgozdb0@sv2F6BORd>3MH7=t_Ru>Jib{*w{ZQ
zb+95jjp7$!Zeq9YMi%k18$Cz=9w`1X?h*&gL)UDk;sc9V?a1Su&p5`k6~ACFzcifs
zG6@MvuPgq@QT2DbB8w-v1zHIjc?y^?orsKYLaFBwsaed9+cG_21ZqN&VDxS{<OUco
zPaB<9&dl&%V=+a{U(;{@YJ^s_;Bl5hVMTnTvSRM(k2gIMZScr@o<hPx_NA(-3jK!!
zSeQm~rFZ_Q88N{@-d{{}xy<Gf+j^YITj>|{^y}Xk)Se!&!af#!A1l9)gDK8M^V+sZ
zWp-VUGF$OvYKVQLRO*h{PVrrHP`3JdX>4jbF=a~?o)$`R+8(`rq{<&0jPUvM=PjQU
zyJx1Qhd9IC6Cw{4n6+sWeAw?~XNwpfTmj&r>DKpjHArHW#yebyL@h>BJ^G4@6AFy`
z!up>iY;HqCi@bJHQ_%B2kNs+8C+tk`S8r;G*UI8lwMNX*oUk`jM`_EOcl8>3c11rD
z@Sz!bnN*<kza7gqp_}_N+LF4+%@=0y*o4dIfaHnnzeO|S*yk{Sw}<ZT^p43iM`<ws
zm352eN0V(|$xpv*pEt)gl!p(AWpBR1<L;V|m5-n!%ojLzWrY#);dPg=eII4WOgQ!!
zZI`}X7WcezW54x?yqA=}*@|c;<ihLUDYo26J>ISjz3J-JUgU_I{fXyfu7@%r=UDGU
z1KB4@x!_d|p|rsa#uVGB6;QeOOo>ALAu}gOF{>smH>Y4|sJrpD#FZr{%;I{Svt%hW
zw{S(V2kCUnXO?jIi1^RajW{Av>ss~v%K<u#qKXuPQ;@2*-TP)r<_U4<V%~S~UeIdZ
zCqRC&V3P``=`fI2&-c<D%IDUIVT@y=JpWVNNuT;RWZm`2@JMwHe8@5jpOIG!$@llf
zs<zz2>3=$zsMJnihQt0Y*k3;k32msV(%-oH4?adzEIym1I>uUuYH&9a6gMYB{HVhh
z*Z%~k7A`Yn-73EmK>M^00e+6z<CC;pYNJ@!6z9XQi}cWNnBBHnQhqR|oY8n)F$IOl
zfJ>{rxqQLMb+fT5d<~7c-F@?noPyB$eEw%GE>z?9w|x1iLO;~VUQ$Pl;+0E|drM7;
zeplE+(Cq*bCwBX$`$9dcO9(~3IWG~bw45C5+jWcK$zCa}!R9i)=Pyb(u&IWZrF?0g
zGqem?#_vNBtMsyIAe>I@4W?(2A+mB!$A4e4&a=Dbc#6*~GOtCtIv6?=#UA@mc)t0v
z7|Fix8!i83fc--$;mCP`8WW8JA$>R&?&2U6*u#9?ZbX#pf~xC$NgdNdj&Nac*m_0(
zJ8Utj1jP!UK7D+wr}E`6LN{N&#kq5`=?i%8JvyzpVR&O*!1kxLLf>RMB$t{PG5mM+
zFATC=n;g-Jzq^0)aMbB{SKlXk^XHCwjF-~U+QrB!31c}bJua5^B3&A<=2d$=`V+8Y
z4ZPwa(}A!jWdWx!cE?AwyQz?ppC{>jZZ8emU1J53by6kGe1FS+2!G*g`eS0b_pzwU
zQR@$_B=b;``Ct+lc3*R?mwc$i%mKzOl|LBijsqRk;DRH~@||}F>|0OtCacd~$@_Ut
z3kX6!tk~Sp;#ejKoDQ4jvgWxB?h2Fk88h>|G0Ry!|2R+X_Z4NCWmJ(P_kYh}lq;xv
zf7(CQ?@%vncHukhVGj%hyNBlnMY-Q5XEFS}TUxvy_Fo=)Y%B<7mXZo4&&}FN_2f2G
zRb~hwd(W1V#1s_6F`a3e3sa=Gn3PYpfYrbl3TlS}uH>vANKl%UTb#Xe;*oKw?GDeG
ze&Ri6?)#eV1H7`US47AZd}PtZjl-uiE4>guLPqAC>MO#S(&|(UZo0z!bm}`}cR4*!
z^n#opBi+SvVq!2A)RYXCGIU?V_?NkDeSNjz@oy%1;5!N2XG%2(yy76fA!d~+Lm~pn
zgnMo=T(*$$@H7ti2m`|QCFK0Ip?=31K~u*QFuRyQfP7eoPShKZr{#ztDk=(nP!y(7
za|9QJl8WklNW5WcE3A^e8!e}c9q8LerQJkfe<MO}zK7Sf<k=TgIX0`=>^2V$JlrYo
ze-rH=82G@#5)!#mqrW+#HCo90<Fpb=gSnUm9K*AiVvVJ!vG1DWU;}VxQB1l6j2<4f
z^b$FW#R8Y5XX~HeLD2Z@3A#r!PueiynT`aBh^-iJ9DAS3HonfYupDR#N@Lm0y-fD)
z&s$8gxRrEHtW)hd&ULOYl%`LbAQJa<)Yg&}U2u5|C01grE>ODILPJGWaeCd-)y3b|
z@D$<Zd-?{-gH`bBbB+vs{24UJDNMyoq0@Sg1FO2kW|sL_?$Cq3y2t8ubYQ$6;X&5V
zu-pk0jxNtK{aoQ?6S4075gb2$H-tIp;yGGB)b*5*u(0l$C^pHpN@?yGl&A`0fob{!
z(fc?y@Tnn_i5P^r#Z)}Av6N)s*>aulGym!7DLFa$&!0a(Dk`E!5c9oz|K2|<i#(Or
z9Y7U?prC8WKA5Oz$6+inB_#|tHfPK}cUJ}ZQbc@w{Jg@#%+k_`#6<kW#KhgbJp(hd
zA78&h!oa}n{>5$zE&zZa15U$9<ORGOS1;7sI$r)&u~}*mm61W@uwCAC86qmtYn8J)
zAVOcqkdTr2D5-(R$LD=<fkc^^8<7*oj;}dyW?`OLkQ0!T!;YV*X@;ASSyB>Spt<bt
z$jZv9prG=ej_ti3`mcvgroFvAUI|H3`aQ@9;^muKZRQA)_op{&!o-X6o9&OUk0?HD
zle^x*;Ns)!TWAuqu&~e${b6Kd>+b0IcD6NWWNa)tS7E%em5C`7BlI7N$>{3t>2X-=
zfEE%K4ytqT@9UGu$jGSkxTL10E{NAsZp&)I3)qrjWM=Pf@F4o@QI%uGWpsgvI7Vmm
zCGM)wmg2OA*CW2`vFkPZ@zVPzT|!rzmCd6ibs-cO3}0KCa;DmPG;b_pV`FMfEdy)g
zuoUa})G7sj-@ij4BO~wb@3%IQl6Jw$zhpyH693TsH`3g%AprnD#m65w-RR|V+@{@O
z&|Y2lf0LD!rEjE$N5JDbM6JGYv=lx<SIk&j^rIzxY>>uh#B6^zqc}69-nbhlu91MC
z^Uwa+ViR^ZcxScL63Ep$L~%A?92z>Xu5T;v-1~RZ$t6cFg?n~>KI8ZAlMZfwR1)l$
zPy!(}z1Zye>+$~D@nTouTSVIG(B8x@0lwm&e*b|fi_ww=4#ZL`d3VRb#m7Vb55{4#
zRF+o3j)!;d!=@&m?fAH(Xx7q20s_zO&r}fcABgbw_Ua}JM3)+z%~t<Pbp{}fjg3*I
z@A{)2e<Qa7ulAKPT$GK!%AYHBXPpmTtI(lHXO?E<7F%Z<4c#L;DK}@EOW^j`p-e(+
zir?s59wkll;3w(gKopV++ZFz+gQdaLX3wAo^q^>IYeJpBW92)wp=mqc(j%>GPne|!
z2GmswLRGQ{SS{z+uf2wf_q91agF{T^nJk9f=yed=$Hw3z<P*oM%#{|GmK2nfXxjVy
zQM+aT+YY4C9^{9XJ5&JG>n8@rS(v$S2?bSE+1Db=>yr$jKw=Y{fKdsi)3`s~`Lk<L
zc>V}+Y?y!SZGXNk`|8!J*(!IIKxE<!3ug+8Dcc__eQEX%`O&uaD5rNae`uN5Du-m(
zi3L2m_BH~!+&3Y7R*<&trYL!vdCeyp*yyxsy4u=)`;lP_HRVUx9(@JXJt9tx%=4&6
zV5rh}@swpOW^C-Yf;Z0<VMB~3KO5cmPKtM@7FK#zhiUb8&9i^0&4Yr1Xw}QUa6A81
ztS;b7syWOsICrrUa0wD%Kgd}5sW9ncP1!%Mm6Kf@=BdO06Oq_eU>!JHw)0xWqM`gI
zVk<sLYjkKLTBT4mGC5g$JRN~lH~MAI6cGG%!_x)#&CM2kLQ)pYK<e+U+(*@hYYYQu
zcvp=mG<>O+)r>D}l|}7*GX4JnLX%3v4i2mu?&!Ktqfg2C-J*`~{L2>Vs{4c50ZP3h
zM(zZ_v}n$2-QSvg(N~6}H5-@PD^NF9u&z3xr+pO;0;JmP-qkJl`Jf=rFHxd;E{_;@
z^CSCIGxO}bW`&hIpVW`)`2y(`R=N{C*otR8IeD)i#*`GYvT`=2W=U&X89Z|Ssy@z@
z9kL#JGKdw9f0VI6H0nsUuAkxK`D3v2^r>eE?ziC*38Z>8Q@n+2Z@K{=M5e{csp#{H
zWZm;k*!?a0;ap`PGLb-MM@JM=Qtj#7jL!iVMt7CJ@7l!Cn}OZIA99k+>};9Bze*FH
zXG~nu8onjX<PIgY!YNIhc`X%km<}gX?V<Xkmj1_)j4LWD&CjP^$%GBs?O!M(TN4k1
zV*T0JcqeX;>oeC@s8bLxcVs-vME;iYS9U$Rw=66)wV{ax%q%#^+l|YA;@JyyT3p0r
z=KIE?6%I66;2xP1-Ajx=e_ngs(gr}T-o*>y>mV$n!4*3(uZ)=JR_oq(=<2aQws@yO
z5%qPpwB@8MyW=gysVUnIkE*YlTbz0YPB0^gbGN70NbC?;F!*>E3%5g<0M^1By2JE%
zp(j+O8AT!(GXn=)H+mg4*LIu$`;O(M65S&Q?(p~W!7>;qrPBiBg}s+RO+&-vF^}!x
zy(XsJhv<X97?qY|yCpPh4dGIZ=U1JLwh?fLPQ;sF$+5Bbw>HLJ*sGp|J+QJ-+>zr6
zO}N+AZLGFc<g<xMh0PLovgLGEubQ5b##|5`><H6-gtOOpQ*3BPb8c0Yv)NKPOKb7U
z@IV_Br8yorxfl^9f8Y=hsP|6%P({iAA!BBW5goF13&Kp;>MVe=!P?^TbWzB6U^gAY
zst(^HK=IL4RZrdkWVRS2{qD}h%LWgi6a4AQY=E&i=aP2JjgF2z)tmP?8)uL^vXX6D
zaKDXcZ%wD%hmuSq2z%2N(T0I1a_D`#@FGA{+kitvFgWrXVWi3p0UPGc&5>153=aVR
znMR=|B^A{wi5qooxU-i0c(JfICe}HF@p4`Zk?Y6^?Zqe6;b)`a!g9W6!bTY}G3<V-
zJ;0?zH|}EdcMSgkz&Whj1i4A>ATK@>d?&NO?%GpW4yBoBad9{f2kM*<nGMd3chj$v
zA4Nr07niIGN-8~z%4yHVgnc9|jo9ifSypou(2WBsxB}(~Y1a>NviBpS+1Irdb`n%Z
zy6wR}!eVG{H}9$m*m8Gfn)7vX>BS?6>GnqbP#H)=!r@3os2ssrftZeaK9p6N>mip<
zfa-l0&uhyAQ12-@SJ;8CWBuml1@9JM1A}U<0K`2&$(P^Fq$*c2dKn<bQa@d%H>ZX;
ze>G0CCgVMm8}=^AJd1U#sQsuU9Lq32X|UHoc5yQlOHhl!<-#3|)p|i$X7i7j=vr5P
z28sFN*&eBPM0ZQl0pHk(%`VR>_}jNvmpVmro}7q0mPX-e%>zH4bnCCNwi5Uo^@B1p
zURe}S^GeFmFe2mhA|M`ZeKpOkS1vUS2=r8$zn{!1shpy@+_8p7K{0J>`>NgI<u91|
zVWMj=H%l13`=gF<^hm>Hj_^*Zm3AZHifZx6mCf*lxe^l_8{NzCg8qs2B6k=oPB23_
zV8FZ`QSJrUob~wO%~ef~9}%v+(5@8-Y*l?7{J#aa!$ki#mHDt|Aocay*m$ez`XEnD
zkW7E1_S7k@xb7!jmY!DpjvIHy<i4~kGK{$0<sIKNY;sp~iS<!c*G}`_7>T#8i5mjq
z4Cf<bgRBMDD`H(?I)^tqX0HR~wFM!e0Z4@jev*mRwI?apFygU$?81b(FzcvJI(<o{
zG42a``Qfz&-N9Is#cFBP!<VNh+`6>=iH+a!E@=ohj`YROq92Y$T9AnN_SZ~ogDbO<
zPhE{xB$Gtftn!6NpV@zzAqGoHRXv~4upjXV*92qBu_YTPW}zNa;Q?vohhk4g6F-E)
z%&}r;`>VGj1%V*)Ho#^Hc+a3)7bic)ho=TpJ3LnQI%fe==d3A{K2z4JUYn=Z!fcYm
z#U!%wBUdUrd8`@3G*eIWdIBx)r*!R2SFzMrV++;VEE8wxX&bKgo<mdI(M-woOTH9z
zjrealB0|HI3z5+ZygpG<uzJ51&t<h~Sgx;|Um}<O(<|F2nKw~UiNno);_*p;Cn}Yo
zJX|c=irxzjX*MOj@Vv|hJv9@P505Q-BjH3m8g&+LR0?@;EFX<>pM%v3uevpNLW)+L
zLjl5ZGE==ysn);@QMK)^v8awhhJsjP_CO@yNbv~cy=hXS2tdXgxL%2%+$-}#9r+)p
z<L`7;M_m!UktvKF1$_|Bn0;sh+Rvn9^~9~B@!DfM&ON*Yt0m{~)+c_LkJ?`2()((P
ziXu9){>~vDXt<ai>#?wBvH5BfFInot$ii@^IMrf<V;a@D3nur#RgA2E#f=*$^XFs%
z1GS@{k&)fYod&aY;hV~R)r$@wtD8QJKLQHaVux{@tMu*-4+1ENshPR&xbPh4TrrUx
zQmq}N@C(_YH>P%5w;on568N+8)1}-#)4FbuRM_lG{vTLa>|&$Aiq}M%lBtk-{h@w2
zh2^?{^HQR|zWPa?y`;VE-)=p~=Q6ufbd%v^mGLz=(p1v_(r^LwfR)}Y9bkcFCC_Bb
zdJjUaC1I4AnSvf3AJ_`DUi1(Tr298e_w7ZqcA>4l`_kt*Q@f*{@I2Rgw2C|`*0Kp4
zr;ad>Rs17x#9tZ`5x&yE*gcKYfnuJia;=BQmIsZ1fIvyz#A&X@p34({wOv<}7+iDs
z5hhf7u*^rdj#IUd?p!p9dr{s)NL&x6igil&k+k`xq>=N<2udrlx%#0xq!wG!5oFkQ
zZQROqsA`W?+0Fz2oup&Th}XI~1@GdL!s%QqxFm%HS+*xCHM0M#9=f&kx<)pY*Z&a~
znfZR?ayM?wbN^5W9wmF_SFySJpJW&n+1=&o@8_m++qxqI108dUfq(X&GDddzC#&f~
z<iA@K=``d?%!K^)O`0BC&O~;$9vq*|e<gtU5Da^b;aDnAm)5u2?rnBp76by7kKejy
zZ$sRnv{9M1vnI^a>{`;gWp6RS##+GOVARKbzRvrcdpM4pP@svVkLNw}lMSu#y-UxZ
zWlWCyvy0<9s+o)u%=*Xm&lV>ArM}iC^A~$ovnNl*s?=S*QlvchbG2_@G~JllS#>KK
zjc82%#w=l~sF+Eoib_FY9q2DS_LA}3C>u95BzZcS>jYEYEFU7JN-{YsoL_@Y#1^h1
zNo8VrC81Q<6GNr6Tvzhr2b{%B{vasO@mi{0=c@>-NBTW^RF00hA};1rxYC7Eh$I|D
zSXe6C@&vslZD9x8#Nio=!_%nrsvhz2iA)Ap=m!UdmEPwbA0h~czQrcxubf2x(uH-%
z6@f`<_-3H7!OPUW*bpxN{jZEx*(+BRTl9@%CKCw(nSmrGmmVRA2M?#WJUmHE6TYIk
zp~PB`YE0e-a5V=4VL=Jdmj?q1?G5ND4cFbvV+oZM5vThXrvTXbS2zs&5=i3=89oND
z%(`s83l0wE)cVWlJ*MYYWhT7BpqZYP)fExF^Sh*EcnDqq-TfBbvX(?lP;f2#uoWry
zJIcBDvyF&u&_{9co#HA`B`V-vG9=uoriF)W#(A4S9l`TYpnQhLUvNxgh1z-9gnUtp
zOpFr*A~-k71IF<O<fx)%vh(dfxz4@xwsaaaeR^8gEapeYF=G?rO41?hY0jizYin(F
zN0f#qu9YmNt-sWS(-Sp#$wKc-9jsIr_s!^S`UvrAXlU&2?xhzL1eE9FovS_kiQjtz
zQRl-J1?B0&=(XsCIEbHFP#|{C(Av?UX#9%32*v?>Azz~w(whG`IK|t!$!p<s^VBGu
zXf|nKIJ}s^>~?RbKIDiOiwIBfB;6YkmkEX?1OYdW&E$;1x6Gy&4HFYHc=BoCQ>6_Q
zVX{SqVRvxtbO36`?&mQyz;{buM3!5Z3r#C+@${lBi9>v>xrQnMi-OYUOyj!_9hvxM
zB$R9F2d+XbCNUb_&#t33KJmQIDK+lgH;leRY3;EmpA@6gPMkXArKB8E9b%~$c5dgJ
zzOez;9qjceTA=Ehb3OyLdu?oKRmk~irWl@>ZvN9!JvPLc0vg0k1J8Ej%<xmIsIV2y
zbFH2po;MUet9egJn`|B1<vVWXZ-ePO33vNvUe4MP;jh~&GGxD=VpTuZrkkHnA1vMq
z++80(t1h4kH6_20B2r!HSg8*He&?z06K>6XQ}Ce+u9iD>D0ekvV)A^998<Gl*v5Wr
z^pOI~Yj~Ft3q%hza8wTY{%+FTKO_+VmYJ8Ik8^uBh<Iy`pmXmvxaQr+btaF>H_x__
zM4EY1@ceV}n&~>VKJmDj-``YhaB}jzW@n-VV<QmdEgxSPk=A3rZY4XGwbh$2QWloV
zwsTSIXKO~b%1sxUAuVfRI0aVb_liJBG8~9|oGm+aDxXfcVDyhv;!w(7lh4z->;=?|
z^^h?{c3}k5k_W<+VYzMCniYQ<st(tON8a}Z{ClqOD|_5|kaw+kn;!ZHB$K|sg>Q!S
z209Kl1Zi$Kj{4OcG$(}3N?qK}Qt>Yx-^i*-OhY3Zh3VNC_B2=H`3|g`N5)j=!Cw%c
z#(I#y{3v@vNky~6m72DEQxrhVwZNRr`GCSx`y^X<rH8G4wAVKudouc}wAJRmn-qvE
z0b&8R)kvfwV-hcJQ^xE|_I^|qsI=IyZy{Oz(|<@d*H9!dRhT%|a&737+M21ppjEd{
z0w8^zvj=sowal6JLbD4h(mpnS!D$hR@3QtmdF%%y0`~RQRM(m3+)Q_haKg7_WGTKb
z&k=25mJny}!xuP8cOLdIK7Y=_xVg5-AY<5AD$t266*$g4zB>~g41hRTt_fn$taH5D
zWE!8CkoeI$*zK5GUNs<@HAJI6c7kDRB6kzH+c)?b$RiJZ0yhmRJL9(<zK}0*C_czu
zq|O|%z)`Zcr)9?r_AY<oH<ROsh<Ds)%p4h+@h6WTz3`REXjsmx7Z{KOua17(XNvu|
z27NISAc(rR?<JG!d}zLwL2WRx+}a}i0yS$$_HwRapYXe<XVaLc&4`qQS7@`2JK{yv
zna;Ugsph7~uy&nXriV*6x{^8T?`IA-4qL&%VZBV#lPhtR0@Xr6hE}vt5~eQ~Rmy)k
z&h)p}RYLI>lfZdobYD)ZV?TpfJty`~5by@-H?&esGLwL8N}6dz-OGk!TMJOIZ?k8@
zUVot9W>1`-ubXr<>L}{2H|`nH9J;VynJE54kws2nWTFvi;|<$fg_I`GGgkSX1H@*N
zU6NmrV;tjUZo1cAbhL=7V?p=O`$9*x0k5U26_L#?X+p&Lc9J*SE!FIR(oqcFy#X%e
zx=P%oTE*^Q#oW^E?F<n>c9lSIM<lLHZTo!=h@(QWlzYy@DE76fSiBHJ?<i1#lixH;
zx^FPckSwKMHRF_<2$tg5$mu8p`~}pDp|;XQ#;w2_20CAcwHF4eKa$Q!%rBK*P)rrw
zVk-+YABRB@E~Z-#sYOc;-++$rJF{5s`6vvJFYmo9&(QiuyVnQ^zjF#Y#=f9&ddhu1
z>_~p1jK6I6l_Z(3E$UCHBZmpq>@4vWQux#-`F1D#`Gv9Y^86v))yJhCkc!9uMau2Q
zT*wZ?V*G^sF7r4eJ3km$Ron7^mGuqP6@wi$e82cSwyZ67Gj7u_d<hP=D4)D7+WB?K
zfPh28m-Ezs7=dlAyU*R^rr{g8^1bVI%hBo|4sTBuH@nl8Olm(jx{9J!P}s#R3I>L>
zo05(_IE?1=TmYI8^IA8eKO&H}>O*X(Dh&h_NxL-`Vw1LObh{85jB9OrFQ0IpH+kzx
zynlfD!PP|&mLXk#I(L+ejEqM9_D3Ekv4CWDNu^5U-6#mb4BH+@R{hsZrn%?9cyMz`
z9GnZ`a2TZg|B?i*?tH}wj`6*w3)myx`J{VbRSGTqJv&U}^++D5U&@3RV1xwNm-|XX
z$i;=daT>8>e*A~Muy+u0>JZ>HPM2B(b)+qeC`p}jOPTcqY0=s~eLlCw^u|?_c!$?)
zczAp7iNYx%BS`qVjti09JXm8t%l^3j@t>weMNK_kmP*IR!}dZ!+kT^N%K?QsSM7iH
z0w6{^H00$|PvklZ7tAM?0S^-5|0E{t_`_>u-nlID2~>^>Yj7P${1lg0gaiV>{rC-o
z-_mwk=C9k^-WqU9Gt*1Ht<0o-8e9AcOxi)E8f!<>CVZaX+4*8C^kJV=RmoY`T_V#|
z00IZA%yfIt4!lPLMY&%p=bjEO*JhYcI{wER*XYENv9Vz-sUN^*f~TIh#zNg1nasSa
z)xgis%R9MVA&`)l%NQ}G3u;ulFx6Hz3cT!HY7gC{kPmJ?`sQ>|Bz|3!))ZYM)%c?<
z#Oc&pL^k*DP|~%uWFVQJTR>AMNVM6L6KL5deLN7#4n(n~q0!#M7Vh%m^F?%F4yAmp
z620fjF|mxyqx25E0e4&z(6&8`zUFg)-h3RMh8U@+rWfC=ZVHi8uDP|vPx@a(+(8>n
z%?L72xm-JPppjEm-;MzV#6Y$O77Ngu#+P$VBE^xVS!88pT@Dxf<&AnyjHO-0Wa4i-
z_5w=RSGzL~!>)>y)bt)~_l##|j=8To_Fq*nvz+SP!iJd08V<ztUmQ-nuy-L|@&C+5
z)=9@@7LSG|SD-^(3~qY&N+~dzzNTWMgZg5+qB%S?#FKsM4wicC;GD}}SH87|afDJ!
z)KM5{Xmh^gO?}5*d;%SyNg?GpS&@lOFE!zE{fXZa_@ju2Goc_0R5(71F3!ssJ&dY8
zFqXNOcb)MoDJmL{cLlLp%>I0Wf~i<5UBP8G!LLyv)b**PRFNa(Y8yHw1H7lZrP(u2
zAyZ5;klc^*i%bwEAkas9aLRqzS|C`qxl%t^VQ*bR{%Ckw*`2yA!-;Tf0s_GM_o59o
zrM<R=$Y{iPNu@11&wlF%TrbYLgAsD`!%9yR02SKd!QI0RZa4vD)dTs*9nyFA%2F2G
zz-*<mEfOD*LsD<8<4_W>*_biD4`D00PRY%sz+p(<nNa1wIGRl+fxTKC_pf|U6h{fu
z9(Xm@Ds2fQJYck;?97g3Mis%I5=X!El}K?VAsC;Y+I{Zh^zA5FBqbvYX%6fxvnT4$
z|7i&^S#0iauc6a3jJPVNjjoolfy+YnR&V^W=szOLY-2`Kph6|zDWA*YyT=cTQ+s4|
z<ipLmiC5!eaD=$?g%ex8g=H|1YJ8F_f)>iJ-5<zf({_$muTo&0j@4V$)8vf_jQH&f
zJ5GWK;2RwR!Qs0gZb9F_BXbnTV`Ec>j|knec@Unq<_ikBCPz;DK~Bf_z0MPb%bp!y
zt1v@0|KVp|K>@SZ4dXkq(oZYhLAH(68%e{(Hxy<(33zz#iBjF5sruz-YwVFyv>I5P
zH{Z5A6!9rUs_l+vOMg9fKp<Tv`43z{3~oD_p3GhXzBvF?x+0nwU<op46VgEZF31?V
zid`8$zE@G7d5%2m@faeU_!_;FAt^sXTf+%J3TK@;E)aE1)`ER;`A=<uFKu69(tg+7
zY<{>EqjgoP*U|xOM`deP7*S|Z!oxo|rW>dr7h!Ah$`{{c!$OG{XS;;-LrmryboZ>>
zXJo}hmt7ss|6If1s4#kl?m&?N>va#Z{J@`h5vQstbLExrEk{pGPwi}fVCiLwM;Pvo
zlG5t6B>Ov3FxhuOB-Y*{t|03TIQ3sEgM@1;PfTXlN$q00AQOhqc4Iz?Qe`=Vob7w<
zjv>_a{FwwOU~ckF1N>G(nAiMPrPQpfF<UgMWlnp{lWeT^&s_u&an`^BNxIj~cDn|l
z%H?{;8F+P|e;i(%m76_&JIJs*RfxmR&JLCvb$v>-5AI(dlx{+EGoO<0Q-UN0g~Q3J
zV2#xhNb}8-a&qm(`8f2Ki}_%V6+PVohSX;bXhhxpnXp{$7bM8XC>@K7p*7a?tF1Oj
z^z`)1TM9oE<-~x=wa!OMX0@&oa{;GiAS5I-TW$pFd3CgPlHQ4%6ql>|7{J*u+1=jn
zk1!oe{?!c%8~_pBmM;IwTu#q3IL~IN_}@&#!taGKF|k0F7L!#$GKMyuRG$1Kf~KOP
zf{E!+Vs2rvzPU-h0!1o?@{jA0ik#XzIdzSVMXq%QMn^`r18;Ax(UwHq#nxmvD>5rP
zTj5VXo+kwkwTkQSiefTstRe-)xCrtQX=&*#3lYx9Ukqq2YqaU4x$sC_A?cB5&VMI!
z@{<UHty9Zby{UvzkVM~0L;JHrk57zCQlxy2I-knV$q9&#R)Q>sCtX%MdkzN_#m|i<
zCN|dI*|~daitT!_+HywS-Whr@^jD?Sv0BWtGHExBzf?_Zc}4NJ>J&a~tm5)KegA}P
ztOnx?sWRAOv5w}(#U_{7q?u9&I_hut>7?4B4INwiV=){oo$c*kHR<V{tS+IzV|!+A
zT8kMTPBye!jEiQ}0}crSYzpWHG@yN(20sn7E%)e(%>cFZzaFe*N!h{QP3Lx?gDHrM
zg-D0!(#sf#+b?}xb@n`w(F?v^=?=H(Ka??5ur;iV2%@QF-W3VqCVW;5<Q~H3dQ)gy
zRA;yL3Wq^=v!grYU=CkK`7`-UiH@+eG{Io7YP^QJf%-5m9~2pI-5A-~I?IZfdU8z6
z%q-%Zt`RO7_aI%3j8eId>==%aU5^*Hr!Nb&BU+@yOkk!}r`5HzjMV1BO9#yqHU!^k
zOys0bw+iItVQRL%LKre4{=oeq^pbe+_v3d)d1i4oB{n^cEi2=qqM~IJSASI7um6bQ
zGEb6gvMA_G0rmh;a5wiE7SCce{ueE2n8$xfbxze&w?1E7;YDZ>&VL3z^rsCOV$XdB
zA5LaqE5!?0TkK$t!@9b<0;BSLF)1OT|4$M}P-y68+gGTY`+LXzX*zsXJF@LzB11#N
zIs%-Ks0!x0JD8X;j^ClF{KglEqf-;&;%X==Y;3GmRb%7hVk#;~bVNk|EcQo+^s&)V
zAyGD8#hAoIDT@K$2?S8OB&226*1p4LW#{}%jvC6$f(2oEO1a06azyddNg(n*2);fL
zsP0>#vWzS&on2k8rKR5xS`9JTDx+BLCzBU@-M;dfv%8=SC4{du-FdJbNj>?NeIw3{
zZmnW1<{6r^Q=ZDX;vz<;L?@3&heRir#vfK(O!wi#2j=k)B2@pR!XMYeX_hD(3qxo~
z&RB890*d+_aX)WxJsZzJpBbdxc84?mRHf%kdazIzYNsJKOWJL`z7W3otbV7+hw=Cx
z(E?#f$)F?-TV~HIt8d@G-)<+_o}8Zx>*)#9%7Byx4-XF-BTz|5KrsP*5$hm2dA(2v
zQ)Vs6-}9}WZct?9<V2;W4ujlyR&~AEZ$wK=Tj%o#qp7LsUb6T1Z$?&@UqAp1KK|d`
zeS+WVC2|_pNCPoUBI3QsP*6~ah=`1=tV4VQF;wRsC}lq0vyC|4zOCLL8w?ZTav;yw
z1`46m2|RpKQZ_2v*G~*&&$TvNSd6T}+`<g!A<T7FwH!|2>D`;iEw8ER>FI${nR>{y
z7y5A>_#a}`foqgqIaYJHT9*Y~HH^0FJ5C3ce(o4NWBIbyF|>CTRxYkSPtLI0Id=!z
zhvFTNz5fSN)KF7@*-{kRpyI1KeB3`zM={%S{fc}3@5S+QJm{Ih)>^Sylp_b;Ux4q1
ze?S95W!!5tdp2ZX)Yls)y2N*XU4;V~PizC!lON6ZKbr$PG%jW!<&Ft&$6K&3Lc5Z9
zI`K?cl4Pwq;3-%~Kcet$Gevx0rE=f{7OLUj$^2wa`)@7Y_Z1dX)K1RM=dntkKK03l
zTUlGb$;;nWR8*X;u_id2ulCIJ2#yVeP3D9oU~kJ)U^Ie}NsMu9f$-jw#v2&zY=L#H
zJ{sQ<AyH;l85MeCByGg6au;*QetCPk96_!tN6yHI3Q{R}te!wUrcjegMP)W1K+K>&
z$<3DwhYZTPgeXmD^$ZedPGPVp(FzLv3C!95duQRm?aAE#hh-{cv&2A?Sya@uYp%6>
z=}!PU&2G%?q<s=wVnH|Pn^3m@-8pSEox3B${cAZ<*FpsBs&dNGk%~+4vzWR4XCmt+
z%M*>ldEVd~e_;2P*RUEce$vbMPJxqO3e87$>cQNn&$n;io3hO+4*#CE>}{;F&jtsw
zeV#<WCOFHGkdTwbTEFOZ8dlfV1f85%je5iB7&Y$AC@DV%BHNw5yZ8&O=MDWQvHkWO
z8v9s;V!9$u2}_PC`xLW6xgt+J{at5l0ER59P2HN&W+&zhRlH{+kOK#nn?2_$O;I>(
z7C*Xpp|3x_`%l7eH!X44ANKA+vGh-G!B&kE3nf}lqPSI1R?afu(*nlIm*{4${~rtV
z6=pu-$A#@-H#V1#(n?`1I{4{DMG|Hr?f)<Sln(j@K;U=e{z*{)c8H+h*DE@m8_Q0n
zii+SX(u%xCw<o+HHP^KJA!B;>S;p9Ww{=M<{IaAaL_^f}*BgHZSEyuUWsPsowv-E1
z!$^D|&;$eoO0?_0rKOSl{d<d(d}~HU(>bHpxi!cIURsP%AA+2GlV(1E-OAvNYuJ%u
ztEjidWFF)f_W4kK5u5dC?M5y#B5}pB+ILtqs+;TGArHsC&l{k>2pHo{`@{&O2yg#u
z4|eC4QqEuZReHT&uf9X0)*P&Hw9-j-yt%l+O|8d8;TiJo7i6B*`AXC}X!^~|FE}CR
zDsEF(`HxFAv5egAsJ~X2IU2KXkUpv((VQ{7vK4$y)Z}MMcK>TyVbbU0vMG7+5u&Mj
z*E`k9#2!`?WJkCU@pD5t9L*ZT4pr{A*L?K!;r?%MD$K^-fv%&j&HiZfse)MAfK%qb
ze;K{ph9wsK;6K$n3_JBdJvv4;__Af<*>?#-a+M-;hw8s>-tD$BnNY5$;%DcVsYvkC
zEW%$~TLbyd(9|>#Bx-5~^?XIRQ<s0O-`O&%s>2eA8SB0z7HN<7O2FqF(H_C;4}O#I
z)hD4Tgo?MhmeLp^1~Y`8i|l{4ZSL>QU~l6Y-#Z=}K=AKz^61SO??+%#8PHe=ygg<?
zXSj0Gc+$J^M-|!?L=l2BpwZfsl=nJWdxyi+eUa^)!s8ka{RX=XGzReU@y*rQlU?r5
z_`){dwBh2lFV>G%)7;#)XNYnYN_pUTXDdS?#<#tOVfxW8(}O17!uAx0)<Y)InkMJw
z#tA}4T|+}5TM7%5!)3!jVCY8vV>Ngz6UkU-zyearj)I4v7#3?iNzKhPB>iP`8l)9F
zLw{b7Di=gMRN1dN-ii6N?2?G~*o=GOybO&MSH#^ma_)MvYQSvlr2Fvo)cRt>$R+Kb
z)|9I<-XBfuA{|9*P6}0!H4`sRz2aB%<nNw0`=E`{@OZg-D23<OMsLJKrZ~!Qnm~lV
zfA^bX4AIr~SFkACv@+wlD4g8e<POuf;>&N0evq;xNDADYk_i|F5*c0ej8@vn6B2Ww
zqM@~49WF54yOP;jA7(@(zad=?{g2GcG$*Qp;>qN`>;hD+HPE{tlTe%4rcje>MIF=K
z+Zjo^@$kZ-LPKd^`f)&Kd#+FkR{c=nzlP5Z4a?f(x1ik!k}pwTQI2C|tkjZ>nWa*r
zaZ4oK+T0=!oft2qq=uU=QI%%e$14=sG5*M@7hO8sp4JrYjhsT-o!eSBV*pc#27~N0
zF~3(|)O%?=JG<Y$&rfb{Zg!w~(C6vaRB}3aqVi3&a%pOGR~SBYe?LR(HC}99m&bHv
zR4nahQs=x*^TP>F9-fWE!?1z^>PDBtcbuH@phvED5|6a2@&#G`P!t2+X&V+4r|%y2
z2eyE*g8R}?{K;3~+5)ED$<as!*OGk|M{o6%a+NhKv;L-Lz~y;IcX<a*th-iR3C}mc
zJAsaRu0vy)C%mxDre1So2I;!JyHHK~^flM+0(Yb|x|OorC&uKuuGh-MD1uM#>^=J|
zsu-@N`gaUD5I;!f5|)~dspnN0D(TMtetwL0s~>6U=-}bt^p~65{rvscc6I`Da<+L6
zro_dx2tLRMDCMp$a^<Naxg2_IStO47DJ6HH2=H&Pc%5#AZxbb_q?nIoK!c{t*U-@R
zn|)|UE3MDi-0%F{q)4@<ZLk0`5VEqOt%)s?L>PH~nmz}Jx_=l3=`z_L;;8Gr!C&6c
zjRl|IE@8p8T#BdsfP;Twt+tR!VBQMb=kBJ8EAyKw$|1hom9?E8$KLW?NxmU@&J=je
z7h~IINkhO)zTx+{_yN%U*@A5=8WE9ft<4f3Y%>JM5mzNmzwXPL^S^va?w0sF_5Jod
zUAz9*%6T$*RD1^}cEwMh3nR?TQK68kD%N-J-qm^CG6R$c@-Y$-QA+J7JSo2g8uN>!
zpZ!U;RMLs~1{QeE=xI0cXwgqS4d2khD|nkJGk6vasFm_X-gA$^TNc%KV7XK#Av=A<
zGdBE@PNTCY%Fx3U4)F>>W*YQ0il*^<159cJ+71zkxMK)7Y#6QQs}!S)yvw}29j`1|
zm|wxdsyAH37LJPkqLNudG=-xege8O{M+FRykdW}?@={b@K4PiS)e)>SF`vf;Sm&<Z
z|E@^*vp+5W3XD($>W07dcZJ3Jq^{}gM+K$W>MW79ioSP0-g1wlX<2b~Q(>3?u<O8U
zhYMvIrmOXPKWh{LgYSnXrq-~Xzu*2HmR6&}FOki1eSbfsrG+1~g&ABQEjjIuLaL}}
zd_8Yg$U&r4htR5Nt1=(WfL?649GFr!=oVvVPP;|ahiJKRNZAMCkW#h9)M9=Vh=BE>
z1eUC9tfr+vz@Gc$U0&|r6eu$r%p?kedqb4(h2V|1T78|yvT>S0$v|Z6Q@bME*%c-k
zmoTE>$rnypv;+nrA*bCJf#-*4*(CO{EJ+M-V@5m#o9>gMqQ@^C^wQ2Ltl{LZ<wlOG
zQOV5E9@jow7G5XmOksGPxXJb=yc@Rxwx870dgta624ZO(L0fH&^@7+`fl7IGb*wLm
zP!r_89@8HvpAeaf43KCv`jKo-@Y2dtFDEl~ziy?S_$h=Mat-1Qs<*5W#Pr?%^nQA9
zS1s1;{ySBupr)2<IaA^n7^u|Zb?Z9!UV(6OYHcSi-Pv+?464S)f5iuC;@5H7HLZ13
zLca|6L_+CJFp||O%2OM@B`X_SzEUo-q@-jrC>p?rJ~%uCpgK-=%-;>^pK#-M^N~EN
zPcd%YAE#y(U50T3x7XSR&<Xz!mg1b>ScXN=``w3Getrc6I2s`Gjm=Fk5?J|E-u9K1
zw838tEEbcLlG9R+cbAT03s%<YVqwW$hisf1L-2B|VI1^z0GND^g#J=eLVt90G+Ce$
z0tWHz+qXK`V_o|z(A)Vf^xv(jZ1s0R0CzmyRHi-FZ4B>tg$q3GX54ppDoGg78r_Di
zfOz7~<kM(2V0(IcddVUC`-8w;Ke@ON(a_*$_OfGT)xWYjIsIz0<iNhHTZdXzrJIj$
z90N{a(`gRR(p)=oTsf`lS9~QUB^eo+mriHUOxpv<o4C06OZ5{g^}AW^t9Swib?Oh$
zXFfjut-U!h&WUoJ?^>NBmPiw)-=<VrW(ya8{3o*0ZzO93FNWf`6r6&t4MrDzaJ5)A
z2f8&$U`00e_oeTz4o}a{gmiQs>8>{)&jjiB^^~uV1WR>MiIEG{c0wDP1DwY3M%+M(
z(7TNtxuHG2yl|q|u4|hrR4cEn>|9<Z78Ol6dEfO$<e%kt95gf}^FcPTE1E)H>gAeS
zFbzp>EVWvl;w8d$=&=G*!MhYz?lrac(mqN2k5V28kEPe9)q56B6uTX1qZP)|^EK8X
zK;g8ou&^!1Ij)W1Ht@9QN56TxPllGfyKq0W2)7R%cFOs{rqO|ZF*@k@`1E+6%<r8z
zIjL+hT@+Maewrjk-xVnJuS0m<J4Og0kW&N#(#nLTpL`>Xqvd8idD|>gXR`qv9eoy{
zW=oV(W6Qu|%00@{xww&C#nv}r1RQaD;m=WihkC#01@Es`4-iAJzq*V)7xV2yqU=iR
z$vH%UJj`Bw9$WA8$Za~3+C4iPkI!b|HQCCDnt}R1Zr_D?E*g>C!@d1NXVp&V=ylo+
zOM*WN0Ug}Zp{uNn2>{J&7#N3}69Z~Q&`6=cal^W$<TLY3r1CkfYDco;Dl`zqF-Ibm
z@6FTGr{+6Lwd&+8uU=Of{Z}g|vMu}axsqby;v2iW-~jwd5&;ty`#0eXa#1u<2*}sy
zeN5pB5gs?Iow;7Y(Ac6S6f7*!fFq;h;`U7!YXyabWSURpxYb;3ehh><P+J<2QXT&p
zU|Y<PokDH}eY5o|*?R$-?prvKUSlF-hnc)*vYjDQ$Qwe^7SC&X3i(tKVd3wZ)fV6~
z4w<Krm;OJUh;%s{k(slH=@tBEj3fziCf9;Yj^*9oN}CO-a?XfwaBttfg#et}%gYNS
z?`->x9uX?>vB+@c->(MM1NiT3%T2S>$gTW29mq|CKaZp`+7LEvzavF)@0;=ZBT8TK
z6-hZ=s)ZS3K<x&nppz530+qsm;^N|ir4Rfr|E;<0g0)R$bPAB58fQh{Q?GqTX}M7h
z(JW=1VggcUTieH1P*7aXe=%)rY;NxE);BhUL3f?wptT80^RB4x-8qIpI;B==OANUc
zgWW!MmGv9r!R?}V8aYFjYHYvi!P*aM$VqErt8atS@ER62Gb>9Zh1+>_jOvbo+3%+9
zUjPVU)_#uSYJ+rnyr)Ps!=H$ctLlO!8De5^&;hl>Xe5>IV7@v8)U9Zs<AB6{a(dc6
zF~PC|JI6YXJMf9UJczBR9jSKxXc<--z2=vM+%TSTqa9?86(mjJOvzu=K(HBi<G;#7
z>B?U85d#B*m*udSDljlLy`DdWR|ppEtM~-8L=mPR?}7npvoht0Q(q5Zs7wgsIm%P0
znmT4?X6AG~A`}!9e1R!IQGThXr>6!JIkEt-;WXGz5gm<&yO^bSo69N1RdmmZo|aFH
zeo-l0-AQYo!UCCm{#MP07J*}tbI3q*EO=0R8|CTa_a*{!8cNDf)fOrsZNVWU0{{`w
z;JokSbPt69<XkYMF3Y+>ovTU#4ngVnv0|(pP$-}_@ot4^t0^lh+kC6BoS{cVLOMM;
zY3uBSVqjnZdV`*3ug36r06V~>r4PZ(XFPLi@5!u6SC3mAugtY-5WT!~8xvu9e`BOb
zybA)6hT8dR5M1U!Lr3obKqwECl$@NL(xn{K?9dm}297lN-FL)cdwN&VUTN(PEH&Pz
zN2TaQQ6C&SetvLK;TjzivkPcC?hiLivWcwiU>vr#wg40AQPorzZ4tB>U{~(SUC->M
zKuFH&&b4@trbEdj!+GDgxUeOBKBHTyi10qphmFI0Iu>AOk6T^U2YQs9g9EiwmBtU0
ze?}&$hyiHiu8U5=HHb<2-8`^8m5`8-%;#CtW**+s(!!9uebeF5zv<axN@qFO^}#}6
zKXxDWInwWt&Cl;+2sW2zO&H#}n2M}1wPV8I^9>1Go`P9DxZ@R0A|MCu3YC<UR6Mla
zjQ)4sm)AKu=>Vjmxe*(eXesJHW&sqbfY9V%dgH5_nNfOP9lRi#gN0fYAie;Oc6xD<
zWzZR5W^UfBP$cix@yn~9=%_46HeUZs>=GVKdEs(@buWR1&Ed|;?Yr^KugYWtL?b8y
z-8$3N324cVj*dK?M)vJ(QN2EK0Pp|1rct`EI4nDQRhg!42(*zN)*dJni%*#n6NHtO
zmGw@0==ayhrq55059cESl)&Syvo``GF`q8dDEIjtN|8EUl|#6t-Y>;EMqAS$U=mf<
z{I!nLY#Q<JOd#|dUC&bXFA%SG<y=+E5p0|E)USXVLdfOt`pug+KolVLtO-Ji{HOBr
z6PI^6e1RfdM-AkX!8Mr7<wr96LSVz1MOu)DonMms#-EVe>4*3IRb*V87zk@SN5{_2
z&hG&JwZx)CsMQI*(Hu?Q9x|ypC{+z5H}Dh=3R*oxnkwv!dT$$3MYIZGZ9bUxAZe-D
zT4v?oz$_k4xb}Ro<f^T#_H=R@@g)WiCSW-PE>A*9M7a%JI+4kuqA@5xX?ZZmiap7&
zqH*qXwAK96_@GHzjO?6<tc=XTkDgajSXq+C#_<D)jJ&>~G9qX&0XeC)rT2!(_1DSZ
zeh<%zr#!eVZt(PQn}H*_rcL&WT@dy4+TxT187ya;?o~yYHKw8j?`hW04(2$d{Km(p
zS5=}R*x<5=jFi+s9<&*SG(`$H*6^vT{6_>+O~c~v^a&uXt?f>`QSsnOykFPUbjneu
zI05nE+AV^u2+wXgHI>-G(GmF8Z@IYeTwSjXc4*)*Lg8j#3!?ftietzgm_FydHcLrK
zq1CRllYy#=e(a0T?qu_7gZ=*Gh7}<G+KNmh-|r0rE1$XN4pHHJRd)37miDk`Q?KSU
zGWRoZU0x{ma55K2O-MX?g7F`_+UCB!h3l9r{0cKJX^PW0+b=gjX+(UkK4hr7h7~1&
zuZq=6#N#qLm87@z{6BjEri_tCk6NFfm{3OLY9hlHyJWrEacE6%>tX~^X}8y30n84K
z(*}joW?72FlaHx*6MkG5I{5P~UX|<u0Bd&k_N07#DOXo68JU@ZDYb89FxTOe-okye
zQ{7Du6hfHm<-aNm^ghT8z~5&6B}!`uFD>y7UL3}@HDhMKe`x6QN{jcwQsb|S3#SkA
zsY5`5(x@^+3&CM9nXfW8DpUP_?<eo}6Lzjo47*IfDa26@Lw;6FT?vC$8*YEPJz8Ef
zc2ds80a~prGAt{Kd-nl9EC3KQUS8gK7SnLtQd!QVAnM4MRq2}K`Q&U1OWHWwP5y!D
zSAEt`A?AMaC^H4D-sRNItD~hsAl>%$^}Pl44=6D|!OlB4ocY0z%3X1np7V}W`qOox
z^DK9B?F4<X##B}nvY_U@KwUJ|X&el*+BC5-q0vg{E)v{1{`=Pu%n3J4EGjxWf!Do4
z<@QYnCz{GTXt3`=g8so!gp9Ceo^v52KIG9u%yFlz@))8qqDu$AVq+syQ{_O<w&(TH
zdk&6Y@$tCe5%tF{_v%e<OuD+dU^zOksY}lgN`WLOg37eqjpnxoj~rmVAS0;t3AG5%
z=YDXoJ{emRqyVt!j2$q^E5pO#Amf2LHrwLO1Bz%zf4})G7?B&A{J)cEuOLn5IcJGH
z>d^l_0M`-cK13rF=R2$lIG3B7n?HeH@S>SkTfTUi<R3mnfqR!Aby87LnX0I*9G~;c
zpJMXNwmaoSxY`dBtivx*&Nt4mmR-fs{fzmnqWHW@;?*Vo(816bsZ}K-C<vLIolUFT
zgllSQT6l)z$Mm5<1OaSLW@)rsxLw!ccO&k--O=(d(AyB!$c}b~Cygs%VPSyAwLM(W
z^6?S*`uaK^hxPaOi-?M*R736h^aVa72vnvVilDK9ohkkC#X83O_C4>-+lRA|z5XOD
zn;n;M$7GTlNFLfkMpb2H5d#C#H#qbn^tH637=G{{Ut7H#jXs`XdysR#6K+Dla(1A7
zgL@Z5?)U{;bn^Fi{{2gjii!$Ox0AOoB0tEzlarG_<Kw}fkU%)!88L1D23=QQA2ya4
zRuXX=FK{MaQ<;)5M0mWO>?+d64l`XESlY_YXYc4t<iecd<UoqU9G%eAPJqpzrmHKb
zs)`N%4hE2l5P5tBafRRMV}RUHlqn?2KKD7QU-v3X44>Pn3)Sd|@H6o_O!2ZAD?aG#
zSzm4cz70VKdVfbpKcQn_B=ES>12Q<2$hMz+z`IJ*vQB&i<V8_fvJH{fRz|;bVN05^
zow#pSo{R7^i~X^qB-RCqH*Jn;-0Fea1Wty8tZethgyYMpz(s?6iCz7An+B?^pF<eW
z9t)}d7;>-R!G^%Fz<7J8s;P;KiNSz647$<I1{qpMmzMq{b2&=L$$cOt{d#-8lZGRZ
z2Us{;;oOkPHj6I^*=2Od1>C*eFSqAw4g0GozGc+;uMi|i{f}>bBvw+uZCqqx-o6h1
zH{H?f1{oOt24H7WJ$VH`d{vI3rY*^N%HWTQT?PRk1v#NmI0bH#C48?0+zH&q0_dEK
zl(e1qPqO=y3e*rqS~u-B-!gdd-bT(HHng&^^mRj}(HaA&tSt4|Nl>CYd4~*;H-fe}
z+zJW{xtw-UUqWJOX{mr2u7eW&zsZkFWO8v1zWpvtDC8e3f}YUJ3o;jZ)JeB%o0Es9
z^+EBx8?f%Bq@;cX2OAzO)^CGNLD14#VA2F-DgYn5?2EX&lY~lxU!;<bj;y664Fq@r
zWi>Snbaca~#gP%)4irfH|BI)$jH<HxzJ^s)P`ac+x*McHX-VmB>Fx&U?rs6;?(S~s
zZa6g39q;CM|DV?}7{l}Boa@@L_F8kzIrq%nnfT<5nMnArIO&OhYY2t;8?LQ&M!ON3
z0JV9Mh#8G%+2+y~TaEs2N;+@zlMHONXK?<ojtk;igO~U~!VtjW;{Z1?KK@Ng3IP<p
zU!)rv8bGO(3{}<LEod;79wx|iB3FMd$#n#dHFWh3mzkGcss<Kv7U=7)j)CG+5P)ox
zc_EqT!XrG_UyUgrPJ9%O<~et@U&AW*apFVP32D{9N(JdN2+6(E!QnsN>cj^Ak_2a`
z`m7XJ!xs242`0+S?xo}6Yb~N6_BE?sJGl2yJv}|{g{%fYf36)LujHxf0j>7R%8FjS
zzaas!Fx@6o^C^Uw7aMGoSs=w06&KGgDmthhGcz+&Zm`M0G;?OzyJT>rTe5~;a?Vru
zjxN*94XFq-A2zs(jHjig-QFF~rqO7WUs6XQ!$vOu;QcvOJeFdBuy21&B1bkVEp3^c
z9q85x85kn-^C@htYPCDwjB9&h;%_nnpiSct+lmiHPY(!qcQ5ZIS3o1$5VTY_e`K9Y
zIDDbegbP6U=2Wlny`@L3d1Mh}L05B##`De1++fKxta-zh*AXmKdNTwIwv&NluC_2Q
zy%_a5+{#yisURy@S$9MM8&&jkvJsgr#NuReadBW|gol<L77_8^`IZ?-)kJe97}dLM
zC)wP(c$T^d5s<&OJ7I{t0#Sy7j;_~;C3!W4+nEW-+yNpIrZ+H3d@$QpYaSW@{tMJK
z16L%zOMPHS;@E?Z0xK_wN+vbQJs}u+dO{p;b>0TOOpH#}L2e3)*szz%CzYQuVIR>e
zx=}=Ms}g%~AxHwlSU$|z<Ng074@BhT0ja6D;Fp0io*2|1pf{G12NV*xxZN=sQSp*r
zLR5yyzC?-bg9l{KEGY>)TCAH~UN-j_>+SUin_r#V7>im%gTWGi$qH)8wM^lAoZP6H
zK~-D{NhHG`{V-u-kT!R$tfV`iLl_5w9qhds`2RO*3{iFy-;ssf3t0@J{CKVek*D)i
zH|=uu#GhMesN%#x-UNa?Aqa8c@xTXb8yh0f{sB*>tEUI{ydGpYX=m%}6l&O;ci_cP
zxjROdxWQ>Cb-L`hnmKJU@_c=DWiSv;x~ZIX{zEFfz~ramr?=2*aZ@SH1NY5i-w<>I
zmLubjz){^7jt3|QsCanh3NIu0zoo6yOz|U9B%OnSYf#2!pa&{~*J~aZvKFw4HCa$n
zLi!&*5S@|X*?VQcY&eQG-PAkIIkO%}OmMdDgdwymqN$1R=jUhV=%{CCD59%N)S>tu
zzLSCbjzV6(9YaewP6Ck!oc*lo%*BMvcAR)>br$+yVSqeNMd8!8^63BNh@*de5S|A3
zI69GAH;Q!f^xD6^ez%o=lVH1%@#Y<4H<IT>8>VjLgeMncoR|=BRpFrEa=D-YxpZbz
zQ%VxEVX{x<%4f+7Gd63t{s8ViTikURrk|S{xS0fC$pA?<2;AUog*Tlk?ijT&k~Z)~
z{w>>av3IhUmz!s<2+CE(a&LeLvHW%@gFp<f4(Gc7J<QtLx}uQATl?LAn{F^LO8Pc7
zz!?)B`(k%I3$J_=fx+JO`LHd0JI+vRJvnUlx9T6F1odDFqR6khfrQCMy3!9JB$caF
zVR(3WKv5Byk+Eu6SXxTP#8fG5-wP)A;qg(#R1Svtw=W7fsGvPQ2mLvv3upNC((KHU
z{r>gqE0B9^YNVdewmrksxBM)`HrD^^hRQ}LG>Fs8SiBv9$0clRObIYM423?wQ=*qV
z-#5nGkjv4QO+h}hXDVID+ZT>0u><bh?WkIg|HJK8jLxw3&JGvH-Cr3O79Q<iz8EO=
zS6-$7c-;v4cYR#ip}huZRk%DZu}e$pK#J8rGLqBWoC+#dAO#x$Ky^@fI2jdHFbFl{
zuRB$8W29uiZ+|RZ14PDu8!$fX4u_ZkiUI74U>w5Df;?!*SOAVCOW2r!-+OETJZKye
z`6ue+Sg*Ce=H%iMLZT1F0HaGRk~azL1$3Sk@3AEm8eE`B6{zAM>GcbXizCYv)My`F
z5c^hUdA_Qd;=Jlj$43kPV(Y=f^LzH-o&|-k0hfHzqy`hty>CvYh}F*CLABb#r3F7t
zit8q{>!+TcPe@2n&-sx0&$)#wcc#sKs(+Iy(|^9lL=J7cLjb-FqPJfRSBnjxc@2E;
zBxxTQ_&`oB@`?l{s3GBNfxHO<8tC7QIAZBDB{d92hJ?V@*4EC=&8_Y4FOYk(v9X2B
znm42UXeZ|Glyb-t2-w?Yw(js#Ye45Z9G=E@^?d7OcK&%M9XD1%>|#MHqT-;eEj@zo
z36p_UyR5jFgpY4^X|(vdEF~qS0bB3i>dlQ4__;ne92nw%V-HCnO(XZ{d_OK!PZ}yr
z3}CJ5+S)AHf*%xUMm4G|*zjUGC~;zb!r9-7rY9B_{8h7iwHba-CY5r4Q<x%7>{YDT
zB&%@Iv<|y|YR%}V6brU}#`TsBM+DCmrZo3yw=tA)Q+<8<%t%vA_XlWbXtG5~VV4cA
zMb}na2Z!Dj4<;!ols_mRY#OMUlHh^_z2&KTMn*;+RLNop6NaoE9r>t76ZCYSJ?bB9
zD5#;R15lm4Fhq&NM$GVM&NMVM%vM{|K;D)snPQ-z@>T~^u-&2b06rN^>)!6}*X;4%
zvITz+F2QqxHvv=T$FGB6x3CyzXYZITO9@yy`~@uU)J$sby5C6&80NhW6Bf_w_@$V~
zss%&7xJVo&T9INFAg|l#)KK3zfkRkd-}stGBAMkwQb;O(yFoPkC>`C!#jmgucv(ZN
zi(e&acqoQ)YKUB1TqF}(p6%c%Hg`$(s!9>UrSj|rj<-nkE8SPA;7|(S7MbNMBE{0i
zZsxTC24-c&-7*q6ZX{SDi$E>;DopjeV_n7bn7mkM?=kPcg4m<fhnnNPy>B^Y|I~7i
zEv8K3Zl5*M(u``bCry1`F9*%0rM>5rdb^zFk6`=RZ1->GtmCVg-M^36a0k`7dRaw7
zcByub_Ll=9bZn1E)^RCs8dnIu0=$OYTM+|rD53_`6U__*s)n(kU0t_qZiCt<J~XI@
z11A#M0yGQ^4Df`J13yJ`WO4EEtnF*KPu}I{#P>O;KA&kd?q;PNPeLlX!a0W5-_U)I
zSI!E`r7jDBK6d}*1C5w9xyODfj}0&}?{~25AfSQ{D@f22Gvd=8rX;FE*d6twdSv5m
ze2L%MJ~?P+$`<68l;ji?1OevM{{Fs^iAh#PMNs_ACsnmYBXjedl9IUEnJ){A=<Mw5
zM2@yyJqqF3F{n%!98xHh;ZjoU-&3s}tUJbKyko#hf^=>TT(N&AAupxPwf!YX)ipZ$
z$rW1UykUNHX2wl}V|rld%5mkeN{T$q&|Vc@1B@Yj+OAzP?~uuqNn=yfk6P;8zs7ri
zO~y^8i~t9T6CRHfk1FR)iLj5@d^rEOu#zFUg~f4wLla>_)B5poct8Lb{xLrA-~#}!
z58#l18uJD11wA}LA`U&3F%xQ~&S=t;zXFP+*+N5TxhFiUF`^sg6F;cpUe+<Gczmh@
zvpkY;63iSKw%o5jf|)-O|B+lt9UUE2*VSc%O<5>U5l0m}=&-PWmM>4m$;tVnAQr+E
z)FPb?=E&O4rn6@n-PIL3l>{X<O(XG8J3^33fGCP-e&uyR6&$n(`5~A<8#~=fAE@x~
za7aiRnBpshaQBr1_*57Ac<;X%$E9>E*fktK4jHj!iWWvX4hQ(GVvjz)l0Q1S`0FD!
z?%(lSWOdw2IHy~C_iNttZ<(S!mR*@5d9W1W-upPKh>(-x;^9U$4OBQ<ecd4Gn4U(*
zNP<fWfu&=@0u8R8TCpRwQ|6fFp_t^C1ZdZdi6OUM1o_3qTLa`7TSaB9{AIJ(SVq@B
z!Q(Zb4N`-`6tt7WnwsumEM!0?mK8!0T_2~`0CiAkC;9X8@={(wAt`Tjds|*nQC34k
zz}=lkQZfug=#As`pnyCKO<s@wWghGEi_YaPSd0d)QX4sK2$5sgW%tzTNZGlcV)nNJ
zBcb`y-x}lovg5){Sz!)B)Frf%6sjr4<|cm{3cO|@WU9$2RyNUVJO2U_64*d_<ogyH
z6%$hwpqT#w*?{@NxKi}R4jQ3-e>ykMOwl3hf_u#N7nIvjU6&NV>U}phbQO!0tyO6;
zzF`Uhqzm5M+#E`Zw#2-;re<Qn<j&Kz=}nwim}*IuKpvpWA{!<#%ND?4G~gD<`^%FF
z5ZMb8#Sz-auODs%3+{(b&0nNfN%(^W4SHY&!|%w0-hw$lU*`YDuC>c$w|nU#Kj;8=
zhrns4Iz@$!hsRlMf^JgtQNfi<H7s~ZC4eG=Rv39IctxP^Px$x0@WSN8c?gSoYNi3t
z53dS~sH9z!X9z$Ddx3Sewbv+03K*hzx|k1jF#s|_GP>gBc<I6ekZuqeGHxnV`DLsb
zx3~KWN=tiZdgFin)^>Y@I=O=FUSxaK)~?;`{&;e6)dNPK4N;o$=7eJZct5M8CJ78H
z_JOH!aane2X|jJZ750HiepyjwX)ZPn4vx2gcM{4c;h%zUqmYq7FBKIZUrJQ8zxxQ;
z_SQyjy5IG<f(nb(q!UIDXEBh}VQ%kFULJ_mi2%x0*hcmxM0&mW6`W<@9DxkT`(=+`
zG&Usl_6md2$k^EUTPA42=@gDK%&*`pDczPi!fR~zOG%8<ouU4Fyi1x=@t22q5BH!K
zR53d^WML3}!!%8cfy1ri65iW-6MT5yUp4l7xD?6H9QH~W8ZPGI;b6#eU@k^jMTT%Y
zM~G!=b|Q09*N`m<;FXPy9_FYV#uFqiE-qHwGGTIbj$I=o@Y0Bg+%3%~=a-=UGRf`i
z>I&AcUqV8{Zum2e(%07mB({-0zNow_Jr#kfB@j@Xy&y*k8PZZxbfl!DQ#10LN1NhS
zyYg=YI$>boiP=d)+aoD&-oIU^!Z<1!{X{DXKQ*f;r(vBsc*bNxHJDFDpR?gaIq2}N
zgOE^AP#6URRj;%WXsPX0<$M_HOfl3Q@nU0t#p$bzxqPHpgZ1a@P0=jd$;<E{Vq`?-
zYh#XxpoAgbeSn?2aNz-4Zfa&`;_u(Dl9KS?9}CMD@WF|Q-83tw!7o1E;3W=SUvw{b
zp*l*_Z&~2irzdiAw?s9$CPG!Ne3g)gNAtA}aESKbjDa;SFWG*xte@vzsz^ymH=I}h
zIpX24Ys=73Rzb%9TiH%h!U~c7o=|@55yc`p1$s$!P3><Z({JMo{A%K;!7<OP3lgT{
zuqZ)jh|<!wuXgtKg6a}5o}N5jVlJT1WMu5s<eP9**iDYOL8`*-x!a*YqU$j|HDv`l
zPXMUt9~~g1r;kY9H}U4rMPhU(lOr-f;-w8<E4T6%=o&rP588nZQx(#8rbN%_iA96R
zsmg!dtH_?3okrp$4Fzx_2=k(;%mLlq-4$h;4OW>2ef=pGl~hSz7GQ`&eQ-&<19kG`
z)YQZQ28p3z7qz>ug$cVO)o#Fm2^1w+xw*Z#zSA=^vPw$Q<{Gs2_V(bLCue4Yn*yNI
zHF=$GZ`SvYd{Xk*j?-7_8(cp-p0|(SraA|&i6i+E9_;O9<`%xOB+xp<!wsk|u4qcB
zMSY!`RpU1kPo|n8>7`+6OFR;GS^b4gR!d1h+!hr8j^vz#Cw+Z=0iYl0=HC1P4z7D~
z@q&$lLiDYJ-j=>5#I%(x?ZTsP4#$)#E?CRs)=wY+!Fp|t5CM<VS2c%->PtEnV^vTh
zV@$zh7EDNDc*`R@-*;p(+!A2{6>Gwtcg|=S5Sd8ZMDJ$Yhlj^RX7VWK@3t>^8nByU
z=R`PCXCuk*M6hgmXKbuUZqHS>>4P|SR;;jhxZ3s-a6lERXP@*|2gy*nJ@*F%I2Hb6
zWqAVvBtWJp%kqC`WknATiec{`oSa;A_KgwH6Yz0!yPuq#_H<3+SZaAL@id=Yo%bzI
zimS)I{l;!sUBfatu_P)dfCsh&3+tD^6Ux%!a!_DYSf*!X)YQTrf4TzV_Xh-cLKb%4
z$Vly%4<9}dl90Rw$mn?BidfAQiX@BiA7sf30N-bimjgzI!|~EU?GYC!T67jdlLUK6
zk<htP^5^CyK4dtkUSD`?gFq-140}E>Hn?RJUZD6*-x<qxhpfVG@11)2&kq1uB);GJ
zo(JXW*+1-C&QKIBMxJKc5Wk6ASLj{<N~1mk&!2z-c5`#1tU&e+v%CA_9KcB^>FB;l
z_l2X&sH%!7D4^rrAv`?1Ie~@g?BhdPZP$Ky@Hv5p>7M0-d2atrxH|9&ygtFj#l_zx
zWoZq2bo&|wmMKL!Ej3AZNzzN!X%Ip(Wr|MD5kHfV_ySwITp?j3<kJI|<0IwKH?vmo
zD^BMh%R-G?LEU0DSMCL$@+B%M>RWd;7Rj($f9h?)aB_+nK7j<1u(+Bya}xB#zzu2G
z@Z;W;q5`l`=}ew3QUS!HemH)QNy%L8qagBPvD^TBqQJG)hZMA89GIrc%4h&Y(1F}B
zXwf*tiVpMsmt=u_bV5R3g<hY;Hx-$vhHFYLH7@=<e^fMVsUJp|9dex?;L^Rdw2|;N
zc{jp;1C*I!JbxO*IpALOZTl3Za8SH}jy|Wk*w?>N^#SS)3}S?~>Q9o%Tp<)JtbtH0
zX5e`^=!D_UFG`+9-4M<HF^c(4k3}DVt|M%#CrAG9Q`6H`R(nD;>K>G~F&IHBUVhfI
z6I1Q<#*6bUm(U*bz|})WrdXrNpL(X0l!?j4Dd>3VL)|JuUwBfV172yKbF$06bAV&9
z7_>I%wD)h@0Ifx_lsM9;wjEUM*_jP+@){T&g@`JC0>$f;yb>xWtM}h>m^T7lFbMGE
z>@=y7<yIh2iWE`2K<Eru7kKix^f{HqzJq77FE7Wf$v;r>#wAo(S645Il{)>Vo*mda
z2Zo2^FJIB1O0X@HM7H~I_rotSnA}pJedN8}LS1pb)<{lKQ??nW`lMAK?b|Rg7u<B;
z`8Ma@-wMw$DTl`g9xl(jbP&ianl3+;f_y9UGSHNT--^L(1<u-9F>VjDPn0Z47`vjQ
zG2pdoNj!i#%H3{lepWs~>tnp74pVQRnVaiR=W(5jNtc4GcWoK$wEy`o5fM!2Cd`7&
ztQ!~_Y+$klH|{S1@J(D9ExDcwZ|>l5h^(y9otm7+z*NC{cV8c~rzQ$$B9MIfa+O*_
zdJ4KjT2DioSK)(+rl4AQc>FhZ4(5o#v4fwk?M_%Wp}1YRngeZ==?(#J(POT?_xUMc
zqtmUl?a2k-{Q?=d>(Pj>`QvEM&^Wc<;VTP#(1*eaBwyLDK07-D-DREeEFr}_QkX|f
zk9I``g`VT(rtgbY0oBz!@{00E2@DB0-M11E;p9wI*loYoqUg#QI*g~NTJP_eJr*ul
zSryPR;avX68bXGpw+nGB4TXn`Pw6&%XG)DWFLyGC%ojgZW1}NaW;Z;awlPp!KVc<&
zPs94Eq=ez%;PBv<?<C>!<?$%kc}h_Uq|Wp4D&7IJH>~x%@fls&jvCVL=I|NjQhFv^
zq1MzPIR@{BoKBCP`zpm1BOGOfL9&|phan@&TiphM;IpkKCw5#gpuf_nGzS6-5+D_g
z1|65D7#na--X>)vjr1e@QBzdxy}KMMx1J;`ZCw9ST7PBG>@M<~_Akf28y`mcp&5H$
zY{IAW+W^b6O@I1^?Rd4D$qf9ip&`>XKi)f-FXrBsZ8e<FIQ3rh!w`?-I?j^gV+)Um
zQxO1$^DrG<zRjc`f~o~+{lvt?T)8!I$`|vjoSe9M+a1)5`d{<k2LyXYb<cj@kAqS4
z+QuJPlfGUO-LDK$Id3}n5Rw|6w)_*+7PZgiQFU6*;cCb3zN_kvL-`5YVHh);G`8#4
zj*mL(@dTxdWvy^RYOvDW*Vq>6nr=6q^rz>JtK~YgI@~Sp_ZnpO2Ct+a9$D$s?Y9%-
zYqsWOJgT^jhduwKHd;R2&AD$G5<rf|+Pdad92Di@xguL*0<p&HUE$6)w{T^Z<ObHE
zTsdsC2?7w0b23Zgg+eeY97eDKwa~BbdR~R}i4Z?4><jN!7qWO&QBla{7<U&=SzE_~
zecO&d7yj2{-rh~kG{4b0+x4%bxwaDK_N4z>?;IT-FL=h<PPiSHJnoYWM@RixO@9{;
z@4IPjvR3wQ5c5`Y(lUfuCdS3}^k8VYjn0rE^-7-pZZkVOKX-oiLA=>|cK2TDis_-I
z+b%16PRUPnlED*Tpr-5J%v_u~ji`GPct~}2=e4zttAgy~D3?27&6cS0%OBDh^pb{}
zIDb61O=PybY2j08da%k@5Chc!{_`Sr_psF4wTiap;oLG_((`sry5_@RM%pn!`~6m9
zrE26)9C%6%i|p|xM$xkIp^nJCsajtd5=!AA6E#Xuxl$jl%$|d!+aCPy|9Sq}iv4NP
zvi%7Rll{zvsEPnQ!O3e8b|zh8(9$|@Dk|;$3$OLiOrZ7Ljx4Um?wKmNgZbR9J=1pa
zsn5fcJYv-mb+PW>+T-;~&vZ@3sBNxvKr;4^qK?58X}!R8Io=wou$Xsm-zK_pWPCAS
z2+W~|X-`s9eF7~qb*FI<rK<xC;=Jm3pVP}~@wbje(#be^*NYKmK-OR7t#5X-@oass
zK>a=VL|5O2<@s^<i1(b-x3TgzWvoHhn8;D1DcL~?N1E4(D@4x+Y|!?9vvfNr9qs~B
zbzt=zH$!Yb2}4J7cO~G=(hy&Z_F|pCdq2{|=d;bM>`bdc01$t@>xXnc-gBZ;TS!z!
z+Q3L#L!jTdSFsAy5j}$5|KkFrbU|NRKW>WyAmQdw1M%#ZawtP$e4$g$v)(5pIyZ)s
z`PYGxR(pqgQ$TgtKk%#Im<g-Xe8Nc>&X~94<#W4#r$m<`F6)aCvdMol*}^tnYQ(j9
z=3_pz;_T7pzyX_kZ`Cs)h;Y0(vQdvzYxXdh<-QB{O}1q%N<!q%m$t%tH5@gU&|YSX
zDmi$0Me*8<oO^eMN4!3tqty-whyCi3!*tH!%^sJ>-LWT4;<13W&eN~^T0W=|%Yp0T
zsmo@a5!o3&H^U5PlOpOQbehez6^&m7jT5y5UtZ<5Z?AKel9CQa#8P-3w|dY54?c)~
z!1*#Cj+4`E`CZ|G^R^HDEl0NRt+>+Z5-dG3$eL$0UBf_a4`Sx;^bJanv42UO{THz+
z>gvO(-3@}|G;2p=tvKh}=J~VS<xiYYUH9oKy2YhlKFB+mLlP-iL(hxVI06xP1C*2i
zrcCFJ@qu!36|e{TNT38kS5VBetpxC9I6hBshc@Q8-MjVbUy^x~*4N9|<@;yT-DI=|
z=dIb?7gOiH(jnLpXJH>fwP|K%?)<N2r{S@Kuj0{)l5Oeq6+QPOOxquGwlTK(6|d*!
z`}ecUF2I7|2_xO*1fWl<H>+0yW_+@}IZEmyX|w85?vm4y6Yh|xCadd<jiw9rT7y^=
zkQPE)Hhk1`bZonQ;{#dF=s3eFZjLV<d#XNS=lrhhGO!(sj$zZ+s8HN;_ugS!{tQBn
z<Fs8CVS8wVpD9P2*k*-wJD+4obKd2sE^coBj=*wmw00PUPSu{&QPY;A@648FrPtEE
zG3wXak7Kvpv4<1!Cu8TSY5B7)pE~Ouf~Vp12b0#h%81%{1I^omO+$5$a`XA+>7M1;
zl5fYy9T9D4CwFaakd|4^uO+g&j#+7=R#)o@&(4U@A|lZV#q68h0`vdk&G^Kx@3rr^
z!l4)2d`4{dTb-}lQdDf##X#`*c!mCDjV1=Z-cp)%u0nf&m&=}qUc(msC9MEy@Hsc1
z`5m^_^H<2QmXj*hliPF2E(><+jWHjNBSDA4aqr8SXK8-9j>~3<1L|$l(pImC*5%Q2
z%clVP)_GC&2O1{kF}G4oOChvV_|+54h%iwX(CH{{Hbb9XaiDkPeb}m(Kf>E*MJ#R`
zZ9i!>jK?f8UHjV2VPHfeOF8y%j+eC&qwF}s`Z%_A01FSVxU=npD9NJJeTI|e6E(Db
zb9)Oc<{5O2KfXytDYtiYJWpADif`5<b-O)(UD~jXkDDgkHh%1+Vm+^FKu-E{Cb7*f
z^NT98H+ig>JuUSbpj5>~tGG{Jf*BQEZ1oe#a7IR?CpbL9t3OLlfq~8Fb=30w^2hFZ
zHCN-|sOH)_u8A;8Oy#lZz{uF-cWvWYwHtA^Za%lBiS-IO4h@0$5ZBz!Vx8GW=g`cX
z6NtE{&UV~Ez1`9DOFIAqX&5Bm-NVUU0N1P^T>ep0cdfP(ttT?Dlrj1k!4ndp^$H-(
z#Z7y34^Tey4<nud@(?cyRW%0eu>LI@@K7hGuxnb+w*=B{H<0o=eGA3+VV5;amw!>~
z8yirO&^qxDd8HhcFxtzn){o8k&U#_TPKJjp5slSJ#jl!37sry#;qnOj;ty9daiJcu
z_FM6cJjAc(3l5yu^_6~48_i|Zc5#ozOKREfEfh(a&i>F;9rn6NTRQK{`vCK?qiZN&
zNAvj?eeI#%#Gmh7PsbS}8z|9E=P{D%?nCZ0TGoUj;i2mGT~Qb85w?8Sn_d0YDlX5D
z*QX~}n+s~kcu^PrdhD~@re(}skN<@QDCC{Qb!VqXSTuZUgM*opJWq-^Z$(pkeAz#C
zlVSKR)5d8upbtASA<Ke25|~S!x_Y<Nd4Ic;K}k!!vnkm$8d7>K?QVjJi6ShZA(?Sa
zl$%u89hZO(Wu;<rXuKyVEQCn8+y#Ag*3qV!1x^NlsGVz+h9fK+->ODmgCKa)k2jmN
zdT@j_80|(w`A<7TNhubT5k0RCSF2(?Tc4dXZX*)V7+sIwyh_I2x4LGsr?WC?pjSEP
zdd1&$k5GukO`2L5+zKB`JMY+Xx5zuYVuSdyxsfLgqhl+5^%IK83}#Y25&}A|RsN;*
z|NhHx&eU@BSKFu$vHh9%J}@EOIn+?oBZL&AlzY?VViqcq^nN+|$nfZke`}w$LW3~@
zLbWGtlHq4&T?2UIRRosjA6N4O2YdSvsk7*9P^8!WQMUrPRSz28$hP0}{Y|wU)sVR4
z0S0Hy>KXiHJx4<E)3UuC_67IdoSxa^UfwC46amLpd58w_!gzmgSc<ayWf*b%iWU52
zvf+`v0sCrI6gLKf{1<UPf<X2@xQLb(s07W5aKLP@aJxNgC0JPK49fd6lh{pSR-TD-
zFv*!DPen>Y6Z-Jr1_A8XEMwT6GTzr}`ue2n%vob0+VE>r2u!X3KC{~8nk(uG>d-PL
zOX{7Ox87o>D?Q^qm*CtEpZU7?Wop{$`qH!kY&wuKOGk?4#C}4z+OBNXG6{%zpN2<c
znWosKq=uNddJYRy$xa|%+ohdR6nn%zqz*R6uAORXnkOE6<(U)Z9+xNNY&Ds#)YZ|F
z_*5`1>=riRiqcU>^V7?597A@A*O%XC#Qn$vd!<n(cYX>BqdQMp)bMn5Ki6bSeeYno
zd96gVQyP%ImfJ+YY3?jun{z6NQx)^i;>wxFcXNmDUvqC$Sxfr?fxFO#w^mWzMIC+@
zCAD(xWASqD-)r_SWo7T~XQQ1*w=(mdEKb1|d+Nu^C7_N!tdg6x-9}eBKg_=VJ8!H#
zlv@^<lqR}6704Xla1Y1F>u<A^8j`h%db7V-*V}}d=NyI65YlATq2E0rUtPBeIp)ya
zgP;9T>P&2%hBe5zqE`F=PgUs4RHX!vZ{Kd`dH$aK#y1<E$)x=|03R3gcD0$=U|1Vi
z3=StU3c%&kh6eJk_J+{6Cb~D(CgGH%A4pl)!TwNF@UrA1_xSa<AeZZ@$Ip3gVg52n
zs>GY&N27>s_}|P)n?<My5c*#C4{)<<b3hNN?b8susm3}-a}N2(j%hFIl#jKzyA_m`
z05!Y6u}p>8{0(dGu|+rp7vh&k&@nj#T_7P0P$n&p2f71`R@k*_o9ioF6-9X?siwTV
zfZ$49{?1Mi?_$!D$6my&`9&Q=eG$`28e@DbcZk=|dn&CrH_ILgbwAav!o%!r6jA`z
z2$_w?=Ueog>*p$aN~`0$FO@EzS#=RjlWv1iZd|3E_n0x;d>Wj&*VFy|Xga_R#kkAm
zUu_AU>`AeDD@Utt;IiRn^v?nmhJ1<|^PXy<D@`k;ec@O44Xpa?i+k0onjR3w84dSK
zCybm3lR`kcJl-fpmSh9m3y>Lx8zs+_Z_VKZ9SmEApZ@=I@v?1JqoDS>`_i7aBH}+;
zIo5GLeo~Dj)MFy%!~X+1Hgb7V=;rgj$dfyZn7FvZI~neSdXB68i_Z@@jmY`L+)<D9
z>*6+u1X)EzG5?;gu>dTsUS0THIte9^TMjUe=7)qnN_yI?rlJs^dk0$;F}QaPA~aI7
zZ0%DAvzhM3fc#$RdVuKm99HmA$5cFK+W8t=jMv9Jpo2Ff!R0kqt=XHk0?+0Sua+j!
zFod<~o%F2=L#+)^B%Jmi&7R%3vz^Z>trCBx__N9+{UJkGb`WLdrq2Zgz`w>dZWj<f
zAO$s?wk*YyO-f580Tt-@%!HZ8-L&Ze#8SoaJCzF7{oWzV--QW5k1HMTJc%PmX9B+G
zZ*}^Ihl1+c7R}GS;zm;@pnY(AqD7xX?-YO7g^(7Hk#S2ryW|GYQcX}@C+A(&dbkYj
z2jqZws0Zc?QCztaM8duW_xmY=W9{V}Sm-oQ_SGiMt1ASWCOg(==WBSAA}VETe?lz&
zJYfblXT~z#>$hO+<l_=f6Z($zK_vkeWYM72m!TVd!~?qT2C9OX(g0|2!pMtIa`Lk;
z?n-#-6T&TZJ#G!5e|r34&l=}5#{Hg#<4SmglUcRzMp+X|nsk(LW@wbV{izyn$*K!J
z&r?~+aNnsLK#k$bI8#p&8N6xx`zG>K)A`$kseDog{w6>vg3FOQuzbDLrB6AoZac(N
ze0Nmi<dmM~lZ>!cxVj1sC%5>+VJIi(`;#fyXI+3vFpoYT@~y7-7~*gGPmAyU-GhNa
z*aqb)yLpn=L>e;QSjqKsl;N`zV%mG2a}3(eZAaeiAZW|Yajw$M2DUp(R2}1$7McOW
zjx7C8FZ14Z5nOb8y;xRxurorVX-%nRwzr6P(&DK;2L7a#l*k<%pjHR&7ES-1M&uFb
zk3_!(+_S($<Pm5sa~(0KRYuA8)RS?uE5k)&JRK_<i*xl{uzTM(Yt$<tRM`6_&SxEq
zM#V)!8;25|&1g?&V~(Ts&7_NGml3Uy26FtLDxLDV5@B1?p00iu8fr-_1HD=9i5c#R
z{*Blxu8#!G*LQq(#sA`Fm%1~apB8>CBGB-)f?*H1do1@Qy>~2kmRe>bull))p#PNV
z@lUGO=4g89AtglFVPJo<5IgO#tgLkiR+?v+m0FVTBx@6La@LfQ6d+ZR3ulO`=g0<*
zg3ZZm&Ah_qP>l3vE>Oc9t-*#9l8W(e30yIrX`};C{X78rxxHmpt79?4Ga&D}|GjS)
z<6H%s>}=9FdvD(vHan7aI9B6^H#dH(Ii6+P<0nncJh%r9Ekt4Bn_HC(#2!H_h{>Os
zefL2{Wo1!a-HkPX?!F?sOjYH$C&9wPYQC8mGJAS*jh6jXbvVHaj_vhGm*SLsl-z#j
z_2;K$OM&g6#ABoXl^D{;>jK<%_pIuTSB}LE`@(Moa<%pJ1OQkIFpkZpGF}iG$FhER
zEigr3__TIS)pm@3U<h-sq9II`Ze3(8g!0P+c3eSiZM}X)rPUzEtIZ%ikHzI0w2UXO
zpsjj~ST^1yPMO*Ss_k2qq{F$&C;~ROpu9Y2$5nd_wq?6XUtI2cQcYcg`x}2tVcLkk
z=LbXHyX!vg>t2yzu~a^j+t8c}PD8{?br@n>c(k3)sPi^yzAb?IobMNvS?PI7&(@mz
z^brL3K(Uclbfa>6;q%a+Wr1w&yNC!h-@^$MhNctY1ge7VI~~kmXxv?WK-+gaT^%zv
zHQfYSj-7)tzHNHX<^&bnohSxNLXe{;VX>tQ#2ob%ws*coXXc6;^PKB4Bxvm+uxLrn
z_2+zP(8V<|GJ7B-JVI3Ci|g&0LpTac8`=HJ1C1YU8)nNZD%L@uBVu5W4aC}Uu=Ma|
zK&zRK!{v<}1@O^))43r)v{kAM;8#8Cf;enPm*frvPhJz8&_A&jI&)vwwILH=^l8+U
z=*<tZF1f4{2qAq=Js%Vgao)Vm%P*iHHNU3Q)w?%tdJl++l$6BLhS<j3!(GJDGfC{6
zoG94XVlpzwRR(ElHAKD@`Z6K1fE9GyctGcHI43132@IP&U|odp#`ru4Lb817&-de+
z&-Yh3s_Ee$DVMiD?jVAi<oI#ZrFF$2a=Ag_&$hz3h6~-;^8s<ZX7ix><A(a>*fp;}
zwxX?y30%>q-f@6@7ZG@HkhPSSdTv?B8om!zX_{OuP3#LZjSv5>**Ra*T%Bmid(Q?i
z6l#E0bTo#<%-7kY!lLNj+~(2767Y>uKR@jFBF+HfJOZb3XSB@NL0#J;t+R7OJ?C7x
z!}m93e9y5xN6KT48|qFD1w{p0Ng~G^z0(*Be2nSCp#p{oGwo>QIk~E7W%xW;KO-e7
zr;XuXL=3om9=JXo4ExR>c1m9t3915uNEDCjRXG=JSXz^VjJmww+!PFvK{paFak8-t
zqu^*DD0UfT^+8Vri7atc3QAwd4-I`wRy|VsyAGY-Eyvu#+)LYHLnuTUNF{)(Wpm|z
z$!e)TOhTVZnyEJJcWiuorN<+)*-~{7tWxRrS&_wOPLGR1W!O$5X6!KBrKS-0=f{_H
z$oia??ffR=3DBBr<n}JtAn&)g*UUBAJ~qvdv@D4ua46>J6#$*jIt0=SS`xh^eCw%l
zX7=q4g+TA|(jWjNO={{CVil48v9Z39ku+mwy+lrPvM6R<7z9{yc9v#oL!|$SFANTk
zb8B;h2RBJ$@wvpTzu|+FD;5oX<KI7NGc(+(jm<#7<OaI3@^XfdzP~B?u@oOjBDv3C
z$eh#%tsZWyd2iOBcyCUKmzH>xFPm_bJ@!mwG-TOL<(1;kCwt50PI^48Y|3|L7A>~@
z56b!$C)P}_E$Z(r`iH6-X~s_A!dT8cA2OzmRkDD3`(^ZPw#CfGP8Wnb^D%FKmGA*(
z78*J_U=B+Hs<TLC6(t>2R$(QIBce2a7ZJ?IG_k+2R^VhOC80?Lz3ZKkS1aJPP$l);
zY2*6Dr6ow^m11RO6#0dmv6u|8<hr^5CD1_84HryKcTW#tLPkSgW7Ry6?f}wn!~^?^
z5V-U*1W+2IuK8|$nXA<?x*Nb14AE_ShtM4`yZL>VcnfZGJG|R-ov5|QEzM0HQY_h+
zQL`We_gU?-*&MfE{A6-E<|rCM7l5NbXQEctu~&^>0M>7Exe_|Sp-C@3&uSDi<=2q}
zpknt$5ai|O2Leh5aQo&^lo$N|{eyiC>kagKWK8aN1Z}U}-gtw~Trd4+B(3MqfDBRY
zSnl!170@QnWo-3$>{+LQd7qq;oRGUDI(&`7l!B71reZMgOnG_D(9oBzRa8`zpr9b|
z>F~OTfm3z;qSEoPbjPJsUl*SF_q56FUS7rxWD)+M+?g39JHwJHovF9EQXL>Q+SCwS
z=boJU(Fd|P+?9+`de>S3X~ZJ>wp3PA#VTO+LMDw5`8+L5{Pulk1RuY8s)9bvpGbMx
zf^3AQNs&5i*8iE*p_S|Q%)JZh<j`}2s`c8n;|vZ7p`@qJ10+q*e;uTz$}i6UQ&|}7
zf5+L}?0$j>*9jVrmTh0%q~F@&Ypyum->t826Q@sn@U~hpHn#x8fT-L%)nsg({Gx(C
zt+~OyjVAjhg#{%Aouf11zt^;Z&z^*w6;ek>2QZxQ1LAi#H$eriSMNT)f%%<mvXof=
z8W;y)02PmZ-)P$5Tt!T1sDQ7ZNHha|-28V+!9H?{z=~yGTX9K+cMSoE(azfR0oVUB
z0hIsJ9Z_?6EuKK94+yu!a-=Tz4)r_u6cpv01$j=v2FcDbY$f!wNT5@C@_4;k1!(Qu
z+=6Wgoskktzswn2TGGM$g64Ap=+=Wy^yW4?kR8Y=sfh~+K+)2U0OHr?-cd+h1U<fH
ztCQ3H8u$>9fCxB8PA<1=M+X7fF+ZD?zJuOZXz22CbuG*Il(Mv(01s^#=tfVCPb_`4
zeQ8aHvCPa)EG_v0_ApRk0!RuKX-&HSyO)ZU6$2QP4QL-f-fcPF4dU7g^X3pH63~bP
zF{A=WRvmJ3qU>*A=t@h6L&ZN+(Rn4Eeh};#?o@#=tq7ryqL|Z;Z0Q@?uyDnAr-J63
zzV_i4CPND%@lUk6ryD)MN(O_gNyf><e$gBW>6J8}xxMUUVsBIP5YeZwuO0qme0&5o
zs*<v@6Nx*tsneq?zeZ5r`*;ENGGOMt(DVR-y|IzA(A1=$gjMqL(q3LkLC4fIph!JD
zWC<PvgF}<|WmJf4<2G${&(2P}CKoX<lsNFyS9aXkF1<g8;`_Av02qGI!Oz*mqByT0
z6Tu$Ppk%+D2mLPA7#B7bXRdW{=-;*ggmPeqA_BO|PaYoN!=~ee79U?*Rcm%c&_>-u
zyu55ff@@zBh2q}vac+5eB+#+|b_YjnR7VtXfVF)bv;6{GuCFvXjm>)<<jEvtJaP-&
z^gd25czJyKoX^)VeIc-vT#VDRGe}=pQ>UiTWTRugi;8}xqB6M{V|8hvR2G*G*qba7
z0}^QE5tG9F&fdzX5@C6eiU9XG$b>k3&$tZB0Wyt)1+-cGK6r+PhIwvQR@U*kIU^VI
zr?$P8_;^5IRAX>(1XZ{fsIyCL*wodx`_;GlrS1-N)0ZL}8j~T`aUmwj-c|@Ql#9}D
z)y?x=eCYi;AJSFl!^H}|PFs8&RaHwiHZ=x3+%*U!JTHM9A3xp6*=1vI+b^RGF+Dxq
zoeU_3fq*qiEN8Q&aR;5prTLUB0GA&I@TNoATQsGCVC?qxc58b(Dkeo7km~JgYTgF;
zBZE%#uQdj5eo48L*n*pzcj<9mOfc?%k0Pt4@Lj=~Qej(PK0ZNKPDa?-m=R#@zP|oI
zCnX?Z$1+Zy8yFZk?(Fg<QJT-MZiVTcnPOv{+G$5X+u1BK#oWn@z8C00a@DZhKJK6+
zm%}HB<z!`MzAU1Jg@rqb5_5Ba<Bu;an0QEM{s8PAfoz%0Et1<y<Mbk2!z5V1lnt7~
zN(!MyF~pKJG$fIo)B+!54Ke<Vj*6z~L%t*Vt}|m^7)=AlCi)9CQ#DLDTewIub39+B
zmilj@f)T5U9rmQ5iT-_1dvV&8!@Hy4FNcSRAlX}okcs@q$8vOJTUuVSc4T{e-WmYP
zTin2~p$LKwUE@F2<c`tOPfi&65(V;9psOGT`1%C`<r^q35s{i!D0><Sm&xyieRTu9
zafI^=0I(ij9XEI2!$CmWG6PpUl5ps^Rh@nL{8oSe1(W^4BBR2xoYvCd!cAZcs<Z()
z{sugzkdcuEg?(RGZa;sL0JJ4hS=#dxov)gu-$7{=6&5-bkkEzD@PEKds)T=`I0A7J
zBwCyftBwiA5D%!bUU=7NAB8erNf*dx{h$DJQa}!kr9v0W2?lTcQHYBw?jzuEtCk4o
z$WN@4{sx&k*oc7J3q}~QX2CjSXXn)Yw`SyWw5IKHMAf&_@mhrZ!{{gzAQwf6=7|1b
zdZ7Tb4@HXpnd4#)yn^fW)nnKNW#x~eSj-E&-D+$=G<@$4ty=OPkYm5Cda0K1=drfT
z<je1JRbyVb$cw#u--2JF=%ZR7m}4SRqBv>H@HtA<I({H>AQiBW0a3pHCzHCmx>eMG
zm30)zkNhRbnA_+RhVI{LkLuD4*v@F(QiBrNdFL&v3Xp&S9vrYMl~GU-(pNy=?i(s7
z27Ic<<l0)rmlNp{vAb&s$5EPKsioQa`lNHH4-t^j0K4K8P!Ycq6>1>F372FQWQGG4
zVsZ*LfZ`eKnLund6-Nc+psCpzfIWnQu<qsM^)_So2L%g>@9*EAfy5jJ5mAJU3)bS{
z6WUiBCV3^FxV|AEfq|et_sU62BZ6>X0Ju9&E-vAwD!x_zFmt1dCN&GV{b2Qg<-Q9T
z>3NfxKPX=Q1K9K{E8(TtP+_V*vN?iz2Mo}jptX@N518tch>Kv}Ud0?8MS%gAtQDZL
z?wuJ$038w_3=mDzD6dHJm4^%hg@KiWwI6<D!_`w<*Prj~Ttnp*H9S$_dlp4gDhBur
zvJhR>bRa`$NbI$!tf~37e`vE&lZGkpjte$-*0j;9U6$SPJ-b(cGzw<%)o!&a2#T+a
zSg}D^fBiRK-VUb;P@e%DlsRd#%Y-R0gbjyz!3kJ^@7)7#TL9)FC6H&lQVKZ#@BkSB
zKrU!MgtK#Su2VVobc`bh#k^HgQUWVyxFbF$n;6*a0^NZ%5JB|xyaP=C>}+D22HYS)
zU4&+J4GmyDi>}b*`&y&l52W7eBh#B2u~q(3dD-CL1)9eH$ly#h7?wtVT3c5hG;QUG
z0dmv7ykr&Cl$7!*F&U|z&^9h*)izetI$AU`EkA67Bx;Q$ipbU)@82{YO7?i5YK|a?
z43oy=#;kx-2wu}p6@Jj62Uu8`Q=psY$9{|@Uud9OP?cme4HE{d<;5UlY!%Ux-trC9
z!|BykZ(koYAcg^k2@Iglb*$qWd00O`Y8yh+x0%_?Rwa!93$kDZVsMQ)2(g)yd!iB&
zxc{<X455Mk#C^|>({^nZC{R2~W)H?+)Fki0umM?c{&X(E7U0_fYDKIV>9R2KQLsZO
z4-W;J`70w9)eD!$pjkkzo{Vs-Q56Dd(5pcQQsHdm_Gb06l~*VX@1kT4+4u5Ud3fyh
zt3rKzh(QA=l{-5-22g?nVlY^tW8*zw56Kn@qaLtD5v~s=7e(*4+WRZFJ>Ua}|GlQl
z$+A>&0UDGGm6^HaFx8y9|2YT5Z9n&&&g%T5e1qU0oW*Xvy^=$DOd~QnF*P{;5YJbo
z^JR*KmbC`ZK5R@IY^k#np^#<XVz}DQrJmn!z6yesN7z}r<#s(m8f_>$cuJjoJ(_aR
zSXR_+F0>Bw`!iogXlV4cnyM=L^F&>31sxzF&&-svyRBlm0fB)GMf=1Aia4w|@UJMZ
ztegtnQdQA0Fz~Ob$t3{YTHx?eUNimH8Sn)`$UB7$fo?MC6M7cWc1#4S6u6T}(qz9e
zHBSmqvrqM*uJ73xDTDs}`6(;MO1uH2PCpH(WT==2M5W1TY0*JUtf_(j6#q$C%~UwV
z?1<G9uDW{SAr)NR*3~(P?Z@v`lJ>~McMv8S3LK%_cgJk}_`eC?dA4OgWs~vHqW_Z6
z=X?haRLE9jTAE+s?_a(K*7;$dElug>RaAZ&8q!vwW&J-cfR2etF!-@6gezrLRULEl
z60C80+!jY0o9_960xOftmS^lK{J^B7<d)fRf&iDx^!%btTtgUvKoS%^yEg4q*@B-t
zqiGihv(mY}A(b!*N<kDIFXJRG-r^KftXTB@`?zm-)>q{}6bvf`6cXUiYK4;dyzP~9
zUBL1+gOJzNx6shg@;cAvw)cF8&ppf6%UDjqXnvVo=<jlgguFhscXqxRYI;+S<PU)}
zwCWJ*OpeFI!P(r{@D2$X(z^yX3HZqtkkHbW-0VE3wXsc1vU;L5pI^5xw}~Gg({ph(
z-I#)Z!^6WL+X{mno!DzSJLhKeq=PbA0P{34Ir-BwF72K3bI1WbO>sq}Vcb|HyCq|~
zV!Go6xmb-2X|>sHw+{Ro@Hrtuy(B93g4Apu9u5N|V_*_BVb76;^1qAHkT&R6&v`^R
z2C-*$8__c9qoaR&xGUEoa5~amo={}vOPYr=_Tt*M?zjpw@Za0>!k?YB_d$C+HAswI
zb_pVVV@^i?_I7l4>?sDExl4`qA%NQY@<q>`+iwuSl_?u^I~>x)*n5p|nbN7LYei*i
zm$R&1S!n4_z{jRxD_V*ZHSsGsr*+x^`VTYGIs^Fn1|Dl=sKg=lUM9t|PVBG1{T!6u
z)U6VNfdNtNz_yNmY5NTZNqLZK819GCQhm+0dT@H>!nW`ZWJ$Q2n5{QV0UT&Qeu$Yu
z<tTP7H8AM)qB`2A9Te-+P9|w0_{GtKn~K4?SZ{w2Un-6q_v<ZiQU_0oGS}@+iIyyx
z+IIJmh)9g*K}eG%;#qj}Y=At32DkzyPp1ChuTe4IzF4$Ojw5uv_Sh)ph3NG%2wRp3
zm8eva0n66E_E=z4|9i&u_iR71XBOF<`TO=~rX@mBSqi2EOn>;eEHxPklO?IIy#cmk
zsoM+rl{SN;{)oK4=-Z}zH_3scA<kU;^Nkh<y3!LcJ^AM5)+`Z%mJ|Jd-^!FwAi{&j
zJ&z-Nigte@5E$yq_e62|mn%<b<vZ|h{J3O2%kLF8)$IKD_iOI!B~-`DFP6-Hl=3+y
z9B8?Cz&}U6L^Teas{3Gyc1Zr`g60@V^pU>VPQ(ANAp}zHRAHdE^XE?h{v8T^T;it>
z+FtLb^LxKbO$6{R6jz@GhD^S#Eo*hzC<QuY@cbGpv;m#f;<-Y>mH+qRguxWtCtxJ_
zSMC3mHjJ7K#s=U+!nrOBv>s|m<Js4{#~vgEuuYl<2LV}mtp_7>J%)#zW9x*o3>d&&
z<IPX80Xs5sLc+{${9pV_l5bvY>8%4OvQE0?X7vLHwO6>=?EsO^WmiWJ(+A5SQE!yS
zfHA^3RG(&mMCnJS%W?bbxkhx*L<nlS3mrS@P3eI1IBTT(I$kZRLMzK1`rmvb00+du
z;ZX#|(kUALv&e!d0ZebUl|uuze`j>`rzmNA!%n?Q+7&KT%&3~~3d}uIJ=;NzoP8Xh
zsuD?QDDyU``~w04)ceTr#s2RB7ngG1vw}g)r)hMYrHN*I>~M8&*c>IL1GZQ_b?#%=
zV8*GHWsnv2%dnW+XEFTYoU<&>`t^X%oUe4gP>BsyscwB!6Dk3Lw1-D4SeY*W@0$ft
z3i#1A5(uecEL*)E?{$Xanb<0NlP`;RG*-58cdC_B@wq&370dkfhtlhdu!h?axX73r
za6c9)8yFY>RTmNlM&5y}Z~A{r2u(JV$PX>mYQml}i>ab6AV-|lwTd+1v9Vg11+eIJ
zF}wPS#6#ZgXHLmuGV-H36e+l7l|Df%6)S?ZZqc*F?q+6|m(u{l6+F>}{I;6{EZ9D(
zk^CQfG4*`HUUt;T`Iu?0NbBVcF{^6~TY&)H%EtJDf=dk9x1soxvmxoJ5lIWC<ndwy
z)@i58wLEd);I-81t~RR=!$ax?ZnyBIh!sQ`Wj|<ylTo2ne&u@A4jIw6$okqLrU*=M
z%r@4GBzajCOMTnF-mC|Z?~`S?`7_0yhVH1O)8=j1bqx#z0VO;rSM4-{{|cbIT(cd>
z5B%Z+vrC7N;^MN2i&dad$-dgzC8cm|4y(?bVV5CG&Mzv6VbFJS{cCTuPgeMn(GF*z
z?TbusD#L-E$Mw<g4FHF;2-fY1;R61*e6oI!CB^AhX=L_sI{2=4>0B87C>mNShQh<_
zfDvZKX4SV;Dj*>jczyz6<-g6hsP;8UBM-x4AO?{o#>#m$ZbKksvlT)2|2HLrMBr?;
z2W#gLGVGOzseER1@8v$a15DOs<4p<}@MH^ELPCLsSxkl*Y2Re30gax@kZPe^OX|ld
z9#9Jc*7A=6`9?aSU91l;)?9*wAI!4U6H~etYEC?#p%duhTCgDCx0w^aVd|*T{D5BZ
z)MD<u@)f@kLHSN_cS5^55m&k`pXyOwUfvFR#enankwA3u-%iPjeEUVl;^AS<^LbJt
zVt9nsmHELb;u>?*>a2fK*9(0&L5t<JL)UxBM0bgTKPX>c$t4ZK2*>Jq-3i2BV_Xye
zH=`t8lCed5lN}x3Y)58@ol@#5dgAAYXJmEIjh;OcITfl3>YMKM9Am`kd@#G2xw~AO
zmBQccV}N8A=;^`8{AK>XiEP-?^-ls5DGf_Ze6vSBQUeSsVq36;AG)P!bdkN@npAwH
zh5g_~C;({x8Aega=u}`nY=>1kvo$c3=Yb{Ki&dNEiX2lT)u7-1&E@NNn0mzrOx=^+
zT~P6KewhM<j1|Kp%_q8aw!mt$a$rW+OV#GS)`0m`n%B$Y5x)rsoeJ2WiV~^xHRc%z
z^+Pi<G6Go1t6RjWBrq@Izi*BFh%S6qBokZL;lsMFKb0?{y6*|6chV6MajP8CWBg5*
zi2FJfaw?U4F}IxmgE77$b%&d4&I|s_w(_5+LfM>;KsV7yC$NirTS5YsFj_S7mrPbz
zjLwmia-(r#R<%wPAb<btT`jN7AujHt*}`%^?tV6)=a?-#LPBQk1$(Fy@y*<b-b?cT
zLa2-=xQt^)S-Ji0G8qXKR~=#i!a6R5Az0>)kCllU_U`JP)~X0XuA^+W0TJp4qW-l`
z>|a1Q4TL871Uf8=+{;^a(I6Ddh`verTi9s7K19FXgTYEHBZPqO+xG0CU1c5G1%>#i
z$;!lq^B(RM2F3_KwQ$6>yZqPJdRRkPqvaWo?=fb+RuQE5`Mm>q<I8&e@ZZb9$jJ1D
z`52~qDQQisk6leGog7vrml1sR^46!><Z9hy$)hfxyYC<J;dNg-oPV~U{%C4oP;LN^
z$+uFyA;E;z{;Jf<Pvfu?|K5hG@vJ~LC)n&aZSZ$(aPK4GM=TxRk8v+6rs-c>fLtDn
z`0`kC&b%@g2i9n+vo@+UchZPiFH^kwU@Nj?18||cI`pE`SX*H2AMnD^{2QA8cp5-f
z&EroJ?G$gw*qgX~*!w!bhOXHr>R_%r?Y|S$FO)I&*BcNJ(;ddglYgUP7d9Nje&*9+
z=Db8IJH?h_2X0R2KepU|{%jA$O8%7;|K5DjMA3(Z(MvL=ed(d1F^nX-wmJuEWUl@F
zd^0|{#Dw(!9)18O<!@t&TE{AZt}ct*hmb8uCw&{Y-Mr_!j~;8#!1bj_z2ukfzq1~U
zWXh;l@7_hmz6D_nk&pYTf5CZl(hH%vTbxEWN?ky;A1E6^b}m~mWlzbE*bi>Z_<wVG
zVK;KoQA{Jb)}SW*{w<H&tp|adlMh?s@K0Lw+gH}s44%9{4W1m;EJ`7a@7@{-!x4;s
zs{NZZI&AQzDpA3shL<!oH5J(F%z!f=QS`q-ABYvrRH&^*LU}{0`YUd_<$7nkqpU4{
zVFcRkE1FEPVaumrw_k{S&Ck194qsBa@>FgsL#Og@qv?S?>C+mbFjFNith)<1yukPU
zm!V}P0?*cxA~|TO)W4yMDryO-Vu=ZP4dIfPC$qmfAT;`va!Fzz(aSIH<EWGOlIO4I
zp+`IUnN^McKf2yJDyyj59!3$65)|oD5m35QKu|zQN$HT5?gnXTk(Lrk>F$z{?k*`Q
zkp^k_7UFyF`;Bpb{vkXAc%F0i*?Z+&bL#H(t;P!j-59nP5XM|bO{G;YeYG|Ct-oI;
z>JR>Z-W-hF{kv!}OxGHll8s*%)aZl-$CGfm)eJH4^!w-8=pnO~C>bUj4Q^nDm6d%8
zeHqRcs<R-{z2F3#!;ZcN1<fBRNWP&nt`DEyg|J%Y`QNBO=0*DR0JO!8ym2PyX&wu!
zft;e4gj~XI8n2@+1Jbpd^K+xMd|{vOja9#9JvK1OiS1ZjK(t;KGNJ2=Lm?wevn%$%
zEJ?;(AnYX?(Q0u`_YSxNq6+PuofIc-6mgB8V^*pV!21emf_P7#|2u^4N5gUEjpp^=
zs%)EkKeYr;mc!}24^1net@xtz2Eu4+D3zD&*~rStG3T2KZq6d?d}MPje#{#AbMZ&D
zbX;sDw_?<%54vXB9=W-g92{lv1hkBe0}~QR&GHm1t*ujloU)>#0yuM|n*4E?+q;J)
zrhiWp|8T}qDQDPy*7+dNNJ0mN7xpnv|5ukpR>aS*9u<_AQ&UnRfeTfSrmz9?@o(p4
zz5o;F?d^?CMAXsJ_v(SHtYz-%w+Q0V)#X*6Fh6Q31vLvRyKn7jG$B$94(x^@3AKod
z9A&^AucN2qwJwixnYb2}J>Hlc8p05#rDcf}1FV05d2iPX>iW;`_J(vL2nioW66!u?
z1#Ol4kC_wY@EO7h>|=hW-jMGvAGe?gu+`W9y_e^s?slzoG&kjZyqL|f4*?VlAZaE)
zJY=v6OU7s+Ha}m~jJF*5wR^+{d=n43xs|WSdB|lB>s1KJL$tz#P`^VPH`a{I0cp>6
zM5W~d^5qaSGV&b<miI7)^C2uzYQ1WID^Ct9pQlbffAwYQr^L%Iky*#v$m+R@ION3L
zxx_M4b+=n`*TSA_pe{^AimTOH5mHkd5FH<Fcd_OgjTceEs8A}<v_jYfEd>ev9V+uL
zvvZ^6{wLMIDh#wIB}RiHqiHv%QKN5PW;9<us5Mb_bS`#AkJq~koc!5b-kPHT)&?RD
zBM~pEZd8I}H1lEe7yF+Q2?&YTs)qbzAKjI=%@$E8f6Hd9%))l}=d$&#)5GXzy*N9Y
zMt1JZ(SgesEk)V5mEu-0ZdOFDaesv8=(X1^xuKhmhnK#_;vMoIqZRRDyTZ!KYOLCx
zk(kp|AF^yn-TS{timH^Xw)KtvXvwxy4+=`mEBz59DY2EKfYPgCyVCEBfRN>RJ<nJ3
z!Ab@q3BOZ>xfEUVw{M9We9p`kvj{x)8$m!u7DAi<1o)(7Xd-_uFYCN{U_OZ%d76ZO
zY3bqPLm$BSDKH2Y=&zgqo~Xp>RViIPRYTZ)ozs-z)|A2UInpPrkeR>E?eOrJ*<?sp
z9tlYejT^*Yc^!3r*}O5EPPI?s#~|m3SWa}lrNc+AJ;bh~qXWnrV1R<i^5y8_P0}#q
ztC*5_yv-_Vm(zU>QmIzxxG5D{Q5w6cdl{Gh+9TS!qn?D`kn1F=9-V$*rV*-pF{3(G
zxXn2r`;mbC?OmPLpk%Y@swxIab5d?AZy+3=U0h6qDBaAP_(zi4Wz32Kc4V9B;&d0Q
zcmMaxR;h#+U2O~1?5an4llOgt6CP^k2EBD~V76+!JF?F6t!A+vhcMv<v|(3A>jhdn
z3$!clL;stCk53%}Ytny#CVbgg?n{1F^7agaF_cJhuxxtFZSTS0h50R5lPZQ>S>wL3
zqyvG3-VmMpLvQ;$K}T<(P|m>9v!vp-1Ent1i9Na-{_~h=!seww`bnp67N6j>5!(sV
zDYhHsLT@F;Ur9xIwW=f|AUKyag-S|qvLC%<btEpa)`{8b=OeS3y4<yaJx^%R!tnTI
zi~}L&-yIuN;Qt`|b^iC6dhT0!?Bh1G7>K?hjm^&$IftlNS*?9TV%xsE_k1va^K#+4
z<XD9zMDzpPP_}|#|AQViMs&`d$A3em1}fNn1gv%>qM@YAlM2K}LpeTq;w)T1%usW(
z4H%x^tv@+6^bR)ofa<SJE4q{u6qSJY8QNSqxw*FLA$`}bgv8Lmk2R&s(>T`In}1md
zS2`K(r@m!u>Z(3oxP3tVE2Xj=(fMNH^tr3NBK?HT>_I~7(LtjyGNzjcU{}<mQ(@lS
zj)i{U-G5f>X53syZ}0Nak6Pw(%b#m{#sy`C{kAU;l=c?s+>YJOb!IffI<hY*HSo^&
zsK3T?W4LL*|0abV;UkI>_ivGIa5S;+ri8Y2^(+@7(RS>su=@zfn7OK>aUVQCc%8bF
z(=yfgF+b|Gv9xUs8j|@_$GH-^M(#~i|B1xAnba#RJkrFYS)BVr;qXTr&%}0M{77Vq
z=h#<U-O!9%M6ai_yof9alpy&L8iHxumsdxef?~6L8Y_3O$7<;y5JEoH`O&f1v97yz
z5_M|xyl8KFsxy(4*j?vUd6WcEe-f=WJ|SxX3M>@iP%b5PC~2xSj<lWGQA&m6TQQak
zPSfiN#Lj)+@_BTS|J*zLS;#Va%msC>BbV)77Y=6*85x<y0Rz1U6ehk``M=DIJZ)Bq
z-FoE)bPA2+EY(u0&682wKte7Xwi8bZ0)c(kx}*cb*NqH#GZ)*u;TBo*jb#+e<JP}u
zFo{lB*CV4};YPTSGAI}O{36qka9MkH&O>I^>$qX>u6)eF&T6oa73gp@%;~UD8ya)E
zgFq4=e{|yTXy*Ksx)a~+rHB&|Rr*CRPft8Y;?U3M9KX@u%*5Vw!XoNuo;!PAX`3QZ
z%FlqcIkETa;(8z+BSSeqEjleNZG>1Fgq=JO{;fOQ476!>TaWiK2zXRz&kk1j-jyXd
zYw4MG&)!~O;$Xi2;8b?|tlosL;kOTMfxSg@$Hb>|#yW{NE|+TK?(^2sY339ZNawke
z{TFFrz+ixlZyop2yu0B?zyB|GK1b6D6foNO<nCt^3b)oL+pEdlgNp-c_4Su9$oQjF
zY=0H5_m)blSsNkWB5m5N&mTN?+zT!(We2Ln%R~5HJ1>+5j?WaNxJ^Je7TgH@^1q-Y
zU2l-f(~?9?NC-7!5j#c2ZPRZaqRN#H46xoG6C#ysGDYm{M)+L$vWot!%Sp4E78-iz
zq`%IcKOs6Qr?WKCea?k&jg)A{x~>Y7h~Kh1?W@9QbVY>{tdAhQr8yL$!@_QZcBYb&
z(n=MH%(ttUx=|}FJ^hV=d4B0RZUBn3en4<t%g-=G!Y3|tnv7?-w8qAH8n^T;4iu$b
zeu%D4)-WMt%6}42Bp^I{y_=APNPx@mrRbuI{r7KDv8fEEf%9g192_}1`dr|WWY26s
zzK{%zXwY}i6-$L^<UU4JbTqytbN|mJ#Zxj({N9B7ytLulax<-2OfK=fuCfNM`07pe
z%MtA#ioa2YY-g$CzuOYWhiCS9+tR*b&^IFW`OfZ+g}wdgaphjHL?D~m-*ok+b^*{$
zf7PtN){3>BzhzymkbmuIU*R+GT$UESnkF-c#0W3_w+~3njf{kU4tGAJrUG`Q816H6
z-~A1TnG^NtY(Ci;gy1t(XeG7<2wThO>s~%|a{ONU+s$tsoCXV3rI%cfuZ6v4l>3m>
z+pdFxYB=-0Z`XiK$=H#5r<Xyc%tSeFl2RV8XzTsll@qw>#i7>`m!n*l+1RUEuPvvM
zutSzqbHI~8G^{)6TiT^s=4+>(xHvtku{8FrmNJC=$r}=9JCk`IgQWXw{1o)|KQ@)K
zHz@Wowe-!tl?$A;M;2gLaprdq6*BI0#BF*A$-H^HOuZXDw=nrZ=B&DZWHgvjzosQ~
zG+nk{rug!t%hTZ2pB?g<*Byye?!6v|;B`(m6VtZS0i3`*gU5{>ntZEUXXEdb3^f7k
zBpG+ay0W-kv$aE8#UPqtWnBamn=z_N*FO-Diyti69@<V`JN?8qYGf+l#u=L8TyD*>
zb>sVDji!bkHZE=ps1&XCC3`_(3YS(5kMuS?ZEwNif`Zx5{WV~6#jz!3`|@&kq>ACC
zfyS@lL>2!1!>wH(0z$&V+1=Qot*yq4x<9Yqxy0z892DsvJ@E9DBGOetB-Ccry;8Ek
zM$VT>5y?3|qD~JXZ3H<?8}*Q$F3mbTJrQKs_5I~KICmCwl(!a~z`)rm4th-U9&UA8
z=4jT3Kr|QmWA-r+zfgK~KZR89ax32G%hwbbIXfq2tYeE9O?PehAhUpJW{I9ZVXIuE
zADGvPz&4tbt5Wq&Gn(;D>mSn+(@Diq%GC%+s)1Y+80!drKT1i4Y5^=J6ux@-Pv}H%
zk-wQdPKrJ62z=PwvQqWX>#pk>Pq;6Ng~`k<Dda?^!vf?B)0)I^xoy=~H>dw?6H62b
zgr$&>`iFX>zfG%dFWB$4b+?b$DkI;Q`}*@FUtlgRaed`S8bxaeS+d>wL=}U$IUL~+
z3H15G&#uZo@HFx8@LYDgT|&sXB@DM@knK!+$m?_NQS*wArtw8We12N>h8eM%jbh_F
zuBUX;e6h4Z3yfZmrmf;yTU(==AYY{m_nQ#`#Zzc-VCHsiN!fZ}nj+0Bph$Nd(Cp2n
z9{orDJs1ZV3zJB)!>n-l#pHfonAjc1(UCcU2%Ag$-wnwGz+`%{`wTxw9KW3J&fZ(=
z^IpxbX@(~P;J`s!$4D_Vvs;&2y;}y6a4MJ5an+xM-{yV2-S5u;52|92&Q}Jq2rbs9
zMORkiIpNXC$?oI?J22-Jfi9Mt$`L(zJ*&UsI!}MHsx*Wdevzf6d7VSN+~dmeTvqQ~
z-A(6b6YIaKSL3CKgy`-j)q}E0>e>zsCfuyDO*6vdp|_<fqr$L7v5)V4c&f3e&|@hz
zn)Y7oAq@0D=cd?lfeIo`!|^i2?n#?eg-NNyA#+0uRYZhLG_;DlR#BgI{J3p@BYdL{
zU6`3lx^{LlSnuxc^+S67<t6-$m{=SJ%Aqcr$u;+{o(64?@Bn}UUNXl|mxGqrK{zzt
z+_UZ23@1E&B|i;*wq(sQHL+FKuN0RSUu>+;c+XpaU%h}bZpZgAE+nL6Z6sl1x@zZl
zaW9l1zpSy))=rk2<KW?mfHvOMC;dAoU*e&>eJR``0)2`G$V<4be%|!(pjLijK#`n`
zzrB~`6Kejf1}0V(7sS_{Ff&(IgA4u7>*+gtdl!yNv(;)z#F`ghJ!oXSP3GjG%9%fy
zsZF7=_vg)9!<%xrXm?{{3*5<5(}dJW*i6y7KY4h0<&le|QOZ5Q48Kx)@zM2`G=u?u
zyo>V_MtlafS)ms<mwPp5fzkURCFT6ma){1g)=<0IJ5^h(tl>=mlwx!Sg=vT-JX7Rw
zgMxxf6;%b@_`zO-nZ_n3mb8++UY;j<+xY~!pEKW@g4J_HyWB#3BP2-_k%-;QThj}f
z&1@<LG<|f;%<@)OmXox1blbX4^Q~D~nb>`Pn^;(RQb~T+5e0F|EQP@d9j6H(U9tv}
zMQDfrUAe1;djtW*ikQS(3_eMxdD3;sjP-=~6?VaGZI3S5Dgpy3IjEv?awOv8vjLGF
zm|M$7^*x<S@vCQKDQ1)+2Lf0!Z5`v*1oO?iXh^F@Ut7xcXjt3i)A7&a1XaY)#PoRl
zQBjptCuf&7d;`T505<^b!PKa7PM})j8nV<9oJNXg=5E3|eTwDu<nUVU1wWmNJWI*6
zWb!*c=g+F;R*ttY1;I@7+Wpq*`z#1mJ$aJYzj64@WN{k#8nX)?_RMcdw&%?bzs^Ma
zSy);9Lqn;#xnn_4j>Y}l<wxQ<l~~$Gm{uDY926&s3lH}KQx+8!^;7`?U`0$E9N+u<
zZ>y@RLK0R0#E<X-A3wTLhdhUZbiBvzJCko&i5{xB#rLBhh|66bw6ACL>+h}c#|0A;
z1J}--5wft@SVF*P0e&YaNY|d>+5Nxq7`Bk#k0sMD@8=Ovn3lfDk>%#(fT~aPz`(~#
z2|v)sbOLcSkI1*69EV@g;9Mj6jA(~+hWUdBC6?@?*-_18N#dKBKGpfvEbKmM;<R}y
z8Qu`Zz@!xb70x)36rSuq{B+qF5n2J6qar9V8t{%p)Vas0<myjVSb|KJJhgW2d&FCG
zI)nn-IFQj}`(jJGw0qIfX>Dp`$|7x$U=|f15ECCRggSf0KZ=B#0P_xUn*6=LHGXew
zo`PW0OX~9OnTmOpbdDL<15)U~b|vzub`D2MN;};VdsLb!?D}gLQ6S<;!?-feL{83m
zb@vpB-MXhvYeO$qnR))$7g}y;hXRksW#{VYRnT&uMhROmNE?HA>?z-`$gh&X$_5;=
zx}Xc1reUlYmQyf~UZ=$x7u)M{+~*fJb-Ib5sX11qz*?lQeNEFH^ZfkN+GO1k@(%~Z
z>(}o+5VFVmatGS~k+(Sz|9OQk*M+eK$&X=>q$I;Nb^=z68O#DumA(w8k}Of1TQHJ#
z?y>OoWlKesJoF%cC0C)M7tK(h>#t8<X1Q=~d>0!5pHXOcJ$EVOKUjdJPoW1hC~2~s
zSf4*a-rV$`Px4F+6VW_oNm#9EK-V+l)cKA9;29vU3Bb#Cwu(~PLDDSnA_a*%zSWlx
z!#?qfhK@*h)i~RNnsE#}x>SNEIzAhPRrc%G7K@R7P<*)YU-tk-d(Yd43%$^)ShC}_
z-_Ql+ty9pw0IC>zMJ2byIYLj=blhA+5mpdkb=e{Rk!fezy>Bw(o{wrVU2UuwbC(j(
z0O3iR9oCN%Y5ueH4b?T`*HP&V9AhVe1dB<(iy(?oQwqp`N|e-(SX<+P%{Dw<7lqeQ
z5M9cuXwUcBHK?(!Pd2gkHbgxB5SD!ANsEeug9DyZ<Zq$vzIRma8{GO`UiTg9r3ljt
zx=68>t+^&bR(%YREmFyQ<?OPhO@0#7W8*X!hbnQ;OZK`_KU@0;>=#l|Mj!3r_@#gT
z{1h6mXwbsB^h-j4Almd*LXS1>tH`)$`{h#uGA=-h7vg1S6QJD<(tWthC5oqfINwRd
z5&5G)1XJ=ARMq*<?m|VSv9Uz6fQ*%yIjlin>nhF{GJJVg21EB=r;-S|N<`%}$e}eA
z>2)3gdKh-i@Eaf8PEvait)QgSMw0^tCe<mLTJ6mr7UxfFRzAm4aa&XA>KWB*@jV<Z
zASC;DG*mtaBD=1364!jg_Km1i2L|ybKP&^7`T`u;+d`pf)O+t<32irlG%k?s%OpEF
zP@tp7Fe7?;&FvW(j$xmlSHD3Up<rp$cldXW5v=TQp^qeRdiV~jV@fJbmibNdO_3l1
z!Fso|5~bt~Wu0z(mv3fv#h-?4(pi%uv=v^Mn~xPD;?cbu)fl9cwK}W%gFb>|g&8+@
z1!1@;)3e0nXVC~a^t%zRkI#V)`HMVFEYR)YWe+l*9|AwO7r}GYi5>pU@Mlu1n26We
zI?p-HZ%KY?h}QJHCV?CAILue{>IpyRp6Jv7PWNDwX0&XU@=4I}rG1^Jdv?4pJ#1^N
zr|pR<7t`3@cmW886cYN{<j6>U_I586?KMTi{_7#+qfWI|4=<C`|Gb<3g8-1|!_Cf=
zTxTf<R&WDgPR`M&{RBlS!$P4m#S)|j)tVLr<Sm-~kI!XSF^M^SDMYo7ZB}N;MMAv2
zZ>;0zAc}~HWDdW*Y+7H{c7)zreGtY&By3|#?+?__Gs}>tA>^{SNA9w94dnj%-uOg%
zT}RR(ct)VDq%90q$5iHyj}Xp~&@%wNfi?`e+q(?9DL7g3S+a@f+w%We#9LG>x3Qi;
zJCf|{G+_5GC4vSsq(^1-BEu;{;8;Uh7EKXa72xYvF%#mo=7h#7Zi5z<R012Zg#e|l
zclXv+!@}D^Xg9VORjMFBA+)5e4X9NCkal^ZAKle6H+V5In8+HhjqSDaLNuMp2ZKe-
zd@LC;o*U5%*@!=h1&O7jPpTIt${>XI_;+dBH*Q(H>phCkHEFq3%~B5Dks!(K_%UcB
zHuvQHUdNE>|MC!kF>L*CPLMewl9T<ZG84EFNArvn!>3BcPmqkmgp$FM{l{j`Gq+$j
zG5HpLj2ucci=CXVbBzPxs$$@dB4RWA+=7<GF#NR#&~o0CzzBZ>8=5R>oO^piIS(qe
zuGJjVU=Uunw47j6LjUhu#-Ndh)7nHJBG6ISZVMFsUdWhlhB9R^NVr}F;_}yCzj@Ca
z8+J`Pn;u?q8)Z2LCgN-(l7+n=GA7$-l|s=L#s6-bW}TQ8x`7u9*8J|NcAyvc9XQn?
z_mB{eBt)jofuBiPcs7xwQ_^#PFB~AA7&r2q*qAPGVz=4IQC2Sc_yKb9e`oE<m$Tmn
zsN#nSGt5mnUF$Hz-r1ibs$6bH3f@&Er_W+2h0J*zK%yYT%AB~ZH(A|1Lw+5RJ@6xR
z$T#b;xVa}74^dw#u|D}{Q^^D|m_Z<vRtfrfdS>O$2WEB0zi7+MrUPngYyY6JJq4qs
zLz3+MQJTN*u*efPZF5?&<Wc+T;3uD#MC_htC$#A+t*MIHdcrdQ^E9r7Slx9$<!<Fh
z*l7ny8A107ibi?5Vs?9PFQcWZk`e(>_v^s+0n$0cTC-;gJ~XFop{FgHAV^DZ)Q&0@
z@uNVIzWY~Lu|ZQ`@+Zs+9Gp_kEuH^fg$DD}@1T|ypxC8D#v0>s9Vuz69dQ!4y#0>%
z*Q|G!BoP2BNC0ODd~@pSd<|TMDnVmGbPyAHERoFUO4$Bl-k-5{4xO<fO<c<e6_faF
zp5-8P(J?~*))Aq;Jk};6pV@ZbFBTeo#>x%XC73EVw*fW@+A=UGBM82j%k`KIZX`vo
zGpYu}+;P=vwOJeAhXwt-6K&BPhRmjQAN}#?**VY^)gEU#JhP8sMR7Xt&15kledY16
zfDrGWIX<{8_}ssR7Q}3#lt3wx-lWnz?ou=@Hr8J(?E!>>pj&CRKEV!bXo@m=fz^N!
z62jZzbT5u71vS_4^p|$OZhZUJSHa9?j2wu!+JcAhU#5Ag)vioOqCJwtx}7qZO=H&Q
zgkibfVonG&0}#52*MJZ`Prdp(FvHWP>Thd>vPkYwy9xQrg6dTd$>B1&QYjihI0_2T
z@@gKU{*MuCcFoZtjn(~OU5$jtH4E^x$O=ASy@2c}rONm&6)kPx#o4Ai%+?5J?*|M_
z^GO!*?{CIZRYvB*PVyqyo1qB@OYM*I$#`m_)JwVeUO5J_t+59b*8V3k7K^xX+opG2
zQK>)JOl|(oy5Z~jI<OF{$<Emzp8C~cPjW>O9I^WEc}}+!++406ORILhJK?WVmazR|
zI)*NYa80ja6WjzPh|Z`_>j*S4|NZ7C<Dp1+Et+v!p16u#2K<xbAvjW$A+NKCq27I%
z_*CD_EChmV^V)qpVA=)rq~eRSFD8HegC5BOI9am2d$GC*MQv{=X^%oS#W=FmiT|v7
zwTCB*hN8__s9ygcH)a`4Z}K?tmXQxGreOnj53>jA0iWB&`59;f-*q?D)%C8d<c8cC
z=>0xQ3!L4xw%$eis{VvXCn&c0Aqd($y)G`{)%`Hs-ocOW_v7&w$?vuo*yBu-xKqZj
z&(3~B`}#Up@pYS{_xTmJ?B?aiCBM7g#k|b-gCa)jt=x%6tNY1%IkcA$wM<Qe>+1!m
zrQ)@~^;J|=Dawz}qdqY-uca$mk#_H~KL5eX$Hz`==6+tebX<mtbC2R#wrvL#pZ=L_
zOFwL(7xz4V$uBec#kO}jD+boc2?<?yKikLuhnrK#R=j=p?sL%Aqb+#5{SX47brWj8
z6KT^fsyJA(kct!gtwwYRO&(IcExQI?UE|WM;kQ9SKj~}kS6<|WUe=zlaUVT?><?}d
zda!{4kn_NQ0|U@LzfaE>48SFL0Y-$Hg2D@40DKw7J0bf2IbG_csiN|WkCyXCXmBt+
z=<(e>#M9!R@(kh@^Np#$`OeErXRiJhxJYP@F>`P<e)|^I)@F=gvpV3z?|KYn#j#3j
z>Pr@UU{L@4TOyK1fr*`+e%U}WB3jFnx$!1C9a9qqWyc*_(X3Zt5-hztbktlj^T*%c
z<mGKGCl$EyL9}D`6ybG-G&O{8si_Y^`RS#Y7|rPmD(1&wIXNb9E0;|<AlCi#NeB|c
zapm!rX?<NojWyv*l5>0eWk|FU#>U6-QMfL9YU?J2B_)khQzRgT+ST0+aNx!tKRjr9
zq+mRE{`c=70JBR0|2U{l|N0e>ot+&twffjcg{lz^)(`<iF|%trxO-NsBE<4Pe|`rI
zZfK_o+t{#in*VqRM|CAe3DRT0i$7#$_GoT?`0)-7lxv~skIIW83aMmaS>d;d5i(*`
z-kcoMf|9at6BEeBs=R=ZW@hDVooc)T6`8Is`b$Jq*VJ`u^zJWY!kRPPZEZK<PY{56
zvaPcB&F#050egFF-3x8K)N-*>f*xpkB1B+8gZ9{l-m*io{c}k-JU-@yhzbonM%}-8
zcS={EOKMvBhxnNHva!%*CuLAjx3J6ew8k}1%c^)aoQ4MQ$JXiT+UEKqu9q!xDO8>}
zJyDm~GC*ge$2!rZsIbA4uISO{cl>*E2ft@3@hpRlN7=}4kLFpP{4q6~s(7iUMyJea
zHo(sq?WLe@X_e=h;I&k0YOwh}w-%_$rN+j_wV_ZDTZyDNG6H8`M_)T6IG6A95u#_m
zdUgojbb41C%x2U#yLJSzp`pp^8t8qDj(eu^77Y?mc=1I-8U#qah9Yza<icM{OWvoa
zjD;64;`KhzpNf$YKRPS#Qf%6ulk-x<)lXCsFatj2<(wd|BM;b|#&h@gZ~nLZ)WHBE
zD!`c99XI^`<^u|fN~?Vu8JW>b#R`4~JaJm%si|z4v@Bu<vkk85ih1Dc_DaFI71A@t
z%d@beh9sInqcl0Ta(v%N0g88zU;3v~QG+Jl3oD@~kK2K$p7H|$@iQS83`^#6|Ipz3
z_xW!DvG>%}^jARame$mMRp_iflq`m;>*?vKa(jV12a2jBRZj0++fTSs4x_V&^FGMX
zBih=t=NS!W&dmw$f6}N>IA|EI<>`UNwaxY|7FUSRlFyZ=Q0xf8n15pyMnEoVvPTa!
zU;j#1ugOu0N?VEmVwtd**jOMR_A#$@V%yto>g^3h#w40uSfHS2o4E1`Q0K{gSgO(u
z1?x*8#pL8<wHgAkl{9g+N-Lj=F#@&esjnMz!lgus6{CBpB6G_<40#n*ubUbN#741_
zWocj!GT#pwTbXPYo|zvBeqlBfH2(*_sE5uk1wZQQ?%K{%K-bjlCN|L2)O2xm{i<4?
zmm_jS06P_&Ks=9aK=`GIXu^Y^jYw$nG;dFaQtWDx9Y%JNrD~Do54O@(B(WqUyKU6%
zd}OnSp^$7r@rx+zH3N<#dyw&5vRbW+zxN@Ri_5Qp8ew#mQWHTCt}+}*^$)rmjdcY}
zy#4H!2}H@Dk9jGkDTR_W_j|lp?G}2|P*)JNr{>oe0{zOde(>*aZDmQ8ej<yBeaX~^
z1Ot;UCTyG!DBcI%q}~yWS?b=6>}(d9`Q9{$BT(;KVz?0sX21IrdkU0nsu)!BFFRu(
zjVpk1%VM@c5UR@GyQWC$sm_PYhk}lS&%Um$`Kj)Is$wXWZF?cTAT}l})SGmF@05@s
z5p&6Dh~33?ZLshe3cwAXgY?c<mC~#{@!X)R;8YlcvS4v}*?Osq@N#x-w*8)`m$Ws6
zE;Ys{uj;jNT!`4x&CW!Ivep8vaUH!BVs-WO?+{wX(nbs2MCWczLpMOJb|8ZZgHIf$
zVx3X+hNETlrjunYfQuYmR3w0>Uw?7l`G=HutlXR&W~CgU#Zx1R@~QN#Xi7T$!}v&6
zJrSPd<qJx#tw-NH{J8O5(4-j|tL#>V@-_HYM{?tW8X|+Q`owL6L}O5FyDYMbhLSDz
z%{9eiJb9_`n)6eM19E*j{g&xiMAiOT0RC@mX?*zL;I^AWjHlu&m8{V4@(f(=m93T{
z<*`|L>i1`TW#}so``e*D+pmi>pvVN$sztVw9A)M+9x!|8TAo;9HiLAbxDKV#FKc%&
zFRSSI=X{cV{az$z2KcWTHNRL#GwiJqKb@&_1q{)kt^e^Awpr$<5t<38-kw6T|NC%_
z5xN9o2~KrvM*Y6&^b>t0i>zGLZTdaFbkw|o(0PkT<>{#$q`rCUi7(7*_6l4)sdf63
z3gJbh-EIGc*3e?7ea0Ns@{nI-i8d>Lo{&}@G>_)LOjEh>(<mAnziH03nybj2n)=qo
zGrtg00(Ps15YI)2m4E#AY-yae&~M$+@17{Vq-YKb!kDo6EfOciXE^zl_m)&q)@O%;
zni{p98>GvJ9(*Lc1%8v9=38pLiI;E@janydZObIr*1Z=XK6jaZZ`;p=#R3)@Q6u%B
zA=zO#FMDm^Ibmu>T9LsC)%nC8@m%tK3}TKTkT;)OSV#dt1cZm++P=Kd!!Ut(elc3p
zU2lD2=7qF$hG>%D-U=%=?BSNURkZEQH)b<GlYsK2c3(PAy;9=h8W7bqTU6PtXT465
z2TdN(>-<3OrX)pi5rsj_85?EF+iqNcr<%|<ct1P3SnrI{W@F0Ve#X%c+BU0Ibm~_P
zlDl6eJk}dL5WC_8lAv@txNvm-WONhhlfa<HkIVood)8k>yyd6gX5vP*-<UM-8Ob>w
zEk+j>4NR9|LJJw72B9FXH@JS}hT*<w`}XMYR}PuXIm^J{Sj8Xek-XCou&k^HYxx+q
z&HtMEsVq0jpsB&Swh;PKLPEc71r>vYhsc;%RXv&#<J~1uzd*Gz%qFYd;=UxHay*!}
zFDNU^>*Imkts}KPU#@jD^ecH!lu@X3WloobBK?`~jGIb_H|oOCUbr-dY5q5hBi8s!
zwAm%htS{HuK3&Q^PJ1DvaIsHW!)-qp4eKA4!#+1D;|j}>v%kBNtxs0wba04^hO}PI
z-+EAQrq^yh$xUQ~oK&^11cW5G+XokrSENfMbR44QZ`Y5bD{U>1t6&<39ur}pbBoqX
zNgAy$G!Azr^L(8%(lyd+F&-4qoz7bz!Qy!~X}1nC@L74CS+B10Q$9!=kM;(84M*!>
za?$q9S>n^gbyjQ&9UbUwjp4a+2PV}e<*%{qO$?N(Zky-UkFH;Wm+Z%h^t)9%T9bOx
z#YgiVK744n?gGZuW@8|7@IpgtT~pL(bWu4sVa@VvyAuuKvoTT|!hDrQ0o(kNO=8#M
zx&aY-v*EW}>%GK=GbxO@Dy2)HA+<PB&maDG)MVvrP7a+fCUKAX+QsZaeJG35JX=?n
zjR5Y-OZ<e2yI<<%r1pi^{-|46ja;}ks+6vEnY)vxIOQIfm<$Je`0&9>Koo+&Ypy5r
zzcs?mUz-k1o(;;%eT3dWKEPW5_tjB*F;Hi|w|XL`S_)z7cZp9uewuU-KAQ{lB=TiP
z?yeADrH^EQn4$h`t~oEqqI9%OHkCD+^I`YA)QHrpy8KIND0)Ji!%jWt_m7`Gs?Enp
z=pma+6G+85<=GtMcklRUUjGmmF3F0e3V;Y@7ZX7@H~&ehTbr%hUe3xa<{Z7{+lcob
zoZf-1ZANZB?HLdIV#5Y0rI5Cm>;u+}dXe6dI-9NRp0;y!ZpYtR+h_3m3%%?Dc<!}s
z`&OSE$E=Q<!{#TK+>fu}_#GgAwoRb<eP+yRUe7U~*t*5l`||$)yXdyppK~4*8MJ<%
zApmSl_Y;%Y{Xflj4rb~c6JX!PKXF2M#7)V<%pX;*Ni2ARyisEQD!82j<qodpVpvbU
z<aa8n8rC&h5vdrd45<WEO!}nNcfwTl=g4n$(DhwwpBo4Miugn1?I+N?p!uu&9IQmC
zDIx%IQ0wnD{-2PZmb1vkleD(8I&-n=`jXve?W2pSx6dl?*o848I`@r?MhZ@=SnZ4n
z@^EhJE=LJ;>^+G{8`<eAH9(LPI1SS1J)okb6sBG7qyD#@*$jH{Q}uOsTMn`day}0q
zelb^HzDN%?nBT+VCb0^)<qZvsk7?jca(y*lq4}Clf3~mxH+qQH>CnNE+YbXZ)M}-4
zYr6j*QpXdTCKI%bGA+Zw(}HuSC6-u|=W1RmX*6cLe~c+ATv-DY;tmQA_Hdp4kahti
z=O*nbty`Rwy0~|7c<ZhCg*DN>?Po3JNTj^as~PwZAP-oo&KJ<T{9pm=_2kfGy59CK
zqlK4}Qo2ob_x>dKe?It}e2IOEQRNH>W&U4$5CNMB#>MXmDK|Hb?X&8#bAQ!Rq7uWw
z?L;E}_#GN$G0HW&1g*|*tT55NvymFsG8!DYc#5mtP|#nqv*cXEq<a$@QGjd$8Vc1i
zlevYX&JvclND-^-H?iCk-49(+)Dzd5tgnF}+haU(O#yy4gF66%9kcuS#92x`O;E=@
zy>{nLmZzs^-uA|3T+x(f)b7ktmCOGdwPbJdMPp(uw?w5=ykT~Z&3w?Kce$&7f_v|3
z^g*cCFp4gz)6W_YsP$ExysSQcjCe1W);RL*8o=$;rn8G3_L2FIk5BHj?*AWXr2(CU
z-T6wbJk9EkL(Z9|?<2RU4e&MM{#?sy<m?1+5S)(N=`|Oqc^kvb<psK9V=v{i=VWRQ
zUrvTh2O`FarOgj*Hw8KDV|s=dT~~z!1Hh((=OJr}Revx(n`UePijZ%QIpR;eTD@K5
zvlF|WjaJPCNC0AExxM^C(-ae&Oirv#Ed@kG&`wp$Q!d0Q92aVpb!j5wxk~B}&l6NH
z!1YFN5DEs=5J}C3xjUTIhGuFE;y_Hoe_;m?i|kqQtB9jh+{KoDoL2;Kg_aB7tyaxj
z0wOVp_yL61YPGuQCgzMOG=3p4vl^X?5>sn|1Q<dkW!1rpmgtv3p^JaI*HoP8LY>Ze
zHKVz?xtm+2^aoT~3+!#aI7v!hE(Makx4ElxZE(UV2kq;e)LCXB3%xH10t%Ovfce4%
zF3am!n<}_<YK~_j-2~emYq0IG;L)p;ZwehOpA2Ry2i|FQ9LbV9t%UX>%yU5k#y7&P
zV>W%`bCutL``PHZ`8QwUu-ga@!;g>D92`dHL?V{zMo6nZ#9+7X8^4yJ87wR<&N$gU
zJDR^p4-Zdh`MTg|nXQ=8yt``K%1!o%K+IX{0Y&4rn=5^XiDiI>q1!H%=Ih>Lau%hY
zuwDJOu^wkQv(Nn?-`DzR-m&h~Y?#kgEp#ZycX>|XB=Ll7{}fj+`PG)m%(vfDrE&M4
z`9869Zw(<|4#whV^y?tYDH*-@<i{=vi9<wW;Ib9v?+4?`u`Lu|#>YbsYIia_oX)?D
z>h<4LmdsaaIbh#0SDsgb<#HVT>IYbK$V(27`D;(MuJDt45>8G$kiqhBAE>e}Gg&pp
zL41kTdTT?k>ob{zlQFUmb-jX1kdVwDR34-(zl%j)PR@+2;)^Js`k9Er>U?V1Z26Y*
z@v({iOe1uuBrYK*6*T%uyGxuMz<#)iT|RzZ@Y_&U=xfXToo&MZo12*?NBbhycx;?E
zBIhWtpT!zIaK85hgQ$agvrbAwgMqjFTo7U`N}-?AWNe;WkCyWv!R4vd+oY=<cXV|$
zcYKF$oIVuQAd~MqhWx((Y*@KzC7aPjP7%BKwG4qGcQ;8EYn_{4lWUrDl-U7dJ0ZUM
zOIyT?%h>P(^Y^=-PrkB4j!3=NSWlT}nRT<0dmOSMkSR+zXAJ(CO_?3LQ!lMl{>zW0
zl#`jgsckGKp7-37+?M?`*;Fli7-3d_sC0g^k@3u)URmb7f5qvHjWFa`^3NUo!|KWs
zs;qgo9(jmj4HRwhFkOtSbJ_mJ&Ip+%9_z>|Sxz+^VmKW@0`D#6^2Ed=C}i6C8n(^e
zz3MWv&zrMz2Yh*ky6b|YH~BY?N+186kz>o8`K)%l^XCuMPRF9v>Y5;&rp6S3-v36}
zS?FwAXGlkJEm_uSc4W~l*Q){q9f2}k!Z#k1!7`|>_6Jm3Dr^^c0FZ#|wh?gEhkT^#
zfi$iQGlIWHa>dV%F_r3_9DNe)dqX5Koa+!T5_tsS`2beKJ0A0U)5-bZ_6A7(dS}>^
zmYo;+mJHp!gk+C5GC~cE)-paV4Hpn}P^o#^M0L*f`fJC4IX^XcU^rKF2?Es)9;ll<
z`-anX=z(>ggdrJKj*UItJ9C-W(OEfZd_T`WY4fXRT(0$qb7kzJ*nW9VCenbswLbQD
zEPcD~49=YwH*eqcb`6sh6y^{Vex9u*XoOojJo>hjW@IGtEpCZonrG>k2X~*#;OT`c
zloj~>K9OJvmxzjexpRJ70@c{_rBu{OxN%;4Ja;emLF`K{H^&}FGFjgtlrlF&zaqyb
z9+tsD0w!JEa7{k}{wJZaoFRq-#&_@tyWcY}I4)LFzYuWsB=Yl8pDbsxRJtRIrCt>c
zioXekoKpJZyyhR`BEQ+<WT@NJW|~=I5IE82*Ka*s&5-^OnfTp0^ujmJ_s^HI^rftW
z85OHyR^@spO8aT{YT+_Yy@7`#ZX;ErB9!~<?&C><hUX_FcU8!*+nZmI`8D-KVXhr+
zE|Vi_vEW^kyl_1ludL@REiDaplj?QnXX5%9a3V0n-u`%{*7dNJm{EtGF@s4U+P&_`
zD&^kD(CFN$ifZTaa8iH1yE_K*v+VU0zN->&{GvZ~WJ&iv<?Ee4s_x6vE$&8a$J)jW
zuHsMrg9WJ8?l7HVUcQ#7;y~VXM<|Aa3JI>qI-kLGha*vGkEl|aFlY_Gv(edHZzLYc
z;p=cPGDC&lNUe#|3DRIbvG?@GY`42>NMYtXVm~U&i-ho4w`CGG71CSIu2>6SS~lm6
zw+uQm-P8m=^G<S@&(=zh;*d_JXvg{2hCeQjxuoT0ym#|m9ip$ru>+0kF;>;DFpjvL
zPft#M$<EI^TaNx@#_-3QZ=oii%X7pE`!IA+G+Af#YyGss7Kh@yRK@IGku~4NG4G8V
z$kwfr6cwh8*hPcATOGW#L{!rC6KCZmEP=5z7a%|3`tvsU?YybasF%crEWPpb)wY^t
zZGRZP4-c;g2zd3?jB+QxCST$|B<STYdl&X{F6YPuDW6Wgr%z^d`^3?{$hEWl>7bjY
zo888yq@Hk#UQ%e#>W|d3q|WYXulm~hk8-V{Ol6v!WL3+GOQ(OBEv$h0$3{-Wk9K(C
zj+ms#54R)b#PbEY+@iBT&0jZ`X|Z9d>^%cR=#x7yK1cjv&hM?VU5jB~lfvWQzmCIb
z*%6PuE+{hb7_X-?(o#pH_~&}L+xE|2%g1wm<S}fHX!$iK%&v0C<zsd&J|@EoARsii
zF^4+TdyT71la4%hT;k298`|pwfsq}SrQZ0q%-c;$HHWrookphAX?~aJ1g>np{eo+k
zEU+dMC1Lg&&K?2+l^<9Fl~+G{8>Z&vg_I__ckvB=-<kD9QL6g6j)!TC0MLNtCafRJ
z{U>JTY}!?Zj^&aB-^t11pZOOOSo`~rY93N(-<D~nEIGURA^Hss!+g2DWQw%xgZ$b*
zSp$nDsDHDRX5~bOH%-1?QL%gFlzSV~akb8N3yP}ULo%*ME-fc82l5_UGSbO{{6K=Z
zHNYN!w`DnLch;-kwA58Ho-0g`+^vlq?=&DSzt%z_Tsn}}d4C#Lsk1Yd>xqAy=-ziF
z`G&QNQ!J3i6pKb~NF)_t+VxGwAZPjDe!k1sf;?hmZ1oqCXn6}??NQoY%v|1x!(mA0
zP|)3WRlD>Sr`&qarr7q&eC49O4QZY2%@!Bj>slZ=a9on^Wpe-VL``i%KRpxXAJTg(
zB5C5hM9&ZL^H%MTw0DG;U%jEzZ#ND+G+U=R-ww5ped1U&Kv_!3O(}c1;?XE%@_jt`
z?H95jPO5*9N3MMOtJCB}AD0tDYBo1I(Uc9N96L9;=!@rtTbZXa=dESw&>o%Bv9Q#%
zge6XNyb@(4L}0wqnj9gI;XEKCtKGCa-<otL!fa*aiS7tMi=tQV8tOmmt7x2S@~cu&
zLQMVpqzxZNyy7VI->`XI6+z1bGUNG-=fp|5YA;PfZ{$@w@+_Fed*&zA52X1^HJFtb
zE}R6r6d%i#nH&cE{Hcpa=kV^aTzZMoi|V_@<6U3yHMCYgreTn{(HAeBDmqQ^pz6q6
zyExZEO`^Y`MnuM#Wn`>-vH7Dml0p12HRWH@gk^%Zry8?JK>x5R`zZ(Hw@Qsiclvi0
zO%C-D;mm9GwOL}2ySg?#FBf9-sVwnMm~n6Y(@lJ+z2F2z?pWJa(kZ94TyGzr$Lc?X
zBY_T6cU2Y-Zo%VQ@{~;{sT!x{gkFXi_PVsGBqlG=X;(3xcSm7rGTTnD!MWG|2$4F2
zq|x7$>%Fz40S~7Yg}rt8K$==4Q1e5jrM1dda~njSW;a&bKZGq1u)V>6leMruSxFs(
z+pSYR$p!j6)#awztx=dHd@dgZy-=(NgE^Tj=bu;EZ*qCe=oc3P3XcEKf>4#iTz{oh
zr_yZz!#9Y;d3blre?;N+>(>5fCr3{E200fy0*8bcU3JDB#hW$ZP}xoEG-kZ2sVzIj
z_yKiU#>!!M;mF8H5vaY@snjQ$bC_stCh`H};6U}vy<-dliKKHc)W9IcDv5sIj!wGM
z5@!^YKN~+Yrg^ze2l*eQJRr1Pe?%og&<oOy{e}}W?|8cvl$6>)*{!RU{2~r^-bWT)
zuBKKAt;3k@8_0e%>Kf6C>I&^WxpCvi>#todre9xzPfaJ}^=BNZT~Er^bvH@9|JK{)
z)nGyw=udcSQfwa6_sm&9(fHbBf$2cNM6YwHdyMqf8|R1EGuc?EFI``}_$6**63W1;
zW@n(Np+EPtkb;D-Bx%9VeSRf5>4kvxCny9mn~X8}ViA8Y9n}b|cVDhs>NjL7vRn{R
z%+=`r#Q1t)-B@e3KxS`4;KRAsr5anFjeo+YChg^){Y~HlSmB}QZ|1E(7i|UV5*xEb
zuFFvmyrk;<@T)#$yfG!MW9Y$QKz;;6+A#bJi;DVQ=Xx>*V}8{KzZWx-+`eRG1(2co
zKet^I)Gg<FGe7Siur6p}SaGA$u1)RDgY_ZHp7<wHA`>qMq)8WkZp({Fh}^+(?q}qV
zbvygGI$6#LntGrq{7Aj%jR^;FwcYxg!KH4K@fshPtivWD5&<*(@Zo;iGJE^p3yF`b
zEO{UlOG;>z@q(`+G{x^vIM}(bDDGcW)#y@0gXbs0C<yso95OB_1ktZ*OYv)>Za+0P
z7Mc7a8HAZ3ZzAEbxm4Ve4JD%hq~Jnp2uuJ8N|=z$^%vgo6UHVY6Mo_FFnLbqhM!M)
zT)QoA9MEY6pzXA^ciiKoO^ENp*ePOdYZqJI^G{LARh+M~r@qgh*qq3B2{naoC7>|u
zm_O+_>z7ZC7aL$z+i&WRZty|#A+Dr^?ahJ{cJznm@@h|*Ew^pf5}&?M@;?1GPqK6e
zCqtTqa{VXsK+g|y?h0~gY3bvGO;Is1w8v*Bth#O3&_s!3D5v;$Pqfi$cV09EDX+>-
zBmk8uw0F4yK4H)kKW8&Rc-i8GLT<smq=wI0LX8yLSQtQOnmGrN&|NS0dxH0q9UMAl
zv6izextQ?qWk19{vy{1pR5?x%i1w(fw?#?*sfHBZxH4fybtMiVsj!Va+jLb6HV&y|
zx!E+F2^3f_=#<jBK1vW#2D0}*>kBaDN5b#oP4V?>DjByBj2JLmPQwxVdhty7IU6`M
zZ;|IXBzJtRsWDp9=O0+H47T??d1j~2<EXr9aPi6_XlI8741plXl2uZD#Ro##RLy!f
zZ@<pR>GTqRkz$s4Jima>;2FsSlB3yvPz_c9_;Pqy7zEyAAjk)(&hW@cVJR~PXdB+e
z#haa*^Dob5tV0%X!El49uix=xeqHD3=0f0)R_H%?sbm{hjQ-jKf-d=Wt_bjb5F_Z&
zmuoRczk%3rNH=vzJ}7PIxsm^EaLNOBa46H?h)GcGIhlJt6S@f!lWc4e@3)vdJw1U@
zjvCPND=UVp$%ZIs=;$vcB`N7)?74(ZDuG{8Wdi2@xu5yBzfW>UIQI}dM7lAzOzwT3
z>88NNQx}YLxU@d!lh3@)`9tIkZ%J--rBNz%QO1a`nMcXu2qPVVAg2x;&F2cHq<K#l
zw4GfGE2{@QJfDCN<xN#fA3c>Xd<QC~(7%ilxLbmG6&)OjuzVDC@Q$m5-NA$F*Cc3Z
z$qbZZDg7_t8_<LVW?vZ-Hd!^3)MnjASw-KLH{VPc(z;|tlpP7ne!Z=!8G<m?!SSo5
zrEQCN?)R3o^B?0aNQ|X;29c~9MC(W=BdfKQL!xBV)YLSzxnrh(L^{{YXtJ`h3MR9@
zX5}>K7t1Ipdra$R6g37kX}7*DeZxTit-T$!_6KpUl%Ha@aP~0hiUT{__ug5*`g(F?
zuWMf4-htls`T05KjC1>kT~ZBUVI&yRf&mk@sby&L$3;tPYu~?Q4UC9kB9sJ1XBZ0i
z_%TV0g(c0#LkgkF<s~~ASy)@QHqH9T1*0hhqrvr+@SGtD)JsXdQc(8q)<^u6VVIen
zn_N}($x8e&M_h0R8turAl}Xv#uC%m>XyvUP*@cC*z|c^vzeKKtmrwc;(+AL}hbK+6
zv8YmPCwR3R>wM^%iOmz2jMBt!8-RO~v*Tz}P*jvvP#Ctj*gXI{DK9UNz(&VA(`$+V
z6G%?A=bpB}o_ERCS5Z*`EWpH3XD%1ks#sW|zVE1>%R%(1%@WHL*B#TX4^|MSbilM+
z3Ww6uFLp*Sel1e4oL*WZngI1%twJS)t*xzw!CiO66d3N>?H4641a9D(ni`l111ftI
zU}=FDeXBNxY(!u-EbXI>C3y+{ZH}nIAV3N#<j7Xtz5g8FhWsGx>2-AFvDE$D-Ch6S
z;57KlNLm~;uE)=&FUv;DtKyn}3Z++Bys_2gZwns|?hW2PJ3E7Vy~&C;UP9oNTYG}~
z@RiFS@tgN2RPOuS!0!9G56pN#xtCs{bl&~zUq5r%@|%yw-aNJ2)khCaH6UYSV?PCJ
zLaXpF;wsawcz;)Rtj8{`6I;keu$zza&M)aefJvC71$h7KoZ&NvSej^g4d~sxUll|2
zwm|D!^ip@N0TTgJtVFJS<g1TYSM&g|`nA7XE-fTn`FmVi8hM9#$HmCr<bJ~fmE8aS
z%@V^^Q2~y^m;d?Aw?o}#8Gyi3x{&(EiiA39NjkF?{P#1lX%*QFKTS))anf2#y^1`d
zE%-)@6ZgfU?|ZKZbv&-mBIDquEZV*5bg2osAIpglW^kq1JcfK_{;l&E4Bp%*`=2)l
zV5AO7wsP*@A2$ZzGS<M`OZoq<`S<3Qyyd`s_4mymWPSaP7^+_mc#$Uk;!+`Dp?^_X
zXH3J5qIN*}f{(k|k2Lhki?yfQY#FdOl9H0N@(&}f268Jf@YMi)tym!R_hz5cmuBY8
zQ&in3>k+@&*hs}OEml!-;<*E9H}CUsuWI8gUwIt0Z}*VrJWvF-y#D^AG8@wbuqP8L
zM=7!fSC7unGq&re=BfDQR!NB8EAZdFDx`hV;wV;b7ZZCVbGhTF;X>l2|9)8ijsEAX
zQH6ARU;n-(Gj3LPl}1^5I<mp?5(;1c`M*D3VJ2I^{L$dsW&6<EkkqU~eYl?4uA21q
z>rutb7mu#Gd;QNJr(z4=y;zzNi+<p}lA6a+FmA$uYLXD~cQ<??B%8afv84AaQ||9I
z{0vxAI4A&D@n0*b4-_OcUw`t}{reSPV!PknX4Dza?KG|eU;S6f^Y_W-^G_8n*Dj%t
z5poizF&^p+2oJb3p21-;^rgvK5ybkjzz1w{t5)9Fq*FACg`uu@Uo||IvW!S^Sde_2
z79rQeThnAZHIgX_eiDj~T-@BrqidE{R*l2Mk>_V8I3y$zP_u{rBRLeI&`2W<@Bd2!
zUe6)&&)RAjke|G2N2L{duc^hB0?M9&8pLb<)Ij9+%2#7cO-t*ZkB<-jbb4_yE8O9Y
z8#hWEYQIP(L|kZJ&gf+`#f<~xk=o_U<#xNZAw$-J(;LYDT9g!#z@mSdN+RZ+nC)Dv
zqk(||mE<Rw`wzb=g{UFn(j+cBCeET}eO0U?x&Iu6!vpnj-noBSgyqg_2L70~W`7)*
zmBgn5>$6<gN@m<o<YRTUgI}+Tm_76*h$?t~xpJg2I8skKQZkK5>V`678zaQah+#e;
zGBOgME)-_N8r}sSbohr{0mQe_Ph$m&-wVeu)2atxe?hGFbIwdF>t{i^^__X+qiIcT
zEigSBmPo*;v-`z?d#-HCE8na0k52$RJ<CpH&!hzI2&wVWtLU>5bDndu)ic&LV_T13
zqK3`b;_I`sX#vA+Udkgpd9}|^h4OcKG`En5$20#f(C^!1Mu!?c0dW<p0j97zeN5VA
zetszEcyu3*#(1tMu$mcl8yY%mx?Gmzgd+zQ;oxL)%@Z`=i?<L8u6pUQK4m-%{HG4H
z9w;is&yx}U8sg{Z72&-8RG)<D{#rwnKU|>;9w-X(%mFg5)n>-WV{cQ4%>Mk@jLA9m
z^wq0Z#PW|Pt}NRZA7Gy`-=PxN4*z>>GPi?Tu>_p@(dj3sN+Dfl0dCkQ=Z6cqY6-7A
z<<!-uedMw(XM^UmYQ7u0G*X-B(K1v#QV+qNrvWx}okFDoB|7k@;JSoiKjH-<RZoYE
zo1}w}1m*6I&d$PdlZc22S<_<e(kR4N8fGo}#n-er;=TfbcwXME;>x=S5Mekf9|<35
z+9mi9MH4CY*Hqc^oC#A8*jd}Rc4oW1F_V^NoSL4#*7vrwqGITRcX46CD_rjEGo?x}
z9%Cs!*~W&0v-2q9;M;8&ifU>?tknpG=fab4i;<BL*lOXMV3ENZPhq+Eh`-(9lFvkM
z3EE$XFb6C<NWnQ<DWbze7fA_&Ko}%VsKQZG`jy;S!JE>@bT9e7(l3lDRO)y{Tl`90
z!6!PJC|EHtBbo?8k?Lxc4Kgx^uW(gWU;2LmTBHed@1;wTfeOsV$sB==h@Qs4;GM4?
zO(ZLkscUF#b{sERq6TJZRb?f+lM8dAhDJrzxjEDA&hc6M$LzO6pE;Z!S^AV>WMZWb
zE9~!<D=5lqm5-u`8!HpCm$J(%DiuzyN5qQvmeFQZWnGW!h5_iHrj5@vHRrZjnFXLD
z;9FU819+39GDJ6XMYD&2gtl+hcEy%wkB1N0i}5N@%HO=GyErP`9UqloyBha5G#b|p
zmtg5sb{pr8@Wz&WEhqO3!X+>Rkj%XTIT|xFh9e{-2$I9%;{4imn{{cDn{`vm%J4vc
z-o*ve;pFhk?jOO;^}wD<{Mt}PqTE}hB7rK|&r<rojJ)kP++W%I5qv$`kjL1Oa8VBr
za%QE@jz^5;TJ(%fZx~vf>?$jVywgg&Wy7z+WeQ3v90i3)2j>&5E!NpJ<9iJ=NwXiY
zg*?4r&H=y!-tXQaz+mYm3-92d+-j34?UjWcDTpfV(!O;vE{)A{^Bs1y9NY)Q_W(4|
z)zbq4Q(=8Yyj6pN_O6Zx0s=|%Uxc1Kc>)#C@3Z9Zz6oGMX2Xx{e%(`OYk#+OGJ`+<
zh~Tu(&{m8*%Fy>$mYA5h1m^v`iUNf2!uJqNOMDlSxD*n(jIW!O)V!rKs2_2?@9SfF
z@ZiDwfS`MTA>P`uXar4%_wQHelBKRZmI~SY{aaQaFijc=kBn<qCc5-lp)dZnB7sZU
zJt;Q!rJDwW##_v9_q8E+#K9&J)3P9d8Vh8Vv&-b~-L;q!HKGMfU)f;Z@*|bAye*96
zcz0<zEIRz9n-m8qncQ7k{1BJ$Qbzk4e;qQ=RloQ5Pj^<kRL#IFhaeP)uOj#((y#1s
z2_CPV2$SbaiFr%iJ&yh(2n;_!Y7S*9$Uqjy3K!y^*ai${NNICK-@&^r{9GO*IgHs`
z)Ry82%cswM7M?<lGM(>mzaVjw*rDz2w)M6@;AKt7*&Ea~NDWH}6Zsy?_S=q_nR)s>
zgoMrqTz4QP1Dp^%yw8f+kqj4ClmqWaY(5RbI91XvHw8hm4YyE9%<tbOw@A1e;5xWn
z4sZH}k}N^SXjrNOWsN(e_|m!(By%9@^4yk!i;ctppO9Oj1dH<fo1%fiHVFY?sMZch
zC(RBOQb6Ys8^(Iyya9?>r?8=Hd?*sYhqDD`j(@*$D!J?8bwBwxba*FMML5$sZ+{t=
zpu)LKwqdyV^l*W}ZgbqLv?l&gV-y=F`l-ahjmyf!|5wyiMpfB1U3?Tl=@My?mQuO|
zMFf!sl?DL`rMp3;8|g;66eJ|1MB+#u3F(mT?*8V8@A_Q+kcI1x>%L-U&z`-56q-f`
zKH61@Yw>E@lf2FewLLmel23gy+tF%}B;XQ9nDIf>{g?{`fUag{hDSt*19?~TUubHA
z1yY^oGpW#ADSCj~Kx3g#vNc;S@nEky#B8E21YVtxuqe%V{gsQ3if7PL|7p6d$F*)U
zvLGy!KXo3)p3Tl5QCylq8FM-I%U5w;b>u1qlk);bIMW}O@Ze&Gy_n-p&7hp6sB6Hf
zVCBb84}om0Sg-LapT%$!_%$+v5zG0<G<rPhhZ9i^J5Oq^f+s^(J8`;pYirw|?<vVE
zV~3ZkD?G!hnwq{q=N-QTwgDnE3qBot@dd?2LbKSw_&*~5+ku`Ncrb3-TF{H5>$ZuW
zT6hwC9~vb@Ufyl>k_zW?x^h4A=%>glaUK;NdB*CBbAW<12M<pr%QSF+ls+Bvy7!5+
zbk(pD%LPbj-s&Adi#<7TlHkMk>>Fiwvl`nCXtHRLqG1O$s77oGcdCrS)Sq9vrwyYd
zX*Cqh&Dk;b&VFX^77SH-@b>+-ZfEa}+h5iNQPPPdh*yZhQ20LIOc1B3T4PWR$RDw4
zhc4U(DrDPbJhodRBJYteil+Mo@wUd!cyvyV{j@x{*$Mj##p_Kh>$EGDN|tv*e(6{z
z@BMj-=!r5gm!X=pe-297a%3Hi3a9bs7Q#PdWMU0Ugl_UUVHzMp40e}(_x1PlnQMO5
zDnN-NbP-8WPHf=dZQ`F#iam{`6DkIxnss9cKi8{;yPtSD*mNtv673i-qp<!OIO6~i
zNnm+0OE&Jg{5-3@GM9n%MWl#TZjYgz5Y?u=+>@nt)NP9#s0}s-6Aw?P6@Ibv#gMSR
zu*xE$z8Jyl3v!nIUwlEXjombwL&}Z|f+9Az13k&$nwUz{t6RUj!28&5{#uZ~^0%@Z
zjw?SOX311$zH5}6G~H1B7A&7bS6>Kcl5FB3>)Gk9Jhl6rVT$&Su`f1NO8^lQ$IwNS
zW?J||>?v3~7HdXCiBWJHLcqkZskyvQ{lbd3Mzl|s&ipnvc9hGq?RDLLup409z1x*)
z>MFJ6Szm==`}!K1qa0adZ&-(EnTNHW=xO@S%E4K6dwH@ag5JUG5Qs$TO*mdem+r>K
zZ1nxmwO!>Uz*fMXRaHS0TMq0=j?mm(MttKG)jOk#ym@mTnfbx};5Aad|C3hN!MjcD
zWwH)bH3V>IwAV~w*85S#P`-NA^HbF9%*Z_QYPi6DU#)WF2UO{C^YS!V%FVWw){LRA
z?pTUq`>GR|>|ozjmu4Q)Xx&iaq2$u<adxk_CDZEsQ!5T)YxUc65h2SPUanWT_^K$@
zInHDrC8{7);^Dz1cdi?lh~qmdkhQ0sx^k%7+J^1gtShKYgxQ7_SbE18QzuU>9FDHY
z9!Z)EeKp@kFDihFoz#4%z8dnS?=JS_yCId<C&Ir!ow6D(<SwffJFt35%Dw#avEh??
z>0J8qMJhwg6RZb4Srt}Ts5ENUAGgblkK3g~P1!eW_N%Ac`vx(^#fYEntuuK(`}bhZ
zZ8Ux`6IHKICN#KLbpQMcnu_H)2}QrhL!aNnzl<7(IWaM>)7}=^D>0wYIb%p8Q0nlU
z!TU5~edVnfM-85Bzz1aANT=g*Z>9C{YDc{R;h~^9&WNLf^;~0Ckov~4*j8uZ^c5fP
z?Iz1L!}B$&lj8#OnyMA7{vw^$7|Z%}C}8>6S~POr^|y3LojFDFe=(Z1SxRs^?M6~3
z^9PNtV2f()QcbMgZ$3!0M14+y@nC9kRer~q+U={3U8gvB_cyf~i%(9o=HpzB$IM1O
zeUGVKk}7nZQ()9D9rUiRAqJ4Cyqb8$ddSx<I*}be1S@#GyKQ;*)rxk;#e2tL@J)w1
zbc+|4&!?;gDN@c|cAvt*wIJrygwA_1*--UN<Fnh=u6*5S2~BMUUVXi%L*r{-xuN=q
zXI)*Ryz8_&&ie*y-;OQnPWMKz29!Q>KpZTdG%Zv(O*IY;zJv0|2kk`*aVaiKVNJU$
zotNufkKXv<TUuu^(n0muq_!49LME_`<BxT3>E*0N|GrC<ldddSs<%ptV_v6oN=9TE
zACT2&H&i~~E@GRoUayH<Ki?s|dj4Q^bhK(V)YU&=wILyzmHe~to^LDt-kRSyBDQ;)
zDIzwq^^t-|SVhr0(Nhcpg5M!KWs#ZGqf&G6y`%dh2nbsa$WP)cHUb#&ZeH50)j}1~
z8W5=r0N}z-V>E6nMyp5g>GWhmZannqti;y$G}$_HzA;xuUN)Nh9=9J!hBo)M2Wc9O
z1(gP2!9u#UQS>`ez3hMn0LKmGf_S&(WB_}Ac6QagJnp>T&stj{=PuTDzi>ii51Zr#
zt8o3q;Ks?(Z`La7C38~Qz7&rmdNGT!ruT>xMjjDDh_pCQR`0{qq+(*qF*+4tW_SLM
zf3~wEJZisRlv`M6v6B=e&U+1&bx`)k`LY(uzPjD6-sRN7svWWLR`h6rPE_sdW*cjH
zns;VhM?&e_Lr2-$9HJj!E4zmpsNGe(w|+UKM2yInyPjvwnPjCuk)3nD&c;N}kE*>N
zOX`-d9`^Lg|998=fR|Kcpw@U=Iv81-g6x$Ekza?uV<zhM&lwH{htL3c<`*FyVlV72
zhch8?qO-bma#Kd;ta*@vkzb_islw%3cgkHe90<CLUm0d<@2GJw6iQ8@x2JdINo6U6
zk%{DULk6^CkI@!a%es!d>AYvpU-0aR0RF7=B{`dNxk^^6kpF*NfWn<|zWLLG!^$1e
zI&3Q5P|LGp^hQZtg`>sDq$l^AbkEKv(MKT8!FeF@tRkp?AnCLMqfts1DRy#ssO&Y-
zG~#^y{9kq`Y|YJI8WAmPEM&RO*Bf7GC!K!TT7WVtS{?klUVMwf64^qCaUT!V8;)e-
zm`!Z4*C+6W9@98SxKcY^d7H<*ZZwAj5`t|nr&V=(9KYlLxSf&Mx2Kg~S{q2QpZc1(
z4lSu`Ia#p2V(w(#)2Q@xbY!#s!%3G|vekzFJ-2U@2wy})+9c^%|6y&4{nxLtE7v~f
z)ow&RMsvgq!-~m!Mw&WPbBogt!$@H^MtE&9i-Be`>xJ!6lad9Q@SpT${#h^vtlG~J
zTt`$P?0d^bocH#zzKocE(miF7Ze<A(Up#!np=4mYH=%QY;q#J*oPymnH5%1yr45oT
zn<To$Z_!V@JR!<jcmVSG3yDb`F*vKHeM%6up*stLSsV9Z`OwMks-eh%CvvORZ=L5;
z<S(e2)gEo^E=9v_$Rdq8-q?)TKDIAdZxC``x!c9T5n?fqQI>rj``YDO!qc*iC6Nea
ziq9GSCIPG6rIXqHCdh&UQM1fsf&MR_VDk$ui<D?-nwnbjZ5xVTvUREDl25J4cR@m7
zUF>-@$>{#CX#kzkz&~&~;_nOFXYJ3wnFu2=U_$%iI&uTGKk!f3ARZ4KR~fI)FYk5@
zkc;7c&g;-OS`Qn!dH19BM+?u3ch<VjVx~{zIi*n3(T)l<!sk<6Lse7UlU6$HvSeO=
zf&HeVMo&O&btquWqVW~m)X#VB5)%BPA?8aR)rb2SGH~`Z3{qtCRDI6LAq74SRM8pf
zMIs0cTDIG46~aA^uJGbwRF_-oO?{ycr5^TtzRR?`8rH!1mZ7NjEu3VZc6efHzF`{2
zW~b)fpc?Ulg}B+Go0^t;D-5dQsE7s%U{%gXY=C8d=q~<rW+!;VmSre@kxl#LHmrBm
z=iA8l;>(u@*H$N{tp<lm^r+5HPYlpxTha@J`Y(t={di~AS^G?ETu1ric>Mg1E#m_5
zhU+yC!Nq<+F3F*LH~m}ly_XALYtDW|W~PcheBnZlynjYvK|UNboRCm3UQY-GlCzx!
zH%5gNSuL&Uafu5cMYu0A1xC+u^G4X_&96L`5<=a)+KyxPClk|Qw(Diql!M39(G+Fx
zD6&UesBEeKpbl3yTJP5e%2om^BKu1{lFM>&B3{6AvF4Y9ZL^@&+%n#t6As#jo#m@a
z>PiizMH~zqb)=4R)Q#Z>w{+aL2-Xtz@u5Onl<%Rc%0GTGFb}(FrL_qVs|Dj19lIW8
z{GR+WQdIM<^ai^JsjiopisbI}(WSAWa_7tI?%z@t2C30RiWhioO1W+haK`xTkGFji
z#Da}E&sv}`-y(OtD(U!-fynXTf0B$orE{euH6?a}kEFB_>+@r+d+Z@n^k!?te6y!j
z!~4_Oc@^8!{c^!Kg(u(lk|B3bme=v|Z+1}ehx{qO_UNa)SR?EDrw6kuCqa7?F&zwy
z)G4kMq4`|nN5_ezBJ0l_v+};8)S1)bM796{6~~;U6BQ59Sd5Us06F<oF3YpiQGs0t
z6s<=iS!Xe#Fc+46qTl|U*Yk;pUj<=3vnTq1IMGWjIXSmV1y|`sKw#qlXF%w#u1DK)
z(AoE>)<|_A&Hw;})LqTo`AcY6RlD2ZhTJ##b=RBrRd^a|cZ(Bs7s9|h@va^HIrE{`
zdEe5rK}{>yPMy@S^m$}raw~*|jp3#UhrlmTSQT({uz6D(R`lby|6a@Fm+jpIWZZpg
zdKz~3Xp(j@{nm&I&Kvz`7o-uB{ZVUUvi7)ES>L<f+FCBZ&}cnwfC?~zHD-I&7bkAJ
zCtf5SPk}wDeKK|Lj<yCJ4TpNi%m??)9p&wgc1u=m`Jll{51f5@8sx{xjKxGQwM82V
zVLdjEnX&p)pG05!t;J){`OOKj9}Sl=Zi4-n;YcgX2gn~JFt%7yw@f`cK^lZg%WZ~-
zmILHX-e$>6Os+D>{93Ff<2^Hy46Co|zS1G?AM+fTFWda4u&ce<JF85Vj%3>YW9ezz
z@FYCeTKOV5Y=FLgS-tCERkSS<79?A6C!t}|>WlNXk?8S?Z5?!%1JEWJQXj8p&=T2K
zan4B{ujpUMLAOdQT<!*b^QyK7Iqq7*OB&e|HdsVV@=Y)A@;KUFU@xJ$;o@t5aP#x#
zCQd*aE{a3i?g7L=VAtq{6g^KWsyhno2$ns{#!jF3L$E_5@;*h{J%QJ)7GGP*!U3{F
zPvm&=L@8{0D-OaLQej3*QLUp+(;+5bhgmIWdM;9Ss^>VoA_!a1i~u2`0o&Rhh5%d+
zKyu^~`8LN|<WMZCA3ts%?a@5>0mc56v9Ko7qbXASOuKk-=Is2E_Xbk9HZ$LKLa9d)
z4er%nqGGt*4y;;2sTy;YGM+qr`lGcqFUx`DuX4=7LVrn2bycEkRqSK7A7sW^GK9$z
zpvDDyB?c&fpwg88cz^ZL`l=j?UZ52z>sB<5D#yQsge~iO_tdA^SvUyVHZ%MLfL|bm
zyTY*AcMbez48Om<g#Ba@`SGFGLT?UUSJ&sg^}>r91NYBcUYb=TR6=LX^_cV!$xARj
z0|4vIn>((1D|!QkD9N)h1F5j7Ol1PniO9IhEBfD<pik&O>&*bCW4>b-D%#<s&))*e
zR1kvhC(JntnKpAxO7h79Pao=VjOiOd|FixBpaZb5&@(Ze_oz@NUes*5)d#<93WPz4
z2nJTxFds&h<2FBkEKnRmDFuH_(&a&EKF$jR_s`Otq|+;6NEE!i9}|$1$*D=e58d9r
zQspzR4aBu##w;>!amFTfaKAFnj!ca2ijR~Mbf3B@I23<yh!Gw)7^xEw01ifBO-&Lm
zdn;fVodZe-e<j$363xw~Io58+zl!;CMfcT|PWRrMH*bEnwN3Tqso+!)F)gq6_Q+4q
z&B;qV<9SFsdBxY8fSB-wCk>^fm6`y=%OFR?rN$G|tOYNN>nx}~Gyh5{F7}b0$LVxZ
zhuw9ot!vkCGBhhJ?81WR_{u5%LShd19UPA@76zI6mknVLgiHUn=sI^o_tRK<2`?zi
zfG{seDbqoFJCMz|xJ!TjY@_GC?*%~3oq{{puH(`&(+9u(j_-DIat{muN%8%Q8dBeW
z#CJPA*}Qik^JTdSpiWc?{tid_T`|(gVoU?QOD*aD0d}}$ThiLu^~0!wfRIpJO-%rb
zm=cdA@xcPn$w>el8YHBorq|XAcP6ziit-Z1<)QW+h8+CXL`7S7-t?iKFcNCLARK|B
zYQVMtJzm$ZV*yu|fs->8yqrMdGq14l$DjGI1|*GcJ=%`w)g4jMg&KD#t3F;=@!a0q
zY)1U?8y|TatKoqc^|JK20mnT(4)(OZS4~>_>6uMW@>>0~`n;=}y#F#80;bac3&g_8
z%d-Y7@&QzdXlWauI7E1ZTpXM^X=!P_eSHZ*iNngu%J_csi;Hm`B2oPAK8m;(TI|gb
ztRL0GaIIVa(+gGr42W;sP}b54?lx&M;Zc6}OhT!czyR0<DEJ+i1`@z{c$y`ifkLpm
z7wk;Rg!;(Y-vHVla^tH;Q2z)<h-6T#hF4;>utqX99HBLRZ@{q4%HFi*6L-mo`Lh?#
z6!q8<dKD^0EKqL%IsxRofiOKg^jkEH(rRjg155e;fzfPGx&Q5{tMfwA&=8$G<c3!&
zunF)k2n8M<S5L67VjEimvjC-$4%Oxd58n20di~pww42HM@1`DN>tTA%uOCbo*-48t
zr)Oqf32L@!=rrR~0RcuJxEKYYmkz!EtsyTh?XCz$x(FA(+&G!eK{LKj{WfSom#F+!
zmG*m4Q7{ka8R7*4m;X#n1;%Pz?wbUTLZZ~^t}@3Nhtn{R)dz)Xs5ewryIN(1ErHxX
zU;l4qi(;)EXMTRt;O1tuzW%<K>_xgriwYHWJ@k)YxU6Z<i}u2l3|9(gu7?l}nz9vL
z^OQ{ChTo=ESG^JwDc*b~50UiJSoP7#L5ygIL2EfwOFq8{lFu=%JUlqyaa*68>koE(
zdh23W)OgA=`#Qx4omH*r_8b=}lhEvI3Gp(rg5QCiMj4rzqBG#iIB6w-#>~zR)t%7c
zVGTgIzYl#ho?TrYXFQbUYRzknijCE^IR<}J!1rK*!6MfODL!CuX*qlhPJI-uQ-shj
zh9P(_nQ`fRZ!ZxZ9v)Oua0&|x(H3@HAb^Bt26=urH#d*NAUY40izrUDEc!Eu&v+cb
zOlu-SeF-~3>!!_Xso}CVk^Sd0kqT;cZi1lKZLuYaQq;MMOX*)!6ntakVR96$J*u+F
zVREx^uw4hLLJin+WGQLyuV=Lrrnl#&2V!$AJPdm=76yZ|FhoQZd9hyy*&vd0oD;NH
zz~|ndDTU<I$2EP@K1^DTzI&mdAyW`GdbG{*A$|Iyif?Ca-Bg_L+wD6>&Cei!yhnx#
z?bOBX-be|E-wya(N3*E6d~k8f{r9#z*a$?<K!E734_U{pNLkc#sJtoo&UoL9>cX%^
zoX4uc=NR~FlnmhyKnpF$nH+2Doq~UiU7$)6!NAfnu=s#MqNu4kvUE)N`O)9iNXzjj
zh|_Z8s_<X~K`6cq8*C)cpRs5s;3tcV9$q0DT{^aQaA;|6_E{?3{`9{JDlG>~iqi{V
zjD9jCO7y1-b#%hOz|E2&N`J)q@$G~EMqcSsQ&T^C-b$k>bm#Av@UBcJR#s~y7yWY?
z3fU1)K$XQ%LYlS^s*l~z{>BQJ-LDL8Hp)Ac_&*lu>;=t2fU5d#4<Imsm-S3ZlI-lD
zqV<gai@n*u|IG%LB++@4Q~1bj5zftsq&qAU+{B7+@kA@9h8d3|zxNkkz++9%mD2QY
z6Ag7*#FRvNZYfOp8{7*rv?8SC$O!+zCrm{M*R;F1=4MccA)D|}D`CtAOKOi7^+`y*
zl6+N9*0t_6wJ#qZ4HzBUT3a_vhL5j@UQjq_H9B^+kT1%&Xlb^1b%~_u!?pzkXP9B|
zR(+|2Eh@hbojtn~-O<?p?&4V_f~sRo!S~2xM(R!;{Rau7yI$HW%HMcsiH%X(<~;F#
z=a6_=f||a1hd$^aIZagsB;G^_^q1;L#t>`AP`M`J2>eGlC?s?-swVazHOz*Lcz6}$
z7sYSDGuN~g#NB1lPQf>S8bDqCO(>qbIOAfj`SVQ&Fm1;nltMv~tu!)Og0L0a2m~0P
z#xhAHhO69uZ2M0~?6&W{;PVX{kcM%Zitn<!$`y`xsF;n8pPX>nFNu&P;etCyOHA_A
zq;WAKYy)$BTa?!O%UkpngVdhcYu!^?Rt=%GoqMX9nn96~Dv7HKWo-W*msHCdY)A$>
zj2udc#7^RV5EDwzaGv<w4vgYZ^1qQL8A4*3xLO2c4baEr8%Z@$|M#)i>~e&`U_M8%
z6CitB2mD9a6}G|@gSY5p199a-zR58~I|@+3u-yH3p9(E2a12y$z9VlP_$tCV93$Y?
z`-x3qT&o9*ggz$a<!gGj0+hfutQb0zX#Y1nxU}I9JP_+o7@~^~$&HiZzh5DgHd_cG
zN~cr2{Y4s26LI0}g-<1aI{;Ses}IelH7#Ua;j&zGHye~=^qX?+0>rg?4&QwaF1bNN
z_VwGhZ<DT7zMl<j^CQ)FU@yV!zV=M9;mwQE_atrzM{Gl8fNWLb18F?q3w#q`eF17~
zy-9PoFu+XhR~lWUY#Z~mbjpliO7+Jv-SZ<=+3cg%S%oBlhRtb2ynwZS<M#GEl8K9}
zL@BYPgbVo6e$e&^b#78pQqaSIqZfEuP$U4h$7k2?=~@4(-2U=8@2}TQ3xjz$*rAzL
z`Yy`Ozp!BNzm?Tar2R{4t|Zv7a#|jpq))MTBk3v*<iCzK^XRMKbpG?_&&mb9<fJ5&
zCk7}Mn3vULXZwOcTJW~mT&gS82)K8=$~_OA%!EmT+B)SCSe%Sp9}L;(g4jSmGQ<qD
zvw%Ov?;MHEaYn1=-@l>h5kw>(rPR;-=~AEKqw6fB=8nkw`+pV}oxA6uQptg7sz}q(
z_huKp-So}U{>W!d{%fXG{uhhH?v2Y%hyD%SErzNY8_xZ$%VJhI1Mo2vwt0>RrKoIr
zKA7B>rU&9frPbuuS6};jlGjMh`Az#j`F^zLfYW2GYCc6~4LLD!9)V<l8ep1!x6Z`^
zkcdrtgaCJvYpIG71fFw9Vx=Z}MgnPiybUxc-28r~>uey-)7xGX%uR}0l=|d$zKk1N
z7?{-X@$J2zg{-wBNpL&jnCm7sDK-zN0LemTu(`2eVl*o*{ck!mR86+P#-UmBm@(e1
zf%IS!VIbm5;~}e0D5EAWwD>gkj!=LEA@~SsS(~e6i#KCRYL$<TR@rh2G~WYZptUj1
zaaN2!%ge3}yk>CXHz5$ZkN^Mbvx1WnVn>@yXH6b^wh6s3NFzh?x<@@B7AFb1rM|p9
z$BZ5yVx97oEI|+PGMUp5U&WXM1z+Ol$zqU@x1H~*HKVB2nPC0`z7)L~Qh0zm7nazh
z5nrq={CSX`T$F{}mpL<h-w6+lmLixyh%&J<K-I~|eI+ACBdeW+>ItQ_tPz(*9|n`K
z!%^>fi8+uR7Y2%S8x8y#8-mHWIYuP2lzEq;ZEbAQLENMM<Nx0vb~2E4z=oZ3>o$hK
z_j{rDyvSgeSBZNsb|!0h2Tm#}f!kiO{;Vz^NUhU7q9mD;79=ZJ%j1O|Imkn<z6GTy
zaN}`l<`cscL5)7hUqO(dYC=0q_wNNd@t-n7vI{m&SINLFF)|+50o?DdT_I?K{V=Y1
z#jvPnHqe1NklE<&Ws*BC-37EY+Fg)w0B6O?#f1y#(2T1HBoYrO6;HFit?XK)yI-(;
zFgLNl@6ODqG%D*=L@Tbt-I!uC1BwCL`wdsPy~t`Bg_9<OQJ0=_PLc8n{19x`a|D7y
zTCS^KA?kyYZ+|AAsHiAZ3wuh9kyw(!#8iGNV~33h6k}4{|AvwbI}Av6sV<nEo*i&U
ze1HfO6gL067E9Tq&76~;f4y`l7-+Zp#fmyQp%8kNl@S9Q<o6r%vQPQn$P2!{FX6(%
z^}FnsaW$y<zX$gAyd)$fXh2gg7G6Ok?%??DT+Pi<P2tC4>O*oY=oQQpT~VQsfdEyZ
zQRn&OPe(S-8@YgO3j|mIPl0vw;55lXM<)dbSzTQP2Fjqh{9|m43f$&l!u&Gf0r5=u
z2g)uPHl<{FKb<0}oL=5)oo-Mx`U}^Hml0s#?v=#S9K2gKGiDOb`}qDH_N%*IWIrEV
zy@yHTR#<b-`Y{wMZ-z*Mv-&-9RMA?GhkV(Rkti$6sAKL(^Yv?%8$o0cMmOuXSd;<>
zvwO+T$t7=7xd31ml;+lpbuZxjP^av+YiVhBFD*X`fdT*rN1;<P)dq@{1FSN%K60wA
zt~*u`V{cpJ_7180XxJWppPpO{NYp%a0EQKFX&h&D9i-6t`T4#Gz-R}}cj=O1qSb-)
zn^j&Ov&Gduv|EsupP$(>`TY$<+V$TOwqT&ELjtd}J|}qr(8UegYYvIYfq^z`M%;!s
zxB&qH7R$%p<zI_Smy^ad!*p^QHP=HL{sc9=G_eE5ENCm?Sz4|KQG20XM1SJUK+T7t
zGB-0|)f{Tq5y#YHegyndIH~J)qID`u|D{jF#Nn~AQowFG1OwukeotLR#kZ}me!SvQ
zR#$%q-sQjm0d?|jVCL-aJ)YM-uYHjt^|?E}d$HT34ALncq5F_Ig}m^4%24F2q7E}7
zMw6MdRMDbX(PQrzuuPjEA1)adXe*c_q?=PFVqm0$q80-KV{SnsV&E;jKvB`VU%&9*
zdwE^EhRY}*5C<w;C{7M0=B-<|9xOgGH@(;aX@?{4<U?5PP!dUHTo2sVkEC6s69wab
zRKhZ9KV*&czyEsw`<x33BCm{$B2XM1BSw_$k~H!bq}?F6W>aFDo1fo=6hjj`M?<l5
z?j1~%-V83%1wMSk!O`J>AGf70ysDBQbQGvfUH>#|c#dV2tse~RoY{G0{X6N*Vt6Xn
zv_3$VAt6@ORE0JdG|;P(kd(wHAp@oPE2!KX^yUc&-i0aTETzT#<%nT+kDrRfwRV;2
z!Wn}}yK{e?HHsB)7Z;2HGsE8tuZgrqf@CYTQ`weMA2)f(Uqvb=1)Hg+YoVzE4U4_6
zfpVnuOzo}bgIiDtx#HtXbdyq2(c~tr-iIq!{Ql73dlxn6imQ<t-HTP$ic`?@;DB<|
z%)DV_YO?f03qBNtF=sTrHiyCkl<sx!EQ}|wK?>2*LP$y~1&=GWEExUoLAwR4tdgcz
z?jJ`#y#w4Q9A5f}C-t^<9DKR0Qf^JBqY7k(xk^9|3{q>Nocq(kiT4PmWs;z+FN%&Z
z^OFD=5iJ3cOoH}X^!?XaKLEX^r3pH6A2~f^(^Klc;^$3tlW^E7IR;-f0~mYIZ00<q
zK4WAY?mWj6Z!G^I+9M&DJ0~|c_uzbQO@wXfjpv_(#ALFUM&1vt!sUjpH1SF|ldzRy
zYgy)fPEZ}`7-5g?XxlT}R^|WfS}>w-m=Kk%{>E_jzxS2z7BGMOtXp5cdvf-mDuUT$
zF3v+oWV>VQ{=9H1p0N|PC{ob2?%-(e`@}>l=sW`-Y;mlbAIvO4k;T?;f|><ob%jY=
zcq6AC&+&-q-Ie^@+u;x1U$bDJ(ho31XEjOB`&vZEkm6Jl5gn}mEN7y$vN8_D0l@^i
zDeaM;pwq%FDdo_YMPHb1F%wU`)j8O~{@z}}q*Lcnx%}<?w~;{8^URvED~}|Fe2HAR
zdUjq>iUo@D#;>ql*3lV<?l^)Q{fXmgX*-L(D4%#+KQ{EgCK*k?*%Hkl5fVF=7TPuN
zqsq%HAJKXD{%mKSYMeIs3m;->c^SaD+hBcn-+B{{c<Zeh>G$s+ZDL(-9uUJk|A>F`
zpBFS!R8uZqvzG4r-5*}4@HjO=e7KvqCyXI7!3|#}GT@z8p@Ef?07?`WvS~>0b-I3K
z{>9e3EBh-aB`=}Ri&)q%8An(XPJ5Ce>)54FcD9j}B35V$oHXJ`xVJKq55$jgZ{4NG
zHZ@IbzgdePs}Mu$)hO*MEgJr$?VW@&F4gzWu@HZMz2JaAdZ4#~KgD@G?UM$S$u*`m
zdtNp<$sO6a;rkY*CC%yG@2?hIO`u5Z{=6|G*+_pCms)=P%*#qSkJGkETuU&xMRG?9
zH}Ymhq_?*4lfhF8q2$oqT;}xj+W~=r-}*=iV&DJO@1D|#c<>*X9bY5b8|;-JYB8e2
zeT>`JJdhzW^B`{ZmT%RB#IyCAeF+6`g6wEH@)$EdJUS-wKVLN_bXdK0_>wS#PKw*U
zjkqO@#*>BPI>*27@l_%$<uRLhY|*3hPU|VL!JzEE_-=lXKA*dG<;p&vqrdoxVe}2s
z&FOuLLu*?$Y1iqSf^X<cjk@TCgvbkmswsVR$`}56vs6mP$ucVQXDbt`x8*bxES8J;
zKX2#T`duzT?PQimY)Y#4w#e5!v0l_N(L+a`s=SKOE=tDO=9D}B_*6I}C@4m{cWqKP
z)#By$8u3+Zn)ZmClr$-13Y+Kd^R~7&j)NrSi}O?KGDQ7S4_@MjL2Gmxf72J|eFAEo
zGVF7mv^m_>2&d)QoWqUefleyP>KE?i@6IM4byBtPuG@G@@^o>?COF`wnvb{k%oZF>
z=1gpCZ5ee>H9vdt!r@5df7fpYAkm+k+ZR13<xkpUWbvGz0Ha(rhO1A{XqvWiUMof?
z)ek`*so)<&vn3YjoWpuu$e(YQ>D20$R9;vfMZ05!LD8sbt}{{ix9ar^H<yAwm?4V;
zo@k;E-4CXY$AWKi<6>c9l{S|OI^aZRTqRgrZ~G}a&gQb9)7Jj<Ql+Uly~2H=9J%B4
z_aavha)(aa_qO*^h3_Yf36~ddeVr%c7r63vt3){^>D*D$*ZCe>lb0)FsGjagA>TaS
zes2j})iy_pXl?!Jj(^>X!eC>IeE}H-wS<Hfe@YxbmWoO{dQ0za-spYWK-z~E5@8GN
zNHMdezV+=6h7X1e&1|O#$`)S?)MbSYB#G)xG0<>!?RU0qreaq$HIDhnLX2zqzDspx
z@1}CIYzeKU67(jtmv`!JBL%r{QZ7h7J5M=rZEpYU9!evpx3**A>*ru>!s)n{g5R8$
z>22HMmR6NwX(rruTsHN??M%@4DnY}TKW6{t_hh10S+Vi8V_yDDwcZ&tG(3N4iHFbl
zOJ_a|$<|J~+-YkUqFmn-rJMV+*y|Om>hU8Yc6=(u)p)CeyIp97?%$k#&dk8zlW1Az
z<Abbi@Cp+P2?_bEKHb{Mw=r`v)NzU+I!Q=sPGGNQX6Kj+nZI%Q?&hBB;5U|-gr%i^
zQBD5lp5NM1PEEPnd%9Ie6e2ZlamNcpX5-1&-+K;ASvc9}3RYc*Qlh##BQ1>K<+e%`
z%2OuVh6BUKwc&1@vwjB|mCGXPC%<GP_SWWt)*ZI?5XELgUqY!y>N2XT;txwL9xcyx
z;koX*ReG>e41CTW>N}ey=$cKnH42Z6Zk5utG}fH5ZW$Mfuj<VZbh%V226`fHC*zu<
z))S9JN)Cqlwa&hts56dx@QX1fzucq4a-RP>FW|w0{??efn#TAuD}|?UQ@=OQ`^F<~
z&wlgI%?t4yJOiOE<)zMI_tr(<6cng$pHkNieel-k^+BxHNAB%C(b}Afq#PwhwEdp=
zsBHRgn0f5_aNKq}72HaWY;`;iqqobW|7}Kh>?T&~xtAvq0X2&+Z2kT#>-Yl8KZ%Fj
z%zV{qd9GoE#<N+aed5xemQ5m%i`8Gw9_$yLusjIdjLgw{{d!36oSRHObF+PqUF598
zMoVi9EJ6&nc3c-HNq@H3r+$4+!OP(rE_zwf(b{NdaC63p!s*qftx1yhg7Ah*jhjov
zheD>=Kcd)7J#nWS|4}AC1C3EG<1>9(QpGP+VhQ3?DHCxOR%8}qB40{X@2-v?ciZpl
z_a1Qyxr2%$){!3`!(6%Wh#4`r%Zih4u)lcPGcM;A*-xK7OAqAyx6$gG>g>_%sc8D`
zqn*{QIZH=Hh)d*SCO>WKniNun$Qf^SJ?SOdA5jpg{KEohJDf<<KIg7Lz;a0DEd>YL
z^^LIsQ}x{;Nq933lbRy>wQp-Rhm#sQPMeSAlLV~09QtGLF`_aYOlz{6*jJU6mDM&|
zuiE<c<g2cGbj0o6g7rI1LoDvp#GKyJ{HuE60on@5Q;Wd(HeXILT9+m4Et?X7sIu7k
z@e{|Kqf{0;ZM^RXdV0oGSeO>otxp{}Q~MFuvo7EHdNo?3ckb)aH;t{5Qs{NtGQU4J
z)?43MRc?NkfS4QYK5{$ESMVn%?L9hqB`Jg^>T${Z$ocTdnv47NlNu5swy|R9E^6Fl
z@cMNC_&x%E1#Km0r1jXc9twIaZ~&KeX+Vo!ihWAgj7xTCOE$MN1y_%T&i117cuj=|
zMSH(oam_(L#=<w(OQd|`stId4qN7&r68)dl8-Ms<jhNGMqnyvZ@m1rY|D8uW3FL(D
zIWn7zeA{_kz9RU;-0?Jdl<o4qEO{fwxy$F>gQnMxrJNq5LrmPzAntO6LoV)UIU&C<
z*16Re+z}?t^yCSrx$W_3a8j1xh^HSr+sOHTWm?)<U&c8*^7z!|M?)i>dNpt1E}xUr
ztLpiq(_p32R=cisKi>E*of6EK#+IJ_rZF+Ay7R1J{D~NANl)<3Z|QpuBSIfB9a^3C
zJB*0W+nm;R1;ZS$So-6>*SxMjgTueQ$BI<c{$0{L<rBOg{bb~Ka{APiE%pD7?mI+K
zE^&T+jqEj|gX(F4?~%}!ZK<{WvSf$3<5pW+SbT*EnW?Bt(O0>mUv)dzSKId~`il)4
zRV5UXtskB$Y%dORMP?}6503t7pE$CPRn}$GYmae@b=y;BU?-2od{{t0Xp;2isEe(Y
z-I2Byd+D=9gtDftsf7h2w|1B#o){QG6_=Hyp9QNIb?}@%Zg$O%@<K&VcaJ~#FjG;Y
z3B=v>?Al9i-IayOE#=&JZqzUDIlrcLcGxFVv$N;N9EHo~deWdWU%xZ$Ud6-DU%H*M
zUL`7Wl4M@Eg8etrY(iIICKlNnGyvh9#Nh;TTffU?X1BP^NAK=2t)vwfzl)d>kHA}L
zY_C`)tPJRdjq$ur#^~r?dW+nGou`kuwB+!;r$Ir#oL#s@Y}ktKSH}gH8Ss#WG_4Oe
z9Qcn@3P#x}ZSJq}<CB`JzNp>&ui57?spE<9?`5Qc;n<<&&BG&fLh5^gK#5HFaiaCc
z^vwYT0W2NJ>3$aOFJ)!GRS&~4RaH>}NSW5lQMG2rk3ZOY--PA+-r5m*M)3zKP5$lG
zBjhD!7LJ+)t=KaI++GXn@yS8EDE=~HdoSP6nNHG}@DC2bkz|V^)f==HWaPs}4#>8)
z>zcx@Iv(?M9z%6L_61@et1B#XT8=xAKYiTxH;_B26*>(OjL_|5)y4O}2*U?-ERz0w
zM4OYZ_Bk0fv-NANyjF3~z5lX^peG+et(|OO4K6&Av94!@Ty>&;wz9fXSDYqey5b$-
zG0&~wc(XC$_9%+Nobqg6!=m~iPeo?OW(h9(pUJT?B5m5X)M>DXkdoAggs@wBmZZQL
zYe7Anc)aef*G5%pWv8rXX1229oT9sFnWU{1fA<X<KkoIH^GHo+&(#}lr~h42J2|14
zN$PmjfhIPGJb{j~`~E!*?-(;S)2Do6;@gks*k2C4#~|w-i44(oZ!ujjG+M}|aB}OS
zS{W{0#hV?DFJ5J~d^<nx7FK967U$7!Wl{YaQ=N>-X|)#lrA){*FQ-WN7FJAc+g1+g
zM+LdHKBx0DZhd(<Njl5g6Jm<`6YnAegW@+#h+ejYkr5`9zev!@Y`iREjL0E<!HdsR
zlRikB<vudi6T)H`KMSgUzjKe;5S=vlPO2`N{?SocPfL=b!lS64*4=ZsQd*ZnDaVmA
z3LOZg*T`Ycfseh5T?1O4hUd*FmYleMkkRYctyoAgWCaEPR_FY=-f(4_*`X1;q`|zg
zH%F|muZv9yw#Yrp8;>L<wMm*a3=A&&DQG8Yj5QB+bYt2I+b{<(Y#VL;3BI{jdyMOG
zYA7YuOnyt|Hi`>GTj=u07n}AT?K|Tbj>&>BRqOU}{Bh6Y=WS2BYPrW|_qy{*nt~Vn
z#23H!78UY13dA;rY4UN|wy71;@FjQ*;P5#L{J@6JQ?rQ^oP9a6_8QmhyB{4nca97?
zTn{GYkq+$<PyW7zDL6>EI!$+ym>unD{-BfOI?6VY3?}o-h-@28yS5o?%oYD6aH4r{
zy>1S%&Idi;Ep*#+)}X;}U~KG|meVWqFMA2O!_15l;&-cZV0U#`rxnq^lF=f`{Yrv<
zxNvO_SHZtN7)}$|_on7)>SlA;DU|Y_$tDZ=utYNT7ELsp+t~&ZUu^0B1qKE}&&zDV
z?(*SotZuini}l!_NiBXm`pX!2jnY}D>_Y2aLa-$43v?dyNcxrWhIdW1pr1tOzU+je
zrm3k7X1TEb%Vi}rad2>&nwyKwj~zhg1Eezou3SMU8r~QBm$TKl!U?FSx2EV*$=3EX
zP_Rbq-OS~HOv)#(CdThqR@pPy*wHH~eSkiZ>z`j78`pgO_ncEF0CJ&J_BS^-R|10Q
zL_Ij+PTso|Pl~>rUGdvRa57)PQ?O*2YSPtlR%bzgdb*tG1IPn$*A?i+IQ;;8wQ+Y6
zn4I(iJ)H0D?aMaa|3XpkN-F?x;F$?XX%xi8Z@2p4sp#s4>AvJV@e*Go7z|2z2gCuN
zbZduuj+Np`S!s2lJnna1OQ}FG=Tnx^N~s{1mYE57lFrWRNbJVL0Rmt}fJq4-AKx6N
z%0+U4Y5f{{4kMD1WcBrL`$eh<xE<WZz@z-$(tkt2l14<t{g?C6pUG7jILF|ouZ*8=
z=5Ucyw6?c0j##~CdvsOM7h8TIEZl)D8j^R7fkJRNAR;IH@%GZ?3w4GaeFxi<(to)v
z?U@KPK|{a-y@ZG`n)x^#g{AI{Oe!&XBgv}}Y*<dDK<vAizx`c%KA_r<NhmDFb!bH*
zN#W6>`zTOnE{UE~I0z2(!zvUn<%9XpTf*&cgZfDTBse)ey|%I6I59yZRv+V<rTlu0
zSm^deNbh|Y4|>D_4g=q5xH<OK%TNMp?dX`9k-iMt2H;K5+nFIOgr|`7RlEC}edACw
ziK-(NN1=ANgFWJF0focfb=w>|4q6ozqUOiw(5a^KEL_1_?~;$RU{nmTa$KwofKF9I
zOe{Z<8PJ%Rl9B>ll#{EgAz>B#<2e={9v<LrkRY5aCjP%MH{^<!MKu9}Yz9!Fpg9=z
zLvpW8YGkt9Lp|EZKIj5Mc~-XTlBA?S*5D>LW?$myg7Ed1owejxGrC-C45CXzm69^K
zBYB(`_1$|S^xI@)m|5Ag%PMnsot@RM&1Nw?i;6}?p3ueC{Md(?_^BPWkd}7!)MOfp
zzq9bo-n4395pvic?d@2uuCBH@`^FI$@wxcPS6)6oWktmY(2)eqizuB6EiG9PtvE#Y
zG1p;bVM)uZ^q-qEg2*}dH#z0=JE#yEqKJh|@x=viuZ-(b(d10g<Wf>h(6(j$EDxgS
zm&V4hnUGUxYDVFPGDkgyUv!?DR?a|HW@2Xc5e}n-{HNp;6uJ4IJ_6wZf}H$2cL1*h
z^2K}jO@6_hyh1Z)9d#uX4?LP=7U<u~s;WU6pC2ygH#a{H3hGDy9CSnVGnU5Z8>*_R
zWg6`84`4SyIS&^XckYZt>)JmQ2Y(=CYs&^2YV&e)O=`tXE6d7u`lhe9wY3AyC%dL5
z3CI?JVFQYiQ&;zHDgREsY5r?7lkY$Uiq`P@8p4a)7Q^7Q_mrW$oZTlWBjdUZs|@)4
zTH7i2Vh;`uzAQ4SXD$ZILY=hC4A0-}Y-}cPxRkY@|6bc<Gyt8O-)KC2zm;`$G1Q<7
z_94tE9)5@`a38?A08|dBWc*Up#d|B+i>@gw9Q71EG*o_YcsTt<ff6&ZfB<uMF0X*F
z<HIcFH03<Sg5T!Uraa_Ox&$VNsp&En6(jAxDUa`|1xWwy?rtCGRPd04O2ie^u)?c-
zoON+P<+Q5`5aDHi`m~ZX&lfKnm3k*%9%8V0?dxEfII?25@aNAj4UsoI<RJR+rKChW
z>&;MB@Ax>ikNCT<UwNT|W<HEn`oH-C2bH3WjI9(HNBs@Q)7}3CE10xRBunR)R!A3`
U>ymuR(cq8tV|j@}@t5!a5BPttm;e9(

literal 0
HcmV?d00001

diff --git a/Documentation/devel/mutable.dot b/Documentation/devel/mutable.dot
new file mode 100644
index 0000000000..929fc48df3
--- /dev/null
+++ b/Documentation/devel/mutable.dot
@@ -0,0 +1,28 @@
+digraph systemd {
+    node [fontname = "Arial", fillcolor="#CFE2F3", style="filled"];
+
+    {
+        notes [
+            shape="note",
+            label=<
+black = Requires<BR ALIGN="LEFT"/>
+red = Conflicts<BR ALIGN="LEFT"/>
+green = After<BR ALIGN="LEFT"/>
+>
+        ]
+    }
+
+    "notes" [fillcolor="#FFE599"];
+
+    "default.target"->"systemd-journald.service" [color="green"];
+	"default.target"->"systemd-journald.service" [color="black"];
+	"default.target"->"halt.target" [color="red"];
+
+    "systemd-journald.service"->"systemd-journald.socket" [color="green"];
+	"systemd-journald.service"->"systemd-journald.socket" [color="black"];
+	"systemd-journald.service"->"systemd-journald.socket" [color="grey66"];
+
+    "halt.target"->"default.target" [color="green"];
+	"halt.target"->"shutdown.service" [color="green"];
+	"halt.target"->"shutdown.service" [color="black"];
+}
diff --git a/Documentation/devel/mutable.png b/Documentation/devel/mutable.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b3f189658b24aa13c1242d72ce49572ef12eadb
GIT binary patch
literal 32313
zcmXtf19)Ct6K&cwXx!LIW82A_G`5<?wrw}I?Z&ok+qP}%p6|c+CeM?c6YR6kp4l^N
z)~p>OCnE|EgAD@)1_m!KCiEK&>`M!9y#Ngfd@XDcMFPG->Pd<Ufqnk>`LDe&4h)PC
zOk9Znk4yU5y0Z$ZGDg=nLHlE*L*G{=RM-cZGmzdT>A+HKa!v>tqkLyy5o2}#2K9o;
z86MhM4w3IahrGv@O@dMi-wQnz{<ccQs48aXgRz>k<!0tbe9{mhB7UTA{76)Vg!?y<
zzy7;K6(`{WewO`Pfp&ZZgHD5xiRrg|H8fgyXei8jtFx$L{U3T1ek6Yw;bNA>BaITS
z9Ru^fJ{^%n`p8tl#N?H;Esi)3PiH8@GD!Z9igLvp?If{Zy)x$gR#;0Ys0g#aR+l*k
z6;AWJARbL7maobyC{SNU1J9L^*2qQCk`({0^lnY~oe>f9=$)~-xp^NimJnK?I7EoN
zEhaIL3u++(<9{P3iaGd7t*8+#fA_um_$`*BP@mRSA-MQ)%VpTy`I+N72|=NVrMxHE
z`C@?W_#BV{RY_&hX`S=OFkK)D>labX6$z71bXB3yU_sU1V26<ZdbaW8#s5azKx&*B
zE|$e`1}5Ejb(j|q*Kl#4``MI$tHKvkaemr1>k?_1CXkWJ2D2_oPw(s&sSy}E6E;Zl
z>mh@|>0)iT%Lg2-#T!_n8baiZbccFYn<`e<;~yv|&C7NVzmZlSUpsGw7CVHc11|NK
z+k9x!lzCEIWi@1#loER$>7jk)&`}eQa`a-4kJ^K8mGSiqb-U`S@sc^(979ewnhA#M
zIJvJ{e~4&#@j9BVRM|N3VJ|v=BjjQWkTtg2KT2t(p!6{oG)DitVw_K>3AL0Yiea!A
z;j&tD?MVS;=^OkjFB1IrOI0<bt<AS53ng|Y<>eg#0l!n)%j-+Mnab_xV!O%oQoc<_
zD`F1jZNG@s2K?a2+F$L?)6pT*Q`MW@!Mo#~$i&$~;R)p18yLCTEV(_#e5&20W;<NZ
z)}~xN?o7u{MB|Mt(W+{uolV*}!+~noNkcDHH~+0E4u`t=<E4>=eEW7rHdK9*&(gIu
z4P+D)aY;#HPR^9GGmDv-88P67n>%f9&j9S^_Eub6Jf<0hhK6=`e;?*iSzaCy7zimM
zB4T1<@(;MFu4W7j41@u(@w*UE(oEB8xQ3(MLe+Xct2A6b8uuut70b`ZI*ps7syol!
z-8XTlBAvaWoS2n(aC_5(L_dU^K0W^YiO0HG#s<DMyIP>DrJhKA>XN??mhZhxr%<%7
zRYHy>w?b)uB27Gd$m_*&dtKn;LDINct~Kk9$|)vz9y3vr`oVM4+fMT()AJqwd3vfE
zK8+S5`Iep<5tGe!>ZFmE`>6MI^8K$Snm!5g_y3-Xr;PKl%o1{T#xvkupRzY6#lo^-
zm7W^dLe*K$F#wp`L}gLS2p2iTKRa%*M*mr*#i>Y8!-I;rpyKeBz^U43yQ(oXyGBw<
ziiC+Nc4$Z}CnqOwQ&ji|8k(@ingTL1vY3Pf5#vvvy1GAg^^Q}si=u*pC?Ig~xp~&9
znFSGbQA9^ac!#??7uOO<G(|KAhdUQuZ@+KfO)E+G#rb(nO^XeTjiTe?1SRZ<I5{~D
z3=N_a69ptBU?85KF|o0A4J`a)Vi*B4B&Vdv_pgLfDVFFM8V1zYJ8plfsi|Gwn4<dI
zWmgF;HcEnXHP}JuyhSIzb=+|922~~{AJGxKv<yuWL$T-&pTzkG4#p)ZcU{{*Ho5Jo
z<DN@>S!#3m6Y{F@_V~TwNn`tMgT9(&k=`~#NxJlh^K0Ycz<UcxqgNsQsq+iEYgtPz
zgt<3?NR*7@7ic%s(eB+w7nke8p7$u6wOBNq$r|7fYYQB@KaDW?qx6;mCxvuV`v+B9
z=-hvJb-y@35>`{gM4Q&cFw&Z$Ve4R}9_IV?yGY=QNl~euzF{9<8d-M9&Gv?WT2|I%
zu4oiA92^M=iGMV3g@EuAxT>0xv$L~jU~cT{nZZV3hLxf%V_>ZP=Y*mR2NyBL&Jz1!
ztrOgl{o~{Wd*2Qh>-ad2gfu!mUd+yps90Q_q;K$=g)VSwbWuE*TfoAB#I~A|CnBtW
zZ0#!)6jXXfhOLub-}Lkka&mGFO-)92cKRfJAg~lv2_349mkdqHJQVPRNYU7?*CzQs
zJxBGfH52fQ7|CptuaAvs2=r!sm7Cul_jce$)G$2kF12{JpQB!!3H`00*gdDxh$>1n
zUuh1GK5+r{%gTy(+>PenqUb%=#%8TeM%R{!X;~(7SbgQG8En^X@HepZOj66gCliVJ
zk%x-(lS;(Yk&upODO?30ymkzQRuQz7#v<{}ii-fv{sc`Sp>N8STBL-8e^;HqLPJ9n
zGF<Vtw6t(E&;1K62UlWyV6j?F*yzQps<!W%d+Yp++<>se!>e<2s4CN=wqI{+)5z(`
zLi%|6@k6!;+WQT<Gc5=j5%wp^(HFqCnp&E-4^AY`SL%y2TiNbU7e!@dFY$0g2;=br
zNVyV}ClKP}<ELn{&FOfkVxl1Fb=S5M&(t^(H1XiSekCrRcan*@zk!7bt@m7R9_7C~
z`jcdRc$sg%x^i@Cn%K0l>ZECAUaYTg_~+?1eX^C&^ngtS(IT?89g7fD`!%@zo>~M_
zxYCi58sl8gvw4+@?{j>R>~!f%9m~A-O41nzu$+U3C|ovA24J6=2>*ag^mgUy+>v<~
zGv?VY3&gtX`}_XMO@dBpuP5zx2{$*ciu#kCKkZ~PR`8~a_6!sAW_l)XFNk6ZF(oC~
z4G1zzTpVcXN^)|)44(9T3D$^7j(9&aJG!z)m97{lkc^FuvDxna#fS>>@bH*S{qsr2
zmnoV8G6?>+LDXkX5}HUWyc2ZwNx=WHQaC->%VAr%W-jnIOMeE8YU1Xzrvok{zZV#(
z{LWj*2jZH~mp|10FYGta6DaJsS+6=im&AalR=eDb7fdb>Z?I;8%~VMJRevOsILm>k
zs!k*ujUKd}vybyS>2PIlvuSQgrJ|x5F)(V!EPQx_lh&%)85)_`Hx<BUQxXZku^OPb
zG@{XPO%I@sY<~=)V`Pl6Kb)|=nWL1+;F8wa@?0}p%oRC*VL6}jo6ef-o~Sn44*HU9
zFfuZ-v?M-hq+aiRojNozvgg%Bd$G|nP+i+WqgE4tGz86)<~md0Xs%XoCY&o0A+&=+
zg&Oc)Z@umuAh{?oG(4{VE~EX`PaktCSGW59tOOI>=0t$7+4cF1&n+&ZmHrD7PL_b9
zG3*L!Wp@(a`SwSz34Y)J)5EAV2kU#oP)c-YC{rr7nT0lQpx>Z%wchM9@~+#4<8uqW
zYjF_;^XKZu+3O?O;N&`Z*YZX<023HICuA=8!pZ0>|Hffl?4CW-Dq9D9nW~BeJ+P6D
zeVl_$S5xx9MeM(7KVp!n7#fn6aH>{Wy$U18F++cMA3^LS5YUwVm?Wv$S#sT?f^R#p
z>!wdmU*plsD%f!*M#UI>yiJu76N3&zr!TN<eNa(Vzdd)Z6(5$@+uO6|u%-2%Z;iU{
zKZ9^M27y5xnh_1ZLt&??%~?)iUj9IN(%qJD%4!?=xNSUIa));I>&4=;MGg!UaX4N{
zNT5~@t<e$)kUKDTfPg^0xrKdtsGacOwkGIM_N%U8(AoFxW+~Fww(xvhaT-gV31HN=
zAmJvDk||$bYB%E%B(KchTuK094JuAzxX#R&rHjJ{)?bl(+~wQHC%yGtFjmd7r`^IY
zQg24oneZ8CYNpwett)lcWfOas4feN7&P63uwN}$M1rr-S#*fbi1_xUP)&m$QTxj^M
zfEC<7@F)E%*>>mdaLQ=mR5@A+3h8+%)-JR=;S6@z)vHP#A?RcdXtLOo6)?Vr!Rbfu
zOWQUrHV^~BKsRm?89yO7vx2NVRZ0JS=ZE13F69UiL6)m*iQOO0ei9SMp`W)Map|Di
zf3El@Hs}S#Lkp)Qr_N?e(sMZ+L;P|u;5d}Q)xCXKmr7wu;Bq`+(CHd<ad+3(mG=;f
zCZtd+KABc@Y#212w~;Rp{qpCWtjcm3^To-Q{!-51CbKCMVO@mLZg0rBW%KCBgw1Mg
zsOA1NB+NZjIm*l7Yyo4D>%L!A4I&{W#^-Vw1$VhI1GX@7w#1P-5D`aYG7}`Pten*T
zh5zZ&x3AStZX4p;HwL{u3Jr}C+mjwN-sc;rNDTyol``!j#Y!JBJGA7)1~$v~mTH}4
zG6e08DEHgQH=a*rT-=Ogc5hw)SncEGTzx^hL=p&ae0{Lway}NgMW>ZtU^AF3E`56&
zR7<Tt4z3B6a1A1lkL~dJ=?N93x4segc5~<^lX=^}vEf5+JVudDD}sc|PtpQIba`F#
zn6rAL85|K|xYl%CXR;h>=9p%4w4+Hjp6r(rkZ?B8<DPBhH$bD(5HcP#@#AXihoWXl
zwZ*gD&CSgSH%m4$a)?Zk90ER1aGE+T@{HY*=S<c%N<mIJ@xf+UnZ+4iN~-}ptg@wk
ze+es#`G#**Rn-lGWRU@tLym$_MsxfeO-Dv&5;kq8;H)iCL4Cn=!)DJX3&i5-8nlZ*
z{Xy-N-Anx6t|6kqTe_3sc3A*krhGgfhU2oPW+j##th!1vFe;we1VKgy;(i)euAM?b
zuH}f9y0JJh5<hjf+l6G;l$>95r-BAem)h_y;IZwtx_oXB#EXP@i<m&-lvpgM)qn58
zagAgzC3?9K^70I8JUjV32P<?g!ZSVYi<MK(t(OCtk4{XGY%O_TT7=0bX{ABU)(7Xp
z+RC+3`lVt3KFl2q-#^G`wE%g1L8%ROg?*Wb@XjqSAC>QfIyy;wXHoGU%ZjMT<R#`!
zc~BbNL=*1ME-M>L9@dth?2X$d4y<{(>^xqsHBPw@d}8pF3%Mw5=H-bL+xl20DAIe*
zNe=<41B<foCGR^jg~0|<!FG$xME^bqjZ)Plm6rmR`@M=ySE*96`4N(W(4#Q=j=srH
z?9oO%0p-fQ;U;R|y*#1xlKHN#DY1tU>un$oW3!olEc`c*!R_tk*Z^;9<G!H}03*({
zIGP8XOFl7B<emQRcjCcu*6b-Cx8Q=;fD=2dgHLNiM`<+0Tu2tU&4lG}<}9ijUx$(h
z77$D`X|ia+1O4@*eV7`}<s)vb&4cZ{d909l1y$T`(vvZp_|T(+Lds4SWd@Vi5U&Bg
zv!`kRHPtC?av1h8tZv#NeF!K8kGP#6xD?5CRWD(^G#sFRt>C%sK?22B_UR2)<E1F7
z>8shIp@RhsV4Yt;l?Z1hb&%UF>4JnTD0(UU=Keyr`RN80G_VOaqh?pXGQmH3tRQ7B
zt-saRDJ~{K-%5Up$L0CLg2QHIF#H07k+%EE|A@6w3d&@qIhroPFO0&c`n^NRNg1Q6
zFgV>3iATFu!jR((RiW9e(&TaWmoEM75$qFxDZ&^Y*7pMHis6b51@iu%AuUeoe4T+y
z<-=OX1>!FmC-nRCI}Z09v2C`S+nZ3(!<s)o=n7<?ZrC}VZ?C}KoY-ml2?mb~$5CfY
z?YZK5HN2G>U@3BU@fR5PrS5iXq@TI2!hABulY8Hd&Y)ja>4eQ>tn675i^%~K3kwTo
zHR?)NPAtd0nRmrE#S_fbv+k+S;j7Fz*}+03-0`Y^<VKh)Zj78t?)XU0-(d4w&dx{4
zh0DAAe_QwZ%TZaaLBA7hE8pE5(PREatIROh>}O_oUM`^ln10t?2U4E>WAHCNJW$Cd
z<9v~YS(H~))LroP498kZUsCV9S)Zfxc<g)!5XkUw#_Z9tVpLSCdo+5T&;jA=&#dyF
zw4k)KL8Bio52E4ljz@e}q@PwP;c*$1_Pm!ONBdddVWW(X_Ugw{HX`y~!<uX@&~2|x
zJwAHrnj=edQf_+@rILAJ^%a-{&IN%Q*zpcbik61+1fy>SG{{k9&K#RWHu_<8q7sX;
zyX@H$g|aAkG&7j?-OmjP@8`Q`<(gA4TSm)Fu{r_WMpSoxAdY><(>Gu=g!ImF#!nrM
z(<WwMNSK>jNxa>f@z)}~!!G~h&6_CezZ#>4=i1Vme(=<vIz!3gQqKpXfbo(!@-PAi
z$Z#Lp2V)&uRq9=MO^YduI#}5E(=uUIZ4>hwwAO8k)H3SL7pWZh1ojJ~D@JD)L~qT`
zl}@lN^E1*pX^C;R>K#wCoDRK6j6Ddp+;v2B`+bLVSFZ<C6)e^qi*1;U{%R4-7b=(^
zldoP2sxdydp0B}&<|)COr@Xq-F>r`nq`CvUhDw^Y8K|!5p0#!k4OdZHvRWG}uAk%?
zKGhqlugYxS=Bznfh1`03cSXC?LAL(jhgN7>1ZUhPB(3b_+g%m3;VC@1edktd-arut
z;=}J*s2>f6^A2y$-w6_EGyP<Hh@_yV-ri`!0ztt+Yz2Oj>g5uvws^5aiVR?4VljK2
zu!moK>dhQ9deWihn{V<zoh|qEg`jL6dj*UL>n<KiC=i@mn$;yVRHTQ*+;OS8#Gj>L
z0&wiBT&~$PrbhbMcZ4wNo26TcFN7J<s)Cvk;bXYXyI-N*NXqXBOAqknip_>WUT>JN
zlGFi{(pY#u%Ms-JFZ%5bF5hyHMNES0VB6KhxcXO=?91<0&b3-SeC8#+_jR{4YnYf}
zO8txt4HL!JYKCgPlTPScFtV~TIy4ds8(KwUEIZEavngcgSfO1}iQI+xUBClKTW01&
zR~se~DKsM*W)>3cs~CaWDrpu2d>=o#{BA_J$M>sv_28con-@yglL`L)V$#C$a%nfW
z)Skz<xVZPTRt);8q*jcCtalk%EpPu0{^`?3iOT2q0U==qTNCRS1nl9@L~8+c(V#7;
z$D`GbY4hD7dJ4~^gVUi_Z}@QxM=aRP_71H~rt|sZ*^Pr{xxDZ@mb&_W4vFnfSMtiW
zq|@Bu5-N=6-%3h75Bb=ZlkIM|1ErbHnjIIX^A(b4Xoi6gmOUlohu=N&mGHZ!nVpL_
zugPP7Gr{b(zY><%Gz$@J^NYdFr;mIrJSLf6496y9NV@zXT0jr{56?%U>8E^J5`1Vl
zw~X!nW)T$?jTUpkbWzTJt*%N$*o8)P|MR3W^^WoCU{mpMR?S^hRD%BOw$794Y^_O7
z&FojL&_RVe<#l?J(6e7+c0y5F6#YK4tf*omSAE__tNKbG(wtw%4Ptt;-PZrY9u~Rp
zk#;B$Lzl%T97iU-@eFv(eny*};k>B%*+p<b$_F*;3PM{o^vUX6LfWmXv)O!Af#Kz6
zwZl0jkk)#HKXp1%8k4MgKl039S1?b^6=wTGA85^P#_4&521sHuW5(O^MT5g-j9fko
z3_sq6N}3DH^JR2w;B2ppEjBN;P0fZWsi~RG?kE;Mo=XKD6<WOnrKHAHKVB#M2K%o_
zSp4^44|8&;&ZnxXo%0O2>AhaBaRmGbqO+0)6T*y-7TVYzt&%)4mTE#-TwgSKB(=2Y
zj3eKByFuz-#Db#)RaLRv2TRU2n^WTVNO}l@YV@vo=H|5c^g9z1*|NJ4#lpQM`1!wV
zO5;p+(a}n3Sm_$R54<PkMYcjg28z7B4_4+C=KsLK8&1vdL>Je&;lZdJD5fZ;96npC
z3boajq|2d!zHu`qm|md8mH}8Op4LgxMMLB)uh#M^-c+D?3u5;a0kWcubZ58u7BU%}
zWq?m6dULbk;(BgrZZ~HZ{gZ<bPNF4;U@iXbG25AJg@$(@-~-Rsqxb=*RvJvm_6nY6
z4KMg<klMC;4q(O)QiTO!dR9zJRR-S{5+Q+FAms(mn}~y@qUvDdDVuiL^@_@I<?|PP
z<%<;7dL#hRbF?j)tSpV<(vm*4=40KL7qvb6r9UNsHBr@ll~YhKJ{|x8Ydw{(YRQW=
z6Xzu;l3Q9Rt5s1K`-%vwy!AU5z1OXww>FUU)=0*9>4|c#OtZ7ka-mEyiZRaksyAHL
zRB<&CytVOaHFTWCd^U!D5OI4aW!HoG(U~aAe>$6Au^{p#xjUCn7}#@fi(`jN&Q}zX
zcsJSFgJcGYHj?k7qvshV!)u?VbF3_?HBK0a;NT{kT`82rd`5T1%)i9HljdVsL)82)
zst3Ha@f>*Y`b-db`UeFCok99uLFV9R$e9^xMqNCduhv<vMpk;gWH@EG4_Ohm)u*4)
z01yy6btc7aXIIZ;^B+|jLi#|tm7iUtOv%50e>t;c34fBM=YHbzOG-*Q5%asW|3fr0
zLe17I0mu+2gtJ2PMJxZnZ;U%}ra1%YzHm=PoHBIt&ku+FKuoSZI=uXkbICtw?aZwq
z5&wQYmdX{F9{wj1?_HUMGg~Uy86{i5WG3&sa)rjhPKclfTN(Rw%=SLs@BBKOdGwjt
znWKdqwsrLdQeL`1VRNT{6&3Ou*|yJblx^JXxfSM)6PcV59bWwz2r@36!OUFQJvMfB
zJ&!vOMiZ(1gLr8SI(;sIvdINkwoU}dKv_z&+E&@tOF=}l_fyg<rN4c3@%c82^zLH4
zwM`J23d>gHF|o$}hQT&1P-b2{FV6@~{lhE-pP%>S<b)=fkHFiTFGmpkc)kT6M~Q}v
zmNmak5M@Ng<O=-2>mIAutuEVj7xEhj8dY3I4m##&V`hVxeQM!%VQBtOZiFWc^$)v{
zOn}kyV78{eO+?QcQ>I7>3xj=qc&Tz<l<~cMn(m*C*z|r0yc*2j$4k8;Kt)Bh+3zte
z2tSz&);hPXW8A%12Rj%`iHM}AqNWHIbFelYZ-8|;l?wtmmny5le!Wp`y6N1KlCgX4
zD9NQzLdjaA@ufy*`VTMVDWwU0xx<6-i^ULNIb%~}H8!@t+rhvi>{M!d=edWijAd~K
z;1f7*UGFlWk7Y&G*T3EN!1SyFV6D}jFZKYGPwKq3GIp>R@S41kI<V006>!?7HX^Eo
zMG&odawu(RKQa?HBovv|Dw;)i0Z{f65S=={`2FZ~-t|IJitqHH2`e#<G^7b!FVW3S
zO;r}l+CrkDjGi}zPg$Jd%DE>}I3TdB^3#wgYTnfdxsI>kR@aZQ5OC)kp)u{Nxv_C0
zk(TP;y`G|r6$*0-l^^=eA+kvfy_hAmw7zKhq0d%TfOM6;ev-1r#mp|mrKg6Zrb=wP
z(I?%Qsw`##yZmR27&Hef4zZx+!g-UJ=w<)6%-1iiR0Cj4i>_L1#?$E^W!fz1_uQT-
zPvc5%uJiQOslQAQM?I|8Bg2w0k7rs;>w752fd3s@!<tFeCU=&}1#qW{SyA;d;;~9?
zNhUKEsLEA0!A5oP=H!-G%+%C$`}{njv5}pTk@0M`G3p%(;p#LUt7)z%#5hgH#ib!f
zsU6ZfJwS-UeK_R1Myp-S=%I|=#oiA9;vKEj<8;2=fuFB7iVEhwU7n%xN*QJz(P?`N
z2{|BtTBQ1i#2}D~aE)bdL@aoQCC<4v$48Yh@dCtij5!{K=5qQ>;>(xg^rZiq0gs~h
z@~%qQh1N-s0B8##=sfbNsW~&NzQG+W&5!iop`oF{<aVObAB-d=CiX)im${nU?xjiQ
z3;?KR0KNOW#~n1Wn~6lI-A_#?bgl#ts!RR(=3Mb=e?9_Hp~)p`BE|qzrc)i7+`Ny=
zf_{+jq0+u|(EHhADC@Ve-1JH5rZZi|eU4d^RYaxXQEjKcjz<pS8|DzZQY88P{XzMk
zpIT!?*S1lCZyhHb0Hc+wPpzD?8vUr!2gh<VyRcB8-e~1;x&Z$-IT>>z6Eu1}YpilN
z3-|SMb8w?OB-Qamq1MS0fXBNU<plzzsmf$P0Qt6#xOFjZzSe1<@i%R8Xk;v}qm{c{
zy;1LOi<HH5MhNZ-ohpw>)`4Ear|pU4v86WsFyF%<;X20of2-Gc+@eu?{uS)}<x|Vz
z-I1GaB;jZel$a!m_dQ=<SC_xj>-}i4k^n3vC1tJ27Tnw0yW;8D-saWK*B4*M%qUW!
z9vk4E`?{OC5EM&w%`byf0(M{vl~|gaIfVlFe)7=x1K0{0-s{(ppZhl`h@5W#$2?sW
z1C<+ykf+-l@TXKsdQ6A74P%67TG3T0hWk$3LwEakCr-At#jPDy7SLX5yXVSRT&WlZ
z7zihVmVxk)jAW)3&lp2$_AJAV8Df$`BZ<<yP9LI3VHajvTG~`LONrS6`V!f_g9Bt#
zRH0wLz??5P_9y0RpDa{`O@@f=?Cq=VZSq1hz>Vh1s#)!O#`<9FCC$U7$E&MKZZ_Zz
zWL>aD-)2>Ia)?8`u}2*vBn==7Vjb=&W%2olxR}18C@`m|r`tF><~NIK4!{$Lji<6!
z*ViYsgYy^t173sG*12y<E-34hV=T+QU0i&0Cy6hz?RsT?)X<}W7DrGK%6>x2t1FqF
z?Z565_FQ$6dBzNt<>G#Wr<cLu-t}=XTfpK%W*S2snmq=A(JC+B0KAoI+4*R`6RxH7
z=$nfFjDmtf@BBQP^5Ty1wymu#kK0|a{_vp6QFS!rDt3;ST*gol1<<w%4vXLidQ-5}
z=0L-Qfq_L}a|&9T7Efx7=D!<dZ31{{T8H~PdF91l>Y`AzmYQ>O^V75J6g7PC@DV*B
ziCL18(v-g;$?4gX!owYym}iE^hsjt;|LY~z)G~=nivOgg4T#SZy4lqWo){wJr1aU#
z`-Yr3aD8Wr3sBW6s;auCra<Eg?Zck_b}x=x#X#jsen1p%0Z+<&e4*%{FX10DV6U^V
z&T%wtEAT$M!6x2!{1Z`>{CF`W43b@^EYs46bqot+c6>kp&=ff_GZeXdZ4VP~zN%=<
zf>o#3;zND4tJA^@6Eh0P&GS!`<Ep2ml*4XN!`^7tgU#L@9)9|3^;#6*7z)e^4at_e
zKVen-hyue2zV2$%&{I$ll92^2En!LH82*1PfJ!E>r-X$C4Yg7kAp=#Y)q2a1_ai!>
zXGcOR9w)D+hJAc|4AggV=_GicNm*I4CAiETMMXvb9?#TrLQAOJ+*(Y`Pyc0S`($VT
zOjS!gGBMY;u<#8CVT^moBx<qJ>?x4x8S49nf`U?3Ue3ruqsGV+&S3UC4)Yw7&D2^C
zid#+~M8;u9pSOS*kFl>RFZ$bddrmYHNOiecjO1T_G2|}*K`PyMZjEGDUKbr+Wqm~-
z(N;}5E;iW-*5~LAAxkZ{$j6@FX!0^MquSWmAR#5KHlD;E8{h1JwlXpzGcz+QD)|VS
z{1+25RZE_n)|*Is6*wHTSeqFlMUrtx6m|MfkZpM`8)3ucmXSa|?5G2ELy{k+IrePB
zl+KU5oQ#e)0iZFA#?~X^+9@41EK#eu`6-wSIfOk=6cS1__HxEZFmQ3Db_XJ=tE#s4
zhT}ddhkfqUcDyC*z!ny49%wMJ_`}eVuwPabgBZgX>O}l<^w(y@$)k8GY$Gb4Q&q=a
ztQo%xa00@E)!Rpx-?KF~59uM2wJAb_`BmQMLM(H_)!(x9Mu?-9#|r2@pEEX9$9D9r
zKPtJrKX@`TGw&`pv*t^cb1SrbE@J2B{NZtQwtktcVNRsGo|oV(2jf>}<qJXK9WcuN
zkca8v&W;{a$SoliZIqGkD}cxz1068>VG7~9YV1=Xa12@0y4{;~yxmAHl&K0v;iJ`2
zwZtNiC4ZTim@371d%y|Dl(%3d4qxg)Z<)=Y302ye5(pc&7(gC%Myn@`=VXKydHQ#5
zNPjW;k+EMkMglm@q%r`x&z5UBoz7JHrS0fXS21KVd^zoPZVZMd=^G@VxETC@nq2Qp
z$XeD_cL%~TZ5Y=1${h&hpzw;R8Zf2|OX+-7U+U3A&kbC`S<TDOpKf)wo=E5P>+Iya
zxVX5aSYeWDq<ebpjlh|zrzXLue5>*&RnZGUmY~QDr)?<Hh1b3z6~v-K&b-<H2;rx#
zwL@NMlOE88tsjm<UhWv%_V#w2#WFGwNM$m4LIMH;#@Nsziz#tIFzD!0ML)hlqN|pL
zkgYC94%B+TE{WQw?gkND_symseEV^i8UZWNuXtkaupJX}WD=q}#Ajf7+)rK7NzYd0
zLn*b*-J#DECok}j*W1z20U*&d+uecd_s7l7O%yb9ldcxWDwpcJ$T7>+f0nB~{rE0b
ze<70fWgJVubwVkjIERoEr~Jv@x(VP6bU5+;62@y44@}>mO((22T2nINZ-W4`d(+{J
z;#I0BXNV{aYfOjUeR;wubxNqh$$YWG@a68fOszhY*YkyfW5n6w)9ZMgvh(e${@}=b
zA0i*`fqv?2`aX?l+M_u(%eEitpAsQ*=*wJ&o+D8{nkpU8DdT{OQCeFYPl0sWz{mUR
z_4ReO*Za#Q;f$TlE8E@C7d-BsSW?14q!5ExtZ|bIyCl4`F8D@gq$0vL)_yol4F6C)
zf>#qUL9W>p&$Bq{;r_wF-TnRk2psk%k7v7mX*;lbb4lypu6NKppzUk@6lpjH9Vl+h
zQ5ChB*l`OlC?5c#q5vFz{LRoVb%!4A?$Q985i^b<r`83#^+sQBFF4S!lu75f_S$gx
ztu`=lHOV*A$_V1wx-(6Yj+fJ8ihEA-evZ7v9GTLa4gM}5{1Z7t?${qihFZ-wWmMyk
z>)eD~xfQ@+vjx&P9q$k7N@XfOsViwgIDdd(&fv~grbdeA%<kQxF^)YGZLUEaM#FQp
z#ny<1Q%Kkb5p(1(u}?yN-Q|Z~x5Y77E#UNJ{?M<h5Lhg}&$r$p`P>cuJhVTL7dG3z
zcN1ej1qqoIjN%S8QxuW~VAZNZ6+@#GkR<rm!ioOCJn!8S^VNhKmg(aWT*qjf|Ni|O
zlgR)Y$aH5L?Ksq>h?O-iA-{j?9Lc%de0w<i;{H4$3hJb;MJs=b<LlQ<5fCP{68W*=
zZQD1UGV#{Sr*TlTCVtWF2gPEwhUw|)2`tjj*tOBS`|d%gm&YUoIzHFm6-M|jHWB6|
zF+vKdp<fOJ0sw{4l@|A?>WMre6fVc4YcrVvB!|Nh5)fnH2zb*0v*qOHleSI=9X#hv
zl`2c3WTr2k!!a5lx?>KDrB3;4p8dA@=X+(8bNbtbUOXD`<+rHM>QKeIoFtEP5@d85
zm9Cxu*yR>SYD?`@G$9v1D8xK8q?5&<1ZsZu4!Ysm^nM)cmzgB(XT<}L9N&LndR<Ld
zAL675+i>K`I!?7X#_9WJNwKj#Rl2<{Z%>T8yu3@x%aj~55@f7sf$(wYcI&lJxVU>}
z=#n(xSYmX|7W!!#?9kr@u#gvz{2xcb@u%VoOmc=H=!P=(E;iaFf!^-a{QUmg^DWVE
zJ3I)qR4?gfY!pW}Gs9=cFqlq^n@uTQEDDmb5$N`T5s)XE{(c$pem00A8_3{4ZXp7N
z*SvDR-kOw1tInj?2W<<w==`nZ#kf(S&3Ej`&B+z;N8S+sR;8Z`lHu?3n5gfO6!HfA
zv?Jvom&qUm8e>lNWeJ>>p?Nxb`lu9U;~LXhGN-d8pTfdIU*h*J9xoa^fROou!}d2O
zMq}I;I)~oVw#(<fY!FEh0*cCGOK34)t{SvYNpSsRkaNPZVl-oKXJ_Z?=B8(H5d#3N
zF?*=p69^NT5a#AZ%7|}odu9i|uu09~lm#p~G0D=xavXpI!<=F-UUh+s;&Kj)H(Tp9
z*=&EkKbh}cUQXE^jM4`{z?K-FPHJkE9>m)dv5Twt>DurtoU~GHYRXt1TDeLu_J30u
z`fn;fLG;ltIGv2XKkORSo9#%oz28|!ljsYzJH24S<tPpY;7yea3dw1-=^l~%%{6lA
zJxyiom8!nd_ObrSmI~R15a^GUX3M(966NTza+-|}w5uN-8{3PM<?UWvOajD$y9Z=u
zc?n_hsF<9{zJB@6CS0S=$`(A=a7GN@Nvgs$m-I@vegz-~H;It{!JRBc@JE?|w*n09
z>+5T>*2EYR5~9)Jp-R$xlUIqz?c8&<JyYE4beUM1@|_HK2T99i+Xt$UvwVsn05MF=
zK_I{;klAI6-(1c9FF5AUO*{`MMEt(l**Jbb$nD)-KOY|-Ut%<a-@ko_<MQndWl~Ar
zdD)eXm<{7odT|%30z2*ud2ggS$)Ib3D<rem-UqD5^zlzsL@`>1=E?Z@vIxB2Vhl$U
zs|`odSL)*`57Mt9`v-g*+4uIl8!QPA`<D5?O^0a#pv3#OvB;P34FlLy6nx7D%)UR$
z3`h?-$em-uLPD~EvJRKqDIAFPAtcH%DQUf(p8~T5Gp<bgWxiX!upLjaf(YX#1H|~0
z9CF!AKq#fah!L6zRq8|PMXQkW!?vsEc7LD&vgn_3wFHGi8Tot(Gzd|uH{+5L25Wp8
zO{xrO!)<|PBZX<fsEjiMFmMwo{Yd*ayl>QhME=_i>GT}|i@OMRNZ<zA%5h>OG+J%R
z8}073CeuX!h0>Om7w%vs3TDq&-^$85H`mF`=xD-PATy8YK%S~bv2X0OWLzorv2tx^
ztc)3vF@})R=rZ{2o1qX8OipDBhJ=Rd9ZqC$jJl4t$nhH*0^axh)U{APRhFVLj(-!a
zb(e!)uQG0CyDk%*1em=I2MD9{wcetfRL-%tx3{^vy@AQe$u`?P5HWjH;L_5^a8zOF
z;*)1alYzcpQ^revqiK5#6C=v<^gD9%TLCWwll1GWmW!<q?9(p&;#1S1W`dTM*4x|d
zq{UJd{~x>}3%AF_i73}SXooZC>1n34qnuF$r>zL~2-7jf$acS90goAg@1zV7`bjZ`
zfxOaIUABBsWYV|3p{oq7DFK4F_t!_`{!p}ZkUP4ywY9K6&7W@w2sQ_BP0ixufxL9D
zfpLe6=Kyr@fkP$r{+0rOppiaN4<Y;1IBBPCeJD;bb2a7w$}$~@leQ*T5<n95^z@{+
z+U#_W4H(e`U?nau>5Vv_kxWd)TA7mQlOmhbKsYzIhHSSzu-YEWePob~MSX~BzF@%1
z8tM?dUJYisujx|=#t`cA-eUDrI8}#<OHtK$NlC#0QQzTmBf~eTV!TYFIkv%al}Ud9
zj?H4}Z$o<ASJ(uh$;_=wMA0aLAOs{d(%RwMQ>PRIz_)~upAo*IZLkAR_!LK14LA1C
zUEJqKn2F0g(}DVUN>bso8jAjDU~Fu^I{<$$ks<kiVLOdRQ#7F7VKf>`w&Os~7N}}W
zT4*w#6I)4mzU=H@Ty9fsnP6@?stE!)6fonvYz28ZUi%{k3n6{@sm7`zTZT0FCw-Vo
zu#ldToJweXUUq&anwXnQf_*2Po|}umJ6l#@a=FqGH#0loj?^ledN_|0laeNl#bPFj
zZR0uC|M)--2@Dj{Gogs->qj%Mk*<-}BVmlSh_~<<?1n*G0%weraWR*55nwHe5mu@;
zOf|6!WM;{c-`3C0&TeXMj){qpe@c#xMIIO!;BmPE)7Rg1MsB>qcfApETbEHp`}n|F
zsrS3GIi4(6PjVS>4w1YoU>C$1nS2YcIcj>D3bA$QS;ZOTxS@P5@S&-B3XT#Z`u^9~
z_bVhE<}Vo;KxGCnxj-cbhsX72`x@r*r@A_aBMc8uo*>fBPM-dSo!!<Nr%G#sN*ozW
zHzJ>mjc?R*G8~h{Qq|SZA0aX>)Po!YrZRDo*EiHFCb?0(f|$OL*kCkjb-~=u7tu*c
z$`<csWi*lapplUTYBYRc=D!vE$fWaj&zQ7ZYJqB#OvXP5F^siX0Byn+!Ex@oFK&>>
zE9eU>S_I(n#rrY9_-My9b0V!*(uR1aE+Y!))zGwcP0pA2%*GQWAW-{KgM)(uz_|AU
z3PeG{UT0U#o>w9s4YeWGTK{eE=H{7@97)W`e<5UPOaAN|EcukmO*v000WjkAZQw{7
ze4V%4KZO2;Go2LaM{;J}Pzqv&avlgTjE|1y0x2dyGf_f9;^_D|CLuw%-R&Ne!-mlF
z<*s{RpnwNK*oB~tZrG=8LQ@Xu?TvXXRng-5wtGL4V<!M3Omz$?kb+GsyXOacZhYL>
zm{d(ojhKuK89RGYd^{>}Gc-0v0%Yj9xj$evwY9L;8$&}wgxu;}gxsX00dK}xdZe*A
zqgte{4ZkH$!q{HiUj8eN^YZ@a;gFJ&9%CgU^JoidYiHq}<9ek$!BY4P3L>uXm<VQ^
zae@6m)iEH3e|dQ^F*B<HP;nxiW@us}I-pT=xL8a10uDJ<tuN}}=s3ESf=bnHf2h+7
zxzvi0xj7VnJ>tkNE!|}EWo=!%HRV*JkQ{V9(0WCd0K9~rzCI8=i6|*UfO-EvNi-|#
zf4`ZT)qb-S{|m4iFfcFx`k{VXl~Yz06;+0khKIkqyPH~E9Gsd$($v%p4-W?vF<m`9
zU-9rVYP`L^srm}#PzU^{u|`G?j*21&G}gcp0Z>&;N{Z%<my<LgFK@4BAIP+Mg@tix
zX@YjKEXDcx;&I6Z1?bqRsYfTr*#!k!Po0Sk2!#9!3b3s3(qMp7$ScKU{yjZD1(yIC
zcK>n<KUZAl=jW&AVnIh-eDqOwcXf+&lM^E(<kYb7gv8Vd!6#9Soz}ue9$XNyUr8V!
z^76^RXPBFSPGwDP4WQ>EBI8015&G>SQdp7g(~!u<)zVT_TB@r<=*j%w+jadS0QUrk
zgS%s7ViM5S?i@<;@%chVMh2vc;O;$wk~H@1E&ioy@QZbDT3VNfY$Wbhj3^KaKE8~N
z4MP+@h=_$Hel_F^E}r+d_e*%O5Au||I~JgA$H2zgJGAu85>FElNl!1#3j%bLB_8O{
z{2Z8^qCCI4a-|qY3fA%7fkdUk;o*KvOrnIE84T8Ou|Zy8OiHGVK#u~zB*h?oqQb*V
zkI{}**VGIEd&QVs6c-oQ#>S>=c^S*y{dLjn33X#7DB}naw+9CYQ@jab;NVDlc<@|*
z|IXuyJvmz_n?>4C*vA(^&dLg5X^96H5y8m7ARsD>sHq96bG)CP2Bs!U00I|uaJYx@
zPV}k_D@bHBJHZCFPi{#;<OGxpTU=a*u#yrwmTB=!?Ls_>ot>SStTe!VCCtSe%m4<L
zlqLhwCWP1hnaT3ZFCd9YjTHd2-67w<o0ypC0rU?br2lV4Q&V-!%mP!2#dVqL>gxJd
zR<N0wna9S*`*Fk!Z|^8^d1<8G$Yp*Rku9p#?@X4^tu@;Ry*^&Z6UJ<9?S<DzfD#qY
zsv7DCM<x)cC2_)~q!^jlgoW?dHM%JQDvMDo_3A&$63$zyFHSCpI1>pCUj!hmU7MT#
zRLc7S>P`94@r0NA)7|ZD0I;2<M)a5~P6#C>B=pCT%ffWx^8tCzg67AMA3~yoNGK@M
z4u4oUIhT`@Q+3U(d{UZ8MaYbfurPIX48pUkzXt{adIRxJxUBce|N2xxkKNS397ri+
z^7_8T#v$i@^1bptFF%G{+mZ|n{=mSI){ugGes%>$14()*C8w$Dm@7cQ!or@NpI6t`
z_AV@-6BFm&@bd5@AQJHI%@r$XG#!O)CQ$RZVfGC!uq|=5Mqez$9GbD(mZ;&4QZ?-3
znHBf-3;jTL(0;k!;`RB$-sJs=0DQ2R%_SE|WB*sf0<!K=?zzX|*OVhBCMK7stDnHw
zBs4VPQ&kKCg1s&`d*1=JqpyEJ$4WOu5e<i?%z~k|ZlG`MtAagjxbzr9V_l+?VsdhJ
z8I2XsI}*_SMaDo8?wREPG#BE*QM;y6EV8>fAt7+&Ttw+bMbLBebJg{={R;~S+}zw}
z=N8qCjfH0OB><X4v$wZj=0+LO5D@qpgh+63RK1(d;~ER>6hPs{e-0T@tXTPz)qFmo
zH0{GP9`H7uF3XFxyTgfkYK>+Wbl`->N`s~3tCQvNN`0w|W`}COv;#oMe}jZXC#!?v
zNBj;0L&U+6yp(KGW@!PC+dU%#U+hb%R1~YbXI9W9&2h%c%lcE2<jjCm4^K^)IYd1n
zAu!}zOzB6#<b6VcDEJS-RifQRB_%t1XW?OziY3iWsAOH(tY$h!MoJq&a>YU-B0Iag
zy%!+&rakxXk0R2hYdN&|<7)EdM(2nRf+a#kfP$P?nJ)cc<XJ(Z*(MRtUQRbUTf5z#
z1mx!Gy9TLD$9w0D4iEoiV2J+v7wlrKx%Zs=3*g~tgSxsZ%GLc7!&o@(<Q8WcRrY0}
z<?SenXJ^0xrlfXTehU5S=@_2x@Y~`h&{2W}$Uh!}$+Nq8V7!7OD=O|*Bxu>q7E1!s
z(s1g{=8<>7C4W*=hk3p}R2!YE(WQ6(H9mc)yI4v9#HUlU7>mUcu_-a#0kfi<_IHHF
zvTu?ZT#lF^GZG*@{%~fKY+n_6^cZmC<Kv^#zTPeA<U=HY)U`4VsFj4rEuHUcR+BDK
za_+A-yO&r+`}v0#0s=ya2jM??%kh1J@h21?T;JSWIIzd2i{y#1U0t?-tyWxY>Kdex
zEhH>_{hA|Orq&E2nsnlD%AFj!?v{Hyq8ZtfW@v0^_m<^}yV9P*&0fLia3ohCoAr>L
zwNJ@54Fb4*05jM;kD$?McSv<*a4#)!%9U1d&zmm}mRo@X^FgCG%AOgS93?)R7Q9&R
zm{?a|Y<51ycDCN^n;D4>ga?_-H2oM)V=n|MfTE7v)=#R~=x8Lb)K_M1=d*wMjT><I
z%-;t~=0~~9B!2FQW2Sv-jdW|OAFbuX)*5-eW}`FFtqNiM_|ZKaN6u+`gIXw)K|)EH
z5-6Rztu*PUc8|TKHi);*9{!5#kH`;*E)c;l?G6VNFE-jn>PInxqr&nHOB3tNR}<MR
zSL7P4)+IdQsQ|Q)bueMre}i_1%MjkJ&)YxNQ_|L35+94av)thYp}s()|F4mq@8hXA
zXd(A%6FEbOsC#lUYTf-|Yj;=BK!^lBl_i%y4jt$&=CzpP#Vh_9Vbb9*iq9eLy?z9R
zefHNrJ!g_KgEC~awC+w<q3G!=C0Kub04K=8u|bfJBAHSzFQO$&D@o2`1pbB9({J~u
zQRyF#gp!FgMps+i`*<_0zh8vNW5hTBUb)rj(&+I5^e<0Hz4D^&VlJZPB4T5COOn56
zEYm;G=4I)p3<2k_t@Txhqa`0N&)1oD_s7QvNIw8X@_xR-I$f;vpKT`2))}_mARPNS
zoSvW=$zVy}8fDUGKVZDPBy=Q6f4Dgm7Z<<XFKW*@IO<<bZRhP5SLr;HA!tGC0IFjf
z>pjX?4N6uUmc1uFckR};j*JbQBxTf^NWq1h8@cH$b#*B6!0?p5lXcN+PS1!`c(tp+
znuMjLB_`J!RG{h~;qLn_E-js}PfiaUJ2P1QvH6+4$78NyV=~$BSr-xd)Z&40!eY|5
z(2F59F_djss?;|ykmxK1L(V)cEF^Tbyf?hGvQq6i=|$%Gj>215$!t1+t8v=q^>zMn
znBdm9_MtLhA5VmFwDD}P-M01yA@{diR;D^LEcFW_UT+O8)N<7)%k^<H%bkf3IX%5h
z7O&>U_HcZ9x>Q=jIRi_r(ew!(X3C$oQ^A@IaH<h^A=Uou+|ohWFlB|oTnJjV1|lx5
z7Py?!Catt1AOSyJyk6QmI_{d9v85qo8eXqx0(z6`8BLN-0-Mq{K??cZ14{<BAAZqj
z+n%0Q=eQZqZ?Dg|9S&KLv|QUD8>Ea@ho3Agb!~#~<<t5DdZwp+fPs=sD`izDG^tKO
z|8m+y;|*~E6fKo@&m5uNVEnhyS=TUbq^K_(4QOxp1;TUMzVM_WX6%k~cIxSCd+joO
zTrbOPK17(D>4}`SJa~XiNruHkz~D~jBQFc1=xaV^mrSrZFt^+v{Kp;uL2B3Im~G-a
zThfGde&YriIVqF*35VKZb#8z<8Xz+5s;9<)ZQN`sq5OQZFz)$>59p+G0lD<rRcD`%
zX4<uxhTlPjk_Wdd3j}?;jeze3bDOd|V9u#rMUV^uh~yUWe*dCA&)=mZjSatYfYoGM
zDIgoPYPY|W(&K1fQ(I(RIJk@=3PUhDIZAz_0uBX^aK0>&<%I9S)MUI}4M?=<v!V#3
zW>3)ToSlv4cb<iJ0O?s0AmN;<NrWFaQ)2?2XQll}&v?+tIl=z!wfF4V=BCl>R<HkX
zh!T26%=E?x=xdwowjHVu*#Je$<RD@}b1B-mW_b!n9lP#N#QhC#*Qtf+?9VC2r}U1<
za!JdRR(74!h4OuD1@VOn&Cz?D#;1oQQp1lgoW!7r$w7FkYe)6eMGNuEFExpyD_-K>
z=0K!j0+hf1y?0>-lrmjrwxgzd<k_m~(uH&-tEz2B`DDk3Py8Lt!KAjF(Q27VX!{Ky
zfDu)gG^)E?$jZlgOf>fe4-R!1D=XGdVK`Txfbg$<9}-61&ANG&-2|Ijb^kVq@Em>p
z`~E~f$O8Zb1-7?rOsn*(ZBbNC2vW%(w4YCqU{~vN)g<HtwXgmJ<P||v`BChEeF?dC
zzJpPfP?c#{C(CxeMdm7ht*&d>PZQ5=x;Pwd=*3WJ=?)@(b+$ct(*5NIJ~=lH&QM>q
zSEP+({)oHVRWU9G1GDFa&r86UJaomda0%+ZE=9aP+4#=}NGhSSE&xWgP<e(D9FWo*
zVdq1~AI<uFjoH}f<#c`jp<n3Huig3H*W1+^aDL!%{e7Uo2$#b<P5-02X~EX`<mihq
z^7ATwVc90)(8qs<({zL1n(Krb9v!7!8|Zv>)-|;h>@A=T>%ThRV>BoztbN~<Jma><
z0~aLjcr&1wyqt}#|Gdd7&L8(bW>#&{MN}x1K8)f^1R_QNP)a?SUTAbA*MiYPtg*Hn
zU*_LE;7^2@|LoUlyy-B?-g^X79W}K4oL@BX(!xgxy6c%*^6%|<RH?DTC`F$n2h>JY
za7b;>^<>l&jrk=d1B><;)i&D#Oxns@4<Kcd>HUL)nNnv05!shm-QB`J!8K%n-U^Tq
z{WCTRZfSu;S5j1I(PiKKyrc)?ay*Twseu8kh}!V%{Aty4j~5Kov11RFZf_LHwd9dk
z`{|#$dPV>}2k8kF(N}Edh;X*@yGiSH0%Tjd3I<NBzvAXdOtr(P(DD3TP#@)l)xtN!
zk2(A23=ZUf=cE87Z}__fWQ*GiW?C{MAizZ(N;$%Z+}J<Kzm@tpfuboZ`IlYX-xZUk
zW2vuP0(&zuBGJTdB{KO%u=qf&_39cBCtq32<I`GNz98TS08L~-?hcz|z2=?T9QHZT
zH3bcv-*fZg`46}e^%7t#f2`sHc8lWaj8cv&RcPb|3MTvGv*Dh1+~v+Nx^^g3?owz#
z>vZ$1;K8-)4x~7JJ)`bPNu~cB8#unV=LL#qZ)|~AX?|y@Jsdlj$(P*6LjW6$A`n%S
z_7fRbqc(WOYq{&Gb%X*=4TiQ`?R$=Q(5kL_-?O^D2J!(|%!A334A2|@sjfE$^vpv*
z09i9~?O4z-Ym#3tX9F0N`1Tw3BC(+6s3=4=F1I@ZwuZJH$^xVF7dZTP%Kt(iAo-3+
zYs~gM%$%#(M2hyxc`q{dez;r`i~8^jiG(|RaOCq+tCOezjFg$)QeUKCp~||b7O=Ux
z#EI%vnP2V)oS1om3>3y6orv|~3XOz@`WLz$R;%xBoYZp}^;w%lKY&R2_Ut{%KGR`8
z*^`y!9|*Q3SFaZ1a)w)aLqe0+x9ftJbkg6-gR2!P3<yIV9UW`5UJRVigClha|GyUC
z211GcJt4@)d3a=uf@gMkgzDv3cEL7LXyH<HV{>qH&``%fs+J9p!)+?)z>@n1Hg2C^
zYh%ji;fvm?3obU?-wZ$dkn7>r&(N-k>6GcLah;8~=d=6knDt-X722ILeg(9s4?fEq
z#b(=&l^y?gon0F~Z_IC=mpjY-6t?y2*Fm8cwQbtwKrGyPiNN_E-}UOY7)sItEc4bz
zldEh0joNJIYe4oc?`}`Az6Otd`VUX8tKqwp@N^EmzZ>8|%vJWVM4A4!H&?tT>^C$s
z`&6axqw!hq@|kTPMPfT&<=l=fw&t0^^Vv1LhlYo}9@fKthS57`vsf-iW(?AOcDCOl
zM3qS3JkhsH8IgH19si7o{`wu{fE-Wc%fesf>$S96(bC{(S!%AW>8|SNsLX#XoqC53
zP1`Q(mSSKwVi5cM0UiDgIrbOT+UD(=vC&2QVdmo)=cT8tXVi0JTL!3(&Pz8rHI4oi
z+0?9~E^T09<0IBSG4Y)Kgr1)Epqu-kTIU$lc7N<`gBmh4ETzxCQzUtDPLXkL+x&KH
z;iZvYk#<18y<do*Q$5|aa9<i6iL*TNPg}|z{5m6|vy(yZOi0P|)l@s|%P-&{z8%3Q
zzI#W2@am_x^2k}j)bgRW3fbhNnTpl{-pr!m_#pjXLGFb|7amXkQt!#Z!64tYk9yw0
zDLGkJQ$~CyPJ4{aZa&`UNYT$5CO*&C=I6}dB3&UNc>UFvc?-=?SbKEZ)89|9-{GuG
zSq<~E`bSn;=56!+j+v~r!9rnf#tv&{J~6>jI01TqK#!O1;obEEA|vft)H!F^Acv5B
zRHL-Mp}K!&WMnP$8^uubOPdrZL+bzZb=FZ;MP0iG1W~#{Qo2hTL^=cn>5}g5Zjmkz
zjdV9icb7CsOLuqoUA*@l-@Sj_aT$)GDDJb**=x@==X`$i*<M<V*ZfyVk!0v&l`GYZ
zyiz8bj<Eu&zeq4KO`vQK+KFpRp97L{8LZA*&lwvK`zV-ms0T#kq7zd6%FAuQJNK2@
z`s}29Tt2=hm2_CT?cwhBs(O$23y)LQ6u+0&bP?SkWU%}Tmu2Zwi>6IW+(tJ1XWr`a
z@{NWchso2n^Fwb_WO!u^vi;1BC~5O$S4busi_Mm-Tu$43e8h#UsY2Lnb`@OV;U&%-
zJ`~EUtRCXFcmLRJJ|C#s*f#uY$ZmhJLTnrrMRh21hMh~w>kMmsl;(N2v`<4nNINvT
zIpLzSf1$LW@zYj3D!nu4*)?R~OkvO5;&yA@rI3MneJg-beDUw!Xx|L9>GC`12n{g^
zS^DTF*Y%=0wzD%cH#1_sdfe;^2>(1+)#*(9oY&OA0KL?9m|V$5tvX|jFz*1#vTp|c
z0IH@YABM^BX49xZPR?&%0^?De^Vas2ui_EOL-*wZa^A930k;j!XG2{J>`b9sd3p4a
zZOmi)j-F3T`wMOMMtxk@FrYz_lg>Z4f9jk&l(yaJA_!{x;t%epPDu+*gQHO)1R;}i
z0n7rP1TC@>V(M>od@h{nUri@fI#;ADe(s%%K?=cJC>=duuKwUSGBWaTzr1{M@v6>Y
z?T=q;bRjmIjr!1EY}B*P^=sBooyoUv$yxCU+%^|SH5R!Hj>xL<IVP-s&6o$OnshR&
z)uw=p^ZO)_b#e+60Zr-XyxgID+f--*vte9mKGA%tpTtES53qAV<2OF4^%>j9h^MMo
z?7aQZLEZHpA*CB5JR*Wf0Lt~ypV`*wd?lW?tHDkQ58iuuM76lK_Uz*6z~We5L9M-d
zmGoolgGzj<>l+D3!IZCyYDh4CZ%fpt;Xyfp?i^DA&WAJdW6!Hs>v;?9iu5+yD``Zk
zaU&xeqj6h(U(Vxg4WF&4s7C5@=y!y*y`CLD8rjD$u|s;;)@TPt*HcG**ze5_kIu$0
z3zRuNx?jVr^@SVvM^kz+qCi!dj8d^N29#VJC6ms+Yg8~EbvWf)v7dSMI>71nw$}OT
z;XHZD&?M(4_s7J(qlP%_sE^1vIHircd~_B>{cgERs>+oveJa*1m($iB#y(kJbP@<S
zEmubPj`dF$=^O4lsNuV*@;7sP7C!3HJZm@kgPYllaYWhRLsBr}&y%bCXHvbblvW&x
z3=#+1Q55a_LGq!NTjQtOQPkgi5|NYXKC5t7M7+KCI^}z~RrU86A|m`$F>m=i;4_RK
zjn_`lo~l+|$bwLg73ZF=w&87^D%Xpd+jbOr+=FYqv;gCoyxtchDd3g}_m+IF*85Vq
z2EiS}KhrOo3~rRa@%v4G$jlFjg(bV~)xw%$VVDJpH2IiLzYKqu!65GG-URCDsRYSc
zxsTUmc{pMF`6z#ohI+@f&O=qX*scT4DBh?;R9S|&dO%~|uWKD2be(5GVe&iYtD`)f
zXX!JDSM&LmrWc)r+~1=&CSSjzH8~$`=#Y4~%jx+1Ie0tn`B?5!Ag^+n=Sg&Sm`}pu
zqQHO>Nv7?7AJdAHuQ^-e^lA`S)@0~MVRt0q{LI>$3-Vv#;?9=ZgI;wb8y!Xtk}2Gg
z2PHCFL%Zpv-X0zvDvuAC0-mSn#n0!;I$;y}&G$V~J5IdDa=}|$AtLfB@#jx70tOZq
zGbSGnXPe_)w4V@*RZBbP8Xk`x{bcj&c6nS+-jh6>i*VZf>z>@LN^+j~C?1i%ke@{H
z-nQjuTv}%t<G$K8pvL+?x^1imsW-c_URg2V?nb?I;D2&QG)N!m--`GgC9tWKbE$Y;
z!=<-8yMTlJDUe^Ry2wiZd-=E{B`tk>mu#cf;?BXt(;y?2GO|HnW4y2-dO%c`I!p=&
zdxsIzFFH_&d9c(NnW{Ohs9J0Sx>*ZO+eG0+d@P!`;EO@6{tW><x{t>;+j*>q-;$V?
z;xPT_M;Uo-oVF5eF+;=a+u?)!Z;L4F;D;aX_RCA|HgRRsKlc1a&kiPFgFp<ZF?iTz
zXVYZ`GZ3+`H|!2pv?EED1}pqMK(o}~>A`I%ohu56ofcWxle4pb&Y7Fr6Lh@$TcSR8
zeV<P-u(F!46Z9+2YiLM9F80}2uY2lU;Bjz0ZgD9uOx<VhntIoWSXfY?dwsNc@UJCV
ztI1hWL!mR6bv>Af-*2ZL0(P@~^u96}m{*XkJgPJM51)CQzGF&U#W<QW*YFapQ_JXT
z=)(Yoyd}@#ADDIicsIKqtEzOiqR7m88>l|>STdBhanh>gdC{v=QTrWr$tV4D4Ao_g
zWXtF4ca34ROiaczWm*SMUO+G<BxR$I5$ezr?e6|SK^6HY)9wdy2#&b}%nV#l09*=x
zlIXu(!@siW?>8Mk=!g7(kc+bbs5wt2>4keK3sKQDVNH^G;kt02?=ZelsW~5$4>cQ&
z`>KtwqnTQp>)&tHcs|eF@37NpyFR%cwca1?7lo&0ZzC=C>|DA>$Hee>KXCU&N5;g)
zidtKvXxo##4nQ`xon-mmMTUpPo0#$QWS^A{whS7CUNN|a4Z}Q$_ZEfQ+&ja()ZEP0
zw1OQ|@kqRplT|S1@BI-V;d?iJGtk4s!<Gy65U!;M__?{c1$LjeT+EG&2N=>B7O_~g
zYR~7_mTHf$h>xs4o?lEbsQrf8-*=%YyhhT}oSdAry*f|_Iuf_n9g>Nnf+UYe{N0_q
za3?$)4LeM_uh0z~N~eG=nzvsEcL=2yWtlJ3Smj7X&Q~ElZ<GMI2CS{kuRoJNJB#Df
zDI@#COQ5}b*FTnMN=8opqJgon{4VbyMx&snKEIq<KIuXgK*J*(sGd7d^6V-hc0%!D
z%qU^lzCKKzt2o6~kV`jw`VLp3<_+S^sTZS$PlgS$mPc${oE<ntpt$@Q7$9S#4?8#@
z#Dcq(%u#rF<$sDu_`^n!Wy$-=)$N}2{7Q`K8mEyTwhTX}|3_tIN@cYEfOIGgt;*Nf
zbZH1#Le|5_&@ile4_6G(RWX%(qo<eoBOm~si0F&0?aAdgha*mWe0;SwZ~kJH=gw(H
z%@b7o?i>PZ{h^yeq>zx7BkD#DF0L4e`!Di)Z<FJz2*aE-N>Ww`-1#=E&y%O<cFGq-
zsK=?XnxJu0(af(uQ&Yb<J9Dbf%>g)EUQJC>ULIXJ4%^jr;OG4fY0Ui!?RCfgf(sYw
zJCL8a{@LivN!-T+dBt9l6y2b-eA+z&GwlZwBTBK@cpL*OqX-{g0dMaoSXfvzd<+?&
zhmn$!{`m3Z4Rf@14nTmxeO2Ln$m@KtAS5P6N!}Z7a5Ec%MD!`}<j;<UH-Gu~tfaFz
z9d#7ZR`;qGAzw9Wg_;Zy2)IUDLkMh|Pu-J*+$fP4L}t)0FE44Z5D*X%X&D%Dz@!q4
z7->&W4^{$}qPqNNWh1z&D->7ve!KG%OIBav58oC(+Ft)$J=hDJ?7=RqLL6Z#lhpba
z@Rse7FhV1sNF$^%4?nI5-zfq^`3py!QSPLYYE}tNeo-YM$PWgJ=qNB~we6XK<;m&!
zIeGgsDrkm3JU*UYU-ylUqN=KPTx$5_{{H>*<=q)<Gog@t5(QIp=#X)62eWe1#s54Z
zg$?*YZg0P5AzvPR*Qjw;$)?c@Xcw}}NxQ!zY2sUy21AJz6f&uuv9yYB-oD+v(Sxxq
zeb+cLHaQ8p<ZwXkz{15<R96R)<*m`?W^6)&qH=CdQ4vC}!si-=&sL?x)D^H?TrMeE
zS`gkQGCRAT&kP;%6uqCx#26rJ8x-Oc@$c<1lH0;46+n)or~d_h$4TQnbHaRlpWT$h
z+z}s{H}!RktaPbtm~637c9FQUVg%SAf9>J;8=Dyg6c-bem6ZXCVRdUOP=-q6h*E?q
z=4HSoKcCvZfe<v3q1V5NW;hfm(M1yR^^Rvt@OZDmnvAAV3NWK4EhMjub=<%OyuZHe
z>tjZ<(ec@6ee(J=ty4Uss8Nzp|JygZ6Gkcw3ya>qUsf(Rryfnf$A^qOJ2))NXz~vv
z9G?Th#pU`_oEwzG<GaQ(1s$Czg~H~IuZ2nlQ|6QA$mS8RBQzGz3db`PrZT4X#>_c@
zAHeUbDli}dO<jRUK%kk@t$%QEP*GJUu|WYcKO6~aR_CiL(7e^NvIz4xke*3wY2mMR
zW@I*&kU*d2WGt1g5H;6!G1M~)sejdjEv?1GqpDimH)~pN`41WSa%;K9onPEw(3wx8
z1|O43W_Z}N1|KT?^(&_ucbPn6M-9e^K=-}<eemJpAxG>u;^Xh_n-!Ex<WG#5nu-=r
z>FVkEDeZ-e(g`udzlTVoh4o10Vx;7b)Yo&9L#k8S#u6Kvn%0kwBGnkI6}|oTas4|4
z0cQ_}iVTg7qmvWlw6%%h;BI5Fa6xJi)Rd3pf-0AywP<%9OA2XR*`W|8a}uYp?-bhj
z0p3<58SC^k<47eVV<}qdM2$vjJP_MWu0c57sm4coEh3#OlP^}RqNrIcQe2kVSP5gK
z49775Ty>-hi;KmM4n@GUh>(yFEGhySFrXq82}DCj_w)A`Nq=;idH+3g-wZ^fg3?m4
zY%_V72yqcDEh2DlTBRu#PqA}x8CaSNXIrzrzeK*AOq=(RDlgB?%!G!@&5mC42tD!0
zy$okhl?|&%U8FL%*#BKuXHgeN3z5{+3JVTy|Mw3eAPWu59fA=hTW9CqP8dr|OIv#k
z1EDY>XGcqU*$TDr(o#l+LM)I-0R<eGpn)q&29eZAt*WZRM2ZtEw{KP5_Oy{TGRnQJ
z6VDdQp2`|G9ouyT8wwO7u~t!6oEomCf%1}j&>K*v9UN%%zR6Xf#i+oeuD~>p3vF!V
z1)@`=3{@8Zi5tE}g2fJ)r`g#zB4jN;ba!5VAej53+1x{X<;W`oJg5X7PF?{XH?>g!
z*vS<Y(e;MEbI8?4c=HXDK_8vVo_tV!sqp^#czIOIWl_x8*%?)uY7E-ySb~~`MUpa3
z(tY|%tP-7A_V|S<AxJa)gpkOhnq`*-02M!J&H<!NewsKz6EvhnD5`*1Z8k^YE}a#3
z>frbG{f8HiDk>^NiLCy}1i+k02_{vD#qm|*5{qMPZ7q;HGG_KY*omS2o<`okcIqF4
z9{R-*_9dC~@~0?Fsu=jmSmR%xsZ&Xjc2Da8Lu6jl*td?3wln%IBs2Mw7q3Jlp-`^E
z<<I{f77GsHprQ|RlsHNnFCP=l7Ye2z^EKl?*&v8iZa6XjuVwH1Qg}+toi`n0$X`Qg
zdvTYwLk2rKKrgXTJ49MAqfI}8LkJckB%aVoNkvr&$VB33sSLI^f!4kXvOL<Zmr~!Z
zuC69$W?Ve8ecL%?vE)-WEfYFrQhAkG9KFK9$4;{uOD-}^Z}&D3<bnY-S(2o=(t6_I
zctUP&JV1Tqr-&1jcsbnP`M{%QE*xmT{Uk}UriHAk+FIka?hwFBHwEQj{O=QVpBMwl
z$Xf$P7?^MBGn8)@6TBi`UZQ0&iw!>lEZ}P?PZ*fTINQ#`oM`i+CM@f{$-;w$hN}NL
zLQ!FF+|nG|@ZY}}78Vwn_X;bGefSogZ>i%ZnF0WU*`dqwGcImQB>L?)l$VbL3Ga9I
zwX<?<bv2d-cvV4$3c_vIgibXzH5PECQHXdaMHK$ekM`8gtYIRh`U)bF;|XDW)<U7i
zYit#Hxn`{_j^7PTp#A8%96=&N_|f$@JjH+C6uwz^;L?1(yy^JcH`OfRdK-|S(6ZZd
zLJo5*u#CPh&wdgFN5IP5R}jpw`Q4XBibR^U!4%+NYx|y#E)*c6mp=_*4oUGEp+j|d
zU}5i2GVkqmU%m~0t2ZPgn8A$K@g{QoGJbAnJe$Y;!W31K!j=bCgiFw_8=_(E!T2eA
zJUA{+xx9z^{aAVkb=u>>v3)&=ZP77J)0?!mmoFD*?FXj2yUomTULF;g`T_q3EKeB<
z2p)^08~OC_-z@C-$VNs+{1i!onlC?2COlajIAY3<0IvB8A&wfF+{gRbnOxiW`1tPb
z?l+~4+Tt&737yPw$DQ%hf8H4fX5yHU2)yvMk<NQ??ou|jJ2F(5AnXZ;fn&gwO^)^S
z_96t9C7>^Tdxgefj&BNZN1DtZSPBJMp~#l)cUcUj<>l0rl(|#K)z$1(378-R)YV;6
z+U4ZsWhv3wfsoYE0S$l+5C8#vvoqKI_6-tRAX|!lsC>rzWJ}K9(8&0$YsG_s=clKu
zKxOqj?ZE|Qm&4v9Z9Ic|=h^0<$LF(sRIn=0=n8asC;G|4G|cVVq3KHs@`+!)K0gk-
z-AcA`y;%(c*aW-=Rouh!^CJmVL_`G03G5zja#74L-T8BKb7SM<^{uQTYHBzLxU69{
za9U9aIFWR8mWgF5d<CDy{Jt|<c3{d0zwLpBzu1{y<lP58I{->u$^e80$U(s-5hd`%
zT~kv7#?v4_e~t~(*0;U{nhrSJ0UEZbL9GR=cVF0X)V^U@gQ=g7SF;8?mkG`e|K{h}
ze4ZXS*BxA3Br?D1vg4b92<=o_RyJbE4F_9BZC;><mHjoN{WU=qF+K~_d+`NhZiu9)
zogM3IkwGuqz1Zw*au6~38E!8lSj4#me|H47ox6wzGc_0oV8<j*8gu*j_`F6XUfAM@
z>F<uFl>XPewYK(m%ME<!fMl_AaXHS}fPtAoQOK#EP`H}MCwJ*>7`6?=W$qmvEg!Z3
zEo`ts>4Bx`tJYh|$)$-+s*jcZ57}ke>w0x#!?FMN<ir*T!T*rR<D}*tZ;i~%`aucR
z_`b%sy~dw1zQow6>FE03JklI!wAC$p6G%w(Ntb=5zyO(Gqq3~uG+3HYdI8urXIqq|
zjj!?XI)a_M7&WSQq8B^F$k4BsJZzfu!0rV$_=FVD6YCltK19gDMXTpL=?L;Uw;`-|
z)Q=}P-0w}{aR3I7y`5Q?XkCD7ZqgF}&#`^&=<CQNmiAJRIbktot?^J%QN^Q(7x%sy
z7?304GBsO%BPJ#;ja4ume!0=pZ-?}!DSMAR>x?~`?~j^FjhW_WXIZ=-ZipfBE2!X8
zX#d?E&E<wE@w5Z;PO6Wi)8n|MP8rc^vOxZiq17lFUsQ5(vKyp6AOH>=_b_tt?VE2l
zp8W}uKNG3_)D0G`XExmcDhTksj=z<gQ~N6`?ZN1W*S&8XQNL#r_%3uZ!lFS{)2Mo2
z%4-BPY~nav=f=cL7&S4DuJ7%cYulLU>5)2Cym|A@7mK#-1krgGnvtJgA%`gNe#Ia4
zca7D%_2Tk!T&k=Kn3uz;>2?U*zyk);x67z+dxRVZfX6bh?Yb;1CL<}b0ieVMG4p-G
zpq;a|hj@~2`{e+4@9CSU_rgE0RZ>4Vg3%3qFrBNWp`mYM6BQLD$1LgYMGgYNz?TJ4
zmJZYL57CfRgem}3f(s-mDJe*Is7A`jzyPv{L>Vf5ef=^OLufyXXjQj3L74Gu8yBL*
zp62rrKJbrVjMQC?7a9t2;<lC6Pg^2;T$crJ%#?j{YDymDrW&Q7%kVB$)<j#WNTHA=
zNd_-Myjp|Nb|fxA4xhkg@sEG`rym`<rVjGlW0m~H{Xe8i^$&k>gcI^a2M3da6W0Fl
z>fj?MCnq-#&+7iZe?$Z_m^lMpT^UB1x3|zvz?~D^W>6p{;vAi>uBj2Di~DsPCrR;L
z(bNxGOhn|BMk!8&xW81caPgEr3m!<5q5hNb+^O#>^xwO*jb@eOt|qSsiDzd5ykhEH
zMi4aUUT%I(O^1yWy_8ffJf2D?F=aA{u8~y$9AgXJ^z^hbKW2z1NUwegXnp$z*7H_&
zsgWp*;oHEnFtAHzE78f*#ewV}gl+ShU%!6gpS#q&oPxEJ7D#tl*t4d9!)bYTW-BpN
zh1&OsQe;_Ki~~YKkfe)HVANqbA|iHUn8;M)5qkv1gW?SZWp=ju;*_sG^tZLO#}{Bn
zz!8}>4cFFK1f$A@THoHzfsZsfRnrnu4A!c9X&_ZLI#j7RvhTQQMp-STjEENFYmryF
zezL{ArtDc0fTAtPZ*3(`trgoXEh#|@qnzcNH2|wZluV2QgVZUWEKbrko_GC#p$8C@
zg-W5ory6{wQRmVGu;mOeTDi^5DQ9Q)boBIvB_;nYx{Q>um6es1l#~>-v?4T0g^S0t
zrp#E`*;iIpg8%ft1=Sd+JgBMP#;e2!r%<SAsISu4cMc5T!%LvM>maA`l2`)FTMm%{
zt!~`k-aEA@Gjr*HbyK*y2>&-!s<?l@p>X-sn5DURx$?w<rEvMg*W#J%8ME<SN7G3<
zuwZ{mrJ_qyyeyElweL+$eBgfl^O4`y#f57h0>1rEO~!nlxXJ-`@NjYR&CN~Ywn$J#
zf)h?rgrQVcj#E;mEi6+}C@slr)Cg&5dBs##CYi&;2q(qRF<!W-2uel<r%(BK7^2&s
zhyY!R6;e@A^HNlfjG*w{@AnDWJ1AoErp5=}@q+Dd%xsDsAAj6z3X~Mp<~6rX+WBJT
zQ;BW+)#mJU*c=>FpvEL5601*BQ~@z;VNo-7`f-6LNyb=3*T&|U6L%Nk8v(en09*2B
zaF863)oW||Qc}|LGzh@{CcC~qF*MY^grW4OTfd#1L*LvKa$yy{0xlP*d2H>@+vj?)
zO;ou=$*2iayMsZ2o6@a@@>}~&i)@&7ey&QnNd8n-nS53e_*E#bTq>%i_$8teqo!!n
zMcIglV`>U?TF7GhPtLDFS=%={0}tjdU|zi%4oXec(xE<<YN$ol`tk)CApj;oSjgM^
z6WDLDuoJ#&Ys=cnqhrT`4^jn`*6Wnly;F;?P?HEls`h!rY&qzC!-|`3>stIz)(+@F
z6IiLpd~zF0Re9p9C9e^|=?e$Gau}IvY}{96b-&6Y3{Zb~dU~CloOI9305FT$v$^HP
zxpjFty}ey<!@j|7pib~PtFRFGXn%Y$t(KFc=HiM<S@;G_1!-t#+DAr+1)iarA7M^o
z?^lj?1A>MSLE-HgOi2{=S*IKif3FbqGb)>_r!q@uvVqP+CiW=~d-G581^^~s`b;Mo
z?>jp?@jkk;0RA&rG@+5|Kmy59BwwNM&&UWBzy}{5JP{DEHs}$)Zs2Bor2z@r$<>wE
z(Rxt+0=!%U>i=#I)w>P6^jS#H8_P6QW(dBBlTQsu710e8fERD9{2p3~5v#nZ6pN#%
zkdske|I!I*_VPSAw_x=Y@`Jv)zsCe;0$fJHDC}XR34$Xk$kxCdNDLsNzzhg&VIkm6
zW8zW+)EG!97+{`-GH-6+SJz2=qjbXTVt5fP_&o4ID5DfZ2*tj|qCKOfWyoL=NM0yG
z3PnWx>2Z$+2yG=L3Uq&XHoy~t5PvsVtNpkP822eiTAD1tnbp<R4ULUrAP^xCT=66D
z1)c>T{J%r)U$1N)h9yLi*xLv+dwSYkUtnm<!lVl4Pkq(+HfxVXOT)~V)m$Ik`JM30
z!NJs$9gUDsSWS&aFEjH;8Xp-M8LU8nDiFokK)fXs@J_+(@28+7+P)}MoaN(2L+6MU
z(i3@ughEcko&xkf3I#ngX`dcl(~S3A$qy+qXH{(dqa*LhFWE!Ce-suG4k7rIvT9e+
z-P41Pi#vmhX?z!zX<=?o2CB{%Dst;U9SlEr?M~#&V`06&zM_234ZG~C``|Bpf{M^9
zz=CI^^9(%`#Kgi<SXLwoNf!~a<`lc-!NS>4NKE)*?TjO<&nho3-`y>WNrWv1=6pl~
zk<g9XwFIrK82j`LLb0Hrhz4Gs5fDjau-xi(z-Q~*1&>N<Z?7*YL#QXBk4MNK9$b(K
zT7^UcGP;5waK$7!2VSsI_e=7B0b<{Vp$W#jcRfGet|zg0e*{DEB234pACCz{W)>D?
zfIqQB6!GRCNH*ao`yaqgJV(Jq7#>ycs~UxWC)t~@U<w*T7L-my7(Z_*5P-x&JuCl?
zM8_nF%No=1yep(Rb2vS{H0lmU4}Zu13$&pyadBN1Wx~y@t+#GY*DaSS0~j@Hqf<P;
z3w2~75n#*7ESTy`^sH|(S}u6BWX|kz$9Tpneh%V^a}1uKjy{QXv+t@VNaS&N{r2r!
ze%7TKzChXHsY>7;08B&wWOfDdq&X78OGsoHNT8v!rR>b2|3D29+Ou~PumdGL91yKi
zhS(KkQ{RI=pMoqEBq4ctr33w?OunfwNc>=g0H|{>M)SJNnf<wXJ8~ey8P3;Q&GPYL
z2)N;&#^kZ;AHa&rrfSMC+CGjMvPU~#VFg_stc;}{=A`lu&)&Ei52ti|heHIW*E^A>
z?!99i?CiEXW27$+2Dm!p<96GlK!>m*5%9zp=#hsIa(*iqe*4V@2uz@jy>d{v{^GZ1
z5Of7vP2!!CupqZf1SYe-1jiPZ|2dI|lXaiDdc9X7SwXCy>|SH$ElKLys_BGLv$TJm
zQF3ryX1Y3F>P<V;3=R)9oU^K{Fdfe-9*;O;bEJz4b=sdkJugx|SOR7?zJlVB$wPna
zV&1VDH-AmWM5_-5DvH8r%Epf0@@L)~KI)iA41AnkF#W4muL})AkQbwV6BZ86*(j>O
z#(sIL_|bk}1Q+v0;M_T+AFeF|W>G}Mi^#*p+GxH}nebmz*pF`5G}i|^D!H_UDG9CA
zOwfLMQIQ^+&9Obam%C2JPi0bB6GA48SGJDaa-*=(>X}&CCxLoH!dF*fa9xY+I@qFK
zZ%Z16yZp~4Tw6f_!=~jCMU&IU_%0=Yq1A)ZUl{(nMh#|$TO;C^lYq~t+_GnAaWSHg
z``KF@W^GGnfmvvE)oNi*V4?$0;`zqs8LIW^NJ3n$A%rn#;^w4@W1(_Gw&RZzWL0S7
zV79q-alhheZBYA|*)cXUvh14Oi^xY}_TL;PxbV!)x9IaR_O2()<@Qu;>8u9ppHny^
zK*uI&QT&n<<bn*^_5^IkBb{vT!!Pe;&ky#GuZtjIBn$=<<<I-4u6G_hyU2I*d=d<h
zO3NORl6jBN`D34Gm!;>QiJ4tDhjq)m*saom*3VCmGU=@T^4WbER@Ey(!}qt~G>5c2
z`#4x38(myFYspc|hZd|%s}m$Mm|X7PbizmlkK@qkEi8IvWmayvp8B^$%)&n>4jafl
zB>g_I{q(efS=Du%_9C*)XnUmY?BE^b5|`ZaCvBoWzB5s+(++8C+AZf@THYx?CX}Y9
z$1oY$Oy=NgIQJ8<+g`k8x!+2rWn^setRMN<Tv8H#i-_~V<_RV+;*0L!s$-h#>haAT
zymQdOW8g*XgcqZ5ayYR-ZV!5uVEP2EQFq5U1Wx*Rb^B1l^(?pU_HOx^^aI^5(2~D2
zZRSml<Z-ak1OD^3&WqN>9!DH0-O<DmRpe#U(4sz5r%&QOKHD!X7_Sjw??opV+;Tzj
zaKfGtOzM9vZ6YGq^EPehL~K});*=T>*@~N^IPNQmPSvo5x4zICjd+kdi<>EwkJ}CL
zWKn$ShofdnzqU^el~a$(*hWaGvG%6NBPd<VZH_1}_il`fw!zk{B-CUPzP9Vbb0XpT
z=nqMfqcpAvObOIq=>ojnso=P4Pq_|wM0*`6pS!q|920?Lse8B65l%w3-5{Yl=Goy)
z)S$k*;3Q3U>TfiZ#2&uvGe4Pmrac>xQKWLVhDo3F$(;q0%&XquNGXzd!Ju^pusS7e
zi7k9}zeYLUMU;*pqsCV5&OCn*(4#<QNVbq2j2yPOoft3*M^1p?;SS-FG|x#z9)v3$
z>F@@H$hU@vovf8<V(`SIOy&)#Mvn|`%9;Ev1G1PLeFCd@aLTDjv)f6e8`g$#-MfT-
z!?oMKBZF~dgRuh5TCH80ws|`87GRtKXFyGLvbkqf;(DNNt=0TP;Q6+Ycy~mJE-pMG
zs?Tt}eOthaO82W|U7sB*(WZc4sdiublZ{!jQFV6ZvdWWFUW#_v!Z0C0{~k#z=kooz
ziw@d8^VZGk<Cep5>lwo}v(?;AJ)8UV)N^jOy+=jsvYRvv^W*N5iXBiGgD-I%F4~U;
z_g!Qq+^6Ip_(S}&$>o|)cu^m2%PA;i4FG3rwdA5MQs;cAfy1ocIe6?fg2~*xWbzs%
zqgt&4F>1N*QSM`3Yb=@fKlh*bM%c$KcMMSH@e9LOUn~k*bmeLRda|;+IlObK$cyyc
zkGg+yin{Scoo;ZRi3O$Y`S59yL&|&3Ej+cqVdz)ekNbp?%#wOED0&O}*2jZa#O`}y
z-h99O66#1sKQ*Up7zEuc$G`HtSj4X_(-}@9()5i_*k7l|S!X(5t20pd1mm=vB~Q?b
zxY|lS8V%vmSum|yO)*4$RY~6GFfW%aoM}?Y%JT5$=p41-aVf~{U`}<&>~==8oW-VJ
z>p*H`y|piGb=^gql8=0f@W{r;8%os$mGeNL>nevZu)F*8CbXv%={7E}D*Itq=3lzU
zh4$WsyZ1lmL?@4EATpgyzH%9x_AEwydV<N9BV3IknNC`ic8XoLii5PS1txEuwpj(u
zw(h$e)t{GfPPpcR1Rsato220ap0?XDqUE8xw`R`BhCsVd>qD>`z!0`W7B~lYHtV^c
zc{OF3RgZdQfBhRMAmXnN8tZ@nEpW#3XttvzJoy9iPD+~7rO$4`f_BMqm9_fNkre?e
z{`1b$Qmr?K_EKv&9^Wa(JKn#=k!#1u#>1LJ$?2YbR?-QOR4=p5S}hS(C8ciuYliJb
zW*_~7?jOY1m23q?aiEMP2Q57?s+6=46xDhk(AIj%3dJ>&7L=QdJ<nCj8Z=k?glo)P
zk1Q=ch|;AKPR1Mr?x(ZK<)zMHk-*YYBE<NmE|9;0t1|AXvo_Qqib51Q*%MbdVFF~X
zl?oG`p1G+AJ@Vca5<D4iYaFP;e7TH2gR89)X}zGZni}?xixQaM#diY=XdmkF_PB|*
zIMsCr@TH$Wa)Sa{8x!(hO$`k+E_Xrz+zHM8G(Eos$Ho+(t;j95oU<<}DeWJY;?jBc
zemriz>PV1G)dFQ(qR0N>3sOd_Q0@K{m-BKlX%26B)Bzcr9F+D%|H&J=-tCX;W4g}i
z#I%3H<e1OHok4AhR!_cwb^EZ$YsXJ*_n0qe+S$5zv@FH>u1UJnyo1l}Ca#p!;O)82
z^SDK;K3{SAgz=*A!-g4msHj!^c-dHz{XhAJu=GSzPDhZ$QxN^@tMnk*n(e?5$(Jww
zBg5BqL(7$zJ_kv2+Vt6#X=qVfwn^bn*Jw%W@_634TWa*?sM=y|HH43fyeJab9WJ=}
zyx_j=^>AC551NCE+8I7x53F1ZAJf6dc~M}SN=e2WZ$wZ05;oru5%z;SP%?!l0pw#)
zAjAFuD6#412Y!GdW|!myv-S76UOqDOVn6AR5aiEc>N7Rqa8e9BJa*bif$|)q(19Ml
z8c;nzw1c9dXM$<(6ZqrF|DJpD!K-hp=D}_AaBJDd>yAH!ZTpuG?$$O88s1-b(lVc~
zZvbjwm6y#g+{Jw8j@T@S1GFnkE33ltVzzWXyA3EEuM1AlUznVk`eosGdFfP|HX+YD
zpY@+B68ex5zwFnM5MgrP%VD`(9oXh`!?D!*v~`|3eEbyn5~|wHn3(zPn6Jyf&Dr_N
zo-AH3JM3#+8yGDf?Pt#KmUwH=2K-ZbcZiTmn@<$ibWiN@8Yp?8&4d^3jQSz5-AN8^
z>jBiJ1?A+sW1pIvy)+rqjwMH#a<ZRut2VEMy%HMhKUfd2d(YPgo+{c<2vCO&O|muL
zmfJA9iGzT-d|}+rkILeu#El>EI%Fg2bi-NtENQ|dk;Or%{LPGdn&;{9!l_S`t?som
z%F$fM;(7jQd(5cAsJ|Qx%W-W}z10>hD8puJjEE|-*G`e&>^a^bR(w>AS&U0@3E6fG
zLp0~do$+O0s>)X%WLkjoab(k)J>+uMhbgWlVSSFjzp1%R3A32X+u9nOZchG{%*10d
z)6297pjf^?O#go<c0B22(SIT8c39gHqFQDNi+Vcc>XmC5KlqbTb-PINj@OeN%wn6?
zXmqa?yA1sVKH%S*f*kz~wXz*<mus3$ix1NC={Kue?6)c6(fBQ4!R;wgEYJGEn+)Km
z{=($kPHQxMD2GN1aHTx;&1p3~n@<TN@$+Gqk9oJ!uD69jpeFq7^hlSrE?)bg9d{y4
z`;w~#BAE&*Nq}IWVP6JiTB%}?=;&a%S)p!R!vzMq4@ifd{_Ia`x<Pq5?RWWjmymF~
zJ3l&n4L~GvGIPB7>2l-!JDtQTQ}u*Soj<quYASc?AOdI-sWuAbAEeAzWqtp6-cWKO
zaJMBUt1sLclo%D((x1W{+>qqs=m26df_>Exhn59_CPQh-P^qNv_mmR)=xbpGIch~6
z)j_W)egooSey<19<ZI{Hk=h*^A6}{ZTYM9Vbq=4qeS+rGaV~D|(3kf%wCzFG<`JeZ
z_K8eFzV0v{O!x_jxqYttSX||(EHIx{Y}CfKS<S|aD?kfbmq4-IXeSm=BUle5;E&Al
z_xQ}~T9~<yK(yZz7dIag!Uo0dtcyB7{oFZ>7+>qA^PiQMS1~T=q&!7=)cG%Nqt!$8
zWTGxzURz^fz0)ZW?79DCaTlWT{)fc<%nz2_&2pPS_Is|F?xZ?L+Gc-$@>`yyNt)u5
zD@0xWPRAv;O?80gntj0MakoXS>XV3Zrn(LNi$=r;!{s9P$?MoDHf|GZYx``ssobeC
zjE06HWqdvVWK}>rtFk$^@t;QP?Tr@Q;9$L*UYLAcbv4C%nje?N-h$aG@;QIDt5BEP
zdwZ`!4L?OC$PG%bf}IO5BI01KH7TO)3D?)$XcIg4yoXxFe!e6gS484=LjK<?f01__
z)*p`Bo<4#TeR<^pHdKd+`T~_2M|ygC%fkb=^L3lKCWm6T-V__bulZ;9oge<HhSf25
z8-6(LSk}?)X`yel`e=2OlB|9`;j(yEGV)jbv6V2D_8xajXL76_WzfvT(fS}qRF;xx
zZKJ|JJluwMv`Zpt9l%ZU8`~e~ycH6j!pe5UOa>2oK(iOZZNaqc^+ZY;0Jp&6;hlW#
zl%uMO?;}@X^=KX_iXuc6Q^UJlmPzo*lN)vE847jT4iSJr{7kwMfHz~6R{i+rC26{O
zW3xpa-fe2R5$B?b+Buro^rlpNxH@^O=HF62+bS-D<_Jij)Lgsp0N(6&yEqCWcu%SW
zW-!S?55cHFe=0o*IT`O&=wDp}gF%Vq=TN{*sjp|btz0!QG<(6x>c8!kWrFhle-gVG
zSZ6_D1tvNkQ2;T?Lq=Ua-K=}5iNH3+{w_k5f~&eZ{@ClnOxyd8luGQrVl{!pZM%vD
zk8AUFnuZ%6{PjV7k)t!!%i1qK_KD1w8Tp$`Rp~1JQS8>O`TRD@>PQ_A3u9!0xoudJ
zng5H5`ykT5$i{V#Q4X`2wfS1ac6vrp_0NRot2%3sBd_a433+c63!l5z`LsFo)T!gh
zoq_|MM4yO=UfH;b$N{a5F>b)rrD-qKd$>cR@zJFLv*f@CJO}0ZaHlPwhQHU7{}(!Z
z&|6EitL)N7T^{>aAC9E?3C5=Nw3l**_rmG6uB~M#h{UT~N82mvN0NiP%%7vI=IX>`
zYNX9&3m4FGDk<-2Fb8_59W=($(}lpRwP)NNBEaIi?#f*om{@fLUhdmE9cqt?g2`4g
zQc_5q+^5m+MuSb4b1*QAUqFT;$Iupculhvdb34d}t8+9vv#IlZM<(!i-1cyOJbJoP
z$>a5x@DT7NuRuR8&BGDyGzPQ$E&0r>>B>O^+}zCfFb=<B3FXp_bl^mlTSaAiK148g
zet%@mWe+71gkrSZ+VXI-8Pt5c76ZDMP5da(en-07@s|rtrmvZsPrhl2qwM4${{Ha;
z_QT(aB>wf+#0?hE*Nne9Mi}?`IAY4cpxgv%A|EXd*wUF>9zO%Rmhs?Uqu(ZCKAUl;
zlD<Ubp@kjn-A_>CXnWo10TMq?TdSi`k=hNYw7-u!D4_t=PRQpDtL#RKh#^toG2crZ
z2Ka^ImmBluOw;W+&P1)w8Tq<QZTzT3Ybg&X3~A3#*KN($Pxq6P1t4<EVwf!crDysM
z3#3qRSv_1Vjn|n4qLb_cJ&v0af`~oQbe5Nvt6d-OE<ZkX$NXu2RC_v6L?U5poiRc~
z^Nn9EBx$=#tN~AS0e&o<Y;pn->zjQ-<<<g?%RbMkHf@iQpvM9bJr<`eLQqOuaj*&t
z3TB)GV*Dk}XlYK{U$krYh7%3`osa)**dHAk+t6obYPzx>C9u_UEg-md&>8JP{L)h?
za~Ci76*Q6LaY_L%i3`qjbGj$Y?Ww`!EfUg!%-GSKUUNkS1QgStr88Bc*@ROunIykX
z#b&=iAs(4Z6V40-ND(j#!Pftokne=A59NsT^5S!^9NuVF0AdoK3lnf3@?u=01X37K
zkh}PfTP0*=Q9yD%3c5NJbk3sX4M>>vp9*N`_2vV0W^0d3KxB2@>40x|eu~qY3OizT
z#MNiV2NsdQtoX?A{)!0LTEz;H>V=1=%N!KAW(6X1-Q!}R)h`v47gHV{(8`hsNd3*^
zPvN$IfyweHsiJ?f#DQV$^@D{crQ@ew&>p>A?IXE8_IVBp$fe{O(QeNnFh)lwnm@+<
zhj<}3AQd{>cF$F7qxNNQH)g2O3`g3gDFQHv=$iBNd;B}zA}*{zGb7}-^(EqSsq}e<
zmZbs*-;<jBjSljD*_Yo$`?RMtFag*g30jp6bMI34-BKnM`*=Lg@aB?sf4~N@xDVlB
z<jDd=61w5r(oB{%2USeSE8rB}_Wao0`-K3=J>jW|?X#aJ@c3AvaqFIDK49;Vuyf)|
zesT^5b5#zeqs~&H2%jZobjLdbhLYIe$ES{eO`HcF=>rW8Xaw7!=}9QfD+}6L)N)ko
zySqIZzdK+9kc_|1>XKy{yhT8<aHs%R-bW-`1p>OL)+)SiNoHV{<Fos~I{?iEqDC2P
z1f##0`vG6d%RlzMPv9YpuQh8e^(MB431@wLeKUkWA9ZwW)gYJ%J4)tgVulRi0v+IS
zCecy$XJ7~%>@<_721p3R-Qn-p5?Q@?fp1(NaNXg{KJXHm!EtX%0~Rr0^m#a`%7o_y
z?;T0WR4J#X@MIxfh1|S;y^hQM=DGc)ef<L`L$G|pkX=FJTQC_jftWW_XtO1P{f9p?
z(n9$YA6#u=f!B7os02DDCNM5x2gY1pjLzwbs;YgU5j@vqLvnw0ynWIkBAJpJLc|mQ
z`%flPB;mkHL1r-J-&P#ujASrY(%&yh&cDh2jy9h=*)ul08Y>Vf#Bi<qtqh((+Ua`V
zb#>YWs>lp6(9?iq9|){-KCrR%4-Jq3fkZd}24HwqY&yrjLaz6B<kwdsNBaQIOJJd4
zvK0dY*gz;EEiF?{N&QbUG2#HXIhr$j8l?^LI9^N)j2E?FRZkC?_5&MS5rECA2p@~&
z1IM2=a8&`^^K-pV&X(*Jwvd(<FvK8!hmVo6A|VhBWdO4B4*qJ-SqMf|R$1&FSY{hW
zMn99>1BWIR4Rdl=4iATa>s5r~5%&RF=N+4|Ox;1{INV)brUfdX3IRx{zKx`#qQdD0
zcZ;>LsR#gI|4itH1^9+25-^_C?D=>aeZR(Z-l<5{H{6A(>LRE2`+--aSYA<CKCtpX
zk`BmJY3XTmvT}l>*Mz}xG&3#e>+6FT5byyq+FRteRKN}gm@5d2h(M$QR3zla0G<yX
z81-3JcB?zYa3nA1ClFtpYNFdSbiWICo|0fm>DuD8g2#^Cz$HFPAzTo<r^bWivL^rz
zw3o8~3|sD&jrM0X6ovrLl0c+)!Uw-I!CXED0YO+;n6yq9KMS&!1dyV!5C9AY2PR;v
zJymIF=;-pAo5TM`D*zVL&f&U!Q86%ICNivv`sf2snKf~JedFrdR%BHefda1Tw{MHT
zYnmLNIsIC58w%e7B-mUTXqZxy98;iAprjlt56Vc81MU?e(9sVRFfivA_6Iiwy^ydC
z3AoVE(6F#K>&MIXKw4Yd+@w_Uy+a40_{D{zf}-MQAlxxBrUH*7Al$LyN8G@{uI-Zq
zCzJ~;dHcD#yRGkTMg+-3<_}4a%`=SwMZ`&2n(}vLR!Zn!eel`RFe-diNR)$+k)*1G
zMU^xA`3e093Sc#qgax}5SUu~<$IEsUUR^b2JG}nd<@p5#!N5EU=&Imx4A~_m;cL+f
zMZgzASw&u}G^eN%p+*CEk-RZcRsFWOVCU@AHP?d-QTv`P8LqY$u140=|2aHH?Yks{
z*)0>~y?ykzX||h7SuHC@-co#^uF4jR<tt}T6^xs)1IE=+1G$Em(Y^Gw@-UBqisF|q
zPS`+P<>uyI+uI5(E~W<(wX17AIZ#^T!C>7c<8n(2q~Flh-TlhR9<C8GFdzk<%Jye;
z6gVLOT@xViVKfX3S>T)pLhZkO(*ng1q`$?^A%WD%uB&Ib>ziL(WBuB}nt9ozwuJ~W
zh&V;~lpF(6N>fq}Jzs&$TUsQpE-$Vu#semqz#G;zF^MWqXV%uX_w@35hlM2xhI?MH
zR&b5Bx4F=ocFJ``X0U-)E|nV%;LTX6+*=PPCk{~T)@b-km5OJpWKWxZEuJcvqGLBl
z)+i0^?G*=-_U!CGvN&D?3zMK0|5s!XJOVyVQGhla9#m9R^?fGmfI$SJG<aO1fgjwO
z!=lmjH0RbAxkDmC%~D!B3~8o$40P#~RWi!5iG3FQ`DJ3s{Hed5)<MRA%2LUGoiVNp
z9(iFD_6rE5Ad?z=#OKJ{GTz$*9yv%a@GkNt`{YdaM3EUgd)ACuVd>Pw>};@x@+)5e
z7psv8G2j5K2_i}HU%0rj5wOMpZ}~6A4QxbjJ#;(}(RbSLkX{2jF>sG$RaeIXi@Kts
zqJkm?h1`;?=H||l(WxmZ&<lAfSMBYE0Z5L)vr2(Ojv;Nwt6B&KGldwOtaB5#=_~a^
zumG6Fz*uT)Zh$oK@84_qagyY9d;;XjsXgX~^32SRW;e@H?I-~GgEbTp@w%#YYG&&1
z?3k}gcAiRkwo1NG`Ap`F`IuRaDZ9BNFXJ$9FKcXA-`WC73jxR=>YJL#&o9~+7m4KL
z<UBn+e-3Wm+}=9PZ?!xkb&OrU1{*RvJ3FwD69E(q_y!d8FL1*DkU3Jhow_U;6T47j
z=1%OKocb_IMfe~Gj`$CsGq&bZ4Iua78>GNMP9xSNrV1D17t*43{I0sPQkV<^1z3fs
z?Ce)ivSh5awTu(KTHmyOLxBbldWdLnk3RSVKwxL*=hs(Oe3j^c=MfG7lqD%TM@Fm#
z86$D(YsdF50k95GAOPsZNf|wrj++i`BS%E+RP*A$oC31A0VaM#U|wGQDB}2TH6HUn
z_)31FSjn7Hx?*7C1P-0-1m+`AAlYv;H8oRGG%h6U%f9abR^o{XCu}&b%bVrXGzl8O
zMZs4)$Cti)0D!)HAsNDoP`?LXwqFd8o9AYP|MRzRF3^;pQSH?({U!DTsKK+~p+1Yr
Kik1oMe*a%C^+<C7

literal 0
HcmV?d00001

diff --git a/Documentation/devel/pod-lifecycle.md b/Documentation/devel/pod-lifecycle.md
index fb58c45cdd..e373c778e2 100644
--- a/Documentation/devel/pod-lifecycle.md
+++ b/Documentation/devel/pod-lifecycle.md
@@ -39,7 +39,7 @@ To prevent the period between first creating a pod's directory and acquiring its
 
 ## App
 
-The `rkt app` family of subcommands allow mutating operations on a running pod, namely adding, starting, stopping, and removing applications.
+The `rkt app` experimental family of subcommands allow mutating operations on a running pod, namely adding, starting, stopping, and removing applications. To be able to use these subcommands the environment variable `RKT_EXPERIMENT_APP=true` has to be set.
 The `rkt app sandbox` subcommand transitions to the Run phase as described above, whereas the remaining subcommands mutate the pod while staying in the Run phase.
 To synchronize operations inside the Run phase an additional advisory lock `$var/run/$uuid/pod.lck` is being introduced.
 Locking on the `$var/run/$uuid/pod` manifest won't work because changes on it need to be atomic, realized by overwriting the original manifest.

From 2698e6c3baa8c36083bed507c9ccfc4a61ca9d19 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Tue, 22 Nov 2016 14:07:21 -0800
Subject: [PATCH 0905/1304] stage0: improve list --format behavior and flags

This change reuses the `image list` flag parsing for `list`.

It also makes `list` and `list --format=json` have more similar behavior
in when the pod manifest is skipped.

Fixes #3402
---
 lib/pod.go        | 34 +++++++++++++++++++---------------
 pkg/pod/pods.go   | 46 +++++++++++++++++++++++++++++++---------------
 rkt/app_status.go |  6 +++---
 rkt/list.go       | 21 ++++++++++-----------
 rkt/status.go     |  8 ++++----
 5 files changed, 67 insertions(+), 48 deletions(-)

diff --git a/lib/pod.go b/lib/pod.go
index 4516bb1942..de6688c8d7 100644
--- a/lib/pod.go
+++ b/lib/pod.go
@@ -18,17 +18,31 @@ import pkgPod "github.com/coreos/rkt/pkg/pod"
 
 // NewPodFromInternalPod converts *pkgPod.Pod to *Pod
 func NewPodFromInternalPod(p *pkgPod.Pod) (*Pod, error) {
-	_, manifest, err := p.PodManifest()
-	if err != nil {
-		return nil, err
-	}
-
 	pod := &Pod{
 		UUID:     p.UUID.String(),
 		State:    p.State(),
 		Networks: p.Nets,
 	}
 
+	startTime, err := p.StartTime()
+	if err != nil {
+		return nil, err
+	}
+
+	if !startTime.IsZero() {
+		startedAt := startTime.Unix()
+		pod.StartedAt = &startedAt
+	}
+
+	if !p.PodManifestAvailable() {
+		return pod, nil
+	}
+	// TODO(vc): we should really hold a shared lock here to prevent gc of the pod
+	_, manifest, err := p.PodManifest()
+	if err != nil {
+		return nil, err
+	}
+
 	for _, app := range manifest.Apps {
 		pod.AppNames = append(pod.AppNames, app.Name.String())
 	}
@@ -47,15 +61,5 @@ func NewPodFromInternalPod(p *pkgPod.Pod) (*Pod, error) {
 		}
 	}
 
-	startTime, err := p.StartTime()
-	if err != nil {
-		return nil, err
-	}
-
-	if !startTime.IsZero() {
-		startedAt := startTime.Unix()
-		pod.StartedAt = &startedAt
-	}
-
 	return pod, nil
 }
diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index fbd70ce5d1..0b3454e2c3 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -980,24 +980,29 @@ func (p *Pod) CreationTime() (time.Time, error) {
 // StartTime returns the time when the pod was started.
 func (p *Pod) StartTime() (time.Time, error) {
 	var (
-		t   time.Time
-		err error
+		t      time.Time
+		retErr error
 	)
-	if p.isRunning() || p.AfterRun() {
-		// check pid and ppid files, since stage1 implementations can choose
-		// which one to implement.
-		t, err = p.getModTime("pid")
-		if os.IsNotExist(err) {
-			t, err = p.getModTime("ppid")
-			// if there's an error starting the pod, it can be "exited" without
-			// the "ppid" (or "pid") files being created, return an error only
-			// if it's different than ENOENT.
-			if os.IsNotExist(err) {
-				err = nil
-			}
+
+	if !p.isRunning() && !p.AfterRun() {
+		// hasn't started
+		return t, nil
+	}
+
+	// check pid and ppid since stage1s can choose one xor the other
+	for _, ctimeFile := range []string{"pid", "ppid"} {
+		t, err := p.getModTime(ctimeFile)
+		if err == nil {
+			return t, nil
+		}
+		// if there's an error starting the pod, it can go to "exited" without
+		// creating a ppid/pid file, so ignore not-exist errors.
+		if !os.IsNotExist(err) {
+			retErr = err
 		}
 	}
-	return t, err
+
+	return t, retErr
 }
 
 // GCMarkedTime returns the time when the pod is marked by gc.
@@ -1156,6 +1161,17 @@ func (p *Pod) isRunning() bool {
 		!p.isExited && !p.isExitedGarbage && !p.isExitedDeleting && !p.isGarbage && !p.isDeleting && !p.isGone
 }
 
+// PodManifestAvailable returns whether the caller should reasonably expect
+// PodManifest to function in the pod's current state.
+// Namely, in Preparing, AbortedPrepare, and Deleting it's possible for the
+// manifest to not be present
+func (p *Pod) PodManifestAvailable() bool {
+	if p.isPreparing || p.isAbortedPrepare || p.isDeleting {
+		return false
+	}
+	return true
+}
+
 // AfterRun returns true if the pod is in a post-running state, otherwise it returns false.
 func (p *Pod) AfterRun() bool {
 	return p.isExitedDeleting || p.isDeleting || p.isExited || p.isGarbage
diff --git a/rkt/app_status.go b/rkt/app_status.go
index 35369f6a68..bd91c22a1a 100644
--- a/rkt/app_status.go
+++ b/rkt/app_status.go
@@ -36,7 +36,7 @@ var (
 func init() {
 	cmdApp.AddCommand(cmdAppStatus)
 	cmdAppStatus.Flags().StringVar(&flagAppName, "app", "", "choose app within the pod, this flag must be set")
-	cmdAppStatus.Flags().StringVar(&flagFormat, "format", "", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
+	cmdAppStatus.Flags().Var(&flagFormat, "format", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
 }
 
 func printApp(app *rkt.App) {
@@ -112,14 +112,14 @@ func runAppStatus(cmd *cobra.Command, args []string) (exit int) {
 
 	// TODO(yifan): Print yamls.
 	switch flagFormat {
-	case "json":
+	case outputFormatJSON:
 		result, err := json.Marshal(apps[0])
 		if err != nil {
 			stderr.PrintE("error marshaling the app status", err)
 			return 1
 		}
 		stdout.Print(string(result))
-	case "json-pretty":
+	case outputFormatPrettyJSON:
 		result, err := json.MarshalIndent(apps[0], "", "\t")
 		if err != nil {
 			stderr.PrintE("error marshaling the app status", err)
diff --git a/rkt/list.go b/rkt/list.go
index 20c19c8884..df0e5e0921 100644
--- a/rkt/list.go
+++ b/rkt/list.go
@@ -43,14 +43,14 @@ var (
 	}
 	flagNoLegend   bool
 	flagFullOutput bool
-	flagFormat     string
+	flagFormat     outputFormat
 )
 
 func init() {
 	cmdRkt.AddCommand(cmdList)
 	cmdList.Flags().BoolVar(&flagNoLegend, "no-legend", false, "suppress a legend with the list")
 	cmdList.Flags().BoolVar(&flagFullOutput, "full", false, "use long output format")
-	cmdList.Flags().StringVar(&flagFormat, "format", "", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
+	cmdList.Flags().Var(&flagFormat, "format", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
 }
 
 func runList(cmd *cobra.Command, args []string) int {
@@ -58,7 +58,7 @@ func runList(cmd *cobra.Command, args []string) int {
 	tabBuffer := new(bytes.Buffer)
 	tabOut := getTabOutWithWriter(tabBuffer)
 
-	if !flagNoLegend && flagFormat == "" {
+	if !flagNoLegend && flagFormat == outputFormatTabbed {
 		if flagFullOutput {
 			fmt.Fprintf(tabOut, "UUID\tAPP\tIMAGE NAME\tIMAGE ID\tSTATE\tCREATED\tSTARTED\tNETWORKS\n")
 		} else {
@@ -69,22 +69,21 @@ func runList(cmd *cobra.Command, args []string) int {
 	var pods []*lib.Pod
 
 	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeMostDirs, func(p *pkgPod.Pod) {
-		if flagFormat != "" {
+		if flagFormat != outputFormatTabbed {
 			pod, err := lib.NewPodFromInternalPod(p)
 			if err != nil {
 				errors = append(errors, err)
+			} else {
+				pods = append(pods, pod)
 			}
-			pods = append(pods, pod)
 			return
 		}
 
 		var pm schema.PodManifest
 		var err error
 
-		podState := p.State()
-		if podState != pkgPod.Preparing && podState != pkgPod.AbortedPrepare && podState != pkgPod.Deleting {
+		if p.PodManifestAvailable() {
 			// TODO(vc): we should really hold a shared lock here to prevent gc of the pod
-
 			_, manifest, err := p.PodManifest()
 			if err != nil {
 				errors = append(errors, newPodListReadError(p, err))
@@ -196,17 +195,17 @@ func runList(cmd *cobra.Command, args []string) int {
 	}
 
 	switch flagFormat {
-	case "":
+	case outputFormatTabbed:
 		tabOut.Flush()
 		stdout.Print(tabBuffer)
-	case "json":
+	case outputFormatJSON:
 		result, err := json.Marshal(pods)
 		if err != nil {
 			stderr.PrintE("error marshaling the pods", err)
 			return 254
 		}
 		stdout.Print(string(result))
-	case "json-pretty":
+	case outputFormatPrettyJSON:
 		result, err := json.MarshalIndent(pods, "", "\t")
 		if err != nil {
 			stderr.PrintE("error marshaling the pods", err)
diff --git a/rkt/status.go b/rkt/status.go
index 683ad1a212..ffbcc14a08 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -46,7 +46,7 @@ const (
 func init() {
 	cmdRkt.AddCommand(cmdStatus)
 	cmdStatus.Flags().BoolVar(&flagWait, "wait", false, "toggle waiting for the pod to exit")
-	cmdStatus.Flags().StringVar(&flagFormat, "format", "", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
+	cmdStatus.Flags().Var(&flagFormat, "format", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
 }
 
 func runStatus(cmd *cobra.Command, args []string) (exit int) {
@@ -97,19 +97,19 @@ func getExitStatuses(p *pkgPod.Pod) (map[string]int, error) {
 
 // printStatus prints the pod's pid and per-app status codes
 func printStatus(p *pkgPod.Pod) error {
-	if flagFormat != "" {
+	if flagFormat != outputFormatTabbed {
 		pod, err := lib.NewPodFromInternalPod(p)
 		if err != nil {
 			return fmt.Errorf("error converting pod: %v", err)
 		}
 		switch flagFormat {
-		case "json":
+		case outputFormatJSON:
 			result, err := json.Marshal(pod)
 			if err != nil {
 				return fmt.Errorf("error marshaling the pod: %v", err)
 			}
 			stdout.Print(string(result))
-		case "json-pretty":
+		case outputFormatPrettyJSON:
 			result, err := json.MarshalIndent(pod, "", "\t")
 			if err != nil {
 				return fmt.Errorf("error marshaling the pod: %v", err)

From 220fb129c3cb30388a47ae7fb68926dd19b25753 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Tue, 22 Nov 2016 13:09:50 -0800
Subject: [PATCH 0906/1304] pkg/pod: flatten the pod state if-ladders

---
 pkg/pod/pods.go | 193 ++++++++++++++++++++++++------------------------
 1 file changed, 96 insertions(+), 97 deletions(-)

diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index fbd70ce5d1..e687abb4dc 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -191,43 +191,38 @@ func getPod(dataDir string, uuid *types.UUID) (*Pod, error) {
 
 	p := &Pod{UUID: uuid, dataDir: dataDir}
 
-	// we try open the pod in all possible directories, in the same order the states occur
-	l, err := lock.NewLock(p.embryoPath(), lock.Dir)
-	if err == nil {
-		p.isEmbryo = true
-	} else if err == lock.ErrNotExist {
-		l, err = lock.NewLock(p.preparePath(), lock.Dir)
+	// dirStates is a list of directories -> state that directory existing
+	// implies.
+	// Its order matches the order states occur.
+	dirStates := []struct {
+		dir           string
+		impliedStates []*bool
+	}{
+		{dir: p.embryoPath(), impliedStates: []*bool{&p.isEmbryo}},
+		// For prepare, assume it's aborted prepare until it gets updated below
+		{dir: p.preparePath(), impliedStates: []*bool{&p.isAbortedPrepare}},
+		{dir: p.preparedPath(), impliedStates: []*bool{&p.isPrepared}},
+		// For run, assume exited until the lock is tested
+		{dir: p.runPath(), impliedStates: []*bool{&p.isExited}},
+		// Exited garbage implies exited
+		{dir: p.exitedGarbagePath(), impliedStates: []*bool{&p.isExitedGarbage, &p.isExited}},
+		{dir: p.garbagePath(), impliedStates: []*bool{&p.isGarbage}},
+	}
+
+	var l *lock.FileLock
+	var err error
+	for _, dirState := range dirStates {
+		l, err = lock.NewLock(dirState.dir, lock.Dir)
 		if err == nil {
-			// treat as aborted prepare until lock is tested
-			p.isAbortedPrepare = true
-		} else if err == lock.ErrNotExist {
-			l, err = lock.NewLock(p.preparedPath(), lock.Dir)
-			if err == nil {
-				p.isPrepared = true
-			} else if err == lock.ErrNotExist {
-				l, err = lock.NewLock(p.runPath(), lock.Dir)
-				if err == nil {
-					// treat as exited until lock is tested
-					p.isExited = true
-				} else if err == lock.ErrNotExist {
-					l, err = lock.NewLock(p.exitedGarbagePath(), lock.Dir)
-					if err == lock.ErrNotExist {
-						l, err = lock.NewLock(p.garbagePath(), lock.Dir)
-						if err == nil {
-							p.isGarbage = true
-						} else {
-							return nil, fmt.Errorf("pod %q not found", uuid)
-						}
-					} else if err == nil {
-						p.isExitedGarbage = true
-						p.isExited = true // ExitedGarbage is _always_ implicitly exited
-					}
-				}
+			for _, s := range dirState.impliedStates {
+				*s = true
 			}
+			break
 		}
-	}
-
-	if err != nil && err != lock.ErrNotExist {
+		if err == lock.ErrNotExist {
+			continue
+		}
+		// unexpected lock error
 		return nil, errwrap.Wrap(fmt.Errorf("error opening pod %q", uuid), err)
 	}
 
@@ -322,7 +317,7 @@ func (p *Pod) garbagePath() string {
 }
 
 // ToPrepare transitions a pod from embryo -> preparing, leaves the pod locked in the prepare directory.
-// only the creator of the pod (via newPod()) may do this, nobody to race with.
+// only the creator of the pod (via NewPod()) may do this, nobody to race with.
 func (p *Pod) ToPreparing() error {
 	if !p.createdByMe {
 		return fmt.Errorf("bug: only pods created by me may transition to preparing")
@@ -356,7 +351,7 @@ func (p *Pod) ToPreparing() error {
 }
 
 // ToPrepared transitions a pod from preparing -> prepared, leaves the pod unlocked in the prepared directory.
-// only the creator of the pod (via newPod()) may do this, nobody to race with.
+// only the creator of the pod (via NewPod()) may do this, nobody to race with.
 func (p *Pod) ToPrepared() error {
 	if !p.createdByMe {
 		return fmt.Errorf("bug: only pods created by me may transition to prepared")
@@ -389,7 +384,7 @@ func (p *Pod) ToPrepared() error {
 }
 
 // ToRun transitions a pod from prepared -> run, leaves the pod locked in the run directory.
-// the creator of the pod (via newPod()) may also jump directly from preparing -> run
+// the creator of the pod (via NewPod()) may also jump directly from preparing -> run
 func (p *Pod) ToRun() error {
 	if !p.createdByMe && !p.isPrepared {
 		return fmt.Errorf("bug: only prepared pods may transition to run")
@@ -550,7 +545,6 @@ func listPodsFromDir(cdir string) ([]string, error) {
 // refreshState() updates the cached members of c to reflect current reality
 // assumes p.FileLock is currently unlocked, and always returns with it unlocked.
 func (p *Pod) refreshState() error {
-	//  TODO(vc): this overlaps substantially with newPod(), could probably unify.
 	p.isEmbryo = false
 	p.isPreparing = false
 	p.isAbortedPrepare = false
@@ -562,72 +556,77 @@ func (p *Pod) refreshState() error {
 	p.isDeleting = false
 	p.isGone = false
 
-	// we try open the pod in all possible directories, in the same order the states occur
-	_, err := os.Stat(p.embryoPath())
-	if err == nil {
-		p.isEmbryo = true
-	} else if os.IsNotExist(err) {
-		_, err := os.Stat(p.preparePath())
+	// dirStates is a list of directories -> state that directory existing
+	// implies.
+	// Its order matches the order states occur.
+	dirStates := []struct {
+		dir           string
+		impliedStates []*bool
+	}{
+		{dir: p.embryoPath(), impliedStates: []*bool{&p.isEmbryo}},
+		// For prepare, assume it's aborted prepare until it gets updated below
+		{dir: p.preparePath(), impliedStates: []*bool{&p.isAbortedPrepare}},
+		{dir: p.preparedPath(), impliedStates: []*bool{&p.isPrepared}},
+		// For run, assume exited until the lock is tested
+		{dir: p.runPath(), impliedStates: []*bool{&p.isExited}},
+		// Exited garbage implies exited
+		{dir: p.exitedGarbagePath(), impliedStates: []*bool{&p.isExitedGarbage, &p.isExited}},
+		{dir: p.garbagePath(), impliedStates: []*bool{&p.isGarbage}},
+	}
+
+	anyMatched := false
+	for _, dirState := range dirStates {
+		_, err := os.Stat(dirState.dir)
 		if err == nil {
-			// treat as aborted prepare until lock is tested
-			p.isAbortedPrepare = true
-		} else if os.IsNotExist(err) {
-			_, err := os.Stat(p.preparedPath())
-			if err == nil {
-				p.isPrepared = true
-			} else if os.IsNotExist(err) {
-				_, err := os.Stat(p.runPath())
-				if err == nil {
-					// treat as exited until lock is tested
-					p.isExited = true
-				} else if os.IsNotExist(err) {
-					_, err := os.Stat(p.exitedGarbagePath())
-					if os.IsNotExist(err) {
-						_, err := os.Stat(p.garbagePath())
-						if os.IsNotExist(err) {
-							// XXX: note this is unique to refreshState(), getPod() errors when it can't find a uuid.
-							p.isGone = true
-						} else if err == nil {
-							p.isGarbage = true
-						}
-					} else if err == nil {
-						p.isExitedGarbage = true
-						p.isExited = true // exitedGarbage is _always_ implicitly exited
-					}
-				}
+			for _, s := range dirState.impliedStates {
+				*s = true
 			}
+			anyMatched = true
+			break
+		}
+		if os.IsNotExist(err) {
+			// just try the next one if it didn't exist
+			continue
 		}
+		// Unknown error statting directory
+		return errwrap.Wrap(fmt.Errorf("error refreshing state of pod %q", p.UUID.String()), err)
 	}
 
-	if err != nil && !os.IsNotExist(err) {
-		return errwrap.Wrap(fmt.Errorf("error refreshing state of pod %q", p.UUID.String()), err)
+	if !anyMatched {
+		// default to isGone if nothing else matched
+		p.isGone = true
+		return nil
 	}
 
-	if !p.isPrepared && !p.isEmbryo && !p.isGone {
-		// preparing, run, and exitedGarbage dirs use exclusive locks to indicate preparing/aborted, running/exited, and deleting/marked
-		if err = p.TrySharedLock(); err != nil {
-			if err != lock.ErrLocked {
-				p.Close()
-				return errwrap.Wrap(errors.New("unexpected lock error"), err)
-			}
-			if p.isExitedGarbage {
-				// locked exitedGarbage is also being deleted
-				p.isExitedDeleting = true
-			} else if p.isExited {
-				// locked exited and !exitedGarbage is not exited (default in the run dir)
-				p.isExited = false
-			} else if p.isAbortedPrepare {
-				// locked in preparing is preparing, not aborted (default in the preparing dir)
-				p.isAbortedPrepare = false
-				p.isPreparing = true
-			} else if p.isGarbage {
-				// locked in non-exited garbage is deleting
-				p.isDeleting = true
-			}
-			err = nil
-		} else {
-			p.Unlock()
-		}
+	if p.isPrepared || p.isEmbryo {
+		// no need to try a shared lock for these; our state is already accurate
+		return nil
+	}
+
+	// preparing, run, and exitedGarbage dirs use exclusive locks to indicate preparing/aborted, running/exited, and deleting/marked
+	err := p.TrySharedLock()
+	if err == nil {
+		// if the lock isn't held, then the impliedState above is accurate so we can just return
+		p.Unlock()
+		return nil
+	}
+	if err != lock.ErrLocked {
+		p.Close()
+		return errwrap.Wrap(errors.New("unexpected lock error"), err)
+	}
+	if p.isExitedGarbage {
+		// locked exitedGarbage is also being deleted
+		p.isExitedDeleting = true
+	} else if p.isExited {
+		// locked exited and !exitedGarbage is not exited (default in the run dir)
+		p.isExited = false
+	} else if p.isAbortedPrepare {
+		// locked in preparing is preparing, not aborted (default in the preparing dir)
+		p.isAbortedPrepare = false
+		p.isPreparing = true
+	} else if p.isGarbage {
+		// locked in non-exited garbage is deleting
+		p.isDeleting = true
 	}
 
 	return nil

From 06ad23f659d513730791883fba7745780df67e45 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 24 Nov 2016 09:21:28 +0100
Subject: [PATCH 0907/1304] README: fix regarding overlay-over-overlay for
 newer kernels

Addresses #2158#issuecomment-261922975
---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2bc177ee41..d20389ce7b 100644
--- a/README.md
+++ b/README.md
@@ -80,9 +80,11 @@ For more information, see the [CoreOS security disclosure page](https://coreos.c
 
 ## Known issues
 
-Due to a bug in the Linux kernel, using rkt's overlay support on top of an overlay filesystem requires Linux 4.3+ (see the [stacked overlay fix](https://github.com/torvalds/linux/commit/1c8a47d) and [#1537](https://github.com/coreos/rkt/issues/1537)).
+Due to limitations in the Linux kernel, using rkt's overlay support on top of an overlay filesystem requires the upperdir and workdir to support the creation of trusted.* extended attributes and valid d_type in readdir responses (see [kernel/Documentation/filesystems/overlayfs.txt](https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt)). When starting rkt inside rkt this means that either:
+- the inner `/var/lib/rkt` directory needs to be mounted on a host volume.
+- the outer or inner rkt container needs to be started using `--no-overlay`.
 
-Due to a bug in the Linux kernel, using rkt when /var/lib/rkt is on btrfs requires Linux 4.5.2+ ([#2175](https://github.com/coreos/rkt/issues/2175)).
+Due to a bug in the Linux kernel, using rkt when `/var/lib/rkt` is on btrfs requires Linux 4.5.2+ ([#2175](https://github.com/coreos/rkt/issues/2175)).
 
 Due to a bug in the Linux kernel, using rkt's overlay support in conjunction with SELinux requires a set of patches that are only currently available on some Linux distributions (for example, [CoreOS Linux](https://github.com/coreos/coreos-overlay/tree/master/sys-kernel/coreos-sources/files)). Work is ongoing to merge this work into the mainline Linux kernel ([#1727](https://github.com/coreos/rkt/issues/1727#issuecomment-173203129)).
 

From 6618114539bde88c6948ae55ccfbe64c5fe1374f Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 24 Nov 2016 13:16:20 +0100
Subject: [PATCH 0908/1304] docs: minor grammar/formatting cleanup

Chasing #3406, and, wreaking, havoc, with, commas.
---
 Documentation/devel/architecture.md  | 26 ++++++++++++++++++++------
 Documentation/devel/pod-lifecycle.md |  3 ++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index 6e22577a90..e90c9f7a79 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -106,11 +106,18 @@ This process is slightly different for the qemu-kvm stage1 but a similar workflo
 
 We will now detail how the starting, shutdown, and exit status collection of the apps in a pod are implemented internally.
 
-rkt supports two kinds of pod runtime environments, an immutable, and a new experimental mutable runtime environment. The mutable runtime environment allows to add, and remove applications once a pod has been started. Currently the mutable runtime environment is only available in the experimental `rkt app` family of subcommands, see the [app pod lifecycle documentation](pod-lifecycle.md#app) for a more detailed description.
+### Immutable vs. mutable pods
 
-The immutable runtime environment is currently the default one, i.e. when executing `rkt prepare`, or `rkt run`. Once a pod has been prepared in this environment, no modifications can be applied any more.
+rkt supports two kinds of pod runtime environments: an _immutable pod_ runtime environment, and a new, experimental _mutable pod_ runtime environment.
 
-Both runtime environments are supervised by systemd, and a custom dependency graph. The differences between both dependency graphs are described below.
+The immutable runtime environment is currently the default, i.e. when executing any `rkt prepare` or `rkt run` command.
+Once a pod has been created in this mode, no modifications can be applied.
+
+Conversely, the mutable runtime environment allows users to add, remove, start, and stop applications after a pod has been started.
+Currently this mode is only available in the experimental `rkt app` family of subcommands; see the [app pod lifecycle documentation](pod-lifecycle.md#app) for a more detailed description.
+
+Both runtime environments are supervised internally by systemd, using a custom dependency graph.
+The differences between both dependency graphs are described below.
 
 #### Immutable runtime environment
 
@@ -135,13 +142,20 @@ This will activate all the reaper services when one of the targets is activated,
 
 #### Mutable runtime environment
 
-The initial mutable runtime environment is very simple and resembles a minimal empty systemd system. Once `default.target` has been reached, apps can be added/removed. Unlike the immutable runtime environment the `default.target` has no dependencies on any apps, but only on `systemd-journald.service` to ensure the journald daemon is started before apps are added.
+The initial mutable runtime environment is very simple and resembles a minimal systemd system without any applications installed.
+Once `default.target` has been reached, apps can be added/removed.
+Unlike the immutable runtime environment, the `default.target` has no dependencies on any apps, but only on `systemd-journald.service`, to ensure the journald daemon is started before apps are added.
 
-In order for the pod not to shut down immediately the `default.target` has a `Before`, and `Conflicts` dependency on `halt.target`. This "deadlock" state between `default.target` and `halt.target` keeps the mutable pod alive. `halt.target` has a `After`, and `Requires` dependency on `shutdown.service`.
+In order for the pod to not shut down immediately on its creation, the `default.target` has `Before` and `Conflicts` dependencies on `halt.target`.
+This "deadlock" state between `default.target` and `halt.target` keeps the mutable pod alive.
+`halt.target` has `After` and `Requires` dependencies on `shutdown.service`.
 
 ![rkt-mutable](mutable.png)
 
-When adding an app the corresponding application service unit `[app].service`, and `reaper-[app].service` are being generated, where `[app]` is being replaced with the actual app name. In order not to stop the whole pod when all apps stop, there is no dependency to `shutdown.service`. The `OnFailure` behavior is the same as in an immutable environment. When an app fails, `halt.target`, and `shutdown.service` will be started, and `default.target` will be stopped.
+When adding an app, the corresponding application service units `[app].service` and `reaper-[app].service` are generated (where `[app]` is the actual app name).
+In order for the pod to not shut down when all apps stop, there is no dependency on `shutdown.service`.
+The `OnFailure` behavior is the same as in an immutable environment.
+When an app fails, `halt.target`, and `shutdown.service` will be started, and `default.target` will be stopped.
 
 ![rkt-mutable-app](mutable-app.png)
 
diff --git a/Documentation/devel/pod-lifecycle.md b/Documentation/devel/pod-lifecycle.md
index e373c778e2..931458755b 100644
--- a/Documentation/devel/pod-lifecycle.md
+++ b/Documentation/devel/pod-lifecycle.md
@@ -39,7 +39,8 @@ To prevent the period between first creating a pod's directory and acquiring its
 
 ## App
 
-The `rkt app` experimental family of subcommands allow mutating operations on a running pod, namely adding, starting, stopping, and removing applications. To be able to use these subcommands the environment variable `RKT_EXPERIMENT_APP=true` has to be set.
+The `rkt app` experimental family of subcommands allow mutating operations on a running pod: namely, adding, starting, stopping, and removing applications.
+To be able to use these subcommands the environment variable `RKT_EXPERIMENT_APP=true` must be set.
 The `rkt app sandbox` subcommand transitions to the Run phase as described above, whereas the remaining subcommands mutate the pod while staying in the Run phase.
 To synchronize operations inside the Run phase an additional advisory lock `$var/run/$uuid/pod.lck` is being introduced.
 Locking on the `$var/run/$uuid/pod` manifest won't work because changes on it need to be atomic, realized by overwriting the original manifest.

From 1e6e9cd4e669c47e21b269a0c4a01f740172619b Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 24 Nov 2016 13:58:33 +0100
Subject: [PATCH 0909/1304] version: bump to v1.20.0

---
 CHANGELOG.md                         | 30 ++++++++++++++++++++++++++++
 Documentation/distributions.md       | 16 +++++++--------
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  4 ++--
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 ROADMAP.md                           |  8 ++++----
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 18 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75b6dd0ba3..0529bb9167 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 1.20.0
+
+This release contains additional bug fixes for the new experimental `app` subcommand, following the path towards the Container Runtime Interface (CRI).
+It also adds first step towards OCI by introducing an internal concept called "distribution points", which will allow rkt to recognize multiple image formats internally.
+Finally the rkt fly flavor gained support for `rkt enter`.
+
+### New features and UX changes
+- stage1/fly: Add a working `rkt enter` implementation ([#3377](https://github.com/coreos/rkt/pull/3377)).
+
+### Bug fixes:
+- tests/build-and-run-test.sh: fix systemd revision parameter ([#3395](https://github.com/coreos/rkt/pull/3395)).
+- namefetcher: Use ETag in fetchVerifiedURL() ([#3374](https://github.com/coreos/rkt/pull/3374)).
+- rkt/run: validates pod manifest to make sure it contains at least one app ([#3363](https://github.com/coreos/rkt/pull/3363)).
+- rkt/app: multiple bugfixes ([#3405](https://github.com/coreos/rkt/pull/3405)).
+
+### Other changes
+- glide: deduplicate cni entries and update go-systemd ([#3372](https://github.com/coreos/rkt/pull/3372)).
+- stage0: improve list --format behavior and flags ([#3403](https://github.com/coreos/rkt/pull/3403)).
+- pkg/pod: flatten the pod state if-ladders ([#3404](https://github.com/coreos/rkt/pull/3404)).
+- tests: adjust security tests for systemd v232 ([#3401](https://github.com/coreos/rkt/pull/3401)).
+- image: export `ImageListEntry` type for image list ([#3383](https://github.com/coreos/rkt/pull/3383)).
+- glide: bump gopsutil to v2.16.10 ([#3400](https://github.com/coreos/rkt/pull/3400)).
+- stage1: update coreos base to alpha 1235.0.0 ([#3388](https://github.com/coreos/rkt/pull/3388)).
+- rkt: Implement distribution points ([#3369](https://github.com/coreos/rkt/pull/3369)). This is the implementation of the distribution concept proposed in [#2953](https://github.com/coreos/rkt/pull/2953).
+- build: add --with-stage1-systemd-revision option for src build ([#3362](https://github.com/coreos/rkt/pull/3362)).
+- remove isReallyNil() ([#3381](https://github.com/coreos/rkt/pull/3381)). This is cleanup PR, removing some reflection based code.
+- vendor: update appc/spec to 0.8.9 ([#3384](https://github.com/coreos/rkt/pull/3384)).
+- vendor: Remove direct k8s dependency ([#3312](https://github.com/coreos/rkt/pull/3312)).
+- Documentation updates: [#3366](https://github.com/coreos/rkt/pull/3366), [#3376](https://github.com/coreos/rkt/pull/3376), [#3379](https://github.com/coreos/rkt/pull/3379), [#3406](https://github.com/coreos/rkt/pull/3406), [#3410](https://github.com/coreos/rkt/pull/3410).
+
 ## 1.19.0
 
 This release contains multiple changes to rkt core, bringing it more in line with the new Container Runtime Interface (CRI) from Kubernetes.
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index ca0343eb60..8275414e2b 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -137,19 +137,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt-1.19.0-1.x86_64.rpm
-wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt-1.19.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.19.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.19.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt-1.20.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt-1.20.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.20.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.20.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt_1.19.0-1_amd64.deb
-wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt_1.19.0-1_amd64.deb.asc
-gpg --verify rkt_1.19.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.19.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt_1.20.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt_1.20.0-1_amd64.deb.asc
+gpg --verify rkt_1.20.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.20.0-1_amd64.deb
 ```
 
 [coreos-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index ac0ae1ebe0..6d31a754ac 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.19.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.20.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.19.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.20.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 4d9e1d013a..bf03264509 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.19.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.20.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.19.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.20.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index e0c14b99de..742ce11589 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.19.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.20.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.19.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.20.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index ef2ca19147..d278fc7033 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.19.0
+rkt Version: 1.20.0
 appc Version: 0.8.9
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 03213fc39c..e367c0b2fb 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.19.0/rkt-v1.19.0.tar.gz
-tar xzvf rkt-v1.19.0.tar.gz
-cd rkt-v1.19.0
+wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt-v1.20.0.tar.gz
+tar xzvf rkt-v1.20.0.tar.gz
+cd rkt-v1.20.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 84b8e58ca4..4bdaa09932 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -14,14 +14,14 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 
 ## Next releases
 
-### rkt 1.20.0 (November)
-
-Up-to-date planning at https://github.com/coreos/rkt/milestone/54.
-
 ### rkt 1.21.0 (December)
 
 Up-to-date planning at https://github.com/coreos/rkt/milestone/55.
 
+### rkt 1.22.0 (January)
+
+Up-to-date planning at https://github.com/coreos/rkt/milestone/56.
+
 ### Upcoming
 
 Future tasks without a specific timeline are tracked at https://github.com/coreos/rkt/milestone/30.
diff --git a/configure.ac b/configure.ac
index 81fef50757..b405d37fdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.19.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.20.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 2085da2fc6..78366dc226 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.19.0"
+version="1.20.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 6c887e916d..edb1b35675 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.19.0"
+            "value": "1.20.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 4b5665eebc..75fd5d3ca8 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.19.0"
+            "value": "1.20.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 7c19ae5ea8..31b292c338 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.19.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.20.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 684abd4df1..fd2c22bbd2 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.20.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 7fe6406efe..4a155c5b92 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.20.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 94b179e71b..2fb974b92b 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.20.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index f8690c6965..efa22096fc 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.20.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index a4a34e94fb..5591330b7f 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.19.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.20.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From 7228ec55157cc4cf4fa7d2cb198be14fd374961b Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Thu, 24 Nov 2016 13:58:36 +0100
Subject: [PATCH 0910/1304] version: bump to v1.20.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b405d37fdd..149ead81b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.20.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.20.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 31b292c338..0458fdd10c 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.20.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.20.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From e727c581034439fd8f1fe671a838a20e5dc2fccf Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 24 Nov 2016 14:55:07 +0000
Subject: [PATCH 0911/1304] pkg/mountinfo: move mountinfo parser to its own
 package

---
 pkg/mountinfo/mountinfo.go                    | 141 +++++++++++++++++
 .../mountinfo/mountinfo_test.go               |  99 ++++++++++--
 pkg/mountinfo/types.go                        |  87 +++++++++++
 stage0/gc.go                                  | 142 +-----------------
 stage1/init/kvm.go                            |   5 +-
 stage1_fly/run/main.go                        |   6 +-
 6 files changed, 322 insertions(+), 158 deletions(-)
 create mode 100644 pkg/mountinfo/mountinfo.go
 rename stage0/gc_test.go => pkg/mountinfo/mountinfo_test.go (81%)
 create mode 100644 pkg/mountinfo/types.go

diff --git a/pkg/mountinfo/mountinfo.go b/pkg/mountinfo/mountinfo.go
new file mode 100644
index 0000000000..f227902ba7
--- /dev/null
+++ b/pkg/mountinfo/mountinfo.go
@@ -0,0 +1,141 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package mountinfo
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/hashicorp/errwrap"
+)
+
+// HasPrefix returns a FilterFunc which returns true if
+// the mountpoint of a given mount has prefix p, else false.
+func HasPrefix(p string) FilterFunc {
+	return FilterFunc(func(m *Mount) bool {
+		return strings.HasPrefix(m.MountPoint, p)
+	})
+}
+
+// ParseMounts returns all mountpoints associated with a process mount namespace.
+// The special value 0 as pid argument is used to specify the current process.
+func ParseMounts(pid uint) (Mounts, error) {
+	var procPath string
+	if pid == 0 {
+		procPath = "/proc/self/mountinfo"
+	} else {
+		procPath = fmt.Sprintf("/proc/%d/mountinfo", pid)
+	}
+
+	mi, err := os.Open(procPath)
+	if err != nil {
+		return nil, err
+	}
+	defer mi.Close()
+
+	return parseMountinfo(mi)
+}
+
+// parseMountinfo parses mi (/proc/<pid>/mountinfo) and returns mounts information
+// according to https://www.kernel.org/doc/Documentation/filesystems/proc.txt
+func parseMountinfo(mi io.Reader) (Mounts, error) {
+	var podMounts Mounts
+	sc := bufio.NewScanner(mi)
+	var (
+		mountID    int
+		parentID   int
+		major      int
+		minor      int
+		root       string
+		mountPoint string
+		opt        map[string]struct{}
+	)
+
+	for sc.Scan() {
+		line := sc.Text()
+		columns := strings.Split(line, " ")
+		if len(columns) < 7 {
+			return nil, fmt.Errorf("Not enough fields from line %q: %+v", line, columns)
+		}
+
+		opt = map[string]struct{}{}
+		for i, col := range columns {
+			if col == "-" {
+				// separator: a single hyphen "-" marks the end of "optional fields"
+				break
+			}
+			var err error
+			switch i {
+			case 0:
+				mountID, err = strconv.Atoi(col)
+			case 1:
+				parentID, err = strconv.Atoi(col)
+			case 2:
+				split := strings.Split(col, ":")
+				if len(split) != 2 {
+					err = fmt.Errorf("found unexpected key:value field with more than two colons: %s", col)
+					break
+				}
+				major, err = strconv.Atoi(split[0])
+				if err != nil {
+					break
+				}
+				minor, err = strconv.Atoi(split[1])
+				if err != nil {
+					break
+				}
+			case 3:
+				root = col
+			case 4:
+				mountPoint = col
+			default:
+				split := strings.Split(col, ":")
+				switch len(split) {
+				case 1:
+					// we ignore modes like rw, relatime, etc.
+				case 2:
+					opt[split[0]] = struct{}{}
+				default:
+					err = fmt.Errorf("found unexpected key:value field with more than two colons: %s", col)
+				}
+			}
+			if err != nil {
+				return nil, errwrap.Wrap(fmt.Errorf("could not parse mountinfo line %q", line), err)
+			}
+		}
+
+		mnt := &Mount{
+			ID:         mountID,
+			Parent:     parentID,
+			Major:      major,
+			Minor:      minor,
+			Root:       root,
+			MountPoint: mountPoint,
+			Opts:       opt,
+		}
+		podMounts = append(podMounts, mnt)
+	}
+	if err := sc.Err(); err != nil {
+		return nil, errwrap.Wrap(errors.New("problem parsing mountinfo"), err)
+	}
+	sort.Sort(podMounts)
+	return podMounts, nil
+}
diff --git a/stage0/gc_test.go b/pkg/mountinfo/mountinfo_test.go
similarity index 81%
rename from stage0/gc_test.go
rename to pkg/mountinfo/mountinfo_test.go
index bf9f22f1cf..60f1b45ddf 100644
--- a/stage0/gc_test.go
+++ b/pkg/mountinfo/mountinfo_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The rkt Authors
+// Copyright 2016 The rkt Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,15 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package stage0
+// +build linux
+
+package mountinfo
 
 import (
+	"bytes"
 	"fmt"
+	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 )
 
 var mountinfo = `39 21 0:36 / /tmp rw shared:91 -
+18 39 0:18 / /sys rw,nosuid,nodev,noexec,relatime shared:7 - sysfs sysfs rw
+19 39 0:4 / /proc rw,nosuid,nodev,noexec,relatime shared:13 - proc proc rw
 71 21 0:39 / /var/lib/rkt rw,relatime shared:26 -
 69 21 0:19 /home /home rw,relatime shared:27 -
 70 20 0:41 / /run/user/1000 rw,nosuid,nodev,relatime shared:28 -
@@ -79,6 +86,22 @@ var mountinfo = `39 21 0:36 / /tmp rw shared:91 -
 255 193 179:1 / /prefix/stage1/rootfs/opt/stage2/busybox/rootfs/rootfs/mnt/unknown ro,relatime -
 `
 
+// safeOrder checks for transitivity and (un)mount order sanity
+func safeOrder(ms Mounts) error {
+	for i, m := range ms {
+		for j, mnext := range ms[i:] {
+			k := i + j
+			if !ms.Less(i, k) {
+				return fmt.Errorf("Transitivity check failed for %d(%d) and %d(%d)", i, m.ID, k, mnext.ID)
+			}
+			if strings.HasPrefix(mnext.MountPoint, m.MountPoint+string(filepath.Separator)) {
+				return fmt.Errorf("Must not unmount \n%q before\n%q.", m.MountPoint, mnext.MountPoint)
+			}
+		}
+	}
+	return nil
+}
+
 func TestMountOrdering(t *testing.T) {
 	tests := []struct {
 		prefix     string
@@ -98,15 +121,16 @@ func TestMountOrdering(t *testing.T) {
 
 	for i, tt := range tests {
 		mi := strings.NewReader(tt.mi)
-		mnts, err := getMountsForPrefix(tt.prefix, mi)
+		mnts, err := parseMountinfo(mi)
 		if err != nil {
 			t.Errorf("problems finding mount points: %v", err)
 		}
+		mnts = mnts.Filter(HasPrefix(tt.prefix))
 
 		requestedRemounts := 0
 		for i := len(mnts) - 1; i >= 0; i-- {
 			mnt := mnts[i]
-			if needsRemountPrivate(mnt) {
+			if mnt.NeedsRemountPrivate() {
 				t.Logf("remounting: %+v", mnt)
 				requestedRemounts++
 			}
@@ -121,7 +145,7 @@ func TestMountOrdering(t *testing.T) {
 		}
 
 		for _, mntCur := range mnts {
-			t.Logf("Unmounting %d: %q", mntCur.id, mntCur.MountPoint)
+			t.Logf("Unmounting %d: %q", mntCur.ID, mntCur.MountPoint)
 		}
 
 		if err := safeOrder(mnts); err != nil {
@@ -130,18 +154,63 @@ func TestMountOrdering(t *testing.T) {
 	}
 }
 
-// safeOrder checks for transitivity and (un)mount order sanity
-func safeOrder(m mounts) error {
-	for i, mntCur := range m {
-		for j, mntNext := range m[(i + 1):] {
-			j := i + j
-			if !m.Less(i, j) {
-				return fmt.Errorf("Transitivity check failed for %d(%d) and %d(%d)", i, mntCur.id, j, mntNext.id)
+func TestMountinfoParser(t *testing.T) {
+	mountTests := []struct {
+		mountinfo string
+		prefix    string
+
+		winfos Mounts
+		werr   bool
+	}{
+		{
+			"plaintext garbage",
+			"",
+
+			nil,
+			true,
+		},
+		{
+			mountinfo,
+			"/proc",
+
+			Mounts{&Mount{19, 39, 0, 4, "/", "/proc", map[string]struct{}{"shared": {}}}},
+			false,
+		},
+		{
+			mountinfo,
+			"/nonexisting",
+
+			nil,
+			false,
+		},
+	}
+
+	for i, tt := range mountTests {
+		mi := bytes.NewBufferString(tt.mountinfo)
+		mnts, err := parseMountinfo(mi)
+		if err != nil && !tt.werr {
+			t.Errorf("#%d: got unexpected error %v", i, err)
+		}
+		if err == nil && tt.werr {
+			t.Errorf("#%d: expected error, got nil", i)
+		}
+
+		mnts = mnts.Filter(HasPrefix(tt.prefix))
+		if mnts == nil && tt.winfos != nil {
+			t.Errorf("#%d: expected mounts %v, got nil", i, tt.winfos)
+		}
+		if len(mnts) > 0 {
+			if len(tt.winfos) == 0 {
+				t.Errorf("#%d: no mounts expected, got %v", i, mnts)
 			}
-			if strings.HasPrefix(mntNext.MountPoint, mntCur.MountPoint) {
-				return fmt.Errorf("Must not unmount \n%q before\n%q.", mntCur.MountPoint, mntNext.MountPoint)
+			for j, m := range mnts {
+				if m == nil {
+					t.Errorf("#%d.%d: got nil mountinfo entry", i, j)
+				}
+				if !reflect.DeepEqual(m, tt.winfos[j]) {
+					t.Errorf("#%d.%d: expected mountinfo %v, got %v", i, j, tt.winfos[j], m)
+				}
 			}
 		}
 	}
-	return nil
 }
diff --git a/pkg/mountinfo/types.go b/pkg/mountinfo/types.go
new file mode 100644
index 0000000000..f879dadef4
--- /dev/null
+++ b/pkg/mountinfo/types.go
@@ -0,0 +1,87 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package mountinfo
+
+// Mount contains information about a single mountpoint entry
+type Mount struct {
+	ID         int
+	Parent     int
+	Major      int
+	Minor      int
+	Root       string
+	MountPoint string
+	Opts       map[string]struct{}
+}
+
+// FilterFunc is a functional type which returns true if the given Mount should be filtered, else false.
+type FilterFunc func(m *Mount) bool
+
+// NeedsRemountPrivate checks if this mountPoint needs to be remounted
+// as private, in order for children to be properly unmounted without
+// leaking to parents.
+func (m *Mount) NeedsRemountPrivate() bool {
+	for _, key := range []string{
+		"shared",
+		"master",
+	} {
+		if _, needsRemount := m.Opts[key]; needsRemount {
+			return true
+		}
+	}
+	return false
+}
+
+// Mounts represents a sortable set of mountpoint entries.
+// It implements sort.Interface according to unmount order (children first).
+type Mounts []*Mount
+
+// Filter returns a filtered copy of Mounts
+func (ms Mounts) Filter(f FilterFunc) Mounts {
+	filtered := make([]*Mount, 0, len(ms))
+
+	for _, m := range ms {
+		if f(m) {
+			filtered = append(filtered, m)
+		}
+	}
+
+	return Mounts(filtered)
+}
+
+// Less ensures that mounts are sorted in an order we can unmount; descendant before ancestor.
+// The requirement of transitivity for Less has to be fulfilled otherwise the sort algorithm will fail.
+func (ms Mounts) Less(i, j int) (result bool) { return ms.mountDepth(i) >= ms.mountDepth(j) }
+
+func (ms Mounts) Len() int { return len(ms) }
+
+func (ms Mounts) Swap(i, j int) { ms[i], ms[j] = ms[j], ms[i] }
+
+// mountDepth determines and returns the number of ancestors of the mount at index i
+func (ms Mounts) mountDepth(i int) int {
+	ancestorCount := 0
+	current := ms[i]
+	for found := true; found; {
+		found = false
+		for _, mnt := range ms {
+			if mnt.ID == current.Parent {
+				ancestorCount++
+				current = mnt
+				found = true
+				break
+			}
+		}
+	}
+	return ancestorCount
+}
diff --git a/stage0/gc.go b/stage0/gc.go
index ce908aac95..5b4973448b 100644
--- a/stage0/gc.go
+++ b/stage0/gc.go
@@ -17,19 +17,15 @@
 package stage0
 
 import (
-	"bufio"
 	"errors"
 	"fmt"
-	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
 	"syscall"
 
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/mountinfo"
 
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
@@ -74,147 +70,17 @@ func GC(pdir string, uuid *types.UUID, localConfig string) error {
 	return c.Run()
 }
 
-type mount struct {
-	id         int
-	parentID   int
-	MountPoint string
-	opt        map[string]struct{}
-}
-
-type mounts []*mount
-
-// getMountDepth determines and returns the number of ancestors of the mount at index i
-func (m mounts) getMountDepth(i int) int {
-	ancestorCount := 0
-	current := m[i]
-	for found := true; found; {
-		found = false
-		for _, mnt := range m {
-			if mnt.id == current.parentID {
-				ancestorCount++
-				current = mnt
-				found = true
-				break
-			}
-		}
-	}
-	return ancestorCount
-}
-
-// Less ensures that mounts are sorted in an order we can unmount; descendant before ancestor.
-// The requirement of transitivity for Less has to be fulfilled otherwise the sort algorithm will fail.
-func (m mounts) Less(i, j int) (result bool) { return m.getMountDepth(i) >= m.getMountDepth(j) }
-func (m mounts) Len() int                    { return len(m) }
-func (m mounts) Swap(i, j int)               { m[i], m[j] = m[j], m[i] }
-
-func GetMountsForPrefix(path string) (mounts, error) {
-	mi, err := os.Open("/proc/self/mountinfo")
-	if err != nil {
-		return nil, err
-	}
-	defer mi.Close()
-
-	mnts, err := getMountsForPrefix(path, mi)
-	if err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("error getting sub-mounts under %q from mountinfo", path), err)
-	}
-
-	return mnts, nil
-}
-
-// getMountsForPrefix parses mi (/proc/PID/mountinfo) and returns mounts for path prefix
-func getMountsForPrefix(path string, mi io.Reader) (mounts, error) {
-	var podMounts mounts
-	sc := bufio.NewScanner(mi)
-	var (
-		mountID    int
-		parentID   int
-		mountPoint string
-		opt        map[string]struct{}
-	)
-
-	for sc.Scan() {
-		line := sc.Text()
-		lineResult := strings.Split(line, " ")
-		if len(lineResult) < 7 {
-			return nil, fmt.Errorf("Not enough fields from line %q: %+v", line, lineResult)
-		}
-
-		opt = map[string]struct{}{}
-		for i, s := range lineResult {
-			if s == "-" {
-				break
-			}
-			var err error
-			switch i {
-			case 0:
-				mountID, err = strconv.Atoi(s)
-			case 1:
-				parentID, err = strconv.Atoi(s)
-			case 2, 3:
-			case 4:
-				mountPoint = s
-			default:
-				split := strings.Split(s, ":")
-				switch len(split) {
-				case 1:
-					// we ignore modes like rw, relatime, etc.
-				case 2:
-					opt[split[0]] = struct{}{}
-				default:
-					err = fmt.Errorf("found unexpected key:value field with more than two colons: %s", s)
-				}
-			}
-			if err != nil {
-				return nil, errwrap.Wrap(fmt.Errorf("could not parse mountinfo line %q", line), err)
-			}
-		}
-
-		if strings.HasPrefix(mountPoint, path) {
-			mnt := &mount{
-				id:         mountID,
-				parentID:   parentID,
-				MountPoint: mountPoint,
-				opt:        opt,
-			}
-			podMounts = append(podMounts, mnt)
-		}
-	}
-	if err := sc.Err(); err != nil {
-		return nil, errwrap.Wrap(errors.New("problem parsing mountinfo"), err)
-	}
-	sort.Sort(podMounts)
-	return podMounts, nil
-}
-
-func needsRemountPrivate(mnt *mount) bool {
-	for _, key := range []string{
-		"shared",
-		"master",
-	} {
-		if _, needsRemount := mnt.opt[key]; needsRemount {
-			return true
-		}
-	}
-	return false
-}
-
 // MountGC removes mounts from pods that couldn't be GCed cleanly.
 func MountGC(path, uuid string) error {
-	mi, err := os.Open("/proc/self/mountinfo")
-	if err != nil {
-		return err
-	}
-	defer mi.Close()
-
-	mnts, err := getMountsForPrefix(path, mi)
+	mnts, err := mountinfo.ParseMounts(0)
 	if err != nil {
 		return errwrap.Wrap(fmt.Errorf("error getting mounts for pod %s from mountinfo", uuid), err)
 	}
+	mnts = mnts.Filter(mountinfo.HasPrefix(path))
 
 	for i := len(mnts) - 1; i >= 0; i-- {
 		mnt := mnts[i]
-		if needsRemountPrivate(mnt) {
+		if mnt.NeedsRemountPrivate() {
 			if err := syscall.Mount("", mnt.MountPoint, "", syscall.MS_PRIVATE, ""); err != nil {
 				return errwrap.Wrap(fmt.Errorf("could not remount at %v", mnt.MountPoint), err)
 			}
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index d4b9eba17e..fdf4361f93 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -28,7 +28,7 @@ import (
 	"github.com/coreos/go-systemd/util"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/networking"
-	"github.com/coreos/rkt/stage0"
+	"github.com/coreos/rkt/pkg/mountinfo"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 	"github.com/coreos/rkt/stage1/init/kvm"
@@ -133,10 +133,11 @@ func doBindMount(source, destination string, readOnly bool, recursive *bool) err
 	if readOnly && recursiveBool {
 		// Sub-mounts are still read-write, so find them and remount them read-only
 
-		mnts, err := stage0.GetMountsForPrefix(source + "/")
+		mnts, err := mountinfo.ParseMounts(0)
 		if err != nil {
 			return errwrap.Wrap(fmt.Errorf("error getting mounts under %q from mountinfo", source), err)
 		}
+		mnts = mnts.Filter(mountinfo.HasPrefix(source + "/"))
 
 		for _, mnt := range mnts {
 			innerAbsPath := destination + strings.Replace(mnt.MountPoint, source, "", -1)
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index bb0b220ce4..781f9b194d 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -15,7 +15,6 @@
 package main
 
 import (
-	"bufio"
 	"errors"
 	"flag"
 	"fmt"
@@ -34,9 +33,9 @@ import (
 	"github.com/coreos/rkt/pkg/fileutil"
 	pkgflag "github.com/coreos/rkt/pkg/flag"
 	rktlog "github.com/coreos/rkt/pkg/log"
+	"github.com/coreos/rkt/pkg/mountinfo"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/stage0"
 	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 )
@@ -243,10 +242,11 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 
 			if recursive {
 				// Every sub-mount needs to be remounted read-only separately
-				mnts, err := stage0.GetMountsForPrefix(tuple.V.Source + "/")
+				mnts, err := mountinfo.ParseMounts(0)
 				if err != nil {
 					return nil, errwrap.Wrap(fmt.Errorf("error getting mounts under %q from mountinfo", tuple.V.Source), err)
 				}
+				mnts = mnts.Filter(mountinfo.HasPrefix(tuple.V.Source + "/"))
 
 				for _, mnt := range mnts {
 					innerRelPath := tuple.M.Path + strings.Replace(mnt.MountPoint, tuple.V.Source, "", -1)

From 0895d449cae9d3c415edd88ecea36337fd3cb836 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 24 Nov 2016 15:06:26 +0000
Subject: [PATCH 0912/1304] export: use pkg/mountinfo for mountinfo parsing

---
 rkt/export.go | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/rkt/export.go b/rkt/export.go
index 959ecc0880..280aed3c4f 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -16,14 +16,12 @@ package main
 
 import (
 	"archive/tar"
-	"bufio"
 	"compress/gzip"
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strings"
 	"syscall"
 
 	"github.com/appc/spec/aci"
@@ -31,6 +29,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/overlay"
+	"github.com/coreos/rkt/pkg/mountinfo"
 	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/store/imagestore"
@@ -55,37 +54,6 @@ func init() {
 	cmdExport.Flags().BoolVar(&flagOverwriteACI, "overwrite", false, "overwrite output ACI")
 }
 
-func appHasMountpoints(podPath string, appName types.ACName) (bool, error) {
-	appRootfs := common.AppRootfsPath(podPath, appName)
-	// add a filepath separator so we don't match the appRootfs path
-	appRootfs += string(filepath.Separator)
-
-	mi, err := os.Open("/proc/self/mountinfo")
-	if err != nil {
-		return false, err
-	}
-	defer mi.Close()
-
-	sc := bufio.NewScanner(mi)
-	for sc.Scan() {
-		line := sc.Text()
-		lineResult := strings.Split(line, " ")
-		if len(lineResult) < 7 {
-			return false, fmt.Errorf("not enough fields from line %q: %+v", line, lineResult)
-		}
-
-		mp := lineResult[4]
-
-		if strings.HasPrefix(mp, appRootfs) {
-			return true, nil
-		}
-	}
-	if err := sc.Err(); err != nil {
-		return false, err
-	}
-	return false, nil
-}
-
 func runExport(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) != 2 {
 		cmd.Usage()
@@ -155,12 +123,15 @@ func runExport(cmd *cobra.Command, args []string) (exit int) {
 		}()
 		root = podDir
 	} else {
-		hasMPs, err := appHasMountpoints(p.Path(), app.Name)
+		// trailing filepath separator so we don't match the appRootfs path
+		appRootfs := common.AppRootfsPath(p.Path(), app.Name) + string(filepath.Separator)
+		mnts, err := mountinfo.ParseMounts(0)
 		if err != nil {
 			stderr.PrintE("error parsing mountpoints", err)
 			return 254
 		}
-		if hasMPs {
+		mnts = mnts.Filter(mountinfo.HasPrefix(appRootfs))
+		if len(mnts) > 0 {
 			stderr.Printf("pod has remaining mountpoints. Only pods using overlayfs or with no mountpoints can be exported")
 			return 254
 		}

From a60a9b5db002d4c6ad3f50885c38ed4bf0f7f13e Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 24 Nov 2016 15:26:56 +0000
Subject: [PATCH 0913/1304] fly: use pkg/mountinfo for mountinfo parsing

---
 stage1_fly/gc/main.go  |  4 ----
 stage1_fly/run/main.go | 38 +++++---------------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/stage1_fly/gc/main.go b/stage1_fly/gc/main.go
index db4b54c846..d54e0973f3 100644
--- a/stage1_fly/gc/main.go
+++ b/stage1_fly/gc/main.go
@@ -23,10 +23,6 @@ import (
 	rktlog "github.com/coreos/rkt/pkg/log"
 )
 
-const (
-	mountinfoPath = "/proc/self/mountinfo"
-)
-
 var (
 	debug bool
 
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 781f9b194d..4ff395c2d6 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -69,38 +69,6 @@ var (
 	dnsConfMode *pkgflag.PairList
 )
 
-func getHostMounts() (map[string]struct{}, error) {
-	hostMounts := map[string]struct{}{}
-
-	mi, err := os.Open("/proc/self/mountinfo")
-	if err != nil {
-		return nil, err
-	}
-	defer mi.Close()
-
-	sc := bufio.NewScanner(mi)
-	for sc.Scan() {
-		var (
-			discard    string
-			mountPoint string
-		)
-
-		_, err := fmt.Sscanf(sc.Text(),
-			"%s %s %s %s %s",
-			&discard, &discard, &discard, &discard, &mountPoint,
-		)
-		if err != nil {
-			return nil, err
-		}
-
-		hostMounts[mountPoint] = struct{}{}
-	}
-	if sc.Err() != nil {
-		return nil, errwrap.Wrap(errors.New("problem parsing mountinfo"), sc.Err())
-	}
-	return hostMounts, nil
-}
-
 func init() {
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
 
@@ -206,10 +174,14 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 	}
 
 	// Gather host mounts which we make MS_SHARED if passed as a volume source
-	hostMounts, err := getHostMounts()
+	hostMounts := map[string]struct{}{}
+	mnts, err := mountinfo.ParseMounts(0)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("can't gather host mounts"), err)
 	}
+	for _, m := range mnts {
+		hostMounts[m.MountPoint] = struct{}{}
+	}
 
 	argFlyMounts := []flyMount{}
 	for _, tuple := range namedVolumeMounts {

From 0ac3c437ca02a4596f4ead7aaf6b4adc1b8f271f Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 25 Nov 2016 17:35:54 +0100
Subject: [PATCH 0914/1304] rkt: remove empty TODO

---
 rkt/app_sandbox.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
index 67d634f852..14854a29d4 100644
--- a/rkt/app_sandbox.go
+++ b/rkt/app_sandbox.go
@@ -48,7 +48,6 @@ func init() {
 	cmdApp.AddCommand(cmdAppSandbox)
 
 	addStage1ImageFlags(cmdAppSandbox.Flags())
-	// TODO(sur)
 	cmdAppSandbox.Flags().StringVar(&flagUUIDFileSave, "uuid-file-save", "", "write out pod UUID to specified file")
 	cmdAppSandbox.Flags().Var(&flagNet, "net", "configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. Syntax: --net[=n[:args], ...]")
 	cmdAppSandbox.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")

From b5f3a071c4191b1f9aa5689ed93fb401da1813f3 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Fri, 18 Nov 2016 14:31:18 +0100
Subject: [PATCH 0915/1304] stage1/init: R/W support for /proc/sys, and /sys

This adds read-write support for the /proc/sys, and /sys mountpoints if
the paths insecure-option is enabled.

Fixes #3245
---
 common/cgroup/v1/cgroup.go | 14 ++++++++++----
 stage1/init/init.go        | 11 ++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/common/cgroup/v1/cgroup.go b/common/cgroup/v1/cgroup.go
index 9fdb30c1da..20bf58a85e 100644
--- a/common/cgroup/v1/cgroup.go
+++ b/common/cgroup/v1/cgroup.go
@@ -320,10 +320,12 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 	return mountFsRO(cgroupTmpfs, cgroupTmpfsFlags)
 }
 
-// RemountCgroupsRO remounts the v1 cgroup hierarchy under root read-only,
-// leaving the needed knobs in the subcgroup for each app read-write so the
-// systemd inside stage1 can apply isolators to them
-func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
+// RemountCgroups remounts the v1 cgroup hierarchy under root.
+// It mounts /sys/fs/cgroup/[controller] read-only,
+// but leaves needed knobs in the subcgroup for each app read-write,
+// such that systemd inside stage1 can apply isolators to them.
+// It leaves /sys read-write, if the given readWrite parameter is true.
+func RemountCgroups(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string, readWrite bool) error {
 	controllers := GetControllerDirs(enabledCgroups)
 	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
 	sysPath := filepath.Join(root, "/sys")
@@ -368,6 +370,10 @@ func RemountCgroupsRO(root string, enabledCgroups map[int][]string, subcgroup st
 		}
 	}
 
+	if readWrite {
+		return nil
+	}
+
 	// Bind-mount sys filesystem read-only
 	return mountFsRO(sysPath, flags)
 }
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 5641326d99..83e271ed48 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -473,6 +473,10 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 	// introduced by https://github.com/systemd/systemd/pull/3809.
 	env = append(env, "SYSTEMD_NSPAWN_USE_CGNS=no")
 
+	if insecureOptions.DisablePaths {
+		env = append(env, "SYSTEMD_NSPAWN_API_VFS_WRITABLE=yes")
+	}
+
 	if len(privateUsers) > 0 {
 		args = append(args, "--private-users="+privateUsers)
 	}
@@ -674,7 +678,7 @@ func stage1() int {
 			serviceNames = append(serviceNames, stage1initcommon.ServiceUnitName(app.Name))
 		}
 
-		if err := mountContainerV1Cgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
+		if err := mountContainerV1Cgroups(s1Root, enabledCgroups, subcgroup, serviceNames, insecureOptions); err != nil {
 			log.PrintE("couldn't mount the container v1 cgroups", err)
 			return 254
 		}
@@ -753,12 +757,13 @@ func mountHostV1Cgroups(enabledCgroups map[int][]string) error {
 // mountContainerV1Cgroups mounts the cgroup controllers hierarchy in the container's
 // namespace read-only, leaving the needed knobs in the subcgroup for each-app
 // read-write so systemd inside stage1 can apply isolators to them
-func mountContainerV1Cgroups(s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
+func mountContainerV1Cgroups(s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string, secopts stage1initcommon.Stage1InsecureOptions) error {
 	mountContext := os.Getenv(common.EnvSELinuxMountContext)
 	if err := v1.CreateCgroups(s1Root, enabledCgroups, mountContext); err != nil {
 		return errwrap.Wrap(errors.New("error creating container cgroups"), err)
 	}
-	if err := v1.RemountCgroupsRO(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
+
+	if err := v1.RemountCgroups(m, s1Root, enabledCgroups, subcgroup, serviceNames, secopts.DisablePaths); err != nil {
 		return errwrap.Wrap(errors.New("error restricting container cgroups"), err)
 	}
 

From 2558be29b3969ca5d527ec18b68b839e05ff7ba3 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 21 Nov 2016 10:42:41 +0100
Subject: [PATCH 0916/1304] stage1/init: check for systemd before invoking
 RunningFromSystemService

Currently if RunningFromSystemService is invoked on a non-systemd system
this call fails with "error calling sd_pid_get_owner_uid".

This fixes it by checking if we are running systemd at all.
---
 stage1/init/init.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 83e271ed48..3383f3f132 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -771,11 +771,16 @@ func mountContainerV1Cgroups(s1Root string, enabledCgroups map[int][]string, sub
 }
 
 func getContainerSubCgroup(machineID string, canMachinedRegister, unified bool) (string, error) {
-	var subcgroup string
-	fromUnit, err := util.RunningFromSystemService()
-	if err != nil {
-		return "", errwrap.Wrap(errors.New("could not determine if we're running from a unit file"), err)
+	var fromUnit bool
+
+	if util.IsRunningSystemd() {
+		var err error
+		if fromUnit, err = util.RunningFromSystemService(); err != nil {
+			return "", errwrap.Wrap(errors.New("could not determine if we're running from a unit file"), err)
+		}
 	}
+
+	var subcgroup string
 	if fromUnit {
 		slice, err := util.GetRunningSlice()
 		if err != nil {

From 427df79c7935e3d425ac6c6f2db451fae11bb479 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Sat, 19 Nov 2016 08:22:48 +0100
Subject: [PATCH 0917/1304] stage1/init: remove "return 254" statements in
 favor of log.FatalE

Currently we have a lot of redundant "return 254" statements in
stage1/init. This removes them in favor of log.FatalE which internally
calls os.Exit(254).
---
 stage1/init/init.go | 57 ++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 39 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 3383f3f132..d851227a50 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -501,51 +501,44 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 func stage1() int {
 	uuid, err := types.NewUUID(flag.Arg(0))
 	if err != nil {
-		log.PrintE("UUID is missing or malformed", err)
-		return 254
+		log.FatalE("UUID is missing or malformed", err)
 	}
 
 	root := "."
 	p, err := stage1commontypes.LoadPod(root, uuid)
 	if err != nil {
-		log.PrintE("failed to load pod", err)
-		return 254
+		log.FatalE("failed to load pod", err)
 	}
 
 	// set close-on-exec flag on RKT_LOCK_FD so it gets correctly closed when invoking
 	// network plugins
 	lfd, err := common.GetRktLockFD()
 	if err != nil {
-		log.PrintE("failed to get rkt lock fd", err)
-		return 254
+		log.FatalE("failed to get rkt lock fd", err)
 	}
 
 	if err := sys.CloseOnExec(lfd, true); err != nil {
-		log.PrintE("failed to set FD_CLOEXEC on rkt lock", err)
-		return 254
+		log.FatalE("failed to set FD_CLOEXEC on rkt lock", err)
 	}
 
 	mirrorLocalZoneInfo(p.Root)
 
 	flavor, _, err := stage1initcommon.GetFlavor(p)
 	if err != nil {
-		log.PrintE("failed to get stage1 flavor", err)
-		return 254
+		log.FatalE("failed to get stage1 flavor", err)
 	}
 
 	var n *networking.Networking
 	if netList.Contained() {
 		fps, err := commonnet.ForwardedPorts(p.Manifest)
 		if err != nil {
-			log.Error(err)
-			return 254
+			log.FatalE("error initializing forwarding ports", err)
 		}
 
 		noDNS := dnsConfMode.Pairs["resolv"] != "default" // force ignore CNI DNS results
 		n, err = networking.Setup(root, p.UUID, fps, netList, localConfig, flavor, noDNS, debug)
 		if err != nil {
-			log.PrintE("failed to setup network", err)
-			return 254
+			log.FatalE("failed to setup network", err)
 		}
 
 		if err = n.Save(); err != nil {
@@ -557,16 +550,14 @@ func stage1() int {
 		if len(mdsToken) > 0 {
 			hostIP, err := n.GetForwardableNetHostIP()
 			if err != nil {
-				log.PrintE("failed to get default Host IP", err)
-				return 254
+				log.FatalE("failed to get default Host IP", err)
 			}
 
 			p.MetadataServiceURL = common.MetadataServicePublicURL(hostIP, mdsToken)
 		}
 	} else {
 		if flavor == "kvm" {
-			log.Print("flavor kvm requires private network configuration (try --net)")
-			return 254
+			log.Fatal("flavor kvm requires private network configuration (try --net)")
 		}
 		if len(mdsToken) > 0 {
 			p.MetadataServiceURL = common.MetadataServicePublicURL(localhostIP, mdsToken)
@@ -589,13 +580,11 @@ func stage1() int {
 
 	if mutable {
 		if err = stage1initcommon.MutableEnv(p); err != nil {
-			log.Error(err)
-			return 254
+			log.FatalE("cannot initialize mutable environment", err)
 		}
 	} else {
 		if err = stage1initcommon.ImmutableEnv(p, interactive, privateUsers, insecureOptions); err != nil {
-			log.Error(err)
-			return 254
+			log.FatalE("cannot initialize immutable environment", err)
 		}
 	}
 
@@ -606,8 +595,7 @@ func stage1() int {
 	if flavor == "kvm" {
 		kvm.InitDebug(debug)
 		if err := KvmNetworkingToSystemd(p, n); err != nil {
-			log.PrintE("failed to configure systemd for kvm", err)
-			return 254
+			log.FatalE("failed to configure systemd for kvm", err)
 		}
 	}
 
@@ -618,8 +606,7 @@ func stage1() int {
 	}
 	args, env, err := getArgsEnv(p, flavor, canMachinedRegister, debug, n, insecureOptions)
 	if err != nil {
-		log.Error(err)
-		return 254
+		log.FatalE("cannot get environment", err)
 	}
 
 	// create a separate mount namespace so the cgroup filesystems
@@ -643,7 +630,6 @@ func stage1() int {
 	unifiedCgroup, err := cgroup.IsCgroupUnified("/")
 	if err != nil {
 		log.FatalE("error determining cgroup version", err)
-		return 254
 	}
 
 	s1Root := common.Stage1RootfsPath(p.Root)
@@ -652,25 +638,21 @@ func stage1() int {
 	subcgroup, err := getContainerSubCgroup(machineID, canMachinedRegister, unifiedCgroup)
 	if err != nil {
 		log.FatalE("error getting container subcgroup", err)
-		return 254
 	}
 
 	if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
 		[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
 		log.FatalE("cannot write subcgroup file", err)
-		return 254
 	}
 
 	if !unifiedCgroup {
 		enabledCgroups, err := v1.GetEnabledCgroups()
 		if err != nil {
 			log.FatalE("error getting v1 cgroups", err)
-			return 254
 		}
 
 		if err := mountHostV1Cgroups(enabledCgroups); err != nil {
 			log.FatalE("couldn't mount the host v1 cgroups", err)
-			return 254
 		}
 
 		var serviceNames []string
@@ -679,8 +661,7 @@ func stage1() int {
 		}
 
 		if err := mountContainerV1Cgroups(s1Root, enabledCgroups, subcgroup, serviceNames, insecureOptions); err != nil {
-			log.PrintE("couldn't mount the container v1 cgroups", err)
-			return 254
+			log.FatalE("couldn't mount the container v1 cgroups", err)
 		}
 
 	}
@@ -694,14 +675,12 @@ func stage1() int {
 	}
 
 	if err = stage1common.WritePid(os.Getpid(), pid_filename); err != nil {
-		log.Error(err)
-		return 254
+		log.FatalE("error writing pid", err)
 	}
 
 	if flavor == "kvm" {
 		if err := KvmPrepareMounts(s1Root, p); err != nil {
-			log.PrintE("could not prepare mounts", err)
-			return 254
+			log.FatalE("error preparing mounts", err)
 		}
 	}
 	diag.Println(args)
@@ -709,9 +688,9 @@ func stage1() int {
 	err = stage1common.WithClearedCloExec(lfd, func() error {
 		return syscall.Exec(args[0], args, env)
 	})
+
 	if err != nil {
-		log.PrintE(fmt.Sprintf("failed to execute %q", args[0]), err)
-		return 254
+		log.FatalE(fmt.Sprintf("failed to execute %q", args[0]), err)
 	}
 
 	return 0

From 0de18d31116e0016f7d5ccdc7d315043c58eef51 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Sat, 19 Nov 2016 09:55:10 +0100
Subject: [PATCH 0918/1304] stage1/init: join container subgroup after cgroup
 mounts

Curently if a container cannot register in systemd it tries to join the
sub-cgroup by creating these entries manually.

This fails if the appropriate cgroups are not mounted in forehand.

This fixes it.
---
 stage1/init/init.go | 72 ++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index d851227a50..1e6305d604 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -655,6 +655,12 @@ func stage1() int {
 			log.FatalE("couldn't mount the host v1 cgroups", err)
 		}
 
+		if !canMachinedRegister {
+			if err := v1.JoinSubcgroup("systemd", subcgroup); err != nil {
+				log.FatalE(fmt.Sprintf("error joining subcgroup %q", subcgroup), err)
+			}
+		}
+
 		var serviceNames []string
 		for _, app := range p.Manifest.Apps {
 			serviceNames = append(serviceNames, stage1initcommon.ServiceUnitName(app.Name))
@@ -759,7 +765,6 @@ func getContainerSubCgroup(machineID string, canMachinedRegister, unified bool)
 		}
 	}
 
-	var subcgroup string
 	if fromUnit {
 		slice, err := util.GetRunningSlice()
 		if err != nil {
@@ -773,45 +778,44 @@ func getContainerSubCgroup(machineID string, canMachinedRegister, unified bool)
 		if err != nil {
 			return "", errwrap.Wrap(errors.New("could not get unit name"), err)
 		}
-		subcgroup = filepath.Join(slicePath, unit)
+		subcgroup := filepath.Join(slicePath, unit)
 
 		if unified {
-			subcgroup = filepath.Join(subcgroup, "payload")
+			return filepath.Join(subcgroup, "payload"), nil
 		}
-	} else {
-		escapedmID := strings.Replace(machineID, "-", "\\x2d", -1)
-		machineDir := "machine-" + escapedmID + ".scope"
-		if canMachinedRegister {
-			// we are not in the final cgroup yet: systemd-nspawn will move us
-			// to the correct cgroup later during registration so we can't
-			// look it up in /proc/self/cgroup
-			subcgroup = filepath.Join("machine.slice", machineDir)
-		} else {
-			if unified {
-				var err error
-				subcgroup, err = v2.GetOwnCgroupPath()
-				if err != nil {
-					return "", errwrap.Wrap(errors.New("could not get own v2 cgroup path"), err)
-				}
-			} else {
-				// when registration is disabled the container will be directly
-				// under the current cgroup so we can look it up in /proc/self/cgroup
-				ownV1CgroupPath, err := v1.GetOwnCgroupPath("name=systemd")
-				if err != nil {
-					return "", errwrap.Wrap(errors.New("could not get own v1 cgroup path"), err)
-				}
-				// systemd-nspawn won't work if we are in the root cgroup. In addition,
-				// we want all rkt instances to be in distinct cgroups. Create a
-				// subcgroup and add ourselves to it.
-				subcgroup = filepath.Join(ownV1CgroupPath, machineDir)
-				if err := v1.JoinSubcgroup("systemd", subcgroup); err != nil {
-					return "", errwrap.Wrap(fmt.Errorf("error joining %s subcgroup", ownV1CgroupPath), err)
-				}
-			}
+
+		return subcgroup, nil
+	}
+
+	escapedmID := strings.Replace(machineID, "-", "\\x2d", -1)
+	machineDir := "machine-" + escapedmID + ".scope"
+
+	if canMachinedRegister {
+		// we are not in the final cgroup yet: systemd-nspawn will move us
+		// to the correct cgroup later during registration so we can't
+		// look it up in /proc/self/cgroup
+		return filepath.Join("machine.slice", machineDir), nil
+	}
+
+	if unified {
+		subcgroup, err := v2.GetOwnCgroupPath()
+		if err != nil {
+			return "", errwrap.Wrap(errors.New("could not get own v2 cgroup path"), err)
 		}
+		return subcgroup, nil
+	}
+
+	// when registration is disabled the container will be directly
+	// under the current cgroup so we can look it up in /proc/self/cgroup
+	ownV1CgroupPath, err := v1.GetOwnCgroupPath("name=systemd")
+	if err != nil {
+		return "", errwrap.Wrap(errors.New("could not get own v1 cgroup path"), err)
 	}
 
-	return subcgroup, nil
+	// systemd-nspawn won't work if we are in the root cgroup. In addition,
+	// we want all rkt instances to be in distinct cgroups. Create a
+	// subcgroup and add ourselves to it.
+	return filepath.Join(ownV1CgroupPath, machineDir), nil
 }
 
 func main() {

From 3d46ff4013b3367994e06e981dd62455ec84b8ca Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 28 Nov 2016 09:23:20 +0000
Subject: [PATCH 0919/1304] stage1/common: gate systemd protection properties
 to >=233

rkt currently tries to switch on `ProtectKernelTunables` for supported
systemd versions (ie. >=232), but it does not work together with
`RootDirectory` due to https://github.com/systemd/systemd/pull/4594
which is targeted at v233.

This commit bumps the version check accordingly.
---
 stage1/init/common/pod.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index ea017af2ba..e69a001280 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -788,7 +788,7 @@ func protectKernelTunables(opts []*unit.UnitOption, appName types.ACName, system
 			opts = append(opts, unit.NewUnitOption("Service", "InaccessiblePaths", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
 		}
 	}
-	if systemdVersion >= 232 {
+	if systemdVersion >= 233 {
 		opts = append(opts, unit.NewUnitOption("Service", "ProtectKernelTunables", "true"))
 	}
 

From d9cb22077a215d7397c0ff1cf5e681354893c20a Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 28 Nov 2016 09:42:32 +0000
Subject: [PATCH 0920/1304] makelib: add a git describe step

---
 makelib/git.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/makelib/git.mk b/makelib/git.mk
index 1a4af48b1b..b571245a99 100644
--- a/makelib/git.mk
+++ b/makelib/git.mk
@@ -55,6 +55,8 @@ $(_GCL_FULL_PATH_): | $(GCL_DIRECTORY)
 	$(_GCL_GIT_) reset --hard $(call vl3,--quiet) "$${rev}"; \
 	$(call vb,vt,GIT CLEAN,$(call vsp,$(GCL_DIRECTORY))) \
 	$(_GCL_GIT_) clean -ffdx $(call vl3,--quiet); \
+	human_rev="$$($(_GCL_GIT_) describe --always)"; \
+	$(call vb,vt,GIT DESCRIBE,$(GCL_REPOSITORY) ($(GCL_COMMITTISH)) => "$${human_rev}") \
 	touch "$@"
 
 # remove the GCL_DIRECTORY if GCL_REPOSITORY changes

From f51d2fc61ad9f60467a4faa13cf0cba020431178 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 28 Nov 2016 09:45:09 +0000
Subject: [PATCH 0921/1304] tests: rkt-inspect does not notify systemd yet

---
 tests/image/manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/image/manifest b/tests/image/manifest
index 75fd5d3ca8..bc52c475e4 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -73,7 +73,7 @@
         },
         {
             "name": "appc.io/executor/supports-systemd-notify",
-            "value": "true"
+            "value": "false"
         }
     ]
 }

From 672c32f7ad20611caa9d7b0205721ef9c4f62fad Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 25 Nov 2016 10:13:30 +0000
Subject: [PATCH 0922/1304] stage1/app-rm: unmount volumes and bind-mounts

---
 stage1/app-rm/app-rm.go | 96 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 80 insertions(+), 16 deletions(-)

diff --git a/stage1/app-rm/app-rm.go b/stage1/app-rm/app-rm.go
index 7961e86c46..f6583a8781 100644
--- a/stage1/app-rm/app-rm.go
+++ b/stage1/app-rm/app-rm.go
@@ -18,10 +18,12 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"syscall"
 
 	"github.com/coreos/rkt/common"
 	rktlog "github.com/coreos/rkt/pkg/log"
@@ -29,20 +31,28 @@ import (
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 
 	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/pkg/mountinfo"
 )
 
 var (
-	flagApp string
-	debug   bool
-	log     *rktlog.Logger
-	diag    *rktlog.Logger
+	debug     bool
+	flagApp   string
+	flagStage int
+
+	log  *rktlog.Logger
+	diag *rktlog.Logger
 )
 
 func init() {
 	flag.StringVar(&flagApp, "app", "", "Application name")
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+
+	// `--stage` is an internal implementation detail, not part of stage1 contract
+	flag.IntVar(&flagStage, "stage", 0, "Removal step, defaults to 0 when called from the outside")
 }
 
+// This is a multi-step entrypoint. It starts in stage0 context then invokes
+// itself again in stage1 context to perform further cleanup at pod level.
 func main() {
 	flag.Parse()
 
@@ -59,7 +69,31 @@ func main() {
 	}
 
 	enterCmd := stage1common.PrepareEnterCmd(false)
+	switch flagStage {
+	case 0:
+		// clean resources in stage0
+		err = cleanupStage0(appName, enterCmd)
+	case 1:
+		// clean resources in stage1
+		err = cleanupStage1(appName, enterCmd)
+	default:
+		// unknown step
+		err = fmt.Errorf("unsupported cleaning step %d", flagStage)
+	}
+	if err != nil {
+		log.FatalE("cleanup error", err)
+	}
 
+	os.Exit(0)
+}
+
+// cleanupStage0 is the default initial step for rm entrypoint, which takes
+// care of cleaning up resources in stage0 and calling into stage1 by:
+//  1. ensuring that the service has been stopped
+//  2. removing unit files
+//  3. calling itself in stage1 for further cleanups
+//  4. calling `systemctl daemon-reload` in stage1
+func cleanupStage0(appName *types.ACName, enterCmd []string) error {
 	args := enterCmd
 	args = append(args, "/usr/bin/systemctl")
 	args = append(args, "is-active")
@@ -74,7 +108,7 @@ func main() {
 	out, _ := cmd.Output()
 
 	if string(out) != "inactive\n" {
-		log.Fatalf("app %q is still running", appName.String())
+		return fmt.Errorf("app %q is still running", appName.String())
 	}
 
 	s1rootfs := common.Stage1RootfsPath(".")
@@ -86,24 +120,54 @@ func main() {
 
 	for _, p := range appServicePaths {
 		if err := os.Remove(p); err != nil && !os.IsNotExist(err) {
-			log.FatalE("error removing app service file", err)
+			return fmt.Errorf("error removing app service file: %s", err)
 		}
 	}
 
-	args = enterCmd
-	args = append(args, "/usr/bin/systemctl")
-	args = append(args, "daemon-reload")
+	// TODO(sur): find all RW cgroups exposed for this app and clean them up in stage0 context
 
-	cmd = exec.Cmd{
-		Path: args[0],
-		Args: args,
+	// last cleaning steps are performed after entering pod context
+	tasks := [][]string{
+		// inception: call itself to clean stage1 before proceeding
+		{"/app-rm", "--stage=1", fmt.Sprintf("--app=%s", appName), fmt.Sprintf("--debug=%t", debug)},
+		// all cleaned-up, let systemd reload and forget about this app
+		{"/usr/bin/systemctl", "daemon-reload"},
 	}
+	for _, cmdLine := range tasks {
+		args := append(enterCmd, cmdLine...)
+		cmd = exec.Cmd{
+			Path: args[0],
+			Args: args,
+		}
 
-	if out, err := cmd.CombinedOutput(); err != nil {
-		log.Fatalf("%q failed at daemon-reload:\n%s", appName, out)
+		if out, err := cmd.CombinedOutput(); err != nil {
+			return fmt.Errorf("%q removal failed:\n%s", appName, out)
+		}
 	}
+	return nil
+}
 
-	// TODO unmount all the volumes
+// cleanupStage1 is meant to be executed in stage1 context. It inspects pod systemd-pid1 mountinfo to
+// find all remaining mountpoints for appName and proceed to clean them up.
+func cleanupStage1(appName *types.ACName, enterCmd []string) error {
+	// TODO(lucab): re-evaluate once/if we support systemd as non-pid1 (eg. host pid-ns inheriting)
+	mnts, err := mountinfo.ParseMounts(1)
+	if err != nil {
+		return err
+	}
+	appRootFs := filepath.Join("/opt/stage2", appName.String(), "rootfs")
+	mnts = mnts.Filter(mountinfo.HasPrefix(appRootFs))
+
+	// soft-errors here, stage0 may still be able to continue with the removal anyway
+	for _, m := range mnts {
+		// unlink first to avoid back-propagation
+		_ = syscall.Mount("", m.MountPoint, "", syscall.MS_PRIVATE|syscall.MS_REC, "")
+		// simple unmount, it may fail if the target is busy (eg. overlapping children)
+		if e := syscall.Unmount(m.MountPoint, 0); e != nil {
+			// if busy, just detach here and let the kernel clean it once free
+			_ = syscall.Unmount(m.MountPoint, syscall.MNT_DETACH)
+		}
+	}
 
-	os.Exit(0)
+	return nil
 }

From 4ad82564a1dda9a0d3ebc619a8c82a48dab9d3b6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 14 Nov 2016 14:08:11 +0000
Subject: [PATCH 0923/1304] tests: add smoke test for app sandbox

---
 tests/rkt_app_sandbox_test.go | 116 ++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 tests/rkt_app_sandbox_test.go

diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
new file mode 100644
index 0000000000..5f304525d9
--- /dev/null
+++ b/tests/rkt_app_sandbox_test.go
@@ -0,0 +1,116 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Disabled on kvm due to https://github.com/coreos/rkt/issues/3382
+// +build !fly,!kvm
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+// TestAppSandboxSmoke is a basic smoke test for `rkt app` sandbox
+// and related commands.
+func TestAppSandboxSmoke(t *testing.T) {
+	actionTimeout := 30 * time.Second
+	imageName := "coreos.com/rkt-inspect/hello"
+	appName := "hello-app"
+	msg := "HelloFromAppInSandbox"
+
+	aciHello := patchTestACI("rkt-inspect-hello.aci", fmt.Sprintf("--name=%s", imageName), fmt.Sprintf("--exec=/inspect --print-msg=%s", msg))
+	defer os.Remove(aciHello)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	cmd := strings.Fields(fmt.Sprintf("%s fetch --insecure-options=image %s", ctx.Cmd(), aciHello))
+	fetchCmd := exec.Command(cmd[0], cmd[1:]...)
+	fetchCmd.Env = append(fetchCmd.Env, "RKT_EXPERIMENT_APP=true")
+	fetchOutput, err := fetchCmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v\n%s", err, fetchOutput)
+	}
+
+	tmpDir := createTempDirOrPanic("rkt-test-cri-")
+	defer os.RemoveAll(tmpDir)
+
+	rktCmd := fmt.Sprintf("%s app sandbox --debug --uuid-file-save=%s/uuid", ctx.Cmd(), tmpDir)
+	err = os.Setenv("RKT_EXPERIMENT_APP", "true")
+	if err != nil {
+		panic(err)
+	}
+	child := spawnOrFail(t, rktCmd)
+	err = os.Unsetenv("RKT_EXPERIMENT_APP")
+	if err != nil {
+		panic(err)
+	}
+
+	expected := "Reached target rkt apps target."
+	if err := expectTimeoutWithOutput(child, expected, actionTimeout); err != nil {
+		t.Fatalf("Expected %q but not found: %v", expected, err)
+	}
+
+	podUUID, err := ioutil.ReadFile(filepath.Join(tmpDir, "uuid"))
+	if err != nil {
+		t.Fatalf("Can't read pod UUID: %v", err)
+	}
+
+	cmd = strings.Fields(fmt.Sprintf("%s app add --debug %s %s --name=%s", ctx.Cmd(), podUUID, imageName, appName))
+	addCmd := exec.Command(cmd[0], cmd[1:]...)
+	addCmd.Env = append(addCmd.Env, "RKT_EXPERIMENT_APP=true")
+	output, err := addCmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v\n%s", err, output)
+	}
+
+	cmd = strings.Fields(fmt.Sprintf("%s app start --debug %s --app=%s", ctx.Cmd(), podUUID, appName))
+	startCmd := exec.Command(cmd[0], cmd[1:]...)
+	startCmd.Env = append(startCmd.Env, "RKT_EXPERIMENT_APP=true")
+	output, err = startCmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v\n%s", err, output)
+	}
+
+	if err := expectTimeoutWithOutput(child, msg, actionTimeout); err != nil {
+		t.Fatalf("Expected %q but not found: %v", expected, err)
+	}
+
+	cmd = strings.Fields(fmt.Sprintf("%s app rm --debug %s --app=%s", ctx.Cmd(), podUUID, appName))
+	removeCmd := exec.Command(cmd[0], cmd[1:]...)
+	removeCmd.Env = append(removeCmd.Env, "RKT_EXPERIMENT_APP=true")
+	output, err = removeCmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v\n%s", err, output)
+	}
+
+	cmd = strings.Fields(fmt.Sprintf("%s stop %s", ctx.Cmd(), podUUID))
+	output, err = exec.Command(cmd[0], cmd[1:]...).CombinedOutput()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v\n%s", err, output)
+	}
+
+	if err := child.Wait(); err != nil {
+		t.Fatalf("rkt didn't terminate correctly: %v", err)
+	}
+}

From 92569cae1e00c7d231f800b5f72f4585e8c84bc8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 28 Nov 2016 20:58:22 +0000
Subject: [PATCH 0924/1304] docs: fix several broken links

This commit fixes several broken and wrong links, fixing all issues
highlighted by https://crates.io/crates/marker.
---
 Documentation/devel/cgroups.md  | 2 +-
 Documentation/hacking.md        | 2 +-
 Documentation/seccomp-guide.md  | 2 +-
 Documentation/trying-out-rkt.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/devel/cgroups.md b/Documentation/devel/cgroups.md
index cfaa06e15f..67d9b3526f 100644
--- a/Documentation/devel/cgroups.md
+++ b/Documentation/devel/cgroups.md
@@ -10,7 +10,7 @@
 
 When a recent version of systemd is running on the host and `rkt` is not started as a systemd service (typically, from the command line), `rkt` will call `systemd-nspawn` with `--register=true`. This will cause `systemd-nspawn` to call the D-Bus method `CreateMachineWithNetwork` on `systemd-machined` and the cgroup `/machine.slice/machine-rkt...` will be created. This requires systemd v216+ as detected by the [machinedRegister][machinedRegister] function in stage1's `init`.
 
-When systemd is not running on the host, or the systemd version is too old (< v216) to support the D-Bus method `CreateMachineWithNetwork`, `rkt` uses `systemd-nspawn` with the `--register=false` parameter. In this case, `systemd-nspawn` or other systemd components will not create new cgroups for rkt. On older `rkt` versions (<= 0.13.0), the pod was staying in the same cgroup as the caller. For example, it could be something like `/user.slice/user-1000.slice/session-1.scope`. Since [#1844](rkt-1844) (rkt >= 0.14.0), `rkt` creates a new cgroup for each pod, like `$CALLER_CGROUP/machine-some-id.slice`.
+When systemd is not running on the host, or the systemd version is too old (< v216) to support the D-Bus method `CreateMachineWithNetwork`, `rkt` uses `systemd-nspawn` with the `--register=false` parameter. In this case, `systemd-nspawn` or other systemd components will not create new cgroups for rkt. On older `rkt` versions (<= 0.13.0), the pod was staying in the same cgroup as the caller. For example, it could be something like `/user.slice/user-1000.slice/session-1.scope`. Since [#1844][rkt-1844] (rkt >= 0.14.0), `rkt` creates a new cgroup for each pod, like `$CALLER_CGROUP/machine-some-id.slice`.
 
 ### `rkt` started as a systemd service
 
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 9ea3f5a63d..a772260096 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -210,6 +210,6 @@ If something looks awry, restart, pray to your preferred deity, and try again.
 [glide-vc]: https://github.com/sgotti/glide-vc
 [glide-versioning]: https://glide.readthedocs.io/en/latest/versions/
 [go]: https://golang.org/
-[rkt-builer]: https://github.com/coreos/rkt-builder
+[rkt-builder]: https://github.com/coreos/rkt-builder
 [run-time-dependencies]: dependencies.md#run-time-dependencies
 [update-coreos-stage1]: devel/update-coreos-stage1.md
diff --git a/Documentation/seccomp-guide.md b/Documentation/seccomp-guide.md
index 1d9094abc7..94e011926a 100644
--- a/Documentation/seccomp-guide.md
+++ b/Documentation/seccomp-guide.md
@@ -382,7 +382,7 @@ set of syscalls requirements and follow best practices:
 [appc-isolators]: https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators
 [capabilities-guide]: capabilities-guide.md
 [docker-seccomp]: https://docs.docker.com/engine/security/seccomp/
-[lwm-seccomp]: https://lwn.net/Articles/656307/
+[lwn-seccomp]: https://lwn.net/Articles/656307/
 [man-errno]: http://man7.org/linux/man-pages/man3/errno.3.html
 [man-mount]: http://man7.org/linux/man-pages/man2/mount.2.html
 [man-ptrace]: http://man7.org/linux/man-pages/man2/ptrace.2.html
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index e367c0b2fb..ccfa7c912a 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -286,7 +286,7 @@ The escape character `^]` is generated by `Ctrl-]` on a US keyboard. The require
 [configdoc]: configuration.md
 [disable-selinux]: https://www.centos.org/docs/5/html/5.1/Deployment_Guide/sec-sel-enable-disable.html
 [distlist]: distributions.md
-[distro-pkg-help]: (https://github.com/coreos/rkt/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fdistribution++label%3Adependency%2Fexternal)
+[distro-pkg-help]: https://github.com/coreos/rkt/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fdistribution++label%3Adependency%2Fexternal
 [docker2aci]: https://github.com/appc/docker2aci
 [docker-nginx]: https://hub.docker.com/_/nginx/
 [etcd]: https://coreos.com/etcd/

From 88f5aa42b8ca75f7e8422702ad586c56913cf915 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Tue, 22 Nov 2016 01:38:18 -0800
Subject: [PATCH 0925/1304] cri: correct 'created' timestamp

Prior to this change, the mtime of the 'pod' file is used for the created
timestamp.

This is inaccurate in the case of CRI where the pod manifest is changed
with each app added.

To resolve that problem, a new file is introduced which is not touched
by the app add codepath.
---
 common/common.go              |  6 ++++++
 lib/app.go                    |  2 +-
 pkg/pod/pods.go               | 14 +++++++++++---
 stage0/run.go                 |  6 ++++++
 tests/rkt_api_service_test.go |  2 +-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/common/common.go b/common/common.go
index 143f64358f..3821fa7212 100644
--- a/common/common.go
+++ b/common/common.go
@@ -109,6 +109,12 @@ func PodManifestPath(root string) string {
 	return filepath.Join(root, "pod")
 }
 
+// PodCreatedPath returns the path in root to the Pod Created file used to
+// denote the time of creation.
+func PodCreatedPath(root string) string {
+	return filepath.Join(root, "pod-created")
+}
+
 // PodManifestLockPath returns the path in root to the Pod Manifest lock file.
 // This must be different from the PodManifestPath since mutations on the pod manifest file
 // happen by overwriting the original file.
diff --git a/lib/app.go b/lib/app.go
index ba4114b459..78bc7aa474 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -168,7 +168,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 	// Read exit code.
 	exitCode, err := readExitCode(appStatusFile)
 	if err != nil {
-		return fmt.Errorf("cannot read exit code: %v", err)
+		return err
 	}
 	app.ExitCode = &exitCode
 
diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index fbd70ce5d1..9abfb3538b 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -971,10 +971,18 @@ func (p *Pod) AppImageManifest(appName string) (*schema.ImageManifest, error) {
 // CreationTime returns the time when the pod was created.
 // This happens at prepare time.
 func (p *Pod) CreationTime() (time.Time, error) {
-	if p.isPrepared || p.isRunning() || p.AfterRun() {
-		return p.getModTime("pod")
+	if !(p.isPrepared || p.isRunning() || p.AfterRun()) {
+		return time.Time{}, nil
+	}
+	t, err := p.getModTime("pod-created")
+	if err == nil {
+		return t, nil
+	}
+	if !os.IsNotExist(err) {
+		return t, err
 	}
-	return time.Time{}, nil
+	// backwards compatibility with rkt before v1.20
+	return p.getModTime("pod")
 }
 
 // StartTime returns the time when the pod was started.
diff --git a/stage0/run.go b/stage0/run.go
index fb0ffe5ab9..9448439283 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -498,6 +498,12 @@ func Prepare(cfg PrepareConfig, dir string, uuid *types.UUID) error {
 		return errwrap.Wrap(errors.New("error writing pod manifest"), err)
 	}
 
+	f, err = os.OpenFile(common.PodCreatedPath(dir), os.O_CREATE|os.O_RDWR, common.DefaultRegularFilePerm)
+	if err != nil {
+		return err
+	}
+	f.Close()
+
 	if cfg.UseOverlay {
 		// mark the pod as prepared with overlay
 		f, err := os.Create(filepath.Join(dir, common.OverlayPreparedFilename))
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index e71843498d..e41c4c6dee 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -397,7 +397,7 @@ func NewAPIServiceListInspectPodsTest() testutils.Test {
 						},
 					},
 				},
-				"non-existed-network",
+				"non-existent-network",
 				254,
 			},
 		}

From dcc8c935e7a334dc089a0b3e69f09a59aa0fbfbf Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Sat, 19 Nov 2016 20:46:55 +0100
Subject: [PATCH 0926/1304] stage1/init: add Mounter interface

Currently mounting operations are very hard to debug. This adds a
Mounter interface, which logs mounting events if debug is enabled.
---
 common/cgroup/v1/cgroup.go       | 23 ++++-----
 pkg/fs/mount.go                  | 81 ++++++++++++++++++++++++++++++++
 pkg/fs/mount_linux.go            | 57 ++++++++++++++++++++++
 stage1/init/common/dns_config.go |  7 ++-
 stage1/init/common/mount.go      |  7 +--
 stage1/init/init.go              | 29 +++++++-----
 6 files changed, 177 insertions(+), 27 deletions(-)
 create mode 100644 pkg/fs/mount.go
 create mode 100644 pkg/fs/mount_linux.go

diff --git a/common/cgroup/v1/cgroup.go b/common/cgroup/v1/cgroup.go
index 20bf58a85e..6368259837 100644
--- a/common/cgroup/v1/cgroup.go
+++ b/common/cgroup/v1/cgroup.go
@@ -29,6 +29,7 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/coreos/rkt/pkg/fs"
 	"github.com/hashicorp/errwrap"
 )
 
@@ -41,13 +42,13 @@ var (
 )
 
 // mountFsRO remounts the given mountPoint using the given flags read-only.
-func mountFsRO(mountPoint string, flags uintptr) error {
+func mountFsRO(m fs.Mounter, mountPoint string, flags uintptr) error {
 	flags = flags |
 		syscall.MS_BIND |
 		syscall.MS_REMOUNT |
 		syscall.MS_RDONLY
 
-	if err := syscall.Mount(mountPoint, mountPoint, "", flags, ""); err != nil {
+	if err := m.Mount(mountPoint, mountPoint, "", flags, ""); err != nil {
 		return errwrap.Wrap(fmt.Errorf("error remounting read-only %q", mountPoint), err)
 	}
 
@@ -249,7 +250,7 @@ func IsControllerMounted(c string) bool {
 
 // CreateCgroups mounts the v1 cgroup controllers hierarchy in /sys/fs/cgroup
 // under root
-func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext string) error {
+func CreateCgroups(m fs.Mounter, root string, enabledCgroups map[int][]string, mountContext string) error {
 	controllers := GetControllerDirs(enabledCgroups)
 
 	sys := filepath.Join(root, "/sys")
@@ -263,7 +264,7 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 
 	// If we're mounting the host cgroups, /sys is probably mounted so we
 	// ignore EBUSY
-	if err := syscall.Mount("sysfs", sys, "sysfs", sysfsFlags, ""); err != nil && err != syscall.EBUSY {
+	if err := m.Mount("sysfs", sys, "sysfs", sysfsFlags, ""); err != nil && err != syscall.EBUSY {
 		return errwrap.Wrap(fmt.Errorf("error mounting %q", sys), err)
 	}
 
@@ -282,7 +283,7 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 		options = fmt.Sprintf("mode=755,context=\"%s\"", mountContext)
 	}
 
-	if err := syscall.Mount("tmpfs", cgroupTmpfs, "tmpfs", cgroupTmpfsFlags, options); err != nil {
+	if err := m.Mount("tmpfs", cgroupTmpfs, "tmpfs", cgroupTmpfsFlags, options); err != nil {
 		return errwrap.Wrap(fmt.Errorf("error mounting %q", cgroupTmpfs), err)
 	}
 
@@ -297,7 +298,7 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 			syscall.MS_NOEXEC |
 			syscall.MS_NODEV
 
-		if err := syscall.Mount("cgroup", cPath, "cgroup", flags, c); err != nil {
+		if err := m.Mount("cgroup", cPath, "cgroup", flags, c); err != nil {
 			return errwrap.Wrap(fmt.Errorf("error mounting %q", cPath), err)
 		}
 	}
@@ -317,7 +318,7 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 	}
 
 	// Bind-mount cgroup tmpfs filesystem read-only
-	return mountFsRO(cgroupTmpfs, cgroupTmpfsFlags)
+	return mountFsRO(m, cgroupTmpfs, cgroupTmpfsFlags)
 }
 
 // RemountCgroups remounts the v1 cgroup hierarchy under root.
@@ -325,7 +326,7 @@ func CreateCgroups(root string, enabledCgroups map[int][]string, mountContext st
 // but leaves needed knobs in the subcgroup for each app read-write,
 // such that systemd inside stage1 can apply isolators to them.
 // It leaves /sys read-write, if the given readWrite parameter is true.
-func RemountCgroups(root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string, readWrite bool) error {
+func RemountCgroups(m fs.Mounter, root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string, readWrite bool) error {
 	controllers := GetControllerDirs(enabledCgroups)
 	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
 	sysPath := filepath.Join(root, "/sys")
@@ -358,14 +359,14 @@ func RemountCgroups(root string, enabledCgroups map[int][]string, subcgroup stri
 				if _, err := os.Stat(cgroupFilePath); os.IsNotExist(err) {
 					continue
 				}
-				if err := syscall.Mount(cgroupFilePath, cgroupFilePath, "", syscall.MS_BIND, ""); err != nil {
+				if err := m.Mount(cgroupFilePath, cgroupFilePath, "", syscall.MS_BIND, ""); err != nil {
 					return errwrap.Wrap(fmt.Errorf("error bind mounting %q", cgroupFilePath), err)
 				}
 			}
 		}
 
 		// Re-mount controller read-only to prevent the container modifying host controllers
-		if err := mountFsRO(cPath, flags); err != nil {
+		if err := mountFsRO(m, cPath, flags); err != nil {
 			return err
 		}
 	}
@@ -375,7 +376,7 @@ func RemountCgroups(root string, enabledCgroups map[int][]string, subcgroup stri
 	}
 
 	// Bind-mount sys filesystem read-only
-	return mountFsRO(sysPath, flags)
+	return mountFsRO(m, sysPath, flags)
 }
 
 // RemountCgroupKnobsRW remounts the needed knobs in the subcgroup for one
diff --git a/pkg/fs/mount.go b/pkg/fs/mount.go
new file mode 100644
index 0000000000..f9c656dfb0
--- /dev/null
+++ b/pkg/fs/mount.go
@@ -0,0 +1,81 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package fs
+
+// Mounter is the interface that mounts a filesystem. It's signature is the same as syscall.Mount.
+type Mounter interface {
+	Mount(source string, target string, fstype string, flags uintptr, data string) error
+}
+
+// MounterFunc is a functional type that implements Mounter.
+// The mount syscall can be wrapped using MounterFunc(syscall.Mount) to be used as a Mounter.
+type MounterFunc func(string, string, string, uintptr, string) error
+
+func (m MounterFunc) Mount(source string, target string, fstype string, flags uintptr, data string) error {
+	return m(source, target, fstype, flags, data)
+}
+
+// Unmounter is the interface that unmounts a filesystem. It's signature is the same as syscall.Unmount.
+type Unmounter interface {
+	Unmount(target string, flags int) error
+}
+
+// UnmounterFunc is a functional type that implements Unmounter.
+// The unmount syscall can be wrapped using UnmounterFunc(syscall.Unmount) to be used as an Unmounter.
+type UnmounterFunc func(string, int) error
+
+func (m UnmounterFunc) Unmount(target string, flags int) error {
+	return m(target, flags)
+}
+
+// A MountUnmounter is the interface that mounts, and unmounts filesystems.
+type MountUnmounter interface {
+	Mounter
+	Unmounter
+}
+
+type loggingMounter struct {
+	m    Mounter
+	um   Unmounter
+	logf func(string, ...interface{})
+}
+
+// NewLoggingMounter returns a MountUnmounter that logs mount events using the given logger func.
+func NewLoggingMounter(m Mounter, um Unmounter, logf func(string, ...interface{})) MountUnmounter {
+	return &loggingMounter{m, um, logf}
+}
+
+func (l *loggingMounter) Mount(source string, target string, fstype string, flags uintptr, data string) error {
+	l.logf(
+		"mounting source %q target %q fstype %q flags %v data %q",
+		source, target, fstype, mountFlags(flags), data,
+	)
+
+	return l.m.Mount(source, target, fstype, flags, data)
+}
+
+func (l *loggingMounter) Unmount(target string, flags int) error {
+	l.logf(
+		"unmounting target %q flags %v",
+		target, mountFlags(flags),
+	)
+
+	return l.um.Unmount(target, flags)
+}
+
+// mountFlags wraps uintptr mount flags.
+// It is supposed to implement the String() method for log output.
+// The implementation is system dependent, gated by build tags.
+type mountFlags uintptr
diff --git a/pkg/fs/mount_linux.go b/pkg/fs/mount_linux.go
new file mode 100644
index 0000000000..0896c6ac06
--- /dev/null
+++ b/pkg/fs/mount_linux.go
@@ -0,0 +1,57 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package fs
+
+import (
+	"strings"
+	"syscall"
+)
+
+// String returns a human readable representation of mountFlags based on which bits are set.
+// E.g. for a value of syscall.MS_RDONLY|syscall.MS_BIND it will print "MS_RDONLY|MS_BIND"
+func (f mountFlags) String() string {
+	var s []string
+
+	maybeAppendFlag := func(ff uintptr, desc string) {
+		if uintptr(f)&ff != 0 {
+			s = append(s, desc)
+		}
+	}
+
+	maybeAppendFlag(syscall.MS_DIRSYNC, "MS_DIRSYNC")
+	maybeAppendFlag(syscall.MS_MANDLOCK, "MS_MANDLOCK")
+	maybeAppendFlag(syscall.MS_NOATIME, "MS_NOATIME")
+	maybeAppendFlag(syscall.MS_NODEV, "MS_NODEV")
+	maybeAppendFlag(syscall.MS_NODIRATIME, "MS_NODIRATIME")
+	maybeAppendFlag(syscall.MS_NOEXEC, "MS_NOEXEC")
+	maybeAppendFlag(syscall.MS_NOSUID, "MS_NOSUID")
+	maybeAppendFlag(syscall.MS_RDONLY, "MS_RDONLY")
+	maybeAppendFlag(syscall.MS_REC, "MS_REC")
+	maybeAppendFlag(syscall.MS_RELATIME, "MS_RELATIME")
+	maybeAppendFlag(syscall.MS_SILENT, "MS_SILENT")
+	maybeAppendFlag(syscall.MS_STRICTATIME, "MS_STRICTATIME")
+	maybeAppendFlag(syscall.MS_SYNCHRONOUS, "MS_SYNCHRONOUS")
+	maybeAppendFlag(syscall.MS_REMOUNT, "MS_REMOUNT")
+	maybeAppendFlag(syscall.MS_BIND, "MS_BIND")
+	maybeAppendFlag(syscall.MS_SHARED, "MS_SHARED")
+	maybeAppendFlag(syscall.MS_PRIVATE, "MS_PRIVATE")
+	maybeAppendFlag(syscall.MS_SLAVE, "MS_SLAVE")
+	maybeAppendFlag(syscall.MS_UNBINDABLE, "MS_UNBINDABLE")
+	maybeAppendFlag(syscall.MS_MOVE, "MS_MOVE")
+
+	return strings.Join(s, "|")
+}
diff --git a/stage1/init/common/dns_config.go b/stage1/init/common/dns_config.go
index 996f84512e..ffcf0bfc11 100644
--- a/stage1/init/common/dns_config.go
+++ b/stage1/init/common/dns_config.go
@@ -18,14 +18,16 @@ import (
 	"path/filepath"
 
 	_common "github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/fs"
 )
 
 /*
  Bind-mount the hosts /etc/resolv.conf in to the stage1's /etc/rkt-resolv.conf.
  That file will then be bind-mounted in to the stage2 by perpare-app.c
 */
-func UseHostResolv(podRoot string) error {
+func UseHostResolv(mnt fs.MountUnmounter, podRoot string) error {
 	return BindMount(
+		mnt,
 		"/etc/resolv.conf",
 		filepath.Join(_common.Stage1RootfsPath(podRoot), "etc/rkt-resolv.conf"),
 		true)
@@ -35,8 +37,9 @@ func UseHostResolv(podRoot string) error {
  Bind-mount the hosts /etc/hosts in to the stage1's /etc/rkt-hosts
  That file will then be bind-mounted in to the stage2 by perpare-app.c
 */
-func UseHostHosts(podRoot string) error {
+func UseHostHosts(mnt fs.MountUnmounter, podRoot string) error {
 	return BindMount(
+		mnt,
 		"/etc/hosts",
 		filepath.Join(_common.Stage1RootfsPath(podRoot), "etc/rkt-hosts"),
 		true)
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index eca41f9a72..afa4f75f8c 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -24,6 +24,7 @@ import (
 	"syscall"
 
 	"github.com/coreos/rkt/pkg/fileutil"
+	"github.com/coreos/rkt/pkg/fs"
 	"github.com/coreos/rkt/pkg/user"
 
 	"github.com/appc/spec/schema"
@@ -229,7 +230,7 @@ func PrepareMountpoints(volPath string, targetPath string, vol *types.Volume, do
 // * evaluate all symlinks
 // * ensure the source exists
 // * recursively create the destination
-func BindMount(source, destination string, readOnly bool) error {
+func BindMount(mnt fs.MountUnmounter, source, destination string, readOnly bool) error {
 	absSource, err := filepath.EvalSymlinks(source)
 	if err != nil {
 		return errwrap.Wrap(fmt.Errorf("Could not resolve symlink for source %v", source), err)
@@ -241,11 +242,11 @@ func BindMount(source, destination string, readOnly bool) error {
 		return errwrap.Wrap(fmt.Errorf("Could not bind mount %v to %v", absSource, destination), err)
 	}
 	if readOnly {
-		err := syscall.Mount(source, destination, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
+		err := mnt.Mount(source, destination, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
 
 		// If we failed to remount ro, unmount
 		if err != nil {
-			syscall.Unmount(destination, 0) // if this fails, oh well
+			mnt.Unmount(destination, 0) // if this fails, oh well
 			return errwrap.Wrap(fmt.Errorf("Could not remount %v read-only", destination), err)
 		}
 	}
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 1e6305d604..88fda9b03d 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -51,6 +51,7 @@ import (
 	commonnet "github.com/coreos/rkt/common/networking"
 	"github.com/coreos/rkt/networking"
 	pkgflag "github.com/coreos/rkt/pkg/flag"
+	"github.com/coreos/rkt/pkg/fs"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/stage1/init/kvm"
@@ -570,12 +571,18 @@ func stage1() int {
 		DisableSeccomp:      disableSeccomp,
 	}
 
+	mnt := fs.NewLoggingMounter(
+		fs.MounterFunc(syscall.Mount),
+		fs.UnmounterFunc(syscall.Unmount),
+		diag.Printf,
+	)
+
 	if dnsConfMode.Pairs["resolv"] == "host" {
-		stage1initcommon.UseHostResolv(root)
+		stage1initcommon.UseHostResolv(mnt, root)
 	}
 
 	if dnsConfMode.Pairs["hosts"] == "host" {
-		stage1initcommon.UseHostHosts(root)
+		stage1initcommon.UseHostHosts(mnt, root)
 	}
 
 	if mutable {
@@ -620,10 +627,10 @@ func stage1() int {
 	// from the host propagate to the new namespace and are forwarded to
 	// its peer group
 	// See https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt
-	if err := syscall.Mount("", "/", "none", syscall.MS_REC|syscall.MS_SLAVE, ""); err != nil {
+	if err := mnt.Mount("", "/", "none", syscall.MS_REC|syscall.MS_SLAVE, ""); err != nil {
 		log.FatalE("error making / a slave mount", err)
 	}
-	if err := syscall.Mount("", "/", "none", syscall.MS_REC|syscall.MS_SHARED, ""); err != nil {
+	if err := mnt.Mount("", "/", "none", syscall.MS_REC|syscall.MS_SHARED, ""); err != nil {
 		log.FatalE("error making / a shared and slave mount", err)
 	}
 
@@ -651,7 +658,7 @@ func stage1() int {
 			log.FatalE("error getting v1 cgroups", err)
 		}
 
-		if err := mountHostV1Cgroups(enabledCgroups); err != nil {
+		if err := mountHostV1Cgroups(mnt, enabledCgroups); err != nil {
 			log.FatalE("couldn't mount the host v1 cgroups", err)
 		}
 
@@ -666,7 +673,7 @@ func stage1() int {
 			serviceNames = append(serviceNames, stage1initcommon.ServiceUnitName(app.Name))
 		}
 
-		if err := mountContainerV1Cgroups(s1Root, enabledCgroups, subcgroup, serviceNames, insecureOptions); err != nil {
+		if err := mountContainerV1Cgroups(mnt, s1Root, enabledCgroups, subcgroup, serviceNames, insecureOptions); err != nil {
 			log.FatalE("couldn't mount the container v1 cgroups", err)
 		}
 
@@ -718,11 +725,11 @@ func areHostV1CgroupsMounted(enabledV1Cgroups map[int][]string) bool {
 // "name=systemd" cgroup or don't mount the cgroup controllers in
 // "/sys/fs/cgroup", and systemd-nspawn needs this. Since this is mounted
 // inside the rkt mount namespace, it doesn't affect the host.
-func mountHostV1Cgroups(enabledCgroups map[int][]string) error {
+func mountHostV1Cgroups(m fs.Mounter, enabledCgroups map[int][]string) error {
 	systemdControllerPath := "/sys/fs/cgroup/systemd"
 	if !areHostV1CgroupsMounted(enabledCgroups) {
 		mountContext := os.Getenv(common.EnvSELinuxMountContext)
-		if err := v1.CreateCgroups("/", enabledCgroups, mountContext); err != nil {
+		if err := v1.CreateCgroups(m, "/", enabledCgroups, mountContext); err != nil {
 			return errwrap.Wrap(errors.New("error creating host cgroups"), err)
 		}
 	}
@@ -731,7 +738,7 @@ func mountHostV1Cgroups(enabledCgroups map[int][]string) error {
 		if err := os.MkdirAll(systemdControllerPath, 0700); err != nil {
 			return err
 		}
-		if err := syscall.Mount("cgroup", systemdControllerPath, "cgroup", 0, "none,name=systemd"); err != nil {
+		if err := m.Mount("cgroup", systemdControllerPath, "cgroup", 0, "none,name=systemd"); err != nil {
 			return errwrap.Wrap(fmt.Errorf("error mounting name=systemd hierarchy on %q", systemdControllerPath), err)
 		}
 	}
@@ -742,9 +749,9 @@ func mountHostV1Cgroups(enabledCgroups map[int][]string) error {
 // mountContainerV1Cgroups mounts the cgroup controllers hierarchy in the container's
 // namespace read-only, leaving the needed knobs in the subcgroup for each-app
 // read-write so systemd inside stage1 can apply isolators to them
-func mountContainerV1Cgroups(s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string, secopts stage1initcommon.Stage1InsecureOptions) error {
+func mountContainerV1Cgroups(m fs.Mounter, s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string, secopts stage1initcommon.Stage1InsecureOptions) error {
 	mountContext := os.Getenv(common.EnvSELinuxMountContext)
-	if err := v1.CreateCgroups(s1Root, enabledCgroups, mountContext); err != nil {
+	if err := v1.CreateCgroups(m, s1Root, enabledCgroups, mountContext); err != nil {
 		return errwrap.Wrap(errors.New("error creating container cgroups"), err)
 	}
 

From 70ab0f6026fa2aec613f3da835651a7ebcbd15a7 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Sat, 19 Nov 2016 20:49:06 +0100
Subject: [PATCH 0927/1304] stage1/init: add more diag outputs

---
 stage1/init/init.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 88fda9b03d..bd35b17f0a 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -611,10 +611,14 @@ func stage1() int {
 		// kvm doesn't register with systemd right now, see #2664.
 		canMachinedRegister = machinedRegister()
 	}
+	diag.Printf("canMachinedRegister %t", canMachinedRegister)
+
 	args, env, err := getArgsEnv(p, flavor, canMachinedRegister, debug, n, insecureOptions)
 	if err != nil {
 		log.FatalE("cannot get environment", err)
 	}
+	diag.Printf("args %q", args)
+	diag.Printf("env %q", env)
 
 	// create a separate mount namespace so the cgroup filesystems
 	// are unmounted when exiting the pod
@@ -638,6 +642,7 @@ func stage1() int {
 	if err != nil {
 		log.FatalE("error determining cgroup version", err)
 	}
+	diag.Printf("unifiedCgroup %t", unifiedCgroup)
 
 	s1Root := common.Stage1RootfsPath(p.Root)
 	machineID := stage1initcommon.GetMachineID(p)
@@ -646,6 +651,7 @@ func stage1() int {
 	if err != nil {
 		log.FatalE("error getting container subcgroup", err)
 	}
+	diag.Printf("subcgroup %q", subcgroup)
 
 	if err := ioutil.WriteFile(filepath.Join(p.Root, "subcgroup"),
 		[]byte(fmt.Sprintf("%s", subcgroup)), 0644); err != nil {
@@ -657,6 +663,7 @@ func stage1() int {
 		if err != nil {
 			log.FatalE("error getting v1 cgroups", err)
 		}
+		diag.Printf("enabledCgroups %q", enabledCgroups)
 
 		if err := mountHostV1Cgroups(mnt, enabledCgroups); err != nil {
 			log.FatalE("couldn't mount the host v1 cgroups", err)
@@ -672,6 +679,7 @@ func stage1() int {
 		for _, app := range p.Manifest.Apps {
 			serviceNames = append(serviceNames, stage1initcommon.ServiceUnitName(app.Name))
 		}
+		diag.Printf("serviceNames %q", serviceNames)
 
 		if err := mountContainerV1Cgroups(mnt, s1Root, enabledCgroups, subcgroup, serviceNames, insecureOptions); err != nil {
 			log.FatalE("couldn't mount the container v1 cgroups", err)
@@ -696,7 +704,6 @@ func stage1() int {
 			log.FatalE("error preparing mounts", err)
 		}
 	}
-	diag.Println(args)
 
 	err = stage1common.WithClearedCloExec(lfd, func() error {
 		return syscall.Exec(args[0], args, env)

From 28cfe986ed5ccde7f21176879c2c03384b000b9f Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Sat, 19 Nov 2016 21:06:23 +0100
Subject: [PATCH 0928/1304] stage1/init: fix LD_LIBRARY_PATH for src flavor.

... it missed usr/lib.
---
 stage1/init/init.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index bd35b17f0a..14c120d65d 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -385,7 +385,9 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 		// use only dynamic libraries provided in the image
 		// from systemd v231 there's a new internal libsystemd-shared-v231.so
 		// which is present in /usr/lib/systemd
-		env = append(env, "LD_LIBRARY_PATH="+filepath.Join(common.Stage1RootfsPath(p.Root), "usr/lib/systemd"))
+		env = append(env, "LD_LIBRARY_PATH="+
+			filepath.Join(common.Stage1RootfsPath(p.Root), "usr/lib")+":"+
+			filepath.Join(common.Stage1RootfsPath(p.Root), "usr/lib/systemd"))
 
 	case "host":
 		hostNspawnBin, err := common.LookupPath("systemd-nspawn", os.Getenv("PATH"))

From e67b3a2c6fb2924b08f0fcbe0371c1c7e0453441 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 22 Nov 2016 12:36:14 +0100
Subject: [PATCH 0929/1304] cgroup/v1: move cgroup.procs to
 cgroupControllerRWFiles var

Currently the cgroup.procs knob is magically appended in the
getControllerRWFiles method. This makes it more explicit, and adds it
to the referenced const var cgroupControllerRWFiles directly.
---
 common/cgroup/v1/cgroup.go | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/common/cgroup/v1/cgroup.go b/common/cgroup/v1/cgroup.go
index 6368259837..e169627afa 100644
--- a/common/cgroup/v1/cgroup.go
+++ b/common/cgroup/v1/cgroup.go
@@ -35,9 +35,20 @@ import (
 
 var (
 	cgroupControllerRWFiles = map[string][]string{
-		"memory":  {"memory.limit_in_bytes"},
-		"cpu":     {"cpu.cfs_quota_us", "cpu.shares"},
-		"devices": {"devices.allow", "devices.deny"},
+		"memory": {
+			"memory.limit_in_bytes",
+			"cgroup.procs",
+		},
+		"cpu": {
+			"cpu.cfs_quota_us",
+			"cpu.shares",
+			"cgroup.procs",
+		},
+		"devices": {
+			"devices.allow",
+			"devices.deny",
+			"cgroup.procs",
+		},
 	}
 )
 
@@ -136,11 +147,9 @@ func CgroupControllerRWFiles(isolator string) []string {
 
 func getControllerRWFiles(controller string) []string {
 	parts := strings.Split(controller, ",")
+
 	for _, p := range parts {
 		if files, ok := cgroupControllerRWFiles[p]; ok {
-			// cgroup.procs always needs to be RW for allowing systemd to add
-			// processes to the controller
-			files = append(files, "cgroup.procs")
 			return files
 		}
 	}

From db9cf2376f1f06c9955c73a1c30b57dda2533353 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 22 Nov 2016 17:28:38 +0100
Subject: [PATCH 0930/1304] tests: replace gexpect with native exec.Command
 calls

Currently we use gexpect to invoke an external command, and check its
output against a regex. This is unnecessary.

This replaces one function runRktAndCheckRegexOutput and implements a
simple exec.Command call, checking its output against the given regex.
---
 tests/rkt_fetch_test.go | 25 ++++++++++++-------------
 tests/rkt_tests.go      | 27 +++++++++++++++++++++------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 66421c659f..756e388647 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -31,6 +31,7 @@ import (
 	"time"
 
 	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/tests/testutils"
 	taas "github.com/coreos/rkt/tests/testutils/aci-server"
 )
@@ -83,10 +84,10 @@ func testFetchFromFile(t *testing.T, arg string, image string) {
 	runRktAndCheckOutput(t, cmd, fetchFromFileMsg, false)
 }
 
-// TestFetch tests that 'rkt fetch/run/prepare' for any type (image name string
+// TestFetchAny tests that 'rkt fetch/run/prepare' for any type (image name string
 // or URL) except file:// URL will work with the default, store only
 // (--store-only) and remote only (--no-store) behaviors.
-func TestFetch(t *testing.T) {
+func TestFetchAny(t *testing.T) {
 	image := "rkt-inspect-implicit-fetch.aci"
 	imagePath := patchTestACI(image, "--exec=/inspect")
 
@@ -161,15 +162,12 @@ func testFetchDefault(t *testing.T, arg string, image string, imageArgs string,
 	cmd := fmt.Sprintf("%s %s %s %s", ctx.Cmd(), arg, image, imageArgs)
 
 	// 1. Run cmd with the image not available in the store, should get $remoteFetchMsg.
-	child := spawnOrFail(t, cmd)
-	err := expectWithOutput(child, remoteFetchMsg)
-	if exitErr := checkExitStatus(child); exitErr != nil {
-		t.Logf("%v", exitErr)
+	err := runRktAndCheckRegexOutput(t, cmd, remoteFetchMsg)
+	status, _ := common.GetExitStatus(err)
+	if status != 0 {
+		t.Logf("%v", err)
 		t.Skip("remote fetching failed, probably a network failure. Skipping...")
 	}
-	if err != nil {
-		t.Fatalf("%q should be found: %v", remoteFetchMsg, err)
-	}
 
 	// 2. Run cmd with the image available in the store, should get $storeMsg.
 	runRktAndCheckRegexOutput(t, cmd, storeMsg)
@@ -211,12 +209,13 @@ func testFetchNoStore(t *testing.T, args string, image string, imageArgs string,
 	cmd := fmt.Sprintf("%s --no-store %s %s %s", ctx.Cmd(), args, image, imageArgs)
 
 	// 1. Run cmd with the image available in the store, should get $remoteFetchMsg.
-	child := spawnOrFail(t, cmd)
-	err := expectWithOutput(child, remoteFetchMsg)
-	if exitErr := checkExitStatus(child); exitErr != nil {
-		t.Logf("%v", exitErr)
+	err := runRktAndCheckRegexOutput(t, cmd, remoteFetchMsg)
+	status, _ := common.GetExitStatus(err)
+	if status != 0 {
+		t.Logf("%v", err)
 		t.Skip("remote fetching failed, probably a network failure. Skipping...")
 	}
+
 	if err != nil {
 		t.Fatalf("%q should be found: %v", remoteFetchMsg, err)
 	}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index c0ec4357bd..337544c803 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -42,6 +42,7 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/tests/testutils"
 	taas "github.com/coreos/rkt/tests/testutils/aci-server"
+	shellquote "github.com/kballard/go-shellquote"
 	"google.golang.org/grpc"
 )
 
@@ -385,14 +386,28 @@ func startRktAsUidGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, e
 	return child
 }
 
-func runRktAndCheckRegexOutput(t *testing.T, rktCmd, match string) {
-	child := spawnOrFail(t, rktCmd)
-	defer child.Wait()
+func runRktAndCheckRegexOutput(t *testing.T, rktCmd, match string) error {
+	re, err := regexp.Compile(match)
+	if err != nil {
+		t.Fatalf("error compiling regex %q: %v", match, err)
+	}
 
-	result, out, err := expectRegexWithOutput(child, match)
-	if err != nil || len(result) != 1 {
-		t.Fatalf("%q regex must be found one time, Error: %v\nOutput: %v", match, err, out)
+	args, err := shellquote.Split(rktCmd)
+	if err != nil {
+		t.Fatalf("error splitting cmd %q: %v", rktCmd, err)
 	}
+
+	path, err := exec.LookPath(args[0])
+	cmd := exec.Command(path, args[1:]...)
+
+	out, err := cmd.CombinedOutput()
+
+	result := re.MatchString(string(out))
+	if !result {
+		t.Fatalf("%q regex must be found\nOutput: %q", match, string(out))
+	}
+
+	return err
 }
 
 func runRktAndCheckOutput(t *testing.T, rktCmd, expectedLine string, expectError bool) {

From c60e845c887426f4c2f86640ab9fd6d67eedd80d Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Wed, 30 Nov 2016 13:28:59 +0100
Subject: [PATCH 0931/1304] tests: clean up
 TestNetDefaultRestrictedConnectivity

Fixes #2943
---
 tests/rkt_net_test.go | 48 +++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index 9787135243..7f1a7330ce 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -307,20 +307,17 @@ func NewTestNetDefaultRestrictedConnectivity() testutils.Test {
 		defer ctx.Cleanup()
 
 		f := func(argument string) {
-			httpPort, err := testutils.GetNextFreePort4()
-			if err != nil {
-				t.Fatalf("%v", err)
-			}
-			httpServeAddr := fmt.Sprintf("0.0.0.0:%v", httpPort)
+			httpPort := "8080"
 			iface := "eth0"
 
-			testImageArgs := []string{fmt.Sprintf("--exec=/inspect --print-ipv4=%v --serve-http=%v", iface, httpServeAddr)}
+			testImageArgs := []string{fmt.Sprintf("--exec=/inspect --print-ipv4=%v --serve-http=0.0.0.0:%v", iface, httpPort)}
 			testImage := patchTestACI("rkt-inspect-networking.aci", testImageArgs...)
 			defer os.Remove(testImage)
 
-			cmd := fmt.Sprintf("%s --debug --insecure-options=image run %s --mds-register=false %s", ctx.Cmd(), argument, testImage)
+			cmd := fmt.Sprintf("%s --insecure-options=image run %s --mds-register=false %s", ctx.Cmd(), argument, testImage)
 			child := spawnOrFail(t, cmd)
 
+			// Wait for the container to print out the IP address
 			expectedRegex := `IPv4: (\d+\.\d+\.\d+\.\d+)`
 			result, out, err := expectRegexWithOutput(child, expectedRegex)
 			if err != nil {
@@ -328,31 +325,18 @@ func NewTestNetDefaultRestrictedConnectivity() testutils.Test {
 			}
 			httpGetAddr := fmt.Sprintf("http://%v:%v", result[1], httpPort)
 
-			ga := testutils.NewGoroutineAssistant(t)
-			ga.Add(2)
-
-			// Child opens the server
-			go func() {
-				defer ga.Done()
-				ga.WaitOrFail(child)
-			}()
-
-			// Host connects to the child
-			go func() {
-				defer ga.Done()
-				expectedRegex := `serving on`
-				_, out, err := expectRegexWithOutput(child, expectedRegex)
-				if err != nil {
-					ga.Fatalf("Error: %v\nOutput: %v", err, out)
-				}
-				body, err := testutils.HTTPGet(httpGetAddr)
-				if err != nil {
-					ga.Fatalf("%v\n", err)
-				}
-				t.Logf("HTTP-Get received: %s", body)
-			}()
-
-			ga.Wait()
+			// Wait for the container to open the port
+			expectedRegex = `serving on`
+			_, out, err = expectRegexWithOutput(child, expectedRegex)
+			if err != nil {
+				t.Fatalf("Error: %v\nOutput: %v", err, out)
+			}
+			body, err := testutils.HTTPGet(httpGetAddr)
+			if err != nil {
+				t.Fatalf("%v\n", err)
+			}
+			t.Logf("HTTP-Get received: %s", body)
+			waitOrFail(t, child, 0)
 		}
 		f("--net=default-restricted")
 	})

From 46bfedcad5877c18bab256fcd2904e58c7a10850 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 30 Nov 2016 14:04:11 +0100
Subject: [PATCH 0932/1304] sandbox add missing flagDNSDomain and
 flagHostsEntries parameters

These were missing.

Fixes #3428
---
 rkt/app_sandbox.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
index 14854a29d4..4864a83876 100644
--- a/rkt/app_sandbox.go
+++ b/rkt/app_sandbox.go
@@ -54,6 +54,8 @@ func init() {
 	cmdAppSandbox.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf")
 	cmdAppSandbox.Flags().Var(&flagDNSSearch, "dns-search", "DNS search domains to write in /etc/resolv.conf")
 	cmdAppSandbox.Flags().Var(&flagDNSOpt, "dns-opt", "DNS options to write in /etc/resolv.conf")
+	cmdAppSandbox.Flags().StringVar(&flagDNSDomain, "dns-domain", "", "DNS domain to write in /etc/resolv.conf")
+	cmdAppSandbox.Flags().Var(&flagHostsEntries, "hosts-entry", "Entries to add to the pod-wide /etc/hosts. Pass 'host' to use the host's /etc/hosts")
 	cmdAppSandbox.Flags().StringVar(&flagHostname, "hostname", "", `pod's hostname. If empty, it will be "rkt-$PODUUID"`)
 	cmdAppSandbox.Flags().Var(&flagAppPorts, "port", "ports to forward. format: \"name:proto:podPort:hostIP:hostPort\"")
 

From e01bb4899fe3ef75fc5bff72d4e3c011b8160cfa Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Tue, 29 Nov 2016 18:12:34 +0100
Subject: [PATCH 0933/1304] stage0: remove usage of stage1 code, refactor
 manifest locking slightly, fix --debug

---
 pkg/pod/pods.go     | 32 ++++++++++++++++++++
 rkt/app_add.go      |  5 ++++
 rkt/app_rm.go       |  9 ++++--
 rkt/app_sandbox.go  |  1 +
 rkt/app_start.go    | 11 +++++--
 rkt/app_stop.go     | 11 +++++--
 rkt/prepare.go      |  1 +
 rkt/run.go          |  1 +
 rkt/run_prepared.go |  1 +
 stage0/app.go       | 73 ++++++++++++++++++++++++++-------------------
 stage0/run.go       |  1 +
 11 files changed, 107 insertions(+), 39 deletions(-)

diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index e7e764b207..dcad17cb57 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -46,6 +46,8 @@ type Pod struct {
 	MountLabel string            // Label to use for container image
 
 	*lock.FileLock
+	manifestLock *lock.FileLock
+
 	dataDir string // The data directory where the pod lives in.
 
 	createdByMe bool // true if we're the creator of this pod (only the creator can ToPrepare or ToRun directly from preparing)
@@ -1187,3 +1189,33 @@ func (p *Pod) AppExitCode(appName string) (int, error) {
 	statusFile := filepath.Join(stage1RootfsPath, "/rkt/status/", appName)
 	return p.readIntFromFile(statusFile)
 }
+
+// ManifestExclusiveLock gets an exclusive lock on only the pod manifest.
+// This is used in the app sandbox - since the pod is already running, we
+// won't be able to get an exclusive lock on the pod itself.
+func (p *Pod) ExclusiveManifestLock() error {
+	if p.manifestLock != nil {
+		return p.manifestLock.ExclusiveLock() // This is idempotent
+	}
+
+	l, err := lock.ExclusiveLock(common.PodManifestLockPath(p.Path()), lock.RegFile)
+	if err != nil {
+		return err
+	}
+
+	p.manifestLock = l
+	return nil
+}
+
+// ManifestUnlock unlocks the pod manifest lock.
+func (p *Pod) ManifestUnlock() error {
+	if p.manifestLock == nil {
+		return nil
+	}
+
+	if err := p.manifestLock.Close(); err != nil {
+		return err
+	}
+	p.manifestLock = nil
+	return nil
+}
diff --git a/rkt/app_add.go b/rkt/app_add.go
index 08b36ead87..49374f358b 100644
--- a/rkt/app_add.go
+++ b/rkt/app_add.go
@@ -113,6 +113,7 @@ func runAppAdd(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	ccfg := stage0.CommonConfig{
+		DataDir:   getDataDir(),
 		Store:     s,
 		TreeStore: ts,
 		UUID:      p.UUID,
@@ -135,6 +136,10 @@ func runAppAdd(cmd *cobra.Command, args []string) (exit int) {
 		PodPID:       podPID,
 	}
 
+	if globalFlags.Debug {
+		stage0.InitDebug()
+	}
+
 	err = stage0.AddApp(cfg)
 	if err != nil {
 		stderr.PrintE("error adding app to pod", err)
diff --git a/rkt/app_rm.go b/rkt/app_rm.go
index 4bb5c2cdc6..7224bae243 100644
--- a/rkt/app_rm.go
+++ b/rkt/app_rm.go
@@ -71,8 +71,9 @@ func runAppRm(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	ccfg := stage0.CommonConfig{
-		UUID:  p.UUID,
-		Debug: globalFlags.Debug,
+		DataDir: getDataDir(),
+		UUID:    p.UUID,
+		Debug:   globalFlags.Debug,
 	}
 
 	cfg := stage0.RmConfig{
@@ -83,6 +84,10 @@ func runAppRm(cmd *cobra.Command, args []string) (exit int) {
 		PodPID:       podPID,
 	}
 
+	if globalFlags.Debug {
+		stage0.InitDebug()
+	}
+
 	err = stage0.RmApp(cfg)
 	if err != nil {
 		stderr.PrintE("error removing app", err)
diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
index 14854a29d4..64015838cf 100644
--- a/rkt/app_sandbox.go
+++ b/rkt/app_sandbox.go
@@ -108,6 +108,7 @@ func runAppSandbox(cmd *cobra.Command, args []string) int {
 
 	p.MountLabel = mountLabel
 	cfg := stage0.CommonConfig{
+		DataDir:      getDataDir(),
 		MountLabel:   mountLabel,
 		ProcessLabel: processLabel,
 		Store:        s,
diff --git a/rkt/app_start.go b/rkt/app_start.go
index 4c81efe712..1068e574cf 100644
--- a/rkt/app_start.go
+++ b/rkt/app_start.go
@@ -75,17 +75,22 @@ func runAppStart(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	cfg := stage0.CommonConfig{
-		UUID:  p.UUID,
-		Debug: globalFlags.Debug,
+		DataDir: getDataDir(),
+		UUID:    p.UUID,
+		Debug:   globalFlags.Debug,
 	}
 
 	scfg := stage0.StartConfig{
 		CommonConfig: &cfg,
-		Dir:          p.Path(),
+		PodPath:      p.Path(),
 		AppName:      appName,
 		PodPID:       podPID,
 	}
 
+	if globalFlags.Debug {
+		stage0.InitDebug()
+	}
+
 	err = stage0.StartApp(scfg)
 	if err != nil {
 		stderr.PrintE("error starting app", err)
diff --git a/rkt/app_stop.go b/rkt/app_stop.go
index ae3c66e799..cf441f309e 100644
--- a/rkt/app_stop.go
+++ b/rkt/app_stop.go
@@ -78,17 +78,22 @@ func runAppStop(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	cfg := stage0.CommonConfig{
-		UUID:  p.UUID,
-		Debug: globalFlags.Debug,
+		DataDir: getDataDir(),
+		UUID:    p.UUID,
+		Debug:   globalFlags.Debug,
 	}
 
 	scfg := stage0.StopConfig{
 		CommonConfig: &cfg,
-		Dir:          p.Path(),
+		PodPath:      p.Path(),
 		AppName:      appName,
 		PodPID:       podPID,
 	}
 
+	if globalFlags.Debug {
+		stage0.InitDebug()
+	}
+
 	err = stage0.StopApp(scfg)
 	if err != nil {
 		stderr.PrintE("error stopping app", err)
diff --git a/rkt/prepare.go b/rkt/prepare.go
index f0722fdc59..b5c18263bc 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -171,6 +171,7 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	cfg := stage0.CommonConfig{
+		DataDir:     getDataDir(),
 		Store:       s,
 		TreeStore:   ts,
 		Stage1Image: *s1img,
diff --git a/rkt/run.go b/rkt/run.go
index cad1e9f54b..1eca4394ff 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -279,6 +279,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	p.MountLabel = mountLabel
 
 	cfg := stage0.CommonConfig{
+		DataDir:      getDataDir(),
 		MountLabel:   mountLabel,
 		ProcessLabel: processLabel,
 		Store:        s,
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index 08e6f5d072..dbc6a5b0b3 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -152,6 +152,7 @@ func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
 
 	rcfg := stage0.RunConfig{
 		CommonConfig: &stage0.CommonConfig{
+			DataDir:   getDataDir(),
 			Store:     s,
 			TreeStore: ts,
 			UUID:      p.UUID,
diff --git a/stage0/app.go b/stage0/app.go
index f206a73c2c..8e7ac829b5 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -28,10 +28,8 @@ import (
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
-	"github.com/coreos/rkt/pkg/lock"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/coreos/rkt/pkg/user"
-	// FIXME this should not be in stage1 anymore
-	stage1types "github.com/coreos/rkt/stage1/common/types"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -40,7 +38,7 @@ import (
 
 type StartConfig struct {
 	*CommonConfig
-	Dir         string
+	PodPath     string
 	UsesOverlay bool
 	AppName     *types.ACName
 	PodPID      int
@@ -48,7 +46,7 @@ type StartConfig struct {
 
 type StopConfig struct {
 	*CommonConfig
-	Dir     string
+	PodPath string
 	AppName *types.ACName
 	PodPID  int
 }
@@ -99,20 +97,23 @@ func AddApp(cfg AddConfig) error {
 		}
 	}
 
-	debug("locking pod")
-	l, err := lock.ExclusiveLock(common.PodManifestLockPath(cfg.PodPath), lock.RegFile)
+	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
 	if err != nil {
-		return errwrap.Wrap(errors.New("failed to lock pod"), err)
+		return errwrap.Wrap(errors.New("error loading pod"), err)
+	}
+	defer pod.Close()
+
+	debug("locking pod manifest")
+	if err := pod.ExclusiveManifestLock(); err != nil {
+		return errwrap.Wrap(errors.New("failed to lock pod manifest"), err)
 	}
-	defer l.Close()
+	defer pod.ManifestUnlock()
 
-	p, err := stage1types.LoadPod(cfg.PodPath, cfg.UUID)
+	_, pm, err := pod.PodManifest()
 	if err != nil {
 		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
 	}
 
-	pm := p.Manifest
-
 	var mutable bool
 	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
 	if ok {
@@ -250,10 +251,9 @@ func AddApp(cfg AddConfig) error {
 		return err
 	}
 
-	apps := append(p.Manifest.Apps, ra)
-	p.Manifest.Apps = apps
+	pm.Apps = append(pm.Apps, ra)
 
-	if err := updatePodManifest(cfg.PodPath, p.Manifest); err != nil {
+	if err := updatePodManifest(cfg.PodPath, pm); err != nil {
 		return err
 	}
 
@@ -283,7 +283,7 @@ func AddApp(cfg AddConfig) error {
 		args = append(args, fmt.Sprintf("--private-users=%s", privateUsers))
 	}
 
-	if _, err := os.Create(common.AppCreatedPath(p.Root, appName.String())); err != nil {
+	if _, err := os.Create(common.AppCreatedPath(pod.Path(), appName.String())); err != nil {
 		return err
 	}
 
@@ -340,20 +340,23 @@ func updateFile(path string, contents []byte) error {
 }
 
 func RmApp(cfg RmConfig) error {
-	debug("locking pod")
-	l, err := lock.ExclusiveLock(common.PodManifestLockPath(cfg.PodPath), lock.RegFile)
+	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
 	if err != nil {
-		return errwrap.Wrap(errors.New("failed to lock pod"), err)
+		return errwrap.Wrap(errors.New("error loading pod"), err)
 	}
-	defer l.Close()
+	defer pod.Close()
 
-	p, err := stage1types.LoadPod(cfg.PodPath, cfg.UUID)
+	debug("locking pod manifest")
+	if err := pod.ExclusiveManifestLock(); err != nil {
+		return errwrap.Wrap(errors.New("failed to lock pod manifest"), err)
+	}
+	defer pod.ManifestUnlock()
+
+	_, pm, err := pod.PodManifest()
 	if err != nil {
 		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
 	}
 
-	pm := p.Manifest
-
 	var mutable bool
 	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
 	if ok {
@@ -459,12 +462,16 @@ func removeAppFromPodManifest(pm *schema.PodManifest, appName *types.ACName) {
 }
 
 func StartApp(cfg StartConfig) error {
-	p, err := stage1types.LoadPod(cfg.Dir, cfg.UUID)
+	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
 	if err != nil {
-		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
+		return errwrap.Wrap(errors.New("error loading pod"), err)
 	}
+	defer pod.Close()
 
-	pm := p.Manifest
+	_, pm, err := pod.PodManifest()
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
+	}
 
 	var mutable bool
 	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
@@ -488,12 +495,12 @@ func StartApp(cfg StartConfig) error {
 		fmt.Sprintf("--app=%s", cfg.AppName),
 	}
 
-	if _, err := os.Create(common.AppStartedPath(p.Root, cfg.AppName.String())); err != nil {
+	if _, err := os.Create(common.AppStartedPath(cfg.PodPath, cfg.AppName.String())); err != nil {
 		log.FatalE(fmt.Sprintf("error creating %s-started file", cfg.AppName.String()), err)
 	}
 
 	ce := CrossingEntrypoint{
-		PodPath:        cfg.Dir,
+		PodPath:        cfg.PodPath,
 		PodPID:         cfg.PodPID,
 		AppName:        cfg.AppName.String(),
 		EntrypointName: appStartEntrypoint,
@@ -508,12 +515,16 @@ func StartApp(cfg StartConfig) error {
 }
 
 func StopApp(cfg StopConfig) error {
-	p, err := stage1types.LoadPod(cfg.Dir, cfg.UUID)
+	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
 	if err != nil {
 		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
 	}
+	defer pod.Close()
 
-	pm := p.Manifest
+	_, pm, err := pod.PodManifest()
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
+	}
 
 	var mutable bool
 	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
@@ -538,7 +549,7 @@ func StopApp(cfg StopConfig) error {
 	}
 
 	ce := CrossingEntrypoint{
-		PodPath:        cfg.Dir,
+		PodPath:        cfg.PodPath,
 		PodPID:         cfg.PodPID,
 		AppName:        cfg.AppName.String(),
 		EntrypointName: appStopEntrypoint,
diff --git a/stage0/run.go b/stage0/run.go
index fb0ffe5ab9..654bc6b688 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -96,6 +96,7 @@ type RunConfig struct {
 
 // CommonConfig defines the configuration shared by both Run and Prepare
 type CommonConfig struct {
+	DataDir      string            // The path to the data directory, e.g. /var/lib/rkt/pods
 	Store        *imagestore.Store // store containing all of the configured application images
 	TreeStore    *treestore.Store  // store containing all of the configured application images
 	Stage1Image  types.Hash        // stage1 image containing usable /init and /enter entrypoints

From e60ccfa889bb23bb8524f53fafd919cdd7a8c6d3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 29 Nov 2016 16:20:25 +0000
Subject: [PATCH 0934/1304] stage1: signal supervisor readiness

This commit introduces a `/rkt/supervisor-status` file used by pod
supervisor (ie. systemd) to signal its readiness. This can be used
by mutating operations to detect if the pod sandbox is ready to be
mutated.
---
 Documentation/devel/architecture.md           |   3 +-
 Documentation/devel/mutable.dot               |  16 +++++----
 Documentation/devel/mutable.png               | Bin 32313 -> 41834 bytes
 .../devel/stage1-implementors-guide.md        |  13 +++++--
 pkg/pod/pods.go                               |  18 ++++++++++
 rkt/app_add.go                                |  25 ++++++++------
 rkt/app_rm.go                                 |  29 ++++++++++------
 rkt/app_start.go                              |  18 ++++++----
 rkt/app_stop.go                               |  24 ++++++++-----
 stage1/init/common/units.go                   |   4 +++
 stage1/units/units/supervisor-ready.service   |  12 +++++++
 tests/rkt_app_sandbox_test.go                 |  32 ++++++++++++++----
 12 files changed, 142 insertions(+), 52 deletions(-)
 create mode 100644 stage1/units/units/supervisor-ready.service

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index e90c9f7a79..97f77a8d6d 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -124,6 +124,7 @@ The differences between both dependency graphs are described below.
 ![rkt-systemd](rkt-systemd.png)
 
 There's a systemd rkt apps target (`default.target`) which has a [*Wants*][systemd-wants] and [*After*][systemd-beforeafter] dependency on each app's service file, making sure they all start.
+Once this target is reached, the pod is in its steady-state. This is signaled by the pod supervisor via a dedicated `supervisor-ready.service`, which is triggered by `default.target` with a [*Wants*][systemd-wants] dependency on it.
 
 Each app's service has a *Wants* dependency on an associated reaper service that deals with writing the app's status exit.
 Each reaper service has a *Wants* and *After* dependency with `shutdown.service` that simply shuts down the pod.
@@ -144,7 +145,7 @@ This will activate all the reaper services when one of the targets is activated,
 
 The initial mutable runtime environment is very simple and resembles a minimal systemd system without any applications installed.
 Once `default.target` has been reached, apps can be added/removed.
-Unlike the immutable runtime environment, the `default.target` has no dependencies on any apps, but only on `systemd-journald.service`, to ensure the journald daemon is started before apps are added.
+Unlike the immutable runtime environment, the `default.target` has no dependencies on any apps, but only on `supervisor-ready.service` and `systemd-journald.service`, to ensure the journald daemon is started before apps are added.
 
 In order for the pod to not shut down immediately on its creation, the `default.target` has `Before` and `Conflicts` dependencies on `halt.target`.
 This "deadlock" state between `default.target` and `halt.target` keeps the mutable pod alive.
diff --git a/Documentation/devel/mutable.dot b/Documentation/devel/mutable.dot
index 929fc48df3..e02e776e16 100644
--- a/Documentation/devel/mutable.dot
+++ b/Documentation/devel/mutable.dot
@@ -6,8 +6,10 @@ digraph systemd {
             shape="note",
             label=<
 black = Requires<BR ALIGN="LEFT"/>
+dark grey = Wants<BR ALIGN="LEFT"/>
 red = Conflicts<BR ALIGN="LEFT"/>
 green = After<BR ALIGN="LEFT"/>
+blue = Before<BR ALIGN="LEFT"/>
 >
         ]
     }
@@ -15,14 +17,16 @@ green = After<BR ALIGN="LEFT"/>
     "notes" [fillcolor="#FFE599"];
 
     "default.target"->"systemd-journald.service" [color="green"];
-	"default.target"->"systemd-journald.service" [color="black"];
-	"default.target"->"halt.target" [color="red"];
+  	"default.target"->"supervisor-ready.service" [color="grey66"];
+  	"default.target"->"supervisor-ready.service" [color="blue"];
+  	"default.target"->"systemd-journald.service" [color="black"];
+  	"default.target"->"halt.target" [color="red"];
 
     "systemd-journald.service"->"systemd-journald.socket" [color="green"];
-	"systemd-journald.service"->"systemd-journald.socket" [color="black"];
-	"systemd-journald.service"->"systemd-journald.socket" [color="grey66"];
+  	"systemd-journald.service"->"systemd-journald.socket" [color="black"];
+  	"systemd-journald.service"->"systemd-journald.socket" [color="grey66"];
 
     "halt.target"->"default.target" [color="green"];
-	"halt.target"->"shutdown.service" [color="green"];
-	"halt.target"->"shutdown.service" [color="black"];
+  	"halt.target"->"shutdown.service" [color="green"];
+  	"halt.target"->"shutdown.service" [color="black"];
 }
diff --git a/Documentation/devel/mutable.png b/Documentation/devel/mutable.png
index 8b3f189658b24aa13c1242d72ce49572ef12eadb..21973bb53374f34ef11ecfe0c06c95be3fd1b203 100644
GIT binary patch
literal 41834
zcmZ_01yo#7n=DF#1P|`+!QCZz8h3ZM-~@-@?(XjH4#C~sJ-8EG?%|&|^X__UUc#bD
z1AR{K{YiaQwG$#IBaQ%z0}BQQh5-5@q5uZ=ISlyvA2by3nNzzf3V47rkQ5gId;j>G
z-BA<=21W!15)o8#Nk3gTRYMoY{k{DK;z&7P@(U#Hf?9CLJ(hcz2zZSF%w45ClZ8kG
zWCX>MykYnNO3nR}sEDY1G=;ny&)mhAEOGhPKY|%Nn5vv@b#)izWbG5DV?)NKrlzFO
zzC<4%uF*+OVE^@{P(OLBs2~yq@IkB#TZ{Pp!BM;2CFb(dRy~MV35-s&QAAf)cR~N-
z*T{(|H`LKaLMtN3Rp#rbW|ZQbsC?nI+x{hoTR~Rpc7^!(_>}h|1FsbdA`25rsi|Q<
z_*1w&SE)~OA_swu!|BEn0y2jPB(p!h<qD68FvgDsZbuG&Cj+>Hku}wflbNDAzMmRR
zNL3WT^*oIFc*1;%;=@E0TfwIao#3W>si1u?k&%aUiJ<qz$ijhJA|zyjryEL753wwX
z|5oAdDM2mdURPWDc%l4Ru$ut})@!)wHEpIcg-e&4jhu{3WMLZy_^kjWzA#_8&})ea
zrFe8EwwWCFXYR3-IRrX{1p6>b9xKC^bs7Oa?m7M2aBY_td)~#Xy?9m=sjPuJd>&)8
zl#iQ6BT+~5SGcqGO{4}L7(0>#dA=SV9QR*kSTl!8u|wUz`F3}7xm-L1{yb<tWxy~5
zR=D`EkFj2k7?0BpZj^#$s&rdSHz}fzGXJmUUE{mM%B^-t<f}-%Mf0>>G-XtlC}`5u
z*qCK@R~G*G?RVh13pavJ#>tCikmtor{;Gn4!t7|ibk#SS{aaeZ)A?Y@#jGDuMFpme
z)(h6*$1Qp4>k$`4=R|aT!fyQh#0i-bCvr77Val^9c)VU;luv4Y%xuIDmr>rF8CG@4
z%7A*OrZZTQ2=!Mz*d;IwL(zJryO1>gsr#5Xaj=%PO}9?Mo<sR3Zv1C+sd-~)VVNlz
z7zY1lU~=xWgqW%(>HU;XIFdx%)AZ^yvPpmDAU!SolC#KXHr<zKL+L6xS@rf0Z2)Rz
zjf*L$xQ*taw2riQz-C-|@a7Wh@5?Qww>5S|Xsto!eGH4;_<b2CnK?GE`&;NZ55rWG
zCiu}+fn`)qQQ1U?;th1$woi-?MwkkIOy<3sGd!yBPv3X#o?$-J<@TG;C9&}F)R^Ai
zzpH~{@{M40RwwO@o;gtntLPQr{RXT|ZaL^eTHDgAaS3jZ_kvI2@%uZwfZe>jLg}6I
z9Ww^j+f;#rcKj9$i)ktZ5nS~X_zkW1?$Vf67G+zb>Gq_zq=3!3LrCw2A=BI<#2=?0
za9Tn2(V3G&Lp{bL>|XbdiHXCKpv`-Co|O8AxxwsGiYGUmdJ7HwDr4b-gI@#>Npbvf
z#kp~Hz2gtaKh0J=zrn4!gIx~BXyUCh5qR<;eD`aKYqeXtw+=CgO-dqV0`(Xz-Ysc#
zF8`{k#xmGdoLZa}Q3oL#lZ&p2HTM5BT1Dyq$Y_srky<Jx=t#CQP!|W&90e^2`(`ae
z9%@RhnLy_O_``)ViTM$>k#UFX{Tb-e`|zmr!2MM!N}xn}J%8+1qHBgxX8YyutcCa9
zEKRYT@>{Qq{n=>MWcK9Llcm*;^c-ZS!;=n>$qA>2OMAnHxr07adFp1A&csPI>ujF%
z&9TRN1OGUVhPN#qkX=24!a(*15HT=NzUl}H66|{f27Y?-?t;M`Elpp(2N#3VP%0&(
z^!#$+qz!pyU~W)6p16+5<y1rQGj(yONlUPIT=dAv>O{#8*h0U7m(WQlOf)q6u75eX
z<v(s;6N*cy_dTOd*CzMR{5b_uQq&<cy`7=ks<EJMtwfrBIdM8&eS!%o;e~bU*4Gul
zkUdd0qy4z8BEgT_vb_-G{AaO$OAiIv)i?Kpa<dk*iqGWTM75qx`4gu%8{?v@<xOc{
zA9-G>0@vipV3e6~Qe(p*<5XN%$Do0YWxQ$2jM}e4@t{^R3XpB)EpAtp{Y1ixdg>7}
z9!`Xx_QpL2`_v9l5hwyzz#bs|J5<GhVC*A<Ikw;$*7>eyRI@`v3kBxHM(*ZV4EJ53
z79!705!gK-3bBz<wIEVPCMLvmbRtDFy-_i+C9OP|(|)BNlublF>KK|A4qma`gCr8S
z-1&ctW{NYiPf>8*qJwQBnoXShEkb)EOG;R9r#b6n%O~}>99P#&ndS{5xxwp-&yD&s
z|J=>4!r7f$3anvq-se7F>%z8d%A}xWP6Td_hCMTTc58m-2B>=bMgQI}sVPFXrc}q&
z-&8A&P_qLgh)+5uV`Ecgwq~gc8Mx%iVHgAYr>;--%h%mf{ri+=W>}WI_b}KolqDa?
zfCk_n74riFGDRZ6D7#c4B}bPd$92*;nIlu?A&k=`{3QK??IaQ2;I7v1a6WbHB_T+?
z!xn7wtEG={nJZYhleMUo7PHd|eYVBf@F~Ab#F?d7yQ=In#$7n}MkqnA_qUsU2O#nO
z%t$dT(q2q&)(e3^KCNdMdP<WS!j$K=Rw_0}k6fs2$T-M;#&Ov7haGrH-MXC|XdQQh
zJ}wt+;gPQpZroLdxssZ!Y)U^ShiDbF0{W}%t#yCBx*`aRJC`nGjx~C!UV9||CvYU`
z+p?3|AhyAm)Y2UEW-po3eq3|Kve;E1wbjN4E{55^pVKAo0FAGBNMthiBO#%EqZxoI
z`SAr2^dkz;u{=ch6Nt@#HoLt`{Qq`bpo>uF@0@pOtt`U*=eK~=0a{$?v;m^5u+CrZ
zyPYl<YUSrl&HKy)ZUPhxI&GCh;f9lUhmyIEX70iJ5jli8nfUmRyN4B8gNOuOexdfp
zh#AdsCl7?;*3)%{>k2J4TeHOqCE`F2dT<FodxJ=klt{eHcxHd&KN3gBcjCpo^{yKG
z`F<dk+LQ!bDJ~&HH10{|rPhTAsM%_48N=uQHm}ydu0q3viCv#2X)O}mb&TdJi*t6^
zFjKppa^Yu1k1#gT;R!epDw5(aFyM<sZFeEvPoatiNRSofcQ{A+f0w10+#KxevWbpQ
zAIR2;Q12)fNI*w-!OjSF-8~Z7c!NQ3GCuOmHH>4lWX&*D#mp-zdlQ^2SEUs9Qmc*{
zt~@IkeB*Qrvw33QudX6=p!hZF<nfr!56Lf%3+D-R!x}4QKkXB-9d`GxKC*e$4RfZu
zwZyDH^#XG8co^Qo#3%X^Dt}r!EV<Kiyb2|=dNTkIU}kcw@RI?rC5ARnf@jZbeFFp6
z*ZY#Wd3g?={e6AW@$n*BTD&DFFfcGzWMpI{F+YOC!rY4@lX*`T=H`TS-lV&J2L?io
zjEtCBSY#I#MuyfhudHYk7Z+!jm8Bi1CQvJn)W7-?DOmygY;-<2FFrl5vO8Qr2&6F3
zsL$_5!jn(O{bPP|ooZ)|jnS&uaP>FEwR6?kFoT9s+8eWWhwkjulty1A&s<&L9lV~x
zNLL3AQm8)Ds=K3+deVJ#zOrNyEuhgW$NJ<7krSD|?>k@A7>&!{I?lH^TM#6m)6~q2
zCW)3sR{!bv;?{cXXs#IMpbCDp(%5**?@iDqeShb4ErkZ>HppCsJtcjtiGueO8eGg7
ze%lZ%`D6QK{`&$0w#Yw*10-zpsGLp;c?MLMyBG3^<5bKCyvf%q@DT~vzW$=i*(dL%
zx^12@DM$6XeO5!$^PPd36kuDAIz+p_L@bYez9+anluNq3m1;cg{OG(|{H$!7cOKR{
z9d4p>a!7)Lg1p{u=?6JE{s95V7#K1xE?6-!F-E4Qc@-6Yjgj;kE8J!lC)p(heu0UI
z)D{+0Cs;XUm4e3P#!B;Za*B#Yu|gB?ooo&D4(qZqIs~p<uFNbf_V}{FQKURPX=7tj
zu_&lNq(NdNG0{kb;#L;0F*QtUu1F#tR`7N;(|!E|NSLV7R#x!K%gcu+xOx^Ap*cCk
zCMNTYOzedk4HjzZ>iWjU0iB&*EqsaqT21;WZ#=fQ7=ypU#bs6T`Lvz>N}UempgKDw
zwAfjhR8Gceuhv~2bjAE%ZT#<>aY9T?z-au>m-D0WoKBO@`_1=zX_?c^-<_FI08|*m
zT1=S`-Z+g)U*!8Aw2%k&=l=o=j0V}LloRWd3AE?W&lCb4o0;us&LBK4F0R(bvhl1z
zYZePNNyMyX$+E&<YN<!lr78H{S+|CLfBwG9%AJr<Ce;-=dQDzAWt7A^@|xTYY%D<k
zX6n^s^4{O}*bR=571WhQ1>i+|0-7D}GDcI(&#?JKSwRgAoUerZdvCAL508(?ms_7?
zGa;^6se+Y2)bnGs#U|DvJ|MPICANGSMfVk@dGXC5|I(*Gv!lb2Rv1W$;Hcd$Ok@$!
zz#C@j*y17Rb6$@Dfuc!Noa^xDB0;56B^XIdnsVBT>MHpRV6ElrOr-Jf@Z=N}Vx3Td
zng#ZeJ@l+3P@Wwe!|5Fr+wR6XVwB9r(_S8vUoJPxM1byNe-@`j6GaDU>h=PvIHm}&
z=D@<hPCI#{OI`Y_etzc8i{Khy?zh%qYICpk%k1cn+eO{Xq#ew+516?yUW$n&X?J^k
zI3&TKD~4b>>|@x3y;Q~o2JX)Gx61pR(Lm1uC_Xfca!&e_$bYuqLr8uHwlbH*zTA)N
zuyql3q%Z257mBC-oque#^h{-|r*B|a5dncfYwfOamW!2k|2Dm^+D-;{2Yr;-82bh$
z2qbyjEjY|2lio;~*qTH(r_@r*y~|ly8>Xh_dPW+>I)OJRdd>UrO`llS_343Fv+-<a
zxEGA1N0_OpI$I`#o7H+QSS$i(x>{eDmF?yoE}aM(J?tYS<9;wlCwbqDDs8{_cG;Y~
zzfxGymf4$Ze#OEzlP`(I1JHf`K>~Hxd!E(*jk^xsCFy}QY4T12W{ACy1uLeaLGkn^
zw<vYJPaYZ_mG5fA*1Xs1Y4K(O>XNBi7R4h4LO*^Wl-aW}LSXo+kdzklK^0W3(>@2-
z?YTl!iNKqnhY&STWX<NsWZa~Ib<0*L$enb@ovK4#Uzy*Y>;FPVR(MTy2nmc%YP=Py
zF(<``J-xkLPRD3Plj-}%^EA9}x6m|}Jb1?ogE`iUt%$bWt*v|($2hf!%7wSL2-CA1
z`8s)pEs;fJl&EM}-}QbAaGY=SxewBRCWO*6HWu9-(4A^kmegpnjtB?{u=<P%kt6pJ
zN)t<RX{t;iSh#!b?oO-kkM73wI__g{<CSKXrJrrzEc9~zMG{U2(*Lxa*3YK&c8^Lx
ztmqsCz&wDcfobv6*2>wI&`BffEGZ`|&X>0K69}x0s&6XNrUt;0(nk3~ytk2U){-x$
z6x8N^KI^O>w0w5eV6TajDV&~>%W);OWVaR&4@yLwac0Odnyg_wwvf0zjAmKo{-*9L
z-|>ymsWv$|dFX0)@QTkhHjYvjnE*q~k0Dk5B8(x0wdpIH1y^oqA;k%!01kC&>0J5h
z?^Gw;Da${MU}PoVcrUv~J60E$8{Gv^DP)Ai#nTolR;N0(HMyP7!y_Xj!$~nAw%KYN
zBZ(X`G#8Ef15w*UK_mc(g!6uT?jYclWZ{d<YLNwC>E_KR+G}3l8XxxVoGRGz)d8Wb
z2m;|lCJ%g|2VB$67D)eGu;P*i_Wf&CyWV4<H*CZ*5FHEFe9~%0v>_lA6)RrBqV6(>
z1SXCOA<ZHj51u1uphjtLxyO;um&K8ucnS3W(TT9fCtNB+2L2&jB@@{anRLt5X=0J@
z_ugwuX3o`7Mc1V>u~Jb4`XNP5$LIGdZmn-9-{6R&8rjp+vsA4Qj?d#Hq`L_gwO=MD
zS2ZFPrOSD8k2kq_$Ko*uaqK;<MHX7{9i$%6iqNTd8O&6^)}A)olvU$$c5#TMc@?%;
z1uXSUsS_?QAD`>fZAp1Ay8mS6M<U%MKeBb}Pph$~2$u2FU~vt>7?VTJurL=GFVJE4
zof?0cE@Ml1r1@Iswhh)vxRCoJOuETNe=>Qy;*jYDQ$b<V``vn?uTrb+6`oYw`Kj4T
zZ=%mSpwp23DNTjy+c&wU_0PbZ?r_+roj88{s?&lDo&g;eZoEfS)I%r&<M>lEEq>0i
zwVf>nD%<_}W7asFD>bRyCA`M_q%w9U9Ct2RaA8@QzM7=%t@AOxmo`w={oF)vtiqP3
z{z+pA6d$YA#)yTVD{^^(e9vF;drNjz@mf3x8M5-iu?}R`p>%(k;=>t>cPfzM9nYC2
zm*I9<@eBzpf*-Bj<Gyh@AP>6zGoLBP*3r?qpu;4C7J7^xotT)QZ%-yd%Zg~=`ofOD
z;OHAtPEJ;sTUkgZjYOKeW42}tGg-y(y4AY)>J>QOmAUhl^4PL5il*1w=%95s`PcaZ
zf8R~l+uK{^tv%G!{oX*gjeh+JzVPRPPH}N*q9vZtbbbMd^Ja4MrNf(&qf#qhd@@ri
zmD48>0e6I(Rq(+oI8$`HZZY@Xp4W>@#vs-o^S!_ByotrpT=T^5SZZ=;udfBng!VD6
zfW<9Lq~<fH_ZzQvn^W)6D8^8US<T53Is55Tnzim%ln?_*m6lo*{MLU14k!GG=`A31
zMN4kyBZ(9CpPXJVoVi`XNFzWb1WayB=!)6yXn~3STPvBh{xsQZc$xh87Hw}=yc%x$
z;J^7`r%`pkfr~b>*c<fqXsHDC6$-wu)5`%-_tx|@-W4k?b(otqC%F^{i^-sz$6NQh
z$n`n1ITFWjHi@p;^`@{~7}Z}k)dgGp;dFTw$8N^dpk(3kJkd|+Q4$2wzf0$`TB%RT
z*^DsmPW?&st!#*!HU~{fMWJvq8u=E7F`Tc<eY#Pbr}M4#D^23Ne_~={c`xvSk%#JN
z{Me8c$`4FStp_N9k>|x~5s>yx2ZlD9uI?`nOwy_B`%n1ZcX(Z6LsyEUwDRSqD((N!
zzdl(NX?t3BR?}su@Ah}R7l{Z8#&nYoTn?6`wFk>&d-(;fb$V(p=)?3-iUY%nT=3?-
zPNB>yB$Z~QVAsUgTdX%YRhxu2djf}~_x{X(o5;_4^X><sb%=&-ZvsgsYJ?fHMY1>j
zn9^pe6$}D48-6)8CFQ~+#=RqiS8De>2d~1C9oCCJ>jH-!uHVi$9ZL^uZ09KgTV?W<
zPuO3s1_=u^x`;f^0WOUQO>ZMq*xz5YZgCV{vW{9rtbf<xkh`K&r(6G`rrv49+cbG6
zG(@t{Sh1}K4uj;<T<M$0ja{qVE|llft#S9H4y(<&;KKIaH-7p+DCrTCZw1k&viu*{
zE#q`UzzS^0;3G|c&MqhrU2V+T<lpy|!}yr*6o<c=V{x}S{Jkc%N}Eiy=1WS<>~2<X
zV=6s}1PHUvtX9%Rb`Jo-Lq#lys~~Wcr%vomg|rnAtS*m6H6LO2BqnUit*`tZ3588g
zIlS(@$4}<Vq49ox0*w{|44!`F*MWb9+4>xrIlE2K>9G`iS+S{+z!+1+z?Tm!G_a2a
zz=KvNvWS@oygfxFP#mHG-ppa>aotc|eR=Hm0oAWn;Nt~k{8Voq)X{*=2UdyHbVs5|
z-|~}v<I73i=ka4}GZp7Nr!4d}1gcjZI`y#7&|Jwy>la2F^%U~ZZ^Oe<g!gnZhy#w6
zI$?F4;tm<Iva-E~6JP5s_59-ekOgF%N%{B=4z@%^u>Os){*aN#%}f!i+};g(bGE~t
zO2BB4va@G2xsBH0^~NCM%UYDXX&YRbZ=zs6<pO>lOQ3zyegB4Acgj;yG1gplGxa2C
zayCy?8%I<16VW#&pAgb7mjOSO-Rg@+=i!RX4T@yN#N2Wwv#IR7idX*O*0_vgJl&lQ
z#!;e^a$)#KWqj0Z1r-G{pocErIp8hxNA?YJwPn+4yTb$6{5&I7d<o%eIDEZY{c-SZ
zE1@c(sH$cJWs=w4?FPtd#jbP8y+fw&`e|e|sw|4p*m00|avW<jCE?~tLV!Wn+ZP~!
z&ok47hZ+hF%}SV^A9I>kO1^7(zzS5n2l3%{?(TP>!#|ZW0fSG^+z)Z?v2^^#njgXw
zW!`)NKnHb}86!SEhwVH*9jd<43~7IjtIzD+;JV;P#HmXG_zSY*bNe1^mnontRw|A-
z|LnbHbXc&`a5@w_(0Ls>B}iMO6_(Tt>cxCn+H>#+=V|)O-Ssai!R$myzw4q4@0|mQ
z&r_JaLI>)%PYg_xko_;@R`gh+R|37xXDqin+#Z2N0=t(@@wxY0t{X2b<?<yD8~&Ju
zj;AJ1(T^RVq4^dU8{7Amp{f4-OsM6C1@ouMGAXafW@wt`{%UQ<Z?Uu>AEY2JCr5jW
zjYd8(GgU9D`SjJ<cxG?dSOLgJYk-Crif?bn1KK`CTjSt@f^KWn)dcuEvwbwGvg6#8
zoT|x7F#7{uD}BfLpJ~nJsN>(6mE3;|m6KU&G;{9VGJ^O2B_z>sWGR#d+QqEY+)R4g
z;Z8#VJLg!h^yp<KiHO%h&c{GWDPBs3AC=Nk)5InutsDXjE_UzoA~DC_iwk^7htoOq
zflsLba^2z1hfI1)O*LI!dO*AV$11O)AR?@d4NNmF9#j{#gk|~pWWUarx`XY`joq>o
z2NAEv@2$;FRJw=y;FDlx?K1@2rh=-Vy!;X)=`D_r;a`5CQ6gf#y{%1<9vrQ>6OB-p
z7MGN<j2YwITW?a8nV=nYUSD66QIazOPnjex%ottnP5XK9n4q*Oml~KWW*{4S4>c_4
zgR%t8aj(~1WU{!W%?^te!|0*+rQ7QO>b7BHd4J!0h~_BKzN&<ZMxyI$M6jUl#kkJs
zU1MMYfufrmMFM)*UDl5uYOIYaPcxJ3iOMiAVO~|~eibpd?f`kBKz?B(poS*v`z|c2
z+VR6!b^Jn{;lSx*1}t=S>O9xTGC`=2bleO*e)@N!rnZ`GqgKDynV(D2J5_OQf>Bo>
zeeSH%E985$)a+JiD4G(0kNX;`9A;|wuLnC<w}Xt7FQUA>d<NzT{K8Uuop|w}cqmwF
zGW!j4+#!SEh=uAWuuyZBbN*qN3^QHc@Ah3lTu1<Mp#&|F;P6gW`rq?}gll5b4`%zb
z(A>*+f?;2@`WGpkj<ER(gyvt*>M;}<Kgh5z@JB5d6D1NPidb}YbSj5<RN)VogRRew
zZI5@rQBV|J(QbWvJH2Q#7s`|jN}vr44X3B)X>OkLK{L^D-Z!RdM;Tc><i^GmPkan_
zk&KGs-ok8fH0+Of1*M&zt`n$1o5*95DkdhK2NKVn2{Z?9HjF$xJc}DgM@KF1J&H4?
zav1ea|AIq8Vw|viFQ-w5bLEKto8Zlm&pe1gXmCZ33kDJ!tm!oiQ^V9QG3yi7Len<~
zRlFUbp0s#zeWum%jQ=7_a&_kj^=CvY%5+j!-_#iF&u-DXzC7K#?j7OCN;@@^-EeWK
z61{@!|3e4wNg*<qa_q-RU_?Yjz_=4={k<=-&=b*;VpT@4_o63!dfw-@F)$GnQG-@#
z>`x;HdIox;``LG47E{5aw0E5mr_S0~=3x-1xU}RG((QvjC{3>X`ENm}j<P|nuD)J8
z3(l4|<-M&d5Qyr~Ul9iSjDDB*0&H!ji>Z8ZG$7m<o-NG!iw?vllj-*lpgQ8TYq)hf
zoTQd7+4`z7fgpl94FDCSD{0D;stNfgz(42qewPKLq1ePsLEA%`LfVx{->k2*MV6lC
z%Wr%*wa;5@J17dlk<tdh>)u{W7c1?$t~P<E)&bw>(d`2m<q1GUGMh7I0xJ~beh`2c
zk4>CiUH)H)<$^jQM^X7I9X^!ZU6(`Mr@EcZg?1<RM%M~rdWzKGY9w}7`tg4bi*=hw
zzup^Tiid1t<6@WoHl#8McTv~t>{|TQ;y#g-uxD0fNH@7THU<W95)xVnFiBjVJL}bO
zGPZ!|B3ZRM$8&c+uV|K#zr%T8Gc#l}hBlL_UiTjQ_v2xTX_2RIKf$l;YIxmIg6{|B
zTP85~vG>qT&BNfo?&ow7>UupIr>qMj@nimn*8N|2>4mh{R6Y|gX<IecL}`<$(n(k`
zM0+81kk4)S40fhpI`M8sSGdvlNileWXPVSs)~x5P{z0-jws%p4`Fu`bvx8250V431
zOkK&c8^MS~=veAh!JL8XqS}E<-vGH{(b?w@<{FR!mO4!!z-a#7<$&%BW}Nv|C(cGI
z1*-H94`t?8;+7jPLhDb9gaieBU{EQxT3l3Of(|4Ndcp(zg94@+T&2bC&c;;1gA~<4
z>aA8%T{)Zb08)PCW-ss*ww!n(Fa~}yV1Z|MFiXA3gSg^2weISGTq@-q)iWqO+c_=0
z%T`LW*|+!Ec_vqdjUxPTa_eFsw=jpe<H9n|guz5@a^a$bC3*9)=R6G)sJ53~4smw~
zR<`e6(DbN<`x41v*YL1mb*wM7Rs_JrVP<KWw9E&w?LeHQo%n8w&Tq-S@E321HGSnm
zN(UL@H^S<K-LgR1W{0FHHerZ}(5%UL$$U08a3%T#?tpu8a*B^>SsF=KOq4m_ohDM-
zlW2En<8tG0xO=_J?q<NLMzx+O{_}Jl6?6}!AP5v<C>~{dbj!qEsi9EF7oJsz?8$Sz
z`jiEdk=U6ZrSfR!*jDoSHM)G#5u&ZRu<gD>7()ds^zA>YbQZj)r>D$Q=2q^-W^)@N
z1rxE(0<oukV)=4Uf<uwn=2WWJSsD^HL7*mb;L2z!5Ok1=1J#zJ4C%LgJ_Q8@<-#cb
zvIgPVH~;Mg2n1k_;6r|LTAIVZ5o0O%QpVyi)B_oUIHw<3Xp(8iR%@QgVV`2s+tK@c
z6L9nEN{sja&WFLDET@L=aawOQNBa2*Z)3vv${7J639%iQmz&#j(e=}Keq_HqT>!Fa
zTleO4m{dK8JiZo4p~5KqiEz6KsjO@8FYmlW6!p+T*hqkOF|-79S4Kxi@qUZ)a^c6l
z+w=9bFQ4ws7mp<a?=42><b^jiG36c}c)eV*TH>^hHgmo;SgN5u91;T)5yQXzItam`
z57C3l5TFv|7;*b|P32uPv)W!5?#kaIm%fzc53c-sZ)xv&-up&F!{UBNo5|-cF=`T#
z!fFpz3EpaZx}^hf8?}hCRJq~djxvM-V-MT9yDMFAz-6u;?1)Brd8ekPsM<dZB1uSn
z3?&2YztW40QF+*{d9n^3lbek+*c(P0_Vu@B+fgNR_UaoNQkV?6iMuBsyz*Ise%a&*
zlk#|_pATf<s*V~nnB+WsezC6ccvIqLuQgnK+J}E=rR?sWRI9foetLQePzBV)FF;oy
za=3yixqbSDPpx8D^OGMJpiGK2q7vw<Gty%N0l;obFVNHYXcbR85dHt15d7+I*PdB0
zl_<#B@BzU|M%V2}Mk5@c(Mtjk%^sx1N~?*PF(LOGH08S7!5LrP63$CMBLR9=dI${w
zvi7933fxt3xm!_DFd~4b)&nc(>ginh2#LKVBqTU_cpR>JT&=ab0y`3594I66Z!qW8
zc?~~f%DyWW@`OP{j*bm&ZAzLxns1=BvQ-W5T|gNW=Z&<~nKrxba_5OhiD_$VFX+Se
zn2OSl(8Z_Z(vR?Y4u3M(jZJwM{;JbYw!`i81@p~QO63p=thTmx8Za{eLP9d|P1;gr
z{o&L+Bhy~Bg9Rm(@;-o4WoD^U+u9J;xBz;?fhGkH53cfwUA?tV2D-zOo=NU#DqYdC
z`vVk5<oFoN#Nx1)&h@IZ+obN|<L(gMoz+7m@owW(i<30qs@Ump+w6E-H-u~;uR6#p
zmMi&Vs)HPVm%B!IJdweJ_j1DU#(PN#_)u7_jzwN6bZ3gy;Z9F2Nf{X4thF&}>*`=&
zJ^nOE9yGh|^S<kF2Ze+%b-3N-t5)f-S}n=7hfzT@Q^bnqjG?iq*E^(+hpeMAa#Vc&
zQ#1SKNKnhIT1#fSGx9Hw#Y}Dx?>7$JU)vc|6pBDD7DB_FSaU$l|2jbzt)r-h&4sE8
zObetD48%<6uiOIBDD{o;nPBzDb-tpCZaaVkYuS{=<l4<Y@p>g($t()O2%AZ4%9<R^
z&Lt1CfrEqF-5ZWe=XDKLERu~&PX6&aFkY-&h0KPJD_1AuIXBnuZciQ)n=bWxlkVkW
zZENG~WUbl$6C@-gKy^w3grC`JBb|zhN-d%yl7ABwnvMw4hzh{TJ-MaMO#X)uuUyas
z9RLddOh=TiqP)u3zZNQEJgbQOP0M1MIO^e!#q%I&=x`$7?u!Q4!C39<iTL<X--EX2
z%B{7^TSI3OH4HTS6$}jwdaCt%vDmG!zySRwozFe7O!eJ(eP(&B>mn+pg`Dk#{ZDHv
zI6Iq#fw3mIu%RNhxK2%bc<3I`Tr+uLx30jw&o^5Hr{cb!o}QY`6*K8NU-Xq43mDkg
zFr3Ii3R3<4nCbx9>F=3*q4Or6$JrSS5%ox@$fj;cYN<l!Ka2vY0trz<4cc?Y+YhJB
z5$5%V6K-RM;dt&R(M|@m3OXAB!W>8S{}ONN>R7-^N=nvRox)BQs~iq03A>&N{(6-P
zU{^5PHY;Jmr5z_Hs~cEYgV-D-rN%3aI&GcQK|n!a<qV$MD&qa>C80K?=<7#-{IJCj
z!?RPeCKprs>uJfcv9L|XG*wm8Kcf~OLoGYBw7eJKnxXq_Fa`g@ms(sib0Y(~C|Kn>
zBK<86z_9uX=h;=WJY_TY$85TXxPoLrhKpH?!JY3c+!{7s!~^8{dIzkyz?dViT%xu2
zB+*9K6C|&qQfNL~$og|7o+?*uNQmGH?4Wtuv1Kjb_iwOF2uQo@DjEnrS0P(l#^d8-
ztP~~T%_*#o(m*99#{5zrWMzc#;#^g9x(sTwlf&G~9Ca74ePGOvX<jnhG0?fX?xNBW
z?I5CNPFH>J*y_UE7U>Gsv)vM2C@hd49)qW$v9v0$c<h<Z)PHrCFH@m=p?x`|TTDap
zg&|Ic)6xUS9U=)sQ;-uz@VsRj#1qH6`U5VC2KQA4$>09NU-q}PzGNK8@)Y()RDeBJ
z>)g%~s<J!Z3~$hsWtpvj)4-v&TJwrTJ^0MoXy{Qh5}yFDntAftH(G$wk{AdJ=#n)j
zla}FFOT3#W(h-iA-dK?l1^f~T=te6T#5N$Zn#2Z|EkTaf?I?i(je#i`Zl~k;GAk1k
zikzIB4_$F;N{)n-6b1odzdHi%<<}z$z>iW<sZdZnp@RX+;^Co+prqy(U}OL^n3D2*
z|JYh;3mhD!%5wkEl{D;b9GujleU?v@fJEZ|z<G2q7jHB}Rzfx~7)K8xSB{l1@Su&I
zQ`#{w42}q)prA-SEvKz_a-5!@&#_SUl#-TaWM<xh6L*J)*U--?5<mO7YAfJ@1%>e0
z*?DR#<50t3nE#F`+9y9&V&(namG0{O9Rj(J@4P15nDFI*1X}3mKfMOfyp6XG$FaCt
z4J`{M0}F&X?dY@rSc-Yi!rqHM7q41>imivonPW2j*Ynm-uc)%%o@Kn&RB^-0QLRb}
zkn!?*wao_BgsG0Yp|!Cj?~fJH=9>O%GayqM&6H6s3;D3R^aAz<xb{MY0to<c7+SxX
ze4fb>4#ML3MGGhg<=Sm3ZuI>8nTLmFI-MRMD=XTXnwlSED6z4z!BJ7-fUp`J{awR?
zHZc+7;c=aG-&jTg3l%r+q*EgmF#N=`u)OsIbhDb-VxY!Z%{e;BH?oRJO2VO|qsJ#C
zOixb>Dk{cNE0@X@NF?O`Ok1oW<#mIoGx2F)d$|OcN(Pg#(MdWKWoWF+AciMSnBy&z
z7mj!w6Bm4uK=FqKjRj(iNXeTDQ~nnltxZ5mLLE7vop|~3G;<BD7#$PJi_6WhY*ZKJ
zIc7wmT<rUWpgvo)=A^~p0C9I9Vz)mGvs|YmH4>jEkt(yfnR6mbK(@(xJyfaF)ghUM
zlCp~ib+NKL{u>e+1dD0UP|T%@&4JDxbGW`MMfi#tsvyJ&Rg%0dV90>3u}vm&pmSpw
z+)dgAh&h)lUEUKfo(~U^5q=`k5A8h?-D`4(l+mb{A!B+>9(lkA**`uWkw~XGQz(u5
z^70~)PW3rIKR>%%>vnHs3Q4D(>go)3u^2g>AEE0F_GCeDz4h{bb7t1_X!PRcO-HCW
z5T~?wCz40sKSBRDV3&;lsF|yeqtG(xaDR$3d7M`0wt%65fW>{3n^y1-q4(2t)F*g7
ztlrDssLoqD6?{PPc5!!C%o9T(AtAZExiQ>mcU7v?x`mN(1xZVbii#Et?IR!%Ghh2z
ztFxZ1bdRTTttT4}3O(Q1o?w8z9uC^PB+}?BefMEW7bI}Sv;Bjv8p8@J1WEdl_@_T3
zIFDFj{Kd;$?M%74DsUnj3)K{aqcaA1O&I;mL6SJr!QVgIbq7eG*_fuMaoEhXyE=Hi
zJ(}K~tp-I!eVs2=rb)n3R8$O`uQSt=8{iAGiAxIV^xWPSK3t%q^f_Jp>g#(b>%CBe
zh^{0j6rw)XgQ3ZLwMTF-C#Fso;Vai2Y$OkuZr<N^1qzuW23QMm=Ap@uoY%r$>9t*4
zI7!9AvkeC$;qkfSfu69tx2IHEgTbLr+mzYgq+AJaZH<Hlt)e1VMbO;3gEya`TrTtl
zUyMmYqaA1dvJX|@#hyH3+ds)+%a^EK8UUVS==DoZb|W6)jpr@?00IPnp)vl5DP5{r
zArpe8RR}SZ_lx?7g5%UT6+XaKGM34Q`{m0QC1qt8XlT8;V)+^D;Q|mzOm=?!JIUF_
z%&ebkl>}dS?(}>>f#mi^NBZQiU(I81lqBTPY;zkl)`9Ak`O^gMz;gS-hXC(W;`>A&
z+hS7bKQ(}J?sGc+CDfA}rZu^??_Fd1>fFb#rW`m8`v@X|`N~_}pGf4}JmJJ%i%c5Y
z^x!Hc1_ekxOUui4`y=S|I_*QLY?f2Avov`_#B_8OY8QORhu@{7w)aPr8Z4^qNVVFb
z?=So+=v-U{O-wTTbtxm9TheIE!-;a!!7=?O(|{n%@vrS=m*_J1tYT+y522(?Jv-~F
z9di==A3~m|Mp>6jk`kYxy}BPm*Mn;q<Z;;zm1eNGe{v$(;r8$0-=gkvo#|Ifne=Rv
z@l<0ZCu?#LMqb$4eR8dG9mT`LpNp;ovaklr-i?k&430sqRMyW+hEcfIB<5)T_9Os?
z6XFEi8NigCt=t>YNsk*MJLG<)Gvxl`>C6!DLWZX`;O4oV0~Gk~a|zG&x=m|6m9oko
zfRnkQyx)?aN>hh;>__<@ylsB5x4I~meBx)<@y%>0!u0Tgj;yGC`5y@v`G;R@Ld(nl
z=gl&edUy;dO+ZZDs3xfcxEqd*QxgtKP9M_9{>qb;2FrSj`OxV+aTe1Fyh^PWp)ibo
zUFVwo&@|fPW0l{T{mu<P)9UzlUmh6^p;#@U4kiyY*YF(JYh!rUh!d2|XRtu7UE$xL
zvoQaE{kQSWo&TFvcDU)KO?bq{8(mpU41-vI+G^E1fLPaC-i#I?U1mB8b?;?58$DiO
zVijka-R%*H7ZY>y3P#rUg8-{Q0@{b)u;CR?yfKRO>gw2_>Cs^?jNxC&q!31}Ke^VH
zPzc66A`FZ^AjUc#%>)22eD~l$e6!QDAZ#QFF#Oya+|v#W2&t%GLn))!+jFrLU2Fzz
z_d0Z5Z19;XNb&1XMl`iZQ<uzT2mZi;%=w7p=$7(wtG`mmfdwf9+#03fSciQvieBWE
zHU~c5*jz&))Z7+k#WXBlBDfxi+LKK$tG&Y)Ug&#g`3ln>Xn!M$K2)Hxzg^3LRn0YE
zr!P0UYhv|+fJq0RPPvnCB^F%V1~fT3IvN9zT(y?&R&@X5m5P;epFI$3hyOALnTwDP
zuw*We{Y7*R?NA~4?&!!mTPWQ-J&kN=Xh<O7H8xkG7{)f7&k79eImN|ld)LRuTr?|W
zWbyiPghKMjT3TCIhPL*;6w-g@(MhfeEgJs_eN-aEzAy!$fGxF~@f8Qa9O^IHm)Klc
zL|n!AlaXza34K5JU4gE&DQ*~Wz2+d-0GdQ*h=b?S7E^Oy4WQltJ)hy#%21tc62#K5
zu_9K}zVgC!)t{6y7Ed2^L${e|cCnqDjHObkH4H@B<8fJ4v->@LVPT;$lHD|5{*MEU
zvgJndGW3-CQc@6f70mGG!X;(Bb0v(9RAXsh5D~earDZeI9q7MS#SNHC8Ge&25k%<R
z#x-FC2ZtZw@DhB00CuJrX>WfMe)}8MP@Yz}2qg>4eRFDPEy?t~YHp!MJwcXlU>e+s
zwudyp%^xp7ebD@XqjScn2H1xmWEWkQ4|g}NXJ;TL@|MY>5lmg61thh<WRo!w6Z<%w
zEYw&nGp{uM9NiyHDv{3<!xqu<NJ&W<8XhKQ&~5J~Mo0ev`j(e1kyc|jv6mEr>aby2
z-xzo_t3O9IRK&4}GO7hKbSe$Y2kM{?Rv-qozx&sX@+=Ir7Zk<3m&GPUKpkQNk-Xv|
zCA$v|&qzgWP36iy(;hK8>M+;U4!KxjNAC=L)-$dgtUIv5=yQL$6#$0WZ<ndDYX^$E
zVGI%G;c)cfMr2Vg{&4jDGH9r%s8^Sle|ma+;V|iKulGP69v;+ExzJpa|Kg3#2BN6d
zJ;pZ(5b=Hs2W?$$bBvxD?FsmtIL)|(X#z;ksgxzcT;#^}or46L`~xEw0@EpA7Bh@F
z*aQez6x^(_Li~frQir!XMaw0u+Kp%0ZzV?%{1FCEvEVIk%l{i!+bXq63>w`sACd%|
z8RG!W>Mck6>dtC(-)-4Po{xl|)(1E#jyCh;eHMpu$I(UA$wN9jJMp+3p~VMxCgbTX
zfz{5Et$ong9oRa7<8kh3{3%z4;o^?TX?OtKcU)Q@k{`OtM}<ZCpoJ6xyFF0WS#D1#
zST9=OZw6*zypadP?J{mUOwOXfuQr^q@t<LC9d!mpk{Zn{ilZ}QX7f1yH~)k7aZMLr
zw`kh{L@T_uUtlWpsOf!7;x`cO|H^p&u^cHIM+ccxgk)xBF0HKCZ}&jHJsuDu;&Y1t
ztz(4h`s=+qMOYOV*FJ4k-7mUwEttqi$jWJGy#RFFWdL@eN-?r8F($S2DO@|}L2f&c
zBxPh|(47$Z%f|hev!Uot6O{>KyWxMhMQ60fRI6I9KH|SDS!A)v<5p0Nza`KF>;SUG
z;O6f*t$M9LkacyAM+!KsW^$))M#K~pful(bvjvjf-XSikqlsKquTIBGVm=8?<+Mv(
z0!8vrP}MGWGNf>JS<ke3pC~!IMJRRxadFJzh5z_o+Mxg^REU&Zu#Kwy@HuyelnR+c
zKo7f<dQkrb8I7-Y`qeZv?2qTZMH29hgrHLLr-~r+-vFp(c=Vur6blJ#(*qp*%YQ(c
zicb>P)*tI%4w*M=`}8Vm+df~0$&wVefXn=cwM0*ZfZ1?Sj7z08<%&xg<2z5F0>OX%
zYC01C?c*9J3v?gX==S?Ub8GA1B~tqkxoF7>1trw>i%a+Q3B9?RV~;F?|G_p?acv6<
zLv73FOUYiBUp$dV<cB+1C?M|p=S&xa0CXLfn)Lm(9gJQql~Xb%Dk^9W4i3QQ7aShG
zH&Y;ay54r5cMS3XoRv2@g^6`yhI)DvPvKRVcZgpZE^Alj2EGu!?J&sLe&#s^pchQ+
z=PFeH$$$@nw3spTIzB|I51xhIKBns-3{ESXXFW`Nu|P8EaJ7j60f+TF!0SHWU+kWp
zMRas{VvFc>iqxt>Yp<t6b`bIoEgw{?(Ahfp6&HVIuoOb|xH6{X;rjEbR1ttDLu7S-
zP9U}wDS;G4GCC*0JQ5~6mXCsGZXRIsxXk&~fATsyG^96~$;WCw;|~}lX8})MCco!M
zt??)$J3D>e;b_(mjId%0Wwln;1N?zGrRq9A^I0PP&Of8+wma~qOJgSNH6g&;!?md`
zHp8`q6MFneE@<W$x+H0{4#w2kbpG2Mj0R|uV7BrPh%}E*NElUAM9I$1?&9LY=yq%7
z>+74$?L@t@vSK{<dHFHgi0RQGy;t8F5tpN<KoXc)*x9$XW8%JJWaFO!x2;l_n)R5{
zI%mw_J}gE{LgJy*H^U{AVpm-yBjf>}K;ymPjt19ad~Axc$&k|Q13D}`s$DT)^E~t;
z>3`>H0on=xl}#5bwd>7i1A)-H-cQm^6r4jJ1&BkyAe|?l=Zk6Sy_n7wotQYge5c;#
z#%2oF{pWi!8(ilr1{$nR7E2iIU0s&?7yzbCnCnEU#DPO2KY-I2DXx##<W~Xk_t05U
zWz?$6IW2y()I~?pYd+mqen<JsFiuYY4CYB=ek?WF5CS)G0H7&=?A$#*4oyf<#unAN
z;&r+F4NOl4vNP(<jHVEGMOh<M)lm^uHWN4zAtBXzpKg!9?Jq8R-x?P|yN-p1zdwbk
ziCAhRDgN;#!u{aLbH@5mC#`?gB{qnlj{gv24rEd)u&6nKg@ZE$P(ZnESEj{$>GsY}
z&s2`EyuAE3zag5&Sc)(>jPF9eKQJ7ICnlC1+!ko%6nvNKa@@E10*~_R5-NZUzgxN?
z6_`mL*hi`+iWj(=0JgY*{x{f~Z6412(x{FJOPZc<%3!+zc_=_vJv=?lROt#>%oPg)
z=IFsF!UI6GZEkM%NCXHGE#eMcA*P|>eX^h?Yo9hAspLx&$?nfoxxsMs5Xd6BPcw0u
z^+kLfE$T8pKs5a)#|wmf{X0$z_|D8lX_Vx)*_*h!VV-81)J{mnL`Ao^w|yca5P&(T
zK+q2g;>(whJju&5#BSV~P0Y|fq&hh`Ia}8YL>N_{Yx8t(_H6qzO09^EspT?exH27y
z=m?}+%jmj2tk!=lQ-ESY^ws4z&v~-Jh=s~-I190Vb$o%Ef%={s(BrtA&++`ed>t4V
z2wZKlxmmU8y4vanFO<m$t*o@hZWKa#tFqtcXzQ*w`}A{Vk1Q&R5Yr_E$3n`OdeS8j
zRi-`{{q<0s2=ao26q*qH<BWxz6^QH#x9f^rcP88<KX&Asj9umpyaAE~6?#i$a4>Wt
zy|%=^<9WMZzY2j#0s;!E)^d?vquxwDu;QUPVb957x=sxqfN&QKP*A=#OsrPWo1R~Y
zi6M0ZxfN3+h<rG=zN4lxhU-HhD}Aizf5;eU(O-VJ&D(+4CgsL-!q^g2Ipz8Y4JF!p
zZh-5&;DTfYn4@m~N~@HsbpuI}%wz}!{4rjF6{HHJR<>WjaeLuBcwT96XhedCqj_L1
zWsGv=-TE|ur5NSbyd%L0X~Rbajs9_jMvzL5w#H>!)bn^Y<GeV#N4e5I<D_}Zm%3E6
z@&t(fu{4gaG&D48Yinjx*`H*y`1=P3gU;96lFV|<b6i9w4PcIr_Q@jN-m=Tn>+b8z
zXhg&?T-23IYvT(ZcB7a_=5jHto3DH^_tBb(JUBm=^D>jRw)qdFmR-VxS>}YJFO11I
z$*_iA2@4Bq_xtk#&*wXjtA0!o5s_-cLByBW*A$@gxVgC*FQIJzG{~t}(6fNe%-lLi
zx@i%MNT-7^G=S}dR|F<<oW)?`K%6-}f}3FRav%sjKC(@aI#~~+775o1s~ft!nk4%B
zQTX4T(^`9A2G!EiVq|4C>J3ByG8`2dxqBc2*UsLax>p4n5}7Zopl^&8s4ALG_9&t>
zW$F1$^p$@`%WHrtN^ck9zSawct5O@Q1iRrThhzktM)kc+ktFh|uqr^WC>F-|h2G)t
z+Wqu3c|-}GiPm15n3$MWrya}P-5u~0h57h=;;`A+12}ki99C#!<9%kU;RE6FIyE0P
zjlX0Om<*lE&Tbp+=@s^{dQp7OOM@U8`v96HgD^}TqiA`4J2)Yx57L2O*ybxsn!!lb
z%Low^vKW@;vILw4k@z%9?8Adgdq>C7Mh6d@<-#7obkJ%xh8M|Z)!J_NOj_V}hRVPT
zClP=7a(U&WShV%_nw~%13$CC5+g{GzaMc~OerocCCm&>pq5iRJXfhw~4jYE(x9eCh
zj%DXAPdMWaqVvZV+6rdmp3T0vvEKkRJtG@i|LABK5F4lj1oRo@x!Kur0~N>;LXHxN
zH9#oF4s^W%NcPVJ{Q<ssNdBKupz+kD8>6PFO}ZT`Bz2t96=g%_=mERtFRKO5<gy)r
zD#KdDg)CAX@pGnc`g0h`;{L_OB+wH+t~5T50EFfFM#pFX9Hy<EouIIA-YE{rkKy6r
z1hb6(a@rW$#54-&ttsNA4qQZnF%V8iJ5k=2{@-8qyHFg-y?BKz878c|w5Frq%mjx%
z=!9+5cp+H+hpD*CWc>lVNS1(a?OTwz%fYCkS$ZfK7=b`X{CBcg1jHv$|ErxZbUtE}
z!-fC@1H*U`iC7jmj6=f0Qn$2NkpIWDHKXyA)h3gL_4TBx+Vv(azvj1qfa~6or0!>E
zJ<eY2q3<iRnVM_VgMT2m5rC}dp(OExkF*Q7d4M7fSL?;$o(|FTU7qxEo5~xiOVRCc
z3rI@Btk7&K1Wfr_ZNDM_KJn(|(E)H3_gk4@)0o#Lr^A<u>S8ETNdpX8*ZW_xP+Sh7
z4DM=Y8y|*P>fB_@&7)uSsG88Q%pXGO!_edIBx|93goTs|bE2BPA8z^qZyr_vz38eU
z7ceWGtv1azSgMYVk8?R5B9V$ml97=3emq&CNLgd{3sSyBft(o@dtwYY6F~F(*V)$7
zzjVk>Ogi6ICt#mH7w3*B6<#L~&d@>hTQdr|{^xv}zfPBpSrC54kreDVyuXZZ50aGC
zXaOQ5+d!k638BVix5^d{LWF>Xv^$(4hWbhn-s(0@(E+_LE-0AO#}{UR)%rO)&hLEP
zVZkh&57%VEzfjs?!;bbhA~$dur>U58C{$4;E=YQh$`4dX7$PTh)rVU2{*EewbfPBC
z*zK|d0>?os$pnt-&}%jSE-Rw}q*kdk_6UH8LP0|M^ASf54#K*+UE!Lf9>KA9w1xS>
znf<V$Is{L5<I6&}b5zNUpVHH}#!@~rxOW6>(OJhxQ2$zDiZD0ez{(l>NJ;8y+aC2^
zoX$N-3x&87EmJ5Kmu|TBt3v#<(0T#`6%~wwi44Qr!)YuW9A=X-ELvLHX3ytF$5lQ<
z!(Dr`7&#pNd{cR{F!bnL5_nvwPoKEn33#zqnu07BVcW<4L)A!XkpvT2Rd<7bt-%eK
zJN|g9=u%`cFFg$P`Q-B@6I>HanO8I9Hmy^Tkg&SFj4Uj1b*7Wd)@z)l%4GvXF{IP8
zv%9Cub!#mSK}WMi-$psB{@V*+Xl|~KNQWYkmb`TxQmTcmrA5Su#Qn>^QhU3sYU_Oc
zGlRpQPlO&1VO^XPcK?N4^B)9AeWO44A|Xg5Y1R!FpouIQj50+s`6BzHPUzgtBy|=m
zJlH%g3XfS^TPu~RAOQbOz~27;2lWOV_%Z7Ch2-Sqj28~`uO*{s_SjKU-VS=Nao)U=
zS2hP9^fqS!QLw}@A0?n@pnRTz6#M~pgzu#6C_ksHs*PKDa<1{~=f!blWmUjG?bS+1
z2z5PCR%lq*5Jw>@(2t9sZqm#bgy6zL++-;b6G^iC!Y0;S91fW+lj-i~Tv3A7^x@dx
zvqe1gs)Pa?=N70bL(U$9?^oXChWLQs<Abn-tauNd^x;9?B5|7ILhVyC$N=fXkXsqk
zl&J-zM}BFsP9*}+jotHE6L_`PtJ_2--wEEa*che9J`zW>7WtmN%ab`3)$bbM1$TWR
zZ4c$z$_ipfCSS(tct>Y>$3-Y=<1#vw%(f-SfSf!OomaXcxL`_K7D4WZVy})(KvO)G
zLPDqFUXz)HU;+}*{k$az5aWKGuYs(sE3x3NU@7T^b&X$M^v*PfMjh6`SS%L;+DcZp
z0)bPc7lSV0Y~}i}ic6y#I<(EU1s|aQwwigwC9LTOae$h^@|cPBUlUWfou6xgD8@mn
zOes=U8|^8|WhyxeB`$|KLC^>Y#=zJyv8>cb{<q98DCo<twvJJlyk^|ithmuM%7~H@
ze2RzzQ@>%7FmhV`Z<6X0_A+**m~iyB&L35rKu!d?>V}&oWf&>2I^%3@;w)ZaguT)3
zi}O~LchG7{Ma6zz6u-gIOo6|@|K;^410Y2Y0aGBC%O#O4-#;|rK=`8oQj{kY4vr?1
ziZJ#xgtYMm11`T$$H(+9^comdNC$BPFE28b5gRTyR8g_Qh%jV~A)vL<j(GV6_kD~f
zI*#XpF);>cAvj31>XdOSJ#cZ(9>>BuUvyf1P|*`XrmB)sAJ83_Tb*cloX_`CEi3i=
zL(yq<JJW}Th6s2+=P;C&l>yrR*SzWAWh=3&#o48$AD*6kzuGdYs~HOcDcmZ9%@S`G
z+1-Wn8ctR=ILz<THaOIGe^h?}ei1KfD#DT5<%G^<AHDfb!{yBti>-8BxwPaj!%Kiu
z`L6Z(-=>#FMO9A!vbc}_!)z4OPr+Uj6R{UJ`5B`++!z?#He8(Dcn(aZmVuKf;*ogz
zPq#<qYBjz<t=hTRw1dmH-KU|V0>tx-1^(Lg^>u7ODhHIu@l4$&L;}~o=^huRuU}ox
zxm=D*GO25(PUwlvd3&)l|C;}*2?OFI$QA3`j1G16l<r6IYR&e6x~qwLPk$~F8wbeO
zaO3=FUkFf9<Hx&pbK?fYlfR=3T_SnY)wbJ07z{d65)!Z*8yT{!0cFC5hNPN}R^0|Q
z^)BPHvvDPgMJRZ9Yp0Ltct524RaClHaYMt1sfvpvXq(5#$s(|gE+J&2W%(zs@S5y2
zi=bXGD-l0p1~HkbE~x{^Fx;iz92>Np_ZM!J7jt0CU{HQOHl2@wKUW*CHs9YcQ=|rB
z$tBg=U6|r1q=8dic|lPkhZlfTWN767aP<~YT`pa`ut|3}NOv~~(w)-XCEbkzN;inK
zfOJWBcXvtir@K48;k@^*^{wkVYaKlYpO~3v&))kNGhpRl9M;&#H~5pGbE(;s>tfX)
zztr|ARrF2k14Yxhyuwd4`+6Bkyh%xj5|LPFe4<CvuIzD62b@n5n1xKt>M8J5f+t9s
zmt`L>Hh2%OF}BO|>oqMM-R<3e*?f%+KA-CW3BW0D&$lZL+TZkq?>@M`d);PL4Jz`V
zSp8YjIiwU6Inyq-Ew}>D1j)V=US51XZbbZbR5ElIxY$$?es}2PRJHZ)WDyTxey7^L
zgD~PJ*iXW&HcU)9w=WTW8$+=T$@OnS$)A`WoSwg6y&B^xiMn|50kpzkp~l8~sbPBl
z*&YN>dX2wdPfkw2T3xfUUu}DRc7C1)n+-ly0RA8l3p7n{3O?Z+wXVc4y{c>EvrS(r
z&#sjQBx@~(rbo`Ehl*@8{%ZmR{F$wF@$iSV)^k>-IBD9l6F7&iOFfV80wM@$WI7J4
z{U+R<w}A@0I#=(g+>;WMIxx^A4d}Er+u;Ui%$dAAf`fQvG2|%GEiElaa8<U3Q+h#s
z*KBlU;Nai@&zjJ9+@eh$DqM@h>ueF0q9ZIKvY;bC@qTCvz7>oO<$KgpVYu(ceQBu#
zI4m9G19grRsa8HiV*1{i_ZfyJ*gn0VpkifNkxx;qrkZu^+owebv+Tt@;<!BgshEu^
zzhks)E|`^Nv<jKxFU)mOPUY8s!^f%d!uk0TEB*1YGVR|ecpNDi88QGgb#HEdDXkZm
zEup%|KW=?a4-JJoaOEQ+A_6IL@e(gKXkaA0CqR^<Qn*qU`rcAfgSG75c{-^jW9-4x
z)#KkPXkwy>v)_|(%a$_NWz63r!atRxL>%}eQ$-J_{*J>6>+jd<;_g6LKG&<i&}?Sm
zIBB1E3ltsrYK=R(1aGOn{}g^hjI^QP^xPFT+8V4^X6JH$d3gzXQ;Ad=-m&Gzy)Rq!
z#KeT8oZKcT5D2*KznZ6e{9rNe2^Lk_aR6|l{W1zB__PeuQrLPOZZ#<b1RpZFq^U39
zzkNFyVv9~&@|1zVGjY?(%OQpnE6Dni9iK5S%#R?sG6#MDTN|RY&z@AKA1XtbaBFSK
z5?EPK2pV<F;=u$wlS%S;mf@!KVIz<DT_kPewf6n76!G!#2JCn-gPY!WyLm6w;8!qY
zt_O2#O*|B|w4v|ev7(cc2S8SSa(3p}e+u`eO<mvTyIz?&NOQV+dutmHa^>tN<syrs
zO-)G(OUDY6@!T&}dxx1T&Dwu5VE5>ro!Ez0#>cE#*mOB;UqJXH5%HN$(aw{OJ38P$
zg38J#aLHDp#P#BBxmF3zNJQ2bcDyu5p(Q&W9zMRMwKWJwRgKNL`?^C53;4vu8LqR}
z*VnzEJOFZ%4M&f#O8|MN_A7t-^oc5}!fX2TC>wugQBx?cQ`qd1gE?xLd!ifcR>zGK
zi0Q45hj#pzQ=c_T)WEd~2OAqJy>A@>`}+m$pr)lY+8Rn4N@5EFpnj-8kZ`RPUba;=
zUgMHH*b*9?+_HYjQVwnN;#*b!!*ctyaOesa*3r??uVFJ;%FjjjG158goOe#!X<>D@
zTM&A^#U{Vx6u`S&bqf*om!*9Bi8Ag(40jLWM`8#7N`Va8rFRY9N7IFaUTfo*z+cPe
zvx~qnMM;Gqr%EY~i9T`8il5b>3jsdXY+Rptu`#Ra9cSL{DDiBE^tYM7o#IobB0Ih>
zJqgLHdY$D130ZslUC|16*b%BPE-o$>)mrR$5$EN*&-;5*8pUcCo`jywuZyOob#)2V
ziZHXszqT86nN?@0>Hlg{-8+n^ttI;q*KgwP$&1F?T`zsKwiYs^fW+>%u=tVx<oxre
zF!g_~PaO$*ZXaHyv{;St$tzy<h&yXByy8p&7lZjaZqa5|&HK~UNu=OHf;3@$e?K52
zg8;m^azPiEH+_9#3^)qqkas!C-&$J*rE}1}3y&Y1K8)U)R5O6hJCGuEi(Ne2hA~fA
zj3QyA-4q@UPNUwD0^kWF5Q~~7>F&Mhq9itRB%o%+DhYbC`pfIq+q-DmYRanm+|7J(
z-+8Bs_X6r8Rv6g~0~Wk^Hfpn8P`8m--n0>G%3t<+i0H202h{UR7ji2B)}+d#e$1yT
zEI8@sSK^f6t2-faB_n%|<^GFeqTRj${Ted^XSO?4+h}UqAH@T*`F`}9ba^uNxcr09
zKu0UU&?nY^*l;9AV*+m^ARqv!4;f(|G>(Eitb(`$VMf{oDxlgJqd&?~W-*q`$Wr5r
zZC4W@J3aG{Mv;Iw77aYNq*GhovPp;VC`+zU=oyi`)h@QJoTsLz-vD_#$em*{G8B{?
zU=tD&0I@|$RaH#R1rx*&>iDOd{>{FJjXo3Ko79xK#a{IvdFq3(D0ujLEIWkyHS}g|
zP|ZXELP2WTLV44xTU$S9x!)y7ivgAbU@?gX2C*2ly@Eo(X>0rTHY6ef^RgUM-KWB$
zTqD1@_)kSe?B1Rg_?0TCsyeMQtHMWAR0L8uv23;M+5Koqz~OLw*pS|Ud++#N(AV)j
z_@~9!(ZuonvOr7UCLDh=dEdjs$<?VCX$*-v_32scs#EEimxq)h_5CpyQR7mid{Mhu
zwE=4q^PbC`wb}(Q16J7ku=zkCw<Dfrq`2{~LU}F^J1#peS{J;Cyb(}oBQe&q3)bM$
z@lQ{nXaqSc4AM*Hsu)!UIZqMDTdpMXf-WfMTK*F^A}L-0((|K+ea0a(HqMli>CGHv
z8qftrAecK7k*{L~A3WIJ3xKUgLqmh+qPnW;XH{J>Q`3ZVo(Qc7FulFK*E+>?r*U-A
zbQpavZ|T?DFI#Hw&2kn8fk46%yHIEK&}hJH-wbR>{y{VGjoc)kc=9m*I&9W$!k!-H
zgzuRKRXHC%Z6sbcZB(trjEDFu912Vb_|MHVs1WR@GO!kZPg=3yAxbtkpI#%AP%}r9
zB)}!m21iFL`l||!+z38{s!`g)BA+|+`cGcQk6FDh%Y}3CiHX_YS;#tB#@*35rcT~4
zoe&+D=R2aZO`65J@P`czp_`=l{mK7}^8EEvmeG1}cqAD=EtIMScVV>R8`Tf*px&bs
z;JKD6{qe#@ges&PEGQ|+s%Z!<3}v+{q@|`~{9Tp*b-ly8u!uG!Jk;zacnye<01@kx
zkr8P~NQk;iTBA{%SXj5Pk`gL_tHEZWsH7xhX-Sh~x*7lTr?Q@!xTz@x2gmfgcTi|J
z7~y`ONCv)sihue>{qXh_S!InFXTy70kObws-z&%ZtQFs}Yiz7a*k<`KaowPXQY<-L
zhP{7ydsapLNCV{N8d#oo3}#GZSWIkccJPQ5Q2ZuDb+-+MiSy-N^OhGDCYy<L{k{Sz
zpd(r{;r}mHmJ-6`cME^L>}AJ9STLrGhlfYaz>xFzZ*)Zkt3+yI;%A+8cX|ez%q+0D
z3#A|4zJXQd2)X@A694+!yLW|(Q15huz5FB=?`beb)O<6&IHqR#jCDV&%joJNCO6<s
zRdYnHd?_M4)puLFPTsS6^ELpKOcea2{=nUil&m8pIGBW<J{)w2f#FL?csPbSG^3bo
zI7GQh^bM!>0z-IAOr*@jhYuLo*p;B21hn4(br1~NM_Thr2_F}fHTm?w4Ap~dJ~p=2
zg%s>ogK{ON7MA2+$&)%PAU3i~f950~=d<_DG^d+9f}p<(7X25u;hR}KuS3=8{4u*Y
zu?TSyJv}1eOt7)N{aHgpQpoVb`}f~5u&|Uhl_F`m1IJEaR6ZEKD-ec-LnLFS{xx<Y
z`6j?078ah0nfqPH#@=I%Jw>_Jkcz6BqOPXAi|Kn+Ow%bfb>&})o!=h4SoU0A_DMWE
z&@}0^t%ZPa0@6+ZnASBm8duIs0%`I6)nTas!5XPrQNqK6Hyj)s!Kt3&Cq3WS9v&VT
zn3&31%Kk$N@*3{sAJ*31L48Ldz!HkyTQs(Z`Cy2e?=RAo*z7xERjsHEK1EHMY7W)-
zM6A!+pT%6na9ySoRN@m9mGnZzODO62{Q)syeSIAV1zQHN23c5GfYA;sNQa9Ws`KS|
z2~$79fB&wi_{zh>{;mpAUWLJqcc4sTYsR+u`n4=PQf^gM_(nNIN|H!seaC^EGU@|~
z<mMjPE+=ov4@i(7<@w3$ib%qZzHiPCj|rgn$NI&LmWGBVUqyZ7RIgZpD$KJvJvEg8
zKo0<%*}6!w9!cd9k(Wopi%1Ucv*;kph7AiQWoJ$P8~pNz)Ts49lBymfP9-fJNlS+h
z@9TLmur`#{R6dDmvT&#-Oij=HhC?zuS#3waWexmr8W0i{<@V(4>=bRk3$hX#dU|WL
zb8~K&JN9|=5k(aZNrULnz8#GY(k$4I#QRDtqN3d>M7T?2iKT&0gC^`ivMQ<R@ZrUA
zB@shOZx5_@S9YLe7DFW#49pby!3_F)KM-(*y}kJX+tS_B)pq&12!uWgQ0<wW|3Jhz
zc#J7{3(e-(XYZ|6^1*USgTFMZRoz(REfrf-^eN<;;Kq_m0?CBg>_9_}UjL;k3l80T
zDAs=z0<dI+I2j1DCT3=i{A_W?5>XDMbo)9ay(nz<DC6Y;!MM!7e!Y(DJ?YyiDl~#?
z&TCl~moj`Uc3Y3Jv8foJA>-i7_}-%)SjC_dq4oy{qK4z~Ow1>mb_Jtmea{Me5h4H~
zeQzWoWTzZLAn2P4gx_lrh|FSJdlv$MtaB>amN7IEC8aHM%l6R}X5f(lOA7VSU=H&r
z>V7x4$<}7HA18i^+Tf~CfD~R*SN?_x;F?Ox%91lOj!btSsbYnFA5P&qkGful<PrNB
zt;g>t37CKQ{CS(#ZUn9E_iUxxERw6wBeCydLQmg@$;_e)6`fkKeI)Z(#-(S4hPt{0
zV7=|);t~jW143h@5|}Mf6$FtVRIDVvH~~Qv%<eldSw_&S(*uMG{;RZVMcv~Wn?q8L
z@@cEqSKwc!N@`j|U%$PTl9pai9?wo<Hhcrfq#~J$bq#$!!mh5IKv4L{+{FH3hlMqY
zxYw)_RnYofzz<4hiyfGCaCwV9`-isyI=VVSpNf>?+)7)uMhavd70eyBHemlQ;KoF^
zfmf!K#TgBRMF+JR_0f^~3;{Oa`9ECR`9ZRg1xalc`Qg<|jkX?g`ntxX2rGWcd0$_u
z)!5$rLYF{xnv~-@-N}w(Ht9oA$3Bd`w5YJCoaY8B3KtjmKw*@Gj4Z9ALs*<V(xj`8
z1wl%Z(svF9M6}L@ykl2)%)m$-L@38mis(GnDEsxD*CVL|MyqW?vcH(Wg>1{yf=>Q$
z&znXx%W5sqqv?IRaK1WTQ4sfps%!5Xhu{b}B8Z5SqYCoJ1n1+hEJTbQg9RSr#2dy&
z#m3{X@v0a3IUMxH7jI5=_$;%?mZ{{)sq_7OcVGNpm|AYofS8Wr{O3|v=)w#$v#&-k
z9b5@54ee@}UvqD+f&d8zN5aa-OYPG7Ej)GXqQM5B*H}0t;ByU6<8wQ+(ZcicofEOQ
zzzNCjjb(O3fX(h<rFZya!GKW;hgBI8mn6~8@Ax%N0@?B4WYl8XDpx*bU`RzGXeTi6
zojUe;g=UG`%gX@QqZRLS28l=_!<`dRH1P<E4;~0o*}bT22GK=fG%z1?i~mF$2l;Mw
z#k@`BcKlilk-+8j=B_jwHZilJ1-b6gxlh^`D=YWA-IeoQ^NjL`ndt|k%g1+x{(O2$
zI~Zwdop(_)r@MkHMpp;;?wgy5!GNso;b%YJpQTo0x<6B5{WOZ@di?KuqG(6mmpm5R
zGxi>Zmh|Yq!I6MAq#iP{E^HpO6HeUPyR?)RACK{qUat#uj!zFeMWoqPH8uMIW;S2p
zLMQ0`{1$bbB|O9XBP37O{Ge;UD~EQi(2Nt8C;k*2*UK&L6vBAs<n)W(6776@)cE#n
zQ&d8tu_1W43GB|ry7%NjRR?*ZdXkK$?V1*AFxsucTYlV!x4vITPxrmEB=Xqcdd!0F
zq@W1Hi}(RdWB>YgLbWX15|WkS_Fh(EGaC*#uR~P}N)(X5Ac0D5k&SA;b(_!CuQ}l}
zRV2&(kNIMqa(|EWt;>4L>B6F-`6^5F44)^S-TTQTb{8mcbK`XvHW(z#&mZ7~wfC$F
z`)?e$8e8XkmXBLLd|-)5v1^C{q_M^-7pd%V`&r#D+|C=+qb)U&T}s9}YCntQj*{XY
zPGh`akX291q68_~*{7z(tke@@yWc`1oz%{*7)<s=gcEUn+jYW<bL{M(v!bUEvQGe6
zmaFe2am&IJaYZEYT5gKn)>;q|ISb2p&L*g~Gu$t$ThA`94rPBiexz~2c6u!KF#3fj
zRQJv-E~dG$<%7)v<<-&M&;HMp=R0Ik%uZWFdWW6b8XA4!@hWH%QQINgdYEL0bs!7f
zjKF?w8!6+AyE^0w2Td06bf1IzL1{~-?|u5-&+8G<(a}-Eb<pbPiYJv&yAL1y(V%#5
zACFFc<AJG8PHRFdQ$kMVfK1r@$*JJY*(5R!hZRPv$Bp6EXvWGHsyN_M$7wy+R#f(w
zFfpO5w(N^6W80FguOKr&d1w4_zxc_~`Y|VU8|0WZ);HK0&Ci^y#CE>tDM6amR+wl~
zqgVT*!^5U`;TTv;&U|hHCpV^c$H4XQ@z7`AHbuZA!%gp=ZN;}TU}M8X9Xn6;kTMMT
z-+V+CxIme?6Svhp|6(?x?<qFy>Nq+K?|wa5(%iE0M1=Fmpm{J#Z-)N7bitGHu#%GR
z|K|1{zl_axv5shI8z7apmjTE|Zs)5tUPP2GBcv?3yQ=bCPNP=V)+VDPWw)~pT=^xX
zt9E`q5und;(bp0#PBt5kJD8f&x_aeBeDu@C)x2VE++$vK`!Joc({JWE%*F4Ktv8Zr
zH_mOM_FvJ2S>@@N2y&%&xAf1IC%UJ{mF6LB&vVQK>Ngl$+YJpc{$q><wa7Al4$v9L
zbEDz6biaH$5&0kQSKPRJFLUzC%C=)9h)r)p6Bg_4UJESWy{*KiM-Kswd}cQ{x7^{>
zK|xOM;m0o-kaYc}-b1$sw7CAM!+X!0wG|XL3&~oF(4~^>b4Pt{yK7NgtdgdLedX<w
z!Rew#pM|ANu?h>$lq5DcMnPhM9&^5{a)Vn2#@5f<CR?aST0B8CWF1MYq^TTSBNULl
z<0N)=i~zkAYt4v;$S*<Pvr0=Wot6&blK$wi1)s%|g0<pt61n*``?+n<&pmvKCE(@n
z3O-+bu;wgsS^zO|KhBsZ{)vpvT*0Wr05hzNc=+k#N=%CzHl4YgiLf{G;OAba0|Thl
zU$%R-t$M@psHj63seRX$X(>+b&O_gy3^-E~o;}PM*m`@|Jlt^<1e>5L`{(v5um#OI
zaiyBgP@u044cDejdXV8dj5uRFhe>>&cA?Fa)JKwc=-JwK(R=Ieb3J6`!i@%kVU8MI
zSj2A4wHdysN0pac|JgmQxfIax=Fc|XkPSx8&26Zd7qBX%OF|)*)s=IpY*hdsie1YY
zJxw+=E4cafO3j~n2NxA+o$k)bxP+palYYPJ3Y&YbVhs;6P>L_r_!LbKbclt`H6EJ_
ztdvLH4*IT5u%Pf2k{wQagw1zttQo%Sqg%3g?SVH2M2**Kvf{>-n_d;^F1eAln3E;l
z)?c)=OW7`Kv*&E-(x<CA((Z<A3Y%L+ButyNjD30#;cvWqeM1L}q@>b9<Y#>t8tUuo
zi&y@BTWP+zwq2m)7RW%#dF~s~M8_4R4yKswjrQ31eSSHTuAs%o<aXidwP4F2j^Ihy
zTE9<8*#%u`Z^gRn<;LP533GYLx$XO}2%j+F)bU}<&2Ou%UF2Y)woJQrfl$lj8}h@Q
z5Z)qr)9G4|fYbfMXE0R*s$Xu7?1}hTE0P4f1YU;ebMEN6VowyX-K{ppe@U0jzggHU
zZTsDmSOyWSARuAyxkCb&Ub#Q}>30f}1V>on9`yBzW1{s4F1vTv+k{NvXX}mjKHu<_
zHC=vajKZw2*tB_Ai}AX>_Ie)FUw-6jjKX5J+m&m&xR-eCetcZ^`vTcuVHxsZ{HX4I
z+kdYs@D#P|^R{xn?}y!0rOz|XhP2<Z@8Ng(61o^qV^-X`oBsQz+cipGUfoF1y$Jcd
z%}zJ{?af*Nlk4#}Tl9LnV8K*It&C<R)SeBGn$N{J{P;pCyOq@IJH02+;2CbyOtoEo
z{jy*LGfGS+rf|I*4+qWeZ(J7=b@&)^x`)*>TAqQe*;?_l8Sx6?i18gFy!##37vAdQ
z77}{aWH*6%X+tTVR<FBV+l8Zl)e2cNN$%$mrh8GpjmSMoFLGtOAxiWGPT!7u{R0Du
zI~pS+=(DRYezr9_3Nw|F11oy6wOExlgxlSNF1b&x7z;Mtm3{__c>+#+_ij5w+lSM5
z`;OmZpFOtqZ=i#mW|JEmZ5p5NXS9d(U7czbCbxg!6Stgm_1<o1e1KP99)NGXkNAHV
z$J6m}>u)$%<NGIiz2|Muna4wlVl1}wbiI+sDs?ViTF7R!=l$RH8jhyZYpzC@#-&Wn
zjBb#CvpGyuThBWo)C=zpIC8{+?@;d!xC8R-Hkge*SKVu09nW`@wYElcf3&}6Ra-hI
zft01q95swpWOT>w&Ym3QEu<QYSaDd{>hlLMxe;2`jQp^h#O0rIn2i-GGam@HZ;>1{
z7>iyT*)|I&`sC?~DU%zuR^sO)<!*xTO0yTqVer9HckjHG--VwESUNl1n^!8Fj_oB_
zFF6%YL+Wno$5|W&ZjX@>6!4Y~E-zOOsC+eq!&qy3tXQ0Mg)w${rb`}{8eGE<o2eoX
ztDj#cnXlGv4dP;V(w=BJV)Nj*D{I?$FJ!j(_qV2p`bc^g{;?eieb%MaGT&$DJAbgJ
z|I7=AOclfh2I(*V<)EOT2*-(O%Uue(8^Z1avzxc~pzei}&JFi<-Jk!c(S}9amwQjA
zg=$|@V)Iy5R-d5K=8-U&(T(P^*3z1<X55wEZHuk8;OYq}?Xjsj*?7r>z2c;Syyejh
zI$J!V;ovZWkSpDb*so^T)1v^y;rY6A^KDrs@qll;{pBOPF6CkSi{0f5%eUp(v)T);
zle|?H|EQO5O~NXDU*_XTzq(4M{*%Jh8Z<rq?EmEg43B>7d|S(qTbKV=qQ<Wv*+u*g
zIAhhjT1jU}W4tEv+cNcanw1mn>0){MXZdGHSM=-`tZZs>$6eHl6Jy@2B@F|u!Q!6+
z!qSE0*p4@5QN;facnaJGm9C+YTK*2*wg*8Y;7uIx6m=tfGWCG{CWI~CPRv}lStTXM
zlvbtodQc`TdH5?TAy@QS?7CW1CPToFnkEWA#W<SO<e#_%iK$Ol9g}~Km*i~ZI4(KA
zq&#l$I)%%*T%<d1`B-@JPnwOaDYW`TSHuc;kQq}mF;G5RbI#@r*_I!#`&YiJV!O6C
z-~U?lKIjLV;}G{tbpiOnOkcDCgV%g&4%UZKDX_HLMtg+H=v8~Bp^7TIUFLqj=Zw-V
zANnMAueEjtx?JM^5Q_`O!eO_Q`TxE;>tfyE@*~Lp;M5ck=+owD$96YWnumlEjv-Qf
zp(*X>8B?e1w5sOzJ07_GQ^Z?&nCp^X(NwJY*kabPfwkalx)dB9lAYCr0NRALwQgkx
zm2AlrVW6eBbE&1CkRw-#&A8nV&-3swd5v?y3pcWLBJ$7GxA_Y92UX;{;Qn(r2v!xR
zE60@v9_KA;hb3Mt1+`o&#7rG|0h;WK+DQww)!VO%vFL2&?z}zSYjjGp?Womc27TEN
zFUf4IEi6uTzHm`htD1eSzFv}dUi|b_?#tKyA+yfQy=vaAkga!4MdDb>d^sq$7qYwC
zjR>E3e)%)v;Y_`CEu{p%-f-<qEib{@%`LBaJd0Nw`tD7D{44`o3-@}9-O}#Agu3rD
z``(i{<qL;(ja<h8^KqBO*=KH)xlEDsH3C%0jI&9`d(<@xVdidb*GPg+DOShFWAhq~
z|BRP@AE$FeM|;YYYta)jxx@bBqjK5wo={Dj2P@g6b|Gb2J!QD3TSt@2S`FX!=*a!5
z93MWVxe?Sz>pS0^9Y<50RXzS~(8aOXZ0T$<*2g5B|2(-3I)3xlev^U!y6f@a-jM3~
zUU0PBzMCOU@7gGa#UVby*>2L#-hw;1L2LUsPl4e0jFZ%Oo!VxCTsPkDXYdZr_Ay!k
zmv}(??frb}WTM7D_(+1eQ4xiY3M#S$%67z&!~$bm6^V{7K_u}^fL_M|9;Bbz@fesV
z^U(Vme;=?*7_l+=P)fv?wp=~4kS+qVp(kl*`;7OdX0)9fjP|AqFgDD%_M?}vtJEcU
zKW{t9oAW&Dt12xU?Tx1wn-eCqX8&qYN#n_lG-}LtKN>Q({S1NzBgaf>t_BlhA0%(d
z5&%_s+BID6_WT}8_P#rXrKt*@o(n>S27Aei;V$bIgQFkSXCf-+^8llIf1%$9(14km
zZr((d)+d2{PCcREJD>Vun>le)m{1w$EL1q%n`IdjCfaw95jsr>oX`2_B(gS&Z9iPi
zAR<PQUk^!{JKetQm-Eoa%9?ti;|8lBWZFO5$S@Wi#N~}{KwSJJK<iXf>cg}9V-Dkr
zDX-TWtE=_xoBx`<z2HWJ#qS4G%aC#S0}+W^gSxG=n3)n=TQ7PCiMFUod4FcKD0G^z
z$AXOUxcL+gY_26xisq5!yA)Md%jk7g*M{yB7NCXe;d@widU|Qv)%Qh9*Y<Q^VXk}=
zzL0j{FKAud?glNgJ`3v?rRTq0Vi3GWP*|=F<$8V+udU(+fZOT6FJ%>1Eeq6)efvMq
z^jbi$mT*}H;#t3@C)R|`9E&}x`HS8Ap*lmuN}mgpkNf!#gxwc8d;diO!fq#tjQX^Q
zOPPr3B8r(Wg>)Xy!*UNtZmndbq*)M5Uc=L@@74=9Qnl7abPbLI^*2oj!~0X+Wp1Vm
zuRfa%ZB-&K3xO_8M#`|nam%<-Qskca7t;gA1<t1w3Yk0kkNjm~ji)}XcbIM^PZVzS
zQidzYe7Z`xSVZ@oVcw4!h<_q+yDm1kYiu6E1zR05SBBP8)RZ*!24Yiek0%<U9-iK-
zF(e-yr2IXr;gBR(Rs%cNP<g<OfDIqA;N^p9!sA+AdS2C^XpcDbx-Z=XKNr2B(F)uu
z7cTfJ?w%xQnCQ&Lr<CYraD!C#hLfQ)>|35T&dVxnAXFfy-df|c+xW?WOcFQPSQQoa
z@p8NMY(_tQ`))%6l<{Hwrw7k}*Jt=Nd9ydaj_H2viCi9)@gc^de}4axb+)F>q~jmg
zL4$Ths3v-n0BvMht#^Bde(QtJ_0P10TKn11c`%R)4v+{g*9BMg60Pn|WPv`W#N4yV
zBRi1VBo=1#PAH|-E*ygDimg?LH%=4sLs2JsbP2h{rY7qD{bJZo7njX#&7YAH(Z8sB
z788H`H9{C>_Se3hKiz%(%v^)V4$!$D9w65y8NA~*3kTug+hG)VNt@Mc5bdu!6&%-h
zKA1(~4neM$2bPcp=d&ELvm3^haG6v+q)-=Hbw+(!t$a36)vcVM5?`7XTSs0vf*yF+
zf=?11q}g7L)@e0Q*?uRx_jZ*I+piO&VCQwa!eNC!N6u6V+S8uH5c{48u$c|*#5_J+
zw?1!<G|n*l4qWn|bg?loE?r@h`g+bJ+$1ev=YRR)eqSvZQ*$V@><)3Ut<QOsc}QF@
zsa;+#D{JlV)pmm%PS)Okxq26%7gZ*^C5uu-H(2k|e(9a&JCL(!m0z}fgul(|H$tE8
zbA_AuGl#=Q{I=seJdX=&*iD_J+E8j6F;RU=Trcvq**vd`zMb)N`ti;E;ONO}+^8-K
zu@;5c`;o@t??nqSZ|^<MT2vQ#{b<p9DV<pNMWZM}UjgM3#AF5*O8iF!zbV0Jna^*{
z6~VPV*Bsxi1}z66qUZD8UQKQe+@!oTbShRaa;0~5$1V4g(gf|Gt^h4;rTYdx^`WhR
z+Gh|?e&;sCUJ^eB&`g@wSII^oBJw|Pl*Qai-gFZC9#2$M<t)`_j?ytPZ6DUItfjdv
zfADN0Q7djpu`F=Xc`7k^_)P+Op>^lqdh1TFj_~WIra`5+KC2+mY4gSRa4!pn(O_(U
zzS<Z*!|#N#dOCsM{`qmy=Q>$0gQ=>jDxPb_JI-xIxA*TK6SdNYpf6<#HkTulE#g)5
zSK)M*Y_phn_;`IcyIw6fHy>XL&!ajB5|QVQ5EK%@9ORxeWtd*Kh9GUcgYNjDadZWB
zIql3*{(NFGD%RuT)$($SY`Q>LZ-&RbsR-0RYqfNb3-u}0pC^}BWs1}oj5HDwyb1K_
z=H(hU2bH7lZcDt8gdcn2aoLhs%volK>(&Yjt^LQA0A{-4caOPZ^Nf6dePFa$=kTzn
zeq8}HV@*v>yvv`ES@9ygFUBRB8f^*9N4HpfuDq4E8O_$GaEHx4qP)xW0b@!axiUEN
zY-_fC^^8J5FqGz2YBsFvmZ@@OTLEB8O_zJZ2k#TGQJgCLpbS5leuR%yLh-$CBNPpM
zUug*uf4Dor>}I40lS_z?|LXt|pRt>3i|Lg3<-X+HBiE7+`?=JPlRJ+DhGG8D)luF&
z<`iPfdUdqEopHtNFd?c|s?iSc0~kb?$9S(2(EnXKzueb+zV(C)3$0@`<%Ce_j|S3A
z!Xh;{C7HZilU7mxd>DLA>~;<^A%Fij^$wfTKoB8hWRz7D*4qf=p00;+i@wL5i;lC8
zi63KsjFtENfNHt97WBBE7Ch~OL{+*TqWiSS^ioiPCr(Hxw^`t9kz435J#Oio91L@a
z%VRnEXBnR6oaUrOC{&k>xtX!q*7A{H?)oFHpl=j_y8sL{Br9k5^l+Q6QW(iK5tPc~
z^dCoUxOSytJLsdRINuKyTrN}I+3?ny(cyO#FwO11XPquqeZgx}LV9&KwzrrK*G0`n
zllz-I&LyR#9bHhh0f%k<37Uw6sWp1#;Ylnv$91$WQdkBwIM$d(1-|KQbuQR7ch8j@
z>+1fI-~DM)PSdzF0;oebM~%lfoD31f*H6Jy3n_objd4MjJS4j(n%j!r_pHT3R}ZBj
zAh-1A5E*nIzhiW<F*ImXzw*jXqnVX61RZ7YI^j6uj&MCs1AxtDw;}+DNH<pt>_~(H
zqSlL_&|-U|nXTxhX2Z#RE#46MSpU`(sv`iaCUuxcZfotW3DHy15SgG8Cs#^fps3l1
ztSPwW=UmzL-aI=wvbmpfDV(QskSItV%<7f?$Bv8n^Ly_wb-&ZeYfJB&t1keLIhzP$
z`U~_=j8XLm(o5;|dd21CF`%f7i-{5P^n|*foa`UsmzO<w^@D<v&BEf%|1cE$@i#OV
ze4y<coAm}@CnVd>SoL`d_GdS!1JYqq@<iQTA?UxDefc51QB(o~%hTP59A=eCfNUO<
zo<8z)fdC2s2^UpN*#7Jg;-7u1h9O<Z3MQb$ycsYlWh^Ce?la<a;JnAkt7Pr}=;IHX
zUa8!kF!jRifv}Kz*9me;*<WoyffIcR;nmgGA2rYL=?P<M4(!$%t<XL;If_kDyo0W5
zuy~9VD%%FR^8C&5HS=CIf4wV1?TRm-vgLE*)C#2E=nLQ`1R)b|?Tlv=eDn;5Bqf;;
z3Cd?LjYJ!g;c%M(Tqlymb=ANK3IQCyB<<aZs#92=`E4SW6z<%Snma}AXg6*nb%1>P
zLW&#>HbhD)oFJ*I?+>|n6wz?LQnrq-u{5w^QW64))C*$PH*O5jjQE!lB{-DQSA!H>
z-e5I)tqTE1RCduIMih?Gu=*DbcZ!Ii9-}!xn!RY_4n9*+)Ay0_^8NsASn)_%BNazh
zfJc$h(hf|E9if5=01|=ok;eTS+iiK!oa}7M;bOBrtMX+b^)F)QWVgTB_VK>lH21DN
zl%bSQ?)&&<=C4UV8b3cjh)%?tu_omV0IhyO3m<MABF)oRfe=1*c(~hu9R;5&`q%4#
z;7~%*i?2eWy@=$zuAnqqTaT2@)CP1B+5u_sC1!(!G0VGG0X(tT_gm@>I4DG-A)ri=
zl$JHv=!+qzq;y?S(NQO>oF4+J!vA51#8hnO?|69TF|aUD2+*VtzP5|@@)!x2wHahV
zpwLh;>BRL>7{fp^TKp$C%by=^#O!l?qKuL+5&$Lv1dWD@+r8QzASH>@4#qk*E>22P
za%Yy|M`CtyaX7NTL$re6W4yn=@XKgi%)=+SFCn0Yakm(NG7kA*xjaI5#hQYdIU3*#
zA=5?b==k{id+RP?0txgrIk~w%{{N^ln~C|hVsu87mac@P1rDkbOQ4uIIvSCbhA6vX
z%=ioHi-z@0c=vcu1m*6Piwz>kSK||~J_B6YLz5*ThXR1-FNm|M>3dKEfW|*As|k!q
zP!~Ee@hEr!05bQk=uc%YgDB4f{PE03Qa=DQA~tgZhm4dI8BI%AX+J-JUZ<545n+me
zd!i~uj(#Ok4K6|!vi|^XhiOUya9ZGl3(#g%%p9?8qvqg$$yUOh9k@WST&W>Qe7wB8
zTq+PKK*z<E2qHnb1B5b?;G?ke8BUKLUj*!|9F@b=ucEBe+{~7A0NQ{=p9|Xe-*C)Z
z+!yndoWY+J&i!cMmyT|i?JQGl_Z3crIH0=%K-~Fh0~-SzXC?tiD4Uz6b&d6a(;_Wt
z!TnmOJupxL1qDYI6mvo!GV_InVPRBIQE&pM8vUF_u?S?v$pDc9bb1R)3;#4!r0#_}
zT797{D4@^FEsPC4Q?@EBdKC<49AL@M&1pa(1(Q)y_S}MLqLW8^`~+x!-QC@h8l$6m
zzkh#idUyjU4uGchyRPon-JPdOp@DEG84Mhf7$%zhZ`#1sF?*Fv!*@YI+m1nR)ItoX
z75V#C1w{q96<OiQh0=usG6f|(*BZKF9-1L+Gh}3BfMDa&<7r(Cc?OgQfR~ZQ1j`g8
z%9N;80)gSggllXKTZI3^8*y@qIA*J2$X3k;3+TvP-rJhwbbmJ?<P!xk8HB2@#l{ja
zu!tWhC=!wiXoh~V1gx$asAE@3T;7|MvlSK=zMLlnQXIhF92gv=;kkZ}ja4ozq%9~c
z&MGa%A_jc6w{Kx#5J;INzq5kF4gE-@pFe?I>I4}^bc?E2A=8<EVDqLw!RS}?ph4}z
zxFrW*X(8}3@TOq}=miPoiRr3`HIzcx=rZ8B5bpi60`M9ERm49ndMvhY--Po0Ro_7e
zp%4<vSy;ftprXDU&qG8cuc3isXlU3h@HTXn*Qz=hfJ(HqwBTHW%&aW`^;oo*2c@O8
zMLmBl6zPr(qnvqxEQ*V=5$<97i3Cv39P81NbRsi!zGdjp+^Oi1#*GIHm5G&2W&wuP
zPW4U|UKJjP3&%7l=*IHDj8E|bE*q`V?2HlfjuLfz;Ex|@1Zcu0AjMc)6BXws8hsAd
za7zR9x8C7m0BkR`W{5x|8L{Kx@;d_*pAv=3ow_{W2MR8sjES>OMnj+tpc&B6zA&dc
z9&|?11*DFW=pE%Vx&SX;DO<wn@K4AK#tqKjK*z$`+9SO#EF#rBC<YK3px5P>mI6<W
zp4(?I0lmg9h%VLD7FB?&iKtZq6`>U%pO@3pLR2ptqLXQ#D*LeEet$!vegmP1Sv@4{
z1cbjtQU46#5EWXny~6<T`iY5MJlIu33g3c)`0DCEsB<%Vd3t!PLH4;>JnnBU{{1dc
z3&X9PNBBDaI}cp<Ra!36*SkBYaH!sRE6+5flxhF=-@VqXASjF%?B|!&8nWUM?k^PY
zxZr^=$Fmu!SuH>>Pb6=0eRK1>PU)vimDOY7ufmz13KYRdCn@<C4$upMVH_~;`yWLw
z_4)XCMeF^nrG<rkj~5VIi=FDpxws&5RC8ExY#T4ftmaR<0MYp>mHKa$J4l{Ad7QGH
zoi`vf-VL0@O2*vw$9Ue8oL-5SDuTnZK$$N_dEVJMiO$3navrz~*$>*TPsti_OFO-|
z*sK0?;l20<%r&6lB3@pO;Bci3YcQAr#uD?6%gAOm9tUUG`^x^{_TSmdW}Uxh4Owtm
zQe;85t;&jnHw`Ln=2Wvlky?p50Wcfmr75IyV%yq2`3I=xk951)+y7<T8trYYvn+lF
zv_TR!wn+y;;Vsw~=8vzhKn_Ls4fHz{O!OdH^6=lQ%x_fM-$C(|-t}WjoA~<nCA<a{
zO+bf?mgMu>1iclbsr~WYs+}sUaL<pPX+H}G9Ic9I3yMmz8nRN83*kcH&kG7lNde6X
z7>B)Zb&NV-UU({!k|eCG70}PZj{%ZcjUnv@pNgilruDcB@~5rnvEZQsUN`GSO<ReT
zs2Q`Su;9sARO1bq!SkjefevH8iKDelS+APi+fTZAPy~s~7k5rhOQlepZ>uBqeZ0M6
zs+{Or%F394P4q}t83$G+SS97)Tn#^P<2j(+0&KlE$jHcxOG`@Bgb-s-52@6&W>Z#N
zv=<65Sbstv)K}@wyR~U40RK3otGrl;(T#EY_&7>9)1Lghv}r4DkSxl`qy_tkhTwDl
z?Ed)vr3O6~Smu;*u;B5uO4_Z<f6wlZ?Ox1TbMEaC=r>q%;zI=xy~-XBoHlw5-gInk
zZqBGx4-K}Z#fB;x^hsZMXUsVNbb72g4J{$(ZO@A+H0duyYMv{|KAn?Z%_ZQ4Pfnr(
zig8&Pf?Yv;TidHY$~3^Bgc<`5{Km1KAW3$HegqTl{p;68Fj(zM$D?i(G=MNzQ8D4b
z@q5C7;%`I4KU^l>Ml6WY+ot{eMArH5mZ!j#C3Rc=Rb2m0_y;>X;ui*NJu%$(SfJDb
zN5}w1;D?7r%sikMT3;tv!nlJ(b2f{ShdqW9^1)#cOc9XRm75a7rVRf8T7av?Fs7DZ
z9mef%&_otjO*)Ldl?g(zh){2#k%>&kv&5FP-GxvZioutfCO^CP1rZU^qWYh_O<svR
zH1JhJFL4#la7l&G8=*q)Bk^WTT2-^Nvvd2oIXQiCMPCQ?#SMh`xeqj_y{e1VX<5>Q
z1>+P1l>Z<o)qH$*m6SZ^6B^au!sWI%$h%qtO4}Bn`@dQxS?F~nb-(iR%o|G_9&M5(
zg?0+1X<<M7(Ijx55+($UR8>_~1?<DZ54>KNY*gGrZ$5fyx1^-tJJvT%GGO_G0}97J
z7v_`xDqXSxUL5qX-L~Yh-M+b8v10aB;-Nrx^iIgW`kWz57ZnYS^#A-{%CKTRDJ(D%
zcoDh1*Z-X=d{~fGIM|<Mp?RPOf~9#ypV2!qPjA62)0YeEz!w&Xi_P9`g_@Lmg_x9Q
z(ER@T8e!-3vCo7xT--S7_~mFqlz-Vm0fM?IwyNyz&fxIGD>6iOMG?8g6bRFI6<QlN
z9r2fAigyq_FZy==tzNJu6?Zc`cI2S<8wo0lVX~UsOq_ov_we!p<VGz*42_p7dWOAz
z>wDwUWPtAL>wAbK%j6s(iFF?XM+-wyrGB+}bQGDGm}sF3Waub5(pB^g;JBCjm}Ob4
z_VEVl7rT#l?Fm52vJak^_&*Z`fBR~n%P6G+1GJ$mUfxQeT!1lH4?F+<<wr5YaT*uZ
z^(o^F0VBJt>^M_dS68%RF6tNaT7W{?;V2M6&5IuXH{c7_bI~Nb6TCo2@M@i4M(*Xu
zbfnvKkN|1GfvXD4$*M9U`|3A|#2E)SHz1Y()^batU{MAG1r#`3vq+9CqE279Vg2Zc
z5ljh~7T>N=Or|DJ8$Te@dU=~eWi2eB)XoMVT)Ri5o6)m-p+_~>2)+zq-CPc3Sk{Wq
zH7Xc7qfSb#|6Maw5=&PB+@miCYADCi$qAhSIMBfO%gmQUerPAof^q)uFRVv!QOY*g
zw1VxBpWl;-2NT>bFwA3J>Z2|()3{kBPtX`DW7NxSaaj>AmM_Er-u{0cO4|P&-3()y
zd9_xIq-R;ia{{nxehj9I6;n_c)mzATIV)4=KsmO%r$-#@0-}RPTrW>J0h-?;A|Qmm
zjB?^x2RwcaV~KGk&rfXdL@3|~NdM0Z4ChqQ|Fh-<F;7gr(3X_-o3H2(1O_dj+SYOG
zr^>)ACJD{Aoo~@A%d4uwNRs`LkwMIvBKI!&zu``Icl=ptF|I5@C><Ye?j5!nNh~N2
zc+$X17z8c|*guzSdxuN*-IU>n>*u@YsD1u<HTBB7I>yFr!~`J``rfR4$L4jmHiYN0
z7pZg!4GY8NaU=&E`8wv9yW6hO+1bQ{18X2jPbpCc1R&rO1NOi!+gd&*k^8$l(!@bP
zKnAqN(rsj|mnpKcF@(Q%WYVg_VF9K<XyhY<<5J`?LgHbUFP0L(EHYX;XKHrVxLm`+
z+S)n2^XVc_&|y~Bt$sE5PH?<puJ;ir*WL;mYzxbmi9mC=*hCo0hPePC9zb|-B6`$n
zae>BxREht&sS&7X%AmQE&p2Lk7_7!6#{X7+rbIWY1jqD<Z>a0RuhGXi63g*Vj?2ZG
zm2)jVe7tF;^XKB(F<_#AtEyMifjaHDd3lsqf_e<8&1LngH!zfS-RD5G^{|fJYEf-m
zrb259TDB#&3XF-h^E$^{TQ5rIMn%V$<+#%j6HcDAp$5Hv)e*)sWa-kZS!u@c<-md#
z6kb3W=JtiBj1t5YNDuQ58d*!1t)DYmn4{X&R;oq)Ss;+rE;`Dj?9*U`VvW`}HlpL=
z&hLHs?<-qM2bNr?HmBZX5#h!<Mf-qsj7G3n@mh>B4s@Qh7MH{ZoC>=1ONrehW>1>(
zd%t4PO#YhL;zg&F{Zyb*<1WC-`7=`_sHR>IY~@8IVOgsG#WIF4&2R+Gu<bmSlJ48T
z1wdt3D+z~>k6#ao<ZEaQR>uUP>n)fpX{*XtU^vbfrajyi9iWwWzst;lZ4eA$?vl%!
zw{KGr6Cp=O^1xjV1gAs|&;P~(51HTnS5OK?II9WJz&7p=X9yA}9dz)bg#_{))rsif
zHp;Hs?)a|1qr&OLq31rbziJBr;hy~OunRa9up2ZIQr*O4$kD*}8xm^el}{MZ{-XC1
z1N@j($rp9|0{sp6VBcltO)E)ouZ^6izk|)=?tTSTRUg@IKte*&Ht(iHo8Sn<VXkHQ
zu!JB8Jc_=79Wq4H<G%aw17*TC3x?Tx?yp&hAvl7(F@%)+&NbDp1H>&VMn-w^P%!Yq
zW$+|l6N;VFuT}E@$zilRAn~o(3;>h{)bydE<@muMntFU!w->zr>EaA~*VK5_01u9s
zH(|wfTk&zro8eiR9S1)RG{-V@#s9^GTq^fB*G|t{Y^|U7>2(`0>_E!t<KuDGPvun?
zs1E(IRh)KJ22#|m^|<KF7P$DHhUqKn>qiZn8P8XkrfE@;lfMHjUFh}wg)>|B|Hc_H
zgq$@tX0F_gR}<J)a{@^f$embp<hf7-9Irq8m*gOP70=ED?JW@Ks<cYZFY9fc=Isxm
zWWD69saM7dY`zBulEn4T)j5!@){S>BEHn<g0EMrElT&s>Lo%`7!+3o$5Kk>F5&lo;
zmRCao;u}l}ki<Es@4tw<yxmSAQ+)*l$<DzI!!FkOD_>uPbZWJ8%ePMPAld*U7w{zj
zuND2(?d>42Q=Ka@Ci0CM%MpLCaSyD+`oCO&5PTiR@!NqywW4tg_F>-<!MtfJr6P`B
zLqOL?W>pPUG#x6R*J;3PP^~qV&jHdn*<AR_5+FyatFK?%-3%F;b-=EuEn`9hd0-nk
z*G3*@9S1w{x_Bmnef(ioMd7{`*n}i9tp&b>E!0ECEK{J<Kx<X#+c(f<dTUUv!JH!d
z3Z&&AWWUJ$@}{|GPcIWbBuFdW(ZxvS+}zz{DN;vEl2a$ZdHa~U%j5tDp5KbpinIwf
zPw(En)0yxh1p{-z2*hnJF4gCGAe(!suB@tf)6Ttj+^2p|?~UzNX^e1KqzZ1+#7i&Q
zi#XW+VCm%<MmlnJCaZe4{R0?6X{SPx9pCQl+o=3ZT&Fwdn}uFMOjA4LUa@4KJ9Mqm
z>dh9{h5jl^D|SRBQ5p?7KIT@S*>J=Fb;I{J3A8W?(%*qBn49}obTrELv77{9y>f`j
zX)2IXg8DmI<;>~1tRS<nutAeKfB)ri+@;7tR{B3d6`biSP|~v2cbx9zwJr2w3x0o7
zpb|Q@04-SmCPXx}O!h}q83I!X24LKHHw&`jMu3JGsBbxoUaA|tyiQPHjO{b0glm*U
z&N7&xLxHkfKI~~RO1?-uZ~XTpkAUKy4JQz*J-vQ<sl@-lk!oOuOJj=K#~G*=sDQ!^
zWM&h4pNhfi>c}YqS}-7>0rhxjXec!uUH0GnU$L=h(lRpCbPOWdN|0?TDoIS)PtkDC
zZ2)lb2O^qG1cbZit0R8KLQlVk8<}}S4QQMiL+ID<xiCak?B#}al&j<>D~^U`ZOSXW
z?h}0J25pxHYEqUe4s*?lwpy4%g6W_tI=@=8wGI76Sh%@=OQvN1sk{AwpBR~_H>t8&
z(5dI#cT`gVTAR<y+M0aWL&+#Cq6-UOo6q|2AV$)fWfw}~;==Q>Tj!7Mh@7gHRbiEi
zx@AG(M3$0zR!Q;i3LPoa@1X;Zn3$WiDg&%w=+HtKh|-C`@+C_gjPdeV2liDU7YCmj
zhzwx+k60SoKTBl70v4bBp!WlY1Bg$;I?*uT-gi?_qzd|_S4^PE%E~&px`^!^_%{cj
zU&&8wWoBbQQ_)1qk8tx!mAg52w2#Avlq@l5FS@uj{CjCg><z%t4yvlC<>xEX6ws?@
zmeNb;j`J5Q($J{WC?zB~e1orR7yx2#AQW9=NF<A^2fMn1iw%*dmsjn)QazZR!~BAR
zki|tER#sMkA&}C&oJ&mqqDvX>xAaY~Sj5Lp@*2#jEW&3+F5Aj%ghrBA9vXhWlbHE8
zIi{#!TL0qP4NiTbp`jJk)RMJS`cPP5Bpn(?O{+LIHx*n~M*JFR?cPD5tR6=Jm1cW;
z`_28m+x_Hft#>&v@{<OFgxlNO7lmR<iiE8mV?9s(i}XlcKPV^&o6+{DZh+t3(V=^O
zn$TQbU1yQs-Zf^8)Twty9s{+O73hlwCXB${lY??7sAWPG6B5{;dl>{2#&3nKi)~I~
z2Tw0g+XdT*i9vMs_C7g1Z66&)25ut8Tw=g~`NzcmCFmT3@>CeG>hnhbyr`1voh(6>
zxQdMu9#qSe?kL#g?R|Q2C2|A_ni4ZR7<*==Rgs1}bENJY%_I>_Bo$+Pf6KFBYObuL
zByX?CoN1UDc)crPVL{#Obxq05UAKS{Q!82ys%t3)1u8PKfQt)f<;f8MBFLMGLxEz<
z{q|;kjYeXNrgwM}-wl~*vAOB=<g90Yx@5R_7Pgky=QBDGYo#*v<>ixPWC_3T{thP{
zih+Sit+=siWMd=u$$$hHMFn2KQBqR}udZ%o?${}#1Rlwk&BlRyI6AUQ^+v|TJBNR!
zQZTYH7BMJO^nNRHf(+Nr^cVYednPxxR0QFfjY4)QIUiZX!3Dcx<w#6gjI^sK9$4C<
zq8Fx$Cgd@opUQ1d0tBDpG$f6x<r)C707(#!(-s0ie^R*}V&f~#m3}6y(_FXD3ZmFO
zlQccPIlY2!TVO)riYjtrWq={fncb%m(EsEsPw6qA1jg%k-!Qo#Us#8~H&6rbF6D7O
zl9Il3P5Jp#LAV<l8VV<DAc3i+Nt5pdj$-qTcEr$E#H%1f)6mqOY&?D?e0M=c-Xv(a
z_Gllo^lx@(DH6<!@@VSnH5-)_pOgQ}XzK5Zrqn*6n6BP#RD66HS=k{uo@m1=qw<=X
zpJ10jLr3RHj_*pEH18W4Y8&p1`yIUuh>xfk|AN5p`g|T)I51%~nbYs?c+V=>`gyPU
za4l&}a?>cz7mwo;evZ+R2L_+OKp}^c14TPXoma5jdSU(T&v!39Uz{m{p}~B$7cxMP
zAdvmhuR9udVn~@Qzd!UXevBZ@9TQU-P?jf@+2|S<0o~T%aHj$=)<F6j8G=p;<W*yg
zJZJ8cq20iDD3XAu!%ia7exnZ+WH%?5@W0(!B|Au=P{4z>=^4&RTHA?p``e3Ha9FV_
zf0k5``*3;Tpe#?6{V4_*9zWus5z09`V*ua^qyr0cnQ;F0VG|bYFAfW!p<Zb^h*eC1
zW(4VF;pR*S$7mWHlQiHr>Z+<+@+4j0O9fp!*^hFn<WPj;^8J)@lQ-!Igq6(U+F}i0
zq{A8<7?`X6g1z8&U;>gj6;;a+9OhrkK4h@O%)tVWq%m{<T)GS2x93kKVE##!TptP{
zA4%u$DS$|UmK2-W1x`;Sp@_G4(~b;SutioD76w3D;(fZQ{?OpT=5vQ=VDZ5HBckDL
z>!;IV<4l|PxAg>z)d>NOwT`5_FsEdYBsMQjVC2zI3T?4CW^@Yhx)(09zTc9txF_!;
zDKs0kEBSaiI6-^q+GzWizrEKu7l*^ulmnn$$xUQ7rwVw4pPax@%K!Q#+<^ePF5!e(
zBrr>&z;Nlf>6{U0Y!F$I6?zoXx(VIndgrHy=Q3eyaa_cB7JTRXYBFZx64HAvaM?5}
z+)=@&esob$+NdE51dK}!F5Zo{AGJz;j-%%?J8y79Aw;4+qQD8`17JW(p1<!~n)Y1v
zro^I&?NBmDSP~mL3=$HjtGho5j*zl4T3Ks(DB(gan`MuWZ1c9z8-I}q!k;JDnSH}s
zd6)WsPxqhE2nmNPWfIY_v1iwA%L+7#%gW5bO`9&S7BDa{SgkrtdSp|@pW9j1cQQ$w
zg+CjUNgy8^Z*LLLHD6+TUhZ{&R$w&zS7iwf8OGt`2fZN;@X8AGTB6DmEM@{XTxR?y
zCzw%Yn1T2?xgcqrE!p(T@cmj=hD_YlnhaE`0p~7-8pZkftDV4z=hCal;reVVJqU~0
zagp3J^pC6Do!5dRslM0JBu-rBO*pQf+w%eA?3m(cq@3W%aPqVT2PVB%Rj|a?C^($~
zhYzH_w#?uoFDh&9X*>peu6jT7BV(CxN6sU&11h^}pVNqmw1uU)xwhI2pRVL<H5T(L
zYfx`Srs>{a$2jjW|JEzp4nP(lp{~QeN2WTxlh8lk?I8?LXWnE|q89KRB{vQlD?Pds
zYb0DeIR2iL#DktYvQab)?d~uw@z7)n{Y|L-#XFFT0|^X;nx-bM!ztN(^D&CP&A-u=
zbRE}0y_)H?^SpAG?FSnxtDeVm><U8(((Q`#5F*w<K$5u1<Em-{+00S>wH`S8<Key)
ze`nHe6%nzHuWxji)fGmV%Vg-dyKP4UO1wAL*<En(`4(fv<{`a0!;kVP3oB4t2f(Yw
zy-Pv|`KR<AYYEy<U&Hz`YB{l!_~-<0{GVH%nX<Bi{(4L@ArQEmrnya%g#j(BC~`>q
zq+tB0-=gV-Fbl^fIWko^73Wae9JAZj|JTt~Kt<JcQT$L)P*GB8B?hFsK}iv$6=~`2
zp;JIq8j)^kaTtagV(65X7Lbq}8U~o5|I5!}v4Ayit#|Lc_nmY0-glp&jOU7WM2RcU
z!VkY{8oe2}^96yD?+HK16t)K?e4pciAOfD!K}YE5ht<&!@MfG~9w7lK&FUb>5YPAA
z+$PI9k9z%or>8EG`w#9cg+HKJ@BdbNNh?;K-Vy5e@)6BzojBrAC6ZO>fhL}vy`6X9
zqNG{7WUadm!}0d)NUkszds#XED?HryZQ~)Q`P0xx)EiwgltW6o2BWK0$<0NjFw?_e
zyqF8m;D&IlrAzQPaU-rg!kckW?;w@_JLY)?W(1;M$AYo_X+3+=#vS24ds7$M8p~G5
z$M)7UQ***-8^7F>V(f;9v6W6xP<VJfV&OxHV;3@L@~xG6Op%)IOvP5I<5Eo%RTnRt
zm8gmHTx?0TRC_o{(a)d#Hi+9HE&%{G1}Zd*jYf?3MrWc(fremJwh*6?<DjK^-eX!u
zOS|*uT57DwsAhd*TYDK>Hj+ov@MLm|ue`$bD;{+}qCPYoe=EJ5#ST0o`}kC3=KbYH
zzqKhF#4t<l%x{L2VmaiM-n1RvGfQ^O7u-6<-(b=ba&^7Krw!AnTk43tx)oKFJ1J;m
zp&R9leCJ?iXEyzJ^s$K8hazLcKU`Tk6%LD%q*g=L*e|p-bl_CVZ01kz%R96g`5j%c
zE4bfsu)_IDN3wP$^_EuU=^d0rtjN_f@p$;k-=Svwg-YyvTdQVoSEkY*PeFWZT@h&?
zY;@8}n!!6Q?Khpt*{E(BhM$(ZXn$6SWJ{#_Wi)&eHI&W}G%%;_qnaTcnRw+-6fCsc
z_@ObBDgA!dV!~1LLAyw{NBxC~|2em~(LI_P2GhQHL5FQR+#XC<LJ(f}k)^tN+~Isx
z;4S<jt9>nk4_Pi>I$nOf<mG)4TD>Ke*o|Yq!^MY>I`99F6*4<?oDZ#`du{!EOvBjs
zbl0&guhP-MIUQQqcy+cVXK1nWbN-U1L4El_P&e}>!XmKLHe!fsZ!!I<d&a)WQEc4Y
zh6Z`m$V*AA!eQ*c6!4Vbp5^LKJ;i8+2VwTu-cmT}BkI8|C91zw9@NuA$2o-dGN)ed
z_eC>@jP77D8^kK&Ra-U33E>C9xfk{Qe-nUJx<*_w{_~OCfRwbfc(6x@{dJvV>817#
z_61U!#W8wN=3SFCxrB<o$Nc`x62ce5c68w9^Zw78qOURy8lBm6AM0NY@VZWOD!xu>
z8?nxAFf(lE{0B}t+S=5&<f$Zi*t%rqzA1J6TL0e3^h>mSTO)>kDU!hppVwo;;p_cv
zd!dU#lOT)fMiS}_teZig{?M4;>igaGFz`_+%;jLr>v?3<?(aOpd-skwy;l|d@k0<5
zHLRw`On^a0*!&>^8JGTCU++u&_t*)O6bw=UWOlCD!`1jsU8lQpHRrWierr<Up$X&?
zeuP%DR}UJHm$SJ(e#cwNuRVk+8T39QP4Ef}tpLUndMZvAnPn1V@*d7%Mu1zL#8=Jm
zBuRQZG4+zUKhVOo)Fd-`!-3|WV?s<77Q`ezv;Ld;-29xJu#~`g$%)JIQcHgjbU3p7
zLROrEqQ(@C*DCHgEbXk91eGz1sJDV<4AFEEjJGq##>P5|?4=vQ@rmKU8U*5lLf_j3
zswrZ78sO9z81~b>*#vWXcjZIO)};Bru5#-c9z0qpRP2*>rJ7}|)J)(LRwwAE16^xr
zVmYx~7_GSNX@J9ptz4;x!`X=h>+9y-2oIXxH-A|mQYaVpdFR>B`Y@-Xz=laqdQq1+
z+<pQYB$mm9lbS=QLva=QtdB)Vo=|f|UJyV}???T|=!;{U2&yZzoPGui$3#dH+<WZg
zGS^43y2j_^vPpk1Q;(av`f7aW$UTSHpn5R7(Fo=Z50L1h%0~KKC%3{45hxWBJ*0=J
z!@ke0xxgD-@Rg=Zaw^KIKjFtW59=%N*MoCp%<BZLf<YO11&(ww)6c5Zy;3%plk#nB
z8nE=rk51;VdM!RO7lLx2&72O(_`UIlhir-?Dkp9tGtLuA;{{<YEbN%)`*LxH6#$mo
z=AW2u%R+!z!}sQ#X0*Bq`sEI$k=a>qW(purUIUu~-w4GkOc<y|(qiX)6A9^kLh=Z)
z2mO7e?~X>aa!#Ta&DF0eEvHLY;C)8hmFqTYwSu2w9tmV!`CZ<LAi{v<REYDxQTONZ
zT^gaCh?Bc3KX$$*&=w5#1e^owDHie5p}rf_T$He%u;StkW3Pj#27B>##b^k6Px?n`
z6-fFkg4QT0rO!yE{EnHc)MWzouP748cC42sv-xaK8@W1n##b9NJ{GW?4YHM2)HK;i
zIvP2T%n7j_c^n<q=99c48|5exfUfBT{7szXF@%|@1Za;^?53t07}iCV8j4`H%-!S8
zPBFhuxoT^B*KN((7J_S<_vmbw3hrL7R;2Y%mLUua(G?*HG{mx8r$sLPpOdf>_0bLK
z8_&2VjJd-hz-`+AQC^<YRCdyRJg^m8%Txy!*sn^|<+fxafm$@r1-aZsm#}9@B}S<g
znd6Ej-tBM64raY#1$Dt8&7t+f(bP?8_^}>T5Mr1n_xklf?NS-q;lhW>{i-Q!yV+qm
zrlHW>%4*Jv2A)(}udOzMwnLQL7;#jc-Afg>BuZ~OOM3<@?8D!@3-*CxRBB6DiNIq4
z*Jqm(fwTNOWnpLUnxHqDx92<0N|W3tqt3)7cMBvN1K6MSH|M%G^vr7NenX<9y^d9j
zk{8k2eLkJpuIz4=`*D6qlrXY9zpx&}FVEFF`>11eNGzS{?+OZUpEEO4+s;(7?&-{9
z{b}!NN3-HaJY(rgo3X@g?yIc2ptXV6CbJU(;-0!?%zA|5>^P`iYOX5ce<eU@B*<Sp
z5LX89!Xo;`$YMY^q^VUr?QDAF56bNS^W|h^rDg%;%tm3v@$<}YJmM7%7utnAb?Ye?
zjzq-R?N-)KWVnEF;8sUT*mRcnx7V&rM-KgFG6pruHn_#uIix6H^<Sj}POE&I|C+h>
z#65|k5s6u22r6H>uVwCM(?#chcG9h*`{p;uG0V7Qo?=fhE;S8BBB7tU_JLTI&ta_g
z?PRf$qj72jL=RoU^=S?QA`mh=NY!@V2jt`@2Qs@AAb*&oI2*?C`JZHCHFUpe>!b`p
zc7JXivR}G-{T-;uZq9pE`oc)B6<pUprR;@_!V=%LYEQN=9v%OhozUsWab=ROL@LoP
zx6{5DAORe4p6oBsPoT~SxcRZd&12VVuxR?8qq^Mot(32Ocr$^QF#tH(fL5RHHCNAi
zt$ltw3Tn=i?p`lFL7v=|nEDuprM_mWE}eq$z5YBbpVtns!0Tjcxw-iEaBHLhh1rlP
z^ZjwCC;-xy4h`cv|LYv(dU>KU5VTX3nLSV1gI9Mtj(4YfhimyV?Shot2dh^vhW9Q-
zMa2>S{(J;=G#Mpd&Hx&0<FaB2ah3V8jvvWcrl5&KN@{ge$;prIESbx7xePi7AB)wn
zB#DG5G@8o9d{dp~krZz*uBpjk8pj1kH585uYFiByR^cSItq0J1DD_Ls8<2%L*BLV|
zemF@<H;ChPx^4axe+ubN9GMKOEt{g^F=#z$^Jl%kJ<u-DC2*8Q2=aw|1R}S+F9o^4
z9uY~DB8g(~ilqj+9u`dYyJ`N*I*Kc^(Jtplb4r8%K3TcVpLZh=)!Sp@+{mp&<jKMS
zMaR+6;u6xt9Nkx%;(8^gN+Y&jKVxI#M{UQ`(oe{sP^u|l?jX2-;s56p<ApjHOzYEC
zI4qCv&%oS{Tw~EFD%~CyZaVif<xE`*T+2n9-ytDhJWAw<rjBI1J?XSFTXz$80<tnx
zy61yJCLfI5-Ic^XEJz`qD;;kR8**->r+tpPtb8{nBJ^<dml+~2yYp!ILV0wT1uTOd
zhqdCTj|SfuX?j5wL1=_?8mPt=5+rd4tVZk;FkmM^AnZ+qW4eC4=?{cHB<T;LbtmrQ
zCdT=~uKtl-V*h+{nDyA=+0WS6Ij?2RwIA2f#rz?3u2}3-*K0brq?Eq&M%FK?J_s8e
zMMEV;z35BU_`U51kg&nvJ0W~vYwWj?xtG9yA7IpF{%vjfcM1}evV%@B#@?ono9U!G
z>Jpmy*o8CHb>Vg%uVuY}N}?qmzrknsDB1g8-Ad3GS%gOXq+4>e%NYRJ_F8|es77o@
zS1_h8{p$8MTa?vgBWg1VE+}A`_rIW6>WZ?MpyN9~_&cfFxDQIIku1mb6ftfhnL0v0
z?3PodM%aB?J(M9Rb)7FaxoXZ&IhKl;U9bU|+xLl^pS&=MZM~rd5?#qd+$eZBpAqeK
zPY4KK>fvTpBzc2!5poZmLcS&ZayUQL_H??8xAmGI0QKyXr%&6aOz(sYD*%g(A#-BN
z_qLAR2|P^`J4a3-E_o{!SxfV9)bl`3@zQy}SU~z1dz`9KMF#Z@4XrhfgI7QwygYu2
z-}j$R*Q{7{i}2|_+09(X5^J?`^HJ>9>^Tz^_d2kO6OQG17YzLO5OQQU7g+(zxePA$
zIU1k5y+zS`fyriMb&3*AV1#~I`tk|4A+sxtg;v-+9FlGzS5awCrZjd(;0POyhXCyZ
z6w)64NLMC+riMq;b}vkMpOR3IY)gn!hNYL(6oxM|5x$hH{d6IL9M&*V0sw^-D>Kl$
zagl~G&K5$&>Fg)VRtAC^71YVJS%=cvYa0rgJUoRwZQ8ih^2#jE3U^O@{!-}__r9yJ
z;KMKkJ~Ei$$Ugg<waHD%GY(eUT%+HgdPkZW<SrwVROV&q_s_J{>QDz-AdgK+shJ_E
zWjtRI6c&#2J!Sqvh>e5V@D!;r|1MG&UFwQ4J;&{Lbab4vl)))(E_MxX9$i}i4@sN!
z)xZoM3o<836!u$mq<s1Nz1?bYLc^qJX?QO4{IvZ_6y-(5^iOebAwx_xQ~W5x$yNMc
zIAvrq@MJd!jXNA>nnM3Jc;#|xk4Su%X*^RRoeSb!ykK&Tuk#w;xV2cw!L8$RDo@G|
ziE%x)AhlM{?oiq3T-VHdEMO%F?8ZAlzs4z3fNv24@40J>{%b6WnL(nfrT9^JS1gm~
z7#)ao)Dn`p=>V)=ZrO39ovX|Q1?`<px-NX|{19M4T|63_n8u9sIgQJTi$8aC$X}y`
zP@G5%1Y*9n@Z7uk<$u0Mti1Umt+@evhsP8}OJPp0=f}dH@_dS_A_w?ekE+U(6$}3Q
zX?=ow)E#k8e#<K;Jfxub7#Zm;3B&}GN+mkL@s%?0PgUynObtM?&4-6Y3FPk;TrE6u
ztv?mcFJoJiA91Etm+V2bp8){D^f2Z3teERlKmfP2w=admHVeU&0sj`@7yA+T1G%pD
zKUT|>9zbgsmB8T;Ho>Uih1LH?L>O-~G(WeXH~#*a-04}PvHJeWe*nhp8F&Q|*!JSr
z8jADbruYKm0&2y>&B^4ZhY#fy6@gIpsTv1y$Z!ELjS}<6@it($OhMB$Ac6)Mb<tJM
zqtp8ltej?eO_wh+eVr<X8;xpRZYVejgN@>{G4(J8LeDG$0s0mKetzkgYvI{F8qZFF
zOlR^u%E;|&7b<Rg^~`^VspQ~{Ku>Rfep%UllPf&bMQGd^jtNWL0q$D8jzo(pm5uqM
z{rAaD%_K_gxMaCNHOiB^R5rJYp1xnqJP=|Udm3OmcKgnqTxWUFhv3%b<rx#c3_@?c
z;B5lTD8TbYT^8^N@6$4$;9RSy?>z~4dK*0&JG>VNz(A_`U`Ex~5<!h=F784?!ry!P
z7H9ux=Vys2>-Q=L%D9sfyStx~(6$T%doaZ)#%Ird$a(S4-~L<i&Ose$FRtB_ii*J5
zg4Vi2=*Un(0#G{3nd8%Exk;i>@jl**t53S+cA`Q4v12?Z+R$5eCibfhR??)VWb67+
z;UiH55d{GA^YS%b>@&cJsNP%JevF0lw6?woJKRtJ=P4Vx?-yv5AkqQJJj@ON0%i!r
zol`8;T)F$&zKf+(0f)P_z(5|N{+t)U_qbcfZQU{&hlXZ1kB&Up+<=?dOD4z?tyt<n
z`_@lrMn?YO_GEHveEeNn(Kzth0qjpS<tEn~PUC1mEy~Dbqfn9u2M0aB23R1FWbg+O
zIg!pY7BwyQ!7``X-dPv7q{Xd`@XG#s0F46w0=12co97ENd+V*$+jKdax>~tf-?fr}
zVOZFYpZS)>oa~C%B#<&6;H3-=Exmzm^xCx(&U0;ZXiR&G!z}<EF}OB_5y}p{<^b&i
z7=--7LN{@ik5ywjMC1{x0r{~ES#Bnh%T3qZ2zvX|r(_W=Yu(=ozl6ZMrnvVN8#iYT
zqs*s}bHfPoI`U_3n!xx=3rg=rqAn{ZyG}OuseD-DT17`pyy+<-dubV=AP2e+vvG45
z0@e*IjwI8j@4*1E17q#|_Uc*h8$&!WQKI5vOAG5^d6mS+F=|s1uUw(u%s~C!F-ZRf
zMn?*GLC0-<W8%yrFy?}B4cK_jxLxrG_%7DeP14pZlQqiyu2qm<A*-NJ7twpLY8sm*
z1>9R}Yis`jIy=4pUR^STU(eli9kc}kyx{mag}b}ExrjE9Js1FUAtoSj2U?tK-mQ0#
zm80}z{ua?KAm6p7(w&u*Oed+W^}D9M#s}yKyH|^f#KamF7S{a@pu2gcu-uC884+$Q
z6utalENp;O<>Hpt(~{Ry#-wrr6TG)?Cx99isC@QG_8=|u%_s9zS56bQ%bOlE<dK=0
zdV0zL^aSpyK!f?JK(<6j3$SvwsbAd^iK-Pt^<j#zGI^sC#XQZ?v9YksM*JF2Pte|s
z2~pWTGD1pY;K#`Y;}t-*Ow7>>xD#{2eqNKO0?1<3R5m=k|CW^HU+A<bK5gyor512^
zSA9KDUW2&N(mPF{UAg+Sdtxw)Udp$MdLH;I{jjmKTMjXfeOr1XO&vXfwlj!^!{Goj
zl&gNL5)eQ)KK^EGLPy)A$UYEWmQ-Ia{zEWv3=OprqOQ{Sz-Z)k_4nU3Fp${V+IDeq
z>6n|N2aQuQGBV=o>KFcj1N@Z&Ko<v?zl_XGR}YWQK{fI<z)c&$3JVE7%C-W*3_BZJ
z4p<*;n6+O+x`zGnufDwk+%5|xWs<0JI`K<FB?z<UeZaP)UpZ`pTmjG<Prw{Z4APU4
zX*1W<05si<3(+~&anoKIV^8yCIlMX-#BqRu+S&gA(&ZdrklEEm0O}1ONO+!Cmaku0
z@Z;6>*gO)G((JZ7L#YyrIXKvK*-JD^iea!;<&7wvjWC^!sK`nIpvm+0^);mR{f9<>
zG2~Wq!=HJt`u!d10}uiXSCPkWBn3@QOne_jU%RfBmBj$rxga$cm?J@IA>h0UL|J)2
zh_QJDLb}$Qf?GK?Z<R9D2!j<zB`@7pDJkFSRbSZ;PEV&@17QXRGdqG{vccIK!~Ld`
z5_VE$cb?s(w@F;hA)q5V`cEZ<m6dhMh%*8PgOww_T1MLbGcdRVM7*F!{MPn1qN1V=
ztPIdW7JOQtNESSXpU$Bs-@$ALc~Eg1+KBZWbbkOYf1?|46zacf#b|xli_&o|ZEZQ=
zBV1ig^+~9DeFM7A-KRS-A)Hd}8s0NFM<1;p(0K+<jp^v>R{IXMjgWGvl&<C`vLq!9
z`26baB?7L%7oGT&G53!_x7h0CXA%+(Nud-$cV9bIN(?9<yorHKUN-MH)OU6T+~dsl
z>Wbac|20RYXlOmheK#O_)c`X!Nc-O0+`ZFMDTq9*t(vS8FhbzIf#H(t`pawa=FJy2
l$?S0sTa5qz9q_E^EBvqx=yK5yJQ_UkrL3SPUncuL<bVB(wBi5&

literal 32313
zcmXtf19)Ct6K&cwXx!LIW82A_G`5<?wrw}I?Z&ok+qP}%p6|c+CeM?c6YR6kp4l^N
z)~p>OCnE|EgAD@)1_m!KCiEK&>`M!9y#Ngfd@XDcMFPG->Pd<Ufqnk>`LDe&4h)PC
zOk9Znk4yU5y0Z$ZGDg=nLHlE*L*G{=RM-cZGmzdT>A+HKa!v>tqkLyy5o2}#2K9o;
z86MhM4w3IahrGv@O@dMi-wQnz{<ccQs48aXgRz>k<!0tbe9{mhB7UTA{76)Vg!?y<
zzy7;K6(`{WewO`Pfp&ZZgHD5xiRrg|H8fgyXei8jtFx$L{U3T1ek6Yw;bNA>BaITS
z9Ru^fJ{^%n`p8tl#N?H;Esi)3PiH8@GD!Z9igLvp?If{Zy)x$gR#;0Ys0g#aR+l*k
z6;AWJARbL7maobyC{SNU1J9L^*2qQCk`({0^lnY~oe>f9=$)~-xp^NimJnK?I7EoN
zEhaIL3u++(<9{P3iaGd7t*8+#fA_um_$`*BP@mRSA-MQ)%VpTy`I+N72|=NVrMxHE
z`C@?W_#BV{RY_&hX`S=OFkK)D>labX6$z71bXB3yU_sU1V26<ZdbaW8#s5azKx&*B
zE|$e`1}5Ejb(j|q*Kl#4``MI$tHKvkaemr1>k?_1CXkWJ2D2_oPw(s&sSy}E6E;Zl
z>mh@|>0)iT%Lg2-#T!_n8baiZbccFYn<`e<;~yv|&C7NVzmZlSUpsGw7CVHc11|NK
z+k9x!lzCEIWi@1#loER$>7jk)&`}eQa`a-4kJ^K8mGSiqb-U`S@sc^(979ewnhA#M
zIJvJ{e~4&#@j9BVRM|N3VJ|v=BjjQWkTtg2KT2t(p!6{oG)DitVw_K>3AL0Yiea!A
z;j&tD?MVS;=^OkjFB1IrOI0<bt<AS53ng|Y<>eg#0l!n)%j-+Mnab_xV!O%oQoc<_
zD`F1jZNG@s2K?a2+F$L?)6pT*Q`MW@!Mo#~$i&$~;R)p18yLCTEV(_#e5&20W;<NZ
z)}~xN?o7u{MB|Mt(W+{uolV*}!+~noNkcDHH~+0E4u`t=<E4>=eEW7rHdK9*&(gIu
z4P+D)aY;#HPR^9GGmDv-88P67n>%f9&j9S^_Eub6Jf<0hhK6=`e;?*iSzaCy7zimM
zB4T1<@(;MFu4W7j41@u(@w*UE(oEB8xQ3(MLe+Xct2A6b8uuut70b`ZI*ps7syol!
z-8XTlBAvaWoS2n(aC_5(L_dU^K0W^YiO0HG#s<DMyIP>DrJhKA>XN??mhZhxr%<%7
zRYHy>w?b)uB27Gd$m_*&dtKn;LDINct~Kk9$|)vz9y3vr`oVM4+fMT()AJqwd3vfE
zK8+S5`Iep<5tGe!>ZFmE`>6MI^8K$Snm!5g_y3-Xr;PKl%o1{T#xvkupRzY6#lo^-
zm7W^dLe*K$F#wp`L}gLS2p2iTKRa%*M*mr*#i>Y8!-I;rpyKeBz^U43yQ(oXyGBw<
ziiC+Nc4$Z}CnqOwQ&ji|8k(@ingTL1vY3Pf5#vvvy1GAg^^Q}si=u*pC?Ig~xp~&9
znFSGbQA9^ac!#??7uOO<G(|KAhdUQuZ@+KfO)E+G#rb(nO^XeTjiTe?1SRZ<I5{~D
z3=N_a69ptBU?85KF|o0A4J`a)Vi*B4B&Vdv_pgLfDVFFM8V1zYJ8plfsi|Gwn4<dI
zWmgF;HcEnXHP}JuyhSIzb=+|922~~{AJGxKv<yuWL$T-&pTzkG4#p)ZcU{{*Ho5Jo
z<DN@>S!#3m6Y{F@_V~TwNn`tMgT9(&k=`~#NxJlh^K0Ycz<UcxqgNsQsq+iEYgtPz
zgt<3?NR*7@7ic%s(eB+w7nke8p7$u6wOBNq$r|7fYYQB@KaDW?qx6;mCxvuV`v+B9
z=-hvJb-y@35>`{gM4Q&cFw&Z$Ve4R}9_IV?yGY=QNl~euzF{9<8d-M9&Gv?WT2|I%
zu4oiA92^M=iGMV3g@EuAxT>0xv$L~jU~cT{nZZV3hLxf%V_>ZP=Y*mR2NyBL&Jz1!
ztrOgl{o~{Wd*2Qh>-ad2gfu!mUd+yps90Q_q;K$=g)VSwbWuE*TfoAB#I~A|CnBtW
zZ0#!)6jXXfhOLub-}Lkka&mGFO-)92cKRfJAg~lv2_349mkdqHJQVPRNYU7?*CzQs
zJxBGfH52fQ7|CptuaAvs2=r!sm7Cul_jce$)G$2kF12{JpQB!!3H`00*gdDxh$>1n
zUuh1GK5+r{%gTy(+>PenqUb%=#%8TeM%R{!X;~(7SbgQG8En^X@HepZOj66gCliVJ
zk%x-(lS;(Yk&upODO?30ymkzQRuQz7#v<{}ii-fv{sc`Sp>N8STBL-8e^;HqLPJ9n
zGF<Vtw6t(E&;1K62UlWyV6j?F*yzQps<!W%d+Yp++<>se!>e<2s4CN=wqI{+)5z(`
zLi%|6@k6!;+WQT<Gc5=j5%wp^(HFqCnp&E-4^AY`SL%y2TiNbU7e!@dFY$0g2;=br
zNVyV}ClKP}<ELn{&FOfkVxl1Fb=S5M&(t^(H1XiSekCrRcan*@zk!7bt@m7R9_7C~
z`jcdRc$sg%x^i@Cn%K0l>ZECAUaYTg_~+?1eX^C&^ngtS(IT?89g7fD`!%@zo>~M_
zxYCi58sl8gvw4+@?{j>R>~!f%9m~A-O41nzu$+U3C|ovA24J6=2>*ag^mgUy+>v<~
zGv?VY3&gtX`}_XMO@dBpuP5zx2{$*ciu#kCKkZ~PR`8~a_6!sAW_l)XFNk6ZF(oC~
z4G1zzTpVcXN^)|)44(9T3D$^7j(9&aJG!z)m97{lkc^FuvDxna#fS>>@bH*S{qsr2
zmnoV8G6?>+LDXkX5}HUWyc2ZwNx=WHQaC->%VAr%W-jnIOMeE8YU1Xzrvok{zZV#(
z{LWj*2jZH~mp|10FYGta6DaJsS+6=im&AalR=eDb7fdb>Z?I;8%~VMJRevOsILm>k
zs!k*ujUKd}vybyS>2PIlvuSQgrJ|x5F)(V!EPQx_lh&%)85)_`Hx<BUQxXZku^OPb
zG@{XPO%I@sY<~=)V`Pl6Kb)|=nWL1+;F8wa@?0}p%oRC*VL6}jo6ef-o~Sn44*HU9
zFfuZ-v?M-hq+aiRojNozvgg%Bd$G|nP+i+WqgE4tGz86)<~md0Xs%XoCY&o0A+&=+
zg&Oc)Z@umuAh{?oG(4{VE~EX`PaktCSGW59tOOI>=0t$7+4cF1&n+&ZmHrD7PL_b9
zG3*L!Wp@(a`SwSz34Y)J)5EAV2kU#oP)c-YC{rr7nT0lQpx>Z%wchM9@~+#4<8uqW
zYjF_;^XKZu+3O?O;N&`Z*YZX<023HICuA=8!pZ0>|Hffl?4CW-Dq9D9nW~BeJ+P6D
zeVl_$S5xx9MeM(7KVp!n7#fn6aH>{Wy$U18F++cMA3^LS5YUwVm?Wv$S#sT?f^R#p
z>!wdmU*plsD%f!*M#UI>yiJu76N3&zr!TN<eNa(Vzdd)Z6(5$@+uO6|u%-2%Z;iU{
zKZ9^M27y5xnh_1ZLt&??%~?)iUj9IN(%qJD%4!?=xNSUIa));I>&4=;MGg!UaX4N{
zNT5~@t<e$)kUKDTfPg^0xrKdtsGacOwkGIM_N%U8(AoFxW+~Fww(xvhaT-gV31HN=
zAmJvDk||$bYB%E%B(KchTuK094JuAzxX#R&rHjJ{)?bl(+~wQHC%yGtFjmd7r`^IY
zQg24oneZ8CYNpwett)lcWfOas4feN7&P63uwN}$M1rr-S#*fbi1_xUP)&m$QTxj^M
zfEC<7@F)E%*>>mdaLQ=mR5@A+3h8+%)-JR=;S6@z)vHP#A?RcdXtLOo6)?Vr!Rbfu
zOWQUrHV^~BKsRm?89yO7vx2NVRZ0JS=ZE13F69UiL6)m*iQOO0ei9SMp`W)Map|Di
zf3El@Hs}S#Lkp)Qr_N?e(sMZ+L;P|u;5d}Q)xCXKmr7wu;Bq`+(CHd<ad+3(mG=;f
zCZtd+KABc@Y#212w~;Rp{qpCWtjcm3^To-Q{!-51CbKCMVO@mLZg0rBW%KCBgw1Mg
zsOA1NB+NZjIm*l7Yyo4D>%L!A4I&{W#^-Vw1$VhI1GX@7w#1P-5D`aYG7}`Pten*T
zh5zZ&x3AStZX4p;HwL{u3Jr}C+mjwN-sc;rNDTyol``!j#Y!JBJGA7)1~$v~mTH}4
zG6e08DEHgQH=a*rT-=Ogc5hw)SncEGTzx^hL=p&ae0{Lway}NgMW>ZtU^AF3E`56&
zR7<Tt4z3B6a1A1lkL~dJ=?N93x4segc5~<^lX=^}vEf5+JVudDD}sc|PtpQIba`F#
zn6rAL85|K|xYl%CXR;h>=9p%4w4+Hjp6r(rkZ?B8<DPBhH$bD(5HcP#@#AXihoWXl
zwZ*gD&CSgSH%m4$a)?Zk90ER1aGE+T@{HY*=S<c%N<mIJ@xf+UnZ+4iN~-}ptg@wk
ze+es#`G#**Rn-lGWRU@tLym$_MsxfeO-Dv&5;kq8;H)iCL4Cn=!)DJX3&i5-8nlZ*
z{Xy-N-Anx6t|6kqTe_3sc3A*krhGgfhU2oPW+j##th!1vFe;we1VKgy;(i)euAM?b
zuH}f9y0JJh5<hjf+l6G;l$>95r-BAem)h_y;IZwtx_oXB#EXP@i<m&-lvpgM)qn58
zagAgzC3?9K^70I8JUjV32P<?g!ZSVYi<MK(t(OCtk4{XGY%O_TT7=0bX{ABU)(7Xp
z+RC+3`lVt3KFl2q-#^G`wE%g1L8%ROg?*Wb@XjqSAC>QfIyy;wXHoGU%ZjMT<R#`!
zc~BbNL=*1ME-M>L9@dth?2X$d4y<{(>^xqsHBPw@d}8pF3%Mw5=H-bL+xl20DAIe*
zNe=<41B<foCGR^jg~0|<!FG$xME^bqjZ)Plm6rmR`@M=ySE*96`4N(W(4#Q=j=srH
z?9oO%0p-fQ;U;R|y*#1xlKHN#DY1tU>un$oW3!olEc`c*!R_tk*Z^;9<G!H}03*({
zIGP8XOFl7B<emQRcjCcu*6b-Cx8Q=;fD=2dgHLNiM`<+0Tu2tU&4lG}<}9ijUx$(h
z77$D`X|ia+1O4@*eV7`}<s)vb&4cZ{d909l1y$T`(vvZp_|T(+Lds4SWd@Vi5U&Bg
zv!`kRHPtC?av1h8tZv#NeF!K8kGP#6xD?5CRWD(^G#sFRt>C%sK?22B_UR2)<E1F7
z>8shIp@RhsV4Yt;l?Z1hb&%UF>4JnTD0(UU=Keyr`RN80G_VOaqh?pXGQmH3tRQ7B
zt-saRDJ~{K-%5Up$L0CLg2QHIF#H07k+%EE|A@6w3d&@qIhroPFO0&c`n^NRNg1Q6
zFgV>3iATFu!jR((RiW9e(&TaWmoEM75$qFxDZ&^Y*7pMHis6b51@iu%AuUeoe4T+y
z<-=OX1>!FmC-nRCI}Z09v2C`S+nZ3(!<s)o=n7<?ZrC}VZ?C}KoY-ml2?mb~$5CfY
z?YZK5HN2G>U@3BU@fR5PrS5iXq@TI2!hABulY8Hd&Y)ja>4eQ>tn675i^%~K3kwTo
zHR?)NPAtd0nRmrE#S_fbv+k+S;j7Fz*}+03-0`Y^<VKh)Zj78t?)XU0-(d4w&dx{4
zh0DAAe_QwZ%TZaaLBA7hE8pE5(PREatIROh>}O_oUM`^ln10t?2U4E>WAHCNJW$Cd
z<9v~YS(H~))LroP498kZUsCV9S)Zfxc<g)!5XkUw#_Z9tVpLSCdo+5T&;jA=&#dyF
zw4k)KL8Bio52E4ljz@e}q@PwP;c*$1_Pm!ONBdddVWW(X_Ugw{HX`y~!<uX@&~2|x
zJwAHrnj=edQf_+@rILAJ^%a-{&IN%Q*zpcbik61+1fy>SG{{k9&K#RWHu_<8q7sX;
zyX@H$g|aAkG&7j?-OmjP@8`Q`<(gA4TSm)Fu{r_WMpSoxAdY><(>Gu=g!ImF#!nrM
z(<WwMNSK>jNxa>f@z)}~!!G~h&6_CezZ#>4=i1Vme(=<vIz!3gQqKpXfbo(!@-PAi
z$Z#Lp2V)&uRq9=MO^YduI#}5E(=uUIZ4>hwwAO8k)H3SL7pWZh1ojJ~D@JD)L~qT`
zl}@lN^E1*pX^C;R>K#wCoDRK6j6Ddp+;v2B`+bLVSFZ<C6)e^qi*1;U{%R4-7b=(^
zldoP2sxdydp0B}&<|)COr@Xq-F>r`nq`CvUhDw^Y8K|!5p0#!k4OdZHvRWG}uAk%?
zKGhqlugYxS=Bznfh1`03cSXC?LAL(jhgN7>1ZUhPB(3b_+g%m3;VC@1edktd-arut
z;=}J*s2>f6^A2y$-w6_EGyP<Hh@_yV-ri`!0ztt+Yz2Oj>g5uvws^5aiVR?4VljK2
zu!moK>dhQ9deWihn{V<zoh|qEg`jL6dj*UL>n<KiC=i@mn$;yVRHTQ*+;OS8#Gj>L
z0&wiBT&~$PrbhbMcZ4wNo26TcFN7J<s)Cvk;bXYXyI-N*NXqXBOAqknip_>WUT>JN
zlGFi{(pY#u%Ms-JFZ%5bF5hyHMNES0VB6KhxcXO=?91<0&b3-SeC8#+_jR{4YnYf}
zO8txt4HL!JYKCgPlTPScFtV~TIy4ds8(KwUEIZEavngcgSfO1}iQI+xUBClKTW01&
zR~se~DKsM*W)>3cs~CaWDrpu2d>=o#{BA_J$M>sv_28con-@yglL`L)V$#C$a%nfW
z)Skz<xVZPTRt);8q*jcCtalk%EpPu0{^`?3iOT2q0U==qTNCRS1nl9@L~8+c(V#7;
z$D`GbY4hD7dJ4~^gVUi_Z}@QxM=aRP_71H~rt|sZ*^Pr{xxDZ@mb&_W4vFnfSMtiW
zq|@Bu5-N=6-%3h75Bb=ZlkIM|1ErbHnjIIX^A(b4Xoi6gmOUlohu=N&mGHZ!nVpL_
zugPP7Gr{b(zY><%Gz$@J^NYdFr;mIrJSLf6496y9NV@zXT0jr{56?%U>8E^J5`1Vl
zw~X!nW)T$?jTUpkbWzTJt*%N$*o8)P|MR3W^^WoCU{mpMR?S^hRD%BOw$794Y^_O7
z&FojL&_RVe<#l?J(6e7+c0y5F6#YK4tf*omSAE__tNKbG(wtw%4Ptt;-PZrY9u~Rp
zk#;B$Lzl%T97iU-@eFv(eny*};k>B%*+p<b$_F*;3PM{o^vUX6LfWmXv)O!Af#Kz6
zwZl0jkk)#HKXp1%8k4MgKl039S1?b^6=wTGA85^P#_4&521sHuW5(O^MT5g-j9fko
z3_sq6N}3DH^JR2w;B2ppEjBN;P0fZWsi~RG?kE;Mo=XKD6<WOnrKHAHKVB#M2K%o_
zSp4^44|8&;&ZnxXo%0O2>AhaBaRmGbqO+0)6T*y-7TVYzt&%)4mTE#-TwgSKB(=2Y
zj3eKByFuz-#Db#)RaLRv2TRU2n^WTVNO}l@YV@vo=H|5c^g9z1*|NJ4#lpQM`1!wV
zO5;p+(a}n3Sm_$R54<PkMYcjg28z7B4_4+C=KsLK8&1vdL>Je&;lZdJD5fZ;96npC
z3boajq|2d!zHu`qm|md8mH}8Op4LgxMMLB)uh#M^-c+D?3u5;a0kWcubZ58u7BU%}
zWq?m6dULbk;(BgrZZ~HZ{gZ<bPNF4;U@iXbG25AJg@$(@-~-Rsqxb=*RvJvm_6nY6
z4KMg<klMC;4q(O)QiTO!dR9zJRR-S{5+Q+FAms(mn}~y@qUvDdDVuiL^@_@I<?|PP
z<%<;7dL#hRbF?j)tSpV<(vm*4=40KL7qvb6r9UNsHBr@ll~YhKJ{|x8Ydw{(YRQW=
z6Xzu;l3Q9Rt5s1K`-%vwy!AU5z1OXww>FUU)=0*9>4|c#OtZ7ka-mEyiZRaksyAHL
zRB<&CytVOaHFTWCd^U!D5OI4aW!HoG(U~aAe>$6Au^{p#xjUCn7}#@fi(`jN&Q}zX
zcsJSFgJcGYHj?k7qvshV!)u?VbF3_?HBK0a;NT{kT`82rd`5T1%)i9HljdVsL)82)
zst3Ha@f>*Y`b-db`UeFCok99uLFV9R$e9^xMqNCduhv<vMpk;gWH@EG4_Ohm)u*4)
z01yy6btc7aXIIZ;^B+|jLi#|tm7iUtOv%50e>t;c34fBM=YHbzOG-*Q5%asW|3fr0
zLe17I0mu+2gtJ2PMJxZnZ;U%}ra1%YzHm=PoHBIt&ku+FKuoSZI=uXkbICtw?aZwq
z5&wQYmdX{F9{wj1?_HUMGg~Uy86{i5WG3&sa)rjhPKclfTN(Rw%=SLs@BBKOdGwjt
znWKdqwsrLdQeL`1VRNT{6&3Ou*|yJblx^JXxfSM)6PcV59bWwz2r@36!OUFQJvMfB
zJ&!vOMiZ(1gLr8SI(;sIvdINkwoU}dKv_z&+E&@tOF=}l_fyg<rN4c3@%c82^zLH4
zwM`J23d>gHF|o$}hQT&1P-b2{FV6@~{lhE-pP%>S<b)=fkHFiTFGmpkc)kT6M~Q}v
zmNmak5M@Ng<O=-2>mIAutuEVj7xEhj8dY3I4m##&V`hVxeQM!%VQBtOZiFWc^$)v{
zOn}kyV78{eO+?QcQ>I7>3xj=qc&Tz<l<~cMn(m*C*z|r0yc*2j$4k8;Kt)Bh+3zte
z2tSz&);hPXW8A%12Rj%`iHM}AqNWHIbFelYZ-8|;l?wtmmny5le!Wp`y6N1KlCgX4
zD9NQzLdjaA@ufy*`VTMVDWwU0xx<6-i^ULNIb%~}H8!@t+rhvi>{M!d=edWijAd~K
z;1f7*UGFlWk7Y&G*T3EN!1SyFV6D}jFZKYGPwKq3GIp>R@S41kI<V006>!?7HX^Eo
zMG&odawu(RKQa?HBovv|Dw;)i0Z{f65S=={`2FZ~-t|IJitqHH2`e#<G^7b!FVW3S
zO;r}l+CrkDjGi}zPg$Jd%DE>}I3TdB^3#wgYTnfdxsI>kR@aZQ5OC)kp)u{Nxv_C0
zk(TP;y`G|r6$*0-l^^=eA+kvfy_hAmw7zKhq0d%TfOM6;ev-1r#mp|mrKg6Zrb=wP
z(I?%Qsw`##yZmR27&Hef4zZx+!g-UJ=w<)6%-1iiR0Cj4i>_L1#?$E^W!fz1_uQT-
zPvc5%uJiQOslQAQM?I|8Bg2w0k7rs;>w752fd3s@!<tFeCU=&}1#qW{SyA;d;;~9?
zNhUKEsLEA0!A5oP=H!-G%+%C$`}{njv5}pTk@0M`G3p%(;p#LUt7)z%#5hgH#ib!f
zsU6ZfJwS-UeK_R1Myp-S=%I|=#oiA9;vKEj<8;2=fuFB7iVEhwU7n%xN*QJz(P?`N
z2{|BtTBQ1i#2}D~aE)bdL@aoQCC<4v$48Yh@dCtij5!{K=5qQ>;>(xg^rZiq0gs~h
z@~%qQh1N-s0B8##=sfbNsW~&NzQG+W&5!iop`oF{<aVObAB-d=CiX)im${nU?xjiQ
z3;?KR0KNOW#~n1Wn~6lI-A_#?bgl#ts!RR(=3Mb=e?9_Hp~)p`BE|qzrc)i7+`Ny=
zf_{+jq0+u|(EHhADC@Ve-1JH5rZZi|eU4d^RYaxXQEjKcjz<pS8|DzZQY88P{XzMk
zpIT!?*S1lCZyhHb0Hc+wPpzD?8vUr!2gh<VyRcB8-e~1;x&Z$-IT>>z6Eu1}YpilN
z3-|SMb8w?OB-Qamq1MS0fXBNU<plzzsmf$P0Qt6#xOFjZzSe1<@i%R8Xk;v}qm{c{
zy;1LOi<HH5MhNZ-ohpw>)`4Ear|pU4v86WsFyF%<;X20of2-Gc+@eu?{uS)}<x|Vz
z-I1GaB;jZel$a!m_dQ=<SC_xj>-}i4k^n3vC1tJ27Tnw0yW;8D-saWK*B4*M%qUW!
z9vk4E`?{OC5EM&w%`byf0(M{vl~|gaIfVlFe)7=x1K0{0-s{(ppZhl`h@5W#$2?sW
z1C<+ykf+-l@TXKsdQ6A74P%67TG3T0hWk$3LwEakCr-At#jPDy7SLX5yXVSRT&WlZ
z7zihVmVxk)jAW)3&lp2$_AJAV8Df$`BZ<<yP9LI3VHajvTG~`LONrS6`V!f_g9Bt#
zRH0wLz??5P_9y0RpDa{`O@@f=?Cq=VZSq1hz>Vh1s#)!O#`<9FCC$U7$E&MKZZ_Zz
zWL>aD-)2>Ia)?8`u}2*vBn==7Vjb=&W%2olxR}18C@`m|r`tF><~NIK4!{$Lji<6!
z*ViYsgYy^t173sG*12y<E-34hV=T+QU0i&0Cy6hz?RsT?)X<}W7DrGK%6>x2t1FqF
z?Z565_FQ$6dBzNt<>G#Wr<cLu-t}=XTfpK%W*S2snmq=A(JC+B0KAoI+4*R`6RxH7
z=$nfFjDmtf@BBQP^5Ty1wymu#kK0|a{_vp6QFS!rDt3;ST*gol1<<w%4vXLidQ-5}
z=0L-Qfq_L}a|&9T7Efx7=D!<dZ31{{T8H~PdF91l>Y`AzmYQ>O^V75J6g7PC@DV*B
ziCL18(v-g;$?4gX!owYym}iE^hsjt;|LY~z)G~=nivOgg4T#SZy4lqWo){wJr1aU#
z`-Yr3aD8Wr3sBW6s;auCra<Eg?Zck_b}x=x#X#jsen1p%0Z+<&e4*%{FX10DV6U^V
z&T%wtEAT$M!6x2!{1Z`>{CF`W43b@^EYs46bqot+c6>kp&=ff_GZeXdZ4VP~zN%=<
zf>o#3;zND4tJA^@6Eh0P&GS!`<Ep2ml*4XN!`^7tgU#L@9)9|3^;#6*7z)e^4at_e
zKVen-hyue2zV2$%&{I$ll92^2En!LH82*1PfJ!E>r-X$C4Yg7kAp=#Y)q2a1_ai!>
zXGcOR9w)D+hJAc|4AggV=_GicNm*I4CAiETMMXvb9?#TrLQAOJ+*(Y`Pyc0S`($VT
zOjS!gGBMY;u<#8CVT^moBx<qJ>?x4x8S49nf`U?3Ue3ruqsGV+&S3UC4)Yw7&D2^C
zid#+~M8;u9pSOS*kFl>RFZ$bddrmYHNOiecjO1T_G2|}*K`PyMZjEGDUKbr+Wqm~-
z(N;}5E;iW-*5~LAAxkZ{$j6@FX!0^MquSWmAR#5KHlD;E8{h1JwlXpzGcz+QD)|VS
z{1+25RZE_n)|*Is6*wHTSeqFlMUrtx6m|MfkZpM`8)3ucmXSa|?5G2ELy{k+IrePB
zl+KU5oQ#e)0iZFA#?~X^+9@41EK#eu`6-wSIfOk=6cS1__HxEZFmQ3Db_XJ=tE#s4
zhT}ddhkfqUcDyC*z!ny49%wMJ_`}eVuwPabgBZgX>O}l<^w(y@$)k8GY$Gb4Q&q=a
ztQo%xa00@E)!Rpx-?KF~59uM2wJAb_`BmQMLM(H_)!(x9Mu?-9#|r2@pEEX9$9D9r
zKPtJrKX@`TGw&`pv*t^cb1SrbE@J2B{NZtQwtktcVNRsGo|oV(2jf>}<qJXK9WcuN
zkca8v&W;{a$SoliZIqGkD}cxz1068>VG7~9YV1=Xa12@0y4{;~yxmAHl&K0v;iJ`2
zwZtNiC4ZTim@371d%y|Dl(%3d4qxg)Z<)=Y302ye5(pc&7(gC%Myn@`=VXKydHQ#5
zNPjW;k+EMkMglm@q%r`x&z5UBoz7JHrS0fXS21KVd^zoPZVZMd=^G@VxETC@nq2Qp
z$XeD_cL%~TZ5Y=1${h&hpzw;R8Zf2|OX+-7U+U3A&kbC`S<TDOpKf)wo=E5P>+Iya
zxVX5aSYeWDq<ebpjlh|zrzXLue5>*&RnZGUmY~QDr)?<Hh1b3z6~v-K&b-<H2;rx#
zwL@NMlOE88tsjm<UhWv%_V#w2#WFGwNM$m4LIMH;#@Nsziz#tIFzD!0ML)hlqN|pL
zkgYC94%B+TE{WQw?gkND_symseEV^i8UZWNuXtkaupJX}WD=q}#Ajf7+)rK7NzYd0
zLn*b*-J#DECok}j*W1z20U*&d+uecd_s7l7O%yb9ldcxWDwpcJ$T7>+f0nB~{rE0b
ze<70fWgJVubwVkjIERoEr~Jv@x(VP6bU5+;62@y44@}>mO((22T2nINZ-W4`d(+{J
z;#I0BXNV{aYfOjUeR;wubxNqh$$YWG@a68fOszhY*YkyfW5n6w)9ZMgvh(e${@}=b
zA0i*`fqv?2`aX?l+M_u(%eEitpAsQ*=*wJ&o+D8{nkpU8DdT{OQCeFYPl0sWz{mUR
z_4ReO*Za#Q;f$TlE8E@C7d-BsSW?14q!5ExtZ|bIyCl4`F8D@gq$0vL)_yol4F6C)
zf>#qUL9W>p&$Bq{;r_wF-TnRk2psk%k7v7mX*;lbb4lypu6NKppzUk@6lpjH9Vl+h
zQ5ChB*l`OlC?5c#q5vFz{LRoVb%!4A?$Q985i^b<r`83#^+sQBFF4S!lu75f_S$gx
ztu`=lHOV*A$_V1wx-(6Yj+fJ8ihEA-evZ7v9GTLa4gM}5{1Z7t?${qihFZ-wWmMyk
z>)eD~xfQ@+vjx&P9q$k7N@XfOsViwgIDdd(&fv~grbdeA%<kQxF^)YGZLUEaM#FQp
z#ny<1Q%Kkb5p(1(u}?yN-Q|Z~x5Y77E#UNJ{?M<h5Lhg}&$r$p`P>cuJhVTL7dG3z
zcN1ej1qqoIjN%S8QxuW~VAZNZ6+@#GkR<rm!ioOCJn!8S^VNhKmg(aWT*qjf|Ni|O
zlgR)Y$aH5L?Ksq>h?O-iA-{j?9Lc%de0w<i;{H4$3hJb;MJs=b<LlQ<5fCP{68W*=
zZQD1UGV#{Sr*TlTCVtWF2gPEwhUw|)2`tjj*tOBS`|d%gm&YUoIzHFm6-M|jHWB6|
zF+vKdp<fOJ0sw{4l@|A?>WMre6fVc4YcrVvB!|Nh5)fnH2zb*0v*qOHleSI=9X#hv
zl`2c3WTr2k!!a5lx?>KDrB3;4p8dA@=X+(8bNbtbUOXD`<+rHM>QKeIoFtEP5@d85
zm9Cxu*yR>SYD?`@G$9v1D8xK8q?5&<1ZsZu4!Ysm^nM)cmzgB(XT<}L9N&LndR<Ld
zAL675+i>K`I!?7X#_9WJNwKj#Rl2<{Z%>T8yu3@x%aj~55@f7sf$(wYcI&lJxVU>}
z=#n(xSYmX|7W!!#?9kr@u#gvz{2xcb@u%VoOmc=H=!P=(E;iaFf!^-a{QUmg^DWVE
zJ3I)qR4?gfY!pW}Gs9=cFqlq^n@uTQEDDmb5$N`T5s)XE{(c$pem00A8_3{4ZXp7N
z*SvDR-kOw1tInj?2W<<w==`nZ#kf(S&3Ej`&B+z;N8S+sR;8Z`lHu?3n5gfO6!HfA
zv?Jvom&qUm8e>lNWeJ>>p?Nxb`lu9U;~LXhGN-d8pTfdIU*h*J9xoa^fROou!}d2O
zMq}I;I)~oVw#(<fY!FEh0*cCGOK34)t{SvYNpSsRkaNPZVl-oKXJ_Z?=B8(H5d#3N
zF?*=p69^NT5a#AZ%7|}odu9i|uu09~lm#p~G0D=xavXpI!<=F-UUh+s;&Kj)H(Tp9
z*=&EkKbh}cUQXE^jM4`{z?K-FPHJkE9>m)dv5Twt>DurtoU~GHYRXt1TDeLu_J30u
z`fn;fLG;ltIGv2XKkORSo9#%oz28|!ljsYzJH24S<tPpY;7yea3dw1-=^l~%%{6lA
zJxyiom8!nd_ObrSmI~R15a^GUX3M(966NTza+-|}w5uN-8{3PM<?UWvOajD$y9Z=u
zc?n_hsF<9{zJB@6CS0S=$`(A=a7GN@Nvgs$m-I@vegz-~H;It{!JRBc@JE?|w*n09
z>+5T>*2EYR5~9)Jp-R$xlUIqz?c8&<JyYE4beUM1@|_HK2T99i+Xt$UvwVsn05MF=
zK_I{;klAI6-(1c9FF5AUO*{`MMEt(l**Jbb$nD)-KOY|-Ut%<a-@ko_<MQndWl~Ar
zdD)eXm<{7odT|%30z2*ud2ggS$)Ib3D<rem-UqD5^zlzsL@`>1=E?Z@vIxB2Vhl$U
zs|`odSL)*`57Mt9`v-g*+4uIl8!QPA`<D5?O^0a#pv3#OvB;P34FlLy6nx7D%)UR$
z3`h?-$em-uLPD~EvJRKqDIAFPAtcH%DQUf(p8~T5Gp<bgWxiX!upLjaf(YX#1H|~0
z9CF!AKq#fah!L6zRq8|PMXQkW!?vsEc7LD&vgn_3wFHGi8Tot(Gzd|uH{+5L25Wp8
zO{xrO!)<|PBZX<fsEjiMFmMwo{Yd*ayl>QhME=_i>GT}|i@OMRNZ<zA%5h>OG+J%R
z8}073CeuX!h0>Om7w%vs3TDq&-^$85H`mF`=xD-PATy8YK%S~bv2X0OWLzorv2tx^
ztc)3vF@})R=rZ{2o1qX8OipDBhJ=Rd9ZqC$jJl4t$nhH*0^axh)U{APRhFVLj(-!a
zb(e!)uQG0CyDk%*1em=I2MD9{wcetfRL-%tx3{^vy@AQe$u`?P5HWjH;L_5^a8zOF
z;*)1alYzcpQ^revqiK5#6C=v<^gD9%TLCWwll1GWmW!<q?9(p&;#1S1W`dTM*4x|d
zq{UJd{~x>}3%AF_i73}SXooZC>1n34qnuF$r>zL~2-7jf$acS90goAg@1zV7`bjZ`
zfxOaIUABBsWYV|3p{oq7DFK4F_t!_`{!p}ZkUP4ywY9K6&7W@w2sQ_BP0ixufxL9D
zfpLe6=Kyr@fkP$r{+0rOppiaN4<Y;1IBBPCeJD;bb2a7w$}$~@leQ*T5<n95^z@{+
z+U#_W4H(e`U?nau>5Vv_kxWd)TA7mQlOmhbKsYzIhHSSzu-YEWePob~MSX~BzF@%1
z8tM?dUJYisujx|=#t`cA-eUDrI8}#<OHtK$NlC#0QQzTmBf~eTV!TYFIkv%al}Ud9
zj?H4}Z$o<ASJ(uh$;_=wMA0aLAOs{d(%RwMQ>PRIz_)~upAo*IZLkAR_!LK14LA1C
zUEJqKn2F0g(}DVUN>bso8jAjDU~Fu^I{<$$ks<kiVLOdRQ#7F7VKf>`w&Os~7N}}W
zT4*w#6I)4mzU=H@Ty9fsnP6@?stE!)6fonvYz28ZUi%{k3n6{@sm7`zTZT0FCw-Vo
zu#ldToJweXUUq&anwXnQf_*2Po|}umJ6l#@a=FqGH#0loj?^ledN_|0laeNl#bPFj
zZR0uC|M)--2@Dj{Gogs->qj%Mk*<-}BVmlSh_~<<?1n*G0%weraWR*55nwHe5mu@;
zOf|6!WM;{c-`3C0&TeXMj){qpe@c#xMIIO!;BmPE)7Rg1MsB>qcfApETbEHp`}n|F
zsrS3GIi4(6PjVS>4w1YoU>C$1nS2YcIcj>D3bA$QS;ZOTxS@P5@S&-B3XT#Z`u^9~
z_bVhE<}Vo;KxGCnxj-cbhsX72`x@r*r@A_aBMc8uo*>fBPM-dSo!!<Nr%G#sN*ozW
zHzJ>mjc?R*G8~h{Qq|SZA0aX>)Po!YrZRDo*EiHFCb?0(f|$OL*kCkjb-~=u7tu*c
z$`<csWi*lapplUTYBYRc=D!vE$fWaj&zQ7ZYJqB#OvXP5F^siX0Byn+!Ex@oFK&>>
zE9eU>S_I(n#rrY9_-My9b0V!*(uR1aE+Y!))zGwcP0pA2%*GQWAW-{KgM)(uz_|AU
z3PeG{UT0U#o>w9s4YeWGTK{eE=H{7@97)W`e<5UPOaAN|EcukmO*v000WjkAZQw{7
ze4V%4KZO2;Go2LaM{;J}Pzqv&avlgTjE|1y0x2dyGf_f9;^_D|CLuw%-R&Ne!-mlF
z<*s{RpnwNK*oB~tZrG=8LQ@Xu?TvXXRng-5wtGL4V<!M3Omz$?kb+GsyXOacZhYL>
zm{d(ojhKuK89RGYd^{>}Gc-0v0%Yj9xj$evwY9L;8$&}wgxu;}gxsX00dK}xdZe*A
zqgte{4ZkH$!q{HiUj8eN^YZ@a;gFJ&9%CgU^JoidYiHq}<9ek$!BY4P3L>uXm<VQ^
zae@6m)iEH3e|dQ^F*B<HP;nxiW@us}I-pT=xL8a10uDJ<tuN}}=s3ESf=bnHf2h+7
zxzvi0xj7VnJ>tkNE!|}EWo=!%HRV*JkQ{V9(0WCd0K9~rzCI8=i6|*UfO-EvNi-|#
zf4`ZT)qb-S{|m4iFfcFx`k{VXl~Yz06;+0khKIkqyPH~E9Gsd$($v%p4-W?vF<m`9
zU-9rVYP`L^srm}#PzU^{u|`G?j*21&G}gcp0Z>&;N{Z%<my<LgFK@4BAIP+Mg@tix
zX@YjKEXDcx;&I6Z1?bqRsYfTr*#!k!Po0Sk2!#9!3b3s3(qMp7$ScKU{yjZD1(yIC
zcK>n<KUZAl=jW&AVnIh-eDqOwcXf+&lM^E(<kYb7gv8Vd!6#9Soz}ue9$XNyUr8V!
z^76^RXPBFSPGwDP4WQ>EBI8015&G>SQdp7g(~!u<)zVT_TB@r<=*j%w+jadS0QUrk
zgS%s7ViM5S?i@<;@%chVMh2vc;O;$wk~H@1E&ioy@QZbDT3VNfY$Wbhj3^KaKE8~N
z4MP+@h=_$Hel_F^E}r+d_e*%O5Au||I~JgA$H2zgJGAu85>FElNl!1#3j%bLB_8O{
z{2Z8^qCCI4a-|qY3fA%7fkdUk;o*KvOrnIE84T8Ou|Zy8OiHGVK#u~zB*h?oqQb*V
zkI{}**VGIEd&QVs6c-oQ#>S>=c^S*y{dLjn33X#7DB}naw+9CYQ@jab;NVDlc<@|*
z|IXuyJvmz_n?>4C*vA(^&dLg5X^96H5y8m7ARsD>sHq96bG)CP2Bs!U00I|uaJYx@
zPV}k_D@bHBJHZCFPi{#;<OGxpTU=a*u#yrwmTB=!?Ls_>ot>SStTe!VCCtSe%m4<L
zlqLhwCWP1hnaT3ZFCd9YjTHd2-67w<o0ypC0rU?br2lV4Q&V-!%mP!2#dVqL>gxJd
zR<N0wna9S*`*Fk!Z|^8^d1<8G$Yp*Rku9p#?@X4^tu@;Ry*^&Z6UJ<9?S<DzfD#qY
zsv7DCM<x)cC2_)~q!^jlgoW?dHM%JQDvMDo_3A&$63$zyFHSCpI1>pCUj!hmU7MT#
zRLc7S>P`94@r0NA)7|ZD0I;2<M)a5~P6#C>B=pCT%ffWx^8tCzg67AMA3~yoNGK@M
z4u4oUIhT`@Q+3U(d{UZ8MaYbfurPIX48pUkzXt{adIRxJxUBce|N2xxkKNS397ri+
z^7_8T#v$i@^1bptFF%G{+mZ|n{=mSI){ugGes%>$14()*C8w$Dm@7cQ!or@NpI6t`
z_AV@-6BFm&@bd5@AQJHI%@r$XG#!O)CQ$RZVfGC!uq|=5Mqez$9GbD(mZ;&4QZ?-3
znHBf-3;jTL(0;k!;`RB$-sJs=0DQ2R%_SE|WB*sf0<!K=?zzX|*OVhBCMK7stDnHw
zBs4VPQ&kKCg1s&`d*1=JqpyEJ$4WOu5e<i?%z~k|ZlG`MtAagjxbzr9V_l+?VsdhJ
z8I2XsI}*_SMaDo8?wREPG#BE*QM;y6EV8>fAt7+&Ttw+bMbLBebJg{={R;~S+}zw}
z=N8qCjfH0OB><X4v$wZj=0+LO5D@qpgh+63RK1(d;~ER>6hPs{e-0T@tXTPz)qFmo
zH0{GP9`H7uF3XFxyTgfkYK>+Wbl`->N`s~3tCQvNN`0w|W`}COv;#oMe}jZXC#!?v
zNBj;0L&U+6yp(KGW@!PC+dU%#U+hb%R1~YbXI9W9&2h%c%lcE2<jjCm4^K^)IYd1n
zAu!}zOzB6#<b6VcDEJS-RifQRB_%t1XW?OziY3iWsAOH(tY$h!MoJq&a>YU-B0Iag
zy%!+&rakxXk0R2hYdN&|<7)EdM(2nRf+a#kfP$P?nJ)cc<XJ(Z*(MRtUQRbUTf5z#
z1mx!Gy9TLD$9w0D4iEoiV2J+v7wlrKx%Zs=3*g~tgSxsZ%GLc7!&o@(<Q8WcRrY0}
z<?SenXJ^0xrlfXTehU5S=@_2x@Y~`h&{2W}$Uh!}$+Nq8V7!7OD=O|*Bxu>q7E1!s
z(s1g{=8<>7C4W*=hk3p}R2!YE(WQ6(H9mc)yI4v9#HUlU7>mUcu_-a#0kfi<_IHHF
zvTu?ZT#lF^GZG*@{%~fKY+n_6^cZmC<Kv^#zTPeA<U=HY)U`4VsFj4rEuHUcR+BDK
za_+A-yO&r+`}v0#0s=ya2jM??%kh1J@h21?T;JSWIIzd2i{y#1U0t?-tyWxY>Kdex
zEhH>_{hA|Orq&E2nsnlD%AFj!?v{Hyq8ZtfW@v0^_m<^}yV9P*&0fLia3ohCoAr>L
zwNJ@54Fb4*05jM;kD$?McSv<*a4#)!%9U1d&zmm}mRo@X^FgCG%AOgS93?)R7Q9&R
zm{?a|Y<51ycDCN^n;D4>ga?_-H2oM)V=n|MfTE7v)=#R~=x8Lb)K_M1=d*wMjT><I
z%-;t~=0~~9B!2FQW2Sv-jdW|OAFbuX)*5-eW}`FFtqNiM_|ZKaN6u+`gIXw)K|)EH
z5-6Rztu*PUc8|TKHi);*9{!5#kH`;*E)c;l?G6VNFE-jn>PInxqr&nHOB3tNR}<MR
zSL7P4)+IdQsQ|Q)bueMre}i_1%MjkJ&)YxNQ_|L35+94av)thYp}s()|F4mq@8hXA
zXd(A%6FEbOsC#lUYTf-|Yj;=BK!^lBl_i%y4jt$&=CzpP#Vh_9Vbb9*iq9eLy?z9R
zefHNrJ!g_KgEC~awC+w<q3G!=C0Kub04K=8u|bfJBAHSzFQO$&D@o2`1pbB9({J~u
zQRyF#gp!FgMps+i`*<_0zh8vNW5hTBUb)rj(&+I5^e<0Hz4D^&VlJZPB4T5COOn56
zEYm;G=4I)p3<2k_t@Txhqa`0N&)1oD_s7QvNIw8X@_xR-I$f;vpKT`2))}_mARPNS
zoSvW=$zVy}8fDUGKVZDPBy=Q6f4Dgm7Z<<XFKW*@IO<<bZRhP5SLr;HA!tGC0IFjf
z>pjX?4N6uUmc1uFckR};j*JbQBxTf^NWq1h8@cH$b#*B6!0?p5lXcN+PS1!`c(tp+
znuMjLB_`J!RG{h~;qLn_E-js}PfiaUJ2P1QvH6+4$78NyV=~$BSr-xd)Z&40!eY|5
z(2F59F_djss?;|ykmxK1L(V)cEF^Tbyf?hGvQq6i=|$%Gj>215$!t1+t8v=q^>zMn
znBdm9_MtLhA5VmFwDD}P-M01yA@{diR;D^LEcFW_UT+O8)N<7)%k^<H%bkf3IX%5h
z7O&>U_HcZ9x>Q=jIRi_r(ew!(X3C$oQ^A@IaH<h^A=Uou+|ohWFlB|oTnJjV1|lx5
z7Py?!Catt1AOSyJyk6QmI_{d9v85qo8eXqx0(z6`8BLN-0-Mq{K??cZ14{<BAAZqj
z+n%0Q=eQZqZ?Dg|9S&KLv|QUD8>Ea@ho3Agb!~#~<<t5DdZwp+fPs=sD`izDG^tKO
z|8m+y;|*~E6fKo@&m5uNVEnhyS=TUbq^K_(4QOxp1;TUMzVM_WX6%k~cIxSCd+joO
zTrbOPK17(D>4}`SJa~XiNruHkz~D~jBQFc1=xaV^mrSrZFt^+v{Kp;uL2B3Im~G-a
zThfGde&YriIVqF*35VKZb#8z<8Xz+5s;9<)ZQN`sq5OQZFz)$>59p+G0lD<rRcD`%
zX4<uxhTlPjk_Wdd3j}?;jeze3bDOd|V9u#rMUV^uh~yUWe*dCA&)=mZjSatYfYoGM
zDIgoPYPY|W(&K1fQ(I(RIJk@=3PUhDIZAz_0uBX^aK0>&<%I9S)MUI}4M?=<v!V#3
zW>3)ToSlv4cb<iJ0O?s0AmN;<NrWFaQ)2?2XQll}&v?+tIl=z!wfF4V=BCl>R<HkX
zh!T26%=E?x=xdwowjHVu*#Je$<RD@}b1B-mW_b!n9lP#N#QhC#*Qtf+?9VC2r}U1<
za!JdRR(74!h4OuD1@VOn&Cz?D#;1oQQp1lgoW!7r$w7FkYe)6eMGNuEFExpyD_-K>
z=0K!j0+hf1y?0>-lrmjrwxgzd<k_m~(uH&-tEz2B`DDk3Py8Lt!KAjF(Q27VX!{Ky
zfDu)gG^)E?$jZlgOf>fe4-R!1D=XGdVK`Txfbg$<9}-61&ANG&-2|Ijb^kVq@Em>p
z`~E~f$O8Zb1-7?rOsn*(ZBbNC2vW%(w4YCqU{~vN)g<HtwXgmJ<P||v`BChEeF?dC
zzJpPfP?c#{C(CxeMdm7ht*&d>PZQ5=x;Pwd=*3WJ=?)@(b+$ct(*5NIJ~=lH&QM>q
zSEP+({)oHVRWU9G1GDFa&r86UJaomda0%+ZE=9aP+4#=}NGhSSE&xWgP<e(D9FWo*
zVdq1~AI<uFjoH}f<#c`jp<n3Huig3H*W1+^aDL!%{e7Uo2$#b<P5-02X~EX`<mihq
z^7ATwVc90)(8qs<({zL1n(Krb9v!7!8|Zv>)-|;h>@A=T>%ThRV>BoztbN~<Jma><
z0~aLjcr&1wyqt}#|Gdd7&L8(bW>#&{MN}x1K8)f^1R_QNP)a?SUTAbA*MiYPtg*Hn
zU*_LE;7^2@|LoUlyy-B?-g^X79W}K4oL@BX(!xgxy6c%*^6%|<RH?DTC`F$n2h>JY
za7b;>^<>l&jrk=d1B><;)i&D#Oxns@4<Kcd>HUL)nNnv05!shm-QB`J!8K%n-U^Tq
z{WCTRZfSu;S5j1I(PiKKyrc)?ay*Twseu8kh}!V%{Aty4j~5Kov11RFZf_LHwd9dk
z`{|#$dPV>}2k8kF(N}Edh;X*@yGiSH0%Tjd3I<NBzvAXdOtr(P(DD3TP#@)l)xtN!
zk2(A23=ZUf=cE87Z}__fWQ*GiW?C{MAizZ(N;$%Z+}J<Kzm@tpfuboZ`IlYX-xZUk
zW2vuP0(&zuBGJTdB{KO%u=qf&_39cBCtq32<I`GNz98TS08L~-?hcz|z2=?T9QHZT
zH3bcv-*fZg`46}e^%7t#f2`sHc8lWaj8cv&RcPb|3MTvGv*Dh1+~v+Nx^^g3?owz#
z>vZ$1;K8-)4x~7JJ)`bPNu~cB8#unV=LL#qZ)|~AX?|y@Jsdlj$(P*6LjW6$A`n%S
z_7fRbqc(WOYq{&Gb%X*=4TiQ`?R$=Q(5kL_-?O^D2J!(|%!A334A2|@sjfE$^vpv*
z09i9~?O4z-Ym#3tX9F0N`1Tw3BC(+6s3=4=F1I@ZwuZJH$^xVF7dZTP%Kt(iAo-3+
zYs~gM%$%#(M2hyxc`q{dez;r`i~8^jiG(|RaOCq+tCOezjFg$)QeUKCp~||b7O=Ux
z#EI%vnP2V)oS1om3>3y6orv|~3XOz@`WLz$R;%xBoYZp}^;w%lKY&R2_Ut{%KGR`8
z*^`y!9|*Q3SFaZ1a)w)aLqe0+x9ftJbkg6-gR2!P3<yIV9UW`5UJRVigClha|GyUC
z211GcJt4@)d3a=uf@gMkgzDv3cEL7LXyH<HV{>qH&``%fs+J9p!)+?)z>@n1Hg2C^
zYh%ji;fvm?3obU?-wZ$dkn7>r&(N-k>6GcLah;8~=d=6knDt-X722ILeg(9s4?fEq
z#b(=&l^y?gon0F~Z_IC=mpjY-6t?y2*Fm8cwQbtwKrGyPiNN_E-}UOY7)sItEc4bz
zldEh0joNJIYe4oc?`}`Az6Otd`VUX8tKqwp@N^EmzZ>8|%vJWVM4A4!H&?tT>^C$s
z`&6axqw!hq@|kTPMPfT&<=l=fw&t0^^Vv1LhlYo}9@fKthS57`vsf-iW(?AOcDCOl
zM3qS3JkhsH8IgH19si7o{`wu{fE-Wc%fesf>$S96(bC{(S!%AW>8|SNsLX#XoqC53
zP1`Q(mSSKwVi5cM0UiDgIrbOT+UD(=vC&2QVdmo)=cT8tXVi0JTL!3(&Pz8rHI4oi
z+0?9~E^T09<0IBSG4Y)Kgr1)Epqu-kTIU$lc7N<`gBmh4ETzxCQzUtDPLXkL+x&KH
z;iZvYk#<18y<do*Q$5|aa9<i6iL*TNPg}|z{5m6|vy(yZOi0P|)l@s|%P-&{z8%3Q
zzI#W2@am_x^2k}j)bgRW3fbhNnTpl{-pr!m_#pjXLGFb|7amXkQt!#Z!64tYk9yw0
zDLGkJQ$~CyPJ4{aZa&`UNYT$5CO*&C=I6}dB3&UNc>UFvc?-=?SbKEZ)89|9-{GuG
zSq<~E`bSn;=56!+j+v~r!9rnf#tv&{J~6>jI01TqK#!O1;obEEA|vft)H!F^Acv5B
zRHL-Mp}K!&WMnP$8^uubOPdrZL+bzZb=FZ;MP0iG1W~#{Qo2hTL^=cn>5}g5Zjmkz
zjdV9icb7CsOLuqoUA*@l-@Sj_aT$)GDDJb**=x@==X`$i*<M<V*ZfyVk!0v&l`GYZ
zyiz8bj<Eu&zeq4KO`vQK+KFpRp97L{8LZA*&lwvK`zV-ms0T#kq7zd6%FAuQJNK2@
z`s}29Tt2=hm2_CT?cwhBs(O$23y)LQ6u+0&bP?SkWU%}Tmu2Zwi>6IW+(tJ1XWr`a
z@{NWchso2n^Fwb_WO!u^vi;1BC~5O$S4busi_Mm-Tu$43e8h#UsY2Lnb`@OV;U&%-
zJ`~EUtRCXFcmLRJJ|C#s*f#uY$ZmhJLTnrrMRh21hMh~w>kMmsl;(N2v`<4nNINvT
zIpLzSf1$LW@zYj3D!nu4*)?R~OkvO5;&yA@rI3MneJg-beDUw!Xx|L9>GC`12n{g^
zS^DTF*Y%=0wzD%cH#1_sdfe;^2>(1+)#*(9oY&OA0KL?9m|V$5tvX|jFz*1#vTp|c
z0IH@YABM^BX49xZPR?&%0^?De^Vas2ui_EOL-*wZa^A930k;j!XG2{J>`b9sd3p4a
zZOmi)j-F3T`wMOMMtxk@FrYz_lg>Z4f9jk&l(yaJA_!{x;t%epPDu+*gQHO)1R;}i
z0n7rP1TC@>V(M>od@h{nUri@fI#;ADe(s%%K?=cJC>=duuKwUSGBWaTzr1{M@v6>Y
z?T=q;bRjmIjr!1EY}B*P^=sBooyoUv$yxCU+%^|SH5R!Hj>xL<IVP-s&6o$OnshR&
z)uw=p^ZO)_b#e+60Zr-XyxgID+f--*vte9mKGA%tpTtES53qAV<2OF4^%>j9h^MMo
z?7aQZLEZHpA*CB5JR*Wf0Lt~ypV`*wd?lW?tHDkQ58iuuM76lK_Uz*6z~We5L9M-d
zmGoolgGzj<>l+D3!IZCyYDh4CZ%fpt;Xyfp?i^DA&WAJdW6!Hs>v;?9iu5+yD``Zk
zaU&xeqj6h(U(Vxg4WF&4s7C5@=y!y*y`CLD8rjD$u|s;;)@TPt*HcG**ze5_kIu$0
z3zRuNx?jVr^@SVvM^kz+qCi!dj8d^N29#VJC6ms+Yg8~EbvWf)v7dSMI>71nw$}OT
z;XHZD&?M(4_s7J(qlP%_sE^1vIHircd~_B>{cgERs>+oveJa*1m($iB#y(kJbP@<S
zEmubPj`dF$=^O4lsNuV*@;7sP7C!3HJZm@kgPYllaYWhRLsBr}&y%bCXHvbblvW&x
z3=#+1Q55a_LGq!NTjQtOQPkgi5|NYXKC5t7M7+KCI^}z~RrU86A|m`$F>m=i;4_RK
zjn_`lo~l+|$bwLg73ZF=w&87^D%Xpd+jbOr+=FYqv;gCoyxtchDd3g}_m+IF*85Vq
z2EiS}KhrOo3~rRa@%v4G$jlFjg(bV~)xw%$VVDJpH2IiLzYKqu!65GG-URCDsRYSc
zxsTUmc{pMF`6z#ohI+@f&O=qX*scT4DBh?;R9S|&dO%~|uWKD2be(5GVe&iYtD`)f
zXX!JDSM&LmrWc)r+~1=&CSSjzH8~$`=#Y4~%jx+1Ie0tn`B?5!Ag^+n=Sg&Sm`}pu
zqQHO>Nv7?7AJdAHuQ^-e^lA`S)@0~MVRt0q{LI>$3-Vv#;?9=ZgI;wb8y!Xtk}2Gg
z2PHCFL%Zpv-X0zvDvuAC0-mSn#n0!;I$;y}&G$V~J5IdDa=}|$AtLfB@#jx70tOZq
zGbSGnXPe_)w4V@*RZBbP8Xk`x{bcj&c6nS+-jh6>i*VZf>z>@LN^+j~C?1i%ke@{H
z-nQjuTv}%t<G$K8pvL+?x^1imsW-c_URg2V?nb?I;D2&QG)N!m--`GgC9tWKbE$Y;
z!=<-8yMTlJDUe^Ry2wiZd-=E{B`tk>mu#cf;?BXt(;y?2GO|HnW4y2-dO%c`I!p=&
zdxsIzFFH_&d9c(NnW{Ohs9J0Sx>*ZO+eG0+d@P!`;EO@6{tW><x{t>;+j*>q-;$V?
z;xPT_M;Uo-oVF5eF+;=a+u?)!Z;L4F;D;aX_RCA|HgRRsKlc1a&kiPFgFp<ZF?iTz
zXVYZ`GZ3+`H|!2pv?EED1}pqMK(o}~>A`I%ohu56ofcWxle4pb&Y7Fr6Lh@$TcSR8
zeV<P-u(F!46Z9+2YiLM9F80}2uY2lU;Bjz0ZgD9uOx<VhntIoWSXfY?dwsNc@UJCV
ztI1hWL!mR6bv>Af-*2ZL0(P@~^u96}m{*XkJgPJM51)CQzGF&U#W<QW*YFapQ_JXT
z=)(Yoyd}@#ADDIicsIKqtEzOiqR7m88>l|>STdBhanh>gdC{v=QTrWr$tV4D4Ao_g
zWXtF4ca34ROiaczWm*SMUO+G<BxR$I5$ezr?e6|SK^6HY)9wdy2#&b}%nV#l09*=x
zlIXu(!@siW?>8Mk=!g7(kc+bbs5wt2>4keK3sKQDVNH^G;kt02?=ZelsW~5$4>cQ&
z`>KtwqnTQp>)&tHcs|eF@37NpyFR%cwca1?7lo&0ZzC=C>|DA>$Hee>KXCU&N5;g)
zidtKvXxo##4nQ`xon-mmMTUpPo0#$QWS^A{whS7CUNN|a4Z}Q$_ZEfQ+&ja()ZEP0
zw1OQ|@kqRplT|S1@BI-V;d?iJGtk4s!<Gy65U!;M__?{c1$LjeT+EG&2N=>B7O_~g
zYR~7_mTHf$h>xs4o?lEbsQrf8-*=%YyhhT}oSdAry*f|_Iuf_n9g>Nnf+UYe{N0_q
za3?$)4LeM_uh0z~N~eG=nzvsEcL=2yWtlJ3Smj7X&Q~ElZ<GMI2CS{kuRoJNJB#Df
zDI@#COQ5}b*FTnMN=8opqJgon{4VbyMx&snKEIq<KIuXgK*J*(sGd7d^6V-hc0%!D
z%qU^lzCKKzt2o6~kV`jw`VLp3<_+S^sTZS$PlgS$mPc${oE<ntpt$@Q7$9S#4?8#@
z#Dcq(%u#rF<$sDu_`^n!Wy$-=)$N}2{7Q`K8mEyTwhTX}|3_tIN@cYEfOIGgt;*Nf
zbZH1#Le|5_&@ile4_6G(RWX%(qo<eoBOm~si0F&0?aAdgha*mWe0;SwZ~kJH=gw(H
z%@b7o?i>PZ{h^yeq>zx7BkD#DF0L4e`!Di)Z<FJz2*aE-N>Ww`-1#=E&y%O<cFGq-
zsK=?XnxJu0(af(uQ&Yb<J9Dbf%>g)EUQJC>ULIXJ4%^jr;OG4fY0Ui!?RCfgf(sYw
zJCL8a{@LivN!-T+dBt9l6y2b-eA+z&GwlZwBTBK@cpL*OqX-{g0dMaoSXfvzd<+?&
zhmn$!{`m3Z4Rf@14nTmxeO2Ln$m@KtAS5P6N!}Z7a5Ec%MD!`}<j;<UH-Gu~tfaFz
z9d#7ZR`;qGAzw9Wg_;Zy2)IUDLkMh|Pu-J*+$fP4L}t)0FE44Z5D*X%X&D%Dz@!q4
z7->&W4^{$}qPqNNWh1z&D->7ve!KG%OIBav58oC(+Ft)$J=hDJ?7=RqLL6Z#lhpba
z@Rse7FhV1sNF$^%4?nI5-zfq^`3py!QSPLYYE}tNeo-YM$PWgJ=qNB~we6XK<;m&!
zIeGgsDrkm3JU*UYU-ylUqN=KPTx$5_{{H>*<=q)<Gog@t5(QIp=#X)62eWe1#s54Z
zg$?*YZg0P5AzvPR*Qjw;$)?c@Xcw}}NxQ!zY2sUy21AJz6f&uuv9yYB-oD+v(Sxxq
zeb+cLHaQ8p<ZwXkz{15<R96R)<*m`?W^6)&qH=CdQ4vC}!si-=&sL?x)D^H?TrMeE
zS`gkQGCRAT&kP;%6uqCx#26rJ8x-Oc@$c<1lH0;46+n)or~d_h$4TQnbHaRlpWT$h
z+z}s{H}!RktaPbtm~637c9FQUVg%SAf9>J;8=Dyg6c-bem6ZXCVRdUOP=-q6h*E?q
z=4HSoKcCvZfe<v3q1V5NW;hfm(M1yR^^Rvt@OZDmnvAAV3NWK4EhMjub=<%OyuZHe
z>tjZ<(ec@6ee(J=ty4Uss8Nzp|JygZ6Gkcw3ya>qUsf(Rryfnf$A^qOJ2))NXz~vv
z9G?Th#pU`_oEwzG<GaQ(1s$Czg~H~IuZ2nlQ|6QA$mS8RBQzGz3db`PrZT4X#>_c@
zAHeUbDli}dO<jRUK%kk@t$%QEP*GJUu|WYcKO6~aR_CiL(7e^NvIz4xke*3wY2mMR
zW@I*&kU*d2WGt1g5H;6!G1M~)sejdjEv?1GqpDimH)~pN`41WSa%;K9onPEw(3wx8
z1|O43W_Z}N1|KT?^(&_ucbPn6M-9e^K=-}<eemJpAxG>u;^Xh_n-!Ex<WG#5nu-=r
z>FVkEDeZ-e(g`udzlTVoh4o10Vx;7b)Yo&9L#k8S#u6Kvn%0kwBGnkI6}|oTas4|4
z0cQ_}iVTg7qmvWlw6%%h;BI5Fa6xJi)Rd3pf-0AywP<%9OA2XR*`W|8a}uYp?-bhj
z0p3<58SC^k<47eVV<}qdM2$vjJP_MWu0c57sm4coEh3#OlP^}RqNrIcQe2kVSP5gK
z49775Ty>-hi;KmM4n@GUh>(yFEGhySFrXq82}DCj_w)A`Nq=;idH+3g-wZ^fg3?m4
zY%_V72yqcDEh2DlTBRu#PqA}x8CaSNXIrzrzeK*AOq=(RDlgB?%!G!@&5mC42tD!0
zy$okhl?|&%U8FL%*#BKuXHgeN3z5{+3JVTy|Mw3eAPWu59fA=hTW9CqP8dr|OIv#k
z1EDY>XGcqU*$TDr(o#l+LM)I-0R<eGpn)q&29eZAt*WZRM2ZtEw{KP5_Oy{TGRnQJ
z6VDdQp2`|G9ouyT8wwO7u~t!6oEomCf%1}j&>K*v9UN%%zR6Xf#i+oeuD~>p3vF!V
z1)@`=3{@8Zi5tE}g2fJ)r`g#zB4jN;ba!5VAej53+1x{X<;W`oJg5X7PF?{XH?>g!
z*vS<Y(e;MEbI8?4c=HXDK_8vVo_tV!sqp^#czIOIWl_x8*%?)uY7E-ySb~~`MUpa3
z(tY|%tP-7A_V|S<AxJa)gpkOhnq`*-02M!J&H<!NewsKz6EvhnD5`*1Z8k^YE}a#3
z>frbG{f8HiDk>^NiLCy}1i+k02_{vD#qm|*5{qMPZ7q;HGG_KY*omS2o<`okcIqF4
z9{R-*_9dC~@~0?Fsu=jmSmR%xsZ&Xjc2Da8Lu6jl*td?3wln%IBs2Mw7q3Jlp-`^E
z<<I{f77GsHprQ|RlsHNnFCP=l7Ye2z^EKl?*&v8iZa6XjuVwH1Qg}+toi`n0$X`Qg
zdvTYwLk2rKKrgXTJ49MAqfI}8LkJckB%aVoNkvr&$VB33sSLI^f!4kXvOL<Zmr~!Z
zuC69$W?Ve8ecL%?vE)-WEfYFrQhAkG9KFK9$4;{uOD-}^Z}&D3<bnY-S(2o=(t6_I
zctUP&JV1Tqr-&1jcsbnP`M{%QE*xmT{Uk}UriHAk+FIka?hwFBHwEQj{O=QVpBMwl
z$Xf$P7?^MBGn8)@6TBi`UZQ0&iw!>lEZ}P?PZ*fTINQ#`oM`i+CM@f{$-;w$hN}NL
zLQ!FF+|nG|@ZY}}78Vwn_X;bGefSogZ>i%ZnF0WU*`dqwGcImQB>L?)l$VbL3Ga9I
zwX<?<bv2d-cvV4$3c_vIgibXzH5PECQHXdaMHK$ekM`8gtYIRh`U)bF;|XDW)<U7i
zYit#Hxn`{_j^7PTp#A8%96=&N_|f$@JjH+C6uwz^;L?1(yy^JcH`OfRdK-|S(6ZZd
zLJo5*u#CPh&wdgFN5IP5R}jpw`Q4XBibR^U!4%+NYx|y#E)*c6mp=_*4oUGEp+j|d
zU}5i2GVkqmU%m~0t2ZPgn8A$K@g{QoGJbAnJe$Y;!W31K!j=bCgiFw_8=_(E!T2eA
zJUA{+xx9z^{aAVkb=u>>v3)&=ZP77J)0?!mmoFD*?FXj2yUomTULF;g`T_q3EKeB<
z2p)^08~OC_-z@C-$VNs+{1i!onlC?2COlajIAY3<0IvB8A&wfF+{gRbnOxiW`1tPb
z?l+~4+Tt&737yPw$DQ%hf8H4fX5yHU2)yvMk<NQ??ou|jJ2F(5AnXZ;fn&gwO^)^S
z_96t9C7>^Tdxgefj&BNZN1DtZSPBJMp~#l)cUcUj<>l0rl(|#K)z$1(378-R)YV;6
z+U4ZsWhv3wfsoYE0S$l+5C8#vvoqKI_6-tRAX|!lsC>rzWJ}K9(8&0$YsG_s=clKu
zKxOqj?ZE|Qm&4v9Z9Ic|=h^0<$LF(sRIn=0=n8asC;G|4G|cVVq3KHs@`+!)K0gk-
z-AcA`y;%(c*aW-=Rouh!^CJmVL_`G03G5zja#74L-T8BKb7SM<^{uQTYHBzLxU69{
za9U9aIFWR8mWgF5d<CDy{Jt|<c3{d0zwLpBzu1{y<lP58I{->u$^e80$U(s-5hd`%
zT~kv7#?v4_e~t~(*0;U{nhrSJ0UEZbL9GR=cVF0X)V^U@gQ=g7SF;8?mkG`e|K{h}
ze4ZXS*BxA3Br?D1vg4b92<=o_RyJbE4F_9BZC;><mHjoN{WU=qF+K~_d+`NhZiu9)
zogM3IkwGuqz1Zw*au6~38E!8lSj4#me|H47ox6wzGc_0oV8<j*8gu*j_`F6XUfAM@
z>F<uFl>XPewYK(m%ME<!fMl_AaXHS}fPtAoQOK#EP`H}MCwJ*>7`6?=W$qmvEg!Z3
zEo`ts>4Bx`tJYh|$)$-+s*jcZ57}ke>w0x#!?FMN<ir*T!T*rR<D}*tZ;i~%`aucR
z_`b%sy~dw1zQow6>FE03JklI!wAC$p6G%w(Ntb=5zyO(Gqq3~uG+3HYdI8urXIqq|
zjj!?XI)a_M7&WSQq8B^F$k4BsJZzfu!0rV$_=FVD6YCltK19gDMXTpL=?L;Uw;`-|
z)Q=}P-0w}{aR3I7y`5Q?XkCD7ZqgF}&#`^&=<CQNmiAJRIbktot?^J%QN^Q(7x%sy
z7?304GBsO%BPJ#;ja4ume!0=pZ-?}!DSMAR>x?~`?~j^FjhW_WXIZ=-ZipfBE2!X8
zX#d?E&E<wE@w5Z;PO6Wi)8n|MP8rc^vOxZiq17lFUsQ5(vKyp6AOH>=_b_tt?VE2l
zp8W}uKNG3_)D0G`XExmcDhTksj=z<gQ~N6`?ZN1W*S&8XQNL#r_%3uZ!lFS{)2Mo2
z%4-BPY~nav=f=cL7&S4DuJ7%cYulLU>5)2Cym|A@7mK#-1krgGnvtJgA%`gNe#Ia4
zca7D%_2Tk!T&k=Kn3uz;>2?U*zyk);x67z+dxRVZfX6bh?Yb;1CL<}b0ieVMG4p-G
zpq;a|hj@~2`{e+4@9CSU_rgE0RZ>4Vg3%3qFrBNWp`mYM6BQLD$1LgYMGgYNz?TJ4
zmJZYL57CfRgem}3f(s-mDJe*Is7A`jzyPv{L>Vf5ef=^OLufyXXjQj3L74Gu8yBL*
zp62rrKJbrVjMQC?7a9t2;<lC6Pg^2;T$crJ%#?j{YDymDrW&Q7%kVB$)<j#WNTHA=
zNd_-Myjp|Nb|fxA4xhkg@sEG`rym`<rVjGlW0m~H{Xe8i^$&k>gcI^a2M3da6W0Fl
z>fj?MCnq-#&+7iZe?$Z_m^lMpT^UB1x3|zvz?~D^W>6p{;vAi>uBj2Di~DsPCrR;L
z(bNxGOhn|BMk!8&xW81caPgEr3m!<5q5hNb+^O#>^xwO*jb@eOt|qSsiDzd5ykhEH
zMi4aUUT%I(O^1yWy_8ffJf2D?F=aA{u8~y$9AgXJ^z^hbKW2z1NUwegXnp$z*7H_&
zsgWp*;oHEnFtAHzE78f*#ewV}gl+ShU%!6gpS#q&oPxEJ7D#tl*t4d9!)bYTW-BpN
zh1&OsQe;_Ki~~YKkfe)HVANqbA|iHUn8;M)5qkv1gW?SZWp=ju;*_sG^tZLO#}{Bn
zz!8}>4cFFK1f$A@THoHzfsZsfRnrnu4A!c9X&_ZLI#j7RvhTQQMp-STjEENFYmryF
zezL{ArtDc0fTAtPZ*3(`trgoXEh#|@qnzcNH2|wZluV2QgVZUWEKbrko_GC#p$8C@
zg-W5ory6{wQRmVGu;mOeTDi^5DQ9Q)boBIvB_;nYx{Q>um6es1l#~>-v?4T0g^S0t
zrp#E`*;iIpg8%ft1=Sd+JgBMP#;e2!r%<SAsISu4cMc5T!%LvM>maA`l2`)FTMm%{
zt!~`k-aEA@Gjr*HbyK*y2>&-!s<?l@p>X-sn5DURx$?w<rEvMg*W#J%8ME<SN7G3<
zuwZ{mrJ_qyyeyElweL+$eBgfl^O4`y#f57h0>1rEO~!nlxXJ-`@NjYR&CN~Ywn$J#
zf)h?rgrQVcj#E;mEi6+}C@slr)Cg&5dBs##CYi&;2q(qRF<!W-2uel<r%(BK7^2&s
zhyY!R6;e@A^HNlfjG*w{@AnDWJ1AoErp5=}@q+Dd%xsDsAAj6z3X~Mp<~6rX+WBJT
zQ;BW+)#mJU*c=>FpvEL5601*BQ~@z;VNo-7`f-6LNyb=3*T&|U6L%Nk8v(en09*2B
zaF863)oW||Qc}|LGzh@{CcC~qF*MY^grW4OTfd#1L*LvKa$yy{0xlP*d2H>@+vj?)
zO;ou=$*2iayMsZ2o6@a@@>}~&i)@&7ey&QnNd8n-nS53e_*E#bTq>%i_$8teqo!!n
zMcIglV`>U?TF7GhPtLDFS=%={0}tjdU|zi%4oXec(xE<<YN$ol`tk)CApj;oSjgM^
z6WDLDuoJ#&Ys=cnqhrT`4^jn`*6Wnly;F;?P?HEls`h!rY&qzC!-|`3>stIz)(+@F
z6IiLpd~zF0Re9p9C9e^|=?e$Gau}IvY}{96b-&6Y3{Zb~dU~CloOI9305FT$v$^HP
zxpjFty}ey<!@j|7pib~PtFRFGXn%Y$t(KFc=HiM<S@;G_1!-t#+DAr+1)iarA7M^o
z?^lj?1A>MSLE-HgOi2{=S*IKif3FbqGb)>_r!q@uvVqP+CiW=~d-G581^^~s`b;Mo
z?>jp?@jkk;0RA&rG@+5|Kmy59BwwNM&&UWBzy}{5JP{DEHs}$)Zs2Bor2z@r$<>wE
z(Rxt+0=!%U>i=#I)w>P6^jS#H8_P6QW(dBBlTQsu710e8fERD9{2p3~5v#nZ6pN#%
zkdske|I!I*_VPSAw_x=Y@`Jv)zsCe;0$fJHDC}XR34$Xk$kxCdNDLsNzzhg&VIkm6
zW8zW+)EG!97+{`-GH-6+SJz2=qjbXTVt5fP_&o4ID5DfZ2*tj|qCKOfWyoL=NM0yG
z3PnWx>2Z$+2yG=L3Uq&XHoy~t5PvsVtNpkP822eiTAD1tnbp<R4ULUrAP^xCT=66D
z1)c>T{J%r)U$1N)h9yLi*xLv+dwSYkUtnm<!lVl4Pkq(+HfxVXOT)~V)m$Ik`JM30
z!NJs$9gUDsSWS&aFEjH;8Xp-M8LU8nDiFokK)fXs@J_+(@28+7+P)}MoaN(2L+6MU
z(i3@ughEcko&xkf3I#ngX`dcl(~S3A$qy+qXH{(dqa*LhFWE!Ce-suG4k7rIvT9e+
z-P41Pi#vmhX?z!zX<=?o2CB{%Dst;U9SlEr?M~#&V`06&zM_234ZG~C``|Bpf{M^9
zz=CI^^9(%`#Kgi<SXLwoNf!~a<`lc-!NS>4NKE)*?TjO<&nho3-`y>WNrWv1=6pl~
zk<g9XwFIrK82j`LLb0Hrhz4Gs5fDjau-xi(z-Q~*1&>N<Z?7*YL#QXBk4MNK9$b(K
zT7^UcGP;5waK$7!2VSsI_e=7B0b<{Vp$W#jcRfGet|zg0e*{DEB234pACCz{W)>D?
zfIqQB6!GRCNH*ao`yaqgJV(Jq7#>ycs~UxWC)t~@U<w*T7L-my7(Z_*5P-x&JuCl?
zM8_nF%No=1yep(Rb2vS{H0lmU4}Zu13$&pyadBN1Wx~y@t+#GY*DaSS0~j@Hqf<P;
z3w2~75n#*7ESTy`^sH|(S}u6BWX|kz$9Tpneh%V^a}1uKjy{QXv+t@VNaS&N{r2r!
ze%7TKzChXHsY>7;08B&wWOfDdq&X78OGsoHNT8v!rR>b2|3D29+Ou~PumdGL91yKi
zhS(KkQ{RI=pMoqEBq4ctr33w?OunfwNc>=g0H|{>M)SJNnf<wXJ8~ey8P3;Q&GPYL
z2)N;&#^kZ;AHa&rrfSMC+CGjMvPU~#VFg_stc;}{=A`lu&)&Ei52ti|heHIW*E^A>
z?!99i?CiEXW27$+2Dm!p<96GlK!>m*5%9zp=#hsIa(*iqe*4V@2uz@jy>d{v{^GZ1
z5Of7vP2!!CupqZf1SYe-1jiPZ|2dI|lXaiDdc9X7SwXCy>|SH$ElKLys_BGLv$TJm
zQF3ryX1Y3F>P<V;3=R)9oU^K{Fdfe-9*;O;bEJz4b=sdkJugx|SOR7?zJlVB$wPna
zV&1VDH-AmWM5_-5DvH8r%Epf0@@L)~KI)iA41AnkF#W4muL})AkQbwV6BZ86*(j>O
z#(sIL_|bk}1Q+v0;M_T+AFeF|W>G}Mi^#*p+GxH}nebmz*pF`5G}i|^D!H_UDG9CA
zOwfLMQIQ^+&9Obam%C2JPi0bB6GA48SGJDaa-*=(>X}&CCxLoH!dF*fa9xY+I@qFK
zZ%Z16yZp~4Tw6f_!=~jCMU&IU_%0=Yq1A)ZUl{(nMh#|$TO;C^lYq~t+_GnAaWSHg
z``KF@W^GGnfmvvE)oNi*V4?$0;`zqs8LIW^NJ3n$A%rn#;^w4@W1(_Gw&RZzWL0S7
zV79q-alhheZBYA|*)cXUvh14Oi^xY}_TL;PxbV!)x9IaR_O2()<@Qu;>8u9ppHny^
zK*uI&QT&n<<bn*^_5^IkBb{vT!!Pe;&ky#GuZtjIBn$=<<<I-4u6G_hyU2I*d=d<h
zO3NORl6jBN`D34Gm!;>QiJ4tDhjq)m*saom*3VCmGU=@T^4WbER@Ey(!}qt~G>5c2
z`#4x38(myFYspc|hZd|%s}m$Mm|X7PbizmlkK@qkEi8IvWmayvp8B^$%)&n>4jafl
zB>g_I{q(efS=Du%_9C*)XnUmY?BE^b5|`ZaCvBoWzB5s+(++8C+AZf@THYx?CX}Y9
z$1oY$Oy=NgIQJ8<+g`k8x!+2rWn^setRMN<Tv8H#i-_~V<_RV+;*0L!s$-h#>haAT
zymQdOW8g*XgcqZ5ayYR-ZV!5uVEP2EQFq5U1Wx*Rb^B1l^(?pU_HOx^^aI^5(2~D2
zZRSml<Z-ak1OD^3&WqN>9!DH0-O<DmRpe#U(4sz5r%&QOKHD!X7_Sjw??opV+;Tzj
zaKfGtOzM9vZ6YGq^EPehL~K});*=T>*@~N^IPNQmPSvo5x4zICjd+kdi<>EwkJ}CL
zWKn$ShofdnzqU^el~a$(*hWaGvG%6NBPd<VZH_1}_il`fw!zk{B-CUPzP9Vbb0XpT
z=nqMfqcpAvObOIq=>ojnso=P4Pq_|wM0*`6pS!q|920?Lse8B65l%w3-5{Yl=Goy)
z)S$k*;3Q3U>TfiZ#2&uvGe4Pmrac>xQKWLVhDo3F$(;q0%&XquNGXzd!Ju^pusS7e
zi7k9}zeYLUMU;*pqsCV5&OCn*(4#<QNVbq2j2yPOoft3*M^1p?;SS-FG|x#z9)v3$
z>F@@H$hU@vovf8<V(`SIOy&)#Mvn|`%9;Ev1G1PLeFCd@aLTDjv)f6e8`g$#-MfT-
z!?oMKBZF~dgRuh5TCH80ws|`87GRtKXFyGLvbkqf;(DNNt=0TP;Q6+Ycy~mJE-pMG
zs?Tt}eOthaO82W|U7sB*(WZc4sdiublZ{!jQFV6ZvdWWFUW#_v!Z0C0{~k#z=kooz
ziw@d8^VZGk<Cep5>lwo}v(?;AJ)8UV)N^jOy+=jsvYRvv^W*N5iXBiGgD-I%F4~U;
z_g!Qq+^6Ip_(S}&$>o|)cu^m2%PA;i4FG3rwdA5MQs;cAfy1ocIe6?fg2~*xWbzs%
zqgt&4F>1N*QSM`3Yb=@fKlh*bM%c$KcMMSH@e9LOUn~k*bmeLRda|;+IlObK$cyyc
zkGg+yin{Scoo;ZRi3O$Y`S59yL&|&3Ej+cqVdz)ekNbp?%#wOED0&O}*2jZa#O`}y
z-h99O66#1sKQ*Up7zEuc$G`HtSj4X_(-}@9()5i_*k7l|S!X(5t20pd1mm=vB~Q?b
zxY|lS8V%vmSum|yO)*4$RY~6GFfW%aoM}?Y%JT5$=p41-aVf~{U`}<&>~==8oW-VJ
z>p*H`y|piGb=^gql8=0f@W{r;8%os$mGeNL>nevZu)F*8CbXv%={7E}D*Itq=3lzU
zh4$WsyZ1lmL?@4EATpgyzH%9x_AEwydV<N9BV3IknNC`ic8XoLii5PS1txEuwpj(u
zw(h$e)t{GfPPpcR1Rsato220ap0?XDqUE8xw`R`BhCsVd>qD>`z!0`W7B~lYHtV^c
zc{OF3RgZdQfBhRMAmXnN8tZ@nEpW#3XttvzJoy9iPD+~7rO$4`f_BMqm9_fNkre?e
z{`1b$Qmr?K_EKv&9^Wa(JKn#=k!#1u#>1LJ$?2YbR?-QOR4=p5S}hS(C8ciuYliJb
zW*_~7?jOY1m23q?aiEMP2Q57?s+6=46xDhk(AIj%3dJ>&7L=QdJ<nCj8Z=k?glo)P
zk1Q=ch|;AKPR1Mr?x(ZK<)zMHk-*YYBE<NmE|9;0t1|AXvo_Qqib51Q*%MbdVFF~X
zl?oG`p1G+AJ@Vca5<D4iYaFP;e7TH2gR89)X}zGZni}?xixQaM#diY=XdmkF_PB|*
zIMsCr@TH$Wa)Sa{8x!(hO$`k+E_Xrz+zHM8G(Eos$Ho+(t;j95oU<<}DeWJY;?jBc
zemriz>PV1G)dFQ(qR0N>3sOd_Q0@K{m-BKlX%26B)Bzcr9F+D%|H&J=-tCX;W4g}i
z#I%3H<e1OHok4AhR!_cwb^EZ$YsXJ*_n0qe+S$5zv@FH>u1UJnyo1l}Ca#p!;O)82
z^SDK;K3{SAgz=*A!-g4msHj!^c-dHz{XhAJu=GSzPDhZ$QxN^@tMnk*n(e?5$(Jww
zBg5BqL(7$zJ_kv2+Vt6#X=qVfwn^bn*Jw%W@_634TWa*?sM=y|HH43fyeJab9WJ=}
zyx_j=^>AC551NCE+8I7x53F1ZAJf6dc~M}SN=e2WZ$wZ05;oru5%z;SP%?!l0pw#)
zAjAFuD6#412Y!GdW|!myv-S76UOqDOVn6AR5aiEc>N7Rqa8e9BJa*bif$|)q(19Ml
z8c;nzw1c9dXM$<(6ZqrF|DJpD!K-hp=D}_AaBJDd>yAH!ZTpuG?$$O88s1-b(lVc~
zZvbjwm6y#g+{Jw8j@T@S1GFnkE33ltVzzWXyA3EEuM1AlUznVk`eosGdFfP|HX+YD
zpY@+B68ex5zwFnM5MgrP%VD`(9oXh`!?D!*v~`|3eEbyn5~|wHn3(zPn6Jyf&Dr_N
zo-AH3JM3#+8yGDf?Pt#KmUwH=2K-ZbcZiTmn@<$ibWiN@8Yp?8&4d^3jQSz5-AN8^
z>jBiJ1?A+sW1pIvy)+rqjwMH#a<ZRut2VEMy%HMhKUfd2d(YPgo+{c<2vCO&O|muL
zmfJA9iGzT-d|}+rkILeu#El>EI%Fg2bi-NtENQ|dk;Or%{LPGdn&;{9!l_S`t?som
z%F$fM;(7jQd(5cAsJ|Qx%W-W}z10>hD8puJjEE|-*G`e&>^a^bR(w>AS&U0@3E6fG
zLp0~do$+O0s>)X%WLkjoab(k)J>+uMhbgWlVSSFjzp1%R3A32X+u9nOZchG{%*10d
z)6297pjf^?O#go<c0B22(SIT8c39gHqFQDNi+Vcc>XmC5KlqbTb-PINj@OeN%wn6?
zXmqa?yA1sVKH%S*f*kz~wXz*<mus3$ix1NC={Kue?6)c6(fBQ4!R;wgEYJGEn+)Km
z{=($kPHQxMD2GN1aHTx;&1p3~n@<TN@$+Gqk9oJ!uD69jpeFq7^hlSrE?)bg9d{y4
z`;w~#BAE&*Nq}IWVP6JiTB%}?=;&a%S)p!R!vzMq4@ifd{_Ia`x<Pq5?RWWjmymF~
zJ3l&n4L~GvGIPB7>2l-!JDtQTQ}u*Soj<quYASc?AOdI-sWuAbAEeAzWqtp6-cWKO
zaJMBUt1sLclo%D((x1W{+>qqs=m26df_>Exhn59_CPQh-P^qNv_mmR)=xbpGIch~6
z)j_W)egooSey<19<ZI{Hk=h*^A6}{ZTYM9Vbq=4qeS+rGaV~D|(3kf%wCzFG<`JeZ
z_K8eFzV0v{O!x_jxqYttSX||(EHIx{Y}CfKS<S|aD?kfbmq4-IXeSm=BUle5;E&Al
z_xQ}~T9~<yK(yZz7dIag!Uo0dtcyB7{oFZ>7+>qA^PiQMS1~T=q&!7=)cG%Nqt!$8
zWTGxzURz^fz0)ZW?79DCaTlWT{)fc<%nz2_&2pPS_Is|F?xZ?L+Gc-$@>`yyNt)u5
zD@0xWPRAv;O?80gntj0MakoXS>XV3Zrn(LNi$=r;!{s9P$?MoDHf|GZYx``ssobeC
zjE06HWqdvVWK}>rtFk$^@t;QP?Tr@Q;9$L*UYLAcbv4C%nje?N-h$aG@;QIDt5BEP
zdwZ`!4L?OC$PG%bf}IO5BI01KH7TO)3D?)$XcIg4yoXxFe!e6gS484=LjK<?f01__
z)*p`Bo<4#TeR<^pHdKd+`T~_2M|ygC%fkb=^L3lKCWm6T-V__bulZ;9oge<HhSf25
z8-6(LSk}?)X`yel`e=2OlB|9`;j(yEGV)jbv6V2D_8xajXL76_WzfvT(fS}qRF;xx
zZKJ|JJluwMv`Zpt9l%ZU8`~e~ycH6j!pe5UOa>2oK(iOZZNaqc^+ZY;0Jp&6;hlW#
zl%uMO?;}@X^=KX_iXuc6Q^UJlmPzo*lN)vE847jT4iSJr{7kwMfHz~6R{i+rC26{O
zW3xpa-fe2R5$B?b+Buro^rlpNxH@^O=HF62+bS-D<_Jij)Lgsp0N(6&yEqCWcu%SW
zW-!S?55cHFe=0o*IT`O&=wDp}gF%Vq=TN{*sjp|btz0!QG<(6x>c8!kWrFhle-gVG
zSZ6_D1tvNkQ2;T?Lq=Ua-K=}5iNH3+{w_k5f~&eZ{@ClnOxyd8luGQrVl{!pZM%vD
zk8AUFnuZ%6{PjV7k)t!!%i1qK_KD1w8Tp$`Rp~1JQS8>O`TRD@>PQ_A3u9!0xoudJ
zng5H5`ykT5$i{V#Q4X`2wfS1ac6vrp_0NRot2%3sBd_a433+c63!l5z`LsFo)T!gh
zoq_|MM4yO=UfH;b$N{a5F>b)rrD-qKd$>cR@zJFLv*f@CJO}0ZaHlPwhQHU7{}(!Z
z&|6EitL)N7T^{>aAC9E?3C5=Nw3l**_rmG6uB~M#h{UT~N82mvN0NiP%%7vI=IX>`
zYNX9&3m4FGDk<-2Fb8_59W=($(}lpRwP)NNBEaIi?#f*om{@fLUhdmE9cqt?g2`4g
zQc_5q+^5m+MuSb4b1*QAUqFT;$Iupculhvdb34d}t8+9vv#IlZM<(!i-1cyOJbJoP
z$>a5x@DT7NuRuR8&BGDyGzPQ$E&0r>>B>O^+}zCfFb=<B3FXp_bl^mlTSaAiK148g
zet%@mWe+71gkrSZ+VXI-8Pt5c76ZDMP5da(en-07@s|rtrmvZsPrhl2qwM4${{Ha;
z_QT(aB>wf+#0?hE*Nne9Mi}?`IAY4cpxgv%A|EXd*wUF>9zO%Rmhs?Uqu(ZCKAUl;
zlD<Ubp@kjn-A_>CXnWo10TMq?TdSi`k=hNYw7-u!D4_t=PRQpDtL#RKh#^toG2crZ
z2Ka^ImmBluOw;W+&P1)w8Tq<QZTzT3Ybg&X3~A3#*KN($Pxq6P1t4<EVwf!crDysM
z3#3qRSv_1Vjn|n4qLb_cJ&v0af`~oQbe5Nvt6d-OE<ZkX$NXu2RC_v6L?U5poiRc~
z^Nn9EBx$=#tN~AS0e&o<Y;pn->zjQ-<<<g?%RbMkHf@iQpvM9bJr<`eLQqOuaj*&t
z3TB)GV*Dk}XlYK{U$krYh7%3`osa)**dHAk+t6obYPzx>C9u_UEg-md&>8JP{L)h?
za~Ci76*Q6LaY_L%i3`qjbGj$Y?Ww`!EfUg!%-GSKUUNkS1QgStr88Bc*@ROunIykX
z#b&=iAs(4Z6V40-ND(j#!Pftokne=A59NsT^5S!^9NuVF0AdoK3lnf3@?u=01X37K
zkh}PfTP0*=Q9yD%3c5NJbk3sX4M>>vp9*N`_2vV0W^0d3KxB2@>40x|eu~qY3OizT
z#MNiV2NsdQtoX?A{)!0LTEz;H>V=1=%N!KAW(6X1-Q!}R)h`v47gHV{(8`hsNd3*^
zPvN$IfyweHsiJ?f#DQV$^@D{crQ@ew&>p>A?IXE8_IVBp$fe{O(QeNnFh)lwnm@+<
zhj<}3AQd{>cF$F7qxNNQH)g2O3`g3gDFQHv=$iBNd;B}zA}*{zGb7}-^(EqSsq}e<
zmZbs*-;<jBjSljD*_Yo$`?RMtFag*g30jp6bMI34-BKnM`*=Lg@aB?sf4~N@xDVlB
z<jDd=61w5r(oB{%2USeSE8rB}_Wao0`-K3=J>jW|?X#aJ@c3AvaqFIDK49;Vuyf)|
zesT^5b5#zeqs~&H2%jZobjLdbhLYIe$ES{eO`HcF=>rW8Xaw7!=}9QfD+}6L)N)ko
zySqIZzdK+9kc_|1>XKy{yhT8<aHs%R-bW-`1p>OL)+)SiNoHV{<Fos~I{?iEqDC2P
z1f##0`vG6d%RlzMPv9YpuQh8e^(MB431@wLeKUkWA9ZwW)gYJ%J4)tgVulRi0v+IS
zCecy$XJ7~%>@<_721p3R-Qn-p5?Q@?fp1(NaNXg{KJXHm!EtX%0~Rr0^m#a`%7o_y
z?;T0WR4J#X@MIxfh1|S;y^hQM=DGc)ef<L`L$G|pkX=FJTQC_jftWW_XtO1P{f9p?
z(n9$YA6#u=f!B7os02DDCNM5x2gY1pjLzwbs;YgU5j@vqLvnw0ynWIkBAJpJLc|mQ
z`%flPB;mkHL1r-J-&P#ujASrY(%&yh&cDh2jy9h=*)ul08Y>Vf#Bi<qtqh((+Ua`V
zb#>YWs>lp6(9?iq9|){-KCrR%4-Jq3fkZd}24HwqY&yrjLaz6B<kwdsNBaQIOJJd4
zvK0dY*gz;EEiF?{N&QbUG2#HXIhr$j8l?^LI9^N)j2E?FRZkC?_5&MS5rECA2p@~&
z1IM2=a8&`^^K-pV&X(*Jwvd(<FvK8!hmVo6A|VhBWdO4B4*qJ-SqMf|R$1&FSY{hW
zMn99>1BWIR4Rdl=4iATa>s5r~5%&RF=N+4|Ox;1{INV)brUfdX3IRx{zKx`#qQdD0
zcZ;>LsR#gI|4itH1^9+25-^_C?D=>aeZR(Z-l<5{H{6A(>LRE2`+--aSYA<CKCtpX
zk`BmJY3XTmvT}l>*Mz}xG&3#e>+6FT5byyq+FRteRKN}gm@5d2h(M$QR3zla0G<yX
z81-3JcB?zYa3nA1ClFtpYNFdSbiWICo|0fm>DuD8g2#^Cz$HFPAzTo<r^bWivL^rz
zw3o8~3|sD&jrM0X6ovrLl0c+)!Uw-I!CXED0YO+;n6yq9KMS&!1dyV!5C9AY2PR;v
zJymIF=;-pAo5TM`D*zVL&f&U!Q86%ICNivv`sf2snKf~JedFrdR%BHefda1Tw{MHT
zYnmLNIsIC58w%e7B-mUTXqZxy98;iAprjlt56Vc81MU?e(9sVRFfivA_6Iiwy^ydC
z3AoVE(6F#K>&MIXKw4Yd+@w_Uy+a40_{D{zf}-MQAlxxBrUH*7Al$LyN8G@{uI-Zq
zCzJ~;dHcD#yRGkTMg+-3<_}4a%`=SwMZ`&2n(}vLR!Zn!eel`RFe-diNR)$+k)*1G
zMU^xA`3e093Sc#qgax}5SUu~<$IEsUUR^b2JG}nd<@p5#!N5EU=&Imx4A~_m;cL+f
zMZgzASw&u}G^eN%p+*CEk-RZcRsFWOVCU@AHP?d-QTv`P8LqY$u140=|2aHH?Yks{
z*)0>~y?ykzX||h7SuHC@-co#^uF4jR<tt}T6^xs)1IE=+1G$Em(Y^Gw@-UBqisF|q
zPS`+P<>uyI+uI5(E~W<(wX17AIZ#^T!C>7c<8n(2q~Flh-TlhR9<C8GFdzk<%Jye;
z6gVLOT@xViVKfX3S>T)pLhZkO(*ng1q`$?^A%WD%uB&Ib>ziL(WBuB}nt9ozwuJ~W
zh&V;~lpF(6N>fq}Jzs&$TUsQpE-$Vu#semqz#G;zF^MWqXV%uX_w@35hlM2xhI?MH
zR&b5Bx4F=ocFJ``X0U-)E|nV%;LTX6+*=PPCk{~T)@b-km5OJpWKWxZEuJcvqGLBl
z)+i0^?G*=-_U!CGvN&D?3zMK0|5s!XJOVyVQGhla9#m9R^?fGmfI$SJG<aO1fgjwO
z!=lmjH0RbAxkDmC%~D!B3~8o$40P#~RWi!5iG3FQ`DJ3s{Hed5)<MRA%2LUGoiVNp
z9(iFD_6rE5Ad?z=#OKJ{GTz$*9yv%a@GkNt`{YdaM3EUgd)ACuVd>Pw>};@x@+)5e
z7psv8G2j5K2_i}HU%0rj5wOMpZ}~6A4QxbjJ#;(}(RbSLkX{2jF>sG$RaeIXi@Kts
zqJkm?h1`;?=H||l(WxmZ&<lAfSMBYE0Z5L)vr2(Ojv;Nwt6B&KGldwOtaB5#=_~a^
zumG6Fz*uT)Zh$oK@84_qagyY9d;;XjsXgX~^32SRW;e@H?I-~GgEbTp@w%#YYG&&1
z?3k}gcAiRkwo1NG`Ap`F`IuRaDZ9BNFXJ$9FKcXA-`WC73jxR=>YJL#&o9~+7m4KL
z<UBn+e-3Wm+}=9PZ?!xkb&OrU1{*RvJ3FwD69E(q_y!d8FL1*DkU3Jhow_U;6T47j
z=1%OKocb_IMfe~Gj`$CsGq&bZ4Iua78>GNMP9xSNrV1D17t*43{I0sPQkV<^1z3fs
z?Ce)ivSh5awTu(KTHmyOLxBbldWdLnk3RSVKwxL*=hs(Oe3j^c=MfG7lqD%TM@Fm#
z86$D(YsdF50k95GAOPsZNf|wrj++i`BS%E+RP*A$oC31A0VaM#U|wGQDB}2TH6HUn
z_)31FSjn7Hx?*7C1P-0-1m+`AAlYv;H8oRGG%h6U%f9abR^o{XCu}&b%bVrXGzl8O
zMZs4)$Cti)0D!)HAsNDoP`?LXwqFd8o9AYP|MRzRF3^;pQSH?({U!DTsKK+~p+1Yr
Kik1oMe*a%C^+<C7

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 03006a6e5b..4101dfac81 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -308,8 +308,8 @@ In that case, this information is persisted at runtime in each application manif
 
 ## Filesystem Layout Assumptions
 
-The following paths are reserved for the stage1 image, and they will be created during stage0.
-When creating a stage1 image, developers SHOULD NOT create or use these paths in the image's filesystem.
+The following paths are reserved for the stage1 image, and they will be populated at runtime.
+When creating a stage1 image, developers SHOULD NOT use these paths to store content in the image's filesystem.
 
 ### stage2
 
@@ -342,4 +342,13 @@ For example, environment variables for an app named `foo` will be stored in `rkt
 This directory path is used for TTY and streaming attach helper.
 When attach mode is enabled each application will have a `rkt/iottymux/$appname/` directory, used by the I/O and TTY mux sidecar.
 
+### supervisor-status (experimental v5)
+
+`rkt/supervisor-status`
+
+This path is used by the pod supervisor to signal its readiness.
+Once the supervisor in the pod has reached its ready state, it MUST write a `rkt/supervisor-status -> ready` symlink.
+A symlink missing or pointing to a different target means that the pod supervisor is not ready.
+
+
 [rkt-networking]: ../networking/overview.md
diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index e7e764b207..cda97ff8cd 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -1040,6 +1040,24 @@ func (p *Pod) Pid() (int, error) {
 	}
 }
 
+// IsSupervisorReady checks if the pod supervisor (typically systemd-pid1)
+// has reached its ready state. All errors are handled as non-readiness.
+func (p *Pod) IsSupervisorReady() bool {
+	s1rootfs, err := p.Stage1RootfsPath()
+	if err != nil {
+		return false
+	}
+	target, err := os.Readlink(filepath.Join(s1rootfs, "/rkt/supervisor-status"))
+	if err != nil {
+		return false
+	}
+	if target == "ready" {
+		return true
+	}
+
+	return false
+}
+
 // ContainerPid1 returns the pid of the process with pid 1 in the pod.
 func (p *Pod) ContainerPid1() (pid int, err error) {
 	// rkt supports two methods to find the container's PID 1: the pid
diff --git a/rkt/app_add.go b/rkt/app_add.go
index 08b36ead87..bc9e15dc12 100644
--- a/rkt/app_add.go
+++ b/rkt/app_add.go
@@ -53,42 +53,47 @@ func init() {
 func runAppAdd(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) < 2 {
 		stderr.Print("must provide the pod UUID and an IMAGEID")
-		return 1
+		return 254
 	}
 
 	err := parseApps(&rktApps, args[1:], cmd.Flags(), true)
 	if err != nil {
 		stderr.PrintE("error parsing app image arguments", err)
-		return 1
+		return 254
 	}
 
 	if rktApps.Count() > 1 {
 		stderr.Print("must give only one app")
-		return 1
+		return 254
 	}
 
 	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
-		return 1
+		return 254
 	}
 	defer p.Close()
 
 	if p.State() != pkgPod.Running {
 		stderr.Printf("pod %q isn't currently running", p.UUID)
-		return 1
+		return 254
+	}
+
+	if !p.IsSupervisorReady() {
+		stderr.Printf("supervisor for pod %q is not yet ready", p.UUID)
+		return 254
 	}
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
 		stderr.PrintE("cannot open store", err)
-		return 1
+		return 254
 	}
 
 	ts, err := treestore.NewStore(treeStoreDir(), s)
 	if err != nil {
 		stderr.PrintE("cannot open treestore", err)
-		return 1
+		return 254
 	}
 
 	fn := &image.Finder{
@@ -103,13 +108,13 @@ func runAppAdd(cmd *cobra.Command, args []string) (exit int) {
 	img, err := fn.FindImage(args[1], "")
 	if err != nil {
 		stderr.PrintE("error finding images", err)
-		return 1
+		return 254
 	}
 
 	podPID, err := p.ContainerPid1()
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
-		return 1
+		return 254
 	}
 
 	ccfg := stage0.CommonConfig{
@@ -138,7 +143,7 @@ func runAppAdd(cmd *cobra.Command, args []string) (exit int) {
 	err = stage0.AddApp(cfg)
 	if err != nil {
 		stderr.PrintE("error adding app to pod", err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/rkt/app_rm.go b/rkt/app_rm.go
index 4bb5c2cdc6..82569a9216 100644
--- a/rkt/app_rm.go
+++ b/rkt/app_rm.go
@@ -41,18 +41,18 @@ func init() {
 func runAppRm(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) < 1 {
 		stderr.Print("must provide the pod UUID")
-		return 1
+		return 254
 	}
 
 	if flagAppName == "" {
 		stderr.Print("must provide the app to remove")
-		return 1
+		return 254
 	}
 
 	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
-		return 1
+		return 254
 	}
 	defer p.Close()
 
@@ -61,13 +61,20 @@ func runAppRm(cmd *cobra.Command, args []string) (exit int) {
 		stderr.PrintE("invalid app name", err)
 	}
 
-	podPID := -1
-	if p.State() == pkgPod.Running {
-		podPID, err = p.ContainerPid1()
-		if err != nil {
-			stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
-			return 1
-		}
+	if p.State() != pkgPod.Running {
+		stderr.Printf("pod %q is not running", p.UUID)
+		return 254
+	}
+
+	if !p.IsSupervisorReady() {
+		stderr.Printf("supervisor for pod %q is not ready yet", p.UUID)
+		return 254
+	}
+
+	podPID, err := p.ContainerPid1()
+	if err != nil {
+		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
+		return 254
 	}
 
 	ccfg := stage0.CommonConfig{
@@ -86,7 +93,7 @@ func runAppRm(cmd *cobra.Command, args []string) (exit int) {
 	err = stage0.RmApp(cfg)
 	if err != nil {
 		stderr.PrintE("error removing app", err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/rkt/app_start.go b/rkt/app_start.go
index 4c81efe712..16d4d92179 100644
--- a/rkt/app_start.go
+++ b/rkt/app_start.go
@@ -43,35 +43,41 @@ func init() {
 func runAppStart(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) < 1 {
 		stderr.Print("must provide the pod UUID")
-		return 1
+		return 254
 	}
 
 	if flagAppName == "" {
 		stderr.Print("must provide the app to start")
-		return 1
+		return 254
 	}
 
 	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
-		return 1
+		return 254
 	}
 	defer p.Close()
 
 	if p.State() != pkgPod.Running {
 		stderr.Printf("pod %q isn't currently running", p.UUID)
-		return 1
+		return 254
+	}
+
+	if !p.IsSupervisorReady() {
+		stderr.Printf("supervisor for pod %q is not yet ready", p.UUID)
+		return 254
 	}
 
 	appName, err := types.NewACName(flagAppName)
 	if err != nil {
 		stderr.PrintE("invalid app name", err)
+		return 254
 	}
 
 	podPID, err := p.ContainerPid1()
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
-		return 1
+		return 254
 	}
 
 	cfg := stage0.CommonConfig{
@@ -89,7 +95,7 @@ func runAppStart(cmd *cobra.Command, args []string) (exit int) {
 	err = stage0.StartApp(scfg)
 	if err != nil {
 		stderr.PrintE("error starting app", err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/rkt/app_stop.go b/rkt/app_stop.go
index ae3c66e799..a57875651e 100644
--- a/rkt/app_stop.go
+++ b/rkt/app_stop.go
@@ -41,18 +41,24 @@ func init() {
 func runAppStop(cmd *cobra.Command, args []string) (exit int) {
 	if len(args) < 1 {
 		stderr.Print("must provide the pod UUID")
-		return 1
+		return 254
 	}
 
 	if flagAppName == "" {
 		stderr.Print("must provide the app to remove")
-		return 1
+		return 254
+	}
+
+	appName, err := types.NewACName(flagAppName)
+	if err != nil {
+		stderr.PrintE("invalid app name", err)
+		return 254
 	}
 
 	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
-		return 1
+		return 254
 	}
 	defer p.Close()
 
@@ -63,18 +69,18 @@ func runAppStop(cmd *cobra.Command, args []string) (exit int) {
 
 	if p.State() != pkgPod.Running {
 		stderr.Printf("pod %q isn't currently running", p.UUID)
-		return 1
+		return 254
 	}
 
-	appName, err := types.NewACName(flagAppName)
-	if err != nil {
-		stderr.PrintE("invalid app name", err)
+	if !p.IsSupervisorReady() {
+		stderr.Printf("supervisor for pod %q is not yet ready", p.UUID)
+		return 254
 	}
 
 	podPID, err := p.ContainerPid1()
 	if err != nil {
 		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
-		return 1
+		return 254
 	}
 
 	cfg := stage0.CommonConfig{
@@ -92,7 +98,7 @@ func runAppStop(cmd *cobra.Command, args []string) (exit int) {
 	err = stage0.StopApp(scfg)
 	if err != nil {
 		stderr.PrintE("error stopping app", err)
-		return 1
+		return 254
 	}
 
 	return 0
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 7bab1a3119..b192bd8883 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -50,6 +50,8 @@ func MutableEnv(p *stage1commontypes.Pod) error {
 		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
 		unit.NewUnitOption("Unit", "Requires", "systemd-journald.service"),
 		unit.NewUnitOption("Unit", "After", "systemd-journald.service"),
+		unit.NewUnitOption("Unit", "Wants", "supervisor-ready.service"),
+		unit.NewUnitOption("Unit", "Before", "supervisor-ready.service"),
 		unit.NewUnitOption("Unit", "Before", "halt.target"),
 		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
 	)
@@ -95,6 +97,8 @@ func ImmutableEnv(p *stage1commontypes.Pod, interactive bool, privateUsers strin
 	opts := []*unit.UnitOption{
 		unit.NewUnitOption("Unit", "Description", "rkt apps target"),
 		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Unit", "Wants", "supervisor-ready.service"),
+		unit.NewUnitOption("Unit", "Before", "supervisor-ready.service"),
 	}
 
 	for i := range p.Manifest.Apps {
diff --git a/stage1/units/units/supervisor-ready.service b/stage1/units/units/supervisor-ready.service
new file mode 100644
index 0000000000..1a225ff86a
--- /dev/null
+++ b/stage1/units/units/supervisor-ready.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=rkt supervisor-ready signaling
+DefaultDependencies=no
+Requires=default.target
+Before=halt.target
+Conflicts=halt.target
+
+[Service]
+Type=oneshot
+Restart=no
+ExecStart=/bin/bash -c "systemd-tmpfiles --create  <(echo L+ /rkt/supervisor-status - - - - ready)"
+ExecStop=/bin/bash -c "systemd-tmpfiles --remove  <(echo R /rkt/supervisor-status)"
\ No newline at end of file
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index 5f304525d9..dde9a89a01 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -53,9 +53,10 @@ func TestAppSandboxSmoke(t *testing.T) {
 	}
 
 	tmpDir := createTempDirOrPanic("rkt-test-cri-")
+	uuidFile := filepath.Join(tmpDir, "uuid")
 	defer os.RemoveAll(tmpDir)
 
-	rktCmd := fmt.Sprintf("%s app sandbox --debug --uuid-file-save=%s/uuid", ctx.Cmd(), tmpDir)
+	rktCmd := fmt.Sprintf("%s app sandbox --uuid-file-save=%s", ctx.Cmd(), uuidFile)
 	err = os.Setenv("RKT_EXPERIMENT_APP", "true")
 	if err != nil {
 		panic(err)
@@ -66,16 +67,33 @@ func TestAppSandboxSmoke(t *testing.T) {
 		panic(err)
 	}
 
-	expected := "Reached target rkt apps target."
-	if err := expectTimeoutWithOutput(child, expected, actionTimeout); err != nil {
-		t.Fatalf("Expected %q but not found: %v", expected, err)
+	// wait for the sandbox to start
+	var podUUID []byte
+	for i := 0; i < 20; i++ {
+		time.Sleep(500 * time.Millisecond)
+		podUUID, err = ioutil.ReadFile(uuidFile)
+		if err == nil {
+			break
+		}
 	}
-
-	podUUID, err := ioutil.ReadFile(filepath.Join(tmpDir, "uuid"))
 	if err != nil {
 		t.Fatalf("Can't read pod UUID: %v", err)
 	}
 
+	// wait for the pod supervisor to be ready
+	podReadyFile := filepath.Join(ctx.DataDir(), "pods", "run", string(podUUID), "stage1/rootfs/rkt/supervisor-status")
+	target := ""
+	for i := 0; i < 20; i++ {
+		time.Sleep(500 * time.Millisecond)
+		target, err = os.Readlink(podReadyFile)
+		if err == nil && target == "ready" {
+			break
+		}
+	}
+	if err != nil || target != "ready" {
+		t.Fatalf("Pod failed to become ready while checking %q", podReadyFile)
+	}
+
 	cmd = strings.Fields(fmt.Sprintf("%s app add --debug %s %s --name=%s", ctx.Cmd(), podUUID, imageName, appName))
 	addCmd := exec.Command(cmd[0], cmd[1:]...)
 	addCmd.Env = append(addCmd.Env, "RKT_EXPERIMENT_APP=true")
@@ -93,7 +111,7 @@ func TestAppSandboxSmoke(t *testing.T) {
 	}
 
 	if err := expectTimeoutWithOutput(child, msg, actionTimeout); err != nil {
-		t.Fatalf("Expected %q but not found: %v", expected, err)
+		t.Fatalf("Expected %q but not found: %v", msg, err)
 	}
 
 	cmd = strings.Fields(fmt.Sprintf("%s app rm --debug %s --app=%s", ctx.Cmd(), podUUID, appName))

From 909f10bab85b9105b3e37f13bb20211f7811d7a3 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 1 Dec 2016 13:51:02 +0100
Subject: [PATCH 0935/1304] pkg/tar: fix variable name in error

---
 pkg/tar/chroot.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tar/chroot.go b/pkg/tar/chroot.go
index f678b2f731..175f213a6c 100644
--- a/pkg/tar/chroot.go
+++ b/pkg/tar/chroot.go
@@ -66,7 +66,7 @@ func extractTarCommand() error {
 	}
 	uc, err := strconv.ParseUint(os.Args[4], 10, 32)
 	if err != nil {
-		return fmt.Errorf("error parsing uidShift argument: %v", err)
+		return fmt.Errorf("error parsing uidCount argument: %v", err)
 	}
 
 	uidRange := &user.UidRange{Shift: uint32(us), Count: uint32(uc)}

From a04bfbff82d0637804be0fc9ec28afd40d15a9cb Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 1 Dec 2016 14:51:05 +0000
Subject: [PATCH 0936/1304] tests: drain output in waitOrFail

This commit fixes waitOrFail to drain output from the child, in order
to avoid a deadlock situation where the children is blocked on a write
toward the parent, while the parent is blocked waiting for the children.
---
 tests/rkt_net_test.go |  2 +-
 tests/rkt_tests.go    | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index 7f1a7330ce..f1756816d3 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -798,7 +798,6 @@ func NewNetCNIEnvTest() testutils.Test {
 		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false %s %s",
 			ctx.Cmd(), nt.NetParameter(), getInspectImagePath(), appCmd)
 		child := spawnOrFail(t, cmd)
-		waitOrFail(t, child, 0)
 
 		expectedRegex := "DefaultGWv4: 11.11.3.1"
 
@@ -806,6 +805,7 @@ func NewNetCNIEnvTest() testutils.Test {
 		if err != nil {
 			t.Fatalf("Error: %v\nOutput: %v", err, out)
 		}
+		waitOrFail(t, child, 0)
 
 		// Parse the log file
 		cniLogFilename := filepath.Join(netdir, "output.json")
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 337544c803..e9779d121e 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -124,11 +124,21 @@ func spawnOrFail(t *testing.T, cmd string) *gexpect.ExpectSubprocess {
 	return child
 }
 
+// waitOrFail waits for the child to exit, draining all its output.
+// If a non-negative return value is provided, child exit status must match.
 func waitOrFail(t *testing.T, child *gexpect.ExpectSubprocess, expectedStatus int) {
+	bufOut := []string{}
+	// TODO(lucab): gexpect should accept those channels from the caller
+	ttyIn, ttyOut := child.AsyncInteractChannels()
+	close(ttyIn)
+	// drain output till gexpect closes the channel (on EOF or error)
+	for line := range ttyOut {
+		bufOut = append(bufOut, line)
+	}
 	err := child.Wait()
 	status, _ := common.GetExitStatus(err)
-	if status != expectedStatus {
-		t.Fatalf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, expectedStatus, child.Collect())
+	if expectedStatus >= 0 && status != expectedStatus {
+		t.Fatalf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, expectedStatus, bufOut)
 	}
 }
 

From 46e9c157d80261aef1eaea478f2277ab3b812042 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 1 Dec 2016 14:54:56 +0000
Subject: [PATCH 0937/1304] tests/stop: raise the pod-stop timeout

This raises the pod-stop timeout from 5 to 15 seconds.
Sporadic test failures on KVM flavor may be due to a
too strict limit, so we just 3x here to make sure failures
are not due to bad timing.
---
 tests/rkt_stop_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_stop_test.go b/tests/rkt_stop_test.go
index 57c27ae74c..6fa42605c7 100644
--- a/tests/rkt_stop_test.go
+++ b/tests/rkt_stop_test.go
@@ -95,7 +95,7 @@ func TestRktStop(t *testing.T) {
 		// Make sure the pod is stopped
 		var podInfo *podInfo
 		exitedSuccessfully := false
-		for i := 0; i < 10; i++ {
+		for i := 0; i < 30; i++ {
 			time.Sleep(500 * time.Millisecond)
 			podInfo = getPodInfo(t, ctx, podUUID)
 			if podInfo.state == "exited" {

From 388bbf67703cc9b16baa42fd27e069c1a33c8a1a Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Thu, 1 Dec 2016 15:56:40 -0800
Subject: [PATCH 0938/1304] fly: ensure the target bin directory exists before
 building

Since there was no explicit dependency, parallel builds could
randomly fail when actool attempted to write the ACI before its
parent directory was created.
---
 stage1_fly/stage1_fly.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1_fly/stage1_fly.mk b/stage1_fly/stage1_fly.mk
index ec14a5f037..58dd667eef 100644
--- a/stage1_fly/stage1_fly.mk
+++ b/stage1_fly/stage1_fly.mk
@@ -11,7 +11,7 @@ $(call inc-many,$(foreach sd,$(FLY_SUBDIRS),$(sd)/$(sd).mk))
 
 $(call inc-one,stop/stop.mk)
 
-$(call generate-stamp-rule,$(FLY_STAMP),$(FLY_STAMPS) $(ACTOOL_STAMP),, \
+$(call generate-stamp-rule,$(FLY_STAMP),$(FLY_STAMPS) $(ACTOOL_STAMP),$(TARGET_BINDIR), \
 	$(call vb,vt,ACTOOL,$(call vsp,$(FLY_STAGE1))) \
 	"$(ACTOOL)" build --overwrite --owner-root "$(FLY_ACIDIR)" "$(FLY_STAGE1)")
 

From e607a8ffc3a39862383d05c1f66e55bf00b56817 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 28 Nov 2016 16:22:07 +0100
Subject: [PATCH 0939/1304] Documentation/proposals: add OCI Image Format
 roadmap

---
 Documentation/proposals/oci.md | 144 +++++++++++++++++++++++++++++++++
 README.md                      |   5 +-
 2 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/proposals/oci.md

diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
new file mode 100644
index 0000000000..bafad6e8b4
--- /dev/null
+++ b/Documentation/proposals/oci.md
@@ -0,0 +1,144 @@
+## OCI Image Format roadmap
+
+### Background
+
+rkt currently implements the [appc specification][app-container] and therefore relies on the [ACI][aci] (Application Container Image) image format internally.
+
+[OCI][opencontainers] on the other hand defines a new [image format][oci] following a separate specification.
+This new specification differs considerably from rkt's internal ACI-based image format handling.
+
+The internal rkt image handling is currently divided in three subsystems:
+- **fetching**: This subsystem is responsible for downloading images of various types.
+Non-ACI image types (Docker and OCI) are converted to ACI images by delegating to [docker2aci][docker2aci]. The logic resides in the `github.com/coreos/rkt/rkt/image` package.
+
+- **image store**: The image store is responsible for persisting and managing downloaded images.
+It consists of two parts, a directory tree storing the actual image file blobs (usually residing under `/var/lib/rkt/cas/blob`) and a separate embedded SQL database storing image metadata usually residing in `/var/lib/rkt/cas/db/ql.db`. The implementation resides in the `github.com/coreos/rkt/store/imagestore` package.
+
+- **tree store**: Since dependencies between ACI images form a directed acyclic graph according to the [appc spec][ace-fs] they are pre-rendered in a directory called the tree store cache.
+If the [overlay filesystem](https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt) is enabled, the pre-rendered image is used as the `lowerdir` for the pod's rendered rootfs. The implementation resides in the `github.com/coreos/rkt/store/treestore` package.
+
+The actual internal lifecycle of an image is documented in the [architecture documentation][image-lifecycle].
+
+The following table gives an overview of the relevant differences between OCI and appc regarding image handling aspects:
+
+ Aspect | OCI | ACI
+--------|-----|------------------
+Dependencies | Layers array in the [image manifest][oci-manifest] | [Dependency graph][ace-fs]
+Hash algorithms | Potentially multiple [algorithms][oci-algorithms], but SHA-256 preferred | [SHA-512][appc-image-id-type]
+
+Current ongoing work to support OCI in rkt is tracked in the following Github project: [https://github.com/coreos/rkt/projects/4](https://github.com/coreos/rkt/projects/4).
+
+### Goals, non-Goals
+
+With the deprecation of the appc Spec (https://github.com/appc/spec#-disclaimer-) the current internal rkt architecture is not favorable any more.
+Currently rkt does support ACI, Docker, and OCI images, but the conversion step from OCI to ACI using `docker2aci` seems unnecessary.
+It introduces CPU and I/O bound overhead and is bound by semantical differences between the formats. For these reasons native support of OCI images inside rkt is envisioned.
+
+The goal therefore is to support OCI images natively next to ACI.
+
+This document outlines the following necessary steps and references existing work to transition to native OCI image support in rkt:
+
+1. Distribution points
+2. Reference based image handling
+3. Transport handlers
+4. Tree store support for OCI
+
+A non-goal is the implementation of the [OCI runtime specification][oci-runtime]. There is ongoing work in [https://github.com/coreos/rkt/issues/3408](https://github.com/coreos/rkt/issues/3408) covering this topic.
+
+### Overview
+
+#### Distribution points
+
+rkt historically used the image name and heuristics around it to determine the actual image format type (appc, Docker, OCI).
+The concept of "distribution points" introduced a URI syntax that uniquely points to the different image formats including the necessary metadata (file location, origin URL, version, etc.).
+
+The URI scheme "cimd" (Container Image Distribution) was chosen to uniquely identify different image formats. The following CIMDs are currently supported:
+
+Name | Example
+-----|--------
+appc | `cimd:appc:v=0:coreos.com/etcd?version=v3.0.3&os=linux&arch=amd64`
+ACIArchive | `cimd:aci-archive:v=0:file%3A%2F%2Fabsolute%2Fpath%2Fto%2Ffile`
+Docker | `cimd:docker:v=0:busybox`
+
+The design document can be found in [Documentation/devel/distribution-point.md][distribution-point].
+
+###### Status
+
+- The design document (https://github.com/coreos/rkt/pull/2953) is merged.
+- The implementation (https://github.com/coreos/rkt/pull/3369) is merged.
+
+###### TODOs
+
+- Introduce a dedicated remote `cimd:oci` and potentially also a local `cimd:oci-layout` (see [github.com/opencontainers/image-spec/image-layout.md][oci-image-layout]) CIMD scheme.
+
+#### Reference based image handling
+
+The current image store implementation does not support different image formats. The blob image store only supports SHA-512.
+The ql backed SQL image store has a simple SQL scheme referencing only ACI images.
+
+In order to prepare native support for OCI the following changes need to be implemented:
+
+- Store the CIMD URI as a primary key in the current image store.
+- Support for multiple hash algorithms: Currently only SHA-512 is supported. OCI in addition needs SHA-256 and potentially other hash algorithms.
+- The database schema needs to be reworked to reflect multi-image support.
+
+###### Status
+
+- The design and initial implementation is proposed in https://github.com/coreos/rkt/pull/3071.
+- The actual design document of the above PR can be found in [Documentation/proposals/reference_based_image_access_and_cas_store.md](https://github.com/coreos/rkt/blob/23313af1c3dac2fb24fe41f9a7c5eaca573e45dd/Documentation/proposals/reference_based_image_access_and_cas_store.md).
+
+Note that the above design document also suggests the introduction of a new key/value [Bolt](https://github.com/boltdb/bolt) based store. The current consensus is that the replacement of `ql` as the backing store can be done independently and therefore should be a non-goal for the OCI roadmap.
+
+###### TODOs
+
+- Finalize the initial design proposal and implementation.
+
+#### Transport handlers
+
+Currently rkt directly fetches remote ACI based images or uses `docker2aci` to delegate non-ACI fetching.
+The current implementation makes it hard to integrate separate fetching subsystems due to the lack of any abstraction.
+
+###### Status
+
+The current proposal is to abstract fetching logic behind "transport handlers" allowing for independent (potentially swappable) fetching implementations for the various image formats.
+
+- A first initial design is proposed in https://github.com/coreos/rkt/pull/2964.
+- The actual design document of the above PR can be found in [Documentation/proposal/fetchers_refactor.md](https://github.com/sgotti/rkt/blob/239fdff081f9fd47dd08834a5660a1375ea4771d/Documentation/proposal/fetchers_refactor.md).
+- A first initial implementation is proposed in https://github.com/coreos/rkt/pull/3232.
+
+Note that the initial design and implementation are in very early stage and should only be considered inspirational. 
+
+###### TODOs
+
+- Fetching images remotely and locally from disk for all formats must be supported.
+- The current initial design proposal needs to be finalized.
+- The current fetcher logic needs to be abstracted allowing to introduce alternative libraries like https://github.com/containers/image to delegate fetching logic for OCI or Docker images.
+
+#### Tree store support for OCI
+
+The current tree store implementation is used for rendering ACI images only. A design document and initial implementation has to be created to prototype deflating OCI images and their dependencies.
+
+###### Status
+
+Not started yet
+
+### Risks
+
+Backwards compatibility: Currently the biggest concern identified is backwards compatibility/rollback capabilities. The proposed changes do not only imply simple schema changes in the `ql` backed database, but also intrusive schema and directory layout changes.
+
+[opencontainers]: https://www.opencontainers.org/
+[docker2aci]: https://github.com/appc/docker2aci
+[oci-runtime]: https://github.com/opencontainers/runtime-spec
+
+[aci]: https://github.com/appc/spec/blob/v0.8.9/spec/aci.md#app-container-image
+[ace-fs]: https://github.com/appc/spec/blob/v0.8.9/spec/ace.md#filesystem-setup
+[appc-image-id-type]: https://github.com/appc/spec/blob/v0.8.9/spec/types.md#image-id-type
+
+[oci]: https://github.com/opencontainers/image-spec
+[oci-manifest]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/manifest.md#image-manifest
+[oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
+[oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
+
+[app-container]: https://github.com/coreos/rkt/blob/v1.20.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.20.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/coreos/rkt/blob/v1.20.0/Documentation/devel/distribution-point.md
diff --git a/README.md b/README.md
index d20389ce7b..36e66d156a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Some of rkt's key features and goals include:
 
 - _Security_: rkt is developed with a principle of "secure-by-default", and includes a number of important security features like support for [SELinux][selinux], [TPM measurement][tpm], and running app containers in [hardware-isolated VMs][kvm].
 - _Composability_: rkt is designed for first-class integration with init systems ([systemd][systemd], upstart) and cluster orchestration tools (fleet, [Kubernetes][kubernetes], [Nomad][nomad]), and supports [swappable execution engines][architecture].
-- _Open standards and compatibility_: rkt implements the [appc specification][rkt-and-appc], supports the [Container Networking Interface specification][CNI], and can also run [Docker images][docker].
+- _Open standards and compatibility_: rkt implements the [appc specification][rkt-and-appc], supports the [Container Networking Interface specification][CNI], can also run [Docker images][docker], and [OCI images][oci] via [docker2aci][docker2aci]. Native OCI image support is [in development][oci-rkt].
 
 For more on the background and motivation behind rkt, read the original [launch announcement][blog-post].
 
@@ -29,6 +29,9 @@ For more on the background and motivation behind rkt, read the original [launch
 [selinux]: Documentation/selinux.md
 [tpm]: Documentation/devel/tpm.md
 [blog-post]: https://coreos.com/blog/rocket
+[oci]: https://github.com/opencontainers/image-spec
+[oci-rkt]: Documentation/proposals/oci.md
+[docker2aci]: https://github.com/appc/docker2aci
 
 ## Project status
 

From a4c766e8cbe7042fba56b143fc64d07b292af46b Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Fri, 2 Dec 2016 14:22:44 +0100
Subject: [PATCH 0940/1304] tests: stop deleting the network config directory.

This prevents `rkt gc` from working correctly, and the directory is
cleaned up automatically anyways by ctx.Cleanup
---
 tests/rkt_net_test.go | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index f1756816d3..a08007d091 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -380,9 +380,11 @@ var (
 	bridgeLoDiffPortFwdCase = PortFwdCase{"127.0.0.1", 1024, "", "--net=" + portFwdBridge.Name, true}
 )
 
-func (ct PortFwdCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
-	netdir := prepareTestNet(t, ctx, portFwdBridge)
-	defer os.RemoveAll(netdir)
+func (ct PortFwdCase) Execute(t *testing.T) {
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	prepareTestNet(t, ctx, portFwdBridge)
 
 	httpPort, err := testutils.GetNextFreePort4Banned(bannedPorts)
 	if err != nil {
@@ -447,11 +449,8 @@ func (ct PortFwdCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
 type portFwdTest []PortFwdCase
 
 func (ct portFwdTest) Execute(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
 	for _, testCase := range ct {
-		testCase.Execute(t, ctx)
+		testCase.Execute(t)
 	}
 }
 
@@ -622,8 +621,7 @@ func testNetCustomDual(t *testing.T, nt networkTemplateT) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	netdir := prepareTestNet(t, ctx, nt)
-	defer os.RemoveAll(netdir)
+	prepareTestNet(t, ctx, nt)
 
 	container1IPv4, container1Hostname := make(chan string), make(chan string)
 	ga := testutils.NewGoroutineAssistant(t)
@@ -695,8 +693,7 @@ func testNetCustomNatConnectivity(t *testing.T, nt networkTemplateT) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	netdir := prepareTestNet(t, ctx, nt)
-	defer os.RemoveAll(netdir)
+	prepareTestNet(t, ctx, nt)
 
 	httpPort, err := testutils.GetNextFreePort4()
 	if err != nil {
@@ -792,7 +789,6 @@ func NewNetCNIEnvTest() testutils.Test {
 
 		// bring the networking up, copy the proxy
 		netdir := prepareTestNet(t, ctx, nt)
-		defer os.RemoveAll(netdir)
 
 		appCmd := "--exec=/inspect -- --print-defaultgwv4 "
 		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false %s %s",
@@ -901,8 +897,7 @@ func NewNetCNIDNSTest() testutils.Test {
 		}
 
 		// bring the networking up, copy the proxy
-		netdir := prepareTestNet(t, ctx, nt)
-		defer os.RemoveAll(netdir)
+		prepareTestNet(t, ctx, nt)
 
 		ga := testutils.NewGoroutineAssistant(t)
 		ga.Add(1)
@@ -959,8 +954,7 @@ func NewNetCNIDNSArgTest() testutils.Test {
 		}
 
 		// bring the networking up, copy the proxy
-		netdir := prepareTestNet(t, ctx, nt)
-		defer os.RemoveAll(netdir)
+		prepareTestNet(t, ctx, nt)
 
 		appCmd := "--exec=/inspect -- --read-file --file-name=/etc/resolv.conf"
 		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false --dns=244.244.244.244 %s %s",
@@ -1009,8 +1003,7 @@ func NewNetCNIDNSArgNoneTest() testutils.Test {
 		}
 
 		// bring the networking up, copy the proxy
-		netdir := prepareTestNet(t, ctx, nt)
-		defer os.RemoveAll(netdir)
+		prepareTestNet(t, ctx, nt)
 
 		appCmd := "--exec=/inspect -- --stat-file --file-name=/etc/resolv.conf"
 		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=%v --mds-register=false --dns=none %s %s",
@@ -1124,8 +1117,7 @@ func NewNetOverrideTest() testutils.Test {
 			},
 		}
 
-		netdir := prepareTestNet(t, ctx, nt)
-		defer os.RemoveAll(netdir)
+		prepareTestNet(t, ctx, nt)
 
 		testImageArgs := []string{"--exec=/inspect --print-ipv4=eth0"}
 		testImage := patchTestACI("rkt-inspect-networking1.aci", testImageArgs...)
@@ -1291,12 +1283,11 @@ func NewNetPreserveNetNameTest() testutils.Test {
 		ctx := testutils.NewRktRunCtx()
 		defer ctx.Cleanup()
 
-		netdir, ntFlannel, err := mockFlannelNetwork(t, ctx)
+		_, ntFlannel, err := mockFlannelNetwork(t, ctx)
 		if err != nil {
 			t.Errorf("Can't mock flannel network: %v", err)
 		}
 
-		defer os.RemoveAll(netdir)
 		defer os.Remove(ntFlannel.SubnetFile)
 
 		podUUIDFile := filepath.Join(ctx.DataDir(), "pod_uuid")
@@ -1353,12 +1344,11 @@ func NewNetDefaultGWTest() testutils.Test {
 		ctx := testutils.NewRktRunCtx()
 		defer ctx.Cleanup()
 
-		netdir, ntFlannel, err := mockFlannelNetwork(t, ctx)
+		_, ntFlannel, err := mockFlannelNetwork(t, ctx)
 		if err != nil {
 			t.Errorf("Can't mock flannel network: %v", err)
 		}
 
-		defer os.RemoveAll(netdir)
 		defer os.Remove(ntFlannel.SubnetFile)
 
 		testImageArgs := []string{"--exec=/inspect --print-defaultgwv4"}

From a226d37e5585cff24fdf38dc7f5245bc3eb3e38f Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Fri, 2 Dec 2016 14:33:19 +0100
Subject: [PATCH 0941/1304] networking: change the default-restricted subnet

This was causing collisions with the default network, since the
host-local IPAM plugin maintains separate pools per networ.

Fixes #3438
---
 stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf | 2 +-
 tests/rkt_net_test.go                                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf b/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
index 04c624c941..98c12e1f51 100644
--- a/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
+++ b/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
@@ -5,6 +5,6 @@
 	"ipMasq": false,
 	"ipam": {
 		"type": "host-local",
-		"subnet": "172.16.28.0/24"
+		"subnet": "172.16.29.0/24"
 	}
 }
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index a08007d091..dc06f919da 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -1171,7 +1171,7 @@ func NewNetDefaultIPArgTest() testutils.Test {
 	}
 	return testutils.TestFunc(func(t *testing.T) {
 		doTest("default:IP=172.16.28.123", "172.16.28.123", t)
-		doTest("default-restricted:IP=172.16.28.42", "172.16.28.42", t)
+		doTest("default-restricted:IP=172.16.29.42", "172.16.29.42", t)
 	})
 }
 

From ff3b0fce02ba61eeb73a3ce4c43f007a694c765d Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 2 Dec 2016 12:49:28 +0000
Subject: [PATCH 0942/1304] stage1-usr: enable and install systemd-tmpfiles

---
 stage1/usr_from_src/usr_from_src.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index 8acba911ee..c73ca57122 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -126,6 +126,8 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 	$(call vb,v2,CONFIGURE,systemd) \
 	"$(abspath $(UFS_SYSTEMD_SRCDIR))/configure" \
 		$(call vl3,--quiet) \
+		--enable-seccomp \
+		--enable-tmpfiles \
 		--disable-dbus \
 		--disable-kmod \
 		--disable-blkid \
@@ -142,7 +144,6 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 		--disable-binfmt \
 		--disable-vconsole \
 		--disable-quotacheck \
-		--disable-tmpfiles \
 		--disable-randomseed \
 		--disable-backlight \
 		--disable-rfkill \
@@ -163,8 +164,7 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 		--disable-hibernate \
 		--disable-hwdb \
 		--disable-importd \
-		--disable-firstboot \
-		--enable-seccomp; \
+		--disable-firstboot; \
 	popd $(call vl3,>/dev/null); \
 	$(call vb,v2,BUILD EXT,systemd) \
 	$$(MAKE) -C "$(UFS_SYSTEMD_BUILDDIR)" all V=0 $(call vl2,>/dev/null))

From f72c397e0f5b474ceebc73882bab9585596ae49a Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 2 Dec 2016 12:50:01 +0000
Subject: [PATCH 0943/1304] stage1-host: install systemd-tmpfiles

---
 stage1/init/init.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 14c120d65d..70be4ba0b9 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -193,6 +193,10 @@ func installAssets() error {
 	if err != nil {
 		return err
 	}
+	systemdTmpfilesBin, err := common.LookupPath("systemd-tmpfiles", os.Getenv("PATH"))
+	if err != nil {
+		return err
+	}
 	bashBin, err := common.LookupPath("bash", os.Getenv("PATH"))
 	if err != nil {
 		return err
@@ -226,6 +230,7 @@ func installAssets() error {
 		proj2aci.GetAssetString("/usr/lib/systemd/systemd", systemdBin),
 		proj2aci.GetAssetString("/usr/bin/systemctl", systemctlBin),
 		proj2aci.GetAssetString("/usr/bin/systemd-sysusers", systemdSysusersBin),
+		proj2aci.GetAssetString("/usr/bin/systemd-tmpfiles", systemdTmpfilesBin),
 		proj2aci.GetAssetString("/usr/lib/systemd/systemd-journald", systemdJournaldBin),
 		proj2aci.GetAssetString("/usr/bin/bash", bashBin),
 		proj2aci.GetAssetString("/bin/mount", mountBin),

From 883f51a8db63ca1e3c505d70884e815ab032224b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 2 Dec 2016 12:50:31 +0000
Subject: [PATCH 0944/1304] stage1-host: symlink /bin -> /usr/bin

---
 stage1/usr_from_host/usr_from_host.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/stage1/usr_from_host/usr_from_host.mk b/stage1/usr_from_host/usr_from_host.mk
index 276bdb5a49..29862e47c5 100644
--- a/stage1/usr_from_host/usr_from_host.mk
+++ b/stage1/usr_from_host/usr_from_host.mk
@@ -3,6 +3,8 @@ $(call setup-stamp-file,UFH_STAMP)
 S1_RF_USR_STAMPS += $(UFH_STAMP)
 
 $(call generate-stamp-rule,$(UFH_STAMP),,$(S1_RF_ACIROOTFSDIR), \
+	$(call vb,v2,LN SF,usr/bin $(S1_RF_ACIROOTFSDIR)/bin) \
+	ln -sf usr/bin "$(S1_RF_ACIROOTFSDIR)/bin" && \
 	$(call vb,v2,LN SF,host $(S1_RF_ACIROOTFSDIR)/flavor) \
 	ln -sf 'host' "$(S1_RF_ACIROOTFSDIR)/flavor" && \
 	mkdir -p "$(S1_RF_ACIROOTFSDIR)/usr/lib" && \
@@ -10,8 +12,12 @@ $(call generate-stamp-rule,$(UFH_STAMP),,$(S1_RF_ACIROOTFSDIR), \
 	ln -sf usr/lib "$(S1_RF_ACIROOTFSDIR)/lib64"&& \
 	ln -sf lib "$(S1_RF_ACIROOTFSDIR)/usr/lib64")
 
-
-CLEAN_SYMLINKS += $(S1_RF_ACIROOTFSDIR)/flavor $(S1_RF_ACIROOTFSDIR)/lib $(S1_RF_ACIROOTFSDIR)/lib64 $(S1_RF_ACIROOTFSDIR)/usr/lib64
+CLEAN_SYMLINKS += \
+	$(S1_RF_ACIROOTFSDIR)/bin \
+	$(S1_RF_ACIROOTFSDIR)/flavor \
+	$(S1_RF_ACIROOTFSDIR)/lib \
+	$(S1_RF_ACIROOTFSDIR)/lib64 \
+	$(S1_RF_ACIROOTFSDIR)/usr/lib64
 
 CLEAN_DIRS += $(S1_RF_ACIROOTFSDIR)/usr/lib
 

From c6c4d09bae34b2bf23d7b5d8acd8458e6c2386ce Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 2 Dec 2016 23:35:21 +0000
Subject: [PATCH 0945/1304] tests: fix some potential gexpect hangs

---
 tests/rkt_app_sandbox_test.go | 4 +---
 tests/rkt_etc_hosts_test.go   | 5 +----
 tests/rkt_fetch_test.go       | 2 +-
 tests/rkt_image_gc_test.go    | 4 +---
 tests/rkt_stop_test.go        | 6 +++---
 tests/rkt_userns_test.go      | 6 +-----
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index dde9a89a01..b5796e6329 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -128,7 +128,5 @@ func TestAppSandboxSmoke(t *testing.T) {
 		t.Fatalf("Unexpected error: %v\n%s", err, output)
 	}
 
-	if err := child.Wait(); err != nil {
-		t.Fatalf("rkt didn't terminate correctly: %v", err)
-	}
+	waitOrFail(t, child, 0)
 }
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index cb09fafebc..9f2c51ea59 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -107,10 +107,7 @@ func TestEtcHosts(t *testing.T) {
 			t.Fatalf("Test %d %v %v", i, err, out)
 		}
 
-		err = child.Wait()
-		if err != nil {
-			t.Fatalf("rkt didn't terminate correctly: %v", err)
-		}
+		waitOrFail(t, child, 0)
 	}
 }
 
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 756e388647..035afe1ca6 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -78,7 +78,7 @@ func testFetchFromFile(t *testing.T, arg string, image string) {
 	if err := expectWithOutput(child, fetchFromFileMsg); err != nil {
 		t.Fatalf("%q should be found: %v", fetchFromFileMsg, err)
 	}
-	child.Wait()
+	waitOrFail(t, child, 0)
 
 	// 1. Run cmd again, should get $fetchFromFileMsg.
 	runRktAndCheckOutput(t, cmd, fetchFromFileMsg, false)
diff --git a/tests/rkt_image_gc_test.go b/tests/rkt_image_gc_test.go
index 7a090d26a3..4c1d246d16 100644
--- a/tests/rkt_image_gc_test.go
+++ b/tests/rkt_image_gc_test.go
@@ -46,9 +46,7 @@ func TestImageGCTreeStore(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Cannot exec: %v", err)
 	}
-	if err := child.Wait(); err != nil {
-		t.Fatalf("rkt didn't terminate correctly: %v", err)
-	}
+	waitOrFail(t, child, 0)
 
 	treeStoreIDs, err := getTreeStoreIDs(ctx)
 	if err != nil {
diff --git a/tests/rkt_stop_test.go b/tests/rkt_stop_test.go
index 6fa42605c7..0c4350b04c 100644
--- a/tests/rkt_stop_test.go
+++ b/tests/rkt_stop_test.go
@@ -107,10 +107,10 @@ func TestRktStop(t *testing.T) {
 			t.Fatalf("Expected pod %q to be exited, but it is %q", podUUID, podInfo.state)
 		}
 
+		exitStatus := 0
 		if tt.expectKill {
-			child.Wait()
-		} else {
-			waitOrFail(t, child, 0)
+			exitStatus = -1
 		}
+		waitOrFail(t, child, exitStatus)
 	}
 }
diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
index 4b0106e653..fcf8758688 100644
--- a/tests/rkt_userns_test.go
+++ b/tests/rkt_userns_test.go
@@ -96,11 +96,7 @@ func TestUserns(t *testing.T) {
 				if err != nil || result[0] == tt.expectGid {
 					t.Fatalf("Expected %q but not found: %v", tt.expectGid, result)
 				}
-
-				err = child.Wait()
-				if err != nil {
-					t.Fatalf("rkt didn't terminate correctly: %v", err)
-				}
+				waitOrFail(t, child, 0)
 
 				ctx.Reset()
 			}

From 11d5a85ac1e45a1d30bdc815a5cd8a5738f67e60 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 1 Dec 2016 17:14:12 +0100
Subject: [PATCH 0946/1304] tests: fix TestExport for the KVM+overlay case

---
 tests/rkt_export_container_test.go | 33 ++++++++++---------
 tests/rkt_export_fly_test.go       |  5 ++-
 tests/rkt_export_test.go           | 53 +++++++++++++++---------------
 tests/rkt_flavor_coreos.go         |  8 ++---
 tests/rkt_flavor_fly.go            |  8 ++---
 tests/rkt_flavor_host.go           |  8 ++---
 tests/rkt_flavor_kvm.go            |  7 +---
 tests/rkt_flavor_src.go            |  8 ++---
 tests/rkt_tests.go                 | 19 +++++++----
 9 files changed, 70 insertions(+), 79 deletions(-)

diff --git a/tests/rkt_export_container_test.go b/tests/rkt_export_container_test.go
index a8fde0fa57..4b86d674bb 100644
--- a/tests/rkt_export_container_test.go
+++ b/tests/rkt_export_container_test.go
@@ -20,24 +20,25 @@ import (
 	"testing"
 
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/tests/testutils"
 )
 
 func TestExport(t *testing.T) {
-	testCases := []ExportTestCase{
-		noOverlaySimpleTest,
-		specifiedAppTest,
-		multiAppPodTest,
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+	overlay := (common.SupportsOverlay() == nil)
+	userns := (common.SupportsUserNS() && checkUserNS() == nil && !TestedFlavor.Kvm)
+
+	for name, testCase := range exportTestCases {
+		if testCase.NeedsOverlay && !overlay {
+			t.Logf("TestExport/%v needs overlay, skipping", name)
+			continue
+		}
+		if testCase.NeedsUserNS && !userns {
+			t.Logf("TestExport/%v needs userns, skipping", name)
+			continue
+		}
+		t.Logf("TestExport/%v", name)
+		testCase.Execute(t, ctx)
 	}
-
-	// Need to do both checks
-	if common.SupportsUserNS() && checkUserNS() == nil {
-		testCases = append(testCases, userNS)
-	}
-
-	if common.SupportsOverlay() == nil {
-		testCases = append(testCases, overlaySimpleTest)
-		testCases = append(testCases, overlaySimulateReboot)
-	}
-
-	NewTestExport(testCases...).Execute(t)
 }
diff --git a/tests/rkt_export_fly_test.go b/tests/rkt_export_fly_test.go
index 78c39c9945..67577dfa3c 100644
--- a/tests/rkt_export_fly_test.go
+++ b/tests/rkt_export_fly_test.go
@@ -20,14 +20,17 @@ import (
 	"testing"
 
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/tests/testutils"
 )
 
 func TestExport(t *testing.T) {
 	if err := common.SupportsOverlay(); err != nil {
 		t.Skipf("Overlay fs not supported: %v", err)
 	}
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
 
 	// TODO(iaguis): we need a new function to unmount the fly pod so we can also test
 	// overlaySimulateReboot
-	NewTestExport(overlaySimpleTest).Execute(t)
+	exportTestCases["overlaySimpleTest"].Execute(t, ctx)
 }
diff --git a/tests/rkt_export_test.go b/tests/rkt_export_test.go
index e873a7d1e0..7c3529a16b 100644
--- a/tests/rkt_export_test.go
+++ b/tests/rkt_export_test.go
@@ -36,12 +36,14 @@ type ExportTestCase struct {
 	expectedResult string
 	unmountOverlay bool
 	multiAppPod    bool
+	NeedsOverlay   bool
+	NeedsUserNS    bool
 }
 
 type exportTest []ExportTestCase
 
-var (
-	noOverlaySimpleTest = ExportTestCase{
+var exportTestCases = map[string]ExportTestCase{
+	"noOverlaySimpleTest": {
 		"--no-overlay --insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
@@ -49,9 +51,11 @@ var (
 		testContent,
 		false,
 		false,
-	}
+		false,
+		false,
+	},
 
-	specifiedAppTest = ExportTestCase{
+	"specifiedAppTest": {
 		"--no-overlay --insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
@@ -59,9 +63,11 @@ var (
 		testContent,
 		false,
 		false,
-	}
+		false,
+		false,
+	},
 
-	multiAppPodTest = ExportTestCase{
+	"multiAppPodTest": {
 		"--no-overlay --insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
@@ -69,9 +75,11 @@ var (
 		testContent,
 		false,
 		true,
-	}
+		false,
+		false,
+	},
 
-	userNS = ExportTestCase{
+	"userNS": {
 		"--private-users --no-overlay --insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
@@ -79,9 +87,11 @@ var (
 		testContent,
 		false,
 		false,
-	}
+		false,
+		true,
+	},
 
-	overlaySimpleTest = ExportTestCase{
+	"overlaySimpleTest": {
 		"--insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
@@ -89,9 +99,11 @@ var (
 		testContent,
 		false,
 		false,
-	}
+		true,
+		false,
+	},
 
-	overlaySimulateReboot = ExportTestCase{
+	"overlaySimulateReboot": {
 		"--insecure-options=image",
 		"--write-file --file-name=" + testFile + " --content=" + testContent,
 		"--read-file --file-name=" + testFile,
@@ -99,16 +111,9 @@ var (
 		testContent,
 		true,
 		false,
-	}
-)
-
-func (ct exportTest) Execute(t *testing.T) {
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
-
-	for _, testCase := range ct {
-		testCase.Execute(t, ctx)
-	}
+		true,
+		false,
+	},
 }
 
 func (ct ExportTestCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
@@ -162,7 +167,3 @@ func (ct ExportTestCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
 	runGC(t, ctx)
 	runImageGC(t, ctx)
 }
-
-func NewTestExport(cases ...ExportTestCase) testutils.Test {
-	return exportTest(cases)
-}
diff --git a/tests/rkt_flavor_coreos.go b/tests/rkt_flavor_coreos.go
index 9627d6d910..c6ec7fa062 100644
--- a/tests/rkt_flavor_coreos.go
+++ b/tests/rkt_flavor_coreos.go
@@ -17,10 +17,6 @@
 package main
 
 var TestedFlavor = Flavor{
-	true,
-	false,
-	false,
-	false,
-	false,
-	true,
+	Coreos:              true,
+	ExitStatusPreserved: true,
 }
diff --git a/tests/rkt_flavor_fly.go b/tests/rkt_flavor_fly.go
index 6b47891984..0b62bbe74b 100644
--- a/tests/rkt_flavor_fly.go
+++ b/tests/rkt_flavor_fly.go
@@ -17,10 +17,6 @@
 package main
 
 var TestedFlavor = Flavor{
-	false,
-	false,
-	false,
-	false,
-	true,
-	true,
+	Fly:                 true,
+	ExitStatusPreserved: true,
 }
diff --git a/tests/rkt_flavor_host.go b/tests/rkt_flavor_host.go
index 08a63e917f..c3f12c8b61 100644
--- a/tests/rkt_flavor_host.go
+++ b/tests/rkt_flavor_host.go
@@ -17,10 +17,6 @@
 package main
 
 var TestedFlavor = Flavor{
-	false,
-	true,
-	false,
-	false,
-	false,
-	true,
+	Host:                true,
+	ExitStatusPreserved: true,
 }
diff --git a/tests/rkt_flavor_kvm.go b/tests/rkt_flavor_kvm.go
index bb10691dab..2069600aca 100644
--- a/tests/rkt_flavor_kvm.go
+++ b/tests/rkt_flavor_kvm.go
@@ -17,10 +17,5 @@
 package main
 
 var TestedFlavor = Flavor{
-	false,
-	false,
-	false,
-	false,
-	true,
-	false,
+	Kvm: true,
 }
diff --git a/tests/rkt_flavor_src.go b/tests/rkt_flavor_src.go
index 0df587eac6..ab664f7e44 100644
--- a/tests/rkt_flavor_src.go
+++ b/tests/rkt_flavor_src.go
@@ -17,10 +17,6 @@
 package main
 
 var TestedFlavor = Flavor{
-	false,
-	false,
-	true,
-	false,
-	false,
-	true,
+	Src:                 true,
+	ExitStatusPreserved: true,
 }
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index e9779d121e..a0a847828d 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -866,12 +866,17 @@ func unmountPod(t *testing.T, ctx *testutils.RktRunCtx, uuid string, rmNetns boo
 	podDir := filepath.Join(ctx.DataDir(), "pods", "run", uuid)
 	stage1MntPath := filepath.Join(podDir, "stage1", "rootfs")
 	stage2MntPath := filepath.Join(stage1MntPath, "opt", "stage2", "rkt-inspect", "rootfs")
+
 	netnsPath := filepath.Join(podDir, "netns")
 	podNetNSPathBytes, err := ioutil.ReadFile(netnsPath)
+	// There may be no netns, e.g. kvm or --net=host
 	if err != nil {
-		t.Fatalf(`cannot read "netns" stage1: %v`, err)
+		if !os.IsNotExist(err) {
+			t.Fatalf(`cannot read "netns" stage1: %v`, err)
+		} else {
+			rmNetns = false
+		}
 	}
-	podNetNSPath := string(podNetNSPathBytes)
 
 	if err := syscall.Unmount(stage2MntPath, 0); err != nil {
 		t.Fatalf("cannot umount stage2: %v", err)
@@ -881,11 +886,13 @@ func unmountPod(t *testing.T, ctx *testutils.RktRunCtx, uuid string, rmNetns boo
 		t.Fatalf("cannot umount stage1: %v", err)
 	}
 
-	if err := syscall.Unmount(podNetNSPath, 0); err != nil {
-		t.Fatalf("cannot umount pod netns: %v", err)
-	}
-
 	if rmNetns {
+		podNetNSPath := string(podNetNSPathBytes)
+
+		if err := syscall.Unmount(podNetNSPath, 0); err != nil {
+			t.Fatalf("cannot umount pod netns: %v", err)
+		}
+
 		_ = os.RemoveAll(podNetNSPath)
 	}
 }

From 1e4b1748e0e8b9f77c566777e0f20f3ecf5a3664 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Mon, 5 Dec 2016 13:38:08 +0100
Subject: [PATCH 0947/1304] docs: update SELinux info for Fedora

---
 Documentation/distributions.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 8275414e2b..61bb70dbcd 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -61,12 +61,7 @@ rkt's entry in the [Fedora package database][pkg-fedora] tracks packaging work f
 
 #### Caveat: SELinux
 
-rkt can integrate with SELinux on Fedora but in a limited way.
-This has the following caveats:
-- running as systemd service restricted (see [#2322][rkt-2322])
-- access to host volumes restricted (see [#2325][rkt-2325])
-- socket activation restricted (see [#2326][rkt-2326])
-- metadata service restricted (see [#1978][rkt-1978])
+Rkt does not work with the SELinux policies currently shipped with Fedora versions 24 and 25.
 
 As a workaround, SELinux can be temporarily disabled:
 ```

From 3c93df9420c8a71e202063731bf360555cea76d9 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Tue, 29 Nov 2016 18:27:42 +0100
Subject: [PATCH 0948/1304] stage1: persist runtime parameters

This stores runtime parameters such as insecure options and the MDS
token to disk in the stage1. These are provided during init, but are
necessary during app add. This also simplifies the signature of some of
the stage1 methods.
---
 stage0/app.go                  |  21 ------
 stage1/app-add/app-add.go      |  28 ++-----
 stage1/common/types/pod.go     |  79 +++++++++++++++++---
 stage1/init/common/pod.go      |  22 ++----
 stage1/init/common/pod_test.go |   5 +-
 stage1/init/common/units.go    |  32 +++-----
 stage1/init/init.go            | 130 +++++++++++++++++----------------
 stage1/init/kvm.go             |  14 ++--
 stage1_fly/run/main.go         |  33 ++++++---
 9 files changed, 191 insertions(+), 173 deletions(-)

diff --git a/stage0/app.go b/stage0/app.go
index 8e7ac829b5..445e78eb71 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -262,27 +262,6 @@ func AddApp(cfg AddConfig) error {
 		fmt.Sprintf("--app=%s", appName),
 	}
 
-	if cfg.InsecureCapabilities {
-		args = append(args, "--disable-capabilities-restriction")
-	}
-
-	if cfg.InsecurePaths {
-		args = append(args, "--disable-paths")
-	}
-
-	if cfg.InsecureSeccomp {
-		args = append(args, "--disable-seccomp")
-	}
-
-	privateUsers, err := preparedWithPrivateUsers(cfg.PodPath)
-	if err != nil {
-		log.FatalE("error reading user namespace information", err)
-	}
-
-	if privateUsers != "" {
-		args = append(args, fmt.Sprintf("--private-users=%s", privateUsers))
-	}
-
 	if _, err := os.Create(common.AppCreatedPath(pod.Path(), appName.String())); err != nil {
 		return err
 	}
diff --git a/stage1/app-add/app-add.go b/stage1/app-add/app-add.go
index 96bdd39030..9cb76fde6a 100644
--- a/stage1/app-add/app-add.go
+++ b/stage1/app-add/app-add.go
@@ -38,25 +38,17 @@ import (
 )
 
 var (
-	flagApp             string
-	flagUUID            string
-	debug               bool
-	disableCapabilities bool
-	disablePaths        bool
-	disableSeccomp      bool
-	privateUsers        string
-	log                 *rktlog.Logger
-	diag                *rktlog.Logger
+	flagApp  string
+	flagUUID string
+	debug    bool
+	log      *rktlog.Logger
+	diag     *rktlog.Logger
 )
 
 func init() {
 	flag.StringVar(&flagApp, "app", "", "Application name")
 	flag.StringVar(&flagUUID, "uuid", "", "Pod UUID")
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
-	flag.BoolVar(&disableCapabilities, "disable-capabilities-restriction", false, "Disable capability restrictions")
-	flag.BoolVar(&disablePaths, "disable-paths", false, "Disable paths restrictions")
-	flag.BoolVar(&disableSeccomp, "disable-seccomp", false, "Disable seccomp restrictions")
-	flag.StringVar(&privateUsers, "private-users", "", "Run within user namespace. Can be set to [=UIDBASE[:NUIDS]]")
 }
 
 func main() {
@@ -80,7 +72,7 @@ func main() {
 	}
 
 	root := "."
-	p, err := stage1types.LoadPod(root, uuid)
+	p, err := stage1types.LoadPod(root, uuid, nil)
 	if err != nil {
 		log.FatalE("failed to load pod", err)
 	}
@@ -90,12 +82,6 @@ func main() {
 		log.FatalE("failed to get stage1 flavor", err)
 	}
 
-	insecureOptions := stage1initcommon.Stage1InsecureOptions{
-		DisablePaths:        disablePaths,
-		DisableCapabilities: disableCapabilities,
-		DisableSeccomp:      disableSeccomp,
-	}
-
 	ra := p.Manifest.Apps.Get(*appName)
 	if ra == nil {
 		log.Fatalf("failed to find app %q", *appName)
@@ -123,7 +109,7 @@ func main() {
 
 	// write service files
 	w := stage1initcommon.NewUnitWriter(p)
-	w.AppUnit(ra, binPath, privateUsers, insecureOptions,
+	w.AppUnit(ra, binPath,
 		unit.NewUnitOption("Unit", "Before", "halt.target"),
 		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
 		unit.NewUnitOption("Service", "StandardOutput", "journal+console"),
diff --git a/stage1/common/types/pod.go b/stage1/common/types/pod.go
index 4888ebfbfb..dc6b2a70fc 100644
--- a/stage1/common/types/pod.go
+++ b/stage1/common/types/pod.go
@@ -19,22 +19,49 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
+	"path/filepath"
 
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/user"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 )
 
+// The filename where we persist the RuntimePod data
+const RuntimeConfigPath = "runtime-config"
+
 // Pod encapsulates a PodManifest and ImageManifests
 type Pod struct {
-	Root               string // root directory where the pod will be located
-	UUID               types.UUID
-	Manifest           *schema.PodManifest
-	Images             map[string]*schema.ImageManifest
-	MetadataServiceURL string
-	Networks           []string
+	RuntimePod        // embedded runtime parameters
+	Root       string // root directory where the pod will be located
+	UUID       types.UUID
+	Manifest   *schema.PodManifest
+	Images     map[string]*schema.ImageManifest
+	UidRange   user.UidRange
+}
+
+// RuntimePod stores internal state we'd like access to. There is no interface,
+// and noone outside the stage1 should access it. If you find yourself needing
+// one of these members outside of the stage1, then it should be set as an
+// annotation on the pod.
+// This includes things like insecure options and the mds token - they are provided
+// during init but needed for `app add`.
+type RuntimePod struct {
+	MetadataServiceURL string         `json:"MetadataServiceURL"`
+	PrivateUsers       string         `json:"PrivateUsers"`
+	MDSToken           string         `json:"MDSToken"`
+	Hostname           string         `json:"Hostname"`
+	Mutable            bool           `json:"Mutable"`
+	ResolvConfMode     string         `json:"ResolvConfMode"`
+	EtcHostsMode       string         `json:"EtcHostsMode"`
+	NetList            common.NetList `json:"NetList"`
+	InsecureOptions    struct {
+		DisablePaths        bool `json:"DisablePaths"`
+		DisableCapabilities bool `json:"DisableCapabilities"`
+		DisableSeccomp      bool `json:"DisableSeccomp"`
+	} `json:"InsecureOptions"`
 }
 
 // AppNameToImageName takes the name of an app in the Pod and returns the name
@@ -49,13 +76,39 @@ func (p *Pod) AppNameToImageName(appName types.ACName) types.ACIdentifier {
 	return image.Name
 }
 
-// LoadPod loads a Pod Manifest (as prepared by stage0) and
+// SaveRuntime persists just the runtime state. This should be called when the
+// pod is started.
+func (p *Pod) SaveRuntime() error {
+	path := filepath.Join(p.Root, RuntimeConfigPath)
+	buf, err := json.Marshal(p.RuntimePod)
+	if err != nil {
+		return err
+	}
+
+	return ioutil.WriteFile(path, buf, 0644)
+}
+
+// LoadPod loads a Pod Manifest (as prepared by stage0), the runtime data, and
 // its associated Application Manifests, under $root/stage1/opt/stage1/$apphash
-func LoadPod(root string, uuid *types.UUID) (*Pod, error) {
+func LoadPod(root string, uuid *types.UUID, rp *RuntimePod) (*Pod, error) {
 	p := &Pod{
-		Root:   root,
-		UUID:   *uuid,
-		Images: make(map[string]*schema.ImageManifest),
+		Root:     root,
+		UUID:     *uuid,
+		Images:   make(map[string]*schema.ImageManifest),
+		UidRange: *user.NewBlankUidRange(),
+	}
+
+	// Unserialize runtime parameters
+	if rp != nil {
+		p.RuntimePod = *rp
+	} else {
+		buf, err := ioutil.ReadFile(filepath.Join(p.Root, RuntimeConfigPath))
+		if err != nil {
+			return nil, errwrap.Wrap(errors.New("failed reading runtime params"), err)
+		}
+		if err := json.Unmarshal(buf, &p.RuntimePod); err != nil {
+			return nil, errwrap.Wrap(errors.New("failed unmarshalling runtime params"), err)
+		}
 	}
 
 	buf, err := ioutil.ReadFile(common.PodManifestPath(p.Root))
@@ -90,5 +143,9 @@ func LoadPod(root string, uuid *types.UUID) (*Pod, error) {
 		p.Images[app.Name.String()] = im
 	}
 
+	if err := p.UidRange.Deserialize([]byte(p.PrivateUsers)); err != nil {
+		return nil, err
+	}
+
 	return p, nil
 }
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index e69a001280..710dfc7d41 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -47,12 +47,6 @@ const (
 	SharedVolPerm = os.FileMode(0755)
 )
 
-type Stage1InsecureOptions struct {
-	DisablePaths        bool
-	DisableCapabilities bool
-	DisableSeccomp      bool
-}
-
 // execEscape uses Golang's string quoting for ", \, \n, and regex for special cases
 func execEscape(i int, str string) string {
 	escapeMap := map[string]string{
@@ -371,7 +365,7 @@ func supportsNotify(p *stage1commontypes.Pod, appName string) bool {
 //   3. a number
 //   4. a name in reference to /etc/{group,passwd} in the image
 // See https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
-func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uidRange *user.UidRange) (int, int, error) {
+func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (int, int, error) {
 	var uidResolver, gidResolver user.Resolver
 	var uid, gid int
 	var err error
@@ -380,7 +374,7 @@ func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uidRange *u
 
 	uidResolver, err = user.NumericIDs(ra.App.User)
 	if err != nil {
-		uidResolver, err = user.IDsFromStat(root, ra.App.User, uidRange)
+		uidResolver, err = user.IDsFromStat(root, ra.App.User, &p.UidRange)
 	}
 
 	if err != nil {
@@ -397,7 +391,7 @@ func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp, uidRange *u
 
 	gidResolver, err = user.NumericIDs(ra.App.Group)
 	if err != nil {
-		gidResolver, err = user.IDsFromStat(root, ra.App.Group, uidRange)
+		gidResolver, err = user.IDsFromStat(root, ra.App.Group, &p.UidRange)
 	}
 
 	if err != nil {
@@ -464,7 +458,7 @@ func EvaluateSymlinksInsideApp(appRootfs, path string) (string, error) {
 
 // appToNspawnArgs transforms the given app manifest, with the given associated
 // app name, into a subset of applicable systemd-nspawn argument
-func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp, insecureOptions Stage1InsecureOptions) ([]string, error) {
+func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string, error) {
 	var args []string
 	appName := ra.Name
 	app := ra.App
@@ -546,7 +540,7 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp, insecureOp
 		args = append(args, strings.Join(opt, ""))
 	}
 
-	if !insecureOptions.DisableCapabilities {
+	if !p.InsecureOptions.DisableCapabilities {
 		capabilitiesStr, err := getAppCapabilities(app.Isolators)
 		if err != nil {
 			return nil, err
@@ -560,7 +554,7 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp, insecureOp
 
 // PodToNspawnArgs renders a prepared Pod as a systemd-nspawn
 // argument list ready to be executed
-func PodToNspawnArgs(p *stage1commontypes.Pod, insecureOptions Stage1InsecureOptions) ([]string, error) {
+func PodToNspawnArgs(p *stage1commontypes.Pod) ([]string, error) {
 	args := []string{
 		"--uuid=" + p.UUID.String(),
 		"--machine=" + GetMachineID(p),
@@ -568,14 +562,14 @@ func PodToNspawnArgs(p *stage1commontypes.Pod, insecureOptions Stage1InsecureOpt
 	}
 
 	for i := range p.Manifest.Apps {
-		aa, err := appToNspawnArgs(p, &p.Manifest.Apps[i], insecureOptions)
+		aa, err := appToNspawnArgs(p, &p.Manifest.Apps[i])
 		if err != nil {
 			return nil, err
 		}
 		args = append(args, aa...)
 	}
 
-	if insecureOptions.DisableCapabilities {
+	if p.InsecureOptions.DisableCapabilities {
 		args = append(args, "--capability=all")
 	}
 
diff --git a/stage1/init/common/pod_test.go b/stage1/init/common/pod_test.go
index c5022ee220..04f98b61b1 100644
--- a/stage1/init/common/pod_test.go
+++ b/stage1/init/common/pod_test.go
@@ -156,8 +156,7 @@ func TestAppToNspawnArgsOverridesImageManifestReadOnly(t *testing.T) {
 		defer os.RemoveAll(tmpDir)
 
 		p := &stage1commontypes.Pod{Manifest: podManifest, Root: tmpDir}
-		insecureOptions := Stage1InsecureOptions{}
-		output, err := appToNspawnArgs(p, appManifest, insecureOptions)
+		output, err := appToNspawnArgs(p, appManifest)
 		if err != nil {
 			t.Errorf("#%d: unexpected error: `%v`", i, err)
 		}
@@ -235,7 +234,7 @@ func TestAppToNspawnArgsRecursive(t *testing.T) {
 		defer os.RemoveAll(tmpDir)
 
 		p := &stage1commontypes.Pod{Manifest: podManifest, Root: tmpDir}
-		output, err := appToNspawnArgs(p, appManifest, Stage1InsecureOptions{})
+		output, err := appToNspawnArgs(p, appManifest)
 		if err != nil {
 			t.Errorf("#%d: unexpected error: `%v`", i, err)
 		}
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index b192bd8883..a9420356ac 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -30,7 +30,6 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
-	"github.com/coreos/rkt/pkg/user"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 
 	"github.com/coreos/go-systemd/unit"
@@ -91,7 +90,7 @@ func MutableEnv(p *stage1commontypes.Pod) error {
 	return w.Error()
 }
 
-func ImmutableEnv(p *stage1commontypes.Pod, interactive bool, privateUsers string, insecureOptions Stage1InsecureOptions) error {
+func ImmutableEnv(p *stage1commontypes.Pod, interactive bool) error {
 	w := NewUnitWriter(p)
 
 	opts := []*unit.UnitOption{
@@ -172,7 +171,7 @@ func ImmutableEnv(p *stage1commontypes.Pod, interactive bool, privateUsers strin
 			opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "journal+console"))
 			opts = append(opts, unit.NewUnitOption("Service", "StandardError", "journal+console"))
 		}
-		w.AppUnit(ra, binPath, privateUsers, insecureOptions, opts...)
+		w.AppUnit(ra, binPath, opts...)
 
 		w.AppReaperUnit(ra.Name, binPath,
 			unit.NewUnitOption("Unit", "Wants", "shutdown.service"),
@@ -284,10 +283,7 @@ func (uw *UnitWriter) Error() error {
 	return uw.err
 }
 
-func (uw *UnitWriter) AppUnit(
-	ra *schema.RuntimeApp, binPath, privateUsers string, insecureOptions Stage1InsecureOptions,
-	opts ...*unit.UnitOption,
-) {
+func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*unit.UnitOption) {
 	if uw.err != nil {
 		return
 	}
@@ -323,24 +319,18 @@ func (uw *UnitWriter) AppUnit(
 
 	envFilePath := EnvFilePath(uw.p.Root, appName)
 
-	uidRange := user.NewBlankUidRange()
-	if err := uidRange.Deserialize([]byte(privateUsers)); err != nil {
-		uw.err = err
-		return
-	}
-
-	if err := common.WriteEnvFile(env, uidRange, envFilePath); err != nil {
+	if err := common.WriteEnvFile(env, &uw.p.UidRange, envFilePath); err != nil {
 		uw.err = errwrap.Wrap(errors.New("unable to write environment file for systemd"), err)
 		return
 	}
 
-	u, g, err := parseUserGroup(uw.p, ra, uidRange)
+	u, g, err := parseUserGroup(uw.p, ra)
 	if err != nil {
 		uw.err = err
 		return
 	}
 
-	if err := generateSysusers(uw.p, ra, u, g, uidRange); err != nil {
+	if err := generateSysusers(uw.p, ra, u, g, &uw.p.UidRange); err != nil {
 		uw.err = errwrap.Wrap(errors.New("unable to generate sysusers"), err)
 		return
 	}
@@ -385,14 +375,14 @@ func (uw *UnitWriter) AppUnit(
 		opts = append(opts, unit.NewUnitOption("Service", "Type", "notify"))
 	}
 
-	if !insecureOptions.DisableCapabilities {
+	if !uw.p.InsecureOptions.DisableCapabilities {
 		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
 	}
 
 	// Apply seccomp isolator, if any and not opt-ing out;
 	// see https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
 	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
-	if !insecureOptions.DisableSeccomp {
+	if !uw.p.InsecureOptions.DisableSeccomp {
 		var forceNoNewPrivileges bool
 
 		unprivileged := (u != 0)
@@ -432,7 +422,7 @@ func (uw *UnitWriter) AppUnit(
 		opts = appendOptionsList(opts, "Service", "ReadOnlyDirectories", "", common.RelAppRootfsPath(ra.Name))
 	}
 
-	if !insecureOptions.DisablePaths {
+	if !uw.p.InsecureOptions.DisablePaths {
 		// Restrict access to sensitive paths (eg. procfs and sysfs entries).
 		opts = protectKernelTunables(opts, appName, systemdVersion)
 
@@ -443,9 +433,9 @@ func (uw *UnitWriter) AppUnit(
 
 	// Generate default device policy for the app, as well as the list of allowed devices.
 	// For kvm flavor, devices are VM-specific and restricting them is not strictly needed.
-	if !insecureOptions.DisablePaths && flavor != "kvm" {
+	if !uw.p.InsecureOptions.DisablePaths && flavor != "kvm" {
 		opts = append(opts, unit.NewUnitOption("Service", "DevicePolicy", "closed"))
-		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(podAbsRoot), appName, app.MountPoints, mounts, uidRange)
+		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(podAbsRoot), appName, app.MountPoints, mounts, &uw.p.UidRange)
 		if err != nil {
 			uw.err = err
 			return
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 70be4ba0b9..eef6a1c337 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -101,36 +101,32 @@ func mirrorLocalZoneInfo(root string) {
 }
 
 var (
-	debug               bool
-	netList             common.NetList
-	interactive         bool
-	privateUsers        string
-	mdsToken            string
-	localhostIP         net.IP
-	localConfig         string
-	hostname            string
-	log                 *rktlog.Logger
-	diag                *rktlog.Logger
-	interpBin           string // Path to the interpreter within the stage1 rootfs, set by the linker
-	disableCapabilities bool
-	disablePaths        bool
-	disableSeccomp      bool
-	dnsConfMode         *pkgflag.PairList
-	mutable             bool
+	debug       bool
+	interactive bool
+	localhostIP net.IP
+	localConfig string
+	log         *rktlog.Logger
+	diag        *rktlog.Logger
+	interpBin   string // Path to the interpreter within the stage1 rootfs, set by the linker
 )
 
-func init() {
+func parseFlags() *stage1commontypes.RuntimePod {
+	rp := stage1commontypes.RuntimePod{}
+
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
-	flag.Var(&netList, "net", "Setup networking")
 	flag.BoolVar(&interactive, "interactive", false, "The pod is interactive")
-	flag.StringVar(&privateUsers, "private-users", "", "Run within user namespace. Can be set to [=UIDBASE[:NUIDS]]")
-	flag.StringVar(&mdsToken, "mds-token", "", "MDS auth token")
 	flag.StringVar(&localConfig, "local-config", common.DefaultLocalConfigDir, "Local config path")
-	flag.StringVar(&hostname, "hostname", "", "Hostname of the pod")
-	flag.BoolVar(&disableCapabilities, "disable-capabilities-restriction", false, "Disable capability restrictions")
-	flag.BoolVar(&disablePaths, "disable-paths", false, "Disable paths restrictions")
-	flag.BoolVar(&disableSeccomp, "disable-seccomp", false, "Disable seccomp restrictions")
-	dnsConfMode = pkgflag.MustNewPairList(map[string][]string{
+
+	// These flags are persisted in the PodRuntime
+	flag.BoolVar(&rp.Mutable, "mutable", false, "Enable mutable operations on this pod, including starting an empty one")
+	flag.Var(&rp.NetList, "net", "Setup networking")
+	flag.StringVar(&rp.PrivateUsers, "private-users", "", "Run within user namespace. Can be set to [=UIDBASE[:NUIDS]]")
+	flag.StringVar(&rp.MDSToken, "mds-token", "", "MDS auth token")
+	flag.StringVar(&rp.Hostname, "hostname", "", "Hostname of the pod")
+	flag.BoolVar(&rp.InsecureOptions.DisableCapabilities, "disable-capabilities-restriction", false, "Disable capability restrictions")
+	flag.BoolVar(&rp.InsecureOptions.DisablePaths, "disable-paths", false, "Disable paths restrictions")
+	flag.BoolVar(&rp.InsecureOptions.DisableSeccomp, "disable-seccomp", false, "Disable seccomp restrictions")
+	dnsConfMode := pkgflag.MustNewPairList(map[string][]string{
 		"resolv": {"host", "stage0", "none", "default"},
 		"hosts":  {"host", "stage0", "default"},
 	}, map[string]string{
@@ -138,13 +134,22 @@ func init() {
 		"hosts":  "default",
 	})
 	flag.Var(dnsConfMode, "dns-conf-mode", "DNS config file modes")
-	flag.BoolVar(&mutable, "mutable", false, "Enable mutable operations on this pod, including starting an empty one")
 
+	flag.Parse()
+
+	rp.ResolvConfMode = dnsConfMode.Pairs["resolv"]
+	rp.EtcHostsMode = dnsConfMode.Pairs["hosts"]
+
+	return &rp
+}
+
+func init() {
 	// this ensures that main runs only on main thread (thread group leader).
 	// since namespace ops (unshare, setns) are done for a single thread, we
 	// must ensure that the goroutine does not jump from OS thread to thread
 	runtime.LockOSThread()
 
+	// We'll need this later
 	localhostIP = net.ParseIP("127.0.0.1")
 	if localhostIP == nil {
 		panic("localhost IP failed to parse")
@@ -249,7 +254,7 @@ func installAssets() error {
 
 // getArgsEnv returns the nspawn or lkvm args and env according to the flavor
 // as the first two return values respectively.
-func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister bool, debug bool, n *networking.Networking, insecureOptions stage1initcommon.Stage1InsecureOptions) ([]string, []string, error) {
+func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister bool, debug bool, n *networking.Networking) ([]string, []string, error) {
 	var args []string
 	env := os.Environ()
 
@@ -262,11 +267,11 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 	// According to systemd manual (https://www.freedesktop.org/software/systemd/man/hostname.html) :
 	// "The /etc/hostname file configures the name of the local system that is set
 	// during boot using the sethostname system call"
-	if hostname == "" {
-		hostname = stage1initcommon.GetMachineID(p)
+	if p.Hostname == "" {
+		p.Hostname = stage1initcommon.GetMachineID(p)
 	}
 	hostnamePath := filepath.Join(common.Stage1RootfsPath(p.Root), "etc/hostname")
-	if err := ioutil.WriteFile(hostnamePath, []byte(hostname), 0644); err != nil {
+	if err := ioutil.WriteFile(hostnamePath, []byte(p.Hostname), 0644); err != nil {
 		return nil, nil, fmt.Errorf("error writing %s, %s", hostnamePath, err)
 	}
 
@@ -278,7 +283,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 
 	switch flavor {
 	case "kvm":
-		if privateUsers != "" {
+		if p.PrivateUsers != "" {
 			return nil, nil, fmt.Errorf("flag --private-users cannot be used with an lkvm stage1")
 		}
 
@@ -481,15 +486,15 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 	// introduced by https://github.com/systemd/systemd/pull/3809.
 	env = append(env, "SYSTEMD_NSPAWN_USE_CGNS=no")
 
-	if insecureOptions.DisablePaths {
+	if p.InsecureOptions.DisablePaths {
 		env = append(env, "SYSTEMD_NSPAWN_API_VFS_WRITABLE=yes")
 	}
 
-	if len(privateUsers) > 0 {
-		args = append(args, "--private-users="+privateUsers)
+	if len(p.PrivateUsers) > 0 {
+		args = append(args, "--private-users="+p.PrivateUsers)
 	}
 
-	nsargs, err := stage1initcommon.PodToNspawnArgs(p, insecureOptions)
+	nsargs, err := stage1initcommon.PodToNspawnArgs(p)
 	if err != nil {
 		return nil, nil, errwrap.Wrap(errors.New("failed to generate nspawn args"), err)
 	}
@@ -506,18 +511,22 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 	return args, env, nil
 }
 
-func stage1() int {
+func stage1(rp *stage1commontypes.RuntimePod) int {
 	uuid, err := types.NewUUID(flag.Arg(0))
 	if err != nil {
 		log.FatalE("UUID is missing or malformed", err)
 	}
 
 	root := "."
-	p, err := stage1commontypes.LoadPod(root, uuid)
+	p, err := stage1commontypes.LoadPod(root, uuid, rp)
 	if err != nil {
 		log.FatalE("failed to load pod", err)
 	}
 
+	if err := p.SaveRuntime(); err != nil {
+		log.FatalE("failed to save runtime parameters", err)
+	}
+
 	// set close-on-exec flag on RKT_LOCK_FD so it gets correctly closed when invoking
 	// network plugins
 	lfd, err := common.GetRktLockFD()
@@ -537,14 +546,14 @@ func stage1() int {
 	}
 
 	var n *networking.Networking
-	if netList.Contained() {
+	if p.NetList.Contained() {
 		fps, err := commonnet.ForwardedPorts(p.Manifest)
 		if err != nil {
 			log.FatalE("error initializing forwarding ports", err)
 		}
 
-		noDNS := dnsConfMode.Pairs["resolv"] != "default" // force ignore CNI DNS results
-		n, err = networking.Setup(root, p.UUID, fps, netList, localConfig, flavor, noDNS, debug)
+		noDNS := p.ResolvConfMode != "default" // force ignore CNI DNS results
+		n, err = networking.Setup(root, p.UUID, fps, p.NetList, localConfig, flavor, noDNS, debug)
 		if err != nil {
 			log.FatalE("failed to setup network", err)
 		}
@@ -555,49 +564,43 @@ func stage1() int {
 			return 254
 		}
 
-		if len(mdsToken) > 0 {
+		if len(p.MDSToken) > 0 {
 			hostIP, err := n.GetForwardableNetHostIP()
 			if err != nil {
 				log.FatalE("failed to get default Host IP", err)
 			}
 
-			p.MetadataServiceURL = common.MetadataServicePublicURL(hostIP, mdsToken)
+			p.MetadataServiceURL = common.MetadataServicePublicURL(hostIP, p.MDSToken)
 		}
 	} else {
 		if flavor == "kvm" {
 			log.Fatal("flavor kvm requires private network configuration (try --net)")
 		}
-		if len(mdsToken) > 0 {
-			p.MetadataServiceURL = common.MetadataServicePublicURL(localhostIP, mdsToken)
+		if len(p.MDSToken) > 0 {
+			p.MetadataServiceURL = common.MetadataServicePublicURL(localhostIP, p.MDSToken)
 		}
 	}
 
-	insecureOptions := stage1initcommon.Stage1InsecureOptions{
-		DisablePaths:        disablePaths,
-		DisableCapabilities: disableCapabilities,
-		DisableSeccomp:      disableSeccomp,
-	}
-
 	mnt := fs.NewLoggingMounter(
 		fs.MounterFunc(syscall.Mount),
 		fs.UnmounterFunc(syscall.Unmount),
 		diag.Printf,
 	)
 
-	if dnsConfMode.Pairs["resolv"] == "host" {
+	if p.ResolvConfMode == "host" {
 		stage1initcommon.UseHostResolv(mnt, root)
 	}
 
-	if dnsConfMode.Pairs["hosts"] == "host" {
+	if p.EtcHostsMode == "host" {
 		stage1initcommon.UseHostHosts(mnt, root)
 	}
 
-	if mutable {
+	if p.Mutable {
 		if err = stage1initcommon.MutableEnv(p); err != nil {
 			log.FatalE("cannot initialize mutable environment", err)
 		}
 	} else {
-		if err = stage1initcommon.ImmutableEnv(p, interactive, privateUsers, insecureOptions); err != nil {
+		if err = stage1initcommon.ImmutableEnv(p, interactive); err != nil {
 			log.FatalE("cannot initialize immutable environment", err)
 		}
 	}
@@ -620,7 +623,7 @@ func stage1() int {
 	}
 	diag.Printf("canMachinedRegister %t", canMachinedRegister)
 
-	args, env, err := getArgsEnv(p, flavor, canMachinedRegister, debug, n, insecureOptions)
+	args, env, err := getArgsEnv(p, flavor, canMachinedRegister, debug, n)
 	if err != nil {
 		log.FatalE("cannot get environment", err)
 	}
@@ -651,7 +654,6 @@ func stage1() int {
 	}
 	diag.Printf("unifiedCgroup %t", unifiedCgroup)
 
-	s1Root := common.Stage1RootfsPath(p.Root)
 	machineID := stage1initcommon.GetMachineID(p)
 
 	subcgroup, err := getContainerSubCgroup(machineID, canMachinedRegister, unifiedCgroup)
@@ -688,7 +690,7 @@ func stage1() int {
 		}
 		diag.Printf("serviceNames %q", serviceNames)
 
-		if err := mountContainerV1Cgroups(mnt, s1Root, enabledCgroups, subcgroup, serviceNames, insecureOptions); err != nil {
+		if err := mountContainerV1Cgroups(mnt, p, enabledCgroups, subcgroup, serviceNames); err != nil {
 			log.FatalE("couldn't mount the container v1 cgroups", err)
 		}
 
@@ -707,7 +709,7 @@ func stage1() int {
 	}
 
 	if flavor == "kvm" {
-		if err := KvmPrepareMounts(s1Root, p); err != nil {
+		if err := KvmPrepareMounts(p); err != nil {
 			log.FatalE("error preparing mounts", err)
 		}
 	}
@@ -763,13 +765,14 @@ func mountHostV1Cgroups(m fs.Mounter, enabledCgroups map[int][]string) error {
 // mountContainerV1Cgroups mounts the cgroup controllers hierarchy in the container's
 // namespace read-only, leaving the needed knobs in the subcgroup for each-app
 // read-write so systemd inside stage1 can apply isolators to them
-func mountContainerV1Cgroups(m fs.Mounter, s1Root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string, secopts stage1initcommon.Stage1InsecureOptions) error {
+func mountContainerV1Cgroups(m fs.Mounter, p *stage1commontypes.Pod, enabledCgroups map[int][]string, subcgroup string, serviceNames []string) error {
 	mountContext := os.Getenv(common.EnvSELinuxMountContext)
-	if err := v1.CreateCgroups(m, s1Root, enabledCgroups, mountContext); err != nil {
+	stage1Root := common.Stage1RootfsPath(p.Root)
+	if err := v1.CreateCgroups(m, stage1Root, enabledCgroups, mountContext); err != nil {
 		return errwrap.Wrap(errors.New("error creating container cgroups"), err)
 	}
 
-	if err := v1.RemountCgroups(m, s1Root, enabledCgroups, subcgroup, serviceNames, secopts.DisablePaths); err != nil {
+	if err := v1.RemountCgroups(m, stage1Root, enabledCgroups, subcgroup, serviceNames, p.InsecureOptions.DisablePaths); err != nil {
 		return errwrap.Wrap(errors.New("error restricting container cgroups"), err)
 	}
 
@@ -840,8 +843,7 @@ func getContainerSubCgroup(machineID string, canMachinedRegister, unified bool)
 }
 
 func main() {
-	flag.Parse()
-
+	rp := parseFlags()
 	stage1initcommon.InitDebug(debug)
 
 	log, diag, _ = rktlog.NewLogSet("stage1", debug)
@@ -850,5 +852,5 @@ func main() {
 	}
 
 	// move code into stage1() helper so deferred fns get run
-	os.Exit(stage1())
+	os.Exit(stage1(rp))
 }
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index fdf4361f93..7b810e0728 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -53,10 +53,10 @@ func KvmNetworkingToSystemd(p *stage1commontypes.Pod, n *networking.Networking)
 	return nil
 }
 
-func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
+func mountSharedVolumes(p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
 	appName := ra.Name
 
-	sharedVolPath := common.SharedVolumesPath(root)
+	sharedVolPath := common.SharedVolumesPath(p.Root)
 	if err := os.MkdirAll(sharedVolPath, stage1initcommon.SharedVolPerm); err != nil {
 		return errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
 	}
@@ -95,7 +95,7 @@ func mountSharedVolumes(root string, p *stage1commontypes.Pod, ra *schema.Runtim
 		case "host":
 			source = m.Volume.Source
 		case "empty":
-			source = filepath.Join(common.SharedVolumesPath(root), m.Volume.Name.String())
+			source = filepath.Join(common.SharedVolumesPath(p.Root), m.Volume.Name.String())
 		default:
 			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, m.Volume.Kind)
 		}
@@ -175,19 +175,19 @@ func ensureDestinationExists(source, destination string) error {
 	return nil
 }
 
-func prepareMountsForApp(s1Root string, p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
+func prepareMountsForApp(p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
 	// bind mount all shared volumes (we don't use mechanism for bind-mounting given by nspawn)
-	if err := mountSharedVolumes(s1Root, p, ra); err != nil {
+	if err := mountSharedVolumes(p, ra); err != nil {
 		return errwrap.Wrap(errors.New("failed to prepare mount point"), err)
 	}
 
 	return nil
 }
 
-func KvmPrepareMounts(s1Root string, p *stage1commontypes.Pod) error {
+func KvmPrepareMounts(p *stage1commontypes.Pod) error {
 	for i := range p.Manifest.Apps {
 		ra := &p.Manifest.Apps[i]
-		if err := prepareMountsForApp(s1Root, p, ra); err != nil {
+		if err := prepareMountsForApp(p, ra); err != nil {
 			return errwrap.Wrap(fmt.Errorf("failed prepare mounts for app %q", ra.Name), err)
 		}
 	}
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 4ff395c2d6..fe75836b95 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -64,12 +64,13 @@ var (
 	discardBool    bool
 	discardString  string
 
-	log         *rktlog.Logger
-	diag        *rktlog.Logger
-	dnsConfMode *pkgflag.PairList
+	log  *rktlog.Logger
+	diag *rktlog.Logger
 )
 
-func init() {
+func parseFlags() *stage1commontypes.RuntimePod {
+	rp := stage1commontypes.RuntimePod{}
+
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
 
 	// The following flags need to be supported by stage1 according to
@@ -89,7 +90,7 @@ func init() {
 	flag.Bool("disable-paths", true, "ignored")
 	flag.Bool("disable-seccomp", true, "ignored")
 
-	dnsConfMode = pkgflag.MustNewPairList(map[string][]string{
+	dnsConfMode := pkgflag.MustNewPairList(map[string][]string{
 		"resolv": {"host", "stage0", "none", "default"},
 		"hosts":  {"host", "stage0", "default"},
 	}, map[string]string{
@@ -98,6 +99,12 @@ func init() {
 	})
 	flag.Var(dnsConfMode, "dns-conf-mode", "DNS config file modes")
 
+	flag.Parse()
+
+	rp.ResolvConfMode = dnsConfMode.Pairs["resolv"]
+	rp.EtcHostsMode = dnsConfMode.Pairs["hosts"]
+
+	return &rp
 }
 
 func addMountPoints(namedVolumeMounts map[types.ACName]volumeMountTuple, mountpoints []types.MountPoint) error {
@@ -232,7 +239,7 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 	return argFlyMounts, nil
 }
 
-func stage1() int {
+func stage1(rp *stage1commontypes.RuntimePod) int {
 	uuid, err := types.NewUUID(flag.Arg(0))
 	if err != nil {
 		log.Print("UUID is missing or malformed\n")
@@ -240,12 +247,16 @@ func stage1() int {
 	}
 
 	root := "."
-	p, err := stage1commontypes.LoadPod(root, uuid)
+	p, err := stage1commontypes.LoadPod(root, uuid, rp)
 	if err != nil {
 		log.PrintE("can't load pod", err)
 		return 254
 	}
 
+	if err := p.SaveRuntime(); err != nil {
+		log.FatalE("failed to save runtime parameters", err)
+	}
+
 	// Sanity checks
 	if len(p.Manifest.Apps) != 1 {
 		log.Printf("flavor %q only supports 1 application per Pod for now", flavor)
@@ -315,7 +326,7 @@ func stage1() int {
 	 * 'default' - do nothing (we would respect CNI if fly had networking)
 	 * 'none' - do nothing
 	 */
-	switch dnsConfMode.Pairs["resolv"] {
+	switch p.ResolvConfMode {
 	case "host":
 		effectiveMounts = append(effectiveMounts,
 			flyMount{"/etc/resolv.conf", rfs, "/etc/resolv.conf", "none", syscall.MS_BIND | syscall.MS_RDONLY})
@@ -333,7 +344,7 @@ func stage1() int {
 	 * 'default' - create a stub /etc/hosts if needed
 	 */
 
-	switch dnsConfMode.Pairs["hosts"] {
+	switch p.EtcHostsMode {
 	case "host":
 		effectiveMounts = append(effectiveMounts,
 			flyMount{"/etc/hosts", rfs, "/etc/hosts", "none", syscall.MS_BIND | syscall.MS_RDONLY})
@@ -523,7 +534,7 @@ func copyResolv(p *stage1commontypes.Pod) error {
 }
 
 func main() {
-	flag.Parse()
+	rp := parseFlags()
 
 	log, diag, _ = rktlog.NewLogSet("run", debug)
 	if !debug {
@@ -531,5 +542,5 @@ func main() {
 	}
 
 	// move code into stage1() helper so defered fns get run
-	os.Exit(stage1())
+	os.Exit(stage1(rp))
 }

From 09f512b725b3c9121cf6e49a22c1daa0f282ad0f Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 6 Dec 2016 15:47:26 +0000
Subject: [PATCH 0949/1304] stage1: persist debug mode to runtime-pod

---
 stage1/common/types/pod.go | 1 +
 stage1/init/init.go        | 1 +
 stage1_fly/run/main.go     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/stage1/common/types/pod.go b/stage1/common/types/pod.go
index dc6b2a70fc..338a9ec312 100644
--- a/stage1/common/types/pod.go
+++ b/stage1/common/types/pod.go
@@ -53,6 +53,7 @@ type RuntimePod struct {
 	PrivateUsers       string         `json:"PrivateUsers"`
 	MDSToken           string         `json:"MDSToken"`
 	Hostname           string         `json:"Hostname"`
+	Debug              bool           `json:"Debug"`
 	Mutable            bool           `json:"Mutable"`
 	ResolvConfMode     string         `json:"ResolvConfMode"`
 	EtcHostsMode       string         `json:"EtcHostsMode"`
diff --git a/stage1/init/init.go b/stage1/init/init.go
index eef6a1c337..f4c04dab09 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -137,6 +137,7 @@ func parseFlags() *stage1commontypes.RuntimePod {
 
 	flag.Parse()
 
+	rp.Debug = debug
 	rp.ResolvConfMode = dnsConfMode.Pairs["resolv"]
 	rp.EtcHostsMode = dnsConfMode.Pairs["hosts"]
 
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index fe75836b95..ef10c26190 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -101,6 +101,7 @@ func parseFlags() *stage1commontypes.RuntimePod {
 
 	flag.Parse()
 
+	rp.Debug = debug
 	rp.ResolvConfMode = dnsConfMode.Pairs["resolv"]
 	rp.EtcHostsMode = dnsConfMode.Pairs["hosts"]
 

From 3e006e02eac1d65c0980f5b40d045227f8b566aa Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 6 Dec 2016 16:28:20 +0000
Subject: [PATCH 0950/1304] tests/inspect: reorder blocking operations

This commit reorders blocking operations, so that sleeps are performed
as first/last operations and reading stdin will block before performing
any other task.
It makes multi-step tests easier to write and without races.
---
 tests/inspect/inspect.go | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 6cc6facfbc..b95ffb988d 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -151,6 +151,26 @@ func main() {
 		os.Exit(254)
 	}
 
+	if globalFlags.SilentSigterm {
+		terminateCh := make(chan os.Signal, 1)
+		signal.Notify(terminateCh, syscall.SIGTERM)
+		go func() {
+			<-terminateCh
+			os.Exit(0)
+		}()
+	}
+
+	if globalFlags.PreSleep >= 0 {
+		time.Sleep(time.Duration(globalFlags.PreSleep) * time.Second)
+	}
+
+	if globalFlags.ReadStdin {
+		reader := bufio.NewReader(os.Stdin)
+		fmt.Printf("Enter text:\n")
+		text, _ := reader.ReadString('\n')
+		fmt.Printf("Received text: %s\n", text)
+	}
+
 	if globalFlags.PrintNoNewPrivs {
 		r1, _, err := syscall.Syscall(
 			syscall.SYS_PRCTL,
@@ -202,26 +222,6 @@ func main() {
 		}
 	}
 
-	if globalFlags.SilentSigterm {
-		terminateCh := make(chan os.Signal, 1)
-		signal.Notify(terminateCh, syscall.SIGTERM)
-		go func() {
-			<-terminateCh
-			os.Exit(0)
-		}()
-	}
-
-	if globalFlags.PreSleep >= 0 {
-		time.Sleep(time.Duration(globalFlags.PreSleep) * time.Second)
-	}
-
-	if globalFlags.ReadStdin {
-		reader := bufio.NewReader(os.Stdin)
-		fmt.Printf("Enter text:\n")
-		text, _ := reader.ReadString('\n')
-		fmt.Printf("Received text: %s\n", text)
-	}
-
 	if globalFlags.CheckTty {
 		fd := int(os.Stdin.Fd())
 		var termios syscall.Termios
@@ -419,10 +419,6 @@ func main() {
 		fmt.Printf("cwd: %s\n", wd)
 	}
 
-	if globalFlags.Sleep >= 0 {
-		time.Sleep(time.Duration(globalFlags.Sleep) * time.Second)
-	}
-
 	if globalFlags.PrintMemoryLimit {
 		// we use /proc/1/root to escape the chroot we're in and read the file
 		isUnified, err := cgroup.IsCgroupUnified("/proc/1/root/")
@@ -658,5 +654,9 @@ func main() {
 		}
 	}
 
+	if globalFlags.Sleep >= 0 {
+		time.Sleep(time.Duration(globalFlags.Sleep) * time.Second)
+	}
+
 	os.Exit(globalFlags.ExitCode)
 }

From 2cbfc3d33d386997da51aeb67dcde926565cb5cb Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Tue, 6 Dec 2016 16:31:37 -0800
Subject: [PATCH 0951/1304] stage1: run deferred cleanup in app add mount

os.Exit results in no defers running which meant garbage was left
behind.
---
 stage1/init/common/mount.go | 38 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index afa4f75f8c..3bce13e5ae 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -295,7 +295,10 @@ func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []st
 	}
 
 	for _, m := range mounts {
-		AppAddOneMount(p, ra, m.Volume.Source, m.Mount.Path, m.ReadOnly, enterCmd)
+		err := AppAddOneMount(p, ra, m.Volume.Source, m.Mount.Path, m.ReadOnly, enterCmd)
+		if err != nil {
+			log.FatalE("Unable to setup app mounts", err)
+		}
 	}
 }
 
@@ -333,7 +336,7 @@ func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []st
  * We set up the temporary playground as a slave bind mount to avoid this
  * limitation.
  */
-func AppAddOneMount(p *stage1commontypes.Pod, ra *schema.RuntimeApp, sourcePath string, dstPath string, readOnly bool, enterCmd []string) {
+func AppAddOneMount(p *stage1commontypes.Pod, ra *schema.RuntimeApp, sourcePath string, dstPath string, readOnly bool, enterCmd []string) error {
 	/* The general plan:
 	 * - bind-mount sourcePath to mountTmp
 	 * - MS_MOVE mountTmp to mountOutside, the systemd propagate dir
@@ -344,44 +347,38 @@ func AppAddOneMount(p *stage1commontypes.Pod, ra *schema.RuntimeApp, sourcePath
 	/* Prepare a temporary playground that is not a shared mount */
 	playgroundMount, err := ioutil.TempDir("", "rkt.propagate.")
 	if err != nil {
-		log.FatalE("error creating temporary propagation directory", err)
-		os.Exit(254)
+		return errwrap.Wrapf("error creating temporary propagation directory", err)
 	}
 	defer os.Remove(playgroundMount)
 
 	err = syscall.Mount(playgroundMount, playgroundMount, "bind", syscall.MS_BIND, "")
 	if err != nil {
-		log.FatalE("error mounting temporary directory", err)
-		os.Exit(254)
+		return errwrap.Wrapf("error mounting temporary directory", err)
 	}
 	defer syscall.Unmount(playgroundMount, 0)
 
 	err = syscall.Mount("", playgroundMount, "none", syscall.MS_SLAVE, "")
 	if err != nil {
-		log.FatalE("error mounting temporary directory", err)
-		os.Exit(254)
+		return errwrap.Wrapf("error mounting temporary directory", err)
 	}
 
 	/* Bind mount the source into the playground, possibly read-only */
 	mountTmp := filepath.Join(playgroundMount, "mount")
 	if err := ensureDestinationExists(sourcePath, mountTmp); err != nil {
-		log.FatalE("error creating temporary mountpoint", err)
-		os.Exit(254)
+		return errwrap.Wrapf("error creating temporary mountpoint", err)
 	}
 	defer os.Remove(mountTmp)
 
 	err = syscall.Mount(sourcePath, mountTmp, "bind", syscall.MS_BIND, "")
 	if err != nil {
-		log.FatalE("error mounting temporary mountpoint", err)
-		os.Exit(254)
+		return errwrap.Wrapf("error mounting temporary mountpoint", err)
 	}
 	defer syscall.Unmount(mountTmp, 0)
 
 	if readOnly {
 		err = syscall.Mount("", mountTmp, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
 		if err != nil {
-			log.FatalE("error remounting temporary mountpoint read-only", err)
-			os.Exit(254)
+			return errwrap.Wrapf("error remounting temporary mountpoint read-only", err)
 		}
 	}
 
@@ -390,15 +387,13 @@ func AppAddOneMount(p *stage1commontypes.Pod, ra *schema.RuntimeApp, sourcePath
 	mountOutside := filepath.Join("/run/systemd/nspawn/propagate/", "rkt-"+p.UUID.String(), "rkt.mount")
 	mountInside := filepath.Join("/run/systemd/nspawn/incoming/", filepath.Base(mountOutside))
 	if err := ensureDestinationExists(sourcePath, mountOutside); err != nil {
-		log.FatalE("error creating propagate mountpoint", err)
-		os.Exit(254)
+		return errwrap.Wrapf("error creating propagate mountpoint", err)
 	}
 	defer os.Remove(mountOutside)
 
 	err = syscall.Mount(mountTmp, mountOutside, "", syscall.MS_MOVE, "")
 	if err != nil {
-		log.FatalE("error moving temporary mountpoint to propagate directory", err)
-		os.Exit(254)
+		return errwrap.Wrapf("error moving temporary mountpoint to propagate directory", err)
 	}
 	defer syscall.Unmount(mountOutside, 0)
 
@@ -406,8 +401,7 @@ func AppAddOneMount(p *stage1commontypes.Pod, ra *schema.RuntimeApp, sourcePath
 	mountDst := filepath.Join("/opt/stage2", ra.Name.String(), "rootfs", dstPath)
 	mountDstOutside := filepath.Join(p.Root, "stage1/rootfs", mountDst)
 	if err := ensureDestinationExists(sourcePath, mountDstOutside); err != nil {
-		log.FatalE("error creating destination directory", err)
-		os.Exit(254)
+		return errwrap.Wrapf("error creating destination directory", err)
 	}
 
 	args := enterCmd
@@ -419,7 +413,7 @@ func AppAddOneMount(p *stage1commontypes.Pod, ra *schema.RuntimeApp, sourcePath
 	}
 
 	if err := cmd.Run(); err != nil {
-		log.PrintE("error executing mount move", err)
-		os.Exit(254)
+		return errwrap.Wrapf("error executing mount move", err)
 	}
+	return nil
 }

From 27431bd5940b7a1c9bdfe8fb649c53d0277d511e Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 5 Dec 2016 12:20:08 +0000
Subject: [PATCH 0952/1304] tests: add a waitPodReady helper

---
 tests/rkt_app_sandbox_test.go | 26 ++---------------------
 tests/rkt_tests.go            | 39 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index b5796e6329..5b0a6dd9f8 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -19,7 +19,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -68,30 +67,9 @@ func TestAppSandboxSmoke(t *testing.T) {
 	}
 
 	// wait for the sandbox to start
-	var podUUID []byte
-	for i := 0; i < 20; i++ {
-		time.Sleep(500 * time.Millisecond)
-		podUUID, err = ioutil.ReadFile(uuidFile)
-		if err == nil {
-			break
-		}
-	}
+	podUUID, err := waitPodReady(ctx, uuidFile, actionTimeout)
 	if err != nil {
-		t.Fatalf("Can't read pod UUID: %v", err)
-	}
-
-	// wait for the pod supervisor to be ready
-	podReadyFile := filepath.Join(ctx.DataDir(), "pods", "run", string(podUUID), "stage1/rootfs/rkt/supervisor-status")
-	target := ""
-	for i := 0; i < 20; i++ {
-		time.Sleep(500 * time.Millisecond)
-		target, err = os.Readlink(podReadyFile)
-		if err == nil && target == "ready" {
-			break
-		}
-	}
-	if err != nil || target != "ready" {
-		t.Fatalf("Pod failed to become ready while checking %q", podReadyFile)
+		t.Fatal(err)
 	}
 
 	cmd = strings.Fields(fmt.Sprintf("%s app add --debug %s %s --name=%s", ctx.Cmd(), podUUID, imageName, appName))
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index a0a847828d..2dc247df76 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -142,6 +142,45 @@ func waitOrFail(t *testing.T, child *gexpect.ExpectSubprocess, expectedStatus in
 	}
 }
 
+// waitPodReady waits for the pod supervisor to get ready, busy-looping until `timeout`
+// while waiting for it. It returns the pod UUID or an error on failure.
+func waitPodReady(ctx *testutils.RktRunCtx, uuidFile string, timeout time.Duration) (string, error) {
+	var podUUID []byte
+	var err error
+	interval := 500 * time.Millisecond
+	elapsed := time.Duration(0)
+
+	for elapsed < timeout {
+		time.Sleep(interval)
+		elapsed += interval
+		podUUID, err = ioutil.ReadFile(uuidFile)
+		if err == nil {
+			break
+		}
+	}
+	if err != nil {
+		return "", fmt.Errorf("Can't read pod UUID: %v", err)
+	}
+
+	// wait for the pod supervisor to be ready
+	podReadyFile := filepath.Join(ctx.DataDir(), "pods", "run", string(podUUID), "stage1/rootfs/rkt/supervisor-status")
+	target := ""
+	elapsed = time.Duration(0)
+	for elapsed < timeout {
+		time.Sleep(interval)
+		elapsed += interval
+		target, err = os.Readlink(podReadyFile)
+		if err == nil && target == "ready" {
+			break
+		}
+	}
+	if err != nil || target != "ready" {
+		return "", fmt.Errorf("Pod failed to become ready while checking %q", podReadyFile)
+	}
+
+	return string(podUUID), nil
+}
+
 func spawnAndWaitOrFail(t *testing.T, cmd string, expectedStatus int) {
 	child := spawnOrFail(t, cmd)
 	waitOrFail(t, child, expectedStatus)

From 632b923e190100af62e5234fde454f1741f0ebfc Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Tue, 6 Dec 2016 17:17:44 +0100
Subject: [PATCH 0953/1304] stage1: app add, status didn't work with empty vols

Fixes #3398
---
 lib/app.go                  |  4 ---
 stage1/init/common/mount.go | 50 ++++++++++++++++++++++++++++++++++---
 stage1/init/common/pod.go   | 17 +++++--------
 stage1/init/kvm.go          | 10 +-------
 4 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/lib/app.go b/lib/app.go
index 78bc7aa474..7061f5a988 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -84,10 +84,6 @@ func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.
 			break
 		}
 
-		if hostPath == "" { // This should not happen.
-			return nil, fmt.Errorf("cannot find corresponded volume for mount %v", mnt)
-		}
-
 		app.Mounts = append(app.Mounts, &Mount{
 			Name:          name,
 			ContainerPath: containerPath,
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 3bce13e5ae..01eb705b13 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -15,6 +15,7 @@
 package common
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -23,6 +24,7 @@ import (
 	"strconv"
 	"syscall"
 
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/fileutil"
 	"github.com/coreos/rkt/pkg/fs"
 	"github.com/coreos/rkt/pkg/user"
@@ -61,6 +63,18 @@ func ConvertedFromDocker(im *schema.ImageManifest) bool {
 	return ok
 }
 
+// Source computes the real volume source for a volume.
+// Volumes of type 'empty' use a workdir relative to podRoot
+func (m *mountWrapper) Source(podRoot string) string {
+	switch m.Volume.Kind {
+	case "host":
+		return m.Volume.Source
+	case "empty":
+		return filepath.Join(common.SharedVolumesPath(podRoot), m.Volume.Name.String())
+	}
+	return "" // We validate in GenerateMounts that it's valid
+}
+
 // GenerateMounts maps MountPoint paths to volumes, returning a list of mounts,
 // each with a parameter indicating if it's an implicit empty volume from a
 // Docker image.
@@ -108,6 +122,12 @@ func GenerateMounts(ra *schema.RuntimeApp, podVolumes []types.Volume, convertedF
 			ro = *vol.ReadOnly
 		}
 
+		switch vol.Kind {
+		case "host":
+		case "empty":
+		default:
+			return nil, fmt.Errorf("Volume %s has invalid kind %s", vol.Name, vol.Kind)
+		}
 		genMnts = append(genMnts,
 			mountWrapper{
 				Mount:          m,
@@ -267,12 +287,12 @@ func ensureDestinationExists(source, destination string) error {
 	}
 
 	if fileInfo.IsDir() {
-		if err := os.Mkdir(destination, SharedVolPerm); !os.IsExist(err) {
-			return err
+		if err := os.Mkdir(destination, SharedVolPerm); err != nil && !os.IsExist(err) {
+			return errwrap.Wrap(errors.New("could not create destination directory "+destination), err)
 		}
 	} else {
 		if file, err := os.OpenFile(destination, os.O_CREATE, SharedVolPerm); err != nil {
-			return err
+			return errwrap.Wrap(errors.New("could not create destination file"), err)
 		} else {
 			file.Close()
 		}
@@ -294,8 +314,30 @@ func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []st
 		os.Exit(254)
 	}
 
+	absRoot, err := filepath.Abs(p.Root)
+	if err != nil {
+		log.FatalE("could not determine pod's absolute path", err)
+	}
+
+	appRootfs := common.AppRootfsPath(absRoot, ra.Name)
+
+	// This logic is mostly copied from appToNspawnArgs
+	// TODO(cdc): deduplicate
 	for _, m := range mounts {
-		err := AppAddOneMount(p, ra, m.Volume.Source, m.Mount.Path, m.ReadOnly, enterCmd)
+		shPath := filepath.Join(common.SharedVolumesPath(p.Root), m.Volume.Name.String())
+
+		// Evaluate symlinks within the app's rootfs - otherwise absolute
+		// symlinks will be wrong.
+		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Mount.Path)
+		if err != nil {
+			log.Fatalf("Could not evaluate path %v: %v", m.Mount.Path, err)
+		}
+		mntAbsPath := filepath.Join(appRootfs, mntPath)
+		// Create the stage1 destination
+		if err := PrepareMountpoints(shPath, mntAbsPath, &m.Volume, m.DockerImplicit); err != nil {
+			log.FatalE("could not prepare mountpoint", err)
+		}
+		err = AppAddOneMount(p, ra, m.Source(absRoot), m.Mount.Path, m.ReadOnly, enterCmd)
 		if err != nil {
 			log.FatalE("Unable to setup app mounts", err)
 		}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 710dfc7d41..4035cac320 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -411,6 +411,7 @@ func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (int, int,
 
 // EvaluateSymlinksInsideApp tries to resolve symlinks within the path.
 // It returns the actual path relative to the app rootfs for the given path.
+// This is needed for absolute symlinks - we are in a different rootfs.
 func EvaluateSymlinksInsideApp(appRootfs, path string) (string, error) {
 	link := appRootfs
 
@@ -492,9 +493,10 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 
 		appRootfs := common.AppRootfsPath(absRoot, appName)
 
-		// TODO(yifan): This is a temporary fix for systemd-nspawn not handling symlink mounts well.
-		// Could be removed when https://github.com/systemd/systemd/issues/2860 is resolved, and systemd
-		// version is bumped.
+		// Evaluate symlinks within the app's rootfs. This is needed because symlinks
+		// within the container can be absolute, which will, of course, be wrong in our ns.
+		// Systemd also gets this wrong, see https://github.com/systemd/systemd/issues/2860
+		// When the above issue is fixed, we can pass the un-evaluated path to --bind instead.
 		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Mount.Path)
 		if err != nil {
 			return nil, errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Mount.Path), err)
@@ -513,14 +515,7 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 			opt[0] = "--bind="
 		}
 
-		switch m.Volume.Kind {
-		case "host":
-			opt[1] = m.Volume.Source
-		case "empty":
-			opt[1] = filepath.Join(common.SharedVolumesPath(absRoot), m.Volume.Name.String())
-		default:
-			return nil, fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, m.Volume.Kind)
-		}
+		opt[1] = m.Source(absRoot)
 		opt[2] = ":"
 		opt[3] = filepath.Join(common.RelAppRootfsPath(appName), mntPath)
 		opt[4] = ":"
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index 7b810e0728..e62ad8d618 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -90,15 +90,7 @@ func mountSharedVolumes(p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
 			return err
 		}
 
-		var source string
-		switch m.Volume.Kind {
-		case "host":
-			source = m.Volume.Source
-		case "empty":
-			source = filepath.Join(common.SharedVolumesPath(p.Root), m.Volume.Name.String())
-		default:
-			return fmt.Errorf(`invalid volume kind %q. Must be one of "host" or "empty"`, m.Volume.Kind)
-		}
+		source := m.Source(p.Root)
 		if cleanedSource, err := filepath.EvalSymlinks(source); err != nil {
 			return errwrap.Wrap(fmt.Errorf("could not resolve symlink for source: %v", source), err)
 		} else if err := ensureDestinationExists(cleanedSource, absDestination); err != nil {

From 809db88a50c7ea260e20cf0c265f6912acfce831 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 8 Dec 2016 12:23:47 +0100
Subject: [PATCH 0954/1304] vendor: add missing files from a bad glide update

---
 .../shirou/gopsutil/cpu/cpu_fallback.go       |  21 +++
 .../shirou/gopsutil/host/host_fallback.go     |  21 +++
 .../shirou/gopsutil/load/load_fallback.go     |  13 ++
 .../shirou/gopsutil/mem/mem_fallback.go       |  13 ++
 .../shirou/gopsutil/net/net_fallback.go       |  21 +++
 .../gopsutil/process/process_fallback.go      | 145 ++++++++++++++++++
 6 files changed, 234 insertions(+)
 create mode 100644 vendor/github.com/shirou/gopsutil/cpu/cpu_fallback.go
 create mode 100644 vendor/github.com/shirou/gopsutil/host/host_fallback.go
 create mode 100644 vendor/github.com/shirou/gopsutil/load/load_fallback.go
 create mode 100644 vendor/github.com/shirou/gopsutil/mem/mem_fallback.go
 create mode 100644 vendor/github.com/shirou/gopsutil/net/net_fallback.go
 create mode 100644 vendor/github.com/shirou/gopsutil/process/process_fallback.go

diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_fallback.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_fallback.go
new file mode 100644
index 0000000000..4fc8257a91
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_fallback.go
@@ -0,0 +1,21 @@
+// +build !darwin,!linux,!freebsd,!windows
+
+package cpu
+
+import (
+	"time"
+
+	"github.com/shirou/gopsutil/internal/common"
+)
+
+func Times(percpu bool) ([]TimesStat, error) {
+	return []TimesStat{}, common.ErrNotImplementedError
+}
+
+func Info() ([]InfoStat, error) {
+	return []InfoStat{}, common.ErrNotImplementedError
+}
+
+func Percent(interval time.Duration, percpu bool) ([]float64, error) {
+	return []float64{}, common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_fallback.go b/vendor/github.com/shirou/gopsutil/host/host_fallback.go
new file mode 100644
index 0000000000..7a9301bdf5
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_fallback.go
@@ -0,0 +1,21 @@
+// +build !darwin,!linux,!freebsd,!windows
+
+package host
+
+import "github.com/shirou/gopsutil/internal/common"
+
+func Info() (*InfoStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func BootTime() (uint64, error) {
+	return 0, common.ErrNotImplementedError
+}
+
+func Uptime() (uint64, error) {
+	return 0, common.ErrNotImplementedError
+}
+
+func Users() ([]UserStat, error) {
+	return []UserStat{}, common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_fallback.go b/vendor/github.com/shirou/gopsutil/load/load_fallback.go
new file mode 100644
index 0000000000..6dfb8e6ea6
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_fallback.go
@@ -0,0 +1,13 @@
+// +build !darwin,!linux,!freebsd,!windows
+
+package load
+
+import "github.com/shirou/gopsutil/internal/common"
+
+func Avg() (*AvgStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func Misc() (*MiscStat, error) {
+	return nil, common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_fallback.go b/vendor/github.com/shirou/gopsutil/mem/mem_fallback.go
new file mode 100644
index 0000000000..022b9422b8
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_fallback.go
@@ -0,0 +1,13 @@
+// +build !darwin,!linux,!freebsd,!windows
+
+package mem
+
+import "github.com/shirou/gopsutil/internal/common"
+
+func VirtualMemory() (*VirtualMemoryStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func SwapMemory() (*SwapMemoryStat, error) {
+	return nil, common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/net/net_fallback.go b/vendor/github.com/shirou/gopsutil/net/net_fallback.go
new file mode 100644
index 0000000000..b2c80090fc
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/net/net_fallback.go
@@ -0,0 +1,21 @@
+// +build !darwin,!linux,!freebsd,!windows
+
+package net
+
+import "github.com/shirou/gopsutil/internal/common"
+
+func IOCounters(pernic bool) ([]IOCountersStat, error) {
+	return []IOCountersStat{}, common.ErrNotImplementedError
+}
+
+func FilterCounters() ([]FilterStat, error) {
+	return []FilterStat{}, common.ErrNotImplementedError
+}
+
+func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
+	return []ProtoCountersStat{}, common.ErrNotImplementedError
+}
+
+func Connections(kind string) ([]ConnectionStat, error) {
+	return []ConnectionStat{}, common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_fallback.go b/vendor/github.com/shirou/gopsutil/process/process_fallback.go
new file mode 100644
index 0000000000..35ba7c19bb
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/process_fallback.go
@@ -0,0 +1,145 @@
+// +build !darwin,!linux,!freebsd,!windows
+
+package process
+
+import (
+	"syscall"
+
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
+)
+
+type MemoryMapsStat struct {
+	Path         string `json:"path"`
+	Rss          uint64 `json:"rss"`
+	Size         uint64 `json:"size"`
+	Pss          uint64 `json:"pss"`
+	SharedClean  uint64 `json:"sharedClean"`
+	SharedDirty  uint64 `json:"sharedDirty"`
+	PrivateClean uint64 `json:"privateClean"`
+	PrivateDirty uint64 `json:"privateDirty"`
+	Referenced   uint64 `json:"referenced"`
+	Anonymous    uint64 `json:"anonymous"`
+	Swap         uint64 `json:"swap"`
+}
+
+type MemoryInfoExStat struct {
+}
+
+func Pids() ([]int32, error) {
+	return []int32{}, common.ErrNotImplementedError
+}
+
+func NewProcess(pid int32) (*Process, error) {
+	return nil, common.ErrNotImplementedError
+}
+
+func (p *Process) Ppid() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Name() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Exe() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Cmdline() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) CmdlineSlice() ([]string, error) {
+	return []string{}, common.ErrNotImplementedError
+}
+func (p *Process) CreateTime() (int64, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Cwd() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Parent() (*Process, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) Status() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Uids() ([]int32, error) {
+	return []int32{}, common.ErrNotImplementedError
+}
+func (p *Process) Gids() ([]int32, error) {
+	return []int32{}, common.ErrNotImplementedError
+}
+func (p *Process) Terminal() (string, error) {
+	return "", common.ErrNotImplementedError
+}
+func (p *Process) Nice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) IOnice() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Rlimit() ([]RlimitStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) IOCounters() (*IOCountersStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) NumFDs() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) NumThreads() (int32, error) {
+	return 0, common.ErrNotImplementedError
+}
+func (p *Process) Threads() (map[string]string, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) Times() (*cpu.TimesStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) CPUAffinity() ([]int32, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) Children() ([]*Process, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
+	return []OpenFilesStat{}, common.ErrNotImplementedError
+}
+func (p *Process) Connections() ([]net.ConnectionStat, error) {
+	return []net.ConnectionStat{}, common.ErrNotImplementedError
+}
+func (p *Process) NetIOCounters(pernic bool) ([]net.IOCountersStat, error) {
+	return []net.IOCountersStat{}, common.ErrNotImplementedError
+}
+func (p *Process) IsRunning() (bool, error) {
+	return true, common.ErrNotImplementedError
+}
+func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
+	return nil, common.ErrNotImplementedError
+}
+func (p *Process) SendSignal(sig syscall.Signal) error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Suspend() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Resume() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Terminate() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Kill() error {
+	return common.ErrNotImplementedError
+}
+func (p *Process) Username() (string, error) {
+	return "", common.ErrNotImplementedError
+}

From 94408a3c5f7eda2519e63a45986a582b6f716509 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 8 Dec 2016 14:27:22 +0100
Subject: [PATCH 0955/1304] net: increase the default-restricted subnet to a
 /16

---
 stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf | 2 +-
 tests/rkt_net_test.go                                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf b/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
index 98c12e1f51..30970cb7df 100644
--- a/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
+++ b/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
@@ -5,6 +5,6 @@
 	"ipMasq": false,
 	"ipam": {
 		"type": "host-local",
-		"subnet": "172.16.29.0/24"
+		"subnet": "172.17.0.0/16"
 	}
 }
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index dc06f919da..c74bdcb0c9 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -1171,7 +1171,7 @@ func NewNetDefaultIPArgTest() testutils.Test {
 	}
 	return testutils.TestFunc(func(t *testing.T) {
 		doTest("default:IP=172.16.28.123", "172.16.28.123", t)
-		doTest("default-restricted:IP=172.16.29.42", "172.16.29.42", t)
+		doTest("default-restricted:IP=172.17.42.42", "172.17.42.42", t)
 	})
 }
 

From c938d233200aec012f4adbc70f08d8805641330f Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 8 Dec 2016 15:53:59 +0100
Subject: [PATCH 0956/1304] version: bump to v1.21.0

---
 CHANGELOG.md                         | 33 ++++++++++++++++++++++++++++
 Documentation/distributions.md       | 16 +++++++-------
 Documentation/proposals/oci.md       |  6 ++---
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  4 ++--
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 ++---
 ROADMAP.md                           |  8 +++----
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 19 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0529bb9167..22db4d144c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,36 @@
+## 1.21.0
+
+This release includes bugfixes for the experimental CRI support, more stable integration tests, and some other interesting changes:
+
+- The `default-restricted` network changed from 172.16.28.0/24 to 172.17.0.0/26.
+- The detailed roadmap for OCI support has been finalized.
+
+
+### New features
+- Change the subnet for the default-restricted network ([#3440](https://github.com/coreos/rkt/pull/3440)), ([#3459](https://github.com/coreos/rkt/pull/3459)).
+- Prepare for writable /proc/sys, and /sys ([#3389](https://github.com/coreos/rkt/pull/3389)).
+- Documentation/proposals: add OCI Image Format roadmap ([#3425](https://github.com/coreos/rkt/pull/3425)).
+
+### Bug fixes
+- stage1: app add, status didn't work with empty vols ([#3451](https://github.com/coreos/rkt/pull/3451)).
+- stage1: properly run defer'd umounts in app add ([#3455](https://github.com/coreos/rkt/pull/3455)).
+- cri: correct 'created' timestamp ([#3399](https://github.com/coreos/rkt/pull/3399)).
+- fly: ensure the target bin directory exists before building ([#3436](https://github.com/coreos/rkt/pull/3436)).
+- rkt: misc systemd-related fixes ([#3418](https://github.com/coreos/rkt/pull/3418)).
+
+### Other changes
+- pkg/mountinfo: move mountinfo parser to its own package ([#3415](https://github.com/coreos/rkt/pull/3415)).
+- stage1: persist runtime parameters ([#3432](https://github.com/coreos/rkt/pull/3432)), ([#3450](https://github.com/coreos/rkt/pull/3450)).
+- stage1: signal supervisor readiness ([#3424](https://github.com/coreos/rkt/pull/3424)), ([#3439](https://github.com/coreos/rkt/pull/3439)).
+- sandbox: add missing flagDNSDomain and flagHostsEntries parameters ([#3430](https://github.com/coreos/rkt/pull/3430)).
+- pkg/tar: fix variable name in error ([#3433](https://github.com/coreos/rkt/pull/3433)).
+- tests: fix TestExport for the KVM+overlay case ([#3435](https://github.com/coreos/rkt/pull/3435)).
+- tests: fix some potential gexpect hangs ([#3443](https://github.com/coreos/rkt/pull/3443)).
+- tests: add smoke test for app sandbox ([#3371](https://github.com/coreos/rkt/pull/3371)).
+- tests: tentative fixes for sporadic host and kvm failures ([#3434](https://github.com/coreos/rkt/pull/3434)).
+- rkt: remove empty TODO ([#3417](https://github.com/coreos/rkt/pull/3417)).
+- Documentation updates: [#3446](https://github.com/coreos/rkt/pull/3446), ([#3421](https://github.com/coreos/rkt/pull/3421)), ([#3412](https://github.com/coreos/rkt/pull/3412)).
+
 ## 1.20.0
 
 This release contains additional bug fixes for the new experimental `app` subcommand, following the path towards the Container Runtime Interface (CRI).
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 61bb70dbcd..9c284ba461 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -132,19 +132,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt-1.20.0-1.x86_64.rpm
-wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt-1.20.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.20.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.20.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt-1.21.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt-1.21.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.21.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.21.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt_1.20.0-1_amd64.deb
-wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt_1.20.0-1_amd64.deb.asc
-gpg --verify rkt_1.20.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.20.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt_1.21.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt_1.21.0-1_amd64.deb.asc
+gpg --verify rkt_1.21.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.21.0-1_amd64.deb
 ```
 
 [coreos-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index bafad6e8b4..1a1e3efb22 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/coreos/rkt/blob/v1.20.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.20.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/coreos/rkt/blob/v1.20.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/coreos/rkt/blob/v1.21.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.21.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/coreos/rkt/blob/v1.21.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 6d31a754ac..f5c1170048 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.20.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.21.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.20.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.21.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index bf03264509..6c47e872e9 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.20.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.21.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.20.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.21.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 742ce11589..260f0f08ec 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.20.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.21.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.20.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.21.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index d278fc7033..c3090ac3ea 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.20.0
+rkt Version: 1.21.0
 appc Version: 0.8.9
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index ccfa7c912a..fb3492dd70 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.20.0/rkt-v1.20.0.tar.gz
-tar xzvf rkt-v1.20.0.tar.gz
-cd rkt-v1.20.0
+wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt-v1.21.0.tar.gz
+tar xzvf rkt-v1.21.0.tar.gz
+cd rkt-v1.21.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 4bdaa09932..b5b3cdf43b 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -14,14 +14,14 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 
 ## Next releases
 
-### rkt 1.21.0 (December)
-
-Up-to-date planning at https://github.com/coreos/rkt/milestone/55.
-
 ### rkt 1.22.0 (January)
 
 Up-to-date planning at https://github.com/coreos/rkt/milestone/56.
 
+### rkt 1.23.0 (January)
+
+Up-to-date planning at https://github.com/coreos/rkt/milestone/57.
+
 ### Upcoming
 
 Future tasks without a specific timeline are tracked at https://github.com/coreos/rkt/milestone/30.
diff --git a/configure.ac b/configure.ac
index 149ead81b5..48cbcd940a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.20.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.21.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 78366dc226..efada68c8e 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.20.0"
+version="1.21.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index edb1b35675..2ea8246a3a 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.20.0"
+            "value": "1.21.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index bc52c475e4..d14c72a499 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.20.0"
+            "value": "1.21.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 0458fdd10c..9673c85380 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.20.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.21.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index fd2c22bbd2..295dd44858 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.20.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.21.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 4a155c5b92..05784a224b 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.20.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.21.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 2fb974b92b..73ccd40867 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.20.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.21.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index efa22096fc..64ed2c0965 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.20.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.21.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 5591330b7f..e9b14d567e 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.20.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.21.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From d78ccdfd8b4b17acf88a73087bb542b7470c9bd4 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 8 Dec 2016 15:53:59 +0100
Subject: [PATCH 0957/1304] version: bump to v1.21.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 48cbcd940a..f17571ef6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.21.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.21.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 9673c85380..5dadf08ebb 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.21.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.21.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 4bf0e639f41ae92aa371fba8990345611e1e18fd Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 8 Dec 2016 11:29:32 -0800
Subject: [PATCH 0958/1304] docs: always rkt, never Rkt

---
 Documentation/distributions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 9c284ba461..1b4d282b21 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -61,7 +61,7 @@ rkt's entry in the [Fedora package database][pkg-fedora] tracks packaging work f
 
 #### Caveat: SELinux
 
-Rkt does not work with the SELinux policies currently shipped with Fedora versions 24 and 25.
+rkt does not work with the SELinux policies currently shipped with Fedora versions 24 and 25.
 
 As a workaround, SELinux can be temporarily disabled:
 ```

From b5a4b8d7a1c8636571b2e382426833fb71a804a9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 9 Dec 2016 16:04:06 +0000
Subject: [PATCH 0959/1304] glide: bump gexpect to 0.1.1

---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index a5f66f2be9..2abd8971e0 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -68,7 +68,7 @@ import:
   - plugins/meta/flannel
   - plugins/meta/tuning
 - package: github.com/coreos/gexpect
-  version: v0.1.0
+  version: v0.1.1
 - package: github.com/coreos/go-iptables
   version: v0.1.0
   subpackages:

From 8b1069e51057ca48f672be229a2e00081185c87f Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 9 Dec 2016 16:11:56 +0000
Subject: [PATCH 0960/1304] vendor: update after gexpect bump

---
 glide.lock                                  | 6 +++---
 vendor/github.com/coreos/gexpect/gexpect.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/glide.lock b/glide.lock
index 8d37b5239a..202f30ca37 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 9c5ba5b4d8b105b7abb52deedfdc16c33f0e0449cbb130202dac3cf2bed88748
-updated: 2016-11-22T16:37:00.043435766+01:00
+hash: cd7bf107f8962ba89c5471bc6d883112b33a7b2d91f97dc3057c3430f3b2cc42
+updated: 2016-12-09T16:05:25.074433175Z
 imports:
 - name: github.com/appc/docker2aci
   version: 64543c1e0a7306b17d0d214549ec08049b234abc
@@ -68,7 +68,7 @@ imports:
   - plugins/meta/flannel
   - plugins/meta/tuning
 - name: github.com/coreos/gexpect
-  version: ca42424d18c76d0d51a4cccd830d11878e9e5c17
+  version: 8d6e05eaaeb840725b2c2aba77483919659bb95e
 - name: github.com/coreos/go-iptables
   version: fbb73372b87f6e89951c2b6b31470c2c9d5cfae3
   subpackages:
diff --git a/vendor/github.com/coreos/gexpect/gexpect.go b/vendor/github.com/coreos/gexpect/gexpect.go
index 4ea620ef6e..6e918cb69c 100644
--- a/vendor/github.com/coreos/gexpect/gexpect.go
+++ b/vendor/github.com/coreos/gexpect/gexpect.go
@@ -318,7 +318,7 @@ func (expect *ExpectSubprocess) Expect(searchString string) (e error) {
 
 	for {
 		n, err := expect.buf.Read(chunk)
-		if err != nil {
+		if n == 0 && err != nil {
 			return err
 		}
 		if expect.outputBuffer != nil {

From 25284c0207d0ee148bee0d1fa7e5c7c509557066 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Fri, 9 Dec 2016 14:18:18 -0800
Subject: [PATCH 0961/1304] mount: ensure shared volume path exists

Before this change, the `copy-up` operation could fail with:
`stage1: could not prepare mountpoint: mkdir sharedVolumes/foo: no such file or directory`

This would occur because `CopyTree` does not implicitly create the
target directory, so we must create it prior to calling.
---
 stage1/app-add/app-add.go   |  5 ++++-
 stage1/init/common/mount.go | 13 +++++++++++--
 stage1/init/common/pod.go   |  1 -
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/stage1/app-add/app-add.go b/stage1/app-add/app-add.go
index 9cb76fde6a..346d1c3cd9 100644
--- a/stage1/app-add/app-add.go
+++ b/stage1/app-add/app-add.go
@@ -97,7 +97,10 @@ func main() {
 	}
 
 	enterCmd := stage1common.PrepareEnterCmd(false)
-	stage1initcommon.AppAddMounts(p, ra, enterCmd)
+	err = stage1initcommon.AppAddMounts(p, ra, enterCmd)
+	if err != nil {
+		log.FatalE("error adding app mounts", err)
+	}
 
 	// when using host cgroups, make the subgroup writable by pod systemd
 	if flavor != "kvm" {
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 01eb705b13..d941551c8e 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -300,7 +300,15 @@ func ensureDestinationExists(source, destination string) error {
 	return nil
 }
 
-func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []string) {
+func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []string) error {
+	sharedVolPath := common.SharedVolumesPath(p.Root)
+	if err := os.MkdirAll(sharedVolPath, SharedVolPerm); err != nil {
+		return errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
+	}
+	if err := os.Chmod(sharedVolPath, SharedVolPerm); err != nil {
+		return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
+	}
+
 	vols := make(map[types.ACName]types.Volume)
 	for _, v := range p.Manifest.Volumes {
 		vols[v.Name] = v
@@ -324,7 +332,7 @@ func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []st
 	// This logic is mostly copied from appToNspawnArgs
 	// TODO(cdc): deduplicate
 	for _, m := range mounts {
-		shPath := filepath.Join(common.SharedVolumesPath(p.Root), m.Volume.Name.String())
+		shPath := filepath.Join(sharedVolPath, m.Volume.Name.String())
 
 		// Evaluate symlinks within the app's rootfs - otherwise absolute
 		// symlinks will be wrong.
@@ -342,6 +350,7 @@ func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []st
 			log.FatalE("Unable to setup app mounts", err)
 		}
 	}
+	return nil
 }
 
 /* AppAddOneMount bind-mounts "sourcePath" from the host into "dstPath" in
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 4035cac320..e405a760bf 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -483,7 +483,6 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 		return nil, errwrap.Wrap(fmt.Errorf("could not generate app %q mounts", appName), err)
 	}
 	for _, m := range mounts {
-
 		shPath := filepath.Join(sharedVolPath, m.Volume.Name.String())
 
 		absRoot, err := filepath.Abs(p.Root) // Absolute path to the pod's rootfs.

From 61fad055c110ec1bf45e22ba57d0b733bfe15d3d Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Fri, 9 Dec 2016 16:51:22 -0800
Subject: [PATCH 0962/1304] stage0: pass debug flag to app entrypoints

---
 stage0/app.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stage0/app.go b/stage0/app.go
index 445e78eb71..845e859e82 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -258,6 +258,7 @@ func AddApp(cfg AddConfig) error {
 	}
 
 	args := []string{
+		fmt.Sprintf("--debug=%t", cfg.Debug),
 		fmt.Sprintf("--uuid=%s", cfg.UUID),
 		fmt.Sprintf("--app=%s", appName),
 	}
@@ -359,6 +360,7 @@ func RmApp(cfg RmConfig) error {
 		// Otherwise, there's not much we can do about it except unmounting/removing
 		// the file system.
 		args := []string{
+			fmt.Sprintf("--debug=%t", cfg.Debug),
 			fmt.Sprintf("--app=%s", cfg.AppName),
 		}
 
@@ -471,6 +473,7 @@ func StartApp(cfg StartConfig) error {
 	}
 
 	args := []string{
+		fmt.Sprintf("--debug=%t", cfg.Debug),
 		fmt.Sprintf("--app=%s", cfg.AppName),
 	}
 
@@ -524,6 +527,7 @@ func StopApp(cfg StopConfig) error {
 	}
 
 	args := []string{
+		fmt.Sprintf("--debug=%t", cfg.Debug),
 		fmt.Sprintf("--app=%s", cfg.AppName),
 	}
 

From a64181f519b927a90c090c8970cad7c9157688a6 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Fri, 9 Dec 2016 17:34:25 -0800
Subject: [PATCH 0963/1304] stage1: dedupe shared volume path creation logic

---
 common/common.go            | 19 +++++++++++++++++++
 stage1/init/common/mount.go | 17 +++++++----------
 stage1/init/common/pod.go   | 12 ++++--------
 stage1/init/kvm.go          | 15 ++++++---------
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/common/common.go b/common/common.go
index 3821fa7212..4179632211 100644
--- a/common/common.go
+++ b/common/common.go
@@ -18,6 +18,7 @@ package common
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"net"
 	"os"
@@ -37,6 +38,7 @@ import (
 
 const (
 	sharedVolumesDir = "/sharedVolumes"
+	SharedVolumePerm = os.FileMode(0755)
 	stage1Dir        = "/stage1"
 	stage2Dir        = "/opt/stage2"
 	AppsInfoDir      = "/appsinfo"
@@ -199,6 +201,23 @@ func SharedVolumesPath(root string) string {
 	return filepath.Join(root, sharedVolumesDir)
 }
 
+// CreateSharedVolumesPath ensures the sharedVolumePath for the pod root passed
+// in exists. It returns the shared volume path or an error.
+func CreateSharedVolumesPath(root string) (string, error) {
+	sharedVolPath := SharedVolumesPath(root)
+
+	if err := os.MkdirAll(sharedVolPath, SharedVolumePerm); err != nil {
+		return "", errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
+	}
+	// In case it already existed and we didn't make it, ensure permissions are
+	// what the caller expects them to be.
+	if err := os.Chmod(sharedVolPath, SharedVolumePerm); err != nil {
+		return "", errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
+	}
+
+	return sharedVolPath, nil
+}
+
 // MetadataServicePublicURL returns the public URL used to host the metadata service
 func MetadataServicePublicURL(ip net.IP, token string) string {
 	return fmt.Sprintf("http://%v:%v/%v", ip, MetadataServicePort, token)
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index d941551c8e..c1f2ffa89d 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -274,7 +274,7 @@ func BindMount(mnt fs.MountUnmounter, source, destination string, readOnly bool)
 }
 
 // ensureDestinationExists will recursively create a given mountpoint. If directories
-// are created, their permissions are initialized to stage1/init/common.SharedVolPerm
+// are created, their permissions are initialized to common.SharedVolumePerm
 func ensureDestinationExists(source, destination string) error {
 	fileInfo, err := os.Stat(source)
 	if err != nil {
@@ -282,16 +282,16 @@ func ensureDestinationExists(source, destination string) error {
 	}
 
 	targetPathParent, _ := filepath.Split(destination)
-	if err := os.MkdirAll(targetPathParent, SharedVolPerm); err != nil {
+	if err := os.MkdirAll(targetPathParent, common.SharedVolumePerm); err != nil {
 		return errwrap.Wrap(fmt.Errorf("could not create parent directory: %v", targetPathParent), err)
 	}
 
 	if fileInfo.IsDir() {
-		if err := os.Mkdir(destination, SharedVolPerm); err != nil && !os.IsExist(err) {
+		if err := os.Mkdir(destination, common.SharedVolumePerm); err != nil && !os.IsExist(err) {
 			return errwrap.Wrap(errors.New("could not create destination directory "+destination), err)
 		}
 	} else {
-		if file, err := os.OpenFile(destination, os.O_CREATE, SharedVolPerm); err != nil {
+		if file, err := os.OpenFile(destination, os.O_CREATE, common.SharedVolumePerm); err != nil {
 			return errwrap.Wrap(errors.New("could not create destination file"), err)
 		} else {
 			file.Close()
@@ -301,12 +301,9 @@ func ensureDestinationExists(source, destination string) error {
 }
 
 func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []string) error {
-	sharedVolPath := common.SharedVolumesPath(p.Root)
-	if err := os.MkdirAll(sharedVolPath, SharedVolPerm); err != nil {
-		return errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
-	}
-	if err := os.Chmod(sharedVolPath, SharedVolPerm); err != nil {
-		return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
+	sharedVolPath, err := common.CreateSharedVolumesPath(p.Root)
+	if err != nil {
+		return err
 	}
 
 	vols := make(map[types.ACName]types.Volume)
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index e405a760bf..089b9c1bdc 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -43,8 +43,7 @@ import (
 
 const (
 	// FlavorFile names the file storing the pod's flavor
-	FlavorFile    = "flavor"
-	SharedVolPerm = os.FileMode(0755)
+	FlavorFile = "flavor"
 )
 
 // execEscape uses Golang's string quoting for ", \, \n, and regex for special cases
@@ -464,12 +463,9 @@ func appToNspawnArgs(p *stage1commontypes.Pod, ra *schema.RuntimeApp) ([]string,
 	appName := ra.Name
 	app := ra.App
 
-	sharedVolPath := common.SharedVolumesPath(p.Root)
-	if err := os.MkdirAll(sharedVolPath, SharedVolPerm); err != nil {
-		return nil, errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
-	}
-	if err := os.Chmod(sharedVolPath, SharedVolPerm); err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
+	sharedVolPath, err := common.CreateSharedVolumesPath(p.Root)
+	if err != nil {
+		return nil, err
 	}
 
 	vols := make(map[types.ACName]types.Volume)
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index e62ad8d618..b8fc9d27ed 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -56,12 +56,9 @@ func KvmNetworkingToSystemd(p *stage1commontypes.Pod, n *networking.Networking)
 func mountSharedVolumes(p *stage1commontypes.Pod, ra *schema.RuntimeApp) error {
 	appName := ra.Name
 
-	sharedVolPath := common.SharedVolumesPath(p.Root)
-	if err := os.MkdirAll(sharedVolPath, stage1initcommon.SharedVolPerm); err != nil {
-		return errwrap.Wrap(errors.New("could not create shared volumes directory"), err)
-	}
-	if err := os.Chmod(sharedVolPath, stage1initcommon.SharedVolPerm); err != nil {
-		return errwrap.Wrap(fmt.Errorf("could not change permissions of %q", sharedVolPath), err)
+	sharedVolPath, err := common.CreateSharedVolumesPath(p.Root)
+	if err != nil {
+		return err
 	}
 
 	imageManifest := p.Images[appName.String()]
@@ -149,16 +146,16 @@ func ensureDestinationExists(source, destination string) error {
 	}
 
 	targetPathParent, _ := filepath.Split(destination)
-	if err := os.MkdirAll(targetPathParent, stage1initcommon.SharedVolPerm); err != nil {
+	if err := os.MkdirAll(targetPathParent, common.SharedVolumePerm); err != nil {
 		return errwrap.Wrap(fmt.Errorf("could not create parent directory: %v", targetPathParent), err)
 	}
 
 	if fileInfo.IsDir() {
-		if err := os.Mkdir(destination, stage1initcommon.SharedVolPerm); !os.IsExist(err) {
+		if err := os.Mkdir(destination, common.SharedVolumePerm); !os.IsExist(err) {
 			return err
 		}
 	} else {
-		if file, err := os.OpenFile(destination, os.O_CREATE, stage1initcommon.SharedVolPerm); err != nil {
+		if file, err := os.OpenFile(destination, os.O_CREATE, common.SharedVolumePerm); err != nil {
 			return err
 		} else {
 			file.Close()

From f08f52baf758b2f2d7db015ba082dac7b8f339a8 Mon Sep 17 00:00:00 2001
From: Graham Whaley <graham.whaley@linux.intel.com>
Date: Mon, 12 Dec 2016 17:17:39 +0000
Subject: [PATCH 0964/1304] stage1/kvm: only configure build qemu when we
 really need to

 QEMU was constantly re-configured and built for every make. This
is not necessary. The root cause was the CONF stamp stage, which
was the target for the git clone and then configure steps, but had
no rule to actually generate the stamp file, so made the configure
stage think we had always just cloned (in effect).
 Remove the CLONE stamp stage, and make the git clone directly
trigger the configure step.
---
 stage1/usr_from_kvm/qemu.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/stage1/usr_from_kvm/qemu.mk b/stage1/usr_from_kvm/qemu.mk
index fad6e97536..cca091bc76 100644
--- a/stage1/usr_from_kvm/qemu.mk
+++ b/stage1/usr_from_kvm/qemu.mk
@@ -24,7 +24,6 @@ QEMU_GIT_COMMIT := v2.7.0
 $(call setup-stamp-file,QEMU_BUILD_STAMP,/build)
 $(call setup-stamp-file,QEMU_BIOS_BUILD_STAMP,/bios_build)
 $(call setup-stamp-file,QEMU_CONF_STAMP,/conf)
-$(call setup-stamp-file,QEMU_CLONE_STAMP,/clone)
 $(call setup-stamp-file,QEMU_DIR_CLEAN_STAMP,/dir-clean)
 $(call setup-filelist-file,QEMU_DIR_FILELIST,/dir)
 $(call setup-clean-file,QEMU_CLEANMK,/src)
@@ -38,7 +37,7 @@ INSTALL_DIRS += \
 # Bios files needs to be removed (source will be removed by QEMU_DIR_CLEAN_STAMP)
 CLEAN_FILES += $(foreach bios,$(QEMU_BIOS_BINARIES),$(HV_ACIROOTFSDIR)/${bios})
 
-$(call generate-stamp-rule,$(QEMU_STAMP),$(QEMU_CLONE_STAMP) $(QEMU_CONF_STAMP) $(QEMU_BUILD_STAMP) $(QEMU_ACI_BINARY) $(QEMU_BIOS_BUILD_STAMP) $(QEMU_DIR_CLEAN_STAMP),,)
+$(call generate-stamp-rule,$(QEMU_STAMP),$(QEMU_CONF_STAMP) $(QEMU_BUILD_STAMP) $(QEMU_ACI_BINARY) $(QEMU_BIOS_BUILD_STAMP) $(QEMU_DIR_CLEAN_STAMP),,)
 
 $(QEMU_BINARY): $(QEMU_BUILD_STAMP)
 
@@ -52,7 +51,7 @@ $(call generate-stamp-rule,$(QEMU_BUILD_STAMP),$(QEMU_CONF_STAMP),, \
     $(call vb,vt,BUILD EXT,qemu) \
 	$$(MAKE) $(call vl2,--silent) -C "$(QEMU_SRCDIR)" $(call vl2,>/dev/null))
 
-$(call generate-stamp-rule,$(QEMU_CONF_STAMP),$(QEMU_CLONE_STAMP),, \
+$(call generate-stamp-rule,$(QEMU_CONF_STAMP),,, \
 	$(call vb,vt,CONFIG EXT,qemu) \
 	cd $(QEMU_SRCDIR); ./configure $(QEMU_CONFIGURATION_OPTS) $(call vl2,>/dev/null))
 
@@ -68,7 +67,7 @@ GCL_REPOSITORY := $(QEMU_GIT)
 GCL_DIRECTORY := $(QEMU_SRCDIR)
 GCL_COMMITTISH := $(QEMU_GIT_COMMIT)
 GCL_EXPECTED_FILE := Makefile
-GCL_TARGET := $(QEMU_CLONE_STAMP)
+GCL_TARGET := $(QEMU_CONF_STAMP)
 GCL_DO_CHECK :=
 
 include makelib/git.mk

From f0e3a28ebf0b1fde98f35b42bbc86ad97a1a32ac Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 12 Dec 2016 11:29:39 +0100
Subject: [PATCH 0965/1304] pkg/pod: dry Sandbox methods

This reduces reduntant implementations for checking mutable pod
manifests and pod manifest update logic.
---
 pkg/pod/pods.go    |  35 +-----------
 pkg/pod/sandbox.go | 131 +++++++++++++++++++++++++++++++++++++++++++
 stage0/app.go      | 137 +++++++--------------------------------------
 3 files changed, 154 insertions(+), 149 deletions(-)
 create mode 100644 pkg/pod/sandbox.go

diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index f154ef187f..5417fd1a0f 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -45,12 +45,13 @@ type Pod struct {
 	Nets       []netinfo.NetInfo // list of networks (name, IP, iface) this pod is using
 	MountLabel string            // Label to use for container image
 
-	*lock.FileLock
-	manifestLock *lock.FileLock
+	*lock.FileLock                // the lock for the whole pod
+	manifestLock   *lock.FileLock // the lock for the pod manifest in case this pod is mutable
 
 	dataDir string // The data directory where the pod lives in.
 
 	createdByMe bool // true if we're the creator of this pod (only the creator can ToPrepare or ToRun directly from preparing)
+	mutable     bool // if true, the pod manifest of the underlying pod can be modified
 
 	isEmbryo         bool // directory starts as embryo before entering preparing state, serves as stage for acquiring lock before rename to prepare/.
 	isPreparing      bool // when locked at pods/prepare/$uuid the pod is actively being prepared
@@ -1215,33 +1216,3 @@ func (p *Pod) AppExitCode(appName string) (int, error) {
 	statusFile := filepath.Join(stage1RootfsPath, "/rkt/status/", appName)
 	return p.readIntFromFile(statusFile)
 }
-
-// ManifestExclusiveLock gets an exclusive lock on only the pod manifest.
-// This is used in the app sandbox - since the pod is already running, we
-// won't be able to get an exclusive lock on the pod itself.
-func (p *Pod) ExclusiveManifestLock() error {
-	if p.manifestLock != nil {
-		return p.manifestLock.ExclusiveLock() // This is idempotent
-	}
-
-	l, err := lock.ExclusiveLock(common.PodManifestLockPath(p.Path()), lock.RegFile)
-	if err != nil {
-		return err
-	}
-
-	p.manifestLock = l
-	return nil
-}
-
-// ManifestUnlock unlocks the pod manifest lock.
-func (p *Pod) ManifestUnlock() error {
-	if p.manifestLock == nil {
-		return nil
-	}
-
-	if err := p.manifestLock.Close(); err != nil {
-		return err
-	}
-	p.manifestLock = nil
-	return nil
-}
diff --git a/pkg/pod/sandbox.go b/pkg/pod/sandbox.go
new file mode 100644
index 0000000000..1014e5def2
--- /dev/null
+++ b/pkg/pod/sandbox.go
@@ -0,0 +1,131 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pod
+
+import (
+	"encoding/json"
+	"errors"
+	"io/ioutil"
+	"os"
+	"strconv"
+
+	"github.com/appc/spec/schema"
+	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/lock"
+	"github.com/hashicorp/errwrap"
+)
+
+// ErrImmutable is the error that is returned by SandboxManifest if the pod is immutable,
+// hence changes on the pod manifest are not allowed.
+var ErrImmutable = errors.New("immutable pod")
+
+// SandboxManifest loads the underlying pod manifest and checks whether mutable operations are allowed.
+// It returns ErrImmutable if the pod does not allow mutable operations or any other error if the operation failed.
+// Upon success a reference to the pod manifest is returned and mutable operations are possible.
+func (p *Pod) SandboxManifest() (*schema.PodManifest, error) {
+	_, pm, err := p.PodManifest() // this takes the lock fd to load the manifest, hence path is not needed here
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("error loading pod manifest"), err)
+	}
+
+	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
+	if ok {
+		p.mutable, err = strconv.ParseBool(ms)
+		if err != nil {
+			return nil, errwrap.Wrap(errors.New("error parsing mutable annotation"), err)
+		}
+	}
+
+	if !p.mutable {
+		return nil, ErrImmutable
+	}
+
+	return pm, nil
+}
+
+// UpdateManifest updates the given pod manifest in the given path atomically on the file system.
+// The pod manifest has to be locked using LockManifest first to avoid races in case of concurrent writes.
+func (p *Pod) UpdateManifest(m *schema.PodManifest, path string) error {
+	if !p.mutable {
+		return ErrImmutable
+	}
+
+	mpath := common.PodManifestPath(path)
+	mstat, err := os.Stat(mpath)
+	if err != nil {
+		return err
+	}
+
+	tmpf, err := ioutil.TempFile(path, "")
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		tmpf.Close()
+		os.Remove(tmpf.Name())
+	}()
+
+	if err := tmpf.Chmod(mstat.Mode().Perm()); err != nil {
+		return err
+	}
+
+	if err := json.NewEncoder(tmpf).Encode(m); err != nil {
+		return err
+	}
+
+	if err := os.Rename(tmpf.Name(), mpath); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ExclusiveLockManifest gets an exclusive lock on only the pod manifest in the app sandbox.
+// Since the pod is already running, we won't be able to get an exclusive lock on the pod itself.
+func (p *Pod) ExclusiveLockManifest() error {
+	if !p.isRunning() {
+		return errors.New("pod is not running")
+	}
+
+	if p.manifestLock != nil {
+		return p.manifestLock.ExclusiveLock() // This is idempotent
+	}
+
+	l, err := lock.ExclusiveLock(common.PodManifestLockPath(p.Path()), lock.RegFile)
+	if err != nil {
+		return err
+	}
+
+	p.manifestLock = l
+	return nil
+}
+
+// UnlockManifest unlocks the pod manifest lock.
+func (p *Pod) UnlockManifest() error {
+	if !p.isRunning() {
+		return errors.New("pod is not running")
+	}
+
+	if p.manifestLock == nil {
+		return nil
+	}
+
+	if err := p.manifestLock.Close(); err != nil {
+		return err
+	}
+	p.manifestLock = nil
+	return nil
+}
diff --git a/stage0/app.go b/stage0/app.go
index 845e859e82..5641c4ffb5 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -17,7 +17,6 @@
 package stage0
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -104,27 +103,14 @@ func AddApp(cfg AddConfig) error {
 	defer pod.Close()
 
 	debug("locking pod manifest")
-	if err := pod.ExclusiveManifestLock(); err != nil {
+	if err := pod.ExclusiveLockManifest(); err != nil {
 		return errwrap.Wrap(errors.New("failed to lock pod manifest"), err)
 	}
-	defer pod.ManifestUnlock()
+	defer pod.UnlockManifest()
 
-	_, pm, err := pod.PodManifest()
+	pm, err := pod.SandboxManifest()
 	if err != nil {
-		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
-	}
-
-	var mutable bool
-	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
-	if ok {
-		mutable, err = strconv.ParseBool(ms)
-		if err != nil {
-			return errwrap.Wrap(errors.New("error parsing mutable annotation"), err)
-		}
-	}
-
-	if !mutable {
-		return errors.New("immutable pod: cannot add application")
+		return errwrap.Wrap(errors.New("cannot add application"), err)
 	}
 
 	if pm.Apps.Get(*appName) != nil {
@@ -251,9 +237,9 @@ func AddApp(cfg AddConfig) error {
 		return err
 	}
 
+	debug("adding app to sandbox")
 	pm.Apps = append(pm.Apps, ra)
-
-	if err := updatePodManifest(cfg.PodPath, pm); err != nil {
+	if err := pod.UpdateManifest(pm, cfg.PodPath); err != nil {
 		return err
 	}
 
@@ -282,43 +268,6 @@ func AddApp(cfg AddConfig) error {
 	return nil
 }
 
-func updatePodManifest(dir string, newPodManifest *schema.PodManifest) error {
-	pmb, err := json.Marshal(newPodManifest)
-	if err != nil {
-		return err
-	}
-
-	debug("Writing pod manifest")
-	return updateFile(common.PodManifestPath(dir), pmb)
-}
-
-func updateFile(path string, contents []byte) error {
-	fi, err := os.Stat(path)
-	if err != nil {
-		return err
-	}
-
-	f, err := ioutil.TempFile(filepath.Dir(path), "")
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	if err := f.Chmod(fi.Mode().Perm()); err != nil {
-		return err
-	}
-
-	if _, err := f.Write(contents); err != nil {
-		return errwrap.Wrap(errors.New("error writing to temp file"), err)
-	}
-
-	if err := os.Rename(f.Name(), path); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func RmApp(cfg RmConfig) error {
 	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
 	if err != nil {
@@ -326,28 +275,15 @@ func RmApp(cfg RmConfig) error {
 	}
 	defer pod.Close()
 
-	debug("locking pod manifest")
-	if err := pod.ExclusiveManifestLock(); err != nil {
-		return errwrap.Wrap(errors.New("failed to lock pod manifest"), err)
+	debug("locking sandbox manifest")
+	if err := pod.ExclusiveLockManifest(); err != nil {
+		return errwrap.Wrap(errors.New("failed to lock sandbox manifest"), err)
 	}
-	defer pod.ManifestUnlock()
+	defer pod.UnlockManifest()
 
-	_, pm, err := pod.PodManifest()
+	pm, err := pod.SandboxManifest()
 	if err != nil {
-		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
-	}
-
-	var mutable bool
-	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
-	if ok {
-		mutable, err = strconv.ParseBool(ms)
-		if err != nil {
-			return errwrap.Wrap(errors.New("error parsing mutable annotation"), err)
-		}
-	}
-
-	if !mutable {
-		return errors.New("immutable pod: cannot remove application")
+		return errwrap.Wrap(errors.New("cannot remove application, sandbox validation failed"), err)
 	}
 
 	app := pm.Apps.Get(*cfg.AppName)
@@ -425,21 +361,14 @@ func RmApp(cfg RmConfig) error {
 		return err
 	}
 
-	removeAppFromPodManifest(pm, cfg.AppName)
-
-	if err := updatePodManifest(cfg.PodPath, pm); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func removeAppFromPodManifest(pm *schema.PodManifest, appName *types.ACName) {
 	for i, app := range pm.Apps {
-		if app.Name == *appName {
+		if app.Name == *cfg.AppName {
 			pm.Apps = append(pm.Apps[:i], pm.Apps[i+1:]...)
+			break
 		}
 	}
+
+	return pod.UpdateManifest(pm, cfg.PodPath)
 }
 
 func StartApp(cfg StartConfig) error {
@@ -449,22 +378,9 @@ func StartApp(cfg StartConfig) error {
 	}
 	defer pod.Close()
 
-	_, pm, err := pod.PodManifest()
+	pm, err := pod.SandboxManifest()
 	if err != nil {
-		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
-	}
-
-	var mutable bool
-	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
-	if ok {
-		mutable, err = strconv.ParseBool(ms)
-		if err != nil {
-			return errwrap.Wrap(errors.New("error parsing mutable annotation"), err)
-		}
-	}
-
-	if !mutable {
-		return errors.New("immutable pod: cannot start application")
+		return errwrap.Wrap(errors.New("cannot start application"), err)
 	}
 
 	app := pm.Apps.Get(*cfg.AppName)
@@ -503,22 +419,9 @@ func StopApp(cfg StopConfig) error {
 	}
 	defer pod.Close()
 
-	_, pm, err := pod.PodManifest()
+	pm, err := pod.SandboxManifest()
 	if err != nil {
-		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
-	}
-
-	var mutable bool
-	ms, ok := pm.Annotations.Get("coreos.com/rkt/stage1/mutable")
-	if ok {
-		mutable, err = strconv.ParseBool(ms)
-		if err != nil {
-			return errwrap.Wrap(errors.New("error parsing mutable annotation"), err)
-		}
-	}
-
-	if !mutable {
-		return errors.New("immutable pod: cannot start application")
+		return errwrap.Wrap(errors.New("cannot stop application"), err)
 	}
 
 	app := pm.Apps.Get(*cfg.AppName)

From ca54f46c9ac101f0d910c6cb5c0d309a71b2ea78 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 12 Dec 2016 11:31:08 +0100
Subject: [PATCH 0966/1304] pkg/pod document semantics of pod methods

Currently it is unclear which methods in pkg/pod refresh the pod
state and which don't. This fixes it by documenting it.
---
 pkg/pod/pods.go | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index 5417fd1a0f..57256e5d2f 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -38,8 +38,13 @@ import (
 	"github.com/pborman/uuid"
 )
 
-// see Documentation/devel/pod-lifecycle.md for some explanation
-
+// Pod is the struct that reflects a pod and its lifecycle.
+// It provides the necessary methods for state transitions and methods for querying internal state.
+//
+// Unless documented otherwise methods do not refresh the pod state as it is reflected on the file system
+// but only the pod state at the point where this struct was created.
+//
+// See Documentation/devel/pod-lifecycle.md for some explanation.
 type Pod struct {
 	UUID       *types.UUID
 	Nets       []netinfo.NetInfo // list of networks (name, IP, iface) this pod is using
@@ -321,6 +326,7 @@ func (p *Pod) garbagePath() string {
 
 // ToPrepare transitions a pod from embryo -> preparing, leaves the pod locked in the prepare directory.
 // only the creator of the pod (via NewPod()) may do this, nobody to race with.
+// This method refreshes the pod state.
 func (p *Pod) ToPreparing() error {
 	if !p.createdByMe {
 		return fmt.Errorf("bug: only pods created by me may transition to preparing")
@@ -355,6 +361,7 @@ func (p *Pod) ToPreparing() error {
 
 // ToPrepared transitions a pod from preparing -> prepared, leaves the pod unlocked in the prepared directory.
 // only the creator of the pod (via NewPod()) may do this, nobody to race with.
+// This method refreshes the pod state.
 func (p *Pod) ToPrepared() error {
 	if !p.createdByMe {
 		return fmt.Errorf("bug: only pods created by me may transition to prepared")
@@ -388,6 +395,7 @@ func (p *Pod) ToPrepared() error {
 
 // ToRun transitions a pod from prepared -> run, leaves the pod locked in the run directory.
 // the creator of the pod (via NewPod()) may also jump directly from preparing -> run
+// This method refreshes the pod state.
 func (p *Pod) ToRun() error {
 	if !p.createdByMe && !p.isPrepared {
 		return fmt.Errorf("bug: only prepared pods may transition to run")
@@ -423,6 +431,7 @@ func (p *Pod) ToRun() error {
 }
 
 // ToExitedGarbage transitions a pod from run -> exitedGarbage
+// This method refreshes the pod state.
 func (p *Pod) ToExitedGarbage() error {
 	if !p.isExited || p.isExitedGarbage {
 		return fmt.Errorf("bug: only exited non-garbage pods may transition to exited-garbage")
@@ -448,6 +457,7 @@ func (p *Pod) ToExitedGarbage() error {
 }
 
 // ToGarbage transitions a pod from abortedPrepared -> garbage or prepared -> garbage
+// This method refreshes the pod state.
 func (p *Pod) ToGarbage() error {
 	if !p.isAbortedPrepare && !p.isPrepared {
 		return fmt.Errorf("bug: only failed prepare or prepared pods may transition to garbage")
@@ -545,8 +555,8 @@ func listPodsFromDir(cdir string) ([]string, error) {
 	return ps, nil
 }
 
-// refreshState() updates the cached members of c to reflect current reality
-// assumes p.FileLock is currently unlocked, and always returns with it unlocked.
+// refreshState() updates the cached members of the pod to reflect current reality.
+// Assumes p.FileLock is currently unlocked, and always returns with it unlocked.
 func (p *Pod) refreshState() error {
 	p.isEmbryo = false
 	p.isPreparing = false
@@ -1070,6 +1080,7 @@ func (p *Pod) IsSupervisorReady() bool {
 }
 
 // ContainerPid1 returns the pid of the process with pid 1 in the pod.
+// Note: This method blocks indefinitely and refreshes the pod state.
 func (p *Pod) ContainerPid1() (pid int, err error) {
 	// rkt supports two methods to find the container's PID 1: the pid
 	// file and the ppid file.

From 41000f39784f208c4609c2e430ca2c0186b16bbb Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 12 Dec 2016 11:32:40 +0100
Subject: [PATCH 0967/1304] pkg/pod: add WaitReady

This adds a WaitReady method to be able to wait for pod readiness on the
command line.

Fixes #3461
---
 pkg/pod/pods.go      | 27 -------------
 pkg/pod/wait.go      | 95 ++++++++++++++++++++++++++++++++++++++++++++
 pkg/pod/wait_test.go | 57 ++++++++++++++++++++++++++
 rkt/status.go        | 17 ++++++--
 4 files changed, 166 insertions(+), 30 deletions(-)
 create mode 100644 pkg/pod/wait.go
 create mode 100644 pkg/pod/wait_test.go

diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index 57256e5d2f..cc82a864ad 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -645,33 +645,6 @@ func (p *Pod) refreshState() error {
 	return nil
 }
 
-// WaitExited waits for a pod to (run and) exit.
-func (p *Pod) WaitExited() error {
-	// isExited implies isExitedGarbage.
-	for !p.isExited && !p.isAbortedPrepare && !p.isGarbage && !p.isGone {
-		if err := p.SharedLock(); err != nil {
-			return err
-		}
-
-		if err := p.Unlock(); err != nil {
-			return err
-		}
-
-		if err := p.refreshState(); err != nil {
-			return err
-		}
-
-		// if we're in the gap between preparing and running in a split prepare/run-prepared usage, take a nap
-		if p.isPrepared {
-			time.Sleep(time.Second)
-		}
-	}
-
-	// TODO(vc): return error or let caller detect the !p.isExited possibilities?
-
-	return nil
-}
-
 // readFile reads an entire file from a pod's directory.
 func (p *Pod) readFile(path string) ([]byte, error) {
 	f, err := p.openFile(path, syscall.O_RDONLY)
diff --git a/pkg/pod/wait.go b/pkg/pod/wait.go
new file mode 100644
index 0000000000..c9c0b9a985
--- /dev/null
+++ b/pkg/pod/wait.go
@@ -0,0 +1,95 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pod
+
+import (
+	"time"
+
+	"golang.org/x/net/context"
+)
+
+// WaitExited waits for a pod to (run and) exit.
+// This method blocks indefinitely and refreshes the pod state.
+func (p *Pod) WaitExited() error {
+	// isExited implies isExitedGarbage.
+	for !p.isExited && !p.isAbortedPrepare && !p.isGarbage && !p.isGone {
+		// this blocks (waits) as long as the pod is locked, i.e. in pepare, run, exitedGarbage, garbage state
+		if err := p.SharedLock(); err != nil {
+			return err
+		}
+
+		// unlock immediately
+		if err := p.Unlock(); err != nil {
+			return err
+		}
+
+		if err := p.refreshState(); err != nil {
+			return err
+		}
+
+		// if we're in the gap between preparing and running in a split prepare/run-prepared usage, take a nap
+		if p.isPrepared {
+			time.Sleep(time.Second)
+		}
+	}
+
+	// TODO(vc): return error or let caller detect the !p.isExited possibilities?
+
+	return nil
+}
+
+// WaitReady blocks until the pod is ready by polling the readiness state every 100 milliseconds
+// or until the given context is cancelled. This method refreshes the pod state.
+func (p *Pod) WaitReady(ctx context.Context) error {
+	f := func() bool {
+		if err := p.refreshState(); err != nil {
+			return false
+		}
+
+		return p.IsSupervisorReady()
+	}
+
+	return retry(ctx, f, 100*time.Millisecond)
+}
+
+// retry calls function f indefinitely with the given delay between invocations
+// until f returns true or the given context is cancelled.
+// It returns immediately without delay in case function f immediately returns true.
+func retry(ctx context.Context, f func() bool, delay time.Duration) error {
+	if f() {
+		return nil
+	}
+
+	ticker := time.NewTicker(delay)
+	errChan := make(chan error)
+
+	go func() {
+		defer close(errChan)
+
+		for {
+			select {
+			case <-ctx.Done():
+				errChan <- ctx.Err()
+				return
+			case <-ticker.C:
+				if f() {
+					return
+				}
+			}
+		}
+	}()
+
+	return <-errChan
+}
diff --git a/pkg/pod/wait_test.go b/pkg/pod/wait_test.go
new file mode 100644
index 0000000000..b2e92cbd6b
--- /dev/null
+++ b/pkg/pod/wait_test.go
@@ -0,0 +1,57 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pod
+
+import (
+	"testing"
+	"time"
+
+	"golang.org/x/net/context"
+)
+
+func TestRetryFailure(t *testing.T) {
+	i := 0
+	f := func() bool { i++; return false } // never succeed
+
+	if err := retry(newTimeout(100*time.Millisecond), f, 10*time.Millisecond); err == nil {
+		t.Error("expected failure, but got none")
+		return
+	}
+
+	if i == 0 {
+		t.Error("expected some retries, but got none")
+		return
+	}
+}
+
+func TestRetrySuccess(t *testing.T) {
+	f := func() bool { return true } // always succeed
+
+	if err := retry(newTimeout(5*time.Second), f, 10*time.Millisecond); err != nil {
+		t.Errorf("expected success, but got %v", err)
+	}
+
+	i := 0
+	f = func() bool { i++; return i > 5 } // succeed after 5 times
+
+	if err := retry(newTimeout(5*time.Second), f, 10*time.Millisecond); err != nil {
+		t.Errorf("expected success, but got %v", err)
+	}
+}
+
+func newTimeout(t time.Duration) context.Context {
+	ctx, _ := context.WithTimeout(context.Background(), t) // should never be reached
+	return ctx
+}
diff --git a/rkt/status.go b/rkt/status.go
index ffbcc14a08..e13c42ff81 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -24,17 +24,19 @@ import (
 	lib "github.com/coreos/rkt/lib"
 	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 )
 
 var (
 	cmdStatus = &cobra.Command{
-		Use:   "status [--wait] UUID",
+		Use:   "status [--wait] [--wait-ready=timeout] UUID",
 		Short: "Check the status of a rkt pod",
 		Long: `Prints assorted information about the pod such as its state, pid and exit
 status`,
 		Run: runWrapper(runStatus),
 	}
-	flagWait bool
+	flagWait      bool
+	flagWaitReady time.Duration
 )
 
 const (
@@ -46,6 +48,7 @@ const (
 func init() {
 	cmdRkt.AddCommand(cmdStatus)
 	cmdStatus.Flags().BoolVar(&flagWait, "wait", false, "toggle waiting for the pod to exit")
+	cmdStatus.Flags().DurationVar(&flagWaitReady, "wait-ready", time.Duration(0), "time to wait until the pod is ready. If time is less or equal zero it doesn't wait at all.")
 	cmdStatus.Flags().Var(&flagFormat, "format", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
 }
 
@@ -62,9 +65,17 @@ func runStatus(cmd *cobra.Command, args []string) (exit int) {
 	}
 	defer p.Close()
 
+	if flagWaitReady > 0 {
+		ctx, _ := context.WithTimeout(context.Background(), flagWaitReady)
+		if err := p.WaitReady(ctx); err != nil {
+			stderr.PrintE("wait for pod readyiness failed", err)
+			return 254
+		}
+	}
+
 	if flagWait {
 		if err := p.WaitExited(); err != nil {
-			stderr.PrintE("unable to wait for pod", err)
+			stderr.PrintE("wait for pod exit failed", err)
 			return 254
 		}
 	}

From d45f15268505af13a57986bb600e49ebaba549ab Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 12 Dec 2016 11:33:26 +0100
Subject: [PATCH 0968/1304] tests/rkt_app_sandbox_test: add more debug output

---
 tests/rkt_app_sandbox_test.go |  4 ++++
 tests/rkt_tests.go            | 23 ++++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index 5b0a6dd9f8..123791ad93 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -75,6 +75,7 @@ func TestAppSandboxSmoke(t *testing.T) {
 	cmd = strings.Fields(fmt.Sprintf("%s app add --debug %s %s --name=%s", ctx.Cmd(), podUUID, imageName, appName))
 	addCmd := exec.Command(cmd[0], cmd[1:]...)
 	addCmd.Env = append(addCmd.Env, "RKT_EXPERIMENT_APP=true")
+	t.Logf("Running command: %v\n", cmd)
 	output, err := addCmd.CombinedOutput()
 	if err != nil {
 		t.Fatalf("Unexpected error: %v\n%s", err, output)
@@ -83,6 +84,7 @@ func TestAppSandboxSmoke(t *testing.T) {
 	cmd = strings.Fields(fmt.Sprintf("%s app start --debug %s --app=%s", ctx.Cmd(), podUUID, appName))
 	startCmd := exec.Command(cmd[0], cmd[1:]...)
 	startCmd.Env = append(startCmd.Env, "RKT_EXPERIMENT_APP=true")
+	t.Logf("Running command: %v\n", cmd)
 	output, err = startCmd.CombinedOutput()
 	if err != nil {
 		t.Fatalf("Unexpected error: %v\n%s", err, output)
@@ -95,12 +97,14 @@ func TestAppSandboxSmoke(t *testing.T) {
 	cmd = strings.Fields(fmt.Sprintf("%s app rm --debug %s --app=%s", ctx.Cmd(), podUUID, appName))
 	removeCmd := exec.Command(cmd[0], cmd[1:]...)
 	removeCmd.Env = append(removeCmd.Env, "RKT_EXPERIMENT_APP=true")
+	t.Logf("Running command: %v\n", cmd)
 	output, err = removeCmd.CombinedOutput()
 	if err != nil {
 		t.Fatalf("Unexpected error: %v\n%s", err, output)
 	}
 
 	cmd = strings.Fields(fmt.Sprintf("%s stop %s", ctx.Cmd(), podUUID))
+	t.Logf("Running command: %v\n", cmd)
 	output, err = exec.Command(cmd[0], cmd[1:]...).CombinedOutput()
 	if err != nil {
 		t.Fatalf("Unexpected error: %v\n%s", err, output)
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 2dc247df76..f2ca5805ea 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -116,7 +116,7 @@ func patchTestACI(newFileName string, args ...string) string {
 }
 
 func spawnOrFail(t *testing.T, cmd string) *gexpect.ExpectSubprocess {
-	t.Logf("Running command: %v", cmd)
+	t.Logf("Spawning command: %v\n", cmd)
 	child, err := gexpect.Spawn(cmd)
 	if err != nil {
 		t.Fatalf("Cannot exec rkt: %v", err)
@@ -162,20 +162,13 @@ func waitPodReady(ctx *testutils.RktRunCtx, uuidFile string, timeout time.Durati
 		return "", fmt.Errorf("Can't read pod UUID: %v", err)
 	}
 
-	// wait for the pod supervisor to be ready
-	podReadyFile := filepath.Join(ctx.DataDir(), "pods", "run", string(podUUID), "stage1/rootfs/rkt/supervisor-status")
-	target := ""
-	elapsed = time.Duration(0)
-	for elapsed < timeout {
-		time.Sleep(interval)
-		elapsed += interval
-		target, err = os.Readlink(podReadyFile)
-		if err == nil && target == "ready" {
-			break
-		}
-	}
-	if err != nil || target != "ready" {
-		return "", fmt.Errorf("Pod failed to become ready while checking %q", podReadyFile)
+	// wait up to one minute for the pod supervisor to be ready
+	cmd := strings.Fields(fmt.Sprintf("%s status --wait-ready=%s %s", ctx.Cmd(), timeout, podUUID))
+	statusCmd := exec.Command(cmd[0], cmd[1:]...)
+	fmt.Printf("Running command: %v\n", cmd)
+	output, err := statusCmd.CombinedOutput()
+	if err != nil {
+		return "", fmt.Errorf("Failed to wait for pod readyness, error %v output %v", err, string(output))
 	}
 
 	return string(podUUID), nil

From 0f3dff5d561092c6ba070afe158159635cc69987 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 12 Dec 2016 11:46:41 +0100
Subject: [PATCH 0969/1304] pkg/pod add IsFinished, rename AfterRun ->
 IsAfterRun

This is a minor cleanup in pkg/pod.
---
 lib/app.go         |  2 +-
 pkg/pod/pods.go    | 13 +++++++++----
 pkg/pod/wait.go    |  9 ++++-----
 rkt/api_service.go |  2 +-
 rkt/app_stop.go    |  2 +-
 rkt/status.go      |  2 +-
 rkt/stop.go        |  2 +-
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/app.go b/lib/app.go
index 7061f5a988..d3a01b6f0d 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -104,7 +104,7 @@ func appState(app *App, pod *pkgPod.Pod) error {
 	app.State = AppStateUnknown
 
 	defer func() {
-		if pod.AfterRun() {
+		if pod.IsAfterRun() {
 			// If the pod is hard killed, set the app to 'exited' state.
 			// Other than this case, status file is guaranteed to be written.
 			if app.State != AppStateExited {
diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index cc82a864ad..b6b3716367 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -956,7 +956,7 @@ func (p *Pod) AppImageManifest(appName string) (*schema.ImageManifest, error) {
 // CreationTime returns the time when the pod was created.
 // This happens at prepare time.
 func (p *Pod) CreationTime() (time.Time, error) {
-	if !(p.isPrepared || p.isRunning() || p.AfterRun()) {
+	if !(p.isPrepared || p.isRunning() || p.IsAfterRun()) {
 		return time.Time{}, nil
 	}
 	t, err := p.getModTime("pod-created")
@@ -977,7 +977,7 @@ func (p *Pod) StartTime() (time.Time, error) {
 		retErr error
 	)
 
-	if !p.isRunning() && !p.AfterRun() {
+	if !p.isRunning() && !p.IsAfterRun() {
 		// hasn't started
 		return t, nil
 	}
@@ -1184,11 +1184,16 @@ func (p *Pod) PodManifestAvailable() bool {
 	return true
 }
 
-// AfterRun returns true if the pod is in a post-running state, otherwise it returns false.
-func (p *Pod) AfterRun() bool {
+// IsAfterRun returns true if the pod is in a post-running state, otherwise it returns false.
+func (p *Pod) IsAfterRun() bool {
 	return p.isExitedDeleting || p.isDeleting || p.isExited || p.isGarbage
 }
 
+// IsFinshed returns true if the pod is in a terminal state, else false.
+func (p *Pod) IsFinished() bool {
+	return p.isExited || p.isAbortedPrepare || p.isGarbage || p.isGone
+}
+
 // AppExitCode returns the app's exit code.
 // It returns an error if the exit code file doesn't exit or the content of the file is invalid.
 func (p *Pod) AppExitCode(appName string) (int, error) {
diff --git a/pkg/pod/wait.go b/pkg/pod/wait.go
index c9c0b9a985..03ebfeb9b7 100644
--- a/pkg/pod/wait.go
+++ b/pkg/pod/wait.go
@@ -20,11 +20,12 @@ import (
 	"golang.org/x/net/context"
 )
 
-// WaitExited waits for a pod to (run and) exit.
+// WaitFinished waits for a pod to (run and) finish.
 // This method blocks indefinitely and refreshes the pod state.
-func (p *Pod) WaitExited() error {
+// It is the caller's responsibility to determine the actual terminal state.
+func (p *Pod) WaitFinished() error {
 	// isExited implies isExitedGarbage.
-	for !p.isExited && !p.isAbortedPrepare && !p.isGarbage && !p.isGone {
+	for !p.IsFinished() {
 		// this blocks (waits) as long as the pod is locked, i.e. in pepare, run, exitedGarbage, garbage state
 		if err := p.SharedLock(); err != nil {
 			return err
@@ -45,8 +46,6 @@ func (p *Pod) WaitExited() error {
 		}
 	}
 
-	// TODO(vc): return error or let caller detect the !p.isExited possibilities?
-
 	return nil
 }
 
diff --git a/rkt/api_service.go b/rkt/api_service.go
index 9a27412266..2c5109afcf 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -593,7 +593,7 @@ func fillPodDetails(store *imagestore.Store, p *pkgPod.Pod, v1pod *v1alpha.Pod)
 		if p.State() == pkgPod.Running {
 			readStatus = true
 			app.State = v1alpha.AppState_APP_STATE_RUNNING
-		} else if p.AfterRun() {
+		} else if p.IsAfterRun() {
 			readStatus = true
 			app.State = v1alpha.AppState_APP_STATE_EXITED
 		} else {
diff --git a/rkt/app_stop.go b/rkt/app_stop.go
index 11ea3fcab7..327c12f737 100644
--- a/rkt/app_stop.go
+++ b/rkt/app_stop.go
@@ -62,7 +62,7 @@ func runAppStop(cmd *cobra.Command, args []string) (exit int) {
 	}
 	defer p.Close()
 
-	if p.AfterRun() {
+	if p.IsAfterRun() {
 		stdout.Printf("pod %q is already stopped", p.UUID)
 		return 0
 	}
diff --git a/rkt/status.go b/rkt/status.go
index e13c42ff81..57204d266c 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -74,7 +74,7 @@ func runStatus(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	if flagWait {
-		if err := p.WaitExited(); err != nil {
+		if err := p.WaitFinished(); err != nil {
 			stderr.PrintE("wait for pod exit failed", err)
 			return 254
 		}
diff --git a/rkt/stop.go b/rkt/stop.go
index f8caf68021..02f32d48b8 100644
--- a/rkt/stop.go
+++ b/rkt/stop.go
@@ -71,7 +71,7 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 			continue
 		}
 
-		if p.AfterRun() {
+		if p.IsAfterRun() {
 			stdout.Printf("pod %q is already stopped", p.UUID)
 			continue
 		}

From aaef5e3f3a920e6e5e01eac280eebe57020e209a Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 12 Dec 2016 12:15:05 +0100
Subject: [PATCH 0970/1304] rkt/status: add timeout to --wait

This changes the rkt status --wait to accept a timeout in addition to a
boolean value.

Addresses https://github.com/coreos/rkt/pull/3462#discussion_r91783242
---
 Documentation/subcommands/status.md |  7 ++-
 pkg/pod/pods.go                     |  2 +-
 pkg/pod/wait.go                     | 33 ++++++++----
 rkt/status.go                       | 78 +++++++++++++++++++++++------
 tests/rkt_app_sandbox_test.go       |  2 +-
 tests/rkt_tests.go                  |  6 +--
 6 files changed, 95 insertions(+), 33 deletions(-)

diff --git a/Documentation/subcommands/status.md b/Documentation/subcommands/status.md
index 921f96fe7c..c3bab4c186 100644
--- a/Documentation/subcommands/status.md
+++ b/Documentation/subcommands/status.md
@@ -14,13 +14,16 @@ app-redis=0
 app-etcd=0
 ```
 
-If the pod is still running, you can wait for it to finish and then get the status with `rkt status --wait UUID`
+If the pod is still running, you can wait for it to finish and then get the status with `rkt status --wait UUID`.
+To wait for the pod to become ready, execute `rkt status --wait-ready`.
+Both options also accept a duration. To wait up to 10 seconds until the pod is finished, execute `rkt status --wait=10s UUID`.
 
 ## Options
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--wait` |  `false` | `true` or `false` | Toggle waiting for the pod to exit |
+| `--wait` |  `false` | `true` or `false` or duration | Toggle waiting for the pod to finish. |
+| `--wait-ready` |  `false` | `true` or `false` or duration | Toggle waiting until the pod is ready. |
 
 ## Global options
 
diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index b6b3716367..91939ca5fa 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -1189,7 +1189,7 @@ func (p *Pod) IsAfterRun() bool {
 	return p.isExitedDeleting || p.isDeleting || p.isExited || p.isGarbage
 }
 
-// IsFinshed returns true if the pod is in a terminal state, else false.
+// IsFinished returns true if the pod is in a terminal state, else false.
 func (p *Pod) IsFinished() bool {
 	return p.isExited || p.isAbortedPrepare || p.isGarbage || p.isGone
 }
diff --git a/pkg/pod/wait.go b/pkg/pod/wait.go
index 03ebfeb9b7..2bc3268004 100644
--- a/pkg/pod/wait.go
+++ b/pkg/pod/wait.go
@@ -17,36 +17,47 @@ package pod
 import (
 	"time"
 
+	"github.com/coreos/rkt/pkg/lock"
+
 	"golang.org/x/net/context"
 )
 
-// WaitFinished waits for a pod to (run and) finish.
-// This method blocks indefinitely and refreshes the pod state.
+// WaitFinished waits for a pod to finish by polling every 100 milliseconds
+// or until the given context is cancelled. This method refreshes the pod state.
 // It is the caller's responsibility to determine the actual terminal state.
-func (p *Pod) WaitFinished() error {
-	// isExited implies isExitedGarbage.
-	for !p.IsFinished() {
-		// this blocks (waits) as long as the pod is locked, i.e. in pepare, run, exitedGarbage, garbage state
-		if err := p.SharedLock(); err != nil {
-			return err
+func (p *Pod) WaitFinished(ctx context.Context) error {
+	f := func() bool {
+		switch err := p.TrySharedLock(); err {
+		case nil:
+			// the pod is now locked successfully, hence one of the running phases passed.
+			// continue with unlocking the pod immediately below.
+		case lock.ErrLocked:
+			// pod is still locked, hence we are still in a running phase.
+			// i.e. in pepare, run, exitedGarbage, garbage state.
+			return false
+		default:
+			// some error occured, bail out.
+			return true
 		}
 
 		// unlock immediately
 		if err := p.Unlock(); err != nil {
-			return err
+			return true
 		}
 
 		if err := p.refreshState(); err != nil {
-			return err
+			return true
 		}
 
 		// if we're in the gap between preparing and running in a split prepare/run-prepared usage, take a nap
 		if p.isPrepared {
 			time.Sleep(time.Second)
 		}
+
+		return p.IsFinished()
 	}
 
-	return nil
+	return retry(ctx, f, 100*time.Millisecond)
 }
 
 // WaitReady blocks until the pod is ready by polling the readiness state every 100 milliseconds
diff --git a/rkt/status.go b/rkt/status.go
index 57204d266c..ee1708900b 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -19,6 +19,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"strconv"
 	"time"
 
 	lib "github.com/coreos/rkt/lib"
@@ -29,14 +30,16 @@ import (
 
 var (
 	cmdStatus = &cobra.Command{
-		Use:   "status [--wait] [--wait-ready=timeout] UUID",
+		Use:   "status [--wait=bool|timeout] [--wait-ready=bool|timeout] UUID",
 		Short: "Check the status of a rkt pod",
-		Long: `Prints assorted information about the pod such as its state, pid and exit
-status`,
+		Long: `Prints assorted information about the pod such as its state, pid and exit status.
+
+The --wait and --wait-ready flags accept boolean or timeout values. If set to true, wait indefinitely. If set to false, don't wait at all.
+They can also be set to a duration. If the duration is less than zero, wait indefinitely. If the duration is zero, don't wait at all.`,
 		Run: runWrapper(runStatus),
 	}
-	flagWait      bool
-	flagWaitReady time.Duration
+	flagWait      string
+	flagWaitReady string
 )
 
 const (
@@ -47,9 +50,12 @@ const (
 
 func init() {
 	cmdRkt.AddCommand(cmdStatus)
-	cmdStatus.Flags().BoolVar(&flagWait, "wait", false, "toggle waiting for the pod to exit")
-	cmdStatus.Flags().DurationVar(&flagWaitReady, "wait-ready", time.Duration(0), "time to wait until the pod is ready. If time is less or equal zero it doesn't wait at all.")
-	cmdStatus.Flags().Var(&flagFormat, "format", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
+	cmdStatus.Flags().StringVar(&flagWait, "wait", "false", `toggles waiting for the pod to finish. Use the output to determine the actual terminal state.`)
+	cmdStatus.Flags().StringVar(&flagWaitReady, "wait-ready", "false", `toggles waiting until the pod is ready.`)
+	cmdStatus.Flags().Var(&flagFormat, "format", `choose the output format. Allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs`)
+
+	cmdStatus.Flags().Lookup("wait").NoOptDefVal = "true"
+	cmdStatus.Flags().Lookup("wait-ready").NoOptDefVal = "true"
 }
 
 func runStatus(cmd *cobra.Command, args []string) (exit int) {
@@ -58,6 +64,18 @@ func runStatus(cmd *cobra.Command, args []string) (exit int) {
 		return 254
 	}
 
+	dWait, err := parseDuration(flagWait)
+	if err != nil {
+		cmd.Usage()
+		return 254
+	}
+
+	dReady, err := parseDuration(flagWaitReady)
+	if err != nil {
+		cmd.Usage()
+		return 254
+	}
+
 	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
@@ -65,17 +83,16 @@ func runStatus(cmd *cobra.Command, args []string) (exit int) {
 	}
 	defer p.Close()
 
-	if flagWaitReady > 0 {
-		ctx, _ := context.WithTimeout(context.Background(), flagWaitReady)
-		if err := p.WaitReady(ctx); err != nil {
-			stderr.PrintE("wait for pod readyiness failed", err)
+	if dReady != 0 {
+		if err := p.WaitReady(newContext(dReady)); err != nil {
+			stderr.PrintE("error waiting for pod readiness", err)
 			return 254
 		}
 	}
 
-	if flagWait {
-		if err := p.WaitFinished(); err != nil {
-			stderr.PrintE("wait for pod exit failed", err)
+	if dWait != 0 {
+		if err := p.WaitFinished(newContext(dWait)); err != nil {
+			stderr.PrintE("error waiting for pod to finish", err)
 			return 254
 		}
 	}
@@ -88,6 +105,37 @@ func runStatus(cmd *cobra.Command, args []string) (exit int) {
 	return 0
 }
 
+// parseDuration converts the given string s to a duration value.
+// If it is empty string or a true boolean value according to strconv.ParseBool, a negative duration is returned.
+// If the boolean value is false, a 0 duration is returned.
+// If the string s is a duration value, then it is returned.
+// It returns an error if the duration conversion failed.
+func parseDuration(s string) (time.Duration, error) {
+	if s == "" {
+		return time.Duration(-1), nil
+	}
+
+	b, err := strconv.ParseBool(s)
+
+	switch {
+	case err != nil:
+		return time.ParseDuration(s)
+	case b:
+		return time.Duration(-1), nil
+	}
+
+	return time.Duration(0), nil
+}
+
+// newContext returns a new context with timeout t if t > 0.
+func newContext(t time.Duration) context.Context {
+	ctx := context.Background()
+	if t > 0 {
+		ctx, _ = context.WithTimeout(ctx, t)
+	}
+	return ctx
+}
+
 // getExitStatuses returns a map of the statuses of the pod.
 func getExitStatuses(p *pkgPod.Pod) (map[string]int, error) {
 	_, manifest, err := p.PodManifest()
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index 123791ad93..a2875bfa56 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -67,7 +67,7 @@ func TestAppSandboxSmoke(t *testing.T) {
 	}
 
 	// wait for the sandbox to start
-	podUUID, err := waitPodReady(ctx, uuidFile, actionTimeout)
+	podUUID, err := waitPodReady(ctx, t, uuidFile, actionTimeout)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index f2ca5805ea..c90dadb86c 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -144,7 +144,7 @@ func waitOrFail(t *testing.T, child *gexpect.ExpectSubprocess, expectedStatus in
 
 // waitPodReady waits for the pod supervisor to get ready, busy-looping until `timeout`
 // while waiting for it. It returns the pod UUID or an error on failure.
-func waitPodReady(ctx *testutils.RktRunCtx, uuidFile string, timeout time.Duration) (string, error) {
+func waitPodReady(ctx *testutils.RktRunCtx, t *testing.T, uuidFile string, timeout time.Duration) (string, error) {
 	var podUUID []byte
 	var err error
 	interval := 500 * time.Millisecond
@@ -165,10 +165,10 @@ func waitPodReady(ctx *testutils.RktRunCtx, uuidFile string, timeout time.Durati
 	// wait up to one minute for the pod supervisor to be ready
 	cmd := strings.Fields(fmt.Sprintf("%s status --wait-ready=%s %s", ctx.Cmd(), timeout, podUUID))
 	statusCmd := exec.Command(cmd[0], cmd[1:]...)
-	fmt.Printf("Running command: %v\n", cmd)
+	t.Logf("Running command: %v\n", cmd)
 	output, err := statusCmd.CombinedOutput()
 	if err != nil {
-		return "", fmt.Errorf("Failed to wait for pod readyness, error %v output %v", err, string(output))
+		return "", fmt.Errorf("Failed to wait for pod readiness, error %v output %v", err, string(output))
 	}
 
 	return string(podUUID), nil

From eb3458f72273588445825b4f87fe0d6a87ef6f8b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 14 Dec 2016 16:35:15 +0000
Subject: [PATCH 0971/1304] docs: update etcd logging details

Since release 3.1.0-rc1, etcd can be forced to print logs to stdout
even if journals is available. This updates the workaround in our docs.
---
 Documentation/commands.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index d26f2a7ab7..294419530f 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -136,14 +136,14 @@ Currently there are two known main issues with logging in rkt:
  ```
  should be added to ```/etc/nginx/nginx.conf```
 
-* Some applications, like newer version of etcd, write directly to journald. Such log entries will not be written to stdout or stderr.
+* Some applications, like etcd 3.0, write directly to journald. Such log entries will not be written to stdout or stderr.
  These logs can be retrieved by passing the machine ID to journalctl:
 
  ```
  $ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4
  ```
 
- Etcd case will be solved when [flag allowing forcing output to stdout][etcd-5449] is added.
+ For the specific etcd case, since release 3.1.0-rc.1 it is possible to force emitting logs to stdout via a `--log-output=stdout` command-line option.
 
 ##### Stopped pod
 

From 0e5f11b0ab5c74847fa5e0cb4863b4853e119bcf Mon Sep 17 00:00:00 2001
From: Graham Whaley <graham.whaley@linux.intel.com>
Date: Thu, 15 Dec 2016 16:49:03 +0000
Subject: [PATCH 0972/1304] stage1/kvm/lkvm: Add patch to chown files and dirs
 on creation

Even though a uid/gid pair are passed over the protocol, they were
not being used for chmod'ing files or dirs being created. This
surfaced inside /tmp with the S_ISVTX 'sticky' bit set, where
all files ended up being owned by root.
Fix it by chmod'ing after creation.

Fixes #2576

As a side effect, it also seems to solve the remaining problems with
'apt-get update' in lkvm, so also:

Fixes #1917
---
 ...9-chown-files-and-dirs-upon-creation.patch | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 stage1/usr_from_kvm/lkvm/patches/p9-chown-files-and-dirs-upon-creation.patch

diff --git a/stage1/usr_from_kvm/lkvm/patches/p9-chown-files-and-dirs-upon-creation.patch b/stage1/usr_from_kvm/lkvm/patches/p9-chown-files-and-dirs-upon-creation.patch
new file mode 100644
index 0000000000..8a90a6f433
--- /dev/null
+++ b/stage1/usr_from_kvm/lkvm/patches/p9-chown-files-and-dirs-upon-creation.patch
@@ -0,0 +1,45 @@
+From c7734dd626a6d47bb946cfc1611e6c9d1dd67372 Mon Sep 17 00:00:00 2001
+From: Graham Whaley <graham.whaley@linux.intel.com>
+Date: Thu, 15 Dec 2016 16:24:55 +0000
+Subject: [PATCH] kvmtool: p9: chown files and dirs upon creation
+
+The protocol passes in a uid and gid, but we are not chowning
+the files to them, just using our default upon creation.
+Apply the passed in id's with a chown.
+
+This was found by mounting /tmp over p9 with the S_ISVTX
+'sticky' bit set, and finding that files created in /tmp
+were not honoring the uid used to create them.
+
+Signed-off-by: Graham Whaley <graham.whaley@intel.com>
+---
+ virtio/9p.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/virtio/9p.c b/virtio/9p.c
+index 49e7c5c..30100a5 100644
+--- a/virtio/9p.c
++++ b/virtio/9p.c
+@@ -286,6 +286,9 @@ static void virtio_p9_create(struct p9_dev *p9dev,
+ 	if (lstat(full_path, &st) < 0)
+ 		goto err_out;
+ 
++	if (lchown(full_path, dfid->uid, gid) < 0)
++		goto err_out;
++
+ 	ret = chmod(full_path, mode & 0777);
+ 	if (ret < 0)
+ 		goto err_out;
+@@ -326,6 +329,9 @@ static void virtio_p9_mkdir(struct p9_dev *p9dev,
+ 	if (lstat(full_path, &st) < 0)
+ 		goto err_out;
+ 
++	if (lchown(full_path, dfid->uid, gid) < 0)
++		goto err_out;
++
+ 	ret = chmod(full_path, mode & 0777);
+ 	if (ret < 0)
+ 		goto err_out;
+-- 
+2.7.4
+

From b148180260f4327097dbcaad599636a0002d36d7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 16 Dec 2016 17:53:46 +0000
Subject: [PATCH 0973/1304] gc: fix cleaning mounts and files

This fixes multiple issues in pods GC. In particular, rkt now tries
harder to clean its environment by:
 * looping over all pods, even if one of them is faulty
 * leaving manifest removal as last step, as next GC runs may succeed
 * chroot-ing to pod before cleaning, to avoid chasing wrong symlinks
 * chdir-ing to (host) root, to avoid keeping directories busy
 * loop-unmounting all mountpoints, even if one umount syscall fails
 * detecting busy mounts, and marking them as detached for lazy unmount
---
 common/mount.go      | 122 +++++++++++++++++++++++++++++++++++++++++++
 rkt/gc.go            |  13 ++++-
 stage0/gc.go         |  27 ++--------
 tests/rkt_gc_test.go |   2 +-
 4 files changed, 138 insertions(+), 26 deletions(-)
 create mode 100644 common/mount.go

diff --git a/common/mount.go b/common/mount.go
new file mode 100644
index 0000000000..ebe172d53d
--- /dev/null
+++ b/common/mount.go
@@ -0,0 +1,122 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"syscall"
+
+	"github.com/coreos/rkt/pkg/fs"
+	rktlog "github.com/coreos/rkt/pkg/log"
+	"github.com/coreos/rkt/pkg/mountinfo"
+)
+
+// ChrootPrivateUnmount cleans up in a safe way all mountpoints existing under
+// `targetPath`. This requires multiple steps:
+//  1. take handles to the current rootdir and workdir (to restore at the end)
+//  2. parse /proc/self/mountinfo to get a list of all mount targets, and filter
+//     out those outside of targetPath
+//  3. chroot into target path, so that all mounts and symlinks can be properly
+//     de-referenced as they appear inside the rootfs
+//  4. mark all mounts as private, so that further operations are not propagated
+//     outside of this rootfs - in descending nest order (parent first)
+//  5. unmount all mount targets - in ascending nest order (children first).
+//     If unmount fails, lazy-detach the mount target so that the kernel can
+//     still clean it up once it ceases to be busy
+//  6. chdir and chroot back to the original state
+func ChrootPrivateUnmount(targetPath string, log *rktlog.Logger, diagf func(string, ...interface{})) error {
+	mounter := fs.NewLoggingMounter(
+		fs.MounterFunc(syscall.Mount),
+		fs.UnmounterFunc(syscall.Unmount),
+		diagf,
+	)
+
+	// getFd checks if dirFile is a directory and returns its fd
+	getFd := func(dirFile *os.File) (int, error) {
+		dirInfo, err := dirFile.Stat()
+		if err != nil {
+			return 0, fmt.Errorf("error getting info on %q: %s", dirFile.Name(), err)
+		}
+		if !dirInfo.IsDir() {
+			return 0, fmt.Errorf("%q is not a directory", dirFile.Name())
+		}
+		return int(dirFile.Fd()), nil
+	}
+
+	// 1a. remember current workdir
+	cwdString, err := os.Getwd()
+	if err != nil {
+		return fmt.Errorf("error getting current workdir: %s", err)
+	}
+
+	// 1b. take the fd for current rootdir
+	rootFile, err := os.Open("/")
+	if err != nil {
+		return fmt.Errorf("error opening current rootdir: %s", err)
+	}
+	defer rootFile.Close()
+	rootFd, err := getFd(rootFile)
+	if err != nil {
+		return err
+	}
+
+	// 2. list all mounts and keeps only those in targetPath
+	//    (this needs to be done here as /proc may not be available after chroot)
+	mnts, err := mountinfo.ParseMounts(0)
+	if err != nil {
+		return fmt.Errorf("error getting mountinfo: %s", err)
+	}
+	mnts = mnts.Filter(mountinfo.HasPrefix(targetPath))
+
+	// 2. chdir to / (to avoid keeping a dir busy) and chroot to target
+	//    (defers in reverse order to escape the chroot on return)
+	_ = syscall.Fchdir(rootFd)
+	defer os.Chdir(cwdString)
+	err = syscall.Chroot(targetPath)
+	if err != nil {
+		return fmt.Errorf("error chroot-ing to %q: %s", targetPath, err)
+	}
+	defer syscall.Chroot(".")
+	defer syscall.Fchdir(rootFd)
+
+	// 4. mark mounts private, top to bottom
+	//    (mountinfo list contains full-paths captured outside of chroot, prefix-stripping needed)
+	for i := len(mnts) - 1; i >= 0; i-- {
+		mnt := mnts[i]
+		if mnt.NeedsRemountPrivate() {
+			relPath := strings.TrimPrefix(mnt.MountPoint, targetPath)
+			mntPath := filepath.Join("/", relPath)
+			err := mounter.Mount("", mntPath, "", syscall.MS_PRIVATE|syscall.MS_REC, "")
+			if err != nil {
+				log.Printf("skipping %q, not marked as private: %v", mntPath, err)
+			}
+		}
+	}
+	// 5. unmount all targets, bottom to top. If busy, still mark them as detached for later cleanups.
+	//    (mountinfo list contains full-paths captured outside of chroot, prefix-stripping needed)
+	for _, mnt := range mnts {
+		relPath := strings.TrimPrefix(mnt.MountPoint, targetPath)
+		mntPath := filepath.Join("/", relPath)
+		err := mounter.Unmount(mntPath, 0)
+		if err == syscall.EBUSY {
+			log.Printf("mount %q is busy, marking for lazy detach", mntPath)
+			_ = mounter.Unmount(mntPath, syscall.MNT_DETACH)
+		}
+	}
+	return nil
+}
diff --git a/rkt/gc.go b/rkt/gc.go
index 8bff3cad2e..9f7dc3301e 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -273,8 +273,19 @@ func deletePod(p *pkgPod.Pod) {
 		}
 	}
 
+	// remove the rootfs first; if this fails (eg. due to busy mountpoints), pod manifest
+	// is left in place and clean-up can be re-tried later.
+	rootfsPath, err := p.Stage1RootfsPath()
+	if err == nil {
+		if e := os.RemoveAll(rootfsPath); e != nil {
+			stderr.PrintE(fmt.Sprintf("unable to remove pod rootfs %q", p.UUID), e)
+			return
+		}
+	}
+
+	// finally remove all remaining pieces
 	if err := os.RemoveAll(p.Path()); err != nil {
 		stderr.PrintE(fmt.Sprintf("unable to remove pod %q", p.UUID), err)
-		os.Exit(254)
+		return
 	}
 }
diff --git a/stage0/gc.go b/stage0/gc.go
index 5b4973448b..fe67283458 100644
--- a/stage0/gc.go
+++ b/stage0/gc.go
@@ -22,12 +22,9 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"syscall"
-
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/mountinfo"
 
 	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common"
 	"github.com/hashicorp/errwrap"
 )
 
@@ -72,27 +69,9 @@ func GC(pdir string, uuid *types.UUID, localConfig string) error {
 
 // MountGC removes mounts from pods that couldn't be GCed cleanly.
 func MountGC(path, uuid string) error {
-	mnts, err := mountinfo.ParseMounts(0)
+	err := common.ChrootPrivateUnmount(path, log, debug)
 	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("error getting mounts for pod %s from mountinfo", uuid), err)
-	}
-	mnts = mnts.Filter(mountinfo.HasPrefix(path))
-
-	for i := len(mnts) - 1; i >= 0; i-- {
-		mnt := mnts[i]
-		if mnt.NeedsRemountPrivate() {
-			if err := syscall.Mount("", mnt.MountPoint, "", syscall.MS_PRIVATE, ""); err != nil {
-				return errwrap.Wrap(fmt.Errorf("could not remount at %v", mnt.MountPoint), err)
-			}
-		}
-	}
-
-	for _, mnt := range mnts {
-		if err := syscall.Unmount(mnt.MountPoint, 0); err != nil {
-			if err != syscall.ENOENT && err != syscall.EINVAL {
-				return errwrap.Wrap(fmt.Errorf("could not unmount %v", mnt.MountPoint), err)
-			}
-		}
+		return errwrap.Wrap(fmt.Errorf("error cleaning mounts for pod %s", uuid), err)
 	}
 	return nil
 }
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index b7918089b1..3b86c776c1 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -55,7 +55,7 @@ func TestGC(t *testing.T) {
 
 	pods = podsRemaining(t, ctx)
 	if len(pods) != 0 {
-		t.Fatalf("no pods should exist rkt's data directory, but found: %v", pods)
+		t.Fatalf("no pods should exist in rkt data directory, but found: %s", pods)
 	}
 }
 

From f2c3d31f4cc4a33a0adb73d4e9534dfcdfeb362d Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Sat, 17 Dec 2016 17:37:41 +0100
Subject: [PATCH 0974/1304] KVM: add a dash in kernel LOCALVERSION

This patch should change `uname -r` from `4.8.6rkt-v1` to
`4.8.6-rkt-v1`.

The missing dash was breaking some scripts to parse the kernel release.
Arguably, those scripts were buggy and need to be fixed, but usually
CONFIG_LOCALVERSION starts with a "-" (at least on Fedora and Arch).
---
 stage1/usr_from_kvm/kernel/cutdown-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/usr_from_kvm/kernel/cutdown-config b/stage1/usr_from_kvm/kernel/cutdown-config
index 542856bb04..ede4c6b910 100644
--- a/stage1/usr_from_kvm/kernel/cutdown-config
+++ b/stage1/usr_from_kvm/kernel/cutdown-config
@@ -52,7 +52,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="rkt-v1"
+CONFIG_LOCALVERSION="-rkt-v1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y

From f62afed7c201fdce184b693e3d25615183f589e2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 19 Dec 2016 15:47:58 +0000
Subject: [PATCH 0975/1304] rkt/rm: bubble up error status from deletePod

---
 rkt/gc.go | 17 ++++++++++-------
 rkt/rm.go |  4 +---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rkt/gc.go b/rkt/gc.go
index 9f7dc3301e..431ed6dab7 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -225,24 +225,25 @@ func mountPodStage1(ts *treestore.Store, p *pkgPod.Pod) error {
 // deletePod cleans up files and resource associated with the pod
 // pod must be under exclusive lock and be in either ExitedGarbage
 // or Garbage state
-func deletePod(p *pkgPod.Pod) {
+func deletePod(p *pkgPod.Pod) bool {
 	podState := p.State()
 	if podState != pkgPod.ExitedGarbage && podState != pkgPod.Garbage {
-		stderr.Panicf("logic error: deletePod called with non-garbage pod %q (status %q)", p.UUID, p.State())
+		stderr.Errorf("non-garbage pod %q (status %q), skipped", p.UUID, p.State())
+		return false
 	}
 
 	if podState == pkgPod.ExitedGarbage {
 		s, err := imagestore.NewStore(storeDir())
 		if err != nil {
 			stderr.PrintE("cannot open store", err)
-			return
+			return false
 		}
 		defer s.Close()
 
 		ts, err := treestore.NewStore(treeStoreDir(), s)
 		if err != nil {
 			stderr.PrintE("cannot open store", err)
-			return
+			return false
 		}
 
 		if globalFlags.Debug {
@@ -269,7 +270,7 @@ func deletePod(p *pkgPod.Pod) {
 		// unmount all leftover mounts
 		if err := stage0.MountGC(p.Path(), p.UUID.String()); err != nil {
 			stderr.PrintE(fmt.Sprintf("GC of leftover mounts for pod %q failed", p.UUID), err)
-			return
+			return false
 		}
 	}
 
@@ -279,13 +280,15 @@ func deletePod(p *pkgPod.Pod) {
 	if err == nil {
 		if e := os.RemoveAll(rootfsPath); e != nil {
 			stderr.PrintE(fmt.Sprintf("unable to remove pod rootfs %q", p.UUID), e)
-			return
+			return false
 		}
 	}
 
 	// finally remove all remaining pieces
 	if err := os.RemoveAll(p.Path()); err != nil {
 		stderr.PrintE(fmt.Sprintf("unable to remove pod %q", p.UUID), err)
-		return
+		return false
 	}
+
+	return true
 }
diff --git a/rkt/rm.go b/rkt/rm.go
index 50cf4ecee5..d0807864b9 100644
--- a/rkt/rm.go
+++ b/rkt/rm.go
@@ -126,7 +126,5 @@ func removePod(p *pkgPod.Pod) bool {
 		return false
 	}
 
-	deletePod(p)
-
-	return true
+	return deletePod(p)
 }

From 5bbe36f20ef7e27a587d43a26601fb0e7a8bf920 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Tue, 20 Dec 2016 23:39:22 +0600
Subject: [PATCH 0976/1304] rkt/rm: a pod must be closed after
 PodFromUUIDString()

---
 rkt/rm.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rkt/rm.go b/rkt/rm.go
index 50cf4ecee5..87b2eba449 100644
--- a/rkt/rm.go
+++ b/rkt/rm.go
@@ -67,6 +67,7 @@ func runRm(cmd *cobra.Command, args []string) (exit int) {
 			stderr.PrintE("cannot get pod", err)
 			continue
 		}
+		defer p.Close()
 
 		if removePod(p) {
 			stdout.Printf("%q", p.UUID)

From 0e7567a0fb3408de87b7d8f5fa0b200a18e6bd5f Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Tue, 20 Dec 2016 23:45:22 +0600
Subject: [PATCH 0977/1304] rkt/stop: a pod must be closed after
 PodFromUUIDString()

---
 rkt/stop.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rkt/stop.go b/rkt/stop.go
index 02f32d48b8..0d9ac814d3 100644
--- a/rkt/stop.go
+++ b/rkt/stop.go
@@ -70,6 +70,7 @@ func runStop(cmd *cobra.Command, args []string) (exit int) {
 			stderr.PrintE("cannot get pod", err)
 			continue
 		}
+		defer p.Close()
 
 		if p.IsAfterRun() {
 			stdout.Printf("pod %q is already stopped", p.UUID)

From 89b857a6c9075e5982414f0c5d3db2b7f4148493 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 21 Dec 2016 16:12:35 +0000
Subject: [PATCH 0978/1304] tests: update AWS CI setup

---
 .gitignore                                    |  1 +
 tests/aws.sh                                  | 35 +++++--------------
 ...ian.cloudinit => debian-testing.cloudinit} |  2 +-
 tests/cloudinit/fedora-22.cloudinit           |  1 -
 tests/cloudinit/fedora-23.cloudinit           |  1 -
 tests/cloudinit/fedora-24.cloudinit           | 26 +++++++++++++-
 .../{fedora.cloudinit => fedora-25.cloudinit} | 10 ++++++
 7 files changed, 46 insertions(+), 30 deletions(-)
 rename tests/cloudinit/{debian.cloudinit => debian-testing.cloudinit} (96%)
 delete mode 120000 tests/cloudinit/fedora-22.cloudinit
 delete mode 120000 tests/cloudinit/fedora-23.cloudinit
 mode change 120000 => 100644 tests/cloudinit/fedora-24.cloudinit
 rename tests/cloudinit/{fedora.cloudinit => fedora-25.cloudinit} (83%)

diff --git a/.gitignore b/.gitignore
index 2dc183c6d2..daa36bd615 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 
 .cache
 .vagrant
+*.pem
 /.config.args
 /Makefile
 /acbuild
diff --git a/tests/aws.sh b/tests/aws.sh
index 0f57aa83af..529e819418 100755
--- a/tests/aws.sh
+++ b/tests/aws.sh
@@ -26,23 +26,19 @@ DISTRO=$1
 test -f cloudinit/${DISTRO}.cloudinit
 CLOUDINIT=$PWD/cloudinit/${DISTRO}.cloudinit
 
-if [ "$DISTRO" = "fedora-22" ] ; then
+if [ "$DISTRO" = "fedora-24" ] ; then
   # https://getfedora.org/en/cloud/download/
   # Search on aws --region $REGION or look at
   # https://apps.fedoraproject.org/datagrepper/raw?category=fedimg
   # Sources: https://github.com/fedora-infra/fedimg/blob/develop/bin/list-the-amis.py
 
-  # Fedora-Cloud-Base-22-20160218.x86_64-us-west-1-HVM-standard-0
-  AMI=ami-e291e082
-  AWS_USER=fedora
-elif [ "$DISTRO" = "fedora-23" ] ; then
-  # Fedora-Cloud-Base-23-20151030.x86_64-us-west-1-HVM-standard-0
-  AMI=ami-a6fc90c6
-  AWS_USER=fedora
-elif [ "$DISTRO" = "fedora-24" ] ; then
   # Fedora-Cloud-Base-24-20160507.n.0.x86_64-us-west-1-HVM-standard-0
   AMI=ami-8b4c35eb
   AWS_USER=fedora
+elif [ "$DISTRO" = "fedora-25" ] ; then
+  # Fedora-Cloud-Base-25-20161220.0.x86_64-us-west-1-HVM-standard-0
+  AMI=ami-c70d5ca7
+  AWS_USER=fedora
 elif [ "$DISTRO" = "fedora-rawhide" ] ; then
   # Fedora-Cloud-Base-rawhide-20160129.x86_64-us-west-1-HVM-standard-0
   AMI=ami-a18dfac1
@@ -52,22 +48,11 @@ elif [ "$DISTRO" = "ubuntu-1604" ] ; then
   # ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20160627
   AMI=ami-b20542d2
   AWS_USER=ubuntu
-elif [ "$DISTRO" = "ubuntu-1510" ] ; then
-  # https://cloud-images.ubuntu.com/locator/ec2/
-  # ubuntu/images/hvm-instance/ubuntu-wily-15.10-amd64-server-20160715
-  AMI=ami-cee8aeae
-  AWS_USER=ubuntu
-elif [ "$DISTRO" = "debian" ] ; then
+elif [ "$DISTRO" = "debian-testing" ] ; then
   # https://wiki.debian.org/Cloud/AmazonEC2Image/Jessie
-  # Debian 8.4
-  AMI=ami-45374b25
+  # Debian 8.6+1
+  AMI=ami-db6c39bb
   AWS_USER=admin
-elif [ "$DISTRO" = "centos" ] ; then
-  # Needs to subscribe first, see:
-  # https://wiki.centos.org/Cloud/AWS
-  # CentOS-7 x86_64 HVM
-  AMI=ami-af4333cf
-  AWS_USER=centos
 fi
 
 test -n "$AMI"
@@ -122,7 +107,7 @@ do
 done
 
 
-NAME=$DISTRO-rkt-test-$(date +"%d-%m-%Y")
+NAME=rkt-ci-jenkins-$(date +"%Y-%m-%d")-$DISTRO
 AMI_ID=$(aws --region $REGION ec2 create-image --instance-id $INSTANCE_ID --name $NAME --output text)
 
 echo -e "\nWaiting for the AMI to be avaliable..."
@@ -132,8 +117,6 @@ do
   sleep 30
 done
 
-aws --region $REGION ec2 modify-image-attribute --image-id $AMI_ID --launch-permission "{\"Add\":[{\"Group\":\"all\"}]}"
-
 echo -e "\nRemoving instance..."
 
 aws --region $REGION ec2 terminate-instances --instance-ids $INSTANCE_ID --output text
diff --git a/tests/cloudinit/debian.cloudinit b/tests/cloudinit/debian-testing.cloudinit
similarity index 96%
rename from tests/cloudinit/debian.cloudinit
rename to tests/cloudinit/debian-testing.cloudinit
index eacb5153e6..c172b1353b 100644
--- a/tests/cloudinit/debian.cloudinit
+++ b/tests/cloudinit/debian-testing.cloudinit
@@ -11,5 +11,5 @@ DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y --force-yes -o Dpkg::Opti
 DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes build-essential autoconf
 DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" squashfs-tools patch gnupg golang dbus libacl1-dev systemd-container libssl-dev libsystemd-dev libpam-systemd
 DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" default-jre
+DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" git patch bc tar xz-utils openssl
 DEBIAN_FRONTEND=noninteractive apt-get build-dep -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" systemd
-DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" git
diff --git a/tests/cloudinit/fedora-22.cloudinit b/tests/cloudinit/fedora-22.cloudinit
deleted file mode 120000
index 2130c0b72a..0000000000
--- a/tests/cloudinit/fedora-22.cloudinit
+++ /dev/null
@@ -1 +0,0 @@
-fedora.cloudinit
\ No newline at end of file
diff --git a/tests/cloudinit/fedora-23.cloudinit b/tests/cloudinit/fedora-23.cloudinit
deleted file mode 120000
index 2130c0b72a..0000000000
--- a/tests/cloudinit/fedora-23.cloudinit
+++ /dev/null
@@ -1 +0,0 @@
-fedora.cloudinit
\ No newline at end of file
diff --git a/tests/cloudinit/fedora-24.cloudinit b/tests/cloudinit/fedora-24.cloudinit
deleted file mode 120000
index 2130c0b72a..0000000000
--- a/tests/cloudinit/fedora-24.cloudinit
+++ /dev/null
@@ -1 +0,0 @@
-fedora.cloudinit
\ No newline at end of file
diff --git a/tests/cloudinit/fedora-24.cloudinit b/tests/cloudinit/fedora-24.cloudinit
new file mode 100644
index 0000000000..cfbf2f9d01
--- /dev/null
+++ b/tests/cloudinit/fedora-24.cloudinit
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+set -x
+
+# ---pretend-input-tty (with 3 dashes) is an undocumented feature of parted
+parted /dev/xvda ---pretend-input-tty resizepart 1 yes 100%
+resize2fs /dev/xvda1
+
+chmod 755 /home/fedora
+
+dnf -y -v update
+dnf -y -v groupinstall "Development Tools" "C Development Tools and Libraries"
+# systemd-container only available in newer versions of Fedora
+dnf -y -v install systemd-container || true
+dnf -y -v install java || true
+dnf -y -v install iptables || true
+dnf -y -v install systemd-devel || true
+dnf -y -v install iptables intltool || true
+dnf -y -v distro-sync
+dnf -y -v install wget squashfs-tools patch glibc-static gnupg golang libacl-devel file openssl-devel bc
+dnf -y -v builddep systemd
+
+groupadd rkt || true
+gpasswd -a fedora rkt || true
diff --git a/tests/cloudinit/fedora.cloudinit b/tests/cloudinit/fedora-25.cloudinit
similarity index 83%
rename from tests/cloudinit/fedora.cloudinit
rename to tests/cloudinit/fedora-25.cloudinit
index 75ca7982ce..54fca14269 100644
--- a/tests/cloudinit/fedora.cloudinit
+++ b/tests/cloudinit/fedora-25.cloudinit
@@ -22,3 +22,13 @@ dnf -y -v install iptables intltool
 
 groupadd rkt || true
 gpasswd -a fedora rkt || true
+
+cat << EOF > /etc/sysconfig/network-scripts/ifcfg-eth0
+DEVICE=eth0
+BOOTPROTO=dhcp
+ONBOOT=yes
+TYPE=Ethernet
+USERCTL=yes
+PEERDNS=yes
+IPV6INIT=no
+EOF

From ded00ef2f7b5e4c0fff4ddc2fd08fbf2420b4f07 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <c1@caseyc.net>
Date: Thu, 22 Dec 2016 11:45:19 -0500
Subject: [PATCH 0979/1304] vendor: bump gocapability

This change renames "sys_psacct" to "sys_pacct", so update rkt_caps_test
accordingly.
---
 glide.lock                                    |   8 +-
 glide.yaml                                    |   2 +-
 tests/rkt_caps_test.go                        |   2 +-
 .../gocapability/capability/capability.go     |  20 +--
 .../capability/capability_linux.go            |  50 ++++++-
 .../syndtr/gocapability/capability/enum.go    |  87 +-----------
 .../gocapability/capability/enum_gen.go       | 129 ++++++++++++++++++
 .../gocapability/capability/syscall_linux.go  |  15 +-
 8 files changed, 209 insertions(+), 104 deletions(-)
 create mode 100644 vendor/github.com/syndtr/gocapability/capability/enum_gen.go

diff --git a/glide.lock b/glide.lock
index 202f30ca37..cd42cea8e2 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: cd7bf107f8962ba89c5471bc6d883112b33a7b2d91f97dc3057c3430f3b2cc42
-updated: 2016-12-09T16:05:25.074433175Z
+hash: d539e0ee23575e8a3fbb83bd56ccd2d59b7e2bd9ac0058863800a61841fb35ae
+updated: 2016-12-22T11:41:11.44338079-05:00
 imports:
 - name: github.com/appc/docker2aci
   version: 64543c1e0a7306b17d0d214549ec08049b234abc
@@ -236,7 +236,7 @@ imports:
 - name: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - name: github.com/syndtr/gocapability
-  version: 8e4cdcb3c22b40d5e330ade0b68cb2e2a3cf6f98
+  version: e7cb7fa329f456b3855136a2642b197bad7366ba
   subpackages:
   - capability
 - name: github.com/vishvananda/netlink
@@ -300,7 +300,7 @@ imports:
 - name: gopkg.in/inf.v0
   version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
 - name: k8s.io/kubernetes
-  version: fd8fac83034df346529c6e11aabceea2db48d663
+  version: ba5b2fcee9d938dae74d4474f68d9d0933f3ec04
   subpackages:
   - pkg/api/resource
 testImports:
diff --git a/glide.yaml b/glide.yaml
index 2abd8971e0..43f22c9f4f 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -201,7 +201,7 @@ import:
 - package: github.com/spf13/pflag
   version: 08b1a584251b5b62f458943640fc8ebd4d50aaa5
 - package: github.com/syndtr/gocapability
-  version: 8e4cdcb3c22b40d5e330ade0b68cb2e2a3cf6f98
+  version: e7cb7fa329f456b3855136a2642b197bad7366ba
   subpackages:
   - capability
 - package: github.com/vishvananda/netlink
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index 2c63859eac..a25caa8edd 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -548,7 +548,7 @@ func TestCapsInsecureOption(t *testing.T) {
 		"sys_rawio",
 		"sys_chroot",
 		"sys_ptrace",
-		"sys_psacct",
+		"sys_pacct",
 		"sys_admin",
 		"sys_boot",
 		"sys_nice",
diff --git a/vendor/github.com/syndtr/gocapability/capability/capability.go b/vendor/github.com/syndtr/gocapability/capability/capability.go
index c13f4e52a9..c07c55794d 100644
--- a/vendor/github.com/syndtr/gocapability/capability/capability.go
+++ b/vendor/github.com/syndtr/gocapability/capability/capability.go
@@ -10,42 +10,42 @@ package capability
 type Capabilities interface {
 	// Get check whether a capability present in the given
 	// capabilities set. The 'which' value should be one of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
+	// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
 	Get(which CapType, what Cap) bool
 
 	// Empty check whether all capability bits of the given capabilities
 	// set are zero. The 'which' value should be one of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
+	// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
 	Empty(which CapType) bool
 
 	// Full check whether all capability bits of the given capabilities
 	// set are one. The 'which' value should be one of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
+	// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
 	Full(which CapType) bool
 
 	// Set sets capabilities of the given capabilities sets. The
 	// 'which' value should be one or combination (OR'ed) of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
+	// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
 	Set(which CapType, caps ...Cap)
 
 	// Unset unsets capabilities of the given capabilities sets. The
 	// 'which' value should be one or combination (OR'ed) of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
+	// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
 	Unset(which CapType, caps ...Cap)
 
 	// Fill sets all bits of the given capabilities kind to one. The
-	// 'kind' value should be one or combination (OR'ed) of CAPS or
-	// BOUNDS.
+	// 'kind' value should be one or combination (OR'ed) of CAPS,
+	// BOUNDS or AMBS.
 	Fill(kind CapType)
 
 	// Clear sets all bits of the given capabilities kind to zero. The
-	// 'kind' value should be one or combination (OR'ed) of CAPS or
-	// BOUNDS.
+	// 'kind' value should be one or combination (OR'ed) of CAPS,
+	// BOUNDS or AMBS.
 	Clear(kind CapType)
 
 	// String return current capabilities state of the given capabilities
 	// set as string. The 'which' value should be one of EFFECTIVE,
-	// PERMITTED, INHERITABLE or BOUNDING.
+	// PERMITTED, INHERITABLE BOUNDING or AMBIENT
 	StringCap(which CapType) string
 
 	// String return current capabilities state as string.
diff --git a/vendor/github.com/syndtr/gocapability/capability/capability_linux.go b/vendor/github.com/syndtr/gocapability/capability/capability_linux.go
index 3dfcd398dc..6d2135ac58 100644
--- a/vendor/github.com/syndtr/gocapability/capability/capability_linux.go
+++ b/vendor/github.com/syndtr/gocapability/capability/capability_linux.go
@@ -235,9 +235,10 @@ func (c *capsV1) Apply(kind CapType) error {
 }
 
 type capsV3 struct {
-	hdr    capHeader
-	data   [2]capData
-	bounds [2]uint32
+	hdr     capHeader
+	data    [2]capData
+	bounds  [2]uint32
+	ambient [2]uint32
 }
 
 func (c *capsV3) Get(which CapType, what Cap) bool {
@@ -256,6 +257,8 @@ func (c *capsV3) Get(which CapType, what Cap) bool {
 		return (1<<uint(what))&c.data[i].inheritable != 0
 	case BOUNDING:
 		return (1<<uint(what))&c.bounds[i] != 0
+	case AMBIENT:
+		return (1<<uint(what))&c.ambient[i] != 0
 	}
 
 	return false
@@ -275,6 +278,9 @@ func (c *capsV3) getData(which CapType, dest []uint32) {
 	case BOUNDING:
 		dest[0] = c.bounds[0]
 		dest[1] = c.bounds[1]
+	case AMBIENT:
+		dest[0] = c.ambient[0]
+		dest[1] = c.ambient[1]
 	}
 }
 
@@ -313,6 +319,9 @@ func (c *capsV3) Set(which CapType, caps ...Cap) {
 		if which&BOUNDING != 0 {
 			c.bounds[i] |= 1 << uint(what)
 		}
+		if which&AMBIENT != 0 {
+			c.ambient[i] |= 1 << uint(what)
+		}
 	}
 }
 
@@ -336,6 +345,9 @@ func (c *capsV3) Unset(which CapType, caps ...Cap) {
 		if which&BOUNDING != 0 {
 			c.bounds[i] &= ^(1 << uint(what))
 		}
+		if which&AMBIENT != 0 {
+			c.ambient[i] &= ^(1 << uint(what))
+		}
 	}
 }
 
@@ -353,6 +365,10 @@ func (c *capsV3) Fill(kind CapType) {
 		c.bounds[0] = 0xffffffff
 		c.bounds[1] = 0xffffffff
 	}
+	if kind&AMBS == AMBS {
+		c.ambient[0] = 0xffffffff
+		c.ambient[1] = 0xffffffff
+	}
 }
 
 func (c *capsV3) Clear(kind CapType) {
@@ -369,6 +385,10 @@ func (c *capsV3) Clear(kind CapType) {
 		c.bounds[0] = 0
 		c.bounds[1] = 0
 	}
+	if kind&AMBS == AMBS {
+		c.ambient[0] = 0
+		c.ambient[1] = 0
+	}
 }
 
 func (c *capsV3) StringCap(which CapType) (ret string) {
@@ -410,6 +430,10 @@ func (c *capsV3) Load() (err error) {
 			fmt.Sscanf(line[4:], "nd:  %08x%08x", &c.bounds[1], &c.bounds[0])
 			break
 		}
+		if strings.HasPrefix(line, "CapA") {
+			fmt.Sscanf(line[4:], "mb:  %08x%08x", &c.ambient[1], &c.ambient[0])
+			break
+		}
 	}
 	f.Close()
 
@@ -442,7 +466,25 @@ func (c *capsV3) Apply(kind CapType) (err error) {
 	}
 
 	if kind&CAPS == CAPS {
-		return capset(&c.hdr, &c.data[0])
+		err = capset(&c.hdr, &c.data[0])
+		if err != nil {
+			return
+		}
+	}
+
+	if kind&AMBS == AMBS {
+		for i := Cap(0); i <= CAP_LAST_CAP; i++ {
+			action := pr_CAP_AMBIENT_LOWER
+			if c.Get(AMBIENT, i) {
+				action = pr_CAP_AMBIENT_RAISE
+			}
+			err := prctl(pr_CAP_AMBIENT, action, uintptr(i), 0, 0)
+			// Ignore EINVAL as not supported on kernels before 4.3
+			if errno, ok := err.(syscall.Errno); ok && errno == syscall.EINVAL {
+				err = nil
+				continue
+			}
+		}
 	}
 
 	return
diff --git a/vendor/github.com/syndtr/gocapability/capability/enum.go b/vendor/github.com/syndtr/gocapability/capability/enum.go
index bff756a5ce..693817317b 100644
--- a/vendor/github.com/syndtr/gocapability/capability/enum.go
+++ b/vendor/github.com/syndtr/gocapability/capability/enum.go
@@ -20,6 +20,8 @@ func (c CapType) String() string {
 		return "bounding"
 	case CAPS:
 		return "caps"
+	case AMBIENT:
+		return "ambient"
 	}
 	return "unknown"
 }
@@ -29,95 +31,16 @@ const (
 	PERMITTED
 	INHERITABLE
 	BOUNDING
+	AMBIENT
 
 	CAPS   = EFFECTIVE | PERMITTED | INHERITABLE
 	BOUNDS = BOUNDING
+	AMBS   = AMBIENT
 )
 
+//go:generate go run enumgen/gen.go
 type Cap int
 
-func (c Cap) String() string {
-	switch c {
-	case CAP_CHOWN:
-		return "chown"
-	case CAP_DAC_OVERRIDE:
-		return "dac_override"
-	case CAP_DAC_READ_SEARCH:
-		return "dac_read_search"
-	case CAP_FOWNER:
-		return "fowner"
-	case CAP_FSETID:
-		return "fsetid"
-	case CAP_KILL:
-		return "kill"
-	case CAP_SETGID:
-		return "setgid"
-	case CAP_SETUID:
-		return "setuid"
-	case CAP_SETPCAP:
-		return "setpcap"
-	case CAP_LINUX_IMMUTABLE:
-		return "linux_immutable"
-	case CAP_NET_BIND_SERVICE:
-		return "net_bind_service"
-	case CAP_NET_BROADCAST:
-		return "net_broadcast"
-	case CAP_NET_ADMIN:
-		return "net_admin"
-	case CAP_NET_RAW:
-		return "net_raw"
-	case CAP_IPC_LOCK:
-		return "ipc_lock"
-	case CAP_IPC_OWNER:
-		return "ipc_owner"
-	case CAP_SYS_MODULE:
-		return "sys_module"
-	case CAP_SYS_RAWIO:
-		return "sys_rawio"
-	case CAP_SYS_CHROOT:
-		return "sys_chroot"
-	case CAP_SYS_PTRACE:
-		return "sys_ptrace"
-	case CAP_SYS_PACCT:
-		return "sys_psacct"
-	case CAP_SYS_ADMIN:
-		return "sys_admin"
-	case CAP_SYS_BOOT:
-		return "sys_boot"
-	case CAP_SYS_NICE:
-		return "sys_nice"
-	case CAP_SYS_RESOURCE:
-		return "sys_resource"
-	case CAP_SYS_TIME:
-		return "sys_time"
-	case CAP_SYS_TTY_CONFIG:
-		return "sys_tty_config"
-	case CAP_MKNOD:
-		return "mknod"
-	case CAP_LEASE:
-		return "lease"
-	case CAP_AUDIT_WRITE:
-		return "audit_write"
-	case CAP_AUDIT_CONTROL:
-		return "audit_control"
-	case CAP_SETFCAP:
-		return "setfcap"
-	case CAP_MAC_OVERRIDE:
-		return "mac_override"
-	case CAP_MAC_ADMIN:
-		return "mac_admin"
-	case CAP_SYSLOG:
-		return "syslog"
-	case CAP_WAKE_ALARM:
-		return "wake_alarm"
-	case CAP_BLOCK_SUSPEND:
-		return "block_suspend"
-	case CAP_AUDIT_READ:
-		return "audit_read"
-	}
-	return "unknown"
-}
-
 // POSIX-draft defined capabilities.
 const (
 	// In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, this
diff --git a/vendor/github.com/syndtr/gocapability/capability/enum_gen.go b/vendor/github.com/syndtr/gocapability/capability/enum_gen.go
new file mode 100644
index 0000000000..b9e6d2d5e1
--- /dev/null
+++ b/vendor/github.com/syndtr/gocapability/capability/enum_gen.go
@@ -0,0 +1,129 @@
+// generated file; DO NOT EDIT - use go generate in directory with source
+
+package capability
+
+func (c Cap) String() string {
+	switch c {
+	case CAP_CHOWN:
+		return "chown"
+	case CAP_DAC_OVERRIDE:
+		return "dac_override"
+	case CAP_DAC_READ_SEARCH:
+		return "dac_read_search"
+	case CAP_FOWNER:
+		return "fowner"
+	case CAP_FSETID:
+		return "fsetid"
+	case CAP_KILL:
+		return "kill"
+	case CAP_SETGID:
+		return "setgid"
+	case CAP_SETUID:
+		return "setuid"
+	case CAP_SETPCAP:
+		return "setpcap"
+	case CAP_LINUX_IMMUTABLE:
+		return "linux_immutable"
+	case CAP_NET_BIND_SERVICE:
+		return "net_bind_service"
+	case CAP_NET_BROADCAST:
+		return "net_broadcast"
+	case CAP_NET_ADMIN:
+		return "net_admin"
+	case CAP_NET_RAW:
+		return "net_raw"
+	case CAP_IPC_LOCK:
+		return "ipc_lock"
+	case CAP_IPC_OWNER:
+		return "ipc_owner"
+	case CAP_SYS_MODULE:
+		return "sys_module"
+	case CAP_SYS_RAWIO:
+		return "sys_rawio"
+	case CAP_SYS_CHROOT:
+		return "sys_chroot"
+	case CAP_SYS_PTRACE:
+		return "sys_ptrace"
+	case CAP_SYS_PACCT:
+		return "sys_pacct"
+	case CAP_SYS_ADMIN:
+		return "sys_admin"
+	case CAP_SYS_BOOT:
+		return "sys_boot"
+	case CAP_SYS_NICE:
+		return "sys_nice"
+	case CAP_SYS_RESOURCE:
+		return "sys_resource"
+	case CAP_SYS_TIME:
+		return "sys_time"
+	case CAP_SYS_TTY_CONFIG:
+		return "sys_tty_config"
+	case CAP_MKNOD:
+		return "mknod"
+	case CAP_LEASE:
+		return "lease"
+	case CAP_AUDIT_WRITE:
+		return "audit_write"
+	case CAP_AUDIT_CONTROL:
+		return "audit_control"
+	case CAP_SETFCAP:
+		return "setfcap"
+	case CAP_MAC_OVERRIDE:
+		return "mac_override"
+	case CAP_MAC_ADMIN:
+		return "mac_admin"
+	case CAP_SYSLOG:
+		return "syslog"
+	case CAP_WAKE_ALARM:
+		return "wake_alarm"
+	case CAP_BLOCK_SUSPEND:
+		return "block_suspend"
+	case CAP_AUDIT_READ:
+		return "audit_read"
+	}
+	return "unknown"
+}
+
+// List returns list of all supported capabilities
+func List() []Cap {
+	return []Cap{
+		CAP_CHOWN,
+		CAP_DAC_OVERRIDE,
+		CAP_DAC_READ_SEARCH,
+		CAP_FOWNER,
+		CAP_FSETID,
+		CAP_KILL,
+		CAP_SETGID,
+		CAP_SETUID,
+		CAP_SETPCAP,
+		CAP_LINUX_IMMUTABLE,
+		CAP_NET_BIND_SERVICE,
+		CAP_NET_BROADCAST,
+		CAP_NET_ADMIN,
+		CAP_NET_RAW,
+		CAP_IPC_LOCK,
+		CAP_IPC_OWNER,
+		CAP_SYS_MODULE,
+		CAP_SYS_RAWIO,
+		CAP_SYS_CHROOT,
+		CAP_SYS_PTRACE,
+		CAP_SYS_PACCT,
+		CAP_SYS_ADMIN,
+		CAP_SYS_BOOT,
+		CAP_SYS_NICE,
+		CAP_SYS_RESOURCE,
+		CAP_SYS_TIME,
+		CAP_SYS_TTY_CONFIG,
+		CAP_MKNOD,
+		CAP_LEASE,
+		CAP_AUDIT_WRITE,
+		CAP_AUDIT_CONTROL,
+		CAP_SETFCAP,
+		CAP_MAC_OVERRIDE,
+		CAP_MAC_ADMIN,
+		CAP_SYSLOG,
+		CAP_WAKE_ALARM,
+		CAP_BLOCK_SUSPEND,
+		CAP_AUDIT_READ,
+	}
+}
diff --git a/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go b/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go
index c18e6f6918..eb7170083a 100644
--- a/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go
+++ b/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go
@@ -38,6 +38,15 @@ func capset(hdr *capHeader, data *capData) (err error) {
 	return
 }
 
+// not yet in syscall
+const (
+	pr_CAP_AMBIENT           = 47
+	pr_CAP_AMBIENT_IS_SET    = uintptr(1)
+	pr_CAP_AMBIENT_RAISE     = uintptr(2)
+	pr_CAP_AMBIENT_LOWER     = uintptr(3)
+	pr_CAP_AMBIENT_CLEAR_ALL = uintptr(4)
+)
+
 func prctl(option int, arg2, arg3, arg4, arg5 uintptr) (err error) {
 	_, _, e1 := syscall.Syscall6(syscall.SYS_PRCTL, uintptr(option), arg2, arg3, arg4, arg5, 0)
 	if e1 != 0 {
@@ -86,6 +95,10 @@ func getVfsCap(path string, dest *vfscapData) (err error) {
 	}
 	r0, _, e1 := syscall.Syscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(dest)), vfscapDataSizeV2, 0, 0)
 	if e1 != 0 {
+		if e1 == syscall.ENODATA {
+			dest.version = 2
+			return
+		}
 		err = e1
 	}
 	switch dest.magic & vfsCapVerMask {
@@ -128,8 +141,6 @@ func setVfsCap(path string, data *vfscapData) (err error) {
 		data.magic = vfsCapVer2
 		if data.effective[0] != 0 || data.effective[1] != 0 {
 			data.magic |= vfsCapFlageffective
-			data.data[0].permitted |= data.effective[0]
-			data.data[1].permitted |= data.effective[1]
 		}
 		size = vfscapDataSizeV2
 	} else {

From 40ab09e2216343f584389f274212b76e00d0f6e2 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 23 Dec 2016 17:05:44 +0100
Subject: [PATCH 0980/1304] README: wording updates

Emphasise pod-native, remove some older and less relevant material.
---
 README.md | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 36e66d156a..373d7b738a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# rkt - App Container runtime
+# rkt - the pod-native container engine
 
 [![godoc](https://godoc.org/github.com/coreos/rkt?status.svg)](http://godoc.org/github.com/coreos/rkt)
 [![Build Status (Travis)](https://travis-ci.org/coreos/rkt.svg?branch=master)](https://travis-ci.org/coreos/rkt)
@@ -7,16 +7,16 @@
 
 ![rkt Logo](logos/rkt-horizontal-color.png)
 
-rkt (pronounced _"rock-it"_) is a CLI for running app containers on Linux. rkt is designed to be secure, composable, and standards-based.
+rkt (pronounced _"rock-it"_) is a CLI for running application containers on Linux. rkt is designed to be secure, composable, and standards-based.
 
 Some of rkt's key features and goals include:
 
+- _Pod-native_: rkt's basic unit of execution is a [pod][coreos-rkt-pod-blog], linking together resources and user applications in a self-contained environment.
 - _Security_: rkt is developed with a principle of "secure-by-default", and includes a number of important security features like support for [SELinux][selinux], [TPM measurement][tpm], and running app containers in [hardware-isolated VMs][kvm].
-- _Composability_: rkt is designed for first-class integration with init systems ([systemd][systemd], upstart) and cluster orchestration tools (fleet, [Kubernetes][kubernetes], [Nomad][nomad]), and supports [swappable execution engines][architecture].
-- _Open standards and compatibility_: rkt implements the [appc specification][rkt-and-appc], supports the [Container Networking Interface specification][CNI], can also run [Docker images][docker], and [OCI images][oci] via [docker2aci][docker2aci]. Native OCI image support is [in development][oci-rkt].
-
-For more on the background and motivation behind rkt, read the original [launch announcement][blog-post].
+- _Composability_: rkt is designed for first-class integration with init systems (like [systemd][systemd], upstart) and cluster orchestration tools (like [Kubernetes][kubernetes] and [Nomad][nomad]), and supports [swappable execution engines][architecture].
+- _Open standards and compatibility_: rkt implements the [appc specification][rkt-and-appc], supports the [Container Networking Interface specification][cni], and can run [Docker images][docker] and [OCI images][oci-image-spec]. Broader native support for OCI images and runtimes is [in development][rkt-oci].
 
+[coreos-rkt-pod-blog]: https://coreos.com/blog/rkt-and-kubernetes.html
 [architecture]: Documentation/devel/architecture.md
 [systemd]: Documentation/using-rkt-with-systemd.md
 [kubernetes]: Documentation/using-rkt-with-kubernetes.md
@@ -28,14 +28,12 @@ For more on the background and motivation behind rkt, read the original [launch
 [cni]: https://github.com/appc/cni
 [selinux]: Documentation/selinux.md
 [tpm]: Documentation/devel/tpm.md
-[blog-post]: https://coreos.com/blog/rocket
-[oci]: https://github.com/opencontainers/image-spec
-[oci-rkt]: Documentation/proposals/oci.md
-[docker2aci]: https://github.com/appc/docker2aci
+[oci-image-spec]: https://github.com/opencontainers/image-spec
+[rkt-oci]: https://github.com/coreos/rkt/projects/4
 
 ## Project status
 
-rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development. Any major changes to those primary areas will be clearly communicated, and a formal deprecation process conducted for any retired features. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable, and an excellent area for testing and participation as it matures.
+The rkt v1.x series provides command line user interface and on-disk data structures stability for external development. Any major changes to those primary areas will be clearly communicated, and a formal deprecation process conducted for any retired features. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable, and an excellent area for testing and participation as it matures.
 
 Check out the [roadmap](ROADMAP.md) for more details on the future of rkt.
 

From 636e2b6ee855c33abc9db7fc783b3a96ff1e2e40 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Fri, 23 Dec 2016 22:44:06 +0600
Subject: [PATCH 0981/1304] common: fix 'the the' duplication in comment

---
 common/apps/apps.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/apps/apps.go b/common/apps/apps.go
index a7b5fa3092..703dfd37d9 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -31,7 +31,7 @@ var (
 )
 
 type App struct {
-	Name              string                            // the name of the app. If not set, the the image's name will be used.
+	Name              string                            // the name of the app. If not set, the image's name will be used.
 	Image             string                            // the image reference as supplied by the user on the cli
 	Args              []string                          // any arguments the user supplied for this app
 	Asc               string                            // signature file override for image verification (if fetching occurs)

From 72371c1c42a64b78daa337ed068d1368a5d5e104 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Fri, 23 Dec 2016 23:11:56 +0600
Subject: [PATCH 0982/1304] rkt/cat-manifest: add support for --uuid-file

So we will be able to use the value saved on rkt run with --uuid-file-save.
---
 rkt/cat_manifest.go            | 24 ++++++++++++++++++-----
 tests/rkt_cat_manifest_test.go | 35 +++++++++++++++++++++++++++++-----
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/rkt/cat_manifest.go b/rkt/cat_manifest.go
index 2c734cd975..567b5279d0 100644
--- a/rkt/cat_manifest.go
+++ b/rkt/cat_manifest.go
@@ -23,7 +23,7 @@ import (
 
 var (
 	cmdCatManifest = &cobra.Command{
-		Use:   "cat-manifest UUID",
+		Use:   "cat-manifest --uuid-file=FILE | UUID ...",
 		Short: "Inspect and print the pod manifest",
 		Long:  `UUID should be the UUID of a pod`,
 		Run:   runWrapper(runCatManifest),
@@ -34,19 +34,33 @@ var (
 func init() {
 	cmdRkt.AddCommand(cmdCatManifest)
 	cmdCatManifest.Flags().BoolVar(&flagPMPrettyPrint, "pretty-print", true, "apply indent to format the output")
+	cmdCatManifest.Flags().StringVar(&flagUUIDFile, "uuid-file", "", "read pod UUID from file instead of argument")
 }
 
 func runCatManifest(cmd *cobra.Command, args []string) (exit int) {
-	if len(args) != 1 {
-		cmd.Usage()
-		return 254
+	var podUUID string
+
+	if flagUUIDFile != "" {
+		uuid, err := pkgPod.ReadUUIDFromFile(flagUUIDFile)
+		if err != nil {
+			stderr.PrintE("unable to resolve UUID from file", err)
+			return 254
+		}
+		podUUID = uuid
+	} else {
+		if len(args) != 1 {
+			cmd.Usage()
+			return 254
+		}
+		podUUID = args[0]
 	}
 
-	pod, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
+	pod, err := pkgPod.PodFromUUIDString(getDataDir(), podUUID)
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
 		return 254
 	}
+
 	defer pod.Close()
 
 	_, manifest, err := pod.PodManifest()
diff --git a/tests/rkt_cat_manifest_test.go b/tests/rkt_cat_manifest_test.go
index 8f74c90a79..130228e85e 100644
--- a/tests/rkt_cat_manifest_test.go
+++ b/tests/rkt_cat_manifest_test.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"testing"
 
@@ -45,26 +46,50 @@ func TestCatManifest(t *testing.T) {
 	defer os.RemoveAll(tmpDir)
 
 	tests := []struct {
-		uuid  string
-		match string
+		uuid     string
+		match    string
+		uuidFile bool
 	}{
 		{
 			podUuid,
 			imgName,
+			false,
 		},
 		{
 			podUuid,
 			imageHash[:20],
+			false,
 		},
 		{
 			"1234567890abcdef",
 			"no matches found for",
+			false,
+		},
+		{
+			"",
+			imageHash[:20],
+			true,
 		},
 	}
 
 	for i, tt := range tests {
-		runCmd := fmt.Sprintf("%s cat-manifest --pretty-print=false %s", ctx.Cmd(), tt.uuid)
-		t.Logf("Running test #%d", i)
-		runRktAndCheckRegexOutput(t, runCmd, tt.match)
+		if tt.uuidFile == true {
+			podUUID := runRktAndGetUUID(t, cmd)
+			uuidFile, err := ioutil.TempFile(tmpDir, "uuid-file")
+			if err != nil {
+				panic(fmt.Sprintf("Cannot create uuid-file: %v", err))
+			}
+			uuidFilePath := uuidFile.Name()
+			if err := ioutil.WriteFile(uuidFilePath, []byte(podUUID), 0600); err != nil {
+				panic(fmt.Sprintf("Cannot write pod UUID to uuid-file: %v", err))
+			}
+			runCmd := fmt.Sprintf("%s cat-manifest --uuid-file=%s --pretty-print=false %s", ctx.Cmd(), uuidFilePath)
+			t.Logf("Running test #%d", i)
+			runRktAndCheckRegexOutput(t, runCmd, tt.match)
+		} else {
+			runCmd := fmt.Sprintf("%s cat-manifest --pretty-print=false %s", ctx.Cmd(), tt.uuid)
+			t.Logf("Running test #%d", i)
+			runRktAndCheckRegexOutput(t, runCmd, tt.match)
+		}
 	}
 }

From 545a7109adb43e3b8c913e8e2428f63e9a018770 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Thu, 29 Dec 2016 12:03:08 -0600
Subject: [PATCH 0983/1304] docs: Provide some more context around
 insecure-options arguments

The insecure-options documentation describes what the options do, but
doesn't really provide much information on why they're bad ideas. Add some
additional context to make that clearer.
---
 Documentation/commands.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 294419530f..34762c2556 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -70,7 +70,7 @@ In addition to the flags used by individual `rkt` commands, `rkt` has a set of g
 | `--cpuprofile (hidden flag)` | `` | A file path | Write CPU profile to the file |
 | `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
 | `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text.<br/>**image**: Disables verifying image signatures<br/>**tls**: Accept any certificate from the server and any host name in that certificate<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time.<br/>**pubkey**: Allow fetching pubkeys via insecure connections (via HTTP connections or from servers with unverified certificates). This slightly extends the meaning of the `--trust-keys-from-https` flag.<br/>**capabilities**: Gives all capabilities to apps<br/>**paths**: Disables inaccessible and read-only paths<br/>**seccomp**: Disables seccomp<br/>**all-fetch**: Disables the following security checks: image, tls, http<br/>**all-run**: Disables the following security checks: ondisk, capabilities, paths, seccomp<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
+| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text, allowing anybody with access to your network to obtain them. It will also perform no validation of the remote server, making it possible for an attacker to impersonate the remote server.<br/>**image**: Disables verifying image signatures. If someone is able to replace the image on the server with a modified one or is in a position to impersonate the server, they will be able to force you to run arbitrary code.<br/>**tls**: Accept any certificate from the server and any host name in that certificate. This will make it possible for attackers to spoof the remote server and provide malicious images.<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time. If an attacker is able to modify the contents of your local filesystem, this will allow them to cause you to run arbitrary malicious code.<br/>**pubkey**: Allow fetching pubkeys via insecure connections (via HTTP connections or from servers with unverified certificates). This slightly extends the meaning of the `--trust-keys-from-https` flag. This will make it possible for an attacker to spoof the remote server, potentially providing fake keys and allowing them to provide container images that have been tampered with.<br/>**capabilities**: Gives all [capabilities][capabilities] to apps. This makes it easier for an attacker who can gain control over a single container to exploit kernel vulnerabilities and potentially escape from that container.<br/>**paths**: Disables inaccessible and read-only paths. This makes it easier for an attacker who can gain control over a single container to execute code in the host system, potentially allowing them to escape from the container.<br/>**seccomp**: Disables [seccomp][seccomp]. This increases the attack surface available to an attacker who can gain control over a single container, potentially making it easier for them to escape from the container.<br/>**all-fetch**: Disables the following security checks: image, tls, http<br/>**all-run**: Disables the following security checks: ondisk, capabilities, paths, seccomp<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
 | `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
 | `--memprofile (hidden flag)` | `` | A file path | Write memory profile to the file |
 | `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
@@ -164,3 +164,5 @@ On some distributions such as Ubuntu, persistent journal storage is not enabled
 [metadata-spec]: https://github.com/appc/spec/blob/master/spec/ace.md#app-container-metadata-service
 [rkt-mds]: subcommands/metadata-service.md
 [sd-journal]: https://www.freedesktop.org/software/systemd/man/sd-journal.html
+[capabilities]: capabilities-guide.md
+[seccomp]: seccomp-guide.md

From 8cce3a470bdb766f227101333b9f5686d88a2b8f Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Mon, 2 Jan 2017 13:02:14 +0100
Subject: [PATCH 0984/1304] README: remove unnecessary API service reference

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 373d7b738a..878bd50103 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Some of rkt's key features and goals include:
 
 ## Project status
 
-The rkt v1.x series provides command line user interface and on-disk data structures stability for external development. Any major changes to those primary areas will be clearly communicated, and a formal deprecation process conducted for any retired features. The (optional) API for pod inspection is not yet completely stabilized, but is quite usable, and an excellent area for testing and participation as it matures.
+The rkt v1.x series provides command line user interface and on-disk data structures stability for external development. Any major changes to those primary areas will be clearly communicated, and a formal deprecation process conducted for any retired features.
 
 Check out the [roadmap](ROADMAP.md) for more details on the future of rkt.
 

From 2c032bc789eeaad6953a1e710585d14945868d91 Mon Sep 17 00:00:00 2001
From: Adam Jedro <jedroadam@gmail.com>
Date: Mon, 2 Jan 2017 14:04:53 +0100
Subject: [PATCH 0985/1304] docs: delete unnecessary go get

go get step is unnecessary after migration to glide

Fixes #3499
---
 Documentation/hacking.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index a772260096..9910602a55 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -35,7 +35,7 @@ Alternatively, you can build rkt in a Docker container with the following comman
 Replace `$SRC` with the absolute path to your rkt source code:
 
 ```
-# docker run -v $SRC:/opt/rkt debian:sid /bin/bash -c "cd /opt/rkt && ./scripts/install-deps-debian-sid.sh && go get github.com/appc/spec/... && ./autogen.sh && ./configure && make"
+# docker run -v $SRC:/opt/rkt debian:sid /bin/bash -c "cd /opt/rkt && ./scripts/install-deps-debian-sid.sh && ./autogen.sh && ./configure && make"
 ```
 
 ### Building systemd in stage1 from source

From ee474acfad899f86047d37bd9254dabfa17493d7 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Fri, 23 Dec 2016 23:23:16 +0600
Subject: [PATCH 0986/1304] pkg/pod: use IncludeMostDirs bitmask instead of
 constructing it

---
 pkg/pod/uuid.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/pod/uuid.go b/pkg/pod/uuid.go
index d9dcd9fed7..5a66b5e8ef 100644
--- a/pkg/pod/uuid.go
+++ b/pkg/pod/uuid.go
@@ -32,7 +32,7 @@ func matchUUID(dataDir, uuid string) ([]string, error) {
 		return nil, types.ErrNoEmptyUUID
 	}
 
-	ls, err := listPods(dataDir, IncludePrepareDir|IncludePreparedDir|IncludeRunDir|IncludeExitedGarbageDir)
+	ls, err := listPods(dataDir, IncludeMostDirs)
 	if err != nil {
 		return nil, err
 	}

From 83f0730d2da8c9865db91d544594557fe55db2e4 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Wed, 4 Jan 2017 16:58:54 +0100
Subject: [PATCH 0987/1304] stage1: don't crash when systemd cgroup doesn't
 exist

When starting the container, we try and determine our subcgroup. On
systems without systemd, this didn't work. So, fall back to the cpu
cgroup as needed.

Fixes #3502
---
 stage1/init/init.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index f4c04dab09..faabadd5c7 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -832,9 +832,14 @@ func getContainerSubCgroup(machineID string, canMachinedRegister, unified bool)
 
 	// when registration is disabled the container will be directly
 	// under the current cgroup so we can look it up in /proc/self/cgroup
+	// Try the systemd slice first, falling back to cpu if that fails (e.g. on
+	// systems not running systemd). See issue #3502.
 	ownV1CgroupPath, err := v1.GetOwnCgroupPath("name=systemd")
 	if err != nil {
-		return "", errwrap.Wrap(errors.New("could not get own v1 cgroup path"), err)
+		ownV1CgroupPath, err = v1.GetOwnCgroupPath("cpu")
+		if err != nil {
+			return "", errwrap.Wrap(errors.New("could not get own v1 cgroup path"), err)
+		}
 	}
 
 	// systemd-nspawn won't work if we are in the root cgroup. In addition,

From 7033fb5725f76374aa9b0c4335c04c37d96a9f3a Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Fri, 23 Dec 2016 18:01:56 -0500
Subject: [PATCH 0988/1304] pkg/fileutil: helper function to get major, minor
 numbers of a device file.

---
 pkg/fileutil/fileutil_linux.go | 37 ++++++++++++++++
 pkg/fileutil/fileutil_test.go  | 78 ++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+)

diff --git a/pkg/fileutil/fileutil_linux.go b/pkg/fileutil/fileutil_linux.go
index c7201ebe8a..f6fce7a8ef 100644
--- a/pkg/fileutil/fileutil_linux.go
+++ b/pkg/fileutil/fileutil_linux.go
@@ -17,6 +17,7 @@
 package fileutil
 
 import (
+	"fmt"
 	"os"
 	"syscall"
 	"unsafe"
@@ -105,3 +106,39 @@ func Lsetxattr(path string, attr string, data []byte, flags int) error {
 	}
 	return nil
 }
+
+// GetDeviceInfo returns the type, major, and minor numbers of a device.
+// Kind is 'b' or 'c' for block and character devices, respectively.
+// This does not follow symlinks.
+func GetDeviceInfo(path string) (kind rune, major uint64, minor uint64, err error) {
+	d, err := os.Lstat(path)
+	if err != nil {
+		return
+	}
+	mode := d.Mode()
+
+	if mode&os.ModeDevice == 0 {
+		err = fmt.Errorf("not a device: %s", path)
+		return
+	}
+	stat_t, ok := d.Sys().(*syscall.Stat_t)
+	if !ok {
+		err = fmt.Errorf("cannot determine device number")
+		return
+	}
+	return getDeviceInfo(mode, stat_t.Rdev)
+}
+
+// Parse the device info out of the mode bits. Separate for testability.
+func getDeviceInfo(mode os.FileMode, rdev uint64) (kind rune, major uint64, minor uint64, err error) {
+	kind = 'b'
+
+	if mode&os.ModeCharDevice != 0 {
+		kind = 'c'
+	}
+
+	major = (rdev >> 8) & 0xfff
+	minor = (rdev & 0xff) | ((rdev >> 12) & 0xfff00)
+
+	return
+}
diff --git a/pkg/fileutil/fileutil_test.go b/pkg/fileutil/fileutil_test.go
index aa68ac9b28..bd04cebe90 100644
--- a/pkg/fileutil/fileutil_test.go
+++ b/pkg/fileutil/fileutil_test.go
@@ -183,3 +183,81 @@ func TestFileIsExecutable(t *testing.T) {
 		}
 	}
 }
+
+func TestDeviceInfo(t *testing.T) {
+	// First, test the main call
+	{
+		kind, major, minor, err := GetDeviceInfo("/dev/null")
+		if kind != 'c' || major != 1 || minor != 3 || err != nil {
+			t.Errorf("GetDeviceInfo(/dev/null) wrong result")
+		}
+	}
+
+	{
+		_, _, _, err := GetDeviceInfo("/usr")
+		if err == nil {
+			t.Errorf("GetDeviceInfo(/usr) should return err")
+		}
+	}
+
+	// Then test the logic more specifically
+	for i, tt := range []struct {
+		mode  os.FileMode
+		rdev  uint64
+		kind  rune
+		major uint64
+		minor uint64
+	}{
+		// /dev/null
+		{
+			69206454,
+			259,
+			'c',
+			1,
+			3,
+		},
+		// /dev/sda1
+		{
+			67109296,
+			2049,
+			'b',
+			8,
+			1,
+		},
+		// /dev/pts/3
+		{
+			69206416,
+			34819,
+			'c',
+			136,
+			3,
+		},
+		// /dev/dm-0
+		{
+			67109296,
+			64768,
+			'b',
+			253,
+			0,
+		},
+	} {
+		kind, major, minor, err := getDeviceInfo(tt.mode, tt.rdev)
+		if err != nil {
+			t.Errorf("getDeviceInfo %d not as expected, got err %s", i, err)
+		}
+		// don't care about result when err
+		if err != nil {
+			continue
+		}
+
+		if tt.kind != kind {
+			t.Errorf("getDeviceInfo %d kind expected %v got %v", i, tt.kind, kind)
+		}
+		if tt.major != major {
+			t.Errorf("getDeviceInfo %d major expected %v got %v", i, tt.major, major)
+		}
+		if tt.minor != minor {
+			t.Errorf("getDeviceInfo %d minor expected %v got %v", i, tt.minor, minor)
+		}
+	}
+}

From 21f91f054fbea44545f9ec3173b8eb9a45428de9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 5 Jan 2017 15:51:47 +0000
Subject: [PATCH 0989/1304] version: bump to v1.22.0

---
 CHANGELOG.md                         | 25 +++++++++++++++++++++++++
 Documentation/distributions.md       | 16 ++++++++--------
 Documentation/proposals/oci.md       |  6 +++---
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  4 ++--
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 18 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22db4d144c..21819eed5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+## 1.22.0
+
+This is a stabilization release which includes better support for environments without systemd, improvements to GC behavior in complex scenarios, and several additional fixes.
+
+### New features and UX changes
+
+- rkt/cat-manifest: add support for --uuid-file ([#3498](https://github.com/coreos/rkt/pull/3498)).
+- stage1: fallback if systemd cgroup doesn't exist ([#3507](https://github.com/coreos/rkt/pull/3507)).
+- vendor: bump gocapability ([#3493](https://github.com/coreos/rkt/pull/3493)). This change renames `sys_psacct` to `sys_pacct`.
+- stage0/app: pass debug flag to entrypoints ([#3469](https://github.com/coreos/rkt/pull/3469)).
+
+### Bug fixes
+- gc: fix cleaning mounts and files ([#3486](https://github.com/coreos/rkt/pull/3486)). This improves GC behavior in case of busy mounts and other complex scenarios.
+- mount: ensure empty volume paths exist for copy-up ([#3468](https://github.com/coreos/rkt/pull/3468)).
+- rkt stop/rm: a pod must be closed after PodFromUUIDString() ([#3492](https://github.com/coreos/rkt/pull/3492)).
+
+### Other changes
+- stage1/kvm: add a dash in kernel LOCALVERSION ([#3489](https://github.com/coreos/rkt/pull/3489)).
+- stage1/kvm: Improve QEMU Makefile rules ([#3474](https://github.com/coreos/rkt/pull/3474)).
+- pkg/pod: use IncludeMostDirs bitmask instead of constructing it ([#3506](https://github.com/coreos/rkt/pull/3506)).
+- pkg/pod: add WaitReady, dry Sandbox methods ([#3462](https://github.com/coreos/rkt/pull/3462)).
+- vendor: bump gexpect to 0.1.1 ([#3467](https://github.com/coreos/rkt/pull/3467)).
+- common: fix 'the the' duplication in comment ([#3497](https://github.com/coreos/rkt/pull/3497)).
+- docs: multiple updates ([#3479](https://github.com/coreos/rkt/pull/3479), [#3501](https://github.com/coreos/rkt/pull/3501), [#3464](https://github.com/coreos/rkt/pull/3464), [#3495](https://github.com/coreos/rkt/pull/3495)).
+
 ## 1.21.0
 
 This release includes bugfixes for the experimental CRI support, more stable integration tests, and some other interesting changes:
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 1b4d282b21..b518e80b90 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -132,19 +132,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt-1.21.0-1.x86_64.rpm
-wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt-1.21.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.21.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.21.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt-1.22.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt-1.22.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.22.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.22.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt_1.21.0-1_amd64.deb
-wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt_1.21.0-1_amd64.deb.asc
-gpg --verify rkt_1.21.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.21.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt_1.22.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt_1.22.0-1_amd64.deb.asc
+gpg --verify rkt_1.22.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.22.0-1_amd64.deb
 ```
 
 [coreos-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 1a1e3efb22..88f2fba7e0 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/coreos/rkt/blob/v1.21.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.21.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/coreos/rkt/blob/v1.21.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/coreos/rkt/blob/v1.22.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.22.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/coreos/rkt/blob/v1.22.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index f5c1170048..66bdcf6bbb 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.21.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.22.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.21.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.22.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 6c47e872e9..87efe7d6f5 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.21.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.22.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.21.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.22.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 260f0f08ec..edfb8b5410 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.21.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.22.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.21.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.22.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index c3090ac3ea..fabb64ff53 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.21.0
+rkt Version: 1.22.0
 appc Version: 0.8.9
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index fb3492dd70..641cec1617 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.21.0/rkt-v1.21.0.tar.gz
-tar xzvf rkt-v1.21.0.tar.gz
-cd rkt-v1.21.0
+wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt-v1.22.0.tar.gz
+tar xzvf rkt-v1.22.0.tar.gz
+cd rkt-v1.22.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index f17571ef6d..ce7ed9c9e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.21.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.22.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index efada68c8e..9f15c53665 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.21.0"
+version="1.22.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 2ea8246a3a..74d0c9fa98 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.21.0"
+            "value": "1.22.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index d14c72a499..3ddbba574a 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.21.0"
+            "value": "1.22.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 5dadf08ebb..09c25fa2db 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.21.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.22.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 295dd44858..e05e66920a 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.21.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.22.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
 )
 
 func TestRunOverrideExec(t *testing.T) {
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 05784a224b..3f1f705329 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -29,7 +29,7 @@ import (
 const (
 
 	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.21.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.22.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 73ccd40867..d4c3f057fe 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.21.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.22.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 64ed2c0965..561777730f 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.21.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.22.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index e9b14d567e..fbcaedeaaa 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.21.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.22.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
 )
 
 type osArchTest struct {

From f0ee058788dd53f1c801aa82a4c206e038bec2a9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 5 Jan 2017 15:51:48 +0000
Subject: [PATCH 0990/1304] version: bump to v1.22.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce7ed9c9e9..8f7f9b6756 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.22.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.22.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 09c25fa2db..f0004428b6 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.22.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.22.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From f29ca0961320374d36aeaa906335b5e78effe657 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Thu, 5 Jan 2017 15:58:06 -0800
Subject: [PATCH 0991/1304] pkg/pod: avoid nil panic for missing pods

If `getPod` was called for a pod that no longer existed, a panic could
occur when trying to lock it.

This regression was introduced in #3404

Fixes #3513
---
 pkg/pod/pods.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index 91939ca5fa..9628292b57 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -234,6 +234,12 @@ func getPod(dataDir string, uuid *types.UUID) (*Pod, error) {
 		return nil, errwrap.Wrap(fmt.Errorf("error opening pod %q", uuid), err)
 	}
 
+	if err == lock.ErrNotExist {
+		// This means it didn't exist in any state, something else might have
+		// deleted it.
+		return nil, errwrap.Wrap(fmt.Errorf("pod %q was not present", uuid), err)
+	}
+
 	if !p.isPrepared && !p.isEmbryo {
 		// preparing, run, exitedGarbage, and garbage dirs use exclusive locks to indicate preparing/aborted, running/exited, and deleting/marked
 		if err = l.TrySharedLock(); err != nil {

From 9c61264d642b088fe9a40ca3a8386fdd9d1c770d Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Thu, 5 Jan 2017 16:34:57 -0800
Subject: [PATCH 0992/1304] gc: avoid erroring in race to deletion

---
 rkt/gc.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/gc.go b/rkt/gc.go
index 431ed6dab7..04e228c433 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -227,7 +227,7 @@ func mountPodStage1(ts *treestore.Store, p *pkgPod.Pod) error {
 // or Garbage state
 func deletePod(p *pkgPod.Pod) bool {
 	podState := p.State()
-	if podState != pkgPod.ExitedGarbage && podState != pkgPod.Garbage {
+	if podState != pkgPod.ExitedGarbage && podState != pkgPod.Garbage && podState != pkgPod.ExitedDeleting {
 		stderr.Errorf("non-garbage pod %q (status %q), skipped", p.UUID, p.State())
 		return false
 	}

From 3e109693d63b46e25a2a800402cf7b0691f6feeb Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Thu, 5 Jan 2017 16:55:51 -0800
Subject: [PATCH 0993/1304] pkg/log: correctly handle var-arg printf params

---
 pkg/log/log.go      |  9 ++-------
 pkg/log/log_test.go | 13 +++++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkg/log/log.go b/pkg/log/log.go
index a59a192c8c..9b3d88c7b0 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -113,7 +113,7 @@ func (l *Logger) Error(e error) {
 
 // Errorf is a convenience function for formatting and printing errors.
 func (l *Logger) Errorf(format string, a ...interface{}) {
-	l.Print(l.formatErr(fmt.Errorf(format, a), ""))
+	l.Print(l.formatErr(fmt.Errorf(format, a...), ""))
 }
 
 // FatalE prints a string and error then calls os.Exit(254).
@@ -124,7 +124,7 @@ func (l *Logger) FatalE(msg string, e error) {
 
 // Fatalf prints an error then calls os.Exit(254).
 func (l *Logger) Fatalf(format string, a ...interface{}) {
-	l.Print(l.formatErr(fmt.Errorf(format, a), ""))
+	l.Print(l.formatErr(fmt.Errorf(format, a...), ""))
 	os.Exit(254)
 }
 
@@ -132,8 +132,3 @@ func (l *Logger) Fatalf(format string, a ...interface{}) {
 func (l *Logger) PanicE(msg string, e error) {
 	l.Panic(l.formatErr(e, msg))
 }
-
-// Panicf prints an error then calls panic.
-func (l *Logger) Panicf(format string, a ...interface{}) {
-	l.Panic(l.formatErr(fmt.Errorf(format, a), ""))
-}
diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go
index 7ce0b251f5..7377e84950 100644
--- a/pkg/log/log_test.go
+++ b/pkg/log/log_test.go
@@ -64,3 +64,16 @@ func TestLogOutput(t *testing.T) {
 		}
 	}
 }
+
+func TestLogFormatting(t *testing.T) {
+	var logBuf bytes.Buffer
+	l := New(&logBuf, "prefix", false)
+
+	l.Errorf("format args: %s %d", "string", 1)
+
+	expected := "prefix: format args: string 1\n"
+
+	if logBuf.String() != expected {
+		t.Errorf("expected %q, got %q", expected, logBuf.String())
+	}
+}

From a98dc580fc032ceb3c9a89629ff26afeaee2b595 Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Fri, 6 Jan 2017 00:20:38 +0600
Subject: [PATCH 0994/1304] Documentation/stop: describe --uuid-file option

---
 Documentation/subcommands/stop.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Documentation/subcommands/stop.md b/Documentation/subcommands/stop.md
index 692df74803..d55edbdec6 100644
--- a/Documentation/subcommands/stop.md
+++ b/Documentation/subcommands/stop.md
@@ -20,6 +20,14 @@ The `--force` flag will stop a pod forcibly, that is:
 "93e516b0-e84b-40cf-a45b-531b14dfcce2"
 ```
 
+The `--uuid-file` flag may be used to pass a text file with UUID to `stop` command.
+This can be paired with `--uuid-file-save` flag to stop pods by name:
+
+```
+rkt run --uuid-file-save=/run/rkt-uuids/mypod ...
+rkt stop --uuid-file=/run/rkt-uuids/mypod
+```
+
 ## Other ways to stop a rkt pod
 
 If you started rkt as a systemd service, you can stop the pod with `systemctl stop`.

From fe401bc967b2e63f470dd7ea325af0de85d0228b Mon Sep 17 00:00:00 2001
From: Graham Whaley <graham.whaley@linux.intel.com>
Date: Fri, 6 Jan 2017 10:17:18 +0000
Subject: [PATCH 0995/1304] tests/rkt_stop: Wait for 'stop' command to complete

Do not just 'fire-and-forget' the issuing of the 'stop' command,
but wait for it to complete, or fail.
From testing, it would appear that not waiting for the command to
complete may be responsible for the spurious hangups seen during
CI testing, which may be attributed to not draining the tty of
the command via gexpect.

Signed-off-by: Graham Whaley <graham.whaley@intel.com>
---
 tests/rkt_stop_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_stop_test.go b/tests/rkt_stop_test.go
index 0c4350b04c..3657a16d99 100644
--- a/tests/rkt_stop_test.go
+++ b/tests/rkt_stop_test.go
@@ -90,7 +90,9 @@ func TestRktStop(t *testing.T) {
 
 		runCmd := fmt.Sprintf("%s %s %s", ctx.Cmd(), tt.cmd, args)
 		t.Logf("Running test #%d, %s", i, runCmd)
-		spawnOrFail(t, runCmd)
+		exitStatus := 0
+		// Issue stop command, and wait for it to complete
+		spawnAndWaitOrFail(t, runCmd, exitStatus)
 
 		// Make sure the pod is stopped
 		var podInfo *podInfo
@@ -107,7 +109,7 @@ func TestRktStop(t *testing.T) {
 			t.Fatalf("Expected pod %q to be exited, but it is %q", podUUID, podInfo.state)
 		}
 
-		exitStatus := 0
+		exitStatus = 0
 		if tt.expectKill {
 			exitStatus = -1
 		}

From b308a8081a0beaec5bb158885c52fb8864eeeedf Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Wed, 14 Dec 2016 13:30:46 +0100
Subject: [PATCH 0996/1304] sandbox: don't exit if an app fails

Currently the sandbox follows the same semantic rule as an immutable
pod. As soon as an app fails, it quits immediately.

This behavior does not hold for mutable sandboxes. As soon as an app
fails the sandbox needs to stay alive but track the exit code of the
failed app appropriately.

Also in case of restarts the /rkt/status files need to be readjusted.

This fixes it.

Also fixes #3472
---
 stage0/app.go               | 20 +++++++++++++++++++-
 stage1/init/common/units.go | 16 +++++++++++++---
 stage1/reaper/reaper.sh     |  4 +++-
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/stage0/app.go b/stage0/app.go
index 5641c4ffb5..eda7ff053a 100644
--- a/stage0/app.go
+++ b/stage0/app.go
@@ -393,7 +393,25 @@ func StartApp(cfg StartConfig) error {
 		fmt.Sprintf("--app=%s", cfg.AppName),
 	}
 
-	if _, err := os.Create(common.AppStartedPath(cfg.PodPath, cfg.AppName.String())); err != nil {
+	appStatusPath := common.AppStatusPath(cfg.PodPath, cfg.AppName.String())
+	appStartedPath := common.AppStartedPath(cfg.PodPath, cfg.AppName.String())
+
+	// The app may be restarted. In this case the /rkt/status/app and
+	// rkt/status/app-started files already exist.
+	// We could touch app-started file and compare its mtime with the app status file
+	// to determine the actual status but this won't work if the server time was modified.
+	//
+	// Instead we:
+	// 1. remove the app-started file
+	//    In this window rkt app list may report that the application exited.
+	// 2. remove the app status file
+	//    In this window rkt app list may report that the app was created.
+	// 3. re-create the the app-started file
+
+	_ = os.Remove(appStartedPath)
+	_ = os.Remove(appStatusPath)
+
+	if _, err := os.Create(appStartedPath); err != nil {
 		log.FatalE(fmt.Sprintf("error creating %s-started file", cfg.AppName.String()), err)
 	}
 
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index a9420356ac..8de3a4af48 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -61,6 +61,12 @@ func MutableEnv(p *stage1commontypes.Pod) error {
 		unit.NewUnitOption("Unit", "Description", "Prepare minimum environment for chrooted applications"),
 		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
 		unit.NewUnitOption("Unit", "OnFailureJobMode", "fail"),
+
+		// prepare-app is meant to be executed at most once.
+		// We must ensure that the prepare-app service unit remains started after the prepare-app binary exits
+		// such that it is not executed again during restarts of the target app.
+		unit.NewUnitOption("Service", "RemainAfterExit", "yes"),
+
 		unit.NewUnitOption("Service", "Type", "oneshot"),
 		unit.NewUnitOption("Service", "Restart", "no"),
 		unit.NewUnitOption("Service", "ExecStart", "/prepare-app %I"),
@@ -171,9 +177,16 @@ func ImmutableEnv(p *stage1commontypes.Pod, interactive bool) error {
 			opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "journal+console"))
 			opts = append(opts, unit.NewUnitOption("Service", "StandardError", "journal+console"))
 		}
+
+		opts = append(opts,
+			// When an app fails, we shut down the pod
+			unit.NewUnitOption("Unit", "OnFailure", "halt.target"),
+		)
+
 		w.AppUnit(ra, binPath, opts...)
 
 		w.AppReaperUnit(ra.Name, binPath,
+			unit.NewUnitOption("Service", "Environment", `"EXIT_POD=true"`),
 			unit.NewUnitOption("Unit", "Wants", "shutdown.service"),
 			unit.NewUnitOption("Unit", "After", "shutdown.service"),
 		)
@@ -445,9 +458,6 @@ func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*un
 		}
 	}
 
-	// When an app fails, we shut down the pod
-	opts = append(opts, unit.NewUnitOption("Unit", "OnFailure", "halt.target"))
-
 	for _, eh := range app.EventHandlers {
 		var typ string
 		switch eh.Name {
diff --git a/stage1/reaper/reaper.sh b/stage1/reaper/reaper.sh
index 0962a34aa4..cee5436693 100755
--- a/stage1/reaper/reaper.sh
+++ b/stage1/reaper/reaper.sh
@@ -16,7 +16,9 @@ if [ $# -eq 3 ]; then
         # be used when the pod exits (via shutdown.service).
         # This command is available since systemd v227. On older versions, the
         # command will fail and rkt will just exit with return code 0.
-        ${SYSCTL} exit ${status#*=} 2>/dev/null
+        if [ -n "$EXIT_POD" ] ; then
+                ${SYSCTL} exit ${status#*=} 2>/dev/null
+        fi
         # systemd EXIT_EXEC is 203 (https://github.com/systemd/systemd/blob/v230/src/basic/exit-status.h#L47)
         if [ "${status}" == 203 ]; then
             "${DIAG}" "${root_dir}" "${target}" 2>&1

From 0282d80368711348ed7e49bbbbb0d3feabd3cd44 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 9 Jan 2017 13:54:07 +0100
Subject: [PATCH 0997/1304] app-rm: remove app if it failed

Currently if a sandbox app failed, it cannot be removed because it is
assumed to be still running. This fixes it.
---
 stage1/app-rm/app-rm.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/stage1/app-rm/app-rm.go b/stage1/app-rm/app-rm.go
index f6583a8781..6a0785fa5c 100644
--- a/stage1/app-rm/app-rm.go
+++ b/stage1/app-rm/app-rm.go
@@ -107,7 +107,10 @@ func cleanupStage0(appName *types.ACName, enterCmd []string) error {
 	// rely only on the output, since is-active returns non-zero for inactive units
 	out, _ := cmd.Output()
 
-	if string(out) != "inactive\n" {
+	switch string(out) {
+	case "failed\n":
+	case "inactive\n":
+	default:
 		return fmt.Errorf("app %q is still running", appName.String())
 	}
 

From 3116615f4be6a2af66437c13bac87e84cbdedf47 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 9 Jan 2017 14:11:31 +0100
Subject: [PATCH 0998/1304] stage0/common: print stage1 debug output

Currently if `rkt app --debug` is enabled we get stage1 debug output
only if an error occurs.

This fixes it by printing debug output always if it is enabled.
---
 stage0/common.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/stage0/common.go b/stage0/common.go
index 55b6f551b9..1643ff1a20 100644
--- a/stage0/common.go
+++ b/stage0/common.go
@@ -86,8 +86,11 @@ func (ce CrossingEntrypoint) Run() error {
 		}
 	} else {
 		out, err := c.CombinedOutput()
+		if len(out) > 0 {
+			debug("%s\n", out)
+		}
 		if err != nil {
-			return fmt.Errorf("error executing stage1 entrypoint: %s", string(out))
+			return fmt.Errorf("error executing stage1 entrypoint: %v", err)
 		}
 	}
 

From b4d2b92fe2b31d3f95db6aa58f5149fdc95af5e4 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 9 Jan 2017 14:37:07 +0100
Subject: [PATCH 0999/1304] stage0/stage1 app: unify filenames

Currently we have mixture of file and directory conventions for app subcommands in
stage0 and stage1.

This fixes it by consolidating them following Go standards (underscore
delimiters in filenames).
---
 stage0/app.go                                 | 474 ------------------
 stage0/app_add.go                             | 243 +++++++++
 stage0/app_rm.go                              | 142 ++++++
 stage0/app_start.go                           |  95 ++++
 stage0/app_stop.go                            |  78 +++
 stage1/aci/aci-manifest.in                    |   8 +-
 .../app-add.go => app_add/app_add.go}         |   0
 .../app-add.mk => app_add/app_add.mk}         |   0
 stage1/{app-rm/app-rm.go => app_rm/app_rm.go} |   2 +-
 stage1/{app-rm/app-rm.mk => app_rm/app_rm.mk} |   0
 .../app-start.go => app_start/app_start.go}   |   0
 .../app-start.mk => app_start/app_start.mk}   |   0
 .../app-stop.go => app_stop/app_stop.go}      |   0
 .../app-stop.mk => app_stop/app_stop.mk}      |   0
 stage1/secondary-stuff.mk                     |   8 +-
 15 files changed, 567 insertions(+), 483 deletions(-)
 delete mode 100644 stage0/app.go
 create mode 100644 stage0/app_add.go
 create mode 100644 stage0/app_rm.go
 create mode 100644 stage0/app_start.go
 create mode 100644 stage0/app_stop.go
 rename stage1/{app-add/app-add.go => app_add/app_add.go} (100%)
 rename stage1/{app-add/app-add.mk => app_add/app_add.mk} (100%)
 rename stage1/{app-rm/app-rm.go => app_rm/app_rm.go} (98%)
 rename stage1/{app-rm/app-rm.mk => app_rm/app_rm.mk} (100%)
 rename stage1/{app-start/app-start.go => app_start/app_start.go} (100%)
 rename stage1/{app-start/app-start.mk => app_start/app_start.mk} (100%)
 rename stage1/{app-stop/app-stop.go => app_stop/app_stop.go} (100%)
 rename stage1/{app-stop/app-stop.mk => app_stop/app_stop.mk} (100%)

diff --git a/stage0/app.go b/stage0/app.go
deleted file mode 100644
index eda7ff053a..0000000000
--- a/stage0/app.go
+++ /dev/null
@@ -1,474 +0,0 @@
-// Copyright 2016 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//+build linux
-
-package stage0
-
-import (
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strconv"
-	"syscall"
-
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/apps"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/pkg/user"
-
-	"github.com/appc/spec/schema"
-	"github.com/appc/spec/schema/types"
-	"github.com/hashicorp/errwrap"
-)
-
-type StartConfig struct {
-	*CommonConfig
-	PodPath     string
-	UsesOverlay bool
-	AppName     *types.ACName
-	PodPID      int
-}
-
-type StopConfig struct {
-	*CommonConfig
-	PodPath string
-	AppName *types.ACName
-	PodPID  int
-}
-
-type AddConfig struct {
-	*CommonConfig
-	Image                types.Hash
-	Apps                 *apps.Apps
-	RktGid               int
-	UsesOverlay          bool
-	PodPath              string
-	PodPID               int
-	InsecureCapabilities bool
-	InsecurePaths        bool
-	InsecureSeccomp      bool
-}
-
-type RmConfig struct {
-	*CommonConfig
-	PodPath     string
-	UsesOverlay bool
-	AppName     *types.ACName
-	PodPID      int
-}
-
-func AddApp(cfg AddConfig) error {
-	// there should be only one app in the config
-	app := cfg.Apps.Last()
-	if app == nil {
-		return errors.New("no image specified")
-	}
-
-	am, err := cfg.Store.GetImageManifest(cfg.Image.String())
-	if err != nil {
-		return err
-	}
-
-	var appName *types.ACName
-	if app.Name != "" {
-		appName, err = types.NewACName(app.Name)
-		if err != nil {
-			return err
-		}
-	} else {
-		appName, err = imageNameToAppName(am.Name)
-		if err != nil {
-			return err
-		}
-	}
-
-	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
-	if err != nil {
-		return errwrap.Wrap(errors.New("error loading pod"), err)
-	}
-	defer pod.Close()
-
-	debug("locking pod manifest")
-	if err := pod.ExclusiveLockManifest(); err != nil {
-		return errwrap.Wrap(errors.New("failed to lock pod manifest"), err)
-	}
-	defer pod.UnlockManifest()
-
-	pm, err := pod.SandboxManifest()
-	if err != nil {
-		return errwrap.Wrap(errors.New("cannot add application"), err)
-	}
-
-	if pm.Apps.Get(*appName) != nil {
-		return fmt.Errorf("error: multiple apps with name %s", *appName)
-	}
-
-	if am.App == nil && app.Exec == "" {
-		return fmt.Errorf("error: image %s has no app section and --exec argument is not provided", cfg.Image)
-	}
-
-	appInfoDir := common.AppInfoPath(cfg.PodPath, *appName)
-	if err := os.MkdirAll(appInfoDir, common.DefaultRegularDirPerm); err != nil {
-		return errwrap.Wrap(errors.New("error creating apps info directory"), err)
-	}
-
-	pcfg := PrepareConfig{
-		CommonConfig: cfg.CommonConfig,
-		PrivateUsers: user.NewBlankUidRange(),
-	}
-
-	if cfg.UsesOverlay {
-		privateUsers, err := preparedWithPrivateUsers(cfg.PodPath)
-		if err != nil {
-			log.FatalE("error reading user namespace information", err)
-		}
-
-		if err := pcfg.PrivateUsers.Deserialize([]byte(privateUsers)); err != nil {
-			return err
-		}
-	}
-
-	treeStoreID, err := prepareAppImage(pcfg, *appName, cfg.Image, cfg.PodPath, cfg.UsesOverlay)
-	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("error preparing image %s", cfg.Image), err)
-	}
-
-	rcfg := RunConfig{
-		CommonConfig: cfg.CommonConfig,
-		UseOverlay:   cfg.UsesOverlay,
-		RktGid:       cfg.RktGid,
-	}
-
-	if err := setupAppImage(rcfg, *appName, cfg.Image, cfg.PodPath, cfg.UsesOverlay); err != nil {
-		return fmt.Errorf("error setting up app image: %v", err)
-	}
-
-	if cfg.UsesOverlay {
-		imgDir := filepath.Join(cfg.PodPath, "overlay", treeStoreID)
-		if err := os.Chown(imgDir, -1, cfg.RktGid); err != nil {
-			return err
-		}
-	}
-
-	ra := schema.RuntimeApp{
-		Name: *appName,
-		App:  am.App,
-		Image: schema.RuntimeImage{
-			Name:   &am.Name,
-			ID:     cfg.Image,
-			Labels: am.Labels,
-		},
-		Mounts:         MergeMounts(cfg.Apps.Mounts, app.Mounts),
-		ReadOnlyRootFS: app.ReadOnlyRootFS,
-	}
-
-	if app.Exec != "" {
-		// Create a minimal App section if not present
-		if am.App == nil {
-			ra.App = &types.App{
-				User:  strconv.Itoa(os.Getuid()),
-				Group: strconv.Itoa(os.Getgid()),
-			}
-		}
-		ra.App.Exec = []string{app.Exec}
-	}
-
-	if app.Args != nil {
-		ra.App.Exec = append(ra.App.Exec, app.Args...)
-	}
-
-	if app.WorkingDir != "" {
-		ra.App.WorkingDirectory = app.WorkingDir
-	}
-
-	if err := prepareIsolators(app, ra.App); err != nil {
-		return err
-	}
-
-	if app.User != "" {
-		ra.App.User = app.User
-	}
-
-	if app.Group != "" {
-		ra.App.Group = app.Group
-	}
-
-	if app.SupplementaryGIDs != nil {
-		ra.App.SupplementaryGIDs = app.SupplementaryGIDs
-	}
-
-	if app.UserAnnotations != nil {
-		ra.App.UserAnnotations = app.UserAnnotations
-	}
-
-	if app.UserLabels != nil {
-		ra.App.UserLabels = app.UserLabels
-	}
-
-	if app.Environments != nil {
-		envs := make([]string, 0, len(app.Environments))
-		for name, value := range app.Environments {
-			envs = append(envs, fmt.Sprintf("%s=%s", name, value))
-		}
-		// Let the app level environment override the environment variables.
-		mergeEnvs(&ra.App.Environment, envs, true)
-	}
-
-	env := ra.App.Environment
-
-	env.Set("AC_APP_NAME", appName.String())
-	envFilePath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "env", appName.String())
-
-	if err := common.WriteEnvFile(env, pcfg.PrivateUsers, envFilePath); err != nil {
-		return err
-	}
-
-	debug("adding app to sandbox")
-	pm.Apps = append(pm.Apps, ra)
-	if err := pod.UpdateManifest(pm, cfg.PodPath); err != nil {
-		return err
-	}
-
-	args := []string{
-		fmt.Sprintf("--debug=%t", cfg.Debug),
-		fmt.Sprintf("--uuid=%s", cfg.UUID),
-		fmt.Sprintf("--app=%s", appName),
-	}
-
-	if _, err := os.Create(common.AppCreatedPath(pod.Path(), appName.String())); err != nil {
-		return err
-	}
-
-	ce := CrossingEntrypoint{
-		PodPath:        cfg.PodPath,
-		PodPID:         cfg.PodPID,
-		AppName:        appName.String(),
-		EntrypointName: appAddEntrypoint,
-		EntrypointArgs: args,
-		Interactive:    false,
-	}
-	if err := ce.Run(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func RmApp(cfg RmConfig) error {
-	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
-	if err != nil {
-		return errwrap.Wrap(errors.New("error loading pod"), err)
-	}
-	defer pod.Close()
-
-	debug("locking sandbox manifest")
-	if err := pod.ExclusiveLockManifest(); err != nil {
-		return errwrap.Wrap(errors.New("failed to lock sandbox manifest"), err)
-	}
-	defer pod.UnlockManifest()
-
-	pm, err := pod.SandboxManifest()
-	if err != nil {
-		return errwrap.Wrap(errors.New("cannot remove application, sandbox validation failed"), err)
-	}
-
-	app := pm.Apps.Get(*cfg.AppName)
-	if app == nil {
-		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
-	}
-
-	if cfg.PodPID > 0 {
-		// Call app-stop and app-rm entrypoint only if the pod is still running.
-		// Otherwise, there's not much we can do about it except unmounting/removing
-		// the file system.
-		args := []string{
-			fmt.Sprintf("--debug=%t", cfg.Debug),
-			fmt.Sprintf("--app=%s", cfg.AppName),
-		}
-
-		ce := CrossingEntrypoint{
-			PodPath:        cfg.PodPath,
-			PodPID:         cfg.PodPID,
-			AppName:        cfg.AppName.String(),
-			EntrypointName: appStopEntrypoint,
-			EntrypointArgs: args,
-			Interactive:    false,
-		}
-		if err := ce.Run(); err != nil {
-			status, err := common.GetExitStatus(err)
-			// ignore nonexistent units failing to stop. Exit status 5
-			// comes from systemctl and means the unit doesn't exist
-			if err != nil {
-				return err
-			} else if status != 5 {
-				return fmt.Errorf("exit status %d", status)
-			}
-		}
-
-		ce.EntrypointName = appRmEntrypoint
-		if err := ce.Run(); err != nil {
-			return err
-		}
-	}
-
-	if cfg.UsesOverlay {
-		treeStoreID, err := ioutil.ReadFile(common.AppTreeStoreIDPath(cfg.PodPath, *cfg.AppName))
-		if err != nil {
-			return err
-		}
-
-		appRootfs := common.AppRootfsPath(cfg.PodPath, *cfg.AppName)
-		if err := syscall.Unmount(appRootfs, 0); err != nil {
-			return err
-		}
-
-		ts := filepath.Join(cfg.PodPath, "overlay", string(treeStoreID))
-		if err := os.RemoveAll(ts); err != nil {
-			return errwrap.Wrap(errors.New("error removing app info directory"), err)
-		}
-	}
-
-	appInfoDir := common.AppInfoPath(cfg.PodPath, *cfg.AppName)
-	if err := os.RemoveAll(appInfoDir); err != nil {
-		return errwrap.Wrap(errors.New("error removing app info directory"), err)
-	}
-
-	if err := os.RemoveAll(common.AppPath(cfg.PodPath, *cfg.AppName)); err != nil {
-		return err
-	}
-
-	appStatusPath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "status", cfg.AppName.String())
-	if err := os.Remove(appStatusPath); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	envPath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "env", cfg.AppName.String())
-	if err := os.Remove(envPath); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	for i, app := range pm.Apps {
-		if app.Name == *cfg.AppName {
-			pm.Apps = append(pm.Apps[:i], pm.Apps[i+1:]...)
-			break
-		}
-	}
-
-	return pod.UpdateManifest(pm, cfg.PodPath)
-}
-
-func StartApp(cfg StartConfig) error {
-	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
-	if err != nil {
-		return errwrap.Wrap(errors.New("error loading pod"), err)
-	}
-	defer pod.Close()
-
-	pm, err := pod.SandboxManifest()
-	if err != nil {
-		return errwrap.Wrap(errors.New("cannot start application"), err)
-	}
-
-	app := pm.Apps.Get(*cfg.AppName)
-	if app == nil {
-		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
-	}
-
-	args := []string{
-		fmt.Sprintf("--debug=%t", cfg.Debug),
-		fmt.Sprintf("--app=%s", cfg.AppName),
-	}
-
-	appStatusPath := common.AppStatusPath(cfg.PodPath, cfg.AppName.String())
-	appStartedPath := common.AppStartedPath(cfg.PodPath, cfg.AppName.String())
-
-	// The app may be restarted. In this case the /rkt/status/app and
-	// rkt/status/app-started files already exist.
-	// We could touch app-started file and compare its mtime with the app status file
-	// to determine the actual status but this won't work if the server time was modified.
-	//
-	// Instead we:
-	// 1. remove the app-started file
-	//    In this window rkt app list may report that the application exited.
-	// 2. remove the app status file
-	//    In this window rkt app list may report that the app was created.
-	// 3. re-create the the app-started file
-
-	_ = os.Remove(appStartedPath)
-	_ = os.Remove(appStatusPath)
-
-	if _, err := os.Create(appStartedPath); err != nil {
-		log.FatalE(fmt.Sprintf("error creating %s-started file", cfg.AppName.String()), err)
-	}
-
-	ce := CrossingEntrypoint{
-		PodPath:        cfg.PodPath,
-		PodPID:         cfg.PodPID,
-		AppName:        cfg.AppName.String(),
-		EntrypointName: appStartEntrypoint,
-		EntrypointArgs: args,
-		Interactive:    false,
-	}
-	if err := ce.Run(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func StopApp(cfg StopConfig) error {
-	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
-	if err != nil {
-		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
-	}
-	defer pod.Close()
-
-	pm, err := pod.SandboxManifest()
-	if err != nil {
-		return errwrap.Wrap(errors.New("cannot stop application"), err)
-	}
-
-	app := pm.Apps.Get(*cfg.AppName)
-	if app == nil {
-		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
-	}
-
-	args := []string{
-		fmt.Sprintf("--debug=%t", cfg.Debug),
-		fmt.Sprintf("--app=%s", cfg.AppName),
-	}
-
-	ce := CrossingEntrypoint{
-		PodPath:        cfg.PodPath,
-		PodPID:         cfg.PodPID,
-		AppName:        cfg.AppName.String(),
-		EntrypointName: appStopEntrypoint,
-		EntrypointArgs: args,
-		Interactive:    false,
-	}
-	if err := ce.Run(); err != nil {
-		status, err := common.GetExitStatus(err)
-		// exit status 5 comes from systemctl and means the unit doesn't exist
-		if status == 5 {
-			return fmt.Errorf("app %q is not running", app.Name)
-		}
-
-		return err
-	}
-
-	return nil
-}
diff --git a/stage0/app_add.go b/stage0/app_add.go
new file mode 100644
index 0000000000..0f25cf9912
--- /dev/null
+++ b/stage0/app_add.go
@@ -0,0 +1,243 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package stage0
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strconv"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/common/apps"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/coreos/rkt/pkg/user"
+	"github.com/hashicorp/errwrap"
+)
+
+type AddConfig struct {
+	*CommonConfig
+	Image                types.Hash
+	Apps                 *apps.Apps
+	RktGid               int
+	UsesOverlay          bool
+	PodPath              string
+	PodPID               int
+	InsecureCapabilities bool
+	InsecurePaths        bool
+	InsecureSeccomp      bool
+}
+
+func AddApp(cfg AddConfig) error {
+	// there should be only one app in the config
+	app := cfg.Apps.Last()
+	if app == nil {
+		return errors.New("no image specified")
+	}
+
+	am, err := cfg.Store.GetImageManifest(cfg.Image.String())
+	if err != nil {
+		return err
+	}
+
+	var appName *types.ACName
+	if app.Name != "" {
+		appName, err = types.NewACName(app.Name)
+		if err != nil {
+			return err
+		}
+	} else {
+		appName, err = imageNameToAppName(am.Name)
+		if err != nil {
+			return err
+		}
+	}
+
+	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod"), err)
+	}
+	defer pod.Close()
+
+	debug("locking pod manifest")
+	if err := pod.ExclusiveLockManifest(); err != nil {
+		return errwrap.Wrap(errors.New("failed to lock pod manifest"), err)
+	}
+	defer pod.UnlockManifest()
+
+	pm, err := pod.SandboxManifest()
+	if err != nil {
+		return errwrap.Wrap(errors.New("cannot add application"), err)
+	}
+
+	if pm.Apps.Get(*appName) != nil {
+		return fmt.Errorf("error: multiple apps with name %s", *appName)
+	}
+
+	if am.App == nil && app.Exec == "" {
+		return fmt.Errorf("error: image %s has no app section and --exec argument is not provided", cfg.Image)
+	}
+
+	appInfoDir := common.AppInfoPath(cfg.PodPath, *appName)
+	if err := os.MkdirAll(appInfoDir, common.DefaultRegularDirPerm); err != nil {
+		return errwrap.Wrap(errors.New("error creating apps info directory"), err)
+	}
+
+	pcfg := PrepareConfig{
+		CommonConfig: cfg.CommonConfig,
+		PrivateUsers: user.NewBlankUidRange(),
+	}
+
+	if cfg.UsesOverlay {
+		privateUsers, err := preparedWithPrivateUsers(cfg.PodPath)
+		if err != nil {
+			log.FatalE("error reading user namespace information", err)
+		}
+
+		if err := pcfg.PrivateUsers.Deserialize([]byte(privateUsers)); err != nil {
+			return err
+		}
+	}
+
+	treeStoreID, err := prepareAppImage(pcfg, *appName, cfg.Image, cfg.PodPath, cfg.UsesOverlay)
+	if err != nil {
+		return errwrap.Wrap(fmt.Errorf("error preparing image %s", cfg.Image), err)
+	}
+
+	rcfg := RunConfig{
+		CommonConfig: cfg.CommonConfig,
+		UseOverlay:   cfg.UsesOverlay,
+		RktGid:       cfg.RktGid,
+	}
+
+	if err := setupAppImage(rcfg, *appName, cfg.Image, cfg.PodPath, cfg.UsesOverlay); err != nil {
+		return fmt.Errorf("error setting up app image: %v", err)
+	}
+
+	if cfg.UsesOverlay {
+		imgDir := filepath.Join(cfg.PodPath, "overlay", treeStoreID)
+		if err := os.Chown(imgDir, -1, cfg.RktGid); err != nil {
+			return err
+		}
+	}
+
+	ra := schema.RuntimeApp{
+		Name: *appName,
+		App:  am.App,
+		Image: schema.RuntimeImage{
+			Name:   &am.Name,
+			ID:     cfg.Image,
+			Labels: am.Labels,
+		},
+		Mounts:         MergeMounts(cfg.Apps.Mounts, app.Mounts),
+		ReadOnlyRootFS: app.ReadOnlyRootFS,
+	}
+
+	if app.Exec != "" {
+		// Create a minimal App section if not present
+		if am.App == nil {
+			ra.App = &types.App{
+				User:  strconv.Itoa(os.Getuid()),
+				Group: strconv.Itoa(os.Getgid()),
+			}
+		}
+		ra.App.Exec = []string{app.Exec}
+	}
+
+	if app.Args != nil {
+		ra.App.Exec = append(ra.App.Exec, app.Args...)
+	}
+
+	if app.WorkingDir != "" {
+		ra.App.WorkingDirectory = app.WorkingDir
+	}
+
+	if err := prepareIsolators(app, ra.App); err != nil {
+		return err
+	}
+
+	if app.User != "" {
+		ra.App.User = app.User
+	}
+
+	if app.Group != "" {
+		ra.App.Group = app.Group
+	}
+
+	if app.SupplementaryGIDs != nil {
+		ra.App.SupplementaryGIDs = app.SupplementaryGIDs
+	}
+
+	if app.UserAnnotations != nil {
+		ra.App.UserAnnotations = app.UserAnnotations
+	}
+
+	if app.UserLabels != nil {
+		ra.App.UserLabels = app.UserLabels
+	}
+
+	if app.Environments != nil {
+		envs := make([]string, 0, len(app.Environments))
+		for name, value := range app.Environments {
+			envs = append(envs, fmt.Sprintf("%s=%s", name, value))
+		}
+		// Let the app level environment override the environment variables.
+		mergeEnvs(&ra.App.Environment, envs, true)
+	}
+
+	env := ra.App.Environment
+
+	env.Set("AC_APP_NAME", appName.String())
+	envFilePath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "env", appName.String())
+
+	if err := common.WriteEnvFile(env, pcfg.PrivateUsers, envFilePath); err != nil {
+		return err
+	}
+
+	debug("adding app to sandbox")
+	pm.Apps = append(pm.Apps, ra)
+	if err := pod.UpdateManifest(pm, cfg.PodPath); err != nil {
+		return err
+	}
+
+	args := []string{
+		fmt.Sprintf("--debug=%t", cfg.Debug),
+		fmt.Sprintf("--uuid=%s", cfg.UUID),
+		fmt.Sprintf("--app=%s", appName),
+	}
+
+	if _, err := os.Create(common.AppCreatedPath(pod.Path(), appName.String())); err != nil {
+		return err
+	}
+
+	ce := CrossingEntrypoint{
+		PodPath:        cfg.PodPath,
+		PodPID:         cfg.PodPID,
+		AppName:        appName.String(),
+		EntrypointName: appAddEntrypoint,
+		EntrypointArgs: args,
+		Interactive:    false,
+	}
+	if err := ce.Run(); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/stage0/app_rm.go b/stage0/app_rm.go
new file mode 100644
index 0000000000..42fc207005
--- /dev/null
+++ b/stage0/app_rm.go
@@ -0,0 +1,142 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package stage0
+
+import (
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"syscall"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/hashicorp/errwrap"
+)
+
+type RmConfig struct {
+	*CommonConfig
+	PodPath     string
+	UsesOverlay bool
+	AppName     *types.ACName
+	PodPID      int
+}
+
+func RmApp(cfg RmConfig) error {
+	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod"), err)
+	}
+	defer pod.Close()
+
+	debug("locking sandbox manifest")
+	if err := pod.ExclusiveLockManifest(); err != nil {
+		return errwrap.Wrap(errors.New("failed to lock sandbox manifest"), err)
+	}
+	defer pod.UnlockManifest()
+
+	pm, err := pod.SandboxManifest()
+	if err != nil {
+		return errwrap.Wrap(errors.New("cannot remove application, sandbox validation failed"), err)
+	}
+
+	app := pm.Apps.Get(*cfg.AppName)
+	if app == nil {
+		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
+	}
+
+	if cfg.PodPID > 0 {
+		// Call app-stop and app-rm entrypoint only if the pod is still running.
+		// Otherwise, there's not much we can do about it except unmounting/removing
+		// the file system.
+		args := []string{
+			fmt.Sprintf("--debug=%t", cfg.Debug),
+			fmt.Sprintf("--app=%s", cfg.AppName),
+		}
+
+		ce := CrossingEntrypoint{
+			PodPath:        cfg.PodPath,
+			PodPID:         cfg.PodPID,
+			AppName:        cfg.AppName.String(),
+			EntrypointName: appStopEntrypoint,
+			EntrypointArgs: args,
+			Interactive:    false,
+		}
+		if err := ce.Run(); err != nil {
+			status, err := common.GetExitStatus(err)
+			// ignore nonexistent units failing to stop. Exit status 5
+			// comes from systemctl and means the unit doesn't exist
+			if err != nil {
+				return err
+			} else if status != 5 {
+				return fmt.Errorf("exit status %d", status)
+			}
+		}
+
+		ce.EntrypointName = appRmEntrypoint
+		if err := ce.Run(); err != nil {
+			return err
+		}
+	}
+
+	if cfg.UsesOverlay {
+		treeStoreID, err := ioutil.ReadFile(common.AppTreeStoreIDPath(cfg.PodPath, *cfg.AppName))
+		if err != nil {
+			return err
+		}
+
+		appRootfs := common.AppRootfsPath(cfg.PodPath, *cfg.AppName)
+		if err := syscall.Unmount(appRootfs, 0); err != nil {
+			return err
+		}
+
+		ts := filepath.Join(cfg.PodPath, "overlay", string(treeStoreID))
+		if err := os.RemoveAll(ts); err != nil {
+			return errwrap.Wrap(errors.New("error removing app info directory"), err)
+		}
+	}
+
+	appInfoDir := common.AppInfoPath(cfg.PodPath, *cfg.AppName)
+	if err := os.RemoveAll(appInfoDir); err != nil {
+		return errwrap.Wrap(errors.New("error removing app info directory"), err)
+	}
+
+	if err := os.RemoveAll(common.AppPath(cfg.PodPath, *cfg.AppName)); err != nil {
+		return err
+	}
+
+	appStatusPath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "status", cfg.AppName.String())
+	if err := os.Remove(appStatusPath); err != nil && !os.IsNotExist(err) {
+		return err
+	}
+
+	envPath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "env", cfg.AppName.String())
+	if err := os.Remove(envPath); err != nil && !os.IsNotExist(err) {
+		return err
+	}
+
+	for i, app := range pm.Apps {
+		if app.Name == *cfg.AppName {
+			pm.Apps = append(pm.Apps[:i], pm.Apps[i+1:]...)
+			break
+		}
+	}
+
+	return pod.UpdateManifest(pm, cfg.PodPath)
+}
diff --git a/stage0/app_start.go b/stage0/app_start.go
new file mode 100644
index 0000000000..07c71373db
--- /dev/null
+++ b/stage0/app_start.go
@@ -0,0 +1,95 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package stage0
+
+import (
+	"errors"
+	"fmt"
+	"os"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/hashicorp/errwrap"
+)
+
+type StartConfig struct {
+	*CommonConfig
+	PodPath     string
+	UsesOverlay bool
+	AppName     *types.ACName
+	PodPID      int
+}
+
+func StartApp(cfg StartConfig) error {
+	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod"), err)
+	}
+	defer pod.Close()
+
+	pm, err := pod.SandboxManifest()
+	if err != nil {
+		return errwrap.Wrap(errors.New("cannot start application"), err)
+	}
+
+	app := pm.Apps.Get(*cfg.AppName)
+	if app == nil {
+		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
+	}
+
+	args := []string{
+		fmt.Sprintf("--debug=%t", cfg.Debug),
+		fmt.Sprintf("--app=%s", cfg.AppName),
+	}
+
+	appStatusPath := common.AppStatusPath(cfg.PodPath, cfg.AppName.String())
+	appStartedPath := common.AppStartedPath(cfg.PodPath, cfg.AppName.String())
+
+	// The app may be restarted. In this case the /rkt/status/app and
+	// rkt/status/app-started files already exist.
+	// We could touch app-started file and compare its mtime with the app status file
+	// to determine the actual status but this won't work if the server time was modified.
+	//
+	// Instead we:
+	// 1. remove the app-started file
+	//    In this window rkt app list may report that the application exited.
+	// 2. remove the app status file
+	//    In this window rkt app list may report that the app was created.
+	// 3. re-create the the app-started file
+
+	_ = os.Remove(appStartedPath)
+	_ = os.Remove(appStatusPath)
+
+	if _, err := os.Create(appStartedPath); err != nil {
+		log.FatalE(fmt.Sprintf("error creating %s-started file", cfg.AppName.String()), err)
+	}
+
+	ce := CrossingEntrypoint{
+		PodPath:        cfg.PodPath,
+		PodPID:         cfg.PodPID,
+		AppName:        cfg.AppName.String(),
+		EntrypointName: appStartEntrypoint,
+		EntrypointArgs: args,
+		Interactive:    false,
+	}
+	if err := ce.Run(); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/stage0/app_stop.go b/stage0/app_stop.go
new file mode 100644
index 0000000000..8a9deb759d
--- /dev/null
+++ b/stage0/app_stop.go
@@ -0,0 +1,78 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package stage0
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/hashicorp/errwrap"
+)
+
+type StopConfig struct {
+	*CommonConfig
+	PodPath string
+	AppName *types.ACName
+	PodPID  int
+}
+
+func StopApp(cfg StopConfig) error {
+	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
+	if err != nil {
+		return errwrap.Wrap(errors.New("error loading pod manifest"), err)
+	}
+	defer pod.Close()
+
+	pm, err := pod.SandboxManifest()
+	if err != nil {
+		return errwrap.Wrap(errors.New("cannot stop application"), err)
+	}
+
+	app := pm.Apps.Get(*cfg.AppName)
+	if app == nil {
+		return fmt.Errorf("error: nonexistent app %q", *cfg.AppName)
+	}
+
+	args := []string{
+		fmt.Sprintf("--debug=%t", cfg.Debug),
+		fmt.Sprintf("--app=%s", cfg.AppName),
+	}
+
+	ce := CrossingEntrypoint{
+		PodPath:        cfg.PodPath,
+		PodPID:         cfg.PodPID,
+		AppName:        cfg.AppName.String(),
+		EntrypointName: appStopEntrypoint,
+		EntrypointArgs: args,
+		Interactive:    false,
+	}
+
+	if err := ce.Run(); err != nil {
+		status, err := common.GetExitStatus(err)
+		// exit status 5 comes from systemctl and means the unit doesn't exist
+		if status == 5 {
+			return fmt.Errorf("app %q is not running", app.Name)
+		}
+
+		return err
+	}
+
+	return nil
+}
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index 12ac16ca4f..6878aa42c5 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -35,19 +35,19 @@
         },
         {
             "name": "coreos.com/rkt/stage1/app/add",
-            "value": "/app-add"
+            "value": "/app_add"
         },
         {
             "name": "coreos.com/rkt/stage1/app/rm",
-            "value": "/app-rm"
+            "value": "/app_rm"
         },
         {
             "name": "coreos.com/rkt/stage1/app/start",
-            "value": "/app-start"
+            "value": "/app_start"
         },
         {
             "name": "coreos.com/rkt/stage1/app/stop",
-            "value": "/app-stop"
+            "value": "/app_stop"
         },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
diff --git a/stage1/app-add/app-add.go b/stage1/app_add/app_add.go
similarity index 100%
rename from stage1/app-add/app-add.go
rename to stage1/app_add/app_add.go
diff --git a/stage1/app-add/app-add.mk b/stage1/app_add/app_add.mk
similarity index 100%
rename from stage1/app-add/app-add.mk
rename to stage1/app_add/app_add.mk
diff --git a/stage1/app-rm/app-rm.go b/stage1/app_rm/app_rm.go
similarity index 98%
rename from stage1/app-rm/app-rm.go
rename to stage1/app_rm/app_rm.go
index 6a0785fa5c..0ac732d5c0 100644
--- a/stage1/app-rm/app-rm.go
+++ b/stage1/app_rm/app_rm.go
@@ -132,7 +132,7 @@ func cleanupStage0(appName *types.ACName, enterCmd []string) error {
 	// last cleaning steps are performed after entering pod context
 	tasks := [][]string{
 		// inception: call itself to clean stage1 before proceeding
-		{"/app-rm", "--stage=1", fmt.Sprintf("--app=%s", appName), fmt.Sprintf("--debug=%t", debug)},
+		{"/app_rm", "--stage=1", fmt.Sprintf("--app=%s", appName), fmt.Sprintf("--debug=%t", debug)},
 		// all cleaned-up, let systemd reload and forget about this app
 		{"/usr/bin/systemctl", "daemon-reload"},
 	}
diff --git a/stage1/app-rm/app-rm.mk b/stage1/app_rm/app_rm.mk
similarity index 100%
rename from stage1/app-rm/app-rm.mk
rename to stage1/app_rm/app_rm.mk
diff --git a/stage1/app-start/app-start.go b/stage1/app_start/app_start.go
similarity index 100%
rename from stage1/app-start/app-start.go
rename to stage1/app_start/app_start.go
diff --git a/stage1/app-start/app-start.mk b/stage1/app_start/app_start.mk
similarity index 100%
rename from stage1/app-start/app-start.mk
rename to stage1/app_start/app_start.mk
diff --git a/stage1/app-stop/app-stop.go b/stage1/app_stop/app_stop.go
similarity index 100%
rename from stage1/app-stop/app-stop.go
rename to stage1/app_stop/app_stop.go
diff --git a/stage1/app-stop/app-stop.mk b/stage1/app_stop/app_stop.mk
similarity index 100%
rename from stage1/app-stop/app-stop.mk
rename to stage1/app_stop/app_stop.mk
diff --git a/stage1/secondary-stuff.mk b/stage1/secondary-stuff.mk
index 449bf4a5f2..2bec9a0f3b 100644
--- a/stage1/secondary-stuff.mk
+++ b/stage1/secondary-stuff.mk
@@ -12,10 +12,10 @@ _S1_SS_SUBDIRS_ := \
 	reaper \
 	stop \
 	stop_kvm \
-	app-add \
-	app-rm \
-	app-start \
-	app-stop \
+	app_add \
+	app_rm \
+	app_start \
+	app_stop \
 	units \
 	aci
 

From ec8c0c84f2cd4a047c76f6a987a33aa36471e46b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 9 Jan 2017 14:29:04 +0000
Subject: [PATCH 1000/1304] stage1/fly: clear FD_CLOEXEC only once

stage1-fly was previously toggling `FD_CLOEXEC` on `RKT_LOCK_FD` multiple
times:
 1. setting it at first
 2. clearing it before exec()
 3. setting it again after exec()

This commit just clears it once, as exec() is the very last stage1 step
and we either exit-fail or never return after that.
---
 stage1_fly/run/main.go | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index ef10c26190..ac0bc550ea 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -279,12 +279,6 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		return 254
 	}
 
-	// set close-on-exec flag on RKT_LOCK_FD so it gets correctly closed after execution is finished
-	if err := sys.CloseOnExec(lfd, true); err != nil {
-		log.PrintE("can't set FD_CLOEXEC on rkt lock", err)
-		return 254
-	}
-
 	workDir := "/"
 	if ra.App.WorkingDirectory != "" {
 		workDir = ra.App.WorkingDirectory
@@ -484,27 +478,30 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 	// see https://github.com/golang/go/issues/1435#issuecomment-66054163.
 	runtime.LockOSThread()
 
-	diag.Printf("setting uid %d gid %d", uid, gid)
-
+	// set process credentials
+	diag.Printf("setting credentials: uid=%d, gid=%d", uid, gid)
 	if err := syscall.Setresgid(gid, gid, gid); err != nil {
 		log.PrintE(fmt.Sprintf("can't set gid %d", gid), err)
 		return 254
 	}
-
 	if err := syscall.Setresuid(uid, uid, uid); err != nil {
 		log.PrintE(fmt.Sprintf("can't set uid %d", uid), err)
 		return 254
 	}
 
+	// clear close-on-exec flag on RKT_LOCK_FD, to keep pod status as running after exec().
+	if err := sys.CloseOnExec(lfd, false); err != nil {
+		log.PrintE("unable to clear FD_CLOEXEC on pod lock", err)
+		return 254
+	}
+
 	diag.Printf("execing %q in %q", args, rfs)
-	err = stage1common.WithClearedCloExec(lfd, func() error {
-		return syscall.Exec(args[0], args, env)
-	})
-	if err != nil {
+	if err = syscall.Exec(args[0], args, env); err != nil {
 		log.PrintE(fmt.Sprintf("can't execute %q", args[0]), err)
 		return 254
 	}
 
+	// unreachable, as successful exec() never returns.
 	return 0
 }
 

From 1a72e2a02eec43b332049dcc4dcd22259fa1797d Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Mon, 9 Jan 2017 16:57:48 +0100
Subject: [PATCH 1001/1304] tests/sandbox: simplify test

This simplifies the sandbox tests.
---
 tests/rkt_app_sandbox_test.go | 75 ++++++++++++++---------------------
 tests/testutils/ctx.go        |  6 +++
 2 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index a2875bfa56..55cc1795ef 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -18,11 +18,8 @@
 package main
 
 import (
-	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 
@@ -37,34 +34,30 @@ func TestAppSandboxSmoke(t *testing.T) {
 	appName := "hello-app"
 	msg := "HelloFromAppInSandbox"
 
-	aciHello := patchTestACI("rkt-inspect-hello.aci", fmt.Sprintf("--name=%s", imageName), fmt.Sprintf("--exec=/inspect --print-msg=%s", msg))
+	aciHello := patchTestACI("rkt-inspect-hello.aci", "--name="+imageName, "--exec=/inspect --print-msg="+msg)
 	defer os.Remove(aciHello)
 
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	cmd := strings.Fields(fmt.Sprintf("%s fetch --insecure-options=image %s", ctx.Cmd(), aciHello))
-	fetchCmd := exec.Command(cmd[0], cmd[1:]...)
-	fetchCmd.Env = append(fetchCmd.Env, "RKT_EXPERIMENT_APP=true")
-	fetchOutput, err := fetchCmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Unexpected error: %v\n%s", err, fetchOutput)
+	if err := os.Setenv("RKT_EXPERIMENT_APP", "true"); err != nil {
+		panic(err)
+	}
+	defer os.Unsetenv("RKT_EXPERIMENT_APP")
+
+	fetch := ctx.ExecCmd("fetch", "--insecure-options=image", aciHello)
+	fetch.Env = append(fetch.Env, "RKT_EXPERIMENT_APP=true")
+	t.Log("Running", fetch.Args)
+	if out, err := fetch.CombinedOutput(); err != nil {
+		t.Fatal(err, "output", out)
 	}
 
 	tmpDir := createTempDirOrPanic("rkt-test-cri-")
 	uuidFile := filepath.Join(tmpDir, "uuid")
 	defer os.RemoveAll(tmpDir)
 
-	rktCmd := fmt.Sprintf("%s app sandbox --uuid-file-save=%s", ctx.Cmd(), uuidFile)
-	err = os.Setenv("RKT_EXPERIMENT_APP", "true")
-	if err != nil {
-		panic(err)
-	}
-	child := spawnOrFail(t, rktCmd)
-	err = os.Unsetenv("RKT_EXPERIMENT_APP")
-	if err != nil {
-		panic(err)
-	}
+	rkt := ctx.Cmd() + " app sandbox --uuid-file-save=" + uuidFile
+	child := spawnOrFail(t, rkt)
 
 	// wait for the sandbox to start
 	podUUID, err := waitPodReady(ctx, t, uuidFile, actionTimeout)
@@ -72,42 +65,32 @@ func TestAppSandboxSmoke(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	cmd = strings.Fields(fmt.Sprintf("%s app add --debug %s %s --name=%s", ctx.Cmd(), podUUID, imageName, appName))
-	addCmd := exec.Command(cmd[0], cmd[1:]...)
-	addCmd.Env = append(addCmd.Env, "RKT_EXPERIMENT_APP=true")
-	t.Logf("Running command: %v\n", cmd)
-	output, err := addCmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Unexpected error: %v\n%s", err, output)
+	add := ctx.ExecCmd("app", "add", "--debug", podUUID, imageName, "--name="+appName)
+	t.Log("Running", add.Args)
+	if out, err := add.CombinedOutput(); err != nil {
+		t.Fatal(err, "output", out)
 	}
 
-	cmd = strings.Fields(fmt.Sprintf("%s app start --debug %s --app=%s", ctx.Cmd(), podUUID, appName))
-	startCmd := exec.Command(cmd[0], cmd[1:]...)
-	startCmd.Env = append(startCmd.Env, "RKT_EXPERIMENT_APP=true")
-	t.Logf("Running command: %v\n", cmd)
-	output, err = startCmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Unexpected error: %v\n%s", err, output)
+	start := ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+appName)
+	t.Log("Running", start.Args)
+	if out, err := start.CombinedOutput(); err != nil {
+		t.Fatal(err, "output", out)
 	}
 
 	if err := expectTimeoutWithOutput(child, msg, actionTimeout); err != nil {
 		t.Fatalf("Expected %q but not found: %v", msg, err)
 	}
 
-	cmd = strings.Fields(fmt.Sprintf("%s app rm --debug %s --app=%s", ctx.Cmd(), podUUID, appName))
-	removeCmd := exec.Command(cmd[0], cmd[1:]...)
-	removeCmd.Env = append(removeCmd.Env, "RKT_EXPERIMENT_APP=true")
-	t.Logf("Running command: %v\n", cmd)
-	output, err = removeCmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Unexpected error: %v\n%s", err, output)
+	remove := ctx.ExecCmd("app", "rm", "--debug", podUUID, "--app="+appName)
+	t.Log("Running", remove.Args)
+	if out, err := remove.CombinedOutput(); err != nil {
+		t.Fatal(err, "output", out)
 	}
 
-	cmd = strings.Fields(fmt.Sprintf("%s stop %s", ctx.Cmd(), podUUID))
-	t.Logf("Running command: %v\n", cmd)
-	output, err = exec.Command(cmd[0], cmd[1:]...).CombinedOutput()
-	if err != nil {
-		t.Fatalf("Unexpected error: %v\n%s", err, output)
+	stop := ctx.ExecCmd("stop", podUUID)
+	t.Log("Running", stop.Args)
+	if out, err := stop.CombinedOutput(); err != nil {
+		t.Fatal(err, "output", out)
 	}
 
 	waitOrFail(t, child, 0)
diff --git a/tests/testutils/ctx.go b/tests/testutils/ctx.go
index dd0f4eac5b..77f3bc7279 100644
--- a/tests/testutils/ctx.go
+++ b/tests/testutils/ctx.go
@@ -197,6 +197,12 @@ func (ctx *RktRunCtx) Cmd() string {
 	)
 }
 
+func (ctx *RktRunCtx) ExecCmd(arg ...string) *exec.Cmd {
+	args := ctx.rktOptions()
+	args = append(args, arg...)
+	return exec.Command(ctx.rktBin(), args...)
+}
+
 // TODO(jonboulle): clean this up
 func (ctx *RktRunCtx) CmdNoConfig() string {
 	return fmt.Sprintf("%s %s",

From 42680a78827895edfc2bcca3a331a7b4df85ef30 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 10 Jan 2017 13:33:00 +0000
Subject: [PATCH 1002/1304] stage1/fly: record pgid and let stop fallback to it

This introduces an additional "pgid" file, specific to stage1-fly
implementation, to record the process group of the pod.
It is used by stop as a fallback mechanism if the pod-leader process
is gone but some daemonized children still exist, leaving the pod
in an unkillable status.
---
 stage1_fly/run/main.go  |  8 ++++++++
 stage1_fly/stop/stop.go | 37 +++++++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index ef10c26190..d25714eef4 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -430,11 +430,19 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		}
 	}
 
+	// stage1 interface: pod-leader pid
 	if err = stage1common.WritePid(os.Getpid(), "pid"); err != nil {
 		log.Error(err)
 		return 254
 	}
 
+	// stage1-fly internal: pod pgid
+	// (used by stop, as fly has weak pod-grouping of processes)
+	if err = stage1common.WritePid(syscall.Getpgrp(), "pgid"); err != nil {
+		log.Error(err)
+		return 254
+	}
+
 	var uidResolver, gidResolver user.Resolver
 	var uid, gid int
 
diff --git a/stage1_fly/stop/stop.go b/stage1_fly/stop/stop.go
index 0b231f25fb..3723975175 100644
--- a/stage1_fly/stop/stop.go
+++ b/stage1_fly/stop/stop.go
@@ -21,8 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-
-	"github.com/shirou/gopsutil/process"
+	"syscall"
 )
 
 var (
@@ -33,7 +32,7 @@ func init() {
 	flag.BoolVar(&force, "force", false, "Forced stopping")
 }
 
-func readIntFromFile(path string) (i int32, err error) {
+func readIntFromFile(path string) (i int, err error) {
 	b, err := ioutil.ReadFile(path)
 	if err != nil {
 		return
@@ -44,27 +43,37 @@ func readIntFromFile(path string) (i int32, err error) {
 
 func main() {
 	flag.Parse()
+	var sig syscall.Signal
 
-	pid, err := readIntFromFile("pid")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
-		os.Exit(254)
+	if force {
+		sig = syscall.SIGKILL
+	} else {
+		sig = syscall.SIGTERM
 	}
 
-	process, err := process.NewProcess(pid)
+	pid, err := readIntFromFile("pid")
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "unable to create process %d instance: %v\n", pid, err)
+		fmt.Fprintf(os.Stderr, "error reading pid: %v\n", err)
 		os.Exit(254)
 	}
 
-	if force {
-		if process.Kill() != nil {
-			fmt.Fprintf(os.Stderr, "unable to kill process %d: %v\n", pid, err)
+	// check for process existence, then kill the process otherwise the group
+	err = syscall.Kill(pid, syscall.Signal(0))
+	if err == nil {
+		err = syscall.Kill(pid, sig)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error stopping process %d: %v\n", pid, err)
 			os.Exit(254)
 		}
 	} else {
-		if process.Terminate() != nil {
-			fmt.Fprintf(os.Stderr, "unable to terminate process %d: %v\n", pid, err)
+		pgid, err := readIntFromFile("pgid")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error reading pgid: %v\n", err)
+			os.Exit(254)
+		}
+		err = syscall.Kill(-pgid, sig)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error stopping process group %d: %v\n", pgid, err)
 			os.Exit(254)
 		}
 	}

From e0b450e75c378890e87e5a974fd115eccc876e68 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Mon, 9 Jan 2017 20:11:45 +0100
Subject: [PATCH 1003/1304] stage1: Add hostname in to /etc/hosts

This fixes a regression where the pod's hostname was missing from
/etc/hosts

Fixes #3422
---
 stage1/init/common/dns_config.go      | 51 ++++++++++++++++
 stage1/init/common/dns_config_test.go | 86 +++++++++++++++++++++++++++
 stage1/init/init.go                   | 44 ++++++++++----
 tests/rkt_etc_hosts_test.go           |  8 +--
 4 files changed, 172 insertions(+), 17 deletions(-)
 create mode 100644 stage1/init/common/dns_config_test.go

diff --git a/stage1/init/common/dns_config.go b/stage1/init/common/dns_config.go
index ffcf0bfc11..de78a65503 100644
--- a/stage1/init/common/dns_config.go
+++ b/stage1/init/common/dns_config.go
@@ -15,7 +15,11 @@
 package common
 
 import (
+	"bufio"
+	"fmt"
+	"os"
 	"path/filepath"
+	"strings"
 
 	_common "github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/fs"
@@ -44,3 +48,50 @@ func UseHostHosts(mnt fs.MountUnmounter, podRoot string) error {
 		filepath.Join(_common.Stage1RootfsPath(podRoot), "etc/rkt-hosts"),
 		true)
 }
+
+// AddHostsEntry adds an entry to an *existing* hosts file, appending
+// to the existing IP if needed
+func AddHostsEntry(filename string, ip string, hostname string) error {
+	fp, err := os.OpenFile(filename, os.O_RDWR, 0644)
+	if err != nil {
+		return err
+	}
+	defer fp.Close()
+
+	out := ""
+	found := false
+
+	scanner := bufio.NewScanner(fp)
+	for scanner.Scan() {
+		line := scanner.Text()
+		words := strings.Fields(line)
+		if !found && len(words) > 0 && words[0] == ip {
+			found = true
+			out += fmt.Sprintf("%s %s\n", line, hostname)
+		} else {
+			out += line
+			out += "\n"
+		}
+	}
+	if err := scanner.Err(); err != nil {
+		return err
+	}
+
+	// If that IP was not found, add a new line
+	if !found {
+		out += fmt.Sprintf("%s\t%s\n", ip, hostname)
+	}
+
+	// Seek to the beginning, truncate, and write again
+	if _, err := fp.Seek(0, 0); err != nil {
+		return err
+	}
+	if err := fp.Truncate(0); err != nil {
+		return err
+	}
+	if _, err := fp.Write([]byte(out)); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/stage1/init/common/dns_config_test.go b/stage1/init/common/dns_config_test.go
new file mode 100644
index 0000000000..d6a3512e92
--- /dev/null
+++ b/stage1/init/common/dns_config_test.go
@@ -0,0 +1,86 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+)
+
+func TestAddHostsEntry(t *testing.T) {
+	for i, tt := range []struct {
+		contents string
+		ip       string
+		hostname string
+		expected string
+	}{
+		{ // Blank file
+			"",
+			"127.0.0.1",
+			"entry",
+			"127.0.0.1\tentry\n",
+		},
+		{ // One line, found
+			"127.0.0.1 localhost localhost.localdomain\n",
+			"127.0.0.1",
+			"testing",
+			"127.0.0.1 localhost localhost.localdomain testing\n",
+		},
+		{ // Some lines, not found
+			"4.2.2.2 hello goodbye\n\n\n",
+			"127.0.0.1",
+			"testing",
+			"4.2.2.2 hello goodbye\n\n\n127.0.0.1\ttesting\n",
+		},
+		{ // IP address duplicated
+			"127.0.0.1 hello\n127.0.0.1 broken\n",
+			"127.0.0.1",
+			"testing",
+			"127.0.0.1 hello testing\n127.0.0.1 broken\n",
+		},
+		{ // Lots of lines, found.
+			"4.2.2.2 hello goodbye\n\n\n127.0.0.1 foo\n\n#words\n",
+			"127.0.0.1",
+			"testing",
+			"4.2.2.2 hello goodbye\n\n\n127.0.0.1 foo testing\n\n#words\n",
+		},
+	} {
+		tmpfile, err := ioutil.TempFile("", "common-test-hosts")
+		if err != nil {
+			t.Fatal("failed to write temporary file", err)
+		}
+
+		defer os.Remove(tmpfile.Name())
+
+		if _, err := tmpfile.Write([]byte(tt.contents)); err != nil {
+			t.Fatal("failed to write temporary file", err)
+		}
+
+		if err := tmpfile.Close(); err != nil {
+			t.Fatal("failed to close temporary file", err)
+		}
+
+		if err != AddHostsEntry(tmpfile.Name(), tt.ip, tt.hostname) {
+			t.Fatal("failed to write new hostname", err)
+		}
+
+		newContents, err := ioutil.ReadFile(tmpfile.Name())
+
+		if tt.expected != string(newContents) {
+			t.Fatalf("Test case %d failed: expected contents %v, actual %v", i, tt.expected, string(newContents))
+		}
+	}
+}
diff --git a/stage1/init/init.go b/stage1/init/init.go
index faabadd5c7..05a4ca3bec 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -264,18 +264,6 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 		return nil, nil, errwrap.Wrap(errors.New("failed to create flavor symlink"), err)
 	}
 
-	// set hostname inside pod
-	// According to systemd manual (https://www.freedesktop.org/software/systemd/man/hostname.html) :
-	// "The /etc/hostname file configures the name of the local system that is set
-	// during boot using the sethostname system call"
-	if p.Hostname == "" {
-		p.Hostname = stage1initcommon.GetMachineID(p)
-	}
-	hostnamePath := filepath.Join(common.Stage1RootfsPath(p.Root), "etc/hostname")
-	if err := ioutil.WriteFile(hostnamePath, []byte(p.Hostname), 0644); err != nil {
-		return nil, nil, fmt.Errorf("error writing %s, %s", hostnamePath, err)
-	}
-
 	// systemd-nspawn needs /etc/machine-id to link the container's journal
 	// to the host. Since systemd-v230, /etc/machine-id is mandatory, see
 	// https://github.com/systemd/systemd/commit/e01ff70a77e781734e1e73a2238af2e9bf7967a8
@@ -588,12 +576,42 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		diag.Printf,
 	)
 
+	// set hostname inside pod
+	// According to systemd manual (https://www.freedesktop.org/software/systemd/man/hostname.html) :
+	// "The /etc/hostname file configures the name of the local system that is set
+	// during boot using the sethostname system call"
+	if p.Hostname == "" {
+		p.Hostname = stage1initcommon.GetMachineID(p)
+	}
+	hostnamePath := filepath.Join(common.Stage1RootfsPath(p.Root), "etc/hostname")
+	if err := ioutil.WriteFile(hostnamePath, []byte(p.Hostname), 0644); err != nil {
+		log.PrintE("error writing "+hostnamePath, err)
+		return 254
+	}
+
 	if p.ResolvConfMode == "host" {
 		stage1initcommon.UseHostResolv(mnt, root)
 	}
 
-	if p.EtcHostsMode == "host" {
+	// Set up the hosts file.
+	// We write <stage1>/etc/rkt-hosts if we want to override each app's hosts,
+	// and <stage1>/etc/hosts-fallback if we want to let the app "win"
+	// Either way, we should add our hostname to it, unless the hosts's
+	// /etc/hosts is bind-mounted in.
+	if p.EtcHostsMode == "host" { // We should bind-mount the hosts's /etc/hosts
 		stage1initcommon.UseHostHosts(mnt, root)
+	} else if p.EtcHostsMode == "default" { // Create hosts-fallback
+		hostsFile := filepath.Join(common.Stage1RootfsPath(p.Root), "etc", "hosts-fallback")
+		if err := stage1initcommon.AddHostsEntry(hostsFile, "127.0.0.1", p.Hostname); err != nil {
+			log.PrintE("Failed to write hostname to "+hostsFile, err)
+			return 254
+		}
+	} else if p.EtcHostsMode == "stage0" { // The stage0 has created rkt-hosts
+		hostsFile := filepath.Join(common.Stage1RootfsPath(p.Root), "etc", "rkt-hosts")
+		if err := stage1initcommon.AddHostsEntry(hostsFile, "127.0.0.1", p.Hostname); err != nil {
+			log.PrintE("Failed to write hostname to "+hostsFile, err)
+			return 254
+		}
 	}
 
 	if p.Mutable {
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index 9f2c51ea59..de425fe14e 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -70,10 +70,10 @@ func TestEtcHosts(t *testing.T) {
 			"--mount volume=hosts,target=/etc/hosts --exec=/inspect -- -file-name=/etc/hosts -read-file",
 			"<<<preexisting etc>>>",
 		},
-		{ // Test that with no /etc/hosts, the fallback is created
+		{ // Test that with no /etc/hosts, the fallback is created with container hostname
 			"",
-			"--exec=/inspect -- -file-name=/etc/hosts -hash-file",
-			"192f716fb0db669de1c537b845b632f03c9aeb40",
+			"--exec=/inspect -- -file-name=/etc/hosts -read-file",
+			"127.0.0.1 localhost localhost.domain localhost4 localhost4.localdomain4 rkt-[a-z0-9-]{36}",
 		},
 		{ // Test that with --hosts-entry=host, the host's is copied
 			"--hosts-entry=host",
@@ -104,7 +104,7 @@ func TestEtcHosts(t *testing.T) {
 
 		_, out, err := expectRegexTimeoutWithOutput(child, tt.expectRegEx, 30*time.Second)
 		if err != nil {
-			t.Fatalf("Test %d %v %v", i, err, out)
+			t.Fatalf("Test %d %v output: %v", i, err, out)
 		}
 
 		waitOrFail(t, child, 0)

From a11d199ae0024a01de5c428531f683821efcbbfb Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Tue, 10 Jan 2017 16:18:07 +0100
Subject: [PATCH 1004/1304] tests/sandbox: add tests for start/remove and
 multiple apps

This adds more functional tests for the app sandbox. It adds a test
which starts/stops an app within a running sandbox and another test
which adds three different kinds of apps and evaluates their respective
status in rkt.
---
 tests/rkt_app_sandbox_test.go | 402 ++++++++++++++++++++++++++++++----
 1 file changed, 363 insertions(+), 39 deletions(-)

diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index 55cc1795ef..e301df006a 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -18,80 +18,404 @@
 package main
 
 import (
+	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
+	"strconv"
+	"strings"
 	"testing"
 	"time"
 
+	"github.com/coreos/gexpect"
 	"github.com/coreos/rkt/tests/testutils"
 )
 
-// TestAppSandboxSmoke is a basic smoke test for `rkt app` sandbox
-// and related commands.
-func TestAppSandboxSmoke(t *testing.T) {
-	actionTimeout := 30 * time.Second
-	imageName := "coreos.com/rkt-inspect/hello"
-	appName := "hello-app"
-	msg := "HelloFromAppInSandbox"
+// TestAppSandboxOneApp is a basic test for `rkt app` sandbox.
+// It starts the sandbox, adds one app, starts it, and removes it.
+func TestAppSandboxAddStartRemove(t *testing.T) {
+	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+		actionTimeout := 30 * time.Second
+		imageName := "coreos.com/rkt-inspect/hello"
+		appName := "hello-app"
+		msg := "HelloFromAppInSandbox"
 
-	aciHello := patchTestACI("rkt-inspect-hello.aci", "--name="+imageName, "--exec=/inspect --print-msg="+msg)
-	defer os.Remove(aciHello)
+		aciHello := patchTestACI("rkt-inspect-hello.aci", "--name="+imageName, "--exec=/inspect --print-msg="+msg)
+		defer os.Remove(aciHello)
 
-	ctx := testutils.NewRktRunCtx()
-	defer ctx.Cleanup()
+		testCmd{ctx.ExecCmd("fetch", "--insecure-options=image", aciHello)}.CombinedOutput(t)
+		testCmd{ctx.ExecCmd("app", "add", "--debug", podUUID, imageName, "--name="+appName)}.CombinedOutput(t)
+		testCmd{ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+appName)}.CombinedOutput(t)
+
+		if err := expectTimeoutWithOutput(child, msg, actionTimeout); err != nil {
+			t.Fatalf("Expected %q but not found: %v", msg, err)
+		}
+
+		testCmd{ctx.ExecCmd("app", "rm", "--debug", podUUID, "--app="+appName)}.CombinedOutput(t)
+
+		out := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+		if out != "\n" {
+			t.Errorf("unexpected output %q", out)
+			return
+		}
+	})
+}
+
+// TestAppSandboxMultipleApps tests multiple apps in a sandbox:
+// one that exits successfully, one that exits with an error, and one that keeps running.
+func TestAppSandboxMultipleApps(t *testing.T) {
+	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+		actionTimeout := 60 * time.Second
+
+		type app struct {
+			name, image, exec, aci string
+		}
+
+		apps := []app{
+			{
+				name:  "winner",
+				image: "coreos.com/rkt-inspect/success",
+				exec:  "/inspect -print-msg=SUCCESS",
+				aci:   "rkt-inspect-success.aci",
+			},
+			{
+				name:  "loser",
+				image: "coreos.com/rkt-inspect/fail",
+				exec:  "/inspect -print-msg=FAILED -exit-code=12",
+				aci:   "rkt-inspect-loser.aci",
+			},
+			{
+				name:  "sleeper",
+				image: "coreos.com/rkt-inspect/sleep",
+				exec:  "/inspect -print-msg=SLEEP -sleep=120",
+				aci:   "rkt-inspect-sleep.aci",
+			},
+		}
+
+		// create, fetch, add, and start all apps in the sandbox
+		for _, app := range apps {
+			aci := patchTestACI(app.aci, "--name="+app.image, "--exec="+app.exec)
+			defer os.Remove(aci)
+
+			testCmd{ctx.ExecCmd("fetch", "--insecure-options=image", aci)}.CombinedOutput(t)
+			testCmd{ctx.ExecCmd("app", "add", "--debug", podUUID, app.image, "--name="+app.name)}.CombinedOutput(t)
+			testCmd{ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+app.name)}.CombinedOutput(t)
+		}
+
+		// check for app output messages
+		for _, msg := range []string{
+			"SUCCESS",
+			"FAILED",
+			"SLEEP",
+		} {
+			if err := expectTimeoutWithOutput(child, msg, actionTimeout); err != nil {
+				t.Fatalf("Expected %q but not found: %v", msg, err)
+			}
+		}
+
+		// total retry timeout: 10s
+		r := retry{
+			n: 20,
+			t: 500 * time.Millisecond,
+		}
+
+		// assert `rkt app list` for the apps
+		if err := r.Retry(func() error {
+			got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+
+			if strings.Contains(got, "winner\texited") &&
+				strings.Contains(got, "loser\texited") &&
+				strings.Contains(got, "sleeper\trunning") {
+				return nil
+			}
+
+			return fmt.Errorf("unexpected result, got %q", got)
+		}); err != nil {
+			t.Error(err)
+			return
+		}
+
+		// assert `rkt app status` for the apps
+		for _, app := range []struct {
+			name          string
+			checkExitCode bool
+			exitCode      int
+			state         string
+		}{
+			{
+				name:          "winner",
+				checkExitCode: true,
+				exitCode:      0,
+				state:         "exited",
+			},
+			{
+				name:          "loser",
+				checkExitCode: true,
+				exitCode:      12,
+				state:         "exited",
+			},
+			{
+				name:  "sleeper",
+				state: "running",
+			},
+		} {
+			if err := r.Retry(func() error {
+				got := testCmd{ctx.ExecCmd("app", "status", podUUID, "--app="+app.name)}.CombinedOutput(t)
+				ok := true
+
+				if app.checkExitCode {
+					ok = ok && strings.Contains(got, "exit_code="+strconv.Itoa(app.exitCode))
+				}
+
+				ok = ok && strings.Contains(got, "state="+app.state)
+
+				if !ok {
+					return fmt.Errorf("unexpected result, got %q", got)
+				}
+
+				return nil
+			}); err != nil {
+				t.Error(err)
+				return
+			}
+		}
+
+		// remove all apps
+		for _, app := range apps {
+			testCmd{ctx.ExecCmd("app", "rm", "--debug", podUUID, "--app="+app.name)}.CombinedOutput(t)
+		}
+
+		// assert empty `rkt app list`, no need for retrying,
+		// as after removal no leftovers are expected to be present
+		got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+		if got != "\n" {
+			t.Errorf("unexpected result, got %q", got)
+			return
+		}
+	})
+}
+
+// TestAppSandboxRestart tests multiple apps in a sandbox and restarts one of them.
+func TestAppSandboxRestart(t *testing.T) {
+	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+		type app struct {
+			name, image, exec, aci string
+		}
+
+		apps := []app{
+			{
+				name:  "app1",
+				image: "coreos.com/rkt-inspect/app1",
+				exec:  "/inspect -sleep=120",
+				aci:   "rkt-inspect-app1.aci",
+			},
+			{
+				name:  "app2",
+				image: "coreos.com/rkt-inspect/app1",
+				exec:  "/inspect -sleep=120",
+				aci:   "rkt-inspect-app1.aci",
+			},
+		}
+
+		// create, fetch, add, and start all apps in the sandbox
+		for _, app := range apps {
+			aci := patchTestACI(app.aci, "--name="+app.image, "--exec="+app.exec)
+			defer os.Remove(aci)
+
+			testCmd{ctx.ExecCmd("fetch", "--insecure-options=image", aci)}.CombinedOutput(t)
+			testCmd{ctx.ExecCmd("app", "add", "--debug", podUUID, app.image, "--name="+app.name)}.CombinedOutput(t)
+			testCmd{ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+app.name)}.CombinedOutput(t)
+		}
+
+		// total retry timeout: 10s
+		r := retry{
+			n: 20,
+			t: 500 * time.Millisecond,
+		}
+
+		// assert `rkt app list` for the apps
+		if err := r.Retry(func() error {
+			got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+
+			if strings.Contains(got, "app1\trunning") &&
+				strings.Contains(got, "app2\trunning") {
+				return nil
+			}
+
+			return fmt.Errorf("unexpected result, got %q", got)
+		}); err != nil {
+			t.Error(err)
+			return
+		}
+
+		assertStatus := func(name, status string) error {
+			return r.Retry(func() error {
+				got := testCmd{ctx.ExecCmd("app", "status", podUUID, "--app="+name)}.CombinedOutput(t)
+
+				if !strings.Contains(got, status) {
+					return fmt.Errorf("unexpected result, got %q", got)
+				}
+
+				return nil
+			})
+		}
+
+		// assert `rkt app status` for the apps
+		for _, app := range apps {
+			if err := assertStatus(app.name, "state=running"); err != nil {
+				t.Error(err)
+				return
+			}
+		}
 
+		// stop app1
+		testCmd{ctx.ExecCmd("app", "stop", podUUID, "--app=app1")}.CombinedOutput(t)
+
+		// assert `rkt app status` for the apps
+		for _, app := range []struct {
+			name   string
+			status string
+		}{
+			{
+				name:   "app1",
+				status: "state=exited",
+			},
+			{
+				name:   "app2",
+				status: "state=running",
+			},
+		} {
+			if err := assertStatus(app.name, app.status); err != nil {
+				t.Error(err)
+				return
+			}
+		}
+
+		// assert `rkt app list` for the apps
+		if err := r.Retry(func() error {
+			got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+
+			if strings.Contains(got, "app1\texited") &&
+				strings.Contains(got, "app2\trunning") {
+				return nil
+			}
+
+			return fmt.Errorf("unexpected result, got %q", got)
+		}); err != nil {
+			t.Error(err)
+			return
+		}
+
+		// start app1
+		testCmd{ctx.ExecCmd("app", "start", podUUID, "--app=app1")}.CombinedOutput(t)
+
+		// assert `rkt app status` for the apps
+		for _, app := range []struct {
+			name   string
+			status string
+		}{
+			{
+				name:   "app1",
+				status: "state=running",
+			},
+			{
+				name:   "app2",
+				status: "state=running",
+			},
+		} {
+			if err := assertStatus(app.name, app.status); err != nil {
+				t.Error(err)
+				return
+			}
+		}
+
+		// assert `rkt app list` for the apps
+		if err := r.Retry(func() error {
+			got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+
+			if strings.Contains(got, "app1\trunning") &&
+				strings.Contains(got, "app2\trunning") {
+				return nil
+			}
+
+			return fmt.Errorf("unexpected result, got %q", got)
+		}); err != nil {
+			t.Error(err)
+			return
+		}
+	})
+}
+
+func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.ExpectSubprocess, string)) {
 	if err := os.Setenv("RKT_EXPERIMENT_APP", "true"); err != nil {
 		panic(err)
 	}
 	defer os.Unsetenv("RKT_EXPERIMENT_APP")
 
-	fetch := ctx.ExecCmd("fetch", "--insecure-options=image", aciHello)
-	fetch.Env = append(fetch.Env, "RKT_EXPERIMENT_APP=true")
-	t.Log("Running", fetch.Args)
-	if out, err := fetch.CombinedOutput(); err != nil {
-		t.Fatal(err, "output", out)
-	}
-
 	tmpDir := createTempDirOrPanic("rkt-test-cri-")
 	uuidFile := filepath.Join(tmpDir, "uuid")
 	defer os.RemoveAll(tmpDir)
 
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
 	rkt := ctx.Cmd() + " app sandbox --uuid-file-save=" + uuidFile
 	child := spawnOrFail(t, rkt)
 
 	// wait for the sandbox to start
-	podUUID, err := waitPodReady(ctx, t, uuidFile, actionTimeout)
+	podUUID, err := waitPodReady(ctx, t, uuidFile, 30*time.Second)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	add := ctx.ExecCmd("app", "add", "--debug", podUUID, imageName, "--name="+appName)
-	t.Log("Running", add.Args)
-	if out, err := add.CombinedOutput(); err != nil {
-		t.Fatal(err, "output", out)
-	}
+	testFunc(ctx, child, podUUID)
 
-	start := ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+appName)
-	t.Log("Running", start.Args)
-	if out, err := start.CombinedOutput(); err != nil {
-		t.Fatal(err, "output", out)
+	// assert that the pod is still running
+	got := testCmd{ctx.ExecCmd("status", podUUID)}.CombinedOutput(t)
+	if !strings.Contains(got, "state=running") {
+		t.Errorf("unexpected result, got %q", got)
+		return
 	}
 
-	if err := expectTimeoutWithOutput(child, msg, actionTimeout); err != nil {
-		t.Fatalf("Expected %q but not found: %v", msg, err)
-	}
+	testCmd{ctx.ExecCmd("stop", podUUID)}.CombinedOutput(t)
 
-	remove := ctx.ExecCmd("app", "rm", "--debug", podUUID, "--app="+appName)
-	t.Log("Running", remove.Args)
-	if out, err := remove.CombinedOutput(); err != nil {
-		t.Fatal(err, "output", out)
+	waitOrFail(t, child, 0)
+}
+
+// retry is the struct that represents retrying function calls.
+type retry struct {
+	n int
+	t time.Duration
+}
+
+// Retry retries the given function f n times with a delay t between invocations
+// until no error is retrurned from f or n is exceeded.
+// The last occured error is returned.
+func (r retry) Retry(f func() error) error {
+	var err error
+
+	for i := 0; i < r.n; i++ {
+		err = f()
+		if err == nil {
+			return nil
+		}
+		time.Sleep(r.t)
 	}
 
-	stop := ctx.ExecCmd("stop", podUUID)
-	t.Log("Running", stop.Args)
-	if out, err := stop.CombinedOutput(); err != nil {
+	return err
+}
+
+type testCmd struct {
+	*exec.Cmd
+}
+
+func (c testCmd) CombinedOutput(t *testing.T) string {
+	t.Log("Running", c.Args)
+	out, err := c.Cmd.CombinedOutput()
+
+	if err != nil {
 		t.Fatal(err, "output", out)
 	}
 
-	waitOrFail(t, child, 0)
+	return string(out)
 }

From d0fb8e1ab70753f756eb45095d48f5aff3a98423 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Tue, 10 Jan 2017 18:09:16 +0100
Subject: [PATCH 1005/1304] api-service: stop erroring when a pod is running

Fixes #3504
---
 rkt/api_service.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index 2c5109afcf..ce5335a139 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -602,7 +602,7 @@ func fillPodDetails(store *imagestore.Store, p *pkgPod.Pod, v1pod *v1alpha.Pod)
 
 		if readStatus {
 			exitCode, err := p.AppExitCode(app.Name)
-			if err != nil {
+			if err != nil && !os.IsNotExist(err) {
 				stderr.PrintE(fmt.Sprintf("failed to read status for app %q", app.Name), err)
 			}
 			app.ExitCode = int32(exitCode)

From bef3cd15977ff12ff0655d3cc55147c84326009c Mon Sep 17 00:00:00 2001
From: Yakau Bubnou <ybubnou@infoblox.com>
Date: Tue, 3 Jan 2017 16:12:36 +0300
Subject: [PATCH 1006/1304] common/overlay: allow data directory name with
 colon character

This patch provides an sanitizing function used to escape the colon
characters in the directory names of the mount command.

According to the Linux documentation
https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt it
is used as a separator symbol in case of multi lower-layer mount.

Separates the mount options rendering, thus make it possible to write
pure unit tests for common/overlay package. Functional tests, that
validates common/overlay.Mount function moved to the "tests"
sub-directory.
---
 common/overlay/overlay.go       | 30 ++++++++++--
 common/overlay/overlay_test.go  | 44 +++++++++++++++++
 tests/rkt_mount_overlay_test.go | 87 +++++++++++++++++++++++++++++++++
 tests/rkt_tests.go              | 13 +++++
 4 files changed, 170 insertions(+), 4 deletions(-)
 create mode 100644 common/overlay/overlay_test.go
 create mode 100644 tests/rkt_mount_overlay_test.go

diff --git a/common/overlay/overlay.go b/common/overlay/overlay.go
index 0dbe14cd3b..6158283ffc 100644
--- a/common/overlay/overlay.go
+++ b/common/overlay/overlay.go
@@ -16,12 +16,17 @@ package overlay
 
 import (
 	"fmt"
+	"strings"
 	"syscall"
 
 	"github.com/coreos/rkt/pkg/label"
 	"github.com/hashicorp/errwrap"
 )
 
+// sanitizer defines a string translator used to escape colon and comma
+// characters in the directories names.
+var sanitizer = strings.NewReplacer(`:`, `\:`, `,`, `\,`)
+
 // MountCfg contains the needed data to construct the overlay mount syscall.
 // The Lower and Upper fields are paths to the filesystems to be merged. The
 // Work field should be an empty directory. Dest is where the mount will be
@@ -34,14 +39,31 @@ type MountCfg struct {
 	Lbl string
 }
 
+// sanitize escapes the colon and comma symbols in order to support the dir
+// names with these characters, otherwise they will be treated as separators
+// between the directory names.
+func sanitize(dir string) string {
+	return sanitizer.Replace(dir)
+}
+
+// Opts returns options for mount system call.
+func (cfg *MountCfg) Opts() string {
+	opts := fmt.Sprintf(
+		"lowerdir=%s,upperdir=%s,workdir=%s",
+		sanitize(cfg.Lower), sanitize(cfg.Upper), sanitize(cfg.Work),
+	)
+
+	return label.FormatMountLabel(opts, cfg.Lbl)
+}
+
 // Mount mounts the upper and lower directories to the destination directory.
 // The MountCfg struct supplies information required to build the mount system
 // call.
 func Mount(cfg *MountCfg) error {
-	opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", cfg.Lower, cfg.Upper, cfg.Work)
-	opts = label.FormatMountLabel(opts, cfg.Lbl)
-	if err := syscall.Mount("overlay", cfg.Dest, "overlay", 0, opts); err != nil {
-		return errwrap.Wrap(fmt.Errorf("error mounting overlay with options '%s' and dest '%s'", opts, cfg.Dest), err)
+	err := syscall.Mount("overlay", cfg.Dest, "overlay", 0, cfg.Opts())
+	if err != nil {
+		const text = "error mounting overlay with options '%s' and dest '%s'"
+		return errwrap.Wrap(fmt.Errorf(text, cfg.Opts(), cfg.Dest), err)
 	}
 
 	return nil
diff --git a/common/overlay/overlay_test.go b/common/overlay/overlay_test.go
new file mode 100644
index 0000000000..1d9f4e004c
--- /dev/null
+++ b/common/overlay/overlay_test.go
@@ -0,0 +1,44 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package overlay
+
+import (
+	"testing"
+)
+
+func TestMountOpts(t *testing.T) {
+	tests := []struct {
+		cfg  MountCfg
+		want string
+	}{
+		{MountCfg{"/tmp/a", "/tmp/b", "/tmp/c", "", ""},
+			`lowerdir=/tmp/a,upperdir=/tmp/b,workdir=/tmp/c`},
+		{MountCfg{"/1", "/2", "/3", "", ""},
+			`lowerdir=/1,upperdir=/2,workdir=/3`},
+		{MountCfg{"/tmp/test:1", "/tmp/test:2", "/tmp/test:3", "", ""},
+			`lowerdir=/tmp/test\:1,upperdir=/tmp/test\:2,workdir=/tmp/test\:3`},
+		{MountCfg{"/tmp/test,1", "/tmp/test,2", "/tmp/test,3", "", ""},
+			`lowerdir=/tmp/test\,1,upperdir=/tmp/test\,2,workdir=/tmp/test\,3`},
+		{MountCfg{"/tmp/,1,1", "/tmp/,,2", "/tmp/,3,", "", ""},
+			`lowerdir=/tmp/\,1\,1,upperdir=/tmp/\,\,2,workdir=/tmp/\,3\,`},
+	}
+
+	for i, tt := range tests {
+		opts := tt.cfg.Opts()
+		if opts != tt.want {
+			t.Errorf("#%d: got: '%s', want: '%s'", i, opts, tt.want)
+		}
+	}
+}
diff --git a/tests/rkt_mount_overlay_test.go b/tests/rkt_mount_overlay_test.go
new file mode 100644
index 0000000000..156f450140
--- /dev/null
+++ b/tests/rkt_mount_overlay_test.go
@@ -0,0 +1,87 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src kvm
+
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"syscall"
+	"testing"
+
+	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/common/overlay"
+)
+
+func overlayMount(cfg overlay.MountCfg) error {
+	// Create temporary directories with a configured prefix.
+
+	// Lower and Upper directories will create two text files
+	// to ensure the merging completed successfully.
+	cfg.Lower = createTempDirOrPanic(cfg.Lower)
+	createFileOrPanic(cfg.Lower, "1.txt")
+
+	cfg.Upper = createTempDirOrPanic(cfg.Upper)
+	createFileOrPanic(cfg.Upper, "2.txt")
+
+	cfg.Work = createTempDirOrPanic(cfg.Work)
+	cfg.Dest = createTempDirOrPanic(cfg.Dest)
+
+	// Ensure temporary directories will be removed after tests.
+	defer os.RemoveAll(cfg.Lower)
+	defer os.RemoveAll(cfg.Upper)
+	defer os.RemoveAll(cfg.Work)
+	defer os.RemoveAll(cfg.Dest)
+
+	err := overlay.Mount(&cfg)
+	if err != nil {
+		return err
+	}
+
+	// Unmount the destination directory when time comes.
+	defer syscall.Unmount(cfg.Dest, 0)
+
+	// Ensure both, 1.txt and 2.txt have been merged into the
+	// destination directory.
+	for _, ff := range []string{"1.txt", "2.txt"} {
+		_, err := os.Stat(filepath.Join(cfg.Dest, ff))
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func TestOverlayMount(t *testing.T) {
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Overlay fs not supported: %v", err)
+	}
+
+	tests := []overlay.MountCfg{
+		{"test1", "test2", "test3", "merged", ""},
+		{"test:1", "test:2", "test:3", "merged:1", ""},
+		{"test,1", "test,2", "test,3", "merged,1", ""},
+	}
+
+	for i, tt := range tests {
+		err := overlayMount(tt)
+		if err != nil {
+			text := "#%d: expected to mount at %s, got error (err=%v)"
+			t.Errorf(text, i, tt.Dest, err)
+		}
+	}
+}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index c90dadb86c..f8048c0c74 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -219,6 +219,19 @@ func createTempDirOrPanic(dirName string) string {
 	return tmpDir
 }
 
+// createFileOrPanic creates an empty file within the given directory
+// with a specified name. Panics if file creation fails for any reason.
+func createFileOrPanic(dirName, fileName string) string {
+	name := filepath.Join(dirName, fileName)
+	file, err := os.Create(name)
+	if err != nil {
+		panic(err)
+	}
+
+	defer file.Close()
+	return name
+}
+
 func importImageAndFetchHashAsGid(t *testing.T, ctx *testutils.RktRunCtx, img string, fetchArgs string, gid int) (string, error) {
 	// Import the test image into store manually.
 	cmd := fmt.Sprintf("%s --insecure-options=image,tls fetch %s %s", ctx.Cmd(), fetchArgs, img)

From 78d26aa2a53a101723c64cc79f7f16941ac17e51 Mon Sep 17 00:00:00 2001
From: Yakau Bubnou <ybubnou@infoblox.com>
Date: Fri, 6 Jan 2017 18:19:20 +0300
Subject: [PATCH 1007/1304] tests: use appc schema instead of string templates

This patch introduces a new package "pkg/aci/acitest" used to set the
default parameters to the application container image manifest
(precisely: name, version, kind).

It replaces the strings templates used to mock the manifest's JSON to
the types from "github.com/appc/schema" go-package.
---
 pkg/aci/aci.go                       |  16 +++-
 pkg/aci/acitest/manifest.go          | 106 ++++++++++++++++++++++++
 rkt/fetch_test.go                    |  10 +--
 store/imagestore/store_test.go       |  26 ++----
 store/treestore/tree_test.go         |  23 ++----
 tests/rkt_exec_test.go               |  22 ++++-
 tests/rkt_fetch_test.go              |  24 ++++--
 tests/rkt_image_cat_manifest_test.go |  34 ++++++--
 tests/rkt_image_dependencies_test.go | 118 +++++++++++++++------------
 tests/rkt_image_export_test.go       |  32 ++++++--
 tests/rkt_image_render_test.go       |  36 ++++++--
 tests/rkt_os_arch_test.go            |  81 +++++++++++++++---
 12 files changed, 394 insertions(+), 134 deletions(-)
 create mode 100644 pkg/aci/acitest/manifest.go

diff --git a/pkg/aci/aci.go b/pkg/aci/aci.go
index d67a3e06b3..5dadf353d7 100644
--- a/pkg/aci/aci.go
+++ b/pkg/aci/aci.go
@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
@@ -29,6 +28,7 @@ import (
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 	"golang.org/x/crypto/openpgp"
 )
@@ -107,8 +107,18 @@ func (aw *imageArchiveWriter) Close() error {
 // NewBasicACI creates a new ACI in the given directory with the given name.
 // Used for testing.
 func NewBasicACI(dir string, name string) (*os.File, error) {
-	manifest := fmt.Sprintf(`{"acKind":"ImageManifest","acVersion":"0.8.9","name":"%s"}`, name)
-	return NewACI(dir, manifest, nil)
+	manifest := schema.ImageManifest{
+		ACKind:    schema.ImageManifestKind,
+		ACVersion: schema.AppContainerVersion,
+		Name:      types.ACIdentifier(name),
+	}
+
+	b, err := manifest.MarshalJSON()
+	if err != nil {
+		return nil, err
+	}
+
+	return NewACI(dir, string(b), nil)
 }
 
 // NewACI creates a new ACI in the given directory with the given image
diff --git a/pkg/aci/acitest/manifest.go b/pkg/aci/acitest/manifest.go
new file mode 100644
index 0000000000..f09673794b
--- /dev/null
+++ b/pkg/aci/acitest/manifest.go
@@ -0,0 +1,106 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package acitest provides utilities for ACI testing.
+package acitest
+
+import (
+	"encoding/json"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+)
+
+var (
+	// zeroVersion specifies an empty instance of the semantic version
+	// used to compare it in the image manifest in order to detect an
+	// unspecified manifest version.
+	zeroVersion types.SemVer
+)
+
+const (
+	// defaultName defines the name of the image manifest that will be
+	// used when name was not specified.
+	defaultName = "example.com/test01"
+)
+
+type (
+	// These types are aliases to the types used in the application
+	// container definition. They used to bypass validations of the
+	// image manifest during serialization to JSON string.
+	aciApp          types.App
+	aciAnnotations  types.Annotations
+	aciDependencies types.Dependencies
+	aciKind         types.ACKind
+	aciLabels       types.Labels
+	aciName         types.ACIdentifier
+
+	// aciManifest completely copies and underlying representation
+	// of the application image manifest. It wraps each attribute of
+	// the manifest into the alias in order to bypass validations.
+	aciManifest struct {
+		ACKind        aciKind         `json:"acKind"`
+		ACVersion     types.SemVer    `json:"acVersion"`
+		Name          aciName         `json:"name"`
+		Labels        aciLabels       `json:"labels,omitempty"`
+		App           *aciApp         `json:"app,omitempty"`
+		Annotations   aciAnnotations  `json:"annotations,omitempty"`
+		Dependencies  aciDependencies `json:"dependencies,omitempty"`
+		PathWhitelist []string        `json:"pathWhitelist,omitempty"`
+	}
+)
+
+// toImageManifest converts the specified application image manifest
+// into the non-checkable image manifest, thus make it possible to
+// create a manifest with mistakes.
+func toImageManifest(m *schema.ImageManifest) *aciManifest {
+	return &aciManifest{
+		ACKind:        aciKind(m.ACKind),
+		ACVersion:     m.ACVersion,
+		Name:          aciName(m.Name),
+		Labels:        aciLabels(m.Labels),
+		App:           (*aciApp)(m.App),
+		Annotations:   aciAnnotations(m.Annotations),
+		Dependencies:  aciDependencies(m.Dependencies),
+		PathWhitelist: m.PathWhitelist,
+	}
+}
+
+// ImageManifestString sets the default attributes to the specified image
+// manifest and returns its JSON string representation.
+func ImageManifestString(im *schema.ImageManifest) (string, error) {
+	// When nil have been passed as an argument, it will create an
+	// empty manifest and define the minimal attributes.
+	if im == nil {
+		im = new(schema.ImageManifest)
+	}
+
+	// Set the default kind of the AC image manifest.
+	if im.ACKind == "" {
+		im.ACKind = schema.ImageManifestKind
+	}
+
+	// Set the default version of the AC image manifest.
+	if im.ACVersion == zeroVersion {
+		im.ACVersion = schema.AppContainerVersion
+	}
+
+	// Set the default name of the AC image manifest.
+	if im.Name == "" {
+		im.Name = defaultName
+	}
+
+	b, err := json.Marshal(toImageManifest(im))
+	return string(b), err
+}
diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index 61c2edf5cf..7582994408 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -30,6 +30,7 @@ import (
 	"testing"
 
 	"github.com/coreos/rkt/pkg/aci"
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	dist "github.com/coreos/rkt/pkg/distribution"
 	"github.com/coreos/rkt/pkg/keystore"
 	"github.com/coreos/rkt/pkg/keystore/keystoretest"
@@ -162,11 +163,10 @@ func TestDownloading(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 
-	imj := `{
-			"acKind": "ImageManifest",
-			"acVersion": "0.7.4",
-			"name": "example.com/test01"
-		}`
+	imj, err := acitest.ImageManifestString(nil)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	entries := []*aci.ACIEntry{
 		// An empty file
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index 9620c9d126..7ab1a36b73 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/coreos/rkt/pkg/aci"
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	"github.com/coreos/rkt/pkg/multicall"
 
 	"github.com/appc/spec/schema/types"
@@ -161,11 +162,10 @@ func TestGetImageManifest(t *testing.T) {
 	}
 	defer s.Close()
 
-	imj := `{
-			"acKind": "ImageManifest",
-			"acVersion": "0.8.9",
-			"name": "example.com/test01"
-		}`
+	imj, err := acitest.ImageManifestString(nil)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	aci, err := aci.NewACI(dir, imj, nil)
 	if err != nil {
@@ -356,11 +356,10 @@ func TestRemoveACI(t *testing.T) {
 	}
 	defer s.Close()
 
-	imj := `{
-                    "acKind": "ImageManifest",
-                    "acVersion": "0.8.9",
-                    "name": "example.com/test01"
-                }`
+	imj, err := acitest.ImageManifestString(nil)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	aciFile, err := aci.NewACI(dir, imj, nil)
 	if err != nil {
@@ -397,13 +396,6 @@ func TestRemoveACI(t *testing.T) {
 		t.Fatalf("expected error")
 	}
 
-	// Simulate error removing from the
-	imj = `{
-                   "acKind": "ImageManifest",
-                   "acVersion": "0.8.9",
-                   "name": "example.com/test01"
-               }`
-
 	aciFile, err = aci.NewACI(dir, imj, nil)
 	if err != nil {
 		t.Fatalf("error creating test tar: %v", err)
diff --git a/store/treestore/tree_test.go b/store/treestore/tree_test.go
index 80abce9060..44c975b325 100644
--- a/store/treestore/tree_test.go
+++ b/store/treestore/tree_test.go
@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	"github.com/coreos/rkt/pkg/aci"
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	"github.com/coreos/rkt/pkg/sys"
 	"github.com/coreos/rkt/store/imagestore"
 )
@@ -31,13 +32,10 @@ const tstprefix = "treestore-test"
 // TODO(sgotti) when the TreeStore will use an interface, change it to a
 // test implementation without relying on store/imagestore
 func testStoreWriteACI(dir string, s *imagestore.Store) (string, error) {
-	imj := `
-		{
-		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.9",
-		    "name": "example.com/test01"
-		}
-	`
+	imj, err := acitest.ImageManifestString(nil)
+	if err != nil {
+		return "", err
+	}
 
 	entries := []*aci.ACIEntry{
 		// An empty dir
@@ -199,13 +197,10 @@ func TestTreeStore(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	imj := `
-		{
-		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.9",
-		    "name": "example.com/test01"
-		}
-	`
+	imj, err := acitest.ImageManifestString(nil)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	entries := []*aci.ACIEntry{
 		// An empty dir
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index e05e66920a..abac98ba06 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -22,14 +22,30 @@ import (
 	"os"
 	"testing"
 
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	"github.com/coreos/rkt/tests/testutils"
-)
 
-const (
-	noappManifestStr = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"coreos.com/rkt-inspect","labels":[{"name":"version","value":"1.22.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 )
 
 func TestRunOverrideExec(t *testing.T) {
+	// noappManifest specifies an image manifest configuration without
+	// an application section.
+	noappManifest := schema.ImageManifest{
+		Name: "coreos.com/rkt-inspect",
+		Labels: types.Labels{
+			{"version", "1.22.0"},
+			{"arch", "amd64"},
+			{"os", "linux"},
+		},
+	}
+
+	noappManifestStr, err := acitest.ImageManifestString(&noappManifest)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
 	noappManifestFile := "noapp-manifest.json"
 	if err := ioutil.WriteFile(noappManifestFile, []byte(noappManifestStr), 0600); err != nil {
 		t.Fatalf("Cannot write noapp manifest: %v", err)
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 035afe1ca6..0a61ec26d5 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -30,10 +30,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	"github.com/coreos/rkt/tests/testutils"
 	taas "github.com/coreos/rkt/tests/testutils/aci-server"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 )
 
 // TestFetchFromFile tests that 'rkt fetch/run/prepare' for a file will always
@@ -535,10 +538,21 @@ func TestDeferredSignatureDownload(t *testing.T) {
 }
 
 func TestDifferentDiscoveryLabels(t *testing.T) {
-	manifestTemplate := `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.2.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}]}`
+	const imageName = "localhost/rkt-test-different-discovery-labels-image"
+
+	manifest, err := acitest.ImageManifestString(&schema.ImageManifest{
+		Name: imageName, Labels: types.Labels{
+			{"version", "1.2.0"},
+			{"arch", "amd64"},
+			{"os", "linux"},
+		},
+	})
+
+	if err != nil {
+		t.Fatalf("unexpected error %v", err)
+	}
+
 	emptyImage := getEmptyImagePath()
-	imageName := "localhost/rkt-test-different-discovery-labels-image"
-	manifest := strings.Replace(manifestTemplate, "IMG_NAME", imageName, -1)
 	tmpDir := createTempDirOrPanic("rkt-TestDifferentDiscoveryLabels-")
 	defer os.RemoveAll(tmpDir)
 
@@ -551,8 +565,8 @@ func TestDifferentDiscoveryLabels(t *testing.T) {
 	}
 	defer os.Remove(tmpManifest.Name())
 
-	image := patchACI(emptyImage, "rkt-test-different-discovery-labels-image.aci", "--manifest", tmpManifest.Name())
 	imageFileName := fmt.Sprintf("%s.aci", filepath.Base(imageName))
+	image := patchACI(emptyImage, imageFileName, "--manifest", tmpManifest.Name())
 	defer os.Remove(image)
 
 	asc := runSignImage(t, image, 1)
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 3f1f705329..821dbef57e 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -20,16 +20,13 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"strings"
 	"testing"
 
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	"github.com/coreos/rkt/tests/testutils"
-)
-
-const (
 
-	// The expected image manifest of the 'rkt-inspect-image-cat-manifest.aci'.
-	manifestTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.22.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 )
 
 // TestImageCatManifest tests 'rkt image cat-manifest', it will:
@@ -38,8 +35,27 @@ const (
 // Read some non-existing image manifest via the image name, and verify nothing is found.
 // Read some non-existing image manifest via the image hash, and verify nothing is found.
 func TestImageCatManifest(t *testing.T) {
-	testImageName := "coreos.com/rkt-image-cat-manifest-test"
-	expectManifest := strings.Replace(manifestTemplate, "IMG_NAME", testImageName, -1)
+	manifestCat := schema.ImageManifest{
+		Name: "coreos.com/rkt-image-cat-manifest-test",
+		App: &types.App{
+			Exec: types.Exec{"/inspect"},
+			User: "0", Group: "0",
+			WorkingDirectory: "/",
+			Environment: types.Environment{
+				{"VAR_FROM_MANIFEST", "manifest"},
+			},
+		},
+		Labels: types.Labels{
+			{"version", "1.22.0"},
+			{"arch", "amd64"},
+			{"os", "linux"},
+		},
+	}
+
+	expectManifest, err := acitest.ImageManifestString(&manifestCat)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	tmpManifest, err := ioutil.TempFile("", "rkt-TestImageCatManifest-")
 	if err != nil {
@@ -66,7 +82,7 @@ func TestImageCatManifest(t *testing.T) {
 		expect     string
 	}{
 		{
-			testImageName,
+			string(manifestCat.Name),
 			true,
 			expectManifest,
 		},
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 6c47964e2e..17d316a775 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -21,57 +21,26 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	"github.com/coreos/rkt/tests/testutils"
 	taas "github.com/coreos/rkt/tests/testutils/aci-server"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 )
 
 const (
-	manifestDepsTemplate = `
-{
-   "acKind" : "ImageManifest",
-   "acVersion" : "0.8.9",
-   "dependencies" : [
-      DEPENDENCIES
-   ],
-   "labels" : [
-      {
-         "name" : "version",
-         "value" : "VERSION"
-      },
-      {
-         "name" : "arch",
-         "value" : "amd64"
-      },
-      {
-         "value" : "linux",
-         "name" : "os"
-      }
-   ],
-   "app" : {
-      "user" : "0",
-      "exec" : [
-         "/inspect", "--print-msg=HelloDependencies"
-      ],
-      "workingDirectory" : "/",
-      "group" : "0",
-      "environment" : [
-      ]
-   },
-   "name" : "IMG_NAME"
-}
-`
+	// topImage defines the name of the top-level image.
+	topImage = "localhost/image-a"
 )
 
-var topImage string = "localhost/image-a"
-
 type testImage struct {
 	shortName string
 	imageName string
-	deps      string
+	deps      types.Dependencies
 	version   string
 	prefetch  bool
 
@@ -80,11 +49,29 @@ type testImage struct {
 }
 
 func generateComplexDependencyTree(t *testing.T, ctx *testutils.RktRunCtx) (map[string]string, []testImage) {
+	// manifest specifies the generic configuration
+	// of the image manifest used in dependencies tests.
+	manifest := schema.ImageManifest{
+		App: &types.App{
+			Exec: types.Exec{
+				"/inspect",
+				"--print-msg=HelloDependencies",
+			},
+			User: "0", Group: "0",
+			WorkingDirectory: "/",
+		},
+		Labels: types.Labels{
+			{"arch", "amd64"},
+			{"os", "linux"},
+		},
+	}
+
 	tmpDir := createTempDirOrPanic("rkt-TestImageDeps-")
 	defer os.RemoveAll(tmpDir)
 
 	baseImage := getInspectImagePath()
-	if _, err := importImageAndFetchHash(t, ctx, "", baseImage); err != nil {
+	_, err := importImageAndFetchHash(t, ctx, "", baseImage)
+	if err != nil {
 		t.Fatalf("%v", err)
 	}
 	emptyImage := getEmptyImagePath()
@@ -108,45 +95,72 @@ func generateComplexDependencyTree(t *testing.T, ctx *testutils.RktRunCtx) (map[
 		{
 			shortName: "a",
 			imageName: topImage,
-			deps:      `{"imageName":"localhost/image-b"}, {"imageName":"localhost/image-c"}, {"imageName":"localhost/image-d"}`,
-			version:   "1",
+			deps: types.Dependencies{
+				{ImageName: "localhost/image-b"},
+				{ImageName: "localhost/image-c"},
+				{ImageName: "localhost/image-d"},
+			},
+			version: "1",
 		},
 		{
 			shortName: "b",
 			imageName: "localhost/image-b",
-			deps:      ``,
 			version:   "1",
 			prefetch:  true,
 		},
 		{
 			shortName: "c",
 			imageName: "localhost/image-c",
-			deps:      `{"imageName":"localhost/image-b"}, {"imageName":"localhost/image-e", "labels": [{"name": "version", "value": "1"}]}`,
-			version:   "1",
+			deps: types.Dependencies{
+				{ImageName: "localhost/image-b"},
+				{ImageName: "localhost/image-e",
+					Labels: types.Labels{{"version", "1"}}},
+			},
+			version: "1",
 		},
 		{
 			shortName: "d",
 			imageName: "localhost/image-d",
-			deps:      `{"imageName":"localhost/image-b"}, {"imageName":"localhost/image-e", "labels": [{"name": "version", "value": "1"}]}`,
-			version:   "1",
+			deps: types.Dependencies{
+				{ImageName: "localhost/image-b"},
+				{ImageName: "localhost/image-e",
+					Labels: types.Labels{{"version", "1"}}},
+			},
+			version: "1",
 		},
 		{
 			shortName: "e",
 			imageName: "localhost/image-e",
-			deps:      `{"imageName":"coreos.com/rkt-inspect"}`,
-			version:   "1",
+			deps: types.Dependencies{
+				{ImageName: "coreos.com/rkt-inspect"},
+			},
+			version: "1",
 		},
 	}
 
+	// Copy original labels of the image manifest, as on
+	// the next step this list will be populated with a
+	// version for each test.
+	labels := make(types.Labels, len(manifest.Labels))
+	copy(labels, manifest.Labels)
+
 	for i := range imageList {
 		// We need a reference rather than a new copy from "range"
 		// because we modify the content
 		img := &imageList[i]
 
-		img.manifest = manifestDepsTemplate
-		img.manifest = strings.Replace(img.manifest, "IMG_NAME", img.imageName, -1)
-		img.manifest = strings.Replace(img.manifest, "DEPENDENCIES", img.deps, -1)
-		img.manifest = strings.Replace(img.manifest, "VERSION", img.version, -1)
+		imgLabels := types.Labels{{"version", img.version}}
+
+		// Customize fields of the generic image manifest.
+		manifest.Name = types.ACIdentifier(img.imageName)
+		manifest.Labels = append(imgLabels, labels...)
+		manifest.Dependencies = img.deps
+
+		// Marshal the modified image manifest into JSON string.
+		img.manifest, err = acitest.ImageManifestString(&manifest)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
 
 		tmpManifest, err := ioutil.TempFile(tmpDir, "manifest-"+img.shortName+"-")
 		if err != nil {
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index d4c3f057fe..d660fd71d3 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -21,22 +21,40 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	"github.com/coreos/rkt/tests/testutils"
-)
 
-const (
-	manifestExportTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.22.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 )
 
 // TestImageExport tests 'rkt image export', it will import some existing
 // image, export it with rkt image export and check that the exported ACI hash
 // matches the hash of the imported ACI
 func TestImageExport(t *testing.T) {
-	testImageName := "coreos.com/rkt-image-export-test"
-	expectManifest := strings.Replace(manifestExportTemplate, "IMG_NAME", testImageName, -1)
+	manifest := schema.ImageManifest{
+		Name: "coreos.com/rkt-image-export-test",
+		App: &types.App{
+			Exec: types.Exec{"/inspect"},
+			User: "0", Group: "0",
+			WorkingDirectory: "/",
+			Environment: types.Environment{
+				{"VAR_FROM_MANIFEST", "manifest"},
+			},
+		},
+		Labels: types.Labels{
+			{"version", "1.22.0"},
+			{"arch", "amd64"},
+			{"os", "linux"},
+		},
+	}
+
+	expectManifest, err := acitest.ImageManifestString(&manifest)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	tmpDir := createTempDirOrPanic("rkt-TestImageExport-")
 	defer os.RemoveAll(tmpDir)
@@ -73,7 +91,7 @@ func TestImageExport(t *testing.T) {
 		expectedHash string
 	}{
 		{
-			testImageName,
+			string(manifest.Name),
 			true,
 			testImageHash,
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 561777730f..13a9f1f4e8 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -21,14 +21,13 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	"github.com/coreos/rkt/tests/testutils"
-)
 
-const (
-	manifestRenderTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.22.0"},{"name":"arch","value":"amd64"},{"name":"os","value":"linux"}],"dependencies":[{"imageName":"coreos.com/rkt-inspect"}],"app":{"exec":["/inspect"],"user":"0","group":"0","workingDirectory":"/","environment":[{"name":"VAR_FROM_MANIFEST","value":"manifest"}]}}`
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 )
 
 // TestImageRender tests 'rkt image render', it will import some existing empty
@@ -39,12 +38,33 @@ func TestImageRender(t *testing.T) {
 	baseImage := getInspectImagePath()
 	emptyImage := getEmptyImagePath()
 
-	testImageName := "coreos.com/rkt-image-render-test"
-
 	inspectFile := testutils.GetValueFromEnvOrPanic("INSPECT_BINARY")
 	inspectHash := getHashOrPanic(inspectFile)
 
-	expectManifest := strings.Replace(manifestRenderTemplate, "IMG_NAME", testImageName, -1)
+	manifestRender := schema.ImageManifest{
+		Name: "coreos.com/rkt-image-render-test",
+		App: &types.App{
+			Exec: types.Exec{"/inspect"},
+			User: "0", Group: "0",
+			WorkingDirectory: "/",
+			Environment: types.Environment{
+				{"VAR_FROM_MANIFEST", "manifest"},
+			},
+		},
+		Dependencies: types.Dependencies{
+			{ImageName: "coreos.com/rkt-inspect"},
+		},
+		Labels: types.Labels{
+			{"version", "1.22.0"},
+			{"arch", "amd64"},
+			{"os", "linux"},
+		},
+	}
+
+	expectManifest, err := acitest.ImageManifestString(&manifestRender)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 
 	tmpDir := createTempDirOrPanic("rkt-TestImageRender-")
 	defer os.RemoveAll(tmpDir)
@@ -78,7 +98,7 @@ func TestImageRender(t *testing.T) {
 		expectedHash string
 	}{
 		{
-			testImageName,
+			string(manifestRender.Name),
 			true,
 			inspectHash,
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index fbcaedeaaa..f96527c1a1 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -20,14 +20,13 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"strings"
 	"testing"
 
+	"github.com/coreos/rkt/pkg/aci/acitest"
 	"github.com/coreos/rkt/tests/testutils"
-)
 
-const (
-	manifestOSArchTemplate = `{"acKind":"ImageManifest","acVersion":"0.8.9","name":"IMG_NAME","labels":[{"name":"version","value":"1.22.0"}ARCH_OS],"app":{"exec":["/inspect", "--print-msg=HelloWorld"],"user":"0","group":"0","workingDirectory":"/"}}`
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 )
 
 type osArchTest struct {
@@ -47,12 +46,40 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 	var tests []osArchTest
 
 	defer osArchTestRemoveImages(tests)
-	testImageName := "coreos.com/rkt-missing-os-arch-test"
-	manifest := strings.Replace(manifestOSArchTemplate, "IMG_NAME", testImageName, 1)
+
+	manifestOSArch := schema.ImageManifest{
+		Name: "coreos.com/rkt-missing-os-arch-test",
+		App: &types.App{
+			Exec: types.Exec{
+				"/inspect",
+				"--print-msg=HelloWorld",
+			},
+			User: "0", Group: "0",
+			WorkingDirectory: "/",
+		},
+		Labels: types.Labels{
+			{"version", "1.22.0"},
+		},
+	}
+
+	// Copy the lables of the image manifest to use the common
+	// part in all test cases.
+	labels := make(types.Labels, len(manifestOSArch.Labels))
+	copy(labels, manifestOSArch.Labels)
 
 	// Test a valid image as a sanity check
-	goodManifestStr := strings.Replace(manifest, "ARCH_OS", `,{"name":"os","value":"linux"},{"name":"arch","value":"amd64"}`, 1)
+	manifestOSArch.Labels = append(
+		labels,
+		types.Label{"os", "linux"},
+		types.Label{"arch", "amd64"},
+	)
+
 	goodManifestFile := "good-manifest.json"
+	goodManifestStr, err := acitest.ImageManifestString(&manifestOSArch)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
 	if err := ioutil.WriteFile(goodManifestFile, []byte(goodManifestStr), 0600); err != nil {
 		t.Fatalf("Cannot write good manifest: %v", err)
 	}
@@ -68,8 +95,14 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 	tests = append(tests, goodTest)
 
 	// Test an image with a missing os label
-	missingOSManifestStr := strings.Replace(manifest, "ARCH_OS", `,{"name":"arch","value":"amd64"}`, 1)
+	manifestOSArch.Labels = append(labels, types.Label{"arch", "amd64"})
+
 	missingOSManifestFile := "missingOS-manifest.json"
+	missingOSManifestStr, err := acitest.ImageManifestString(&manifestOSArch)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
 	if err := ioutil.WriteFile(missingOSManifestFile, []byte(missingOSManifestStr), 0600); err != nil {
 		t.Fatalf("Cannot write missing OS manifest: %v", err)
 	}
@@ -85,8 +118,14 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 	tests = append(tests, missingOSTest)
 
 	// Test an image with a missing arch label
-	missingArchManifestStr := strings.Replace(manifest, "ARCH_OS", `,{"name":"os","value":"linux"}`, 1)
+	manifestOSArch.Labels = append(labels, types.Label{"os", "linux"})
+
 	missingArchManifestFile := "missingArch-manifest.json"
+	missingArchManifestStr, err := acitest.ImageManifestString(&manifestOSArch)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
 	if err := ioutil.WriteFile(missingArchManifestFile, []byte(missingArchManifestStr), 0600); err != nil {
 		t.Fatalf("Cannot write missing Arch manifest: %v", err)
 	}
@@ -102,8 +141,18 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 	tests = append(tests, missingArchTest)
 
 	// Test an image with an invalid os
-	invalidOSManifestStr := strings.Replace(manifest, "ARCH_OS", `,{"name":"os","value":"freebsd"},{"name":"arch","value":"amd64"}`, 1)
+	manifestOSArch.Labels = append(
+		labels,
+		types.Label{"os", "freebsd"},
+		types.Label{"arch", "amd64"},
+	)
+
 	invalidOSManifestFile := "invalid-os-manifest.json"
+	invalidOSManifestStr, err := acitest.ImageManifestString(&manifestOSArch)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
 	if err := ioutil.WriteFile(invalidOSManifestFile, []byte(invalidOSManifestStr), 0600); err != nil {
 		t.Fatalf("Cannot write invalid os manifest: %v", err)
 	}
@@ -119,8 +168,18 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 	tests = append(tests, invalidOSTest)
 
 	// Test an image with an invalid arch
-	invalidArchManifestStr := strings.Replace(manifest, "ARCH_OS", `,{"name":"os","value":"linux"},{"name":"arch","value":"armv5l"}`, 1)
+	manifestOSArch.Labels = append(
+		labels,
+		types.Label{"os", "linux"},
+		types.Label{"arch", "armv5l"},
+	)
+
 	invalidArchManifestFile := "invalid-arch-manifest.json"
+	invalidArchManifestStr, err := acitest.ImageManifestString(&manifestOSArch)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
 	if err := ioutil.WriteFile(invalidArchManifestFile, []byte(invalidArchManifestStr), 0600); err != nil {
 		t.Fatalf("Cannot write invalid arch manifest: %v", err)
 	}

From 30ecafb9667e0b5a4f4b9f47040b6aa7392f376d Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Thu, 22 Dec 2016 16:47:51 -0500
Subject: [PATCH 1008/1304] stage1: remount entire subcgroup r/w, instead of
 each knob

This mounts the entire subcgroup (machine slice) read-write, instead of
mounting only the exact knobs per-app we need.
---
 Documentation/devel/cgroups.md |  39 ++++++-
 common/cgroup/cgroup.go        |  14 +--
 common/cgroup/v1/cgroup.go     | 208 +++++++++++----------------------
 stage1/app_add/app_add.go      |  51 --------
 stage1/init/init.go            |  10 +-
 5 files changed, 112 insertions(+), 210 deletions(-)

diff --git a/Documentation/devel/cgroups.md b/Documentation/devel/cgroups.md
index 67d9b3526f..af699660b0 100644
--- a/Documentation/devel/cgroups.md
+++ b/Documentation/devel/cgroups.md
@@ -4,13 +4,15 @@
 
 [Control Groups][cgroups] are a Linux feature for organizing processes in hierarchical groups and applying resources limits to them. Each rkt pod is placed in a different cgroup to separate the processes of the pod from the processes of the host. Memory and CPU isolators are also implemented with cgroups.
 
-## Which cgroups are used
+## What cgroup does rkt use?
+
+Every pod and application within that pod is run within its own cgroup.
 
 ### `rkt` started from the command line
 
 When a recent version of systemd is running on the host and `rkt` is not started as a systemd service (typically, from the command line), `rkt` will call `systemd-nspawn` with `--register=true`. This will cause `systemd-nspawn` to call the D-Bus method `CreateMachineWithNetwork` on `systemd-machined` and the cgroup `/machine.slice/machine-rkt...` will be created. This requires systemd v216+ as detected by the [machinedRegister][machinedRegister] function in stage1's `init`.
 
-When systemd is not running on the host, or the systemd version is too old (< v216) to support the D-Bus method `CreateMachineWithNetwork`, `rkt` uses `systemd-nspawn` with the `--register=false` parameter. In this case, `systemd-nspawn` or other systemd components will not create new cgroups for rkt. On older `rkt` versions (<= 0.13.0), the pod was staying in the same cgroup as the caller. For example, it could be something like `/user.slice/user-1000.slice/session-1.scope`. Since [#1844][rkt-1844] (rkt >= 0.14.0), `rkt` creates a new cgroup for each pod, like `$CALLER_CGROUP/machine-some-id.slice`.
+When systemd is not running on the host, or the systemd version is too old (< v216), `rkt` uses `systemd-nspawn` with the `--register=false` parameter. In this case, `systemd-nspawn` or other systemd components will not create new cgroups for rkt. Instead, `rkt` creates a new cgroup for each pod under the current cgroup, like `$CALLER_CGROUP/machine-some-id.slice`.
 
 ### `rkt` started as a systemd service
 
@@ -24,7 +26,38 @@ It will result in `/machine.slice/servicename.service` when the user select that
 
 1. `/machine.slice/machine-rkt...` when started on the command line with systemd v216+.
 2. `/$SLICE.slice/servicename.service` when started from a systemd service.
-3. `$CALLER_CGROUP/machine-some-id.slice` without systemd-v216+, since rkt >= 0.14.0.
+3. `$CALLER_CGROUP/machine-some-id.slice` without systemd, or with systemd pre-v216
+
+For example, a simple pod run interactively on a system with systemd would look like:
+
+```
+├─machine.slice
+│ └─machine-rkt\x2df28d074b\x2da8bb\x2d4246\x2d96a5\x2db961e1fe7035.scope
+│   ├─init.scope
+│   │ └─/usr/lib/systemd/systemd
+│   └─system.slice
+│     ├─alpine-sh.service
+│     │ ├─/bin/sh 
+│     └─systemd-journald.service
+│       └─/usr/lib/systemd/systemd-journald
+```
+
+
+## What subsystems does rkt use?
+
+Right now, rkt uses the `cpu`, `cpuset`, and `memory` subsystems.
+
+### How are they mounted?
+
+When the stage1 starts, it mounts `/sys` . Then, for every subsystem, it:
+
+1. Mounts the subsystem (on `<rootfs>/sys/fs/cgroup/<subsystem>`)
+2. Bind-mounts the subcgroup on top of itself (e.g `<rootfs>/sys/fs/cgroup/memory/machine.slice/machine-rkt-UUID.scope/`)
+3. Remounts the subsystem readonly
+
+This is so that the pod itself cannot escape the cgroup. Currently the cgroup filesystems are not accessible to applications within the pod, but that may change.
+
+(N.B. `rkt` prior to v1.23 mounted each individual *knob* read-write. E.g. `.../memory/machine.slice/machine-rkt-UUID.scope/system.slice/etcd.service/{memory.limit_in_bytes, cgroup.procs}`)
 
 ## Future work
 
diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index 71154a411e..6d68729312 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -18,7 +18,6 @@ package cgroup
 
 import (
 	"errors"
-	"os"
 	"path/filepath"
 	"syscall"
 
@@ -53,18 +52,7 @@ func IsIsolatorSupported(isolator string) (bool, error) {
 		}
 		return false, nil
 	}
-
-	if files := v1.CgroupControllerRWFiles(isolator); len(files) > 0 {
-		for _, f := range files {
-			isolatorPath := filepath.Join("/sys/fs/cgroup/", isolator, f)
-			if _, err := os.Stat(isolatorPath); os.IsNotExist(err) {
-				return false, nil
-			}
-		}
-		return true, nil
-	}
-
-	return false, nil
+	return v1.IsControllerMounted(isolator)
 }
 
 // IsCgroupUnified checks if cgroup mounted at /sys/fs/cgroup is
diff --git a/common/cgroup/v1/cgroup.go b/common/cgroup/v1/cgroup.go
index e169627afa..076c81a1f4 100644
--- a/common/cgroup/v1/cgroup.go
+++ b/common/cgroup/v1/cgroup.go
@@ -23,7 +23,6 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -33,25 +32,6 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
-var (
-	cgroupControllerRWFiles = map[string][]string{
-		"memory": {
-			"memory.limit_in_bytes",
-			"cgroup.procs",
-		},
-		"cpu": {
-			"cpu.cfs_quota_us",
-			"cpu.shares",
-			"cgroup.procs",
-		},
-		"devices": {
-			"devices.allow",
-			"devices.deny",
-			"cgroup.procs",
-		},
-	}
-)
-
 // mountFsRO remounts the given mountPoint using the given flags read-only.
 func mountFsRO(m fs.Mounter, mountPoint string, flags uintptr) error {
 	flags = flags |
@@ -140,23 +120,6 @@ func getControllerSymlinks(cgroups map[int][]string) map[string]string {
 	return symlinks
 }
 
-func CgroupControllerRWFiles(isolator string) []string {
-	files, _ := cgroupControllerRWFiles[isolator]
-	return files
-}
-
-func getControllerRWFiles(controller string) []string {
-	parts := strings.Split(controller, ",")
-
-	for _, p := range parts {
-		if files, ok := cgroupControllerRWFiles[p]; ok {
-			return files
-		}
-	}
-
-	return nil
-}
-
 func parseCgroupController(cgroupPath, controller string) ([]string, error) {
 	cg, err := os.Open(cgroupPath)
 	if err != nil {
@@ -216,45 +179,72 @@ func JoinSubcgroup(controller string, subcgroup string) error {
 	return nil
 }
 
-// If /system.slice does not exist in the cpuset controller, create it and
-// configure it.
-// Since this is a workaround, we ignore errors
-func fixCpusetKnobs(cpusetPath string) {
-	cgroupPathFix := filepath.Join(cpusetPath, "system.slice")
-	_ = os.MkdirAll(cgroupPathFix, 0755)
-	knobs := []string{"cpuset.mems", "cpuset.cpus"}
-	for _, knob := range knobs {
-		parentFile := filepath.Join(filepath.Dir(cgroupPathFix), knob)
-		childFile := filepath.Join(cgroupPathFix, knob)
-
-		data, err := ioutil.ReadFile(childFile)
+// Ensure that the hierarchy has consistent cpu restrictions.
+// This may fail; since this is "fixup" code, we should ignore
+// the error and proceed.
+//
+// This was originally a workaround for https://github.com/coreos/rkt/issues/1210
+// but is actually useful to have around
+//
+// cpuSetPath should be <stage1rootfs>/sys/fs/cgroup/cpuset
+func fixCpusetKnobs(cpusetPath, subcgroup, knob string) error {
+	if err := os.MkdirAll(filepath.Join(cpusetPath, subcgroup), 0755); err != nil {
+		return err
+	}
+
+	dirs := filepath.SplitList(subcgroup)
+
+	// Loop over every entry in the hierarchy, putting in the parent's value
+	// unless there is one already there.
+	// Read from the root knob
+	parentFile := filepath.Join(cpusetPath, knob)
+	parentData, err := ioutil.ReadFile(parentFile)
+	if err != nil {
+		return errwrap.Wrapf("error reading cgroup "+parentFile, err)
+	}
+
+	// Loop over every directory in the subcgroup path
+	currDir := cpusetPath
+	for _, dir := range dirs {
+		currDir = filepath.Join(currDir, dir)
+
+		childFile := filepath.Join(currDir, knob)
+		childData, err := ioutil.ReadFile(childFile)
 		if err != nil {
-			continue
+			return errwrap.Wrapf("error reading cgroup "+childFile, err)
 		}
-		// If the file is already configured, don't change it
-		if strings.TrimSpace(string(data)) != "" {
+
+		// If there is already a value, don't write - and propagate
+		// this value to subsequent children
+		if strings.TrimSpace(string(childData)) != "" {
+			parentData = childData
 			continue
 		}
 
-		data, err = ioutil.ReadFile(parentFile)
-		if err == nil {
-			// Workaround: just write twice to workaround the kernel bug fixed by this commit:
-			// https://github.com/torvalds/linux/commit/24ee3cf89bef04e8bc23788aca4e029a3f0f06d9
-			ioutil.WriteFile(childFile, data, 0644)
-			ioutil.WriteFile(childFile, data, 0644)
+		// Workaround: just write twice to workaround the kernel bug fixed by this commit:
+		// https://github.com/torvalds/linux/commit/24ee3cf89bef04e8bc23788aca4e029a3f0f06d9
+		if err := ioutil.WriteFile(childFile, parentData, 0644); err != nil {
+			return errwrap.Wrapf("error writing cgroup "+childFile, err)
+		}
+		if err := ioutil.WriteFile(childFile, parentData, 0644); err != nil {
+			return errwrap.Wrapf("error writing cgroup "+childFile, err)
 		}
 	}
+	return nil
 }
 
 // IsControllerMounted returns whether a controller is mounted by checking that
 // cgroup.procs is accessible
-func IsControllerMounted(c string) bool {
+func IsControllerMounted(c string) (bool, error) {
 	cgroupProcsPath := filepath.Join("/sys/fs/cgroup", c, "cgroup.procs")
 	if _, err := os.Stat(cgroupProcsPath); err != nil {
-		return false
+		if !os.IsNotExist(err) {
+			return false, err
+		}
+		return false, nil
 	}
 
-	return true
+	return true, nil
 }
 
 // CreateCgroups mounts the v1 cgroup controllers hierarchy in /sys/fs/cgroup
@@ -332,10 +322,12 @@ func CreateCgroups(m fs.Mounter, root string, enabledCgroups map[int][]string, m
 
 // RemountCgroups remounts the v1 cgroup hierarchy under root.
 // It mounts /sys/fs/cgroup/[controller] read-only,
-// but leaves needed knobs in the subcgroup for each app read-write,
+// but leaves needed knobs in the pod's subcgroup read-write,
 // such that systemd inside stage1 can apply isolators to them.
-// It leaves /sys read-write, if the given readWrite parameter is true.
-func RemountCgroups(m fs.Mounter, root string, enabledCgroups map[int][]string, subcgroup string, serviceNames []string, readWrite bool) error {
+// It leaves /sys read-write if the given readWrite parameter is true.
+// When this is done, <stage1>/sys/fs/cgroup/<controller> should be RO, and
+// <stage1>/sys/fs/cgroup/<cotroller>/.../machine-rkt/.../system.slice should be RW
+func RemountCgroups(m fs.Mounter, root string, enabledCgroups map[int][]string, subcgroup string, readWrite bool) error {
 	controllers := GetControllerDirs(enabledCgroups)
 	cgroupTmpfs := filepath.Join(root, "/sys/fs/cgroup")
 	sysPath := filepath.Join(root, "/sys")
@@ -344,34 +336,23 @@ func RemountCgroups(m fs.Mounter, root string, enabledCgroups map[int][]string,
 		syscall.MS_NOEXEC |
 		syscall.MS_NODEV
 
-	// Mount RW knobs we need to make the enabled isolators work
+	// Mount RW the controllers for this pod
 	for _, c := range controllers {
 		cPath := filepath.Join(cgroupTmpfs, c)
 		subcgroupPath := filepath.Join(cPath, subcgroup, "system.slice")
 
-		// Workaround for https://github.com/coreos/rkt/issues/1210
-		if c == "cpuset" {
-			fixCpusetKnobs(cPath)
+		if err := os.MkdirAll(subcgroupPath, 0755); err != nil {
+			return err
+		}
+		if err := m.Mount(subcgroupPath, subcgroupPath, "", syscall.MS_BIND, ""); err != nil {
+			return errwrap.Wrap(fmt.Errorf("error bind mounting %q", subcgroupPath), err)
 		}
 
-		// Create cgroup directories and mount the files we need over
-		// themselves so they stay read-write
-		for _, serviceName := range serviceNames {
-			appCgroup := filepath.Join(subcgroupPath, serviceName)
-			if err := os.MkdirAll(appCgroup, 0755); err != nil {
-				return err
-			}
-			for _, f := range getControllerRWFiles(c) {
-				cgroupFilePath := filepath.Join(appCgroup, f)
-				// the file may not be there if kernel doesn't support the
-				// feature, skip it in that case
-				if _, err := os.Stat(cgroupFilePath); os.IsNotExist(err) {
-					continue
-				}
-				if err := m.Mount(cgroupFilePath, cgroupFilePath, "", syscall.MS_BIND, ""); err != nil {
-					return errwrap.Wrap(fmt.Errorf("error bind mounting %q", cgroupFilePath), err)
-				}
-			}
+		// Workaround for https://github.com/coreos/rkt/issues/1210
+		// It is OK to ignore errors here.
+		if c == "cpuset" {
+			_ = fixCpusetKnobs(cPath, subcgroup, "cpuset.mems")
+			_ = fixCpusetKnobs(cPath, subcgroup, "cpuset.cpus")
 		}
 
 		// Re-mount controller read-only to prevent the container modifying host controllers
@@ -380,63 +361,10 @@ func RemountCgroups(m fs.Mounter, root string, enabledCgroups map[int][]string,
 		}
 	}
 
-	if readWrite {
+	if readWrite { // leave sys r/w?
 		return nil
 	}
 
 	// Bind-mount sys filesystem read-only
 	return mountFsRO(m, sysPath, flags)
 }
-
-// RemountCgroupKnobsRW remounts the needed knobs in the subcgroup for one
-// specified app read-write so the systemd inside stage1 can apply isolators
-// to them.
-func RemountCgroupKnobsRW(enabledCgroups map[int][]string, subcgroup string, serviceName string, enterCmd []string) error {
-	controllers := GetControllerDirs(enabledCgroups)
-
-	// Mount RW knobs we need to make the enabled isolators work
-	for _, c := range controllers {
-		cPath := filepath.Join("/sys/fs/cgroup", c)
-		subcgroupPath := filepath.Join(cPath, subcgroup, "system.slice")
-
-		// Create cgroup directories and mount the files we need over
-		// themselves so they stay read-write
-		appCgroup := filepath.Join(subcgroupPath, serviceName)
-		if err := os.MkdirAll(appCgroup, 0755); err != nil {
-			return err
-		}
-		for _, f := range getControllerRWFiles(c) {
-			cgroupFilePath := filepath.Join(appCgroup, f)
-			// the file may not be there if kernel doesn't support the
-			// feature, skip it in that case
-			if _, err := os.Stat(cgroupFilePath); os.IsNotExist(err) {
-				continue
-			}
-
-			// Go applications cannot be  reassociated  with a new mount
-			// namespace because they are multithreaded. Instead of
-			// syscall.Mount, uses the enter entrypoint.
-			argsMountBind := append(enterCmd, "/bin/mount", "--bind", cgroupFilePath, cgroupFilePath)
-			cmdMountBind := exec.Cmd{
-				Path: argsMountBind[0],
-				Args: argsMountBind,
-			}
-
-			if err := cmdMountBind.Run(); err != nil {
-				return err
-			}
-
-			argsRemountRW := append(enterCmd, "/bin/mount", "-o", "remount,bind,rw", cgroupFilePath)
-			cmdRemountRW := exec.Cmd{
-				Path: argsRemountRW[0],
-				Args: argsRemountRW,
-			}
-
-			if err := cmdRemountRW.Run(); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/stage1/app_add/app_add.go b/stage1/app_add/app_add.go
index 346d1c3cd9..707612c918 100644
--- a/stage1/app_add/app_add.go
+++ b/stage1/app_add/app_add.go
@@ -17,23 +17,17 @@
 package main
 
 import (
-	"errors"
 	"flag"
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"path/filepath"
 
 	"github.com/coreos/go-systemd/unit"
-	"github.com/coreos/rkt/common/cgroup"
-	"github.com/coreos/rkt/common/cgroup/v1"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1types "github.com/coreos/rkt/stage1/common/types"
 	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
-	"github.com/hashicorp/errwrap"
 
-	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 )
 
@@ -77,11 +71,6 @@ func main() {
 		log.FatalE("failed to load pod", err)
 	}
 
-	flavor, _, err := stage1initcommon.GetFlavor(p)
-	if err != nil {
-		log.FatalE("failed to get stage1 flavor", err)
-	}
-
 	ra := p.Manifest.Apps.Get(*appName)
 	if ra == nil {
 		log.Fatalf("failed to find app %q", *appName)
@@ -102,14 +91,6 @@ func main() {
 		log.FatalE("error adding app mounts", err)
 	}
 
-	// when using host cgroups, make the subgroup writable by pod systemd
-	if flavor != "kvm" {
-		err = prepareAppCgroups(p, ra, enterCmd)
-		if err != nil {
-			log.FatalE("error preparing cgroups", err)
-		}
-	}
-
 	// write service files
 	w := stage1initcommon.NewUnitWriter(p)
 	w.AppUnit(ra, binPath,
@@ -140,35 +121,3 @@ func main() {
 
 	os.Exit(0)
 }
-
-// prepareAppCgroups makes the cgroups-v1 hierarchy for this application writable
-// by pod supervisor
-func prepareAppCgroups(p *stage1types.Pod, ra *schema.RuntimeApp, enterCmd []string) error {
-	isUnified, err := cgroup.IsCgroupUnified("/")
-	if err != nil {
-		return errwrap.Wrap(errors.New("failed to determine cgroup version"), err)
-	}
-
-	if isUnified {
-		return nil
-	}
-
-	enabledCgroups, err := v1.GetEnabledCgroups()
-	if err != nil {
-		return errwrap.Wrap(errors.New("error getting cgroups"), err)
-	}
-
-	b, err := ioutil.ReadFile(filepath.Join(p.Root, "subcgroup"))
-	if err != nil {
-		log.PrintE("continuing with per-app isolators disabled", err)
-		return nil
-	}
-
-	subcgroup := string(b)
-	serviceName := stage1initcommon.ServiceUnitName(ra.Name)
-	if err := v1.RemountCgroupKnobsRW(enabledCgroups, subcgroup, serviceName, enterCmd); err != nil {
-		return errwrap.Wrap(errors.New("error restricting application cgroups"), err)
-	}
-
-	return nil
-}
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 05a4ca3bec..807a081b6b 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -747,7 +747,7 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 func areHostV1CgroupsMounted(enabledV1Cgroups map[int][]string) bool {
 	controllers := v1.GetControllerDirs(enabledV1Cgroups)
 	for _, c := range controllers {
-		if !v1.IsControllerMounted(c) {
+		if mounted, _ := v1.IsControllerMounted(c); !mounted {
 			return false
 		}
 	}
@@ -769,7 +769,11 @@ func mountHostV1Cgroups(m fs.Mounter, enabledCgroups map[int][]string) error {
 		}
 	}
 
-	if !v1.IsControllerMounted("systemd") {
+	mounted, err := v1.IsControllerMounted("systemd")
+	if err != nil {
+		return err
+	}
+	if !mounted {
 		if err := os.MkdirAll(systemdControllerPath, 0700); err != nil {
 			return err
 		}
@@ -791,7 +795,7 @@ func mountContainerV1Cgroups(m fs.Mounter, p *stage1commontypes.Pod, enabledCgro
 		return errwrap.Wrap(errors.New("error creating container cgroups"), err)
 	}
 
-	if err := v1.RemountCgroups(m, stage1Root, enabledCgroups, subcgroup, serviceNames, p.InsecureOptions.DisablePaths); err != nil {
+	if err := v1.RemountCgroups(m, stage1Root, enabledCgroups, subcgroup, p.InsecureOptions.DisablePaths); err != nil {
 		return errwrap.Wrap(errors.New("error restricting container cgroups"), err)
 	}
 

From 43c70a0fbf95e8009bb37a4721cd7c96d7edfda1 Mon Sep 17 00:00:00 2001
From: Graham Whaley <graham.whaley@linux.intel.com>
Date: Thu, 12 Jan 2017 16:57:17 +0000
Subject: [PATCH 1009/1304] stage1: kvm: Update kernel to 4.9.2

Update the kvm kernel tag and matching config file to stable 4.9.2
Changes add approx. 1.5% (130k) of size.
Possibly notable new items:
 virtually mapped stacks (can now catch stack over-runs)

Signed-off-by: Graham Whaley <graham.whaley@intel.com>
---
 stage1/usr_from_kvm/kernel.mk             |  2 +-
 stage1/usr_from_kvm/kernel/cutdown-config | 27 ++++++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/stage1/usr_from_kvm/kernel.mk b/stage1/usr_from_kvm/kernel.mk
index 00548cf0ce..080c25461c 100644
--- a/stage1/usr_from_kvm/kernel.mk
+++ b/stage1/usr_from_kvm/kernel.mk
@@ -1,5 +1,5 @@
 # custom kernel compilation
-KERNEL_VERSION := 4.8.6
+KERNEL_VERSION := 4.9.2
 KERNEL_TMPDIR := $(UFK_TMPDIR)/kernel
 KERNEL_NAME := linux-$(KERNEL_VERSION)
 KERNEL_TARBALL := $(KERNEL_NAME).tar.xz
diff --git a/stage1/usr_from_kvm/kernel/cutdown-config b/stage1/usr_from_kvm/kernel/cutdown-config
index ede4c6b910..9d9481bd68 100644
--- a/stage1/usr_from_kvm/kernel/cutdown-config
+++ b/stage1/usr_from_kvm/kernel/cutdown-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.8.6 Kernel Configuration
+# Linux/x86 4.9.2 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -45,6 +45,7 @@ CONFIG_PGTABLE_LEVELS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
 
 #
 # General setup
@@ -302,6 +303,8 @@ CONFIG_HAVE_STACK_VALIDATION=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
 
 #
 # GCOV-based kernel profiling
@@ -352,6 +355,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
 
 #
 # IO Schedulers
@@ -591,6 +595,7 @@ CONFIG_PCI_LABEL=y
 # PCI host controller drivers
 #
 # CONFIG_PCIE_DW_PLAT is not set
+# CONFIG_VMD is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 # CONFIG_PCCARD is not set
@@ -617,7 +622,6 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_KEYS_COMPAT=y
 CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_PMC_ATOM=y
-# CONFIG_VMD is not set
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 
@@ -682,6 +686,7 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_CONG_ILLINOIS is not set
 CONFIG_TCP_CONG_DCTCP=m
 # CONFIG_TCP_CONG_CDG is not set
+# CONFIG_TCP_CONG_BBR is not set
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -1028,6 +1033,7 @@ CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
+# CONFIG_STREAM_PARSER is not set
 # CONFIG_WIRELESS is not set
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
@@ -1224,7 +1230,6 @@ CONFIG_NET_CORE=y
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_TEAM is not set
 # CONFIG_MACVLAN is not set
-# CONFIG_IPVLAN is not set
 # CONFIG_VXLAN is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
@@ -1389,7 +1394,6 @@ CONFIG_DEVPORT=y
 #
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
-# CONFIG_NTP_PPS is not set
 
 #
 # PPS clients support
@@ -1412,9 +1416,9 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # CONFIG_GPIOLIB is not set
 # CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_POWER_RESET is not set
 # CONFIG_POWER_AVS is not set
+# CONFIG_POWER_RESET is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
 # CONFIG_WATCHDOG is not set
@@ -1436,6 +1440,7 @@ CONFIG_BCMA_POSSIBLE=y
 #
 CONFIG_MFD_CORE=m
 # CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_EXYNOS_LPASS is not set
 # CONFIG_HTC_PASIC3 is not set
 CONFIG_LPC_ICH=m
 # CONFIG_LPC_SCH is not set
@@ -1548,6 +1553,11 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_ZYDACRON is not set
 # CONFIG_HID_SENSOR_HUB is not set
 # CONFIG_HID_ALPS is not set
+
+#
+# Intel ISH HID support
+#
+# CONFIG_INTEL_ISH_HID is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_UWB is not set
@@ -1825,6 +1835,7 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
@@ -1982,7 +1993,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -2017,6 +2027,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 # CONFIG_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
@@ -2297,7 +2308,6 @@ CONFIG_HAS_DMA=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_CLZ_TAB=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
@@ -2309,3 +2319,4 @@ CONFIG_OID_REGISTRY=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_MMIO_FLUSH=y
+CONFIG_SBITMAP=y

From 28f065d9e5546389ea85b01294cb94903dd18685 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 13 Jan 2017 11:27:37 +0000
Subject: [PATCH 1010/1304] stage1: uid shift systemd files

This commit adjusts some systemd-related files in stage1
which were not properly uid-shifted for in case of user-ns.
---
 stage1/init/common/units.go | 6 ++++++
 stage1/init/init.go         | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 8de3a4af48..17cef7e6a7 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -30,6 +30,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/cgroup"
+	"github.com/coreos/rkt/pkg/user"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 
 	"github.com/coreos/go-systemd/unit"
@@ -225,6 +226,11 @@ func (uw *UnitWriter) WriteUnit(path string, errmsg string, opts ...*unit.UnitOp
 
 	if _, err = io.Copy(file, unit.Serialize(opts)); err != nil {
 		uw.err = errwrap.Wrap(errors.New(errmsg), err)
+		return
+	}
+	if err := user.ShiftFiles([]string{path}, &uw.p.UidRange); err != nil {
+		uw.err = errwrap.Wrap(errors.New(errmsg), err)
+		return
 	}
 }
 
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 05a4ca3bec..4bd59b0a89 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -54,6 +54,7 @@ import (
 	"github.com/coreos/rkt/pkg/fs"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/sys"
+	"github.com/coreos/rkt/pkg/user"
 	"github.com/coreos/rkt/stage1/init/kvm"
 	"github.com/coreos/rkt/stage1/init/kvm/hypervisor/hvlkvm"
 	"github.com/coreos/rkt/stage1/init/kvm/hypervisor/hvqemu"
@@ -437,7 +438,10 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 
 	machineIDBytes := append([]byte(machineID), '\n')
 	if err := ioutil.WriteFile(mPath, machineIDBytes, 0644); err != nil {
-		log.FatalE("error writing /etc/machine-id", err)
+		return nil, nil, errwrap.Wrap(errors.New("error writing /etc/machine-id"), err)
+	}
+	if err := user.ShiftFiles([]string{mPath}, &p.UidRange); err != nil {
+		return nil, nil, errwrap.Wrap(errors.New("error shifting /etc/machine-id"), err)
 	}
 
 	// link journal only if the host is running systemd
@@ -588,6 +592,9 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		log.PrintE("error writing "+hostnamePath, err)
 		return 254
 	}
+	if err := user.ShiftFiles([]string{hostnamePath}, &p.UidRange); err != nil {
+		log.PrintE("error shifting "+hostnamePath, err)
+	}
 
 	if p.ResolvConfMode == "host" {
 		stage1initcommon.UseHostResolv(mnt, root)

From 1007d8d9a92afb27e6c61fe806e03200bd02a33c Mon Sep 17 00:00:00 2001
From: Michael Schubert <michael@kinvolk.io>
Date: Thu, 12 Jan 2017 11:50:14 +0100
Subject: [PATCH 1011/1304] namefetcher: fix nil pointer dereference

Currently (rkt v1.22.0) e.g.

   rkt fetch --no-store coreos.com/etcd:v3.0.15

(run twice to trigger) fails when using cached data due to

```
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x56200f0b6be5]

goroutine 1 [running, locked to thread]:
panic(0x56200f6f7c40, 0xc4200120d0)
	/usr/lib/go-1.7/src/runtime/panic.go:500 +0x1a1
github.com/coreos/rkt/rkt/image.(*nameFetcher).fetchImageFromSingleEndpoint(0xc4205338b0, 0xc42022ab00, 0xc420498cc0, 0x3f, 0xc420533a38, 0x0, 0x0, 0x0, 0x0, 0x0)
	/go/src/github.com/coreos/rkt/build-rkt-1.22.0/gopath/src/github.com/coreos/rkt/rkt/image/namefetcher.go:124 +0x245
github.com/coreos/rkt/rkt/image.(*nameFetcher).fetchImageFromEndpoints(0xc4205338b0, 0xc42022ab00, 0xc4203afaa0, 0x1, 0x1, 0xc420533a38, 0x0, 0xc420214990, 0xc42022ab00, 0x56200f7c064c, ...)
	/go/src/github.com/coreos/rkt/build-rkt-1.22.0/gopath/src/github.com/coreos/rkt/rkt/image/namefetcher.go:99 +0x19d
github.com/coreos/rkt/rkt/image.(*nameFetcher).Hash(0xc4205338b0, 0xc42022ab00, 0xc420533a38, 0xc42022c5b0, 0x7, 0x56200f7c0a2f, 0x5)
	/go/src/github.com/coreos/rkt/build-rkt-1.22.0/gopath/src/github.com/coreos/rkt/rkt/image/namefetcher.go:63 +0x3a5
github.com/coreos/rkt/rkt/image.(*Fetcher).maybeFetchImageFromRemote(0xc420533c28, 0xc420533a78, 0xc420533a38, 0x0, 0x0, 0x0, 0xc420057940)
	/go/src/github.com/coreos/rkt/build-rkt-1.22.0/gopath/src/github.com/coreos/rkt/rkt/image/fetcher.go:362 +0xe7

...
```
---
 rkt/image/namefetcher.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index b9c7a8b427..22db1e82db 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -206,7 +206,7 @@ func (f *nameFetcher) fetchVerifiedURL(app *discovery.App, u *url.URL, a *asc, e
 
 	if cd.UseCached {
 		aciFile.Close()
-		return nil, cd, nil
+		return NopReadSeekCloser(nil), cd, nil
 	}
 
 	if retry {

From 78db751fcbe1c76edd09caa76a4ffc2d2fa1f72d Mon Sep 17 00:00:00 2001
From: Yakau Bubnou <ybubnou@infoblox.com>
Date: Mon, 16 Jan 2017 13:17:14 +0300
Subject: [PATCH 1012/1304] Bump appc/docker2aci library version to 0.15.0

This patch bumps the version of the appc/docker2aci library to 0.15.0
in order to support the conversion of the images with various os/arch.
---
 glide.lock                                    |   8 +-
 glide.yaml                                    |   2 +-
 .../lib/internal/backend/file/file.go         |  28 +++-
 .../appc/docker2aci/lib/internal/internal.go  | 138 +++++++++---------
 .../github.com/appc/docker2aci/lib/version.go |   2 +-
 vendor/github.com/appc/docker2aci/main.go     |  52 +++----
 .../pkg/api/resource/generated.pb.go          |   2 +-
 7 files changed, 122 insertions(+), 110 deletions(-)

diff --git a/glide.lock b/glide.lock
index cd42cea8e2..089ecc2108 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: d539e0ee23575e8a3fbb83bd56ccd2d59b7e2bd9ac0058863800a61841fb35ae
-updated: 2016-12-22T11:41:11.44338079-05:00
+hash: d4d89bbae9978ca0305ddeb4f80bf28a1e7697215fa3fe2e11271240d234038e
+updated: 2017-01-16T13:12:04.012198138+03:00
 imports:
 - name: github.com/appc/docker2aci
-  version: 64543c1e0a7306b17d0d214549ec08049b234abc
+  version: cfd196b05e02185b34aa3a844eff07b943c7e3ec
   subpackages:
   - lib
   - lib/common
@@ -300,7 +300,7 @@ imports:
 - name: gopkg.in/inf.v0
   version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
 - name: k8s.io/kubernetes
-  version: ba5b2fcee9d938dae74d4474f68d9d0933f3ec04
+  version: 5aadd18b051c7c156ee9815055beb180c8365309
   subpackages:
   - pkg/api/resource
 testImports:
diff --git a/glide.yaml b/glide.yaml
index 43f22c9f4f..bd09ddc435 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.14.0
+  version: v0.15.0
   subpackages:
   - lib
   - lib/common
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
index e0c16b5016..8d922ec952 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
@@ -54,10 +54,15 @@ func NewFileBackend(file *os.File, debug, info log.Logger) *FileBackend {
 }
 
 func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *common.ParsedDockerURL, error) {
-	parsedDockerURL, err := common.ParseDockerURL(dockerURL)
-	if err != nil {
-		// a missing Docker URL could mean that the file only contains one
-		// image, so we ignore the error here, we'll handle it in getImageID
+	// a missing Docker URL could mean that the file only contains one
+	// image so it's okay for dockerURL to be blank
+	var parsedDockerURL *common.ParsedDockerURL
+	if dockerURL != "" {
+		var err error
+		parsedDockerURL, err = common.ParseDockerURL(dockerURL)
+		if err != nil {
+			return nil, nil, fmt.Errorf("image provided couldnot be parsed: %v", err)
+		}
 	}
 
 	var ancestry []string
@@ -214,11 +219,22 @@ func getImageID(file *os.File, dockerURL *common.ParsedDockerURL, name string, d
 				return fmt.Errorf("error reading repositories file: %v", err)
 			}
 
-			var repositories apps
-			if err := json.Unmarshal(repob, &repositories); err != nil {
+			var unparsedRepositories apps
+			if err := json.Unmarshal(repob, &unparsedRepositories); err != nil {
 				return fmt.Errorf("error unmarshaling repositories file")
 			}
 
+			repositories := make(apps, 0)
+			// Normalize repository keys since the image potentially passed in is
+			// normalized
+			for key, val := range unparsedRepositories {
+				parsed, err := common.ParseDockerURL(key)
+				if err != nil {
+					return fmt.Errorf("error parsing key %q in repositories: %v", key, err)
+				}
+				repositories[parsed.ImageName] = val
+			}
+
 			if dockerURL == nil {
 				n := len(repositories)
 				switch {
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/internal.go b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
index 2f115d94a2..3a36c4cf2c 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/internal.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
@@ -166,6 +166,42 @@ func generateEPCmdAnnotation(dockerEP, dockerCmd []string) (string, string, erro
 	return entrypointAnnotation, cmdAnnotation, nil
 }
 
+// setLabel sets the label entries associated with non-empty key
+// to the single non-empty value. It replaces any existing values
+// associated with key.
+func setLabel(labels map[appctypes.ACIdentifier]string, key, val string) {
+	if key != "" && val != "" {
+		labels[*appctypes.MustACIdentifier(key)] = val
+	}
+}
+
+// setOSArch translates the given OS and architecture strings into
+// the compatible with application container specification and sets
+// the respective label entries.
+//
+// Returns an error if label translation fails.
+func setOSArch(labels map[appctypes.ACIdentifier]string, os, arch string) error {
+	// Translate arch tuple into the appc arch tuple.
+	appcOS, appcArch, err := appctypes.ToAppcOSArch(os, arch, "")
+	if err != nil {
+		return err
+	}
+
+	// Set translated labels.
+	setLabel(labels, "os", appcOS)
+	setLabel(labels, "arch", appcArch)
+	return nil
+}
+
+// setAnnotation sets the annotation entries associated with non-empty
+// key to the single non-empty value. It replaces any existing values
+// associated with key.
+func setAnnotation(annotations *appctypes.Annotations, key, val string) {
+	if key != "" && val != "" {
+		annotations.Set(*appctypes.MustACIdentifier(key), val)
+	}
+}
+
 // GenerateManifest converts the docker manifest format to an appc
 // ImageManifest.
 func GenerateManifest(layerData types.DockerImageData, dockerURL *common.ParsedDockerURL, debug log.Logger) (*schema.ImageManifest, error) {
@@ -195,42 +231,23 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *common.ParsedD
 	labels := make(map[appctypes.ACIdentifier]string)
 	parentLabels := make(map[appctypes.ACIdentifier]string)
 
-	addLabel := func(key, val string) {
-		if key != "" && val != "" {
-			labels[*appctypes.MustACIdentifier(key)] = val
-		}
-	}
-
-	addParentLabel := func(key, val string) {
-		if key != "" && val != "" {
-			parentLabels[*appctypes.MustACIdentifier(key)] = val
-		}
-	}
-
-	addAnno := func(key, val string) {
-		if key != "" && val != "" {
-			annotations.Set(*appctypes.MustACIdentifier(key), val)
-		}
-	}
+	setLabel(labels, "layer", layerData.ID)
+	setLabel(labels, "version", dockerURL.Tag)
 
-	addLabel("layer", layerData.ID)
-	addLabel("version", dockerURL.Tag)
-	addLabel("os", layerData.OS)
-	addParentLabel("os", layerData.OS)
-	addLabel("arch", layerData.Architecture)
-	addParentLabel("arch", layerData.OS)
+	setOSArch(labels, layerData.OS, layerData.Architecture)
+	setOSArch(parentLabels, layerData.OS, layerData.Architecture)
 
-	addAnno("authors", layerData.Author)
+	setAnnotation(&annotations, "authors", layerData.Author)
 	epoch := time.Unix(0, 0)
 	if !layerData.Created.Equal(epoch) {
-		addAnno("created", layerData.Created.Format(time.RFC3339))
+		setAnnotation(&annotations, "created", layerData.Created.Format(time.RFC3339))
 	}
-	addAnno("docker-comment", layerData.Comment)
-	addAnno(common.AppcDockerOriginalName, dockerURL.OriginalName)
-	addAnno(common.AppcDockerRegistryURL, dockerURL.IndexURL)
-	addAnno(common.AppcDockerRepository, dockerURL.ImageName)
-	addAnno(common.AppcDockerImageID, layerData.ID)
-	addAnno(common.AppcDockerParentImageID, layerData.Parent)
+	setAnnotation(&annotations, "docker-comment", layerData.Comment)
+	setAnnotation(&annotations, common.AppcDockerOriginalName, dockerURL.OriginalName)
+	setAnnotation(&annotations, common.AppcDockerRegistryURL, dockerURL.IndexURL)
+	setAnnotation(&annotations, common.AppcDockerRepository, dockerURL.ImageName)
+	setAnnotation(&annotations, common.AppcDockerImageID, layerData.ID)
+	setAnnotation(&annotations, common.AppcDockerParentImageID, layerData.Parent)
 
 	if dockerConfig != nil {
 		exec := getExecCommand(dockerConfig.Entrypoint, dockerConfig.Cmd)
@@ -265,10 +282,10 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *common.ParsedD
 			return nil, err
 		}
 		if len(ep) > 0 {
-			addAnno(common.AppcDockerEntrypoint, ep)
+			setAnnotation(&annotations, common.AppcDockerEntrypoint, ep)
 		}
 		if len(cmd) > 0 {
-			addAnno(common.AppcDockerCmd, cmd)
+			setAnnotation(&annotations, common.AppcDockerCmd, cmd)
 		}
 
 		genManifest.App = app
@@ -292,7 +309,7 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *common.ParsedD
 
 		genManifest.Dependencies = append(genManifest.Dependencies, appctypes.Dependency{ImageName: *parentImageName, Labels: plbl})
 
-		addAnno(common.AppcDockerTag, dockerURL.Tag)
+		setAnnotation(&annotations, common.AppcDockerTag, dockerURL.Tag)
 	}
 
 	genManifest.Labels, err = appctypes.LabelsFromMap(labels)
@@ -310,15 +327,15 @@ func GenerateEmptyManifest(name string) (*schema.ImageManifest, error) {
 		return nil, err
 	}
 
-	labels := appctypes.Labels{
-		appctypes.Label{
-			Name:  *appctypes.MustACIdentifier("arch"),
-			Value: runtime.GOARCH,
-		},
-		appctypes.Label{
-			Name:  *appctypes.MustACIdentifier("os"),
-			Value: runtime.GOOS,
-		},
+	labelsMap := make(map[appctypes.ACIdentifier]string)
+	err = setOSArch(labelsMap, runtime.GOOS, runtime.GOARCH)
+	if err != nil {
+		return nil, err
+	}
+
+	labels, err := appctypes.LabelsFromMap(labelsMap)
+	if err != nil {
+		return nil, err
 	}
 
 	return &schema.ImageManifest{
@@ -338,30 +355,17 @@ func GenerateManifestV22(name string, dockerURL *common.ParsedDockerURL, config
 	labels := manifest.Labels.ToMap()
 	annotations := manifest.Annotations
 
-	addLabel := func(key, val string) {
-		if key != "" && val != "" {
-			labels[*appctypes.MustACIdentifier(key)] = val
-		}
-	}
-
-	addAnno := func(key, val string) {
-		if key != "" && val != "" {
-			annotations.Set(*appctypes.MustACIdentifier(key), val)
-		}
-	}
-
-	addLabel("version", dockerURL.Tag)
-	addLabel("os", config.OS)
-	addLabel("arch", config.Architecture)
+	setLabel(labels, "version", dockerURL.Tag)
+	setOSArch(labels, config.OS, config.Architecture)
 
-	addAnno("author", config.Author)
-	addAnno("created", config.Created)
+	setAnnotation(&annotations, "author", config.Author)
+	setAnnotation(&annotations, "created", config.Created)
 
-	addAnno(common.AppcDockerOriginalName, dockerURL.OriginalName)
-	addAnno(common.AppcDockerRegistryURL, dockerURL.IndexURL)
-	addAnno(common.AppcDockerRepository, dockerURL.ImageName)
-	addAnno(common.AppcDockerImageID, imageDigest)
-	addAnno("created", config.Created)
+	setAnnotation(&annotations, common.AppcDockerOriginalName, dockerURL.OriginalName)
+	setAnnotation(&annotations, common.AppcDockerRegistryURL, dockerURL.IndexURL)
+	setAnnotation(&annotations, common.AppcDockerRepository, dockerURL.ImageName)
+	setAnnotation(&annotations, common.AppcDockerImageID, imageDigest)
+	setAnnotation(&annotations, "created", config.Created)
 
 	if config.Config != nil {
 		innerCfg := config.Config
@@ -393,10 +397,10 @@ func GenerateManifestV22(name string, dockerURL *common.ParsedDockerURL, config
 			return nil, err
 		}
 		if len(ep) > 0 {
-			addAnno(common.AppcDockerEntrypoint, ep)
+			setAnnotation(&annotations, common.AppcDockerEntrypoint, ep)
 		}
 		if len(cmd) > 0 {
-			addAnno(common.AppcDockerCmd, cmd)
+			setAnnotation(&annotations, common.AppcDockerCmd, cmd)
 		}
 	}
 
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index 831d47f690..a1f4f16cb4 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.14.0"
+var Version = "0.15.0"
 var AppcVersion = schema.AppContainerVersion
diff --git a/vendor/github.com/appc/docker2aci/main.go b/vendor/github.com/appc/docker2aci/main.go
index 7aaf4a3ce0..fb22a34e3d 100644
--- a/vendor/github.com/appc/docker2aci/main.go
+++ b/vendor/github.com/appc/docker2aci/main.go
@@ -136,12 +136,8 @@ func runDocker2ACI(arg string) error {
 		return err
 	}
 
-	if err := printConvertedVolumes(*manifest); err != nil {
-		return err
-	}
-	if err := printConvertedPorts(*manifest); err != nil {
-		return err
-	}
+	printConvertedVolumes(*manifest)
+	printConvertedPorts(*manifest)
 
 	fmt.Printf("\nGenerated ACI(s):\n")
 	for _, aciFile := range aciLayerPaths {
@@ -151,33 +147,29 @@ func runDocker2ACI(arg string) error {
 	return nil
 }
 
-func printConvertedVolumes(manifest schema.ImageManifest) error {
-	if manifest.App != nil && manifest.App.MountPoints != nil {
-		mps := manifest.App.MountPoints
-		if len(mps) > 0 {
-			fmt.Printf("\nConverted volumes:\n")
-			for _, mp := range mps {
-				fmt.Printf("\tname: %q, path: %q, readOnly: %v\n", mp.Name, mp.Path, mp.ReadOnly)
-			}
+func printConvertedVolumes(manifest schema.ImageManifest) {
+	if manifest.App == nil {
+		return
+	}
+	if mps := manifest.App.MountPoints; len(mps) > 0 {
+		fmt.Printf("\nConverted volumes:\n")
+		for _, mp := range mps {
+			fmt.Printf("\tname: %q, path: %q, readOnly: %v\n", mp.Name, mp.Path, mp.ReadOnly)
 		}
 	}
-
-	return nil
 }
 
-func printConvertedPorts(manifest schema.ImageManifest) error {
-	if manifest.App != nil && manifest.App.Ports != nil {
-		ports := manifest.App.Ports
-		if len(ports) > 0 {
-			fmt.Printf("\nConverted ports:\n")
-			for _, port := range ports {
-				fmt.Printf("\tname: %q, protocol: %q, port: %v, count: %v, socketActivated: %v\n",
-					port.Name, port.Protocol, port.Port, port.Count, port.SocketActivated)
-			}
+func printConvertedPorts(manifest schema.ImageManifest) {
+	if manifest.App == nil {
+		return
+	}
+	if ports := manifest.App.Ports; len(ports) > 0 {
+		fmt.Printf("\nConverted ports:\n")
+		for _, port := range ports {
+			fmt.Printf("\tname: %q, protocol: %q, port: %v, count: %v, socketActivated: %v\n",
+				port.Name, port.Protocol, port.Port, port.Count, port.SocketActivated)
 		}
 	}
-
-	return nil
 }
 
 func getManifest(aciPath string) (*schema.ImageManifest, error) {
@@ -197,9 +189,9 @@ func getManifest(aciPath string) (*schema.ImageManifest, error) {
 
 func usage() {
 	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
-	fmt.Fprintf(os.Stderr, "docker2aci [--debug] [--nosquash] [--compression=(gzip|none)] IMAGE\n")
+	fmt.Fprintf(os.Stderr, "docker2aci [-debug] [-nosquash] [-compression=(gzip|none)] IMAGE\n")
 	fmt.Fprintf(os.Stderr, "  Where IMAGE is\n")
-	fmt.Fprintf(os.Stderr, "    [--image=IMAGE_NAME[:TAG]] FILEPATH\n")
+	fmt.Fprintf(os.Stderr, "    [-image=IMAGE_NAME[:TAG]] FILEPATH\n")
 	fmt.Fprintf(os.Stderr, "  or\n")
 	fmt.Fprintf(os.Stderr, "    docker://[REGISTRYURL/]IMAGE_NAME[:TAG]\n")
 	fmt.Fprintf(os.Stderr, "Flags:\n")
@@ -216,7 +208,7 @@ func main() {
 		return
 	}
 
-	if len(args) < 1 {
+	if len(args) != 1 {
 		usage()
 		os.Exit(2)
 	}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go b/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
index 3bde152533..e7c6e9ed10 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
+++ b/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Kubernetes Authors.
+Copyright 2017 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 61b292ef59c0e3053acf805e6a910a23060e68c8 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Fri, 23 Dec 2016 10:44:43 -0500
Subject: [PATCH 1013/1304] stage1: move more logic out of AppUnit

Try and simplify app unit generation in a few ways. This is in
preparation for pluggable stage2 isolation engines.

- generate a struct with runtime information, rather than generating
    unit directives directly from isolators, etc.
- Split systemd-specific and more generic unit code
---
 stage1/common/types/pod.go    |   1 +
 stage1/init/common/app.go     | 239 ++++++++++++++++++++++++++++
 stage1/init/common/pod.go     |  53 -------
 stage1/init/common/seccomp.go | 109 ++++++++-----
 stage1/init/common/units.go   | 285 ++++++++++++++--------------------
 stage1/init/init.go           |   5 +-
 tests/rkt_app_sandbox_test.go |   2 +-
 7 files changed, 432 insertions(+), 262 deletions(-)
 create mode 100644 stage1/init/common/app.go

diff --git a/stage1/common/types/pod.go b/stage1/common/types/pod.go
index 338a9ec312..18c57c4ad0 100644
--- a/stage1/common/types/pod.go
+++ b/stage1/common/types/pod.go
@@ -58,6 +58,7 @@ type RuntimePod struct {
 	ResolvConfMode     string         `json:"ResolvConfMode"`
 	EtcHostsMode       string         `json:"EtcHostsMode"`
 	NetList            common.NetList `json:"NetList"`
+	Interactive        bool           `json:"Interactive"`
 	InsecureOptions    struct {
 		DisablePaths        bool `json:"DisablePaths"`
 		DisableCapabilities bool `json:"DisableCapabilities"`
diff --git a/stage1/init/common/app.go b/stage1/init/common/app.go
new file mode 100644
index 0000000000..f2b431aa64
--- /dev/null
+++ b/stage1/init/common/app.go
@@ -0,0 +1,239 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package common
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+	"github.com/hashicorp/errwrap"
+
+	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/common/cgroup"
+	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
+)
+
+// preparedApp contains some internal state needed to actually run an app.
+// We add this intermediate step to prevent unit file generation from being
+// totally unwieldly.
+type preparedApp struct {
+	app             *schema.RuntimeApp
+	uid             uint32
+	gid             uint32
+	env             types.Environment
+	resources       appResources
+	mounts          []mountWrapper
+	noNewPrivileges bool
+	capabilities    []string
+	seccomp         *seccompFilter
+
+	// Path restrictions
+	roPaths     []string
+	hiddenPaths []string
+	hiddenDirs  []string
+}
+
+type appResources struct {
+	MemoryLimit         *uint64 // Memory limit in bytes
+	CPUQuota            *uint64 // The hard (absolute) CPU quota as a percent (100 = 1 core)
+	LinuxCPUShares      *uint64 // The relative CPU weight in the app's cgroup.
+	LinuxOOMScoreAdjust *int    // OOMScoreAdjust knob
+}
+
+/*
+ * Paths to protect for non-provileged applications
+ * AKA protectKernelTunables
+ */
+var protectKernelROPaths = []string{
+	"/proc/bus/",
+	"/proc/sys/kernel/core_pattern",
+	"/proc/sys/kernel/modprobe",
+	"/proc/sys/vm/panic_on_oom",
+	"/proc/sysrq-trigger",
+	"/sys/block/",
+	"/sys/bus/",
+	"/sys/class/",
+	"/sys/dev/",
+	"/sys/devices/",
+	"/sys/kernel/",
+}
+var protectKernelHiddenDirs = []string{
+	"/sys/firmware/",
+	"/sys/fs/",
+	"/sys/hypervisor/",
+	"/sys/module/",
+	"/sys/power/",
+}
+
+// This is separate because systemd <231 didn't support masking files,
+// only directories
+var protectKernelHiddenPaths = []string{
+	"/proc/config.gz",
+	"/proc/kallsyms",
+	"/proc/sched_debug",
+	"/proc/kcore",
+	"/proc/kmem",
+	"/proc/mem",
+}
+
+// prepareApp sets up the internal runtime context for a specific app.
+func prepareApp(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (*preparedApp, error) {
+	pa := preparedApp{
+		app:             ra,
+		env:             ra.App.Environment,
+		noNewPrivileges: getAppNoNewPrivileges(ra.App.Isolators),
+	}
+	var err error
+
+	// Determine numeric uid and gid
+	u, g, err := parseUserGroup(p, ra)
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("unable to determine app's uid and gid"), err)
+	}
+	if u < 0 || g < 0 {
+		return nil, errors.New("Invalid uid or gid")
+	}
+	pa.uid = uint32(u)
+	pa.gid = uint32(g)
+
+	// Set some rkt-provided environment variables
+	pa.env.Set("AC_APP_NAME", ra.Name.String())
+	if p.MetadataServiceURL != "" {
+		pa.env.Set("AC_METADATA_URL", p.MetadataServiceURL)
+	}
+
+	// Determine capability set
+	pa.capabilities, err = getAppCapabilities(ra.App.Isolators)
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("unable to construct capabilities"), err)
+	}
+
+	// Determine mounts
+	cfd := ConvertedFromDocker(p.Images[ra.Name.String()])
+	pa.mounts, err = GenerateMounts(ra, p.Manifest.Volumes, cfd)
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("unable to compute mounts"), err)
+	}
+
+	// Compute resources
+	pa.resources, err = computeAppResources(ra.App.Isolators)
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("unable to compute resources"), err)
+	}
+
+	// Protect kernel tunables by default
+	if !p.InsecureOptions.DisablePaths {
+		pa.roPaths = append(pa.roPaths, protectKernelROPaths...)
+		pa.hiddenPaths = append(pa.hiddenDirs, protectKernelHiddenPaths...)
+		pa.hiddenDirs = append(pa.hiddenDirs, protectKernelHiddenDirs...)
+	}
+
+	// Seccomp
+	if !p.InsecureOptions.DisableSeccomp {
+		pa.seccomp, err = generateSeccompFilter(p, &pa)
+		if err != nil {
+			return nil, err
+		}
+		if pa.seccomp != nil && pa.seccomp.forceNoNewPrivileges {
+			pa.noNewPrivileges = true
+		}
+	}
+
+	// Write the systemd-sysusers config file
+	if err := generateSysusers(p, pa.app, int(pa.uid), int(pa.gid), &p.UidRange); err != nil {
+		return nil, errwrap.Wrapf("unable to generate sysusers file", err)
+	}
+
+	return &pa, nil
+}
+
+// computeAppResources processes any isolators that manipulate cgroups.
+func computeAppResources(isolators types.Isolators) (appResources, error) {
+	res := appResources{}
+	var err error
+
+	withIsolator := func(name string, f func() error) error {
+		ok, err := cgroup.IsIsolatorSupported(name)
+		if err != nil {
+			return errwrap.Wrapf("could not check for isolator "+name, err)
+		}
+
+		if !ok {
+			fmt.Fprintf(os.Stderr, "warning: resource/%s isolator set but support disabled in the kernel, skipping\n", name)
+			return nil
+		}
+
+		return f()
+	}
+
+	for _, isolator := range isolators {
+		if err != nil {
+			return res, err
+		}
+
+		switch v := isolator.Value().(type) {
+		case *types.ResourceMemory:
+			err = withIsolator("memory", func() error {
+				if v.Limit() == nil {
+					return nil
+				}
+
+				val := uint64(v.Limit().Value())
+				res.MemoryLimit = &val
+				return nil
+			})
+		case *types.ResourceCPU:
+			err = withIsolator("cpu", func() error {
+				if v.Limit() == nil {
+					return nil
+				}
+				if v.Limit().Value() > MaxMilliValue {
+					return fmt.Errorf("cpu limit exceeds the maximum millivalue: %v", v.Limit().String())
+				}
+
+				val := uint64(v.Limit().MilliValue() / 10)
+				res.CPUQuota = &val
+				return nil
+			})
+		case *types.LinuxCPUShares:
+			err = withIsolator("cpu", func() error {
+				val := uint64(*v)
+				res.LinuxCPUShares = &val
+				return nil
+			})
+		case *types.LinuxOOMScoreAdj:
+			val := int(*v)
+			res.LinuxOOMScoreAdjust = &val
+		}
+	}
+
+	return res, err
+}
+
+// relAppPaths prepends the relative app path (/opt/stage1/rootfs/) to a list
+// of paths. Useful for systemd unit directives.
+func (pa *preparedApp) relAppPaths(paths []string) []string {
+	out := make([]string, 0, len(paths))
+	for _, p := range paths {
+		out = append(out, filepath.Join(common.RelAppRootfsPath(pa.app.Name), p))
+	}
+	return out
+}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 089b9c1bdc..5f81e9168c 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -725,56 +725,3 @@ func getAppNoNewPrivileges(isolators types.Isolators) bool {
 
 	return false
 }
-
-// protectKernelTunables restricts access to some security-sensitive paths under
-// /proc and /sys. Entries are either hidden or just made read-only to app.
-// This protection is enabled by default.
-func protectKernelTunables(opts []*unit.UnitOption, appName types.ACName, systemdVersion int) []*unit.UnitOption {
-	roPaths := []string{
-		"/proc/bus/",
-		"/proc/sys/kernel/core_pattern",
-		"/proc/sys/kernel/modprobe",
-		"/proc/sys/vm/panic_on_oom",
-		"/proc/sysrq-trigger",
-		"/sys/block/",
-		"/sys/bus/",
-		"/sys/class/",
-		"/sys/dev/",
-		"/sys/devices/",
-		"/sys/kernel/",
-	}
-	hiddenDirs := []string{
-		"/sys/firmware/",
-		"/sys/fs/",
-		"/sys/hypervisor/",
-		"/sys/module/",
-		"/sys/power/",
-	}
-	hiddenPaths := []string{
-		"/proc/config.gz",
-		"/proc/kallsyms",
-		"/proc/sched_debug",
-		"/proc/kcore",
-		"/proc/kmem",
-		"/proc/mem",
-	}
-
-	// Paths prefixed with "-" are ignored if they do not exist:
-	// https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ReadWriteDirectories=
-	for _, p := range roPaths {
-		opts = append(opts, unit.NewUnitOption("Service", "ReadOnlyDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
-	}
-	for _, p := range hiddenDirs {
-		opts = append(opts, unit.NewUnitOption("Service", "InaccessibleDirectories", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
-	}
-	if systemdVersion >= 231 {
-		for _, p := range hiddenPaths {
-			opts = append(opts, unit.NewUnitOption("Service", "InaccessiblePaths", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
-		}
-	}
-	if systemdVersion >= 233 {
-		opts = append(opts, unit.NewUnitOption("Service", "ProtectKernelTunables", "true"))
-	}
-
-	return opts
-}
diff --git a/stage1/init/common/seccomp.go b/stage1/init/common/seccomp.go
index d5a2caecef..4f85353b4d 100644
--- a/stage1/init/common/seccomp.go
+++ b/stage1/init/common/seccomp.go
@@ -18,6 +18,7 @@ package common
 
 import (
 	"errors"
+	"fmt"
 	"strings"
 
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
@@ -33,73 +34,101 @@ var (
 // Systemd filter mode, see
 // https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
 const (
-	sdBlacklistMode = "~"
-	sdWhitelistMode = ""
+	sdBlacklistPrefix = "~"
+	sdWhitelistPrefix = ""
 )
 
-// getSeccompFilter gets an appc seccomp set and an optional error mode,
-// returning those values in a format suitable for systemd consumption.
-func getSeccompFilter(opts []*unit.UnitOption, p *stage1commontypes.Pod, unprivileged bool, isolators types.Isolators) ([]*unit.UnitOption, bool, error) {
-	var filterMode string
-	flag := ""
-	seccompIsolators := 0
-	seccompErrno := ""
-	noNewPrivs := false
-	var err error
-	var seccompSet []string
-	for _, i := range isolators {
+type filterType int
+
+const (
+	ModeBlacklist filterType = iota
+	ModeWhitelist
+)
+
+// seccompFilter is an internal representation of the seccomp filtering
+// supplied by the isolators.
+type seccompFilter struct {
+	syscalls             []string   // List of syscalls to filter
+	mode                 filterType // whitelist or blacklist
+	errno                string     // optional - empty string = use default
+	forceNoNewPrivileges bool       // If true, then override the NoNewPrivileges isolator
+}
+
+// generateSeccompFilter computes the concrete seccomp filter from the isolators
+func generateSeccompFilter(p *stage1commontypes.Pod, pa *preparedApp) (*seccompFilter, error) {
+	sf := seccompFilter{}
+	seenIsolators := 0
+	for _, i := range pa.app.App.Isolators {
+		var flag string
+		var err error
 		if seccomp, ok := i.Value().(types.LinuxSeccompSet); ok {
-			seccompIsolators++
+			seenIsolators++
 			// By appc spec, only one seccomp isolator per app is allowed
-			if seccompIsolators > 1 {
-				return nil, false, ErrTooManySeccompIsolators
+			if seenIsolators > 1 {
+				return nil, ErrTooManySeccompIsolators
 			}
 			switch i.Name {
 			case types.LinuxSeccompRemoveSetName:
-				filterMode = sdBlacklistMode
-				seccompSet, flag, err = parseLinuxSeccompSet(p, seccomp)
+				sf.mode = ModeBlacklist
+				sf.syscalls, flag, err = parseLinuxSeccompSet(p, seccomp)
 				if err != nil {
-					return nil, false, err
+					return nil, err
 				}
 				if flag == "empty" {
-					// Opt-in to rkt default whitelist
-					seccompSet = nil
-					break
+					// we interpret "remove @empty" to mean "default whitelist"
+					sf.mode = ModeWhitelist
+					sf.syscalls = RktDefaultSeccompWhitelist
 				}
 			case types.LinuxSeccompRetainSetName:
-				filterMode = sdWhitelistMode
-				seccompSet, flag, err = parseLinuxSeccompSet(p, seccomp)
+				sf.mode = ModeWhitelist
+				sf.syscalls, flag, err = parseLinuxSeccompSet(p, seccomp)
 				if err != nil {
-					return nil, false, err
+					return nil, err
 				}
 				if flag == "all" {
 					// Opt-out seccomp filtering
-					return opts, false, nil
+					return nil, nil
 				}
 			}
-			seccompErrno = string(seccomp.Errno())
+			sf.errno = string(seccomp.Errno())
 		}
 	}
 
 	// If unset, use rkt default whitelist
-	if len(seccompSet) == 0 {
-		filterMode = sdWhitelistMode
-		seccompSet = RktDefaultSeccompWhitelist
+	if seenIsolators == 0 {
+		sf.mode = ModeWhitelist
+		sf.syscalls = RktDefaultSeccompWhitelist
 	}
 
-	// Append computed options
-	if seccompErrno != "" {
-		opts = append(opts, unit.NewUnitOption("Service", "SystemCallErrorNumber", seccompErrno))
+	// Non-priv apps *must* have NoNewPrivileges set if they have seccomp
+	sf.forceNoNewPrivileges = (pa.uid != 0)
+
+	return &sf, nil
+}
+
+// seccompUnitOptions converts a concrete seccomp filter to systemd unit options
+func seccompUnitOptions(opts []*unit.UnitOption, sf *seccompFilter) ([]*unit.UnitOption, error) {
+	if sf == nil {
+		return opts, nil
 	}
-	// SystemCallFilter options are written down one entry per line, because
-	// filtering sets may be quite large and overlong lines break unit serialization.
-	opts = appendOptionsList(opts, "Service", "SystemCallFilter", filterMode, seccompSet...)
-	// In order to install seccomp filters, unprivileged process must first set no-news-privs.
-	if unprivileged {
-		noNewPrivs = true
+	if sf.errno != "" {
+		opts = append(opts, unit.NewUnitOption("Service", "SystemCallErrorNumber", sf.errno))
 	}
 
-	return opts, noNewPrivs, nil
+	var filterPrefix string
+	switch sf.mode {
+	case ModeWhitelist:
+		filterPrefix = sdWhitelistPrefix
+	case ModeBlacklist:
+		filterPrefix = sdBlacklistPrefix
+	default:
+		return nil, fmt.Errorf("unkown filter mode %v", sf.mode)
+	}
+
+	// SystemCallFilter options are written down one entry per line, because
+	// filtering sets may be quite large and overlong lines break unit serialization.
+	opts = appendOptionsList(opts, "Service", "SystemCallFilter", filterPrefix, sf.syscalls...)
+	return opts, nil
 }
 
 // parseLinuxSeccompSet gets an appc LinuxSeccompSet and returns an array
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 17cef7e6a7..a934d7e7af 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -29,7 +29,6 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/cgroup"
 	"github.com/coreos/rkt/pkg/user"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 
@@ -97,8 +96,8 @@ func MutableEnv(p *stage1commontypes.Pod) error {
 	return w.Error()
 }
 
-func ImmutableEnv(p *stage1commontypes.Pod, interactive bool) error {
-	w := NewUnitWriter(p)
+func ImmutableEnv(p *stage1commontypes.Pod) error {
+	uw := NewUnitWriter(p)
 
 	opts := []*unit.UnitOption{
 		unit.NewUnitOption("Unit", "Description", "rkt apps target"),
@@ -114,13 +113,13 @@ func ImmutableEnv(p *stage1commontypes.Pod, interactive bool) error {
 		opts = append(opts, unit.NewUnitOption("Unit", "Wants", serviceName))
 	}
 
-	w.WriteUnit(
+	uw.WriteUnit(
 		TargetUnitPath(p.Root, "default"),
 		"failed to write default.target",
 		opts...,
 	)
 
-	w.WriteUnit(
+	uw.WriteUnit(
 		ServiceUnitPath(p.Root, "prepare-app@"),
 		"failed to write prepare-app service template",
 		unit.NewUnitOption("Unit", "Description", "Prepare minimum environment for chrooted applications"),
@@ -136,7 +135,7 @@ func ImmutableEnv(p *stage1commontypes.Pod, interactive bool) error {
 		unit.NewUnitOption("Service", "CapabilityBoundingSet", "CAP_SYS_ADMIN CAP_DAC_OVERRIDE"),
 	)
 
-	w.WriteUnit(
+	uw.WriteUnit(
 		TargetUnitPath(p.Root, "halt"),
 		"failed to write halt target",
 		unit.NewUnitOption("Unit", "Description", "Halt"),
@@ -144,7 +143,7 @@ func ImmutableEnv(p *stage1commontypes.Pod, interactive bool) error {
 		unit.NewUnitOption("Unit", "AllowIsolate", "true"),
 	)
 
-	w.writeShutdownService(
+	uw.writeShutdownService(
 		"ExecStop",
 		unit.NewUnitOption("Unit", "Description", "Pod shutdown"),
 		unit.NewUnitOption("Unit", "AllowIsolate", "true"),
@@ -153,7 +152,7 @@ func ImmutableEnv(p *stage1commontypes.Pod, interactive bool) error {
 		unit.NewUnitOption("Service", "RemainAfterExit", "yes"),
 	)
 
-	if err := w.Error(); err != nil {
+	if err := uw.Error(); err != nil {
 		return err
 	}
 
@@ -170,7 +169,7 @@ func ImmutableEnv(p *stage1commontypes.Pod, interactive bool) error {
 		}
 
 		var opts []*unit.UnitOption
-		if interactive {
+		if p.Interactive {
 			opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "tty"))
 			opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "tty"))
 			opts = append(opts, unit.NewUnitOption("Service", "StandardError", "tty"))
@@ -184,16 +183,16 @@ func ImmutableEnv(p *stage1commontypes.Pod, interactive bool) error {
 			unit.NewUnitOption("Unit", "OnFailure", "halt.target"),
 		)
 
-		w.AppUnit(ra, binPath, opts...)
+		uw.AppUnit(ra, binPath, opts...)
 
-		w.AppReaperUnit(ra.Name, binPath,
+		uw.AppReaperUnit(ra.Name, binPath,
 			unit.NewUnitOption("Service", "Environment", `"EXIT_POD=true"`),
 			unit.NewUnitOption("Unit", "Wants", "shutdown.service"),
 			unit.NewUnitOption("Unit", "After", "shutdown.service"),
 		)
 	}
 
-	return w.Error()
+	return uw.Error()
 }
 
 // UnitWriter is the type that writes systemd units preserving the first previously occured error.
@@ -307,51 +306,72 @@ func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*un
 		return
 	}
 
-	flavor, systemdVersion, err := GetFlavor(uw.p)
-	if err != nil {
-		uw.err = errwrap.Wrap(errors.New("unable to determine stage1 flavor"), err)
+	if len(ra.App.Exec) == 0 {
+		uw.err = fmt.Errorf(`image %q has an empty "exec" (try --exec=BINARY)`,
+			uw.p.AppNameToImageName(ra.Name))
 		return
 	}
 
-	app := ra.App
-	appName := ra.Name
-	imgName := uw.p.AppNameToImageName(appName)
-	imageManifest := uw.p.Images[appName.String()]
-
-	podAbsRoot, err := filepath.Abs(uw.p.Root)
+	pa, err := prepareApp(uw.p, ra)
 	if err != nil {
 		uw.err = err
 		return
 	}
 
-	if len(app.Exec) == 0 {
-		uw.err = fmt.Errorf(`image %q has an empty "exec" (try --exec=BINARY)`, imgName)
-		return
-	}
+	appName := ra.Name.String()
+	imgName := uw.p.AppNameToImageName(ra.Name)
+	/* Write the generic unit options */
+	opts = append(opts, []*unit.UnitOption{
+		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Application=%v Image=%v", appName, imgName)),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
+		unit.NewUnitOption("Unit", "Wants", fmt.Sprintf("reaper-%s.service", appName)),
+		unit.NewUnitOption("Service", "Restart", "no"),
 
-	env := app.Environment
+		// This helps working around a race
+		// (https://github.com/systemd/systemd/issues/2913) that causes the
+		// systemd unit name not getting written to the journal if the unit is
+		// short-lived and runs as non-root.
+		unit.NewUnitOption("Service", "SyslogIdentifier", appName),
+	}...)
 
-	env.Set("AC_APP_NAME", appName.String())
-	if uw.p.MetadataServiceURL != "" {
-		env.Set("AC_METADATA_URL", uw.p.MetadataServiceURL)
+	if supportsNotify(uw.p, ra.Name.String()) {
+		opts = append(opts, unit.NewUnitOption("Service", "Type", "notify"))
 	}
 
-	envFilePath := EnvFilePath(uw.p.Root, appName)
+	// Some pre-start jobs take a long time, set the timeout to 0
+	opts = append(opts, unit.NewUnitOption("Service", "TimeoutStartSec", "0"))
+
+	opts = append(opts, unit.NewUnitOption("Unit", "Requires", "sysusers.service"))
+	opts = append(opts, unit.NewUnitOption("Unit", "After", "sysusers.service"))
+
+	opts = uw.appSystemdUnit(pa, binPath, opts)
 
-	if err := common.WriteEnvFile(env, &uw.p.UidRange, envFilePath); err != nil {
-		uw.err = errwrap.Wrap(errors.New("unable to write environment file for systemd"), err)
-		return
+	uw.WriteUnit(ServiceUnitPath(uw.p.Root, ra.Name), "failed to create service unit file", opts...)
+	uw.Activate(ServiceUnitName(ra.Name), ServiceWantPath(uw.p.Root, ra.Name))
+
+}
+
+// appSystemdUnit sets up an application for isolation via systemd
+func (uw *UnitWriter) appSystemdUnit(pa *preparedApp, binPath string, opts []*unit.UnitOption) []*unit.UnitOption {
+	if uw.err != nil {
+		return nil
 	}
 
-	u, g, err := parseUserGroup(uw.p, ra)
+	flavor, systemdVersion, err := GetFlavor(uw.p)
 	if err != nil {
-		uw.err = err
-		return
+		uw.err = errwrap.Wrap(errors.New("unable to determine stage1 flavor"), err)
+		return nil
 	}
 
-	if err := generateSysusers(uw.p, ra, u, g, &uw.p.UidRange); err != nil {
-		uw.err = errwrap.Wrap(errors.New("unable to generate sysusers"), err)
-		return
+	ra := pa.app
+	app := ra.App
+	appName := ra.Name
+	imgName := uw.p.AppNameToImageName(ra.Name)
+
+	podAbsRoot, err := filepath.Abs(uw.p.Root)
+	if err != nil {
+		uw.err = err
+		return nil
 	}
 
 	var supplementaryGroups []string
@@ -359,78 +379,50 @@ func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*un
 		supplementaryGroups = append(supplementaryGroups, strconv.Itoa(g))
 	}
 
-	capabilitiesStr, err := getAppCapabilities(app.Isolators)
-	if err != nil {
-		uw.err = err
-		return
+	// Write env file
+	if err := common.WriteEnvFile(pa.env, &uw.p.UidRange, EnvFilePath(uw.p.Root, pa.app.Name)); err != nil {
+		uw.err = errwrap.Wrapf("unable to write environment file", err)
+		return nil
 	}
 
 	execStart := append([]string{binPath}, app.Exec[1:]...)
 	execStartString := quoteExec(execStart)
-	opts = append(opts, []*unit.UnitOption{
-		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Application=%v Image=%v", appName, imgName)),
-		unit.NewUnitOption("Unit", "DefaultDependencies", "false"),
-		unit.NewUnitOption("Unit", "Wants", fmt.Sprintf("reaper-%s.service", appName)),
-		unit.NewUnitOption("Service", "Restart", "no"),
+	opts = append(opts,
 		unit.NewUnitOption("Service", "ExecStart", execStartString),
 		unit.NewUnitOption("Service", "RootDirectory", common.RelAppRootfsPath(appName)),
 		unit.NewUnitOption("Service", "WorkingDirectory", app.WorkingDirectory),
 		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePath(appName)),
-		unit.NewUnitOption("Service", "User", strconv.Itoa(u)),
-		unit.NewUnitOption("Service", "Group", strconv.Itoa(g)),
-
-		// This helps working around a race
-		// (https://github.com/systemd/systemd/issues/2913) that causes the
-		// systemd unit name not getting written to the journal if the unit is
-		// short-lived and runs as non-root.
-		unit.NewUnitOption("Service", "SyslogIdentifier", appName.String()),
-	}...)
+		unit.NewUnitOption("Service", "User", strconv.Itoa(int(pa.uid))),
+		unit.NewUnitOption("Service", "Group", strconv.Itoa(int(pa.gid))),
+		unit.NewUnitOption("Unit", "Requires", InstantiatedPrepareAppUnitName(ra.Name)),
+		unit.NewUnitOption("Unit", "After", InstantiatedPrepareAppUnitName(ra.Name)),
+	)
 
 	if len(supplementaryGroups) > 0 {
 		opts = appendOptionsList(opts, "Service", "SupplementaryGroups", "", supplementaryGroups...)
 	}
 
-	if supportsNotify(uw.p, appName.String()) {
-		opts = append(opts, unit.NewUnitOption("Service", "Type", "notify"))
-	}
-
 	if !uw.p.InsecureOptions.DisableCapabilities {
-		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(capabilitiesStr, " ")))
+		opts = append(opts, unit.NewUnitOption("Service", "CapabilityBoundingSet", strings.Join(pa.capabilities, " ")))
 	}
 
 	// Apply seccomp isolator, if any and not opt-ing out;
 	// see https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
-	noNewPrivileges := getAppNoNewPrivileges(app.Isolators)
-	if !uw.p.InsecureOptions.DisableSeccomp {
-		var forceNoNewPrivileges bool
-
-		unprivileged := (u != 0)
-		opts, forceNoNewPrivileges, err = getSeccompFilter(opts, uw.p, unprivileged, app.Isolators)
+	if pa.seccomp != nil {
+		opts, err = seccompUnitOptions(opts, pa.seccomp)
 		if err != nil {
-			uw.err = err
-			return
+			uw.err = errwrap.Wrapf("unable to apply seccomp options", err)
+			return nil
 		}
-
-		// Seccomp filters require NoNewPrivileges for unprivileged apps, that may override
-		// manifest annotation.
-		if forceNoNewPrivileges {
-			noNewPrivileges = true
-		}
-	}
-	opts = append(opts, unit.NewUnitOption("Service", "NoNewPrivileges", strconv.FormatBool(noNewPrivileges)))
-
-	mounts, err := GenerateMounts(ra, uw.p.Manifest.Volumes, ConvertedFromDocker(imageManifest))
-	if err != nil {
-		uw.err = err
-		return
 	}
+	opts = append(opts, unit.NewUnitOption("Service", "NoNewPrivileges", strconv.FormatBool(pa.noNewPrivileges)))
 
 	if ra.ReadOnlyRootFS {
-		for _, m := range mounts {
+		for _, m := range pa.mounts {
 			mntPath, err := EvaluateSymlinksInsideApp(podAbsRoot, m.Mount.Path)
 			if err != nil {
 				uw.err = err
-				return
+				return nil
 			}
 
 			if !m.ReadOnly {
@@ -441,9 +433,27 @@ func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*un
 		opts = appendOptionsList(opts, "Service", "ReadOnlyDirectories", "", common.RelAppRootfsPath(ra.Name))
 	}
 
+	// Unless we have --insecure-options=paths, then do some path protections:
+	//
+	// * prevent access to sensitive kernel tunables
+	// * Run the app in a separate mount namespace
+	//
 	if !uw.p.InsecureOptions.DisablePaths {
-		// Restrict access to sensitive paths (eg. procfs and sysfs entries).
-		opts = protectKernelTunables(opts, appName, systemdVersion)
+		// Systemd 231+ has InaccessiblePaths
+		// older versions only have InaccessibleDirectories
+		// Paths prepended with "-" are ignored if they don't exist.
+		if systemdVersion >= 231 {
+			opts = appendOptionsList(opts, "Service", "InaccessiblePaths", "-", pa.relAppPaths(pa.hiddenPaths)...)
+			opts = appendOptionsList(opts, "Service", "InaccessiblePaths", "-", pa.relAppPaths(pa.hiddenDirs)...)
+			opts = appendOptionsList(opts, "Service", "ReadOnlyPaths", "-", pa.relAppPaths(pa.roPaths)...)
+		} else {
+			opts = appendOptionsList(opts, "Service", "InaccessibleDirectories", "-", pa.relAppPaths(pa.hiddenDirs)...)
+			opts = appendOptionsList(opts, "Service", "ReadOnlyDirectories", "-", pa.relAppPaths(pa.roPaths)...)
+		}
+
+		if systemdVersion >= 233 {
+			opts = append(opts, unit.NewUnitOption("Service", "ProtectKernelTunables", "true"))
+		}
 
 		// MountFlags=shared creates a new mount namespace and (as unintuitive
 		// as it might seem) makes sure the mount is slave+shared.
@@ -454,10 +464,10 @@ func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*un
 	// For kvm flavor, devices are VM-specific and restricting them is not strictly needed.
 	if !uw.p.InsecureOptions.DisablePaths && flavor != "kvm" {
 		opts = append(opts, unit.NewUnitOption("Service", "DevicePolicy", "closed"))
-		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(podAbsRoot), appName, app.MountPoints, mounts, &uw.p.UidRange)
+		deviceAllows, err := generateDeviceAllows(common.Stage1RootfsPath(podAbsRoot), appName, app.MountPoints, pa.mounts, &uw.p.UidRange)
 		if err != nil {
 			uw.err = err
-			return
+			return nil
 		}
 		for _, dev := range deviceAllows {
 			opts = append(opts, unit.NewUnitOption("Service", "DeviceAllow", dev))
@@ -473,82 +483,34 @@ func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*un
 			typ = "ExecStopPost"
 		default:
 			uw.err = fmt.Errorf("unrecognized eventHandler: %v", eh.Name)
-			return
+			return nil
 		}
 		exec := quoteExec(eh.Exec)
 		opts = append(opts, unit.NewUnitOption("Service", typ, exec))
 	}
 
-	// Some pre-start jobs take a long time, set the timeout to 0
-	opts = append(opts, unit.NewUnitOption("Service", "TimeoutStartSec", "0"))
+	// Resource isolators
+	if pa.resources.MemoryLimit != nil {
+		opts = append(opts, unit.NewUnitOption("Service", "MemoryLimit", strconv.FormatUint(*pa.resources.MemoryLimit, 10)))
+	}
+	if pa.resources.CPUQuota != nil {
+		quota := strconv.FormatUint(*pa.resources.CPUQuota, 10) + "%"
+		opts = append(opts, unit.NewUnitOption("Service", "CPUQuota", quota))
+	}
+	if pa.resources.LinuxCPUShares != nil {
+		opts = append(opts, unit.NewUnitOption("Service", "CPUShares", strconv.FormatUint(*pa.resources.LinuxCPUShares, 10)))
+	}
+	if pa.resources.LinuxOOMScoreAdjust != nil {
+		opts = append(opts, unit.NewUnitOption("Service", "OOMScoreAdjust", strconv.Itoa(*pa.resources.LinuxOOMScoreAdjust)))
+	}
 
 	var saPorts []types.Port
-	for _, p := range app.Ports {
+	for _, p := range ra.App.Ports {
 		if p.SocketActivated {
 			saPorts = append(saPorts, p)
 		}
 	}
 
-	doWithIsolator := func(isolator string, f func() error) bool {
-		ok, err := cgroup.IsIsolatorSupported(isolator)
-		if err != nil {
-			uw.err = err
-			return true
-		}
-
-		if !ok {
-			fmt.Fprintf(os.Stderr, "warning: resource/%s isolator set but support disabled in the kernel, skipping\n", isolator)
-		}
-
-		if err := f(); err != nil {
-			uw.err = err
-			return true
-		}
-
-		return false
-	}
-
-	exit := false
-	for _, i := range app.Isolators {
-		if exit {
-			return
-		}
-
-		switch v := i.Value().(type) {
-		case *types.ResourceMemory:
-			exit = doWithIsolator("memory", func() error {
-				if v.Limit() == nil {
-					return nil
-				}
-
-				opts = append(opts, unit.NewUnitOption("Service", "MemoryLimit", strconv.Itoa(int(v.Limit().Value()))))
-				return nil
-			})
-		case *types.ResourceCPU:
-			exit = doWithIsolator("cpu", func() error {
-				if v.Limit() == nil {
-					return nil
-				}
-
-				if v.Limit().Value() > MaxMilliValue {
-					return fmt.Errorf("cpu limit exceeds the maximum millivalue: %v", v.Limit().String())
-				}
-
-				quota := strconv.Itoa(int(v.Limit().MilliValue()/10)) + "%"
-				opts = append(opts, unit.NewUnitOption("Service", "CPUQuota", quota))
-
-				return nil
-			})
-		case *types.LinuxOOMScoreAdj:
-			opts = append(opts, unit.NewUnitOption("Service", "OOMScoreAdjust", strconv.Itoa(int(*v))))
-		case *types.LinuxCPUShares:
-			exit = doWithIsolator("cpu", func() error {
-				opts = append(opts, unit.NewUnitOption("Service", "CPUShares", strconv.Itoa(int(*v))))
-				return nil
-			})
-		}
-	}
-
 	if len(saPorts) > 0 {
 		sockopts := []*unit.UnitOption{
 			unit.NewUnitOption("Unit", "Description", fmt.Sprintf("Application=%v Image=%v %s", appName, imgName, "socket-activated ports")),
@@ -566,7 +528,7 @@ func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*un
 				proto = "ListenDatagram"
 			default:
 				uw.err = fmt.Errorf("unrecognized protocol: %v", sap.Protocol)
-				return
+				return nil
 			}
 			// We find the host port for the pod's port and use that in the
 			// socket unit file.
@@ -584,30 +546,23 @@ func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*un
 		file, err := os.OpenFile(SocketUnitPath(uw.p.Root, appName), os.O_WRONLY|os.O_CREATE, 0644)
 		if err != nil {
 			uw.err = errwrap.Wrap(errors.New("failed to create socket file"), err)
-			return
+			return nil
 		}
 		defer file.Close()
 
 		if _, err = io.Copy(file, unit.Serialize(sockopts)); err != nil {
 			uw.err = errwrap.Wrap(errors.New("failed to write socket unit file"), err)
-			return
+			return nil
 		}
 
 		if err = os.Symlink(path.Join("..", SocketUnitName(appName)), SocketWantPath(uw.p.Root, appName)); err != nil {
 			uw.err = errwrap.Wrap(errors.New("failed to link socket want"), err)
-			return
+			return nil
 		}
 
 		opts = append(opts, unit.NewUnitOption("Unit", "Requires", SocketUnitName(appName)))
 	}
-
-	opts = append(opts, unit.NewUnitOption("Unit", "Requires", InstantiatedPrepareAppUnitName(appName)))
-	opts = append(opts, unit.NewUnitOption("Unit", "After", InstantiatedPrepareAppUnitName(appName)))
-	opts = append(opts, unit.NewUnitOption("Unit", "Requires", "sysusers.service"))
-	opts = append(opts, unit.NewUnitOption("Unit", "After", "sysusers.service"))
-
-	uw.WriteUnit(ServiceUnitPath(uw.p.Root, appName), "failed to create service unit file", opts...)
-	uw.Activate(ServiceUnitName(appName), ServiceWantPath(uw.p.Root, appName))
+	return opts
 }
 
 // AppReaperUnit writes an app reaper service unit for the given app in the given path using the given unit options.
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 05270ae5d4..d74c1907a8 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -103,7 +103,6 @@ func mirrorLocalZoneInfo(root string) {
 
 var (
 	debug       bool
-	interactive bool
 	localhostIP net.IP
 	localConfig string
 	log         *rktlog.Logger
@@ -115,10 +114,10 @@ func parseFlags() *stage1commontypes.RuntimePod {
 	rp := stage1commontypes.RuntimePod{}
 
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
-	flag.BoolVar(&interactive, "interactive", false, "The pod is interactive")
 	flag.StringVar(&localConfig, "local-config", common.DefaultLocalConfigDir, "Local config path")
 
 	// These flags are persisted in the PodRuntime
+	flag.BoolVar(&rp.Interactive, "interactive", false, "The pod is interactive")
 	flag.BoolVar(&rp.Mutable, "mutable", false, "Enable mutable operations on this pod, including starting an empty one")
 	flag.Var(&rp.NetList, "net", "Setup networking")
 	flag.StringVar(&rp.PrivateUsers, "private-users", "", "Run within user namespace. Can be set to [=UIDBASE[:NUIDS]]")
@@ -626,7 +625,7 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 			log.FatalE("cannot initialize mutable environment", err)
 		}
 	} else {
-		if err = stage1initcommon.ImmutableEnv(p, interactive); err != nil {
+		if err = stage1initcommon.ImmutableEnv(p); err != nil {
 			log.FatalE("cannot initialize immutable environment", err)
 		}
 	}
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index e301df006a..2b9c68b00b 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -414,7 +414,7 @@ func (c testCmd) CombinedOutput(t *testing.T) string {
 	out, err := c.Cmd.CombinedOutput()
 
 	if err != nil {
-		t.Fatal(err, "output", out)
+		t.Fatal(err, "output", string(out))
 	}
 
 	return string(out)

From 3535a6893c6555f0a59853af07aebb160f09d984 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 17 Jan 2017 06:36:21 +0100
Subject: [PATCH 1014/1304] pkg: add filepath.EvalSymlinksAlways

This adds a new method for resolving symlinks.

This is needed for #3483
---
 pkg/fileutil/symlink.go | 122 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 pkg/fileutil/symlink.go

diff --git a/pkg/fileutil/symlink.go b/pkg/fileutil/symlink.go
new file mode 100644
index 0000000000..7e05d9cf13
--- /dev/null
+++ b/pkg/fileutil/symlink.go
@@ -0,0 +1,122 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package fileutil
+
+import (
+	"errors"
+	"os"
+	"path/filepath"
+)
+
+// The following code was taken from "src/path/filepath/symlink.go" from Go 1.7.4.
+// Modifications include:
+// - remove Windows specific code
+// - continue evaluatig paths, even if they don't exist
+
+// Original copyright notice:
+//
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+func isRoot(path string) bool {
+	return path == "/"
+}
+
+func walkLink(path string, linksWalked *int) (newpath string, islink bool, err error) {
+	if *linksWalked > 255 {
+		return "", false, errors.New("EvalSymlinks: too many links")
+	}
+	fi, err := os.Lstat(path)
+	if os.IsNotExist(err) {
+		return path, false, nil
+	}
+	if err != nil {
+		return "", false, err
+	}
+	if fi.Mode()&os.ModeSymlink == 0 {
+		return path, false, nil
+	}
+	newpath, err = os.Readlink(path)
+	if err != nil {
+		return "", false, err
+	}
+	*linksWalked++
+	return newpath, true, nil
+}
+
+func walkLinks(path string, linksWalked *int) (string, error) {
+	dir, file := filepath.Split(path)
+
+	switch {
+	case dir == "":
+		newpath, _, err := walkLink(file, linksWalked)
+		return newpath, err
+	case file == "":
+		if os.IsPathSeparator(dir[len(dir)-1]) {
+			if isRoot(dir) {
+				return dir, nil
+			}
+			return walkLinks(dir[:len(dir)-1], linksWalked)
+		}
+		newpath, _, err := walkLink(dir, linksWalked)
+		return newpath, err
+	default:
+		newdir, err := walkLinks(dir, linksWalked)
+		if err != nil {
+			return "", err
+		}
+		newpath, islink, err := walkLink(filepath.Join(newdir, file), linksWalked)
+		if err != nil {
+			return "", err
+		}
+		if !islink {
+			return newpath, nil
+		}
+		if filepath.IsAbs(newpath) || os.IsPathSeparator(newpath[0]) {
+			return newpath, nil
+		}
+		return filepath.Join(newdir, newpath), nil
+	}
+}
+
+func walkSymlinks(path string) (string, error) {
+	if path == "" {
+		return path, nil
+	}
+	var linksWalked int // to protect against cycles
+	for {
+		i := linksWalked
+		newpath, err := walkLinks(path, &linksWalked)
+		if err != nil {
+			return "", err
+		}
+		if i == linksWalked {
+			return filepath.Clean(newpath), nil
+		}
+		path = newpath
+	}
+}
+
+// EvalSymlinksAlways behaves like filepath.EvalSymlinks
+// but does not require that all path components must exist.
+//
+// While filepath.EvalSymlink behaves like `readlink -e`
+// this function behaves like `readlink -m`.
+//
+// Unlike `readlink` EvalSymlinksAlways might return a relative path.
+func EvalSymlinksAlways(path string) (string, error) {
+	return walkSymlinks(path)
+}

From c30f4fd2dbb2f1937abbb79a5fd4d915f2e9a650 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 17 Jan 2017 06:36:32 +0100
Subject: [PATCH 1015/1304] sandbox/app-add: fix mount targets with absolute
 symlink targets

Currently resolving symlinks in stage1 is broken for a couple of edge
cases, most prominently absolute symlinks which escape the stage2
rootfs.

This fixes it by evaluating symlinks in chroot'ed environment in the
stage2 rootfs.

Fixes #3483
---
 stage0/app_add.go                |   1 +
 stage0/common.go                 |   3 +-
 stage1/app_add/app_add.go        | 355 +++++++++++++++++++++++++++++--
 stage1/init/common/app.go        |   2 +-
 stage1/init/common/mount.go      | 198 ++---------------
 stage1/init/common/mount_test.go |   8 +-
 stage1/init/common/pod.go        | 114 ++++++----
 tests/functional.mk              |  17 +-
 tests/rkt_mount_overlay_test.go  |   8 +-
 tests/rkt_mount_test.go          |  62 +++++-
 10 files changed, 502 insertions(+), 266 deletions(-)

diff --git a/stage0/app_add.go b/stage0/app_add.go
index 0f25cf9912..13bc543d94 100644
--- a/stage0/app_add.go
+++ b/stage0/app_add.go
@@ -235,6 +235,7 @@ func AddApp(cfg AddConfig) error {
 		EntrypointArgs: args,
 		Interactive:    false,
 	}
+
 	if err := ce.Run(); err != nil {
 		return err
 	}
diff --git a/stage0/common.go b/stage0/common.go
index 1643ff1a20..5009b724f5 100644
--- a/stage0/common.go
+++ b/stage0/common.go
@@ -89,8 +89,9 @@ func (ce CrossingEntrypoint) Run() error {
 		if len(out) > 0 {
 			debug("%s\n", out)
 		}
+
 		if err != nil {
-			return fmt.Errorf("error executing stage1 entrypoint: %v", err)
+			return errwrap.Wrapf("error executing stage1 entrypoint", err)
 		}
 	}
 
diff --git a/stage1/app_add/app_add.go b/stage1/app_add/app_add.go
index 707612c918..dd70dca5de 100644
--- a/stage1/app_add/app_add.go
+++ b/stage1/app_add/app_add.go
@@ -18,39 +18,56 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"reflect"
+	"runtime"
+	"strconv"
+	"syscall"
 
 	"github.com/coreos/go-systemd/unit"
+	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/pkg/fs"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1types "github.com/coreos/rkt/stage1/common/types"
-	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+	stage1init "github.com/coreos/rkt/stage1/init/common"
+	"github.com/hashicorp/errwrap"
 
+	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 )
 
 var (
-	flagApp  string
-	flagUUID string
-	debug    bool
-	log      *rktlog.Logger
-	diag     *rktlog.Logger
+	flagApp    string
+	flagUUID   string
+	flagStage  int
+	flagTarget string
+
+	debug bool
+	log   *rktlog.Logger
+	diag  *rktlog.Logger
 )
 
 func init() {
 	flag.StringVar(&flagApp, "app", "", "Application name")
 	flag.StringVar(&flagUUID, "uuid", "", "Pod UUID")
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+
+	// `--stage` is an internal implementation detail, not part of stage1 contract
+	flag.IntVar(&flagStage, "stage", 0, "app add stage, defaults to 0 when called from the outside")
+	flag.StringVar(&flagTarget, "target", "", "the target mount point. this is only relevant for -stage=1")
 }
 
 func main() {
 	flag.Parse()
 
-	stage1initcommon.InitDebug(debug)
+	stage1init.InitDebug(debug)
 
-	log, diag, _ = rktlog.NewLogSet("app-add", debug)
+	log, diag, _ = rktlog.NewLogSet("stage"+strconv.Itoa(flagStage)+": app-add", debug)
 	if !debug {
 		diag.SetOutput(ioutil.Discard)
 	}
@@ -65,20 +82,40 @@ func main() {
 		log.FatalE("invalid app name", err)
 	}
 
-	root := "."
+	switch flagStage {
+	case 0:
+		err = appAddStage0(appName, uuid)
+	case 1:
+		err = appAddStage1(appName, uuid, flagTarget)
+	default:
+		log.Fatalf("unknown stage %d", flagStage)
+	}
+
+	if err != nil {
+		log.FatalE("app add failed", err)
+	}
+
+	os.Exit(0)
+}
+
+func appAddStage0(appName *types.ACName, uuid *types.UUID) error {
+	root, err := os.Getwd()
+	if err != nil {
+		return errwrap.Wrapf("failed to determine current directory", err)
+	}
 	p, err := stage1types.LoadPod(root, uuid, nil)
 	if err != nil {
-		log.FatalE("failed to load pod", err)
+		return errwrap.Wrapf("failed to load pod", err)
 	}
 
 	ra := p.Manifest.Apps.Get(*appName)
 	if ra == nil {
-		log.Fatalf("failed to find app %q", *appName)
+		return fmt.Errorf("failed to find app %q", *appName)
 	}
 
-	binPath, err := stage1initcommon.FindBinPath(p, ra)
+	binPath, err := stage1init.FindBinPath(p, ra)
 	if err != nil {
-		log.FatalE("failed to find bin path", err)
+		return errwrap.Wrapf("failed to find bin path", err)
 	}
 
 	if ra.App.WorkingDirectory == "" {
@@ -86,13 +123,13 @@ func main() {
 	}
 
 	enterCmd := stage1common.PrepareEnterCmd(false)
-	err = stage1initcommon.AppAddMounts(p, ra, enterCmd)
+	err = addMountsStage0(p, ra, enterCmd)
 	if err != nil {
-		log.FatalE("error adding app mounts", err)
+		return errwrap.Wrapf("adding mounts failed", err)
 	}
 
 	// write service files
-	w := stage1initcommon.NewUnitWriter(p)
+	w := stage1init.NewUnitWriter(p)
 	w.AppUnit(ra, binPath,
 		unit.NewUnitOption("Unit", "Before", "halt.target"),
 		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
@@ -101,7 +138,7 @@ func main() {
 	)
 	w.AppReaperUnit(ra.Name, binPath)
 	if err := w.Error(); err != nil {
-		log.FatalE("error generating app units", err)
+		return errwrap.Wrapf("error generating app units", err)
 	}
 
 	// stage2 environment is ready at this point, but systemd does not know
@@ -115,9 +152,287 @@ func main() {
 		Args: args,
 	}
 
-	if out, err := cmd.CombinedOutput(); err != nil {
-		log.Fatalf("%q failed at daemon-reload:\n%s", appName, out)
+	out, err := cmd.CombinedOutput()
+	diag.Printf("systemctl daemon-reload output:\n%s\n", out)
+	if err != nil {
+		return errwrap.Wrapf(fmt.Sprintf("daemon reload of %s failed", appName), err)
 	}
 
-	os.Exit(0)
+	return nil
+}
+
+// addMountStage0 iterates over all requested mounts and bind mounts them to the stage2 rootfs.
+func addMountsStage0(p *stage1types.Pod, ra *schema.RuntimeApp, enterCmd []string) error {
+	sharedVolPath, err := common.CreateSharedVolumesPath(p.Root)
+	if err != nil {
+		return err
+	}
+
+	vols := make(map[types.ACName]types.Volume)
+	for _, v := range p.Manifest.Volumes {
+		vols[v.Name] = v
+	}
+
+	imageManifest := p.Images[ra.Name.String()]
+
+	mounts, err := stage1init.GenerateMounts(ra, p.Manifest.Volumes, stage1init.ConvertedFromDocker(imageManifest))
+	if err != nil {
+		return errwrap.Wrapf("could not generate mounts", err)
+	}
+
+	absRoot, err := filepath.Abs(p.Root)
+	if err != nil {
+		return errwrap.Wrapf("could not determine pod's absolute path", err)
+	}
+
+	appRootfs := common.AppRootfsPath(absRoot, ra.Name)
+
+	// This logic is mostly copied from appToNspawnArgs
+	// TODO(cdc): deduplicate
+	for _, m := range mounts {
+		shPath := filepath.Join(sharedVolPath, m.Volume.Name.String())
+
+		// Evaluate symlinks within the app's rootfs - otherwise absolute
+		// symlinks will be wrong.
+		mntPath, err := stage1init.EvaluateSymlinksInsideApp(appRootfs, m.Mount.Path)
+		if err != nil {
+			return errwrap.Wrap(fmt.Errorf("could not evaluate path %v", m.Mount.Path), err)
+		}
+
+		// Create the stage1 destination
+		if err := stage1init.PrepareMountpoints(shPath, filepath.Join(appRootfs, mntPath), &m.Volume, m.DockerImplicit); err != nil {
+			return errwrap.Wrapf("could not prepare mountpoint", err)
+		}
+
+		err = addMountStage0(p, ra, &m, mntPath, enterCmd)
+		if err != nil {
+			return errwrap.Wrap(fmt.Errorf("error adding mount volume %v path %v", m.Mount.Volume, m.Mount.Path), err)
+		}
+	}
+	return nil
+}
+
+// addMountStage1 bind-mounts (moves) the given mount from the host in the container.
+//
+// We use the propagation mechanism of systemd-nspawn. In all systemd-nspawn
+// containers, the directory "/run/systemd/nspawn/propagate/$MACHINE_ID" on
+// the host is propagating mounts to the directory
+// "/run/systemd/nspawn/incoming/" in the container mount namespace. Once a
+// bind mount is propagated, we simply move to its correct location.
+//
+// The algorithm is the same as in "machinectl bind":
+// https://github.com/systemd/systemd/blob/v231/src/machine/machine-dbus.c#L865
+// except that we don't use setns() to enter the mount namespace of the pod
+// because Linux does not allow multithreaded applications (such as Go
+// programs) to change mount namespaces with setns. Instead, we fork another
+// process written in C (single-threaded) to enter the mount namespace. The
+// command used is specified by the "enterCmd" parameter.
+//
+// Users might request a bind mount to be set up read-only. This complicates
+// things a bit because on Linux, setting up a read-only bind mount involves
+// two mount() calls, so it is not atomic. We don't want the container to see
+// the mount in read-write mode, even for a short time, so we don't create the
+// bind mount directly in "/run/systemd/nspawn/propagate/$MACHINE_ID" to avoid
+// an immediate propagation to the container. Instead, we create a temporary
+// playground in "/tmp/rkt.propagate.XXXX" and create the bind mount in
+// "/tmp/rkt.propagate.XXXX/mount" with the correct read-only attribute before
+// moving it.
+//
+// Another complication is that the playground cannot be on a shared mount
+// because Linux does not allow MS_MOVE to be applied to mounts with MS_SHARED
+// parent mounts. But by default, systemd mounts everything as shared, see:
+// https://github.com/systemd/systemd/blob/v231/src/core/mount-setup.c#L392
+// We set up the temporary playground as a slave bind mount to avoid this
+// limitation.
+func addMountStage0(
+	p *stage1types.Pod, ra *schema.RuntimeApp,
+	m *stage1init.Mount, target string,
+	enterCmd []string,
+) error {
+	mnt := fs.NewLoggingMounter(
+		fs.MounterFunc(syscall.Mount),
+		fs.UnmounterFunc(syscall.Unmount),
+		log.Printf,
+	)
+
+	hostPodRoot, err := filepath.Abs(p.Root)
+	if err != nil {
+		return errwrap.Wrapf("error reading absolute pod root path", err)
+	}
+
+	src := m.Source(hostPodRoot)
+	warn := warner(diag.Printf)
+
+	pg, err := newPlayground(src, "", "rkt.propagate.stage1", mnt)
+	if err != nil {
+		return errwrap.Wrapf("error creating stage1 playground", err)
+	}
+	defer warn(pg.Cleanup)
+
+	err = mnt.Mount(src, pg.Playground(), "bind", syscall.MS_BIND, "")
+	if err != nil {
+		return errwrap.Wrapf("bind mount src to rkt.propagate.stage1/mount failed", err)
+	}
+
+	if m.ReadOnly {
+		err = mnt.Mount("", pg.Playground(), "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
+		if err != nil {
+			return errwrap.Wrapf("remount of rkt.propagate.stage1/mount failed", err)
+		}
+	}
+
+	// move mount it to the propagation directory prepared by systemd-nspawn
+	propagate := filepath.Join("/run/systemd/nspawn/propagate/", "rkt-"+p.UUID.String(), "rkt.mount")
+	if err := stage1init.EnsureTargetExists(src, propagate); err != nil {
+		return errwrap.Wrapf("error creating propagate mountpoint", err)
+	}
+	defer warn(func() error { return os.Remove(propagate) })
+
+	err = mnt.Mount(pg.Playground(), propagate, "", syscall.MS_MOVE, "")
+	if err != nil {
+		return errwrap.Wrapf("error moving temporary mountpoint to propagate directory", err)
+	}
+	defer warn(func() error { return mnt.Unmount(propagate, 0) })
+
+	// enter stage1
+	args := append(enterCmd,
+		"/app_add", "-stage=1",
+		"-debug="+strconv.FormatBool(debug),
+		"-uuid="+p.UUID.String(),
+		"-app="+ra.Name.String(),
+		"-target="+target,
+	)
+
+	diag.Printf("entering stage1 %q", args)
+
+	cmd := exec.Cmd{
+		Path: args[0],
+		Args: args,
+	}
+
+	out, err := cmd.CombinedOutput()
+	diag.Printf("stage1 output:\n%s\n", out)
+	if err != nil {
+		return errwrap.Wrapf("app-add in stage1 failed", err)
+	}
+
+	return nil
+}
+
+// appAddStage1 bind mounts the incoming mount /run/systemd/nspawn/incoming/rkt.mount
+// to the final target inside the stage2 rootfs.
+//
+// It is assumed that it is executed in the mount namespace of stage1.
+// We chroot into the stage2 rootfs and the incoming mount is bind mounted to the actual target.
+func appAddStage1(appName *types.ACName, uuid *types.UUID, target string) error {
+	mnt := fs.NewLoggingMounter(
+		fs.MounterFunc(syscall.Mount),
+		fs.UnmounterFunc(syscall.Unmount),
+		log.Printf,
+	)
+	appRoot := filepath.Join("/opt/stage2", appName.String(), "rootfs")
+	target = filepath.Join(appRoot, target)
+	incoming := "/run/systemd/nspawn/incoming/rkt.mount"
+
+	if err := stage1init.EnsureTargetExists(incoming, target); err != nil {
+		return errwrap.Wrapf("ensuring "+target+" failed", err)
+	}
+
+	if err := mnt.Mount(incoming, target, "", syscall.MS_MOVE, ""); err != nil {
+		return errwrap.Wrapf("mount move "+incoming+" to "+target+" failed", err)
+	}
+
+	return nil
+}
+
+// warner enables printing a warning message in case a function call fails.
+// Given the warnf function (compatible with fmt.Printf) for printing warning messages it returns the actual warner.
+// The returned warner takes a possibly failing function "func() error" and prints a warning in case it failed.
+// The actual error is ignored.
+//
+// Example usage:
+//
+//  warn := warner(log.Printf)
+//  file, err := os.Open("file")
+//  if err != nil { return err }
+//  // do stuff
+//  defer warn(file.Close)
+func warner(warnf func(string, ...interface{})) func(func() error) {
+	return func(f func() error) {
+		if err := f(); err != nil {
+			caller := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
+			warnf("%s failed: %v\n", caller, err)
+		}
+	}
+}
+
+// playground is the struct that represents a directory (or file)
+// which can be moved to new locations using syscall.MS_MOVE
+// even in environments marked as MS_SHARED (i.e. systemd based systems).
+//
+// This is ensured by creating a directory which is bind-mounted over itself
+// and marked as a slave mount.
+//
+// The caller is responsible for calling Cleanup() after move operations.
+type playground struct {
+	tmpDir     string // the directory the playground resides in
+	playground string // the full path to the playground
+
+	mnt fs.MountUnmounter
+}
+
+// newPlayground creates a playground directory (or file) in the given directory dir with a name beginning with prefix.
+// If dir is empty string, newPlayground uses the default directory for temporary files (see os.TempDir).
+// The playground type (file or directory) is equal to the type of the type of src.
+// The playground can be moved to a new location using syscall.MS_MOVE.
+// Use the Playground() method to get the full playground path.
+func newPlayground(src, dir, prefix string, mnt fs.MountUnmounter) (*playground, error) {
+	p := playground{
+		mnt: mnt,
+	}
+
+	var err error
+	p.tmpDir, err = ioutil.TempDir(dir, prefix+".")
+	if err != nil {
+		return nil, errwrap.Wrapf("creating temporary "+prefix+" failed", err)
+	}
+	// removed in Cleanup
+
+	err = p.mnt.Mount(p.tmpDir, p.tmpDir, "bind", syscall.MS_BIND, "")
+	if err != nil {
+		return nil, errwrap.Wrapf("bind mount of "+prefix+" failed", err)
+	}
+	// unmounted in Cleanup
+
+	err = mnt.Mount("", p.tmpDir, "none", syscall.MS_SLAVE, "")
+	if err != nil {
+		return nil, errwrap.Wrapf("slave mount of "+prefix+" failed", err)
+	}
+
+	p.playground = filepath.Join(p.tmpDir, "playground")
+	if err := stage1init.EnsureTargetExists(src, p.playground); err != nil {
+		return nil, errwrap.Wrapf("creating rkt.propagate.stage2/mount failed", err)
+	}
+	// removed in Cleanup
+
+	return &p, nil
+}
+
+// Playground returns its full path.
+func (p *playground) Playground() string {
+	return p.playground
+}
+
+// Cleanup cleans up the playground.
+// It removes it, unmounts the parent directory, and removes the unmounted directory.
+func (p *playground) Cleanup() error {
+	if err := os.Remove(p.playground); err != nil {
+		return err
+	}
+
+	if err := p.mnt.Unmount(p.tmpDir, 0); err != nil {
+		return err
+	}
+
+	return os.Remove(p.tmpDir)
 }
diff --git a/stage1/init/common/app.go b/stage1/init/common/app.go
index f2b431aa64..c2a3fcacfc 100644
--- a/stage1/init/common/app.go
+++ b/stage1/init/common/app.go
@@ -40,7 +40,7 @@ type preparedApp struct {
 	gid             uint32
 	env             types.Environment
 	resources       appResources
-	mounts          []mountWrapper
+	mounts          []Mount
 	noNewPrivileges bool
 	capabilities    []string
 	seccomp         *seccompFilter
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index c1f2ffa89d..0647c35427 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -17,9 +17,7 @@ package common
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strconv"
 	"syscall"
@@ -32,8 +30,6 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
-
-	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
 )
 
 /*
@@ -42,10 +38,10 @@ import (
  * TODO(cdc) De-duplicate code from stage0/gc.go
  */
 
-// mountWrapper is a wrapper around a schema.Mount with an additional field indicating
-// whether it is an implicit empty volume converted from a Docker image.
-type mountWrapper struct {
-	Mount          schema.Mount
+// Mount extends schema.Mount with additional rkt specific fields.
+type Mount struct {
+	schema.Mount
+
 	Volume         types.Volume
 	DockerImplicit bool
 	ReadOnly       bool
@@ -65,7 +61,7 @@ func ConvertedFromDocker(im *schema.ImageManifest) bool {
 
 // Source computes the real volume source for a volume.
 // Volumes of type 'empty' use a workdir relative to podRoot
-func (m *mountWrapper) Source(podRoot string) string {
+func (m *Mount) Source(podRoot string) string {
 	switch m.Volume.Kind {
 	case "host":
 		return m.Volume.Source
@@ -78,10 +74,10 @@ func (m *mountWrapper) Source(podRoot string) string {
 // GenerateMounts maps MountPoint paths to volumes, returning a list of mounts,
 // each with a parameter indicating if it's an implicit empty volume from a
 // Docker image.
-func GenerateMounts(ra *schema.RuntimeApp, podVolumes []types.Volume, convertedFromDocker bool) ([]mountWrapper, error) {
+func GenerateMounts(ra *schema.RuntimeApp, podVolumes []types.Volume, convertedFromDocker bool) ([]Mount, error) {
 	app := ra.App
 
-	var genMnts []mountWrapper
+	var genMnts []Mount
 
 	vols := make(map[types.ACName]types.Volume)
 	for _, v := range podVolumes {
@@ -129,7 +125,7 @@ func GenerateMounts(ra *schema.RuntimeApp, podVolumes []types.Volume, convertedF
 			return nil, fmt.Errorf("Volume %s has invalid kind %s", vol.Name, vol.Kind)
 		}
 		genMnts = append(genMnts,
-			mountWrapper{
+			Mount{
 				Mount:          m,
 				DockerImplicit: false,
 				ReadOnly:       ro,
@@ -169,7 +165,7 @@ func GenerateMounts(ra *schema.RuntimeApp, podVolumes []types.Volume, convertedF
 
 			vols[uniqName] = emptyVol
 			genMnts = append(genMnts,
-				mountWrapper{
+				Mount{
 					Mount: schema.Mount{
 						Volume: uniqName,
 						Path:   mp.Path,
@@ -184,7 +180,7 @@ func GenerateMounts(ra *schema.RuntimeApp, podVolumes []types.Volume, convertedF
 				ro = *vol.ReadOnly
 			}
 			genMnts = append(genMnts,
-				mountWrapper{
+				Mount{
 					Mount: schema.Mount{
 						Volume: vol.Name,
 						Path:   mp.Path,
@@ -256,9 +252,9 @@ func BindMount(mnt fs.MountUnmounter, source, destination string, readOnly bool)
 		return errwrap.Wrap(fmt.Errorf("Could not resolve symlink for source %v", source), err)
 	}
 
-	if err := ensureDestinationExists(absSource, destination); err != nil {
+	if err := EnsureTargetExists(absSource, destination); err != nil {
 		return errwrap.Wrap(fmt.Errorf("Could not create destination mount point: %v", destination), err)
-	} else if err := syscall.Mount(absSource, destination, "bind", syscall.MS_BIND, ""); err != nil {
+	} else if err := mnt.Mount(absSource, destination, "bind", syscall.MS_BIND, ""); err != nil {
 		return errwrap.Wrap(fmt.Errorf("Could not bind mount %v to %v", absSource, destination), err)
 	}
 	if readOnly {
@@ -273,9 +269,9 @@ func BindMount(mnt fs.MountUnmounter, source, destination string, readOnly bool)
 	return nil
 }
 
-// ensureDestinationExists will recursively create a given mountpoint. If directories
+// EnsureTargetExists will recursively create a given mountpoint. If directories
 // are created, their permissions are initialized to common.SharedVolumePerm
-func ensureDestinationExists(source, destination string) error {
+func EnsureTargetExists(source, destination string) error {
 	fileInfo, err := os.Stat(source)
 	if err != nil {
 		return errwrap.Wrap(fmt.Errorf("could not stat source location: %v", source), err)
@@ -299,169 +295,3 @@ func ensureDestinationExists(source, destination string) error {
 	}
 	return nil
 }
-
-func AppAddMounts(p *stage1commontypes.Pod, ra *schema.RuntimeApp, enterCmd []string) error {
-	sharedVolPath, err := common.CreateSharedVolumesPath(p.Root)
-	if err != nil {
-		return err
-	}
-
-	vols := make(map[types.ACName]types.Volume)
-	for _, v := range p.Manifest.Volumes {
-		vols[v.Name] = v
-	}
-
-	imageManifest := p.Images[ra.Name.String()]
-
-	mounts, err := GenerateMounts(ra, p.Manifest.Volumes, ConvertedFromDocker(imageManifest))
-	if err != nil {
-		log.FatalE("Could not generate mounts", err)
-		os.Exit(254)
-	}
-
-	absRoot, err := filepath.Abs(p.Root)
-	if err != nil {
-		log.FatalE("could not determine pod's absolute path", err)
-	}
-
-	appRootfs := common.AppRootfsPath(absRoot, ra.Name)
-
-	// This logic is mostly copied from appToNspawnArgs
-	// TODO(cdc): deduplicate
-	for _, m := range mounts {
-		shPath := filepath.Join(sharedVolPath, m.Volume.Name.String())
-
-		// Evaluate symlinks within the app's rootfs - otherwise absolute
-		// symlinks will be wrong.
-		mntPath, err := EvaluateSymlinksInsideApp(appRootfs, m.Mount.Path)
-		if err != nil {
-			log.Fatalf("Could not evaluate path %v: %v", m.Mount.Path, err)
-		}
-		mntAbsPath := filepath.Join(appRootfs, mntPath)
-		// Create the stage1 destination
-		if err := PrepareMountpoints(shPath, mntAbsPath, &m.Volume, m.DockerImplicit); err != nil {
-			log.FatalE("could not prepare mountpoint", err)
-		}
-		err = AppAddOneMount(p, ra, m.Source(absRoot), m.Mount.Path, m.ReadOnly, enterCmd)
-		if err != nil {
-			log.FatalE("Unable to setup app mounts", err)
-		}
-	}
-	return nil
-}
-
-/* AppAddOneMount bind-mounts "sourcePath" from the host into "dstPath" in
- * the container.
- *
- * We use the propagation mechanism of systemd-nspawn. In all systemd-nspawn
- * containers, the directory "/run/systemd/nspawn/propagate/$MACHINE_ID" on
- * the host is propagating mounts to the directory
- * "/run/systemd/nspawn/incoming/" in the container mount namespace. Once a
- * bind mount is propagated, we simply move to its correct location.
- *
- * The algorithm is the same as in "machinectl bind":
- * https://github.com/systemd/systemd/blob/v231/src/machine/machine-dbus.c#L865
- * except that we don't use setns() to enter the mount namespace of the pod
- * because Linux does not allow multithreaded applications (such as Go
- * programs) to change mount namespaces with setns. Instead, we fork another
- * process written in C (single-threaded) to enter the mount namespace. The
- * command used is specified by the "enterCmd" parameter.
- *
- * Users might request a bind mount to be set up read-only. This complicates
- * things a bit because on Linux, setting up a read-only bind mount involves
- * two mount() calls, so it is not atomic. We don't want the container to see
- * the mount in read-write mode, even for a short time, so we don't create the
- * bind mount directly in "/run/systemd/nspawn/propagate/$MACHINE_ID" to avoid
- * an immediate propagation to the container. Instead, we create a temporary
- * playground in "/tmp/rkt.propagate.XXXX" and create the bind mount in
- * "/tmp/rkt.propagate.XXXX/mount" with the correct read-only attribute before
- * moving it.
- *
- * Another complication is that the playground cannot be on a shared mount
- * because Linux does not allow MS_MOVE to be applied to mounts with MS_SHARED
- * parent mounts. But by default, systemd mounts everything as shared, see:
- * https://github.com/systemd/systemd/blob/v231/src/core/mount-setup.c#L392
- * We set up the temporary playground as a slave bind mount to avoid this
- * limitation.
- */
-func AppAddOneMount(p *stage1commontypes.Pod, ra *schema.RuntimeApp, sourcePath string, dstPath string, readOnly bool, enterCmd []string) error {
-	/* The general plan:
-	 * - bind-mount sourcePath to mountTmp
-	 * - MS_MOVE mountTmp to mountOutside, the systemd propagate dir
-	 * - systemd moves mountOutside to mountInside
-	 * - in the stage1 namespace, bind mountInside to the app's rootfs
-	 */
-
-	/* Prepare a temporary playground that is not a shared mount */
-	playgroundMount, err := ioutil.TempDir("", "rkt.propagate.")
-	if err != nil {
-		return errwrap.Wrapf("error creating temporary propagation directory", err)
-	}
-	defer os.Remove(playgroundMount)
-
-	err = syscall.Mount(playgroundMount, playgroundMount, "bind", syscall.MS_BIND, "")
-	if err != nil {
-		return errwrap.Wrapf("error mounting temporary directory", err)
-	}
-	defer syscall.Unmount(playgroundMount, 0)
-
-	err = syscall.Mount("", playgroundMount, "none", syscall.MS_SLAVE, "")
-	if err != nil {
-		return errwrap.Wrapf("error mounting temporary directory", err)
-	}
-
-	/* Bind mount the source into the playground, possibly read-only */
-	mountTmp := filepath.Join(playgroundMount, "mount")
-	if err := ensureDestinationExists(sourcePath, mountTmp); err != nil {
-		return errwrap.Wrapf("error creating temporary mountpoint", err)
-	}
-	defer os.Remove(mountTmp)
-
-	err = syscall.Mount(sourcePath, mountTmp, "bind", syscall.MS_BIND, "")
-	if err != nil {
-		return errwrap.Wrapf("error mounting temporary mountpoint", err)
-	}
-	defer syscall.Unmount(mountTmp, 0)
-
-	if readOnly {
-		err = syscall.Mount("", mountTmp, "bind", syscall.MS_REMOUNT|syscall.MS_RDONLY|syscall.MS_BIND, "")
-		if err != nil {
-			return errwrap.Wrapf("error remounting temporary mountpoint read-only", err)
-		}
-	}
-
-	/* Now that the bind mount has the correct attributes (RO or RW), move
-	 * it to the propagation directory prepared by systemd-nspawn */
-	mountOutside := filepath.Join("/run/systemd/nspawn/propagate/", "rkt-"+p.UUID.String(), "rkt.mount")
-	mountInside := filepath.Join("/run/systemd/nspawn/incoming/", filepath.Base(mountOutside))
-	if err := ensureDestinationExists(sourcePath, mountOutside); err != nil {
-		return errwrap.Wrapf("error creating propagate mountpoint", err)
-	}
-	defer os.Remove(mountOutside)
-
-	err = syscall.Mount(mountTmp, mountOutside, "", syscall.MS_MOVE, "")
-	if err != nil {
-		return errwrap.Wrapf("error moving temporary mountpoint to propagate directory", err)
-	}
-	defer syscall.Unmount(mountOutside, 0)
-
-	/* Finally move the bind mount at the correct place inside the container. */
-	mountDst := filepath.Join("/opt/stage2", ra.Name.String(), "rootfs", dstPath)
-	mountDstOutside := filepath.Join(p.Root, "stage1/rootfs", mountDst)
-	if err := ensureDestinationExists(sourcePath, mountDstOutside); err != nil {
-		return errwrap.Wrapf("error creating destination directory", err)
-	}
-
-	args := enterCmd
-	args = append(args, "/bin/mount", "--move", mountInside, mountDst)
-
-	cmd := exec.Cmd{
-		Path: args[0],
-		Args: args,
-	}
-
-	if err := cmd.Run(); err != nil {
-		return errwrap.Wrapf("error executing mount move", err)
-	}
-	return nil
-}
diff --git a/stage1/init/common/mount_test.go b/stage1/init/common/mount_test.go
index da87d2bee8..f7af18eb37 100644
--- a/stage1/init/common/mount_test.go
+++ b/stage1/init/common/mount_test.go
@@ -30,7 +30,7 @@ func TestGenerateMounts(t *testing.T) {
 		vols       []types.Volume
 		fromDocker bool
 		hasErr     bool
-		expected   []mountWrapper
+		expected   []Mount
 	}{
 		{ // Test matching ra.mount to volume via name w/o/ mountpoint
 			ra: &schema.RuntimeApp{
@@ -54,7 +54,7 @@ func TestGenerateMounts(t *testing.T) {
 			},
 			fromDocker: false,
 			hasErr:     false,
-			expected: []mountWrapper{
+			expected: []Mount{
 				{
 					Mount: schema.Mount{
 						Volume: *types.MustACName("foo-mount"),
@@ -100,7 +100,7 @@ func TestGenerateMounts(t *testing.T) {
 			},
 			fromDocker: false,
 			hasErr:     false,
-			expected: []mountWrapper{
+			expected: []Mount{
 				{
 					Mount: schema.Mount{
 						Volume: *types.MustACName("foo-mp"),
@@ -152,7 +152,7 @@ func TestGenerateMounts(t *testing.T) {
 			},
 			fromDocker: false,
 			hasErr:     false,
-			expected: []mountWrapper{
+			expected: []Mount{
 				{
 					Mount: schema.Mount{
 						Volume: *types.MustACName("foo-mount"),
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 5f81e9168c..664afd8d58 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -27,6 +27,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"syscall"
 
 	"github.com/coreos/rkt/pkg/acl"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
@@ -302,7 +303,7 @@ func FindBinPath(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (string, error
 // node, we create a symlink to its target in "/rkt/volumes". Later,
 // prepare-app will copy those to "/dev/.rkt/" so that's what we use in the
 // DeviceAllow= line.
-func generateDeviceAllows(root string, appName types.ACName, mountPoints []types.MountPoint, mounts []mountWrapper, uidRange *user.UidRange) ([]string, error) {
+func generateDeviceAllows(root string, appName types.ACName, mountPoints []types.MountPoint, mounts []Mount, uidRange *user.UidRange) ([]string, error) {
 	var devAllow []string
 
 	rktVolumeLinksPath := filepath.Join(root, "rkt", "volumes")
@@ -412,48 +413,27 @@ func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (int, int,
 // It returns the actual path relative to the app rootfs for the given path.
 // This is needed for absolute symlinks - we are in a different rootfs.
 func EvaluateSymlinksInsideApp(appRootfs, path string) (string, error) {
-	link := appRootfs
-
-	paths := strings.Split(path, "/")
-	for i, p := range paths {
-		next := filepath.Join(link, p)
-
-		if !strings.HasPrefix(next, appRootfs) {
-			return "", fmt.Errorf("path escapes app's root: %q", path)
-		}
-
-		fi, err := os.Lstat(next)
-		if err != nil {
-			if os.IsNotExist(err) {
-				link = filepath.Join(append([]string{link}, paths[i:]...)...)
-				break
-			}
-			return "", err
-		}
-
-		if fi.Mode()&os.ModeType != os.ModeSymlink {
-			link = filepath.Join(link, p)
-			continue
-		}
+	chroot, err := newChroot(appRootfs)
+	if err != nil {
+		return "", errwrap.Wrapf(fmt.Sprintf("chroot to %q failed", appRootfs), err)
+	}
 
-		// Evaluate the symlink.
-		target, err := os.Readlink(next)
-		if err != nil {
-			return "", err
-		}
+	target, err := fileutil.EvalSymlinksAlways(path)
+	if err != nil {
+		return "", errwrap.Wrapf(fmt.Sprintf("evaluating symlinks of %q failed", path), err)
+	}
 
-		if filepath.IsAbs(target) {
-			link = filepath.Join(appRootfs, target)
-		} else {
-			link = filepath.Join(link, target)
-		}
+	// EvalSymlinksAlways might return a relative path
+	abs, err := filepath.Abs(target)
+	if err != nil {
+		return "", errwrap.Wrapf(fmt.Sprintf("failed to get absolute representation of %q", target), err)
+	}
 
-		if !strings.HasPrefix(link, appRootfs) {
-			return "", fmt.Errorf("symlink %q escapes app's root with value %q", next, target)
-		}
+	if err := chroot.escape(); err != nil {
+		return "", errwrap.Wrapf(fmt.Sprintf("escaping chroot %q failed", appRootfs), err)
 	}
 
-	return strings.TrimPrefix(link, appRootfs), nil
+	return abs, nil
 }
 
 // appToNspawnArgs transforms the given app manifest, with the given associated
@@ -725,3 +705,61 @@ func getAppNoNewPrivileges(isolators types.Isolators) bool {
 
 	return false
 }
+
+// chroot is the struct that represents a chroot environment
+type chroot struct {
+	wd   string   // the working directory in the outer root
+	root *os.File // the outer root directory
+}
+
+// newChroot creates a new chroot environment for the given path.
+// Unless the caller calls Escape() all system operations will be invoked in that environment.
+// It stores the working directory at the point it was invoked.
+func newChroot(path string) (*chroot, error) {
+	var err error
+	var c chroot
+
+	c.wd, err = os.Getwd()
+	if err != nil {
+		return nil, errwrap.Wrapf("getwd before chroot failed", err)
+	}
+
+	c.root, err = os.Open("/")
+	if err != nil {
+		return nil, errwrap.Wrapf("error opening outer root", err)
+	}
+
+	if err := syscall.Chroot(path); err != nil {
+		return nil, errwrap.Wrapf("chroot to "+path+" failed", err)
+	}
+
+	if err := os.Chdir("/"); err != nil {
+		return nil, errwrap.Wrapf("chdir to \"/\" failed", err)
+	}
+
+	return &c, nil
+}
+
+// Escape escapes the chroot environment changing back to the original working directory where newChroot was invoked.
+func (c *chroot) escape() error {
+	// change directory to outer root and close it
+	if err := syscall.Fchdir(int(c.root.Fd())); err != nil {
+		return errwrap.Wrapf("changing directory to outer root failed", err)
+	}
+
+	if err := c.root.Close(); err != nil {
+		return errwrap.Wrapf("closing outer root failed", err)
+	}
+
+	// chroot to current directory aka "." being the outer root
+	if err := syscall.Chroot("."); err != nil {
+		return errwrap.Wrapf("chroot to current directory failed", err)
+	}
+
+	// chdir into previous working directory
+	if err := os.Chdir(c.wd); err != nil {
+		return errwrap.Wrapf("chdir to working directory failed", err)
+	}
+
+	return nil
+}
diff --git a/tests/functional.mk b/tests/functional.mk
index 462ac33714..5751e9f223 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -7,7 +7,11 @@ FTST_IMAGE_ROOTFSDIR := $(FTST_IMAGE_DIR)/rootfs
 FTST_IMAGE := $(FTST_TMPDIR)/rkt-inspect.aci
 FTST_IMAGE_MANIFEST_SRC := $(MK_SRCDIR)/image/manifest
 FTST_IMAGE_MANIFEST := $(FTST_IMAGE_DIR)/manifest
-FTST_IMAGE_TEST_DIRS := $(FTST_IMAGE_ROOTFSDIR)/dir1 $(FTST_IMAGE_ROOTFSDIR)/dir2 $(FTST_IMAGE_ROOTFSDIR)/bin $(FTST_IMAGE_ROOTFSDIR)/etc
+FTST_IMAGE_TEST_DIRS := \
+	$(FTST_IMAGE_ROOTFSDIR)/dir1 \
+	$(FTST_IMAGE_ROOTFSDIR)/dir2 \
+	$(FTST_IMAGE_ROOTFSDIR)/bin \
+	$(FTST_IMAGE_ROOTFSDIR)/etc
 FTST_ACE_MAIN_IMAGE_DIR := $(FTST_TMPDIR)/ace-main
 FTST_ACE_MAIN_IMAGE := $(FTST_TMPDIR)/rkt-ace-validator-main.aci
 FTST_ACE_MAIN_IMAGE_MANIFEST_SRC := vendor/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -59,6 +63,9 @@ CLEAN_FILES += \
 	$(FTST_EMPTY_IMAGE) \
 	$(FTST_IMAGE_ROOTFSDIR)/dir1/file \
 	$(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_dir2 \
+	$(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_dotdot_dir2 \
+	$(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_notexists \
+	$(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_root \
 	$(FTST_IMAGE_ROOTFSDIR)/dir1/link_rel_dir2 \
 	$(FTST_IMAGE_ROOTFSDIR)/dir1/link_invalid \
 	$(FTST_IMAGE_ROOTFSDIR)/dir2/file \
@@ -106,10 +113,14 @@ $(FTST_IMAGE): $(FTST_IMAGE_MANIFEST) $(FTST_ACI_INSPECT) $(FTST_ACI_ECHO_SERVER
 	echo -n dir1 >$(FTST_IMAGE_ROOTFSDIR)/dir1/file; \
 	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_dir2)) \
 	ln -sf /dir2 $(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_dir2; \
+	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_dotdot_dir2)) \
+	ln -sf /../dir2 $(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_dotdot_dir2; \
 	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/dir1/link_rel_dir2)) \
 	ln -sf ../dir2 $(FTST_IMAGE_ROOTFSDIR)/dir1/link_rel_dir2; \
-	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/dir1/link_invalid)) \
-	ln -sf /../dir2 $(FTST_IMAGE_ROOTFSDIR)/dir1/link_invalid; \
+	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_root)) \
+	ln -sf / $(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_root; \
+	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_notexists)) \
+	ln -sf /notexists $(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_notexists; \
 	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/dir2/file)) \
 	echo -n dir2 >$(FTST_IMAGE_ROOTFSDIR)/dir2/file; \
 	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/etc/group)) \
diff --git a/tests/rkt_mount_overlay_test.go b/tests/rkt_mount_overlay_test.go
index 156f450140..498730b37c 100644
--- a/tests/rkt_mount_overlay_test.go
+++ b/tests/rkt_mount_overlay_test.go
@@ -31,14 +31,14 @@ func overlayMount(cfg overlay.MountCfg) error {
 
 	// Lower and Upper directories will create two text files
 	// to ensure the merging completed successfully.
-	cfg.Lower = createTempDirOrPanic(cfg.Lower)
+	cfg.Lower = mustTempDir(cfg.Lower)
 	createFileOrPanic(cfg.Lower, "1.txt")
 
-	cfg.Upper = createTempDirOrPanic(cfg.Upper)
+	cfg.Upper = mustTempDir(cfg.Upper)
 	createFileOrPanic(cfg.Upper, "2.txt")
 
-	cfg.Work = createTempDirOrPanic(cfg.Work)
-	cfg.Dest = createTempDirOrPanic(cfg.Dest)
+	cfg.Work = mustTempDir(cfg.Work)
+	cfg.Dest = mustTempDir(cfg.Dest)
 
 	// Ensure temporary directories will be removed after tests.
 	defer os.RemoveAll(cfg.Lower)
diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index 8c693162ae..2893fb978d 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -41,7 +41,7 @@ func TestMountSymlink(t *testing.T) {
 	defer ctx.Cleanup()
 
 	tests := []struct {
-		linkFile     string
+		targetFile   string
 		actualFile   string
 		expectedLine string
 		exitCode     int
@@ -67,27 +67,67 @@ func TestMountSymlink(t *testing.T) {
 			"world",
 			0,
 		},
-		// '/dir1/../../../foo' is invalid because it tries to escape rootfs.
 		{
 			"/dir1/../../../foo",
-			"/dir2/foo",
-			"path escapes app's root",
-			254,
+			"/foo",
+			"world",
+			0,
 		},
-		// '/dir1/link_invalid' is an invalid link because it tries to escape rootfs.
 		{
-			"/dir1/link_invalid/foo",
+			"/dir1/link_abs_dotdot_dir2/foo",
 			"/dir2/foo",
-			"escapes app's root with value",
-			254,
+			"world",
+			0,
+		},
+		{
+			"/dir1/../../../newdir/foo",
+			"/newdir/foo",
+			"world",
+			0,
+		},
+		{
+			"/dir1/link_rel_dir2/newdir/foo",
+			"/dir2/newdir/foo",
+			"world",
+			0,
+		},
+		{
+			"/dir1/link_abs_dir2/newdir/foo",
+			"/dir2/newdir/foo",
+			"world",
+			0,
+		},
+		{
+			"/dir1/link_abs_notexists/newdir1/newdir2/foo",
+			"/notexists/newdir1/newdir2/foo",
+			"world",
+			0,
+		},
+		{
+			"/dir1/link_abs_root/newdir1/newdir2/foo",
+			"/newdir1/newdir2/foo",
+			"world",
+			0,
+		},
+		{
+			"../../../../../../../../../../../../../../../foo",
+			"/foo",
+			"world",
+			0,
 		},
 	}
 
 	for _, tt := range tests {
-		paramMount := fmt.Sprintf("--volume=test,kind=host,source=%s --mount volume=test,target=%s", mountSrcFile, tt.linkFile)
+		paramMount := fmt.Sprintf(
+			"--volume=test,kind=host,source=%s --mount=volume=test,target=%s",
+			mountSrcFile, tt.targetFile,
+		)
 
 		// Read the actual file.
-		rktCmd := fmt.Sprintf("%s --insecure-options=image run %s --set-env=FILE=%s %s", ctx.Cmd(), paramMount, tt.actualFile, image)
+		rktCmd := fmt.Sprintf(
+			"%s --insecure-options=image run %s --set-env=FILE=%s %s",
+			ctx.Cmd(), paramMount, tt.actualFile, image,
+		)
 		t.Logf("%s\n", rktCmd)
 
 		if tt.exitCode == 0 {

From bafd11fcbf19d8007a34574ea5e900f073e29839 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 17 Jan 2017 06:36:33 +0100
Subject: [PATCH 1016/1304] tests: rename createTempDirOrPanic -> mustTempDir

This renames the above function to be more idiomatic.
---
 tests/rkt_app_sandbox_test.go        | 2 +-
 tests/rkt_cat_manifest_test.go       | 2 +-
 tests/rkt_etc_hosts_test.go          | 4 ++--
 tests/rkt_export_test.go             | 2 +-
 tests/rkt_fetch_test.go              | 2 +-
 tests/rkt_image_dependencies_test.go | 2 +-
 tests/rkt_image_export_test.go       | 2 +-
 tests/rkt_image_extract_test.go      | 2 +-
 tests/rkt_image_list_test.go         | 4 ++--
 tests/rkt_image_render_test.go       | 2 +-
 tests/rkt_list_test.go               | 2 +-
 tests/rkt_mount_test.go              | 2 +-
 tests/rkt_rm_test.go                 | 2 +-
 tests/rkt_run_pod_manifest_test.go   | 4 ++--
 tests/rkt_stop_test.go               | 2 +-
 tests/rkt_tests.go                   | 2 +-
 tests/rkt_volume_mount_test.go       | 2 +-
 tests/rkt_volume_test.go             | 2 +-
 18 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index 2b9c68b00b..fc00a9cb6f 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -352,7 +352,7 @@ func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.Expe
 	}
 	defer os.Unsetenv("RKT_EXPERIMENT_APP")
 
-	tmpDir := createTempDirOrPanic("rkt-test-cri-")
+	tmpDir := mustTempDir("rkt-test-cri-")
 	uuidFile := filepath.Join(tmpDir, "uuid")
 	defer os.RemoveAll(tmpDir)
 
diff --git a/tests/rkt_cat_manifest_test.go b/tests/rkt_cat_manifest_test.go
index 130228e85e..ebc8b1b0c3 100644
--- a/tests/rkt_cat_manifest_test.go
+++ b/tests/rkt_cat_manifest_test.go
@@ -42,7 +42,7 @@ func TestCatManifest(t *testing.T) {
 	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imgID.path)
 	podUuid := runRktAndGetUUID(t, cmd)
 
-	tmpDir := createTempDirOrPanic(imgName)
+	tmpDir := mustTempDir(imgName)
 	defer os.RemoveAll(tmpDir)
 
 	tests := []struct {
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index de425fe14e..cecac5e8b6 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -43,9 +43,9 @@ func TestEtcHosts(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	tmpdir := createTempDirOrPanic("rkt-tests.")
+	tmpdir := mustTempDir("rkt-tests.")
 	defer os.RemoveAll(tmpdir)
-	tmpetc := createTempDirOrPanic("rkt-tests-etc.")
+	tmpetc := mustTempDir("rkt-tests-etc.")
 	defer os.RemoveAll(tmpetc)
 
 	tmpfile := filepath.Join(tmpetc, "hosts")
diff --git a/tests/rkt_export_test.go b/tests/rkt_export_test.go
index 7c3529a16b..3b959ebd80 100644
--- a/tests/rkt_export_test.go
+++ b/tests/rkt_export_test.go
@@ -117,7 +117,7 @@ var exportTestCases = map[string]ExportTestCase{
 }
 
 func (ct ExportTestCase) Execute(t *testing.T, ctx *testutils.RktRunCtx) {
-	tmpDir := createTempDirOrPanic("rkt-TestExport-tmp-")
+	tmpDir := mustTempDir("rkt-TestExport-tmp-")
 	defer os.RemoveAll(tmpDir)
 
 	tmpTestAci := filepath.Join(tmpDir, "test.aci")
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 0a61ec26d5..3a165656e6 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -553,7 +553,7 @@ func TestDifferentDiscoveryLabels(t *testing.T) {
 	}
 
 	emptyImage := getEmptyImagePath()
-	tmpDir := createTempDirOrPanic("rkt-TestDifferentDiscoveryLabels-")
+	tmpDir := mustTempDir("rkt-TestDifferentDiscoveryLabels-")
 	defer os.RemoveAll(tmpDir)
 
 	tmpManifest, err := ioutil.TempFile(tmpDir, "manifest")
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 17d316a775..1df591180f 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -66,7 +66,7 @@ func generateComplexDependencyTree(t *testing.T, ctx *testutils.RktRunCtx) (map[
 		},
 	}
 
-	tmpDir := createTempDirOrPanic("rkt-TestImageDeps-")
+	tmpDir := mustTempDir("rkt-TestImageDeps-")
 	defer os.RemoveAll(tmpDir)
 
 	baseImage := getInspectImagePath()
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index d660fd71d3..9bcf190db2 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -56,7 +56,7 @@ func TestImageExport(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	tmpDir := createTempDirOrPanic("rkt-TestImageExport-")
+	tmpDir := mustTempDir("rkt-TestImageExport-")
 	defer os.RemoveAll(tmpDir)
 
 	tmpManifest, err := ioutil.TempFile(tmpDir, "manifest")
diff --git a/tests/rkt_image_extract_test.go b/tests/rkt_image_extract_test.go
index 6e4fc5031b..9381445345 100644
--- a/tests/rkt_image_extract_test.go
+++ b/tests/rkt_image_extract_test.go
@@ -35,7 +35,7 @@ func TestImageExtract(t *testing.T) {
 	inspectFile := testutils.GetValueFromEnvOrPanic("INSPECT_BINARY")
 	inspectHash := getHashOrPanic(inspectFile)
 
-	tmpDir := createTempDirOrPanic("rkt-TestImageRender-")
+	tmpDir := mustTempDir("rkt-TestImageRender-")
 	defer os.RemoveAll(tmpDir)
 
 	ctx := testutils.NewRktRunCtx()
diff --git a/tests/rkt_image_list_test.go b/tests/rkt_image_list_test.go
index 18731b5e84..54d4f383e1 100644
--- a/tests/rkt_image_list_test.go
+++ b/tests/rkt_image_list_test.go
@@ -168,7 +168,7 @@ func TestImageSize(t *testing.T) {
 		spawnAndWaitOrFail(t, runCmd, 0)
 	}
 
-	tmpDir := createTempDirOrPanic("rkt_image_list_test")
+	tmpDir := mustTempDir("rkt_image_list_test")
 	defer os.RemoveAll(tmpDir)
 	imageRenderCmd := fmt.Sprintf("%s image render --overwrite %s %s", ctx.Cmd(), imageHash, tmpDir)
 	spawnAndWaitOrFail(t, imageRenderCmd, 0)
@@ -254,7 +254,7 @@ func TestShortHash(t *testing.T) {
 		runRktAndCheckOutput(t, imageListCmd, hash, false)
 	}
 
-	tmpDir := createTempDirOrPanic("rkt_image_list_test")
+	tmpDir := mustTempDir("rkt_image_list_test")
 	defer os.RemoveAll(tmpDir)
 
 	// Define tests
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 13a9f1f4e8..e4a59c644d 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -66,7 +66,7 @@ func TestImageRender(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	tmpDir := createTempDirOrPanic("rkt-TestImageRender-")
+	tmpDir := mustTempDir("rkt-TestImageRender-")
 	defer os.RemoveAll(tmpDir)
 
 	tmpManifest, err := ioutil.TempFile(tmpDir, "manifest")
diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index a0ed5032df..084a22025d 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -158,7 +158,7 @@ func TestRktListCreatedStarted(t *testing.T) {
 	// Get hash
 	imageID := fmt.Sprintf("sha512-%s", imgID.hash[:12])
 
-	tmpDir := createTempDirOrPanic(imgName)
+	tmpDir := mustTempDir(imgName)
 	defer os.RemoveAll(tmpDir)
 
 	time.Sleep(delta)
diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index 2893fb978d..293f74a495 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 func TestMountSymlink(t *testing.T) {
-	tmpDir := createTempDirOrPanic("rkt-mount-test-")
+	tmpDir := mustTempDir("rkt-mount-test-")
 	defer os.RemoveAll(tmpDir)
 	mountSrcFile := filepath.Join(tmpDir, "hello")
 	if err := ioutil.WriteFile(mountSrcFile, []byte("world"), 0666); err != nil {
diff --git a/tests/rkt_rm_test.go b/tests/rkt_rm_test.go
index 6ad66857f9..ff917e5a4f 100644
--- a/tests/rkt_rm_test.go
+++ b/tests/rkt_rm_test.go
@@ -84,7 +84,7 @@ func TestRmInvalid(t *testing.T) {
 	defer ctx.Cleanup()
 
 	nonexistentUUID := "0f746094-3438-42bc-ab37-3cf85f132e60"
-	tmpDir := createTempDirOrPanic("rkt_rm_test")
+	tmpDir := mustTempDir("rkt_rm_test")
 	defer os.RemoveAll(tmpDir)
 	uuidFile := filepath.Join(tmpDir, "uuid-file")
 	if err := ioutil.WriteFile(uuidFile, []byte(nonexistentUUID), 0600); err != nil {
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 8b531879f0..278f6cff80 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -51,7 +51,7 @@ func TestPodManifest(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	tmpdir := createTempDirOrPanic("rkt-tests.")
+	tmpdir := mustTempDir("rkt-tests.")
 	defer os.RemoveAll(tmpdir)
 
 	boolFalse, boolTrue := false, true
@@ -1286,7 +1286,7 @@ func TestPodManifestWithEmptyApps(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	tmpdir := createTempDirOrPanic("rkt-tests.")
+	tmpdir := mustTempDir("rkt-tests.")
 	defer os.RemoveAll(tmpdir)
 
 	manifest := &schema.PodManifest{
diff --git a/tests/rkt_stop_test.go b/tests/rkt_stop_test.go
index 3657a16d99..79f8ab2063 100644
--- a/tests/rkt_stop_test.go
+++ b/tests/rkt_stop_test.go
@@ -31,7 +31,7 @@ func TestRktStop(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	tmpDir := createTempDirOrPanic("rkt-TestRktStop-")
+	tmpDir := mustTempDir("rkt-TestRktStop-")
 	defer os.RemoveAll(tmpDir)
 
 	// Define tests
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index f8048c0c74..ec87b70f3b 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -211,7 +211,7 @@ func getHash(filePath string) (string, error) {
 	return hex.EncodeToString(hash.Sum(nil)), nil
 }
 
-func createTempDirOrPanic(dirName string) string {
+func mustTempDir(dirName string) string {
 	tmpDir, err := ioutil.TempDir("", dirName)
 	if err != nil {
 		panic(fmt.Sprintf("Cannot create temp dir: %v", err))
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
index 0afec5b2f3..f965b74760 100644
--- a/tests/rkt_volume_mount_test.go
+++ b/tests/rkt_volume_mount_test.go
@@ -38,7 +38,7 @@ var (
 	mountDir                   = "/mnt"
 	mountFilePath              = "/mnt/subDirRW/file"
 
-	volDir      = createTempDirOrPanic("rkt-tests-volume-data")
+	volDir      = mustTempDir("rkt-tests-volume-data")
 	volSubDirRW = path.Join(volDir, "subDirRW")
 	volFilePath = path.Join(volSubDirRW, "file")
 
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 6a6255451d..1690519f23 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -162,7 +162,7 @@ func NewVolumesTest() testutils.Test {
 		ctx := testutils.NewRktRunCtx()
 		defer ctx.Cleanup()
 
-		tmpdir := createTempDirOrPanic("rkt-tests.")
+		tmpdir := mustTempDir("rkt-tests.")
 		defer os.RemoveAll(tmpdir)
 
 		tmpfile := filepath.Join(tmpdir, "file")

From 59bd4a86f8ded56219fb4a380c0b4dda1bb1dd09 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 17 Jan 2017 06:36:34 +0100
Subject: [PATCH 1017/1304] tests/sandbox: add functional test for mounts

---
 tests/rkt_app_sandbox_test.go | 123 +++++++++++++++++++++++++---------
 1 file changed, 93 insertions(+), 30 deletions(-)

diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index fc00a9cb6f..29e6931ceb 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -19,6 +19,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -43,17 +44,17 @@ func TestAppSandboxAddStartRemove(t *testing.T) {
 		aciHello := patchTestACI("rkt-inspect-hello.aci", "--name="+imageName, "--exec=/inspect --print-msg="+msg)
 		defer os.Remove(aciHello)
 
-		testCmd{ctx.ExecCmd("fetch", "--insecure-options=image", aciHello)}.CombinedOutput(t)
-		testCmd{ctx.ExecCmd("app", "add", "--debug", podUUID, imageName, "--name="+appName)}.CombinedOutput(t)
-		testCmd{ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+appName)}.CombinedOutput(t)
+		combinedOutput(t, ctx.ExecCmd("fetch", "--insecure-options=image", aciHello))
+		combinedOutput(t, ctx.ExecCmd("app", "add", "--debug", podUUID, imageName, "--name="+appName))
+		combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+appName))
 
 		if err := expectTimeoutWithOutput(child, msg, actionTimeout); err != nil {
 			t.Fatalf("Expected %q but not found: %v", msg, err)
 		}
 
-		testCmd{ctx.ExecCmd("app", "rm", "--debug", podUUID, "--app="+appName)}.CombinedOutput(t)
+		combinedOutput(t, ctx.ExecCmd("app", "rm", "--debug", podUUID, "--app="+appName))
 
-		out := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+		out := combinedOutput(t, ctx.ExecCmd("app", "list", "--no-legend", podUUID))
 		if out != "\n" {
 			t.Errorf("unexpected output %q", out)
 			return
@@ -65,7 +66,7 @@ func TestAppSandboxAddStartRemove(t *testing.T) {
 // one that exits successfully, one that exits with an error, and one that keeps running.
 func TestAppSandboxMultipleApps(t *testing.T) {
 	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
-		actionTimeout := 60 * time.Second
+		actionTimeout := 30 * time.Second
 
 		type app struct {
 			name, image, exec, aci string
@@ -97,9 +98,9 @@ func TestAppSandboxMultipleApps(t *testing.T) {
 			aci := patchTestACI(app.aci, "--name="+app.image, "--exec="+app.exec)
 			defer os.Remove(aci)
 
-			testCmd{ctx.ExecCmd("fetch", "--insecure-options=image", aci)}.CombinedOutput(t)
-			testCmd{ctx.ExecCmd("app", "add", "--debug", podUUID, app.image, "--name="+app.name)}.CombinedOutput(t)
-			testCmd{ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+app.name)}.CombinedOutput(t)
+			combinedOutput(t, ctx.ExecCmd("fetch", "--insecure-options=image", aci))
+			combinedOutput(t, ctx.ExecCmd("app", "add", "--debug", podUUID, app.image, "--name="+app.name))
+			combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+app.name))
 		}
 
 		// check for app output messages
@@ -121,7 +122,7 @@ func TestAppSandboxMultipleApps(t *testing.T) {
 
 		// assert `rkt app list` for the apps
 		if err := r.Retry(func() error {
-			got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+			got := combinedOutput(t, ctx.ExecCmd("app", "list", "--no-legend", podUUID))
 
 			if strings.Contains(got, "winner\texited") &&
 				strings.Contains(got, "loser\texited") &&
@@ -160,7 +161,7 @@ func TestAppSandboxMultipleApps(t *testing.T) {
 			},
 		} {
 			if err := r.Retry(func() error {
-				got := testCmd{ctx.ExecCmd("app", "status", podUUID, "--app="+app.name)}.CombinedOutput(t)
+				got := combinedOutput(t, ctx.ExecCmd("app", "status", podUUID, "--app="+app.name))
 				ok := true
 
 				if app.checkExitCode {
@@ -182,12 +183,12 @@ func TestAppSandboxMultipleApps(t *testing.T) {
 
 		// remove all apps
 		for _, app := range apps {
-			testCmd{ctx.ExecCmd("app", "rm", "--debug", podUUID, "--app="+app.name)}.CombinedOutput(t)
+			combinedOutput(t, ctx.ExecCmd("app", "rm", "--debug", podUUID, "--app="+app.name))
 		}
 
 		// assert empty `rkt app list`, no need for retrying,
 		// as after removal no leftovers are expected to be present
-		got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+		got := combinedOutput(t, ctx.ExecCmd("app", "list", "--no-legend", podUUID))
 		if got != "\n" {
 			t.Errorf("unexpected result, got %q", got)
 			return
@@ -222,9 +223,9 @@ func TestAppSandboxRestart(t *testing.T) {
 			aci := patchTestACI(app.aci, "--name="+app.image, "--exec="+app.exec)
 			defer os.Remove(aci)
 
-			testCmd{ctx.ExecCmd("fetch", "--insecure-options=image", aci)}.CombinedOutput(t)
-			testCmd{ctx.ExecCmd("app", "add", "--debug", podUUID, app.image, "--name="+app.name)}.CombinedOutput(t)
-			testCmd{ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+app.name)}.CombinedOutput(t)
+			combinedOutput(t, ctx.ExecCmd("fetch", "--insecure-options=image", aci))
+			combinedOutput(t, ctx.ExecCmd("app", "add", "--debug", podUUID, app.image, "--name="+app.name))
+			combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+app.name))
 		}
 
 		// total retry timeout: 10s
@@ -235,7 +236,7 @@ func TestAppSandboxRestart(t *testing.T) {
 
 		// assert `rkt app list` for the apps
 		if err := r.Retry(func() error {
-			got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+			got := combinedOutput(t, ctx.ExecCmd("app", "list", "--no-legend", podUUID))
 
 			if strings.Contains(got, "app1\trunning") &&
 				strings.Contains(got, "app2\trunning") {
@@ -250,7 +251,7 @@ func TestAppSandboxRestart(t *testing.T) {
 
 		assertStatus := func(name, status string) error {
 			return r.Retry(func() error {
-				got := testCmd{ctx.ExecCmd("app", "status", podUUID, "--app="+name)}.CombinedOutput(t)
+				got := combinedOutput(t, ctx.ExecCmd("app", "status", podUUID, "--app="+name))
 
 				if !strings.Contains(got, status) {
 					return fmt.Errorf("unexpected result, got %q", got)
@@ -269,7 +270,7 @@ func TestAppSandboxRestart(t *testing.T) {
 		}
 
 		// stop app1
-		testCmd{ctx.ExecCmd("app", "stop", podUUID, "--app=app1")}.CombinedOutput(t)
+		combinedOutput(t, ctx.ExecCmd("app", "stop", podUUID, "--app=app1"))
 
 		// assert `rkt app status` for the apps
 		for _, app := range []struct {
@@ -293,7 +294,7 @@ func TestAppSandboxRestart(t *testing.T) {
 
 		// assert `rkt app list` for the apps
 		if err := r.Retry(func() error {
-			got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+			got := combinedOutput(t, ctx.ExecCmd("app", "list", "--no-legend", podUUID))
 
 			if strings.Contains(got, "app1\texited") &&
 				strings.Contains(got, "app2\trunning") {
@@ -307,7 +308,7 @@ func TestAppSandboxRestart(t *testing.T) {
 		}
 
 		// start app1
-		testCmd{ctx.ExecCmd("app", "start", podUUID, "--app=app1")}.CombinedOutput(t)
+		combinedOutput(t, ctx.ExecCmd("app", "start", podUUID, "--app=app1"))
 
 		// assert `rkt app status` for the apps
 		for _, app := range []struct {
@@ -331,7 +332,7 @@ func TestAppSandboxRestart(t *testing.T) {
 
 		// assert `rkt app list` for the apps
 		if err := r.Retry(func() error {
-			got := testCmd{ctx.ExecCmd("app", "list", "--no-legend", podUUID)}.CombinedOutput(t)
+			got := combinedOutput(t, ctx.ExecCmd("app", "list", "--no-legend", podUUID))
 
 			if strings.Contains(got, "app1\trunning") &&
 				strings.Contains(got, "app2\trunning") {
@@ -346,6 +347,72 @@ func TestAppSandboxRestart(t *testing.T) {
 	})
 }
 
+func TestAppSandboxMount(t *testing.T) {
+	mntSrcDir := mustTempDir("rkt-mount-test-")
+	defer os.RemoveAll(mntSrcDir)
+
+	mntSrcFile := filepath.Join(mntSrcDir, "test")
+	if err := ioutil.WriteFile(mntSrcFile, []byte("content"), 0666); err != nil {
+		t.Fatalf("Cannot write file: %v", err)
+	}
+
+	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+		aci := patchTestACI(
+			"rkt-inspect-mounter.aci",
+			"--name=coreos.com/rkt-inspect/mounter",
+			"--exec=/inspect -read-file",
+		)
+		defer os.Remove(aci)
+		combinedOutput(t, ctx.ExecCmd("fetch", "--insecure-options=image", aci))
+
+		for _, tt := range []struct {
+			mntTarget    string
+			expectedFile string
+		}{
+			{
+				mntTarget:    "/dir2",
+				expectedFile: "/dir2/test",
+			},
+			{
+				mntTarget:    "/dir1/link_rel_dir2",
+				expectedFile: "/dir2/test",
+			},
+			{
+				mntTarget:    "/dir1/link_abs_dir2",
+				expectedFile: "/dir2/test",
+			},
+			{
+				mntTarget:    "/dir1/link_abs_root/notexists",
+				expectedFile: "/notexists/test",
+			},
+			{
+				mntTarget:    "/../../../../../../../../notexists",
+				expectedFile: "/notexists/test",
+			},
+			{
+				mntTarget:    "../../../../../../../../notexists",
+				expectedFile: "/notexists/test",
+			},
+		} {
+			combinedOutput(t, ctx.ExecCmd(
+				"app", "add", "--debug", podUUID,
+				"coreos.com/rkt-inspect/mounter",
+				"--name=mounter",
+				"--environment=FILE="+tt.expectedFile,
+				"--mnt-volume=name=test,kind=host,source="+mntSrcDir+",target="+tt.mntTarget,
+			))
+
+			combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app=mounter"))
+
+			if err := expectTimeoutWithOutput(child, "content", 10*time.Second); err != nil {
+				t.Fatalf("Expected \"content\" but not found: %v", err)
+			}
+
+			combinedOutput(t, ctx.ExecCmd("app", "rm", "--debug", podUUID, "--app=mounter"))
+		}
+	})
+}
+
 func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.ExpectSubprocess, string)) {
 	if err := os.Setenv("RKT_EXPERIMENT_APP", "true"); err != nil {
 		panic(err)
@@ -371,13 +438,13 @@ func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.Expe
 	testFunc(ctx, child, podUUID)
 
 	// assert that the pod is still running
-	got := testCmd{ctx.ExecCmd("status", podUUID)}.CombinedOutput(t)
+	got := combinedOutput(t, ctx.ExecCmd("status", podUUID))
 	if !strings.Contains(got, "state=running") {
 		t.Errorf("unexpected result, got %q", got)
 		return
 	}
 
-	testCmd{ctx.ExecCmd("stop", podUUID)}.CombinedOutput(t)
+	combinedOutput(t, ctx.ExecCmd("stop", podUUID))
 
 	waitOrFail(t, child, 0)
 }
@@ -405,13 +472,9 @@ func (r retry) Retry(f func() error) error {
 	return err
 }
 
-type testCmd struct {
-	*exec.Cmd
-}
-
-func (c testCmd) CombinedOutput(t *testing.T) string {
+func combinedOutput(t *testing.T, c *exec.Cmd) string {
 	t.Log("Running", c.Args)
-	out, err := c.Cmd.CombinedOutput()
+	out, err := c.CombinedOutput()
 
 	if err != nil {
 		t.Fatal(err, "output", string(out))

From 04c374d888fb7f2b0f9beaca190dd2857197a323 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 17 Jan 2017 06:36:38 +0100
Subject: [PATCH 1018/1304] stage1/init/common/tests: disable
 TestAppToNspawnArgs*

Since EvaluateSymlinksInsideApp requires chroot now, these tests fail.
This disables them.
---
 stage1/init/common/pod_test.go | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/stage1/init/common/pod_test.go b/stage1/init/common/pod_test.go
index 04f98b61b1..288f214432 100644
--- a/stage1/init/common/pod_test.go
+++ b/stage1/init/common/pod_test.go
@@ -17,6 +17,7 @@ package common
 import (
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"regexp"
 	"testing"
 
@@ -79,7 +80,7 @@ var (
 // TestAppToNspawnArgsOverridesImageManifestReadOnly tests
 // that the ImageManifest's `readOnly` volume setting will be
 // overrided by PodManifest.
-func TestAppToNspawnArgsOverridesImageManifestReadOnly(t *testing.T) {
+func Disabled_TestAppToNspawnArgsOverridesImageManifestReadOnly(t *testing.T) {
 	tests := []struct {
 		imageManifestVolumeReadOnly bool
 		podManifestVolumeReadOnly   *bool
@@ -152,9 +153,15 @@ func TestAppToNspawnArgsOverridesImageManifestReadOnly(t *testing.T) {
 		tmpDir, err := ioutil.TempDir("", tstprefix)
 		if err != nil {
 			t.Errorf("error creating tempdir: %v", err)
+			continue
 		}
 		defer os.RemoveAll(tmpDir)
 
+		if err := os.MkdirAll(filepath.Join(tmpDir, "/stage1/rootfs/opt/stage2/rootfs"), 0755); err != nil {
+			t.Errorf("error stage2 rootfs in tmpdir: %v", err)
+			continue
+		}
+
 		p := &stage1commontypes.Pod{Manifest: podManifest, Root: tmpDir}
 		output, err := appToNspawnArgs(p, appManifest)
 		if err != nil {
@@ -177,7 +184,7 @@ func hasBindROArg(output []string) bool {
 	return false
 }
 
-func TestAppToNspawnArgsRecursive(t *testing.T) {
+func Disabled_TestAppToNspawnArgsRecursive(t *testing.T) {
 	tests := []struct {
 		podManifestVolumeRecursive *bool
 		expectRecursive            bool
@@ -230,9 +237,15 @@ func TestAppToNspawnArgsRecursive(t *testing.T) {
 		tmpDir, err := ioutil.TempDir("", tstprefix)
 		if err != nil {
 			t.Errorf("error creating tempdir: %v", err)
+			continue
 		}
 		defer os.RemoveAll(tmpDir)
 
+		if err := os.MkdirAll(filepath.Join(tmpDir, "/stage1/rootfs/opt/stage2/rootfs"), 0755); err != nil {
+			t.Errorf("error stage2 rootfs in tmpdir: %v", err)
+			continue
+		}
+
 		p := &stage1commontypes.Pod{Manifest: podManifest, Root: tmpDir}
 		output, err := appToNspawnArgs(p, appManifest)
 		if err != nil {

From d74b467ef55ec6369b14127ba9e1f11b23e03601 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Wed, 18 Jan 2017 10:12:44 +0100
Subject: [PATCH 1019/1304] stage1: fix incorrect splitting function

---
 common/cgroup/v1/cgroup.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/cgroup/v1/cgroup.go b/common/cgroup/v1/cgroup.go
index 076c81a1f4..35734ebea7 100644
--- a/common/cgroup/v1/cgroup.go
+++ b/common/cgroup/v1/cgroup.go
@@ -192,7 +192,7 @@ func fixCpusetKnobs(cpusetPath, subcgroup, knob string) error {
 		return err
 	}
 
-	dirs := filepath.SplitList(subcgroup)
+	dirs := strings.Split(subcgroup, "/")
 
 	// Loop over every entry in the hierarchy, putting in the parent's value
 	// unless there is one already there.

From 2eb98e5496c4cafc976a586691f2578f62ef9fda Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 17 Jan 2017 14:54:19 +0100
Subject: [PATCH 1020/1304] test/TestAppSandboxMount disable if env var is set

This test fails on semaphore due to an old kernel and thus is disabled
there via an env variable.
---
 tests/functional.mk           | 2 +-
 tests/rkt_app_sandbox_test.go | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/functional.mk b/tests/functional.mk
index 5751e9f223..eefd17cc3e 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -90,7 +90,7 @@ $(call forward-vars,$(FTST_FUNCTIONAL_TESTS_STAMP), \
 $(FTST_FUNCTIONAL_TESTS_STAMP): $(FTST_IMAGE) $(FTST_EMPTY_IMAGE) $(ACTOOL_STAMP) $(RKT_STAMP) $(FTST_ACE_MAIN_IMAGE) $(FTST_ACE_SIDEKICK_IMAGE) $(FTST_SS1_STAMP) | $(FTST_TEST_TMP) $(FTST_RKT_PATH) $(FTST_STAGE1_ALL_FLAVOR_SYMLINKS)
 	$(VQ) \
 	$(call vb,vt,GO TEST,$(REPO_PATH)/tests) \
-	sudo RKT_STAGE1_DEFAULT_FLAVOR="$(RKT_STAGE1_DEFAULT_FLAVOR)" \
+	sudo -E RKT_STAGE1_DEFAULT_FLAVOR="$(RKT_STAGE1_DEFAULT_FLAVOR)" \
 		RKT="$(FTST_RKT_PATH)" \
 		ACTOOL="$(ACTOOL)" \
 		RKT_INSPECT_IMAGE="$(FTST_IMAGE)" \
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index 29e6931ceb..de3597fd4e 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -348,6 +348,13 @@ func TestAppSandboxRestart(t *testing.T) {
 }
 
 func TestAppSandboxMount(t *testing.T) {
+	// this test hast to be skipped on semaphore for now,
+	// because it uses an outdated kernel hindering mount propagation,
+	// letting this test fail.
+	if os.Getenv("SEMAPHORE") == "true" {
+		t.Skip("skipped on semaphore")
+	}
+
 	mntSrcDir := mustTempDir("rkt-mount-test-")
 	defer os.RemoveAll(mntSrcDir)
 

From c3bdb5b298186f55ffa62b2e6c974ef257fa4369 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 19 Jan 2017 12:12:38 +0100
Subject: [PATCH 1021/1304] cloudinit: fix symlink from
 fedora-rawhide.cloudinit

---
 tests/cloudinit/fedora-rawhide.cloudinit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cloudinit/fedora-rawhide.cloudinit b/tests/cloudinit/fedora-rawhide.cloudinit
index 2130c0b72a..322c58a776 120000
--- a/tests/cloudinit/fedora-rawhide.cloudinit
+++ b/tests/cloudinit/fedora-rawhide.cloudinit
@@ -1 +1 @@
-fedora.cloudinit
\ No newline at end of file
+fedora-25.cloudinit
\ No newline at end of file

From 8a188be756eea039bfa83ed5839ae70df8ef81f0 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 19 Jan 2017 12:13:00 +0100
Subject: [PATCH 1022/1304] version: bump to v1.23.0

---
 CHANGELOG.md                         | 33 ++++++++++++++++++++++++++++
 Documentation/distributions.md       | 16 +++++++-------
 Documentation/proposals/oci.md       |  6 ++---
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  4 ++--
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 ++---
 ROADMAP.md                           |  8 +++----
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 19 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21819eed5e..4c66e93213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,36 @@
+## 1.23.0
+
+This release adds a lot of bugfixes around the rkt fly flavor, garbage collection, kvm, and the sandbox. The new experimental `app` subcommand now follows the semantic of CRI of not quitting prematurely if apps fail or exit. Finally docker2aci received an important update fixing issues with os/arch labels which caused issues on arm architectures, a big thanks here goes to @ybubnov for this contribution.
+
+### New features
+- sandbox: don't exit if an app fails ([#3478](https://github.com/coreos/rkt/pull/3478)). In contrast to regular `rkt run` behavior, the sandbox now does not quit if all or single apps fail or exit.
+
+### Bug fixes
+- stage1: fix incorrect splitting function ([#3541](https://github.com/coreos/rkt/pull/3541)).
+- sandbox/app-add: fix mount targets with absolute symlink targets ([#3490](https://github.com/coreos/rkt/pull/3490)).
+- namefetcher: fix nil pointer dereference ([#3536](https://github.com/coreos/rkt/pull/3536)).
+- Bump appc/docker2aci library version to 0.15.0 ([#3534](https://github.com/coreos/rkt/pull/3534)). This supports the conversion of images with various os/arch labels.
+- stage1: uid shift systemd files ([#3529](https://github.com/coreos/rkt/pull/3529)).
+- stage1/kvm/lkvm: chown files and dirs on creation ([#3485](https://github.com/coreos/rkt/pull/3485)).
+- stage1/fly: record pgid and let stop fallback to it ([#3523](https://github.com/coreos/rkt/pull/3523)).
+- common/overlay: allow data directory name with colon character ([#3505](https://github.com/coreos/rkt/pull/3505)).
+- api-service: stop erroring when a pod is running ([#3525](https://github.com/coreos/rkt/pull/3525)).
+- stage1/fly: clear FD_CLOEXEC only once ([#3521](https://github.com/coreos/rkt/pull/3521)).
+- stage1: Add hostname to /etc/hosts ([#3522](https://github.com/coreos/rkt/pull/3522)).
+- gc: avoid erroring in race to deletion ([#3515](https://github.com/coreos/rkt/pull/3515)).
+- tests/rkt_stop: Wait for 'stop' command to complete ([#3518](https://github.com/coreos/rkt/pull/3518)).
+- pkg/pod: avoid nil panic for missing pods ([#3514](https://github.com/coreos/rkt/pull/3514)).
+
+### Other changes
+- stage1: move more logic out of AppUnit ([#3496](https://github.com/coreos/rkt/pull/3496)).
+- tests: use appc schema instead of string templates ([#3520](https://github.com/coreos/rkt/pull/3520)).
+- stage1: kvm: Update kernel to 4.9.2 ([#3530](https://github.com/coreos/rkt/pull/3530)).
+- stage1: remount entire subcgroup r/w, instead of each knob ([#3494](https://github.com/coreos/rkt/pull/3494)).
+- tests: update AWS CI setup ([#3509](https://github.com/coreos/rkt/pull/3509)).
+- pkg/fileutil: helper function to get major, minor numbers of a device file ([#3500](https://github.com/coreos/rkt/pull/3500)). 
+- pkg/log: correctly handle var-arg printf params ([#3516](https://github.com/coreos/rkt/pull/3516)).
+- Documentation/stop: describe --uuid-file option ([#3511](https://github.com/coreos/rkt/pull/3511)).
+
 ## 1.22.0
 
 This is a stabilization release which includes better support for environments without systemd, improvements to GC behavior in complex scenarios, and several additional fixes.
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index b518e80b90..f1d2c088d7 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -132,19 +132,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt-1.22.0-1.x86_64.rpm
-wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt-1.22.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.22.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.22.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt-1.23.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt-1.23.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.23.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.23.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt_1.22.0-1_amd64.deb
-wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt_1.22.0-1_amd64.deb.asc
-gpg --verify rkt_1.22.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.22.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt_1.23.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt_1.23.0-1_amd64.deb.asc
+gpg --verify rkt_1.23.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.23.0-1_amd64.deb
 ```
 
 [coreos-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 88f2fba7e0..01dd93796c 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/coreos/rkt/blob/v1.22.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.22.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/coreos/rkt/blob/v1.22.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/coreos/rkt/blob/v1.23.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.23.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/coreos/rkt/blob/v1.23.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 66bdcf6bbb..00f25214b9 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.22.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.23.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.22.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.23.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 87efe7d6f5..9d057959b1 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.22.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.23.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.22.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.23.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index edfb8b5410..90197020f7 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.22.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.23.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.22.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.23.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index fabb64ff53..a561c1f6c4 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.22.0
+rkt Version: 1.23.0
 appc Version: 0.8.9
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 641cec1617..fdf7c1623e 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.22.0/rkt-v1.22.0.tar.gz
-tar xzvf rkt-v1.22.0.tar.gz
-cd rkt-v1.22.0
+wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt-v1.23.0.tar.gz
+tar xzvf rkt-v1.23.0.tar.gz
+cd rkt-v1.23.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
index b5b3cdf43b..05c3a5c7fc 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -14,13 +14,13 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 
 ## Next releases
 
-### rkt 1.22.0 (January)
+### rkt 1.24.0 (February)
 
-Up-to-date planning at https://github.com/coreos/rkt/milestone/56.
+Up-to-date planning at https://github.com/coreos/rkt/milestone/58.
 
-### rkt 1.23.0 (January)
+### rkt 1.25.0 (February)
 
-Up-to-date planning at https://github.com/coreos/rkt/milestone/57.
+Up-to-date planning at https://github.com/coreos/rkt/milestone/59.
 
 ### Upcoming
 
diff --git a/configure.ac b/configure.ac
index 8f7f9b6756..c039f30c64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.22.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.23.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 9f15c53665..9a8651e29a 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.22.0"
+version="1.23.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 74d0c9fa98..0ac80e4aff 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.22.0"
+            "value": "1.23.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 3ddbba574a..c5124a83a4 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.22.0"
+            "value": "1.23.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index f0004428b6..5824fd7ad2 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.22.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.23.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index abac98ba06..49ad73feff 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -35,7 +35,7 @@ func TestRunOverrideExec(t *testing.T) {
 	noappManifest := schema.ImageManifest{
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
-			{"version", "1.22.0"},
+			{"version", "1.23.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 821dbef57e..217f562ae3 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -46,7 +46,7 @@ func TestImageCatManifest(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.22.0"},
+			{"version", "1.23.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 9bcf190db2..5a9fe756e3 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -45,7 +45,7 @@ func TestImageExport(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.22.0"},
+			{"version", "1.23.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index e4a59c644d..f33383208c 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -55,7 +55,7 @@ func TestImageRender(t *testing.T) {
 			{ImageName: "coreos.com/rkt-inspect"},
 		},
 		Labels: types.Labels{
-			{"version", "1.22.0"},
+			{"version", "1.23.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index f96527c1a1..c09e6fcf75 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -58,7 +58,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"version", "1.22.0"},
+			{"version", "1.23.0"},
 		},
 	}
 

From eef3d7493c490ce6bc0cd25eedfe0d30b857481b Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 19 Jan 2017 12:13:00 +0100
Subject: [PATCH 1023/1304] version: bump to v1.23.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index c039f30c64..4e8a049580 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.23.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.23.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 5824fd7ad2..b6707e18c1 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.23.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.23.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 64a632623dedcc616c12d85bd23e91b76d3ee875 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Thu, 19 Jan 2017 13:34:20 -0800
Subject: [PATCH 1024/1304] image gc: don't remove images that currently
 running pods were made from

This commit changes the behavior of `rkt image gc` to pass over any
images from which currently running pods were created from, regardless
of how long ago the image was last used.
---
 rkt/image_gc.go | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/rkt/image_gc.go b/rkt/image_gc.go
index 250d97e468..ca02458285 100644
--- a/rkt/image_gc.go
+++ b/rkt/image_gc.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/appc/spec/schema"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/lock"
 	pkgPod "github.com/coreos/rkt/pkg/pod"
@@ -140,10 +141,17 @@ func gcStore(s *imagestore.Store, gracePeriod time.Duration) error {
 	if err != nil {
 		return errwrap.Wrap(errors.New("failed to get aciinfos"), err)
 	}
+	runningImages, err := getRunningImages()
+	if err != nil {
+		return errwrap.Wrap(errors.New("failed to get list of images for running pods"), err)
+	}
 	for _, ai := range aciinfos {
 		if time.Now().Sub(ai.LastUsed) <= gracePeriod {
 			break
 		}
+		if isInSet(ai.BlobKey, runningImages) {
+			break
+		}
 		imagesToRemove = append(imagesToRemove, ai.BlobKey)
 	}
 
@@ -153,3 +161,44 @@ func gcStore(s *imagestore.Store, gracePeriod time.Duration) error {
 
 	return nil
 }
+
+// getRunningImages will return the image IDs used to create any of the
+// currently running pods
+func getRunningImages() ([]string, error) {
+	var runningImages []string
+	var errors []error
+	err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeMostDirs, func(p *pkgPod.Pod) {
+		var pm schema.PodManifest
+		if p.State() != pkgPod.Running {
+			return
+		}
+		if !p.PodManifestAvailable() {
+			return
+		}
+		_, manifest, err := p.PodManifest()
+		if err != nil {
+			errors = append(errors, newPodListReadError(p, err))
+			return
+		}
+		pm = *manifest
+		for _, app := range pm.Apps {
+			runningImages = append(runningImages, app.Image.ID.String())
+		}
+	})
+	if err != nil {
+		return nil, err
+	}
+	if len(errors) > 0 {
+		return nil, errors[0]
+	}
+	return runningImages, nil
+}
+
+func isInSet(item string, set []string) bool {
+	for _, elem := range set {
+		if item == elem {
+			return true
+		}
+	}
+	return false
+}

From 9f2e2552bf2fcdaaf6f34aeca5ec653ec9784099 Mon Sep 17 00:00:00 2001
From: "Elijah C. Voigt" <elijah.caine@coreos.com>
Date: Thu, 19 Jan 2017 15:18:19 -0800
Subject: [PATCH 1025/1304] docs: Add --insecure-options list under table.

---
 Documentation/commands.md | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 34762c2556..92ecc1abae 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -67,15 +67,30 @@ In addition to the flags used by individual `rkt` commands, `rkt` has a set of g
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--cpuprofile (hidden flag)` | `` | A file path | Write CPU profile to the file |
+| `--cpuprofile (hidden flag)` | ''  | A file path | Write CPU profile to the file |
 | `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
 | `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**: All security features are enabled<br/>**http**: Allow HTTP connections. Be warned that this will send any credentials as clear text, allowing anybody with access to your network to obtain them. It will also perform no validation of the remote server, making it possible for an attacker to impersonate the remote server.<br/>**image**: Disables verifying image signatures. If someone is able to replace the image on the server with a modified one or is in a position to impersonate the server, they will be able to force you to run arbitrary code.<br/>**tls**: Accept any certificate from the server and any host name in that certificate. This will make it possible for attackers to spoof the remote server and provide malicious images.<br/>**ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time. If an attacker is able to modify the contents of your local filesystem, this will allow them to cause you to run arbitrary malicious code.<br/>**pubkey**: Allow fetching pubkeys via insecure connections (via HTTP connections or from servers with unverified certificates). This slightly extends the meaning of the `--trust-keys-from-https` flag. This will make it possible for an attacker to spoof the remote server, potentially providing fake keys and allowing them to provide container images that have been tampered with.<br/>**capabilities**: Gives all [capabilities][capabilities] to apps. This makes it easier for an attacker who can gain control over a single container to exploit kernel vulnerabilities and potentially escape from that container.<br/>**paths**: Disables inaccessible and read-only paths. This makes it easier for an attacker who can gain control over a single container to execute code in the host system, potentially allowing them to escape from the container.<br/>**seccomp**: Disables [seccomp][seccomp]. This increases the attack surface available to an attacker who can gain control over a single container, potentially making it easier for them to escape from the container.<br/>**all-fetch**: Disables the following security checks: image, tls, http<br/>**all-run**: Disables the following security checks: ondisk, capabilities, paths, seccomp<br/>**all**: Disables all security checks | Comma-separated list of security features to disable |
+| `--insecure-options` |  none | **none**, **http**, **image**, **tls**, **ondisk**, **pubkey**, **capabilities**, **paths**, **seccomp**, **all-fetch**, **all-run**, **all** <br/> More information below. | Comma-separated list of security features to disable |
 | `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
-| `--memprofile (hidden flag)` | `` | A file path | Write memory profile to the file |
+| `--memprofile (hidden flag)` | '' | A file path | Write memory profile to the file |
 | `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
 | `--trust-keys-from-https` |  `false` | `true` or `false` | Automatically trust gpg keys fetched from HTTPS (or HTTP if the insecure `pubkey` option is also specified) |
-| `--user-config` |  `` | A directory path | Path to the user configuration directory |
+| `--user-config` | '' | A directory path | Path to the user configuration directory |
+
+### `--insecure-options`
+
+- **none**: All security features are enabled
+- **http**: Allow HTTP connections. Be warned that this will send any credentials as clear text, allowing anybody with access to your network to obtain them. It will also perform no validation of the remote server, making it possible for an attacker to impersonate the remote server. This applies specifically to fetching images, signatures, and gpg pubkeys.
+- **image**: Disables verifying image signatures. If someone is able to replace the image on the server with a modified one or is in a position to impersonate the server, they will be able to force you to run arbitrary code.
+- **tls**: Accept any certificate from the server and any host name in that certificate. This will make it possible for attackers to spoof the remote server and provide malicious images.
+- **ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time. If an attacker is able to modify the contents of your local filesystem, this will allow them to cause you to run arbitrary malicious code.
+- **pubkey**: Allow fetching pubkeys via insecure connections (via HTTP connections or from servers with unverified certificates). This slightly extends the meaning of the `--trust-keys-from-https` flag. This will make it possible for an attacker to spoof the remote server, potentially providing fake keys and allowing them to provide container images that have been tampered with.
+- **capabilities**: Gives all [capabilities][capabilities] to apps. This allows an attacker that is able to execute code in the container to trivially escalate to root privileges on the host. 
+- **paths**: Disables inaccessible and read-only paths. This makes it easier for an attacker who can gain control over a single container to execute code in the host system, potentially allowing them to escape from the container. This also leaks additional information.
+- **seccomp**: Disables [seccomp][seccomp]. This increases the attack surface available to an attacker who can gain control over a single container, potentially making it easier for them to escape from the container.
+- **all-fetch**: Disables the following security checks: image, tls, http
+- **all-run**: Disables the following security checks: ondisk, capabilities, paths, seccomp
+- **all**: Disables all security checks
 
 ## Logging
 

From a472a38100fb890420293dcef74b4b2ec45c72ca Mon Sep 17 00:00:00 2001
From: Yakau Bubnou <ybubnou@infoblox.com>
Date: Tue, 24 Jan 2017 22:34:09 +0300
Subject: [PATCH 1026/1304] travis: remove "gimme.local" script

This patch removes a "gimme.local" script used within the Travis CI
in order to install the correct version of the Go compiler for aarch64
architecture as the version for Travis was broken.

An issue was fixed in the Travis CI itself, therefore the copy of
"gimme.local" is no longer required within rkt source tree. Updated
the configuration of Travis CI accordingly.
---
 .travis.yml |  36 ++--
 gimme.local | 481 ----------------------------------------------------
 2 files changed, 22 insertions(+), 495 deletions(-)
 delete mode 100755 gimme.local

diff --git a/.travis.yml b/.travis.yml
index 7f30f9051d..3613af8253 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ go:
   - 1.7
 
 env:
-  - TARGET=amd64
-  - TARGET=arm64
+  - TARGET=amd64 GIMME_ARCH=amd64
+  - TARGET=arm64 GIMME_ARCH=arm64 GIMME_CGO_ENABLED=1
 
 addons:
   apt:
@@ -28,16 +28,24 @@ addons:
 install:
   -
 
+# Build host and fly to ensure we build stage1 init. We don't build everything
+# to avoid downloading large images.
 script:
- # Build host and fly to ensure we build stage1 init. We don't build everything
- # to avoid downloading large images.
- -      if [ "${TARGET}" == "amd64" ]; then
-                ./autogen.sh;
-                ./configure --with-stage1-flavors=host,fly --enable-tpm=auto;
-                make unit-check manpages bash-completion;
-        elif [ "${TARGET}" == "arm64" ]; then
-                eval "$(GIMME_ARCH=${TARGET} GIMME_CGO_ENABLED=1 ./gimme.local ${TRAVIS_GO_VERSION})";
-                ./autogen.sh;
-                ./configure --host=aarch64-linux-gnu --with-stage1-flavors=host,fly --enable-tpm=auto;
-                make V=2;
-        fi
+  - sh autogen.sh
+
+  - test "${TARGET}" = "amd64"
+    && export CONFIGURE_ARCH="x86_64"
+    && export CONFIGURE_MAKE="unit-check manpages bash-completion"
+    || true
+
+  - test "${TARGET}" = "arm64"
+    && export CONFIGURE_ARCH="aarch64-linux-gnu"
+    && export CONFIGURE_MAKE="V=2"
+    || true
+
+  - sh configure
+        --host=$CONFIGURE_ARCH
+        --with-stage1-flavors=host,fly
+        --enable-tpm=auto
+
+  - make $CONFIGURE_MAKE
diff --git a/gimme.local b/gimme.local
deleted file mode 100755
index 9a2afe69d7..0000000000
--- a/gimme.local
+++ /dev/null
@@ -1,481 +0,0 @@
-#!/bin/bash
-# vim:noexpandtab:ts=2:sw=2:
-#
-#+  Usage: $(basename $0) [flags] [go-version] [version-prefix]
-#+  -
-#+  Version: ${GIMME_VERSION}
-#+  -
-#+  Install go!  There are multiple types of installations available, with 'auto' being the default.
-#+  If either 'auto' or 'binary' is specified as GIMME_TYPE, gimme will first check for an existing
-#+  go installation.  This behavior may be disabled by providing '-f/--force/force' as first positional
-#+  argument.
-#+  -
-#+  Option flags:
-#+          -h --help help - show this help text and exit
-#+    -V --version version - show the version only and exit
-#+        -f --force force - remove the existing go installation if present prior to install
-#+          -l --list list - list installed go versions and exit
-#+  -
-#+  Influential env vars:
-#+  -
-#+        GIMME_GO_VERSION - version to install (*REQUIRED*, may be given as first positional arg)
-#+    GIMME_VERSION_PREFIX - prefix for installed versions (default '${GIMME_VERSION_PREFIX}',
-#+                           may be given as second positional arg)
-#+              GIMME_ARCH - arch to install (default '${GIMME_ARCH}')
-#+        GIMME_BINARY_OSX - darwin-specific binary suffix (default '${GIMME_BINARY_OSX}')
-#+        GIMME_ENV_PREFIX - prefix for env files (default '${GIMME_ENV_PREFIX}')
-#+     GIMME_GO_GIT_REMOTE - git remote for git-based install (default '${GIMME_GO_GIT_REMOTE}')
-#+                GIMME_OS - os to install (default '${GIMME_OS}')
-#+               GIMME_TMP - temp directory (default '${GIMME_TMP}')
-#+              GIMME_TYPE - install type to perform ('auto', 'binary', 'source', or 'git')
-#+                           (default '${GIMME_TYPE}')
-#+             GIMME_DEBUG - enable tracing if non-empty
-#+      GIMME_NO_ENV_ALIAS - disable creation of env 'alias' file when os and arch match host
-#+        GIMME_SILENT_ENV - omit the 'go version' line from env file
-#+       GIMME_CGO_ENABLED - enable build of cgo support
-#+     GIMME_CC_FOR_TARGET - cross compiler for cgo support
-#+  -
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2015 Dan Buch, Tianon Gravi
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-set -e
-shopt -s nullglob
-set -o pipefail
-
-[[ ${GIMME_DEBUG} ]] && set -x
-
-GIMME_VERSION=v0.2.3
-
-# _do_curl "url" "file"
-_do_curl() {
-	mkdir -p "$(dirname "${2}")"
-
-	if command -v curl > /dev/null ; then
-		curl -sSLf "${1}" -o "${2}" 2>/dev/null
-		return
-	fi
-
-	if command -v wget > /dev/null ; then
-		wget -q "${1}" -O "${2}" 2>/dev/null
-		return
-	fi
-
-	echo >&2 'error: no curl or wget found'
-	exit 1
-}
-
-# _do_curls "file" "url" ["url"...]
-_do_curls() {
-	f="${1}"
-	shift
-	[[ ! -s "${f}" ]] || return 0
-	for url in "${@}" ; do
-		if _do_curl "${url}" "${f}" ; then
-			return
-		fi
-	done
-	rm -f "${f}"
-	return 1
-}
-
-# _binary "version" "file.tar.gz" "arch"
-_binary() {
-	local version=${1}
-	local file=${2}
-	local arch=${3}
-	urls=(
-		"https://storage.googleapis.com/golang/go${version}.${GIMME_OS}-${arch}.tar.gz"
-		"https://go.googlecode.com/files/go${version}.${GIMME_OS}-${arch}.tar.gz"
-		"https://go.googlecode.com/files/go.${version}.${GIMME_OS}-${arch}.tar.gz"
-	)
-	if [ "${GIMME_OS}" = 'darwin' -a "${GIMME_BINARY_OSX}" ] ; then
-		urls=(
-			"https://storage.googleapis.com/golang/go${version}.${GIMME_OS}-${arch}-${GIMME_BINARY_OSX}.tar.gz"
-			"${urls[@]}"
-		)
-	fi
-	if [ "${arch}" = 'arm' ] ; then
-		# attempt "armv6l" vs just "arm" first (since that's what's officially published)
-		urls=(
-			"https://storage.googleapis.com/golang/go${version}.${GIMME_OS}-${arch}v6l.tar.gz" # go1.6beta2 & go1.6rc1
-			"https://storage.googleapis.com/golang/go${version}.${GIMME_OS}-${arch}6.tar.gz" # go1.6beta1
-			"${urls[@]}"
-		)
-	fi
-	_do_curls "${file}" "${urls[@]}"
-}
-
-# _source "version" "file.src.tar.gz"
-_source() {
-	urls=(
-		"https://storage.googleapis.com/golang/go${1}.src.tar.gz"
-		"https://go.googlecode.com/files/go${1}.src.tar.gz"
-		"https://go.googlecode.com/files/go.${1}.src.tar.gz"
-	)
-	_do_curls "${2}" "${urls[@]}"
-}
-
-# _fetch "dir"
-_fetch() {
-	mkdir -p "$(dirname "${1}")"
-
-	if [[ -d "${1}/.git" ]] ; then
-		(
-			cd "${1}"
-			git remote set-url origin "${GIMME_GO_GIT_REMOTE}"
-			git fetch -q --all && git fetch -q --tags
-		)
-		return
-	fi
-
-	git clone -q "${GIMME_GO_GIT_REMOTE}" "${1}"
-}
-
-# _checkout "version" "dir"
-_checkout() {
-	_fetch "${2}"
-	( cd "${2}" && {
-		git reset -q --hard "origin/${1}" \
-		|| git reset -q --hard "origin/go${1}" \
-		|| { [ "${1}" = 'tip' ] && git reset -q --hard origin/master ; } \
-		|| git reset -q --hard "refs/tags/${1}" \
-		|| git reset -q --hard "refs/tags/go${1}"
-	} 2>/dev/null )
-}
-
-# _extract "file.tar.gz" "dir"
-_extract() {
-	mkdir -p "${2}"
-	tar -xf "${1}" -C "${2}" --strip-components 1
-}
-
-# _setup_bootstrap
-_setup_bootstrap() {
-	local versions=("1.6" "1.5" "1.4")
-
-	# try existing
-	for v in "${versions[@]}" ; do
-		for candidate in "${GIMME_ENV_PREFIX}/go${v}"*".env" ; do
-			if [ -s "$candidate" ]; then
-				export GOROOT_BOOTSTRAP="$(source "${candidate}" 2>/dev/null && go env GOROOT)"
-				return 0
-			fi
-		done
-	done
-
-	# try binary
-	for v in "${versions[@]}" ; do
-		if [ -n  "$(_try_binary ${v} "${GIMME_HOSTARCH}")" ]; then
-			export GOROOT_BOOTSTRAP="${GIMME_VERSION_PREFIX}/go${v}.${GIMME_OS}.${GIMME_HOSTARCH}"
-			return 0
-		fi
-	done
-
-	echo >&2 "Unable to setup go bootstrap from existing or binary";
-	return 1;
-}
-
-# _compile "dir"
-_compile() {
-	(
-		if grep -q GOROOT_BOOTSTRAP "${1}/src/make.bash" &> /dev/null; then
-			_setup_bootstrap || return 1
-		fi
-		cd "${1}"
-		if [[ -d .git ]] ; then
-			git clean -dfx -q
-		fi
-		cd src
-		export GOOS="${GIMME_OS}" GOARCH="${GIMME_ARCH}"
-		export CGO_ENABLED="${GIMME_CGO_ENABLED}"
-		export CC_FOR_TARGET="${GIMME_CC_FOR_TARGET}"
-
-		if [ "${GIMME_DEBUG}" = "2" ]; then
-			./make.bash 1>&2 || return 1
-		else
-			local make_log="${1}/make.${GOOS}.${GOARCH}.log"
-			./make.bash &> $make_log || return 1
-		fi
-	)
-}
-
-_can_compile() {
-	cat > "${GIMME_TMP}/test.go" <<'EOF'
-package main
-import "os"
-func main() {
-	os.Exit(0)
-}
-EOF
-	"${1}/bin/go" run "${GIMME_TMP}/test.go"
-}
-
-# _env "dir"
-_env() {
-	[ -d "${1}/bin" -a -x "${1}/bin/go" ] || return 1
-
-	# if we try to run a Darwin binary on Linux, we need to fail so 'auto' can fallback to cross-compiling from source
-	# automatically
-	GOROOT="${1}" "${1}/bin/go" version &> /dev/null || return 1
-
-	# https://twitter.com/davecheney/status/431581286918934528
-	# we have to GOROOT sometimes because we use official release binaries in unofficial locations :(
-
-	echo
-	if [[ "$(GOROOT="${1}" "${1}/bin/go" env GOHOSTOS)" = "${GIMME_OS}" ]] ; then
-		echo 'unset GOOS'
-	else
-		echo 'export GOOS="'"${GIMME_OS}"'"'
-	fi
-	if [[ "$(GOROOT="${1}" "${1}/bin/go" env GOHOSTARCH)" = "${GIMME_ARCH}" ]] ; then
-		echo 'unset GOARCH'
-	else
-		echo 'export GOARCH="'"${GIMME_ARCH}"'"'
-	fi
-	if ! _can_compile "${1}" >/dev/null 2>&1 ; then
-		# if the compile test fails without GOROOT, then we probably need GOROOT
-		echo 'export GOROOT="'"${1}"'"'
-	else
-		echo 'unset GOROOT'
-	fi
-	echo 'export PATH="'"${1}/bin"':${PATH}"'
-	if [[ -z "${GIMME_SILENT_ENV}" ]] ; then
-		echo 'go version >&2'
-	fi
-	echo
-}
-
-# _env_alias "dir" "env-file"
-_env_alias() {
-	if [[ "${GIMME_NO_ENV_ALIAS}" ]] ; then
-		echo "${2}"
-		return
-	fi
-
-	if [[ "$(GOROOT="${1}" "${1}/bin/go" env GOHOSTOS)" = "${GIMME_OS}"  && \
-		"$(GOROOT="${1}" "${1}/bin/go" env GOHOSTARCH)" = "${GIMME_ARCH}" ]] ; then
-		local dest="${GIMME_ENV_PREFIX}/go${GIMME_GO_VERSION}.env"
-		cp "${2}" "${dest}"
-		ln -sf "${dest}" "${GIMME_ENV_PREFIX}/latest.env"
-		echo "${dest}"
-	else
-		echo "${2}"
-	fi
-}
-
-_try_existing() {
-	local existing_ver="${GIMME_VERSION_PREFIX}/go${GIMME_GO_VERSION}.${GIMME_OS}.${GIMME_ARCH}"
-	local existing_env="${GIMME_ENV_PREFIX}/go${GIMME_GO_VERSION}.${GIMME_OS}.${GIMME_ARCH}.env"
-
-	if [[ -x "${existing_ver}/bin/go" &&  -s "${existing_env}" ]] ; then
-		cat "${existing_env}"
-		return
-	fi
-
-	return 1
-}
-
-# _try_binary "version" "arch"
-_try_binary() {
-	local version=${1}
-	local arch=${2}
-	local bin_tgz="${GIMME_TMP}/go${version}.${GIMME_OS}.${arch}.tar.gz"
-	local bin_dir="${GIMME_VERSION_PREFIX}/go${version}.${GIMME_OS}.${arch}"
-	local bin_env="${GIMME_ENV_PREFIX}/go${version}.${GIMME_OS}.${arch}.env"
-
-	_binary "${version}" "${bin_tgz}" "${arch}" || return 1
-	_extract "${bin_tgz}" "${bin_dir}" || return 1
-	_env "${bin_dir}" | tee "${bin_env}" || return 1
-	echo "export GIMME_ENV=\"$(_env_alias "${bin_dir}" "${bin_env}")\""
-}
-
-_try_source() {
-	local src_tgz="${GIMME_TMP}/go${GIMME_GO_VERSION}.src.tar.gz"
-	local src_dir="${GIMME_VERSION_PREFIX}/go${GIMME_GO_VERSION}.src"
-	local src_env="${GIMME_ENV_PREFIX}/go${GIMME_GO_VERSION}.${GIMME_OS}.${GIMME_ARCH}.env"
-
-	_source "${GIMME_GO_VERSION}" "${src_tgz}" || return 1
-	_extract "${src_tgz}" "${src_dir}" || return 1
-	_compile "${src_dir}" || return 1
-	_env "${src_dir}" | tee "${src_env}" || return 1
-	echo "export GIMME_ENV=\"$(_env_alias "${src_dir}" "${src_env}")\""
-}
-
-_try_git() {
-	local git_dir="${GIMME_VERSION_PREFIX}/go"
-	local git_env="${GIMME_ENV_PREFIX}/go.git.${GIMME_OS}.${GIMME_ARCH}.env"
-
-	_checkout "${GIMME_GO_VERSION}" "${git_dir}" || return 1
-	_compile "${git_dir}" || return 1
-	_env "${git_dir}" | tee "${git_env}" || return 1
-	echo "export GIMME_ENV=\"$(_env_alias "${git_dir}" "${git_env}")\""
-}
-
-_wipe_version() {
-	local env_file="${GIMME_ENV_PREFIX}/go${1}.${GIMME_OS}.${GIMME_ARCH}.env"
-
-	if [[ -s "${env_file}" ]] ; then
-		rm -rf "$(awk -F\" '/GOROOT/ { print $2 }' "${env_file}")"
-		rm -f "${env_file}"
-	fi
-}
-
-_list_versions() {
-	if [ ! -d "${GIMME_VERSION_PREFIX}" ] ; then
-		return 0
-	fi
-
-	local current_version="$(go env GOROOT 2>/dev/null)"
-	current_version="${current_version##*/go}"
-	current_version="${current_version%%.${GIMME_OS}.*}"
-
-	for d in "${GIMME_VERSION_PREFIX}/go"*".${GIMME_OS}."* ; do
-		local cleaned="${d##*/go}"
-		cleaned="${cleaned%%.${GIMME_OS}.*}"
-		echo -en "${cleaned}"
-		if [[ $cleaned = $current_version ]] ; then
-			echo -en >&2 ' <= current'
-		fi
-		echo
-	done
-}
-
-_realpath() {
-	[ -d "$1" ] && echo "$(cd "$1" && pwd)" || echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
-}
-
-_assert_version_given() {
-	if [[ -z "${GIMME_GO_VERSION}" ]] ; then
-		echo >&2 'error: no GIMME_GO_VERSION supplied'
-		echo >&2 "  ex: GIMME_GO_VERSION=1.4.1 ${0} ${@}"
-		echo >&2 "  ex: ${0} 1.4.1 ${@}"
-		exit 1
-	fi
-}
-
-: ${GIMME_OS:=$(uname -s | tr '[:upper:]' '[:lower:]')}
-: ${GIMME_HOSTOS:=$(uname -s | tr '[:upper:]' '[:lower:]')}
-: ${GIMME_ARCH:=$(uname -m)}
-: ${GIMME_HOSTARCH:=$(uname -m)}
-: ${GIMME_ENV_PREFIX:=${HOME}/.gimme/envs}
-: ${GIMME_VERSION_PREFIX:=${HOME}/.gimme/versions}
-: ${GIMME_TMP:=${TMPDIR:-/tmp}/gimme}
-: ${GIMME_GO_GIT_REMOTE:=https://github.com/golang/go.git}
-: ${GIMME_TYPE:=auto} # 'auto', 'binary', 'source', or 'git'
-: ${GIMME_BINARY_OSX:=osx10.8}
-
-while [[ $# -gt 0 ]]; do
-	case "${1}" in
-		-h|--help|help|wat)
-			_old_ifs="$IFS"
-			IFS=';'
-			awk '/^#\+  / {
-				sub(/^#\+  /, "", $0) ;
-				sub(/-$/, "", $0) ;
-				print $0
-			}' "$0" | while read line ; do
-				eval "echo \"$line\""
-			done
-			IFS="$_old_ifs"
-			exit 0
-		;;
-		-V|--version|version)
-			echo "${GIMME_VERSION}"
-			exit 0
-		;;
-		-l|--list|list)
-			_list_versions
-			exit 0
-		;;
-		-f|--force|force)
-			force=1
-		;;
-		*)
-			break
-		;;
-	esac
-	shift
-done
-
-if [[ -n "${1}" ]] ; then
-	GIMME_GO_VERSION="${1}"
-fi
-if [[ -n "${2}" ]] ; then
-	GIMME_VERSION_PREFIX="${2}"
-fi
-
-case "${GIMME_ARCH}" in
-	x86_64) GIMME_ARCH=amd64 ;;
-	x86) GIMME_ARCH=386 ;;
-	arm64)
-		if [[ "${GIMME_GO_VERSION}" < "1.5" ]]; then
-			echo >&2 "error: ${GIMME_ARCH} is not supported by this go version"
-			echo >&2 "try go1.5 or newer"
-			exit 1
-		fi
-		if [[ "${GIMME_HOSTOS}" = "linux" && "${GIMME_HOSTARCH}" != "${GIMME_ARCH}" ]]; then
-			: ${GIMME_CC_FOR_TARGET:="aarch64-linux-gnu-gcc"}
-		fi
-	;;
-	arm*) GIMME_ARCH=arm ;;
-esac
-
-case "${GIMME_HOSTARCH}" in
-	x86_64) GIMME_HOSTARCH=amd64 ;;
-	x86) GIMME_HOSTARCH=386 ;;
-	arm64) ;;
-	arm*) GIMME_HOSTARCH=arm ;;
-esac
-
-_assert_version_given "$@"
-
-[ ${force} ] && _wipe_version "${GIMME_GO_VERSION}"
-
-unset GOARCH
-unset GOBIN
-unset GOOS
-unset GOPATH
-unset GOROOT
-unset CGO_ENABLED
-unset CC_FOR_TARGET
-
-mkdir -p "${GIMME_VERSION_PREFIX}" "${GIMME_ENV_PREFIX}"
-
-GIMME_VERSION_PREFIX="$(_realpath "${GIMME_VERSION_PREFIX}")"
-GIMME_ENV_PREFIX="$(_realpath "${GIMME_ENV_PREFIX}")"
-
-if ! case "${GIMME_TYPE}" in
-	binary) _try_existing || _try_binary "${GIMME_GO_VERSION}" "${GIMME_ARCH}" ;;
-	source) _try_source || _try_git ;;
-	git)    _try_git ;;
-	auto)   _try_existing || _try_binary  "${GIMME_GO_VERSION}" "${GIMME_ARCH}" || _try_source || _try_git ;;
-	*)
-		echo >&2 "I don't know how to '${GIMME_TYPE}'."
-		echo >&2 "  Try 'auto', 'binary', 'source', or 'git'."
-		exit 1
-		;;
-esac ; then
-	echo >&2 "I don't have any idea what to do with '${GIMME_GO_VERSION}'."
-	echo >&2 "  (using type '${GIMME_TYPE}')"
-	exit 1
-fi

From 2a4b27fa0cbb9a875aaf84914fd5397af98bbc39 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Thu, 26 Jan 2017 09:13:24 +0000
Subject: [PATCH 1027/1304] tests: remove gexpect from TestAppUserGroup

TestAppUserGroup currently uses gexpect but does not need any
interactivity. This commit switches it away to use golang process
spawning and regexp matching.
---
 tests/rkt_run_user_group_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
index 820580f9d6..8e69a1dd7d 100644
--- a/tests/rkt_run_user_group_test.go
+++ b/tests/rkt_run_user_group_test.go
@@ -118,7 +118,7 @@ func TestAppUserGroup(t *testing.T) {
 					image, tt.rktParams,
 					imageDummy,
 				)
-				runRktAndCheckOutput(t, rktCmd, tt.expected, false)
+				runRktAndCheckRegexOutput(t, rktCmd, tt.expected)
 
 				// run the user/group overridden app last
 				rktCmd = fmt.Sprintf(
@@ -128,7 +128,7 @@ func TestAppUserGroup(t *testing.T) {
 					imageDummy,
 					image, tt.rktParams,
 				)
-				runRktAndCheckOutput(t, rktCmd, tt.expected, false)
+				runRktAndCheckRegexOutput(t, rktCmd, tt.expected)
 			}
 		}()
 	}

From 498207d42d996b41395ded870dfe3b7792c665f6 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 20 Jan 2017 20:20:45 +0100
Subject: [PATCH 1028/1304] makelib: introduce --enable-incremental-build,
 enabling "go install"

This change decreases incremental compilation time by 50% on my machine
for stage0 builds.

stage1 binaries are much smaller so there is no significant improvement
in compilation speed.

Small change in rkt/main.go:
```
$ time make
  GO           github.com/coreos/rkt/rkt
  ACTOOL       build-rkt/target/bin/stage1-coreos.aci

real    0m13.086s
user    0m11.797s
sys 0m1.323s
```

Small change in stage1/init/init.go:
```
$ time make
  GO           github.com/coreos/rkt/stage1/init
  ACTOOL       build-rkt/target/bin/stage1-coreos.aci

real    0m11.615s
user    0m10.047s
sys 0m1.083s
```

The same with "go build":

Small change in rkt/main.go:
```
$ time make
  GO           github.com/coreos/rkt/rkt
  ACTOOL       build-rkt/target/bin/stage1-coreos.aci

real    0m21.573s
user    0m32.907s
sys 0m2.177s
```

Small change in stage1/init/init.go:
```
$ time make
  GO           github.com/coreos/rkt/stage1/init
  ACTOOL       build-rkt/target/bin/stage1-coreos.aci

real    0m11.365s
user    0m10.777s
sys 0m1.083s
```
---
 Documentation/build-configure.md      | 10 ++++++++++
 Documentation/devel/quickstart-dev.md |  2 +-
 Makefile.in                           |  2 ++
 configure.ac                          |  9 +++++++++
 makelib/build_go_bin.mk               | 12 ++++++++++++
 makelib/variables.mk                  |  7 +++++++
 tests/functional.mk                   |  2 +-
 tools/quickrm/main.go                 | 21 +++++++++++++++++----
 8 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/Documentation/build-configure.md b/Documentation/build-configure.md
index 19e4716bc5..4ee53d8b85 100644
--- a/Documentation/build-configure.md
+++ b/Documentation/build-configure.md
@@ -161,5 +161,15 @@ This option to enable [logging to the TPM][rkt-tpm] is set by default. For loggi
 
 This option to allow building rkt with go having known security issues is unset by default. Use it with caution.
 
+## Development
+
+#### `--enable-incremental-build`
+
+This option enables incremental compilation. This is useful for local development.
+In contrast to a release build this option enables `go install` vs `go build`
+which decreases incremental compilation time.
+Note that this option is not supported in cross-compile builds.
+For this reason the incremental build option must not be used for release builds.
+
 [rkt-tpm]: devel/tpm.md
 [trousers]: http://trousers.sourceforge.net/
diff --git a/Documentation/devel/quickstart-dev.md b/Documentation/devel/quickstart-dev.md
index 63d4528d97..dd786850d8 100644
--- a/Documentation/devel/quickstart-dev.md
+++ b/Documentation/devel/quickstart-dev.md
@@ -58,7 +58,7 @@ Run the autogen and configure commands with the relevant arguments, for example
 
 ```sh
 $ cd ~/Repos/rkt
-$ ./autogen.sh && ./configure --enable-functional-tests --with-stage1-flavors=kvm
+$ ./autogen.sh && ./configure --enable-functional-tests --enable-incremental-build --with-stage1-flavors=kvm
 ```
 
 Now build rkt with:
diff --git a/Makefile.in b/Makefile.in
index 33a28cb011..5db6837d54 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,6 +55,8 @@ RKT_DEFINES_FOR_ENTER := @RKT_DEFINES_FOR_ENTER@
 
 RKT_RUN_FUNCTIONAL_TESTS := @RKT_RUN_FUNCTIONAL_TESTS@
 
+INCREMENTAL_BUILD := @INCREMENTAL_BUILD@
+
 GOARCH := @GOARCH@
 GOARM := @GOARM@
 GOARCH_FOR_BUILD := @GOARCH_FOR_BUILD@
diff --git a/configure.ac b/configure.ac
index 4e8a049580..a590448e16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,13 @@ AC_ARG_ENABLE([functional-tests],
               [RKT_RUN_FUNCTIONAL_TESTS="${enableval}"],
               [RKT_RUN_FUNCTIONAL_TESTS="no"])
 
+## Incremental build
+
+AC_ARG_ENABLE([incremental-build],
+              [AS_HELP_STRING([--enable-incremental-build],
+                              [enable incremental build. Note: this does not work for cross compile builds.])],
+              [INCREMENTAL_BUILD="${enableval}"],
+              [INCREMENTAL_BUILD="no"])
 ## TPM
 
 AC_ARG_ENABLE([tpm],
@@ -797,6 +804,7 @@ AC_SUBST(RKT_STAGE1_COREOS_BOARD)
 AC_SUBST(RKT_STAGE1_INTERPRETER)
 
 AC_SUBST(RKT_RUN_FUNCTIONAL_TESTS)
+AC_SUBST(INCREMENTAL_BUILD)
 
 AC_SUBST(GOARCH)
 AC_SUBST(GOARM)
@@ -882,6 +890,7 @@ AC_MSG_RESULT([
         other build parameters
 
         functional tests enabled:               '${RKT_RUN_FUNCTIONAL_TESTS}'
+        incremental build:                      '${INCREMENTAL_BUILD}'
         features:                               '${RKT_FEATURES}'
         ACI arch:                               '${RKT_ACI_ARCH}'
         go version:                             '${GO_VERSION}'
diff --git a/makelib/build_go_bin.mk b/makelib/build_go_bin.mk
index 0b42b20081..d470fd9e43 100644
--- a/makelib/build_go_bin.mk
+++ b/makelib/build_go_bin.mk
@@ -43,11 +43,23 @@ $(call setup-dep-file,_BGB_KV_DEPMK,$(_BGB_PKG_NAME_)/kv)
 
 $(call forward-vars,$(BGB_BINARY), \
 	BGB_ADDITIONAL_GO_ENV GO_ENV GO BGB_GO_FLAGS _BGB_PKG_NAME_)
+
+ifeq ($(INCREMENTAL_BUILD),yes)
+
+$(BGB_BINARY): $(_BGB_PATH_) $(_BGB_RKT_SYMLINK_STAMP_)
+	$(VQ) \
+	$(call vb,vt,GO,$(call vsg,$(_BGB_PKG_NAME_))) \
+	$(GO_ENV) $(BGB_ADDITIONAL_GO_ENV) GOBIN=$(dir $(@)) "$(GO)" install -pkgdir $(GOPATH)/pkg $(call v3,-v -x) $(BGB_GO_FLAGS) "$(_BGB_PKG_NAME_)"
+
+else
+
 $(BGB_BINARY): $(_BGB_PATH_) $(_BGB_RKT_SYMLINK_STAMP_)
 	$(VQ) \
 	$(call vb,vt,GO,$(call vsg,$(_BGB_PKG_NAME_))) \
 	$(GO_ENV) $(BGB_ADDITIONAL_GO_ENV) "$(GO)" build $(call v3,-v -x) -o "$@" $(BGB_GO_FLAGS) "$(_BGB_PKG_NAME_)"
 
+endif
+
 $(call generate-go-deps,$(_BGB_GO_DEPMK_STAMP_),$(BGB_BINARY),$(_BGB_GO_DEPMK),$(BGB_PKG_IN_REPO))
 $(call generate-kv-deps,$(_BGB_KV_DEPMK_STAMP_),$(BGB_BINARY),$(_BGB_KV_DEPMK),BGB_GO_FLAGS)
 
diff --git a/makelib/variables.mk b/makelib/variables.mk
index 1aa22cc148..37fd8f5134 100644
--- a/makelib/variables.mk
+++ b/makelib/variables.mk
@@ -26,8 +26,11 @@ QUICKRMTOOL := $(TOOLSDIR)/quickrm
 GO_TEST_PACKAGES ?= ./...
 GO_TEST_FUNC_ARGS ?=
 
+GOOS := $(shell "$(GO)" env GOOS)
+
 GO_ENV := $(strip \
 	GO15VENDOREXPERIMENT=1 \
+	GOOS="$(GOOS)" \
 	GOARCH="$(GOARCH)" \
 	$(if $(GOARM),GOARM="$(GOARM)") \
 	CGO_ENABLED=1 \
@@ -48,3 +51,7 @@ CREATE_DIRS += \
 	$(FILELISTDIR) \
 	$(MAINTEMPDIR) \
 	$(CLEANDIR)
+
+CLEAN_DIRS += \
+	$(GOPATH)/bin \
+	$(GOPATH)/pkg
diff --git a/tests/functional.mk b/tests/functional.mk
index eefd17cc3e..2bb12fa264 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -22,7 +22,7 @@ FTST_ACE_SIDEKICK_IMAGE_MANIFEST_SRC := vendor/github.com/appc/spec/ace/image_ma
 FTST_ACE_SIDEKICK_IMAGE_MANIFEST := $(FTST_ACE_SIDEKICK_IMAGE_DIR)/manifest
 FTST_INSPECT_BINARY := $(FTST_TMPDIR)/inspect
 FTST_ACI_INSPECT := $(FTST_IMAGE_ROOTFSDIR)/inspect
-FTST_ACE_BINARY := $(FTST_TMPDIR)/ace-validator
+FTST_ACE_BINARY := $(FTST_TMPDIR)/ace
 FTST_ECHO_SERVER_BINARY := $(FTST_TMPDIR)/echo-socket-activated
 FTST_ACI_ECHO_SERVER := $(FTST_IMAGE_ROOTFSDIR)/echo-socket-activated
 FTST_CNI_PROXY_BINARY := $(FTST_TMPDIR)/cniproxy
diff --git a/tools/quickrm/main.go b/tools/quickrm/main.go
index c3dadb7586..41ec74e7a7 100644
--- a/tools/quickrm/main.go
+++ b/tools/quickrm/main.go
@@ -35,6 +35,7 @@ type processor interface {
 	setWordsNumber(number int)
 	processWord(word string) error
 	getList() []string
+	remove(name string) error
 }
 
 // fileProcessor is the simplest from all processor
@@ -61,7 +62,7 @@ type dirProcessor struct {
 }
 
 type items struct {
-	kind string
+	proc processor
 	list []string
 }
 
@@ -77,11 +78,11 @@ func main() {
 	failed := false
 	for _, i := range allItems {
 		for _, el := range i.list {
-			if err := os.Remove(el); err != nil {
+			if err := i.proc.remove(el); err != nil {
 				if os.IsNotExist(err) {
 					continue
 				}
-				common.Warn("Failed to remove %s %q: %v", i.kind, el, err)
+				common.Warn("Failed to remove %s %q: %v", i.proc.kind(), el, err)
 				failed = true
 				if infos, err := ioutil.ReadDir(el); err == nil {
 					var contents []string
@@ -131,7 +132,7 @@ func getItems() []items {
 			common.Die("Failed to get %s list: %v", k.proc.kind(), err)
 		}
 		allItems = append(allItems, items{
-			kind: k.proc.kind(),
+			proc: k.proc,
 			list: l,
 		})
 	}
@@ -175,6 +176,10 @@ func (proc *fileProcessor) kind() string {
 	return "file"
 }
 
+func (proc *fileProcessor) remove(name string) error {
+	return os.Remove(name)
+}
+
 func (proc *fileProcessor) setWordsNumber(number int) {
 	proc.list = make([]string, 0, number)
 }
@@ -196,6 +201,10 @@ func (proc *symlinkProcessor) kind() string {
 	return "symlink"
 }
 
+func (proc *symlinkProcessor) remove(name string) error {
+	return os.Remove(name)
+}
+
 func (proc *symlinkProcessor) setWordsNumber(number int) {
 	proc.list = make([]string, 0, number)
 }
@@ -227,6 +236,10 @@ func (proc *dirProcessor) kind() string {
 	return "directory"
 }
 
+func (proc *dirProcessor) remove(name string) error {
+	return os.RemoveAll(name)
+}
+
 func (proc *dirProcessor) setWordsNumber(number int) {
 	proc.set = make(map[string]struct{}, number)
 }

From a752e22d8f432611f169acab2b5789dcaf91241c Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <james.o.hunt@intel.com>
Date: Thu, 26 Jan 2017 11:56:29 +0000
Subject: [PATCH 1029/1304] docs: Mention qemu along with lkvm.

Added qemu where lkvm was mentioned without also mentioning that
qemu is another stage1 kvm hypervisor option.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
---
 Documentation/build-configure.md  | 2 +-
 Documentation/dependencies.md     | 2 +-
 Documentation/subcommands/stop.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/build-configure.md b/Documentation/build-configure.md
index 19e4716bc5..09282cc902 100644
--- a/Documentation/build-configure.md
+++ b/Documentation/build-configure.md
@@ -15,7 +15,7 @@ Note that specifying this parameter does not necessarily mean that rkt will use
 Available flavors are:
 
 - `coreos` - it takes systemd and bash from a CoreOS PXE image; uses systemd-nspawn
-- `kvm` - it takes systemd, bash and other binaries from a CoreOS PXE image; uses lkvm
+- `kvm` - it takes systemd, bash and other binaries from a CoreOS PXE image; uses lkvm or qemu
 - `src` - it builds systemd, takes bash from the host at build time; uses built systemd-nspawn
 - `host` - it takes systemd and bash from host at runtime; uses systemd-nspawn from the host
 - `fly` - chroot-only approach for single-application minimal isolation containers; native Go implementation
diff --git a/Documentation/dependencies.md b/Documentation/dependencies.md
index 5558d1ed9c..964d3a2420 100644
--- a/Documentation/dependencies.md
+++ b/Documentation/dependencies.md
@@ -58,7 +58,7 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
   * bc
   * binutils
   * openssl
-* build dependencies for lkvm
+* build dependencies for lkvm and/or qemu
 
 ### Specific dependencies for the src flavor
 
diff --git a/Documentation/subcommands/stop.md b/Documentation/subcommands/stop.md
index d55edbdec6..69997f618b 100644
--- a/Documentation/subcommands/stop.md
+++ b/Documentation/subcommands/stop.md
@@ -9,7 +9,7 @@ Given a list of pod UUIDs, rkt stop will shut them down, for the shipped stage1
 The `--force` flag will stop a pod forcibly, that is:
 
 * default systemd-nspawn stage1: the container is killed.
-* kvm stage1: the lkvm process receives a KILL signal.
+* kvm stage1: the qemu or lkvm process receives a KILL signal.
 * rkt fly stage1: the app receives a KILL signal.
 
 ```

From a1e697dcaf06bd00111d06633589090ee54f4561 Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <james.o.hunt@intel.com>
Date: Thu, 26 Jan 2017 11:59:42 +0000
Subject: [PATCH 1030/1304] config: Switch default stage1 kvm hypervisor to
 qemu.

Change the default so that if "--with-stage1-flavors=kvm" is specified
but "--with-stage1-kvm-hypervisors=" is not, qemu will be used rather
than lkvm.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4e8a049580..ba5f6fffd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,9 +124,9 @@ AC_ARG_WITH([stage1-systemd-revision],
 # STAGE1 - kvm hypervisor. lkvm or/and qemu can be chosen
 AC_ARG_WITH([stage1-kvm-hypervisors],
             [AS_HELP_STRING([--with-stage1-kvm-hypervisors],
-                            [select hypervisors for kvm flavor; build stage1 aci for each of them. select "lkvm", "qemu" or both (default: 'lkvm')])],
+                            [select hypervisors for kvm flavor; build stage1 aci for each of them. select "lkvm", "qemu" or both (default: 'qemu')])],
             [RKT_STAGE1_KVM_HV="${withval}"],
-            [RKT_STAGE1_KVM_HV='lkvm'])
+            [RKT_STAGE1_KVM_HV='qemu'])
 
 ## STAGE1 - path to coreos pxe and its systemd version for kvm and coreos flavors
 

From 60dfa77a52e8040ecdcfc215ab1bccb6e9b6c915 Mon Sep 17 00:00:00 2001
From: Max Leonard Inden <IndenML@gmail.com>
Date: Wed, 25 Jan 2017 15:28:13 +0100
Subject: [PATCH 1031/1304] tests: fix when $HOME is only accessible by current
 user

Previously tested by executing rkt binary with user "nobody". This fails
when the $HOME folder of the user is only accessible by the user itself.
Now the tests first choose the owner of the rkt binary file and if that
is root they use the "nobody" user as a fallback.
---
 tests/rkt_api_service_test.go   | 22 ++++++----------------
 tests/rkt_config_test.go        |  1 +
 tests/rkt_non_root_test.go      | 12 +++++++-----
 tests/rkt_root_commands_test.go |  5 ++++-
 tests/rkt_tests.go              | 10 +++++-----
 tests/testutils/ctx.go          | 18 ++++++++++++++++++
 tests/testutils/utils.go        |  9 +++++++++
 7 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index e41c4c6dee..c16342d0f2 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -21,10 +21,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"os/user"
 	"path/filepath"
 	"reflect"
-	"strconv"
 	"strings"
 	"syscall"
 	"testing"
@@ -40,34 +38,26 @@ import (
 )
 
 func startAPIService(t *testing.T, ctx *testutils.RktRunCtx) *gexpect.ExpectSubprocess {
-	noUidGid := false
-	gid, err := common.LookupGid(common.RktGroup)
+	noRktGid := false
+	rktGid, err := common.LookupGid(common.RktGroup)
 	if err != nil {
 		t.Logf("no %q group, will run api service with root, ONLY DO THIS FOR TESTING!", common.RktGroup)
-		noUidGid = true
+		noRktGid = true
 	} else {
 		if err := ctx.SetupDataDir(); err != nil {
 			t.Fatalf("failed to setup data directory: %v", err)
 		}
 	}
 
-	u, err := user.Lookup("nobody")
-	if err != nil {
-		t.Logf(`no "nobody" user, will run api service with root, ONLY DO THIS FOR TESTING!`)
-		noUidGid = true
-	}
-	uid, err := strconv.Atoi(u.Uid)
-	if err != nil {
-		t.Fatalf(`failed to parse "nobody" UID: %v`, err)
-	}
+	uid, _ := ctx.GetUidGidRktBinOwnerNotRoot()
 
 	t.Logf("Running rkt api service")
 	apisvcCmd := fmt.Sprintf("%s api-service", ctx.Cmd())
 
-	if noUidGid {
+	if noRktGid {
 		return startRktAndCheckOutput(t, apisvcCmd, "API service running")
 	}
-	return startRktAsUidGidAndCheckOutput(t, apisvcCmd, "API service running", false, uid, gid)
+	return startRktAsUidGidAndCheckOutput(t, apisvcCmd, "API service running", false, uid, rktGid)
 }
 
 func stopAPIService(t *testing.T, svc *gexpect.ExpectSubprocess) {
diff --git a/tests/rkt_config_test.go b/tests/rkt_config_test.go
index ad8b028b60..a09584dfac 100644
--- a/tests/rkt_config_test.go
+++ b/tests/rkt_config_test.go
@@ -453,6 +453,7 @@ func TestConfig(t *testing.T) {
 			tt.configFunc(ctx)
 
 			rktCmd := ctx.Cmd() + " --debug --insecure-options=image --pretty-print=false config"
+			nobodyUid, _ := testutils.GetUnprivilegedUidGid()
 			out, status := runRkt(t, rktCmd, nobodyUid, 0)
 
 			if status != 0 {
diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index 459ecd0d64..579442499d 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -91,7 +91,9 @@ func TestNonRootFetchRmGCImage(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	gid, err := common.LookupGid(common.RktGroup)
+	uid, _ := ctx.GetUidGidRktBinOwnerNotRoot()
+
+	rktGid, err := common.LookupGid(common.RktGroup)
 	if err != nil {
 		t.Skipf("Skipping the test because there's no %q group", common.RktGroup)
 	}
@@ -117,22 +119,22 @@ func TestNonRootFetchRmGCImage(t *testing.T) {
 	// We can't touch the treestores even as members of the rkt group.
 	imgGCCmd := fmt.Sprintf("%s image gc", ctx.Cmd())
 	t.Logf("Running %s", imgGCCmd)
-	runRktAsGidAndCheckOutput(t, imgGCCmd, "permission denied", true, gid)
+	runRktAsUidGidAndCheckOutput(t, imgGCCmd, "permission denied", true, uid, rktGid)
 
 	// Should be able to remove the image fetched by root since we're in the rkt group.
 	imgRmCmd := fmt.Sprintf("%s image rm %s", ctx.Cmd(), rootImgHash)
 	t.Logf("Running %s", imgRmCmd)
-	runRktAsGidAndCheckOutput(t, imgRmCmd, "successfully removed", false, gid)
+	runRktAsUidGidAndCheckOutput(t, imgRmCmd, "successfully removed", false, uid, rktGid)
 
 	// Should be able to remove the image fetched by ourselves.
 	nonrootImg := patchTestACI("rkt-inspect-non-root-rm.aci", "--exec=/inspect")
 	defer os.Remove(nonrootImg)
-	nonrootImgHash, err := importImageAndFetchHashAsGid(t, ctx, nonrootImg, "", gid)
+	nonrootImgHash, err := importImageAndFetchHashAsUidGid(t, ctx, nonrootImg, "", uid, rktGid)
 	if err != nil {
 		t.Fatalf("%v", err)
 	}
 
 	imgRmCmd = fmt.Sprintf("%s image rm %s", ctx.Cmd(), nonrootImgHash)
 	t.Logf("Running %s", imgRmCmd)
-	runRktAsGidAndCheckOutput(t, imgRmCmd, "successfully removed", false, gid)
+	runRktAsUidGidAndCheckOutput(t, imgRmCmd, "successfully removed", false, uid, rktGid)
 }
diff --git a/tests/rkt_root_commands_test.go b/tests/rkt_root_commands_test.go
index e1f4ded28d..527ec06d4b 100644
--- a/tests/rkt_root_commands_test.go
+++ b/tests/rkt_root_commands_test.go
@@ -37,9 +37,12 @@ var rootRequiringCommands = []string{
 // user without them
 func TestCommandsNeedRoot(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
+
+	uid, gid := ctx.GetUidGidRktBinOwnerNotRoot()
+
 	defer ctx.Cleanup()
 	for _, sc := range rootRequiringCommands {
 		cmd := fmt.Sprintf("%s %s", ctx.Cmd(), sc)
-		runRktAsUidGidAndCheckOutput(t, cmd, "cannot run as unprivileged user", true, nobodyUid, nobodyGid)
+		runRktAsUidGidAndCheckOutput(t, cmd, "cannot run as unprivileged user", true, uid, gid)
 	}
 }
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index ec87b70f3b..463d3fb468 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -48,8 +48,6 @@ import (
 
 const (
 	defaultTimeLayout = "2006-01-02 15:04:05.999 -0700 MST"
-	nobodyUid         = 65534
-	nobodyGid         = 65534
 
 	baseAppName = "rkt-inspect"
 )
@@ -232,7 +230,7 @@ func createFileOrPanic(dirName, fileName string) string {
 	return name
 }
 
-func importImageAndFetchHashAsGid(t *testing.T, ctx *testutils.RktRunCtx, img string, fetchArgs string, gid int) (string, error) {
+func importImageAndFetchHashAsUidGid(t *testing.T, ctx *testutils.RktRunCtx, img string, fetchArgs string, uid int, gid int) (string, error) {
 	// Import the test image into store manually.
 	cmd := fmt.Sprintf("%s --insecure-options=image,tls fetch %s %s", ctx.Cmd(), fetchArgs, img)
 
@@ -248,7 +246,7 @@ func importImageAndFetchHashAsGid(t *testing.T, ctx *testutils.RktRunCtx, img st
 	}
 	if gid != 0 {
 		child.Cmd.SysProcAttr = &syscall.SysProcAttr{}
-		child.Cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(nobodyUid), Gid: uint32(gid)}
+		child.Cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}
 	}
 
 	err = child.Start()
@@ -270,7 +268,7 @@ func importImageAndFetchHashAsGid(t *testing.T, ctx *testutils.RktRunCtx, img st
 }
 
 func importImageAndFetchHash(t *testing.T, ctx *testutils.RktRunCtx, fetchArgs string, img string) (string, error) {
-	return importImageAndFetchHashAsGid(t, ctx, fetchArgs, img, 0)
+	return importImageAndFetchHashAsUidGid(t, ctx, fetchArgs, img, 0, 0)
 }
 
 func importImageAndRun(imagePath string, t *testing.T, ctx *testutils.RktRunCtx) {
@@ -340,6 +338,7 @@ func runRktAndGetUUID(t *testing.T, rktCmd string) string {
 }
 
 func runRktAsGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, expectError bool, gid int) {
+	nobodyUid, _ := testutils.GetUnprivilegedUidGid()
 	runRktAsUidGidAndCheckOutput(t, rktCmd, expectedLine, expectError, nobodyUid, gid)
 }
 
@@ -403,6 +402,7 @@ func startRktAsGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, gid
 	}
 	if gid != 0 {
 		child.Cmd.SysProcAttr = &syscall.SysProcAttr{}
+		nobodyUid, _ := testutils.GetUnprivilegedUidGid()
 		child.Cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(nobodyUid), Gid: uint32(gid)}
 	}
 
diff --git a/tests/testutils/ctx.go b/tests/testutils/ctx.go
index 77f3bc7279..4120c4e384 100644
--- a/tests/testutils/ctx.go
+++ b/tests/testutils/ctx.go
@@ -21,6 +21,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"syscall"
 
 	"github.com/coreos/gexpect"
 	"github.com/coreos/rkt/tests/testutils/logger"
@@ -220,6 +221,23 @@ func (ctx *RktRunCtx) rktBin() string {
 	return abs
 }
 
+func (ctx *RktRunCtx) GetUidGidRktBinOwnerNotRoot() (int, int) {
+	s, err := os.Stat(ctx.rktBin())
+	if err != nil {
+		return GetUnprivilegedUidGid()
+	}
+
+	uid := int(s.Sys().(*syscall.Stat_t).Uid)
+	gid := int(s.Sys().(*syscall.Stat_t).Gid)
+
+	// If owner is root, fallback to user "nobody"
+	if uid == 0 {
+		return GetUnprivilegedUidGid()
+	}
+
+	return uid, gid
+}
+
 func (ctx *RktRunCtx) rktOptions() []string {
 	ctx.ensureValid()
 	opts := make([]string, 0, len(ctx.directories))
diff --git a/tests/testutils/utils.go b/tests/testutils/utils.go
index e653c81f45..e7190ba45f 100644
--- a/tests/testutils/utils.go
+++ b/tests/testutils/utils.go
@@ -21,6 +21,15 @@ import (
 	"time"
 )
 
+const (
+	nobodyUid = 65534
+	nobodyGid = 65534
+)
+
+func GetUnprivilegedUidGid() (int, int) {
+	return nobodyUid, nobodyGid
+}
+
 func GetValueFromEnvOrPanic(envVar string) string {
 	path := os.Getenv(envVar)
 	if path == "" {

From 7e52080501504fdc027930fe21c40c6ef0cadf00 Mon Sep 17 00:00:00 2001
From: Graham Whaley <graham.whaley@linux.intel.com>
Date: Sat, 28 Jan 2017 20:51:16 +0000
Subject: [PATCH 1032/1304] kvm/lkvm: update lkvm version to HEAD

Update the LKVM git tag to the latest upstream.
This fetches in a number of 9pfs fixes.

Signed-off-by: Graham Whaley <graham.whaley@intel.com>
---
 stage1/usr_from_kvm/lkvm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/usr_from_kvm/lkvm.mk b/stage1/usr_from_kvm/lkvm.mk
index ae5d4ae73b..cd75732f86 100644
--- a/stage1/usr_from_kvm/lkvm.mk
+++ b/stage1/usr_from_kvm/lkvm.mk
@@ -5,7 +5,7 @@ LKVM_BINARY := $(LKVM_SRCDIR)/lkvm-static
 LKVM_ACI_BINARY := $(HV_ACIROOTFSDIR)/lkvm
 LKVM_GIT := https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool
 # just last published version (for reproducible builds), not for any other reason
-LKVM_VERSION := 1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2
+LKVM_VERSION := cfae4d64482ed745214e3c62dd84b79c2ae0f325
 
 LKVM_STUFFDIR := $(MK_SRCDIR)/lkvm
 LKVM_PATCHESDIR := $(LKVM_STUFFDIR)/patches

From 0de54252de33a87768ebf8ed24e8e308f13b77ae Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Thu, 19 Jan 2017 13:03:52 -0800
Subject: [PATCH 1033/1304] run/prepare/fetch: replace --no-store and
 --store-only with --pull-policy

This replaces the `--no-store` and `--store-only` flags with a singular
flag `--pull-policy` that can accept one of three things, `never`,
`new`, and `update`. This is purely a cli change, there are no under the
hood impacts. `--no-store` has been aliased to `--pull-policy=update`
and `--store-only` has been aliased to `--pull-policy=never` for
compatibility reasons.
---
 Documentation/image-fetching-behavior.md | 15 ++++++++-------
 Documentation/subcommands/fetch.md       |  7 +++----
 Documentation/subcommands/prepare.md     |  3 +--
 Documentation/subcommands/run.md         |  3 +--
 rkt/app_add.go                           |  3 +--
 rkt/fetch.go                             | 21 ++++++++++++++++++---
 rkt/fetch_test.go                        |  2 +-
 rkt/image/common.go                      | 14 +++++++-------
 rkt/image/fetcher.go                     | 10 +++++-----
 rkt/prepare.go                           | 19 ++++++++++++++-----
 rkt/run.go                               | 20 +++++++++++++++-----
 rkt/stage1hash.go                        | 10 +++++-----
 tests/rkt_fetch_test.go                  | 18 +++++++++---------
 tests/rkt_image_dependencies_test.go     |  2 +-
 tests/rkt_tests.go                       |  4 ++--
 15 files changed, 91 insertions(+), 60 deletions(-)

diff --git a/Documentation/image-fetching-behavior.md b/Documentation/image-fetching-behavior.md
index 41eb68b02c..ed573484ae 100644
--- a/Documentation/image-fetching-behavior.md
+++ b/Documentation/image-fetching-behavior.md
@@ -2,18 +2,19 @@
 
 When fetching, rkt will try to avoid unnecessary network transfers: if an updated image is already in the local store there's no need to download it again.
 
-This behavior can be controlled with the `--store-only` and `--no-store` flags.
+This behavior can be controlled with the `--pull-policy` flag.
 
 ## General Behavior
 
-The following table describes the meaning of the `--store-only` and `--no-store` flags.
+The following table describes the meaning of the `--pull-policy` flag.
 
-Flags                     | Description
+This flag accepts one of three options:
+
+Option                    | Description
 ------------------------- | ---------------------------------------------------------------------------------------------------
-_no flags_                | **Default behavior.** Do `store` and if it doesn't return an image do `remote`.
-`--store-only`            | Check the local store only.
-`--no-store`              | Execute a remote download, while handling caching logic for `http(s)://` and `docker://`.
-`--store-only --no-store` | Invalid option.
+`new`                     | __Default behavior in run and prepare__ Check the store, and if the image is missing fetch from remote
+`update`                  | __Default behavior in fetch__ Attempt to fetch from remote, but if the remote image matches something in our store don't pull it
+`never`                   | Only check the store, and don't fetch from remote.
 
 ## Details
 
diff --git a/Documentation/subcommands/fetch.md b/Documentation/subcommands/fetch.md
index af95d40212..42f61e970b 100644
--- a/Documentation/subcommands/fetch.md
+++ b/Documentation/subcommands/fetch.md
@@ -70,8 +70,8 @@ Docker images do not support signature verification.
 When fetching, rkt will try to avoid unnecessary network transfers.
 For example, if an image is already in the local store, rkt will use HTTP's ETag and Cache-Control to avoid downloading it again unless the image was updated on the remote server.
 
-This behavior can be changed by using the `--store-only` and `--no-store` flags.
-Their meanings are detailed in the [image fetching behavior][img-fetch] documentation.
+This behavior can be changed by using the `--pull-policy` flag.
+Usage of this flag is detailed in the [image fetching behavior][img-fetch] documentation.
 
 ## Authentication
 
@@ -86,9 +86,8 @@ Note that the configuration kind for images downloaded via https:// and images d
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
 | `--full` |  `false` | `true` or `false` | Print the full image hash after fetching |
-| `--no-store` |  `false` | `true` or `false` | Fetch images ignoring the local store. See [image fetching behavior][img-fetch] |
 | `--signature` |  `` | A file path | Local signature file to use in validating the preceding image |
-| `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior][img-fetch] |
+| `--pull-policy` | `new` | `never`, `new`, or `update` | Sets the policy for when to fetch an image. See [image fetching behavior][img-fetch] |
 
 ## Global options
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 90197020f7..764e89a935 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -63,7 +63,7 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--mount` | none | Mount syntax (ex. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points][vol-no-mount]. |
 | `--name` | none | Name of the app | Set the name of the app (example: '--name=foo'). If not set, then the app name default to the image's name |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
-| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior][img-fetch] |
+| `--pull-policy` | `new` | `never`, `new`, or `update` | Sets the policy for when to fetch an image. See [image fetching behavior][img-fetch] |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
 | `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network][contained]. Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080` |
 | `--private-users` |  `false` | `true` or `false` | Run within user namespaces |
@@ -76,7 +76,6 @@ c9fad0e6-8236-4fc2-ad17-55d0a4c7d742
 | `--stage1-name` |  `` | A name of a stage1 image. Will perform a discovery if the image is not in the store | Image to use as stage1 |
 | `--stage1-hash` |  `` | A hash of a stage1 image. The image must exist in the store | Image to use as stage1 |
 | `--stage1-from-dir` |  `` | A stage1 image file inside the default stage1 images directory | Image to use as stage1 |
-| `--store-only` |  `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior][img-fetch] |
 | `--user` | none | uid, username or file path | user override for the preceding image (example: '--user=user') |
 | `--volume` |  `` | Volume syntax (`NAME,kind=KIND,source=PATH,readOnly=BOOL,recursive=BOOL`). See [Mount Volumes into a Pod][mount-vol] | Volumes to make available in the pod |
 
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index d45045a67c..77db2dc0e4 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -407,7 +407,6 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--name` | none | Name of the app | Set the name of the app (example: '--name=foo'). If not set, then the app name default to the image's name |
 | `--net` | `default` | A comma-separated list of networks. (e.g. `--net[=n[:args], ...]`) | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
-| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior][img-fetch]. |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
 | `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network][contained]. Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080`. |
 | `--private-users` | `false` | `true` or `false` | Run within user namespaces. |
@@ -419,7 +418,7 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--stage1-name` | none | Image name (e.g. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A name of a stage1 image. Will perform a discovery if the image is not in the store. |
 | `--stage1-path` | none | Absolute or relative path | A path to a stage1 image. |
 | `--stage1-url` | none | URL with protocol | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported. |
-| `--store-only` | `false` | `true` or `false` | Use only available images in the store (do not discover or download from remote URLs). See [image fetching behavior][img-fetch]. |
+| `--pull-policy` | `new` | `never`, `new`, or `update` | Sets the policy for when to fetch an image. See [image fetching behavior][img-fetch] |
 | `--user` | none | uid, username or file path (e.g. `--user=core`) | User override for the preceding image. |
 | `--uuid-file-save` | none | A file path | Write out the pod UUID to a file. |
 | `--volume` | none | Volume syntax (e.g. `--volume NAME,kind=KIND,source=PATH,readOnly=BOOL`) | Volumes to make available in the pod. See [Mount Volumes into a Pod](#mount-volumes-into-a-pod). |
diff --git a/rkt/app_add.go b/rkt/app_add.go
index ddf1ccae41..7c7b8e1988 100644
--- a/rkt/app_add.go
+++ b/rkt/app_add.go
@@ -101,8 +101,7 @@ func runAppAdd(cmd *cobra.Command, args []string) (exit int) {
 		Ts: ts,
 		Ks: getKeystore(),
 
-		StoreOnly: true,
-		NoStore:   false,
+		PullPolicy: image.PullPolicyNever,
 	}
 
 	img, err := fn.FindImage(args[1], "")
diff --git a/rkt/fetch.go b/rkt/fetch.go
index 1a00f54925..875ac431e5 100644
--- a/rkt/fetch.go
+++ b/rkt/fetch.go
@@ -42,6 +42,9 @@ again.`,
 		Run: runWrapper(runFetch),
 	}
 	flagFullHash bool
+	// We can't have different defaults for a given flag variable shared across
+	// subcommands, so we can't use pullPolicyUpdate here
+	flagPullPolicyDefaultUpdate string
 )
 
 func init() {
@@ -52,8 +55,11 @@ func init() {
 
 	cmdFetch.Flags().Var((*appAsc)(&rktApps), "signature", "local signature file to use in validating the preceding image")
 	cmdFetch.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
+	cmdFetch.Flags().MarkDeprecated("store-only", "please use --pull-policy=never")
 	cmdFetch.Flags().BoolVar(&flagNoStore, "no-store", false, "fetch images ignoring the local store")
+	cmdFetch.Flags().MarkDeprecated("no-store", "please use --pull-policy=update")
 	cmdFetch.Flags().BoolVar(&flagFullHash, "full", false, "print the full image hash after fetching")
+	cmdFetch.Flags().StringVar(&flagPullPolicyDefaultUpdate, "pull-policy", image.PullPolicyUpdate, "when to pull an image")
 
 	cmdRkt.AddCommand(cmdFetch)
 
@@ -74,10 +80,20 @@ func runFetch(cmd *cobra.Command, args []string) (exit int) {
 		return 254
 	}
 
+	// flagPullPolicy defaults to new regardless of subcommand, so we use a
+	// different variable for the flag on fetch and then set it here
+	flagPullPolicy = flagPullPolicyDefaultUpdate
+
 	if flagStoreOnly && flagNoStore {
 		stderr.Print("both --store-only and --no-store specified")
 		return 254
 	}
+	if flagStoreOnly {
+		flagPullPolicy = image.PullPolicyNever
+	}
+	if flagNoStore {
+		flagPullPolicy = image.PullPolicyUpdate
+	}
 
 	s, err := imagestore.NewStore(storeDir())
 	if err != nil {
@@ -107,9 +123,8 @@ func runFetch(cmd *cobra.Command, args []string) (exit int) {
 		Debug:              globalFlags.Debug,
 		TrustKeysFromHTTPS: globalFlags.TrustKeysFromHTTPS,
 
-		StoreOnly: flagStoreOnly,
-		NoStore:   flagNoStore,
-		WithDeps:  true,
+		PullPolicy: flagPullPolicy,
+		WithDeps:   true,
 	}
 
 	err = ft.FetchImages(&rktApps)
diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index 7582994408..28c5e12eb8 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -561,7 +561,7 @@ func TestFetchImageCache(t *testing.T) {
 			Ks:            ks,
 			InsecureFlags: secureFlags,
 			// Skip local store
-			NoStore: true,
+			PullPolicy: image.PullPolicyUpdate,
 		}
 		u, err := url.Parse(aciURL)
 		if err != nil {
diff --git a/rkt/image/common.go b/rkt/image/common.go
index c3f4ef7884..29d5517ea5 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -42,6 +42,10 @@ type imageStringType int
 const (
 	imageStringName imageStringType = iota // image type to be guessed
 	imageStringPath                        // absolute or relative path
+
+	PullPolicyNever  = "never"
+	PullPolicyNew    = "new"
+	PullPolicyUpdate = "update"
 )
 
 // action is a common type for Finder and Fetcher
@@ -69,13 +73,9 @@ type action struct {
 	// via the https protocol can be trusted
 	TrustKeysFromHTTPS bool
 
-	// StoreOnly tells whether to avoid getting images from a
-	// local filesystem or a remote location.
-	StoreOnly bool
-	// NoStore tells whether to avoid getting images from the
-	// store. Note that transport caching (like http Etags) can be still
-	// used to avoid refetching.
-	NoStore bool
+	// PullPolicy controls when to pull images from remote, versus using a copy
+	// on the local filesystem, versus checking for updates to local images
+	PullPolicy string
 	// NoCache tells to ignore transport caching.
 	NoCache bool
 	// WithDeps tells whether image dependencies should be
diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index 3578ee1a9a..a644480484 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -233,7 +233,7 @@ func (f *Fetcher) fetchSingleImageByDockerURL(d *dist.Docker) (string, error) {
 }
 
 func (f *Fetcher) maybeCheckRemoteFromStore(rem *imagestore.Remote) string {
-	if f.NoStore || rem == nil {
+	if f.PullPolicy == PullPolicyUpdate || rem == nil {
 		return ""
 	}
 	diag.Printf("using image from local store for url %s", rem.ACIURL)
@@ -241,7 +241,7 @@ func (f *Fetcher) maybeCheckRemoteFromStore(rem *imagestore.Remote) string {
 }
 
 func (f *Fetcher) maybeFetchHTTPURLFromRemote(rem *imagestore.Remote, u *url.URL, a *asc) (string, error) {
-	if !f.StoreOnly {
+	if f.PullPolicy != PullPolicyNever {
 		diag.Printf("remote fetching from URL %q", u.String())
 		hf := &httpFetcher{
 			InsecureFlags: f.InsecureFlags,
@@ -257,7 +257,7 @@ func (f *Fetcher) maybeFetchHTTPURLFromRemote(rem *imagestore.Remote, u *url.URL
 }
 
 func (f *Fetcher) maybeFetchDockerURLFromRemote(u *url.URL) (string, error) {
-	if !f.StoreOnly {
+	if f.PullPolicy != PullPolicyNever {
 		diag.Printf("remote fetching from URL %q", u.String())
 		df := &dockerFetcher{
 			InsecureFlags: f.InsecureFlags,
@@ -313,7 +313,7 @@ func (f *Fetcher) fetchSingleImageByName(db *distBundle, a *asc) (string, error)
 }
 
 func (f *Fetcher) maybeCheckStoreForApp(db *distBundle) (string, error) {
-	if !f.NoStore {
+	if f.PullPolicy != PullPolicyUpdate {
 		key, err := f.getStoreKeyFromApp(db)
 		if err == nil {
 			diag.Printf("using image from local store for image name %s", db.image)
@@ -348,7 +348,7 @@ func (f *Fetcher) getStoreKeyFromApp(db *distBundle) (string, error) {
 }
 
 func (f *Fetcher) maybeFetchImageFromRemote(db *distBundle, a *asc) (string, error) {
-	if !f.StoreOnly {
+	if f.PullPolicy != PullPolicyNever {
 		app := db.dist.(*dist.Appc).App()
 		nf := &nameFetcher{
 			InsecureFlags:      f.InsecureFlags,
diff --git a/rkt/prepare.go b/rkt/prepare.go
index b5c18263bc..9827ce2c92 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -64,7 +64,10 @@ func init() {
 	cmdPrepare.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for all the apps in the form key=value, this will be overriden by --environment")
 	cmdPrepare.Flags().Var(&flagEnvFromFile, "set-env-file", "the path to an environment variables file")
 	cmdPrepare.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
+	cmdPrepare.Flags().MarkDeprecated("store-only", "please use --pull-policy=never")
 	cmdPrepare.Flags().BoolVar(&flagNoStore, "no-store", false, "fetch images ignoring the local store")
+	cmdPrepare.Flags().MarkDeprecated("no-store", "please use --pull-policy=update")
+	cmdPrepare.Flags().StringVar(&flagPullPolicy, "pull-policy", image.PullPolicyNew, "when to pull an image")
 	cmdPrepare.Flags().StringVar(&flagPodManifest, "pod-manifest", "", "the path to the pod manifest. If it's non-empty, then only '--quiet' and '--no-overlay' will have effect")
 	cmdPrepare.Flags().Var((*appsVolume)(&rktApps), "volume", "volumes to make available in the pod")
 
@@ -94,6 +97,12 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		stderr.Print("both --store-only and --no-store specified")
 		return 254
 	}
+	if flagStoreOnly {
+		flagPullPolicy = image.PullPolicyNever
+	}
+	if flagNoStore {
+		flagPullPolicy = image.PullPolicyUpdate
+	}
 
 	if flagPrivateUsers {
 		if !common.SupportsUserNS() {
@@ -110,8 +119,9 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 
 	if len(flagPodManifest) > 0 && (rktApps.Count() > 0 ||
 		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" ||
-		len(flagPorts) > 0 || flagStoreOnly || flagNoStore ||
-		flagInheritEnv || !flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty()) {
+		len(flagPorts) > 0 || flagPullPolicy == image.PullPolicyNever ||
+		flagPullPolicy == image.PullPolicyUpdate || flagInheritEnv ||
+		!flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty()) {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
 		return 254
 	}
@@ -155,9 +165,8 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 		Debug:              globalFlags.Debug,
 		TrustKeysFromHTTPS: globalFlags.TrustKeysFromHTTPS,
 
-		StoreOnly: flagStoreOnly,
-		NoStore:   flagNoStore,
-		WithDeps:  true,
+		PullPolicy: flagPullPolicy,
+		WithDeps:   true,
 	}
 	if err := fn.FindImages(&rktApps); err != nil {
 		stderr.PrintE("error finding images", err)
diff --git a/rkt/run.go b/rkt/run.go
index 1eca4394ff..1dd158061d 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -77,6 +77,7 @@ image arguments with a lone "---" to resume argument parsing.`,
 	flagUUIDFileSave string
 	flagHostname     string
 	flagHostsEntries flagStringList
+	flagPullPolicy   string
 )
 
 func addIsolatorFlags(cmd *cobra.Command, compat bool) {
@@ -135,7 +136,10 @@ func init() {
 	cmdRun.Flags().StringVar(&flagDNSDomain, "dns-domain", "", "DNS domain to write in /etc/resolv.conf")
 	cmdRun.Flags().Var(&flagHostsEntries, "hosts-entry", "Entries to add to the pod-wide /etc/hosts. Pass 'host' to use the host's /etc/hosts")
 	cmdRun.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
+	cmdRun.Flags().MarkDeprecated("store-only", "please use --pull-policy=never")
 	cmdRun.Flags().BoolVar(&flagNoStore, "no-store", false, "fetch images ignoring the local store")
+	cmdRun.Flags().MarkDeprecated("no-store", "please use --pull-policy=update")
+	cmdRun.Flags().StringVar(&flagPullPolicy, "pull-policy", image.PullPolicyNew, "when to pull an image")
 	cmdRun.Flags().StringVar(&flagPodManifest, "pod-manifest", "", "the path to the pod manifest. If it's non-empty, then only '--net', '--no-overlay' and '--interactive' will have effect")
 	cmdRun.Flags().BoolVar(&flagMDSRegister, "mds-register", false, "register pod with metadata service. needs network connectivity to the host (--net=(default|default-restricted|host)")
 	cmdRun.Flags().StringVar(&flagUUIDFileSave, "uuid-file-save", "", "write out pod UUID to specified file")
@@ -171,6 +175,12 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		stderr.Print("both --store-only and --no-store specified")
 		return 254
 	}
+	if flagStoreOnly {
+		flagPullPolicy = image.PullPolicyNever
+	}
+	if flagNoStore {
+		flagPullPolicy = image.PullPolicyUpdate
+	}
 
 	if flagPrivateUsers {
 		if !common.SupportsUserNS() {
@@ -196,8 +206,9 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 
 	if len(flagPodManifest) > 0 && (rktApps.Count() > 0 ||
 		(*appsVolume)(&rktApps).String() != "" || (*appMount)(&rktApps).String() != "" ||
-		len(flagPorts) > 0 || flagStoreOnly || flagNoStore ||
-		flagInheritEnv || !flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty()) {
+		len(flagPorts) > 0 || flagPullPolicy == image.PullPolicyNever ||
+		flagPullPolicy == image.PullPolicyUpdate || flagInheritEnv ||
+		!flagExplicitEnv.IsEmpty() || !flagEnvFromFile.IsEmpty()) {
 		stderr.Print("conflicting flags set with --pod-manifest (see --help)")
 		return 254
 	}
@@ -246,9 +257,8 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		Debug:              globalFlags.Debug,
 		TrustKeysFromHTTPS: globalFlags.TrustKeysFromHTTPS,
 
-		StoreOnly: flagStoreOnly,
-		NoStore:   flagNoStore,
-		WithDeps:  true,
+		PullPolicy: flagPullPolicy,
+		WithDeps:   true,
 	}
 	if err := fn.FindImages(&rktApps); err != nil {
 		stderr.Error(err)
diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index dc048874aa..14c14438c7 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -302,11 +302,12 @@ func getConfiguredStage1Hash(s *imagestore.Store, ts *treestore.Store, imgRef, i
 	}
 	fn := getStage1Finder(s, ts, !trusted)
 	if !strings.HasSuffix(imgRef, "-dirty") {
-		fn.StoreOnly = true
+		oldPolicy := fn.PullPolicy
+		fn.PullPolicy = image.PullPolicyNever
 		if hash, err := fn.FindImage(imgRef, ""); err == nil {
 			return hash, nil
 		}
-		fn.StoreOnly = false
+		fn.PullPolicy = oldPolicy
 	}
 	if imgLoc == "" && imgFileName == "" {
 		return nil, fmt.Errorf("neither the location of the default stage1 image nor its filename are set, use --stage1-{path,url,name,hash,from-dir} flag")
@@ -327,9 +328,8 @@ func getStage1Finder(s *imagestore.Store, ts *treestore.Store, withKeystore bool
 		InsecureFlags:      globalFlags.InsecureFlags,
 		TrustKeysFromHTTPS: globalFlags.TrustKeysFromHTTPS,
 
-		StoreOnly: false,
-		NoStore:   false,
-		WithDeps:  false,
+		PullPolicy: image.PullPolicyNew,
+		WithDeps:   false,
 	}
 
 	if withKeystore {
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 3a165656e6..82f1c69997 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -119,9 +119,9 @@ func TestFetchAny(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		testFetchDefault(t, tt.args, tt.image, tt.imageArgs, tt.finalURL)
-		testFetchStoreOnly(t, tt.args, tt.image, tt.imageArgs, tt.finalURL)
-		testFetchNoStore(t, tt.args, tt.image, tt.imageArgs, tt.finalURL)
+		testFetchNew(t, tt.args, tt.image, tt.imageArgs, tt.finalURL)
+		testFetchNever(t, tt.args, tt.image, tt.imageArgs, tt.finalURL)
+		testFetchUpdate(t, tt.args, tt.image, tt.imageArgs, tt.finalURL)
 	}
 }
 
@@ -150,7 +150,7 @@ func TestFetchFullHash(t *testing.T) {
 	}
 }
 
-func testFetchDefault(t *testing.T, arg string, image string, imageArgs string, finalURL string) {
+func testFetchNew(t *testing.T, arg string, image string, imageArgs string, finalURL string) {
 	remoteFetchMsgTpl := `remote fetching from URL %q`
 	storeMsgTpl := `using image from local store for .* %s`
 	if finalURL == "" {
@@ -162,7 +162,7 @@ func testFetchDefault(t *testing.T, arg string, image string, imageArgs string,
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	cmd := fmt.Sprintf("%s %s %s %s", ctx.Cmd(), arg, image, imageArgs)
+	cmd := fmt.Sprintf("%s --pull-policy=new %s %s %s", ctx.Cmd(), arg, image, imageArgs)
 
 	// 1. Run cmd with the image not available in the store, should get $remoteFetchMsg.
 	err := runRktAndCheckRegexOutput(t, cmd, remoteFetchMsg)
@@ -176,7 +176,7 @@ func testFetchDefault(t *testing.T, arg string, image string, imageArgs string,
 	runRktAndCheckRegexOutput(t, cmd, storeMsg)
 }
 
-func testFetchStoreOnly(t *testing.T, args string, image string, imageArgs string, finalURL string) {
+func testFetchNever(t *testing.T, args string, image string, imageArgs string, finalURL string) {
 	cannotFetchMsgTpl := `unable to fetch.* image from .* %q`
 	storeMsgTpl := `using image from local store for .* %s`
 	cannotFetchMsg := fmt.Sprintf(cannotFetchMsgTpl, image)
@@ -185,7 +185,7 @@ func testFetchStoreOnly(t *testing.T, args string, image string, imageArgs strin
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	cmd := fmt.Sprintf("%s --store-only %s %s %s", ctx.Cmd(), args, image, imageArgs)
+	cmd := fmt.Sprintf("%s --pull-policy=never %s %s %s", ctx.Cmd(), args, image, imageArgs)
 
 	// 1. Run cmd with the image not available in the store should get $cannotFetchMsg.
 	runRktAndCheckRegexOutput(t, cmd, cannotFetchMsg)
@@ -198,7 +198,7 @@ func testFetchStoreOnly(t *testing.T, args string, image string, imageArgs strin
 	runRktAndCheckRegexOutput(t, cmd, storeMsg)
 }
 
-func testFetchNoStore(t *testing.T, args string, image string, imageArgs string, finalURL string) {
+func testFetchUpdate(t *testing.T, args string, image string, imageArgs string, finalURL string) {
 	remoteFetchMsgTpl := `remote fetching from URL %q`
 	remoteFetchMsg := fmt.Sprintf(remoteFetchMsgTpl, finalURL)
 
@@ -209,7 +209,7 @@ func testFetchNoStore(t *testing.T, args string, image string, imageArgs string,
 		t.Skip(fmt.Sprintf("%v, probably a network failure. Skipping...", err))
 	}
 
-	cmd := fmt.Sprintf("%s --no-store %s %s %s", ctx.Cmd(), args, image, imageArgs)
+	cmd := fmt.Sprintf("%s --pull-policy=update %s %s %s", ctx.Cmd(), args, image, imageArgs)
 
 	// 1. Run cmd with the image available in the store, should get $remoteFetchMsg.
 	err := runRktAndCheckRegexOutput(t, cmd, remoteFetchMsg)
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 1df591180f..74695088f2 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -265,7 +265,7 @@ func TestRenderOnFetch(t *testing.T) {
 		}
 	}
 
-	fetchCmd := fmt.Sprintf("%s --debug --insecure-options=image,tls fetch %s", ctx.Cmd(), topImage)
+	fetchCmd := fmt.Sprintf("%s --debug --insecure-options=image,tls fetch --pull-policy=new %s", ctx.Cmd(), topImage)
 	child := spawnOrFail(t, fetchCmd)
 
 	treeStoreDir := filepath.Join(ctx.DataDir(), "cas", "tree")
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index ec87b70f3b..3c969a1267 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -234,13 +234,13 @@ func createFileOrPanic(dirName, fileName string) string {
 
 func importImageAndFetchHashAsGid(t *testing.T, ctx *testutils.RktRunCtx, img string, fetchArgs string, gid int) (string, error) {
 	// Import the test image into store manually.
-	cmd := fmt.Sprintf("%s --insecure-options=image,tls fetch %s %s", ctx.Cmd(), fetchArgs, img)
+	cmd := fmt.Sprintf("%s --insecure-options=image,tls fetch --pull-policy=new %s %s", ctx.Cmd(), fetchArgs, img)
 
 	// TODO(jonboulle): non-root user breaks trying to read root-written
 	// config directories. Should be a better way to approach this. Should
 	// config directories be readable by the rkt group too?
 	if gid != 0 {
-		cmd = fmt.Sprintf("%s --insecure-options=image,tls fetch %s %s", ctx.CmdNoConfig(), fetchArgs, img)
+		cmd = fmt.Sprintf("%s --insecure-options=image,tls fetch --pull-policy=new %s %s", ctx.CmdNoConfig(), fetchArgs, img)
 	}
 	child, err := gexpect.Command(cmd)
 	if err != nil {

From aa4e4bff4b2c7e576c40667cfe8c0794806a1eb3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 27 Jan 2017 17:57:47 +0000
Subject: [PATCH 1034/1304] stage0/app-add: CLI args should override image ones

This commit uniforms app args and exec command, so that in both cases
CLI parameters always override image ones.
---
 stage0/app_add.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage0/app_add.go b/stage0/app_add.go
index 13bc543d94..8b23aaa32d 100644
--- a/stage0/app_add.go
+++ b/stage0/app_add.go
@@ -162,7 +162,7 @@ func AddApp(cfg AddConfig) error {
 	}
 
 	if app.Args != nil {
-		ra.App.Exec = append(ra.App.Exec, app.Args...)
+		ra.App.Exec = append(ra.App.Exec[:1], app.Args...)
 	}
 
 	if app.WorkingDir != "" {

From 054e4b7e7ea2b962f8d61e407dfa8046781e95f4 Mon Sep 17 00:00:00 2001
From: Graham Whaley <graham.whaley@linux.intel.com>
Date: Sat, 28 Jan 2017 11:27:36 +0000
Subject: [PATCH 1035/1304] kvm/qemu: Update QEMU to v2.8.0

Update the QEMU pull tag to v2.8.0.
Disabling of VHDX is deprecated on the command line, so remove it from our option list.

Signed-off-by: Graham Whaley <graham.whaley@intel.com>
---
 stage1/usr_from_kvm/qemu.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1/usr_from_kvm/qemu.mk b/stage1/usr_from_kvm/qemu.mk
index cca091bc76..d948666f48 100644
--- a/stage1/usr_from_kvm/qemu.mk
+++ b/stage1/usr_from_kvm/qemu.mk
@@ -12,14 +12,14 @@ QEMU_BIOS_BINARIES := bios-256k.bin \
 QEMU_CONFIGURATION_OPTS := --disable-bsd-user --disable-docs --disable-guest-agent --disable-guest-agent-msi \
     --disable-sdl --disable-gtk --disable-vte --disable-curses --disable-cocoa --disable-brlapi --disable-vnc \
     --disable-seccomp --disable-curl --disable-bluez --disable-cap-ng --disable-rbd --disable-libiscsi \
-    --disable-libnfs --disable-smartcard --disable-libusb --disable-glusterfs --disable-archipelago --disable-vhdx \
+    --disable-libnfs --disable-smartcard --disable-libusb --disable-glusterfs --disable-archipelago \
     --disable-tcmalloc --disable-jemalloc --disable-debug-info --static --enable-virtfs --target-list=x86_64-softmmu \
     --python=/usr/bin/python2 --disable-werror
 QEMU_ACI_BINARY := $(HV_ACIROOTFSDIR)/qemu
 
 # Using 2.7.0 stable release from official repository
 QEMU_GIT := git://git.qemu-project.org/qemu.git
-QEMU_GIT_COMMIT := v2.7.0
+QEMU_GIT_COMMIT := v2.8.0
 
 $(call setup-stamp-file,QEMU_BUILD_STAMP,/build)
 $(call setup-stamp-file,QEMU_BIOS_BUILD_STAMP,/bios_build)

From aeae1c1620dcd52c362d43394ac3c4cb08705fc3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 31 Jan 2017 16:50:24 +0000
Subject: [PATCH 1036/1304] stage1/fly: use a logging mounter

---
 stage1_fly/run/main.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index de6fd82818..873d34479a 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -32,6 +32,7 @@ import (
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/pkg/fileutil"
 	pkgflag "github.com/coreos/rkt/pkg/flag"
+	"github.com/coreos/rkt/pkg/fs"
 	rktlog "github.com/coreos/rkt/pkg/log"
 	"github.com/coreos/rkt/pkg/mountinfo"
 	"github.com/coreos/rkt/pkg/sys"
@@ -358,9 +359,12 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		}
 	}
 
+	mounter := fs.NewLoggingMounter(
+		fs.MounterFunc(syscall.Mount),
+		fs.UnmounterFunc(syscall.Unmount),
+		diag.Printf,
+	)
 	for _, mount := range effectiveMounts {
-		diag.Printf("Processing %+v", mount)
-
 		var (
 			err            error
 			hostPathInfo   os.FileInfo
@@ -418,7 +422,7 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 			}
 		}
 
-		if err := syscall.Mount(mount.HostPath, absTargetPath, mount.Fs, mount.Flags, ""); err != nil {
+		if err := mounter.Mount(mount.HostPath, absTargetPath, mount.Fs, mount.Flags, ""); err != nil {
 			log.PrintE(fmt.Sprintf("can't mount %q on %q with flags %v", mount.HostPath, absTargetPath, mount.Flags), err)
 			return 254
 		}

From 7e69e70464693a0514199d0dfa536e9445d042b8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 31 Jan 2017 16:52:17 +0000
Subject: [PATCH 1037/1304] stage1/fly: evaluate symlinks in mount targets

---
 stage1_fly/run/main.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 873d34479a..23036ddcbd 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -39,6 +39,7 @@ import (
 	"github.com/coreos/rkt/pkg/user"
 	stage1common "github.com/coreos/rkt/stage1/common"
 	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
+	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 )
 
 const (
@@ -380,7 +381,16 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 			hostPathInfo = nil
 		}
 
-		absTargetPath := filepath.Join(mount.TargetPrefixPath, mount.RelTargetPath)
+		absTargetPath := mount.RelTargetPath
+		if mount.TargetPrefixPath != "" {
+			absStage2RootFS := common.AppRootfsPath(p.Root, ra.Name)
+			targetPath, err := stage1initcommon.EvaluateSymlinksInsideApp(absStage2RootFS, mount.RelTargetPath)
+			if err != nil {
+				log.PrintE(fmt.Sprintf("evaluate target path %q in %q", mount.RelTargetPath, absStage2RootFS), err)
+				return 254
+			}
+			absTargetPath = filepath.Join(absStage2RootFS, targetPath)
+		}
 		if targetPathInfo, err = os.Stat(absTargetPath); err != nil && !os.IsNotExist(err) {
 			log.PrintE(fmt.Sprintf("stat of target path %s", absTargetPath), err)
 			return 254

From 789a90c8e60030dd3869a4ec3b42c19e27d22c3e Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Tue, 31 Jan 2017 16:52:48 +0000
Subject: [PATCH 1038/1304] tests: unconditionally run mount tests

---
 tests/rkt_mount_test.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index 293f74a495..7c09ebc7f5 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build host coreos src
-
 package main
 
 import (
@@ -125,7 +123,7 @@ func TestMountSymlink(t *testing.T) {
 
 		// Read the actual file.
 		rktCmd := fmt.Sprintf(
-			"%s --insecure-options=image run %s --set-env=FILE=%s %s",
+			"%s --insecure-options=image --debug run %s --set-env=FILE=%s %s",
 			ctx.Cmd(), paramMount, tt.actualFile, image,
 		)
 		t.Logf("%s\n", rktCmd)

From f00c947f6c9800c96de6c0ca9e804e7c8f6d2b10 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 1 Feb 2017 10:01:44 +0100
Subject: [PATCH 1039/1304] lib/app: use runtime app mounts and appVolumes
 rather than mountpoints

Currently we use (mostly unpopulated) mountpoint metadata for returning
sandbox mounts. The appc added specific appVolume mounts though. This
fixes it by using the latter.
---
 lib/app.go | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/lib/app.go b/lib/app.go
index d3a01b6f0d..52f3fcdb7f 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -65,30 +65,12 @@ func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.
 		UserLabels:      ra.App.UserLabels,
 	}
 
-	// Generate mounts
-	for _, mnt := range ra.App.MountPoints {
-		name := mnt.Name.String()
-		containerPath := mnt.Path
-		readOnly := mnt.ReadOnly
-
-		var hostPath string
-		for _, vol := range podManifest.Volumes {
-			if vol.Name != mnt.Name {
-				continue
-			}
-
-			hostPath = vol.Source
-			if vol.ReadOnly != nil && !readOnly {
-				readOnly = *vol.ReadOnly
-			}
-			break
-		}
-
+	for _, mnt := range ra.Mounts {
 		app.Mounts = append(app.Mounts, &Mount{
-			Name:          name,
-			ContainerPath: containerPath,
-			HostPath:      hostPath,
-			ReadOnly:      readOnly,
+			Name:          mnt.Volume.String(),
+			ContainerPath: mnt.Path,
+			HostPath:      mnt.AppVolume.Source,
+			ReadOnly:      *mnt.AppVolume.ReadOnly,
 		})
 	}
 

From e2e11296acca3228558b577cf713d9bb1810bdfc Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 19 Sep 2016 12:58:08 +0000
Subject: [PATCH 1040/1304] stage1: add support for attachable applications

This commit introduces experimental support for attachable
applications. This consists of:
 * a new `attach` subcommand
 * a set of per-app flags to control stdin/stdout/stderr modes
 * a stage1 `iottymux` binary for multiplexing and attaching
 * two new templated stage1 services, `iomux` and `ttymux`
---
 common/apps/apps.go                |  18 +
 common/experiment.go               |   9 +-
 rkt/app_add.go                     |   1 +
 rkt/app_sandbox.go                 |   2 +-
 rkt/attach.go                      | 183 +++++++++
 rkt/cli_apps.go                    | 101 +++++
 rkt/run.go                         |   9 +-
 stage0/app_add.go                  |  66 +---
 stage0/attach.go                   |  37 ++
 stage0/common.go                   |  91 +++++
 stage0/manifest.go                 |   9 +-
 stage0/run.go                      | 112 ++----
 stage1/aci/aci-install.mk          |   1 +
 stage1/aci/aci-manifest.in         |   4 +
 stage1/app_add/app_add.go          |   2 -
 stage1/attach/attach.go            | 108 ++++++
 stage1/attach/attach.mk            |   1 +
 stage1/common/types/pod.go         |  11 +-
 stage1/init/common/path.go         |  14 +-
 stage1/init/common/units.go        | 194 +++++++++-
 stage1/iottymux/iottymux.go        | 601 +++++++++++++++++++++++++++++
 stage1/iottymux/iottymux.mk        |   1 +
 stage1/secondary-stuff.mk          |   2 +
 stage1/units/units/iomux@.service  |  16 +
 stage1/units/units/ttymux@.service |  16 +
 25 files changed, 1437 insertions(+), 172 deletions(-)
 create mode 100644 rkt/attach.go
 create mode 100644 stage0/attach.go
 create mode 100644 stage1/attach/attach.go
 create mode 100644 stage1/attach/attach.mk
 create mode 100644 stage1/iottymux/iottymux.go
 create mode 100644 stage1/iottymux/iottymux.mk
 create mode 100644 stage1/units/units/iomux@.service
 create mode 100644 stage1/units/units/ttymux@.service

diff --git a/common/apps/apps.go b/common/apps/apps.go
index 703dfd37d9..598a6de326 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -30,6 +30,21 @@ var (
 	ErrInvalidSeccompOverride = errors.New("invalid seccomp command-line override")
 )
 
+// AppIO describes the type of an application stream at runtime (stdin/stdout/stderr).
+type AppIO string
+
+func (a AppIO) String() string {
+	return string(a)
+}
+
+const (
+	AppIOInteractive AppIO = "interactive" // interactive I/O (parent terminal)
+	AppIOLog         AppIO = "log"         // log-only I/O
+	AppIONull        AppIO = "null"        // null I/O
+	AppIOStream      AppIO = "stream"      // attachable I/O
+	AppIOTTY         AppIO = "tty"         // I/O over TTY
+)
+
 type App struct {
 	Name              string                            // the name of the app. If not set, the image's name will be used.
 	Image             string                            // the image reference as supplied by the user on the cli
@@ -51,6 +66,9 @@ type App struct {
 	UserAnnotations   map[string]string                 // the user annotations of the app.
 	UserLabels        map[string]string                 // the user labels of the app.
 	Environments      map[string]string                 // the environments of the app.
+	Stdin             AppIO                             // mode for stdin
+	Stdout            AppIO                             // mode for stdout
+	Stderr            AppIO                             // mode for stderr
 
 	// TODO(jonboulle): These images are partially-populated hashes, this should be clarified.
 	ImageID types.Hash // resolved image identifier
diff --git a/common/experiment.go b/common/experiment.go
index 48650ea763..7c7cb07fba 100644
--- a/common/experiment.go
+++ b/common/experiment.go
@@ -20,9 +20,10 @@ import (
 	"strings"
 )
 
-// a string set of known rkt experiments
-var experiments = map[string]struct{}{
-	"app": {}, // rkt app subcommands for CRI
+// a string set of known rkt experiments, gated stage0 features
+var stage0Experiments = map[string]struct{}{
+	"app":    {}, // rkt app subcommands for CRI
+	"attach": {}, // rkt attach subcommands and streaming options
 }
 
 // IsExperimentEnabled returns true if the given rkt experiment is enabled.
@@ -32,7 +33,7 @@ var experiments = map[string]struct{}{
 // If the environment variable does not contain a valid bool value
 // according to strconv.ParseBool, false is returned.
 func IsExperimentEnabled(name string) bool {
-	if _, ok := experiments[name]; !ok {
+	if _, ok := stage0Experiments[name]; !ok {
 		return false
 	}
 
diff --git a/rkt/app_add.go b/rkt/app_add.go
index 7c7b8e1988..b2273a860c 100644
--- a/rkt/app_add.go
+++ b/rkt/app_add.go
@@ -109,6 +109,7 @@ func runAppAdd(cmd *cobra.Command, args []string) (exit int) {
 		stderr.PrintE("error finding images", err)
 		return 254
 	}
+	rktApps.Last().ImageID = *img
 
 	podPID, err := p.ContainerPid1()
 	if err != nil {
diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
index 87b9b6f6b0..db84e559f5 100644
--- a/rkt/app_sandbox.go
+++ b/rkt/app_sandbox.go
@@ -192,7 +192,7 @@ func runAppSandbox(cmd *cobra.Command, args []string) int {
 		CommonConfig:         &cfg,
 		Net:                  flagNet,
 		LockFd:               lfd,
-		Interactive:          true,
+		Interactive:          false,
 		DNSConfMode:          DNSConfMode,
 		DNSConfig:            DNSConfig,
 		MDSRegister:          false,
diff --git a/rkt/attach.go b/rkt/attach.go
new file mode 100644
index 0000000000..3a0e06d259
--- /dev/null
+++ b/rkt/attach.go
@@ -0,0 +1,183 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/coreos/rkt/common"
+	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/coreos/rkt/stage0"
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdAttach = &cobra.Command{
+		Use:   "attach [--app=APPNAME] [--mode=MODE] UUID",
+		Short: "Attach to an app running within a rkt pod",
+
+		Long: `UUID should be the UUID of a running pod.`,
+		Run:  ensureSuperuser(runWrapper(runAttach)),
+	}
+	flagAttachMode string
+)
+
+func init() {
+	if common.IsExperimentEnabled("attach") {
+		cmdRkt.AddCommand(cmdAttach)
+		cmdAttach.Flags().StringVar(&flagAppName, "app", "", "name of the app to enter within the specified pod")
+		cmdAttach.Flags().StringVar(&flagAttachMode, "mode", "auto", "attach mode")
+	}
+}
+
+func runAttach(cmd *cobra.Command, args []string) (exit int) {
+	if len(args) < 1 {
+		cmd.Usage()
+		return 254
+	}
+
+	uuid := args[0]
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), uuid)
+	if err != nil {
+		stderr.PrintE("problem retrieving pod", err)
+		return 254
+	}
+	defer p.Close()
+
+	if p.State() != pkgPod.Running {
+		stderr.Printf("pod %q isn't currently running", p.UUID)
+		return 254
+	}
+
+	podPID, err := p.ContainerPid1()
+	if err != nil {
+		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
+		return 254
+	}
+
+	appName, err := getAppName(p)
+	if err != nil {
+		stderr.PrintE("unable to determine app name", err)
+		return 254
+	}
+
+	s, err := imagestore.NewStore(storeDir())
+	if err != nil {
+		stderr.PrintE("cannot open store", err)
+		return 254
+	}
+
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open store", err)
+		return 254
+	}
+
+	stage1TreeStoreID, err := p.GetStage1TreeStoreID()
+	if err != nil {
+		stderr.PrintE("error getting stage1 treeStoreID", err)
+		return 254
+	}
+
+	// prepare stage1/attach flags
+	stage1RootFS := ts.GetRootFS(stage1TreeStoreID)
+	attachArgs, err := createStage1AttachFlags(flagAttachMode)
+	if err != nil {
+		stderr.PrintE("invalid attach mode", err)
+		return 254
+	}
+	attachArgs = append(attachArgs,
+		fmt.Sprintf("--app=%s", appName),
+		fmt.Sprintf("--debug=%t", globalFlags.Debug),
+	)
+
+	if err = stage0.Attach(p.Path(), podPID, *appName, stage1RootFS, uuid, attachArgs); err != nil {
+		stderr.PrintE("attach failed", err)
+		return 254
+	}
+	// not reached when stage0.Attach execs /enter
+	return 0
+}
+
+// createStage1AttachFlags parses an attach stage0 CLI "--mode" flag and
+// returns options suited for stage1/attach entrypoint invocation
+func createStage1AttachFlags(attachMode string) ([]string, error) {
+	attachArgs := []string{}
+
+	// list mode: just print endpoints
+	if attachMode == "list" {
+		attachArgs = append(attachArgs, "--action=list")
+		return attachArgs, nil
+	}
+
+	// auto-attach mode: stage1-attach will figure out endpoints
+	if attachMode == "auto" || attachMode == "" {
+		attachArgs = append(attachArgs, "--action=auto-attach")
+		return attachArgs, nil
+	}
+
+	// custom-attach mode: user specified endpoints
+	var customEndpoints struct {
+		TTYIn  bool
+		TTYOut bool
+		Stdin  bool
+		Stdout bool
+		Stderr bool
+	}
+	attachArgs = append(attachArgs, "--action=custom-attach")
+
+	// parse comma-separated endpoints for custom attach
+	eps := strings.Split(attachMode, ",")
+	for _, e := range eps {
+		switch e {
+		case "stdin":
+			customEndpoints.Stdin = true
+		case "stdout":
+			customEndpoints.Stdout = true
+		case "stderr":
+			customEndpoints.Stderr = true
+		case "tty":
+			customEndpoints.TTYIn = true
+			customEndpoints.TTYOut = true
+		case "tty-in":
+			customEndpoints.TTYIn = true
+		case "tty-out":
+			customEndpoints.TTYOut = true
+		default:
+			return nil, fmt.Errorf("unknown endpoint %q", e)
+		}
+	}
+
+	// check that the resulting attach mode is sane
+	if !(customEndpoints.TTYIn || customEndpoints.TTYOut || customEndpoints.Stdin || customEndpoints.Stdout || customEndpoints.Stderr) {
+		return nil, fmt.Errorf("mode must specify at least one endpoint to attach")
+	}
+	if (customEndpoints.TTYIn || customEndpoints.TTYOut) && (customEndpoints.Stdin || customEndpoints.Stdout || customEndpoints.Stderr) {
+		return nil, fmt.Errorf("incompatible endpoints %q, cannot simultaneously attach TTY and streams", attachMode)
+	}
+
+	attachArgs = append(attachArgs,
+		fmt.Sprintf("--tty-in=%t", customEndpoints.TTYIn),
+		fmt.Sprintf("--tty-out=%t", customEndpoints.TTYOut),
+		fmt.Sprintf("--stdin=%t", customEndpoints.Stdin),
+		fmt.Sprintf("--stdout=%t", customEndpoints.Stdout),
+		fmt.Sprintf("--stderr=%t", customEndpoints.Stderr),
+	)
+	return attachArgs, nil
+
+}
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index a8fa444bef..2848e93523 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -794,3 +794,104 @@ func (au *appSupplementaryGIDs) String() string {
 func (au *appSupplementaryGIDs) Type() string {
 	return "appSupplementaryGIDs"
 }
+
+// `--stdin=mode` flag
+type appStdin apps.Apps
+
+func (au *appStdin) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--stdin must follow an application")
+	}
+	allowedInModes := map[string]apps.AppIO{
+		apps.AppIONull.String():   apps.AppIONull,
+		apps.AppIOStream.String(): apps.AppIOStream,
+		apps.AppIOTTY.String():    apps.AppIOTTY,
+	}
+	mode, ok := allowedInModes[s]
+	if !ok {
+		return fmt.Errorf("invalid stdin mode %q", s)
+	}
+	app.Stdin = mode
+	return nil
+}
+
+func (au *appStdin) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	return app.Stdin.String()
+}
+
+func (au *appStdin) Type() string {
+	return "appStdin"
+}
+
+// `--stdout=mode` flag
+type appStdout apps.Apps
+
+func (au *appStdout) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--stdout must follow an application")
+	}
+	allowedOutModes := map[string]apps.AppIO{
+		apps.AppIOLog.String():    apps.AppIOLog,
+		apps.AppIONull.String():   apps.AppIONull,
+		apps.AppIOStream.String(): apps.AppIOStream,
+		apps.AppIOTTY.String():    apps.AppIOTTY,
+	}
+	mode, ok := allowedOutModes[s]
+	if !ok {
+		return fmt.Errorf("invalid stdout mode %q", s)
+	}
+	app.Stdout = mode
+	return nil
+}
+
+func (au *appStdout) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	return app.Stdout.String()
+}
+
+func (au *appStdout) Type() string {
+	return "appStdout"
+}
+
+// `--stderr=mode` flag
+type appStderr apps.Apps
+
+func (au *appStderr) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--stderr must follow an application")
+	}
+	allowedErrModes := map[string]apps.AppIO{
+		apps.AppIOLog.String():    apps.AppIOLog,
+		apps.AppIONull.String():   apps.AppIONull,
+		apps.AppIOStream.String(): apps.AppIOStream,
+		apps.AppIOTTY.String():    apps.AppIOTTY,
+	}
+	mode, ok := allowedErrModes[s]
+	if !ok {
+		return fmt.Errorf("invalid stderr mode %q", s)
+	}
+	app.Stderr = mode
+	return nil
+}
+
+func (au *appStderr) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	return app.Stderr.String()
+}
+
+func (au *appStderr) Type() string {
+	return "appStderr"
+}
diff --git a/rkt/run.go b/rkt/run.go
index 1dd158061d..b3d0a9af5e 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -110,6 +110,14 @@ func addAppFlags(cmd *cobra.Command) {
 	cmd.Flags().Var((*appAnnotation)(&rktApps), "user-annotation", "set the app's annotations (example: '--user-annotation=foo=bar')")
 	cmd.Flags().Var((*appLabel)(&rktApps), "user-label", "set the app's labels (example: '--user-label=foo=bar')")
 	cmd.Flags().Var((*appEnv)(&rktApps), "environment", "set the app's environment variables (example: '--environment=foo=bar')")
+	if common.IsExperimentEnabled("attach") {
+		cmd.Flags().Var((*appStdin)(&rktApps), "stdin", "stdin mode for the preceding application (example: '--stdin=null')")
+		cmd.Flags().MarkHidden("stdin")
+		cmd.Flags().Var((*appStdout)(&rktApps), "stdout", "stdout mode for the preceding application (example: '--stdout=log')")
+		cmd.Flags().MarkHidden("stdout")
+		cmd.Flags().Var((*appStderr)(&rktApps), "stderr", "stderr mode for the preceding application (example: '--stderr=log')")
+		cmd.Flags().MarkHidden("stderr")
+	}
 }
 
 func init() {
@@ -285,7 +293,6 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		stderr.PrintE("error initialising SELinux", err)
 		return 254
 	}
-
 	p.MountLabel = mountLabel
 
 	cfg := stage0.CommonConfig{
diff --git a/stage0/app_add.go b/stage0/app_add.go
index 8b23aaa32d..41e7875d2e 100644
--- a/stage0/app_add.go
+++ b/stage0/app_add.go
@@ -21,9 +21,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strconv"
 
-	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
@@ -138,69 +136,14 @@ func AddApp(cfg AddConfig) error {
 		}
 	}
 
-	ra := schema.RuntimeApp{
-		Name: *appName,
-		App:  am.App,
-		Image: schema.RuntimeImage{
-			Name:   &am.Name,
-			ID:     cfg.Image,
-			Labels: am.Labels,
-		},
-		Mounts:         MergeMounts(cfg.Apps.Mounts, app.Mounts),
-		ReadOnlyRootFS: app.ReadOnlyRootFS,
-	}
-
-	if app.Exec != "" {
-		// Create a minimal App section if not present
-		if am.App == nil {
-			ra.App = &types.App{
-				User:  strconv.Itoa(os.Getuid()),
-				Group: strconv.Itoa(os.Getgid()),
-			}
-		}
-		ra.App.Exec = []string{app.Exec}
+	ra, err := generateRuntimeApp(app, am, cfg.Apps.Mounts)
+	if err != nil {
+		return err
 	}
-
 	if app.Args != nil {
 		ra.App.Exec = append(ra.App.Exec[:1], app.Args...)
 	}
-
-	if app.WorkingDir != "" {
-		ra.App.WorkingDirectory = app.WorkingDir
-	}
-
-	if err := prepareIsolators(app, ra.App); err != nil {
-		return err
-	}
-
-	if app.User != "" {
-		ra.App.User = app.User
-	}
-
-	if app.Group != "" {
-		ra.App.Group = app.Group
-	}
-
-	if app.SupplementaryGIDs != nil {
-		ra.App.SupplementaryGIDs = app.SupplementaryGIDs
-	}
-
-	if app.UserAnnotations != nil {
-		ra.App.UserAnnotations = app.UserAnnotations
-	}
-
-	if app.UserLabels != nil {
-		ra.App.UserLabels = app.UserLabels
-	}
-
-	if app.Environments != nil {
-		envs := make([]string, 0, len(app.Environments))
-		for name, value := range app.Environments {
-			envs = append(envs, fmt.Sprintf("%s=%s", name, value))
-		}
-		// Let the app level environment override the environment variables.
-		mergeEnvs(&ra.App.Environment, envs, true)
-	}
+	pm.Apps = append(pm.Apps, ra)
 
 	env := ra.App.Environment
 
@@ -212,7 +155,6 @@ func AddApp(cfg AddConfig) error {
 	}
 
 	debug("adding app to sandbox")
-	pm.Apps = append(pm.Apps, ra)
 	if err := pod.UpdateManifest(pm, cfg.PodPath); err != nil {
 		return err
 	}
diff --git a/stage0/attach.go b/stage0/attach.go
new file mode 100644
index 0000000000..443ae83633
--- /dev/null
+++ b/stage0/attach.go
@@ -0,0 +1,37 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package stage0
+
+import (
+	"github.com/appc/spec/schema/types"
+)
+
+// Attach runs attach entrypoint, crossing the stage0/stage1 border.
+func Attach(cdir string, podPID int, appName types.ACName, stage1Path string, uuid string, args []string) error {
+	ce := CrossingEntrypoint{
+		PodPath:        cdir,
+		PodPID:         podPID,
+		AppName:        appName.String(),
+		EntrypointName: attachEntrypoint,
+		EntrypointArgs: args,
+		Interactive:    true,
+	}
+
+	if err := ce.Run(); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/stage0/common.go b/stage0/common.go
index 5009b724f5..96fe269ae5 100644
--- a/stage0/common.go
+++ b/stage0/common.go
@@ -21,8 +21,13 @@ import (
 	"os/exec"
 	"path/filepath"
 
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 	"github.com/coreos/rkt/common"
+	"github.com/coreos/rkt/common/apps"
+	stage1types "github.com/coreos/rkt/stage1/common/types"
 	"github.com/hashicorp/errwrap"
+	"strconv"
 )
 
 // CrossingEntrypoint represents a stage1 entrypoint whose execution
@@ -101,3 +106,89 @@ func (ce CrossingEntrypoint) Run() error {
 
 	return nil
 }
+
+// generateRuntimeApp merges runtime information from the image manifest and from
+// runtime configuration overrides, returning a full configuration for a runtime app
+func generateRuntimeApp(appRunConfig *apps.App, am *schema.ImageManifest, podMounts []schema.Mount) (schema.RuntimeApp, error) {
+
+	ra := schema.RuntimeApp{
+		App: am.App,
+		Image: schema.RuntimeImage{
+			Name:   &am.Name,
+			ID:     appRunConfig.ImageID,
+			Labels: am.Labels,
+		},
+		Mounts:         MergeMounts(podMounts, appRunConfig.Mounts),
+		ReadOnlyRootFS: appRunConfig.ReadOnlyRootFS,
+	}
+
+	appName, err := types.NewACName(appRunConfig.Name)
+	if err != nil {
+		return ra, errwrap.Wrap(errors.New("invalid app name format"), err)
+	}
+	ra.Name = *appName
+
+	if appRunConfig.Exec != "" {
+		// Create a minimal App section if not present
+		if am.App == nil {
+			ra.App = &types.App{
+				User:  strconv.Itoa(os.Getuid()),
+				Group: strconv.Itoa(os.Getgid()),
+			}
+		}
+		ra.App.Exec = []string{appRunConfig.Exec}
+	}
+
+	if appRunConfig.Args != nil {
+		ra.App.Exec = append(ra.App.Exec, appRunConfig.Args...)
+	}
+
+	if appRunConfig.WorkingDir != "" {
+		ra.App.WorkingDirectory = appRunConfig.WorkingDir
+	}
+
+	if err := prepareIsolators(appRunConfig, ra.App); err != nil {
+		return ra, err
+	}
+
+	if appRunConfig.User != "" {
+		ra.App.User = appRunConfig.User
+	}
+
+	if appRunConfig.Group != "" {
+		ra.App.Group = appRunConfig.Group
+	}
+
+	if appRunConfig.SupplementaryGIDs != nil {
+		ra.App.SupplementaryGIDs = appRunConfig.SupplementaryGIDs
+	}
+
+	if appRunConfig.UserAnnotations != nil {
+		ra.App.UserAnnotations = appRunConfig.UserAnnotations
+	}
+
+	if appRunConfig.UserLabels != nil {
+		ra.App.UserLabels = appRunConfig.UserLabels
+	}
+
+	if appRunConfig.Stdin != "" {
+		ra.Annotations.Set(stage1types.AppStdinMode, appRunConfig.Stdin.String())
+	}
+	if appRunConfig.Stdout != "" {
+		ra.Annotations.Set(stage1types.AppStdoutMode, appRunConfig.Stdout.String())
+	}
+	if appRunConfig.Stderr != "" {
+		ra.Annotations.Set(stage1types.AppStderrMode, appRunConfig.Stderr.String())
+	}
+
+	if appRunConfig.Environments != nil {
+		envs := make([]string, 0, len(appRunConfig.Environments))
+		for name, value := range appRunConfig.Environments {
+			envs = append(envs, fmt.Sprintf("%s=%s", name, value))
+		}
+		// Let the app level environment override the environment variables.
+		mergeEnvs(&ra.App.Environment, envs, true)
+	}
+
+	return ra, nil
+}
diff --git a/stage0/manifest.go b/stage0/manifest.go
index ab03e87403..1392bed4e6 100644
--- a/stage0/manifest.go
+++ b/stage0/manifest.go
@@ -29,10 +29,11 @@ import (
 )
 
 const (
-	enterEntrypoint = "coreos.com/rkt/stage1/enter"
-	runEntrypoint   = "coreos.com/rkt/stage1/run"
-	gcEntrypoint    = "coreos.com/rkt/stage1/gc"
-	stopEntrypoint  = "coreos.com/rkt/stage1/stop"
+	enterEntrypoint  = "coreos.com/rkt/stage1/enter"
+	runEntrypoint    = "coreos.com/rkt/stage1/run"
+	gcEntrypoint     = "coreos.com/rkt/stage1/gc"
+	stopEntrypoint   = "coreos.com/rkt/stage1/stop"
+	attachEntrypoint = "coreos.com/rkt/stage1/attach"
 
 	appAddEntrypoint   = "coreos.com/rkt/stage1/app/add"
 	appRmEntrypoint    = "coreos.com/rkt/stage1/app/rm"
diff --git a/stage0/run.go b/stage0/run.go
index c64c07d5a5..f7f1ca5d35 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -96,17 +96,18 @@ type RunConfig struct {
 
 // CommonConfig defines the configuration shared by both Run and Prepare
 type CommonConfig struct {
-	DataDir      string            // The path to the data directory, e.g. /var/lib/rkt/pods
-	Store        *imagestore.Store // store containing all of the configured application images
-	TreeStore    *treestore.Store  // store containing all of the configured application images
-	Stage1Image  types.Hash        // stage1 image containing usable /init and /enter entrypoints
-	UUID         *types.UUID       // UUID of the pod
-	RootHash     string            // Hash of the root filesystem
-	ManifestData string            // The pod manifest data
-	Debug        bool
-	MountLabel   string // selinux label to use for fs
-	ProcessLabel string // selinux label to use
-	Mutable      bool   // whether this pod is mutable
+	DataDir      string                        // The path to the data directory, e.g. /var/lib/rkt/pods
+	Store        *imagestore.Store             // store containing all of the configured application images
+	TreeStore    *treestore.Store              // store containing all of the configured application images
+	Stage1Image  types.Hash                    // stage1 image containing usable /init and /enter entrypoints
+	UUID         *types.UUID                   // UUID of the pod
+	RootHash     string                        // hash of the root filesystem
+	ManifestData string                        // the pod manifest data
+	Debug        bool                          // debug mode
+	MountLabel   string                        // SELinux label to use for fs
+	ProcessLabel string                        // SELinux label to use
+	Mutable      bool                          // whether this pod is mutable
+	Annotations  map[types.ACIdentifier]string // pod-level annotations, for internal/experimental usage
 }
 
 // HostsEntries encapsulates the entries in an etc-hosts file: mapping from IP
@@ -210,84 +211,34 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 			return errwrap.Wrap(errors.New("error getting the manifest"), err)
 		}
 
-		var appName *types.ACName
-		if app.Name != "" {
-			appName, err = types.NewACName(app.Name)
-			if err != nil {
-				return errwrap.Wrap(errors.New("invalid app name format"), err)
-			}
-		} else {
-			appName, err = imageNameToAppName(am.Name)
+		if app.Name == "" {
+			appName, err := imageNameToAppName(am.Name)
 			if err != nil {
 				return errwrap.Wrap(errors.New("error converting image name to app name"), err)
 			}
+			app.Name = appName.String()
+		}
+
+		appName, err := types.NewACName(app.Name)
+		if err != nil {
+			return errwrap.Wrap(errors.New("invalid app name format"), err)
 		}
 
 		if _, err := prepareAppImage(cfg, *appName, img, dir, cfg.UseOverlay); err != nil {
 			return errwrap.Wrap(fmt.Errorf("error preparing image %s", img), err)
 		}
 		if pm.Apps.Get(*appName) != nil {
-			return fmt.Errorf("error: multiple apps with name %s", am.Name)
+			return fmt.Errorf("error: multiple apps with name %s", app.Name)
 		}
 		if am.App == nil && app.Exec == "" {
 			return fmt.Errorf("error: image %s has no app section and --exec argument is not provided", img)
 		}
-		ra := schema.RuntimeApp{
-			// TODO(vc): leverage RuntimeApp.Name for disambiguating the apps
-			Name: *appName,
-			App:  am.App,
-			Image: schema.RuntimeImage{
-				Name:   &am.Name,
-				ID:     img,
-				Labels: am.Labels,
-			},
-			Mounts:         MergeMounts(cfg.Apps.Mounts, app.Mounts),
-			ReadOnlyRootFS: app.ReadOnlyRootFS,
-		}
 
-		if app.Exec != "" {
-			// Create a minimal App section if not present
-			if am.App == nil {
-				ra.App = &types.App{
-					User:  strconv.Itoa(os.Getuid()),
-					Group: strconv.Itoa(os.Getgid()),
-				}
-			}
-			ra.App.Exec = []string{app.Exec}
-		}
-
-		if app.Args != nil {
-			ra.App.Exec = append(ra.App.Exec, app.Args...)
-		}
-
-		if app.WorkingDir != "" {
-			ra.App.WorkingDirectory = app.WorkingDir
-		}
-
-		if err := prepareIsolators(app, ra.App); err != nil {
+		ra, err := generateRuntimeApp(app, am, cfg.Apps.Mounts)
+		if err != nil {
 			return err
 		}
 
-		if app.User != "" {
-			ra.App.User = app.User
-		}
-
-		if app.Group != "" {
-			ra.App.Group = app.Group
-		}
-
-		if app.SupplementaryGIDs != nil {
-			ra.App.SupplementaryGIDs = app.SupplementaryGIDs
-		}
-
-		if app.UserAnnotations != nil {
-			ra.App.UserAnnotations = app.UserAnnotations
-		}
-
-		if app.UserLabels != nil {
-			ra.App.UserLabels = app.UserLabels
-		}
-
 		// loading the environment from the lowest priority to highest
 		if cfg.InheritEnv {
 			// Inherit environment does not override app image environment
@@ -297,15 +248,8 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		mergeEnvs(&ra.App.Environment, cfg.EnvFromFile, true)
 		mergeEnvs(&ra.App.Environment, cfg.ExplicitEnv, true)
 
-		if app.Environments != nil {
-			envs := make([]string, 0, len(app.Environments))
-			for name, value := range app.Environments {
-				envs = append(envs, fmt.Sprintf("%s=%s", name, value))
-			}
-			mergeEnvs(&ra.App.Environment, envs, true)
-		}
-
 		pm.Apps = append(pm.Apps, ra)
+
 		return nil
 	}); err != nil {
 		return nil, err
@@ -329,6 +273,14 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 	pm.UserAnnotations = cfg.UserAnnotations
 	pm.UserLabels = cfg.UserLabels
 
+	// Add internal annotations for rkt experiments
+	for k, v := range cfg.Annotations {
+		if _, ok := pm.Annotations.Get(k.String()); ok {
+			continue
+		}
+		pm.Annotations.Set(k, v)
+	}
+
 	pmb, err := json.Marshal(pm)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("error marshalling pod manifest"), err)
diff --git a/stage1/aci/aci-install.mk b/stage1/aci/aci-install.mk
index ceaf738818..11175f1613 100644
--- a/stage1/aci/aci-install.mk
+++ b/stage1/aci/aci-install.mk
@@ -15,6 +15,7 @@ AMI_ACI_DIRS_BASE := $(AMI_ACIROOTFSDIR)
 AMI_ACI_DIRS_RESTS := \
 	etc \
 	opt/stage2 \
+	rkt/iottymux \
 	rkt/status \
 	rkt/env
 # all the directories we want to be created in the ACI rootfs
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index 6878aa42c5..d71b523b40 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -49,6 +49,10 @@
             "name": "coreos.com/rkt/stage1/app/stop",
             "value": "/app_stop"
         },
+        {
+            "name": "coreos.com/rkt/stage1/attach",
+            "value": "/attach"
+        },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
             "value": "5"
diff --git a/stage1/app_add/app_add.go b/stage1/app_add/app_add.go
index dd70dca5de..da9c06870d 100644
--- a/stage1/app_add/app_add.go
+++ b/stage1/app_add/app_add.go
@@ -133,8 +133,6 @@ func appAddStage0(appName *types.ACName, uuid *types.UUID) error {
 	w.AppUnit(ra, binPath,
 		unit.NewUnitOption("Unit", "Before", "halt.target"),
 		unit.NewUnitOption("Unit", "Conflicts", "halt.target"),
-		unit.NewUnitOption("Service", "StandardOutput", "journal+console"),
-		unit.NewUnitOption("Service", "StandardError", "journal+console"),
 	)
 	w.AppReaperUnit(ra.Name, binPath)
 	if err := w.Error(); err != nil {
diff --git a/stage1/attach/attach.go b/stage1/attach/attach.go
new file mode 100644
index 0000000000..499035cd4e
--- /dev/null
+++ b/stage1/attach/attach.go
@@ -0,0 +1,108 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+
+	"github.com/appc/spec/schema/types"
+	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1common "github.com/coreos/rkt/stage1/common"
+	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+)
+
+var (
+	log  *rktlog.Logger
+	diag *rktlog.Logger
+
+	app    string
+	action string
+	debug  bool
+
+	attachTTYIn  bool
+	attachTTYOut bool
+	attachStdin  bool
+	attachStdout bool
+	attachStderr bool
+)
+
+func init() {
+	flag.StringVar(&action, "action", "list", "Action")
+	flag.StringVar(&app, "app", "", "Application name")
+	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
+
+	flag.BoolVar(&attachTTYIn, "tty-in", false, "attach tty input")
+	flag.BoolVar(&attachTTYOut, "tty-out", false, "attach tty output")
+	flag.BoolVar(&attachStdin, "stdin", false, "attach stdin")
+	flag.BoolVar(&attachStdout, "stdout", false, "attach stdin")
+	flag.BoolVar(&attachStderr, "stderr", false, "attach stderr")
+}
+
+func main() {
+	flag.Parse()
+
+	stage1initcommon.InitDebug(debug)
+
+	log, diag, _ = rktlog.NewLogSet("stage1-attach", debug)
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
+	}
+
+	appName, err := types.NewACName(app)
+	if err != nil {
+		log.PrintE("invalid application name", err)
+		os.Exit(254)
+	}
+
+	if action != "list" && action != "auto-attach" && action != "custom-attach" {
+		log.Printf("invalid attach action %q", action)
+		os.Exit(254)
+	}
+
+	args := stage1common.PrepareEnterCmd(false)
+	args = append(args,
+		"/iottymux",
+		fmt.Sprintf("--action=%s", action),
+		fmt.Sprintf("--app=%s", appName),
+	)
+
+	cmd := exec.Cmd{
+		Path:   args[0],
+		Args:   args,
+		Stdin:  os.Stdin,
+		Stdout: os.Stdout,
+		Stderr: os.Stderr,
+		Env: []string{
+			fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
+			fmt.Sprintf("STAGE2_DEBUG=%t", debug),
+			fmt.Sprintf("STAGE2_ATTACH_TTYIN=%t", attachTTYIn),
+			fmt.Sprintf("STAGE2_ATTACH_TTYOUT=%t", attachTTYOut),
+			fmt.Sprintf("STAGE2_ATTACH_STDIN=%t", attachStdin),
+			fmt.Sprintf("STAGE2_ATTACH_STDOUT=%t", attachStdout),
+			fmt.Sprintf("STAGE2_ATTACH_STDERR=%t", attachStderr),
+		},
+	}
+
+	if err := cmd.Run(); err != nil {
+		log.PrintE(`error executing "iottymux"`, err)
+		os.Exit(254)
+	}
+
+	os.Exit(0)
+}
diff --git a/stage1/attach/attach.mk b/stage1/attach/attach.mk
new file mode 100644
index 0000000000..b96c5ea77b
--- /dev/null
+++ b/stage1/attach/attach.mk
@@ -0,0 +1 @@
+include stage1/makelib/aci_simple_go_bin.mk
diff --git a/stage1/common/types/pod.go b/stage1/common/types/pod.go
index 18c57c4ad0..81dd38956e 100644
--- a/stage1/common/types/pod.go
+++ b/stage1/common/types/pod.go
@@ -29,8 +29,15 @@ import (
 	"github.com/hashicorp/errwrap"
 )
 
-// The filename where we persist the RuntimePod data
-const RuntimeConfigPath = "runtime-config"
+const (
+	// The filename where we persist the RuntimePod data
+	RuntimeConfigPath = "runtime-config"
+
+	// App-level annotations: streams mode
+	AppStdinMode  = "coreos.com/rkt/stage2/stdin"
+	AppStdoutMode = "coreos.com/rkt/stage2/stdout"
+	AppStderrMode = "coreos.com/rkt/stage2/stderr"
+)
 
 // Pod encapsulates a PodManifest and ImageManifests
 type Pod struct {
diff --git a/stage1/init/common/path.go b/stage1/init/common/path.go
index c6fbc8764d..fb0426ada4 100644
--- a/stage1/init/common/path.go
+++ b/stage1/init/common/path.go
@@ -27,7 +27,9 @@ import (
 const (
 	// UnitsDir is the default path to systemd systemd unit directory
 	UnitsDir        = "/usr/lib/systemd/system"
-	envDir          = "/rkt/env" // TODO(vc): perhaps this doesn't belong in /rkt?
+	envDir          = "/rkt/env"
+	statusDir       = "/rkt/status"
+	ioMuxDir        = "/rkt/iottymux"
 	defaultWantsDir = UnitsDir + "/default.target.wants"
 	socketsWantsDir = UnitsDir + "/sockets.target.wants"
 )
@@ -60,6 +62,11 @@ func EnvFilePath(root string, appName types.ACName) string {
 	return filepath.Join(common.Stage1RootfsPath(root), RelEnvFilePath(appName))
 }
 
+// IOMUxFilePath returns the path to the environment file for the given app name.
+func IOMuxDir(root string, appName types.ACName) string {
+	return filepath.Join(common.Stage1RootfsPath(root), ioMuxDir, appName.String())
+}
+
 // ServiceWantPath returns the systemd default.target want symlink path for the
 // given app name.
 func ServiceWantPath(root string, appName types.ACName) string {
@@ -89,3 +96,8 @@ func SocketUnitPath(root string, appName types.ACName) string {
 func SocketWantPath(root string, appName types.ACName) string {
 	return filepath.Join(common.Stage1RootfsPath(root), socketsWantsDir, SocketUnitName(appName))
 }
+
+// TypedUnitPath returns the path to a custom-typed unit file
+func TypedUnitPath(root string, unitName string, unitType string) string {
+	return filepath.Join(common.Stage1RootfsPath(root), UnitsDir, unitName+"."+unitType)
+}
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index a934d7e7af..47fc8052f5 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -168,22 +168,9 @@ func ImmutableEnv(p *stage1commontypes.Pod) error {
 			return err
 		}
 
-		var opts []*unit.UnitOption
-		if p.Interactive {
-			opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "tty"))
-			opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "tty"))
-			opts = append(opts, unit.NewUnitOption("Service", "StandardError", "tty"))
-		} else {
-			opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "journal+console"))
-			opts = append(opts, unit.NewUnitOption("Service", "StandardError", "journal+console"))
-		}
-
-		opts = append(opts,
+		uw.AppUnit(ra, binPath,
 			// When an app fails, we shut down the pod
-			unit.NewUnitOption("Unit", "OnFailure", "halt.target"),
-		)
-
-		uw.AppUnit(ra, binPath, opts...)
+			unit.NewUnitOption("Unit", "OnFailure", "halt.target"))
 
 		uw.AppReaperUnit(ra.Name, binPath,
 			unit.NewUnitOption("Service", "Environment", `"EXIT_POD=true"`),
@@ -195,6 +182,157 @@ func ImmutableEnv(p *stage1commontypes.Pod) error {
 	return uw.Error()
 }
 
+// SetupAppIO prepares all properties related to streams (stdin/stdout/stderr) and TTY
+// for an application service unit.
+//
+// It works according to the following steps:
+//  1. short-circuit interactive pods and legacy systemd, for backward compatibility
+//  2. parse app-level annotations to determine stdin/stdout/stderr mode
+//     2a. if an annotation is missing/invalid, it fallbacks to legacy mode (in: null, out/err: journald)
+//     2b. if a valid annotation is found, it prepares:
+//          - TTY and stream properties for the systemd service unit
+//          - env variables for iottymux binary
+//  3. if any of stdin/stdout/stderr is in TTY or streaming mode:
+//     3a. the env file for iottymux is written to `/rkt/iottymux/<appname>/env` with the above content
+//     3b. for TTY mode, a `TTYPath` property and an `After=ttymux@<appname>.service` dependency are added
+//     3c. for streaming mode, a `Before=iomux@<appname>.service` dependency is added
+//
+// For complete details, see dev-docs at Documentation/devel/log-attach-design.md
+func (uw *UnitWriter) SetupAppIO(p *stage1commontypes.Pod, ra *schema.RuntimeApp, binPath string, opts ...*unit.UnitOption) []*unit.UnitOption {
+	if uw.err != nil {
+		return opts
+	}
+
+	if p.Interactive {
+		opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "tty"))
+		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "tty"))
+		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "tty"))
+		return opts
+	}
+
+	flavor, systemdVersion, err := GetFlavor(uw.p)
+	if err != nil {
+		uw.err = err
+		return opts
+	}
+
+	stdin, _ := ra.Annotations.Get(stage1commontypes.AppStdinMode)
+	stdout, _ := ra.Annotations.Get(stage1commontypes.AppStdoutMode)
+	stderr, _ := ra.Annotations.Get(stage1commontypes.AppStderrMode)
+
+	// Attach needs https://github.com/systemd/systemd/pull/4179, ie. systemd v232 or a backport
+	if ((flavor == "src" || flavor == "host") && systemdVersion < 232) ||
+		((flavor == "coreos" || flavor == "kvm") && systemdVersion < 231) {
+		// Explicit error if systemd is too old for attaching
+		if stdin != "" || stdout != "" || stderr != "" {
+			uw.err = fmt.Errorf("stage1 systemd %q does not support attachable I/O", systemdVersion)
+			return opts
+		}
+		opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "null"))
+		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "journal+console"))
+		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "journal+console"))
+		return opts
+	}
+
+	var iottymuxEnvFlags []string
+	needsIOMux := false
+	needsTTYMux := false
+
+	switch stdin {
+	case "stream":
+		needsIOMux = true
+		uw.AppSocketUnit(ra.Name, binPath, "stdin")
+		iottymuxEnvFlags = append(iottymuxEnvFlags, "STAGE2_STDIN=true")
+		opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "fd"))
+		opts = append(opts, unit.NewUnitOption("Service", "Sockets", fmt.Sprintf("%s-%s.socket", ra.Name, "stdin")))
+	case "tty":
+		needsTTYMux = true
+		iottymuxEnvFlags = append(iottymuxEnvFlags, "STAGE2_STDIN=true")
+		opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "tty-force"))
+	case "interactive":
+		opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "tty"))
+	default:
+		// null mode
+		opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "null"))
+	}
+
+	switch stdout {
+	case "stream":
+		needsIOMux = true
+		uw.AppSocketUnit(ra.Name, binPath, "stdout")
+		iottymuxEnvFlags = append(iottymuxEnvFlags, "STAGE2_STDOUT=true")
+		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "fd"))
+		opts = append(opts, unit.NewUnitOption("Service", "Sockets", fmt.Sprintf("%s-%s.socket", ra.Name, "stdout")))
+	case "tty":
+		needsTTYMux = true
+		iottymuxEnvFlags = append(iottymuxEnvFlags, "STAGE2_STDOUT=true")
+		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "tty"))
+	case "interactive":
+		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "tty"))
+	case "null":
+		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "null"))
+	default:
+		// log mode
+		opts = append(opts, unit.NewUnitOption("Service", "StandardOutput", "journal+console"))
+	}
+
+	switch stderr {
+	case "stream":
+		needsIOMux = true
+		uw.AppSocketUnit(ra.Name, binPath, "stderr")
+		iottymuxEnvFlags = append(iottymuxEnvFlags, "STAGE2_STDERR=true")
+		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "fd"))
+		opts = append(opts, unit.NewUnitOption("Service", "Sockets", fmt.Sprintf("%s-%s.socket", ra.Name, "stderr")))
+	case "tty":
+		needsTTYMux = true
+		iottymuxEnvFlags = append(iottymuxEnvFlags, "STAGE2_STDERR=true")
+		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "tty"))
+	case "interactive":
+		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "tty"))
+	case "null":
+		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "null"))
+	default:
+		// log mode
+		opts = append(opts, unit.NewUnitOption("Service", "StandardError", "journal+console"))
+	}
+
+	// if at least one stream requires I/O muxing, an appropriate iottymux dependency needs to be setup
+	if needsIOMux || needsTTYMux {
+		// an env file is written here for iottymux, containing service configuration.
+		appIODir := IOMuxDir(p.Root, ra.Name)
+		os.MkdirAll(appIODir, 0644)
+		file, err := os.OpenFile(filepath.Join(appIODir, "env"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+		if err != nil {
+			uw.err = err
+			return nil
+		}
+		defer file.Close()
+
+		// env file specifies: debug verbosity, which streams to mux and whether a dedicated TTY is needed.
+		file.WriteString(fmt.Sprintf("STAGE2_TTY=%t\n", needsTTYMux))
+		file.WriteString(fmt.Sprintf("STAGE1_DEBUG=%t\n", p.Debug))
+		for _, l := range iottymuxEnvFlags {
+			file.WriteString(l + "\n")
+		}
+
+		if needsIOMux {
+			// streaming mode brings in a `iomux@.service` before-dependency
+			opts = append(opts, unit.NewUnitOption("Unit", "Requires", fmt.Sprintf("iomux@%s.service", ra.Name)))
+			opts = append(opts, unit.NewUnitOption("Unit", "Before", fmt.Sprintf("iomux@%s.service", ra.Name)))
+			logMode, ok := p.Manifest.Annotations.Get("coreos.com/rkt/experiment/logmode")
+			if ok {
+				file.WriteString(fmt.Sprintf("STAGE1_LOGMODE=%s\n", logMode))
+			}
+		} else if needsTTYMux {
+			// tty mode brings in a `ttymux@.service` after-dependency (it needs to create the TTY first)
+			opts = append(opts, unit.NewUnitOption("Service", "TTYPath", filepath.Join("/rkt/iottymux", ra.Name.String(), "stage2-pts")))
+			opts = append(opts, unit.NewUnitOption("Unit", "Requires", fmt.Sprintf("ttymux@%s.service", ra.Name)))
+			opts = append(opts, unit.NewUnitOption("Unit", "After", fmt.Sprintf("ttymux@%s.service", ra.Name)))
+		}
+	}
+	return opts
+}
+
 // UnitWriter is the type that writes systemd units preserving the first previously occured error.
 // Any method of this type can be invoked multiple times without error checking.
 // If a previous invocation generated an error, any invoked method will be skipped.
@@ -301,6 +439,7 @@ func (uw *UnitWriter) Error() error {
 	return uw.err
 }
 
+// AppUnit sets up the main systemd service unit for the application.
 func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*unit.UnitOption) {
 	if uw.err != nil {
 		return
@@ -334,6 +473,9 @@ func (uw *UnitWriter) AppUnit(ra *schema.RuntimeApp, binPath string, opts ...*un
 		unit.NewUnitOption("Service", "SyslogIdentifier", appName),
 	}...)
 
+	// Setup I/O for iottymux (stdin/stdout/stderr)
+	opts = append(opts, uw.SetupAppIO(uw.p, ra, binPath)...)
+
 	if supportsNotify(uw.p, ra.Name.String()) {
 		opts = append(opts, unit.NewUnitOption("Service", "Type", "notify"))
 	}
@@ -595,6 +737,28 @@ func (uw *UnitWriter) AppReaperUnit(appName types.ACName, binPath string, opts .
 	)
 }
 
+// AppSocketUnits writes a stream socket-unit for the given app in the given path.
+func (uw *UnitWriter) AppSocketUnit(appName types.ACName, binPath string, streamName string, opts ...*unit.UnitOption) {
+	opts = append(opts, []*unit.UnitOption{
+		unit.NewUnitOption("Unit", "Description", fmt.Sprintf("%s socket for %s", streamName, appName)),
+		unit.NewUnitOption("Unit", "DefaultDependencies", "no"),
+		unit.NewUnitOption("Unit", "StopWhenUnneeded", "yes"),
+		unit.NewUnitOption("Unit", "RefuseManualStart", "yes"),
+		unit.NewUnitOption("Unit", "RefuseManualStop", "yes"),
+		unit.NewUnitOption("Unit", "BindsTo", fmt.Sprintf("%s.service", appName)),
+		unit.NewUnitOption("Socket", "RemoveOnStop", "yes"),
+		unit.NewUnitOption("Socket", "Service", fmt.Sprintf("%s.service", appName)),
+		unit.NewUnitOption("Socket", "FileDescriptorName", streamName),
+		unit.NewUnitOption("Socket", "ListenFIFO", filepath.Join("/rkt/iottymux", appName.String(), "stage2-"+streamName)),
+	}...)
+
+	uw.WriteUnit(
+		TypedUnitPath(uw.p.Root, appName.String()+"-"+streamName, "socket"),
+		fmt.Sprintf("failed to write %s socket for %q service", streamName, appName),
+		opts...,
+	)
+}
+
 // appendOptionsList updates an existing unit options list appending
 // an array of new properties, one entry at a time.
 // This is the preferred method to avoid hitting line length limits
diff --git a/stage1/iottymux/iottymux.go b/stage1/iottymux/iottymux.go
new file mode 100644
index 0000000000..40704741ba
--- /dev/null
+++ b/stage1/iottymux/iottymux.go
@@ -0,0 +1,601 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//+build linux
+
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net"
+	"os"
+	"path/filepath"
+	"strconv"
+	"syscall"
+	"time"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/coreos/go-systemd/daemon"
+	rktlog "github.com/coreos/rkt/pkg/log"
+	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+	"github.com/kr/pty"
+)
+
+var (
+	log     *rktlog.Logger
+	diag    *rktlog.Logger
+	action  string
+	appName string
+	debug   bool
+)
+
+const (
+	// iottymux store several bits of information for a
+	// specific instance under /rkt/iottymux/<app>/
+	pathPrefix = "/rkt/iottymux"
+
+	// curren version of JSON API (for `list`)
+	apiVersion = 1
+)
+
+func init() {
+	// debug flag is not here, as it comes from env instead of CLI
+	flag.StringVar(&action, "action", "list", "Sub-action to perform")
+	flag.StringVar(&appName, "app", "", "Target application name")
+}
+
+// Endpoint represents a single attachable endpoint for an application
+type Endpoint struct {
+	// Name, freeform (eg. stdin, tty, etc.)
+	Name string `json:"name"`
+	// Domain, golang compatible (eg. tcp4, unix, etc.)
+	Domain string `json:"domain"`
+	// Address, golang compatible (eg. 127.0.0.1:3333, /tmp/file.sock, etc.)
+	Address string `json:"address"`
+}
+
+// Targets references all attachable endpoints, for status persistence
+type Targets struct {
+	Version int        `json:"version"`
+	Targets []Endpoint `json:"targets"`
+}
+
+// iottymux is a multi-action binary which can be used for:
+//  * creating and muxing a TTY for an application
+//  * proxying streams for an application (stdin/stdout/stderr) over TCP
+//  * listing available attachable endpoints for an application
+func main() {
+	var err error
+	// Parse flag and initialize logging
+	flag.Parse()
+	if os.Getenv("STAGE1_DEBUG") == "true" {
+		debug = true
+	}
+	stage1initcommon.InitDebug(debug)
+	log, diag, _ = rktlog.NewLogSet("iottymux", debug)
+	if !debug {
+		diag.SetOutput(ioutil.Discard)
+	}
+
+	// validate app name
+	_, err = types.NewACName(appName)
+	if err != nil {
+		log.Printf("invalid app name (%s): %v", appName, err)
+		os.Exit(254)
+	}
+
+	var r error
+	statusFile := filepath.Join(pathPrefix, appName, "endpoints")
+
+	// TODO(lucab): split this some more. Mux is part of pod service,
+	// while other actions are called from stage0. Those should be split.
+	switch action {
+	// attaching
+	case "auto-attach":
+		r = actionAttach(statusFile, true)
+	case "custom-attach":
+		r = actionAttach(statusFile, false)
+
+	// muxing and proxying
+	case "iomux":
+		r = actionIOMux(statusFile)
+	case "ttymux":
+		r = actionTTYMux(statusFile)
+
+	// listing
+	case "list":
+		r = actionPrint(statusFile, os.Stdout)
+
+	default:
+		r = fmt.Errorf("unknown action %q", action)
+	}
+
+	if r != nil && r != io.EOF {
+		log.FatalE("runtime failure", r)
+	}
+	os.Exit(0)
+}
+
+// actionAttach handles the attach action, either in "automatic" or "custom endpoints" mode.
+func actionAttach(statusPath string, autoMode bool) error {
+	var endpoints Targets
+	dialTimeout := 15 * time.Second
+
+	// retrieve available endpoints
+	statusFile, err := os.OpenFile(statusPath, os.O_RDONLY, os.ModePerm)
+	if err != nil {
+		return err
+	}
+	err = json.NewDecoder(statusFile).Decode(&endpoints)
+	_ = statusFile.Close()
+	if err != nil {
+		return err
+	}
+
+	// retrieve custom attaching modes
+	customTargets := struct {
+		ttyIn  bool
+		ttyOut bool
+		stdin  bool
+		stdout bool
+		stderr bool
+	}{}
+	if !autoMode {
+		customTargets.ttyIn, _ = strconv.ParseBool(os.Getenv("STAGE2_ATTACH_TTYIN"))
+		customTargets.ttyOut, _ = strconv.ParseBool(os.Getenv("STAGE2_ATTACH_TTYOUT"))
+		customTargets.stdin, _ = strconv.ParseBool(os.Getenv("STAGE2_ATTACH_STDIN"))
+		customTargets.stdout, _ = strconv.ParseBool(os.Getenv("STAGE2_ATTACH_STDOUT"))
+		customTargets.stderr, _ = strconv.ParseBool(os.Getenv("STAGE2_ATTACH_STDERR"))
+	}
+
+	// Proxy I/O between this process and the iottymux service:
+	//  - input (stdin, tty-in) copying routines can only be canceled by process killing (ie. user detaching)
+	//  - output (stdout, stderr, tty-out) copying routines are canceled by errors when reading from remote service
+	c := make(chan error)
+	copyOut := func(w io.Writer, conn net.Conn) {
+		_, err := io.Copy(w, conn)
+		c <- err
+	}
+
+	for _, ep := range endpoints.Targets {
+		d := net.Dialer{Timeout: dialTimeout}
+		conn, err := d.Dial(ep.Domain, ep.Address)
+		if err != nil {
+			return err
+		}
+		defer conn.Close()
+		switch ep.Name {
+		case "stdin":
+			if autoMode || customTargets.stdin {
+				go io.Copy(conn, os.Stdin)
+			}
+		case "stdout":
+			if autoMode || customTargets.stdout {
+				go copyOut(os.Stdout, conn)
+			}
+		case "stderr":
+			if autoMode || customTargets.stderr {
+				go copyOut(os.Stderr, conn)
+			}
+		case "tty":
+			if autoMode || customTargets.ttyIn {
+				go io.Copy(conn, os.Stdin)
+			}
+
+			if autoMode || customTargets.ttyOut {
+				go copyOut(os.Stdout, conn)
+			} else {
+				go copyOut(ioutil.Discard, conn)
+			}
+		}
+	}
+
+	// as soon as one output copying routine fails, this unblocks and the whole process exits
+	return <-c
+}
+
+// actionPrint prints out available endpoints by unmarshalling the Targets struct
+// from JSON at the given path. This is used by external tools to see which attaching
+// modes are available for an application (eg. `rkt attach --mode=list`)
+func actionPrint(path string, out io.Writer) error {
+	var endpoints Targets
+	statusFile, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm)
+	if err != nil {
+		return err
+	}
+
+	err = json.NewDecoder(statusFile).Decode(&endpoints)
+	_ = statusFile.Close()
+	if err != nil {
+		return err
+	}
+
+	// TODO(lucab): move to encoder.SetIndent (golang >= 1.7)
+	status, err := json.MarshalIndent(endpoints, "", "    ")
+	if err != nil {
+		return nil
+	}
+	_, err = out.Write(status)
+	return err
+}
+
+// actionTTYMux handles TTY muxing and proxying.
+// It creates a PTY pair and bind-mounts the slave to `/rkt/iottymux/<app>/stage2-pts`.
+// Once ready, it sd-notifies as READY so that the main application can be started.
+func actionTTYMux(statusFile string) error {
+	// Open a new TTY pair (master/slave)
+	ptm, pts, err := pty.Open()
+	if err != nil {
+		return err
+	}
+	ttySlavePath := pts.Name()
+	_ = pts.Close()
+	defer ptm.Close()
+	diag.Printf("TTY created, slave pty at %q\n", ttySlavePath)
+
+	// TODO(lucab): set a sane TTY mode here (echo, controls and such).
+
+	// Slave TTY has a dynamic name (eg. /dev/pts/<n>) but a predictable name
+	// is needed, in order to be used as `TTYPath=` value in application unit.
+	// A bind mount is put in place for that, here.
+	ttypath := filepath.Join(pathPrefix, appName, "stage2-pts")
+	f, err := os.Create(ttypath)
+	if err != nil {
+		return err
+	}
+	err = syscall.Mount(pts.Name(), ttypath, "", syscall.MS_BIND, "")
+	if err != nil {
+		return err
+	}
+	// TODO(lucab): double-check this is fine here (alternatives: app-stop or app-rm)
+	defer syscall.Unmount(ttypath, 0)
+	defer f.Close()
+
+	// TODO(lucab): investigate sending fd to systemd-manager to ensure we never close
+	// the PTY master fd. Open questions: dupfd and ownership.
+
+	// signal to systemd that the PTY is ready and application can start.
+	// sd-notify is required here, so a non-delivered status is an hard failure.
+	ok, err := daemon.SdNotify(true, "READY=1")
+	if !ok {
+		return fmt.Errorf("failure during startup notification: %v", err)
+	}
+	diag.Print("TTY handler ready\n")
+
+	// Open sockets
+	ep := Endpoint{
+		Name:    "tty",
+		Domain:  "unix",
+		Address: filepath.Join(pathPrefix, appName, "sock-tty"),
+	}
+	endpoints := Targets{apiVersion, []Endpoint{ep}}
+	listener, err := net.Listen(ep.Domain, ep.Address)
+	if err != nil {
+		return fmt.Errorf("unable to open tty listener: %s", err)
+	}
+	defer listener.Close()
+	diag.Printf("Listening for TTY on %s\n", ep.Address)
+
+	// write available endpoints to status file
+	sf, err := os.OpenFile(statusFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.ModePerm)
+	if err != nil {
+		return err
+	}
+	err = json.NewEncoder(sf).Encode(endpoints)
+	_ = sf.Close()
+	if err != nil {
+		return err
+	}
+
+	// Proxy between TTY and remote clients.
+	c := make(chan error)
+	clients := make(chan net.Conn)
+	go acceptConn(listener, clients, "tty")
+	go proxyIO(clients, ptm, c)
+
+	// If nothing else fails, ttymux service will be waiting here forever
+	// and be terminated by systemd only when the main application exits.
+	return <-c
+}
+
+// actionIOMux handles I/O streams muxing and proxying (stdin/stdout/stderr)
+func actionIOMux(statusFile string) error {
+	// Slice containing mapping for "fdnum -> stream -> fifo -> socket":
+	//  0 -> stdin  -> /rkt/iottymux/<app>/stage2-stdin  -> /rkt/iottymux/<app>/sock-stdin
+	//  1 -> stdout -> /rkt/iottymux/<app>/stage2-stdout -> /rkt/iottymux/<app>/sock-stdout
+	//  2 -> stderr -> /rkt/iottymux/<app>/stage2-stderr -> /rkt/iottymux/<app>/sock-stderr
+	streams := [3]struct {
+		listener net.Listener
+		fifo     *os.File
+	}{}
+
+	// open FIFOs and create sockets
+	streamsSetup := [3]struct {
+		streamName    string
+		isEnabled     bool
+		fifoPath      string
+		fifoOpenFlags int
+		socketDomain  string
+		socketAddress string
+	}{
+		{
+			"stdin",
+			false,
+			filepath.Join(pathPrefix, appName, "stage2-stdin"),
+			os.O_WRONLY,
+			"unix",
+			filepath.Join(pathPrefix, appName, "sock-stdin"),
+		},
+		{
+			"stdout",
+			false,
+			filepath.Join(pathPrefix, appName, "stage2-stdout"),
+			os.O_RDONLY,
+			"unix",
+			filepath.Join(pathPrefix, appName, "sock-stdout"),
+		},
+		{
+			"stderr",
+			false,
+			filepath.Join(pathPrefix, appName, "stage2-stderr"),
+			os.O_RDONLY,
+			"unix",
+			filepath.Join(pathPrefix, appName, "sock-stderr"),
+		},
+	}
+	for i, f := range [3]string{"STAGE2_STDIN", "STAGE2_STDOUT", "STAGE2_STDERR"} {
+		streamsSetup[i].isEnabled, _ = strconv.ParseBool(os.Getenv(f))
+	}
+
+	var endpoints Targets
+	endpoints.Version = 1
+	for i, entry := range streamsSetup {
+		if streamsSetup[i].isEnabled {
+			var err error
+			ep := Endpoint{
+				Name:    entry.streamName,
+				Domain:  entry.socketDomain,
+				Address: entry.socketAddress,
+			}
+			streams[i].fifo, err = os.OpenFile(entry.fifoPath, entry.fifoOpenFlags, os.ModeNamedPipe)
+			if err != nil {
+				return fmt.Errorf("invalid %s FIFO: %s", entry.streamName, err)
+			}
+			defer streams[i].fifo.Close()
+			streams[i].listener, err = net.Listen(ep.Domain, ep.Address)
+			if err != nil {
+				return fmt.Errorf("unable to open %s listener: %s", entry.streamName, err)
+			}
+			defer streams[i].listener.Close()
+			endpoints.Targets = append(endpoints.Targets, ep)
+			diag.Printf("Listening for %s on %s\n", entry.streamName, ep.Address)
+		}
+	}
+
+	// write available endpoints to status file
+	sf, err := os.OpenFile(statusFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.ModePerm)
+	if err != nil {
+		return err
+	}
+	err = json.NewEncoder(sf).Encode(endpoints)
+	_ = sf.Close()
+	if err != nil {
+		return err
+	}
+
+	c := make(chan error)
+
+	// TODO(lucab): finalize custom logging modes
+	logMode := os.Getenv("STAGE1_LOGMODE")
+	var logFile *os.File
+	switch logMode {
+	case "k8s-plain":
+		var err error
+		// TODO(lucab): check what should be the target path with Euan
+		logTarget := filepath.Join(pathPrefix, appName, "logfile")
+		logFile, err = os.OpenFile(logTarget, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.ModePerm)
+		if err != nil {
+			return err
+		}
+		defer logFile.Close()
+	}
+
+	// proxy stdin
+	if streams[0].fifo != nil && streams[0].listener != nil {
+		clients := make(chan net.Conn)
+		go acceptConn(streams[0].listener, clients, "stdin")
+		go muxInput(clients, streams[0].fifo)
+	}
+
+	// proxy stdout
+	if streams[1].fifo != nil && streams[1].listener != nil {
+		localTargets := make(chan io.WriteCloser)
+		clients := make(chan net.Conn)
+		lines := make(chan []byte)
+		go bufferLine(streams[1].fifo, lines, c)
+		go acceptConn(streams[1].listener, clients, "stdout")
+		go muxOutput("stdout", lines, clients, localTargets)
+		if logFile != nil {
+			localTargets <- logFile
+		}
+	}
+
+	// proxy stderr
+	if streams[2].fifo != nil && streams[2].listener != nil {
+		localTargets := make(chan io.WriteCloser)
+		clients := make(chan net.Conn)
+		lines := make(chan []byte)
+		go bufferLine(streams[2].fifo, lines, c)
+		go acceptConn(streams[2].listener, clients, "stderr")
+		go muxOutput("stderr", lines, clients, localTargets)
+		if logFile != nil {
+			localTargets <- logFile
+		}
+	}
+
+	// If nothing else fails, iomux service will be waiting here forever
+	// and be terminated by systemd only when the main application exits.
+	return <-c
+}
+
+// bufferLine buffers and queues a single line from a Reader to a multiplexer
+// If reading from src fails, it hard-fails and propagates the error back.
+func bufferLine(src io.Reader, c chan<- []byte, ec chan<- error) {
+	rd := bufio.NewReader(src)
+	for {
+		lineOut, err := rd.ReadBytes('\n')
+		if len(lineOut) > 0 {
+			c <- lineOut
+		}
+		if err != nil {
+			ec <- err
+		}
+	}
+}
+
+// acceptConn accepts a single client and queues it for further proxying
+// It is never canceled explicitly, as it is bound to the lifetime of the main process.
+func acceptConn(socket net.Listener, c chan<- net.Conn, stream string) {
+	for {
+		conn, err := socket.Accept()
+		if err == nil {
+			diag.Printf("Accepted new connection for %s\n", stream)
+			c <- conn
+		}
+	}
+}
+
+// proxyIO performs bi-directional byte-by-byte forwarding
+// TODO(lucab): this may become line-buffered and muxed to logs
+// TODO(lucab): reset terminal state on new attach
+func proxyIO(clients <-chan net.Conn, tty *os.File, ttyFailure chan<- error) {
+	ec := make(chan error)
+
+	// ttyToRemote copies output from application TTY to remote client.
+	// If copier reaches TTY EOF, it hard-fails and propagates the error up.
+	ttyToRemote := func(dst net.Conn, src *os.File) {
+		_, err := io.Copy(dst, src)
+		if err == nil {
+			dst.Close()
+			ec <- io.EOF
+		}
+	}
+
+	// remoteToTTY copies input from remote client to application TTY.
+	// When copying stops/fails, it recovers and just closes this connection.
+	remoteToTTY := func(dst *os.File, src net.Conn) {
+		io.Copy(dst, src)
+		src.Close()
+	}
+
+	for {
+		select {
+		// a new remote client
+		case cl := <-clients:
+			go ttyToRemote(cl, tty)
+			go remoteToTTY(tty, cl)
+
+		// a TTY failure from one of the copier
+		case tf := <-ec:
+			ttyFailure <- tf
+			return
+		}
+	}
+}
+
+// muxInput accepts remote clients and multiplex input line from them
+func muxInput(clients <-chan net.Conn, stdin *os.File) {
+	for {
+		select {
+		case c := <-clients:
+			go bufferInput(c, stdin)
+		}
+	}
+}
+
+// bufferInput buffers and write a single line from a remote client to the local app
+func bufferInput(conn net.Conn, stdin *os.File) {
+	rd := bufio.NewReader(conn)
+	defer conn.Close()
+	for {
+		lineIn, err := rd.ReadBytes('\n')
+		if len(lineIn) == 0 && err != nil {
+			return
+		}
+		_, err = stdin.Write(lineIn)
+		if err != nil {
+			return
+		}
+	}
+}
+
+// muxOutput receives remote clients and local log targets,
+// multiplexing output lines to them
+func muxOutput(streamLabel string, lines chan []byte, clients <-chan net.Conn, targets <-chan io.WriteCloser) {
+	var logs []io.WriteCloser
+	var conns []io.WriteCloser
+
+	writeAndFilter := func(wc io.WriteCloser, line []byte) bool {
+		_, err := wc.Write(line)
+		if err != nil {
+			wc.Close()
+		}
+		return err != nil
+	}
+
+	logsWriteAndFilter := func(wc io.WriteCloser, line []byte) bool {
+		out := []byte(fmt.Sprintf("%s %s %s", time.Now().Format(time.RFC3339Nano), streamLabel, line))
+		return writeAndFilter(wc, out)
+	}
+
+	for {
+		select {
+		// an incoming output line to multiplex
+		// TODO(lucab): ordered non-blocking writes
+		case l := <-lines:
+			conns = filterTargets(conns, l, writeAndFilter)
+			logs = filterTargets(logs, l, logsWriteAndFilter)
+
+		// a new remote client
+		case c := <-clients:
+			conns = append(conns, c)
+
+		// a new local log target
+		case t := <-targets:
+			logs = append(logs, t)
+		}
+	}
+}
+
+// filterTargets passes line to each writer in wcs,
+// filtering out single writers if filter returns true.
+func filterTargets(
+	wcs []io.WriteCloser,
+	line []byte,
+	filter func(io.WriteCloser, []byte) bool,
+) []io.WriteCloser {
+	var filteredTargets []io.WriteCloser
+
+	for _, c := range wcs {
+		if !filter(c, line) {
+			filteredTargets = append(filteredTargets, c)
+		}
+	}
+	return filteredTargets
+}
diff --git a/stage1/iottymux/iottymux.mk b/stage1/iottymux/iottymux.mk
new file mode 100644
index 0000000000..b96c5ea77b
--- /dev/null
+++ b/stage1/iottymux/iottymux.mk
@@ -0,0 +1 @@
+include stage1/makelib/aci_simple_go_bin.mk
diff --git a/stage1/secondary-stuff.mk b/stage1/secondary-stuff.mk
index 2bec9a0f3b..cc3f5b4bbb 100644
--- a/stage1/secondary-stuff.mk
+++ b/stage1/secondary-stuff.mk
@@ -6,6 +6,8 @@ _S1_SS_SUBDIRS_ := \
 	diagnostic \
 	gc \
 	init \
+	attach \
+	iottymux \
 	net \
 	net-plugins \
 	prepare-app \
diff --git a/stage1/units/units/iomux@.service b/stage1/units/units/iomux@.service
new file mode 100644
index 0000000000..d85e987305
--- /dev/null
+++ b/stage1/units/units/iomux@.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Streaming I/O handler for %i
+DefaultDependencies=false
+OnFailureJobMode=fail
+BindsTo=%i.service
+
+[Service]
+Type=simple
+Restart=no
+EnvironmentFile=/rkt/iottymux/%i/env
+ExecStart=/iottymux --action=iomux --app=%i
+User=0
+Group=0
+SyslogIdentifier=%i
+StandardOutput=journal+console
+StandardError=journal+console
\ No newline at end of file
diff --git a/stage1/units/units/ttymux@.service b/stage1/units/units/ttymux@.service
new file mode 100644
index 0000000000..1eb04fe22d
--- /dev/null
+++ b/stage1/units/units/ttymux@.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=TTY handler for %i
+DefaultDependencies=false
+OnFailureJobMode=fail
+BindsTo=%i.service
+
+[Service]
+Type=notify
+Restart=no
+EnvironmentFile=/rkt/iottymux/%i/env
+ExecStart=/iottymux --action=ttymux --app=%i
+User=0
+Group=0
+SyslogIdentifier=%i
+StandardOutput=journal+console
+StandardError=journal+console
\ No newline at end of file

From e0b95f9fb41bb964edf070037c739d6903871347 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 5 Dec 2016 12:30:10 +0000
Subject: [PATCH 1041/1304] tests: add a rkt-attach smoke test

---
 tests/rkt_attach_test.go | 144 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 tests/rkt_attach_test.go

diff --git a/tests/rkt_attach_test.go b/tests/rkt_attach_test.go
new file mode 100644
index 0000000000..fbf265754f
--- /dev/null
+++ b/tests/rkt_attach_test.go
@@ -0,0 +1,144 @@
+// Copyright 2016 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !fly,!kvm
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/coreos/gexpect"
+	"github.com/coreos/rkt/tests/testutils"
+)
+
+// TestAttachSmoke is a smoke test for rkt-attach. It exercises several
+// features: tty/streams mux, auto-attach, interactive I/O, sandbox support.
+func TestAttachSmoke(t *testing.T) {
+	actionTimeout := 30 * time.Second
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	imageName := "coreos.com/rkt-inspect/test-attach"
+	appName := "test-attach"
+	aciPatchArgs := []string{"--name=" + imageName, "--exec=/inspect --read-stdin --check-tty"}
+	aciFileName := patchTestACI("rkt-inspect-attach-tty.aci", aciPatchArgs...)
+	combinedOutput(t, ctx.ExecCmd("fetch", "--insecure-options=image", aciFileName))
+	defer os.Remove(aciFileName)
+
+	var tests = []struct {
+		testName   string
+		rktRunArgs []string
+		expect     string
+		sandbox    bool
+	}{
+		{
+			`Check tty with terminal (positive test) - immutable pod`,
+			[]string{`--stdin=tty`, `--stdout=tty`, `--stderr=tty`},
+			`stdin is a terminal`,
+			false,
+		},
+		{
+			`Check tty without terminal (negative test) - immutable pod`,
+			[]string{`--stdin=stream`, `--stdout=stream`, `--stderr=stream`},
+			`stdin is not a terminal`,
+			false,
+		},
+		{
+			`Check tty with terminal (positive test) - sandbox`,
+			[]string{`--stdin=tty`, `--stdout=tty`, `--stderr=tty`},
+			`stdin is a terminal`,
+			true,
+		},
+		{
+			`Check tty without terminal (negative test) - sandbox`,
+			[]string{`--stdin=stream`, `--stdout=stream`, `--stderr=stream`},
+			`stdin is not a terminal`,
+			true,
+		},
+	}
+
+	for i, tt := range tests {
+		t.Logf("Running test #%v: %v", i, tt.testName)
+
+		tmpDir := mustTempDir("rkt-test-attach-")
+		uuidFile := filepath.Join(tmpDir, "uuid")
+		defer os.RemoveAll(tmpDir)
+
+		err := os.Setenv("RKT_EXPERIMENT_ATTACH", "true")
+		if err != nil {
+			panic(err)
+		}
+		defer os.Unsetenv("RKT_EXPERIMENT_ATTACH")
+
+		var uuid string
+		var podProc *gexpect.ExpectSubprocess
+		if tt.sandbox {
+			err := os.Setenv("RKT_EXPERIMENT_APP", "true")
+			if err != nil {
+				panic(err)
+			}
+			defer os.Unsetenv("RKT_EXPERIMENT_APP")
+
+			rkt := ctx.Cmd() + " app sandbox --uuid-file-save=" + uuidFile
+			podProc = spawnOrFail(t, rkt)
+
+			// wait for the sandbox to start
+			uuid, err = waitPodReady(ctx, t, uuidFile, 30*time.Second)
+			if err != nil {
+				t.Fatal(err)
+			}
+			addArgs := []string{"app", "add", "--debug", uuid, imageName, "--name=" + appName}
+			combinedOutput(t, ctx.ExecCmd(append(addArgs, tt.rktRunArgs...)...))
+			combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", uuid, "--app="+appName))
+		} else {
+			// app starts and blocks, waiting for input
+			rktRunCmd := fmt.Sprintf("%s --insecure-options=image run --uuid-file-save=%s %s %s", ctx.Cmd(), uuidFile, aciFileName, strings.Join(tt.rktRunArgs, " "))
+			podProc = spawnOrFail(t, rktRunCmd)
+			uuid, err = waitPodReady(ctx, t, uuidFile, actionTimeout)
+			if err != nil {
+				t.Fatal(err)
+			}
+		}
+
+		// attach and unblock app by sending some input
+		rktAttachCmd := fmt.Sprintf("%s attach %s", ctx.Cmd(), uuid)
+		attachProc := spawnOrFail(t, rktAttachCmd)
+		input := "some_input"
+		if err := attachProc.SendLine(input); err != nil {
+			t.Fatalf("Failed to send %q on the prompt #%v: %v", input, i, err)
+		}
+		feedback := fmt.Sprintf("Received text: %s", input)
+		if err := expectTimeoutWithOutput(attachProc, feedback, actionTimeout); err != nil {
+			t.Fatalf("Waited for the prompt but not found #%v: %v", i, err)
+		}
+
+		// check test result
+		if err := expectTimeoutWithOutput(attachProc, tt.expect, actionTimeout); err != nil {
+			t.Fatalf("Expected %q but not found #%v: %v", tt.expect, i, err)
+		}
+		if err := attachProc.Close(); err != nil {
+			t.Fatalf("Detach #%v failed: %v", i, err)
+		}
+
+		combinedOutput(t, ctx.ExecCmd("stop", uuid))
+
+		waitOrFail(t, podProc, 0)
+	}
+}

From 0223674c9314ec3a23eabb792feca1ee6810a58c Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 5 Dec 2016 14:40:09 +0000
Subject: [PATCH 1042/1304] docs: add user doc for rkt-attach

---
 Documentation/subcommands/attach.md | 92 +++++++++++++++++++++++++++++
 Documentation/subcommands/run.md    |  8 +++
 2 files changed, 100 insertions(+)
 create mode 100644 Documentation/subcommands/attach.md

diff --git a/Documentation/subcommands/attach.md b/Documentation/subcommands/attach.md
new file mode 100644
index 0000000000..fce5d8f3a9
--- /dev/null
+++ b/Documentation/subcommands/attach.md
@@ -0,0 +1,92 @@
+# rkt attach
+
+Applications can be started in interactive mode and later attached via `rkt attach`.
+
+In order for an application to be attachable:
+ * it must be started in interactive mode
+ * it must be running as part of a running pod
+ * it must support the corresponding attach mode
+
+To start an application in interactive mode, either `tty` or `stream` must be passed as value for the `--stdin`, `--stdout` and `--stderr` options.
+
+An application can be run with a dedicated terminal and later attached to:
+
+```
+# rkt run quay.io/coreos/alpine-sh --stdin tty --stdout tty --stderr tty
+```
+
+```
+# rkt attach --mode tty ${UUID}
+
+/ # hostname
+rkt-911afe8e-992f-4089-8666-4a4c957a1964
+
+/ # tty     
+/rkt/iottymux/alpine-sh/pts
+^C
+```
+
+In a similar way, an application can be run without a tty but with separated attachable streams:
+
+```
+# rkt run quay.io/coreos/alpine-sh --stdin stream --stdout stream --stderr stream
+```
+
+```
+# rkt attach --mode stdin,stdout,stderr ${UUID}
+hostname
+rkt-846c35db-6728-471a-ad50-66d3a8d7ff9c
+
+tty
+not a tty
+^C
+```
+
+If a pod contains multiple applications, the one to be used as attach target can be specified via `--app`.
+
+The following options are allowed as `--mode` values:
+ * `list`: list available endpoints, and return early without attaching
+ * `auto`: attach to all available endpoints
+ * `tty`: bi-directionally attach to the application terminal
+ * `tty-in` or `tty-out`: uni-directionally attach to the application terminal
+ * `stdin,stdout,stderr`: attach to specific application streams. Omitted streams will no be attached
+
+A more complex example, showing the usage of advanced options and piping:
+
+```
+# rkt run quay.io/coreos/alpine-sh --stdin stream --stdout stream --stderr stream
+```
+
+```
+# rkt attach --app alpine-sh --mode list 846c35db
+stdin
+stdout
+stderr
+
+# echo 'hostname; fakecmd' | ./rkt attach --app alpine-sh --mode auto ${UUID}
+rkt-846c35db-6728-471a-ad50-66d3a8d7ff9c
+/bin/sh: fakecmd: not found
+^C
+
+# echo 'hostname; fakecmd' | ./rkt attach --app alpine-sh --mode stdin,stdout ${UUID}
+rkt-846c35db-6728-471a-ad50-66d3a8d7ff9c
+^C
+
+# echo 'hostname; fakecmd' | ./rkt attach --app alpine-sh --mode stdin,stderr ${UUID}
+/bin/sh: fakecmd: not found
+^C
+```
+
+## Options
+
+| Flag | Default | Options | Description |
+| ---  | ---     | ---     | ---         |
+| `--app`  |  ``     | Name of an application            | Name of the app to attach to within the specified pod |
+| `--mode` |  `auto` | "list", "auto" or tty/stream mode | Attaching mode                                        |
+
+## Global options
+
+See the table with [global options in general commands documentation][global-options].
+
+
+[global-options]: ../commands.md#global-options
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 77db2dc0e4..c6984d0dde 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -423,6 +423,14 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--uuid-file-save` | none | A file path | Write out the pod UUID to a file. |
 | `--volume` | none | Volume syntax (e.g. `--volume NAME,kind=KIND,source=PATH,readOnly=BOOL`) | Volumes to make available in the pod. See [Mount Volumes into a Pod](#mount-volumes-into-a-pod). |
 
+## Per-application options
+
+| Flag | Default | Options | Description |
+| ---  | ---     | ---     | ---         |
+| `--stdin`  | "null" | "null", "tty", "stream"        | Mode for this application stdin.  |
+| `--stdout` | "log"  | "null", "tty", "stream", "log" | Mode for this application stdout. |
+| `--stderr` | "log"  | "null", "tty", "stream", "log" | Mode for this application stderr. |
+
 ## Global options
 
 See the table with [global options in general commands documentation][global-options].

From c0ad6870605982e7fb6759d73b3d725a5d731725 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 28 Nov 2016 17:19:50 +0000
Subject: [PATCH 1043/1304] docs/devel: add logging and attaching design doc

---
 Documentation/devel/architecture.md      |  18 ++
 Documentation/devel/log-attach-design.md | 354 +++++++++++++++++++++++
 2 files changed, 372 insertions(+)
 create mode 100644 Documentation/devel/log-attach-design.md

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index 97f77a8d6d..c97559e82e 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -244,7 +244,25 @@ Additionally, since appc dependencies can be found only via discovery, a depende
 
 Given this 1:N relation between an ACI and their rendered images, the ACIStore and TreeStore are decoupled.
 
+
+## Logging and attaching
+
+Applications running inside a rkt pod can produce output on stdout/stderr, which can be redirected at runtime. Optionally, they can receive input on stdin from an external component that can be attached/detached during execution.
+
+The internal architecture for attaching (TTY and single streams) and logging is described in full details in the [Logging and attaching design document][attach-design].
+
+For each application, rkt support separately configuring stdin/stdout/stderr via runtime command-line flags. The following modes are available:
+ * interactive: application will be run under the TTY of the parent process. A single application is allowed in the pod, which is tied to the lifetime of the parent terminal and cannot be later re-attached.
+ * TTY: selected I/O streams will be run under a newly allocated TTY, which can be later used for external attaching.
+ * streaming: selected I/O streams will be supervised by a separate multiplexing process (running in the pod context). They can be later externally attached.
+ * logging: selected output streams will be supervised by a separate logging process (running in the pod context). Output entries will be handled as log entries, and the application cannot be later re-attached.
+ * null: selected I/O streams will be closed. Application will not received the file-descriptor for the corresponding stream, and it cannot be later re-attached.
+
+From a UI perspective, main consumers of the logging and attaching subsystem are the `rkt attach` subcommand and the `--stdin`, `--stdout`, `--stderr` runtime options.
+
+
 [acirenderer]: https://github.com/appc/spec/tree/master/pkg/acirenderer
+[attach-design]: ./log-attach-design.md
 [appc-spec]: https://github.com/appc/spec
 [appc-dependencies]: https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
 [appc-discovery]: https://github.com/appc/spec/blob/master/spec/discovery.md
diff --git a/Documentation/devel/log-attach-design.md b/Documentation/devel/log-attach-design.md
new file mode 100644
index 0000000000..e751f742c6
--- /dev/null
+++ b/Documentation/devel/log-attach-design.md
@@ -0,0 +1,354 @@
+# Logging and attaching design
+
+## Overview
+
+rkt can run multiple applications in a pod, under a supervising process and alongside with a sidecar service which takes care of multiplexing its I/O toward the outside world.
+
+Historically this has been done via systemd-journald only, meaning that all logging was handled via journald and interactive applications had to re-use a parent TTY.
+
+Starting from systemd v232, it is possible to connect a service streams to arbitrary socket units and let custom sidecar multiplex all the I/O.
+
+This document describes the architectural design for the current logging and attaching subsystem, which allows custom logging and attaching logic.
+
+## Runtime modes
+
+In order to be able to attach or apply custom logging logic to applications, an appropriate runtime mode must be specified when adding/preparing an application inside a pod.
+
+This is done via stage0 CLI arguments (`--stdin`, `--stdout`, and `--stder`) which translate into per-application stage2 annotations.
+
+### Interactive mode
+
+This mode results in the application having the corresponding stream attached to the parent terminal.
+
+For historical reasons and backward compatibility, this is a special mode activated via `--interactive` and only supports single-app pods.
+
+Interactive mode does not support attaching and ties the runtime to the lifetime of the parent terminal.
+
+Internally, this translates to an annotation at the app level:
+
+```
+{
+    "name": "coreos.com/rkt/stage2/stdin",
+    "value": "interactive"
+},
+{
+    "name": "coreos.com/rkt/stage2/stdout",
+    "value": "interactive"
+},
+{
+    "name": "coreos.com/rkt/stage2/stderr",
+    "value": "interactive"
+}
+```
+
+In this case, the corresponding service unit file gains the following properties:
+
+```
+[Service]
+StandardInput=tty
+StandardOutput=tty
+StandardError=tty
+...
+```
+
+No further sidecar dependencies are introduced in this case.
+
+### TTY mode
+
+This mode results in the application having the corresponding stream attached to a dedicated pseudo-terminal.
+
+This is different from the "interactive" mode because:
+ * it allocates a new pseudo-terminal accounted towards pod resources
+ * it supports external attaching/detaching
+ * it supports multiple applications running inside a single pod
+ * it does not tie the pod lifetime to the parent terminal one
+
+Internally, this translates to an annotation at the app level:
+
+```
+{
+    "name": "coreos.com/rkt/stage2/stdin",
+    "value": "tty"
+},
+{
+    "name": "coreos.com/rkt/stage2/stdout",
+    "value": "tty"
+},
+{
+    "name": "coreos.com/rkt/stage2/stderr",
+    "value": "tty"
+}
+```
+
+In this case, the corresponding service unit file gains the following properties:
+
+```
+[Service]
+TTYPath=/rkt/iomux/<appname>/stage2-pts
+StandardInput=tty
+StandardOutput=tty
+StandardError=tty
+...
+```
+
+A sidecar dependency to `ttymux@.service` is introduced in this case. Application has a `Wants=` and `After=` relationship to it.
+
+### Streaming mode
+
+This mode results in the application having each of the corresponding streams separately handled by a muxing service.
+
+This is different from the "interactive" and "tty" modes because:
+ * it does not allocate any terminal for the application
+ * single streams can be separately handled
+ * it supports multiple applications running inside a single pod
+
+
+Internally, this translates to an annotation at the app level:
+
+```
+{
+    "name": "coreos.com/rkt/stage2/stdin",
+    "value": "stream"
+},
+{
+    "name": "coreos.com/rkt/stage2/stdout",
+    "value": "stream"
+},
+{
+    "name": "coreos.com/rkt/stage2/stderr",
+    "value": "stream"
+}
+```
+
+In this case, the corresponding service unit file gains the following properties:
+
+```
+[Service]
+StandardInput=fd
+Sockets=<appname>-stdin.socket
+StandardOutput=fd
+Sockets=<appname>-stdout.socket
+StandardError=fd
+Sockets=<appname>-stderr.socket
+...
+```
+
+A sidecar dependency to `iomux@.service` is introduced in this case. Application has a `Wants=` and `Before=` relationship to it.
+
+Additional per-stream socket units are generated, as follows:
+
+```
+[Unit]
+Description=<stream> socket for <appname>
+DefaultDependencies=no
+StopWhenUnneeded=yes
+RefuseManualStart=yes
+RefuseManualStop=yes
+BindsTo=<appname>.service
+
+[Socket]
+RemoveOnStop=yes
+Service=<appname>.service
+FileDescriptorName=<stream>
+ListenFIFO=/rkt/iottymux/<appname>/stage2-<stream>
+```
+
+### Logging mode
+
+This mode results in the application having the corresponding stream attached to systemd-journald.
+
+This is the default mode for stdout/stderr, for historical reasons and backward compatibility.
+
+Internally, this translates to an annotation at the app level:
+
+```
+{
+    "name": "coreos.com/rkt/stage2/stdout",
+    "value": "log"
+},
+{
+    "name": "coreos.com/rkt/stage2/stderr",
+    "value": "log"
+}
+```
+
+In this case, the corresponding service unit file gains the following properties:
+
+```
+[Service]
+StandardOutput=journal
+StandardError=journal
+...
+```
+
+A sidecar dependency to `systemd-journald.service` is introduced in this case. Application has a `Wants=` and `After=` relationship to it.
+
+Logging is not a valid mode for stdin.
+
+### Null mode
+
+This mode results in the application having the corresponding stream closed.
+
+This is the default mode for stdin, for historical reasons and backward compatibility.
+
+Internally, this translates to an annotation at the app level:
+
+```
+{
+    "name": "coreos.com/rkt/stage2/stdin",
+    "value": "null"
+},
+{
+    "name": "coreos.com/rkt/stage2/stdout",
+    "value": "null"
+},
+{
+    "name": "coreos.com/rkt/stage2/stderr",
+    "value": "null"
+}
+```
+
+In this case, the corresponding service unit file gains the following properties:
+
+```
+[Service]
+StandardInput=null
+StandardOutput=null
+StandardError=null
+[...]
+```
+
+No further sidecar dependencies are introduced in this case.
+
+## Annotations
+
+The following per-app annotations are defined for internal use, with the corresponding set of allowed values:
+
+ * `coreos.com/rkt/stage2/stdin`
+   - `interactive`
+   - `null`
+   - `stream`
+   - `tty`
+ * `coreos.com/rkt/stage2/stdout`
+   - `interactive`
+   - `log`
+   - `null`
+   - `stream`
+   - `tty`
+ * `coreos.com/rkt/stage2/stderr`
+   - `interactive`
+   - `log`
+   - `null`
+   - `stream`
+   - `tty`
+
+
+## Stage1 internals
+
+All the logging and attaching logic is handled by the stage1 `iottymux` binary.
+
+Each main application may additionally have a dedicated sidecar for I/O multiplexing, which proxies I/O to external clients over sockets.
+
+Sidecar state is persisted at `/rkt/iottymux/<appname>` while the main application is running.
+
+
+## Attaching
+
+`rkt attach` can auto-discover endpoints, by reading the content of status file located at `/rkt/iottymux/<appname>/endpoints`.
+
+This file provides a versioned JSON document, whose content varies depending on the I/O for the specific application.
+
+For example, an application with all streams available for attaching will have a status file similar to the following:
+
+```
+{
+    "version": 1,
+    "targets": [
+        {
+            "name": "stdin",
+            "domain": "unix",
+            "address": "/rkt/iottymux/alpine-sh/sock-stdin"
+        },
+        {
+            "name": "stdout",
+            "domain": "unix",
+            "address": "/rkt/iottymux/alpine-sh/sock-stdout"
+        },
+        {
+            "name": "stderr",
+            "domain": "unix",
+            "address": "/rkt/iottymux/alpine-sh/sock-stderr"
+        }
+    ]
+}
+```
+
+### Endpoint listing
+
+
+Its `--mode=list` option just read the file and print it back to the user.
+
+### Automatic attaching
+
+`rkt attach --mode=auto` performs the auto-discovery mechanism described above, and the proceed to attach stdin/stdour/stderr of the current process (itself) to all available corresponding endpoints.
+
+This the default attaching mode.
+
+### Custom attaching
+
+`rkt attach --mode=<stream>` performs the auto-discovery mechanism described above, and the proceed to the corresponding available endpoints.
+
+## Logging
+
+### Journald
+
+This is the default output multiplexer for stdout/stderr in logging mode, for historical reasons and backward compatibility.
+
+Restrictions:
+ * requires journalctl (or similar libsystemd-based helper) to decode output entries
+ * requires a libsystemd on the host compiled with LZ4 support
+ * systemd-journald does not support distinguishing between entries from stdout and stderr
+
+### Experimental logging modes
+
+TODO(lucab): k8s logmode
+
+## Sidecars
+
+### systemd-journald
+
+
+This is the standard systemd-journald service. It is the default output handler for the "logging" mode.
+
+### iottymux
+
+iottymux is a multi-purpose stage1 binary. It currently serves the following purposes:
+ * Multiplex I/O over TTY (in TTY mode)
+ * Multiplex I/O from streams (in streaming mode)
+ * Attach to existing attachable applications (in TTY or streaming mode)
+
+#### iomux
+
+This component takes care of multiplexing dedicated streams and receiving clients for attaching.
+
+It is started as an instance of the templated `iomux@.service` service by a `Before=` dependency from the application.
+
+Internally, it attaches to available FIFOs and proxies them to separate sockets for external clients.
+
+It is implemented as a sub-action of the main `iottymux` binary and completely run in stage1 context.
+
+#### ttymux
+
+This component takes care of multiplexing TTY and receiving clients for attaching.
+
+It is started as an instance of the templated `ttymux@.service` service by a `After=` dependency from the application.
+
+Internally, it creates a pesudo-tty pair (whose slave is used by the main application) and proxies the master to a socket for external clients.
+
+It is implemented as a sub-action of the main `iottymux` binary and completely run in stage1 context.
+
+#### iottymux-attach
+
+This component takes care of discovering endpoints and attaching to them, both for TTY and streaming modes.
+
+It is invoked by the "stage1" attach entrypoint and completely run in stage1 context. It is implemented as a sub-action of the main `iottymux` binary.

From 2b025fb9927e1459d928ff8d5882b8a092f39326 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Sun, 29 Jan 2017 15:47:53 +0100
Subject: [PATCH 1044/1304] apps/attach: clean resources on termination

---
 stage1/iottymux/iottymux.go        | 28 +++++++++-
 stage1/units/units/ttymux@.service |  2 +-
 tests/rkt_app_sandbox_test.go      | 40 ++------------
 tests/rkt_attach_test.go           | 83 ++++++++++++++++++++++++++++++
 tests/rkt_tests.go                 | 37 +++++++++++++
 5 files changed, 152 insertions(+), 38 deletions(-)

diff --git a/stage1/iottymux/iottymux.go b/stage1/iottymux/iottymux.go
index 40704741ba..5d40a3ace7 100644
--- a/stage1/iottymux/iottymux.go
+++ b/stage1/iottymux/iottymux.go
@@ -25,6 +25,7 @@ import (
 	"io/ioutil"
 	"net"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"strconv"
 	"syscall"
@@ -309,6 +310,8 @@ func actionTTYMux(statusFile string) error {
 	go acceptConn(listener, clients, "tty")
 	go proxyIO(clients, ptm, c)
 
+	dispatchSig(c)
+
 	// If nothing else fails, ttymux service will be waiting here forever
 	// and be terminated by systemd only when the main application exits.
 	return <-c
@@ -449,11 +452,32 @@ func actionIOMux(statusFile string) error {
 		}
 	}
 
+	dispatchSig(c)
+
 	// If nothing else fails, iomux service will be waiting here forever
 	// and be terminated by systemd only when the main application exits.
 	return <-c
 }
 
+// dispatchSig launches a goroutine and closes the given stop channel
+// when SIGTERM, SIGHUP, or SIGINT is received.
+func dispatchSig(stop chan<- error) {
+	sigChan := make(chan os.Signal)
+	signal.Notify(
+		sigChan,
+		syscall.SIGTERM,
+		syscall.SIGHUP,
+		syscall.SIGINT,
+	)
+
+	go func() {
+		diag.Println("Waiting for signal")
+		sig := <-sigChan
+		diag.Printf("Received signal %v\n", sig)
+		close(stop)
+	}()
+}
+
 // bufferLine buffers and queues a single line from a Reader to a multiplexer
 // If reading from src fails, it hard-fails and propagates the error back.
 func bufferLine(src io.Reader, c chan<- []byte, ec chan<- error) {
@@ -492,8 +516,8 @@ func proxyIO(clients <-chan net.Conn, tty *os.File, ttyFailure chan<- error) {
 	ttyToRemote := func(dst net.Conn, src *os.File) {
 		_, err := io.Copy(dst, src)
 		if err == nil {
-			dst.Close()
-			ec <- io.EOF
+			_ = dst.Close()
+			close(ec)
 		}
 	}
 
diff --git a/stage1/units/units/ttymux@.service b/stage1/units/units/ttymux@.service
index 1eb04fe22d..a37d73a72a 100644
--- a/stage1/units/units/ttymux@.service
+++ b/stage1/units/units/ttymux@.service
@@ -13,4 +13,4 @@ User=0
 Group=0
 SyslogIdentifier=%i
 StandardOutput=journal+console
-StandardError=journal+console
\ No newline at end of file
+StandardError=journal+console
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index de3597fd4e..b17c00f7d6 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -426,6 +425,11 @@ func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.Expe
 	}
 	defer os.Unsetenv("RKT_EXPERIMENT_APP")
 
+	if err := os.Setenv("RKT_EXPERIMENT_ATTACH", "true"); err != nil {
+		panic(err)
+	}
+	defer os.Unsetenv("RKT_EXPERIMENT_ATTACH")
+
 	tmpDir := mustTempDir("rkt-test-cri-")
 	uuidFile := filepath.Join(tmpDir, "uuid")
 	defer os.RemoveAll(tmpDir)
@@ -455,37 +459,3 @@ func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.Expe
 
 	waitOrFail(t, child, 0)
 }
-
-// retry is the struct that represents retrying function calls.
-type retry struct {
-	n int
-	t time.Duration
-}
-
-// Retry retries the given function f n times with a delay t between invocations
-// until no error is retrurned from f or n is exceeded.
-// The last occured error is returned.
-func (r retry) Retry(f func() error) error {
-	var err error
-
-	for i := 0; i < r.n; i++ {
-		err = f()
-		if err == nil {
-			return nil
-		}
-		time.Sleep(r.t)
-	}
-
-	return err
-}
-
-func combinedOutput(t *testing.T, c *exec.Cmd) string {
-	t.Log("Running", c.Args)
-	out, err := c.CombinedOutput()
-
-	if err != nil {
-		t.Fatal(err, "output", string(out))
-	}
-
-	return string(out)
-}
diff --git a/tests/rkt_attach_test.go b/tests/rkt_attach_test.go
index fbf265754f..f5b3d2f84d 100644
--- a/tests/rkt_attach_test.go
+++ b/tests/rkt_attach_test.go
@@ -142,3 +142,86 @@ func TestAttachSmoke(t *testing.T) {
 		waitOrFail(t, podProc, 0)
 	}
 }
+
+func TestAttachStartStop(t *testing.T) {
+	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+		// total retry timeout: 10s
+		r := retry{
+			n: 20,
+			t: 500 * time.Millisecond,
+		}
+
+		assertStatus := func(name, status string) error {
+			return r.Retry(func() error {
+				got := combinedOutput(t, ctx.ExecCmd("app", "status", podUUID, "--app="+name))
+
+				if !strings.Contains(got, status) {
+					return fmt.Errorf("unexpected result, got %q", got)
+				}
+
+				return nil
+			})
+		}
+
+		aci := patchTestACI(
+			"rkt-inspect-attach-start-stop.aci",
+			"--name=coreos.com/rkt-inspect/attach-start-stop",
+			"--exec=/inspect -read-stdin -sleep 30",
+		)
+		defer os.Remove(aci)
+
+		// fetch app
+		combinedOutput(t, ctx.ExecCmd("fetch", "--insecure-options=image", aci))
+
+		// add app
+		combinedOutput(t, ctx.ExecCmd(
+			"app", "add", podUUID,
+			"coreos.com/rkt-inspect/attach-start-stop",
+			"--name=attach-start-stop",
+			"--stdin=stream", "--stdout=stream", "--stderr=stream",
+		))
+
+		// start app
+		combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app=attach-start-stop"))
+		if err := assertStatus("attach-start-stop", "running"); err != nil {
+			t.Error(err)
+			return
+		}
+
+		// attach and unblock app by sending some input
+		rktAttachCmd := fmt.Sprintf("%s attach %s", ctx.Cmd(), podUUID)
+		attachProc := spawnOrFail(t, rktAttachCmd)
+		input := "some_input"
+		if err := attachProc.SendLine(input); err != nil {
+			t.Errorf("Failed to send %q on the prompt: %v", input, err)
+			return
+		}
+
+		feedback := fmt.Sprintf("Received text: %s", input)
+		if err := expectTimeoutWithOutput(attachProc, feedback, 30*time.Second); err != nil {
+			t.Errorf("Waited for the prompt but not found: %v", err)
+			return
+		}
+
+		// stop after entering input
+		combinedOutput(t, ctx.ExecCmd("app", "stop", "--debug", podUUID, "--app=attach-start-stop"))
+		if err := assertStatus("attach-start-stop", "exited"); err != nil {
+			t.Error(err)
+			return
+		}
+
+		// restart app
+		combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app=attach-start-stop"))
+		if err := assertStatus("attach-start-stop", "running"); err != nil {
+			t.Error(err)
+			return
+		}
+
+		// stop without entering input
+		combinedOutput(t, ctx.ExecCmd("app", "stop", "--debug", podUUID, "--app=attach-start-stop"))
+		if err := assertStatus("attach-start-stop", "exited"); err != nil {
+			t.Error(err)
+			return
+		}
+	})
+}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 5a75386b2b..ed4297f1c6 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -951,3 +951,40 @@ func checkExitStatus(child *gexpect.ExpectSubprocess) error {
 
 	return nil
 }
+
+// combinedOutput executes the given command c for the given test context t
+// and fails test t if command execution failed.
+// It returns the command output.
+func combinedOutput(t *testing.T, c *exec.Cmd) string {
+	t.Log("Running", c.Args)
+	out, err := c.CombinedOutput()
+
+	if err != nil {
+		t.Fatal(err, "output", string(out))
+	}
+
+	return string(out)
+}
+
+// retry is the struct that represents retrying function calls.
+type retry struct {
+	n int
+	t time.Duration
+}
+
+// Retry retries the given function f n times with a delay t between invocations
+// until no error is returned from f or n is exceeded.
+// The last occured error is returned.
+func (r retry) Retry(f func() error) error {
+	var err error
+
+	for i := 0; i < r.n; i++ {
+		err = f()
+		if err == nil {
+			return nil
+		}
+		time.Sleep(r.t)
+	}
+
+	return err
+}

From 5b77de6ac8bee7486e3da3610e6de43375e9ce98 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Wed, 1 Feb 2017 15:19:49 +0100
Subject: [PATCH 1045/1304] vendor: bump appc to v0.8.10

---
 Documentation/app-container.md                |   4 +-
 .../devel/stage1-implementors-guide.md        |   2 +-
 Documentation/proposals/oci.md                |   6 +-
 Documentation/subcommands/cat-manifest.md     |   2 +-
 Documentation/subcommands/image.md            |   2 +-
 Documentation/subcommands/version.md          |   2 +-
 glide.lock                                    |  11 +-
 glide.yaml                                    |   2 +-
 stage1/aci/aci-manifest.in                    |   2 +-
 stage1_fly/aci/aci-manifest.in                |   2 +-
 store/imagestore/store_test.go                |   6 +-
 tests/empty-image/manifest                    |   2 +-
 tests/image/manifest                          |   2 +-
 tests/rkt-monitor/build-too-many-apps.sh      |   2 +-
 tests/stub-stage1/manifest                    |   2 +-
 .../appc/spec/ace/image_manifest_main.json.in |   4 +-
 .../spec/ace/image_manifest_sidekick.json.in  |   4 +-
 vendor/github.com/appc/spec/ace/validator.go  |   7 -
 .../spec/schema/types/isolator_resources.go   |   2 +-
 .../spec/schema/types}/resource/amount.go     |   2 +-
 .../appc/spec/schema/types}/resource/math.go  |   2 +-
 .../spec/schema/types}/resource/quantity.go   |  13 +-
 .../spec/schema/types}/resource/scale_int.go  |   2 +-
 .../spec/schema/types}/resource/suffix.go     |   2 +-
 vendor/github.com/appc/spec/schema/version.go |   2 +-
 vendor/k8s.io/kubernetes/LICENSE              | 202 -------------
 .../pkg/api/resource/generated.pb.go          |  69 -----
 .../pkg/api/resource/quantity_proto.go        | 284 ------------------
 28 files changed, 35 insertions(+), 609 deletions(-)
 rename vendor/{k8s.io/kubernetes/pkg/api => github.com/appc/spec/schema/types}/resource/amount.go (99%)
 rename vendor/{k8s.io/kubernetes/pkg/api => github.com/appc/spec/schema/types}/resource/math.go (99%)
 rename vendor/{k8s.io/kubernetes/pkg/api => github.com/appc/spec/schema/types}/resource/quantity.go (98%)
 rename vendor/{k8s.io/kubernetes/pkg/api => github.com/appc/spec/schema/types}/resource/scale_int.go (97%)
 rename vendor/{k8s.io/kubernetes/pkg/api => github.com/appc/spec/schema/types}/resource/suffix.go (98%)
 delete mode 100644 vendor/k8s.io/kubernetes/LICENSE
 delete mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
 delete mode 100644 vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index d37ecbbed5..a1187a466f 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -33,8 +33,8 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 # rkt --insecure-options=image run \
 	--mds-register \
 	--volume=database,kind=host,source=/tmp \
-	https://github.com/appc/spec/releases/download/v0.8.9/ace-validator-main.aci \
-	https://github.com/appc/spec/releases/download/v0.8.9/ace-validator-sidekick.aci
+	https://github.com/appc/spec/releases/download/v0.8.10/ace-validator-main.aci \
+	https://github.com/appc/spec/releases/download/v0.8.10/ace-validator-sidekick.aci
 ```
 
 [acbuild]: https://github.com/containers/build
diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index 4101dfac81..f061362275 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -247,7 +247,7 @@ If the annotation is not present, rkt assumes the version is 1.
 ```json
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.9",
+    "acVersion": "0.8.10",
     "name": "foo.com/rkt/stage1",
     "labels": [
         {
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 01dd93796c..a5e3eca950 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -130,9 +130,9 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [docker2aci]: https://github.com/appc/docker2aci
 [oci-runtime]: https://github.com/opencontainers/runtime-spec
 
-[aci]: https://github.com/appc/spec/blob/v0.8.9/spec/aci.md#app-container-image
-[ace-fs]: https://github.com/appc/spec/blob/v0.8.9/spec/ace.md#filesystem-setup
-[appc-image-id-type]: https://github.com/appc/spec/blob/v0.8.9/spec/types.md#image-id-type
+[aci]: https://github.com/appc/spec/blob/v0.8.10/spec/aci.md#app-container-image
+[ace-fs]: https://github.com/appc/spec/blob/v0.8.10/spec/ace.md#filesystem-setup
+[appc-image-id-type]: https://github.com/appc/spec/blob/v0.8.10/spec/types.md#image-id-type
 
 [oci]: https://github.com/opencontainers/image-spec
 [oci-manifest]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/manifest.md#image-manifest
diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index dc953f9050..282bce0c0c 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -5,7 +5,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 ```
 # rkt cat-manifest UUID
 {
-  "acVersion":"0.8.9",
+  "acVersion":"0.8.10",
   "acKind":"PodManifest"
 ...
 ```
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 066fba3b07..7de30e18c0 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -7,7 +7,7 @@ For debugging or inspection you may want to extract an ACI manifest to stdout.
 ```
 # rkt image cat-manifest coreos.com/etcd
 {
-  "acVersion": "0.8.9",
+  "acVersion": "0.8.10",
   "acKind": "ImageManifest",
 ...
 ```
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index a561c1f6c4..7369f0d221 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -7,6 +7,6 @@ This command prints the rkt version, the appc version rkt is built against, and
 ```
 $ rkt version
 rkt Version: 1.23.0
-appc Version: 0.8.9
+appc Version: 0.8.10
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/glide.lock b/glide.lock
index 089ecc2108..103e3ba5d3 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: d4d89bbae9978ca0305ddeb4f80bf28a1e7697215fa3fe2e11271240d234038e
-updated: 2017-01-16T13:12:04.012198138+03:00
+hash: ab29310f45cc4931a6769b71ce4968a2d49581c0ded1e116f4719b4c09648f22
+updated: 2017-02-01T15:08:20.265780035+01:00
 imports:
 - name: github.com/appc/docker2aci
   version: cfd196b05e02185b34aa3a844eff07b943c7e3ec
@@ -20,7 +20,7 @@ imports:
   subpackages:
   - proj2aci
 - name: github.com/appc/spec
-  version: d7de4875ad542ca48f4ff1f1f0a487764a825fbd
+  version: ba99d6b8ccbbed2942e53eb5395fddae113cdf8e
   subpackages:
   - ace
   - aci
@@ -33,6 +33,7 @@ imports:
   - schema/common
   - schema/lastditch
   - schema/types
+  - schema/types/resource
 - name: github.com/aws/aws-sdk-go
   version: 13a12060f716145019378a10e2806c174356b857
   subpackages:
@@ -299,10 +300,6 @@ imports:
   - transport
 - name: gopkg.in/inf.v0
   version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
-- name: k8s.io/kubernetes
-  version: 5aadd18b051c7c156ee9815055beb180c8365309
-  subpackages:
-  - pkg/api/resource
 testImports:
 - name: github.com/kr/text
   version: 7cafcd837844e784b526369c9bce262804aebc60
diff --git a/glide.yaml b/glide.yaml
index bd09ddc435..d7e409fbfc 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,7 +20,7 @@ import:
   subpackages:
   - proj2aci
 - package: github.com/appc/spec
-  version: v0.8.9
+  version: v0.8.10
   subpackages:
   - ace
   - aci
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index 6878aa42c5..ec0acb5a7a 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.9",
+    "acVersion": "0.8.10",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index b9e45b05a6..f3fc36b669 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.9",
+    "acVersion": "0.8.10",
     "name": "coreos.com/rkt/stage1-fly",
     "labels": [
         {
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index 7ab1a36b73..b1d8c71963 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -228,7 +228,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.9",
+						"acVersion": "0.8.10",
 						"name": "example.com/test01"
 					}`,
 					false,
@@ -236,7 +236,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.9",
+						"acVersion": "0.8.10",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.9",
+						"acVersion": "0.8.10",
 						"name": "example.com/test02",
 						"labels": [
 							{
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 0ac80e4aff..d1203958c6 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.9",
+    "acVersion": "0.8.10",
     "name": "coreos.com/rkt-empty",
     "labels": [
         {
diff --git a/tests/image/manifest b/tests/image/manifest
index c5124a83a4..411a6f04b0 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.9",
+    "acVersion": "0.8.10",
     "name": "coreos.com/rkt-inspect",
     "labels": [
         {
diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
index d6619890c3..e98fb5fd3c 100755
--- a/tests/rkt-monitor/build-too-many-apps.sh
+++ b/tests/rkt-monitor/build-too-many-apps.sh
@@ -45,7 +45,7 @@ OUTPUT=${PWD}/too-many-apps.podmanifest
 
 cat <<EOF >${OUTPUT}
 {
-    "acVersion": "0.8.9",
+    "acVersion": "0.8.10",
     "acKind": "PodManifest",
     "apps": [
 EOF
diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest
index ccbc3ed5f2..7335a31cd4 100644
--- a/tests/stub-stage1/manifest
+++ b/tests/stub-stage1/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.9",
+    "acVersion": "0.8.10",
     "name": "localhost/rkt-stub-stage1",
     "labels": [
         {
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
index ec7d9ab4ff..ddfc3ab2f2 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.9",
+    "acVersion": "0.8.10",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.9" },
+        { "name": "version", "value": "0.8.10" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index a867294140..accff02f5f 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.9",
+    "acVersion": "0.8.10",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.9" },
+        { "name": "version", "value": "0.8.10" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],
diff --git a/vendor/github.com/appc/spec/ace/validator.go b/vendor/github.com/appc/spec/ace/validator.go
index f92652cde2..eeb298e86d 100644
--- a/vendor/github.com/appc/spec/ace/validator.go
+++ b/vendor/github.com/appc/spec/ace/validator.go
@@ -26,9 +26,6 @@ Changes to the validator need to be reflected in app_manifest.json, and vice-ver
 The App Container Execution spec defines the following expectations within the execution environment:
  - Working Directory defaults to the root of the application image, overridden with "workingDirectory"
  - PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
- - USER, LOGNAME username of the user executing this app
- - HOME home directory of the user
- - SHELL login shell of the user
  - AC_APP_NAME the entrypoint that this process was defined from
 
 In addition, we validate:
@@ -81,10 +78,6 @@ var (
 	// "Environment"
 	env = map[string]string{
 		"IN_ACE_VALIDATOR": "correct",
-		"HOME":             "/root",
-		"USER":             "root",
-		"LOGNAME":          "root",
-		"SHELL":            "/bin/sh",
 	}
 	// "MountPoints"
 	mps = map[string]types.MountPoint{
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_resources.go b/vendor/github.com/appc/spec/schema/types/isolator_resources.go
index 771c73fdcb..2ec250d4f9 100644
--- a/vendor/github.com/appc/spec/schema/types/isolator_resources.go
+++ b/vendor/github.com/appc/spec/schema/types/isolator_resources.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	"k8s.io/kubernetes/pkg/api/resource"
+	"github.com/appc/spec/schema/types/resource"
 )
 
 var (
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go b/vendor/github.com/appc/spec/schema/types/resource/amount.go
similarity index 99%
rename from vendor/k8s.io/kubernetes/pkg/api/resource/amount.go
rename to vendor/github.com/appc/spec/schema/types/resource/amount.go
index 2d3012c875..6ae823a022 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/amount.go
+++ b/vendor/github.com/appc/spec/schema/types/resource/amount.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 The Kubernetes Authors.
+Copyright 2014 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/math.go b/vendor/github.com/appc/spec/schema/types/resource/math.go
similarity index 99%
rename from vendor/k8s.io/kubernetes/pkg/api/resource/math.go
rename to vendor/github.com/appc/spec/schema/types/resource/math.go
index 887ac74c98..163aafa5db 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/math.go
+++ b/vendor/github.com/appc/spec/schema/types/resource/math.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 The Kubernetes Authors.
+Copyright 2014 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go b/vendor/github.com/appc/spec/schema/types/resource/quantity.go
similarity index 98%
rename from vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
rename to vendor/github.com/appc/spec/schema/types/resource/quantity.go
index 823dd5ef70..96877b4c94 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity.go
+++ b/vendor/github.com/appc/spec/schema/types/resource/quantity.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 The Kubernetes Authors.
+Copyright 2014 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -87,6 +87,7 @@ import (
 // writing some sort of special handling code in the hopes that that will
 // cause implementors to also use a fixed point implementation.
 //
+// +gencopy=false
 // +protobuf=true
 // +protobuf.embed=string
 // +protobuf.options.marshal=false
@@ -385,16 +386,6 @@ func ParseQuantity(str string) (Quantity, error) {
 	return Quantity{d: infDecAmount{amount}, Format: format}, nil
 }
 
-// DeepCopy returns a deep-copy of the Quantity value.  Note that the method
-// receiver is a value, so we can mutate it in-place and return it.
-func (q Quantity) DeepCopy() Quantity {
-	if q.d.Dec != nil {
-		tmp := &inf.Dec{}
-		q.d.Dec = tmp.Set(q.d.Dec)
-	}
-	return q
-}
-
 // CanonicalizeBytes returns the canonical form of q and its suffix (see comment on Quantity).
 //
 // Note about BinarySI:
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go b/vendor/github.com/appc/spec/schema/types/resource/scale_int.go
similarity index 97%
rename from vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go
rename to vendor/github.com/appc/spec/schema/types/resource/scale_int.go
index 55e177b0e9..173de1a217 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/scale_int.go
+++ b/vendor/github.com/appc/spec/schema/types/resource/scale_int.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2015 The Kubernetes Authors.
+Copyright 2015 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go b/vendor/github.com/appc/spec/schema/types/resource/suffix.go
similarity index 98%
rename from vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
rename to vendor/github.com/appc/spec/schema/types/resource/suffix.go
index 5ed7abe665..0aa2ce2bf6 100644
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/suffix.go
+++ b/vendor/github.com/appc/spec/schema/types/resource/suffix.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 The Kubernetes Authors.
+Copyright 2014 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go
index a678f2068a..9e7265604f 100644
--- a/vendor/github.com/appc/spec/schema/version.go
+++ b/vendor/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.9"
+	version string = "0.8.10"
 )
 
 var (
diff --git a/vendor/k8s.io/kubernetes/LICENSE b/vendor/k8s.io/kubernetes/LICENSE
deleted file mode 100644
index 00b2401109..0000000000
--- a/vendor/k8s.io/kubernetes/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2014 The Kubernetes Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go b/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
deleted file mode 100644
index e7c6e9ed10..0000000000
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/generated.pb.go
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by protoc-gen-gogo.
-// source: k8s.io/kubernetes/pkg/api/resource/generated.proto
-// DO NOT EDIT!
-
-/*
-	Package resource is a generated protocol buffer package.
-
-	It is generated from these files:
-		k8s.io/kubernetes/pkg/api/resource/generated.proto
-
-	It has these top-level messages:
-		Quantity
-*/
-package resource
-
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
-
-func (m *Quantity) Reset()                    { *m = Quantity{} }
-func (*Quantity) ProtoMessage()               {}
-func (*Quantity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} }
-
-func init() {
-	proto.RegisterType((*Quantity)(nil), "k8s.io.kubernetes.pkg.api.resource.Quantity")
-}
-
-var fileDescriptorGenerated = []byte{
-	// 222 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x32, 0xca, 0xb6, 0x28, 0xd6,
-	0xcb, 0xcc, 0xd7, 0xcf, 0x2e, 0x4d, 0x4a, 0x2d, 0xca, 0x4b, 0x2d, 0x49, 0x2d, 0xd6, 0x2f, 0xc8,
-	0x4e, 0xd7, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0x4a, 0x2d, 0xce, 0x2f, 0x2d, 0x4a, 0x4e, 0xd5, 0x4f,
-	0x4f, 0xcd, 0x4b, 0x2d, 0x4a, 0x2c, 0x49, 0x4d, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52,
-	0x82, 0xe8, 0xd1, 0x43, 0xe8, 0xd1, 0x03, 0xea, 0xd1, 0x03, 0xea, 0xd1, 0x83, 0xe9, 0x91, 0xd2,
-	0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, 0xd7,
-	0x07, 0x6b, 0x4d, 0x2a, 0x4d, 0x03, 0xf3, 0xc0, 0x1c, 0x30, 0x0b, 0x62, 0xa4, 0x94, 0x21, 0x76,
-	0x67, 0x94, 0x96, 0x64, 0xe6, 0xe8, 0x67, 0xe6, 0x95, 0x14, 0x97, 0x14, 0xa1, 0xbb, 0x42, 0xc9,
-	0x82, 0x8b, 0x23, 0xb0, 0x34, 0x31, 0xaf, 0x24, 0xb3, 0xa4, 0x52, 0x48, 0x8c, 0x8b, 0x0d, 0xa8,
-	0x24, 0x33, 0x2f, 0x5d, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, 0xca, 0xb3, 0x12, 0x99, 0xb1,
-	0x40, 0x9e, 0xa1, 0x63, 0xa1, 0x3c, 0xc3, 0x04, 0x20, 0x5e, 0x00, 0xc4, 0x0d, 0x77, 0x14, 0x18,
-	0x9c, 0xb4, 0x4e, 0x3c, 0x94, 0x63, 0xb8, 0x00, 0xc4, 0x37, 0x80, 0xb8, 0xe1, 0x91, 0x1c, 0xe3,
-	0x09, 0x20, 0xbe, 0x00, 0xc4, 0x0f, 0x80, 0x78, 0xc2, 0x63, 0x39, 0x86, 0x28, 0x0e, 0x98, 0x3f,
-	0x00, 0x01, 0x00, 0x00, 0xff, 0xff, 0x90, 0x1c, 0x7f, 0xff, 0x20, 0x01, 0x00, 0x00,
-}
diff --git a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go b/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
deleted file mode 100644
index 74dfb4e4b7..0000000000
--- a/vendor/k8s.io/kubernetes/pkg/api/resource/quantity_proto.go
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package resource
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/gogo/protobuf/proto"
-)
-
-var _ proto.Sizer = &Quantity{}
-
-func (m *Quantity) Marshal() (data []byte, err error) {
-	size := m.Size()
-	data = make([]byte, size)
-	n, err := m.MarshalTo(data)
-	if err != nil {
-		return nil, err
-	}
-	return data[:n], nil
-}
-
-// MarshalTo is a customized version of the generated Protobuf unmarshaler for a struct
-// with a single string field.
-func (m *Quantity) MarshalTo(data []byte) (int, error) {
-	var i int
-	_ = i
-	var l int
-	_ = l
-
-	data[i] = 0xa
-	i++
-	// BEGIN CUSTOM MARSHAL
-	out := m.String()
-	i = encodeVarintGenerated(data, i, uint64(len(out)))
-	i += copy(data[i:], out)
-	// END CUSTOM MARSHAL
-
-	return i, nil
-}
-
-func encodeVarintGenerated(data []byte, offset int, v uint64) int {
-	for v >= 1<<7 {
-		data[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	data[offset] = uint8(v)
-	return offset + 1
-}
-
-func (m *Quantity) Size() (n int) {
-	var l int
-	_ = l
-
-	// BEGIN CUSTOM SIZE
-	l = len(m.String())
-	// END CUSTOM SIZE
-
-	n += 1 + l + sovGenerated(uint64(l))
-	return n
-}
-
-func sovGenerated(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
-}
-
-// Unmarshal is a customized version of the generated Protobuf unmarshaler for a struct
-// with a single string field.
-func (m *Quantity) Unmarshal(data []byte) error {
-	l := len(data)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowGenerated
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := data[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: Quantity: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: Quantity: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field String_", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			s := string(data[iNdEx:postIndex])
-
-			// BEGIN CUSTOM DECODE
-			p, err := ParseQuantity(s)
-			if err != nil {
-				return err
-			}
-			*m = p
-			// END CUSTOM DECODE
-
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipGenerated(data[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-
-func skipGenerated(data []byte) (n int, err error) {
-	l := len(data)
-	iNdEx := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowGenerated
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := data[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if data[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-			return iNdEx, nil
-		case 1:
-			iNdEx += 8
-			return iNdEx, nil
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			iNdEx += length
-			if length < 0 {
-				return 0, ErrInvalidLengthGenerated
-			}
-			return iNdEx, nil
-		case 3:
-			for {
-				var innerWire uint64
-				var start int = iNdEx
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return 0, ErrIntOverflowGenerated
-					}
-					if iNdEx >= l {
-						return 0, io.ErrUnexpectedEOF
-					}
-					b := data[iNdEx]
-					iNdEx++
-					innerWire |= (uint64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				innerWireType := int(innerWire & 0x7)
-				if innerWireType == 4 {
-					break
-				}
-				next, err := skipGenerated(data[start:])
-				if err != nil {
-					return 0, err
-				}
-				iNdEx = start + next
-			}
-			return iNdEx, nil
-		case 4:
-			return iNdEx, nil
-		case 5:
-			iNdEx += 4
-			return iNdEx, nil
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-	}
-	panic("unreachable")
-}
-
-var (
-	ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowGenerated   = fmt.Errorf("proto: integer overflow")
-)

From 73ef404ff51147776b2e7a427200f7aca6915e14 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Wed, 1 Feb 2017 13:24:17 +0000
Subject: [PATCH 1046/1304] tests: wait for attachable status before attaching

---
 tests/rkt_attach_test.go | 26 ++++++++++++++++++--------
 tests/rkt_tests.go       | 31 +++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/tests/rkt_attach_test.go b/tests/rkt_attach_test.go
index f5b3d2f84d..0b303ccc83 100644
--- a/tests/rkt_attach_test.go
+++ b/tests/rkt_attach_test.go
@@ -117,6 +117,11 @@ func TestAttachSmoke(t *testing.T) {
 			}
 		}
 
+		// wait for the app to become attachable
+		if err := waitAppAttachable(ctx, t, uuid, appName, 30*time.Second); err != nil {
+			t.Fatalf("Failed to wait for attachable app #%v: %v", i, err)
+		}
+
 		// attach and unblock app by sending some input
 		rktAttachCmd := fmt.Sprintf("%s attach %s", ctx.Cmd(), uuid)
 		attachProc := spawnOrFail(t, rktAttachCmd)
@@ -145,6 +150,7 @@ func TestAttachSmoke(t *testing.T) {
 
 func TestAttachStartStop(t *testing.T) {
 	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+		appName := "attach-start-stop"
 		// total retry timeout: 10s
 		r := retry{
 			n: 20,
@@ -177,17 +183,22 @@ func TestAttachStartStop(t *testing.T) {
 		combinedOutput(t, ctx.ExecCmd(
 			"app", "add", podUUID,
 			"coreos.com/rkt-inspect/attach-start-stop",
-			"--name=attach-start-stop",
+			"--name="+appName,
 			"--stdin=stream", "--stdout=stream", "--stderr=stream",
 		))
 
 		// start app
-		combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app=attach-start-stop"))
+		combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+appName))
 		if err := assertStatus("attach-start-stop", "running"); err != nil {
 			t.Error(err)
 			return
 		}
 
+		// wait for the app to become attachable
+		if err := waitAppAttachable(ctx, t, podUUID, appName, 30*time.Second); err != nil {
+			t.Fatalf("Failed to wait for attachable app: %v", err)
+		}
+
 		// attach and unblock app by sending some input
 		rktAttachCmd := fmt.Sprintf("%s attach %s", ctx.Cmd(), podUUID)
 		attachProc := spawnOrFail(t, rktAttachCmd)
@@ -197,28 +208,27 @@ func TestAttachStartStop(t *testing.T) {
 			return
 		}
 
-		feedback := fmt.Sprintf("Received text: %s", input)
-		if err := expectTimeoutWithOutput(attachProc, feedback, 30*time.Second); err != nil {
-			t.Errorf("Waited for the prompt but not found: %v", err)
+		if err := expectTimeoutWithOutput(attachProc, input, 30*time.Second); err != nil {
+			t.Errorf("Waited for feedback %q but not found: %v", input, err)
 			return
 		}
 
 		// stop after entering input
-		combinedOutput(t, ctx.ExecCmd("app", "stop", "--debug", podUUID, "--app=attach-start-stop"))
+		combinedOutput(t, ctx.ExecCmd("app", "stop", "--debug", podUUID, "--app="+appName))
 		if err := assertStatus("attach-start-stop", "exited"); err != nil {
 			t.Error(err)
 			return
 		}
 
 		// restart app
-		combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app=attach-start-stop"))
+		combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app="+appName))
 		if err := assertStatus("attach-start-stop", "running"); err != nil {
 			t.Error(err)
 			return
 		}
 
 		// stop without entering input
-		combinedOutput(t, ctx.ExecCmd("app", "stop", "--debug", podUUID, "--app=attach-start-stop"))
+		combinedOutput(t, ctx.ExecCmd("app", "stop", "--debug", podUUID, "--app="+appName))
 		if err := assertStatus("attach-start-stop", "exited"); err != nil {
 			t.Error(err)
 			return
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index ed4297f1c6..2b406c755c 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -172,6 +172,37 @@ func waitPodReady(ctx *testutils.RktRunCtx, t *testing.T, uuidFile string, timeo
 	return string(podUUID), nil
 }
 
+// waitAppAttachable waits for an attachable application to get ready, busy-looping until `timeout`
+// while waiting for it. It returns an error on failure.
+func waitAppAttachable(ctx *testutils.RktRunCtx, t *testing.T, podUUID, appName string, timeout time.Duration) error {
+	var (
+		err         error
+		output      []byte
+		appNameFlag string
+	)
+
+	if appName != "" {
+		appNameFlag = "--app=" + appName
+	}
+	cmd := strings.Fields(fmt.Sprintf("%s attach --mode=list %s %s", ctx.Cmd(), appNameFlag, podUUID))
+
+	interval := 500 * time.Millisecond
+	elapsed := time.Duration(0)
+	for elapsed < timeout {
+		time.Sleep(interval)
+		elapsed += interval
+		statusCmd := exec.Command(cmd[0], cmd[1:]...)
+		output, err = statusCmd.CombinedOutput()
+		if err == nil {
+			break
+		}
+	}
+	if err != nil {
+		return fmt.Errorf("%s", output)
+	}
+	return nil
+}
+
 func spawnAndWaitOrFail(t *testing.T, cmd string, expectedStatus int) {
 	child := spawnOrFail(t, cmd)
 	waitOrFail(t, child, expectedStatus)

From 46b1f742777ddc34a9ab9b4d9c37c45d3396ca37 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Sat, 4 Feb 2017 11:52:32 +0100
Subject: [PATCH 1047/1304] version: bump to v1.24.0

---
 CHANGELOG.md                         | 38 ++++++++++++++++++++++++++++
 Documentation/distributions.md       | 16 ++++++------
 Documentation/proposals/oci.md       |  6 ++---
 Documentation/running-fly-stage1.md  |  4 +--
 Documentation/running-kvm-stage1.md  |  4 +--
 Documentation/subcommands/prepare.md |  4 +--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 ++---
 ROADMAP.md                           |  9 ++++---
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 19 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c66e93213..a8ca5ee88b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,41 @@
+## 1.24.0
+
+This release includes experimental support for attaching to a running application's input and output. It also introduces
+a more finely grained pull-policy flag.
+
+## New Features:
+- rkt: add experimental support for attachable applications ([#3396](https://github.com/coreos/rkt/pull/3396)).
+    It consists of:
+    * a new `attach` subcommand
+    * a set of per-app flags to control stdin/stdout/stderr modes
+    * a stage1 `iottymux` binary for multiplexing and attaching
+    * two new templated stage1 services, `iomux` and `ttymux`
+- run/prepare/fetch: replace --no-store and --store-only with --pull-policy ([#3554](https://github.com/coreos/rkt/pull/3554)).
+    * Replaces the `--no-store` and `--store-only` flags with a singular
+    flag `--pull-policy`.
+    * can accept one of three things, `never`, `new`, and `update`.
+    * `--no-store` has been aliased to `--pull-policy=update`
+    * `--store-only` has been aliased to `--pull-policy=never`
+
+### Bug fixes
+- image gc: don't remove images that currently running pods were made from ([#3549](https://github.com/coreos/rkt/pull/3549)).
+- stage1/fly: evaluate symlinks in mount targets ([#3570](https://github.com/coreos/rkt/pull/3570)).
+- lib/app: use runtime app mounts and appVolumes rather than mountpoints ([#3571](https://github.com/coreos/rkt/pull/3571)).
+
+## Other changes:
+- kvm/qemu: Update QEMU to v2.8.0 ([#3568](https://github.com/coreos/rkt/pull/3568)).
+- stage0/app-add: CLI args should override image ones ([#3566](https://github.com/coreos/rkt/pull/3566)).
+- lib/app: use runtime app mounts and appVolumes rather than mountpoints ([#3571](https://github.com/coreos/rkt/pull/3571)).
+- kvm/lkvm: update lkvm version to HEAD ([#3569](https://github.com/coreos/rkt/pull/3569)).
+- vendor: bump appc to v0.8.10 ([#3574](https://github.com/coreos/rkt/pull/3574)).
+- docs: ([#3552](https://github.com/coreos/rkt/pull/3552))
+
+### Build & Test:
+- tests: remove gexpect from TestAppUserGroup ([#3561](https://github.com/coreos/rkt/pull/3561)).
+- travis: remove "gimme.local" script ([#3556](https://github.com/coreos/rkt/pull/3556)).
+- tests: fix when $HOME is only accessible by current user ([#3559](https://github.com/coreos/rkt/pull/3559)).
+- makelib: introduce --enable-incremental-build, enabling "go install" ([#3553](https://github.com/coreos/rkt/pull/3553)).
+
 ## 1.23.0
 
 This release adds a lot of bugfixes around the rkt fly flavor, garbage collection, kvm, and the sandbox. The new experimental `app` subcommand now follows the semantic of CRI of not quitting prematurely if apps fail or exit. Finally docker2aci received an important update fixing issues with os/arch labels which caused issues on arm architectures, a big thanks here goes to @ybubnov for this contribution.
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index f1d2c088d7..355dee1092 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -132,19 +132,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt-1.23.0-1.x86_64.rpm
-wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt-1.23.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.23.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.23.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt-1.24.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt-1.24.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.24.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.24.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt_1.23.0-1_amd64.deb
-wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt_1.23.0-1_amd64.deb.asc
-gpg --verify rkt_1.23.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.23.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt_1.24.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt_1.24.0-1_amd64.deb.asc
+gpg --verify rkt_1.24.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.24.0-1_amd64.deb
 ```
 
 [coreos-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index a5e3eca950..9a1d0cb3f4 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/coreos/rkt/blob/v1.23.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.23.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/coreos/rkt/blob/v1.23.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/coreos/rkt/blob/v1.24.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.24.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/coreos/rkt/blob/v1.24.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 00f25214b9..1fe71e6dd6 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.23.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.24.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.23.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.24.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 9d057959b1..5612135cab 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.23.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.24.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.23.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.24.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 764e89a935..4fa912d359 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.23.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.24.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.23.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.24.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 7369f0d221..cd4cc2403b 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.23.0
+rkt Version: 1.24.0
 appc Version: 0.8.10
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index fdf7c1623e..8291e8766e 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.23.0/rkt-v1.23.0.tar.gz
-tar xzvf rkt-v1.23.0.tar.gz
-cd rkt-v1.23.0
+wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt-v1.24.0.tar.gz
+tar xzvf rkt-v1.24.0.tar.gz
+cd rkt-v1.24.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 05c3a5c7fc..38f2c462fe 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -14,14 +14,15 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 
 ## Next releases
 
-### rkt 1.24.0 (February)
-
-Up-to-date planning at https://github.com/coreos/rkt/milestone/58.
-
 ### rkt 1.25.0 (February)
 
 Up-to-date planning at https://github.com/coreos/rkt/milestone/59.
 
+### rkt 1.26.0 (February)
+
+Up-to-date planning at https://github.com/coreos/rkt/milestone/60.
+
+
 ### Upcoming
 
 Future tasks without a specific timeline are tracked at https://github.com/coreos/rkt/milestone/30.
diff --git a/configure.ac b/configure.ac
index a590448e16..209c8e6ef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.23.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.24.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 9a8651e29a..9c6d144e28 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.23.0"
+version="1.24.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index d1203958c6..88054c9c36 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.23.0"
+            "value": "1.24.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 411a6f04b0..f99d2735a1 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.23.0"
+            "value": "1.24.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index b6707e18c1..20065a87d7 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.23.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.24.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 49ad73feff..1b6e06b7fa 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -35,7 +35,7 @@ func TestRunOverrideExec(t *testing.T) {
 	noappManifest := schema.ImageManifest{
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
-			{"version", "1.23.0"},
+			{"version", "1.24.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 217f562ae3..f326333fdc 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -46,7 +46,7 @@ func TestImageCatManifest(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.23.0"},
+			{"version", "1.24.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 5a9fe756e3..b16e0fbdb3 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -45,7 +45,7 @@ func TestImageExport(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.23.0"},
+			{"version", "1.24.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index f33383208c..9747a4ff12 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -55,7 +55,7 @@ func TestImageRender(t *testing.T) {
 			{ImageName: "coreos.com/rkt-inspect"},
 		},
 		Labels: types.Labels{
-			{"version", "1.23.0"},
+			{"version", "1.24.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index c09e6fcf75..2da821e17a 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -58,7 +58,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"version", "1.23.0"},
+			{"version", "1.24.0"},
 		},
 	}
 

From d6daffb768b902af19309058ecd5fecf35f3c933 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Sat, 4 Feb 2017 11:52:32 +0100
Subject: [PATCH 1048/1304] version: bump to v1.24.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 209c8e6ef7..b1afb159f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.24.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.24.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 20065a87d7..72f5095dc7 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.24.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.24.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 30146a20019ebe92b8ed5258137b24d0243cc0d2 Mon Sep 17 00:00:00 2001
From: Graham Whaley <graham.whaley@linux.intel.com>
Date: Mon, 30 Jan 2017 18:34:46 +0000
Subject: [PATCH 1049/1304] stage1/kvm: Change RAM calculation, and increase
 minimum

The current values and algorithm for working out the VM memory
mean that, for cases such as empty pods, we could end up with as
little as 128Mi of RAM. This is too little, and can impact some
startup functions (init/systemd) as the kernel sets some resources
(such as max-threads) according to how much memory the system has.

Improve the situation by setting a minimum RAM size we need,
and adjusting the calculations accordingly.

Modify the relevant unit tests to match, and extend slightly.

Other potential more dynamic solutions (hotplug memory, ballooning
solutions etc. ) are much more complex, and will be investigated for
the future.

Signed-off-by: Graham Whaley <graham.whaley@intel.com>
---
 stage1/init/kvm/resources.go      | 22 +++++++++--
 stage1/init/kvm/resources_test.go | 62 ++++++++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/stage1/init/kvm/resources.go b/stage1/init/kvm/resources.go
index eabbcfe664..2ca94371bf 100644
--- a/stage1/init/kvm/resources.go
+++ b/stage1/init/kvm/resources.go
@@ -21,14 +21,25 @@ import (
 	"github.com/appc/spec/schema/types"
 )
 
+// The algorithm/reasoning:
+// When running the VM takes a small amount of memory out of the container
+//  (systemMemOverhead below)
+// The VM also has a transient startup need - some extra 'space' really only
+//  needed to 'get going' before we get to the workload.
+//
+// So, we have two rules:
+// - we always add on the system overhead
+// - we bump up to the minimum required for boot if we need to
+//
+// From those, and the app memory asks, calculate how much memory to hand to
+//  the VM.
 const (
-	defaultMem        = 128 // MB
-	systemMemOverhead = 128 // MB
+	minMem            = 512 // MB - minimum we need in VM
+	systemMemOverhead = 128 // MB - overhead we need for VM
 )
 
 // findResources finds value of last isolator for particular type.
 func findResources(isolators types.Isolators) (mem, cpus int64) {
-	mem = defaultMem
 	for _, i := range isolators {
 		switch v := i.Value().(type) {
 		case *types.ResourceMemory:
@@ -66,5 +77,10 @@ func GetAppsResources(apps schema.AppList) (totalCpus, totalMem int64) {
 	// Add an overhead for the VM system
 	totalMem += systemMemOverhead
 
+	// Always ensure we have at least the minimum RAM needed
+	if totalMem < minMem {
+		totalMem = minMem
+	}
+
 	return totalCpus, totalMem
 }
diff --git a/stage1/init/kvm/resources_test.go b/stage1/init/kvm/resources_test.go
index ffec71a1dc..70d3172c47 100644
--- a/stage1/init/kvm/resources_test.go
+++ b/stage1/init/kvm/resources_test.go
@@ -20,6 +20,9 @@ import (
 	"github.com/appc/spec/schema/types"
 )
 
+// Check that findResources is returning the answers we expect.
+// In the current implementation, that is exactly what we pass in to it for
+// the cpu value, and the memory value is divided by (1024 * 1024) - MB
 func TestFindResources(t *testing.T) {
 	tests := []struct {
 		in types.Isolators
@@ -27,26 +30,75 @@ func TestFindResources(t *testing.T) {
 		wmem int64
 		wcpu int64
 	}{
+		//empty values should return us empty results
 		{
 			types.Isolators{},
 
-			defaultMem,
+			0,
 			0,
 		},
+		//check values in isolators actually come back
 		{
 			types.Isolators([]types.Isolator{
 				newIsolator(`
 				{
 					"name":     "resource/cpu",
 					"value": {
-						"limit": 100,
-						"request": 100
+						"limit": 0,
+						"request": 0
 						}
 				}`),
 			}),
 
-			defaultMem,
-			100,
+			0,
+			0,
+		},
+		{
+			types.Isolators([]types.Isolator{
+				newIsolator(`
+				{
+					"name":     "resource/cpu",
+					"value": {
+						"limit": 1,
+						"request": 1
+						}
+				}`),
+			}),
+
+			0,
+			1,
+		},
+		{
+			// 1M test
+			types.Isolators([]types.Isolator{
+				newIsolator(`
+				{
+					"name":     "resource/memory",
+					"value": {
+						"limit": 1048576,
+						"request": 1048576
+						}
+				}`),
+			}),
+
+			1,
+			0,
+		},
+		{
+			// 128M test
+			types.Isolators([]types.Isolator{
+				newIsolator(`
+				{
+					"name":     "resource/memory",
+					"value": {
+						"limit": 134217728,
+						"request": 134217728
+						}
+				}`),
+			}),
+
+			128,
+			0,
 		},
 	}
 

From 45746e9eb049fdad26bf0e6ae62881c71f3f6e7e Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <james.o.hunt@intel.com>
Date: Wed, 14 Dec 2016 15:11:04 +0000
Subject: [PATCH 1050/1304] stage1: Ensure ptmx device usable by non-root for
 all flavours.

kvm-based stage1 flavours previously used a sym-link from /dev/ptmx to
/dev/pts/ptmx. However, the VM-based stage1's /dev/pts/ptmx device has
perms 000 meaning that non-root users could not access the device.

Determine if /dev/ptmx (or it's link target) is usable by all users and
if not recreate the device.

Fixes #3252.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
---
 stage1/init/common/units.go      |  4 +-
 stage1/prepare-app/prepare-app.c | 83 +++++++++++++++++++++++++++++---
 2 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 47fc8052f5..8e3d8d6def 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -72,7 +72,7 @@ func MutableEnv(p *stage1commontypes.Pod) error {
 		unit.NewUnitOption("Service", "ExecStart", "/prepare-app %I"),
 		unit.NewUnitOption("Service", "User", "0"),
 		unit.NewUnitOption("Service", "Group", "0"),
-		unit.NewUnitOption("Service", "CapabilityBoundingSet", "CAP_SYS_ADMIN CAP_DAC_OVERRIDE"),
+		unit.NewUnitOption("Service", "CapabilityBoundingSet", "CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_MKNOD"),
 	)
 
 	w.WriteUnit(
@@ -132,7 +132,7 @@ func ImmutableEnv(p *stage1commontypes.Pod) error {
 		unit.NewUnitOption("Service", "ExecStart", "/prepare-app %I"),
 		unit.NewUnitOption("Service", "User", "0"),
 		unit.NewUnitOption("Service", "Group", "0"),
-		unit.NewUnitOption("Service", "CapabilityBoundingSet", "CAP_SYS_ADMIN CAP_DAC_OVERRIDE"),
+		unit.NewUnitOption("Service", "CapabilityBoundingSet", "CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_MKNOD"),
 	)
 
 	uw.WriteUnit(
diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 466ab1a488..b8c403aa62 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -61,6 +61,10 @@ static int exit_err;
 #define CGROUP2_SUPER_MAGIC 0x63677270
 #endif
 
+/* permission masks */
+#define WORLD_READABLE          0444
+#define WORLD_WRITABLE          0222
+
 typedef struct _dir_op_t {
 	const char	*name;
 	mode_t		mode;
@@ -220,12 +224,50 @@ static void copy_volume_symlinks()
 	}
 }
 
+/* Determine if the specified ptmx device (or symlink to a device)
+ * is usable by all users.
+ *
+ * dirfd: Open file descriptor of a root directory.
+ * path: Relative path to ptmx device below the path specified by dirfd.
+ *
+ * Returns true on success, else false.
+ */
+bool
+ptmx_device_usable (int dirfd, const char *path)
+{
+	struct stat st;
+	int perms;
+	bool world_readable, world_writable;
+	bool is_char;
+	bool dev_type;
+	dev_t expected_dev;
+
+	if (dirfd < 0 || ! path) {
+		return false;
+	}
+
+	expected_dev = makedev(5, 2);
+
+	if (fstatat (dirfd, path, &st, 0) < 0) {
+		return false;
+	}
+
+	is_char = S_ISCHR (st.st_mode);
+	dev_type = (expected_dev == st.st_rdev);
+
+	perms = (st.st_mode & ACCESSPERMS);
+
+	world_readable = (perms & WORLD_READABLE) == WORLD_READABLE;
+	world_writable = (perms & WORLD_WRITABLE) == WORLD_WRITABLE;
+
+	return (is_char && dev_type && world_readable && world_writable);
+}
+
 int main(int argc, char *argv[])
 {
 	static const char *unlink_paths[] = {
 		"dev/shm",
-		"dev/ptmx",
-		NULL
+		 NULL
 	};
 	static const dir_op_t dirs[] = {
 		dir("dev",	0755),
@@ -270,6 +312,7 @@ int main(int argc, char *argv[])
 	int rootfd;
 	char to[4096];
 	int i;
+	bool ptmx_usable, pts_ptmx_usable;
 
 	exit_if(argc < 2,
 		"Usage: %s /path/to/root", argv[0]);
@@ -384,11 +427,37 @@ int main(int argc, char *argv[])
 				"Mounting \"%s\" on \"%s\" failed", mnt->source, to);
 	}
 
-	/* /dev/ptmx -> /dev/pts/ptmx */
-	exit_if(snprintf(to, sizeof(to), "%s/dev/ptmx", root) >= sizeof(to),
-		"Path too long: \"%s\"", to);
-	pexit_if(symlink("/dev/pts/ptmx", to) == -1 && errno != EEXIST,
-		"Failed to create /dev/ptmx symlink");
+	/* Now that all mounts have been handled, reopen the root
+	 * directory to special-case the handling of ptmx devices.
+	 */
+	rootfd = open(root, O_DIRECTORY | O_CLOEXEC);
+	pexit_if(rootfd < 0,
+		"Failed to open directory \"%s\"", root);
+
+	ptmx_usable = ptmx_device_usable (rootfd, "dev/ptmx");
+	pts_ptmx_usable = ptmx_device_usable (rootfd, "dev/pts/ptmx");
+
+	if (pts_ptmx_usable) {
+		if (! ptmx_usable) {
+			pexit_if(unlinkat(rootfd, "dev/ptmx", 0) != 0
+					&& errno != ENOENT,
+					"Failed to unlink \"%s\"", "dev/ptmx");
+			pexit_if(symlinkat("/dev/pts/ptmx", rootfd, "dev/ptmx") == -1,
+					"Failed to create /dev/ptmx symlink");
+		}
+	} else {
+		if (! ptmx_usable) {
+			int perms = (WORLD_READABLE + WORLD_WRITABLE);
+
+			pexit_if(unlinkat(rootfd, "dev/ptmx", 0) != 0
+					&& errno != ENOENT,
+					"Failed to unlink \"%s\"", "dev/ptmx");
+			pexit_if(mknodat (rootfd, "dev/ptmx", (S_IFCHR|perms), makedev (5, 2)) < 0,
+					"Failed to create device: \"%s\"", "dev/ptmx");
+		}
+	}
+
+	close(rootfd);
 
 	/* Copy symlinks to device node volumes to "/dev/.rkt" so they can be
 	 * used in the DeviceAllow= option of the app's unit file (systemd

From 8e64062dfe7ffe8ab56c562a681cbf84d3891979 Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <james.o.hunt@intel.com>
Date: Thu, 5 Jan 2017 08:57:22 +0000
Subject: [PATCH 1051/1304] tests: Allow output tests to specify a regular
 expression.

Added an extra parameter to runRktAsUidGidAndCheckOutput() to specify
whether the expected string provided is a literal or a regular
expression.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
---
 tests/rkt_non_root_test.go      |  6 +++---
 tests/rkt_root_commands_test.go |  2 +-
 tests/rkt_tests.go              | 19 +++++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index 579442499d..f6c0673fc5 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -119,12 +119,12 @@ func TestNonRootFetchRmGCImage(t *testing.T) {
 	// We can't touch the treestores even as members of the rkt group.
 	imgGCCmd := fmt.Sprintf("%s image gc", ctx.Cmd())
 	t.Logf("Running %s", imgGCCmd)
-	runRktAsUidGidAndCheckOutput(t, imgGCCmd, "permission denied", true, uid, rktGid)
+	runRktAsUidGidAndCheckOutput(t, imgGCCmd, "permission denied", false, true, uid, rktGid)
 
 	// Should be able to remove the image fetched by root since we're in the rkt group.
 	imgRmCmd := fmt.Sprintf("%s image rm %s", ctx.Cmd(), rootImgHash)
 	t.Logf("Running %s", imgRmCmd)
-	runRktAsUidGidAndCheckOutput(t, imgRmCmd, "successfully removed", false, uid, rktGid)
+	runRktAsUidGidAndCheckOutput(t, imgRmCmd, "successfully removed", false, false, uid, rktGid)
 
 	// Should be able to remove the image fetched by ourselves.
 	nonrootImg := patchTestACI("rkt-inspect-non-root-rm.aci", "--exec=/inspect")
@@ -136,5 +136,5 @@ func TestNonRootFetchRmGCImage(t *testing.T) {
 
 	imgRmCmd = fmt.Sprintf("%s image rm %s", ctx.Cmd(), nonrootImgHash)
 	t.Logf("Running %s", imgRmCmd)
-	runRktAsUidGidAndCheckOutput(t, imgRmCmd, "successfully removed", false, uid, rktGid)
+	runRktAsUidGidAndCheckOutput(t, imgRmCmd, "successfully removed", false, false, uid, rktGid)
 }
diff --git a/tests/rkt_root_commands_test.go b/tests/rkt_root_commands_test.go
index 527ec06d4b..805cda11a4 100644
--- a/tests/rkt_root_commands_test.go
+++ b/tests/rkt_root_commands_test.go
@@ -43,6 +43,6 @@ func TestCommandsNeedRoot(t *testing.T) {
 	defer ctx.Cleanup()
 	for _, sc := range rootRequiringCommands {
 		cmd := fmt.Sprintf("%s %s", ctx.Cmd(), sc)
-		runRktAsUidGidAndCheckOutput(t, cmd, "cannot run as unprivileged user", true, uid, gid)
+		runRktAsUidGidAndCheckOutput(t, cmd, "cannot run as unprivileged user", false, true, uid, gid)
 	}
 }
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 2b406c755c..47c332b74d 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -370,10 +370,15 @@ func runRktAndGetUUID(t *testing.T, rktCmd string) string {
 
 func runRktAsGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, expectError bool, gid int) {
 	nobodyUid, _ := testutils.GetUnprivilegedUidGid()
-	runRktAsUidGidAndCheckOutput(t, rktCmd, expectedLine, expectError, nobodyUid, gid)
+	runRktAsUidGidAndCheckOutput(t, rktCmd, expectedLine, false, expectError, nobodyUid, gid)
 }
 
-func runRktAsUidGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, expectError bool, uid, gid int) {
+func runRktAsGidAndCheckREOutput(t *testing.T, rktCmd, expectedLine string, expectError bool, gid int) {
+	nobodyUid, _ := testutils.GetUnprivilegedUidGid()
+	runRktAsUidGidAndCheckOutput(t, rktCmd, expectedLine, true, expectError, nobodyUid, gid)
+}
+
+func runRktAsUidGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, lineIsRegex, expectError bool, uid, gid int) {
 	child, err := gexpect.Command(rktCmd)
 	if err != nil {
 		t.Fatalf("cannot exec rkt: %v", err)
@@ -394,8 +399,14 @@ func runRktAsUidGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, exp
 	defer waitOrFail(t, child, expectedStatus)
 
 	if expectedLine != "" {
-		if err := expectWithOutput(child, expectedLine); err != nil {
-			t.Fatalf("didn't receive expected output %q: %v", expectedLine, err)
+		if lineIsRegex == true {
+			_, _, err = expectRegexWithOutput(child, expectedLine)
+		} else {
+			err = expectWithOutput(child, expectedLine)
+		}
+
+		if err != nil {
+			t.Fatalf("didn't receive expected output %q (regex=%v): %v", expectedLine, lineIsRegex, err)
 		}
 	}
 }

From 61f0fc860d7575aba86f6cae4cb9cd447556ad1c Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <james.o.hunt@intel.com>
Date: Thu, 5 Jan 2017 11:49:19 +0000
Subject: [PATCH 1052/1304] tests: Show output collected by expect on regex
 failure.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
---
 tests/rkt_tests.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 47c332b74d..1f3cd734c1 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -400,14 +400,17 @@ func runRktAsUidGidAndCheckOutput(t *testing.T, rktCmd, expectedLine string, lin
 
 	if expectedLine != "" {
 		if lineIsRegex == true {
-			_, _, err = expectRegexWithOutput(child, expectedLine)
+			_, _, err := expectRegexWithOutput(child, expectedLine)
+			if err != nil {
+				t.Fatalf("didn't receive expected regex %q in output: %v", expectedLine, err)
+			}
 		} else {
 			err = expectWithOutput(child, expectedLine)
+			if err != nil {
+				t.Fatalf("didn't receive expected output %q: %v", expectedLine, err)
+			}
 		}
 
-		if err != nil {
-			t.Fatalf("didn't receive expected output %q (regex=%v): %v", expectedLine, lineIsRegex, err)
-		}
 	}
 }
 

From 79df37d352b7fdf8c3f31b6465f5a87a8149321e Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <james.o.hunt@intel.com>
Date: Thu, 5 Jan 2017 08:59:33 +0000
Subject: [PATCH 1053/1304] Tests: Added TestDevPathsStat() to check details of
 pty devices.

The new test supports the fix for #3252 by making assertions about the
pseudoterminal devices.

Change required renaming TestPathsStat() to TestProcPathsStat().

Also added helper functions runRktAsGidAndCheckREOutput() and
runRktAndCheckREOutput().

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
---
 tests/rkt_paths_test.go | 63 +++++++++++++++++++++++++++++++++++++++--
 tests/rkt_tests.go      |  4 +++
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/tests/rkt_paths_test.go b/tests/rkt_paths_test.go
index c207b152a6..6c1d19f4ee 100644
--- a/tests/rkt_paths_test.go
+++ b/tests/rkt_paths_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build coreos src
+// +build coreos src kvm
 
 package main
 
@@ -27,6 +27,10 @@ import (
 // TestPathsWrite checks whether access to paths like /proc/sysrq-trigger are
 // restricted
 func TestPathsWrite(t *testing.T) {
+	if TestedFlavor.Kvm == true {
+		t.Skip("Not running test for kvm flavour")
+	}
+
 	imageFile := patchTestACI("rkt-inspect-paths.aci",
 		"--exec=/inspect --write-file --print-msg=testing-insecure-option")
 	defer os.Remove(imageFile)
@@ -84,25 +88,32 @@ func TestPathsWrite(t *testing.T) {
 	}
 }
 
-// TestPathsStat checks that access to inaccessible paths under
+// TestProcPathsStat checks that access to inaccessible paths under
 // /proc or /sys is correctly restricted:
 // https://github.com/coreos/rkt/issues/2484
-func TestPathsStat(t *testing.T) {
+func TestProcPathsStat(t *testing.T) {
 	tests := []struct {
 		Path         string
 		ExpectedMode string
+		SkipUnderKvm bool
 	}{
 		{
 			Path:         "/sys/firmware",
 			ExpectedMode: "d---------",
+			SkipUnderKvm: false,
 		},
 		{
 			Path:         "/proc/kcore",
 			ExpectedMode: "----------",
+			SkipUnderKvm: true,
 		},
 	}
 
 	for _, tt := range tests {
+		if TestedFlavor.Kvm == true && tt.SkipUnderKvm == true {
+			t.Skip("Not running test for kvm flavour")
+		}
+
 		hiddenImage := patchTestACI("rkt-inspect-stat-procfs.aci", fmt.Sprintf("--exec=/inspect --stat-file --file-name %s", tt.Path))
 		defer os.Remove(hiddenImage)
 
@@ -120,3 +131,49 @@ func TestPathsStat(t *testing.T) {
 		runRktAndCheckOutput(t, hiddenCmd, hiddenExpectedLine, false)
 	}
 }
+
+// TestDevPathsStat checks that particular devices have been created as
+// expected.
+func TestDevPathsStat(t *testing.T) {
+	tests := []struct {
+		Path          string
+		ExpectedMode  string
+		ExpectedOwner int
+		ExpectedGroup int
+	}{
+		{
+			Path:          "/dev/ptmx",
+			ExpectedMode:  "Dcrw-rw-rw-",
+			ExpectedOwner: 0,
+			ExpectedGroup: 0,
+		},
+	}
+
+	for _, tt := range tests {
+		hiddenImage := patchTestACI("rkt-inspect-stat-devices.aci", fmt.Sprintf("--exec=/inspect --stat-file --file-name %s", tt.Path))
+		defer os.Remove(hiddenImage)
+
+		hiddenCtx := testutils.NewRktRunCtx()
+		defer hiddenCtx.Cleanup()
+
+		//run
+		hiddenCmd := fmt.Sprintf("%s --debug --insecure-options=image run %s", hiddenCtx.Cmd(), hiddenImage)
+
+		lines := ""
+		lines += fmt.Sprintf("%s: mode: %s.*", tt.Path, tt.ExpectedMode)
+		lines += fmt.Sprintf("%s: user: %d.*", tt.Path, tt.ExpectedOwner)
+		lines += fmt.Sprintf("%s: group: %d.*", tt.Path, tt.ExpectedGroup)
+
+		// enable multi-line matching and search for all substrings
+		hiddenExpectedLines := fmt.Sprintf("(?s:.*%s)", lines)
+
+		runRktAndCheckREOutput(t, hiddenCmd, hiddenExpectedLines, false)
+
+		// run-prepared
+		hiddenCmd = fmt.Sprintf(`%s --insecure-options=image prepare %s`, hiddenCtx.Cmd(), hiddenImage)
+		uuid := runRktAndGetUUID(t, hiddenCmd)
+		hiddenCmd = fmt.Sprintf("%s --debug run-prepared --mds-register=false %s", hiddenCtx.Cmd(), uuid)
+
+		runRktAndCheckREOutput(t, hiddenCmd, hiddenExpectedLines, false)
+	}
+}
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 1f3cd734c1..00e3b18736 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -514,6 +514,10 @@ func runRktAndCheckOutput(t *testing.T, rktCmd, expectedLine string, expectError
 	runRktAsGidAndCheckOutput(t, rktCmd, expectedLine, expectError, 0)
 }
 
+func runRktAndCheckREOutput(t *testing.T, rktCmd, expectedLine string, expectError bool) {
+	runRktAsGidAndCheckREOutput(t, rktCmd, expectedLine, expectError, 0)
+}
+
 func startRktAndCheckOutput(t *testing.T, rktCmd, expectedLine string) *gexpect.ExpectSubprocess {
 	return startRktAsGidAndCheckOutput(t, rktCmd, expectedLine, 0)
 }

From 8bad56655b75a2d34f406d793bee531342606416 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 7 Feb 2017 18:56:18 +0000
Subject: [PATCH 1054/1304] tests: fix TestNonRootReadInfo when $HOME is only
 accessible by current user

This is a follow-up for 60dfa77a52e8040ec
---
 tests/rkt_non_root_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index 579442499d..98546f9d61 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -38,7 +38,9 @@ func TestNonRootReadInfo(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
-	gid, err := common.LookupGid(common.RktGroup)
+	uid, _ := ctx.GetUidGidRktBinOwnerNotRoot()
+
+	rktGid, err := common.LookupGid(common.RktGroup)
 	if err != nil {
 		t.Skipf("Skipping the test because there's no %q group", common.RktGroup)
 	}
@@ -82,7 +84,7 @@ func TestNonRootReadInfo(t *testing.T) {
 
 	imgListCmd := fmt.Sprintf("%s image list", ctx.Cmd())
 	t.Logf("Running %s", imgListCmd)
-	runRktAsGidAndCheckOutput(t, imgListCmd, "inspect-", false, gid)
+	runRktAsUidGidAndCheckOutput(t, imgListCmd, "inspect-", false, uid, rktGid)
 }
 
 // TestNonRootFetchRmGCImage tests that non-root users can remove all images but

From f22e61b99141f83ad53a06581c0bddd292690115 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 9 Feb 2017 13:52:03 -0800
Subject: [PATCH 1055/1304] glide: bump grpc/protobuf

---
 glide.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/glide.yaml b/glide.yaml
index d7e409fbfc..a1c588e7b0 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -147,7 +147,7 @@ import:
   subpackages:
   - proto
 - package: github.com/golang/protobuf
-  version: c3cefd437628a0b7d31b34fe44b3a7a540e98527
+  version: 8ee79997227bf9b34611aee7946ae64735e6fd93
   subpackages:
   - proto
   - protoc-gen-go
@@ -242,7 +242,7 @@ import:
   subpackages:
   - go/vcs
 - package: google.golang.org/grpc
-  version: 02fca896ff5f50c6bbbee0860345a49344b37a03
+  version: v1.0.5
   subpackages:
   - codes
   - credentials

From 89a0d9ddc98f7072c13f95184afcf18ba756abac Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 9 Feb 2017 13:52:22 -0800
Subject: [PATCH 1056/1304] glide: vendor grpc/protobuf

---
 glide.lock                                    |   8 +-
 .../golang/protobuf/proto/decode.go           | 112 ++++-
 .../golang/protobuf/proto/encode.go           |  25 +-
 .../github.com/golang/protobuf/proto/equal.go |   8 +-
 .../golang/protobuf/proto/extensions.go       |   1 +
 .../github.com/golang/protobuf/proto/lib.go   |   2 +-
 .../golang/protobuf/proto/properties.go       |  10 +-
 .../golang/protobuf/proto/text_parser.go      |  12 +-
 .../protoc-gen-go/descriptor/descriptor.pb.go | 309 ++++++------
 .../protoc-gen-go/generator/generator.go      |  14 +-
 .../protobuf/protoc-gen-go/grpc/grpc.go       |   4 +-
 vendor/google.golang.org/grpc/backoff.go      |   2 +-
 vendor/google.golang.org/grpc/balancer.go     |  23 +-
 vendor/google.golang.org/grpc/call.go         | 101 +++-
 vendor/google.golang.org/grpc/clientconn.go   | 443 ++++++++++++------
 .../grpc/credentials/credentials.go           | 102 ++--
 .../grpc/credentials/credentials_util_go17.go |  76 +++
 .../credentials/credentials_util_pre_go17.go  |  74 +++
 vendor/google.golang.org/grpc/interceptor.go  |  16 +
 .../grpc/metadata/metadata.go                 |  29 +-
 vendor/google.golang.org/grpc/rpc_util.go     |  56 ++-
 vendor/google.golang.org/grpc/server.go       | 312 +++++++++---
 .../google.golang.org/grpc/stats/handlers.go  | 152 ++++++
 vendor/google.golang.org/grpc/stats/stats.go  | 223 +++++++++
 vendor/google.golang.org/grpc/stream.go       | 250 +++++++---
 vendor/google.golang.org/grpc/tap/tap.go      |  54 +++
 .../grpc/transport/control.go                 |  39 +-
 .../google.golang.org/grpc/transport/go16.go  |  46 ++
 .../google.golang.org/grpc/transport/go17.go  |  46 ++
 .../grpc/transport/handler_server.go          |  14 +-
 .../grpc/transport/http2_client.go            | 375 +++++++++++----
 .../grpc/transport/http2_server.go            | 200 +++++---
 .../grpc/transport/http_util.go               |  94 +++-
 .../grpc/transport/pre_go16.go                |  51 ++
 .../grpc/transport/transport.go               | 169 +++++--
 35 files changed, 2679 insertions(+), 773 deletions(-)
 create mode 100644 vendor/google.golang.org/grpc/credentials/credentials_util_go17.go
 create mode 100644 vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go
 create mode 100644 vendor/google.golang.org/grpc/stats/handlers.go
 create mode 100644 vendor/google.golang.org/grpc/stats/stats.go
 create mode 100644 vendor/google.golang.org/grpc/tap/tap.go
 create mode 100644 vendor/google.golang.org/grpc/transport/go16.go
 create mode 100644 vendor/google.golang.org/grpc/transport/go17.go
 create mode 100644 vendor/google.golang.org/grpc/transport/pre_go16.go

diff --git a/glide.lock b/glide.lock
index 103e3ba5d3..21c8135dde 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: ab29310f45cc4931a6769b71ce4968a2d49581c0ded1e116f4719b4c09648f22
-updated: 2017-02-01T15:08:20.265780035+01:00
+hash: bb1e09a77900796205fe212186f97cdb3fea30edb8161fc27d1eec71b236472e
+updated: 2017-02-09T13:51:00.832051936-08:00
 imports:
 - name: github.com/appc/docker2aci
   version: cfd196b05e02185b34aa3a844eff07b943c7e3ec
@@ -154,7 +154,7 @@ imports:
   subpackages:
   - proto
 - name: github.com/golang/protobuf
-  version: c3cefd437628a0b7d31b34fe44b3a7a540e98527
+  version: 8ee79997227bf9b34611aee7946ae64735e6fd93
   subpackages:
   - proto
   - protoc-gen-go
@@ -286,7 +286,7 @@ imports:
   subpackages:
   - go/vcs
 - name: google.golang.org/grpc
-  version: 02fca896ff5f50c6bbbee0860345a49344b37a03
+  version: 708a7f9f3283aa2d4f6132d287d78683babe55c8
   subpackages:
   - codes
   - credentials
diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go
index 04dcb88130..aa207298f9 100644
--- a/vendor/github.com/golang/protobuf/proto/decode.go
+++ b/vendor/github.com/golang/protobuf/proto/decode.go
@@ -61,7 +61,6 @@ var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for
 // int32, int64, uint32, uint64, bool, and enum
 // protocol buffer types.
 func DecodeVarint(buf []byte) (x uint64, n int) {
-	// x, n already 0
 	for shift := uint(0); shift < 64; shift += 7 {
 		if n >= len(buf) {
 			return 0, 0
@@ -78,13 +77,7 @@ func DecodeVarint(buf []byte) (x uint64, n int) {
 	return 0, 0
 }
 
-// DecodeVarint reads a varint-encoded integer from the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) DecodeVarint() (x uint64, err error) {
-	// x, err already 0
-
+func (p *Buffer) decodeVarintSlow() (x uint64, err error) {
 	i := p.index
 	l := len(p.buf)
 
@@ -107,6 +100,107 @@ func (p *Buffer) DecodeVarint() (x uint64, err error) {
 	return
 }
 
+// DecodeVarint reads a varint-encoded integer from the Buffer.
+// This is the format for the
+// int32, int64, uint32, uint64, bool, and enum
+// protocol buffer types.
+func (p *Buffer) DecodeVarint() (x uint64, err error) {
+	i := p.index
+	buf := p.buf
+
+	if i >= len(buf) {
+		return 0, io.ErrUnexpectedEOF
+	} else if buf[i] < 0x80 {
+		p.index++
+		return uint64(buf[i]), nil
+	} else if len(buf)-i < 10 {
+		return p.decodeVarintSlow()
+	}
+
+	var b uint64
+	// we already checked the first byte
+	x = uint64(buf[i]) - 0x80
+	i++
+
+	b = uint64(buf[i])
+	i++
+	x += b << 7
+	if b&0x80 == 0 {
+		goto done
+	}
+	x -= 0x80 << 7
+
+	b = uint64(buf[i])
+	i++
+	x += b << 14
+	if b&0x80 == 0 {
+		goto done
+	}
+	x -= 0x80 << 14
+
+	b = uint64(buf[i])
+	i++
+	x += b << 21
+	if b&0x80 == 0 {
+		goto done
+	}
+	x -= 0x80 << 21
+
+	b = uint64(buf[i])
+	i++
+	x += b << 28
+	if b&0x80 == 0 {
+		goto done
+	}
+	x -= 0x80 << 28
+
+	b = uint64(buf[i])
+	i++
+	x += b << 35
+	if b&0x80 == 0 {
+		goto done
+	}
+	x -= 0x80 << 35
+
+	b = uint64(buf[i])
+	i++
+	x += b << 42
+	if b&0x80 == 0 {
+		goto done
+	}
+	x -= 0x80 << 42
+
+	b = uint64(buf[i])
+	i++
+	x += b << 49
+	if b&0x80 == 0 {
+		goto done
+	}
+	x -= 0x80 << 49
+
+	b = uint64(buf[i])
+	i++
+	x += b << 56
+	if b&0x80 == 0 {
+		goto done
+	}
+	x -= 0x80 << 56
+
+	b = uint64(buf[i])
+	i++
+	x += b << 63
+	if b&0x80 == 0 {
+		goto done
+	}
+	// x -= 0x80 << 63 // Always zero.
+
+	return 0, errOverflow
+
+done:
+	p.index = i
+	return x, nil
+}
+
 // DecodeFixed64 reads a 64-bit integer from the Buffer.
 // This is the format for the
 // fixed64, sfixed64, and double protocol buffer types.
@@ -340,6 +434,8 @@ func (p *Buffer) DecodeGroup(pb Message) error {
 // Buffer and places the decoded result in pb.  If the struct
 // underlying pb does not match the data in the buffer, the results can be
 // unpredictable.
+//
+// Unlike proto.Unmarshal, this does not reset pb before starting to unmarshal.
 func (p *Buffer) Unmarshal(pb Message) error {
 	// If the object can unmarshal itself, let it.
 	if u, ok := pb.(Unmarshaler); ok {
diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go
index 8c1b8fd1f6..2b30f84626 100644
--- a/vendor/github.com/golang/protobuf/proto/encode.go
+++ b/vendor/github.com/golang/protobuf/proto/encode.go
@@ -234,10 +234,6 @@ func Marshal(pb Message) ([]byte, error) {
 	}
 	p := NewBuffer(nil)
 	err := p.Marshal(pb)
-	var state errorState
-	if err != nil && !state.shouldContinue(err, nil) {
-		return nil, err
-	}
 	if p.buf == nil && err == nil {
 		// Return a non-nil slice on success.
 		return []byte{}, nil
@@ -266,11 +262,8 @@ func (p *Buffer) Marshal(pb Message) error {
 	// Can the object marshal itself?
 	if m, ok := pb.(Marshaler); ok {
 		data, err := m.Marshal()
-		if err != nil {
-			return err
-		}
 		p.buf = append(p.buf, data...)
-		return nil
+		return err
 	}
 
 	t, base, err := getbase(pb)
@@ -282,7 +275,7 @@ func (p *Buffer) Marshal(pb Message) error {
 	}
 
 	if collectStats {
-		stats.Encode++
+		(stats).Encode++ // Parens are to work around a goimports bug.
 	}
 
 	if len(p.buf) > maxMarshalSize {
@@ -309,7 +302,7 @@ func Size(pb Message) (n int) {
 	}
 
 	if collectStats {
-		stats.Size++
+		(stats).Size++ // Parens are to work around a goimports bug.
 	}
 
 	return
@@ -1014,7 +1007,6 @@ func size_slice_struct_message(p *Properties, base structPointer) (n int) {
 		if p.isMarshaler {
 			m := structPointer_Interface(structp, p.stype).(Marshaler)
 			data, _ := m.Marshal()
-			n += len(p.tagcode)
 			n += sizeRawBytes(data)
 			continue
 		}
@@ -1083,10 +1075,17 @@ func (o *Buffer) enc_map(p *Properties, base structPointer) error {
 
 func (o *Buffer) enc_exts(p *Properties, base structPointer) error {
 	exts := structPointer_Extensions(base, p.field)
-	if err := encodeExtensions(exts); err != nil {
+
+	v, mu := exts.extensionsRead()
+	if v == nil {
+		return nil
+	}
+
+	mu.Lock()
+	defer mu.Unlock()
+	if err := encodeExtensionsMap(v); err != nil {
 		return err
 	}
-	v, _ := exts.extensionsRead()
 
 	return o.enc_map_body(v)
 }
diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go
index 8b16f951c7..2ed1cf5966 100644
--- a/vendor/github.com/golang/protobuf/proto/equal.go
+++ b/vendor/github.com/golang/protobuf/proto/equal.go
@@ -54,13 +54,17 @@ Equality is defined in this way:
     in a proto3 .proto file, fields are not "set"; specifically,
     zero length proto3 "bytes" fields are equal (nil == {}).
   - Two repeated fields are equal iff their lengths are the same,
-    and their corresponding elements are equal (a "bytes" field,
-    although represented by []byte, is not a repeated field)
+    and their corresponding elements are equal. Note a "bytes" field,
+    although represented by []byte, is not a repeated field and the
+    rule for the scalar fields described above applies.
   - Two unset fields are equal.
   - Two unknown field sets are equal if their current
     encoded state is equal.
   - Two extension sets are equal iff they have corresponding
     elements that are pairwise equal.
+  - Two map fields are equal iff their lengths are the same,
+    and they contain the same set of elements. Zero-length map
+    fields are equal.
   - Every other combination of things are not equal.
 
 The return value is undefined if a and b are not protocol buffers.
diff --git a/vendor/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go
index 6b9b363746..eaad218312 100644
--- a/vendor/github.com/golang/protobuf/proto/extensions.go
+++ b/vendor/github.com/golang/protobuf/proto/extensions.go
@@ -154,6 +154,7 @@ type ExtensionDesc struct {
 	Field         int32       // field number
 	Name          string      // fully-qualified name of extension, for text formatting
 	Tag           string      // protobuf tag style
+	Filename      string      // name of the file in which the extension is defined
 }
 
 func (ed *ExtensionDesc) repeated() bool {
diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go
index 170b8e87d2..ac4ddbc075 100644
--- a/vendor/github.com/golang/protobuf/proto/lib.go
+++ b/vendor/github.com/golang/protobuf/proto/lib.go
@@ -308,7 +308,7 @@ func GetStats() Stats { return stats }
 // temporary Buffer and are fine for most applications.
 type Buffer struct {
 	buf   []byte // encode/decode byte stream
-	index int    // write point
+	index int    // read point
 
 	// pools of basic types to amortize allocation.
 	bools   []bool
diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go
index 69ddda8d4b..ec2289c005 100644
--- a/vendor/github.com/golang/protobuf/proto/properties.go
+++ b/vendor/github.com/golang/protobuf/proto/properties.go
@@ -844,7 +844,15 @@ func RegisterType(x Message, name string) {
 }
 
 // MessageName returns the fully-qualified proto name for the given message type.
-func MessageName(x Message) string { return revProtoTypes[reflect.TypeOf(x)] }
+func MessageName(x Message) string {
+	type xname interface {
+		XXX_MessageName() string
+	}
+	if m, ok := x.(xname); ok {
+		return m.XXX_MessageName()
+	}
+	return revProtoTypes[reflect.TypeOf(x)]
+}
 
 // MessageType returns the message type (pointer to struct) for a named message.
 func MessageType(name string) reflect.Type { return protoTypes[name] }
diff --git a/vendor/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go
index 7e6f145a10..61f83c1e10 100644
--- a/vendor/github.com/golang/protobuf/proto/text_parser.go
+++ b/vendor/github.com/golang/protobuf/proto/text_parser.go
@@ -592,7 +592,11 @@ func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
 			props = oop.Prop
 			nv := reflect.New(oop.Type.Elem())
 			dst = nv.Elem().Field(0)
-			sv.Field(oop.Field).Set(nv)
+			field := sv.Field(oop.Field)
+			if !field.IsNil() {
+				return p.errorf("field '%s' would overwrite already parsed oneof '%s'", name, sv.Type().Field(oop.Field).Name)
+			}
+			field.Set(nv)
 		}
 		if !dst.IsValid() {
 			return p.errorf("unknown field name %q in %v", name, st)
@@ -792,12 +796,12 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) error {
 		fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
 		return p.readAny(fv.Index(fv.Len()-1), props)
 	case reflect.Bool:
-		// Either "true", "false", 1 or 0.
+		// true/1/t/True or false/f/0/False.
 		switch tok.value {
-		case "true", "1":
+		case "true", "1", "t", "True":
 			fv.SetBool(true)
 			return nil
-		case "false", "0":
+		case "false", "0", "f", "False":
 			fv.SetBool(false)
 			return nil
 		}
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
index 2e06cb3a9e..a1d8a764f2 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
@@ -900,19 +900,8 @@ type FileOptions struct {
 	// generated to contain the file's getDescriptor() method as well as any
 	// top-level extensions defined in the file.
 	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,json=javaMultipleFiles,def=0" json:"java_multiple_files,omitempty"`
-	// If set true, then the Java code generator will generate equals() and
-	// hashCode() methods for all messages defined in the .proto file.
-	// This increases generated code size, potentially substantially for large
-	// protos, which may harm a memory-constrained application.
-	// - In the full runtime this is a speed optimization, as the
-	// AbstractMessage base class includes reflection-based implementations of
-	// these methods.
-	// - In the lite runtime, setting this option changes the semantics of
-	// equals() and hashCode() to more closely match those of the full runtime;
-	// the generated methods compute their results based on field values rather
-	// than object identity. (Implementations should not assume that hashcodes
-	// will be consistent across runtimes or versions of the protocol compiler.)
-	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,json=javaGenerateEqualsAndHash,def=0" json:"java_generate_equals_and_hash,omitempty"`
+	// This option does nothing.
+	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,json=javaGenerateEqualsAndHash" json:"java_generate_equals_and_hash,omitempty"`
 	// If set true, then the Java2 code generator will generate code that
 	// throws an exception whenever an attempt is made to assign a non-UTF-8
 	// byte sequence to a string field.
@@ -973,7 +962,6 @@ func (*FileOptions) ExtensionRangeArray() []proto.ExtensionRange {
 }
 
 const Default_FileOptions_JavaMultipleFiles bool = false
-const Default_FileOptions_JavaGenerateEqualsAndHash bool = false
 const Default_FileOptions_JavaStringCheckUtf8 bool = false
 const Default_FileOptions_OptimizeFor FileOptions_OptimizeMode = FileOptions_SPEED
 const Default_FileOptions_CcGenericServices bool = false
@@ -1007,7 +995,7 @@ func (m *FileOptions) GetJavaGenerateEqualsAndHash() bool {
 	if m != nil && m.JavaGenerateEqualsAndHash != nil {
 		return *m.JavaGenerateEqualsAndHash
 	}
-	return Default_FileOptions_JavaGenerateEqualsAndHash
+	return false
 }
 
 func (m *FileOptions) GetJavaStringCheckUtf8() bool {
@@ -1237,7 +1225,7 @@ type FieldOptions struct {
 	//
 	//
 	// Note that implementations may choose not to check required fields within
-	// a lazy sub-message.  That is, calling IsInitialized() on the outher message
+	// a lazy sub-message.  That is, calling IsInitialized() on the outer message
 	// may return true even if the inner message has missing required fields.
 	// This is necessary because otherwise the inner message would have to be
 	// parsed in order to perform the check, defeating the purpose of lazy
@@ -1929,148 +1917,149 @@ func init() {
 func init() { proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 2287 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x73, 0xdb, 0xc6,
-	0x15, 0x0f, 0xf8, 0x25, 0xf2, 0x91, 0xa2, 0x56, 0x2b, 0xc5, 0x86, 0xe5, 0x38, 0x96, 0x19, 0x3b,
-	0x96, 0xed, 0x96, 0xce, 0xc8, 0x1f, 0x71, 0x94, 0x4e, 0x3a, 0x94, 0x08, 0x2b, 0xf4, 0x50, 0x22,
-	0x0b, 0x4a, 0xad, 0x93, 0x1e, 0x30, 0x2b, 0x60, 0x49, 0xc1, 0x06, 0x17, 0x28, 0x00, 0xda, 0x56,
-	0x4e, 0x9e, 0xe9, 0xa9, 0xc7, 0xde, 0x3a, 0x6d, 0xa7, 0xd3, 0xc9, 0x25, 0x33, 0xfd, 0x03, 0x7a,
-	0xe8, 0xbd, 0xd7, 0xce, 0xf4, 0xde, 0x63, 0x67, 0xda, 0xff, 0xa0, 0xd7, 0xce, 0xee, 0x02, 0x20,
-	0xf8, 0x15, 0xab, 0x99, 0x49, 0xd2, 0x93, 0xb8, 0xbf, 0xf7, 0x7b, 0x0f, 0x6f, 0xdf, 0x3e, 0xbc,
-	0xf7, 0xb0, 0x82, 0xcd, 0x81, 0xeb, 0x0e, 0x1c, 0x7a, 0xd7, 0xf3, 0xdd, 0xd0, 0x3d, 0x19, 0xf5,
-	0xef, 0x5a, 0x34, 0x30, 0x7d, 0xdb, 0x0b, 0x5d, 0xbf, 0x2e, 0x30, 0xbc, 0x22, 0x19, 0xf5, 0x98,
-	0x51, 0x3b, 0x80, 0xd5, 0xc7, 0xb6, 0x43, 0x9b, 0x09, 0xb1, 0x47, 0x43, 0xfc, 0x08, 0x72, 0x7d,
-	0xdb, 0xa1, 0xaa, 0xb2, 0x99, 0xdd, 0x2a, 0x6f, 0x5f, 0xaf, 0x4f, 0x29, 0xd5, 0x27, 0x35, 0xba,
-	0x1c, 0xd6, 0x85, 0x46, 0xed, 0x9f, 0x39, 0x58, 0x9b, 0x23, 0xc5, 0x18, 0x72, 0x8c, 0x0c, 0xb9,
-	0x45, 0x65, 0xab, 0xa4, 0x8b, 0xdf, 0x58, 0x85, 0x25, 0x8f, 0x98, 0xcf, 0xc9, 0x80, 0xaa, 0x19,
-	0x01, 0xc7, 0x4b, 0xfc, 0x2e, 0x80, 0x45, 0x3d, 0xca, 0x2c, 0xca, 0xcc, 0x33, 0x35, 0xbb, 0x99,
-	0xdd, 0x2a, 0xe9, 0x29, 0x04, 0xdf, 0x81, 0x55, 0x6f, 0x74, 0xe2, 0xd8, 0xa6, 0x91, 0xa2, 0xc1,
-	0x66, 0x76, 0x2b, 0xaf, 0x23, 0x29, 0x68, 0x8e, 0xc9, 0x37, 0x61, 0xe5, 0x25, 0x25, 0xcf, 0xd3,
-	0xd4, 0xb2, 0xa0, 0x56, 0x39, 0x9c, 0x22, 0xee, 0x41, 0x65, 0x48, 0x83, 0x80, 0x0c, 0xa8, 0x11,
-	0x9e, 0x79, 0x54, 0xcd, 0x89, 0xdd, 0x6f, 0xce, 0xec, 0x7e, 0x7a, 0xe7, 0xe5, 0x48, 0xeb, 0xe8,
-	0xcc, 0xa3, 0xb8, 0x01, 0x25, 0xca, 0x46, 0x43, 0x69, 0x21, 0xbf, 0x20, 0x7e, 0x1a, 0x1b, 0x0d,
-	0xa7, 0xad, 0x14, 0xb9, 0x5a, 0x64, 0x62, 0x29, 0xa0, 0xfe, 0x0b, 0xdb, 0xa4, 0x6a, 0x41, 0x18,
-	0xb8, 0x39, 0x63, 0xa0, 0x27, 0xe5, 0xd3, 0x36, 0x62, 0x3d, 0xbc, 0x07, 0x25, 0xfa, 0x2a, 0xa4,
-	0x2c, 0xb0, 0x5d, 0xa6, 0x2e, 0x09, 0x23, 0x37, 0xe6, 0x9c, 0x22, 0x75, 0xac, 0x69, 0x13, 0x63,
-	0x3d, 0xfc, 0x10, 0x96, 0x5c, 0x2f, 0xb4, 0x5d, 0x16, 0xa8, 0xc5, 0x4d, 0x65, 0xab, 0xbc, 0xfd,
-	0xce, 0xdc, 0x44, 0xe8, 0x48, 0x8e, 0x1e, 0x93, 0x71, 0x0b, 0x50, 0xe0, 0x8e, 0x7c, 0x93, 0x1a,
-	0xa6, 0x6b, 0x51, 0xc3, 0x66, 0x7d, 0x57, 0x2d, 0x09, 0x03, 0x57, 0x67, 0x37, 0x22, 0x88, 0x7b,
-	0xae, 0x45, 0x5b, 0xac, 0xef, 0xea, 0xd5, 0x60, 0x62, 0x8d, 0x2f, 0x40, 0x21, 0x38, 0x63, 0x21,
-	0x79, 0xa5, 0x56, 0x44, 0x86, 0x44, 0xab, 0xda, 0x7f, 0xf2, 0xb0, 0x72, 0x9e, 0x14, 0xfb, 0x18,
-	0xf2, 0x7d, 0xbe, 0x4b, 0x35, 0xf3, 0xbf, 0xc4, 0x40, 0xea, 0x4c, 0x06, 0xb1, 0xf0, 0x0d, 0x83,
-	0xd8, 0x80, 0x32, 0xa3, 0x41, 0x48, 0x2d, 0x99, 0x11, 0xd9, 0x73, 0xe6, 0x14, 0x48, 0xa5, 0xd9,
-	0x94, 0xca, 0x7d, 0xa3, 0x94, 0x7a, 0x0a, 0x2b, 0x89, 0x4b, 0x86, 0x4f, 0xd8, 0x20, 0xce, 0xcd,
-	0xbb, 0x6f, 0xf2, 0xa4, 0xae, 0xc5, 0x7a, 0x3a, 0x57, 0xd3, 0xab, 0x74, 0x62, 0x8d, 0x9b, 0x00,
-	0x2e, 0xa3, 0x6e, 0xdf, 0xb0, 0xa8, 0xe9, 0xa8, 0xc5, 0x05, 0x51, 0xea, 0x70, 0xca, 0x4c, 0x94,
-	0x5c, 0x89, 0x9a, 0x0e, 0xfe, 0x68, 0x9c, 0x6a, 0x4b, 0x0b, 0x32, 0xe5, 0x40, 0xbe, 0x64, 0x33,
-	0xd9, 0x76, 0x0c, 0x55, 0x9f, 0xf2, 0xbc, 0xa7, 0x56, 0xb4, 0xb3, 0x92, 0x70, 0xa2, 0xfe, 0xc6,
-	0x9d, 0xe9, 0x91, 0x9a, 0xdc, 0xd8, 0xb2, 0x9f, 0x5e, 0xe2, 0xf7, 0x20, 0x01, 0x0c, 0x91, 0x56,
-	0x20, 0xaa, 0x50, 0x25, 0x06, 0x0f, 0xc9, 0x90, 0x6e, 0x3c, 0x82, 0xea, 0x64, 0x78, 0xf0, 0x3a,
-	0xe4, 0x83, 0x90, 0xf8, 0xa1, 0xc8, 0xc2, 0xbc, 0x2e, 0x17, 0x18, 0x41, 0x96, 0x32, 0x4b, 0x54,
-	0xb9, 0xbc, 0xce, 0x7f, 0x6e, 0x7c, 0x08, 0xcb, 0x13, 0x8f, 0x3f, 0xaf, 0x62, 0xed, 0x37, 0x05,
-	0x58, 0x9f, 0x97, 0x73, 0x73, 0xd3, 0xff, 0x02, 0x14, 0xd8, 0x68, 0x78, 0x42, 0x7d, 0x35, 0x2b,
-	0x2c, 0x44, 0x2b, 0xdc, 0x80, 0xbc, 0x43, 0x4e, 0xa8, 0xa3, 0xe6, 0x36, 0x95, 0xad, 0xea, 0xf6,
-	0x9d, 0x73, 0x65, 0x75, 0xbd, 0xcd, 0x55, 0x74, 0xa9, 0x89, 0x3f, 0x81, 0x5c, 0x54, 0xe2, 0xb8,
-	0x85, 0xdb, 0xe7, 0xb3, 0xc0, 0x73, 0x51, 0x17, 0x7a, 0xf8, 0x32, 0x94, 0xf8, 0x5f, 0x19, 0xdb,
-	0x82, 0xf0, 0xb9, 0xc8, 0x01, 0x1e, 0x57, 0xbc, 0x01, 0x45, 0x91, 0x66, 0x16, 0x8d, 0x5b, 0x43,
-	0xb2, 0xe6, 0x07, 0x63, 0xd1, 0x3e, 0x19, 0x39, 0xa1, 0xf1, 0x82, 0x38, 0x23, 0x2a, 0x12, 0xa6,
-	0xa4, 0x57, 0x22, 0xf0, 0xa7, 0x1c, 0xc3, 0x57, 0xa1, 0x2c, 0xb3, 0xd2, 0x66, 0x16, 0x7d, 0x25,
-	0xaa, 0x4f, 0x5e, 0x97, 0x89, 0xda, 0xe2, 0x08, 0x7f, 0xfc, 0xb3, 0xc0, 0x65, 0xf1, 0xd1, 0x8a,
-	0x47, 0x70, 0x40, 0x3c, 0xfe, 0xc3, 0xe9, 0xc2, 0x77, 0x65, 0xfe, 0xf6, 0xa6, 0x73, 0xb1, 0xf6,
-	0xe7, 0x0c, 0xe4, 0xc4, 0xfb, 0xb6, 0x02, 0xe5, 0xa3, 0xcf, 0xba, 0x9a, 0xd1, 0xec, 0x1c, 0xef,
-	0xb6, 0x35, 0xa4, 0xe0, 0x2a, 0x80, 0x00, 0x1e, 0xb7, 0x3b, 0x8d, 0x23, 0x94, 0x49, 0xd6, 0xad,
-	0xc3, 0xa3, 0x87, 0xf7, 0x51, 0x36, 0x51, 0x38, 0x96, 0x40, 0x2e, 0x4d, 0xb8, 0xb7, 0x8d, 0xf2,
-	0x18, 0x41, 0x45, 0x1a, 0x68, 0x3d, 0xd5, 0x9a, 0x0f, 0xef, 0xa3, 0xc2, 0x24, 0x72, 0x6f, 0x1b,
-	0x2d, 0xe1, 0x65, 0x28, 0x09, 0x64, 0xb7, 0xd3, 0x69, 0xa3, 0x62, 0x62, 0xb3, 0x77, 0xa4, 0xb7,
-	0x0e, 0xf7, 0x51, 0x29, 0xb1, 0xb9, 0xaf, 0x77, 0x8e, 0xbb, 0x08, 0x12, 0x0b, 0x07, 0x5a, 0xaf,
-	0xd7, 0xd8, 0xd7, 0x50, 0x39, 0x61, 0xec, 0x7e, 0x76, 0xa4, 0xf5, 0x50, 0x65, 0xc2, 0xad, 0x7b,
-	0xdb, 0x68, 0x39, 0x79, 0x84, 0x76, 0x78, 0x7c, 0x80, 0xaa, 0x78, 0x15, 0x96, 0xe5, 0x23, 0x62,
-	0x27, 0x56, 0xa6, 0xa0, 0x87, 0xf7, 0x11, 0x1a, 0x3b, 0x22, 0xad, 0xac, 0x4e, 0x00, 0x0f, 0xef,
-	0x23, 0x5c, 0xdb, 0x83, 0xbc, 0xc8, 0x2e, 0x8c, 0xa1, 0xda, 0x6e, 0xec, 0x6a, 0x6d, 0xa3, 0xd3,
-	0x3d, 0x6a, 0x75, 0x0e, 0x1b, 0x6d, 0xa4, 0x8c, 0x31, 0x5d, 0xfb, 0xc9, 0x71, 0x4b, 0xd7, 0x9a,
-	0x28, 0x93, 0xc6, 0xba, 0x5a, 0xe3, 0x48, 0x6b, 0xa2, 0x6c, 0xcd, 0x84, 0xf5, 0x79, 0x75, 0x66,
-	0xee, 0x9b, 0x91, 0x3a, 0xe2, 0xcc, 0x82, 0x23, 0x16, 0xb6, 0x66, 0x8e, 0xf8, 0x4b, 0x05, 0xd6,
-	0xe6, 0xd4, 0xda, 0xb9, 0x0f, 0xf9, 0x31, 0xe4, 0x65, 0x8a, 0xca, 0xee, 0x73, 0x6b, 0x6e, 0xd1,
-	0x16, 0x09, 0x3b, 0xd3, 0x81, 0x84, 0x5e, 0xba, 0x03, 0x67, 0x17, 0x74, 0x60, 0x6e, 0x62, 0xc6,
-	0xc9, 0x5f, 0x2a, 0xa0, 0x2e, 0xb2, 0xfd, 0x86, 0x42, 0x91, 0x99, 0x28, 0x14, 0x1f, 0x4f, 0x3b,
-	0x70, 0x6d, 0xf1, 0x1e, 0x66, 0xbc, 0xf8, 0x4a, 0x81, 0x0b, 0xf3, 0x07, 0x95, 0xb9, 0x3e, 0x7c,
-	0x02, 0x85, 0x21, 0x0d, 0x4f, 0xdd, 0xb8, 0x59, 0xbf, 0x3f, 0xa7, 0x05, 0x70, 0xf1, 0x74, 0xac,
-	0x22, 0xad, 0x74, 0x0f, 0xc9, 0x2e, 0x9a, 0x36, 0xa4, 0x37, 0x33, 0x9e, 0xfe, 0x2a, 0x03, 0x6f,
-	0xcf, 0x35, 0x3e, 0xd7, 0xd1, 0x2b, 0x00, 0x36, 0xf3, 0x46, 0xa1, 0x6c, 0xc8, 0xb2, 0x3e, 0x95,
-	0x04, 0x22, 0xde, 0x7d, 0x5e, 0x7b, 0x46, 0x61, 0x22, 0xcf, 0x0a, 0x39, 0x48, 0x48, 0x10, 0x1e,
-	0x8d, 0x1d, 0xcd, 0x09, 0x47, 0xdf, 0x5d, 0xb0, 0xd3, 0x99, 0x5e, 0xf7, 0x01, 0x20, 0xd3, 0xb1,
-	0x29, 0x0b, 0x8d, 0x20, 0xf4, 0x29, 0x19, 0xda, 0x6c, 0x20, 0x0a, 0x70, 0x71, 0x27, 0xdf, 0x27,
-	0x4e, 0x40, 0xf5, 0x15, 0x29, 0xee, 0xc5, 0x52, 0xae, 0x21, 0xba, 0x8c, 0x9f, 0xd2, 0x28, 0x4c,
-	0x68, 0x48, 0x71, 0xa2, 0x51, 0xfb, 0xf5, 0x12, 0x94, 0x53, 0x63, 0x1d, 0xbe, 0x06, 0x95, 0x67,
-	0xe4, 0x05, 0x31, 0xe2, 0x51, 0x5d, 0x46, 0xa2, 0xcc, 0xb1, 0x6e, 0x34, 0xae, 0x7f, 0x00, 0xeb,
-	0x82, 0xe2, 0x8e, 0x42, 0xea, 0x1b, 0xa6, 0x43, 0x82, 0x40, 0x04, 0xad, 0x28, 0xa8, 0x98, 0xcb,
-	0x3a, 0x5c, 0xb4, 0x17, 0x4b, 0xf0, 0x03, 0x58, 0x13, 0x1a, 0xc3, 0x91, 0x13, 0xda, 0x9e, 0x43,
-	0x0d, 0xfe, 0xf1, 0x10, 0x88, 0x42, 0x9c, 0x78, 0xb6, 0xca, 0x19, 0x07, 0x11, 0x81, 0x7b, 0x14,
-	0xe0, 0x7d, 0xb8, 0x22, 0xd4, 0x06, 0x94, 0x51, 0x9f, 0x84, 0xd4, 0xa0, 0xbf, 0x18, 0x11, 0x27,
-	0x30, 0x08, 0xb3, 0x8c, 0x53, 0x12, 0x9c, 0xaa, 0xeb, 0x69, 0x03, 0x97, 0x38, 0x77, 0x3f, 0xa2,
-	0x6a, 0x82, 0xd9, 0x60, 0xd6, 0xa7, 0x24, 0x38, 0xc5, 0x3b, 0x70, 0x41, 0x18, 0x0a, 0x42, 0xdf,
-	0x66, 0x03, 0xc3, 0x3c, 0xa5, 0xe6, 0x73, 0x63, 0x14, 0xf6, 0x1f, 0xa9, 0x97, 0xd3, 0x16, 0x84,
-	0x93, 0x3d, 0xc1, 0xd9, 0xe3, 0x94, 0xe3, 0xb0, 0xff, 0x08, 0xf7, 0xa0, 0xc2, 0xcf, 0x63, 0x68,
-	0x7f, 0x41, 0x8d, 0xbe, 0xeb, 0x8b, 0xe6, 0x52, 0x9d, 0xf3, 0x72, 0xa7, 0x82, 0x58, 0xef, 0x44,
-	0x0a, 0x07, 0xae, 0x45, 0x77, 0xf2, 0xbd, 0xae, 0xa6, 0x35, 0xf5, 0x72, 0x6c, 0xe5, 0xb1, 0xeb,
-	0xf3, 0x9c, 0x1a, 0xb8, 0x49, 0x8c, 0xcb, 0x32, 0xa7, 0x06, 0x6e, 0x1c, 0xe1, 0x07, 0xb0, 0x66,
-	0x9a, 0x72, 0xdb, 0xb6, 0x69, 0x44, 0x53, 0x7e, 0xa0, 0xa2, 0x89, 0x78, 0x99, 0xe6, 0xbe, 0x24,
-	0x44, 0x69, 0x1e, 0xe0, 0x8f, 0xe0, 0xed, 0x71, 0xbc, 0xd2, 0x8a, 0xab, 0x33, 0xbb, 0x9c, 0x56,
-	0x7d, 0x00, 0x6b, 0xde, 0xd9, 0xac, 0x22, 0x9e, 0x78, 0xa2, 0x77, 0x36, 0xad, 0x76, 0x43, 0x7c,
-	0xb9, 0xf9, 0xd4, 0x24, 0x21, 0xb5, 0xd4, 0x8b, 0x69, 0x76, 0x4a, 0x80, 0xef, 0x02, 0x32, 0x4d,
-	0x83, 0x32, 0x72, 0xe2, 0x50, 0x83, 0xf8, 0x94, 0x91, 0x40, 0xbd, 0x9a, 0x26, 0x57, 0x4d, 0x53,
-	0x13, 0xd2, 0x86, 0x10, 0xe2, 0xdb, 0xb0, 0xea, 0x9e, 0x3c, 0x33, 0x65, 0x72, 0x19, 0x9e, 0x4f,
-	0xfb, 0xf6, 0x2b, 0xf5, 0xba, 0x08, 0xd3, 0x0a, 0x17, 0x88, 0xd4, 0xea, 0x0a, 0x18, 0xdf, 0x02,
-	0x64, 0x06, 0xa7, 0xc4, 0xf7, 0x44, 0x77, 0x0f, 0x3c, 0x62, 0x52, 0xf5, 0x86, 0xa4, 0x4a, 0xfc,
-	0x30, 0x86, 0xf1, 0x53, 0x58, 0x1f, 0x31, 0x9b, 0x85, 0xd4, 0xf7, 0x7c, 0xca, 0x87, 0x74, 0xf9,
-	0xa6, 0xa9, 0xff, 0x5a, 0x5a, 0x30, 0x66, 0x1f, 0xa7, 0xd9, 0xf2, 0x74, 0xf5, 0xb5, 0xd1, 0x2c,
-	0x58, 0xdb, 0x81, 0x4a, 0xfa, 0xd0, 0x71, 0x09, 0xe4, 0xb1, 0x23, 0x85, 0xf7, 0xd0, 0xbd, 0x4e,
-	0x93, 0x77, 0xbf, 0xcf, 0x35, 0x94, 0xe1, 0x5d, 0xb8, 0xdd, 0x3a, 0xd2, 0x0c, 0xfd, 0xf8, 0xf0,
-	0xa8, 0x75, 0xa0, 0xa1, 0xec, 0xed, 0x52, 0xf1, 0xdf, 0x4b, 0xe8, 0xf5, 0xeb, 0xd7, 0xaf, 0x33,
-	0x4f, 0x72, 0xc5, 0xf7, 0xd1, 0xcd, 0xda, 0x5f, 0x33, 0x50, 0x9d, 0x9c, 0x7f, 0xf1, 0x8f, 0xe0,
-	0x62, 0xfc, 0xb1, 0x1a, 0xd0, 0xd0, 0x78, 0x69, 0xfb, 0x22, 0x1b, 0x87, 0x44, 0x4e, 0x90, 0x49,
-	0x20, 0xd7, 0x23, 0x56, 0x8f, 0x86, 0x3f, 0xb3, 0x7d, 0x9e, 0x6b, 0x43, 0x12, 0xe2, 0x36, 0x5c,
-	0x65, 0xae, 0x11, 0x84, 0x84, 0x59, 0xc4, 0xb7, 0x8c, 0xf1, 0x35, 0x81, 0x41, 0x4c, 0x93, 0x06,
-	0x81, 0x2b, 0x1b, 0x41, 0x62, 0xe5, 0x1d, 0xe6, 0xf6, 0x22, 0xf2, 0xb8, 0x42, 0x36, 0x22, 0xea,
-	0xd4, 0xa1, 0x67, 0x17, 0x1d, 0xfa, 0x65, 0x28, 0x0d, 0x89, 0x67, 0x50, 0x16, 0xfa, 0x67, 0x62,
-	0x6a, 0x2b, 0xea, 0xc5, 0x21, 0xf1, 0x34, 0xbe, 0xfe, 0xf6, 0x4e, 0x22, 0x15, 0xcd, 0xda, 0x3f,
-	0xb2, 0x50, 0x49, 0x4f, 0x6e, 0x7c, 0x10, 0x36, 0x45, 0x95, 0x56, 0xc4, 0x4b, 0xfc, 0xde, 0xd7,
-	0xce, 0x79, 0xf5, 0x3d, 0x5e, 0xbe, 0x77, 0x0a, 0x72, 0x9e, 0xd2, 0xa5, 0x26, 0x6f, 0x9d, 0xfc,
-	0xb5, 0xa5, 0x72, 0x4a, 0x2f, 0xea, 0xd1, 0x0a, 0xef, 0x43, 0xe1, 0x59, 0x20, 0x6c, 0x17, 0x84,
-	0xed, 0xeb, 0x5f, 0x6f, 0xfb, 0x49, 0x4f, 0x18, 0x2f, 0x3d, 0xe9, 0x19, 0x87, 0x1d, 0xfd, 0xa0,
-	0xd1, 0xd6, 0x23, 0x75, 0x7c, 0x09, 0x72, 0x0e, 0xf9, 0xe2, 0x6c, 0xb2, 0xd0, 0x0b, 0xe8, 0xbc,
-	0x81, 0xbf, 0x04, 0xb9, 0x97, 0x94, 0x3c, 0x9f, 0x2c, 0xaf, 0x02, 0xfa, 0x16, 0x5f, 0x80, 0xbb,
-	0x90, 0x17, 0xf1, 0xc2, 0x00, 0x51, 0xc4, 0xd0, 0x5b, 0xb8, 0x08, 0xb9, 0xbd, 0x8e, 0xce, 0x5f,
-	0x02, 0x04, 0x15, 0x89, 0x1a, 0xdd, 0x96, 0xb6, 0xa7, 0xa1, 0x4c, 0xed, 0x01, 0x14, 0x64, 0x10,
-	0xf8, 0x0b, 0x92, 0x84, 0x01, 0xbd, 0x15, 0x2d, 0x23, 0x1b, 0x4a, 0x2c, 0x3d, 0x3e, 0xd8, 0xd5,
-	0x74, 0x94, 0x49, 0x1f, 0x6f, 0x00, 0x95, 0xf4, 0xd0, 0xf6, 0xdd, 0xe4, 0xd4, 0x5f, 0x14, 0x28,
-	0xa7, 0x86, 0x30, 0xde, 0xfe, 0x89, 0xe3, 0xb8, 0x2f, 0x0d, 0xe2, 0xd8, 0x24, 0x88, 0x92, 0x02,
-	0x04, 0xd4, 0xe0, 0xc8, 0x79, 0x0f, 0xed, 0x3b, 0x71, 0xfe, 0x0f, 0x0a, 0xa0, 0xe9, 0x01, 0x6e,
-	0xca, 0x41, 0xe5, 0x7b, 0x75, 0xf0, 0xf7, 0x0a, 0x54, 0x27, 0xa7, 0xb6, 0x29, 0xf7, 0xae, 0x7d,
-	0xaf, 0xee, 0xfd, 0x4e, 0x81, 0xe5, 0x89, 0x59, 0xed, 0xff, 0xca, 0xbb, 0xdf, 0x66, 0x61, 0x6d,
-	0x8e, 0x1e, 0x6e, 0x44, 0x43, 0xad, 0x9c, 0xb3, 0x7f, 0x78, 0x9e, 0x67, 0xd5, 0x79, 0xcf, 0xec,
-	0x12, 0x3f, 0x8c, 0x66, 0xe0, 0x5b, 0x80, 0x6c, 0x8b, 0xb2, 0xd0, 0xee, 0xdb, 0xd4, 0x8f, 0x3e,
-	0xc4, 0xe5, 0xa4, 0xbb, 0x32, 0xc6, 0xe5, 0xb7, 0xf8, 0x0f, 0x00, 0x7b, 0x6e, 0x60, 0x87, 0xf6,
-	0x0b, 0x6a, 0xd8, 0x2c, 0xfe, 0x6a, 0xe7, 0x93, 0x6f, 0x4e, 0x47, 0xb1, 0xa4, 0xc5, 0xc2, 0x84,
-	0xcd, 0xe8, 0x80, 0x4c, 0xb1, 0x79, 0xed, 0xcb, 0xea, 0x28, 0x96, 0x24, 0xec, 0x6b, 0x50, 0xb1,
-	0xdc, 0x11, 0x1f, 0x22, 0x24, 0x8f, 0x97, 0x5a, 0x45, 0x2f, 0x4b, 0x2c, 0xa1, 0x44, 0x53, 0xde,
-	0xf8, 0xba, 0xa0, 0xa2, 0x97, 0x25, 0x26, 0x29, 0x37, 0x61, 0x85, 0x0c, 0x06, 0x3e, 0x37, 0x1e,
-	0x1b, 0x92, 0xa3, 0x6b, 0x35, 0x81, 0x05, 0x71, 0xe3, 0x09, 0x14, 0xe3, 0x38, 0xf0, 0x6e, 0xc6,
-	0x23, 0x61, 0x78, 0xf2, 0xd2, 0x26, 0xb3, 0x55, 0xd2, 0x8b, 0x2c, 0x16, 0x5e, 0x83, 0x8a, 0x1d,
-	0x18, 0xe3, 0xdb, 0xc3, 0xcc, 0x66, 0x66, 0xab, 0xa8, 0x97, 0xed, 0x20, 0xb9, 0x2e, 0xaa, 0x7d,
-	0x95, 0x81, 0xea, 0xe4, 0xed, 0x27, 0x6e, 0x42, 0xd1, 0x71, 0x4d, 0x22, 0x12, 0x41, 0x5e, 0xbd,
-	0x6f, 0xbd, 0xe1, 0xc2, 0xb4, 0xde, 0x8e, 0xf8, 0x7a, 0xa2, 0xb9, 0xf1, 0x37, 0x05, 0x8a, 0x31,
-	0x8c, 0x2f, 0x40, 0xce, 0x23, 0xe1, 0xa9, 0x30, 0x97, 0xdf, 0xcd, 0x20, 0x45, 0x17, 0x6b, 0x8e,
-	0x07, 0x1e, 0x61, 0x22, 0x05, 0x22, 0x9c, 0xaf, 0xf9, 0xb9, 0x3a, 0x94, 0x58, 0x62, 0x28, 0x76,
-	0x87, 0x43, 0xca, 0xc2, 0x20, 0x3e, 0xd7, 0x08, 0xdf, 0x8b, 0x60, 0x7c, 0x07, 0x56, 0x43, 0x9f,
-	0xd8, 0xce, 0x04, 0x37, 0x27, 0xb8, 0x28, 0x16, 0x24, 0xe4, 0x1d, 0xb8, 0x14, 0xdb, 0xb5, 0x68,
-	0x48, 0xcc, 0x53, 0x6a, 0x8d, 0x95, 0x0a, 0xe2, 0x6a, 0xed, 0x62, 0x44, 0x68, 0x46, 0xf2, 0x58,
-	0xb7, 0xf6, 0x77, 0x05, 0x56, 0xe3, 0x31, 0xde, 0x4a, 0x82, 0x75, 0x00, 0x40, 0x18, 0x73, 0xc3,
-	0x74, 0xb8, 0x66, 0x53, 0x79, 0x46, 0xaf, 0xde, 0x48, 0x94, 0xf4, 0x94, 0x81, 0x8d, 0x21, 0xc0,
-	0x58, 0xb2, 0x30, 0x6c, 0x57, 0xa1, 0x1c, 0x5d, 0x6d, 0x8b, 0xff, 0x8f, 0xc8, 0x6f, 0x3f, 0x90,
-	0x10, 0x9f, 0xf7, 0xf1, 0x3a, 0xe4, 0x4f, 0xe8, 0xc0, 0x66, 0xd1, 0x85, 0x9b, 0x5c, 0xc4, 0xd7,
-	0x78, 0xb9, 0xe4, 0x1a, 0x6f, 0xf7, 0xe7, 0xb0, 0x66, 0xba, 0xc3, 0x69, 0x77, 0x77, 0xd1, 0xd4,
-	0xf7, 0x67, 0xf0, 0xa9, 0xf2, 0x39, 0x8c, 0xa7, 0xb3, 0x3f, 0x2a, 0xca, 0x97, 0x99, 0xec, 0x7e,
-	0x77, 0xf7, 0x4f, 0x99, 0x8d, 0x7d, 0xa9, 0xda, 0x8d, 0x77, 0xaa, 0xd3, 0xbe, 0x43, 0x4d, 0xee,
-	0xfd, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x05, 0x54, 0xc8, 0x7d, 0x07, 0x1a, 0x00, 0x00,
+	// 2295 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x59, 0x4f, 0x6f, 0x1b, 0xc7,
+	0x15, 0xcf, 0xf2, 0x9f, 0xc8, 0x47, 0x8a, 0x1a, 0x8d, 0x14, 0x67, 0xad, 0xfc, 0xb1, 0xcc, 0xd8,
+	0xb1, 0x6c, 0xb7, 0x74, 0x20, 0xff, 0x89, 0xa3, 0x14, 0x29, 0x28, 0x71, 0xad, 0xd0, 0x90, 0x44,
+	0x76, 0x29, 0xb5, 0x4e, 0x2e, 0x8b, 0xd1, 0xee, 0x90, 0x5a, 0x7b, 0x39, 0xbb, 0xdd, 0x5d, 0xda,
+	0x56, 0x4e, 0x06, 0x7a, 0xea, 0xa5, 0xe7, 0xa2, 0x2d, 0x7a, 0xc8, 0x25, 0x40, 0x3f, 0x40, 0x0f,
+	0xfd, 0x0a, 0x05, 0x0a, 0xf4, 0x2b, 0x14, 0x05, 0xda, 0x6f, 0xd0, 0x6b, 0x31, 0x33, 0xbb, 0xcb,
+	0x5d, 0xfe, 0x89, 0xd5, 0x00, 0x49, 0x7a, 0x12, 0xe7, 0xf7, 0x7e, 0xef, 0xcd, 0x9b, 0x37, 0x6f,
+	0xde, 0xbc, 0x1d, 0xc1, 0xe6, 0xd0, 0x75, 0x87, 0x0e, 0xbd, 0xe3, 0xf9, 0x6e, 0xe8, 0x9e, 0x8e,
+	0x07, 0x77, 0x2c, 0x1a, 0x98, 0xbe, 0xed, 0x85, 0xae, 0xdf, 0x14, 0x18, 0x5e, 0x91, 0x8c, 0x66,
+	0xcc, 0x68, 0x1c, 0xc2, 0xea, 0x23, 0xdb, 0xa1, 0xed, 0x84, 0xd8, 0xa7, 0x21, 0x7e, 0x08, 0x85,
+	0x81, 0xed, 0x50, 0x55, 0xd9, 0xcc, 0x6f, 0x55, 0xb7, 0xaf, 0x35, 0xa7, 0x94, 0x9a, 0x59, 0x8d,
+	0x1e, 0x87, 0x75, 0xa1, 0xd1, 0xf8, 0x67, 0x01, 0xd6, 0xe6, 0x48, 0x31, 0x86, 0x02, 0x23, 0x23,
+	0x6e, 0x51, 0xd9, 0xaa, 0xe8, 0xe2, 0x37, 0x56, 0x61, 0xc9, 0x23, 0xe6, 0x33, 0x32, 0xa4, 0x6a,
+	0x4e, 0xc0, 0xf1, 0x10, 0xbf, 0x07, 0x60, 0x51, 0x8f, 0x32, 0x8b, 0x32, 0xf3, 0x5c, 0xcd, 0x6f,
+	0xe6, 0xb7, 0x2a, 0x7a, 0x0a, 0xc1, 0xb7, 0x61, 0xd5, 0x1b, 0x9f, 0x3a, 0xb6, 0x69, 0xa4, 0x68,
+	0xb0, 0x99, 0xdf, 0x2a, 0xea, 0x48, 0x0a, 0xda, 0x13, 0xf2, 0x0d, 0x58, 0x79, 0x41, 0xc9, 0xb3,
+	0x34, 0xb5, 0x2a, 0xa8, 0x75, 0x0e, 0xa7, 0x88, 0x7b, 0x50, 0x1b, 0xd1, 0x20, 0x20, 0x43, 0x6a,
+	0x84, 0xe7, 0x1e, 0x55, 0x0b, 0x62, 0xf5, 0x9b, 0x33, 0xab, 0x9f, 0x5e, 0x79, 0x35, 0xd2, 0x3a,
+	0x3e, 0xf7, 0x28, 0x6e, 0x41, 0x85, 0xb2, 0xf1, 0x48, 0x5a, 0x28, 0x2e, 0x88, 0x9f, 0xc6, 0xc6,
+	0xa3, 0x69, 0x2b, 0x65, 0xae, 0x16, 0x99, 0x58, 0x0a, 0xa8, 0xff, 0xdc, 0x36, 0xa9, 0x5a, 0x12,
+	0x06, 0x6e, 0xcc, 0x18, 0xe8, 0x4b, 0xf9, 0xb4, 0x8d, 0x58, 0x0f, 0xef, 0x41, 0x85, 0xbe, 0x0c,
+	0x29, 0x0b, 0x6c, 0x97, 0xa9, 0x4b, 0xc2, 0xc8, 0xf5, 0x39, 0xbb, 0x48, 0x1d, 0x6b, 0xda, 0xc4,
+	0x44, 0x0f, 0x3f, 0x80, 0x25, 0xd7, 0x0b, 0x6d, 0x97, 0x05, 0x6a, 0x79, 0x53, 0xd9, 0xaa, 0x6e,
+	0xbf, 0x33, 0x37, 0x11, 0xba, 0x92, 0xa3, 0xc7, 0x64, 0xdc, 0x01, 0x14, 0xb8, 0x63, 0xdf, 0xa4,
+	0x86, 0xe9, 0x5a, 0xd4, 0xb0, 0xd9, 0xc0, 0x55, 0x2b, 0xc2, 0xc0, 0x95, 0xd9, 0x85, 0x08, 0xe2,
+	0x9e, 0x6b, 0xd1, 0x0e, 0x1b, 0xb8, 0x7a, 0x3d, 0xc8, 0x8c, 0xf1, 0x25, 0x28, 0x05, 0xe7, 0x2c,
+	0x24, 0x2f, 0xd5, 0x9a, 0xc8, 0x90, 0x68, 0xd4, 0xf8, 0x4f, 0x11, 0x56, 0x2e, 0x92, 0x62, 0x9f,
+	0x40, 0x71, 0xc0, 0x57, 0xa9, 0xe6, 0xfe, 0x97, 0x18, 0x48, 0x9d, 0x6c, 0x10, 0x4b, 0xdf, 0x32,
+	0x88, 0x2d, 0xa8, 0x32, 0x1a, 0x84, 0xd4, 0x92, 0x19, 0x91, 0xbf, 0x60, 0x4e, 0x81, 0x54, 0x9a,
+	0x4d, 0xa9, 0xc2, 0xb7, 0x4a, 0xa9, 0x27, 0xb0, 0x92, 0xb8, 0x64, 0xf8, 0x84, 0x0d, 0xe3, 0xdc,
+	0xbc, 0xf3, 0x3a, 0x4f, 0x9a, 0x5a, 0xac, 0xa7, 0x73, 0x35, 0xbd, 0x4e, 0x33, 0x63, 0xdc, 0x06,
+	0x70, 0x19, 0x75, 0x07, 0x86, 0x45, 0x4d, 0x47, 0x2d, 0x2f, 0x88, 0x52, 0x97, 0x53, 0x66, 0xa2,
+	0xe4, 0x4a, 0xd4, 0x74, 0xf0, 0xc7, 0x93, 0x54, 0x5b, 0x5a, 0x90, 0x29, 0x87, 0xf2, 0x90, 0xcd,
+	0x64, 0xdb, 0x09, 0xd4, 0x7d, 0xca, 0xf3, 0x9e, 0x5a, 0xd1, 0xca, 0x2a, 0xc2, 0x89, 0xe6, 0x6b,
+	0x57, 0xa6, 0x47, 0x6a, 0x72, 0x61, 0xcb, 0x7e, 0x7a, 0x88, 0xdf, 0x87, 0x04, 0x30, 0x44, 0x5a,
+	0x81, 0xa8, 0x42, 0xb5, 0x18, 0x3c, 0x22, 0x23, 0xba, 0xf1, 0x10, 0xea, 0xd9, 0xf0, 0xe0, 0x75,
+	0x28, 0x06, 0x21, 0xf1, 0x43, 0x91, 0x85, 0x45, 0x5d, 0x0e, 0x30, 0x82, 0x3c, 0x65, 0x96, 0xa8,
+	0x72, 0x45, 0x9d, 0xff, 0xdc, 0xf8, 0x08, 0x96, 0x33, 0xd3, 0x5f, 0x54, 0xb1, 0xf1, 0xdb, 0x12,
+	0xac, 0xcf, 0xcb, 0xb9, 0xb9, 0xe9, 0x7f, 0x09, 0x4a, 0x6c, 0x3c, 0x3a, 0xa5, 0xbe, 0x9a, 0x17,
+	0x16, 0xa2, 0x11, 0x6e, 0x41, 0xd1, 0x21, 0xa7, 0xd4, 0x51, 0x0b, 0x9b, 0xca, 0x56, 0x7d, 0xfb,
+	0xf6, 0x85, 0xb2, 0xba, 0x79, 0xc0, 0x55, 0x74, 0xa9, 0x89, 0x3f, 0x85, 0x42, 0x54, 0xe2, 0xb8,
+	0x85, 0x5b, 0x17, 0xb3, 0xc0, 0x73, 0x51, 0x17, 0x7a, 0xf8, 0x6d, 0xa8, 0xf0, 0xbf, 0x32, 0xb6,
+	0x25, 0xe1, 0x73, 0x99, 0x03, 0x3c, 0xae, 0x78, 0x03, 0xca, 0x22, 0xcd, 0x2c, 0x1a, 0x5f, 0x0d,
+	0xc9, 0x98, 0x6f, 0x8c, 0x45, 0x07, 0x64, 0xec, 0x84, 0xc6, 0x73, 0xe2, 0x8c, 0xa9, 0x48, 0x98,
+	0x8a, 0x5e, 0x8b, 0xc0, 0x9f, 0x73, 0x0c, 0x5f, 0x81, 0xaa, 0xcc, 0x4a, 0x9b, 0x59, 0xf4, 0xa5,
+	0xa8, 0x3e, 0x45, 0x5d, 0x26, 0x6a, 0x87, 0x23, 0x7c, 0xfa, 0xa7, 0x81, 0xcb, 0xe2, 0xad, 0x15,
+	0x53, 0x70, 0x40, 0x4c, 0xff, 0xd1, 0x74, 0xe1, 0x7b, 0x77, 0xfe, 0xf2, 0xa6, 0x73, 0xb1, 0xf1,
+	0xe7, 0x1c, 0x14, 0xc4, 0x79, 0x5b, 0x81, 0xea, 0xf1, 0xe7, 0x3d, 0xcd, 0x68, 0x77, 0x4f, 0x76,
+	0x0f, 0x34, 0xa4, 0xe0, 0x3a, 0x80, 0x00, 0x1e, 0x1d, 0x74, 0x5b, 0xc7, 0x28, 0x97, 0x8c, 0x3b,
+	0x47, 0xc7, 0x0f, 0xee, 0xa1, 0x7c, 0xa2, 0x70, 0x22, 0x81, 0x42, 0x9a, 0x70, 0x77, 0x1b, 0x15,
+	0x31, 0x82, 0x9a, 0x34, 0xd0, 0x79, 0xa2, 0xb5, 0x1f, 0xdc, 0x43, 0xa5, 0x2c, 0x72, 0x77, 0x1b,
+	0x2d, 0xe1, 0x65, 0xa8, 0x08, 0x64, 0xb7, 0xdb, 0x3d, 0x40, 0xe5, 0xc4, 0x66, 0xff, 0x58, 0xef,
+	0x1c, 0xed, 0xa3, 0x4a, 0x62, 0x73, 0x5f, 0xef, 0x9e, 0xf4, 0x10, 0x24, 0x16, 0x0e, 0xb5, 0x7e,
+	0xbf, 0xb5, 0xaf, 0xa1, 0x6a, 0xc2, 0xd8, 0xfd, 0xfc, 0x58, 0xeb, 0xa3, 0x5a, 0xc6, 0xad, 0xbb,
+	0xdb, 0x68, 0x39, 0x99, 0x42, 0x3b, 0x3a, 0x39, 0x44, 0x75, 0xbc, 0x0a, 0xcb, 0x72, 0x8a, 0xd8,
+	0x89, 0x95, 0x29, 0xe8, 0xc1, 0x3d, 0x84, 0x26, 0x8e, 0x48, 0x2b, 0xab, 0x19, 0xe0, 0xc1, 0x3d,
+	0x84, 0x1b, 0x7b, 0x50, 0x14, 0xd9, 0x85, 0x31, 0xd4, 0x0f, 0x5a, 0xbb, 0xda, 0x81, 0xd1, 0xed,
+	0x1d, 0x77, 0xba, 0x47, 0xad, 0x03, 0xa4, 0x4c, 0x30, 0x5d, 0xfb, 0xd9, 0x49, 0x47, 0xd7, 0xda,
+	0x28, 0x97, 0xc6, 0x7a, 0x5a, 0xeb, 0x58, 0x6b, 0xa3, 0x7c, 0xc3, 0x84, 0xf5, 0x79, 0x75, 0x66,
+	0xee, 0xc9, 0x48, 0x6d, 0x71, 0x6e, 0xc1, 0x16, 0x0b, 0x5b, 0x33, 0x5b, 0xfc, 0x95, 0x02, 0x6b,
+	0x73, 0x6a, 0xed, 0xdc, 0x49, 0x7e, 0x0a, 0x45, 0x99, 0xa2, 0xf2, 0xf6, 0xb9, 0x39, 0xb7, 0x68,
+	0x8b, 0x84, 0x9d, 0xb9, 0x81, 0x84, 0x5e, 0xfa, 0x06, 0xce, 0x2f, 0xb8, 0x81, 0xb9, 0x89, 0x19,
+	0x27, 0x7f, 0xa5, 0x80, 0xba, 0xc8, 0xf6, 0x6b, 0x0a, 0x45, 0x2e, 0x53, 0x28, 0x3e, 0x99, 0x76,
+	0xe0, 0xea, 0xe2, 0x35, 0xcc, 0x78, 0xf1, 0xb5, 0x02, 0x97, 0xe6, 0x37, 0x2a, 0x73, 0x7d, 0xf8,
+	0x14, 0x4a, 0x23, 0x1a, 0x9e, 0xb9, 0xf1, 0x65, 0xfd, 0xc1, 0x9c, 0x2b, 0x80, 0x8b, 0xa7, 0x63,
+	0x15, 0x69, 0xa5, 0xef, 0x90, 0xfc, 0xa2, 0x6e, 0x43, 0x7a, 0x33, 0xe3, 0xe9, 0xaf, 0x73, 0xf0,
+	0xe6, 0x5c, 0xe3, 0x73, 0x1d, 0x7d, 0x17, 0xc0, 0x66, 0xde, 0x38, 0x94, 0x17, 0xb2, 0xac, 0x4f,
+	0x15, 0x81, 0x88, 0xb3, 0xcf, 0x6b, 0xcf, 0x38, 0x4c, 0xe4, 0x79, 0x21, 0x07, 0x09, 0x09, 0xc2,
+	0xc3, 0x89, 0xa3, 0x05, 0xe1, 0xe8, 0x7b, 0x0b, 0x56, 0x3a, 0x73, 0xd7, 0x7d, 0x08, 0xc8, 0x74,
+	0x6c, 0xca, 0x42, 0x23, 0x08, 0x7d, 0x4a, 0x46, 0x36, 0x1b, 0x8a, 0x02, 0x5c, 0xde, 0x29, 0x0e,
+	0x88, 0x13, 0x50, 0x7d, 0x45, 0x8a, 0xfb, 0xb1, 0x94, 0x6b, 0x88, 0x5b, 0xc6, 0x4f, 0x69, 0x94,
+	0x32, 0x1a, 0x52, 0x9c, 0x68, 0x34, 0x7e, 0xb3, 0x04, 0xd5, 0x54, 0x5b, 0x87, 0xaf, 0x42, 0xed,
+	0x29, 0x79, 0x4e, 0x8c, 0xb8, 0x55, 0x97, 0x91, 0xa8, 0x72, 0xac, 0x17, 0xb5, 0xeb, 0x1f, 0xc2,
+	0xba, 0xa0, 0xb8, 0xe3, 0x90, 0xfa, 0x86, 0xe9, 0x90, 0x20, 0x10, 0x41, 0x2b, 0x0b, 0x2a, 0xe6,
+	0xb2, 0x2e, 0x17, 0xed, 0xc5, 0x12, 0x7c, 0x1f, 0xd6, 0x84, 0xc6, 0x68, 0xec, 0x84, 0xb6, 0xe7,
+	0x50, 0x83, 0x7f, 0x3c, 0x04, 0xa2, 0x10, 0x27, 0x9e, 0xad, 0x72, 0xc6, 0x61, 0x44, 0xe0, 0x1e,
+	0x05, 0xb8, 0x0d, 0xef, 0x0a, 0xb5, 0x21, 0x65, 0xd4, 0x27, 0x21, 0x35, 0xe8, 0x2f, 0xc7, 0xc4,
+	0x09, 0x0c, 0xc2, 0x2c, 0xe3, 0x8c, 0x04, 0x67, 0xea, 0x3a, 0x37, 0xb0, 0x9b, 0x53, 0x15, 0xfd,
+	0x32, 0x27, 0xee, 0x47, 0x3c, 0x4d, 0xd0, 0x5a, 0xcc, 0xfa, 0x8c, 0x04, 0x67, 0x78, 0x07, 0x2e,
+	0x09, 0x2b, 0x41, 0xe8, 0xdb, 0x6c, 0x68, 0x98, 0x67, 0xd4, 0x7c, 0x66, 0x8c, 0xc3, 0xc1, 0x43,
+	0xf5, 0xed, 0xf4, 0xfc, 0xc2, 0xc3, 0xbe, 0xe0, 0xec, 0x71, 0xca, 0x49, 0x38, 0x78, 0x88, 0xfb,
+	0x50, 0xe3, 0x9b, 0x31, 0xb2, 0xbf, 0xa4, 0xc6, 0xc0, 0xf5, 0xc5, 0xcd, 0x52, 0x9f, 0x73, 0xb2,
+	0x53, 0x11, 0x6c, 0x76, 0x23, 0x85, 0x43, 0xd7, 0xa2, 0x3b, 0xc5, 0x7e, 0x4f, 0xd3, 0xda, 0x7a,
+	0x35, 0xb6, 0xf2, 0xc8, 0xf5, 0x79, 0x42, 0x0d, 0xdd, 0x24, 0xc0, 0x55, 0x99, 0x50, 0x43, 0x37,
+	0x0e, 0xef, 0x7d, 0x58, 0x33, 0x4d, 0xb9, 0x66, 0xdb, 0x34, 0xa2, 0x16, 0x3f, 0x50, 0x51, 0x26,
+	0x58, 0xa6, 0xb9, 0x2f, 0x09, 0x51, 0x8e, 0x07, 0xf8, 0x63, 0x78, 0x73, 0x12, 0xac, 0xb4, 0xe2,
+	0xea, 0xcc, 0x2a, 0xa7, 0x55, 0xef, 0xc3, 0x9a, 0x77, 0x3e, 0xab, 0x88, 0x33, 0x33, 0x7a, 0xe7,
+	0xd3, 0x6a, 0xd7, 0xc5, 0x67, 0x9b, 0x4f, 0x4d, 0x12, 0x52, 0x4b, 0x7d, 0x2b, 0xcd, 0x4e, 0x09,
+	0xf0, 0x1d, 0x40, 0xa6, 0x69, 0x50, 0x46, 0x4e, 0x1d, 0x6a, 0x10, 0x9f, 0x32, 0x12, 0xa8, 0x57,
+	0xd2, 0xe4, 0xba, 0x69, 0x6a, 0x42, 0xda, 0x12, 0x42, 0x7c, 0x0b, 0x56, 0xdd, 0xd3, 0xa7, 0xa6,
+	0xcc, 0x2c, 0xc3, 0xf3, 0xe9, 0xc0, 0x7e, 0xa9, 0x5e, 0x13, 0x61, 0x5a, 0xe1, 0x02, 0x91, 0x57,
+	0x3d, 0x01, 0xe3, 0x9b, 0x80, 0xcc, 0xe0, 0x8c, 0xf8, 0x9e, 0xb8, 0xda, 0x03, 0x8f, 0x98, 0x54,
+	0xbd, 0x2e, 0xa9, 0x12, 0x3f, 0x8a, 0x61, 0xfc, 0x04, 0xd6, 0xc7, 0xcc, 0x66, 0x21, 0xf5, 0x3d,
+	0x9f, 0xf2, 0x0e, 0x5d, 0x1e, 0x33, 0xf5, 0x5f, 0x4b, 0x0b, 0x7a, 0xec, 0x93, 0x34, 0x5b, 0xee,
+	0xae, 0xbe, 0x36, 0x9e, 0x05, 0x1b, 0x3b, 0x50, 0x4b, 0x6f, 0x3a, 0xae, 0x80, 0xdc, 0x76, 0xa4,
+	0xf0, 0x0b, 0x74, 0xaf, 0xdb, 0xe6, 0x57, 0xdf, 0x17, 0x1a, 0xca, 0xf1, 0x2b, 0xf8, 0xa0, 0x73,
+	0xac, 0x19, 0xfa, 0xc9, 0xd1, 0x71, 0xe7, 0x50, 0x43, 0xf9, 0x5b, 0x95, 0xf2, 0xbf, 0x97, 0xd0,
+	0xab, 0x57, 0xaf, 0x5e, 0xe5, 0x1e, 0x17, 0xca, 0x1f, 0xa0, 0x1b, 0x8d, 0xbf, 0xe6, 0xa0, 0x9e,
+	0x6d, 0x7e, 0xf1, 0x4f, 0xe0, 0xad, 0xf8, 0x4b, 0x35, 0xa0, 0xa1, 0xf1, 0xc2, 0xf6, 0x45, 0x36,
+	0x8e, 0x88, 0x6c, 0x1f, 0x93, 0x40, 0xae, 0x47, 0xac, 0x3e, 0x0d, 0x7f, 0x61, 0xfb, 0x3c, 0xd7,
+	0x46, 0x24, 0xc4, 0x07, 0x70, 0x85, 0xb9, 0x46, 0x10, 0x12, 0x66, 0x11, 0xdf, 0x32, 0x26, 0x6f,
+	0x04, 0x06, 0x31, 0x4d, 0x1a, 0x04, 0xae, 0xbc, 0x05, 0x12, 0x2b, 0xef, 0x30, 0xb7, 0x1f, 0x91,
+	0x27, 0xe5, 0xb1, 0x15, 0x51, 0xa7, 0x36, 0x3d, 0xbf, 0x68, 0xd3, 0xdf, 0x86, 0xca, 0x88, 0x78,
+	0x06, 0x65, 0xa1, 0x7f, 0x2e, 0x5a, 0xb6, 0xb2, 0x5e, 0x1e, 0x11, 0x4f, 0xe3, 0xe3, 0xef, 0x6e,
+	0x27, 0xb2, 0xd1, 0x2c, 0xa3, 0x4a, 0xe3, 0x1f, 0x79, 0xa8, 0xa5, 0x9b, 0x37, 0xde, 0x0b, 0x9b,
+	0xa2, 0x50, 0x2b, 0xe2, 0x28, 0xbf, 0xff, 0x8d, 0xad, 0x5e, 0x73, 0x8f, 0x57, 0xf0, 0x9d, 0x92,
+	0x6c, 0xa9, 0x74, 0xa9, 0xc9, 0x6f, 0x4f, 0x7e, 0x78, 0xa9, 0x6c, 0xd4, 0xcb, 0x7a, 0x34, 0xc2,
+	0xfb, 0x50, 0x7a, 0x1a, 0x08, 0xdb, 0x25, 0x61, 0xfb, 0xda, 0x37, 0xdb, 0x7e, 0xdc, 0x17, 0xc6,
+	0x2b, 0x8f, 0xfb, 0xc6, 0x51, 0x57, 0x3f, 0x6c, 0x1d, 0xe8, 0x91, 0x3a, 0xbe, 0x0c, 0x05, 0x87,
+	0x7c, 0x79, 0x9e, 0xad, 0xf5, 0x02, 0xba, 0x68, 0xf8, 0x2f, 0x43, 0xe1, 0x05, 0x25, 0xcf, 0xb2,
+	0x15, 0x56, 0x40, 0xdf, 0xe1, 0x31, 0xb8, 0x03, 0x45, 0x11, 0x2f, 0x0c, 0x10, 0x45, 0x0c, 0xbd,
+	0x81, 0xcb, 0x50, 0xd8, 0xeb, 0xea, 0xfc, 0x28, 0x20, 0xa8, 0x49, 0xd4, 0xe8, 0x75, 0xb4, 0x3d,
+	0x0d, 0xe5, 0x1a, 0xf7, 0xa1, 0x24, 0x83, 0xc0, 0x8f, 0x49, 0x12, 0x06, 0xf4, 0x46, 0x34, 0x8c,
+	0x6c, 0x28, 0xb1, 0xf4, 0xe4, 0x70, 0x57, 0xd3, 0x51, 0x2e, 0xbb, 0xc9, 0x05, 0x54, 0x6c, 0x04,
+	0x50, 0x4b, 0x77, 0x6f, 0xdf, 0x4b, 0x7e, 0x35, 0xfe, 0xa2, 0x40, 0x35, 0xd5, 0x8d, 0xf1, 0x3e,
+	0x80, 0x38, 0x8e, 0xfb, 0xc2, 0x20, 0x8e, 0x4d, 0x82, 0x28, 0x35, 0x40, 0x40, 0x2d, 0x8e, 0x5c,
+	0x74, 0xeb, 0xbe, 0x17, 0xe7, 0xff, 0xa8, 0x00, 0x9a, 0xee, 0xe4, 0xa6, 0x1c, 0x54, 0x7e, 0x50,
+	0x07, 0xff, 0xa0, 0x40, 0x3d, 0xdb, 0xbe, 0x4d, 0xb9, 0x77, 0xf5, 0x07, 0x75, 0xef, 0xf7, 0x0a,
+	0x2c, 0x67, 0x9a, 0xb6, 0xff, 0x2b, 0xef, 0x7e, 0x97, 0x87, 0xb5, 0x39, 0x7a, 0xb8, 0x15, 0x75,
+	0xb7, 0xb2, 0xe1, 0xfe, 0xf1, 0x45, 0xe6, 0x6a, 0xf2, 0xfb, 0xb3, 0x47, 0xfc, 0x30, 0x6a, 0x86,
+	0x6f, 0x02, 0xb2, 0x2d, 0xca, 0x42, 0x7b, 0x60, 0x53, 0x3f, 0xfa, 0x22, 0x97, 0x2d, 0xef, 0xca,
+	0x04, 0x97, 0x1f, 0xe5, 0x3f, 0x02, 0xec, 0xb9, 0x81, 0x1d, 0xda, 0xcf, 0xa9, 0x61, 0xb3, 0xf8,
+	0xf3, 0x9d, 0xb7, 0xc0, 0x05, 0x1d, 0xc5, 0x92, 0x0e, 0x0b, 0x13, 0x36, 0xa3, 0x43, 0x32, 0xc5,
+	0xe6, 0x15, 0x30, 0xaf, 0xa3, 0x58, 0x92, 0xb0, 0xaf, 0x42, 0xcd, 0x72, 0xc7, 0xbc, 0xa1, 0x90,
+	0x3c, 0x5e, 0x70, 0x15, 0xbd, 0x2a, 0xb1, 0x84, 0x12, 0x75, 0x7c, 0x93, 0x77, 0x83, 0x9a, 0x5e,
+	0x95, 0x98, 0xa4, 0xdc, 0x80, 0x15, 0x32, 0x1c, 0xfa, 0xdc, 0x78, 0x6c, 0x48, 0xf6, 0xb0, 0xf5,
+	0x04, 0x16, 0xc4, 0x8d, 0xc7, 0x50, 0x8e, 0xe3, 0xc0, 0x6f, 0x36, 0x1e, 0x09, 0xc3, 0x93, 0xaf,
+	0x37, 0xb9, 0xad, 0x8a, 0x5e, 0x66, 0xb1, 0xf0, 0x2a, 0xd4, 0xec, 0xc0, 0x98, 0x3c, 0x23, 0xe6,
+	0x36, 0x73, 0x5b, 0x65, 0xbd, 0x6a, 0x07, 0xc9, 0xbb, 0x51, 0xe3, 0xeb, 0x1c, 0xd4, 0xb3, 0xcf,
+	0xa0, 0xb8, 0x0d, 0x65, 0xc7, 0x35, 0x89, 0x48, 0x04, 0xf9, 0x06, 0xbf, 0xf5, 0x9a, 0x97, 0xd3,
+	0xe6, 0x41, 0xc4, 0xd7, 0x13, 0xcd, 0x8d, 0xbf, 0x29, 0x50, 0x8e, 0x61, 0x7c, 0x09, 0x0a, 0x1e,
+	0x09, 0xcf, 0x84, 0xb9, 0xe2, 0x6e, 0x0e, 0x29, 0xba, 0x18, 0x73, 0x3c, 0xf0, 0x08, 0x13, 0x29,
+	0x10, 0xe1, 0x7c, 0xcc, 0xf7, 0xd5, 0xa1, 0xc4, 0x12, 0x0d, 0xb2, 0x3b, 0x1a, 0x51, 0x16, 0x06,
+	0xf1, 0xbe, 0x46, 0xf8, 0x5e, 0x04, 0xe3, 0xdb, 0xb0, 0x1a, 0xfa, 0xc4, 0x76, 0x32, 0xdc, 0x82,
+	0xe0, 0xa2, 0x58, 0x90, 0x90, 0x77, 0xe0, 0x72, 0x6c, 0xd7, 0xa2, 0x21, 0x31, 0xcf, 0xa8, 0x35,
+	0x51, 0x2a, 0x89, 0x37, 0xb6, 0xb7, 0x22, 0x42, 0x3b, 0x92, 0xc7, 0xba, 0x8d, 0xbf, 0x2b, 0xb0,
+	0x1a, 0xb7, 0xf4, 0x56, 0x12, 0xac, 0x43, 0x00, 0xc2, 0x98, 0x1b, 0xa6, 0xc3, 0x35, 0x9b, 0xca,
+	0x33, 0x7a, 0xcd, 0x56, 0xa2, 0xa4, 0xa7, 0x0c, 0x6c, 0x8c, 0x00, 0x26, 0x92, 0x85, 0x61, 0xbb,
+	0x02, 0xd5, 0xe8, 0x8d, 0x5b, 0xfc, 0xa3, 0x44, 0x7e, 0x04, 0x82, 0x84, 0x78, 0xef, 0x8f, 0xd7,
+	0xa1, 0x78, 0x4a, 0x87, 0x36, 0x8b, 0x5e, 0xde, 0xe4, 0x20, 0x7e, 0xcf, 0x2b, 0x24, 0xef, 0x79,
+	0xbb, 0x4f, 0x60, 0xcd, 0x74, 0x47, 0xd3, 0xee, 0xee, 0xa2, 0xa9, 0x0f, 0xd1, 0xe0, 0x33, 0xe5,
+	0x0b, 0x98, 0x74, 0x6a, 0x5f, 0xe5, 0xf2, 0xfb, 0xbd, 0xdd, 0x3f, 0xe5, 0x36, 0xf6, 0xa5, 0x5e,
+	0x2f, 0x5e, 0xa6, 0x4e, 0x07, 0x0e, 0x35, 0xb9, 0xeb, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x5f,
+	0x1c, 0x48, 0x4f, 0x0d, 0x1a, 0x00, 0x00,
 }
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
index 4d7d19b677..a5879fe676 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
@@ -626,7 +626,6 @@ func (g *Generator) CommandLineParameters(parameter string) {
 			}
 		}
 	}
-
 	if pluginList != "" {
 		// Amend the set of plugins.
 		enabled := make(map[string]bool)
@@ -1181,7 +1180,6 @@ func (g *Generator) generate(file *FileDescriptor) {
 		g.P("const _ = ", g.Pkg["proto"], ".ProtoPackageIsVersion", generatedCodeVersion, " // please upgrade the proto package")
 		g.P()
 	}
-
 	for _, td := range g.file.imp {
 		g.generateImported(td)
 	}
@@ -2078,11 +2076,6 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			star = "*"
 		}
 
-		// In proto3, only generate getters for message fields and oneof fields.
-		if message.proto3() && *field.Type != descriptor.FieldDescriptorProto_TYPE_MESSAGE && !oneof {
-			continue
-		}
-
 		// Only export getter symbols for basic types,
 		// and for messages and enums in the same package.
 		// Groups are not exported.
@@ -2141,7 +2134,11 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			continue
 		}
 		if !oneof {
-			g.P("if m != nil && m." + fname + " != nil {")
+			if message.proto3() {
+				g.P("if m != nil {")
+			} else {
+				g.P("if m != nil && m." + fname + " != nil {")
+			}
 			g.In()
 			g.P("return " + star + "m." + fname)
 			g.Out()
@@ -2559,6 +2556,7 @@ func (g *Generator) generateExtension(ext *ExtensionDescriptor) {
 	g.P("Field: ", field.Number, ",")
 	g.P(`Name: "`, extName, `",`)
 	g.P("Tag: ", tag, ",")
+	g.P(`Filename: "`, g.file.GetName(), `",`)
 
 	g.Out()
 	g.P("}")
diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
index a29a8d2c20..2660e47a27 100644
--- a/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
+++ b/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
@@ -48,7 +48,7 @@ import (
 // It is incremented whenever an incompatibility between the generated code and
 // the grpc package is introduced; the generated code references
 // a constant, grpc.SupportPackageIsVersionN (where N is generatedCodeVersion).
-const generatedCodeVersion = 3
+const generatedCodeVersion = 4
 
 // Paths for packages used by code generated in this file,
 // relative to the import_prefix of the generator.Generator.
@@ -254,7 +254,7 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi
 		g.P("},")
 	}
 	g.P("},")
-	g.P("Metadata: ", file.VarName(), ",")
+	g.P("Metadata: \"", file.GetName(), "\",")
 	g.P("}")
 	g.P()
 }
diff --git a/vendor/google.golang.org/grpc/backoff.go b/vendor/google.golang.org/grpc/backoff.go
index 52f4f10fc2..c99024ee30 100644
--- a/vendor/google.golang.org/grpc/backoff.go
+++ b/vendor/google.golang.org/grpc/backoff.go
@@ -58,7 +58,7 @@ func setDefaults(bc *BackoffConfig) {
 	}
 }
 
-func (bc BackoffConfig) backoff(retries int) (t time.Duration) {
+func (bc BackoffConfig) backoff(retries int) time.Duration {
 	if retries == 0 {
 		return bc.baseDelay
 	}
diff --git a/vendor/google.golang.org/grpc/balancer.go b/vendor/google.golang.org/grpc/balancer.go
index 419e214611..9d943fbada 100644
--- a/vendor/google.golang.org/grpc/balancer.go
+++ b/vendor/google.golang.org/grpc/balancer.go
@@ -38,6 +38,8 @@ import (
 	"sync"
 
 	"golang.org/x/net/context"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/naming"
 )
@@ -52,6 +54,14 @@ type Address struct {
 	Metadata interface{}
 }
 
+// BalancerConfig specifies the configurations for Balancer.
+type BalancerConfig struct {
+	// DialCreds is the transport credential the Balancer implementation can
+	// use to dial to a remote load balancer server. The Balancer implementations
+	// can ignore this if it does not need to talk to another party securely.
+	DialCreds credentials.TransportCredentials
+}
+
 // BalancerGetOptions configures a Get call.
 // This is the EXPERIMENTAL API and may be changed or extended in the future.
 type BalancerGetOptions struct {
@@ -66,11 +76,11 @@ type Balancer interface {
 	// Start does the initialization work to bootstrap a Balancer. For example,
 	// this function may start the name resolution and watch the updates. It will
 	// be called when dialing.
-	Start(target string) error
+	Start(target string, config BalancerConfig) error
 	// Up informs the Balancer that gRPC has a connection to the server at
 	// addr. It returns down which is called once the connection to addr gets
 	// lost or closed.
-	// TODO: It is not clear how to construct and take advantage the meaningful error
+	// TODO: It is not clear how to construct and take advantage of the meaningful error
 	// parameter for down. Need realistic demands to guide.
 	Up(addr Address) (down func(error))
 	// Get gets the address of a server for the RPC corresponding to ctx.
@@ -205,7 +215,12 @@ func (rr *roundRobin) watchAddrUpdates() error {
 	return nil
 }
 
-func (rr *roundRobin) Start(target string) error {
+func (rr *roundRobin) Start(target string, config BalancerConfig) error {
+	rr.mu.Lock()
+	defer rr.mu.Unlock()
+	if rr.done {
+		return ErrClientConnClosing
+	}
 	if rr.r == nil {
 		// If there is no name resolver installed, it is not needed to
 		// do name resolution. In this case, target is added into rr.addrs
@@ -301,7 +316,7 @@ func (rr *roundRobin) Get(ctx context.Context, opts BalancerGetOptions) (addr Ad
 	if !opts.BlockingWait {
 		if len(rr.addrs) == 0 {
 			rr.mu.Unlock()
-			err = fmt.Errorf("there is no address available")
+			err = Errorf(codes.Unavailable, "there is no address available")
 			return
 		}
 		// Returns the next addr on rr.addrs for failfast RPCs.
diff --git a/vendor/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go
index 84ac178c43..fc8e18afc2 100644
--- a/vendor/google.golang.org/grpc/call.go
+++ b/vendor/google.golang.org/grpc/call.go
@@ -36,11 +36,13 @@ package grpc
 import (
 	"bytes"
 	"io"
+	"math"
 	"time"
 
 	"golang.org/x/net/context"
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/transport"
 )
 
@@ -48,22 +50,40 @@ import (
 // On error, it returns the error and indicates whether the call should be retried.
 //
 // TODO(zhaoq): Check whether the received message sequence is valid.
-func recvResponse(dopts dialOptions, t transport.ClientTransport, c *callInfo, stream *transport.Stream, reply interface{}) error {
+// TODO ctx is used for stats collection and processing. It is the context passed from the application.
+func recvResponse(ctx context.Context, dopts dialOptions, t transport.ClientTransport, c *callInfo, stream *transport.Stream, reply interface{}) (err error) {
 	// Try to acquire header metadata from the server if there is any.
-	var err error
+	defer func() {
+		if err != nil {
+			if _, ok := err.(transport.ConnectionError); !ok {
+				t.CloseStream(stream, err)
+			}
+		}
+	}()
 	c.headerMD, err = stream.Header()
 	if err != nil {
-		return err
+		return
 	}
 	p := &parser{r: stream}
+	var inPayload *stats.InPayload
+	if stats.On() {
+		inPayload = &stats.InPayload{
+			Client: true,
+		}
+	}
 	for {
-		if err = recv(p, dopts.codec, stream, dopts.dc, reply); err != nil {
+		if err = recv(p, dopts.codec, stream, dopts.dc, reply, math.MaxInt32, inPayload); err != nil {
 			if err == io.EOF {
 				break
 			}
-			return err
+			return
 		}
 	}
+	if inPayload != nil && err == io.EOF && stream.StatusCode() == codes.OK {
+		// TODO in the current implementation, inTrailer may be handled before inPayload in some cases.
+		// Fix the order if necessary.
+		stats.HandleRPC(ctx, inPayload)
+	}
 	c.trailerMD = stream.Trailer()
 	return nil
 }
@@ -76,21 +96,37 @@ func sendRequest(ctx context.Context, codec Codec, compressor Compressor, callHd
 	}
 	defer func() {
 		if err != nil {
+			// If err is connection error, t will be closed, no need to close stream here.
 			if _, ok := err.(transport.ConnectionError); !ok {
 				t.CloseStream(stream, err)
 			}
 		}
 	}()
-	var cbuf *bytes.Buffer
+	var (
+		cbuf       *bytes.Buffer
+		outPayload *stats.OutPayload
+	)
 	if compressor != nil {
 		cbuf = new(bytes.Buffer)
 	}
-	outBuf, err := encode(codec, args, compressor, cbuf)
+	if stats.On() {
+		outPayload = &stats.OutPayload{
+			Client: true,
+		}
+	}
+	outBuf, err := encode(codec, args, compressor, cbuf, outPayload)
 	if err != nil {
-		return nil, transport.StreamErrorf(codes.Internal, "grpc: %v", err)
+		return nil, Errorf(codes.Internal, "grpc: %v", err)
 	}
 	err = t.Write(stream, outBuf, opts)
-	if err != nil {
+	if err == nil && outPayload != nil {
+		outPayload.SentTime = time.Now()
+		stats.HandleRPC(ctx, outPayload)
+	}
+	// t.NewStream(...) could lead to an early rejection of the RPC (e.g., the service/method
+	// does not exist.) so that t.Write could get io.EOF from wait(...). Leave the following
+	// recvResponse to get the final status.
+	if err != nil && err != io.EOF {
 		return nil, err
 	}
 	// Sent successfully.
@@ -100,7 +136,14 @@ func sendRequest(ctx context.Context, codec Codec, compressor Compressor, callHd
 // Invoke sends the RPC request on the wire and returns after response is received.
 // Invoke is called by generated code. Also users can call Invoke directly when it
 // is really needed in their use cases.
-func Invoke(ctx context.Context, method string, args, reply interface{}, cc *ClientConn, opts ...CallOption) (err error) {
+func Invoke(ctx context.Context, method string, args, reply interface{}, cc *ClientConn, opts ...CallOption) error {
+	if cc.dopts.unaryInt != nil {
+		return cc.dopts.unaryInt(ctx, method, args, reply, cc, invoke, opts...)
+	}
+	return invoke(ctx, method, args, reply, cc, opts...)
+}
+
+func invoke(ctx context.Context, method string, args, reply interface{}, cc *ClientConn, opts ...CallOption) (e error) {
 	c := defaultCallInfo
 	for _, o := range opts {
 		if err := o.before(&c); err != nil {
@@ -122,12 +165,31 @@ func Invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 		c.traceInfo.tr.LazyLog(&c.traceInfo.firstLine, false)
 		// TODO(dsymonds): Arrange for c.traceInfo.firstLine.remoteAddr to be set.
 		defer func() {
-			if err != nil {
-				c.traceInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
+			if e != nil {
+				c.traceInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{e}}, true)
 				c.traceInfo.tr.SetError()
 			}
 		}()
 	}
+	if stats.On() {
+		ctx = stats.TagRPC(ctx, &stats.RPCTagInfo{FullMethodName: method})
+		begin := &stats.Begin{
+			Client:    true,
+			BeginTime: time.Now(),
+			FailFast:  c.failFast,
+		}
+		stats.HandleRPC(ctx, begin)
+	}
+	defer func() {
+		if stats.On() {
+			end := &stats.End{
+				Client:  true,
+				EndTime: time.Now(),
+				Error:   e,
+			}
+			stats.HandleRPC(ctx, end)
+		}
+	}()
 	topts := &transport.Options{
 		Last:  true,
 		Delay: false,
@@ -158,9 +220,9 @@ func Invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 			if _, ok := err.(*rpcError); ok {
 				return err
 			}
-			if err == errConnClosing {
+			if err == errConnClosing || err == errConnUnavailable {
 				if c.failFast {
-					return Errorf(codes.Unavailable, "%v", errConnClosing)
+					return Errorf(codes.Unavailable, "%v", err)
 				}
 				continue
 			}
@@ -176,7 +238,10 @@ func Invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 				put()
 				put = nil
 			}
-			if _, ok := err.(transport.ConnectionError); ok {
+			// Retry a non-failfast RPC when
+			// i) there is a connection error; or
+			// ii) the server started to drain before this RPC was initiated.
+			if _, ok := err.(transport.ConnectionError); ok || err == transport.ErrStreamDrain {
 				if c.failFast {
 					return toRPCErr(err)
 				}
@@ -184,20 +249,18 @@ func Invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 			}
 			return toRPCErr(err)
 		}
-		// Receive the response
-		err = recvResponse(cc.dopts, t, &c, stream, reply)
+		err = recvResponse(ctx, cc.dopts, t, &c, stream, reply)
 		if err != nil {
 			if put != nil {
 				put()
 				put = nil
 			}
-			if _, ok := err.(transport.ConnectionError); ok {
+			if _, ok := err.(transport.ConnectionError); ok || err == transport.ErrStreamDrain {
 				if c.failFast {
 					return toRPCErr(err)
 				}
 				continue
 			}
-			t.CloseStream(stream, err)
 			return toRPCErr(err)
 		}
 		if c.traceInfo.tr != nil {
diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go
index c3c7691dc0..f6dab4b772 100644
--- a/vendor/google.golang.org/grpc/clientconn.go
+++ b/vendor/google.golang.org/grpc/clientconn.go
@@ -43,7 +43,6 @@ import (
 
 	"golang.org/x/net/context"
 	"golang.org/x/net/trace"
-	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/transport"
@@ -68,13 +67,15 @@ var (
 	// errCredentialsConflict indicates that grpc.WithTransportCredentials()
 	// and grpc.WithInsecure() are both called for a connection.
 	errCredentialsConflict = errors.New("grpc: transport credentials are set for an insecure connection (grpc.WithTransportCredentials() and grpc.WithInsecure() are both called)")
-	// errNetworkIP indicates that the connection is down due to some network I/O error.
+	// errNetworkIO indicates that the connection is down due to some network I/O error.
 	errNetworkIO = errors.New("grpc: failed with network I/O error")
 	// errConnDrain indicates that the connection starts to be drained and does not accept any new RPCs.
 	errConnDrain = errors.New("grpc: the connection is drained")
 	// errConnClosing indicates that the connection is closing.
 	errConnClosing = errors.New("grpc: the connection is closing")
-	errNoAddr      = errors.New("grpc: there is no address available to dial")
+	// errConnUnavailable indicates that the connection is unavailable.
+	errConnUnavailable = errors.New("grpc: the connection is unavailable")
+	errNoAddr          = errors.New("grpc: there is no address available to dial")
 	// minimum time to give a connection to complete
 	minConnectTimeout = 20 * time.Second
 )
@@ -82,15 +83,17 @@ var (
 // dialOptions configure a Dial call. dialOptions are set by the DialOption
 // values passed to Dial.
 type dialOptions struct {
-	codec    Codec
-	cp       Compressor
-	dc       Decompressor
-	bs       backoffStrategy
-	balancer Balancer
-	block    bool
-	insecure bool
-	timeout  time.Duration
-	copts    transport.ConnectOptions
+	unaryInt  UnaryClientInterceptor
+	streamInt StreamClientInterceptor
+	codec     Codec
+	cp        Compressor
+	dc        Decompressor
+	bs        backoffStrategy
+	balancer  Balancer
+	block     bool
+	insecure  bool
+	timeout   time.Duration
+	copts     transport.ConnectOptions
 }
 
 // DialOption configures how we set up the connection.
@@ -196,9 +199,27 @@ func WithTimeout(d time.Duration) DialOption {
 }
 
 // WithDialer returns a DialOption that specifies a function to use for dialing network addresses.
-func WithDialer(f func(addr string, timeout time.Duration) (net.Conn, error)) DialOption {
+// If FailOnNonTempDialError() is set to true, and an error is returned by f, gRPC checks the error's
+// Temporary() method to decide if it should try to reconnect to the network address.
+func WithDialer(f func(string, time.Duration) (net.Conn, error)) DialOption {
 	return func(o *dialOptions) {
-		o.copts.Dialer = f
+		o.copts.Dialer = func(ctx context.Context, addr string) (net.Conn, error) {
+			if deadline, ok := ctx.Deadline(); ok {
+				return f(addr, deadline.Sub(time.Now()))
+			}
+			return f(addr, 0)
+		}
+	}
+}
+
+// FailOnNonTempDialError returns a DialOption that specified if gRPC fails on non-temporary dial errors.
+// If f is true, and dialer returns a non-temporary error, gRPC will fail the connection to the network
+// address and won't try to reconnect.
+// The default value of FailOnNonTempDialError is false.
+// This is an EXPERIMENTAL API.
+func FailOnNonTempDialError(f bool) DialOption {
+	return func(o *dialOptions) {
+		o.copts.FailOnNonTempDialError = f
 	}
 }
 
@@ -209,12 +230,48 @@ func WithUserAgent(s string) DialOption {
 	}
 }
 
-// Dial creates a client connection the given target.
+// WithUnaryInterceptor returns a DialOption that specifies the interceptor for unary RPCs.
+func WithUnaryInterceptor(f UnaryClientInterceptor) DialOption {
+	return func(o *dialOptions) {
+		o.unaryInt = f
+	}
+}
+
+// WithStreamInterceptor returns a DialOption that specifies the interceptor for streaming RPCs.
+func WithStreamInterceptor(f StreamClientInterceptor) DialOption {
+	return func(o *dialOptions) {
+		o.streamInt = f
+	}
+}
+
+// Dial creates a client connection to the given target.
 func Dial(target string, opts ...DialOption) (*ClientConn, error) {
+	return DialContext(context.Background(), target, opts...)
+}
+
+// DialContext creates a client connection to the given target. ctx can be used to
+// cancel or expire the pending connecting. Once this function returns, the
+// cancellation and expiration of ctx will be noop. Users should call ClientConn.Close
+// to terminate all the pending operations after this function returns.
+// This is the EXPERIMENTAL API.
+func DialContext(ctx context.Context, target string, opts ...DialOption) (conn *ClientConn, err error) {
 	cc := &ClientConn{
 		target: target,
 		conns:  make(map[Address]*addrConn),
 	}
+	cc.ctx, cc.cancel = context.WithCancel(context.Background())
+	defer func() {
+		select {
+		case <-ctx.Done():
+			conn, err = nil, ctx.Err()
+		default:
+		}
+
+		if err != nil {
+			cc.Close()
+		}
+	}()
+
 	for _, opt := range opts {
 		opt(&cc.dopts)
 	}
@@ -226,31 +283,49 @@ func Dial(target string, opts ...DialOption) (*ClientConn, error) {
 	if cc.dopts.bs == nil {
 		cc.dopts.bs = DefaultBackoffConfig
 	}
-	if cc.dopts.balancer == nil {
-		cc.dopts.balancer = RoundRobin(nil)
-	}
-
-	if err := cc.dopts.balancer.Start(target); err != nil {
-		return nil, err
-	}
-	var (
-		ok    bool
-		addrs []Address
-	)
-	ch := cc.dopts.balancer.Notify()
-	if ch == nil {
-		// There is no name resolver installed.
-		addrs = append(addrs, Address{Addr: target})
+	creds := cc.dopts.copts.TransportCredentials
+	if creds != nil && creds.Info().ServerName != "" {
+		cc.authority = creds.Info().ServerName
 	} else {
-		addrs, ok = <-ch
-		if !ok || len(addrs) == 0 {
-			return nil, errNoAddr
+		colonPos := strings.LastIndex(target, ":")
+		if colonPos == -1 {
+			colonPos = len(target)
 		}
+		cc.authority = target[:colonPos]
 	}
+	var ok bool
 	waitC := make(chan error, 1)
 	go func() {
+		var addrs []Address
+		if cc.dopts.balancer == nil {
+			// Connect to target directly if balancer is nil.
+			addrs = append(addrs, Address{Addr: target})
+		} else {
+			var credsClone credentials.TransportCredentials
+			if creds != nil {
+				credsClone = creds.Clone()
+			}
+			config := BalancerConfig{
+				DialCreds: credsClone,
+			}
+			if err := cc.dopts.balancer.Start(target, config); err != nil {
+				waitC <- err
+				return
+			}
+			ch := cc.dopts.balancer.Notify()
+			if ch == nil {
+				// There is no name resolver installed.
+				addrs = append(addrs, Address{Addr: target})
+			} else {
+				addrs, ok = <-ch
+				if !ok || len(addrs) == 0 {
+					waitC <- errNoAddr
+					return
+				}
+			}
+		}
 		for _, a := range addrs {
-			if err := cc.newAddrConn(a, false); err != nil {
+			if err := cc.resetAddrConn(a, false, nil); err != nil {
 				waitC <- err
 				return
 			}
@@ -262,23 +337,20 @@ func Dial(target string, opts ...DialOption) (*ClientConn, error) {
 		timeoutCh = time.After(cc.dopts.timeout)
 	}
 	select {
+	case <-ctx.Done():
+		return nil, ctx.Err()
 	case err := <-waitC:
 		if err != nil {
-			cc.Close()
 			return nil, err
 		}
 	case <-timeoutCh:
-		cc.Close()
 		return nil, ErrClientConnTimeout
 	}
+	// If balancer is nil or balancer.Notify() is nil, ok will be false here.
+	// The lbWatcher goroutine will not be created.
 	if ok {
 		go cc.lbWatcher()
 	}
-	colonPos := strings.LastIndex(target, ":")
-	if colonPos == -1 {
-		colonPos = len(target)
-	}
-	cc.authority = target[:colonPos]
 	return cc, nil
 }
 
@@ -317,6 +389,9 @@ func (s ConnectivityState) String() string {
 
 // ClientConn represents a client connection to an RPC server.
 type ClientConn struct {
+	ctx    context.Context
+	cancel context.CancelFunc
+
 	target    string
 	authority string
 	dopts     dialOptions
@@ -347,11 +422,12 @@ func (cc *ClientConn) lbWatcher() {
 			}
 			if !keep {
 				del = append(del, c)
+				delete(cc.conns, c.addr)
 			}
 		}
 		cc.mu.Unlock()
 		for _, a := range add {
-			cc.newAddrConn(a, true)
+			cc.resetAddrConn(a, true, nil)
 		}
 		for _, c := range del {
 			c.tearDown(errConnDrain)
@@ -359,13 +435,17 @@ func (cc *ClientConn) lbWatcher() {
 	}
 }
 
-func (cc *ClientConn) newAddrConn(addr Address, skipWait bool) error {
+// resetAddrConn creates an addrConn for addr and adds it to cc.conns.
+// If there is an old addrConn for addr, it will be torn down, using tearDownErr as the reason.
+// If tearDownErr is nil, errConnDrain will be used instead.
+func (cc *ClientConn) resetAddrConn(addr Address, skipWait bool, tearDownErr error) error {
 	ac := &addrConn{
-		cc:           cc,
-		addr:         addr,
-		dopts:        cc.dopts,
-		shutdownChan: make(chan struct{}),
+		cc:    cc,
+		addr:  addr,
+		dopts: cc.dopts,
 	}
+	ac.ctx, ac.cancel = context.WithCancel(cc.ctx)
+	ac.stateCV = sync.NewCond(&ac.mu)
 	if EnableTracing {
 		ac.events = trace.NewEventLog("grpc.ClientConn", ac.addr.Addr)
 	}
@@ -383,26 +463,44 @@ func (cc *ClientConn) newAddrConn(addr Address, skipWait bool) error {
 			}
 		}
 	}
-	// Insert ac into ac.cc.conns. This needs to be done before any getTransport(...) is called.
-	ac.cc.mu.Lock()
-	if ac.cc.conns == nil {
-		ac.cc.mu.Unlock()
+	// Track ac in cc. This needs to be done before any getTransport(...) is called.
+	cc.mu.Lock()
+	if cc.conns == nil {
+		cc.mu.Unlock()
 		return ErrClientConnClosing
 	}
-	stale := ac.cc.conns[ac.addr]
-	ac.cc.conns[ac.addr] = ac
-	ac.cc.mu.Unlock()
+	stale := cc.conns[ac.addr]
+	cc.conns[ac.addr] = ac
+	cc.mu.Unlock()
 	if stale != nil {
 		// There is an addrConn alive on ac.addr already. This could be due to
-		// i) stale's Close is undergoing;
-		// ii) a buggy Balancer notifies duplicated Addresses.
-		stale.tearDown(errConnDrain)
+		// 1) a buggy Balancer notifies duplicated Addresses;
+		// 2) goaway was received, a new ac will replace the old ac.
+		//    The old ac should be deleted from cc.conns, but the
+		//    underlying transport should drain rather than close.
+		if tearDownErr == nil {
+			// tearDownErr is nil if resetAddrConn is called by
+			// 1) Dial
+			// 2) lbWatcher
+			// In both cases, the stale ac should drain, not close.
+			stale.tearDown(errConnDrain)
+		} else {
+			stale.tearDown(tearDownErr)
+		}
 	}
-	ac.stateCV = sync.NewCond(&ac.mu)
 	// skipWait may overwrite the decision in ac.dopts.block.
 	if ac.dopts.block && !skipWait {
 		if err := ac.resetTransport(false); err != nil {
-			ac.tearDown(err)
+			if err != errConnClosing {
+				// Tear down ac and delete it from cc.conns.
+				cc.mu.Lock()
+				delete(cc.conns, ac.addr)
+				cc.mu.Unlock()
+				ac.tearDown(err)
+			}
+			if e, ok := err.(transport.ConnectionError); ok && !e.Temporary() {
+				return e.Origin()
+			}
 			return err
 		}
 		// Start to monitor the error status of transport.
@@ -412,7 +510,10 @@ func (cc *ClientConn) newAddrConn(addr Address, skipWait bool) error {
 		go func() {
 			if err := ac.resetTransport(false); err != nil {
 				grpclog.Printf("Failed to dial %s: %v; please retry.", ac.addr.Addr, err)
-				ac.tearDown(err)
+				if err != errConnClosing {
+					// Keep this ac in cc.conns, to get the reason it's torn down.
+					ac.tearDown(err)
+				}
 				return
 			}
 			ac.transportMonitor()
@@ -422,24 +523,48 @@ func (cc *ClientConn) newAddrConn(addr Address, skipWait bool) error {
 }
 
 func (cc *ClientConn) getTransport(ctx context.Context, opts BalancerGetOptions) (transport.ClientTransport, func(), error) {
-	addr, put, err := cc.dopts.balancer.Get(ctx, opts)
-	if err != nil {
-		return nil, nil, toRPCErr(err)
-	}
-	cc.mu.RLock()
-	if cc.conns == nil {
+	var (
+		ac  *addrConn
+		ok  bool
+		put func()
+	)
+	if cc.dopts.balancer == nil {
+		// If balancer is nil, there should be only one addrConn available.
+		cc.mu.RLock()
+		if cc.conns == nil {
+			cc.mu.RUnlock()
+			return nil, nil, toRPCErr(ErrClientConnClosing)
+		}
+		for _, ac = range cc.conns {
+			// Break after the first iteration to get the first addrConn.
+			ok = true
+			break
+		}
+		cc.mu.RUnlock()
+	} else {
+		var (
+			addr Address
+			err  error
+		)
+		addr, put, err = cc.dopts.balancer.Get(ctx, opts)
+		if err != nil {
+			return nil, nil, toRPCErr(err)
+		}
+		cc.mu.RLock()
+		if cc.conns == nil {
+			cc.mu.RUnlock()
+			return nil, nil, toRPCErr(ErrClientConnClosing)
+		}
+		ac, ok = cc.conns[addr]
 		cc.mu.RUnlock()
-		return nil, nil, toRPCErr(ErrClientConnClosing)
 	}
-	ac, ok := cc.conns[addr]
-	cc.mu.RUnlock()
 	if !ok {
 		if put != nil {
 			put()
 		}
-		return nil, nil, Errorf(codes.Internal, "grpc: failed to find the transport to send the rpc")
+		return nil, nil, errConnClosing
 	}
-	t, err := ac.wait(ctx, !opts.BlockingWait)
+	t, err := ac.wait(ctx, cc.dopts.balancer != nil, !opts.BlockingWait)
 	if err != nil {
 		if put != nil {
 			put()
@@ -451,6 +576,8 @@ func (cc *ClientConn) getTransport(ctx context.Context, opts BalancerGetOptions)
 
 // Close tears down the ClientConn and all underlying connections.
 func (cc *ClientConn) Close() error {
+	cc.cancel()
+
 	cc.mu.Lock()
 	if cc.conns == nil {
 		cc.mu.Unlock()
@@ -459,7 +586,9 @@ func (cc *ClientConn) Close() error {
 	conns := cc.conns
 	cc.conns = nil
 	cc.mu.Unlock()
-	cc.dopts.balancer.Close()
+	if cc.dopts.balancer != nil {
+		cc.dopts.balancer.Close()
+	}
 	for _, ac := range conns {
 		ac.tearDown(ErrClientConnClosing)
 	}
@@ -468,11 +597,13 @@ func (cc *ClientConn) Close() error {
 
 // addrConn is a network connection to a given address.
 type addrConn struct {
-	cc           *ClientConn
-	addr         Address
-	dopts        dialOptions
-	shutdownChan chan struct{}
-	events       trace.EventLog
+	ctx    context.Context
+	cancel context.CancelFunc
+
+	cc     *ClientConn
+	addr   Address
+	dopts  dialOptions
+	events trace.EventLog
 
 	mu      sync.Mutex
 	state   ConnectivityState
@@ -482,6 +613,9 @@ type addrConn struct {
 	// due to timeout.
 	ready     chan struct{}
 	transport transport.ClientTransport
+
+	// The reason this addrConn is torn down.
+	tearDownErr error
 }
 
 // printf records an event in ac's event log, unless ac has been closed.
@@ -537,8 +671,7 @@ func (ac *addrConn) waitForStateChange(ctx context.Context, sourceState Connecti
 }
 
 func (ac *addrConn) resetTransport(closeTransport bool) error {
-	var retries int
-	for {
+	for retries := 0; ; retries++ {
 		ac.mu.Lock()
 		ac.printf("connecting")
 		if ac.state == Shutdown {
@@ -558,13 +691,24 @@ func (ac *addrConn) resetTransport(closeTransport bool) error {
 			t.Close()
 		}
 		sleepTime := ac.dopts.bs.backoff(retries)
-		ac.dopts.copts.Timeout = sleepTime
-		if sleepTime < minConnectTimeout {
-			ac.dopts.copts.Timeout = minConnectTimeout
+		timeout := minConnectTimeout
+		if timeout < sleepTime {
+			timeout = sleepTime
 		}
+		ctx, cancel := context.WithTimeout(ac.ctx, timeout)
 		connectTime := time.Now()
-		newTransport, err := transport.NewClientTransport(ac.addr.Addr, &ac.dopts.copts)
+		sinfo := transport.TargetInfo{
+			Addr:     ac.addr.Addr,
+			Metadata: ac.addr.Metadata,
+		}
+		newTransport, err := transport.NewClientTransport(ctx, sinfo, ac.dopts.copts)
 		if err != nil {
+			cancel()
+
+			if e, ok := err.(transport.ConnectionError); ok && !e.Temporary() {
+				return err
+			}
+			grpclog.Printf("grpc: addrConn.resetTransport failed to create client transport: %v; Reconnecting to %v", err, ac.addr)
 			ac.mu.Lock()
 			if ac.state == Shutdown {
 				// ac.tearDown(...) has been invoked.
@@ -579,17 +723,12 @@ func (ac *addrConn) resetTransport(closeTransport bool) error {
 				ac.ready = nil
 			}
 			ac.mu.Unlock()
-			sleepTime -= time.Since(connectTime)
-			if sleepTime < 0 {
-				sleepTime = 0
-			}
 			closeTransport = false
 			select {
-			case <-time.After(sleepTime):
-			case <-ac.shutdownChan:
+			case <-time.After(sleepTime - time.Since(connectTime)):
+			case <-ac.ctx.Done():
+				return ac.ctx.Err()
 			}
-			retries++
-			grpclog.Printf("grpc: addrConn.resetTransport failed to create client transport: %v; Reconnecting to %q", err, ac.addr)
 			continue
 		}
 		ac.mu.Lock()
@@ -607,7 +746,9 @@ func (ac *addrConn) resetTransport(closeTransport bool) error {
 			close(ac.ready)
 			ac.ready = nil
 		}
-		ac.down = ac.cc.dopts.balancer.Up(ac.addr)
+		if ac.cc.dopts.balancer != nil {
+			ac.down = ac.cc.dopts.balancer.Up(ac.addr)
+		}
 		ac.mu.Unlock()
 		return nil
 	}
@@ -621,14 +762,42 @@ func (ac *addrConn) transportMonitor() {
 		t := ac.transport
 		ac.mu.Unlock()
 		select {
-		// shutdownChan is needed to detect the teardown when
+		// This is needed to detect the teardown when
 		// the addrConn is idle (i.e., no RPC in flight).
-		case <-ac.shutdownChan:
+		case <-ac.ctx.Done():
+			select {
+			case <-t.Error():
+				t.Close()
+			default:
+			}
+			return
+		case <-t.GoAway():
+			// If GoAway happens without any network I/O error, ac is closed without shutting down the
+			// underlying transport (the transport will be closed when all the pending RPCs finished or
+			// failed.).
+			// If GoAway and some network I/O error happen concurrently, ac and its underlying transport
+			// are closed.
+			// In both cases, a new ac is created.
+			select {
+			case <-t.Error():
+				ac.cc.resetAddrConn(ac.addr, true, errNetworkIO)
+			default:
+				ac.cc.resetAddrConn(ac.addr, true, errConnDrain)
+			}
 			return
 		case <-t.Error():
+			select {
+			case <-ac.ctx.Done():
+				t.Close()
+				return
+			case <-t.GoAway():
+				ac.cc.resetAddrConn(ac.addr, true, errNetworkIO)
+				return
+			default:
+			}
 			ac.mu.Lock()
 			if ac.state == Shutdown {
-				// ac.tearDown(...) has been invoked.
+				// ac has been shutdown.
 				ac.mu.Unlock()
 				return
 			}
@@ -640,6 +809,10 @@ func (ac *addrConn) transportMonitor() {
 				ac.printf("transport exiting: %v", err)
 				ac.mu.Unlock()
 				grpclog.Printf("grpc: addrConn.transportMonitor exits due to: %v", err)
+				if err != errConnClosing {
+					// Keep this ac in cc.conns, to get the reason it's torn down.
+					ac.tearDown(err)
+				}
 				return
 			}
 		}
@@ -647,35 +820,42 @@ func (ac *addrConn) transportMonitor() {
 }
 
 // wait blocks until i) the new transport is up or ii) ctx is done or iii) ac is closed or
-// iv) transport is in TransientFailure and the RPC is fail-fast.
-func (ac *addrConn) wait(ctx context.Context, failFast bool) (transport.ClientTransport, error) {
+// iv) transport is in TransientFailure and there is a balancer/failfast is true.
+func (ac *addrConn) wait(ctx context.Context, hasBalancer, failfast bool) (transport.ClientTransport, error) {
 	for {
 		ac.mu.Lock()
 		switch {
 		case ac.state == Shutdown:
+			if failfast || !hasBalancer {
+				// RPC is failfast or balancer is nil. This RPC should fail with ac.tearDownErr.
+				err := ac.tearDownErr
+				ac.mu.Unlock()
+				return nil, err
+			}
 			ac.mu.Unlock()
 			return nil, errConnClosing
 		case ac.state == Ready:
 			ct := ac.transport
 			ac.mu.Unlock()
 			return ct, nil
-		case ac.state == TransientFailure && failFast:
-			ac.mu.Unlock()
-			return nil, Errorf(codes.Unavailable, "grpc: RPC failed fast due to transport failure")
-		default:
-			ready := ac.ready
-			if ready == nil {
-				ready = make(chan struct{})
-				ac.ready = ready
-			}
-			ac.mu.Unlock()
-			select {
-			case <-ctx.Done():
-				return nil, toRPCErr(ctx.Err())
-			// Wait until the new transport is ready or failed.
-			case <-ready:
+		case ac.state == TransientFailure:
+			if failfast || hasBalancer {
+				ac.mu.Unlock()
+				return nil, errConnUnavailable
 			}
 		}
+		ready := ac.ready
+		if ready == nil {
+			ready = make(chan struct{})
+			ac.ready = ready
+		}
+		ac.mu.Unlock()
+		select {
+		case <-ctx.Done():
+			return nil, toRPCErr(ctx.Err())
+		// Wait until the new transport is ready or failed.
+		case <-ready:
+		}
 	}
 }
 
@@ -683,24 +863,28 @@ func (ac *addrConn) wait(ctx context.Context, failFast bool) (transport.ClientTr
 // TODO(zhaoq): Make this synchronous to avoid unbounded memory consumption in
 // some edge cases (e.g., the caller opens and closes many addrConn's in a
 // tight loop.
+// tearDown doesn't remove ac from ac.cc.conns.
 func (ac *addrConn) tearDown(err error) {
+	ac.cancel()
+
 	ac.mu.Lock()
-	defer func() {
-		ac.mu.Unlock()
-		ac.cc.mu.Lock()
-		if ac.cc.conns != nil {
-			delete(ac.cc.conns, ac.addr)
-		}
-		ac.cc.mu.Unlock()
-	}()
-	if ac.state == Shutdown {
-		return
-	}
-	ac.state = Shutdown
+	defer ac.mu.Unlock()
 	if ac.down != nil {
 		ac.down(downErrorf(false, false, "%v", err))
 		ac.down = nil
 	}
+	if err == errConnDrain && ac.transport != nil {
+		// GracefulClose(...) may be executed multiple times when
+		// i) receiving multiple GoAway frames from the server; or
+		// ii) there are concurrent name resolver/Balancer triggered
+		// address removal and GoAway.
+		ac.transport.GracefulClose()
+	}
+	if ac.state == Shutdown {
+		return
+	}
+	ac.state = Shutdown
+	ac.tearDownErr = err
 	ac.stateCV.Broadcast()
 	if ac.events != nil {
 		ac.events.Finish()
@@ -710,15 +894,8 @@ func (ac *addrConn) tearDown(err error) {
 		close(ac.ready)
 		ac.ready = nil
 	}
-	if ac.transport != nil {
-		if err == errConnDrain {
-			ac.transport.GracefulClose()
-		} else {
-			ac.transport.Close()
-		}
-	}
-	if ac.shutdownChan != nil {
-		close(ac.shutdownChan)
+	if ac.transport != nil && err != errConnDrain {
+		ac.transport.Close()
 	}
 	return
 }
diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go
index 8d4c57ccf6..5555ef024f 100644
--- a/vendor/google.golang.org/grpc/credentials/credentials.go
+++ b/vendor/google.golang.org/grpc/credentials/credentials.go
@@ -40,11 +40,11 @@ package credentials // import "google.golang.org/grpc/credentials"
 import (
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net"
 	"strings"
-	"time"
 
 	"golang.org/x/net/context"
 )
@@ -72,7 +72,7 @@ type PerRPCCredentials interface {
 }
 
 // ProtocolInfo provides information regarding the gRPC wire protocol version,
-// security protocol, security protocol version in use, etc.
+// security protocol, security protocol version in use, server name, etc.
 type ProtocolInfo struct {
 	// ProtocolVersion is the gRPC wire protocol version.
 	ProtocolVersion string
@@ -80,6 +80,8 @@ type ProtocolInfo struct {
 	SecurityProtocol string
 	// SecurityVersion is the security protocol version.
 	SecurityVersion string
+	// ServerName is the user-configured server name.
+	ServerName string
 }
 
 // AuthInfo defines the common interface for the auth information the users are interested in.
@@ -87,19 +89,32 @@ type AuthInfo interface {
 	AuthType() string
 }
 
+var (
+	// ErrConnDispatched indicates that rawConn has been dispatched out of gRPC
+	// and the caller should not close rawConn.
+	ErrConnDispatched = errors.New("credentials: rawConn is dispatched out of gRPC")
+)
+
 // TransportCredentials defines the common interface for all the live gRPC wire
 // protocols and supported transport security protocols (e.g., TLS, SSL).
 type TransportCredentials interface {
 	// ClientHandshake does the authentication handshake specified by the corresponding
 	// authentication protocol on rawConn for clients. It returns the authenticated
 	// connection and the corresponding auth information about the connection.
-	ClientHandshake(addr string, rawConn net.Conn, timeout time.Duration) (net.Conn, AuthInfo, error)
+	// Implementations must use the provided context to implement timely cancellation.
+	ClientHandshake(context.Context, string, net.Conn) (net.Conn, AuthInfo, error)
 	// ServerHandshake does the authentication handshake for servers. It returns
 	// the authenticated connection and the corresponding auth information about
 	// the connection.
-	ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error)
+	ServerHandshake(net.Conn) (net.Conn, AuthInfo, error)
 	// Info provides the ProtocolInfo of this TransportCredentials.
 	Info() ProtocolInfo
+	// Clone makes a copy of this TransportCredentials.
+	Clone() TransportCredentials
+	// OverrideServerName overrides the server name used to verify the hostname on the returned certificates from the server.
+	// gRPC internals also use it to override the virtual hosting name if it is set.
+	// It must be called before dialing. Currently, this is only used by grpclb.
+	OverrideServerName(string) error
 }
 
 // TLSInfo contains the auth information for a TLS authenticated connection.
@@ -123,55 +138,32 @@ func (c tlsCreds) Info() ProtocolInfo {
 	return ProtocolInfo{
 		SecurityProtocol: "tls",
 		SecurityVersion:  "1.2",
+		ServerName:       c.config.ServerName,
 	}
 }
 
-// GetRequestMetadata returns nil, nil since TLS credentials does not have
-// metadata.
-func (c *tlsCreds) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
-	return nil, nil
-}
-
-func (c *tlsCreds) RequireTransportSecurity() bool {
-	return true
-}
-
-type timeoutError struct{}
-
-func (timeoutError) Error() string   { return "credentials: Dial timed out" }
-func (timeoutError) Timeout() bool   { return true }
-func (timeoutError) Temporary() bool { return true }
-
-func (c *tlsCreds) ClientHandshake(addr string, rawConn net.Conn, timeout time.Duration) (_ net.Conn, _ AuthInfo, err error) {
-	// borrow some code from tls.DialWithDialer
-	var errChannel chan error
-	if timeout != 0 {
-		errChannel = make(chan error, 2)
-		time.AfterFunc(timeout, func() {
-			errChannel <- timeoutError{}
-		})
-	}
+func (c *tlsCreds) ClientHandshake(ctx context.Context, addr string, rawConn net.Conn) (_ net.Conn, _ AuthInfo, err error) {
 	// use local cfg to avoid clobbering ServerName if using multiple endpoints
-	cfg := *c.config
-	if c.config.ServerName == "" {
+	cfg := cloneTLSConfig(c.config)
+	if cfg.ServerName == "" {
 		colonPos := strings.LastIndex(addr, ":")
 		if colonPos == -1 {
 			colonPos = len(addr)
 		}
 		cfg.ServerName = addr[:colonPos]
 	}
-	conn := tls.Client(rawConn, &cfg)
-	if timeout == 0 {
-		err = conn.Handshake()
-	} else {
-		go func() {
-			errChannel <- conn.Handshake()
-		}()
-		err = <-errChannel
-	}
-	if err != nil {
-		rawConn.Close()
-		return nil, nil, err
+	conn := tls.Client(rawConn, cfg)
+	errChannel := make(chan error, 1)
+	go func() {
+		errChannel <- conn.Handshake()
+	}()
+	select {
+	case err := <-errChannel:
+		if err != nil {
+			return nil, nil, err
+		}
+	case <-ctx.Done():
+		return nil, nil, ctx.Err()
 	}
 	// TODO(zhaoq): Omit the auth info for client now. It is more for
 	// information than anything else.
@@ -181,26 +173,38 @@ func (c *tlsCreds) ClientHandshake(addr string, rawConn net.Conn, timeout time.D
 func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error) {
 	conn := tls.Server(rawConn, c.config)
 	if err := conn.Handshake(); err != nil {
-		rawConn.Close()
 		return nil, nil, err
 	}
 	return conn, TLSInfo{conn.ConnectionState()}, nil
 }
 
+func (c *tlsCreds) Clone() TransportCredentials {
+	return NewTLS(c.config)
+}
+
+func (c *tlsCreds) OverrideServerName(serverNameOverride string) error {
+	c.config.ServerName = serverNameOverride
+	return nil
+}
+
 // NewTLS uses c to construct a TransportCredentials based on TLS.
 func NewTLS(c *tls.Config) TransportCredentials {
-	tc := &tlsCreds{c}
+	tc := &tlsCreds{cloneTLSConfig(c)}
 	tc.config.NextProtos = alpnProtoStr
 	return tc
 }
 
 // NewClientTLSFromCert constructs a TLS from the input certificate for client.
-func NewClientTLSFromCert(cp *x509.CertPool, serverName string) TransportCredentials {
-	return NewTLS(&tls.Config{ServerName: serverName, RootCAs: cp})
+// serverNameOverride is for testing only. If set to a non empty string,
+// it will override the virtual host name of authority (e.g. :authority header field) in requests.
+func NewClientTLSFromCert(cp *x509.CertPool, serverNameOverride string) TransportCredentials {
+	return NewTLS(&tls.Config{ServerName: serverNameOverride, RootCAs: cp})
 }
 
 // NewClientTLSFromFile constructs a TLS from the input certificate file for client.
-func NewClientTLSFromFile(certFile, serverName string) (TransportCredentials, error) {
+// serverNameOverride is for testing only. If set to a non empty string,
+// it will override the virtual host name of authority (e.g. :authority header field) in requests.
+func NewClientTLSFromFile(certFile, serverNameOverride string) (TransportCredentials, error) {
 	b, err := ioutil.ReadFile(certFile)
 	if err != nil {
 		return nil, err
@@ -209,7 +213,7 @@ func NewClientTLSFromFile(certFile, serverName string) (TransportCredentials, er
 	if !cp.AppendCertsFromPEM(b) {
 		return nil, fmt.Errorf("credentials: failed to append certificates")
 	}
-	return NewTLS(&tls.Config{ServerName: serverName, RootCAs: cp}), nil
+	return NewTLS(&tls.Config{ServerName: serverNameOverride, RootCAs: cp}), nil
 }
 
 // NewServerTLSFromCert constructs a TLS from the input certificate for server.
diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_go17.go b/vendor/google.golang.org/grpc/credentials/credentials_util_go17.go
new file mode 100644
index 0000000000..9647b9ec83
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/credentials_util_go17.go
@@ -0,0 +1,76 @@
+// +build go1.7
+
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package credentials
+
+import (
+	"crypto/tls"
+)
+
+// cloneTLSConfig returns a shallow clone of the exported
+// fields of cfg, ignoring the unexported sync.Once, which
+// contains a mutex and must not be copied.
+//
+// If cfg is nil, a new zero tls.Config is returned.
+//
+// TODO replace this function with official clone function.
+func cloneTLSConfig(cfg *tls.Config) *tls.Config {
+	if cfg == nil {
+		return &tls.Config{}
+	}
+	return &tls.Config{
+		Rand:                        cfg.Rand,
+		Time:                        cfg.Time,
+		Certificates:                cfg.Certificates,
+		NameToCertificate:           cfg.NameToCertificate,
+		GetCertificate:              cfg.GetCertificate,
+		RootCAs:                     cfg.RootCAs,
+		NextProtos:                  cfg.NextProtos,
+		ServerName:                  cfg.ServerName,
+		ClientAuth:                  cfg.ClientAuth,
+		ClientCAs:                   cfg.ClientCAs,
+		InsecureSkipVerify:          cfg.InsecureSkipVerify,
+		CipherSuites:                cfg.CipherSuites,
+		PreferServerCipherSuites:    cfg.PreferServerCipherSuites,
+		SessionTicketsDisabled:      cfg.SessionTicketsDisabled,
+		SessionTicketKey:            cfg.SessionTicketKey,
+		ClientSessionCache:          cfg.ClientSessionCache,
+		MinVersion:                  cfg.MinVersion,
+		MaxVersion:                  cfg.MaxVersion,
+		CurvePreferences:            cfg.CurvePreferences,
+		DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled,
+		Renegotiation:               cfg.Renegotiation,
+	}
+}
diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go b/vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go
new file mode 100644
index 0000000000..09b8d12c79
--- /dev/null
+++ b/vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go
@@ -0,0 +1,74 @@
+// +build !go1.7
+
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package credentials
+
+import (
+	"crypto/tls"
+)
+
+// cloneTLSConfig returns a shallow clone of the exported
+// fields of cfg, ignoring the unexported sync.Once, which
+// contains a mutex and must not be copied.
+//
+// If cfg is nil, a new zero tls.Config is returned.
+//
+// TODO replace this function with official clone function.
+func cloneTLSConfig(cfg *tls.Config) *tls.Config {
+	if cfg == nil {
+		return &tls.Config{}
+	}
+	return &tls.Config{
+		Rand:                     cfg.Rand,
+		Time:                     cfg.Time,
+		Certificates:             cfg.Certificates,
+		NameToCertificate:        cfg.NameToCertificate,
+		GetCertificate:           cfg.GetCertificate,
+		RootCAs:                  cfg.RootCAs,
+		NextProtos:               cfg.NextProtos,
+		ServerName:               cfg.ServerName,
+		ClientAuth:               cfg.ClientAuth,
+		ClientCAs:                cfg.ClientCAs,
+		InsecureSkipVerify:       cfg.InsecureSkipVerify,
+		CipherSuites:             cfg.CipherSuites,
+		PreferServerCipherSuites: cfg.PreferServerCipherSuites,
+		SessionTicketsDisabled:   cfg.SessionTicketsDisabled,
+		SessionTicketKey:         cfg.SessionTicketKey,
+		ClientSessionCache:       cfg.ClientSessionCache,
+		MinVersion:               cfg.MinVersion,
+		MaxVersion:               cfg.MaxVersion,
+		CurvePreferences:         cfg.CurvePreferences,
+	}
+}
diff --git a/vendor/google.golang.org/grpc/interceptor.go b/vendor/google.golang.org/grpc/interceptor.go
index 588f59e5ab..8d932efed7 100644
--- a/vendor/google.golang.org/grpc/interceptor.go
+++ b/vendor/google.golang.org/grpc/interceptor.go
@@ -37,6 +37,22 @@ import (
 	"golang.org/x/net/context"
 )
 
+// UnaryInvoker is called by UnaryClientInterceptor to complete RPCs.
+type UnaryInvoker func(ctx context.Context, method string, req, reply interface{}, cc *ClientConn, opts ...CallOption) error
+
+// UnaryClientInterceptor intercepts the execution of a unary RPC on the client. inovker is the handler to complete the RPC
+// and it is the responsibility of the interceptor to call it.
+// This is the EXPERIMENTAL API.
+type UnaryClientInterceptor func(ctx context.Context, method string, req, reply interface{}, cc *ClientConn, invoker UnaryInvoker, opts ...CallOption) error
+
+// Streamer is called by StreamClientInterceptor to create a ClientStream.
+type Streamer func(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error)
+
+// StreamClientInterceptor intercepts the creation of ClientStream. It may return a custom ClientStream to intercept all I/O
+// operations. streamer is the handlder to create a ClientStream and it is the responsibility of the interceptor to call it.
+// This is the EXPERIMENTAL API.
+type StreamClientInterceptor func(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, streamer Streamer, opts ...CallOption) (ClientStream, error)
+
 // UnaryServerInfo consists of various information about a unary RPC on
 // server side. All per-rpc information may be mutated by the interceptor.
 type UnaryServerInfo struct {
diff --git a/vendor/google.golang.org/grpc/metadata/metadata.go b/vendor/google.golang.org/grpc/metadata/metadata.go
index 52070dbeca..65dc5af57d 100644
--- a/vendor/google.golang.org/grpc/metadata/metadata.go
+++ b/vendor/google.golang.org/grpc/metadata/metadata.go
@@ -60,15 +60,21 @@ func encodeKeyValue(k, v string) (string, string) {
 
 // DecodeKeyValue returns the original key and value corresponding to the
 // encoded data in k, v.
+// If k is a binary header and v contains comma, v is split on comma before decoded,
+// and the decoded v will be joined with comma before returned.
 func DecodeKeyValue(k, v string) (string, string, error) {
 	if !strings.HasSuffix(k, binHdrSuffix) {
 		return k, v, nil
 	}
-	val, err := base64.StdEncoding.DecodeString(v)
-	if err != nil {
-		return "", "", err
+	vvs := strings.Split(v, ",")
+	for i, vv := range vvs {
+		val, err := base64.StdEncoding.DecodeString(vv)
+		if err != nil {
+			return "", "", err
+		}
+		vvs[i] = string(val)
 	}
-	return k, string(val), nil
+	return k, strings.Join(vvs, ","), nil
 }
 
 // MD is a mapping from metadata keys to values. Users should use the following
@@ -111,10 +117,17 @@ func (md MD) Len() int {
 
 // Copy returns a copy of md.
 func (md MD) Copy() MD {
+	return Join(md)
+}
+
+// Join joins any number of MDs into a single MD.
+// The order of values for each key is determined by the order in which
+// the MDs containing those values are presented to Join.
+func Join(mds ...MD) MD {
 	out := MD{}
-	for k, v := range md {
-		for _, i := range v {
-			out[k] = append(out[k], i)
+	for _, md := range mds {
+		for k, v := range md {
+			out[k] = append(out[k], v...)
 		}
 	}
 	return out
@@ -128,6 +141,8 @@ func NewContext(ctx context.Context, md MD) context.Context {
 }
 
 // FromContext returns the MD in ctx if it exists.
+// The returned md should be immutable, writing to it may cause races.
+// Modification should be made to the copies of the returned md.
 func FromContext(ctx context.Context) (md MD, ok bool) {
 	md, ok = ctx.Value(mdKey{}).(MD)
 	return
diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go
index d628717560..66d08b5aa2 100644
--- a/vendor/google.golang.org/grpc/rpc_util.go
+++ b/vendor/google.golang.org/grpc/rpc_util.go
@@ -42,11 +42,13 @@ import (
 	"io/ioutil"
 	"math"
 	"os"
+	"time"
 
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/transport"
 )
 
@@ -227,7 +229,7 @@ type parser struct {
 // No other error values or types must be returned, which also means
 // that the underlying io.Reader must not return an incompatible
 // error.
-func (p *parser) recvMsg() (pf payloadFormat, msg []byte, err error) {
+func (p *parser) recvMsg(maxMsgSize int) (pf payloadFormat, msg []byte, err error) {
 	if _, err := io.ReadFull(p.r, p.header[:]); err != nil {
 		return 0, nil, err
 	}
@@ -238,6 +240,9 @@ func (p *parser) recvMsg() (pf payloadFormat, msg []byte, err error) {
 	if length == 0 {
 		return pf, nil, nil
 	}
+	if length > uint32(maxMsgSize) {
+		return 0, nil, Errorf(codes.Internal, "grpc: received message length %d exceeding the max size %d", length, maxMsgSize)
+	}
 	// TODO(bradfitz,zhaoq): garbage. reuse buffer after proto decoding instead
 	// of making it for each message:
 	msg = make([]byte, int(length))
@@ -252,9 +257,11 @@ func (p *parser) recvMsg() (pf payloadFormat, msg []byte, err error) {
 
 // encode serializes msg and prepends the message header. If msg is nil, it
 // generates the message header of 0 message length.
-func encode(c Codec, msg interface{}, cp Compressor, cbuf *bytes.Buffer) ([]byte, error) {
-	var b []byte
-	var length uint
+func encode(c Codec, msg interface{}, cp Compressor, cbuf *bytes.Buffer, outPayload *stats.OutPayload) ([]byte, error) {
+	var (
+		b      []byte
+		length uint
+	)
 	if msg != nil {
 		var err error
 		// TODO(zhaoq): optimize to reduce memory alloc and copying.
@@ -262,6 +269,12 @@ func encode(c Codec, msg interface{}, cp Compressor, cbuf *bytes.Buffer) ([]byte
 		if err != nil {
 			return nil, err
 		}
+		if outPayload != nil {
+			outPayload.Payload = msg
+			// TODO truncate large payload.
+			outPayload.Data = b
+			outPayload.Length = len(b)
+		}
 		if cp != nil {
 			if err := cp.Do(cbuf, b); err != nil {
 				return nil, err
@@ -292,6 +305,10 @@ func encode(c Codec, msg interface{}, cp Compressor, cbuf *bytes.Buffer) ([]byte
 	// Copy encoded msg to buf
 	copy(buf[5:], b)
 
+	if outPayload != nil {
+		outPayload.WireLength = len(buf)
+	}
+
 	return buf, nil
 }
 
@@ -300,30 +317,45 @@ func checkRecvPayload(pf payloadFormat, recvCompress string, dc Decompressor) er
 	case compressionNone:
 	case compressionMade:
 		if dc == nil || recvCompress != dc.Type() {
-			return transport.StreamErrorf(codes.Unimplemented, "grpc: Decompressor is not installed for grpc-encoding %q", recvCompress)
+			return Errorf(codes.Unimplemented, "grpc: Decompressor is not installed for grpc-encoding %q", recvCompress)
 		}
 	default:
-		return transport.StreamErrorf(codes.Internal, "grpc: received unexpected payload format %d", pf)
+		return Errorf(codes.Internal, "grpc: received unexpected payload format %d", pf)
 	}
 	return nil
 }
 
-func recv(p *parser, c Codec, s *transport.Stream, dc Decompressor, m interface{}) error {
-	pf, d, err := p.recvMsg()
+func recv(p *parser, c Codec, s *transport.Stream, dc Decompressor, m interface{}, maxMsgSize int, inPayload *stats.InPayload) error {
+	pf, d, err := p.recvMsg(maxMsgSize)
 	if err != nil {
 		return err
 	}
+	if inPayload != nil {
+		inPayload.WireLength = len(d)
+	}
 	if err := checkRecvPayload(pf, s.RecvCompress(), dc); err != nil {
 		return err
 	}
 	if pf == compressionMade {
 		d, err = dc.Do(bytes.NewReader(d))
 		if err != nil {
-			return transport.StreamErrorf(codes.Internal, "grpc: failed to decompress the received message %v", err)
+			return Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err)
 		}
 	}
+	if len(d) > maxMsgSize {
+		// TODO: Revisit the error code. Currently keep it consistent with java
+		// implementation.
+		return Errorf(codes.Internal, "grpc: received a message of %d bytes exceeding %d limit", len(d), maxMsgSize)
+	}
 	if err := c.Unmarshal(d, m); err != nil {
-		return transport.StreamErrorf(codes.Internal, "grpc: failed to unmarshal the received message %v", err)
+		return Errorf(codes.Internal, "grpc: failed to unmarshal the received message %v", err)
+	}
+	if inPayload != nil {
+		inPayload.RecvTime = time.Now()
+		inPayload.Payload = m
+		// TODO truncate large payload.
+		inPayload.Data = d
+		inPayload.Length = len(d)
 	}
 	return nil
 }
@@ -440,10 +472,10 @@ func convertCode(err error) codes.Code {
 	return codes.Unknown
 }
 
-// SupportPackageIsVersion3 is referenced from generated protocol buffer files
+// SupportPackageIsVersion4 is referenced from generated protocol buffer files
 // to assert that that code is compatible with this version of the grpc package.
 //
 // This constant may be renamed in the future if a change in the generated code
 // requires a synchronised update of grpc-go and protoc-gen-go. This constant
 // should not be referenced from any other code.
-const SupportPackageIsVersion3 = true
+const SupportPackageIsVersion4 = true
diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go
index a2b2b94d48..22aa33bfe4 100644
--- a/vendor/google.golang.org/grpc/server.go
+++ b/vendor/google.golang.org/grpc/server.go
@@ -54,6 +54,8 @@ import (
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/internal"
 	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/stats"
+	"google.golang.org/grpc/tap"
 	"google.golang.org/grpc/transport"
 )
 
@@ -92,6 +94,12 @@ type Server struct {
 	mu     sync.Mutex // guards following
 	lis    map[net.Listener]bool
 	conns  map[io.Closer]bool
+	drain  bool
+	ctx    context.Context
+	cancel context.CancelFunc
+	// A CondVar to let GracefulStop() blocks until all the pending RPCs are finished
+	// and all the transport goes away.
+	cv     *sync.Cond
 	m      map[string]*service // service name -> service info
 	events trace.EventLog
 }
@@ -101,12 +109,16 @@ type options struct {
 	codec                Codec
 	cp                   Compressor
 	dc                   Decompressor
+	maxMsgSize           int
 	unaryInt             UnaryServerInterceptor
 	streamInt            StreamServerInterceptor
+	inTapHandle          tap.ServerInHandle
 	maxConcurrentStreams uint32
 	useHandlerImpl       bool // use http.Handler-based server
 }
 
+var defaultMaxMsgSize = 1024 * 1024 * 4 // use 4MB as the default message size limit
+
 // A ServerOption sets options.
 type ServerOption func(*options)
 
@@ -117,20 +129,28 @@ func CustomCodec(codec Codec) ServerOption {
 	}
 }
 
-// RPCCompressor returns a ServerOption that sets a compressor for outbound message.
+// RPCCompressor returns a ServerOption that sets a compressor for outbound messages.
 func RPCCompressor(cp Compressor) ServerOption {
 	return func(o *options) {
 		o.cp = cp
 	}
 }
 
-// RPCDecompressor returns a ServerOption that sets a decompressor for inbound message.
+// RPCDecompressor returns a ServerOption that sets a decompressor for inbound messages.
 func RPCDecompressor(dc Decompressor) ServerOption {
 	return func(o *options) {
 		o.dc = dc
 	}
 }
 
+// MaxMsgSize returns a ServerOption to set the max message size in bytes for inbound mesages.
+// If this is not set, gRPC uses the default 4MB.
+func MaxMsgSize(m int) ServerOption {
+	return func(o *options) {
+		o.maxMsgSize = m
+	}
+}
+
 // MaxConcurrentStreams returns a ServerOption that will apply a limit on the number
 // of concurrent streams to each ServerTransport.
 func MaxConcurrentStreams(n uint32) ServerOption {
@@ -169,10 +189,22 @@ func StreamInterceptor(i StreamServerInterceptor) ServerOption {
 	}
 }
 
+// InTapHandle returns a ServerOption that sets the tap handle for all the server
+// transport to be created. Only one can be installed.
+func InTapHandle(h tap.ServerInHandle) ServerOption {
+	return func(o *options) {
+		if o.inTapHandle != nil {
+			panic("The tap handle has been set.")
+		}
+		o.inTapHandle = h
+	}
+}
+
 // NewServer creates a gRPC server which has no service registered and has not
 // started to accept requests yet.
 func NewServer(opt ...ServerOption) *Server {
 	var opts options
+	opts.maxMsgSize = defaultMaxMsgSize
 	for _, o := range opt {
 		o(&opts)
 	}
@@ -186,6 +218,8 @@ func NewServer(opt ...ServerOption) *Server {
 		conns: make(map[io.Closer]bool),
 		m:     make(map[string]*service),
 	}
+	s.cv = sync.NewCond(&s.mu)
+	s.ctx, s.cancel = context.WithCancel(context.Background())
 	if EnableTracing {
 		_, file, line, _ := runtime.Caller(1)
 		s.events = trace.NewEventLog("grpc.Server", fmt.Sprintf("%s:%d", file, line))
@@ -264,8 +298,8 @@ type ServiceInfo struct {
 
 // GetServiceInfo returns a map from service names to ServiceInfo.
 // Service names include the package names, in the form of <package>.<service>.
-func (s *Server) GetServiceInfo() map[string]*ServiceInfo {
-	ret := make(map[string]*ServiceInfo)
+func (s *Server) GetServiceInfo() map[string]ServiceInfo {
+	ret := make(map[string]ServiceInfo)
 	for n, srv := range s.m {
 		methods := make([]MethodInfo, 0, len(srv.md)+len(srv.sd))
 		for m := range srv.md {
@@ -283,7 +317,7 @@ func (s *Server) GetServiceInfo() map[string]*ServiceInfo {
 			})
 		}
 
-		ret[n] = &ServiceInfo{
+		ret[n] = ServiceInfo{
 			Methods:  methods,
 			Metadata: srv.mdata,
 		}
@@ -307,7 +341,7 @@ func (s *Server) useTransportAuthenticator(rawConn net.Conn) (net.Conn, credenti
 // Serve accepts incoming connections on the listener lis, creating a new
 // ServerTransport and service goroutine for each. The service goroutines
 // read gRPC requests and then call the registered handlers to reply to them.
-// Service returns when lis.Accept fails. lis will be closed when
+// Serve returns when lis.Accept fails with fatal errors.  lis will be closed when
 // this method returns.
 func (s *Server) Serve(lis net.Listener) error {
 	s.mu.Lock()
@@ -327,14 +361,38 @@ func (s *Server) Serve(lis net.Listener) error {
 		}
 		s.mu.Unlock()
 	}()
+
+	var tempDelay time.Duration // how long to sleep on accept failure
+
 	for {
 		rawConn, err := lis.Accept()
 		if err != nil {
+			if ne, ok := err.(interface {
+				Temporary() bool
+			}); ok && ne.Temporary() {
+				if tempDelay == 0 {
+					tempDelay = 5 * time.Millisecond
+				} else {
+					tempDelay *= 2
+				}
+				if max := 1 * time.Second; tempDelay > max {
+					tempDelay = max
+				}
+				s.mu.Lock()
+				s.printf("Accept error: %v; retrying in %v", err, tempDelay)
+				s.mu.Unlock()
+				select {
+				case <-time.After(tempDelay):
+				case <-s.ctx.Done():
+				}
+				continue
+			}
 			s.mu.Lock()
 			s.printf("done serving; Accept = %v", err)
 			s.mu.Unlock()
 			return err
 		}
+		tempDelay = 0
 		// Start a new goroutine to deal with rawConn
 		// so we don't stall this Accept loop goroutine.
 		go s.handleRawConn(rawConn)
@@ -350,7 +408,10 @@ func (s *Server) handleRawConn(rawConn net.Conn) {
 		s.errorf("ServerHandshake(%q) failed: %v", rawConn.RemoteAddr(), err)
 		s.mu.Unlock()
 		grpclog.Printf("grpc: Server.Serve failed to complete security handshake from %q: %v", rawConn.RemoteAddr(), err)
-		rawConn.Close()
+		// If serverHandShake returns ErrConnDispatched, keep rawConn open.
+		if err != credentials.ErrConnDispatched {
+			rawConn.Close()
+		}
 		return
 	}
 
@@ -365,17 +426,22 @@ func (s *Server) handleRawConn(rawConn net.Conn) {
 	if s.opts.useHandlerImpl {
 		s.serveUsingHandler(conn)
 	} else {
-		s.serveNewHTTP2Transport(conn, authInfo)
+		s.serveHTTP2Transport(conn, authInfo)
 	}
 }
 
-// serveNewHTTP2Transport sets up a new http/2 transport (using the
+// serveHTTP2Transport sets up a http/2 transport (using the
 // gRPC http2 server transport in transport/http2_server.go) and
 // serves streams on it.
 // This is run in its own goroutine (it does network I/O in
 // transport.NewServerTransport).
-func (s *Server) serveNewHTTP2Transport(c net.Conn, authInfo credentials.AuthInfo) {
-	st, err := transport.NewServerTransport("http2", c, s.opts.maxConcurrentStreams, authInfo)
+func (s *Server) serveHTTP2Transport(c net.Conn, authInfo credentials.AuthInfo) {
+	config := &transport.ServerConfig{
+		MaxStreams:  s.opts.maxConcurrentStreams,
+		AuthInfo:    authInfo,
+		InTapHandle: s.opts.inTapHandle,
+	}
+	st, err := transport.NewServerTransport("http2", c, config)
 	if err != nil {
 		s.mu.Lock()
 		s.errorf("NewServerTransport(%q) failed: %v", c.RemoteAddr(), err)
@@ -401,6 +467,12 @@ func (s *Server) serveStreams(st transport.ServerTransport) {
 			defer wg.Done()
 			s.handleStream(st, stream, s.traceInfo(st, stream))
 		}()
+	}, func(ctx context.Context, method string) context.Context {
+		if !EnableTracing {
+			return ctx
+		}
+		tr := trace.New("grpc.Recv."+methodFamily(method), method)
+		return trace.NewContext(ctx, tr)
 	})
 	wg.Wait()
 }
@@ -450,15 +522,17 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 // traceInfo returns a traceInfo and associates it with stream, if tracing is enabled.
 // If tracing is not enabled, it returns nil.
 func (s *Server) traceInfo(st transport.ServerTransport, stream *transport.Stream) (trInfo *traceInfo) {
-	if !EnableTracing {
+	tr, ok := trace.FromContext(stream.Context())
+	if !ok {
 		return nil
 	}
+
 	trInfo = &traceInfo{
-		tr: trace.New("grpc.Recv."+methodFamily(stream.Method()), stream.Method()),
+		tr: tr,
 	}
 	trInfo.firstLine.client = false
 	trInfo.firstLine.remoteAddr = st.RemoteAddr()
-	stream.TraceContext(trInfo.tr)
+
 	if dl, ok := stream.Context().Deadline(); ok {
 		trInfo.firstLine.deadline = dl.Sub(time.Now())
 	}
@@ -468,7 +542,7 @@ func (s *Server) traceInfo(st transport.ServerTransport, stream *transport.Strea
 func (s *Server) addConn(c io.Closer) bool {
 	s.mu.Lock()
 	defer s.mu.Unlock()
-	if s.conns == nil {
+	if s.conns == nil || s.drain {
 		return false
 	}
 	s.conns[c] = true
@@ -480,15 +554,22 @@ func (s *Server) removeConn(c io.Closer) {
 	defer s.mu.Unlock()
 	if s.conns != nil {
 		delete(s.conns, c)
+		s.cv.Broadcast()
 	}
 }
 
 func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Stream, msg interface{}, cp Compressor, opts *transport.Options) error {
-	var cbuf *bytes.Buffer
+	var (
+		cbuf       *bytes.Buffer
+		outPayload *stats.OutPayload
+	)
 	if cp != nil {
 		cbuf = new(bytes.Buffer)
 	}
-	p, err := encode(s.opts.codec, msg, cp, cbuf)
+	if stats.On() {
+		outPayload = &stats.OutPayload{}
+	}
+	p, err := encode(s.opts.codec, msg, cp, cbuf, outPayload)
 	if err != nil {
 		// This typically indicates a fatal issue (e.g., memory
 		// corruption or hardware faults) the application program
@@ -499,10 +580,32 @@ func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Str
 		// the optimal option.
 		grpclog.Fatalf("grpc: Server failed to encode response %v", err)
 	}
-	return t.Write(stream, p, opts)
+	err = t.Write(stream, p, opts)
+	if err == nil && outPayload != nil {
+		outPayload.SentTime = time.Now()
+		stats.HandleRPC(stream.Context(), outPayload)
+	}
+	return err
 }
 
 func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, md *MethodDesc, trInfo *traceInfo) (err error) {
+	if stats.On() {
+		begin := &stats.Begin{
+			BeginTime: time.Now(),
+		}
+		stats.HandleRPC(stream.Context(), begin)
+	}
+	defer func() {
+		if stats.On() {
+			end := &stats.End{
+				EndTime: time.Now(),
+			}
+			if err != nil && err != io.EOF {
+				end.Error = toRPCErr(err)
+			}
+			stats.HandleRPC(stream.Context(), end)
+		}
+	}()
 	if trInfo != nil {
 		defer trInfo.tr.Finish()
 		trInfo.firstLine.client = false
@@ -520,21 +623,25 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 	}
 	p := &parser{r: stream}
 	for {
-		pf, req, err := p.recvMsg()
+		pf, req, err := p.recvMsg(s.opts.maxMsgSize)
 		if err == io.EOF {
 			// The entire stream is done (for unary RPC only).
 			return err
 		}
 		if err == io.ErrUnexpectedEOF {
-			err = transport.StreamError{Code: codes.Internal, Desc: "io.ErrUnexpectedEOF"}
+			err = Errorf(codes.Internal, io.ErrUnexpectedEOF.Error())
 		}
 		if err != nil {
 			switch err := err.(type) {
+			case *rpcError:
+				if e := t.WriteStatus(stream, err.code, err.desc); e != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", e)
+				}
 			case transport.ConnectionError:
 				// Nothing to do here.
 			case transport.StreamError:
-				if err := t.WriteStatus(stream, err.Code, err.Desc); err != nil {
-					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
+				if e := t.WriteStatus(stream, err.Code, err.Desc); e != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", e)
 				}
 			default:
 				panic(fmt.Sprintf("grpc: Unexpected error (%T) from recvMsg: %v", err, err))
@@ -544,21 +651,30 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 
 		if err := checkRecvPayload(pf, stream.RecvCompress(), s.opts.dc); err != nil {
 			switch err := err.(type) {
-			case transport.StreamError:
-				if err := t.WriteStatus(stream, err.Code, err.Desc); err != nil {
-					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
+			case *rpcError:
+				if e := t.WriteStatus(stream, err.code, err.desc); e != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", e)
 				}
+				return err
 			default:
-				if err := t.WriteStatus(stream, codes.Internal, err.Error()); err != nil {
-					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
+				if e := t.WriteStatus(stream, codes.Internal, err.Error()); e != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", e)
 				}
-
+				// TODO checkRecvPayload always return RPC error. Add a return here if necessary.
+			}
+		}
+		var inPayload *stats.InPayload
+		if stats.On() {
+			inPayload = &stats.InPayload{
+				RecvTime: time.Now(),
 			}
-			return err
 		}
 		statusCode := codes.OK
 		statusDesc := ""
 		df := func(v interface{}) error {
+			if inPayload != nil {
+				inPayload.WireLength = len(req)
+			}
 			if pf == compressionMade {
 				var err error
 				req, err = s.opts.dc.Do(bytes.NewReader(req))
@@ -566,12 +682,24 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 					if err := t.WriteStatus(stream, codes.Internal, err.Error()); err != nil {
 						grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
 					}
-					return err
+					return Errorf(codes.Internal, err.Error())
 				}
 			}
+			if len(req) > s.opts.maxMsgSize {
+				// TODO: Revisit the error code. Currently keep it consistent with
+				// java implementation.
+				statusCode = codes.Internal
+				statusDesc = fmt.Sprintf("grpc: server received a message of %d bytes exceeding %d limit", len(req), s.opts.maxMsgSize)
+			}
 			if err := s.opts.codec.Unmarshal(req, v); err != nil {
 				return err
 			}
+			if inPayload != nil {
+				inPayload.Payload = v
+				inPayload.Data = req
+				inPayload.Length = len(req)
+				stats.HandleRPC(stream.Context(), inPayload)
+			}
 			if trInfo != nil {
 				trInfo.tr.LazyLog(&payload{sent: false, msg: v}, true)
 			}
@@ -592,9 +720,8 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 			}
 			if err := t.WriteStatus(stream, statusCode, statusDesc); err != nil {
 				grpclog.Printf("grpc: Server.processUnaryRPC failed to write status: %v", err)
-				return err
 			}
-			return nil
+			return Errorf(statusCode, statusDesc)
 		}
 		if trInfo != nil {
 			trInfo.tr.LazyLog(stringer("OK"), false)
@@ -619,22 +746,44 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 		if trInfo != nil {
 			trInfo.tr.LazyLog(&payload{sent: true, msg: reply}, true)
 		}
-		return t.WriteStatus(stream, statusCode, statusDesc)
+		errWrite := t.WriteStatus(stream, statusCode, statusDesc)
+		if statusCode != codes.OK {
+			return Errorf(statusCode, statusDesc)
+		}
+		return errWrite
 	}
 }
 
 func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, sd *StreamDesc, trInfo *traceInfo) (err error) {
+	if stats.On() {
+		begin := &stats.Begin{
+			BeginTime: time.Now(),
+		}
+		stats.HandleRPC(stream.Context(), begin)
+	}
+	defer func() {
+		if stats.On() {
+			end := &stats.End{
+				EndTime: time.Now(),
+			}
+			if err != nil && err != io.EOF {
+				end.Error = toRPCErr(err)
+			}
+			stats.HandleRPC(stream.Context(), end)
+		}
+	}()
 	if s.opts.cp != nil {
 		stream.SetSendCompress(s.opts.cp.Type())
 	}
 	ss := &serverStream{
-		t:      t,
-		s:      stream,
-		p:      &parser{r: stream},
-		codec:  s.opts.codec,
-		cp:     s.opts.cp,
-		dc:     s.opts.dc,
-		trInfo: trInfo,
+		t:          t,
+		s:          stream,
+		p:          &parser{r: stream},
+		codec:      s.opts.codec,
+		cp:         s.opts.cp,
+		dc:         s.opts.dc,
+		maxMsgSize: s.opts.maxMsgSize,
+		trInfo:     trInfo,
 	}
 	if ss.cp != nil {
 		ss.cbuf = new(bytes.Buffer)
@@ -685,7 +834,11 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
 		}
 		ss.mu.Unlock()
 	}
-	return t.WriteStatus(ss.s, ss.statusCode, ss.statusDesc)
+	errWrite := t.WriteStatus(ss.s, ss.statusCode, ss.statusDesc)
+	if ss.statusCode != codes.OK {
+		return Errorf(ss.statusCode, ss.statusDesc)
+	}
+	return errWrite
 
 }
 
@@ -700,7 +853,8 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str
 			trInfo.tr.LazyLog(&fmtStringer{"Malformed method name %q", []interface{}{sm}}, true)
 			trInfo.tr.SetError()
 		}
-		if err := t.WriteStatus(stream, codes.InvalidArgument, fmt.Sprintf("malformed method name: %q", stream.Method())); err != nil {
+		errDesc := fmt.Sprintf("malformed method name: %q", stream.Method())
+		if err := t.WriteStatus(stream, codes.InvalidArgument, errDesc); err != nil {
 			if trInfo != nil {
 				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
 				trInfo.tr.SetError()
@@ -720,7 +874,8 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str
 			trInfo.tr.LazyLog(&fmtStringer{"Unknown service %v", []interface{}{service}}, true)
 			trInfo.tr.SetError()
 		}
-		if err := t.WriteStatus(stream, codes.Unimplemented, fmt.Sprintf("unknown service %v", service)); err != nil {
+		errDesc := fmt.Sprintf("unknown service %v", service)
+		if err := t.WriteStatus(stream, codes.Unimplemented, errDesc); err != nil {
 			if trInfo != nil {
 				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
 				trInfo.tr.SetError()
@@ -745,7 +900,8 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str
 		trInfo.tr.LazyLog(&fmtStringer{"Unknown method %v", []interface{}{method}}, true)
 		trInfo.tr.SetError()
 	}
-	if err := t.WriteStatus(stream, codes.Unimplemented, fmt.Sprintf("unknown method %v", method)); err != nil {
+	errDesc := fmt.Sprintf("unknown method %v", method)
+	if err := t.WriteStatus(stream, codes.Unimplemented, errDesc); err != nil {
 		if trInfo != nil {
 			trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
 			trInfo.tr.SetError()
@@ -766,18 +922,21 @@ func (s *Server) Stop() {
 	s.mu.Lock()
 	listeners := s.lis
 	s.lis = nil
-	cs := s.conns
+	st := s.conns
 	s.conns = nil
+	// interrupt GracefulStop if Stop and GracefulStop are called concurrently.
+	s.cv.Broadcast()
 	s.mu.Unlock()
 
 	for lis := range listeners {
 		lis.Close()
 	}
-	for c := range cs {
+	for c := range st {
 		c.Close()
 	}
 
 	s.mu.Lock()
+	s.cancel()
 	if s.events != nil {
 		s.events.Finish()
 		s.events = nil
@@ -785,6 +944,35 @@ func (s *Server) Stop() {
 	s.mu.Unlock()
 }
 
+// GracefulStop stops the gRPC server gracefully. It stops the server to accept new
+// connections and RPCs and blocks until all the pending RPCs are finished.
+func (s *Server) GracefulStop() {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	if s.conns == nil {
+		return
+	}
+	for lis := range s.lis {
+		lis.Close()
+	}
+	s.lis = nil
+	s.cancel()
+	if !s.drain {
+		for c := range s.conns {
+			c.(transport.ServerTransport).Drain()
+		}
+		s.drain = true
+	}
+	for len(s.conns) != 0 {
+		s.cv.Wait()
+	}
+	s.conns = nil
+	if s.events != nil {
+		s.events.Finish()
+		s.events = nil
+	}
+}
+
 func init() {
 	internal.TestingCloseConns = func(arg interface{}) {
 		arg.(*Server).testingCloseConns()
@@ -805,33 +993,49 @@ func (s *Server) testingCloseConns() {
 	s.mu.Unlock()
 }
 
-// SendHeader sends header metadata. It may be called at most once from a unary
-// RPC handler. The ctx is the RPC handler's Context or one derived from it.
-func SendHeader(ctx context.Context, md metadata.MD) error {
+// SetHeader sets the header metadata.
+// When called multiple times, all the provided metadata will be merged.
+// All the metadata will be sent out when one of the following happens:
+//  - grpc.SendHeader() is called;
+//  - The first response is sent out;
+//  - An RPC status is sent out (error or success).
+func SetHeader(ctx context.Context, md metadata.MD) error {
 	if md.Len() == 0 {
 		return nil
 	}
 	stream, ok := transport.StreamFromContext(ctx)
 	if !ok {
-		return fmt.Errorf("grpc: failed to fetch the stream from the context %v", ctx)
+		return Errorf(codes.Internal, "grpc: failed to fetch the stream from the context %v", ctx)
+	}
+	return stream.SetHeader(md)
+}
+
+// SendHeader sends header metadata. It may be called at most once.
+// The provided md and headers set by SetHeader() will be sent.
+func SendHeader(ctx context.Context, md metadata.MD) error {
+	stream, ok := transport.StreamFromContext(ctx)
+	if !ok {
+		return Errorf(codes.Internal, "grpc: failed to fetch the stream from the context %v", ctx)
 	}
 	t := stream.ServerTransport()
 	if t == nil {
 		grpclog.Fatalf("grpc: SendHeader: %v has no ServerTransport to send header metadata.", stream)
 	}
-	return t.WriteHeader(stream, md)
+	if err := t.WriteHeader(stream, md); err != nil {
+		return toRPCErr(err)
+	}
+	return nil
 }
 
 // SetTrailer sets the trailer metadata that will be sent when an RPC returns.
-// It may be called at most once from a unary RPC handler. The ctx is the RPC
-// handler's Context or one derived from it.
+// When called more than once, all the provided metadata will be merged.
 func SetTrailer(ctx context.Context, md metadata.MD) error {
 	if md.Len() == 0 {
 		return nil
 	}
 	stream, ok := transport.StreamFromContext(ctx)
 	if !ok {
-		return fmt.Errorf("grpc: failed to fetch the stream from the context %v", ctx)
+		return Errorf(codes.Internal, "grpc: failed to fetch the stream from the context %v", ctx)
 	}
 	return stream.SetTrailer(md)
 }
diff --git a/vendor/google.golang.org/grpc/stats/handlers.go b/vendor/google.golang.org/grpc/stats/handlers.go
new file mode 100644
index 0000000000..d41c524421
--- /dev/null
+++ b/vendor/google.golang.org/grpc/stats/handlers.go
@@ -0,0 +1,152 @@
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package stats
+
+import (
+	"net"
+	"sync/atomic"
+
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/grpclog"
+)
+
+// ConnTagInfo defines the relevant information needed by connection context tagger.
+type ConnTagInfo struct {
+	// RemoteAddr is the remote address of the corresponding connection.
+	RemoteAddr net.Addr
+	// LocalAddr is the local address of the corresponding connection.
+	LocalAddr net.Addr
+	// TODO add QOS related fields.
+}
+
+// RPCTagInfo defines the relevant information needed by RPC context tagger.
+type RPCTagInfo struct {
+	// FullMethodName is the RPC method in the format of /package.service/method.
+	FullMethodName string
+}
+
+var (
+	on          = new(int32)
+	rpcHandler  func(context.Context, RPCStats)
+	connHandler func(context.Context, ConnStats)
+	connTagger  func(context.Context, *ConnTagInfo) context.Context
+	rpcTagger   func(context.Context, *RPCTagInfo) context.Context
+)
+
+// HandleRPC processes the RPC stats using the rpc handler registered by the user.
+func HandleRPC(ctx context.Context, s RPCStats) {
+	if rpcHandler == nil {
+		return
+	}
+	rpcHandler(ctx, s)
+}
+
+// RegisterRPCHandler registers the user handler function for RPC stats processing.
+// It should be called only once. The later call will overwrite the former value if it is called multiple times.
+// This handler function will be called to process the rpc stats.
+func RegisterRPCHandler(f func(context.Context, RPCStats)) {
+	rpcHandler = f
+}
+
+// HandleConn processes the stats using the call back function registered by user.
+func HandleConn(ctx context.Context, s ConnStats) {
+	if connHandler == nil {
+		return
+	}
+	connHandler(ctx, s)
+}
+
+// RegisterConnHandler registers the user handler function for conn stats.
+// It should be called only once. The later call will overwrite the former value if it is called multiple times.
+// This handler function will be called to process the conn stats.
+func RegisterConnHandler(f func(context.Context, ConnStats)) {
+	connHandler = f
+}
+
+// TagConn calls user registered connection context tagger.
+func TagConn(ctx context.Context, info *ConnTagInfo) context.Context {
+	if connTagger == nil {
+		return ctx
+	}
+	return connTagger(ctx, info)
+}
+
+// RegisterConnTagger registers the user connection context tagger function.
+// The connection context tagger can attach some information to the given context.
+// The returned context will be used for stats handling.
+// For conn stats handling, the context used in connHandler for this
+// connection will be derived from the context returned.
+// For RPC stats handling,
+//  - On server side, the context used in rpcHandler for all RPCs on this
+// connection will be derived from the context returned.
+//  - On client side, the context is not derived from the context returned.
+func RegisterConnTagger(t func(context.Context, *ConnTagInfo) context.Context) {
+	connTagger = t
+}
+
+// TagRPC calls the user registered RPC context tagger.
+func TagRPC(ctx context.Context, info *RPCTagInfo) context.Context {
+	if rpcTagger == nil {
+		return ctx
+	}
+	return rpcTagger(ctx, info)
+}
+
+// RegisterRPCTagger registers the user RPC context tagger function.
+// The RPC context tagger can attach some information to the given context.
+// The context used in stats rpcHandler for this RPC will be derived from the
+// context returned.
+func RegisterRPCTagger(t func(context.Context, *RPCTagInfo) context.Context) {
+	rpcTagger = t
+}
+
+// Start starts the stats collection and processing if there is a registered stats handle.
+func Start() {
+	if rpcHandler == nil && connHandler == nil {
+		grpclog.Println("rpcHandler and connHandler are both nil when starting stats. Stats is not started")
+		return
+	}
+	atomic.StoreInt32(on, 1)
+}
+
+// Stop stops the stats collection and processing.
+// Stop does not unregister the handlers.
+func Stop() {
+	atomic.StoreInt32(on, 0)
+}
+
+// On indicates whether the stats collection and processing is on.
+func On() bool {
+	return atomic.CompareAndSwapInt32(on, 1, 1)
+}
diff --git a/vendor/google.golang.org/grpc/stats/stats.go b/vendor/google.golang.org/grpc/stats/stats.go
new file mode 100644
index 0000000000..a82448a68b
--- /dev/null
+++ b/vendor/google.golang.org/grpc/stats/stats.go
@@ -0,0 +1,223 @@
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// Package stats is for collecting and reporting various network and RPC stats.
+// This package is for monitoring purpose only. All fields are read-only.
+// All APIs are experimental.
+package stats // import "google.golang.org/grpc/stats"
+
+import (
+	"net"
+	"time"
+)
+
+// RPCStats contains stats information about RPCs.
+type RPCStats interface {
+	isRPCStats()
+	// IsClient returns true if this RPCStats is from client side.
+	IsClient() bool
+}
+
+// Begin contains stats when an RPC begins.
+// FailFast are only valid if Client is true.
+type Begin struct {
+	// Client is true if this Begin is from client side.
+	Client bool
+	// BeginTime is the time when the RPC begins.
+	BeginTime time.Time
+	// FailFast indicates if this RPC is failfast.
+	FailFast bool
+}
+
+// IsClient indicates if this is from client side.
+func (s *Begin) IsClient() bool { return s.Client }
+
+func (s *Begin) isRPCStats() {}
+
+// InPayload contains the information for an incoming payload.
+type InPayload struct {
+	// Client is true if this InPayload is from client side.
+	Client bool
+	// Payload is the payload with original type.
+	Payload interface{}
+	// Data is the serialized message payload.
+	Data []byte
+	// Length is the length of uncompressed data.
+	Length int
+	// WireLength is the length of data on wire (compressed, signed, encrypted).
+	WireLength int
+	// RecvTime is the time when the payload is received.
+	RecvTime time.Time
+}
+
+// IsClient indicates if this is from client side.
+func (s *InPayload) IsClient() bool { return s.Client }
+
+func (s *InPayload) isRPCStats() {}
+
+// InHeader contains stats when a header is received.
+// FullMethod, addresses and Compression are only valid if Client is false.
+type InHeader struct {
+	// Client is true if this InHeader is from client side.
+	Client bool
+	// WireLength is the wire length of header.
+	WireLength int
+
+	// FullMethod is the full RPC method string, i.e., /package.service/method.
+	FullMethod string
+	// RemoteAddr is the remote address of the corresponding connection.
+	RemoteAddr net.Addr
+	// LocalAddr is the local address of the corresponding connection.
+	LocalAddr net.Addr
+	// Compression is the compression algorithm used for the RPC.
+	Compression string
+}
+
+// IsClient indicates if this is from client side.
+func (s *InHeader) IsClient() bool { return s.Client }
+
+func (s *InHeader) isRPCStats() {}
+
+// InTrailer contains stats when a trailer is received.
+type InTrailer struct {
+	// Client is true if this InTrailer is from client side.
+	Client bool
+	// WireLength is the wire length of trailer.
+	WireLength int
+}
+
+// IsClient indicates if this is from client side.
+func (s *InTrailer) IsClient() bool { return s.Client }
+
+func (s *InTrailer) isRPCStats() {}
+
+// OutPayload contains the information for an outgoing payload.
+type OutPayload struct {
+	// Client is true if this OutPayload is from client side.
+	Client bool
+	// Payload is the payload with original type.
+	Payload interface{}
+	// Data is the serialized message payload.
+	Data []byte
+	// Length is the length of uncompressed data.
+	Length int
+	// WireLength is the length of data on wire (compressed, signed, encrypted).
+	WireLength int
+	// SentTime is the time when the payload is sent.
+	SentTime time.Time
+}
+
+// IsClient indicates if this is from client side.
+func (s *OutPayload) IsClient() bool { return s.Client }
+
+func (s *OutPayload) isRPCStats() {}
+
+// OutHeader contains stats when a header is sent.
+// FullMethod, addresses and Compression are only valid if Client is true.
+type OutHeader struct {
+	// Client is true if this OutHeader is from client side.
+	Client bool
+	// WireLength is the wire length of header.
+	WireLength int
+
+	// FullMethod is the full RPC method string, i.e., /package.service/method.
+	FullMethod string
+	// RemoteAddr is the remote address of the corresponding connection.
+	RemoteAddr net.Addr
+	// LocalAddr is the local address of the corresponding connection.
+	LocalAddr net.Addr
+	// Compression is the compression algorithm used for the RPC.
+	Compression string
+}
+
+// IsClient indicates if this is from client side.
+func (s *OutHeader) IsClient() bool { return s.Client }
+
+func (s *OutHeader) isRPCStats() {}
+
+// OutTrailer contains stats when a trailer is sent.
+type OutTrailer struct {
+	// Client is true if this OutTrailer is from client side.
+	Client bool
+	// WireLength is the wire length of trailer.
+	WireLength int
+}
+
+// IsClient indicates if this is from client side.
+func (s *OutTrailer) IsClient() bool { return s.Client }
+
+func (s *OutTrailer) isRPCStats() {}
+
+// End contains stats when an RPC ends.
+type End struct {
+	// Client is true if this End is from client side.
+	Client bool
+	// EndTime is the time when the RPC ends.
+	EndTime time.Time
+	// Error is the error just happened. Its type is gRPC error.
+	Error error
+}
+
+// IsClient indicates if this is from client side.
+func (s *End) IsClient() bool { return s.Client }
+
+func (s *End) isRPCStats() {}
+
+// ConnStats contains stats information about connections.
+type ConnStats interface {
+	isConnStats()
+	// IsClient returns true if this ConnStats is from client side.
+	IsClient() bool
+}
+
+// ConnBegin contains the stats of a connection when it is established.
+type ConnBegin struct {
+	// Client is true if this ConnBegin is from client side.
+	Client bool
+}
+
+// IsClient indicates if this is from client side.
+func (s *ConnBegin) IsClient() bool { return s.Client }
+
+func (s *ConnBegin) isConnStats() {}
+
+// ConnEnd contains the stats of a connection when it ends.
+type ConnEnd struct {
+	// Client is true if this ConnEnd is from client side.
+	Client bool
+}
+
+// IsClient indicates if this is from client side.
+func (s *ConnEnd) IsClient() bool { return s.Client }
+
+func (s *ConnEnd) isConnStats() {}
diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go
index 7a3bef511b..1bcd2183a8 100644
--- a/vendor/google.golang.org/grpc/stream.go
+++ b/vendor/google.golang.org/grpc/stream.go
@@ -37,6 +37,7 @@ import (
 	"bytes"
 	"errors"
 	"io"
+	"math"
 	"sync"
 	"time"
 
@@ -44,6 +45,7 @@ import (
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/transport"
 )
 
@@ -84,12 +86,9 @@ type ClientStream interface {
 	// Header returns the header metadata received from the server if there
 	// is any. It blocks if the metadata is not ready to read.
 	Header() (metadata.MD, error)
-	// Trailer returns the trailer metadata from the server. It must be called
-	// after stream.Recv() returns non-nil error (including io.EOF) for
-	// bi-directional streaming and server streaming or stream.CloseAndRecv()
-	// returns for client streaming in order to receive trailer metadata if
-	// present. Otherwise, it could returns an empty MD even though trailer
-	// is present.
+	// Trailer returns the trailer metadata from the server, if there is any.
+	// It must only be called after stream.CloseAndRecv has returned, or
+	// stream.Recv has returned a non-nil error (including io.EOF).
 	Trailer() metadata.MD
 	// CloseSend closes the send direction of the stream. It closes the stream
 	// when non-nil error is met.
@@ -99,11 +98,17 @@ type ClientStream interface {
 
 // NewClientStream creates a new Stream for the client side. This is called
 // by generated code.
-func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error) {
+func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (_ ClientStream, err error) {
+	if cc.dopts.streamInt != nil {
+		return cc.dopts.streamInt(ctx, desc, cc, method, newClientStream, opts...)
+	}
+	return newClientStream(ctx, desc, cc, method, opts...)
+}
+
+func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (_ ClientStream, err error) {
 	var (
 		t   transport.ClientTransport
 		s   *transport.Stream
-		err error
 		put func()
 	)
 	c := defaultCallInfo
@@ -120,28 +125,44 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 	if cc.dopts.cp != nil {
 		callHdr.SendCompress = cc.dopts.cp.Type()
 	}
-	cs := &clientStream{
-		opts:    opts,
-		c:       c,
-		desc:    desc,
-		codec:   cc.dopts.codec,
-		cp:      cc.dopts.cp,
-		dc:      cc.dopts.dc,
-		tracing: EnableTracing,
-	}
-	if cc.dopts.cp != nil {
-		callHdr.SendCompress = cc.dopts.cp.Type()
-		cs.cbuf = new(bytes.Buffer)
-	}
-	if cs.tracing {
-		cs.trInfo.tr = trace.New("grpc.Sent."+methodFamily(method), method)
-		cs.trInfo.firstLine.client = true
+	var trInfo traceInfo
+	if EnableTracing {
+		trInfo.tr = trace.New("grpc.Sent."+methodFamily(method), method)
+		trInfo.firstLine.client = true
 		if deadline, ok := ctx.Deadline(); ok {
-			cs.trInfo.firstLine.deadline = deadline.Sub(time.Now())
+			trInfo.firstLine.deadline = deadline.Sub(time.Now())
+		}
+		trInfo.tr.LazyLog(&trInfo.firstLine, false)
+		ctx = trace.NewContext(ctx, trInfo.tr)
+		defer func() {
+			if err != nil {
+				// Need to call tr.finish() if error is returned.
+				// Because tr will not be returned to caller.
+				trInfo.tr.LazyPrintf("RPC: [%v]", err)
+				trInfo.tr.SetError()
+				trInfo.tr.Finish()
+			}
+		}()
+	}
+	if stats.On() {
+		ctx = stats.TagRPC(ctx, &stats.RPCTagInfo{FullMethodName: method})
+		begin := &stats.Begin{
+			Client:    true,
+			BeginTime: time.Now(),
+			FailFast:  c.failFast,
 		}
-		cs.trInfo.tr.LazyLog(&cs.trInfo.firstLine, false)
-		ctx = trace.NewContext(ctx, cs.trInfo.tr)
+		stats.HandleRPC(ctx, begin)
 	}
+	defer func() {
+		if err != nil && stats.On() {
+			// Only handle end stats if err != nil.
+			end := &stats.End{
+				Client: true,
+				Error:  err,
+			}
+			stats.HandleRPC(ctx, end)
+		}
+	}()
 	gopts := BalancerGetOptions{
 		BlockingWait: !c.failFast,
 	}
@@ -152,9 +173,9 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 			if _, ok := err.(*rpcError); ok {
 				return nil, err
 			}
-			if err == errConnClosing {
+			if err == errConnClosing || err == errConnUnavailable {
 				if c.failFast {
-					return nil, Errorf(codes.Unavailable, "%v", errConnClosing)
+					return nil, Errorf(codes.Unavailable, "%v", err)
 				}
 				continue
 			}
@@ -168,9 +189,8 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 				put()
 				put = nil
 			}
-			if _, ok := err.(transport.ConnectionError); ok {
+			if _, ok := err.(transport.ConnectionError); ok || err == transport.ErrStreamDrain {
 				if c.failFast {
-					cs.finish(err)
 					return nil, toRPCErr(err)
 				}
 				continue
@@ -179,16 +199,45 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 		}
 		break
 	}
-	cs.put = put
-	cs.t = t
-	cs.s = s
-	cs.p = &parser{r: s}
-	// Listen on ctx.Done() to detect cancellation when there is no pending
-	// I/O operations on this stream.
+	cs := &clientStream{
+		opts:  opts,
+		c:     c,
+		desc:  desc,
+		codec: cc.dopts.codec,
+		cp:    cc.dopts.cp,
+		dc:    cc.dopts.dc,
+
+		put: put,
+		t:   t,
+		s:   s,
+		p:   &parser{r: s},
+
+		tracing: EnableTracing,
+		trInfo:  trInfo,
+
+		statsCtx: ctx,
+	}
+	if cc.dopts.cp != nil {
+		cs.cbuf = new(bytes.Buffer)
+	}
+	// Listen on ctx.Done() to detect cancellation and s.Done() to detect normal termination
+	// when there is no pending I/O operations on this stream.
 	go func() {
 		select {
 		case <-t.Error():
 			// Incur transport error, simply exit.
+		case <-s.Done():
+			// TODO: The trace of the RPC is terminated here when there is no pending
+			// I/O, which is probably not the optimal solution.
+			if s.StatusCode() == codes.OK {
+				cs.finish(nil)
+			} else {
+				cs.finish(Errorf(s.StatusCode(), "%s", s.StatusDesc()))
+			}
+			cs.closeTransportStream(nil)
+		case <-s.GoAway():
+			cs.finish(errConnDrain)
+			cs.closeTransportStream(errConnDrain)
 		case <-s.Context().Done():
 			err := s.Context().Err()
 			cs.finish(err)
@@ -219,6 +268,11 @@ type clientStream struct {
 	// trInfo.tr is set when the clientStream is created (if EnableTracing is true),
 	// and is set to nil when the clientStream's finish method is called.
 	trInfo traceInfo
+
+	// statsCtx keeps the user context for stats handling.
+	// All stats collection should use the statsCtx (instead of the stream context)
+	// so that all the generated stats for a particular RPC can be associated in the processing phase.
+	statsCtx context.Context
 }
 
 func (cs *clientStream) Context() context.Context {
@@ -247,11 +301,23 @@ func (cs *clientStream) SendMsg(m interface{}) (err error) {
 		}
 		cs.mu.Unlock()
 	}
+	// TODO Investigate how to signal the stats handling party.
+	// generate error stats if err != nil && err != io.EOF?
 	defer func() {
 		if err != nil {
 			cs.finish(err)
 		}
-		if err == nil || err == io.EOF {
+		if err == nil {
+			return
+		}
+		if err == io.EOF {
+			// Specialize the process for server streaming. SendMesg is only called
+			// once when creating the stream object. io.EOF needs to be skipped when
+			// the rpc is early finished (before the stream object is created.).
+			// TODO: It is probably better to move this into the generated code.
+			if !cs.desc.ClientStreams && cs.desc.ServerStreams {
+				err = nil
+			}
 			return
 		}
 		if _, ok := err.(transport.ConnectionError); !ok {
@@ -259,20 +325,52 @@ func (cs *clientStream) SendMsg(m interface{}) (err error) {
 		}
 		err = toRPCErr(err)
 	}()
-	out, err := encode(cs.codec, m, cs.cp, cs.cbuf)
+	var outPayload *stats.OutPayload
+	if stats.On() {
+		outPayload = &stats.OutPayload{
+			Client: true,
+		}
+	}
+	out, err := encode(cs.codec, m, cs.cp, cs.cbuf, outPayload)
 	defer func() {
 		if cs.cbuf != nil {
 			cs.cbuf.Reset()
 		}
 	}()
 	if err != nil {
-		return transport.StreamErrorf(codes.Internal, "grpc: %v", err)
+		return Errorf(codes.Internal, "grpc: %v", err)
 	}
-	return cs.t.Write(cs.s, out, &transport.Options{Last: false})
+	err = cs.t.Write(cs.s, out, &transport.Options{Last: false})
+	if err == nil && outPayload != nil {
+		outPayload.SentTime = time.Now()
+		stats.HandleRPC(cs.statsCtx, outPayload)
+	}
+	return err
 }
 
 func (cs *clientStream) RecvMsg(m interface{}) (err error) {
-	err = recv(cs.p, cs.codec, cs.s, cs.dc, m)
+	defer func() {
+		if err != nil && stats.On() {
+			// Only generate End if err != nil.
+			// If err == nil, it's not the last RecvMsg.
+			// The last RecvMsg gets either an RPC error or io.EOF.
+			end := &stats.End{
+				Client:  true,
+				EndTime: time.Now(),
+			}
+			if err != io.EOF {
+				end.Error = toRPCErr(err)
+			}
+			stats.HandleRPC(cs.statsCtx, end)
+		}
+	}()
+	var inPayload *stats.InPayload
+	if stats.On() {
+		inPayload = &stats.InPayload{
+			Client: true,
+		}
+	}
+	err = recv(cs.p, cs.codec, cs.s, cs.dc, m, math.MaxInt32, inPayload)
 	defer func() {
 		// err != nil indicates the termination of the stream.
 		if err != nil {
@@ -287,11 +385,15 @@ func (cs *clientStream) RecvMsg(m interface{}) (err error) {
 			}
 			cs.mu.Unlock()
 		}
+		if inPayload != nil {
+			stats.HandleRPC(cs.statsCtx, inPayload)
+		}
 		if !cs.desc.ClientStreams || cs.desc.ServerStreams {
 			return
 		}
 		// Special handling for client streaming rpc.
-		err = recv(cs.p, cs.codec, cs.s, cs.dc, m)
+		// This recv expects EOF or errors, so we don't collect inPayload.
+		err = recv(cs.p, cs.codec, cs.s, cs.dc, m, math.MaxInt32, nil)
 		cs.closeTransportStream(err)
 		if err == nil {
 			return toRPCErr(errors.New("grpc: client streaming protocol violation: get <nil>, want <EOF>"))
@@ -326,7 +428,7 @@ func (cs *clientStream) CloseSend() (err error) {
 		}
 	}()
 	if err == nil || err == io.EOF {
-		return
+		return nil
 	}
 	if _, ok := err.(transport.ConnectionError); !ok {
 		cs.closeTransportStream(err)
@@ -373,12 +475,19 @@ func (cs *clientStream) finish(err error) {
 
 // ServerStream defines the interface a server stream has to satisfy.
 type ServerStream interface {
-	// SendHeader sends the header metadata. It should not be called
-	// after SendProto. It fails if called multiple times or if
-	// called after SendProto.
+	// SetHeader sets the header metadata. It may be called multiple times.
+	// When call multiple times, all the provided metadata will be merged.
+	// All the metadata will be sent out when one of the following happens:
+	//  - ServerStream.SendHeader() is called;
+	//  - The first response is sent out;
+	//  - An RPC status is sent out (error or success).
+	SetHeader(metadata.MD) error
+	// SendHeader sends the header metadata.
+	// The provided md and headers set by SetHeader() will be sent.
+	// It fails if called multiple times.
 	SendHeader(metadata.MD) error
-	// SetTrailer sets the trailer metadata which will be sent with the
-	// RPC status.
+	// SetTrailer sets the trailer metadata which will be sent with the RPC status.
+	// When called more than once, all the provided metadata will be merged.
 	SetTrailer(metadata.MD)
 	Stream
 }
@@ -392,6 +501,7 @@ type serverStream struct {
 	cp         Compressor
 	dc         Decompressor
 	cbuf       *bytes.Buffer
+	maxMsgSize int
 	statusCode codes.Code
 	statusDesc string
 	trInfo     *traceInfo
@@ -403,6 +513,13 @@ func (ss *serverStream) Context() context.Context {
 	return ss.s.Context()
 }
 
+func (ss *serverStream) SetHeader(md metadata.MD) error {
+	if md.Len() == 0 {
+		return nil
+	}
+	return ss.s.SetHeader(md)
+}
+
 func (ss *serverStream) SendHeader(md metadata.MD) error {
 	return ss.t.WriteHeader(ss.s, md)
 }
@@ -430,17 +547,28 @@ func (ss *serverStream) SendMsg(m interface{}) (err error) {
 			ss.mu.Unlock()
 		}
 	}()
-	out, err := encode(ss.codec, m, ss.cp, ss.cbuf)
+	var outPayload *stats.OutPayload
+	if stats.On() {
+		outPayload = &stats.OutPayload{}
+	}
+	out, err := encode(ss.codec, m, ss.cp, ss.cbuf, outPayload)
 	defer func() {
 		if ss.cbuf != nil {
 			ss.cbuf.Reset()
 		}
 	}()
 	if err != nil {
-		err = transport.StreamErrorf(codes.Internal, "grpc: %v", err)
+		err = Errorf(codes.Internal, "grpc: %v", err)
 		return err
 	}
-	return ss.t.Write(ss.s, out, &transport.Options{Last: false})
+	if err := ss.t.Write(ss.s, out, &transport.Options{Last: false}); err != nil {
+		return toRPCErr(err)
+	}
+	if outPayload != nil {
+		outPayload.SentTime = time.Now()
+		stats.HandleRPC(ss.s.Context(), outPayload)
+	}
+	return nil
 }
 
 func (ss *serverStream) RecvMsg(m interface{}) (err error) {
@@ -458,5 +586,21 @@ func (ss *serverStream) RecvMsg(m interface{}) (err error) {
 			ss.mu.Unlock()
 		}
 	}()
-	return recv(ss.p, ss.codec, ss.s, ss.dc, m)
+	var inPayload *stats.InPayload
+	if stats.On() {
+		inPayload = &stats.InPayload{}
+	}
+	if err := recv(ss.p, ss.codec, ss.s, ss.dc, m, ss.maxMsgSize, inPayload); err != nil {
+		if err == io.EOF {
+			return err
+		}
+		if err == io.ErrUnexpectedEOF {
+			err = Errorf(codes.Internal, io.ErrUnexpectedEOF.Error())
+		}
+		return toRPCErr(err)
+	}
+	if inPayload != nil {
+		stats.HandleRPC(ss.s.Context(), inPayload)
+	}
+	return nil
 }
diff --git a/vendor/google.golang.org/grpc/tap/tap.go b/vendor/google.golang.org/grpc/tap/tap.go
new file mode 100644
index 0000000000..0f36647674
--- /dev/null
+++ b/vendor/google.golang.org/grpc/tap/tap.go
@@ -0,0 +1,54 @@
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// Package tap defines the function handles which are executed on the transport
+// layer of gRPC-Go and related information. Everything here is EXPERIMENTAL.
+package tap
+
+import (
+	"golang.org/x/net/context"
+)
+
+// Info defines the relevant information needed by the handles.
+type Info struct {
+	// FullMethodName is the string of grpc method (in the format of
+	// /package.service/method).
+	FullMethodName string
+	// TODO: More to be added.
+}
+
+// ServerInHandle defines the function which runs when a new stream is created
+// on the server side. Note that it is executed in the per-connection I/O goroutine(s) instead
+// of per-RPC goroutine. Therefore, users should NOT have any blocking/time-consuming
+// work in this handle. Otherwise all the RPCs would slow down.
+type ServerInHandle func(ctx context.Context, info *Info) (context.Context, error)
diff --git a/vendor/google.golang.org/grpc/transport/control.go b/vendor/google.golang.org/grpc/transport/control.go
index 7e9bdf3350..2586cba469 100644
--- a/vendor/google.golang.org/grpc/transport/control.go
+++ b/vendor/google.golang.org/grpc/transport/control.go
@@ -72,6 +72,11 @@ type resetStream struct {
 
 func (*resetStream) item() {}
 
+type goAway struct {
+}
+
+func (*goAway) item() {}
+
 type flushIO struct {
 }
 
@@ -106,35 +111,9 @@ func newQuotaPool(q int) *quotaPool {
 	return qb
 }
 
-// add adds n to the available quota and tries to send it on acquire.
-func (qb *quotaPool) add(n int) {
-	qb.mu.Lock()
-	defer qb.mu.Unlock()
-	qb.quota += n
-	if qb.quota <= 0 {
-		return
-	}
-	select {
-	case qb.c <- qb.quota:
-		qb.quota = 0
-	default:
-	}
-}
-
-// cancel cancels the pending quota sent on acquire, if any.
-func (qb *quotaPool) cancel() {
-	qb.mu.Lock()
-	defer qb.mu.Unlock()
-	select {
-	case n := <-qb.c:
-		qb.quota += n
-	default:
-	}
-}
-
-// reset cancels the pending quota sent on acquired, incremented by v and sends
+// add cancels the pending quota sent on acquired, incremented by v and sends
 // it back on acquire.
-func (qb *quotaPool) reset(v int) {
+func (qb *quotaPool) add(v int) {
 	qb.mu.Lock()
 	defer qb.mu.Unlock()
 	select {
@@ -146,6 +125,10 @@ func (qb *quotaPool) reset(v int) {
 	if qb.quota <= 0 {
 		return
 	}
+	// After the pool has been created, this is the only place that sends on
+	// the channel. Since mu is held at this point and any quota that was sent
+	// on the channel has been retrieved, we know that this code will always
+	// place any positive quota value on the channel.
 	select {
 	case qb.c <- qb.quota:
 		qb.quota = 0
diff --git a/vendor/google.golang.org/grpc/transport/go16.go b/vendor/google.golang.org/grpc/transport/go16.go
new file mode 100644
index 0000000000..ee1c46bad5
--- /dev/null
+++ b/vendor/google.golang.org/grpc/transport/go16.go
@@ -0,0 +1,46 @@
+// +build go1.6,!go1.7
+
+/*
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package transport
+
+import (
+	"net"
+
+	"golang.org/x/net/context"
+)
+
+// dialContext connects to the address on the named network.
+func dialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	return (&net.Dialer{Cancel: ctx.Done()}).Dial(network, address)
+}
diff --git a/vendor/google.golang.org/grpc/transport/go17.go b/vendor/google.golang.org/grpc/transport/go17.go
new file mode 100644
index 0000000000..356f13ff19
--- /dev/null
+++ b/vendor/google.golang.org/grpc/transport/go17.go
@@ -0,0 +1,46 @@
+// +build go1.7
+
+/*
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package transport
+
+import (
+	"net"
+
+	"golang.org/x/net/context"
+)
+
+// dialContext connects to the address on the named network.
+func dialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	return (&net.Dialer{}).DialContext(ctx, network, address)
+}
diff --git a/vendor/google.golang.org/grpc/transport/handler_server.go b/vendor/google.golang.org/grpc/transport/handler_server.go
index 4b0d525243..10b6dc0b19 100644
--- a/vendor/google.golang.org/grpc/transport/handler_server.go
+++ b/vendor/google.golang.org/grpc/transport/handler_server.go
@@ -83,9 +83,9 @@ func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request) (ServerTr
 	}
 
 	if v := r.Header.Get("grpc-timeout"); v != "" {
-		to, err := timeoutDecode(v)
+		to, err := decodeTimeout(v)
 		if err != nil {
-			return nil, StreamErrorf(codes.Internal, "malformed time-out: %v", err)
+			return nil, streamErrorf(codes.Internal, "malformed time-out: %v", err)
 		}
 		st.timeoutSet = true
 		st.timeout = to
@@ -194,7 +194,7 @@ func (ht *serverHandlerTransport) WriteStatus(s *Stream, statusCode codes.Code,
 		h := ht.rw.Header()
 		h.Set("Grpc-Status", fmt.Sprintf("%d", statusCode))
 		if statusDesc != "" {
-			h.Set("Grpc-Message", statusDesc)
+			h.Set("Grpc-Message", encodeGrpcMessage(statusDesc))
 		}
 		if md := s.Trailer(); len(md) > 0 {
 			for k, vv := range md {
@@ -268,7 +268,7 @@ func (ht *serverHandlerTransport) WriteHeader(s *Stream, md metadata.MD) error {
 	})
 }
 
-func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream)) {
+func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream), traceCtx func(context.Context, string) context.Context) {
 	// With this transport type there will be exactly 1 stream: this HTTP request.
 
 	var ctx context.Context
@@ -370,6 +370,10 @@ func (ht *serverHandlerTransport) runStream() {
 	}
 }
 
+func (ht *serverHandlerTransport) Drain() {
+	panic("Drain() is not implemented")
+}
+
 // mapRecvMsgError returns the non-nil err into the appropriate
 // error value as expected by callers of *grpc.parser.recvMsg.
 // In particular, in can only be:
@@ -389,5 +393,5 @@ func mapRecvMsgError(err error) error {
 			}
 		}
 	}
-	return ConnectionError{Desc: err.Error()}
+	return connectionErrorf(true, err, err.Error())
 }
diff --git a/vendor/google.golang.org/grpc/transport/http2_client.go b/vendor/google.golang.org/grpc/transport/http2_client.go
index f66435fdbd..3936b9cf9f 100644
--- a/vendor/google.golang.org/grpc/transport/http2_client.go
+++ b/vendor/google.golang.org/grpc/transport/http2_client.go
@@ -35,6 +35,7 @@ package transport
 
 import (
 	"bytes"
+	"fmt"
 	"io"
 	"math"
 	"net"
@@ -50,15 +51,20 @@ import (
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
+	"google.golang.org/grpc/stats"
 )
 
 // http2Client implements the ClientTransport interface with HTTP2.
 type http2Client struct {
-	target    string // server name/addr
-	userAgent string
-	conn      net.Conn             // underlying communication channel
-	authInfo  credentials.AuthInfo // auth info about the connection
-	nextID    uint32               // the next stream ID to be used
+	ctx        context.Context
+	target     string // server name/addr
+	userAgent  string
+	md         interface{}
+	conn       net.Conn // underlying communication channel
+	remoteAddr net.Addr
+	localAddr  net.Addr
+	authInfo   credentials.AuthInfo // auth info about the connection
+	nextID     uint32               // the next stream ID to be used
 
 	// writableChan synchronizes write access to the transport.
 	// A writer acquires the write lock by sending a value on writableChan
@@ -71,6 +77,9 @@ type http2Client struct {
 	shutdownChan chan struct{}
 	// errorChan is closed to notify the I/O error to the caller.
 	errorChan chan struct{}
+	// goAway is closed to notify the upper layer (i.e., addrConn.transportMonitor)
+	// that the server sent GoAway on this transport.
+	goAway chan struct{}
 
 	framer *framer
 	hBuf   *bytes.Buffer  // the buffer for HPACK encoding
@@ -97,56 +106,96 @@ type http2Client struct {
 	maxStreams int
 	// the per-stream outbound flow control window size set by the peer.
 	streamSendQuota uint32
+	// goAwayID records the Last-Stream-ID in the GoAway frame from the server.
+	goAwayID uint32
+	// prevGoAway ID records the Last-Stream-ID in the previous GOAway frame.
+	prevGoAwayID uint32
+}
+
+func dial(ctx context.Context, fn func(context.Context, string) (net.Conn, error), addr string) (net.Conn, error) {
+	if fn != nil {
+		return fn(ctx, addr)
+	}
+	return dialContext(ctx, "tcp", addr)
+}
+
+func isTemporary(err error) bool {
+	switch err {
+	case io.EOF:
+		// Connection closures may be resolved upon retry, and are thus
+		// treated as temporary.
+		return true
+	case context.DeadlineExceeded:
+		// In Go 1.7, context.DeadlineExceeded implements Timeout(), and this
+		// special case is not needed. Until then, we need to keep this
+		// clause.
+		return true
+	}
+
+	switch err := err.(type) {
+	case interface {
+		Temporary() bool
+	}:
+		return err.Temporary()
+	case interface {
+		Timeout() bool
+	}:
+		// Timeouts may be resolved upon retry, and are thus treated as
+		// temporary.
+		return err.Timeout()
+	}
+	return false
 }
 
 // newHTTP2Client constructs a connected ClientTransport to addr based on HTTP2
 // and starts to receive messages on it. Non-nil error returns if construction
 // fails.
-func newHTTP2Client(addr string, opts *ConnectOptions) (_ ClientTransport, err error) {
-	if opts.Dialer == nil {
-		// Set the default Dialer.
-		opts.Dialer = func(addr string, timeout time.Duration) (net.Conn, error) {
-			return net.DialTimeout("tcp", addr, timeout)
-		}
-	}
+func newHTTP2Client(ctx context.Context, addr TargetInfo, opts ConnectOptions) (_ ClientTransport, err error) {
 	scheme := "http"
-	startT := time.Now()
-	timeout := opts.Timeout
-	conn, connErr := opts.Dialer(addr, timeout)
-	if connErr != nil {
-		return nil, ConnectionErrorf("transport: %v", connErr)
-	}
-	var authInfo credentials.AuthInfo
-	if opts.TransportCredentials != nil {
-		scheme = "https"
-		if timeout > 0 {
-			timeout -= time.Since(startT)
+	conn, err := dial(ctx, opts.Dialer, addr.Addr)
+	if err != nil {
+		if opts.FailOnNonTempDialError {
+			return nil, connectionErrorf(isTemporary(err), err, "transport: %v", err)
 		}
-		conn, authInfo, connErr = opts.TransportCredentials.ClientHandshake(addr, conn, timeout)
-	}
-	if connErr != nil {
-		return nil, ConnectionErrorf("transport: %v", connErr)
+		return nil, connectionErrorf(true, err, "transport: %v", err)
 	}
-	defer func() {
+	// Any further errors will close the underlying connection
+	defer func(conn net.Conn) {
 		if err != nil {
 			conn.Close()
 		}
-	}()
+	}(conn)
+	var authInfo credentials.AuthInfo
+	if creds := opts.TransportCredentials; creds != nil {
+		scheme = "https"
+		conn, authInfo, err = creds.ClientHandshake(ctx, addr.Addr, conn)
+		if err != nil {
+			// Credentials handshake errors are typically considered permanent
+			// to avoid retrying on e.g. bad certificates.
+			temp := isTemporary(err)
+			return nil, connectionErrorf(temp, err, "transport: %v", err)
+		}
+	}
 	ua := primaryUA
 	if opts.UserAgent != "" {
 		ua = opts.UserAgent + " " + ua
 	}
 	var buf bytes.Buffer
 	t := &http2Client{
-		target:    addr,
-		userAgent: ua,
-		conn:      conn,
-		authInfo:  authInfo,
+		ctx:        ctx,
+		target:     addr.Addr,
+		userAgent:  ua,
+		md:         addr.Metadata,
+		conn:       conn,
+		remoteAddr: conn.RemoteAddr(),
+		localAddr:  conn.LocalAddr(),
+		authInfo:   authInfo,
 		// The client initiated stream id is odd starting from 1.
 		nextID:          1,
 		writableChan:    make(chan int, 1),
 		shutdownChan:    make(chan struct{}),
 		errorChan:       make(chan struct{}),
+		goAway:          make(chan struct{}),
 		framer:          newFramer(conn),
 		hBuf:            &buf,
 		hEnc:            hpack.NewEncoder(&buf),
@@ -168,11 +217,11 @@ func newHTTP2Client(addr string, opts *ConnectOptions) (_ ClientTransport, err e
 	n, err := t.conn.Write(clientPreface)
 	if err != nil {
 		t.Close()
-		return nil, ConnectionErrorf("transport: %v", err)
+		return nil, connectionErrorf(true, err, "transport: %v", err)
 	}
 	if n != len(clientPreface) {
 		t.Close()
-		return nil, ConnectionErrorf("transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface))
+		return nil, connectionErrorf(true, err, "transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface))
 	}
 	if initialWindowSize != defaultWindowSize {
 		err = t.framer.writeSettings(true, http2.Setting{
@@ -184,17 +233,27 @@ func newHTTP2Client(addr string, opts *ConnectOptions) (_ ClientTransport, err e
 	}
 	if err != nil {
 		t.Close()
-		return nil, ConnectionErrorf("transport: %v", err)
+		return nil, connectionErrorf(true, err, "transport: %v", err)
 	}
 	// Adjust the connection flow control window if needed.
 	if delta := uint32(initialConnWindowSize - defaultWindowSize); delta > 0 {
 		if err := t.framer.writeWindowUpdate(true, 0, delta); err != nil {
 			t.Close()
-			return nil, ConnectionErrorf("transport: %v", err)
+			return nil, connectionErrorf(true, err, "transport: %v", err)
 		}
 	}
 	go t.controller()
 	t.writableChan <- 0
+	if stats.On() {
+		t.ctx = stats.TagConn(t.ctx, &stats.ConnTagInfo{
+			RemoteAddr: t.remoteAddr,
+			LocalAddr:  t.localAddr,
+		})
+		connBegin := &stats.ConnBegin{
+			Client: true,
+		}
+		stats.HandleConn(t.ctx, connBegin)
+	}
 	return t, nil
 }
 
@@ -202,6 +261,8 @@ func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
 	// TODO(zhaoq): Handle uint32 overflow of Stream.id.
 	s := &Stream{
 		id:            t.nextID,
+		done:          make(chan struct{}),
+		goAway:        make(chan struct{}),
 		method:        callHdr.Method,
 		sendCompress:  callHdr.SendCompress,
 		buf:           newRecvBuffer(),
@@ -213,11 +274,14 @@ func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
 	s.windowHandler = func(n int) {
 		t.updateWindow(s, uint32(n))
 	}
-	// Make a stream be able to cancel the pending operations by itself.
-	s.ctx, s.cancel = context.WithCancel(ctx)
+	// The client side stream context should have exactly the same life cycle with the user provided context.
+	// That means, s.ctx should be read-only. And s.ctx is done iff ctx is done.
+	// So we use the original context here instead of creating a copy.
+	s.ctx = ctx
 	s.dec = &recvBufferReader{
-		ctx:  s.ctx,
-		recv: s.buf,
+		ctx:    s.ctx,
+		goAway: s.goAway,
+		recv:   s.buf,
 	}
 	return s
 }
@@ -225,23 +289,14 @@ func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
 // NewStream creates a stream and register it into the transport as "active"
 // streams.
 func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Stream, err error) {
-	// Record the timeout value on the context.
-	var timeout time.Duration
-	if dl, ok := ctx.Deadline(); ok {
-		timeout = dl.Sub(time.Now())
-	}
-	select {
-	case <-ctx.Done():
-		return nil, ContextErr(ctx.Err())
-	default:
-	}
 	pr := &peer.Peer{
-		Addr: t.conn.RemoteAddr(),
+		Addr: t.remoteAddr,
 	}
 	// Attach Auth info if there is any.
 	if t.authInfo != nil {
 		pr.AuthInfo = t.authInfo
 	}
+	userCtx := ctx
 	ctx = peer.NewContext(ctx, pr)
 	authData := make(map[string]string)
 	for _, c := range t.creds {
@@ -255,12 +310,12 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		}
 		pos := strings.LastIndex(callHdr.Method, "/")
 		if pos == -1 {
-			return nil, StreamErrorf(codes.InvalidArgument, "transport: malformed method name: %q", callHdr.Method)
+			return nil, streamErrorf(codes.InvalidArgument, "transport: malformed method name: %q", callHdr.Method)
 		}
 		audience := "https://" + callHdr.Host + port + callHdr.Method[:pos]
 		data, err := c.GetRequestMetadata(ctx, audience)
 		if err != nil {
-			return nil, StreamErrorf(codes.InvalidArgument, "transport: %v", err)
+			return nil, streamErrorf(codes.InvalidArgument, "transport: %v", err)
 		}
 		for k, v := range data {
 			authData[k] = v
@@ -271,6 +326,10 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		t.mu.Unlock()
 		return nil, ErrConnClosing
 	}
+	if t.state == draining {
+		t.mu.Unlock()
+		return nil, ErrStreamDrain
+	}
 	if t.state != reachable {
 		t.mu.Unlock()
 		return nil, ErrConnClosing
@@ -278,7 +337,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 	checkStreamsQuota := t.streamsQuota != nil
 	t.mu.Unlock()
 	if checkStreamsQuota {
-		sq, err := wait(ctx, t.shutdownChan, t.streamsQuota.acquire())
+		sq, err := wait(ctx, nil, nil, t.shutdownChan, t.streamsQuota.acquire())
 		if err != nil {
 			return nil, err
 		}
@@ -287,7 +346,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 			t.streamsQuota.add(sq - 1)
 		}
 	}
-	if _, err := wait(ctx, t.shutdownChan, t.writableChan); err != nil {
+	if _, err := wait(ctx, nil, nil, t.shutdownChan, t.writableChan); err != nil {
 		// Return the quota back now because there is no stream returned to the caller.
 		if _, ok := err.(StreamError); ok && checkStreamsQuota {
 			t.streamsQuota.add(1)
@@ -295,11 +354,21 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		return nil, err
 	}
 	t.mu.Lock()
+	if t.state == draining {
+		t.mu.Unlock()
+		if checkStreamsQuota {
+			t.streamsQuota.add(1)
+		}
+		// Need to make t writable again so that the rpc in flight can still proceed.
+		t.writableChan <- 0
+		return nil, ErrStreamDrain
+	}
 	if t.state != reachable {
 		t.mu.Unlock()
 		return nil, ErrConnClosing
 	}
 	s := t.newStream(ctx, callHdr)
+	s.clientStatsCtx = userCtx
 	t.activeStreams[s.id] = s
 
 	// This stream is not counted when applySetings(...) initialize t.streamsQuota.
@@ -310,7 +379,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 	}
 	t.mu.Unlock()
 	if reset {
-		t.streamsQuota.reset(-1)
+		t.streamsQuota.add(-1)
 	}
 
 	// HPACK encodes various headers. Note that once WriteField(...) is
@@ -328,9 +397,12 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 	if callHdr.SendCompress != "" {
 		t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-encoding", Value: callHdr.SendCompress})
 	}
-	if timeout > 0 {
-		t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-timeout", Value: timeoutEncode(timeout)})
+	if dl, ok := ctx.Deadline(); ok {
+		// Send out timeout regardless its value. The server can detect timeout context by itself.
+		timeout := dl.Sub(time.Now())
+		t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-timeout", Value: encodeTimeout(timeout)})
 	}
+
 	for k, v := range authData {
 		// Capital header names are illegal in HTTP/2.
 		k = strings.ToLower(k)
@@ -352,7 +424,18 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 			}
 		}
 	}
+	if md, ok := t.md.(*metadata.MD); ok {
+		for k, v := range *md {
+			if isReservedHeader(k) {
+				continue
+			}
+			for _, entry := range v {
+				t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+			}
+		}
+	}
 	first := true
+	bufLen := t.hBuf.Len()
 	// Sends the headers in a single batch even when they span multiple frames.
 	for !endHeaders {
 		size := t.hBuf.Len()
@@ -384,8 +467,19 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		}
 		if err != nil {
 			t.notifyError(err)
-			return nil, ConnectionErrorf("transport: %v", err)
+			return nil, connectionErrorf(true, err, "transport: %v", err)
+		}
+	}
+	if stats.On() {
+		outHeader := &stats.OutHeader{
+			Client:      true,
+			WireLength:  bufLen,
+			FullMethod:  callHdr.Method,
+			RemoteAddr:  t.remoteAddr,
+			LocalAddr:   t.localAddr,
+			Compression: callHdr.SendCompress,
 		}
+		stats.HandleRPC(s.clientStatsCtx, outHeader)
 	}
 	t.writableChan <- 0
 	return s, nil
@@ -403,22 +497,17 @@ func (t *http2Client) CloseStream(s *Stream, err error) {
 	if t.streamsQuota != nil {
 		updateStreams = true
 	}
-	if t.state == draining && len(t.activeStreams) == 1 {
+	delete(t.activeStreams, s.id)
+	if t.state == draining && len(t.activeStreams) == 0 {
 		// The transport is draining and s is the last live stream on t.
 		t.mu.Unlock()
 		t.Close()
 		return
 	}
-	delete(t.activeStreams, s.id)
 	t.mu.Unlock()
 	if updateStreams {
 		t.streamsQuota.add(1)
 	}
-	// In case stream sending and receiving are invoked in separate
-	// goroutines (e.g., bi-directional streaming), the caller needs
-	// to call cancel on the stream to interrupt the blocking on
-	// other goroutines.
-	s.cancel()
 	s.mu.Lock()
 	if q := s.fc.resetPendingData(); q > 0 {
 		if n := t.fc.onRead(q); n > 0 {
@@ -435,7 +524,7 @@ func (t *http2Client) CloseStream(s *Stream, err error) {
 	}
 	s.state = streamDone
 	s.mu.Unlock()
-	if _, ok := err.(StreamError); ok {
+	if se, ok := err.(StreamError); ok && se.Code != codes.DeadlineExceeded {
 		t.controlBuf.put(&resetStream{s.id, http2.ErrCodeCancel})
 	}
 }
@@ -445,13 +534,13 @@ func (t *http2Client) CloseStream(s *Stream, err error) {
 // accessed any more.
 func (t *http2Client) Close() (err error) {
 	t.mu.Lock()
-	if t.state == reachable {
-		close(t.errorChan)
-	}
 	if t.state == closing {
 		t.mu.Unlock()
 		return
 	}
+	if t.state == reachable || t.state == draining {
+		close(t.errorChan)
+	}
 	t.state = closing
 	t.mu.Unlock()
 	close(t.shutdownChan)
@@ -470,15 +559,46 @@ func (t *http2Client) Close() (err error) {
 		s.mu.Unlock()
 		s.write(recvMsg{err: ErrConnClosing})
 	}
+	if stats.On() {
+		connEnd := &stats.ConnEnd{
+			Client: true,
+		}
+		stats.HandleConn(t.ctx, connEnd)
+	}
 	return
 }
 
 func (t *http2Client) GracefulClose() error {
 	t.mu.Lock()
-	if t.state == closing {
+	switch t.state {
+	case unreachable:
+		// The server may close the connection concurrently. t is not available for
+		// any streams. Close it now.
+		t.mu.Unlock()
+		t.Close()
+		return nil
+	case closing:
 		t.mu.Unlock()
 		return nil
 	}
+	// Notify the streams which were initiated after the server sent GOAWAY.
+	select {
+	case <-t.goAway:
+		n := t.prevGoAwayID
+		if n == 0 && t.nextID > 1 {
+			n = t.nextID - 2
+		}
+		m := t.goAwayID + 2
+		if m == 2 {
+			m = 1
+		}
+		for i := m; i <= n; i += 2 {
+			if s, ok := t.activeStreams[i]; ok {
+				close(s.goAway)
+			}
+		}
+	default:
+	}
 	if t.state == draining {
 		t.mu.Unlock()
 		return nil
@@ -502,19 +622,14 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
 		var p []byte
 		if r.Len() > 0 {
 			size := http2MaxFrameLen
-			s.sendQuotaPool.add(0)
 			// Wait until the stream has some quota to send the data.
-			sq, err := wait(s.ctx, t.shutdownChan, s.sendQuotaPool.acquire())
+			sq, err := wait(s.ctx, s.done, s.goAway, t.shutdownChan, s.sendQuotaPool.acquire())
 			if err != nil {
 				return err
 			}
-			t.sendQuotaPool.add(0)
 			// Wait until the transport has some quota to send the data.
-			tq, err := wait(s.ctx, t.shutdownChan, t.sendQuotaPool.acquire())
+			tq, err := wait(s.ctx, s.done, s.goAway, t.shutdownChan, t.sendQuotaPool.acquire())
 			if err != nil {
-				if _, ok := err.(StreamError); ok {
-					t.sendQuotaPool.cancel()
-				}
 				return err
 			}
 			if sq < size {
@@ -544,8 +659,8 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
 		// Indicate there is a writer who is about to write a data frame.
 		t.framer.adjustNumWriters(1)
 		// Got some quota. Try to acquire writing privilege on the transport.
-		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
-			if _, ok := err.(StreamError); ok {
+		if _, err := wait(s.ctx, s.done, s.goAway, t.shutdownChan, t.writableChan); err != nil {
+			if _, ok := err.(StreamError); ok || err == io.EOF {
 				// Return the connection quota back.
 				t.sendQuotaPool.add(len(p))
 			}
@@ -578,7 +693,7 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
 		// invoked.
 		if err := t.framer.writeData(forceFlush, s.id, endStream, p); err != nil {
 			t.notifyError(err)
-			return ConnectionErrorf("transport: %v", err)
+			return connectionErrorf(true, err, "transport: %v", err)
 		}
 		if t.framer.adjustNumWriters(-1) == 0 {
 			t.framer.flushWrite()
@@ -593,11 +708,7 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
 	}
 	s.mu.Lock()
 	if s.state != streamDone {
-		if s.state == streamReadDone {
-			s.state = streamDone
-		} else {
-			s.state = streamWriteDone
-		}
+		s.state = streamWriteDone
 	}
 	s.mu.Unlock()
 	return nil
@@ -630,7 +741,7 @@ func (t *http2Client) updateWindow(s *Stream, n uint32) {
 func (t *http2Client) handleData(f *http2.DataFrame) {
 	size := len(f.Data())
 	if err := t.fc.onData(uint32(size)); err != nil {
-		t.notifyError(ConnectionErrorf("%v", err))
+		t.notifyError(connectionErrorf(true, err, "%v", err))
 		return
 	}
 	// Select the right stream to dispatch.
@@ -655,6 +766,7 @@ func (t *http2Client) handleData(f *http2.DataFrame) {
 			s.state = streamDone
 			s.statusCode = codes.Internal
 			s.statusDesc = err.Error()
+			close(s.done)
 			s.mu.Unlock()
 			s.write(recvMsg{err: io.EOF})
 			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeFlowControl})
@@ -672,13 +784,14 @@ func (t *http2Client) handleData(f *http2.DataFrame) {
 	// the read direction is closed, and set the status appropriately.
 	if f.FrameHeader.Flags.Has(http2.FlagDataEndStream) {
 		s.mu.Lock()
-		if s.state == streamWriteDone {
-			s.state = streamDone
-		} else {
-			s.state = streamReadDone
+		if s.state == streamDone {
+			s.mu.Unlock()
+			return
 		}
+		s.state = streamDone
 		s.statusCode = codes.Internal
 		s.statusDesc = "server closed the stream without sending trailers"
+		close(s.done)
 		s.mu.Unlock()
 		s.write(recvMsg{err: io.EOF})
 	}
@@ -704,6 +817,8 @@ func (t *http2Client) handleRSTStream(f *http2.RSTStreamFrame) {
 		grpclog.Println("transport: http2Client.handleRSTStream found no mapped gRPC status for the received http2 error ", f.ErrCode)
 		s.statusCode = codes.Unknown
 	}
+	s.statusDesc = fmt.Sprintf("stream terminated by RST_STREAM with error code: %d", f.ErrCode)
+	close(s.done)
 	s.mu.Unlock()
 	s.write(recvMsg{err: io.EOF})
 }
@@ -722,13 +837,41 @@ func (t *http2Client) handleSettings(f *http2.SettingsFrame) {
 }
 
 func (t *http2Client) handlePing(f *http2.PingFrame) {
+	if f.IsAck() { // Do nothing.
+		return
+	}
 	pingAck := &ping{ack: true}
 	copy(pingAck.data[:], f.Data[:])
 	t.controlBuf.put(pingAck)
 }
 
 func (t *http2Client) handleGoAway(f *http2.GoAwayFrame) {
-	// TODO(zhaoq): GoAwayFrame handler to be implemented
+	t.mu.Lock()
+	if t.state == reachable || t.state == draining {
+		if f.LastStreamID > 0 && f.LastStreamID%2 != 1 {
+			t.mu.Unlock()
+			t.notifyError(connectionErrorf(true, nil, "received illegal http2 GOAWAY frame: stream ID %d is even", f.LastStreamID))
+			return
+		}
+		select {
+		case <-t.goAway:
+			id := t.goAwayID
+			// t.goAway has been closed (i.e.,multiple GoAways).
+			if id < f.LastStreamID {
+				t.mu.Unlock()
+				t.notifyError(connectionErrorf(true, nil, "received illegal http2 GOAWAY frame: previously recv GOAWAY frame with LastStramID %d, currently recv %d", id, f.LastStreamID))
+				return
+			}
+			t.prevGoAwayID = id
+			t.goAwayID = f.LastStreamID
+			t.mu.Unlock()
+			return
+		default:
+		}
+		t.goAwayID = f.LastStreamID
+		close(t.goAway)
+	}
+	t.mu.Unlock()
 }
 
 func (t *http2Client) handleWindowUpdate(f *http2.WindowUpdateFrame) {
@@ -754,12 +897,36 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
 		state.processHeaderField(hf)
 	}
 	if state.err != nil {
+		s.mu.Lock()
+		if !s.headerDone {
+			close(s.headerChan)
+			s.headerDone = true
+		}
+		s.mu.Unlock()
 		s.write(recvMsg{err: state.err})
 		// Something wrong. Stops reading even when there is remaining.
 		return
 	}
 
 	endStream := frame.StreamEnded()
+	var isHeader bool
+	defer func() {
+		if stats.On() {
+			if isHeader {
+				inHeader := &stats.InHeader{
+					Client:     true,
+					WireLength: int(frame.Header().Length),
+				}
+				stats.HandleRPC(s.clientStatsCtx, inHeader)
+			} else {
+				inTrailer := &stats.InTrailer{
+					Client:     true,
+					WireLength: int(frame.Header().Length),
+				}
+				stats.HandleRPC(s.clientStatsCtx, inTrailer)
+			}
+		}
+	}()
 
 	s.mu.Lock()
 	if !endStream {
@@ -771,6 +938,7 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
 		}
 		close(s.headerChan)
 		s.headerDone = true
+		isHeader = true
 	}
 	if !endStream || s.state == streamDone {
 		s.mu.Unlock()
@@ -780,11 +948,11 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
 	if len(state.mdata) > 0 {
 		s.trailer = state.mdata
 	}
-	s.state = streamDone
 	s.statusCode = state.statusCode
 	s.statusDesc = state.statusDesc
+	close(s.done)
+	s.state = streamDone
 	s.mu.Unlock()
-
 	s.write(recvMsg{err: io.EOF})
 }
 
@@ -831,7 +999,7 @@ func (t *http2Client) reader() {
 				t.mu.Unlock()
 				if s != nil {
 					// use error detail to provide better err message
-					handleMalformedHTTP2(s, StreamErrorf(http2ErrConvTab[se.Code], "%v", t.framer.errorDetail()))
+					handleMalformedHTTP2(s, streamErrorf(http2ErrConvTab[se.Code], "%v", t.framer.errorDetail()))
 				}
 				continue
 			} else {
@@ -880,13 +1048,13 @@ func (t *http2Client) applySettings(ss []http2.Setting) {
 			t.maxStreams = int(s.Val)
 			t.mu.Unlock()
 			if reset {
-				t.streamsQuota.reset(int(s.Val) - ms)
+				t.streamsQuota.add(int(s.Val) - ms)
 			}
 		case http2.SettingInitialWindowSize:
 			t.mu.Lock()
 			for _, stream := range t.activeStreams {
 				// Adjust the sending quota for each stream.
-				stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
+				stream.sendQuotaPool.add(int(s.Val - t.streamSendQuota))
 			}
 			t.streamSendQuota = s.Val
 			t.mu.Unlock()
@@ -937,13 +1105,22 @@ func (t *http2Client) Error() <-chan struct{} {
 	return t.errorChan
 }
 
+func (t *http2Client) GoAway() <-chan struct{} {
+	return t.goAway
+}
+
 func (t *http2Client) notifyError(err error) {
 	t.mu.Lock()
-	defer t.mu.Unlock()
 	// make sure t.errorChan is closed only once.
+	if t.state == draining {
+		t.mu.Unlock()
+		t.Close()
+		return
+	}
 	if t.state == reachable {
 		t.state = unreachable
 		close(t.errorChan)
 		grpclog.Printf("transport: http2Client.notifyError got notified that the client transport was broken %v.", err)
 	}
+	t.mu.Unlock()
 }
diff --git a/vendor/google.golang.org/grpc/transport/http2_server.go b/vendor/google.golang.org/grpc/transport/http2_server.go
index cee1542976..316188e7b7 100644
--- a/vendor/google.golang.org/grpc/transport/http2_server.go
+++ b/vendor/google.golang.org/grpc/transport/http2_server.go
@@ -50,6 +50,8 @@ import (
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
+	"google.golang.org/grpc/stats"
+	"google.golang.org/grpc/tap"
 )
 
 // ErrIllegalHeaderWrite indicates that setting header is illegal because of
@@ -58,9 +60,13 @@ var ErrIllegalHeaderWrite = errors.New("transport: the stream is done or WriteHe
 
 // http2Server implements the ServerTransport interface with HTTP2.
 type http2Server struct {
+	ctx         context.Context
 	conn        net.Conn
+	remoteAddr  net.Addr
+	localAddr   net.Addr
 	maxStreamID uint32               // max stream ID ever seen
 	authInfo    credentials.AuthInfo // auth info about the connection
+	inTapHandle tap.ServerInHandle
 	// writableChan synchronizes write access to the transport.
 	// A writer acquires the write lock by receiving a value on writableChan
 	// and releases it by sending on writableChan.
@@ -91,12 +97,13 @@ type http2Server struct {
 
 // newHTTP2Server constructs a ServerTransport based on HTTP2. ConnectionError is
 // returned if something goes wrong.
-func newHTTP2Server(conn net.Conn, maxStreams uint32, authInfo credentials.AuthInfo) (_ ServerTransport, err error) {
+func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err error) {
 	framer := newFramer(conn)
 	// Send initial settings as connection preface to client.
 	var settings []http2.Setting
 	// TODO(zhaoq): Have a better way to signal "no limit" because 0 is
 	// permitted in the HTTP2 spec.
+	maxStreams := config.MaxStreams
 	if maxStreams == 0 {
 		maxStreams = math.MaxUint32
 	} else {
@@ -111,22 +118,26 @@ func newHTTP2Server(conn net.Conn, maxStreams uint32, authInfo credentials.AuthI
 			Val: uint32(initialWindowSize)})
 	}
 	if err := framer.writeSettings(true, settings...); err != nil {
-		return nil, ConnectionErrorf("transport: %v", err)
+		return nil, connectionErrorf(true, err, "transport: %v", err)
 	}
 	// Adjust the connection flow control window if needed.
 	if delta := uint32(initialConnWindowSize - defaultWindowSize); delta > 0 {
 		if err := framer.writeWindowUpdate(true, 0, delta); err != nil {
-			return nil, ConnectionErrorf("transport: %v", err)
+			return nil, connectionErrorf(true, err, "transport: %v", err)
 		}
 	}
 	var buf bytes.Buffer
 	t := &http2Server{
+		ctx:             context.Background(),
 		conn:            conn,
-		authInfo:        authInfo,
+		remoteAddr:      conn.RemoteAddr(),
+		localAddr:       conn.LocalAddr(),
+		authInfo:        config.AuthInfo,
 		framer:          framer,
 		hBuf:            &buf,
 		hEnc:            hpack.NewEncoder(&buf),
 		maxStreams:      maxStreams,
+		inTapHandle:     config.InTapHandle,
 		controlBuf:      newRecvBuffer(),
 		fc:              &inFlow{limit: initialConnWindowSize},
 		sendQuotaPool:   newQuotaPool(defaultWindowSize),
@@ -136,13 +147,21 @@ func newHTTP2Server(conn net.Conn, maxStreams uint32, authInfo credentials.AuthI
 		activeStreams:   make(map[uint32]*Stream),
 		streamSendQuota: defaultWindowSize,
 	}
+	if stats.On() {
+		t.ctx = stats.TagConn(t.ctx, &stats.ConnTagInfo{
+			RemoteAddr: t.remoteAddr,
+			LocalAddr:  t.localAddr,
+		})
+		connBegin := &stats.ConnBegin{}
+		stats.HandleConn(t.ctx, connBegin)
+	}
 	go t.controller()
 	t.writableChan <- 0
 	return t, nil
 }
 
 // operateHeader takes action on the decoded headers.
-func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(*Stream)) {
+func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(*Stream), traceCtx func(context.Context, string) context.Context) (close bool) {
 	buf := newRecvBuffer()
 	s := &Stream{
 		id:  frame.Header().StreamID,
@@ -168,12 +187,12 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 	}
 	s.recvCompress = state.encoding
 	if state.timeoutSet {
-		s.ctx, s.cancel = context.WithTimeout(context.TODO(), state.timeout)
+		s.ctx, s.cancel = context.WithTimeout(t.ctx, state.timeout)
 	} else {
-		s.ctx, s.cancel = context.WithCancel(context.TODO())
+		s.ctx, s.cancel = context.WithCancel(t.ctx)
 	}
 	pr := &peer.Peer{
-		Addr: t.conn.RemoteAddr(),
+		Addr: t.remoteAddr,
 	}
 	// Attach Auth info if there is any.
 	if t.authInfo != nil {
@@ -195,6 +214,18 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 	}
 	s.recvCompress = state.encoding
 	s.method = state.method
+	if t.inTapHandle != nil {
+		var err error
+		info := &tap.Info{
+			FullMethodName: state.method,
+		}
+		s.ctx, err = t.inTapHandle(s.ctx, info)
+		if err != nil {
+			// TODO: Log the real error.
+			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeRefusedStream})
+			return
+		}
+	}
 	t.mu.Lock()
 	if t.state != reachable {
 		t.mu.Unlock()
@@ -205,18 +236,39 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 		t.controlBuf.put(&resetStream{s.id, http2.ErrCodeRefusedStream})
 		return
 	}
+	if s.id%2 != 1 || s.id <= t.maxStreamID {
+		t.mu.Unlock()
+		// illegal gRPC stream id.
+		grpclog.Println("transport: http2Server.HandleStreams received an illegal stream id: ", s.id)
+		return true
+	}
+	t.maxStreamID = s.id
 	s.sendQuotaPool = newQuotaPool(int(t.streamSendQuota))
 	t.activeStreams[s.id] = s
 	t.mu.Unlock()
 	s.windowHandler = func(n int) {
 		t.updateWindow(s, uint32(n))
 	}
+	s.ctx = traceCtx(s.ctx, s.method)
+	if stats.On() {
+		s.ctx = stats.TagRPC(s.ctx, &stats.RPCTagInfo{FullMethodName: s.method})
+		inHeader := &stats.InHeader{
+			FullMethod:  s.method,
+			RemoteAddr:  t.remoteAddr,
+			LocalAddr:   t.localAddr,
+			Compression: s.recvCompress,
+			WireLength:  int(frame.Header().Length),
+		}
+		stats.HandleRPC(s.ctx, inHeader)
+	}
 	handle(s)
+	return
 }
 
 // HandleStreams receives incoming streams using the given handler. This is
 // typically run in a separate goroutine.
-func (t *http2Server) HandleStreams(handle func(*Stream)) {
+// traceCtx attaches trace to ctx and returns the new context.
+func (t *http2Server) HandleStreams(handle func(*Stream), traceCtx func(context.Context, string) context.Context) {
 	// Check the validity of client preface.
 	preface := make([]byte, len(clientPreface))
 	if _, err := io.ReadFull(t.conn, preface); err != nil {
@@ -231,6 +283,10 @@ func (t *http2Server) HandleStreams(handle func(*Stream)) {
 	}
 
 	frame, err := t.framer.readFrame()
+	if err == io.EOF || err == io.ErrUnexpectedEOF {
+		t.Close()
+		return
+	}
 	if err != nil {
 		grpclog.Printf("transport: http2Server.HandleStreams failed to read frame: %v", err)
 		t.Close()
@@ -257,20 +313,20 @@ func (t *http2Server) HandleStreams(handle func(*Stream)) {
 				t.controlBuf.put(&resetStream{se.StreamID, se.Code})
 				continue
 			}
+			if err == io.EOF || err == io.ErrUnexpectedEOF {
+				t.Close()
+				return
+			}
+			grpclog.Printf("transport: http2Server.HandleStreams failed to read frame: %v", err)
 			t.Close()
 			return
 		}
 		switch frame := frame.(type) {
 		case *http2.MetaHeadersFrame:
-			id := frame.Header().StreamID
-			if id%2 != 1 || id <= t.maxStreamID {
-				// illegal gRPC stream id.
-				grpclog.Println("transport: http2Server.HandleStreams received an illegal stream id: ", id)
+			if t.operateHeaders(frame, handle, traceCtx) {
 				t.Close()
 				break
 			}
-			t.maxStreamID = id
-			t.operateHeaders(frame, handle)
 		case *http2.DataFrame:
 			t.handleData(frame)
 		case *http2.RSTStreamFrame:
@@ -282,7 +338,7 @@ func (t *http2Server) HandleStreams(handle func(*Stream)) {
 		case *http2.WindowUpdateFrame:
 			t.handleWindowUpdate(frame)
 		case *http2.GoAwayFrame:
-			break
+			// TODO: Handle GoAway from the client appropriately.
 		default:
 			grpclog.Printf("transport: http2Server.HandleStreams found unhandled frame type %v.", frame)
 		}
@@ -364,11 +420,7 @@ func (t *http2Server) handleData(f *http2.DataFrame) {
 		// Received the end of stream from the client.
 		s.mu.Lock()
 		if s.state != streamDone {
-			if s.state == streamWriteDone {
-				s.state = streamDone
-			} else {
-				s.state = streamReadDone
-			}
+			s.state = streamReadDone
 		}
 		s.mu.Unlock()
 		s.write(recvMsg{err: io.EOF})
@@ -397,6 +449,9 @@ func (t *http2Server) handleSettings(f *http2.SettingsFrame) {
 }
 
 func (t *http2Server) handlePing(f *http2.PingFrame) {
+	if f.IsAck() { // Do nothing.
+		return
+	}
 	pingAck := &ping{ack: true}
 	copy(pingAck.data[:], f.Data[:])
 	t.controlBuf.put(pingAck)
@@ -440,7 +495,7 @@ func (t *http2Server) writeHeaders(s *Stream, b *bytes.Buffer, endStream bool) e
 		}
 		if err != nil {
 			t.Close()
-			return ConnectionErrorf("transport: %v", err)
+			return connectionErrorf(true, err, "transport: %v", err)
 		}
 	}
 	return nil
@@ -454,8 +509,16 @@ func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
 		return ErrIllegalHeaderWrite
 	}
 	s.headerOk = true
+	if md.Len() > 0 {
+		if s.header.Len() > 0 {
+			s.header = metadata.Join(s.header, md)
+		} else {
+			s.header = md
+		}
+	}
+	md = s.header
 	s.mu.Unlock()
-	if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+	if _, err := wait(s.ctx, nil, nil, t.shutdownChan, t.writableChan); err != nil {
 		return err
 	}
 	t.hBuf.Reset()
@@ -473,9 +536,16 @@ func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
 			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
 		}
 	}
+	bufLen := t.hBuf.Len()
 	if err := t.writeHeaders(s, t.hBuf, false); err != nil {
 		return err
 	}
+	if stats.On() {
+		outHeader := &stats.OutHeader{
+			WireLength: bufLen,
+		}
+		stats.HandleRPC(s.Context(), outHeader)
+	}
 	t.writableChan <- 0
 	return nil
 }
@@ -485,7 +555,7 @@ func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
 // TODO(zhaoq): Now it indicates the end of entire stream. Revisit if early
 // OK is adopted.
 func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc string) error {
-	var headersSent bool
+	var headersSent, hasHeader bool
 	s.mu.Lock()
 	if s.state == streamDone {
 		s.mu.Unlock()
@@ -494,8 +564,17 @@ func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc s
 	if s.headerOk {
 		headersSent = true
 	}
+	if s.header.Len() > 0 {
+		hasHeader = true
+	}
 	s.mu.Unlock()
-	if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+
+	if !headersSent && hasHeader {
+		t.WriteHeader(s, nil)
+		headersSent = true
+	}
+
+	if _, err := wait(s.ctx, nil, nil, t.shutdownChan, t.writableChan); err != nil {
 		return err
 	}
 	t.hBuf.Reset()
@@ -508,7 +587,7 @@ func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc s
 			Name:  "grpc-status",
 			Value: strconv.Itoa(int(statusCode)),
 		})
-	t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-message", Value: statusDesc})
+	t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-message", Value: encodeGrpcMessage(statusDesc)})
 	// Attach the trailer metadata.
 	for k, v := range s.trailer {
 		// Clients don't tolerate reading restricted headers after some non restricted ones were sent.
@@ -519,10 +598,17 @@ func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc s
 			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
 		}
 	}
+	bufLen := t.hBuf.Len()
 	if err := t.writeHeaders(s, t.hBuf, true); err != nil {
 		t.Close()
 		return err
 	}
+	if stats.On() {
+		outTrailer := &stats.OutTrailer{
+			WireLength: bufLen,
+		}
+		stats.HandleRPC(s.Context(), outTrailer)
+	}
 	t.closeStream(s)
 	t.writableChan <- 0
 	return nil
@@ -536,33 +622,14 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
 	s.mu.Lock()
 	if s.state == streamDone {
 		s.mu.Unlock()
-		return StreamErrorf(codes.Unknown, "the stream has been done")
+		return streamErrorf(codes.Unknown, "the stream has been done")
 	}
 	if !s.headerOk {
 		writeHeaderFrame = true
-		s.headerOk = true
 	}
 	s.mu.Unlock()
 	if writeHeaderFrame {
-		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
-			return err
-		}
-		t.hBuf.Reset()
-		t.hEnc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
-		if s.sendCompress != "" {
-			t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-encoding", Value: s.sendCompress})
-		}
-		p := http2.HeadersFrameParam{
-			StreamID:      s.id,
-			BlockFragment: t.hBuf.Bytes(),
-			EndHeaders:    true,
-		}
-		if err := t.framer.writeHeaders(false, p); err != nil {
-			t.Close()
-			return ConnectionErrorf("transport: %v", err)
-		}
-		t.writableChan <- 0
+		t.WriteHeader(s, nil)
 	}
 	r := bytes.NewBuffer(data)
 	for {
@@ -570,19 +637,14 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
 			return nil
 		}
 		size := http2MaxFrameLen
-		s.sendQuotaPool.add(0)
 		// Wait until the stream has some quota to send the data.
-		sq, err := wait(s.ctx, t.shutdownChan, s.sendQuotaPool.acquire())
+		sq, err := wait(s.ctx, nil, nil, t.shutdownChan, s.sendQuotaPool.acquire())
 		if err != nil {
 			return err
 		}
-		t.sendQuotaPool.add(0)
 		// Wait until the transport has some quota to send the data.
-		tq, err := wait(s.ctx, t.shutdownChan, t.sendQuotaPool.acquire())
+		tq, err := wait(s.ctx, nil, nil, t.shutdownChan, t.sendQuotaPool.acquire())
 		if err != nil {
-			if _, ok := err.(StreamError); ok {
-				t.sendQuotaPool.cancel()
-			}
 			return err
 		}
 		if sq < size {
@@ -604,7 +666,7 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
 		t.framer.adjustNumWriters(1)
 		// Got some quota. Try to acquire writing privilege on the
 		// transport.
-		if _, err := wait(s.ctx, t.shutdownChan, t.writableChan); err != nil {
+		if _, err := wait(s.ctx, nil, nil, t.shutdownChan, t.writableChan); err != nil {
 			if _, ok := err.(StreamError); ok {
 				// Return the connection quota back.
 				t.sendQuotaPool.add(ps)
@@ -634,7 +696,7 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
 		}
 		if err := t.framer.writeData(forceFlush, s.id, false, p); err != nil {
 			t.Close()
-			return ConnectionErrorf("transport: %v", err)
+			return connectionErrorf(true, err, "transport: %v", err)
 		}
 		if t.framer.adjustNumWriters(-1) == 0 {
 			t.framer.flushWrite()
@@ -650,7 +712,7 @@ func (t *http2Server) applySettings(ss []http2.Setting) {
 			t.mu.Lock()
 			defer t.mu.Unlock()
 			for _, stream := range t.activeStreams {
-				stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
+				stream.sendQuotaPool.add(int(s.Val - t.streamSendQuota))
 			}
 			t.streamSendQuota = s.Val
 		}
@@ -679,6 +741,17 @@ func (t *http2Server) controller() {
 					}
 				case *resetStream:
 					t.framer.writeRSTStream(true, i.streamID, i.code)
+				case *goAway:
+					t.mu.Lock()
+					if t.state == closing {
+						t.mu.Unlock()
+						// The transport is closing.
+						return
+					}
+					sid := t.maxStreamID
+					t.state = draining
+					t.mu.Unlock()
+					t.framer.writeGoAway(true, sid, http2.ErrCodeNo, nil)
 				case *flushIO:
 					t.framer.flushWrite()
 				case *ping:
@@ -716,6 +789,10 @@ func (t *http2Server) Close() (err error) {
 	for _, s := range streams {
 		s.cancel()
 	}
+	if stats.On() {
+		connEnd := &stats.ConnEnd{}
+		stats.HandleConn(t.ctx, connEnd)
+	}
 	return
 }
 
@@ -724,6 +801,9 @@ func (t *http2Server) Close() (err error) {
 func (t *http2Server) closeStream(s *Stream) {
 	t.mu.Lock()
 	delete(t.activeStreams, s.id)
+	if t.state == draining && len(t.activeStreams) == 0 {
+		defer t.Close()
+	}
 	t.mu.Unlock()
 	// In case stream sending and receiving are invoked in separate
 	// goroutines (e.g., bi-directional streaming), cancel needs to be
@@ -744,5 +824,9 @@ func (t *http2Server) closeStream(s *Stream) {
 }
 
 func (t *http2Server) RemoteAddr() net.Addr {
-	return t.conn.RemoteAddr()
+	return t.remoteAddr
+}
+
+func (t *http2Server) Drain() {
+	t.controlBuf.put(&goAway{})
 }
diff --git a/vendor/google.golang.org/grpc/transport/http_util.go b/vendor/google.golang.org/grpc/transport/http_util.go
index f2e23dcec3..a3c68d4cac 100644
--- a/vendor/google.golang.org/grpc/transport/http_util.go
+++ b/vendor/google.golang.org/grpc/transport/http_util.go
@@ -35,6 +35,7 @@ package transport
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
 	"io"
 	"net"
@@ -52,7 +53,7 @@ import (
 
 const (
 	// The primary user agent
-	primaryUA = "grpc-go/0.11"
+	primaryUA = "grpc-go/1.0"
 	// http2MaxFrameLen specifies the max length of a HTTP2 frame.
 	http2MaxFrameLen = 16384 // 16KB frame
 	// http://http2.github.io/http2-spec/#SettingValues
@@ -161,7 +162,7 @@ func (d *decodeState) processHeaderField(f hpack.HeaderField) {
 	switch f.Name {
 	case "content-type":
 		if !validContentType(f.Value) {
-			d.setErr(StreamErrorf(codes.FailedPrecondition, "transport: received the unexpected content-type %q", f.Value))
+			d.setErr(streamErrorf(codes.FailedPrecondition, "transport: received the unexpected content-type %q", f.Value))
 			return
 		}
 	case "grpc-encoding":
@@ -169,18 +170,18 @@ func (d *decodeState) processHeaderField(f hpack.HeaderField) {
 	case "grpc-status":
 		code, err := strconv.Atoi(f.Value)
 		if err != nil {
-			d.setErr(StreamErrorf(codes.Internal, "transport: malformed grpc-status: %v", err))
+			d.setErr(streamErrorf(codes.Internal, "transport: malformed grpc-status: %v", err))
 			return
 		}
 		d.statusCode = codes.Code(code)
 	case "grpc-message":
-		d.statusDesc = f.Value
+		d.statusDesc = decodeGrpcMessage(f.Value)
 	case "grpc-timeout":
 		d.timeoutSet = true
 		var err error
-		d.timeout, err = timeoutDecode(f.Value)
+		d.timeout, err = decodeTimeout(f.Value)
 		if err != nil {
-			d.setErr(StreamErrorf(codes.Internal, "transport: malformed time-out: %v", err))
+			d.setErr(streamErrorf(codes.Internal, "transport: malformed time-out: %v", err))
 			return
 		}
 	case ":path":
@@ -251,7 +252,10 @@ func div(d, r time.Duration) int64 {
 }
 
 // TODO(zhaoq): It is the simplistic and not bandwidth efficient. Improve it.
-func timeoutEncode(t time.Duration) string {
+func encodeTimeout(t time.Duration) string {
+	if t <= 0 {
+		return "0n"
+	}
 	if d := div(t, time.Nanosecond); d <= maxTimeoutValue {
 		return strconv.FormatInt(d, 10) + "n"
 	}
@@ -271,7 +275,7 @@ func timeoutEncode(t time.Duration) string {
 	return strconv.FormatInt(div(t, time.Hour), 10) + "H"
 }
 
-func timeoutDecode(s string) (time.Duration, error) {
+func decodeTimeout(s string) (time.Duration, error) {
 	size := len(s)
 	if size < 2 {
 		return 0, fmt.Errorf("transport: timeout string is too short: %q", s)
@@ -288,6 +292,80 @@ func timeoutDecode(s string) (time.Duration, error) {
 	return d * time.Duration(t), nil
 }
 
+const (
+	spaceByte   = ' '
+	tildaByte   = '~'
+	percentByte = '%'
+)
+
+// encodeGrpcMessage is used to encode status code in header field
+// "grpc-message".
+// It checks to see if each individual byte in msg is an
+// allowable byte, and then either percent encoding or passing it through.
+// When percent encoding, the byte is converted into hexadecimal notation
+// with a '%' prepended.
+func encodeGrpcMessage(msg string) string {
+	if msg == "" {
+		return ""
+	}
+	lenMsg := len(msg)
+	for i := 0; i < lenMsg; i++ {
+		c := msg[i]
+		if !(c >= spaceByte && c < tildaByte && c != percentByte) {
+			return encodeGrpcMessageUnchecked(msg)
+		}
+	}
+	return msg
+}
+
+func encodeGrpcMessageUnchecked(msg string) string {
+	var buf bytes.Buffer
+	lenMsg := len(msg)
+	for i := 0; i < lenMsg; i++ {
+		c := msg[i]
+		if c >= spaceByte && c < tildaByte && c != percentByte {
+			buf.WriteByte(c)
+		} else {
+			buf.WriteString(fmt.Sprintf("%%%02X", c))
+		}
+	}
+	return buf.String()
+}
+
+// decodeGrpcMessage decodes the msg encoded by encodeGrpcMessage.
+func decodeGrpcMessage(msg string) string {
+	if msg == "" {
+		return ""
+	}
+	lenMsg := len(msg)
+	for i := 0; i < lenMsg; i++ {
+		if msg[i] == percentByte && i+2 < lenMsg {
+			return decodeGrpcMessageUnchecked(msg)
+		}
+	}
+	return msg
+}
+
+func decodeGrpcMessageUnchecked(msg string) string {
+	var buf bytes.Buffer
+	lenMsg := len(msg)
+	for i := 0; i < lenMsg; i++ {
+		c := msg[i]
+		if c == percentByte && i+2 < lenMsg {
+			parsed, err := strconv.ParseUint(msg[i+1:i+3], 16, 8)
+			if err != nil {
+				buf.WriteByte(c)
+			} else {
+				buf.WriteByte(byte(parsed))
+				i += 2
+			}
+		} else {
+			buf.WriteByte(c)
+		}
+	}
+	return buf.String()
+}
+
 type framer struct {
 	numWriters int32
 	reader     io.Reader
diff --git a/vendor/google.golang.org/grpc/transport/pre_go16.go b/vendor/google.golang.org/grpc/transport/pre_go16.go
new file mode 100644
index 0000000000..33d91c17c4
--- /dev/null
+++ b/vendor/google.golang.org/grpc/transport/pre_go16.go
@@ -0,0 +1,51 @@
+// +build !go1.6
+
+/*
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package transport
+
+import (
+	"net"
+	"time"
+
+	"golang.org/x/net/context"
+)
+
+// dialContext connects to the address on the named network.
+func dialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	var dialer net.Dialer
+	if deadline, ok := ctx.Deadline(); ok {
+		dialer.Timeout = deadline.Sub(time.Now())
+	}
+	return dialer.Dial(network, address)
+}
diff --git a/vendor/google.golang.org/grpc/transport/transport.go b/vendor/google.golang.org/grpc/transport/transport.go
index d4c220a0c4..4726bb2cea 100644
--- a/vendor/google.golang.org/grpc/transport/transport.go
+++ b/vendor/google.golang.org/grpc/transport/transport.go
@@ -39,18 +39,16 @@ package transport // import "google.golang.org/grpc/transport"
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"io"
 	"net"
 	"sync"
-	"time"
 
 	"golang.org/x/net/context"
-	"golang.org/x/net/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/tap"
 )
 
 // recvMsg represents the received msg from the transport. All transport
@@ -120,10 +118,11 @@ func (b *recvBuffer) get() <-chan item {
 // recvBufferReader implements io.Reader interface to read the data from
 // recvBuffer.
 type recvBufferReader struct {
-	ctx  context.Context
-	recv *recvBuffer
-	last *bytes.Reader // Stores the remaining data in the previous calls.
-	err  error
+	ctx    context.Context
+	goAway chan struct{}
+	recv   *recvBuffer
+	last   *bytes.Reader // Stores the remaining data in the previous calls.
+	err    error
 }
 
 // Read reads the next len(p) bytes from last. If last is drained, it tries to
@@ -141,6 +140,8 @@ func (r *recvBufferReader) Read(p []byte) (n int, err error) {
 	select {
 	case <-r.ctx.Done():
 		return 0, ContextErr(r.ctx.Err())
+	case <-r.goAway:
+		return 0, ErrStreamDrain
 	case i := <-r.recv.get():
 		r.recv.load()
 		m := i.(*recvMsg)
@@ -158,7 +159,7 @@ const (
 	streamActive    streamState = iota
 	streamWriteDone             // EndStream sent
 	streamReadDone              // EndStream received
-	streamDone                  // sendDone and recvDone or RSTStreamFrame is sent or received.
+	streamDone                  // the entire stream is finished.
 )
 
 // Stream represents an RPC in the transport layer.
@@ -166,9 +167,19 @@ type Stream struct {
 	id uint32
 	// nil for client side Stream.
 	st ServerTransport
+	// clientStatsCtx keeps the user context for stats handling.
+	// It's only valid on client side. Server side stats context is same as s.ctx.
+	// All client side stats collection should use the clientStatsCtx (instead of the stream context)
+	// so that all the generated stats for a particular RPC can be associated in the processing phase.
+	clientStatsCtx context.Context
 	// ctx is the associated context of the stream.
-	ctx    context.Context
+	ctx context.Context
+	// cancel is always nil for client side Stream.
 	cancel context.CancelFunc
+	// done is closed when the final status arrives.
+	done chan struct{}
+	// goAway is closed when the server sent GoAways signal before this stream was initiated.
+	goAway chan struct{}
 	// method records the associated RPC method of the stream.
 	method       string
 	recvCompress string
@@ -214,6 +225,18 @@ func (s *Stream) SetSendCompress(str string) {
 	s.sendCompress = str
 }
 
+// Done returns a chanel which is closed when it receives the final status
+// from the server.
+func (s *Stream) Done() <-chan struct{} {
+	return s.done
+}
+
+// GoAway returns a channel which is closed when the server sent GoAways signal
+// before this stream was initiated.
+func (s *Stream) GoAway() <-chan struct{} {
+	return s.goAway
+}
+
 // Header acquires the key-value pairs of header metadata once it
 // is available. It blocks until i) the metadata is ready or ii) there is no
 // header metadata or iii) the stream is cancelled/expired.
@@ -221,6 +244,8 @@ func (s *Stream) Header() (metadata.MD, error) {
 	select {
 	case <-s.ctx.Done():
 		return nil, ContextErr(s.ctx.Err())
+	case <-s.goAway:
+		return nil, ErrStreamDrain
 	case <-s.headerChan:
 		return s.header.Copy(), nil
 	}
@@ -246,11 +271,6 @@ func (s *Stream) Context() context.Context {
 	return s.ctx
 }
 
-// TraceContext recreates the context of s with a trace.Trace.
-func (s *Stream) TraceContext(tr trace.Trace) {
-	s.ctx = trace.NewContext(s.ctx, tr)
-}
-
 // Method returns the method for the stream.
 func (s *Stream) Method() string {
 	return s.method
@@ -266,19 +286,30 @@ func (s *Stream) StatusDesc() string {
 	return s.statusDesc
 }
 
-// ErrIllegalTrailerSet indicates that the trailer has already been set or it
-// is too late to do so.
-var ErrIllegalTrailerSet = errors.New("transport: trailer has been set")
+// SetHeader sets the header metadata. This can be called multiple times.
+// Server side only.
+func (s *Stream) SetHeader(md metadata.MD) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	if s.headerOk || s.state == streamDone {
+		return ErrIllegalHeaderWrite
+	}
+	if md.Len() == 0 {
+		return nil
+	}
+	s.header = metadata.Join(s.header, md)
+	return nil
+}
 
 // SetTrailer sets the trailer metadata which will be sent with the RPC status
-// by the server. This can only be called at most once. Server side only.
+// by the server. This can be called multiple times. Server side only.
 func (s *Stream) SetTrailer(md metadata.MD) error {
+	if md.Len() == 0 {
+		return nil
+	}
 	s.mu.Lock()
 	defer s.mu.Unlock()
-	if s.trailer != nil {
-		return ErrIllegalTrailerSet
-	}
-	s.trailer = md.Copy()
+	s.trailer = metadata.Join(s.trailer, md)
 	return nil
 }
 
@@ -324,30 +355,43 @@ const (
 	draining
 )
 
+// ServerConfig consists of all the configurations to establish a server transport.
+type ServerConfig struct {
+	MaxStreams  uint32
+	AuthInfo    credentials.AuthInfo
+	InTapHandle tap.ServerInHandle
+}
+
 // NewServerTransport creates a ServerTransport with conn or non-nil error
 // if it fails.
-func NewServerTransport(protocol string, conn net.Conn, maxStreams uint32, authInfo credentials.AuthInfo) (ServerTransport, error) {
-	return newHTTP2Server(conn, maxStreams, authInfo)
+func NewServerTransport(protocol string, conn net.Conn, config *ServerConfig) (ServerTransport, error) {
+	return newHTTP2Server(conn, config)
 }
 
-// ConnectOptions covers all relevant options for dialing a server.
+// ConnectOptions covers all relevant options for communicating with the server.
 type ConnectOptions struct {
 	// UserAgent is the application user agent.
 	UserAgent string
 	// Dialer specifies how to dial a network address.
-	Dialer func(string, time.Duration) (net.Conn, error)
+	Dialer func(context.Context, string) (net.Conn, error)
+	// FailOnNonTempDialError specifies if gRPC fails on non-temporary dial errors.
+	FailOnNonTempDialError bool
 	// PerRPCCredentials stores the PerRPCCredentials required to issue RPCs.
 	PerRPCCredentials []credentials.PerRPCCredentials
 	// TransportCredentials stores the Authenticator required to setup a client connection.
 	TransportCredentials credentials.TransportCredentials
-	// Timeout specifies the timeout for dialing a ClientTransport.
-	Timeout time.Duration
+}
+
+// TargetInfo contains the information of the target such as network address and metadata.
+type TargetInfo struct {
+	Addr     string
+	Metadata interface{}
 }
 
 // NewClientTransport establishes the transport with the required ConnectOptions
 // and returns it to the caller.
-func NewClientTransport(target string, opts *ConnectOptions) (ClientTransport, error) {
-	return newHTTP2Client(target, opts)
+func NewClientTransport(ctx context.Context, target TargetInfo, opts ConnectOptions) (ClientTransport, error) {
+	return newHTTP2Client(ctx, target, opts)
 }
 
 // Options provides additional hints and information for message
@@ -417,6 +461,11 @@ type ClientTransport interface {
 	// and create a new one) in error case. It should not return nil
 	// once the transport is initiated.
 	Error() <-chan struct{}
+
+	// GoAway returns a channel that is closed when ClientTranspor
+	// receives the draining signal from the server (e.g., GOAWAY frame in
+	// HTTP/2).
+	GoAway() <-chan struct{}
 }
 
 // ServerTransport is the common interface for all gRPC server-side transport
@@ -426,7 +475,7 @@ type ClientTransport interface {
 // Write methods for a given Stream will be called serially.
 type ServerTransport interface {
 	// HandleStreams receives incoming streams using the given handler.
-	HandleStreams(func(*Stream))
+	HandleStreams(func(*Stream), func(context.Context, string) context.Context)
 
 	// WriteHeader sends the header metadata for the given stream.
 	// WriteHeader may not be called on all streams.
@@ -448,20 +497,25 @@ type ServerTransport interface {
 
 	// RemoteAddr returns the remote network address.
 	RemoteAddr() net.Addr
+
+	// Drain notifies the client this ServerTransport stops accepting new RPCs.
+	Drain()
 }
 
-// StreamErrorf creates an StreamError with the specified error code and description.
-func StreamErrorf(c codes.Code, format string, a ...interface{}) StreamError {
+// streamErrorf creates an StreamError with the specified error code and description.
+func streamErrorf(c codes.Code, format string, a ...interface{}) StreamError {
 	return StreamError{
 		Code: c,
 		Desc: fmt.Sprintf(format, a...),
 	}
 }
 
-// ConnectionErrorf creates an ConnectionError with the specified error description.
-func ConnectionErrorf(format string, a ...interface{}) ConnectionError {
+// connectionErrorf creates an ConnectionError with the specified error description.
+func connectionErrorf(temp bool, e error, format string, a ...interface{}) ConnectionError {
 	return ConnectionError{
 		Desc: fmt.Sprintf(format, a...),
+		temp: temp,
+		err:  e,
 	}
 }
 
@@ -469,14 +523,36 @@ func ConnectionErrorf(format string, a ...interface{}) ConnectionError {
 // entire connection and the retry of all the active streams.
 type ConnectionError struct {
 	Desc string
+	temp bool
+	err  error
 }
 
 func (e ConnectionError) Error() string {
 	return fmt.Sprintf("connection error: desc = %q", e.Desc)
 }
 
-// ErrConnClosing indicates that the transport is closing.
-var ErrConnClosing = ConnectionError{Desc: "transport is closing"}
+// Temporary indicates if this connection error is temporary or fatal.
+func (e ConnectionError) Temporary() bool {
+	return e.temp
+}
+
+// Origin returns the original error of this connection error.
+func (e ConnectionError) Origin() error {
+	// Never return nil error here.
+	// If the original error is nil, return itself.
+	if e.err == nil {
+		return e
+	}
+	return e.err
+}
+
+var (
+	// ErrConnClosing indicates that the transport is closing.
+	ErrConnClosing = connectionErrorf(true, nil, "transport is closing")
+	// ErrStreamDrain indicates that the stream is rejected by the server because
+	// the server stops accepting new RPCs.
+	ErrStreamDrain = streamErrorf(codes.Unavailable, "the server stops accepting new RPCs")
+)
 
 // StreamError is an error that only affects one stream within a connection.
 type StreamError struct {
@@ -492,21 +568,34 @@ func (e StreamError) Error() string {
 func ContextErr(err error) StreamError {
 	switch err {
 	case context.DeadlineExceeded:
-		return StreamErrorf(codes.DeadlineExceeded, "%v", err)
+		return streamErrorf(codes.DeadlineExceeded, "%v", err)
 	case context.Canceled:
-		return StreamErrorf(codes.Canceled, "%v", err)
+		return streamErrorf(codes.Canceled, "%v", err)
 	}
 	panic(fmt.Sprintf("Unexpected error from context packet: %v", err))
 }
 
 // wait blocks until it can receive from ctx.Done, closing, or proceed.
 // If it receives from ctx.Done, it returns 0, the StreamError for ctx.Err.
+// If it receives from done, it returns 0, io.EOF if ctx is not done; otherwise
+// it return the StreamError for ctx.Err.
+// If it receives from goAway, it returns 0, ErrStreamDrain.
 // If it receives from closing, it returns 0, ErrConnClosing.
 // If it receives from proceed, it returns the received integer, nil.
-func wait(ctx context.Context, closing <-chan struct{}, proceed <-chan int) (int, error) {
+func wait(ctx context.Context, done, goAway, closing <-chan struct{}, proceed <-chan int) (int, error) {
 	select {
 	case <-ctx.Done():
 		return 0, ContextErr(ctx.Err())
+	case <-done:
+		// User cancellation has precedence.
+		select {
+		case <-ctx.Done():
+			return 0, ContextErr(ctx.Err())
+		default:
+		}
+		return 0, io.EOF
+	case <-goAway:
+		return 0, ErrStreamDrain
 	case <-closing:
 		return 0, ErrConnClosing
 	case i := <-proceed:

From f6b516d8bed435a0e62c4fe40de1df2692ca9ef5 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 9 Feb 2017 13:55:37 -0800
Subject: [PATCH 1057/1304] scripts/genproto: bump protoc to 3.1.0

---
 scripts/genproto.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index 2999babea4..44f69f4d89 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -10,8 +10,8 @@ if ! [[ "$0" =~ "scripts/genproto.sh" ]]; then
 	exit 255
 fi
 
-if ! [[ $(protoc --version) =~ "3.0.0" ]]; then
-	echo "could not find protoc 3.0.0, is it installed + in PATH?"
+if ! [[ $(protoc --version) =~ "3.1.0" ]]; then
+	echo "could not find protoc 3.1.0, is it installed + in PATH?"
 	exit 255
 fi
 

From 147835a1425b10760b2780fe144ea7ea700ea20d Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 9 Feb 2017 13:56:30 -0800
Subject: [PATCH 1058/1304] api: update grpc version

---
 api/v1alpha/api.pb.go | 701 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 586 insertions(+), 115 deletions(-)

diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index 1b03b90ecb..5b9a3a836b 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -221,6 +221,20 @@ func (m *ImageFormat) String() string            { return proto.CompactTextStrin
 func (*ImageFormat) ProtoMessage()               {}
 func (*ImageFormat) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
+func (m *ImageFormat) GetType() ImageType {
+	if m != nil {
+		return m.Type
+	}
+	return ImageType_IMAGE_TYPE_UNDEFINED
+}
+
+func (m *ImageFormat) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
+}
+
 // Image describes the image's information.
 type Image struct {
 	// Base format of the image, required. This indicates the original format
@@ -258,6 +272,48 @@ func (m *Image) GetBaseFormat() *ImageFormat {
 	return nil
 }
 
+func (m *Image) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *Image) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Image) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
+}
+
+func (m *Image) GetImportTimestamp() int64 {
+	if m != nil {
+		return m.ImportTimestamp
+	}
+	return 0
+}
+
+func (m *Image) GetManifest() []byte {
+	if m != nil {
+		return m.Manifest
+	}
+	return nil
+}
+
+func (m *Image) GetSize() int64 {
+	if m != nil {
+		return m.Size
+	}
+	return 0
+}
+
 func (m *Image) GetAnnotations() []*KeyValue {
 	if m != nil {
 		return m.Annotations
@@ -287,6 +343,27 @@ func (m *Network) String() string            { return proto.CompactTextString(m)
 func (*Network) ProtoMessage()               {}
 func (*Network) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
+func (m *Network) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Network) GetIpv4() string {
+	if m != nil {
+		return m.Ipv4
+	}
+	return ""
+}
+
+func (m *Network) GetIpv6() string {
+	if m != nil {
+		return m.Ipv6
+	}
+	return ""
+}
+
 // App describes the information of an app that's running in a pod.
 type App struct {
 	// Name of the app, required.
@@ -308,6 +385,13 @@ func (m *App) String() string            { return proto.CompactTextString(m) }
 func (*App) ProtoMessage()               {}
 func (*App) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
 
+func (m *App) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
 func (m *App) GetImage() *Image {
 	if m != nil {
 		return m.Image
@@ -315,6 +399,20 @@ func (m *App) GetImage() *Image {
 	return nil
 }
 
+func (m *App) GetState() AppState {
+	if m != nil {
+		return m.State
+	}
+	return AppState_APP_STATE_UNDEFINED
+}
+
+func (m *App) GetExitCode() int32 {
+	if m != nil {
+		return m.ExitCode
+	}
+	return 0
+}
+
 func (m *App) GetAnnotations() []*KeyValue {
 	if m != nil {
 		return m.Annotations
@@ -368,6 +466,27 @@ func (m *Pod) String() string            { return proto.CompactTextString(m) }
 func (*Pod) ProtoMessage()               {}
 func (*Pod) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
 
+func (m *Pod) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *Pod) GetPid() int32 {
+	if m != nil {
+		return m.Pid
+	}
+	return 0
+}
+
+func (m *Pod) GetState() PodState {
+	if m != nil {
+		return m.State
+	}
+	return PodState_POD_STATE_UNDEFINED
+}
+
 func (m *Pod) GetApps() []*App {
 	if m != nil {
 		return m.Apps
@@ -382,6 +501,13 @@ func (m *Pod) GetNetworks() []*Network {
 	return nil
 }
 
+func (m *Pod) GetManifest() []byte {
+	if m != nil {
+		return m.Manifest
+	}
+	return nil
+}
+
 func (m *Pod) GetAnnotations() []*KeyValue {
 	if m != nil {
 		return m.Annotations
@@ -389,9 +515,37 @@ func (m *Pod) GetAnnotations() []*KeyValue {
 	return nil
 }
 
+func (m *Pod) GetCgroup() string {
+	if m != nil {
+		return m.Cgroup
+	}
+	return ""
+}
+
+func (m *Pod) GetCreatedAt() int64 {
+	if m != nil {
+		return m.CreatedAt
+	}
+	return 0
+}
+
+func (m *Pod) GetStartedAt() int64 {
+	if m != nil {
+		return m.StartedAt
+	}
+	return 0
+}
+
+func (m *Pod) GetGcMarkedAt() int64 {
+	if m != nil {
+		return m.GcMarkedAt
+	}
+	return 0
+}
+
 type KeyValue struct {
 	// Key part of the key-value pair.
-	Key string `protobuf:"bytes,1,opt,name=Key,json=key" json:"Key,omitempty"`
+	Key string `protobuf:"bytes,1,opt,name=Key" json:"Key,omitempty"`
 	// Value part of the key-value pair.
 	Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
 }
@@ -401,6 +555,20 @@ func (m *KeyValue) String() string            { return proto.CompactTextString(m
 func (*KeyValue) ProtoMessage()               {}
 func (*KeyValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
 
+func (m *KeyValue) GetKey() string {
+	if m != nil {
+		return m.Key
+	}
+	return ""
+}
+
+func (m *KeyValue) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
 // PodFilter defines the condition that the returned pods need to satisfy in ListPods().
 // The conditions are combined by 'AND', and different filters are combined by 'OR'.
 type PodFilter struct {
@@ -428,6 +596,41 @@ func (m *PodFilter) String() string            { return proto.CompactTextString(
 func (*PodFilter) ProtoMessage()               {}
 func (*PodFilter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
 
+func (m *PodFilter) GetIds() []string {
+	if m != nil {
+		return m.Ids
+	}
+	return nil
+}
+
+func (m *PodFilter) GetStates() []PodState {
+	if m != nil {
+		return m.States
+	}
+	return nil
+}
+
+func (m *PodFilter) GetAppNames() []string {
+	if m != nil {
+		return m.AppNames
+	}
+	return nil
+}
+
+func (m *PodFilter) GetImageIds() []string {
+	if m != nil {
+		return m.ImageIds
+	}
+	return nil
+}
+
+func (m *PodFilter) GetNetworkNames() []string {
+	if m != nil {
+		return m.NetworkNames
+	}
+	return nil
+}
+
 func (m *PodFilter) GetAnnotations() []*KeyValue {
 	if m != nil {
 		return m.Annotations
@@ -435,6 +638,20 @@ func (m *PodFilter) GetAnnotations() []*KeyValue {
 	return nil
 }
 
+func (m *PodFilter) GetCgroups() []string {
+	if m != nil {
+		return m.Cgroups
+	}
+	return nil
+}
+
+func (m *PodFilter) GetPodSubCgroups() []string {
+	if m != nil {
+		return m.PodSubCgroups
+	}
+	return nil
+}
+
 // ImageFilter defines the condition that the returned images need to satisfy in ListImages().
 // The conditions are combined by 'AND', and different filters are combined by 'OR'.
 type ImageFilter struct {
@@ -466,6 +683,34 @@ func (m *ImageFilter) String() string            { return proto.CompactTextStrin
 func (*ImageFilter) ProtoMessage()               {}
 func (*ImageFilter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
 
+func (m *ImageFilter) GetIds() []string {
+	if m != nil {
+		return m.Ids
+	}
+	return nil
+}
+
+func (m *ImageFilter) GetPrefixes() []string {
+	if m != nil {
+		return m.Prefixes
+	}
+	return nil
+}
+
+func (m *ImageFilter) GetBaseNames() []string {
+	if m != nil {
+		return m.BaseNames
+	}
+	return nil
+}
+
+func (m *ImageFilter) GetKeywords() []string {
+	if m != nil {
+		return m.Keywords
+	}
+	return nil
+}
+
 func (m *ImageFilter) GetLabels() []*KeyValue {
 	if m != nil {
 		return m.Labels
@@ -473,6 +718,20 @@ func (m *ImageFilter) GetLabels() []*KeyValue {
 	return nil
 }
 
+func (m *ImageFilter) GetImportedAfter() int64 {
+	if m != nil {
+		return m.ImportedAfter
+	}
+	return 0
+}
+
+func (m *ImageFilter) GetImportedBefore() int64 {
+	if m != nil {
+		return m.ImportedBefore
+	}
+	return 0
+}
+
 func (m *ImageFilter) GetAnnotations() []*KeyValue {
 	if m != nil {
 		return m.Annotations
@@ -480,6 +739,13 @@ func (m *ImageFilter) GetAnnotations() []*KeyValue {
 	return nil
 }
 
+func (m *ImageFilter) GetFullNames() []string {
+	if m != nil {
+		return m.FullNames
+	}
+	return nil
+}
+
 // GlobalFlags describes the flags that passed to rkt api service when it is launched.
 type GlobalFlags struct {
 	// Data directory.
@@ -501,6 +767,48 @@ func (m *GlobalFlags) String() string            { return proto.CompactTextStrin
 func (*GlobalFlags) ProtoMessage()               {}
 func (*GlobalFlags) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
 
+func (m *GlobalFlags) GetDir() string {
+	if m != nil {
+		return m.Dir
+	}
+	return ""
+}
+
+func (m *GlobalFlags) GetSystemConfigDir() string {
+	if m != nil {
+		return m.SystemConfigDir
+	}
+	return ""
+}
+
+func (m *GlobalFlags) GetLocalConfigDir() string {
+	if m != nil {
+		return m.LocalConfigDir
+	}
+	return ""
+}
+
+func (m *GlobalFlags) GetUserConfigDir() string {
+	if m != nil {
+		return m.UserConfigDir
+	}
+	return ""
+}
+
+func (m *GlobalFlags) GetInsecureFlags() string {
+	if m != nil {
+		return m.InsecureFlags
+	}
+	return ""
+}
+
+func (m *GlobalFlags) GetTrustKeysFromHttps() bool {
+	if m != nil {
+		return m.TrustKeysFromHttps
+	}
+	return false
+}
+
 // Info describes the information of rkt on the machine.
 type Info struct {
 	// Version of rkt, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/).
@@ -518,6 +826,27 @@ func (m *Info) String() string            { return proto.CompactTextString(m) }
 func (*Info) ProtoMessage()               {}
 func (*Info) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
 
+func (m *Info) GetRktVersion() string {
+	if m != nil {
+		return m.RktVersion
+	}
+	return ""
+}
+
+func (m *Info) GetAppcVersion() string {
+	if m != nil {
+		return m.AppcVersion
+	}
+	return ""
+}
+
+func (m *Info) GetApiVersion() string {
+	if m != nil {
+		return m.ApiVersion
+	}
+	return ""
+}
+
 func (m *Info) GetGlobalFlags() *GlobalFlags {
 	if m != nil {
 		return m.GlobalFlags
@@ -549,6 +878,34 @@ func (m *Event) String() string            { return proto.CompactTextString(m) }
 func (*Event) ProtoMessage()               {}
 func (*Event) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
 
+func (m *Event) GetType() EventType {
+	if m != nil {
+		return m.Type
+	}
+	return EventType_EVENT_TYPE_UNDEFINED
+}
+
+func (m *Event) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *Event) GetFrom() string {
+	if m != nil {
+		return m.From
+	}
+	return ""
+}
+
+func (m *Event) GetTime() int64 {
+	if m != nil {
+		return m.Time
+	}
+	return 0
+}
+
 func (m *Event) GetData() []*KeyValue {
 	if m != nil {
 		return m.Data
@@ -579,6 +936,41 @@ func (m *EventFilter) String() string            { return proto.CompactTextStrin
 func (*EventFilter) ProtoMessage()               {}
 func (*EventFilter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
 
+func (m *EventFilter) GetTypes() []EventType {
+	if m != nil {
+		return m.Types
+	}
+	return nil
+}
+
+func (m *EventFilter) GetIds() []string {
+	if m != nil {
+		return m.Ids
+	}
+	return nil
+}
+
+func (m *EventFilter) GetNames() []string {
+	if m != nil {
+		return m.Names
+	}
+	return nil
+}
+
+func (m *EventFilter) GetSinceTime() int64 {
+	if m != nil {
+		return m.SinceTime
+	}
+	return 0
+}
+
+func (m *EventFilter) GetUntilTime() int64 {
+	if m != nil {
+		return m.UntilTime
+	}
+	return 0
+}
+
 // Request for GetInfo().
 type GetInfoRequest struct {
 }
@@ -623,6 +1015,13 @@ func (m *ListPodsRequest) GetFilters() []*PodFilter {
 	return nil
 }
 
+func (m *ListPodsRequest) GetDetail() bool {
+	if m != nil {
+		return m.Detail
+	}
+	return false
+}
+
 // Response for ListPods().
 type ListPodsResponse struct {
 	Pods []*Pod `protobuf:"bytes,1,rep,name=pods" json:"pods,omitempty"`
@@ -651,6 +1050,13 @@ func (m *InspectPodRequest) String() string            { return proto.CompactTex
 func (*InspectPodRequest) ProtoMessage()               {}
 func (*InspectPodRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
 
+func (m *InspectPodRequest) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
 // Response for InspectPod().
 type InspectPodResponse struct {
 	Pod *Pod `protobuf:"bytes,1,opt,name=pod" json:"pod,omitempty"`
@@ -686,6 +1092,13 @@ func (m *ListImagesRequest) GetFilters() []*ImageFilter {
 	return nil
 }
 
+func (m *ListImagesRequest) GetDetail() bool {
+	if m != nil {
+		return m.Detail
+	}
+	return false
+}
+
 // Response for ListImages().
 type ListImagesResponse struct {
 	Images []*Image `protobuf:"bytes,1,rep,name=images" json:"images,omitempty"`
@@ -713,6 +1126,13 @@ func (m *InspectImageRequest) String() string            { return proto.CompactT
 func (*InspectImageRequest) ProtoMessage()               {}
 func (*InspectImageRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
 
+func (m *InspectImageRequest) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
 // Response for InspectImage().
 type InspectImageResponse struct {
 	Image *Image `protobuf:"bytes,1,opt,name=image" json:"image,omitempty"`
@@ -791,6 +1211,48 @@ func (m *GetLogsRequest) String() string            { return proto.CompactTextSt
 func (*GetLogsRequest) ProtoMessage()               {}
 func (*GetLogsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
 
+func (m *GetLogsRequest) GetPodId() string {
+	if m != nil {
+		return m.PodId
+	}
+	return ""
+}
+
+func (m *GetLogsRequest) GetAppName() string {
+	if m != nil {
+		return m.AppName
+	}
+	return ""
+}
+
+func (m *GetLogsRequest) GetLines() int32 {
+	if m != nil {
+		return m.Lines
+	}
+	return 0
+}
+
+func (m *GetLogsRequest) GetFollow() bool {
+	if m != nil {
+		return m.Follow
+	}
+	return false
+}
+
+func (m *GetLogsRequest) GetSinceTime() int64 {
+	if m != nil {
+		return m.SinceTime
+	}
+	return 0
+}
+
+func (m *GetLogsRequest) GetUntilTime() int64 {
+	if m != nil {
+		return m.UntilTime
+	}
+	return 0
+}
+
 // Response for GetLogs().
 type GetLogsResponse struct {
 	// List of the log lines that returned, optional as the response can contain no logs.
@@ -802,6 +1264,13 @@ func (m *GetLogsResponse) String() string            { return proto.CompactTextS
 func (*GetLogsResponse) ProtoMessage()               {}
 func (*GetLogsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
 
+func (m *GetLogsResponse) GetLines() []string {
+	if m != nil {
+		return m.Lines
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*ImageFormat)(nil), "v1alpha.ImageFormat")
 	proto.RegisterType((*Image)(nil), "v1alpha.Image")
@@ -841,7 +1310,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion3
+const _ = grpc.SupportPackageIsVersion4
 
 // Client API for PublicAPI service
 
@@ -1183,122 +1652,124 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: fileDescriptor0,
+	Metadata: "api.proto",
 }
 
 func init() { proto.RegisterFile("api.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 1767 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x58, 0xcd, 0x6e, 0xdb, 0xc6,
-	0x16, 0x8e, 0xfe, 0xa5, 0x23, 0x59, 0x96, 0xc7, 0x4e, 0xa2, 0x38, 0x3f, 0xd7, 0x97, 0xb9, 0x49,
-	0x7c, 0x8d, 0x0b, 0xe3, 0xc6, 0x49, 0xdb, 0x4d, 0x10, 0x54, 0x96, 0x69, 0x57, 0x88, 0x2d, 0x09,
-	0x8c, 0xe2, 0x36, 0xe8, 0x82, 0xa0, 0x24, 0x4a, 0x21, 0x4c, 0x89, 0x2c, 0x49, 0x39, 0x71, 0x97,
-	0x7d, 0x80, 0xbe, 0x41, 0xbb, 0xea, 0xba, 0xdb, 0x02, 0xdd, 0xf7, 0x51, 0xba, 0xe8, 0x13, 0x74,
-	0xdb, 0x33, 0x3f, 0x24, 0x87, 0xb4, 0x9c, 0x1a, 0xdd, 0x71, 0xce, 0x77, 0xe6, 0x9b, 0xf3, 0x37,
-	0xe7, 0x8c, 0x04, 0x15, 0xc3, 0xb5, 0x76, 0x5d, 0xcf, 0x09, 0x1c, 0x52, 0x3a, 0x7f, 0x6a, 0xd8,
-	0xee, 0x3b, 0x43, 0xe9, 0x41, 0xb5, 0x33, 0x33, 0xa6, 0xe6, 0xa1, 0xe3, 0xcd, 0x8c, 0x80, 0x3c,
-	0x86, 0x7c, 0x70, 0xe1, 0x9a, 0xcd, 0xcc, 0x56, 0x66, 0xbb, 0xbe, 0x47, 0x76, 0x85, 0xda, 0x2e,
-	0xd3, 0x19, 0x20, 0xa2, 0x31, 0x9c, 0x34, 0xa1, 0x74, 0x6e, 0x7a, 0xbe, 0xe5, 0xcc, 0x9b, 0x59,
-	0x54, 0xad, 0x68, 0xe1, 0x52, 0xf9, 0x25, 0x0b, 0x05, 0xa6, 0x4d, 0x3e, 0x81, 0xea, 0xd0, 0xf0,
-	0x4d, 0x7d, 0xc2, 0xa8, 0x19, 0x65, 0x75, 0x6f, 0x23, 0x49, 0xc9, 0x8f, 0xd5, 0x80, 0x2a, 0x0a,
-	0x13, 0xea, 0x90, 0xb5, 0xc6, 0x82, 0x15, 0xbf, 0x08, 0x81, 0xfc, 0xdc, 0x98, 0x99, 0xcd, 0x1c,
-	0x93, 0xb0, 0x6f, 0xf9, 0xf8, 0x7c, 0xe2, 0x78, 0xf2, 0x5f, 0x68, 0x58, 0x33, 0xd7, 0xf1, 0x02,
-	0x3d, 0xb0, 0x66, 0xa6, 0x1f, 0x18, 0x33, 0xb7, 0x59, 0x40, 0x95, 0x9c, 0xb6, 0xca, 0xe5, 0x83,
-	0x50, 0x4c, 0x36, 0xa1, 0x3c, 0x33, 0xe6, 0xd6, 0x04, 0x97, 0xcd, 0x22, 0xaa, 0xd4, 0xb4, 0x68,
-	0x4d, 0x0f, 0xf5, 0xad, 0x6f, 0xcd, 0x66, 0x89, 0x6d, 0x65, 0xdf, 0xe4, 0x19, 0x54, 0x8d, 0xf9,
-	0xdc, 0x09, 0x8c, 0x00, 0x0f, 0xf2, 0x9b, 0xe5, 0xad, 0x1c, 0xfa, 0xb3, 0x16, 0xf9, 0xf3, 0xca,
-	0xbc, 0x38, 0x35, 0xec, 0x85, 0xa9, 0xc9, 0x5a, 0x68, 0x4f, 0xd1, 0x36, 0x86, 0xa6, 0xed, 0x37,
-	0x2b, 0x57, 0xe9, 0x0b, 0x05, 0x45, 0x85, 0x52, 0xd7, 0x0c, 0xde, 0x3b, 0xde, 0x59, 0xe4, 0x73,
-	0x46, 0xf2, 0x19, 0x65, 0x96, 0x7b, 0xfe, 0x5c, 0x44, 0x86, 0x7d, 0x0b, 0xd9, 0xa7, 0x61, 0x6c,
-	0xe8, 0xb7, 0xf2, 0x6b, 0x06, 0x72, 0x2d, 0xd7, 0x5d, 0xca, 0xf1, 0x1f, 0x28, 0x58, 0x34, 0xec,
-	0x8c, 0xa4, 0xba, 0x57, 0x4f, 0x26, 0x43, 0xe3, 0x20, 0x79, 0x02, 0x05, 0x8c, 0x50, 0xc0, 0x43,
-	0x5e, 0x97, 0x4c, 0x46, 0xda, 0xd7, 0x14, 0xd0, 0x38, 0x4e, 0xee, 0x42, 0xc5, 0xfc, 0x60, 0x05,
-	0xfa, 0xc8, 0x19, 0x9b, 0x2c, 0x11, 0x6b, 0x5a, 0x99, 0x0a, 0xda, 0xb8, 0x4e, 0x87, 0xab, 0x70,
-	0x9d, 0x70, 0x29, 0x7f, 0x64, 0x21, 0xd7, 0x77, 0xc6, 0xa2, 0x08, 0x32, 0x51, 0x11, 0x34, 0x20,
-	0xe7, 0x8a, 0xaa, 0x58, 0xd3, 0xe8, 0xe7, 0xd5, 0x46, 0xe2, 0xf6, 0x84, 0x91, 0x5b, 0x90, 0x37,
-	0x5c, 0xd7, 0x47, 0xfb, 0xa8, 0x01, 0x35, 0xd9, 0x19, 0x8d, 0x21, 0xe4, 0x7f, 0x50, 0x9e, 0xf3,
-	0xc0, 0x87, 0x66, 0x36, 0x22, 0x2d, 0x91, 0x11, 0x2d, 0xd2, 0xf8, 0x68, 0xd9, 0xa4, 0x7c, 0x2e,
-	0x5d, 0xab, 0x44, 0x6e, 0x41, 0x71, 0x34, 0xf5, 0x9c, 0x85, 0x8b, 0x25, 0x45, 0xfd, 0x15, 0x2b,
-	0x72, 0x1f, 0x60, 0xe4, 0x99, 0xe8, 0xc2, 0x58, 0xc7, 0xeb, 0x53, 0x61, 0x95, 0x58, 0x11, 0x92,
-	0x56, 0x40, 0x61, 0x74, 0xd0, 0x13, 0x30, 0x70, 0x58, 0x48, 0x10, 0xde, 0x82, 0xda, 0x74, 0xa4,
-	0xcf, 0x0c, 0xef, 0x8c, 0x2b, 0x54, 0x99, 0x02, 0x4c, 0x47, 0x27, 0x4c, 0xd4, 0x0a, 0x94, 0x3d,
-	0x28, 0x87, 0x06, 0xd1, 0xf8, 0xe2, 0xb7, 0x08, 0x78, 0xee, 0xcc, 0xbc, 0x20, 0x1b, 0x50, 0x38,
-	0xa7, 0x90, 0xa8, 0x37, 0xbe, 0x50, 0x7e, 0xcc, 0x42, 0x05, 0x03, 0x7c, 0x68, 0xd9, 0x81, 0xe9,
-	0xd1, 0x5d, 0xd6, 0xd8, 0xc7, 0x5d, 0x39, 0xba, 0x0b, 0x3f, 0x69, 0xb9, 0xb3, 0xa8, 0xfb, 0xb8,
-	0x2d, 0xb7, 0x3c, 0x2d, 0x42, 0x81, 0x16, 0x0f, 0x46, 0x5f, 0xa7, 0x75, 0xe9, 0x63, 0x12, 0x29,
-	0x45, 0x19, 0x05, 0x5d, 0xba, 0xa6, 0x20, 0xab, 0x45, 0x9d, 0xf2, 0xe7, 0x39, 0xc8, 0x04, 0x1d,
-	0x3c, 0xe4, 0x21, 0xac, 0x88, 0x6c, 0x88, 0xdd, 0x05, 0xa6, 0x50, 0x13, 0x42, 0xce, 0x90, 0x4a,
-	0x45, 0xf1, 0x5a, 0xa9, 0xc0, 0xbe, 0xc2, 0x83, 0xcf, 0x73, 0x87, 0x7d, 0x45, 0x2c, 0xb1, 0x31,
-	0xae, 0xba, 0xce, 0x58, 0xf7, 0x17, 0x43, 0x3d, 0xd4, 0x28, 0x33, 0x8d, 0x15, 0x14, 0xbf, 0x5e,
-	0x0c, 0xdb, 0x5c, 0xa8, 0xfc, 0x96, 0x0d, 0x1b, 0xea, 0x55, 0x21, 0xc2, 0xfa, 0x71, 0x3d, 0x73,
-	0x62, 0x7d, 0x10, 0x41, 0x42, 0xcf, 0xc2, 0x35, 0xcd, 0x29, 0x6b, 0x99, 0x72, 0x50, 0x2a, 0x54,
-	0xc2, 0x7d, 0xc2, 0xad, 0x98, 0x1a, 0xf4, 0x31, 0x0e, 0x4a, 0xb8, 0x96, 0x1a, 0x4d, 0xe1, 0x6f,
-	0x1a, 0x0d, 0x79, 0x04, 0x75, 0xde, 0x0b, 0x69, 0x65, 0x4c, 0xd0, 0x4a, 0x56, 0xc7, 0x39, 0x6d,
-	0x25, 0x94, 0xb6, 0xa8, 0x10, 0x6f, 0xd8, 0x6a, 0xa4, 0x36, 0x34, 0xb1, 0x8b, 0x87, 0xed, 0x30,
-	0xda, 0xbd, 0xcf, 0xa4, 0xff, 0xac, 0x31, 0xa2, 0xab, 0x93, 0x85, 0x6d, 0x0b, 0x57, 0x2b, 0xdc,
-	0x55, 0x2a, 0x61, 0xae, 0x2a, 0x7f, 0x66, 0xa0, 0x7a, 0x64, 0x3b, 0x43, 0xc3, 0x3e, 0xb4, 0x8d,
-	0xa9, 0x4f, 0xe3, 0x38, 0xb6, 0xbc, 0xb0, 0x40, 0xf1, 0x93, 0xec, 0xc0, 0x9a, 0x7f, 0xe1, 0x07,
-	0xe6, 0x0c, 0xdb, 0xcf, 0x7c, 0x62, 0x4d, 0x75, 0x8a, 0xf3, 0x62, 0x5d, 0xe5, 0x40, 0x9b, 0xc9,
-	0x0f, 0x50, 0x77, 0x1b, 0x1a, 0xb6, 0x33, 0x32, 0x6c, 0x59, 0x95, 0xf7, 0xcc, 0x3a, 0x93, 0xc7,
-	0x9a, 0x98, 0xe7, 0x85, 0x6f, 0x7a, 0xb2, 0x22, 0x9f, 0x30, 0x2b, 0x54, 0x1c, 0xeb, 0xd1, 0x18,
-	0xce, 0x7d, 0x73, 0xb4, 0xf0, 0x70, 0xc0, 0x51, 0x0b, 0xd9, 0x94, 0x41, 0xb5, 0x50, 0xca, 0xcd,
-	0x7e, 0x0a, 0x37, 0x03, 0x6f, 0xe1, 0x07, 0x3a, 0xe6, 0xc9, 0xd7, 0x27, 0x9e, 0x33, 0xd3, 0xdf,
-	0x05, 0x81, 0xeb, 0xb3, 0x88, 0x97, 0x35, 0xc2, 0x40, 0x0c, 0x90, 0x7f, 0x88, 0xd0, 0x17, 0x14,
-	0x51, 0x7e, 0xca, 0x40, 0xbe, 0x33, 0x9f, 0x38, 0xe4, 0x5f, 0x50, 0xf5, 0xce, 0x02, 0x3d, 0x1c,
-	0x74, 0xdc, 0x75, 0x40, 0xd1, 0xa9, 0x98, 0x75, 0xff, 0x86, 0x1a, 0x5e, 0x98, 0x91, 0x9e, 0x9c,
-	0xc4, 0x55, 0x2a, 0x0b, 0x55, 0x90, 0x03, 0x87, 0x7e, 0xa4, 0xc1, 0x7d, 0x06, 0x14, 0x85, 0x0a,
-	0x9f, 0x61, 0x9b, 0x60, 0x61, 0x16, 0x5e, 0xe4, 0x53, 0x53, 0x5a, 0xca, 0x81, 0x56, 0x9d, 0xc6,
-	0x0b, 0xe5, 0xfb, 0x0c, 0x14, 0xd4, 0x73, 0x73, 0x7e, 0xf5, 0x9b, 0x81, 0xa1, 0xd2, 0x9b, 0x61,
-	0xc9, 0x60, 0xa7, 0x01, 0x09, 0x87, 0x17, 0xfd, 0xa6, 0x32, 0x3a, 0xb7, 0x99, 0x19, 0x38, 0x77,
-	0xe9, 0x37, 0x86, 0x3a, 0x3f, 0x36, 0x02, 0xe3, 0xea, 0xba, 0x66, 0xb0, 0xf2, 0x03, 0x56, 0x0c,
-	0x3b, 0x52, 0xdc, 0xbc, 0x6d, 0x28, 0xd0, 0x63, 0xf9, 0xdd, 0x5b, 0x6e, 0x17, 0x57, 0x08, 0xef,
-	0x68, 0x36, 0xbe, 0xa3, 0xd8, 0xfc, 0xe4, 0x2b, 0xc8, 0x17, 0xac, 0xe3, 0x5a, 0xf3, 0x91, 0xa9,
-	0x4b, 0x26, 0x56, 0x98, 0x84, 0x3e, 0x2a, 0x28, 0xbc, 0x98, 0x07, 0x96, 0xcd, 0x61, 0xfe, 0xe8,
-	0xa8, 0x30, 0x09, 0x85, 0x95, 0x06, 0xd4, 0x8f, 0xcc, 0x80, 0x66, 0x56, 0x33, 0xbf, 0x59, 0xe0,
-	0xb4, 0x50, 0x9e, 0xc3, 0x6a, 0x24, 0xf1, 0x5d, 0xbc, 0x14, 0x26, 0xa6, 0x34, 0x6f, 0xe1, 0x5a,
-	0x3c, 0x96, 0x56, 0xe2, 0xf9, 0x4c, 0x95, 0x18, 0xa4, 0x7c, 0x09, 0xab, 0xc7, 0x96, 0x1f, 0x60,
-	0x3f, 0xf5, 0x05, 0x11, 0x0e, 0xb0, 0xd2, 0x84, 0x39, 0xcd, 0x9d, 0xad, 0x4a, 0xce, 0x46, 0xcd,
-	0x5a, 0x0b, 0x55, 0xe8, 0xbc, 0x19, 0x9b, 0x81, 0x61, 0xd9, 0x2c, 0x17, 0x65, 0x4d, 0xac, 0xd0,
-	0x9c, 0x46, 0x4c, 0x2c, 0xec, 0xc1, 0xe1, 0x89, 0xfd, 0x2d, 0xa4, 0xad, 0xc9, 0xb4, 0x1a, 0x43,
-	0x94, 0x87, 0xb0, 0xd6, 0x99, 0xfb, 0xae, 0x39, 0xa2, 0x1b, 0x43, 0x83, 0x52, 0xe3, 0x1b, 0xa9,
-	0x89, 0xac, 0x24, 0xc8, 0x1f, 0xe0, 0x50, 0x77, 0xc6, 0xc2, 0xd7, 0x24, 0x37, 0x05, 0x94, 0xaf,
-	0x61, 0x8d, 0x1a, 0xc4, 0xda, 0x69, 0xe4, 0xeb, 0x6e, 0xda, 0xd7, 0xf4, 0x8b, 0xf2, 0x9a, 0xde,
-	0xbe, 0x00, 0x22, 0x93, 0x0b, 0x93, 0x1e, 0x43, 0x91, 0x8d, 0x99, 0x90, 0x3c, 0xfd, 0x42, 0x12,
-	0xa8, 0xf2, 0x08, 0xd6, 0x85, 0x43, 0x5c, 0x7e, 0x85, 0xdf, 0x2f, 0x60, 0x23, 0xa9, 0x26, 0x8e,
-	0x89, 0xde, 0x61, 0x99, 0x8f, 0xbc, 0xc3, 0x94, 0x36, 0xac, 0x53, 0x13, 0xcd, 0x39, 0xab, 0x58,
-	0x29, 0xdb, 0x45, 0xee, 0xdc, 0xa5, 0x27, 0xb5, 0x54, 0xfe, 0x9a, 0xd0, 0x51, 0x5e, 0xc2, 0x46,
-	0x92, 0x24, 0xf6, 0xd4, 0x64, 0x92, 0x4b, 0x9e, 0x32, 0x45, 0x4d, 0xa0, 0xca, 0xcf, 0x19, 0x56,
-	0xb7, 0xc7, 0xce, 0x34, 0x32, 0xe0, 0x26, 0x14, 0xe9, 0x2c, 0x8c, 0x3c, 0x2d, 0xe0, 0xaa, 0x33,
-	0x26, 0x77, 0xa0, 0x1c, 0x0e, 0xf4, 0xf0, 0x47, 0x81, 0x98, 0xe7, 0xf4, 0x3e, 0xd9, 0xd6, 0x9c,
-	0xdd, 0xa7, 0xcc, 0x76, 0x41, 0xe3, 0x0b, 0x9a, 0x9a, 0x89, 0x63, 0xdb, 0xce, 0x7b, 0x76, 0x97,
-	0x30, 0x35, 0x7c, 0x95, 0xba, 0x67, 0x85, 0x8f, 0xdf, 0xb3, 0x62, 0xfa, 0x9e, 0x3d, 0x61, 0xb7,
-	0x8a, 0xdb, 0x2b, 0x7c, 0x8d, 0x8e, 0xe7, 0x63, 0x98, 0x2f, 0x76, 0x4c, 0xa8, 0x44, 0x3f, 0x6b,
-	0x70, 0xf2, 0x6f, 0x74, 0x4e, 0x5a, 0x47, 0xaa, 0x3e, 0x78, 0xdb, 0x57, 0xf5, 0x37, 0xdd, 0x03,
-	0xf5, 0xb0, 0xd3, 0x55, 0x0f, 0x1a, 0x37, 0xc8, 0x3a, 0xac, 0x4a, 0x48, 0xab, 0xdf, 0x6f, 0x37,
-	0x32, 0x18, 0x82, 0x35, 0x49, 0x78, 0xd0, 0x6b, 0xbf, 0x52, 0xb5, 0x46, 0x16, 0xdb, 0x57, 0x5d,
-	0x12, 0xf7, 0xda, 0x9d, 0x46, 0x6e, 0xa7, 0x0f, 0xe5, 0xf0, 0xdd, 0x4c, 0x6e, 0xc3, 0x3a, 0x12,
-	0xe8, 0xaf, 0x07, 0xad, 0x41, 0xf2, 0x10, 0xe4, 0x8b, 0x01, 0xed, 0x4d, 0xb7, 0xdb, 0xe9, 0x1e,
-	0xe1, 0x31, 0x1b, 0xd0, 0x88, 0xc5, 0xea, 0x57, 0x9d, 0x01, 0x2a, 0x67, 0x77, 0x7e, 0xcf, 0x40,
-	0x39, 0x7c, 0x4e, 0x51, 0xca, 0x7e, 0xef, 0x60, 0x09, 0x25, 0xee, 0x8d, 0x01, 0xf5, 0x64, 0x5f,
-	0x7b, 0xdb, 0x43, 0xc6, 0x84, 0x7a, 0x5f, 0x53, 0xfb, 0x2d, 0x8d, 0x1e, 0x95, 0xc5, 0x64, 0x90,
-	0x34, 0x80, 0x34, 0x39, 0x6a, 0x59, 0x2c, 0x0f, 0x2d, 0xcb, 0x63, 0x12, 0xee, 0xc4, 0xe2, 0xd6,
-	0x7e, 0x4f, 0x43, 0xd3, 0xc2, 0x6d, 0x8d, 0x42, 0xea, 0x70, 0x6e, 0x78, 0x31, 0x79, 0xc6, 0x81,
-	0x7a, 0xac, 0x0e, 0x28, 0x59, 0x29, 0x79, 0xc6, 0x51, 0x4b, 0xdb, 0xc7, 0x10, 0x36, 0xca, 0x3b,
-	0xf8, 0x53, 0xb2, 0x12, 0x35, 0x6b, 0x9a, 0x21, 0xf5, 0x54, 0xed, 0x0e, 0x2e, 0x67, 0xe8, 0x2e,
-	0xdc, 0x96, 0x10, 0xca, 0x14, 0xd9, 0x9f, 0x21, 0x0a, 0x3c, 0x58, 0x0e, 0x86, 0x56, 0xa3, 0xef,
-	0x9b, 0x70, 0x2b, 0xa5, 0x83, 0xa6, 0x30, 0x2c, 0x87, 0x55, 0x7d, 0x33, 0x85, 0x09, 0x77, 0xf2,
-	0x78, 0x8b, 0xb7, 0x52, 0x90, 0xb0, 0x5d, 0x6f, 0xf7, 0x8e, 0x8f, 0xd5, 0x36, 0xd5, 0x2a, 0xa4,
-	0xc8, 0x45, 0x3a, 0x35, 0x1e, 0x90, 0x24, 0x39, 0xc5, 0x04, 0x79, 0x89, 0x06, 0x58, 0x82, 0x78,
-	0x55, 0x75, 0x4e, 0xfa, 0xdc, 0xe4, 0x32, 0xb9, 0x07, 0xcd, 0x4b, 0xb0, 0xa6, 0x9e, 0xf4, 0x4e,
-	0x11, 0xad, 0xec, 0x7d, 0x97, 0xc7, 0x67, 0xfa, 0x62, 0x68, 0x5b, 0xa3, 0x56, 0xbf, 0x43, 0x5e,
-	0x42, 0x49, 0xcc, 0x19, 0x72, 0x3b, 0x1e, 0xec, 0x89, 0x59, 0xb4, 0xd9, 0xbc, 0x0c, 0xf0, 0xcb,
-	0xa3, 0xdc, 0x20, 0x2d, 0x28, 0x87, 0x83, 0x81, 0xc4, 0x7a, 0xa9, 0x21, 0xb4, 0x79, 0x67, 0x09,
-	0x12, 0x51, 0x1c, 0x01, 0xc4, 0x03, 0x80, 0x6c, 0x4a, 0x73, 0x2d, 0x35, 0x3a, 0x36, 0xef, 0x2e,
-	0xc5, 0x64, 0xa2, 0xb8, 0x6d, 0x4b, 0x44, 0x97, 0x06, 0x85, 0x44, 0x74, 0xb9, 0xcf, 0x23, 0xd1,
-	0x09, 0xd4, 0xe4, 0xd6, 0x4c, 0xee, 0xa5, 0xcf, 0x95, 0x1b, 0xfb, 0xe6, 0xfd, 0x2b, 0xd0, 0x88,
-	0xae, 0x07, 0x35, 0xb9, 0xcd, 0x4a, 0x74, 0x4b, 0x5a, 0xb8, 0x44, 0xb7, 0xac, 0x37, 0x2b, 0x37,
-	0xfe, 0x9f, 0x21, 0x9f, 0xb3, 0xa4, 0xd1, 0x36, 0x96, 0x4c, 0x9a, 0xd4, 0x88, 0x93, 0x49, 0x93,
-	0x3b, 0x1e, 0x65, 0x18, 0x16, 0xd9, 0x5f, 0x3d, 0xcf, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x45,
-	0x22, 0xcb, 0xca, 0xf7, 0x11, 0x00, 0x00,
+	// 1800 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x4f, 0x73, 0xdb, 0xc6,
+	0x15, 0x37, 0xf8, 0x17, 0x78, 0xd4, 0x1f, 0x68, 0x2d, 0xd9, 0x30, 0x1d, 0x27, 0x0c, 0x12, 0xdb,
+	0x8a, 0x26, 0xe3, 0x69, 0x14, 0xb7, 0xbd, 0x64, 0x32, 0xa5, 0x49, 0x48, 0xe5, 0x58, 0x12, 0x39,
+	0x6b, 0xc6, 0x6d, 0xa6, 0x07, 0x0c, 0x44, 0x2c, 0x19, 0x8c, 0x40, 0x00, 0x05, 0x96, 0x72, 0xd4,
+	0x63, 0x3f, 0x40, 0xbf, 0x41, 0x7b, 0xea, 0xb9, 0xd7, 0xcc, 0xf4, 0xde, 0x8f, 0xd2, 0x43, 0x3f,
+	0x41, 0xaf, 0x9d, 0xfd, 0x03, 0x60, 0x09, 0x51, 0xae, 0x27, 0xb7, 0xdd, 0xf7, 0xfb, 0xe1, 0xed,
+	0xfb, 0xb7, 0xef, 0x2d, 0x09, 0x86, 0x97, 0x04, 0x2f, 0x92, 0x34, 0xa6, 0x31, 0x6a, 0x5f, 0x7f,
+	0xe5, 0x85, 0xc9, 0x0f, 0x9e, 0x3d, 0x86, 0xce, 0x68, 0xe9, 0x2d, 0xc8, 0x49, 0x9c, 0x2e, 0x3d,
+	0x8a, 0x9e, 0x41, 0x83, 0xde, 0x24, 0xc4, 0xd2, 0x7a, 0xda, 0xe1, 0xce, 0x31, 0x7a, 0x21, 0x69,
+	0x2f, 0x38, 0x67, 0x7a, 0x93, 0x10, 0xcc, 0x71, 0x64, 0x41, 0xfb, 0x9a, 0xa4, 0x59, 0x10, 0x47,
+	0x56, 0xad, 0xa7, 0x1d, 0x1a, 0x38, 0xdf, 0xda, 0x3f, 0xd5, 0xa0, 0xc9, 0xd9, 0xe8, 0x97, 0xd0,
+	0xb9, 0xf4, 0x32, 0xe2, 0xce, 0xb9, 0x6a, 0xae, 0xb2, 0x73, 0xbc, 0xbf, 0xae, 0x52, 0x1c, 0x8b,
+	0x81, 0x11, 0xa5, 0x09, 0x3b, 0x50, 0x0b, 0x7c, 0xa9, 0xb5, 0x16, 0xf8, 0x08, 0x41, 0x23, 0xf2,
+	0x96, 0xc4, 0xaa, 0x73, 0x09, 0x5f, 0xab, 0xc7, 0x37, 0xd6, 0x8e, 0x47, 0x5f, 0x80, 0x19, 0x2c,
+	0x93, 0x38, 0xa5, 0x2e, 0x0d, 0x96, 0x24, 0xa3, 0xde, 0x32, 0xb1, 0x9a, 0x3d, 0xed, 0xb0, 0x8e,
+	0x77, 0x85, 0x7c, 0x9a, 0x8b, 0x51, 0x17, 0xf4, 0xa5, 0x17, 0x05, 0x73, 0x92, 0x51, 0xab, 0xd5,
+	0xd3, 0x0e, 0xb7, 0x70, 0xb1, 0x67, 0x87, 0x66, 0xc1, 0x9f, 0x88, 0xd5, 0xe6, 0x9f, 0xf2, 0x35,
+	0xfa, 0x1a, 0x3a, 0x5e, 0x14, 0xc5, 0xd4, 0xa3, 0x41, 0x1c, 0x65, 0x96, 0xde, 0xab, 0x1f, 0x76,
+	0x8e, 0xf7, 0x0a, 0x7f, 0x5e, 0x93, 0x9b, 0xb7, 0x5e, 0xb8, 0x22, 0x58, 0x65, 0xa1, 0x2f, 0xa0,
+	0x15, 0x7a, 0x97, 0x24, 0xcc, 0x2c, 0xe3, 0x2e, 0xbe, 0x24, 0xd8, 0x0e, 0xb4, 0x2f, 0x08, 0x7d,
+	0x17, 0xa7, 0x57, 0x85, 0xcf, 0x9a, 0xe2, 0x33, 0x82, 0x46, 0x90, 0x5c, 0xbf, 0x94, 0x91, 0xe1,
+	0x6b, 0x29, 0xfb, 0x55, 0x1e, 0x1b, 0xb6, 0xb6, 0xff, 0xa9, 0x41, 0xbd, 0x9f, 0x24, 0x1b, 0x75,
+	0x7c, 0x0e, 0xcd, 0x80, 0x85, 0x9d, 0x2b, 0xe9, 0x1c, 0xef, 0xac, 0x27, 0x03, 0x0b, 0x10, 0x3d,
+	0x87, 0x66, 0x46, 0x3d, 0x2a, 0x42, 0xbe, 0xa3, 0x98, 0xdc, 0x4f, 0x92, 0x37, 0x0c, 0xc0, 0x02,
+	0x47, 0x8f, 0xc1, 0x20, 0x3f, 0x06, 0xd4, 0x9d, 0xc5, 0x3e, 0xe1, 0x89, 0xd8, 0xc3, 0x3a, 0x13,
+	0x0c, 0x62, 0xff, 0x56, 0xb8, 0x9a, 0x1f, 0x12, 0x2e, 0xfb, 0x3f, 0x35, 0xa8, 0x4f, 0x62, 0x5f,
+	0x16, 0x81, 0x56, 0x14, 0x81, 0x09, 0xf5, 0x44, 0x56, 0xc5, 0x1e, 0x66, 0xcb, 0xbb, 0x8d, 0x9c,
+	0xc4, 0xfe, 0x9a, 0x91, 0x3d, 0x68, 0x78, 0x49, 0x92, 0x59, 0x0d, 0x6e, 0xc0, 0x96, 0xea, 0x0c,
+	0xe6, 0x08, 0xfa, 0x12, 0xf4, 0x48, 0x04, 0x3e, 0x37, 0xd3, 0x2c, 0x58, 0x32, 0x23, 0xb8, 0x60,
+	0xbc, 0xb7, 0x6c, 0x2a, 0x3e, 0xb7, 0x3f, 0xa8, 0x44, 0x1e, 0x40, 0x6b, 0xb6, 0x48, 0xe3, 0x55,
+	0x62, 0xe9, 0xdc, 0x5f, 0xb9, 0x43, 0x4f, 0x00, 0x66, 0x29, 0xf1, 0x28, 0xf1, 0x5d, 0x8f, 0x5a,
+	0x06, 0xaf, 0x44, 0x43, 0x4a, 0xfa, 0x94, 0xc1, 0x19, 0xf5, 0x52, 0x09, 0x83, 0x80, 0xa5, 0xa4,
+	0x4f, 0x51, 0x0f, 0xb6, 0x16, 0x33, 0x77, 0xe9, 0xa5, 0x57, 0x82, 0xd0, 0xe1, 0x04, 0x58, 0xcc,
+	0xce, 0xb9, 0xa8, 0x4f, 0xed, 0x63, 0xd0, 0x73, 0x83, 0x58, 0x7c, 0x5f, 0x93, 0x1b, 0x19, 0x70,
+	0xb6, 0x44, 0xfb, 0xd0, 0xbc, 0x66, 0x90, 0xac, 0x37, 0xb1, 0xb1, 0xff, 0x56, 0x03, 0x63, 0x12,
+	0xfb, 0x27, 0x41, 0x48, 0x49, 0xca, 0xbe, 0x0a, 0xfc, 0xcc, 0xd2, 0x7a, 0x75, 0xf6, 0x55, 0xe0,
+	0xf3, 0x72, 0xe7, 0x51, 0xcf, 0xac, 0x5a, 0xaf, 0xbe, 0x39, 0x2d, 0x92, 0xc0, 0x8a, 0xc7, 0x4b,
+	0x12, 0x97, 0xd5, 0x65, 0x66, 0xd5, 0xb9, 0x0a, 0xdd, 0x4b, 0x92, 0x0b, 0xb6, 0x67, 0x20, 0xaf,
+	0x45, 0x97, 0xe9, 0x6f, 0x08, 0x90, 0x0b, 0x46, 0x7e, 0x86, 0x3e, 0x83, 0x6d, 0x99, 0x0d, 0xf9,
+	0x75, 0x93, 0x13, 0xb6, 0xa4, 0x50, 0x68, 0xa8, 0xa4, 0xa2, 0xf5, 0x41, 0xa9, 0xb0, 0xa0, 0x2d,
+	0x82, 0x2f, 0x72, 0x67, 0xe0, 0x7c, 0x8b, 0x9e, 0xc1, 0x6e, 0x12, 0xfb, 0x6e, 0xb6, 0xba, 0x74,
+	0x73, 0x86, 0xce, 0x19, 0xdb, 0x49, 0xec, 0xbf, 0x59, 0x5d, 0x0e, 0x84, 0xd0, 0xfe, 0x57, 0x2d,
+	0x6f, 0xa8, 0x77, 0x85, 0xa8, 0x0b, 0x7a, 0x92, 0x92, 0x79, 0xf0, 0xa3, 0x0c, 0x92, 0x81, 0x8b,
+	0x3d, 0xcb, 0x29, 0x6f, 0x99, 0x6a, 0x50, 0x0c, 0x26, 0x11, 0x3e, 0x75, 0x41, 0xbf, 0x22, 0x37,
+	0xef, 0xe2, 0xb4, 0x0c, 0x4a, 0xbe, 0x57, 0x1a, 0x4d, 0xf3, 0xff, 0x34, 0x1a, 0xf4, 0x14, 0x76,
+	0x44, 0x2f, 0x64, 0x95, 0x31, 0xa7, 0x24, 0xe5, 0x75, 0x5c, 0xc7, 0xdb, 0xb9, 0xb4, 0xcf, 0x84,
+	0xe8, 0x39, 0xec, 0x16, 0xb4, 0x4b, 0x32, 0x8f, 0xd3, 0xbc, 0x1d, 0x16, 0x5f, 0xbf, 0xe2, 0xd2,
+	0x9f, 0xd7, 0x18, 0x9f, 0x00, 0xcc, 0x57, 0x61, 0x28, 0x5d, 0x35, 0x84, 0xab, 0x4c, 0xc2, 0x5d,
+	0xb5, 0xff, 0xab, 0x41, 0xe7, 0x34, 0x8c, 0x2f, 0xbd, 0xf0, 0x24, 0xf4, 0x16, 0x19, 0x8b, 0xa3,
+	0x1f, 0xa4, 0x79, 0x81, 0xfa, 0x41, 0x8a, 0x8e, 0x60, 0x2f, 0xbb, 0xc9, 0x28, 0x59, 0xba, 0xb3,
+	0x38, 0x9a, 0x07, 0x0b, 0x97, 0xe1, 0xa2, 0x58, 0x77, 0x05, 0x30, 0xe0, 0xf2, 0x61, 0x90, 0xa2,
+	0x43, 0x30, 0xc3, 0x78, 0xe6, 0x85, 0x2a, 0x55, 0xf4, 0xcc, 0x1d, 0x2e, 0x2f, 0x99, 0xcf, 0x60,
+	0x77, 0x95, 0x91, 0x54, 0x25, 0x8a, 0x09, 0xb3, 0xcd, 0xc4, 0x25, 0x8f, 0xc5, 0x30, 0xca, 0xc8,
+	0x6c, 0x95, 0x12, 0x77, 0xce, 0x2c, 0xe4, 0x53, 0xc6, 0xc0, 0xdb, 0xb9, 0x54, 0x98, 0xfd, 0x15,
+	0x1c, 0xd0, 0x74, 0x95, 0x51, 0xf7, 0x8a, 0xdc, 0x64, 0xee, 0x3c, 0x8d, 0x97, 0xee, 0x0f, 0x94,
+	0x26, 0x19, 0x8f, 0xb8, 0x8e, 0x11, 0x07, 0x5f, 0x93, 0x9b, 0xec, 0x24, 0x8d, 0x97, 0xbf, 0x65,
+	0x88, 0xfd, 0x77, 0x0d, 0x1a, 0xa3, 0x68, 0x1e, 0xa3, 0x4f, 0xa0, 0x93, 0x5e, 0x51, 0x37, 0x1f,
+	0x74, 0xc2, 0x75, 0x48, 0xaf, 0xe8, 0x5b, 0x39, 0xeb, 0x3e, 0x85, 0x2d, 0x2f, 0x49, 0x66, 0xee,
+	0xfa, 0x24, 0xee, 0x30, 0x59, 0x4e, 0xf9, 0x04, 0x3a, 0x5e, 0x12, 0x14, 0x0c, 0xe1, 0x33, 0x78,
+	0x49, 0x90, 0x13, 0x7e, 0x0d, 0x5b, 0x0b, 0x1e, 0x66, 0xe9, 0x45, 0xa3, 0x32, 0xa5, 0x95, 0x1c,
+	0xe0, 0xce, 0xa2, 0xdc, 0xd8, 0x7f, 0xd1, 0xa0, 0xe9, 0x5c, 0x93, 0xe8, 0xee, 0x37, 0x03, 0x47,
+	0x95, 0x37, 0xc3, 0x86, 0xc1, 0xce, 0x02, 0x92, 0x0f, 0x2f, 0xb6, 0x66, 0x32, 0x36, 0xb7, 0xb9,
+	0x19, 0x75, 0xcc, 0xd7, 0xe8, 0x29, 0x34, 0x7c, 0x8f, 0x7a, 0x77, 0xd7, 0x35, 0x87, 0xed, 0xbf,
+	0x6a, 0xd0, 0xe1, 0x47, 0xca, 0x9b, 0x77, 0x08, 0x4d, 0x76, 0xac, 0xb8, 0x7b, 0x9b, 0xed, 0x12,
+	0x84, 0xfc, 0x8e, 0xd6, 0xca, 0x3b, 0xba, 0x0f, 0x4d, 0xf5, 0x0a, 0x8a, 0x0d, 0xef, 0xb8, 0x41,
+	0x34, 0x23, 0xae, 0x62, 0xa2, 0xc1, 0x25, 0xec, 0x51, 0xc1, 0xe0, 0x55, 0x44, 0x83, 0x50, 0xc0,
+	0xe2, 0xd1, 0x61, 0x70, 0x09, 0x83, 0x6d, 0x13, 0x76, 0x4e, 0x09, 0x65, 0x99, 0xc5, 0xe4, 0x8f,
+	0x2b, 0x92, 0x51, 0xfb, 0x25, 0xec, 0x16, 0x92, 0x2c, 0x89, 0xa3, 0x8c, 0xa0, 0x4f, 0xa1, 0x11,
+	0x44, 0xf3, 0x58, 0x3e, 0x96, 0xb6, 0xcb, 0xf9, 0xcc, 0x48, 0x1c, 0xb2, 0x7f, 0x07, 0xbb, 0x67,
+	0x41, 0x46, 0x27, 0xb1, 0x9f, 0x49, 0x45, 0xe8, 0x4b, 0x68, 0xcf, 0xb9, 0xd3, 0xc2, 0xd9, 0x8e,
+	0xe2, 0x6c, 0xd1, 0xac, 0x71, 0x4e, 0x61, 0xf3, 0xc6, 0x27, 0xd4, 0x0b, 0x42, 0x9e, 0x0b, 0x1d,
+	0xcb, 0x9d, 0xfd, 0x12, 0xcc, 0x52, 0xb1, 0xb4, 0xa7, 0x07, 0x8d, 0x24, 0xf6, 0x73, 0xb5, 0x5b,
+	0xaa, 0x5a, 0xcc, 0x11, 0xfb, 0x33, 0xd8, 0x1b, 0x45, 0x59, 0x42, 0x66, 0xec, 0xc3, 0xdc, 0xa0,
+	0xca, 0xf8, 0xb6, 0x5f, 0x02, 0x52, 0x49, 0x52, 0xf9, 0xc7, 0x50, 0x4f, 0x62, 0x5f, 0xfa, 0xba,
+	0xae, 0x9b, 0x01, 0xf6, 0x1f, 0x60, 0x8f, 0x19, 0xc4, 0xdb, 0x69, 0xe1, 0xeb, 0x8b, 0xaa, 0xaf,
+	0xd5, 0x17, 0xe5, 0x07, 0x7a, 0xfb, 0x0d, 0x20, 0x55, 0xb9, 0x34, 0xe9, 0x19, 0xb4, 0xf8, 0x98,
+	0xc9, 0x95, 0x57, 0x5f, 0x48, 0x12, 0xb5, 0x9f, 0xc2, 0x7d, 0xe9, 0x90, 0x90, 0xdf, 0xe1, 0xf7,
+	0x37, 0xb0, 0xbf, 0x4e, 0x93, 0xc7, 0x14, 0xef, 0x30, 0xed, 0x3d, 0xef, 0x30, 0x7b, 0x00, 0xf7,
+	0x99, 0x89, 0x24, 0xe2, 0x15, 0xab, 0x64, 0xbb, 0x25, 0x9c, 0xbb, 0xf5, 0xa4, 0x56, 0xca, 0x1f,
+	0x4b, 0x8e, 0xfd, 0x2d, 0xec, 0xaf, 0x2b, 0x29, 0x3d, 0x25, 0x5c, 0x72, 0xcb, 0x53, 0x4e, 0xc4,
+	0x12, 0xb5, 0xff, 0xa1, 0xf1, 0xba, 0x3d, 0x8b, 0x17, 0x85, 0x01, 0x07, 0xd0, 0x62, 0xb3, 0xb0,
+	0xf0, 0xb4, 0x99, 0xc4, 0xfe, 0xc8, 0x47, 0x8f, 0x40, 0xcf, 0x07, 0x7a, 0xfe, 0xa3, 0x40, 0xce,
+	0x73, 0x76, 0x9f, 0xc2, 0x20, 0xe2, 0xf7, 0x49, 0x3b, 0x6c, 0x62, 0xb1, 0x61, 0xa9, 0x99, 0xc7,
+	0x61, 0x18, 0xbf, 0xe3, 0x77, 0x49, 0xc7, 0x72, 0x57, 0xb9, 0x67, 0xcd, 0xf7, 0xdf, 0xb3, 0x56,
+	0xf5, 0x9e, 0x3d, 0xe7, 0xb7, 0x4a, 0xd8, 0x2b, 0x7d, 0x2d, 0x8e, 0x17, 0x63, 0x58, 0x6c, 0x8e,
+	0x08, 0x18, 0xc5, 0xcf, 0x1a, 0x64, 0xc1, 0xfe, 0xe8, 0xbc, 0x7f, 0xea, 0xb8, 0xd3, 0xef, 0x27,
+	0x8e, 0xfb, 0xdd, 0xc5, 0xd0, 0x39, 0x19, 0x5d, 0x38, 0x43, 0xf3, 0x1e, 0xba, 0x0f, 0xbb, 0x0a,
+	0xd2, 0x9f, 0x4c, 0x06, 0xa6, 0x86, 0x0e, 0x60, 0x4f, 0x11, 0x0e, 0xc7, 0x83, 0xd7, 0x0e, 0x36,
+	0x6b, 0x08, 0xc1, 0x8e, 0x22, 0x1e, 0x0f, 0x46, 0x66, 0xfd, 0x68, 0x02, 0x7a, 0xfe, 0x6e, 0x46,
+	0x0f, 0xe1, 0x7e, 0x7f, 0x32, 0x71, 0xdf, 0x4c, 0xfb, 0xd3, 0xf5, 0x43, 0x0e, 0x60, 0xaf, 0x04,
+	0xf0, 0x77, 0x17, 0x17, 0xa3, 0x8b, 0x53, 0x53, 0x43, 0xfb, 0x60, 0x96, 0x62, 0xe7, 0xf7, 0xa3,
+	0xa9, 0x33, 0x34, 0x6b, 0x47, 0xff, 0xd6, 0x40, 0xcf, 0x9f, 0x53, 0x4c, 0xe5, 0x64, 0x3c, 0xdc,
+	0xa0, 0x72, 0x1f, 0xcc, 0x12, 0x70, 0xce, 0x5f, 0xe1, 0xef, 0xc7, 0xa6, 0xb6, 0x4e, 0x9f, 0x60,
+	0x67, 0xd2, 0xc7, 0xec, 0xa8, 0x1a, 0x7a, 0x00, 0xa8, 0x0a, 0x38, 0x43, 0xb3, 0xce, 0x2c, 0x2b,
+	0xe5, 0xb9, 0x65, 0x0d, 0xf4, 0x04, 0x1e, 0x95, 0xe2, 0xfe, 0xab, 0x31, 0x9e, 0x3a, 0xc3, 0xfc,
+	0x33, 0xb3, 0x59, 0x39, 0x5c, 0x18, 0xde, 0x5a, 0x3f, 0x63, 0xe8, 0x9c, 0x39, 0x53, 0xa6, 0xac,
+	0xbd, 0x7e, 0xc6, 0x69, 0x1f, 0xbf, 0xea, 0x9f, 0x3a, 0xa6, 0x7e, 0xf4, 0x53, 0x0d, 0x8c, 0xa2,
+	0x59, 0xb3, 0x0c, 0x39, 0x6f, 0x9d, 0x8b, 0xe9, 0xed, 0x0c, 0x3d, 0x86, 0x87, 0x0a, 0xc2, 0x34,
+	0x15, 0xf6, 0x6b, 0xc8, 0x86, 0x8f, 0x37, 0x83, 0xb9, 0xd5, 0x66, 0x0d, 0x75, 0xe1, 0x41, 0x85,
+	0xf3, 0x66, 0xda, 0xe7, 0x58, 0x1d, 0x3d, 0x82, 0x83, 0x0a, 0x26, 0xdd, 0x69, 0xa0, 0xcf, 0xa1,
+	0x57, 0x81, 0xa4, 0xed, 0xee, 0x60, 0x7c, 0x76, 0xe6, 0x0c, 0x18, 0xab, 0x59, 0x51, 0x2e, 0xd3,
+	0x89, 0x45, 0x40, 0xd6, 0x95, 0x33, 0x4c, 0x2a, 0x6f, 0xb3, 0x00, 0x2b, 0x90, 0xa8, 0xaa, 0xd1,
+	0xf9, 0x44, 0x98, 0xac, 0xa3, 0x8f, 0xc0, 0xba, 0x05, 0x63, 0xe7, 0x7c, 0xfc, 0xd6, 0x19, 0x9a,
+	0xc6, 0xf1, 0x9f, 0x1b, 0x60, 0x4c, 0x56, 0x97, 0x61, 0x30, 0xeb, 0x4f, 0x46, 0xe8, 0x5b, 0x68,
+	0xcb, 0x39, 0x83, 0x1e, 0x96, 0x83, 0x7d, 0x6d, 0x16, 0x75, 0xad, 0xdb, 0x80, 0xb8, 0x3c, 0xf6,
+	0x3d, 0xd4, 0x07, 0x3d, 0x1f, 0x0c, 0xa8, 0xe4, 0x55, 0x86, 0x50, 0xf7, 0xd1, 0x06, 0xa4, 0x50,
+	0x71, 0x0a, 0x50, 0x0e, 0x00, 0xd4, 0x55, 0xe6, 0x5a, 0x65, 0x74, 0x74, 0x1f, 0x6f, 0xc4, 0x54,
+	0x45, 0x65, 0xdb, 0x56, 0x14, 0xdd, 0x1a, 0x14, 0x8a, 0xa2, 0xdb, 0x7d, 0xde, 0xbe, 0x87, 0xce,
+	0x61, 0x4b, 0x6d, 0xcd, 0xe8, 0xa3, 0xea, 0xb9, 0x6a, 0x63, 0xef, 0x3e, 0xb9, 0x03, 0x2d, 0xd4,
+	0x8d, 0x61, 0x4b, 0x6d, 0xb3, 0x8a, 0xba, 0x0d, 0x2d, 0x5c, 0x51, 0xb7, 0xa9, 0x37, 0xdb, 0xf7,
+	0x7e, 0xa1, 0xa1, 0xdf, 0xf0, 0xa4, 0xb1, 0x36, 0xb6, 0x9e, 0x34, 0xa5, 0x11, 0xaf, 0x27, 0x4d,
+	0xed, 0x78, 0x4c, 0xc3, 0x65, 0x8b, 0xff, 0xd5, 0xf3, 0xf5, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff,
+	0x12, 0x12, 0x68, 0x59, 0xf7, 0x11, 0x00, 0x00,
 }

From d01e843bf5f7e5bcec1b748db5eefc6a1816a8f6 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 10 Feb 2017 15:37:07 -0800
Subject: [PATCH 1059/1304] glide: bump grpc to 1.0.4

Apparently the k8s proto version (1.0.4) is not compatible with 1.0.5,
hence bumping one version back.
---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index a1c588e7b0..d04761cdcf 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -242,7 +242,7 @@ import:
   subpackages:
   - go/vcs
 - package: google.golang.org/grpc
-  version: v1.0.5
+  version: v1.0.4
   subpackages:
   - codes
   - credentials

From 5d9134d2cba03cd2f63959667695436e9e71255b Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 10 Feb 2017 17:20:12 -0800
Subject: [PATCH 1060/1304] glide: vendor grpc/protobuf

---
 glide.lock                                    |   6 +-
 vendor/google.golang.org/grpc/call.go         |  60 +----
 vendor/google.golang.org/grpc/clientconn.go   |  13 -
 .../grpc/metadata/metadata.go                 |   2 -
 vendor/google.golang.org/grpc/rpc_util.go     |  32 +--
 vendor/google.golang.org/grpc/server.go       | 153 +++---------
 .../google.golang.org/grpc/stats/handlers.go  | 152 ------------
 vendor/google.golang.org/grpc/stats/stats.go  | 223 ------------------
 vendor/google.golang.org/grpc/stream.go       |  94 +-------
 vendor/google.golang.org/grpc/tap/tap.go      |  54 -----
 .../grpc/transport/control.go                 |  34 ++-
 .../grpc/transport/handler_server.go          |   2 +-
 .../grpc/transport/http2_client.go            |  94 ++------
 .../grpc/transport/http2_server.go            |  87 ++-----
 .../grpc/transport/transport.go               |  27 +--
 15 files changed, 123 insertions(+), 910 deletions(-)
 delete mode 100644 vendor/google.golang.org/grpc/stats/handlers.go
 delete mode 100644 vendor/google.golang.org/grpc/stats/stats.go
 delete mode 100644 vendor/google.golang.org/grpc/tap/tap.go

diff --git a/glide.lock b/glide.lock
index 21c8135dde..0dff9168f9 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: bb1e09a77900796205fe212186f97cdb3fea30edb8161fc27d1eec71b236472e
-updated: 2017-02-09T13:51:00.832051936-08:00
+hash: 62bf475671ecbac0d0d8350a9e8e3aad3c29253fdb3728b8b4cd09ae262e5fa8
+updated: 2017-02-10T17:19:45.543064389-08:00
 imports:
 - name: github.com/appc/docker2aci
   version: cfd196b05e02185b34aa3a844eff07b943c7e3ec
@@ -286,7 +286,7 @@ imports:
   subpackages:
   - go/vcs
 - name: google.golang.org/grpc
-  version: 708a7f9f3283aa2d4f6132d287d78683babe55c8
+  version: 777daa17ff9b5daef1cfdf915088a2ada3332bf0
   subpackages:
   - codes
   - credentials
diff --git a/vendor/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go
index fc8e18afc2..772c817edd 100644
--- a/vendor/google.golang.org/grpc/call.go
+++ b/vendor/google.golang.org/grpc/call.go
@@ -42,7 +42,6 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/transport"
 )
 
@@ -50,8 +49,7 @@ import (
 // On error, it returns the error and indicates whether the call should be retried.
 //
 // TODO(zhaoq): Check whether the received message sequence is valid.
-// TODO ctx is used for stats collection and processing. It is the context passed from the application.
-func recvResponse(ctx context.Context, dopts dialOptions, t transport.ClientTransport, c *callInfo, stream *transport.Stream, reply interface{}) (err error) {
+func recvResponse(dopts dialOptions, t transport.ClientTransport, c *callInfo, stream *transport.Stream, reply interface{}) (err error) {
 	// Try to acquire header metadata from the server if there is any.
 	defer func() {
 		if err != nil {
@@ -65,25 +63,14 @@ func recvResponse(ctx context.Context, dopts dialOptions, t transport.ClientTran
 		return
 	}
 	p := &parser{r: stream}
-	var inPayload *stats.InPayload
-	if stats.On() {
-		inPayload = &stats.InPayload{
-			Client: true,
-		}
-	}
 	for {
-		if err = recv(p, dopts.codec, stream, dopts.dc, reply, math.MaxInt32, inPayload); err != nil {
+		if err = recv(p, dopts.codec, stream, dopts.dc, reply, math.MaxInt32); err != nil {
 			if err == io.EOF {
 				break
 			}
 			return
 		}
 	}
-	if inPayload != nil && err == io.EOF && stream.StatusCode() == codes.OK {
-		// TODO in the current implementation, inTrailer may be handled before inPayload in some cases.
-		// Fix the order if necessary.
-		stats.HandleRPC(ctx, inPayload)
-	}
 	c.trailerMD = stream.Trailer()
 	return nil
 }
@@ -102,27 +89,15 @@ func sendRequest(ctx context.Context, codec Codec, compressor Compressor, callHd
 			}
 		}
 	}()
-	var (
-		cbuf       *bytes.Buffer
-		outPayload *stats.OutPayload
-	)
+	var cbuf *bytes.Buffer
 	if compressor != nil {
 		cbuf = new(bytes.Buffer)
 	}
-	if stats.On() {
-		outPayload = &stats.OutPayload{
-			Client: true,
-		}
-	}
-	outBuf, err := encode(codec, args, compressor, cbuf, outPayload)
+	outBuf, err := encode(codec, args, compressor, cbuf)
 	if err != nil {
 		return nil, Errorf(codes.Internal, "grpc: %v", err)
 	}
 	err = t.Write(stream, outBuf, opts)
-	if err == nil && outPayload != nil {
-		outPayload.SentTime = time.Now()
-		stats.HandleRPC(ctx, outPayload)
-	}
 	// t.NewStream(...) could lead to an early rejection of the RPC (e.g., the service/method
 	// does not exist.) so that t.Write could get io.EOF from wait(...). Leave the following
 	// recvResponse to get the final status.
@@ -143,7 +118,7 @@ func Invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 	return invoke(ctx, method, args, reply, cc, opts...)
 }
 
-func invoke(ctx context.Context, method string, args, reply interface{}, cc *ClientConn, opts ...CallOption) (e error) {
+func invoke(ctx context.Context, method string, args, reply interface{}, cc *ClientConn, opts ...CallOption) (err error) {
 	c := defaultCallInfo
 	for _, o := range opts {
 		if err := o.before(&c); err != nil {
@@ -165,31 +140,12 @@ func invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 		c.traceInfo.tr.LazyLog(&c.traceInfo.firstLine, false)
 		// TODO(dsymonds): Arrange for c.traceInfo.firstLine.remoteAddr to be set.
 		defer func() {
-			if e != nil {
-				c.traceInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{e}}, true)
+			if err != nil {
+				c.traceInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
 				c.traceInfo.tr.SetError()
 			}
 		}()
 	}
-	if stats.On() {
-		ctx = stats.TagRPC(ctx, &stats.RPCTagInfo{FullMethodName: method})
-		begin := &stats.Begin{
-			Client:    true,
-			BeginTime: time.Now(),
-			FailFast:  c.failFast,
-		}
-		stats.HandleRPC(ctx, begin)
-	}
-	defer func() {
-		if stats.On() {
-			end := &stats.End{
-				Client:  true,
-				EndTime: time.Now(),
-				Error:   e,
-			}
-			stats.HandleRPC(ctx, end)
-		}
-	}()
 	topts := &transport.Options{
 		Last:  true,
 		Delay: false,
@@ -249,7 +205,7 @@ func invoke(ctx context.Context, method string, args, reply interface{}, cc *Cli
 			}
 			return toRPCErr(err)
 		}
-		err = recvResponse(ctx, cc.dopts, t, &c, stream, reply)
+		err = recvResponse(cc.dopts, t, &c, stream, reply)
 		if err != nil {
 			if put != nil {
 				put()
diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go
index f6dab4b772..61674729a7 100644
--- a/vendor/google.golang.org/grpc/clientconn.go
+++ b/vendor/google.golang.org/grpc/clientconn.go
@@ -199,8 +199,6 @@ func WithTimeout(d time.Duration) DialOption {
 }
 
 // WithDialer returns a DialOption that specifies a function to use for dialing network addresses.
-// If FailOnNonTempDialError() is set to true, and an error is returned by f, gRPC checks the error's
-// Temporary() method to decide if it should try to reconnect to the network address.
 func WithDialer(f func(string, time.Duration) (net.Conn, error)) DialOption {
 	return func(o *dialOptions) {
 		o.copts.Dialer = func(ctx context.Context, addr string) (net.Conn, error) {
@@ -212,17 +210,6 @@ func WithDialer(f func(string, time.Duration) (net.Conn, error)) DialOption {
 	}
 }
 
-// FailOnNonTempDialError returns a DialOption that specified if gRPC fails on non-temporary dial errors.
-// If f is true, and dialer returns a non-temporary error, gRPC will fail the connection to the network
-// address and won't try to reconnect.
-// The default value of FailOnNonTempDialError is false.
-// This is an EXPERIMENTAL API.
-func FailOnNonTempDialError(f bool) DialOption {
-	return func(o *dialOptions) {
-		o.copts.FailOnNonTempDialError = f
-	}
-}
-
 // WithUserAgent returns a DialOption that specifies a user agent string for all the RPCs.
 func WithUserAgent(s string) DialOption {
 	return func(o *dialOptions) {
diff --git a/vendor/google.golang.org/grpc/metadata/metadata.go b/vendor/google.golang.org/grpc/metadata/metadata.go
index 65dc5af57d..3c0ca7a36c 100644
--- a/vendor/google.golang.org/grpc/metadata/metadata.go
+++ b/vendor/google.golang.org/grpc/metadata/metadata.go
@@ -141,8 +141,6 @@ func NewContext(ctx context.Context, md MD) context.Context {
 }
 
 // FromContext returns the MD in ctx if it exists.
-// The returned md should be immutable, writing to it may cause races.
-// Modification should be made to the copies of the returned md.
 func FromContext(ctx context.Context) (md MD, ok bool) {
 	md, ok = ctx.Value(mdKey{}).(MD)
 	return
diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go
index 66d08b5aa2..a25eaa8a28 100644
--- a/vendor/google.golang.org/grpc/rpc_util.go
+++ b/vendor/google.golang.org/grpc/rpc_util.go
@@ -42,13 +42,11 @@ import (
 	"io/ioutil"
 	"math"
 	"os"
-	"time"
 
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/transport"
 )
 
@@ -257,11 +255,9 @@ func (p *parser) recvMsg(maxMsgSize int) (pf payloadFormat, msg []byte, err erro
 
 // encode serializes msg and prepends the message header. If msg is nil, it
 // generates the message header of 0 message length.
-func encode(c Codec, msg interface{}, cp Compressor, cbuf *bytes.Buffer, outPayload *stats.OutPayload) ([]byte, error) {
-	var (
-		b      []byte
-		length uint
-	)
+func encode(c Codec, msg interface{}, cp Compressor, cbuf *bytes.Buffer) ([]byte, error) {
+	var b []byte
+	var length uint
 	if msg != nil {
 		var err error
 		// TODO(zhaoq): optimize to reduce memory alloc and copying.
@@ -269,12 +265,6 @@ func encode(c Codec, msg interface{}, cp Compressor, cbuf *bytes.Buffer, outPayl
 		if err != nil {
 			return nil, err
 		}
-		if outPayload != nil {
-			outPayload.Payload = msg
-			// TODO truncate large payload.
-			outPayload.Data = b
-			outPayload.Length = len(b)
-		}
 		if cp != nil {
 			if err := cp.Do(cbuf, b); err != nil {
 				return nil, err
@@ -305,10 +295,6 @@ func encode(c Codec, msg interface{}, cp Compressor, cbuf *bytes.Buffer, outPayl
 	// Copy encoded msg to buf
 	copy(buf[5:], b)
 
-	if outPayload != nil {
-		outPayload.WireLength = len(buf)
-	}
-
 	return buf, nil
 }
 
@@ -325,14 +311,11 @@ func checkRecvPayload(pf payloadFormat, recvCompress string, dc Decompressor) er
 	return nil
 }
 
-func recv(p *parser, c Codec, s *transport.Stream, dc Decompressor, m interface{}, maxMsgSize int, inPayload *stats.InPayload) error {
+func recv(p *parser, c Codec, s *transport.Stream, dc Decompressor, m interface{}, maxMsgSize int) error {
 	pf, d, err := p.recvMsg(maxMsgSize)
 	if err != nil {
 		return err
 	}
-	if inPayload != nil {
-		inPayload.WireLength = len(d)
-	}
 	if err := checkRecvPayload(pf, s.RecvCompress(), dc); err != nil {
 		return err
 	}
@@ -350,13 +333,6 @@ func recv(p *parser, c Codec, s *transport.Stream, dc Decompressor, m interface{
 	if err := c.Unmarshal(d, m); err != nil {
 		return Errorf(codes.Internal, "grpc: failed to unmarshal the received message %v", err)
 	}
-	if inPayload != nil {
-		inPayload.RecvTime = time.Now()
-		inPayload.Payload = m
-		// TODO truncate large payload.
-		inPayload.Data = d
-		inPayload.Length = len(d)
-	}
 	return nil
 }
 
diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go
index 22aa33bfe4..e0bb187ef9 100644
--- a/vendor/google.golang.org/grpc/server.go
+++ b/vendor/google.golang.org/grpc/server.go
@@ -54,8 +54,6 @@ import (
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/internal"
 	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/stats"
-	"google.golang.org/grpc/tap"
 	"google.golang.org/grpc/transport"
 )
 
@@ -112,7 +110,6 @@ type options struct {
 	maxMsgSize           int
 	unaryInt             UnaryServerInterceptor
 	streamInt            StreamServerInterceptor
-	inTapHandle          tap.ServerInHandle
 	maxConcurrentStreams uint32
 	useHandlerImpl       bool // use http.Handler-based server
 }
@@ -189,17 +186,6 @@ func StreamInterceptor(i StreamServerInterceptor) ServerOption {
 	}
 }
 
-// InTapHandle returns a ServerOption that sets the tap handle for all the server
-// transport to be created. Only one can be installed.
-func InTapHandle(h tap.ServerInHandle) ServerOption {
-	return func(o *options) {
-		if o.inTapHandle != nil {
-			panic("The tap handle has been set.")
-		}
-		o.inTapHandle = h
-	}
-}
-
 // NewServer creates a gRPC server which has no service registered and has not
 // started to accept requests yet.
 func NewServer(opt ...ServerOption) *Server {
@@ -426,22 +412,17 @@ func (s *Server) handleRawConn(rawConn net.Conn) {
 	if s.opts.useHandlerImpl {
 		s.serveUsingHandler(conn)
 	} else {
-		s.serveHTTP2Transport(conn, authInfo)
+		s.serveNewHTTP2Transport(conn, authInfo)
 	}
 }
 
-// serveHTTP2Transport sets up a http/2 transport (using the
+// serveNewHTTP2Transport sets up a new http/2 transport (using the
 // gRPC http2 server transport in transport/http2_server.go) and
 // serves streams on it.
 // This is run in its own goroutine (it does network I/O in
 // transport.NewServerTransport).
-func (s *Server) serveHTTP2Transport(c net.Conn, authInfo credentials.AuthInfo) {
-	config := &transport.ServerConfig{
-		MaxStreams:  s.opts.maxConcurrentStreams,
-		AuthInfo:    authInfo,
-		InTapHandle: s.opts.inTapHandle,
-	}
-	st, err := transport.NewServerTransport("http2", c, config)
+func (s *Server) serveNewHTTP2Transport(c net.Conn, authInfo credentials.AuthInfo) {
+	st, err := transport.NewServerTransport("http2", c, s.opts.maxConcurrentStreams, authInfo)
 	if err != nil {
 		s.mu.Lock()
 		s.errorf("NewServerTransport(%q) failed: %v", c.RemoteAddr(), err)
@@ -467,12 +448,6 @@ func (s *Server) serveStreams(st transport.ServerTransport) {
 			defer wg.Done()
 			s.handleStream(st, stream, s.traceInfo(st, stream))
 		}()
-	}, func(ctx context.Context, method string) context.Context {
-		if !EnableTracing {
-			return ctx
-		}
-		tr := trace.New("grpc.Recv."+methodFamily(method), method)
-		return trace.NewContext(ctx, tr)
 	})
 	wg.Wait()
 }
@@ -522,17 +497,15 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 // traceInfo returns a traceInfo and associates it with stream, if tracing is enabled.
 // If tracing is not enabled, it returns nil.
 func (s *Server) traceInfo(st transport.ServerTransport, stream *transport.Stream) (trInfo *traceInfo) {
-	tr, ok := trace.FromContext(stream.Context())
-	if !ok {
+	if !EnableTracing {
 		return nil
 	}
-
 	trInfo = &traceInfo{
-		tr: tr,
+		tr: trace.New("grpc.Recv."+methodFamily(stream.Method()), stream.Method()),
 	}
 	trInfo.firstLine.client = false
 	trInfo.firstLine.remoteAddr = st.RemoteAddr()
-
+	stream.TraceContext(trInfo.tr)
 	if dl, ok := stream.Context().Deadline(); ok {
 		trInfo.firstLine.deadline = dl.Sub(time.Now())
 	}
@@ -559,17 +532,11 @@ func (s *Server) removeConn(c io.Closer) {
 }
 
 func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Stream, msg interface{}, cp Compressor, opts *transport.Options) error {
-	var (
-		cbuf       *bytes.Buffer
-		outPayload *stats.OutPayload
-	)
+	var cbuf *bytes.Buffer
 	if cp != nil {
 		cbuf = new(bytes.Buffer)
 	}
-	if stats.On() {
-		outPayload = &stats.OutPayload{}
-	}
-	p, err := encode(s.opts.codec, msg, cp, cbuf, outPayload)
+	p, err := encode(s.opts.codec, msg, cp, cbuf)
 	if err != nil {
 		// This typically indicates a fatal issue (e.g., memory
 		// corruption or hardware faults) the application program
@@ -580,32 +547,10 @@ func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Str
 		// the optimal option.
 		grpclog.Fatalf("grpc: Server failed to encode response %v", err)
 	}
-	err = t.Write(stream, p, opts)
-	if err == nil && outPayload != nil {
-		outPayload.SentTime = time.Now()
-		stats.HandleRPC(stream.Context(), outPayload)
-	}
-	return err
+	return t.Write(stream, p, opts)
 }
 
 func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, md *MethodDesc, trInfo *traceInfo) (err error) {
-	if stats.On() {
-		begin := &stats.Begin{
-			BeginTime: time.Now(),
-		}
-		stats.HandleRPC(stream.Context(), begin)
-	}
-	defer func() {
-		if stats.On() {
-			end := &stats.End{
-				EndTime: time.Now(),
-			}
-			if err != nil && err != io.EOF {
-				end.Error = toRPCErr(err)
-			}
-			stats.HandleRPC(stream.Context(), end)
-		}
-	}()
 	if trInfo != nil {
 		defer trInfo.tr.Finish()
 		trInfo.firstLine.client = false
@@ -634,14 +579,14 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 		if err != nil {
 			switch err := err.(type) {
 			case *rpcError:
-				if e := t.WriteStatus(stream, err.code, err.desc); e != nil {
-					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", e)
+				if err := t.WriteStatus(stream, err.code, err.desc); err != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
 				}
 			case transport.ConnectionError:
 				// Nothing to do here.
 			case transport.StreamError:
-				if e := t.WriteStatus(stream, err.Code, err.Desc); e != nil {
-					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", e)
+				if err := t.WriteStatus(stream, err.Code, err.Desc); err != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
 				}
 			default:
 				panic(fmt.Sprintf("grpc: Unexpected error (%T) from recvMsg: %v", err, err))
@@ -652,29 +597,20 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 		if err := checkRecvPayload(pf, stream.RecvCompress(), s.opts.dc); err != nil {
 			switch err := err.(type) {
 			case *rpcError:
-				if e := t.WriteStatus(stream, err.code, err.desc); e != nil {
-					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", e)
+				if err := t.WriteStatus(stream, err.code, err.desc); err != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
 				}
-				return err
 			default:
-				if e := t.WriteStatus(stream, codes.Internal, err.Error()); e != nil {
-					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", e)
+				if err := t.WriteStatus(stream, codes.Internal, err.Error()); err != nil {
+					grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
 				}
-				// TODO checkRecvPayload always return RPC error. Add a return here if necessary.
-			}
-		}
-		var inPayload *stats.InPayload
-		if stats.On() {
-			inPayload = &stats.InPayload{
-				RecvTime: time.Now(),
+
 			}
+			return err
 		}
 		statusCode := codes.OK
 		statusDesc := ""
 		df := func(v interface{}) error {
-			if inPayload != nil {
-				inPayload.WireLength = len(req)
-			}
 			if pf == compressionMade {
 				var err error
 				req, err = s.opts.dc.Do(bytes.NewReader(req))
@@ -682,7 +618,7 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 					if err := t.WriteStatus(stream, codes.Internal, err.Error()); err != nil {
 						grpclog.Printf("grpc: Server.processUnaryRPC failed to write status %v", err)
 					}
-					return Errorf(codes.Internal, err.Error())
+					return err
 				}
 			}
 			if len(req) > s.opts.maxMsgSize {
@@ -694,12 +630,6 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 			if err := s.opts.codec.Unmarshal(req, v); err != nil {
 				return err
 			}
-			if inPayload != nil {
-				inPayload.Payload = v
-				inPayload.Data = req
-				inPayload.Length = len(req)
-				stats.HandleRPC(stream.Context(), inPayload)
-			}
 			if trInfo != nil {
 				trInfo.tr.LazyLog(&payload{sent: false, msg: v}, true)
 			}
@@ -720,8 +650,9 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 			}
 			if err := t.WriteStatus(stream, statusCode, statusDesc); err != nil {
 				grpclog.Printf("grpc: Server.processUnaryRPC failed to write status: %v", err)
+				return err
 			}
-			return Errorf(statusCode, statusDesc)
+			return nil
 		}
 		if trInfo != nil {
 			trInfo.tr.LazyLog(stringer("OK"), false)
@@ -746,32 +677,11 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 		if trInfo != nil {
 			trInfo.tr.LazyLog(&payload{sent: true, msg: reply}, true)
 		}
-		errWrite := t.WriteStatus(stream, statusCode, statusDesc)
-		if statusCode != codes.OK {
-			return Errorf(statusCode, statusDesc)
-		}
-		return errWrite
+		return t.WriteStatus(stream, statusCode, statusDesc)
 	}
 }
 
 func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transport.Stream, srv *service, sd *StreamDesc, trInfo *traceInfo) (err error) {
-	if stats.On() {
-		begin := &stats.Begin{
-			BeginTime: time.Now(),
-		}
-		stats.HandleRPC(stream.Context(), begin)
-	}
-	defer func() {
-		if stats.On() {
-			end := &stats.End{
-				EndTime: time.Now(),
-			}
-			if err != nil && err != io.EOF {
-				end.Error = toRPCErr(err)
-			}
-			stats.HandleRPC(stream.Context(), end)
-		}
-	}()
 	if s.opts.cp != nil {
 		stream.SetSendCompress(s.opts.cp.Type())
 	}
@@ -834,11 +744,7 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
 		}
 		ss.mu.Unlock()
 	}
-	errWrite := t.WriteStatus(ss.s, ss.statusCode, ss.statusDesc)
-	if ss.statusCode != codes.OK {
-		return Errorf(ss.statusCode, ss.statusDesc)
-	}
-	return errWrite
+	return t.WriteStatus(ss.s, ss.statusCode, ss.statusDesc)
 
 }
 
@@ -853,8 +759,7 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str
 			trInfo.tr.LazyLog(&fmtStringer{"Malformed method name %q", []interface{}{sm}}, true)
 			trInfo.tr.SetError()
 		}
-		errDesc := fmt.Sprintf("malformed method name: %q", stream.Method())
-		if err := t.WriteStatus(stream, codes.InvalidArgument, errDesc); err != nil {
+		if err := t.WriteStatus(stream, codes.InvalidArgument, fmt.Sprintf("malformed method name: %q", stream.Method())); err != nil {
 			if trInfo != nil {
 				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
 				trInfo.tr.SetError()
@@ -874,8 +779,7 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str
 			trInfo.tr.LazyLog(&fmtStringer{"Unknown service %v", []interface{}{service}}, true)
 			trInfo.tr.SetError()
 		}
-		errDesc := fmt.Sprintf("unknown service %v", service)
-		if err := t.WriteStatus(stream, codes.Unimplemented, errDesc); err != nil {
+		if err := t.WriteStatus(stream, codes.Unimplemented, fmt.Sprintf("unknown service %v", service)); err != nil {
 			if trInfo != nil {
 				trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
 				trInfo.tr.SetError()
@@ -900,8 +804,7 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str
 		trInfo.tr.LazyLog(&fmtStringer{"Unknown method %v", []interface{}{method}}, true)
 		trInfo.tr.SetError()
 	}
-	errDesc := fmt.Sprintf("unknown method %v", method)
-	if err := t.WriteStatus(stream, codes.Unimplemented, errDesc); err != nil {
+	if err := t.WriteStatus(stream, codes.Unimplemented, fmt.Sprintf("unknown method %v", method)); err != nil {
 		if trInfo != nil {
 			trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true)
 			trInfo.tr.SetError()
diff --git a/vendor/google.golang.org/grpc/stats/handlers.go b/vendor/google.golang.org/grpc/stats/handlers.go
deleted file mode 100644
index d41c524421..0000000000
--- a/vendor/google.golang.org/grpc/stats/handlers.go
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *
- * Copyright 2016, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package stats
-
-import (
-	"net"
-	"sync/atomic"
-
-	"golang.org/x/net/context"
-	"google.golang.org/grpc/grpclog"
-)
-
-// ConnTagInfo defines the relevant information needed by connection context tagger.
-type ConnTagInfo struct {
-	// RemoteAddr is the remote address of the corresponding connection.
-	RemoteAddr net.Addr
-	// LocalAddr is the local address of the corresponding connection.
-	LocalAddr net.Addr
-	// TODO add QOS related fields.
-}
-
-// RPCTagInfo defines the relevant information needed by RPC context tagger.
-type RPCTagInfo struct {
-	// FullMethodName is the RPC method in the format of /package.service/method.
-	FullMethodName string
-}
-
-var (
-	on          = new(int32)
-	rpcHandler  func(context.Context, RPCStats)
-	connHandler func(context.Context, ConnStats)
-	connTagger  func(context.Context, *ConnTagInfo) context.Context
-	rpcTagger   func(context.Context, *RPCTagInfo) context.Context
-)
-
-// HandleRPC processes the RPC stats using the rpc handler registered by the user.
-func HandleRPC(ctx context.Context, s RPCStats) {
-	if rpcHandler == nil {
-		return
-	}
-	rpcHandler(ctx, s)
-}
-
-// RegisterRPCHandler registers the user handler function for RPC stats processing.
-// It should be called only once. The later call will overwrite the former value if it is called multiple times.
-// This handler function will be called to process the rpc stats.
-func RegisterRPCHandler(f func(context.Context, RPCStats)) {
-	rpcHandler = f
-}
-
-// HandleConn processes the stats using the call back function registered by user.
-func HandleConn(ctx context.Context, s ConnStats) {
-	if connHandler == nil {
-		return
-	}
-	connHandler(ctx, s)
-}
-
-// RegisterConnHandler registers the user handler function for conn stats.
-// It should be called only once. The later call will overwrite the former value if it is called multiple times.
-// This handler function will be called to process the conn stats.
-func RegisterConnHandler(f func(context.Context, ConnStats)) {
-	connHandler = f
-}
-
-// TagConn calls user registered connection context tagger.
-func TagConn(ctx context.Context, info *ConnTagInfo) context.Context {
-	if connTagger == nil {
-		return ctx
-	}
-	return connTagger(ctx, info)
-}
-
-// RegisterConnTagger registers the user connection context tagger function.
-// The connection context tagger can attach some information to the given context.
-// The returned context will be used for stats handling.
-// For conn stats handling, the context used in connHandler for this
-// connection will be derived from the context returned.
-// For RPC stats handling,
-//  - On server side, the context used in rpcHandler for all RPCs on this
-// connection will be derived from the context returned.
-//  - On client side, the context is not derived from the context returned.
-func RegisterConnTagger(t func(context.Context, *ConnTagInfo) context.Context) {
-	connTagger = t
-}
-
-// TagRPC calls the user registered RPC context tagger.
-func TagRPC(ctx context.Context, info *RPCTagInfo) context.Context {
-	if rpcTagger == nil {
-		return ctx
-	}
-	return rpcTagger(ctx, info)
-}
-
-// RegisterRPCTagger registers the user RPC context tagger function.
-// The RPC context tagger can attach some information to the given context.
-// The context used in stats rpcHandler for this RPC will be derived from the
-// context returned.
-func RegisterRPCTagger(t func(context.Context, *RPCTagInfo) context.Context) {
-	rpcTagger = t
-}
-
-// Start starts the stats collection and processing if there is a registered stats handle.
-func Start() {
-	if rpcHandler == nil && connHandler == nil {
-		grpclog.Println("rpcHandler and connHandler are both nil when starting stats. Stats is not started")
-		return
-	}
-	atomic.StoreInt32(on, 1)
-}
-
-// Stop stops the stats collection and processing.
-// Stop does not unregister the handlers.
-func Stop() {
-	atomic.StoreInt32(on, 0)
-}
-
-// On indicates whether the stats collection and processing is on.
-func On() bool {
-	return atomic.CompareAndSwapInt32(on, 1, 1)
-}
diff --git a/vendor/google.golang.org/grpc/stats/stats.go b/vendor/google.golang.org/grpc/stats/stats.go
deleted file mode 100644
index a82448a68b..0000000000
--- a/vendor/google.golang.org/grpc/stats/stats.go
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- *
- * Copyright 2016, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-// Package stats is for collecting and reporting various network and RPC stats.
-// This package is for monitoring purpose only. All fields are read-only.
-// All APIs are experimental.
-package stats // import "google.golang.org/grpc/stats"
-
-import (
-	"net"
-	"time"
-)
-
-// RPCStats contains stats information about RPCs.
-type RPCStats interface {
-	isRPCStats()
-	// IsClient returns true if this RPCStats is from client side.
-	IsClient() bool
-}
-
-// Begin contains stats when an RPC begins.
-// FailFast are only valid if Client is true.
-type Begin struct {
-	// Client is true if this Begin is from client side.
-	Client bool
-	// BeginTime is the time when the RPC begins.
-	BeginTime time.Time
-	// FailFast indicates if this RPC is failfast.
-	FailFast bool
-}
-
-// IsClient indicates if this is from client side.
-func (s *Begin) IsClient() bool { return s.Client }
-
-func (s *Begin) isRPCStats() {}
-
-// InPayload contains the information for an incoming payload.
-type InPayload struct {
-	// Client is true if this InPayload is from client side.
-	Client bool
-	// Payload is the payload with original type.
-	Payload interface{}
-	// Data is the serialized message payload.
-	Data []byte
-	// Length is the length of uncompressed data.
-	Length int
-	// WireLength is the length of data on wire (compressed, signed, encrypted).
-	WireLength int
-	// RecvTime is the time when the payload is received.
-	RecvTime time.Time
-}
-
-// IsClient indicates if this is from client side.
-func (s *InPayload) IsClient() bool { return s.Client }
-
-func (s *InPayload) isRPCStats() {}
-
-// InHeader contains stats when a header is received.
-// FullMethod, addresses and Compression are only valid if Client is false.
-type InHeader struct {
-	// Client is true if this InHeader is from client side.
-	Client bool
-	// WireLength is the wire length of header.
-	WireLength int
-
-	// FullMethod is the full RPC method string, i.e., /package.service/method.
-	FullMethod string
-	// RemoteAddr is the remote address of the corresponding connection.
-	RemoteAddr net.Addr
-	// LocalAddr is the local address of the corresponding connection.
-	LocalAddr net.Addr
-	// Compression is the compression algorithm used for the RPC.
-	Compression string
-}
-
-// IsClient indicates if this is from client side.
-func (s *InHeader) IsClient() bool { return s.Client }
-
-func (s *InHeader) isRPCStats() {}
-
-// InTrailer contains stats when a trailer is received.
-type InTrailer struct {
-	// Client is true if this InTrailer is from client side.
-	Client bool
-	// WireLength is the wire length of trailer.
-	WireLength int
-}
-
-// IsClient indicates if this is from client side.
-func (s *InTrailer) IsClient() bool { return s.Client }
-
-func (s *InTrailer) isRPCStats() {}
-
-// OutPayload contains the information for an outgoing payload.
-type OutPayload struct {
-	// Client is true if this OutPayload is from client side.
-	Client bool
-	// Payload is the payload with original type.
-	Payload interface{}
-	// Data is the serialized message payload.
-	Data []byte
-	// Length is the length of uncompressed data.
-	Length int
-	// WireLength is the length of data on wire (compressed, signed, encrypted).
-	WireLength int
-	// SentTime is the time when the payload is sent.
-	SentTime time.Time
-}
-
-// IsClient indicates if this is from client side.
-func (s *OutPayload) IsClient() bool { return s.Client }
-
-func (s *OutPayload) isRPCStats() {}
-
-// OutHeader contains stats when a header is sent.
-// FullMethod, addresses and Compression are only valid if Client is true.
-type OutHeader struct {
-	// Client is true if this OutHeader is from client side.
-	Client bool
-	// WireLength is the wire length of header.
-	WireLength int
-
-	// FullMethod is the full RPC method string, i.e., /package.service/method.
-	FullMethod string
-	// RemoteAddr is the remote address of the corresponding connection.
-	RemoteAddr net.Addr
-	// LocalAddr is the local address of the corresponding connection.
-	LocalAddr net.Addr
-	// Compression is the compression algorithm used for the RPC.
-	Compression string
-}
-
-// IsClient indicates if this is from client side.
-func (s *OutHeader) IsClient() bool { return s.Client }
-
-func (s *OutHeader) isRPCStats() {}
-
-// OutTrailer contains stats when a trailer is sent.
-type OutTrailer struct {
-	// Client is true if this OutTrailer is from client side.
-	Client bool
-	// WireLength is the wire length of trailer.
-	WireLength int
-}
-
-// IsClient indicates if this is from client side.
-func (s *OutTrailer) IsClient() bool { return s.Client }
-
-func (s *OutTrailer) isRPCStats() {}
-
-// End contains stats when an RPC ends.
-type End struct {
-	// Client is true if this End is from client side.
-	Client bool
-	// EndTime is the time when the RPC ends.
-	EndTime time.Time
-	// Error is the error just happened. Its type is gRPC error.
-	Error error
-}
-
-// IsClient indicates if this is from client side.
-func (s *End) IsClient() bool { return s.Client }
-
-func (s *End) isRPCStats() {}
-
-// ConnStats contains stats information about connections.
-type ConnStats interface {
-	isConnStats()
-	// IsClient returns true if this ConnStats is from client side.
-	IsClient() bool
-}
-
-// ConnBegin contains the stats of a connection when it is established.
-type ConnBegin struct {
-	// Client is true if this ConnBegin is from client side.
-	Client bool
-}
-
-// IsClient indicates if this is from client side.
-func (s *ConnBegin) IsClient() bool { return s.Client }
-
-func (s *ConnBegin) isConnStats() {}
-
-// ConnEnd contains the stats of a connection when it ends.
-type ConnEnd struct {
-	// Client is true if this ConnEnd is from client side.
-	Client bool
-}
-
-// IsClient indicates if this is from client side.
-func (s *ConnEnd) IsClient() bool { return s.Client }
-
-func (s *ConnEnd) isConnStats() {}
diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go
index 1bcd2183a8..46810544f1 100644
--- a/vendor/google.golang.org/grpc/stream.go
+++ b/vendor/google.golang.org/grpc/stream.go
@@ -45,7 +45,6 @@ import (
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/transport"
 )
 
@@ -98,7 +97,7 @@ type ClientStream interface {
 
 // NewClientStream creates a new Stream for the client side. This is called
 // by generated code.
-func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (_ ClientStream, err error) {
+func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error) {
 	if cc.dopts.streamInt != nil {
 		return cc.dopts.streamInt(ctx, desc, cc, method, newClientStream, opts...)
 	}
@@ -144,25 +143,6 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 			}
 		}()
 	}
-	if stats.On() {
-		ctx = stats.TagRPC(ctx, &stats.RPCTagInfo{FullMethodName: method})
-		begin := &stats.Begin{
-			Client:    true,
-			BeginTime: time.Now(),
-			FailFast:  c.failFast,
-		}
-		stats.HandleRPC(ctx, begin)
-	}
-	defer func() {
-		if err != nil && stats.On() {
-			// Only handle end stats if err != nil.
-			end := &stats.End{
-				Client: true,
-				Error:  err,
-			}
-			stats.HandleRPC(ctx, end)
-		}
-	}()
 	gopts := BalancerGetOptions{
 		BlockingWait: !c.failFast,
 	}
@@ -214,8 +194,6 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
 
 		tracing: EnableTracing,
 		trInfo:  trInfo,
-
-		statsCtx: ctx,
 	}
 	if cc.dopts.cp != nil {
 		cs.cbuf = new(bytes.Buffer)
@@ -268,11 +246,6 @@ type clientStream struct {
 	// trInfo.tr is set when the clientStream is created (if EnableTracing is true),
 	// and is set to nil when the clientStream's finish method is called.
 	trInfo traceInfo
-
-	// statsCtx keeps the user context for stats handling.
-	// All stats collection should use the statsCtx (instead of the stream context)
-	// so that all the generated stats for a particular RPC can be associated in the processing phase.
-	statsCtx context.Context
 }
 
 func (cs *clientStream) Context() context.Context {
@@ -301,8 +274,6 @@ func (cs *clientStream) SendMsg(m interface{}) (err error) {
 		}
 		cs.mu.Unlock()
 	}
-	// TODO Investigate how to signal the stats handling party.
-	// generate error stats if err != nil && err != io.EOF?
 	defer func() {
 		if err != nil {
 			cs.finish(err)
@@ -325,13 +296,7 @@ func (cs *clientStream) SendMsg(m interface{}) (err error) {
 		}
 		err = toRPCErr(err)
 	}()
-	var outPayload *stats.OutPayload
-	if stats.On() {
-		outPayload = &stats.OutPayload{
-			Client: true,
-		}
-	}
-	out, err := encode(cs.codec, m, cs.cp, cs.cbuf, outPayload)
+	out, err := encode(cs.codec, m, cs.cp, cs.cbuf)
 	defer func() {
 		if cs.cbuf != nil {
 			cs.cbuf.Reset()
@@ -340,37 +305,11 @@ func (cs *clientStream) SendMsg(m interface{}) (err error) {
 	if err != nil {
 		return Errorf(codes.Internal, "grpc: %v", err)
 	}
-	err = cs.t.Write(cs.s, out, &transport.Options{Last: false})
-	if err == nil && outPayload != nil {
-		outPayload.SentTime = time.Now()
-		stats.HandleRPC(cs.statsCtx, outPayload)
-	}
-	return err
+	return cs.t.Write(cs.s, out, &transport.Options{Last: false})
 }
 
 func (cs *clientStream) RecvMsg(m interface{}) (err error) {
-	defer func() {
-		if err != nil && stats.On() {
-			// Only generate End if err != nil.
-			// If err == nil, it's not the last RecvMsg.
-			// The last RecvMsg gets either an RPC error or io.EOF.
-			end := &stats.End{
-				Client:  true,
-				EndTime: time.Now(),
-			}
-			if err != io.EOF {
-				end.Error = toRPCErr(err)
-			}
-			stats.HandleRPC(cs.statsCtx, end)
-		}
-	}()
-	var inPayload *stats.InPayload
-	if stats.On() {
-		inPayload = &stats.InPayload{
-			Client: true,
-		}
-	}
-	err = recv(cs.p, cs.codec, cs.s, cs.dc, m, math.MaxInt32, inPayload)
+	err = recv(cs.p, cs.codec, cs.s, cs.dc, m, math.MaxInt32)
 	defer func() {
 		// err != nil indicates the termination of the stream.
 		if err != nil {
@@ -385,15 +324,11 @@ func (cs *clientStream) RecvMsg(m interface{}) (err error) {
 			}
 			cs.mu.Unlock()
 		}
-		if inPayload != nil {
-			stats.HandleRPC(cs.statsCtx, inPayload)
-		}
 		if !cs.desc.ClientStreams || cs.desc.ServerStreams {
 			return
 		}
 		// Special handling for client streaming rpc.
-		// This recv expects EOF or errors, so we don't collect inPayload.
-		err = recv(cs.p, cs.codec, cs.s, cs.dc, m, math.MaxInt32, nil)
+		err = recv(cs.p, cs.codec, cs.s, cs.dc, m, math.MaxInt32)
 		cs.closeTransportStream(err)
 		if err == nil {
 			return toRPCErr(errors.New("grpc: client streaming protocol violation: get <nil>, want <EOF>"))
@@ -547,11 +482,7 @@ func (ss *serverStream) SendMsg(m interface{}) (err error) {
 			ss.mu.Unlock()
 		}
 	}()
-	var outPayload *stats.OutPayload
-	if stats.On() {
-		outPayload = &stats.OutPayload{}
-	}
-	out, err := encode(ss.codec, m, ss.cp, ss.cbuf, outPayload)
+	out, err := encode(ss.codec, m, ss.cp, ss.cbuf)
 	defer func() {
 		if ss.cbuf != nil {
 			ss.cbuf.Reset()
@@ -564,10 +495,6 @@ func (ss *serverStream) SendMsg(m interface{}) (err error) {
 	if err := ss.t.Write(ss.s, out, &transport.Options{Last: false}); err != nil {
 		return toRPCErr(err)
 	}
-	if outPayload != nil {
-		outPayload.SentTime = time.Now()
-		stats.HandleRPC(ss.s.Context(), outPayload)
-	}
 	return nil
 }
 
@@ -586,11 +513,7 @@ func (ss *serverStream) RecvMsg(m interface{}) (err error) {
 			ss.mu.Unlock()
 		}
 	}()
-	var inPayload *stats.InPayload
-	if stats.On() {
-		inPayload = &stats.InPayload{}
-	}
-	if err := recv(ss.p, ss.codec, ss.s, ss.dc, m, ss.maxMsgSize, inPayload); err != nil {
+	if err := recv(ss.p, ss.codec, ss.s, ss.dc, m, ss.maxMsgSize); err != nil {
 		if err == io.EOF {
 			return err
 		}
@@ -599,8 +522,5 @@ func (ss *serverStream) RecvMsg(m interface{}) (err error) {
 		}
 		return toRPCErr(err)
 	}
-	if inPayload != nil {
-		stats.HandleRPC(ss.s.Context(), inPayload)
-	}
 	return nil
 }
diff --git a/vendor/google.golang.org/grpc/tap/tap.go b/vendor/google.golang.org/grpc/tap/tap.go
deleted file mode 100644
index 0f36647674..0000000000
--- a/vendor/google.golang.org/grpc/tap/tap.go
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * Copyright 2016, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-// Package tap defines the function handles which are executed on the transport
-// layer of gRPC-Go and related information. Everything here is EXPERIMENTAL.
-package tap
-
-import (
-	"golang.org/x/net/context"
-)
-
-// Info defines the relevant information needed by the handles.
-type Info struct {
-	// FullMethodName is the string of grpc method (in the format of
-	// /package.service/method).
-	FullMethodName string
-	// TODO: More to be added.
-}
-
-// ServerInHandle defines the function which runs when a new stream is created
-// on the server side. Note that it is executed in the per-connection I/O goroutine(s) instead
-// of per-RPC goroutine. Therefore, users should NOT have any blocking/time-consuming
-// work in this handle. Otherwise all the RPCs would slow down.
-type ServerInHandle func(ctx context.Context, info *Info) (context.Context, error)
diff --git a/vendor/google.golang.org/grpc/transport/control.go b/vendor/google.golang.org/grpc/transport/control.go
index 2586cba469..4ef0830b56 100644
--- a/vendor/google.golang.org/grpc/transport/control.go
+++ b/vendor/google.golang.org/grpc/transport/control.go
@@ -111,9 +111,35 @@ func newQuotaPool(q int) *quotaPool {
 	return qb
 }
 
-// add cancels the pending quota sent on acquired, incremented by v and sends
+// add adds n to the available quota and tries to send it on acquire.
+func (qb *quotaPool) add(n int) {
+	qb.mu.Lock()
+	defer qb.mu.Unlock()
+	qb.quota += n
+	if qb.quota <= 0 {
+		return
+	}
+	select {
+	case qb.c <- qb.quota:
+		qb.quota = 0
+	default:
+	}
+}
+
+// cancel cancels the pending quota sent on acquire, if any.
+func (qb *quotaPool) cancel() {
+	qb.mu.Lock()
+	defer qb.mu.Unlock()
+	select {
+	case n := <-qb.c:
+		qb.quota += n
+	default:
+	}
+}
+
+// reset cancels the pending quota sent on acquired, incremented by v and sends
 // it back on acquire.
-func (qb *quotaPool) add(v int) {
+func (qb *quotaPool) reset(v int) {
 	qb.mu.Lock()
 	defer qb.mu.Unlock()
 	select {
@@ -125,10 +151,6 @@ func (qb *quotaPool) add(v int) {
 	if qb.quota <= 0 {
 		return
 	}
-	// After the pool has been created, this is the only place that sends on
-	// the channel. Since mu is held at this point and any quota that was sent
-	// on the channel has been retrieved, we know that this code will always
-	// place any positive quota value on the channel.
 	select {
 	case qb.c <- qb.quota:
 		qb.quota = 0
diff --git a/vendor/google.golang.org/grpc/transport/handler_server.go b/vendor/google.golang.org/grpc/transport/handler_server.go
index 10b6dc0b19..114e34906a 100644
--- a/vendor/google.golang.org/grpc/transport/handler_server.go
+++ b/vendor/google.golang.org/grpc/transport/handler_server.go
@@ -268,7 +268,7 @@ func (ht *serverHandlerTransport) WriteHeader(s *Stream, md metadata.MD) error {
 	})
 }
 
-func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream), traceCtx func(context.Context, string) context.Context) {
+func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream)) {
 	// With this transport type there will be exactly 1 stream: this HTTP request.
 
 	var ctx context.Context
diff --git a/vendor/google.golang.org/grpc/transport/http2_client.go b/vendor/google.golang.org/grpc/transport/http2_client.go
index 3936b9cf9f..2b0f68016a 100644
--- a/vendor/google.golang.org/grpc/transport/http2_client.go
+++ b/vendor/google.golang.org/grpc/transport/http2_client.go
@@ -51,20 +51,16 @@ import (
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
-	"google.golang.org/grpc/stats"
 )
 
 // http2Client implements the ClientTransport interface with HTTP2.
 type http2Client struct {
-	ctx        context.Context
-	target     string // server name/addr
-	userAgent  string
-	md         interface{}
-	conn       net.Conn // underlying communication channel
-	remoteAddr net.Addr
-	localAddr  net.Addr
-	authInfo   credentials.AuthInfo // auth info about the connection
-	nextID     uint32               // the next stream ID to be used
+	target    string // server name/addr
+	userAgent string
+	md        interface{}
+	conn      net.Conn             // underlying communication channel
+	authInfo  credentials.AuthInfo // auth info about the connection
+	nextID    uint32               // the next stream ID to be used
 
 	// writableChan synchronizes write access to the transport.
 	// A writer acquires the write lock by sending a value on writableChan
@@ -154,9 +150,6 @@ func newHTTP2Client(ctx context.Context, addr TargetInfo, opts ConnectOptions) (
 	scheme := "http"
 	conn, err := dial(ctx, opts.Dialer, addr.Addr)
 	if err != nil {
-		if opts.FailOnNonTempDialError {
-			return nil, connectionErrorf(isTemporary(err), err, "transport: %v", err)
-		}
 		return nil, connectionErrorf(true, err, "transport: %v", err)
 	}
 	// Any further errors will close the underlying connection
@@ -182,14 +175,11 @@ func newHTTP2Client(ctx context.Context, addr TargetInfo, opts ConnectOptions) (
 	}
 	var buf bytes.Buffer
 	t := &http2Client{
-		ctx:        ctx,
-		target:     addr.Addr,
-		userAgent:  ua,
-		md:         addr.Metadata,
-		conn:       conn,
-		remoteAddr: conn.RemoteAddr(),
-		localAddr:  conn.LocalAddr(),
-		authInfo:   authInfo,
+		target:    addr.Addr,
+		userAgent: ua,
+		md:        addr.Metadata,
+		conn:      conn,
+		authInfo:  authInfo,
 		// The client initiated stream id is odd starting from 1.
 		nextID:          1,
 		writableChan:    make(chan int, 1),
@@ -244,16 +234,6 @@ func newHTTP2Client(ctx context.Context, addr TargetInfo, opts ConnectOptions) (
 	}
 	go t.controller()
 	t.writableChan <- 0
-	if stats.On() {
-		t.ctx = stats.TagConn(t.ctx, &stats.ConnTagInfo{
-			RemoteAddr: t.remoteAddr,
-			LocalAddr:  t.localAddr,
-		})
-		connBegin := &stats.ConnBegin{
-			Client: true,
-		}
-		stats.HandleConn(t.ctx, connBegin)
-	}
 	return t, nil
 }
 
@@ -290,13 +270,12 @@ func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream {
 // streams.
 func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Stream, err error) {
 	pr := &peer.Peer{
-		Addr: t.remoteAddr,
+		Addr: t.conn.RemoteAddr(),
 	}
 	// Attach Auth info if there is any.
 	if t.authInfo != nil {
 		pr.AuthInfo = t.authInfo
 	}
-	userCtx := ctx
 	ctx = peer.NewContext(ctx, pr)
 	authData := make(map[string]string)
 	for _, c := range t.creds {
@@ -368,7 +347,6 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		return nil, ErrConnClosing
 	}
 	s := t.newStream(ctx, callHdr)
-	s.clientStatsCtx = userCtx
 	t.activeStreams[s.id] = s
 
 	// This stream is not counted when applySetings(...) initialize t.streamsQuota.
@@ -379,7 +357,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 	}
 	t.mu.Unlock()
 	if reset {
-		t.streamsQuota.add(-1)
+		t.streamsQuota.reset(-1)
 	}
 
 	// HPACK encodes various headers. Note that once WriteField(...) is
@@ -435,7 +413,6 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		}
 	}
 	first := true
-	bufLen := t.hBuf.Len()
 	// Sends the headers in a single batch even when they span multiple frames.
 	for !endHeaders {
 		size := t.hBuf.Len()
@@ -470,17 +447,6 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 			return nil, connectionErrorf(true, err, "transport: %v", err)
 		}
 	}
-	if stats.On() {
-		outHeader := &stats.OutHeader{
-			Client:      true,
-			WireLength:  bufLen,
-			FullMethod:  callHdr.Method,
-			RemoteAddr:  t.remoteAddr,
-			LocalAddr:   t.localAddr,
-			Compression: callHdr.SendCompress,
-		}
-		stats.HandleRPC(s.clientStatsCtx, outHeader)
-	}
 	t.writableChan <- 0
 	return s, nil
 }
@@ -559,12 +525,6 @@ func (t *http2Client) Close() (err error) {
 		s.mu.Unlock()
 		s.write(recvMsg{err: ErrConnClosing})
 	}
-	if stats.On() {
-		connEnd := &stats.ConnEnd{
-			Client: true,
-		}
-		stats.HandleConn(t.ctx, connEnd)
-	}
 	return
 }
 
@@ -622,14 +582,19 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
 		var p []byte
 		if r.Len() > 0 {
 			size := http2MaxFrameLen
+			s.sendQuotaPool.add(0)
 			// Wait until the stream has some quota to send the data.
 			sq, err := wait(s.ctx, s.done, s.goAway, t.shutdownChan, s.sendQuotaPool.acquire())
 			if err != nil {
 				return err
 			}
+			t.sendQuotaPool.add(0)
 			// Wait until the transport has some quota to send the data.
 			tq, err := wait(s.ctx, s.done, s.goAway, t.shutdownChan, t.sendQuotaPool.acquire())
 			if err != nil {
+				if _, ok := err.(StreamError); ok || err == io.EOF {
+					t.sendQuotaPool.cancel()
+				}
 				return err
 			}
 			if sq < size {
@@ -909,24 +874,6 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
 	}
 
 	endStream := frame.StreamEnded()
-	var isHeader bool
-	defer func() {
-		if stats.On() {
-			if isHeader {
-				inHeader := &stats.InHeader{
-					Client:     true,
-					WireLength: int(frame.Header().Length),
-				}
-				stats.HandleRPC(s.clientStatsCtx, inHeader)
-			} else {
-				inTrailer := &stats.InTrailer{
-					Client:     true,
-					WireLength: int(frame.Header().Length),
-				}
-				stats.HandleRPC(s.clientStatsCtx, inTrailer)
-			}
-		}
-	}()
 
 	s.mu.Lock()
 	if !endStream {
@@ -938,7 +885,6 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
 		}
 		close(s.headerChan)
 		s.headerDone = true
-		isHeader = true
 	}
 	if !endStream || s.state == streamDone {
 		s.mu.Unlock()
@@ -1048,13 +994,13 @@ func (t *http2Client) applySettings(ss []http2.Setting) {
 			t.maxStreams = int(s.Val)
 			t.mu.Unlock()
 			if reset {
-				t.streamsQuota.add(int(s.Val) - ms)
+				t.streamsQuota.reset(int(s.Val) - ms)
 			}
 		case http2.SettingInitialWindowSize:
 			t.mu.Lock()
 			for _, stream := range t.activeStreams {
 				// Adjust the sending quota for each stream.
-				stream.sendQuotaPool.add(int(s.Val - t.streamSendQuota))
+				stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
 			}
 			t.streamSendQuota = s.Val
 			t.mu.Unlock()
diff --git a/vendor/google.golang.org/grpc/transport/http2_server.go b/vendor/google.golang.org/grpc/transport/http2_server.go
index 316188e7b7..a62fb7c228 100644
--- a/vendor/google.golang.org/grpc/transport/http2_server.go
+++ b/vendor/google.golang.org/grpc/transport/http2_server.go
@@ -50,8 +50,6 @@ import (
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
-	"google.golang.org/grpc/stats"
-	"google.golang.org/grpc/tap"
 )
 
 // ErrIllegalHeaderWrite indicates that setting header is illegal because of
@@ -60,13 +58,9 @@ var ErrIllegalHeaderWrite = errors.New("transport: the stream is done or WriteHe
 
 // http2Server implements the ServerTransport interface with HTTP2.
 type http2Server struct {
-	ctx         context.Context
 	conn        net.Conn
-	remoteAddr  net.Addr
-	localAddr   net.Addr
 	maxStreamID uint32               // max stream ID ever seen
 	authInfo    credentials.AuthInfo // auth info about the connection
-	inTapHandle tap.ServerInHandle
 	// writableChan synchronizes write access to the transport.
 	// A writer acquires the write lock by receiving a value on writableChan
 	// and releases it by sending on writableChan.
@@ -97,13 +91,12 @@ type http2Server struct {
 
 // newHTTP2Server constructs a ServerTransport based on HTTP2. ConnectionError is
 // returned if something goes wrong.
-func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err error) {
+func newHTTP2Server(conn net.Conn, maxStreams uint32, authInfo credentials.AuthInfo) (_ ServerTransport, err error) {
 	framer := newFramer(conn)
 	// Send initial settings as connection preface to client.
 	var settings []http2.Setting
 	// TODO(zhaoq): Have a better way to signal "no limit" because 0 is
 	// permitted in the HTTP2 spec.
-	maxStreams := config.MaxStreams
 	if maxStreams == 0 {
 		maxStreams = math.MaxUint32
 	} else {
@@ -128,16 +121,12 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err
 	}
 	var buf bytes.Buffer
 	t := &http2Server{
-		ctx:             context.Background(),
 		conn:            conn,
-		remoteAddr:      conn.RemoteAddr(),
-		localAddr:       conn.LocalAddr(),
-		authInfo:        config.AuthInfo,
+		authInfo:        authInfo,
 		framer:          framer,
 		hBuf:            &buf,
 		hEnc:            hpack.NewEncoder(&buf),
 		maxStreams:      maxStreams,
-		inTapHandle:     config.InTapHandle,
 		controlBuf:      newRecvBuffer(),
 		fc:              &inFlow{limit: initialConnWindowSize},
 		sendQuotaPool:   newQuotaPool(defaultWindowSize),
@@ -147,21 +136,13 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err
 		activeStreams:   make(map[uint32]*Stream),
 		streamSendQuota: defaultWindowSize,
 	}
-	if stats.On() {
-		t.ctx = stats.TagConn(t.ctx, &stats.ConnTagInfo{
-			RemoteAddr: t.remoteAddr,
-			LocalAddr:  t.localAddr,
-		})
-		connBegin := &stats.ConnBegin{}
-		stats.HandleConn(t.ctx, connBegin)
-	}
 	go t.controller()
 	t.writableChan <- 0
 	return t, nil
 }
 
 // operateHeader takes action on the decoded headers.
-func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(*Stream), traceCtx func(context.Context, string) context.Context) (close bool) {
+func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(*Stream)) (close bool) {
 	buf := newRecvBuffer()
 	s := &Stream{
 		id:  frame.Header().StreamID,
@@ -187,12 +168,12 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 	}
 	s.recvCompress = state.encoding
 	if state.timeoutSet {
-		s.ctx, s.cancel = context.WithTimeout(t.ctx, state.timeout)
+		s.ctx, s.cancel = context.WithTimeout(context.TODO(), state.timeout)
 	} else {
-		s.ctx, s.cancel = context.WithCancel(t.ctx)
+		s.ctx, s.cancel = context.WithCancel(context.TODO())
 	}
 	pr := &peer.Peer{
-		Addr: t.remoteAddr,
+		Addr: t.conn.RemoteAddr(),
 	}
 	// Attach Auth info if there is any.
 	if t.authInfo != nil {
@@ -214,18 +195,6 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 	}
 	s.recvCompress = state.encoding
 	s.method = state.method
-	if t.inTapHandle != nil {
-		var err error
-		info := &tap.Info{
-			FullMethodName: state.method,
-		}
-		s.ctx, err = t.inTapHandle(s.ctx, info)
-		if err != nil {
-			// TODO: Log the real error.
-			t.controlBuf.put(&resetStream{s.id, http2.ErrCodeRefusedStream})
-			return
-		}
-	}
 	t.mu.Lock()
 	if t.state != reachable {
 		t.mu.Unlock()
@@ -249,26 +218,13 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(
 	s.windowHandler = func(n int) {
 		t.updateWindow(s, uint32(n))
 	}
-	s.ctx = traceCtx(s.ctx, s.method)
-	if stats.On() {
-		s.ctx = stats.TagRPC(s.ctx, &stats.RPCTagInfo{FullMethodName: s.method})
-		inHeader := &stats.InHeader{
-			FullMethod:  s.method,
-			RemoteAddr:  t.remoteAddr,
-			LocalAddr:   t.localAddr,
-			Compression: s.recvCompress,
-			WireLength:  int(frame.Header().Length),
-		}
-		stats.HandleRPC(s.ctx, inHeader)
-	}
 	handle(s)
 	return
 }
 
 // HandleStreams receives incoming streams using the given handler. This is
 // typically run in a separate goroutine.
-// traceCtx attaches trace to ctx and returns the new context.
-func (t *http2Server) HandleStreams(handle func(*Stream), traceCtx func(context.Context, string) context.Context) {
+func (t *http2Server) HandleStreams(handle func(*Stream)) {
 	// Check the validity of client preface.
 	preface := make([]byte, len(clientPreface))
 	if _, err := io.ReadFull(t.conn, preface); err != nil {
@@ -323,7 +279,7 @@ func (t *http2Server) HandleStreams(handle func(*Stream), traceCtx func(context.
 		}
 		switch frame := frame.(type) {
 		case *http2.MetaHeadersFrame:
-			if t.operateHeaders(frame, handle, traceCtx) {
+			if t.operateHeaders(frame, handle) {
 				t.Close()
 				break
 			}
@@ -536,16 +492,9 @@ func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
 			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
 		}
 	}
-	bufLen := t.hBuf.Len()
 	if err := t.writeHeaders(s, t.hBuf, false); err != nil {
 		return err
 	}
-	if stats.On() {
-		outHeader := &stats.OutHeader{
-			WireLength: bufLen,
-		}
-		stats.HandleRPC(s.Context(), outHeader)
-	}
 	t.writableChan <- 0
 	return nil
 }
@@ -598,17 +547,10 @@ func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc s
 			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
 		}
 	}
-	bufLen := t.hBuf.Len()
 	if err := t.writeHeaders(s, t.hBuf, true); err != nil {
 		t.Close()
 		return err
 	}
-	if stats.On() {
-		outTrailer := &stats.OutTrailer{
-			WireLength: bufLen,
-		}
-		stats.HandleRPC(s.Context(), outTrailer)
-	}
 	t.closeStream(s)
 	t.writableChan <- 0
 	return nil
@@ -637,14 +579,19 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
 			return nil
 		}
 		size := http2MaxFrameLen
+		s.sendQuotaPool.add(0)
 		// Wait until the stream has some quota to send the data.
 		sq, err := wait(s.ctx, nil, nil, t.shutdownChan, s.sendQuotaPool.acquire())
 		if err != nil {
 			return err
 		}
+		t.sendQuotaPool.add(0)
 		// Wait until the transport has some quota to send the data.
 		tq, err := wait(s.ctx, nil, nil, t.shutdownChan, t.sendQuotaPool.acquire())
 		if err != nil {
+			if _, ok := err.(StreamError); ok {
+				t.sendQuotaPool.cancel()
+			}
 			return err
 		}
 		if sq < size {
@@ -712,7 +659,7 @@ func (t *http2Server) applySettings(ss []http2.Setting) {
 			t.mu.Lock()
 			defer t.mu.Unlock()
 			for _, stream := range t.activeStreams {
-				stream.sendQuotaPool.add(int(s.Val - t.streamSendQuota))
+				stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
 			}
 			t.streamSendQuota = s.Val
 		}
@@ -789,10 +736,6 @@ func (t *http2Server) Close() (err error) {
 	for _, s := range streams {
 		s.cancel()
 	}
-	if stats.On() {
-		connEnd := &stats.ConnEnd{}
-		stats.HandleConn(t.ctx, connEnd)
-	}
 	return
 }
 
@@ -824,7 +767,7 @@ func (t *http2Server) closeStream(s *Stream) {
 }
 
 func (t *http2Server) RemoteAddr() net.Addr {
-	return t.remoteAddr
+	return t.conn.RemoteAddr()
 }
 
 func (t *http2Server) Drain() {
diff --git a/vendor/google.golang.org/grpc/transport/transport.go b/vendor/google.golang.org/grpc/transport/transport.go
index 4726bb2cea..413f7493b4 100644
--- a/vendor/google.golang.org/grpc/transport/transport.go
+++ b/vendor/google.golang.org/grpc/transport/transport.go
@@ -45,10 +45,10 @@ import (
 	"sync"
 
 	"golang.org/x/net/context"
+	"golang.org/x/net/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/tap"
 )
 
 // recvMsg represents the received msg from the transport. All transport
@@ -167,11 +167,6 @@ type Stream struct {
 	id uint32
 	// nil for client side Stream.
 	st ServerTransport
-	// clientStatsCtx keeps the user context for stats handling.
-	// It's only valid on client side. Server side stats context is same as s.ctx.
-	// All client side stats collection should use the clientStatsCtx (instead of the stream context)
-	// so that all the generated stats for a particular RPC can be associated in the processing phase.
-	clientStatsCtx context.Context
 	// ctx is the associated context of the stream.
 	ctx context.Context
 	// cancel is always nil for client side Stream.
@@ -271,6 +266,11 @@ func (s *Stream) Context() context.Context {
 	return s.ctx
 }
 
+// TraceContext recreates the context of s with a trace.Trace.
+func (s *Stream) TraceContext(tr trace.Trace) {
+	s.ctx = trace.NewContext(s.ctx, tr)
+}
+
 // Method returns the method for the stream.
 func (s *Stream) Method() string {
 	return s.method
@@ -355,17 +355,10 @@ const (
 	draining
 )
 
-// ServerConfig consists of all the configurations to establish a server transport.
-type ServerConfig struct {
-	MaxStreams  uint32
-	AuthInfo    credentials.AuthInfo
-	InTapHandle tap.ServerInHandle
-}
-
 // NewServerTransport creates a ServerTransport with conn or non-nil error
 // if it fails.
-func NewServerTransport(protocol string, conn net.Conn, config *ServerConfig) (ServerTransport, error) {
-	return newHTTP2Server(conn, config)
+func NewServerTransport(protocol string, conn net.Conn, maxStreams uint32, authInfo credentials.AuthInfo) (ServerTransport, error) {
+	return newHTTP2Server(conn, maxStreams, authInfo)
 }
 
 // ConnectOptions covers all relevant options for communicating with the server.
@@ -374,8 +367,6 @@ type ConnectOptions struct {
 	UserAgent string
 	// Dialer specifies how to dial a network address.
 	Dialer func(context.Context, string) (net.Conn, error)
-	// FailOnNonTempDialError specifies if gRPC fails on non-temporary dial errors.
-	FailOnNonTempDialError bool
 	// PerRPCCredentials stores the PerRPCCredentials required to issue RPCs.
 	PerRPCCredentials []credentials.PerRPCCredentials
 	// TransportCredentials stores the Authenticator required to setup a client connection.
@@ -475,7 +466,7 @@ type ClientTransport interface {
 // Write methods for a given Stream will be called serially.
 type ServerTransport interface {
 	// HandleStreams receives incoming streams using the given handler.
-	HandleStreams(func(*Stream), func(context.Context, string) context.Context)
+	HandleStreams(func(*Stream))
 
 	// WriteHeader sends the header metadata for the given stream.
 	// WriteHeader may not be called on all streams.

From ce8e2667a00f2f30d420383845fd2b614f50b924 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 10 Feb 2017 17:49:32 -0800
Subject: [PATCH 1061/1304] tests: fix runRktAsUidGidAndCheckOutput parameters

---
 tests/rkt_non_root_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index 7369038b9a..9f6de05dca 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -84,7 +84,7 @@ func TestNonRootReadInfo(t *testing.T) {
 
 	imgListCmd := fmt.Sprintf("%s image list", ctx.Cmd())
 	t.Logf("Running %s", imgListCmd)
-	runRktAsUidGidAndCheckOutput(t, imgListCmd, "inspect-", false, uid, rktGid)
+	runRktAsUidGidAndCheckOutput(t, imgListCmd, "inspect-", false, false, uid, rktGid)
 }
 
 // TestNonRootFetchRmGCImage tests that non-root users can remove all images but

From e706f323eb724c50c56a5f3686e1809c0616f78b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 13 Feb 2017 16:48:26 +0000
Subject: [PATCH 1062/1304] glide: bump docker2aci to 0.16.0

---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index d04761cdcf..dca4bd7478 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.15.0
+  version: v0.16.0
   subpackages:
   - lib
   - lib/common

From dc318a95cf703eefd33ad259087921b956457d90 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 13 Feb 2017 17:00:20 +0000
Subject: [PATCH 1063/1304] vendor: update after docker2aci bump

---
 glide.lock                                    |  10 +-
 .../appc/docker2aci/lib/common/common.go      | 145 ++++++
 .../appc/docker2aci/lib/docker2aci.go         |  28 +-
 .../lib/internal/backend/file/file.go         |  26 +-
 .../internal/backend/repository/repository.go |  44 +-
 .../backend/repository/repository1.go         |  14 +-
 .../backend/repository/repository2.go         |  87 ++--
 .../appc/docker2aci/lib/internal/internal.go  |  35 +-
 .../lib/internal/typesV2/docker_types.go      |  20 +-
 .../github.com/appc/docker2aci/lib/version.go |   2 +-
 .../opencontainers/go-digest/LICENSE.code     | 191 ++++++++
 .../opencontainers/go-digest/LICENSE.docs     | 425 ++++++++++++++++++
 .../opencontainers/go-digest/algorithm.go     | 144 ++++++
 .../opencontainers/go-digest/digest.go        | 140 ++++++
 .../opencontainers/go-digest/digester.go      |  25 ++
 .../opencontainers/go-digest/doc.go           |  42 ++
 .../opencontainers/go-digest/verifiers.go     |  31 ++
 vendor/golang.org/x/text/gen.go               | 139 +++++-
 .../golang.org/x/text/transform/transform.go  |  52 ++-
 .../x/text/unicode/norm/forminfo.go           |  47 +-
 .../x/text/unicode/norm/normalize.go          |  36 +-
 .../x/text/unicode/norm/readwriter.go         |   1 -
 vendor/golang.org/x/text/width/transform.go   |  77 ++++
 vendor/golang.org/x/text/width/width.go       |   9 +-
 24 files changed, 1604 insertions(+), 166 deletions(-)
 create mode 100644 vendor/github.com/opencontainers/go-digest/LICENSE.code
 create mode 100644 vendor/github.com/opencontainers/go-digest/LICENSE.docs
 create mode 100644 vendor/github.com/opencontainers/go-digest/algorithm.go
 create mode 100644 vendor/github.com/opencontainers/go-digest/digest.go
 create mode 100644 vendor/github.com/opencontainers/go-digest/digester.go
 create mode 100644 vendor/github.com/opencontainers/go-digest/doc.go
 create mode 100644 vendor/github.com/opencontainers/go-digest/verifiers.go

diff --git a/glide.lock b/glide.lock
index 0dff9168f9..ad6df47b0d 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: 62bf475671ecbac0d0d8350a9e8e3aad3c29253fdb3728b8b4cd09ae262e5fa8
-updated: 2017-02-10T17:19:45.543064389-08:00
+hash: 5b01507338879a95e4f789cc14dac4aee0ae1ef7661da521a437621e207ba7fa
+updated: 2017-02-13T16:50:01.49078982Z
 imports:
 - name: github.com/appc/docker2aci
-  version: cfd196b05e02185b34aa3a844eff07b943c7e3ec
+  version: 4537ee8e3139455eac6092d47a224d8fa19bf08a
   subpackages:
   - lib
   - lib/common
@@ -199,6 +199,8 @@ imports:
   version: cfb55aafdaf3ec08f0db22699ab822c50091b1c4
 - name: github.com/kr/pty
   version: f7ee69f31298ecbe5d2b349c711e2547a617d398
+- name: github.com/opencontainers/go-digest
+  version: 21dfd564fd89c944783d00d069f33e3e7123c448
 - name: github.com/opencontainers/image-spec
   version: 6e820ec55259e89ccd7092f3131c63e8419a349b
   subpackages:
@@ -276,7 +278,7 @@ imports:
   subpackages:
   - unix
 - name: golang.org/x/text
-  version: 2910a502d2bf9e43193af9d68ca516529614eed3
+  version: 06d6eba81293389cafdff7fca90d75592194b2d9
   subpackages:
   - transform
   - unicode/norm
diff --git a/vendor/github.com/appc/docker2aci/lib/common/common.go b/vendor/github.com/appc/docker2aci/lib/common/common.go
index 698f03d44c..13ca559f10 100644
--- a/vendor/github.com/appc/docker2aci/lib/common/common.go
+++ b/vendor/github.com/appc/docker2aci/lib/common/common.go
@@ -21,6 +21,8 @@ import (
 
 	"github.com/appc/docker2aci/lib/internal/docker"
 	"github.com/docker/distribution/reference"
+
+	spec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 type Compression int
@@ -48,6 +50,7 @@ const (
 	AppcDockerParentImageID = "appc.io/docker/parentimageid"
 	AppcDockerEntrypoint    = "appc.io/docker/entrypoint"
 	AppcDockerCmd           = "appc.io/docker/cmd"
+	AppcDockerManifestHash  = "appc.io/docker/manifesthash"
 )
 
 const defaultTag = "latest"
@@ -112,3 +115,145 @@ func ValidateLayerId(id string) error {
 	}
 	return nil
 }
+
+/*
+ * Media Type Selectors Section
+ */
+
+const (
+	MediaTypeDockerV21Manifest       = "application/vnd.docker.distribution.manifest.v1+json"
+	MediaTypeDockerV21SignedManifest = "application/vnd.docker.distribution.manifest.v1+prettyjws"
+	MediaTypeDockerV21ManifestLayer  = "application/vnd.docker.container.image.rootfs.diff+x-gtar"
+
+	MediaTypeDockerV22Manifest     = "application/vnd.docker.distribution.manifest.v2+json"
+	MediaTypeDockerV22ManifestList = "application/vnd.docker.distribution.manifest.list.v2+json"
+	MediaTypeDockerV22Config       = "application/vnd.docker.container.image.v1+json"
+	MediaTypeDockerV22RootFS       = "application/vnd.docker.image.rootfs.diff.tar.gzip"
+
+	MediaTypeOCIV1Manifest     = spec.MediaTypeImageManifest
+	MediaTypeOCIV1ManifestList = spec.MediaTypeImageManifestList
+	MediaTypeOCIV1Config       = spec.MediaTypeImageConfig
+	MediaTypeOCIV1Layer        = spec.MediaTypeImageLayer
+)
+
+// MediaTypeOption represents the media types for a given docker image (or oci)
+// spec.
+type MediaTypeOption int
+
+const (
+	MediaTypeOptionDockerV21 = iota
+	MediaTypeOptionDockerV22
+	MediaTypeOptionOCIV1Pre
+)
+
+// MediaTypeSet represents a set of media types which docker2aci is to use when
+// fetchimg images. As an example if a MediaTypeSet is equal to
+// {MediaTypeOptionDockerV22, MediaTypeOptionOCIV1Pre}, then when an image pull
+// is made V2.1 images will not be fetched. This doesn't apply to V1 pulls. As
+// an edge case if a MedaTypeSet is nil or empty, that means that _every_ type
+// of media type is enabled. This type is intended to be a set, and putting
+// duplicates in this set is generally unadvised.
+type MediaTypeSet []MediaTypeOption
+
+func (m MediaTypeSet) ManifestMediaTypes() []string {
+	if len(m) == 0 {
+		return []string{
+			MediaTypeDockerV21Manifest,
+			MediaTypeDockerV22Manifest,
+			MediaTypeOCIV1Manifest,
+		}
+	}
+	ret := []string{}
+	for _, option := range m {
+		switch option {
+		case MediaTypeOptionDockerV21:
+			ret = append(ret, MediaTypeDockerV21Manifest)
+		case MediaTypeOptionDockerV22:
+			ret = append(ret, MediaTypeDockerV22Manifest)
+		case MediaTypeOptionOCIV1Pre:
+			ret = append(ret, MediaTypeOCIV1Manifest)
+		}
+	}
+	return ret
+}
+
+func (m MediaTypeSet) ConfigMediaTypes() []string {
+	if len(m) == 0 {
+		return []string{
+			MediaTypeDockerV22Config,
+			MediaTypeOCIV1Config,
+		}
+	}
+	ret := []string{}
+	for _, option := range m {
+		switch option {
+		case MediaTypeOptionDockerV21:
+		case MediaTypeOptionDockerV22:
+			ret = append(ret, MediaTypeDockerV22Config)
+		case MediaTypeOptionOCIV1Pre:
+			ret = append(ret, MediaTypeOCIV1Config)
+		}
+	}
+	return ret
+}
+
+func (m MediaTypeSet) LayerMediaTypes() []string {
+	if len(m) == 0 {
+		return []string{
+			MediaTypeDockerV22RootFS,
+			MediaTypeOCIV1Layer,
+		}
+	}
+	ret := []string{}
+	for _, option := range m {
+		switch option {
+		case MediaTypeOptionDockerV21:
+		case MediaTypeOptionDockerV22:
+			ret = append(ret, MediaTypeDockerV22RootFS)
+		case MediaTypeOptionOCIV1Pre:
+			ret = append(ret, MediaTypeOCIV1Layer)
+		}
+	}
+	return ret
+}
+
+// RegistryOption represents a type of a registry, based on the version of the
+// docker http API.
+type RegistryOption int
+
+const (
+	RegistryOptionV1 = iota
+	RegistryOptionV2
+)
+
+// RegistryOptionSet represents a set of registry types which docker2aci is to
+// use when fetching images. As an example if a RegistryOptionSet is equal to
+// {RegistryOptionV2}, then v1 pulls are disabled. As an edge case if a
+// RegistryOptionSet is nil or empty, that means that _every_ type of registry
+// is enabled. This type is intended to be a set, and putting duplicates in this
+// set is generally unadvised.
+type RegistryOptionSet []RegistryOption
+
+func (r RegistryOptionSet) AllowsV1() bool {
+	if len(r) == 0 {
+		return true
+	}
+	for _, o := range r {
+		if o == RegistryOptionV1 {
+			return true
+		}
+	}
+	return false
+}
+
+func (r RegistryOptionSet) AllowsV2() bool {
+	if len(r) == 0 {
+		return true
+	}
+	for _, o := range r {
+		if o == RegistryOptionV2 {
+			return true
+		}
+	}
+	return false
+}
diff --git a/vendor/github.com/appc/docker2aci/lib/docker2aci.go b/vendor/github.com/appc/docker2aci/lib/docker2aci.go
index c9eada7952..b888e64903 100644
--- a/vendor/github.com/appc/docker2aci/lib/docker2aci.go
+++ b/vendor/github.com/appc/docker2aci/lib/docker2aci.go
@@ -42,10 +42,11 @@ import (
 // CommonConfig represents the shared configuration options for converting
 // Docker images.
 type CommonConfig struct {
-	Squash      bool               // squash the layers in one file
-	OutputDir   string             // where to put the resulting ACI
-	TmpDir      string             // directory to use for temporary files
-	Compression common.Compression // which compression to use for the resulting file(s)
+	Squash                bool               // squash the layers in one file
+	OutputDir             string             // where to put the resulting ACI
+	TmpDir                string             // directory to use for temporary files
+	Compression           common.Compression // which compression to use for the resulting file(s)
+	CurrentManifestHashes []string           // any manifest hashes the caller already has
 
 	Info  log.Logger
 	Debug log.Logger
@@ -65,9 +66,11 @@ func (c *CommonConfig) initLogger() {
 // converting Docker images.
 type RemoteConfig struct {
 	CommonConfig
-	Username string                // username to use if the image to convert needs authentication
-	Password string                // password to use if the image to convert needs authentication
-	Insecure common.InsecureConfig // Insecure options
+	Username        string                // username to use if the image to convert needs authentication
+	Password        string                // password to use if the image to convert needs authentication
+	Insecure        common.InsecureConfig // Insecure options
+	MediaTypes      common.MediaTypeSet
+	RegistryOptions common.RegistryOptionSet
 }
 
 // FileConfig represents the saved file specific configuration for converting
@@ -94,6 +97,8 @@ func ConvertRemoteRepo(dockerURL string, config RemoteConfig) ([]string, error)
 			config.Password,
 			config.Insecure,
 			config.Debug,
+			config.MediaTypes,
+			config.RegistryOptions,
 		),
 		dockerURL: dockerURL,
 		config:    config.CommonConfig,
@@ -141,10 +146,15 @@ type converter struct {
 
 func (c *converter) convert() ([]string, error) {
 	c.config.Debug.Println("Getting image info...")
-	ancestry, parsedDockerURL, err := c.backend.GetImageInfo(c.dockerURL)
+	ancestry, manhash, parsedDockerURL, err := c.backend.GetImageInfo(c.dockerURL)
 	if err != nil {
 		return nil, err
 	}
+	for _, h := range c.config.CurrentManifestHashes {
+		if manhash == h {
+			return nil, nil
+		}
+	}
 
 	layersOutputDir := c.config.OutputDir
 	if c.config.Squash {
@@ -163,7 +173,7 @@ func (c *converter) convert() ([]string, error) {
 		layerCompression = common.NoCompression
 	}
 
-	aciLayerPaths, aciManifests, err := c.backend.BuildACI(ancestry, parsedDockerURL, layersOutputDir, c.config.TmpDir, layerCompression)
+	aciLayerPaths, aciManifests, err := c.backend.BuildACI(ancestry, manhash, parsedDockerURL, layersOutputDir, c.config.TmpDir, layerCompression)
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
index 8d922ec952..85275c5d4f 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/file/file.go
@@ -53,7 +53,13 @@ func NewFileBackend(file *os.File, debug, info log.Logger) *FileBackend {
 	}
 }
 
-func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *common.ParsedDockerURL, error) {
+// GetImageInfo, given the url for a docker image, will return the
+// following:
+// - []string: an ordered list of all layer hashes
+// - string: a unique identifier for this image, like a hash of the manifest
+// - *common.ParsedDockerURL: a parsed docker URL
+// - error: an error if one occurred
+func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, string, *common.ParsedDockerURL, error) {
 	// a missing Docker URL could mean that the file only contains one
 	// image so it's okay for dockerURL to be blank
 	var parsedDockerURL *common.ParsedDockerURL
@@ -61,7 +67,7 @@ func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *common.ParsedD
 		var err error
 		parsedDockerURL, err = common.ParseDockerURL(dockerURL)
 		if err != nil {
-			return nil, nil, fmt.Errorf("image provided couldnot be parsed: %v", err)
+			return nil, "", nil, fmt.Errorf("image provided couldnot be parsed: %v", err)
 		}
 	}
 
@@ -70,25 +76,25 @@ func (lb *FileBackend) GetImageInfo(dockerURL string) ([]string, *common.ParsedD
 	name := strings.Split(filepath.Base(lb.file.Name()), ".")[0]
 	appImageID, ancestry, parsedDockerURL, err := getImageID(lb.file, parsedDockerURL, name, lb.debug)
 	if err != nil {
-		return nil, nil, err
+		return nil, "", nil, err
 	}
 
 	if len(ancestry) == 0 {
 		ancestry, err = getAncestry(lb.file, appImageID, lb.debug)
 		if err != nil {
-			return nil, nil, fmt.Errorf("error getting ancestry: %v", err)
+			return nil, "", nil, fmt.Errorf("error getting ancestry: %v", err)
 		}
 	} else {
 		// for oci the first image is the config
 		ancestry = append([]string{appImageID}, ancestry...)
 	}
 
-	return ancestry, parsedDockerURL, nil
+	return ancestry, appImageID, parsedDockerURL, nil
 }
 
-func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (lb *FileBackend) BuildACI(layerIDs []string, manhash string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	if strings.Contains(layerIDs[0], ":") {
-		return lb.BuildACIV22(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+		return lb.BuildACIV22(layerIDs, manhash, dockerURL, outputDir, tmpBaseDir, compression)
 	}
 	var aciLayerPaths []string
 	var aciManifests []*schema.ImageManifest
@@ -125,7 +131,7 @@ func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *common.ParsedDocke
 		defer layerFile.Close()
 
 		lb.debug.Println("Generating layer ACI...")
-		aciPath, manifest, err := internal.GenerateACI(i, layerData, dockerURL, outputDir, layerFile, curPwl, compression, lb.debug)
+		aciPath, manifest, err := internal.GenerateACI(i, manhash, layerData, dockerURL, outputDir, layerFile, curPwl, compression, lb.debug)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
 		}
@@ -138,7 +144,7 @@ func (lb *FileBackend) BuildACI(layerIDs []string, dockerURL *common.ParsedDocke
 	return aciLayerPaths, aciManifests, nil
 }
 
-func (lb *FileBackend) BuildACIV22(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (lb *FileBackend) BuildACIV22(layerIDs []string, manhash string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	if len(layerIDs) < 2 {
 		return nil, nil, fmt.Errorf("insufficient layers for oci image")
 	}
@@ -179,7 +185,7 @@ func (lb *FileBackend) BuildACIV22(layerIDs []string, dockerURL *common.ParsedDo
 		if i != 0 {
 			aciPath, manifest, err = internal.GenerateACI22LowerLayer(dockerURL, parts[1], outputDir, layerFile, curPwl, compression)
 		} else {
-			aciPath, manifest, err = internal.GenerateACI22TopLayer(dockerURL, &imageConfig, parts[1], outputDir, layerFile, curPwl, compression, aciManifests, lb.debug)
+			aciPath, manifest, err = internal.GenerateACI22TopLayer(dockerURL, manhash, &imageConfig, parts[1], outputDir, layerFile, curPwl, compression, aciManifests, lb.debug)
 		}
 		if err != nil {
 			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
index 8bbe1a1f3d..97315fd399 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository.go
@@ -67,11 +67,13 @@ type RepositoryBackend struct {
 	imageV2Manifests  map[common.ParsedDockerURL]*typesV2.ImageManifest
 	imageConfigs      map[common.ParsedDockerURL]*typesV2.ImageConfig
 	layersIndex       map[string]int
+	mediaTypes        common.MediaTypeSet
+	registryOptions   common.RegistryOptionSet
 
 	debug log.Logger
 }
 
-func NewRepositoryBackend(username string, password string, insecure common.InsecureConfig, debug log.Logger) *RepositoryBackend {
+func NewRepositoryBackend(username, password string, insecure common.InsecureConfig, debug log.Logger, mediaTypes common.MediaTypeSet, registryOptions common.RegistryOptionSet) *RepositoryBackend {
 	return &RepositoryBackend{
 		username:          username,
 		password:          password,
@@ -83,14 +85,22 @@ func NewRepositoryBackend(username string, password string, insecure common.Inse
 		imageV2Manifests:  make(map[common.ParsedDockerURL]*typesV2.ImageManifest),
 		imageConfigs:      make(map[common.ParsedDockerURL]*typesV2.ImageConfig),
 		layersIndex:       make(map[string]int),
+		mediaTypes:        mediaTypes,
+		registryOptions:   registryOptions,
 		debug:             debug,
 	}
 }
 
-func (rb *RepositoryBackend) GetImageInfo(url string) ([]string, *common.ParsedDockerURL, error) {
+// GetImageInfo, given the url for a docker image, will return the
+// following:
+// - []string: an ordered list of all layer hashes
+// - string: a unique identifier for this image, like a hash of the manifest
+// - *common.ParsedDockerURL: a parsed docker URL
+// - error: an error if one occurred
+func (rb *RepositoryBackend) GetImageInfo(url string) ([]string, string, *common.ParsedDockerURL, error) {
 	dockerURL, err := common.ParseDockerURL(url)
 	if err != nil {
-		return nil, nil, err
+		return nil, "", nil, err
 	}
 
 	var supportsV2, supportsV1, ok bool
@@ -100,42 +110,50 @@ func (rb *RepositoryBackend) GetImageInfo(url string) ([]string, *common.ParsedD
 		var err error
 		URLSchema, supportsV2, err = rb.supportsRegistry(dockerURL.IndexURL, registryV2)
 		if err != nil {
-			return nil, nil, err
+			return nil, "", nil, err
 		}
 		rb.schema = URLSchema + "://"
 		rb.hostsV2Support[dockerURL.IndexURL] = supportsV2
 	}
 
 	// try v2
-	if supportsV2 {
-		layers, dockerURL, err := rb.getImageInfoV2(dockerURL)
+	if supportsV2 && rb.registryOptions.AllowsV2() {
+		layers, manhash, dockerURL, err := rb.getImageInfoV2(dockerURL)
 		if !isErrHTTP404(err) {
-			return layers, dockerURL, err
+			return layers, manhash, dockerURL, err
 		}
 		// fallback on 404 failure
 		rb.hostsV1fallback = true
+		// unless we can't fallback
+		if !rb.registryOptions.AllowsV1() {
+			return nil, "", nil, err
+		}
+	}
+
+	if !rb.registryOptions.AllowsV1() {
+		return nil, "", nil, fmt.Errorf("no remaining enabled registry options")
 	}
 
 	URLSchema, supportsV1, err = rb.supportsRegistry(dockerURL.IndexURL, registryV1)
 	if err != nil {
-		return nil, nil, err
+		return nil, "", nil, err
 	}
 	if !supportsV1 && rb.hostsV1fallback {
-		return nil, nil, fmt.Errorf("attempted fallback to API v1 but not supported")
+		return nil, "", nil, fmt.Errorf("attempted fallback to API v1 but not supported")
 	}
 	if !supportsV1 && !supportsV2 {
-		return nil, nil, fmt.Errorf("registry doesn't support API v2 nor v1")
+		return nil, "", nil, fmt.Errorf("registry doesn't support API v2 nor v1")
 	}
 	rb.schema = URLSchema + "://"
 	// try v1, hard fail on failure
 	return rb.getImageInfoV1(dockerURL)
 }
 
-func (rb *RepositoryBackend) BuildACI(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (rb *RepositoryBackend) BuildACI(layerIDs []string, manhash string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	if rb.hostsV1fallback || !rb.hostsV2Support[dockerURL.IndexURL] {
-		return rb.buildACIV1(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+		return rb.buildACIV1(layerIDs, manhash, dockerURL, outputDir, tmpBaseDir, compression)
 	} else {
-		return rb.buildACIV2(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+		return rb.buildACIV2(layerIDs, manhash, dockerURL, outputDir, tmpBaseDir, compression)
 	}
 }
 
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
index 69aad8565e..69bd841113 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository1.go
@@ -40,29 +40,29 @@ type RepoData struct {
 	Cookie    []string
 }
 
-func (rb *RepositoryBackend) getImageInfoV1(dockerURL *common.ParsedDockerURL) ([]string, *common.ParsedDockerURL, error) {
+func (rb *RepositoryBackend) getImageInfoV1(dockerURL *common.ParsedDockerURL) ([]string, string, *common.ParsedDockerURL, error) {
 	repoData, err := rb.getRepoDataV1(dockerURL.IndexURL, dockerURL.ImageName)
 	if err != nil {
-		return nil, nil, fmt.Errorf("error getting repository data: %v", err)
+		return nil, "", nil, fmt.Errorf("error getting repository data: %v", err)
 	}
 
 	// TODO(iaguis) check more endpoints
 	appImageID, err := rb.getImageIDFromTagV1(repoData.Endpoints[0], dockerURL.ImageName, dockerURL.Tag, repoData)
 	if err != nil {
-		return nil, nil, fmt.Errorf("error getting ImageID from tag %s: %v", dockerURL.Tag, err)
+		return nil, "", nil, fmt.Errorf("error getting ImageID from tag %s: %v", dockerURL.Tag, err)
 	}
 
 	ancestry, err := rb.getAncestryV1(appImageID, repoData.Endpoints[0], repoData)
 	if err != nil {
-		return nil, nil, err
+		return nil, "", nil, err
 	}
 
 	rb.repoData = repoData
 
-	return ancestry, dockerURL, nil
+	return ancestry, appImageID, dockerURL, nil
 }
 
-func (rb *RepositoryBackend) buildACIV1(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (rb *RepositoryBackend) buildACIV1(layerIDs []string, manhash string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	layerFiles := make([]*os.File, len(layerIDs))
 	layerDatas := make([]types.DockerImageData, len(layerIDs))
 
@@ -121,7 +121,7 @@ func (rb *RepositoryBackend) buildACIV1(layerIDs []string, dockerURL *common.Par
 
 	for i := len(layerIDs) - 1; i >= 0; i-- {
 		rb.debug.Println("Generating layer ACI...")
-		aciPath, manifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression, rb.debug)
+		aciPath, manifest, err := internal.GenerateACI(i, manhash, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression, rb.debug)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
 		}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
index cd3bc2b4b8..1e03791f2e 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/backend/repository/repository2.go
@@ -35,6 +35,7 @@ import (
 	"github.com/appc/docker2aci/lib/internal/util"
 	"github.com/appc/spec/schema"
 	"github.com/coreos/pkg/progressutil"
+	godigest "github.com/opencontainers/go-digest"
 )
 
 const (
@@ -54,24 +55,24 @@ type v2Manifest struct {
 	Signature []byte `json:"signature"`
 }
 
-func (rb *RepositoryBackend) getImageInfoV2(dockerURL *common.ParsedDockerURL) ([]string, *common.ParsedDockerURL, error) {
-	layers, err := rb.getManifestV2(dockerURL)
+func (rb *RepositoryBackend) getImageInfoV2(dockerURL *common.ParsedDockerURL) ([]string, string, *common.ParsedDockerURL, error) {
+	layers, manhash, err := rb.getManifestV2(dockerURL)
 	if err != nil {
-		return nil, nil, err
+		return nil, "", nil, err
 	}
 
-	return layers, dockerURL, nil
+	return layers, manhash, dockerURL, nil
 }
 
-func (rb *RepositoryBackend) buildACIV2(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (rb *RepositoryBackend) buildACIV2(layerIDs []string, manhash string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	_, isVersion22 := rb.imageV2Manifests[*dockerURL]
 	if isVersion22 {
-		return rb.buildACIV22(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+		return rb.buildACIV22(layerIDs, manhash, dockerURL, outputDir, tmpBaseDir, compression)
 	}
-	return rb.buildACIV21(layerIDs, dockerURL, outputDir, tmpBaseDir, compression)
+	return rb.buildACIV21(layerIDs, manhash, dockerURL, outputDir, tmpBaseDir, compression)
 }
 
-func (rb *RepositoryBackend) buildACIV21(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (rb *RepositoryBackend) buildACIV21(layerIDs []string, manhash string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	layerFiles := make([]*os.File, len(layerIDs))
 	layerDatas := make([]types.DockerImageData, len(layerIDs))
 
@@ -160,7 +161,7 @@ func (rb *RepositoryBackend) buildACIV21(layerIDs []string, dockerURL *common.Pa
 	var curPwl []string
 	for i := len(layerIDs) - 1; i >= 0; i-- {
 		rb.debug.Println("Generating layer ACI...")
-		aciPath, aciManifest, err := internal.GenerateACI(i, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression, rb.debug)
+		aciPath, aciManifest, err := internal.GenerateACI(i, manhash, layerDatas[i], dockerURL, outputDir, layerFiles[i], curPwl, compression, rb.debug)
 		if err != nil {
 			return nil, nil, fmt.Errorf("error generating ACI: %v", err)
 		}
@@ -181,7 +182,7 @@ type layer struct {
 	err    error
 }
 
-func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
+func (rb *RepositoryBackend) buildACIV22(layerIDs []string, manhash string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error) {
 	layerFiles := make([]*os.File, len(layerIDs))
 
 	tmpParentDir, err := ioutil.TempDir(tmpBaseDir, "docker2aci-")
@@ -268,7 +269,7 @@ func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *common.Pa
 		curPwl = aciManifest.PathWhitelist
 	}
 	rb.debug.Println("Generating layer ACI...")
-	aciPath, aciManifest, err := internal.GenerateACI22TopLayer(dockerURL, rb.imageConfigs[*dockerURL], layerIDs[i], outputDir, layerFiles[i], curPwl, compression, aciManifests, rb.debug)
+	aciPath, aciManifest, err := internal.GenerateACI22TopLayer(dockerURL, manhash, rb.imageConfigs[*dockerURL], layerIDs[i], outputDir, layerFiles[i], curPwl, compression, aciManifests, rb.debug)
 	if err != nil {
 		return nil, nil, fmt.Errorf("error generating ACI: %v", err)
 	}
@@ -278,7 +279,7 @@ func (rb *RepositoryBackend) buildACIV22(layerIDs []string, dockerURL *common.Pa
 	return aciLayerPaths, aciManifests, nil
 }
 
-func (rb *RepositoryBackend) getManifestV2(dockerURL *common.ParsedDockerURL) ([]string, error) {
+func (rb *RepositoryBackend) getManifestV2(dockerURL *common.ParsedDockerURL) ([]string, string, error) {
 	var reference string
 	if dockerURL.Digest != "" {
 		reference = dockerURL.Digest
@@ -289,59 +290,55 @@ func (rb *RepositoryBackend) getManifestV2(dockerURL *common.ParsedDockerURL) ([
 
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
 	rb.setBasicAuth(req)
 
-	accepting := []string{
-		typesV2.MediaTypeOCIManifest,
-		typesV2.MediaTypeDockerV22Manifest,
-		typesV2.MediaTypeDockerV21Manifest,
-	}
-
-	res, err := rb.makeRequest(req, dockerURL.ImageName, accepting)
+	res, err := rb.makeRequest(req, dockerURL.ImageName, rb.mediaTypes.ManifestMediaTypes())
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusOK {
-		return nil, &httpStatusErr{res.StatusCode, req.URL}
+		return nil, "", &httpStatusErr{res.StatusCode, req.URL}
 	}
 
 	switch res.Header.Get("content-type") {
-	case typesV2.MediaTypeDockerV22Manifest, typesV2.MediaTypeOCIManifest:
+	case common.MediaTypeDockerV22Manifest, common.MediaTypeOCIV1Manifest:
 		return rb.getManifestV22(dockerURL, res)
-	case typesV2.MediaTypeDockerV21Manifest:
+	case common.MediaTypeDockerV21Manifest:
 		return rb.getManifestV21(dockerURL, res)
 	}
 	return rb.getManifestV21(dockerURL, res)
 }
 
-func (rb *RepositoryBackend) getManifestV21(dockerURL *common.ParsedDockerURL, res *http.Response) ([]string, error) {
+func (rb *RepositoryBackend) getManifestV21(dockerURL *common.ParsedDockerURL, res *http.Response) ([]string, string, error) {
 	manblob, err := ioutil.ReadAll(res.Body)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
 	manifest := &v2Manifest{}
 
 	err = json.Unmarshal(manblob, manifest)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
+	manhash := godigest.FromBytes(manblob)
+
 	if manifest.Name != dockerURL.ImageName {
-		return nil, fmt.Errorf("name doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.ImageName, manifest.Name)
+		return nil, "", fmt.Errorf("name doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.ImageName, manifest.Name)
 	}
 
 	if dockerURL.Tag != "" && manifest.Tag != dockerURL.Tag {
-		return nil, fmt.Errorf("tag doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.Tag, manifest.Tag)
+		return nil, "", fmt.Errorf("tag doesn't match what was requested, expected: %s, downloaded: %s", dockerURL.Tag, manifest.Tag)
 	}
 
 	if err := fixManifestLayers(manifest); err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
 	//TODO: verify signature here
@@ -357,22 +354,24 @@ func (rb *RepositoryBackend) getManifestV21(dockerURL *common.ParsedDockerURL, r
 
 	rb.imageManifests[*dockerURL] = *manifest
 
-	return layers, nil
+	return layers, string(manhash), nil
 }
 
-func (rb *RepositoryBackend) getManifestV22(dockerURL *common.ParsedDockerURL, res *http.Response) ([]string, error) {
+func (rb *RepositoryBackend) getManifestV22(dockerURL *common.ParsedDockerURL, res *http.Response) ([]string, string, error) {
 	manblob, err := ioutil.ReadAll(res.Body)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
 	manifest := &typesV2.ImageManifest{}
 
 	err = json.Unmarshal(manblob, manifest)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
+	manhash := godigest.FromBytes(manblob)
+
 	//TODO: verify signature here
 
 	layers := make([]string, len(manifest.Layers))
@@ -383,12 +382,12 @@ func (rb *RepositoryBackend) getManifestV22(dockerURL *common.ParsedDockerURL, r
 
 	err = rb.getConfigV22(dockerURL, manifest.Config.Digest)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
 	rb.imageV2Manifests[*dockerURL] = manifest
 
-	return layers, nil
+	return layers, string(manhash), nil
 }
 
 func (rb *RepositoryBackend) getConfigV22(dockerURL *common.ParsedDockerURL, configDigest string) error {
@@ -400,12 +399,7 @@ func (rb *RepositoryBackend) getConfigV22(dockerURL *common.ParsedDockerURL, con
 
 	rb.setBasicAuth(req)
 
-	accepting := []string{
-		typesV2.MediaTypeOCIConfig,
-		typesV2.MediaTypeDockerV22Config,
-	}
-
-	res, err := rb.makeRequest(req, dockerURL.ImageName, accepting)
+	res, err := rb.makeRequest(req, dockerURL.ImageName, rb.mediaTypes.ConfigMediaTypes())
 	if err != nil {
 		return err
 	}
@@ -486,12 +480,7 @@ func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *common.Parsed
 
 	rb.setBasicAuth(req)
 
-	accepting := []string{
-		typesV2.MediaTypeDockerV22RootFS,
-		typesV2.MediaTypeOCILayer,
-	}
-
-	res, err = rb.makeRequest(req, dockerURL.ImageName, accepting)
+	res, err = rb.makeRequest(req, dockerURL.ImageName, rb.mediaTypes.LayerMediaTypes())
 	if err != nil {
 		return nil, nil, err
 	}
@@ -511,7 +500,7 @@ func (rb *RepositoryBackend) getLayerV2(layerID string, dockerURL *common.Parsed
 			}
 			res.Body.Close()
 			res = nil
-			res, err = rb.makeRequest(req, dockerURL.ImageName, accepting)
+			res, err = rb.makeRequest(req, dockerURL.ImageName, rb.mediaTypes.LayerMediaTypes())
 			if err != nil {
 				return nil, nil, err
 			}
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/internal.go b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
index 3a36c4cf2c..5ee81387dc 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/internal.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
@@ -53,13 +53,19 @@ import (
 // BuildACI takes a Docker layer, converts it to ACI and returns its output
 // path and its converted ImageManifest.
 type Docker2ACIBackend interface {
-	GetImageInfo(dockerUrl string) ([]string, *common.ParsedDockerURL, error)
-	BuildACI(layerIDs []string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error)
+	// GetImageInfo, given the url for a docker image, will return the
+	// following:
+	// - []string: an ordered list of all layer hashes
+	// - string: a unique identifier for this image, like a hash of the manifest
+	// - *common.ParsedDockerURL: a parsed docker URL
+	// - error: an error if one occurred
+	GetImageInfo(dockerUrl string) ([]string, string, *common.ParsedDockerURL, error)
+	BuildACI(layerIDs []string, manhash string, dockerURL *common.ParsedDockerURL, outputDir string, tmpBaseDir string, compression common.Compression) ([]string, []*schema.ImageManifest, error)
 }
 
 // GenerateACI takes a Docker layer and generates an ACI from it.
-func GenerateACI(layerNumber int, layerData types.DockerImageData, dockerURL *common.ParsedDockerURL, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression, debug log.Logger) (string, *schema.ImageManifest, error) {
-	manifest, err := GenerateManifest(layerData, dockerURL, debug)
+func GenerateACI(layerNumber int, manhash string, layerData types.DockerImageData, dockerURL *common.ParsedDockerURL, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression, debug log.Logger) (string, *schema.ImageManifest, error) {
+	manifest, err := GenerateManifest(layerData, manhash, dockerURL, debug)
 	if err != nil {
 		return "", nil, fmt.Errorf("error generating the manifest: %v", err)
 	}
@@ -104,13 +110,13 @@ func GenerateACI22LowerLayer(dockerURL *common.ParsedDockerURL, layerDigest stri
 	return aciPath, manifest, nil
 }
 
-func GenerateACI22TopLayer(dockerURL *common.ParsedDockerURL, imageConfig *typesV2.ImageConfig, layerDigest string, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression, lowerLayers []*schema.ImageManifest, debug log.Logger) (string, *schema.ImageManifest, error) {
+func GenerateACI22TopLayer(dockerURL *common.ParsedDockerURL, manhash string, imageConfig *typesV2.ImageConfig, layerDigest string, outputDir string, layerFile *os.File, curPwl []string, compression common.Compression, lowerLayers []*schema.ImageManifest, debug log.Logger) (string, *schema.ImageManifest, error) {
 	aciName := fmt.Sprintf("%s/%s-%s", dockerURL.IndexURL, dockerURL.ImageName, layerDigest)
 	sanitizedAciName, err := appctypes.SanitizeACIdentifier(aciName)
 	if err != nil {
 		return "", nil, err
 	}
-	manifest, err := GenerateManifestV22(sanitizedAciName, dockerURL, imageConfig, layerDigest, lowerLayers, debug)
+	manifest, err := GenerateManifestV22(sanitizedAciName, manhash, layerDigest, dockerURL, imageConfig, lowerLayers, debug)
 	if err != nil {
 		return "", nil, err
 	}
@@ -204,7 +210,7 @@ func setAnnotation(annotations *appctypes.Annotations, key, val string) {
 
 // GenerateManifest converts the docker manifest format to an appc
 // ImageManifest.
-func GenerateManifest(layerData types.DockerImageData, dockerURL *common.ParsedDockerURL, debug log.Logger) (*schema.ImageManifest, error) {
+func GenerateManifest(layerData types.DockerImageData, manhash string, dockerURL *common.ParsedDockerURL, debug log.Logger) (*schema.ImageManifest, error) {
 	dockerConfig := layerData.Config
 	genManifest := &schema.ImageManifest{}
 
@@ -248,6 +254,7 @@ func GenerateManifest(layerData types.DockerImageData, dockerURL *common.ParsedD
 	setAnnotation(&annotations, common.AppcDockerRepository, dockerURL.ImageName)
 	setAnnotation(&annotations, common.AppcDockerImageID, layerData.ID)
 	setAnnotation(&annotations, common.AppcDockerParentImageID, layerData.Parent)
+	setAnnotation(&annotations, common.AppcDockerManifestHash, manhash)
 
 	if dockerConfig != nil {
 		exec := getExecCommand(dockerConfig.Entrypoint, dockerConfig.Cmd)
@@ -346,7 +353,18 @@ func GenerateEmptyManifest(name string) (*schema.ImageManifest, error) {
 	}, nil
 }
 
-func GenerateManifestV22(name string, dockerURL *common.ParsedDockerURL, config *typesV2.ImageConfig, imageDigest string, lowerLayers []*schema.ImageManifest, debug log.Logger) (*schema.ImageManifest, error) {
+// GenerateManifestV22, given a large set of information (documented a couple
+// lines down), will produce an image manifest compliant with the Dockver V2.2
+// image spec
+func GenerateManifestV22(
+	name string, // The name of this image
+	manhash string, // The hash of this image's manifest
+	imageDigest string, // The digest of the image
+	dockerURL *common.ParsedDockerURL, // The parsed docker URL
+	config *typesV2.ImageConfig, // The image config
+	lowerLayers []*schema.ImageManifest, // A list of manifests for the lower layers
+	debug log.Logger, // The debug logger, for logging debug information
+) (*schema.ImageManifest, error) {
 	manifest, err := GenerateEmptyManifest(name)
 	if err != nil {
 		return nil, err
@@ -366,6 +384,7 @@ func GenerateManifestV22(name string, dockerURL *common.ParsedDockerURL, config
 	setAnnotation(&annotations, common.AppcDockerRepository, dockerURL.ImageName)
 	setAnnotation(&annotations, common.AppcDockerImageID, imageDigest)
 	setAnnotation(&annotations, "created", config.Created)
+	setAnnotation(&annotations, common.AppcDockerManifestHash, manhash)
 
 	if config.Config != nil {
 		innerCfg := config.Config
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go b/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
index f8305f757d..8d7f6fb1ca 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/typesV2/docker_types.go
@@ -18,23 +18,7 @@ import (
 	"encoding/json"
 	"errors"
 
-	spec "github.com/opencontainers/image-spec/specs-go/v1"
-)
-
-const (
-	MediaTypeDockerV21Manifest       = "application/vnd.docker.distribution.manifest.v1+json"
-	MediaTypeDockerV21SignedManifest = "application/vnd.docker.distribution.manifest.v1+prettyjws"
-	MediaTypeDockerV21ManifestLayer  = "application/vnd.docker.container.image.rootfs.diff+x-gtar"
-
-	MediaTypeDockerV22Manifest     = "application/vnd.docker.distribution.manifest.v2+json"
-	MediaTypeDockerV22ManifestList = "application/vnd.docker.distribution.manifest.list.v2+json"
-	MediaTypeDockerV22Config       = "application/vnd.docker.container.image.v1+json"
-	MediaTypeDockerV22RootFS       = "application/vnd.docker.image.rootfs.diff.tar.gzip"
-
-	MediaTypeOCIManifest     = spec.MediaTypeImageManifest
-	MediaTypeOCIManifestList = spec.MediaTypeImageManifestList
-	MediaTypeOCIConfig       = spec.MediaTypeImageConfig
-	MediaTypeOCILayer        = spec.MediaTypeImageLayer
+	"github.com/appc/docker2aci/lib/common"
 )
 
 var (
@@ -74,7 +58,7 @@ func (im *ImageManifest) PrettyString() string {
 }
 
 func (im *ImageManifest) Validate() error {
-	if im.MediaType != MediaTypeDockerV22Manifest && im.MediaType != MediaTypeOCIManifest {
+	if im.MediaType != common.MediaTypeDockerV22Manifest && im.MediaType != common.MediaTypeOCIV1Manifest {
 		return ErrIncorrectMediaType
 	}
 	if im.Config == nil {
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index a1f4f16cb4..87a3ecfe13 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.15.0"
+var Version = "0.16.0"
 var AppcVersion = schema.AppContainerVersion
diff --git a/vendor/github.com/opencontainers/go-digest/LICENSE.code b/vendor/github.com/opencontainers/go-digest/LICENSE.code
new file mode 100644
index 0000000000..0ea3ff81e3
--- /dev/null
+++ b/vendor/github.com/opencontainers/go-digest/LICENSE.code
@@ -0,0 +1,191 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2016 Docker, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/vendor/github.com/opencontainers/go-digest/LICENSE.docs b/vendor/github.com/opencontainers/go-digest/LICENSE.docs
new file mode 100644
index 0000000000..e26cd4fc8e
--- /dev/null
+++ b/vendor/github.com/opencontainers/go-digest/LICENSE.docs
@@ -0,0 +1,425 @@
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public:
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+
+     including for purposes of Section 3(b); and
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public licenses.
+Notwithstanding, Creative Commons may elect to apply one of its public
+licenses to material it publishes and in those instances will be
+considered the "Licensor." Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the public
+licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/vendor/github.com/opencontainers/go-digest/algorithm.go b/vendor/github.com/opencontainers/go-digest/algorithm.go
new file mode 100644
index 0000000000..a3c44801d5
--- /dev/null
+++ b/vendor/github.com/opencontainers/go-digest/algorithm.go
@@ -0,0 +1,144 @@
+package digest
+
+import (
+	"crypto"
+	"fmt"
+	"hash"
+	"io"
+)
+
+// Algorithm identifies and implementation of a digester by an identifier.
+// Note the that this defines both the hash algorithm used and the string
+// encoding.
+type Algorithm string
+
+// supported digest types
+const (
+	SHA256 Algorithm = "sha256" // sha256 with hex encoding
+	SHA384 Algorithm = "sha384" // sha384 with hex encoding
+	SHA512 Algorithm = "sha512" // sha512 with hex encoding
+
+	// Canonical is the primary digest algorithm used with the distribution
+	// project. Other digests may be used but this one is the primary storage
+	// digest.
+	Canonical = SHA256
+)
+
+var (
+	// TODO(stevvooe): Follow the pattern of the standard crypto package for
+	// registration of digests. Effectively, we are a registerable set and
+	// common symbol access.
+
+	// algorithms maps values to hash.Hash implementations. Other algorithms
+	// may be available but they cannot be calculated by the digest package.
+	algorithms = map[Algorithm]crypto.Hash{
+		SHA256: crypto.SHA256,
+		SHA384: crypto.SHA384,
+		SHA512: crypto.SHA512,
+	}
+)
+
+// Available returns true if the digest type is available for use. If this
+// returns false, Digester and Hash will return nil.
+func (a Algorithm) Available() bool {
+	h, ok := algorithms[a]
+	if !ok {
+		return false
+	}
+
+	// check availability of the hash, as well
+	return h.Available()
+}
+
+func (a Algorithm) String() string {
+	return string(a)
+}
+
+// Size returns number of bytes returned by the hash.
+func (a Algorithm) Size() int {
+	h, ok := algorithms[a]
+	if !ok {
+		return 0
+	}
+	return h.Size()
+}
+
+// Set implemented to allow use of Algorithm as a command line flag.
+func (a *Algorithm) Set(value string) error {
+	if value == "" {
+		*a = Canonical
+	} else {
+		// just do a type conversion, support is queried with Available.
+		*a = Algorithm(value)
+	}
+
+	if !a.Available() {
+		return ErrDigestUnsupported
+	}
+
+	return nil
+}
+
+// Digester returns a new digester for the specified algorithm. If the algorithm
+// does not have a digester implementation, nil will be returned. This can be
+// checked by calling Available before calling Digester.
+func (a Algorithm) Digester() Digester {
+	return &digester{
+		alg:  a,
+		hash: a.Hash(),
+	}
+}
+
+// Hash returns a new hash as used by the algorithm. If not available, the
+// method will panic. Check Algorithm.Available() before calling.
+func (a Algorithm) Hash() hash.Hash {
+	if !a.Available() {
+		// Empty algorithm string is invalid
+		if a == "" {
+			panic(fmt.Sprintf("empty digest algorithm, validate before calling Algorithm.Hash()"))
+		}
+
+		// NOTE(stevvooe): A missing hash is usually a programming error that
+		// must be resolved at compile time. We don't import in the digest
+		// package to allow users to choose their hash implementation (such as
+		// when using stevvooe/resumable or a hardware accelerated package).
+		//
+		// Applications that may want to resolve the hash at runtime should
+		// call Algorithm.Available before call Algorithm.Hash().
+		panic(fmt.Sprintf("%v not available (make sure it is imported)", a))
+	}
+
+	return algorithms[a].New()
+}
+
+// FromReader returns the digest of the reader using the algorithm.
+func (a Algorithm) FromReader(rd io.Reader) (Digest, error) {
+	digester := a.Digester()
+
+	if _, err := io.Copy(digester.Hash(), rd); err != nil {
+		return "", err
+	}
+
+	return digester.Digest(), nil
+}
+
+// FromBytes digests the input and returns a Digest.
+func (a Algorithm) FromBytes(p []byte) Digest {
+	digester := a.Digester()
+
+	if _, err := digester.Hash().Write(p); err != nil {
+		// Writes to a Hash should never fail. None of the existing
+		// hash implementations in the stdlib or hashes vendored
+		// here can return errors from Write. Having a panic in this
+		// condition instead of having FromBytes return an error value
+		// avoids unnecessary error handling paths in all callers.
+		panic("write to hash function returned error: " + err.Error())
+	}
+
+	return digester.Digest()
+}
+
+// FromString digests the string input and returns a Digest.
+func (a Algorithm) FromString(s string) Digest {
+	return a.FromBytes([]byte(s))
+}
diff --git a/vendor/github.com/opencontainers/go-digest/digest.go b/vendor/github.com/opencontainers/go-digest/digest.go
new file mode 100644
index 0000000000..7c66c30c01
--- /dev/null
+++ b/vendor/github.com/opencontainers/go-digest/digest.go
@@ -0,0 +1,140 @@
+package digest
+
+import (
+	"fmt"
+	"hash"
+	"io"
+	"regexp"
+	"strings"
+)
+
+// Digest allows simple protection of hex formatted digest strings, prefixed
+// by their algorithm. Strings of type Digest have some guarantee of being in
+// the correct format and it provides quick access to the components of a
+// digest string.
+//
+// The following is an example of the contents of Digest types:
+//
+// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
+//
+// This allows to abstract the digest behind this type and work only in those
+// terms.
+type Digest string
+
+// NewDigest returns a Digest from alg and a hash.Hash object.
+func NewDigest(alg Algorithm, h hash.Hash) Digest {
+	return NewDigestFromBytes(alg, h.Sum(nil))
+}
+
+// NewDigestFromBytes returns a new digest from the byte contents of p.
+// Typically, this can come from hash.Hash.Sum(...) or xxx.SumXXX(...)
+// functions. This is also useful for rebuilding digests from binary
+// serializations.
+func NewDigestFromBytes(alg Algorithm, p []byte) Digest {
+	return Digest(fmt.Sprintf("%s:%x", alg, p))
+}
+
+// NewDigestFromHex returns a Digest from alg and a the hex encoded digest.
+func NewDigestFromHex(alg, hex string) Digest {
+	return Digest(fmt.Sprintf("%s:%s", alg, hex))
+}
+
+// DigestRegexp matches valid digest types.
+var DigestRegexp = regexp.MustCompile(`[a-zA-Z0-9-_+.]+:[a-fA-F0-9]+`)
+
+// DigestRegexpAnchored matches valid digest types, anchored to the start and end of the match.
+var DigestRegexpAnchored = regexp.MustCompile(`^` + DigestRegexp.String() + `$`)
+
+var (
+	// ErrDigestInvalidFormat returned when digest format invalid.
+	ErrDigestInvalidFormat = fmt.Errorf("invalid checksum digest format")
+
+	// ErrDigestInvalidLength returned when digest has invalid length.
+	ErrDigestInvalidLength = fmt.Errorf("invalid checksum digest length")
+
+	// ErrDigestUnsupported returned when the digest algorithm is unsupported.
+	ErrDigestUnsupported = fmt.Errorf("unsupported digest algorithm")
+)
+
+// Parse parses s and returns the validated digest object. An error will
+// be returned if the format is invalid.
+func Parse(s string) (Digest, error) {
+	d := Digest(s)
+	return d, d.Validate()
+}
+
+// FromReader consumes the content of rd until io.EOF, returning canonical digest.
+func FromReader(rd io.Reader) (Digest, error) {
+	return Canonical.FromReader(rd)
+}
+
+// FromBytes digests the input and returns a Digest.
+func FromBytes(p []byte) Digest {
+	return Canonical.FromBytes(p)
+}
+
+// FromString digests the input and returns a Digest.
+func FromString(s string) Digest {
+	return Canonical.FromString(s)
+}
+
+// Validate checks that the contents of d is a valid digest, returning an
+// error if not.
+func (d Digest) Validate() error {
+	s := string(d)
+
+	i := strings.Index(s, ":")
+
+	// validate i then run through regexp
+	if i < 0 || i+1 == len(s) || !DigestRegexpAnchored.MatchString(s) {
+		return ErrDigestInvalidFormat
+	}
+
+	algorithm := Algorithm(s[:i])
+	if !algorithm.Available() {
+		return ErrDigestUnsupported
+	}
+
+	// Digests much always be hex-encoded, ensuring that their hex portion will
+	// always be size*2
+	if algorithm.Size()*2 != len(s[i+1:]) {
+		return ErrDigestInvalidLength
+	}
+
+	return nil
+}
+
+// Algorithm returns the algorithm portion of the digest. This will panic if
+// the underlying digest is not in a valid format.
+func (d Digest) Algorithm() Algorithm {
+	return Algorithm(d[:d.sepIndex()])
+}
+
+// Verifier returns a writer object that can be used to verify a stream of
+// content against the digest. If the digest is invalid, the method will panic.
+func (d Digest) Verifier() Verifier {
+	return hashVerifier{
+		hash:   d.Algorithm().Hash(),
+		digest: d,
+	}
+}
+
+// Hex returns the hex digest portion of the digest. This will panic if the
+// underlying digest is not in a valid format.
+func (d Digest) Hex() string {
+	return string(d[d.sepIndex()+1:])
+}
+
+func (d Digest) String() string {
+	return string(d)
+}
+
+func (d Digest) sepIndex() int {
+	i := strings.Index(string(d), ":")
+
+	if i < 0 {
+		panic(fmt.Sprintf("no ':' separator in digest %q", d))
+	}
+
+	return i
+}
diff --git a/vendor/github.com/opencontainers/go-digest/digester.go b/vendor/github.com/opencontainers/go-digest/digester.go
new file mode 100644
index 0000000000..918a3f9191
--- /dev/null
+++ b/vendor/github.com/opencontainers/go-digest/digester.go
@@ -0,0 +1,25 @@
+package digest
+
+import "hash"
+
+// Digester calculates the digest of written data. Writes should go directly
+// to the return value of Hash, while calling Digest will return the current
+// value of the digest.
+type Digester interface {
+	Hash() hash.Hash // provides direct access to underlying hash instance.
+	Digest() Digest
+}
+
+// digester provides a simple digester definition that embeds a hasher.
+type digester struct {
+	alg  Algorithm
+	hash hash.Hash
+}
+
+func (d *digester) Hash() hash.Hash {
+	return d.hash
+}
+
+func (d *digester) Digest() Digest {
+	return NewDigest(d.alg, d.hash)
+}
diff --git a/vendor/github.com/opencontainers/go-digest/doc.go b/vendor/github.com/opencontainers/go-digest/doc.go
new file mode 100644
index 0000000000..f64b0db32b
--- /dev/null
+++ b/vendor/github.com/opencontainers/go-digest/doc.go
@@ -0,0 +1,42 @@
+// Package digest provides a generalized type to opaquely represent message
+// digests and their operations within the registry. The Digest type is
+// designed to serve as a flexible identifier in a content-addressable system.
+// More importantly, it provides tools and wrappers to work with
+// hash.Hash-based digests with little effort.
+//
+// Basics
+//
+// The format of a digest is simply a string with two parts, dubbed the
+// "algorithm" and the "digest", separated by a colon:
+//
+// 	<algorithm>:<digest>
+//
+// An example of a sha256 digest representation follows:
+//
+// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
+//
+// In this case, the string "sha256" is the algorithm and the hex bytes are
+// the "digest".
+//
+// Because the Digest type is simply a string, once a valid Digest is
+// obtained, comparisons are cheap, quick and simple to express with the
+// standard equality operator.
+//
+// Verification
+//
+// The main benefit of using the Digest type is simple verification against a
+// given digest. The Verifier interface, modeled after the stdlib hash.Hash
+// interface, provides a common write sink for digest verification. After
+// writing is complete, calling the Verifier.Verified method will indicate
+// whether or not the stream of bytes matches the target digest.
+//
+// Missing Features
+//
+// In addition to the above, we intend to add the following features to this
+// package:
+//
+// 1. A Digester type that supports write sink digest calculation.
+//
+// 2. Suspend and resume of ongoing digest calculations to support efficient digest verification in the registry.
+//
+package digest
diff --git a/vendor/github.com/opencontainers/go-digest/verifiers.go b/vendor/github.com/opencontainers/go-digest/verifiers.go
new file mode 100644
index 0000000000..f1db6cda84
--- /dev/null
+++ b/vendor/github.com/opencontainers/go-digest/verifiers.go
@@ -0,0 +1,31 @@
+package digest
+
+import (
+	"hash"
+	"io"
+)
+
+// Verifier presents a general verification interface to be used with message
+// digests and other byte stream verifications. Users instantiate a Verifier
+// from one of the various methods, write the data under test to it then check
+// the result with the Verified method.
+type Verifier interface {
+	io.Writer
+
+	// Verified will return true if the content written to Verifier matches
+	// the digest.
+	Verified() bool
+}
+
+type hashVerifier struct {
+	digest Digest
+	hash   hash.Hash
+}
+
+func (hv hashVerifier) Write(p []byte) (n int, err error) {
+	return hv.hash.Write(p)
+}
+
+func (hv hashVerifier) Verified() bool {
+	return hv.digest == NewDigest(hv.digest.Algorithm(), hv.hash)
+}
diff --git a/vendor/golang.org/x/text/gen.go b/vendor/golang.org/x/text/gen.go
index 4ed42b814e..5d973f08cb 100644
--- a/vendor/golang.org/x/text/gen.go
+++ b/vendor/golang.org/x/text/gen.go
@@ -12,9 +12,14 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
+	"go/build"
+	"go/format"
+	"io/ioutil"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"strings"
 	"sync"
@@ -26,6 +31,7 @@ import (
 var (
 	verbose     = flag.Bool("v", false, "verbose output")
 	force       = flag.Bool("force", false, "ignore failing dependencies")
+	doCore      = flag.Bool("core", false, "force an update to core")
 	excludeList = flag.String("exclude", "",
 		"comma-separated list of packages to exclude")
 
@@ -61,6 +67,7 @@ func main() {
 	// variable. This will prevent duplicate downloads and also will enable long
 	// tests, which really need to be run after each generated package.
 
+	updateCore := *doCore
 	if gen.UnicodeVersion() != unicode.Version {
 		fmt.Printf("Requested Unicode version %s; core unicode version is %s.\n",
 			gen.UnicodeVersion(),
@@ -72,26 +79,49 @@ func main() {
 		if gen.UnicodeVersion() < unicode.Version && !*force {
 			os.Exit(2)
 		}
+		updateCore = true
 	}
+
+	var unicode = &dependency{}
+	if updateCore {
+		fmt.Printf("Updating core to version %s...\n", gen.UnicodeVersion())
+		unicode = generate("unicode")
+
+		// Test some users of the unicode packages, especially the ones that
+		// keep a mirrored table. These may need to be corrected by hand.
+		generate("regexp", unicode)
+		generate("strconv", unicode) // mimics Unicode table
+		generate("strings", unicode)
+		generate("testing", unicode) // mimics Unicode table
+	}
+
 	var (
-		cldr       = generate("unicode/cldr")
-		language   = generate("language", cldr)
-		internal   = generate("internal", language)
-		norm       = generate("unicode/norm")
-		rangetable = generate("unicode/rangetable")
-		cases      = generate("cases", norm, language, rangetable)
-		width      = generate("width")
-		bidi       = generate("unicode/bidi", norm, rangetable)
-		_          = generate("secure/precis", norm, rangetable, cases, width, bidi)
-		_          = generate("encoding/htmlindex", language)
-		_          = generate("currency", cldr, language, internal)
-		_          = generate("internal/number", cldr, language, internal)
-		_          = generate("language/display", cldr, language)
-		_          = generate("collate", norm, cldr, language, rangetable)
-		_          = generate("search", norm, cldr, language, rangetable)
+		cldr       = generate("./unicode/cldr", unicode)
+		language   = generate("./language", cldr)
+		internal   = generate("./internal", unicode, language)
+		norm       = generate("./unicode/norm", unicode)
+		rangetable = generate("./unicode/rangetable", unicode)
+		cases      = generate("./cases", unicode, norm, language, rangetable)
+		width      = generate("./width", unicode)
+		bidi       = generate("./unicode/bidi", unicode, norm, rangetable)
+		_          = generate("./secure/precis", unicode, norm, rangetable, cases, width, bidi)
+		_          = generate("./encoding/htmlindex", unicode, language)
+		_          = generate("./currency", unicode, cldr, language, internal)
+		_          = generate("./internal/number", unicode, cldr, language, internal)
+		_          = generate("./internal/export/idna", unicode, bidi, norm)
+		_          = generate("./language/display", unicode, cldr, language, internal)
+		_          = generate("./collate", unicode, norm, cldr, language, rangetable)
+		_          = generate("./search", unicode, norm, cldr, language, rangetable)
 	)
 	all.Wait()
 
+	// Copy exported packages to the destination golang.org repo.
+	copyExported("golang.org/x/net/idna")
+
+	if updateCore {
+		copyVendored()
+	}
+
 	if hasErrors {
 		fmt.Println("FAIL")
 		os.Exit(1)
@@ -133,7 +163,7 @@ func generate(pkg string, deps ...*dependency) *dependency {
 		if *verbose {
 			args = append(args, "-v")
 		}
-		args = append(args, "./"+pkg)
+		args = append(args, pkg)
 		cmd := exec.Command(filepath.Join(runtime.GOROOT(), "bin", "go"), args...)
 		w := &bytes.Buffer{}
 		cmd.Stderr = w
@@ -163,6 +193,83 @@ func generate(pkg string, deps ...*dependency) *dependency {
 	return &wg
 }
 
+// copyExported copies a package in x/text/internal/export to the
+// destination repository.
+func copyExported(p string) {
+	copyPackage(
+		filepath.Join("internal", "export", path.Base(p)),
+		filepath.Join("..", filepath.FromSlash(p[len("golang.org/x"):])),
+		"golang.org/x/text/internal/export/"+path.Base(p),
+		p)
+}
+
+// copyVendored copies packages used by Go core into the vendored directory.
+func copyVendored() {
+	root := filepath.Join(build.Default.GOROOT, filepath.FromSlash("src/vendor/golang_org/x"))
+
+	err := filepath.Walk(root, func(dir string, info os.FileInfo, err error) error {
+		if err != nil || !info.IsDir() || root == dir {
+			return err
+		}
+		src := dir[len(root)+1:]
+		const slash = string(filepath.Separator)
+		if c := strings.Split(src, slash); c[0] == "text" {
+			// Copy a text repo package from its normal location.
+			src = strings.Join(c[1:], slash)
+		} else {
+			// Copy the vendored package if it exists in the export directory.
+			src = filepath.Join("internal", "export", filepath.Base(src))
+		}
+		copyPackage(src, dir, "golang.org", "golang_org")
+		return nil
+	})
+	if err != nil {
+		fmt.Printf("Seeding directory %s has failed %v:", root, err)
+		os.Exit(1)
+	}
+}
+
+// goGenRE is used to remove go:generate lines.
+var goGenRE = regexp.MustCompile("//go:generate[^\n]*\n")
+
+// copyPackage copies relevant files from a directory in x/text to the
+// destination package directory. The destination package is assumed to have
+// the same name. For each copied file go:generate lines are removed and
+// and package comments are rewritten to the new path.
+func copyPackage(dirSrc, dirDst, search, replace string) {
+	err := filepath.Walk(dirSrc, func(file string, info os.FileInfo, err error) error {
+		base := filepath.Base(file)
+		if err != nil || info.IsDir() ||
+			!strings.HasSuffix(base, ".go") ||
+			strings.HasSuffix(base, "_test.go") ||
+			// Don't process subdirectories.
+			filepath.Dir(file) != dirSrc {
+			return nil
+		}
+		b, err := ioutil.ReadFile(file)
+		if err != nil || bytes.Contains(b, []byte("\n// +build ignore")) {
+			return err
+		}
+		// Fix paths.
+		b = bytes.Replace(b, []byte(search), []byte(replace), -1)
+		// Remove go:generate lines.
+		b = goGenRE.ReplaceAllLiteral(b, nil)
+		const comment = "// Copied from the golang.org/x/text repo; DO NOT EDIT\n\n"
+		b = append([]byte(comment), b...)
+		if b, err = format.Source(b); err != nil {
+			fmt.Println("Failed to format file:", err)
+			os.Exit(1)
+		}
+		file = filepath.Join(dirDst, base)
+		vprintf("=== COPY %s\n", file)
+		return ioutil.WriteFile(file, b, 0666)
+	})
+	if err != nil {
+		fmt.Println("Copying exported files failed:", err)
+		os.Exit(1)
+	}
+}
+
 func contains(a []string, s string) bool {
 	for _, e := range a {
 		if s == e {
diff --git a/vendor/golang.org/x/text/transform/transform.go b/vendor/golang.org/x/text/transform/transform.go
index 0c2f730ea0..fe47b9b35f 100644
--- a/vendor/golang.org/x/text/transform/transform.go
+++ b/vendor/golang.org/x/text/transform/transform.go
@@ -24,6 +24,10 @@ var (
 	// complete the transformation.
 	ErrShortSrc = errors.New("transform: short source buffer")
 
+	// ErrEndOfSpan means that the input and output (the transformed input)
+	// are not identical.
+	ErrEndOfSpan = errors.New("transform: input and output are not identical")
+
 	// errInconsistentByteCount means that Transform returned success (nil
 	// error) but also returned nSrc inconsistent with the src argument.
 	errInconsistentByteCount = errors.New("transform: inconsistent byte count returned")
@@ -60,6 +64,41 @@ type Transformer interface {
 	Reset()
 }
 
+// SpanningTransformer extends the Transformer interface with a Span method
+// that determines how much of the input already conforms to the Transformer.
+type SpanningTransformer interface {
+	Transformer
+
+	// Span returns a position in src such that transforming src[:n] results in
+	// identical output src[:n] for these bytes. It does not necessarily return
+	// the largest such n. The atEOF argument tells whether src represents the
+	// last bytes of the input.
+	//
+	// Callers should always account for the n bytes consumed before
+	// considering the error err.
+	//
+	// A nil error means that all input bytes are known to be identical to the
+	// output produced by the Transformer. A nil error can be be returned
+	// regardless of whether atEOF is true. If err is nil, then then n must
+	// equal len(src); the converse is not necessarily true.
+	//
+	// ErrEndOfSpan means that the Transformer output may differ from the
+	// input after n bytes. Note that n may be len(src), meaning that the output
+	// would contain additional bytes after otherwise identical output.
+	// ErrShortSrc means that src had insufficient data to determine whether the
+	// remaining bytes would change. Other than the error conditions listed
+	// here, implementations are free to report other errors that arise.
+	//
+	// Calling Span can modify the Transformer state as a side effect. In
+	// effect, it does the transformation just as calling Transform would, only
+	// without copying to a destination buffer and only up to a point it can
+	// determine the input and output bytes are the same. This is obviously more
+	// limited than calling Transform, but can be more efficient in terms of
+	// copying and allocating buffers. Calls to Span and Transform may be
+	// interleaved.
+	Span(src []byte, atEOF bool) (n int, err error)
+}
+
 // NopResetter can be embedded by implementations of Transformer to add a nop
 // Reset method.
 type NopResetter struct{}
@@ -278,6 +317,10 @@ func (nop) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	return n, n, err
 }
 
+func (nop) Span(src []byte, atEOF bool) (n int, err error) {
+	return len(src), nil
+}
+
 type discard struct{ NopResetter }
 
 func (discard) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
@@ -289,8 +332,8 @@ var (
 	// by consuming all bytes and writing nothing.
 	Discard Transformer = discard{}
 
-	// Nop is a Transformer that copies src to dst.
-	Nop Transformer = nop{}
+	// Nop is a SpanningTransformer that copies src to dst.
+	Nop SpanningTransformer = nop{}
 )
 
 // chain is a sequence of links. A chain with N Transformers has N+1 links and
@@ -358,6 +401,8 @@ func (c *chain) Reset() {
 	}
 }
 
+// TODO: make chain use Span (is going to be fun to implement!)
+
 // Transform applies the transformers of c in sequence.
 func (c *chain) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	// Set up src and dst in the chain.
@@ -448,8 +493,7 @@ func (c *chain) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err erro
 	return dstL.n, srcL.p, err
 }
 
-// RemoveFunc returns a Transformer that removes from the input all runes r for
-// which f(r) is true. Illegal bytes in the input are replaced by RuneError.
+// Deprecated: use runes.Remove instead.
 func RemoveFunc(f func(r rune) bool) Transformer {
 	return removeF(f)
 }
diff --git a/vendor/golang.org/x/text/unicode/norm/forminfo.go b/vendor/golang.org/x/text/unicode/norm/forminfo.go
index 15a67c653a..8c78b15c79 100644
--- a/vendor/golang.org/x/text/unicode/norm/forminfo.go
+++ b/vendor/golang.org/x/text/unicode/norm/forminfo.go
@@ -56,28 +56,31 @@ type formInfo struct {
 	nextMain                 iterFunc
 }
 
-var formTable []*formInfo
-
-func init() {
-	formTable = make([]*formInfo, 4)
-
-	for i := range formTable {
-		f := &formInfo{}
-		formTable[i] = f
-		f.form = Form(i)
-		if Form(i) == NFKD || Form(i) == NFKC {
-			f.compatibility = true
-			f.info = lookupInfoNFKC
-		} else {
-			f.info = lookupInfoNFC
-		}
-		f.nextMain = nextDecomposed
-		if Form(i) == NFC || Form(i) == NFKC {
-			f.nextMain = nextComposed
-			f.composing = true
-		}
-	}
-}
+var formTable = []*formInfo{{
+	form:          NFC,
+	composing:     true,
+	compatibility: false,
+	info:          lookupInfoNFC,
+	nextMain:      nextComposed,
+}, {
+	form:          NFD,
+	composing:     false,
+	compatibility: false,
+	info:          lookupInfoNFC,
+	nextMain:      nextDecomposed,
+}, {
+	form:          NFKC,
+	composing:     true,
+	compatibility: true,
+	info:          lookupInfoNFKC,
+	nextMain:      nextComposed,
+}, {
+	form:          NFKD,
+	composing:     false,
+	compatibility: true,
+	info:          lookupInfoNFKC,
+	nextMain:      nextDecomposed,
+}}
 
 // We do not distinguish between boundaries for NFC, NFD, etc. to avoid
 // unexpected behavior for the user.  For example, in NFD, there is a boundary
diff --git a/vendor/golang.org/x/text/unicode/norm/normalize.go b/vendor/golang.org/x/text/unicode/norm/normalize.go
index eb5596f86a..bba8ce9f95 100644
--- a/vendor/golang.org/x/text/unicode/norm/normalize.go
+++ b/vendor/golang.org/x/text/unicode/norm/normalize.go
@@ -8,7 +8,11 @@
 // Package norm contains types and functions for normalizing Unicode strings.
 package norm // import "golang.org/x/text/unicode/norm"
 
-import "unicode/utf8"
+import (
+	"unicode/utf8"
+
+	"golang.org/x/text/transform"
+)
 
 // A Form denotes a canonical representation of Unicode code points.
 // The Unicode-defined normalization and equivalence forms are:
@@ -263,6 +267,34 @@ func (f Form) QuickSpan(b []byte) int {
 	return n
 }
 
+// Span implements transform.SpanningTransformer. It returns a boundary n such
+// that b[0:n] == f(b[0:n]). It is not guaranteed to return the largest such n.
+func (f Form) Span(b []byte, atEOF bool) (n int, err error) {
+	n, ok := formTable[f].quickSpan(inputBytes(b), 0, len(b), atEOF)
+	if n < len(b) {
+		if !ok {
+			err = transform.ErrEndOfSpan
+		} else {
+			err = transform.ErrShortSrc
+		}
+	}
+	return n, err
+}
+
+// SpanString returns a boundary n such that s[0:n] == f(s[0:n]).
+// It is not guaranteed to return the largest such n.
+func (f Form) SpanString(s string, atEOF bool) (n int, err error) {
+	n, ok := formTable[f].quickSpan(inputString(s), 0, len(s), atEOF)
+	if n < len(s) {
+		if !ok {
+			err = transform.ErrEndOfSpan
+		} else {
+			err = transform.ErrShortSrc
+		}
+	}
+	return n, err
+}
+
 // quickSpan returns a boundary n such that src[0:n] == f(src[0:n]) and
 // whether any non-normalized parts were found. If atEOF is false, n will
 // not point past the last segment if this segment might be become
@@ -321,7 +353,7 @@ func (f *formInfo) quickSpan(src input, i, end int, atEOF bool) (n int, ok bool)
 	return lastSegStart, false
 }
 
-// QuickSpanString returns a boundary n such that b[0:n] == f(s[0:n]).
+// QuickSpanString returns a boundary n such that s[0:n] == f(s[0:n]).
 // It is not guaranteed to return the largest such n.
 func (f Form) QuickSpanString(s string) int {
 	n, _ := formTable[f].quickSpan(inputString(s), 0, len(s), true)
diff --git a/vendor/golang.org/x/text/unicode/norm/readwriter.go b/vendor/golang.org/x/text/unicode/norm/readwriter.go
index 4fa0e04b21..d926ee903e 100644
--- a/vendor/golang.org/x/text/unicode/norm/readwriter.go
+++ b/vendor/golang.org/x/text/unicode/norm/readwriter.go
@@ -112,7 +112,6 @@ func (r *normReader) Read(p []byte) (int, error) {
 			}
 		}
 	}
-	panic("should not reach here")
 }
 
 // Reader returns a new reader that implements Read
diff --git a/vendor/golang.org/x/text/width/transform.go b/vendor/golang.org/x/text/width/transform.go
index 2ed25096ac..0049f700a2 100644
--- a/vendor/golang.org/x/text/width/transform.go
+++ b/vendor/golang.org/x/text/width/transform.go
@@ -14,6 +14,32 @@ type foldTransform struct {
 	transform.NopResetter
 }
 
+func (foldTransform) Span(src []byte, atEOF bool) (n int, err error) {
+	for n < len(src) {
+		if src[n] < utf8.RuneSelf {
+			// ASCII fast path.
+			for n++; n < len(src) && src[n] < utf8.RuneSelf; n++ {
+			}
+			continue
+		}
+		v, size := trie.lookup(src[n:])
+		if size == 0 { // incomplete UTF-8 encoding
+			if !atEOF {
+				err = transform.ErrShortSrc
+			} else {
+				n = len(src)
+			}
+			break
+		}
+		if elem(v)&tagNeedsFold != 0 {
+			err = transform.ErrEndOfSpan
+			break
+		}
+		n += size
+	}
+	return n, err
+}
+
 func (foldTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	for nSrc < len(src) {
 		if src[nSrc] < utf8.RuneSelf {
@@ -70,6 +96,33 @@ type narrowTransform struct {
 	transform.NopResetter
 }
 
+func (narrowTransform) Span(src []byte, atEOF bool) (n int, err error) {
+	for n < len(src) {
+		if src[n] < utf8.RuneSelf {
+			// ASCII fast path.
+			for n++; n < len(src) && src[n] < utf8.RuneSelf; n++ {
+			}
+			continue
+		}
+		v, size := trie.lookup(src[n:])
+		if size == 0 { // incomplete UTF-8 encoding
+			if !atEOF {
+				err = transform.ErrShortSrc
+			} else {
+				n = len(src)
+			}
+			break
+		}
+		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianFullwidth && k != EastAsianWide && k != EastAsianAmbiguous {
+		} else {
+			err = transform.ErrEndOfSpan
+			break
+		}
+		n += size
+	}
+	return n, err
+}
+
 func (narrowTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	for nSrc < len(src) {
 		if src[nSrc] < utf8.RuneSelf {
@@ -126,6 +179,30 @@ type wideTransform struct {
 	transform.NopResetter
 }
 
+func (wideTransform) Span(src []byte, atEOF bool) (n int, err error) {
+	for n < len(src) {
+		// TODO: Consider ASCII fast path. Special-casing ASCII handling can
+		// reduce the ns/op of BenchmarkWideASCII by about 30%. This is probably
+		// not enough to warrant the extra code and complexity.
+		v, size := trie.lookup(src[n:])
+		if size == 0 { // incomplete UTF-8 encoding
+			if !atEOF {
+				err = transform.ErrShortSrc
+			} else {
+				n = len(src)
+			}
+			break
+		}
+		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianHalfwidth && k != EastAsianNarrow {
+		} else {
+			err = transform.ErrEndOfSpan
+			break
+		}
+		n += size
+	}
+	return n, err
+}
+
 func (wideTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	for nSrc < len(src) {
 		// TODO: Consider ASCII fast path. Special-casing ASCII handling can
diff --git a/vendor/golang.org/x/text/width/width.go b/vendor/golang.org/x/text/width/width.go
index dc026eef6b..f1639ca68a 100644
--- a/vendor/golang.org/x/text/width/width.go
+++ b/vendor/golang.org/x/text/width/width.go
@@ -153,17 +153,22 @@ func (p Properties) Wide() rune {
 
 // Transformer implements the transform.Transformer interface.
 type Transformer struct {
-	t transform.Transformer
+	t transform.SpanningTransformer
 }
 
 // Reset implements the transform.Transformer interface.
 func (t Transformer) Reset() { t.t.Reset() }
 
-// Transform implements the Transformer interface.
+// Transform implements the transform.Transformer interface.
 func (t Transformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	return t.t.Transform(dst, src, atEOF)
 }
 
+// Span implements the transform.SpanningTransformer interface.
+func (t Transformer) Span(src []byte, atEOF bool) (n int, err error) {
+	return t.t.Span(src, atEOF)
+}
+
 // Bytes returns a new byte slice with the result of applying t to b.
 func (t Transformer) Bytes(b []byte) []byte {
 	b, _, _ = transform.Bytes(t, b)

From ec37f3cb649bfb72408906e7cbf330e4aeda1075 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 20 Feb 2017 10:15:28 +0000
Subject: [PATCH 1064/1304] version: bump to v1.25.0

---
 CHANGELOG.md                         | 16 ++++++++++++++++
 Documentation/distributions.md       | 16 ++++++++--------
 Documentation/proposals/oci.md       |  6 +++---
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  4 ++--
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 ROADMAP.md                           | 11 -----------
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 19 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8ca5ee88b..76f687257c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.25.0
+
+This minor release contains bugfixes and other improvements related to the KVM flavour, which is now using qemu-kvm by default.
+
+## New Features:
+- Switch default kvm flavour from lkvm to qemu ([#3562](https://github.com/coreos/rkt/pull/3562)).
+
+### Bug fixes
+- stage1/kvm: Change RAM calculation, and increase minimum ([#3572](https://github.com/coreos/rkt/pull/3572)).
+- stage1: Ensure ptmx device usable by non-root for all flavours ([#3484](https://github.com/coreos/rkt/pull/3484)).
+
+## Other changes:
+- tests: fix TestNonRootReadInfo when $HOME is only accessible by current user ([#3580](https://github.com/coreos/rkt/pull/3580)).
+- glide: bump grpc to 1.0.4 ([#3584](https://github.com/coreos/rkt/pull/3584)).
+- vendor: bump docker2aci to 0.16.0 ([#3591](https://github.com/coreos/rkt/pull/3591)).
+
 ## 1.24.0
 
 This release includes experimental support for attaching to a running application's input and output. It also introduces
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 355dee1092..30b57a8eb0 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -132,19 +132,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt-1.24.0-1.x86_64.rpm
-wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt-1.24.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.24.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.24.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt-1.25.0-1.x86_64.rpm
+wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt-1.25.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.25.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.25.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt_1.24.0-1_amd64.deb
-wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt_1.24.0-1_amd64.deb.asc
-gpg --verify rkt_1.24.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.24.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt_1.25.0-1_amd64.deb
+wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt_1.25.0-1_amd64.deb.asc
+gpg --verify rkt_1.25.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.25.0-1_amd64.deb
 ```
 
 [coreos-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 9a1d0cb3f4..2929461b63 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/coreos/rkt/blob/v1.24.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.24.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/coreos/rkt/blob/v1.24.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/coreos/rkt/blob/v1.25.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.25.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/coreos/rkt/blob/v1.25.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 1fe71e6dd6..e8ddfe3fc1 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.24.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.25.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.24.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.25.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 5612135cab..a7ef89a4b3 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -13,7 +13,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.24.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.25.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
@@ -84,7 +84,7 @@ If you want to run software that requires hypervisor isolation along with truste
 For example, to use the official kvm stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.24.0 coreos.com/etcd:v2.0.9
+# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.25.0 coreos.com/etcd:v2.0.9
 ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 4fa912d359..62afc231e1 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.24.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.25.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.24.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.25.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index cd4cc2403b..9e18107381 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.24.0
+rkt Version: 1.25.0
 appc Version: 0.8.10
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 8291e8766e..2c4165e5ec 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.24.0/rkt-v1.24.0.tar.gz
-tar xzvf rkt-v1.24.0.tar.gz
-cd rkt-v1.24.0
+wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt-v1.25.0.tar.gz
+tar xzvf rkt-v1.25.0.tar.gz
+cd rkt-v1.25.0
 ./rkt help
 ```
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 38f2c462fe..3d4c1fcfc8 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -12,17 +12,6 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 - [OCI native support](https://github.com/coreos/rkt/projects/4): supporting OCI specs natively in rkt.
 - [appc phase-out](https://github.com/coreos/rkt/projects/5): following OCI evolution and stabilization, appc will be naturally deprecated and phased-out.
 
-## Next releases
-
-### rkt 1.25.0 (February)
-
-Up-to-date planning at https://github.com/coreos/rkt/milestone/59.
-
-### rkt 1.26.0 (February)
-
-Up-to-date planning at https://github.com/coreos/rkt/milestone/60.
-
-
 ### Upcoming
 
 Future tasks without a specific timeline are tracked at https://github.com/coreos/rkt/milestone/30.
diff --git a/configure.ac b/configure.ac
index 45e86cec81..55c98a16c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.24.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.25.0], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 9c6d144e28..1f66c80a34 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.24.0"
+version="1.25.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 88054c9c36..bb95208670 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.24.0"
+            "value": "1.25.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index f99d2735a1..08d342a5dd 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.24.0"
+            "value": "1.25.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 72f5095dc7..ceb1452f73 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.24.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.25.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 1b6e06b7fa..e8ad6378a8 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -35,7 +35,7 @@ func TestRunOverrideExec(t *testing.T) {
 	noappManifest := schema.ImageManifest{
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
-			{"version", "1.24.0"},
+			{"version", "1.25.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index f326333fdc..0b28428fb3 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -46,7 +46,7 @@ func TestImageCatManifest(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.24.0"},
+			{"version", "1.25.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index b16e0fbdb3..25d180aa1c 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -45,7 +45,7 @@ func TestImageExport(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.24.0"},
+			{"version", "1.25.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 9747a4ff12..104a66dad9 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -55,7 +55,7 @@ func TestImageRender(t *testing.T) {
 			{ImageName: "coreos.com/rkt-inspect"},
 		},
 		Labels: types.Labels{
-			{"version", "1.24.0"},
+			{"version", "1.25.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 2da821e17a..f76aa1c702 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -58,7 +58,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"version", "1.24.0"},
+			{"version", "1.25.0"},
 		},
 	}
 

From 087ef096c27efc818f4506038e0c91ada157a97b Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 20 Feb 2017 10:15:29 +0000
Subject: [PATCH 1065/1304] version: bump to v1.25.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 55c98a16c7..b48f83e239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.25.0], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.25.0+git], [https://github.com/coreos/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index ceb1452f73..62e866724b 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.25.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.25.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 6d2f0312eaf9ad917a28a87a2ffcbae42d506398 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 20 Feb 2017 17:26:26 +0000
Subject: [PATCH 1066/1304] scripts: update rkt-builder version

---
 scripts/build-rir.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 75bad141dd..996999f0ad 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.1.1}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.2.0}"
 RKT_CMD="${RKT_CMD:-rkt}"
 
 mkdir -p $BUILDDIR

From 0d2f81cbcc0292a7598c0544be980edc6bb0fd13 Mon Sep 17 00:00:00 2001
From: Paul Burt <pgburt@gmail.com>
Date: Fri, 3 Mar 2017 14:31:50 -0500
Subject: [PATCH 1067/1304] added production-users and integrations pages

added cAdvisor and tweaked Kinvolk entry.
---
 Documentation/integrations.md     | 19 +++++++++++++++++++
 Documentation/production-users.md | 12 ++++++++++++
 README.md                         |  7 +++++++
 3 files changed, 38 insertions(+)
 create mode 100644 Documentation/integrations.md
 create mode 100644 Documentation/production-users.md

diff --git a/Documentation/integrations.md b/Documentation/integrations.md
new file mode 100644
index 0000000000..29a8a980fd
--- /dev/null
+++ b/Documentation/integrations.md
@@ -0,0 +1,19 @@
+# Integrations
+This document tracks projects that integrate with rkt. [Join the community](https://github.com/coreos/rkt/), and help us keep the list up-to-date.
+
+## Projects 
+[Kubernetes](https://kubernetes.io/docs/getting-started-guides/rkt/): a enterprise grade container orchestration solution. Kubernetes offers rkt support as an alternative to the standard install.
+
+[Nomad](https://www.nomadproject.io/docs/drivers/rkt.html): a container orchestration platform focused on ease of use. Nomad supports rkt through the rkt driver.
+
+[dgr](https://github.com/blablacar/dgr): a container build and runtime tool, preferring convention over configuration.
+
+[Mulled](https://github.com/BioContainers/mulled): a tool for generating minimal container images.
+
+[Quay.io](https://quay.io/): an enterprise ready container registry. Quay hosts rkt images.
+
+[SELinux](https://coreos.com/rkt/docs/latest/selinux.html): an access control and security toolkit for containers.
+
+[Linux](https://coreos.com/rkt/docs/latest/distributions.html): an open an extensible OS. rkt is included in the package managers on Red Hat, Ubuntu, and many other popular Linux distributions.
+
+[cAdvisor](https://github.com/google/cadvisor): a daemon that monitors resource usage and performance for running containers.
\ No newline at end of file
diff --git a/Documentation/production-users.md b/Documentation/production-users.md
new file mode 100644
index 0000000000..1c1937df51
--- /dev/null
+++ b/Documentation/production-users.md
@@ -0,0 +1,12 @@
+# Production users
+
+This document tracks people and use cases for rkt in production. [Join the community](https://github.com/coreos/rkt/), and help us keep the list up-to-date.
+
+## [BlaBlaCar](https://www.blablacar.com/)
+BlaBlaCar is a trusted car-pooling service based in France. They've [blogged about](http://blablatech.com/blog/why-and-how-blablacar-went-full-containers) the stability of rkt being a big appeal.
+
+## [Kumul.us](https://kumul.us/)
+Kumulus Technologies offers classes and services to optimize your Cloud. They've [blogged about](https://kumul.us/docker-youve-failed-me-again-rkt-please-save-me/) rkt's pod native features and Kubernetes support being a reason for their adoption.
+
+## [Kinvolk.io](https://kinvolk.io/)
+Kinvolk are a professional consulting team and active contributors to systemd, rkt, and the Linux kernel. rkt helps them easily [test various Linux kernels and configurations](https://kinvolk.io/blog/2017/02/using-custom-rkt-stage1-images-to-test-against-various-kernel-versions/).
\ No newline at end of file
diff --git a/README.md b/README.md
index 878bd50103..5b59f6d930 100644
--- a/README.md
+++ b/README.md
@@ -90,3 +90,10 @@ Due to a bug in the Linux kernel, using rkt when `/var/lib/rkt` is on btrfs requ
 Due to a bug in the Linux kernel, using rkt's overlay support in conjunction with SELinux requires a set of patches that are only currently available on some Linux distributions (for example, [CoreOS Linux](https://github.com/coreos/coreos-overlay/tree/master/sys-kernel/coreos-sources/files)). Work is ongoing to merge this work into the mainline Linux kernel ([#1727](https://github.com/coreos/rkt/issues/1727#issuecomment-173203129)).
 
 Linux 3.18+ is required to successfully garbage collect rkt pods when system services such as udevd are in a slave mount namespace (see [lazy umounts on unlinked files and directories](https://github.com/torvalds/linux/commit/8ed936b) and [#1922](https://github.com/coreos/rkt/issues/1922)).
+
+## Related Links
+
+### Integrations and Production Users
+
+- [Projects integrating with rkt](https://github.com/coreos/rkt/blob/master/Documentation/integrations.md)
+- [Production users](https://github.com/coreos/rkt/blob/master/Documentation/production-users.md)
\ No newline at end of file

From ebd4636175045f9c99bee7ced8cc024f17a338cc Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gmail.com>
Date: Mon, 6 Mar 2017 20:41:31 -0800
Subject: [PATCH 1068/1304] stage1: include <sys/sysmacros.h> for makedev
 function

In glibc, inclusion of <sys/sysmacros.h> by <sys/types.h> has
been deprecated, so files that use makedev need to explicitly
include <sys/sysmacros.h>.

See:
https://sourceware.org/git/?p=glibc.git;a=commit;h=dbab6577c6684c62bd2521c1c29dc25c3cac966f
---
 stage1/prepare-app/prepare-app.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index b8c403aa62..0c9ba7dde1 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>

From c8ef6aeb1419e64ed34244ec7fb56a4b04d5853f Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon.philips@coreos.com>
Date: Sun, 12 Mar 2017 20:16:38 -0700
Subject: [PATCH 1069/1304] Documentation: CoreOS -> Container Linux

We renamed the project from CoreOS Linux to Container Linux. Fix rkt's
docs.
---
 Documentation/distributions.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 30b57a8eb0..982944b65a 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -2,7 +2,7 @@
 
 - [Arch](#arch)
 - [CentOS](#centos)
-- [CoreOS](#coreos)
+- [Container Linux by CoreOS](#container-linux)
 - [Debian](#debian)
 - [Fedora](#fedora)
 - [NixOS](#nixos)
@@ -31,12 +31,12 @@ sudo pacman -S rkt
 rkt is available in the [CentOS Community Build Service][pkg-centos] for CentOS 7.
 However, this is [not yet ready for production use][rkt-1305] due to pending systemd upgrade issues.
 
-## CoreOS
+## Container Linux
 
-rkt is an integral part of CoreOS, installed with the operating system.
+rkt is an integral part of Container Linux, installed with the operating system.
 The [CoreOS releases page][coreos-releases] lists the version of rkt available in each CoreOS release channel.
 
-If the version of rkt included in CoreOS is too old, it's fairly trivial to fetch the desired version [via a systemd unit][coreos-install-rkt].
+If the version of rkt included in Container Linux is too old, it's fairly trivial to fetch the desired version [via a systemd unit][coreos-install-rkt].
 
 ## Debian
 

From 7f81cc7f83dc89483f47af792df733a84361fc80 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon.philips@coreos.com>
Date: Mon, 13 Mar 2017 17:39:28 -0700
Subject: [PATCH 1070/1304] Documentation: add some individual blog posts

---
 Documentation/production-users.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Documentation/production-users.md b/Documentation/production-users.md
index 1c1937df51..0ed199160c 100644
--- a/Documentation/production-users.md
+++ b/Documentation/production-users.md
@@ -9,4 +9,20 @@ BlaBlaCar is a trusted car-pooling service based in France. They've [blogged abo
 Kumulus Technologies offers classes and services to optimize your Cloud. They've [blogged about](https://kumul.us/docker-youve-failed-me-again-rkt-please-save-me/) rkt's pod native features and Kubernetes support being a reason for their adoption.
 
 ## [Kinvolk.io](https://kinvolk.io/)
-Kinvolk are a professional consulting team and active contributors to systemd, rkt, and the Linux kernel. rkt helps them easily [test various Linux kernels and configurations](https://kinvolk.io/blog/2017/02/using-custom-rkt-stage1-images-to-test-against-various-kernel-versions/).
\ No newline at end of file
+Kinvolk are a professional consulting team and active contributors to systemd, rkt, and the Linux kernel. rkt helps them easily [test various Linux kernels and configurations](https://kinvolk.io/blog/2017/02/using-custom-rkt-stage1-images-to-test-against-various-kernel-versions/).
+
+## Individual Use Cases
+
+These are blog posts and stories from people evaluating rkt. Although most aren't production use cases; just some further useful links.
+
+- [Adrian de Jonge](https://medium.com/@adriaandejonge/moving-from-docker-to-rkt-310dc9aec938#.earel7ndf) moving from docker to rkt
+- [Kushal Das, Cloud Engineer at RedHat](https://kushaldas.in/posts/using-rkt-and-systemd.html) using rkt and systemd
+- [Julia Evans, Infrastructure Engineer at Stripe](https://jvns.ca/blog/2016/11/03/what-happens-when-you-run-a-rkt-container/) what happens when you run a rkt container
+- [Nicholas Dziuba](https://www.reddit.com/r/coreos/comments/5vhrlw/thesis_with_rkt_evaluation/) writing his thesis on the security model of rkt
+- [John Pettigrew, Developer at Clevyr ](https://pettigrew.rocks/2016/05/30/a-beginners-guide-to-rkt-containers/) a beginner’s guide to rkt containers
+- [Joey Zwicker, at Co-founder of Pachyderm.io](https://news.ycombinator.com/item?id=12103201) rkt support is on the roadmap. See [Does Pachyderm only work with docker containers?](http://docs.pachyderm.io/en/stable/FAQ.html)
+- [Fernando Ike, Sales Engineer at Highwinds](http://www.slideshare.net/fernandoike/docker-baleias-vs-rkt-foguetes) docker vs rkt comparison
+- [Scott Lowe, Developer at VMWare](http://www.slideshare.net/lowescott/getting-started-with-containers) getting started with containers
+- [Yutaka Matsubara, CTO at Abby](http://www.slideshare.net/YutakaMatsubara/rocket-46800960) rkt
+- [Thuc Le Dong, Developer at Silicon Straits](http://www.slideshare.net/ledongthuc/rkt-container-engine) overview of the rkt container engine
+- [Avi Deitcher, Business Technology Consultant](http://blog.atomicinc.com/2016/10/14/can-rktkubernetes-provide-a-real-alternative-to-docker-2896/)

From 9d9aeff5a867d87d497d54b9eabd4bc733e0c897 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon.philips@coreos.com>
Date: Mon, 13 Mar 2017 17:43:25 -0700
Subject: [PATCH 1071/1304] Documentation: add production user from HN comment

---
 Documentation/production-users.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/production-users.md b/Documentation/production-users.md
index 0ed199160c..19ef408b37 100644
--- a/Documentation/production-users.md
+++ b/Documentation/production-users.md
@@ -11,6 +11,9 @@ Kumulus Technologies offers classes and services to optimize your Cloud. They've
 ## [Kinvolk.io](https://kinvolk.io/)
 Kinvolk are a professional consulting team and active contributors to systemd, rkt, and the Linux kernel. rkt helps them easily [test various Linux kernels and configurations](https://kinvolk.io/blog/2017/02/using-custom-rkt-stage1-images-to-test-against-various-kernel-versions/).
 
+## [Adfin.com](http://www.adfin.com/)
+Per Milosz Tanski, [from HN comments](https://news.ycombinator.com/item?id=12366932). "The same experiences we switched to using rkt, supervised by upstart (and now systemd). We have an "application" state template in our salt config and every docker update something would cause all of them to fail. Thankful the "application" state template abstracted running container enough were we switched from docker -> rkt under the covers without anybody noticing, except now we no longer fearing of container software updates."
+
 ## Individual Use Cases
 
 These are blog posts and stories from people evaluating rkt. Although most aren't production use cases; just some further useful links.

From 099ada0196bb885f5f0d71ce1f258bbb6cb26c04 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon.philips@coreos.com>
Date: Mon, 13 Mar 2017 17:47:38 -0700
Subject: [PATCH 1072/1304] Documentation: add more color on BlaBlaCar usage

---
 Documentation/production-users.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/production-users.md b/Documentation/production-users.md
index 19ef408b37..160c33818a 100644
--- a/Documentation/production-users.md
+++ b/Documentation/production-users.md
@@ -4,6 +4,8 @@ This document tracks people and use cases for rkt in production. [Join the commu
 
 ## [BlaBlaCar](https://www.blablacar.com/)
 BlaBlaCar is a trusted car-pooling service based in France. They've [blogged about](http://blablatech.com/blog/why-and-how-blablacar-went-full-containers) the stability of rkt being a big appeal.
+- Media report from [LeMagIT](http://www.lemagit.fr/actualites/4500272608/avec-rkt-10-CoreOS-estime-que-sa-technologie-de-conteneur-est-mure-pour-la-production): "rkt has become the container technology of choice for the French carpool specialist Blablacar. The company, which has adopted early container technologies, now relies on rkt and CoreOS for 90% of its applications."
+- Media report from [Silicon.fr](http://www.silicon.fr/blablacar-generalise-conteneurs-rocket-159564.html), "Rocket tackled the limitations we had identified with Docker. In particular, the solution eliminated the use of a daemon (process running in the background, Editor's note) and approached the network part in a very modular way"
 
 ## [Kumul.us](https://kumul.us/)
 Kumulus Technologies offers classes and services to optimize your Cloud. They've [blogged about](https://kumul.us/docker-youve-failed-me-again-rkt-please-save-me/) rkt's pod native features and Kubernetes support being a reason for their adoption.

From f9db1eb39c4722a643488d84ab31ee42918d1093 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon.philips@coreos.com>
Date: Mon, 13 Mar 2017 18:33:09 -0700
Subject: [PATCH 1073/1304] Documentation: cleanup stage1 stuff

Ideally I could have just linked to this instead of writing my comment
on HN here: https://news.ycombinator.com/item?id=13864159

- Use docker images
- Include debug to assist user
- Move build instructions to the bottom
---
 Documentation/running-kvm-stage1.md | 79 +++++------------------------
 1 file changed, 12 insertions(+), 67 deletions(-)

diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index a7ef89a4b3..559f3ee0ab 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -6,63 +6,10 @@ The KVM stage1 does not yet implement all of the default stage1's features and s
 
 ## Getting started
 
-For LKVM you can use `stage1-kvm.aci` or `stage1-kvm-lkvm.aci`, for QEMU - `stage1-kvm-qemu.aci` from the official release. You can also build rkt yourself with the right options:
-
-```
-$ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hypervisors=lkvm,qemu && make
-```
-
-For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.25.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
-
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
 ```
-# rkt trust --prefix coreos.com/etcd
-prefix: "coreos.com/etcd"
-key: "https://coreos.com/dist/pubkeys/aci-pubkeys.gpg"
-gpg key fingerprint is: 8B86 DE38 890D DB72 9186  7B02 5210 BD88 8818 2190
-	CoreOS ACI Builder <release@coreos.com>
-Trusting "https://coreos.com/dist/pubkeys/aci-pubkeys.gpg" for prefix "coreos.com/etcd" without fingerprint review.
-Added key for prefix "coreos.com/etcd" at "/etc/rkt/trustedkeys/prefix.d/coreos.com/etcd/8b86de38890ddb7291867b025210bd8888182190"
-# rkt run coreos.com/etcd:v2.0.9
-rkt: searching for app image coreos.com/etcd:v2.0.9
-prefix: "coreos.com/etcd"
-key: "https://coreos.com/dist/pubkeys/aci-pubkeys.gpg"
-gpg key fingerprint is: 8B86 DE38 890D DB72 9186  7B02 5210 BD88 8818 2190
-	CoreOS ACI Builder <release@coreos.com>
-Key "https://coreos.com/dist/pubkeys/aci-pubkeys.gpg" already in the keystore
-Downloading signature from https://github.com/coreos/etcd/releases/download/v2.0.9/etcd-v2.0.9-linux-amd64.aci.asc
-Downloading signature: [=======================================] 819 B/819 B
-Downloading ACI: [=============================================] 3.79 MB/3.79 MB
-rkt: signature verified:
-  CoreOS ACI Builder <release@coreos.com>
-[188748.162493] etcd[4]: 2015/08/18 14:10:08 etcd: no data-dir provided, using default data-dir ./default.etcd
-[188748.163213] etcd[4]: 2015/08/18 14:10:08 etcd: listening for peers on http://localhost:2380
-[188748.163674] etcd[4]: 2015/08/18 14:10:08 etcd: listening for peers on http://localhost:7001
-[188748.164143] etcd[4]: 2015/08/18 14:10:08 etcd: listening for client requests on http://localhost:2379
-[188748.164603] etcd[4]: 2015/08/18 14:10:08 etcd: listening for client requests on http://localhost:4001
-[188748.165044] etcd[4]: 2015/08/18 14:10:08 etcdserver: datadir is valid for the 2.0.1 format
-[188748.165541] etcd[4]: 2015/08/18 14:10:08 etcdserver: name = default
-[188748.166236] etcd[4]: 2015/08/18 14:10:08 etcdserver: data dir = default.etcd
-[188748.166719] etcd[4]: 2015/08/18 14:10:08 etcdserver: member dir = default.etcd/member
-[188748.167251] etcd[4]: 2015/08/18 14:10:08 etcdserver: heartbeat = 100ms
-[188748.167685] etcd[4]: 2015/08/18 14:10:08 etcdserver: election = 1000ms
-[188748.168322] etcd[4]: 2015/08/18 14:10:08 etcdserver: snapshot count = 10000
-[188748.168787] etcd[4]: 2015/08/18 14:10:08 etcdserver: advertise client URLs = http://localhost:2379,http://localhost:4001
-[188748.169342] etcd[4]: 2015/08/18 14:10:08 etcdserver: initial advertise peer URLs = http://localhost:2380,http://localhost:7001
-[188748.169862] etcd[4]: 2015/08/18 14:10:08 etcdserver: initial cluster = default=http://localhost:2380,default=http://localhost:7001
-[188748.188550] etcd[4]: 2015/08/18 14:10:08 etcdserver: start member ce2a822cea30bfca in cluster 7e27652122e8b2ae
-[188748.190202] etcd[4]: 2015/08/18 14:10:08 raft: ce2a822cea30bfca became follower at term 0
-[188748.190381] etcd[4]: 2015/08/18 14:10:08 raft: newRaft ce2a822cea30bfca [peers: [], term: 0, commit: 0, applied: 0, lastindex: 0, lastterm: 0]
-[188748.190499] etcd[4]: 2015/08/18 14:10:08 raft: ce2a822cea30bfca became follower at term 1
-[188748.206523] etcd[4]: 2015/08/18 14:10:08 etcdserver: added local member ce2a822cea30bfca [http://localhost:2380 http://localhost:7001] to cluster 7e27652122e8b2ae
-[188749.489184] etcd[4]: 2015/08/18 14:10:10 raft: ce2a822cea30bfca is starting a new election at term 1
-[188749.489460] etcd[4]: 2015/08/18 14:10:10 raft: ce2a822cea30bfca became candidate at term 2
-[188749.489583] etcd[4]: 2015/08/18 14:10:10 raft: ce2a822cea30bfca received vote from ce2a822cea30bfca at term 2
-[188749.489675] etcd[4]: 2015/08/18 14:10:10 raft: ce2a822cea30bfca became leader at term 2
-[188749.489760] etcd[4]: 2015/08/18 14:10:10 raft.node: ce2a822cea30bfca elected leader ce2a822cea30bfca at term 2
-[188749.523133] etcd[4]: 2015/08/18 14:10:10 etcdserver: published {Name:default ClientURLs:[http://localhost:2379 http://localhost:4001]} to cluster 7e27652122e8b2ae
+sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.25.0 docker://redis
 ```
 
 This output is the same you'll get if you run a container-based rkt.
@@ -77,19 +24,6 @@ In the other case, container will be working on aggregate amount of CPUs.
 #### Memory
 Currently, the memory allocated to the virtual machine is a sum of memory required by each app in pod and additional 128MB required by system. If memory of some app is not specified, app memory will be set on default value (128MB).
 
-### Selecting stage1 at runtime
-
-If you want to run software that requires hypervisor isolation along with trusted software that only needs container isolation, you can [choose which stage1 to use at runtime][rkt-run].
-
-For example, to use the official kvm stage1:
-
-```
-# rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.25.0 coreos.com/etcd:v2.0.9
-...
-```
-
-If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
-
 ## How does it work?
 
 It leverages the work done by Intel with their [Clear Containers system][clear-containers].
@@ -124,6 +58,17 @@ host OS
             └─ user-app1
 ```
 
+## Building rkt KVM stage1
+
+For LKVM you can use `stage1-kvm.aci` or `stage1-kvm-lkvm.aci`, for QEMU - `stage1-kvm-qemu.aci` from the official release. You can also build rkt yourself with the right options:
+
+```
+$ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hypervisors=lkvm,qemu && make
+```
+
+For more details about configure parameters, see [configure script parameters documentation][build-configure].
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.25.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+
 
 [build-configure]: build-configure.md
 [clear-containers]: https://lwn.net/Articles/644675/

From 54e0e1f20a611befd68600bd3cf8bb0eba24b637 Mon Sep 17 00:00:00 2001
From: Josh Wood <j@coreos.com>
Date: Mon, 13 Mar 2017 23:21:31 -0700
Subject: [PATCH 1074/1304] production-users: Style & fmt nits

---
 Documentation/production-users.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Documentation/production-users.md b/Documentation/production-users.md
index 160c33818a..79ef0cdd5d 100644
--- a/Documentation/production-users.md
+++ b/Documentation/production-users.md
@@ -3,22 +3,27 @@
 This document tracks people and use cases for rkt in production. [Join the community](https://github.com/coreos/rkt/), and help us keep the list up-to-date.
 
 ## [BlaBlaCar](https://www.blablacar.com/)
+
 BlaBlaCar is a trusted car-pooling service based in France. They've [blogged about](http://blablatech.com/blog/why-and-how-blablacar-went-full-containers) the stability of rkt being a big appeal.
-- Media report from [LeMagIT](http://www.lemagit.fr/actualites/4500272608/avec-rkt-10-CoreOS-estime-que-sa-technologie-de-conteneur-est-mure-pour-la-production): "rkt has become the container technology of choice for the French carpool specialist Blablacar. The company, which has adopted early container technologies, now relies on rkt and CoreOS for 90% of its applications."
-- Media report from [Silicon.fr](http://www.silicon.fr/blablacar-generalise-conteneurs-rocket-159564.html), "Rocket tackled the limitations we had identified with Docker. In particular, the solution eliminated the use of a daemon (process running in the background, Editor's note) and approached the network part in a very modular way"
+
+* Media report from [LeMagIT](http://www.lemagit.fr/actualites/4500272608/avec-rkt-10-CoreOS-estime-que-sa-technologie-de-conteneur-est-mure-pour-la-production): "rkt has become the container technology of choice for the French carpool specialist Blablacar. The company, which has adopted early container technologies, now relies on rkt and CoreOS for 90% of its applications."
+* Media report from [Silicon.fr](http://www.silicon.fr/blablacar-generalise-conteneurs-rocket-159564.html), "Rocket tackled the limitations we had identified with Docker. In particular, the solution eliminated the use of a daemon (process running in the background, Editor's note) and approached the network part in a very modular way"
 
 ## [Kumul.us](https://kumul.us/)
+
 Kumulus Technologies offers classes and services to optimize your Cloud. They've [blogged about](https://kumul.us/docker-youve-failed-me-again-rkt-please-save-me/) rkt's pod native features and Kubernetes support being a reason for their adoption.
 
 ## [Kinvolk.io](https://kinvolk.io/)
+
 Kinvolk are a professional consulting team and active contributors to systemd, rkt, and the Linux kernel. rkt helps them easily [test various Linux kernels and configurations](https://kinvolk.io/blog/2017/02/using-custom-rkt-stage1-images-to-test-against-various-kernel-versions/).
 
 ## [Adfin.com](http://www.adfin.com/)
+
 Per Milosz Tanski, [from HN comments](https://news.ycombinator.com/item?id=12366932). "The same experiences we switched to using rkt, supervised by upstart (and now systemd). We have an "application" state template in our salt config and every docker update something would cause all of them to fail. Thankful the "application" state template abstracted running container enough were we switched from docker -> rkt under the covers without anybody noticing, except now we no longer fearing of container software updates."
 
 ## Individual Use Cases
 
-These are blog posts and stories from people evaluating rkt. Although most aren't production use cases; just some further useful links.
+These are blog posts and stories from people evaluating rkt. Although most aren't (yet) production use cases, the links offer useful information and shared experience in deploying rkt.
 
 - [Adrian de Jonge](https://medium.com/@adriaandejonge/moving-from-docker-to-rkt-310dc9aec938#.earel7ndf) moving from docker to rkt
 - [Kushal Das, Cloud Engineer at RedHat](https://kushaldas.in/posts/using-rkt-and-systemd.html) using rkt and systemd

From e4d92dfab67fa6d0141e85f22daced9c6e749879 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Tue, 14 Mar 2017 15:10:15 +0100
Subject: [PATCH 1075/1304] docs: add Gentoo to the list of distributions that
 have rkt

---
 Documentation/distributions.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 982944b65a..8a86a7b308 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -5,6 +5,7 @@
 - [Container Linux by CoreOS](#container-linux)
 - [Debian](#debian)
 - [Fedora](#fedora)
+- [Gentoo](#gentoo)
 - [NixOS](#nixos)
 - [openSUSE](#opensuse)
 - [Ubuntu](#ubuntu)
@@ -84,6 +85,14 @@ sudo firewall-cmd --add-source=172.16.28.0/24 --zone=trusted
 
 172.16.28.0/24 is the subnet of the [default pod network][networking-overview-default]. The command must be adapted when rkt is configured to use a [different network][networking-overview-additional] with a different subnet.
 
+## Gentoo
+
+rkt is [packaged for gentoo][pkg-gentoo] and available via portage.
+
+```
+sudo emerge rkt
+```
+
 ## NixOS
 
 rkt can be installed on NixOS using the following command:
@@ -157,6 +166,7 @@ sudo dpkg -i rkt_1.25.0-1_amd64.deb
 [pkg-centos]: https://cbs.centos.org/koji/packageinfo?packageID=4464
 [pkg-debian]: https://packages.debian.org/sid/utils/rkt
 [pkg-fedora]: https://admin.fedoraproject.org/pkgdb/package/rpms/rkt/
+[pkg-gentoo]: https://packages.gentoo.org/packages/app-emulation/rkt
 [rkt-nixos]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/virtualization/rkt/default.nix
 [rkt-opensuse]: https://build.opensuse.org/package/show/Virtualization:containers/rkt
 [rkt-void]: https://github.com/voidlinux/void-packages/tree/master/srcpkgs/rkt

From 70280523c171f5e2f8c65b74c23634ae2423e129 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon.philips@coreos.com>
Date: Wed, 15 Mar 2017 08:48:32 -0700
Subject: [PATCH 1076/1304] Documentation: add container linux and tectonic as
 production users

---
 Documentation/production-users.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/production-users.md b/Documentation/production-users.md
index 79ef0cdd5d..354416d944 100644
--- a/Documentation/production-users.md
+++ b/Documentation/production-users.md
@@ -9,6 +9,10 @@ BlaBlaCar is a trusted car-pooling service based in France. They've [blogged abo
 * Media report from [LeMagIT](http://www.lemagit.fr/actualites/4500272608/avec-rkt-10-CoreOS-estime-que-sa-technologie-de-conteneur-est-mure-pour-la-production): "rkt has become the container technology of choice for the French carpool specialist Blablacar. The company, which has adopted early container technologies, now relies on rkt and CoreOS for 90% of its applications."
 * Media report from [Silicon.fr](http://www.silicon.fr/blablacar-generalise-conteneurs-rocket-159564.html), "Rocket tackled the limitations we had identified with Docker. In particular, the solution eliminated the use of a daemon (process running in the background, Editor's note) and approached the network part in a very modular way"
 
+## [Kubernetes and CoreOS Container Linux]()
+
+rkt is used by Container Linux to execute the Kubernetes on node agent called the "kubelet". This enables users to be able to have cluster controlled versioning of this critical component. There are many documented production users of Kubernetes and Container Linux including all of the users of [CoreOS Tectonic](https://coreos.com/tectonic).
+
 ## [Kumul.us](https://kumul.us/)
 
 Kumulus Technologies offers classes and services to optimize your Cloud. They've [blogged about](https://kumul.us/docker-youve-failed-me-again-rkt-please-save-me/) rkt's pod native features and Kubernetes support being a reason for their adoption.

From 64148471dc1178602f395281c61e0b0d2879165f Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 16 Mar 2017 22:09:31 -0700
Subject: [PATCH 1077/1304] dist: use multi-user.target instead of
 default.target

The behavior of the default.target alias can be inconsistent and change
between systemd releases. Also it is customary to use multi-user.target
anyway. Switch to avoid potential surprise breakage.

Note: Container Linux isn't impacted since when this unit is enabled by
the ebuild it explicitly uses multi-user.target.
---
 dist/init/systemd/rkt-gc.timer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/init/systemd/rkt-gc.timer b/dist/init/systemd/rkt-gc.timer
index 6db9b51e30..fdcf5ed839 100644
--- a/dist/init/systemd/rkt-gc.timer
+++ b/dist/init/systemd/rkt-gc.timer
@@ -6,4 +6,4 @@ OnActiveSec=0s
 OnUnitActiveSec=12h
 
 [Install]
-WantedBy=default.target
+WantedBy=multi-user.target

From 7c0fae12d41680fa76b1dcd9b31222feca1866c2 Mon Sep 17 00:00:00 2001
From: Tino Rusch <tino.rusch@webvariants.de>
Date: Mon, 27 Mar 2017 11:54:43 +0200
Subject: [PATCH 1078/1304] fetch: introduce common.GetArch() and
 common.GetOS() to get "rkt fetch" working on arm devices

GetArch() returns the architecture of the current system, and especially returns either armv6l, armv7l or aarch64 if on arm devices (GOARCH is always arm).
This leads to working rkt fetch on arm devices.
---
 common/common.go     | 28 ++++++++++++++++++++++++++++
 rkt/fetch.go         | 12 ++++--------
 rkt/image/fetcher.go |  5 ++---
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/common/common.go b/common/common.go
index 4179632211..d7d22acde6 100644
--- a/common/common.go
+++ b/common/common.go
@@ -24,6 +24,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"syscall"
@@ -486,3 +487,30 @@ func GetExitStatus(err error) (int, error) {
 	}
 	return -1, err
 }
+
+// reference to GOARM, needs to be globally, if in GetArch() function it resolves to zero
+//go:linkname goarm runtime.goarm
+var goarm uint8
+
+// GetArch returns the current architecture. It returns runtime.GOARCH if not on a arm device
+// and armv6l, armv7l, arm64 otherwise
+func GetArch() string {
+	arch := runtime.GOARCH
+	switch arch {
+	case "arm":
+		{
+			os := GetOS()
+			_, arch, _ = types.ToAppcOSArch(os, "arm", strconv.Itoa(int(goarm)))
+		}
+	case "arm64":
+		{
+			arch = "aarch64"
+		}
+	}
+	return arch
+}
+
+// GetOS returns the current operating system (linux, windows etc...)
+func GetOS() string {
+	return runtime.GOOS
+}
diff --git a/rkt/fetch.go b/rkt/fetch.go
index 875ac431e5..879578f0af 100644
--- a/rkt/fetch.go
+++ b/rkt/fetch.go
@@ -15,9 +15,8 @@
 package main
 
 import (
-	"runtime"
-
 	"github.com/appc/spec/schema/types"
+	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
 	"github.com/coreos/rkt/rkt/image"
 	"github.com/coreos/rkt/store/imagestore"
@@ -26,13 +25,10 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const (
-	defaultOS   = runtime.GOOS
-	defaultArch = runtime.GOARCH
-)
-
 var (
-	cmdFetch = &cobra.Command{
+	defaultOS   = common.GetOS()
+	defaultArch = common.GetArch()
+	cmdFetch    = &cobra.Command{
 		Use:   "fetch IMAGE_URL...",
 		Short: "Fetch image(s) and store them in the local store",
 		Long: `Locates and downloads remote ACIs and their attached signatures.
diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index a644480484..2c3fd3f6b4 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"net/url"
 	"os"
-	"runtime"
 
 	"github.com/coreos/rkt/common"
 	"github.com/coreos/rkt/common/apps"
@@ -287,10 +286,10 @@ func (f *Fetcher) fetchSingleImageByPath(path string, a *asc) (string, error) {
 func (db *distBundle) setAppDefaults() error {
 	app := db.dist.(*dist.Appc).App()
 	if _, ok := app.Labels["arch"]; !ok {
-		app.Labels["arch"] = runtime.GOARCH
+		app.Labels["arch"] = common.GetArch()
 	}
 	if _, ok := app.Labels["os"]; !ok {
-		app.Labels["os"] = runtime.GOOS
+		app.Labels["os"] = common.GetOS()
 	}
 	if err := types.IsValidOSArch(app.Labels, stage0.ValidOSArch); err != nil {
 		return errwrap.Wrap(fmt.Errorf("invalid Appc distribution %q", db.image), err)

From 5f4e77e4d555e868779bfe42f457a83d65ecc8d8 Mon Sep 17 00:00:00 2001
From: Tino Rusch <tino.rusch@webvariants.de>
Date: Mon, 27 Mar 2017 15:27:59 +0200
Subject: [PATCH 1079/1304] common: GetArch(): use ToAppcOSArch() for all
 architectures;

---
 common/common.go | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/common/common.go b/common/common.go
index d7d22acde6..6b1d97c4d4 100644
--- a/common/common.go
+++ b/common/common.go
@@ -496,17 +496,11 @@ var goarm uint8
 // and armv6l, armv7l, arm64 otherwise
 func GetArch() string {
 	arch := runtime.GOARCH
-	switch arch {
-	case "arm":
-		{
-			os := GetOS()
-			_, arch, _ = types.ToAppcOSArch(os, "arm", strconv.Itoa(int(goarm)))
-		}
-	case "arm64":
-		{
-			arch = "aarch64"
-		}
+	flavor := ""
+	if arch == "arm" {
+		flavor = strconv.Itoa(int(goarm))
 	}
+	_, arch, _ = types.ToAppcOSArch(GetOS(), arch, flavor)
 	return arch
 }
 

From 4511983da41cda6ceb8d9c04fefc4f7a2e7ed5ee Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.org>
Date: Tue, 28 Mar 2017 16:52:59 +0200
Subject: [PATCH 1080/1304] integrations: add mesos

---
 Documentation/integrations.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/integrations.md b/Documentation/integrations.md
index 29a8a980fd..75389db211 100644
--- a/Documentation/integrations.md
+++ b/Documentation/integrations.md
@@ -4,6 +4,8 @@ This document tracks projects that integrate with rkt. [Join the community](http
 ## Projects 
 [Kubernetes](https://kubernetes.io/docs/getting-started-guides/rkt/): a enterprise grade container orchestration solution. Kubernetes offers rkt support as an alternative to the standard install.
 
+[Mesos](http://mesos.apache.org/blog/mesos-1-0-0-released/): Apache Mesos abstracts CPU, memory, storage, and other compute resources away from machines (physical or virtual), enabling fault-tolerant and elastic distributed systems to easily be built and run effectively.
+
 [Nomad](https://www.nomadproject.io/docs/drivers/rkt.html): a container orchestration platform focused on ease of use. Nomad supports rkt through the rkt driver.
 
 [dgr](https://github.com/blablacar/dgr): a container build and runtime tool, preferring convention over configuration.
@@ -16,4 +18,4 @@ This document tracks projects that integrate with rkt. [Join the community](http
 
 [Linux](https://coreos.com/rkt/docs/latest/distributions.html): an open an extensible OS. rkt is included in the package managers on Red Hat, Ubuntu, and many other popular Linux distributions.
 
-[cAdvisor](https://github.com/google/cadvisor): a daemon that monitors resource usage and performance for running containers.
\ No newline at end of file
+[cAdvisor](https://github.com/google/cadvisor): a daemon that monitors resource usage and performance for running containers.

From ebf1b31b1082ca51ce9be4ff16c0ccf7bcb26730 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 7 Apr 2017 13:56:18 +0200
Subject: [PATCH 1081/1304] docs: add appc deprecation note

---
 Documentation/app-container.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index a1187a466f..6e5c031b23 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -4,6 +4,8 @@
 
 rkt's native [image format](#aci) and [runtime environment](#pods) are those defined by the [specification][appc-spec].
 
+_Note that as of late 2016, appc is [no longer being actively developed](https://github.com/appc/spec#-disclaimer-), and future versions of rkt will instead [natively use OCI formats](https://github.com/rkt/rkt/projects/4)._
+
 ## ACI
 
 The image format defined by appc and used in rkt is the [_Application Container Image_][appc-aci], or ACI.

From 5e6abc98db8a8f7e98315ad4312f2fab2decb335 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 6 Apr 2017 11:57:12 +0200
Subject: [PATCH 1082/1304] *: coreos/rkt -> rkt/rkt

---
 CHANGELOG.md                                  | 1138 ++++++++---------
 Documentation/devel/cgroups.md                |    6 +-
 Documentation/devel/distribution-point.md     |    2 +-
 Documentation/devel/on-disk-format.md         |    2 +-
 Documentation/devel/quickstart-dev.md         |    6 +-
 Documentation/devel/release.md                |   14 +-
 Documentation/devel/user-namespaces.md        |    2 +-
 Documentation/distributions.md                |   20 +-
 Documentation/getting-started-guide.md        |    2 +-
 Documentation/hacking.md                      |    6 +-
 Documentation/install-rkt-in-coreos.md        |    2 +-
 Documentation/integrations.md                 |    2 +-
 Documentation/networking/dns.md               |    2 +-
 Documentation/packaging.md                    |    6 +-
 .../performance/rkt-1-4-0-benchmarks.md       |    8 +-
 Documentation/production-users.md             |    2 +-
 Documentation/proposals/oci.md                |   28 +-
 Documentation/rkt-build-rkt.md                |    2 +-
 Documentation/subcommands/api-service.md      |    6 +-
 Documentation/subcommands/metadata-service.md |    2 +-
 Documentation/trying-out-rkt.md               |    8 +-
 README.md                                     |   22 +-
 ROADMAP.md                                    |   10 +-
 api/v1alpha/README.md                         |    2 +-
 api/v1alpha/api.pb.go                         |    2 +-
 api/v1alpha/api.proto                         |    4 +-
 api/v1alpha/client_example.go                 |    2 +-
 common/cgroup/cgroup.go                       |    4 +-
 common/cgroup/v1/cgroup.go                    |    6 +-
 common/common.go                              |    2 +-
 common/environment.go                         |    2 +-
 common/group.go                               |    2 +-
 common/mount.go                               |    6 +-
 common/overlay/overlay.go                     |    2 +-
 configure.ac                                  |    4 +-
 dist/init/systemd/rkt-api.service             |    2 +-
 dist/init/systemd/rkt-metadata.service        |    2 +-
 glide.yaml                                    |    2 +-
 lib/app.go                                    |    4 +-
 lib/pod.go                                    |    2 +-
 lib/types.go                                  |    2 +-
 makelib/variables.mk                          |    2 +-
 makelib/verbosity.mk                          |    2 +-
 networking/kvm.go                             |    8 +-
 networking/net_plugin.go                      |    2 +-
 networking/networking.go                      |    8 +-
 networking/podenv.go                          |    4 +-
 networking/portfwd.go                         |    2 +-
 pkg/aci/render.go                             |    4 +-
 pkg/backup/backup.go                          |    4 +-
 pkg/distribution/appc.go                      |    2 +-
 pkg/fileutil/fileutil.go                      |    2 +-
 pkg/fileutil/fileutil_test.go                 |    2 +-
 pkg/keystore/keystore.go                      |    2 +-
 pkg/keystore/keystore_test.go                 |    2 +-
 pkg/label/label_selinux.go                    |    2 +-
 pkg/label/label_selinux_test.go               |    2 +-
 pkg/pod/pods.go                               |   12 +-
 pkg/pod/pods_test.go                          |    2 +-
 pkg/pod/sandbox.go                            |    4 +-
 pkg/pod/wait.go                               |    2 +-
 pkg/selinux/selinux.go                        |    2 +-
 pkg/selinux/selinux_test.go                   |    2 +-
 pkg/tar/chroot.go                             |    6 +-
 pkg/tar/tar.go                                |    4 +-
 pkg/tar/tar_test.go                           |    6 +-
 pkg/user/resolver.go                          |    4 +-
 pkg/user/resolver_test.go                     |    2 +-
 rkt/api_service.go                            |   16 +-
 rkt/api_service_sdjournal.go                  |    6 +-
 rkt/api_service_stub.go                       |    2 +-
 rkt/api_service_test.go                       |    4 +-
 rkt/app.go                                    |    2 +-
 rkt/app_add.go                                |   12 +-
 rkt/app_list.go                               |    2 +-
 rkt/app_rm.go                                 |    4 +-
 rkt/app_sandbox.go                            |   16 +-
 rkt/app_start.go                              |    4 +-
 rkt/app_status.go                             |    2 +-
 rkt/app_stop.go                               |    4 +-
 rkt/attach.go                                 |   10 +-
 rkt/cat_manifest.go                           |    2 +-
 rkt/cli_apps.go                               |    2 +-
 rkt/config/config.go                          |    2 +-
 rkt/enter.go                                  |    8 +-
 rkt/export.go                                 |   14 +-
 rkt/fetch.go                                  |   10 +-
 rkt/fetch_test.go                             |   18 +-
 rkt/flag/secflags.go                          |    2 +-
 rkt/gc.go                                     |   10 +-
 rkt/help.go                                   |    2 +-
 rkt/image/asc.go                              |    2 +-
 rkt/image/common.go                           |   14 +-
 rkt/image/common_test.go                      |    2 +-
 rkt/image/dockerfetcher.go                    |    6 +-
 rkt/image/fetcher.go                          |   12 +-
 rkt/image/filefetcher.go                      |    6 +-
 rkt/image/finder.go                           |    2 +-
 rkt/image/httpfetcher.go                      |    8 +-
 rkt/image/httpops.go                          |    4 +-
 rkt/image/io.go                               |    4 +-
 rkt/image/namefetcher.go                      |   10 +-
 rkt/image/resumablesession.go                 |    4 +-
 rkt/image/validator.go                        |    2 +-
 rkt/image_cat_manifest.go                     |    2 +-
 rkt/image_cmd_common.go                       |    2 +-
 rkt/image_export.go                           |    2 +-
 rkt/image_extract.go                          |    8 +-
 rkt/image_gc.go                               |   10 +-
 rkt/image_list.go                             |    8 +-
 rkt/image_render.go                           |    8 +-
 rkt/image_rm.go                               |    2 +-
 rkt/list.go                                   |    6 +-
 rkt/main.go                                   |    2 +-
 rkt/metadata_service.go                       |    2 +-
 rkt/prepare.go                                |   16 +-
 rkt/pubkey/pubkey.go                          |    6 +-
 rkt/rkt.go                                    |   10 +-
 rkt/rkt_test.go                               |    2 +-
 rkt/rm.go                                     |    2 +-
 rkt/run.go                                    |   18 +-
 rkt/run_prepared.go                           |   10 +-
 rkt/stage1hash.go                             |    8 +-
 rkt/status.go                                 |    4 +-
 rkt/stop.go                                   |    4 +-
 rkt/trust.go                                  |    4 +-
 rkt/version.go                                |    2 +-
 scripts/changelog.sh                          |    4 +-
 scripts/genproto.sh                           |    2 +-
 scripts/glide-update.sh                       |    4 +-
 scripts/install-rkt.sh                        |    4 +-
 scripts/pkg/build-pkgs.sh                     |    2 +-
 stage0/app_add.go                             |    8 +-
 stage0/app_rm.go                              |    4 +-
 stage0/app_start.go                           |    4 +-
 stage0/app_stop.go                            |    4 +-
 stage0/common.go                              |    9 +-
 stage0/gc.go                                  |    2 +-
 stage0/log.go                                 |    2 +-
 stage0/manifest.go                            |    2 +-
 stage0/registration.go                        |    4 +-
 stage0/run.go                                 |   26 +-
 stage0/stop.go                                |    2 +-
 stage1/app_add/app_add.go                     |   12 +-
 stage1/app_rm/app_rm.go                       |   10 +-
 stage1/app_start/app_start.go                 |    6 +-
 stage1/app_stop/app_stop.go                   |    8 +-
 stage1/attach/attach.go                       |    6 +-
 stage1/common/run.go                          |    4 +-
 stage1/common/ssh/ssh.go                      |    6 +-
 stage1/common/types/pod.go                    |    4 +-
 stage1/enter_kvm/enter_kvm.go                 |    4 +-
 stage1/gc/gc.go                               |   12 +-
 stage1/init/common/app.go                     |    6 +-
 stage1/init/common/dns_config.go              |    4 +-
 stage1/init/common/log.go                     |    2 +-
 stage1/init/common/mount.go                   |    8 +-
 stage1/init/common/path.go                    |    2 +-
 stage1/init/common/pod.go                     |   10 +-
 stage1/init/common/pod_test.go                |    2 +-
 stage1/init/common/seccomp.go                 |    2 +-
 stage1/init/common/units.go                   |    6 +-
 stage1/init/init.go                           |   38 +-
 stage1/init/kvm.go                            |   12 +-
 .../init/kvm/hypervisor/hvlkvm/lkvm_driver.go |    4 +-
 .../init/kvm/hypervisor/hvqemu/qemu_driver.go |    4 +-
 stage1/init/kvm/log.go                        |    2 +-
 stage1/init/kvm/network.go                    |    2 +-
 stage1/iottymux/iottymux.go                   |    4 +-
 stage1/prepare-app/prepare-app.c              |    2 +-
 stage1/stop_kvm/stop_kvm.go                   |    4 +-
 stage1/usr_from_coreos/cache.sh               |    2 +-
 stage1_fly/enter/main.go                      |    2 +-
 stage1_fly/gc/main.go                         |    4 +-
 stage1_fly/run/main.go                        |   24 +-
 store/db/db.go                                |    2 +-
 store/db/db_test.go                           |    2 +-
 store/imagestore/main_test.go                 |    2 +-
 store/imagestore/migrate_test.go              |    2 +-
 store/imagestore/store.go                     |    6 +-
 store/imagestore/store_test.go                |    6 +-
 store/treestore/tree.go                       |   12 +-
 store/treestore/tree_test.go                  |    8 +-
 .../echo-socket-activated.go                  |    2 +-
 tests/inspect/inspect.go                      |    8 +-
 tests/rkt_ace_validator_test.go               |    2 +-
 tests/rkt_api_service_bench_test.go           |    4 +-
 tests/rkt_api_service_test.go                 |    6 +-
 tests/rkt_app_isolator_nspawn_test.go         |    2 +-
 tests/rkt_app_isolator_test.go                |    4 +-
 tests/rkt_app_sandbox_test.go                 |    4 +-
 tests/rkt_attach_test.go                      |    2 +-
 tests/rkt_auth_test.go                        |    4 +-
 tests/rkt_caps_test.go                        |    2 +-
 tests/rkt_cat_manifest_test.go                |    2 +-
 tests/rkt_config_test.go                      |    2 +-
 tests/rkt_devices_test.go                     |    2 +-
 tests/rkt_diagnostic_test.go                  |    2 +-
 tests/rkt_dns_test.go                         |    2 +-
 tests/rkt_env_test.go                         |    2 +-
 tests/rkt_error_output_test.go                |    2 +-
 tests/rkt_etc_hosts_test.go                   |    4 +-
 tests/rkt_exec_test.go                        |    4 +-
 tests/rkt_exit_test.go                        |    4 +-
 tests/rkt_export_container_test.go            |    4 +-
 tests/rkt_export_fly_test.go                  |    4 +-
 tests/rkt_export_test.go                      |    2 +-
 tests/rkt_fetch_test.go                       |   10 +-
 tests/rkt_fly_test.go                         |    2 +-
 tests/rkt_gc_nspawn_test.go                   |    2 +-
 tests/rkt_gc_test.go                          |    4 +-
 tests/rkt_hostname_test.go                    |    2 +-
 tests/rkt_image_cat_manifest_test.go          |    4 +-
 tests/rkt_image_dependencies_test.go          |   12 +-
 tests/rkt_image_export_test.go                |    4 +-
 tests/rkt_image_extract_test.go               |    2 +-
 tests/rkt_image_gc_test.go                    |    4 +-
 tests/rkt_image_list_test.go                  |    6 +-
 tests/rkt_image_render_test.go                |    4 +-
 tests/rkt_image_rm_test.go                    |    2 +-
 tests/rkt_interactive_test.go                 |    2 +-
 tests/rkt_journal_test.go                     |    2 +-
 tests/rkt_list_test.go                        |    2 +-
 tests/rkt_metadata_service_test.go            |    2 +-
 tests/rkt_mount_overlay_test.go               |    4 +-
 tests/rkt_mount_test.go                       |    2 +-
 tests/rkt_mountns_test.go                     |    2 +-
 tests/rkt_mtab_test.go                        |    2 +-
 tests/rkt_net_test.go                         |    8 +-
 tests/rkt_no_new_privs_test.go                |    2 +-
 tests/rkt_non_root_test.go                    |    4 +-
 tests/rkt_oom_score_adj_test.go               |    2 +-
 tests/rkt_os_arch_test.go                     |    4 +-
 tests/rkt_paths_test.go                       |    4 +-
 tests/rkt_pid_file_test.go                    |    2 +-
 tests/rkt_prepare_test.go                     |    2 +-
 tests/rkt_rm_nspawn_test.go                   |    2 +-
 tests/rkt_rm_test.go                          |    2 +-
 tests/rkt_root_commands_test.go               |    2 +-
 tests/rkt_run_pod_manifest_test.go            |    4 +-
 tests/rkt_run_test.go                         |    2 +-
 tests/rkt_run_user_group_test.go              |    4 +-
 tests/rkt_seccomp_test.go                     |    2 +-
 tests/rkt_service_file_test.go                |    2 +-
 tests/rkt_socket_activation_test.go           |    2 +-
 tests/rkt_socket_proxyd_test.go               |    4 +-
 tests/rkt_stage1_loading_test.go              |    6 +-
 tests/rkt_stop_test.go                        |    2 +-
 tests/rkt_supplementary_gids_test.go          |    2 +-
 tests/rkt_tests.go                            |    8 +-
 tests/rkt_trust_test.go                       |    2 +-
 tests/rkt_userns_test.go                      |    6 +-
 tests/rkt_volume_mount_test.go                |    2 +-
 tests/rkt_volume_nspawn_test.go               |    4 +-
 tests/rkt_volume_test.go                      |    2 +-
 tests/stub-stage1/run/main.go                 |    6 +-
 tests/testutils/ctx.go                        |    2 +-
 tests/testutils/datadirsetup.go               |    2 +-
 tests/testutils/httputils.go                  |    2 +-
 tools/cleangen/main.go                        |    4 +-
 tools/depsgen/globcmd.go                      |    4 +-
 tools/depsgen/gocmd.go                        |    4 +-
 tools/depsgen/kvcmd.go                        |    2 +-
 tools/depsgen/main.go                         |    2 +-
 tools/depsgen/util.go                         |    2 +-
 tools/filelistgen/main.go                     |    4 +-
 tools/quickrm/main.go                         |    2 +-
 267 files changed, 1216 insertions(+), 1215 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76f687257c..39a42a497f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,16 +3,16 @@
 This minor release contains bugfixes and other improvements related to the KVM flavour, which is now using qemu-kvm by default.
 
 ## New Features:
-- Switch default kvm flavour from lkvm to qemu ([#3562](https://github.com/coreos/rkt/pull/3562)).
+- Switch default kvm flavour from lkvm to qemu ([#3562](https://github.com/rkt/rkt/pull/3562)).
 
 ### Bug fixes
-- stage1/kvm: Change RAM calculation, and increase minimum ([#3572](https://github.com/coreos/rkt/pull/3572)).
-- stage1: Ensure ptmx device usable by non-root for all flavours ([#3484](https://github.com/coreos/rkt/pull/3484)).
+- stage1/kvm: Change RAM calculation, and increase minimum ([#3572](https://github.com/rkt/rkt/pull/3572)).
+- stage1: Ensure ptmx device usable by non-root for all flavours ([#3484](https://github.com/rkt/rkt/pull/3484)).
 
 ## Other changes:
-- tests: fix TestNonRootReadInfo when $HOME is only accessible by current user ([#3580](https://github.com/coreos/rkt/pull/3580)).
-- glide: bump grpc to 1.0.4 ([#3584](https://github.com/coreos/rkt/pull/3584)).
-- vendor: bump docker2aci to 0.16.0 ([#3591](https://github.com/coreos/rkt/pull/3591)).
+- tests: fix TestNonRootReadInfo when $HOME is only accessible by current user ([#3580](https://github.com/rkt/rkt/pull/3580)).
+- glide: bump grpc to 1.0.4 ([#3584](https://github.com/rkt/rkt/pull/3584)).
+- vendor: bump docker2aci to 0.16.0 ([#3591](https://github.com/rkt/rkt/pull/3591)).
 
 ## 1.24.0
 
@@ -20,13 +20,13 @@ This release includes experimental support for attaching to a running applicatio
 a more finely grained pull-policy flag.
 
 ## New Features:
-- rkt: add experimental support for attachable applications ([#3396](https://github.com/coreos/rkt/pull/3396)).
+- rkt: add experimental support for attachable applications ([#3396](https://github.com/rkt/rkt/pull/3396)).
     It consists of:
     * a new `attach` subcommand
     * a set of per-app flags to control stdin/stdout/stderr modes
     * a stage1 `iottymux` binary for multiplexing and attaching
     * two new templated stage1 services, `iomux` and `ttymux`
-- run/prepare/fetch: replace --no-store and --store-only with --pull-policy ([#3554](https://github.com/coreos/rkt/pull/3554)).
+- run/prepare/fetch: replace --no-store and --store-only with --pull-policy ([#3554](https://github.com/rkt/rkt/pull/3554)).
     * Replaces the `--no-store` and `--store-only` flags with a singular
     flag `--pull-policy`.
     * can accept one of three things, `never`, `new`, and `update`.
@@ -34,56 +34,56 @@ a more finely grained pull-policy flag.
     * `--store-only` has been aliased to `--pull-policy=never`
 
 ### Bug fixes
-- image gc: don't remove images that currently running pods were made from ([#3549](https://github.com/coreos/rkt/pull/3549)).
-- stage1/fly: evaluate symlinks in mount targets ([#3570](https://github.com/coreos/rkt/pull/3570)).
-- lib/app: use runtime app mounts and appVolumes rather than mountpoints ([#3571](https://github.com/coreos/rkt/pull/3571)).
+- image gc: don't remove images that currently running pods were made from ([#3549](https://github.com/rkt/rkt/pull/3549)).
+- stage1/fly: evaluate symlinks in mount targets ([#3570](https://github.com/rkt/rkt/pull/3570)).
+- lib/app: use runtime app mounts and appVolumes rather than mountpoints ([#3571](https://github.com/rkt/rkt/pull/3571)).
 
 ## Other changes:
-- kvm/qemu: Update QEMU to v2.8.0 ([#3568](https://github.com/coreos/rkt/pull/3568)).
-- stage0/app-add: CLI args should override image ones ([#3566](https://github.com/coreos/rkt/pull/3566)).
-- lib/app: use runtime app mounts and appVolumes rather than mountpoints ([#3571](https://github.com/coreos/rkt/pull/3571)).
-- kvm/lkvm: update lkvm version to HEAD ([#3569](https://github.com/coreos/rkt/pull/3569)).
-- vendor: bump appc to v0.8.10 ([#3574](https://github.com/coreos/rkt/pull/3574)).
-- docs: ([#3552](https://github.com/coreos/rkt/pull/3552))
+- kvm/qemu: Update QEMU to v2.8.0 ([#3568](https://github.com/rkt/rkt/pull/3568)).
+- stage0/app-add: CLI args should override image ones ([#3566](https://github.com/rkt/rkt/pull/3566)).
+- lib/app: use runtime app mounts and appVolumes rather than mountpoints ([#3571](https://github.com/rkt/rkt/pull/3571)).
+- kvm/lkvm: update lkvm version to HEAD ([#3569](https://github.com/rkt/rkt/pull/3569)).
+- vendor: bump appc to v0.8.10 ([#3574](https://github.com/rkt/rkt/pull/3574)).
+- docs: ([#3552](https://github.com/rkt/rkt/pull/3552))
 
 ### Build & Test:
-- tests: remove gexpect from TestAppUserGroup ([#3561](https://github.com/coreos/rkt/pull/3561)).
-- travis: remove "gimme.local" script ([#3556](https://github.com/coreos/rkt/pull/3556)).
-- tests: fix when $HOME is only accessible by current user ([#3559](https://github.com/coreos/rkt/pull/3559)).
-- makelib: introduce --enable-incremental-build, enabling "go install" ([#3553](https://github.com/coreos/rkt/pull/3553)).
+- tests: remove gexpect from TestAppUserGroup ([#3561](https://github.com/rkt/rkt/pull/3561)).
+- travis: remove "gimme.local" script ([#3556](https://github.com/rkt/rkt/pull/3556)).
+- tests: fix when $HOME is only accessible by current user ([#3559](https://github.com/rkt/rkt/pull/3559)).
+- makelib: introduce --enable-incremental-build, enabling "go install" ([#3553](https://github.com/rkt/rkt/pull/3553)).
 
 ## 1.23.0
 
 This release adds a lot of bugfixes around the rkt fly flavor, garbage collection, kvm, and the sandbox. The new experimental `app` subcommand now follows the semantic of CRI of not quitting prematurely if apps fail or exit. Finally docker2aci received an important update fixing issues with os/arch labels which caused issues on arm architectures, a big thanks here goes to @ybubnov for this contribution.
 
 ### New features
-- sandbox: don't exit if an app fails ([#3478](https://github.com/coreos/rkt/pull/3478)). In contrast to regular `rkt run` behavior, the sandbox now does not quit if all or single apps fail or exit.
+- sandbox: don't exit if an app fails ([#3478](https://github.com/rkt/rkt/pull/3478)). In contrast to regular `rkt run` behavior, the sandbox now does not quit if all or single apps fail or exit.
 
 ### Bug fixes
-- stage1: fix incorrect splitting function ([#3541](https://github.com/coreos/rkt/pull/3541)).
-- sandbox/app-add: fix mount targets with absolute symlink targets ([#3490](https://github.com/coreos/rkt/pull/3490)).
-- namefetcher: fix nil pointer dereference ([#3536](https://github.com/coreos/rkt/pull/3536)).
-- Bump appc/docker2aci library version to 0.15.0 ([#3534](https://github.com/coreos/rkt/pull/3534)). This supports the conversion of images with various os/arch labels.
-- stage1: uid shift systemd files ([#3529](https://github.com/coreos/rkt/pull/3529)).
-- stage1/kvm/lkvm: chown files and dirs on creation ([#3485](https://github.com/coreos/rkt/pull/3485)).
-- stage1/fly: record pgid and let stop fallback to it ([#3523](https://github.com/coreos/rkt/pull/3523)).
-- common/overlay: allow data directory name with colon character ([#3505](https://github.com/coreos/rkt/pull/3505)).
-- api-service: stop erroring when a pod is running ([#3525](https://github.com/coreos/rkt/pull/3525)).
-- stage1/fly: clear FD_CLOEXEC only once ([#3521](https://github.com/coreos/rkt/pull/3521)).
-- stage1: Add hostname to /etc/hosts ([#3522](https://github.com/coreos/rkt/pull/3522)).
-- gc: avoid erroring in race to deletion ([#3515](https://github.com/coreos/rkt/pull/3515)).
-- tests/rkt_stop: Wait for 'stop' command to complete ([#3518](https://github.com/coreos/rkt/pull/3518)).
-- pkg/pod: avoid nil panic for missing pods ([#3514](https://github.com/coreos/rkt/pull/3514)).
+- stage1: fix incorrect splitting function ([#3541](https://github.com/rkt/rkt/pull/3541)).
+- sandbox/app-add: fix mount targets with absolute symlink targets ([#3490](https://github.com/rkt/rkt/pull/3490)).
+- namefetcher: fix nil pointer dereference ([#3536](https://github.com/rkt/rkt/pull/3536)).
+- Bump appc/docker2aci library version to 0.15.0 ([#3534](https://github.com/rkt/rkt/pull/3534)). This supports the conversion of images with various os/arch labels.
+- stage1: uid shift systemd files ([#3529](https://github.com/rkt/rkt/pull/3529)).
+- stage1/kvm/lkvm: chown files and dirs on creation ([#3485](https://github.com/rkt/rkt/pull/3485)).
+- stage1/fly: record pgid and let stop fallback to it ([#3523](https://github.com/rkt/rkt/pull/3523)).
+- common/overlay: allow data directory name with colon character ([#3505](https://github.com/rkt/rkt/pull/3505)).
+- api-service: stop erroring when a pod is running ([#3525](https://github.com/rkt/rkt/pull/3525)).
+- stage1/fly: clear FD_CLOEXEC only once ([#3521](https://github.com/rkt/rkt/pull/3521)).
+- stage1: Add hostname to /etc/hosts ([#3522](https://github.com/rkt/rkt/pull/3522)).
+- gc: avoid erroring in race to deletion ([#3515](https://github.com/rkt/rkt/pull/3515)).
+- tests/rkt_stop: Wait for 'stop' command to complete ([#3518](https://github.com/rkt/rkt/pull/3518)).
+- pkg/pod: avoid nil panic for missing pods ([#3514](https://github.com/rkt/rkt/pull/3514)).
 
 ### Other changes
-- stage1: move more logic out of AppUnit ([#3496](https://github.com/coreos/rkt/pull/3496)).
-- tests: use appc schema instead of string templates ([#3520](https://github.com/coreos/rkt/pull/3520)).
-- stage1: kvm: Update kernel to 4.9.2 ([#3530](https://github.com/coreos/rkt/pull/3530)).
-- stage1: remount entire subcgroup r/w, instead of each knob ([#3494](https://github.com/coreos/rkt/pull/3494)).
-- tests: update AWS CI setup ([#3509](https://github.com/coreos/rkt/pull/3509)).
-- pkg/fileutil: helper function to get major, minor numbers of a device file ([#3500](https://github.com/coreos/rkt/pull/3500)). 
-- pkg/log: correctly handle var-arg printf params ([#3516](https://github.com/coreos/rkt/pull/3516)).
-- Documentation/stop: describe --uuid-file option ([#3511](https://github.com/coreos/rkt/pull/3511)).
+- stage1: move more logic out of AppUnit ([#3496](https://github.com/rkt/rkt/pull/3496)).
+- tests: use appc schema instead of string templates ([#3520](https://github.com/rkt/rkt/pull/3520)).
+- stage1: kvm: Update kernel to 4.9.2 ([#3530](https://github.com/rkt/rkt/pull/3530)).
+- stage1: remount entire subcgroup r/w, instead of each knob ([#3494](https://github.com/rkt/rkt/pull/3494)).
+- tests: update AWS CI setup ([#3509](https://github.com/rkt/rkt/pull/3509)).
+- pkg/fileutil: helper function to get major, minor numbers of a device file ([#3500](https://github.com/rkt/rkt/pull/3500)). 
+- pkg/log: correctly handle var-arg printf params ([#3516](https://github.com/rkt/rkt/pull/3516)).
+- Documentation/stop: describe --uuid-file option ([#3511](https://github.com/rkt/rkt/pull/3511)).
 
 ## 1.22.0
 
@@ -91,24 +91,24 @@ This is a stabilization release which includes better support for environments w
 
 ### New features and UX changes
 
-- rkt/cat-manifest: add support for --uuid-file ([#3498](https://github.com/coreos/rkt/pull/3498)).
-- stage1: fallback if systemd cgroup doesn't exist ([#3507](https://github.com/coreos/rkt/pull/3507)).
-- vendor: bump gocapability ([#3493](https://github.com/coreos/rkt/pull/3493)). This change renames `sys_psacct` to `sys_pacct`.
-- stage0/app: pass debug flag to entrypoints ([#3469](https://github.com/coreos/rkt/pull/3469)).
+- rkt/cat-manifest: add support for --uuid-file ([#3498](https://github.com/rkt/rkt/pull/3498)).
+- stage1: fallback if systemd cgroup doesn't exist ([#3507](https://github.com/rkt/rkt/pull/3507)).
+- vendor: bump gocapability ([#3493](https://github.com/rkt/rkt/pull/3493)). This change renames `sys_psacct` to `sys_pacct`.
+- stage0/app: pass debug flag to entrypoints ([#3469](https://github.com/rkt/rkt/pull/3469)).
 
 ### Bug fixes
-- gc: fix cleaning mounts and files ([#3486](https://github.com/coreos/rkt/pull/3486)). This improves GC behavior in case of busy mounts and other complex scenarios.
-- mount: ensure empty volume paths exist for copy-up ([#3468](https://github.com/coreos/rkt/pull/3468)).
-- rkt stop/rm: a pod must be closed after PodFromUUIDString() ([#3492](https://github.com/coreos/rkt/pull/3492)).
+- gc: fix cleaning mounts and files ([#3486](https://github.com/rkt/rkt/pull/3486)). This improves GC behavior in case of busy mounts and other complex scenarios.
+- mount: ensure empty volume paths exist for copy-up ([#3468](https://github.com/rkt/rkt/pull/3468)).
+- rkt stop/rm: a pod must be closed after PodFromUUIDString() ([#3492](https://github.com/rkt/rkt/pull/3492)).
 
 ### Other changes
-- stage1/kvm: add a dash in kernel LOCALVERSION ([#3489](https://github.com/coreos/rkt/pull/3489)).
-- stage1/kvm: Improve QEMU Makefile rules ([#3474](https://github.com/coreos/rkt/pull/3474)).
-- pkg/pod: use IncludeMostDirs bitmask instead of constructing it ([#3506](https://github.com/coreos/rkt/pull/3506)).
-- pkg/pod: add WaitReady, dry Sandbox methods ([#3462](https://github.com/coreos/rkt/pull/3462)).
-- vendor: bump gexpect to 0.1.1 ([#3467](https://github.com/coreos/rkt/pull/3467)).
-- common: fix 'the the' duplication in comment ([#3497](https://github.com/coreos/rkt/pull/3497)).
-- docs: multiple updates ([#3479](https://github.com/coreos/rkt/pull/3479), [#3501](https://github.com/coreos/rkt/pull/3501), [#3464](https://github.com/coreos/rkt/pull/3464), [#3495](https://github.com/coreos/rkt/pull/3495)).
+- stage1/kvm: add a dash in kernel LOCALVERSION ([#3489](https://github.com/rkt/rkt/pull/3489)).
+- stage1/kvm: Improve QEMU Makefile rules ([#3474](https://github.com/rkt/rkt/pull/3474)).
+- pkg/pod: use IncludeMostDirs bitmask instead of constructing it ([#3506](https://github.com/rkt/rkt/pull/3506)).
+- pkg/pod: add WaitReady, dry Sandbox methods ([#3462](https://github.com/rkt/rkt/pull/3462)).
+- vendor: bump gexpect to 0.1.1 ([#3467](https://github.com/rkt/rkt/pull/3467)).
+- common: fix 'the the' duplication in comment ([#3497](https://github.com/rkt/rkt/pull/3497)).
+- docs: multiple updates ([#3479](https://github.com/rkt/rkt/pull/3479), [#3501](https://github.com/rkt/rkt/pull/3501), [#3464](https://github.com/rkt/rkt/pull/3464), [#3495](https://github.com/rkt/rkt/pull/3495)).
 
 ## 1.21.0
 
@@ -119,29 +119,29 @@ This release includes bugfixes for the experimental CRI support, more stable int
 
 
 ### New features
-- Change the subnet for the default-restricted network ([#3440](https://github.com/coreos/rkt/pull/3440)), ([#3459](https://github.com/coreos/rkt/pull/3459)).
-- Prepare for writable /proc/sys, and /sys ([#3389](https://github.com/coreos/rkt/pull/3389)).
-- Documentation/proposals: add OCI Image Format roadmap ([#3425](https://github.com/coreos/rkt/pull/3425)).
+- Change the subnet for the default-restricted network ([#3440](https://github.com/rkt/rkt/pull/3440)), ([#3459](https://github.com/rkt/rkt/pull/3459)).
+- Prepare for writable /proc/sys, and /sys ([#3389](https://github.com/rkt/rkt/pull/3389)).
+- Documentation/proposals: add OCI Image Format roadmap ([#3425](https://github.com/rkt/rkt/pull/3425)).
 
 ### Bug fixes
-- stage1: app add, status didn't work with empty vols ([#3451](https://github.com/coreos/rkt/pull/3451)).
-- stage1: properly run defer'd umounts in app add ([#3455](https://github.com/coreos/rkt/pull/3455)).
-- cri: correct 'created' timestamp ([#3399](https://github.com/coreos/rkt/pull/3399)).
-- fly: ensure the target bin directory exists before building ([#3436](https://github.com/coreos/rkt/pull/3436)).
-- rkt: misc systemd-related fixes ([#3418](https://github.com/coreos/rkt/pull/3418)).
+- stage1: app add, status didn't work with empty vols ([#3451](https://github.com/rkt/rkt/pull/3451)).
+- stage1: properly run defer'd umounts in app add ([#3455](https://github.com/rkt/rkt/pull/3455)).
+- cri: correct 'created' timestamp ([#3399](https://github.com/rkt/rkt/pull/3399)).
+- fly: ensure the target bin directory exists before building ([#3436](https://github.com/rkt/rkt/pull/3436)).
+- rkt: misc systemd-related fixes ([#3418](https://github.com/rkt/rkt/pull/3418)).
 
 ### Other changes
-- pkg/mountinfo: move mountinfo parser to its own package ([#3415](https://github.com/coreos/rkt/pull/3415)).
-- stage1: persist runtime parameters ([#3432](https://github.com/coreos/rkt/pull/3432)), ([#3450](https://github.com/coreos/rkt/pull/3450)).
-- stage1: signal supervisor readiness ([#3424](https://github.com/coreos/rkt/pull/3424)), ([#3439](https://github.com/coreos/rkt/pull/3439)).
-- sandbox: add missing flagDNSDomain and flagHostsEntries parameters ([#3430](https://github.com/coreos/rkt/pull/3430)).
-- pkg/tar: fix variable name in error ([#3433](https://github.com/coreos/rkt/pull/3433)).
-- tests: fix TestExport for the KVM+overlay case ([#3435](https://github.com/coreos/rkt/pull/3435)).
-- tests: fix some potential gexpect hangs ([#3443](https://github.com/coreos/rkt/pull/3443)).
-- tests: add smoke test for app sandbox ([#3371](https://github.com/coreos/rkt/pull/3371)).
-- tests: tentative fixes for sporadic host and kvm failures ([#3434](https://github.com/coreos/rkt/pull/3434)).
-- rkt: remove empty TODO ([#3417](https://github.com/coreos/rkt/pull/3417)).
-- Documentation updates: [#3446](https://github.com/coreos/rkt/pull/3446), ([#3421](https://github.com/coreos/rkt/pull/3421)), ([#3412](https://github.com/coreos/rkt/pull/3412)).
+- pkg/mountinfo: move mountinfo parser to its own package ([#3415](https://github.com/rkt/rkt/pull/3415)).
+- stage1: persist runtime parameters ([#3432](https://github.com/rkt/rkt/pull/3432)), ([#3450](https://github.com/rkt/rkt/pull/3450)).
+- stage1: signal supervisor readiness ([#3424](https://github.com/rkt/rkt/pull/3424)), ([#3439](https://github.com/rkt/rkt/pull/3439)).
+- sandbox: add missing flagDNSDomain and flagHostsEntries parameters ([#3430](https://github.com/rkt/rkt/pull/3430)).
+- pkg/tar: fix variable name in error ([#3433](https://github.com/rkt/rkt/pull/3433)).
+- tests: fix TestExport for the KVM+overlay case ([#3435](https://github.com/rkt/rkt/pull/3435)).
+- tests: fix some potential gexpect hangs ([#3443](https://github.com/rkt/rkt/pull/3443)).
+- tests: add smoke test for app sandbox ([#3371](https://github.com/rkt/rkt/pull/3371)).
+- tests: tentative fixes for sporadic host and kvm failures ([#3434](https://github.com/rkt/rkt/pull/3434)).
+- rkt: remove empty TODO ([#3417](https://github.com/rkt/rkt/pull/3417)).
+- Documentation updates: [#3446](https://github.com/rkt/rkt/pull/3446), ([#3421](https://github.com/rkt/rkt/pull/3421)), ([#3412](https://github.com/rkt/rkt/pull/3412)).
 
 ## 1.20.0
 
@@ -150,28 +150,28 @@ It also adds first step towards OCI by introducing an internal concept called "d
 Finally the rkt fly flavor gained support for `rkt enter`.
 
 ### New features and UX changes
-- stage1/fly: Add a working `rkt enter` implementation ([#3377](https://github.com/coreos/rkt/pull/3377)).
+- stage1/fly: Add a working `rkt enter` implementation ([#3377](https://github.com/rkt/rkt/pull/3377)).
 
 ### Bug fixes:
-- tests/build-and-run-test.sh: fix systemd revision parameter ([#3395](https://github.com/coreos/rkt/pull/3395)).
-- namefetcher: Use ETag in fetchVerifiedURL() ([#3374](https://github.com/coreos/rkt/pull/3374)).
-- rkt/run: validates pod manifest to make sure it contains at least one app ([#3363](https://github.com/coreos/rkt/pull/3363)).
-- rkt/app: multiple bugfixes ([#3405](https://github.com/coreos/rkt/pull/3405)).
+- tests/build-and-run-test.sh: fix systemd revision parameter ([#3395](https://github.com/rkt/rkt/pull/3395)).
+- namefetcher: Use ETag in fetchVerifiedURL() ([#3374](https://github.com/rkt/rkt/pull/3374)).
+- rkt/run: validates pod manifest to make sure it contains at least one app ([#3363](https://github.com/rkt/rkt/pull/3363)).
+- rkt/app: multiple bugfixes ([#3405](https://github.com/rkt/rkt/pull/3405)).
 
 ### Other changes
-- glide: deduplicate cni entries and update go-systemd ([#3372](https://github.com/coreos/rkt/pull/3372)).
-- stage0: improve list --format behavior and flags ([#3403](https://github.com/coreos/rkt/pull/3403)).
-- pkg/pod: flatten the pod state if-ladders ([#3404](https://github.com/coreos/rkt/pull/3404)).
-- tests: adjust security tests for systemd v232 ([#3401](https://github.com/coreos/rkt/pull/3401)).
-- image: export `ImageListEntry` type for image list ([#3383](https://github.com/coreos/rkt/pull/3383)).
-- glide: bump gopsutil to v2.16.10 ([#3400](https://github.com/coreos/rkt/pull/3400)).
-- stage1: update coreos base to alpha 1235.0.0 ([#3388](https://github.com/coreos/rkt/pull/3388)).
-- rkt: Implement distribution points ([#3369](https://github.com/coreos/rkt/pull/3369)). This is the implementation of the distribution concept proposed in [#2953](https://github.com/coreos/rkt/pull/2953).
-- build: add --with-stage1-systemd-revision option for src build ([#3362](https://github.com/coreos/rkt/pull/3362)).
-- remove isReallyNil() ([#3381](https://github.com/coreos/rkt/pull/3381)). This is cleanup PR, removing some reflection based code.
-- vendor: update appc/spec to 0.8.9 ([#3384](https://github.com/coreos/rkt/pull/3384)).
-- vendor: Remove direct k8s dependency ([#3312](https://github.com/coreos/rkt/pull/3312)).
-- Documentation updates: [#3366](https://github.com/coreos/rkt/pull/3366), [#3376](https://github.com/coreos/rkt/pull/3376), [#3379](https://github.com/coreos/rkt/pull/3379), [#3406](https://github.com/coreos/rkt/pull/3406), [#3410](https://github.com/coreos/rkt/pull/3410).
+- glide: deduplicate cni entries and update go-systemd ([#3372](https://github.com/rkt/rkt/pull/3372)).
+- stage0: improve list --format behavior and flags ([#3403](https://github.com/rkt/rkt/pull/3403)).
+- pkg/pod: flatten the pod state if-ladders ([#3404](https://github.com/rkt/rkt/pull/3404)).
+- tests: adjust security tests for systemd v232 ([#3401](https://github.com/rkt/rkt/pull/3401)).
+- image: export `ImageListEntry` type for image list ([#3383](https://github.com/rkt/rkt/pull/3383)).
+- glide: bump gopsutil to v2.16.10 ([#3400](https://github.com/rkt/rkt/pull/3400)).
+- stage1: update coreos base to alpha 1235.0.0 ([#3388](https://github.com/rkt/rkt/pull/3388)).
+- rkt: Implement distribution points ([#3369](https://github.com/rkt/rkt/pull/3369)). This is the implementation of the distribution concept proposed in [#2953](https://github.com/rkt/rkt/pull/2953).
+- build: add --with-stage1-systemd-revision option for src build ([#3362](https://github.com/rkt/rkt/pull/3362)).
+- remove isReallyNil() ([#3381](https://github.com/rkt/rkt/pull/3381)). This is cleanup PR, removing some reflection based code.
+- vendor: update appc/spec to 0.8.9 ([#3384](https://github.com/rkt/rkt/pull/3384)).
+- vendor: Remove direct k8s dependency ([#3312](https://github.com/rkt/rkt/pull/3312)).
+- Documentation updates: [#3366](https://github.com/rkt/rkt/pull/3366), [#3376](https://github.com/rkt/rkt/pull/3376), [#3379](https://github.com/rkt/rkt/pull/3379), [#3406](https://github.com/rkt/rkt/pull/3406), [#3410](https://github.com/rkt/rkt/pull/3410).
 
 ## 1.19.0
 
@@ -180,53 +180,53 @@ This release contains multiple changes to rkt core, bringing it more in line wit
 A new experimental `app` subcommand has been introduced, which allows creating a "pod sandbox" and dynamically mutating it at runtime. This feature is not yet completely stabilized, and is currently gated behind an experimental flag.
 
 ### New features and UX changes
-- rkt: experimental support for pod sandbox ([#3318](https://github.com/coreos/rkt/pull/3318)). This PR introduces an experimental `app` subcommand and many additional app-level options.
-- rkt/image: align image selection behavior for the rm subcommand ([#3353](https://github.com/coreos/rkt/pull/3353)).
-- stage1/init: leave privileged pods without stage2 mount-ns ([#3290](https://github.com/coreos/rkt/pull/3290)).
-- stage0/image: list images output in JSON format ([#3334](https://github.com/coreos/rkt/pull/3334)).
-- stage0/arch: initial support for ppc64le platform ([#3315](https://github.com/coreos/rkt/pull/3315)).
+- rkt: experimental support for pod sandbox ([#3318](https://github.com/rkt/rkt/pull/3318)). This PR introduces an experimental `app` subcommand and many additional app-level options.
+- rkt/image: align image selection behavior for the rm subcommand ([#3353](https://github.com/rkt/rkt/pull/3353)).
+- stage1/init: leave privileged pods without stage2 mount-ns ([#3290](https://github.com/rkt/rkt/pull/3290)).
+- stage0/image: list images output in JSON format ([#3334](https://github.com/rkt/rkt/pull/3334)).
+- stage0/arch: initial support for ppc64le platform ([#3315](https://github.com/rkt/rkt/pull/3315)).
 
 ### Bug fixes:
-- gc: make sure `CNI_PATH` is same for gc and init ([#3348](https://github.com/coreos/rkt/pull/3348)).
-- gc: clean up some GC leaks ([#3317](https://github.com/coreos/rkt/pull/3317)).
-- stage0: minor wording fixes ([#3351](https://github.com/coreos/rkt/pull/3351)).
-- setup-data-dir.sh: fallback to the `mkdir/chmod`s if the rkt.conf doesn't exist ([#3335](https://github.com/coreos/rkt/pull/3335)).
-- scripts: add gpg to Debian dependencies ([#3339](https://github.com/coreos/rkt/pull/3339)).
-- kvm: fix for breaking change in Debian Sid GCC default options ([#3354](https://github.com/coreos/rkt/pull/3354)).
-- image/list: bring back field filtering in plaintext mode ([#3361](https://github.com/coreos/rkt/pull/3361)).
+- gc: make sure `CNI_PATH` is same for gc and init ([#3348](https://github.com/rkt/rkt/pull/3348)).
+- gc: clean up some GC leaks ([#3317](https://github.com/rkt/rkt/pull/3317)).
+- stage0: minor wording fixes ([#3351](https://github.com/rkt/rkt/pull/3351)).
+- setup-data-dir.sh: fallback to the `mkdir/chmod`s if the rkt.conf doesn't exist ([#3335](https://github.com/rkt/rkt/pull/3335)).
+- scripts: add gpg to Debian dependencies ([#3339](https://github.com/rkt/rkt/pull/3339)).
+- kvm: fix for breaking change in Debian Sid GCC default options ([#3354](https://github.com/rkt/rkt/pull/3354)).
+- image/list: bring back field filtering in plaintext mode ([#3361](https://github.com/rkt/rkt/pull/3361)).
 
 ### Other changes
-- cgroup/v1: introduce mount flags to mountFsRO ([#3350](https://github.com/coreos/rkt/pull/3350)).
-- kvm: update QEMU version to 2.7.0 ([#3341](https://github.com/coreos/rkt/pull/3341)).
-- kvm: bump kernel version to 4.8.6, updated config ([#3342](https://github.com/coreos/rkt/pull/3342)). 
-- vendor: introduce kr/pretty and bump go-systemd ([#3333](https://github.com/coreos/rkt/pull/3333)).
-- vendor: update docker2aci to 0.14.0 ([#3356](https://github.com/coreos/rkt/pull/3356)).
-- tests: add the --debug option to more tests ([#3340](https://github.com/coreos/rkt/pull/3340)).
-- scripts/build-rir: bump rkt-builder version to 1.1.1 ([#3360](https://github.com/coreos/rkt/pull/3360)).
-- Documentation updates: [#3321](https://github.com/coreos/rkt/pull/3321), [#3331](https://github.com/coreos/rkt/pull/3331), [#3325](https://github.com/coreos/rkt/pull/3325).
+- cgroup/v1: introduce mount flags to mountFsRO ([#3350](https://github.com/rkt/rkt/pull/3350)).
+- kvm: update QEMU version to 2.7.0 ([#3341](https://github.com/rkt/rkt/pull/3341)).
+- kvm: bump kernel version to 4.8.6, updated config ([#3342](https://github.com/rkt/rkt/pull/3342)). 
+- vendor: introduce kr/pretty and bump go-systemd ([#3333](https://github.com/rkt/rkt/pull/3333)).
+- vendor: update docker2aci to 0.14.0 ([#3356](https://github.com/rkt/rkt/pull/3356)).
+- tests: add the --debug option to more tests ([#3340](https://github.com/rkt/rkt/pull/3340)).
+- scripts/build-rir: bump rkt-builder version to 1.1.1 ([#3360](https://github.com/rkt/rkt/pull/3360)).
+- Documentation updates: [#3321](https://github.com/rkt/rkt/pull/3321), [#3331](https://github.com/rkt/rkt/pull/3331), [#3325](https://github.com/rkt/rkt/pull/3325).
 
 ## 1.18.0
 
 This minor release contains bugfixes, UX enhancements, and other improvements.
 
 ### UX changes:
-- rkt: gate diagnostic output behind `--debug` ([#3297](https://github.com/coreos/rkt/pull/3297)).
-- rkt: Change exit codes to 254 ([#3261](https://github.com/coreos/rkt/pull/3261)). 
+- rkt: gate diagnostic output behind `--debug` ([#3297](https://github.com/rkt/rkt/pull/3297)).
+- rkt: Change exit codes to 254 ([#3261](https://github.com/rkt/rkt/pull/3261)). 
 
 
 ### Bug fixes:
-- stage1/kvm: correctly bind-mount read-only volumes ([#3304](https://github.com/coreos/rkt/pull/3304)). 
-- stage0/cas: apply xattr attributes ([#3305](https://github.com/coreos/rkt/pull/3305)). 
-- scripts/install-rkt: add iptables dependency ([#3309](https://github.com/coreos/rkt/pull/3309)). 
-- stage0/image: set proxy if InsecureSkipVerify is set ([#3303](https://github.com/coreos/rkt/pull/3303)).
+- stage1/kvm: correctly bind-mount read-only volumes ([#3304](https://github.com/rkt/rkt/pull/3304)). 
+- stage0/cas: apply xattr attributes ([#3305](https://github.com/rkt/rkt/pull/3305)). 
+- scripts/install-rkt: add iptables dependency ([#3309](https://github.com/rkt/rkt/pull/3309)). 
+- stage0/image: set proxy if InsecureSkipVerify is set ([#3303](https://github.com/rkt/rkt/pull/3303)).
 
 ### Other changes
-- vendor: update docker2aci to 0.13.0 ([#3314](https://github.com/coreos/rkt/pull/3314)). This fixes multiple fetching and conversion bugs, including two security issues.
-- scripts: update glide vendor script ([#3313](https://github.com/coreos/rkt/pull/3313)). 
-- vendor: update appc/spec to v0.8.8 ([#3310](https://github.com/coreos/rkt/pull/3310)). 
-- stage1: update to CoreOS 1192.0.0 (and update sanity checks) ([#3283](https://github.com/coreos/rkt/pull/3283)). 
-- cgroup: introduce proper cgroup/v1, cgroup/v2 packages ([#3277](https://github.com/coreos/rkt/pull/3277)).
-- Documentation updates: ([#3281](https://github.com/coreos/rkt/pull/3281)), ([#3319](https://github.com/coreos/rkt/pull/3319)), ([#3308](https://github.com/coreos/rkt/pull/3308)).
+- vendor: update docker2aci to 0.13.0 ([#3314](https://github.com/rkt/rkt/pull/3314)). This fixes multiple fetching and conversion bugs, including two security issues.
+- scripts: update glide vendor script ([#3313](https://github.com/rkt/rkt/pull/3313)). 
+- vendor: update appc/spec to v0.8.8 ([#3310](https://github.com/rkt/rkt/pull/3310)). 
+- stage1: update to CoreOS 1192.0.0 (and update sanity checks) ([#3283](https://github.com/rkt/rkt/pull/3283)). 
+- cgroup: introduce proper cgroup/v1, cgroup/v2 packages ([#3277](https://github.com/rkt/rkt/pull/3277)).
+- Documentation updates: ([#3281](https://github.com/rkt/rkt/pull/3281)), ([#3319](https://github.com/rkt/rkt/pull/3319)), ([#3308](https://github.com/rkt/rkt/pull/3308)).
 
 
 ## 1.17.0
@@ -234,98 +234,98 @@ This minor release contains bugfixes, UX enhancements, and other improvements.
 This is a minor release packaging rkt-api systemd service units, and fixing a bug caused by overly long lines in generated stage1 unit files.
 
 ### New features and UX changes
-- dist: Add systemd rkt-api service and socket ([#3271](https://github.com/coreos/rkt/pull/3271)).
-- dist: package rkt-api unit files ([#3275](https://github.com/coreos/rkt/pull/3275)).
+- dist: Add systemd rkt-api service and socket ([#3271](https://github.com/rkt/rkt/pull/3271)).
+- dist: package rkt-api unit files ([#3275](https://github.com/rkt/rkt/pull/3275)).
 
 ### Bug fixes
-- stage1: break down overlong property lines ([#3279](https://github.com/coreos/rkt/pull/3279)).
+- stage1: break down overlong property lines ([#3279](https://github.com/rkt/rkt/pull/3279)).
 
 ### Other changes
-- stage0: fix typo and some docstring style ([#3266](https://github.com/coreos/rkt/pull/3266)).
-- stage0: Create an mtab symlink if not present ([#3265](https://github.com/coreos/rkt/pull/3265)).
-- stage1: use systemd protection for kernel tunables ([#3273](https://github.com/coreos/rkt/pull/3273)).
-- Documentation updates: ([#3280](https://github.com/coreos/rkt/pull/3280), [#3263](https://github.com/coreos/rkt/pull/3263), [#3268](https://github.com/coreos/rkt/pull/3268), [#3254](https://github.com/coreos/rkt/pull/3254), [#3199](https://github.com/coreos/rkt/pull/3199), [#3256](https://github.com/coreos/rkt/pull/3256))
+- stage0: fix typo and some docstring style ([#3266](https://github.com/rkt/rkt/pull/3266)).
+- stage0: Create an mtab symlink if not present ([#3265](https://github.com/rkt/rkt/pull/3265)).
+- stage1: use systemd protection for kernel tunables ([#3273](https://github.com/rkt/rkt/pull/3273)).
+- Documentation updates: ([#3280](https://github.com/rkt/rkt/pull/3280), [#3263](https://github.com/rkt/rkt/pull/3263), [#3268](https://github.com/rkt/rkt/pull/3268), [#3254](https://github.com/rkt/rkt/pull/3254), [#3199](https://github.com/rkt/rkt/pull/3199), [#3256](https://github.com/rkt/rkt/pull/3256))
 
 ## 1.16.0
 
 This release contains an important bugfix for the stage1-host flavor, as well as initial internal support for cgroup2 and pod sandboxes as specified by kubernetes CRI (Container Runtime Interface).
 
 ### Bug fixes
-- stage1/host: fix systemd-nspawn args ordering ([#3216](https://github.com/coreos/rkt/pull/3216)). Fixes https://github.com/coreos/rkt/issues/3215.
+- stage1/host: fix systemd-nspawn args ordering ([#3216](https://github.com/rkt/rkt/pull/3216)). Fixes https://github.com/rkt/rkt/issues/3215.
 
 ### New features
-- rkt: support for unified cgroups (cgroup2) ([#3032](https://github.com/coreos/rkt/pull/3032)). This implements support for cgroups v2 along support for legacy version.
-- cri: initial implementation of stage1 changes ([#3218](https://github.com/coreos/rkt/pull/3218)). This PR pulls the stage1-based changes from the CRI branch back into
+- rkt: support for unified cgroups (cgroup2) ([#3032](https://github.com/rkt/rkt/pull/3032)). This implements support for cgroups v2 along support for legacy version.
+- cri: initial implementation of stage1 changes ([#3218](https://github.com/rkt/rkt/pull/3218)). This PR pulls the stage1-based changes from the CRI branch back into
 master, leaving out the changes in stage0 (new app subcommands).
 
 ### Other changes
-- doc/using-rkt-with-systemd: fix the go app example ([#3217](https://github.com/coreos/rkt/pull/3217)).
-- rkt: refactor app-level flags handling ([#3209](https://github.com/coreos/rkt/pull/3209)). This is in preparation for https://github.com/coreos/rkt/pull/3205
-- docs/distributions: rearrange, add centos ([#3212](https://github.com/coreos/rkt/pull/3212)).
-- rkt: Correct typos listed by the tool misspell ([#3208](https://github.com/coreos/rkt/pull/3208)).
+- doc/using-rkt-with-systemd: fix the go app example ([#3217](https://github.com/rkt/rkt/pull/3217)).
+- rkt: refactor app-level flags handling ([#3209](https://github.com/rkt/rkt/pull/3209)). This is in preparation for https://github.com/rkt/rkt/pull/3205
+- docs/distributions: rearrange, add centos ([#3212](https://github.com/rkt/rkt/pull/3212)).
+- rkt: Correct typos listed by the tool misspell ([#3208](https://github.com/rkt/rkt/pull/3208)).
 
 ## 1.15.0
 
 This relase brings some expanded DNS configuration options, beta support for QEMU, recursive volume mounts, and improved sd_notify support.
 
 ### New features
-- DNS configuration improvements ([#3161](https://github.com/coreos/rkt/pull/3161)):
+- DNS configuration improvements ([#3161](https://github.com/rkt/rkt/pull/3161)):
     - Respect DNS results from CNI
     - Add --dns=host mode to bind-mount the host's /etc/resolv.conf
     - Add --dns=none mode to ignore CNI DNS
     - Add --hosts-entry (IP=HOSTNAME) to tweak the pod's /etc/hosts
     - Add --hosts-entry=host to bind-mount the host's /etc/hosts
-- Introduce QEMU support as an alternative KVM hypervisor ([#2952](https://github.com/coreos/rkt/pull/2952))
-- add support for recursive volume/mounts ([#2880](https://github.com/coreos/rkt/pull/2880))
-- stage1: allow sd_notify from the app in the container to the host ([#2826](https://github.com/coreos/rkt/pull/2826)).
+- Introduce QEMU support as an alternative KVM hypervisor ([#2952](https://github.com/rkt/rkt/pull/2952))
+- add support for recursive volume/mounts ([#2880](https://github.com/rkt/rkt/pull/2880))
+- stage1: allow sd_notify from the app in the container to the host ([#2826](https://github.com/rkt/rkt/pull/2826)).
 
 ### Other changes
-- rkt-monitor: bunch of improvements ([#3093](https://github.com/coreos/rkt/pull/3093))
-- makefile/kvm: add dependency for copied files ([#3197](https://github.com/coreos/rkt/pull/3197))
-- store: refactor GetRemote ([#2975](https://github.com/coreos/rkt/pull/2975)).
-- build,stage1: include systemd dir when checking libs ([#3186](https://github.com/coreos/rkt/pull/3186))
-- tests: volumes: add missing test `volumeMountTestCasesNonRecursive` ([#3165](https://github.com/coreos/rkt/pull/3165))
-- kvm/pod: disable insecure-options=paths for kvm flavor ([#3155](https://github.com/coreos/rkt/pull/3155))
-- stage0: don't copy image annotations to pod manifest RuntimeApp annotations ([#3100](https://github.com/coreos/rkt/pull/3100))
-- stage1: shutdown.service: don't use /dev/console ([#3148](https://github.com/coreos/rkt/pull/3148))
-- build: build simple .deb and .rpm packages ([#3177](https://github.com/coreos/rkt/pull/3177)). Add a simple script to build .deb and .rpm packages. This is not a substitute for a proper distro-maintained package.
-- Documentation updates: ([#3196](https://github.com/coreos/rkt/pull/3196)) ([#3192](https://github.com/coreos/rkt/pull/3192)) ([#3187](https://github.com/coreos/rkt/pull/3187)) ([#3185](https://github.com/coreos/rkt/pull/3185)) ([#3182](https://github.com/coreos/rkt/pull/3182)) ([#3180](https://github.com/coreos/rkt/pull/3180)) ([#3166](https://github.com/coreos/rkt/pull/3166))
-- proposals/app-level-api: add rkt app sandbox subcommand ([#3147](https://github.com/coreos/rkt/pull/3147)). This adds a new subcommand `app init` to create an initial empty pod.
+- rkt-monitor: bunch of improvements ([#3093](https://github.com/rkt/rkt/pull/3093))
+- makefile/kvm: add dependency for copied files ([#3197](https://github.com/rkt/rkt/pull/3197))
+- store: refactor GetRemote ([#2975](https://github.com/rkt/rkt/pull/2975)).
+- build,stage1: include systemd dir when checking libs ([#3186](https://github.com/rkt/rkt/pull/3186))
+- tests: volumes: add missing test `volumeMountTestCasesNonRecursive` ([#3165](https://github.com/rkt/rkt/pull/3165))
+- kvm/pod: disable insecure-options=paths for kvm flavor ([#3155](https://github.com/rkt/rkt/pull/3155))
+- stage0: don't copy image annotations to pod manifest RuntimeApp annotations ([#3100](https://github.com/rkt/rkt/pull/3100))
+- stage1: shutdown.service: don't use /dev/console ([#3148](https://github.com/rkt/rkt/pull/3148))
+- build: build simple .deb and .rpm packages ([#3177](https://github.com/rkt/rkt/pull/3177)). Add a simple script to build .deb and .rpm packages. This is not a substitute for a proper distro-maintained package.
+- Documentation updates: ([#3196](https://github.com/rkt/rkt/pull/3196)) ([#3192](https://github.com/rkt/rkt/pull/3192)) ([#3187](https://github.com/rkt/rkt/pull/3187)) ([#3185](https://github.com/rkt/rkt/pull/3185)) ([#3182](https://github.com/rkt/rkt/pull/3182)) ([#3180](https://github.com/rkt/rkt/pull/3180)) ([#3166](https://github.com/rkt/rkt/pull/3166))
+- proposals/app-level-api: add rkt app sandbox subcommand ([#3147](https://github.com/rkt/rkt/pull/3147)). This adds a new subcommand `app init` to create an initial empty pod.
 
 ## 1.14.0
 
 This release updates the coreos and kvm flavors, bringing in a newer stable systemd (v231). Several fixes and cgroups-related changes landed in `api-service`, and better heuristics have been introduced to avoid using overlays in non-supported environments. Finally, `run-prepared` now honors options for insecure/privileged pods too.
 
 ### New features and UX changes
-- stage1: update to CoreOS 1151.0.0 and systemd v231 ([#3122](https://github.com/coreos/rkt/pull/3122)).
-- common: fall back to non-overlay with ftype=0 ([#3105](https://github.com/coreos/rkt/pull/3105)).
-- rkt: honor insecure-options in run-prepared ([#3138](https://github.com/coreos/rkt/pull/3138)).
+- stage1: update to CoreOS 1151.0.0 and systemd v231 ([#3122](https://github.com/rkt/rkt/pull/3122)).
+- common: fall back to non-overlay with ftype=0 ([#3105](https://github.com/rkt/rkt/pull/3105)).
+- rkt: honor insecure-options in run-prepared ([#3138](https://github.com/rkt/rkt/pull/3138)).
 
 #### Bug fixes
-- stage0: fix golint warnings ([#3099](https://github.com/coreos/rkt/pull/3099)).
-- rkt: avoid possible panic in api-server ([#3111](https://github.com/coreos/rkt/pull/3111)).
-- rkt/run: allow --set-env-file files with comments ([#3115](https://github.com/coreos/rkt/pull/3115)).
-- scripts/install-rkt: add wget as dependency ([#3124](https://github.com/coreos/rkt/pull/3124)).
-- install-rkt.sh: scripts: Fix missing files in .deb when using install-rkt.sh ([#3127](https://github.com/coreos/rkt/pull/3127)). 
-- tests: check for run-prepared with insecure options ([#3139](https://github.com/coreos/rkt/pull/3139)).
+- stage0: fix golint warnings ([#3099](https://github.com/rkt/rkt/pull/3099)).
+- rkt: avoid possible panic in api-server ([#3111](https://github.com/rkt/rkt/pull/3111)).
+- rkt/run: allow --set-env-file files with comments ([#3115](https://github.com/rkt/rkt/pull/3115)).
+- scripts/install-rkt: add wget as dependency ([#3124](https://github.com/rkt/rkt/pull/3124)).
+- install-rkt.sh: scripts: Fix missing files in .deb when using install-rkt.sh ([#3127](https://github.com/rkt/rkt/pull/3127)). 
+- tests: check for run-prepared with insecure options ([#3139](https://github.com/rkt/rkt/pull/3139)).
 
 #### Other changes
-- seccomp/docker: update docker whitelist to include mlock ([#3126](https://github.com/coreos/rkt/pull/3126)). This updates the `@docker/default-whitelist` to include mlock-related
+- seccomp/docker: update docker whitelist to include mlock ([#3126](https://github.com/rkt/rkt/pull/3126)). This updates the `@docker/default-whitelist` to include mlock-related
 syscalls (mlock, mlock2, mlockall).
-- build: add PowerPC ([#2936](https://github.com/coreos/rkt/pull/2936)).
-- scripts: install-rkt.sh: fail install-pak on errors ([#3150](https://github.com/coreos/rkt/pull/3150)). When install-pak (called from install-rkt.sh) fails at some point
+- build: add PowerPC ([#2936](https://github.com/rkt/rkt/pull/2936)).
+- scripts: install-rkt.sh: fail install-pak on errors ([#3150](https://github.com/rkt/rkt/pull/3150)). When install-pak (called from install-rkt.sh) fails at some point
 abort packaging.
-- api_service: Rework cgroup detection ([#3072](https://github.com/coreos/rkt/pull/3072)). Use the `subcgroup` file hint provided by some stage1s rather than
+- api_service: Rework cgroup detection ([#3072](https://github.com/rkt/rkt/pull/3072)). Use the `subcgroup` file hint provided by some stage1s rather than
 machined registration.
-- Documentation/devel: add make images target ([#3142](https://github.com/coreos/rkt/pull/3142)). This introduces the possibility to generate graphivz based PNG images using
+- Documentation/devel: add make images target ([#3142](https://github.com/rkt/rkt/pull/3142)). This introduces the possibility to generate graphivz based PNG images using
 a new `images` make target.
-- vendor: update appc/spec to 0.8.7 ([#3143](https://github.com/coreos/rkt/pull/3143)).
-- stage1/kvm: avoid writing misleading subcgroup ([#3107](https://github.com/coreos/rkt/pull/3107)).
-- vendor: update go-systemd to v12 ([#3125](https://github.com/coreos/rkt/pull/3125)).
-- scripts: bump coreos.com/rkt/builder image version ([#3092](https://github.com/coreos/rkt/pull/3092)). This bumps rkt-builder version to 1.0.2, in order to work with
+- vendor: update appc/spec to 0.8.7 ([#3143](https://github.com/rkt/rkt/pull/3143)).
+- stage1/kvm: avoid writing misleading subcgroup ([#3107](https://github.com/rkt/rkt/pull/3107)).
+- vendor: update go-systemd to v12 ([#3125](https://github.com/rkt/rkt/pull/3125)).
+- scripts: bump coreos.com/rkt/builder image version ([#3092](https://github.com/rkt/rkt/pull/3092)). This bumps rkt-builder version to 1.0.2, in order to work with
 seccomp filtering.
-- export: test export for multi-app pods ([#3075](https://github.com/coreos/rkt/pull/3075)).
-- Documentation updates: ([#3146](https://github.com/coreos/rkt/pull/3146), [#2954](https://github.com/coreos/rkt/pull/2954), [#3128](https://github.com/coreos/rkt/pull/3128), [#2953](https://github.com/coreos/rkt/pull/2953), [#3103](https://github.com/coreos/rkt/pull/3103), [#3087](https://github.com/coreos/rkt/pull/3087), [#3097](https://github.com/coreos/rkt/pull/3097), [#3096](https://github.com/coreos/rkt/pull/3096), [#3095](https://github.com/coreos/rkt/pull/3095), [#3089](https://github.com/coreos/rkt/pull/3089))
+- export: test export for multi-app pods ([#3075](https://github.com/rkt/rkt/pull/3075)).
+- Documentation updates: ([#3146](https://github.com/rkt/rkt/pull/3146), [#2954](https://github.com/rkt/rkt/pull/2954), [#3128](https://github.com/rkt/rkt/pull/3128), [#2953](https://github.com/rkt/rkt/pull/2953), [#3103](https://github.com/rkt/rkt/pull/3103), [#3087](https://github.com/rkt/rkt/pull/3087), [#3097](https://github.com/rkt/rkt/pull/3097), [#3096](https://github.com/rkt/rkt/pull/3096), [#3095](https://github.com/rkt/rkt/pull/3095), [#3089](https://github.com/rkt/rkt/pull/3089))
 
 ## 1.13.0
 
@@ -333,32 +333,32 @@ This release introduces support for exporting single applications out of multi-a
 
 ### New features and UX changes
 
-- export: name flag for exporting multi-app pods ([#3030](https://github.com/coreos/rkt/pull/3030)).
-- stage1: limit device node creation/reading/writing with DevicePolicy= and DeviceAllow= ([#3027](https://github.com/coreos/rkt/pull/3027), [#3058](https://github.com/coreos/rkt/pull/3058)).
-- rkt: implements --insecure-options={capabilities,paths,seccomp,run-all} ([#2983](https://github.com/coreos/rkt/pull/2983)).
+- export: name flag for exporting multi-app pods ([#3030](https://github.com/rkt/rkt/pull/3030)).
+- stage1: limit device node creation/reading/writing with DevicePolicy= and DeviceAllow= ([#3027](https://github.com/rkt/rkt/pull/3027), [#3058](https://github.com/rkt/rkt/pull/3058)).
+- rkt: implements --insecure-options={capabilities,paths,seccomp,run-all} ([#2983](https://github.com/rkt/rkt/pull/2983)).
 
 #### Bug fixes
 
-- kvm: use a properly formatted comment for iptables chains ([#3038](https://github.com/coreos/rkt/pull/3038)). rkt was using the chain name as comment, which could lead to confusion.
-- pkg/label: supply mcsdir as function argument to InitLabels() ([#3045](https://github.com/coreos/rkt/pull/3045)).
-- api_service: improve machined call error output ([#3059](https://github.com/coreos/rkt/pull/3059)).
-- general: fix old appc/spec version in various files ([#3055](https://github.com/coreos/rkt/pull/3055)).
-- rkt/pubkey: use custom http client including timeout ([#3084](https://github.com/coreos/rkt/pull/3084)).
-- dist: remove quotes from rkt-api.service ExecStart ([#3079](https://github.com/coreos/rkt/pull/3079)).
-- build: multiple fixes ([#3042](https://github.com/coreos/rkt/pull/3042), [#3041](https://github.com/coreos/rkt/pull/3041), [#3046](https://github.com/coreos/rkt/pull/3046)).
-- configure: disable tests on host flavor with systemd <227 ([#3047](https://github.com/coreos/rkt/pull/3047)).
+- kvm: use a properly formatted comment for iptables chains ([#3038](https://github.com/rkt/rkt/pull/3038)). rkt was using the chain name as comment, which could lead to confusion.
+- pkg/label: supply mcsdir as function argument to InitLabels() ([#3045](https://github.com/rkt/rkt/pull/3045)).
+- api_service: improve machined call error output ([#3059](https://github.com/rkt/rkt/pull/3059)).
+- general: fix old appc/spec version in various files ([#3055](https://github.com/rkt/rkt/pull/3055)).
+- rkt/pubkey: use custom http client including timeout ([#3084](https://github.com/rkt/rkt/pull/3084)).
+- dist: remove quotes from rkt-api.service ExecStart ([#3079](https://github.com/rkt/rkt/pull/3079)).
+- build: multiple fixes ([#3042](https://github.com/rkt/rkt/pull/3042), [#3041](https://github.com/rkt/rkt/pull/3041), [#3046](https://github.com/rkt/rkt/pull/3046)).
+- configure: disable tests on host flavor with systemd <227 ([#3047](https://github.com/rkt/rkt/pull/3047)).
 
 #### Other changes
 
-- travis: add go 1.7, bump go 1.5/1.6 ([#3077](https://github.com/coreos/rkt/pull/3077)).
-- api_service: Add lru cache to cache image info ([#2910](https://github.com/coreos/rkt/pull/2910)).
-- scripts: add curl as build dependency ([#3070](https://github.com/coreos/rkt/pull/3070)).
-- vendor: use appc/spec 0.8.6 and k8s.io/kubernetes v1.3.0 ([#3063](https://github.com/coreos/rkt/pull/3063)).
-- common: use fileutil.IsExecutable() ([#3023](https://github.com/coreos/rkt/pull/3023)).
-- build: Stop printing irrelevant invalidation messages ([#3050](https://github.com/coreos/rkt/pull/3050)).
-- build: Make generating clean files simpler to do ([#3057](https://github.com/coreos/rkt/pull/3057)).
-- Documentation: misc changes ([#3053](https://github.com/coreos/rkt/pull/3053), [#2911](https://github.com/coreos/rkt/pull/2911), [#3035](https://github.com/coreos/rkt/pull/3035), [#3036](https://github.com/coreos/rkt/pull/3036), [#3037](https://github.com/coreos/rkt/pull/3037), [#2945](https://github.com/coreos/rkt/pull/2945), [#3083](https://github.com/coreos/rkt/pull/3083), [#3076](https://github.com/coreos/rkt/pull/3076), [#3033](https://github.com/coreos/rkt/pull/3033), [#3064](https://github.com/coreos/rkt/pull/3064), [#2932](https://github.com/coreos/rkt/pull/2932)).
-- functional tests: misc fixes ([#3049](https://github.com/coreos/rkt/pull/3049)).
+- travis: add go 1.7, bump go 1.5/1.6 ([#3077](https://github.com/rkt/rkt/pull/3077)).
+- api_service: Add lru cache to cache image info ([#2910](https://github.com/rkt/rkt/pull/2910)).
+- scripts: add curl as build dependency ([#3070](https://github.com/rkt/rkt/pull/3070)).
+- vendor: use appc/spec 0.8.6 and k8s.io/kubernetes v1.3.0 ([#3063](https://github.com/rkt/rkt/pull/3063)).
+- common: use fileutil.IsExecutable() ([#3023](https://github.com/rkt/rkt/pull/3023)).
+- build: Stop printing irrelevant invalidation messages ([#3050](https://github.com/rkt/rkt/pull/3050)).
+- build: Make generating clean files simpler to do ([#3057](https://github.com/rkt/rkt/pull/3057)).
+- Documentation: misc changes ([#3053](https://github.com/rkt/rkt/pull/3053), [#2911](https://github.com/rkt/rkt/pull/2911), [#3035](https://github.com/rkt/rkt/pull/3035), [#3036](https://github.com/rkt/rkt/pull/3036), [#3037](https://github.com/rkt/rkt/pull/3037), [#2945](https://github.com/rkt/rkt/pull/2945), [#3083](https://github.com/rkt/rkt/pull/3083), [#3076](https://github.com/rkt/rkt/pull/3076), [#3033](https://github.com/rkt/rkt/pull/3033), [#3064](https://github.com/rkt/rkt/pull/3064), [#2932](https://github.com/rkt/rkt/pull/2932)).
+- functional tests: misc fixes ([#3049](https://github.com/rkt/rkt/pull/3049)).
 
 ## 1.12.0
 
@@ -366,89 +366,89 @@ This release introduces support for seccomp filtering via two new seccomp isolat
 
 #### New features and UX changes
 
-- cli: rename `--cap-retain` and `--cap-remove` to `--caps-*` ([#2994](https://github.com/coreos/rkt/pull/2994)).
-- stage1: apply seccomp isolators ([#2753](https://github.com/coreos/rkt/pull/2753)). This introduces support for appc seccomp isolators.
-- scripts: add /etc/rkt owned by group rkt-admin in setup-data-dir.sh ([#2944](https://github.com/coreos/rkt/pull/2944)).
-- rkt: add `--caps-retain` and `--caps-remove` to prepare ([#3007](https://github.com/coreos/rkt/pull/3007)).
-- store: allow users in the rkt group to delete images ([#2961](https://github.com/coreos/rkt/pull/2961)).
-- api_service: cache pod manifest ([#2891](https://github.com/coreos/rkt/pull/2891)). Manifest caching considerably improves api-service performances.
-- store: tell the user to run as root on db update ([#2966](https://github.com/coreos/rkt/pull/2966)).
-- stage1: disabling cgroup namespace in systemd-nspawn ([#2989](https://github.com/coreos/rkt/pull/2989)). For more information see [systemd#3589](https://github.com/systemd/systemd/pull/3589).
-- fly: copy rkt-resolv.conf in the app ([#2982](https://github.com/coreos/rkt/pull/2982)).
-- store: decouple aci store and treestore implementations ([#2919](https://github.com/coreos/rkt/pull/2919)).
-- store: record ACI fetching information ([#2960](https://github.com/coreos/rkt/pull/2960)).
+- cli: rename `--cap-retain` and `--cap-remove` to `--caps-*` ([#2994](https://github.com/rkt/rkt/pull/2994)).
+- stage1: apply seccomp isolators ([#2753](https://github.com/rkt/rkt/pull/2753)). This introduces support for appc seccomp isolators.
+- scripts: add /etc/rkt owned by group rkt-admin in setup-data-dir.sh ([#2944](https://github.com/rkt/rkt/pull/2944)).
+- rkt: add `--caps-retain` and `--caps-remove` to prepare ([#3007](https://github.com/rkt/rkt/pull/3007)).
+- store: allow users in the rkt group to delete images ([#2961](https://github.com/rkt/rkt/pull/2961)).
+- api_service: cache pod manifest ([#2891](https://github.com/rkt/rkt/pull/2891)). Manifest caching considerably improves api-service performances.
+- store: tell the user to run as root on db update ([#2966](https://github.com/rkt/rkt/pull/2966)).
+- stage1: disabling cgroup namespace in systemd-nspawn ([#2989](https://github.com/rkt/rkt/pull/2989)). For more information see [systemd#3589](https://github.com/systemd/systemd/pull/3589).
+- fly: copy rkt-resolv.conf in the app ([#2982](https://github.com/rkt/rkt/pull/2982)).
+- store: decouple aci store and treestore implementations ([#2919](https://github.com/rkt/rkt/pull/2919)).
+- store: record ACI fetching information ([#2960](https://github.com/rkt/rkt/pull/2960)).
 
 #### Bug fixes
-- stage1/init: fix writing of /etc/machine-id ([#2977](https://github.com/coreos/rkt/pull/2977)).
-- rkt-monitor: multiple fixes ([#2927](https://github.com/coreos/rkt/pull/2927), [#2988](https://github.com/coreos/rkt/pull/2988)).
-- rkt: don't errwrap cli_apps errors ([#2958](https://github.com/coreos/rkt/pull/2958)).
-- pkg/tar/chroot: avoid errwrap in function called by multicall ([#2997](https://github.com/coreos/rkt/pull/2997)).
-- networking: apply CNI args to the default networks as well ([#2985](https://github.com/coreos/rkt/pull/2985)).
-- trust: provide InsecureSkipTLSCheck to pubkey manager ([#3016](https://github.com/coreos/rkt/pull/3016)).
-- api_service: update grpc version ([#3015](https://github.com/coreos/rkt/pull/3015)).
-- fetcher: httpcaching fixes ([#2965](https://github.com/coreos/rkt/pull/2965)).
+- stage1/init: fix writing of /etc/machine-id ([#2977](https://github.com/rkt/rkt/pull/2977)).
+- rkt-monitor: multiple fixes ([#2927](https://github.com/rkt/rkt/pull/2927), [#2988](https://github.com/rkt/rkt/pull/2988)).
+- rkt: don't errwrap cli_apps errors ([#2958](https://github.com/rkt/rkt/pull/2958)).
+- pkg/tar/chroot: avoid errwrap in function called by multicall ([#2997](https://github.com/rkt/rkt/pull/2997)).
+- networking: apply CNI args to the default networks as well ([#2985](https://github.com/rkt/rkt/pull/2985)).
+- trust: provide InsecureSkipTLSCheck to pubkey manager ([#3016](https://github.com/rkt/rkt/pull/3016)).
+- api_service: update grpc version ([#3015](https://github.com/rkt/rkt/pull/3015)).
+- fetcher: httpcaching fixes ([#2965](https://github.com/rkt/rkt/pull/2965)).
 
 #### Other changes
-- build,stage1/init: set interpBin at build time for src flavor ([#2978](https://github.com/coreos/rkt/pull/2978)).
-- common: introduce RemoveEmptyLines() ([#3004](https://github.com/coreos/rkt/pull/3004)).
-- glide: update docker2aci to v0.12.3 ([#3026](https://github.com/coreos/rkt/pull/3026)). This fixes multiple bugs in layers ordering for Docker images.
-- glide: update go-systemd to v11 ([#2970](https://github.com/coreos/rkt/pull/2970)). This fixes a buggy corner-case in journal seeking (implicit seek to head).
-- docs: document capabilities overriding ([#2917](https://github.com/coreos/rkt/pull/2917), [#2991](https://github.com/coreos/rkt/pull/2991)).
-- issue template: add '\n' to the end of environment output ([#3008](https://github.com/coreos/rkt/pull/3008)).
-- functional tests: multiple fixes ([#2999](https://github.com/coreos/rkt/pull/2999), [#2979](https://github.com/coreos/rkt/pull/2979), [#3014](https://github.com/coreos/rkt/pull/3014)).
+- build,stage1/init: set interpBin at build time for src flavor ([#2978](https://github.com/rkt/rkt/pull/2978)).
+- common: introduce RemoveEmptyLines() ([#3004](https://github.com/rkt/rkt/pull/3004)).
+- glide: update docker2aci to v0.12.3 ([#3026](https://github.com/rkt/rkt/pull/3026)). This fixes multiple bugs in layers ordering for Docker images.
+- glide: update go-systemd to v11 ([#2970](https://github.com/rkt/rkt/pull/2970)). This fixes a buggy corner-case in journal seeking (implicit seek to head).
+- docs: document capabilities overriding ([#2917](https://github.com/rkt/rkt/pull/2917), [#2991](https://github.com/rkt/rkt/pull/2991)).
+- issue template: add '\n' to the end of environment output ([#3008](https://github.com/rkt/rkt/pull/3008)).
+- functional tests: multiple fixes ([#2999](https://github.com/rkt/rkt/pull/2999), [#2979](https://github.com/rkt/rkt/pull/2979), [#3014](https://github.com/rkt/rkt/pull/3014)).
 
 ## 1.11.0
 
 This release sets the ground for the new upcoming KVM qemu flavor. It adds support for exporting a pod to an ACI including all modifications. The rkt API service now also supports systemd socket activation. Finally we have diagnostics back, helping users to find out why their app failed to execute.
 
 #### New features
-- KVM: Hypervisor support for KVM flavor focusing on qemu ([#2684](https://github.com/coreos/rkt/pull/2684)). This provides a generic mechanism to use different kvm hypervisors (such as lkvm, qemu-kvm).
-- rkt: add command to export a pod to an aci ([#2889](https://github.com/coreos/rkt/pull/2889)). Adds a new `export` command to rkt which generates an ACI from a pod; saving any changes made to the pod.
-- rkt/api: detect when run as a `systemd.socket(5)` service ([#2916](https://github.com/coreos/rkt/pull/2916)). This allows rkt to run as a systemd socket-based unit.
-- rkt/stop: implement `--uuid-file` ([#2902](https://github.com/coreos/rkt/pull/2902)). So the user can use the value saved on rkt run with `--uuid-file-save`.
+- KVM: Hypervisor support for KVM flavor focusing on qemu ([#2684](https://github.com/rkt/rkt/pull/2684)). This provides a generic mechanism to use different kvm hypervisors (such as lkvm, qemu-kvm).
+- rkt: add command to export a pod to an aci ([#2889](https://github.com/rkt/rkt/pull/2889)). Adds a new `export` command to rkt which generates an ACI from a pod; saving any changes made to the pod.
+- rkt/api: detect when run as a `systemd.socket(5)` service ([#2916](https://github.com/rkt/rkt/pull/2916)). This allows rkt to run as a systemd socket-based unit.
+- rkt/stop: implement `--uuid-file` ([#2902](https://github.com/rkt/rkt/pull/2902)). So the user can use the value saved on rkt run with `--uuid-file-save`.
 
 #### Bug fixes
-- scripts/glide-update: ensure running from $GOPATH ([#2885](https://github.com/coreos/rkt/pull/2885)). glide is confused when it's not running with the rkt repository inside $GOPATH.
-- store: fix missing shared storelock acquisition on NewStore ([#2896](https://github.com/coreos/rkt/pull/2896)).
-- store,rkt: fix fd leaks ([#2906](https://github.com/coreos/rkt/pull/2906)). Close db lock on store close. If we don't do it, there's a fd leak everytime we open a new Store, even if it was closed.
-- stage1/enterexec: remove trailing `\n` in environment variables ([#2901](https://github.com/coreos/rkt/pull/2901)). Loading environment retained the new line character (`\n`), this produced an incorrect evaluation of the environment variables.
-- stage1/gc: skip cleaning our own cgroup ([#2914](https://github.com/coreos/rkt/pull/2914)).
-- api_service/log: fix file descriptor leak in GetLogs() ([#2930](https://github.com/coreos/rkt/pull/2930)).
-- protobuf: fix protoc-gen-go build with vendoring ([#2913](https://github.com/coreos/rkt/pull/2913)).
-- build: fix x86 builds ([#2926](https://github.com/coreos/rkt/pull/2926)). This PR fixes a minor issue which leads to x86 builds failing.
-- functional tests: add some more volume/mount tests ([#2903](https://github.com/coreos/rkt/pull/2903)).
-- stage1/init: link pod's journal in kvm flavor ([#2934](https://github.com/coreos/rkt/pull/2934)). In nspawn flavors, nspawn creates a symlink from `/var/log/journal/${machine-id}` to the pod's journal directory. In kvm we need to do the link ourselves.
-- build: Build system fixes ([#2938](https://github.com/coreos/rkt/pull/2938)). This should fix the `expr: syntax error` and useless rebuilds of network plugins.
+- scripts/glide-update: ensure running from $GOPATH ([#2885](https://github.com/rkt/rkt/pull/2885)). glide is confused when it's not running with the rkt repository inside $GOPATH.
+- store: fix missing shared storelock acquisition on NewStore ([#2896](https://github.com/rkt/rkt/pull/2896)).
+- store,rkt: fix fd leaks ([#2906](https://github.com/rkt/rkt/pull/2906)). Close db lock on store close. If we don't do it, there's a fd leak everytime we open a new Store, even if it was closed.
+- stage1/enterexec: remove trailing `\n` in environment variables ([#2901](https://github.com/rkt/rkt/pull/2901)). Loading environment retained the new line character (`\n`), this produced an incorrect evaluation of the environment variables.
+- stage1/gc: skip cleaning our own cgroup ([#2914](https://github.com/rkt/rkt/pull/2914)).
+- api_service/log: fix file descriptor leak in GetLogs() ([#2930](https://github.com/rkt/rkt/pull/2930)).
+- protobuf: fix protoc-gen-go build with vendoring ([#2913](https://github.com/rkt/rkt/pull/2913)).
+- build: fix x86 builds ([#2926](https://github.com/rkt/rkt/pull/2926)). This PR fixes a minor issue which leads to x86 builds failing.
+- functional tests: add some more volume/mount tests ([#2903](https://github.com/rkt/rkt/pull/2903)).
+- stage1/init: link pod's journal in kvm flavor ([#2934](https://github.com/rkt/rkt/pull/2934)). In nspawn flavors, nspawn creates a symlink from `/var/log/journal/${machine-id}` to the pod's journal directory. In kvm we need to do the link ourselves.
+- build: Build system fixes ([#2938](https://github.com/rkt/rkt/pull/2938)). This should fix the `expr: syntax error` and useless rebuilds of network plugins.
 
 #### Other changes
-- stage1: diagnostic functionality for rkt run ([#2872](https://github.com/coreos/rkt/pull/2872)). If the app exits with `ExecMainStatus == 203`, the app's reaper runs the diagnostic tool and prints the output on stdout. systemd sets `ExecMainstatus` to EXIT_EXEC (203) when execve() fails.
-- build: add support for more architectures at configure time ([#2907](https://github.com/coreos/rkt/pull/2907)).
-- stage1: update coreos image to 1097.0.0 ([#2884](https://github.com/coreos/rkt/pull/2884)). This is needed for a recent enough version of libseccomp (2.3.0), with support for new syscalls (eg. getrandom).
-- api: By adding labels to the image itself, we don't need to pass the manifest to filter function ([#2909](https://github.com/coreos/rkt/pull/2909)). api: Add labels to pod and image type.
-- api: optionally build systemd-journal support ([#2868](https://github.com/coreos/rkt/pull/2868)). This introduces a 'sdjournal' tag and corresponding stubs in api_service, turning libsystemd headers into a soft-dependency.
-- store: simplify db locking and functions ([#2897](https://github.com/coreos/rkt/pull/2897)). Instead of having a file lock to handle inter process locking and a sync.Mutex to handle locking between multiple goroutines, just create, lock and close a new file lock at every db.Do function.
-- stage1/enterexec: Add entry to ASSCB_EXTRA_HEADERS ([#2924](https://github.com/coreos/rkt/pull/2924)). Added entry to ASSCB_EXTRA_HEADERS for better change tracking.
-- build: use rkt-builder ACI ([#2923](https://github.com/coreos/rkt/pull/2923)).
-- Add hidden 'image fetch' next to the existing 'fetch' option ([#2860](https://github.com/coreos/rkt/pull/2860)).
-- stage1: prepare-app: don't mount /sys if path already used ([#2888](https://github.com/coreos/rkt/pull/2888)). When users mount /sys or a sub-directory of /sys as a volume, prepare-app should not mount /sys: that would mask the volume provided by users.
-- build,stage1/init: set interpBin at build time to fix other architecture builds (e.g. x86) ([#2950](https://github.com/coreos/rkt/pull/2950)).
-- functional tests: re-purpose aws.sh for generating AMIs ([#2736](https://github.com/coreos/rkt/pull/2736)).
-- rkt: Add `--cpuprofile` `--memprofile` for profiling rkt ([#2887](https://github.com/coreos/rkt/pull/2887)). Adds two hidden global flags and documentation to enable profiling rkt.
-- functional test: check PATH variable for trailer `\n` character ([#2942](https://github.com/coreos/rkt/pull/2942)).
-- functional tests: disable TestVolumeSysfs on kvm ([#2941](https://github.com/coreos/rkt/pull/2941)).
-- Documentation updates ([#2918](https://github.com/coreos/rkt/pull/2918))
+- stage1: diagnostic functionality for rkt run ([#2872](https://github.com/rkt/rkt/pull/2872)). If the app exits with `ExecMainStatus == 203`, the app's reaper runs the diagnostic tool and prints the output on stdout. systemd sets `ExecMainstatus` to EXIT_EXEC (203) when execve() fails.
+- build: add support for more architectures at configure time ([#2907](https://github.com/rkt/rkt/pull/2907)).
+- stage1: update coreos image to 1097.0.0 ([#2884](https://github.com/rkt/rkt/pull/2884)). This is needed for a recent enough version of libseccomp (2.3.0), with support for new syscalls (eg. getrandom).
+- api: By adding labels to the image itself, we don't need to pass the manifest to filter function ([#2909](https://github.com/rkt/rkt/pull/2909)). api: Add labels to pod and image type.
+- api: optionally build systemd-journal support ([#2868](https://github.com/rkt/rkt/pull/2868)). This introduces a 'sdjournal' tag and corresponding stubs in api_service, turning libsystemd headers into a soft-dependency.
+- store: simplify db locking and functions ([#2897](https://github.com/rkt/rkt/pull/2897)). Instead of having a file lock to handle inter process locking and a sync.Mutex to handle locking between multiple goroutines, just create, lock and close a new file lock at every db.Do function.
+- stage1/enterexec: Add entry to ASSCB_EXTRA_HEADERS ([#2924](https://github.com/rkt/rkt/pull/2924)). Added entry to ASSCB_EXTRA_HEADERS for better change tracking.
+- build: use rkt-builder ACI ([#2923](https://github.com/rkt/rkt/pull/2923)).
+- Add hidden 'image fetch' next to the existing 'fetch' option ([#2860](https://github.com/rkt/rkt/pull/2860)).
+- stage1: prepare-app: don't mount /sys if path already used ([#2888](https://github.com/rkt/rkt/pull/2888)). When users mount /sys or a sub-directory of /sys as a volume, prepare-app should not mount /sys: that would mask the volume provided by users.
+- build,stage1/init: set interpBin at build time to fix other architecture builds (e.g. x86) ([#2950](https://github.com/rkt/rkt/pull/2950)).
+- functional tests: re-purpose aws.sh for generating AMIs ([#2736](https://github.com/rkt/rkt/pull/2736)).
+- rkt: Add `--cpuprofile` `--memprofile` for profiling rkt ([#2887](https://github.com/rkt/rkt/pull/2887)). Adds two hidden global flags and documentation to enable profiling rkt.
+- functional test: check PATH variable for trailer `\n` character ([#2942](https://github.com/rkt/rkt/pull/2942)).
+- functional tests: disable TestVolumeSysfs on kvm ([#2941](https://github.com/rkt/rkt/pull/2941)).
+- Documentation updates ([#2918](https://github.com/rkt/rkt/pull/2918))
 
 #### Library updates
 
-- glide: update docker2aci to v0.12.1 ([#2873](https://github.com/coreos/rkt/pull/2873)). Includes support for the docker image format v2.2 and OCI image format and allows fetching via digest.
+- glide: update docker2aci to v0.12.1 ([#2873](https://github.com/rkt/rkt/pull/2873)). Includes support for the docker image format v2.2 and OCI image format and allows fetching via digest.
 
 ## 1.10.1
 
 This is a minor bug fix release.
 
 #### Bug fixes
-- rkt/run: handle malformed environment files ([#2901](https://github.com/coreos/rkt/pull/2901))
-- stage1/enterexec: remove trailing `\n` in environment variables ([#2901](https://github.com/coreos/rkt/pull/2901))
+- rkt/run: handle malformed environment files ([#2901](https://github.com/rkt/rkt/pull/2901))
+- stage1/enterexec: remove trailing `\n` in environment variables ([#2901](https://github.com/rkt/rkt/pull/2901))
 
 ## v1.10.0
 This release introduces a number of important features and improvements:
@@ -459,29 +459,29 @@ This release introduces a number of important features and improvements:
 - rkt is now packaged for openSUSE Tumbleweed and Leap
 
 #### New features
-- Add ARM64 support ([#2758](https://github.com/coreos/rkt/pull/2758)). This enables ARM64 cross-compliation, fly, and stage1-coreos.
-- Replace Godep with Glide, introduce native Go vendoring ([#2735](https://github.com/coreos/rkt/pull/2735)).
-- rkt: rkt stop ([#2438](https://github.com/coreos/rkt/pull/2438)). Cleanly stops a running pod. For systemd-nspawn, sends a SIGTERM. For kvm, executes `systemctl halt`.
+- Add ARM64 support ([#2758](https://github.com/rkt/rkt/pull/2758)). This enables ARM64 cross-compliation, fly, and stage1-coreos.
+- Replace Godep with Glide, introduce native Go vendoring ([#2735](https://github.com/rkt/rkt/pull/2735)).
+- rkt: rkt stop ([#2438](https://github.com/rkt/rkt/pull/2438)). Cleanly stops a running pod. For systemd-nspawn, sends a SIGTERM. For kvm, executes `systemctl halt`.
 
 #### Bug fixes
-- stage1/fly: respect runtimeApp App's MountPoints ([#2852](https://github.com/coreos/rkt/pull/2852)). Fixes #2846.
-- run: fix sandbox-side metadata service to comply to appc v0.8.1 ([#2863](https://github.com/coreos/rkt/pull/2863)). Fixes #2621.
+- stage1/fly: respect runtimeApp App's MountPoints ([#2852](https://github.com/rkt/rkt/pull/2852)). Fixes #2846.
+- run: fix sandbox-side metadata service to comply to appc v0.8.1 ([#2863](https://github.com/rkt/rkt/pull/2863)). Fixes #2621.
 
 #### Other changes
-- build directory layout change ([#2758](https://github.com/coreos/rkt/pull/2758)): The rkt binary and stage1 image files have been moved from the 'bin' sub-directory to the 'target/bin' sub-directory.
-- networking/kvm: add flannel default gateway parsing ([#2859](https://github.com/coreos/rkt/pull/2859)).
-- stage1/enterexec: environment file with '\n' as separator (systemd style) ([#2839](https://github.com/coreos/rkt/pull/2839)).
-- pkg/tar: ignore global extended headers ([#2847](https://github.com/coreos/rkt/pull/2847)).
-- pkg/tar: remove errwrap ([#2848](https://github.com/coreos/rkt/pull/2848)).
-- tests: fix abuses of appc types.Isolator ([#2840](https://github.com/coreos/rkt/pull/2840)).
-- common: remove unused GetImageIDs() ([#2834](https://github.com/coreos/rkt/pull/2834)).
-- common/cgroup: add mountFsRO() helper function ([#2829](https://github.com/coreos/rkt/pull/2829)).
-- Documentation updates ([#2732](https://github.com/coreos/rkt/pull/2732), [#2869](https://github.com/coreos/rkt/pull/2869), [#2810](https://github.com/coreos/rkt/pull/2810), [#2865](https://github.com/coreos/rkt/pull/2865), [#2825](https://github.com/coreos/rkt/pull/2825), [#2841](https://github.com/coreos/rkt/pull/2841), [#2732](https://github.com/coreos/rkt/pull/2732))
+- build directory layout change ([#2758](https://github.com/rkt/rkt/pull/2758)): The rkt binary and stage1 image files have been moved from the 'bin' sub-directory to the 'target/bin' sub-directory.
+- networking/kvm: add flannel default gateway parsing ([#2859](https://github.com/rkt/rkt/pull/2859)).
+- stage1/enterexec: environment file with '\n' as separator (systemd style) ([#2839](https://github.com/rkt/rkt/pull/2839)).
+- pkg/tar: ignore global extended headers ([#2847](https://github.com/rkt/rkt/pull/2847)).
+- pkg/tar: remove errwrap ([#2848](https://github.com/rkt/rkt/pull/2848)).
+- tests: fix abuses of appc types.Isolator ([#2840](https://github.com/rkt/rkt/pull/2840)).
+- common: remove unused GetImageIDs() ([#2834](https://github.com/rkt/rkt/pull/2834)).
+- common/cgroup: add mountFsRO() helper function ([#2829](https://github.com/rkt/rkt/pull/2829)).
+- Documentation updates ([#2732](https://github.com/rkt/rkt/pull/2732), [#2869](https://github.com/rkt/rkt/pull/2869), [#2810](https://github.com/rkt/rkt/pull/2810), [#2865](https://github.com/rkt/rkt/pull/2865), [#2825](https://github.com/rkt/rkt/pull/2825), [#2841](https://github.com/rkt/rkt/pull/2841), [#2732](https://github.com/rkt/rkt/pull/2732))
 
 #### Library updates
-- glide: bump ql to v1.0.4 ([#2875](https://github.com/coreos/rkt/pull/2875)). It fixes an occassional panic when doing GC.
-- glide: bump gopsutils to 2.1 ([#2876](https://github.com/coreos/rkt/pull/2876)). To include https://github.com/shirou/gopsutil/pull/194 (this adds ARM aarch64 support)
-- vendor: update appc/spec to 0.8.5 ([#2854](https://github.com/coreos/rkt/pull/2854)).
+- glide: bump ql to v1.0.4 ([#2875](https://github.com/rkt/rkt/pull/2875)). It fixes an occassional panic when doing GC.
+- glide: bump gopsutils to 2.1 ([#2876](https://github.com/rkt/rkt/pull/2876)). To include https://github.com/shirou/gopsutil/pull/194 (this adds ARM aarch64 support)
+- vendor: update appc/spec to 0.8.5 ([#2854](https://github.com/rkt/rkt/pull/2854)).
 
 ## v1.9.1
 
@@ -489,9 +489,9 @@ This is a minor bug fix release.
 
 #### Bug fixes
 
-- Godeps: update go-systemd ([#2837](https://github.com/coreos/rkt/pull/2837)). go-systemd v10 fixes a panic-inducing bug due to returning incorrect
+- Godeps: update go-systemd ([#2837](https://github.com/rkt/rkt/pull/2837)). go-systemd v10 fixes a panic-inducing bug due to returning incorrect
 Read() length values.
-- stage1/fly: use 0755 to create mountpaths ([#2836](https://github.com/coreos/rkt/pull/2836)). This will allow any user to list the content directories. It does not
+- stage1/fly: use 0755 to create mountpaths ([#2836](https://github.com/rkt/rkt/pull/2836)). This will allow any user to list the content directories. It does not
 have any effect on the permissions on the mounted files itself.
 
 ## v1.9.0
@@ -500,26 +500,26 @@ This release focuses on bug fixes and developer tooling and UX improvements.
 
 #### New features and UX changes
 
-- rkt/run: added --set-env-file switch and priorities for environments ([#2816](https://github.com/coreos/rkt/pull/2816)). --set-env-file gets an environment variables file path in the format "VAR=VALUE\n...".
-- run: add --cap-retain and --cap-remove ([#2771](https://github.com/coreos/rkt/pull/2771)).
-- store: print more information on rm as non-root ([#2805](https://github.com/coreos/rkt/pull/2805)).
-- Documentation/vagrant: use rkt binary for getting started ([#2808](https://github.com/coreos/rkt/pull/2808)). 
-- docs: New file in documentation - instruction for new developers in rkt ([#2639](https://github.com/coreos/rkt/pull/2639)).
-- stage0/trust: change error message if prefix/root flag missing ([#2661](https://github.com/coreos/rkt/pull/2661)).
+- rkt/run: added --set-env-file switch and priorities for environments ([#2816](https://github.com/rkt/rkt/pull/2816)). --set-env-file gets an environment variables file path in the format "VAR=VALUE\n...".
+- run: add --cap-retain and --cap-remove ([#2771](https://github.com/rkt/rkt/pull/2771)).
+- store: print more information on rm as non-root ([#2805](https://github.com/rkt/rkt/pull/2805)).
+- Documentation/vagrant: use rkt binary for getting started ([#2808](https://github.com/rkt/rkt/pull/2808)). 
+- docs: New file in documentation - instruction for new developers in rkt ([#2639](https://github.com/rkt/rkt/pull/2639)).
+- stage0/trust: change error message if prefix/root flag missing ([#2661](https://github.com/rkt/rkt/pull/2661)).
 
 #### Bug fixes
 
-- rkt/uuid: fix match when uuid is an empty string ([#2807](https://github.com/coreos/rkt/pull/2807)).
-- rkt/api_service: fix fly pods ([#2799](https://github.com/coreos/rkt/pull/2799)).
-- api/client_example: fix panic if pod has no apps ([#2766](https://github.com/coreos/rkt/pull/2766)). Fixes the concern expressed in https://github.com/coreos/rkt/pull/2763#discussion_r66409260
-- api_service: wait until a pod regs with machined ([#2788](https://github.com/coreos/rkt/pull/2788)).
+- rkt/uuid: fix match when uuid is an empty string ([#2807](https://github.com/rkt/rkt/pull/2807)).
+- rkt/api_service: fix fly pods ([#2799](https://github.com/rkt/rkt/pull/2799)).
+- api/client_example: fix panic if pod has no apps ([#2766](https://github.com/rkt/rkt/pull/2766)). Fixes the concern expressed in https://github.com/rkt/rkt/pull/2763#discussion_r66409260
+- api_service: wait until a pod regs with machined ([#2788](https://github.com/rkt/rkt/pull/2788)).
 
 #### Other changes
 
-- stage1: update coreos image to 1068.0.0 ([#2821](https://github.com/coreos/rkt/pull/2821)). 
-- KVM: Update LKVM patch to mount with mmap mode ([#2795](https://github.com/coreos/rkt/pull/2795)).
-- stage1: always write /etc/machine-id ([#2440](https://github.com/coreos/rkt/pull/2440)). Prepare rkt for systemd-v230 in stage1.
-- stage1/prepare-app: always adjust /etc/hostname ([#2761](https://github.com/coreos/rkt/pull/2761)). 
+- stage1: update coreos image to 1068.0.0 ([#2821](https://github.com/rkt/rkt/pull/2821)). 
+- KVM: Update LKVM patch to mount with mmap mode ([#2795](https://github.com/rkt/rkt/pull/2795)).
+- stage1: always write /etc/machine-id ([#2440](https://github.com/rkt/rkt/pull/2440)). Prepare rkt for systemd-v230 in stage1.
+- stage1/prepare-app: always adjust /etc/hostname ([#2761](https://github.com/rkt/rkt/pull/2761)). 
 
 ## v1.8.0
 
@@ -527,25 +527,25 @@ This release focuses on stabilizing the API service, fixing multiple issues in t
 
 #### New features and UX changes
 
-- api: GetLogs: improve client example with 'Follow' ([#2747](https://github.com/coreos/rkt/pull/2747)).
-- kvm: add proxy arp support to macvtap ([#2715](https://github.com/coreos/rkt/pull/2715)).
-- stage0/config: add a CLI flag to pretty print json ([#2745](https://github.com/coreos/rkt/pull/2745)).
-- stage1: make /proc/bus/ read-only ([#2743](https://github.com/coreos/rkt/pull/2743)).
+- api: GetLogs: improve client example with 'Follow' ([#2747](https://github.com/rkt/rkt/pull/2747)).
+- kvm: add proxy arp support to macvtap ([#2715](https://github.com/rkt/rkt/pull/2715)).
+- stage0/config: add a CLI flag to pretty print json ([#2745](https://github.com/rkt/rkt/pull/2745)).
+- stage1: make /proc/bus/ read-only ([#2743](https://github.com/rkt/rkt/pull/2743)).
 
 #### Bug fixes
 
-- api: GetLogs: use the correct type in LogsStreamWriter ([#2744](https://github.com/coreos/rkt/pull/2744)).
-- api: fix service panic on incomplete pods ([#2739](https://github.com/coreos/rkt/pull/2739)).
-- api: Fix the GetLogs() when appname is given ([#2763](https://github.com/coreos/rkt/pull/2763)).
-- pkg/selinux: various fixes ([#2723](https://github.com/coreos/rkt/pull/2723)).
-- pkg/fileutil: don't remove the cleanSrc if it equals '.' ([#2731](https://github.com/coreos/rkt/pull/2731)).
-- stage0: remove superfluous error verbs ([#2750](https://github.com/coreos/rkt/pull/2750)).
+- api: GetLogs: use the correct type in LogsStreamWriter ([#2744](https://github.com/rkt/rkt/pull/2744)).
+- api: fix service panic on incomplete pods ([#2739](https://github.com/rkt/rkt/pull/2739)).
+- api: Fix the GetLogs() when appname is given ([#2763](https://github.com/rkt/rkt/pull/2763)).
+- pkg/selinux: various fixes ([#2723](https://github.com/rkt/rkt/pull/2723)).
+- pkg/fileutil: don't remove the cleanSrc if it equals '.' ([#2731](https://github.com/rkt/rkt/pull/2731)).
+- stage0: remove superfluous error verbs ([#2750](https://github.com/rkt/rkt/pull/2750)).
 
 #### Other changes
 
-- Godeps: bump go-systemd ([#2754](https://github.com/coreos/rkt/pull/2754)). Fixes a panic on the api-service when calling GetLogs().
-- Documentation updates ([#2756](https://github.com/coreos/rkt/pull/2756), [#2741](https://github.com/coreos/rkt/pull/2741), [#2737](https://github.com/coreos/rkt/pull/2737), [#2742](https://github.com/coreos/rkt/pull/2742), [#2730](https://github.com/coreos/rkt/pull/2730), [#2729](https://github.com/coreos/rkt/pull/2729))
-- Test improvements ([#2726](https://github.com/coreos/rkt/pull/2726)).
+- Godeps: bump go-systemd ([#2754](https://github.com/rkt/rkt/pull/2754)). Fixes a panic on the api-service when calling GetLogs().
+- Documentation updates ([#2756](https://github.com/rkt/rkt/pull/2756), [#2741](https://github.com/rkt/rkt/pull/2741), [#2737](https://github.com/rkt/rkt/pull/2737), [#2742](https://github.com/rkt/rkt/pull/2742), [#2730](https://github.com/rkt/rkt/pull/2730), [#2729](https://github.com/rkt/rkt/pull/2729))
+- Test improvements ([#2726](https://github.com/rkt/rkt/pull/2726)).
 
 ## v1.7.0
 
@@ -554,36 +554,36 @@ Cgroups handling has also been improved with regards to setup and cleaning. Many
 
 #### New features and UX changes
 
-- stage1: implement no-new-privs linux isolator ([#2677](https://github.com/coreos/rkt/pull/2677)).
-- stage0: disable OverlayFS by default when working on ZFS ([#2600](https://github.com/coreos/rkt/pull/2600)).
-- stage1: (partially) restrict access to procfs and sysfs paths ([#2683](https://github.com/coreos/rkt/pull/2683)).
-- stage1: clean up pod cgroups on GC ([#2655](https://github.com/coreos/rkt/pull/2655)).
-- stage1/prepare-app: don't mount /sys/fs/cgroup in stage2 ([#2681](https://github.com/coreos/rkt/pull/2681)).
-- stage0: complain and abort on conflicting CLI flags ([#2666](https://github.com/coreos/rkt/pull/2666)).
-- stage1: update CoreOS image signing key ([#2659](https://github.com/coreos/rkt/pull/2659)).
-- api_service: Implement GetLogs RPC request ([#2662](https://github.com/coreos/rkt/pull/2662)).
-- networking: update to CNI v0.3.0 ([#3696](https://github.com/coreos/rkt/pull/2696)).
+- stage1: implement no-new-privs linux isolator ([#2677](https://github.com/rkt/rkt/pull/2677)).
+- stage0: disable OverlayFS by default when working on ZFS ([#2600](https://github.com/rkt/rkt/pull/2600)).
+- stage1: (partially) restrict access to procfs and sysfs paths ([#2683](https://github.com/rkt/rkt/pull/2683)).
+- stage1: clean up pod cgroups on GC ([#2655](https://github.com/rkt/rkt/pull/2655)).
+- stage1/prepare-app: don't mount /sys/fs/cgroup in stage2 ([#2681](https://github.com/rkt/rkt/pull/2681)).
+- stage0: complain and abort on conflicting CLI flags ([#2666](https://github.com/rkt/rkt/pull/2666)).
+- stage1: update CoreOS image signing key ([#2659](https://github.com/rkt/rkt/pull/2659)).
+- api_service: Implement GetLogs RPC request ([#2662](https://github.com/rkt/rkt/pull/2662)).
+- networking: update to CNI v0.3.0 ([#3696](https://github.com/rkt/rkt/pull/2696)).
 
 #### Bug fixes
 
-- api: fix image size reporting ([#2501](https://github.com/coreos/rkt/pull/2501)).
-- build: fix build failures on manpages/bash-completion target due to missing GOPATH ([#2646](https://github.com/coreos/rkt/pull/2646)).
-- dist: fix "other" permissions so rkt list can work without root/rkt-admin ([#2698](https://github.com/coreos/rkt/pull/2698)).
-- kvm: fix logging network plugin type ([#2635](https://github.com/coreos/rkt/pull/2635)).
-- kvm: transform flannel network to allow teardown ([#2647](https://github.com/coreos/rkt/pull/2647)).
-- rkt: fix panic on rm a non-existing pod with uuid-file ([#2679](https://github.com/coreos/rkt/pull/2679)).
-- stage1/init: work around `cgroup/SCM_CREDENTIALS` race ([#2645](https://github.com/coreos/rkt/pull/2645)).
-- gc: mount stage1 on GC ([#2704](https://github.com/coreos/rkt/pull/2704)).
-- stage1: fix network files leak on GC ([#2319](https://github.com/coreos/rkt/issues/2319)).
+- api: fix image size reporting ([#2501](https://github.com/rkt/rkt/pull/2501)).
+- build: fix build failures on manpages/bash-completion target due to missing GOPATH ([#2646](https://github.com/rkt/rkt/pull/2646)).
+- dist: fix "other" permissions so rkt list can work without root/rkt-admin ([#2698](https://github.com/rkt/rkt/pull/2698)).
+- kvm: fix logging network plugin type ([#2635](https://github.com/rkt/rkt/pull/2635)).
+- kvm: transform flannel network to allow teardown ([#2647](https://github.com/rkt/rkt/pull/2647)).
+- rkt: fix panic on rm a non-existing pod with uuid-file ([#2679](https://github.com/rkt/rkt/pull/2679)).
+- stage1/init: work around `cgroup/SCM_CREDENTIALS` race ([#2645](https://github.com/rkt/rkt/pull/2645)).
+- gc: mount stage1 on GC ([#2704](https://github.com/rkt/rkt/pull/2704)).
+- stage1: fix network files leak on GC ([#2319](https://github.com/rkt/rkt/issues/2319)).
 
 #### Other changes
 
-- deps: remove unused dependencies ([#2703](https://github.com/coreos/rkt/pull/2703)).
-- deps: appc/spec, k8s, protobuf updates ([#2697](https://github.com/coreos/rkt/pull/2697)).
-- deps: use tagged release of github.com/shirou/gopsutil ([#2705](https://github.com/coreos/rkt/pull/2705)).
-- deps: bump docker2aci to v0.11.1 ([#2719](https://github.com/coreos/rkt/pull/2719)).
-- Documentation updates ([#2620](https://github.com/coreos/rkt/pull/2620), [#2700](https://github.com/coreos/rkt/pull/2700), [#2637](https://github.com/coreos/rkt/pull/2637), [#2591](https://github.com/coreos/rkt/pull/2591), [#2651](https://github.com/coreos/rkt/pull/2651), [#2699](https://github.com/coreos/rkt/pull/2699), [#2631](https://github.com/coreos/rkt/pull/2631)).
-- Test improvements ([#2587](https://github.com/coreos/rkt/pull/2587), [#2656](https://github.com/coreos/rkt/pull/2656), [#2676](https://github.com/coreos/rkt/pull/2676), [#2554](https://github.com/coreos/rkt/pull/2554), [#2690](https://github.com/coreos/rkt/pull/2690), [#2674](https://github.com/coreos/rkt/pull/2674), [#2665](https://github.com/coreos/rkt/pull/2665), [#2649](https://github.com/coreos/rkt/pull/2649), [#2643](https://github.com/coreos/rkt/pull/2643), [#2637](https://github.com/coreos/rkt/pull/2637), [#2633](https://github.com/coreos/rkt/pull/2633)).
+- deps: remove unused dependencies ([#2703](https://github.com/rkt/rkt/pull/2703)).
+- deps: appc/spec, k8s, protobuf updates ([#2697](https://github.com/rkt/rkt/pull/2697)).
+- deps: use tagged release of github.com/shirou/gopsutil ([#2705](https://github.com/rkt/rkt/pull/2705)).
+- deps: bump docker2aci to v0.11.1 ([#2719](https://github.com/rkt/rkt/pull/2719)).
+- Documentation updates ([#2620](https://github.com/rkt/rkt/pull/2620), [#2700](https://github.com/rkt/rkt/pull/2700), [#2637](https://github.com/rkt/rkt/pull/2637), [#2591](https://github.com/rkt/rkt/pull/2591), [#2651](https://github.com/rkt/rkt/pull/2651), [#2699](https://github.com/rkt/rkt/pull/2699), [#2631](https://github.com/rkt/rkt/pull/2631)).
+- Test improvements ([#2587](https://github.com/rkt/rkt/pull/2587), [#2656](https://github.com/rkt/rkt/pull/2656), [#2676](https://github.com/rkt/rkt/pull/2676), [#2554](https://github.com/rkt/rkt/pull/2554), [#2690](https://github.com/rkt/rkt/pull/2690), [#2674](https://github.com/rkt/rkt/pull/2674), [#2665](https://github.com/rkt/rkt/pull/2665), [#2649](https://github.com/rkt/rkt/pull/2649), [#2643](https://github.com/rkt/rkt/pull/2643), [#2637](https://github.com/rkt/rkt/pull/2637), [#2633](https://github.com/rkt/rkt/pull/2633)).
 
 ## v1.6.0
 
@@ -591,31 +591,31 @@ This release focuses on security enhancements. It provides additional isolators,
 
 #### New features and UX changes
 
-- stage1: implement read-only rootfs ([#2624](https://github.com/coreos/rkt/pull/2624)). Using the Pod manifest readOnlyRootFS option mounts the rootfs of the app as read-only using systemd-exec unit option ReadOnlyDirectories, see [appc/spec](https://github.com/appc/spec/blob/master/spec/pods.md#pod-manifest-schema).
-- stage1: capabilities: implement both remain set and remove set ([#2589](https://github.com/coreos/rkt/pull/2589)). It follows the [Linux Isolators semantics from the App Container Executor spec](https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators), as modified by [appc/spec#600](https://github.com/appc/spec/pull/600).
-- stage1/init: create a new mount ns for each app ([#2603](https://github.com/coreos/rkt/pull/2603)). Up to this point, you could escape the app's chroot easily by using a simple program downloaded from the internet [1](http://www.unixwiz.net/techtips/chroot-practices.html). To avoid this, we now create a new mount namespace per each app.
-- api: Return the pods even when we failed getting information about them ([#2593](https://github.com/coreos/rkt/pull/2593)).
-- stage1/usr_from_coreos: use CoreOS 1032.0.0 with systemd v229 ([#2514](https://github.com/coreos/rkt/pull/2514)).
+- stage1: implement read-only rootfs ([#2624](https://github.com/rkt/rkt/pull/2624)). Using the Pod manifest readOnlyRootFS option mounts the rootfs of the app as read-only using systemd-exec unit option ReadOnlyDirectories, see [appc/spec](https://github.com/appc/spec/blob/master/spec/pods.md#pod-manifest-schema).
+- stage1: capabilities: implement both remain set and remove set ([#2589](https://github.com/rkt/rkt/pull/2589)). It follows the [Linux Isolators semantics from the App Container Executor spec](https://github.com/appc/spec/blob/master/spec/ace.md#linux-isolators), as modified by [appc/spec#600](https://github.com/appc/spec/pull/600).
+- stage1/init: create a new mount ns for each app ([#2603](https://github.com/rkt/rkt/pull/2603)). Up to this point, you could escape the app's chroot easily by using a simple program downloaded from the internet [1](http://www.unixwiz.net/techtips/chroot-practices.html). To avoid this, we now create a new mount namespace per each app.
+- api: Return the pods even when we failed getting information about them ([#2593](https://github.com/rkt/rkt/pull/2593)).
+- stage1/usr_from_coreos: use CoreOS 1032.0.0 with systemd v229 ([#2514](https://github.com/rkt/rkt/pull/2514)).
 
 #### Bug fixes
 
-- kvm: fix flannel network info ([#2625](https://github.com/coreos/rkt/pull/2625)). It wasn't saving the network information on disk.
-- stage1: Machine name wasn't being populated with the full UUID ([#2575](https://github.com/coreos/rkt/pull/2575)).
-- rkt: Some simple arg doc string fixes ([#2588](https://github.com/coreos/rkt/pull/2588)). Remove some unnecessary indefinite articles from the start of argument doc strings and fixes the arg doc string for run-prepared's --interactive flag.
-- stage1: Fix segfault in enterexec ([#2608](https://github.com/coreos/rkt/pull/2608)). This happened if rkt enter was executed without the TERM environment variable set.
-- net: fix port forwarding behavior with custom CNI ipMasq'ed networks and allow different hostPort:podPort combinations ([#2387](https://github.com/coreos/rkt/pull/2387)).
-- stage0: check and create /etc ([#2599](https://github.com/coreos/rkt/pull/2599)). Checks '/etc' before writing to '/etc/rkt-resolv.conf' and creates it with default permissions if it doesn't exist.
+- kvm: fix flannel network info ([#2625](https://github.com/rkt/rkt/pull/2625)). It wasn't saving the network information on disk.
+- stage1: Machine name wasn't being populated with the full UUID ([#2575](https://github.com/rkt/rkt/pull/2575)).
+- rkt: Some simple arg doc string fixes ([#2588](https://github.com/rkt/rkt/pull/2588)). Remove some unnecessary indefinite articles from the start of argument doc strings and fixes the arg doc string for run-prepared's --interactive flag.
+- stage1: Fix segfault in enterexec ([#2608](https://github.com/rkt/rkt/pull/2608)). This happened if rkt enter was executed without the TERM environment variable set.
+- net: fix port forwarding behavior with custom CNI ipMasq'ed networks and allow different hostPort:podPort combinations ([#2387](https://github.com/rkt/rkt/pull/2387)).
+- stage0: check and create /etc ([#2599](https://github.com/rkt/rkt/pull/2599)). Checks '/etc' before writing to '/etc/rkt-resolv.conf' and creates it with default permissions if it doesn't exist.
 
 #### Other changes
 
-- godep: update cni to v0.2.3 ([#2618](https://github.com/coreos/rkt/pull/2618)).
-- godep: update appc/spec to v0.8.1 ([#2623](https://github.com/coreos/rkt/pull/2623), [#2611](https://github.com/coreos/rkt/pull/2611)).
-- dist: Update tmpfiles to create /etc/rkt ([#2472](https://github.com/coreos/rkt/pull/2472)). By creating this directory, users can run `rkt trust` without being root, if the user is in the rkt group.
-- Invoke gofmt with simplify-code flag ([#2489](https://github.com/coreos/rkt/pull/2489)). Enables code simplification checks of gofmt.
-- Implement composable uid/gid generators ([#2510](https://github.com/coreos/rkt/pull/2510)). This cleans up the code a bit and implements uid/gid functionality for rkt fly.
-- stage1: download CoreOS over HTTPS ([#2568](https://github.com/coreos/rkt/pull/2568)). 
-- Documentation updates ([#2555](https://github.com/coreos/rkt/pull/2555), [#2609](https://github.com/coreos/rkt/pull/2609), [#2605](https://github.com/coreos/rkt/pull/2605), [#2578](https://github.com/coreos/rkt/pull/2578), [#2614](https://github.com/coreos/rkt/pull/2614), [#2579](https://github.com/coreos/rkt/pull/2579), [#2570](https://github.com/coreos/rkt/pull/2570)).
-- Test improvements ([#2613](https://github.com/coreos/rkt/pull/2613), [#2566](https://github.com/coreos/rkt/pull/2566), [#2508](https://github.com/coreos/rkt/pull/2508)).
+- godep: update cni to v0.2.3 ([#2618](https://github.com/rkt/rkt/pull/2618)).
+- godep: update appc/spec to v0.8.1 ([#2623](https://github.com/rkt/rkt/pull/2623), [#2611](https://github.com/rkt/rkt/pull/2611)).
+- dist: Update tmpfiles to create /etc/rkt ([#2472](https://github.com/rkt/rkt/pull/2472)). By creating this directory, users can run `rkt trust` without being root, if the user is in the rkt group.
+- Invoke gofmt with simplify-code flag ([#2489](https://github.com/rkt/rkt/pull/2489)). Enables code simplification checks of gofmt.
+- Implement composable uid/gid generators ([#2510](https://github.com/rkt/rkt/pull/2510)). This cleans up the code a bit and implements uid/gid functionality for rkt fly.
+- stage1: download CoreOS over HTTPS ([#2568](https://github.com/rkt/rkt/pull/2568)). 
+- Documentation updates ([#2555](https://github.com/rkt/rkt/pull/2555), [#2609](https://github.com/rkt/rkt/pull/2609), [#2605](https://github.com/rkt/rkt/pull/2605), [#2578](https://github.com/rkt/rkt/pull/2578), [#2614](https://github.com/rkt/rkt/pull/2614), [#2579](https://github.com/rkt/rkt/pull/2579), [#2570](https://github.com/rkt/rkt/pull/2570)).
+- Test improvements ([#2613](https://github.com/rkt/rkt/pull/2613), [#2566](https://github.com/rkt/rkt/pull/2566), [#2508](https://github.com/rkt/rkt/pull/2508)).
 
 ## v1.5.1
 
@@ -623,13 +623,13 @@ This release is a minor bug fix release.
 
 #### Bug fixes
 
-- rkt: fix bug where rkt errored out if the default data directory didn't exist [#2557](https://github.com/coreos/rkt/pull/2557).
-- kvm: fix docker volume semantics ([#2558](https://github.com/coreos/rkt/pull/2558)). When a Docker image exposes a mount point that is not mounted by a host volume, Docker volume semantics expect the files in the directory to be available to the application. This was not working properly in the kvm flavor and it's fixed now.
-- kvm: fix net long names ([#2543](https://github.com/coreos/rkt/pull/2543)). Handle network names that are longer than the maximum allowed by iptables in the kvm flavor.
+- rkt: fix bug where rkt errored out if the default data directory didn't exist [#2557](https://github.com/rkt/rkt/pull/2557).
+- kvm: fix docker volume semantics ([#2558](https://github.com/rkt/rkt/pull/2558)). When a Docker image exposes a mount point that is not mounted by a host volume, Docker volume semantics expect the files in the directory to be available to the application. This was not working properly in the kvm flavor and it's fixed now.
+- kvm: fix net long names ([#2543](https://github.com/rkt/rkt/pull/2543)). Handle network names that are longer than the maximum allowed by iptables in the kvm flavor.
 
 #### Other changes
 
-- minor tests and clean-ups ([#2551](https://github.com/coreos/rkt/pull/2551)).
+- minor tests and clean-ups ([#2551](https://github.com/rkt/rkt/pull/2551)).
 
 ## v1.5.0
 
@@ -637,33 +637,33 @@ This release switches to pure systemd for running apps within a pod. This lays t
 
 #### New features and UX changes
 
-- stage1: replace appexec with pure systemd ([#2493](https://github.com/coreos/rkt/pull/2493)). Replace functionality implemented in appexec with equivalent systemd options. This allows restricting the capabilities granted to apps in a pod and makes enabling other security features (per-app mount namespaces, seccomp filters...) easier.
-- stage1: restrict capabilities granted to apps ([#2493](https://github.com/coreos/rkt/pull/2493)). Apps in a pod receive now a [smaller set of capabilities](https://github.com/coreos/rkt/blob/v1.5.0/stage1/init/common/pod.go#L67).
-- rkt/image: render images on fetch ([#2398](https://github.com/coreos/rkt/pull/2398)). On systems with overlay fs support, rkt was delaying rendering images to the tree store until they were about to run for the first time which caused that first run to be slow for big images. When fetching as root, render the images right away so the first run is faster.
+- stage1: replace appexec with pure systemd ([#2493](https://github.com/rkt/rkt/pull/2493)). Replace functionality implemented in appexec with equivalent systemd options. This allows restricting the capabilities granted to apps in a pod and makes enabling other security features (per-app mount namespaces, seccomp filters...) easier.
+- stage1: restrict capabilities granted to apps ([#2493](https://github.com/rkt/rkt/pull/2493)). Apps in a pod receive now a [smaller set of capabilities](https://github.com/rkt/rkt/blob/v1.5.0/stage1/init/common/pod.go#L67).
+- rkt/image: render images on fetch ([#2398](https://github.com/rkt/rkt/pull/2398)). On systems with overlay fs support, rkt was delaying rendering images to the tree store until they were about to run for the first time which caused that first run to be slow for big images. When fetching as root, render the images right away so the first run is faster.
 
 #### Bug fixes
 
-- kvm: fix mounts regression ([#2530](https://github.com/coreos/rkt/pull/2530)). Cause - AppRootfsPath called with local "root" value was adding
+- kvm: fix mounts regression ([#2530](https://github.com/rkt/rkt/pull/2530)). Cause - AppRootfsPath called with local "root" value was adding
 stage1/rootfs twice. After this change this is made properly.
-- rkt/image: strip "Authorization" on redirects to a different host ([#2465](https://github.com/coreos/rkt/pull/2465)). We now don't pass the "Authorization" header if the redirect goes to a different host, it can leak sensitive information to unexpected third parties.
-- stage1/init: interpret the string "root" as UID/GID 0 ([#2458](https://github.com/coreos/rkt/pull/2458)). This is a special case and it should work even if the image doesn't have /etc/passwd or /etc/group.
+- rkt/image: strip "Authorization" on redirects to a different host ([#2465](https://github.com/rkt/rkt/pull/2465)). We now don't pass the "Authorization" header if the redirect goes to a different host, it can leak sensitive information to unexpected third parties.
+- stage1/init: interpret the string "root" as UID/GID 0 ([#2458](https://github.com/rkt/rkt/pull/2458)). This is a special case and it should work even if the image doesn't have /etc/passwd or /etc/group.
 
 #### Improved documentation
 
-- added benchmarks folder, benchmarks for v1.4.0 ([#2520](https://github.com/coreos/rkt/pull/2520)). Added the `Documentation/benchmarks` folder which includes a README that describes how rkt-monitor works and how to use it, and a file detailing the results of running rkt-monitor on each current workload with rkt v1.4.0.
-- minor documentation fixes ([#2455](https://github.com/coreos/rkt/pull/2455), [#2528](https://github.com/coreos/rkt/pull/2528), [#2511](https://github.com/coreos/rkt/pull/2511)).
+- added benchmarks folder, benchmarks for v1.4.0 ([#2520](https://github.com/rkt/rkt/pull/2520)). Added the `Documentation/benchmarks` folder which includes a README that describes how rkt-monitor works and how to use it, and a file detailing the results of running rkt-monitor on each current workload with rkt v1.4.0.
+- minor documentation fixes ([#2455](https://github.com/rkt/rkt/pull/2455), [#2528](https://github.com/rkt/rkt/pull/2528), [#2511](https://github.com/rkt/rkt/pull/2511)).
 
 #### Testing
 
-- kvm: enable functional tests for kvm ([#2007](https://github.com/coreos/rkt/pull/2007)). This includes initial support for running functional tests on the `kvm` flavor.
+- kvm: enable functional tests for kvm ([#2007](https://github.com/rkt/rkt/pull/2007)). This includes initial support for running functional tests on the `kvm` flavor.
 
 #### Other changes
 
-- benchmarks: added rkt-monitor benchmarks ([#2324](https://github.com/coreos/rkt/pull/2324)). This includes the code for a golang binary that can start rkt and watch its resource usage and bash scripts for generating a handful of test scenarios.
-- scripts: generate a Debian Sid ACI instead of using the Docker hub image ([#2471](https://github.com/coreos/rkt/pull/2471)). This is the first step to having an official release builder.
-- pkg/sys: add SYS_SYNCFS definition for ppc64/ppc64le ([#2443](https://github.com/coreos/rkt/pull/2443)). Added missing SYS_SYNCFS definition for ppc64 and ppc64le, fixing build failures on those architectures.
-- userns: not experimental anymore ([#2486](https://github.com/coreos/rkt/pull/2486)). Although it requires doing a recursive chown for each app, user namespaces work fine and shouldn't be marked as experimental.
-- kvm: not experimental anymore ([#2485](https://github.com/coreos/rkt/pull/2485)). The kvm flavor was initially introduced in rkt v0.8.0, no reason to mark it as experimental.
+- benchmarks: added rkt-monitor benchmarks ([#2324](https://github.com/rkt/rkt/pull/2324)). This includes the code for a golang binary that can start rkt and watch its resource usage and bash scripts for generating a handful of test scenarios.
+- scripts: generate a Debian Sid ACI instead of using the Docker hub image ([#2471](https://github.com/rkt/rkt/pull/2471)). This is the first step to having an official release builder.
+- pkg/sys: add SYS_SYNCFS definition for ppc64/ppc64le ([#2443](https://github.com/rkt/rkt/pull/2443)). Added missing SYS_SYNCFS definition for ppc64 and ppc64le, fixing build failures on those architectures.
+- userns: not experimental anymore ([#2486](https://github.com/rkt/rkt/pull/2486)). Although it requires doing a recursive chown for each app, user namespaces work fine and shouldn't be marked as experimental.
+- kvm: not experimental anymore ([#2485](https://github.com/rkt/rkt/pull/2485)). The kvm flavor was initially introduced in rkt v0.8.0, no reason to mark it as experimental.
 
 ## v1.4.0
 
@@ -671,63 +671,63 @@ This release includes a number of new features and bugfixes like a new config su
 
 #### New features and UX changes
 
-- config: add config subcommand ([#2405](https://github.com/coreos/rkt/pull/2405)). This new subcommand prints the current rkt configuration. It can be used to get i.e. authentication credentials. See rkt's [config subcommand](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/config.md) documentation.
+- config: add config subcommand ([#2405](https://github.com/rkt/rkt/pull/2405)). This new subcommand prints the current rkt configuration. It can be used to get i.e. authentication credentials. See rkt's [config subcommand](https://github.com/rkt/rkt/blob/master/Documentation/subcommands/config.md) documentation.
 
-- run: add `--user`/`--group` app flags to `rkt run` and `rkt prepare` allowing to override the user and group specified in the image manifest ([#2419](https://github.com/coreos/rkt/pull/2419)).
+- run: add `--user`/`--group` app flags to `rkt run` and `rkt prepare` allowing to override the user and group specified in the image manifest ([#2419](https://github.com/rkt/rkt/pull/2419)).
 
-- gc: Add flag 'mark-only' to mark garbage pods without deleting them ([#2400](https://github.com/coreos/rkt/pull/2400), [#2402](https://github.com/coreos/rkt/pull/2402)). This new flag moves exited/aborted pods to the exited-garbage/garbage directory but does not delete them. A third party application can use `rkt gc --mark-only=true` to mark exited pods as garbage without deleting them.
+- gc: Add flag 'mark-only' to mark garbage pods without deleting them ([#2400](https://github.com/rkt/rkt/pull/2400), [#2402](https://github.com/rkt/rkt/pull/2402)). This new flag moves exited/aborted pods to the exited-garbage/garbage directory but does not delete them. A third party application can use `rkt gc --mark-only=true` to mark exited pods as garbage without deleting them.
 
-- kvm: Add support for app capabilities limitation ([#2222](https://github.com/coreos/rkt/pull/2222)). By default kvm flavor has got enabled every capability inside pod. This patch adds support for a restricted set of capabilities inside a kvm flavor of rkt.
+- kvm: Add support for app capabilities limitation ([#2222](https://github.com/rkt/rkt/pull/2222)). By default kvm flavor has got enabled every capability inside pod. This patch adds support for a restricted set of capabilities inside a kvm flavor of rkt.
 
-- stage1/init: return exit code 1 on error ([#2383](https://github.com/coreos/rkt/pull/2383)). On error, stage1/init was returning a non-zero value between 1 and 7. This change makes it return status code 1 only.
+- stage1/init: return exit code 1 on error ([#2383](https://github.com/rkt/rkt/pull/2383)). On error, stage1/init was returning a non-zero value between 1 and 7. This change makes it return status code 1 only.
 
-- api: Add 'CreatedAt', 'StartedAt' in pod's info returned by api service. ([#2377](https://github.com/coreos/rkt/pull/2377)).
+- api: Add 'CreatedAt', 'StartedAt' in pod's info returned by api service. ([#2377](https://github.com/rkt/rkt/pull/2377)).
 
 #### Improved documentation
 
-- Minor documentation fixes ([#2413](https://github.com/coreos/rkt/pull/2413), [#2395](https://github.com/coreos/rkt/pull/2395), [#2231](https://github.com/coreos/rkt/pull/2231)).
+- Minor documentation fixes ([#2413](https://github.com/rkt/rkt/pull/2413), [#2395](https://github.com/rkt/rkt/pull/2395), [#2231](https://github.com/rkt/rkt/pull/2231)).
 
-- functional tests: Add new test with systemd-proxyd ([#2257](https://github.com/coreos/rkt/pull/2257)). Adds a new test and documentation how to use systemd-proxyd with rkt pods.
+- functional tests: Add new test with systemd-proxyd ([#2257](https://github.com/rkt/rkt/pull/2257)). Adds a new test and documentation how to use systemd-proxyd with rkt pods.
 
 #### Bug fixes
 
-- kvm: refactor volumes support ([#2328](https://github.com/coreos/rkt/pull/2328)). This allows users to share regular files as volumes in addition to directories.
+- kvm: refactor volumes support ([#2328](https://github.com/rkt/rkt/pull/2328)). This allows users to share regular files as volumes in addition to directories.
 
-- kvm: fix rkt status ([#2415](https://github.com/coreos/rkt/pull/2415)). Fixes a regression bug were `rkt status` was no longer reporting the pid of the pod when using the kvm flavor.
+- kvm: fix rkt status ([#2415](https://github.com/rkt/rkt/pull/2415)). Fixes a regression bug were `rkt status` was no longer reporting the pid of the pod when using the kvm flavor.
 
-- Build actool for the *build* architecture ([#2372](https://github.com/coreos/rkt/pull/2372)). Fixes a cross compilation issue with acbuild.
+- Build actool for the *build* architecture ([#2372](https://github.com/rkt/rkt/pull/2372)). Fixes a cross compilation issue with acbuild.
 
-- rkt: calculate real dataDir path ([#2399](https://github.com/coreos/rkt/pull/2399)). Fixes garbage collection when the data directory specified by `--dir` contains a symlink component.
+- rkt: calculate real dataDir path ([#2399](https://github.com/rkt/rkt/pull/2399)). Fixes garbage collection when the data directory specified by `--dir` contains a symlink component.
 
-- stage1/init: fix docker volume semantics ([#2409](https://github.com/coreos/rkt/pull/2409)). Fixes a bug in docker volume semantics when rkt runs with the option `--pod-manifest`. When a Docker image exposes a mount point that is not mounted by a host volume, Docker volume semantics expect the files in the directory to be available to the application. This was partially fixed in rkt 1.3.0 via [#2315](https://github.com/coreos/rkt/pull/2315) but the bug remained when rkt runs with the option `--pod-manifest`. This is now fully fixed.
+- stage1/init: fix docker volume semantics ([#2409](https://github.com/rkt/rkt/pull/2409)). Fixes a bug in docker volume semantics when rkt runs with the option `--pod-manifest`. When a Docker image exposes a mount point that is not mounted by a host volume, Docker volume semantics expect the files in the directory to be available to the application. This was partially fixed in rkt 1.3.0 via [#2315](https://github.com/rkt/rkt/pull/2315) but the bug remained when rkt runs with the option `--pod-manifest`. This is now fully fixed.
 
-- rkt/image: check that discovery labels match manifest labels ([#2311](https://github.com/coreos/rkt/pull/2311)).
+- rkt/image: check that discovery labels match manifest labels ([#2311](https://github.com/rkt/rkt/pull/2311)).
 
-- store: fix multi process with multi goroutines race on db ([#2391](https://github.com/coreos/rkt/pull/2391)). This was a bug when multiple `rkt fetch` commands were executed concurrently.
+- store: fix multi process with multi goroutines race on db ([#2391](https://github.com/rkt/rkt/pull/2391)). This was a bug when multiple `rkt fetch` commands were executed concurrently.
 
-- kvm: fix pid vs ppid usage ([#2396](https://github.com/coreos/rkt/pull/2396)). Fixes a bug in `rkt enter` in the kvm flavor causing an infinite loop.
+- kvm: fix pid vs ppid usage ([#2396](https://github.com/rkt/rkt/pull/2396)). Fixes a bug in `rkt enter` in the kvm flavor causing an infinite loop.
 
-- kvm: Fix connectivity issue in macvtap networks caused by macvlan NICs having incorrect names ([#2181](https://github.com/coreos/rkt/pull/2181)). 
+- kvm: Fix connectivity issue in macvtap networks caused by macvlan NICs having incorrect names ([#2181](https://github.com/rkt/rkt/pull/2181)). 
 
-- tests: TestRktListCreatedStarted: fix timing issue causing the test to fail on slow machines ([#2366](https://github.com/coreos/rkt/pull/2366)).
+- tests: TestRktListCreatedStarted: fix timing issue causing the test to fail on slow machines ([#2366](https://github.com/rkt/rkt/pull/2366)).
 
-- rkt/image: remove redundant quotes in an error message ([#2379](https://github.com/coreos/rkt/pull/2379)).
+- rkt/image: remove redundant quotes in an error message ([#2379](https://github.com/rkt/rkt/pull/2379)).
 
-- prepare: Support 'ondisk' verification skip as documented by [the global options](https://github.com/coreos/rkt/blob/master/Documentation/commands.md#global-options) ([#2376](https://github.com/coreos/rkt/pull/2376)). Prior to this commit, rkt prepare would check the ondisk image even if the `--insecure-options=ondisk` flag was provided. This corrects that.
+- prepare: Support 'ondisk' verification skip as documented by [the global options](https://github.com/rkt/rkt/blob/master/Documentation/commands.md#global-options) ([#2376](https://github.com/rkt/rkt/pull/2376)). Prior to this commit, rkt prepare would check the ondisk image even if the `--insecure-options=ondisk` flag was provided. This corrects that.
 
 #### Other changes
 
-- tests: skip TestSocketProxyd when systemd-socket-proxyd is not installed ([#2436](https://github.com/coreos/rkt/pull/2436)).
+- tests: skip TestSocketProxyd when systemd-socket-proxyd is not installed ([#2436](https://github.com/rkt/rkt/pull/2436)).
 
-- tests: TestDockerVolumeSemantics: more tests with symlinks ([#2394](https://github.com/coreos/rkt/pull/2394)).
+- tests: TestDockerVolumeSemantics: more tests with symlinks ([#2394](https://github.com/rkt/rkt/pull/2394)).
 
-- rkt: Improve build shell script used in [continuous integration](https://github.com/coreos/rkt/blob/master/tests/README.md) ([#2394](https://github.com/coreos/rkt/pull/2394)).
+- rkt: Improve build shell script used in [continuous integration](https://github.com/rkt/rkt/blob/master/tests/README.md) ([#2394](https://github.com/rkt/rkt/pull/2394)).
 
-- protobuf: generate code using a script ([#2382](https://github.com/coreos/rkt/pull/2382)).
+- protobuf: generate code using a script ([#2382](https://github.com/rkt/rkt/pull/2382)).
 
-- Generate manpages ([#2373](https://github.com/coreos/rkt/pull/2373)). This adds support for generating rkt man pages using `make manpages` and the bash completion file using `make bash-completion`, see the note for packagers below.
+- Generate manpages ([#2373](https://github.com/rkt/rkt/pull/2373)). This adds support for generating rkt man pages using `make manpages` and the bash completion file using `make bash-completion`, see the note for packagers below.
 
-- tests/aws.sh: add test for Fedora 24 ([#2340](https://github.com/coreos/rkt/pull/2340)).
+- tests/aws.sh: add test for Fedora 24 ([#2340](https://github.com/rkt/rkt/pull/2340)).
 
 #### Note for packagers
 
@@ -742,22 +742,22 @@ This release includes a number of new features and bugfixes like the long-awaite
 
 #### New features and UX changes
 
-- Propagate exit status from apps inside the pod to rkt ([#2308](https://github.com/coreos/rkt/pull/2308)). Previously, if an app exited with a non-zero exit status, rkt's exit status would still be 0. Now, if an app fails, its exit status will be propagated to the outside. While this was partially implemented in some stage1 flavors since rkt v1.1.0, it now works in the default coreos flavor.
-- Check signatures for stage1 images by default, especially useful when stage1 images are downloaded from the Internet ([#2336](https://github.com/coreos/rkt/pull/2336)).
+- Propagate exit status from apps inside the pod to rkt ([#2308](https://github.com/rkt/rkt/pull/2308)). Previously, if an app exited with a non-zero exit status, rkt's exit status would still be 0. Now, if an app fails, its exit status will be propagated to the outside. While this was partially implemented in some stage1 flavors since rkt v1.1.0, it now works in the default coreos flavor.
+- Check signatures for stage1 images by default, especially useful when stage1 images are downloaded from the Internet ([#2336](https://github.com/rkt/rkt/pull/2336)).
  This doesn't affect the following cases:
   - The stage1 image is already in the store
   - The stage1 image is in the default directory configured at build time
   - The stage1 image is the default one and it is in the same directory as the rkt binary
-- Allow downloading of insecure public keys with the `pubkey` insecure option ([#2278](https://github.com/coreos/rkt/pull/2278)).
-- Implement Docker volume semantics ([#2315](https://github.com/coreos/rkt/pull/2315)). Docker volumes are initialized with the files in the image if they exist, unless a host directory is mounted there. Implement that behavior in rkt when it runs a Docker converted image.
+- Allow downloading of insecure public keys with the `pubkey` insecure option ([#2278](https://github.com/rkt/rkt/pull/2278)).
+- Implement Docker volume semantics ([#2315](https://github.com/rkt/rkt/pull/2315)). Docker volumes are initialized with the files in the image if they exist, unless a host directory is mounted there. Implement that behavior in rkt when it runs a Docker converted image.
 
 #### API service
 
-- Return the cgroup when getting information about running pods and add a new cgroup filter ([#2331](https://github.com/coreos/rkt/pull/2331)).
+- Return the cgroup when getting information about running pods and add a new cgroup filter ([#2331](https://github.com/rkt/rkt/pull/2331)).
 
 #### Bug fixes
 
-- Avoid configuring more CPUs than the host has in the kvm flavor ([#2321](https://github.com/coreos/rkt/pull/2321)).
+- Avoid configuring more CPUs than the host has in the kvm flavor ([#2321](https://github.com/rkt/rkt/pull/2321)).
 - Fix a bug where the proxy configuration wasn't forwarded to docker2aci ([docker2aci#147](https://github.com/appc/docker2aci/pull/147)).
 
 #### Notes
@@ -770,8 +770,8 @@ This release fixes a couple of bugs we missed in 1.2.0.
 
 #### Bug fixes
 
-- Do not error out if `/dev/ptmx` or `/dev/log` exist ([#2302](https://github.com/coreos/rkt/pull/2302)).
-- Vendor a release of go-systemd instead of current master ([#2306](https://github.com/coreos/rkt/pull/2306)).
+- Do not error out if `/dev/ptmx` or `/dev/log` exist ([#2302](https://github.com/rkt/rkt/pull/2302)).
+- Vendor a release of go-systemd instead of current master ([#2306](https://github.com/rkt/rkt/pull/2306)).
 
 ## v1.2.0
 
@@ -779,21 +779,21 @@ This release is an incremental release with numerous bug fixes.
 
 #### New features and UX changes
 
-- Add `--hostname` option to rkt run/run-prepared ([#2251](https://github.com/coreos/rkt/pull/2251)). This option allows setting the pod host name.
+- Add `--hostname` option to rkt run/run-prepared ([#2251](https://github.com/rkt/rkt/pull/2251)). This option allows setting the pod host name.
 
 #### Bug fixes
 
-- Fix deadlock while exiting a lkvm rkt pod ([#2191](https://github.com/coreos/rkt/pull/2191)).
-- SELinux fixes preparating rkt to work on Fedora with SELinux enabled ([#2247](https://github.com/coreos/rkt/pull/2247) and [#2262](https://github.com/coreos/rkt/pull/2262)).
-- Fix bug that occurs for some types of on-disk image corruption, making it impossible for the user run or garbage collect them ([#2180](https://github.com/coreos/rkt/issues/2180)).
-- Fix authentication issue when fetching from a private quay.io repository ([#2248](https://github.com/coreos/rkt/issues/2248)).
-- Allow concurrent image fetching ([#2239](https://github.com/coreos/rkt/pull/2239)).
-- Fix issue mounting volumes on images if the target path includes an absolute symlink ([#2290](https://github.com/coreos/rkt/pull/2290)).
-- Clean up dangling symlinks in `/var/log/journal` on garbage collection if running on systemd hosts ([#2289](https://github.com/coreos/rkt/pull/2289)).
+- Fix deadlock while exiting a lkvm rkt pod ([#2191](https://github.com/rkt/rkt/pull/2191)).
+- SELinux fixes preparating rkt to work on Fedora with SELinux enabled ([#2247](https://github.com/rkt/rkt/pull/2247) and [#2262](https://github.com/rkt/rkt/pull/2262)).
+- Fix bug that occurs for some types of on-disk image corruption, making it impossible for the user run or garbage collect them ([#2180](https://github.com/rkt/rkt/issues/2180)).
+- Fix authentication issue when fetching from a private quay.io repository ([#2248](https://github.com/rkt/rkt/issues/2248)).
+- Allow concurrent image fetching ([#2239](https://github.com/rkt/rkt/pull/2239)).
+- Fix issue mounting volumes on images if the target path includes an absolute symlink ([#2290](https://github.com/rkt/rkt/pull/2290)).
+- Clean up dangling symlinks in `/var/log/journal` on garbage collection if running on systemd hosts ([#2289](https://github.com/rkt/rkt/pull/2289)).
 
 #### Note for 3rd party stage1 builders
 
-- The stage1 command line interface is versioned now. See the [implementors guide](https://github.com/coreos/rkt/blob/master/Documentation/devel/stage1-implementors-guide.md) for more information.
+- The stage1 command line interface is versioned now. See the [implementors guide](https://github.com/rkt/rkt/blob/master/Documentation/devel/stage1-implementors-guide.md) for more information.
 
 ## v1.1.0
 
@@ -801,16 +801,16 @@ This release is the first incremental release since 1.0. It includes bugfixes an
 
 #### New features and UX changes
 
-- Add support for non-numerical UID/GID as specified in the appc spec ([#2159](https://github.com/coreos/rkt/pull/2159)). rkt can now start apps as the user and group specified in the [image manifest](https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema) with three different possible formats: a numeric UID/GID, a username and group name referring to the ACI's /etc/passwd and /etc/group, or a file path in the ACI whose owner will determine the UID/GID.
-- When an application terminates with a non-zero exit status, `rkt run` should return that exit status ([#2198](https://github.com/coreos/rkt/pull/2198)). This is now fixed in the [src and host flavors](https://github.com/coreos/rkt/blob/master/Documentation/build-configure.md#--with-stage1-flavors) with [systemd >= v227](https://lists.freedesktop.org/archives/systemd-devel/2015-October/034509.html) but not yet in the shipped coreos flavor.
-- Use exit status 2 to report usage errors ([#2149](https://github.com/coreos/rkt/pull/2149)).
-- Add support for tuning pod's network via the [CNI tuning plugin](https://github.com/appc/cni/blob/master/Documentation/tuning.md) ([#2140](https://github.com/coreos/rkt/pull/2140)). For example, this allows increasing the size of the listen queue for accepting new TCP connections (`net.core.somaxconn`) in the rkt pod.
-- Keep $TERM from the host when entering a pod ([#1962](https://github.com/coreos/rkt/pull/1962)). This fixes the command "clear" which previously was not working.
+- Add support for non-numerical UID/GID as specified in the appc spec ([#2159](https://github.com/rkt/rkt/pull/2159)). rkt can now start apps as the user and group specified in the [image manifest](https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema) with three different possible formats: a numeric UID/GID, a username and group name referring to the ACI's /etc/passwd and /etc/group, or a file path in the ACI whose owner will determine the UID/GID.
+- When an application terminates with a non-zero exit status, `rkt run` should return that exit status ([#2198](https://github.com/rkt/rkt/pull/2198)). This is now fixed in the [src and host flavors](https://github.com/rkt/rkt/blob/master/Documentation/build-configure.md#--with-stage1-flavors) with [systemd >= v227](https://lists.freedesktop.org/archives/systemd-devel/2015-October/034509.html) but not yet in the shipped coreos flavor.
+- Use exit status 2 to report usage errors ([#2149](https://github.com/rkt/rkt/pull/2149)).
+- Add support for tuning pod's network via the [CNI tuning plugin](https://github.com/appc/cni/blob/master/Documentation/tuning.md) ([#2140](https://github.com/rkt/rkt/pull/2140)). For example, this allows increasing the size of the listen queue for accepting new TCP connections (`net.core.somaxconn`) in the rkt pod.
+- Keep $TERM from the host when entering a pod ([#1962](https://github.com/rkt/rkt/pull/1962)). This fixes the command "clear" which previously was not working.
 
 #### Bug fixes
-- Socket activation was not working if the port on the host is different from the app port as set in the image manifest ([#2137](https://github.com/coreos/rkt/pull/2137)).
-- Fix an authentication failure when fetching images from private repositories in the official Docker registry ([#2197](https://github.com/coreos/rkt/pull/2197)).
-- Set /etc/hostname in kvm pods ([#2190](https://github.com/coreos/rkt/pull/2190)).
+- Socket activation was not working if the port on the host is different from the app port as set in the image manifest ([#2137](https://github.com/rkt/rkt/pull/2137)).
+- Fix an authentication failure when fetching images from private repositories in the official Docker registry ([#2197](https://github.com/rkt/rkt/pull/2197)).
+- Set /etc/hostname in kvm pods ([#2190](https://github.com/rkt/rkt/pull/2190)).
 
 ## v1.0.0
 
@@ -821,30 +821,30 @@ The API is not yet completely stabilized, but is functional and suitable for use
 
 #### New features and UX changes
 
-- Add pod creation and start times to `rkt list` and `rkt status` ([#2030](https://github.com/coreos/rkt/pull/2030)). See [`rkt list`](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/list.md) and [`rkt status`](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/status.md) documentation.
-- The DNS configuration can now be passed to the pod via the command line ([#2040](https://github.com/coreos/rkt/pull/2040)). See [`DNS support`](https://github.com/coreos/rkt/blob/master/Documentation/networking.md#dns-support) documentation.
-- Errors are now structured, allowing for better control of the output ([#1937](https://github.com/coreos/rkt/pull/1937)). See [Error & Output](https://github.com/coreos/rkt/blob/master/Documentation/hacking.md#errors--output) for how a developer should use it.
-- All output now uses the new log package in `pkg/log` to provide a more clean and consistent output format and more helpful debug output ([#1937](https://github.com/coreos/rkt/pull/1937)).
-- Added configuration for stage1 image. Users can drop a configuration file to `/etc/rkt/stage1.d` (or to `stage1.d` in the user configuration directory) to tell rkt to use a different stage1 image name, version and location instead of build-time defaults ([#1977](https://github.com/coreos/rkt/pull/1977)).
-- Replaced the `--stage1-image` flag with a new set of flags. `--stage1-url`, `--stage-path`, `--stage1-name` do the usual fetching from remote if the image does not exist in the store. `--stage1-hash` takes the stage1 image directly from the store. `--stage1-from-dir` works together with the default stage1 images directory and is described in the next point ([#1977](https://github.com/coreos/rkt/pull/1977)).
-- Added default stage1 images directory. User can use the newly added `--stage1-from-dir` parameter to avoid typing the full path. `--stage1-from-dir` behaves like `--stage1-path` ([#1977](https://github.com/coreos/rkt/pull/1977)).
-- Removed the deprecated `--insecure-skip-verify` flag ([#2068](https://github.com/coreos/rkt/pull/2068)).
-- Fetched keys are no longer automatically trusted by default, unless `--trust-keys-from-https` is used. Additionally, newly fetched keys have to be explicitly trusted with `rkt trust` if a previous key was trusted for the same image prefix ([#2033](https://github.com/coreos/rkt/pull/2033)).
-- Use NAT loopback to make ports forwarded in pods accessible from localhost ([#1256](https://github.com/coreos/rkt/issues/1256)).
-- Show a clearer error message when unprivileged users execute commands that require root privileges ([#2081](https://github.com/coreos/rkt/pull/2081)).
-- Add a rkt tmpfiles configuration file to make the creation of the rkt data directory on first boot easier ([#2088](https://github.com/coreos/rkt/pull/2088)).
-- Remove `rkt install` command. It was replaced with a `setup-data-dir.sh` script ([#2101](https://github.com/coreos/rkt/pull/2101).
+- Add pod creation and start times to `rkt list` and `rkt status` ([#2030](https://github.com/rkt/rkt/pull/2030)). See [`rkt list`](https://github.com/rkt/rkt/blob/master/Documentation/subcommands/list.md) and [`rkt status`](https://github.com/rkt/rkt/blob/master/Documentation/subcommands/status.md) documentation.
+- The DNS configuration can now be passed to the pod via the command line ([#2040](https://github.com/rkt/rkt/pull/2040)). See [`DNS support`](https://github.com/rkt/rkt/blob/master/Documentation/networking.md#dns-support) documentation.
+- Errors are now structured, allowing for better control of the output ([#1937](https://github.com/rkt/rkt/pull/1937)). See [Error & Output](https://github.com/rkt/rkt/blob/master/Documentation/hacking.md#errors--output) for how a developer should use it.
+- All output now uses the new log package in `pkg/log` to provide a more clean and consistent output format and more helpful debug output ([#1937](https://github.com/rkt/rkt/pull/1937)).
+- Added configuration for stage1 image. Users can drop a configuration file to `/etc/rkt/stage1.d` (or to `stage1.d` in the user configuration directory) to tell rkt to use a different stage1 image name, version and location instead of build-time defaults ([#1977](https://github.com/rkt/rkt/pull/1977)).
+- Replaced the `--stage1-image` flag with a new set of flags. `--stage1-url`, `--stage-path`, `--stage1-name` do the usual fetching from remote if the image does not exist in the store. `--stage1-hash` takes the stage1 image directly from the store. `--stage1-from-dir` works together with the default stage1 images directory and is described in the next point ([#1977](https://github.com/rkt/rkt/pull/1977)).
+- Added default stage1 images directory. User can use the newly added `--stage1-from-dir` parameter to avoid typing the full path. `--stage1-from-dir` behaves like `--stage1-path` ([#1977](https://github.com/rkt/rkt/pull/1977)).
+- Removed the deprecated `--insecure-skip-verify` flag ([#2068](https://github.com/rkt/rkt/pull/2068)).
+- Fetched keys are no longer automatically trusted by default, unless `--trust-keys-from-https` is used. Additionally, newly fetched keys have to be explicitly trusted with `rkt trust` if a previous key was trusted for the same image prefix ([#2033](https://github.com/rkt/rkt/pull/2033)).
+- Use NAT loopback to make ports forwarded in pods accessible from localhost ([#1256](https://github.com/rkt/rkt/issues/1256)).
+- Show a clearer error message when unprivileged users execute commands that require root privileges ([#2081](https://github.com/rkt/rkt/pull/2081)).
+- Add a rkt tmpfiles configuration file to make the creation of the rkt data directory on first boot easier ([#2088](https://github.com/rkt/rkt/pull/2088)).
+- Remove `rkt install` command. It was replaced with a `setup-data-dir.sh` script ([#2101](https://github.com/rkt/rkt/pull/2101).
 
 #### Bug fixes
 
-- Fix regression when authenticating to v2 Docker registries ([#2008](https://github.com/coreos/rkt/issues/2008)).
-- Don't link to libacl, but dlopen it ([#1963](https://github.com/coreos/rkt/pull/1963)). This means that rkt will not crash if libacl is not present on the host, but it will just print a warning.
-- Only suppress diagnostic messages, not error messages in stage1 ([#2111](https://github.com/coreos/rkt/pull/2111)).
+- Fix regression when authenticating to v2 Docker registries ([#2008](https://github.com/rkt/rkt/issues/2008)).
+- Don't link to libacl, but dlopen it ([#1963](https://github.com/rkt/rkt/pull/1963)). This means that rkt will not crash if libacl is not present on the host, but it will just print a warning.
+- Only suppress diagnostic messages, not error messages in stage1 ([#2111](https://github.com/rkt/rkt/pull/2111)).
 
 #### Other changes
 
-- Trusted Platform Module logging (TPM) is now enabled by default ([#1815](https://github.com/coreos/rkt/issues/1815)). This ensures that rkt benefits from security features by default. See rkt's [Build Configuration](https://github.com/coreos/rkt/blob/master/Documentation/build-configure.md#security) documentation.
-- Added long descriptions to all rkt commands ([#2098](https://github.com/coreos/rkt/issues/2098)).
+- Trusted Platform Module logging (TPM) is now enabled by default ([#1815](https://github.com/rkt/rkt/issues/1815)). This ensures that rkt benefits from security features by default. See rkt's [Build Configuration](https://github.com/rkt/rkt/blob/master/Documentation/build-configure.md#security) documentation.
+- Added long descriptions to all rkt commands ([#2098](https://github.com/rkt/rkt/issues/2098)).
 
 #### Migration
 
@@ -864,37 +864,37 @@ With this release, `rkt` RPM/dpkg packages should have the following updates:
 
 #### New features and UX changes
 
-- Explicitly allow http connections via a new 'http' option to `--insecure-options` ([#1945](https://github.com/coreos/rkt/pull/1945)). Any data and credentials will be sent in the clear.
-- When using `bash`, `rkt` commands can be auto-completed ([#1955](https://github.com/coreos/rkt/pull/1955)).
-- The executables given on the command line via the `--exec` parameters don't need to be absolute paths anymore ([#1953](https://github.com/coreos/rkt/pull/1953)). This change reflects an update in the appc spec since [v0.7.2](https://github.com/appc/spec/releases/tag/v0.7.2). See rkt's [rkt run --exec](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/run.md#overriding-executable-to-launch) documentation.
-- Add a `--full` flag to rkt fetch so it returns full hash of the image ([#1976](https://github.com/coreos/rkt/pull/1976)).
-- There is a new global flag for specifying the user configuration directory, `--user-config`. It overrides whatever is configured in system and local configuration directories. It can be useful for specifying different credentials for fetching images without putting them in a globally visible directory like `/etc/rkt`. See rkt's [Global Options](https://github.com/coreos/rkt/blob/master/Documentation/commands.md#global-options) documentation ([#1981](https://github.com/coreos/rkt/pull/1981)).
-- As a temporary fix, search for network plugins in the local configuration directory too ([#2005](https://github.com/coreos/rkt/pull/2005)).
-- Pass the environment defined in the image manifest to the application when using the fly stage1 image ([#1989](https://github.com/coreos/rkt/pull/1989)).
+- Explicitly allow http connections via a new 'http' option to `--insecure-options` ([#1945](https://github.com/rkt/rkt/pull/1945)). Any data and credentials will be sent in the clear.
+- When using `bash`, `rkt` commands can be auto-completed ([#1955](https://github.com/rkt/rkt/pull/1955)).
+- The executables given on the command line via the `--exec` parameters don't need to be absolute paths anymore ([#1953](https://github.com/rkt/rkt/pull/1953)). This change reflects an update in the appc spec since [v0.7.2](https://github.com/appc/spec/releases/tag/v0.7.2). See rkt's [rkt run --exec](https://github.com/rkt/rkt/blob/master/Documentation/subcommands/run.md#overriding-executable-to-launch) documentation.
+- Add a `--full` flag to rkt fetch so it returns full hash of the image ([#1976](https://github.com/rkt/rkt/pull/1976)).
+- There is a new global flag for specifying the user configuration directory, `--user-config`. It overrides whatever is configured in system and local configuration directories. It can be useful for specifying different credentials for fetching images without putting them in a globally visible directory like `/etc/rkt`. See rkt's [Global Options](https://github.com/rkt/rkt/blob/master/Documentation/commands.md#global-options) documentation ([#1981](https://github.com/rkt/rkt/pull/1981)).
+- As a temporary fix, search for network plugins in the local configuration directory too ([#2005](https://github.com/rkt/rkt/pull/2005)).
+- Pass the environment defined in the image manifest to the application when using the fly stage1 image ([#1989](https://github.com/rkt/rkt/pull/1989)).
 
 #### Build improvements
 
-- Fix vagrant rkt build ([#1960](https://github.com/coreos/rkt/pull/1960)).
-- Switch to using unrewritten imports, this will allow rkt packages to be cleanly vendored by other projects ([#2014](https://github.com/coreos/rkt/pull/2014)).
+- Fix vagrant rkt build ([#1960](https://github.com/rkt/rkt/pull/1960)).
+- Switch to using unrewritten imports, this will allow rkt packages to be cleanly vendored by other projects ([#2014](https://github.com/rkt/rkt/pull/2014)).
 
 #### API service
 
-- Allow filtering images by name ([#1985](https://github.com/coreos/rkt/pull/1985)).
+- Allow filtering images by name ([#1985](https://github.com/rkt/rkt/pull/1985)).
 
 #### Bug fixes
 
-- Fix bug where the wrong image signature was checked when using dependencies ([#1991](https://github.com/coreos/rkt/pull/1991)).
+- Fix bug where the wrong image signature was checked when using dependencies ([#1991](https://github.com/rkt/rkt/pull/1991)).
 
 #### Test improvements
 
-- A new script to run test on AWS makes it easier to test under several distributions: CentOS, Debian, Fedora, Ubuntu ([#1925](https://github.com/coreos/rkt/pull/1925)).
-- The functional tests now skip user namespace tests when user namespaces do not work ([#1947](https://github.com/coreos/rkt/pull/1947)).
-- Check that rkt is not built with go 1.5.{0,1,2} to make sure it's not vulnerable to CVE-2015-8618 ([#2006](https://github.com/coreos/rkt/pull/2006)).
+- A new script to run test on AWS makes it easier to test under several distributions: CentOS, Debian, Fedora, Ubuntu ([#1925](https://github.com/rkt/rkt/pull/1925)).
+- The functional tests now skip user namespace tests when user namespaces do not work ([#1947](https://github.com/rkt/rkt/pull/1947)).
+- Check that rkt is not built with go 1.5.{0,1,2} to make sure it's not vulnerable to CVE-2015-8618 ([#2006](https://github.com/rkt/rkt/pull/2006)).
 
 #### Other changes
 
-- Cleanups in the kvm stage1 ([#1895](https://github.com/coreos/rkt/pull/1895)).
-- Document stage1 filesystem layout for developers ([#1832](https://github.com/coreos/rkt/pull/1832)).
+- Cleanups in the kvm stage1 ([#1895](https://github.com/rkt/rkt/pull/1895)).
+- Document stage1 filesystem layout for developers ([#1832](https://github.com/rkt/rkt/pull/1832)).
 
 #### Note for packagers
 
@@ -908,30 +908,30 @@ rkt v0.15.0 is an incremental release with UX improvements, bug fixes, API servi
 
 #### New features and UX changes
 
-- Images can now be deleted from the store by both ID and name ([#1866](https://github.com/coreos/rkt/pull/1866)). See rkt's [rkt image rm](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/image.md#rkt-image-rm) documentation.
-- The journals of rkt pods can now be accessed by members of the Unix group rkt ([#1877](https://github.com/coreos/rkt/pull/1877)). See rkt's [journalctl -M](https://github.com/coreos/rkt/blob/master/Documentation/using-rkt-with-systemd.md#journalctl--m) documentation.
+- Images can now be deleted from the store by both ID and name ([#1866](https://github.com/rkt/rkt/pull/1866)). See rkt's [rkt image rm](https://github.com/rkt/rkt/blob/master/Documentation/subcommands/image.md#rkt-image-rm) documentation.
+- The journals of rkt pods can now be accessed by members of the Unix group rkt ([#1877](https://github.com/rkt/rkt/pull/1877)). See rkt's [journalctl -M](https://github.com/rkt/rkt/blob/master/Documentation/using-rkt-with-systemd.md#journalctl--m) documentation.
 
 #### Improved documentation
 
-- Mention [rkt integration in Nomad](https://github.com/coreos/rkt/blob/master/Documentation/using-rkt-with-nomad.md) ([#1884](https://github.com/coreos/rkt/pull/1884)).
-- Document [how to start the api service](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/api-service.md) and add a [program example](https://github.com/coreos/rkt/blob/master/api/v1alpha/client_example.go) explaining how the api service can be used to integrate rkt with other programs ([#1915](https://github.com/coreos/rkt/pull/1915)).
+- Mention [rkt integration in Nomad](https://github.com/rkt/rkt/blob/master/Documentation/using-rkt-with-nomad.md) ([#1884](https://github.com/rkt/rkt/pull/1884)).
+- Document [how to start the api service](https://github.com/rkt/rkt/blob/master/Documentation/subcommands/api-service.md) and add a [program example](https://github.com/rkt/rkt/blob/master/api/v1alpha/client_example.go) explaining how the api service can be used to integrate rkt with other programs ([#1915](https://github.com/rkt/rkt/pull/1915)).
 
 #### API service
 
-- Programs using rkt's API service are now provided with the size of the images stored in rkt's store ([#1916](https://github.com/coreos/rkt/pull/1916)).
-- Programs using rkt's API service are now provided with any annotations found in the [image manifest](https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema) and [pod manifest](https://github.com/appc/spec/blob/master/spec/pods.md#pod-manifest-schema) ([#1924](https://github.com/coreos/rkt/pull/1924)).
-- Fix a panic in the API service by making the store database thread-safe ([#1892](https://github.com/coreos/rkt/pull/1892)) and by refactoring the API service functions to get the pod state ([#1893](https://github.com/coreos/rkt/pull/1893)).
+- Programs using rkt's API service are now provided with the size of the images stored in rkt's store ([#1916](https://github.com/rkt/rkt/pull/1916)).
+- Programs using rkt's API service are now provided with any annotations found in the [image manifest](https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema) and [pod manifest](https://github.com/appc/spec/blob/master/spec/pods.md#pod-manifest-schema) ([#1924](https://github.com/rkt/rkt/pull/1924)).
+- Fix a panic in the API service by making the store database thread-safe ([#1892](https://github.com/rkt/rkt/pull/1892)) and by refactoring the API service functions to get the pod state ([#1893](https://github.com/rkt/rkt/pull/1893)).
 
 #### Build improvements
 
-- Add support for building rkt with Go 1.5, which is now the preferred version. rkt can still be built with Go 1.4 as best effort ([#1907](https://github.com/coreos/rkt/pull/1907)). As part of the move to Go 1.5, rkt now has a godep-save script to support Go 1.5 ([#1857](https://github.com/coreos/rkt/pull/1857)).
-- Continuous Integration on Travis now builds with both Go 1.4.2 and Go 1.5.2. Go 1.4.3 is avoided to workaround recent problems with go vet ([#1941](https://github.com/coreos/rkt/pull/1941)).
+- Add support for building rkt with Go 1.5, which is now the preferred version. rkt can still be built with Go 1.4 as best effort ([#1907](https://github.com/rkt/rkt/pull/1907)). As part of the move to Go 1.5, rkt now has a godep-save script to support Go 1.5 ([#1857](https://github.com/rkt/rkt/pull/1857)).
+- Continuous Integration on Travis now builds with both Go 1.4.2 and Go 1.5.2. Go 1.4.3 is avoided to workaround recent problems with go vet ([#1941](https://github.com/rkt/rkt/pull/1941)).
 
 #### Bug fixes
 
-- Fix regression issue when downloading image signatures from quay.io ([#1909](https://github.com/coreos/rkt/pull/1909)).
-- Properly cleanup the tap network interface that were not cleaned up in some error cases when using the kvm stage1 ([#1921](https://github.com/coreos/rkt/pull/1921)).
-- Fix a bug in the 9p filesystem used by the kvm stage1 that were preventing `apt-get` from working propertly ([#1918](https://github.com/coreos/rkt/pull/1918)).
+- Fix regression issue when downloading image signatures from quay.io ([#1909](https://github.com/rkt/rkt/pull/1909)).
+- Properly cleanup the tap network interface that were not cleaned up in some error cases when using the kvm stage1 ([#1921](https://github.com/rkt/rkt/pull/1921)).
+- Fix a bug in the 9p filesystem used by the kvm stage1 that were preventing `apt-get` from working propertly ([#1918](https://github.com/rkt/rkt/pull/1918)).
 
 ## v0.14.0
 
@@ -940,46 +940,46 @@ The appc spec version has been updated to v0.7.4
 
 #### New features and UX changes
 
-- The data directory that rkt uses can now be configured with a config file ([#1806](https://github.com/coreos/rkt/pull/1806)). See rkt's [paths configuration](https://github.com/coreos/rkt/blob/master/Documentation/configuration.md#rktkind-paths) documentation.
-- CPU and memory resource isolators can be specified on the command line to override the limits specified in the image manifest ([#1851](https://github.com/coreos/rkt/pull/1851), [#1874](https://github.com/coreos/rkt/pull/1874)). See rkt's [overriding isolators](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/run.md#overriding-isolators) documentation.
-- CPU and memory resource isolators can now be used within the kvm stage1 ([#1404](https://github.com/coreos/rkt/pull/1404))
-- The `rkt image list` command can now display the image size ([#1865](https://github.com/coreos/rkt/pull/1865)).
-- A new stage1 flavor has been added: fly; and it represents the first experimental implementation of the upcoming rkt fly feature. ([#1833](https://github.com/coreos/rkt/pull/1833))
+- The data directory that rkt uses can now be configured with a config file ([#1806](https://github.com/rkt/rkt/pull/1806)). See rkt's [paths configuration](https://github.com/rkt/rkt/blob/master/Documentation/configuration.md#rktkind-paths) documentation.
+- CPU and memory resource isolators can be specified on the command line to override the limits specified in the image manifest ([#1851](https://github.com/rkt/rkt/pull/1851), [#1874](https://github.com/rkt/rkt/pull/1874)). See rkt's [overriding isolators](https://github.com/rkt/rkt/blob/master/Documentation/subcommands/run.md#overriding-isolators) documentation.
+- CPU and memory resource isolators can now be used within the kvm stage1 ([#1404](https://github.com/rkt/rkt/pull/1404))
+- The `rkt image list` command can now display the image size ([#1865](https://github.com/rkt/rkt/pull/1865)).
+- A new stage1 flavor has been added: fly; and it represents the first experimental implementation of the upcoming rkt fly feature. ([#1833](https://github.com/rkt/rkt/pull/1833))
 
 #### Build improvements
 
-- It is now possible to build rkt inside rkt ([#1681](https://github.com/coreos/rkt/pull/1681)). This should improve the reproducibility of builds. This release does not use it yet but it is planned for future releases.
-- Linux distribution packagers can override the version of stage1 during the build ([#1821](https://github.com/coreos/rkt/pull/1821)). This is needed for any Linux distributions that might carry distro-specific patches along the upstream release. See rkt's documentation about [building stage1 flavors](https://github.com/coreos/rkt/blob/master/Documentation/build-configure.md#--with-stage1-flavors-version-override).
-- Smaller build improvements with dep generation ([#1838](https://github.com/coreos/rkt/pull/1838)), error messages on `make clean` ([#1850](https://github.com/coreos/rkt/pull/1850)), dependency checks in the kvm flavor ([#1860](https://github.com/coreos/rkt/pull/1860))
+- It is now possible to build rkt inside rkt ([#1681](https://github.com/rkt/rkt/pull/1681)). This should improve the reproducibility of builds. This release does not use it yet but it is planned for future releases.
+- Linux distribution packagers can override the version of stage1 during the build ([#1821](https://github.com/rkt/rkt/pull/1821)). This is needed for any Linux distributions that might carry distro-specific patches along the upstream release. See rkt's documentation about [building stage1 flavors](https://github.com/rkt/rkt/blob/master/Documentation/build-configure.md#--with-stage1-flavors-version-override).
+- Smaller build improvements with dep generation ([#1838](https://github.com/rkt/rkt/pull/1838)), error messages on `make clean` ([#1850](https://github.com/rkt/rkt/pull/1850)), dependency checks in the kvm flavor ([#1860](https://github.com/rkt/rkt/pull/1860))
 
 #### Bug fixes
 
-- rkt is now able to override the application command with `--exec` when the application manifest didn't specify any command ([#1843](https://github.com/coreos/rkt/pull/1843)).
-- In some cases, user namespaces were not working in Linux distributions without systemd, such as Ubuntu 14.04 LTS. This is fixed by creating a unique cgroup for each pod when systemd is not used ([#1844](https://github.com/coreos/rkt/pull/1844))
-- rkt's tar package didn't prefix the destination file correctly when using hard links in images. This was not a issue in rkt itself but was causing acbuild to misbehave ([#1852](https://github.com/coreos/rkt/pull/1852)).
-- ACIs with multiple dependencies can end up depending on the same base image through multiple paths. In some of those configuration with multiple dependencies, fetching the image via image discovery was not working. This is fixed and a new test ensures it will keep working ([#1822](https://github.com/coreos/rkt/pull/1822)).
-- The pod cgroups were misconfigured when systemd-devel is not installed. This was causing per-app CPU and memory isolators to be ineffective on those systems. This is now fixed but will require an additional fix for NixOS ([#1873](https://github.com/coreos/rkt/pull/1873)).
-- During the garbage collection of pods (`rkt gc`), all mounts will be umounted even when the pod is in an inconsistent state ([#1828](https://github.com/coreos/rkt/pull/1828), [#1856](https://github.com/coreos/rkt/pull/1856))
+- rkt is now able to override the application command with `--exec` when the application manifest didn't specify any command ([#1843](https://github.com/rkt/rkt/pull/1843)).
+- In some cases, user namespaces were not working in Linux distributions without systemd, such as Ubuntu 14.04 LTS. This is fixed by creating a unique cgroup for each pod when systemd is not used ([#1844](https://github.com/rkt/rkt/pull/1844))
+- rkt's tar package didn't prefix the destination file correctly when using hard links in images. This was not a issue in rkt itself but was causing acbuild to misbehave ([#1852](https://github.com/rkt/rkt/pull/1852)).
+- ACIs with multiple dependencies can end up depending on the same base image through multiple paths. In some of those configuration with multiple dependencies, fetching the image via image discovery was not working. This is fixed and a new test ensures it will keep working ([#1822](https://github.com/rkt/rkt/pull/1822)).
+- The pod cgroups were misconfigured when systemd-devel is not installed. This was causing per-app CPU and memory isolators to be ineffective on those systems. This is now fixed but will require an additional fix for NixOS ([#1873](https://github.com/rkt/rkt/pull/1873)).
+- During the garbage collection of pods (`rkt gc`), all mounts will be umounted even when the pod is in an inconsistent state ([#1828](https://github.com/rkt/rkt/pull/1828), [#1856](https://github.com/rkt/rkt/pull/1856))
 
 #### Improved documentation
 
-- New documentation about configure flags ([#1824](https://github.com/coreos/rkt/pull/1824)). This also includes formatting and typos fixes and updates. The examples about rkt's configuration files are also clarified ([#1847](https://github.com/coreos/rkt/pull/1847)).
-- New documentation explaining [how cgroups are used by rkt](https://github.com/coreos/rkt/blob/master/Documentation/devel/cgroups.md) ([#1870](https://github.com/coreos/rkt/pull/1870)). This should make it easier for software developers to integrate rkt with monitoring software.
+- New documentation about configure flags ([#1824](https://github.com/rkt/rkt/pull/1824)). This also includes formatting and typos fixes and updates. The examples about rkt's configuration files are also clarified ([#1847](https://github.com/rkt/rkt/pull/1847)).
+- New documentation explaining [how cgroups are used by rkt](https://github.com/rkt/rkt/blob/master/Documentation/devel/cgroups.md) ([#1870](https://github.com/rkt/rkt/pull/1870)). This should make it easier for software developers to integrate rkt with monitoring software.
 
 #### API service
 
-- The API service is meant to be used by orchestration tools like Kubernetes. The performance of the API service was improved by reducing the round-trips in the ListPods and ListImages requests ([#1786](https://github.com/coreos/rkt/pull/1786)). Those requests also gained multiple filters for more flexibility ([#1853](https://github.com/coreos/rkt/pull/1853)).
+- The API service is meant to be used by orchestration tools like Kubernetes. The performance of the API service was improved by reducing the round-trips in the ListPods and ListImages requests ([#1786](https://github.com/rkt/rkt/pull/1786)). Those requests also gained multiple filters for more flexibility ([#1853](https://github.com/rkt/rkt/pull/1853)).
 
 ## v0.13.0
 
 The primary motivation for this release is to add support for fetching images on the Docker Registry 2.0. It also includes other small improvements.
 
-- docker2aci: support Docker Registry 2.0 ([#1826](https://github.com/coreos/rkt/pull/1826))
-- always use https:// when fetching docker images ([#1837](https://github.com/coreos/rkt/pull/1837))
-- stage0: add container hash data into TPM ([#1775](https://github.com/coreos/rkt/pull/1775))
-- host flavor: fix systemd copying into stage1 for Debian packaging ([#1811](https://github.com/coreos/rkt/pull/1811))
-- clarify network error messages ([#1707](https://github.com/coreos/rkt/pull/1707))
-- documentation: add more build-time requirements ([#1834](https://github.com/coreos/rkt/pull/1834))
+- docker2aci: support Docker Registry 2.0 ([#1826](https://github.com/rkt/rkt/pull/1826))
+- always use https:// when fetching docker images ([#1837](https://github.com/rkt/rkt/pull/1837))
+- stage0: add container hash data into TPM ([#1775](https://github.com/rkt/rkt/pull/1775))
+- host flavor: fix systemd copying into stage1 for Debian packaging ([#1811](https://github.com/rkt/rkt/pull/1811))
+- clarify network error messages ([#1707](https://github.com/rkt/rkt/pull/1707))
+- documentation: add more build-time requirements ([#1834](https://github.com/rkt/rkt/pull/1834))
 
 ## v0.12.0
 
@@ -987,31 +987,31 @@ rkt v0.12.0 is an incremental release with UX improvements like fine-grained sec
 
 #### New features and UX changes
 
-- implement `rkt cat-manifest` for pods ([#1744](https://github.com/coreos/rkt/pull/1744))
-- generate an empty volume if a required one is not provided ([#1753](https://github.com/coreos/rkt/pull/1753))
-- make disabling security features granular; `--insecure-skip-verify` is now `--insecure-options={feature(s)-to-disable}` ([#1738](https://github.com/coreos/rkt/pull/1738)). See rkt's [Global Options](https://github.com/coreos/rkt/blob/master/Documentation/commands.md#global-options) documentation.
-- allow skipping the on-disk integrity check using `--insecure-options=ondisk`. This greatly speeds up start time. ([#1804](https://github.com/coreos/rkt/pull/1804))
-- set empty volumes' permissions following the [spec](https://github.com/appc/spec/blob/master/spec/pods.md#pod-manifest-schema) ([1803](https://github.com/coreos/rkt/pull/1803))
-- flannel networking support in kvm flavor ([#1563](https://github.com/coreos/rkt/pull/1563))
+- implement `rkt cat-manifest` for pods ([#1744](https://github.com/rkt/rkt/pull/1744))
+- generate an empty volume if a required one is not provided ([#1753](https://github.com/rkt/rkt/pull/1753))
+- make disabling security features granular; `--insecure-skip-verify` is now `--insecure-options={feature(s)-to-disable}` ([#1738](https://github.com/rkt/rkt/pull/1738)). See rkt's [Global Options](https://github.com/rkt/rkt/blob/master/Documentation/commands.md#global-options) documentation.
+- allow skipping the on-disk integrity check using `--insecure-options=ondisk`. This greatly speeds up start time. ([#1804](https://github.com/rkt/rkt/pull/1804))
+- set empty volumes' permissions following the [spec](https://github.com/appc/spec/blob/master/spec/pods.md#pod-manifest-schema) ([1803](https://github.com/rkt/rkt/pull/1803))
+- flannel networking support in kvm flavor ([#1563](https://github.com/rkt/rkt/pull/1563))
 
 #### Bug fixes
 
-- store used MCS contexts on the filesystem ([#1742](https://github.com/coreos/rkt/pull/1742))
-- fix Docker images with whiteout-ed hard links ([#1653](https://github.com/coreos/rkt/pull/1653))
-- fix Docker images relying on /dev/stdout ([#1617](https://github.com/coreos/rkt/pull/1617))
-- use authentication for discovery and trust ([#1801](https://github.com/coreos/rkt/pull/1801))
-- fix build in Docker ([#1798](https://github.com/coreos/rkt/pull/1798))
-- fix kvm networking ([#1530](https://github.com/coreos/rkt/pull/1530))
+- store used MCS contexts on the filesystem ([#1742](https://github.com/rkt/rkt/pull/1742))
+- fix Docker images with whiteout-ed hard links ([#1653](https://github.com/rkt/rkt/pull/1653))
+- fix Docker images relying on /dev/stdout ([#1617](https://github.com/rkt/rkt/pull/1617))
+- use authentication for discovery and trust ([#1801](https://github.com/rkt/rkt/pull/1801))
+- fix build in Docker ([#1798](https://github.com/rkt/rkt/pull/1798))
+- fix kvm networking ([#1530](https://github.com/rkt/rkt/pull/1530))
 
 #### Improved testing
 
-- add functional tests for rkt api service ([#1761](https://github.com/coreos/rkt/pull/1761))
-- fix TestSocketActivation on systemd-v219 ([#1768](https://github.com/coreos/rkt/pull/1768))
-- fix the ACE validator test ([#1802](https://github.com/coreos/rkt/pull/1802))
+- add functional tests for rkt api service ([#1761](https://github.com/rkt/rkt/pull/1761))
+- fix TestSocketActivation on systemd-v219 ([#1768](https://github.com/rkt/rkt/pull/1768))
+- fix the ACE validator test ([#1802](https://github.com/rkt/rkt/pull/1802))
 
 #### Other changes
 
-- Bumped appc spec to 0.7.3 ([#1800](https://github.com/coreos/rkt/pull/1800))
+- Bumped appc spec to 0.7.3 ([#1800](https://github.com/rkt/rkt/pull/1800))
 
 ## v0.11.0
 
@@ -1019,41 +1019,41 @@ rkt v0.11.0 is an incremental release with mostly bug fixes and testing improvem
 
 #### New features and UX changes
 
-- support resuming ACI downloads ([#1444](https://github.com/coreos/rkt/pull/1444))
-- `rkt image gc` now also removes images from the store ([#1697](https://github.com/coreos/rkt/pull/1697))
+- support resuming ACI downloads ([#1444](https://github.com/rkt/rkt/pull/1444))
+- `rkt image gc` now also removes images from the store ([#1697](https://github.com/rkt/rkt/pull/1697))
 
 #### Build
 
-- handle building multiple flavors ([#1683](https://github.com/coreos/rkt/pull/1683))
-- verbosity control ([#1685](https://github.com/coreos/rkt/pull/1685), [#1686](https://github.com/coreos/rkt/pull/1686))
-- fix bugs in `make clean` ([#1695](https://github.com/coreos/rkt/pull/1695))
+- handle building multiple flavors ([#1683](https://github.com/rkt/rkt/pull/1683))
+- verbosity control ([#1685](https://github.com/rkt/rkt/pull/1685), [#1686](https://github.com/rkt/rkt/pull/1686))
+- fix bugs in `make clean` ([#1695](https://github.com/rkt/rkt/pull/1695))
 
 #### Improved testing
 
-- nicer output in tests ([#1698](https://github.com/coreos/rkt/pull/1698))
-- refactor test code ([#1709](https://github.com/coreos/rkt/pull/1709))
-- skip CI tests when the source was not modified ([#1619](https://github.com/coreos/rkt/pull/1619))
-- better output when tests fail ([#1728](https://github.com/coreos/rkt/pull/1728))
-- fix tests in `10.*` IP range ([#1736](https://github.com/coreos/rkt/pull/1736))
-- document how to run functional tests ([#1736](https://github.com/coreos/rkt/pull/1736))
+- nicer output in tests ([#1698](https://github.com/rkt/rkt/pull/1698))
+- refactor test code ([#1709](https://github.com/rkt/rkt/pull/1709))
+- skip CI tests when the source was not modified ([#1619](https://github.com/rkt/rkt/pull/1619))
+- better output when tests fail ([#1728](https://github.com/rkt/rkt/pull/1728))
+- fix tests in `10.*` IP range ([#1736](https://github.com/rkt/rkt/pull/1736))
+- document how to run functional tests ([#1736](https://github.com/rkt/rkt/pull/1736))
 
 #### Improved documentation
 
-- add some help on how to run rkt as a daemon ([#1684](https://github.com/coreos/rkt/pull/1684))
+- add some help on how to run rkt as a daemon ([#1684](https://github.com/rkt/rkt/pull/1684))
 
 #### API service
 
-- do not return manifest in `ListPods()` and `ListImages()` ([#1688](https://github.com/coreos/rkt/pull/1688))
+- do not return manifest in `ListPods()` and `ListImages()` ([#1688](https://github.com/rkt/rkt/pull/1688))
 
 #### Bug fixes
 
-- parameter `--mount` fixed in kvm flavour ([#1687](https://github.com/coreos/rkt/pull/1687))
-- fix rkt leaking containers in machinectl on CoreOS ([#1694](https://github.com/coreos/rkt/pull/1694), [#1704](https://github.com/coreos/rkt/pull/1704))
-- `rkt status` now returns the stage1 pid ([#1699](https://github.com/coreos/rkt/pull/1699))
-- fix crash in `rkt status` when an image is removed ([#1701](https://github.com/coreos/rkt/pull/1701))
-- fix fd leak in store ([#1716](https://github.com/coreos/rkt/pull/1716))
-- fix exec line parsing in ACI manifest ([#1652](https://github.com/coreos/rkt/pull/1652))
-- fix build on 32-bit systems ([#1729](https://github.com/coreos/rkt/pull/1729))
+- parameter `--mount` fixed in kvm flavour ([#1687](https://github.com/rkt/rkt/pull/1687))
+- fix rkt leaking containers in machinectl on CoreOS ([#1694](https://github.com/rkt/rkt/pull/1694), [#1704](https://github.com/rkt/rkt/pull/1704))
+- `rkt status` now returns the stage1 pid ([#1699](https://github.com/rkt/rkt/pull/1699))
+- fix crash in `rkt status` when an image is removed ([#1701](https://github.com/rkt/rkt/pull/1701))
+- fix fd leak in store ([#1716](https://github.com/rkt/rkt/pull/1716))
+- fix exec line parsing in ACI manifest ([#1652](https://github.com/rkt/rkt/pull/1652))
+- fix build on 32-bit systems ([#1729](https://github.com/rkt/rkt/pull/1729))
 
 ## v0.10.0
 
@@ -1061,28 +1061,28 @@ rkt v0.10.0 is an incremental release with numerous bug fixes and a few small ne
 
 #### New features and UX changes
 
-- added implementation for basic API service (`rkt api-service`) ([#1508](https://github.com/coreos/rkt/pull/1508))
-- mount arbitrary volumes with `--mount` ([#1582](https://github.com/coreos/rkt/pull/1582), [#1678](https://github.com/coreos/rkt/pull/1678))
-- `--net=none` only exposes the loopback interface ([#1635](https://github.com/coreos/rkt/pull/1635))
-- better formatting for rkt help ([#1597](https://github.com/coreos/rkt/pull/1597))
-- metadata service registration (`--mds-register`) disabled by default ([#1635](https://github.com/coreos/rkt/pull/1635))
+- added implementation for basic API service (`rkt api-service`) ([#1508](https://github.com/rkt/rkt/pull/1508))
+- mount arbitrary volumes with `--mount` ([#1582](https://github.com/rkt/rkt/pull/1582), [#1678](https://github.com/rkt/rkt/pull/1678))
+- `--net=none` only exposes the loopback interface ([#1635](https://github.com/rkt/rkt/pull/1635))
+- better formatting for rkt help ([#1597](https://github.com/rkt/rkt/pull/1597))
+- metadata service registration (`--mds-register`) disabled by default ([#1635](https://github.com/rkt/rkt/pull/1635))
 
 #### Improved documentation
-- [compare rkt and other projects](https://github.com/coreos/rkt/blob/master/Documentation/rkt-vs-other-projects.md) ([#1588](https://github.com/coreos/rkt/pull/1588))
-- [Stage1 systemd Architecture](https://github.com/coreos/rkt/blob/master/Documentation/devel/architecture.md) ([#1631](https://github.com/coreos/rkt/pull/1631))
-- [packaging rkt in Linux distributions](https://github.com/coreos/rkt/blob/master/Documentation/packaging.md) ([#1511](https://github.com/coreos/rkt/pull/1511))
+- [compare rkt and other projects](https://github.com/rkt/rkt/blob/master/Documentation/rkt-vs-other-projects.md) ([#1588](https://github.com/rkt/rkt/pull/1588))
+- [Stage1 systemd Architecture](https://github.com/rkt/rkt/blob/master/Documentation/devel/architecture.md) ([#1631](https://github.com/rkt/rkt/pull/1631))
+- [packaging rkt in Linux distributions](https://github.com/rkt/rkt/blob/master/Documentation/packaging.md) ([#1511](https://github.com/rkt/rkt/pull/1511))
 
 #### Improved testing
-- new test for user namespaces (`--private-users`) ([#1580](https://github.com/coreos/rkt/pull/1580))
-- fix races in tests ([#1608](https://github.com/coreos/rkt/pull/1608))
+- new test for user namespaces (`--private-users`) ([#1580](https://github.com/rkt/rkt/pull/1580))
+- fix races in tests ([#1608](https://github.com/rkt/rkt/pull/1608))
 
 #### Bug fixes
-- suppress unnecessary output when `--debug` is not used ([#1557](https://github.com/coreos/rkt/pull/1557))
-- fix permission of rootfs with overlayfs ([#1607](https://github.com/coreos/rkt/pull/1607))
-- allow relative path in parameters ([#1615](https://github.com/coreos/rkt/pull/1615))
-- fix pod garbage collection failure in some cases ([#1621](https://github.com/coreos/rkt/pull/1621))
-- fix `rkt list` when an image was removed ([#1655](https://github.com/coreos/rkt/pull/1655))
-- user namespace (`--private-users`) regression with rkt group fixed ([#1654](//github.com/coreos/rkt/pull/1654))
+- suppress unnecessary output when `--debug` is not used ([#1557](https://github.com/rkt/rkt/pull/1557))
+- fix permission of rootfs with overlayfs ([#1607](https://github.com/rkt/rkt/pull/1607))
+- allow relative path in parameters ([#1615](https://github.com/rkt/rkt/pull/1615))
+- fix pod garbage collection failure in some cases ([#1621](https://github.com/rkt/rkt/pull/1621))
+- fix `rkt list` when an image was removed ([#1655](https://github.com/rkt/rkt/pull/1655))
+- user namespace (`--private-users`) regression with rkt group fixed ([#1654](//github.com/rkt/rkt/pull/1654))
 
 ## v0.9.0
 
@@ -1097,7 +1097,7 @@ There are several notable breaking changes from the previous release:
 #### New features and UX changes
 
 ###### `--private-net` --> `--net`, and networking is now private by default
-The `--private-net` flag has been changed to `--net`, and has been now made the default behaviour. ([#1532](https://github.com/coreos/rkt/pull/1532), [#1418](https://github.com/coreos/rkt/pull/1418))
+The `--private-net` flag has been changed to `--net`, and has been now made the default behaviour. ([#1532](https://github.com/rkt/rkt/pull/1532), [#1418](https://github.com/rkt/rkt/pull/1418))
 That is, a `rkt run` command will now by default set up a private network for the pod.
 To achieve the previous default behaviour of the pod sharing the networking namespace of the host, use `--net=host`.
 The flag still allows the specification of multiple networks via CNI plugins, and overriding plugin configuration on a per-network basis.
@@ -1110,7 +1110,7 @@ Instead, rkt now features two new flags, `--store-only` and `--no-store`, on bot
 For full details of the new behaviour see the [image fetching documentation](Documentation/image-fetching-behavior.md).
 
 ###### Unprivileged users
-A number of changes were made to the permissions of rkt's internal store to facilitate unprivileged users to access information about images and pods on the system ([#1542](https://github.com/coreos/rkt/pull/1542), [#1569](https://github.com/coreos/rkt/pull/1569)).
+A number of changes were made to the permissions of rkt's internal store to facilitate unprivileged users to access information about images and pods on the system ([#1542](https://github.com/rkt/rkt/pull/1542), [#1569](https://github.com/rkt/rkt/pull/1569)).
 In particular, the set-group-ID bit is applied to the directories touched by `rkt install` so that the `rkt` group (if it exists on the system) can retain read-access to information about pods and images.
 This will be used by the rkt API service (targeted for the next release) so that it can run as an unprivileged user on the system.
 This support is still considered partially experimental.
@@ -1118,46 +1118,46 @@ Some tasks like `rkt image gc` remain a root-only operation.
 
 ###### /etc/hosts support
 If no `/etc/hosts` exists in an application filesystem at the time it starts running, rkt will now provide a basic default version of this file.
-If rkt detects one already in the app's filesystem (whether through being included in an image, or a volume mounted in), it will make no changes. ([#1541](https://github.com/coreos/rkt/pull/1541))
+If rkt detects one already in the app's filesystem (whether through being included in an image, or a volume mounted in), it will make no changes. ([#1541](https://github.com/rkt/rkt/pull/1541))
 
 ##### Other new features
-- rkt now supports setting supplementary group IDs on processes ([#1514](https://github.com/coreos/rkt/pull/1514)).
-- rkt's use of cgroups has been reworked to facilitate rkt running on a variety of operating systems like Void and older non-systemd distributions ([#1437](https://github.com/coreos/rkt/pull/1437), [#1320](https://github.com/coreos/rkt/pull/1320), [#1076](https://github.com/coreos/rkt/pull/1076), [#1042](https://github.com/coreos/rkt/pull/1042))
-- If `rkt run` is used with an image that does not have an app section, rkt will now create one if the user provides an `--exec` flag ([#1427](https://github.com/coreos/rkt/pull/1427))
-- A new `rkt image gc` command adds initial support for garbage collecting images from the store ([#1487](https://github.com/coreos/rkt/pull/1487)). This removes treeStores not referenced by any non-GCed rkt pod.
-- `rkt list` now provides more information including image version and hash ([#1559](https://github.com/coreos/rkt/pull/1559))
+- rkt now supports setting supplementary group IDs on processes ([#1514](https://github.com/rkt/rkt/pull/1514)).
+- rkt's use of cgroups has been reworked to facilitate rkt running on a variety of operating systems like Void and older non-systemd distributions ([#1437](https://github.com/rkt/rkt/pull/1437), [#1320](https://github.com/rkt/rkt/pull/1320), [#1076](https://github.com/rkt/rkt/pull/1076), [#1042](https://github.com/rkt/rkt/pull/1042))
+- If `rkt run` is used with an image that does not have an app section, rkt will now create one if the user provides an `--exec` flag ([#1427](https://github.com/rkt/rkt/pull/1427))
+- A new `rkt image gc` command adds initial support for garbage collecting images from the store ([#1487](https://github.com/rkt/rkt/pull/1487)). This removes treeStores not referenced by any non-GCed rkt pod.
+- `rkt list` now provides more information including image version and hash ([#1559](https://github.com/rkt/rkt/pull/1559))
 - `rkt image list` output now shows shortened hash identifiers by default, and human readable date formats.
-  To use the previous output format, use the `--full` flag. ([#1455](https://github.com/coreos/rkt/pull/1455))
-- `rkt prepare` gained the `--exec` flag, which restores flag-parity with `rkt run` ([#1410](https://github.com/coreos/rkt/pull/1410))
-- lkvm stage1 backend has experimental support for `rkt enter` ([#1303](https://github.com/coreos/rkt/pull/1303))
-- rkt now supports empty volume types ([#1502](https://github.com/coreos/rkt/pull/1502))
-- An early, experimental read-only API definition has been added ([#1359](https://github.com/coreos/rkt/pull/1359), [#1518](https://github.com/coreos/rkt/pull/1518)).
+  To use the previous output format, use the `--full` flag. ([#1455](https://github.com/rkt/rkt/pull/1455))
+- `rkt prepare` gained the `--exec` flag, which restores flag-parity with `rkt run` ([#1410](https://github.com/rkt/rkt/pull/1410))
+- lkvm stage1 backend has experimental support for `rkt enter` ([#1303](https://github.com/rkt/rkt/pull/1303))
+- rkt now supports empty volume types ([#1502](https://github.com/rkt/rkt/pull/1502))
+- An early, experimental read-only API definition has been added ([#1359](https://github.com/rkt/rkt/pull/1359), [#1518](https://github.com/rkt/rkt/pull/1518)).
 
 #### Bug fixes
-- Fixed bug in `--stage1-image` option which prevented it from using URLs ([#1524](https://github.com/coreos/rkt/pull/1524))
-- Fixed bug in `rkt trust`'s handling of `--root` ([#1494](https://github.com/coreos/rkt/pull/1494))
-- Fixed bug when decompressing xz-compressed images ([#1462](https://github.com/coreos/rkt/pull/1462), [#1224](https://github.com/coreos/rkt/pull/1224))
-- In earlier versions of rkt, hooks had an implicit timeout of 30 seconds, causing some pre-start jobs which took a long time to be killed. This implicit timeout has been removed. ([#1547](https://github.com/coreos/rkt/pull/1547))
-- When running with the lkvm stage1, rkt now sets `$HOME` if it is not already set, working around a bug in the lkvm tool ([#1447](https://github.com/coreos/rkt/pull/1447), [#1393](https://github.com/coreos/rkt/pull/1393))
-- Fixed bug preventing `run-prepared` from working if the metadata service was not available ([#1436](https://github.com/coreos/rkt/pull/1436))
+- Fixed bug in `--stage1-image` option which prevented it from using URLs ([#1524](https://github.com/rkt/rkt/pull/1524))
+- Fixed bug in `rkt trust`'s handling of `--root` ([#1494](https://github.com/rkt/rkt/pull/1494))
+- Fixed bug when decompressing xz-compressed images ([#1462](https://github.com/rkt/rkt/pull/1462), [#1224](https://github.com/rkt/rkt/pull/1224))
+- In earlier versions of rkt, hooks had an implicit timeout of 30 seconds, causing some pre-start jobs which took a long time to be killed. This implicit timeout has been removed. ([#1547](https://github.com/rkt/rkt/pull/1547))
+- When running with the lkvm stage1, rkt now sets `$HOME` if it is not already set, working around a bug in the lkvm tool ([#1447](https://github.com/rkt/rkt/pull/1447), [#1393](https://github.com/rkt/rkt/pull/1393))
+- Fixed bug preventing `run-prepared` from working if the metadata service was not available ([#1436](https://github.com/rkt/rkt/pull/1436))
 
 #### Other changes
-- Bumped appc spec to 0.7.1 ([#1543](https://github.com/coreos/rkt/pull/1543))
-- Bumped CNI and netlink dependencies ([#1476](https://github.com/coreos/rkt/pull/1476))
-- Bumped ioprogress to a version which prevents the download bar from being drawn when rkt is not drawing to a terminal ([#1423](https://github.com/coreos/rkt/pull/1423), [#1282](https://github.com/coreos/rkt/pull/1282))
-- Significantly reworked rkt's internal use of systemd to orchestrate apps, which should facilitate more granular control over pod lifecycles ([#1407](https://github.com/coreos/rkt/pull/1407))
-- Reworked rkt's handling of images with non-deterministically dependencies ([#1240](https://github.com/coreos/rkt/pull/1240), [#1198](https://github.com/coreos/rkt/pull/1198)).
-- rkt functional tests now run appc's ACE validator, which should ensure that rkt is always compliant with the specification. ([#1473](https://github.com/coreos/rkt/pull/1473))
+- Bumped appc spec to 0.7.1 ([#1543](https://github.com/rkt/rkt/pull/1543))
+- Bumped CNI and netlink dependencies ([#1476](https://github.com/rkt/rkt/pull/1476))
+- Bumped ioprogress to a version which prevents the download bar from being drawn when rkt is not drawing to a terminal ([#1423](https://github.com/rkt/rkt/pull/1423), [#1282](https://github.com/rkt/rkt/pull/1282))
+- Significantly reworked rkt's internal use of systemd to orchestrate apps, which should facilitate more granular control over pod lifecycles ([#1407](https://github.com/rkt/rkt/pull/1407))
+- Reworked rkt's handling of images with non-deterministically dependencies ([#1240](https://github.com/rkt/rkt/pull/1240), [#1198](https://github.com/rkt/rkt/pull/1198)).
+- rkt functional tests now run appc's ACE validator, which should ensure that rkt is always compliant with the specification. ([#1473](https://github.com/rkt/rkt/pull/1473))
 - A swathe of improvements to the build system
   - `make clean` should now work
-  - Different rkt stage1 images are now built with different names ([#1406](https://github.com/coreos/rkt/pull/1406))
-  - rkt can now build on older Linux distributions (like CentOS 6) ([#1529](https://github.com/coreos/rkt/pull/1529))
+  - Different rkt stage1 images are now built with different names ([#1406](https://github.com/rkt/rkt/pull/1406))
+  - rkt can now build on older Linux distributions (like CentOS 6) ([#1529](https://github.com/rkt/rkt/pull/1529))
 - Various internal improvements to the functional test suite to improve coverage and consolidate code
 - The "ACI" field header in `rkt image` output has been changed to "IMAGE NAME"
-- `rkt image rm` now exits with status 1 on any failure ([#1486](https://github.com/coreos/rkt/pull/1486))
-- Fixed permissions in the default stage1 image ([#1503](https://github.com/coreos/rkt/pull/1503))
-- Added documentation for `prepare` and `run-prepared` subcommands ([#1526](https://github.com/coreos/rkt/pull/1526))
-- rkt should now report more helpful errors when encountering manifests it does not understand ([#1471](https://github.com/coreos/rkt/pull/1471))
+- `rkt image rm` now exits with status 1 on any failure ([#1486](https://github.com/rkt/rkt/pull/1486))
+- Fixed permissions in the default stage1 image ([#1503](https://github.com/rkt/rkt/pull/1503))
+- Added documentation for `prepare` and `run-prepared` subcommands ([#1526](https://github.com/rkt/rkt/pull/1526))
+- rkt should now report more helpful errors when encountering manifests it does not understand ([#1471](https://github.com/rkt/rkt/pull/1471))
 
 
 ## v0.8.1
@@ -1183,7 +1183,7 @@ rkt v0.8.1 is an incremental release with numerous bug fixes and clean-up to the
   - rkt will refuse to add isolators with nil Limits, preventing a panic caused by an ambiguity in upstream appc schema
 - Other changes:
   - Reworked the SELinux implementation to use `systemd-nspawn`'s native context-switching feature
-  - Added a workaround for a bug in Docker <1.8 when it is run on the same system as rkt (see https://github.com/coreos/rkt/issues/1210#issuecomment-132793300)
+  - Added a workaround for a bug in Docker <1.8 when it is run on the same system as rkt (see https://github.com/rkt/rkt/issues/1210#issuecomment-132793300)
   - Added a `rkt-xxxx-tapN` name to tap devices that rkt creates
   - Functional tests now clean intermediate images between tests
   - Countless improvements and cleanup to the build system
@@ -1370,7 +1370,7 @@ a couple of small new features:
 - metadata-service no longer manipulates IP tables rules as it connects over a
   unix socket by default
 - pkg/lock has been improved to also support regular (non-directory) files
-- images in the cas are now locked at runtime (as described in [#460](https://github.com/coreos/rkt/pull/460))
+- images in the cas are now locked at runtime (as described in [#460](https://github.com/rkt/rkt/pull/460))
 
 
 ## v0.5.1
@@ -1406,7 +1406,7 @@ This release also introduces a number of key features and minor changes:
 ## v0.4.2
 
 - First support for interactive containers, with the `rkt run --interactive`
-  flag. This is currently only supported if a container has one app. [#562](https://github.com/coreos/rkt/pull/562) #[601](https://github.com/coreos/rkt/pull/601)
+  flag. This is currently only supported if a container has one app. [#562](https://github.com/rkt/rkt/pull/562) #[601](https://github.com/rkt/rkt/pull/601)
 - Add container IP address information to `rkt list`
 - Provide `/sys` and `/dev/shm` to apps (per spec)
 - Introduce "latest" pattern handling for local image index
diff --git a/Documentation/devel/cgroups.md b/Documentation/devel/cgroups.md
index af699660b0..c83d5f59a6 100644
--- a/Documentation/devel/cgroups.md
+++ b/Documentation/devel/cgroups.md
@@ -80,8 +80,8 @@ This is not implemented yet.
 This could be implemented with cgroups.
 
 [cgroups]: https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt
-[machinedRegister]: https://github.com/coreos/rkt/blob/master/stage1/init/init.go#L153
+[machinedRegister]: https://github.com/rkt/rkt/blob/master/stage1/init/init.go#L153
 [network-isolator]: https://github.com/appc/spec/blob/master/spec/ace.md#resourcenetwork-bandwidth
-[rkt-1757]: https://github.com/coreos/rkt/issues/1757
-[rkt-1844]: https://github.com/coreos/rkt/pull/1844
+[rkt-1757]: https://github.com/rkt/rkt/issues/1757
+[rkt-1844]: https://github.com/rkt/rkt/pull/1844
 [rkt-systemd]: ../using-rkt-with-systemd.md
diff --git a/Documentation/devel/distribution-point.md b/Documentation/devel/distribution-point.md
index 835de1cae0..36b19550ae 100644
--- a/Documentation/devel/distribution-point.md
+++ b/Documentation/devel/distribution-point.md
@@ -165,4 +165,4 @@ For example there may exist multiple transport plugins (file, http, s3, bittorre
 [docker2aci_GH]: https://github.com/appc/docker2aci
 [oci_image_spec_readme]: https://github.com/opencontainers/image-spec#running-an-oci-imag://github.com/appc/docker2aci
 [oci_layout]: https://github.com/opencontainers/image-spec/blob/master/image-layout.md
-[rkt-2964]: https://github.com/coreos/rkt/pull/2964
+[rkt-2964]: https://github.com/rkt/rkt/pull/2964
diff --git a/Documentation/devel/on-disk-format.md b/Documentation/devel/on-disk-format.md
index de82682a92..5ac01510ac 100644
--- a/Documentation/devel/on-disk-format.md
+++ b/Documentation/devel/on-disk-format.md
@@ -29,5 +29,5 @@ The [configuration][configuration] on-disk format is documented separately.
 
 [configuration]: ../configuration.md
 [pod-lifecycle]: pod-lifecycle.md
-[rkt-706]: https://github.com/coreos/rkt/issues/706
+[rkt-706]: https://github.com/rkt/rkt/issues/706
 [rktkind-paths]: ../configuration.md#rktkind-paths
diff --git a/Documentation/devel/quickstart-dev.md b/Documentation/devel/quickstart-dev.md
index dd786850d8..bb2cb9a86c 100644
--- a/Documentation/devel/quickstart-dev.md
+++ b/Documentation/devel/quickstart-dev.md
@@ -8,10 +8,10 @@ In this example ~/Repos is a personal workspace where all repos are stored
 
 ```sh
 $ mkdir ~/Repos && cd ~/Repos
-$ mkdir -p ~/.local/gopath/src/github.com/coreos
+$ mkdir -p ~/.local/gopath/src/github.com/rkt
 $ sudo apt-get install git
-$ git -C ~/.local/gopath/src/github.com/coreos clone https://github.com/coreos/rkt.git
-$ ln -s ~/.local/gopath/src/github.com/coreos/rkt rkt
+$ git -C ~/.local/gopath/src/github.com/rkt clone https://github.com/rkt/rkt.git
+$ ln -s ~/.local/gopath/src/github.com/rkt/rkt rkt
 ```
 
 On a fresh system installation, few additional software packages are needed to correctly build rkt:
diff --git a/Documentation/devel/release.md b/Documentation/devel/release.md
index d44d5713c7..8849055f72 100644
--- a/Documentation/devel/release.md
+++ b/Documentation/devel/release.md
@@ -23,7 +23,7 @@ The following example assumes we're going from version 1.1.0 (`v1.1.0`) to 1.2.0
 
 Let's get started:
 
-- Start at the relevant milestone on GitHub (e.g. https://github.com/coreos/rkt/milestones/v1.2.0): ensure all referenced issues are closed (or moved elsewhere, if they're not done). Close the milestone.
+- Start at the relevant milestone on GitHub (e.g. https://github.com/rkt/rkt/milestones/v1.2.0): ensure all referenced issues are closed (or moved elsewhere, if they're not done). Close the milestone.
 - Update the [roadmap][roadmap] to remove the release you're performing, if necessary
 - Ensure that `stage1/aci/aci-manifest.in` is the same version of appc/spec vendored with rkt. Otherwise, update it.
 - Branch from the latest master, make sure your git status is clean
@@ -122,11 +122,11 @@ git log v1.1.0..v1.2.0 --pretty=format:"%an" | sort | uniq | tr '\n' ',' | sed -
 ```
 
 
-[changelog]: https://github.com/coreos/rkt/blob/master/CHANGELOG.md
-[configure_ac]: https://github.com/coreos/rkt/blob/master/configure.ac#L2
+[changelog]: https://github.com/rkt/rkt/blob/master/CHANGELOG.md
+[configure_ac]: https://github.com/rkt/rkt/blob/master/configure.ac#L2
 [coreos-key]: https://coreos.com/security/app-signing-key
-[gh-new-release]: https://github.com/coreos/rkt/releases/new
-[milestones]: https://github.com/coreos/rkt/milestones
-[maintainers]: https://github.com/coreos/rkt/blob/master/MAINTAINERS
+[gh-new-release]: https://github.com/rkt/rkt/releases/new
+[milestones]: https://github.com/rkt/rkt/milestones
+[maintainers]: https://github.com/rkt/rkt/blob/master/MAINTAINERS
 [rkt-dev-list]: https://groups.google.com/forum/#!forum/rkt-dev
-[roadmap]: https://github.com/coreos/rkt/blob/master/ROADMAP.md
+[roadmap]: https://github.com/rkt/rkt/blob/master/ROADMAP.md
diff --git a/Documentation/devel/user-namespaces.md b/Documentation/devel/user-namespaces.md
index 3cf342247d..259901ad7f 100644
--- a/Documentation/devel/user-namespaces.md
+++ b/Documentation/devel/user-namespaces.md
@@ -36,4 +36,4 @@ It would make it work with overlayfs.
 When mounting a volume from the host into the pod, the ownership of the files is not shifted, so it makes volumes difficult if not impossible to use with user namespaces.
 The same kernel support should help here too ([#1057][rkt-1057]).
 
-[rkt-1057]: https://github.com/coreos/rkt/issues/1057
+[rkt-1057]: https://github.com/rkt/rkt/issues/1057
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 8a86a7b308..7efeb744c2 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -141,8 +141,8 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt-1.25.0-1.x86_64.rpm
-wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt-1.25.0-1.x86_64.rpm.asc
+wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt-1.25.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt-1.25.0-1.x86_64.rpm.asc
 gpg --verify rkt-1.25.0-1.x86_64.rpm.asc
 sudo rpm -Uvh rkt-1.25.0-1.x86_64.rpm
 ```
@@ -150,8 +150,8 @@ sudo rpm -Uvh rkt-1.25.0-1.x86_64.rpm
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt_1.25.0-1_amd64.deb
-wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt_1.25.0-1_amd64.deb.asc
+wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt_1.25.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt_1.25.0-1_amd64.deb.asc
 gpg --verify rkt_1.25.0-1_amd64.deb.asc
 sudo dpkg -i rkt_1.25.0-1_amd64.deb
 ```
@@ -170,10 +170,10 @@ sudo dpkg -i rkt_1.25.0-1_amd64.deb
 [rkt-nixos]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/virtualization/rkt/default.nix
 [rkt-opensuse]: https://build.opensuse.org/package/show/Virtualization:containers/rkt
 [rkt-void]: https://github.com/voidlinux/void-packages/tree/master/srcpkgs/rkt
-[rkt-1305]: https://github.com/coreos/rkt/issues/1305
-[rkt-1978]: https://github.com/coreos/rkt/issues/1978
-[rkt-2206]: https://github.com/coreos/rkt/issues/2206
-[rkt-2322]: https://github.com/coreos/rkt/issues/2322
-[rkt-2325]: https://github.com/coreos/rkt/issues/2325
-[rkt-2326]: https://github.com/coreos/rkt/issues/2326
+[rkt-1305]: https://github.com/rkt/rkt/issues/1305
+[rkt-1978]: https://github.com/rkt/rkt/issues/1978
+[rkt-2206]: https://github.com/rkt/rkt/issues/2206
+[rkt-2322]: https://github.com/rkt/rkt/issues/2322
+[rkt-2325]: https://github.com/rkt/rkt/issues/2325
+[rkt-2326]: https://github.com/rkt/rkt/issues/2326
 [void-packages]: http://www.voidlinux.eu/packages/
diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index 5649512e5f..4533286e21 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -96,5 +96,5 @@ hello
 [appc-spec]: https://github.com/appc/spec
 [rkt-daemon]: subcommands/run.md#run-rkt-as-a-daemon
 [rkt-releases]: https://github.com/containers/build/releases
-[rkt-vagrant]: https://github.com/coreos/rkt/blob/master/Documentation/trying-out-rkt.md#rkt-using-vagrant
+[rkt-vagrant]: https://github.com/rkt/rkt/blob/master/Documentation/trying-out-rkt.md#rkt-using-vagrant
 [signing-guide]: signing-and-verification-guide.md
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 9910602a55..dfb5796d2f 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -7,7 +7,7 @@ For more information on the rkt internals, see the [`devel`](devel/) documentati
 
 ## Building rkt
 
-The easiest way to build rkt is by using the coreos.com/rkt/builder ACI image. See instructions for how to use it in the README at [github.com/coreos/rkt-builder][rkt-builder].
+The easiest way to build rkt is by using the coreos.com/rkt/builder ACI image. See instructions for how to use it in the README at [github.com/rkt/rkt-builder][rkt-builder].
 
 Alternatively, you should be able build rkt on any modern Linux system with [Go](https://golang.org/) (1.5+) installed.
 For the most part the codebase is self-contained (e.g. all dependencies are vendored), but assembly of the stage1 requires some other tools to be installed on the system.
@@ -15,7 +15,7 @@ Please see [the list of the build-time dependencies][build-time-dependencies].
 Once the dependencies have been satisfied you can build rkt with a default configuration by running the following commands:
 
 ```
-git clone https://github.com/coreos/rkt.git
+git clone https://github.com/rkt/rkt.git
 cd rkt
 ./autogen.sh && ./configure && make
 ```
@@ -210,6 +210,6 @@ If something looks awry, restart, pray to your preferred deity, and try again.
 [glide-vc]: https://github.com/sgotti/glide-vc
 [glide-versioning]: https://glide.readthedocs.io/en/latest/versions/
 [go]: https://golang.org/
-[rkt-builder]: https://github.com/coreos/rkt-builder
+[rkt-builder]: https://github.com/rkt/rkt-builder
 [run-time-dependencies]: dependencies.md#run-time-dependencies
 [update-coreos-stage1]: devel/update-coreos-stage1.md
diff --git a/Documentation/install-rkt-in-coreos.md b/Documentation/install-rkt-in-coreos.md
index 7aafb75299..0f81901917 100644
--- a/Documentation/install-rkt-in-coreos.md
+++ b/Documentation/install-rkt-in-coreos.md
@@ -33,6 +33,6 @@ Other units being added can then contain a `After=rkt-install.service` (or
 whatever the service was named) to delay their running until rkt has been
 installed.
 
-[rkt-releases]: https://github.com/coreos/rkt/releases
+[rkt-releases]: https://github.com/rkt/rkt/releases
 [ignition]: https://coreos.com/ignition/docs/latest/
 [cloud-config]: https://coreos.com/os/docs/latest/cloud-config.html
diff --git a/Documentation/integrations.md b/Documentation/integrations.md
index 75389db211..6fbeeb9e03 100644
--- a/Documentation/integrations.md
+++ b/Documentation/integrations.md
@@ -1,5 +1,5 @@
 # Integrations
-This document tracks projects that integrate with rkt. [Join the community](https://github.com/coreos/rkt/), and help us keep the list up-to-date.
+This document tracks projects that integrate with rkt. [Join the community](https://github.com/rkt/rkt/), and help us keep the list up-to-date.
 
 ## Projects 
 [Kubernetes](https://kubernetes.io/docs/getting-started-guides/rkt/): a enterprise grade container orchestration solution. Kubernetes offers rkt support as an alternative to the standard install.
diff --git a/Documentation/networking/dns.md b/Documentation/networking/dns.md
index fc2647f919..ea0fea90a2 100644
--- a/Documentation/networking/dns.md
+++ b/Documentation/networking/dns.md
@@ -113,4 +113,4 @@ round-trip min/avg/max = 5.421/5.421/5.421 ms
 ```
 
 
-[standard-defaults]: https://github.com/coreos/rkt/blob/master/stage1/net/rootfs/etc/hosts-fallback
+[standard-defaults]: https://github.com/rkt/rkt/blob/master/stage1/net/rootfs/etc/hosts-fallback
diff --git a/Documentation/packaging.md b/Documentation/packaging.md
index f93db80647..456e3fde15 100644
--- a/Documentation/packaging.md
+++ b/Documentation/packaging.md
@@ -61,7 +61,7 @@ A few [example systemd unit files for rkt helper services][rkt-units] are includ
 [rkt-gc]: subcommands/gc.md
 [rkt-metadata-svc]: subcommands/metadata-service.md
 [api-service]: subcommands/api-service.md
-[rkt-units]: https://github.com/coreos/rkt/tree/master/dist/init/systemd
-[rkt-vendor]: https://github.com/coreos/rkt/tree/master/vendor
+[rkt-units]: https://github.com/rkt/rkt/tree/master/dist/init/systemd
+[rkt-vendor]: https://github.com/rkt/rkt/tree/master/vendor
 [run-deps]: dependencies.md#run-time-dependencies
-[rkt-dirs]: https://github.com/coreos/rkt/blob/master/dist/init/systemd/tmpfiles.d/rkt.conf
+[rkt-dirs]: https://github.com/rkt/rkt/blob/master/dist/init/systemd/tmpfiles.d/rkt.conf
diff --git a/Documentation/performance/rkt-1-4-0-benchmarks.md b/Documentation/performance/rkt-1-4-0-benchmarks.md
index ff233fe328..0be6b1bfce 100644
--- a/Documentation/performance/rkt-1-4-0-benchmarks.md
+++ b/Documentation/performance/rkt-1-4-0-benchmarks.md
@@ -12,7 +12,7 @@ Linux proton 4.4.6 #1-NixOS SMP Wed Mar 16 15:43:17 UTC 2016 x86_64 GNU/Linux
 
 ### log-stresser.aci
 ```
-derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor log-stresser.aci
+derek@proton ~/go/src/github.com/rkt/rkt/tests/rkt-monitor> sudo ./rkt-monitor log-stresser.aci
 rkt(18493): seconds alive: 10  avg CPU: 28.314541%  avg Mem: 2 mB  peak Mem: 2 mB
 systemd(18515): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(18517): seconds alive: 9  avg CPU: 88.397098%  avg Mem: 7 mB  peak Mem: 7 mB
@@ -25,7 +25,7 @@ container stop time: 17332926ns
 
 ### mem-stresser.aci
 ```
-derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor mem-stresser.aci
+derek@proton ~/go/src/github.com/rkt/rkt/tests/rkt-monitor> sudo ./rkt-monitor mem-stresser.aci
 worker(18634): seconds alive: 9  avg CPU: 98.550401%  avg Mem: 318 mB  peak Mem: 555 mB
 rkt(18599): seconds alive: 10  avg CPU: 3.583814%  avg Mem: 2 mB  peak Mem: 2 mB
 systemd(18628): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
@@ -37,7 +37,7 @@ container stop time: 17593446ns
 
 ### cpu-stresser.aci
 ```
-derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor cpu-stresser.aci
+derek@proton ~/go/src/github.com/rkt/rkt/tests/rkt-monitor> sudo ./rkt-monitor cpu-stresser.aci
 rkt(18706): seconds alive: 10  avg CPU: 3.587050%  avg Mem: 2 mB  peak Mem: 2 mB
 systemd(18736): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 4 mB  peak Mem: 4 mB
 systemd-journal(18740): seconds alive: 9  avg CPU: 0.000000%  avg Mem: 6 mB  peak Mem: 6 mB
@@ -49,7 +49,7 @@ container stop time: 16124700ns
 
 ### too-many-apps.podmanifest
 ```
-derek@proton ~/go/src/github.com/coreos/rkt/tests/rkt-monitor> sudo ./rkt-monitor too-many-apps.podmanifest -d 30s
+derek@proton ~/go/src/github.com/rkt/rkt/tests/rkt-monitor> sudo ./rkt-monitor too-many-apps.podmanifest -d 30s
 # Identical (aside from PID) worker-binary lines removed
 rkt(17227): seconds alive: 20  avg CPU: 9.595387%  avg Mem: 3 mB  peak Mem: 20 mB
 systemd(17253): seconds alive: 17  avg CPU: 0.329028%  avg Mem: 16 mB  peak Mem: 16 mB
diff --git a/Documentation/production-users.md b/Documentation/production-users.md
index 354416d944..3f022b33e5 100644
--- a/Documentation/production-users.md
+++ b/Documentation/production-users.md
@@ -1,6 +1,6 @@
 # Production users
 
-This document tracks people and use cases for rkt in production. [Join the community](https://github.com/coreos/rkt/), and help us keep the list up-to-date.
+This document tracks people and use cases for rkt in production. [Join the community](https://github.com/rkt/rkt/), and help us keep the list up-to-date.
 
 ## [BlaBlaCar](https://www.blablacar.com/)
 
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 2929461b63..4fe473c61d 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -9,13 +9,13 @@ This new specification differs considerably from rkt's internal ACI-based image
 
 The internal rkt image handling is currently divided in three subsystems:
 - **fetching**: This subsystem is responsible for downloading images of various types.
-Non-ACI image types (Docker and OCI) are converted to ACI images by delegating to [docker2aci][docker2aci]. The logic resides in the `github.com/coreos/rkt/rkt/image` package.
+Non-ACI image types (Docker and OCI) are converted to ACI images by delegating to [docker2aci][docker2aci]. The logic resides in the `github.com/rkt/rkt/rkt/image` package.
 
 - **image store**: The image store is responsible for persisting and managing downloaded images.
-It consists of two parts, a directory tree storing the actual image file blobs (usually residing under `/var/lib/rkt/cas/blob`) and a separate embedded SQL database storing image metadata usually residing in `/var/lib/rkt/cas/db/ql.db`. The implementation resides in the `github.com/coreos/rkt/store/imagestore` package.
+It consists of two parts, a directory tree storing the actual image file blobs (usually residing under `/var/lib/rkt/cas/blob`) and a separate embedded SQL database storing image metadata usually residing in `/var/lib/rkt/cas/db/ql.db`. The implementation resides in the `github.com/rkt/rkt/store/imagestore` package.
 
 - **tree store**: Since dependencies between ACI images form a directed acyclic graph according to the [appc spec][ace-fs] they are pre-rendered in a directory called the tree store cache.
-If the [overlay filesystem](https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt) is enabled, the pre-rendered image is used as the `lowerdir` for the pod's rendered rootfs. The implementation resides in the `github.com/coreos/rkt/store/treestore` package.
+If the [overlay filesystem](https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt) is enabled, the pre-rendered image is used as the `lowerdir` for the pod's rendered rootfs. The implementation resides in the `github.com/rkt/rkt/store/treestore` package.
 
 The actual internal lifecycle of an image is documented in the [architecture documentation][image-lifecycle].
 
@@ -26,7 +26,7 @@ The following table gives an overview of the relevant differences between OCI an
 Dependencies | Layers array in the [image manifest][oci-manifest] | [Dependency graph][ace-fs]
 Hash algorithms | Potentially multiple [algorithms][oci-algorithms], but SHA-256 preferred | [SHA-512][appc-image-id-type]
 
-Current ongoing work to support OCI in rkt is tracked in the following Github project: [https://github.com/coreos/rkt/projects/4](https://github.com/coreos/rkt/projects/4).
+Current ongoing work to support OCI in rkt is tracked in the following Github project: [https://github.com/rkt/rkt/projects/4](https://github.com/rkt/rkt/projects/4).
 
 ### Goals, non-Goals
 
@@ -43,7 +43,7 @@ This document outlines the following necessary steps and references existing wor
 3. Transport handlers
 4. Tree store support for OCI
 
-A non-goal is the implementation of the [OCI runtime specification][oci-runtime]. There is ongoing work in [https://github.com/coreos/rkt/issues/3408](https://github.com/coreos/rkt/issues/3408) covering this topic.
+A non-goal is the implementation of the [OCI runtime specification][oci-runtime]. There is ongoing work in [https://github.com/rkt/rkt/issues/3408](https://github.com/rkt/rkt/issues/3408) covering this topic.
 
 ### Overview
 
@@ -64,8 +64,8 @@ The design document can be found in [Documentation/devel/distribution-point.md][
 
 ###### Status
 
-- The design document (https://github.com/coreos/rkt/pull/2953) is merged.
-- The implementation (https://github.com/coreos/rkt/pull/3369) is merged.
+- The design document (https://github.com/rkt/rkt/pull/2953) is merged.
+- The implementation (https://github.com/rkt/rkt/pull/3369) is merged.
 
 ###### TODOs
 
@@ -84,8 +84,8 @@ In order to prepare native support for OCI the following changes need to be impl
 
 ###### Status
 
-- The design and initial implementation is proposed in https://github.com/coreos/rkt/pull/3071.
-- The actual design document of the above PR can be found in [Documentation/proposals/reference_based_image_access_and_cas_store.md](https://github.com/coreos/rkt/blob/23313af1c3dac2fb24fe41f9a7c5eaca573e45dd/Documentation/proposals/reference_based_image_access_and_cas_store.md).
+- The design and initial implementation is proposed in https://github.com/rkt/rkt/pull/3071.
+- The actual design document of the above PR can be found in [Documentation/proposals/reference_based_image_access_and_cas_store.md](https://github.com/rkt/rkt/blob/23313af1c3dac2fb24fe41f9a7c5eaca573e45dd/Documentation/proposals/reference_based_image_access_and_cas_store.md).
 
 Note that the above design document also suggests the introduction of a new key/value [Bolt](https://github.com/boltdb/bolt) based store. The current consensus is that the replacement of `ql` as the backing store can be done independently and therefore should be a non-goal for the OCI roadmap.
 
@@ -102,9 +102,9 @@ The current implementation makes it hard to integrate separate fetching subsyste
 
 The current proposal is to abstract fetching logic behind "transport handlers" allowing for independent (potentially swappable) fetching implementations for the various image formats.
 
-- A first initial design is proposed in https://github.com/coreos/rkt/pull/2964.
+- A first initial design is proposed in https://github.com/rkt/rkt/pull/2964.
 - The actual design document of the above PR can be found in [Documentation/proposal/fetchers_refactor.md](https://github.com/sgotti/rkt/blob/239fdff081f9fd47dd08834a5660a1375ea4771d/Documentation/proposal/fetchers_refactor.md).
-- A first initial implementation is proposed in https://github.com/coreos/rkt/pull/3232.
+- A first initial implementation is proposed in https://github.com/rkt/rkt/pull/3232.
 
 Note that the initial design and implementation are in very early stage and should only be considered inspirational. 
 
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/coreos/rkt/blob/v1.25.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/coreos/rkt/blob/v1.25.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/coreos/rkt/blob/v1.25.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/rkt/rkt/blob/v1.25.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.25.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/rkt/rkt/blob/v1.25.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/rkt-build-rkt.md b/Documentation/rkt-build-rkt.md
index 9e6dc99cd1..233393c72e 100644
--- a/Documentation/rkt-build-rkt.md
+++ b/Documentation/rkt-build-rkt.md
@@ -15,7 +15,7 @@ export BUILDDIR=
 mkdir -p $BUILDDIR
 ```
 
-Start the container which will run the [rkt builder](https://github.com/coreos/rkt-builder), and compile rkt:
+Start the container which will run the [rkt builder](https://github.com/rkt/rkt-builder), and compile rkt:
 ```
 ./scripts/build-rir.sh
 ```
diff --git a/Documentation/subcommands/api-service.md b/Documentation/subcommands/api-service.md
index 878c5c0fbc..71b83c8c41 100644
--- a/Documentation/subcommands/api-service.md
+++ b/Documentation/subcommands/api-service.md
@@ -31,8 +31,8 @@ Here is a small [Go program][client-example] that illustrates how to use the API
 See the table with [global options in general commands documentation][global-options].
 
 
-[api_proto]: https://github.com/coreos/rkt/blob/master/api/v1alpha/api.proto
-[client-example]: https://github.com/coreos/rkt/blob/master/api/v1alpha/client_example.go
+[api_proto]: https://github.com/rkt/rkt/blob/master/api/v1alpha/api.proto
+[client-example]: https://github.com/rkt/rkt/blob/master/api/v1alpha/client_example.go
 [global-options]: ../commands.md#global-options
 [grpc]: http://www.grpc.io/
-[rkt-api]: https://github.com/coreos/rkt/blob/master/dist/init/systemd/rkt-api.service
+[rkt-api]: https://github.com/rkt/rkt/blob/master/dist/init/systemd/rkt-api.service
diff --git a/Documentation/subcommands/metadata-service.md b/Documentation/subcommands/metadata-service.md
index 929256995a..1c19eb7849 100644
--- a/Documentation/subcommands/metadata-service.md
+++ b/Documentation/subcommands/metadata-service.md
@@ -38,6 +38,6 @@ See the table with [global options in general commands documentation][global-opt
 
 
 [appc-container-metadata]: https://github.com/appc/spec/blob/master/spec/ace.md#app-container-metadata-service
-[dist]: https://github.com/coreos/rkt/tree/master/dist/init/systemd
+[dist]: https://github.com/rkt/rkt/tree/master/dist/init/systemd
 [global-options]: ../commands.md#global-options
 [socket-activation]: http://0pointer.de/blog/projects/socket-activation.html
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 2c4165e5ec..1efc6a305e 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,7 +20,7 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/coreos/rkt/releases/download/v1.25.0/rkt-v1.25.0.tar.gz
+wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt-v1.25.0.tar.gz
 tar xzvf rkt-v1.25.0.tar.gz
 cd rkt-v1.25.0
 ./rkt help
@@ -41,7 +41,7 @@ For Mac (and other Vagrant) users we have set up a `Vagrantfile`. Make sure you
 First, download the `Vagrantfile` and start a Linux machine with rkt installed by running `vagrant up`.
 
 ```
-git clone https://github.com/coreos/rkt
+git clone https://github.com/rkt/rkt
 cd rkt
 vagrant up
 ```
@@ -286,7 +286,7 @@ The escape character `^]` is generated by `Ctrl-]` on a US keyboard. The require
 [configdoc]: configuration.md
 [disable-selinux]: https://www.centos.org/docs/5/html/5.1/Deployment_Guide/sec-sel-enable-disable.html
 [distlist]: distributions.md
-[distro-pkg-help]: https://github.com/coreos/rkt/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fdistribution++label%3Adependency%2Fexternal
+[distro-pkg-help]: https://github.com/rkt/rkt/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fdistribution++label%3Adependency%2Fexternal
 [docker2aci]: https://github.com/appc/docker2aci
 [docker-nginx]: https://hub.docker.com/_/nginx/
 [etcd]: https://coreos.com/etcd/
@@ -305,7 +305,7 @@ The escape character `^]` is generated by `Ctrl-]` on a US keyboard. The require
 [rkt-run]: subcommands/run.md
 [rkt-trust]: subcommands/trust.md
 [run-coreos]: https://coreos.com/os/docs/latest/#running-coreos
-[setup-data-dir]: https://github.com/coreos/rkt/blob/master/dist/scripts/setup-data-dir.sh
+[setup-data-dir]: https://github.com/rkt/rkt/blob/master/dist/scripts/setup-data-dir.sh
 [signguide]: signing-and-verification-guide.md
 [signguide-establishing-trust]: signing-and-verification-guide.md#establishing-trust
 [vagrant]: https://www.vagrantup.com/
diff --git a/README.md b/README.md
index 5b59f6d930..f1abb2828a 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # rkt - the pod-native container engine
 
-[![godoc](https://godoc.org/github.com/coreos/rkt?status.svg)](http://godoc.org/github.com/coreos/rkt)
-[![Build Status (Travis)](https://travis-ci.org/coreos/rkt.svg?branch=master)](https://travis-ci.org/coreos/rkt)
-[![Build Status (SemaphoreCI)](https://semaphoreci.com/api/v1/projects/28468e19-4fd0-483e-9c29-6c8368661333/395211/badge.svg)](https://semaphoreci.com/coreos/rkt)
+[![godoc](https://godoc.org/github.com/rkt/rkt?status.svg)](http://godoc.org/github.com/rkt/rkt)
+[![Build Status (Travis)](https://travis-ci.org/rkt/rkt.svg?branch=master)](https://travis-ci.org/rkt/rkt)
+[![Build Status (SemaphoreCI)](https://semaphoreci.com/api/v1/rkt/rkt/branches/master/badge.svg)](https://semaphoreci.com/rkt/rkt)
 [![Build Status (Jenkins)](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-master-periodic/badge/icon)](https://jenkins-rkt-public.prod.coreos.systems/view/rkt/job/rkt-master-periodic/)
 
 ![rkt Logo](logos/rkt-horizontal-color.png)
@@ -29,7 +29,7 @@ Some of rkt's key features and goals include:
 [selinux]: Documentation/selinux.md
 [tpm]: Documentation/devel/tpm.md
 [oci-image-spec]: https://github.com/opencontainers/image-spec
-[rkt-oci]: https://github.com/coreos/rkt/projects/4
+[rkt-oci]: https://github.com/rkt/rkt/projects/4
 
 ## Project status
 
@@ -56,10 +56,10 @@ The rkt developers also host a semi-regular community sync meeting open to the p
 This sync usually features demos, updates on the roadmap, and time for anyone from the community to ask questions of the developers or share users stories with others.
 For more details, including how to join and recordings of previous syncs, see the [sync doc on Google Docs][sync-doc].
 
-[new-issue]: https://github.com/coreos/rkt/issues/new
+[new-issue]: https://github.com/rkt/rkt/issues/new
 [rkt-dev]: https://groups.google.com/forum/?hl=en#!forum/rkt-dev
 [irc]: irc://irc.freenode.org:6667/#rkt-dev
-[milestones]: https://github.com/coreos/rkt/milestones
+[milestones]: https://github.com/rkt/rkt/milestones
 [sync-doc]: https://docs.google.com/document/d/1NT_J5X2QErtKgd8Y3TFXNknWhJx_yOCMJnq3Iy2jPgE/edit#
 
 ## Contributing to rkt
@@ -85,15 +85,15 @@ Due to limitations in the Linux kernel, using rkt's overlay support on top of an
 - the inner `/var/lib/rkt` directory needs to be mounted on a host volume.
 - the outer or inner rkt container needs to be started using `--no-overlay`.
 
-Due to a bug in the Linux kernel, using rkt when `/var/lib/rkt` is on btrfs requires Linux 4.5.2+ ([#2175](https://github.com/coreos/rkt/issues/2175)).
+Due to a bug in the Linux kernel, using rkt when `/var/lib/rkt` is on btrfs requires Linux 4.5.2+ ([#2175](https://github.com/rkt/rkt/issues/2175)).
 
-Due to a bug in the Linux kernel, using rkt's overlay support in conjunction with SELinux requires a set of patches that are only currently available on some Linux distributions (for example, [CoreOS Linux](https://github.com/coreos/coreos-overlay/tree/master/sys-kernel/coreos-sources/files)). Work is ongoing to merge this work into the mainline Linux kernel ([#1727](https://github.com/coreos/rkt/issues/1727#issuecomment-173203129)).
+Due to a bug in the Linux kernel, using rkt's overlay support in conjunction with SELinux requires a set of patches that are only currently available on some Linux distributions (for example, [CoreOS Linux](https://github.com/coreos/coreos-overlay/tree/master/sys-kernel/coreos-sources/files)). Work is ongoing to merge this work into the mainline Linux kernel ([#1727](https://github.com/rkt/rkt/issues/1727#issuecomment-173203129)).
 
-Linux 3.18+ is required to successfully garbage collect rkt pods when system services such as udevd are in a slave mount namespace (see [lazy umounts on unlinked files and directories](https://github.com/torvalds/linux/commit/8ed936b) and [#1922](https://github.com/coreos/rkt/issues/1922)).
+Linux 3.18+ is required to successfully garbage collect rkt pods when system services such as udevd are in a slave mount namespace (see [lazy umounts on unlinked files and directories](https://github.com/torvalds/linux/commit/8ed936b) and [#1922](https://github.com/rkt/rkt/issues/1922)).
 
 ## Related Links
 
 ### Integrations and Production Users
 
-- [Projects integrating with rkt](https://github.com/coreos/rkt/blob/master/Documentation/integrations.md)
-- [Production users](https://github.com/coreos/rkt/blob/master/Documentation/production-users.md)
\ No newline at end of file
+- [Projects integrating with rkt](https://github.com/rkt/rkt/blob/master/Documentation/integrations.md)
+- [Production users](https://github.com/rkt/rkt/blob/master/Documentation/production-users.md)
diff --git a/ROADMAP.md b/ROADMAP.md
index 3d4c1fcfc8..3e3117ccf6 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,16 +2,16 @@
 
 This document defines a high level roadmap for rkt development.
 The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project.
-The [milestones defined in GitHub](https://github.com/coreos/rkt/milestones) represent the most up-to-date state of affairs.
+The [milestones defined in GitHub](https://github.com/rkt/rkt/milestones) represent the most up-to-date state of affairs.
 
 rkt's version 1.0 release marks the command line user interface and on-disk data structures as stable and reliable for external development.
 
 ## Ongoing projects
 
-- [Kubernetes CRI](https://github.com/coreos/rkt/projects/1): adapting rkt to offer first-class implementation of the Kubernetes Container Runtime Interface.
-- [OCI native support](https://github.com/coreos/rkt/projects/4): supporting OCI specs natively in rkt.
-- [appc phase-out](https://github.com/coreos/rkt/projects/5): following OCI evolution and stabilization, appc will be naturally deprecated and phased-out.
+- [Kubernetes CRI](https://github.com/rkt/rkt/projects/1): adapting rkt to offer first-class implementation of the Kubernetes Container Runtime Interface.
+- [OCI native support](https://github.com/rkt/rkt/projects/4): supporting OCI specs natively in rkt.
+- [appc phase-out](https://github.com/rkt/rkt/projects/5): following OCI evolution and stabilization, appc will be naturally deprecated and phased-out.
 
 ### Upcoming
 
-Future tasks without a specific timeline are tracked at https://github.com/coreos/rkt/milestone/30.
+Future tasks without a specific timeline are tracked at https://github.com/rkt/rkt/milestone/30.
diff --git a/api/v1alpha/README.md b/api/v1alpha/README.md
index f8c292c1f3..5af1132f63 100644
--- a/api/v1alpha/README.md
+++ b/api/v1alpha/README.md
@@ -2,7 +2,7 @@
 
 The API defined here is proposed, experimental, and (for now) subject to change at any time.
 
-If you think you want to use it, or for any other queries, contact <rkt-dev@googlegroups.com> or file an [issue](https://github.com/coreos/rkt/issues/new)
+If you think you want to use it, or for any other queries, contact <rkt-dev@googlegroups.com> or file an [issue](https://github.com/rkt/rkt/issues/new)
 
 For more information, see:
 - #1208
diff --git a/api/v1alpha/api.pb.go b/api/v1alpha/api.pb.go
index 5b9a3a836b..3f1274999f 100644
--- a/api/v1alpha/api.pb.go
+++ b/api/v1alpha/api.pb.go
@@ -112,7 +112,7 @@ func (x AppState) String() string {
 func (AppState) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
 // PodState defines the possible states of the pod.
-// See https://github.com/coreos/rkt/blob/master/Documentation/devel/pod-lifecycle.md for a detailed
+// See https://github.com/rkt/rkt/blob/master/Documentation/devel/pod-lifecycle.md for a detailed
 // explanation of each state.
 type PodState int32
 
diff --git a/api/v1alpha/api.proto b/api/v1alpha/api.proto
index 8bddb5c4f7..51f817c122 100644
--- a/api/v1alpha/api.proto
+++ b/api/v1alpha/api.proto
@@ -20,7 +20,7 @@
 //                                                     //
 //  If you think you want to use it, or for any other  //
 //     queries, contact <rkt-dev@googlegroups.com>     //
-//      or file an issue on github.com/coreos/rkt      //
+//      or file an issue on github.com/rkt/rkt      //
 //                                                     //
 // *************************************************** //
 // ****************** END WARNING ******************** //
@@ -119,7 +119,7 @@ message App {
 }
 
 // PodState defines the possible states of the pod.
-// See https://github.com/coreos/rkt/blob/master/Documentation/devel/pod-lifecycle.md for a detailed
+// See https://github.com/rkt/rkt/blob/master/Documentation/devel/pod-lifecycle.md for a detailed
 // explanation of each state.
 enum PodState {
         POD_STATE_UNDEFINED = 0;
diff --git a/api/v1alpha/client_example.go b/api/v1alpha/client_example.go
index e3c4c53362..07ac0597dc 100644
--- a/api/v1alpha/client_example.go
+++ b/api/v1alpha/client_example.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/coreos/rkt/api/v1alpha"
+	"github.com/rkt/rkt/api/v1alpha"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
diff --git a/common/cgroup/cgroup.go b/common/cgroup/cgroup.go
index 6d68729312..099ae3910b 100644
--- a/common/cgroup/cgroup.go
+++ b/common/cgroup/cgroup.go
@@ -21,9 +21,9 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/coreos/rkt/common/cgroup/v1"
-	"github.com/coreos/rkt/common/cgroup/v2"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common/cgroup/v1"
+	"github.com/rkt/rkt/common/cgroup/v2"
 )
 
 const (
diff --git a/common/cgroup/v1/cgroup.go b/common/cgroup/v1/cgroup.go
index 35734ebea7..9c44187189 100644
--- a/common/cgroup/v1/cgroup.go
+++ b/common/cgroup/v1/cgroup.go
@@ -28,8 +28,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/coreos/rkt/pkg/fs"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/fs"
 )
 
 // mountFsRO remounts the given mountPoint using the given flags read-only.
@@ -183,7 +183,7 @@ func JoinSubcgroup(controller string, subcgroup string) error {
 // This may fail; since this is "fixup" code, we should ignore
 // the error and proceed.
 //
-// This was originally a workaround for https://github.com/coreos/rkt/issues/1210
+// This was originally a workaround for https://github.com/rkt/rkt/issues/1210
 // but is actually useful to have around
 //
 // cpuSetPath should be <stage1rootfs>/sys/fs/cgroup/cpuset
@@ -348,7 +348,7 @@ func RemountCgroups(m fs.Mounter, root string, enabledCgroups map[int][]string,
 			return errwrap.Wrap(fmt.Errorf("error bind mounting %q", subcgroupPath), err)
 		}
 
-		// Workaround for https://github.com/coreos/rkt/issues/1210
+		// Workaround for https://github.com/rkt/rkt/issues/1210
 		// It is OK to ignore errors here.
 		if c == "cpuset" {
 			_ = fixCpusetKnobs(cPath, subcgroup, "cpuset.mems")
diff --git a/common/common.go b/common/common.go
index 6b1d97c4d4..5f4f4267db 100644
--- a/common/common.go
+++ b/common/common.go
@@ -34,7 +34,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 
-	"github.com/coreos/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/fileutil"
 )
 
 const (
diff --git a/common/environment.go b/common/environment.go
index 24e365787c..011f4b647e 100644
--- a/common/environment.go
+++ b/common/environment.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/pkg/user"
 
 	"github.com/appc/spec/schema/types"
 )
diff --git a/common/group.go b/common/group.go
index 07b5c3f572..838ed1bffc 100644
--- a/common/group.go
+++ b/common/group.go
@@ -15,7 +15,7 @@
 package common
 
 import (
-	"github.com/coreos/rkt/pkg/group"
+	"github.com/rkt/rkt/pkg/group"
 )
 
 const (
diff --git a/common/mount.go b/common/mount.go
index ebe172d53d..aac932c46d 100644
--- a/common/mount.go
+++ b/common/mount.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/coreos/rkt/pkg/fs"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	"github.com/coreos/rkt/pkg/mountinfo"
+	"github.com/rkt/rkt/pkg/fs"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/pkg/mountinfo"
 )
 
 // ChrootPrivateUnmount cleans up in a safe way all mountpoints existing under
diff --git a/common/overlay/overlay.go b/common/overlay/overlay.go
index 6158283ffc..61e6482721 100644
--- a/common/overlay/overlay.go
+++ b/common/overlay/overlay.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/coreos/rkt/pkg/label"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/label"
 )
 
 // sanitizer defines a string translator used to escape colon and comma
diff --git a/configure.ac b/configure.ac
index b48f83e239..bd7acf652f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.25.0+git], [https://github.com/coreos/rkt/issues])
+AC_INIT([rkt], [1.25.0+git], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
@@ -773,7 +773,7 @@ RKT_STAGE1_DEFAULT_LOCATION_LDFLAGS="-X 'main.buildDefaultStage1ImageLoc=${RKT_S
 RKT_STAGE1_DEFAULT_IMAGE_FILENAME_LDFLAGS="-X 'main.buildDefaultStage1ImageInRktDir=${RKT_STAGE1_DEFAULT_IMAGE_FILENAME_IN_RKT_DIRECTORY}'"
 RKT_STAGE1_DEFAULT_IMAGES_DIRECTORY_LDFLAGS="-X 'main.buildDefaultStage1ImagesDir=${RKT_STAGE1_DEFAULT_IMAGES_DIR}'"
 RKT_STAGE1_INTERPRETER_LDFLAGS="-X 'main.interpBin=${RKT_STAGE1_INTERPRETER}'"
-RKT_VERSION_LDFLAGS="-X 'github.com/coreos/rkt/version.Version=${RKT_VERSION}'"
+RKT_VERSION_LDFLAGS="-X 'github.com/rkt/rkt/version.Version=${RKT_VERSION}'"
 RKT_FEATURES_LDFLAGS="-X 'main.rktFeatures=${RKT_FEATURES}'"
 
 #### SUBSTITUTIONS
diff --git a/dist/init/systemd/rkt-api.service b/dist/init/systemd/rkt-api.service
index 378eece883..876a7e4288 100644
--- a/dist/init/systemd/rkt-api.service
+++ b/dist/init/systemd/rkt-api.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=rkt api service
-Documentation=http://github.com/coreos/rkt
+Documentation=http://github.com/rkt/rkt
 After=network.target rkt-api-tcp.socket
 Requires=rkt-api-tcp.socket
 
diff --git a/dist/init/systemd/rkt-metadata.service b/dist/init/systemd/rkt-metadata.service
index 246cf328fd..f43879d2b4 100644
--- a/dist/init/systemd/rkt-metadata.service
+++ b/dist/init/systemd/rkt-metadata.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=rkt metadata service
-Documentation=http://github.com/coreos/rkt
+Documentation=http://github.com/rkt/rkt
 After=network.target rkt-metadata.socket
 Requires=rkt-metadata.socket
 
diff --git a/glide.yaml b/glide.yaml
index dca4bd7478..b6ca38a781 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,4 +1,4 @@
-package: github.com/coreos/rkt
+package: github.com/rkt/rkt
 import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
diff --git a/lib/app.go b/lib/app.go
index 52f3fcdb7f..15ac181376 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -20,8 +20,8 @@ import (
 	"os"
 
 	"github.com/appc/spec/schema"
-	"github.com/coreos/rkt/common"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/rkt/rkt/common"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 )
 
 // AppsForPod returns the apps of the pod with the given uuid in the given data directory.
diff --git a/lib/pod.go b/lib/pod.go
index de6688c8d7..d003635616 100644
--- a/lib/pod.go
+++ b/lib/pod.go
@@ -14,7 +14,7 @@
 
 package rkt
 
-import pkgPod "github.com/coreos/rkt/pkg/pod"
+import pkgPod "github.com/rkt/rkt/pkg/pod"
 
 // NewPodFromInternalPod converts *pkgPod.Pod to *Pod
 func NewPodFromInternalPod(p *pkgPod.Pod) (*Pod, error) {
diff --git a/lib/types.go b/lib/types.go
index 77c43f60df..91c504f7b9 100644
--- a/lib/types.go
+++ b/lib/types.go
@@ -14,7 +14,7 @@
 
 package rkt
 
-import "github.com/coreos/rkt/networking/netinfo"
+import "github.com/rkt/rkt/networking/netinfo"
 
 // AppState defines the state of the app.
 type AppState string
diff --git a/makelib/variables.mk b/makelib/variables.mk
index 37fd8f5134..00b37e6a01 100644
--- a/makelib/variables.mk
+++ b/makelib/variables.mk
@@ -1,5 +1,5 @@
 # path to rkt source code distro
-ORG_PATH := github.com/coreos
+ORG_PATH := github.com/rkt
 REPO_PATH := $(ORG_PATH)/rkt
 
 override BUILDDIR := $(abspath $(BUILDDIR))
diff --git a/makelib/verbosity.mk b/makelib/verbosity.mk
index 3e6f49f6e8..2b2ee8c091 100644
--- a/makelib/verbosity.mk
+++ b/makelib/verbosity.mk
@@ -132,7 +132,7 @@ endef
 
 # This shortens the paths by removing the vendor part. So it
 # truncates
-# github.com/coreos/rkt/vendor/github.com/appc/spec/schema
+# github.com/rkt/rkt/vendor/github.com/appc/spec/schema
 # to <VENDOR>/github.com/appc/spec/schema.
 define vsg
 $(subst $(REPO_PATH)/vendor,<VENDOR>,$1)
diff --git a/networking/kvm.go b/networking/kvm.go
index 1e702a6450..3db7c71f75 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -37,9 +37,9 @@ import (
 	"github.com/hashicorp/errwrap"
 	"github.com/vishvananda/netlink"
 
-	"github.com/coreos/rkt/common"
-	commonnet "github.com/coreos/rkt/common/networking"
-	"github.com/coreos/rkt/networking/tuntap"
+	"github.com/rkt/rkt/common"
+	commonnet "github.com/rkt/rkt/common/networking"
+	"github.com/rkt/rkt/networking/tuntap"
 )
 
 const (
@@ -97,7 +97,7 @@ func setupMacVTapDevice(podID types.UUID, config MacVTapNetConf, interfaceNumber
 	var mode netlink.MacvlanMode
 	switch config.Mode {
 	// if not set - defaults to bridge mode as in:
-	// https://github.com/coreos/rkt/blob/master/Documentation/networking.md#macvlan
+	// https://github.com/rkt/rkt/blob/master/Documentation/networking.md#macvlan
 	case "", "bridge":
 		mode = netlink.MACVLAN_MODE_BRIDGE
 	case "private":
diff --git a/networking/net_plugin.go b/networking/net_plugin.go
index b200bc052e..f8650a8939 100644
--- a/networking/net_plugin.go
+++ b/networking/net_plugin.go
@@ -26,7 +26,7 @@ import (
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/hashicorp/errwrap"
 
-	"github.com/coreos/rkt/common"
+	"github.com/rkt/rkt/common"
 )
 
 // TODO(eyakubovich): make this configurable in rkt.conf
diff --git a/networking/networking.go b/networking/networking.go
index 5b35c00e1a..ed0d704e5d 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -29,10 +29,10 @@ import (
 	"github.com/hashicorp/errwrap"
 	"github.com/vishvananda/netlink"
 
-	"github.com/coreos/rkt/common"
-	commonnet "github.com/coreos/rkt/common/networking"
-	"github.com/coreos/rkt/networking/netinfo"
-	"github.com/coreos/rkt/pkg/log"
+	"github.com/rkt/rkt/common"
+	commonnet "github.com/rkt/rkt/common/networking"
+	"github.com/rkt/rkt/networking/netinfo"
+	"github.com/rkt/rkt/pkg/log"
 )
 
 const (
diff --git a/networking/podenv.go b/networking/podenv.go
index bcd60b6fa4..90f538a801 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -33,8 +33,8 @@ import (
 
 	"github.com/containernetworking/cni/pkg/ns"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/networking/netinfo"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/networking/netinfo"
 )
 
 const (
diff --git a/networking/portfwd.go b/networking/portfwd.go
index 74021d8370..9702d519f6 100644
--- a/networking/portfwd.go
+++ b/networking/portfwd.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/coreos/go-iptables/iptables"
 
-	commonnet "github.com/coreos/rkt/common/networking"
+	commonnet "github.com/rkt/rkt/common/networking"
 )
 
 type iptablesRule struct {
diff --git a/pkg/aci/render.go b/pkg/aci/render.go
index b7aebb9f6a..78bf391b3b 100644
--- a/pkg/aci/render.go
+++ b/pkg/aci/render.go
@@ -17,10 +17,10 @@ package aci
 import (
 	"errors"
 
-	"github.com/coreos/rkt/pkg/user"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/user"
 
-	ptar "github.com/coreos/rkt/pkg/tar"
+	ptar "github.com/rkt/rkt/pkg/tar"
 
 	"github.com/appc/spec/pkg/acirenderer"
 	"github.com/appc/spec/schema/types"
diff --git a/pkg/backup/backup.go b/pkg/backup/backup.go
index edde116c9b..1fa5554ae1 100644
--- a/pkg/backup/backup.go
+++ b/pkg/backup/backup.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/user"
 )
 
 // CreateBackup backs a directory up in a given directory. It basically
diff --git a/pkg/distribution/appc.go b/pkg/distribution/appc.go
index cf4f4c4de1..ed9558a1cb 100644
--- a/pkg/distribution/appc.go
+++ b/pkg/distribution/appc.go
@@ -22,7 +22,7 @@ import (
 	"github.com/PuerkitoBio/purell"
 	"github.com/appc/spec/discovery"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common/labelsort"
+	"github.com/rkt/rkt/common/labelsort"
 )
 
 const (
diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go
index 1fa3933c4a..1d7fd480b6 100644
--- a/pkg/fileutil/fileutil.go
+++ b/pkg/fileutil/fileutil.go
@@ -22,7 +22,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/pkg/user"
 
 	"github.com/appc/spec/pkg/device"
 )
diff --git a/pkg/fileutil/fileutil_test.go b/pkg/fileutil/fileutil_test.go
index bd04cebe90..d92a0c0513 100644
--- a/pkg/fileutil/fileutil_test.go
+++ b/pkg/fileutil/fileutil_test.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/pkg/user"
 )
 
 const tstprefix = "fileutil-test"
diff --git a/pkg/keystore/keystore.go b/pkg/keystore/keystore.go
index 020da19d3d..ca54a8aef2 100644
--- a/pkg/keystore/keystore.go
+++ b/pkg/keystore/keystore.go
@@ -27,8 +27,8 @@ import (
 	"strings"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
 	"golang.org/x/crypto/openpgp"
 )
 
diff --git a/pkg/keystore/keystore_test.go b/pkg/keystore/keystore_test.go
index 248385a712..5155fd51e0 100644
--- a/pkg/keystore/keystore_test.go
+++ b/pkg/keystore/keystore_test.go
@@ -33,7 +33,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/keystore/keystoretest"
+	"github.com/rkt/rkt/pkg/keystore/keystoretest"
 
 	"golang.org/x/crypto/openpgp/errors"
 )
diff --git a/pkg/label/label_selinux.go b/pkg/label/label_selinux.go
index 946c2b4f4b..3fc18436eb 100644
--- a/pkg/label/label_selinux.go
+++ b/pkg/label/label_selinux.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/coreos/rkt/pkg/selinux"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/selinux"
 )
 
 // InitLabels returns the process label and file labels to be used within
diff --git a/pkg/label/label_selinux_test.go b/pkg/label/label_selinux_test.go
index f3fcaa0a50..62e7320f20 100644
--- a/pkg/label/label_selinux_test.go
+++ b/pkg/label/label_selinux_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/selinux"
+	"github.com/rkt/rkt/pkg/selinux"
 )
 
 func TestInit(t *testing.T) {
diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index 9628292b57..250d833b60 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -29,13 +29,13 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/networking/netinfo"
-	"github.com/coreos/rkt/pkg/label"
-	"github.com/coreos/rkt/pkg/lock"
-	"github.com/coreos/rkt/pkg/sys"
 	"github.com/hashicorp/errwrap"
 	"github.com/pborman/uuid"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/networking/netinfo"
+	"github.com/rkt/rkt/pkg/label"
+	"github.com/rkt/rkt/pkg/lock"
+	"github.com/rkt/rkt/pkg/sys"
 )
 
 // Pod is the struct that reflects a pod and its lifecycle.
@@ -746,7 +746,7 @@ func getChildPID(ppid int) (int, error) {
 			return -1, err
 		}
 		if len(fi) == 0 {
-			// See https://github.com/coreos/rkt/issues/3109#issuecomment-242209246
+			// See https://github.com/rkt/rkt/issues/3109#issuecomment-242209246
 			continue
 		}
 		var pid64 int64
diff --git a/pkg/pod/pods_test.go b/pkg/pod/pods_test.go
index 6a6ecb088f..ae5cdd41a3 100644
--- a/pkg/pod/pods_test.go
+++ b/pkg/pod/pods_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/pkg/lock"
+	"github.com/rkt/rkt/pkg/lock"
 )
 
 func TestWalkPods(t *testing.T) {
diff --git a/pkg/pod/sandbox.go b/pkg/pod/sandbox.go
index 1014e5def2..5ca9b996fc 100644
--- a/pkg/pod/sandbox.go
+++ b/pkg/pod/sandbox.go
@@ -22,9 +22,9 @@ import (
 	"strconv"
 
 	"github.com/appc/spec/schema"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/lock"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/lock"
 )
 
 // ErrImmutable is the error that is returned by SandboxManifest if the pod is immutable,
diff --git a/pkg/pod/wait.go b/pkg/pod/wait.go
index 2bc3268004..aa531dacd7 100644
--- a/pkg/pod/wait.go
+++ b/pkg/pod/wait.go
@@ -17,7 +17,7 @@ package pod
 import (
 	"time"
 
-	"github.com/coreos/rkt/pkg/lock"
+	"github.com/rkt/rkt/pkg/lock"
 
 	"golang.org/x/net/context"
 )
diff --git a/pkg/selinux/selinux.go b/pkg/selinux/selinux.go
index a1b182a965..5e039dbf63 100644
--- a/pkg/selinux/selinux.go
+++ b/pkg/selinux/selinux.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/coreos/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/fileutil"
 )
 
 const (
diff --git a/pkg/selinux/selinux_test.go b/pkg/selinux/selinux_test.go
index f0e6781b10..d5bb747c1f 100644
--- a/pkg/selinux/selinux_test.go
+++ b/pkg/selinux/selinux_test.go
@@ -24,7 +24,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/selinux"
+	"github.com/rkt/rkt/pkg/selinux"
 )
 
 func TestSetfilecon(t *testing.T) {
diff --git a/pkg/tar/chroot.go b/pkg/tar/chroot.go
index 175f213a6c..f30a6f768e 100644
--- a/pkg/tar/chroot.go
+++ b/pkg/tar/chroot.go
@@ -26,10 +26,10 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/coreos/rkt/pkg/multicall"
-	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/pkg/user"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/multicall"
+	"github.com/rkt/rkt/pkg/sys"
+	"github.com/rkt/rkt/pkg/user"
 )
 
 const (
diff --git a/pkg/tar/tar.go b/pkg/tar/tar.go
index a7d4f09cc5..ffae92132e 100644
--- a/pkg/tar/tar.go
+++ b/pkg/tar/tar.go
@@ -27,8 +27,8 @@ import (
 	"syscall"
 
 	"github.com/appc/spec/pkg/device"
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/user"
 )
 
 const DEFAULT_DIR_MODE os.FileMode = 0755
diff --git a/pkg/tar/tar_test.go b/pkg/tar/tar_test.go
index 54d2414bd3..48f6be9ed8 100644
--- a/pkg/tar/tar_test.go
+++ b/pkg/tar/tar_test.go
@@ -27,9 +27,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/pkg/multicall"
-	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/pkg/multicall"
+	"github.com/rkt/rkt/pkg/sys"
+	"github.com/rkt/rkt/pkg/user"
 )
 
 func init() {
diff --git a/pkg/user/resolver.go b/pkg/user/resolver.go
index 5a4206b7f1..aef0267975 100644
--- a/pkg/user/resolver.go
+++ b/pkg/user/resolver.go
@@ -22,9 +22,9 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/coreos/rkt/pkg/group"
-	"github.com/coreos/rkt/pkg/passwd"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/group"
+	"github.com/rkt/rkt/pkg/passwd"
 )
 
 // Resolver defines the interface for resolving a UID/GID.
diff --git a/pkg/user/resolver_test.go b/pkg/user/resolver_test.go
index db97a475d2..dffc40d52c 100644
--- a/pkg/user/resolver_test.go
+++ b/pkg/user/resolver_test.go
@@ -23,7 +23,7 @@ import (
 
 	osuser "os/user"
 
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/pkg/user"
 )
 
 const (
diff --git a/rkt/api_service.go b/rkt/api_service.go
index ce5335a139..d932c53501 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -30,15 +30,15 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/activation"
-	"github.com/coreos/rkt/api/v1alpha"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/cgroup/v1"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/pkg/set"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/version"
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/golang-lru"
+	"github.com/rkt/rkt/api/v1alpha"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/cgroup/v1"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/pkg/set"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/version"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -359,7 +359,7 @@ func getPodCgroup(p *pkgPod.Pod, pid int) (string, error) {
 	}
 	// If the stage1 systemd > v226, it will put the PID1 into "init.scope"
 	// implicit scope unit in the root slice.
-	// See https://github.com/coreos/rkt/pull/2331#issuecomment-203540543
+	// See https://github.com/rkt/rkt/pull/2331#issuecomment-203540543
 	//
 	// TODO(yifan): Revisit this when using unified cgroup hierarchy.
 	cgroup = strings.TrimSuffix(cgroup, "/init.scope")
diff --git a/rkt/api_service_sdjournal.go b/rkt/api_service_sdjournal.go
index fbb4e517d5..5597543082 100644
--- a/rkt/api_service_sdjournal.go
+++ b/rkt/api_service_sdjournal.go
@@ -23,9 +23,9 @@ import (
 	"time"
 
 	"github.com/coreos/go-systemd/sdjournal"
-	"github.com/coreos/rkt/api/v1alpha"
-	"github.com/coreos/rkt/common"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
+	"github.com/rkt/rkt/api/v1alpha"
+	"github.com/rkt/rkt/common"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 )
 
 func (s *v1AlphaAPIServer) constrainedGetLogs(request *v1alpha.GetLogsRequest, server v1alpha.PublicAPI_GetLogsServer) error {
diff --git a/rkt/api_service_stub.go b/rkt/api_service_stub.go
index 5a1c743fcf..0b3d085673 100644
--- a/rkt/api_service_stub.go
+++ b/rkt/api_service_stub.go
@@ -19,7 +19,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/coreos/rkt/api/v1alpha"
+	"github.com/rkt/rkt/api/v1alpha"
 )
 
 func (s *v1AlphaAPIServer) constrainedGetLogs(request *v1alpha.GetLogsRequest, server v1alpha.PublicAPI_GetLogsServer) error {
diff --git a/rkt/api_service_test.go b/rkt/api_service_test.go
index fdfc1af588..b0a5e98c10 100644
--- a/rkt/api_service_test.go
+++ b/rkt/api_service_test.go
@@ -20,8 +20,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/api/v1alpha"
-	"github.com/coreos/rkt/pkg/log"
+	"github.com/rkt/rkt/api/v1alpha"
+	"github.com/rkt/rkt/pkg/log"
 )
 
 func TestFilterPod(t *testing.T) {
diff --git a/rkt/app.go b/rkt/app.go
index cca977a7d3..d9465aa65b 100644
--- a/rkt/app.go
+++ b/rkt/app.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/coreos/rkt/common"
+	"github.com/rkt/rkt/common"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/app_add.go b/rkt/app_add.go
index b2273a860c..86889ec215 100644
--- a/rkt/app_add.go
+++ b/rkt/app_add.go
@@ -17,12 +17,12 @@ package main
 import (
 	"fmt"
 
-	"github.com/coreos/rkt/common"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/rkt/image"
-	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
+	"github.com/rkt/rkt/common"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/rkt/image"
+	"github.com/rkt/rkt/stage0"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 
 	"github.com/spf13/cobra"
 )
diff --git a/rkt/app_list.go b/rkt/app_list.go
index 87e1361edb..f429453a7c 100644
--- a/rkt/app_list.go
+++ b/rkt/app_list.go
@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"fmt"
 
-	rkt "github.com/coreos/rkt/lib"
+	rkt "github.com/rkt/rkt/lib"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/app_rm.go b/rkt/app_rm.go
index 433953ba14..e892ee597e 100644
--- a/rkt/app_rm.go
+++ b/rkt/app_rm.go
@@ -17,8 +17,8 @@ package main
 import (
 	"fmt"
 
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/stage0"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/stage0"
 
 	"github.com/appc/spec/schema/types"
 	"github.com/spf13/cobra"
diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
index db84e559f5..cfe585eb8b 100644
--- a/rkt/app_sandbox.go
+++ b/rkt/app_sandbox.go
@@ -21,14 +21,14 @@ import (
 	"strings"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/label"
-	"github.com/coreos/rkt/pkg/lock"
-	"github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/label"
+	"github.com/rkt/rkt/pkg/lock"
+	"github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/pkg/user"
+	"github.com/rkt/rkt/stage0"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/app_start.go b/rkt/app_start.go
index c9d5ad0375..4b206174bc 100644
--- a/rkt/app_start.go
+++ b/rkt/app_start.go
@@ -17,8 +17,8 @@ package main
 import (
 	"fmt"
 
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/stage0"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/stage0"
 
 	"github.com/appc/spec/schema/types"
 	"github.com/spf13/cobra"
diff --git a/rkt/app_status.go b/rkt/app_status.go
index bd91c22a1a..c9c806769b 100644
--- a/rkt/app_status.go
+++ b/rkt/app_status.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	rkt "github.com/coreos/rkt/lib"
+	rkt "github.com/rkt/rkt/lib"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/app_stop.go b/rkt/app_stop.go
index 327c12f737..75079882af 100644
--- a/rkt/app_stop.go
+++ b/rkt/app_stop.go
@@ -17,8 +17,8 @@ package main
 import (
 	"fmt"
 
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/stage0"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/stage0"
 
 	"github.com/appc/spec/schema/types"
 	"github.com/spf13/cobra"
diff --git a/rkt/attach.go b/rkt/attach.go
index 3a0e06d259..ab11bc1a5a 100644
--- a/rkt/attach.go
+++ b/rkt/attach.go
@@ -18,11 +18,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/coreos/rkt/common"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
+	"github.com/rkt/rkt/common"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/stage0"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/cat_manifest.go b/rkt/cat_manifest.go
index 567b5279d0..e7bad31e4d 100644
--- a/rkt/cat_manifest.go
+++ b/rkt/cat_manifest.go
@@ -17,7 +17,7 @@ package main
 import (
 	"encoding/json"
 
-	pkgPod "github.com/coreos/rkt/pkg/pod"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 2848e93523..b41c3e283f 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/coreos/rkt/common/apps"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common/apps"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/rkt/config/config.go b/rkt/config/config.go
index 2603adeecc..0fa2e6269f 100644
--- a/rkt/config/config.go
+++ b/rkt/config/config.go
@@ -25,8 +25,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/coreos/rkt/common"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
 )
 
 // Headerer is an interface for getting additional HTTP headers to use
diff --git a/rkt/enter.go b/rkt/enter.go
index 268068001b..0c5416d4aa 100644
--- a/rkt/enter.go
+++ b/rkt/enter.go
@@ -21,11 +21,11 @@ import (
 	"fmt"
 
 	"github.com/appc/spec/schema/types"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/stage0"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/export.go b/rkt/export.go
index 280aed3c4f..f9f8be7195 100644
--- a/rkt/export.go
+++ b/rkt/export.go
@@ -27,14 +27,14 @@ import (
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/overlay"
-	"github.com/coreos/rkt/pkg/mountinfo"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/overlay"
+	"github.com/rkt/rkt/pkg/mountinfo"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/pkg/user"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/fetch.go b/rkt/fetch.go
index 879578f0af..e35db4a79d 100644
--- a/rkt/fetch.go
+++ b/rkt/fetch.go
@@ -16,11 +16,11 @@ package main
 
 import (
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/apps"
-	"github.com/coreos/rkt/rkt/image"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/apps"
+	"github.com/rkt/rkt/rkt/image"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 
 	"github.com/spf13/cobra"
 )
diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index 28c5e12eb8..fbf101d95e 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -29,15 +29,15 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/aci"
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	dist "github.com/coreos/rkt/pkg/distribution"
-	"github.com/coreos/rkt/pkg/keystore"
-	"github.com/coreos/rkt/pkg/keystore/keystoretest"
-	"github.com/coreos/rkt/rkt/config"
-	rktflag "github.com/coreos/rkt/rkt/flag"
-	"github.com/coreos/rkt/rkt/image"
-	"github.com/coreos/rkt/store/imagestore"
+	"github.com/rkt/rkt/pkg/aci"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	dist "github.com/rkt/rkt/pkg/distribution"
+	"github.com/rkt/rkt/pkg/keystore"
+	"github.com/rkt/rkt/pkg/keystore/keystoretest"
+	"github.com/rkt/rkt/rkt/config"
+	rktflag "github.com/rkt/rkt/rkt/flag"
+	"github.com/rkt/rkt/rkt/image"
+	"github.com/rkt/rkt/store/imagestore"
 )
 
 type httpError struct {
diff --git a/rkt/flag/secflags.go b/rkt/flag/secflags.go
index 3f02b3d77e..94e44c4a00 100644
--- a/rkt/flag/secflags.go
+++ b/rkt/flag/secflags.go
@@ -17,7 +17,7 @@ package flag
 import (
 	"strings"
 
-	pkgflag "github.com/coreos/rkt/pkg/flag"
+	pkgflag "github.com/rkt/rkt/pkg/flag"
 )
 
 const (
diff --git a/rkt/gc.go b/rkt/gc.go
index 04e228c433..5e025bb96a 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -24,12 +24,12 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/coreos/rkt/common"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/stage0"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/help.go b/rkt/help.go
index 935322b998..9c5919a957 100644
--- a/rkt/help.go
+++ b/rkt/help.go
@@ -22,7 +22,7 @@ import (
 	"text/template"
 
 	"github.com/appc/spec/schema"
-	"github.com/coreos/rkt/version"
+	"github.com/rkt/rkt/version"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
diff --git a/rkt/image/asc.go b/rkt/image/asc.go
index b5dfc7eba2..1f478ce8ba 100644
--- a/rkt/image/asc.go
+++ b/rkt/image/asc.go
@@ -19,8 +19,8 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/store/imagestore"
 )
 
 // ascFetcher is an interface used by asc to get the desired signature
diff --git a/rkt/image/common.go b/rkt/image/common.go
index 29d5517ea5..734fc36718 100644
--- a/rkt/image/common.go
+++ b/rkt/image/common.go
@@ -23,14 +23,14 @@ import (
 	"strings"
 	"time"
 
-	dist "github.com/coreos/rkt/pkg/distribution"
-	"github.com/coreos/rkt/pkg/keystore"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	"github.com/coreos/rkt/rkt/config"
-	rktflag "github.com/coreos/rkt/rkt/flag"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
+	dist "github.com/rkt/rkt/pkg/distribution"
+	"github.com/rkt/rkt/pkg/keystore"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/rkt/config"
+	rktflag "github.com/rkt/rkt/rkt/flag"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 
 	"github.com/appc/spec/discovery"
 	"github.com/appc/spec/schema"
diff --git a/rkt/image/common_test.go b/rkt/image/common_test.go
index 22420d6777..0d6adee43a 100644
--- a/rkt/image/common_test.go
+++ b/rkt/image/common_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	dist "github.com/coreos/rkt/pkg/distribution"
+	dist "github.com/rkt/rkt/pkg/distribution"
 )
 
 func TestGuessAppcOrPath(t *testing.T) {
diff --git a/rkt/image/dockerfetcher.go b/rkt/image/dockerfetcher.go
index 12377ebe1f..405ef23aa2 100644
--- a/rkt/image/dockerfetcher.go
+++ b/rkt/image/dockerfetcher.go
@@ -24,10 +24,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/rkt/rkt/config"
-	rktflag "github.com/coreos/rkt/rkt/flag"
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/rkt/config"
+	rktflag "github.com/rkt/rkt/rkt/flag"
+	"github.com/rkt/rkt/store/imagestore"
 
 	docker2aci "github.com/appc/docker2aci/lib"
 	d2acommon "github.com/appc/docker2aci/lib/common"
diff --git a/rkt/image/fetcher.go b/rkt/image/fetcher.go
index 2c3fd3f6b4..02b27d377b 100644
--- a/rkt/image/fetcher.go
+++ b/rkt/image/fetcher.go
@@ -21,12 +21,12 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/apps"
-	dist "github.com/coreos/rkt/pkg/distribution"
-	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/apps"
+	dist "github.com/rkt/rkt/pkg/distribution"
+	"github.com/rkt/rkt/stage0"
+	"github.com/rkt/rkt/store/imagestore"
 
 	"github.com/appc/spec/discovery"
 	"github.com/appc/spec/schema/types"
@@ -282,7 +282,7 @@ func (f *Fetcher) fetchSingleImageByPath(path string, a *asc) (string, error) {
 
 // TODO(sgotti) I'm not sure setting default os and arch also for image
 // dependencies is correct since it may break noarch dependencies. Reference:
-// https://github.com/coreos/rkt/pull/2317
+// https://github.com/rkt/rkt/pull/2317
 func (db *distBundle) setAppDefaults() error {
 	app := db.dist.(*dist.Appc).App()
 	if _, ok := app.Labels["arch"]; !ok {
diff --git a/rkt/image/filefetcher.go b/rkt/image/filefetcher.go
index 6e3a16a4e6..250ca07ee0 100644
--- a/rkt/image/filefetcher.go
+++ b/rkt/image/filefetcher.go
@@ -20,10 +20,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/coreos/rkt/pkg/keystore"
-	rktflag "github.com/coreos/rkt/rkt/flag"
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/keystore"
+	rktflag "github.com/rkt/rkt/rkt/flag"
+	"github.com/rkt/rkt/store/imagestore"
 )
 
 // fileFetcher is used to fetch files from a local filesystem
diff --git a/rkt/image/finder.go b/rkt/image/finder.go
index 7abd33df49..b8d6e76d05 100644
--- a/rkt/image/finder.go
+++ b/rkt/image/finder.go
@@ -17,8 +17,8 @@ package image
 import (
 	"fmt"
 
-	"github.com/coreos/rkt/common/apps"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common/apps"
 
 	"github.com/appc/spec/schema/types"
 )
diff --git a/rkt/image/httpfetcher.go b/rkt/image/httpfetcher.go
index 20a5a5f885..5c77e8a5e1 100644
--- a/rkt/image/httpfetcher.go
+++ b/rkt/image/httpfetcher.go
@@ -20,12 +20,12 @@ import (
 	"net/url"
 	"time"
 
-	rktflag "github.com/coreos/rkt/rkt/flag"
+	rktflag "github.com/rkt/rkt/rkt/flag"
 
-	"github.com/coreos/rkt/pkg/keystore"
-	"github.com/coreos/rkt/rkt/config"
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/keystore"
+	"github.com/rkt/rkt/rkt/config"
+	"github.com/rkt/rkt/store/imagestore"
 )
 
 // httpFetcher is used to download images from http or https URLs.
diff --git a/rkt/image/httpops.go b/rkt/image/httpops.go
index 07b8644c7a..337781bd2f 100644
--- a/rkt/image/httpops.go
+++ b/rkt/image/httpops.go
@@ -21,9 +21,9 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/coreos/rkt/rkt/config"
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/rkt/config"
+	"github.com/rkt/rkt/store/imagestore"
 )
 
 // httpOps is a kind of facade around a downloader and a
diff --git a/rkt/image/io.go b/rkt/image/io.go
index e14ea24962..f75c7908ca 100644
--- a/rkt/image/io.go
+++ b/rkt/image/io.go
@@ -23,9 +23,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/coreos/rkt/pkg/lock"
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/lock"
+	"github.com/rkt/rkt/store/imagestore"
 
 	"github.com/coreos/ioprogress"
 )
diff --git a/rkt/image/namefetcher.go b/rkt/image/namefetcher.go
index 22db1e82db..023874adca 100644
--- a/rkt/image/namefetcher.go
+++ b/rkt/image/namefetcher.go
@@ -22,13 +22,13 @@ import (
 	"net/url"
 	"time"
 
-	rktflag "github.com/coreos/rkt/rkt/flag"
+	rktflag "github.com/rkt/rkt/rkt/flag"
 
-	"github.com/coreos/rkt/pkg/keystore"
-	"github.com/coreos/rkt/rkt/config"
-	"github.com/coreos/rkt/rkt/pubkey"
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/keystore"
+	"github.com/rkt/rkt/rkt/config"
+	"github.com/rkt/rkt/rkt/pubkey"
+	"github.com/rkt/rkt/store/imagestore"
 
 	"github.com/appc/spec/discovery"
 	pgperrors "golang.org/x/crypto/openpgp/errors"
diff --git a/rkt/image/resumablesession.go b/rkt/image/resumablesession.go
index d890e3648e..5baf2bd016 100644
--- a/rkt/image/resumablesession.go
+++ b/rkt/image/resumablesession.go
@@ -26,8 +26,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/rkt/rkt/config"
-	"github.com/coreos/rkt/version"
+	"github.com/rkt/rkt/rkt/config"
+	"github.com/rkt/rkt/version"
 )
 
 // statusAcceptedError is an error returned when resumableSession
diff --git a/rkt/image/validator.go b/rkt/image/validator.go
index 78e1aa2d7b..9ea264d572 100644
--- a/rkt/image/validator.go
+++ b/rkt/image/validator.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/coreos/rkt/pkg/keystore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/keystore"
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema"
diff --git a/rkt/image_cat_manifest.go b/rkt/image_cat_manifest.go
index 525f06aded..1b7f3eec8a 100644
--- a/rkt/image_cat_manifest.go
+++ b/rkt/image_cat_manifest.go
@@ -17,7 +17,7 @@ package main
 import (
 	"encoding/json"
 
-	"github.com/coreos/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/imagestore"
 
 	"github.com/spf13/cobra"
 )
diff --git a/rkt/image_cmd_common.go b/rkt/image_cmd_common.go
index 88f7fcda8d..175957549c 100644
--- a/rkt/image_cmd_common.go
+++ b/rkt/image_cmd_common.go
@@ -18,8 +18,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/store/imagestore"
 
 	"github.com/appc/spec/discovery"
 	"github.com/appc/spec/schema/types"
diff --git a/rkt/image_export.go b/rkt/image_export.go
index c3a2fa532a..3ecd4ab196 100644
--- a/rkt/image_export.go
+++ b/rkt/image_export.go
@@ -19,7 +19,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/coreos/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/imagestore"
 
 	"github.com/spf13/cobra"
 )
diff --git a/rkt/image_extract.go b/rkt/image_extract.go
index 6e5693d2a7..92b46958e8 100644
--- a/rkt/image_extract.go
+++ b/rkt/image_extract.go
@@ -20,10 +20,10 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/tar"
-	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/store/imagestore"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/tar"
+	"github.com/rkt/rkt/pkg/user"
+	"github.com/rkt/rkt/store/imagestore"
 
 	"github.com/spf13/cobra"
 )
diff --git a/rkt/image_gc.go b/rkt/image_gc.go
index ca02458285..1de666e8ad 100644
--- a/rkt/image_gc.go
+++ b/rkt/image_gc.go
@@ -20,12 +20,12 @@ import (
 	"time"
 
 	"github.com/appc/spec/schema"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/lock"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/lock"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/image_list.go b/rkt/image_list.go
index 19ddcceed3..f3acac7c40 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -21,13 +21,13 @@ import (
 	"strings"
 	"time"
 
-	rktlib "github.com/coreos/rkt/lib"
-	rktflag "github.com/coreos/rkt/pkg/flag"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/dustin/go-humanize"
+	rktlib "github.com/rkt/rkt/lib"
+	rktflag "github.com/rkt/rkt/pkg/flag"
+	"github.com/rkt/rkt/store/imagestore"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/lastditch"
+	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/image_render.go b/rkt/image_render.go
index 7c518ffe92..defccb53f3 100644
--- a/rkt/image_render.go
+++ b/rkt/image_render.go
@@ -20,10 +20,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/user"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 
 	"github.com/spf13/cobra"
 )
diff --git a/rkt/image_rm.go b/rkt/image_rm.go
index 38acafbd6e..fb32d8abec 100644
--- a/rkt/image_rm.go
+++ b/rkt/image_rm.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/coreos/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/imagestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/list.go b/rkt/list.go
index df0e5e0921..dc8e8019dc 100644
--- a/rkt/list.go
+++ b/rkt/list.go
@@ -26,11 +26,11 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/lastditch"
 	"github.com/appc/spec/schema/types"
-	lib "github.com/coreos/rkt/lib"
-	"github.com/coreos/rkt/networking/netinfo"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/dustin/go-humanize"
 	"github.com/hashicorp/errwrap"
+	lib "github.com/rkt/rkt/lib"
+	"github.com/rkt/rkt/networking/netinfo"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/main.go b/rkt/main.go
index 8e6cfd3c70..d0605f6d15 100644
--- a/rkt/main.go
+++ b/rkt/main.go
@@ -17,7 +17,7 @@ package main
 import (
 	"os"
 
-	"github.com/coreos/rkt/pkg/multicall"
+	"github.com/rkt/rkt/pkg/multicall"
 )
 
 func main() {
diff --git a/rkt/metadata_service.go b/rkt/metadata_service.go
index 44e8f276d0..f47600483c 100644
--- a/rkt/metadata_service.go
+++ b/rkt/metadata_service.go
@@ -34,9 +34,9 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
 	"github.com/gorilla/mux"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 9827ce2c92..09b2ca3557 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -20,14 +20,14 @@ import (
 	"os"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/lock"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/rkt/image"
-	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/lock"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/pkg/user"
+	"github.com/rkt/rkt/rkt/image"
+	"github.com/rkt/rkt/stage0"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/pubkey/pubkey.go b/rkt/pubkey/pubkey.go
index 6ff4df9838..af04017f03 100644
--- a/rkt/pubkey/pubkey.go
+++ b/rkt/pubkey/pubkey.go
@@ -28,10 +28,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/rkt/pkg/keystore"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	"github.com/coreos/rkt/rkt/config"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/keystore"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/rkt/config"
 
 	"github.com/appc/spec/discovery"
 	"golang.org/x/crypto/openpgp"
diff --git a/rkt/rkt.go b/rkt/rkt.go
index 4208fcf356..ba5c6c5578 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -22,11 +22,11 @@ import (
 	"runtime/pprof"
 	"text/tabwriter"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/keystore"
-	"github.com/coreos/rkt/pkg/log"
-	"github.com/coreos/rkt/rkt/config"
-	rktflag "github.com/coreos/rkt/rkt/flag"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/keystore"
+	"github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/rkt/config"
+	rktflag "github.com/rkt/rkt/rkt/flag"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/rkt_test.go b/rkt/rkt_test.go
index 041c4a24eb..224ae6678e 100644
--- a/rkt/rkt_test.go
+++ b/rkt/rkt_test.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/log"
+	"github.com/rkt/rkt/pkg/log"
 )
 
 func TestCalculateDataDir(t *testing.T) {
diff --git a/rkt/rm.go b/rkt/rm.go
index 1fc8cb352d..0d7756636d 100644
--- a/rkt/rm.go
+++ b/rkt/rm.go
@@ -19,7 +19,7 @@ package main
 import (
 	"os"
 
-	pkgPod "github.com/coreos/rkt/pkg/pod"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/run.go b/rkt/run.go
index b3d0a9af5e..db89e25302 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -26,16 +26,16 @@ import (
 
 	"github.com/appc/spec/schema/types"
 	cnitypes "github.com/containernetworking/cni/pkg/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/label"
-	"github.com/coreos/rkt/pkg/lock"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/rkt/image"
-	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/label"
+	"github.com/rkt/rkt/pkg/lock"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/pkg/user"
+	"github.com/rkt/rkt/rkt/image"
+	"github.com/rkt/rkt/stage0"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index dbc6a5b0b3..19f976ac7e 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -17,11 +17,11 @@
 package main
 
 import (
-	"github.com/coreos/rkt/common"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/stage0"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
+	"github.com/rkt/rkt/common"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/stage0"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/stage1hash.go b/rkt/stage1hash.go
index 14c14438c7..ff3551b68b 100644
--- a/rkt/stage1hash.go
+++ b/rkt/stage1hash.go
@@ -22,11 +22,11 @@ import (
 	"strings"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/rkt/config"
-	"github.com/coreos/rkt/rkt/image"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/rkt/config"
+	"github.com/rkt/rkt/rkt/image"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/pflag"
 )
 
diff --git a/rkt/status.go b/rkt/status.go
index ee1708900b..7b00f669e7 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"time"
 
-	lib "github.com/coreos/rkt/lib"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
+	lib "github.com/rkt/rkt/lib"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )
diff --git a/rkt/stop.go b/rkt/stop.go
index 0d9ac814d3..b2e9c24951 100644
--- a/rkt/stop.go
+++ b/rkt/stop.go
@@ -19,9 +19,9 @@ package main
 import (
 	"fmt"
 
-	"github.com/coreos/rkt/stage0"
+	"github.com/rkt/rkt/stage0"
 
-	pkgPod "github.com/coreos/rkt/pkg/pod"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 	"github.com/spf13/cobra"
 )
 
diff --git a/rkt/trust.go b/rkt/trust.go
index b129c709c2..67cf4ed0a6 100644
--- a/rkt/trust.go
+++ b/rkt/trust.go
@@ -14,14 +14,14 @@
 
 //+build linux
 
-// implements https://github.com/coreos/rkt/issues/367
+// implements https://github.com/rkt/rkt/issues/367
 
 package main
 
 import (
 	"net/url"
 
-	"github.com/coreos/rkt/rkt/pubkey"
+	"github.com/rkt/rkt/rkt/pubkey"
 
 	"github.com/spf13/cobra"
 )
diff --git a/rkt/version.go b/rkt/version.go
index ab2232aae4..d53f62e727 100644
--- a/rkt/version.go
+++ b/rkt/version.go
@@ -18,7 +18,7 @@ import (
 	"runtime"
 
 	"github.com/appc/spec/schema"
-	"github.com/coreos/rkt/version"
+	"github.com/rkt/rkt/version"
 	"github.com/spf13/cobra"
 )
 
diff --git a/scripts/changelog.sh b/scripts/changelog.sh
index 65bab0d84d..e13d80a947 100755
--- a/scripts/changelog.sh
+++ b/scripts/changelog.sh
@@ -26,11 +26,11 @@ if [ ! -z "${GITHUB_AUTH}" ]; then
 fi
 
 for pr in $(git log --pretty=%s --first-parent "${RANGE}" | egrep -o '#\w+' | tr -d '#'); do
-    body=$(curl -s "${GITHUB_AUTH}" https://api.github.com/repos/coreos/rkt/pulls/"${pr}" | \
+    body=$(curl -s "${GITHUB_AUTH}" https://api.github.com/repos/rkt/rkt/pulls/"${pr}" | \
                   jq -r '{title: .title, body: .body}')
 
     echo "-" \
          "$(echo "${body}" | jq -r .title | sed 's/\.$//g')" \
-         "([#${pr}](https://github.com/coreos/rkt/pull/$pr))." \
+         "([#${pr}](https://github.com/rkt/rkt/pull/$pr))." \
          "$(echo "${body}" | jq -r .body | awk -v RS='\r\n\r\n' NR==1 | tr -d '\r')"
 done
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index 44f69f4d89..e74589f510 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -16,7 +16,7 @@ if ! [[ $(protoc --version) =~ "3.1.0" ]]; then
 fi
 
 export PATH=.:${PATH}
-cd $GOPATH/src/github.com/coreos/rkt
+cd $GOPATH/src/github.com/rkt/rkt
 
 echo "building protoc-gen-go"
 pushd vendor/github.com/golang/protobuf/protoc-gen-go
diff --git a/scripts/glide-update.sh b/scripts/glide-update.sh
index c918ad783d..e41f7e7e70 100755
--- a/scripts/glide-update.sh
+++ b/scripts/glide-update.sh
@@ -4,8 +4,8 @@
 #
 set -e
 
-if ! [[ "$PWD" = "$GOPATH/src/github.com/coreos/rkt" ]]; then
-  echo "must be run from \$GOPATH/src/github.com/coreos/rkt"
+if ! [[ "$PWD" = "$GOPATH/src/github.com/rkt/rkt" ]]; then
+  echo "must be run from \$GOPATH/src/github.com/rkt/rkt"
   exit 255
 fi
 
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 1f66c80a34..e4e6cd4f0c 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -21,8 +21,8 @@ apt-get install -y --no-install-recommends \
 curl -sSL https://coreos.com/dist/pubkeys/app-signing-pubkey.gpg | gpg2 --import -
 key=$(gpg2 --with-colons --keyid-format LONG -k security@coreos.com | egrep ^pub | cut -d ':' -f5)
 
-wget --progress=bar:force https://github.com/coreos/rkt/releases/download/v"${version}"/rkt-v"${version}".tar.gz
-wget --progress=bar:force https://github.com/coreos/rkt/releases/download/v"${version}"/rkt-v"${version}".tar.gz.asc
+wget --progress=bar:force https://github.com/rkt/rkt/releases/download/v"${version}"/rkt-v"${version}".tar.gz
+wget --progress=bar:force https://github.com/rkt/rkt/releases/download/v"${version}"/rkt-v"${version}".tar.gz.asc
 gpg2 --trusted-key "${key}" --verify-files *.asc
 
 tar xvzf rkt-v"${version}".tar.gz
diff --git a/scripts/pkg/build-pkgs.sh b/scripts/pkg/build-pkgs.sh
index 325e732bfe..b9d7b38a58 100755
--- a/scripts/pkg/build-pkgs.sh
+++ b/scripts/pkg/build-pkgs.sh
@@ -12,7 +12,7 @@ version=$1
 MAINTAINER=security@coreos.com
 LICENSE="APLv2"
 VENDOR="CoreOS, Inc."
-HOMEPAGE="https://www.github.com/coreos/rkt"
+HOMEPAGE="https://www.github.com/rkt/rkt"
 #iteration is the package version; bump if you need to repackage without
 #changing the rkt version
 ITERATION="${ITERATION:-1}" 
diff --git a/stage0/app_add.go b/stage0/app_add.go
index 41e7875d2e..e3c61c9776 100644
--- a/stage0/app_add.go
+++ b/stage0/app_add.go
@@ -23,11 +23,11 @@ import (
 	"path/filepath"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/apps"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
-	"github.com/coreos/rkt/pkg/user"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/apps"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+	"github.com/rkt/rkt/pkg/user"
 )
 
 type AddConfig struct {
diff --git a/stage0/app_rm.go b/stage0/app_rm.go
index 42fc207005..ba02a4bd37 100644
--- a/stage0/app_rm.go
+++ b/stage0/app_rm.go
@@ -25,9 +25,9 @@ import (
 	"syscall"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 )
 
 type RmConfig struct {
diff --git a/stage0/app_start.go b/stage0/app_start.go
index 07c71373db..b09a6fc8bb 100644
--- a/stage0/app_start.go
+++ b/stage0/app_start.go
@@ -22,9 +22,9 @@ import (
 	"os"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 )
 
 type StartConfig struct {
diff --git a/stage0/app_stop.go b/stage0/app_stop.go
index 8a9deb759d..165cfbc1d2 100644
--- a/stage0/app_stop.go
+++ b/stage0/app_stop.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	pkgPod "github.com/coreos/rkt/pkg/pod"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
 )
 
 type StopConfig struct {
diff --git a/stage0/common.go b/stage0/common.go
index 96fe269ae5..9a13791853 100644
--- a/stage0/common.go
+++ b/stage0/common.go
@@ -21,13 +21,14 @@ import (
 	"os/exec"
 	"path/filepath"
 
+	"strconv"
+
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/apps"
-	stage1types "github.com/coreos/rkt/stage1/common/types"
 	"github.com/hashicorp/errwrap"
-	"strconv"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/apps"
+	stage1types "github.com/rkt/rkt/stage1/common/types"
 )
 
 // CrossingEntrypoint represents a stage1 entrypoint whose execution
diff --git a/stage0/gc.go b/stage0/gc.go
index fe67283458..76552f2305 100644
--- a/stage0/gc.go
+++ b/stage0/gc.go
@@ -24,8 +24,8 @@ import (
 	"path/filepath"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
 )
 
 // GC enters the pod by fork/exec()ing the stage1's /gc similar to /init.
diff --git a/stage0/log.go b/stage0/log.go
index 645801e651..2754da9518 100644
--- a/stage0/log.go
+++ b/stage0/log.go
@@ -17,7 +17,7 @@ package stage0
 import (
 	"os"
 
-	rktlog "github.com/coreos/rkt/pkg/log"
+	rktlog "github.com/rkt/rkt/pkg/log"
 )
 
 var log *rktlog.Logger
diff --git a/stage0/manifest.go b/stage0/manifest.go
index 1392bed4e6..9c8056856d 100644
--- a/stage0/manifest.go
+++ b/stage0/manifest.go
@@ -24,8 +24,8 @@ import (
 	"strconv"
 
 	"github.com/appc/spec/schema"
-	"github.com/coreos/rkt/common"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
 )
 
 const (
diff --git a/stage0/registration.go b/stage0/registration.go
index c1e7d744bc..e91648fe1c 100644
--- a/stage0/registration.go
+++ b/stage0/registration.go
@@ -32,7 +32,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 
-	"github.com/coreos/rkt/common"
+	"github.com/rkt/rkt/common"
 )
 
 const (
@@ -47,7 +47,7 @@ var errUnreachable = errors.New(`could not reach the metadata service.
 Make sure metadata service is currently running or use
 "rkt run --mds-register=false" to skip pod registration.
 For more information on running metadata service,
-see https://github.com/coreos/rkt/blob/master/Documentation/subcommands/metadata-service.md`)
+see https://github.com/rkt/rkt/blob/master/Documentation/subcommands/metadata-service.md`)
 
 // registerPod registers pod with metadata service.
 // Returns authentication token to be passed in the URL
diff --git a/stage0/run.go b/stage0/run.go
index f7f1ca5d35..17bc35c6a9 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -40,20 +40,20 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	cnitypes "github.com/containernetworking/cni/pkg/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/apps"
-	commonnet "github.com/coreos/rkt/common/networking"
-	"github.com/coreos/rkt/common/overlay"
-	"github.com/coreos/rkt/pkg/aci"
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/label"
-	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/pkg/tpm"
-	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
-	"github.com/coreos/rkt/version"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/apps"
+	commonnet "github.com/rkt/rkt/common/networking"
+	"github.com/rkt/rkt/common/overlay"
+	"github.com/rkt/rkt/pkg/aci"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/label"
+	"github.com/rkt/rkt/pkg/sys"
+	"github.com/rkt/rkt/pkg/tpm"
+	"github.com/rkt/rkt/pkg/user"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
+	"github.com/rkt/rkt/version"
 )
 
 var debugEnabled bool
diff --git a/stage0/stop.go b/stage0/stop.go
index 904fd82af7..12fa581d92 100644
--- a/stage0/stop.go
+++ b/stage0/stop.go
@@ -22,7 +22,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/coreos/rkt/common"
+	"github.com/rkt/rkt/common"
 
 	"github.com/appc/spec/schema/types"
 )
diff --git a/stage1/app_add/app_add.go b/stage1/app_add/app_add.go
index da9c06870d..48ddf079d9 100644
--- a/stage1/app_add/app_add.go
+++ b/stage1/app_add/app_add.go
@@ -29,13 +29,13 @@ import (
 	"syscall"
 
 	"github.com/coreos/go-systemd/unit"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/fs"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	stage1common "github.com/coreos/rkt/stage1/common"
-	stage1types "github.com/coreos/rkt/stage1/common/types"
-	stage1init "github.com/coreos/rkt/stage1/init/common"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/fs"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	stage1common "github.com/rkt/rkt/stage1/common"
+	stage1types "github.com/rkt/rkt/stage1/common/types"
+	stage1init "github.com/rkt/rkt/stage1/init/common"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/stage1/app_rm/app_rm.go b/stage1/app_rm/app_rm.go
index 0ac732d5c0..d4718cae94 100644
--- a/stage1/app_rm/app_rm.go
+++ b/stage1/app_rm/app_rm.go
@@ -25,13 +25,13 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/coreos/rkt/common"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	stage1common "github.com/coreos/rkt/stage1/common"
-	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+	"github.com/rkt/rkt/common"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	stage1common "github.com/rkt/rkt/stage1/common"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
 
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/pkg/mountinfo"
+	"github.com/rkt/rkt/pkg/mountinfo"
 )
 
 var (
diff --git a/stage1/app_start/app_start.go b/stage1/app_start/app_start.go
index e1e3b94f28..a73e9c722c 100644
--- a/stage1/app_start/app_start.go
+++ b/stage1/app_start/app_start.go
@@ -22,9 +22,9 @@ import (
 	"os"
 	"os/exec"
 
-	rktlog "github.com/coreos/rkt/pkg/log"
-	stage1common "github.com/coreos/rkt/stage1/common"
-	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	stage1common "github.com/rkt/rkt/stage1/common"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
 
 	"github.com/appc/spec/schema/types"
 )
diff --git a/stage1/app_stop/app_stop.go b/stage1/app_stop/app_stop.go
index b4e3feaa61..053fd55399 100644
--- a/stage1/app_stop/app_stop.go
+++ b/stage1/app_stop/app_stop.go
@@ -22,10 +22,10 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/coreos/rkt/common"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	stage1common "github.com/coreos/rkt/stage1/common"
-	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+	"github.com/rkt/rkt/common"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	stage1common "github.com/rkt/rkt/stage1/common"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
 
 	"github.com/appc/spec/schema/types"
 )
diff --git a/stage1/attach/attach.go b/stage1/attach/attach.go
index 499035cd4e..959d7e26b1 100644
--- a/stage1/attach/attach.go
+++ b/stage1/attach/attach.go
@@ -22,9 +22,9 @@ import (
 	"os/exec"
 
 	"github.com/appc/spec/schema/types"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	stage1common "github.com/coreos/rkt/stage1/common"
-	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	stage1common "github.com/rkt/rkt/stage1/common"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
 )
 
 var (
diff --git a/stage1/common/run.go b/stage1/common/run.go
index fdb148d47b..6da831a8a2 100644
--- a/stage1/common/run.go
+++ b/stage1/common/run.go
@@ -21,9 +21,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/sys"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/sys"
 )
 
 // WithClearedCloExec executes a given function in between setting and unsetting the close-on-exit flag
diff --git a/stage1/common/ssh/ssh.go b/stage1/common/ssh/ssh.go
index 9717113232..5a88919791 100644
--- a/stage1/common/ssh/ssh.go
+++ b/stage1/common/ssh/ssh.go
@@ -28,9 +28,9 @@ import (
 
 	"github.com/hashicorp/errwrap"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/networking/netinfo"
-	"github.com/coreos/rkt/pkg/lock"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/networking/netinfo"
+	"github.com/rkt/rkt/pkg/lock"
 )
 
 const (
diff --git a/stage1/common/types/pod.go b/stage1/common/types/pod.go
index 81dd38956e..36560cb420 100644
--- a/stage1/common/types/pod.go
+++ b/stage1/common/types/pod.go
@@ -21,8 +21,8 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/user"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/stage1/enter_kvm/enter_kvm.go b/stage1/enter_kvm/enter_kvm.go
index a842aab3a4..ab4b328328 100644
--- a/stage1/enter_kvm/enter_kvm.go
+++ b/stage1/enter_kvm/enter_kvm.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"os/user"
 
-	rktlog "github.com/coreos/rkt/pkg/log"
-	"github.com/coreos/rkt/stage1/common/ssh"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/stage1/common/ssh"
 )
 
 var (
diff --git a/stage1/gc/gc.go b/stage1/gc/gc.go
index c978c163b1..806a3a2547 100644
--- a/stage1/gc/gc.go
+++ b/stage1/gc/gc.go
@@ -31,11 +31,11 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/cgroup"
-	"github.com/coreos/rkt/common/cgroup/v1"
-	"github.com/coreos/rkt/networking"
-	rktlog "github.com/coreos/rkt/pkg/log"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/cgroup"
+	"github.com/rkt/rkt/common/cgroup/v1"
+	"github.com/rkt/rkt/networking"
+	rktlog "github.com/rkt/rkt/pkg/log"
 )
 
 const (
@@ -121,7 +121,7 @@ func gcNetworking(podID *types.UUID) error {
 func removeJournalLink(uuid *types.UUID) error {
 	// if the host runs systemd, we link the journal and set pod's machine-id
 	// as pod's UUID without the dashes in init.go:
-	// https://github.com/coreos/rkt/blob/95e6bc/stage1/init/init.go#L382
+	// https://github.com/rkt/rkt/blob/95e6bc/stage1/init/init.go#L382
 	machineID := strings.Replace(uuid.String(), "-", "", -1)
 	journalLink := filepath.Join("/var/log/journal", machineID)
 	err := os.Remove(journalLink)
diff --git a/stage1/init/common/app.go b/stage1/init/common/app.go
index c2a3fcacfc..e8b5b5f931 100644
--- a/stage1/init/common/app.go
+++ b/stage1/init/common/app.go
@@ -26,9 +26,9 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/cgroup"
-	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/cgroup"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
 )
 
 // preparedApp contains some internal state needed to actually run an app.
diff --git a/stage1/init/common/dns_config.go b/stage1/init/common/dns_config.go
index de78a65503..c6e8517e60 100644
--- a/stage1/init/common/dns_config.go
+++ b/stage1/init/common/dns_config.go
@@ -21,8 +21,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	_common "github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/fs"
+	_common "github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/fs"
 )
 
 /*
diff --git a/stage1/init/common/log.go b/stage1/init/common/log.go
index 978e82ca2f..fdfbca4817 100644
--- a/stage1/init/common/log.go
+++ b/stage1/init/common/log.go
@@ -17,7 +17,7 @@ package common
 import (
 	"io/ioutil"
 
-	rktlog "github.com/coreos/rkt/pkg/log"
+	rktlog "github.com/rkt/rkt/pkg/log"
 )
 
 var (
diff --git a/stage1/init/common/mount.go b/stage1/init/common/mount.go
index 0647c35427..e4a366133a 100644
--- a/stage1/init/common/mount.go
+++ b/stage1/init/common/mount.go
@@ -22,10 +22,10 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/fs"
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/fs"
+	"github.com/rkt/rkt/pkg/user"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/stage1/init/common/path.go b/stage1/init/common/path.go
index fb0426ada4..4a322cdb00 100644
--- a/stage1/init/common/path.go
+++ b/stage1/init/common/path.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/unit"
-	"github.com/coreos/rkt/common"
+	"github.com/rkt/rkt/common"
 )
 
 const (
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 664afd8d58..3473c3b0fa 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -29,17 +29,17 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/coreos/rkt/pkg/acl"
-	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
+	"github.com/rkt/rkt/pkg/acl"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/unit"
 	"github.com/hashicorp/errwrap"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/user"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/user"
 )
 
 const (
diff --git a/stage1/init/common/pod_test.go b/stage1/init/common/pod_test.go
index 288f214432..7f47769fca 100644
--- a/stage1/init/common/pod_test.go
+++ b/stage1/init/common/pod_test.go
@@ -21,7 +21,7 @@ import (
 	"regexp"
 	"testing"
 
-	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/stage1/init/common/seccomp.go b/stage1/init/common/seccomp.go
index 4f85353b4d..bda5cd9838 100644
--- a/stage1/init/common/seccomp.go
+++ b/stage1/init/common/seccomp.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strings"
 
-	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
 
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/unit"
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 8e3d8d6def..943dfd1007 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -28,9 +28,9 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/user"
-	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/user"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
 
 	"github.com/coreos/go-systemd/unit"
 	"github.com/hashicorp/errwrap"
diff --git a/stage1/init/init.go b/stage1/init/init.go
index d74c1907a8..cf1c60e552 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -40,24 +40,24 @@ import (
 	"github.com/godbus/dbus/introspect"
 	"github.com/hashicorp/errwrap"
 
-	stage1common "github.com/coreos/rkt/stage1/common"
-	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
-	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
-
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/cgroup"
-	"github.com/coreos/rkt/common/cgroup/v1"
-	"github.com/coreos/rkt/common/cgroup/v2"
-	commonnet "github.com/coreos/rkt/common/networking"
-	"github.com/coreos/rkt/networking"
-	pkgflag "github.com/coreos/rkt/pkg/flag"
-	"github.com/coreos/rkt/pkg/fs"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/stage1/init/kvm"
-	"github.com/coreos/rkt/stage1/init/kvm/hypervisor/hvlkvm"
-	"github.com/coreos/rkt/stage1/init/kvm/hypervisor/hvqemu"
+	stage1common "github.com/rkt/rkt/stage1/common"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
+
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/cgroup"
+	"github.com/rkt/rkt/common/cgroup/v1"
+	"github.com/rkt/rkt/common/cgroup/v2"
+	commonnet "github.com/rkt/rkt/common/networking"
+	"github.com/rkt/rkt/networking"
+	pkgflag "github.com/rkt/rkt/pkg/flag"
+	"github.com/rkt/rkt/pkg/fs"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/pkg/sys"
+	"github.com/rkt/rkt/pkg/user"
+	"github.com/rkt/rkt/stage1/init/kvm"
+	"github.com/rkt/rkt/stage1/init/kvm/hypervisor/hvlkvm"
+	"github.com/rkt/rkt/stage1/init/kvm/hypervisor/hvqemu"
 )
 
 const (
@@ -318,7 +318,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 		args = append(args, hvStartCmd...)
 
 		// lkvm requires $HOME to be defined,
-		// see https://github.com/coreos/rkt/issues/1393
+		// see https://github.com/rkt/rkt/issues/1393
 		if os.Getenv("HOME") == "" {
 			env = append(env, "HOME=/root")
 		}
diff --git a/stage1/init/kvm.go b/stage1/init/kvm.go
index b8fc9d27ed..989e22a2a9 100644
--- a/stage1/init/kvm.go
+++ b/stage1/init/kvm.go
@@ -26,13 +26,13 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/coreos/go-systemd/util"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/networking"
-	"github.com/coreos/rkt/pkg/mountinfo"
-	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
-	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
-	"github.com/coreos/rkt/stage1/init/kvm"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/networking"
+	"github.com/rkt/rkt/pkg/mountinfo"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
+	"github.com/rkt/rkt/stage1/init/kvm"
 )
 
 const journalDir = "/var/log/journal"
diff --git a/stage1/init/kvm/hypervisor/hvlkvm/lkvm_driver.go b/stage1/init/kvm/hypervisor/hvlkvm/lkvm_driver.go
index 0406e36b34..325d28e4fc 100644
--- a/stage1/init/kvm/hypervisor/hvlkvm/lkvm_driver.go
+++ b/stage1/init/kvm/hypervisor/hvlkvm/lkvm_driver.go
@@ -20,8 +20,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/coreos/rkt/stage1/init/kvm"
-	"github.com/coreos/rkt/stage1/init/kvm/hypervisor"
+	"github.com/rkt/rkt/stage1/init/kvm"
+	"github.com/rkt/rkt/stage1/init/kvm/hypervisor"
 )
 
 // StartCmd takes path to stage1, UUID of the pod, path to kernel, network
diff --git a/stage1/init/kvm/hypervisor/hvqemu/qemu_driver.go b/stage1/init/kvm/hypervisor/hvqemu/qemu_driver.go
index f120db14fe..4605e99044 100644
--- a/stage1/init/kvm/hypervisor/hvqemu/qemu_driver.go
+++ b/stage1/init/kvm/hypervisor/hvqemu/qemu_driver.go
@@ -20,8 +20,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/coreos/rkt/stage1/init/kvm"
-	"github.com/coreos/rkt/stage1/init/kvm/hypervisor"
+	"github.com/rkt/rkt/stage1/init/kvm"
+	"github.com/rkt/rkt/stage1/init/kvm/hypervisor"
 )
 
 // StartCmd takes path to stage1, name of the machine, path to kernel, network describers, memory in megabytes
diff --git a/stage1/init/kvm/log.go b/stage1/init/kvm/log.go
index 8caf970f9b..9de6a4654e 100644
--- a/stage1/init/kvm/log.go
+++ b/stage1/init/kvm/log.go
@@ -18,7 +18,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	rktlog "github.com/coreos/rkt/pkg/log"
+	rktlog "github.com/rkt/rkt/pkg/log"
 )
 
 var diag *rktlog.Logger
diff --git a/stage1/init/kvm/network.go b/stage1/init/kvm/network.go
index 2aaa420748..b05a6f1244 100644
--- a/stage1/init/kvm/network.go
+++ b/stage1/init/kvm/network.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/coreos/go-systemd/unit"
-	"github.com/coreos/rkt/networking"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/networking"
 )
 
 // GetNetworkDescriptions converts activeNets to netDescribers
diff --git a/stage1/iottymux/iottymux.go b/stage1/iottymux/iottymux.go
index 5d40a3ace7..8ba2e08170 100644
--- a/stage1/iottymux/iottymux.go
+++ b/stage1/iottymux/iottymux.go
@@ -33,9 +33,9 @@ import (
 
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/daemon"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
 	"github.com/kr/pty"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
 )
 
 var (
diff --git a/stage1/prepare-app/prepare-app.c b/stage1/prepare-app/prepare-app.c
index 0c9ba7dde1..a1bb7ab896 100644
--- a/stage1/prepare-app/prepare-app.c
+++ b/stage1/prepare-app/prepare-app.c
@@ -180,7 +180,7 @@ static void mount_sys(const char *root)
 	 * bind-mounts to control which files are read-only. To avoid
 	 * a quadratic progression, prepare-app does not bind mount
 	 * /sys recursively. See:
-	 * https://github.com/coreos/rkt/issues/2351 */
+	 * https://github.com/rkt/rkt/issues/2351 */
 	mount_at(root, &sys_bind);
 }
 
diff --git a/stage1/stop_kvm/stop_kvm.go b/stage1/stop_kvm/stop_kvm.go
index cd0cf5da5a..ecf251c482 100644
--- a/stage1/stop_kvm/stop_kvm.go
+++ b/stage1/stop_kvm/stop_kvm.go
@@ -23,8 +23,8 @@ import (
 	"os"
 	"syscall"
 
-	rktlog "github.com/coreos/rkt/pkg/log"
-	"github.com/coreos/rkt/stage1/common/ssh"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/stage1/common/ssh"
 )
 
 var (
diff --git a/stage1/usr_from_coreos/cache.sh b/stage1/usr_from_coreos/cache.sh
index 15fbfd5fcd..edcc0048a3 100755
--- a/stage1/usr_from_coreos/cache.sh
+++ b/stage1/usr_from_coreos/cache.sh
@@ -301,7 +301,7 @@ function do_wget() {
 	if [ "${quiet}" ]; then
 		# strip the working directory from output path, so we get
 		# something like build-rkt/tmp/coreos-common/pxe.img
-		# instead of /home/foo/projects/coreos/rkt/build-rkt/...
+		# instead of /home/foo/projects/rkt/rkt/build-rkt/...
 		short_out="${out#${PWD}/}"
 		printf '  %-12s %s\n' 'WGET' "${url} => ${short_out}"
 	fi
diff --git a/stage1_fly/enter/main.go b/stage1_fly/enter/main.go
index 66861525ac..19c47c75db 100644
--- a/stage1_fly/enter/main.go
+++ b/stage1_fly/enter/main.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"syscall"
 
-	rktlog "github.com/coreos/rkt/pkg/log"
+	rktlog "github.com/rkt/rkt/pkg/log"
 )
 
 var (
diff --git a/stage1_fly/gc/main.go b/stage1_fly/gc/main.go
index d54e0973f3..8fbc2d031f 100644
--- a/stage1_fly/gc/main.go
+++ b/stage1_fly/gc/main.go
@@ -19,8 +19,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/coreos/rkt/common"
-	rktlog "github.com/coreos/rkt/pkg/log"
+	"github.com/rkt/rkt/common"
+	rktlog "github.com/rkt/rkt/pkg/log"
 )
 
 var (
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 23036ddcbd..e3ac2943f3 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -29,17 +29,17 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/fileutil"
-	pkgflag "github.com/coreos/rkt/pkg/flag"
-	"github.com/coreos/rkt/pkg/fs"
-	rktlog "github.com/coreos/rkt/pkg/log"
-	"github.com/coreos/rkt/pkg/mountinfo"
-	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/pkg/user"
-	stage1common "github.com/coreos/rkt/stage1/common"
-	stage1commontypes "github.com/coreos/rkt/stage1/common/types"
-	stage1initcommon "github.com/coreos/rkt/stage1/init/common"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/fileutil"
+	pkgflag "github.com/rkt/rkt/pkg/flag"
+	"github.com/rkt/rkt/pkg/fs"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/pkg/mountinfo"
+	"github.com/rkt/rkt/pkg/sys"
+	"github.com/rkt/rkt/pkg/user"
+	stage1common "github.com/rkt/rkt/stage1/common"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
 )
 
 const (
@@ -76,7 +76,7 @@ func parseFlags() *stage1commontypes.RuntimePod {
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
 
 	// The following flags need to be supported by stage1 according to
-	// https://github.com/coreos/rkt/blob/master/Documentation/devel/stage1-implementors-guide.md
+	// https://github.com/rkt/rkt/blob/master/Documentation/devel/stage1-implementors-guide.md
 	// Most of them are ignored
 	// These are ignored, but stage0 always passes them
 	flag.Var(&discardNetlist, "net", "Setup networking")
diff --git a/store/db/db.go b/store/db/db.go
index 502eb7b769..501c7f9c89 100644
--- a/store/db/db.go
+++ b/store/db/db.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/coreos/rkt/pkg/lock"
+	"github.com/rkt/rkt/pkg/lock"
 
 	_ "github.com/cznic/ql/driver"
 )
diff --git a/store/db/db_test.go b/store/db/db_test.go
index fd92640692..42962d6d8c 100644
--- a/store/db/db_test.go
+++ b/store/db/db_test.go
@@ -22,7 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func queryValue(query string, tx *sql.Tx) (int, error) {
diff --git a/store/imagestore/main_test.go b/store/imagestore/main_test.go
index 8a6c706b54..09402343bc 100644
--- a/store/imagestore/main_test.go
+++ b/store/imagestore/main_test.go
@@ -28,7 +28,7 @@ func interestingGoroutines() (gs []string) {
 			strings.Contains(stack, "created by testing.RunTests") ||
 			strings.Contains(stack, "testing.Main(") ||
 			strings.Contains(stack, "runtime.goexit") ||
-			strings.Contains(stack, "github.com/coreos/rkt/store/imagestore.interestingGoroutines") ||
+			strings.Contains(stack, "github.com/rkt/rkt/store/imagestore.interestingGoroutines") ||
 			strings.Contains(stack, "created by runtime.gc") ||
 			strings.Contains(stack, "runtime.MHeap_Scavenger") {
 			continue
diff --git a/store/imagestore/migrate_test.go b/store/imagestore/migrate_test.go
index 847d81536a..49555560b6 100644
--- a/store/imagestore/migrate_test.go
+++ b/store/imagestore/migrate_test.go
@@ -24,9 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/store/db"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/jonboulle/clockwork"
+	"github.com/rkt/rkt/store/db"
 )
 
 type testdb interface {
diff --git a/store/imagestore/store.go b/store/imagestore/store.go
index 31066baade..cc91614131 100644
--- a/store/imagestore/store.go
+++ b/store/imagestore/store.go
@@ -29,9 +29,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/coreos/rkt/pkg/backup"
-	"github.com/coreos/rkt/pkg/lock"
-	"github.com/coreos/rkt/store/db"
+	"github.com/rkt/rkt/pkg/backup"
+	"github.com/rkt/rkt/pkg/lock"
+	"github.com/rkt/rkt/store/db"
 
 	"github.com/appc/spec/aci"
 	"github.com/appc/spec/schema"
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index b1d8c71963..d63b6a307d 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -24,9 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/pkg/aci"
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	"github.com/coreos/rkt/pkg/multicall"
+	"github.com/rkt/rkt/pkg/aci"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	"github.com/rkt/rkt/pkg/multicall"
 
 	"github.com/appc/spec/schema/types"
 )
diff --git a/store/treestore/tree.go b/store/treestore/tree.go
index 7b6c75cfb1..1bdb6275c6 100644
--- a/store/treestore/tree.go
+++ b/store/treestore/tree.go
@@ -33,13 +33,13 @@ import (
 	"github.com/appc/spec/pkg/acirenderer"
 	"github.com/appc/spec/pkg/tarheader"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/pkg/aci"
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/pkg/lock"
-	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/pkg/user"
-	"github.com/coreos/rkt/store/imagestore"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/aci"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/pkg/lock"
+	"github.com/rkt/rkt/pkg/sys"
+	"github.com/rkt/rkt/pkg/user"
+	"github.com/rkt/rkt/store/imagestore"
 )
 
 const (
diff --git a/store/treestore/tree_test.go b/store/treestore/tree_test.go
index 44c975b325..18ad618852 100644
--- a/store/treestore/tree_test.go
+++ b/store/treestore/tree_test.go
@@ -21,10 +21,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/aci"
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	"github.com/coreos/rkt/pkg/sys"
-	"github.com/coreos/rkt/store/imagestore"
+	"github.com/rkt/rkt/pkg/aci"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	"github.com/rkt/rkt/pkg/sys"
+	"github.com/rkt/rkt/store/imagestore"
 )
 
 const tstprefix = "treestore-test"
diff --git a/tests/echo-socket-activated/echo-socket-activated.go b/tests/echo-socket-activated/echo-socket-activated.go
index 74c251b27d..7fe2fb40e2 100644
--- a/tests/echo-socket-activated/echo-socket-activated.go
+++ b/tests/echo-socket-activated/echo-socket-activated.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/coreos/rkt/pkg/sys"
+	"github.com/rkt/rkt/pkg/sys"
 )
 
 const (
diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index b95ffb988d..792189e371 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -34,10 +34,10 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/appc/spec/pkg/device"
-	"github.com/coreos/rkt/common/cgroup"
-	"github.com/coreos/rkt/common/cgroup/v1"
-	"github.com/coreos/rkt/common/cgroup/v2"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common/cgroup"
+	"github.com/rkt/rkt/common/cgroup/v1"
+	"github.com/rkt/rkt/common/cgroup/v2"
+	"github.com/rkt/rkt/tests/testutils"
 	"github.com/syndtr/gocapability/capability"
 )
 
diff --git a/tests/rkt_ace_validator_test.go b/tests/rkt_ace_validator_test.go
index c4876ee334..d8a8cc5276 100644
--- a/tests/rkt_ace_validator_test.go
+++ b/tests/rkt_ace_validator_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // Spin up the appc ACE validator pod and return the result.
diff --git a/tests/rkt_api_service_bench_test.go b/tests/rkt_api_service_bench_test.go
index a30dc96fb3..21991cc50d 100644
--- a/tests/rkt_api_service_bench_test.go
+++ b/tests/rkt_api_service_bench_test.go
@@ -23,8 +23,8 @@ import (
 	"testing"
 
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/api/v1alpha"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/api/v1alpha"
+	"github.com/rkt/rkt/tests/testutils"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index c16342d0f2..5de4390a7f 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -31,9 +31,9 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/api/v1alpha"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/api/v1alpha"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/tests/testutils"
 	"golang.org/x/net/context"
 )
 
diff --git a/tests/rkt_app_isolator_nspawn_test.go b/tests/rkt_app_isolator_nspawn_test.go
index c0e6359526..17d8f63042 100644
--- a/tests/rkt_app_isolator_nspawn_test.go
+++ b/tests/rkt_app_isolator_nspawn_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestCgroups(t *testing.T) {
diff --git a/tests/rkt_app_isolator_test.go b/tests/rkt_app_isolator_test.go
index d5130dc048..d1bf7b3752 100644
--- a/tests/rkt_app_isolator_test.go
+++ b/tests/rkt_app_isolator_test.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/coreos/rkt/common/cgroup"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common/cgroup"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 const (
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index b17c00f7d6..1d61cac323 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Disabled on kvm due to https://github.com/coreos/rkt/issues/3382
+// Disabled on kvm due to https://github.com/rkt/rkt/issues/3382
 // +build !fly,!kvm
 
 package main
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestAppSandboxOneApp is a basic test for `rkt app` sandbox.
diff --git a/tests/rkt_attach_test.go b/tests/rkt_attach_test.go
index 0b303ccc83..325d796e67 100644
--- a/tests/rkt_attach_test.go
+++ b/tests/rkt_attach_test.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestAttachSmoke is a smoke test for rkt-attach. It exercises several
diff --git a/tests/rkt_auth_test.go b/tests/rkt_auth_test.go
index 4299b3bbf0..d8d4cc918d 100644
--- a/tests/rkt_auth_test.go
+++ b/tests/rkt_auth_test.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
-	taas "github.com/coreos/rkt/tests/testutils/aci-server"
+	"github.com/rkt/rkt/tests/testutils"
+	taas "github.com/rkt/rkt/tests/testutils/aci-server"
 )
 
 func TestAuthSanity(t *testing.T) {
diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index a25caa8edd..cc74e463d2 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 	"github.com/syndtr/gocapability/capability"
 )
 
diff --git a/tests/rkt_cat_manifest_test.go b/tests/rkt_cat_manifest_test.go
index ebc8b1b0c3..9d7eeafdc9 100644
--- a/tests/rkt_cat_manifest_test.go
+++ b/tests/rkt_cat_manifest_test.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestCatManifest tests 'rkt cat-manifest', it will:
diff --git a/tests/rkt_config_test.go b/tests/rkt_config_test.go
index a09584dfac..676eb53b1f 100644
--- a/tests/rkt_config_test.go
+++ b/tests/rkt_config_test.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 type basic struct {
diff --git a/tests/rkt_devices_test.go b/tests/rkt_devices_test.go
index a78f5ed821..5556d386bf 100644
--- a/tests/rkt_devices_test.go
+++ b/tests/rkt_devices_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestDevices(t *testing.T) {
diff --git a/tests/rkt_diagnostic_test.go b/tests/rkt_diagnostic_test.go
index 7f40c8cb15..43f5749430 100644
--- a/tests/rkt_diagnostic_test.go
+++ b/tests/rkt_diagnostic_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestDiagnostic(t *testing.T) {
diff --git a/tests/rkt_dns_test.go b/tests/rkt_dns_test.go
index e7287e217f..9a912ec71a 100644
--- a/tests/rkt_dns_test.go
+++ b/tests/rkt_dns_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestDNS is checking how rkt fills /etc/resolv.conf
diff --git a/tests/rkt_env_test.go b/tests/rkt_env_test.go
index fc244ca0ce..6a15c7a435 100644
--- a/tests/rkt_env_test.go
+++ b/tests/rkt_env_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 var envTests = []struct {
diff --git a/tests/rkt_error_output_test.go b/tests/rkt_error_output_test.go
index 35555e1394..61da4da707 100644
--- a/tests/rkt_error_output_test.go
+++ b/tests/rkt_error_output_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestRktEnsureErrors(t *testing.T) {
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index cecac5e8b6..3749168340 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // stage1/prepare-app will populate /etc/hosts with a 127.0.0.1 entry when absent,
@@ -112,7 +112,7 @@ func TestEtcHosts(t *testing.T) {
 }
 
 // stage1/prepare-app will bind mount /proc/sys/kernel/hostname on /etc/hostname,
-// see https://github.com/coreos/rkt/issues/2657
+// see https://github.com/rkt/rkt/issues/2657
 var etcHostnameTests = []struct {
 	aciBuildArgs   []string
 	runArgs        []string
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index e8ad6378a8..781f9a343d 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	"github.com/rkt/rkt/tests/testutils"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/tests/rkt_exit_test.go b/tests/rkt_exit_test.go
index 3a77adae24..25d4c93f28 100644
--- a/tests/rkt_exit_test.go
+++ b/tests/rkt_exit_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestExitCodeSimple is testing a few exit codes on 1 pod containing just 1 app
@@ -82,6 +82,6 @@ func TestExitCodeWithSeveralApps(t *testing.T) {
 	checkAppStatus(t, ctx, true, "hello1", "status=5")
 	// Currently, hello2 should be stopped correctly (exit code 0) when hello1
 	// failed, so it cannot return its exit code 2. This might change with
-	// https://github.com/coreos/rkt/issues/1461
+	// https://github.com/rkt/rkt/issues/1461
 	checkAppStatus(t, ctx, true, "hello2", "status=0")
 }
diff --git a/tests/rkt_export_container_test.go b/tests/rkt_export_container_test.go
index 4b86d674bb..022ef12332 100644
--- a/tests/rkt_export_container_test.go
+++ b/tests/rkt_export_container_test.go
@@ -19,8 +19,8 @@ package main
 import (
 	"testing"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestExport(t *testing.T) {
diff --git a/tests/rkt_export_fly_test.go b/tests/rkt_export_fly_test.go
index 67577dfa3c..05eda0a401 100644
--- a/tests/rkt_export_fly_test.go
+++ b/tests/rkt_export_fly_test.go
@@ -19,8 +19,8 @@ package main
 import (
 	"testing"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestExport(t *testing.T) {
diff --git a/tests/rkt_export_test.go b/tests/rkt_export_test.go
index 3b959ebd80..2a5ed7de6f 100644
--- a/tests/rkt_export_test.go
+++ b/tests/rkt_export_test.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 const (
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 82f1c69997..fdfb2dfa6b 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -30,10 +30,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	"github.com/coreos/rkt/tests/testutils"
-	taas "github.com/coreos/rkt/tests/testutils/aci-server"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	"github.com/rkt/rkt/tests/testutils"
+	taas "github.com/rkt/rkt/tests/testutils/aci-server"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -113,7 +113,7 @@ func TestFetchAny(t *testing.T) {
 		{"--insecure-options=image --debug prepare", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
 		{"--insecure-options=image --debug prepare", "coreos.com/etcd:v2.1.2", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
 		// test --insecure-options=tls to make sure
-		// https://github.com/coreos/rkt/issues/1829 is not an issue anymore
+		// https://github.com/rkt/rkt/issues/1829 is not an issue anymore
 		{"--insecure-options=image,tls --debug prepare", "docker://busybox", "", "docker://busybox"},
 		{"--insecure-options=image --debug prepare", "docker://busybox:latest", "", "docker://busybox:latest"},
 	}
diff --git a/tests/rkt_fly_test.go b/tests/rkt_fly_test.go
index 7001a3580b..6e8de95257 100644
--- a/tests/rkt_fly_test.go
+++ b/tests/rkt_fly_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestFlyNetns(t *testing.T) {
diff --git a/tests/rkt_gc_nspawn_test.go b/tests/rkt_gc_nspawn_test.go
index 3c1b67ef81..cd0185840a 100644
--- a/tests/rkt_gc_nspawn_test.go
+++ b/tests/rkt_gc_nspawn_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func getPodCgroups(shortUUID string) ([]string, error) {
diff --git a/tests/rkt_gc_test.go b/tests/rkt_gc_test.go
index 3b86c776c1..dc2659978d 100644
--- a/tests/rkt_gc_test.go
+++ b/tests/rkt_gc_test.go
@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestGC(t *testing.T) {
diff --git a/tests/rkt_hostname_test.go b/tests/rkt_hostname_test.go
index a1c007feaa..bc54e3b407 100644
--- a/tests/rkt_hostname_test.go
+++ b/tests/rkt_hostname_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestHostname test that the --hostname option works.
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 0b28428fb3..cd15e0a0ed 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	"github.com/rkt/rkt/tests/testutils"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 74695088f2..4a879ae61e 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -23,10 +23,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	"github.com/coreos/rkt/tests/testutils"
-	taas "github.com/coreos/rkt/tests/testutils/aci-server"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	"github.com/rkt/rkt/tests/testutils"
+	taas "github.com/rkt/rkt/tests/testutils/aci-server"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -77,7 +77,7 @@ func generateComplexDependencyTree(t *testing.T, ctx *testutils.RktRunCtx) (map[
 	emptyImage := getEmptyImagePath()
 	fileSet := make(map[string]string)
 
-	// Scenario from https://github.com/coreos/rkt/issues/1752#issue-117121841
+	// Scenario from https://github.com/rkt/rkt/issues/1752#issue-117121841
 	//
 	// A->B
 	// A->C
@@ -183,7 +183,7 @@ func generateComplexDependencyTree(t *testing.T, ctx *testutils.RktRunCtx) (map[
 // fetches them via the discovery mechanism. Some dependencies are already
 // cached in the CAS, and some dependencies are fetched via the discovery
 // mechanism. This is to reproduce the scenario in explained in:
-// https://github.com/coreos/rkt/issues/1752#issue-117121841
+// https://github.com/rkt/rkt/issues/1752#issue-117121841
 func TestImageDependencies(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 25d180aa1c..1f59d7cbc4 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	"github.com/rkt/rkt/tests/testutils"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/tests/rkt_image_extract_test.go b/tests/rkt_image_extract_test.go
index 9381445345..2e186c7d9a 100644
--- a/tests/rkt_image_extract_test.go
+++ b/tests/rkt_image_extract_test.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestImageExtract tests 'rkt image extract', it will import some existing
diff --git a/tests/rkt_image_gc_test.go b/tests/rkt_image_gc_test.go
index 4c1d246d16..49bd0d1a61 100644
--- a/tests/rkt_image_gc_test.go
+++ b/tests/rkt_image_gc_test.go
@@ -24,8 +24,8 @@ import (
 	"testing"
 
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestImageGCTreeStore(t *testing.T) {
diff --git a/tests/rkt_image_list_test.go b/tests/rkt_image_list_test.go
index 54d4f383e1..b29f5b58e3 100644
--- a/tests/rkt_image_list_test.go
+++ b/tests/rkt_image_list_test.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 type ImageID struct {
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 104a66dad9..8caa102d3d 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	"github.com/rkt/rkt/tests/testutils"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/tests/rkt_image_rm_test.go b/tests/rkt_image_rm_test.go
index 3b6321e3c0..aca5d268e0 100644
--- a/tests/rkt_image_rm_test.go
+++ b/tests/rkt_image_rm_test.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 const (
diff --git a/tests/rkt_interactive_test.go b/tests/rkt_interactive_test.go
index d00902dd11..6f9d148502 100644
--- a/tests/rkt_interactive_test.go
+++ b/tests/rkt_interactive_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 var interactiveTests = []struct {
diff --git a/tests/rkt_journal_test.go b/tests/rkt_journal_test.go
index 127f0f990f..ca9e537c70 100644
--- a/tests/rkt_journal_test.go
+++ b/tests/rkt_journal_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	sd_util "github.com/coreos/go-systemd/util"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 const journalDir = "/var/log/journal"
diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index 084a22025d..881aaa941b 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 const delta = 4 * time.Second
diff --git a/tests/rkt_metadata_service_test.go b/tests/rkt_metadata_service_test.go
index a11ce11d0f..067ec61a07 100644
--- a/tests/rkt_metadata_service_test.go
+++ b/tests/rkt_metadata_service_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // Launch an app that polls the Annotations metadata
diff --git a/tests/rkt_mount_overlay_test.go b/tests/rkt_mount_overlay_test.go
index 498730b37c..f707a1f868 100644
--- a/tests/rkt_mount_overlay_test.go
+++ b/tests/rkt_mount_overlay_test.go
@@ -22,8 +22,8 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/common/overlay"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/common/overlay"
 )
 
 func overlayMount(cfg overlay.MountCfg) error {
diff --git a/tests/rkt_mount_test.go b/tests/rkt_mount_test.go
index 7c09ebc7f5..2b3c650bf2 100644
--- a/tests/rkt_mount_test.go
+++ b/tests/rkt_mount_test.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestMountSymlink(t *testing.T) {
diff --git a/tests/rkt_mountns_test.go b/tests/rkt_mountns_test.go
index d7bdf98a92..fdaf9848f2 100644
--- a/tests/rkt_mountns_test.go
+++ b/tests/rkt_mountns_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestMountNSApp(t *testing.T) {
diff --git a/tests/rkt_mtab_test.go b/tests/rkt_mtab_test.go
index c3ac85ee1b..0ae76dfc2c 100644
--- a/tests/rkt_mtab_test.go
+++ b/tests/rkt_mtab_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestMtabExistence tests the happy path for the creation of the /etc/mtab
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index c74bdcb0c9..fb775aa8ac 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -29,10 +29,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/networking/netinfo"
-	"github.com/coreos/rkt/pkg/fileutil"
-	"github.com/coreos/rkt/tests/testutils"
-	"github.com/coreos/rkt/tests/testutils/logger"
+	"github.com/rkt/rkt/networking/netinfo"
+	"github.com/rkt/rkt/pkg/fileutil"
+	"github.com/rkt/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils/logger"
 	"github.com/vishvananda/netlink"
 )
 
diff --git a/tests/rkt_no_new_privs_test.go b/tests/rkt_no_new_privs_test.go
index 2f4920bfa6..54b90bd673 100644
--- a/tests/rkt_no_new_privs_test.go
+++ b/tests/rkt_no_new_privs_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestNoNewPrivileges(t *testing.T) {
diff --git a/tests/rkt_non_root_test.go b/tests/rkt_non_root_test.go
index 9f6de05dca..40dcd3c8e2 100644
--- a/tests/rkt_non_root_test.go
+++ b/tests/rkt_non_root_test.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestNonRootReadInfo tests that non-root users that can do rkt list, rkt image list.
diff --git a/tests/rkt_oom_score_adj_test.go b/tests/rkt_oom_score_adj_test.go
index ae6adc8012..08a2464859 100644
--- a/tests/rkt_oom_score_adj_test.go
+++ b/tests/rkt_oom_score_adj_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestOOMScoreAdjust(t *testing.T) {
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index f76aa1c702..2945fae6cd 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/pkg/aci/acitest"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/pkg/aci/acitest"
+	"github.com/rkt/rkt/tests/testutils"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/tests/rkt_paths_test.go b/tests/rkt_paths_test.go
index 6c1d19f4ee..607b13a627 100644
--- a/tests/rkt_paths_test.go
+++ b/tests/rkt_paths_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestPathsWrite checks whether access to paths like /proc/sysrq-trigger are
@@ -90,7 +90,7 @@ func TestPathsWrite(t *testing.T) {
 
 // TestProcPathsStat checks that access to inaccessible paths under
 // /proc or /sys is correctly restricted:
-// https://github.com/coreos/rkt/issues/2484
+// https://github.com/rkt/rkt/issues/2484
 func TestProcPathsStat(t *testing.T) {
 	tests := []struct {
 		Path         string
diff --git a/tests/rkt_pid_file_test.go b/tests/rkt_pid_file_test.go
index f8b558ee08..0ea44fe0d6 100644
--- a/tests/rkt_pid_file_test.go
+++ b/tests/rkt_pid_file_test.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func preparePidFileRace(t *testing.T, ctx *testutils.RktRunCtx, pidFileName, sleepImage string) (*gexpect.ExpectSubprocess, *gexpect.ExpectSubprocess, string, string) {
diff --git a/tests/rkt_prepare_test.go b/tests/rkt_prepare_test.go
index 538f5e9c0a..e797f0f924 100644
--- a/tests/rkt_prepare_test.go
+++ b/tests/rkt_prepare_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestPrepareConflictingFlags tests that 'rkt prepare' will complain and abort
diff --git a/tests/rkt_rm_nspawn_test.go b/tests/rkt_rm_nspawn_test.go
index 6326241fe1..38336f20d6 100644
--- a/tests/rkt_rm_nspawn_test.go
+++ b/tests/rkt_rm_nspawn_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestRmCgroup(t *testing.T) {
diff --git a/tests/rkt_rm_test.go b/tests/rkt_rm_test.go
index ff917e5a4f..8bdc4af8c4 100644
--- a/tests/rkt_rm_test.go
+++ b/tests/rkt_rm_test.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestRm(t *testing.T) {
diff --git a/tests/rkt_root_commands_test.go b/tests/rkt_root_commands_test.go
index 805cda11a4..6b90b9ae16 100644
--- a/tests/rkt_root_commands_test.go
+++ b/tests/rkt_root_commands_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 var rootRequiringCommands = []string{
diff --git a/tests/rkt_run_pod_manifest_test.go b/tests/rkt_run_pod_manifest_test.go
index 278f6cff80..415f4268d9 100644
--- a/tests/rkt_run_pod_manifest_test.go
+++ b/tests/rkt_run_pod_manifest_test.go
@@ -24,10 +24,10 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 	"github.com/syndtr/gocapability/capability"
 
-	"github.com/coreos/rkt/common/cgroup"
+	"github.com/rkt/rkt/common/cgroup"
 )
 
 func intP(i int) *int {
diff --git a/tests/rkt_run_test.go b/tests/rkt_run_test.go
index 6d321bb20e..54921106e0 100644
--- a/tests/rkt_run_test.go
+++ b/tests/rkt_run_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestRunConflictingFlags tests that 'rkt run' will complain and abort
diff --git a/tests/rkt_run_user_group_test.go b/tests/rkt_run_user_group_test.go
index 8e69a1dd7d..e0e1d8a659 100644
--- a/tests/rkt_run_user_group_test.go
+++ b/tests/rkt_run_user_group_test.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestAppUserGroup(t *testing.T) {
diff --git a/tests/rkt_seccomp_test.go b/tests/rkt_seccomp_test.go
index 1458ccdf1f..3050a44280 100644
--- a/tests/rkt_seccomp_test.go
+++ b/tests/rkt_seccomp_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 const (
diff --git a/tests/rkt_service_file_test.go b/tests/rkt_service_file_test.go
index 3f7cc98a17..3f345a6789 100644
--- a/tests/rkt_service_file_test.go
+++ b/tests/rkt_service_file_test.go
@@ -26,7 +26,7 @@ import (
 
 	sd_dbus "github.com/coreos/go-systemd/dbus"
 	sd_util "github.com/coreos/go-systemd/util"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestServiceFile(t *testing.T) {
diff --git a/tests/rkt_socket_activation_test.go b/tests/rkt_socket_activation_test.go
index 33985b6b62..73b3ca4829 100644
--- a/tests/rkt_socket_activation_test.go
+++ b/tests/rkt_socket_activation_test.go
@@ -31,7 +31,7 @@ import (
 
 	sd_dbus "github.com/coreos/go-systemd/dbus"
 	sd_util "github.com/coreos/go-systemd/util"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func randomFreePort(t *testing.T) (int, error) {
diff --git a/tests/rkt_socket_proxyd_test.go b/tests/rkt_socket_proxyd_test.go
index 78c361d4d0..b04e5f5f32 100644
--- a/tests/rkt_socket_proxyd_test.go
+++ b/tests/rkt_socket_proxyd_test.go
@@ -29,13 +29,13 @@ import (
 
 	sd_dbus "github.com/coreos/go-systemd/dbus"
 	sd_util "github.com/coreos/go-systemd/util"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 	"github.com/vishvananda/netlink"
 )
 
 func TestSocketProxyd(t *testing.T) {
 	// Skip the test for now. See
-	// https://github.com/coreos/rkt/issues/2432#issuecomment-238858840 for
+	// https://github.com/rkt/rkt/issues/2432#issuecomment-238858840 for
 	// details.
 	t.Skip("this test is racy, let's skip it until we fix it")
 
diff --git a/tests/rkt_stage1_loading_test.go b/tests/rkt_stage1_loading_test.go
index 95bb3a32ff..a7e7f8ed91 100644
--- a/tests/rkt_stage1_loading_test.go
+++ b/tests/rkt_stage1_loading_test.go
@@ -27,9 +27,9 @@ import (
 	"testing"
 
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/rkt/config"
-	"github.com/coreos/rkt/tests/testutils"
-	taas "github.com/coreos/rkt/tests/testutils/aci-server"
+	"github.com/rkt/rkt/rkt/config"
+	"github.com/rkt/rkt/tests/testutils"
+	taas "github.com/rkt/rkt/tests/testutils/aci-server"
 )
 
 type stubStage1Reference int
diff --git a/tests/rkt_stop_test.go b/tests/rkt_stop_test.go
index 79f8ab2063..60524c68bf 100644
--- a/tests/rkt_stop_test.go
+++ b/tests/rkt_stop_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestRktStop(t *testing.T) {
diff --git a/tests/rkt_supplementary_gids_test.go b/tests/rkt_supplementary_gids_test.go
index 2c68edd9f7..a0a1070beb 100644
--- a/tests/rkt_supplementary_gids_test.go
+++ b/tests/rkt_supplementary_gids_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestSupplementaryGIDs(t *testing.T) {
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 00e3b18736..5747c12f80 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -38,11 +38,11 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/api/v1alpha"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/tests/testutils"
-	taas "github.com/coreos/rkt/tests/testutils/aci-server"
 	shellquote "github.com/kballard/go-shellquote"
+	"github.com/rkt/rkt/api/v1alpha"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/tests/testutils"
+	taas "github.com/rkt/rkt/tests/testutils/aci-server"
 	"google.golang.org/grpc"
 )
 
diff --git a/tests/rkt_trust_test.go b/tests/rkt_trust_test.go
index 132f93e25c..0c1963e8d1 100644
--- a/tests/rkt_trust_test.go
+++ b/tests/rkt_trust_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func runImage(t *testing.T, ctx *testutils.RktRunCtx, imageFile string, expected string, shouldFail bool) {
diff --git a/tests/rkt_userns_test.go b/tests/rkt_userns_test.go
index fcf8758688..6af9747066 100644
--- a/tests/rkt_userns_test.go
+++ b/tests/rkt_userns_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 var usernsTests = []struct {
@@ -45,7 +45,7 @@ var usernsTests = []struct {
 		"/proc/1/root/", // stage1 rootfs ($POD/stage1/rootfs)
 		"drwxr-xr-x",
 		"0",
-		"", // no check: it could be 0 but also the gid of 'rkt', see https://github.com/coreos/rkt/pull/1452
+		"", // no check: it could be 0 but also the gid of 'rkt', see https://github.com/rkt/rkt/pull/1452
 	},
 	// TODO test with overlay fs too. We don't test it for now because
 	// the Semaphore CI system doesn't support it.
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
index f965b74760..e74c26201f 100644
--- a/tests/rkt_volume_mount_test.go
+++ b/tests/rkt_volume_mount_test.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TODO: unite these tests with rkt_run_pod_manifest_test.go
diff --git a/tests/rkt_volume_nspawn_test.go b/tests/rkt_volume_nspawn_test.go
index fba011a743..7eeb129251 100644
--- a/tests/rkt_volume_nspawn_test.go
+++ b/tests/rkt_volume_nspawn_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 )
 
 func TestVolumes(t *testing.T) {
@@ -67,7 +67,7 @@ var volSysfsTests = []struct {
 
 // TestVolumeSysfs checks that sysfs is available for the apps, but only if
 // the app does not have mount points in /sys or a subdirectory.
-// See: https://github.com/coreos/rkt/issues/2874
+// See: https://github.com/rkt/rkt/issues/2874
 func TestVolumeSysfs(t *testing.T) {
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
diff --git a/tests/rkt_volume_test.go b/tests/rkt_volume_test.go
index 1690519f23..c0a46f6948 100644
--- a/tests/rkt_volume_test.go
+++ b/tests/rkt_volume_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/rkt/tests/testutils"
+	"github.com/rkt/rkt/tests/testutils"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
diff --git a/tests/stub-stage1/run/main.go b/tests/stub-stage1/run/main.go
index 8d2cb99378..43183f70c9 100644
--- a/tests/stub-stage1/run/main.go
+++ b/tests/stub-stage1/run/main.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/coreos/rkt/common"
-	"github.com/coreos/rkt/pkg/sys"
-	stage1common "github.com/coreos/rkt/stage1/common"
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/sys"
+	stage1common "github.com/rkt/rkt/stage1/common"
 )
 
 func main() {
diff --git a/tests/testutils/ctx.go b/tests/testutils/ctx.go
index 4120c4e384..688ad0b61e 100644
--- a/tests/testutils/ctx.go
+++ b/tests/testutils/ctx.go
@@ -24,7 +24,7 @@ import (
 	"syscall"
 
 	"github.com/coreos/gexpect"
-	"github.com/coreos/rkt/tests/testutils/logger"
+	"github.com/rkt/rkt/tests/testutils/logger"
 )
 
 // dirDesc structure manages one directory and provides an option for
diff --git a/tests/testutils/datadirsetup.go b/tests/testutils/datadirsetup.go
index 376ed22721..ac104fb5d6 100644
--- a/tests/testutils/datadirsetup.go
+++ b/tests/testutils/datadirsetup.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/coreos/rkt/pkg/group"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/pkg/group"
 )
 
 const casDbPerm = os.FileMode(0660)
diff --git a/tests/testutils/httputils.go b/tests/testutils/httputils.go
index e042e2cff2..8ae557e701 100644
--- a/tests/testutils/httputils.go
+++ b/tests/testutils/httputils.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/coreos/rkt/tests/testutils/logger"
 	"github.com/hydrogen18/stoppableListener"
+	"github.com/rkt/rkt/tests/testutils/logger"
 )
 
 func HTTPServe(addr string, timeout int) error {
diff --git a/tools/cleangen/main.go b/tools/cleangen/main.go
index 35a9f8e2d7..7876b9e366 100644
--- a/tools/cleangen/main.go
+++ b/tools/cleangen/main.go
@@ -20,8 +20,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/coreos/rkt/tools/common"
-	"github.com/coreos/rkt/tools/common/filelist"
+	"github.com/rkt/rkt/tools/common"
+	"github.com/rkt/rkt/tools/common/filelist"
 )
 
 type mkPair struct {
diff --git a/tools/depsgen/globcmd.go b/tools/depsgen/globcmd.go
index a54bd22b72..9050e0dccf 100644
--- a/tools/depsgen/globcmd.go
+++ b/tools/depsgen/globcmd.go
@@ -20,9 +20,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/coreos/rkt/tools/common"
-	"github.com/coreos/rkt/tools/common/filelist"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/tools/common"
+	"github.com/rkt/rkt/tools/common/filelist"
 )
 
 const (
diff --git a/tools/depsgen/gocmd.go b/tools/depsgen/gocmd.go
index d15f70b4be..7be203beea 100644
--- a/tools/depsgen/gocmd.go
+++ b/tools/depsgen/gocmd.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/coreos/rkt/tools/common"
+	"github.com/rkt/rkt/tools/common"
 )
 
 const (
@@ -68,7 +68,7 @@ func goGetMakeFunction(repo, module string) string {
 // mode. If mode is "files", then target is optional.
 func goGetArgs(args []string) (string, string, string, goDepsMode) {
 	f, target := standardFlags(goCmd)
-	repo := f.String("repo", "", "Go repo (example: github.com/coreos/rkt)")
+	repo := f.String("repo", "", "Go repo (example: github.com/rkt/rkt)")
 	module := f.String("module", "", "Module inside Go repo (example: stage1)")
 	mode := f.String("mode", "make", "Mode to use (make - print deps as makefile [default], files - print a list of files)")
 
diff --git a/tools/depsgen/kvcmd.go b/tools/depsgen/kvcmd.go
index b0c14b11e6..44175321f6 100644
--- a/tools/depsgen/kvcmd.go
+++ b/tools/depsgen/kvcmd.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/coreos/rkt/tools/common"
+	"github.com/rkt/rkt/tools/common"
 )
 
 const (
diff --git a/tools/depsgen/main.go b/tools/depsgen/main.go
index bb56076c4e..abd413c0b3 100644
--- a/tools/depsgen/main.go
+++ b/tools/depsgen/main.go
@@ -20,7 +20,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/coreos/rkt/tools/common"
+	"github.com/rkt/rkt/tools/common"
 )
 
 var cmds = make(map[string]func([]string) string)
diff --git a/tools/depsgen/util.go b/tools/depsgen/util.go
index 1663307e7a..73d6869599 100644
--- a/tools/depsgen/util.go
+++ b/tools/depsgen/util.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/coreos/rkt/tools/common"
+	"github.com/rkt/rkt/tools/common"
 )
 
 // toMap creates a map from passed strings. This function expects an
diff --git a/tools/filelistgen/main.go b/tools/filelistgen/main.go
index 257b972582..bda1903499 100644
--- a/tools/filelistgen/main.go
+++ b/tools/filelistgen/main.go
@@ -22,8 +22,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/coreos/rkt/tools/common"
-	"github.com/coreos/rkt/tools/common/filelist"
+	"github.com/rkt/rkt/tools/common"
+	"github.com/rkt/rkt/tools/common/filelist"
 )
 
 type fsWalker struct {
diff --git a/tools/quickrm/main.go b/tools/quickrm/main.go
index 41ec74e7a7..361b78cb37 100644
--- a/tools/quickrm/main.go
+++ b/tools/quickrm/main.go
@@ -25,8 +25,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/coreos/rkt/tools/common"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/tools/common"
 )
 
 // processor processes words from files generated by make

From 535a47db7ddc0894cb0b89cc033ffbbecf6500fc Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Thu, 6 Apr 2017 14:02:48 +0200
Subject: [PATCH 1083/1304] tests: update travis/semaphore golang versions

Drop 1.5 testing, bump to latest 1.6.x and 1.7.x
---
 .travis.yml                  | 5 ++---
 tests/build-and-run-tests.sh | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3613af8253..c8da4dc5db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,8 @@ sudo: required
 dist: trusty
 
 go:
-  - 1.5.4
-  - 1.6.3
-  - 1.7
+  - 1.6.4
+  - 1.7.5
 
 env:
   - TARGET=amd64 GIMME_ARCH=amd64
diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index a6b97feced..e7262b35d6 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -50,7 +50,7 @@ function semaphoreCIConfiguration {
     # Set up go environment on Semaphore
     if [ -f /opt/change-go-version.sh ]; then
         . /opt/change-go-version.sh
-        change-go-version 1.5
+        change-go-version 1.7
         
 	# systemd v229 doesn't build on gcc-4.8, set the compiler to gcc-5
         export CC=gcc-5

From f23df1bff9b27829592736ce7c55fecdeb0536b5 Mon Sep 17 00:00:00 2001
From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Fri, 7 Apr 2017 16:20:54 +0200
Subject: [PATCH 1084/1304] CONTRIBUTING: remove CoreOS-specific bits

---
 CONTRIBUTING.md | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0167613bd4..fd23d2028e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # How to Contribute
 
-CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via
+rkt is [Apache 2.0 licensed](LICENSE) and accepts contributions via
 GitHub pull requests.  This document outlines some of the conventions on
 development workflow, commit message formatting, contact points and other
 resources to make it easier to get your contribution accepted.
@@ -51,13 +51,20 @@ Thanks for your contributions!
 
 ### Coding Style
 
-CoreOS projects written in Go follow a set of style guidelines that we've documented
-[here](https://github.com/coreos/docs/tree/master/golang). Please follow them when
-working on your contributions.
+Go style in the rkt project essentially just means following the upstream conventions:
+  - [Effective Go][effectivego]
+  - [CodeReviewComments][codereview]
+  - [Godoc][godoc]
+
+It's recommended to set a save hook in your editor of choice that runs `goimports` against your code.
+
+[effectivego]: https://golang.org/doc/effective_go.html
+[codereview]: https://github.com/golang/go/wiki/CodeReviewComments
+[godoc]: http://blog.golang.org/godoc-documenting-go-code[here](https://github.com/coreos/docs/tree/master/golang).
 
 ### Documentation Style
 
-CoreOS project docs should follow the [Documentation style and formatting
+Project docs should follow the [Documentation style and formatting
 guide](https://github.com/coreos/docs/tree/master/STYLE.md). Thank you for documenting!
 
 ### Format of the Commit Message

From 8f37ad3c3556358a4f37f8090c07cce77e50bbcb Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Sun, 26 Mar 2017 23:59:21 -0700
Subject: [PATCH 1085/1304] stage0/{run,prepare}: remove ondisk verification

For backwards compatibility, specifying 'insecure-options=ondisk' will
still run without error, however it will also not do anything.

Implements #3481
---
 Documentation/commands.md |  5 +--
 rkt/app_sandbox.go        | 15 ++++---
 rkt/flag/secflags.go      | 10 ++---
 rkt/flag/secflags_test.go | 84 ++++++++++++++++-----------------------
 rkt/prepare.go            |  7 ++--
 rkt/run.go                |  7 ++--
 stage0/run.go             | 47 +++++-----------------
 7 files changed, 64 insertions(+), 111 deletions(-)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 92ecc1abae..6a1fcc1e78 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -70,7 +70,7 @@ In addition to the flags used by individual `rkt` commands, `rkt` has a set of g
 | `--cpuprofile (hidden flag)` | ''  | A file path | Write CPU profile to the file |
 | `--debug` |  `false` | `true` or `false` | Prints out more debug information to `stderr` |
 | `--dir` | `/var/lib/rkt` | A directory path | Path to the `rkt` data directory |
-| `--insecure-options` |  none | **none**, **http**, **image**, **tls**, **ondisk**, **pubkey**, **capabilities**, **paths**, **seccomp**, **all-fetch**, **all-run**, **all** <br/> More information below. | Comma-separated list of security features to disable |
+| `--insecure-options` |  none | **none**, **http**, **image**, **tls**, **pubkey**, **capabilities**, **paths**, **seccomp**, **all-fetch**, **all-run**, **all** <br/> More information below. | Comma-separated list of security features to disable |
 | `--local-config` |  `/etc/rkt` | A directory path | Path to the local configuration directory |
 | `--memprofile (hidden flag)` | '' | A file path | Write memory profile to the file |
 | `--system-config` |  `/usr/lib/rkt` | A directory path | Path to the system configuration directory |
@@ -83,13 +83,12 @@ In addition to the flags used by individual `rkt` commands, `rkt` has a set of g
 - **http**: Allow HTTP connections. Be warned that this will send any credentials as clear text, allowing anybody with access to your network to obtain them. It will also perform no validation of the remote server, making it possible for an attacker to impersonate the remote server. This applies specifically to fetching images, signatures, and gpg pubkeys.
 - **image**: Disables verifying image signatures. If someone is able to replace the image on the server with a modified one or is in a position to impersonate the server, they will be able to force you to run arbitrary code.
 - **tls**: Accept any certificate from the server and any host name in that certificate. This will make it possible for attackers to spoof the remote server and provide malicious images.
-- **ondisk**: Disables verifying the integrity of the on-disk, rendered image before running. This significantly speeds up start time. If an attacker is able to modify the contents of your local filesystem, this will allow them to cause you to run arbitrary malicious code.
 - **pubkey**: Allow fetching pubkeys via insecure connections (via HTTP connections or from servers with unverified certificates). This slightly extends the meaning of the `--trust-keys-from-https` flag. This will make it possible for an attacker to spoof the remote server, potentially providing fake keys and allowing them to provide container images that have been tampered with.
 - **capabilities**: Gives all [capabilities][capabilities] to apps. This allows an attacker that is able to execute code in the container to trivially escalate to root privileges on the host. 
 - **paths**: Disables inaccessible and read-only paths. This makes it easier for an attacker who can gain control over a single container to execute code in the host system, potentially allowing them to escape from the container. This also leaks additional information.
 - **seccomp**: Disables [seccomp][seccomp]. This increases the attack surface available to an attacker who can gain control over a single container, potentially making it easier for them to escape from the container.
 - **all-fetch**: Disables the following security checks: image, tls, http
-- **all-run**: Disables the following security checks: ondisk, capabilities, paths, seccomp
+- **all-run**: Disables the following security checks: capabilities, paths, seccomp
 - **all**: Disables all security checks
 
 ## Logging
diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
index cfe585eb8b..e831641b59 100644
--- a/rkt/app_sandbox.go
+++ b/rkt/app_sandbox.go
@@ -135,14 +135,13 @@ func runAppSandbox(cmd *cobra.Command, args []string) int {
 	useOverlay := !flagNoOverlay && ovlOk
 
 	pcfg := stage0.PrepareConfig{
-		CommonConfig:       &cfg,
-		UseOverlay:         useOverlay,
-		PrivateUsers:       user.NewBlankUidRange(),
-		SkipTreeStoreCheck: globalFlags.InsecureFlags.SkipOnDiskCheck(),
-		Apps:               &rktApps,
-		Ports:              []types.ExposedPort(flagAppPorts),
-		UserAnnotations:    parseAnnotations(&flagAnnotations),
-		UserLabels:         parseLabels(&flagLabels),
+		CommonConfig:    &cfg,
+		UseOverlay:      useOverlay,
+		PrivateUsers:    user.NewBlankUidRange(),
+		Apps:            &rktApps,
+		Ports:           []types.ExposedPort(flagAppPorts),
+		UserAnnotations: parseAnnotations(&flagAnnotations),
+		UserLabels:      parseLabels(&flagLabels),
 	}
 
 	if globalFlags.Debug {
diff --git a/rkt/flag/secflags.go b/rkt/flag/secflags.go
index 94e44c4a00..0df9f9a551 100644
--- a/rkt/flag/secflags.go
+++ b/rkt/flag/secflags.go
@@ -24,7 +24,7 @@ const (
 	insecureNone  = 0
 	insecureImage = 1 << (iota - 1)
 	insecureTLS
-	insecureOnDisk
+	insecureOnDisk // ignored, left for backwards compatibility
 	insecureHTTP
 	insecurePubKey
 	insecureCapabilities
@@ -32,7 +32,7 @@ const (
 	insecureSeccomp
 
 	insecureAllFetch = (insecureImage | insecureTLS | insecureHTTP | insecurePubKey)
-	insecureAllRun   = (insecureOnDisk | insecureCapabilities | insecurePaths | insecureSeccomp)
+	insecureAllRun   = (insecureCapabilities | insecurePaths | insecureSeccomp)
 	insecureAll      = (insecureAllFetch | insecureAllRun)
 )
 
@@ -85,6 +85,8 @@ func NewSecFlags(defOpts string) (*SecFlags, error) {
 	if err != nil {
 		return nil, err
 	}
+	// Ignore ondisk
+	bf.Flags = bf.Flags &^ insecureOnDisk
 
 	sf := &SecFlags{
 		BitFlags: bf,
@@ -100,10 +102,6 @@ func (sf *SecFlags) SkipTLSCheck() bool {
 	return sf.HasFlag(insecureTLS)
 }
 
-func (sf *SecFlags) SkipOnDiskCheck() bool {
-	return sf.HasFlag(insecureOnDisk)
-}
-
 func (sf *SecFlags) AllowHTTP() bool {
 	return sf.HasFlag(insecureHTTP)
 }
diff --git a/rkt/flag/secflags_test.go b/rkt/flag/secflags_test.go
index ab1c5fb015..726fcea037 100644
--- a/rkt/flag/secflags_test.go
+++ b/rkt/flag/secflags_test.go
@@ -18,66 +18,56 @@ import "testing"
 
 func TestSecFlags(t *testing.T) {
 	tests := []struct {
-		opts   string
-		image  bool
-		tls    bool
-		onDisk bool
-		http   bool
-		err    bool
+		opts  string
+		image bool
+		tls   bool
+		http  bool
+		err   bool
 	}{
 		{
-			opts:   "none",
-			image:  false,
-			tls:    false,
-			onDisk: false,
-			http:   false,
+			opts:  "none",
+			image: false,
+			tls:   false,
+			http:  false,
 		},
 		{
-			opts:   "image",
-			image:  true,
-			tls:    false,
-			onDisk: false,
-			http:   false,
+			opts:  "image",
+			image: true,
+			tls:   false,
+			http:  false,
 		},
 		{
-			opts:   "tls",
-			image:  false,
-			tls:    true,
-			onDisk: false,
-			http:   false,
+			opts:  "tls",
+			image: false,
+			tls:   true,
+			http:  false,
 		},
 		{
-			opts:   "onDisk",
-			image:  false,
-			tls:    false,
-			onDisk: true,
-			http:   false,
+			opts:  "http",
+			image: false,
+			tls:   false,
+			http:  true,
 		},
 		{
-			opts:   "http",
-			image:  false,
-			tls:    false,
-			onDisk: false,
-			http:   true,
+			opts:  "all",
+			image: true,
+			tls:   true,
+			http:  true,
 		},
 		{
-			opts:   "all",
-			image:  true,
-			tls:    true,
-			onDisk: true,
-			http:   true,
-		},
-		{
-			opts:   "image,tls",
-			image:  true,
-			tls:    true,
-			onDisk: false,
-			http:   false,
+			opts:  "image,tls",
+			image: true,
+			tls:   true,
+			http:  false,
 		},
 		{
 			opts: "i-am-sure-we-will-not-get-this-insecure-flag",
 			err:  true,
 		},
+		{
+			opts: "ondisk",
+			err:  false,
+		},
 	}
 
 	for i, tt := range tests {
@@ -99,20 +89,16 @@ func TestSecFlags(t *testing.T) {
 			t.Errorf("test %d: expected tls skip to be %v, got %v", i, tt.tls, got)
 		}
 
-		if got := sf.SkipOnDiskCheck(); tt.onDisk != got {
-			t.Errorf("test %d: expected on disk skip to be %v, got %v", i, tt.onDisk, got)
-		}
-
 		if got := sf.AllowHTTP(); tt.http != got {
 			t.Errorf("test %d: expected http allowed to be %v, got %v", i, tt.http, got)
 		}
 
-		all := tt.http && tt.onDisk && tt.tls && tt.image
+		all := tt.http && tt.tls && tt.image
 		if got := sf.SkipAllSecurityChecks(); all != got {
 			t.Errorf("test %d: expected all skip to be %v, got %v", i, all, got)
 		}
 
-		any := tt.http || tt.onDisk || tt.tls || tt.image
+		any := tt.http || tt.tls || tt.image
 		if got := sf.SkipAnySecurityChecks(); any != got {
 			t.Errorf("test %d: expected all skip to be %v, got %v", i, any, got)
 		}
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 09b2ca3557..1fabed448e 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -200,10 +200,9 @@ func runPrepare(cmd *cobra.Command, args []string) (exit int) {
 	}
 
 	pcfg := stage0.PrepareConfig{
-		CommonConfig:       &cfg,
-		UseOverlay:         !flagNoOverlay && ovlOk,
-		PrivateUsers:       privateUsers,
-		SkipTreeStoreCheck: globalFlags.InsecureFlags.SkipOnDiskCheck(),
+		CommonConfig: &cfg,
+		UseOverlay:   !flagNoOverlay && ovlOk,
+		PrivateUsers: privateUsers,
 	}
 
 	if len(flagPodManifest) > 0 {
diff --git a/rkt/run.go b/rkt/run.go
index db89e25302..9fe9e7b1aa 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -321,10 +321,9 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 	useOverlay := !flagNoOverlay && ovlOk
 
 	pcfg := stage0.PrepareConfig{
-		CommonConfig:       &cfg,
-		UseOverlay:         useOverlay,
-		PrivateUsers:       privateUsers,
-		SkipTreeStoreCheck: globalFlags.InsecureFlags.SkipOnDiskCheck(),
+		CommonConfig: &cfg,
+		UseOverlay:   useOverlay,
+		PrivateUsers: privateUsers,
 	}
 
 	if len(flagPodManifest) > 0 {
diff --git a/stage0/run.go b/stage0/run.go
index 17bc35c6a9..f3698c4b68 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -61,17 +61,16 @@ var debugEnabled bool
 // PrepareConfig defines the configuration parameters required by Prepare
 type PrepareConfig struct {
 	*CommonConfig
-	Apps               *apps.Apps            // apps to prepare
-	InheritEnv         bool                  // inherit parent environment into apps
-	ExplicitEnv        []string              // always set these environment variables for all the apps
-	EnvFromFile        []string              // environment variables loaded from files, set for all the apps
-	Ports              []types.ExposedPort   // list of ports that rkt will expose on the host
-	UseOverlay         bool                  // prepare pod with overlay fs
-	SkipTreeStoreCheck bool                  // skip checking the treestore before rendering
-	PodManifest        string                // use the pod manifest specified by the user, this will ignore flags such as '--volume', '--port', etc.
-	PrivateUsers       *user.UidRange        // user namespaces
-	UserAnnotations    types.UserAnnotations // user annotations for the pod.
-	UserLabels         types.UserLabels      // user labels for the pod.
+	Apps            *apps.Apps            // apps to prepare
+	InheritEnv      bool                  // inherit parent environment into apps
+	ExplicitEnv     []string              // always set these environment variables for all the apps
+	EnvFromFile     []string              // environment variables loaded from files, set for all the apps
+	Ports           []types.ExposedPort   // list of ports that rkt will expose on the host
+	UseOverlay      bool                  // prepare pod with overlay fs
+	PodManifest     string                // use the pod manifest specified by the user, this will ignore flags such as '--volume', '--port', etc.
+	PrivateUsers    *user.UidRange        // user namespaces
+	UserAnnotations types.UserAnnotations // user annotations for the pod.
+	UserLabels      types.UserLabels      // user labels for the pod.
 }
 
 // RunConfig defines the configuration parameters needed by Run
@@ -737,19 +736,6 @@ func prepareAppImage(cfg PrepareConfig, appName types.ACName, img types.Hash, cd
 			return "", errwrap.Wrap(errors.New("error rendering tree image"), err)
 		}
 
-		if !cfg.SkipTreeStoreCheck {
-			hash, err := cfg.TreeStore.Check(treeStoreID)
-			if err != nil {
-				log.PrintE("warning: tree cache is in a bad state.  Rebuilding...", err)
-				var err error
-				treeStoreID, hash, err = cfg.TreeStore.Render(img.String(), true)
-				if err != nil {
-					return "", errwrap.Wrap(errors.New("error rendering tree image"), err)
-				}
-			}
-			cfg.CommonConfig.RootHash = hash
-		}
-
 		if err := ioutil.WriteFile(common.AppTreeStoreIDPath(cdir, appName), []byte(treeStoreID), common.DefaultRegularFilePerm); err != nil {
 			return "", errwrap.Wrap(errors.New("error writing app treeStoreID"), err)
 		}
@@ -854,19 +840,6 @@ func prepareStage1Image(cfg PrepareConfig, cdir string) error {
 		return errwrap.Wrap(errors.New("error rendering tree image"), err)
 	}
 
-	if !cfg.SkipTreeStoreCheck {
-		hash, err := cfg.TreeStore.Check(treeStoreID)
-		if err != nil {
-			log.Printf("warning: tree cache is in a bad state: %v. Rebuilding...", err)
-			var err error
-			treeStoreID, hash, err = cfg.TreeStore.Render(cfg.Stage1Image.String(), true)
-			if err != nil {
-				return errwrap.Wrap(errors.New("error rendering tree image"), err)
-			}
-		}
-		cfg.CommonConfig.RootHash = hash
-	}
-
 	if err := writeManifest(*cfg.CommonConfig, cfg.Stage1Image, s1); err != nil {
 		return errwrap.Wrap(errors.New("error writing manifest"), err)
 	}

From c505a30744e598de42747424d0332990afdd0750 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Mon, 27 Mar 2017 00:30:32 -0700
Subject: [PATCH 1086/1304] rkt/image: introduce 'image verify' subcommand

This command replaces the previous ondisk verification that was done on
every run.

It can be used in cases where the user suspects their treestore has been
corrupted in some way.
---
 Documentation/subcommands/image.md | 11 ++++
 rkt/image_verify.go                | 80 ++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 rkt/image_verify.go

diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 7de30e18c0..81564bac1a 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -141,6 +141,17 @@ rkt: successfully removed aci for image: "sha512-91e98d7f167905b69cce91b163963cc
 rkt: 2 image(s) successfully removed
 ```
 
+## rkt image verify
+
+Given one or more image IDs or image names, verify will verify that their
+ondisk checksum matches the value previously calculated on render.
+
+```
+# rkt image verify quay.io/coreos/etcd:v3.1.0 sha512-887890e697d9
+successfully verified checksum for image: "quay.io/coreos/etcd:v3.1.0" ("sha512-e70ec975ce5327ea52c4a30cc4a951ecea55217a290e866e70888517964ba700")                   
+successfully verified checksum for image: "sha512-887890e697d9" ("sha512-887890e697d9a0229eff22436def3c436cb4b18f72ac274c8c05427b39539307")
+```
+
 ## Global options
 
 See the table with [global options in general commands documentation][global-options].
diff --git a/rkt/image_verify.go b/rkt/image_verify.go
new file mode 100644
index 0000000000..8e3e75d94e
--- /dev/null
+++ b/rkt/image_verify.go
@@ -0,0 +1,80 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"github.com/coreos/rkt/store/imagestore"
+	"github.com/coreos/rkt/store/treestore"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdImageVerify = &cobra.Command{
+		Use:   "verify IMAGE...",
+		Short: "Verify one or more images in the local store",
+		Long: `Verify is able to check that, based on the stored hash value, a rendered image on disk has not changed.
+
+This command may be used if the user suspects disk corruption might have damaged the rkt store.`,
+		Run: runWrapper(runVerifyImage),
+	}
+)
+
+func init() {
+	cmdImage.AddCommand(cmdImageVerify)
+}
+
+func runVerifyImage(cmd *cobra.Command, args []string) int {
+	if len(args) < 1 {
+		stderr.Print("must provide at least one image ID")
+		return 254
+	}
+
+	s, err := imagestore.NewStore(storeDir())
+	if err != nil {
+		stderr.PrintE("cannot open store", err)
+		return 254
+	}
+
+	ts, err := treestore.NewStore(treeStoreDir(), s)
+	if err != nil {
+		stderr.PrintE("cannot open treestore", err)
+		return 254
+	}
+
+	for _, img := range args {
+		key, err := getStoreKeyFromAppOrHash(s, img)
+		if err != nil {
+			stderr.Printf("unable to resolve store key for image %s: %v", img, err)
+			return 254
+		}
+		id, err := ts.GetID(key)
+		if err != nil {
+			stderr.Printf("unable to get treestoreID for image %s: %v", img, err)
+			return 254
+		}
+		_, err = ts.Check(id)
+		if err != nil {
+			stdout.Printf("tree cache verification failed for image %s: %v;  rebuilding...", img, err)
+			_, _, err = ts.Render(key, true)
+			if err != nil {
+				stderr.Printf("unable to repair cache for image %s: %v", img, err)
+				return 254
+			}
+		} else {
+			stdout.Printf("successfully verified checksum for image: %q (%q)", img, key)
+		}
+	}
+	return 0
+}

From 0cbd2a619980e7318d3d8c85c7770376379dc4de Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Mon, 27 Mar 2017 01:47:46 -0700
Subject: [PATCH 1087/1304] tests: add "image verify" functional test

---
 tests/rkt_image_verify_test.go | 73 ++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 tests/rkt_image_verify_test.go

diff --git a/tests/rkt_image_verify_test.go b/tests/rkt_image_verify_test.go
new file mode 100644
index 0000000000..b0a50a4f7a
--- /dev/null
+++ b/tests/rkt_image_verify_test.go
@@ -0,0 +1,73 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build host coreos src kvm
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/rkt/rkt/tests/testutils"
+)
+
+// TestImageVerify tests 'rkt image verify'.
+// It renders an image, deletes a file from it, and verifies that 'verify' notices and repairs it.
+func TestImageVerify(t *testing.T) {
+	tmpDir := mustTempDir("rkt-TestImageVerify-")
+	defer os.RemoveAll(tmpDir)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	img := getInspectImagePath()
+	imgHash, err := importImageAndFetchHash(t, ctx, "--insecure-options=image", img)
+	if err != nil {
+		t.Fatalf("unable to fetch image: %v", err)
+	}
+	prepareCmd := fmt.Sprintf("%s prepare %s", ctx.Cmd(), imgHash)
+	_ = runRktAndGetUUID(t, prepareCmd)
+
+	treestorePath := filepath.Join(ctx.DataDir(), "cas", "tree")
+	numDeleted := 0
+	err = filepath.Walk(treestorePath, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if info.Name() == "inspect" {
+			os.Remove(path)
+			numDeleted++
+		}
+		return nil
+	})
+	if err != nil {
+		t.Fatalf("unable to walk treestore %v: %v", treestorePath, err)
+	}
+	if numDeleted != 1 {
+		t.Fatalf("expected to find one 'inspect' binary in the tree to delete")
+	}
+
+	cmd := fmt.Sprintf("%s image verify %s", ctx.Cmd(), imgHash)
+	if err := runRktAndCheckRegexOutput(t, cmd, "tree cache verification failed for image.*"); err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+	// treestore should be fixed so this should now be successful
+	if err := runRktAndCheckRegexOutput(t, cmd, "successfully verified checksum for image.*"); err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+}

From 745affc412f3b56473f79cd129a25929aac18e91 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Mon, 27 Mar 2017 17:44:59 -0700
Subject: [PATCH 1088/1304] stage0/image_verify: don't always render images

This avoids rendering an image that has not yet been rendered, and
skips doing the verification for it since it's a nonsensical operation.
---
 rkt/image_verify.go     | 27 ++++++++++++++++++++++++---
 store/treestore/tree.go |  6 +++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/rkt/image_verify.go b/rkt/image_verify.go
index 8e3e75d94e..21a66ae939 100644
--- a/rkt/image_verify.go
+++ b/rkt/image_verify.go
@@ -15,15 +15,18 @@
 package main
 
 import (
-	"github.com/coreos/rkt/store/imagestore"
-	"github.com/coreos/rkt/store/treestore"
+	"os"
+
+	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/store/imagestore"
+	"github.com/rkt/rkt/store/treestore"
 	"github.com/spf13/cobra"
 )
 
 var (
 	cmdImageVerify = &cobra.Command{
 		Use:   "verify IMAGE...",
-		Short: "Verify one or more images in the local store",
+		Short: "Verify one or more rendered images in the local store",
 		Long: `Verify is able to check that, based on the stored hash value, a rendered image on disk has not changed.
 
 This command may be used if the user suspects disk corruption might have damaged the rkt store.`,
@@ -65,6 +68,10 @@ func runVerifyImage(cmd *cobra.Command, args []string) int {
 			return 254
 		}
 		_, err = ts.Check(id)
+		if isNotRenderedErr(err) {
+			stdout.Printf("image %q not rendered; no verification needed", img)
+			continue
+		}
 		if err != nil {
 			stdout.Printf("tree cache verification failed for image %s: %v;  rebuilding...", img, err)
 			_, _, err = ts.Render(key, true)
@@ -78,3 +85,17 @@ func runVerifyImage(cmd *cobra.Command, args []string) int {
 	}
 	return 0
 }
+
+func isNotRenderedErr(err error) bool {
+	containsIsNotExist := false
+	containsReadHashErr := false
+	errwrap.Walk(err, func(e error) {
+		if os.IsNotExist(e) {
+			containsIsNotExist = true
+		}
+		if e == treestore.ErrReadHashfile {
+			containsReadHashErr = true
+		}
+	})
+	return containsIsNotExist && containsReadHashErr
+}
diff --git a/store/treestore/tree.go b/store/treestore/tree.go
index 1bdb6275c6..89ab80aa7b 100644
--- a/store/treestore/tree.go
+++ b/store/treestore/tree.go
@@ -56,6 +56,10 @@ const (
 	minlenKey  = len(hashPrefix) + 2 // at least sha512-aa
 )
 
+var (
+	ErrReadHashfile = errors.New("cannot read hash file")
+)
+
 // Store represents a store of rendered ACIs
 type Store struct {
 	dir string
@@ -362,7 +366,7 @@ func (ts *Store) check(id string) (string, error) {
 	treepath := ts.GetPath(id)
 	hash, err := ioutil.ReadFile(filepath.Join(treepath, hashfilename))
 	if err != nil {
-		return "", errwrap.Wrap(errors.New("cannot read hash file"), err)
+		return "", errwrap.Wrap(ErrReadHashfile, err)
 	}
 	curhash, err := ts.Hash(id)
 	if err != nil {

From f21e0be1db826950ac6512c72e072c1b3af5210d Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Mon, 10 Apr 2017 13:27:31 -0700
Subject: [PATCH 1089/1304] rkt list|status: app state info (i.e. exit codes)
 in --format=json

Make `rkt list|status --format=json` compatible with the default k=v
format and include state info (exit codes in particular).

Also deprecate App.AppNames in the json output, but keep it there for
backwards compatibility.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
---
 lib/app.go      | 73 +++++++++++++++++++++++++++++++++++++++++++++++--
 lib/pod.go      | 12 ++++++++
 lib/types.go    |  3 ++
 pkg/pod/pods.go |  5 ++++
 4 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/lib/app.go b/lib/app.go
index 15ac181376..f819ace81d 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -24,6 +24,14 @@ import (
 	pkgPod "github.com/rkt/rkt/pkg/pod"
 )
 
+// appStateFunc fills in known state information:
+// * App.State
+// * App.CreatedAt
+// * App.StartedAt
+// * App.FinishedAt
+// * App.ExitCode
+type appStateFunc func(*App, *pkgPod.Pod) error
+
 // AppsForPod returns the apps of the pod with the given uuid in the given data directory.
 // If appName is non-empty, then only the app with the given name will be returned.
 func AppsForPod(uuid, dataDir string, appName string) ([]*App, error) {
@@ -33,6 +41,10 @@ func AppsForPod(uuid, dataDir string, appName string) ([]*App, error) {
 	}
 	defer p.Close()
 
+	return appsForPod(p, appName, appStateInMutablePod)
+}
+
+func appsForPod(p *pkgPod.Pod, appName string, appState appStateFunc) ([]*App, error) {
 	_, podManifest, err := p.PodManifest()
 	if err != nil {
 		return nil, err
@@ -44,7 +56,7 @@ func AppsForPod(uuid, dataDir string, appName string) ([]*App, error) {
 			continue
 		}
 
-		app, err := newApp(&ra, podManifest, p)
+		app, err := newApp(&ra, podManifest, p, appState)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Cannot get app status: %v", err)
 			continue
@@ -57,7 +69,7 @@ func AppsForPod(uuid, dataDir string, appName string) ([]*App, error) {
 }
 
 // newApp constructs the App object with the runtime app and pod manifest.
-func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.Pod) (*App, error) {
+func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.Pod, appState appStateFunc) (*App, error) {
 	app := &App{
 		Name:            ra.Name.String(),
 		ImageID:         ra.Image.ID.String(),
@@ -82,7 +94,7 @@ func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.
 	return app, nil
 }
 
-func appState(app *App, pod *pkgPod.Pod) error {
+func appStateInMutablePod(app *App, pod *pkgPod.Pod) error {
 	app.State = AppStateUnknown
 
 	defer func() {
@@ -153,6 +165,61 @@ func appState(app *App, pod *pkgPod.Pod) error {
 	return nil
 }
 
+// appStateInImmutablePod infers most App state from the Pod itself, since all apps are created and destroyed with the Pod
+func appStateInImmutablePod(app *App, pod *pkgPod.Pod) error {
+	app.State = appStateFromPod(pod)
+
+	t, err := pod.CreationTime()
+	if err != nil {
+		return err
+	}
+	createdAt := t.UnixNano()
+	app.CreatedAt = &createdAt
+
+	code, err := pod.AppExitCode(app.Name)
+	if err == nil {
+		// there is an exit code, it is definitely Exited
+		app.State = AppStateExited
+		exitCode := int32(code)
+		app.ExitCode = &exitCode
+	}
+
+	start, err := pod.StartTime()
+	if err != nil {
+		return err
+	}
+	if !start.IsZero() {
+		startedAt := start.UnixNano()
+		app.StartedAt = &startedAt
+	}
+	// the best we can guess for immutable pods
+	finish, err := pod.GCMarkedTime()
+	if err != nil {
+		return err
+	}
+	if !finish.IsZero() {
+		finishedAt := finish.UnixNano()
+		app.FinishedAt = &finishedAt
+	}
+
+	return nil
+}
+
+func appStateFromPod(pod *pkgPod.Pod) AppState {
+	switch pod.State() {
+	case pkgPod.Embryo, pkgPod.Preparing, pkgPod.AbortedPrepare:
+		return AppStateUnknown
+	case pkgPod.Prepared:
+		return AppStateCreated
+	case pkgPod.Running:
+		return AppStateRunning
+	case pkgPod.Deleting, pkgPod.ExitedDeleting, pkgPod.Exited, pkgPod.ExitedGarbage, pkgPod.Garbage:
+		return AppStateExited
+	default:
+		return AppStateUnknown
+	}
+}
+
 func readExitCode(path string) (int32, error) {
 	var exitCode int32
 
diff --git a/lib/pod.go b/lib/pod.go
index d003635616..9d91af8d07 100644
--- a/lib/pod.go
+++ b/lib/pod.go
@@ -44,9 +44,21 @@ func NewPodFromInternalPod(p *pkgPod.Pod) (*Pod, error) {
 	}
 
 	for _, app := range manifest.Apps {
+		// for backwards compatibility
 		pod.AppNames = append(pod.AppNames, app.Name.String())
 	}
 
+	var appState appStateFunc
+	if p.IsMutable() {
+		appState = appStateInMutablePod
+	} else {
+		appState = appStateInImmutablePod
+	}
+	pod.Apps, err = appsForPod(p, "", appState)
+	if err != nil {
+		return nil, err
+	}
+
 	if len(manifest.UserAnnotations) > 0 {
 		pod.UserAnnotations = make(map[string]string)
 		for name, value := range manifest.UserAnnotations {
diff --git a/lib/types.go b/lib/types.go
index 91c504f7b9..87cbb5114c 100644
--- a/lib/types.go
+++ b/lib/types.go
@@ -73,7 +73,10 @@ type (
 		// Networks are the information of the networks.
 		Networks []netinfo.NetInfo `json:"networks,omitempty"`
 		// AppNames are the names of the apps.
+		// Deprecated: use Apps instead.
 		AppNames []string `json:"app_names,omitempty"`
+		// Apps holds current information about each app.
+		Apps []*App `json:"apps,omitempty"`
 		// The start time of the pod.
 		StartedAt *int64 `json:"started_at,omitempty"`
 		// UserAnnotations are the pod user annotations.
diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index 250d833b60..643f20f1b1 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -1211,3 +1211,8 @@ func (p *Pod) AppExitCode(appName string) (int, error) {
 	statusFile := filepath.Join(stage1RootfsPath, "/rkt/status/", appName)
 	return p.readIntFromFile(statusFile)
 }
+
+// IsMutable can be used to determine if a pod is mutable
+func (p *Pod) IsMutable() bool {
+	return p.mutable
+}

From ab40f16295c3ec279fa1589cbfadba0e3e306a69 Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Wed, 12 Apr 2017 11:42:49 -0700
Subject: [PATCH 1090/1304] stage0 {list,status}: start versioning json models

Mark the current JSON output format for rkt status|list as v1, so we can
track changes and compatibility moving forward.

Fixes #3551

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
---
 lib/types.go => api/v1/json.go |  2 +-
 lib/app.go                     | 45 +++++++++++++++++-----------------
 lib/pod.go                     |  9 ++++---
 rkt/app_status.go              |  3 ++-
 rkt/image_list.go              | 11 ++++-----
 rkt/list.go                    |  3 ++-
 6 files changed, 39 insertions(+), 34 deletions(-)
 rename lib/types.go => api/v1/json.go (99%)

diff --git a/lib/types.go b/api/v1/json.go
similarity index 99%
rename from lib/types.go
rename to api/v1/json.go
index 87cbb5114c..534c46f673 100644
--- a/lib/types.go
+++ b/api/v1/json.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package rkt
+package v1
 
 import "github.com/rkt/rkt/networking/netinfo"
 
diff --git a/lib/app.go b/lib/app.go
index f819ace81d..16381bba98 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -20,6 +20,7 @@ import (
 	"os"
 
 	"github.com/appc/spec/schema"
+	"github.com/rkt/rkt/api/v1"
 	"github.com/rkt/rkt/common"
 	pkgPod "github.com/rkt/rkt/pkg/pod"
 )
@@ -30,11 +31,11 @@ import (
 // * App.StartedAt
 // * App.FinishedAt
 // * App.ExitCode
-type appStateFunc func(*App, *pkgPod.Pod) error
+type appStateFunc func(*v1.App, *pkgPod.Pod) error
 
 // AppsForPod returns the apps of the pod with the given uuid in the given data directory.
 // If appName is non-empty, then only the app with the given name will be returned.
-func AppsForPod(uuid, dataDir string, appName string) ([]*App, error) {
+func AppsForPod(uuid, dataDir string, appName string) ([]*v1.App, error) {
 	p, err := pkgPod.PodFromUUIDString(dataDir, uuid)
 	if err != nil {
 		return nil, err
@@ -44,13 +45,13 @@ func AppsForPod(uuid, dataDir string, appName string) ([]*App, error) {
 	return appsForPod(p, appName, appStateInMutablePod)
 }
 
-func appsForPod(p *pkgPod.Pod, appName string, appState appStateFunc) ([]*App, error) {
+func appsForPod(p *pkgPod.Pod, appName string, appState appStateFunc) ([]*v1.App, error) {
 	_, podManifest, err := p.PodManifest()
 	if err != nil {
 		return nil, err
 	}
 
-	var apps []*App
+	var apps []*v1.App
 	for _, ra := range podManifest.Apps {
 		if appName != "" && appName != ra.Name.String() {
 			continue
@@ -69,8 +70,8 @@ func appsForPod(p *pkgPod.Pod, appName string, appState appStateFunc) ([]*App, e
 }
 
 // newApp constructs the App object with the runtime app and pod manifest.
-func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.Pod, appState appStateFunc) (*App, error) {
-	app := &App{
+func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.Pod, appState appStateFunc) (*v1.App, error) {
+	app := &v1.App{
 		Name:            ra.Name.String(),
 		ImageID:         ra.Image.ID.String(),
 		UserAnnotations: ra.App.UserAnnotations,
@@ -78,7 +79,7 @@ func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.
 	}
 
 	for _, mnt := range ra.Mounts {
-		app.Mounts = append(app.Mounts, &Mount{
+		app.Mounts = append(app.Mounts, &v1.Mount{
 			Name:          mnt.Volume.String(),
 			ContainerPath: mnt.Path,
 			HostPath:      mnt.AppVolume.Source,
@@ -94,15 +95,15 @@ func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.
 	return app, nil
 }
 
-func appStateInMutablePod(app *App, pod *pkgPod.Pod) error {
-	app.State = AppStateUnknown
+func appStateInMutablePod(app *v1.App, pod *pkgPod.Pod) error {
+	app.State = v1.AppStateUnknown
 
 	defer func() {
 		if pod.IsAfterRun() {
 			// If the pod is hard killed, set the app to 'exited' state.
 			// Other than this case, status file is guaranteed to be written.
-			if app.State != AppStateExited {
-				app.State = AppStateExited
+			if app.State != v1.AppStateExited {
+				app.State = v1.AppStateExited
 				t, err := pod.GCMarkedTime()
 				if err != nil {
 					fmt.Fprintf(os.Stderr, "Cannot get GC marked time: %v", err)
@@ -124,7 +125,7 @@ func appStateInMutablePod(app *App, pod *pkgPod.Pod) error {
 		return nil
 	}
 
-	app.State = AppStateCreated
+	app.State = v1.AppStateCreated
 	createdAt := fi.ModTime().UnixNano()
 	app.CreatedAt = &createdAt
 
@@ -137,7 +138,7 @@ func appStateInMutablePod(app *App, pod *pkgPod.Pod) error {
 		return nil
 	}
 
-	app.State = AppStateRunning
+	app.State = v1.AppStateRunning
 	startedAt := fi.ModTime().UnixNano()
 	app.StartedAt = &startedAt
 
@@ -151,7 +152,7 @@ func appStateInMutablePod(app *App, pod *pkgPod.Pod) error {
 		return nil
 	}
 
-	app.State = AppStateExited
+	app.State = v1.AppStateExited
 	finishedAt := fi.ModTime().UnixNano()
 	app.FinishedAt = &finishedAt
 
@@ -166,7 +167,7 @@ func appStateInMutablePod(app *App, pod *pkgPod.Pod) error {
 }
 
 // appStateInImmutablePod infers most App state from the Pod itself, since all apps are created and destroyed with the Pod
-func appStateInImmutablePod(app *App, pod *pkgPod.Pod) error {
+func appStateInImmutablePod(app *v1.App, pod *pkgPod.Pod) error {
 	app.State = appStateFromPod(pod)
 
 	t, err := pod.CreationTime()
@@ -179,7 +180,7 @@ func appStateInImmutablePod(app *App, pod *pkgPod.Pod) error {
 	code, err := pod.AppExitCode(app.Name)
 	if err == nil {
 		// there is an exit code, it is definitely Exited
-		app.State = AppStateExited
+		app.State = v1.AppStateExited
 		exitCode := int32(code)
 		app.ExitCode = &exitCode
 	}
@@ -205,18 +206,18 @@ func appStateInImmutablePod(app *App, pod *pkgPod.Pod) error {
 	return nil
 }
 
-func appStateFromPod(pod *pkgPod.Pod) AppState {
+func appStateFromPod(pod *pkgPod.Pod) v1.AppState {
 	switch pod.State() {
 	case pkgPod.Embryo, pkgPod.Preparing, pkgPod.AbortedPrepare:
-		return AppStateUnknown
+		return v1.AppStateUnknown
 	case pkgPod.Prepared:
-		return AppStateCreated
+		return v1.AppStateCreated
 	case pkgPod.Running:
-		return AppStateRunning
+		return v1.AppStateRunning
 	case pkgPod.Deleting, pkgPod.ExitedDeleting, pkgPod.Exited, pkgPod.ExitedGarbage, pkgPod.Garbage:
-		return AppStateExited
+		return v1.AppStateExited
 	default:
-		return AppStateUnknown
+		return v1.AppStateUnknown
 	}
 }
 
diff --git a/lib/pod.go b/lib/pod.go
index 9d91af8d07..5be69a3910 100644
--- a/lib/pod.go
+++ b/lib/pod.go
@@ -14,11 +14,14 @@
 
 package rkt
 
-import pkgPod "github.com/rkt/rkt/pkg/pod"
+import (
+	"github.com/rkt/rkt/api/v1"
+	pkgPod "github.com/rkt/rkt/pkg/pod"
+)
 
 // NewPodFromInternalPod converts *pkgPod.Pod to *Pod
-func NewPodFromInternalPod(p *pkgPod.Pod) (*Pod, error) {
-	pod := &Pod{
+func NewPodFromInternalPod(p *pkgPod.Pod) (*v1.Pod, error) {
+	pod := &v1.Pod{
 		UUID:     p.UUID.String(),
 		State:    p.State(),
 		Networks: p.Nets,
diff --git a/rkt/app_status.go b/rkt/app_status.go
index c9c806769b..74000b2cbe 100644
--- a/rkt/app_status.go
+++ b/rkt/app_status.go
@@ -20,6 +20,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/rkt/rkt/api/v1"
 	rkt "github.com/rkt/rkt/lib"
 	"github.com/spf13/cobra"
 )
@@ -39,7 +40,7 @@ func init() {
 	cmdAppStatus.Flags().Var(&flagFormat, "format", "choose the output format, allowed format includes 'json', 'json-pretty'. If empty, then the result is printed as key value pairs")
 }
 
-func printApp(app *rkt.App) {
+func printApp(app *v1.App) {
 	stdout.Printf("name=%s\n", app.Name)
 	stdout.Printf("state=%s\n", app.State)
 	stdout.Printf("image_id=%s\n", app.ImageID)
diff --git a/rkt/image_list.go b/rkt/image_list.go
index f3acac7c40..7a2da48844 100644
--- a/rkt/image_list.go
+++ b/rkt/image_list.go
@@ -21,13 +21,12 @@ import (
 	"strings"
 	"time"
 
-	rktlib "github.com/rkt/rkt/lib"
-	rktflag "github.com/rkt/rkt/pkg/flag"
-	"github.com/rkt/rkt/store/imagestore"
-
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/lastditch"
 	"github.com/dustin/go-humanize"
+	"github.com/rkt/rkt/api/v1"
+	rktflag "github.com/rkt/rkt/pkg/flag"
+	"github.com/rkt/rkt/store/imagestore"
 	"github.com/spf13/cobra"
 )
 
@@ -81,7 +80,7 @@ var (
 )
 
 type printableImage struct {
-	rktlib.ImageListEntry
+	v1.ImageListEntry
 
 	format outputFormat
 	full   bool
@@ -301,7 +300,7 @@ func runImages(cmd *cobra.Command, args []string) int {
 		}
 
 		imagesToPrint = append(imagesToPrint, printableImage{
-			ImageListEntry: rktlib.ImageListEntry{
+			ImageListEntry: v1.ImageListEntry{
 				ID:           imageID,
 				Name:         imageName,
 				ImportTime:   aciInfo.ImportTime.UnixNano(),
diff --git a/rkt/list.go b/rkt/list.go
index dc8e8019dc..a6f8077c92 100644
--- a/rkt/list.go
+++ b/rkt/list.go
@@ -28,6 +28,7 @@ import (
 	"github.com/appc/spec/schema/types"
 	"github.com/dustin/go-humanize"
 	"github.com/hashicorp/errwrap"
+	"github.com/rkt/rkt/api/v1"
 	lib "github.com/rkt/rkt/lib"
 	"github.com/rkt/rkt/networking/netinfo"
 	pkgPod "github.com/rkt/rkt/pkg/pod"
@@ -66,7 +67,7 @@ func runList(cmd *cobra.Command, args []string) int {
 		}
 	}
 
-	var pods []*lib.Pod
+	var pods []*v1.Pod
 
 	if err := pkgPod.WalkPods(getDataDir(), pkgPod.IncludeMostDirs, func(p *pkgPod.Pod) {
 		if flagFormat != outputFormatTabbed {

From e6561a860875e5f522c419ceabcaca0bdab95a94 Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Wed, 12 Apr 2017 11:45:03 -0700
Subject: [PATCH 1091/1304] cleanup: delete unused code (function)

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
---
 rkt/list.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rkt/list.go b/rkt/list.go
index a6f8077c92..3972b724db 100644
--- a/rkt/list.go
+++ b/rkt/list.go
@@ -230,10 +230,6 @@ func newPodListReadError(p *pkgPod.Pod, err error) error {
 	return fmt.Errorf("%s", strings.Join(lines, "\n"))
 }
 
-func newPodListZeroAppsError(p *pkgPod.Pod) error {
-	return fmt.Errorf("pod %s contains zero apps", p.UUID.String())
-}
-
 func newPodListLoadImageManifestError(p *pkgPod.Pod, err error) error {
 	return errwrap.Wrap(fmt.Errorf("pod %s ImageManifest could not be loaded", p.UUID.String()), err)
 }

From cf913418caff7edff4a35f0395e19e27cd414a25 Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@hashbangbash.com>
Date: Mon, 17 Apr 2017 14:31:00 -0400
Subject: [PATCH 1092/1304] treestore: changes for golint

(the couple of changes to non-exported varialbes/functions were because
they were not found to be used anywhere.)

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
---
 store/treestore/tree.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/store/treestore/tree.go b/store/treestore/tree.go
index 89ab80aa7b..78192eaf55 100644
--- a/store/treestore/tree.go
+++ b/store/treestore/tree.go
@@ -57,6 +57,7 @@ const (
 )
 
 var (
+	// ErrReadHashfile when the hashfile cannot be read
 	ErrReadHashfile = errors.New("cannot read hash file")
 )
 
@@ -68,6 +69,7 @@ type Store struct {
 	lockDir string
 }
 
+// NewStore creates a Store for managing filesystem trees, including the dependency graph resolution of the underlying image layers.
 func NewStore(dir string, store *imagestore.Store) (*Store, error) {
 	// TODO(sgotti) backward compatibility with the current tree store paths. Needs a migration path to better paths.
 	ts := &Store{dir: filepath.Join(dir, "tree"), store: store}
@@ -349,7 +351,7 @@ func (ts *Store) Hash(id string) (string, error) {
 	treepath := ts.GetPath(id)
 
 	hash := sha512.New()
-	iw := NewHashWriter(hash)
+	iw := newHashWriter(hash)
 	err := filepath.Walk(treepath, buildWalker(treepath, iw))
 	if err != nil {
 		return "", errwrap.Wrap(errors.New("error walking rootfs"), err)
@@ -417,8 +419,8 @@ type xattr struct {
 type fileInfo struct {
 	Name     string // name of header file entry
 	Mode     int64  // permission and mode bits
-	Uid      int    // user id of owner
-	Gid      int    // group id of owner
+	UID      int    // user id of owner
+	GID      int    // group id of owner
 	Size     int64  // length in bytes
 	Typeflag byte   // type of header entry
 	Linkname string // target name of link
@@ -427,12 +429,12 @@ type fileInfo struct {
 	Xattrs   []xattr
 }
 
-func FileInfoFromHeader(hdr *tar.Header) *fileInfo {
+func fileInfoFromHeader(hdr *tar.Header) *fileInfo {
 	fi := &fileInfo{
 		Name:     hdr.Name,
 		Mode:     hdr.Mode,
-		Uid:      hdr.Uid,
-		Gid:      hdr.Gid,
+		UID:      hdr.Uid,
+		GID:      hdr.Gid,
 		Size:     hdr.Size,
 		Typeflag: hdr.Typeflag,
 		Linkname: hdr.Linkname,
@@ -527,13 +529,13 @@ type imageHashWriter struct {
 	io.Writer
 }
 
-func NewHashWriter(w io.Writer) specaci.ArchiveWriter {
+func newHashWriter(w io.Writer) specaci.ArchiveWriter {
 	return &imageHashWriter{w}
 }
 
 func (aw *imageHashWriter) AddFile(hdr *tar.Header, r io.Reader) error {
 	// Write the json encoding of the FileInfo struct
-	hdrj, err := json.Marshal(FileInfoFromHeader(hdr))
+	hdrj, err := json.Marshal(fileInfoFromHeader(hdr))
 	if err != nil {
 		return err
 	}

From ee5df59375b8ad353f3069eed33a7d5e47202d3b Mon Sep 17 00:00:00 2001
From: Fox Wilson <foxwilson123@gmail.com>
Date: Wed, 19 Apr 2017 14:22:36 -0500
Subject: [PATCH 1093/1304] Documentation/integrations.md: typo fix

Change "open an extensible" (a typo/incorrect) to "open and extensible".
---
 Documentation/integrations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/integrations.md b/Documentation/integrations.md
index 6fbeeb9e03..6d15220bc2 100644
--- a/Documentation/integrations.md
+++ b/Documentation/integrations.md
@@ -16,6 +16,6 @@ This document tracks projects that integrate with rkt. [Join the community](http
 
 [SELinux](https://coreos.com/rkt/docs/latest/selinux.html): an access control and security toolkit for containers.
 
-[Linux](https://coreos.com/rkt/docs/latest/distributions.html): an open an extensible OS. rkt is included in the package managers on Red Hat, Ubuntu, and many other popular Linux distributions.
+[Linux](https://coreos.com/rkt/docs/latest/distributions.html): an open and extensible OS. rkt is included in the package managers on Red Hat, Ubuntu, and many other popular Linux distributions.
 
 [cAdvisor](https://github.com/google/cadvisor): a daemon that monitors resource usage and performance for running containers.

From 51ed31603fbef602f42c5d0447a31314dec37ba2 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Thu, 20 Apr 2017 23:54:21 -0500
Subject: [PATCH 1094/1304] tests: improve image verify fail output

---
 tests/rkt_image_verify_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_image_verify_test.go b/tests/rkt_image_verify_test.go
index b0a50a4f7a..093dac556b 100644
--- a/tests/rkt_image_verify_test.go
+++ b/tests/rkt_image_verify_test.go
@@ -59,7 +59,7 @@ func TestImageVerify(t *testing.T) {
 		t.Fatalf("unable to walk treestore %v: %v", treestorePath, err)
 	}
 	if numDeleted != 1 {
-		t.Fatalf("expected to find one 'inspect' binary in the tree to delete")
+		t.Fatalf("expected to find one 'inspect' binary in the tree to delete; found %v", numDeleted)
 	}
 
 	cmd := fmt.Sprintf("%s image verify %s", ctx.Cmd(), imgHash)

From ad9dc6cd436b1b9bb13d40d2b7b25bb59d2b6a3e Mon Sep 17 00:00:00 2001
From: Chris Aniszczyk <caniszczyk@gmail.com>
Date: Tue, 25 Apr 2017 15:44:41 -0500
Subject: [PATCH 1095/1304] Add code of conduct

Required by CNCF.

Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
---
 CODE-OF-CONDUCT.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 CODE-OF-CONDUCT.md

diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md
new file mode 100644
index 0000000000..ee05c3b9bb
--- /dev/null
+++ b/CODE-OF-CONDUCT.md
@@ -0,0 +1,4 @@
+## Community Code of Conduct
+
+rkt follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+

From 028ebe0760270ba620848c51aff0f73d2ce7d6dc Mon Sep 17 00:00:00 2001
From: Brian 'Redbeard' Harrington <redbeard@dead-city.org>
Date: Thu, 27 Apr 2017 13:01:30 -0700
Subject: [PATCH 1096/1304] build / stage1: Transfer xattr data

Currently there is a combination where both xattr data cannot be
transferred from a squashfs image to the filesystem combined with the
fact that it's not there.  This at least enables the transfer in the
future, and silences some of the warnings in the build process.

If it is decided that xattrs should not be explicitly transferred in the
future this should be changed to -no-xattrs.
---
 stage1/usr_from_coreos/build-usr.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/usr_from_coreos/build-usr.mk b/stage1/usr_from_coreos/build-usr.mk
index 64cf3176ca..cf3c736b8f 100644
--- a/stage1/usr_from_coreos/build-usr.mk
+++ b/stage1/usr_from_coreos/build-usr.mk
@@ -169,7 +169,7 @@ $(call generate-stamp-rule,$(CBU_MKBASE_STAMP),$(CCN_SQUASHFS) $(CBU_COMPLETE_MA
 		echo -e "Files listed in $(CBU_COMPLETE_MANIFEST) are missing from $(CCN_SQUASHFS):\n$$$$(comm -1 -3 "$(CBU_SQUASHFS_FILES)" "$(CBU_COMPLETE_MANIFEST)")"; \
 		exit 1; \
 	fi; \
-	unsquashfs -dest "$(CBU_ROOTFS)/usr" -ef "$(CBU_COMPLETE_MANIFEST)" "$(CCN_SQUASHFS)"$(call vl3, >/dev/null))
+	unsquashfs -user-xattrs -dest "$(CBU_ROOTFS)/usr" -ef "$(CBU_COMPLETE_MANIFEST)" "$(CCN_SQUASHFS)"$(call vl3, >/dev/null))
 
 # If either squashfs file or the concatenated manifest file changes we
 # need to unpack the squashfs file again. Clean the directory holding

From e8fc11617aaa893bba891009850d29db42df7984 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Tue, 2 May 2017 17:41:25 -0700
Subject: [PATCH 1097/1304] tests/image_verify: skip on non-overlayfs systems

The treestore structure differs on those systems and so the test doesn't
work correctly.
---
 tests/rkt_image_verify_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/rkt_image_verify_test.go b/tests/rkt_image_verify_test.go
index 093dac556b..1684284f97 100644
--- a/tests/rkt_image_verify_test.go
+++ b/tests/rkt_image_verify_test.go
@@ -22,12 +22,17 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/tests/testutils"
 )
 
 // TestImageVerify tests 'rkt image verify'.
 // It renders an image, deletes a file from it, and verifies that 'verify' notices and repairs it.
 func TestImageVerify(t *testing.T) {
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Overlay fs not supported: %v", err)
+	}
+
 	tmpDir := mustTempDir("rkt-TestImageVerify-")
 	defer os.RemoveAll(tmpDir)
 

From fddc4d27f2eceb036202450aeda7624a0de6694a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Fri, 28 Apr 2017 11:43:13 +0000
Subject: [PATCH 1098/1304] stage0: deduplicate mounts based on clean path

---
 stage0/run.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/stage0/run.go b/stage0/run.go
index f3698c4b68..a4d4d8c6a0 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -173,9 +173,10 @@ func deduplicateMPs(mounts []schema.Mount) []schema.Mount {
 	var res []schema.Mount
 	seen := make(map[string]struct{})
 	for _, m := range mounts {
-		if _, ok := seen[m.Path]; !ok {
+		cleanPath := path.Clean(m.Path)
+		if _, ok := seen[cleanPath]; !ok {
 			res = append(res, m)
-			seen[m.Path] = struct{}{}
+			seen[cleanPath] = struct{}{}
 		}
 	}
 	return res

From be7d77c4de047053b53f7cdb63a215aa89d10843 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Fri, 28 Apr 2017 11:43:47 +0000
Subject: [PATCH 1099/1304] stage1: reject pods with duplicate volume names

---
 stage1/common/types/pod.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/stage1/common/types/pod.go b/stage1/common/types/pod.go
index 36560cb420..6f492f34e4 100644
--- a/stage1/common/types/pod.go
+++ b/stage1/common/types/pod.go
@@ -131,6 +131,15 @@ func LoadPod(root string, uuid *types.UUID, rp *RuntimePod) (*Pod, error) {
 	}
 	p.Manifest = pm
 
+	// ensure volumes names are unique
+	volNames := make(map[types.ACName]bool, len(pm.Volumes))
+	for _, vol := range pm.Volumes {
+		if volNames[vol.Name] {
+			return nil, fmt.Errorf("duplicate volume name %q", vol.Name)
+		}
+		volNames[vol.Name] = true
+	}
+
 	for i, app := range p.Manifest.Apps {
 		impath := common.ImageManifestPath(p.Root, app.Name)
 		buf, err := ioutil.ReadFile(impath)

From 048e3a50400c1f0986cdcf7af35a9893195ad500 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Fri, 28 Apr 2017 11:45:42 +0000
Subject: [PATCH 1100/1304] tests: check for clean path dedup and unique volume
 names

---
 tests/rkt_volume_mount_fly_test.go     |  3 ++-
 tests/rkt_volume_mount_generic_test.go |  3 ++-
 tests/rkt_volume_mount_test.go         | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/tests/rkt_volume_mount_fly_test.go b/tests/rkt_volume_mount_fly_test.go
index af9b703da5..c90d32f6fc 100644
--- a/tests/rkt_volume_mount_fly_test.go
+++ b/tests/rkt_volume_mount_fly_test.go
@@ -28,6 +28,7 @@ func TestVolumeMount(t *testing.T) {
 		volumeMountTestCasesRecursivePodManifest,
 		volumeMountTestCasesNonRecursivePodManifest,
 		volumeMountTestCasesNonRecursive,
+		volumeMountTestCasesDuplicateVolume,
 		{
 			{
 				"CLI: duplicate mount given",
@@ -40,7 +41,7 @@ func TestVolumeMount(t *testing.T) {
 				fmt.Sprintf(
 					"--volume=test1,kind=host,source=%s --mount volume=test1,target=%s --volume=test2,kind=host,source=%s --mount volume=test1,target=%s",
 					volDir, mountDir,
-					volDir, mountDir,
+					volDir, mountDir+"/",
 				),
 				nil,
 				`run: can't evaluate mounts: missing mount for volume "test2"`,
diff --git a/tests/rkt_volume_mount_generic_test.go b/tests/rkt_volume_mount_generic_test.go
index 5cf495d774..adf5e62ed4 100644
--- a/tests/rkt_volume_mount_generic_test.go
+++ b/tests/rkt_volume_mount_generic_test.go
@@ -28,6 +28,7 @@ func TestVolumeMount(t *testing.T) {
 		volumeMountTestCasesRecursivePodManifest,
 		volumeMountTestCasesNonRecursivePodManifest,
 		volumeMountTestCasesNonRecursive,
+		volumeMountTestCasesDuplicateVolume,
 		{
 			{
 				"CLI: duplicate mount given",
@@ -40,7 +41,7 @@ func TestVolumeMount(t *testing.T) {
 				fmt.Sprintf(
 					"--volume=test1,kind=host,source=%s --mount volume=test1,target=%s --volume=test2,kind=host,source=%s --mount volume=test1,target=%s",
 					volDir, mountDir,
-					volDir, mountDir,
+					volDir, mountDir+"/",
 				),
 				nil,
 				innerFileContent,
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
index e74c26201f..67ff9aac71 100644
--- a/tests/rkt_volume_mount_test.go
+++ b/tests/rkt_volume_mount_test.go
@@ -307,6 +307,21 @@ var (
 			outerFileContent,
 		},
 	}
+
+	volumeMountTestCasesDuplicateVolume = []volumeMountTestCase{
+		{
+			"CLI: duplicate volume name",
+			[]imagePatch{
+				{"rkt-test-run-pod-manifest-duplicate-mount.aci", []string{}},
+			},
+			fmt.Sprintf(
+				"--volume=test,kind=host,source=%s --mount volume=test,target=%s --volume=test,kind=empty --mount volume=test,target=%s",
+				volDir, mountDir, path.Join(mountDir, "dup"),
+			),
+			nil,
+			"duplicate volume name",
+		},
+	}
 )
 
 func NewTestVolumeMount(volumeMountTestCases [][]volumeMountTestCase) testutils.Test {

From 1916ca714308bb6d53e6041b3d866932df66177a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Wed, 3 May 2017 14:35:33 +0000
Subject: [PATCH 1101/1304] stage1/fly: skip unused pod volumes

---
 stage1_fly/run/main.go             | 11 ++++++++---
 tests/rkt_volume_mount_fly_test.go | 20 +-------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index e3ac2943f3..90bad42a21 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -157,11 +157,16 @@ func evaluateMounts(rfs string, app string, p *stage1commontypes.Pod) ([]flyMoun
 		// Check if we have a mount for this volume
 		tuple, exists := namedVolumeMounts[v.Name]
 		if !exists {
-			return nil, fmt.Errorf("missing mount for volume %q", v.Name)
-		} else if tuple.M.Volume != v.Name {
-			// assertion regarding the implementation, should never happen
+			diag.Printf("skipping unused volume %q", v.Name)
+			continue
+		}
+
+		// Assertion regarding the implementation, should never happen
+		if tuple.M.Volume != v.Name {
 			return nil, fmt.Errorf("mismatched volume:mount pair: %q != %q", v.Name, tuple.M.Volume)
 		}
+
+		// Augment and replace mount entry, adding volume info
 		namedVolumeMounts[v.Name] = volumeMountTuple{V: v, M: tuple.M}
 		diag.Printf("adding %+v", namedVolumeMounts[v.Name])
 	}
diff --git a/tests/rkt_volume_mount_fly_test.go b/tests/rkt_volume_mount_fly_test.go
index c90d32f6fc..8e9fbec9ca 100644
--- a/tests/rkt_volume_mount_fly_test.go
+++ b/tests/rkt_volume_mount_fly_test.go
@@ -17,7 +17,6 @@
 package main
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -29,22 +28,5 @@ func TestVolumeMount(t *testing.T) {
 		volumeMountTestCasesNonRecursivePodManifest,
 		volumeMountTestCasesNonRecursive,
 		volumeMountTestCasesDuplicateVolume,
-		{
-			{
-				"CLI: duplicate mount given",
-				[]imagePatch{
-					{
-						"rkt-test-run-read-file.aci",
-						[]string{fmt.Sprintf("--exec=/inspect --read-file --file-name %s", mountFilePath)},
-					},
-				},
-				fmt.Sprintf(
-					"--volume=test1,kind=host,source=%s --mount volume=test1,target=%s --volume=test2,kind=host,source=%s --mount volume=test1,target=%s",
-					volDir, mountDir,
-					volDir, mountDir+"/",
-				),
-				nil,
-				`run: can't evaluate mounts: missing mount for volume "test2"`,
-			},
-		}}).Execute(t)
+	}).Execute(t)
 }

From f71c822b48b1d197553f74244879f9c2f005a0ae Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Mon, 8 May 2017 10:53:55 +0000
Subject: [PATCH 1102/1304] tests/caps: skip if overlayfs support is missing

Capabilities tests produce a very large combination of images and
unpacked pods, which can easily fill all disk space on systems without
overlayfs support.
As we are currently hitting such limit on SemaphoreCI, this commit
makes caps tests optional by skipping them if overlayfs can't be used.
---
 tests/rkt_caps_test.go | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go
index cc74e463d2..17d8c602a7 100644
--- a/tests/rkt_caps_test.go
+++ b/tests/rkt_caps_test.go
@@ -22,6 +22,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/tests/testutils"
 	"github.com/syndtr/gocapability/capability"
 )
@@ -313,6 +314,10 @@ func capsSeveralAppsRunAndCheckOutput(t *testing.T, ctx *testutils.RktRunCtx, cm
 }
 
 func TestCapsSeveralAppWithPatches(t *testing.T) {
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Skipping storage-intensive test, overlayfs not supported: %v", err)
+	}
+
 	// All the following images are launched together in the same pod
 
 	ctx := testutils.NewRktRunCtx()
@@ -346,8 +351,11 @@ func TestCapsSeveralAppWithPatches(t *testing.T) {
 }
 
 func TestCapsSeveralAppWithFlags(t *testing.T) {
-	// All the following images are launched together in the same pod
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Skipping storage-intensive test, overlayfs not supported: %v", err)
+	}
 
+	// All the following images are launched together in the same pod
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
@@ -385,6 +393,10 @@ func TestCapsSeveralAppWithFlags(t *testing.T) {
 
 // Tests that flags on the command line override the isolator in the ACI
 func TestCapsOverride(t *testing.T) {
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Skipping storage-intensive test, overlayfs not supported: %v", err)
+	}
+
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
@@ -502,6 +514,10 @@ func TestCapsOverride(t *testing.T) {
 
 // Tests that --insecure-options=capabilities allows everything
 func TestCapsInsecureOption(t *testing.T) {
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Skipping storage-intensive test, overlayfs not supported: %v", err)
+	}
+
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 
@@ -700,6 +716,10 @@ func NewCapsTest(hasStage1FullCaps bool) testutils.Test {
 }
 
 func TestCapsNonRoot(t *testing.T) {
+	if err := common.SupportsOverlay(); err != nil {
+		t.Skipf("Skipping storage-intensive test, overlayfs not supported: %v", err)
+	}
+
 	ctx := testutils.NewRktRunCtx()
 	defer ctx.Cleanup()
 

From 0a4eac9c5cee4c9d36ff3045b416d3ecfadb0416 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 24 Mar 2017 14:10:40 +0100
Subject: [PATCH 1103/1304] kvm/qemu: add extra kernel parameters

For testing purpose, I need to add extra kernel parameters in the VM.

Implemented in this way:

sudo RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS="foo1=bar foo2=bar" \
  ./build-rkt-1.21.0+git/target/bin/rkt run \
  --stage1-path=$PWD/build-rkt-1.21.0+git/target/bin/stage1-kvm.aci \
  --insecure-options=image --interactive \
  docker://busybox --cpu 1 --exec sh -- -c \
  'cat /proc/cmdline'

noapic noacpi pci=conf1 reboot=k panic=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 console=ttyS0 i8042.noaux=1 rw rootflags=trans=virtio,version=9p2000.L,cache=mmap rootfstype=9p systemd.default_standard_error=journal+console systemd.default_standard_output=journal+console systemd.machine_id=3a2af63d415946778491bda1cb828c57 console=hvc0 init=/usr/lib/systemd/systemd no_timer_check noreplace-smp tsc=reliable systemd.show_status=false systemd.log_target=null rd.udev.log-priority=3 quiet=vga quiet systemd.log_level=emerg foo1=bar foo2=bar
---
 Documentation/running-kvm-stage1.md      | 19 +++++++++++++++++++
 stage1/init/kvm/hypervisor/hypervisor.go |  7 +++++++
 2 files changed, 26 insertions(+)

diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 559f3ee0ab..26d185b68c 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -78,3 +78,22 @@ This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.25.0
 [rkt-arch-stage1]: devel/architecture.md#stage-1
 [rkt-run]: subcommands/run.md#use-a-custom-stage-1
 [stage1-implementers-guide]: devel/stage1-implementors-guide.md
+
+## Additional parameters
+
+The KVM stage1 has some hypervisor specific parameters that can change the execution environment.
+
+### Extra kernel command line parameters
+
+Additional [Linux kernel's command line parameters](https://www.kernel.org/doc/html/latest/admin-guide/kernel-parameters.html) can be passed via the environment variable `RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS`:
+
+```
+sudo RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS="systemd.unified_cgroup_hierarchy=true max_loop=12 possible_cpus=1" \
+      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.25.0 \
+      ...
+```
+
+The three command line parameters above are just examples and they are documented respectively in:
+- [systemd's kernel command line parameters](https://www.freedesktop.org/software/systemd/man/kernel-command-line.html)
+- [Linux' parameters](https://github.com/torvalds/linux/blob/master/Documentation/admin-guide/kernel-parameters.txt)
+- [Linux' CPU hotplug](https://github.com/torvalds/linux/blob/master/Documentation/core-api/cpu_hotplug.rst)
diff --git a/stage1/init/kvm/hypervisor/hypervisor.go b/stage1/init/kvm/hypervisor/hypervisor.go
index f4508d9eeb..75d3cf2793 100644
--- a/stage1/init/kvm/hypervisor/hypervisor.go
+++ b/stage1/init/kvm/hypervisor/hypervisor.go
@@ -14,6 +14,8 @@
 
 package hypervisor
 
+import "os"
+
 // KvmHypervisor structure describes KVM hypervisor binary and its parameters
 type KvmHypervisor struct {
 	Bin          string
@@ -44,4 +46,9 @@ func (hv *KvmHypervisor) InitKernelParams(isDebug bool) {
 			"quiet systemd.log_level=emerg",
 		}...)
 	}
+
+	customKernelParams := os.Getenv("RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS")
+	if customKernelParams != "" {
+		hv.KernelParams = append(hv.KernelParams, customKernelParams)
+	}
 }

From 5f49ab061603361b9a10e783810220bcbab4159b Mon Sep 17 00:00:00 2001
From: Tino Rusch <tino.rusch@webvariants.de>
Date: Mon, 10 Apr 2017 14:18:09 +0200
Subject: [PATCH 1104/1304] seccomp: add ARM specific syscalls if on an ARM
 device.

This enables us to run binaries which use these syscalls when systemd has seccomp enforcing enabled.
Like reported this should affect at least all gcc compiled binaries.

This solves issue #3629.
---
 stage1/init/common/seccomp_wildcards.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/stage1/init/common/seccomp_wildcards.go b/stage1/init/common/seccomp_wildcards.go
index afc5b75409..85ddac0f3f 100644
--- a/stage1/init/common/seccomp_wildcards.go
+++ b/stage1/init/common/seccomp_wildcards.go
@@ -16,6 +16,8 @@
 
 package common
 
+import "runtime"
+
 // seccomp default whitelists/blacklists.
 // rkt tries not to diverge from docker here, for the moment.
 
@@ -392,6 +394,16 @@ var (
 		"vm86old",
 	}
 
+	//RktDefaultSeccompArmWhitelist contains the additional needed syscalls for arm support
+	RktDefaultSeccompArmWhitelist = []string{
+		"arm_fadvise64_64",
+		"arm_sync_file_range",
+		"breakpoint",
+		"cacheflush",
+		"set_tls",
+		"sync_file_range2",
+	}
+
 	// RktDefaultSeccompBlacklist contains a default blacklist of syscalls,
 	// used by rkt for seccomp filtering.
 	RktDefaultSeccompBlacklist = DockerDefaultSeccompBlacklist
@@ -399,3 +411,9 @@ var (
 	// used by rkt for seccomp filtering.
 	RktDefaultSeccompWhitelist = DockerDefaultSeccompWhitelist
 )
+
+func init() {
+	if arch := runtime.GOARCH; arch == "arm" || arch == "arm64" {
+		RktDefaultSeccompWhitelist = append(RktDefaultSeccompWhitelist, RktDefaultSeccompArmWhitelist...)
+	}
+}

From 2524cd96741e820cc2b786f658e54d2f9234ba03 Mon Sep 17 00:00:00 2001
From: Tino Rusch <tino.rusch@gmail.com>
Date: Fri, 12 May 2017 11:52:32 +0200
Subject: [PATCH 1105/1304] release: updated changelog for v1.26.0

---
 CHANGELOG.md | 68 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39a42a497f..db1f0e0ad1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.26.0
+
+This minor release contains bugfixes and other improvements. It also adds better support for the arm architecture to rkt, so that you can now fetch images via autodiscovery and have the correct seccomp whitelist to run them. Also notable is the new possibilty to pass extra kernel parameters to kvm, and last but not least a significant prepare/run speedup in stage0. This also introduces stricter validation on volume names, now rejecting duplicate ones.
+
+## New Features
+- stage1: improve duplicate mount-volume detection ([#3666](https://github.com/rkt/rkt/pull/3666)). Breaking change: volumes with duplicate names are now rejected.
+- stage0/{run,prepare}: remove ondisk verification ([#3623](https://github.com/rkt/rkt/pull/3623)). For backwards compatibility, specifying 'insecure-options=ondisk' will still run without error, however it will also not do anything.
+- kvm/qemu: add extra kernel parameters ([#3644](https://github.com/rkt/rkt/pull/3644)).
+
+## Bugfixes
+- seccomp: add arch-specific syscalls on ARM ([#3636](https://github.com/rkt/rkt/pull/3636)).
+- fetch: use proper appc os/arch labels ([#3621](https://github.com/rkt/rkt/pull/3621)).
+- tests/caps: skip if overlayfs support is missing ([#3670](https://github.com/rkt/rkt/pull/3670)).
+- build/stage1: transfer user xattr data ([#3665](https://github.com/rkt/rkt/pull/3665)).
+- stage1: include <sys/sysmacros.h> for makedev function ([#3604](https://github.com/rkt/rkt/pull/3604)).
+
+## Other changes
+- Add code of conduct ([#3661](https://github.com/rkt/rkt/pull/3661)). Required by CNCF.
+- rkt list|status: app state info (i.e. exit codes) in --format=json ([#3638](https://github.com/rkt/rkt/pull/3638)).
+- integrations: add mesos ([#3624](https://github.com/rkt/rkt/pull/3624)).
+- Documentation: add container linux and tectonic as production users ([#3618](https://github.com/rkt/rkt/pull/3618)).
+- Documentation: add Gentoo to the list of distributions that have rkt ([#3613](https://github.com/rkt/rkt/pull/3613)).
+- Documentation: add some individual blog posts ([#3611](https://github.com/rkt/rkt/pull/3611)).
+- Documentation: cleanup stage1 stuff ([#3612](https://github.com/rkt/rkt/pull/3612)).
+- dist: use multi-user.target instead of default.target ([#3620](https://github.com/rkt/rkt/pull/3620)).
+- added production-users and integrations pages ([#3602](https://github.com/rkt/rkt/pull/3602)).
+- scripts: update rkt-builder version ([#3595](https://github.com/rkt/rkt/pull/3595)).
+
 ## 1.25.0
 
 This minor release contains bugfixes and other improvements related to the KVM flavour, which is now using qemu-kvm by default.
@@ -81,7 +109,7 @@ This release adds a lot of bugfixes around the rkt fly flavor, garbage collectio
 - stage1: kvm: Update kernel to 4.9.2 ([#3530](https://github.com/rkt/rkt/pull/3530)).
 - stage1: remount entire subcgroup r/w, instead of each knob ([#3494](https://github.com/rkt/rkt/pull/3494)).
 - tests: update AWS CI setup ([#3509](https://github.com/rkt/rkt/pull/3509)).
-- pkg/fileutil: helper function to get major, minor numbers of a device file ([#3500](https://github.com/rkt/rkt/pull/3500)). 
+- pkg/fileutil: helper function to get major, minor numbers of a device file ([#3500](https://github.com/rkt/rkt/pull/3500)).
 - pkg/log: correctly handle var-arg printf params ([#3516](https://github.com/rkt/rkt/pull/3516)).
 - Documentation/stop: describe --uuid-file option ([#3511](https://github.com/rkt/rkt/pull/3511)).
 
@@ -198,7 +226,7 @@ A new experimental `app` subcommand has been introduced, which allows creating a
 ### Other changes
 - cgroup/v1: introduce mount flags to mountFsRO ([#3350](https://github.com/rkt/rkt/pull/3350)).
 - kvm: update QEMU version to 2.7.0 ([#3341](https://github.com/rkt/rkt/pull/3341)).
-- kvm: bump kernel version to 4.8.6, updated config ([#3342](https://github.com/rkt/rkt/pull/3342)). 
+- kvm: bump kernel version to 4.8.6, updated config ([#3342](https://github.com/rkt/rkt/pull/3342)).
 - vendor: introduce kr/pretty and bump go-systemd ([#3333](https://github.com/rkt/rkt/pull/3333)).
 - vendor: update docker2aci to 0.14.0 ([#3356](https://github.com/rkt/rkt/pull/3356)).
 - tests: add the --debug option to more tests ([#3340](https://github.com/rkt/rkt/pull/3340)).
@@ -211,20 +239,20 @@ This minor release contains bugfixes, UX enhancements, and other improvements.
 
 ### UX changes:
 - rkt: gate diagnostic output behind `--debug` ([#3297](https://github.com/rkt/rkt/pull/3297)).
-- rkt: Change exit codes to 254 ([#3261](https://github.com/rkt/rkt/pull/3261)). 
+- rkt: Change exit codes to 254 ([#3261](https://github.com/rkt/rkt/pull/3261)).
 
 
 ### Bug fixes:
-- stage1/kvm: correctly bind-mount read-only volumes ([#3304](https://github.com/rkt/rkt/pull/3304)). 
-- stage0/cas: apply xattr attributes ([#3305](https://github.com/rkt/rkt/pull/3305)). 
-- scripts/install-rkt: add iptables dependency ([#3309](https://github.com/rkt/rkt/pull/3309)). 
+- stage1/kvm: correctly bind-mount read-only volumes ([#3304](https://github.com/rkt/rkt/pull/3304)).
+- stage0/cas: apply xattr attributes ([#3305](https://github.com/rkt/rkt/pull/3305)).
+- scripts/install-rkt: add iptables dependency ([#3309](https://github.com/rkt/rkt/pull/3309)).
 - stage0/image: set proxy if InsecureSkipVerify is set ([#3303](https://github.com/rkt/rkt/pull/3303)).
 
 ### Other changes
 - vendor: update docker2aci to 0.13.0 ([#3314](https://github.com/rkt/rkt/pull/3314)). This fixes multiple fetching and conversion bugs, including two security issues.
-- scripts: update glide vendor script ([#3313](https://github.com/rkt/rkt/pull/3313)). 
-- vendor: update appc/spec to v0.8.8 ([#3310](https://github.com/rkt/rkt/pull/3310)). 
-- stage1: update to CoreOS 1192.0.0 (and update sanity checks) ([#3283](https://github.com/rkt/rkt/pull/3283)). 
+- scripts: update glide vendor script ([#3313](https://github.com/rkt/rkt/pull/3313)).
+- vendor: update appc/spec to v0.8.8 ([#3310](https://github.com/rkt/rkt/pull/3310)).
+- stage1: update to CoreOS 1192.0.0 (and update sanity checks) ([#3283](https://github.com/rkt/rkt/pull/3283)).
 - cgroup: introduce proper cgroup/v1, cgroup/v2 packages ([#3277](https://github.com/rkt/rkt/pull/3277)).
 - Documentation updates: ([#3281](https://github.com/rkt/rkt/pull/3281)), ([#3319](https://github.com/rkt/rkt/pull/3319)), ([#3308](https://github.com/rkt/rkt/pull/3308)).
 
@@ -306,7 +334,7 @@ This release updates the coreos and kvm flavors, bringing in a newer stable syst
 - rkt: avoid possible panic in api-server ([#3111](https://github.com/rkt/rkt/pull/3111)).
 - rkt/run: allow --set-env-file files with comments ([#3115](https://github.com/rkt/rkt/pull/3115)).
 - scripts/install-rkt: add wget as dependency ([#3124](https://github.com/rkt/rkt/pull/3124)).
-- install-rkt.sh: scripts: Fix missing files in .deb when using install-rkt.sh ([#3127](https://github.com/rkt/rkt/pull/3127)). 
+- install-rkt.sh: scripts: Fix missing files in .deb when using install-rkt.sh ([#3127](https://github.com/rkt/rkt/pull/3127)).
 - tests: check for run-prepared with insecure options ([#3139](https://github.com/rkt/rkt/pull/3139)).
 
 #### Other changes
@@ -503,7 +531,7 @@ This release focuses on bug fixes and developer tooling and UX improvements.
 - rkt/run: added --set-env-file switch and priorities for environments ([#2816](https://github.com/rkt/rkt/pull/2816)). --set-env-file gets an environment variables file path in the format "VAR=VALUE\n...".
 - run: add --cap-retain and --cap-remove ([#2771](https://github.com/rkt/rkt/pull/2771)).
 - store: print more information on rm as non-root ([#2805](https://github.com/rkt/rkt/pull/2805)).
-- Documentation/vagrant: use rkt binary for getting started ([#2808](https://github.com/rkt/rkt/pull/2808)). 
+- Documentation/vagrant: use rkt binary for getting started ([#2808](https://github.com/rkt/rkt/pull/2808)).
 - docs: New file in documentation - instruction for new developers in rkt ([#2639](https://github.com/rkt/rkt/pull/2639)).
 - stage0/trust: change error message if prefix/root flag missing ([#2661](https://github.com/rkt/rkt/pull/2661)).
 
@@ -516,10 +544,10 @@ This release focuses on bug fixes and developer tooling and UX improvements.
 
 #### Other changes
 
-- stage1: update coreos image to 1068.0.0 ([#2821](https://github.com/rkt/rkt/pull/2821)). 
+- stage1: update coreos image to 1068.0.0 ([#2821](https://github.com/rkt/rkt/pull/2821)).
 - KVM: Update LKVM patch to mount with mmap mode ([#2795](https://github.com/rkt/rkt/pull/2795)).
 - stage1: always write /etc/machine-id ([#2440](https://github.com/rkt/rkt/pull/2440)). Prepare rkt for systemd-v230 in stage1.
-- stage1/prepare-app: always adjust /etc/hostname ([#2761](https://github.com/rkt/rkt/pull/2761)). 
+- stage1/prepare-app: always adjust /etc/hostname ([#2761](https://github.com/rkt/rkt/pull/2761)).
 
 ## v1.8.0
 
@@ -613,7 +641,7 @@ This release focuses on security enhancements. It provides additional isolators,
 - dist: Update tmpfiles to create /etc/rkt ([#2472](https://github.com/rkt/rkt/pull/2472)). By creating this directory, users can run `rkt trust` without being root, if the user is in the rkt group.
 - Invoke gofmt with simplify-code flag ([#2489](https://github.com/rkt/rkt/pull/2489)). Enables code simplification checks of gofmt.
 - Implement composable uid/gid generators ([#2510](https://github.com/rkt/rkt/pull/2510)). This cleans up the code a bit and implements uid/gid functionality for rkt fly.
-- stage1: download CoreOS over HTTPS ([#2568](https://github.com/rkt/rkt/pull/2568)). 
+- stage1: download CoreOS over HTTPS ([#2568](https://github.com/rkt/rkt/pull/2568)).
 - Documentation updates ([#2555](https://github.com/rkt/rkt/pull/2555), [#2609](https://github.com/rkt/rkt/pull/2609), [#2605](https://github.com/rkt/rkt/pull/2605), [#2578](https://github.com/rkt/rkt/pull/2578), [#2614](https://github.com/rkt/rkt/pull/2614), [#2579](https://github.com/rkt/rkt/pull/2579), [#2570](https://github.com/rkt/rkt/pull/2570)).
 - Test improvements ([#2613](https://github.com/rkt/rkt/pull/2613), [#2566](https://github.com/rkt/rkt/pull/2566), [#2508](https://github.com/rkt/rkt/pull/2508)).
 
@@ -707,7 +735,7 @@ This release includes a number of new features and bugfixes like a new config su
 
 - kvm: fix pid vs ppid usage ([#2396](https://github.com/rkt/rkt/pull/2396)). Fixes a bug in `rkt enter` in the kvm flavor causing an infinite loop.
 
-- kvm: Fix connectivity issue in macvtap networks caused by macvlan NICs having incorrect names ([#2181](https://github.com/rkt/rkt/pull/2181)). 
+- kvm: Fix connectivity issue in macvtap networks caused by macvlan NICs having incorrect names ([#2181](https://github.com/rkt/rkt/pull/2181)).
 
 - tests: TestRktListCreatedStarted: fix timing issue causing the test to fail on slow machines ([#2366](https://github.com/rkt/rkt/pull/2366)).
 
@@ -1289,7 +1317,7 @@ fixes and a new ipvlan network plugin.
 
 rkt 0.5.5 includes a move to [cni](https://github.com/appc/cni) network
 plugins, a number of minor bug fixes and two new experimental commands for
-handling images: `rkt images` and `rkt rmimage`. 
+handling images: `rkt images` and `rkt rmimage`.
 
 Full changelog:
 - switched to using [cni](https://github.com/appc/cni) based network plugins
@@ -1311,10 +1339,10 @@ more. Further, although we aren't yet guaranteeing API/ABI stability between
 releases, we have added important work towards this goal including functional
 testing and database migration code.
 
-This release also sees the removal of the `--spawn-metadata-svc` flag to 
+This release also sees the removal of the `--spawn-metadata-svc` flag to
 `rkt run`. The flag was originally provided as a convenience, making it easy
 for users to get started with the metadata service.  In rkt v0.5.4 we removed
-it in favor of explicitly starting it via `rkt metadata-service` command. 
+it in favor of explicitly starting it via `rkt metadata-service` command.
 
 Full changelog:
 - added configuration support for repository authentication (HTTP Basic Auth,
@@ -1331,7 +1359,7 @@ Full changelog:
 - the store DB now supports migrations for future versions
 - systemd-nspawn machine names are now set to pod UUID
 - removed the `--spawn-metadata-svc` option from `rkt run`; this mode was
-  inherently racy and really only for convenience. A separate 
+  inherently racy and really only for convenience. A separate
   `rkt metadata-service` invocation should be used instead.
 - various internal codebase refactoring: "cas" renamed to "store", tasks to
   encapsulate image fetch operations, etc
@@ -1434,7 +1462,7 @@ of the [appc spec](https://github.com/appc/spec/releases/tag/v0.4.0) yesterday.
 Note that due to the introduction of a database for indexing the local CAS,
 users upgrading from previous versions of Rocket on a system may need to clear
 their local cache by removing the `cas` directory. For example, using the
-standard Rocket setup, this would be accomplished with 
+standard Rocket setup, this would be accomplished with
 `rm -fr /var/lib/rkt/cas`.
 
 Major changes since v0.3.2:

From 9e7a7acbde5a3464bf23176e9d19b2c55a8b2354 Mon Sep 17 00:00:00 2001
From: Tino Rusch <tino.rusch@gmail.com>
Date: Fri, 12 May 2017 11:52:45 +0200
Subject: [PATCH 1106/1304] version: bump to v1.26.0

---
 Documentation/distributions.md       | 16 ++++++++--------
 Documentation/proposals/oci.md       |  6 +++---
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  6 +++---
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 17 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 7efeb744c2..dd16953e3d 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -141,19 +141,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt-1.25.0-1.x86_64.rpm
-wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt-1.25.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.25.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.25.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt-1.26.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt-1.26.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.26.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.26.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt_1.25.0-1_amd64.deb
-wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt_1.25.0-1_amd64.deb.asc
-gpg --verify rkt_1.25.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.25.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt_1.26.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt_1.26.0-1_amd64.deb.asc
+gpg --verify rkt_1.26.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.26.0-1_amd64.deb
 ```
 
 [coreos-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 4fe473c61d..04c2a404ef 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/rkt/rkt/blob/v1.25.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.25.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/rkt/rkt/blob/v1.25.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/rkt/rkt/blob/v1.26.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.26.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/rkt/rkt/blob/v1.26.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index e8ddfe3fc1..ef90ef32d8 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.25.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.26.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.25.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.26.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 26d185b68c..4fa47d7962 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -9,7 +9,7 @@ The KVM stage1 does not yet implement all of the default stage1's features and s
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
 ```
-sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.25.0 docker://redis
+sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.26.0 docker://redis
 ```
 
 This output is the same you'll get if you run a container-based rkt.
@@ -67,7 +67,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.25.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.26.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 
 [build-configure]: build-configure.md
@@ -89,7 +89,7 @@ Additional [Linux kernel's command line parameters](https://www.kernel.org/doc/h
 
 ```
 sudo RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS="systemd.unified_cgroup_hierarchy=true max_loop=12 possible_cpus=1" \
-      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.25.0 \
+      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.26.0 \
       ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 62afc231e1..80ab0acaa6 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.25.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.26.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.25.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.26.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 9e18107381..e080996f0a 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.25.0
+rkt Version: 1.26.0
 appc Version: 0.8.10
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 1efc6a305e..aa556ff750 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/rkt/rkt/releases/download/v1.25.0/rkt-v1.25.0.tar.gz
-tar xzvf rkt-v1.25.0.tar.gz
-cd rkt-v1.25.0
+wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt-v1.26.0.tar.gz
+tar xzvf rkt-v1.26.0.tar.gz
+cd rkt-v1.26.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index bd7acf652f..5407a0083d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.25.0+git], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.26.0], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index e4e6cd4f0c..16ca0cbf65 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.25.0"
+version="1.26.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index bb95208670..ffb2e48137 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.25.0"
+            "value": "1.26.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 08d342a5dd..094164f138 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.25.0"
+            "value": "1.26.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 62e866724b..55510a5e2b 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.25.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.26.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 781f9a343d..dc60181595 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -35,7 +35,7 @@ func TestRunOverrideExec(t *testing.T) {
 	noappManifest := schema.ImageManifest{
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
-			{"version", "1.25.0"},
+			{"version", "1.26.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index cd15e0a0ed..2d592a6155 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -46,7 +46,7 @@ func TestImageCatManifest(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.25.0"},
+			{"version", "1.26.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 1f59d7cbc4..f054f9958b 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -45,7 +45,7 @@ func TestImageExport(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.25.0"},
+			{"version", "1.26.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 8caa102d3d..78f83dc8e2 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -55,7 +55,7 @@ func TestImageRender(t *testing.T) {
 			{ImageName: "coreos.com/rkt-inspect"},
 		},
 		Labels: types.Labels{
-			{"version", "1.25.0"},
+			{"version", "1.26.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 2945fae6cd..6b683e90bc 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -58,7 +58,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"version", "1.25.0"},
+			{"version", "1.26.0"},
 		},
 	}
 

From 23a9289aba42b760fec548f9ade6f5968e496d60 Mon Sep 17 00:00:00 2001
From: Tino Rusch <tino.rusch@gmail.com>
Date: Fri, 12 May 2017 11:52:45 +0200
Subject: [PATCH 1107/1304] version: bump to v1.26.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5407a0083d..a701c58517 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.26.0], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.26.0+git], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 55510a5e2b..265ce4f0a2 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.26.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.26.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From f5fa445e50987a7fc402fce9883de5a17605323c Mon Sep 17 00:00:00 2001
From: Radhika Puthiyetath <radhika.puthiyetath@coreos.com>
Date: Wed, 17 May 2017 10:35:56 -0700
Subject: [PATCH 1108/1304] Documentation/trying-out-rkt.md: Reflect the latest
 ETCD version in rkt documentation

---
 Documentation/trying-out-rkt.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index aa556ff750..0a0562ef2a 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -161,7 +161,7 @@ just run `newgrp rkt` to enable it and continue in the same session.
 Now fetch the etcd image as an unprivileged user:
 
 ```
-./rkt fetch coreos.com/etcd:v2.3.7
+./rkt fetch coreos.com/etcd:v3.1.7
 ```
 
 Success! Now rkt can fetch and download images as an unprivileged user.
@@ -202,11 +202,11 @@ For more information, see the [detailed, step-by-step guide for the signing proc
 Now that the CoreOS public key is trusted, fetch the ACI using [`rkt fetch`][rkt-fetch]. This step doesn't need root privileges if the rkt host has been [configured for privilege separation][id-privsep]:
 
 ```
-$ rkt fetch coreos.com/etcd:v2.3.7
-rkt: searching for app image coreos.com/etcd:v2.3.7
-rkt: fetching image from https://github.com/coreos/etcd/releases/download/v2.3.7/etcd-v2.3.7-linux-amd64.aci
+$ rkt fetch coreos.com/etcd:v3.1.7
+rkt: searching for app image coreos.com/etcd:v3.1.7
+rkt: fetching image from https://github.com/coreos/etcd/releases/download/v3.1.7/etcd-v3.1.7-linux-amd64.aci
 Downloading aci: [==========================================   ] 3.47 MB/3.7 MB
-Downloading signature from https://github.com/coreos/etcd/releases/download/v2.3.7/etcd-v2.3.7-linux-amd64.aci.asc
+Downloading signature from https://github.com/coreos/etcd/releases/download/v3.1.7/etcd-v3.1.7-linux-amd64.asc
 rkt: signature verified:
   CoreOS ACI Builder <release@coreos.com>
 sha512-7d28419b27d5ae56cca97f4c6ccdd309c...
@@ -231,21 +231,21 @@ $ find /var/lib/rkt/cas/blob/
 According to the [App Container specification][aci-archives], the SHA-512 hash is that of the `tar` file compressed in the ACI, and can be examined with standard tools:
 
 ```
-$ wget https://github.com/coreos/etcd/releases/download/v2.3.7/etcd-v2.3.7-linux-amd64.aci
+$ wget https://github.com/coreos/etcd/releases/download/v3.1.7/etcd-v3.1.7-linux-amd64.aci
 ...
-$ gzip -dc etcd-v2.3.7-linux-amd64.aci > etcd-v2.3.7-linux-amd64.tar
-$ sha512sum etcd-v2.3.7-linux-amd64.tar
-7d28419b27d5ae56cca97f4c6ccdd309c95b967ca0119f6962b187d1287ec9967f49e367c36b0e44ecd73675bc06d112dec86386d0e9b84c2265cddd45d15020  etcd-v2.3.7-linux-amd64.tar
+$ gzip -dc etcd-v3.1.7-linux-amd64.aci >  etcd-v3.1.7-linux-amd64.tar
+$ sha512sum etcd-v3.1.7-linux-amd64.tar
+7d28419b27d5ae56cca97f4c6ccdd309c95b967ca0119f6962b187d1287ec9967f49e367c36b0e44ecd73675bc06d112dec86386d0e9b84c2265cddd45d15020  etcd-v3.1.7-linux-amd64.tar
 ```
 
 ### Running an ACI with rkt
 
-After it has been retrieved and stored locally, an ACI can be run by pointing [`rkt run`][rkt-run] at either the original image reference (in this case, `coreos.com/etcd:v2.3.7`), the ACI hash, or the full URL of the ACI. Therefore the following three examples are equivalent:
+After it has been retrieved and stored locally, an ACI can be run by pointing [`rkt run`][rkt-run] at either the original image reference (in this case, `coreos.com/etcd:v3.1.7`), the ACI hash, or the full URL of the ACI. Therefore the following three examples are equivalent:
 
 #### Running the container by ACI name and version
 
 ```
-$ sudo rkt run coreos.com/etcd:v2.3.7
+$ sudo rkt run coreos.com/etcd:v3.1.7
 ...
 Press ^] three times to kill container
 ```
@@ -261,7 +261,7 @@ $ sudo rkt run sha512-1eba37d9b344b33d272181e176da111e
 #### Running the container by ACI URL
 
 ```
-$ sudo rkt run https://github.com/coreos/etcd/releases/download/v2.3.7/etcd-v2.3.7-linux-amd64.aci
+$ sudo rkt run https://github.com/coreos/etcd/releases/download/v3.1.7/etcd-v3.1.7-linux-amd64.aci
 ...
 ^]]]
 ```

From f3d008bafa7d7f2f8645afd59eb549de81f5e349 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 18 May 2017 09:51:04 -0700
Subject: [PATCH 1109/1304] functional test: Fix manifest arch error

The manifest contains values for the ACI arch and OS, not the go
language values.

Fixes 'make check' errors like these when run an ARM64 machines:

  build: Layout failed validation: image manifest validation failed: bad arch "arm64" for linux (must be one of: [amd64 i386 aarch64 aarch64_be armv6l armv7l armv7b ppc64 ppc64le s390x])

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 tests/functional.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/functional.mk b/tests/functional.mk
index 2bb12fa264..dc58d612cd 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -187,8 +187,7 @@ $$(call forward-vars,$2/manifest,ABS_GO)
 $2/manifest: $4 | $2
 	$$(VQ) \
 	$$(call vb,v2,GEN,$$(call vsp,$$@)) \
-	GOARCH="$$$$($$(ABS_GO) env GOARCH)"; \
-	sed -e "s/@GOOS@/linux/" -e "s/@GOARCH@/$$$$GOARCH/" <$$< >$$@
+	sed -e "s/@GOOS@/linux/" -e "s/@GOARCH@/$${RKT_ACI_ARCH}/" <$$< >$$@
 
 $$(call forward-vars,$1,ACTOOL)
 $1: $2/manifest $2/rootfs/ace-validator | $2/rootfs/opt/acvalidator

From a69dd1727c2dd645bd73530c77a15b335504f1de Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 18 May 2017 09:51:04 -0700
Subject: [PATCH 1110/1304] imagestore: Fix sql resource leaks

When using sql queries the rows iterator needs to be closed if the entire query
result is not iterated over.  Failure to close the iterator results in resource
leakage.

Fixes errors like these seen with go1.8.1:

    Too many goroutines running after integration test(s).
    database/sql.(*Rows).awaitDone(0xc4201d9200, 0xd64000, 0xc4201e9b40)
            database/sql/sql.go:2121
    created by database/sql.(*Rows).initContextClose
            database/sql/sql.go:2116

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 store/imagestore/aciinfo.go      | 4 ++++
 store/imagestore/migrate_test.go | 8 ++++++++
 store/imagestore/remote.go       | 2 ++
 store/imagestore/schema.go       | 2 ++
 4 files changed, 16 insertions(+)

diff --git a/store/imagestore/aciinfo.go b/store/imagestore/aciinfo.go
index 1f96156fa8..242d15c77b 100644
--- a/store/imagestore/aciinfo.go
+++ b/store/imagestore/aciinfo.go
@@ -71,6 +71,7 @@ func GetACIInfosWithKeyPrefix(tx *sql.Tx, prefix string) ([]*ACIInfo, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		aciinfo := &ACIInfo{}
 		if err := aciinfoRowScan(rows, aciinfo); err != nil {
@@ -93,6 +94,7 @@ func GetACIInfosWithName(tx *sql.Tx, name string) ([]*ACIInfo, bool, error) {
 	if err != nil {
 		return nil, false, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		found = true
 		aciinfo := &ACIInfo{}
@@ -116,6 +118,7 @@ func GetACIInfoWithBlobKey(tx *sql.Tx, blobKey string) (*ACIInfo, bool, error) {
 	if err != nil {
 		return nil, false, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		found = true
 		if err := aciinfoRowScan(rows, aciinfo); err != nil {
@@ -147,6 +150,7 @@ func GetAllACIInfos(tx *sql.Tx, sortfields []string, ascending bool) ([]*ACIInfo
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		aciinfo := &ACIInfo{}
 		if err := aciinfoRowScan(rows, aciinfo); err != nil {
diff --git a/store/imagestore/migrate_test.go b/store/imagestore/migrate_test.go
index 49555560b6..67c9f73237 100644
--- a/store/imagestore/migrate_test.go
+++ b/store/imagestore/migrate_test.go
@@ -466,6 +466,7 @@ func getAllACIInfosV0_2(tx *sql.Tx) ([]*ACIInfoV0_2, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		aciinfo := &ACIInfoV0_2{}
 		if err := rows.Scan(&aciinfo.BlobKey, &aciinfo.AppName, &aciinfo.ImportTime, &aciinfo.Latest); err != nil {
@@ -485,6 +486,7 @@ func getAllACIInfosV3(tx *sql.Tx) ([]*ACIInfoV3, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		aciinfo := &ACIInfoV3{}
 		if rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.Latest); err != nil {
@@ -504,6 +506,7 @@ func getAllACIInfosV4(tx *sql.Tx) ([]*ACIInfoV4, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		aciinfo := &ACIInfoV4{}
 		if rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest); err != nil {
@@ -523,6 +526,7 @@ func getAllACIInfosV5(tx *sql.Tx) ([]*ACIInfoV5, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		aciinfo := &ACIInfoV5{}
 		if rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize); err != nil {
@@ -542,6 +546,7 @@ func getAllACIInfosV6(tx *sql.Tx) ([]*ACIInfoV6, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		aciinfo := &ACIInfoV6{}
 		if rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize, &aciinfo.InsecureOptions); err != nil {
@@ -561,6 +566,7 @@ func getAllACIInfosV7(tx *sql.Tx) ([]*ACIInfoV7, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		aciinfo := &ACIInfoV7{}
 		if rows.Scan(&aciinfo.BlobKey, &aciinfo.Name, &aciinfo.ImportTime, &aciinfo.LastUsed, &aciinfo.Latest, &aciinfo.Size, &aciinfo.TreeStoreSize); err != nil {
@@ -587,6 +593,7 @@ func getAllRemoteV0_1(tx *sql.Tx) ([]*RemoteV0_1, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		remote := &RemoteV0_1{}
 		if err := rows.Scan(&remote.ACIURL, &remote.SigURL, &remote.ETag, &remote.BlobKey); err != nil {
@@ -615,6 +622,7 @@ func getAllRemoteV2_7(tx *sql.Tx) ([]*RemoteV2_7, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	for rows.Next() {
 		remote := &RemoteV2_7{}
 		if err := rows.Scan(&remote.ACIURL, &remote.SigURL, &remote.ETag, &remote.BlobKey, &remote.CacheMaxAge, &remote.DownloadTime); err != nil {
diff --git a/store/imagestore/remote.go b/store/imagestore/remote.go
index 0475396beb..0850874a01 100644
--- a/store/imagestore/remote.go
+++ b/store/imagestore/remote.go
@@ -58,6 +58,7 @@ func GetRemote(tx *sql.Tx, aciURL string) (*Remote, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 
 	if ok := rows.Next(); !ok {
 		return nil, ErrRemoteNotFound
@@ -86,6 +87,7 @@ func GetAllRemotes(tx *sql.Tx) ([]*Remote, error) {
 		return nil, err
 
 	}
+	defer rows.Close()
 
 	for rows.Next() {
 		r := &Remote{}
diff --git a/store/imagestore/schema.go b/store/imagestore/schema.go
index c9a21fb184..d692567493 100644
--- a/store/imagestore/schema.go
+++ b/store/imagestore/schema.go
@@ -48,6 +48,7 @@ func dbIsPopulated(tx *sql.Tx) (bool, error) {
 	if err != nil {
 		return false, err
 	}
+	defer rows.Close()
 	count := 0
 	for rows.Next() {
 		count++
@@ -68,6 +69,7 @@ func getDBVersion(tx *sql.Tx) (int, error) {
 	if err != nil {
 		return -1, err
 	}
+	defer rows.Close()
 	found := false
 	for rows.Next() {
 		if err := rows.Scan(&version); err != nil {

From 3d86a9aac3cf49319e29d446ab030dd49dfa8ca9 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Tue, 16 May 2017 10:06:19 +0200
Subject: [PATCH 1111/1304] fix(doc): how to get password for the ubuntu user

The password for the `ubuntu` user seems to be generated automatically.

Found the solution on https://bugs.launchpad.net/cloud-images/+bug/1569237, https://bugs.launchpad.net/cloud-images/+bug/1569237/comments/43
---
 Documentation/trying-out-rkt.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index aa556ff750..f30051fa8e 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -61,6 +61,9 @@ vagrant up --provider=libvirt
 
 With a subsequent `vagrant ssh` you will have access to run rkt:
 
+If you are running an outdated version of VirtualBox, it may be that SSH asks for a password. You can find the password for the `ubuntu` user in `~/.vagrant.d/boxes/ubuntu-VAGRANTSLASH-xenial64/[DATE]/virtualbox/Vagrantfile`
+under `config.ssh.password`.
+
 ```
 vagrant ssh
 rkt --help

From c87da62b5d3d41ecdab2195ef687a5d926237384 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Fri, 19 May 2017 09:14:47 -0700
Subject: [PATCH 1112/1304] tests: Only run race test on supported arch

Fixes build errors like these when run on non amd64 machines:

    go test: -race and -msan are only supported on linux/amd64, freebsd/amd64, darwin/amd64 and windows/amd64

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 tests/tests.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/tests.mk b/tests/tests.mk
index 743da07b6a..cdeb13989f 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -1,5 +1,7 @@
 $(call setup-stamp-file,TST_SHORT_TESTS_STAMP,/short-tests)
 
+GO_RACE := $(if $(call equal,$(GOARCH),amd64),--race,)
+
 # gofmt takes list of directories
 # go vet and go test take a list of packages
 $(call forward-vars,$(TST_SHORT_TESTS_STAMP), \
@@ -26,7 +28,7 @@ $(TST_SHORT_TESTS_STAMP):
 	); \
 	if [ -n "$${res}" ]; then echo -e "license header checking failed:\n$${res}"; exit 1; fi; \
 	$(call vb,vt,GO TEST,$(TST_GO_TEST_PACKAGES)) \
-	$(GO_ENV) "$(GO)" test -timeout 60s -cover $(RKT_TAGS) $(TST_GO_TEST_PACKAGES) --race
+	$(GO_ENV) "$(GO)" test -timeout 60s -cover $(RKT_TAGS) $(TST_GO_TEST_PACKAGES) $(GO_RACE)
 
 TOPLEVEL_CHECK_STAMPS += $(TST_SHORT_TESTS_STAMP)
 TOPLEVEL_UNIT_CHECK_STAMPS += $(TST_SHORT_TESTS_STAMP)

From 91cf986d9073700ab5ced34e903e60c39f140905 Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Mon, 22 May 2017 19:08:35 -0700
Subject: [PATCH 1113/1304] stage1/usr_from_coreos: add new image signing
 sub-key EF4B4ED9

---
 stage1/usr_from_coreos/cache.sh | 434 +++++++++++++++++---------------
 1 file changed, 229 insertions(+), 205 deletions(-)

diff --git a/stage1/usr_from_coreos/cache.sh b/stage1/usr_from_coreos/cache.sh
index edcc0048a3..fd919987fd 100755
--- a/stage1/usr_from_coreos/cache.sh
+++ b/stage1/usr_from_coreos/cache.sh
@@ -18,6 +18,7 @@ fi
 # sub   4096R/1CB5FA26 2015-08-31 [expires: 2017-08-30]
 # sub   4096R/B58844F1 2015-11-20 [revoked: 2016-05-16]
 # sub   4096R/2E16137F 2016-05-16 [expires: 2017-05-16]
+# sub   4096R/EF4B4ED9 2017-05-22 [expires: 2018-06-01]
 GPG_LONG_ID="50E0885593D2DCB4"
 GPG_KEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v2
@@ -34,211 +35,234 @@ QQH87vtZS5xFaHUQnArXtZFu1WC0gZvMkNkJofv3GowNfanZb8iNtNFE8r1+GjL7
 a9NhaD8She0z2xQ4eZm8+Mtpz9ap/F7RLa9YgnJth5bDwLlAe30lg+7WIZHilR09
 UBHapoYlLB3B6RF51wWVneIlnTpMIJeP9vOGFBUqZ+W1j3O3uoLij1FUuwARAQAB
 tDZDb3JlT1MgQnVpbGRib3QgKE9mZmljYWwgQnVpbGRzKSA8YnVpbGRib3RAY29y
-ZW9zLmNvbT6JAjkEEwECACMFAlIqVhQCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIe
-AQIXgAAKCRBQ4IhVk9LctFkGD/46/I3S392oQQs81pUOMbPulCitA7/ehYPuVlgy
-mv6+SEZOtafEJuI9uiTzlAVremZfalyL20RBtU10ANJfejp14rOpMadlRqz0DCvc
-Wuuhhn9FEQE59Yk3LQ7DBLLbeJwUvEAtEEXq8xVXWh4OWgDiP5/3oALkJ4Lb3sFx
-KwMy2JjkImr1XgMY7M2UVIomiSFD7v0H5Xjxaow/R6twttESyoO7TSI6eVyVgkWk
-GjOSVK5MZOZlux7hW+uSbyUGPoYrfF6TKM9+UvBqxWzz9GBG44AjcViuOn9eH/kF
-NoOAwzLcL0wjKs9lN1G4mhYALgzQx/2ZH5XO0IbfAx5Z0ZOgXk25gJajLTiqtOkM
-E6u691Dx4c87kST2g7Cp3JMCC+cqG37xilbV4u03PD0izNBt/FLaTeddNpPJyttz
-gYqeoSv2xCYC8AM9N73Yp1nT1G1rnCpe5Jct8Mwq7j8rQWIBArt3lt6mYFNjuNpg
-om+rZstK8Ut1c8vOhSwz7Qza+3YaaNjLwaxe52RZ5svt6sCfIVO2sKHf3iO3aLzZ
-5KrCLZ/8tJtVxlhxRh0TqJVqFvOneP7TxkZs9DkU5uq5lHc9FWObPfbW5lhrU36K
-Pf5pn0XomaWqge+GCBCgF369ibWbUAyGPqYj5wr/jwmG6nedMiqcOwpeBljpDF1i
-d9zMN4kCHAQQAQIABgUCUipXUQAKCRDAr7X91+bcxwvZD/0T4mVRyAp8+EhCta6f
-Qnoiqc49oHhnKsoN7wDg45NRlQP84rH1knn4/nSpUzrB29bhY8OgAiXXMHVcS+Uk
-hUsF0sHNlnunbY0GEuIziqnrjEisb1cdIGyfsWUPc/4+inzu31J1n3iQyxdOOkrA
-ddd0iQxPtyEjwevAfptGUeAGvtFXP374XsEo2fbd+xHMdV1YkMImLGx0guOK8tgp
-+ht7cyHkfsyymrCV/WGaTdGMwtoJOxNZyaS6l0ccneW4UhORda2wwD0mOHHk2EHG
-dJuEN4SRSoXQ0zjXvFr/u3k7Qww11xU0V4c6ZPl0Rd/ziqbiDImlyODCx6KUlmJb
-k4l77XhHezWD0l3ZwodCV0xSgkOKLkudtgHPOBgHnJSL0vy7Ts6UzM/QLX5GR7uj
-do7P/v0FrhXB+bMKvB/fMVHsKQNqPepigfrJ4+dZki7qtpx0iXFOfazYUB4CeMHC
-0gGIiBjQxKorzzcc5DVaVaGmmkYoBpxZeUsAD3YNFr6AVm3AGGZO4JahEOsul2FF
-V6B0BiSwhg1SnZzBjkCcTCPURFm82aYsFuwWwqwizObZZNDC/DcFuuAuuEaarhO9
-BGzShpdbM3Phb4tjKKEJ9Sps6FBC2Cf/1pmPyOWZToMXex5ZKB0XHGCI0DFlB4Tn
-in95D/b2+nYGUehmneuAmgde87kCDQRSKlZGARAAuMYYnu48l3AvE8ZpTN6uXSt2
-RrXnOr9oEah6hw1fn9KYKVJi0ZGJHzQOeAHHO/3BKYPFZNoUoNOU6VR/KAn7gon1
-wkUwk9Tn0AXVIQ7wMFJNLvcinoTkLBT5tqcAz5MvAoI9sivAM0Rm2BgeujdHjRS+
-UQKq/EZtpnodeQKE8+pwe3zdf6A9FZY2pnBs0PxKJ0NZ1rZeAW9w+2WdbyrkWxUv
-jYWMSzTUkWK6533PVi7RcdRmWrDMNVR/X1PfqqAIzQkQ8oGcXtRpYjFL30Z/LhKe
-c9Awfm57rkZk2EMduIB/Y5VYqnOsmKgUghXjOo6JOcanQZ4sHAyQrB2Yd6UgdAfz
-qa7AWNIAljSGy6/CfJAoVIgl1revG7GCsRD5Dr/+BLyauwZ/YtTH9mGDtg6hy/So
-zzDAM8+79Y8VMBUtj64GQBgg2+0MVZYNsZCN209X+EGpGUmAGEFQLGLHwFoNlwwL
-1Uj+/5NTAhp2MQA/XRDTVx1nm8MZZXUOu6NTCUXtUmgTQuQEsKCosQzBuT/G+8Ia
-R5jBVZ38/NJgLw+YcRPNVo2S2XSh7liw+Sl1sdjEW1nWQHotDAzd2MFG++KVbxwb
-cXbDgJOB0+N0c362WQ7bzxpJZoaYGhNOVjVjNY8YkcOiDl0DqkCk45obz4hG2T08
-x0OoXN7Oby0FclbUkVsAEQEAAYkERAQYAQIADwUCUipWRgIbAgUJAeEzgAIpCRBQ
-4IhVk9LctMFdIAQZAQIABgUCUipWRgAKCRClQeyydOfjYdY6D/4+PmhaiyasTHqh
-iui2DwDVdhwxdikQEl+KQQHtk7aqgbUAxgU1D4rbLxzXyhTbmql7D30nl+oZg0Be
-yl67Xo6X/wHsP44651aTbwxVT9nzhOp6OEW5z/qxJaX1B9EBsYtjGO87N854xC6a
-QEaGZPbNauRpcYEadkppSumBo5ujmRWc4S+H1VjQW4vGSCm9m4X7a7L7/063HJza
-SYaHybbu/udWW8ymzuUf/UARH4141bGnZOtIa9vIGtFl2oWJ/ViyJew9vwdMqiI6
-Y86ISQcGV/lL/iThNJBn+pots0CqdsoLvEZQGF3ZozWJVCKnnn/kC8NNyd7Wst9C
-+p7ZzN3BTz+74Te5Vde3prQPFG4ClSzwJZ/U15boIMBPtNd7pRYum2padTK9oHp1
-l5dI/cELluj5JXT58hs5RAn4xD5XRNb4ahtnc/wdqtle0Kr5O0qNGQ0+U6ALdy/f
-IVpSXihfsiy45+nPgGpfnRVmjQvIWQelI25+cvqxX1dr827ksUj4h6af/Bm9JvPG
-KKRhORXPe+OQM6y/ubJOpYPEq9fZxdClekjA9IXhojNA8C6QKy2Kan873XDE0H4K
-Y2OMTqQ1/n1A6g3qWCWph/sPdEMCsfnybDPcdPZp3psTQ8uX/vGLz0AAORapVCbp
-iFHbF3TduuvnKaBWXKjrr5tNY/njrU4zEADTzhgbtGW75HSGgN3wtsiieMdfbH/P
-f7wcC2FlbaQmevXjWI5tyx2m3ejG9gqnjRSyN5DWPq0m5AfKCY+4Glfjf01l7wR2
-5oOvwL9lTtyrFE68t3pylUtIdzDz3EG0LalVYpEDyTIygzrriRsdXC+Na1KXdr5E
-GC0BZeG4QNS6XAsNS0/4SgT9ceA5DkgBCln58HRXabc25Tyfm2RiLQ70apWdEuoQ
-TBoiWoMDeDmGLlquA5J2rBZh2XNThmpKU7PJ+2g3NQQubDeUjGEa6hvDwZ3vni6V
-vVqsviCYJLcMHoHgJGtTTUoRO5Q6terCpRADMhQ014HYugZVBRdbbVGPo3YetrzU
-/BuhvvROvb5dhWVi7zBUw2hUgQ0g0OpJB2TaJizXA+jIQ/x2HiO4QSUihp4JZJrL
-5G4P8dv7c7/BOqdj19VXV974RAnqDNSpuAsnmObVDO3Oy0eKj1J1eSIp5ZOA9Q3d
-bHinx13rh5nMVbn3FxIemTYEbUFUbqa0eB3GRFoDz4iBGR4NqwIboP317S27NLDY
-J8L6KmXTyNh8/Cm2l7wKlkwi3ItBGoAT+j3cOG988+3slgM9vXMaQRRQv9O1aTs1
-ZAai+Jq7AGjGh4ZkuG0cDZ2DuBy22XsUNboxQeHbQTsAPzQfvi+fQByUi6TzxiW0
-BeiJ6tEeDHDzdLkCDQRUDREaARAA+Wuzp1ANTtPGooSq4W4fVUz+mlEpDV4fzK6n
-HQ35qGVJgXEJVKxXy206jNHx3lro7BGcJtIXeRb+Wp1eGUghrG1+V/mKFxE4wulN
-tFXoTOJ//AOYkPq9FG12VGeLZDckAR4zMhDwdcwsJ208hZzBSslJOWAuZTPoWple
-+xie4B8jZiUcjf10XaWvBnlx4EPohhvtv5VEczZWNvGa/0VDe/FfI4qGknJM3+d0
-kvXK/7yaFpdGwnY3nE/V4xbwx2tggqQRXoFmYbjogGHpTcdXkWbGEz5F7mLNwzZ/
-voyTiZeukZP5I45CCLgiB+g2WTl8cm3gcxrnt/aZAJCAl/eclFeYQ/Xiq8sK1+U2
-nDEYLWRygoZACULmLPbUEVmQBOw/HAufE98sb36MHcFss634h2ijIp9/wvnX9GOE
-LgX4hgqkgM85QaMeaS3d2+jlMu8BdsMYxPkTumsEUShcFtAYgtrNrPSayHtV6I9I
-41ISg8EIr9qEhH1xLGvSA+dfUvXqwa0cIBxhI3bXOa25vPHbT+SLtfQlvUvKySIb
-c6fobw2Wf1ZtM8lgFL3f/dHbT6fsvK6Jd/8iVMAZkAYFbJcivjS9/ugXbMznz5Wv
-g9O7hbQtXUvRjvh8+AzlASYidqSd6neW6o+i2xduUBlrbCfW6R0bPLX+7w9iqMaT
-0wEQs3MAEQEAAYkERAQYAQIADwUCVA0RGgIbAgUJAeEzgAIpCRBQ4IhVk9LctMFd
-IAQZAQIABgUCVA0RGgAKCRClqWY15Wdu/JYcD/95hNCztDFlwzYi2p9vfaMbnWcR
-qzqavj21muB9vE/ybb9CQrcXd84y7oNq2zU7jOSAbT3aGloQDP9+N0YFkQoYGMRs
-CPiTdnF7/mJCgAnXei6SO+H6PIw9qgC4wDV0UhCiNh+CrsICFFbK+O+Jbgj+CEN8
-XtVhZz3UXbH/YWg/AV/XGWL1BT4bFilUdF6b2nJAtORYQFIUKwOtCAlI/ytBo34n
-M6lrMdMhHv4MoBHP91+Y9+t4D/80ytOgH6lq0+fznY8Tty+ODh4WNkfXwXq+0TfZ
-fJiZLvkoXGD+l/I+HE3gXn4MBwahQQZl8gzI9daEGqPF8KYX0xyyKGo+8yJG5/WG
-lfdGeKmz8rGP/Ugyo6tt8DTSSqJv6otAF/AWV1Wu/DCniehtfHYrp2EHZUlpvGRl
-7Ea9D9tv9BKYm6S4+2yD5KkPu4qp3r6glVbePPCLeZ4NLQCEIpKakIERfxk66JqZ
-Tb5XI9HKKbnhKunOoGiL5SMXVsS67Sxt//Ta/3vSaLC3wnVwN5OeXNaa04Yx7jg/
-wtMJ9Jz0EYFtVv2NLizEeGCI8iPJOyMWOy+twCIk5zmvwsLu5MKmg1tLI2mtCTYz
-qo8uVIqETlojxIqAhRYtmeiYKf2fZs5um3+Sjv28v4nw3VfQgibTKc2uBjeqxxOe
-XGw0ysKnS2VO72SK879+EADd3HoF9U80odCgN5T6aljhaNaruqmG4CvBdRyzp3EQ
-9RP7jPOEhcM00etw572orviK9AqCk+zwvfzEFbt/uC7zOpO0BJ8fnMAZ0Zn/fF8s
-88zR4zq6BBq9WD4RCmazw2G6IyGXHvVAWi8UxoNjNoJJosLyLauFdPPUeoye5PxE
-g+fQew3behcCaebjZwUA+xZMj7dfwcNXlDa4VkCDHzTfU43znawBo9avB8hNwMeW
-CZYINmym+LSKyQnz3sirTpYcjorxtov1fyml8413tDJoOvkotSX9o3QQgbBPsyQ7
-nwLTscYc5eklGRH7iytXOPI+29EPpfRHX2DAnVyTeVSFPEr79tIsijy02ZBZTiKY
-lBlJy/Cj2C5cGhVeQ6v4jnj1Nt3sjHkZlVfmipSYVfcBoID1/4r2zHl4OFlLCjvk
-XUhbqhm9xWV8NdmItO3BBSlIEksFunykzz1HM6shvzw77sM5+TEtSsxoOxxys+9N
-ItCl8L6yf84A5333pLaUWh5HON1J+jGGbKnUzXKBsDxGSvgDcFlyVloBRQShUkv3
-FMem+FWqt7aA3/YFCPgyLp7818VhfM70bqIxLi0/BJHp6ltGN5EH+q7Ewz210VAB
-ju5IO7bjgCqTFeR3YYUN87l8ofdARx3shApXS6TkVcwaTv5eqzdFO9fZeRqHj4L9
-PrkCDQRV5KHhARAAz9Qk17qaFi2iOlRgA4WXhn5zkr9ed1F1HGIJmFB4J8NIVkTZ
-dt2UfRBWw0ykOB8m1sWLEfimP2FN5urnfsndtc1wEVrcuc7YAMbfUgxbTc/o+gTy
-dpVCKmGrL10mZeOmioFQuVT9s1qzIII/gDbiSLRVDb75F6/aag7mDsJFGtUqStpN
-mR0AHyrLOY/jYVLlTr8dAfX2Z2aBifpJ/nPaw29FkTBCQvyC84+cReTT3RiUOXQ3
-EL4zLaYm/VTtLlAnZ4IYADpGijFHw2c4jcBWZ/72Wb6TUk9lg2b6M6THfCwNieJB
-CwCf6VHyKBebbYZYHiuZB5GILfdm4aSclRACVXT3seTZQh8yeCYLMYyieceeHesO
-M/4rC5iLujbNsVN+95z0SuRMPlpd3mfExFYeeH6SO/EgTL5cCXwP6L2R2vP67gSs
-P01HBTOAOzEzXQQ4IY1kK2zUjbJJBx8HylvcYLlbsRce1uvMmCR/b7QWJEXR/7VX
-qjCtmYIwroxhGiMpH5Fssh0z62BiBXDLc0iSKVBD3P36Uv++o51aDOg/V928ve/D
-4ISf28IiNnVIg1/zrUy2+LpFSUkU+Szjd77leUSjOTFnpyHQhlsZuG02S4SO1opX
-O6HblhuEjCEcw2TUDgvXb9hsuj+C+d4DFdTdQ/bPZ0sc2351wkiqn4JhMekAEQEA
-AYkERAQYAQIADwUCVeSh4QIbAgUJA8JnAAIpCRBQ4IhVk9LctMFdIAQZAQIABgUC
-VeSh4QAKCRAH+p7THLX6JlrhD/9W+hAjebjCRuNfcAoMFVujrSNgiR7o6aH5Re0q
-cPITQ4ev4muNEl+L1AMcBiAr7Ke7fdEhhSdWiBOutlig3VFRRaX6kOQlS5h+lazi
-JQc84VR9iBnWMsfK3WadMYmRkTR4P/lHsGTvczD8Qhl7kha8BGbm1a4SgWuF3FOR
-xEWkimz8AIpaozf+vD4CV2rVSaJ0oHRLJXqQHrhWuBy73NVF4wa/7lxDi7Q3PA8p
-6Rr5Kr+IVuPVUvxJOVLEUfGgpEnMnTbRu322HvUqeLNrNnSCdJKePuoy2Sky0K+/
-82O877nFysagTeO4tbLr+OiVG/6ORiInn1y7uQjwLgrz8ojDjGMNmqnNW8ACYhey
-4ko3L9xdep0VhxaBwjVWBU6fhbogSVkCRhjz8h2sLGdItLzDxp69y0ncf931H0e5
-DAB7VbURuKh6P8ToQQhWUD5zIOCyxFXMQPA63pxd7mQooCpaWK1i80J/fRA5TBIP
-Lqty2NEP3aTePelrBdqiQol/aPQ3ugtrnP/PLLlJ0zxg/YNGgBFRwNHgnu7HxOOr
-E4gap8prvZCKC/05A71AXwj6u2h9so9jSrE5slrOgfh9v9w9AyuQzNMG/2l1Cli4
-UpeVqy07Qn27evjEbad6HT1vmrPJE3A/D9hzEFPWMM+sPOWH+4L2Qekoy954M5fW
-CQ2aoL3+EACDFKJIEp/Xc8n3CRuqxxNwRij6EJ2jYZZURQONwtumFXDD0LKF7Upc
-ZrOiG4i2qojp0WQWarQuITmiyds0jtDg+xhdQUZ3HgjhN/MNT3O0klTXsZ4AYrys
-9yDhdC030kD/CqKxTOJJCz8z2of2xXY9/rKpTvZAra+UBEzNKb7F+dQ3kclZF6CG
-MnNY51KBXi1xRAv9J8LdsdNsTOhoZG/2s4vbVCkgKWF60NRh/jw7JFM9YYre8+qM
-R1bbaW/uW4Ts9XopaG5+auS9mYFDgICdyXqrwzUo4PLbnTqTxni6Ldt525wye+/h
-ex5ssLi+PMhCalcWEAKUYYW/CfDyZqwtRDoBAKwStcV5DrcK28YBzheMAEcGI7dE
-xVHYpET+49ERwTvYQtwKqZSDBoivrQg5MdJpu8Ncj126DbN2lwQQpIsMmq93jOCv
-DEPTdTUOs5XzLv8YTYDKiyxm3IKPsSvElnoI/wedO4EscldAAQqNKo/6pzI+K4Eh
-ifyLT1GOMN7PCaHzW449DrSJNd3yL7xkzNtrphw32a9qLJ43sWFrF21EjG1IQgUV
-4XOz01Q2Hp4H1l1YE11MbSL/+TarNTbEfhzv6tS3eNrlU/MQDLsUn76c4hi2tAbK
-X8FjXVJ/8MWi91Z0pHcLzhYZYn2IACvaaUh06HyyAIiDlgWRC7zgMbkCDQRWT38I
-ARAAzWz3KxYiRJ04sltTwnndeFYaBMJySA+wN2Y2Re5/sS1C97+ryNfGcj50MQ7m
-RbSXzqvfvlbvgiLjSL337UwahrXboLcYxbmVzsIG/aXiCogPlJ3ooyd6Krn/p4CO
-tzhVDlReBSkNdwUxusAsAVdSDpJVk/JOTil49g7jx3angVqHmI/oPyPIcGhNJlBV
-ofVxJZKVWSsmP8rsWYZ0LHNdSngt7uhYb8BO57sSfKpT0YJpP7i5/Au3ZXohBa9K
-tEJELX/WJe95i38ysq/xedRwKg7Zt9aNND7Tiic+3DRONvus3StvN6dHEhM84RNW
-bk/XDmjjCk92cB6Gm32HPDk8rnAfXug/rJFWD/CzGwCvxmPuikXEZesHLCdrgzZh
-VGQ9BcAh8oxz1QcPQXr7TCk8+cikSemQrVmqJPq2rvdVpZIzF91ZCpAfT28e0y/a
-DxbrfS83Ytk+90dQOR8rStGNVnrwT/LeMn1ytV7oK8e2sIj1HFUYENQxy5jVjR3Q
-tcTbVoOYLvZ83/wanc4GaZnxZ7cJguuKFdqCR5kq4b7acjeQ8a76hrYI57Z+5JDs
-L+aOgGfCqCDx2IL/bRiwY1pNDfTCPhSSC054yydG3g6pUGk9Kpfj+oA8XrasvR+d
-D4d7a2cUZRKXU29817isfLNjqZMiJ/7LA11I6DeQgPaRK+kAEQEAAYkCHwQoAQgA
-CQUCVzocNwIdAgAKCRBQ4IhVk9LctGVfEADBBSjZq858OE932M9FUyt5fsYQ1p/O
-6zoHlCyGyyDdXNu2aDGvhjUVBd3RbjHW87FiiwggubZ/GidCSUmv/et26MAzqthl
-5CJgi0yvb5p2KeiJvbTPZEN+WVitAlEsmN5FuUzD2Q7BlBhFunwaN39A27f1r3av
-qfy6AoFsTIiYHVP85HscCaDYc2SpZNAJYV4ZcascuLye2UkUm3fSSaYLCjtlVg0m
-Wkcjp7rZFQxqlQqSjVGarozxOYgI+HgKaqYF9+zJsh+26kmyHRdQY+Pznpt+PXjt
-EQVsdzh5pqr4w4J8CnYTJKQQO4T08cfo13pfFzgqBGo4ftXOkLLDS3ZgFHgx00fg
-70MGYYAgNME7BJog+pO5vthwfhQO6pMT08axC8sAWD0wia362VDNG5Kg4TQHFARu
-Ao51e+NvxF8cGi0g1zBEfGMCFwlAlQOYcI9bpk1xx+Z8P3Y8dnpRdg8VK2ZRNsf/
-CggNXrgjQ2cEOrEsda5lG/NXbNqdDiygBHc1wgnoidABOHMT483WKMw3GBao3JLF
-L0njULRguJgTuyI9ie8HLH/vfYWXq7t5o5sYM+bxAiJDDX+F/dp+gbomXjDE/wJ/
-jFOz/7Cp9WoLYttpWFpWPl4UTDvfyPzn9kKT/57OC7OMFZH2a3LxwEfaGTgDOvA5
-QbxS5txqnkpPcokERAQYAQgADwUCVk9/CAIbAgUJAeEzgAIpCRBQ4IhVk9LctMFd
-IAQZAQgABgUCVk9/CAAKCRCGM/sTtYhE8RLLD/0bK5unOEb1RsuzCqL7IWPr+Z6i
-7smZ0tmrTF58a3St64DjR3WYuv/RnhYyh8xCtBod7ZoIl2S+Azavevx22KWXPQgR
-twhlCJFsnDoG9C5Kj0BqUrtyk+9nlGeIMOUPjMJJocEaB9yHZs7J9KFNyqpEY7x2
-XW6HTDihsBdaOUu814g6C4gLiXydwbQMzU2Crefc1w/fWhSxjqiyUlKp571jeauW
-uUdtbQmwk/Kvq9yreHkEWN4MHs2HuBwwBmbj0KDFFDA2u6oUvGlRTfwomTiryXDr
-1tOgiySucdFVrx+6zPBMcqlXqsVDsx8sr+u7PzIsHO9NT+P3wYQpmWhwKCjLX5KN
-6Xv3d0aAr7OYEacrED1sqndIfXjM5EcouLFtw/YESA7Px8iRggFVFDN0GY3hfoPJ
-gHpiJj2KYyuVvNe8dXpsjOdPpFbhTPI1CoA12woT4vGtfxcI9u/uc7m5rQDJI+FC
-R9OtUYvtDUqtE/XYjqPXzkbgtRy+zwjpTTdxn48OaizVU3JOW+OQwW4q/4Wk6T6n
-zNTpQDHUmIdxsAAbZjBJwkE4Qkgtl8iUjS0hUX05ixLUwn0ZuGjeLcK9O/rqynPD
-qd9gdeKo5fTJ91RhJxoBSFcrj21tPOa0PhE/2Zza24AVZIX5+AweD9pie8QIkZLM
-k6yrvRFqs2YrHUrc5emkD/4lGsZpfSAKWCdc+iE5pL434yMlp73rhi+40mbCiXMO
-gavdWPZSDcVe+7fYENx0tqUyGZj2qKluOBtxTeovrsFVllF9fxzixBthKddA6IcD
-QdTb076t/Ez51jX1z/GRPzn8yWkDEvi3L9mfKtfuD4BRzjaVw8TtNzuFuwz2PQDD
-BtFXqYMklA67cdjvYdffO7MeyKlNjKAutXOr/Or70rKkk2wZLYtSeJIDRwUSsPdK
-ncbGLEKvfoBKOcOmjfZKjnYpIDDNqAsMrJLIwyo+6NSUtq84Gba6QjPYLvJ9g4P2
-99dIYzFxu/0Zy4q9QgfjJOav3GUQT1fRhqqRS11ffXFqClJKqsKSChcPhNhK5wt6
-Ab6PVbd9RQhI8ImLQ81PWn708rOr1dQTQfPvJrHBBrEolUw/0y7SxPmQZUkYlXiT
-6bvsUa2n2f4ZzIgtYtZ5JSuoqcut/jmeUQE1TUUyG+9HVMfmhlhjNO0pDiFdSAgj
-k+DyTd5lUVz3tPGFliIDq7O/sgDq6xtSlGKvQt/gRoYstrillyxfIVqR10C2t2kC
-BXKSX3uQmbx3OaX8JtZ2uMjmKZb2iovfSf8qLSu49qrsNS9Etqvda0EXqaHeX+K8
-NjENoQEdXZUnBRJg9VVa0HkPiFSFIwF8IPWewm0DocZil66bp/wrHVsJkw7AwE/z
-JrkCDQRXOi4eARAA+cAKfT0IoViuCxqa6uPteVC8/qp8ZiEPri0neCt+khngPpCX
-9JseOyRJEzwt9+31XgzsCWlfW5BWrLBd3F4caRqucu3ZnE68Qtrw6kcOsJ8LSiok
-/uu1XnXW1mgpRxlu0i83YVM6+BrIXroP22SWVxkDkAXDlgvFmIvrh9TG43uSRjmg
-riSnJ7EOgDXDrZ5mTlnlGHb6EGpHJHoJsfp3JdBAh4oNGBBHf5fZZhBiUIJSGwbL
-g8oEzOuycNor9mEiJPaAyPm22braWRgvX7beOca60eNGIuQSZ8ML3G6rog/pNdbN
-gLf1hvrfl7NJCJJ0iB7BPYw8e5+xPEHNLrJI6NjFCbD0dlHnuq79ePc9bPQALa/6
-lIICOCAZJYDCf7S2dHqkHCOnr8F2A2qwAqP5IlVqdS7sSy7D9wDDYis7jlMw8vVW
-jqcL6MNxJDk3h/0ns7Ad5TNfJnLUnUbYWeH5QYbPsGgqQomhSWBvhCZkILnE7Rpb
-tjl55/CvTXN1L6jyi9qJeSoWORjwhTlACKDzlsLRTO24sM/KjKDajYrqU3CRVDQG
-gQL0yU3qDz/mql+awQAMUS9ckaf/ohBM8SrCandNvE/+as426Mf6/FH6R7kntJpp
-YQZJMwq0XlyueadWs8xrCjrXnXFijvrVkaZhlCfJRZPEdI76hGscRp8Sr6kAEQEA
-AYkERAQYAQgADwUCVzouHgIbAgUJAeEzgAIpCRBQ4IhVk9LctMFdIAQZAQgABgUC
-VzouHgAKCRBI+blqLhYTf6o8D/0WqjCOqB4rAv29MGpz5SZbk57TbQrKfjneSDVe
-CsvgofUBL6z9yA2jEanIh76Lo6r5ZnvF8I4pDImiRCjhZ+4vDOKaO5yvrNKruusr
-+ZA6DDPwjlhnRPqW8Sm1YGl1VqAqQEjib4I7dbGb5qpR/PkAj64UDtLtbMfx6Zb9
-B9ZJvYEiWUbAEQWUohRhw6vT/qS07GrKgG35JFiJKrNPSFEh/YOLKq+vLVZwDKX9
-1Tvabs3MuNFIavuMiGaoqv4/JVRA1Iw3E9zCsXgFhIfQll4XvrrPXiGAllFzaqX2
-9PnvqMngjPRDTh+jHNUjFv8MNvhs1o3jc1pQAJT5JIpPQJJpbnNnrYoCJoBO0kfJ
-04zEDznHkuVbLRn2pxWsCrF2Agwm4GB3YSenEW8AKcmtS4ov0Yaw5csY3fXUDXjB
-aPR9dweNWT/kaY5V4NUwOutecnZ0o0yDc57GGIjFhTcULMdOCE6DbSTfljqcoAoP
-IydzQ4rlMdmTkiM5k2F/jDHCURersqF8Naro7Nx2fKokPrLKUst+pFBBwbeTO9tW
-EbOnl/ypHeRW9XA31sZ0yvvSwUrWnHC+UDpHPzvaAGleAOK7gGyJehVIw9BhgZB1
-LplkbkGgpS8L/3CAcaQ488MP5NK0peO+ED/ocNhi1tC/cHbLXtDiz/eG/1rIdxkO
-h3D61WiyD/42Oj2h4BHt5qTS12By95po4avzgqaV3PFYi9Rx6tBvzwnD7x2UeGk4
-wzFdb2V4LWoe6bqMokxbUMWJgP5faWDT6/urhBt4GYcBxX0b3l9qBs20hP5JVHGX
-208gOW5cjfHrTNiHiY4/CbQrbAdO24CUYZtYEmDNdHN+KHrlLLjkf0v5yGjVK2XB
-qs8l6upA7xBGHAF7U/XkLYrvyusqqWdvdGHGHthbLBzjceO+4N+lb6RyHRuF6kgb
-LdCcaKfCMUs/v1ZXgYGhdk7NWFHFDoF8DByHwluoihd10OudGPFg7ydTc6+V3kt9
-SN1/iQbk2/rHffI1tm28MfBvN+K/Da+Y+EAqTbUDHl6O30mSGZjLl1xJxvWoezU9
-8TdPCxy7L9XRFfqZlBJAo8cxRIPHpqKIaRy0wn616xCDfUSQ9NBLlDITL4d7tNvD
-C9hLpehFKMKIEct5WDfaQIWQe2o1fjVsU2Is2wXVmdi9A7X3q7yWVA766zQTxQO6
-1TcgyoJM9k2DxncsmwXIa8oD6KP4VYtrtsx8r4VXPEjHucCjPe+qgyY65wBPXSl5
-U21AiUuGGegFQwRD6L7ZqT3K5JLDlK/kkaV3l8i0onfJ+5CytOB2T6QPQnJ4Ynch
-K9w3EiyDrgzl0IpotQXxOBGHoCtcxUZvkNeOIxAb8QwkWnhgkljMyQ==
-=nV4h
+ZW9zLmNvbT6JAjkEEwECACMCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAUC
+WSN1RgAKCRBQ4IhVk9LctF/0EADf18yxXNfa7yZx2CCvIMSqpmcY12z0eQhMZJDp
+HISexj2ZnVa2hcNDAdeGf9KtqW1dOlwxEccl3TYgl6dXCKy2kd8UPxw0zwiRkB86
+JPXuMuet0T6lxr3gEBJEsMD0DNQqsxQ6OZBLqWAMIlGzlv4plqap7uGkMiVtE+yM
+8atGyFqSpnksVDFwd+Pjgr6cC4H6ZP24XUr8e9JxG6ltpyNwG7AmYB9HhFg3RBrx
+RtxVzAKmDAffXmntQv1f4XY9NLL0tccCD3QoqW0s130lWpCkRmTQFYe/+VtWORYt
+EwGSMF0f9VVd9klC2BcE/L3kgK74I6PzCjmioC0Al2rkrPb/VotrwlMj8OMTQtGB
+i/lvn4tFwDRMPhu+SRU4jYRdZi724fARm0vv13dxZUwMqGHdhT7vfTCoerk6I6Pd
+1g1kG/lU1RMkJqK/nh/aoqDdsdv7ZBuDXKJYJ3p6O2EH5TOXToF4b8lOM1SI7Lm1
+z4vo8Se7jWDR9VgD5fuFfMthliIzMwZXX2gLk9Oc9eRixygAOKdcRnkx/pCFgVim
+WNRSMJAbc8bTyDMdyMEaElXyr9G5x3mZdqrU0J42ZeT0+fl8yvKMvaqvO+Z5PR2R
+nvGijw1l1VcG6SNDYvIJI2hwkKq04+dZmWOuxyn9uK/F/EFq6Bl7hRtilbOgARvi
+UQORR7kCDQRSKlZGARAAuMYYnu48l3AvE8ZpTN6uXSt2RrXnOr9oEah6hw1fn9KY
+KVJi0ZGJHzQOeAHHO/3BKYPFZNoUoNOU6VR/KAn7gon1wkUwk9Tn0AXVIQ7wMFJN
+LvcinoTkLBT5tqcAz5MvAoI9sivAM0Rm2BgeujdHjRS+UQKq/EZtpnodeQKE8+pw
+e3zdf6A9FZY2pnBs0PxKJ0NZ1rZeAW9w+2WdbyrkWxUvjYWMSzTUkWK6533PVi7R
+cdRmWrDMNVR/X1PfqqAIzQkQ8oGcXtRpYjFL30Z/LhKec9Awfm57rkZk2EMduIB/
+Y5VYqnOsmKgUghXjOo6JOcanQZ4sHAyQrB2Yd6UgdAfzqa7AWNIAljSGy6/CfJAo
+VIgl1revG7GCsRD5Dr/+BLyauwZ/YtTH9mGDtg6hy/SozzDAM8+79Y8VMBUtj64G
+QBgg2+0MVZYNsZCN209X+EGpGUmAGEFQLGLHwFoNlwwL1Uj+/5NTAhp2MQA/XRDT
+Vx1nm8MZZXUOu6NTCUXtUmgTQuQEsKCosQzBuT/G+8IaR5jBVZ38/NJgLw+YcRPN
+Vo2S2XSh7liw+Sl1sdjEW1nWQHotDAzd2MFG++KVbxwbcXbDgJOB0+N0c362WQ7b
+zxpJZoaYGhNOVjVjNY8YkcOiDl0DqkCk45obz4hG2T08x0OoXN7Oby0FclbUkVsA
+EQEAAYkERAQYAQIADwUCUipWRgIbAgUJAeEzgAIpCRBQ4IhVk9LctMFdIAQZAQIA
+BgUCUipWRgAKCRClQeyydOfjYdY6D/4+PmhaiyasTHqhiui2DwDVdhwxdikQEl+K
+QQHtk7aqgbUAxgU1D4rbLxzXyhTbmql7D30nl+oZg0Beyl67Xo6X/wHsP44651aT
+bwxVT9nzhOp6OEW5z/qxJaX1B9EBsYtjGO87N854xC6aQEaGZPbNauRpcYEadkpp
+SumBo5ujmRWc4S+H1VjQW4vGSCm9m4X7a7L7/063HJzaSYaHybbu/udWW8ymzuUf
+/UARH4141bGnZOtIa9vIGtFl2oWJ/ViyJew9vwdMqiI6Y86ISQcGV/lL/iThNJBn
++pots0CqdsoLvEZQGF3ZozWJVCKnnn/kC8NNyd7Wst9C+p7ZzN3BTz+74Te5Vde3
+prQPFG4ClSzwJZ/U15boIMBPtNd7pRYum2padTK9oHp1l5dI/cELluj5JXT58hs5
+RAn4xD5XRNb4ahtnc/wdqtle0Kr5O0qNGQ0+U6ALdy/fIVpSXihfsiy45+nPgGpf
+nRVmjQvIWQelI25+cvqxX1dr827ksUj4h6af/Bm9JvPGKKRhORXPe+OQM6y/ubJO
+pYPEq9fZxdClekjA9IXhojNA8C6QKy2Kan873XDE0H4KY2OMTqQ1/n1A6g3qWCWp
+h/sPdEMCsfnybDPcdPZp3psTQ8uX/vGLz0AAORapVCbpiFHbF3TduuvnKaBWXKjr
+r5tNY/njrU4zEADTzhgbtGW75HSGgN3wtsiieMdfbH/Pf7wcC2FlbaQmevXjWI5t
+yx2m3ejG9gqnjRSyN5DWPq0m5AfKCY+4Glfjf01l7wR25oOvwL9lTtyrFE68t3py
+lUtIdzDz3EG0LalVYpEDyTIygzrriRsdXC+Na1KXdr5EGC0BZeG4QNS6XAsNS0/4
+SgT9ceA5DkgBCln58HRXabc25Tyfm2RiLQ70apWdEuoQTBoiWoMDeDmGLlquA5J2
+rBZh2XNThmpKU7PJ+2g3NQQubDeUjGEa6hvDwZ3vni6VvVqsviCYJLcMHoHgJGtT
+TUoRO5Q6terCpRADMhQ014HYugZVBRdbbVGPo3YetrzU/BuhvvROvb5dhWVi7zBU
+w2hUgQ0g0OpJB2TaJizXA+jIQ/x2HiO4QSUihp4JZJrL5G4P8dv7c7/BOqdj19VX
+V974RAnqDNSpuAsnmObVDO3Oy0eKj1J1eSIp5ZOA9Q3dbHinx13rh5nMVbn3FxIe
+mTYEbUFUbqa0eB3GRFoDz4iBGR4NqwIboP317S27NLDYJ8L6KmXTyNh8/Cm2l7wK
+lkwi3ItBGoAT+j3cOG988+3slgM9vXMaQRRQv9O1aTs1ZAai+Jq7AGjGh4ZkuG0c
+DZ2DuBy22XsUNboxQeHbQTsAPzQfvi+fQByUi6TzxiW0BeiJ6tEeDHDzdLkCDQRU
+DREaARAA+Wuzp1ANTtPGooSq4W4fVUz+mlEpDV4fzK6nHQ35qGVJgXEJVKxXy206
+jNHx3lro7BGcJtIXeRb+Wp1eGUghrG1+V/mKFxE4wulNtFXoTOJ//AOYkPq9FG12
+VGeLZDckAR4zMhDwdcwsJ208hZzBSslJOWAuZTPoWple+xie4B8jZiUcjf10XaWv
+Bnlx4EPohhvtv5VEczZWNvGa/0VDe/FfI4qGknJM3+d0kvXK/7yaFpdGwnY3nE/V
+4xbwx2tggqQRXoFmYbjogGHpTcdXkWbGEz5F7mLNwzZ/voyTiZeukZP5I45CCLgi
+B+g2WTl8cm3gcxrnt/aZAJCAl/eclFeYQ/Xiq8sK1+U2nDEYLWRygoZACULmLPbU
+EVmQBOw/HAufE98sb36MHcFss634h2ijIp9/wvnX9GOELgX4hgqkgM85QaMeaS3d
+2+jlMu8BdsMYxPkTumsEUShcFtAYgtrNrPSayHtV6I9I41ISg8EIr9qEhH1xLGvS
+A+dfUvXqwa0cIBxhI3bXOa25vPHbT+SLtfQlvUvKySIbc6fobw2Wf1ZtM8lgFL3f
+/dHbT6fsvK6Jd/8iVMAZkAYFbJcivjS9/ugXbMznz5Wvg9O7hbQtXUvRjvh8+Azl
+ASYidqSd6neW6o+i2xduUBlrbCfW6R0bPLX+7w9iqMaT0wEQs3MAEQEAAYkERAQY
+AQIADwUCVA0RGgIbAgUJAeEzgAIpCRBQ4IhVk9LctMFdIAQZAQIABgUCVA0RGgAK
+CRClqWY15Wdu/JYcD/95hNCztDFlwzYi2p9vfaMbnWcRqzqavj21muB9vE/ybb9C
+QrcXd84y7oNq2zU7jOSAbT3aGloQDP9+N0YFkQoYGMRsCPiTdnF7/mJCgAnXei6S
+O+H6PIw9qgC4wDV0UhCiNh+CrsICFFbK+O+Jbgj+CEN8XtVhZz3UXbH/YWg/AV/X
+GWL1BT4bFilUdF6b2nJAtORYQFIUKwOtCAlI/ytBo34nM6lrMdMhHv4MoBHP91+Y
+9+t4D/80ytOgH6lq0+fznY8Tty+ODh4WNkfXwXq+0TfZfJiZLvkoXGD+l/I+HE3g
+Xn4MBwahQQZl8gzI9daEGqPF8KYX0xyyKGo+8yJG5/WGlfdGeKmz8rGP/Ugyo6tt
+8DTSSqJv6otAF/AWV1Wu/DCniehtfHYrp2EHZUlpvGRl7Ea9D9tv9BKYm6S4+2yD
+5KkPu4qp3r6glVbePPCLeZ4NLQCEIpKakIERfxk66JqZTb5XI9HKKbnhKunOoGiL
+5SMXVsS67Sxt//Ta/3vSaLC3wnVwN5OeXNaa04Yx7jg/wtMJ9Jz0EYFtVv2NLizE
+eGCI8iPJOyMWOy+twCIk5zmvwsLu5MKmg1tLI2mtCTYzqo8uVIqETlojxIqAhRYt
+meiYKf2fZs5um3+Sjv28v4nw3VfQgibTKc2uBjeqxxOeXGw0ysKnS2VO72SK879+
+EADd3HoF9U80odCgN5T6aljhaNaruqmG4CvBdRyzp3EQ9RP7jPOEhcM00etw572o
+rviK9AqCk+zwvfzEFbt/uC7zOpO0BJ8fnMAZ0Zn/fF8s88zR4zq6BBq9WD4RCmaz
+w2G6IyGXHvVAWi8UxoNjNoJJosLyLauFdPPUeoye5PxEg+fQew3behcCaebjZwUA
++xZMj7dfwcNXlDa4VkCDHzTfU43znawBo9avB8hNwMeWCZYINmym+LSKyQnz3sir
+TpYcjorxtov1fyml8413tDJoOvkotSX9o3QQgbBPsyQ7nwLTscYc5eklGRH7iytX
+OPI+29EPpfRHX2DAnVyTeVSFPEr79tIsijy02ZBZTiKYlBlJy/Cj2C5cGhVeQ6v4
+jnj1Nt3sjHkZlVfmipSYVfcBoID1/4r2zHl4OFlLCjvkXUhbqhm9xWV8NdmItO3B
+BSlIEksFunykzz1HM6shvzw77sM5+TEtSsxoOxxys+9NItCl8L6yf84A5333pLaU
+Wh5HON1J+jGGbKnUzXKBsDxGSvgDcFlyVloBRQShUkv3FMem+FWqt7aA3/YFCPgy
+Lp7818VhfM70bqIxLi0/BJHp6ltGN5EH+q7Ewz210VABju5IO7bjgCqTFeR3YYUN
+87l8ofdARx3shApXS6TkVcwaTv5eqzdFO9fZeRqHj4L9PrkCDQRV5KHhARAAz9Qk
+17qaFi2iOlRgA4WXhn5zkr9ed1F1HGIJmFB4J8NIVkTZdt2UfRBWw0ykOB8m1sWL
+EfimP2FN5urnfsndtc1wEVrcuc7YAMbfUgxbTc/o+gTydpVCKmGrL10mZeOmioFQ
+uVT9s1qzIII/gDbiSLRVDb75F6/aag7mDsJFGtUqStpNmR0AHyrLOY/jYVLlTr8d
+AfX2Z2aBifpJ/nPaw29FkTBCQvyC84+cReTT3RiUOXQ3EL4zLaYm/VTtLlAnZ4IY
+ADpGijFHw2c4jcBWZ/72Wb6TUk9lg2b6M6THfCwNieJBCwCf6VHyKBebbYZYHiuZ
+B5GILfdm4aSclRACVXT3seTZQh8yeCYLMYyieceeHesOM/4rC5iLujbNsVN+95z0
+SuRMPlpd3mfExFYeeH6SO/EgTL5cCXwP6L2R2vP67gSsP01HBTOAOzEzXQQ4IY1k
+K2zUjbJJBx8HylvcYLlbsRce1uvMmCR/b7QWJEXR/7VXqjCtmYIwroxhGiMpH5Fs
+sh0z62BiBXDLc0iSKVBD3P36Uv++o51aDOg/V928ve/D4ISf28IiNnVIg1/zrUy2
++LpFSUkU+Szjd77leUSjOTFnpyHQhlsZuG02S4SO1opXO6HblhuEjCEcw2TUDgvX
+b9hsuj+C+d4DFdTdQ/bPZ0sc2351wkiqn4JhMekAEQEAAYkERAQYAQIADwUCVeSh
+4QIbAgUJA8JnAAIpCRBQ4IhVk9LctMFdIAQZAQIABgUCVeSh4QAKCRAH+p7THLX6
+JlrhD/9W+hAjebjCRuNfcAoMFVujrSNgiR7o6aH5Re0qcPITQ4ev4muNEl+L1AMc
+BiAr7Ke7fdEhhSdWiBOutlig3VFRRaX6kOQlS5h+laziJQc84VR9iBnWMsfK3Wad
+MYmRkTR4P/lHsGTvczD8Qhl7kha8BGbm1a4SgWuF3FORxEWkimz8AIpaozf+vD4C
+V2rVSaJ0oHRLJXqQHrhWuBy73NVF4wa/7lxDi7Q3PA8p6Rr5Kr+IVuPVUvxJOVLE
+UfGgpEnMnTbRu322HvUqeLNrNnSCdJKePuoy2Sky0K+/82O877nFysagTeO4tbLr
++OiVG/6ORiInn1y7uQjwLgrz8ojDjGMNmqnNW8ACYhey4ko3L9xdep0VhxaBwjVW
+BU6fhbogSVkCRhjz8h2sLGdItLzDxp69y0ncf931H0e5DAB7VbURuKh6P8ToQQhW
+UD5zIOCyxFXMQPA63pxd7mQooCpaWK1i80J/fRA5TBIPLqty2NEP3aTePelrBdqi
+Qol/aPQ3ugtrnP/PLLlJ0zxg/YNGgBFRwNHgnu7HxOOrE4gap8prvZCKC/05A71A
+Xwj6u2h9so9jSrE5slrOgfh9v9w9AyuQzNMG/2l1Cli4UpeVqy07Qn27evjEbad6
+HT1vmrPJE3A/D9hzEFPWMM+sPOWH+4L2Qekoy954M5fWCQ2aoL3+EACDFKJIEp/X
+c8n3CRuqxxNwRij6EJ2jYZZURQONwtumFXDD0LKF7UpcZrOiG4i2qojp0WQWarQu
+ITmiyds0jtDg+xhdQUZ3HgjhN/MNT3O0klTXsZ4AYrys9yDhdC030kD/CqKxTOJJ
+Cz8z2of2xXY9/rKpTvZAra+UBEzNKb7F+dQ3kclZF6CGMnNY51KBXi1xRAv9J8Ld
+sdNsTOhoZG/2s4vbVCkgKWF60NRh/jw7JFM9YYre8+qMR1bbaW/uW4Ts9XopaG5+
+auS9mYFDgICdyXqrwzUo4PLbnTqTxni6Ldt525wye+/hex5ssLi+PMhCalcWEAKU
+YYW/CfDyZqwtRDoBAKwStcV5DrcK28YBzheMAEcGI7dExVHYpET+49ERwTvYQtwK
+qZSDBoivrQg5MdJpu8Ncj126DbN2lwQQpIsMmq93jOCvDEPTdTUOs5XzLv8YTYDK
+iyxm3IKPsSvElnoI/wedO4EscldAAQqNKo/6pzI+K4EhifyLT1GOMN7PCaHzW449
+DrSJNd3yL7xkzNtrphw32a9qLJ43sWFrF21EjG1IQgUV4XOz01Q2Hp4H1l1YE11M
+bSL/+TarNTbEfhzv6tS3eNrlU/MQDLsUn76c4hi2tAbKX8FjXVJ/8MWi91Z0pHcL
+zhYZYn2IACvaaUh06HyyAIiDlgWRC7zgMbkCDQRWT38IARAAzWz3KxYiRJ04sltT
+wnndeFYaBMJySA+wN2Y2Re5/sS1C97+ryNfGcj50MQ7mRbSXzqvfvlbvgiLjSL33
+7UwahrXboLcYxbmVzsIG/aXiCogPlJ3ooyd6Krn/p4COtzhVDlReBSkNdwUxusAs
+AVdSDpJVk/JOTil49g7jx3angVqHmI/oPyPIcGhNJlBVofVxJZKVWSsmP8rsWYZ0
+LHNdSngt7uhYb8BO57sSfKpT0YJpP7i5/Au3ZXohBa9KtEJELX/WJe95i38ysq/x
+edRwKg7Zt9aNND7Tiic+3DRONvus3StvN6dHEhM84RNWbk/XDmjjCk92cB6Gm32H
+PDk8rnAfXug/rJFWD/CzGwCvxmPuikXEZesHLCdrgzZhVGQ9BcAh8oxz1QcPQXr7
+TCk8+cikSemQrVmqJPq2rvdVpZIzF91ZCpAfT28e0y/aDxbrfS83Ytk+90dQOR8r
+StGNVnrwT/LeMn1ytV7oK8e2sIj1HFUYENQxy5jVjR3QtcTbVoOYLvZ83/wanc4G
+aZnxZ7cJguuKFdqCR5kq4b7acjeQ8a76hrYI57Z+5JDsL+aOgGfCqCDx2IL/bRiw
+Y1pNDfTCPhSSC054yydG3g6pUGk9Kpfj+oA8XrasvR+dD4d7a2cUZRKXU29817is
+fLNjqZMiJ/7LA11I6DeQgPaRK+kAEQEAAYkCHwQoAQgACQUCVzocNwIdAgAKCRBQ
+4IhVk9LctGVfEADBBSjZq858OE932M9FUyt5fsYQ1p/O6zoHlCyGyyDdXNu2aDGv
+hjUVBd3RbjHW87FiiwggubZ/GidCSUmv/et26MAzqthl5CJgi0yvb5p2KeiJvbTP
+ZEN+WVitAlEsmN5FuUzD2Q7BlBhFunwaN39A27f1r3avqfy6AoFsTIiYHVP85Hsc
+CaDYc2SpZNAJYV4ZcascuLye2UkUm3fSSaYLCjtlVg0mWkcjp7rZFQxqlQqSjVGa
+rozxOYgI+HgKaqYF9+zJsh+26kmyHRdQY+Pznpt+PXjtEQVsdzh5pqr4w4J8CnYT
+JKQQO4T08cfo13pfFzgqBGo4ftXOkLLDS3ZgFHgx00fg70MGYYAgNME7BJog+pO5
+vthwfhQO6pMT08axC8sAWD0wia362VDNG5Kg4TQHFARuAo51e+NvxF8cGi0g1zBE
+fGMCFwlAlQOYcI9bpk1xx+Z8P3Y8dnpRdg8VK2ZRNsf/CggNXrgjQ2cEOrEsda5l
+G/NXbNqdDiygBHc1wgnoidABOHMT483WKMw3GBao3JLFL0njULRguJgTuyI9ie8H
+LH/vfYWXq7t5o5sYM+bxAiJDDX+F/dp+gbomXjDE/wJ/jFOz/7Cp9WoLYttpWFpW
+Pl4UTDvfyPzn9kKT/57OC7OMFZH2a3LxwEfaGTgDOvA5QbxS5txqnkpPcokERAQY
+AQgADwUCVk9/CAIbAgUJAeEzgAIpCRBQ4IhVk9LctMFdIAQZAQgABgUCVk9/CAAK
+CRCGM/sTtYhE8RLLD/0bK5unOEb1RsuzCqL7IWPr+Z6i7smZ0tmrTF58a3St64Dj
+R3WYuv/RnhYyh8xCtBod7ZoIl2S+Azavevx22KWXPQgRtwhlCJFsnDoG9C5Kj0Bq
+Urtyk+9nlGeIMOUPjMJJocEaB9yHZs7J9KFNyqpEY7x2XW6HTDihsBdaOUu814g6
+C4gLiXydwbQMzU2Crefc1w/fWhSxjqiyUlKp571jeauWuUdtbQmwk/Kvq9yreHkE
+WN4MHs2HuBwwBmbj0KDFFDA2u6oUvGlRTfwomTiryXDr1tOgiySucdFVrx+6zPBM
+cqlXqsVDsx8sr+u7PzIsHO9NT+P3wYQpmWhwKCjLX5KN6Xv3d0aAr7OYEacrED1s
+qndIfXjM5EcouLFtw/YESA7Px8iRggFVFDN0GY3hfoPJgHpiJj2KYyuVvNe8dXps
+jOdPpFbhTPI1CoA12woT4vGtfxcI9u/uc7m5rQDJI+FCR9OtUYvtDUqtE/XYjqPX
+zkbgtRy+zwjpTTdxn48OaizVU3JOW+OQwW4q/4Wk6T6nzNTpQDHUmIdxsAAbZjBJ
+wkE4Qkgtl8iUjS0hUX05ixLUwn0ZuGjeLcK9O/rqynPDqd9gdeKo5fTJ91RhJxoB
+SFcrj21tPOa0PhE/2Zza24AVZIX5+AweD9pie8QIkZLMk6yrvRFqs2YrHUrc5emk
+D/4lGsZpfSAKWCdc+iE5pL434yMlp73rhi+40mbCiXMOgavdWPZSDcVe+7fYENx0
+tqUyGZj2qKluOBtxTeovrsFVllF9fxzixBthKddA6IcDQdTb076t/Ez51jX1z/GR
+Pzn8yWkDEvi3L9mfKtfuD4BRzjaVw8TtNzuFuwz2PQDDBtFXqYMklA67cdjvYdff
+O7MeyKlNjKAutXOr/Or70rKkk2wZLYtSeJIDRwUSsPdKncbGLEKvfoBKOcOmjfZK
+jnYpIDDNqAsMrJLIwyo+6NSUtq84Gba6QjPYLvJ9g4P299dIYzFxu/0Zy4q9Qgfj
+JOav3GUQT1fRhqqRS11ffXFqClJKqsKSChcPhNhK5wt6Ab6PVbd9RQhI8ImLQ81P
+Wn708rOr1dQTQfPvJrHBBrEolUw/0y7SxPmQZUkYlXiT6bvsUa2n2f4ZzIgtYtZ5
+JSuoqcut/jmeUQE1TUUyG+9HVMfmhlhjNO0pDiFdSAgjk+DyTd5lUVz3tPGFliID
+q7O/sgDq6xtSlGKvQt/gRoYstrillyxfIVqR10C2t2kCBXKSX3uQmbx3OaX8JtZ2
+uMjmKZb2iovfSf8qLSu49qrsNS9Etqvda0EXqaHeX+K8NjENoQEdXZUnBRJg9VVa
+0HkPiFSFIwF8IPWewm0DocZil66bp/wrHVsJkw7AwE/zJrkCDQRXOi4eARAA+cAK
+fT0IoViuCxqa6uPteVC8/qp8ZiEPri0neCt+khngPpCX9JseOyRJEzwt9+31Xgzs
+CWlfW5BWrLBd3F4caRqucu3ZnE68Qtrw6kcOsJ8LSiok/uu1XnXW1mgpRxlu0i83
+YVM6+BrIXroP22SWVxkDkAXDlgvFmIvrh9TG43uSRjmgriSnJ7EOgDXDrZ5mTlnl
+GHb6EGpHJHoJsfp3JdBAh4oNGBBHf5fZZhBiUIJSGwbLg8oEzOuycNor9mEiJPaA
+yPm22braWRgvX7beOca60eNGIuQSZ8ML3G6rog/pNdbNgLf1hvrfl7NJCJJ0iB7B
+PYw8e5+xPEHNLrJI6NjFCbD0dlHnuq79ePc9bPQALa/6lIICOCAZJYDCf7S2dHqk
+HCOnr8F2A2qwAqP5IlVqdS7sSy7D9wDDYis7jlMw8vVWjqcL6MNxJDk3h/0ns7Ad
+5TNfJnLUnUbYWeH5QYbPsGgqQomhSWBvhCZkILnE7Rpbtjl55/CvTXN1L6jyi9qJ
+eSoWORjwhTlACKDzlsLRTO24sM/KjKDajYrqU3CRVDQGgQL0yU3qDz/mql+awQAM
+US9ckaf/ohBM8SrCandNvE/+as426Mf6/FH6R7kntJppYQZJMwq0XlyueadWs8xr
+CjrXnXFijvrVkaZhlCfJRZPEdI76hGscRp8Sr6kAEQEAAYkERAQYAQgADwUCVzou
+HgIbAgUJAeEzgAIpCRBQ4IhVk9LctMFdIAQZAQgABgUCVzouHgAKCRBI+blqLhYT
+f6o8D/0WqjCOqB4rAv29MGpz5SZbk57TbQrKfjneSDVeCsvgofUBL6z9yA2jEanI
+h76Lo6r5ZnvF8I4pDImiRCjhZ+4vDOKaO5yvrNKruusr+ZA6DDPwjlhnRPqW8Sm1
+YGl1VqAqQEjib4I7dbGb5qpR/PkAj64UDtLtbMfx6Zb9B9ZJvYEiWUbAEQWUohRh
+w6vT/qS07GrKgG35JFiJKrNPSFEh/YOLKq+vLVZwDKX91Tvabs3MuNFIavuMiGao
+qv4/JVRA1Iw3E9zCsXgFhIfQll4XvrrPXiGAllFzaqX29PnvqMngjPRDTh+jHNUj
+Fv8MNvhs1o3jc1pQAJT5JIpPQJJpbnNnrYoCJoBO0kfJ04zEDznHkuVbLRn2pxWs
+CrF2Agwm4GB3YSenEW8AKcmtS4ov0Yaw5csY3fXUDXjBaPR9dweNWT/kaY5V4NUw
+OutecnZ0o0yDc57GGIjFhTcULMdOCE6DbSTfljqcoAoPIydzQ4rlMdmTkiM5k2F/
+jDHCURersqF8Naro7Nx2fKokPrLKUst+pFBBwbeTO9tWEbOnl/ypHeRW9XA31sZ0
+yvvSwUrWnHC+UDpHPzvaAGleAOK7gGyJehVIw9BhgZB1LplkbkGgpS8L/3CAcaQ4
+88MP5NK0peO+ED/ocNhi1tC/cHbLXtDiz/eG/1rIdxkOh3D61WiyD/42Oj2h4BHt
+5qTS12By95po4avzgqaV3PFYi9Rx6tBvzwnD7x2UeGk4wzFdb2V4LWoe6bqMokxb
+UMWJgP5faWDT6/urhBt4GYcBxX0b3l9qBs20hP5JVHGX208gOW5cjfHrTNiHiY4/
+CbQrbAdO24CUYZtYEmDNdHN+KHrlLLjkf0v5yGjVK2XBqs8l6upA7xBGHAF7U/Xk
+LYrvyusqqWdvdGHGHthbLBzjceO+4N+lb6RyHRuF6kgbLdCcaKfCMUs/v1ZXgYGh
+dk7NWFHFDoF8DByHwluoihd10OudGPFg7ydTc6+V3kt9SN1/iQbk2/rHffI1tm28
+MfBvN+K/Da+Y+EAqTbUDHl6O30mSGZjLl1xJxvWoezU98TdPCxy7L9XRFfqZlBJA
+o8cxRIPHpqKIaRy0wn616xCDfUSQ9NBLlDITL4d7tNvDC9hLpehFKMKIEct5WDfa
+QIWQe2o1fjVsU2Is2wXVmdi9A7X3q7yWVA766zQTxQO61TcgyoJM9k2DxncsmwXI
+a8oD6KP4VYtrtsx8r4VXPEjHucCjPe+qgyY65wBPXSl5U21AiUuGGegFQwRD6L7Z
+qT3K5JLDlK/kkaV3l8i0onfJ+5CytOB2T6QPQnJ4YnchK9w3EiyDrgzl0IpotQXx
+OBGHoCtcxUZvkNeOIxAb8QwkWnhgkljMybkCDQRZIy9RARAAx0HKx3EkqAd93ZFZ
+/5iJDUEWB5GpMdlc+gTyh+/P1ys2Ob/gZxI0j9/OYMomV9SkPnaZvwxVfxabBpuM
+3UTp1+Cvgn0ghXNZqptyj6o9pW+JYUA4aD8MgmqUYXSq7nHFG7LbQ3y8N+wAoRJ3
+Obt4ZnyvEqW1PuE4OF9JbjmLUW3mj+OLkcMptbhYDafM9IDqAp0eKORXZ+z3xhJX
+nV+4B82RdJHKwfAmaemjMNTK8yuwBJ38k773JiCNbptHG3IE/TkDcIbBXAY2desS
+3+JbkwWtXK+Xn7XhwAxyuY6Zh0o8oIsIQO+mQc3NivbW6eqfIPH08m+sJs61Of4r
+O1xB9lRHYEYxUCDrOydzJyDq+X4W6CymRIHcDiQ5vZmfbGkmBmlxA4/OGshbbC1g
+aeniecelbgExZ7H6oFuRhIem7lnZV6yJtg293paUhHvHfHtLv4hdriSwkWV5vQLh
+GIjJ9g3XJAJ+lkgbge3CoN2oSqIjS9k1ohwRzfEfYRldckmNHJCYj9T9vkWX4wUN
+YMHOb5Ct2fybGSWSQuPBfKeOjdHhO49C4RM8IvvPaBaVmFWqRdiRrOjZkyb51xX4
+zjoENYlKzXxlk0lg6eQE2m40uzon+PKu32/hI+Nc3ARIzUm/mb7v9P58pLzOXKlI
+W46p6wR4dqJR48hgJlnDup5yDdUAEQEAAYkERAQYAQgADwUCWSMvUQIbAgUJAe5o
+XwIpCRBQ4IhVk9LctMFdIAQZAQgABgUCWSMvUQAKCRDeL4+H70tO2bzzEACTbFvi
+MxRtepG0rYeBaDwJaB9CUH6mlTuFaz0HjmvR42CwrN87DUbr0B5mZcxV9IdEN2+c
+cwTIOhMmvxePqpkfekiw9nGbfOnWgAMOpiJvs9QctZU4JKwI/NwybII2Zum6L5KX
+S6EUq372yWT/jzbn5sCuasud+zugjGaYYrjmnzXy0jafUXkIjsPl1vj/ANlUvhP9
+4Aqpl1Fk+tHGan6OrxyvLp/4BZU3TmfFVD3MJhF8tWgcMVzT91Uhev7D/S1YptY9
+Bh3rjAj/uxcwjyciSbo/WL4rTKco5zB9Wa+1lbWo6dO8UYt6rm6g8/tI4ql8jiAW
+4c1rdQVpvukYqhGZqalwaxYXeNjzqdFmh4A7CQTELgMF2fvcsGFX6Pzm/3Z/jlQn
+9Uwc3I+WMZUNmqLnljTru3uCewczwA720EEbonHEGZb4eWi39KytUekfZTaQM9Kj
+nmiAG0NedWSnAf6IEJRHZle0AZAFvKwrfUpQyK1G2fBI3QLvb33US44zZzM7HP1s
+zGm6Wj2nUJtWOjSiorHgiyNp5rK9ZMtIkaoSDQhg1Z4Kd+HlZOeC5sOTCDH1Porf
+idlJLFsQZSPAjmgWEGB1buYr/Qa6e7RdR8beDKM+ZwFQQge+h8LeXQOYTrhvGdWQ
+G8bFT008cvm27Pz6BDOsh48J1t7jbMuW/pLYEAg8EACpOsWlWEIYoUPOpSELcBCN
+lkeuURirbGGvMWTsVTu+fsz1smacjyXrd5NdQL1VZl65Vfauba4k1OUlRCDE+bdM
+Ze6nGbH+/2/IioUUVKxS/skJlfXq/oZ1+pfel/rbmeYEPURJQG8cQjAlB7tRzX5B
+c+gshgmJ+DNQJ15bEAu1V2TdQKqjA4VtClJThSUpg4HlKIl3WpgaBJpXTeb35j3u
+9+pKxwp1AOaLUiwG3YcnbZrKmqP1/lFR3Iyz6OoL/c0CRAP5cckFbDsJN5FmR9Ns
++j/e7Ci0+ic/62R8Yqrqzbtoj/ISfTfYPrKEo1FmcptgGVy3ty8jps1KdkJy6RDN
+EtoSQ5C4gFg40WIQ/nUJEegLVwm/y+AKQ/bArLmfH+SPVRV/WVKgjZHoU5FwhP79
+3DzG8wF0Pfq6iYNpCziUYMSI9As+zdXpee0f0xtvji++V3J4PaOWX2/59OnHwR27
+kfS68AO03dY9yhiAw41bKNafIwfAJNVUyiP+JgXc/EYVtZtcSJC+h5v8dxi8W3GR
+3Oa0hgV/GKQwofqV0QN63sW0N/MVH/73HdOl90N+We5L3hWNkWnX+klCmpbBb89a
+JUz0rdDolFlffrdwVM5RvAT0OBNo4ZTDv5p0+4ahoZpXT/kQGXDVdBFvp9GLTH3l
+tNPsShDTwMfzQ7k8ah9PXA==
+=NfcE
 -----END PGP PUBLIC KEY BLOCK-----
 "
 

From a92dcbd378e1b014b8d890a0ece90781cac4f93e Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Tue, 23 May 2017 17:23:31 -0700
Subject: [PATCH 1114/1304] skip nonexistent stage1 images when packaging

Not all builds will generate all stage1 images. It depends on what
./configure flags (--with-stage1-flavors) were used.

When generating deb and rpm packages, only use what is available.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
---
 scripts/pkg/build-pkgs.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/pkg/build-pkgs.sh b/scripts/pkg/build-pkgs.sh
index b9d7b38a58..445c6d2029 100755
--- a/scripts/pkg/build-pkgs.sh
+++ b/scripts/pkg/build-pkgs.sh
@@ -48,7 +48,9 @@ install -Dm755 $builddir/target/bin/rkt $prefix/usr/bin/rkt
 
 ## install stage1s
 for flavor in fly coreos kvm; do
-    install -Dm644 $builddir/target/bin/stage1-${flavor}.aci $prefix/usr/lib/rkt/stage1-images/stage1-${flavor}.aci
+    stage1_aci="$builddir/target/bin/stage1-${flavor}.aci"
+    [[ -f "$stage1_aci" ]] || continue # skip nonexistent
+    install -Dm644 $stage1_aci $prefix/usr/lib/rkt/stage1-images/stage1-${flavor}.aci
 done
 
 ## manpages & doc

From 857cb0c1eb449dcf95c04fb0c5dead6d4c0053ea Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <benjamin.gilbert@coreos.com>
Date: Wed, 7 Jun 2017 22:06:06 -0700
Subject: [PATCH 1115/1304] Documentation: CoreOS -> Container Linux

---
 Documentation/build-configure.md            | 10 +++++-----
 Documentation/dependencies.md               |  2 +-
 Documentation/devel/update-coreos-stage1.md |  8 ++++----
 Documentation/distributions.md              |  8 ++++----
 Documentation/hacking.md                    |  4 ++--
 Documentation/install-rkt-in-coreos.md      |  4 ++--
 Documentation/packaging.md                  |  2 +-
 Documentation/trying-out-rkt.md             |  6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Documentation/build-configure.md b/Documentation/build-configure.md
index 5dff3da078..740930f818 100644
--- a/Documentation/build-configure.md
+++ b/Documentation/build-configure.md
@@ -14,8 +14,8 @@ Depending on a default stage1 image setup, this list is by default either empty
 Note that specifying this parameter does not necessarily mean that rkt will use them in the end.
 Available flavors are:
 
-- `coreos` - it takes systemd and bash from a CoreOS PXE image; uses systemd-nspawn
-- `kvm` - it takes systemd, bash and other binaries from a CoreOS PXE image; uses lkvm or qemu
+- `coreos` - it takes systemd and bash from a CoreOS Container Linux PXE image; uses systemd-nspawn
+- `kvm` - it takes systemd, bash and other binaries from a Container Linux PXE image; uses lkvm or qemu
 - `src` - it builds systemd, takes bash from the host at build time; uses built systemd-nspawn
 - `host` - it takes systemd and bash from host at runtime; uses systemd-nspawn from the host
 - `fly` - chroot-only approach for single-application minimal isolation containers; native Go implementation
@@ -115,11 +115,11 @@ The default is `master`.
 
 ### `coreos` and `kvm` flavor
 
-`coreos` and `kvm` flavors provide parameters related to CoreOS PXE image.
+`coreos` and `kvm` flavors provide parameters related to CoreOS Container Linux PXE image.
 
 #### `--with-coreos-local-pxe-image-path`
 
-This parameter is used to point the build system to a local CoreOS PXE image.
+This parameter is used to point the build system to a local Container Linux PXE image.
 This can be helpful for some packagers, where downloading anything over the network is a no-no.
 The parameter takes either relative or absolute paths.
 The default value is empty, so the image will be downloaded over the network.
@@ -127,7 +127,7 @@ If this parameter is specified, then also `--with-coreos-local-pxe-image-systemd
 
 #### `--with-coreos-local-pxe-image-systemd-version`
 
-The build system has no reliable way to deduce automatically what version of systemd the CoreOS PXE image contains, so it needs some help.
+The build system has no reliable way to deduce automatically what version of systemd the Container Linux PXE image contains, so it needs some help.
 This parameters tells the build systemd what is the version of systemd in the local PXE image.
 The value should be like tag name in systemd git repository, that is - `v<number>`, like `v229`.
 If this parameter is specified, then also `--with-coreos-local-pxe-image-path` must be specified too.
diff --git a/Documentation/dependencies.md b/Documentation/dependencies.md
index 964d3a2420..53800a035f 100644
--- a/Documentation/dependencies.md
+++ b/Documentation/dependencies.md
@@ -47,7 +47,7 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
 * sort
 * unsquashfs
 * wget
-* gpg (optional, required when downloading the CoreOS PXE image during the build)
+* gpg (optional, required when downloading the CoreOS Container Linux PXE image during the build)
 
 ### Specific dependencies for the kvm flavor
 
diff --git a/Documentation/devel/update-coreos-stage1.md b/Documentation/devel/update-coreos-stage1.md
index 1c9c6ec7be..ef81c380ec 100644
--- a/Documentation/devel/update-coreos-stage1.md
+++ b/Documentation/devel/update-coreos-stage1.md
@@ -7,7 +7,7 @@ The process is quite manual because it's not done often, but improvements are we
 
 ## Extract the root filesystem of the image
 
-Let's assume you want to update from version 991.0.0 to version 1032.0.0.
+Let's assume you want to update CoreOS Container Linux from version 991.0.0 to version 1032.0.0.
 
 First, you need to download and verify the image.
 Make sure you trust the [CoreOS Image Signing Key][coreos-key].
@@ -64,7 +64,7 @@ You should have now the rootfs of the image in the `squashfs-root` directory.
 
 ## Update the manifest files
 
-Back to the rkt repo, in the directory `stage1/usr_from_coreos/manifest.d`, there are some manifest files that define which files are copied from the CoreOS image to the stage1 image.
+Back to the rkt repo, in the directory `stage1/usr_from_coreos/manifest.d`, there are some manifest files that define which files are copied from the Container Linux image to the stage1 image.
 
 You need to go through all of them and check that the files listed correspond to files that are in the actual rootfs of the image (which we extracted in the previous step). Do this from your root directory:
 
@@ -78,11 +78,11 @@ done
 ```
 
 Usually, there are some updated libraries which need an update on their version numbers.
-In our case, there are no updates and all the files mentioned in the manifest are present in the updated CoreOS image.
+In our case, there are no updates and all the files mentioned in the manifest are present in the updated Container Linux image.
 
 ## Update the coreos flavor version used by the build system
 
-In the file `stage1/usr_from_coreos/coreos-common.mk`, we define which CoreOS image version we use for the coreos flavor.
+In the file `stage1/usr_from_coreos/coreos-common.mk`, we define which Container Linux image version we use for the coreos flavor.
 Update `CCN_IMG_RELEASE` to 1032.0.0 and `CCN_SYSTEMD_VERSION` to the systemd version shipped with the image (in our case, v229).
 
 ```diff
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index dd16953e3d..a70fd45751 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -35,9 +35,9 @@ However, this is [not yet ready for production use][rkt-1305] due to pending sys
 ## Container Linux
 
 rkt is an integral part of Container Linux, installed with the operating system.
-The [CoreOS releases page][coreos-releases] lists the version of rkt available in each CoreOS release channel.
+The [Container Linux releases page][cl-releases] lists the version of rkt available in each Container Linux release channel.
 
-If the version of rkt included in Container Linux is too old, it's fairly trivial to fetch the desired version [via a systemd unit][coreos-install-rkt].
+If the version of rkt included in Container Linux is too old, it's fairly trivial to fetch the desired version [via a systemd unit][cl-install-rkt].
 
 ## Debian
 
@@ -156,8 +156,8 @@ gpg --verify rkt_1.26.0-1_amd64.deb.asc
 sudo dpkg -i rkt_1.26.0-1_amd64.deb
 ```
 
-[coreos-install-rkt]: install-rkt-in-coreos.md
-[coreos-releases]: https://coreos.com/releases/
+[cl-install-rkt]: install-rkt-in-coreos.md
+[cl-releases]: https://coreos.com/releases/
 [debian-823322]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823322
 [firewalld]: https://fedoraproject.org/wiki/FirewallD
 [networking-overview-additional]: networking/overview.md#setting-up-additional-networks
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index dfb5796d2f..463520888b 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -40,7 +40,7 @@ Replace `$SRC` with the absolute path to your rkt source code:
 
 ### Building systemd in stage1 from source
 
-By default, rkt gets systemd from a CoreOS image to generate stage1.
+By default, rkt gets systemd from a CoreOS Container Linux image to generate stage1.
 It's also possible to build systemd from source.
 To do this, use the following `configure` parameters after running `./autogen.sh`:
 
@@ -59,7 +59,7 @@ Example:
 
 ### Building stage1 with kvm as execution engine
 
-The stage1 kvm image is based on CoreOS, but with additional components for running containers on top of a hypervisor.
+The stage1 kvm image is based on Container Linux, but with additional components for running containers on top of a hypervisor.
 
 To build this stage1 image, pass `kvm` to `--with-stage1-flavors` parameter in `./configure`
 
diff --git a/Documentation/install-rkt-in-coreos.md b/Documentation/install-rkt-in-coreos.md
index 0f81901917..cd6706afa6 100644
--- a/Documentation/install-rkt-in-coreos.md
+++ b/Documentation/install-rkt-in-coreos.md
@@ -1,6 +1,6 @@
-# Installing a different version of rkt in CoreOS
+# Installing a different version of rkt in CoreOS Container Linux
 
-If a different version of rkt is required than what ships with CoreOS, a
+If a different version of rkt is required than what ships with CoreOS Container Linux, a
 oneshot systemd unit can be used to download and install an alternate version
 on boot.
 
diff --git a/Documentation/packaging.md b/Documentation/packaging.md
index 456e3fde15..a2df39dfc0 100644
--- a/Documentation/packaging.md
+++ b/Documentation/packaging.md
@@ -8,7 +8,7 @@ Please see [the list of build-time dependencies][build-deps].
 
 ### Offline builds
 
-By default, the rkt build will download a CoreOS PXE image from the internet and extract some binaries, such as `systemd-nspawn` and `bash`. However, some packaging environments don't allow internet access during the build. To work around this, download the CoreOS PXE image before starting the build process, and use the `--with-coreos-local-pxe-image-path` and `--with-coreos-local-pxe-image-systemd-version` parameters. For more details, see the [configure script parameters documentation][build-config].
+By default, the rkt build will download a CoreOS Container Linux PXE image from the internet and extract some binaries, such as `systemd-nspawn` and `bash`. However, some packaging environments don't allow internet access during the build. To work around this, download the Container Linux PXE image before starting the build process, and use the `--with-coreos-local-pxe-image-path` and `--with-coreos-local-pxe-image-systemd-version` parameters. For more details, see the [configure script parameters documentation][build-config].
 
 ### Bundling with systemd
 
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 1a803f130c..f79f331797 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -5,7 +5,7 @@ This document introduces the basics of getting rkt and running a container with
 Giving rkt a spin takes just a few basic steps, detailed below.
 
 1. Install rkt:
-  * [CoreOS Linux][run-coreos] comes with rkt installed and configured. You can skip straight to [running a container with rkt][id-rkt-run-by-name].
+  * [CoreOS Container Linux][run-cl] comes with rkt installed and configured. You can skip straight to [running a container with rkt][id-rkt-run-by-name].
   * On other Linux distributions, [grab the latest rkt binary][id-lin-rkt-bin], or [the distribution's rkt package][id-lin-rkt-pkg].
   * On Mac or Windows, you can [use a Vagrant virtual machine to run rkt][id-vagrant-rkt]
 2. [Configure rkt][id-config-rkt]: Optional steps that make it simpler to experiment with rkt.
@@ -134,7 +134,7 @@ Once rkt is present on a machine, some optional configuration steps can make it
 
 ### SELinux
 
-rkt supports running under SELinux mandatory access controls, but an SELinux policy needs to be tailored to your distribution. New rkt users on distributions other than CoreOS should temporarily [disable SELinux][disable-selinux] to make it easier to get started. If you can help package rkt for your distro, including SELinux policy support, [please lend a hand][distro-pkg-help]!
+rkt supports running under SELinux mandatory access controls, but an SELinux policy needs to be tailored to your distribution. New rkt users on distributions other than Container Linux should temporarily [disable SELinux][disable-selinux] to make it easier to get started. If you can help package rkt for your distro, including SELinux policy support, [please lend a hand][distro-pkg-help]!
 
 ### Optional: Set up privilege separation
 
@@ -307,7 +307,7 @@ The escape character `^]` is generated by `Ctrl-]` on a US keyboard. The require
 [rkt-fetch]: subcommands/fetch.md
 [rkt-run]: subcommands/run.md
 [rkt-trust]: subcommands/trust.md
-[run-coreos]: https://coreos.com/os/docs/latest/#running-coreos
+[run-cl]: https://coreos.com/os/docs/latest/#running-coreos
 [setup-data-dir]: https://github.com/rkt/rkt/blob/master/dist/scripts/setup-data-dir.sh
 [signguide]: signing-and-verification-guide.md
 [signguide-establishing-trust]: signing-and-verification-guide.md#establishing-trust

From 28d096fe22b273dd2c96efd05a73d5e42f9492cf Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Wed, 7 Jun 2017 14:12:36 -0700
Subject: [PATCH 1116/1304] RuntimeApp.Mounts.AppVolume is optional

When it is nil, the Volume info at the Pod level (with the same name)
should be used. Without this patch `rkt list --format=json` panics on a
nil pointer when Apps reference Volumes from the Pod level.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
---
 lib/app.go | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/app.go b/lib/app.go
index 16381bba98..15a67ac2b4 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -20,6 +20,7 @@ import (
 	"os"
 
 	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 	"github.com/rkt/rkt/api/v1"
 	"github.com/rkt/rkt/common"
 	pkgPod "github.com/rkt/rkt/pkg/pod"
@@ -78,12 +79,32 @@ func newApp(ra *schema.RuntimeApp, podManifest *schema.PodManifest, pod *pkgPod.
 		UserLabels:      ra.App.UserLabels,
 	}
 
+	podVols := podManifest.Volumes
+	podVolsByName := make(map[types.ACName]types.Volume, len(podVols))
+	for i := range podManifest.Volumes {
+		podVolsByName[podVols[i].Name] = podVols[i]
+	}
+
 	for _, mnt := range ra.Mounts {
+		readOnly := false
+		var hostPath string
+		// AppVolume is optional
+		if av := mnt.AppVolume; av != nil {
+			hostPath = av.Source
+			if ro := av.ReadOnly; ro != nil {
+				readOnly = *ro
+			}
+		} else {
+			hostPath = podVolsByName[mnt.Volume].Source
+			if ro := podVolsByName[mnt.Volume].ReadOnly; ro != nil {
+				readOnly = *ro
+			}
+		}
 		app.Mounts = append(app.Mounts, &v1.Mount{
 			Name:          mnt.Volume.String(),
 			ContainerPath: mnt.Path,
-			HostPath:      mnt.AppVolume.Source,
-			ReadOnly:      *mnt.AppVolume.ReadOnly,
+			HostPath:      hostPath,
+			ReadOnly:      readOnly,
 		})
 	}
 

From b0175aa362682d372791b26c04f00600a6410857 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Mon, 12 Jun 2017 14:19:32 +0000
Subject: [PATCH 1117/1304] rkt/pubkeys: print debug logs on discovery errors

This reorders log-printing and error-returning when pubkeys discovery
fails, in order to print useful debugging information on error.
---
 rkt/pubkey/pubkey.go | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/rkt/pubkey/pubkey.go b/rkt/pubkey/pubkey.go
index af04017f03..dc66409545 100644
--- a/rkt/pubkey/pubkey.go
+++ b/rkt/pubkey/pubkey.go
@@ -163,25 +163,21 @@ func (m *Manager) metaDiscoverPubKeyLocations(prefix string) ([]string, error) {
 
 	hostHeaders := config.ResolveAuthPerHost(m.AuthPerHost)
 	insecure := discovery.InsecureNone
-
 	if m.InsecureAllowHTTP {
 		insecure = insecure | discovery.InsecureHTTP
 	}
 	if m.InsecureSkipTLSCheck {
 		insecure = insecure | discovery.InsecureTLS
 	}
-	keys, attempts, err := discovery.DiscoverPublicKeys(*app, hostHeaders, insecure, 0)
-	if err != nil {
-		return nil, err
-	}
 
-	if m.Debug {
+	keys, attempts, err := discovery.DiscoverPublicKeys(*app, hostHeaders, insecure, 0)
+	if err != nil && m.Debug {
 		for _, a := range attempts {
 			log.PrintE(fmt.Sprintf("meta tag 'ac-discovery-pubkeys' not found on %s", a.Prefix), a.Error)
 		}
 	}
 
-	return keys, nil
+	return keys, err
 }
 
 // getPubKey retrieves a public key (if remote), and verifies it's a gpg key

From c20edb82e759da41688db9c02da276fc9aae39cc Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Wed, 14 Jun 2017 09:00:12 +0000
Subject: [PATCH 1118/1304] docs: fix code block syntax

---
 Documentation/commands.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 6a1fcc1e78..5102739d5b 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -139,25 +139,26 @@ Additionaly, logs can be programmatically accessed via the [sd-journal API][sd-j
 
 Currently there are two known main issues with logging in rkt:
 * In some rare situations when an application inside the pod is writing to `/dev/stdout` and `/dev/stderr` (i.e. nginx) there is no way to obtain logs.
- The app should be modified so it will write to `stdout` or `syslog`. In the case of nginx:
- ```
- error_log stderr;
- 
- http {
-     access_log syslog:server=unix:/dev/log main;
-     [...]
- }
- ```
- should be added to ```/etc/nginx/nginx.conf```
+ The app should be modified so it will write to `stdout` or `syslog`. In the case of nginx the following snippet should be added to ```/etc/nginx/nginx.conf```:
+
+```
+error_log stderr;
+
+http {
+    access_log syslog:server=unix:/dev/log main;
+    [...]
+}
+```
 
 * Some applications, like etcd 3.0, write directly to journald. Such log entries will not be written to stdout or stderr.
  These logs can be retrieved by passing the machine ID to journalctl:
 
- ```
- $ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4
- ```
 
- For the specific etcd case, since release 3.1.0-rc.1 it is possible to force emitting logs to stdout via a `--log-output=stdout` command-line option.
+```
+$ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4
+```
+
+For the specific etcd case, since release 3.1.0-rc.1 it is possible to force emitting logs to stdout via a `--log-output=stdout` command-line option.
 
 ##### Stopped pod
 

From 7328c8b472c8ce9d854d6186cd22b67843fbdcd1 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Wed, 14 Jun 2017 15:03:44 -0700
Subject: [PATCH 1119/1304] stage1/kvm: Remove stray file from arm64 manifest

Fixes errors like these when building the kvm stage1 flavor for arm64:

  Files listed in manifest.txt are missing from usr.squashfs:
     libcrypt-2.21.so

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest b/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest
index 5591237179..86575998f9 100644
--- a/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest
+++ b/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest
@@ -17,6 +17,5 @@ lib64/libutil-2.21.so
 lib64/libutil.so.1
 lib64/libz.so.1
 lib64/libz.so.1.2.8
-libcrypt-2.21.so
 lib/ld-linux-aarch64.so.1
 sbin/sshd

From ecd871a1b2af839c86bfed7eb5f3aef792fea825 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Wed, 14 Jun 2017 15:03:44 -0700
Subject: [PATCH 1120/1304] stage1/kvm: Use generic names for kernel image

Bzipped images are platform specific, so use generic names.

Also, add an empty make recipe to the kernel image target to avoid using
implicit rules.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1/init/init.go           |  2 +-
 stage1/usr_from_kvm/kernel.mk | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index cf1c60e552..26e5dd3aae 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -279,7 +279,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 		// kernel and hypervisor binaries are located relative to the working directory
 		// of init (/var/lib/rkt/..../uuid)
 		// TODO: move to path.go
-		kernelPath := filepath.Join(common.Stage1RootfsPath(p.Root), "bzImage")
+		kernelPath := filepath.Join(common.Stage1RootfsPath(p.Root), "kernel_image")
 		netDescriptions := kvm.GetNetworkDescriptions(n)
 
 		cpu, mem := kvm.GetAppsResources(p.Manifest.Apps)
diff --git a/stage1/usr_from_kvm/kernel.mk b/stage1/usr_from_kvm/kernel.mk
index 080c25461c..7ebee7ab51 100644
--- a/stage1/usr_from_kvm/kernel.mk
+++ b/stage1/usr_from_kvm/kernel.mk
@@ -13,11 +13,12 @@ KERNEL_SRC_CONFIG := $(KERNEL_STUFFDIR)/cutdown-config
 KERNEL_PATCHESDIR := $(KERNEL_STUFFDIR)/patches
 KERNEL_PATCHES := $(abspath $(KERNEL_PATCHESDIR)/*.patch)
 KERNEL_BUILD_CONFIG := $(KERNEL_BUILDDIR)/.config
-KERNEL_BZIMAGE := $(KERNEL_BUILDDIR)/arch/x86/boot/bzImage
-KERNEL_ACI_BZIMAGE := $(S1_RF_ACIROOTFSDIR)/bzImage
+
+KERNEL_IMAGE := $(KERNEL_BUILDDIR)/arch/x86/boot/bzImage
+KERNEL_ACI_IMAGE := $(S1_RF_ACIROOTFSDIR)/kernel_image
 
 $(call setup-stamp-file,KERNEL_STAMP,/build_kernel)
-$(call setup-stamp-file,KERNEL_BZIMAGE_STAMP,/bzimage)
+$(call setup-stamp-file,KERNEL_IMAGE_STAMP,/kernel_image)
 $(call setup-stamp-file,KERNEL_PATCH_STAMP,/patch_kernel)
 $(call setup-stamp-file,KERNEL_DEPS_STAMP,/deps)
 $(call setup-dep-file,KERNEL_PATCHES_DEPMK)
@@ -26,20 +27,21 @@ $(call setup-filelist-file,KERNEL_PATCHES_FILELIST,/patches)
 CREATE_DIRS += $(KERNEL_TMPDIR) $(KERNEL_BUILDDIR)
 CLEAN_DIRS += $(KERNEL_SRCDIR)
 INSTALL_FILES += $(KERNEL_SRC_CONFIG):$(KERNEL_BUILD_CONFIG):-
-S1_RF_INSTALL_FILES += $(KERNEL_BZIMAGE):$(KERNEL_ACI_BZIMAGE):-
+S1_RF_INSTALL_FILES += $(KERNEL_IMAGE):$(KERNEL_ACI_IMAGE):-
 S1_RF_SECONDARY_STAMPS += $(KERNEL_STAMP)
 CLEAN_FILES += $(KERNEL_TARGET_FILE)
 
-$(call generate-stamp-rule,$(KERNEL_STAMP),$(KERNEL_ACI_BZIMAGE) $(KERNEL_DEPS_STAMP))
+$(call generate-stamp-rule,$(KERNEL_STAMP),$(KERNEL_ACI_IMAGE) $(KERNEL_DEPS_STAMP))
 
 # $(KERNEL_ACI_BZIMAGE) has a dependency on $(KERNEL_BZIMAGE), which
-# is actually provided by $(KERNEL_BZIMAGE_STAMP)
-$(KERNEL_BZIMAGE): $(KERNEL_BZIMAGE_STAMP)
+# is actually provided by $(KERNEL_BZIMAGE_STAMP).  Note the empty recipe
+# here to avoid using implicit rules.
+$(KERNEL_IMAGE): $(KERNEL_IMAGE_STAMP) ;
 
 # This stamp is to make sure that building linux kernel has finished.
-$(call generate-stamp-rule,$(KERNEL_BZIMAGE_STAMP),$(KERNEL_BUILD_CONFIG) $(KERNEL_PATCH_STAMP),, \
-	$(call vb,vt,BUILD EXT,bzImage) \
-	$$(MAKE) $(call vl2,--silent) -C "$(KERNEL_SRCDIR)" O="$(KERNEL_BUILDDIR)" V=0 bzImage $(call vl2,>/dev/null))
+$(call generate-stamp-rule,$(KERNEL_IMAGE_STAMP),$(KERNEL_BUILD_CONFIG) $(KERNEL_PATCH_STAMP),, \
+	$(call vb,vt,BUILD EXT,kernel_image) \
+	$$(MAKE) $(call vl2,--silent) -C "$(KERNEL_SRCDIR)" O="$(KERNEL_BUILDDIR)" V=0 $(call vl2,>/dev/null))
 
 # Generate clean file of a builddir. Can happen only after the
 # building finished.
@@ -47,7 +49,7 @@ $(call generate-clean-mk-simple,\
 	$(KERNEL_STAMP), \
 	$(KERNEL_BUILDDIR), \
 	$(KERNEL_BUILDDIR), \
-	$(KERNEL_BZIMAGE_STAMP), \
+	$(KERNEL_IMAGE_STAMP), \
 	builddir-cleanup)
 
 $(call generate-stamp-rule,$(KERNEL_PATCH_STAMP),$(KERNEL_MAKEFILE),, \

From aa7a58d5b3d6623305af9a3f8fe82135fbeb3964 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Wed, 14 Jun 2017 15:03:44 -0700
Subject: [PATCH 1121/1304] stage1/kvm: Make way for multi-arch build

Add amd64 specifier.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1/usr_from_kvm/kernel.mk                                | 5 +++--
 .../kernel/{cutdown-config => cutdown-config-amd64}          | 0
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename stage1/usr_from_kvm/kernel/{cutdown-config => cutdown-config-amd64} (100%)

diff --git a/stage1/usr_from_kvm/kernel.mk b/stage1/usr_from_kvm/kernel.mk
index 7ebee7ab51..7f0453b18f 100644
--- a/stage1/usr_from_kvm/kernel.mk
+++ b/stage1/usr_from_kvm/kernel.mk
@@ -9,12 +9,13 @@ KERNEL_BUILDDIR := $(abspath $(KERNEL_TMPDIR)/build-$(KERNEL_VERSION))
 KERNEL_URL := https://www.kernel.org/pub/linux/kernel/v4.x/$(KERNEL_TARBALL)
 KERNEL_MAKEFILE := $(KERNEL_SRCDIR)/Makefile
 KERNEL_STUFFDIR := $(MK_SRCDIR)/kernel
-KERNEL_SRC_CONFIG := $(KERNEL_STUFFDIR)/cutdown-config
+KERNEL_SRC_CONFIG := $(KERNEL_STUFFDIR)/cutdown-config-$(GOARCH)
 KERNEL_PATCHESDIR := $(KERNEL_STUFFDIR)/patches
 KERNEL_PATCHES := $(abspath $(KERNEL_PATCHESDIR)/*.patch)
 KERNEL_BUILD_CONFIG := $(KERNEL_BUILDDIR)/.config
 
-KERNEL_IMAGE := $(KERNEL_BUILDDIR)/arch/x86/boot/bzImage
+KERNEL_IMAGE_amd64 := $(KERNEL_BUILDDIR)/arch/x86/boot/bzImage
+KERNEL_IMAGE := $(KERNEL_IMAGE_$(GOARCH))
 KERNEL_ACI_IMAGE := $(S1_RF_ACIROOTFSDIR)/kernel_image
 
 $(call setup-stamp-file,KERNEL_STAMP,/build_kernel)
diff --git a/stage1/usr_from_kvm/kernel/cutdown-config b/stage1/usr_from_kvm/kernel/cutdown-config-amd64
similarity index 100%
rename from stage1/usr_from_kvm/kernel/cutdown-config
rename to stage1/usr_from_kvm/kernel/cutdown-config-amd64

From 4d3fb55dac983dbf76ac7f70dd680410ca9c8e66 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Wed, 14 Jun 2017 15:03:44 -0700
Subject: [PATCH 1122/1304] stage1/kvm: Add arm64 kernel config

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1/usr_from_kvm/kernel.mk                 |    1 +
 .../usr_from_kvm/kernel/cutdown-config-arm64  | 5277 +++++++++++++++++
 2 files changed, 5278 insertions(+)
 create mode 100644 stage1/usr_from_kvm/kernel/cutdown-config-arm64

diff --git a/stage1/usr_from_kvm/kernel.mk b/stage1/usr_from_kvm/kernel.mk
index 7f0453b18f..57c27e8e95 100644
--- a/stage1/usr_from_kvm/kernel.mk
+++ b/stage1/usr_from_kvm/kernel.mk
@@ -15,6 +15,7 @@ KERNEL_PATCHES := $(abspath $(KERNEL_PATCHESDIR)/*.patch)
 KERNEL_BUILD_CONFIG := $(KERNEL_BUILDDIR)/.config
 
 KERNEL_IMAGE_amd64 := $(KERNEL_BUILDDIR)/arch/x86/boot/bzImage
+KERNEL_IMAGE_arm64 := $(KERNEL_BUILDDIR)/vmlinux
 KERNEL_IMAGE := $(KERNEL_IMAGE_$(GOARCH))
 KERNEL_ACI_IMAGE := $(S1_RF_ACIROOTFSDIR)/kernel_image
 
diff --git a/stage1/usr_from_kvm/kernel/cutdown-config-arm64 b/stage1/usr_from_kvm/kernel/cutdown-config-arm64
new file mode 100644
index 0000000000..09282e4374
--- /dev/null
+++ b/stage1/usr_from_kvm/kernel/cutdown-config-arm64
@@ -0,0 +1,5277 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm64 4.9.2 Kernel Configuration
+#
+CONFIG_ARM64=y
+CONFIG_64BIT=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU=y
+CONFIG_DEBUG_RODATA=y
+CONFIG_ARM64_PAGE_SHIFT=12
+CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CSUM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_HAVE_GENERIC_RCU_GUP=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_SMP=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_FHANDLE=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
+# RCU Subsystem
+#
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+# CONFIG_TASKS_RCU is not set
+CONFIG_RCU_STALL_COMMON=y
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_EXPEDITE_BOOT is not set
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_CFS_BANDWIDTH is not set
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_FREEZER is not set
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_BPF=y
+# CONFIG_EXPERT is not set
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
+CONFIG_SYSFS_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+# CONFIG_BPF_SYSCALL is not set
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_USERFAULTFD is not set
+CONFIG_PCI_QUIRKS=y
+CONFIG_MEMBARRIER=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
+CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_PROFILING=y
+CONFIG_KEXEC_CORE=y
+# CONFIG_KPROBES is not set
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+# CONFIG_UPROBES is not set
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR_NONE=y
+# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS=18
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
+# CONFIG_HAVE_ARCH_HASH is not set
+# CONFIG_ISA_BUS_API is not set
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+# CONFIG_CPU_NO_EFFICIENT_FFS is not set
+# CONFIG_HAVE_ARCH_VMAP_STACK is not set
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSGLIB is not set
+CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_CMDLINE_PARSER is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CFQ_GROUP_IOSCHED is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Platform selection
+#
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_ALPINE=y
+# CONFIG_ARCH_BCM2835 is not set
+CONFIG_ARCH_BCM_IPROC=y
+CONFIG_ARCH_BERLIN=y
+# CONFIG_ARCH_BRCMSTB is not set
+CONFIG_ARCH_EXYNOS=y
+CONFIG_ARCH_LAYERSCAPE=y
+CONFIG_ARCH_LG1K=y
+CONFIG_ARCH_HISI=y
+CONFIG_ARCH_MEDIATEK=y
+CONFIG_ARCH_MESON=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_SEATTLE=y
+CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_RENESAS=y
+CONFIG_ARCH_R8A7795=y
+CONFIG_ARCH_R8A7796=y
+CONFIG_ARCH_STRATIX10=y
+CONFIG_ARCH_TEGRA=y
+CONFIG_ARCH_SPRD=y
+CONFIG_ARCH_THUNDER=y
+CONFIG_ARCH_UNIPHIER=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VULCAN=y
+CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_ZX=y
+CONFIG_ARCH_ZYNQMP=y
+
+#
+# Bus support
+#
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+# CONFIG_PCIE_DPC is not set
+# CONFIG_PCIE_PTM is not set
+CONFIG_PCI_BUS_ADDR_T_64BIT=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+# CONFIG_PCI_STUB is not set
+CONFIG_PCI_ATS=y
+CONFIG_PCI_ECAM=y
+CONFIG_PCI_IOV=y
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+CONFIG_PCI_LABEL=y
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# PCI host controller drivers
+#
+CONFIG_PCI_AARDVARK=y
+# CONFIG_PCIE_XILINX_NWL is not set
+# CONFIG_PCIE_DW_PLAT is not set
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_RCAR=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCI_XGENE=y
+CONFIG_PCI_XGENE_MSI=y
+CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCIE_IPROC=y
+CONFIG_PCIE_IPROC_PLATFORM=y
+CONFIG_PCIE_IPROC_MSI=y
+CONFIG_PCI_HISI=y
+CONFIG_PCIE_QCOM=y
+# CONFIG_PCI_HOST_THUNDER_PEM is not set
+# CONFIG_PCI_HOST_THUNDER_ECAM is not set
+CONFIG_PCIE_ARMADA_8K=y
+# CONFIG_PCIE_ROCKCHIP is not set
+
+#
+# Kernel Features
+#
+
+#
+# ARM errata workarounds via the alternatives framework
+#
+CONFIG_ARM64_ERRATUM_826319=y
+CONFIG_ARM64_ERRATUM_827319=y
+CONFIG_ARM64_ERRATUM_824069=y
+CONFIG_ARM64_ERRATUM_819472=y
+CONFIG_ARM64_ERRATUM_832075=y
+CONFIG_ARM64_ERRATUM_834220=y
+CONFIG_ARM64_ERRATUM_845719=y
+CONFIG_ARM64_ERRATUM_843419=y
+CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23154=y
+CONFIG_CAVIUM_ERRATUM_27456=y
+CONFIG_ARM64_4K_PAGES=y
+# CONFIG_ARM64_16K_PAGES is not set
+# CONFIG_ARM64_64K_PAGES is not set
+# CONFIG_ARM64_VA_BITS_39 is not set
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_ARM64_VA_BITS=48
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_SCHED_MC=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_NR_CPUS=64
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_NUMA is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HW_PERF_EVENTS=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_MEMORY_ISOLATION=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_BOUNCE=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
+# CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+# CONFIG_ZPOOL is not set
+# CONFIG_ZBUD is not set
+# CONFIG_ZSMALLOC is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_SECCOMP=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_KEXEC=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_ARMV8_DEPRECATED is not set
+
+#
+# ARMv8.1 architectural features
+#
+CONFIG_ARM64_HW_AFDBM=y
+CONFIG_ARM64_PAN=y
+# CONFIG_ARM64_LSE_ATOMICS is not set
+CONFIG_ARM64_VHE=y
+
+#
+# ARMv8.2 architectural features
+#
+CONFIG_ARM64_UAO=y
+CONFIG_ARM64_MODULE_CMODEL_LARGE=y
+# CONFIG_RANDOMIZE_BASE is not set
+
+#
+# Boot options
+#
+# CONFIG_ARM64_ACPI_PARKING_PROTOCOL is not set
+CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
+CONFIG_EFI_STUB=y
+CONFIG_EFI=y
+CONFIG_DMI=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_COREDUMP=y
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_OPP=y
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_CPU_PM=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_GOV_LADDER is not set
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_DT_IDLE_STATES=y
+
+#
+# ARM CPU Idle Drivers
+#
+CONFIG_ARM_CPUIDLE=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_STAT is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
+# CONFIG_ARM_DT_BL_CPUFREQ is not set
+# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
+# CONFIG_ARM_MT8173_CPUFREQ is not set
+CONFIG_ARM_SCPI_CPUFREQ=y
+CONFIG_ARM_TEGRA20_CPUFREQ=y
+CONFIG_ARM_TEGRA124_CPUFREQ=y
+# CONFIG_ACPI_CPPC_CPUFREQ is not set
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+CONFIG_UNIX=y
+# CONFIG_UNIX_DIAG is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE_DEMUX is not set
+CONFIG_NET_IP_TUNNEL=m
+# CONFIG_IP_MROUTE is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_NET_IPVTI is not set
+# CONFIG_NET_UDP_TUNNEL is not set
+# CONFIG_NET_FOU is not set
+# CONFIG_NET_FOU_IP_TUNNELS is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_INET_DIAG_DESTROY is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_IPV6_ILA is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+# CONFIG_IPV6_VTI is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_FOU is not set
+# CONFIG_IPV6_FOU_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+# CONFIG_NF_CONNTRACK_MARK is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_REDIRECT is not set
+# CONFIG_NF_TABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+CONFIG_NETFILTER_XT_NAT=m
+# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
+# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_NF_DUP_IPV4 is not set
+# CONFIG_NF_LOG_ARP is not set
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=m
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+# CONFIG_IP_NF_TARGET_SYNPROXY is not set
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
+CONFIG_IP_NF_MANGLE=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+# CONFIG_NF_DUP_IPV6 is not set
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
+CONFIG_IP6_NF_MANGLE=m
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_SECURITY is not set
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+# CONFIG_IP6_NF_TARGET_NPT is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_L2TP is not set
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_PHONET is not set
+# CONFIG_6LOWPAN is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_OPENVSWITCH is not set
+# CONFIG_VSOCKETS is not set
+# CONFIG_NETLINK_DIAG is not set
+# CONFIG_MPLS is not set
+# CONFIG_HSR is not set
+# CONFIG_NET_SWITCHDEV is not set
+# CONFIG_NET_L3_MASTER_DEV is not set
+# CONFIG_QRTR is not set
+# CONFIG_NET_NCSI is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+# CONFIG_SOCK_CGROUP_DATA is not set
+# CONFIG_CGROUP_NET_PRIO is not set
+# CONFIG_CGROUP_NET_CLASSID is not set
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_HIDP=m
+# CONFIG_BT_HS is not set
+# CONFIG_BT_LE is not set
+CONFIG_BT_LEDS=y
+# CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_DEBUGFS is not set
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIUART=m
+# CONFIG_BT_HCIUART_H4 is not set
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+CONFIG_BT_HCIUART_LL=y
+# CONFIG_BT_HCIUART_3WIRE is not set
+# CONFIG_BT_HCIUART_INTEL is not set
+# CONFIG_BT_HCIUART_BCM is not set
+# CONFIG_BT_HCIUART_QCA is not set
+# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AF_KCM is not set
+# CONFIG_STREAM_PARSER is not set
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+# CONFIG_CFG80211_WEXT is not set
+# CONFIG_LIB80211 is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+# CONFIG_WIMAX is not set
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_RFKILL_REGULATOR is not set
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=y
+CONFIG_NET_9P_VIRTIO=y
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
+# CONFIG_LWTUNNEL is not set
+CONFIG_DST_CACHE=y
+# CONFIG_NET_DEVLINK is not set
+CONFIG_MAY_USE_DEVLINK=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# Device Drivers
+#
+CONFIG_ARM_AMBA=y
+CONFIG_TEGRA_AHB=y
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_ALLOW_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_SYS_HYPERVISOR=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_FENCE_TRACE is not set
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+
+#
+# Bus devices
+#
+# CONFIG_ARM_CCI400_PMU is not set
+# CONFIG_ARM_CCI5xx_PMU is not set
+# CONFIG_ARM_CCN is not set
+# CONFIG_QCOM_EBI2 is not set
+# CONFIG_SIMPLE_PM_BUS is not set
+# CONFIG_SUNXI_RSB is not set
+# CONFIG_TEGRA_ACONNECT is not set
+CONFIG_UNIPHIER_SYSTEM_BUS=y
+CONFIG_VEXPRESS_CONFIG=y
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_DATAFLASH is not set
+CONFIG_MTD_M25P80=y
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+CONFIG_MTD_SPI_NOR=y
+# CONFIG_MTD_MT81xx_NOR is not set
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_SPI_FSL_QUADSPI is not set
+# CONFIG_SPI_HISI_SFC is not set
+# CONFIG_MTD_UBI is not set
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_ADDRESS_PCI=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
+CONFIG_OF_RESERVED_MEM=y
+# CONFIG_OF_OVERLAY is not set
+# CONFIG_PARPORT is not set
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_DRBD is not set
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SKD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_XEN_BLKDEV_FRONTEND=y
+# CONFIG_XEN_BLKDEV_BACKEND is not set
+CONFIG_VIRTIO_BLK=y
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_RSXX is not set
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_NVME_TARGET is not set
+
+#
+# Misc devices
+#
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_QCOM_COINCELL is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_SRAM=y
+CONFIG_VEXPRESS_SYSCFG=y
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+
+#
+# Intel MIC Bus Driver
+#
+
+#
+# SCIF Bus Driver
+#
+
+#
+# VOP Bus Driver
+#
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
+
+#
+# SCIF Driver
+#
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+
+#
+# VOP Driver
+#
+# CONFIG_GENWQE is not set
+# CONFIG_ECHO is not set
+# CONFIG_CXL_BASE is not set
+# CONFIG_CXL_AFU_DRIVER_OPS is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_MQ_DEFAULT is not set
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+CONFIG_SCSI_HISI_SAS=y
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_ESAS2R is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_SMARTPQI is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_XEN_SCSI_FRONTEND is not set
+# CONFIG_SCSI_SNIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_AM53C974 is not set
+# CONFIG_SCSI_WD719X is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_VIRTIO is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_HAVE_PATA_PLATFORM=y
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+# CONFIG_SATA_ZPODD is not set
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_CEVA=y
+CONFIG_AHCI_MVEBU=y
+# CONFIG_AHCI_SUNXI is not set
+# CONFIG_AHCI_TEGRA is not set
+CONFIG_AHCI_XGENE=y
+CONFIG_AHCI_QORIQ=y
+# CONFIG_SATA_AHCI_SEATTLE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_DWC is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PROMISE is not set
+CONFIG_SATA_RCAR=y
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+CONFIG_PATA_PLATFORM=y
+CONFIG_PATA_OF_PLATFORM=y
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_PATA_ACPI is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_MD is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_NET_CORE=y
+# CONFIG_BONDING is not set
+# CONFIG_DUMMY is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NET_TEAM is not set
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+# CONFIG_VXLAN is not set
+# CONFIG_MACSEC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_TUN=y
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=y
+# CONFIG_NLMON is not set
+# CONFIG_ARCNET is not set
+
+#
+# CAIF transport drivers
+#
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_3COM=y
+# CONFIG_VORTEX is not set
+# CONFIG_TYPHOON is not set
+CONFIG_NET_VENDOR_ADAPTEC=y
+# CONFIG_ADAPTEC_STARFIRE is not set
+CONFIG_NET_VENDOR_AGERE=y
+# CONFIG_ET131X is not set
+CONFIG_NET_VENDOR_ALLWINNER=y
+# CONFIG_SUN4I_EMAC is not set
+CONFIG_NET_VENDOR_ALTEON=y
+# CONFIG_ACENIC is not set
+# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_PCNET32 is not set
+CONFIG_AMD_XGBE=y
+CONFIG_NET_XGENE=y
+CONFIG_NET_VENDOR_ARC=y
+# CONFIG_ARC_EMAC is not set
+# CONFIG_EMAC_ROCKCHIP is not set
+CONFIG_NET_VENDOR_ATHEROS=y
+# CONFIG_ATL2 is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ALX is not set
+# CONFIG_NET_VENDOR_AURORA is not set
+CONFIG_NET_CADENCE=y
+CONFIG_MACB=y
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+# CONFIG_BCMGENET is not set
+# CONFIG_BNX2 is not set
+# CONFIG_CNIC is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
+CONFIG_BGMAC=y
+CONFIG_BGMAC_PLATFORM=y
+# CONFIG_SYSTEMPORT is not set
+# CONFIG_BNXT is not set
+CONFIG_NET_VENDOR_BROCADE=y
+# CONFIG_BNA is not set
+CONFIG_NET_VENDOR_CAVIUM=y
+# CONFIG_THUNDER_NIC_PF is not set
+# CONFIG_THUNDER_NIC_VF is not set
+# CONFIG_THUNDER_NIC_BGX is not set
+# CONFIG_THUNDER_NIC_RGX is not set
+# CONFIG_LIQUIDIO is not set
+CONFIG_NET_VENDOR_CHELSIO=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_ENIC is not set
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_DEC=y
+# CONFIG_NET_TULIP is not set
+CONFIG_NET_VENDOR_DLINK=y
+# CONFIG_DL2K is not set
+# CONFIG_SUNDANCE is not set
+CONFIG_NET_VENDOR_EMULEX=y
+# CONFIG_BE2NET is not set
+CONFIG_NET_VENDOR_EZCHIP=y
+# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_EXAR=y
+# CONFIG_S2IO is not set
+# CONFIG_VXGE is not set
+CONFIG_NET_VENDOR_FREESCALE=y
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+# CONFIG_GIANFAR is not set
+CONFIG_NET_VENDOR_HISILICON=y
+# CONFIG_HIX5HD2_GMAC is not set
+# CONFIG_HISI_FEMAC is not set
+# CONFIG_HIP04_ETH is not set
+CONFIG_HNS_MDIO=y
+CONFIG_HNS=y
+CONFIG_HNS_DSAF=y
+CONFIG_HNS_ENET=y
+CONFIG_NET_VENDOR_HP=y
+# CONFIG_HP100 is not set
+CONFIG_NET_VENDOR_INTEL=y
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+CONFIG_E1000E=y
+CONFIG_IGB=y
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=y
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGBEVF is not set
+# CONFIG_I40E is not set
+# CONFIG_I40EVF is not set
+# CONFIG_FM10K is not set
+CONFIG_NET_VENDOR_I825XX=y
+# CONFIG_JME is not set
+CONFIG_NET_VENDOR_MARVELL=y
+# CONFIG_MVMDIO is not set
+# CONFIG_MVNETA_BM is not set
+# CONFIG_PXA168_ETH is not set
+# CONFIG_SKGE is not set
+CONFIG_SKY2=y
+# CONFIG_SKY2_DEBUG is not set
+# CONFIG_NET_VENDOR_MEDIATEK is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_MLX5_CORE is not set
+# CONFIG_MLXSW_CORE is not set
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_KSZ884X_PCI is not set
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCX24J600 is not set
+CONFIG_NET_VENDOR_MYRI=y
+# CONFIG_MYRI10GE is not set
+# CONFIG_FEALNX is not set
+CONFIG_NET_VENDOR_NATSEMI=y
+# CONFIG_NATSEMI is not set
+# CONFIG_NS83820 is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+# CONFIG_NFP_NETVF is not set
+CONFIG_NET_VENDOR_8390=y
+# CONFIG_NE2K_PCI is not set
+CONFIG_NET_VENDOR_NVIDIA=y
+# CONFIG_FORCEDETH is not set
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_ETHOC is not set
+CONFIG_NET_PACKET_ENGINE=y
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_NET_VENDOR_QLOGIC=y
+# CONFIG_QLA3XXX is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_QLGE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_QED is not set
+CONFIG_NET_VENDOR_QUALCOMM=y
+# CONFIG_QCA7000 is not set
+# CONFIG_QCOM_EMAC is not set
+CONFIG_NET_VENDOR_REALTEK=y
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_R8169 is not set
+CONFIG_NET_VENDOR_RENESAS=y
+# CONFIG_SH_ETH is not set
+CONFIG_RAVB=y
+CONFIG_NET_VENDOR_RDC=y
+# CONFIG_R6040 is not set
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_NET_VENDOR_SAMSUNG=y
+# CONFIG_SXGBE_ETH is not set
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+# CONFIG_SC92031 is not set
+CONFIG_NET_VENDOR_SIS=y
+# CONFIG_SIS900 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SFC is not set
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC91X=y
+# CONFIG_EPIC100 is not set
+CONFIG_SMSC911X=y
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
+# CONFIG_SMSC9420 is not set
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SUNXI=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NIU is not set
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+# CONFIG_TEHUTI is not set
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_ALE is not set
+# CONFIG_TLAN is not set
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_NET_SB1000 is not set
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+
+#
+# MDIO bus device drivers
+#
+# CONFIG_MDIO_BCM_IPROC is not set
+# CONFIG_MDIO_BCM_UNIMAC is not set
+CONFIG_MDIO_BITBANG=y
+CONFIG_MDIO_BUS_MUX=y
+CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_GPIO is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
+# CONFIG_MDIO_SUN4I is not set
+# CONFIG_MDIO_THUNDER is not set
+CONFIG_MDIO_XGENE=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+# CONFIG_AQUANTIA_PHY is not set
+# CONFIG_AT803X_PHY is not set
+# CONFIG_BCM7XXX_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DP83848_PHY is not set
+# CONFIG_DP83867_PHY is not set
+CONFIG_FIXED_PHY=y
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_INTEL_XWAY_PHY is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+CONFIG_MICREL_PHY=y
+# CONFIG_MICROCHIP_PHY is not set
+# CONFIG_MICROSEMI_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+CONFIG_REALTEK_PHY=m
+# CONFIG_SMSC_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_TERANETICS_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+CONFIG_USB_NET_DRIVERS=y
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+# CONFIG_USB_LAN78XX is not set
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_CDC_EEM is not set
+CONFIG_USB_NET_CDC_NCM=m
+# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
+# CONFIG_USB_NET_CDC_MBIM is not set
+CONFIG_USB_NET_DM9601=m
+# CONFIG_USB_NET_SR9700 is not set
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_QMI_WWAN is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_VL600 is not set
+# CONFIG_USB_NET_CH9200 is not set
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+# CONFIG_ADM8211 is not set
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH5K_PCI is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATH9K_HTC is not set
+# CONFIG_CARL9170 is not set
+# CONFIG_ATH6KL is not set
+# CONFIG_AR5523 is not set
+# CONFIG_WIL6210 is not set
+# CONFIG_ATH10K is not set
+# CONFIG_WCN36XX is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+# CONFIG_ATMEL is not set
+# CONFIG_AT76C50X_USB is not set
+CONFIG_WLAN_VENDOR_BROADCOM=y
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_BRCMSMAC is not set
+# CONFIG_BRCMFMAC is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_WLAN_VENDOR_INTEL=y
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_IWL4965 is not set
+# CONFIG_IWL3945 is not set
+# CONFIG_IWLWIFI is not set
+CONFIG_WLAN_VENDOR_INTERSIL=y
+# CONFIG_HOSTAP is not set
+# CONFIG_HERMES is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_PRISM54 is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_MWIFIEX is not set
+# CONFIG_MWL8K is not set
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+# CONFIG_MT7601U is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+# CONFIG_RT2X00 is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+# CONFIG_RTL8180 is not set
+# CONFIG_RTL8187 is not set
+CONFIG_RTL_CARDS=m
+# CONFIG_RTL8192CE is not set
+# CONFIG_RTL8192SE is not set
+# CONFIG_RTL8192DE is not set
+# CONFIG_RTL8723AE is not set
+# CONFIG_RTL8723BE is not set
+# CONFIG_RTL8188EE is not set
+# CONFIG_RTL8192EE is not set
+# CONFIG_RTL8821AE is not set
+# CONFIG_RTL8192CU is not set
+# CONFIG_RTL8XXXU is not set
+CONFIG_WLAN_VENDOR_RSI=y
+# CONFIG_RSI_91X is not set
+CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_CW1200 is not set
+CONFIG_WLAN_VENDOR_TI=y
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX is not set
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+CONFIG_XEN_NETDEV_FRONTEND=y
+# CONFIG_XEN_NETDEV_BACKEND is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_FUJITSU_ES is not set
+# CONFIG_ISDN is not set
+# CONFIG_NVM is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_MATRIXKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_TEGRA is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_SH_KEYSC is not set
+# CONFIG_KEYBOARD_SUN4I_LRADC is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_CROS_EC is not set
+# CONFIG_KEYBOARD_CAP11XX is not set
+# CONFIG_KEYBOARD_BCM is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_CYAPA is not set
+# CONFIG_MOUSE_ELAN_I2C is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_E3X0_BUTTON is not set
+CONFIG_INPUT_PM8941_PWRKEY=y
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_CMA3000 is not set
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+CONFIG_INPUT_HISI_POWERKEY=y
+# CONFIG_RMI4_CORE is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_AMBAKMI=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_SUN4I_PS2 is not set
+# CONFIG_USERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=16
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+# CONFIG_TRACE_SINK is not set
+CONFIG_DEVMEM=y
+CONFIG_DEVKMEM=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_MT6577=y
+CONFIG_SERIAL_8250_UNIPHIER=y
+# CONFIG_SERIAL_8250_MOXA is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_AMBA_PL010 is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
+CONFIG_SERIAL_MESON=y
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_UARTS_4=y
+CONFIG_SERIAL_SAMSUNG_UARTS=4
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_TEGRA=y
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=11
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+# CONFIG_SERIAL_SH_SCI_EARLYCON is not set
+# CONFIG_SERIAL_SH_SCI_DMA is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_XILINX_PS_UART=y
+CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
+# CONFIG_SERIAL_ARC is not set
+# CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# CONFIG_SERIAL_SPRD is not set
+CONFIG_SERIAL_MVEBU_UART=y
+CONFIG_SERIAL_MVEBU_CONSOLE=y
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+# CONFIG_HVC_DCC is not set
+CONFIG_VIRTIO_CONSOLE=y
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HW_RANDOM_IPROC_RNG200=m
+# CONFIG_HW_RANDOM_VIRTIO is not set
+CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_HISI=m
+CONFIG_HW_RANDOM_MSM=m
+CONFIG_HW_RANDOM_XGENE=m
+CONFIG_HW_RANDOM_MESON=m
+CONFIG_HW_RANDOM_CAVIUM=m
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HPET is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_XILLYBUS is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+CONFIG_I2C_MUX_PCA954x=y
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_DEMUX_PINCTRL is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_HIX5HD2 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# ACPI drivers
+#
+# CONFIG_I2C_SCMI is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_BCM_IPROC=y
+# CONFIG_I2C_CADENCE is not set
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EMEV2 is not set
+CONFIG_I2C_EXYNOS5=y
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_IMX=y
+CONFIG_I2C_MESON=y
+# CONFIG_I2C_MT65XX is not set
+CONFIG_I2C_MV64XXX=y
+# CONFIG_I2C_NOMADIK is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_QUP=y
+# CONFIG_I2C_RIIC is not set
+# CONFIG_I2C_RK3X is not set
+# CONFIG_I2C_SH_MOBILE is not set
+# CONFIG_I2C_SIMTEC is not set
+CONFIG_I2C_TEGRA=y
+# CONFIG_I2C_UNIPHIER is not set
+CONFIG_I2C_UNIPHIER_F=y
+# CONFIG_I2C_VERSATILE is not set
+# CONFIG_I2C_THUNDERX is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2C_XLP9XX is not set
+CONFIG_I2C_RCAR=y
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_CROS_EC_TUNNEL=y
+# CONFIG_I2C_XGENE_SLIMPRO is not set
+# CONFIG_I2C_STUB is not set
+CONFIG_I2C_SLAVE=y
+# CONFIG_I2C_SLAVE_EEPROM is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+CONFIG_SPI_BCM_QSPI=y
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_FSL_DSPI is not set
+CONFIG_SPI_MESON_SPIFC=m
+# CONFIG_SPI_MT65XX is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_ORION=y
+CONFIG_SPI_PL022=y
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_ROCKCHIP is not set
+# CONFIG_SPI_RSPI is not set
+CONFIG_SPI_QUP=y
+CONFIG_SPI_S3C64XX=y
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SH_MSIOF is not set
+# CONFIG_SPI_SH_HSPI is not set
+# CONFIG_SPI_SUN4I is not set
+# CONFIG_SPI_SUN6I is not set
+# CONFIG_SPI_TEGRA114 is not set
+# CONFIG_SPI_TEGRA20_SFLASH is not set
+# CONFIG_SPI_TEGRA20_SLINK is not set
+# CONFIG_SPI_THUNDERX is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XLP is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+CONFIG_SPMI=y
+CONFIG_SPMI_MSM_PMIC_ARB=y
+# CONFIG_HSI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_PINCTRL_AMD is not set
+CONFIG_PINCTRL_MESON=y
+CONFIG_PINCTRL_ROCKCHIP=y
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_MAX77620=y
+CONFIG_PINCTRL_IPROC_GPIO=y
+CONFIG_PINCTRL_NS2_MUX=y
+# CONFIG_PINCTRL_BERLIN_BG2 is not set
+# CONFIG_PINCTRL_BERLIN_BG2CD is not set
+# CONFIG_PINCTRL_BERLIN_BG2Q is not set
+# CONFIG_PINCTRL_BERLIN_BG4CT is not set
+# CONFIG_PINCTRL_BAYTRAIL is not set
+# CONFIG_PINCTRL_CHERRYVIEW is not set
+# CONFIG_PINCTRL_BROXTON is not set
+# CONFIG_PINCTRL_SUNRISEPOINT is not set
+CONFIG_PINCTRL_MSM=y
+# CONFIG_PINCTRL_APQ8064 is not set
+# CONFIG_PINCTRL_APQ8084 is not set
+# CONFIG_PINCTRL_IPQ4019 is not set
+# CONFIG_PINCTRL_IPQ8064 is not set
+# CONFIG_PINCTRL_MSM8660 is not set
+# CONFIG_PINCTRL_MSM8960 is not set
+# CONFIG_PINCTRL_MDM9615 is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
+CONFIG_PINCTRL_MSM8916=y
+CONFIG_PINCTRL_MSM8996=y
+CONFIG_PINCTRL_QDF2XXX=y
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
+# CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
+CONFIG_PINCTRL_SAMSUNG=y
+CONFIG_PINCTRL_EXYNOS=y
+CONFIG_PINCTRL_SH_PFC=y
+CONFIG_PINCTRL_PFC_R8A7795=y
+CONFIG_PINCTRL_PFC_R8A7796=y
+CONFIG_PINCTRL_SUNXI=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN5I_A10S is not set
+# CONFIG_PINCTRL_SUN5I_A13 is not set
+# CONFIG_PINCTRL_GR8 is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31S is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN7I_A20 is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+# CONFIG_PINCTRL_SUN8I_H3_R is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
+CONFIG_PINCTRL_SUN50I_A64=y
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA210=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
+CONFIG_PINCTRL_UNIPHIER=y
+# CONFIG_PINCTRL_UNIPHIER_LD4 is not set
+# CONFIG_PINCTRL_UNIPHIER_PRO4 is not set
+# CONFIG_PINCTRL_UNIPHIER_SLD8 is not set
+# CONFIG_PINCTRL_UNIPHIER_PRO5 is not set
+# CONFIG_PINCTRL_UNIPHIER_PXS2 is not set
+# CONFIG_PINCTRL_UNIPHIER_LD6B is not set
+CONFIG_PINCTRL_UNIPHIER_LD11=y
+CONFIG_PINCTRL_UNIPHIER_LD20=y
+CONFIG_PINCTRL_MTK=y
+# CONFIG_PINCTRL_MT2701 is not set
+# CONFIG_PINCTRL_MT7623 is not set
+# CONFIG_PINCTRL_MT8135 is not set
+# CONFIG_PINCTRL_MT8127 is not set
+CONFIG_PINCTRL_MT8173=y
+# CONFIG_PINCTRL_MT6397 is not set
+CONFIG_GPIOLIB=y
+CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=y
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_74XX_MMIO is not set
+# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_DWAPB=y
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_MOCKUP is not set
+# CONFIG_GPIO_MPC8XXX is not set
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_RCAR=y
+# CONFIG_GPIO_SYSCON is not set
+CONFIG_GPIO_TEGRA=y
+# CONFIG_GPIO_VX855 is not set
+CONFIG_GPIO_XGENE=y
+# CONFIG_GPIO_XGENE_SB is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GPIO_XLP is not set
+# CONFIG_GPIO_ZYNQ is not set
+# CONFIG_GPIO_ZX is not set
+
+#
+# I2C GPIO expanders
+#
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_TPIC2810 is not set
+# CONFIG_GPIO_TS4900 is not set
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_MAX77620=y
+
+#
+# PCI GPIO expanders
+#
+# CONFIG_GPIO_AMD8111 is not set
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_RDC321X is not set
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_PISOSR is not set
+
+#
+# SPI or I2C GPIO expanders
+#
+# CONFIG_GPIO_MCP23S08 is not set
+
+#
+# USB GPIO expanders
+#
+# CONFIG_W1 is not set
+# CONFIG_POWER_AVS is not set
+CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_GPIO is not set
+# CONFIG_POWER_RESET_GPIO_RESTART is not set
+# CONFIG_POWER_RESET_HISI is not set
+CONFIG_POWER_RESET_MSM=y
+# CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_RESTART is not set
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_POWER_RESET_SYSCON=y
+# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
+# CONFIG_POWER_RESET_ZX is not set
+# CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SBS is not set
+CONFIG_BATTERY_BQ27XXX=y
+CONFIG_BATTERY_BQ27XXX_I2C=y
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_QCOM_SMBB is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_CHARGER_RT9455 is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+CONFIG_SENSORS_ARM_SCPI=y
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FTSTEUTATES is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_POWR1220 is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LTC2945 is not set
+# CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4222 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4260 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX31722 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MAX31790 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+CONFIG_SENSORS_LM90=m
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LM95234 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_NCT6683 is not set
+# CONFIG_SENSORS_NCT6775 is not set
+# CONFIG_SENSORS_NCT7802 is not set
+# CONFIG_SENSORS_NCT7904 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+# CONFIG_SENSORS_PWM_FAN is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SHT3x is not set
+# CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_ADC128D818 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_INA209 is not set
+CONFIG_SENSORS_INA2XX=m
+# CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_TC74 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VEXPRESS is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+
+#
+# ACPI drivers
+#
+# CONFIG_SENSORS_ACPI_POWER is not set
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_CPU_THERMAL=y
+# CONFIG_CLOCK_THERMAL is not set
+CONFIG_THERMAL_EMULATION=y
+# CONFIG_HISI_THERMAL is not set
+# CONFIG_MAX77620_THERMAL is not set
+# CONFIG_QORIQ_THERMAL is not set
+# CONFIG_ROCKCHIP_THERMAL is not set
+# CONFIG_RCAR_THERMAL is not set
+# CONFIG_ARMADA_THERMAL is not set
+
+#
+# ACPI INT340X thermal drivers
+#
+CONFIG_MTK_THERMAL=y
+
+#
+# Samsung thermal drivers
+#
+CONFIG_EXYNOS_THERMAL=y
+
+#
+# NVIDIA Tegra thermal drivers
+#
+# CONFIG_TEGRA_SOCTHERM is not set
+# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
+# CONFIG_GENERIC_ADC_THERMAL is not set
+
+#
+# Qualcomm thermal drivers
+#
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_WATCHDOG_SYSFS is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_WDAT_WDT is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
+# CONFIG_ARM_SP805_WATCHDOG is not set
+# CONFIG_ARM_SBSA_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_HAVE_S3C2410_WATCHDOG=y
+CONFIG_S3C2410_WATCHDOG=y
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_SUNXI_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MAX77620_WATCHDOG is not set
+# CONFIG_IMX2_WDT is not set
+# CONFIG_TEGRA_WATCHDOG is not set
+# CONFIG_QCOM_WDT is not set
+CONFIG_MESON_GXBB_WATCHDOG=m
+CONFIG_MESON_WATCHDOG=m
+# CONFIG_MEDIATEK_WATCHDOG is not set
+CONFIG_RENESAS_WDT=y
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_MEN_A21_WDT is not set
+# CONFIG_XEN_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+# CONFIG_BCMA is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_AXP20X_I2C is not set
+CONFIG_MFD_CROS_EC=y
+CONFIG_MFD_CROS_EC_I2C=y
+# CONFIG_MFD_CROS_EC_SPI is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_EXYNOS_LPASS is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_HI6421_PMIC is not set
+CONFIG_MFD_HI655X_PMIC=y
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_INTEL_SOC_PMIC is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+CONFIG_MFD_MAX77620=y
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_QCOM_RPM is not set
+CONFIG_MFD_SPMI_PMIC=y
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RTSX_USB is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_RK808 is not set
+# CONFIG_MFD_RN5T618 is not set
+CONFIG_MFD_SEC_CORE=y
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SUN6I_PRCM is not set
+CONFIG_MFD_SYSCON=y
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+CONFIG_MFD_VEXPRESS_SYSREG=y
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_ACT8865 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_HI655X=y
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX77620=y
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
+# CONFIG_REGULATOR_PV88090 is not set
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_QCOM_SMD_RPM=y
+CONFIG_REGULATOR_QCOM_SPMI=y
+# CONFIG_REGULATOR_S2MPA01 is not set
+CONFIG_REGULATOR_S2MPS11=y
+# CONFIG_REGULATOR_S5M8767 is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VEXPRESS is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HOST1X_FIREWALL=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_HDLCD is not set
+# CONFIG_DRM_MALI_DISPLAY is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_AMDGPU is not set
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_PLATFORM_DRIVER=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_VGEM is not set
+# CONFIG_DRM_EXYNOS is not set
+# CONFIG_DRM_UDL is not set
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_CIRRUS_QEMU is not set
+# CONFIG_DRM_RCAR_DU is not set
+# CONFIG_DRM_QXL is not set
+# CONFIG_DRM_BOCHS is not set
+# CONFIG_DRM_VIRTIO_GPU is not set
+CONFIG_DRM_MSM=m
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
+CONFIG_DRM_MSM_HDMI_HDCP=y
+CONFIG_DRM_MSM_DSI=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_TEGRA=m
+# CONFIG_DRM_TEGRA_DEBUG is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+CONFIG_DRM_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_DUMB_VGA_DAC is not set
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7533=y
+# CONFIG_DRM_ARCPGU is not set
+CONFIG_DRM_HISI_KIRIN=m
+CONFIG_HISI_KIRIN_DW_DSI=m
+# CONFIG_DRM_MEDIATEK is not set
+# CONFIG_DRM_LEGACY is not set
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+CONFIG_FB_ARMCLCD=y
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_EFI is not set
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_SH_MOBILE_LCDC is not set
+# CONFIG_FB_S3C is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=y
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_SH_MOBILE_MERAM is not set
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_PLATFORM is not set
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_BACKLIGHT_PWM is not set
+# CONFIG_BACKLIGHT_PM8941_WLED is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+CONFIG_BACKLIGHT_LP855X=m
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=y
+# CONFIG_SOUND_OSS_CORE is not set
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_TIMER=y
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SE6X is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+
+#
+# HD-Audio
+#
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDA_TEGRA is not set
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_HIFACE is not set
+# CONFIG_SND_BCD2000 is not set
+# CONFIG_SND_USB_POD is not set
+# CONFIG_SND_USB_PODHD is not set
+# CONFIG_SND_USB_TONEPORT is not set
+# CONFIG_SND_USB_VARIAX is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_DESIGNWARE_I2S is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_MT2701 is not set
+# CONFIG_SND_SOC_MT8173 is not set
+# CONFIG_SND_SOC_QCOM is not set
+# CONFIG_SND_SOC_ROCKCHIP is not set
+CONFIG_SND_SOC_SAMSUNG=y
+# CONFIG_SND_SAMSUNG_PCM is not set
+# CONFIG_SND_SAMSUNG_SPDIF is not set
+# CONFIG_SND_SAMSUNG_I2S is not set
+# CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
+# CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF is not set
+# CONFIG_SND_SOC_SMDK_WM8994_PCM is not set
+# CONFIG_SND_SOC_SNOW is not set
+# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
+
+#
+# SoC Audio support for SuperH
+#
+# CONFIG_SND_SOC_SH4_FSI is not set
+CONFIG_SND_SOC_RCAR=y
+
+#
+# Allwinner SoC Audio support
+#
+# CONFIG_SND_SUN4I_CODEC is not set
+# CONFIG_SND_SUN4I_I2S is not set
+# CONFIG_SND_SUN4I_SPDIF is not set
+# CONFIG_SND_SOC_TEGRA is not set
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
+CONFIG_SND_SOC_I2C_AND_SPI=y
+
+#
+# CODEC drivers
+#
+# CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_ADAU7002 is not set
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+CONFIG_SND_SOC_AK4613=y
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_BT_SCO is not set
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
+# CONFIG_SND_SOC_ES8328 is not set
+# CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
+# CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_RT5616 is not set
+# CONFIG_SND_SOC_RT5631 is not set
+# CONFIG_SND_SOC_RT5677_SPI is not set
+# CONFIG_SND_SOC_SGTL5000 is not set
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SPDIF is not set
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TFA9879 is not set
+# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC3X is not set
+# CONFIG_SND_SOC_TS3A227E is not set
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+# CONFIG_SND_SOC_WM8753 is not set
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
+# CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8960 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+# CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_TPA6130A2 is not set
+CONFIG_SND_SIMPLE_CARD_UTILS=y
+CONFIG_SND_SIMPLE_CARD=y
+# CONFIG_SND_SIMPLE_SCU_CARD is not set
+# CONFIG_SOUND_PRIME is not set
+
+#
+# HID support
+#
+CONFIG_HID=y
+# CONFIG_HID_BATTERY_STRENGTH is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_UHID is not set
+CONFIG_HID_GENERIC=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=y
+# CONFIG_HID_ACRUX is not set
+CONFIG_HID_APPLE=y
+# CONFIG_HID_APPLEIR is not set
+# CONFIG_HID_AUREAL is not set
+CONFIG_HID_BELKIN=y
+# CONFIG_HID_BETOP_FF is not set
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+# CONFIG_HID_CORSAIR is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CMEDIA is not set
+# CONFIG_HID_CP2112 is not set
+CONFIG_HID_CYPRESS=y
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
+CONFIG_HID_EZKEY=y
+# CONFIG_HID_GEMBIRD is not set
+# CONFIG_HID_GFRM is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GT683R is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_ICADE is not set
+# CONFIG_HID_TWINHAN is not set
+CONFIG_HID_KENSINGTON=y
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LED is not set
+# CONFIG_HID_LENOVO is not set
+CONFIG_HID_LOGITECH=y
+# CONFIG_HID_LOGITECH_HIDPP is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGIG940_FF is not set
+# CONFIG_LOGIWHEELS_FF is not set
+# CONFIG_HID_MAGICMOUSE is not set
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PENMOUNT is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_RMI is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_XINMO is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_ALPS is not set
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# I2C HID support
+#
+# CONFIG_I2C_HID is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_OTG=y
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_XHCI_PLATFORM=y
+# CONFIG_USB_XHCI_MTK is not set
+# CONFIG_USB_XHCI_MVEBU is not set
+CONFIG_USB_XHCI_RCAR=y
+CONFIG_USB_XHCI_TEGRA=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_EHCI_MSM=y
+# CONFIG_USB_EHCI_TEGRA is not set
+CONFIG_USB_EHCI_EXYNOS=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_EXYNOS=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RENESAS_USBHS_HCD is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+CONFIG_USB_RENESAS_USBHS=m
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_UAS is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_EXYNOS=y
+CONFIG_USB_DWC3_PCI=y
+CONFIG_USB_DWC3_OF_SIMPLE=y
+CONFIG_USB_DWC2=y
+# CONFIG_USB_DWC2_HOST is not set
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+# CONFIG_USB_DWC2_PERIPHERAL is not set
+CONFIG_USB_DWC2_DUAL_ROLE=y
+# CONFIG_USB_DWC2_PCI is not set
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_OF=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=y
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_YUREX is not set
+# CONFIG_USB_EZUSB_FX2 is not set
+CONFIG_USB_HSIC_USB3503=y
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+# CONFIG_USB_CHAOSKEY is not set
+# CONFIG_UCSI is not set
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_MSM_OTG=y
+# CONFIG_USB_QCOM_8X16_PHY is not set
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+CONFIG_USB_RENESAS_USBHS_UDC=m
+# CONFIG_USB_RENESAS_USB3 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_CONFIGFS is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_LED_TRIG is not set
+# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_UWB is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SIMPLE=y
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_ARMMMCI=y
+CONFIG_MMC_QCOM_DML=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+# CONFIG_MMC_SDHCI_PCI is not set
+CONFIG_MMC_SDHCI_ACPI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+# CONFIG_MMC_SDHCI_OF_ARASAN is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=y
+CONFIG_MMC_SDHCI_TEGRA=y
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+CONFIG_MMC_SDHCI_IPROC=y
+CONFIG_MMC_SDHCI_MSM=y
+# CONFIG_MMC_TIFM_SD is not set
+CONFIG_MMC_SPI=y
+CONFIG_MMC_TMIO_CORE=y
+CONFIG_MMC_SDHI=y
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_PLTFM=y
+CONFIG_MMC_DW_EXYNOS=y
+CONFIG_MMC_DW_K3=y
+# CONFIG_MMC_DW_PCI is not set
+# CONFIG_MMC_DW_ROCKCHIP is not set
+# CONFIG_MMC_SH_MMCIF is not set
+# CONFIG_MMC_VUB300 is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_SUNXI=y
+# CONFIG_MMC_TOSHIBA_PCI is not set
+# CONFIG_MMC_MTK is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=y
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP3952 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP8860 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_TLC591XX is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_IS31FL319X is not set
+# CONFIG_LEDS_IS31FL32XX is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_BLINKM is not set
+CONFIG_LEDS_SYSCON=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+# CONFIG_LEDS_TRIGGER_DISK is not set
+# CONFIG_LEDS_TRIGGER_MTD is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+CONFIG_LEDS_TRIGGER_CPU=y
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
+# CONFIG_LEDS_TRIGGER_PANIC is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC_SUPPORT=y
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABX80X is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+CONFIG_RTC_DRV_MAX77686=y
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_S5M=y
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6916 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=y
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+CONFIG_RTC_DRV_EFI=y
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_ZYNQMP is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_HAVE_S3C_RTC=y
+CONFIG_RTC_DRV_S3C=y
+# CONFIG_RTC_DRV_PL030 is not set
+CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_SUN6I=y
+# CONFIG_RTC_DRV_MV is not set
+# CONFIG_RTC_DRV_ARMADA38X is not set
+# CONFIG_RTC_DRV_PM8XXX is not set
+CONFIG_RTC_DRV_TEGRA=y
+# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_RTC_DRV_XGENE=y
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_ACPI=y
+CONFIG_DMA_OF=y
+# CONFIG_AMBA_PL08X is not set
+# CONFIG_FSL_EDMA is not set
+# CONFIG_INTEL_IDMA64 is not set
+# CONFIG_K3_DMA is not set
+# CONFIG_MV_XOR is not set
+# CONFIG_MV_XOR_V2 is not set
+CONFIG_PL330_DMA=y
+CONFIG_TEGRA20_APB_DMA=y
+# CONFIG_TEGRA210_ADMA is not set
+# CONFIG_XGENE_DMA is not set
+# CONFIG_XILINX_DMA is not set
+# CONFIG_XILINX_ZYNQMP_DMA is not set
+# CONFIG_ZX_DMA is not set
+CONFIG_QCOM_BAM_DMA=y
+CONFIG_QCOM_HIDMA_MGMT=y
+CONFIG_QCOM_HIDMA=y
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
+CONFIG_RENESAS_DMA=y
+CONFIG_SH_DMAE_BASE=y
+# CONFIG_SH_DMAE is not set
+CONFIG_RCAR_DMAC=y
+# CONFIG_RENESAS_USB_DMAC is not set
+# CONFIG_SUDMAC is not set
+
+#
+# DMA Clients
+#
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+CONFIG_VFIO_IOMMU_TYPE1=y
+CONFIG_VFIO_VIRQFD=y
+CONFIG_VFIO=y
+# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI=y
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+# CONFIG_VFIO_PLATFORM is not set
+CONFIG_IRQ_BYPASS_MANAGER=y
+# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRTIO=y
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_BALLOON=y
+# CONFIG_VIRTIO_INPUT is not set
+CONFIG_VIRTIO_MMIO=y
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DEV_EVTCHN=y
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=y
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=y
+CONFIG_XEN_GRANT_DEV_ALLOC=y
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PRIVCMD=y
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+# CONFIG_STAGING is not set
+# CONFIG_GOLDFISH is not set
+CONFIG_CHROME_PLATFORMS=y
+# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_PROTO=y
+# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+CONFIG_COMMON_CLK_VERSATILE=y
+CONFIG_CLK_SP810=y
+CONFIG_CLK_VEXPRESS_OSC=y
+# CONFIG_COMMON_CLK_MAX77686 is not set
+CONFIG_COMMON_CLK_SCPI=y
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+CONFIG_COMMON_CLK_CS2000_CP=y
+CONFIG_COMMON_CLK_S2MPS11=y
+CONFIG_CLK_QORIQ=y
+CONFIG_COMMON_CLK_XGENE=y
+# CONFIG_COMMON_CLK_NXP is not set
+# CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_PXA is not set
+# CONFIG_COMMON_CLK_PIC32 is not set
+CONFIG_COMMON_CLK_IPROC=y
+CONFIG_CLK_BCM_NS2=y
+CONFIG_COMMON_CLK_HI3519=y
+CONFIG_COMMON_CLK_HI6220=y
+CONFIG_RESET_HISI=y
+# CONFIG_STUB_CLK_HI6220 is not set
+CONFIG_COMMON_CLK_MEDIATEK=y
+CONFIG_COMMON_CLK_MT8135=y
+CONFIG_COMMON_CLK_MT8173=y
+CONFIG_COMMON_CLK_AMLOGIC=y
+CONFIG_COMMON_CLK_GXBB=y
+CONFIG_ARMADA_37XX_CLK=y
+CONFIG_ARMADA_AP806_SYSCON=y
+CONFIG_ARMADA_CP110_SYSCON=y
+CONFIG_QCOM_GDSC=y
+CONFIG_COMMON_CLK_QCOM=y
+# CONFIG_APQ_GCC_8084 is not set
+# CONFIG_APQ_MMCC_8084 is not set
+# CONFIG_IPQ_GCC_4019 is not set
+# CONFIG_IPQ_GCC_806X is not set
+# CONFIG_IPQ_LCC_806X is not set
+# CONFIG_MSM_GCC_8660 is not set
+CONFIG_MSM_GCC_8916=y
+# CONFIG_MSM_GCC_8960 is not set
+# CONFIG_MSM_LCC_8960 is not set
+# CONFIG_MDM_GCC_9615 is not set
+# CONFIG_MDM_LCC_9615 is not set
+# CONFIG_MSM_MMCC_8960 is not set
+# CONFIG_MSM_GCC_8974 is not set
+# CONFIG_MSM_MMCC_8974 is not set
+CONFIG_MSM_GCC_8996=y
+CONFIG_MSM_MMCC_8996=y
+CONFIG_CLK_RENESAS_CPG_MSSR=y
+CONFIG_COMMON_CLK_SAMSUNG=y
+CONFIG_EXYNOS_ARM64_COMMON_CLK=y
+CONFIG_EXYNOS_AUDSS_CLK_CON=y
+CONFIG_SUNXI_CCU=y
+# CONFIG_SUN6I_A31_CCU is not set
+# CONFIG_SUN8I_A23_CCU is not set
+# CONFIG_SUN8I_A33_CCU is not set
+# CONFIG_SUN8I_H3_CCU is not set
+CONFIG_CLK_UNIPHIER=y
+CONFIG_HWSPINLOCK=y
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_HWSPINLOCK_QCOM=y
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKSRC_OF=y
+CONFIG_CLKSRC_ACPI=y
+CONFIG_CLKSRC_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_ROCKCHIP_TIMER=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_ARM_TIMER_SP804=y
+# CONFIG_ATMEL_PIT is not set
+CONFIG_MTK_TIMER=y
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
+CONFIG_CLKSRC_VERSATILE=y
+CONFIG_MAILBOX=y
+CONFIG_ARM_MHU=y
+# CONFIG_PLATFORM_MHU is not set
+# CONFIG_PL320_MBOX is not set
+# CONFIG_ROCKCHIP_MBOX is not set
+# CONFIG_PCC is not set
+# CONFIG_ALTERA_MBOX is not set
+CONFIG_HI6220_MBOX=y
+# CONFIG_MAILBOX_TEST is not set
+# CONFIG_XGENE_SLIMPRO_MBOX is not set
+CONFIG_BCM_PDC_MBOX=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+CONFIG_IOMMU_IOVA=y
+CONFIG_OF_IOMMU=y
+CONFIG_IOMMU_DMA=y
+# CONFIG_EXYNOS_IOMMU is not set
+CONFIG_ARM_SMMU=y
+# CONFIG_ARM_SMMU_V3 is not set
+# CONFIG_MTK_IOMMU is not set
+
+#
+# Remoteproc drivers
+#
+# CONFIG_STE_MODEM_RPROC is not set
+# CONFIG_QCOM_Q6V5_PIL is not set
+# CONFIG_QCOM_WCNSS_PIL is not set
+
+#
+# Rpmsg drivers
+#
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Broadcom SoC drivers
+#
+CONFIG_MTK_INFRACFG=y
+# CONFIG_MTK_PMIC_WRAP is not set
+CONFIG_MTK_SCPSYS=y
+# CONFIG_QCOM_GSBI is not set
+CONFIG_QCOM_SMEM=y
+CONFIG_QCOM_SMD=y
+CONFIG_QCOM_SMD_RPM=y
+# CONFIG_QCOM_SMP2P is not set
+# CONFIG_QCOM_SMSM is not set
+# CONFIG_QCOM_WCNSS_CTRL is not set
+# CONFIG_ROCKCHIP_PM_DOMAINS is not set
+CONFIG_SOC_SAMSUNG=y
+CONFIG_SUNXI_SRAM=y
+CONFIG_ARCH_TEGRA_132_SOC=y
+CONFIG_ARCH_TEGRA_210_SOC=y
+# CONFIG_SOC_TI is not set
+# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USB_GPIO=y
+# CONFIG_MEMORY is not set
+CONFIG_IIO=y
+# CONFIG_IIO_BUFFER is not set
+# CONFIG_IIO_CONFIGFS is not set
+# CONFIG_IIO_TRIGGER is not set
+# CONFIG_IIO_SW_DEVICE is not set
+# CONFIG_IIO_SW_TRIGGER is not set
+
+#
+# Accelerometers
+#
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD799X is not set
+# CONFIG_BCM_IPROC_ADC is not set
+# CONFIG_BERLIN2_ADC is not set
+# CONFIG_CC10001_ADC is not set
+CONFIG_EXYNOS_ADC=y
+# CONFIG_HI8435 is not set
+# CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2485 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MEDIATEK_MT6577_AUXADC is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_QCOM_SPMI_IADC is not set
+# CONFIG_QCOM_SPMI_VADC is not set
+# CONFIG_ROCKCHIP_SARADC is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS8688 is not set
+# CONFIG_VF610_ADC is not set
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+
+#
+# Chemical Sensors
+#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_VZ89X is not set
+
+#
+# Hid Sensor IIO Common
+#
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686 is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_VF610_DAC is not set
+
+#
+# IIO dummy driver
+#
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+# CONFIG_KMX61 is not set
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+
+#
+# Light sensors
+#
+# CONFIG_ACPI_ALS is not set
+# CONFIG_ADJD_S311 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
+# CONFIG_BH1750 is not set
+# CONFIG_BH1780 is not set
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_ISL29125 is not set
+# CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+# CONFIG_MAX44000 is not set
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VEML6070 is not set
+
+#
+# Magnetometer sensors
+#
+# CONFIG_AK8974 is not set
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+
+#
+# Inclinometer sensors
+#
+
+#
+# Digital potentiometers
+#
+# CONFIG_DS1803 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_TPL0102 is not set
+
+#
+# Pressure sensors
+#
+# CONFIG_BMP280 is not set
+# CONFIG_HP03 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+
+#
+# Proximity sensors
+#
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_SX9500 is not set
+
+#
+# Temperature sensors
+#
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+# CONFIG_NTB is not set
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_BCM_IPROC is not set
+# CONFIG_PWM_BERLIN is not set
+# CONFIG_PWM_CROS_EC is not set
+# CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_MESON is not set
+# CONFIG_PWM_MTK_DISP is not set
+# CONFIG_PWM_PCA9685 is not set
+# CONFIG_PWM_RCAR is not set
+# CONFIG_PWM_RENESAS_TPU is not set
+# CONFIG_PWM_ROCKCHIP is not set
+CONFIG_PWM_SAMSUNG=y
+# CONFIG_PWM_SUN4I is not set
+CONFIG_PWM_TEGRA=m
+CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_MAX_NR=1
+CONFIG_ARM_GIC_V2M=y
+CONFIG_ARM_GIC_V3=y
+CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ALPINE_MSI=y
+CONFIG_DW_APB_ICTL=y
+CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_RENESAS_IRQC=y
+CONFIG_MVEBU_ODMI=y
+CONFIG_MVEBU_PIC=y
+CONFIG_LS_SCFG_MSI=y
+CONFIG_PARTITION_PERCPU=y
+# CONFIG_IPACK_BUS is not set
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_ATH79 is not set
+CONFIG_RESET_BERLIN=y
+# CONFIG_RESET_LPC18XX is not set
+CONFIG_RESET_MESON=y
+# CONFIG_RESET_PISTACHIO is not set
+# CONFIG_RESET_SOCFPGA is not set
+# CONFIG_RESET_STM32 is not set
+CONFIG_RESET_SUNXI=y
+# CONFIG_TI_SYSCON_RESET is not set
+CONFIG_RESET_UNIPHIER=y
+# CONFIG_RESET_ZYNQ is not set
+CONFIG_COMMON_RESET_HI6220=y
+# CONFIG_FMC is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+# CONFIG_PHY_BCM_NS_USB2 is not set
+# CONFIG_PHY_BCM_NS_USB3 is not set
+# CONFIG_PHY_BERLIN_USB is not set
+# CONFIG_PHY_BERLIN_SATA is not set
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_RCAR_GEN2 is not set
+CONFIG_PHY_RCAR_GEN3_USB2=y
+CONFIG_PHY_EXYNOS_DP_VIDEO=y
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_MT65XX_USB3 is not set
+CONFIG_PHY_HI6220_USB=y
+# CONFIG_PHY_SUN4I_USB is not set
+# CONFIG_PHY_SUN9I_USB is not set
+CONFIG_PHY_SAMSUNG_USB2=y
+# CONFIG_PHY_EXYNOS4210_USB2 is not set
+# CONFIG_PHY_EXYNOS4X12_USB2 is not set
+# CONFIG_PHY_EXYNOS5250_USB2 is not set
+CONFIG_PHY_EXYNOS5_USBDRD=y
+# CONFIG_PHY_QCOM_APQ8064_SATA is not set
+# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_PHY_ROCKCHIP_USB is not set
+# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
+# CONFIG_PHY_ROCKCHIP_EMMC is not set
+# CONFIG_PHY_ROCKCHIP_DP is not set
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
+# CONFIG_PHY_ROCKCHIP_TYPEC is not set
+CONFIG_PHY_XGENE=y
+# CONFIG_PHY_QCOM_UFS is not set
+CONFIG_PHY_BRCM_SATA=y
+CONFIG_PHY_TEGRA_XUSB=y
+CONFIG_PHY_NS2_PCIE=y
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+CONFIG_ARM_PMU=y
+# CONFIG_XGENE_PMU is not set
+CONFIG_RAS=y
+# CONFIG_THUNDERBOLT is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# CONFIG_LIBNVDIMM is not set
+# CONFIG_DEV_DAX is not set
+# CONFIG_NVMEM is not set
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_ARM_PSCI_FW=y
+CONFIG_ARM_SCPI_PROTOCOL=y
+CONFIG_ARM_SCPI_POWER_DOMAIN=y
+# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
+# CONFIG_FW_CFG_SYSFS is not set
+CONFIG_QCOM_SCM=y
+CONFIG_QCOM_SCM_64=y
+CONFIG_HAVE_ARM_SMCCC=y
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_ARMSTUB=y
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+CONFIG_MESON_SM=y
+CONFIG_ACPI=y
+CONFIG_ACPI_GENERIC_GSI=y
+CONFIG_ACPI_CCA_REQUIRED=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_DOCK is not set
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_MCFG=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_ACPI_CONTAINER=y
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
+# CONFIG_PMIC_OPREGION is not set
+# CONFIG_ACPI_CONFIGFS is not set
+CONFIG_ACPI_IORT=y
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+# CONFIG_EXT4_FS_SECURITY is not set
+# CONFIG_EXT4_ENCRYPTION is not set
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_F2FS_FS is not set
+# CONFIG_FS_DAX is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+# CONFIG_QFMT_V1 is not set
+# CONFIG_QFMT_V2 is not set
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_OVERLAY_FS=m
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_PROC_CHILDREN is not set
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_TMPFS_XATTR is not set
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_EFIVAR_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_LOGFS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_LZ4 is not set
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XZ is not set
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V2=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=y
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_ROOT_NFS=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFSD is not set
+CONFIG_GRACE_PERIOD=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_BACKCHANNEL=y
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+CONFIG_9P_FS=y
+# CONFIG_9P_FS_POSIX_ACL is not set
+# CONFIG_9P_FS_SECURITY is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM_ARM_VGIC_V3_ITS=y
+CONFIG_KVM=y
+CONFIG_KVM_ARM_HOST=y
+CONFIG_KVM_ARM_PMU=y
+# CONFIG_VHOST_NET is not set
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_PAGE_OWNER is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_ARCH_KASAN=y
+# CONFIG_KASAN is not set
+CONFIG_ARCH_HAS_KCOV=y
+# CONFIG_KCOV is not set
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHED_INFO=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
+# CONFIG_DEBUG_TIMEKEEPING is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_STACKTRACE is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_HAVE_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_TORTURE_TEST is not set
+# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+
+#
+# Runtime Testing
+#
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_MEMTEST=y
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
+# CONFIG_UBSAN is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+# CONFIG_STRICT_DEVMEM is not set
+# CONFIG_ARM64_PTDUMP is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
+CONFIG_DEBUG_SET_MODULE_RONX=y
+# CONFIG_DEBUG_ALIGN_RODATA is not set
+# CONFIG_CORESIGHT is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_NETWORK is not set
+# CONFIG_SECURITY_PATH is not set
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_LOADPIN is not set
+# CONFIG_SECURITY_YAMA is not set
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_KPP2=y
+# CONFIG_CRYPTO_RSA is not set
+# CONFIG_CRYPTO_DH is not set
+# CONFIG_CRYPTO_ECDH is not set
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_USER is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+# CONFIG_CRYPTO_PCRYPT is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=y
+# CONFIG_CRYPTO_MCRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_ABLK_HELPER=y
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=y
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+CONFIG_CRYPTO_CTR=m
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_KEYWRAP is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_CRC32 is not set
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=m
+# CONFIG_CRYPTO_POLY1305 is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+CONFIG_CRYPTO_SHA256=y
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_SHA3 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_CHACHA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_842 is not set
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_USER_API_RNG is not set
+# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_S5P is not set
+# CONFIG_CRYPTO_DEV_CCP is not set
+# CONFIG_CRYPTO_DEV_QCE is not set
+# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
+CONFIG_CRYPTO_CRC32_ARM64=y
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+# CONFIG_CRC_CCITT is not set
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=y
+# CONFIG_LIBCRC32C is not set
+# CONFIG_CRC8 is not set
+CONFIG_AUDIT_GENERIC=y
+CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
+CONFIG_AUDIT_COMPAT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_RADIX_TREE_MULTIORDER=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+# CONFIG_CORDIC is not set
+# CONFIG_DDR is not set
+# CONFIG_IRQ_POLL is not set
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_SG_SPLIT is not set
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_SBITMAP=y

From cf1a18bc45c56305a8e9cb4234f9be15e56dc1c0 Mon Sep 17 00:00:00 2001
From: Simon Guest <simon.guest@tesujimath.org>
Date: Thu, 15 Jun 2017 13:45:08 +1200
Subject: [PATCH 1123/1304] scripts/pkg: improved detection of active mounts

On systems which have /var/lib/rkt as a separate partition, the active
mount detection in before-remove needs to not get confused by the
presence of /var/lib/rkt itself as a mount.  Therefore a longer path
is used for active mount detection.

Fixes #3706
---
 scripts/pkg/before-remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pkg/before-remove b/scripts/pkg/before-remove
index afaa4a170f..afa5b13edb 100644
--- a/scripts/pkg/before-remove
+++ b/scripts/pkg/before-remove
@@ -4,7 +4,7 @@ if [ -f /usr/bin/rkt ]; then
         exit 1
     fi
     /usr/bin/rkt gc --grace-period=0s
-    if [ -n "$(grep "/var/lib/rkt" /proc/mounts)" ]; then
+    if [ -n "$(grep "/var/lib/rkt/pods/run/" /proc/mounts)" ]; then
         printf "rkt/before-remove error: detected active mounts in [/var/lib/rkt].\n"
         exit 1
     fi

From 556e0259fe6ed42d37d96fba53f5801e3f26972c Mon Sep 17 00:00:00 2001
From: Simon Guest <simon.guest@tesujimath.org>
Date: Thu, 15 Jun 2017 14:09:58 +1200
Subject: [PATCH 1124/1304] scripts/pkg: handle /var/lib/rkt being a mountpoint
 on remove

If /var/lib/rkt is a mountpoint, we can't remove it, so check for
this, and remove just the contents if it is so.
---
 scripts/pkg/after-remove | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/pkg/after-remove b/scripts/pkg/after-remove
index 88a40f5a82..8448b56c07 100644
--- a/scripts/pkg/after-remove
+++ b/scripts/pkg/after-remove
@@ -1,2 +1,7 @@
-rm -rf /var/lib/rkt
+if test `stat -c%d "/var/lib/rkt"` == `stat -c%d "/var/lib"`; then
+    rm -rf /var/lib/rkt
+else
+    # is a mountpoint, so just delete contents
+    rm -rf /var/lib/rkt/*
+fi
 systemctl daemon-reload || true

From 6beec52be001975d475c93b6cb353e8fa7609b82 Mon Sep 17 00:00:00 2001
From: Simon Guest <simon.guest@tesujimath.org>
Date: Mon, 19 Jun 2017 17:02:33 +1200
Subject: [PATCH 1125/1304] stage1/fly run/enter: honour uid/gid/suppGids.

Refactored common functionality out of run.

Fixes #3392, fixes #3716.
---
 stage1_fly/enter/main.go          | 54 ++++++++++++++++++++++
 stage1_fly/process-credentials.go | 76 +++++++++++++++++++++++++++++++
 stage1_fly/run/main.go            | 49 ++------------------
 3 files changed, 135 insertions(+), 44 deletions(-)
 create mode 100644 stage1_fly/process-credentials.go

diff --git a/stage1_fly/enter/main.go b/stage1_fly/enter/main.go
index 19c47c75db..418e642048 100644
--- a/stage1_fly/enter/main.go
+++ b/stage1_fly/enter/main.go
@@ -15,13 +15,21 @@
 package main
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"syscall"
 
+	"github.com/appc/spec/schema"
+	"github.com/hashicorp/errwrap"
 	rktlog "github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/stage1_fly"
+)
+
+const (
+	flavor = "fly"
 )
 
 var (
@@ -47,6 +55,33 @@ func getRootDir(pid string) (string, error) {
 	return os.Readlink(rootLink)
 }
 
+func getPodManifest() (*schema.PodManifest, error) {
+	f, err := os.Open("pod")
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+
+	pmb, err := ioutil.ReadAll(f)
+
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("error reading pod manifest"), err)
+	}
+	pm := &schema.PodManifest{}
+	if err = pm.UnmarshalJSON(pmb); err != nil {
+		return nil, errwrap.Wrap(errors.New("invalid pod manifest"), err)
+	}
+	return pm, nil
+}
+
+func getRuntimeApp(pm *schema.PodManifest) (*schema.RuntimeApp, error) {
+	if len(pm.Apps) != 1 {
+		return nil, fmt.Errorf("flavor %q only supports 1 application per Pod for now", flavor)
+	}
+
+	return &pm.Apps[0], nil
+}
+
 func execArgs() error {
 	argv0 := flag.Arg(0)
 	argv := flag.Args()
@@ -70,6 +105,21 @@ func main() {
 		log.FatalE("Failed to get pod root", err)
 	}
 
+	pm, err := getPodManifest()
+	if err != nil {
+		log.FatalE("Failed to get pod manifest", err)
+	}
+
+	ra, err := getRuntimeApp(pm)
+	if err != nil {
+		log.FatalE("Failed to get app", err)
+	}
+
+	credentials, err := stage1_fly.LookupProcessCredentials(ra, root)
+	if err != nil {
+		log.FatalE("failed to lookup process credentials", err)
+	}
+
 	if err := os.Chdir(root); err != nil {
 		log.FatalE("Failed to change to new root", err)
 	}
@@ -78,6 +128,10 @@ func main() {
 		log.FatalE("Failed to chroot", err)
 	}
 
+	if err := stage1_fly.SetProcessCredentials(credentials, diag); err != nil {
+		log.FatalE("can't set process credentials", err)
+	}
+
 	diag.Println("PID:", podPid)
 	diag.Println("APP:", appName)
 	diag.Println("ARGS:", flag.Args())
diff --git a/stage1_fly/process-credentials.go b/stage1_fly/process-credentials.go
new file mode 100644
index 0000000000..a945589f9f
--- /dev/null
+++ b/stage1_fly/process-credentials.go
@@ -0,0 +1,76 @@
+package stage1_fly
+
+import (
+	"fmt"
+	"runtime"
+	"syscall"
+
+	"github.com/appc/spec/schema"
+	"github.com/hashicorp/errwrap"
+	rktlog "github.com/rkt/rkt/pkg/log"
+	"github.com/rkt/rkt/pkg/user"
+)
+
+type ProcessCredentials struct {
+	uid               int
+	gid               int
+	supplementaryGIDs []int
+}
+
+func LookupProcessCredentials(ra *schema.RuntimeApp, rfs string) (*ProcessCredentials, error) {
+	var c ProcessCredentials
+
+	uidResolver, err := user.NumericIDs(ra.App.User)
+	if err != nil {
+		uidResolver, err = user.IDsFromStat(rfs, ra.App.User, nil)
+	}
+
+	if err != nil { // give up
+		return nil, errwrap.Wrap(fmt.Errorf("invalid user %q", ra.App.User), err)
+	}
+
+	if c.uid, _, err = uidResolver.IDs(); err != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("failed to configure user %q", ra.App.User), err)
+	}
+
+	gidResolver, err := user.NumericIDs(ra.App.Group)
+	if err != nil {
+		gidResolver, err = user.IDsFromStat(rfs, ra.App.Group, nil)
+	}
+
+	if err != nil { // give up
+		return nil, errwrap.Wrap(fmt.Errorf("invalid group %q", ra.App.Group), err)
+	}
+
+	if _, c.gid, err = gidResolver.IDs(); err != nil {
+		return nil, errwrap.Wrap(fmt.Errorf("failed to configure group %q", ra.App.Group), err)
+	}
+
+	// supplementary groups - ensure primary group is included
+	n := len(ra.App.SupplementaryGIDs)
+	c.supplementaryGIDs = make([]int, n+1, n+1)
+	c.supplementaryGIDs[0] = c.gid
+	copy(c.supplementaryGIDs[1:], ra.App.SupplementaryGIDs)
+
+	return &c, nil
+}
+
+func SetProcessCredentials(c *ProcessCredentials, diag *rktlog.Logger) error {
+	// lock the current goroutine to its current OS thread.
+	// This will force the subsequent syscalls to be executed in the same OS thread as Setresuid, and Setresgid,
+	// see https://github.com/golang/go/issues/1435#issuecomment-66054163.
+	runtime.LockOSThread()
+
+	diag.Printf("setting credentials: uid=%d, gid=%d, suppGids=%v", c.uid, c.gid, c.supplementaryGIDs)
+	if err := syscall.Setresgid(c.gid, c.gid, c.gid); err != nil {
+		return err
+	}
+	if err := syscall.Setgroups(c.supplementaryGIDs); err != nil {
+		return err
+	}
+	if err := syscall.Setresuid(c.uid, c.uid, c.uid); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 90bad42a21..b79e7b4e19 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -21,7 +21,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"syscall"
 
@@ -36,10 +35,10 @@ import (
 	rktlog "github.com/rkt/rkt/pkg/log"
 	"github.com/rkt/rkt/pkg/mountinfo"
 	"github.com/rkt/rkt/pkg/sys"
-	"github.com/rkt/rkt/pkg/user"
 	stage1common "github.com/rkt/rkt/stage1/common"
 	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
 	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
+	"github.com/rkt/rkt/stage1_fly"
 )
 
 const (
@@ -456,36 +455,9 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		return 254
 	}
 
-	var uidResolver, gidResolver user.Resolver
-	var uid, gid int
-
-	uidResolver, err = user.NumericIDs(ra.App.User)
-	if err != nil {
-		uidResolver, err = user.IDsFromStat(rfs, ra.App.User, nil)
-	}
-
-	if err != nil { // give up
-		log.PrintE(fmt.Sprintf("invalid user %q", ra.App.User), err)
-		return 254
-	}
-
-	if uid, _, err = uidResolver.IDs(); err != nil {
-		log.PrintE(fmt.Sprintf("failed to configure user %q", ra.App.User), err)
-		return 254
-	}
-
-	gidResolver, err = user.NumericIDs(ra.App.Group)
+	credentials, err := stage1_fly.LookupProcessCredentials(&ra, rfs)
 	if err != nil {
-		gidResolver, err = user.IDsFromStat(rfs, ra.App.Group, nil)
-	}
-
-	if err != nil { // give up
-		log.PrintE(fmt.Sprintf("invalid group %q", ra.App.Group), err)
-		return 254
-	}
-
-	if _, gid, err = gidResolver.IDs(); err != nil {
-		log.PrintE(fmt.Sprintf("failed to configure group %q", ra.App.Group), err)
+		log.PrintE("failed to lookup process credentials", err)
 		return 254
 	}
 
@@ -500,19 +472,8 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		return 254
 	}
 
-	// lock the current goroutine to its current OS thread.
-	// This will force the subsequent syscalls to be executed in the same OS thread as Setresuid, and Setresgid,
-	// see https://github.com/golang/go/issues/1435#issuecomment-66054163.
-	runtime.LockOSThread()
-
-	// set process credentials
-	diag.Printf("setting credentials: uid=%d, gid=%d", uid, gid)
-	if err := syscall.Setresgid(gid, gid, gid); err != nil {
-		log.PrintE(fmt.Sprintf("can't set gid %d", gid), err)
-		return 254
-	}
-	if err := syscall.Setresuid(uid, uid, uid); err != nil {
-		log.PrintE(fmt.Sprintf("can't set uid %d", uid), err)
+	if err := stage1_fly.SetProcessCredentials(credentials, diag); err != nil {
+		log.PrintE("can't set process credentials", err)
 		return 254
 	}
 

From 69aa94502bda819a15afd00d629785ac196de28f Mon Sep 17 00:00:00 2001
From: Raees Iqbal <raees.bhatti@gmail.com>
Date: Mon, 19 Jun 2017 13:28:45 +0500
Subject: [PATCH 1126/1304] docs: correct rkt pronunciation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change `rkt` pronunciation from “rock-it” to “rocket” to match the rkt
logo.

Fixes #3673
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f1abb2828a..209c05b555 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 ![rkt Logo](logos/rkt-horizontal-color.png)
 
-rkt (pronounced _"rock-it"_) is a CLI for running application containers on Linux. rkt is designed to be secure, composable, and standards-based.
+rkt (pronounced like a _"rocket"_) is a CLI for running application containers on Linux. rkt is designed to be secure, composable, and standards-based.
 
 Some of rkt's key features and goals include:
 

From 6ec12ef514000f812c4ff50e18273b3736e3bd18 Mon Sep 17 00:00:00 2001
From: Simon Guest <simon.guest@tesujimath.org>
Date: Mon, 19 Jun 2017 20:32:17 +1200
Subject: [PATCH 1127/1304] stage1_fly/process-credentials.go: license
 boiler-plate.

---
 stage1_fly/process-credentials.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/stage1_fly/process-credentials.go b/stage1_fly/process-credentials.go
index a945589f9f..8f4be71187 100644
--- a/stage1_fly/process-credentials.go
+++ b/stage1_fly/process-credentials.go
@@ -1,3 +1,17 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package stage1_fly
 
 import (

From f58146538b0b432051c52d3c6f313323f83ede45 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.Callendrello@coreos.com>
Date: Wed, 8 Mar 2017 11:19:15 +0100
Subject: [PATCH 1128/1304] networking: change the default-restricted subnet

Previously, we were using 172.17/16, which conflicts with the default
Docker networking. Change it to 172.31/16
---
 stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf | 2 +-
 tests/rkt_net_test.go                                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf b/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
index 30970cb7df..df0549499f 100644
--- a/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
+++ b/stage1/net/rootfs/etc/rkt/net.d/99-default-restricted.conf
@@ -5,6 +5,6 @@
 	"ipMasq": false,
 	"ipam": {
 		"type": "host-local",
-		"subnet": "172.17.0.0/16"
+		"subnet": "172.31.0.0/16"
 	}
 }
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index fb775aa8ac..d6da6e8d37 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -1171,7 +1171,7 @@ func NewNetDefaultIPArgTest() testutils.Test {
 	}
 	return testutils.TestFunc(func(t *testing.T) {
 		doTest("default:IP=172.16.28.123", "172.16.28.123", t)
-		doTest("default-restricted:IP=172.17.42.42", "172.17.42.42", t)
+		doTest("default-restricted:IP=172.31.42.42", "172.31.42.42", t)
 	})
 }
 

From aab7ece56084422864bbfb6d61b47ad35226b96c Mon Sep 17 00:00:00 2001
From: Julien Balestra <julien.balestra@gmail.com>
Date: Mon, 19 Jun 2017 15:12:05 +0200
Subject: [PATCH 1129/1304] version: bump to v1.27.0

---
 CHANGELOG.md                         | 21 +++++++++++++++++++++
 Documentation/distributions.md       | 16 ++++++++--------
 Documentation/proposals/oci.md       |  6 +++---
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  6 +++---
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 18 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db1f0e0ad1..0499c854e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+## 1.27.0
+
+This minor release contains bugfixes and other improvements related to the tests and the documentation.
+
+## New Features
+- stage1/kvm: add arm64 build ([#3690](https://github.com/rkt/rkt/pull/3690)).
+
+## Bugfixes
+- stage0: list|status --format=json panics: RuntimeApp.Mounts.AppVolume is optional ([#3699](https://github.com/rkt/rkt/pull/3699)). When it is nil, the Volume info at the Pod level (with the same name) should be used. Without this patch `rkt list --format=json` panics on a nil pointer when Apps reference Volumes from the Pod level.
+- imagestore: Fix sql resource leaks ([#3682](https://github.com/rkt/rkt/pull/3682)). When using sql queries the rows iterator needs to be closed if the entire query  result is not iterated over. Failure to close the iterator results in resource leakage.
+
+## Other changes
+- networking: change the default-restricted subnet ([#3718](https://github.com/rkt/rkt/pull/3718)). Previously, we were using 172.17/16, which conflicts with the default
+Docker networking. Change it to 172.31/16.
+- scripts/pkg: improved detection of active mounts ([#3710](https://github.com/rkt/rkt/pull/3710)). On systems which have /var/lib/rkt as a separate partition, the active mount detection in before-remove needs to not get confused by the presence of /var/lib/rkt itself as a mount.  Therefore a longer path is used for active mount detection.
+- stage1/usr_from_coreos: add new image signing sub-key EF4B4ED9 ([#3686](https://github.com/rkt/rkt/pull/3686)). See coreos/init#236.
+- scripts: skip nonexistent stage1 images when packaging ([#3687](https://github.com/rkt/rkt/pull/3687)). Not all builds will generate all stage1 images. It depends on what `./configure` flags (`--with-stage1-flavors`) were used.
+- tests: Only run race test on supported arch ([#3684](https://github.com/rkt/rkt/pull/3684)). Fixes build errors like these when run on non amd64 machines:
+- functional test: Fix manifest arch error ([#3681](https://github.com/rkt/rkt/pull/3681)). The manifest contains values for the ACI arch and OS, not the go language values.
+- Documentation updates: [#3680](https://github.com/rkt/rkt/pull/3680), [#3679](https://github.com/rkt/rkt/pull/3679), [#3700](https://github.com/rkt/rkt/pull/3700), [#3709](https://github.com/rkt/rkt/pull/3709)
+
 ## 1.26.0
 
 This minor release contains bugfixes and other improvements. It also adds better support for the arm architecture to rkt, so that you can now fetch images via autodiscovery and have the correct seccomp whitelist to run them. Also notable is the new possibilty to pass extra kernel parameters to kvm, and last but not least a significant prepare/run speedup in stage0. This also introduces stricter validation on volume names, now rejecting duplicate ones.
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index a70fd45751..fe2505073e 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -141,19 +141,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt-1.26.0-1.x86_64.rpm
-wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt-1.26.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.26.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.26.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt-1.27.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt-1.27.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.27.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.27.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt_1.26.0-1_amd64.deb
-wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt_1.26.0-1_amd64.deb.asc
-gpg --verify rkt_1.26.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.26.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt_1.27.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt_1.27.0-1_amd64.deb.asc
+gpg --verify rkt_1.27.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.27.0-1_amd64.deb
 ```
 
 [cl-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 04c2a404ef..e3a663c1aa 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/rkt/rkt/blob/v1.26.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.26.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/rkt/rkt/blob/v1.26.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/rkt/rkt/blob/v1.27.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.27.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/rkt/rkt/blob/v1.27.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index ef90ef32d8..a684a40cbe 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.26.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.27.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.26.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.27.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 4fa47d7962..03de38cb21 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -9,7 +9,7 @@ The KVM stage1 does not yet implement all of the default stage1's features and s
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
 ```
-sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.26.0 docker://redis
+sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.27.0 docker://redis
 ```
 
 This output is the same you'll get if you run a container-based rkt.
@@ -67,7 +67,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.26.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.27.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 
 [build-configure]: build-configure.md
@@ -89,7 +89,7 @@ Additional [Linux kernel's command line parameters](https://www.kernel.org/doc/h
 
 ```
 sudo RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS="systemd.unified_cgroup_hierarchy=true max_loop=12 possible_cpus=1" \
-      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.26.0 \
+      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.27.0 \
       ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 80ab0acaa6..3408411165 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.26.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.27.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.26.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.27.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index e080996f0a..031841cc6e 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.26.0
+rkt Version: 1.27.0
 appc Version: 0.8.10
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index f79f331797..1eaa742eca 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/rkt/rkt/releases/download/v1.26.0/rkt-v1.26.0.tar.gz
-tar xzvf rkt-v1.26.0.tar.gz
-cd rkt-v1.26.0
+wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt-v1.27.0.tar.gz
+tar xzvf rkt-v1.27.0.tar.gz
+cd rkt-v1.27.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index a701c58517..a5d55bab6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.26.0+git], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.27.0], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 16ca0cbf65..04bd18db6a 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.26.0"
+version="1.27.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index ffb2e48137..1f6112bceb 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.26.0"
+            "value": "1.27.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 094164f138..44ac16ff70 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.26.0"
+            "value": "1.27.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 265ce4f0a2..4c8883c108 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.26.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.27.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index dc60181595..528f9a8b46 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -35,7 +35,7 @@ func TestRunOverrideExec(t *testing.T) {
 	noappManifest := schema.ImageManifest{
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
-			{"version", "1.26.0"},
+			{"version", "1.27.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 2d592a6155..0191686b78 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -46,7 +46,7 @@ func TestImageCatManifest(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.26.0"},
+			{"version", "1.27.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index f054f9958b..d4e2fce5f8 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -45,7 +45,7 @@ func TestImageExport(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.26.0"},
+			{"version", "1.27.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 78f83dc8e2..c0919704c6 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -55,7 +55,7 @@ func TestImageRender(t *testing.T) {
 			{ImageName: "coreos.com/rkt-inspect"},
 		},
 		Labels: types.Labels{
-			{"version", "1.26.0"},
+			{"version", "1.27.0"},
 			{"arch", "amd64"},
 			{"os", "linux"},
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 6b683e90bc..006292f3c8 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -58,7 +58,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"version", "1.26.0"},
+			{"version", "1.27.0"},
 		},
 	}
 

From 6ce64016f6b18d45be62d2f8b3a9ec92aff12c7c Mon Sep 17 00:00:00 2001
From: Julien Balestra <julien.balestra@gmail.com>
Date: Mon, 19 Jun 2017 16:25:49 +0200
Subject: [PATCH 1130/1304] version: bump to v1.27.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index a5d55bab6a..60c4f8496e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.27.0], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.27.0+git], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 4c8883c108..546a0a683b 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.27.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.27.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From bc6597d155a7594247e14c7577ca28b9d9fca82a Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 19 Jun 2017 12:09:36 -0700
Subject: [PATCH 1131/1304] Fix message formatting errors

Use the path string not the os.File object when formatting error messages.

Fixes errors like these when building with go1.9:

  common/common.go: arg dir for printf verb %q of wrong type: *os.File

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 common/common.go | 4 ++--
 rkt/run.go       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/common.go b/common/common.go
index 5f4f4267db..1b2b9c410e 100644
--- a/common/common.go
+++ b/common/common.go
@@ -428,7 +428,7 @@ func PathSupportsOverlay(path string) error {
 
 	dir, err := os.OpenFile(path, syscall.O_RDONLY|syscall.O_DIRECTORY, 0755)
 	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("cannot open %q", dir), err)
+		return errwrap.Wrap(fmt.Errorf("cannot open %q", path), err)
 	}
 	defer dir.Close()
 
@@ -437,7 +437,7 @@ func PathSupportsOverlay(path string) error {
 	// passing the buffer size.
 	n, err := syscall.ReadDirent(int(dir.Fd()), buf)
 	if err != nil {
-		return errwrap.Wrap(fmt.Errorf("cannot read directory %q", dir), err)
+		return errwrap.Wrap(fmt.Errorf("cannot read directory %q", path), err)
 	}
 
 	offset := 0
diff --git a/rkt/run.go b/rkt/run.go
index 9fe9e7b1aa..e0b26041a6 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -553,10 +553,10 @@ func (e *envFileMap) Set(s string) error {
 		pair := strings.SplitN(line, "=", 2)
 		// Malformed lines
 		if len(pair) != 2 || len(pair[0]) == 0 {
-			return fmt.Errorf("environment variable must be specified as name=value (file %q)", file)
+			return fmt.Errorf("environment variable must be specified as name=value (file %q)", s)
 		}
 		if _, exists := e.mapping[pair[0]]; exists {
-			return fmt.Errorf("environment variable %q already set (file %q)", pair[0], file)
+			return fmt.Errorf("environment variable %q already set (file %q)", pair[0], s)
 		}
 		e.mapping[pair[0]] = pair[1]
 	}

From 185fcc0135837971f5de3115c08ef5b92c30dd64 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 19 Jun 2017 12:09:36 -0700
Subject: [PATCH 1132/1304] tests: Remove stale forward-vars

This target no longer uses ABS_GO, so remove the forward-vars for
it.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 tests/functional.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/functional.mk b/tests/functional.mk
index dc58d612cd..43f2941332 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -183,7 +183,6 @@ include makelib/build_go_bin.mk
 # 4 - manifest.json.in
 define FTST_GENERATE_ACE_IMAGE
 
-$$(call forward-vars,$2/manifest,ABS_GO)
 $2/manifest: $4 | $2
 	$$(VQ) \
 	$$(call vb,v2,GEN,$$(call vsp,$$@)) \

From 72a03a39b972cd17ea9810616575d73c45dcc466 Mon Sep 17 00:00:00 2001
From: Simon Guest <simon.guest@tesujimath.org>
Date: Wed, 21 Jun 2017 17:13:12 +1200
Subject: [PATCH 1133/1304] Refactoring to eliminate some duplication.

---
 stage1/common/types/pod.go        | 23 +++++++++++------
 stage1/init/common/app.go         |  2 +-
 stage1/init/common/pod.go         |  4 +--
 stage1_fly/enter/main.go          | 39 +++++++++--------------------
 stage1_fly/process-credentials.go | 41 +++++++------------------------
 stage1_fly/run/main.go            | 13 ++++++----
 6 files changed, 47 insertions(+), 75 deletions(-)

diff --git a/stage1/common/types/pod.go b/stage1/common/types/pod.go
index 6f492f34e4..3be56ded2a 100644
--- a/stage1/common/types/pod.go
+++ b/stage1/common/types/pod.go
@@ -97,6 +97,20 @@ func (p *Pod) SaveRuntime() error {
 	return ioutil.WriteFile(path, buf, 0644)
 }
 
+// LoadPodManifest loads a Pod Manifest.
+func LoadPodManifest(root string) (*schema.PodManifest, error) {
+	buf, err := ioutil.ReadFile(common.PodManifestPath(root))
+	if err != nil {
+		return nil, errwrap.Wrap(errors.New("failed reading pod manifest"), err)
+	}
+
+	pm := &schema.PodManifest{}
+	if err := json.Unmarshal(buf, pm); err != nil {
+		return nil, errwrap.Wrap(errors.New("failed unmarshalling pod manifest"), err)
+	}
+	return pm, nil
+}
+
 // LoadPod loads a Pod Manifest (as prepared by stage0), the runtime data, and
 // its associated Application Manifests, under $root/stage1/opt/stage1/$apphash
 func LoadPod(root string, uuid *types.UUID, rp *RuntimePod) (*Pod, error) {
@@ -120,14 +134,9 @@ func LoadPod(root string, uuid *types.UUID, rp *RuntimePod) (*Pod, error) {
 		}
 	}
 
-	buf, err := ioutil.ReadFile(common.PodManifestPath(p.Root))
+	pm, err := LoadPodManifest(p.Root)
 	if err != nil {
-		return nil, errwrap.Wrap(errors.New("failed reading pod manifest"), err)
-	}
-
-	pm := &schema.PodManifest{}
-	if err := json.Unmarshal(buf, pm); err != nil {
-		return nil, errwrap.Wrap(errors.New("failed unmarshalling pod manifest"), err)
+		return nil, err
 	}
 	p.Manifest = pm
 
diff --git a/stage1/init/common/app.go b/stage1/init/common/app.go
index e8b5b5f931..e97cb6b461 100644
--- a/stage1/init/common/app.go
+++ b/stage1/init/common/app.go
@@ -104,7 +104,7 @@ func prepareApp(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (*preparedApp,
 	var err error
 
 	// Determine numeric uid and gid
-	u, g, err := parseUserGroup(p, ra)
+	u, g, err := ParseUserGroup(p, ra)
 	if err != nil {
 		return nil, errwrap.Wrap(errors.New("unable to determine app's uid and gid"), err)
 	}
diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 3473c3b0fa..4e06ccea68 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -357,7 +357,7 @@ func supportsNotify(p *stage1commontypes.Pod, appName string) bool {
 	return false
 }
 
-// parseUserGroup parses the User and Group fields of an App and returns its
+// ParseUserGroup parses the User and Group fields of an App and returns its
 // UID and GID.
 // The User and Group fields accept several formats:
 //   1. the hardcoded string "root"
@@ -365,7 +365,7 @@ func supportsNotify(p *stage1commontypes.Pod, appName string) bool {
 //   3. a number
 //   4. a name in reference to /etc/{group,passwd} in the image
 // See https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
-func parseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (int, int, error) {
+func ParseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (int, int, error) {
 	var uidResolver, gidResolver user.Resolver
 	var uid, gid int
 	var err error
diff --git a/stage1_fly/enter/main.go b/stage1_fly/enter/main.go
index 418e642048..0157405139 100644
--- a/stage1_fly/enter/main.go
+++ b/stage1_fly/enter/main.go
@@ -15,23 +15,19 @@
 package main
 
 import (
-	"errors"
 	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
+	"runtime"
 	"syscall"
 
 	"github.com/appc/spec/schema"
-	"github.com/hashicorp/errwrap"
 	rktlog "github.com/rkt/rkt/pkg/log"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
 	"github.com/rkt/rkt/stage1_fly"
 )
 
-const (
-	flavor = "fly"
-)
-
 var (
 	debug   bool
 	podPid  string
@@ -55,28 +51,9 @@ func getRootDir(pid string) (string, error) {
 	return os.Readlink(rootLink)
 }
 
-func getPodManifest() (*schema.PodManifest, error) {
-	f, err := os.Open("pod")
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	pmb, err := ioutil.ReadAll(f)
-
-	if err != nil {
-		return nil, errwrap.Wrap(errors.New("error reading pod manifest"), err)
-	}
-	pm := &schema.PodManifest{}
-	if err = pm.UnmarshalJSON(pmb); err != nil {
-		return nil, errwrap.Wrap(errors.New("invalid pod manifest"), err)
-	}
-	return pm, nil
-}
-
 func getRuntimeApp(pm *schema.PodManifest) (*schema.RuntimeApp, error) {
 	if len(pm.Apps) != 1 {
-		return nil, fmt.Errorf("flavor %q only supports 1 application per Pod for now", flavor)
+		return nil, fmt.Errorf("fly only supports 1 application per Pod for now")
 	}
 
 	return &pm.Apps[0], nil
@@ -100,14 +77,20 @@ func main() {
 		diag.SetOutput(ioutil.Discard)
 	}
 
+	// lock the current goroutine to its current OS thread.
+	// This will force the subsequent syscalls *made by this goroutine only*
+	// to be executed in the same OS thread as Setresuid, and Setresgid,
+	// see https://github.com/golang/go/issues/1435#issuecomment-66054163.
+	runtime.LockOSThread()
+
 	root, err := getRootDir(podPid)
 	if err != nil {
 		log.FatalE("Failed to get pod root", err)
 	}
 
-	pm, err := getPodManifest()
+	pm, err := stage1commontypes.LoadPodManifest(".")
 	if err != nil {
-		log.FatalE("Failed to get pod manifest", err)
+		log.FatalE("Failed to load pod manifest", err)
 	}
 
 	ra, err := getRuntimeApp(pm)
diff --git a/stage1_fly/process-credentials.go b/stage1_fly/process-credentials.go
index 8f4be71187..e047171ee1 100644
--- a/stage1_fly/process-credentials.go
+++ b/stage1_fly/process-credentials.go
@@ -15,14 +15,12 @@
 package stage1_fly
 
 import (
-	"fmt"
-	"runtime"
 	"syscall"
 
 	"github.com/appc/spec/schema"
-	"github.com/hashicorp/errwrap"
 	rktlog "github.com/rkt/rkt/pkg/log"
-	"github.com/rkt/rkt/pkg/user"
+	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
 )
 
 type ProcessCredentials struct {
@@ -31,33 +29,17 @@ type ProcessCredentials struct {
 	supplementaryGIDs []int
 }
 
-func LookupProcessCredentials(ra *schema.RuntimeApp, rfs string) (*ProcessCredentials, error) {
+func LookupProcessCredentials(ra *schema.RuntimeApp, root string) (*ProcessCredentials, error) {
 	var c ProcessCredentials
+	var err error
 
-	uidResolver, err := user.NumericIDs(ra.App.User)
-	if err != nil {
-		uidResolver, err = user.IDsFromStat(rfs, ra.App.User, nil)
-	}
-
-	if err != nil { // give up
-		return nil, errwrap.Wrap(fmt.Errorf("invalid user %q", ra.App.User), err)
+	// mock up a pod so we can call ParseUserGroup
+	pod := &stage1commontypes.Pod{
+		Root: root,
 	}
-
-	if c.uid, _, err = uidResolver.IDs(); err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("failed to configure user %q", ra.App.User), err)
-	}
-
-	gidResolver, err := user.NumericIDs(ra.App.Group)
+	c.uid, c.gid, err = stage1initcommon.ParseUserGroup(pod, ra)
 	if err != nil {
-		gidResolver, err = user.IDsFromStat(rfs, ra.App.Group, nil)
-	}
-
-	if err != nil { // give up
-		return nil, errwrap.Wrap(fmt.Errorf("invalid group %q", ra.App.Group), err)
-	}
-
-	if _, c.gid, err = gidResolver.IDs(); err != nil {
-		return nil, errwrap.Wrap(fmt.Errorf("failed to configure group %q", ra.App.Group), err)
+		return nil, err
 	}
 
 	// supplementary groups - ensure primary group is included
@@ -70,11 +52,6 @@ func LookupProcessCredentials(ra *schema.RuntimeApp, rfs string) (*ProcessCreden
 }
 
 func SetProcessCredentials(c *ProcessCredentials, diag *rktlog.Logger) error {
-	// lock the current goroutine to its current OS thread.
-	// This will force the subsequent syscalls to be executed in the same OS thread as Setresuid, and Setresgid,
-	// see https://github.com/golang/go/issues/1435#issuecomment-66054163.
-	runtime.LockOSThread()
-
 	diag.Printf("setting credentials: uid=%d, gid=%d, suppGids=%v", c.uid, c.gid, c.supplementaryGIDs)
 	if err := syscall.Setresgid(c.gid, c.gid, c.gid); err != nil {
 		return err
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index b79e7b4e19..3b9c0a0f4e 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -21,6 +21,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"syscall"
 
@@ -41,10 +42,6 @@ import (
 	"github.com/rkt/rkt/stage1_fly"
 )
 
-const (
-	flavor = "fly"
-)
-
 type flyMount struct {
 	HostPath         string
 	TargetPrefixPath string
@@ -266,7 +263,7 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 
 	// Sanity checks
 	if len(p.Manifest.Apps) != 1 {
-		log.Printf("flavor %q only supports 1 application per Pod for now", flavor)
+		log.Printf("fly only supports 1 application per Pod for now")
 		return 254
 	}
 
@@ -527,6 +524,12 @@ func main() {
 		diag.SetOutput(ioutil.Discard)
 	}
 
+	// lock the current goroutine to its current OS thread.
+	// This will force the subsequent syscalls *made by this goroutine only*
+	// to be executed in the same OS thread as Setresuid, and Setresgid,
+	// see https://github.com/golang/go/issues/1435#issuecomment-66054163.
+	runtime.LockOSThread()
+
 	// move code into stage1() helper so defered fns get run
 	os.Exit(stage1(rp))
 }

From 2ca7beedf6c2877b64a65284f2b0051927ebc9b4 Mon Sep 17 00:00:00 2001
From: Simon Guest <simon.guest@tesujimath.org>
Date: Thu, 22 Jun 2017 12:30:48 +1200
Subject: [PATCH 1134/1304] stage1/fly: minor refactoring.

---
 stage1_fly/enter/main.go          |  9 +++++++--
 stage1_fly/process-credentials.go | 10 ++--------
 stage1_fly/run/main.go            |  5 +++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/stage1_fly/enter/main.go b/stage1_fly/enter/main.go
index 0157405139..9e5726ab4d 100644
--- a/stage1_fly/enter/main.go
+++ b/stage1_fly/enter/main.go
@@ -98,7 +98,11 @@ func main() {
 		log.FatalE("Failed to get app", err)
 	}
 
-	credentials, err := stage1_fly.LookupProcessCredentials(ra, root)
+	// mock up a pod so we can call LookupProcessCredentials
+	pod := &stage1commontypes.Pod{
+		Root: root,
+	}
+	credentials, err := stage1_fly.LookupProcessCredentials(pod, ra, root)
 	if err != nil {
 		log.FatalE("failed to lookup process credentials", err)
 	}
@@ -111,7 +115,8 @@ func main() {
 		log.FatalE("Failed to chroot", err)
 	}
 
-	if err := stage1_fly.SetProcessCredentials(credentials, diag); err != nil {
+	diag.Printf("setting credentials: %+v", credentials)
+	if err := stage1_fly.SetProcessCredentials(credentials); err != nil {
 		log.FatalE("can't set process credentials", err)
 	}
 
diff --git a/stage1_fly/process-credentials.go b/stage1_fly/process-credentials.go
index e047171ee1..9be4f80f4d 100644
--- a/stage1_fly/process-credentials.go
+++ b/stage1_fly/process-credentials.go
@@ -18,7 +18,6 @@ import (
 	"syscall"
 
 	"github.com/appc/spec/schema"
-	rktlog "github.com/rkt/rkt/pkg/log"
 	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
 	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
 )
@@ -29,14 +28,10 @@ type ProcessCredentials struct {
 	supplementaryGIDs []int
 }
 
-func LookupProcessCredentials(ra *schema.RuntimeApp, root string) (*ProcessCredentials, error) {
+func LookupProcessCredentials(pod *stage1commontypes.Pod, ra *schema.RuntimeApp, root string) (*ProcessCredentials, error) {
 	var c ProcessCredentials
 	var err error
 
-	// mock up a pod so we can call ParseUserGroup
-	pod := &stage1commontypes.Pod{
-		Root: root,
-	}
 	c.uid, c.gid, err = stage1initcommon.ParseUserGroup(pod, ra)
 	if err != nil {
 		return nil, err
@@ -51,8 +46,7 @@ func LookupProcessCredentials(ra *schema.RuntimeApp, root string) (*ProcessCrede
 	return &c, nil
 }
 
-func SetProcessCredentials(c *ProcessCredentials, diag *rktlog.Logger) error {
-	diag.Printf("setting credentials: uid=%d, gid=%d, suppGids=%v", c.uid, c.gid, c.supplementaryGIDs)
+func SetProcessCredentials(c *ProcessCredentials) error {
 	if err := syscall.Setresgid(c.gid, c.gid, c.gid); err != nil {
 		return err
 	}
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 3b9c0a0f4e..3da1aba5c0 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -452,7 +452,7 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		return 254
 	}
 
-	credentials, err := stage1_fly.LookupProcessCredentials(&ra, rfs)
+	credentials, err := stage1_fly.LookupProcessCredentials(p, &ra, rfs)
 	if err != nil {
 		log.PrintE("failed to lookup process credentials", err)
 		return 254
@@ -469,7 +469,8 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		return 254
 	}
 
-	if err := stage1_fly.SetProcessCredentials(credentials, diag); err != nil {
+	diag.Printf("setting credentials: %+v", credentials)
+	if err := stage1_fly.SetProcessCredentials(credentials); err != nil {
 		log.PrintE("can't set process credentials", err)
 		return 254
 	}

From db12cf4a54cf51328ab36c52dd8c1a866bf27bdb Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Thu, 22 Jun 2017 11:52:32 +0200
Subject: [PATCH 1135/1304] doc: mention external stage1s

This was discussed on:
https://github.com/rkt/rkt/pull/3645#issuecomment-296865635

/cc @lucab @euank @sstabellini @n0rad @iaguis @schu
---
 Documentation/devel/architecture.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index c97559e82e..eecca03de7 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -83,6 +83,13 @@ Specifically, it must:
   - systemd/nspawn: a cgroup/namespace based isolation environment using systemd, and systemd-nspawn.
   - kvm: a fully isolated kvm environment.
 
+There are also out of tree stage1:
+- [stage1-xen](https://github.com/rkt/stage1-xen), stage1 based on the Xen hypervisor
+- [volo](https://github.com/lucab/rkt-volo), stage1 written in Rust, akin to stage1-fly
+- [docker-skim](https://github.com/coreos/docker-skim), a weaker version of stage1-fly using `LD_PRELOAD` tricks instead of chroot
+- [dgr/aci-builder](https://github.com/blablacar/dgr), a stage1 used internally by the container build and runtime tool dgr
+- [stage1-builder](https://github.com/kinvolk/stage1-builder), scripts and tools to generate KVM-based stage1 with customized Linux kernels
+
 ### Stage 2
 
 The final stage, stage2, is the actual environment in which the applications run, as launched by stage1.

From 67f2937e340068ab7cc039c654dc04559047adc7 Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Thu, 22 Jun 2017 11:23:01 -0700
Subject: [PATCH 1136/1304] stage1/init/units: keep journald running while apps
 are shutting down

This prevents a race when apps are writing to their stdout/err (and
output is being sent to stage1's journal) while shutting down. If
journald terminates before the apps finish shutting down, their output
will be lost.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
---
 stage1/init/common/units.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 943dfd1007..c6267be825 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -169,6 +169,7 @@ func ImmutableEnv(p *stage1commontypes.Pod) error {
 		}
 
 		uw.AppUnit(ra, binPath,
+			unit.NewUnitOption("Unit", "After", "systemd-journald.service"),
 			// When an app fails, we shut down the pod
 			unit.NewUnitOption("Unit", "OnFailure", "halt.target"))
 

From e32c3d44f88288e6440fc0b9f721753464f947f2 Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Fri, 19 May 2017 17:10:41 -0700
Subject: [PATCH 1137/1304] network: hierarchical loader for configs, custom
 defaults

**BREAKING**

Let builtin network configurations (e.g.: default and
default-restricted) in the default stage1 image be overriden by custom
images.

This allows users to specify --net=custom1,default and have the default
network come from builtin configurations. Users can also provide a
custom network named default to override what's builtin, as needed.

Fixes #3598 and #3605, a default network is only added to containers
when --net is empty (no custom networks), or when default or
default-restricted were explicitly specified.

For backwards compatibility, the order in which networks will be applied
is define by their config file names. This allows some control on what
is eth0, eth1, etc. inside pods, with filenames like Z01-custom.conf,
N15-default.conf, ...

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
---
 networking/podenv.go  | 230 ++++++++++++++++++++++--------------------
 tests/rkt_net_test.go |  12 +--
 2 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/networking/podenv.go b/networking/podenv.go
index 90f538a801..bb415a3476 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -26,15 +26,12 @@ import (
 	"strings"
 	"syscall"
 
-	"golang.org/x/sys/unix"
-
 	"github.com/appc/spec/schema/types"
-	"github.com/hashicorp/errwrap"
-
 	"github.com/containernetworking/cni/pkg/ns"
-
+	"github.com/hashicorp/errwrap"
 	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/networking/netinfo"
+	"golang.org/x/sys/unix"
 )
 
 const (
@@ -42,8 +39,7 @@ const (
 	UserNetPathSuffix = "net.d"
 
 	// Default net path relative to stage1 root
-	DefaultNetPath           = "etc/rkt/net.d/99-default.conf"
-	DefaultRestrictedNetPath = "etc/rkt/net.d/99-default-restricted.conf"
+	BuiltinNetPath = "etc/rkt/" + UserNetPathSuffix
 )
 
 // "base" struct that's populated from the beginning
@@ -63,33 +59,36 @@ type activeNet struct {
 	runtime   *netinfo.NetInfo
 }
 
-// Loads nets specified by user and default one from stage1
-func (e *podEnv) loadNets() ([]activeNet, error) {
-	nets, err := loadUserNets(e.localConfig, e.netsLoadList)
-	if err != nil {
-		return nil, err
-	}
+type byFilename []activeNet
+
+func (s byFilename) Len() int      { return len(s) }
+func (s byFilename) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s byFilename) Less(i, j int) bool {
+	fiName := filepath.Base(s[i].runtime.ConfPath)
+	fjName := filepath.Base(s[j].runtime.ConfPath)
+	return strings.Compare(fiName, fjName) < 0
+}
 
+// Loads nets specified by user, both from a configurable user location and builtin from stage1. User supplied network
+// configs override what is built into stage1.
+// The order in which networks are applied to pods will be defined by their filenames.
+func (e *podEnv) loadNets() ([]activeNet, error) {
 	if e.netsLoadList.None() {
-		return nets, nil
+		stderr.Printf("networking namespace with loopback only")
+		return nil, nil
 	}
 
-	if !netExists(nets, "default") && !netExists(nets, "default-restricted") {
-		var defaultNet string
-		if e.netsLoadList.Specific("default") || e.netsLoadList.All() {
-			defaultNet = DefaultNetPath
-		} else {
-			defaultNet = DefaultRestrictedNetPath
-		}
-		defPath := path.Join(common.Stage1RootfsPath(e.podRoot), defaultNet)
-		n, err := loadNet(defPath)
-		if err != nil {
-			return nil, err
-		}
-		nets = append(nets, *n)
+	nets, err := e.newNetLoader().loadNets(e.netsLoadList)
+	if err != nil {
+		return nil, err
 	}
+	netSlice := make([]activeNet, 0, len(nets))
+	for _, net := range nets {
+		netSlice = append(netSlice, net)
+	}
+	sort.Sort(byFilename(netSlice))
 
-	missing := missingNets(e.netsLoadList, nets)
+	missing := missingNets(e.netsLoadList, netSlice)
 	if len(missing) > 0 {
 		return nil, fmt.Errorf("networks not found: %v", strings.Join(missing, ", "))
 	}
@@ -99,7 +98,7 @@ func (e *podEnv) loadNets() ([]activeNet, error) {
 	for _, n := range nets {
 		n.runtime.Args = e.netsLoadList.SpecificArgs(n.conf.Name)
 	}
-	return nets, nil
+	return netSlice, nil
 }
 
 // podNSCreate creates the network namespace and saves a reference to its path.
@@ -266,7 +265,6 @@ func (e *podEnv) setupNets(nets []activeNet, noDNS bool) error {
 }
 
 func (e *podEnv) teardownNets(nets []activeNet) {
-
 	for i := len(nets) - 1; i >= 0; i-- {
 		if debuglog {
 			stderr.Printf("teardown - executing net-plugin %v", nets[i].conf.Type)
@@ -290,6 +288,97 @@ func (e *podEnv) teardownNets(nets []activeNet) {
 	}
 }
 
+// netLoader loads network definitions hierarchically. Child loaders can override definitions from parents.
+type netLoader struct {
+	parent     *netLoader
+	configPath string
+}
+
+// Build a Loader that looks first for custom (user provided) plugins, then builtin.
+func (e *podEnv) newNetLoader() *netLoader {
+	return &netLoader{
+		parent: &netLoader{
+			configPath: path.Join(common.Stage1RootfsPath(e.podRoot), BuiltinNetPath),
+		},
+		configPath: filepath.Join(e.localConfig, UserNetPathSuffix),
+	}
+}
+
+func (l *netLoader) loadNets(netsLoadList common.NetList) (map[string]activeNet, error) {
+	var parentNets map[string]activeNet
+	if l.parent != nil {
+		var err error
+		if parentNets, err = l.parent.loadNets(netsLoadList); err != nil {
+			return nil, err
+		}
+	} else {
+		parentNets = make(map[string]activeNet)
+	}
+
+	if debuglog {
+		stderr.Printf("loading networks from %v", l.configPath)
+	}
+
+	files, err := listFiles(l.configPath)
+	if err != nil {
+		return nil, err
+	}
+	sort.Strings(files)
+	nets := make(map[string]activeNet, len(files))
+
+	for _, filename := range files {
+		filepath := filepath.Join(l.configPath, filename)
+
+		if !strings.HasSuffix(filepath, ".conf") {
+			continue
+		}
+
+		n, err := loadNet(filepath)
+		if err != nil {
+			return nil, err
+		}
+
+		if !(netsLoadList.All() || netsLoadList.Specific(n.conf.Name)) {
+			continue
+		}
+
+		if _, ok := nets[n.conf.Name]; ok {
+			stderr.Printf("%q network already defined, ignoring %v", n.conf.Name, filename)
+			continue
+		}
+
+		nets[n.conf.Name] = *n
+	}
+
+	// merge with parent
+	for name, net := range nets {
+		if _, exists := parentNets[name]; exists {
+			stderr.Printf(`overriding %q network with one from %v`, name, l.configPath)
+		}
+		parentNets[name] = net
+	}
+	return parentNets, nil
+}
+
+func missingNets(defined common.NetList, loaded []activeNet) []string {
+	diff := make(map[string]struct{})
+	for _, n := range defined.StringsOnlyNames() {
+		if n != "all" {
+			diff[n] = struct{}{}
+		}
+	}
+
+	for _, an := range loaded {
+		delete(diff, an.conf.Name)
+	}
+
+	var missing []string
+	for n := range diff {
+		missing = append(missing, n)
+	}
+	return missing
+}
+
 func listFiles(dir string) ([]string, error) {
 	dirents, err := ioutil.ReadDir(dir)
 	switch {
@@ -312,15 +401,6 @@ func listFiles(dir string) ([]string, error) {
 	return files, nil
 }
 
-func netExists(nets []activeNet, name string) bool {
-	for _, n := range nets {
-		if n.conf.Name == name {
-			return true
-		}
-	}
-	return false
-}
-
 func loadNet(filepath string) (*activeNet, error) {
 	bytes, err := ioutil.ReadFile(filepath)
 	if err != nil {
@@ -360,75 +440,3 @@ func copyFileToDir(src, dstdir string) (string, error) {
 	_, err = io.Copy(d, s)
 	return dst, err
 }
-
-// loadUserNets will load all network configuration files from the user-supplied
-// configuration directory (typically /etc/rkt/net.d). Do not do any mutation here -
-// we also load networks in a few other code paths.
-func loadUserNets(localConfig string, netsLoadList common.NetList) ([]activeNet, error) {
-	if netsLoadList.None() {
-		stderr.Printf("networking namespace with loopback only")
-		return nil, nil
-	}
-
-	userNetPath := filepath.Join(localConfig, UserNetPathSuffix)
-	if debuglog {
-		stderr.Printf("loading networks from %v", userNetPath)
-	}
-
-	files, err := listFiles(userNetPath)
-	if err != nil {
-		return nil, err
-	}
-	sort.Strings(files)
-	nets := make([]activeNet, 0, len(files))
-
-	for _, filename := range files {
-		filepath := filepath.Join(userNetPath, filename)
-
-		if !strings.HasSuffix(filepath, ".conf") {
-			continue
-		}
-
-		n, err := loadNet(filepath)
-		if err != nil {
-			return nil, err
-		}
-
-		if !(netsLoadList.All() || netsLoadList.Specific(n.conf.Name)) {
-			continue
-		}
-
-		if n.conf.Name == "default" ||
-			n.conf.Name == "default-restricted" {
-			stderr.Printf(`overriding %q network with %v`, n.conf.Name, filename)
-		}
-
-		if netExists(nets, n.conf.Name) {
-			stderr.Printf("%q network already defined, ignoring %v", n.conf.Name, filename)
-			continue
-		}
-
-		nets = append(nets, *n)
-	}
-
-	return nets, nil
-}
-
-func missingNets(defined common.NetList, loaded []activeNet) []string {
-	diff := make(map[string]struct{})
-	for _, n := range defined.StringsOnlyNames() {
-		if n != "all" {
-			diff[n] = struct{}{}
-		}
-	}
-
-	for _, an := range loaded {
-		delete(diff, an.conf.Name)
-	}
-
-	var missing []string
-	for n := range diff {
-		missing = append(missing, n)
-	}
-	return missing
-}
diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index d6da6e8d37..f1e992acc4 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -1318,19 +1318,11 @@ func NewNetPreserveNetNameTest() testutils.Test {
 			t.Fatalf("Can't open net-info.json for reading: %v", err)
 		}
 
-		if len(info) != 2 {
+		if len(info) != 1 {
 			t.Fatalf("Incorrect number of networks: %v", len(info))
 		}
 
-		found := false
-		for _, net := range info {
-			if net.NetName == ntFlannel.Name {
-				found = true
-				break
-			}
-		}
-
-		if !found {
+		if info[0].NetName != ntFlannel.Name {
 			t.Fatalf("Network '%s' not found!\nnetInfo[0]: %v\nnetInfo[1]: %v", ntFlannel.Name, info[0], info[1])
 		}
 	})

From d8ea9a0f3ca45a8a28c285863d61fd9f97d813dc Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Mon, 19 Jun 2017 10:02:26 -0700
Subject: [PATCH 1138/1304] test: TestNetOverride only needs one --net

Now that the network loader respects the filename order, --net=all
was causing the default networks to be added as eth0, instead of the
desired custom network

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
---
 tests/rkt_net_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_net_test.go b/tests/rkt_net_test.go
index f1e992acc4..fee692a6e8 100644
--- a/tests/rkt_net_test.go
+++ b/tests/rkt_net_test.go
@@ -1125,7 +1125,7 @@ func NewNetOverrideTest() testutils.Test {
 
 		expectedIP := "11.11.4.244"
 
-		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=all --net=\"%s:IP=%s\" --mds-register=false %s", ctx.Cmd(), nt.Name, expectedIP, testImage)
+		cmd := fmt.Sprintf("%s --debug --insecure-options=image run --net=\"%s:IP=%s\" --mds-register=false %s", ctx.Cmd(), nt.Name, expectedIP, testImage)
 		child := spawnOrFail(t, cmd)
 		defer waitOrFail(t, child, 0)
 

From 21e8e0ec955b6e92db5ef3bf71ce3f5a8d3281c5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Mon, 10 Jul 2017 16:20:39 +0000
Subject: [PATCH 1139/1304] tests/net: skip TestNetCustomBridge on semaphore

---
 tests/rkt_net_nspawn_test.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index bacac3078f..6e90f486b0 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -16,7 +16,10 @@
 
 package main
 
-import "testing"
+import (
+	"os"
+	"testing"
+)
 
 func TestNetHost(t *testing.T) {
 	NewNetHostTest().Execute(t)
@@ -50,6 +53,10 @@ func TestNetCustomMacvlan(t *testing.T) {
 }
 
 func TestNetCustomBridge(t *testing.T) {
+	// Flaking test: https://github.com/rkt/rkt/issues/3739
+	if os.Getenv("SEMAPHORE") == "true" {
+		t.Skip("skipped on semaphore")
+	}
 	NewNetCustomBridgeTest().Execute(t)
 }
 

From 161dfa5a68ffb399133919ff8e5317c464bdc88e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Mon, 17 Jul 2017 09:14:59 +0000
Subject: [PATCH 1140/1304] tests/net: skip TestNetCustomPtp on semaphore

---
 tests/rkt_net_nspawn_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/rkt_net_nspawn_test.go b/tests/rkt_net_nspawn_test.go
index 6e90f486b0..61a1958460 100644
--- a/tests/rkt_net_nspawn_test.go
+++ b/tests/rkt_net_nspawn_test.go
@@ -73,6 +73,10 @@ func TestNetIPConflict(t *testing.T) {
 }
 
 func TestNetCustomPtp(t *testing.T) {
+	// Flaking test: https://github.com/rkt/rkt/issues/3739
+	if os.Getenv("SEMAPHORE") == "true" {
+		t.Skip("skipped on semaphore")
+	}
 	// PTP means connection Point-To-Point. That is, connections to other pods/containers should be forbidden
 	NewNetCustomPtpTest(true).Execute(t)
 }

From 0d5f9dd9ff393ed8e10145b87e09f223e75abb53 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 17 Jul 2017 09:40:34 -0700
Subject: [PATCH 1141/1304] stage1/usr_from_coreos: Fix arm64 --user --group

systemd needs the libnss_files library (dynamically loaded by glibc for
getpwuid().

Fixes errors like these for rtk's --user and --group command line
options on arm64:

  Container rkt-XXX failed with error code 216.
  Container rkt-XXX failed with error code 217.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
index 21530fb9f7..edb8376b1b 100644
--- a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
@@ -49,6 +49,8 @@ lib64/libmount.so.1
 lib64/libmount.so.1.1.0
 lib64/libncurses.so.5
 lib64/libncurses.so.5.9
+lib64/libnss_files.so.2
+lib64/libnss_files-2.21.so
 lib64/libpam.so.0
 lib64/libpam.so.0.84.1
 lib64/libpthread-2.21.so

From 9cac4ef5a0980500b1c1393f7401af24509b9f54 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 17 Jul 2017 09:40:34 -0700
Subject: [PATCH 1142/1304] tests: Fix makefile arch problems

Add a new makefile function 'generate-manifest-file' that inserts machine
specific values into an ACI manifest template.  Also, change all makefiles
and manifest source files to work with generate-manifest-file.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 makelib/misc.mk                  | 14 ++++++++++++++
 tests/empty-image/manifest       |  4 ++--
 tests/functional.mk              | 15 +++++++++------
 tests/image/manifest             |  4 ++--
 tests/stub-stage1/manifest       |  4 ++--
 tests/stub-stage1/stub-stage1.mk |  7 ++++---
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/makelib/misc.mk b/makelib/misc.mk
index c28cb35c03..63ad19a202 100644
--- a/makelib/misc.mk
+++ b/makelib/misc.mk
@@ -570,6 +570,20 @@ $(strip \
 	$(call undefine-namespaces,_MISC_GPF))
 endef
 
+# Generate an ACI manifest from a source template.  Fills in
+# machine specific values.
+#
+# 1 - input: manifest source template file
+# 2 - output: generated manifest file
+define generate-manifest-file
+	sed \
+		-e "s/@ACI_OS@/linux/" \
+		-e "s/@ACI_ARCH@/${RKT_ACI_ARCH}/" \
+		-e "s/@GOOS@/linux/" \
+		-e "s/@GOARCH@/${RKT_ACI_ARCH}/" \
+		$(1) >$(2);
+endef
+
 # Recursive wildcard - recursively generate a list of files
 #
 # 1 - root directory
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 1f6112bceb..9a62eda7de 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -9,11 +9,11 @@
         },
         {
             "name": "arch",
-            "value": "amd64"
+            "value": "@ACI_ARCH@"
         },
         {
             "name": "os",
-            "value": "linux"
+            "value": "@ACI_OS@"
         }
     ]
 }
diff --git a/tests/functional.mk b/tests/functional.mk
index 43f2941332..0e569df5fa 100644
--- a/tests/functional.mk
+++ b/tests/functional.mk
@@ -41,9 +41,7 @@ TOPLEVEL_CHECK_STAMPS += $(FTST_FUNCTIONAL_TESTS_STAMP)
 TOPLEVEL_FUNCTIONAL_CHECK_STAMPS += $(FTST_FUNCTIONAL_TESTS_STAMP)
 INSTALL_FILES += \
 	$(RKT_BINARY):$(FTST_RKT_PATH):- \
-	$(FTST_IMAGE_MANIFEST_SRC):$(FTST_IMAGE_MANIFEST):- \
 	$(FTST_INSPECT_BINARY):$(FTST_ACI_INSPECT):- \
-	$(FTST_EMPTY_IMAGE_MANIFEST_SRC):$(FTST_EMPTY_IMAGE_MANIFEST):- \
 	$(FTST_ECHO_SERVER_BINARY):$(FTST_ACI_ECHO_SERVER):-
 CREATE_DIRS += \
 	$(FTST_IMAGE_DIR) \
@@ -105,10 +103,12 @@ $(FTST_FUNCTIONAL_TESTS_STAMP): $(FTST_IMAGE) $(FTST_EMPTY_IMAGE) $(ACTOOL_STAMP
 		test -tags $(RKT_STAGE1_DEFAULT_FLAVOR) -timeout $(FTST_FUNCTIONAL_TESTS_TIMEOUT) -v $(GO_TEST_FUNC_ARGS) $(REPO_PATH)/tests
 
 $(call forward-vars,$(FTST_IMAGE), \
-	FTST_IMAGE_ROOTFSDIR ACTOOL FTST_IMAGE_DIR)
-$(FTST_IMAGE): $(FTST_IMAGE_MANIFEST) $(FTST_ACI_INSPECT) $(FTST_ACI_ECHO_SERVER) | $(FTST_IMAGE_TEST_DIRS)
+	FTST_IMAGE_MANIFEST_SRC FTST_IMAGE_MANIFEST FTST_IMAGE_ROOTFSDIR ACTOOL FTST_IMAGE_DIR)
+$(FTST_IMAGE): $(FTST_ACI_INSPECT) $(FTST_ACI_ECHO_SERVER) | $(FTST_IMAGE_TEST_DIRS)
 	$(VQ) \
 	set -e; \
+	$(call vb,vt,GEN,$(call vsp,$(FTST_IMAGE_MANIFEST))) \
+	$(call generate-manifest-file,$(FTST_IMAGE_MANIFEST_SRC),$(FTST_IMAGE_MANIFEST)) \
 	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/dir1/file)) \
 	echo -n dir1 >$(FTST_IMAGE_ROOTFSDIR)/dir1/file; \
 	$(call vb,v2,GEN,$(call vsp,$(FTST_IMAGE_ROOTFSDIR)/dir1/link_abs_dir2)) \
@@ -152,9 +152,12 @@ BGB_ADDITIONAL_GO_ENV := CGO_ENABLED=0
 include makelib/build_go_bin.mk
 
 $(call forward-vars,$(FTST_EMPTY_IMAGE), \
+	FTST_EMPTY_IMAGE_MANIFEST_SRC FTST_EMPTY_IMAGE_MANIFEST \
 	ACTOOL FTST_EMPTY_IMAGE_DIR)
-$(FTST_EMPTY_IMAGE): $(FTST_EMPTY_IMAGE_MANIFEST) | $(FTST_EMPTY_IMAGE_ROOTFSDIR)
+$(FTST_EMPTY_IMAGE): $(FTST_EMPTY_IMAGE_ROOTFSDIR)
 	$(VQ) \
+	$(call vb,vt,GEN,$(call vsp,$(FTST_EMPTY_IMAGE_MANIFEST))) \
+	$(call generate-manifest-file,$(FTST_EMPTY_IMAGE_MANIFEST_SRC),$(FTST_EMPTY_IMAGE_MANIFEST)) \
 	$(call vb,vt,ACTOOL,$(call vsp,$@)) \
 	"$(ACTOOL)" build --overwrite "$(FTST_EMPTY_IMAGE_DIR)" "$@"
 
@@ -186,7 +189,7 @@ define FTST_GENERATE_ACE_IMAGE
 $2/manifest: $4 | $2
 	$$(VQ) \
 	$$(call vb,v2,GEN,$$(call vsp,$$@)) \
-	sed -e "s/@GOOS@/linux/" -e "s/@GOARCH@/$${RKT_ACI_ARCH}/" <$$< >$$@
+	$$(call generate-manifest-file,$$<,$$@) \
 
 $$(call forward-vars,$1,ACTOOL)
 $1: $2/manifest $2/rootfs/ace-validator | $2/rootfs/opt/acvalidator
diff --git a/tests/image/manifest b/tests/image/manifest
index 44ac16ff70..84612720c9 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -9,11 +9,11 @@
         },
         {
             "name": "arch",
-            "value": "amd64"
+            "value": "@ACI_ARCH@"
         },
         {
             "name": "os",
-            "value": "linux"
+            "value": "@ACI_OS@"
         }
     ],
     "app": {
diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest
index 7335a31cd4..8b62f48007 100644
--- a/tests/stub-stage1/manifest
+++ b/tests/stub-stage1/manifest
@@ -9,11 +9,11 @@
         },
         {
             "name": "arch",
-            "value": "amd64"
+            "value": "@ACI_ARCH@"
         },
         {
             "name": "os",
-            "value": "linux"
+            "value": "@ACI_OS@"
         }
     ],
     "annotations": [
diff --git a/tests/stub-stage1/stub-stage1.mk b/tests/stub-stage1/stub-stage1.mk
index aab991615b..3691dce132 100644
--- a/tests/stub-stage1/stub-stage1.mk
+++ b/tests/stub-stage1/stub-stage1.mk
@@ -26,7 +26,6 @@ FTST_SS1_RESERVED_DIR_CHAINS := \
 	$(foreach d,$(FTST_SS1_RESERVED_DIRS), \
 		$(call dir-chain,$(FTST_SS1_ACIROOTFSDIR),$d))
 
-INSTALL_FILES += $(FTST_SS1_MANIFEST_SRC):$(FTST_SS1_MANIFEST):0644
 INSTALL_DIRS += \
 	$(FTST_SS1_ACIDIR):- \
 	$(FTST_SS1_ACIROOTFSDIR):- \
@@ -40,9 +39,11 @@ CLEAN_FILES += \
 $(call generate-stamp-rule,$(FTST_SS1_STAMP),$(FTST_SS1_IMAGE))
 
 $(call forward-vars,$(FTST_SS1_IMAGE), \
-	FTST_SS1_ACIDIR)
-$(FTST_SS1_IMAGE): $(FTST_SS1_MANIFEST) $(FTST_SS1_RUN_BINARY) $(FTST_SS1_ENTER_BINARY) $(FTST_SS1_GC_BINARY) $(ACTOOL_STAMP) | $(FTST_SS1_ACIDIR) $(FTST_SS1_RESERVED_DIRS_IN_ROOTFS)
+	FTST_SS1_MANIFEST_SRC FTST_SS1_MANIFEST FTST_SS1_ACIDIR)
+$(FTST_SS1_IMAGE): $(FTST_SS1_RUN_BINARY) $(FTST_SS1_ENTER_BINARY) $(FTST_SS1_GC_BINARY) $(ACTOOL_STAMP) | $(FTST_SS1_ACIDIR) $(FTST_SS1_RESERVED_DIRS_IN_ROOTFS)
 	$(VQ) \
+	$(call vb,vt,GEN,$(call vsp,$(FTST_SS1_MANIFEST))) \
+	$(call generate-manifest-file,$(FTST_SS1_MANIFEST_SRC),$(FTST_SS1_MANIFEST)) \
 	$(call vb,vt,ACTOOL,$(call vsp,$@)) \
 	"$(ACTOOL)" build --overwrite "$(FTST_SS1_ACIDIR)" "$@"
 

From fe1d350406b2d56cf0fc533900779f4f47eb8491 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 17 Jul 2017 09:40:34 -0700
Subject: [PATCH 1143/1304] tests: Cleanup TestFetchAny

Move duplicate strings into local variables.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 tests/rkt_fetch_test.go | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index fdfb2dfa6b..9d338d6641 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -96,26 +96,34 @@ func TestFetchAny(t *testing.T) {
 
 	defer os.Remove(imagePath)
 
+	etcdVersion := "v2.1.2"
+	etcdImage := "coreos.com/etcd:" + etcdVersion
+	etcdURL := "https://github.com/coreos/etcd/releases/download/" + etcdVersion + "/etcd-" + etcdVersion + "-linux-amd64.aci"
+
+	dockerVersion := "latest"
+	dockerImage := "docker://busybox"
+	dockerImageV := dockerImage + ":" + dockerVersion
+
 	tests := []struct {
 		args      string
 		image     string
 		imageArgs string
 		finalURL  string
 	}{
-		{"--insecure-options=image --debug fetch", "coreos.com/etcd:v2.1.2", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image --debug fetch", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image --debug fetch", "docker://busybox", "", "docker://busybox"},
-		{"--insecure-options=image --debug fetch", "docker://busybox:latest", "", "docker://busybox:latest"},
-		{"--insecure-options=image --debug run --mds-register=false", "coreos.com/etcd:v2.1.2", "--exec /etcdctl", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image --debug run --mds-register=false", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "--exec /etcdctl", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image --debug run --mds-register=false", "docker://busybox", "", "docker://busybox"},
-		{"--insecure-options=image --debug run --mds-register=false", "docker://busybox:latest", "", "docker://busybox:latest"},
-		{"--insecure-options=image --debug prepare", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
-		{"--insecure-options=image --debug prepare", "coreos.com/etcd:v2.1.2", "", "https://github.com/coreos/etcd/releases/download/v2.1.2/etcd-v2.1.2-linux-amd64.aci"},
+		{"--insecure-options=image --debug fetch", etcdImage, "", etcdURL},
+		{"--insecure-options=image --debug fetch", etcdURL, "", etcdURL},
+		{"--insecure-options=image --debug fetch", dockerImage, "", dockerImage},
+		{"--insecure-options=image --debug fetch", dockerImageV, "", dockerImageV},
+		{"--insecure-options=image --debug run --mds-register=false", etcdImage, "--exec /etcdctl", etcdURL},
+		{"--insecure-options=image --debug run --mds-register=false", etcdURL, "--exec /etcdctl", etcdURL},
+		{"--insecure-options=image --debug run --mds-register=false", dockerImage, "", dockerImage},
+		{"--insecure-options=image --debug run --mds-register=false", dockerImageV, "", dockerImageV},
+		{"--insecure-options=image --debug prepare", etcdURL, "", etcdURL},
+		{"--insecure-options=image --debug prepare", etcdImage, "", etcdURL},
 		// test --insecure-options=tls to make sure
 		// https://github.com/rkt/rkt/issues/1829 is not an issue anymore
-		{"--insecure-options=image,tls --debug prepare", "docker://busybox", "", "docker://busybox"},
-		{"--insecure-options=image --debug prepare", "docker://busybox:latest", "", "docker://busybox:latest"},
+		{"--insecure-options=image,tls --debug prepare", dockerImage, "", dockerImage},
+		{"--insecure-options=image --debug prepare", dockerImageV, "", dockerImageV},
 	}
 
 	for _, tt := range tests {

From 14f4497c0a3796d4e60a5652e052a031101b8b25 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 17 Jul 2017 09:40:34 -0700
Subject: [PATCH 1144/1304] common: Cleanup GetOS and GetArch

Create a new common routine GetOSArch() and change GetOS() and GetArch()
to be wrappers that call GetOSArch().  This change makes GetOS() use
ToAppcOSArch() so that proper converion will be done when needed.  Also
update the comments for GetArch() and GetOS() to be more clear.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 common/common.go | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/common/common.go b/common/common.go
index 1b2b9c410e..d11b55d6fa 100644
--- a/common/common.go
+++ b/common/common.go
@@ -488,23 +488,28 @@ func GetExitStatus(err error) (int, error) {
 	return -1, err
 }
 
+// GetOS returns the current ACI operating system (linux, windows etc...)
+func GetOS() string {
+	os, _ := GetOSArch()
+	return os
+}
+
+// GetArch returns the current ACI architecture.
+func GetArch() string {
+	_, arch := GetOSArch()
+	return arch
+}
+
 // reference to GOARM, needs to be globally, if in GetArch() function it resolves to zero
 //go:linkname goarm runtime.goarm
 var goarm uint8
 
-// GetArch returns the current architecture. It returns runtime.GOARCH if not on a arm device
-// and armv6l, armv7l, arm64 otherwise
-func GetArch() string {
-	arch := runtime.GOARCH
+func GetOSArch() (os string, arch string) {
+	arch = runtime.GOARCH
 	flavor := ""
 	if arch == "arm" {
 		flavor = strconv.Itoa(int(goarm))
 	}
-	_, arch, _ = types.ToAppcOSArch(GetOS(), arch, flavor)
-	return arch
-}
-
-// GetOS returns the current operating system (linux, windows etc...)
-func GetOS() string {
-	return runtime.GOOS
+	os, arch, _ = types.ToAppcOSArch(runtime.GOOS, arch, flavor)
+	return os, arch
 }

From 8eeaeb584daa52bb889f2d8a8256cc1bf53b4af3 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 17 Jul 2017 09:40:34 -0700
Subject: [PATCH 1145/1304] tests: Fix test program arch problems

Replace hard coded values with calls to common.getOSArch(), common.GetArch()
and common.GetOS().

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 tests/rkt_exec_test.go               |  5 +++--
 tests/rkt_fetch_test.go              | 21 +++++++++++++++++----
 tests/rkt_image_cat_manifest_test.go |  5 +++--
 tests/rkt_image_dependencies_test.go |  4 ++--
 tests/rkt_image_export_test.go       |  5 +++--
 tests/rkt_image_render_test.go       |  5 +++--
 tests/rkt_os_arch_test.go            | 21 ++++++++++++++-------
 7 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 528f9a8b46..e2e0ce9683 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/pkg/aci/acitest"
 	"github.com/rkt/rkt/tests/testutils"
 
@@ -36,8 +37,8 @@ func TestRunOverrideExec(t *testing.T) {
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
 			{"version", "1.27.0"},
-			{"arch", "amd64"},
-			{"os", "linux"},
+			{"arch", common.GetArch()},
+			{"os", common.GetOS()},
 		},
 	}
 
diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 9d338d6641..48282ebef2 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -96,12 +96,18 @@ func TestFetchAny(t *testing.T) {
 
 	defer os.Remove(imagePath)
 
+	aci_os, aci_arch := common.GetOSArch()
+	os_arch := aci_os + "-" + aci_arch
+
 	etcdVersion := "v2.1.2"
 	etcdImage := "coreos.com/etcd:" + etcdVersion
-	etcdURL := "https://github.com/coreos/etcd/releases/download/" + etcdVersion + "/etcd-" + etcdVersion + "-linux-amd64.aci"
+	etcdURL := "https://github.com/coreos/etcd/releases/download/" + etcdVersion + "/etcd-" + etcdVersion + "-" + os_arch + ".aci"
 
 	dockerVersion := "latest"
 	dockerImage := "docker://busybox"
+	if aci_arch != "amd64" {
+		dockerImage = "docker://" + aci_arch + "/busybox"
+	}
 	dockerImageV := dockerImage + ":" + dockerVersion
 
 	tests := []struct {
@@ -548,11 +554,13 @@ func TestDeferredSignatureDownload(t *testing.T) {
 func TestDifferentDiscoveryLabels(t *testing.T) {
 	const imageName = "localhost/rkt-test-different-discovery-labels-image"
 
+	aci_os, aci_arch := common.GetOSArch()
+
 	manifest, err := acitest.ImageManifestString(&schema.ImageManifest{
 		Name: imageName, Labels: types.Labels{
 			{"version", "1.2.0"},
-			{"arch", "amd64"},
-			{"os", "linux"},
+			{"arch", aci_arch},
+			{"os", aci_os},
 		},
 	})
 
@@ -591,13 +599,18 @@ func TestDifferentDiscoveryLabels(t *testing.T) {
 		t.Fatalf("Failed to populate a file list in test aci server: %v", err)
 	}
 
+	other_arch := "armv7b"
+	if aci_arch == "armv7b" {
+		other_arch = "amd64"
+	}
+
 	tests := []struct {
 		imageName       string
 		expectedMessage string
 	}{
 		{imageName + ":2.0", fmt.Sprintf("requested value for label %q: %q differs from fetched aci label value: %q", "version", "2.0", "1.2.0")},
 		{imageName + ":latest", fmt.Sprintf("requested value for label %q: %q differs from fetched aci label value: %q", "version", "latest", "1.2.0")},
-		{imageName + ",arch=armv7b", fmt.Sprintf("requested value for label %q: %q differs from fetched aci label value: %q", "arch", "armv7b", "amd64")},
+		{imageName + ",arch=" + other_arch, fmt.Sprintf("requested value for label %q: %q differs from fetched aci label value: %q", "arch", other_arch, aci_arch)},
 		{imageName + ",unexistinglabel=bla", fmt.Sprintf("requested label %q not provided by the image manifest", "unexistinglabel")},
 	}
 
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 0191686b78..71746a4ce9 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/pkg/aci/acitest"
 	"github.com/rkt/rkt/tests/testutils"
 
@@ -47,8 +48,8 @@ func TestImageCatManifest(t *testing.T) {
 		},
 		Labels: types.Labels{
 			{"version", "1.27.0"},
-			{"arch", "amd64"},
-			{"os", "linux"},
+			{"arch", common.GetArch()},
+			{"os", common.GetOS()},
 		},
 	}
 
diff --git a/tests/rkt_image_dependencies_test.go b/tests/rkt_image_dependencies_test.go
index 4a879ae61e..69ae22d998 100644
--- a/tests/rkt_image_dependencies_test.go
+++ b/tests/rkt_image_dependencies_test.go
@@ -61,8 +61,8 @@ func generateComplexDependencyTree(t *testing.T, ctx *testutils.RktRunCtx) (map[
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"arch", "amd64"},
-			{"os", "linux"},
+			{"arch", common.GetArch()},
+			{"os", common.GetOS()},
 		},
 	}
 
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index d4e2fce5f8..32e7eeb9b1 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -23,6 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/pkg/aci/acitest"
 	"github.com/rkt/rkt/tests/testutils"
 
@@ -46,8 +47,8 @@ func TestImageExport(t *testing.T) {
 		},
 		Labels: types.Labels{
 			{"version", "1.27.0"},
-			{"arch", "amd64"},
-			{"os", "linux"},
+			{"arch", common.GetArch()},
+			{"os", common.GetOS()},
 		},
 	}
 
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index c0919704c6..d15e4c18ff 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -23,6 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/pkg/aci/acitest"
 	"github.com/rkt/rkt/tests/testutils"
 
@@ -56,8 +57,8 @@ func TestImageRender(t *testing.T) {
 		},
 		Labels: types.Labels{
 			{"version", "1.27.0"},
-			{"arch", "amd64"},
-			{"os", "linux"},
+			{"arch", common.GetArch()},
+			{"os", common.GetOS()},
 		},
 	}
 
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 006292f3c8..7e5356b695 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/pkg/aci/acitest"
 	"github.com/rkt/rkt/tests/testutils"
 
@@ -47,6 +48,8 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 
 	defer osArchTestRemoveImages(tests)
 
+	aci_os, aci_arch := common.GetOSArch()
+
 	manifestOSArch := schema.ImageManifest{
 		Name: "coreos.com/rkt-missing-os-arch-test",
 		App: &types.App{
@@ -70,8 +73,8 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 	// Test a valid image as a sanity check
 	manifestOSArch.Labels = append(
 		labels,
-		types.Label{"os", "linux"},
-		types.Label{"arch", "amd64"},
+		types.Label{"os", aci_os},
+		types.Label{"arch", aci_arch},
 	)
 
 	goodManifestFile := "good-manifest.json"
@@ -95,7 +98,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 	tests = append(tests, goodTest)
 
 	// Test an image with a missing os label
-	manifestOSArch.Labels = append(labels, types.Label{"arch", "amd64"})
+	manifestOSArch.Labels = append(labels, types.Label{"arch", aci_arch})
 
 	missingOSManifestFile := "missingOS-manifest.json"
 	missingOSManifestStr, err := acitest.ImageManifestString(&manifestOSArch)
@@ -118,7 +121,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 	tests = append(tests, missingOSTest)
 
 	// Test an image with a missing arch label
-	manifestOSArch.Labels = append(labels, types.Label{"os", "linux"})
+	manifestOSArch.Labels = append(labels, types.Label{"os", aci_os})
 
 	missingArchManifestFile := "missingArch-manifest.json"
 	missingArchManifestStr, err := acitest.ImageManifestString(&manifestOSArch)
@@ -144,7 +147,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 	manifestOSArch.Labels = append(
 		labels,
 		types.Label{"os", "freebsd"},
-		types.Label{"arch", "amd64"},
+		types.Label{"arch", aci_arch},
 	)
 
 	invalidOSManifestFile := "invalid-os-manifest.json"
@@ -165,12 +168,16 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 		expectedLine: `bad os "freebsd"`,
 		expectError:  true,
 	}
-	tests = append(tests, invalidOSTest)
+
+	// only do this test on amd64 since freebsd is not supported on all architectures.
+	if aci_arch == "amd64" {
+		tests = append(tests, invalidOSTest)
+	}
 
 	// Test an image with an invalid arch
 	manifestOSArch.Labels = append(
 		labels,
-		types.Label{"os", "linux"},
+		types.Label{"os", aci_os},
 		types.Label{"arch", "armv5l"},
 	)
 

From db603fd7fe2b65406a12d20cfae3054aad309a67 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 17 Jul 2017 09:40:34 -0700
Subject: [PATCH 1146/1304] tests: Fix TestFetchAny for arm64

arm64 binaries were first released in etcd-v3.2.2.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 tests/rkt_fetch_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rkt_fetch_test.go b/tests/rkt_fetch_test.go
index 48282ebef2..72b677b711 100644
--- a/tests/rkt_fetch_test.go
+++ b/tests/rkt_fetch_test.go
@@ -99,7 +99,7 @@ func TestFetchAny(t *testing.T) {
 	aci_os, aci_arch := common.GetOSArch()
 	os_arch := aci_os + "-" + aci_arch
 
-	etcdVersion := "v2.1.2"
+	etcdVersion := "v3.2.2"
 	etcdImage := "coreos.com/etcd:" + etcdVersion
 	etcdURL := "https://github.com/coreos/etcd/releases/download/" + etcdVersion + "/etcd-" + etcdVersion + "-" + os_arch + ".aci"
 

From b55032074f2073ab0ab2414bd485ab99993613c2 Mon Sep 17 00:00:00 2001
From: Simon Guest <simon.guest@tesujimath.org>
Date: Fri, 16 Jun 2017 14:35:58 +1200
Subject: [PATCH 1147/1304] stage1-fly: preserve environment between run and
 enter

Fly run now writes the app env file, and fly enter reads it.

Fixes #3393.
---
 common/environment.go       |  65 ++++++++++--
 common/environment_test.go  | 200 ++++++++++++++++++++++++++++++++++++
 stage0/app_add.go           |   2 +-
 stage1/init/common/units.go |   2 +-
 stage1_fly/enter/main.go    |  20 +++-
 stage1_fly/run/main.go      |  12 ++-
 tests/rkt_env_test.go       |   2 +-
 7 files changed, 281 insertions(+), 22 deletions(-)
 create mode 100644 common/environment_test.go

diff --git a/common/environment.go b/common/environment.go
index 011f4b647e..d53f124dec 100644
--- a/common/environment.go
+++ b/common/environment.go
@@ -15,9 +15,12 @@
 package common
 
 import (
+	"bufio"
 	"bytes"
 	"fmt"
 	"io/ioutil"
+	"os"
+	"path/filepath"
 
 	"github.com/rkt/rkt/pkg/user"
 
@@ -34,20 +37,20 @@ var defaultEnv = map[string]string{
 	"HOME":    "/root",
 }
 
-// WriteEnvFile creates an environment file for given app name, the minimum
-// required environment variables by the appc spec will be set to sensible
-// defaults here if they're not provided by env.
-func WriteEnvFile(env types.Environment, uidRange *user.UidRange, envFilePath string) error {
+// WriteEnvFile creates an environment file for given app name.  To
+// ensure the minimum required environment variables by the appc spec
+// are set to sensible defaults, env should be the result of calling
+// ComposeEnviron.  The containing directory and its ancestors will be
+// created if necessary.
+func WriteEnvFile(env []string, uidRange *user.UidRange, envFilePath string) error {
 	ef := bytes.Buffer{}
 
-	for dk, dv := range defaultEnv {
-		if _, exists := env.Get(dk); !exists {
-			fmt.Fprintf(&ef, "%s=%s\n", dk, dv)
-		}
+	for _, v := range env {
+		fmt.Fprintf(&ef, "%s\n", v)
 	}
 
-	for _, e := range env {
-		fmt.Fprintf(&ef, "%s=%s\n", e.Name, e.Value)
+	if err := os.MkdirAll(filepath.Dir(envFilePath), 0755); err != nil {
+		return err
 	}
 
 	if err := ioutil.WriteFile(envFilePath, ef.Bytes(), 0644); err != nil {
@@ -60,3 +63,45 @@ func WriteEnvFile(env types.Environment, uidRange *user.UidRange, envFilePath st
 
 	return nil
 }
+
+// ReadEnvFileRaw reads the environment file, returning it as a
+// slice of strings, each expected but not checked to be of the form
+// "key=value".  (The suffix leaves room for a function which parallels
+// WriteEnvFile, which splits each string and has a return type of
+// types.Environment.)
+func ReadEnvFileRaw(envFilePath string) ([]string, error) {
+	var env []string
+	var envFile *os.File
+	var err error
+	if envFile, err = os.Open(envFilePath); err != nil {
+		return nil, err
+	}
+	defer envFile.Close()
+	scanner := bufio.NewScanner(envFile)
+	for scanner.Scan() {
+		env = append(env, scanner.Text())
+	}
+	if err = scanner.Err(); err != nil {
+		return nil, err
+	}
+	return env, nil
+}
+
+// ComposeEnviron formats the environment into a slice of strings,
+// each of the form "key=value".  The minimum required environment
+// variables by the appc spec will be set to sensible defaults here if
+// they're not provided by env.
+func ComposeEnviron(env types.Environment) []string {
+	var composed []string
+
+	for dk, dv := range defaultEnv {
+		if _, exists := env.Get(dk); !exists {
+			composed = append(composed, fmt.Sprintf("%s=%s", dk, dv))
+		}
+	}
+
+	for _, e := range env {
+		composed = append(composed, fmt.Sprintf("%s=%s", e.Name, e.Value))
+	}
+	return composed
+}
diff --git a/common/environment_test.go b/common/environment_test.go
new file mode 100644
index 0000000000..ae50429c22
--- /dev/null
+++ b/common/environment_test.go
@@ -0,0 +1,200 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"fmt"
+	"os"
+	"path"
+	"strings"
+	"testing"
+
+	"github.com/appc/spec/schema/types"
+	"github.com/rkt/rkt/pkg/user"
+)
+
+func addEnvToMap(env types.Environment, m map[string]string) {
+	for _, e := range env {
+		m[e.Name] = e.Value
+	}
+}
+
+func addRawToMap(raw []string, m map[string]string) error {
+	for _, kv := range raw {
+		fields := strings.SplitN(kv, "=", 2)
+		if len(fields) != 2 {
+			return fmt.Errorf("invalid environment string `%s'", kv)
+		}
+		m[fields[0]] = fields[1]
+	}
+	return nil
+}
+
+// add m1 to the map m
+func addMapToMap(m1 map[string]string, m map[string]string) error {
+	for k, v := range m1 {
+		m[k] = v
+	}
+	return nil
+}
+
+func checkEnvMap(expected, actual map[string]string) error {
+	// check they're equal
+	for k0, v0 := range expected {
+		v1, ok := actual[k0]
+		if !ok {
+			return fmt.Errorf("missing environment string for `%s'", k0)
+		}
+		if v1 != v0 {
+			return fmt.Errorf("environment variable `%s' expected `%s', actual `%s'", k0, v0, v1)
+		}
+	}
+	for k1, v1 := range actual {
+		_, ok := expected[k1]
+		if !ok {
+			return fmt.Errorf("unexpected bonus environment variable `%s=%s'", k1, v1)
+		}
+	}
+	return nil
+}
+
+func checkEnv(initial types.Environment, actualRaw []string) error {
+	// determine what we expect
+	expected := make(map[string]string)
+	for k, v := range defaultEnv {
+		expected[k] = v
+	}
+	addEnvToMap(initial, expected)
+
+	// determine what we got
+	actual := make(map[string]string)
+	err := addRawToMap(actualRaw, actual)
+	if err != nil {
+		return err
+	}
+
+	return checkEnvMap(expected, actual)
+}
+
+func writeAndReadEnvFile(env types.Environment) ([]string, error) {
+	tmpFile := path.Join("/tmp", fmt.Sprintf("rkt-common-environment_test%d", os.Getpid()))
+	defer os.Remove(tmpFile)
+	err := WriteEnvFile(ComposeEnviron(env), user.NewBlankUidRange(), tmpFile)
+	if err != nil {
+		return nil, err
+	}
+	return ReadEnvFileRaw(tmpFile)
+}
+
+func TestWriteEnvFile(t *testing.T) {
+	tests := []types.Environment{
+		{},
+		{
+			types.EnvironmentVariable{
+				Name:  "PATH",
+				Value: "/something/stupid/that/will/be/preserved",
+			},
+			types.EnvironmentVariable{
+				Name:  "USER",
+				Value: "511",
+			},
+		},
+		{
+			types.EnvironmentVariable{
+				Name:  "FIRST_NAME",
+				Value: "Zaphod",
+			},
+		},
+	}
+
+	for i, tt := range tests {
+
+		result, err := writeAndReadEnvFile(tt)
+		if err == nil {
+			err = checkEnv(tt, result)
+		}
+		if err != nil {
+			t.Errorf("#%d: %v", i, err)
+		}
+	}
+}
+
+type envAndExpected struct {
+	env      types.Environment
+	expected []string
+}
+
+func checkComposedEnv(expectedRaw, actualRaw []string) error {
+	expected := make(map[string]string)
+
+	// these defaults will get overridden by any actual values
+	addMapToMap(defaultEnv, expected)
+
+	err := addRawToMap(expectedRaw, expected)
+	if err != nil {
+		return err
+	}
+	actual := make(map[string]string)
+	err = addRawToMap(actualRaw, actual)
+	if err != nil {
+		return err
+	}
+	return checkEnvMap(expected, actual)
+}
+
+func TestComposeEnv(t *testing.T) {
+	tests := []envAndExpected{
+		{
+			env:      types.Environment{},
+			expected: nil,
+		},
+		{
+			env: types.Environment{
+				types.EnvironmentVariable{
+					Name:  "PATH",
+					Value: "/something/stupid/that/will/be/preserved",
+				},
+				types.EnvironmentVariable{
+					Name:  "USER",
+					Value: "511",
+				},
+			},
+			expected: []string{
+				"PATH=/something/stupid/that/will/be/preserved",
+				"USER=511",
+			},
+		},
+		{
+			env: types.Environment{
+				types.EnvironmentVariable{
+					Name:  "FIRST_NAME",
+					Value: "Zaphod",
+				},
+			},
+			expected: []string{
+				"FIRST_NAME=Zaphod",
+			},
+		},
+	}
+
+	for i, tt := range tests {
+
+		result := ComposeEnviron(tt.env)
+		err := checkComposedEnv(tt.expected, result)
+		if err != nil {
+			t.Errorf("#%d: %v", i, err)
+		}
+	}
+}
diff --git a/stage0/app_add.go b/stage0/app_add.go
index e3c61c9776..62e14d356a 100644
--- a/stage0/app_add.go
+++ b/stage0/app_add.go
@@ -150,7 +150,7 @@ func AddApp(cfg AddConfig) error {
 	env.Set("AC_APP_NAME", appName.String())
 	envFilePath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "env", appName.String())
 
-	if err := common.WriteEnvFile(env, pcfg.PrivateUsers, envFilePath); err != nil {
+	if err := common.WriteEnvFile(common.ComposeEnviron(env), pcfg.PrivateUsers, envFilePath); err != nil {
 		return err
 	}
 
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index c6267be825..0011cb9837 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -523,7 +523,7 @@ func (uw *UnitWriter) appSystemdUnit(pa *preparedApp, binPath string, opts []*un
 	}
 
 	// Write env file
-	if err := common.WriteEnvFile(pa.env, &uw.p.UidRange, EnvFilePath(uw.p.Root, pa.app.Name)); err != nil {
+	if err := common.WriteEnvFile(common.ComposeEnviron(pa.env), &uw.p.UidRange, EnvFilePath(uw.p.Root, pa.app.Name)); err != nil {
 		uw.err = errwrap.Wrapf("unable to write environment file", err)
 		return nil
 	}
diff --git a/stage1_fly/enter/main.go b/stage1_fly/enter/main.go
index 9e5726ab4d..b22f77cace 100644
--- a/stage1_fly/enter/main.go
+++ b/stage1_fly/enter/main.go
@@ -23,8 +23,11 @@ import (
 	"syscall"
 
 	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
+	"github.com/rkt/rkt/common"
 	rktlog "github.com/rkt/rkt/pkg/log"
 	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
+	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
 	"github.com/rkt/rkt/stage1_fly"
 )
 
@@ -40,7 +43,7 @@ var (
 func init() {
 	flag.BoolVar(&debug, "debug", false, "Run in debug mode")
 	flag.StringVar(&podPid, "pid", "", "Pod PID")
-	flag.StringVar(&appName, "appname", "", "Application (Ignored in rkt fly)")
+	flag.StringVar(&appName, "appname", "", "Application name")
 
 	log, diag, _ = rktlog.NewLogSet("fly-enter", false)
 }
@@ -59,10 +62,9 @@ func getRuntimeApp(pm *schema.PodManifest) (*schema.RuntimeApp, error) {
 	return &pm.Apps[0], nil
 }
 
-func execArgs() error {
+func execArgs(envv []string) error {
 	argv0 := flag.Arg(0)
 	argv := flag.Args()
-	envv := []string{}
 
 	return syscall.Exec(argv0, argv, envv)
 }
@@ -107,6 +109,16 @@ func main() {
 		log.FatalE("failed to lookup process credentials", err)
 	}
 
+	cwd, err := os.Getwd()
+	if err != nil {
+		log.FatalE("Failed to get cwd", err)
+	}
+
+	env, err := common.ReadEnvFileRaw(stage1initcommon.EnvFilePath(cwd, types.ACName(appName)))
+	if err != nil {
+		log.FatalE("Failed to read app env", err)
+	}
+
 	if err := os.Chdir(root); err != nil {
 		log.FatalE("Failed to change to new root", err)
 	}
@@ -124,7 +136,7 @@ func main() {
 	diag.Println("APP:", appName)
 	diag.Println("ARGS:", flag.Args())
 
-	if err := execArgs(); err != nil {
+	if err := execArgs(env); err != nil {
 		log.PrintE("exec failed", err)
 	}
 
diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 3da1aba5c0..2d3b1dc118 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -36,6 +36,7 @@ import (
 	rktlog "github.com/rkt/rkt/pkg/log"
 	"github.com/rkt/rkt/pkg/mountinfo"
 	"github.com/rkt/rkt/pkg/sys"
+	"github.com/rkt/rkt/pkg/user"
 	stage1common "github.com/rkt/rkt/stage1/common"
 	stage1commontypes "github.com/rkt/rkt/stage1/common/types"
 	stage1initcommon "github.com/rkt/rkt/stage1/init/common"
@@ -287,11 +288,6 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		workDir = ra.App.WorkingDirectory
 	}
 
-	env := []string{"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"}
-	for _, e := range ra.App.Environment {
-		env = append(env, e.Name+"="+e.Value)
-	}
-
 	rfs := filepath.Join(common.AppPath(p.Root, ra.Name), "rootfs")
 
 	argFlyMounts, err := evaluateMounts(rfs, string(ra.Name), p)
@@ -458,6 +454,12 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		return 254
 	}
 
+	env := common.ComposeEnviron(ra.App.Environment)
+	if err = common.WriteEnvFile(env, user.NewBlankUidRange(), stage1initcommon.EnvFilePath(p.Root, ra.Name)); err != nil {
+		log.PrintE("can't write env", err)
+		return 254
+	}
+
 	diag.Printf("chroot to %q", rfs)
 	if err := syscall.Chroot(rfs); err != nil {
 		log.PrintE("can't chroot", err)
diff --git a/tests/rkt_env_test.go b/tests/rkt_env_test.go
index 6a15c7a435..e1139bad3f 100644
--- a/tests/rkt_env_test.go
+++ b/tests/rkt_env_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build host coreos src kvm
+// +build host coreos src kvm fly
 
 package main
 

From 35dae383bb1934df0047e16263d979aafdf52174 Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Fri, 16 Jun 2017 16:30:38 -0700
Subject: [PATCH 1148/1304] stage0: status only prints a PID when there is one

A pid file never gets written if systemd never gets to run in stage1.
This can happen if the image had a bad command, i.e.: not in $PATH.

In that case, rkt status will constantly error with:

status: unable to print status: unable to get PID for pod ...

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
---
 Documentation/subcommands/status.md |  4 +++
 rkt/status.go                       | 46 ++++++++++-------------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/Documentation/subcommands/status.md b/Documentation/subcommands/status.md
index c3bab4c186..304fce76ab 100644
--- a/Documentation/subcommands/status.md
+++ b/Documentation/subcommands/status.md
@@ -14,6 +14,10 @@ app-redis=0
 app-etcd=0
 ```
 
+Note that `pid` may not be available shortly after `rkt run`, or `rkt run-prepared`, even when `state=running`.
+
+The `--wait` flags below can be used to wait for a Pod to be running with its pid captured.
+
 If the pod is still running, you can wait for it to finish and then get the status with `rkt status --wait UUID`.
 To wait for the pod to become ready, execute `rkt status --wait-ready`.
 Both options also accept a duration. To wait up to 10 seconds until the pod is finished, execute `rkt status --wait=10s UUID`.
diff --git a/rkt/status.go b/rkt/status.go
index 7b00f669e7..c6ae2e0089 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -203,38 +203,24 @@ func printStatus(p *pkgPod.Pod) error {
 		stdout.Printf("networks=%s", fmtNets(p.Nets))
 	}
 
-	if state == pkgPod.Running || state == pkgPod.Deleting || state == pkgPod.ExitedDeleting || state == pkgPod.Exited || state == pkgPod.ExitedGarbage {
-		var pid int
-		pidCh := make(chan int, 1)
-
-		// Wait slightly because the pid file might not be written yet when the state changes to 'Running'.
-		go func() {
-			for {
-				pid, err := p.Pid()
-				if err == nil {
-					pidCh <- pid
-					return
-				}
-				time.Sleep(time.Millisecond * 100)
-			}
-		}()
-
-		select {
-		case pid = <-pidCh:
-		case <-time.After(time.Second):
-			return fmt.Errorf("unable to get PID for pod %q: %v", p.UUID, err)
-		}
+	if !(state == pkgPod.Running || state == pkgPod.Deleting || state == pkgPod.ExitedDeleting || state == pkgPod.Exited || state == pkgPod.ExitedGarbage) {
+		return nil
+	}
 
-		stdout.Printf("pid=%d\nexited=%t", pid, (state == pkgPod.Exited || state == pkgPod.ExitedGarbage))
+	if pid, err := p.Pid(); err == nil {
+		// the pid file might not be written yet when the state changes to 'Running'
+		// it may also never be written if systemd never executes (e.g.: a bad command)
+		stdout.Printf("pid=%d", pid)
+	}
+	stdout.Printf("exited=%t", (state == pkgPod.Exited || state == pkgPod.ExitedGarbage))
 
-		if state != pkgPod.Running {
-			stats, err := getExitStatuses(p)
-			if err != nil {
-				return fmt.Errorf("unable to get exit statuses for pod %q: %v", p.UUID, err)
-			}
-			for app, stat := range stats {
-				stdout.Printf("app-%s=%d", app, stat)
-			}
+	if state != pkgPod.Running {
+		stats, err := getExitStatuses(p)
+		if err != nil {
+			return fmt.Errorf("unable to get exit statuses for pod %q: %v", p.UUID, err)
+		}
+		for app, stat := range stats {
+			stdout.Printf("app-%s=%d", app, stat)
 		}
 	}
 	return nil

From 55ae320831960176ba961477b523cac8d919bc35 Mon Sep 17 00:00:00 2001
From: Mark Petrovic <mspetrovic@gmail.com>
Date: Mon, 24 Jul 2017 19:08:19 -0700
Subject: [PATCH 1149/1304] docs: update CLI flags in run.md

Added rkt-run options present in rkt 1.27.0 but not present in the run.md markdown.  The entries in markdown have been sorted.

Fixes #3747.
---
 Documentation/subcommands/run.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index c6984d0dde..3b6245dc86 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -387,29 +387,33 @@ This feature will be disabled automatically if the underlying filesystem does no
 
 | Flag | Default | Options | Description |
 | --- | --- | --- | --- |
-| `--user-annotation` | none | annotation add to the app's UserAnnotations field | Set the app's annotations (example: '--user-annotation=foo=bar'). |
 | `--caps-remove` | none | capability to remove (e.g. `--caps-remove=CAP_SYS_CHROOT,CAP_MKNOD`) | Capabilities to remove from the process's capabilities bounding set; all others from the default set will be included. |
 | `--caps-retain` | none | capability to retain (e.g. `--caps-retain=CAP_SYS_ADMIN,CAP_NET_ADMIN`) | Capabilities to retain in the process's capabilities bounding set; all others will be removed. |
 | `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
 | `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times. |
+| `--dns-domain` | none | DNS domain (e.g., `--dns-domain=example.com`) | DNS domain to write in `/etc/resolv.conf`. |
 | `--dns-opt` | none | DNS option | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--environment` | none | environment variables add to the app's environment variables | Set the app's environment variables (example: '--environment=foo=bar'). |
 | `--exec` | none | Path to executable | Override the exec command for the preceding image. |
 | `--group` | root | gid, groupname or file path (e.g. `--group=core`) | Group override for the preceding image. |
+| `--hosts-entry` | none | an /etc/hosts entry within the container (e.g., `--hosts-entry=10.2.1.42=db`) | Entries to add to the pod-wide /etc/hosts. Pass 'host' to use the host's /etc/hosts. |
 | `--hostname` | `rkt-$PODUUID` | A host name | Set pod's host name. |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
 | `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
-| `--user-label` | none | label add to the apps' UserLabels field | Set the app's labels (example: '--user-label=foo=bar'). |
 | `--mds-register` | `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net` as `default`, `default-restricted`, or `host`). |
 | `--memory` | none | Memory units (e.g. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
 | `--mount` | none | Mount syntax (e.g. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
 | `--name` | none | Name of the app | Set the name of the app (example: '--name=foo'). If not set, then the app name default to the image's name |
 | `--net` | `default` | A comma-separated list of networks. (e.g. `--net[=n[:args], ...]`) | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively. |
 | `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
+| `--oom-score-adjust` | none | adjust /proc/$pid/oom_score_adj  | oom-score-adj isolator override. |
 | `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
 | `--port` | none | A port name and number pair | Container port name to expose through host port number. Requires [contained network][contained]. Syntax: `--port=NAME:HOSTPORT` The NAME is that given in the ACI. By convention, Docker containers' EXPOSEd ports are given a name formed from the port number, a hyphen, and the protocol, e.g., `80-tcp`, giving something like `--port=80-tcp:8080`. |
 | `--private-users` | `false` | `true` or `false` | Run within user namespaces. |
+| `--pull-policy` | `new` | `never`, `new`, or `update` | Sets the policy for when to fetch an image. See [image fetching behavior][img-fetch] |
+| `--readonly-rootfs` | none | set root filesystem readonly (e.g., `--readonly-rootfs=true`) | if set, the app's rootfs will be mounted read-only |
+| `--seccomp` | none | filter override (e.g., `--seccomp mode=retain,errno=EPERM,chmod,chown`) | seccomp filter override |
 | `--set-env` | none | An environment variable (e.g. `--set-env=NAME=VALUE`) | An environment variable to set for apps. |
 | `--set-env-file` | none | Path of an environment variables file (e.g. `--set-env-file=/path/to/env/file`) | Environment variables to set for apps. |
 | `--signature` | none | A file path | Local signature file to use in validating the preceding image. |
@@ -418,10 +422,13 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--stage1-name` | none | Image name (e.g. `--stage1-name=coreos.com/rkt/stage1-coreos`) | A name of a stage1 image. Will perform a discovery if the image is not in the store. |
 | `--stage1-path` | none | Absolute or relative path | A path to a stage1 image. |
 | `--stage1-url` | none | URL with protocol | A URL to a stage1 image. HTTP/HTTPS/File/Docker URLs are supported. |
-| `--pull-policy` | `new` | `never`, `new`, or `update` | Sets the policy for when to fetch an image. See [image fetching behavior][img-fetch] |
+| `--supplementary-gids` | none | supplementary group IDs (e.g., `--supplementary-gids=1024,2048`) | supplementary group IDs override for the preceding image |
 | `--user` | none | uid, username or file path (e.g. `--user=core`) | User override for the preceding image. |
+| `--user-annotation` | none | annotation add to the app's UserAnnotations field | Set the app's annotations (example: '--user-annotation=foo=bar'). |
+| `--user-label` | none | label add to the apps' UserLabels field | Set the app's labels (example: '--user-label=foo=bar'). |
 | `--uuid-file-save` | none | A file path | Write out the pod UUID to a file. |
 | `--volume` | none | Volume syntax (e.g. `--volume NAME,kind=KIND,source=PATH,readOnly=BOOL`) | Volumes to make available in the pod. See [Mount Volumes into a Pod](#mount-volumes-into-a-pod). |
+| `--working-dir` | none | working directory override (e.g. `--working-dir=/tmp/bar`) | Override the working directory in the preceding image. |
 
 ## Per-application options
 

From c60f25cda59250b4c2882599ae227de59fd8382a Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Thu, 27 Jul 2017 08:10:58 -0700
Subject: [PATCH 1150/1304] version: bump to v1.28.0

---
 CHANGELOG.md                         | 34 ++++++++++++++++++++++++++++
 Documentation/distributions.md       | 16 ++++++-------
 Documentation/proposals/oci.md       |  6 ++---
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  6 ++---
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 ++---
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 18 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0499c854e2..dd16cb6f8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+## 1.28.0
+
+This release contains changes to the behavior of `rkt run`, `rkt status`, and `rkt fly` to make them more consistent. Two of them need particular attention:
+
+- `rkt status` can now omit the pid field when non-existent. Use `--wait[-ready]` to ensure a pid will be available.
+- the `default[-restricted]` network is not added by default when a custom network is specified with `--net`.
+
+There are also some improvements on documentation and tests working on arm64.
+
+### New features and UX changes
+
+- stage0/status: fix failure when systemd never runs in stage1 ([#3713](https://github.com/rkt/rkt/pull/3713)). This changes the behavior of `rkt status` when a PID is not available: instead of crashing, it will now omit the pid field. Users that need to read the PID shortly after an invocation of `rkt run` should now use the `--wait[-ready]` flag explicitly.
+- **BREAKING** network: do not automatically add `default*` networks when custom ones are specified ([#3685](https://github.com/rkt/rkt/pull/3685)).
+- stage1/fly: preserve environment between run and enter ([#3712](https://github.com/rkt/rkt/pull/3712)). Fly run now writes the app env file, and `fly enter` reads it.
+- stage1/fly: make run/enter honour uid/gid/suppGids ([#3717](https://github.com/rkt/rkt/pull/3717)). Refactored common functionality out of run.
+
+### Bugfixes
+
+- stage1/init/units: keep journald running while apps are shutting down ([#3726](https://github.com/rkt/rkt/pull/3726)). This prevents a race when apps are writing to their stdout/err (and output is being sent to stage1's journal) while shutting down. If journald terminates before the apps finish shutting down, their output will be lost.
+- tests: get functional tests working on arm64 ([#3737](https://github.com/rkt/rkt/pull/3737)). Various arch fixups to get `make check` with a coreos stage1 working on arm64 machines.
+- Fix `--user --group` on arm64 ([#3736](https://github.com/rkt/rkt/pull/3736)). Fixes issue https://github.com/rkt/rkt/issues/3714 (`rkt run --user` fails on arm64).
+
+### Other changes
+
+- docs: update CLI flags in run.md ([#3748](https://github.com/rkt/rkt/pull/3748)). Also added rkt-run options present in rkt 1.27.0 but not present in the run.md markdown.  The entries in markdown have been sorted.
+- tests/net: skip TestNetCustomBridge on semaphore ([#3740](https://github.com/rkt/rkt/pull/3740)). Reference https://github.com/rkt/rkt/issues/3739
+- doc: mention external stage1s ([#3723](https://github.com/rkt/rkt/pull/3723)). This was discussed on:
+https://github.com/rkt/rkt/pull/3645#issuecomment-296865635
+- rkt/pubkeys: print debug logs on discovery errors ([#3705](https://github.com/rkt/rkt/pull/3705)). Thisreorders log-printing and error-returning when pubkeys discovery
+fails, in order to print useful debugging information on error.
+- docs: correct rkt pronunciation ([#3674](https://github.com/rkt/rkt/pull/3674)). `rkt` has an icon of a rocket but previously the official pronunciation was "rock-it" which is incompatible with the logo. This change fixes that.
+- stage0: fix message formatting errors, stale forward-vars ([#3722](https://github.com/rkt/rkt/pull/3722)).
+
+
 ## 1.27.0
 
 This minor release contains bugfixes and other improvements related to the tests and the documentation.
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index fe2505073e..c40d654fd9 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -141,19 +141,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt-1.27.0-1.x86_64.rpm
-wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt-1.27.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.27.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.27.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt-1.28.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt-1.28.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.28.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.28.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt_1.27.0-1_amd64.deb
-wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt_1.27.0-1_amd64.deb.asc
-gpg --verify rkt_1.27.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.27.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt_1.28.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt_1.28.0-1_amd64.deb.asc
+gpg --verify rkt_1.28.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.28.0-1_amd64.deb
 ```
 
 [cl-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index e3a663c1aa..4d6950ea94 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/rkt/rkt/blob/v1.27.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.27.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/rkt/rkt/blob/v1.27.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/rkt/rkt/blob/v1.28.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.28.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/rkt/rkt/blob/v1.28.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index a684a40cbe..f38b0fbc86 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.27.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.28.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.27.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.28.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 03de38cb21..c3089ca60c 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -9,7 +9,7 @@ The KVM stage1 does not yet implement all of the default stage1's features and s
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
 ```
-sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.27.0 docker://redis
+sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.28.0 docker://redis
 ```
 
 This output is the same you'll get if you run a container-based rkt.
@@ -67,7 +67,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.27.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.28.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 
 [build-configure]: build-configure.md
@@ -89,7 +89,7 @@ Additional [Linux kernel's command line parameters](https://www.kernel.org/doc/h
 
 ```
 sudo RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS="systemd.unified_cgroup_hierarchy=true max_loop=12 possible_cpus=1" \
-      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.27.0 \
+      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.28.0 \
       ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 3408411165..6eaf6afaba 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.27.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.28.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.27.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.28.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 031841cc6e..d0149a053e 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.27.0
+rkt Version: 1.28.0
 appc Version: 0.8.10
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 1eaa742eca..b8a63166f4 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/rkt/rkt/releases/download/v1.27.0/rkt-v1.27.0.tar.gz
-tar xzvf rkt-v1.27.0.tar.gz
-cd rkt-v1.27.0
+wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt-v1.28.0.tar.gz
+tar xzvf rkt-v1.28.0.tar.gz
+cd rkt-v1.28.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 60c4f8496e..11767bcbb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.27.0+git], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.28.0], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 04bd18db6a..eb8159dde4 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.27.0"
+version="1.28.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 9a62eda7de..18271088d7 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.27.0"
+            "value": "1.28.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 84612720c9..570dcbfdf5 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.27.0"
+            "value": "1.28.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 546a0a683b..2fa9ab3608 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.27.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.28.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index e2e0ce9683..6a09dcc25c 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -36,7 +36,7 @@ func TestRunOverrideExec(t *testing.T) {
 	noappManifest := schema.ImageManifest{
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
-			{"version", "1.27.0"},
+			{"version", "1.28.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 71746a4ce9..d24f02d2ff 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -47,7 +47,7 @@ func TestImageCatManifest(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.27.0"},
+			{"version", "1.28.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 32e7eeb9b1..34c8063ce0 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -46,7 +46,7 @@ func TestImageExport(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.27.0"},
+			{"version", "1.28.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index d15e4c18ff..8a780f80b8 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -56,7 +56,7 @@ func TestImageRender(t *testing.T) {
 			{ImageName: "coreos.com/rkt-inspect"},
 		},
 		Labels: types.Labels{
-			{"version", "1.27.0"},
+			{"version", "1.28.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 7e5356b695..8b9c025b5f 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -61,7 +61,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"version", "1.27.0"},
+			{"version", "1.28.0"},
 		},
 	}
 

From f60fb07a6d382e2fcdf66001cda38b577de32cb4 Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Thu, 27 Jul 2017 08:10:58 -0700
Subject: [PATCH 1151/1304] version: bump to v1.28.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 11767bcbb7..d02c50c234 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.28.0], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.28.0+git], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 2fa9ab3608..1b9031f5ff 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.28.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.28.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 4ab79e4383031eb21b44eec3df34344660daaf16 Mon Sep 17 00:00:00 2001
From: Marek Ruszczyk <marek.ruszczyk@blablacar.com>
Date: Fri, 28 Jul 2017 17:58:01 +0200
Subject: [PATCH 1152/1304] scripts: update rkt-builder version to 1.3.0

---
 scripts/build-rir.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-rir.sh b/scripts/build-rir.sh
index 996999f0ad..e6e9167662 100755
--- a/scripts/build-rir.sh
+++ b/scripts/build-rir.sh
@@ -4,7 +4,7 @@ set -xe
 
 SRC_DIR="${SRC_DIR:-$PWD}"
 BUILDDIR="${BUILDDIR:-$PWD/build-rir}"
-RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.2.0}"
+RKT_BUILDER_ACI="${RKT_BUILDER_ACI:-coreos.com/rkt/builder:1.3.0}"
 RKT_CMD="${RKT_CMD:-rkt}"
 
 mkdir -p $BUILDDIR

From 6bf0b5799e463c6fd9b2251c0566a8afbedf6f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 1 Aug 2017 11:22:18 +0200
Subject: [PATCH 1153/1304] glide: bump go-systemd to v15

rkt stopped working when running in a service with systemd v234. This
bump includes a fix.
---
 glide.lock                                    |   8 +-
 glide.yaml                                    |   2 +-
 .../coreos/go-systemd/sdjournal/journal.go    |  72 ++++++++-
 .../coreos/go-systemd/sdjournal/read.go       |  53 ++++---
 .../coreos/go-systemd/util/util_cgo.go        |   5 +-
 vendor/golang.org/x/text/gen.go               | 139 ++----------------
 .../golang.org/x/text/transform/transform.go  |  52 +------
 .../x/text/unicode/norm/forminfo.go           |  47 +++---
 .../x/text/unicode/norm/normalize.go          |  36 +----
 .../x/text/unicode/norm/readwriter.go         |   1 +
 vendor/golang.org/x/text/width/transform.go   |  77 ----------
 vendor/golang.org/x/text/width/width.go       |   9 +-
 12 files changed, 150 insertions(+), 351 deletions(-)

diff --git a/glide.lock b/glide.lock
index ad6df47b0d..74f77b0c18 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 5b01507338879a95e4f789cc14dac4aee0ae1ef7661da521a437621e207ba7fa
-updated: 2017-02-13T16:50:01.49078982Z
+hash: 0d70dcd3d02dde6c7f3a493536fb7629dfb18151eaef79fff15fc05439f69674
+updated: 2017-08-01T11:21:48.713539074+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: 4537ee8e3139455eac6092d47a224d8fa19bf08a
@@ -79,7 +79,7 @@ imports:
   subpackages:
   - semver
 - name: github.com/coreos/go-systemd
-  version: 48702e0da86bd25e76cfef347e2adeb434a0d0a6
+  version: d2196463941895ee908e13531a23a39feb9e1243
   subpackages:
   - activation
   - daemon
@@ -278,7 +278,7 @@ imports:
   subpackages:
   - unix
 - name: golang.org/x/text
-  version: 06d6eba81293389cafdff7fca90d75592194b2d9
+  version: 2910a502d2bf9e43193af9d68ca516529614eed3
   subpackages:
   - transform
   - unicode/norm
diff --git a/glide.yaml b/glide.yaml
index b6ca38a781..b6bac47fba 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -78,7 +78,7 @@ import:
   subpackages:
   - semver
 - package: github.com/coreos/go-systemd
-  version: v14
+  version: v15
   subpackages:
   - activation
   - daemon
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/journal.go b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
index b00d606c1a..732a62521a 100644
--- a/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
@@ -47,6 +47,15 @@ package sdjournal
 //   return sd_journal_open_directory(ret, path, flags);
 // }
 //
+// int
+// my_sd_journal_open_files(void *f, sd_journal **ret, const char **paths, int flags)
+// {
+//   int (*sd_journal_open_files)(sd_journal **, const char **, int);
+//
+//   sd_journal_open_files = f;
+//   return sd_journal_open_files(ret, paths, flags);
+// }
+//
 // void
 // my_sd_journal_close(void *f, sd_journal *j)
 // {
@@ -282,6 +291,15 @@ package sdjournal
 //   sd_journal_restart_unique(j);
 // }
 //
+// int
+// my_sd_journal_get_catalog(void *f, sd_journal *j, char **ret)
+// {
+//   int(*sd_journal_get_catalog)(sd_journal *, char **);
+//
+//   sd_journal_get_catalog = f;
+//   return sd_journal_get_catalog(j, ret);
+// }
+//
 import "C"
 import (
 	"bytes"
@@ -396,8 +414,7 @@ func NewJournal() (j *Journal, err error) {
 }
 
 // NewJournalFromDir returns a new Journal instance pointing to a journal residing
-// in a given directory. The supplied path may be relative or absolute; if
-// relative, it will be converted to an absolute path before being opened.
+// in a given directory.
 func NewJournalFromDir(path string) (j *Journal, err error) {
 	j = &Journal{}
 
@@ -417,6 +434,32 @@ func NewJournalFromDir(path string) (j *Journal, err error) {
 	return j, nil
 }
 
+// NewJournalFromFiles returns a new Journal instance pointing to a journals residing
+// in a given files.
+func NewJournalFromFiles(paths ...string) (j *Journal, err error) {
+	j = &Journal{}
+
+	sd_journal_open_files, err := getFunction("sd_journal_open_files")
+	if err != nil {
+		return nil, err
+	}
+
+	// by making the slice 1 elem too long, we guarantee it'll be null-terminated
+	cPaths := make([]*C.char, len(paths)+1)
+	for idx, path := range paths {
+		p := C.CString(path)
+		cPaths[idx] = p
+		defer C.free(unsafe.Pointer(p))
+	}
+
+	r := C.my_sd_journal_open_files(sd_journal_open_files, &j.cjournal, &cPaths[0], 0)
+	if r < 0 {
+		return nil, fmt.Errorf("failed to open journals in paths %q: %d", paths, syscall.Errno(-r))
+	}
+
+	return j, nil
+}
+
 // Close closes a journal opened with NewJournal.
 func (j *Journal) Close() error {
 	sd_journal_close, err := getFunction("sd_journal_close")
@@ -937,7 +980,7 @@ func (j *Journal) Wait(timeout time.Duration) int {
 		// equivalent hex value.
 		to = 0xffffffffffffffff
 	} else {
-		to = uint64(time.Now().Add(timeout).Unix() / 1000)
+		to = uint64(timeout / time.Microsecond)
 	}
 	j.mu.Lock()
 	r := C.my_sd_journal_wait(sd_journal_wait, j.cjournal, C.uint64_t(to))
@@ -1022,3 +1065,26 @@ func (j *Journal) GetUniqueValues(field string) ([]string, error) {
 
 	return result, nil
 }
+
+// GetCatalog retrieves a message catalog entry for the current journal entry.
+func (j *Journal) GetCatalog() (string, error) {
+	sd_journal_get_catalog, err := getFunction("sd_journal_get_catalog")
+	if err != nil {
+		return "", err
+	}
+
+	var c *C.char
+
+	j.mu.Lock()
+	r := C.my_sd_journal_get_catalog(sd_journal_get_catalog, j.cjournal, &c)
+	j.mu.Unlock()
+	defer C.free(unsafe.Pointer(c))
+
+	if r < 0 {
+		return "", fmt.Errorf("failed to retrieve catalog entry for current journal entry: %d", syscall.Errno(-r))
+	}
+
+	catalog := C.GoString(c)
+
+	return catalog, nil
+}
diff --git a/vendor/github.com/coreos/go-systemd/sdjournal/read.go b/vendor/github.com/coreos/go-systemd/sdjournal/read.go
index b581f03b4f..100ee6f8da 100644
--- a/vendor/github.com/coreos/go-systemd/sdjournal/read.go
+++ b/vendor/github.com/coreos/go-systemd/sdjournal/read.go
@@ -185,6 +185,10 @@ func (r *JournalReader) Follow(until <-chan time.Time, writer io.Writer) (err er
 	// Process journal entries and events. Entries are flushed until the tail or
 	// timeout is reached, and then we wait for new events or the timeout.
 	var msg = make([]byte, 64*1<<(10))
+	var waitCh = make(chan int)
+	var waitStop = make(chan bool)
+	defer close(waitStop)
+
 process:
 	for {
 		c, err := r.Read(msg)
@@ -196,43 +200,38 @@ process:
 		case <-until:
 			return ErrExpired
 		default:
-			if c > 0 {
-				if _, err = writer.Write(msg[:c]); err != nil {
-					break process
-				}
-				continue process
+		}
+		if c > 0 {
+			if _, err = writer.Write(msg[:c]); err != nil {
+				break process
 			}
+			continue process
 		}
 
 		// We're at the tail, so wait for new events or time out.
 		// Holds journal events to process. Tightly bounded for now unless there's a
 		// reason to unblock the journal watch routine more quickly.
-		events := make(chan int, 1)
-		pollDone := make(chan bool, 1)
-		go func() {
-			for {
+		for {
+			go func() {
 				select {
-				case <-pollDone:
-					return
+				case <-waitStop:
+				case waitCh <- r.journal.Wait(1 * time.Second):
+				}
+			}()
+
+			select {
+			case <-until:
+				return ErrExpired
+			case e := <-waitCh:
+				switch e {
+				case SD_JOURNAL_NOP:
+					// the journal did not change since the last invocation
+				case SD_JOURNAL_APPEND, SD_JOURNAL_INVALIDATE:
+					continue process
 				default:
-					events <- r.journal.Wait(time.Duration(1) * time.Second)
+					log.Printf("Received unknown event: %d\n", e)
 				}
 			}
-		}()
-
-		select {
-		case <-until:
-			pollDone <- true
-			return ErrExpired
-		case e := <-events:
-			pollDone <- true
-			switch e {
-			case SD_JOURNAL_NOP, SD_JOURNAL_APPEND, SD_JOURNAL_INVALIDATE:
-				// TODO: need to account for any of these?
-			default:
-				log.Printf("Received unknown event: %d\n", e)
-			}
-			continue process
 		}
 	}
 
diff --git a/vendor/github.com/coreos/go-systemd/util/util_cgo.go b/vendor/github.com/coreos/go-systemd/util/util_cgo.go
index 22c0d6099d..6269bc7323 100644
--- a/vendor/github.com/coreos/go-systemd/util/util_cgo.go
+++ b/vendor/github.com/coreos/go-systemd/util/util_cgo.go
@@ -122,11 +122,12 @@ func runningFromSystemService() (ret bool, err error) {
 	errno := C.my_sd_pid_get_owner_uid(sd_pid_get_owner_uid, 0, &uid)
 	serrno := syscall.Errno(-errno)
 	// when we're running from a unit file, sd_pid_get_owner_uid returns
-	// ENOENT (systemd <220) or ENXIO (systemd >=220)
+	// ENOENT (systemd <220), ENXIO (systemd 220-223), or ENODATA
+	// (systemd >=234)
 	switch {
 	case errno >= 0:
 		ret = false
-	case serrno == syscall.ENOENT, serrno == syscall.ENXIO:
+	case serrno == syscall.ENOENT, serrno == syscall.ENXIO, serrno == syscall.ENODATA:
 		// Since the implementation of sessions in systemd relies on
 		// the `pam_systemd` module, using the sd_pid_get_owner_uid
 		// heuristic alone can result in false positives if that module
diff --git a/vendor/golang.org/x/text/gen.go b/vendor/golang.org/x/text/gen.go
index 5d973f08cb..4ed42b814e 100644
--- a/vendor/golang.org/x/text/gen.go
+++ b/vendor/golang.org/x/text/gen.go
@@ -12,14 +12,9 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"go/build"
-	"go/format"
-	"io/ioutil"
 	"os"
 	"os/exec"
-	"path"
 	"path/filepath"
-	"regexp"
 	"runtime"
 	"strings"
 	"sync"
@@ -31,7 +26,6 @@ import (
 var (
 	verbose     = flag.Bool("v", false, "verbose output")
 	force       = flag.Bool("force", false, "ignore failing dependencies")
-	doCore      = flag.Bool("core", false, "force an update to core")
 	excludeList = flag.String("exclude", "",
 		"comma-separated list of packages to exclude")
 
@@ -67,7 +61,6 @@ func main() {
 	// variable. This will prevent duplicate downloads and also will enable long
 	// tests, which really need to be run after each generated package.
 
-	updateCore := *doCore
 	if gen.UnicodeVersion() != unicode.Version {
 		fmt.Printf("Requested Unicode version %s; core unicode version is %s.\n",
 			gen.UnicodeVersion(),
@@ -79,49 +72,26 @@ func main() {
 		if gen.UnicodeVersion() < unicode.Version && !*force {
 			os.Exit(2)
 		}
-		updateCore = true
 	}
-
-	var unicode = &dependency{}
-	if updateCore {
-		fmt.Printf("Updating core to version %s...\n", gen.UnicodeVersion())
-		unicode = generate("unicode")
-
-		// Test some users of the unicode packages, especially the ones that
-		// keep a mirrored table. These may need to be corrected by hand.
-		generate("regexp", unicode)
-		generate("strconv", unicode) // mimics Unicode table
-		generate("strings", unicode)
-		generate("testing", unicode) // mimics Unicode table
-	}
-
 	var (
-		cldr       = generate("./unicode/cldr", unicode)
-		language   = generate("./language", cldr)
-		internal   = generate("./internal", unicode, language)
-		norm       = generate("./unicode/norm", unicode)
-		rangetable = generate("./unicode/rangetable", unicode)
-		cases      = generate("./cases", unicode, norm, language, rangetable)
-		width      = generate("./width", unicode)
-		bidi       = generate("./unicode/bidi", unicode, norm, rangetable)
-		_          = generate("./secure/precis", unicode, norm, rangetable, cases, width, bidi)
-		_          = generate("./encoding/htmlindex", unicode, language)
-		_          = generate("./currency", unicode, cldr, language, internal)
-		_          = generate("./internal/number", unicode, cldr, language, internal)
-		_          = generate("./internal/export/idna", unicode, bidi, norm)
-		_          = generate("./language/display", unicode, cldr, language, internal)
-		_          = generate("./collate", unicode, norm, cldr, language, rangetable)
-		_          = generate("./search", unicode, norm, cldr, language, rangetable)
+		cldr       = generate("unicode/cldr")
+		language   = generate("language", cldr)
+		internal   = generate("internal", language)
+		norm       = generate("unicode/norm")
+		rangetable = generate("unicode/rangetable")
+		cases      = generate("cases", norm, language, rangetable)
+		width      = generate("width")
+		bidi       = generate("unicode/bidi", norm, rangetable)
+		_          = generate("secure/precis", norm, rangetable, cases, width, bidi)
+		_          = generate("encoding/htmlindex", language)
+		_          = generate("currency", cldr, language, internal)
+		_          = generate("internal/number", cldr, language, internal)
+		_          = generate("language/display", cldr, language)
+		_          = generate("collate", norm, cldr, language, rangetable)
+		_          = generate("search", norm, cldr, language, rangetable)
 	)
 	all.Wait()
 
-	// Copy exported packages to the destination golang.org repo.
-	copyExported("golang.org/x/net/idna")
-
-	if updateCore {
-		copyVendored()
-	}
-
 	if hasErrors {
 		fmt.Println("FAIL")
 		os.Exit(1)
@@ -163,7 +133,7 @@ func generate(pkg string, deps ...*dependency) *dependency {
 		if *verbose {
 			args = append(args, "-v")
 		}
-		args = append(args, pkg)
+		args = append(args, "./"+pkg)
 		cmd := exec.Command(filepath.Join(runtime.GOROOT(), "bin", "go"), args...)
 		w := &bytes.Buffer{}
 		cmd.Stderr = w
@@ -193,83 +163,6 @@ func generate(pkg string, deps ...*dependency) *dependency {
 	return &wg
 }
 
-// copyExported copies a package in x/text/internal/export to the
-// destination repository.
-func copyExported(p string) {
-	copyPackage(
-		filepath.Join("internal", "export", path.Base(p)),
-		filepath.Join("..", filepath.FromSlash(p[len("golang.org/x"):])),
-		"golang.org/x/text/internal/export/"+path.Base(p),
-		p)
-}
-
-// copyVendored copies packages used by Go core into the vendored directory.
-func copyVendored() {
-	root := filepath.Join(build.Default.GOROOT, filepath.FromSlash("src/vendor/golang_org/x"))
-
-	err := filepath.Walk(root, func(dir string, info os.FileInfo, err error) error {
-		if err != nil || !info.IsDir() || root == dir {
-			return err
-		}
-		src := dir[len(root)+1:]
-		const slash = string(filepath.Separator)
-		if c := strings.Split(src, slash); c[0] == "text" {
-			// Copy a text repo package from its normal location.
-			src = strings.Join(c[1:], slash)
-		} else {
-			// Copy the vendored package if it exists in the export directory.
-			src = filepath.Join("internal", "export", filepath.Base(src))
-		}
-		copyPackage(src, dir, "golang.org", "golang_org")
-		return nil
-	})
-	if err != nil {
-		fmt.Printf("Seeding directory %s has failed %v:", root, err)
-		os.Exit(1)
-	}
-}
-
-// goGenRE is used to remove go:generate lines.
-var goGenRE = regexp.MustCompile("//go:generate[^\n]*\n")
-
-// copyPackage copies relevant files from a directory in x/text to the
-// destination package directory. The destination package is assumed to have
-// the same name. For each copied file go:generate lines are removed and
-// and package comments are rewritten to the new path.
-func copyPackage(dirSrc, dirDst, search, replace string) {
-	err := filepath.Walk(dirSrc, func(file string, info os.FileInfo, err error) error {
-		base := filepath.Base(file)
-		if err != nil || info.IsDir() ||
-			!strings.HasSuffix(base, ".go") ||
-			strings.HasSuffix(base, "_test.go") ||
-			// Don't process subdirectories.
-			filepath.Dir(file) != dirSrc {
-			return nil
-		}
-		b, err := ioutil.ReadFile(file)
-		if err != nil || bytes.Contains(b, []byte("\n// +build ignore")) {
-			return err
-		}
-		// Fix paths.
-		b = bytes.Replace(b, []byte(search), []byte(replace), -1)
-		// Remove go:generate lines.
-		b = goGenRE.ReplaceAllLiteral(b, nil)
-		const comment = "// Copied from the golang.org/x/text repo; DO NOT EDIT\n\n"
-		b = append([]byte(comment), b...)
-		if b, err = format.Source(b); err != nil {
-			fmt.Println("Failed to format file:", err)
-			os.Exit(1)
-		}
-		file = filepath.Join(dirDst, base)
-		vprintf("=== COPY %s\n", file)
-		return ioutil.WriteFile(file, b, 0666)
-	})
-	if err != nil {
-		fmt.Println("Copying exported files failed:", err)
-		os.Exit(1)
-	}
-}
-
 func contains(a []string, s string) bool {
 	for _, e := range a {
 		if s == e {
diff --git a/vendor/golang.org/x/text/transform/transform.go b/vendor/golang.org/x/text/transform/transform.go
index fe47b9b35f..0c2f730ea0 100644
--- a/vendor/golang.org/x/text/transform/transform.go
+++ b/vendor/golang.org/x/text/transform/transform.go
@@ -24,10 +24,6 @@ var (
 	// complete the transformation.
 	ErrShortSrc = errors.New("transform: short source buffer")
 
-	// ErrEndOfSpan means that the input and output (the transformed input)
-	// are not identical.
-	ErrEndOfSpan = errors.New("transform: input and output are not identical")
-
 	// errInconsistentByteCount means that Transform returned success (nil
 	// error) but also returned nSrc inconsistent with the src argument.
 	errInconsistentByteCount = errors.New("transform: inconsistent byte count returned")
@@ -64,41 +60,6 @@ type Transformer interface {
 	Reset()
 }
 
-// SpanningTransformer extends the Transformer interface with a Span method
-// that determines how much of the input already conforms to the Transformer.
-type SpanningTransformer interface {
-	Transformer
-
-	// Span returns a position in src such that transforming src[:n] results in
-	// identical output src[:n] for these bytes. It does not necessarily return
-	// the largest such n. The atEOF argument tells whether src represents the
-	// last bytes of the input.
-	//
-	// Callers should always account for the n bytes consumed before
-	// considering the error err.
-	//
-	// A nil error means that all input bytes are known to be identical to the
-	// output produced by the Transformer. A nil error can be be returned
-	// regardless of whether atEOF is true. If err is nil, then then n must
-	// equal len(src); the converse is not necessarily true.
-	//
-	// ErrEndOfSpan means that the Transformer output may differ from the
-	// input after n bytes. Note that n may be len(src), meaning that the output
-	// would contain additional bytes after otherwise identical output.
-	// ErrShortSrc means that src had insufficient data to determine whether the
-	// remaining bytes would change. Other than the error conditions listed
-	// here, implementations are free to report other errors that arise.
-	//
-	// Calling Span can modify the Transformer state as a side effect. In
-	// effect, it does the transformation just as calling Transform would, only
-	// without copying to a destination buffer and only up to a point it can
-	// determine the input and output bytes are the same. This is obviously more
-	// limited than calling Transform, but can be more efficient in terms of
-	// copying and allocating buffers. Calls to Span and Transform may be
-	// interleaved.
-	Span(src []byte, atEOF bool) (n int, err error)
-}
-
 // NopResetter can be embedded by implementations of Transformer to add a nop
 // Reset method.
 type NopResetter struct{}
@@ -317,10 +278,6 @@ func (nop) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	return n, n, err
 }
 
-func (nop) Span(src []byte, atEOF bool) (n int, err error) {
-	return len(src), nil
-}
-
 type discard struct{ NopResetter }
 
 func (discard) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
@@ -332,8 +289,8 @@ var (
 	// by consuming all bytes and writing nothing.
 	Discard Transformer = discard{}
 
-	// Nop is a SpanningTransformer that copies src to dst.
-	Nop SpanningTransformer = nop{}
+	// Nop is a Transformer that copies src to dst.
+	Nop Transformer = nop{}
 )
 
 // chain is a sequence of links. A chain with N Transformers has N+1 links and
@@ -401,8 +358,6 @@ func (c *chain) Reset() {
 	}
 }
 
-// TODO: make chain use Span (is going to be fun to implement!)
-
 // Transform applies the transformers of c in sequence.
 func (c *chain) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	// Set up src and dst in the chain.
@@ -493,7 +448,8 @@ func (c *chain) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err erro
 	return dstL.n, srcL.p, err
 }
 
-// Deprecated: use runes.Remove instead.
+// RemoveFunc returns a Transformer that removes from the input all runes r for
+// which f(r) is true. Illegal bytes in the input are replaced by RuneError.
 func RemoveFunc(f func(r rune) bool) Transformer {
 	return removeF(f)
 }
diff --git a/vendor/golang.org/x/text/unicode/norm/forminfo.go b/vendor/golang.org/x/text/unicode/norm/forminfo.go
index 8c78b15c79..15a67c653a 100644
--- a/vendor/golang.org/x/text/unicode/norm/forminfo.go
+++ b/vendor/golang.org/x/text/unicode/norm/forminfo.go
@@ -56,31 +56,28 @@ type formInfo struct {
 	nextMain                 iterFunc
 }
 
-var formTable = []*formInfo{{
-	form:          NFC,
-	composing:     true,
-	compatibility: false,
-	info:          lookupInfoNFC,
-	nextMain:      nextComposed,
-}, {
-	form:          NFD,
-	composing:     false,
-	compatibility: false,
-	info:          lookupInfoNFC,
-	nextMain:      nextDecomposed,
-}, {
-	form:          NFKC,
-	composing:     true,
-	compatibility: true,
-	info:          lookupInfoNFKC,
-	nextMain:      nextComposed,
-}, {
-	form:          NFKD,
-	composing:     false,
-	compatibility: true,
-	info:          lookupInfoNFKC,
-	nextMain:      nextDecomposed,
-}}
+var formTable []*formInfo
+
+func init() {
+	formTable = make([]*formInfo, 4)
+
+	for i := range formTable {
+		f := &formInfo{}
+		formTable[i] = f
+		f.form = Form(i)
+		if Form(i) == NFKD || Form(i) == NFKC {
+			f.compatibility = true
+			f.info = lookupInfoNFKC
+		} else {
+			f.info = lookupInfoNFC
+		}
+		f.nextMain = nextDecomposed
+		if Form(i) == NFC || Form(i) == NFKC {
+			f.nextMain = nextComposed
+			f.composing = true
+		}
+	}
+}
 
 // We do not distinguish between boundaries for NFC, NFD, etc. to avoid
 // unexpected behavior for the user.  For example, in NFD, there is a boundary
diff --git a/vendor/golang.org/x/text/unicode/norm/normalize.go b/vendor/golang.org/x/text/unicode/norm/normalize.go
index bba8ce9f95..eb5596f86a 100644
--- a/vendor/golang.org/x/text/unicode/norm/normalize.go
+++ b/vendor/golang.org/x/text/unicode/norm/normalize.go
@@ -8,11 +8,7 @@
 // Package norm contains types and functions for normalizing Unicode strings.
 package norm // import "golang.org/x/text/unicode/norm"
 
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/transform"
-)
+import "unicode/utf8"
 
 // A Form denotes a canonical representation of Unicode code points.
 // The Unicode-defined normalization and equivalence forms are:
@@ -267,34 +263,6 @@ func (f Form) QuickSpan(b []byte) int {
 	return n
 }
 
-// Span implements transform.SpanningTransformer. It returns a boundary n such
-// that b[0:n] == f(b[0:n]). It is not guaranteed to return the largest such n.
-func (f Form) Span(b []byte, atEOF bool) (n int, err error) {
-	n, ok := formTable[f].quickSpan(inputBytes(b), 0, len(b), atEOF)
-	if n < len(b) {
-		if !ok {
-			err = transform.ErrEndOfSpan
-		} else {
-			err = transform.ErrShortSrc
-		}
-	}
-	return n, err
-}
-
-// SpanString returns a boundary n such that s[0:n] == f(s[0:n]).
-// It is not guaranteed to return the largest such n.
-func (f Form) SpanString(s string, atEOF bool) (n int, err error) {
-	n, ok := formTable[f].quickSpan(inputString(s), 0, len(s), atEOF)
-	if n < len(s) {
-		if !ok {
-			err = transform.ErrEndOfSpan
-		} else {
-			err = transform.ErrShortSrc
-		}
-	}
-	return n, err
-}
-
 // quickSpan returns a boundary n such that src[0:n] == f(src[0:n]) and
 // whether any non-normalized parts were found. If atEOF is false, n will
 // not point past the last segment if this segment might be become
@@ -353,7 +321,7 @@ func (f *formInfo) quickSpan(src input, i, end int, atEOF bool) (n int, ok bool)
 	return lastSegStart, false
 }
 
-// QuickSpanString returns a boundary n such that s[0:n] == f(s[0:n]).
+// QuickSpanString returns a boundary n such that b[0:n] == f(s[0:n]).
 // It is not guaranteed to return the largest such n.
 func (f Form) QuickSpanString(s string) int {
 	n, _ := formTable[f].quickSpan(inputString(s), 0, len(s), true)
diff --git a/vendor/golang.org/x/text/unicode/norm/readwriter.go b/vendor/golang.org/x/text/unicode/norm/readwriter.go
index d926ee903e..4fa0e04b21 100644
--- a/vendor/golang.org/x/text/unicode/norm/readwriter.go
+++ b/vendor/golang.org/x/text/unicode/norm/readwriter.go
@@ -112,6 +112,7 @@ func (r *normReader) Read(p []byte) (int, error) {
 			}
 		}
 	}
+	panic("should not reach here")
 }
 
 // Reader returns a new reader that implements Read
diff --git a/vendor/golang.org/x/text/width/transform.go b/vendor/golang.org/x/text/width/transform.go
index 0049f700a2..2ed25096ac 100644
--- a/vendor/golang.org/x/text/width/transform.go
+++ b/vendor/golang.org/x/text/width/transform.go
@@ -14,32 +14,6 @@ type foldTransform struct {
 	transform.NopResetter
 }
 
-func (foldTransform) Span(src []byte, atEOF bool) (n int, err error) {
-	for n < len(src) {
-		if src[n] < utf8.RuneSelf {
-			// ASCII fast path.
-			for n++; n < len(src) && src[n] < utf8.RuneSelf; n++ {
-			}
-			continue
-		}
-		v, size := trie.lookup(src[n:])
-		if size == 0 { // incomplete UTF-8 encoding
-			if !atEOF {
-				err = transform.ErrShortSrc
-			} else {
-				n = len(src)
-			}
-			break
-		}
-		if elem(v)&tagNeedsFold != 0 {
-			err = transform.ErrEndOfSpan
-			break
-		}
-		n += size
-	}
-	return n, err
-}
-
 func (foldTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	for nSrc < len(src) {
 		if src[nSrc] < utf8.RuneSelf {
@@ -96,33 +70,6 @@ type narrowTransform struct {
 	transform.NopResetter
 }
 
-func (narrowTransform) Span(src []byte, atEOF bool) (n int, err error) {
-	for n < len(src) {
-		if src[n] < utf8.RuneSelf {
-			// ASCII fast path.
-			for n++; n < len(src) && src[n] < utf8.RuneSelf; n++ {
-			}
-			continue
-		}
-		v, size := trie.lookup(src[n:])
-		if size == 0 { // incomplete UTF-8 encoding
-			if !atEOF {
-				err = transform.ErrShortSrc
-			} else {
-				n = len(src)
-			}
-			break
-		}
-		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianFullwidth && k != EastAsianWide && k != EastAsianAmbiguous {
-		} else {
-			err = transform.ErrEndOfSpan
-			break
-		}
-		n += size
-	}
-	return n, err
-}
-
 func (narrowTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	for nSrc < len(src) {
 		if src[nSrc] < utf8.RuneSelf {
@@ -179,30 +126,6 @@ type wideTransform struct {
 	transform.NopResetter
 }
 
-func (wideTransform) Span(src []byte, atEOF bool) (n int, err error) {
-	for n < len(src) {
-		// TODO: Consider ASCII fast path. Special-casing ASCII handling can
-		// reduce the ns/op of BenchmarkWideASCII by about 30%. This is probably
-		// not enough to warrant the extra code and complexity.
-		v, size := trie.lookup(src[n:])
-		if size == 0 { // incomplete UTF-8 encoding
-			if !atEOF {
-				err = transform.ErrShortSrc
-			} else {
-				n = len(src)
-			}
-			break
-		}
-		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianHalfwidth && k != EastAsianNarrow {
-		} else {
-			err = transform.ErrEndOfSpan
-			break
-		}
-		n += size
-	}
-	return n, err
-}
-
 func (wideTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	for nSrc < len(src) {
 		// TODO: Consider ASCII fast path. Special-casing ASCII handling can
diff --git a/vendor/golang.org/x/text/width/width.go b/vendor/golang.org/x/text/width/width.go
index f1639ca68a..dc026eef6b 100644
--- a/vendor/golang.org/x/text/width/width.go
+++ b/vendor/golang.org/x/text/width/width.go
@@ -153,22 +153,17 @@ func (p Properties) Wide() rune {
 
 // Transformer implements the transform.Transformer interface.
 type Transformer struct {
-	t transform.SpanningTransformer
+	t transform.Transformer
 }
 
 // Reset implements the transform.Transformer interface.
 func (t Transformer) Reset() { t.t.Reset() }
 
-// Transform implements the transform.Transformer interface.
+// Transform implements the Transformer interface.
 func (t Transformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	return t.t.Transform(dst, src, atEOF)
 }
 
-// Span implements the transform.SpanningTransformer interface.
-func (t Transformer) Span(src []byte, atEOF bool) (n int, err error) {
-	return t.t.Span(src, atEOF)
-}
-
 // Bytes returns a new byte slice with the result of applying t to b.
 func (t Transformer) Bytes(b []byte) []byte {
 	b, _, _ = transform.Bytes(t, b)

From 3abde24bc284b7ded5784c56b4e8184c28999641 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Tue, 1 Aug 2017 12:18:56 +0000
Subject: [PATCH 1154/1304] version: bump to v1.28.1

---
 CHANGELOG.md                         |  8 ++++++++
 Documentation/distributions.md       | 16 ++++++++--------
 Documentation/proposals/oci.md       |  6 +++---
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  6 +++---
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 18 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd16cb6f8a..2b2157c425 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.28.1
+
+This is a minor bugfix release. It does not contain any changes to the rkt code, but it updates dependencies and runtime versions for bugfixes:
+
+- vendor: update go-systemd to v15 ([#3759](https://github.com/rkt/rkt/pull/3759)). rkt stopped working when running in a service with systemd v234. This update fixes it.
+- scripts: update rkt-builder version to 1.3.0 ([#3754](https://github.com/rkt/rkt/pull/3754)). This updates the default Go runtime to 1.8, fixing [#3738](https://github.com/rkt/rkt/issues/3738).
+
+
 ## 1.28.0
 
 This release contains changes to the behavior of `rkt run`, `rkt status`, and `rkt fly` to make them more consistent. Two of them need particular attention:
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index c40d654fd9..457b963c4a 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -141,19 +141,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt-1.28.0-1.x86_64.rpm
-wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt-1.28.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.28.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.28.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt-1.28.1-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt-1.28.1-1.x86_64.rpm.asc
+gpg --verify rkt-1.28.1-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.28.1-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt_1.28.0-1_amd64.deb
-wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt_1.28.0-1_amd64.deb.asc
-gpg --verify rkt_1.28.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.28.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt_1.28.1-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt_1.28.1-1_amd64.deb.asc
+gpg --verify rkt_1.28.1-1_amd64.deb.asc
+sudo dpkg -i rkt_1.28.1-1_amd64.deb
 ```
 
 [cl-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 4d6950ea94..a014e2aec8 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/rkt/rkt/blob/v1.28.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.28.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/rkt/rkt/blob/v1.28.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/rkt/rkt/blob/v1.28.1/Documentation/app-container.md
+[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.28.1/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/rkt/rkt/blob/v1.28.1/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index f38b0fbc86..c05808d435 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.28.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.28.1+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.28.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.28.1 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index c3089ca60c..922961757b 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -9,7 +9,7 @@ The KVM stage1 does not yet implement all of the default stage1's features and s
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
 ```
-sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.28.0 docker://redis
+sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.28.1 docker://redis
 ```
 
 This output is the same you'll get if you run a container-based rkt.
@@ -67,7 +67,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.28.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.28.1+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 
 [build-configure]: build-configure.md
@@ -89,7 +89,7 @@ Additional [Linux kernel's command line parameters](https://www.kernel.org/doc/h
 
 ```
 sudo RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS="systemd.unified_cgroup_hierarchy=true max_loop=12 possible_cpus=1" \
-      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.28.0 \
+      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.28.1 \
       ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 6eaf6afaba..3b816dd452 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.28.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.28.1
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.28.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.28.1
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index d0149a053e..50a87e9cb8 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.28.0
+rkt Version: 1.28.1
 appc Version: 0.8.10
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index b8a63166f4..aec97d233e 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/rkt/rkt/releases/download/v1.28.0/rkt-v1.28.0.tar.gz
-tar xzvf rkt-v1.28.0.tar.gz
-cd rkt-v1.28.0
+wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt-v1.28.1.tar.gz
+tar xzvf rkt-v1.28.1.tar.gz
+cd rkt-v1.28.1
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index d02c50c234..474a47877e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.28.0+git], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.28.1], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index eb8159dde4..6e934a8f01 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.28.0"
+version="1.28.1"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 18271088d7..ac6eaf1727 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.28.0"
+            "value": "1.28.1"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 570dcbfdf5..59055cfede 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.28.0"
+            "value": "1.28.1"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 1b9031f5ff..759f877627 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.28.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.28.1/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 6a09dcc25c..aba757137b 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -36,7 +36,7 @@ func TestRunOverrideExec(t *testing.T) {
 	noappManifest := schema.ImageManifest{
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
-			{"version", "1.28.0"},
+			{"version", "1.28.1"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index d24f02d2ff..7d98c51f22 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -47,7 +47,7 @@ func TestImageCatManifest(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.28.0"},
+			{"version", "1.28.1"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 34c8063ce0..617f01b798 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -46,7 +46,7 @@ func TestImageExport(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.28.0"},
+			{"version", "1.28.1"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 8a780f80b8..7d60310abd 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -56,7 +56,7 @@ func TestImageRender(t *testing.T) {
 			{ImageName: "coreos.com/rkt-inspect"},
 		},
 		Labels: types.Labels{
-			{"version", "1.28.0"},
+			{"version", "1.28.1"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 8b9c025b5f..a98dc330fe 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -61,7 +61,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"version", "1.28.0"},
+			{"version", "1.28.1"},
 		},
 	}
 

From a5bd2a80877a365681f83086f1a1aef2130287b4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Tue, 1 Aug 2017 12:18:57 +0000
Subject: [PATCH 1155/1304] version: bump to v1.28.1+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 474a47877e..ca346a5590 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.28.1], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.28.1+git], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 759f877627..1e60345579 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.28.1/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.28.1+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 8c88f69e3ddb6ef7e576ec2f2bf607b28a181e68 Mon Sep 17 00:00:00 2001
From: Fabio Kung <fabio.kung@gmail.com>
Date: Wed, 2 Aug 2017 11:06:37 -0700
Subject: [PATCH 1156/1304] src flavor: copy the real libnss_files.so.2 file
 from the host

The makelib scripts were copying a symbolic link instead of the real
shared library file.

Signed-off-by: Fabio Kung <fkung@netflix.com>
---
 stage1/usr_from_src/libnss.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/stage1/usr_from_src/libnss.mk b/stage1/usr_from_src/libnss.mk
index 328480a12d..ca62f2b6dd 100644
--- a/stage1/usr_from_src/libnss.mk
+++ b/stage1/usr_from_src/libnss.mk
@@ -10,11 +10,10 @@ UFSN_ACI_LIB_PATH := $(S1_RF_ACIROOTFSDIR)$(UFSN_LIB_PATH)
 UFSN_LIBNSS_FILES_PATH := $(UFSN_LIB_PATH)/$(UFSN_LIBNSS_FILES_LINK)
 UFSN_LIBNSS_FILES_REALPATH := $(shell realpath $(UFSN_LIBNSS_FILES_PATH))
 UFSN_LIBNSS_FILES := $(shell basename $(UFSN_LIBNSS_FILES_REALPATH))
-
 UFSN_LIBNSS_FILES_ON_ACI := $(UFSN_ACI_LIB_PATH)/$(UFSN_LIBNSS_FILES)
 
 S1_RF_SECONDARY_STAMPS += $(UFSN_STAMP)
-S1_RF_INSTALL_FILES += $(UFSN_LIBNSS_FILES_PATH):$(UFSN_LIBNSS_FILES_ON_ACI):-
+S1_RF_INSTALL_FILES += $(UFSN_LIBNSS_FILES_REALPATH):$(UFSN_LIBNSS_FILES_ON_ACI):-
 S1_RF_INSTALL_SYMLINKS += $(UFSN_LIBNSS_FILES):$(UFSN_ACI_LIB_PATH)/$(UFSN_LIBNSS_FILES_LINK)
 
 $(call generate-stamp-rule,$(UFSN_STAMP),$(UFSN_LIBNSS_FILES_ON_ACI),$(UFSN_ACI_LIB_PATH)/$(UFSN_LIBNSS_FILES_LINK))

From 0101b86c28b0faed4b8957f19b315fb1a276e401 Mon Sep 17 00:00:00 2001
From: Simon Guest <simon.guest@tesujimath.org>
Date: Thu, 3 Aug 2017 09:09:53 +1200
Subject: [PATCH 1157/1304] RPM/deb package can upgrade even if running pods.

Fixes #3762.
---
 scripts/pkg/build-pkgs.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/pkg/build-pkgs.sh b/scripts/pkg/build-pkgs.sh
index 445c6d2029..b389a3c40f 100755
--- a/scripts/pkg/build-pkgs.sh
+++ b/scripts/pkg/build-pkgs.sh
@@ -86,7 +86,6 @@ fpm -s dir -t deb \
 	--after-remove $workdir/after-remove \
 	--before-remove $workdir/before-remove \
 	--after-upgrade $workdir/after-install \
-	--before-upgrade $workdir/before-remove \
     --license "$LICENSE" --vendor "$VENDOR" --url "$HOMEPAGE" -m "$MAINTAINER" --category utils \
     -d adduser \
     -d dbus \
@@ -103,7 +102,6 @@ fpm -s dir -t rpm \
 	--after-remove $workdir/after-remove \
 	--before-remove $workdir/before-remove \
 	--after-upgrade $workdir/after-install \
-	--before-upgrade $workdir/before-remove \
     --license "$LICENSE" --vendor "$VENDOR" --url "$HOMEPAGE" -m "$MAINTAINER" --category utils \
     --provides rkt \
     -d 'shadow-utils' \

From 02bdc057f3eae705b403f2bdc39f511cc0bf9761 Mon Sep 17 00:00:00 2001
From: Fabio Kung <fkung@netflix.com>
Date: Thu, 3 Aug 2017 16:03:59 -0700
Subject: [PATCH 1158/1304] stage1: fix systemd version fmt in error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous version caused cryptic error messages. E.g. for
systemdVersion == 231:

"stage1 systemd ç does not support attachable I/O"

Signed-off-by: Fabio Kung <fkung@netflix.com>
---
 stage1/init/common/units.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 0011cb9837..5577630e93 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -226,7 +226,7 @@ func (uw *UnitWriter) SetupAppIO(p *stage1commontypes.Pod, ra *schema.RuntimeApp
 		((flavor == "coreos" || flavor == "kvm") && systemdVersion < 231) {
 		// Explicit error if systemd is too old for attaching
 		if stdin != "" || stdout != "" || stderr != "" {
-			uw.err = fmt.Errorf("stage1 systemd %q does not support attachable I/O", systemdVersion)
+			uw.err = fmt.Errorf("stage1 systemd %d does not support attachable I/O", systemdVersion)
 			return opts
 		}
 		opts = append(opts, unit.NewUnitOption("Service", "StandardInput", "null"))

From ca8e5f5930d1f413c67617e7d1f9500e312d5256 Mon Sep 17 00:00:00 2001
From: Fabio Kung <fkung@netflix.com>
Date: Fri, 4 Aug 2017 21:54:33 -0700
Subject: [PATCH 1159/1304] stage1 build: make target installing units can not
 remove the ACI dir

This can cause the build to fail for some flavors, as the unit
generation targets can delete the stage1/aci rootfs being built after
some other make targets responsible for setting it up execute (e.g.:
stage1/aci and stage1/usr_from_src/stdlibdirs.mk), effectively undoing
everything other targets may have already done.

Signed-off-by: Fabio Kung <fkung@netflix.com>
---
 stage1/units/units-install.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/stage1/units/units-install.mk b/stage1/units/units-install.mk
index 900e008cf0..e865d4bf0c 100644
--- a/stage1/units/units-install.mk
+++ b/stage1/units/units-install.mk
@@ -78,8 +78,8 @@ $(call generate-stamp-rule,$(UNI_STAMP),$(UNI_COPY_STAMP) $(UNI_UNIT_TARGET_DEPS
 # this stamp makes sure that everything is copied
 $(call generate-stamp-rule,$(UNI_COPY_STAMP),$(UNI_UNITS),$(UNI_SYMLINKS) $(UNI_UNIT_DIRS))
 
-# this removes the ACI rootfs directory
-$(call generate-rm-dir-rule,$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_ACIROOTFSDIR))
+# this cleans up the units directory in the ACI rootfs
+$(call generate-rm-dir-rule,$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_UNITDIR))
 
 STAGE1_INSTALL_FILES_$(UNI_FLAVOR) += $(UNI_INSTALL_FILES_TRIPLETS)
 STAGE1_INSTALL_DIRS_$(UNI_FLAVOR) += $(UNI_INSTALL_DIRS_PAIRS)
@@ -95,19 +95,19 @@ STAGE1_SECONDARY_STAMPS_$(UNI_FLAVOR) += $(UNI_STAMP)
 # This filelist of all target unit files can be generated any time.
 $(call generate-shallow-filelist,$(UNI_UNIT_TARGET_FILELIST),$(UNI_SRC_UNITDIR),.target)
 # This dep.mk can be generated only after the filelist above was
-# generated. Will trigger removing of the ACI rootfs directory in all
+# generated. Will trigger removing of the units directory in all
 # ACI rootfses if target unit files change.
 $(call generate-glob-deps,$(UNI_UNIT_TARGET_DEPS_STAMP),$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_UNIT_TARGET_DEPMK),.target,$(UNI_UNIT_TARGET_FILELIST),$(UNI_SRC_UNITDIR),normal)
 
 # This filelist of all service unit files can be generated any time.
 $(call generate-shallow-filelist,$(UNI_UNIT_SERVICE_FILELIST),$(UNI_SRC_UNITDIR),.service)
 # This dep.mk can be generated only after the filelist above was
-# generated. Will trigger removing of the ACI rootfs directory in all
+# generated. Will trigger removing of the units directory in all
 # ACI rootfses if service unit files change.
 $(call generate-glob-deps,$(UNI_UNIT_SERVICE_DEPS_STAMP),$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_UNIT_SERVICE_DEPMK),.service,$(UNI_UNIT_SERVICE_FILELIST),$(UNI_SRC_UNITDIR),normal)
 
-# This dep.mk will force the removal of the ACI rootfs directory if
-# any symlink to be created changes.
+# This dep.mk will force the removal of the units directory in the
+# ACI rootfs if any symlink to be created changes.
 $(call generate-kv-deps,$(UNI_UNIT_SYMLINKS_KV_DEPS_STAMP),$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_UNIT_SYMLINKS_KV_DEPMK),UNI_SYMLINK_TARGETS UNI_SYMLINK_FILENAMES)
 
 $(call undefine-namespaces,UNI)

From 1179771b093a668fef65beaa8c23bb7000430129 Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Thu, 20 Jul 2017 14:50:11 -0700
Subject: [PATCH 1160/1304] stage1-usr: Support local systemd source for
 offline builds

Local systemd source trees are useful here for packagers to build
usr_from_src without requiring network access.  This differentiates
between local and remote systemd sources by checking if the value
from ./configure contains "://".  If the string is found, the build
will preserve existing behavior.  If not, the value is interpreted
as the source directory path on the build system.
---
 configure.ac                        |  8 ++++----
 stage1/usr_from_src/usr_from_src.mk | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index ca346a5590..6cf393aa3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,7 @@ AC_ARG_WITH(stage1-default-images-directory,
 
 AC_ARG_WITH([stage1-systemd-src],
             [AS_HELP_STRING([--with-stage1-systemd-src],
-                            [address to git repository of systemd, used in 'src' stage1 flavor (default: 'https://github.com/systemd/systemd.git')])],
+                            [URL to a systemd Git repository or path to a local systemd source directory, used in 'src' stage1 flavor (default: 'https://github.com/systemd/systemd.git')])],
             [RKT_STAGE1_SYSTEMD_SRC="${withval}"],
             [RKT_STAGE1_SYSTEMD_SRC='auto'])
 
@@ -117,7 +117,7 @@ AC_ARG_WITH([stage1-systemd-version],
 
 AC_ARG_WITH([stage1-systemd-revision],
             [AS_HELP_STRING([--with-stage1-systemd-revision],
-                            [systemd revision to check out to build, used in 'src' stage1 flavor (default: the same value as --stage1-systemd-version)])],
+                            [systemd revision to check out to build, used in 'src' stage1 flavor when --with-stage1-systemd-src is a Git repository (default: the same value as --with-stage1-systemd-version)])],
             [RKT_STAGE1_SYSTEMD_REV="${withval}"],
             [RKT_STAGE1_SYSTEMD_REV='auto'])
 
@@ -869,8 +869,8 @@ RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [src],
                   [AC_MSG_RESULT([
         src flavor specific build parameters
 
-        systemd git repo:                       '${RKT_STAGE1_SYSTEMD_SRC}'
-        systemd git revision:                   '${RKT_STAGE1_SYSTEMD_REV}'
+        systemd source:                         '${RKT_STAGE1_SYSTEMD_SRC}'
+        systemd Git revision:                   '${RKT_STAGE1_SYSTEMD_REV}'
         systemd version:                        '${RKT_STAGE1_SYSTEMD_VER}'])])
 
 RKT_IF_HAS_VALUE([${RKT_STAGE1_FLAVORS}], [kvm],
diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
index c73ca57122..9b6718bd37 100644
--- a/stage1/usr_from_src/usr_from_src.mk
+++ b/stage1/usr_from_src/usr_from_src.mk
@@ -203,7 +203,7 @@ $(UFS_SYSTEMD_CONFIGURE):
 	if [ -d "$(UFS_PATCHES_DIR)" ]; then \
 		for p in "$(abspath $(UFS_PATCHES_DIR))"/*.patch; do \
 			$(call vb,v2,PATCH,$${p#$(MK_TOPLEVEL_ABS_SRCDIR)/}) \
-			"$(GIT)" -C "$(UFS_SYSTEMD_SRCDIR)" am $(call vl3,--quiet) "$${p}"; \
+			patch $(call vl3,--silent )--directory="$(UFS_SYSTEMD_SRCDIR)" --strip=1 --forward <"$${p}"; \
 		done; \
 	fi; \
 	pushd "$(UFS_SYSTEMD_SRCDIR)" $(call vl3,>/dev/null); \
@@ -233,6 +233,16 @@ $(call generate-patches-filelist,$(UFS_PATCHES_FILELIST),$(UFS_PATCHES_DIR))
 # regenerated.
 $(call generate-glob-deps,$(UFS_PATCHES_DEPS_STAMP),$(UFS_SYSTEMD_CONFIGURE_AC),$(UFS_PATCHES_DEPMK),.patch,$(UFS_PATCHES_FILELIST),$(UFS_PATCHES_DIR),normal)
 
+# Copy a local systemd source directory if not given a Git URL.
+ifeq ($(RKT_STAGE1_SYSTEMD_SRC),$(subst ://,,$(RKT_STAGE1_SYSTEMD_SRC)))
+
+$(UFS_SYSTEMD_CONFIGURE): $(UFS_SYSTEMD_SRCDIR)/autogen.sh
+$(UFS_SYSTEMD_SRCDIR)/autogen.sh: | $(UFS_SYSTEMDDIR)
+	cp -af $(RKT_STAGE1_SYSTEMD_SRC) $(@D)
+
+# Clone the systemd source repository if not using a local source tree.
+else
+
 # parameters for makelib/git.mk
 GCL_REPOSITORY := $(RKT_STAGE1_SYSTEMD_SRC)
 GCL_DIRECTORY := $(UFS_SYSTEMD_SRCDIR)
@@ -256,6 +266,8 @@ endif
 
 include makelib/git.mk
 
+endif
+
 # Remove the build directory if there were some changes in sources
 # (like different branch or repository, or a change in patches)
 $(UFS_SYSTEMD_RM_BUILDDIR_STAMP): $(UFS_SYSTEMD_CLONE_AND_PATCH_STAMP)

From c0c00bda246b889795e0db3a7c9e51febce7fedd Mon Sep 17 00:00:00 2001
From: Yakau Bubnou <ybubnou@infoblox.com>
Date: Sat, 12 Aug 2017 23:26:15 +0300
Subject: [PATCH 1161/1304] rkt: bash completion code

This patch provides an implementation of the command used to generate
completion code for the bash shell. This feature is extremely useful
for distributions of rkt that does not provide bash completion files
and can be easily generated by the user instead.
---
 rkt/bash_completion_gen.go |  32 --------
 rkt/completion.go          | 161 +++++++++++++++++++++++++++++++++++++
 rkt/completion_test.go     |  61 ++++++++++++++
 rkt/rkt.go                 |  58 +------------
 rkt/rkt.mk                 |   8 +-
 5 files changed, 225 insertions(+), 95 deletions(-)
 delete mode 100644 rkt/bash_completion_gen.go
 create mode 100644 rkt/completion.go
 create mode 100644 rkt/completion_test.go

diff --git a/rkt/bash_completion_gen.go b/rkt/bash_completion_gen.go
deleted file mode 100644
index 8a566d2715..0000000000
--- a/rkt/bash_completion_gen.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 The rkt Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This file is not part of the rkt binary. It is only executed manually via
-// the makefile.
-//+build doc
-
-package main
-
-import (
-	"fmt"
-	"os"
-)
-
-func main() {
-	err := cmdRkt.GenBashCompletionFile("dist/bash_completion/rkt.bash")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to generate the bash completion file: %v\n", err)
-		os.Exit(254)
-	}
-}
diff --git a/rkt/completion.go b/rkt/completion.go
new file mode 100644
index 0000000000..cd1e88709d
--- /dev/null
+++ b/rkt/completion.go
@@ -0,0 +1,161 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"io"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	cmdCompletion = &cobra.Command{
+		Use:   "completion SHELL",
+		Short: "Output shell completion code for the specified shell",
+		Long: `This command outputs completion code for the specified shell. The generated
+code must be evaluated to provide interactive completion of rkt sub-commands.
+This can be done by sourcing it from the .bash_profile.
+
+Save completion code in a home directory and then include it in .bash_profile
+script:
+
+	$ rkt completion bash > $HOME/.rkt.bash.inc
+	$ printf '
+# rkt shell completion
+source "$HOME/.rkt.bash.inc"
+' >> $HOME/.bash_profile
+	$ source $HOME/.bash_profile
+
+Alternatively, include the completion code directly into the launched shell:
+
+	$ source <(rkt completion bash)`,
+		ValidArgs: []string{"bash"},
+		Run:       runWrapper(newCompletion(os.Stdout)),
+	}
+
+	bashCompletionFunc = `__rkt_parse_image()
+{
+	local rkt_output
+	if rkt_output=$(rkt image list --no-legend 2>/dev/null); then
+		out=($(echo "${rkt_output}" | awk '{print $1}'))
+		COMPREPLY=( $( compgen -W "${out[*]}" -- "$cur" ) )
+	fi
+}
+
+__rkt_parse_list()
+{
+	local rkt_output
+	if rkt_output=$(rkt list --no-legend 2>/dev/null); then
+		if [[ -n "$1" ]]; then
+			out=($(echo "${rkt_output}" | grep ${1} | awk '{print $1}'))
+		else
+			out=($(echo "${rkt_output}" | awk '{print $1}'))
+		fi
+		COMPREPLY=( $( compgen -W "${out[*]}" -- "$cur" ) )
+	fi
+}
+
+__custom_func() {
+	case ${last_command} in
+		rkt_image_export | \
+		rkt_image_extract | \
+		rkt_image_cat-manifest | \
+		rkt_image_render | \
+		rkt_image_rm | \
+		rkt_run | \
+		rkt_prepare)
+			__rkt_parse_image
+			return
+			;;
+		rkt_run-prepared)
+			__rkt_parse_list prepared
+			return
+			;;
+		rkt_enter)
+			__rkt_parse_list running
+			return
+			;;
+		rkt_rm)
+			__rkt_parse_list "prepare\|exited"
+			return
+			;;
+		rkt_status)
+			__rkt_parse_list
+			return
+			;;
+		*)
+			;;
+	esac
+}
+`
+
+	completionShells = map[string]func(io.Writer, *cobra.Command) error{
+		"bash": runBashCompletion,
+	}
+)
+
+func init() {
+	cmdRkt.AddCommand(cmdCompletion)
+}
+
+// newCompletion creates a new command with a bounded writer. Writer
+// is used to print the generated shell-completion script, which is
+// intended to be consumed by the CLI users.
+func newCompletion(w io.Writer) func(*cobra.Command, []string) int {
+	return func(cmd *cobra.Command, args []string) int {
+		return runCompletion(w, cmd, args)
+	}
+}
+
+// runCompletion is a command handler to generate the shell script with
+// shell completion functions.
+//
+// It ensures that there are enough arguments to generate the completion
+// scripts.
+func runCompletion(w io.Writer, cmd *cobra.Command, args []string) (exit int) {
+	if len(args) == 0 {
+		stderr.Print("shell type is not specified")
+		return 254
+	}
+
+	if len(args) > 1 {
+		stderr.Print("too many arguments, only shell type is expected")
+		return 254
+	}
+
+	// Right now only bash completion is supported, but zsh could be
+	// supported in a future as well.
+	completion, ok := completionShells[args[0]]
+	if !ok {
+		stderr.Printf("'%s' shell is not supported", args[0])
+		return 254
+	}
+
+	// Write the shell completion to the specified writer.
+	err := completion(w, cmd.Parent())
+	if err != nil {
+		stderr.PrintE("completion failed", err)
+		return 254
+	}
+
+	return 0
+}
+
+// runBashCompletion generates bash completion script by delegating
+// this responsibility to the cobra package itself.
+func runBashCompletion(out io.Writer, cmd *cobra.Command) error {
+	return cmd.GenBashCompletion(out)
+}
diff --git a/rkt/completion_test.go b/rkt/completion_test.go
new file mode 100644
index 0000000000..e36ee8bccb
--- /dev/null
+++ b/rkt/completion_test.go
@@ -0,0 +1,61 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"bytes"
+	"io/ioutil"
+	"strings"
+	"testing"
+
+	"github.com/rkt/rkt/pkg/log"
+)
+
+func TestBashCompletion(t *testing.T) {
+	tests := []struct {
+		ExitCode int
+		Args     []string
+	}{
+		// Command expects at least one parameter.
+		{254, []string{}},
+		// Only single argument is expected.
+		{254, []string{"two", "args"}},
+		// Fish shell is not supported.
+		{254, []string{"fish"}},
+		// Bash completion should succeed.
+		{0, []string{"bash"}},
+	}
+
+	var buf bytes.Buffer
+	handler := newCompletion(&buf)
+	stderr = log.New(ioutil.Discard, "", false)
+
+	for ii, tt := range tests {
+		buf.Reset()
+		code := handler(cmdCompletion, tt.Args)
+		if code != tt.ExitCode {
+			t.Errorf("#%d: got %v exit code, want %v", ii, code, tt.ExitCode)
+		}
+	}
+
+	// Check that generated output contains custom bash functions.
+	buf.Reset()
+	handler(cmdCompletion, []string{"bash"})
+
+	output := buf.String()
+	if !strings.Contains(output, bashCompletionFunc) {
+		t.Errorf("it is expected custom bash functions in the output")
+	}
+}
diff --git a/rkt/rkt.go b/rkt/rkt.go
index ba5c6c5578..57c61b8d83 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -35,62 +35,6 @@ const (
 	cliDescription = "rkt, the application container runner"
 
 	defaultDataDir = "/var/lib/rkt"
-
-	bash_completion_func = `__rkt_parse_image()
-{
-    local rkt_output
-    if rkt_output=$(rkt image list --no-legend 2>/dev/null); then
-        out=($(echo "${rkt_output}" | awk '{print $1}'))
-        COMPREPLY=( $( compgen -W "${out[*]}" -- "$cur" ) )
-    fi
-}
-
-__rkt_parse_list()
-{
-    local rkt_output
-    if rkt_output=$(rkt list --no-legend 2>/dev/null); then
-        if [[ -n "$1" ]]; then
-            out=($(echo "${rkt_output}" | grep ${1} | awk '{print $1}'))
-        else
-            out=($(echo "${rkt_output}" | awk '{print $1}'))
-        fi
-        COMPREPLY=( $( compgen -W "${out[*]}" -- "$cur" ) )
-    fi
-}
-
-__custom_func() {
-    case ${last_command} in
-        rkt_image_export | \
-        rkt_image_extract | \
-        rkt_image_cat-manifest | \
-        rkt_image_render | \
-        rkt_image_rm | \
-        rkt_run | \
-        rkt_prepare)
-            __rkt_parse_image
-            return
-            ;;
-        rkt_run-prepared)
-            __rkt_parse_list prepared
-            return
-            ;;
-        rkt_enter)
-            __rkt_parse_list running
-            return
-            ;;
-        rkt_rm)
-            __rkt_parse_list "prepare\|exited"
-            return
-            ;;
-        rkt_status)
-            __rkt_parse_list
-            return
-            ;;
-        *)
-            ;;
-    esac
-}
-`
 )
 
 type absDir string
@@ -153,7 +97,7 @@ var cmdRkt = &cobra.Command{
 	Long: `A CLI for running app containers on Linux.
 
 To get the help on any specific command, run "rkt help command".`,
-	BashCompletionFunction: bash_completion_func,
+	BashCompletionFunction: bashCompletionFunc,
 	Run: runMissingCommand,
 }
 
diff --git a/rkt/rkt.mk b/rkt/rkt.mk
index f42f8bde0f..91cab9ab18 100644
--- a/rkt/rkt.mk
+++ b/rkt/rkt.mk
@@ -39,13 +39,9 @@ manpages: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 		grep -vE $(LOCAL_DIST_SRC_FILTER) | \
 		$(GO_ENV) xargs "$(GO)" run $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/manpages_gen.go
 
-$(call forward-vars,bash-completion,LOCAL_DIST_SRC_FILTER)
-bash-completion: GO_ENV += GOARCH=$(GOARCH_FOR_BUILD) CC=$(CC_FOR_BUILD)
-bash-completion: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
+bash-completion: $(RKT_BINARY) $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	mkdir -p dist/bash_completion/
-	ls $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/*.go | \
-		grep -vE $(LOCAL_DIST_SRC_FILTER) | \
-		$(GO_ENV) xargs "$(GO)" run $(GOPATH_TO_CREATE)/src/$(REPO_PATH)/rkt/bash_completion_gen.go
+	$(RKT_BINARY) completion bash > dist/bash_completion/rkt.bash
 
 protobuf: | $(GOPATH_TO_CREATE)/src/$(REPO_PATH)
 	GOPATH=$(GOPATH_TO_CREATE) scripts/genproto.sh

From 1e49325039c3b77ac710069cf6316edcfc115799 Mon Sep 17 00:00:00 2001
From: JulienBalestra <julien.balestra@gmail.com>
Date: Thu, 24 Aug 2017 14:29:46 +0200
Subject: [PATCH 1162/1304] networking: mount netns directory as iproute2 does

---
 networking/networking.go | 12 +++++++++---
 networking/podenv.go     | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/networking/networking.go b/networking/networking.go
index ed0d704e5d..64cd56d84d 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -36,8 +36,9 @@ import (
 )
 
 const (
-	IfNamePattern = "eth%d"
-	selfNetNS     = "/proc/self/ns/net"
+	IfNamePattern       = "eth%d"
+	selfNetNS           = "/proc/self/ns/net"
+	mountNetnsDirectory = "/var/run/netns"
 )
 
 // Networking describes the networking details of a pod.
@@ -83,8 +84,13 @@ func Setup(podRoot string, podID types.UUID, fps []commonnet.ForwardedPort, netL
 		},
 	}
 
+	err := n.mountNetnsDirectory()
+	if err != nil {
+		return nil, err
+	}
+
 	// Create the network namespace (and save its name in a file)
-	err := n.podNSCreate()
+	err = n.podNSCreate()
 	if err != nil {
 		return nil, err
 	}
diff --git a/networking/podenv.go b/networking/podenv.go
index bb415a3476..3593688c55 100644
--- a/networking/podenv.go
+++ b/networking/podenv.go
@@ -101,6 +101,39 @@ func (e *podEnv) loadNets() ([]activeNet, error) {
 	return netSlice, nil
 }
 
+// Ensure the netns directory is mounted before adding new netns like `ip netns add <netns>` command does.
+// See https://github.com/kubernetes/kubernetes/issues/48427
+// Make it possible for network namespace mounts to propagate between mount namespaces.
+// This makes it likely that an unmounting a network namespace file in one namespace will unmount the network namespace.
+// file in all namespaces allowing the network namespace to be freed sooner.
+func (e *podEnv) mountNetnsDirectory() error {
+	err := os.MkdirAll(mountNetnsDirectory, 0755)
+	if err != nil {
+		return err
+	}
+
+	err = syscall.Mount("", mountNetnsDirectory, "none", syscall.MS_SHARED|syscall.MS_REC, "")
+	if err != nil {
+		// Fail unless we need to make the mount point
+		if err != syscall.EINVAL {
+			return fmt.Errorf("mount --make-rshared %s failed: %q", mountNetnsDirectory, err)
+		}
+
+		// Upgrade mountTarget to a mount point
+		err = syscall.Mount(mountNetnsDirectory, mountNetnsDirectory, "none", syscall.MS_BIND|syscall.MS_REC, "")
+		if err != nil {
+			return fmt.Errorf("mount --rbind %s %s failed: %q", mountNetnsDirectory, mountNetnsDirectory, err)
+		}
+
+		// Remount after the Upgrade
+		err = syscall.Mount("", mountNetnsDirectory, "none", syscall.MS_SHARED|syscall.MS_REC, "")
+		if err != nil {
+			return fmt.Errorf("mount --make-rshared %s failed: %q", mountNetnsDirectory, err)
+		}
+	}
+	return nil
+}
+
 // podNSCreate creates the network namespace and saves a reference to its path.
 // NewNS will bind-mount the namespace in /run/netns, so we write that filename
 // to disk.

From f075a494a5d0b87d75b25e9ff986e3aa505deea5 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Wed, 30 Aug 2017 14:49:44 +0200
Subject: [PATCH 1163/1304] Revert "stage1 build: make target installing units
 can not remove the ACI dir"

This reverts commit ca8e5f5930d1f413c67617e7d1f9500e312d5256.
---
 stage1/units/units-install.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/stage1/units/units-install.mk b/stage1/units/units-install.mk
index e865d4bf0c..900e008cf0 100644
--- a/stage1/units/units-install.mk
+++ b/stage1/units/units-install.mk
@@ -78,8 +78,8 @@ $(call generate-stamp-rule,$(UNI_STAMP),$(UNI_COPY_STAMP) $(UNI_UNIT_TARGET_DEPS
 # this stamp makes sure that everything is copied
 $(call generate-stamp-rule,$(UNI_COPY_STAMP),$(UNI_UNITS),$(UNI_SYMLINKS) $(UNI_UNIT_DIRS))
 
-# this cleans up the units directory in the ACI rootfs
-$(call generate-rm-dir-rule,$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_UNITDIR))
+# this removes the ACI rootfs directory
+$(call generate-rm-dir-rule,$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_ACIROOTFSDIR))
 
 STAGE1_INSTALL_FILES_$(UNI_FLAVOR) += $(UNI_INSTALL_FILES_TRIPLETS)
 STAGE1_INSTALL_DIRS_$(UNI_FLAVOR) += $(UNI_INSTALL_DIRS_PAIRS)
@@ -95,19 +95,19 @@ STAGE1_SECONDARY_STAMPS_$(UNI_FLAVOR) += $(UNI_STAMP)
 # This filelist of all target unit files can be generated any time.
 $(call generate-shallow-filelist,$(UNI_UNIT_TARGET_FILELIST),$(UNI_SRC_UNITDIR),.target)
 # This dep.mk can be generated only after the filelist above was
-# generated. Will trigger removing of the units directory in all
+# generated. Will trigger removing of the ACI rootfs directory in all
 # ACI rootfses if target unit files change.
 $(call generate-glob-deps,$(UNI_UNIT_TARGET_DEPS_STAMP),$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_UNIT_TARGET_DEPMK),.target,$(UNI_UNIT_TARGET_FILELIST),$(UNI_SRC_UNITDIR),normal)
 
 # This filelist of all service unit files can be generated any time.
 $(call generate-shallow-filelist,$(UNI_UNIT_SERVICE_FILELIST),$(UNI_SRC_UNITDIR),.service)
 # This dep.mk can be generated only after the filelist above was
-# generated. Will trigger removing of the units directory in all
+# generated. Will trigger removing of the ACI rootfs directory in all
 # ACI rootfses if service unit files change.
 $(call generate-glob-deps,$(UNI_UNIT_SERVICE_DEPS_STAMP),$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_UNIT_SERVICE_DEPMK),.service,$(UNI_UNIT_SERVICE_FILELIST),$(UNI_SRC_UNITDIR),normal)
 
-# This dep.mk will force the removal of the units directory in the
-# ACI rootfs if any symlink to be created changes.
+# This dep.mk will force the removal of the ACI rootfs directory if
+# any symlink to be created changes.
 $(call generate-kv-deps,$(UNI_UNIT_SYMLINKS_KV_DEPS_STAMP),$(UNI_REMOVE_ACIROOTFSDIR_STAMP),$(UNI_UNIT_SYMLINKS_KV_DEPMK),UNI_SYMLINK_TARGETS UNI_SYMLINK_FILENAMES)
 
 $(call undefine-namespaces,UNI)

From 6e504cc5efd184e373952a5bae4819ef262e53e9 Mon Sep 17 00:00:00 2001
From: pppKin <leoihungkin@outlook.com>
Date: Sat, 26 Aug 2017 01:47:36 +0800
Subject: [PATCH 1164/1304] pkg/keystore/keystore.go: add Chmod after every
 writeFile()

Chmod ensures that every file created in keystore.go have correct
permissions no matter the umask.

Fixes #3779
---
 pkg/keystore/keystore.go | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/pkg/keystore/keystore.go b/pkg/keystore/keystore.go
index ca54a8aef2..d8c6b52fd8 100644
--- a/pkg/keystore/keystore.go
+++ b/pkg/keystore/keystore.go
@@ -123,7 +123,13 @@ func (ks *Keystore) MaskTrustedKeySystemPrefix(prefix, fingerprint string) (stri
 		return "", err
 	}
 	dst := path.Join(ks.LocalPrefixPath, acidentifier.String(), fingerprint)
-	return dst, ioutil.WriteFile(dst, []byte(""), 0644)
+	if err := ioutil.WriteFile(dst, []byte(""), 0644); err != nil {
+		return "", err
+	}
+	if err := os.Chmod(dst, 0644); err != nil {
+		return "", err
+	}
+	return dst, nil
 }
 
 // DeleteTrustedKeyRoot deletes the root trusted key identified by fingerprint.
@@ -134,7 +140,13 @@ func (ks *Keystore) DeleteTrustedKeyRoot(fingerprint string) error {
 // MaskTrustedKeySystemRoot masks the system root trusted key identified by fingerprint.
 func (ks *Keystore) MaskTrustedKeySystemRoot(fingerprint string) (string, error) {
 	dst := path.Join(ks.LocalRootPath, fingerprint)
-	return dst, ioutil.WriteFile(dst, []byte(""), 0644)
+	if err := ioutil.WriteFile(dst, []byte(""), 0644); err != nil {
+		return "", err
+	}
+	if err := os.Chmod(dst, 0644); err != nil {
+		return "", err
+	}
+	return dst, nil
 }
 
 // TrustKeyPrefixExists returns whether or not there exists 1 or more trusted
@@ -251,6 +263,9 @@ func storeTrustedKey(dir string, r io.Reader) (string, error) {
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		return "", err
 	}
+	if err := os.Chmod(dir, 0755); err != nil {
+		return "", err
+	}
 	entityList, err := openpgp.ReadArmoredKeyRing(bytes.NewReader(pubkeyBytes))
 	if err != nil {
 		return "", err
@@ -263,6 +278,10 @@ func storeTrustedKey(dir string, r io.Reader) (string, error) {
 	if err := ioutil.WriteFile(trustedKeyPath, pubkeyBytes, 0644); err != nil {
 		return "", err
 	}
+	if err := os.Chmod(trustedKeyPath, 0644); err != nil {
+		return "", err
+	}
+
 	return trustedKeyPath, nil
 }
 
@@ -363,6 +382,10 @@ func NewTestKeystore() (*Keystore, string, error) {
 		if err := os.MkdirAll(path, 0755); err != nil {
 			return nil, "", err
 		}
+		if err := os.Chmod(dir, 0755); err != nil {
+			return nil, "", err
+		}
+
 	}
 	return New(c), dir, nil
 }

From c676c6006ea2ef2b4f56b0daad1000f55ff25191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 1 Sep 2017 12:21:59 +0200
Subject: [PATCH 1165/1304] stage1: support hybrid cgroup hierarchy

systemd introduced the hybrid cgroup hierarchy that mounts a cgroup v1
and v2 hierarchy in parallel. After systemd v233 the cgroup v2 hierarchy
is mounted in `/sys/fs/cgroup/unified`. This breaks rkt (specifically
flavor host) because we mount `/sys/fs/cgroup` ourselves and were not
creating the `unified` directory.

Let's create `/sys/fs/cgroup/unified` in CreateCgroup() to support the
hybrid cgroup hierarchy. If the system or stage1 doesn't use the hybrid
hierarchy, having this directory created doesn't hurt.
---
 common/cgroup/v1/cgroup.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/cgroup/v1/cgroup.go b/common/cgroup/v1/cgroup.go
index 9c44187189..94a3b681ca 100644
--- a/common/cgroup/v1/cgroup.go
+++ b/common/cgroup/v1/cgroup.go
@@ -316,6 +316,11 @@ func CreateCgroups(m fs.Mounter, root string, enabledCgroups map[int][]string, m
 		return err
 	}
 
+	unifiedPath := filepath.Join(root, "/sys/fs/cgroup/unified")
+	if err := os.MkdirAll(unifiedPath, 0700); err != nil {
+		return err
+	}
+
 	// Bind-mount cgroup tmpfs filesystem read-only
 	return mountFsRO(m, cgroupTmpfs, cgroupTmpfsFlags)
 }

From c2d32609fc551c88399fcfbe98aab034b2025e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 8 Sep 2017 14:54:50 +0200
Subject: [PATCH 1166/1304] lib/app: check in upper/ if the pod uses overlay

Getting creation/start time and status of applications will fail for
pods using overlay if stage1 was unmounted (e.g. when rebooting).

This commit checks in the `upper/` directory if the pod uses overlay.
---
 lib/app.go | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/app.go b/lib/app.go
index 15a67ac2b4..c4f84a4507 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -136,9 +137,26 @@ func appStateInMutablePod(app *v1.App, pod *pkgPod.Pod) error {
 			}
 		}
 	}()
+	createdFile := common.AppCreatedPath(pod.Path(), app.Name)
+	startedFile := common.AppStartedPath(pod.Path(), app.Name)
+	appStatusFile := common.AppStatusPath(pod.Path(), app.Name)
+
+	if pod.UsesOverlay() {
+		treeStoreID, err := pod.GetStage1TreeStoreID()
+		if err != nil {
+			return err
+		}
+		s1Dir := filepath.Join(filepath.Join(pod.Path(), "overlay"), treeStoreID)
+		upper := filepath.Join(s1Dir, "upper")
+		appStatusesPath := filepath.Join(upper, "/rkt/status")
+
+		createdFile = filepath.Join(appStatusesPath, fmt.Sprintf("%s-created", app.Name))
+		startedFile = filepath.Join(appStatusesPath, fmt.Sprintf("%s-started", app.Name))
+		appStatusFile = filepath.Join(appStatusesPath, app.Name)
+	}
 
 	// Check if the app is created.
-	fi, err := os.Stat(common.AppCreatedPath(pod.Path(), app.Name))
+	fi, err := os.Stat(createdFile)
 	if err != nil {
 		if !os.IsNotExist(err) {
 			return fmt.Errorf("cannot stat app creation file: %v", err)
@@ -151,7 +169,7 @@ func appStateInMutablePod(app *v1.App, pod *pkgPod.Pod) error {
 	app.CreatedAt = &createdAt
 
 	// Check if the app is started.
-	fi, err = os.Stat(common.AppStartedPath(pod.Path(), app.Name))
+	fi, err = os.Stat(startedFile)
 	if err != nil {
 		if !os.IsNotExist(err) {
 			return fmt.Errorf("cannot stat app started file: %v", err)
@@ -164,7 +182,6 @@ func appStateInMutablePod(app *v1.App, pod *pkgPod.Pod) error {
 	app.StartedAt = &startedAt
 
 	// Check if the app is exited.
-	appStatusFile := common.AppStatusPath(pod.Path(), app.Name)
 	fi, err = os.Stat(appStatusFile)
 	if err != nil {
 		if !os.IsNotExist(err) {

From 200bfddb8b12265272ba17f783a60030c8c8d6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 6 Sep 2017 17:02:02 +0200
Subject: [PATCH 1167/1304] stage1: handle docker group semantics

Docker uses the UID as GID if you only specify the "user".

In that case, docker2aci sets the group name to the user name because
the appc spec requires both user and group to be set. This will fail
because that group name won't be found in /etc/group.

Let's detect if the image was converted from docker and set the GID to
the UID in that case.
---
 stage1/init/common/pod.go | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index 4e06ccea68..b230dc3fb1 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -403,7 +403,25 @@ func ParseUserGroup(p *stage1commontypes.Pod, ra *schema.RuntimeApp) (int, int,
 	}
 
 	if _, gid, err = gidResolver.IDs(); err != nil {
-		return -1, -1, errwrap.Wrap(fmt.Errorf("failed to configure group %q", ra.App.Group), err)
+		// If we can't resolve the GID, it might be an image converted from
+		// docker.
+		//
+		// Docker uses the UID as GID if you only specify the "user". In that
+		// case, docker2aci sets the group name to the user name because the
+		// appc spec requires both user and group to be set. This will fail
+		// because that group name won't be found in /etc/group. Let's detect
+		// if the image was converted from docker and set the GID to the UID in
+		// that case.
+		//
+		// We only do this if the group in RuntimeApp is the same as the one in
+		// the image, otherwise we trust that the user knows what they're
+		// doing.
+		img := p.Images[ra.Name.String()]
+		if ConvertedFromDocker(img) && img.App.User == img.App.Group && ra.App.Group == img.App.Group {
+			gid = uid
+		} else {
+			return -1, -1, errwrap.Wrap(fmt.Errorf("failed to configure group %q", ra.App.Group), err)
+		}
 	}
 
 	return uid, gid, nil

From 94db4f962b19f185f1517b946d1e5ddac024e1df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Sep 2017 16:05:37 +0200
Subject: [PATCH 1168/1304] rkt,stage0: remove unused variable

---
 rkt/status.go | 5 ++---
 stage0/run.go | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/rkt/status.go b/rkt/status.go
index c6ae2e0089..4ba348e9e2 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -43,9 +43,8 @@ They can also be set to a duration. If the duration is less than zero, wait inde
 )
 
 const (
-	overlayStatusDirTemplate = "overlay/%s/upper/rkt/status"
-	regularStatusDir         = "stage1/rootfs/rkt/status"
-	cmdStatusName            = "status"
+	regularStatusDir = "stage1/rootfs/rkt/status"
+	cmdStatusName    = "status"
 )
 
 func init() {
diff --git a/stage0/run.go b/stage0/run.go
index a4d4d8c6a0..3fb0bd3ead 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -870,8 +870,7 @@ func setupStage1Image(cfg RunConfig, cdir string, useOverlay bool) error {
 			return err
 		}
 
-		// pass an empty appName: make sure it remains consistent with
-		// overlayStatusDirTemplate
+		// pass an empty appName
 		if err := overlayRender(cfg, string(treeStoreID), cdir, s1, ""); err != nil {
 			return errwrap.Wrap(errors.New("error rendering overlay filesystem"), err)
 		}

From 06c8bd2bbe19449c609842cf62c08e208e7576ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 11 Sep 2017 16:29:42 +0200
Subject: [PATCH 1169/1304] common: add some functions for getting paths from
 stage1 rootfs

And use them.
---
 common/common.go | 28 +++++++++++++++++++++++++++-
 lib/app.go       | 22 ++++++----------------
 pkg/pod/pods.go  |  2 +-
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/common/common.go b/common/common.go
index d11b55d6fa..5e2dfb75d9 100644
--- a/common/common.go
+++ b/common/common.go
@@ -125,9 +125,15 @@ func PodManifestLockPath(root string) string {
 	return filepath.Join(root, "pod.lck")
 }
 
+// AppsStatusesPathFromStage1Rootfs returns the path of the status dir for all apps.
+// It receives the stage1 rootfs as parameter instead of the pod root.
+func AppsStatusesPathFromStage1Rootfs(rootfs string) string {
+	return filepath.Join(rootfs, "/rkt/status")
+}
+
 // AppsStatusesPath returns the path of the status dir for all apps.
 func AppsStatusesPath(root string) string {
-	return filepath.Join(Stage1RootfsPath(root), "/rkt/status")
+	return AppsStatusesPathFromStage1Rootfs(Stage1RootfsPath(root))
 }
 
 // AppStatusPath returns the path of the status file of an app.
@@ -135,18 +141,38 @@ func AppStatusPath(root, appName string) string {
 	return filepath.Join(AppsStatusesPath(root), appName)
 }
 
+// AppStatusPathFromStage1Rootfs returns the path of the status file of an app.
+// It receives the stage1 rootfs as parameter instead of the pod root.
+func AppStatusPathFromStage1Rootfs(rootfs, appName string) string {
+	return filepath.Join(AppsStatusesPathFromStage1Rootfs(rootfs), appName)
+}
+
 // AppCreatedPath returns the path of the ${appname}-created file, which is used to record
 // the creation timestamp of the app.
 func AppCreatedPath(root, appName string) string {
 	return filepath.Join(AppsStatusesPath(root), fmt.Sprintf("%s-created", appName))
 }
 
+// AppCreatedPathFromStage1Rootfs returns the path of the ${appname}-created file,
+// which is used to record the creation timestamp of the app.
+// It receives the stage1 rootfs as parameter instead of the pod root.
+func AppCreatedPathFromStage1Rootfs(rootfs, appName string) string {
+	return filepath.Join(AppsStatusesPathFromStage1Rootfs(rootfs), fmt.Sprintf("%s-created", appName))
+}
+
 // AppStartedPath returns the path of the ${appname}-started file, which is used to record
 // the start timestamp of the app.
 func AppStartedPath(root, appName string) string {
 	return filepath.Join(AppsStatusesPath(root), fmt.Sprintf("%s-started", appName))
 }
 
+// AppStartedPathFromStage1Rootfs returns the path of the ${appname}-started file, which is used to record
+// the start timestamp of the app.
+// It receives the stage1 rootfs as parameter instead of the pod root.
+func AppStartedPathFromStage1Rootfs(rootfs, appName string) string {
+	return filepath.Join(AppsStatusesPathFromStage1Rootfs(rootfs), fmt.Sprintf("%s-started", appName))
+}
+
 // AppsPath returns the path where the apps within a pod live.
 func AppsPath(root string) string {
 	return filepath.Join(Stage1RootfsPath(root), stage2Dir)
diff --git a/lib/app.go b/lib/app.go
index c4f84a4507..0f6098c0c4 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -18,7 +18,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
@@ -137,23 +136,14 @@ func appStateInMutablePod(app *v1.App, pod *pkgPod.Pod) error {
 			}
 		}
 	}()
-	createdFile := common.AppCreatedPath(pod.Path(), app.Name)
-	startedFile := common.AppStartedPath(pod.Path(), app.Name)
-	appStatusFile := common.AppStatusPath(pod.Path(), app.Name)
 
-	if pod.UsesOverlay() {
-		treeStoreID, err := pod.GetStage1TreeStoreID()
-		if err != nil {
-			return err
-		}
-		s1Dir := filepath.Join(filepath.Join(pod.Path(), "overlay"), treeStoreID)
-		upper := filepath.Join(s1Dir, "upper")
-		appStatusesPath := filepath.Join(upper, "/rkt/status")
-
-		createdFile = filepath.Join(appStatusesPath, fmt.Sprintf("%s-created", app.Name))
-		startedFile = filepath.Join(appStatusesPath, fmt.Sprintf("%s-started", app.Name))
-		appStatusFile = filepath.Join(appStatusesPath, app.Name)
+	stage1RootfsPath, err := pod.Stage1RootfsPath()
+	if err != nil {
+		return err
 	}
+	createdFile := common.AppCreatedPathFromStage1Rootfs(stage1RootfsPath, app.Name)
+	startedFile := common.AppStartedPathFromStage1Rootfs(stage1RootfsPath, app.Name)
+	appStatusFile := common.AppStatusPathFromStage1Rootfs(stage1RootfsPath, app.Name)
 
 	// Check if the app is created.
 	fi, err := os.Stat(createdFile)
diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index 643f20f1b1..ba9543880d 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -1208,7 +1208,7 @@ func (p *Pod) AppExitCode(appName string) (int, error) {
 		return -1, err
 	}
 
-	statusFile := filepath.Join(stage1RootfsPath, "/rkt/status/", appName)
+	statusFile := common.AppStatusPathFromStage1Rootfs(stage1RootfsPath, appName)
 	return p.readIntFromFile(statusFile)
 }
 

From ae44b18762bb461011d2f13267e00446a5745a9f Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Mon, 4 Sep 2017 17:11:45 +0200
Subject: [PATCH 1170/1304] workaround for building Linux < 4.11 with gcc >= 7

Symptoms:

kernel/built-in.o: In function `update_wall_time':
(.text+0x5acc6): undefined reference to `____ilog2_NaN'

This commit includes the workaround patch from the upstream Linux
kernel. Ideally, we would switch to a newer Linux version for the kvm
flavor. But this is quicker this way.

See:

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=474c90156c8dcc2fa815e6716cc9394d7930cb9c
---
 ...-on-gcc-ilog2-constant-optimizations.patch | 127 ++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 stage1/usr_from_kvm/kernel/patches/0003-give-up-on-gcc-ilog2-constant-optimizations.patch

diff --git a/stage1/usr_from_kvm/kernel/patches/0003-give-up-on-gcc-ilog2-constant-optimizations.patch b/stage1/usr_from_kvm/kernel/patches/0003-give-up-on-gcc-ilog2-constant-optimizations.patch
new file mode 100644
index 0000000000..d41a86087e
--- /dev/null
+++ b/stage1/usr_from_kvm/kernel/patches/0003-give-up-on-gcc-ilog2-constant-optimizations.patch
@@ -0,0 +1,127 @@
+From 474c90156c8dcc2fa815e6716cc9394d7930cb9c Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Thu, 2 Mar 2017 12:17:22 -0800
+Subject: [PATCH] give up on gcc ilog2() constant optimizations
+
+gcc-7 has an "optimization" pass that completely screws up, and
+generates the code expansion for the (impossible) case of calling
+ilog2() with a zero constant, even when the code gcc compiles does not
+actually have a zero constant.
+
+And we try to generate a compile-time error for anybody doing ilog2() on
+a constant where that doesn't make sense (be it zero or negative).  So
+now gcc7 will fail the build due to our sanity checking, because it
+created that constant-zero case that didn't actually exist in the source
+code.
+
+There's a whole long discussion on the kernel mailing about how to work
+around this gcc bug.  The gcc people themselevs have discussed their
+"feature" in
+
+   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785
+
+but it's all water under the bridge, because while it looked at one
+point like it would be solved by the time gcc7 was released, that was
+not to be.
+
+So now we have to deal with this compiler braindamage.
+
+And the only simple approach seems to be to just delete the code that
+tries to warn about bad uses of ilog2().
+
+So now "ilog2()" will just return 0 not just for the value 1, but for
+any non-positive value too.
+
+It's not like I can recall anybody having ever actually tried to use
+this function on any invalid value, but maybe the sanity check just
+meant that such code never made it out in public.
+
+Reported-by: Laura Abbott <labbott@redhat.com>
+Cc: John Stultz <john.stultz@linaro.org>,
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ include/linux/log2.h       | 13 ++-----------
+ tools/include/linux/log2.h | 13 ++-----------
+ 2 files changed, 4 insertions(+), 22 deletions(-)
+
+diff --git a/include/linux/log2.h b/include/linux/log2.h
+index ef3d4f67118c..c373295f359f 100644
+--- a/include/linux/log2.h
++++ b/include/linux/log2.h
+@@ -16,12 +16,6 @@
+ #include <linux/bitops.h>
+ 
+ /*
+- * deal with unrepresentable constant logarithms
+- */
+-extern __attribute__((const, noreturn))
+-int ____ilog2_NaN(void);
+-
+-/*
+  * non-constant log of base 2 calculators
+  * - the arch may override these in asm/bitops.h if they can be implemented
+  *   more efficiently than using fls() and fls64()
+@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ #define ilog2(n)				\
+ (						\
+ 	__builtin_constant_p(n) ? (		\
+-		(n) < 1 ? ____ilog2_NaN() :	\
++		(n) < 2 ? 0 :			\
+ 		(n) & (1ULL << 63) ? 63 :	\
+ 		(n) & (1ULL << 62) ? 62 :	\
+ 		(n) & (1ULL << 61) ? 61 :	\
+@@ -148,10 +142,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ 		(n) & (1ULL <<  4) ?  4 :	\
+ 		(n) & (1ULL <<  3) ?  3 :	\
+ 		(n) & (1ULL <<  2) ?  2 :	\
+-		(n) & (1ULL <<  1) ?  1 :	\
+-		(n) & (1ULL <<  0) ?  0 :	\
+-		____ilog2_NaN()			\
+-				   ) :		\
++		1 ) :				\
+ 	(sizeof(n) <= 4) ?			\
+ 	__ilog2_u32(n) :			\
+ 	__ilog2_u64(n)				\
+diff --git a/tools/include/linux/log2.h b/tools/include/linux/log2.h
+index 41446668ccce..d5677d39c1e4 100644
+--- a/tools/include/linux/log2.h
++++ b/tools/include/linux/log2.h
+@@ -13,12 +13,6 @@
+ #define _TOOLS_LINUX_LOG2_H
+ 
+ /*
+- * deal with unrepresentable constant logarithms
+- */
+-extern __attribute__((const, noreturn))
+-int ____ilog2_NaN(void);
+-
+-/*
+  * non-constant log of base 2 calculators
+  * - the arch may override these in asm/bitops.h if they can be implemented
+  *   more efficiently than using fls() and fls64()
+@@ -78,7 +72,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ #define ilog2(n)				\
+ (						\
+ 	__builtin_constant_p(n) ? (		\
+-		(n) < 1 ? ____ilog2_NaN() :	\
++		(n) < 2 ? 0 :			\
+ 		(n) & (1ULL << 63) ? 63 :	\
+ 		(n) & (1ULL << 62) ? 62 :	\
+ 		(n) & (1ULL << 61) ? 61 :	\
+@@ -141,10 +135,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ 		(n) & (1ULL <<  4) ?  4 :	\
+ 		(n) & (1ULL <<  3) ?  3 :	\
+ 		(n) & (1ULL <<  2) ?  2 :	\
+-		(n) & (1ULL <<  1) ?  1 :	\
+-		(n) & (1ULL <<  0) ?  0 :	\
+-		____ilog2_NaN()			\
+-				   ) :		\
++		1 ) :				\
+ 	(sizeof(n) <= 4) ?			\
+ 	__ilog2_u32(n) :			\
+ 	__ilog2_u64(n)				\
+-- 
+2.13.5
+

From e70889eea122e73afd94cc2598f87b4919328b30 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 8 Aug 2017 23:28:36 +0200
Subject: [PATCH 1171/1304] stage1: upgrade to systemd-v233 from CoreOS
 1478.0.0

systemd-v234 is already released. However I am only upgrading from
v231 to v233 to avoid a regression bug when the 4 year old v204 is used
on the host. v204 is still used on SemaphoreCI. The symptoms were:

> Press ^] three times within 1s to kill container.
> Failed to allocate scope: No such method 'StartTransientUnit'

This is due to a change in systemd-nspawn-v234: see:
https://github.com/systemd/systemd/pull/6261/files#diff-a8646f412b928a4679f2ec702b55c12bR338

It now calls 'StartTransientUnit' synchronously. Before, it was called
asynchronously without checking for errors. This 'StartTransientUnit'
method was added in systemd-v205 (via
https://github.com/systemd/systemd/commit/c2756a684011) so it is not yet
available in SemaphoreCI.
---
 stage1/usr_from_coreos/coreos-common.mk       |  4 +-
 .../manifest-amd64-usr.d/bash.manifest        |  6 +--
 .../manifest-amd64-usr.d/systemd.manifest     | 38 +++++++++++------
 .../manifest-arm64-usr.d/bash.manifest        | 18 ++++----
 .../manifest-arm64-usr.d/systemd.manifest     | 41 ++++++++++++++-----
 .../manifest-amd64-usr.d/sshd.manifest        | 14 +++----
 .../manifest-arm64-usr.d/ip.manifest          |  6 +--
 .../manifest-arm64-usr.d/sshd.manifest        | 12 +++---
 8 files changed, 87 insertions(+), 52 deletions(-)

diff --git a/stage1/usr_from_coreos/coreos-common.mk b/stage1/usr_from_coreos/coreos-common.mk
index b4cff8fc94..d9c29dc410 100644
--- a/stage1/usr_from_coreos/coreos-common.mk
+++ b/stage1/usr_from_coreos/coreos-common.mk
@@ -9,9 +9,9 @@ _CCN_INCLUDED_ := x
 $(call setup-tmp-dir,CCN_TMPDIR)
 
 # systemd version in coreos image
-CCN_SYSTEMD_VERSION := v231
+CCN_SYSTEMD_VERSION := v233
 # coreos image version
-CCN_IMG_RELEASE := 1235.0.0
+CCN_IMG_RELEASE := 1478.0.0
 # coreos image URL
 CCN_IMG_URL := https://alpha.release.core-os.net/$(RKT_STAGE1_COREOS_BOARD)/$(CCN_IMG_RELEASE)/coreos_production_pxe_image.cpio.gz
 # path to downloaded pxe image
diff --git a/stage1/usr_from_coreos/manifest-amd64-usr.d/bash.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/bash.manifest
index a74b266609..9ca1863e02 100644
--- a/stage1/usr_from_coreos/manifest-amd64-usr.d/bash.manifest
+++ b/stage1/usr_from_coreos/manifest-amd64-usr.d/bash.manifest
@@ -1,9 +1,9 @@
 bin/bash
-lib64/ld-2.21.so
+lib64/ld-2.23.so
 lib64/ld-linux-x86-64.so.2
-lib64/libc-2.21.so
+lib64/libc-2.23.so
 lib64/libc.so.6
-lib64/libdl-2.21.so
+lib64/libdl-2.23.so
 lib64/libdl.so
 lib64/libdl.so.2
 lib64/libncurses.so
diff --git a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
index b4158e8c33..1727c58254 100644
--- a/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-amd64-usr.d/systemd.manifest
@@ -1,7 +1,6 @@
 bin/coredumpctl
 bin/journalctl
 bin/mount
-bin/umount
 bin/systemctl
 bin/systemd-analyze
 bin/systemd-ask-password
@@ -21,8 +20,9 @@ bin/systemd-stdio-bridge
 bin/systemd-sysusers
 bin/systemd-tmpfiles
 bin/systemd-tty-ask-password-agent
+bin/umount
 lib
-lib64/ld-2.21.so
+lib64/ld-2.23.so
 lib64/ld-linux-x86-64.so.2
 lib64/libattr.so
 lib64/libattr.so.1
@@ -33,11 +33,16 @@ lib64/libaudit.so.1.0.0
 lib64/libblkid.so
 lib64/libblkid.so.1
 lib64/libblkid.so.1.1.0
-lib64/libc-2.21.so
-lib64/libc.so.6
+lib64/libc-2.23.so
 lib64/libcap.so
 lib64/libcap.so.2
 lib64/libcap.so.2.24
+lib64/libcryptsetup.so
+lib64/libcryptsetup.so.4
+lib64/libcryptsetup.so.4.7.0
+lib64/libc.so.6
+lib64/libdevmapper.so
+lib64/libdevmapper.so.1.02
 lib64/libgcc_s.so
 lib64/libgcc_s.so.1
 lib64/libgcrypt.so
@@ -55,39 +60,47 @@ lib64/libitm.so.1.0.0
 lib64/libkmod.so
 lib64/libkmod.so.2
 lib64/libkmod.so.2.2.11
+lib64/liblz4.so
+lib64/liblz4.so.1
+lib64/liblz4.so.1.7.1
 lib64/liblzma.so
 lib64/liblzma.so.5
 lib64/liblzma.so.5.2.2
+lib64/libm-2.23.so
 lib64/libmount.so
 lib64/libmount.so.1
 lib64/libmount.so.1.1.0
-lib64/libnss_files-2.21.so
+lib64/libm.so
+lib64/libm.so.6
+lib64/libnss_files-2.23.so
 lib64/libnss_files.so.2
 lib64/libpam.so
 lib64/libpam.so.0
 lib64/libpam.so.0.84.1
 lib64/libpcre.so
 lib64/libpcre.so.1
-lib64/libpcre.so.1.2.6
-lib64/libpthread-2.21.so
+lib64/libpcre.so.1.2.8
+lib64/libpthread-2.23.so
 lib64/libpthread.so
 lib64/libpthread.so.0
-lib64/librt-2.21.so
+lib64/librt-2.23.so
 lib64/librt.so
 lib64/librt.so.1
 lib64/libseccomp.so
 lib64/libseccomp.so.2
-lib64/libseccomp.so.2.3.0
+lib64/libseccomp.so.2.3.1
 lib64/libselinux.so
 lib64/libselinux.so.1
+lib64/libudev.so
+lib64/libudev.so.1
+lib64/libudev.so.1.6.6
 lib64/libuuid.so
 lib64/libuuid.so.1
 lib64/libuuid.so.1.3.0
 lib64/libz.so
 lib64/libz.so.1
-lib64/libz.so.1.2.8
-lib64/systemd/libsystemd-shared-231.so
-lib64/systemd/system-sleep
+lib64/libz.so.1.2.11
+lib64/systemd/libsystemd-shared-233.so
 lib64/systemd/systemd
 lib64/systemd/systemd-ac-power
 lib64/systemd/systemd-backlight
@@ -116,4 +129,5 @@ lib64/systemd/systemd-udevd
 lib64/systemd/systemd-update-done
 lib64/systemd/systemd-update-utmp
 lib64/systemd/systemd-vconsole-setup
+lib64/systemd/system-sleep
 lib64/systemd/user-generators
diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/bash.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/bash.manifest
index cfba8f1f1a..f30ba20976 100644
--- a/stage1/usr_from_coreos/manifest-arm64-usr.d/bash.manifest
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/bash.manifest
@@ -1,12 +1,12 @@
 bin/bash
-lib64/libreadline.so.6.3
-lib64/libreadline.so.6
-lib64/libncurses.so.5.9
-lib64/libncurses.so.5
-lib64/libdl.so.2
-lib64/libdl-2.21.so
-lib64/libc.so.6
-lib64/libc-2.21.so
+lib64/ld-2.23.so
 lib64/ld-linux-aarch64.so.1
-lib64/ld-2.21.so
+lib64/libc-2.23.so
+lib64/libc.so.6
+lib64/libdl-2.23.so
+lib64/libdl.so.2
+lib64/libncurses.so.5
+lib64/libncurses.so.5.9
+lib64/libreadline.so.6
+lib64/libreadline.so.6.3
 lib/ld-linux-aarch64.so.1
diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
index edb8376b1b..4b57f9aa7a 100644
--- a/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/systemd.manifest
@@ -2,7 +2,6 @@ bin/bash
 bin/coredumpctl
 bin/journalctl
 bin/mount
-bin/umount
 bin/systemctl
 bin/systemd-analyze
 bin/systemd-ask-password
@@ -22,17 +21,22 @@ bin/systemd-stdio-bridge
 bin/systemd-sysusers
 bin/systemd-tmpfiles
 bin/systemd-tty-ask-password-agent
-lib64/ld-2.21.so
+bin/umount
+lib64/ld-2.23.so
 lib64/ld-linux-aarch64.so.1
 lib64/libattr.so.1
 lib64/libattr.so.1.1.0
 lib64/libblkid.so.1
 lib64/libblkid.so.1.1.0
-lib64/libc-2.21.so
+lib64/libc-2.23.so
 lib64/libcap.so.2
 lib64/libcap.so.2.24
+lib64/libcryptsetup.so
+lib64/libcryptsetup.so.4
+lib64/libcryptsetup.so.4.7.0
 lib64/libc.so.6
-lib64/libdl-2.21.so
+lib64/libdevmapper.so.1.02
+lib64/libdl-2.23.so
 lib64/libdl.so
 lib64/libdl.so.2
 lib64/libgcrypt.so.20
@@ -43,27 +47,45 @@ lib64/libip4tc.so.0
 lib64/libip4tc.so.0.1.0
 lib64/libkmod.so.2
 lib64/libkmod.so.2.2.11
-lib64/liblzma.so.5.2.2
+lib64/liblz4.so
+lib64/liblz4.so.1
+lib64/liblz4.so.1.7.1
 lib64/liblzma.so.5
+lib64/liblzma.so.5.2.2
+lib64/libm-2.23.so
 lib64/libmount.so.1
 lib64/libmount.so.1.1.0
+lib64/libm.so.6
 lib64/libncurses.so.5
 lib64/libncurses.so.5.9
+lib64/libnss_files-2.23.so
 lib64/libnss_files.so.2
-lib64/libnss_files-2.21.so
 lib64/libpam.so.0
 lib64/libpam.so.0.84.1
-lib64/libpthread-2.21.so
+lib64/libpcrecpp.so
+lib64/libpcrecpp.so.0
+lib64/libpcrecpp.so.0.0.1
+lib64/libpthread-2.23.so
 lib64/libpthread.so.0
 lib64/libreadline.so.6
 lib64/libreadline.so.6.3
-lib64/librt-2.21.so
+lib64/librt-2.23.so
 lib64/librt.so.1
+lib64/libseccomp.so.2
+lib64/libseccomp.so.2.3.1
+lib64/libudev.so
+lib64/libudev.so.1
+lib64/libudev.so.1.6.6
 lib64/libuuid.so.1
 lib64/libuuid.so.1.3.0
 lib64/libz.so.1
-lib64/libz.so.1.2.8
+lib64/libz.so.1.2.11
 lib/ld-linux-aarch64.so.1
+lib/libgcc_s.so.1
+lib/libitm.so
+lib/libitm.so.1
+lib/libitm.so.1.0.0
+lib/systemd/libsystemd-shared-233.so
 lib/systemd/systemd
 lib/systemd/systemd-ac-power
 lib/systemd/systemd-backlight
@@ -92,6 +114,5 @@ lib/systemd/systemd-udevd
 lib/systemd/systemd-update-done
 lib/systemd/systemd-update-utmp
 lib/systemd/systemd-vconsole-setup
-lib/systemd/libsystemd-shared-231.so
 lib/systemd/system-sleep
 lib/systemd/user-generators
diff --git a/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest b/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
index 0975f8b0d9..be5064474a 100644
--- a/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
+++ b/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
@@ -3,7 +3,7 @@ bin/chown
 bin/ssh-keygen
 lib64/libcom_err.so.2
 lib64/libcom_err.so.2.1
-lib64/libcrypt-2.21.so
+lib64/libcrypt-2.23.so
 lib64/libcrypt.so.1
 lib64/libcrypto.so.1.0.0
 lib64/libgssapi_krb5.so.2
@@ -14,16 +14,16 @@ lib64/libkrb5.so.3
 lib64/libkrb5.so.3.3
 lib64/libkrb5support.so.0
 lib64/libkrb5support.so.0.1
-lib64/libnsl-2.21.so
+lib64/libnsl-2.23.so
 lib64/libnsl.so.1
-lib64/libnss_compat-2.21.so
+lib64/libnss_compat-2.23.so
 lib64/libnss_compat.so.2
-lib64/libnss_files-2.21.so
+lib64/libnss_files-2.23.so
 lib64/libnss_files.so.2
-lib64/libresolv-2.21.so
+lib64/libresolv-2.23.so
 lib64/libresolv.so.2
-lib64/libutil-2.21.so
+lib64/libutil-2.23.so
 lib64/libutil.so.1
 lib64/libz.so.1
-lib64/libz.so.1.2.8
+lib64/libz.so.1.2.11
 sbin/sshd
diff --git a/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest b/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest
index c983b94b65..378e7f9a3b 100644
--- a/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest
+++ b/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest
@@ -1,8 +1,8 @@
 bin/ip
 lib64/libdl.so.2
-lib64/libdl-2.21.so
+lib64/libdl-2.23.so
 lib64/libc.so.6
-lib64/libc-2.21.so
+lib64/libc-2.23.so
 lib64/ld-linux-aarch64.so.1
-lib64/ld-2.21.so
+lib64/ld-2.23.so
 lib/ld-linux-aarch64.so.1
diff --git a/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest b/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest
index 86575998f9..afbff0b71e 100644
--- a/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest
+++ b/stage1/usr_from_kvm/manifest-arm64-usr.d/sshd.manifest
@@ -2,20 +2,20 @@ bin/chmod
 bin/chown
 bin/ssh-keygen
 lib64/ld-linux-aarch64.so.1
-lib64/libc-2.21.so
-lib64/libcrypt-2.21.so
+lib64/libc-2.23.so
+lib64/libcrypt-2.23.so
 lib64/libcrypto.so.1.0.0
 lib64/libcrypt.so.1
 lib64/libc.so.6
-lib64/libdl-2.21.so
+lib64/libdl-2.23.so
 lib64/libdl.so.2
 lib64/libpam.so
 lib64/libpam.so.0.84.1
-lib64/libresolv-2.21.so
+lib64/libresolv-2.23.so
 lib64/libresolv.so.2
-lib64/libutil-2.21.so
+lib64/libutil-2.23.so
 lib64/libutil.so.1
 lib64/libz.so.1
-lib64/libz.so.1.2.8
+lib64/libz.so.1.2.11
 lib/ld-linux-aarch64.so.1
 sbin/sshd

From 7c7e833e9e196dde61422211bf8e7650098d91ef Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 8 Sep 2017 11:33:16 +0200
Subject: [PATCH 1172/1304] stage1: add systemd-journal-flush.service

systemd-v233 introduced a change in journald: the logs will not be
written in /var/log/journal until it is asked to. This is done by the
new unit systemd-journal-flush.service but rkt didn't include that unit.

rkt uses the systemd-nspawn option '--link-journal=try-guest', which
means the logs from the pod's /var/log/journal directory will be bind-mounted
to the host. So it is important to use the correct directory to have
"journalctl -M" working properly.

See: https://github.com/systemd/systemd/commit/f78273c8dacf678cc8fd7387f678e6344a99405c

This patch adds this new unit systemd-journal-flush.service in stage1,
both on the host flavor (taking the unit from the host if rkt detects systemd
>= v233) and on the default flavor (taking the unit from the coreos
image).
---
 stage1/init/init.go                                   | 11 +++++++++--
 .../manifest-amd64-usr.d/journald.manifest            |  1 +
 .../manifest-arm64-usr.d/journald.manifest            |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 26e5dd3aae..28852e63fe 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -190,7 +190,7 @@ func machinedRegister() bool {
 	return found == 2
 }
 
-func installAssets() error {
+func installAssets(systemdVersion int) error {
 	systemctlBin, err := common.LookupPath("systemctl", os.Getenv("PATH"))
 	if err != nil {
 		return err
@@ -250,6 +250,13 @@ func installAssets() error {
 		proj2aci.GetAssetString(systemdShutdownBin, systemdShutdownBin),
 	}
 
+	// systemd-journal-flush.service was added in systemd-v233. Required to place
+	// the logs in /var/log/journal instead of /run/log/journal. See:
+	// https://github.com/systemd/systemd/commit/f78273c8dacf678cc8fd7387f678e6344a99405c
+	if systemdVersion >= 233 {
+		assets = append(assets, proj2aci.GetAssetString(fmt.Sprintf("%s/systemd-journal-flush.service", systemdUnitsPath), fmt.Sprintf("%s/systemd-journald.service", systemdUnitsPath)))
+	}
+
 	return proj2aci.PrepareAssets(assets, "./stage1/rootfs/", nil)
 }
 
@@ -411,7 +418,7 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 		}
 
 		// Copy systemd, bash, etc. in stage1 at run-time
-		if err := installAssets(); err != nil {
+		if err := installAssets(version); err != nil {
 			return nil, nil, errwrap.Wrap(errors.New("cannot install assets from the host"), err)
 		}
 
diff --git a/stage1/usr_from_coreos/manifest-amd64-usr.d/journald.manifest b/stage1/usr_from_coreos/manifest-amd64-usr.d/journald.manifest
index 5db0061c21..c4af2d7433 100644
--- a/stage1/usr_from_coreos/manifest-amd64-usr.d/journald.manifest
+++ b/stage1/usr_from_coreos/manifest-amd64-usr.d/journald.manifest
@@ -3,3 +3,4 @@ lib64/systemd/system/systemd-journald-audit.socket
 lib64/systemd/system/systemd-journald-dev-log.socket
 lib64/systemd/system/systemd-journald.service
 lib64/systemd/system/systemd-journald.socket
+lib64/systemd/system/systemd-journal-flush.service
diff --git a/stage1/usr_from_coreos/manifest-arm64-usr.d/journald.manifest b/stage1/usr_from_coreos/manifest-arm64-usr.d/journald.manifest
index 04637a41c4..91aaf197ae 100644
--- a/stage1/usr_from_coreos/manifest-arm64-usr.d/journald.manifest
+++ b/stage1/usr_from_coreos/manifest-arm64-usr.d/journald.manifest
@@ -3,3 +3,4 @@ lib/systemd/system/systemd-journald-audit.socket
 lib/systemd/system/systemd-journald-dev-log.socket
 lib/systemd/system/systemd-journald.service
 lib/systemd/system/systemd-journald.socket
+lib/systemd/system/systemd-journal-flush.service

From 161fa3de3bfbbe07182562708eb8efcf566bb48d Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 5 Sep 2017 18:13:51 +0200
Subject: [PATCH 1173/1304] stage1: ensure systemd parameter MountAPIVFS is
 disabled

systemd implicitely set MountAPIVFS to true whenever we have
ProtectKernelTunables=true.

It was causing a regression on test TestVolumeSysfs with systemd >= v233

Symptoms:

> rkt_tests.go:410: didn't receive expected output "/sys/class: mode: Dcrw-rw-rw-": image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.28.1+gitc779c926
>
> [ 4385.848746] rkt-inspect[5]: /sys/class: mode: drwxr-xr-x
---
 stage1/init/common/units.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 5577630e93..fc11306eed 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -595,7 +595,17 @@ func (uw *UnitWriter) appSystemdUnit(pa *preparedApp, binPath string, opts []*un
 		}
 
 		if systemdVersion >= 233 {
-			opts = append(opts, unit.NewUnitOption("Service", "ProtectKernelTunables", "true"))
+			// ProtectKernelTunables is introduced in systemd-v232 but didn't work
+			// until v233 due to a systemd bug, see
+			// https://github.com/systemd/systemd/pull/4594
+			// However, from v233, setting ProtectKernelTunables + RootDirectory causes
+			// MountAPIVFS to be enabled unconditionally, which we don't want.
+			//
+			// opts = append(opts, unit.NewUnitOption("Service", "ProtectKernelTunables", "true"))
+
+			// MountAPIVFS is introduced in systemd-233. Don't let systemd mount /sys:
+			// it is mounted by prepare-app (tested by TestVolumeSysfs)
+			opts = append(opts, unit.NewUnitOption("Service", "MountAPIVFS", "false"))
 		}
 
 		// MountFlags=shared creates a new mount namespace and (as unintuitive

From 6ecc19f3a81627a547d307adf3363f9a7046fa17 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Wed, 6 Sep 2017 12:47:12 +0200
Subject: [PATCH 1174/1304] stage1: enable host IPC namespace

rkt normally creates a new IPC namespace for the pod. In order to stay
in the host IPC namespace, a new option is added:

  --ipc=[auto|private|parent]
---
 .../devel/stage1-implementors-guide.md        |  6 ++++
 Documentation/subcommands/run-prepared.md     |  1 +
 Documentation/subcommands/run.md              |  1 +
 rkt/run.go                                    |  3 ++
 rkt/run_prepared.go                           |  1 +
 stage0/manifest.go                            |  4 +++
 stage0/run.go                                 |  9 ++++++
 stage1/aci/aci-manifest.in                    |  2 +-
 stage1/common/types/pod.go                    |  1 +
 stage1/init/init.go                           | 28 +++++++++++++++++--
 10 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index f061362275..e275cb3d9d 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -96,6 +96,12 @@ This interface version is not yet finalized, thus marked as experimental.
 
 * `--mutable` to run a mutable pod
 
+#### Arguments added in interface version 6
+
+* `--ipc=[auto|private|parent]` (default to `auto` if missing): Allows to stay in the host IPC namespace. The default
+	to `auto` does what makes more sense for the flavor (`parent` for `stage1-fly` and `private` for `stage1-coreos`
+	and `stage1-kvm`).
+
 ### rkt enter
 
 `coreos.com/rkt/stage1/enter`
diff --git a/Documentation/subcommands/run-prepared.md b/Documentation/subcommands/run-prepared.md
index b5aded4f4f..feb6ec4f98 100644
--- a/Documentation/subcommands/run-prepared.md
+++ b/Documentation/subcommands/run-prepared.md
@@ -50,6 +50,7 @@ c9fad0e6    etcd    coreos.com/etcd prepared
 | `--dns-search` |  `` | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times |
 | `--hostname` | "rkt-$PODUUID" | A host name | Set pod's host name. |
 | `--interactive` |  `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied |
+| `--ipc` | `auto` | `auto`, `private` or `parent` | Whether to stay in the host IPC namespace. |
 | `--mds-register` |  `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net=(default|default-restricted|host)` |
 | `--net` |  `default` | A comma-separated list of networks. Syntax: `--net[=n[:args], ...]` | Configure the pod's networking. Optionally, pass a list of user-configured networks to load and set arguments to pass to each network, respectively |
 
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 3b6245dc86..b92fc9ec49 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -401,6 +401,7 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--hostname` | `rkt-$PODUUID` | A host name | Set pod's host name. |
 | `--inherit-env` | `false` | `true` or `false` | Inherit all environment variables not set by apps. |
 | `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
+| `--ipc` | `auto` | `auto`, `private` or `parent` | Whether to stay in the host IPC namespace. |
 | `--mds-register` | `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net` as `default`, `default-restricted`, or `host`). |
 | `--memory` | none | Memory units (e.g. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
 | `--mount` | none | Mount syntax (e.g. `--mount volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
diff --git a/rkt/run.go b/rkt/run.go
index e0b26041a6..b1a0ce8457 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -78,6 +78,7 @@ image arguments with a lone "---" to resume argument parsing.`,
 	flagHostname     string
 	flagHostsEntries flagStringList
 	flagPullPolicy   string
+	flagIPCMode      string
 )
 
 func addIsolatorFlags(cmd *cobra.Command, compat bool) {
@@ -153,6 +154,7 @@ func init() {
 	cmdRun.Flags().StringVar(&flagUUIDFileSave, "uuid-file-save", "", "write out pod UUID to specified file")
 	cmdRun.Flags().StringVar(&flagHostname, "hostname", "", `pod's hostname. If empty, it will be "rkt-$PODUUID"`)
 	cmdRun.Flags().Var((*appsVolume)(&rktApps), "volume", "volumes to make available in the pod")
+	cmdRun.Flags().StringVar(&flagIPCMode, "ipc", "", `whether to stay in the host IPC namespace. Syntax: --ipc=[auto|private|parent]`)
 
 	// per-app flags
 	cmdRun.Flags().Var((*appAsc)(&rktApps), "signature", "local signature file to use in validating the preceding image")
@@ -394,6 +396,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		InsecureSeccomp:      globalFlags.InsecureFlags.SkipSeccomp(),
 		UseOverlay:           useOverlay,
 		HostsEntries:         *HostsEntries,
+		IPCMode:              flagIPCMode,
 	}
 
 	_, manifest, err := p.PodManifest()
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index 19f976ac7e..945ee987b4 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -52,6 +52,7 @@ func init() {
 	cmdRunPrepared.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively")
 	cmdRunPrepared.Flags().BoolVar(&flagMDSRegister, "mds-register", false, "register pod with metadata service")
 	cmdRunPrepared.Flags().StringVar(&flagHostname, "hostname", "", `pod's hostname. If empty, it will be "rkt-$PODUUID"`)
+	cmdRunPrepared.Flags().StringVar(&flagIPCMode, "ipc", "", `whether to stay in the host IPC namespace. Syntax: --ipc=[auto|private|parent]`)
 }
 
 func runRunPrepared(cmd *cobra.Command, args []string) (exit int) {
diff --git a/stage0/manifest.go b/stage0/manifest.go
index 9c8056856d..f56f357877 100644
--- a/stage0/manifest.go
+++ b/stage0/manifest.go
@@ -125,3 +125,7 @@ func interfaceVersionSupportsDNSConfMode(version int) bool {
 func interfaceVersionSupportsGCLocalConfig(version int) bool {
 	return version >= 5
 }
+
+func interfaceVersionSupportsIPCMode(version int) bool {
+	return version >= 6
+}
diff --git a/stage0/run.go b/stage0/run.go
index a4d4d8c6a0..42afd4b1b2 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -91,6 +91,7 @@ type RunConfig struct {
 	InsecureSeccomp      bool           // Do not add seccomp restrictions
 	UseOverlay           bool           // run pod with overlay fs
 	HostsEntries         HostsEntries   // The entries in /etc/hosts
+	IPCMode              string         // whether to stay in the host IPC namespace
 }
 
 // CommonConfig defines the configuration shared by both Run and Prepare
@@ -677,6 +678,14 @@ func Run(cfg RunConfig, dir string, dataDir string) {
 		args = append(args, "--mutable")
 	}
 
+	if cfg.IPCMode != "" {
+		if interfaceVersionSupportsIPCMode(s1v) {
+			args = append(args, "--ipc="+cfg.IPCMode)
+		} else {
+			log.Printf("warning: --ipc option is not supported by stage1")
+		}
+	}
+
 	args = append(args, cfg.UUID.String())
 
 	// make sure the lock fd stays open across exec
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index e8a3614531..f3842ed336 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -55,7 +55,7 @@
         },
         {
             "name": "coreos.com/rkt/stage1/interface-version",
-            "value": "5"
+            "value": "6"
         }
     ]
 }
diff --git a/stage1/common/types/pod.go b/stage1/common/types/pod.go
index 3be56ded2a..7ae5c1a7b2 100644
--- a/stage1/common/types/pod.go
+++ b/stage1/common/types/pod.go
@@ -71,6 +71,7 @@ type RuntimePod struct {
 		DisableCapabilities bool `json:"DisableCapabilities"`
 		DisableSeccomp      bool `json:"DisableSeccomp"`
 	} `json:"InsecureOptions"`
+	IPCMode string `json:"IPCMode"`
 }
 
 // AppNameToImageName takes the name of an app in the Pod and returns the name
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 28852e63fe..61ab3a4c4d 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -134,6 +134,7 @@ func parseFlags() *stage1commontypes.RuntimePod {
 		"hosts":  "default",
 	})
 	flag.Var(dnsConfMode, "dns-conf-mode", "DNS config file modes")
+	flag.StringVar(&rp.IPCMode, "ipc", "", "IPC mode --ipc=[auto|private|parent]")
 
 	flag.Parse()
 
@@ -262,7 +263,7 @@ func installAssets(systemdVersion int) error {
 
 // getArgsEnv returns the nspawn or lkvm args and env according to the flavor
 // as the first two return values respectively.
-func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister bool, debug bool, n *networking.Networking) ([]string, []string, error) {
+func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister bool, debug bool, n *networking.Networking, parentIPC bool) ([]string, []string, error) {
 	var args []string
 	env := os.Environ()
 
@@ -475,6 +476,10 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 		env = append(env, "SYSTEMD_LOG_LEVEL=err") // silence log_warning too
 	}
 
+	if parentIPC {
+		env = append(env, "SYSTEMD_NSPAWN_SHARE_NS_IPC=true")
+	}
+
 	env = append(env, "SYSTEMD_NSPAWN_CONTAINER_SERVICE=rkt")
 	// TODO (alepuccetti) remove this line when rkt will use cgroup namespace
 	// If the kernel has the cgroup namespace enabled, systemd v232 will use it by default.
@@ -655,7 +660,26 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 	}
 	diag.Printf("canMachinedRegister %t", canMachinedRegister)
 
-	args, env, err := getArgsEnv(p, flavor, canMachinedRegister, debug, n)
+	// --ipc=[auto|private|parent]
+	// default to private
+	parentIPC := false
+	switch p.IPCMode {
+	case "parent":
+		parentIPC = true
+	case "private":
+		parentIPC = false
+	case "auto":
+		fallthrough
+	case "":
+		parentIPC = false
+	default:
+		log.Fatalf("unknown value for --ipc parameter: %v", p.IPCMode)
+	}
+	if parentIPC && flavor == "kvm" {
+		log.Fatal("flavor kvm requires private IPC namespace (try to remove --ipc)")
+	}
+
+	args, env, err := getArgsEnv(p, flavor, canMachinedRegister, debug, n, parentIPC)
 	if err != nil {
 		log.FatalE("cannot get environment", err)
 	}

From 66b7c4ddc5b6fb8a5c3522a7fe4596c667f712d5 Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Fri, 8 Sep 2017 18:06:50 +0200
Subject: [PATCH 1175/1304] test: ipc: new test for --ipc=

---
 tests/inspect/inspect.go | 11 +++++
 tests/rkt_ipcns_test.go  | 99 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 tests/rkt_ipcns_test.go

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 792189e371..970f64423e 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -70,6 +70,7 @@ var (
 		Content            string
 		CheckCgroupMounts  bool
 		PrintNetNS         bool
+		PrintIpcNS         bool
 		PrintIPv4          string
 		PrintIPv6          string
 		PrintDefaultGWv4   bool
@@ -116,6 +117,7 @@ func init() {
 	globalFlagset.StringVar(&globalFlags.Content, "content", "", "The content to write, $CONTENT will be ignored if this is specified")
 	globalFlagset.BoolVar(&globalFlags.CheckCgroupMounts, "check-cgroups", false, "Try to write to the cgroup filesystem. Everything should be RO except some well-known files")
 	globalFlagset.BoolVar(&globalFlags.PrintNetNS, "print-netns", false, "Print the network namespace")
+	globalFlagset.BoolVar(&globalFlags.PrintIpcNS, "print-ipcns", false, "Print the IPC namespace")
 	globalFlagset.StringVar(&globalFlags.PrintIPv4, "print-ipv4", "", "Takes an interface name and prints its IPv4")
 	globalFlagset.StringVar(&globalFlags.PrintIPv6, "print-ipv6", "", "Takes an interface name and prints its IPv6")
 	globalFlagset.BoolVar(&globalFlags.PrintDefaultGWv4, "print-defaultgwv4", false, "Print the default IPv4 gateway")
@@ -539,6 +541,15 @@ func main() {
 		fmt.Printf("NetNS: %s\n", ns)
 	}
 
+	if globalFlags.PrintIpcNS {
+		ns, err := os.Readlink("/proc/self/ns/ipc")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%v\n", err)
+			os.Exit(1)
+		}
+		fmt.Printf("IPCNS: %s\n", ns)
+	}
+
 	if globalFlags.PrintIPv4 != "" {
 		iface := globalFlags.PrintIPv4
 		ips, err := testutils.GetIPsv4(iface)
diff --git a/tests/rkt_ipcns_test.go b/tests/rkt_ipcns_test.go
new file mode 100644
index 0000000000..896e6e8eb9
--- /dev/null
+++ b/tests/rkt_ipcns_test.go
@@ -0,0 +1,99 @@
+// Copyright 2016-2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !fly,!kvm
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/rkt/rkt/tests/testutils"
+)
+
+// TestIpc test that the --ipc option works.
+func TestIpc(t *testing.T) {
+	imageFile := patchTestACI("rkt-inspect-ipc.aci", "--exec=/inspect --print-ipcns")
+	defer os.Remove(imageFile)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	hostIpcNs, err := os.Readlink("/proc/self/ns/ipc")
+	if err != nil {
+		t.Fatalf("Cannot evaluate IPC NS symlink: %v", err)
+	}
+
+	tests := []struct {
+		option string
+		host   bool
+		ret    int
+	}{
+		{
+			"",
+			false,
+			0,
+		},
+		{
+			"--ipc=auto",
+			false,
+			0,
+		},
+		{
+			"--ipc=private",
+			false,
+			0,
+		},
+		{
+			"--ipc=parent",
+			true,
+			0,
+		},
+		{
+			"--ipc=supercalifragilisticexpialidocious",
+			false,
+			254,
+		},
+	}
+
+	for _, tt := range tests {
+		cmd := fmt.Sprintf("%s run --insecure-options=image %s %s", ctx.Cmd(), tt.option, imageFile)
+
+		child := spawnOrFail(t, cmd)
+		ctx.RegisterChild(child)
+
+		expectedRegex := `IPCNS: (ipc:\[\d+\])`
+
+		result, out, err := expectRegexWithOutput(child, expectedRegex)
+		if tt.ret == 0 {
+			if err != nil {
+				t.Fatalf("Error: %v\nOutput: %v", err, out)
+			}
+
+			nsChanged := hostIpcNs != result[1]
+			if tt.host == nsChanged {
+				t.Fatalf("unexpected ipc ns %q for with option %q (host ipc ns %q)", result, tt.option, hostIpcNs)
+			}
+		} else {
+			if err == nil {
+				t.Fatalf("test %q didn't fail as expected\nOutput: %v", tt.option, out)
+			}
+
+		}
+
+		waitOrFail(t, child, tt.ret)
+	}
+}

From 267fc72acde11e05e8e64cf8fc5f1622ae33be47 Mon Sep 17 00:00:00 2001
From: JulienBalestra <julien.balestra@gmail.com>
Date: Mon, 18 Sep 2017 15:53:54 +0200
Subject: [PATCH 1176/1304] image: set the header instead of adding it

---
 rkt/image/resumablesession.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/image/resumablesession.go b/rkt/image/resumablesession.go
index 5baf2bd016..2c1c4fc077 100644
--- a/rkt/image/resumablesession.go
+++ b/rkt/image/resumablesession.go
@@ -361,7 +361,7 @@ func (s *resumableSession) setHTTPHeaders(req *http.Request, stripAuth bool) {
 			continue
 		}
 		for _, e := range v {
-			req.Header.Add(k, e)
+			req.Header.Set(k, e)
 		}
 	}
 	req.Header.Add("User-Agent", fmt.Sprintf("rkt/%s", version.Version))

From 9c27eead7cb9f0b6a256830e24dfe09e471cca98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 18 Sep 2017 17:50:54 +0200
Subject: [PATCH 1177/1304] stage0,rkt: don't require the pod to be running to
 remove apps

The kubelet tries to remove apps from pods that are stopped and there's
no reason to prevent the removal of apps from not running pods, actually
it was considered in some parts of stage0.RmApp().

Let's not require pods to be running to remove apps. If the pod is
running, we'll still stop the app units and so on. If not, we just
remove the app.
---
 pkg/pod/sandbox.go | 10 +---------
 rkt/app_rm.go      | 26 ++++++++++++--------------
 stage0/app_add.go  |  4 ++++
 stage0/app_rm.go   | 13 ++++++++++---
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/pkg/pod/sandbox.go b/pkg/pod/sandbox.go
index 5ca9b996fc..9abcf90e44 100644
--- a/pkg/pod/sandbox.go
+++ b/pkg/pod/sandbox.go
@@ -94,12 +94,8 @@ func (p *Pod) UpdateManifest(m *schema.PodManifest, path string) error {
 }
 
 // ExclusiveLockManifest gets an exclusive lock on only the pod manifest in the app sandbox.
-// Since the pod is already running, we won't be able to get an exclusive lock on the pod itself.
+// Since the pod might already be running, we can't just get an exclusive lock on the pod itself.
 func (p *Pod) ExclusiveLockManifest() error {
-	if !p.isRunning() {
-		return errors.New("pod is not running")
-	}
-
 	if p.manifestLock != nil {
 		return p.manifestLock.ExclusiveLock() // This is idempotent
 	}
@@ -115,10 +111,6 @@ func (p *Pod) ExclusiveLockManifest() error {
 
 // UnlockManifest unlocks the pod manifest lock.
 func (p *Pod) UnlockManifest() error {
-	if !p.isRunning() {
-		return errors.New("pod is not running")
-	}
-
 	if p.manifestLock == nil {
 		return nil
 	}
diff --git a/rkt/app_rm.go b/rkt/app_rm.go
index e892ee597e..0acb899ebc 100644
--- a/rkt/app_rm.go
+++ b/rkt/app_rm.go
@@ -61,20 +61,18 @@ func runAppRm(cmd *cobra.Command, args []string) (exit int) {
 		stderr.PrintE("invalid app name", err)
 	}
 
-	if p.State() != pkgPod.Running {
-		stderr.Printf("pod %q is not running", p.UUID)
-		return 254
-	}
-
-	if !p.IsSupervisorReady() {
-		stderr.Printf("supervisor for pod %q is not ready yet", p.UUID)
-		return 254
-	}
-
-	podPID, err := p.ContainerPid1()
-	if err != nil {
-		stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
-		return 254
+	var podPID int
+	if p.State() == pkgPod.Running {
+		if !p.IsSupervisorReady() {
+			stderr.Printf("pod %q is running but its supervisor is not ready yet", p.UUID)
+			return 254
+		}
+
+		podPID, err = p.ContainerPid1()
+		if err != nil {
+			stderr.PrintE(fmt.Sprintf("unable to determine the pid for pod %q", p.UUID), err)
+			return 254
+		}
 	}
 
 	ccfg := stage0.CommonConfig{
diff --git a/stage0/app_add.go b/stage0/app_add.go
index 62e14d356a..68b60d4272 100644
--- a/stage0/app_add.go
+++ b/stage0/app_add.go
@@ -74,6 +74,10 @@ func AddApp(cfg AddConfig) error {
 	}
 	defer pod.Close()
 
+	if pod.State() != pkgPod.Running {
+		return errors.New("pod is not running")
+	}
+
 	debug("locking pod manifest")
 	if err := pod.ExclusiveLockManifest(); err != nil {
 		return errwrap.Wrap(errors.New("failed to lock pod manifest"), err)
diff --git a/stage0/app_rm.go b/stage0/app_rm.go
index ba02a4bd37..6a352cd443 100644
--- a/stage0/app_rm.go
+++ b/stage0/app_rm.go
@@ -102,7 +102,9 @@ func RmApp(cfg RmConfig) error {
 		}
 
 		appRootfs := common.AppRootfsPath(cfg.PodPath, *cfg.AppName)
-		if err := syscall.Unmount(appRootfs, 0); err != nil {
+		// if the system reboots stage1 won't be mounted and appRootfs won't
+		// exist, ignore this error
+		if err := syscall.Unmount(appRootfs, 0); err != nil && !os.IsNotExist(err) {
 			return err
 		}
 
@@ -121,12 +123,17 @@ func RmApp(cfg RmConfig) error {
 		return err
 	}
 
-	appStatusPath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "status", cfg.AppName.String())
+	stage1RootfsPath, err := pod.Stage1RootfsPath()
+	if err != nil {
+		return err
+	}
+
+	appStatusPath := filepath.Join(stage1RootfsPath, "rkt", "status", cfg.AppName.String())
 	if err := os.Remove(appStatusPath); err != nil && !os.IsNotExist(err) {
 		return err
 	}
 
-	envPath := filepath.Join(common.Stage1RootfsPath(cfg.PodPath), "rkt", "env", cfg.AppName.String())
+	envPath := filepath.Join(stage1RootfsPath, "rkt", "env", cfg.AppName.String())
 	if err := os.Remove(envPath); err != nil && !os.IsNotExist(err) {
 		return err
 	}

From 374d8ba3a11db7d69b31c1e80943e871dec9297d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 18 Sep 2017 17:50:58 +0200
Subject: [PATCH 1178/1304] lib: don't error out if we can't get the app exit
 code

This can happen if the pod dies but we don't have time to register
the app exit code.

Let's be more flexible here and continue even then.
---
 lib/app.go | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/lib/app.go b/lib/app.go
index 0f6098c0c4..2572a0334b 100644
--- a/lib/app.go
+++ b/lib/app.go
@@ -16,7 +16,6 @@ package rkt
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/appc/spec/schema"
@@ -184,11 +183,14 @@ func appStateInMutablePod(app *v1.App, pod *pkgPod.Pod) error {
 	finishedAt := fi.ModTime().UnixNano()
 	app.FinishedAt = &finishedAt
 
-	// Read exit code.
-	exitCode, err := readExitCode(appStatusFile)
+	code, err := pod.AppExitCode(app.Name)
 	if err != nil {
-		return err
+		// if we can't get the exit code (e.g. we didn't have time to write it
+		// after a pod dies) let's continue instead of erroring out, the exit code
+		// will be a generic 1 and we'll let callers handle it.
+		code = 1
 	}
+	exitCode := int32(code)
 	app.ExitCode = &exitCode
 
 	return nil
@@ -248,16 +250,3 @@ func appStateFromPod(pod *pkgPod.Pod) v1.AppState {
 		return v1.AppStateUnknown
 	}
 }
-
-func readExitCode(path string) (int32, error) {
-	var exitCode int32
-
-	b, err := ioutil.ReadFile(path)
-	if err != nil {
-		return -1, fmt.Errorf("cannot read app exited file: %v", err)
-	}
-	if _, err := fmt.Sscanf(string(b), "%d", &exitCode); err != nil {
-		return -1, fmt.Errorf("cannot parse exit code: %v", err)
-	}
-	return exitCode, nil
-}

From 3fada4c5e90c38518af820d4023680734e579ac7 Mon Sep 17 00:00:00 2001
From: Casey Callendrello <casey.callendrello@coreos.com>
Date: Tue, 19 Sep 2017 12:31:45 +0200
Subject: [PATCH 1179/1304] vendor: bump appc/spec to v0.8.11

---
 Documentation/app-container.md                        |  4 ++--
 Documentation/devel/stage1-implementors-guide.md      |  2 +-
 Documentation/proposals/oci.md                        |  6 +++---
 Documentation/subcommands/cat-manifest.md             |  2 +-
 Documentation/subcommands/image.md                    |  2 +-
 Documentation/subcommands/version.md                  |  2 +-
 glide.lock                                            |  6 +++---
 glide.yaml                                            |  2 +-
 stage1/aci/aci-manifest.in                            |  2 +-
 stage1_fly/aci/aci-manifest.in                        |  2 +-
 store/imagestore/store_test.go                        |  6 +++---
 tests/empty-image/manifest                            |  2 +-
 tests/image/manifest                                  |  2 +-
 tests/rkt-monitor/build-too-many-apps.sh              |  2 +-
 tests/stub-stage1/manifest                            |  2 +-
 .../appc/spec/ace/image_manifest_main.json.in         |  8 ++++----
 .../appc/spec/ace/image_manifest_sidekick.json.in     |  8 ++++----
 vendor/github.com/appc/spec/schema/pod.go             |  9 +++++++++
 .../github.com/appc/spec/schema/types/environment.go  |  2 +-
 .../appc/spec/schema/types/isolator_linux_specific.go | 10 +++++++---
 vendor/github.com/appc/spec/schema/types/labels.go    | 11 ++++++++---
 vendor/github.com/appc/spec/schema/version.go         |  2 +-
 22 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index 6e5c031b23..0236477845 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -35,8 +35,8 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 # rkt --insecure-options=image run \
 	--mds-register \
 	--volume=database,kind=host,source=/tmp \
-	https://github.com/appc/spec/releases/download/v0.8.10/ace-validator-main.aci \
-	https://github.com/appc/spec/releases/download/v0.8.10/ace-validator-sidekick.aci
+	https://github.com/appc/spec/releases/download/v0.8.11/ace-validator-main.aci \
+	https://github.com/appc/spec/releases/download/v0.8.11/ace-validator-sidekick.aci
 ```
 
 [acbuild]: https://github.com/containers/build
diff --git a/Documentation/devel/stage1-implementors-guide.md b/Documentation/devel/stage1-implementors-guide.md
index e275cb3d9d..4ac5e11b91 100644
--- a/Documentation/devel/stage1-implementors-guide.md
+++ b/Documentation/devel/stage1-implementors-guide.md
@@ -253,7 +253,7 @@ If the annotation is not present, rkt assumes the version is 1.
 ```json
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "foo.com/rkt/stage1",
     "labels": [
         {
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index a014e2aec8..a540a37f95 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -130,9 +130,9 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [docker2aci]: https://github.com/appc/docker2aci
 [oci-runtime]: https://github.com/opencontainers/runtime-spec
 
-[aci]: https://github.com/appc/spec/blob/v0.8.10/spec/aci.md#app-container-image
-[ace-fs]: https://github.com/appc/spec/blob/v0.8.10/spec/ace.md#filesystem-setup
-[appc-image-id-type]: https://github.com/appc/spec/blob/v0.8.10/spec/types.md#image-id-type
+[aci]: https://github.com/appc/spec/blob/v0.8.11/spec/aci.md#app-container-image
+[ace-fs]: https://github.com/appc/spec/blob/v0.8.11/spec/ace.md#filesystem-setup
+[appc-image-id-type]: https://github.com/appc/spec/blob/v0.8.11/spec/types.md#image-id-type
 
 [oci]: https://github.com/opencontainers/image-spec
 [oci-manifest]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/manifest.md#image-manifest
diff --git a/Documentation/subcommands/cat-manifest.md b/Documentation/subcommands/cat-manifest.md
index 282bce0c0c..95196b5874 100644
--- a/Documentation/subcommands/cat-manifest.md
+++ b/Documentation/subcommands/cat-manifest.md
@@ -5,7 +5,7 @@ For debugging or inspection you may want to extract the PodManifest to stdout.
 ```
 # rkt cat-manifest UUID
 {
-  "acVersion":"0.8.10",
+  "acVersion":"0.8.11",
   "acKind":"PodManifest"
 ...
 ```
diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index 81564bac1a..aa2bb8f900 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -7,7 +7,7 @@ For debugging or inspection you may want to extract an ACI manifest to stdout.
 ```
 # rkt image cat-manifest coreos.com/etcd
 {
-  "acVersion": "0.8.10",
+  "acVersion": "0.8.11",
   "acKind": "ImageManifest",
 ...
 ```
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index 50a87e9cb8..e4ae3ac1a5 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -7,6 +7,6 @@ This command prints the rkt version, the appc version rkt is built against, and
 ```
 $ rkt version
 rkt Version: 1.28.1
-appc Version: 0.8.10
+appc Version: 0.8.11
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/glide.lock b/glide.lock
index 74f77b0c18..a2a1404be2 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 0d70dcd3d02dde6c7f3a493536fb7629dfb18151eaef79fff15fc05439f69674
-updated: 2017-08-01T11:21:48.713539074+02:00
+hash: 5b06576039a24b5039701b611547d833429d8c94bcaf8c0c87e86a17eae97a55
+updated: 2017-09-19T12:27:26.119724281+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: 4537ee8e3139455eac6092d47a224d8fa19bf08a
@@ -20,7 +20,7 @@ imports:
   subpackages:
   - proj2aci
 - name: github.com/appc/spec
-  version: ba99d6b8ccbbed2942e53eb5395fddae113cdf8e
+  version: cbe99b7160b1397bf89f9c8bb1418f69c9424049
   subpackages:
   - ace
   - aci
diff --git a/glide.yaml b/glide.yaml
index b6bac47fba..441187181d 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,7 +20,7 @@ import:
   subpackages:
   - proj2aci
 - package: github.com/appc/spec
-  version: v0.8.10
+  version: v0.8.11
   subpackages:
   - ace
   - aci
diff --git a/stage1/aci/aci-manifest.in b/stage1/aci/aci-manifest.in
index f3842ed336..b64146a875 100644
--- a/stage1/aci/aci-manifest.in
+++ b/stage1/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "@RKT_STAGE1_NAME@",
     "labels": [
         {
diff --git a/stage1_fly/aci/aci-manifest.in b/stage1_fly/aci/aci-manifest.in
index f3fc36b669..3cd08728f6 100644
--- a/stage1_fly/aci/aci-manifest.in
+++ b/stage1_fly/aci/aci-manifest.in
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "coreos.com/rkt/stage1-fly",
     "labels": [
         {
diff --git a/store/imagestore/store_test.go b/store/imagestore/store_test.go
index d63b6a307d..f1f94e78bc 100644
--- a/store/imagestore/store_test.go
+++ b/store/imagestore/store_test.go
@@ -228,7 +228,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.10",
+						"acVersion": "0.8.11",
 						"name": "example.com/test01"
 					}`,
 					false,
@@ -236,7 +236,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.10",
+						"acVersion": "0.8.11",
 						"name": "example.com/test02",
 						"labels": [
 							{
@@ -250,7 +250,7 @@ func TestGetAci(t *testing.T) {
 				{
 					`{
 						"acKind": "ImageManifest",
-						"acVersion": "0.8.10",
+						"acVersion": "0.8.11",
 						"name": "example.com/test02",
 						"labels": [
 							{
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index ac6eaf1727..ba501bfbc5 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "coreos.com/rkt-empty",
     "labels": [
         {
diff --git a/tests/image/manifest b/tests/image/manifest
index 59055cfede..a871dfdd2d 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "coreos.com/rkt-inspect",
     "labels": [
         {
diff --git a/tests/rkt-monitor/build-too-many-apps.sh b/tests/rkt-monitor/build-too-many-apps.sh
index e98fb5fd3c..eb6bf34876 100755
--- a/tests/rkt-monitor/build-too-many-apps.sh
+++ b/tests/rkt-monitor/build-too-many-apps.sh
@@ -45,7 +45,7 @@ OUTPUT=${PWD}/too-many-apps.podmanifest
 
 cat <<EOF >${OUTPUT}
 {
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "acKind": "PodManifest",
     "apps": [
 EOF
diff --git a/tests/stub-stage1/manifest b/tests/stub-stage1/manifest
index 8b62f48007..358074d2f8 100644
--- a/tests/stub-stage1/manifest
+++ b/tests/stub-stage1/manifest
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "name": "localhost/rkt-stub-stage1",
     "labels": [
         {
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
index ddfc3ab2f2..13e0fd9e39 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_main.json.in
@@ -1,11 +1,11 @@
 {
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.10" },
-        { "name": "os", "value": "@GOOS@" },
-        { "name": "arch", "value": "@GOARCH@" }
+        { "name": "version", "value": "0.8.11" },
+        { "name": "os", "value": "@ACI_OS@" },
+        { "name": "arch", "value": "@ACI_ARCH@" }
     ],
     "app": {
         "exec": [
diff --git a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
index accff02f5f..74b037c469 100644
--- a/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
+++ b/vendor/github.com/appc/spec/ace/image_manifest_sidekick.json.in
@@ -1,11 +1,11 @@
 {
-    "acVersion": "0.8.10",
+    "acVersion": "0.8.11",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.10" },
-        { "name": "os", "value": "@GOOS@" },
-        { "name": "arch", "value": "@GOARCH@" }
+        { "name": "version", "value": "0.8.11" },
+        { "name": "os", "value": "@ACI_OS@" },
+        { "name": "arch", "value": "@ACI_ARCH@" }
     ],
     "app": {
         "exec": [
diff --git a/vendor/github.com/appc/spec/schema/pod.go b/vendor/github.com/appc/spec/schema/pod.go
index 9ed6c9e0a6..a834e51bdd 100644
--- a/vendor/github.com/appc/spec/schema/pod.go
+++ b/vendor/github.com/appc/spec/schema/pod.go
@@ -83,6 +83,15 @@ func (pm *PodManifest) assertValid() error {
 	if pm.ACKind != PodManifestKind {
 		return pmKindError
 	}
+
+	// ensure volumes names are unique (unique key)
+	volNames := make(map[types.ACName]bool, len(pm.Volumes))
+	for _, vol := range pm.Volumes {
+		if volNames[vol.Name] {
+			return fmt.Errorf("duplicate volume name %q", vol.Name)
+		}
+		volNames[vol.Name] = true
+	}
 	return nil
 }
 
diff --git a/vendor/github.com/appc/spec/schema/types/environment.go b/vendor/github.com/appc/spec/schema/types/environment.go
index f152a6b88d..3e7b18fade 100644
--- a/vendor/github.com/appc/spec/schema/types/environment.go
+++ b/vendor/github.com/appc/spec/schema/types/environment.go
@@ -21,7 +21,7 @@ import (
 )
 
 var (
-	envPattern = regexp.MustCompile("^[A-Za-z_][A-Za-z_0-9]*$")
+	envPattern = regexp.MustCompile("^[A-Za-z_][A-Za-z_0-9.-]*$")
 )
 
 type Environment []EnvironmentVariable
diff --git a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
index 3d5dc9fa28..ad3441a8dd 100644
--- a/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
+++ b/vendor/github.com/appc/spec/schema/types/isolator_linux_specific.go
@@ -226,9 +226,13 @@ func (l linuxSeccompBase) AssertValid() error {
 	if l.val.Errno == "" {
 		return nil
 	}
-	for _, c := range l.val.Errno {
-		if !unicode.IsUpper(c) {
-			return errors.New("errno must be an upper case string")
+	for i, c := range l.val.Errno {
+		if i == 0 && c != 'E' {
+			s := fmt.Sprintf("errno must start with an 'E' character, got %s", l.val.Errno)
+			return errors.New(s)
+		} else if !(unicode.IsUpper(c) || unicode.IsNumber(c)) {
+			s := fmt.Sprintf("errno can only contain upper case or numeric characters, got %s", l.val.Errno)
+			return errors.New(s)
 		}
 	}
 	return nil
diff --git a/vendor/github.com/appc/spec/schema/types/labels.go b/vendor/github.com/appc/spec/schema/types/labels.go
index 89fa4285d4..25931f9402 100644
--- a/vendor/github.com/appc/spec/schema/types/labels.go
+++ b/vendor/github.com/appc/spec/schema/types/labels.go
@@ -28,7 +28,11 @@ var ValidOSArch = map[string][]string{
 
 type Labels []Label
 
-type labels Labels
+type labelsSlice Labels
+
+func (l labelsSlice) Len() int           { return len(l) }
+func (l labelsSlice) Swap(i, j int)      { l[i], l[j] = l[j], l[i] }
+func (l labelsSlice) Less(i, j int) bool { return l[i].Name < l[j].Name }
 
 type Label struct {
 	Name  ACIdentifier `json:"name"`
@@ -97,11 +101,11 @@ func (l Labels) MarshalJSON() ([]byte, error) {
 	if err := l.assertValid(); err != nil {
 		return nil, err
 	}
-	return json.Marshal(labels(l))
+	return json.Marshal(labelsSlice(l))
 }
 
 func (l *Labels) UnmarshalJSON(data []byte) error {
-	var jl labels
+	var jl labelsSlice
 	if err := json.Unmarshal(data, &jl); err != nil {
 		return err
 	}
@@ -141,6 +145,7 @@ func LabelsFromMap(labelsMap map[ACIdentifier]string) (Labels, error) {
 	if err := labels.assertValid(); err != nil {
 		return nil, err
 	}
+	sort.Sort(labelsSlice(labels))
 	return labels, nil
 }
 
diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go
index 9e7265604f..2b55b7cfc7 100644
--- a/vendor/github.com/appc/spec/schema/version.go
+++ b/vendor/github.com/appc/spec/schema/version.go
@@ -22,7 +22,7 @@ const (
 	// version represents the canonical version of the appc spec and tooling.
 	// For now, the schema and tooling is coupled with the spec itself, so
 	// this must be kept in sync with the VERSION file in the root of the repo.
-	version string = "0.8.10"
+	version string = "0.8.11"
 )
 
 var (

From a0fc3b872c3c987943d6b5ef266b8bd07cad3c5f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Tue, 19 Sep 2017 16:28:00 +0000
Subject: [PATCH 1180/1304] tests/functional: skip prepared check on early
 failures

This skips the run-prepared test if we already know prepare will
fail earlier.
---
 tests/rkt_volume_mount_generic_test.go |  1 +
 tests/rkt_volume_mount_test.go         | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/tests/rkt_volume_mount_generic_test.go b/tests/rkt_volume_mount_generic_test.go
index adf5e62ed4..1d75007cb3 100644
--- a/tests/rkt_volume_mount_generic_test.go
+++ b/tests/rkt_volume_mount_generic_test.go
@@ -45,6 +45,7 @@ func TestVolumeMount(t *testing.T) {
 				),
 				nil,
 				innerFileContent,
+				false,
 			},
 		},
 	}).Execute(t)
diff --git a/tests/rkt_volume_mount_test.go b/tests/rkt_volume_mount_test.go
index 67ff9aac71..3e918af931 100644
--- a/tests/rkt_volume_mount_test.go
+++ b/tests/rkt_volume_mount_test.go
@@ -103,6 +103,7 @@ type volumeMountTestCase struct {
 	cmdArgs        string
 	podManifest    *schema.PodManifest
 	expectedResult string
+	skipPrepared   bool
 }
 
 var (
@@ -121,6 +122,7 @@ var (
 			),
 			nil,
 			innerFileContent,
+			false,
 		},
 		{
 			"CLI: recursive read-only mount write file must fail",
@@ -136,6 +138,7 @@ var (
 			),
 			nil,
 			"read-only file system",
+			false,
 		},
 	}
 
@@ -154,6 +157,7 @@ var (
 			),
 			nil,
 			outerFileContent,
+			false,
 		},
 		{
 			"CLI: read-only non-recursive write file must fail",
@@ -169,6 +173,7 @@ var (
 			),
 			nil,
 			"read-only file system",
+			false,
 		},
 	}
 
@@ -203,6 +208,7 @@ var (
 				},
 			},
 			innerFileContent,
+			false,
 		},
 		{
 			"Write of nested file for recursive/read-only mount must fail",
@@ -235,6 +241,7 @@ var (
 				},
 			},
 			"read-only file system",
+			false,
 		},
 	}
 
@@ -271,6 +278,7 @@ var (
 				},
 			},
 			"host:foo",
+			false,
 		},
 	}
 
@@ -305,6 +313,7 @@ var (
 				},
 			},
 			outerFileContent,
+			false,
 		},
 	}
 
@@ -320,6 +329,7 @@ var (
 			),
 			nil,
 			"duplicate volume name",
+			true,
 		},
 	}
 )
@@ -383,6 +393,9 @@ func NewTestVolumeMount(volumeMountTestCases [][]volumeMountTestCase) testutils.
 				verifyHostFile(t, volDir, "file", i, tt.expectedResult)
 
 				// 2. Test 'rkt prepare' + 'rkt run-prepared'.
+				if tt.skipPrepared {
+					continue
+				}
 				prepareCmd := fmt.Sprintf("%s prepare", ctx.Cmd())
 				if manifestFile != "" {
 					prepareCmd += fmt.Sprintf(" --pod-manifest=%s", manifestFile)

From 22bc4ba83604bfb8e75ee79ca735db85c59a5cc5 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Tue, 19 Sep 2017 16:58:49 -0700
Subject: [PATCH 1181/1304] rkt_seccomp_test: Fix arm64 stat tests

The -stat-file option of rkt's inspect program uses the standard go
os.Stat() routine, which uses the syscall.Stat() routine for its
operation.  For amd64 syscall.Stat() uses the SYS_STAT system call,
and so setting actool's --seccomp-set option to 'stat' works with
inspect's -stat-file option.

The arm64 linux kernel does not implement a SYS_STAT syscall, so for
arm64 syscall.Stat() is implemented as a wrapper around the
syscall.Fstatat() routine.  Because of this actool's --seccomp-set
option needs to be set to 'newfstatat' for the '-stat-file' option
to work correctly on arm64 machines.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 tests/rkt_seccomp_test.go | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tests/rkt_seccomp_test.go b/tests/rkt_seccomp_test.go
index 3050a44280..71f914344c 100644
--- a/tests/rkt_seccomp_test.go
+++ b/tests/rkt_seccomp_test.go
@@ -22,6 +22,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/tests/testutils"
 )
 
@@ -29,6 +30,19 @@ const (
 	baseApp = `--exec=/inspect -file-name / -stat-file`
 )
 
+// Returns the syscall used by syscall.Stat()
+func getStatCall() string {
+	m := map[string]string{
+		"default": "stat",
+		"aarch64": "newfstatat",
+	}
+
+	if v, ok := m[common.GetArch()]; ok {
+		return v
+	}
+	return m["default"]
+}
+
 var seccompTestCases = []struct {
 	name           string
 	aciBuildArgs   []string
@@ -73,7 +87,7 @@ var seccompTestCases = []struct {
 	},
 	{
 		`remove-set blacklist stat with custom error`,
-		[]string{baseApp, "--seccomp-mode=remove,errno=EXFULL", "--seccomp-set=stat"},
+		[]string{baseApp, "--seccomp-mode=remove,errno=EXFULL", "--seccomp-set=" + getStatCall()},
 		nil,
 		"exchange full",
 		true,
@@ -108,7 +122,7 @@ var seccompTestCases = []struct {
 	},
 	{
 		`CLI override whitelist all`,
-		[]string{baseApp, "--seccomp-mode=remove,errno=EXFULL", "--seccomp-set=stat"},
+		[]string{baseApp, "--seccomp-mode=remove,errno=EXFULL", "--seccomp-set=" + getStatCall()},
 		[]string{"--seccomp=mode=retain,@appc.io/all"},
 		`/: mode: d`,
 		false,
@@ -116,27 +130,27 @@ var seccompTestCases = []struct {
 	{
 		`CLI override blacklist stat with custom error`,
 		[]string{baseApp},
-		[]string{"--seccomp=mode=remove,errno=EXFULL,stat"},
+		[]string{"--seccomp=mode=remove,errno=EXFULL," + getStatCall()},
 		"exchange full",
 		true,
 	},
 	{
 		`insecure-options fake override: remove-set blacklist stat with custom error`,
-		[]string{baseApp, "--seccomp-mode=remove,errno=EMULTIHOP", "--seccomp-set=stat"},
+		[]string{baseApp, "--seccomp-mode=remove,errno=EMULTIHOP", "--seccomp-set=" + getStatCall()},
 		[]string{"--insecure-options=image,ondisk,capabilities,paths"},
 		"multihop attempted",
 		true,
 	},
 	{
 		`insecure-options simple override: remove-set blacklist stat with custom error`,
-		[]string{baseApp, "--seccomp-mode=remove,errno=EMULTIHOP", "--seccomp-set=stat"},
+		[]string{baseApp, "--seccomp-mode=remove,errno=EMULTIHOP", "--seccomp-set=" + getStatCall()},
 		[]string{"--insecure-options=image,seccomp"},
 		`/: mode: d`,
 		false,
 	},
 	{
 		`insecure-options complete override: remove-set blacklist stat with custom error`,
-		[]string{baseApp, "--seccomp-mode=remove,errno=EMULTIHOP", "--seccomp-set=stat"},
+		[]string{baseApp, "--seccomp-mode=remove,errno=EMULTIHOP", "--seccomp-set=" + getStatCall()},
 		[]string{"--insecure-options=image,all-run"},
 		`/: mode: d`,
 		false,

From 66e04159c8e7be7993cc5b74a51923dd2fc94c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 18 Sep 2017 15:52:55 +0200
Subject: [PATCH 1182/1304] api: add CreatedAt to v1.Pod

It might happen that the pod is created but we can't get its start time
(e.g. we can't find the CNI network corresponding to `--net=NETWORK`).

This means StartedAt will not be set and the kubelet will error out and
ignore the pod, so it won't try to start it again.

Let's introduce CreatedAt to express the time when the pod was created
(even if it doesn't start) to handle this. This works because this time
is available after pod preparation.

We'll need to change rktlet to use CreatedAt instead of StartedAt when
getting a pod sandbox status.
---
 api/v1/json.go |  2 ++
 lib/pod.go     | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/api/v1/json.go b/api/v1/json.go
index 534c46f673..b793c70874 100644
--- a/api/v1/json.go
+++ b/api/v1/json.go
@@ -77,6 +77,8 @@ type (
 		AppNames []string `json:"app_names,omitempty"`
 		// Apps holds current information about each app.
 		Apps []*App `json:"apps,omitempty"`
+		// The creation time of the pod.
+		CreatedAt *int64 `json:"created_at,omitempty"`
 		// The start time of the pod.
 		StartedAt *int64 `json:"started_at,omitempty"`
 		// UserAnnotations are the pod user annotations.
diff --git a/lib/pod.go b/lib/pod.go
index 5be69a3910..8a50597080 100644
--- a/lib/pod.go
+++ b/lib/pod.go
@@ -15,6 +15,8 @@
 package rkt
 
 import (
+	"errors"
+
 	"github.com/rkt/rkt/api/v1"
 	pkgPod "github.com/rkt/rkt/pkg/pod"
 )
@@ -37,6 +39,17 @@ func NewPodFromInternalPod(p *pkgPod.Pod) (*v1.Pod, error) {
 		pod.StartedAt = &startedAt
 	}
 
+	creationTime, err := p.CreationTime()
+	if err != nil {
+		return nil, err
+	}
+
+	createdAt := creationTime.Unix()
+	if creationTime.IsZero() || createdAt <= 0 {
+		return nil, errors.New("invalid creation time")
+	}
+	pod.CreatedAt = &createdAt
+
 	if !p.PodManifestAvailable() {
 		return pod, nil
 	}

From bc2d91279f6217d6120f8f96bf72de9dc2df62ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 20 Sep 2017 14:52:22 +0200
Subject: [PATCH 1183/1304] tests: check output validity for when parsing pod
 info

---
 tests/rkt_tests.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 5747c12f80..172236dd53 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -673,6 +673,14 @@ func parsePodInfoOutput(t *testing.T, result string, p *podInfo) {
 			}
 		}
 	}
+
+	if p.state == "" {
+		t.Fatalf("Unexpected empty state for pod")
+	}
+
+	if p.createdAt <= 0 {
+		t.Fatalf("Unexpected createdAt <= 0 for pod")
+	}
 }
 
 func getPodDir(t *testing.T, ctx *testutils.RktRunCtx, podID string) string {

From a778cd1b33d191e83178879cd23732f1c106a0ef Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Wed, 20 Sep 2017 10:10:37 +0000
Subject: [PATCH 1184/1304] stage0/gc: try to avoid double overlay mounts

Before Linux 4.13, it used to be possible to perform double overlayfs
mounts in place. This now fails at mount() with EBUSY.
We were abusing this feature to unconditionally ensure that the stage1
image overlay mount was present before calling gc entrypoint.
This improves stage0 logic to perform the stage1 image overlay mount
only if it doesn't already exist.
---
 rkt/gc.go | 50 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/rkt/gc.go b/rkt/gc.go
index 5e025bb96a..1ecdd8faf4 100644
--- a/rkt/gc.go
+++ b/rkt/gc.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/hashicorp/errwrap"
 	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/mountinfo"
 	pkgPod "github.com/rkt/rkt/pkg/pod"
 	"github.com/rkt/rkt/stage0"
 	"github.com/rkt/rkt/store/imagestore"
@@ -197,29 +198,51 @@ func emptyGarbage() error {
 	return nil
 }
 
-func mountPodStage1(ts *treestore.Store, p *pkgPod.Pod) error {
+// mountPodStage1 tries to remount stage1 image overlay in case
+// it is not anymore available in place (e.g. a reboot happened
+// in-between). If an overlay mount is already there, we assume
+// stage1 image is properly in place and we don't perform any
+// further actions. A boolean is returned to signal whether a
+// a new mount was performed.
+func mountPodStage1(ts *treestore.Store, p *pkgPod.Pod) (bool, error) {
 	if !p.UsesOverlay() {
-		return nil
+		return false, nil
 	}
 
 	s1Id, err := p.GetStage1TreeStoreID()
 	if err != nil {
-		return errwrap.Wrap(errors.New("error getting stage1 treeStoreID"), err)
+		return false, errwrap.Wrap(errors.New("error getting stage1 treeStoreID"), err)
 	}
 	s1rootfs := ts.GetRootFS(s1Id)
-
 	stage1Dir := common.Stage1RootfsPath(p.Path())
+
+	if mounts, err := mountinfo.ParseMounts(0); err == nil {
+		for _, m := range mounts {
+			if m.MountPoint == stage1Dir {
+				// stage1 image overlay already in place
+				return false, nil
+			}
+		}
+	}
+
 	overlayDir := filepath.Join(p.Path(), "overlay")
 	imgDir := filepath.Join(overlayDir, s1Id)
 	upperDir := filepath.Join(imgDir, "upper")
 	workDir := filepath.Join(imgDir, "work")
 
 	opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", s1rootfs, upperDir, workDir)
-	if err := syscall.Mount("overlay", stage1Dir, "overlay", 0, opts); err != nil {
-		return errwrap.Wrap(errors.New("error mounting stage1"), err)
+	err = syscall.Mount("overlay", stage1Dir, "overlay", 0, opts)
+	if err != nil {
+		// -EBUSY means the overlay mount is already present.
+		// This behavior was introduced in Linux 4.13, double-mounts were allowed
+		// in older kernels.
+		if err == syscall.EBUSY {
+			stderr.Println("mount detected on stage1 target, skipping overlay mount")
+			return false, nil
+		}
+		return false, errwrap.Wrap(errors.New("error mounting stage1"), err)
 	}
-
-	return nil
+	return true, nil
 }
 
 // deletePod cleans up files and resource associated with the pod
@@ -250,16 +273,15 @@ func deletePod(p *pkgPod.Pod) bool {
 			stage0.InitDebug()
 		}
 
-		if err := mountPodStage1(ts, p); err == nil {
+		if newMount, err := mountPodStage1(ts, p); err == nil {
 			if err = stage0.GC(p.Path(), p.UUID, globalFlags.LocalConfigDir); err != nil {
 				stderr.PrintE(fmt.Sprintf("problem performing stage1 GC on %q", p.UUID), err)
 			}
-			// an overlay fs can be mounted over itself, let's unmount it here
-			// if we mounted it before to avoid problems when running
-			// stage0.MountGC
-			if p.UsesOverlay() {
+			// Linux <4.13 allows an overlay fs to be mounted over itself, so let's
+			// unmount it here to avoid problems when running stage0.MountGC
+			if p.UsesOverlay() && newMount {
 				stage1Mnt := common.Stage1RootfsPath(p.Path())
-				if err := syscall.Unmount(stage1Mnt, 0); err != nil {
+				if err := syscall.Unmount(stage1Mnt, 0); err != nil && err != syscall.EBUSY {
 					stderr.PrintE("error unmounting stage1", err)
 				}
 			}

From 10da844a356cc2d748f017163cb88a691b6d19d3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Fri, 22 Sep 2017 08:41:07 +0000
Subject: [PATCH 1185/1304] glide: bump pborman/uuid to v1.1

---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index 441187181d..264598cff2 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -175,7 +175,7 @@ import:
 - package: github.com/kr/pty
   version: f7ee69f31298ecbe5d2b349c711e2547a617d398
 - package: github.com/pborman/uuid
-  version: cccd189d45f7ac3368a0d127efb7f4d08ae0b655
+  version: v1.1
 - package: github.com/peterbourgon/diskv
   version: v2.0.0
 - package: github.com/russross/blackfriday

From 9b59a67776fee50d4f57faf4f2574f77ad5f952a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Fri, 22 Sep 2017 08:44:37 +0000
Subject: [PATCH 1186/1304] vendor: update after uuid bump

---
 glide.lock                             |  6 +--
 vendor/github.com/pborman/uuid/dce.go  |  0
 vendor/github.com/pborman/uuid/doc.go  |  0
 vendor/github.com/pborman/uuid/hash.go |  2 +-
 vendor/github.com/pborman/uuid/json.go | 30 ------------
 vendor/github.com/pborman/uuid/node.go | 20 +++++++-
 vendor/github.com/pborman/uuid/sql.go  | 36 ++++++++++++--
 vendor/github.com/pborman/uuid/time.go | 14 +++---
 vendor/github.com/pborman/uuid/util.go |  2 +-
 vendor/github.com/pborman/uuid/uuid.go | 66 ++++++++++++++++++++------
 10 files changed, 113 insertions(+), 63 deletions(-)
 mode change 100755 => 100644 vendor/github.com/pborman/uuid/dce.go
 mode change 100755 => 100644 vendor/github.com/pborman/uuid/doc.go
 delete mode 100644 vendor/github.com/pborman/uuid/json.go
 mode change 100755 => 100644 vendor/github.com/pborman/uuid/node.go
 mode change 100755 => 100644 vendor/github.com/pborman/uuid/time.go
 mode change 100755 => 100644 vendor/github.com/pborman/uuid/uuid.go

diff --git a/glide.lock b/glide.lock
index a2a1404be2..a218a5dc8c 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 5b06576039a24b5039701b611547d833429d8c94bcaf8c0c87e86a17eae97a55
-updated: 2017-09-19T12:27:26.119724281+02:00
+hash: fb6826e4dd20d01356b635ac2c186ce58e8f8c459129ab4836c0b1fc76d955ac
+updated: 2017-09-22T08:41:59.222546512Z
 imports:
 - name: github.com/appc/docker2aci
   version: 4537ee8e3139455eac6092d47a224d8fa19bf08a
@@ -207,7 +207,7 @@ imports:
   - specs-go
   - specs-go/v1
 - name: github.com/pborman/uuid
-  version: cccd189d45f7ac3368a0d127efb7f4d08ae0b655
+  version: e790cca94e6cc75c7064b1332e63811d4aae1a53
 - name: github.com/peterbourgon/diskv
   version: 937c5a91d7fb1477fa6d2bb71410b2ae7a0f2143
 - name: github.com/PuerkitoBio/purell
diff --git a/vendor/github.com/pborman/uuid/dce.go b/vendor/github.com/pborman/uuid/dce.go
old mode 100755
new mode 100644
diff --git a/vendor/github.com/pborman/uuid/doc.go b/vendor/github.com/pborman/uuid/doc.go
old mode 100755
new mode 100644
diff --git a/vendor/github.com/pborman/uuid/hash.go b/vendor/github.com/pborman/uuid/hash.go
index cdd4192fd9..a0420c1ef3 100644
--- a/vendor/github.com/pborman/uuid/hash.go
+++ b/vendor/github.com/pborman/uuid/hash.go
@@ -19,7 +19,7 @@ var (
 	NIL            = Parse("00000000-0000-0000-0000-000000000000")
 )
 
-// NewHash returns a new UUID dervied from the hash of space concatenated with
+// NewHash returns a new UUID derived from the hash of space concatenated with
 // data generated by h.  The hash should be at least 16 byte in length.  The
 // first 16 bytes of the hash are used to form the UUID.  The version of the
 // UUID will be the lower 4 bits of version.  NewHash is used to implement
diff --git a/vendor/github.com/pborman/uuid/json.go b/vendor/github.com/pborman/uuid/json.go
deleted file mode 100644
index 760580a504..0000000000
--- a/vendor/github.com/pborman/uuid/json.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import "errors"
-
-func (u UUID) MarshalJSON() ([]byte, error) {
-	if len(u) == 0 {
-		return []byte(`""`), nil
-	}
-	return []byte(`"` + u.String() + `"`), nil
-}
-
-func (u *UUID) UnmarshalJSON(data []byte) error {
-	if len(data) == 0 || string(data) == `""` {
-		return nil
-	}
-	if len(data) < 2 || data[0] != '"' || data[len(data)-1] != '"' {
-		return errors.New("invalid UUID format")
-	}
-	data = data[1 : len(data)-1]
-	uu := Parse(string(data))
-	if uu == nil {
-		return errors.New("invalid UUID format")
-	}
-	*u = uu
-	return nil
-}
diff --git a/vendor/github.com/pborman/uuid/node.go b/vendor/github.com/pborman/uuid/node.go
old mode 100755
new mode 100644
index dd0a8ac189..42d60da8f1
--- a/vendor/github.com/pborman/uuid/node.go
+++ b/vendor/github.com/pborman/uuid/node.go
@@ -4,9 +4,13 @@
 
 package uuid
 
-import "net"
+import (
+	"net"
+	"sync"
+)
 
 var (
+	nodeMu     sync.Mutex
 	interfaces []net.Interface // cached list of interfaces
 	ifname     string          // name of interface being used
 	nodeID     []byte          // hardware for version 1 UUIDs
@@ -16,6 +20,8 @@ var (
 // derived.  The interface "user" is returned if the NodeID was set by
 // SetNodeID.
 func NodeInterface() string {
+	defer nodeMu.Unlock()
+	nodeMu.Lock()
 	return ifname
 }
 
@@ -26,6 +32,12 @@ func NodeInterface() string {
 //
 // SetNodeInterface never fails when name is "".
 func SetNodeInterface(name string) bool {
+	defer nodeMu.Unlock()
+	nodeMu.Lock()
+	return setNodeInterface(name)
+}
+
+func setNodeInterface(name string) bool {
 	if interfaces == nil {
 		var err error
 		interfaces, err = net.Interfaces()
@@ -59,8 +71,10 @@ func SetNodeInterface(name string) bool {
 // NodeID returns a slice of a copy of the current Node ID, setting the Node ID
 // if not already set.
 func NodeID() []byte {
+	defer nodeMu.Unlock()
+	nodeMu.Lock()
 	if nodeID == nil {
-		SetNodeInterface("")
+		setNodeInterface("")
 	}
 	nid := make([]byte, 6)
 	copy(nid, nodeID)
@@ -71,6 +85,8 @@ func NodeID() []byte {
 // of id are used.  If id is less than 6 bytes then false is returned and the
 // Node ID is not set.
 func SetNodeID(id []byte) bool {
+	defer nodeMu.Unlock()
+	nodeMu.Lock()
 	if setNodeID(id) {
 		ifname = "user"
 		return true
diff --git a/vendor/github.com/pborman/uuid/sql.go b/vendor/github.com/pborman/uuid/sql.go
index 2d7679e2af..d015bfd132 100644
--- a/vendor/github.com/pborman/uuid/sql.go
+++ b/vendor/github.com/pborman/uuid/sql.go
@@ -5,6 +5,7 @@
 package uuid
 
 import (
+	"database/sql/driver"
 	"errors"
 	"fmt"
 )
@@ -15,6 +16,11 @@ import (
 func (uuid *UUID) Scan(src interface{}) error {
 	switch src.(type) {
 	case string:
+		// if an empty UUID comes from a table, we return a null UUID
+		if src.(string) == "" {
+			return nil
+		}
+
 		// see uuid.Parse for required string format
 		parsed := Parse(src.(string))
 
@@ -24,17 +30,37 @@ func (uuid *UUID) Scan(src interface{}) error {
 
 		*uuid = parsed
 	case []byte:
-		// assumes a simple slice of bytes, just check validity and store
-		u := UUID(src.([]byte))
+		b := src.([]byte)
 
-		if u.Variant() == Invalid {
-			return errors.New("Scan: invalid UUID format")
+		// if an empty UUID comes from a table, we return a null UUID
+		if len(b) == 0 {
+			return nil
+		}
+
+		// assumes a simple slice of bytes if 16 bytes
+		// otherwise attempts to parse
+		if len(b) == 16 {
+			*uuid = UUID(b)
+		} else {
+			u := Parse(string(b))
+
+			if u == nil {
+				return errors.New("Scan: invalid UUID format")
+			}
+
+			*uuid = u
 		}
 
-		*uuid = u
 	default:
 		return fmt.Errorf("Scan: unable to scan type %T into UUID", src)
 	}
 
 	return nil
 }
+
+// Value implements sql.Valuer so that UUIDs can be written to databases
+// transparently. Currently, UUIDs map to strings. Please consult
+// database-specific driver documentation for matching types.
+func (uuid UUID) Value() (driver.Value, error) {
+	return uuid.String(), nil
+}
diff --git a/vendor/github.com/pborman/uuid/time.go b/vendor/github.com/pborman/uuid/time.go
old mode 100755
new mode 100644
index 7ebc9bef10..eedf242194
--- a/vendor/github.com/pborman/uuid/time.go
+++ b/vendor/github.com/pborman/uuid/time.go
@@ -23,7 +23,7 @@ const (
 )
 
 var (
-	mu        sync.Mutex
+	timeMu    sync.Mutex
 	lasttime  uint64 // last time we returned
 	clock_seq uint16 // clock sequence for this run
 
@@ -43,8 +43,8 @@ func (t Time) UnixTime() (sec, nsec int64) {
 // clock sequence as well as adjusting the clock sequence as needed.  An error
 // is returned if the current time cannot be determined.
 func GetTime() (Time, uint16, error) {
-	defer mu.Unlock()
-	mu.Lock()
+	defer timeMu.Unlock()
+	timeMu.Lock()
 	return getTime()
 }
 
@@ -75,8 +75,8 @@ func getTime() (Time, uint16, error) {
 // ClockSequence, GetTime, or NewUUID.  (section 4.2.1.1) sequence is generated
 // for
 func ClockSequence() int {
-	defer mu.Unlock()
-	mu.Lock()
+	defer timeMu.Unlock()
+	timeMu.Lock()
 	return clockSequence()
 }
 
@@ -90,8 +90,8 @@ func clockSequence() int {
 // SetClockSeq sets the clock sequence to the lower 14 bits of seq.  Setting to
 // -1 causes a new sequence to be generated.
 func SetClockSequence(seq int) {
-	defer mu.Unlock()
-	mu.Lock()
+	defer timeMu.Unlock()
+	timeMu.Lock()
 	setClockSequence(seq)
 }
 
diff --git a/vendor/github.com/pborman/uuid/util.go b/vendor/github.com/pborman/uuid/util.go
index de40b102c4..fc8e052c7a 100644
--- a/vendor/github.com/pborman/uuid/util.go
+++ b/vendor/github.com/pborman/uuid/util.go
@@ -16,7 +16,7 @@ func randomBits(b []byte) {
 }
 
 // xvalues returns the value of a byte as a hexadecimal digit or 255.
-var xvalues = []byte{
+var xvalues = [256]byte{
 	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
diff --git a/vendor/github.com/pborman/uuid/uuid.go b/vendor/github.com/pborman/uuid/uuid.go
old mode 100755
new mode 100644
index 2920fae632..7c643cf0a3
--- a/vendor/github.com/pborman/uuid/uuid.go
+++ b/vendor/github.com/pborman/uuid/uuid.go
@@ -7,11 +7,26 @@ package uuid
 import (
 	"bytes"
 	"crypto/rand"
+	"encoding/hex"
 	"fmt"
 	"io"
 	"strings"
 )
 
+// Array is a pass-by-value UUID that can be used as an effecient key in a map.
+type Array [16]byte
+
+// UUID converts uuid into a slice.
+func (uuid Array) UUID() UUID {
+	return uuid[:]
+}
+
+// String returns the string representation of uuid,
+// xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx.
+func (uuid Array) String() string {
+	return uuid.UUID().String()
+}
+
 // A UUID is a 128 bit (16 byte) Universal Unique IDentifier as defined in RFC
 // 4122.
 type UUID []byte
@@ -54,8 +69,8 @@ func Parse(s string) UUID {
 	if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' {
 		return nil
 	}
-	uuid := make([]byte, 16)
-	for i, x := range []int{
+	var uuid [16]byte
+	for i, x := range [16]int{
 		0, 2, 4, 6,
 		9, 11,
 		14, 16,
@@ -67,7 +82,7 @@ func Parse(s string) UUID {
 			uuid[i] = v
 		}
 	}
-	return uuid
+	return uuid[:]
 }
 
 // Equal returns true if uuid1 and uuid2 are equal.
@@ -75,26 +90,50 @@ func Equal(uuid1, uuid2 UUID) bool {
 	return bytes.Equal(uuid1, uuid2)
 }
 
+// Array returns an array representation of uuid that can be used as a map key.
+// Array panics if uuid is not valid.
+func (uuid UUID) Array() Array {
+	if len(uuid) != 16 {
+		panic("invalid uuid")
+	}
+	var a Array
+	copy(a[:], uuid)
+	return a
+}
+
 // String returns the string form of uuid, xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
 // , or "" if uuid is invalid.
 func (uuid UUID) String() string {
-	if uuid == nil || len(uuid) != 16 {
+	if len(uuid) != 16 {
 		return ""
 	}
-	b := []byte(uuid)
-	return fmt.Sprintf("%08x-%04x-%04x-%04x-%012x",
-		b[:4], b[4:6], b[6:8], b[8:10], b[10:])
+	var buf [36]byte
+	encodeHex(buf[:], uuid)
+	return string(buf[:])
 }
 
 // URN returns the RFC 2141 URN form of uuid,
 // urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx,  or "" if uuid is invalid.
 func (uuid UUID) URN() string {
-	if uuid == nil || len(uuid) != 16 {
+	if len(uuid) != 16 {
 		return ""
 	}
-	b := []byte(uuid)
-	return fmt.Sprintf("urn:uuid:%08x-%04x-%04x-%04x-%012x",
-		b[:4], b[4:6], b[6:8], b[8:10], b[10:])
+	var buf [36 + 9]byte
+	copy(buf[:], "urn:uuid:")
+	encodeHex(buf[9:], uuid)
+	return string(buf[:])
+}
+
+func encodeHex(dst []byte, uuid UUID) {
+	hex.Encode(dst[:], uuid[:4])
+	dst[8] = '-'
+	hex.Encode(dst[9:13], uuid[4:6])
+	dst[13] = '-'
+	hex.Encode(dst[14:18], uuid[6:8])
+	dst[18] = '-'
+	hex.Encode(dst[19:23], uuid[8:10])
+	dst[23] = '-'
+	hex.Encode(dst[24:], uuid[10:])
 }
 
 // Variant returns the variant encoded in uuid.  It returns Invalid if
@@ -113,10 +152,9 @@ func (uuid UUID) Variant() Variant {
 	default:
 		return Reserved
 	}
-	panic("unreachable")
 }
 
-// Version returns the verison of uuid.  It returns false if uuid is not
+// Version returns the version of uuid.  It returns false if uuid is not
 // valid.
 func (uuid UUID) Version() (Version, bool) {
 	if len(uuid) != 16 {
@@ -148,7 +186,7 @@ func (v Variant) String() string {
 	return fmt.Sprintf("BadVariant%d", int(v))
 }
 
-// SetRand sets the random number generator to r, which implents io.Reader.
+// SetRand sets the random number generator to r, which implements io.Reader.
 // If r.Read returns an error when the package requests random data then
 // a panic will be issued.
 //

From e541128175a891cee20b8192dd0b594e67ff1e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 21 Sep 2017 18:45:14 +0200
Subject: [PATCH 1187/1304] stage1/init: activate systemd-journal-flush.service

It's needed to make systemd-journald write to /var/log/journal instead
of /run/log/journal. We added this unit in 7c7e833e9 but we didn't
configure it so it starts.
---
 stage1/init/common/units.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index fc11306eed..7303a480e7 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -93,6 +93,8 @@ func MutableEnv(p *stage1commontypes.Pod) error {
 		unit.NewUnitOption("Service", "RemainAfterExit", "yes"),
 	)
 
+	w.Activate("systemd-journal-flush.service", ServiceWantPath(p.Root, "systemd-journal-flush"))
+
 	return w.Error()
 }
 
@@ -180,6 +182,8 @@ func ImmutableEnv(p *stage1commontypes.Pod) error {
 		)
 	}
 
+	uw.Activate("systemd-journal-flush.service", ServiceWantPath(p.Root, "systemd-journal-flush"))
+
 	return uw.Error()
 }
 

From 745c4148c2472b332096a5d9ab021ae37c2b591c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 22 Sep 2017 15:42:06 +0200
Subject: [PATCH 1188/1304] vendor: bump docker2aci to v0.17.0

---
 glide.lock                                                | 6 +++---
 glide.yaml                                                | 2 +-
 vendor/github.com/appc/docker2aci/lib/common/common.go    | 4 ++--
 vendor/github.com/appc/docker2aci/lib/docker2aci.go       | 3 +++
 .../github.com/appc/docker2aci/lib/internal/internal.go   | 8 ++++++--
 vendor/github.com/appc/docker2aci/lib/version.go          | 2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/glide.lock b/glide.lock
index a218a5dc8c..e14d907a48 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: fb6826e4dd20d01356b635ac2c186ce58e8f8c459129ab4836c0b1fc76d955ac
-updated: 2017-09-22T08:41:59.222546512Z
+hash: b0227041c092fa574c31ef546358d9af633abcd9ad731d790a1bbc228489aba2
+updated: 2017-09-22T15:41:52.673499209+02:00
 imports:
 - name: github.com/appc/docker2aci
-  version: 4537ee8e3139455eac6092d47a224d8fa19bf08a
+  version: 76a5ef32f8b027b68027374252f90bbacf4f64a3
   subpackages:
   - lib
   - lib/common
diff --git a/glide.yaml b/glide.yaml
index 264598cff2..1d028c3fb9 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.16.0
+  version: v0.17.0
   subpackages:
   - lib
   - lib/common
diff --git a/vendor/github.com/appc/docker2aci/lib/common/common.go b/vendor/github.com/appc/docker2aci/lib/common/common.go
index 13ca559f10..e20f5ea354 100644
--- a/vendor/github.com/appc/docker2aci/lib/common/common.go
+++ b/vendor/github.com/appc/docker2aci/lib/common/common.go
@@ -82,7 +82,7 @@ func (e *ErrSeveralImages) Error() string {
 // ParseDockerURL takes a Docker URL and returns a ParsedDockerURL with its
 // index URL, image name, and tag.
 func ParseDockerURL(arg string) (*ParsedDockerURL, error) {
-	r, err := reference.ParseNamed(arg)
+	r, err := reference.ParseNormalizedNamed(arg)
 	if err != nil {
 		return nil, err
 	}
@@ -97,7 +97,7 @@ func ParseDockerURL(arg string) (*ParsedDockerURL, error) {
 		tag = defaultTag
 	}
 
-	indexURL, remoteName := docker.SplitReposName(r.Name())
+	indexURL, remoteName := docker.SplitReposName(reference.FamiliarName(r))
 
 	return &ParsedDockerURL{
 		OriginalName: arg,
diff --git a/vendor/github.com/appc/docker2aci/lib/docker2aci.go b/vendor/github.com/appc/docker2aci/lib/docker2aci.go
index b888e64903..90b5739ab0 100644
--- a/vendor/github.com/appc/docker2aci/lib/docker2aci.go
+++ b/vendor/github.com/appc/docker2aci/lib/docker2aci.go
@@ -150,6 +150,9 @@ func (c *converter) convert() ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
+	if len(ancestry) == 0 {
+		return nil, fmt.Errorf("backend image had no useful layers: not creating ACI")
+	}
 	for _, h := range c.config.CurrentManifestHashes {
 		if manhash == h {
 			return nil, nil
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/internal.go b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
index 5ee81387dc..1f811fcb91 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/internal.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
@@ -262,7 +262,9 @@ func GenerateManifest(layerData types.DockerImageData, manhash string, dockerURL
 		var env appctypes.Environment
 		for _, v := range dockerConfig.Env {
 			parts := strings.SplitN(v, "=", 2)
-			env.Set(parts[0], parts[1])
+                        if len(parts) == 2 {
+				env.Set(parts[0], parts[1])
+                        }
 		}
 		app := &appctypes.App{
 			Exec:             exec,
@@ -393,7 +395,9 @@ func GenerateManifestV22(
 		var env appctypes.Environment
 		for _, v := range innerCfg.Env {
 			parts := strings.SplitN(v, "=", 2)
-			env.Set(parts[0], parts[1])
+                        if len(parts) == 2 {
+				env.Set(parts[0], parts[1])
+                        }
 		}
 		manifest.App = &appctypes.App{
 			Exec:             exec,
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index 87a3ecfe13..3f37f71c3e 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.16.0"
+var Version = "0.17.0"
 var AppcVersion = schema.AppContainerVersion

From 2cc4a7652543be65d153ca311140462834691e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 22 Sep 2017 16:11:52 +0200
Subject: [PATCH 1189/1304] vendor: bump docker/distribution

It's needed by the new docker2aci version.
---
 glide.lock                                    |   7 +-
 glide.yaml                                    |   2 +-
 .../github.com/docker/distribution/blobs.go   |  40 +++-
 .../docker/distribution/digest/digest.go      | 139 -----------
 .../docker/distribution/digest/digester.go    | 155 -------------
 .../docker/distribution/digest/doc.go         |  42 ----
 .../docker/distribution/digest/verifiers.go   |  44 ----
 .../distribution/{digest => digestset}/set.go |  32 +--
 .../github.com/docker/distribution/errors.go  |   8 +-
 .../docker/distribution/manifests.go          |  48 ++--
 .../docker/distribution/reference/helpers.go  |  42 ++++
 .../distribution/reference/normalize.go       | 170 ++++++++++++++
 .../distribution/reference/reference.go       | 215 +++++++++++++-----
 .../docker/distribution/reference/regexp.go   |  43 +++-
 .../docker/distribution/registry.go           |  34 ++-
 vendor/github.com/docker/distribution/tags.go |   2 +-
 16 files changed, 519 insertions(+), 504 deletions(-)
 delete mode 100644 vendor/github.com/docker/distribution/digest/digest.go
 delete mode 100644 vendor/github.com/docker/distribution/digest/digester.go
 delete mode 100644 vendor/github.com/docker/distribution/digest/doc.go
 delete mode 100644 vendor/github.com/docker/distribution/digest/verifiers.go
 rename vendor/github.com/docker/distribution/{digest => digestset}/set.go (89%)
 create mode 100644 vendor/github.com/docker/distribution/reference/helpers.go
 create mode 100644 vendor/github.com/docker/distribution/reference/normalize.go

diff --git a/glide.lock b/glide.lock
index e14d907a48..4e2667fc62 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: b0227041c092fa574c31ef546358d9af633abcd9ad731d790a1bbc228489aba2
-updated: 2017-09-22T15:41:52.673499209+02:00
+hash: 57f42aad7f59db30f4bea9a422c8f904dc474a44830d5f26f2c2617d71d85bb3
+updated: 2017-09-22T16:07:34.061851427+02:00
 imports:
 - name: github.com/appc/docker2aci
   version: 76a5ef32f8b027b68027374252f90bbacf4f64a3
@@ -133,9 +133,10 @@ imports:
   subpackages:
   - spew
 - name: github.com/docker/distribution
-  version: 099622876197e3b24d627a72053d1bcc8968076a
+  version: 5db89f0ca68677abc5eefce8f2a0a772c98ba52d
   subpackages:
   - digest
+  - digestset
   - reference
 - name: github.com/dustin/go-humanize
   version: c20a8bde38c8f5ba06f6600edf473705c96829d1
diff --git a/glide.yaml b/glide.yaml
index 1d028c3fb9..d5b0425eda 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -126,7 +126,7 @@ import:
 - package: github.com/d2g/dhcp4client
   version: bed07e1bc5b85f69c6f0fd73393aa35ec68ed892
 - package: github.com/docker/distribution
-  version: v2.3.0
+  version: 5db89f0ca68677abc5eefce8f2a0a772c98ba52d
   subpackages:
   - digest
   - reference
diff --git a/vendor/github.com/docker/distribution/blobs.go b/vendor/github.com/docker/distribution/blobs.go
index ce43ea2ef6..145b078532 100644
--- a/vendor/github.com/docker/distribution/blobs.go
+++ b/vendor/github.com/docker/distribution/blobs.go
@@ -1,15 +1,15 @@
 package distribution
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"time"
 
-	"github.com/docker/distribution/context"
-	"github.com/docker/distribution/digest"
 	"github.com/docker/distribution/reference"
+	"github.com/opencontainers/go-digest"
 )
 
 var (
@@ -69,6 +69,9 @@ type Descriptor struct {
 	// against against this digest.
 	Digest digest.Digest `json:"digest,omitempty"`
 
+	// URLs contains the source URLs of this content.
+	URLs []string `json:"urls,omitempty"`
+
 	// NOTE: Before adding a field here, please ensure that all
 	// other options have been exhausted. Much of the type relationships
 	// depend on the simplicity of this type.
@@ -97,6 +100,11 @@ type BlobDeleter interface {
 	Delete(ctx context.Context, dgst digest.Digest) error
 }
 
+// BlobEnumerator enables iterating over blobs from storage
+type BlobEnumerator interface {
+	Enumerate(ctx context.Context, ingester func(dgst digest.Digest) error) error
+}
+
 // BlobDescriptorService manages metadata about a blob by digest. Most
 // implementations will not expose such an interface explicitly. Such mappings
 // should be maintained by interacting with the BlobIngester. Hence, this is
@@ -119,6 +127,11 @@ type BlobDescriptorService interface {
 	Clear(ctx context.Context, dgst digest.Digest) error
 }
 
+// BlobDescriptorServiceFactory creates middleware for BlobDescriptorService.
+type BlobDescriptorServiceFactory interface {
+	BlobAccessController(svc BlobDescriptorService) BlobDescriptorService
+}
+
 // ReadSeekCloser is the primary reader type for blob data, combining
 // io.ReadSeeker with io.Closer.
 type ReadSeekCloser interface {
@@ -139,7 +152,7 @@ type BlobProvider interface {
 
 // BlobServer can serve blobs via http.
 type BlobServer interface {
-	// ServeBlob attempts to serve the blob, identifed by dgst, via http. The
+	// ServeBlob attempts to serve the blob, identified by dgst, via http. The
 	// service may decide to redirect the client elsewhere or serve the data
 	// directly.
 	//
@@ -179,14 +192,28 @@ type BlobCreateOption interface {
 	Apply(interface{}) error
 }
 
+// CreateOptions is a collection of blob creation modifiers relevant to general
+// blob storage intended to be configured by the BlobCreateOption.Apply method.
+type CreateOptions struct {
+	Mount struct {
+		ShouldMount bool
+		From        reference.Canonical
+		// Stat allows to pass precalculated descriptor to link and return.
+		// Blob access check will be skipped if set.
+		Stat *Descriptor
+	}
+}
+
 // BlobWriter provides a handle for inserting data into a blob store.
 // Instances should be obtained from BlobWriteService.Writer and
 // BlobWriteService.Resume. If supported by the store, a writer can be
 // recovered with the id.
 type BlobWriter interface {
-	io.WriteSeeker
+	io.WriteCloser
 	io.ReaderFrom
-	io.Closer
+
+	// Size returns the number of bytes written to this blob.
+	Size() int64
 
 	// ID returns the identifier for this writer. The ID can be used with the
 	// Blob service to later resume the write.
@@ -211,9 +238,6 @@ type BlobWriter interface {
 	// result in a no-op. This allows use of Cancel in a defer statement,
 	// increasing the assurance that it is correctly called.
 	Cancel(ctx context.Context) error
-
-	// Get a reader to the blob being written by this BlobWriter
-	Reader() (io.ReadCloser, error)
 }
 
 // BlobService combines the operations to access, read and write blobs. This
diff --git a/vendor/github.com/docker/distribution/digest/digest.go b/vendor/github.com/docker/distribution/digest/digest.go
deleted file mode 100644
index 31d821bba7..0000000000
--- a/vendor/github.com/docker/distribution/digest/digest.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package digest
-
-import (
-	"fmt"
-	"hash"
-	"io"
-	"regexp"
-	"strings"
-)
-
-const (
-	// DigestSha256EmptyTar is the canonical sha256 digest of empty data
-	DigestSha256EmptyTar = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-)
-
-// Digest allows simple protection of hex formatted digest strings, prefixed
-// by their algorithm. Strings of type Digest have some guarantee of being in
-// the correct format and it provides quick access to the components of a
-// digest string.
-//
-// The following is an example of the contents of Digest types:
-//
-// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
-//
-// This allows to abstract the digest behind this type and work only in those
-// terms.
-type Digest string
-
-// NewDigest returns a Digest from alg and a hash.Hash object.
-func NewDigest(alg Algorithm, h hash.Hash) Digest {
-	return NewDigestFromBytes(alg, h.Sum(nil))
-}
-
-// NewDigestFromBytes returns a new digest from the byte contents of p.
-// Typically, this can come from hash.Hash.Sum(...) or xxx.SumXXX(...)
-// functions. This is also useful for rebuilding digests from binary
-// serializations.
-func NewDigestFromBytes(alg Algorithm, p []byte) Digest {
-	return Digest(fmt.Sprintf("%s:%x", alg, p))
-}
-
-// NewDigestFromHex returns a Digest from alg and a the hex encoded digest.
-func NewDigestFromHex(alg, hex string) Digest {
-	return Digest(fmt.Sprintf("%s:%s", alg, hex))
-}
-
-// DigestRegexp matches valid digest types.
-var DigestRegexp = regexp.MustCompile(`[a-zA-Z0-9-_+.]+:[a-fA-F0-9]+`)
-
-// DigestRegexpAnchored matches valid digest types, anchored to the start and end of the match.
-var DigestRegexpAnchored = regexp.MustCompile(`^` + DigestRegexp.String() + `$`)
-
-var (
-	// ErrDigestInvalidFormat returned when digest format invalid.
-	ErrDigestInvalidFormat = fmt.Errorf("invalid checksum digest format")
-
-	// ErrDigestInvalidLength returned when digest has invalid length.
-	ErrDigestInvalidLength = fmt.Errorf("invalid checksum digest length")
-
-	// ErrDigestUnsupported returned when the digest algorithm is unsupported.
-	ErrDigestUnsupported = fmt.Errorf("unsupported digest algorithm")
-)
-
-// ParseDigest parses s and returns the validated digest object. An error will
-// be returned if the format is invalid.
-func ParseDigest(s string) (Digest, error) {
-	d := Digest(s)
-
-	return d, d.Validate()
-}
-
-// FromReader returns the most valid digest for the underlying content using
-// the canonical digest algorithm.
-func FromReader(rd io.Reader) (Digest, error) {
-	return Canonical.FromReader(rd)
-}
-
-// FromBytes digests the input and returns a Digest.
-func FromBytes(p []byte) Digest {
-	return Canonical.FromBytes(p)
-}
-
-// Validate checks that the contents of d is a valid digest, returning an
-// error if not.
-func (d Digest) Validate() error {
-	s := string(d)
-
-	if !DigestRegexpAnchored.MatchString(s) {
-		return ErrDigestInvalidFormat
-	}
-
-	i := strings.Index(s, ":")
-	if i < 0 {
-		return ErrDigestInvalidFormat
-	}
-
-	// case: "sha256:" with no hex.
-	if i+1 == len(s) {
-		return ErrDigestInvalidFormat
-	}
-
-	switch algorithm := Algorithm(s[:i]); algorithm {
-	case SHA256, SHA384, SHA512:
-		if algorithm.Size()*2 != len(s[i+1:]) {
-			return ErrDigestInvalidLength
-		}
-		break
-	default:
-		return ErrDigestUnsupported
-	}
-
-	return nil
-}
-
-// Algorithm returns the algorithm portion of the digest. This will panic if
-// the underlying digest is not in a valid format.
-func (d Digest) Algorithm() Algorithm {
-	return Algorithm(d[:d.sepIndex()])
-}
-
-// Hex returns the hex digest portion of the digest. This will panic if the
-// underlying digest is not in a valid format.
-func (d Digest) Hex() string {
-	return string(d[d.sepIndex()+1:])
-}
-
-func (d Digest) String() string {
-	return string(d)
-}
-
-func (d Digest) sepIndex() int {
-	i := strings.Index(string(d), ":")
-
-	if i < 0 {
-		panic("could not find ':' in digest: " + d)
-	}
-
-	return i
-}
diff --git a/vendor/github.com/docker/distribution/digest/digester.go b/vendor/github.com/docker/distribution/digest/digester.go
deleted file mode 100644
index f3105a45b6..0000000000
--- a/vendor/github.com/docker/distribution/digest/digester.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package digest
-
-import (
-	"crypto"
-	"fmt"
-	"hash"
-	"io"
-)
-
-// Algorithm identifies and implementation of a digester by an identifier.
-// Note the that this defines both the hash algorithm used and the string
-// encoding.
-type Algorithm string
-
-// supported digest types
-const (
-	SHA256 Algorithm = "sha256" // sha256 with hex encoding
-	SHA384 Algorithm = "sha384" // sha384 with hex encoding
-	SHA512 Algorithm = "sha512" // sha512 with hex encoding
-
-	// Canonical is the primary digest algorithm used with the distribution
-	// project. Other digests may be used but this one is the primary storage
-	// digest.
-	Canonical = SHA256
-)
-
-var (
-	// TODO(stevvooe): Follow the pattern of the standard crypto package for
-	// registration of digests. Effectively, we are a registerable set and
-	// common symbol access.
-
-	// algorithms maps values to hash.Hash implementations. Other algorithms
-	// may be available but they cannot be calculated by the digest package.
-	algorithms = map[Algorithm]crypto.Hash{
-		SHA256: crypto.SHA256,
-		SHA384: crypto.SHA384,
-		SHA512: crypto.SHA512,
-	}
-)
-
-// Available returns true if the digest type is available for use. If this
-// returns false, New and Hash will return nil.
-func (a Algorithm) Available() bool {
-	h, ok := algorithms[a]
-	if !ok {
-		return false
-	}
-
-	// check availability of the hash, as well
-	return h.Available()
-}
-
-func (a Algorithm) String() string {
-	return string(a)
-}
-
-// Size returns number of bytes returned by the hash.
-func (a Algorithm) Size() int {
-	h, ok := algorithms[a]
-	if !ok {
-		return 0
-	}
-	return h.Size()
-}
-
-// Set implemented to allow use of Algorithm as a command line flag.
-func (a *Algorithm) Set(value string) error {
-	if value == "" {
-		*a = Canonical
-	} else {
-		// just do a type conversion, support is queried with Available.
-		*a = Algorithm(value)
-	}
-
-	return nil
-}
-
-// New returns a new digester for the specified algorithm. If the algorithm
-// does not have a digester implementation, nil will be returned. This can be
-// checked by calling Available before calling New.
-func (a Algorithm) New() Digester {
-	return &digester{
-		alg:  a,
-		hash: a.Hash(),
-	}
-}
-
-// Hash returns a new hash as used by the algorithm. If not available, the
-// method will panic. Check Algorithm.Available() before calling.
-func (a Algorithm) Hash() hash.Hash {
-	if !a.Available() {
-		// NOTE(stevvooe): A missing hash is usually a programming error that
-		// must be resolved at compile time. We don't import in the digest
-		// package to allow users to choose their hash implementation (such as
-		// when using stevvooe/resumable or a hardware accelerated package).
-		//
-		// Applications that may want to resolve the hash at runtime should
-		// call Algorithm.Available before call Algorithm.Hash().
-		panic(fmt.Sprintf("%v not available (make sure it is imported)", a))
-	}
-
-	return algorithms[a].New()
-}
-
-// FromReader returns the digest of the reader using the algorithm.
-func (a Algorithm) FromReader(rd io.Reader) (Digest, error) {
-	digester := a.New()
-
-	if _, err := io.Copy(digester.Hash(), rd); err != nil {
-		return "", err
-	}
-
-	return digester.Digest(), nil
-}
-
-// FromBytes digests the input and returns a Digest.
-func (a Algorithm) FromBytes(p []byte) Digest {
-	digester := a.New()
-
-	if _, err := digester.Hash().Write(p); err != nil {
-		// Writes to a Hash should never fail. None of the existing
-		// hash implementations in the stdlib or hashes vendored
-		// here can return errors from Write. Having a panic in this
-		// condition instead of having FromBytes return an error value
-		// avoids unnecessary error handling paths in all callers.
-		panic("write to hash function returned error: " + err.Error())
-	}
-
-	return digester.Digest()
-}
-
-// TODO(stevvooe): Allow resolution of verifiers using the digest type and
-// this registration system.
-
-// Digester calculates the digest of written data. Writes should go directly
-// to the return value of Hash, while calling Digest will return the current
-// value of the digest.
-type Digester interface {
-	Hash() hash.Hash // provides direct access to underlying hash instance.
-	Digest() Digest
-}
-
-// digester provides a simple digester definition that embeds a hasher.
-type digester struct {
-	alg  Algorithm
-	hash hash.Hash
-}
-
-func (d *digester) Hash() hash.Hash {
-	return d.hash
-}
-
-func (d *digester) Digest() Digest {
-	return NewDigest(d.alg, d.hash)
-}
diff --git a/vendor/github.com/docker/distribution/digest/doc.go b/vendor/github.com/docker/distribution/digest/doc.go
deleted file mode 100644
index f64b0db32b..0000000000
--- a/vendor/github.com/docker/distribution/digest/doc.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Package digest provides a generalized type to opaquely represent message
-// digests and their operations within the registry. The Digest type is
-// designed to serve as a flexible identifier in a content-addressable system.
-// More importantly, it provides tools and wrappers to work with
-// hash.Hash-based digests with little effort.
-//
-// Basics
-//
-// The format of a digest is simply a string with two parts, dubbed the
-// "algorithm" and the "digest", separated by a colon:
-//
-// 	<algorithm>:<digest>
-//
-// An example of a sha256 digest representation follows:
-//
-// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
-//
-// In this case, the string "sha256" is the algorithm and the hex bytes are
-// the "digest".
-//
-// Because the Digest type is simply a string, once a valid Digest is
-// obtained, comparisons are cheap, quick and simple to express with the
-// standard equality operator.
-//
-// Verification
-//
-// The main benefit of using the Digest type is simple verification against a
-// given digest. The Verifier interface, modeled after the stdlib hash.Hash
-// interface, provides a common write sink for digest verification. After
-// writing is complete, calling the Verifier.Verified method will indicate
-// whether or not the stream of bytes matches the target digest.
-//
-// Missing Features
-//
-// In addition to the above, we intend to add the following features to this
-// package:
-//
-// 1. A Digester type that supports write sink digest calculation.
-//
-// 2. Suspend and resume of ongoing digest calculations to support efficient digest verification in the registry.
-//
-package digest
diff --git a/vendor/github.com/docker/distribution/digest/verifiers.go b/vendor/github.com/docker/distribution/digest/verifiers.go
deleted file mode 100644
index 9af3be1341..0000000000
--- a/vendor/github.com/docker/distribution/digest/verifiers.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package digest
-
-import (
-	"hash"
-	"io"
-)
-
-// Verifier presents a general verification interface to be used with message
-// digests and other byte stream verifications. Users instantiate a Verifier
-// from one of the various methods, write the data under test to it then check
-// the result with the Verified method.
-type Verifier interface {
-	io.Writer
-
-	// Verified will return true if the content written to Verifier matches
-	// the digest.
-	Verified() bool
-}
-
-// NewDigestVerifier returns a verifier that compares the written bytes
-// against a passed in digest.
-func NewDigestVerifier(d Digest) (Verifier, error) {
-	if err := d.Validate(); err != nil {
-		return nil, err
-	}
-
-	return hashVerifier{
-		hash:   d.Algorithm().Hash(),
-		digest: d,
-	}, nil
-}
-
-type hashVerifier struct {
-	digest Digest
-	hash   hash.Hash
-}
-
-func (hv hashVerifier) Write(p []byte) (n int, err error) {
-	return hv.hash.Write(p)
-}
-
-func (hv hashVerifier) Verified() bool {
-	return hv.digest == NewDigest(hv.digest.Algorithm(), hv.hash)
-}
diff --git a/vendor/github.com/docker/distribution/digest/set.go b/vendor/github.com/docker/distribution/digestset/set.go
similarity index 89%
rename from vendor/github.com/docker/distribution/digest/set.go
rename to vendor/github.com/docker/distribution/digestset/set.go
index 3fac41b40f..71327dca72 100644
--- a/vendor/github.com/docker/distribution/digest/set.go
+++ b/vendor/github.com/docker/distribution/digestset/set.go
@@ -1,10 +1,12 @@
-package digest
+package digestset
 
 import (
 	"errors"
 	"sort"
 	"strings"
 	"sync"
+
+	digest "github.com/opencontainers/go-digest"
 )
 
 var (
@@ -22,7 +24,7 @@ var (
 // may be easily referenced by easily  referenced by a string
 // representation of the digest as well as short representation.
 // The uniqueness of the short representation is based on other
-// digests in the set. If digests are ommited from this set,
+// digests in the set. If digests are omitted from this set,
 // collisions in a larger set may not be detected, therefore it
 // is important to always do short representation lookups on
 // the complete set of digests. To mitigate collisions, an
@@ -44,7 +46,7 @@ func NewSet() *Set {
 // values or short values. This function does not test equality,
 // rather whether the second value could match against the first
 // value.
-func checkShortMatch(alg Algorithm, hex, shortAlg, shortHex string) bool {
+func checkShortMatch(alg digest.Algorithm, hex, shortAlg, shortHex string) bool {
 	if len(hex) == len(shortHex) {
 		if hex != shortHex {
 			return false
@@ -64,7 +66,7 @@ func checkShortMatch(alg Algorithm, hex, shortAlg, shortHex string) bool {
 // If no digests could be found ErrDigestNotFound will be returned
 // with an empty digest value. If multiple matches are found
 // ErrDigestAmbiguous will be returned with an empty digest value.
-func (dst *Set) Lookup(d string) (Digest, error) {
+func (dst *Set) Lookup(d string) (digest.Digest, error) {
 	dst.mutex.RLock()
 	defer dst.mutex.RUnlock()
 	if len(dst.entries) == 0 {
@@ -72,11 +74,11 @@ func (dst *Set) Lookup(d string) (Digest, error) {
 	}
 	var (
 		searchFunc func(int) bool
-		alg        Algorithm
+		alg        digest.Algorithm
 		hex        string
 	)
-	dgst, err := ParseDigest(d)
-	if err == ErrDigestInvalidFormat {
+	dgst, err := digest.Parse(d)
+	if err == digest.ErrDigestInvalidFormat {
 		hex = d
 		searchFunc = func(i int) bool {
 			return dst.entries[i].val >= d
@@ -108,7 +110,7 @@ func (dst *Set) Lookup(d string) (Digest, error) {
 // Add adds the given digest to the set. An error will be returned
 // if the given digest is invalid. If the digest already exists in the
 // set, this operation will be a no-op.
-func (dst *Set) Add(d Digest) error {
+func (dst *Set) Add(d digest.Digest) error {
 	if err := d.Validate(); err != nil {
 		return err
 	}
@@ -139,7 +141,7 @@ func (dst *Set) Add(d Digest) error {
 // Remove removes the given digest from the set. An err will be
 // returned if the given digest is invalid. If the digest does
 // not exist in the set, this operation will be a no-op.
-func (dst *Set) Remove(d Digest) error {
+func (dst *Set) Remove(d digest.Digest) error {
 	if err := d.Validate(); err != nil {
 		return err
 	}
@@ -167,10 +169,10 @@ func (dst *Set) Remove(d Digest) error {
 }
 
 // All returns all the digests in the set
-func (dst *Set) All() []Digest {
+func (dst *Set) All() []digest.Digest {
 	dst.mutex.RLock()
 	defer dst.mutex.RUnlock()
-	retValues := make([]Digest, len(dst.entries))
+	retValues := make([]digest.Digest, len(dst.entries))
 	for i := range dst.entries {
 		retValues[i] = dst.entries[i].digest
 	}
@@ -183,10 +185,10 @@ func (dst *Set) All() []Digest {
 // entire value of digest if uniqueness cannot be achieved without the
 // full value. This function will attempt to make short codes as short
 // as possible to be unique.
-func ShortCodeTable(dst *Set, length int) map[Digest]string {
+func ShortCodeTable(dst *Set, length int) map[digest.Digest]string {
 	dst.mutex.RLock()
 	defer dst.mutex.RUnlock()
-	m := make(map[Digest]string, len(dst.entries))
+	m := make(map[digest.Digest]string, len(dst.entries))
 	l := length
 	resetIdx := 0
 	for i := 0; i < len(dst.entries); i++ {
@@ -222,9 +224,9 @@ func ShortCodeTable(dst *Set, length int) map[Digest]string {
 }
 
 type digestEntry struct {
-	alg    Algorithm
+	alg    digest.Algorithm
 	val    string
-	digest Digest
+	digest digest.Digest
 }
 
 type digestEntries []*digestEntry
diff --git a/vendor/github.com/docker/distribution/errors.go b/vendor/github.com/docker/distribution/errors.go
index 77bd096ec8..020d33258b 100644
--- a/vendor/github.com/docker/distribution/errors.go
+++ b/vendor/github.com/docker/distribution/errors.go
@@ -5,9 +5,13 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/distribution/digest"
+	"github.com/opencontainers/go-digest"
 )
 
+// ErrAccessDenied is returned when an access to a requested resource is
+// denied.
+var ErrAccessDenied = errors.New("access denied")
+
 // ErrManifestNotModified is returned when a conditional manifest GetByTag
 // returns nil due to the client indicating it has the latest version
 var ErrManifestNotModified = errors.New("manifest not modified")
@@ -73,7 +77,7 @@ func (err ErrManifestUnknownRevision) Error() string {
 type ErrManifestUnverified struct{}
 
 func (ErrManifestUnverified) Error() string {
-	return fmt.Sprintf("unverified manifest")
+	return "unverified manifest"
 }
 
 // ErrManifestVerification provides a type to collect errors encountered
diff --git a/vendor/github.com/docker/distribution/manifests.go b/vendor/github.com/docker/distribution/manifests.go
index 1acb0500d7..1816baea1d 100644
--- a/vendor/github.com/docker/distribution/manifests.go
+++ b/vendor/github.com/docker/distribution/manifests.go
@@ -1,24 +1,29 @@
 package distribution
 
 import (
+	"context"
 	"fmt"
 	"mime"
 
-	"github.com/docker/distribution/context"
-	"github.com/docker/distribution/digest"
+	"github.com/opencontainers/go-digest"
 )
 
 // Manifest represents a registry object specifying a set of
 // references and an optional target
 type Manifest interface {
 	// References returns a list of objects which make up this manifest.
-	// The references are strictly ordered from base to head. A reference
-	// is anything which can be represented by a distribution.Descriptor
+	// A reference is anything which can be represented by a
+	// distribution.Descriptor. These can consist of layers, resources or other
+	// manifests.
+	//
+	// While no particular order is required, implementations should return
+	// them from highest to lowest priority. For example, one might want to
+	// return the base layer before the top layer.
 	References() []Descriptor
 
 	// Payload provides the serialized format of the manifest, in addition to
-	// the mediatype.
-	Payload() (mediatype string, payload []byte, err error)
+	// the media type.
+	Payload() (mediaType string, payload []byte, err error)
 }
 
 // ManifestBuilder creates a manifest allowing one to include dependencies.
@@ -36,6 +41,9 @@ type ManifestBuilder interface {
 	// AppendReference includes the given object in the manifest after any
 	// existing dependencies. If the add fails, such as when adding an
 	// unsupported dependency, an error may be returned.
+	//
+	// The destination of the reference is dependent on the manifest type and
+	// the dependency type.
 	AppendReference(dependency Describable) error
 }
 
@@ -53,12 +61,12 @@ type ManifestService interface {
 	// Delete removes the manifest specified by the given digest. Deleting
 	// a manifest that doesn't exist will return ErrManifestNotFound
 	Delete(ctx context.Context, dgst digest.Digest) error
+}
 
-	// Enumerate fills 'manifests' with the manifests in this service up
-	// to the size of 'manifests' and returns 'n' for the number of entries
-	// which were filled.  'last' contains an offset in the manifest set
-	// and can be used to resume iteration.
-	//Enumerate(ctx context.Context, manifests []Manifest, last Manifest) (n int, err error)
+// ManifestEnumerator enables iterating over manifests
+type ManifestEnumerator interface {
+	// Enumerate calls ingester for each manifest.
+	Enumerate(ctx context.Context, ingester func(digest.Digest) error) error
 }
 
 // Describable is an interface for descriptors
@@ -81,25 +89,25 @@ type UnmarshalFunc func([]byte) (Manifest, Descriptor, error)
 
 var mappings = make(map[string]UnmarshalFunc, 0)
 
-// UnmarshalManifest looks up manifest unmarshall functions based on
+// UnmarshalManifest looks up manifest unmarshal functions based on
 // MediaType
 func UnmarshalManifest(ctHeader string, p []byte) (Manifest, Descriptor, error) {
 	// Need to look up by the actual media type, not the raw contents of
 	// the header. Strip semicolons and anything following them.
-	var mediatype string
+	var mediaType string
 	if ctHeader != "" {
 		var err error
-		mediatype, _, err = mime.ParseMediaType(ctHeader)
+		mediaType, _, err = mime.ParseMediaType(ctHeader)
 		if err != nil {
 			return nil, Descriptor{}, err
 		}
 	}
 
-	unmarshalFunc, ok := mappings[mediatype]
+	unmarshalFunc, ok := mappings[mediaType]
 	if !ok {
 		unmarshalFunc, ok = mappings[""]
 		if !ok {
-			return nil, Descriptor{}, fmt.Errorf("unsupported manifest mediatype and no default available: %s", mediatype)
+			return nil, Descriptor{}, fmt.Errorf("unsupported manifest media type and no default available: %s", mediaType)
 		}
 	}
 
@@ -108,10 +116,10 @@ func UnmarshalManifest(ctHeader string, p []byte) (Manifest, Descriptor, error)
 
 // RegisterManifestSchema registers an UnmarshalFunc for a given schema type.  This
 // should be called from specific
-func RegisterManifestSchema(mediatype string, u UnmarshalFunc) error {
-	if _, ok := mappings[mediatype]; ok {
-		return fmt.Errorf("manifest mediatype registration would overwrite existing: %s", mediatype)
+func RegisterManifestSchema(mediaType string, u UnmarshalFunc) error {
+	if _, ok := mappings[mediaType]; ok {
+		return fmt.Errorf("manifest media type registration would overwrite existing: %s", mediaType)
 	}
-	mappings[mediatype] = u
+	mappings[mediaType] = u
 	return nil
 }
diff --git a/vendor/github.com/docker/distribution/reference/helpers.go b/vendor/github.com/docker/distribution/reference/helpers.go
new file mode 100644
index 0000000000..978df7eabb
--- /dev/null
+++ b/vendor/github.com/docker/distribution/reference/helpers.go
@@ -0,0 +1,42 @@
+package reference
+
+import "path"
+
+// IsNameOnly returns true if reference only contains a repo name.
+func IsNameOnly(ref Named) bool {
+	if _, ok := ref.(NamedTagged); ok {
+		return false
+	}
+	if _, ok := ref.(Canonical); ok {
+		return false
+	}
+	return true
+}
+
+// FamiliarName returns the familiar name string
+// for the given named, familiarizing if needed.
+func FamiliarName(ref Named) string {
+	if nn, ok := ref.(normalizedNamed); ok {
+		return nn.Familiar().Name()
+	}
+	return ref.Name()
+}
+
+// FamiliarString returns the familiar string representation
+// for the given reference, familiarizing if needed.
+func FamiliarString(ref Reference) string {
+	if nn, ok := ref.(normalizedNamed); ok {
+		return nn.Familiar().String()
+	}
+	return ref.String()
+}
+
+// FamiliarMatch reports whether ref matches the specified pattern.
+// See https://godoc.org/path#Match for supported patterns.
+func FamiliarMatch(pattern string, ref Reference) (bool, error) {
+	matched, err := path.Match(pattern, FamiliarString(ref))
+	if namedRef, isNamed := ref.(Named); isNamed && !matched {
+		matched, _ = path.Match(pattern, FamiliarName(namedRef))
+	}
+	return matched, err
+}
diff --git a/vendor/github.com/docker/distribution/reference/normalize.go b/vendor/github.com/docker/distribution/reference/normalize.go
new file mode 100644
index 0000000000..2d71fc5e9f
--- /dev/null
+++ b/vendor/github.com/docker/distribution/reference/normalize.go
@@ -0,0 +1,170 @@
+package reference
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/docker/distribution/digestset"
+	"github.com/opencontainers/go-digest"
+)
+
+var (
+	legacyDefaultDomain = "index.docker.io"
+	defaultDomain       = "docker.io"
+	officialRepoName    = "library"
+	defaultTag          = "latest"
+)
+
+// normalizedNamed represents a name which has been
+// normalized and has a familiar form. A familiar name
+// is what is used in Docker UI. An example normalized
+// name is "docker.io/library/ubuntu" and corresponding
+// familiar name of "ubuntu".
+type normalizedNamed interface {
+	Named
+	Familiar() Named
+}
+
+// ParseNormalizedNamed parses a string into a named reference
+// transforming a familiar name from Docker UI to a fully
+// qualified reference. If the value may be an identifier
+// use ParseAnyReference.
+func ParseNormalizedNamed(s string) (Named, error) {
+	if ok := anchoredIdentifierRegexp.MatchString(s); ok {
+		return nil, fmt.Errorf("invalid repository name (%s), cannot specify 64-byte hexadecimal strings", s)
+	}
+	domain, remainder := splitDockerDomain(s)
+	var remoteName string
+	if tagSep := strings.IndexRune(remainder, ':'); tagSep > -1 {
+		remoteName = remainder[:tagSep]
+	} else {
+		remoteName = remainder
+	}
+	if strings.ToLower(remoteName) != remoteName {
+		return nil, errors.New("invalid reference format: repository name must be lowercase")
+	}
+
+	ref, err := Parse(domain + "/" + remainder)
+	if err != nil {
+		return nil, err
+	}
+	named, isNamed := ref.(Named)
+	if !isNamed {
+		return nil, fmt.Errorf("reference %s has no name", ref.String())
+	}
+	return named, nil
+}
+
+// splitDockerDomain splits a repository name to domain and remotename string.
+// If no valid domain is found, the default domain is used. Repository name
+// needs to be already validated before.
+func splitDockerDomain(name string) (domain, remainder string) {
+	i := strings.IndexRune(name, '/')
+	if i == -1 || (!strings.ContainsAny(name[:i], ".:") && name[:i] != "localhost") {
+		domain, remainder = defaultDomain, name
+	} else {
+		domain, remainder = name[:i], name[i+1:]
+	}
+	if domain == legacyDefaultDomain {
+		domain = defaultDomain
+	}
+	if domain == defaultDomain && !strings.ContainsRune(remainder, '/') {
+		remainder = officialRepoName + "/" + remainder
+	}
+	return
+}
+
+// familiarizeName returns a shortened version of the name familiar
+// to to the Docker UI. Familiar names have the default domain
+// "docker.io" and "library/" repository prefix removed.
+// For example, "docker.io/library/redis" will have the familiar
+// name "redis" and "docker.io/dmcgowan/myapp" will be "dmcgowan/myapp".
+// Returns a familiarized named only reference.
+func familiarizeName(named namedRepository) repository {
+	repo := repository{
+		domain: named.Domain(),
+		path:   named.Path(),
+	}
+
+	if repo.domain == defaultDomain {
+		repo.domain = ""
+		// Handle official repositories which have the pattern "library/<official repo name>"
+		if split := strings.Split(repo.path, "/"); len(split) == 2 && split[0] == officialRepoName {
+			repo.path = split[1]
+		}
+	}
+	return repo
+}
+
+func (r reference) Familiar() Named {
+	return reference{
+		namedRepository: familiarizeName(r.namedRepository),
+		tag:             r.tag,
+		digest:          r.digest,
+	}
+}
+
+func (r repository) Familiar() Named {
+	return familiarizeName(r)
+}
+
+func (t taggedReference) Familiar() Named {
+	return taggedReference{
+		namedRepository: familiarizeName(t.namedRepository),
+		tag:             t.tag,
+	}
+}
+
+func (c canonicalReference) Familiar() Named {
+	return canonicalReference{
+		namedRepository: familiarizeName(c.namedRepository),
+		digest:          c.digest,
+	}
+}
+
+// TagNameOnly adds the default tag "latest" to a reference if it only has
+// a repo name.
+func TagNameOnly(ref Named) Named {
+	if IsNameOnly(ref) {
+		namedTagged, err := WithTag(ref, defaultTag)
+		if err != nil {
+			// Default tag must be valid, to create a NamedTagged
+			// type with non-validated input the WithTag function
+			// should be used instead
+			panic(err)
+		}
+		return namedTagged
+	}
+	return ref
+}
+
+// ParseAnyReference parses a reference string as a possible identifier,
+// full digest, or familiar name.
+func ParseAnyReference(ref string) (Reference, error) {
+	if ok := anchoredIdentifierRegexp.MatchString(ref); ok {
+		return digestReference("sha256:" + ref), nil
+	}
+	if dgst, err := digest.Parse(ref); err == nil {
+		return digestReference(dgst), nil
+	}
+
+	return ParseNormalizedNamed(ref)
+}
+
+// ParseAnyReferenceWithSet parses a reference string as a possible short
+// identifier to be matched in a digest set, a full digest, or familiar name.
+func ParseAnyReferenceWithSet(ref string, ds *digestset.Set) (Reference, error) {
+	if ok := anchoredShortIdentifierRegexp.MatchString(ref); ok {
+		dgst, err := ds.Lookup(ref)
+		if err == nil {
+			return digestReference(dgst), nil
+		}
+	} else {
+		if dgst, err := digest.Parse(ref); err == nil {
+			return digestReference(dgst), nil
+		}
+	}
+
+	return ParseNormalizedNamed(ref)
+}
diff --git a/vendor/github.com/docker/distribution/reference/reference.go b/vendor/github.com/docker/distribution/reference/reference.go
index c188472a40..2f66cca87a 100644
--- a/vendor/github.com/docker/distribution/reference/reference.go
+++ b/vendor/github.com/docker/distribution/reference/reference.go
@@ -3,29 +3,33 @@
 //
 // Grammar
 //
-// 	reference                       := repository [ ":" tag ] [ "@" digest ]
-//	name                            := [hostname '/'] component ['/' component]*
-//	hostname                        := hostcomponent ['.' hostcomponent]* [':' port-number]
-//	hostcomponent                   := /([a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])/
+// 	reference                       := name [ ":" tag ] [ "@" digest ]
+//	name                            := [domain '/'] path-component ['/' path-component]*
+//	domain                          := domain-component ['.' domain-component]* [':' port-number]
+//	domain-component                := /([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])/
 //	port-number                     := /[0-9]+/
-//	component                       := alpha-numeric [separator alpha-numeric]*
+//	path-component                  := alpha-numeric [separator alpha-numeric]*
 // 	alpha-numeric                   := /[a-z0-9]+/
 //	separator                       := /[_.]|__|[-]*/
 //
 //	tag                             := /[\w][\w.-]{0,127}/
 //
 //	digest                          := digest-algorithm ":" digest-hex
-//	digest-algorithm                := digest-algorithm-component [ digest-algorithm-separator digest-algorithm-component ]
+//	digest-algorithm                := digest-algorithm-component [ digest-algorithm-separator digest-algorithm-component ]*
 //	digest-algorithm-separator      := /[+.-_]/
 //	digest-algorithm-component      := /[A-Za-z][A-Za-z0-9]*/
 //	digest-hex                      := /[0-9a-fA-F]{32,}/ ; At least 128 bit digest value
+//
+//	identifier                      := /[a-f0-9]{64}/
+//	short-identifier                := /[a-f0-9]{6,64}/
 package reference
 
 import (
 	"errors"
 	"fmt"
+	"strings"
 
-	"github.com/docker/distribution/digest"
+	"github.com/opencontainers/go-digest"
 )
 
 const (
@@ -43,11 +47,17 @@ var (
 	// ErrDigestInvalidFormat represents an error while trying to parse a string as a tag.
 	ErrDigestInvalidFormat = errors.New("invalid digest format")
 
+	// ErrNameContainsUppercase is returned for invalid repository names that contain uppercase characters.
+	ErrNameContainsUppercase = errors.New("repository name must be lowercase")
+
 	// ErrNameEmpty is returned for empty, invalid repository names.
 	ErrNameEmpty = errors.New("repository name must have at least one component")
 
 	// ErrNameTooLong is returned when a repository name is longer than NameTotalLengthMax.
 	ErrNameTooLong = fmt.Errorf("repository name must not be more than %v characters", NameTotalLengthMax)
+
+	// ErrNameNotCanonical is returned when a name is not canonical.
+	ErrNameNotCanonical = errors.New("repository name must be canonical")
 )
 
 // Reference is an opaque object reference identifier that may include
@@ -121,23 +131,56 @@ type Digested interface {
 }
 
 // Canonical reference is an object with a fully unique
-// name including a name with hostname and digest
+// name including a name with domain and digest
 type Canonical interface {
 	Named
 	Digest() digest.Digest
 }
 
+// namedRepository is a reference to a repository with a name.
+// A namedRepository has both domain and path components.
+type namedRepository interface {
+	Named
+	Domain() string
+	Path() string
+}
+
+// Domain returns the domain part of the Named reference
+func Domain(named Named) string {
+	if r, ok := named.(namedRepository); ok {
+		return r.Domain()
+	}
+	domain, _ := splitDomain(named.Name())
+	return domain
+}
+
+// Path returns the name without the domain part of the Named reference
+func Path(named Named) (name string) {
+	if r, ok := named.(namedRepository); ok {
+		return r.Path()
+	}
+	_, path := splitDomain(named.Name())
+	return path
+}
+
+func splitDomain(name string) (string, string) {
+	match := anchoredNameRegexp.FindStringSubmatch(name)
+	if len(match) != 3 {
+		return "", name
+	}
+	return match[1], match[2]
+}
+
 // SplitHostname splits a named reference into a
 // hostname and name string. If no valid hostname is
 // found, the hostname is empty and the full value
 // is returned as name
+// DEPRECATED: Use Domain or Path
 func SplitHostname(named Named) (string, string) {
-	name := named.Name()
-	match := anchoredNameRegexp.FindStringSubmatch(name)
-	if match == nil || len(match) != 3 {
-		return "", name
+	if r, ok := named.(namedRepository); ok {
+		return r.Domain(), r.Path()
 	}
-	return match[1], match[2]
+	return splitDomain(named.Name())
 }
 
 // Parse parses s and returns a syntactically valid Reference.
@@ -149,7 +192,9 @@ func Parse(s string) (Reference, error) {
 		if s == "" {
 			return nil, ErrNameEmpty
 		}
-		// TODO(dmcgowan): Provide more specific and helpful error
+		if ReferenceRegexp.FindStringSubmatch(strings.ToLower(s)) != nil {
+			return nil, ErrNameContainsUppercase
+		}
 		return nil, ErrReferenceInvalidFormat
 	}
 
@@ -157,13 +202,24 @@ func Parse(s string) (Reference, error) {
 		return nil, ErrNameTooLong
 	}
 
+	var repo repository
+
+	nameMatch := anchoredNameRegexp.FindStringSubmatch(matches[1])
+	if nameMatch != nil && len(nameMatch) == 3 {
+		repo.domain = nameMatch[1]
+		repo.path = nameMatch[2]
+	} else {
+		repo.domain = ""
+		repo.path = matches[1]
+	}
+
 	ref := reference{
-		name: matches[1],
-		tag:  matches[2],
+		namedRepository: repo,
+		tag:             matches[2],
 	}
 	if matches[3] != "" {
 		var err error
-		ref.digest, err = digest.ParseDigest(matches[3])
+		ref.digest, err = digest.Parse(matches[3])
 		if err != nil {
 			return nil, err
 		}
@@ -178,18 +234,17 @@ func Parse(s string) (Reference, error) {
 }
 
 // ParseNamed parses s and returns a syntactically valid reference implementing
-// the Named interface. The reference must have a name, otherwise an error is
-// returned.
+// the Named interface. The reference must have a name and be in the canonical
+// form, otherwise an error is returned.
 // If an error was encountered it is returned, along with a nil Reference.
 // NOTE: ParseNamed will not handle short digests.
 func ParseNamed(s string) (Named, error) {
-	ref, err := Parse(s)
+	named, err := ParseNormalizedNamed(s)
 	if err != nil {
 		return nil, err
 	}
-	named, isNamed := ref.(Named)
-	if !isNamed {
-		return nil, fmt.Errorf("reference %s has no name", ref.String())
+	if named.String() != s {
+		return nil, ErrNameNotCanonical
 	}
 	return named, nil
 }
@@ -200,10 +255,15 @@ func WithName(name string) (Named, error) {
 	if len(name) > NameTotalLengthMax {
 		return nil, ErrNameTooLong
 	}
-	if !anchoredNameRegexp.MatchString(name) {
+
+	match := anchoredNameRegexp.FindStringSubmatch(name)
+	if match == nil || len(match) != 3 {
 		return nil, ErrReferenceInvalidFormat
 	}
-	return repository(name), nil
+	return repository{
+		domain: match[1],
+		path:   match[2],
+	}, nil
 }
 
 // WithTag combines the name from "name" and the tag from "tag" to form a
@@ -212,9 +272,23 @@ func WithTag(name Named, tag string) (NamedTagged, error) {
 	if !anchoredTagRegexp.MatchString(tag) {
 		return nil, ErrTagInvalidFormat
 	}
+	var repo repository
+	if r, ok := name.(namedRepository); ok {
+		repo.domain = r.Domain()
+		repo.path = r.Path()
+	} else {
+		repo.path = name.Name()
+	}
+	if canonical, ok := name.(Canonical); ok {
+		return reference{
+			namedRepository: repo,
+			tag:             tag,
+			digest:          canonical.Digest(),
+		}, nil
+	}
 	return taggedReference{
-		name: name.Name(),
-		tag:  tag,
+		namedRepository: repo,
+		tag:             tag,
 	}, nil
 }
 
@@ -224,14 +298,37 @@ func WithDigest(name Named, digest digest.Digest) (Canonical, error) {
 	if !anchoredDigestRegexp.MatchString(digest.String()) {
 		return nil, ErrDigestInvalidFormat
 	}
+	var repo repository
+	if r, ok := name.(namedRepository); ok {
+		repo.domain = r.Domain()
+		repo.path = r.Path()
+	} else {
+		repo.path = name.Name()
+	}
+	if tagged, ok := name.(Tagged); ok {
+		return reference{
+			namedRepository: repo,
+			tag:             tagged.Tag(),
+			digest:          digest,
+		}, nil
+	}
 	return canonicalReference{
-		name:   name.Name(),
-		digest: digest,
+		namedRepository: repo,
+		digest:          digest,
 	}, nil
 }
 
+// TrimNamed removes any tag or digest from the named reference.
+func TrimNamed(ref Named) Named {
+	domain, path := SplitHostname(ref)
+	return repository{
+		domain: domain,
+		path:   path,
+	}
+}
+
 func getBestReferenceType(ref reference) Reference {
-	if ref.name == "" {
+	if ref.Name() == "" {
 		// Allow digest only references
 		if ref.digest != "" {
 			return digestReference(ref.digest)
@@ -241,16 +338,16 @@ func getBestReferenceType(ref reference) Reference {
 	if ref.tag == "" {
 		if ref.digest != "" {
 			return canonicalReference{
-				name:   ref.name,
-				digest: ref.digest,
+				namedRepository: ref.namedRepository,
+				digest:          ref.digest,
 			}
 		}
-		return repository(ref.name)
+		return ref.namedRepository
 	}
 	if ref.digest == "" {
 		return taggedReference{
-			name: ref.name,
-			tag:  ref.tag,
+			namedRepository: ref.namedRepository,
+			tag:             ref.tag,
 		}
 	}
 
@@ -258,17 +355,13 @@ func getBestReferenceType(ref reference) Reference {
 }
 
 type reference struct {
-	name   string
+	namedRepository
 	tag    string
 	digest digest.Digest
 }
 
 func (r reference) String() string {
-	return r.name + ":" + r.tag + "@" + r.digest.String()
-}
-
-func (r reference) Name() string {
-	return r.name
+	return r.Name() + ":" + r.tag + "@" + r.digest.String()
 }
 
 func (r reference) Tag() string {
@@ -279,20 +372,34 @@ func (r reference) Digest() digest.Digest {
 	return r.digest
 }
 
-type repository string
+type repository struct {
+	domain string
+	path   string
+}
 
 func (r repository) String() string {
-	return string(r)
+	return r.Name()
 }
 
 func (r repository) Name() string {
-	return string(r)
+	if r.domain == "" {
+		return r.path
+	}
+	return r.domain + "/" + r.path
+}
+
+func (r repository) Domain() string {
+	return r.domain
+}
+
+func (r repository) Path() string {
+	return r.path
 }
 
 type digestReference digest.Digest
 
 func (d digestReference) String() string {
-	return d.String()
+	return digest.Digest(d).String()
 }
 
 func (d digestReference) Digest() digest.Digest {
@@ -300,16 +407,12 @@ func (d digestReference) Digest() digest.Digest {
 }
 
 type taggedReference struct {
-	name string
-	tag  string
+	namedRepository
+	tag string
 }
 
 func (t taggedReference) String() string {
-	return t.name + ":" + t.tag
-}
-
-func (t taggedReference) Name() string {
-	return t.name
+	return t.Name() + ":" + t.tag
 }
 
 func (t taggedReference) Tag() string {
@@ -317,16 +420,12 @@ func (t taggedReference) Tag() string {
 }
 
 type canonicalReference struct {
-	name   string
+	namedRepository
 	digest digest.Digest
 }
 
 func (c canonicalReference) String() string {
-	return c.name + "@" + c.digest.String()
-}
-
-func (c canonicalReference) Name() string {
-	return c.name
+	return c.Name() + "@" + c.digest.String()
 }
 
 func (c canonicalReference) Digest() digest.Digest {
diff --git a/vendor/github.com/docker/distribution/reference/regexp.go b/vendor/github.com/docker/distribution/reference/regexp.go
index a4ffe5b642..7860349320 100644
--- a/vendor/github.com/docker/distribution/reference/regexp.go
+++ b/vendor/github.com/docker/distribution/reference/regexp.go
@@ -19,18 +19,18 @@ var (
 		alphaNumericRegexp,
 		optional(repeated(separatorRegexp, alphaNumericRegexp)))
 
-	// hostnameComponentRegexp restricts the registry hostname component of a
-	// repository name to start with a component as defined by hostnameRegexp
+	// domainComponentRegexp restricts the registry domain component of a
+	// repository name to start with a component as defined by DomainRegexp
 	// and followed by an optional port.
-	hostnameComponentRegexp = match(`(?:[a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])`)
+	domainComponentRegexp = match(`(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])`)
 
-	// hostnameRegexp defines the structure of potential hostname components
+	// DomainRegexp defines the structure of potential domain components
 	// that may be part of image names. This is purposely a subset of what is
 	// allowed by DNS to ensure backwards compatibility with Docker image
 	// names.
-	hostnameRegexp = expression(
-		hostnameComponentRegexp,
-		optional(repeated(literal(`.`), hostnameComponentRegexp)),
+	DomainRegexp = expression(
+		domainComponentRegexp,
+		optional(repeated(literal(`.`), domainComponentRegexp)),
 		optional(literal(`:`), match(`[0-9]+`)))
 
 	// TagRegexp matches valid tag names. From docker/docker:graph/tags.go.
@@ -48,17 +48,17 @@ var (
 	anchoredDigestRegexp = anchored(DigestRegexp)
 
 	// NameRegexp is the format for the name component of references. The
-	// regexp has capturing groups for the hostname and name part omitting
-	// the seperating forward slash from either.
+	// regexp has capturing groups for the domain and name part omitting
+	// the separating forward slash from either.
 	NameRegexp = expression(
-		optional(hostnameRegexp, literal(`/`)),
+		optional(DomainRegexp, literal(`/`)),
 		nameComponentRegexp,
 		optional(repeated(literal(`/`), nameComponentRegexp)))
 
 	// anchoredNameRegexp is used to parse a name value, capturing the
-	// hostname and trailing components.
+	// domain and trailing components.
 	anchoredNameRegexp = anchored(
-		optional(capture(hostnameRegexp), literal(`/`)),
+		optional(capture(DomainRegexp), literal(`/`)),
 		capture(nameComponentRegexp,
 			optional(repeated(literal(`/`), nameComponentRegexp))))
 
@@ -68,6 +68,25 @@ var (
 	ReferenceRegexp = anchored(capture(NameRegexp),
 		optional(literal(":"), capture(TagRegexp)),
 		optional(literal("@"), capture(DigestRegexp)))
+
+	// IdentifierRegexp is the format for string identifier used as a
+	// content addressable identifier using sha256. These identifiers
+	// are like digests without the algorithm, since sha256 is used.
+	IdentifierRegexp = match(`([a-f0-9]{64})`)
+
+	// ShortIdentifierRegexp is the format used to represent a prefix
+	// of an identifier. A prefix may be used to match a sha256 identifier
+	// within a list of trusted identifiers.
+	ShortIdentifierRegexp = match(`([a-f0-9]{6,64})`)
+
+	// anchoredIdentifierRegexp is used to check or match an
+	// identifier value, anchored at start and end of string.
+	anchoredIdentifierRegexp = anchored(IdentifierRegexp)
+
+	// anchoredShortIdentifierRegexp is used to check if a value
+	// is a possible identifier prefix, anchored at start and end
+	// of string.
+	anchoredShortIdentifierRegexp = anchored(ShortIdentifierRegexp)
 )
 
 // match compiles the string to a regular expression.
diff --git a/vendor/github.com/docker/distribution/registry.go b/vendor/github.com/docker/distribution/registry.go
index dcb35c3744..c34207d030 100644
--- a/vendor/github.com/docker/distribution/registry.go
+++ b/vendor/github.com/docker/distribution/registry.go
@@ -1,7 +1,8 @@
 package distribution
 
 import (
-	"github.com/docker/distribution/context"
+	"context"
+
 	"github.com/docker/distribution/reference"
 )
 
@@ -35,11 +36,22 @@ type Namespace interface {
 	// reference.
 	Repository(ctx context.Context, name reference.Named) (Repository, error)
 
-	// Repositories fills 'repos' with a lexigraphically sorted catalog of repositories
+	// Repositories fills 'repos' with a lexicographically sorted catalog of repositories
 	// up to the size of 'repos' and returns the value 'n' for the number of entries
 	// which were filled.  'last' contains an offset in the catalog, and 'err' will be
 	// set to io.EOF if there are no more entries to obtain.
 	Repositories(ctx context.Context, repos []string, last string) (n int, err error)
+
+	// Blobs returns a blob enumerator to access all blobs
+	Blobs() BlobEnumerator
+
+	// BlobStatter returns a BlobStatter to control
+	BlobStatter() BlobStatter
+}
+
+// RepositoryEnumerator describes an operation to enumerate repositories
+type RepositoryEnumerator interface {
+	Enumerate(ctx context.Context, ingester func(string) error) error
 }
 
 // ManifestServiceOption is a function argument for Manifest Service methods
@@ -47,10 +59,24 @@ type ManifestServiceOption interface {
 	Apply(ManifestService) error
 }
 
+// WithTag allows a tag to be passed into Put
+func WithTag(tag string) ManifestServiceOption {
+	return WithTagOption{tag}
+}
+
+// WithTagOption holds a tag
+type WithTagOption struct{ Tag string }
+
+// Apply conforms to the ManifestServiceOption interface
+func (o WithTagOption) Apply(m ManifestService) error {
+	// no implementation
+	return nil
+}
+
 // Repository is a named collection of manifests and layers.
 type Repository interface {
-	// Name returns the name of the repository.
-	Name() reference.Named
+	// Named returns the name of the repository.
+	Named() reference.Named
 
 	// Manifests returns a reference to this repository's manifest service.
 	// with the supplied options applied.
diff --git a/vendor/github.com/docker/distribution/tags.go b/vendor/github.com/docker/distribution/tags.go
index 5030565963..f22df2b850 100644
--- a/vendor/github.com/docker/distribution/tags.go
+++ b/vendor/github.com/docker/distribution/tags.go
@@ -1,7 +1,7 @@
 package distribution
 
 import (
-	"github.com/docker/distribution/context"
+	"context"
 )
 
 // TagService provides access to information about tagged objects.

From 61456e64a6705378642b9c79e830a644d49b51fd Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Fri, 22 Sep 2017 13:50:26 -0700
Subject: [PATCH 1190/1304] scripts: New file sort-stage1-manifests

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 Documentation/devel/update-coreos-stage1.md |  2 ++
 scripts/sort-stage1-manifests.sh            | 28 +++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100755 scripts/sort-stage1-manifests.sh

diff --git a/Documentation/devel/update-coreos-stage1.md b/Documentation/devel/update-coreos-stage1.md
index ef81c380ec..ec4a7f9d31 100644
--- a/Documentation/devel/update-coreos-stage1.md
+++ b/Documentation/devel/update-coreos-stage1.md
@@ -80,6 +80,8 @@ done
 Usually, there are some updated libraries which need an update on their version numbers.
 In our case, there are no updates and all the files mentioned in the manifest are present in the updated Container Linux image.
 
+If any of the manifest files have been modified run the script `scripts/sort-stage1-manifests.sh` to keep the manifest files in sorted order.
+
 ## Update the coreos flavor version used by the build system
 
 In the file `stage1/usr_from_coreos/coreos-common.mk`, we define which Container Linux image version we use for the coreos flavor.
diff --git a/scripts/sort-stage1-manifests.sh b/scripts/sort-stage1-manifests.sh
new file mode 100755
index 0000000000..518b9a1163
--- /dev/null
+++ b/scripts/sort-stage1-manifests.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Usage: [TOP_DIR=directory] sort-stage1-manifests.sh
+
+set -e
+
+: ${TOP_DIR:="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"}
+
+tmp=$(mktemp --tmpdir manifest-sort-XXX)
+
+cleanup () {
+	rm -f ${tmp}
+}
+
+trap cleanup EXIT
+
+boards='amd64-usr arm64-usr'
+flavors='usr_from_coreos usr_from_kvm'
+
+for board in ${boards}; do
+	for flavor in ${flavors}; do
+		dir="${TOP_DIR}/stage1/${flavor}/manifest-${board}.d/"
+		files=$(find ${dir} -type f -name '*.manifest')
+		for f in ${files}; do
+			cat ${f} | sort | uniq | sed '/^$/d' > ${tmp}
+			cp ${tmp} ${f}
+		done
+	done
+done

From bed6af0fa012d5366037da096f5c3c48073f7273 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Fri, 22 Sep 2017 13:50:26 -0700
Subject: [PATCH 1191/1304] stage1: Sort usr_from_kvm manifests

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest |  2 +-
 stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest b/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
index be5064474a..061964b7f2 100644
--- a/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
+++ b/stage1/usr_from_kvm/manifest-amd64-usr.d/sshd.manifest
@@ -4,8 +4,8 @@ bin/ssh-keygen
 lib64/libcom_err.so.2
 lib64/libcom_err.so.2.1
 lib64/libcrypt-2.23.so
-lib64/libcrypt.so.1
 lib64/libcrypto.so.1.0.0
+lib64/libcrypt.so.1
 lib64/libgssapi_krb5.so.2
 lib64/libgssapi_krb5.so.2.2
 lib64/libk5crypto.so.3
diff --git a/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest b/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest
index 378e7f9a3b..725d76cced 100644
--- a/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest
+++ b/stage1/usr_from_kvm/manifest-arm64-usr.d/ip.manifest
@@ -1,8 +1,8 @@
 bin/ip
-lib64/libdl.so.2
-lib64/libdl-2.23.so
-lib64/libc.so.6
-lib64/libc-2.23.so
-lib64/ld-linux-aarch64.so.1
 lib64/ld-2.23.so
+lib64/ld-linux-aarch64.so.1
+lib64/libc-2.23.so
+lib64/libc.so.6
+lib64/libdl-2.23.so
+lib64/libdl.so.2
 lib/ld-linux-aarch64.so.1

From 18f76241421892816703eed007f071b3abb28658 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal@kinvolk.io>
Date: Tue, 26 Sep 2017 14:51:17 +0200
Subject: [PATCH 1192/1304] app/add: Allow to define annotations for app from
 CLI

Before this change, "app add" CLI allowed only to define
user annotations. User annotations were designed mostly
to store annotations from Kubernetes API. At the same time,
we want to store some data related to rktlet which aren't
k8s annotations (i.e. log directories for CRI-compatible
logs).

Defining annotations is allowed here by --annotation
CLI option (i.e. --annotation=foo=bar).

Ref #3813
---
 common/apps/apps.go           |  1 +
 rkt/app_sandbox.go            | 16 +++++-----
 rkt/cli_apps.go               | 45 +++++++++++++++++++++++++---
 rkt/run.go                    |  3 +-
 stage0/common.go              | 12 ++++++++
 tests/rkt_app_sandbox_test.go | 56 +++++++++++++++++++++++++++++++++++
 6 files changed, 120 insertions(+), 13 deletions(-)

diff --git a/common/apps/apps.go b/common/apps/apps.go
index 598a6de326..1978b6841d 100644
--- a/common/apps/apps.go
+++ b/common/apps/apps.go
@@ -63,6 +63,7 @@ type App struct {
 	CapsRemove        *types.LinuxCapabilitiesRevokeSet // os/linux/capabilities-remove-set overrides
 	SeccompFilter     string                            // seccomp CLI overrides
 	OOMScoreAdj       *types.LinuxOOMScoreAdj           // oom-score-adj isolator override
+	Annotations       map[string]string                 // the annotations of the app
 	UserAnnotations   map[string]string                 // the user annotations of the app.
 	UserLabels        map[string]string                 // the user labels of the app.
 	Environments      map[string]string                 // the environments of the app.
diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
index e831641b59..58144075b4 100644
--- a/rkt/app_sandbox.go
+++ b/rkt/app_sandbox.go
@@ -39,9 +39,9 @@ var (
 		Long:  "Initializes an empty pod having no applications.",
 		Run:   runWrapper(runAppSandbox),
 	}
-	flagAppPorts    appPortList
-	flagAnnotations kvMap
-	flagLabels      kvMap
+	flagAppPorts        appPortList
+	flagUserAnnotations kvMap
+	flagLabels          kvMap
 )
 
 func init() {
@@ -60,7 +60,7 @@ func init() {
 	cmdAppSandbox.Flags().Var(&flagAppPorts, "port", "ports to forward. format: \"name:proto:podPort:hostIP:hostPort\"")
 
 	flagAppPorts = appPortList{}
-	cmdAppSandbox.Flags().Var(&flagAnnotations, "user-annotation", "optional, set the pod's annotations in the form of key=value")
+	cmdAppSandbox.Flags().Var(&flagUserAnnotations, "user-annotation", "optional, set the pod's annotations in the form of key=value")
 	cmdAppSandbox.Flags().Var(&flagLabels, "user-label", "optional, set the pod's label in the form of key=value")
 }
 
@@ -140,7 +140,7 @@ func runAppSandbox(cmd *cobra.Command, args []string) int {
 		PrivateUsers:    user.NewBlankUidRange(),
 		Apps:            &rktApps,
 		Ports:           []types.ExposedPort(flagAppPorts),
-		UserAnnotations: parseAnnotations(&flagAnnotations),
+		UserAnnotations: parseAnnotations(&flagUserAnnotations),
 		UserLabels:      parseLabels(&flagLabels),
 	}
 
@@ -297,12 +297,12 @@ func (apl *appPortList) Type() string {
 
 // parseAnnotations converts the annotations set by '--user-annotation' flag,
 // and returns types.UserAnnotations.
-func parseAnnotations(flagAnnotations *kvMap) types.UserAnnotations {
-	if flagAnnotations.IsEmpty() {
+func parseAnnotations(flagUserAnnotations *kvMap) types.UserAnnotations {
+	if flagUserAnnotations.IsEmpty() {
 		return nil
 	}
 	annotations := make(types.UserAnnotations)
-	for k, v := range flagAnnotations.mapping {
+	for k, v := range flagUserAnnotations.mapping {
 		annotations[k] = v
 	}
 	return annotations
diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index b41c3e283f..5c04d1f766 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -600,10 +600,47 @@ func (au *appName) Type() string {
 	return "appName"
 }
 
-// appAnnotation is for --user-annotation flags in the form of: --user-annotation=NAME=VALUE.
+// appAnnotation is for --annotation flags in the form of: --annotation=name=value
 type appAnnotation apps.Apps
 
 func (au *appAnnotation) Set(s string) error {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return fmt.Errorf("--annotation must follow an image")
+	}
+
+	fields := strings.SplitN(s, "=", 2)
+	if len(fields) != 2 {
+		return fmt.Errorf("invalid format of --annotation flag %q", s)
+	}
+
+	if app.Annotations == nil {
+		app.Annotations = make(map[string]string)
+	}
+	app.Annotations[fields[0]] = fields[1]
+	return nil
+}
+
+func (au *appAnnotation) String() string {
+	app := (*apps.Apps)(au).Last()
+	if app == nil {
+		return ""
+	}
+	var annotations []string
+	for name, value := range app.Annotations {
+		annotations = append(annotations, fmt.Sprintf("%s=%s", name, value))
+	}
+	return strings.Join(annotations, ",")
+}
+
+func (au *appAnnotation) Type() string {
+	return "appAnnotation"
+}
+
+// appUserAnnotation is for --user-annotation flags in the form of: --user-annotation=NAME=VALUE.
+type appUserAnnotation apps.Apps
+
+func (au *appUserAnnotation) Set(s string) error {
 	app := (*apps.Apps)(au).Last()
 	if app == nil {
 		return fmt.Errorf("--user-annotation must follow an image")
@@ -621,7 +658,7 @@ func (au *appAnnotation) Set(s string) error {
 	return nil
 }
 
-func (au *appAnnotation) String() string {
+func (au *appUserAnnotation) String() string {
 	app := (*apps.Apps)(au).Last()
 	if app == nil {
 		return ""
@@ -633,8 +670,8 @@ func (au *appAnnotation) String() string {
 	return strings.Join(annotations, ",")
 }
 
-func (au *appAnnotation) Type() string {
-	return "appAnnotation"
+func (au *appUserAnnotation) Type() string {
+	return "appUserAnnotation"
 }
 
 // appLabel is for --user-label flags in the form of: --user-label=NAME=VALUE.
diff --git a/rkt/run.go b/rkt/run.go
index b1a0ce8457..b852e13a6c 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -108,7 +108,8 @@ func addAppFlags(cmd *cobra.Command) {
 	cmd.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
 	cmd.Flags().Var((*appSupplementaryGIDs)(&rktApps), "supplementary-gids", "supplementary group IDs override for the preceding image (examples: '--supplementary-gids=1024,2048'")
 	cmd.Flags().Var((*appName)(&rktApps), "name", "set the name of the app (example: '--name=foo'). If not set, then the app name default to the image's name")
-	cmd.Flags().Var((*appAnnotation)(&rktApps), "user-annotation", "set the app's annotations (example: '--user-annotation=foo=bar')")
+	cmd.Flags().Var((*appAnnotation)(&rktApps), "annotation", "set the app's annotations (example: '--annotation=foo=bar')")
+	cmd.Flags().Var((*appUserAnnotation)(&rktApps), "user-annotation", "set the app's annotations (example: '--user-annotation=foo=bar')")
 	cmd.Flags().Var((*appLabel)(&rktApps), "user-label", "set the app's labels (example: '--user-label=foo=bar')")
 	cmd.Flags().Var((*appEnv)(&rktApps), "environment", "set the app's environment variables (example: '--environment=foo=bar')")
 	if common.IsExperimentEnabled("attach") {
diff --git a/stage0/common.go b/stage0/common.go
index 9a13791853..aa1ce5f560 100644
--- a/stage0/common.go
+++ b/stage0/common.go
@@ -164,6 +164,18 @@ func generateRuntimeApp(appRunConfig *apps.App, am *schema.ImageManifest, podMou
 		ra.App.SupplementaryGIDs = appRunConfig.SupplementaryGIDs
 	}
 
+	for k, v := range appRunConfig.Annotations {
+		if _, ok := ra.Annotations.Get(k); ok {
+			continue
+		}
+		kAci, err := types.NewACIdentifier(k)
+		if err != nil {
+			return ra, errwrap.Wrap(fmt.Errorf("error parsing annotation key %q", k), err)
+		}
+
+		ra.Annotations.Set(*kAci, v)
+	}
+
 	if appRunConfig.UserAnnotations != nil {
 		ra.App.UserAnnotations = appRunConfig.UserAnnotations
 	}
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index 1d61cac323..a5cd8c9bbd 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -22,6 +22,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"reflect"
 	"strconv"
 	"strings"
 	"testing"
@@ -419,6 +420,61 @@ func TestAppSandboxMount(t *testing.T) {
 	})
 }
 
+func TestAppSandboxAnnotations(t *testing.T) {
+	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+		for _, tt := range []struct {
+			args                    []string
+			expectedAnnotations     map[string]string
+			expectedUserAnnotations map[string]string
+		}{
+			{
+				args: []string{
+					"--annotation=foo=bar",
+					"--user-annotation=ayy=lmao",
+				},
+				expectedAnnotations:     map[string]string{"foo": "bar"},
+				expectedUserAnnotations: map[string]string{"ayy": "lmao"},
+			},
+		} {
+			imageName := "coreos.com/rkt-inspect/hello"
+			msg := "HelloFromAppInSandbox"
+
+			aciHello := patchTestACI("rkt-inspect-hello.aci", "--name="+imageName, "--exec=/inspect --print-msg="+msg)
+			defer os.Remove(aciHello)
+
+			combinedOutput(t, ctx.ExecCmd("fetch", "--insecure-options=image", aciHello))
+
+			args := []string{
+				"app", "add", "--debug", podUUID,
+				"coreos.com/rkt-inspect/hello",
+				"--name=annotation-test",
+			}
+			args = append(args, tt.args...)
+
+			combinedOutput(t, ctx.ExecCmd(args...))
+
+			podInfo := getPodInfo(t, ctx, podUUID)
+
+			annotations := make(map[string]string)
+			for _, annotation := range podInfo.manifest.Apps[0].Annotations {
+				annotations[annotation.Name.String()] = annotation.Value
+			}
+
+			userAnnotations := make(map[string]string)
+			for k, v := range podInfo.manifest.Apps[0].App.UserAnnotations {
+				userAnnotations[k] = v
+			}
+
+			if !reflect.DeepEqual(annotations, tt.expectedAnnotations) {
+				t.Errorf("expected %v annotations, got %v annotations", annotations, tt.expectedAnnotations)
+			}
+			if !reflect.DeepEqual(userAnnotations, tt.expectedUserAnnotations) {
+				t.Errorf("expected %v user annotations, got %v user annotations", userAnnotations, tt.expectedUserAnnotations)
+			}
+		}
+	})
+}
+
 func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.ExpectSubprocess, string)) {
 	if err := os.Setenv("RKT_EXPERIMENT_APP", "true"); err != nil {
 		panic(err)

From 91fc5881540dea9c44ff1e98421fa8dcea937b0d Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal@kinvolk.io>
Date: Tue, 19 Sep 2017 10:14:32 +0200
Subject: [PATCH 1193/1304] app/add: Use the image name as a default name for
 app

The help message in "app add" sucommand suggests that --name
flag is optional, but it wasn't. This commit fixes the desired
behaviour.

Fixes #3801
---
 common/common.go              | 14 +++++++++
 common/common_test.go         | 56 +++++++++++++++++++++++++++++++++++
 stage0/app_add.go             |  3 +-
 stage0/run.go                 | 14 +--------
 tests/rkt_app_sandbox_test.go | 25 ++++++++++++++++
 5 files changed, 98 insertions(+), 14 deletions(-)
 create mode 100644 common/common_test.go

diff --git a/common/common.go b/common/common.go
index 5e2dfb75d9..ffe11278f0 100644
--- a/common/common.go
+++ b/common/common.go
@@ -539,3 +539,17 @@ func GetOSArch() (os string, arch string) {
 	os, arch, _ = types.ToAppcOSArch(runtime.GOOS, arch, flavor)
 	return os, arch
 }
+
+// ImageNameToAppName converts the full name of image to an app name without special
+// characters - we use it as a default app name when specyfing it is optional
+func ImageNameToAppName(name types.ACIdentifier) (*types.ACName, error) {
+	parts := strings.Split(name.String(), "/")
+	last := parts[len(parts)-1]
+
+	sn, err := types.SanitizeACName(last)
+	if err != nil {
+		return nil, err
+	}
+
+	return types.MustACName(sn), nil
+}
diff --git a/common/common_test.go b/common/common_test.go
new file mode 100644
index 0000000000..b93ba88ccc
--- /dev/null
+++ b/common/common_test.go
@@ -0,0 +1,56 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"testing"
+
+	"github.com/appc/spec/schema/types"
+)
+
+func TestImageNameToAppName(t *testing.T) {
+	for _, tt := range []struct {
+		in  types.ACIdentifier
+		out types.ACName
+		err bool
+	}{
+		{
+			in:  types.ACIdentifier("coreos.com/etcd:v2.0.0"),
+			out: types.ACName("etcd-v2-0-0"),
+			err: false,
+		},
+		{
+			in:  types.ACIdentifier("coreos.com/etcd"),
+			out: types.ACName("etcd"),
+			err: false,
+		},
+		{
+			in:  types.ACIdentifier("docker://registry.hub.docker.com/library/fedora"),
+			out: types.ACName("fedora"),
+			err: false,
+		},
+	} {
+		appName, err := ImageNameToAppName(tt.in)
+		if err != nil {
+			if !tt.err {
+				t.Fatal(err)
+			}
+		} else if appName == nil {
+			t.Errorf("got nil app name without any error")
+		} else if *appName != tt.out {
+			t.Errorf("got %s app name, expected %s app name", appName, tt.out)
+		}
+	}
+}
diff --git a/stage0/app_add.go b/stage0/app_add.go
index 68b60d4272..df2f4e0082 100644
--- a/stage0/app_add.go
+++ b/stage0/app_add.go
@@ -62,10 +62,11 @@ func AddApp(cfg AddConfig) error {
 			return err
 		}
 	} else {
-		appName, err = imageNameToAppName(am.Name)
+		appName, err = common.ImageNameToAppName(am.Name)
 		if err != nil {
 			return err
 		}
+		app.Name = appName.String()
 	}
 
 	pod, err := pkgPod.PodFromUUIDString(cfg.DataDir, cfg.UUID.String())
diff --git a/stage0/run.go b/stage0/run.go
index c8ee731018..5dd407d0e3 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -156,18 +156,6 @@ func mergeEnvs(appEnv *types.Environment, env []string, override bool) {
 	}
 }
 
-func imageNameToAppName(name types.ACIdentifier) (*types.ACName, error) {
-	parts := strings.Split(name.String(), "/")
-	last := parts[len(parts)-1]
-
-	sn, err := types.SanitizeACName(last)
-	if err != nil {
-		return nil, err
-	}
-
-	return types.MustACName(sn), nil
-}
-
 // deduplicateMPs removes Mounts with duplicated paths. If there's more than
 // one Mount with the same path, it keeps the first one encountered.
 func deduplicateMPs(mounts []schema.Mount) []schema.Mount {
@@ -213,7 +201,7 @@ func generatePodManifest(cfg PrepareConfig, dir string) ([]byte, error) {
 		}
 
 		if app.Name == "" {
-			appName, err := imageNameToAppName(am.Name)
+			appName, err := common.ImageNameToAppName(am.Name)
 			if err != nil {
 				return errwrap.Wrap(errors.New("error converting image name to app name"), err)
 			}
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index a5cd8c9bbd..8009e54268 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -62,6 +62,31 @@ func TestAppSandboxAddStartRemove(t *testing.T) {
 	})
 }
 
+// TestAppSandboxAddDefaultAppName tests applying default names to apps.
+// It starts the sandbox, adds one app and ensures that it has a name converted from
+// the image name.
+func TestAppSandboxAddDefaultAppName(t *testing.T) {
+	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+		imageName := "coreos.com/rkt-inspect/hello"
+		msg := "HelloFromAppInSandbox"
+
+		expectedAppName := "hello"
+
+		aciHello := patchTestACI("rkt-inspect-hello.aci", "--name="+imageName, "--exec=/inspect --print-msg="+msg)
+		defer os.Remove(aciHello)
+
+		combinedOutput(t, ctx.ExecCmd("fetch", "--insecure-options=image", aciHello))
+		combinedOutput(t, ctx.ExecCmd("app", "add", "--debug", podUUID, imageName))
+
+		podInfo := getPodInfo(t, ctx, podUUID)
+		appName := podInfo.manifest.Apps[0].Name
+
+		if appName.String() != expectedAppName {
+			t.Errorf("got %s app name, expected %s app name", appName, expectedAppName)
+		}
+	})
+}
+
 // TestAppSandboxMultipleApps tests multiple apps in a sandbox:
 // one that exits successfully, one that exits with an error, and one that keeps running.
 func TestAppSandboxMultipleApps(t *testing.T) {

From 68cd245810478805c8c156190c14b2a83c4ddb5d Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal@kinvolk.io>
Date: Thu, 28 Sep 2017 12:17:32 +0200
Subject: [PATCH 1194/1304] app/sandbox: Allow to define annotations for
 sandbox from CLI

Before this change, "app sandbox" CLI allowed only to define
user annotations. User annotations were designed mostly to
store annotations from Kubernetes API. At the same time, we
want to store some data related to rktlet which aren't k8s
annotations (i.e. log mode).

Defining annotations is allowed here by --annotation CLI
option (i.e. --annotation=foo=bar).

Ref #3813
---
 rkt/app_sandbox.go            | 28 ++++++++++++++----
 tests/rkt_app_sandbox_test.go | 54 +++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
index 58144075b4..7c82f59f45 100644
--- a/rkt/app_sandbox.go
+++ b/rkt/app_sandbox.go
@@ -40,6 +40,7 @@ var (
 		Run:   runWrapper(runAppSandbox),
 	}
 	flagAppPorts        appPortList
+	flagAnnotations     kvMap
 	flagUserAnnotations kvMap
 	flagLabels          kvMap
 )
@@ -60,7 +61,8 @@ func init() {
 	cmdAppSandbox.Flags().Var(&flagAppPorts, "port", "ports to forward. format: \"name:proto:podPort:hostIP:hostPort\"")
 
 	flagAppPorts = appPortList{}
-	cmdAppSandbox.Flags().Var(&flagUserAnnotations, "user-annotation", "optional, set the pod's annotations in the form of key=value")
+	cmdAppSandbox.Flags().Var(&flagAnnotations, "annotation", "optional, set the pod's annotations in the form of key=value")
+	cmdAppSandbox.Flags().Var(&flagUserAnnotations, "user-annotation", "optional, set the pod's user annotations in the form of key=value")
 	cmdAppSandbox.Flags().Var(&flagLabels, "user-label", "optional, set the pod's label in the form of key=value")
 }
 
@@ -119,6 +121,7 @@ func runAppSandbox(cmd *cobra.Command, args []string) int {
 		UUID:         p.UUID,
 		Debug:        globalFlags.Debug,
 		Mutable:      true,
+		Annotations:  parseAnnotations(&flagAnnotations),
 	}
 
 	ovlOk := true
@@ -140,7 +143,7 @@ func runAppSandbox(cmd *cobra.Command, args []string) int {
 		PrivateUsers:    user.NewBlankUidRange(),
 		Apps:            &rktApps,
 		Ports:           []types.ExposedPort(flagAppPorts),
-		UserAnnotations: parseAnnotations(&flagUserAnnotations),
+		UserAnnotations: parseUserAnnotations(&flagUserAnnotations),
 		UserLabels:      parseLabels(&flagLabels),
 	}
 
@@ -295,15 +298,28 @@ func (apl *appPortList) Type() string {
 	return "appPortList"
 }
 
-// parseAnnotations converts the annotations set by '--user-annotation' flag,
+// parseUserAnnotations converts the user annotations set by '--user-annotation' flag,
 // and returns types.UserAnnotations.
-func parseAnnotations(flagUserAnnotations *kvMap) types.UserAnnotations {
+func parseUserAnnotations(flagUserAnnotations *kvMap) types.UserAnnotations {
 	if flagUserAnnotations.IsEmpty() {
 		return nil
 	}
-	annotations := make(types.UserAnnotations)
+	userAnnotations := make(types.UserAnnotations)
 	for k, v := range flagUserAnnotations.mapping {
-		annotations[k] = v
+		userAnnotations[k] = v
+	}
+	return userAnnotations
+}
+
+// parseAnnotations converts the annotations set by '--annotation' flag,
+// and returns map[types.ACIdentifier]string
+func parseAnnotations(flagAnnotations *kvMap) map[types.ACIdentifier]string {
+	if flagAnnotations.IsEmpty() {
+		return nil
+	}
+	annotations := make(map[types.ACIdentifier]string)
+	for k, v := range flagAnnotations.mapping {
+		annotations[types.ACIdentifier(k)] = v
 	}
 	return annotations
 }
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index 8009e54268..f30cb62bf2 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -446,6 +446,53 @@ func TestAppSandboxMount(t *testing.T) {
 }
 
 func TestAppSandboxAnnotations(t *testing.T) {
+	for _, tt := range []struct {
+		args                    []string
+		expectedAnnotations     map[string]string
+		expectedUserAnnotations map[string]string
+	}{
+		{
+			args: []string{
+				"--annotation=foo=bar",
+				"--user-annotation=ayy=lmao",
+			},
+			expectedAnnotations:     map[string]string{"foo": "bar"},
+			expectedUserAnnotations: map[string]string{"ayy": "lmao"},
+		},
+	} {
+		testSandboxWithArgs(t, tt.args, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+			podInfo := getPodInfo(t, ctx, podUUID)
+
+			annotations := make(map[string]string)
+			for _, annotation := range podInfo.manifest.Annotations {
+				annotations[annotation.Name.String()] = annotation.Value
+			}
+
+			userAnnotations := make(map[string]string)
+			for k, v := range podInfo.manifest.UserAnnotations {
+				userAnnotations[k] = v
+			}
+
+			// Annotations contain both the data from CLI and data generated dufing rkt runtime.
+			// We check here only for the data we provided with CLi.
+			for k, v := range tt.expectedAnnotations {
+				value, ok := annotations[k]
+				if !ok {
+					t.Errorf("key %s doesn't exist in annotations", k)
+				}
+				if v != value {
+					t.Errorf("got value %s, expected value %s", v, value)
+				}
+			}
+
+			if !reflect.DeepEqual(userAnnotations, tt.expectedUserAnnotations) {
+				t.Errorf("got %v user annotations, expected %v user annotations", userAnnotations, tt.expectedUserAnnotations)
+			}
+		})
+	}
+}
+
+func TestAppSandboxAppAnnotations(t *testing.T) {
 	testSandbox(t, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
 		for _, tt := range []struct {
 			args                    []string
@@ -501,6 +548,10 @@ func TestAppSandboxAnnotations(t *testing.T) {
 }
 
 func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.ExpectSubprocess, string)) {
+	testSandboxWithArgs(t, nil, testFunc)
+}
+
+func testSandboxWithArgs(t *testing.T, args []string, testFunc func(*testutils.RktRunCtx, *gexpect.ExpectSubprocess, string)) {
 	if err := os.Setenv("RKT_EXPERIMENT_APP", "true"); err != nil {
 		panic(err)
 	}
@@ -519,6 +570,9 @@ func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.Expe
 	defer ctx.Cleanup()
 
 	rkt := ctx.Cmd() + " app sandbox --uuid-file-save=" + uuidFile
+	if args != nil {
+		rkt = rkt + " " + strings.Join(args, " ")
+	}
 	child := spawnOrFail(t, rkt)
 
 	// wait for the sandbox to start

From af8d5ae6b8e53a1f5d964cfac9173a1b2a41b17b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 28 Sep 2017 18:24:26 +0200
Subject: [PATCH 1195/1304] CHANGELOG: add v1.29.0

---
 CHANGELOG.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b2157c425..b279c75de9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,44 @@
+## 1.29.0
+
+This release contains a number of bugfixes, new features like the ability to share the host IPC namespace, dependency updates, and build system improvements.
+
+### Bugfixes
+
+- app/add: Use the image name as a default name for app ([#3802](https://github.com/rkt/rkt/pull/3802)). Make the `--name` flag optional like stated in the help message.
+- stage1/init: activate systemd-journal-flush.service ([#3807](https://github.com/rkt/rkt/pull/3807)). It's needed to make systemd-journald write to /var/log/journal instead of /run/log/journal.
+- stage0/gc: try to avoid double overlay mounts ([#3806](https://github.com/rkt/rkt/pull/3806)). Before Linux 4.13, it used to be possible to perform double overlayfs mounts and now it's not, handle this case.
+- api: add CreatedAt to v1.Pod ([#3797](https://github.com/rkt/rkt/pull/3797)). It might happen that the pod is created but we can't get its start time so we add a CreatedAt field to the API.
+- lib: don't error out if we can't get the app exit code ([#3800](https://github.com/rkt/rkt/pull/3800)). This can happen if the pod dies but we don't have time to register the app exit code.
+- image: set the header instead of adding it ([#3796](https://github.com/rkt/rkt/pull/3796)). The go [http/client](https://golang.org/doc/go1.8#net_http) changes its behavior for redirect and header's copy since the go 1.8:
+- lib/app: check in upper/ if the pod uses overlay ([#3791](https://github.com/rkt/rkt/pull/3791)). Getting creation/start time and status of applications will fail for pods using overlay if stage1 was unmounted (e.g. when rebooting).
+- stage1: handle docker group semantics ([#3792](https://github.com/rkt/rkt/pull/3792)). Docker uses the UID as GID if you only specify the "user".
+- stage1: support hybrid cgroup hierarchy ([#3784](https://github.com/rkt/rkt/pull/3784)). systemd introduced the hybrid cgroup hierarchy in v233, which was breaking the host flavor of rkt.
+- pkg/keystore: ensure correct permissions on path creation ([#3780](https://github.com/rkt/rkt/pull/3780)). Allow writing to `/etc/rkt/trustedkeys` as a user in the rkt group in systems with restrictive umask.
+- networking: ensure the netns directory is mounted ([#3761](https://github.com/rkt/rkt/pull/3761)). Allows using rktnetes and rkt on the same host.
+- stage1: fix systemd version fmt in error message ([#3767](https://github.com/rkt/rkt/pull/3767)). The previous version caused cryptic error messages.
+
+### New features and UX changes
+
+- app/add: Allow to define annotations for app from CLI ([#3814](https://github.com/rkt/rkt/pull/3814)).
+- app/sandbox: Allow to define annotations for sandbox from CLI ([#3816](https://github.com/rkt/rkt/pull/3816)).
+- stage0,rkt: don't require the pod to be running to remove apps ([#3799](https://github.com/rkt/rkt/pull/3799)).
+- stage1: enable host IPC namespace ([#3787](https://github.com/rkt/rkt/pull/3787)). rkt normally creates a new IPC namespace for the pod. In order to stay in the host IPC namespace, a new option `--ipc=` was added.
+- rkt: bash completion code ([#3774](https://github.com/rkt/rkt/pull/3774)). This patch provides an implementation of the command used to generate completion code for the bash shell.
+
+### Other changes
+
+- vendor: bump docker2aci to v0.17.0 ([#3810](https://github.com/rkt/rkt/pull/3810)).
+- vendor: update pborman/uuid to v1.1 ([#3809](https://github.com/rkt/rkt/pull/3809)).
+- vendor: bump appc/spec to v0.8.11 ([#3803](https://github.com/rkt/rkt/pull/3803)).
+- rkt\_seccomp\_test: Fix arm64 stat tests ([#3804](https://github.com/rkt/rkt/pull/3804)).
+- build: sort stage1 manifest files ([#3808](https://github.com/rkt/rkt/pull/3808)). To ease maintenance.
+
+### Build system
+
+- build/stage1: support local systemd source for offline builds ([#3746](https://github.com/rkt/rkt/pull/3746)).
+- RPM/deb package can upgrade even if running pods ([#3766](https://github.com/rkt/rkt/pull/3766)).
+- src flavor: copy the real libnss\_files.so.2 file from the host ([#3764](https://github.com/rkt/rkt/pull/3764)). It was copying a symbolic link instead.
+
 ## 1.28.1
 
 This is a minor bugfix release. It does not contain any changes to the rkt code, but it updates dependencies and runtime versions for bugfixes:

From 6de500a70706403c8c611d80491aea64019141b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 28 Sep 2017 18:27:09 +0200
Subject: [PATCH 1196/1304] version: bump to v1.29.0

---
 Documentation/distributions.md       | 16 ++++++++--------
 Documentation/proposals/oci.md       |  6 +++---
 Documentation/running-fly-stage1.md  |  4 ++--
 Documentation/running-kvm-stage1.md  |  6 +++---
 Documentation/subcommands/prepare.md |  4 ++--
 Documentation/subcommands/version.md |  2 +-
 Documentation/trying-out-rkt.md      |  6 +++---
 configure.ac                         |  2 +-
 scripts/install-rkt.sh               |  2 +-
 tests/empty-image/manifest           |  2 +-
 tests/image/manifest                 |  2 +-
 tests/rkt-monitor/build-stresser.sh  |  2 +-
 tests/rkt_exec_test.go               |  2 +-
 tests/rkt_image_cat_manifest_test.go |  2 +-
 tests/rkt_image_export_test.go       |  2 +-
 tests/rkt_image_render_test.go       |  2 +-
 tests/rkt_os_arch_test.go            |  2 +-
 17 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 457b963c4a..c56d86ade0 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -141,19 +141,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt-1.28.1-1.x86_64.rpm
-wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt-1.28.1-1.x86_64.rpm.asc
-gpg --verify rkt-1.28.1-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.28.1-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt-1.29.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt-1.29.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.29.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.29.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt_1.28.1-1_amd64.deb
-wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt_1.28.1-1_amd64.deb.asc
-gpg --verify rkt_1.28.1-1_amd64.deb.asc
-sudo dpkg -i rkt_1.28.1-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt_1.29.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt_1.29.0-1_amd64.deb.asc
+gpg --verify rkt_1.29.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.29.0-1_amd64.deb
 ```
 
 [cl-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index a540a37f95..0fd66ede2a 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -139,6 +139,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/rkt/rkt/blob/v1.28.1/Documentation/app-container.md
-[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.28.1/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/rkt/rkt/blob/v1.28.1/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/rkt/rkt/blob/v1.29.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.29.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/rkt/rkt/blob/v1.29.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index c05808d435..c0ae334a29 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.28.1+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.29.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.28.1 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.29.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 922961757b..ddfeb93e92 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -9,7 +9,7 @@ The KVM stage1 does not yet implement all of the default stage1's features and s
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
 ```
-sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.28.1 docker://redis
+sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.29.0 docker://redis
 ```
 
 This output is the same you'll get if you run a container-based rkt.
@@ -67,7 +67,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.28.1+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.29.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 
 [build-configure]: build-configure.md
@@ -89,7 +89,7 @@ Additional [Linux kernel's command line parameters](https://www.kernel.org/doc/h
 
 ```
 sudo RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS="systemd.unified_cgroup_hierarchy=true max_loop=12 possible_cpus=1" \
-      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.28.1 \
+      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.29.0 \
       ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index 3b816dd452..b46d2632fc 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.28.1
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.29.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.28.1
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.29.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index e4ae3ac1a5..cbfacaf090 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.28.1
+rkt Version: 1.29.0
 appc Version: 0.8.11
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index aec97d233e..8ae3c65a7f 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/rkt/rkt/releases/download/v1.28.1/rkt-v1.28.1.tar.gz
-tar xzvf rkt-v1.28.1.tar.gz
-cd rkt-v1.28.1
+wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt-v1.29.0.tar.gz
+tar xzvf rkt-v1.29.0.tar.gz
+cd rkt-v1.29.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 6cf393aa3e..761e614d16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.28.1+git], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.29.0], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index 6e934a8f01..f0edf0eb40 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.28.1"
+version="1.29.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index ba501bfbc5..84542b17f2 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.28.1"
+            "value": "1.29.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index a871dfdd2d..808495a70f 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.28.1"
+            "value": "1.29.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 1e60345579..b37bceeabb 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.28.1+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.29.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index aba757137b..36fd7a1194 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -36,7 +36,7 @@ func TestRunOverrideExec(t *testing.T) {
 	noappManifest := schema.ImageManifest{
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
-			{"version", "1.28.1"},
+			{"version", "1.29.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 7d98c51f22..06123d54f7 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -47,7 +47,7 @@ func TestImageCatManifest(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.28.1"},
+			{"version", "1.29.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index 617f01b798..ddf24c1ed4 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -46,7 +46,7 @@ func TestImageExport(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.28.1"},
+			{"version", "1.29.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 7d60310abd..74d00ed90b 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -56,7 +56,7 @@ func TestImageRender(t *testing.T) {
 			{ImageName: "coreos.com/rkt-inspect"},
 		},
 		Labels: types.Labels{
-			{"version", "1.28.1"},
+			{"version", "1.29.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index a98dc330fe..22b80ecbed 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -61,7 +61,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"version", "1.28.1"},
+			{"version", "1.29.0"},
 		},
 	}
 

From 15ec7056d0f967b1102df6f681f4561dec354a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 28 Sep 2017 18:27:09 +0200
Subject: [PATCH 1197/1304] version: bump to v1.29.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 761e614d16..1c4443241e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.29.0], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.29.0+git], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index b37bceeabb..bfc53b9d62 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.29.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.29.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From bfd21c4977a85075f0da9efbe475f5c622924592 Mon Sep 17 00:00:00 2001
From: Brad Ison <bison@coreos.com>
Date: Wed, 4 Oct 2017 10:30:45 -0400
Subject: [PATCH 1198/1304] Remove Jenkins build-badge from README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 209c05b555..32c90a8ad5 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
 [![godoc](https://godoc.org/github.com/rkt/rkt?status.svg)](http://godoc.org/github.com/rkt/rkt)
 [![Build Status (Travis)](https://travis-ci.org/rkt/rkt.svg?branch=master)](https://travis-ci.org/rkt/rkt)
 [![Build Status (SemaphoreCI)](https://semaphoreci.com/api/v1/rkt/rkt/branches/master/badge.svg)](https://semaphoreci.com/rkt/rkt)
-[![Build Status (Jenkins)](https://jenkins-rkt-public.prod.coreos.systems/job/rkt-master-periodic/badge/icon)](https://jenkins-rkt-public.prod.coreos.systems/view/rkt/job/rkt-master-periodic/)
 
 ![rkt Logo](logos/rkt-horizontal-color.png)
 

From 595327e23a5bb2fe3bf1acf6c8f71c8229a2496c Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Wed, 4 Oct 2017 17:33:54 -0700
Subject: [PATCH 1199/1304] tests: Add verbose flag to build-and-run-tests.sh

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 tests/build-and-run-tests.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index e7262b35d6..cbd336883e 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -74,7 +74,7 @@ function checkFlavorValue {
 
 # Parse user provided parameters
 function parseParameters {
-    while getopts "f:s:r:cxujd" option; do
+    while getopts "f:s:r:cxujdv" option; do
         case ${option} in
         f)
             RKT_STAGE1_USR_FROM="${OPTARG}"
@@ -111,6 +111,9 @@ function parseParameters {
         d)
             DIRTYBUILD=true
             ;;
+        v)
+            VERBOSITY="V=3"
+            ;;
         \?)
             set -
             echo "Invalid parameter -${OPTARG}"
@@ -167,14 +170,14 @@ function build {
 
     CORES=$(grep -c ^processor /proc/cpuinfo)
     echo "Running make with ${CORES} threads"
-    make "-j${CORES}"
+    make "-j${CORES}" ${VERBOSITY}
     make manpages bash-completion
 
     if [[ ${PRECLEANUP} == true ]]; then
         rm -rf "${BUILD_DIR}/tmp/usr_from_${RKT_STAGE1_USR_FROM}"
     fi
     if [[ ${JUSTBUILD} != true ]]; then
-        make check
+        make ${VERBOSITY} check
         make "-j${CORES}" clean
     fi
 }
@@ -230,6 +233,7 @@ function usage {
     echo -e "-s\tSystemd version"
     echo -e "-r\tSystemd revision"
     echo -e "-u\tShow this message"
+    echo -e "-v\tRun make with verbose flag"
     echo -e "-x\tUse with '-c' to force cleanup on non-CI systems"
 }
 

From b7107250d8aa4add7a6e988d99747374bcd4a9d4 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal@kinvolk.io>
Date: Mon, 18 Sep 2017 16:57:27 +0200
Subject: [PATCH 1200/1304] iottymux: Store logs for kubelet in the appropriate
 location

This is the change made for rktlet. Kubelet expect the CRI-formatted
logs to be in specific directory and it provides that information with
CRI.

CRI-compatible logs are generated by iottymux. That specific directory
which kubelet is looking at, exists in the host filesystem. In order to
make it available for iottymux, we need to mount it into the stage1
container. That's why this commit introduces the new annotation called
coreos.com/rkt/experiment/kubernetes-log-dir. This annotation is read
by stage1 init and the directory by it is bind mounted to the stage1
nspawn container (the mountpoint inside container is /rkt/kubernetes/log).

Kubelet provides the name of a logfile of a container via CRI. Since the
container concept in Kubernetes refers to an app in rkt, we use the
annotation named coreos.com/rkt/experiment/kubernetes-log-path to pass it
from rktlet. Then stage1 init redirects that value in KUBERNETES_LOG_PATH
environment variable for iottymux.

Then finally, iottymux saves the logs to /rkt/kubernetes/log/$KUBERNETES_LOG_PATH
file, i.e. /rkt/kubernetes/log/0a8f619b-df34-4c57-86e5-84a551452db1/etcd_0.log.

Fixes #3795
---
 stage1/init/common/units.go   | 10 +++++
 stage1/init/init.go           |  5 +++
 stage1/iottymux/iottymux.go   | 17 ++++++--
 tests/rkt_app_sandbox_test.go | 75 +++++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 7303a480e7..9e29e169d2 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -328,6 +328,16 @@ func (uw *UnitWriter) SetupAppIO(p *stage1commontypes.Pod, ra *schema.RuntimeApp
 			if ok {
 				file.WriteString(fmt.Sprintf("STAGE1_LOGMODE=%s\n", logMode))
 			}
+			switch logMode {
+			case "k8s-plain":
+				kubernetesLogPath, ok := ra.Annotations.Get("coreos.com/rkt/experiment/kubernetes-log-path")
+				if !ok {
+					uw.err = fmt.Errorf("kubernetes-log-path annotation needs to be specified when k8s-plain logging mode is used")
+					return nil
+				}
+				file.WriteString(fmt.Sprintf("KUBERNETES_LOG_PATH=%s\n", kubernetesLogPath))
+			}
+
 		} else if needsTTYMux {
 			// tty mode brings in a `ttymux@.service` after-dependency (it needs to create the TTY first)
 			opts = append(opts, unit.NewUnitOption("Service", "TTYPath", filepath.Join("/rkt/iottymux", ra.Name.String(), "stage2-pts")))
diff --git a/stage1/init/init.go b/stage1/init/init.go
index 61ab3a4c4d..9967dc65f4 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -362,6 +362,11 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 			args = append(args, fmt.Sprintf("--register=false"))
 		}
 
+		kubernetesLogDir, ok := p.Manifest.Annotations.Get("coreos.com/rkt/experiment/kubernetes-log-dir")
+		if ok {
+			args = append(args, fmt.Sprintf("--bind=%s:/rkt/kubernetes/log", kubernetesLogDir))
+		}
+
 		// use only dynamic libraries provided in the image
 		// from systemd v231 there's a new internal libsystemd-shared-v231.so
 		// which is present in /usr/lib/systemd
diff --git a/stage1/iottymux/iottymux.go b/stage1/iottymux/iottymux.go
index 8ba2e08170..5028c50674 100644
--- a/stage1/iottymux/iottymux.go
+++ b/stage1/iottymux/iottymux.go
@@ -410,9 +410,20 @@ func actionIOMux(statusFile string) error {
 	switch logMode {
 	case "k8s-plain":
 		var err error
-		// TODO(lucab): check what should be the target path with Euan
-		logTarget := filepath.Join(pathPrefix, appName, "logfile")
-		logFile, err = os.OpenFile(logTarget, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.ModePerm)
+
+		// TODO(nhlfr): logPath coming from CRI/kubelet should be always a file name,
+		// but we may want to ensure that here and check that value explicitly.
+		logPath := os.Getenv("KUBERNETES_LOG_PATH")
+		logFullPath := filepath.Clean(filepath.Join("/rkt/kubernetes/log", logPath))
+
+		match, err := filepath.Match("/rkt/kubernetes/log/*", logFullPath)
+		if err != nil {
+			return fmt.Errorf("couldn't analyze the full log path %s: %s", logFullPath, err)
+		} else if !match {
+			return fmt.Errorf("log path is not inside /rkt/kubernetes/log, refusing path traversal")
+		}
+
+		logFile, err = os.OpenFile(logFullPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.ModePerm)
 		if err != nil {
 			return err
 		}
diff --git a/tests/rkt_app_sandbox_test.go b/tests/rkt_app_sandbox_test.go
index f30cb62bf2..b511737eb7 100644
--- a/tests/rkt_app_sandbox_test.go
+++ b/tests/rkt_app_sandbox_test.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"reflect"
 	"strconv"
@@ -32,6 +33,13 @@ import (
 	"github.com/rkt/rkt/tests/testutils"
 )
 
+const (
+	// Number of retries to read CRI log file.
+	criLogsReadRetries = 5
+	// Delay between each retry attempt in reading CRI log file.
+	criLogsReadRetryDelay = 5 * time.Second
+)
+
 // TestAppSandboxOneApp is a basic test for `rkt app` sandbox.
 // It starts the sandbox, adds one app, starts it, and removes it.
 func TestAppSandboxAddStartRemove(t *testing.T) {
@@ -547,6 +555,73 @@ func TestAppSandboxAppAnnotations(t *testing.T) {
 	})
 }
 
+func TestAppSandboxCRILogs(t *testing.T) {
+	if TestedFlavor.Kvm || TestedFlavor.Fly {
+		t.Skip("CRI logs are not supported in kvm and fly flavors yet")
+	}
+
+	for _, tt := range []struct {
+		kubernetesLogDir  string
+		kubernetesLogPath string
+	}{
+		{
+			kubernetesLogDir:  "/tmp/rkt-test-logs",
+			kubernetesLogPath: "hello_0.log",
+		},
+	} {
+		args := []string{
+			"--annotation=coreos.com/rkt/experiment/logmode=k8s-plain",
+			fmt.Sprintf("--annotation=coreos.com/rkt/experiment/kubernetes-log-dir=%s", tt.kubernetesLogDir),
+		}
+
+		if err := os.MkdirAll(tt.kubernetesLogDir, 0777); err != nil {
+			t.Fatalf("Couldn't create directory for CRI logs: %v", err)
+		}
+		defer os.RemoveAll(tt.kubernetesLogDir)
+
+		testSandboxWithArgs(t, args, func(ctx *testutils.RktRunCtx, child *gexpect.ExpectSubprocess, podUUID string) {
+			imageName := "coreos.com/rkt-inspect/hello"
+			msg := "HelloFromAppInSandbox"
+
+			aciHello := patchTestACI("rkt-inspect-hello.aci", "--name="+imageName, "--exec=/inspect --print-msg="+msg)
+			defer os.Remove(aciHello)
+
+			combinedOutput(t, ctx.ExecCmd("fetch", "--insecure-options=image", aciHello))
+
+			combinedOutput(t, ctx.ExecCmd(
+				"app", "add", "--debug", podUUID,
+				imageName, "--name=hello", "--stdin=stream",
+				"--stdout=stream", "--stderr=stream",
+				fmt.Sprintf("--annotation=coreos.com/rkt/experiment/kubernetes-log-path=%s", tt.kubernetesLogPath),
+			))
+			combinedOutput(t, ctx.ExecCmd("app", "start", "--debug", podUUID, "--app=hello"))
+
+			// It takes some time to have iottymux unit running inside the stage1 container,
+			// so we are looking for CRI logs with a reasonable amount of retries.
+			var content []byte
+			var err error
+			for i := 0; i < criLogsReadRetries; i++ {
+				kubernetesLogFullPath := path.Join(tt.kubernetesLogDir, tt.kubernetesLogPath)
+				content, err = ioutil.ReadFile(kubernetesLogFullPath)
+				if err == nil {
+					sContent := string(content)
+					if strings.Contains(sContent, "stdout HelloFromAppInSandbox") {
+						break
+					}
+					err = fmt.Errorf("Expected CRI logs to contain 'stdout HelloFromAppInSandbox', instead got: %s", sContent)
+				} else {
+					err = fmt.Errorf("Couldn't open file with CRI logs: %v", err)
+				}
+				time.Sleep(criLogsReadRetryDelay)
+			}
+			if err != nil {
+				t.Fatal(err)
+			}
+
+		})
+	}
+}
+
 func testSandbox(t *testing.T, testFunc func(*testutils.RktRunCtx, *gexpect.ExpectSubprocess, string)) {
 	testSandboxWithArgs(t, nil, testFunc)
 }

From b41982fbc39a087bd69047f0ab4f995f3b895322 Mon Sep 17 00:00:00 2001
From: Davor Kapsa <davor.kapsa@gmail.com>
Date: Sun, 8 Oct 2017 19:40:22 +0200
Subject: [PATCH 1201/1304] travis: update go versions

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c8da4dc5db..434f687922 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,10 @@ sudo: required
 dist: trusty
 
 go:
-  - 1.6.4
-  - 1.7.5
+  - 1.6.x
+  - 1.7.x
+  - 1.8.x
+  - 1.9.x
 
 env:
   - TARGET=amd64 GIMME_ARCH=amd64

From 53a85cf291fb6491099ca2994a48b96ca1282a2c Mon Sep 17 00:00:00 2001
From: Dongsu Park <dongsu@kinvolk.io>
Date: Mon, 9 Oct 2017 17:09:01 +0200
Subject: [PATCH 1202/1304] rkt: skip parsing in case of an empty string

When any string in []args is empty, "", then the `al.Count()` gets
still incremented, even if there's nothing to parse. As a result, `rkt
app add` fails with an error message like `must give only one app`,
even when only one app name is given.

For example, rktlet runs the following command:

```
rkt app --insecure-options=image,ondisk add 58992c0a-540d-40a4-bf39-4bb193d74f94 \
docker://busybox:1.26 --name=2-seccomp-container-docker-default-d25eafce-ad02-11e7-a670-2eecc98c9398d25eaff2-ad02-11e7-a670-2eecc98c9398 \
--user-annotation=k8s.io/reserved/image-name=busybox:1.26  --exec=top
```

Then the last part, "  --exec=top" is parsed a list of 2 separate
strings: " " and "--exec=top", That's why `al.Count()` becomes 2.

See also https://github.com/kubernetes-incubator/rktlet/pull/146#issuecomment-334750394
---
 rkt/cli_apps.go      | 5 ++++-
 rkt/cli_apps_test.go | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/rkt/cli_apps.go b/rkt/cli_apps.go
index 5c04d1f766..ba86d18d93 100644
--- a/rkt/cli_apps.go
+++ b/rkt/cli_apps.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The rkt Authors
+// Copyright 2015-2017 The rkt Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -49,6 +49,9 @@ func parseApps(al *apps.Apps, args []string, flags *pflag.FlagSet, allowAppArgs
 	inAppArgs := false
 	for i := 0; i < len(args); i++ {
 		a := args[i]
+		if len(a) == 0 {
+			continue
+		}
 		if inAppArgs {
 			switch a {
 			case "---":
diff --git a/rkt/cli_apps_test.go b/rkt/cli_apps_test.go
index b82545077e..db98efefd3 100644
--- a/rkt/cli_apps_test.go
+++ b/rkt/cli_apps_test.go
@@ -62,6 +62,15 @@ func TestParseAppArgs(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"example.com/foo  example.com/bar",
+			[]string{"example.com/foo", "example.com/bar"},
+			[][]string{
+				nil,
+				nil,
+			},
+			false,
+		},
 	}
 
 	for i, tt := range tests {

From 4fca2901e004e9edcb1120a89e20c463d90a5dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 12 Oct 2017 17:18:40 +0200
Subject: [PATCH 1203/1304] stage1: mount kubernetesLogDir for src and host
 flavors too

So the annotation coreos.com/rkt/experiment/kubernetes-log-dir works
with the source and host flavors.
---
 stage1/init/init.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/stage1/init/init.go b/stage1/init/init.go
index 9967dc65f4..57ef6ccb22 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -394,6 +394,11 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 			args = append(args, fmt.Sprintf("--register=false"))
 		}
 
+		kubernetesLogDir, ok := p.Manifest.Annotations.Get("coreos.com/rkt/experiment/kubernetes-log-dir")
+		if ok {
+			args = append(args, fmt.Sprintf("--bind=%s:/rkt/kubernetes/log", kubernetesLogDir))
+		}
+
 		// use only dynamic libraries provided in the image
 		// from systemd v231 there's a new internal libsystemd-shared-v231.so
 		// which is present in /usr/lib/systemd
@@ -444,6 +449,11 @@ func getArgsEnv(p *stage1commontypes.Pod, flavor string, canMachinedRegister boo
 			args = append(args, fmt.Sprintf("-L%s", context))
 		}
 
+		kubernetesLogDir, ok := p.Manifest.Annotations.Get("coreos.com/rkt/experiment/kubernetes-log-dir")
+		if ok {
+			args = append(args, fmt.Sprintf("--bind=%s:/rkt/kubernetes/log", kubernetesLogDir))
+		}
+
 	default:
 		return nil, nil, fmt.Errorf("unrecognized stage1 flavor: %q", flavor)
 	}

From c29c384a6b956543f94ac8471dd88f3f5756066e Mon Sep 17 00:00:00 2001
From: Akhil Thayyil <loginakhil@gmail.com>
Date: Sun, 15 Oct 2017 17:04:16 +0530
Subject: [PATCH 1204/1304] scripts: adding missing dependecies to debian
 dependency installer

Fixes #3828
---
 scripts/install-deps-debian-sid.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install-deps-debian-sid.sh b/scripts/install-deps-debian-sid.sh
index c33dacbe9a..43adf6ef41 100755
--- a/scripts/install-deps-debian-sid.sh
+++ b/scripts/install-deps-debian-sid.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev gpg make automake wget git golang-go coreutils cpio squashfs-tools realpath autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libtspi-dev libsystemd-dev"
+DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev gpg gpg-agent make automake wget git golang-go coreutils cpio squashfs-tools autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libtspi-dev libsystemd-dev python pkg-config zlib1g-dev libglib2.0-dev libpixman-1-dev libcap-dev"
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update

From c7ab07780e1fd21ab268f16e3d30288e448e5d7f Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Mon, 16 Oct 2017 16:16:20 -0700
Subject: [PATCH 1205/1304] tests: Use semaphore install-package

When running on semaphore use thier install-package to
take advantage of package caching.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 tests/install-deps.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/install-deps.sh b/tests/install-deps.sh
index d15a3c967a..5e5b7525dc 100755
--- a/tests/install-deps.sh
+++ b/tests/install-deps.sh
@@ -20,22 +20,17 @@ if [ "${CI-}" == true ] ; then
 		# Semaphore installs more dependencies on their
 		# platform, they should be removed from here to save time.
 
-		# If there is some dependency to install then
-		# uncomment the following line and add "sudo apt-get
-		# install -y <dep>" after it.
-
-		sudo apt-get update -qq || true
-		sudo apt-get install -y libacl1-dev bc libsystemd-journal-dev
+		install-package libacl1-dev bc libsystemd-journal-dev
 
 		# libmount: https://github.com/systemd/systemd/pull/986#issuecomment-138451264
 		sudo add-apt-repository --yes ppa:pitti/systemd-semaphore
 		sudo apt-get update -qq || true
-		sudo apt-get install -y libmount-dev libmount1
+		install-package libmount-dev libmount1
 
 		# building systemd v229 crashes with the gcc 4.8, update to gcc 5
 		sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-		sudo apt-get update -qq
-		sudo apt-get install gcc-5 gcc-5-base libgcc-5-dev g++-5 libstdc++-5-dev libseccomp-dev -y -qq
+		sudo apt-get update -qq || true
+		install-package gcc-5 gcc-5-base libgcc-5-dev g++-5 libstdc++-5-dev libseccomp-dev
 		sudo update-alternatives --remove-all gcc
 		sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 20
 		sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 20

From ce936a91678b77a2b91440e0198c895519ca8b24 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 23 Oct 2017 08:49:09 +0000
Subject: [PATCH 1206/1304] stage0/run: relax '--hosts-entry' parser

This tweaks the '--hosts-entry' CLI flag parser to accept multiple
time the special value "host" when there are no other conflicting
settings.
---
 rkt/run.go                  | 14 +++++++-------
 tests/rkt_etc_hosts_test.go |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/rkt/run.go b/rkt/run.go
index b852e13a6c..ab41214756 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"net"
 	"os"
@@ -643,13 +644,8 @@ func parseDNSFlags(flagHostsEntries, flagDNS, flagDNSSearch, flagDNSOpt []string
 	// Parse out --hosts-entries, also looking for the magic value "host"
 	for _, entry := range flagHostsEntries {
 		if entry == "host" {
-			if len(flagHostsEntries) == 1 {
-				DNSConfMode.Hosts = "host"
-			} else {
-				return DNSConfMode, DNSConfig, &HostsEntries,
-					fmt.Errorf("cannot pass --hosts-entry=host with multiple hosts-entries")
-			}
-			break
+			DNSConfMode.Hosts = "host"
+			continue
 		}
 		for _, entry := range strings.Split(entry, ",") {
 			vals := strings.SplitN(entry, "=", 2)
@@ -677,6 +673,10 @@ func parseDNSFlags(flagHostsEntries, flagDNS, flagDNSSearch, flagDNSOpt []string
 	}
 
 	if len(HostsEntries) > 0 {
+		if DNSConfMode.Hosts == "host" {
+			return DNSConfMode, DNSConfig, &HostsEntries,
+				errors.New("cannot pass --hosts-entry=host with multiple hosts-entries")
+		}
 		DNSConfMode.Hosts = "stage0"
 	}
 
diff --git a/tests/rkt_etc_hosts_test.go b/tests/rkt_etc_hosts_test.go
index 3749168340..b3967cf6e5 100644
--- a/tests/rkt_etc_hosts_test.go
+++ b/tests/rkt_etc_hosts_test.go
@@ -80,6 +80,11 @@ func TestEtcHosts(t *testing.T) {
 			"--exec=/inspect -- -file-name=/etc/hosts -hash-file",
 			sum,
 		},
+		{ // Test that multiple '--hosts-entry=host' entries are fine
+			"--hosts-entry=host --hosts-entry=host",
+			"--exec=/inspect -- -file-name=/etc/hosts -hash-file",
+			sum,
+		},
 		{ // test that we create our own
 			"--hosts-entry=128.66.0.99=host1",
 			"--exec=/inspect -- -file-name=/etc/hosts -read-file",

From 735c3bf2d24536ef4ed6fb345702e793e781c479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 24 Oct 2017 13:44:23 +0200
Subject: [PATCH 1207/1304] vendor: bump docker2aci to v0.17.1

It fixes an image pulling bug for some images in GCR.
---
 glide.lock                                             | 6 +++---
 glide.yaml                                             | 2 +-
 vendor/github.com/appc/docker2aci/lib/common/common.go | 2 ++
 vendor/github.com/appc/docker2aci/lib/version.go       | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/glide.lock b/glide.lock
index 4e2667fc62..68f1eb4434 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: 57f42aad7f59db30f4bea9a422c8f904dc474a44830d5f26f2c2617d71d85bb3
-updated: 2017-09-22T16:07:34.061851427+02:00
+hash: f763c3172b6e3e37f77970cbd8601d9101221fd4a25815961f98f47148f20615
+updated: 2017-10-24T13:44:07.972543348+02:00
 imports:
 - name: github.com/appc/docker2aci
-  version: 76a5ef32f8b027b68027374252f90bbacf4f64a3
+  version: b62d1b9cbba9aa4eddc65dad290bff4aee211feb
   subpackages:
   - lib
   - lib/common
diff --git a/glide.yaml b/glide.yaml
index d5b0425eda..55d78759f9 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.17.0
+  version: v0.17.1
   subpackages:
   - lib
   - lib/common
diff --git a/vendor/github.com/appc/docker2aci/lib/common/common.go b/vendor/github.com/appc/docker2aci/lib/common/common.go
index e20f5ea354..a7d567e868 100644
--- a/vendor/github.com/appc/docker2aci/lib/common/common.go
+++ b/vendor/github.com/appc/docker2aci/lib/common/common.go
@@ -159,6 +159,7 @@ func (m MediaTypeSet) ManifestMediaTypes() []string {
 	if len(m) == 0 {
 		return []string{
 			MediaTypeDockerV21Manifest,
+			MediaTypeDockerV21SignedManifest,
 			MediaTypeDockerV22Manifest,
 			MediaTypeOCIV1Manifest,
 		}
@@ -168,6 +169,7 @@ func (m MediaTypeSet) ManifestMediaTypes() []string {
 		switch option {
 		case MediaTypeOptionDockerV21:
 			ret = append(ret, MediaTypeDockerV21Manifest)
+			ret = append(ret, MediaTypeDockerV21SignedManifest)
 		case MediaTypeOptionDockerV22:
 			ret = append(ret, MediaTypeDockerV22Manifest)
 		case MediaTypeOptionOCIV1Pre:
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index 3f37f71c3e..905fa7471e 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.17.0"
+var Version = "0.17.1"
 var AppcVersion = schema.AppContainerVersion

From 6cc0f8160309d77a281060d3c848b32196548f68 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 26 Oct 2017 15:37:12 +0200
Subject: [PATCH 1208/1304] MAINTAINERS: remove Stefan Junker

I have no more time to maintain rkt for the time being.
Thanks for having had me!
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b671a51611..e8ff38fbed 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8,5 +8,4 @@ Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle) pkg: *
 Krzesimir Nowak <krzesimir@kinvolk.io> (@krnowak) pkg: *
 Luca Bruno <luca.bruno@coreos.com> (@lucab) pkg: *
 Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak) pkg: *
-Stefan Junker <stefan.junker@coreos.com> (@steveeJ) pkg: *
 Yifan Gu <yifan.gu@coreos.com> (@yifan-gu) pkg: *

From 2ee9247ac1989132304e5343cb22d118c0242d47 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 26 Oct 2017 13:05:26 -0700
Subject: [PATCH 1209/1304] Refresh vendor

Run glide-update.sh to refresh the vendor directory.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 glide.lock                                    |    4 +-
 vendor/github.com/pborman/uuid/marshal.go     |   83 +
 vendor/golang.org/x/text/gen.go               |  183 +-
 .../golang.org/x/text/transform/transform.go  |   52 +-
 .../x/text/unicode/norm/composition.go        |   18 +-
 .../x/text/unicode/norm/forminfo.go           |   49 +-
 .../golang.org/x/text/unicode/norm/input.go   |    8 +-
 vendor/golang.org/x/text/unicode/norm/iter.go |   31 +-
 .../x/text/unicode/norm/maketables.go         |   12 +-
 .../x/text/unicode/norm/normalize.go          |   55 +-
 .../x/text/unicode/norm/readwriter.go         |    1 -
 .../golang.org/x/text/unicode/norm/tables.go  | 3650 +++++++++--------
 .../x/text/unicode/norm/transform.go          |    2 +-
 vendor/golang.org/x/text/width/kind_string.go |    2 +-
 vendor/golang.org/x/text/width/tables.go      |  320 +-
 vendor/golang.org/x/text/width/transform.go   |   77 +
 vendor/golang.org/x/text/width/trieval.go     |    2 +-
 vendor/golang.org/x/text/width/width.go       |    9 +-
 18 files changed, 2501 insertions(+), 2057 deletions(-)
 create mode 100644 vendor/github.com/pborman/uuid/marshal.go

diff --git a/glide.lock b/glide.lock
index 68f1eb4434..4a57339910 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
 hash: f763c3172b6e3e37f77970cbd8601d9101221fd4a25815961f98f47148f20615
-updated: 2017-10-24T13:44:07.972543348+02:00
+updated: 2017-10-26T12:55:14.287892242-07:00
 imports:
 - name: github.com/appc/docker2aci
   version: b62d1b9cbba9aa4eddc65dad290bff4aee211feb
@@ -279,7 +279,7 @@ imports:
   subpackages:
   - unix
 - name: golang.org/x/text
-  version: 2910a502d2bf9e43193af9d68ca516529614eed3
+  version: 6eab0e8f74e86c598ec3b6fad4888e0c11482d48
   subpackages:
   - transform
   - unicode/norm
diff --git a/vendor/github.com/pborman/uuid/marshal.go b/vendor/github.com/pborman/uuid/marshal.go
new file mode 100644
index 0000000000..6621dd54be
--- /dev/null
+++ b/vendor/github.com/pborman/uuid/marshal.go
@@ -0,0 +1,83 @@
+// Copyright 2016 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"errors"
+	"fmt"
+)
+
+// MarshalText implements encoding.TextMarshaler.
+func (u UUID) MarshalText() ([]byte, error) {
+	if len(u) != 16 {
+		return nil, nil
+	}
+	var js [36]byte
+	encodeHex(js[:], u)
+	return js[:], nil
+}
+
+// UnmarshalText implements encoding.TextUnmarshaler.
+func (u *UUID) UnmarshalText(data []byte) error {
+	if len(data) == 0 {
+		return nil
+	}
+	id := Parse(string(data))
+	if id == nil {
+		return errors.New("invalid UUID")
+	}
+	*u = id
+	return nil
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler.
+func (u UUID) MarshalBinary() ([]byte, error) {
+	return u[:], nil
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler.
+func (u *UUID) UnmarshalBinary(data []byte) error {
+	if len(data) == 0 {
+		return nil
+	}
+	if len(data) != 16 {
+		return fmt.Errorf("invalid UUID (got %d bytes)", len(data))
+	}
+	var id [16]byte
+	copy(id[:], data)
+	*u = id[:]
+	return nil
+}
+
+// MarshalText implements encoding.TextMarshaler.
+func (u Array) MarshalText() ([]byte, error) {
+	var js [36]byte
+	encodeHex(js[:], u[:])
+	return js[:], nil
+}
+
+// UnmarshalText implements encoding.TextUnmarshaler.
+func (u *Array) UnmarshalText(data []byte) error {
+	id := Parse(string(data))
+	if id == nil {
+		return errors.New("invalid UUID")
+	}
+	*u = id.Array()
+	return nil
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler.
+func (u Array) MarshalBinary() ([]byte, error) {
+	return u[:], nil
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler.
+func (u *Array) UnmarshalBinary(data []byte) error {
+	if len(data) != 16 {
+		return fmt.Errorf("invalid UUID (got %d bytes)", len(data))
+	}
+	copy(u[:], data)
+	return nil
+}
diff --git a/vendor/golang.org/x/text/gen.go b/vendor/golang.org/x/text/gen.go
index 4ed42b814e..4257a18399 100644
--- a/vendor/golang.org/x/text/gen.go
+++ b/vendor/golang.org/x/text/gen.go
@@ -12,20 +12,28 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
+	"go/build"
+	"go/format"
+	"io/ioutil"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"strings"
 	"sync"
 	"unicode"
 
+	"golang.org/x/text/collate"
 	"golang.org/x/text/internal/gen"
+	"golang.org/x/text/language"
 )
 
 var (
 	verbose     = flag.Bool("v", false, "verbose output")
 	force       = flag.Bool("force", false, "ignore failing dependencies")
+	doCore      = flag.Bool("core", false, "force an update to core")
 	excludeList = flag.String("exclude", "",
 		"comma-separated list of packages to exclude")
 
@@ -61,37 +69,74 @@ func main() {
 	// variable. This will prevent duplicate downloads and also will enable long
 	// tests, which really need to be run after each generated package.
 
+	updateCore := *doCore
 	if gen.UnicodeVersion() != unicode.Version {
 		fmt.Printf("Requested Unicode version %s; core unicode version is %s.\n",
 			gen.UnicodeVersion(),
 			unicode.Version)
-		// TODO: use collate to compare. Simple comparison will work, though,
-		// until Unicode reaches version 10. To avoid circular dependencies, we
-		// could use the NumericWeighter without using package collate using a
-		// trivial Weighter implementation.
-		if gen.UnicodeVersion() < unicode.Version && !*force {
+		c := collate.New(language.Und, collate.Numeric)
+		if c.CompareString(gen.UnicodeVersion(), unicode.Version) < 0 && !*force {
 			os.Exit(2)
 		}
+		updateCore = true
+		goroot := os.Getenv("GOROOT")
+		appendToFile(
+			filepath.Join(goroot, "api", "except.txt"),
+			fmt.Sprintf("pkg unicode, const Version = %q\n", unicode.Version),
+		)
+		const lines = `pkg unicode, const Version = %q
+// TODO: add a new line of the following form for each new script and property.
+pkg unicode, var <new script or property> *RangeTable
+`
+		appendToFile(
+			filepath.Join(goroot, "api", "next.txt"),
+			fmt.Sprintf(lines, gen.UnicodeVersion()),
+		)
 	}
+
+	var unicode = &dependency{}
+	if updateCore {
+		fmt.Printf("Updating core to version %s...\n", gen.UnicodeVersion())
+		unicode = generate("unicode")
+
+		// Test some users of the unicode packages, especially the ones that
+		// keep a mirrored table. These may need to be corrected by hand.
+		generate("regexp", unicode)
+		generate("strconv", unicode) // mimics Unicode table
+		generate("strings", unicode)
+		generate("testing", unicode) // mimics Unicode table
+	}
+
 	var (
-		cldr       = generate("unicode/cldr")
-		language   = generate("language", cldr)
-		internal   = generate("internal", language)
-		norm       = generate("unicode/norm")
-		rangetable = generate("unicode/rangetable")
-		cases      = generate("cases", norm, language, rangetable)
-		width      = generate("width")
-		bidi       = generate("unicode/bidi", norm, rangetable)
-		_          = generate("secure/precis", norm, rangetable, cases, width, bidi)
-		_          = generate("encoding/htmlindex", language)
-		_          = generate("currency", cldr, language, internal)
-		_          = generate("internal/number", cldr, language, internal)
-		_          = generate("language/display", cldr, language)
-		_          = generate("collate", norm, cldr, language, rangetable)
-		_          = generate("search", norm, cldr, language, rangetable)
+		cldr       = generate("./unicode/cldr", unicode)
+		language   = generate("./language", cldr)
+		internal   = generate("./internal", unicode, language)
+		norm       = generate("./unicode/norm", unicode)
+		rangetable = generate("./unicode/rangetable", unicode)
+		cases      = generate("./cases", unicode, norm, language, rangetable)
+		width      = generate("./width", unicode)
+		bidi       = generate("./unicode/bidi", unicode, norm, rangetable)
+		mib        = generate("./encoding/internal/identifier", unicode)
+		_          = generate("./encoding/htmlindex", unicode, language, mib)
+		_          = generate("./encoding/ianaindex", unicode, language, mib)
+		_          = generate("./secure/precis", unicode, norm, rangetable, cases, width, bidi)
+		_          = generate("./currency", unicode, cldr, language, internal)
+		_          = generate("./internal/number", unicode, cldr, language, internal)
+		_          = generate("./feature/plural", unicode, cldr, language, internal)
+		_          = generate("./internal/export/idna", unicode, bidi, norm)
+		_          = generate("./language/display", unicode, cldr, language, internal)
+		_          = generate("./collate", unicode, norm, cldr, language, rangetable)
+		_          = generate("./search", unicode, norm, cldr, language, rangetable)
 	)
 	all.Wait()
 
+	// Copy exported packages to the destination golang.org repo.
+	copyExported("golang.org/x/net/idna")
+
+	if updateCore {
+		copyVendored()
+	}
+
 	if hasErrors {
 		fmt.Println("FAIL")
 		os.Exit(1)
@@ -99,6 +144,20 @@ func main() {
 	vprintf("SUCCESS\n")
 }
 
+func appendToFile(file, text string) {
+	fmt.Println("Augmenting", file)
+	w, err := os.OpenFile(file, os.O_APPEND|os.O_WRONLY, 0600)
+	if err != nil {
+		fmt.Println("Failed to open file:", err)
+		os.Exit(1)
+	}
+	defer w.Close()
+	if _, err := w.WriteString(text); err != nil {
+		fmt.Println("Failed to write to file:", err)
+		os.Exit(1)
+	}
+}
+
 var (
 	all       sync.WaitGroup
 	hasErrors bool
@@ -133,7 +192,7 @@ func generate(pkg string, deps ...*dependency) *dependency {
 		if *verbose {
 			args = append(args, "-v")
 		}
-		args = append(args, "./"+pkg)
+		args = append(args, pkg)
 		cmd := exec.Command(filepath.Join(runtime.GOROOT(), "bin", "go"), args...)
 		w := &bytes.Buffer{}
 		cmd.Stderr = w
@@ -163,6 +222,88 @@ func generate(pkg string, deps ...*dependency) *dependency {
 	return &wg
 }
 
+// copyExported copies a package in x/text/internal/export to the
+// destination repository.
+func copyExported(p string) {
+	copyPackage(
+		filepath.Join("internal", "export", path.Base(p)),
+		filepath.Join("..", filepath.FromSlash(p[len("golang.org/x"):])),
+		"golang.org/x/text/internal/export/"+path.Base(p),
+		p)
+}
+
+// copyVendored copies packages used by Go core into the vendored directory.
+func copyVendored() {
+	root := filepath.Join(build.Default.GOROOT, filepath.FromSlash("src/vendor/golang_org/x"))
+
+	err := filepath.Walk(root, func(dir string, info os.FileInfo, err error) error {
+		if err != nil || !info.IsDir() || root == dir {
+			return err
+		}
+		src := dir[len(root)+1:]
+		const slash = string(filepath.Separator)
+		if c := strings.Split(src, slash); c[0] == "text" {
+			// Copy a text repo package from its normal location.
+			src = strings.Join(c[1:], slash)
+		} else {
+			// Copy the vendored package if it exists in the export directory.
+			src = filepath.Join("internal", "export", filepath.Base(src))
+		}
+		copyPackage(src, dir, "golang.org", "golang_org")
+		return nil
+	})
+	if err != nil {
+		fmt.Printf("Seeding directory %s has failed %v:", root, err)
+		os.Exit(1)
+	}
+}
+
+// goGenRE is used to remove go:generate lines.
+var goGenRE = regexp.MustCompile("//go:generate[^\n]*\n")
+
+// copyPackage copies relevant files from a directory in x/text to the
+// destination package directory. The destination package is assumed to have
+// the same name. For each copied file go:generate lines are removed and
+// and package comments are rewritten to the new path.
+func copyPackage(dirSrc, dirDst, search, replace string) {
+	err := filepath.Walk(dirSrc, func(file string, info os.FileInfo, err error) error {
+		base := filepath.Base(file)
+		if err != nil || info.IsDir() ||
+			!strings.HasSuffix(base, ".go") ||
+			strings.HasSuffix(base, "_test.go") ||
+			// Don't process subdirectories.
+			filepath.Dir(file) != dirSrc {
+			return nil
+		}
+		b, err := ioutil.ReadFile(file)
+		if err != nil || bytes.Contains(b, []byte("\n// +build ignore")) {
+			return err
+		}
+		// Fix paths.
+		b = bytes.Replace(b, []byte(search), []byte(replace), -1)
+		// Remove go:generate lines.
+		b = goGenRE.ReplaceAllLiteral(b, nil)
+		comment := "// Code generated by running \"go generate\" in golang.org/x/text. DO NOT EDIT.\n\n"
+		if *doCore {
+			comment = "// Code generated by running \"go run gen.go -core\" in golang.org/x/text. DO NOT EDIT.\n\n"
+		}
+		if !bytes.HasPrefix(b, []byte(comment)) {
+			b = append([]byte(comment), b...)
+		}
+		if b, err = format.Source(b); err != nil {
+			fmt.Println("Failed to format file:", err)
+			os.Exit(1)
+		}
+		file = filepath.Join(dirDst, base)
+		vprintf("=== COPY %s\n", file)
+		return ioutil.WriteFile(file, b, 0666)
+	})
+	if err != nil {
+		fmt.Println("Copying exported files failed:", err)
+		os.Exit(1)
+	}
+}
+
 func contains(a []string, s string) bool {
 	for _, e := range a {
 		if s == e {
diff --git a/vendor/golang.org/x/text/transform/transform.go b/vendor/golang.org/x/text/transform/transform.go
index 0c2f730ea0..fe47b9b35f 100644
--- a/vendor/golang.org/x/text/transform/transform.go
+++ b/vendor/golang.org/x/text/transform/transform.go
@@ -24,6 +24,10 @@ var (
 	// complete the transformation.
 	ErrShortSrc = errors.New("transform: short source buffer")
 
+	// ErrEndOfSpan means that the input and output (the transformed input)
+	// are not identical.
+	ErrEndOfSpan = errors.New("transform: input and output are not identical")
+
 	// errInconsistentByteCount means that Transform returned success (nil
 	// error) but also returned nSrc inconsistent with the src argument.
 	errInconsistentByteCount = errors.New("transform: inconsistent byte count returned")
@@ -60,6 +64,41 @@ type Transformer interface {
 	Reset()
 }
 
+// SpanningTransformer extends the Transformer interface with a Span method
+// that determines how much of the input already conforms to the Transformer.
+type SpanningTransformer interface {
+	Transformer
+
+	// Span returns a position in src such that transforming src[:n] results in
+	// identical output src[:n] for these bytes. It does not necessarily return
+	// the largest such n. The atEOF argument tells whether src represents the
+	// last bytes of the input.
+	//
+	// Callers should always account for the n bytes consumed before
+	// considering the error err.
+	//
+	// A nil error means that all input bytes are known to be identical to the
+	// output produced by the Transformer. A nil error can be be returned
+	// regardless of whether atEOF is true. If err is nil, then then n must
+	// equal len(src); the converse is not necessarily true.
+	//
+	// ErrEndOfSpan means that the Transformer output may differ from the
+	// input after n bytes. Note that n may be len(src), meaning that the output
+	// would contain additional bytes after otherwise identical output.
+	// ErrShortSrc means that src had insufficient data to determine whether the
+	// remaining bytes would change. Other than the error conditions listed
+	// here, implementations are free to report other errors that arise.
+	//
+	// Calling Span can modify the Transformer state as a side effect. In
+	// effect, it does the transformation just as calling Transform would, only
+	// without copying to a destination buffer and only up to a point it can
+	// determine the input and output bytes are the same. This is obviously more
+	// limited than calling Transform, but can be more efficient in terms of
+	// copying and allocating buffers. Calls to Span and Transform may be
+	// interleaved.
+	Span(src []byte, atEOF bool) (n int, err error)
+}
+
 // NopResetter can be embedded by implementations of Transformer to add a nop
 // Reset method.
 type NopResetter struct{}
@@ -278,6 +317,10 @@ func (nop) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	return n, n, err
 }
 
+func (nop) Span(src []byte, atEOF bool) (n int, err error) {
+	return len(src), nil
+}
+
 type discard struct{ NopResetter }
 
 func (discard) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
@@ -289,8 +332,8 @@ var (
 	// by consuming all bytes and writing nothing.
 	Discard Transformer = discard{}
 
-	// Nop is a Transformer that copies src to dst.
-	Nop Transformer = nop{}
+	// Nop is a SpanningTransformer that copies src to dst.
+	Nop SpanningTransformer = nop{}
 )
 
 // chain is a sequence of links. A chain with N Transformers has N+1 links and
@@ -358,6 +401,8 @@ func (c *chain) Reset() {
 	}
 }
 
+// TODO: make chain use Span (is going to be fun to implement!)
+
 // Transform applies the transformers of c in sequence.
 func (c *chain) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	// Set up src and dst in the chain.
@@ -448,8 +493,7 @@ func (c *chain) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err erro
 	return dstL.n, srcL.p, err
 }
 
-// RemoveFunc returns a Transformer that removes from the input all runes r for
-// which f(r) is true. Illegal bytes in the input are replaced by RuneError.
+// Deprecated: use runes.Remove instead.
 func RemoveFunc(f func(r rune) bool) Transformer {
 	return removeF(f)
 }
diff --git a/vendor/golang.org/x/text/unicode/norm/composition.go b/vendor/golang.org/x/text/unicode/norm/composition.go
index d17b278adc..bab4c5de02 100644
--- a/vendor/golang.org/x/text/unicode/norm/composition.go
+++ b/vendor/golang.org/x/text/unicode/norm/composition.go
@@ -33,17 +33,9 @@ const (
 // streamSafe implements the policy of when a CGJ should be inserted.
 type streamSafe uint8
 
-// mkStreamSafe is a shorthand for declaring a streamSafe var and calling
-// first on it.
-func mkStreamSafe(p Properties) streamSafe {
-	return streamSafe(p.nTrailingNonStarters())
-}
-
-// first inserts the first rune of a segment.
+// first inserts the first rune of a segment. It is a faster version of next if
+// it is known p represents the first rune in a segment.
 func (ss *streamSafe) first(p Properties) {
-	if *ss != 0 {
-		panic("!= 0")
-	}
 	*ss = streamSafe(p.nTrailingNonStarters())
 }
 
@@ -66,7 +58,7 @@ func (ss *streamSafe) next(p Properties) ssState {
 	// be a non-starter. Note that it always hold that if nLead > 0 then
 	// nLead == nTrail.
 	if n == 0 {
-		*ss = 0
+		*ss = streamSafe(p.nTrailingNonStarters())
 		return ssStarter
 	}
 	return ssSuccess
@@ -142,7 +134,6 @@ func (rb *reorderBuffer) setFlusher(out []byte, f func(*reorderBuffer) bool) {
 func (rb *reorderBuffer) reset() {
 	rb.nrune = 0
 	rb.nbyte = 0
-	rb.ss = 0
 }
 
 func (rb *reorderBuffer) doFlush() bool {
@@ -257,6 +248,9 @@ func (rb *reorderBuffer) insertUnsafe(src input, i int, info Properties) {
 // It flushes the buffer on each new segment start.
 func (rb *reorderBuffer) insertDecomposed(dcomp []byte) insertErr {
 	rb.tmpBytes.setBytes(dcomp)
+	// As the streamSafe accounting already handles the counting for modifiers,
+	// we don't have to call next. However, we do need to keep the accounting
+	// intact when flushing the buffer.
 	for i := 0; i < len(dcomp); {
 		info := rb.f.info(rb.tmpBytes, i)
 		if info.BoundaryBefore() && rb.nrune > 0 && !rb.doFlush() {
diff --git a/vendor/golang.org/x/text/unicode/norm/forminfo.go b/vendor/golang.org/x/text/unicode/norm/forminfo.go
index 15a67c653a..e67e7655c5 100644
--- a/vendor/golang.org/x/text/unicode/norm/forminfo.go
+++ b/vendor/golang.org/x/text/unicode/norm/forminfo.go
@@ -10,7 +10,7 @@ package norm
 // and its corresponding decomposing form share the same trie.  Each trie maps
 // a rune to a uint16. The values take two forms.  For v >= 0x8000:
 //   bits
-//   15:    1 (inverse of NFD_QD bit of qcInfo)
+//   15:    1 (inverse of NFD_QC bit of qcInfo)
 //   13..7: qcInfo (see below). isYesD is always true (no decompostion).
 //    6..0: ccc (compressed CCC value).
 // For v < 0x8000, the respective rune has a decomposition and v is an index
@@ -56,28 +56,31 @@ type formInfo struct {
 	nextMain                 iterFunc
 }
 
-var formTable []*formInfo
-
-func init() {
-	formTable = make([]*formInfo, 4)
-
-	for i := range formTable {
-		f := &formInfo{}
-		formTable[i] = f
-		f.form = Form(i)
-		if Form(i) == NFKD || Form(i) == NFKC {
-			f.compatibility = true
-			f.info = lookupInfoNFKC
-		} else {
-			f.info = lookupInfoNFC
-		}
-		f.nextMain = nextDecomposed
-		if Form(i) == NFC || Form(i) == NFKC {
-			f.nextMain = nextComposed
-			f.composing = true
-		}
-	}
-}
+var formTable = []*formInfo{{
+	form:          NFC,
+	composing:     true,
+	compatibility: false,
+	info:          lookupInfoNFC,
+	nextMain:      nextComposed,
+}, {
+	form:          NFD,
+	composing:     false,
+	compatibility: false,
+	info:          lookupInfoNFC,
+	nextMain:      nextDecomposed,
+}, {
+	form:          NFKC,
+	composing:     true,
+	compatibility: true,
+	info:          lookupInfoNFKC,
+	nextMain:      nextComposed,
+}, {
+	form:          NFKD,
+	composing:     false,
+	compatibility: true,
+	info:          lookupInfoNFKC,
+	nextMain:      nextDecomposed,
+}}
 
 // We do not distinguish between boundaries for NFC, NFD, etc. to avoid
 // unexpected behavior for the user.  For example, in NFD, there is a boundary
diff --git a/vendor/golang.org/x/text/unicode/norm/input.go b/vendor/golang.org/x/text/unicode/norm/input.go
index 045d4ccce2..479e35bc25 100644
--- a/vendor/golang.org/x/text/unicode/norm/input.go
+++ b/vendor/golang.org/x/text/unicode/norm/input.go
@@ -90,16 +90,20 @@ func (in *input) charinfoNFKC(p int) (uint16, int) {
 }
 
 func (in *input) hangul(p int) (r rune) {
+	var size int
 	if in.bytes == nil {
 		if !isHangulString(in.str[p:]) {
 			return 0
 		}
-		r, _ = utf8.DecodeRuneInString(in.str[p:])
+		r, size = utf8.DecodeRuneInString(in.str[p:])
 	} else {
 		if !isHangul(in.bytes[p:]) {
 			return 0
 		}
-		r, _ = utf8.DecodeRune(in.bytes[p:])
+		r, size = utf8.DecodeRune(in.bytes[p:])
+	}
+	if size != hangulUTF8Size {
+		return 0
 	}
 	return r
 }
diff --git a/vendor/golang.org/x/text/unicode/norm/iter.go b/vendor/golang.org/x/text/unicode/norm/iter.go
index 0a42a72de8..ce17f96c2e 100644
--- a/vendor/golang.org/x/text/unicode/norm/iter.go
+++ b/vendor/golang.org/x/text/unicode/norm/iter.go
@@ -41,6 +41,7 @@ func (i *Iter) Init(f Form, src []byte) {
 	i.next = i.rb.f.nextMain
 	i.asciiF = nextASCIIBytes
 	i.info = i.rb.f.info(i.rb.src, i.p)
+	i.rb.ss.first(i.info)
 }
 
 // InitString initializes i to iterate over src after normalizing it to Form f.
@@ -56,11 +57,12 @@ func (i *Iter) InitString(f Form, src string) {
 	i.next = i.rb.f.nextMain
 	i.asciiF = nextASCIIString
 	i.info = i.rb.f.info(i.rb.src, i.p)
+	i.rb.ss.first(i.info)
 }
 
 // Seek sets the segment to be returned by the next call to Next to start
 // at position p.  It is the responsibility of the caller to set p to the
-// start of a UTF8 rune.
+// start of a segment.
 func (i *Iter) Seek(offset int64, whence int) (int64, error) {
 	var abs int64
 	switch whence {
@@ -84,6 +86,7 @@ func (i *Iter) Seek(offset int64, whence int) (int64, error) {
 	i.multiSeg = nil
 	i.next = i.rb.f.nextMain
 	i.info = i.rb.f.info(i.rb.src, i.p)
+	i.rb.ss.first(i.info)
 	return abs, nil
 }
 
@@ -161,6 +164,7 @@ func nextHangul(i *Iter) []byte {
 	if next >= i.rb.nsrc {
 		i.setDone()
 	} else if i.rb.src.hangul(next) == 0 {
+		i.rb.ss.next(i.info)
 		i.info = i.rb.f.info(i.rb.src, i.p)
 		i.next = i.rb.f.nextMain
 		return i.next(i)
@@ -204,12 +208,10 @@ func nextMultiNorm(i *Iter) []byte {
 		if info.BoundaryBefore() {
 			i.rb.compose()
 			seg := i.buf[:i.rb.flushCopy(i.buf[:])]
-			i.rb.ss.first(info)
 			i.rb.insertUnsafe(input{bytes: d}, j, info)
 			i.multiSeg = d[j+int(info.size):]
 			return seg
 		}
-		i.rb.ss.next(info)
 		i.rb.insertUnsafe(input{bytes: d}, j, info)
 		j += int(info.size)
 	}
@@ -222,9 +224,9 @@ func nextMultiNorm(i *Iter) []byte {
 func nextDecomposed(i *Iter) (next []byte) {
 	outp := 0
 	inCopyStart, outCopyStart := i.p, 0
-	ss := mkStreamSafe(i.info)
 	for {
 		if sz := int(i.info.size); sz <= 1 {
+			i.rb.ss = 0
 			p := i.p
 			i.p++ // ASCII or illegal byte.  Either way, advance by 1.
 			if i.p >= i.rb.nsrc {
@@ -243,6 +245,8 @@ func nextDecomposed(i *Iter) (next []byte) {
 			p := outp + len(d)
 			if outp > 0 {
 				i.rb.src.copySlice(i.buf[outCopyStart:], inCopyStart, i.p)
+				// TODO: this condition should not be possible, but we leave it
+				// in for defensive purposes.
 				if p > len(i.buf) {
 					return i.buf[:outp]
 				}
@@ -266,7 +270,7 @@ func nextDecomposed(i *Iter) (next []byte) {
 			} else {
 				i.info = i.rb.f.info(i.rb.src, i.p)
 			}
-			switch ss.next(i.info) {
+			switch i.rb.ss.next(i.info) {
 			case ssOverflow:
 				i.next = nextCGJDecompose
 				fallthrough
@@ -309,7 +313,7 @@ func nextDecomposed(i *Iter) (next []byte) {
 		}
 		prevCC := i.info.tccc
 		i.info = i.rb.f.info(i.rb.src, i.p)
-		if v := ss.next(i.info); v == ssStarter {
+		if v := i.rb.ss.next(i.info); v == ssStarter {
 			break
 		} else if v == ssOverflow {
 			i.next = nextCGJDecompose
@@ -335,10 +339,6 @@ doNorm:
 
 func doNormDecomposed(i *Iter) []byte {
 	for {
-		if s := i.rb.ss.next(i.info); s == ssOverflow {
-			i.next = nextCGJDecompose
-			break
-		}
 		i.rb.insertUnsafe(i.rb.src, i.p, i.info)
 		if i.p += int(i.info.size); i.p >= i.rb.nsrc {
 			i.setDone()
@@ -348,6 +348,10 @@ func doNormDecomposed(i *Iter) []byte {
 		if i.info.ccc == 0 {
 			break
 		}
+		if s := i.rb.ss.next(i.info); s == ssOverflow {
+			i.next = nextCGJDecompose
+			break
+		}
 	}
 	// new segment or too many combining characters: exit normalization
 	return i.buf[:i.rb.flushCopy(i.buf[:])]
@@ -357,6 +361,7 @@ func nextCGJDecompose(i *Iter) []byte {
 	i.rb.ss = 0
 	i.rb.insertCGJ()
 	i.next = nextDecomposed
+	i.rb.ss.first(i.info)
 	buf := doNormDecomposed(i)
 	return buf
 }
@@ -365,7 +370,6 @@ func nextCGJDecompose(i *Iter) []byte {
 func nextComposed(i *Iter) []byte {
 	outp, startp := 0, i.p
 	var prevCC uint8
-	ss := mkStreamSafe(i.info)
 	for {
 		if !i.info.isYesC() {
 			goto doNorm
@@ -385,11 +389,12 @@ func nextComposed(i *Iter) []byte {
 			i.setDone()
 			break
 		} else if i.rb.src._byte(i.p) < utf8.RuneSelf {
+			i.rb.ss = 0
 			i.next = i.asciiF
 			break
 		}
 		i.info = i.rb.f.info(i.rb.src, i.p)
-		if v := ss.next(i.info); v == ssStarter {
+		if v := i.rb.ss.next(i.info); v == ssStarter {
 			break
 		} else if v == ssOverflow {
 			i.next = nextCGJCompose
@@ -401,8 +406,10 @@ func nextComposed(i *Iter) []byte {
 	}
 	return i.returnSlice(startp, i.p)
 doNorm:
+	// reset to start position
 	i.p = startp
 	i.info = i.rb.f.info(i.rb.src, i.p)
+	i.rb.ss.first(i.info)
 	if i.info.multiSegment() {
 		d := i.info.Decomposition()
 		info := i.rb.f.info(input{bytes: d}, 0)
diff --git a/vendor/golang.org/x/text/unicode/norm/maketables.go b/vendor/golang.org/x/text/unicode/norm/maketables.go
index 07bdff6bdc..8d418160ca 100644
--- a/vendor/golang.org/x/text/unicode/norm/maketables.go
+++ b/vendor/golang.org/x/text/unicode/norm/maketables.go
@@ -35,12 +35,9 @@ func main() {
 	computeNonStarterCounts()
 	verifyComputed()
 	printChars()
-	if *test {
-		testDerived()
-		printTestdata()
-	} else {
-		makeTables()
-	}
+	testDerived()
+	printTestdata()
+	makeTables()
 }
 
 var (
@@ -602,6 +599,7 @@ func printCharInfoTables(w io.Writer) int {
 		}
 		index := normalDecomp
 		nTrail := chars[r].nTrailingNonStarters
+		nLead := chars[r].nLeadingNonStarters
 		if tccc > 0 || lccc > 0 || nTrail > 0 {
 			tccc <<= 2
 			tccc |= nTrail
@@ -612,7 +610,7 @@ func printCharInfoTables(w io.Writer) int {
 					index = firstCCC
 				}
 			}
-			if lccc > 0 {
+			if lccc > 0 || nLead > 0 {
 				s += string([]byte{lccc})
 				if index == firstCCC {
 					log.Fatalf("%U: multi-segment decomposition not supported for decompositions with leading CCC != 0", r)
diff --git a/vendor/golang.org/x/text/unicode/norm/normalize.go b/vendor/golang.org/x/text/unicode/norm/normalize.go
index eb5596f86a..e28ac641ac 100644
--- a/vendor/golang.org/x/text/unicode/norm/normalize.go
+++ b/vendor/golang.org/x/text/unicode/norm/normalize.go
@@ -2,13 +2,18 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// Note: the file data_test.go that is generated should not be checked in.
 //go:generate go run maketables.go triegen.go
-//go:generate go run maketables.go triegen.go -test
+//go:generate go test -tags test
 
 // Package norm contains types and functions for normalizing Unicode strings.
 package norm // import "golang.org/x/text/unicode/norm"
 
-import "unicode/utf8"
+import (
+	"unicode/utf8"
+
+	"golang.org/x/text/transform"
+)
 
 // A Form denotes a canonical representation of Unicode code points.
 // The Unicode-defined normalization and equivalence forms are:
@@ -263,6 +268,34 @@ func (f Form) QuickSpan(b []byte) int {
 	return n
 }
 
+// Span implements transform.SpanningTransformer. It returns a boundary n such
+// that b[0:n] == f(b[0:n]). It is not guaranteed to return the largest such n.
+func (f Form) Span(b []byte, atEOF bool) (n int, err error) {
+	n, ok := formTable[f].quickSpan(inputBytes(b), 0, len(b), atEOF)
+	if n < len(b) {
+		if !ok {
+			err = transform.ErrEndOfSpan
+		} else {
+			err = transform.ErrShortSrc
+		}
+	}
+	return n, err
+}
+
+// SpanString returns a boundary n such that s[0:n] == f(s[0:n]).
+// It is not guaranteed to return the largest such n.
+func (f Form) SpanString(s string, atEOF bool) (n int, err error) {
+	n, ok := formTable[f].quickSpan(inputString(s), 0, len(s), atEOF)
+	if n < len(s) {
+		if !ok {
+			err = transform.ErrEndOfSpan
+		} else {
+			err = transform.ErrShortSrc
+		}
+	}
+	return n, err
+}
+
 // quickSpan returns a boundary n such that src[0:n] == f(src[0:n]) and
 // whether any non-normalized parts were found. If atEOF is false, n will
 // not point past the last segment if this segment might be become
@@ -291,7 +324,6 @@ func (f *formInfo) quickSpan(src input, i, end int, atEOF bool) (n int, ok bool)
 		// have an overflow for runes that are starters (e.g. with U+FF9E).
 		switch ss.next(info) {
 		case ssStarter:
-			ss.first(info)
 			lastSegStart = i
 		case ssOverflow:
 			return lastSegStart, false
@@ -321,7 +353,7 @@ func (f *formInfo) quickSpan(src input, i, end int, atEOF bool) (n int, ok bool)
 	return lastSegStart, false
 }
 
-// QuickSpanString returns a boundary n such that b[0:n] == f(s[0:n]).
+// QuickSpanString returns a boundary n such that s[0:n] == f(s[0:n]).
 // It is not guaranteed to return the largest such n.
 func (f Form) QuickSpanString(s string) int {
 	n, _ := formTable[f].quickSpan(inputString(s), 0, len(s), true)
@@ -408,6 +440,8 @@ func (f Form) nextBoundary(src input, nsrc int, atEOF bool) int {
 			}
 			return -1
 		}
+		// TODO: Using streamSafe to determine the boundary isn't the same as
+		// using BoundaryBefore. Determine which should be used.
 		if s := ss.next(info); s != ssSuccess {
 			return i
 		}
@@ -472,15 +506,14 @@ func decomposeSegment(rb *reorderBuffer, sp int, atEOF bool) int {
 	if info.size == 0 {
 		return 0
 	}
-	if rb.nrune > 0 {
-		if s := rb.ss.next(info); s == ssStarter {
-			goto end
-		} else if s == ssOverflow {
-			rb.insertCGJ()
+	if s := rb.ss.next(info); s == ssStarter {
+		// TODO: this could be removed if we don't support merging.
+		if rb.nrune > 0 {
 			goto end
 		}
-	} else {
-		rb.ss.first(info)
+	} else if s == ssOverflow {
+		rb.insertCGJ()
+		goto end
 	}
 	if err := rb.insertFlush(rb.src, sp, info); err != iSuccess {
 		return int(err)
diff --git a/vendor/golang.org/x/text/unicode/norm/readwriter.go b/vendor/golang.org/x/text/unicode/norm/readwriter.go
index 4fa0e04b21..d926ee903e 100644
--- a/vendor/golang.org/x/text/unicode/norm/readwriter.go
+++ b/vendor/golang.org/x/text/unicode/norm/readwriter.go
@@ -112,7 +112,6 @@ func (r *normReader) Read(p []byte) (int, error) {
 			}
 		}
 	}
-	panic("should not reach here")
 }
 
 // Reader returns a new reader that implements Read
diff --git a/vendor/golang.org/x/text/unicode/norm/tables.go b/vendor/golang.org/x/text/unicode/norm/tables.go
index a56697b571..316b093c53 100644
--- a/vendor/golang.org/x/text/unicode/norm/tables.go
+++ b/vendor/golang.org/x/text/unicode/norm/tables.go
@@ -1,10 +1,10 @@
-// This file was generated by go generate; DO NOT EDIT
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 package norm
 
 const (
 	// Version is the Unicode edition from which the tables are derived.
-	Version = "9.0.0"
+	Version = "10.0.0"
 
 	// MaxTransformChunkSize indicates the maximum number of bytes that Transform
 	// may need to write atomically for any Form. Making a destination buffer at
@@ -27,14 +27,14 @@ const (
 	firstMulti            = 0x186D
 	firstCCC              = 0x2C9E
 	endMulti              = 0x2F60
-	firstLeadingCCC       = 0x4A44
-	firstCCCZeroExcept    = 0x4A5A
-	firstStarterWithNLead = 0x4A81
-	lastDecomp            = 0x4A83
+	firstLeadingCCC       = 0x49AE
+	firstCCCZeroExcept    = 0x4A78
+	firstStarterWithNLead = 0x4A9F
+	lastDecomp            = 0x4AA1
 	maxDecomp             = 0x8000
 )
 
-// decomps: 19075 bytes
+// decomps: 19105 bytes
 var decomps = [...]byte{
 	// Bytes 0 - 3f
 	0x00, 0x41, 0x20, 0x41, 0x21, 0x41, 0x22, 0x41,
@@ -2443,283 +2443,287 @@ var decomps = [...]byte{
 	0xD9, 0x8F, 0x69, 0x43, 0x20, 0xD9, 0x90, 0x6D,
 	0x43, 0x20, 0xD9, 0x91, 0x71, 0x43, 0x20, 0xD9,
 	0x92, 0x75, 0x43, 0x41, 0xCC, 0x8A, 0xC9, 0x43,
-	0x73, 0xCC, 0x87, 0xC9, 0x43, 0xE1, 0x85, 0xA1,
-	0x01, 0x43, 0xE1, 0x85, 0xA2, 0x01, 0x43, 0xE1,
-	0x85, 0xA3, 0x01, 0x43, 0xE1, 0x85, 0xA4, 0x01,
-	0x43, 0xE1, 0x85, 0xA5, 0x01, 0x43, 0xE1, 0x85,
-	0xA6, 0x01, 0x43, 0xE1, 0x85, 0xA7, 0x01, 0x43,
+	0x73, 0xCC, 0x87, 0xC9, 0x44, 0x20, 0xE3, 0x82,
+	0x99, 0x0D, 0x44, 0x20, 0xE3, 0x82, 0x9A, 0x0D,
+	0x44, 0xC2, 0xA8, 0xCC, 0x81, 0xCA, 0x44, 0xCE,
+	0x91, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0x95, 0xCC,
+	0x81, 0xC9, 0x44, 0xCE, 0x97, 0xCC, 0x81, 0xC9,
 	// Bytes 4300 - 433f
-	0xE1, 0x85, 0xA8, 0x01, 0x43, 0xE1, 0x85, 0xA9,
-	0x01, 0x43, 0xE1, 0x85, 0xAA, 0x01, 0x43, 0xE1,
-	0x85, 0xAB, 0x01, 0x43, 0xE1, 0x85, 0xAC, 0x01,
-	0x43, 0xE1, 0x85, 0xAD, 0x01, 0x43, 0xE1, 0x85,
-	0xAE, 0x01, 0x43, 0xE1, 0x85, 0xAF, 0x01, 0x43,
-	0xE1, 0x85, 0xB0, 0x01, 0x43, 0xE1, 0x85, 0xB1,
-	0x01, 0x43, 0xE1, 0x85, 0xB2, 0x01, 0x43, 0xE1,
-	0x85, 0xB3, 0x01, 0x43, 0xE1, 0x85, 0xB4, 0x01,
+	0x44, 0xCE, 0x99, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
+	0x9F, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xA5, 0xCC,
+	0x81, 0xC9, 0x44, 0xCE, 0xA5, 0xCC, 0x88, 0xC9,
+	0x44, 0xCE, 0xA9, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
+	0xB1, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xB5, 0xCC,
+	0x81, 0xC9, 0x44, 0xCE, 0xB7, 0xCC, 0x81, 0xC9,
+	0x44, 0xCE, 0xB9, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
+	0xBF, 0xCC, 0x81, 0xC9, 0x44, 0xCF, 0x85, 0xCC,
 	// Bytes 4340 - 437f
-	0x43, 0xE1, 0x85, 0xB5, 0x01, 0x43, 0xE1, 0x86,
-	0xAA, 0x01, 0x43, 0xE1, 0x86, 0xAC, 0x01, 0x43,
-	0xE1, 0x86, 0xAD, 0x01, 0x43, 0xE1, 0x86, 0xB0,
-	0x01, 0x43, 0xE1, 0x86, 0xB1, 0x01, 0x43, 0xE1,
-	0x86, 0xB2, 0x01, 0x43, 0xE1, 0x86, 0xB3, 0x01,
-	0x43, 0xE1, 0x86, 0xB4, 0x01, 0x43, 0xE1, 0x86,
-	0xB5, 0x01, 0x44, 0x20, 0xE3, 0x82, 0x99, 0x0D,
-	0x44, 0x20, 0xE3, 0x82, 0x9A, 0x0D, 0x44, 0xC2,
+	0x81, 0xC9, 0x44, 0xCF, 0x89, 0xCC, 0x81, 0xC9,
+	0x44, 0xD7, 0x90, 0xD6, 0xB7, 0x31, 0x44, 0xD7,
+	0x90, 0xD6, 0xB8, 0x35, 0x44, 0xD7, 0x90, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x91, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x91, 0xD6, 0xBF, 0x49, 0x44, 0xD7,
+	0x92, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x93, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x94, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x95, 0xD6, 0xB9, 0x39, 0x44, 0xD7,
 	// Bytes 4380 - 43bf
-	0xA8, 0xCC, 0x81, 0xCA, 0x44, 0xCE, 0x91, 0xCC,
-	0x81, 0xC9, 0x44, 0xCE, 0x95, 0xCC, 0x81, 0xC9,
-	0x44, 0xCE, 0x97, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
-	0x99, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0x9F, 0xCC,
-	0x81, 0xC9, 0x44, 0xCE, 0xA5, 0xCC, 0x81, 0xC9,
-	0x44, 0xCE, 0xA5, 0xCC, 0x88, 0xC9, 0x44, 0xCE,
-	0xA9, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xB1, 0xCC,
-	0x81, 0xC9, 0x44, 0xCE, 0xB5, 0xCC, 0x81, 0xC9,
+	0x95, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x96, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x98, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x99, 0xD6, 0xB4, 0x25, 0x44, 0xD7,
+	0x99, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x9A, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x9B, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x9B, 0xD6, 0xBF, 0x49, 0x44, 0xD7,
+	0x9C, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x9E, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0xA0, 0xD6, 0xBC, 0x41,
 	// Bytes 43c0 - 43ff
-	0x44, 0xCE, 0xB7, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
-	0xB9, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xBF, 0xCC,
-	0x81, 0xC9, 0x44, 0xCF, 0x85, 0xCC, 0x81, 0xC9,
-	0x44, 0xCF, 0x89, 0xCC, 0x81, 0xC9, 0x44, 0xD7,
-	0x90, 0xD6, 0xB7, 0x31, 0x44, 0xD7, 0x90, 0xD6,
-	0xB8, 0x35, 0x44, 0xD7, 0x90, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0x91, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
-	0x91, 0xD6, 0xBF, 0x49, 0x44, 0xD7, 0x92, 0xD6,
+	0x44, 0xD7, 0xA1, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0xA3, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA4, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0xA4, 0xD6, 0xBF, 0x49,
+	0x44, 0xD7, 0xA6, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0xA7, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA8, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0xA9, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0xA9, 0xD7, 0x81, 0x4D, 0x44, 0xD7,
+	0xA9, 0xD7, 0x82, 0x51, 0x44, 0xD7, 0xAA, 0xD6,
 	// Bytes 4400 - 443f
-	0xBC, 0x41, 0x44, 0xD7, 0x93, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0x94, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
-	0x95, 0xD6, 0xB9, 0x39, 0x44, 0xD7, 0x95, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0x96, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0x98, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
-	0x99, 0xD6, 0xB4, 0x25, 0x44, 0xD7, 0x99, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0x9A, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0x9B, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0xBC, 0x41, 0x44, 0xD7, 0xB2, 0xD6, 0xB7, 0x31,
+	0x44, 0xD8, 0xA7, 0xD9, 0x8B, 0x59, 0x44, 0xD8,
+	0xA7, 0xD9, 0x93, 0xC9, 0x44, 0xD8, 0xA7, 0xD9,
+	0x94, 0xC9, 0x44, 0xD8, 0xA7, 0xD9, 0x95, 0xB5,
+	0x44, 0xD8, 0xB0, 0xD9, 0xB0, 0x79, 0x44, 0xD8,
+	0xB1, 0xD9, 0xB0, 0x79, 0x44, 0xD9, 0x80, 0xD9,
+	0x8B, 0x59, 0x44, 0xD9, 0x80, 0xD9, 0x8E, 0x65,
+	0x44, 0xD9, 0x80, 0xD9, 0x8F, 0x69, 0x44, 0xD9,
 	// Bytes 4440 - 447f
-	0x9B, 0xD6, 0xBF, 0x49, 0x44, 0xD7, 0x9C, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0x9E, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0xA0, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
-	0xA1, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA3, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0xA4, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0xA4, 0xD6, 0xBF, 0x49, 0x44, 0xD7,
-	0xA6, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA7, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0xA8, 0xD6, 0xBC, 0x41,
+	0x80, 0xD9, 0x90, 0x6D, 0x44, 0xD9, 0x80, 0xD9,
+	0x91, 0x71, 0x44, 0xD9, 0x80, 0xD9, 0x92, 0x75,
+	0x44, 0xD9, 0x87, 0xD9, 0xB0, 0x79, 0x44, 0xD9,
+	0x88, 0xD9, 0x94, 0xC9, 0x44, 0xD9, 0x89, 0xD9,
+	0xB0, 0x79, 0x44, 0xD9, 0x8A, 0xD9, 0x94, 0xC9,
+	0x44, 0xDB, 0x92, 0xD9, 0x94, 0xC9, 0x44, 0xDB,
+	0x95, 0xD9, 0x94, 0xC9, 0x45, 0x20, 0xCC, 0x88,
+	0xCC, 0x80, 0xCA, 0x45, 0x20, 0xCC, 0x88, 0xCC,
 	// Bytes 4480 - 44bf
-	0x44, 0xD7, 0xA9, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
-	0xA9, 0xD7, 0x81, 0x4D, 0x44, 0xD7, 0xA9, 0xD7,
-	0x82, 0x51, 0x44, 0xD7, 0xAA, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0xB2, 0xD6, 0xB7, 0x31, 0x44, 0xD8,
-	0xA7, 0xD9, 0x8B, 0x59, 0x44, 0xD8, 0xA7, 0xD9,
-	0x93, 0xC9, 0x44, 0xD8, 0xA7, 0xD9, 0x94, 0xC9,
-	0x44, 0xD8, 0xA7, 0xD9, 0x95, 0xB5, 0x44, 0xD8,
-	0xB0, 0xD9, 0xB0, 0x79, 0x44, 0xD8, 0xB1, 0xD9,
+	0x81, 0xCA, 0x45, 0x20, 0xCC, 0x88, 0xCD, 0x82,
+	0xCA, 0x45, 0x20, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x45, 0x20, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x45,
+	0x20, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x45, 0x20,
+	0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x45, 0x20, 0xCC,
+	0x94, 0xCC, 0x81, 0xCA, 0x45, 0x20, 0xCC, 0x94,
+	0xCD, 0x82, 0xCA, 0x45, 0x20, 0xD9, 0x8C, 0xD9,
+	0x91, 0x72, 0x45, 0x20, 0xD9, 0x8D, 0xD9, 0x91,
 	// Bytes 44c0 - 44ff
-	0xB0, 0x79, 0x44, 0xD9, 0x80, 0xD9, 0x8B, 0x59,
-	0x44, 0xD9, 0x80, 0xD9, 0x8E, 0x65, 0x44, 0xD9,
-	0x80, 0xD9, 0x8F, 0x69, 0x44, 0xD9, 0x80, 0xD9,
-	0x90, 0x6D, 0x44, 0xD9, 0x80, 0xD9, 0x91, 0x71,
-	0x44, 0xD9, 0x80, 0xD9, 0x92, 0x75, 0x44, 0xD9,
-	0x87, 0xD9, 0xB0, 0x79, 0x44, 0xD9, 0x88, 0xD9,
-	0x94, 0xC9, 0x44, 0xD9, 0x89, 0xD9, 0xB0, 0x79,
-	0x44, 0xD9, 0x8A, 0xD9, 0x94, 0xC9, 0x44, 0xDB,
+	0x72, 0x45, 0x20, 0xD9, 0x8E, 0xD9, 0x91, 0x72,
+	0x45, 0x20, 0xD9, 0x8F, 0xD9, 0x91, 0x72, 0x45,
+	0x20, 0xD9, 0x90, 0xD9, 0x91, 0x72, 0x45, 0x20,
+	0xD9, 0x91, 0xD9, 0xB0, 0x7A, 0x45, 0xE2, 0xAB,
+	0x9D, 0xCC, 0xB8, 0x05, 0x46, 0xCE, 0xB9, 0xCC,
+	0x88, 0xCC, 0x81, 0xCA, 0x46, 0xCF, 0x85, 0xCC,
+	0x88, 0xCC, 0x81, 0xCA, 0x46, 0xD7, 0xA9, 0xD6,
+	0xBC, 0xD7, 0x81, 0x4E, 0x46, 0xD7, 0xA9, 0xD6,
 	// Bytes 4500 - 453f
-	0x92, 0xD9, 0x94, 0xC9, 0x44, 0xDB, 0x95, 0xD9,
-	0x94, 0xC9, 0x45, 0x20, 0xCC, 0x88, 0xCC, 0x80,
-	0xCA, 0x45, 0x20, 0xCC, 0x88, 0xCC, 0x81, 0xCA,
-	0x45, 0x20, 0xCC, 0x88, 0xCD, 0x82, 0xCA, 0x45,
-	0x20, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x45, 0x20,
-	0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x45, 0x20, 0xCC,
-	0x93, 0xCD, 0x82, 0xCA, 0x45, 0x20, 0xCC, 0x94,
-	0xCC, 0x80, 0xCA, 0x45, 0x20, 0xCC, 0x94, 0xCC,
+	0xBC, 0xD7, 0x82, 0x52, 0x46, 0xD9, 0x80, 0xD9,
+	0x8E, 0xD9, 0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9,
+	0x8F, 0xD9, 0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9,
+	0x90, 0xD9, 0x91, 0x72, 0x46, 0xE0, 0xA4, 0x95,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x96,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x97,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x9C,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA1,
 	// Bytes 4540 - 457f
-	0x81, 0xCA, 0x45, 0x20, 0xCC, 0x94, 0xCD, 0x82,
-	0xCA, 0x45, 0x20, 0xD9, 0x8C, 0xD9, 0x91, 0x72,
-	0x45, 0x20, 0xD9, 0x8D, 0xD9, 0x91, 0x72, 0x45,
-	0x20, 0xD9, 0x8E, 0xD9, 0x91, 0x72, 0x45, 0x20,
-	0xD9, 0x8F, 0xD9, 0x91, 0x72, 0x45, 0x20, 0xD9,
-	0x90, 0xD9, 0x91, 0x72, 0x45, 0x20, 0xD9, 0x91,
-	0xD9, 0xB0, 0x7A, 0x45, 0xE2, 0xAB, 0x9D, 0xCC,
-	0xB8, 0x05, 0x46, 0xCE, 0xB9, 0xCC, 0x88, 0xCC,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA2,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAB,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAF,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA1,
+	0xE0, 0xA6, 0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA2,
+	0xE0, 0xA6, 0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xAF,
+	0xE0, 0xA6, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x96,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x97,
 	// Bytes 4580 - 45bf
-	0x81, 0xCA, 0x46, 0xCF, 0x85, 0xCC, 0x88, 0xCC,
-	0x81, 0xCA, 0x46, 0xD7, 0xA9, 0xD6, 0xBC, 0xD7,
-	0x81, 0x4E, 0x46, 0xD7, 0xA9, 0xD6, 0xBC, 0xD7,
-	0x82, 0x52, 0x46, 0xD9, 0x80, 0xD9, 0x8E, 0xD9,
-	0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9, 0x8F, 0xD9,
-	0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9, 0x90, 0xD9,
-	0x91, 0x72, 0x46, 0xE0, 0xA4, 0x95, 0xE0, 0xA4,
-	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x96, 0xE0, 0xA4,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x9C,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xAB,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB2,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB8,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA1,
+	0xE0, 0xAC, 0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA2,
+	0xE0, 0xAC, 0xBC, 0x09, 0x46, 0xE0, 0xBE, 0xB2,
+	0xE0, 0xBE, 0x80, 0x9D, 0x46, 0xE0, 0xBE, 0xB3,
 	// Bytes 45c0 - 45ff
-	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x97, 0xE0, 0xA4,
-	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x9C, 0xE0, 0xA4,
-	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA1, 0xE0, 0xA4,
-	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA2, 0xE0, 0xA4,
-	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAB, 0xE0, 0xA4,
-	0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAF, 0xE0, 0xA4,
-	0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA1, 0xE0, 0xA6,
-	0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA2, 0xE0, 0xA6,
+	0xE0, 0xBE, 0x80, 0x9D, 0x46, 0xE3, 0x83, 0x86,
+	0xE3, 0x82, 0x99, 0x0D, 0x48, 0xF0, 0x9D, 0x85,
+	0x97, 0xF0, 0x9D, 0x85, 0xA5, 0xAD, 0x48, 0xF0,
+	0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xAD,
+	0x48, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85,
+	0xA5, 0xAD, 0x48, 0xF0, 0x9D, 0x86, 0xBA, 0xF0,
+	0x9D, 0x85, 0xA5, 0xAD, 0x49, 0xE0, 0xBE, 0xB2,
+	0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E, 0x49,
 	// Bytes 4600 - 463f
-	0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xAF, 0xE0, 0xA6,
-	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x96, 0xE0, 0xA8,
-	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x97, 0xE0, 0xA8,
-	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x9C, 0xE0, 0xA8,
-	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xAB, 0xE0, 0xA8,
-	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB2, 0xE0, 0xA8,
-	0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB8, 0xE0, 0xA8,
-	0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA1, 0xE0, 0xAC,
-	// Bytes 4640 - 467f
-	0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA2, 0xE0, 0xAC,
-	0xBC, 0x09, 0x46, 0xE0, 0xBE, 0xB2, 0xE0, 0xBE,
-	0x80, 0x9D, 0x46, 0xE0, 0xBE, 0xB3, 0xE0, 0xBE,
-	0x80, 0x9D, 0x46, 0xE3, 0x83, 0x86, 0xE3, 0x82,
-	0x99, 0x0D, 0x48, 0xF0, 0x9D, 0x85, 0x97, 0xF0,
-	0x9D, 0x85, 0xA5, 0xAD, 0x48, 0xF0, 0x9D, 0x85,
-	0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xAD, 0x48, 0xF0,
-	0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85, 0xA5, 0xAD,
-	// Bytes 4680 - 46bf
-	0x48, 0xF0, 0x9D, 0x86, 0xBA, 0xF0, 0x9D, 0x85,
-	0xA5, 0xAD, 0x49, 0xE0, 0xBE, 0xB2, 0xE0, 0xBD,
-	0xB1, 0xE0, 0xBE, 0x80, 0x9E, 0x49, 0xE0, 0xBE,
-	0xB3, 0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E,
+	0xE0, 0xBE, 0xB3, 0xE0, 0xBD, 0xB1, 0xE0, 0xBE,
+	0x80, 0x9E, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0,
+	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE,
 	0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85,
-	0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE, 0x4C, 0xF0,
+	0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xAE, 0x4C, 0xF0,
 	0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0,
-	0x9D, 0x85, 0xAF, 0xAE, 0x4C, 0xF0, 0x9D, 0x85,
-	// Bytes 46c0 - 46ff
+	0x9D, 0x85, 0xB0, 0xAE, 0x4C, 0xF0, 0x9D, 0x85,
 	0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85,
-	0xB0, 0xAE, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0,
-	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xB1, 0xAE,
-	0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85,
-	0xA5, 0xF0, 0x9D, 0x85, 0xB2, 0xAE, 0x4C, 0xF0,
+	// Bytes 4640 - 467f
+	0xB1, 0xAE, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0,
+	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xB2, 0xAE,
+	0x4C, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85,
+	0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE, 0x4C, 0xF0,
 	0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85, 0xA5, 0xF0,
-	0x9D, 0x85, 0xAE, 0xAE, 0x4C, 0xF0, 0x9D, 0x86,
-	0xB9, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85,
+	0x9D, 0x85, 0xAF, 0xAE, 0x4C, 0xF0, 0x9D, 0x86,
+	0xBA, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85,
+	0xAE, 0xAE, 0x4C, 0xF0, 0x9D, 0x86, 0xBA, 0xF0,
+	// Bytes 4680 - 46bf
+	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xAE,
+	0x83, 0x41, 0xCC, 0x82, 0xC9, 0x83, 0x41, 0xCC,
+	0x86, 0xC9, 0x83, 0x41, 0xCC, 0x87, 0xC9, 0x83,
+	0x41, 0xCC, 0x88, 0xC9, 0x83, 0x41, 0xCC, 0x8A,
+	0xC9, 0x83, 0x41, 0xCC, 0xA3, 0xB5, 0x83, 0x43,
+	0xCC, 0xA7, 0xA5, 0x83, 0x45, 0xCC, 0x82, 0xC9,
+	0x83, 0x45, 0xCC, 0x84, 0xC9, 0x83, 0x45, 0xCC,
+	0xA3, 0xB5, 0x83, 0x45, 0xCC, 0xA7, 0xA5, 0x83,
+	// Bytes 46c0 - 46ff
+	0x49, 0xCC, 0x88, 0xC9, 0x83, 0x4C, 0xCC, 0xA3,
+	0xB5, 0x83, 0x4F, 0xCC, 0x82, 0xC9, 0x83, 0x4F,
+	0xCC, 0x83, 0xC9, 0x83, 0x4F, 0xCC, 0x84, 0xC9,
+	0x83, 0x4F, 0xCC, 0x87, 0xC9, 0x83, 0x4F, 0xCC,
+	0x88, 0xC9, 0x83, 0x4F, 0xCC, 0x9B, 0xAD, 0x83,
+	0x4F, 0xCC, 0xA3, 0xB5, 0x83, 0x4F, 0xCC, 0xA8,
+	0xA5, 0x83, 0x52, 0xCC, 0xA3, 0xB5, 0x83, 0x53,
+	0xCC, 0x81, 0xC9, 0x83, 0x53, 0xCC, 0x8C, 0xC9,
 	// Bytes 4700 - 473f
-	0xAF, 0xAE, 0x4C, 0xF0, 0x9D, 0x86, 0xBA, 0xF0,
-	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE,
-	0x4C, 0xF0, 0x9D, 0x86, 0xBA, 0xF0, 0x9D, 0x85,
-	0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xAE, 0x83, 0x41,
-	0xCC, 0x82, 0xC9, 0x83, 0x41, 0xCC, 0x86, 0xC9,
-	0x83, 0x41, 0xCC, 0x87, 0xC9, 0x83, 0x41, 0xCC,
-	0x88, 0xC9, 0x83, 0x41, 0xCC, 0x8A, 0xC9, 0x83,
-	0x41, 0xCC, 0xA3, 0xB5, 0x83, 0x43, 0xCC, 0xA7,
+	0x83, 0x53, 0xCC, 0xA3, 0xB5, 0x83, 0x55, 0xCC,
+	0x83, 0xC9, 0x83, 0x55, 0xCC, 0x84, 0xC9, 0x83,
+	0x55, 0xCC, 0x88, 0xC9, 0x83, 0x55, 0xCC, 0x9B,
+	0xAD, 0x83, 0x61, 0xCC, 0x82, 0xC9, 0x83, 0x61,
+	0xCC, 0x86, 0xC9, 0x83, 0x61, 0xCC, 0x87, 0xC9,
+	0x83, 0x61, 0xCC, 0x88, 0xC9, 0x83, 0x61, 0xCC,
+	0x8A, 0xC9, 0x83, 0x61, 0xCC, 0xA3, 0xB5, 0x83,
+	0x63, 0xCC, 0xA7, 0xA5, 0x83, 0x65, 0xCC, 0x82,
 	// Bytes 4740 - 477f
-	0xA5, 0x83, 0x45, 0xCC, 0x82, 0xC9, 0x83, 0x45,
-	0xCC, 0x84, 0xC9, 0x83, 0x45, 0xCC, 0xA3, 0xB5,
-	0x83, 0x45, 0xCC, 0xA7, 0xA5, 0x83, 0x49, 0xCC,
-	0x88, 0xC9, 0x83, 0x4C, 0xCC, 0xA3, 0xB5, 0x83,
-	0x4F, 0xCC, 0x82, 0xC9, 0x83, 0x4F, 0xCC, 0x83,
-	0xC9, 0x83, 0x4F, 0xCC, 0x84, 0xC9, 0x83, 0x4F,
-	0xCC, 0x87, 0xC9, 0x83, 0x4F, 0xCC, 0x88, 0xC9,
-	0x83, 0x4F, 0xCC, 0x9B, 0xAD, 0x83, 0x4F, 0xCC,
+	0xC9, 0x83, 0x65, 0xCC, 0x84, 0xC9, 0x83, 0x65,
+	0xCC, 0xA3, 0xB5, 0x83, 0x65, 0xCC, 0xA7, 0xA5,
+	0x83, 0x69, 0xCC, 0x88, 0xC9, 0x83, 0x6C, 0xCC,
+	0xA3, 0xB5, 0x83, 0x6F, 0xCC, 0x82, 0xC9, 0x83,
+	0x6F, 0xCC, 0x83, 0xC9, 0x83, 0x6F, 0xCC, 0x84,
+	0xC9, 0x83, 0x6F, 0xCC, 0x87, 0xC9, 0x83, 0x6F,
+	0xCC, 0x88, 0xC9, 0x83, 0x6F, 0xCC, 0x9B, 0xAD,
+	0x83, 0x6F, 0xCC, 0xA3, 0xB5, 0x83, 0x6F, 0xCC,
 	// Bytes 4780 - 47bf
-	0xA3, 0xB5, 0x83, 0x4F, 0xCC, 0xA8, 0xA5, 0x83,
-	0x52, 0xCC, 0xA3, 0xB5, 0x83, 0x53, 0xCC, 0x81,
-	0xC9, 0x83, 0x53, 0xCC, 0x8C, 0xC9, 0x83, 0x53,
-	0xCC, 0xA3, 0xB5, 0x83, 0x55, 0xCC, 0x83, 0xC9,
-	0x83, 0x55, 0xCC, 0x84, 0xC9, 0x83, 0x55, 0xCC,
-	0x88, 0xC9, 0x83, 0x55, 0xCC, 0x9B, 0xAD, 0x83,
-	0x61, 0xCC, 0x82, 0xC9, 0x83, 0x61, 0xCC, 0x86,
-	0xC9, 0x83, 0x61, 0xCC, 0x87, 0xC9, 0x83, 0x61,
+	0xA8, 0xA5, 0x83, 0x72, 0xCC, 0xA3, 0xB5, 0x83,
+	0x73, 0xCC, 0x81, 0xC9, 0x83, 0x73, 0xCC, 0x8C,
+	0xC9, 0x83, 0x73, 0xCC, 0xA3, 0xB5, 0x83, 0x75,
+	0xCC, 0x83, 0xC9, 0x83, 0x75, 0xCC, 0x84, 0xC9,
+	0x83, 0x75, 0xCC, 0x88, 0xC9, 0x83, 0x75, 0xCC,
+	0x9B, 0xAD, 0x84, 0xCE, 0x91, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0x91, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
+	0x95, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0x95, 0xCC,
 	// Bytes 47c0 - 47ff
-	0xCC, 0x88, 0xC9, 0x83, 0x61, 0xCC, 0x8A, 0xC9,
-	0x83, 0x61, 0xCC, 0xA3, 0xB5, 0x83, 0x63, 0xCC,
-	0xA7, 0xA5, 0x83, 0x65, 0xCC, 0x82, 0xC9, 0x83,
-	0x65, 0xCC, 0x84, 0xC9, 0x83, 0x65, 0xCC, 0xA3,
-	0xB5, 0x83, 0x65, 0xCC, 0xA7, 0xA5, 0x83, 0x69,
-	0xCC, 0x88, 0xC9, 0x83, 0x6C, 0xCC, 0xA3, 0xB5,
-	0x83, 0x6F, 0xCC, 0x82, 0xC9, 0x83, 0x6F, 0xCC,
-	0x83, 0xC9, 0x83, 0x6F, 0xCC, 0x84, 0xC9, 0x83,
+	0x94, 0xC9, 0x84, 0xCE, 0x97, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0x97, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
+	0x99, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0x99, 0xCC,
+	0x94, 0xC9, 0x84, 0xCE, 0x9F, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0x9F, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
+	0xA5, 0xCC, 0x94, 0xC9, 0x84, 0xCE, 0xA9, 0xCC,
+	0x93, 0xC9, 0x84, 0xCE, 0xA9, 0xCC, 0x94, 0xC9,
+	0x84, 0xCE, 0xB1, 0xCC, 0x80, 0xC9, 0x84, 0xCE,
 	// Bytes 4800 - 483f
-	0x6F, 0xCC, 0x87, 0xC9, 0x83, 0x6F, 0xCC, 0x88,
-	0xC9, 0x83, 0x6F, 0xCC, 0x9B, 0xAD, 0x83, 0x6F,
-	0xCC, 0xA3, 0xB5, 0x83, 0x6F, 0xCC, 0xA8, 0xA5,
-	0x83, 0x72, 0xCC, 0xA3, 0xB5, 0x83, 0x73, 0xCC,
-	0x81, 0xC9, 0x83, 0x73, 0xCC, 0x8C, 0xC9, 0x83,
-	0x73, 0xCC, 0xA3, 0xB5, 0x83, 0x75, 0xCC, 0x83,
-	0xC9, 0x83, 0x75, 0xCC, 0x84, 0xC9, 0x83, 0x75,
-	0xCC, 0x88, 0xC9, 0x83, 0x75, 0xCC, 0x9B, 0xAD,
+	0xB1, 0xCC, 0x81, 0xC9, 0x84, 0xCE, 0xB1, 0xCC,
+	0x93, 0xC9, 0x84, 0xCE, 0xB1, 0xCC, 0x94, 0xC9,
+	0x84, 0xCE, 0xB1, 0xCD, 0x82, 0xC9, 0x84, 0xCE,
+	0xB5, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0xB5, 0xCC,
+	0x94, 0xC9, 0x84, 0xCE, 0xB7, 0xCC, 0x80, 0xC9,
+	0x84, 0xCE, 0xB7, 0xCC, 0x81, 0xC9, 0x84, 0xCE,
+	0xB7, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0xB7, 0xCC,
+	0x94, 0xC9, 0x84, 0xCE, 0xB7, 0xCD, 0x82, 0xC9,
 	// Bytes 4840 - 487f
-	0x84, 0xCE, 0x91, 0xCC, 0x93, 0xC9, 0x84, 0xCE,
-	0x91, 0xCC, 0x94, 0xC9, 0x84, 0xCE, 0x95, 0xCC,
-	0x93, 0xC9, 0x84, 0xCE, 0x95, 0xCC, 0x94, 0xC9,
-	0x84, 0xCE, 0x97, 0xCC, 0x93, 0xC9, 0x84, 0xCE,
-	0x97, 0xCC, 0x94, 0xC9, 0x84, 0xCE, 0x99, 0xCC,
-	0x93, 0xC9, 0x84, 0xCE, 0x99, 0xCC, 0x94, 0xC9,
-	0x84, 0xCE, 0x9F, 0xCC, 0x93, 0xC9, 0x84, 0xCE,
-	0x9F, 0xCC, 0x94, 0xC9, 0x84, 0xCE, 0xA5, 0xCC,
+	0x84, 0xCE, 0xB9, 0xCC, 0x88, 0xC9, 0x84, 0xCE,
+	0xB9, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0xB9, 0xCC,
+	0x94, 0xC9, 0x84, 0xCE, 0xBF, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0xBF, 0xCC, 0x94, 0xC9, 0x84, 0xCF,
+	0x85, 0xCC, 0x88, 0xC9, 0x84, 0xCF, 0x85, 0xCC,
+	0x93, 0xC9, 0x84, 0xCF, 0x85, 0xCC, 0x94, 0xC9,
+	0x84, 0xCF, 0x89, 0xCC, 0x80, 0xC9, 0x84, 0xCF,
+	0x89, 0xCC, 0x81, 0xC9, 0x84, 0xCF, 0x89, 0xCC,
 	// Bytes 4880 - 48bf
-	0x94, 0xC9, 0x84, 0xCE, 0xA9, 0xCC, 0x93, 0xC9,
-	0x84, 0xCE, 0xA9, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
-	0xB1, 0xCC, 0x80, 0xC9, 0x84, 0xCE, 0xB1, 0xCC,
-	0x81, 0xC9, 0x84, 0xCE, 0xB1, 0xCC, 0x93, 0xC9,
-	0x84, 0xCE, 0xB1, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
-	0xB1, 0xCD, 0x82, 0xC9, 0x84, 0xCE, 0xB5, 0xCC,
-	0x93, 0xC9, 0x84, 0xCE, 0xB5, 0xCC, 0x94, 0xC9,
-	0x84, 0xCE, 0xB7, 0xCC, 0x80, 0xC9, 0x84, 0xCE,
+	0x93, 0xC9, 0x84, 0xCF, 0x89, 0xCC, 0x94, 0xC9,
+	0x84, 0xCF, 0x89, 0xCD, 0x82, 0xC9, 0x86, 0xCE,
+	0x91, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
 	// Bytes 48c0 - 48ff
-	0xB7, 0xCC, 0x81, 0xC9, 0x84, 0xCE, 0xB7, 0xCC,
-	0x93, 0xC9, 0x84, 0xCE, 0xB7, 0xCC, 0x94, 0xC9,
-	0x84, 0xCE, 0xB7, 0xCD, 0x82, 0xC9, 0x84, 0xCE,
-	0xB9, 0xCC, 0x88, 0xC9, 0x84, 0xCE, 0xB9, 0xCC,
-	0x93, 0xC9, 0x84, 0xCE, 0xB9, 0xCC, 0x94, 0xC9,
-	0x84, 0xCE, 0xBF, 0xCC, 0x93, 0xC9, 0x84, 0xCE,
-	0xBF, 0xCC, 0x94, 0xC9, 0x84, 0xCF, 0x85, 0xCC,
-	0x88, 0xC9, 0x84, 0xCF, 0x85, 0xCC, 0x93, 0xC9,
+	0x97, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
 	// Bytes 4900 - 493f
-	0x84, 0xCF, 0x85, 0xCC, 0x94, 0xC9, 0x84, 0xCF,
-	0x89, 0xCC, 0x80, 0xC9, 0x84, 0xCF, 0x89, 0xCC,
-	0x81, 0xC9, 0x84, 0xCF, 0x89, 0xCC, 0x93, 0xC9,
-	0x84, 0xCF, 0x89, 0xCC, 0x94, 0xC9, 0x84, 0xCF,
-	0x89, 0xCD, 0x82, 0xC9, 0x86, 0xCE, 0x91, 0xCC,
-	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
-	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
-	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
+	0xA9, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
 	// Bytes 4940 - 497f
-	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
-	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0x91, 0xCC,
-	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
-	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
-	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
-	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
-	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
-	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0x97, 0xCC,
+	0xB1, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCF,
 	// Bytes 4980 - 49bf
-	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
-	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
-	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
-	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
-	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
-	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xA9, 0xCC,
-	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
-	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
+	0x89, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x42, 0xCC,
+	0x80, 0xC9, 0x32, 0x42, 0xCC, 0x81, 0xC9, 0x32,
+	0x42, 0xCC, 0x93, 0xC9, 0x32, 0x43, 0xE1, 0x85,
 	// Bytes 49c0 - 49ff
-	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
-	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
-	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
-	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xB1, 0xCC,
-	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
-	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
-	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
-	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
+	0xA1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA2, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xA3, 0x01, 0x00, 0x43,
+	0xE1, 0x85, 0xA4, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xA5, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA6, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xA7, 0x01, 0x00, 0x43,
+	0xE1, 0x85, 0xA8, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xA9, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAA, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xAB, 0x01, 0x00, 0x43,
 	// Bytes 4a00 - 4a3f
-	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
-	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE, 0xB7, 0xCC,
-	0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
-	0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
-	0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
-	0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
-	0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
-	0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCF, 0x89, 0xCC,
+	0xE1, 0x85, 0xAC, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xAD, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAE, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xAF, 0x01, 0x00, 0x43,
+	0xE1, 0x85, 0xB0, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xB1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xB2, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xB3, 0x01, 0x00, 0x43,
+	0xE1, 0x85, 0xB4, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xB5, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xAA, 0x01,
 	// Bytes 4a40 - 4a7f
-	0x94, 0xCD, 0x82, 0xCA, 0x42, 0xCC, 0x80, 0xC9,
-	0x32, 0x42, 0xCC, 0x81, 0xC9, 0x32, 0x42, 0xCC,
-	0x93, 0xC9, 0x32, 0x44, 0xCC, 0x88, 0xCC, 0x81,
-	0xCA, 0x32, 0x43, 0xE3, 0x82, 0x99, 0x0D, 0x03,
-	0x43, 0xE3, 0x82, 0x9A, 0x0D, 0x03, 0x46, 0xE0,
-	0xBD, 0xB1, 0xE0, 0xBD, 0xB2, 0x9E, 0x26, 0x46,
-	0xE0, 0xBD, 0xB1, 0xE0, 0xBD, 0xB4, 0xA2, 0x26,
-	0x46, 0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E,
+	0x00, 0x43, 0xE1, 0x86, 0xAC, 0x01, 0x00, 0x43,
+	0xE1, 0x86, 0xAD, 0x01, 0x00, 0x43, 0xE1, 0x86,
+	0xB0, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB1, 0x01,
+	0x00, 0x43, 0xE1, 0x86, 0xB2, 0x01, 0x00, 0x43,
+	0xE1, 0x86, 0xB3, 0x01, 0x00, 0x43, 0xE1, 0x86,
+	0xB4, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB5, 0x01,
+	0x00, 0x44, 0xCC, 0x88, 0xCC, 0x81, 0xCA, 0x32,
+	0x43, 0xE3, 0x82, 0x99, 0x0D, 0x03, 0x43, 0xE3,
 	// Bytes 4a80 - 4abf
-	0x26, 0x00, 0x01,
+	0x82, 0x9A, 0x0D, 0x03, 0x46, 0xE0, 0xBD, 0xB1,
+	0xE0, 0xBD, 0xB2, 0x9E, 0x26, 0x46, 0xE0, 0xBD,
+	0xB1, 0xE0, 0xBD, 0xB4, 0xA2, 0x26, 0x46, 0xE0,
+	0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E, 0x26, 0x00,
+	0x01,
 }
 
 // lookup returns the trie value for the first UTF-8 encoding in s and
@@ -2892,7 +2896,7 @@ func (t *nfcTrie) lookupStringUnsafe(s string) uint16 {
 	return 0
 }
 
-// nfcTrie. Total size: 10332 bytes (10.09 KiB). Checksum: ad355b768fddb1b6.
+// nfcTrie. Total size: 10442 bytes (10.20 KiB). Checksum: 4ba400a9d8208e03.
 type nfcTrie struct{}
 
 func newNfcTrie(i int) *nfcTrie {
@@ -2902,17 +2906,17 @@ func newNfcTrie(i int) *nfcTrie {
 // lookupValue determines the type of block n and looks up the value for b.
 func (t *nfcTrie) lookupValue(n uint32, b byte) uint16 {
 	switch {
-	case n < 44:
+	case n < 45:
 		return uint16(nfcValues[n<<6+uint32(b)])
 	default:
-		n -= 44
+		n -= 45
 		return uint16(nfcSparse.lookup(n, b))
 	}
 }
 
-// nfcValues: 46 blocks, 2944 entries, 5888 bytes
+// nfcValues: 47 blocks, 3008 entries, 6016 bytes
 // The third block is the zero block.
-var nfcValues = [2944]uint16{
+var nfcValues = [3008]uint16{
 	// Block 0x0, offset 0x0
 	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
 	// Block 0x1, offset 0x40
@@ -2928,22 +2932,22 @@ var nfcValues = [2944]uint16{
 	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
 	// Block 0x2, offset 0x80
 	// Block 0x3, offset 0xc0
-	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x471e, 0xc3: 0x2f79, 0xc4: 0x472d, 0xc5: 0x4732,
-	0xc6: 0xa000, 0xc7: 0x473c, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x4741, 0xcb: 0x2ffb,
-	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x4755, 0xd1: 0x3104,
-	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x475f, 0xd5: 0x4764, 0xd6: 0x4773,
-	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x47a5, 0xdd: 0x3235,
-	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x47af, 0xe3: 0x3285,
-	0xe4: 0x47be, 0xe5: 0x47c3, 0xe6: 0xa000, 0xe7: 0x47cd, 0xe8: 0x32ee, 0xe9: 0x32f3,
-	0xea: 0x47d2, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x47e6,
-	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x47f0, 0xf5: 0x47f5,
-	0xf6: 0x4804, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
-	0xfc: 0x4836, 0xfd: 0x3550, 0xff: 0x3569,
+	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x4688, 0xc3: 0x2f79, 0xc4: 0x4697, 0xc5: 0x469c,
+	0xc6: 0xa000, 0xc7: 0x46a6, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x46ab, 0xcb: 0x2ffb,
+	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x46bf, 0xd1: 0x3104,
+	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x46c9, 0xd5: 0x46ce, 0xd6: 0x46dd,
+	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x470f, 0xdd: 0x3235,
+	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x4719, 0xe3: 0x3285,
+	0xe4: 0x4728, 0xe5: 0x472d, 0xe6: 0xa000, 0xe7: 0x4737, 0xe8: 0x32ee, 0xe9: 0x32f3,
+	0xea: 0x473c, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x4750,
+	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x475a, 0xf5: 0x475f,
+	0xf6: 0x476e, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
+	0xfc: 0x47a0, 0xfd: 0x3550, 0xff: 0x3569,
 	// Block 0x4, offset 0x100
-	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x4723, 0x103: 0x47b4, 0x104: 0x2f9c, 0x105: 0x32a8,
+	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x468d, 0x103: 0x471e, 0x104: 0x2f9c, 0x105: 0x32a8,
 	0x106: 0x2fb0, 0x107: 0x32bc, 0x108: 0x2fb5, 0x109: 0x32c1, 0x10a: 0x2fba, 0x10b: 0x32c6,
 	0x10c: 0x2fbf, 0x10d: 0x32cb, 0x10e: 0x2fc9, 0x10f: 0x32d5,
-	0x112: 0x4746, 0x113: 0x47d7, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
+	0x112: 0x46b0, 0x113: 0x4741, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
 	0x118: 0x3014, 0x119: 0x3320, 0x11a: 0x3005, 0x11b: 0x3311, 0x11c: 0x302d, 0x11d: 0x3339,
 	0x11e: 0x3037, 0x11f: 0x3343, 0x120: 0x303c, 0x121: 0x3348, 0x122: 0x3046, 0x123: 0x3352,
 	0x124: 0x304b, 0x125: 0x3357, 0x128: 0x307d, 0x129: 0x338e,
@@ -2954,12 +2958,12 @@ var nfcValues = [2944]uint16{
 	// Block 0x5, offset 0x140
 	0x143: 0x30ff, 0x144: 0x3410, 0x145: 0x3118,
 	0x146: 0x3429, 0x147: 0x310e, 0x148: 0x341f,
-	0x14c: 0x4769, 0x14d: 0x47fa, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
+	0x14c: 0x46d3, 0x14d: 0x4764, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
 	0x154: 0x3159, 0x155: 0x346a, 0x156: 0x3172, 0x157: 0x3483,
-	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x478c, 0x15b: 0x481d, 0x15c: 0x317c, 0x15d: 0x348d,
-	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x4791, 0x161: 0x4822, 0x162: 0x31a4, 0x163: 0x34ba,
-	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x479b, 0x169: 0x482c,
-	0x16a: 0x47a0, 0x16b: 0x4831, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
+	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x46f6, 0x15b: 0x4787, 0x15c: 0x317c, 0x15d: 0x348d,
+	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x46fb, 0x161: 0x478c, 0x162: 0x31a4, 0x163: 0x34ba,
+	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x4705, 0x169: 0x4796,
+	0x16a: 0x470a, 0x16b: 0x479b, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
 	0x170: 0x31d1, 0x171: 0x34e7, 0x172: 0x31ef, 0x173: 0x3505, 0x174: 0x3212, 0x175: 0x3528,
 	0x176: 0x323a, 0x177: 0x3555, 0x178: 0x324e, 0x179: 0x325d, 0x17a: 0x357d, 0x17b: 0x3267,
 	0x17c: 0x3587, 0x17d: 0x326c, 0x17e: 0x358c, 0x17f: 0xa000,
@@ -2971,7 +2975,7 @@ var nfcValues = [2944]uint16{
 	0x198: 0x3b57, 0x199: 0x39d6, 0x19a: 0x3b65, 0x19b: 0x39c1, 0x19c: 0x3b50,
 	0x19e: 0x38b0, 0x19f: 0x3a3f, 0x1a0: 0x38a9, 0x1a1: 0x3a38, 0x1a2: 0x35b3, 0x1a3: 0x35c5,
 	0x1a6: 0x3041, 0x1a7: 0x334d, 0x1a8: 0x30be, 0x1a9: 0x33cf,
-	0x1aa: 0x4782, 0x1ab: 0x4813, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
+	0x1aa: 0x46ec, 0x1ab: 0x477d, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
 	0x1b0: 0x33c5, 0x1b4: 0x3028, 0x1b5: 0x3334,
 	0x1b8: 0x30fa, 0x1b9: 0x340b, 0x1ba: 0x38b7, 0x1bb: 0x3a46,
 	0x1bc: 0x35ad, 0x1bd: 0x35bf, 0x1be: 0x35b9, 0x1bf: 0x35cb,
@@ -2982,8 +2986,8 @@ var nfcValues = [2944]uint16{
 	0x1d2: 0x316d, 0x1d3: 0x347e, 0x1d4: 0x31db, 0x1d5: 0x34f1, 0x1d6: 0x31e0, 0x1d7: 0x34f6,
 	0x1d8: 0x3186, 0x1d9: 0x3497, 0x1da: 0x319f, 0x1db: 0x34b5,
 	0x1de: 0x305a, 0x1df: 0x3366,
-	0x1e6: 0x4728, 0x1e7: 0x47b9, 0x1e8: 0x4750, 0x1e9: 0x47e1,
-	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x476e, 0x1ef: 0x47ff,
+	0x1e6: 0x4692, 0x1e7: 0x4723, 0x1e8: 0x46ba, 0x1e9: 0x474b,
+	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x46d8, 0x1ef: 0x4769,
 	0x1f0: 0x3958, 0x1f1: 0x3ae7, 0x1f2: 0x3244, 0x1f3: 0x355f,
 	// Block 0x8, offset 0x200
 	0x200: 0x9932, 0x201: 0x9932, 0x202: 0x9932, 0x203: 0x9932, 0x204: 0x9932, 0x205: 0x8132,
@@ -2998,7 +3002,7 @@ var nfcValues = [2944]uint16{
 	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812d, 0x23a: 0x812d, 0x23b: 0x812d,
 	0x23c: 0x812d, 0x23d: 0x8132, 0x23e: 0x8132, 0x23f: 0x8132,
 	// Block 0x9, offset 0x240
-	0x240: 0x4a44, 0x241: 0x4a49, 0x242: 0x9932, 0x243: 0x4a4e, 0x244: 0x4a53, 0x245: 0x9936,
+	0x240: 0x49ae, 0x241: 0x49b3, 0x242: 0x9932, 0x243: 0x49b8, 0x244: 0x4a71, 0x245: 0x9936,
 	0x246: 0x8132, 0x247: 0x812d, 0x248: 0x812d, 0x249: 0x812d, 0x24a: 0x8132, 0x24b: 0x8132,
 	0x24c: 0x8132, 0x24d: 0x812d, 0x24e: 0x812d, 0x250: 0x8132, 0x251: 0x8132,
 	0x252: 0x8132, 0x253: 0x812d, 0x254: 0x812d, 0x255: 0x812d, 0x256: 0x812d, 0x257: 0x8132,
@@ -3017,7 +3021,7 @@ var nfcValues = [2944]uint16{
 	0x299: 0xa000,
 	0x29f: 0xa000, 0x2a1: 0xa000,
 	0x2a5: 0xa000, 0x2a9: 0xa000,
-	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x4894, 0x2ad: 0x3697, 0x2ae: 0x48be, 0x2af: 0x36a9,
+	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x47fe, 0x2ad: 0x3697, 0x2ae: 0x4828, 0x2af: 0x36a9,
 	0x2b0: 0x3e70, 0x2b1: 0xa000, 0x2b5: 0xa000,
 	0x2b7: 0xa000, 0x2b9: 0xa000,
 	0x2bf: 0xa000,
@@ -3069,341 +3073,353 @@ var nfcValues = [2944]uint16{
 	0x3fa: 0xa000, 0x3fb: 0x2d56,
 	0x3fc: 0xa000, 0x3fd: 0x2d5e, 0x3fe: 0xa000, 0x3ff: 0xa000,
 	// Block 0x10, offset 0x400
-	0x400: 0x2f97, 0x401: 0x32a3, 0x402: 0x2fa1, 0x403: 0x32ad, 0x404: 0x2fa6, 0x405: 0x32b2,
-	0x406: 0x2fab, 0x407: 0x32b7, 0x408: 0x38cc, 0x409: 0x3a5b, 0x40a: 0x2fc4, 0x40b: 0x32d0,
-	0x40c: 0x2fce, 0x40d: 0x32da, 0x40e: 0x2fdd, 0x40f: 0x32e9, 0x410: 0x2fd3, 0x411: 0x32df,
-	0x412: 0x2fd8, 0x413: 0x32e4, 0x414: 0x38ef, 0x415: 0x3a7e, 0x416: 0x38f6, 0x417: 0x3a85,
-	0x418: 0x3019, 0x419: 0x3325, 0x41a: 0x301e, 0x41b: 0x332a, 0x41c: 0x3904, 0x41d: 0x3a93,
-	0x41e: 0x3023, 0x41f: 0x332f, 0x420: 0x3032, 0x421: 0x333e, 0x422: 0x3050, 0x423: 0x335c,
-	0x424: 0x305f, 0x425: 0x336b, 0x426: 0x3055, 0x427: 0x3361, 0x428: 0x3064, 0x429: 0x3370,
-	0x42a: 0x3069, 0x42b: 0x3375, 0x42c: 0x30af, 0x42d: 0x33bb, 0x42e: 0x390b, 0x42f: 0x3a9a,
-	0x430: 0x30b9, 0x431: 0x33ca, 0x432: 0x30c3, 0x433: 0x33d4, 0x434: 0x30cd, 0x435: 0x33de,
-	0x436: 0x475a, 0x437: 0x47eb, 0x438: 0x3912, 0x439: 0x3aa1, 0x43a: 0x30e6, 0x43b: 0x33f7,
-	0x43c: 0x30e1, 0x43d: 0x33f2, 0x43e: 0x30eb, 0x43f: 0x33fc,
+	0x400: 0x8132, 0x401: 0x8132, 0x402: 0x812d, 0x403: 0x8132, 0x404: 0x8132, 0x405: 0x8132,
+	0x406: 0x8132, 0x407: 0x8132, 0x408: 0x8132, 0x409: 0x8132, 0x40a: 0x812d, 0x40b: 0x8132,
+	0x40c: 0x8132, 0x40d: 0x8135, 0x40e: 0x812a, 0x40f: 0x812d, 0x410: 0x8129, 0x411: 0x8132,
+	0x412: 0x8132, 0x413: 0x8132, 0x414: 0x8132, 0x415: 0x8132, 0x416: 0x8132, 0x417: 0x8132,
+	0x418: 0x8132, 0x419: 0x8132, 0x41a: 0x8132, 0x41b: 0x8132, 0x41c: 0x8132, 0x41d: 0x8132,
+	0x41e: 0x8132, 0x41f: 0x8132, 0x420: 0x8132, 0x421: 0x8132, 0x422: 0x8132, 0x423: 0x8132,
+	0x424: 0x8132, 0x425: 0x8132, 0x426: 0x8132, 0x427: 0x8132, 0x428: 0x8132, 0x429: 0x8132,
+	0x42a: 0x8132, 0x42b: 0x8132, 0x42c: 0x8132, 0x42d: 0x8132, 0x42e: 0x8132, 0x42f: 0x8132,
+	0x430: 0x8132, 0x431: 0x8132, 0x432: 0x8132, 0x433: 0x8132, 0x434: 0x8132, 0x435: 0x8132,
+	0x436: 0x8133, 0x437: 0x8131, 0x438: 0x8131, 0x439: 0x812d, 0x43b: 0x8132,
+	0x43c: 0x8134, 0x43d: 0x812d, 0x43e: 0x8132, 0x43f: 0x812d,
 	// Block 0x11, offset 0x440
-	0x440: 0x30f0, 0x441: 0x3401, 0x442: 0x30f5, 0x443: 0x3406, 0x444: 0x3109, 0x445: 0x341a,
-	0x446: 0x3113, 0x447: 0x3424, 0x448: 0x3122, 0x449: 0x3433, 0x44a: 0x311d, 0x44b: 0x342e,
-	0x44c: 0x3935, 0x44d: 0x3ac4, 0x44e: 0x3943, 0x44f: 0x3ad2, 0x450: 0x394a, 0x451: 0x3ad9,
-	0x452: 0x3951, 0x453: 0x3ae0, 0x454: 0x314f, 0x455: 0x3460, 0x456: 0x3154, 0x457: 0x3465,
-	0x458: 0x315e, 0x459: 0x346f, 0x45a: 0x4787, 0x45b: 0x4818, 0x45c: 0x3997, 0x45d: 0x3b26,
-	0x45e: 0x3177, 0x45f: 0x3488, 0x460: 0x3181, 0x461: 0x3492, 0x462: 0x4796, 0x463: 0x4827,
-	0x464: 0x399e, 0x465: 0x3b2d, 0x466: 0x39a5, 0x467: 0x3b34, 0x468: 0x39ac, 0x469: 0x3b3b,
-	0x46a: 0x3190, 0x46b: 0x34a1, 0x46c: 0x319a, 0x46d: 0x34b0, 0x46e: 0x31ae, 0x46f: 0x34c4,
-	0x470: 0x31a9, 0x471: 0x34bf, 0x472: 0x31ea, 0x473: 0x3500, 0x474: 0x31f9, 0x475: 0x350f,
-	0x476: 0x31f4, 0x477: 0x350a, 0x478: 0x39b3, 0x479: 0x3b42, 0x47a: 0x39ba, 0x47b: 0x3b49,
-	0x47c: 0x31fe, 0x47d: 0x3514, 0x47e: 0x3203, 0x47f: 0x3519,
+	0x440: 0x2f97, 0x441: 0x32a3, 0x442: 0x2fa1, 0x443: 0x32ad, 0x444: 0x2fa6, 0x445: 0x32b2,
+	0x446: 0x2fab, 0x447: 0x32b7, 0x448: 0x38cc, 0x449: 0x3a5b, 0x44a: 0x2fc4, 0x44b: 0x32d0,
+	0x44c: 0x2fce, 0x44d: 0x32da, 0x44e: 0x2fdd, 0x44f: 0x32e9, 0x450: 0x2fd3, 0x451: 0x32df,
+	0x452: 0x2fd8, 0x453: 0x32e4, 0x454: 0x38ef, 0x455: 0x3a7e, 0x456: 0x38f6, 0x457: 0x3a85,
+	0x458: 0x3019, 0x459: 0x3325, 0x45a: 0x301e, 0x45b: 0x332a, 0x45c: 0x3904, 0x45d: 0x3a93,
+	0x45e: 0x3023, 0x45f: 0x332f, 0x460: 0x3032, 0x461: 0x333e, 0x462: 0x3050, 0x463: 0x335c,
+	0x464: 0x305f, 0x465: 0x336b, 0x466: 0x3055, 0x467: 0x3361, 0x468: 0x3064, 0x469: 0x3370,
+	0x46a: 0x3069, 0x46b: 0x3375, 0x46c: 0x30af, 0x46d: 0x33bb, 0x46e: 0x390b, 0x46f: 0x3a9a,
+	0x470: 0x30b9, 0x471: 0x33ca, 0x472: 0x30c3, 0x473: 0x33d4, 0x474: 0x30cd, 0x475: 0x33de,
+	0x476: 0x46c4, 0x477: 0x4755, 0x478: 0x3912, 0x479: 0x3aa1, 0x47a: 0x30e6, 0x47b: 0x33f7,
+	0x47c: 0x30e1, 0x47d: 0x33f2, 0x47e: 0x30eb, 0x47f: 0x33fc,
 	// Block 0x12, offset 0x480
-	0x480: 0x3208, 0x481: 0x351e, 0x482: 0x320d, 0x483: 0x3523, 0x484: 0x321c, 0x485: 0x3532,
-	0x486: 0x3217, 0x487: 0x352d, 0x488: 0x3221, 0x489: 0x353c, 0x48a: 0x3226, 0x48b: 0x3541,
-	0x48c: 0x322b, 0x48d: 0x3546, 0x48e: 0x3249, 0x48f: 0x3564, 0x490: 0x3262, 0x491: 0x3582,
-	0x492: 0x3271, 0x493: 0x3591, 0x494: 0x3276, 0x495: 0x3596, 0x496: 0x337a, 0x497: 0x34a6,
-	0x498: 0x3537, 0x499: 0x3573, 0x49b: 0x35d1,
-	0x4a0: 0x4737, 0x4a1: 0x47c8, 0x4a2: 0x2f83, 0x4a3: 0x328f,
-	0x4a4: 0x3878, 0x4a5: 0x3a07, 0x4a6: 0x3871, 0x4a7: 0x3a00, 0x4a8: 0x3886, 0x4a9: 0x3a15,
-	0x4aa: 0x387f, 0x4ab: 0x3a0e, 0x4ac: 0x38be, 0x4ad: 0x3a4d, 0x4ae: 0x3894, 0x4af: 0x3a23,
-	0x4b0: 0x388d, 0x4b1: 0x3a1c, 0x4b2: 0x38a2, 0x4b3: 0x3a31, 0x4b4: 0x389b, 0x4b5: 0x3a2a,
-	0x4b6: 0x38c5, 0x4b7: 0x3a54, 0x4b8: 0x474b, 0x4b9: 0x47dc, 0x4ba: 0x3000, 0x4bb: 0x330c,
-	0x4bc: 0x2fec, 0x4bd: 0x32f8, 0x4be: 0x38da, 0x4bf: 0x3a69,
+	0x480: 0x30f0, 0x481: 0x3401, 0x482: 0x30f5, 0x483: 0x3406, 0x484: 0x3109, 0x485: 0x341a,
+	0x486: 0x3113, 0x487: 0x3424, 0x488: 0x3122, 0x489: 0x3433, 0x48a: 0x311d, 0x48b: 0x342e,
+	0x48c: 0x3935, 0x48d: 0x3ac4, 0x48e: 0x3943, 0x48f: 0x3ad2, 0x490: 0x394a, 0x491: 0x3ad9,
+	0x492: 0x3951, 0x493: 0x3ae0, 0x494: 0x314f, 0x495: 0x3460, 0x496: 0x3154, 0x497: 0x3465,
+	0x498: 0x315e, 0x499: 0x346f, 0x49a: 0x46f1, 0x49b: 0x4782, 0x49c: 0x3997, 0x49d: 0x3b26,
+	0x49e: 0x3177, 0x49f: 0x3488, 0x4a0: 0x3181, 0x4a1: 0x3492, 0x4a2: 0x4700, 0x4a3: 0x4791,
+	0x4a4: 0x399e, 0x4a5: 0x3b2d, 0x4a6: 0x39a5, 0x4a7: 0x3b34, 0x4a8: 0x39ac, 0x4a9: 0x3b3b,
+	0x4aa: 0x3190, 0x4ab: 0x34a1, 0x4ac: 0x319a, 0x4ad: 0x34b0, 0x4ae: 0x31ae, 0x4af: 0x34c4,
+	0x4b0: 0x31a9, 0x4b1: 0x34bf, 0x4b2: 0x31ea, 0x4b3: 0x3500, 0x4b4: 0x31f9, 0x4b5: 0x350f,
+	0x4b6: 0x31f4, 0x4b7: 0x350a, 0x4b8: 0x39b3, 0x4b9: 0x3b42, 0x4ba: 0x39ba, 0x4bb: 0x3b49,
+	0x4bc: 0x31fe, 0x4bd: 0x3514, 0x4be: 0x3203, 0x4bf: 0x3519,
 	// Block 0x13, offset 0x4c0
-	0x4c0: 0x38d3, 0x4c1: 0x3a62, 0x4c2: 0x38e8, 0x4c3: 0x3a77, 0x4c4: 0x38e1, 0x4c5: 0x3a70,
-	0x4c6: 0x38fd, 0x4c7: 0x3a8c, 0x4c8: 0x3091, 0x4c9: 0x339d, 0x4ca: 0x30a5, 0x4cb: 0x33b1,
-	0x4cc: 0x477d, 0x4cd: 0x480e, 0x4ce: 0x3136, 0x4cf: 0x3447, 0x4d0: 0x3920, 0x4d1: 0x3aaf,
-	0x4d2: 0x3919, 0x4d3: 0x3aa8, 0x4d4: 0x392e, 0x4d5: 0x3abd, 0x4d6: 0x3927, 0x4d7: 0x3ab6,
-	0x4d8: 0x3989, 0x4d9: 0x3b18, 0x4da: 0x396d, 0x4db: 0x3afc, 0x4dc: 0x3966, 0x4dd: 0x3af5,
-	0x4de: 0x397b, 0x4df: 0x3b0a, 0x4e0: 0x3974, 0x4e1: 0x3b03, 0x4e2: 0x3982, 0x4e3: 0x3b11,
-	0x4e4: 0x31e5, 0x4e5: 0x34fb, 0x4e6: 0x31c7, 0x4e7: 0x34dd, 0x4e8: 0x39e4, 0x4e9: 0x3b73,
-	0x4ea: 0x39dd, 0x4eb: 0x3b6c, 0x4ec: 0x39f2, 0x4ed: 0x3b81, 0x4ee: 0x39eb, 0x4ef: 0x3b7a,
-	0x4f0: 0x39f9, 0x4f1: 0x3b88, 0x4f2: 0x3230, 0x4f3: 0x354b, 0x4f4: 0x3258, 0x4f5: 0x3578,
-	0x4f6: 0x3253, 0x4f7: 0x356e, 0x4f8: 0x323f, 0x4f9: 0x355a,
+	0x4c0: 0x3208, 0x4c1: 0x351e, 0x4c2: 0x320d, 0x4c3: 0x3523, 0x4c4: 0x321c, 0x4c5: 0x3532,
+	0x4c6: 0x3217, 0x4c7: 0x352d, 0x4c8: 0x3221, 0x4c9: 0x353c, 0x4ca: 0x3226, 0x4cb: 0x3541,
+	0x4cc: 0x322b, 0x4cd: 0x3546, 0x4ce: 0x3249, 0x4cf: 0x3564, 0x4d0: 0x3262, 0x4d1: 0x3582,
+	0x4d2: 0x3271, 0x4d3: 0x3591, 0x4d4: 0x3276, 0x4d5: 0x3596, 0x4d6: 0x337a, 0x4d7: 0x34a6,
+	0x4d8: 0x3537, 0x4d9: 0x3573, 0x4db: 0x35d1,
+	0x4e0: 0x46a1, 0x4e1: 0x4732, 0x4e2: 0x2f83, 0x4e3: 0x328f,
+	0x4e4: 0x3878, 0x4e5: 0x3a07, 0x4e6: 0x3871, 0x4e7: 0x3a00, 0x4e8: 0x3886, 0x4e9: 0x3a15,
+	0x4ea: 0x387f, 0x4eb: 0x3a0e, 0x4ec: 0x38be, 0x4ed: 0x3a4d, 0x4ee: 0x3894, 0x4ef: 0x3a23,
+	0x4f0: 0x388d, 0x4f1: 0x3a1c, 0x4f2: 0x38a2, 0x4f3: 0x3a31, 0x4f4: 0x389b, 0x4f5: 0x3a2a,
+	0x4f6: 0x38c5, 0x4f7: 0x3a54, 0x4f8: 0x46b5, 0x4f9: 0x4746, 0x4fa: 0x3000, 0x4fb: 0x330c,
+	0x4fc: 0x2fec, 0x4fd: 0x32f8, 0x4fe: 0x38da, 0x4ff: 0x3a69,
 	// Block 0x14, offset 0x500
-	0x500: 0x489a, 0x501: 0x48a0, 0x502: 0x49b4, 0x503: 0x49cc, 0x504: 0x49bc, 0x505: 0x49d4,
-	0x506: 0x49c4, 0x507: 0x49dc, 0x508: 0x4840, 0x509: 0x4846, 0x50a: 0x4924, 0x50b: 0x493c,
-	0x50c: 0x492c, 0x50d: 0x4944, 0x50e: 0x4934, 0x50f: 0x494c, 0x510: 0x48ac, 0x511: 0x48b2,
-	0x512: 0x3db8, 0x513: 0x3dc8, 0x514: 0x3dc0, 0x515: 0x3dd0,
-	0x518: 0x484c, 0x519: 0x4852, 0x51a: 0x3ce8, 0x51b: 0x3cf8, 0x51c: 0x3cf0, 0x51d: 0x3d00,
-	0x520: 0x48c4, 0x521: 0x48ca, 0x522: 0x49e4, 0x523: 0x49fc,
-	0x524: 0x49ec, 0x525: 0x4a04, 0x526: 0x49f4, 0x527: 0x4a0c, 0x528: 0x4858, 0x529: 0x485e,
-	0x52a: 0x4954, 0x52b: 0x496c, 0x52c: 0x495c, 0x52d: 0x4974, 0x52e: 0x4964, 0x52f: 0x497c,
-	0x530: 0x48dc, 0x531: 0x48e2, 0x532: 0x3e18, 0x533: 0x3e30, 0x534: 0x3e20, 0x535: 0x3e38,
-	0x536: 0x3e28, 0x537: 0x3e40, 0x538: 0x4864, 0x539: 0x486a, 0x53a: 0x3d18, 0x53b: 0x3d30,
-	0x53c: 0x3d20, 0x53d: 0x3d38, 0x53e: 0x3d28, 0x53f: 0x3d40,
+	0x500: 0x38d3, 0x501: 0x3a62, 0x502: 0x38e8, 0x503: 0x3a77, 0x504: 0x38e1, 0x505: 0x3a70,
+	0x506: 0x38fd, 0x507: 0x3a8c, 0x508: 0x3091, 0x509: 0x339d, 0x50a: 0x30a5, 0x50b: 0x33b1,
+	0x50c: 0x46e7, 0x50d: 0x4778, 0x50e: 0x3136, 0x50f: 0x3447, 0x510: 0x3920, 0x511: 0x3aaf,
+	0x512: 0x3919, 0x513: 0x3aa8, 0x514: 0x392e, 0x515: 0x3abd, 0x516: 0x3927, 0x517: 0x3ab6,
+	0x518: 0x3989, 0x519: 0x3b18, 0x51a: 0x396d, 0x51b: 0x3afc, 0x51c: 0x3966, 0x51d: 0x3af5,
+	0x51e: 0x397b, 0x51f: 0x3b0a, 0x520: 0x3974, 0x521: 0x3b03, 0x522: 0x3982, 0x523: 0x3b11,
+	0x524: 0x31e5, 0x525: 0x34fb, 0x526: 0x31c7, 0x527: 0x34dd, 0x528: 0x39e4, 0x529: 0x3b73,
+	0x52a: 0x39dd, 0x52b: 0x3b6c, 0x52c: 0x39f2, 0x52d: 0x3b81, 0x52e: 0x39eb, 0x52f: 0x3b7a,
+	0x530: 0x39f9, 0x531: 0x3b88, 0x532: 0x3230, 0x533: 0x354b, 0x534: 0x3258, 0x535: 0x3578,
+	0x536: 0x3253, 0x537: 0x356e, 0x538: 0x323f, 0x539: 0x355a,
 	// Block 0x15, offset 0x540
-	0x540: 0x48e8, 0x541: 0x48ee, 0x542: 0x3e48, 0x543: 0x3e58, 0x544: 0x3e50, 0x545: 0x3e60,
-	0x548: 0x4870, 0x549: 0x4876, 0x54a: 0x3d48, 0x54b: 0x3d58,
-	0x54c: 0x3d50, 0x54d: 0x3d60, 0x550: 0x48fa, 0x551: 0x4900,
-	0x552: 0x3e80, 0x553: 0x3e98, 0x554: 0x3e88, 0x555: 0x3ea0, 0x556: 0x3e90, 0x557: 0x3ea8,
-	0x559: 0x487c, 0x55b: 0x3d68, 0x55d: 0x3d70,
-	0x55f: 0x3d78, 0x560: 0x4912, 0x561: 0x4918, 0x562: 0x4a14, 0x563: 0x4a2c,
-	0x564: 0x4a1c, 0x565: 0x4a34, 0x566: 0x4a24, 0x567: 0x4a3c, 0x568: 0x4882, 0x569: 0x4888,
-	0x56a: 0x4984, 0x56b: 0x499c, 0x56c: 0x498c, 0x56d: 0x49a4, 0x56e: 0x4994, 0x56f: 0x49ac,
-	0x570: 0x488e, 0x571: 0x43b4, 0x572: 0x3691, 0x573: 0x43ba, 0x574: 0x48b8, 0x575: 0x43c0,
-	0x576: 0x36a3, 0x577: 0x43c6, 0x578: 0x36c1, 0x579: 0x43cc, 0x57a: 0x36d9, 0x57b: 0x43d2,
-	0x57c: 0x4906, 0x57d: 0x43d8,
+	0x540: 0x4804, 0x541: 0x480a, 0x542: 0x491e, 0x543: 0x4936, 0x544: 0x4926, 0x545: 0x493e,
+	0x546: 0x492e, 0x547: 0x4946, 0x548: 0x47aa, 0x549: 0x47b0, 0x54a: 0x488e, 0x54b: 0x48a6,
+	0x54c: 0x4896, 0x54d: 0x48ae, 0x54e: 0x489e, 0x54f: 0x48b6, 0x550: 0x4816, 0x551: 0x481c,
+	0x552: 0x3db8, 0x553: 0x3dc8, 0x554: 0x3dc0, 0x555: 0x3dd0,
+	0x558: 0x47b6, 0x559: 0x47bc, 0x55a: 0x3ce8, 0x55b: 0x3cf8, 0x55c: 0x3cf0, 0x55d: 0x3d00,
+	0x560: 0x482e, 0x561: 0x4834, 0x562: 0x494e, 0x563: 0x4966,
+	0x564: 0x4956, 0x565: 0x496e, 0x566: 0x495e, 0x567: 0x4976, 0x568: 0x47c2, 0x569: 0x47c8,
+	0x56a: 0x48be, 0x56b: 0x48d6, 0x56c: 0x48c6, 0x56d: 0x48de, 0x56e: 0x48ce, 0x56f: 0x48e6,
+	0x570: 0x4846, 0x571: 0x484c, 0x572: 0x3e18, 0x573: 0x3e30, 0x574: 0x3e20, 0x575: 0x3e38,
+	0x576: 0x3e28, 0x577: 0x3e40, 0x578: 0x47ce, 0x579: 0x47d4, 0x57a: 0x3d18, 0x57b: 0x3d30,
+	0x57c: 0x3d20, 0x57d: 0x3d38, 0x57e: 0x3d28, 0x57f: 0x3d40,
 	// Block 0x16, offset 0x580
-	0x580: 0x3da0, 0x581: 0x3da8, 0x582: 0x4184, 0x583: 0x41a2, 0x584: 0x418e, 0x585: 0x41ac,
-	0x586: 0x4198, 0x587: 0x41b6, 0x588: 0x3cd8, 0x589: 0x3ce0, 0x58a: 0x40d0, 0x58b: 0x40ee,
-	0x58c: 0x40da, 0x58d: 0x40f8, 0x58e: 0x40e4, 0x58f: 0x4102, 0x590: 0x3de8, 0x591: 0x3df0,
-	0x592: 0x41c0, 0x593: 0x41de, 0x594: 0x41ca, 0x595: 0x41e8, 0x596: 0x41d4, 0x597: 0x41f2,
-	0x598: 0x3d08, 0x599: 0x3d10, 0x59a: 0x410c, 0x59b: 0x412a, 0x59c: 0x4116, 0x59d: 0x4134,
-	0x59e: 0x4120, 0x59f: 0x413e, 0x5a0: 0x3ec0, 0x5a1: 0x3ec8, 0x5a2: 0x41fc, 0x5a3: 0x421a,
-	0x5a4: 0x4206, 0x5a5: 0x4224, 0x5a6: 0x4210, 0x5a7: 0x422e, 0x5a8: 0x3d80, 0x5a9: 0x3d88,
-	0x5aa: 0x4148, 0x5ab: 0x4166, 0x5ac: 0x4152, 0x5ad: 0x4170, 0x5ae: 0x415c, 0x5af: 0x417a,
-	0x5b0: 0x3685, 0x5b1: 0x367f, 0x5b2: 0x3d90, 0x5b3: 0x368b, 0x5b4: 0x3d98,
-	0x5b6: 0x48a6, 0x5b7: 0x3db0, 0x5b8: 0x35f5, 0x5b9: 0x35ef, 0x5ba: 0x35e3, 0x5bb: 0x4384,
-	0x5bc: 0x35fb, 0x5bd: 0x8100, 0x5be: 0x01d3, 0x5bf: 0xa100,
+	0x580: 0x4852, 0x581: 0x4858, 0x582: 0x3e48, 0x583: 0x3e58, 0x584: 0x3e50, 0x585: 0x3e60,
+	0x588: 0x47da, 0x589: 0x47e0, 0x58a: 0x3d48, 0x58b: 0x3d58,
+	0x58c: 0x3d50, 0x58d: 0x3d60, 0x590: 0x4864, 0x591: 0x486a,
+	0x592: 0x3e80, 0x593: 0x3e98, 0x594: 0x3e88, 0x595: 0x3ea0, 0x596: 0x3e90, 0x597: 0x3ea8,
+	0x599: 0x47e6, 0x59b: 0x3d68, 0x59d: 0x3d70,
+	0x59f: 0x3d78, 0x5a0: 0x487c, 0x5a1: 0x4882, 0x5a2: 0x497e, 0x5a3: 0x4996,
+	0x5a4: 0x4986, 0x5a5: 0x499e, 0x5a6: 0x498e, 0x5a7: 0x49a6, 0x5a8: 0x47ec, 0x5a9: 0x47f2,
+	0x5aa: 0x48ee, 0x5ab: 0x4906, 0x5ac: 0x48f6, 0x5ad: 0x490e, 0x5ae: 0x48fe, 0x5af: 0x4916,
+	0x5b0: 0x47f8, 0x5b1: 0x431e, 0x5b2: 0x3691, 0x5b3: 0x4324, 0x5b4: 0x4822, 0x5b5: 0x432a,
+	0x5b6: 0x36a3, 0x5b7: 0x4330, 0x5b8: 0x36c1, 0x5b9: 0x4336, 0x5ba: 0x36d9, 0x5bb: 0x433c,
+	0x5bc: 0x4870, 0x5bd: 0x4342,
 	// Block 0x17, offset 0x5c0
-	0x5c0: 0x8100, 0x5c1: 0x35a7, 0x5c2: 0x3dd8, 0x5c3: 0x369d, 0x5c4: 0x3de0,
-	0x5c6: 0x48d0, 0x5c7: 0x3df8, 0x5c8: 0x3601, 0x5c9: 0x438a, 0x5ca: 0x360d, 0x5cb: 0x4390,
-	0x5cc: 0x3619, 0x5cd: 0x3b8f, 0x5ce: 0x3b96, 0x5cf: 0x3b9d, 0x5d0: 0x36b5, 0x5d1: 0x36af,
-	0x5d2: 0x3e00, 0x5d3: 0x457a, 0x5d6: 0x36bb, 0x5d7: 0x3e10,
-	0x5d8: 0x3631, 0x5d9: 0x362b, 0x5da: 0x361f, 0x5db: 0x4396, 0x5dd: 0x3ba4,
-	0x5de: 0x3bab, 0x5df: 0x3bb2, 0x5e0: 0x36eb, 0x5e1: 0x36e5, 0x5e2: 0x3e68, 0x5e3: 0x4582,
-	0x5e4: 0x36cd, 0x5e5: 0x36d3, 0x5e6: 0x36f1, 0x5e7: 0x3e78, 0x5e8: 0x3661, 0x5e9: 0x365b,
-	0x5ea: 0x364f, 0x5eb: 0x43a2, 0x5ec: 0x3649, 0x5ed: 0x359b, 0x5ee: 0x437e, 0x5ef: 0x0081,
-	0x5f2: 0x3eb0, 0x5f3: 0x36f7, 0x5f4: 0x3eb8,
-	0x5f6: 0x491e, 0x5f7: 0x3ed0, 0x5f8: 0x363d, 0x5f9: 0x439c, 0x5fa: 0x366d, 0x5fb: 0x43ae,
-	0x5fc: 0x3679, 0x5fd: 0x4256, 0x5fe: 0xa100,
+	0x5c0: 0x3da0, 0x5c1: 0x3da8, 0x5c2: 0x4184, 0x5c3: 0x41a2, 0x5c4: 0x418e, 0x5c5: 0x41ac,
+	0x5c6: 0x4198, 0x5c7: 0x41b6, 0x5c8: 0x3cd8, 0x5c9: 0x3ce0, 0x5ca: 0x40d0, 0x5cb: 0x40ee,
+	0x5cc: 0x40da, 0x5cd: 0x40f8, 0x5ce: 0x40e4, 0x5cf: 0x4102, 0x5d0: 0x3de8, 0x5d1: 0x3df0,
+	0x5d2: 0x41c0, 0x5d3: 0x41de, 0x5d4: 0x41ca, 0x5d5: 0x41e8, 0x5d6: 0x41d4, 0x5d7: 0x41f2,
+	0x5d8: 0x3d08, 0x5d9: 0x3d10, 0x5da: 0x410c, 0x5db: 0x412a, 0x5dc: 0x4116, 0x5dd: 0x4134,
+	0x5de: 0x4120, 0x5df: 0x413e, 0x5e0: 0x3ec0, 0x5e1: 0x3ec8, 0x5e2: 0x41fc, 0x5e3: 0x421a,
+	0x5e4: 0x4206, 0x5e5: 0x4224, 0x5e6: 0x4210, 0x5e7: 0x422e, 0x5e8: 0x3d80, 0x5e9: 0x3d88,
+	0x5ea: 0x4148, 0x5eb: 0x4166, 0x5ec: 0x4152, 0x5ed: 0x4170, 0x5ee: 0x415c, 0x5ef: 0x417a,
+	0x5f0: 0x3685, 0x5f1: 0x367f, 0x5f2: 0x3d90, 0x5f3: 0x368b, 0x5f4: 0x3d98,
+	0x5f6: 0x4810, 0x5f7: 0x3db0, 0x5f8: 0x35f5, 0x5f9: 0x35ef, 0x5fa: 0x35e3, 0x5fb: 0x42ee,
+	0x5fc: 0x35fb, 0x5fd: 0x8100, 0x5fe: 0x01d3, 0x5ff: 0xa100,
 	// Block 0x18, offset 0x600
-	0x601: 0x3c06, 0x603: 0xa000, 0x604: 0x3c0d, 0x605: 0xa000,
-	0x607: 0x3c14, 0x608: 0xa000, 0x609: 0x3c1b,
-	0x60d: 0xa000,
-	0x620: 0x2f65, 0x621: 0xa000, 0x622: 0x3c29,
-	0x624: 0xa000, 0x625: 0xa000,
-	0x62d: 0x3c22, 0x62e: 0x2f60, 0x62f: 0x2f6a,
-	0x630: 0x3c30, 0x631: 0x3c37, 0x632: 0xa000, 0x633: 0xa000, 0x634: 0x3c3e, 0x635: 0x3c45,
-	0x636: 0xa000, 0x637: 0xa000, 0x638: 0x3c4c, 0x639: 0x3c53, 0x63a: 0xa000, 0x63b: 0xa000,
-	0x63c: 0xa000, 0x63d: 0xa000,
+	0x600: 0x8100, 0x601: 0x35a7, 0x602: 0x3dd8, 0x603: 0x369d, 0x604: 0x3de0,
+	0x606: 0x483a, 0x607: 0x3df8, 0x608: 0x3601, 0x609: 0x42f4, 0x60a: 0x360d, 0x60b: 0x42fa,
+	0x60c: 0x3619, 0x60d: 0x3b8f, 0x60e: 0x3b96, 0x60f: 0x3b9d, 0x610: 0x36b5, 0x611: 0x36af,
+	0x612: 0x3e00, 0x613: 0x44e4, 0x616: 0x36bb, 0x617: 0x3e10,
+	0x618: 0x3631, 0x619: 0x362b, 0x61a: 0x361f, 0x61b: 0x4300, 0x61d: 0x3ba4,
+	0x61e: 0x3bab, 0x61f: 0x3bb2, 0x620: 0x36eb, 0x621: 0x36e5, 0x622: 0x3e68, 0x623: 0x44ec,
+	0x624: 0x36cd, 0x625: 0x36d3, 0x626: 0x36f1, 0x627: 0x3e78, 0x628: 0x3661, 0x629: 0x365b,
+	0x62a: 0x364f, 0x62b: 0x430c, 0x62c: 0x3649, 0x62d: 0x359b, 0x62e: 0x42e8, 0x62f: 0x0081,
+	0x632: 0x3eb0, 0x633: 0x36f7, 0x634: 0x3eb8,
+	0x636: 0x4888, 0x637: 0x3ed0, 0x638: 0x363d, 0x639: 0x4306, 0x63a: 0x366d, 0x63b: 0x4318,
+	0x63c: 0x3679, 0x63d: 0x4256, 0x63e: 0xa100,
 	// Block 0x19, offset 0x640
-	0x640: 0x3c5a, 0x641: 0x3c61, 0x642: 0xa000, 0x643: 0xa000, 0x644: 0x3c76, 0x645: 0x3c7d,
-	0x646: 0xa000, 0x647: 0xa000, 0x648: 0x3c84, 0x649: 0x3c8b,
-	0x651: 0xa000,
-	0x652: 0xa000,
-	0x662: 0xa000,
-	0x668: 0xa000, 0x669: 0xa000,
-	0x66b: 0xa000, 0x66c: 0x3ca0, 0x66d: 0x3ca7, 0x66e: 0x3cae, 0x66f: 0x3cb5,
-	0x672: 0xa000, 0x673: 0xa000, 0x674: 0xa000, 0x675: 0xa000,
+	0x641: 0x3c06, 0x643: 0xa000, 0x644: 0x3c0d, 0x645: 0xa000,
+	0x647: 0x3c14, 0x648: 0xa000, 0x649: 0x3c1b,
+	0x64d: 0xa000,
+	0x660: 0x2f65, 0x661: 0xa000, 0x662: 0x3c29,
+	0x664: 0xa000, 0x665: 0xa000,
+	0x66d: 0x3c22, 0x66e: 0x2f60, 0x66f: 0x2f6a,
+	0x670: 0x3c30, 0x671: 0x3c37, 0x672: 0xa000, 0x673: 0xa000, 0x674: 0x3c3e, 0x675: 0x3c45,
+	0x676: 0xa000, 0x677: 0xa000, 0x678: 0x3c4c, 0x679: 0x3c53, 0x67a: 0xa000, 0x67b: 0xa000,
+	0x67c: 0xa000, 0x67d: 0xa000,
 	// Block 0x1a, offset 0x680
-	0x686: 0xa000, 0x68b: 0xa000,
-	0x68c: 0x3f08, 0x68d: 0xa000, 0x68e: 0x3f10, 0x68f: 0xa000, 0x690: 0x3f18, 0x691: 0xa000,
-	0x692: 0x3f20, 0x693: 0xa000, 0x694: 0x3f28, 0x695: 0xa000, 0x696: 0x3f30, 0x697: 0xa000,
-	0x698: 0x3f38, 0x699: 0xa000, 0x69a: 0x3f40, 0x69b: 0xa000, 0x69c: 0x3f48, 0x69d: 0xa000,
-	0x69e: 0x3f50, 0x69f: 0xa000, 0x6a0: 0x3f58, 0x6a1: 0xa000, 0x6a2: 0x3f60,
-	0x6a4: 0xa000, 0x6a5: 0x3f68, 0x6a6: 0xa000, 0x6a7: 0x3f70, 0x6a8: 0xa000, 0x6a9: 0x3f78,
-	0x6af: 0xa000,
-	0x6b0: 0x3f80, 0x6b1: 0x3f88, 0x6b2: 0xa000, 0x6b3: 0x3f90, 0x6b4: 0x3f98, 0x6b5: 0xa000,
-	0x6b6: 0x3fa0, 0x6b7: 0x3fa8, 0x6b8: 0xa000, 0x6b9: 0x3fb0, 0x6ba: 0x3fb8, 0x6bb: 0xa000,
-	0x6bc: 0x3fc0, 0x6bd: 0x3fc8,
+	0x680: 0x3c5a, 0x681: 0x3c61, 0x682: 0xa000, 0x683: 0xa000, 0x684: 0x3c76, 0x685: 0x3c7d,
+	0x686: 0xa000, 0x687: 0xa000, 0x688: 0x3c84, 0x689: 0x3c8b,
+	0x691: 0xa000,
+	0x692: 0xa000,
+	0x6a2: 0xa000,
+	0x6a8: 0xa000, 0x6a9: 0xa000,
+	0x6ab: 0xa000, 0x6ac: 0x3ca0, 0x6ad: 0x3ca7, 0x6ae: 0x3cae, 0x6af: 0x3cb5,
+	0x6b2: 0xa000, 0x6b3: 0xa000, 0x6b4: 0xa000, 0x6b5: 0xa000,
 	// Block 0x1b, offset 0x6c0
-	0x6d4: 0x3f00,
-	0x6d9: 0x9903, 0x6da: 0x9903, 0x6db: 0x8100, 0x6dc: 0x8100, 0x6dd: 0xa000,
-	0x6de: 0x3fd0,
-	0x6e6: 0xa000,
-	0x6eb: 0xa000, 0x6ec: 0x3fe0, 0x6ed: 0xa000, 0x6ee: 0x3fe8, 0x6ef: 0xa000,
-	0x6f0: 0x3ff0, 0x6f1: 0xa000, 0x6f2: 0x3ff8, 0x6f3: 0xa000, 0x6f4: 0x4000, 0x6f5: 0xa000,
-	0x6f6: 0x4008, 0x6f7: 0xa000, 0x6f8: 0x4010, 0x6f9: 0xa000, 0x6fa: 0x4018, 0x6fb: 0xa000,
-	0x6fc: 0x4020, 0x6fd: 0xa000, 0x6fe: 0x4028, 0x6ff: 0xa000,
+	0x6c6: 0xa000, 0x6cb: 0xa000,
+	0x6cc: 0x3f08, 0x6cd: 0xa000, 0x6ce: 0x3f10, 0x6cf: 0xa000, 0x6d0: 0x3f18, 0x6d1: 0xa000,
+	0x6d2: 0x3f20, 0x6d3: 0xa000, 0x6d4: 0x3f28, 0x6d5: 0xa000, 0x6d6: 0x3f30, 0x6d7: 0xa000,
+	0x6d8: 0x3f38, 0x6d9: 0xa000, 0x6da: 0x3f40, 0x6db: 0xa000, 0x6dc: 0x3f48, 0x6dd: 0xa000,
+	0x6de: 0x3f50, 0x6df: 0xa000, 0x6e0: 0x3f58, 0x6e1: 0xa000, 0x6e2: 0x3f60,
+	0x6e4: 0xa000, 0x6e5: 0x3f68, 0x6e6: 0xa000, 0x6e7: 0x3f70, 0x6e8: 0xa000, 0x6e9: 0x3f78,
+	0x6ef: 0xa000,
+	0x6f0: 0x3f80, 0x6f1: 0x3f88, 0x6f2: 0xa000, 0x6f3: 0x3f90, 0x6f4: 0x3f98, 0x6f5: 0xa000,
+	0x6f6: 0x3fa0, 0x6f7: 0x3fa8, 0x6f8: 0xa000, 0x6f9: 0x3fb0, 0x6fa: 0x3fb8, 0x6fb: 0xa000,
+	0x6fc: 0x3fc0, 0x6fd: 0x3fc8,
 	// Block 0x1c, offset 0x700
-	0x700: 0x4030, 0x701: 0xa000, 0x702: 0x4038, 0x704: 0xa000, 0x705: 0x4040,
-	0x706: 0xa000, 0x707: 0x4048, 0x708: 0xa000, 0x709: 0x4050,
-	0x70f: 0xa000, 0x710: 0x4058, 0x711: 0x4060,
-	0x712: 0xa000, 0x713: 0x4068, 0x714: 0x4070, 0x715: 0xa000, 0x716: 0x4078, 0x717: 0x4080,
-	0x718: 0xa000, 0x719: 0x4088, 0x71a: 0x4090, 0x71b: 0xa000, 0x71c: 0x4098, 0x71d: 0x40a0,
-	0x72f: 0xa000,
-	0x730: 0xa000, 0x731: 0xa000, 0x732: 0xa000, 0x734: 0x3fd8,
-	0x737: 0x40a8, 0x738: 0x40b0, 0x739: 0x40b8, 0x73a: 0x40c0,
-	0x73d: 0xa000, 0x73e: 0x40c8,
+	0x714: 0x3f00,
+	0x719: 0x9903, 0x71a: 0x9903, 0x71b: 0x8100, 0x71c: 0x8100, 0x71d: 0xa000,
+	0x71e: 0x3fd0,
+	0x726: 0xa000,
+	0x72b: 0xa000, 0x72c: 0x3fe0, 0x72d: 0xa000, 0x72e: 0x3fe8, 0x72f: 0xa000,
+	0x730: 0x3ff0, 0x731: 0xa000, 0x732: 0x3ff8, 0x733: 0xa000, 0x734: 0x4000, 0x735: 0xa000,
+	0x736: 0x4008, 0x737: 0xa000, 0x738: 0x4010, 0x739: 0xa000, 0x73a: 0x4018, 0x73b: 0xa000,
+	0x73c: 0x4020, 0x73d: 0xa000, 0x73e: 0x4028, 0x73f: 0xa000,
 	// Block 0x1d, offset 0x740
-	0x740: 0x1377, 0x741: 0x0cfb, 0x742: 0x13d3, 0x743: 0x139f, 0x744: 0x0e57, 0x745: 0x06eb,
-	0x746: 0x08df, 0x747: 0x162b, 0x748: 0x162b, 0x749: 0x0a0b, 0x74a: 0x145f, 0x74b: 0x0943,
-	0x74c: 0x0a07, 0x74d: 0x0bef, 0x74e: 0x0fcf, 0x74f: 0x115f, 0x750: 0x1297, 0x751: 0x12d3,
-	0x752: 0x1307, 0x753: 0x141b, 0x754: 0x0d73, 0x755: 0x0dff, 0x756: 0x0eab, 0x757: 0x0f43,
-	0x758: 0x125f, 0x759: 0x1447, 0x75a: 0x1573, 0x75b: 0x070f, 0x75c: 0x08b3, 0x75d: 0x0d87,
-	0x75e: 0x0ecf, 0x75f: 0x1293, 0x760: 0x15c3, 0x761: 0x0ab3, 0x762: 0x0e77, 0x763: 0x1283,
-	0x764: 0x1317, 0x765: 0x0c23, 0x766: 0x11bb, 0x767: 0x12df, 0x768: 0x0b1f, 0x769: 0x0d0f,
-	0x76a: 0x0e17, 0x76b: 0x0f1b, 0x76c: 0x1427, 0x76d: 0x074f, 0x76e: 0x07e7, 0x76f: 0x0853,
-	0x770: 0x0c8b, 0x771: 0x0d7f, 0x772: 0x0ecb, 0x773: 0x0fef, 0x774: 0x1177, 0x775: 0x128b,
-	0x776: 0x12a3, 0x777: 0x13c7, 0x778: 0x14ef, 0x779: 0x15a3, 0x77a: 0x15bf, 0x77b: 0x102b,
-	0x77c: 0x106b, 0x77d: 0x1123, 0x77e: 0x1243, 0x77f: 0x147b,
+	0x740: 0x4030, 0x741: 0xa000, 0x742: 0x4038, 0x744: 0xa000, 0x745: 0x4040,
+	0x746: 0xa000, 0x747: 0x4048, 0x748: 0xa000, 0x749: 0x4050,
+	0x74f: 0xa000, 0x750: 0x4058, 0x751: 0x4060,
+	0x752: 0xa000, 0x753: 0x4068, 0x754: 0x4070, 0x755: 0xa000, 0x756: 0x4078, 0x757: 0x4080,
+	0x758: 0xa000, 0x759: 0x4088, 0x75a: 0x4090, 0x75b: 0xa000, 0x75c: 0x4098, 0x75d: 0x40a0,
+	0x76f: 0xa000,
+	0x770: 0xa000, 0x771: 0xa000, 0x772: 0xa000, 0x774: 0x3fd8,
+	0x777: 0x40a8, 0x778: 0x40b0, 0x779: 0x40b8, 0x77a: 0x40c0,
+	0x77d: 0xa000, 0x77e: 0x40c8,
 	// Block 0x1e, offset 0x780
-	0x780: 0x15cb, 0x781: 0x134b, 0x782: 0x09c7, 0x783: 0x0b3b, 0x784: 0x10db, 0x785: 0x119b,
-	0x786: 0x0eff, 0x787: 0x1033, 0x788: 0x1397, 0x789: 0x14e7, 0x78a: 0x09c3, 0x78b: 0x0a8f,
-	0x78c: 0x0d77, 0x78d: 0x0e2b, 0x78e: 0x0e5f, 0x78f: 0x1113, 0x790: 0x113b, 0x791: 0x14a7,
-	0x792: 0x084f, 0x793: 0x11a7, 0x794: 0x07f3, 0x795: 0x07ef, 0x796: 0x1097, 0x797: 0x1127,
-	0x798: 0x125b, 0x799: 0x14af, 0x79a: 0x1367, 0x79b: 0x0c27, 0x79c: 0x0d73, 0x79d: 0x1357,
-	0x79e: 0x06f7, 0x79f: 0x0a63, 0x7a0: 0x0b93, 0x7a1: 0x0f2f, 0x7a2: 0x0faf, 0x7a3: 0x0873,
-	0x7a4: 0x103b, 0x7a5: 0x075f, 0x7a6: 0x0b77, 0x7a7: 0x06d7, 0x7a8: 0x0deb, 0x7a9: 0x0ca3,
-	0x7aa: 0x110f, 0x7ab: 0x08c7, 0x7ac: 0x09b3, 0x7ad: 0x0ffb, 0x7ae: 0x1263, 0x7af: 0x133b,
-	0x7b0: 0x0db7, 0x7b1: 0x13f7, 0x7b2: 0x0de3, 0x7b3: 0x0c37, 0x7b4: 0x121b, 0x7b5: 0x0c57,
-	0x7b6: 0x0fab, 0x7b7: 0x072b, 0x7b8: 0x07a7, 0x7b9: 0x07eb, 0x7ba: 0x0d53, 0x7bb: 0x10fb,
-	0x7bc: 0x11f3, 0x7bd: 0x1347, 0x7be: 0x145b, 0x7bf: 0x085b,
+	0x780: 0x1377, 0x781: 0x0cfb, 0x782: 0x13d3, 0x783: 0x139f, 0x784: 0x0e57, 0x785: 0x06eb,
+	0x786: 0x08df, 0x787: 0x162b, 0x788: 0x162b, 0x789: 0x0a0b, 0x78a: 0x145f, 0x78b: 0x0943,
+	0x78c: 0x0a07, 0x78d: 0x0bef, 0x78e: 0x0fcf, 0x78f: 0x115f, 0x790: 0x1297, 0x791: 0x12d3,
+	0x792: 0x1307, 0x793: 0x141b, 0x794: 0x0d73, 0x795: 0x0dff, 0x796: 0x0eab, 0x797: 0x0f43,
+	0x798: 0x125f, 0x799: 0x1447, 0x79a: 0x1573, 0x79b: 0x070f, 0x79c: 0x08b3, 0x79d: 0x0d87,
+	0x79e: 0x0ecf, 0x79f: 0x1293, 0x7a0: 0x15c3, 0x7a1: 0x0ab3, 0x7a2: 0x0e77, 0x7a3: 0x1283,
+	0x7a4: 0x1317, 0x7a5: 0x0c23, 0x7a6: 0x11bb, 0x7a7: 0x12df, 0x7a8: 0x0b1f, 0x7a9: 0x0d0f,
+	0x7aa: 0x0e17, 0x7ab: 0x0f1b, 0x7ac: 0x1427, 0x7ad: 0x074f, 0x7ae: 0x07e7, 0x7af: 0x0853,
+	0x7b0: 0x0c8b, 0x7b1: 0x0d7f, 0x7b2: 0x0ecb, 0x7b3: 0x0fef, 0x7b4: 0x1177, 0x7b5: 0x128b,
+	0x7b6: 0x12a3, 0x7b7: 0x13c7, 0x7b8: 0x14ef, 0x7b9: 0x15a3, 0x7ba: 0x15bf, 0x7bb: 0x102b,
+	0x7bc: 0x106b, 0x7bd: 0x1123, 0x7be: 0x1243, 0x7bf: 0x147b,
 	// Block 0x1f, offset 0x7c0
-	0x7c0: 0x090f, 0x7c1: 0x0a17, 0x7c2: 0x0b2f, 0x7c3: 0x0cbf, 0x7c4: 0x0e7b, 0x7c5: 0x103f,
-	0x7c6: 0x1497, 0x7c7: 0x157b, 0x7c8: 0x15cf, 0x7c9: 0x15e7, 0x7ca: 0x0837, 0x7cb: 0x0cf3,
-	0x7cc: 0x0da3, 0x7cd: 0x13eb, 0x7ce: 0x0afb, 0x7cf: 0x0bd7, 0x7d0: 0x0bf3, 0x7d1: 0x0c83,
-	0x7d2: 0x0e6b, 0x7d3: 0x0eb7, 0x7d4: 0x0f67, 0x7d5: 0x108b, 0x7d6: 0x112f, 0x7d7: 0x1193,
-	0x7d8: 0x13db, 0x7d9: 0x126b, 0x7da: 0x1403, 0x7db: 0x147f, 0x7dc: 0x080f, 0x7dd: 0x083b,
-	0x7de: 0x0923, 0x7df: 0x0ea7, 0x7e0: 0x12f3, 0x7e1: 0x133b, 0x7e2: 0x0b1b, 0x7e3: 0x0b8b,
-	0x7e4: 0x0c4f, 0x7e5: 0x0daf, 0x7e6: 0x10d7, 0x7e7: 0x0f23, 0x7e8: 0x073b, 0x7e9: 0x097f,
-	0x7ea: 0x0a63, 0x7eb: 0x0ac7, 0x7ec: 0x0b97, 0x7ed: 0x0f3f, 0x7ee: 0x0f5b, 0x7ef: 0x116b,
-	0x7f0: 0x118b, 0x7f1: 0x1463, 0x7f2: 0x14e3, 0x7f3: 0x14f3, 0x7f4: 0x152f, 0x7f5: 0x0753,
-	0x7f6: 0x107f, 0x7f7: 0x144f, 0x7f8: 0x14cb, 0x7f9: 0x0baf, 0x7fa: 0x0717, 0x7fb: 0x0777,
-	0x7fc: 0x0a67, 0x7fd: 0x0a87, 0x7fe: 0x0caf, 0x7ff: 0x0d73,
+	0x7c0: 0x15cb, 0x7c1: 0x134b, 0x7c2: 0x09c7, 0x7c3: 0x0b3b, 0x7c4: 0x10db, 0x7c5: 0x119b,
+	0x7c6: 0x0eff, 0x7c7: 0x1033, 0x7c8: 0x1397, 0x7c9: 0x14e7, 0x7ca: 0x09c3, 0x7cb: 0x0a8f,
+	0x7cc: 0x0d77, 0x7cd: 0x0e2b, 0x7ce: 0x0e5f, 0x7cf: 0x1113, 0x7d0: 0x113b, 0x7d1: 0x14a7,
+	0x7d2: 0x084f, 0x7d3: 0x11a7, 0x7d4: 0x07f3, 0x7d5: 0x07ef, 0x7d6: 0x1097, 0x7d7: 0x1127,
+	0x7d8: 0x125b, 0x7d9: 0x14af, 0x7da: 0x1367, 0x7db: 0x0c27, 0x7dc: 0x0d73, 0x7dd: 0x1357,
+	0x7de: 0x06f7, 0x7df: 0x0a63, 0x7e0: 0x0b93, 0x7e1: 0x0f2f, 0x7e2: 0x0faf, 0x7e3: 0x0873,
+	0x7e4: 0x103b, 0x7e5: 0x075f, 0x7e6: 0x0b77, 0x7e7: 0x06d7, 0x7e8: 0x0deb, 0x7e9: 0x0ca3,
+	0x7ea: 0x110f, 0x7eb: 0x08c7, 0x7ec: 0x09b3, 0x7ed: 0x0ffb, 0x7ee: 0x1263, 0x7ef: 0x133b,
+	0x7f0: 0x0db7, 0x7f1: 0x13f7, 0x7f2: 0x0de3, 0x7f3: 0x0c37, 0x7f4: 0x121b, 0x7f5: 0x0c57,
+	0x7f6: 0x0fab, 0x7f7: 0x072b, 0x7f8: 0x07a7, 0x7f9: 0x07eb, 0x7fa: 0x0d53, 0x7fb: 0x10fb,
+	0x7fc: 0x11f3, 0x7fd: 0x1347, 0x7fe: 0x145b, 0x7ff: 0x085b,
 	// Block 0x20, offset 0x800
-	0x800: 0x0ec3, 0x801: 0x0fcb, 0x802: 0x1277, 0x803: 0x1417, 0x804: 0x1623, 0x805: 0x0ce3,
-	0x806: 0x14a3, 0x807: 0x0833, 0x808: 0x0d2f, 0x809: 0x0d3b, 0x80a: 0x0e0f, 0x80b: 0x0e47,
-	0x80c: 0x0f4b, 0x80d: 0x0fa7, 0x80e: 0x1027, 0x80f: 0x110b, 0x810: 0x153b, 0x811: 0x07af,
-	0x812: 0x0c03, 0x813: 0x14b3, 0x814: 0x0767, 0x815: 0x0aab, 0x816: 0x0e2f, 0x817: 0x13df,
-	0x818: 0x0b67, 0x819: 0x0bb7, 0x81a: 0x0d43, 0x81b: 0x0f2f, 0x81c: 0x14bb, 0x81d: 0x0817,
-	0x81e: 0x08ff, 0x81f: 0x0a97, 0x820: 0x0cd3, 0x821: 0x0d1f, 0x822: 0x0d5f, 0x823: 0x0df3,
-	0x824: 0x0f47, 0x825: 0x0fbb, 0x826: 0x1157, 0x827: 0x12f7, 0x828: 0x1303, 0x829: 0x1457,
-	0x82a: 0x14d7, 0x82b: 0x0883, 0x82c: 0x0e4b, 0x82d: 0x0903, 0x82e: 0x0ec7, 0x82f: 0x0f6b,
-	0x830: 0x1287, 0x831: 0x14bf, 0x832: 0x15ab, 0x833: 0x15d3, 0x834: 0x0d37, 0x835: 0x0e27,
-	0x836: 0x11c3, 0x837: 0x10b7, 0x838: 0x10c3, 0x839: 0x10e7, 0x83a: 0x0f17, 0x83b: 0x0e9f,
-	0x83c: 0x1363, 0x83d: 0x0733, 0x83e: 0x122b, 0x83f: 0x081b,
+	0x800: 0x090f, 0x801: 0x0a17, 0x802: 0x0b2f, 0x803: 0x0cbf, 0x804: 0x0e7b, 0x805: 0x103f,
+	0x806: 0x1497, 0x807: 0x157b, 0x808: 0x15cf, 0x809: 0x15e7, 0x80a: 0x0837, 0x80b: 0x0cf3,
+	0x80c: 0x0da3, 0x80d: 0x13eb, 0x80e: 0x0afb, 0x80f: 0x0bd7, 0x810: 0x0bf3, 0x811: 0x0c83,
+	0x812: 0x0e6b, 0x813: 0x0eb7, 0x814: 0x0f67, 0x815: 0x108b, 0x816: 0x112f, 0x817: 0x1193,
+	0x818: 0x13db, 0x819: 0x126b, 0x81a: 0x1403, 0x81b: 0x147f, 0x81c: 0x080f, 0x81d: 0x083b,
+	0x81e: 0x0923, 0x81f: 0x0ea7, 0x820: 0x12f3, 0x821: 0x133b, 0x822: 0x0b1b, 0x823: 0x0b8b,
+	0x824: 0x0c4f, 0x825: 0x0daf, 0x826: 0x10d7, 0x827: 0x0f23, 0x828: 0x073b, 0x829: 0x097f,
+	0x82a: 0x0a63, 0x82b: 0x0ac7, 0x82c: 0x0b97, 0x82d: 0x0f3f, 0x82e: 0x0f5b, 0x82f: 0x116b,
+	0x830: 0x118b, 0x831: 0x1463, 0x832: 0x14e3, 0x833: 0x14f3, 0x834: 0x152f, 0x835: 0x0753,
+	0x836: 0x107f, 0x837: 0x144f, 0x838: 0x14cb, 0x839: 0x0baf, 0x83a: 0x0717, 0x83b: 0x0777,
+	0x83c: 0x0a67, 0x83d: 0x0a87, 0x83e: 0x0caf, 0x83f: 0x0d73,
 	// Block 0x21, offset 0x840
-	0x840: 0x080b, 0x841: 0x0b0b, 0x842: 0x0c2b, 0x843: 0x10f3, 0x844: 0x0a53, 0x845: 0x0e03,
-	0x846: 0x0cef, 0x847: 0x13e7, 0x848: 0x12e7, 0x849: 0x14ab, 0x84a: 0x1323, 0x84b: 0x0b27,
-	0x84c: 0x0787, 0x84d: 0x095b, 0x850: 0x09af,
-	0x852: 0x0cdf, 0x855: 0x07f7, 0x856: 0x0f1f, 0x857: 0x0fe3,
-	0x858: 0x1047, 0x859: 0x1063, 0x85a: 0x1067, 0x85b: 0x107b, 0x85c: 0x14fb, 0x85d: 0x10eb,
-	0x85e: 0x116f, 0x860: 0x128f, 0x862: 0x1353,
-	0x865: 0x1407, 0x866: 0x1433,
-	0x86a: 0x154f, 0x86b: 0x1553, 0x86c: 0x1557, 0x86d: 0x15bb, 0x86e: 0x142b, 0x86f: 0x14c7,
-	0x870: 0x0757, 0x871: 0x077b, 0x872: 0x078f, 0x873: 0x084b, 0x874: 0x0857, 0x875: 0x0897,
-	0x876: 0x094b, 0x877: 0x0967, 0x878: 0x096f, 0x879: 0x09ab, 0x87a: 0x09b7, 0x87b: 0x0a93,
-	0x87c: 0x0a9b, 0x87d: 0x0ba3, 0x87e: 0x0bcb, 0x87f: 0x0bd3,
+	0x840: 0x0ec3, 0x841: 0x0fcb, 0x842: 0x1277, 0x843: 0x1417, 0x844: 0x1623, 0x845: 0x0ce3,
+	0x846: 0x14a3, 0x847: 0x0833, 0x848: 0x0d2f, 0x849: 0x0d3b, 0x84a: 0x0e0f, 0x84b: 0x0e47,
+	0x84c: 0x0f4b, 0x84d: 0x0fa7, 0x84e: 0x1027, 0x84f: 0x110b, 0x850: 0x153b, 0x851: 0x07af,
+	0x852: 0x0c03, 0x853: 0x14b3, 0x854: 0x0767, 0x855: 0x0aab, 0x856: 0x0e2f, 0x857: 0x13df,
+	0x858: 0x0b67, 0x859: 0x0bb7, 0x85a: 0x0d43, 0x85b: 0x0f2f, 0x85c: 0x14bb, 0x85d: 0x0817,
+	0x85e: 0x08ff, 0x85f: 0x0a97, 0x860: 0x0cd3, 0x861: 0x0d1f, 0x862: 0x0d5f, 0x863: 0x0df3,
+	0x864: 0x0f47, 0x865: 0x0fbb, 0x866: 0x1157, 0x867: 0x12f7, 0x868: 0x1303, 0x869: 0x1457,
+	0x86a: 0x14d7, 0x86b: 0x0883, 0x86c: 0x0e4b, 0x86d: 0x0903, 0x86e: 0x0ec7, 0x86f: 0x0f6b,
+	0x870: 0x1287, 0x871: 0x14bf, 0x872: 0x15ab, 0x873: 0x15d3, 0x874: 0x0d37, 0x875: 0x0e27,
+	0x876: 0x11c3, 0x877: 0x10b7, 0x878: 0x10c3, 0x879: 0x10e7, 0x87a: 0x0f17, 0x87b: 0x0e9f,
+	0x87c: 0x1363, 0x87d: 0x0733, 0x87e: 0x122b, 0x87f: 0x081b,
 	// Block 0x22, offset 0x880
-	0x880: 0x0beb, 0x881: 0x0c97, 0x882: 0x0cc7, 0x883: 0x0ce7, 0x884: 0x0d57, 0x885: 0x0e1b,
-	0x886: 0x0e37, 0x887: 0x0e67, 0x888: 0x0ebb, 0x889: 0x0edb, 0x88a: 0x0f4f, 0x88b: 0x102f,
-	0x88c: 0x104b, 0x88d: 0x1053, 0x88e: 0x104f, 0x88f: 0x1057, 0x890: 0x105b, 0x891: 0x105f,
-	0x892: 0x1073, 0x893: 0x1077, 0x894: 0x109b, 0x895: 0x10af, 0x896: 0x10cb, 0x897: 0x112f,
-	0x898: 0x1137, 0x899: 0x113f, 0x89a: 0x1153, 0x89b: 0x117b, 0x89c: 0x11cb, 0x89d: 0x11ff,
-	0x89e: 0x11ff, 0x89f: 0x1267, 0x8a0: 0x130f, 0x8a1: 0x1327, 0x8a2: 0x135b, 0x8a3: 0x135f,
-	0x8a4: 0x13a3, 0x8a5: 0x13a7, 0x8a6: 0x13ff, 0x8a7: 0x1407, 0x8a8: 0x14db, 0x8a9: 0x151f,
-	0x8aa: 0x1537, 0x8ab: 0x0b9b, 0x8ac: 0x171e, 0x8ad: 0x11e3,
-	0x8b0: 0x06df, 0x8b1: 0x07e3, 0x8b2: 0x07a3, 0x8b3: 0x074b, 0x8b4: 0x078b, 0x8b5: 0x07b7,
-	0x8b6: 0x0847, 0x8b7: 0x0863, 0x8b8: 0x094b, 0x8b9: 0x0937, 0x8ba: 0x0947, 0x8bb: 0x0963,
-	0x8bc: 0x09af, 0x8bd: 0x09bf, 0x8be: 0x0a03, 0x8bf: 0x0a0f,
+	0x880: 0x080b, 0x881: 0x0b0b, 0x882: 0x0c2b, 0x883: 0x10f3, 0x884: 0x0a53, 0x885: 0x0e03,
+	0x886: 0x0cef, 0x887: 0x13e7, 0x888: 0x12e7, 0x889: 0x14ab, 0x88a: 0x1323, 0x88b: 0x0b27,
+	0x88c: 0x0787, 0x88d: 0x095b, 0x890: 0x09af,
+	0x892: 0x0cdf, 0x895: 0x07f7, 0x896: 0x0f1f, 0x897: 0x0fe3,
+	0x898: 0x1047, 0x899: 0x1063, 0x89a: 0x1067, 0x89b: 0x107b, 0x89c: 0x14fb, 0x89d: 0x10eb,
+	0x89e: 0x116f, 0x8a0: 0x128f, 0x8a2: 0x1353,
+	0x8a5: 0x1407, 0x8a6: 0x1433,
+	0x8aa: 0x154f, 0x8ab: 0x1553, 0x8ac: 0x1557, 0x8ad: 0x15bb, 0x8ae: 0x142b, 0x8af: 0x14c7,
+	0x8b0: 0x0757, 0x8b1: 0x077b, 0x8b2: 0x078f, 0x8b3: 0x084b, 0x8b4: 0x0857, 0x8b5: 0x0897,
+	0x8b6: 0x094b, 0x8b7: 0x0967, 0x8b8: 0x096f, 0x8b9: 0x09ab, 0x8ba: 0x09b7, 0x8bb: 0x0a93,
+	0x8bc: 0x0a9b, 0x8bd: 0x0ba3, 0x8be: 0x0bcb, 0x8bf: 0x0bd3,
 	// Block 0x23, offset 0x8c0
-	0x8c0: 0x0a2b, 0x8c1: 0x0a3b, 0x8c2: 0x0b23, 0x8c3: 0x0b2b, 0x8c4: 0x0b5b, 0x8c5: 0x0b7b,
-	0x8c6: 0x0bab, 0x8c7: 0x0bc3, 0x8c8: 0x0bb3, 0x8c9: 0x0bd3, 0x8ca: 0x0bc7, 0x8cb: 0x0beb,
-	0x8cc: 0x0c07, 0x8cd: 0x0c5f, 0x8ce: 0x0c6b, 0x8cf: 0x0c73, 0x8d0: 0x0c9b, 0x8d1: 0x0cdf,
-	0x8d2: 0x0d0f, 0x8d3: 0x0d13, 0x8d4: 0x0d27, 0x8d5: 0x0da7, 0x8d6: 0x0db7, 0x8d7: 0x0e0f,
-	0x8d8: 0x0e5b, 0x8d9: 0x0e53, 0x8da: 0x0e67, 0x8db: 0x0e83, 0x8dc: 0x0ebb, 0x8dd: 0x1013,
-	0x8de: 0x0edf, 0x8df: 0x0f13, 0x8e0: 0x0f1f, 0x8e1: 0x0f5f, 0x8e2: 0x0f7b, 0x8e3: 0x0f9f,
-	0x8e4: 0x0fc3, 0x8e5: 0x0fc7, 0x8e6: 0x0fe3, 0x8e7: 0x0fe7, 0x8e8: 0x0ff7, 0x8e9: 0x100b,
-	0x8ea: 0x1007, 0x8eb: 0x1037, 0x8ec: 0x10b3, 0x8ed: 0x10cb, 0x8ee: 0x10e3, 0x8ef: 0x111b,
-	0x8f0: 0x112f, 0x8f1: 0x114b, 0x8f2: 0x117b, 0x8f3: 0x122f, 0x8f4: 0x1257, 0x8f5: 0x12cb,
-	0x8f6: 0x1313, 0x8f7: 0x131f, 0x8f8: 0x1327, 0x8f9: 0x133f, 0x8fa: 0x1353, 0x8fb: 0x1343,
-	0x8fc: 0x135b, 0x8fd: 0x1357, 0x8fe: 0x134f, 0x8ff: 0x135f,
+	0x8c0: 0x0beb, 0x8c1: 0x0c97, 0x8c2: 0x0cc7, 0x8c3: 0x0ce7, 0x8c4: 0x0d57, 0x8c5: 0x0e1b,
+	0x8c6: 0x0e37, 0x8c7: 0x0e67, 0x8c8: 0x0ebb, 0x8c9: 0x0edb, 0x8ca: 0x0f4f, 0x8cb: 0x102f,
+	0x8cc: 0x104b, 0x8cd: 0x1053, 0x8ce: 0x104f, 0x8cf: 0x1057, 0x8d0: 0x105b, 0x8d1: 0x105f,
+	0x8d2: 0x1073, 0x8d3: 0x1077, 0x8d4: 0x109b, 0x8d5: 0x10af, 0x8d6: 0x10cb, 0x8d7: 0x112f,
+	0x8d8: 0x1137, 0x8d9: 0x113f, 0x8da: 0x1153, 0x8db: 0x117b, 0x8dc: 0x11cb, 0x8dd: 0x11ff,
+	0x8de: 0x11ff, 0x8df: 0x1267, 0x8e0: 0x130f, 0x8e1: 0x1327, 0x8e2: 0x135b, 0x8e3: 0x135f,
+	0x8e4: 0x13a3, 0x8e5: 0x13a7, 0x8e6: 0x13ff, 0x8e7: 0x1407, 0x8e8: 0x14db, 0x8e9: 0x151f,
+	0x8ea: 0x1537, 0x8eb: 0x0b9b, 0x8ec: 0x171e, 0x8ed: 0x11e3,
+	0x8f0: 0x06df, 0x8f1: 0x07e3, 0x8f2: 0x07a3, 0x8f3: 0x074b, 0x8f4: 0x078b, 0x8f5: 0x07b7,
+	0x8f6: 0x0847, 0x8f7: 0x0863, 0x8f8: 0x094b, 0x8f9: 0x0937, 0x8fa: 0x0947, 0x8fb: 0x0963,
+	0x8fc: 0x09af, 0x8fd: 0x09bf, 0x8fe: 0x0a03, 0x8ff: 0x0a0f,
 	// Block 0x24, offset 0x900
-	0x900: 0x136b, 0x901: 0x13a7, 0x902: 0x13e3, 0x903: 0x1413, 0x904: 0x144b, 0x905: 0x146b,
-	0x906: 0x14b7, 0x907: 0x14db, 0x908: 0x14fb, 0x909: 0x150f, 0x90a: 0x151f, 0x90b: 0x152b,
-	0x90c: 0x1537, 0x90d: 0x158b, 0x90e: 0x162b, 0x90f: 0x16b5, 0x910: 0x16b0, 0x911: 0x16e2,
-	0x912: 0x0607, 0x913: 0x062f, 0x914: 0x0633, 0x915: 0x1764, 0x916: 0x1791, 0x917: 0x1809,
-	0x918: 0x1617, 0x919: 0x1627,
+	0x900: 0x0a2b, 0x901: 0x0a3b, 0x902: 0x0b23, 0x903: 0x0b2b, 0x904: 0x0b5b, 0x905: 0x0b7b,
+	0x906: 0x0bab, 0x907: 0x0bc3, 0x908: 0x0bb3, 0x909: 0x0bd3, 0x90a: 0x0bc7, 0x90b: 0x0beb,
+	0x90c: 0x0c07, 0x90d: 0x0c5f, 0x90e: 0x0c6b, 0x90f: 0x0c73, 0x910: 0x0c9b, 0x911: 0x0cdf,
+	0x912: 0x0d0f, 0x913: 0x0d13, 0x914: 0x0d27, 0x915: 0x0da7, 0x916: 0x0db7, 0x917: 0x0e0f,
+	0x918: 0x0e5b, 0x919: 0x0e53, 0x91a: 0x0e67, 0x91b: 0x0e83, 0x91c: 0x0ebb, 0x91d: 0x1013,
+	0x91e: 0x0edf, 0x91f: 0x0f13, 0x920: 0x0f1f, 0x921: 0x0f5f, 0x922: 0x0f7b, 0x923: 0x0f9f,
+	0x924: 0x0fc3, 0x925: 0x0fc7, 0x926: 0x0fe3, 0x927: 0x0fe7, 0x928: 0x0ff7, 0x929: 0x100b,
+	0x92a: 0x1007, 0x92b: 0x1037, 0x92c: 0x10b3, 0x92d: 0x10cb, 0x92e: 0x10e3, 0x92f: 0x111b,
+	0x930: 0x112f, 0x931: 0x114b, 0x932: 0x117b, 0x933: 0x122f, 0x934: 0x1257, 0x935: 0x12cb,
+	0x936: 0x1313, 0x937: 0x131f, 0x938: 0x1327, 0x939: 0x133f, 0x93a: 0x1353, 0x93b: 0x1343,
+	0x93c: 0x135b, 0x93d: 0x1357, 0x93e: 0x134f, 0x93f: 0x135f,
 	// Block 0x25, offset 0x940
-	0x940: 0x06fb, 0x941: 0x06f3, 0x942: 0x0703, 0x943: 0x1647, 0x944: 0x0747, 0x945: 0x0757,
-	0x946: 0x075b, 0x947: 0x0763, 0x948: 0x076b, 0x949: 0x076f, 0x94a: 0x077b, 0x94b: 0x0773,
-	0x94c: 0x05b3, 0x94d: 0x165b, 0x94e: 0x078f, 0x94f: 0x0793, 0x950: 0x0797, 0x951: 0x07b3,
-	0x952: 0x164c, 0x953: 0x05b7, 0x954: 0x079f, 0x955: 0x07bf, 0x956: 0x1656, 0x957: 0x07cf,
-	0x958: 0x07d7, 0x959: 0x0737, 0x95a: 0x07df, 0x95b: 0x07e3, 0x95c: 0x1831, 0x95d: 0x07ff,
-	0x95e: 0x0807, 0x95f: 0x05bf, 0x960: 0x081f, 0x961: 0x0823, 0x962: 0x082b, 0x963: 0x082f,
-	0x964: 0x05c3, 0x965: 0x0847, 0x966: 0x084b, 0x967: 0x0857, 0x968: 0x0863, 0x969: 0x0867,
-	0x96a: 0x086b, 0x96b: 0x0873, 0x96c: 0x0893, 0x96d: 0x0897, 0x96e: 0x089f, 0x96f: 0x08af,
-	0x970: 0x08b7, 0x971: 0x08bb, 0x972: 0x08bb, 0x973: 0x08bb, 0x974: 0x166a, 0x975: 0x0e93,
-	0x976: 0x08cf, 0x977: 0x08d7, 0x978: 0x166f, 0x979: 0x08e3, 0x97a: 0x08eb, 0x97b: 0x08f3,
-	0x97c: 0x091b, 0x97d: 0x0907, 0x97e: 0x0913, 0x97f: 0x0917,
+	0x940: 0x136b, 0x941: 0x13a7, 0x942: 0x13e3, 0x943: 0x1413, 0x944: 0x144b, 0x945: 0x146b,
+	0x946: 0x14b7, 0x947: 0x14db, 0x948: 0x14fb, 0x949: 0x150f, 0x94a: 0x151f, 0x94b: 0x152b,
+	0x94c: 0x1537, 0x94d: 0x158b, 0x94e: 0x162b, 0x94f: 0x16b5, 0x950: 0x16b0, 0x951: 0x16e2,
+	0x952: 0x0607, 0x953: 0x062f, 0x954: 0x0633, 0x955: 0x1764, 0x956: 0x1791, 0x957: 0x1809,
+	0x958: 0x1617, 0x959: 0x1627,
 	// Block 0x26, offset 0x980
-	0x980: 0x091f, 0x981: 0x0927, 0x982: 0x092b, 0x983: 0x0933, 0x984: 0x093b, 0x985: 0x093f,
-	0x986: 0x093f, 0x987: 0x0947, 0x988: 0x094f, 0x989: 0x0953, 0x98a: 0x095f, 0x98b: 0x0983,
-	0x98c: 0x0967, 0x98d: 0x0987, 0x98e: 0x096b, 0x98f: 0x0973, 0x990: 0x080b, 0x991: 0x09cf,
-	0x992: 0x0997, 0x993: 0x099b, 0x994: 0x099f, 0x995: 0x0993, 0x996: 0x09a7, 0x997: 0x09a3,
-	0x998: 0x09bb, 0x999: 0x1674, 0x99a: 0x09d7, 0x99b: 0x09db, 0x99c: 0x09e3, 0x99d: 0x09ef,
-	0x99e: 0x09f7, 0x99f: 0x0a13, 0x9a0: 0x1679, 0x9a1: 0x167e, 0x9a2: 0x0a1f, 0x9a3: 0x0a23,
-	0x9a4: 0x0a27, 0x9a5: 0x0a1b, 0x9a6: 0x0a2f, 0x9a7: 0x05c7, 0x9a8: 0x05cb, 0x9a9: 0x0a37,
-	0x9aa: 0x0a3f, 0x9ab: 0x0a3f, 0x9ac: 0x1683, 0x9ad: 0x0a5b, 0x9ae: 0x0a5f, 0x9af: 0x0a63,
-	0x9b0: 0x0a6b, 0x9b1: 0x1688, 0x9b2: 0x0a73, 0x9b3: 0x0a77, 0x9b4: 0x0b4f, 0x9b5: 0x0a7f,
-	0x9b6: 0x05cf, 0x9b7: 0x0a8b, 0x9b8: 0x0a9b, 0x9b9: 0x0aa7, 0x9ba: 0x0aa3, 0x9bb: 0x1692,
-	0x9bc: 0x0aaf, 0x9bd: 0x1697, 0x9be: 0x0abb, 0x9bf: 0x0ab7,
+	0x980: 0x06fb, 0x981: 0x06f3, 0x982: 0x0703, 0x983: 0x1647, 0x984: 0x0747, 0x985: 0x0757,
+	0x986: 0x075b, 0x987: 0x0763, 0x988: 0x076b, 0x989: 0x076f, 0x98a: 0x077b, 0x98b: 0x0773,
+	0x98c: 0x05b3, 0x98d: 0x165b, 0x98e: 0x078f, 0x98f: 0x0793, 0x990: 0x0797, 0x991: 0x07b3,
+	0x992: 0x164c, 0x993: 0x05b7, 0x994: 0x079f, 0x995: 0x07bf, 0x996: 0x1656, 0x997: 0x07cf,
+	0x998: 0x07d7, 0x999: 0x0737, 0x99a: 0x07df, 0x99b: 0x07e3, 0x99c: 0x1831, 0x99d: 0x07ff,
+	0x99e: 0x0807, 0x99f: 0x05bf, 0x9a0: 0x081f, 0x9a1: 0x0823, 0x9a2: 0x082b, 0x9a3: 0x082f,
+	0x9a4: 0x05c3, 0x9a5: 0x0847, 0x9a6: 0x084b, 0x9a7: 0x0857, 0x9a8: 0x0863, 0x9a9: 0x0867,
+	0x9aa: 0x086b, 0x9ab: 0x0873, 0x9ac: 0x0893, 0x9ad: 0x0897, 0x9ae: 0x089f, 0x9af: 0x08af,
+	0x9b0: 0x08b7, 0x9b1: 0x08bb, 0x9b2: 0x08bb, 0x9b3: 0x08bb, 0x9b4: 0x166a, 0x9b5: 0x0e93,
+	0x9b6: 0x08cf, 0x9b7: 0x08d7, 0x9b8: 0x166f, 0x9b9: 0x08e3, 0x9ba: 0x08eb, 0x9bb: 0x08f3,
+	0x9bc: 0x091b, 0x9bd: 0x0907, 0x9be: 0x0913, 0x9bf: 0x0917,
 	// Block 0x27, offset 0x9c0
-	0x9c0: 0x0abf, 0x9c1: 0x0acf, 0x9c2: 0x0ad3, 0x9c3: 0x05d3, 0x9c4: 0x0ae3, 0x9c5: 0x0aeb,
-	0x9c6: 0x0aef, 0x9c7: 0x0af3, 0x9c8: 0x05d7, 0x9c9: 0x169c, 0x9ca: 0x05db, 0x9cb: 0x0b0f,
-	0x9cc: 0x0b13, 0x9cd: 0x0b17, 0x9ce: 0x0b1f, 0x9cf: 0x1863, 0x9d0: 0x0b37, 0x9d1: 0x16a6,
-	0x9d2: 0x16a6, 0x9d3: 0x11d7, 0x9d4: 0x0b47, 0x9d5: 0x0b47, 0x9d6: 0x05df, 0x9d7: 0x16c9,
-	0x9d8: 0x179b, 0x9d9: 0x0b57, 0x9da: 0x0b5f, 0x9db: 0x05e3, 0x9dc: 0x0b73, 0x9dd: 0x0b83,
-	0x9de: 0x0b87, 0x9df: 0x0b8f, 0x9e0: 0x0b9f, 0x9e1: 0x05eb, 0x9e2: 0x05e7, 0x9e3: 0x0ba3,
-	0x9e4: 0x16ab, 0x9e5: 0x0ba7, 0x9e6: 0x0bbb, 0x9e7: 0x0bbf, 0x9e8: 0x0bc3, 0x9e9: 0x0bbf,
-	0x9ea: 0x0bcf, 0x9eb: 0x0bd3, 0x9ec: 0x0be3, 0x9ed: 0x0bdb, 0x9ee: 0x0bdf, 0x9ef: 0x0be7,
-	0x9f0: 0x0beb, 0x9f1: 0x0bef, 0x9f2: 0x0bfb, 0x9f3: 0x0bff, 0x9f4: 0x0c17, 0x9f5: 0x0c1f,
-	0x9f6: 0x0c2f, 0x9f7: 0x0c43, 0x9f8: 0x16ba, 0x9f9: 0x0c3f, 0x9fa: 0x0c33, 0x9fb: 0x0c4b,
-	0x9fc: 0x0c53, 0x9fd: 0x0c67, 0x9fe: 0x16bf, 0x9ff: 0x0c6f,
+	0x9c0: 0x091f, 0x9c1: 0x0927, 0x9c2: 0x092b, 0x9c3: 0x0933, 0x9c4: 0x093b, 0x9c5: 0x093f,
+	0x9c6: 0x093f, 0x9c7: 0x0947, 0x9c8: 0x094f, 0x9c9: 0x0953, 0x9ca: 0x095f, 0x9cb: 0x0983,
+	0x9cc: 0x0967, 0x9cd: 0x0987, 0x9ce: 0x096b, 0x9cf: 0x0973, 0x9d0: 0x080b, 0x9d1: 0x09cf,
+	0x9d2: 0x0997, 0x9d3: 0x099b, 0x9d4: 0x099f, 0x9d5: 0x0993, 0x9d6: 0x09a7, 0x9d7: 0x09a3,
+	0x9d8: 0x09bb, 0x9d9: 0x1674, 0x9da: 0x09d7, 0x9db: 0x09db, 0x9dc: 0x09e3, 0x9dd: 0x09ef,
+	0x9de: 0x09f7, 0x9df: 0x0a13, 0x9e0: 0x1679, 0x9e1: 0x167e, 0x9e2: 0x0a1f, 0x9e3: 0x0a23,
+	0x9e4: 0x0a27, 0x9e5: 0x0a1b, 0x9e6: 0x0a2f, 0x9e7: 0x05c7, 0x9e8: 0x05cb, 0x9e9: 0x0a37,
+	0x9ea: 0x0a3f, 0x9eb: 0x0a3f, 0x9ec: 0x1683, 0x9ed: 0x0a5b, 0x9ee: 0x0a5f, 0x9ef: 0x0a63,
+	0x9f0: 0x0a6b, 0x9f1: 0x1688, 0x9f2: 0x0a73, 0x9f3: 0x0a77, 0x9f4: 0x0b4f, 0x9f5: 0x0a7f,
+	0x9f6: 0x05cf, 0x9f7: 0x0a8b, 0x9f8: 0x0a9b, 0x9f9: 0x0aa7, 0x9fa: 0x0aa3, 0x9fb: 0x1692,
+	0x9fc: 0x0aaf, 0x9fd: 0x1697, 0x9fe: 0x0abb, 0x9ff: 0x0ab7,
 	// Block 0x28, offset 0xa00
-	0xa00: 0x0c63, 0xa01: 0x0c5b, 0xa02: 0x05ef, 0xa03: 0x0c77, 0xa04: 0x0c7f, 0xa05: 0x0c87,
-	0xa06: 0x0c7b, 0xa07: 0x05f3, 0xa08: 0x0c97, 0xa09: 0x0c9f, 0xa0a: 0x16c4, 0xa0b: 0x0ccb,
-	0xa0c: 0x0cff, 0xa0d: 0x0cdb, 0xa0e: 0x05ff, 0xa0f: 0x0ce7, 0xa10: 0x05fb, 0xa11: 0x05f7,
-	0xa12: 0x07c3, 0xa13: 0x07c7, 0xa14: 0x0d03, 0xa15: 0x0ceb, 0xa16: 0x11ab, 0xa17: 0x0663,
-	0xa18: 0x0d0f, 0xa19: 0x0d13, 0xa1a: 0x0d17, 0xa1b: 0x0d2b, 0xa1c: 0x0d23, 0xa1d: 0x16dd,
-	0xa1e: 0x0603, 0xa1f: 0x0d3f, 0xa20: 0x0d33, 0xa21: 0x0d4f, 0xa22: 0x0d57, 0xa23: 0x16e7,
-	0xa24: 0x0d5b, 0xa25: 0x0d47, 0xa26: 0x0d63, 0xa27: 0x0607, 0xa28: 0x0d67, 0xa29: 0x0d6b,
-	0xa2a: 0x0d6f, 0xa2b: 0x0d7b, 0xa2c: 0x16ec, 0xa2d: 0x0d83, 0xa2e: 0x060b, 0xa2f: 0x0d8f,
-	0xa30: 0x16f1, 0xa31: 0x0d93, 0xa32: 0x060f, 0xa33: 0x0d9f, 0xa34: 0x0dab, 0xa35: 0x0db7,
-	0xa36: 0x0dbb, 0xa37: 0x16f6, 0xa38: 0x168d, 0xa39: 0x16fb, 0xa3a: 0x0ddb, 0xa3b: 0x1700,
-	0xa3c: 0x0de7, 0xa3d: 0x0def, 0xa3e: 0x0ddf, 0xa3f: 0x0dfb,
+	0xa00: 0x0abf, 0xa01: 0x0acf, 0xa02: 0x0ad3, 0xa03: 0x05d3, 0xa04: 0x0ae3, 0xa05: 0x0aeb,
+	0xa06: 0x0aef, 0xa07: 0x0af3, 0xa08: 0x05d7, 0xa09: 0x169c, 0xa0a: 0x05db, 0xa0b: 0x0b0f,
+	0xa0c: 0x0b13, 0xa0d: 0x0b17, 0xa0e: 0x0b1f, 0xa0f: 0x1863, 0xa10: 0x0b37, 0xa11: 0x16a6,
+	0xa12: 0x16a6, 0xa13: 0x11d7, 0xa14: 0x0b47, 0xa15: 0x0b47, 0xa16: 0x05df, 0xa17: 0x16c9,
+	0xa18: 0x179b, 0xa19: 0x0b57, 0xa1a: 0x0b5f, 0xa1b: 0x05e3, 0xa1c: 0x0b73, 0xa1d: 0x0b83,
+	0xa1e: 0x0b87, 0xa1f: 0x0b8f, 0xa20: 0x0b9f, 0xa21: 0x05eb, 0xa22: 0x05e7, 0xa23: 0x0ba3,
+	0xa24: 0x16ab, 0xa25: 0x0ba7, 0xa26: 0x0bbb, 0xa27: 0x0bbf, 0xa28: 0x0bc3, 0xa29: 0x0bbf,
+	0xa2a: 0x0bcf, 0xa2b: 0x0bd3, 0xa2c: 0x0be3, 0xa2d: 0x0bdb, 0xa2e: 0x0bdf, 0xa2f: 0x0be7,
+	0xa30: 0x0beb, 0xa31: 0x0bef, 0xa32: 0x0bfb, 0xa33: 0x0bff, 0xa34: 0x0c17, 0xa35: 0x0c1f,
+	0xa36: 0x0c2f, 0xa37: 0x0c43, 0xa38: 0x16ba, 0xa39: 0x0c3f, 0xa3a: 0x0c33, 0xa3b: 0x0c4b,
+	0xa3c: 0x0c53, 0xa3d: 0x0c67, 0xa3e: 0x16bf, 0xa3f: 0x0c6f,
 	// Block 0x29, offset 0xa40
-	0xa40: 0x0e0b, 0xa41: 0x0e1b, 0xa42: 0x0e0f, 0xa43: 0x0e13, 0xa44: 0x0e1f, 0xa45: 0x0e23,
-	0xa46: 0x1705, 0xa47: 0x0e07, 0xa48: 0x0e3b, 0xa49: 0x0e3f, 0xa4a: 0x0613, 0xa4b: 0x0e53,
-	0xa4c: 0x0e4f, 0xa4d: 0x170a, 0xa4e: 0x0e33, 0xa4f: 0x0e6f, 0xa50: 0x170f, 0xa51: 0x1714,
-	0xa52: 0x0e73, 0xa53: 0x0e87, 0xa54: 0x0e83, 0xa55: 0x0e7f, 0xa56: 0x0617, 0xa57: 0x0e8b,
-	0xa58: 0x0e9b, 0xa59: 0x0e97, 0xa5a: 0x0ea3, 0xa5b: 0x1651, 0xa5c: 0x0eb3, 0xa5d: 0x1719,
-	0xa5e: 0x0ebf, 0xa5f: 0x1723, 0xa60: 0x0ed3, 0xa61: 0x0edf, 0xa62: 0x0ef3, 0xa63: 0x1728,
-	0xa64: 0x0f07, 0xa65: 0x0f0b, 0xa66: 0x172d, 0xa67: 0x1732, 0xa68: 0x0f27, 0xa69: 0x0f37,
-	0xa6a: 0x061b, 0xa6b: 0x0f3b, 0xa6c: 0x061f, 0xa6d: 0x061f, 0xa6e: 0x0f53, 0xa6f: 0x0f57,
-	0xa70: 0x0f5f, 0xa71: 0x0f63, 0xa72: 0x0f6f, 0xa73: 0x0623, 0xa74: 0x0f87, 0xa75: 0x1737,
-	0xa76: 0x0fa3, 0xa77: 0x173c, 0xa78: 0x0faf, 0xa79: 0x16a1, 0xa7a: 0x0fbf, 0xa7b: 0x1741,
-	0xa7c: 0x1746, 0xa7d: 0x174b, 0xa7e: 0x0627, 0xa7f: 0x062b,
+	0xa40: 0x0c63, 0xa41: 0x0c5b, 0xa42: 0x05ef, 0xa43: 0x0c77, 0xa44: 0x0c7f, 0xa45: 0x0c87,
+	0xa46: 0x0c7b, 0xa47: 0x05f3, 0xa48: 0x0c97, 0xa49: 0x0c9f, 0xa4a: 0x16c4, 0xa4b: 0x0ccb,
+	0xa4c: 0x0cff, 0xa4d: 0x0cdb, 0xa4e: 0x05ff, 0xa4f: 0x0ce7, 0xa50: 0x05fb, 0xa51: 0x05f7,
+	0xa52: 0x07c3, 0xa53: 0x07c7, 0xa54: 0x0d03, 0xa55: 0x0ceb, 0xa56: 0x11ab, 0xa57: 0x0663,
+	0xa58: 0x0d0f, 0xa59: 0x0d13, 0xa5a: 0x0d17, 0xa5b: 0x0d2b, 0xa5c: 0x0d23, 0xa5d: 0x16dd,
+	0xa5e: 0x0603, 0xa5f: 0x0d3f, 0xa60: 0x0d33, 0xa61: 0x0d4f, 0xa62: 0x0d57, 0xa63: 0x16e7,
+	0xa64: 0x0d5b, 0xa65: 0x0d47, 0xa66: 0x0d63, 0xa67: 0x0607, 0xa68: 0x0d67, 0xa69: 0x0d6b,
+	0xa6a: 0x0d6f, 0xa6b: 0x0d7b, 0xa6c: 0x16ec, 0xa6d: 0x0d83, 0xa6e: 0x060b, 0xa6f: 0x0d8f,
+	0xa70: 0x16f1, 0xa71: 0x0d93, 0xa72: 0x060f, 0xa73: 0x0d9f, 0xa74: 0x0dab, 0xa75: 0x0db7,
+	0xa76: 0x0dbb, 0xa77: 0x16f6, 0xa78: 0x168d, 0xa79: 0x16fb, 0xa7a: 0x0ddb, 0xa7b: 0x1700,
+	0xa7c: 0x0de7, 0xa7d: 0x0def, 0xa7e: 0x0ddf, 0xa7f: 0x0dfb,
 	// Block 0x2a, offset 0xa80
-	0xa80: 0x0ff7, 0xa81: 0x1755, 0xa82: 0x1750, 0xa83: 0x175a, 0xa84: 0x175f, 0xa85: 0x0fff,
-	0xa86: 0x1003, 0xa87: 0x1003, 0xa88: 0x100b, 0xa89: 0x0633, 0xa8a: 0x100f, 0xa8b: 0x0637,
-	0xa8c: 0x063b, 0xa8d: 0x1769, 0xa8e: 0x1023, 0xa8f: 0x102b, 0xa90: 0x1037, 0xa91: 0x063f,
-	0xa92: 0x176e, 0xa93: 0x105b, 0xa94: 0x1773, 0xa95: 0x1778, 0xa96: 0x107b, 0xa97: 0x1093,
-	0xa98: 0x0643, 0xa99: 0x109b, 0xa9a: 0x109f, 0xa9b: 0x10a3, 0xa9c: 0x177d, 0xa9d: 0x1782,
-	0xa9e: 0x1782, 0xa9f: 0x10bb, 0xaa0: 0x0647, 0xaa1: 0x1787, 0xaa2: 0x10cf, 0xaa3: 0x10d3,
-	0xaa4: 0x064b, 0xaa5: 0x178c, 0xaa6: 0x10ef, 0xaa7: 0x064f, 0xaa8: 0x10ff, 0xaa9: 0x10f7,
-	0xaaa: 0x1107, 0xaab: 0x1796, 0xaac: 0x111f, 0xaad: 0x0653, 0xaae: 0x112b, 0xaaf: 0x1133,
-	0xab0: 0x1143, 0xab1: 0x0657, 0xab2: 0x17a0, 0xab3: 0x17a5, 0xab4: 0x065b, 0xab5: 0x17aa,
-	0xab6: 0x115b, 0xab7: 0x17af, 0xab8: 0x1167, 0xab9: 0x1173, 0xaba: 0x117b, 0xabb: 0x17b4,
-	0xabc: 0x17b9, 0xabd: 0x118f, 0xabe: 0x17be, 0xabf: 0x1197,
+	0xa80: 0x0e0b, 0xa81: 0x0e1b, 0xa82: 0x0e0f, 0xa83: 0x0e13, 0xa84: 0x0e1f, 0xa85: 0x0e23,
+	0xa86: 0x1705, 0xa87: 0x0e07, 0xa88: 0x0e3b, 0xa89: 0x0e3f, 0xa8a: 0x0613, 0xa8b: 0x0e53,
+	0xa8c: 0x0e4f, 0xa8d: 0x170a, 0xa8e: 0x0e33, 0xa8f: 0x0e6f, 0xa90: 0x170f, 0xa91: 0x1714,
+	0xa92: 0x0e73, 0xa93: 0x0e87, 0xa94: 0x0e83, 0xa95: 0x0e7f, 0xa96: 0x0617, 0xa97: 0x0e8b,
+	0xa98: 0x0e9b, 0xa99: 0x0e97, 0xa9a: 0x0ea3, 0xa9b: 0x1651, 0xa9c: 0x0eb3, 0xa9d: 0x1719,
+	0xa9e: 0x0ebf, 0xa9f: 0x1723, 0xaa0: 0x0ed3, 0xaa1: 0x0edf, 0xaa2: 0x0ef3, 0xaa3: 0x1728,
+	0xaa4: 0x0f07, 0xaa5: 0x0f0b, 0xaa6: 0x172d, 0xaa7: 0x1732, 0xaa8: 0x0f27, 0xaa9: 0x0f37,
+	0xaaa: 0x061b, 0xaab: 0x0f3b, 0xaac: 0x061f, 0xaad: 0x061f, 0xaae: 0x0f53, 0xaaf: 0x0f57,
+	0xab0: 0x0f5f, 0xab1: 0x0f63, 0xab2: 0x0f6f, 0xab3: 0x0623, 0xab4: 0x0f87, 0xab5: 0x1737,
+	0xab6: 0x0fa3, 0xab7: 0x173c, 0xab8: 0x0faf, 0xab9: 0x16a1, 0xaba: 0x0fbf, 0xabb: 0x1741,
+	0xabc: 0x1746, 0xabd: 0x174b, 0xabe: 0x0627, 0xabf: 0x062b,
 	// Block 0x2b, offset 0xac0
-	0xac0: 0x16ce, 0xac1: 0x065f, 0xac2: 0x11af, 0xac3: 0x11b3, 0xac4: 0x0667, 0xac5: 0x11b7,
-	0xac6: 0x0a33, 0xac7: 0x17c3, 0xac8: 0x17c8, 0xac9: 0x16d3, 0xaca: 0x16d8, 0xacb: 0x11d7,
-	0xacc: 0x11db, 0xacd: 0x13f3, 0xace: 0x066b, 0xacf: 0x1207, 0xad0: 0x1203, 0xad1: 0x120b,
-	0xad2: 0x083f, 0xad3: 0x120f, 0xad4: 0x1213, 0xad5: 0x1217, 0xad6: 0x121f, 0xad7: 0x17cd,
-	0xad8: 0x121b, 0xad9: 0x1223, 0xada: 0x1237, 0xadb: 0x123b, 0xadc: 0x1227, 0xadd: 0x123f,
-	0xade: 0x1253, 0xadf: 0x1267, 0xae0: 0x1233, 0xae1: 0x1247, 0xae2: 0x124b, 0xae3: 0x124f,
-	0xae4: 0x17d2, 0xae5: 0x17dc, 0xae6: 0x17d7, 0xae7: 0x066f, 0xae8: 0x126f, 0xae9: 0x1273,
-	0xaea: 0x127b, 0xaeb: 0x17f0, 0xaec: 0x127f, 0xaed: 0x17e1, 0xaee: 0x0673, 0xaef: 0x0677,
-	0xaf0: 0x17e6, 0xaf1: 0x17eb, 0xaf2: 0x067b, 0xaf3: 0x129f, 0xaf4: 0x12a3, 0xaf5: 0x12a7,
-	0xaf6: 0x12ab, 0xaf7: 0x12b7, 0xaf8: 0x12b3, 0xaf9: 0x12bf, 0xafa: 0x12bb, 0xafb: 0x12cb,
-	0xafc: 0x12c3, 0xafd: 0x12c7, 0xafe: 0x12cf, 0xaff: 0x067f,
+	0xac0: 0x0ff7, 0xac1: 0x1755, 0xac2: 0x1750, 0xac3: 0x175a, 0xac4: 0x175f, 0xac5: 0x0fff,
+	0xac6: 0x1003, 0xac7: 0x1003, 0xac8: 0x100b, 0xac9: 0x0633, 0xaca: 0x100f, 0xacb: 0x0637,
+	0xacc: 0x063b, 0xacd: 0x1769, 0xace: 0x1023, 0xacf: 0x102b, 0xad0: 0x1037, 0xad1: 0x063f,
+	0xad2: 0x176e, 0xad3: 0x105b, 0xad4: 0x1773, 0xad5: 0x1778, 0xad6: 0x107b, 0xad7: 0x1093,
+	0xad8: 0x0643, 0xad9: 0x109b, 0xada: 0x109f, 0xadb: 0x10a3, 0xadc: 0x177d, 0xadd: 0x1782,
+	0xade: 0x1782, 0xadf: 0x10bb, 0xae0: 0x0647, 0xae1: 0x1787, 0xae2: 0x10cf, 0xae3: 0x10d3,
+	0xae4: 0x064b, 0xae5: 0x178c, 0xae6: 0x10ef, 0xae7: 0x064f, 0xae8: 0x10ff, 0xae9: 0x10f7,
+	0xaea: 0x1107, 0xaeb: 0x1796, 0xaec: 0x111f, 0xaed: 0x0653, 0xaee: 0x112b, 0xaef: 0x1133,
+	0xaf0: 0x1143, 0xaf1: 0x0657, 0xaf2: 0x17a0, 0xaf3: 0x17a5, 0xaf4: 0x065b, 0xaf5: 0x17aa,
+	0xaf6: 0x115b, 0xaf7: 0x17af, 0xaf8: 0x1167, 0xaf9: 0x1173, 0xafa: 0x117b, 0xafb: 0x17b4,
+	0xafc: 0x17b9, 0xafd: 0x118f, 0xafe: 0x17be, 0xaff: 0x1197,
 	// Block 0x2c, offset 0xb00
-	0xb00: 0x12d7, 0xb01: 0x12db, 0xb02: 0x0683, 0xb03: 0x12eb, 0xb04: 0x12ef, 0xb05: 0x17f5,
-	0xb06: 0x12fb, 0xb07: 0x12ff, 0xb08: 0x0687, 0xb09: 0x130b, 0xb0a: 0x05bb, 0xb0b: 0x17fa,
-	0xb0c: 0x17ff, 0xb0d: 0x068b, 0xb0e: 0x068f, 0xb0f: 0x1337, 0xb10: 0x134f, 0xb11: 0x136b,
-	0xb12: 0x137b, 0xb13: 0x1804, 0xb14: 0x138f, 0xb15: 0x1393, 0xb16: 0x13ab, 0xb17: 0x13b7,
-	0xb18: 0x180e, 0xb19: 0x1660, 0xb1a: 0x13c3, 0xb1b: 0x13bf, 0xb1c: 0x13cb, 0xb1d: 0x1665,
-	0xb1e: 0x13d7, 0xb1f: 0x13e3, 0xb20: 0x1813, 0xb21: 0x1818, 0xb22: 0x1423, 0xb23: 0x142f,
-	0xb24: 0x1437, 0xb25: 0x181d, 0xb26: 0x143b, 0xb27: 0x1467, 0xb28: 0x1473, 0xb29: 0x1477,
-	0xb2a: 0x146f, 0xb2b: 0x1483, 0xb2c: 0x1487, 0xb2d: 0x1822, 0xb2e: 0x1493, 0xb2f: 0x0693,
-	0xb30: 0x149b, 0xb31: 0x1827, 0xb32: 0x0697, 0xb33: 0x14d3, 0xb34: 0x0ac3, 0xb35: 0x14eb,
-	0xb36: 0x182c, 0xb37: 0x1836, 0xb38: 0x069b, 0xb39: 0x069f, 0xb3a: 0x1513, 0xb3b: 0x183b,
-	0xb3c: 0x06a3, 0xb3d: 0x1840, 0xb3e: 0x152b, 0xb3f: 0x152b,
+	0xb00: 0x16ce, 0xb01: 0x065f, 0xb02: 0x11af, 0xb03: 0x11b3, 0xb04: 0x0667, 0xb05: 0x11b7,
+	0xb06: 0x0a33, 0xb07: 0x17c3, 0xb08: 0x17c8, 0xb09: 0x16d3, 0xb0a: 0x16d8, 0xb0b: 0x11d7,
+	0xb0c: 0x11db, 0xb0d: 0x13f3, 0xb0e: 0x066b, 0xb0f: 0x1207, 0xb10: 0x1203, 0xb11: 0x120b,
+	0xb12: 0x083f, 0xb13: 0x120f, 0xb14: 0x1213, 0xb15: 0x1217, 0xb16: 0x121f, 0xb17: 0x17cd,
+	0xb18: 0x121b, 0xb19: 0x1223, 0xb1a: 0x1237, 0xb1b: 0x123b, 0xb1c: 0x1227, 0xb1d: 0x123f,
+	0xb1e: 0x1253, 0xb1f: 0x1267, 0xb20: 0x1233, 0xb21: 0x1247, 0xb22: 0x124b, 0xb23: 0x124f,
+	0xb24: 0x17d2, 0xb25: 0x17dc, 0xb26: 0x17d7, 0xb27: 0x066f, 0xb28: 0x126f, 0xb29: 0x1273,
+	0xb2a: 0x127b, 0xb2b: 0x17f0, 0xb2c: 0x127f, 0xb2d: 0x17e1, 0xb2e: 0x0673, 0xb2f: 0x0677,
+	0xb30: 0x17e6, 0xb31: 0x17eb, 0xb32: 0x067b, 0xb33: 0x129f, 0xb34: 0x12a3, 0xb35: 0x12a7,
+	0xb36: 0x12ab, 0xb37: 0x12b7, 0xb38: 0x12b3, 0xb39: 0x12bf, 0xb3a: 0x12bb, 0xb3b: 0x12cb,
+	0xb3c: 0x12c3, 0xb3d: 0x12c7, 0xb3e: 0x12cf, 0xb3f: 0x067f,
 	// Block 0x2d, offset 0xb40
-	0xb40: 0x1533, 0xb41: 0x1845, 0xb42: 0x154b, 0xb43: 0x06a7, 0xb44: 0x155b, 0xb45: 0x1567,
-	0xb46: 0x156f, 0xb47: 0x1577, 0xb48: 0x06ab, 0xb49: 0x184a, 0xb4a: 0x158b, 0xb4b: 0x15a7,
-	0xb4c: 0x15b3, 0xb4d: 0x06af, 0xb4e: 0x06b3, 0xb4f: 0x15b7, 0xb50: 0x184f, 0xb51: 0x06b7,
-	0xb52: 0x1854, 0xb53: 0x1859, 0xb54: 0x185e, 0xb55: 0x15db, 0xb56: 0x06bb, 0xb57: 0x15ef,
-	0xb58: 0x15f7, 0xb59: 0x15fb, 0xb5a: 0x1603, 0xb5b: 0x160b, 0xb5c: 0x1613, 0xb5d: 0x1868,
+	0xb40: 0x12d7, 0xb41: 0x12db, 0xb42: 0x0683, 0xb43: 0x12eb, 0xb44: 0x12ef, 0xb45: 0x17f5,
+	0xb46: 0x12fb, 0xb47: 0x12ff, 0xb48: 0x0687, 0xb49: 0x130b, 0xb4a: 0x05bb, 0xb4b: 0x17fa,
+	0xb4c: 0x17ff, 0xb4d: 0x068b, 0xb4e: 0x068f, 0xb4f: 0x1337, 0xb50: 0x134f, 0xb51: 0x136b,
+	0xb52: 0x137b, 0xb53: 0x1804, 0xb54: 0x138f, 0xb55: 0x1393, 0xb56: 0x13ab, 0xb57: 0x13b7,
+	0xb58: 0x180e, 0xb59: 0x1660, 0xb5a: 0x13c3, 0xb5b: 0x13bf, 0xb5c: 0x13cb, 0xb5d: 0x1665,
+	0xb5e: 0x13d7, 0xb5f: 0x13e3, 0xb60: 0x1813, 0xb61: 0x1818, 0xb62: 0x1423, 0xb63: 0x142f,
+	0xb64: 0x1437, 0xb65: 0x181d, 0xb66: 0x143b, 0xb67: 0x1467, 0xb68: 0x1473, 0xb69: 0x1477,
+	0xb6a: 0x146f, 0xb6b: 0x1483, 0xb6c: 0x1487, 0xb6d: 0x1822, 0xb6e: 0x1493, 0xb6f: 0x0693,
+	0xb70: 0x149b, 0xb71: 0x1827, 0xb72: 0x0697, 0xb73: 0x14d3, 0xb74: 0x0ac3, 0xb75: 0x14eb,
+	0xb76: 0x182c, 0xb77: 0x1836, 0xb78: 0x069b, 0xb79: 0x069f, 0xb7a: 0x1513, 0xb7b: 0x183b,
+	0xb7c: 0x06a3, 0xb7d: 0x1840, 0xb7e: 0x152b, 0xb7f: 0x152b,
+	// Block 0x2e, offset 0xb80
+	0xb80: 0x1533, 0xb81: 0x1845, 0xb82: 0x154b, 0xb83: 0x06a7, 0xb84: 0x155b, 0xb85: 0x1567,
+	0xb86: 0x156f, 0xb87: 0x1577, 0xb88: 0x06ab, 0xb89: 0x184a, 0xb8a: 0x158b, 0xb8b: 0x15a7,
+	0xb8c: 0x15b3, 0xb8d: 0x06af, 0xb8e: 0x06b3, 0xb8f: 0x15b7, 0xb90: 0x184f, 0xb91: 0x06b7,
+	0xb92: 0x1854, 0xb93: 0x1859, 0xb94: 0x185e, 0xb95: 0x15db, 0xb96: 0x06bb, 0xb97: 0x15ef,
+	0xb98: 0x15f7, 0xb99: 0x15fb, 0xb9a: 0x1603, 0xb9b: 0x160b, 0xb9c: 0x1613, 0xb9d: 0x1868,
 }
 
 // nfcIndex: 22 blocks, 1408 entries, 1408 bytes
@@ -3413,33 +3429,33 @@ var nfcIndex = [1408]uint8{
 	// Block 0x1, offset 0x40
 	// Block 0x2, offset 0x80
 	// Block 0x3, offset 0xc0
-	0xc2: 0x2c, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x2d, 0xc7: 0x04,
-	0xc8: 0x05, 0xca: 0x2e, 0xcb: 0x2f, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x30,
-	0xd0: 0x09, 0xd1: 0x31, 0xd2: 0x32, 0xd3: 0x0a, 0xd6: 0x0b, 0xd7: 0x33,
-	0xd8: 0x34, 0xd9: 0x0c, 0xdb: 0x35, 0xdc: 0x36, 0xdd: 0x37, 0xdf: 0x38,
+	0xc2: 0x2d, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x2e, 0xc7: 0x04,
+	0xc8: 0x05, 0xca: 0x2f, 0xcb: 0x30, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x31,
+	0xd0: 0x09, 0xd1: 0x32, 0xd2: 0x33, 0xd3: 0x0a, 0xd6: 0x0b, 0xd7: 0x34,
+	0xd8: 0x35, 0xd9: 0x0c, 0xdb: 0x36, 0xdc: 0x37, 0xdd: 0x38, 0xdf: 0x39,
 	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
 	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
 	0xf0: 0x13,
 	// Block 0x4, offset 0x100
-	0x120: 0x39, 0x121: 0x3a, 0x123: 0x3b, 0x124: 0x3c, 0x125: 0x3d, 0x126: 0x3e, 0x127: 0x3f,
-	0x128: 0x40, 0x129: 0x41, 0x12a: 0x42, 0x12b: 0x43, 0x12c: 0x3e, 0x12d: 0x44, 0x12e: 0x45, 0x12f: 0x46,
-	0x131: 0x47, 0x132: 0x48, 0x133: 0x49, 0x134: 0x4a, 0x135: 0x4b, 0x137: 0x4c,
-	0x138: 0x4d, 0x139: 0x4e, 0x13a: 0x4f, 0x13b: 0x50, 0x13c: 0x51, 0x13d: 0x52, 0x13e: 0x53, 0x13f: 0x54,
+	0x120: 0x3a, 0x121: 0x3b, 0x123: 0x3c, 0x124: 0x3d, 0x125: 0x3e, 0x126: 0x3f, 0x127: 0x40,
+	0x128: 0x41, 0x129: 0x42, 0x12a: 0x43, 0x12b: 0x44, 0x12c: 0x3f, 0x12d: 0x45, 0x12e: 0x46, 0x12f: 0x47,
+	0x131: 0x48, 0x132: 0x49, 0x133: 0x4a, 0x134: 0x4b, 0x135: 0x4c, 0x137: 0x4d,
+	0x138: 0x4e, 0x139: 0x4f, 0x13a: 0x50, 0x13b: 0x51, 0x13c: 0x52, 0x13d: 0x53, 0x13e: 0x54, 0x13f: 0x55,
 	// Block 0x5, offset 0x140
-	0x140: 0x55, 0x142: 0x56, 0x144: 0x57, 0x145: 0x58, 0x146: 0x59, 0x147: 0x5a,
-	0x14d: 0x5b,
-	0x15c: 0x5c, 0x15f: 0x5d,
-	0x162: 0x5e, 0x164: 0x5f,
-	0x168: 0x60, 0x169: 0x61, 0x16a: 0x62, 0x16c: 0x0d, 0x16d: 0x63, 0x16e: 0x64, 0x16f: 0x65,
-	0x170: 0x66, 0x173: 0x67, 0x177: 0x68,
-	0x178: 0x0e, 0x179: 0x0f, 0x17a: 0x10, 0x17b: 0x11, 0x17c: 0x12, 0x17d: 0x13, 0x17e: 0x14, 0x17f: 0x15,
+	0x140: 0x56, 0x142: 0x57, 0x144: 0x58, 0x145: 0x59, 0x146: 0x5a, 0x147: 0x5b,
+	0x14d: 0x5c,
+	0x15c: 0x5d, 0x15f: 0x5e,
+	0x162: 0x5f, 0x164: 0x60,
+	0x168: 0x61, 0x169: 0x62, 0x16a: 0x63, 0x16c: 0x0d, 0x16d: 0x64, 0x16e: 0x65, 0x16f: 0x66,
+	0x170: 0x67, 0x173: 0x68, 0x177: 0x0e,
+	0x178: 0x0f, 0x179: 0x10, 0x17a: 0x11, 0x17b: 0x12, 0x17c: 0x13, 0x17d: 0x14, 0x17e: 0x15, 0x17f: 0x16,
 	// Block 0x6, offset 0x180
 	0x180: 0x69, 0x183: 0x6a, 0x184: 0x6b, 0x186: 0x6c, 0x187: 0x6d,
-	0x188: 0x6e, 0x189: 0x16, 0x18a: 0x17, 0x18b: 0x6f, 0x18c: 0x70,
+	0x188: 0x6e, 0x189: 0x17, 0x18a: 0x18, 0x18b: 0x6f, 0x18c: 0x70,
 	0x1ab: 0x71,
 	0x1b3: 0x72, 0x1b5: 0x73, 0x1b7: 0x74,
 	// Block 0x7, offset 0x1c0
-	0x1c0: 0x75, 0x1c1: 0x18, 0x1c2: 0x19, 0x1c3: 0x1a, 0x1c4: 0x76, 0x1c5: 0x77,
+	0x1c0: 0x75, 0x1c1: 0x19, 0x1c2: 0x1a, 0x1c3: 0x1b, 0x1c4: 0x76, 0x1c5: 0x77,
 	0x1c9: 0x78, 0x1cc: 0x79, 0x1cd: 0x7a,
 	// Block 0x8, offset 0x200
 	0x219: 0x7b, 0x21a: 0x7c, 0x21b: 0x7d,
@@ -3471,8 +3487,8 @@ var nfcIndex = [1408]uint8{
 	0x2d0: 0x8d, 0x2d1: 0x87, 0x2d2: 0x88, 0x2d3: 0x89, 0x2d4: 0x8a, 0x2d5: 0x8b, 0x2d6: 0x8c, 0x2d7: 0x8d,
 	0x2d8: 0x87, 0x2d9: 0x88, 0x2da: 0x89, 0x2db: 0x8a, 0x2dc: 0x8b, 0x2dd: 0x8c, 0x2de: 0x8e,
 	// Block 0xc, offset 0x300
-	0x324: 0x1b, 0x325: 0x1c, 0x326: 0x1d, 0x327: 0x1e,
-	0x328: 0x1f, 0x329: 0x20, 0x32a: 0x21, 0x32b: 0x22, 0x32c: 0x8f, 0x32d: 0x90, 0x32e: 0x91,
+	0x324: 0x1c, 0x325: 0x1d, 0x326: 0x1e, 0x327: 0x1f,
+	0x328: 0x20, 0x329: 0x21, 0x32a: 0x22, 0x32b: 0x23, 0x32c: 0x8f, 0x32d: 0x90, 0x32e: 0x91,
 	0x331: 0x92, 0x332: 0x93, 0x333: 0x94, 0x334: 0x95,
 	0x338: 0x96, 0x339: 0x97, 0x33a: 0x98, 0x33b: 0x99, 0x33e: 0x9a, 0x33f: 0x9b,
 	// Block 0xd, offset 0x340
@@ -3481,36 +3497,37 @@ var nfcIndex = [1408]uint8{
 	0x368: 0x9f, 0x36b: 0xa0,
 	// Block 0xe, offset 0x380
 	0x381: 0xa1, 0x382: 0xa2, 0x384: 0xa3, 0x385: 0x82, 0x387: 0xa4,
-	0x388: 0xa5, 0x38b: 0xa6, 0x38c: 0x3e, 0x38d: 0xa7,
+	0x388: 0xa5, 0x38b: 0xa6, 0x38c: 0x3f, 0x38d: 0xa7,
 	0x391: 0xa8, 0x392: 0xa9, 0x393: 0xaa, 0x396: 0xab, 0x397: 0xac,
 	0x398: 0x73, 0x39a: 0xad, 0x39c: 0xae,
-	0x3b0: 0x73,
+	0x3a8: 0xaf, 0x3a9: 0xb0, 0x3aa: 0xb1,
+	0x3b0: 0x73, 0x3b5: 0xb2,
 	// Block 0xf, offset 0x3c0
-	0x3eb: 0xaf, 0x3ec: 0xb0,
+	0x3eb: 0xb3, 0x3ec: 0xb4,
 	// Block 0x10, offset 0x400
-	0x432: 0xb1,
+	0x432: 0xb5,
 	// Block 0x11, offset 0x440
-	0x445: 0xb2, 0x446: 0xb3, 0x447: 0xb4,
-	0x449: 0xb5,
+	0x445: 0xb6, 0x446: 0xb7, 0x447: 0xb8,
+	0x449: 0xb9,
 	// Block 0x12, offset 0x480
-	0x480: 0xb6,
-	0x4a3: 0xb7, 0x4a5: 0xb8,
+	0x480: 0xba,
+	0x4a3: 0xbb, 0x4a5: 0xbc,
 	// Block 0x13, offset 0x4c0
-	0x4c8: 0xb9,
+	0x4c8: 0xbd,
 	// Block 0x14, offset 0x500
-	0x520: 0x23, 0x521: 0x24, 0x522: 0x25, 0x523: 0x26, 0x524: 0x27, 0x525: 0x28, 0x526: 0x29, 0x527: 0x2a,
-	0x528: 0x2b,
+	0x520: 0x24, 0x521: 0x25, 0x522: 0x26, 0x523: 0x27, 0x524: 0x28, 0x525: 0x29, 0x526: 0x2a, 0x527: 0x2b,
+	0x528: 0x2c,
 	// Block 0x15, offset 0x540
 	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
 	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
 	0x56f: 0x12,
 }
 
-// nfcSparseOffset: 142 entries, 284 bytes
-var nfcSparseOffset = []uint16{0x0, 0x5, 0x9, 0xb, 0xd, 0x18, 0x28, 0x2a, 0x2f, 0x3a, 0x49, 0x56, 0x5e, 0x62, 0x67, 0x69, 0x7a, 0x82, 0x89, 0x8c, 0x93, 0x97, 0x9b, 0x9d, 0x9f, 0xa8, 0xac, 0xb3, 0xb8, 0xbb, 0xc5, 0xc7, 0xce, 0xd6, 0xd9, 0xdb, 0xdd, 0xdf, 0xe4, 0xf5, 0x101, 0x103, 0x109, 0x10b, 0x10d, 0x10f, 0x111, 0x113, 0x115, 0x118, 0x11b, 0x11d, 0x120, 0x123, 0x127, 0x12c, 0x135, 0x137, 0x13a, 0x13c, 0x147, 0x157, 0x15b, 0x169, 0x16c, 0x172, 0x178, 0x183, 0x187, 0x189, 0x18b, 0x18d, 0x18f, 0x191, 0x197, 0x19b, 0x19d, 0x19f, 0x1a7, 0x1ab, 0x1ae, 0x1b0, 0x1b2, 0x1b4, 0x1b7, 0x1b9, 0x1bb, 0x1bd, 0x1bf, 0x1c5, 0x1c8, 0x1ca, 0x1d1, 0x1d7, 0x1dd, 0x1e5, 0x1eb, 0x1f1, 0x1f7, 0x1fb, 0x209, 0x212, 0x215, 0x218, 0x21a, 0x21d, 0x21f, 0x223, 0x228, 0x22a, 0x22c, 0x231, 0x237, 0x239, 0x23b, 0x23d, 0x243, 0x246, 0x249, 0x251, 0x258, 0x25b, 0x25e, 0x260, 0x268, 0x26b, 0x272, 0x275, 0x27b, 0x27d, 0x280, 0x282, 0x284, 0x286, 0x288, 0x295, 0x29f, 0x2a1, 0x2a3, 0x2a9, 0x2ab, 0x2ae}
+// nfcSparseOffset: 145 entries, 290 bytes
+var nfcSparseOffset = []uint16{0x0, 0x5, 0x9, 0xb, 0xd, 0x18, 0x28, 0x2a, 0x2f, 0x3a, 0x49, 0x56, 0x5e, 0x62, 0x67, 0x69, 0x7a, 0x82, 0x89, 0x8c, 0x93, 0x97, 0x9b, 0x9d, 0x9f, 0xa8, 0xac, 0xb3, 0xb8, 0xbb, 0xc5, 0xc8, 0xcf, 0xd7, 0xda, 0xdc, 0xde, 0xe0, 0xe5, 0xf6, 0x102, 0x104, 0x10a, 0x10c, 0x10e, 0x110, 0x112, 0x114, 0x116, 0x119, 0x11c, 0x11e, 0x121, 0x124, 0x128, 0x12d, 0x136, 0x138, 0x13b, 0x13d, 0x148, 0x14c, 0x15a, 0x15d, 0x163, 0x169, 0x174, 0x178, 0x17a, 0x17c, 0x17e, 0x180, 0x182, 0x188, 0x18c, 0x18e, 0x190, 0x198, 0x19c, 0x19f, 0x1a1, 0x1a3, 0x1a5, 0x1a8, 0x1aa, 0x1ac, 0x1ae, 0x1b0, 0x1b6, 0x1b9, 0x1bb, 0x1c2, 0x1c8, 0x1ce, 0x1d6, 0x1dc, 0x1e2, 0x1e8, 0x1ec, 0x1fa, 0x203, 0x206, 0x209, 0x20b, 0x20e, 0x210, 0x214, 0x219, 0x21b, 0x21d, 0x222, 0x228, 0x22a, 0x22c, 0x22e, 0x234, 0x237, 0x23a, 0x242, 0x249, 0x24c, 0x24f, 0x251, 0x259, 0x25c, 0x263, 0x266, 0x26c, 0x26e, 0x271, 0x273, 0x275, 0x277, 0x279, 0x27c, 0x27e, 0x280, 0x282, 0x28f, 0x299, 0x29b, 0x29d, 0x2a3, 0x2a5, 0x2a8}
 
-// nfcSparseValues: 688 entries, 2752 bytes
-var nfcSparseValues = [688]valueRange{
+// nfcSparseValues: 682 entries, 2728 bytes
+var nfcSparseValues = [682]valueRange{
 	// Block 0x0, offset 0x0
 	{value: 0x0000, lo: 0x04},
 	{value: 0xa100, lo: 0xa8, hi: 0xa8},
@@ -3519,8 +3536,8 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x8100, lo: 0xb8, hi: 0xb8},
 	// Block 0x1, offset 0x5
 	{value: 0x0091, lo: 0x03},
-	{value: 0x4778, lo: 0xa0, hi: 0xa1},
-	{value: 0x47aa, lo: 0xaf, hi: 0xb0},
+	{value: 0x46e2, lo: 0xa0, hi: 0xa1},
+	{value: 0x4714, lo: 0xaf, hi: 0xb0},
 	{value: 0xa000, lo: 0xb7, hi: 0xb7},
 	// Block 0x2, offset 0x9
 	{value: 0x0000, lo: 0x01},
@@ -3533,11 +3550,11 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0xa000, lo: 0x81, hi: 0x81},
 	{value: 0xa000, lo: 0x85, hi: 0x85},
 	{value: 0xa000, lo: 0x89, hi: 0x89},
-	{value: 0x48d6, lo: 0x8a, hi: 0x8a},
-	{value: 0x48f4, lo: 0x8b, hi: 0x8b},
+	{value: 0x4840, lo: 0x8a, hi: 0x8a},
+	{value: 0x485e, lo: 0x8b, hi: 0x8b},
 	{value: 0x36c7, lo: 0x8c, hi: 0x8c},
 	{value: 0x36df, lo: 0x8d, hi: 0x8d},
-	{value: 0x490c, lo: 0x8e, hi: 0x8e},
+	{value: 0x4876, lo: 0x8e, hi: 0x8e},
 	{value: 0xa000, lo: 0x92, hi: 0x92},
 	{value: 0x36fd, lo: 0x93, hi: 0x94},
 	// Block 0x5, offset 0x18
@@ -3665,7 +3682,7 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x812d, lo: 0x92, hi: 0x92},
 	{value: 0x8132, lo: 0x93, hi: 0x93},
 	{value: 0x8132, lo: 0x94, hi: 0x94},
-	{value: 0x45b2, lo: 0x98, hi: 0x9f},
+	{value: 0x451c, lo: 0x98, hi: 0x9f},
 	// Block 0x12, offset 0x89
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8102, lo: 0xbc, hi: 0xbc},
@@ -3676,18 +3693,18 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x2c9e, lo: 0x8b, hi: 0x8c},
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
 	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x45f2, lo: 0x9c, hi: 0x9d},
-	{value: 0x4602, lo: 0x9f, hi: 0x9f},
+	{value: 0x455c, lo: 0x9c, hi: 0x9d},
+	{value: 0x456c, lo: 0x9f, hi: 0x9f},
 	// Block 0x14, offset 0x93
 	{value: 0x0000, lo: 0x03},
-	{value: 0x462a, lo: 0xb3, hi: 0xb3},
-	{value: 0x4632, lo: 0xb6, hi: 0xb6},
+	{value: 0x4594, lo: 0xb3, hi: 0xb3},
+	{value: 0x459c, lo: 0xb6, hi: 0xb6},
 	{value: 0x8102, lo: 0xbc, hi: 0xbc},
 	// Block 0x15, offset 0x97
 	{value: 0x0008, lo: 0x03},
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x460a, lo: 0x99, hi: 0x9b},
-	{value: 0x4622, lo: 0x9e, hi: 0x9e},
+	{value: 0x4574, lo: 0x99, hi: 0x9b},
+	{value: 0x458c, lo: 0x9e, hi: 0x9e},
 	// Block 0x16, offset 0x9b
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8102, lo: 0xbc, hi: 0xbc},
@@ -3702,8 +3719,8 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x2cbe, lo: 0x8c, hi: 0x8c},
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
 	{value: 0x9900, lo: 0x96, hi: 0x97},
-	{value: 0x463a, lo: 0x9c, hi: 0x9c},
-	{value: 0x4642, lo: 0x9d, hi: 0x9d},
+	{value: 0x45a4, lo: 0x9c, hi: 0x9c},
+	{value: 0x45ac, lo: 0x9d, hi: 0x9d},
 	// Block 0x19, offset 0xa8
 	{value: 0x0000, lo: 0x03},
 	{value: 0xa000, lo: 0x92, hi: 0x92},
@@ -3739,9 +3756,10 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
 	{value: 0x9900, lo: 0x95, hi: 0x96},
 	// Block 0x1e, offset 0xc5
-	{value: 0x0000, lo: 0x01},
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xbb, hi: 0xbc},
 	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x1f, offset 0xc7
+	// Block 0x1f, offset 0xc8
 	{value: 0x0000, lo: 0x06},
 	{value: 0xa000, lo: 0x86, hi: 0x87},
 	{value: 0x2cfe, lo: 0x8a, hi: 0x8a},
@@ -3749,7 +3767,7 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x2d06, lo: 0x8c, hi: 0x8c},
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
 	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x20, offset 0xce
+	// Block 0x20, offset 0xcf
 	{value: 0x6bea, lo: 0x07},
 	{value: 0x9904, lo: 0x8a, hi: 0x8a},
 	{value: 0x9900, lo: 0x8f, hi: 0x8f},
@@ -3758,26 +3776,26 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x2f58, lo: 0x9c, hi: 0x9c},
 	{value: 0x2de3, lo: 0x9d, hi: 0x9d},
 	{value: 0x2d16, lo: 0x9e, hi: 0x9f},
-	// Block 0x21, offset 0xd6
+	// Block 0x21, offset 0xd7
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8122, lo: 0xb8, hi: 0xb9},
 	{value: 0x8104, lo: 0xba, hi: 0xba},
-	// Block 0x22, offset 0xd9
+	// Block 0x22, offset 0xda
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8123, lo: 0x88, hi: 0x8b},
-	// Block 0x23, offset 0xdb
+	// Block 0x23, offset 0xdc
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8124, lo: 0xb8, hi: 0xb9},
-	// Block 0x24, offset 0xdd
+	// Block 0x24, offset 0xde
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8125, lo: 0x88, hi: 0x8b},
-	// Block 0x25, offset 0xdf
+	// Block 0x25, offset 0xe0
 	{value: 0x0000, lo: 0x04},
 	{value: 0x812d, lo: 0x98, hi: 0x99},
 	{value: 0x812d, lo: 0xb5, hi: 0xb5},
 	{value: 0x812d, lo: 0xb7, hi: 0xb7},
 	{value: 0x812b, lo: 0xb9, hi: 0xb9},
-	// Block 0x26, offset 0xe4
+	// Block 0x26, offset 0xe5
 	{value: 0x0000, lo: 0x10},
 	{value: 0x2644, lo: 0x83, hi: 0x83},
 	{value: 0x264b, lo: 0x8d, hi: 0x8d},
@@ -3787,18 +3805,18 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x263d, lo: 0xa9, hi: 0xa9},
 	{value: 0x8126, lo: 0xb1, hi: 0xb1},
 	{value: 0x8127, lo: 0xb2, hi: 0xb2},
-	{value: 0x4a66, lo: 0xb3, hi: 0xb3},
+	{value: 0x4a84, lo: 0xb3, hi: 0xb3},
 	{value: 0x8128, lo: 0xb4, hi: 0xb4},
-	{value: 0x4a6f, lo: 0xb5, hi: 0xb5},
-	{value: 0x464a, lo: 0xb6, hi: 0xb6},
+	{value: 0x4a8d, lo: 0xb5, hi: 0xb5},
+	{value: 0x45b4, lo: 0xb6, hi: 0xb6},
 	{value: 0x8200, lo: 0xb7, hi: 0xb7},
-	{value: 0x4652, lo: 0xb8, hi: 0xb8},
+	{value: 0x45bc, lo: 0xb8, hi: 0xb8},
 	{value: 0x8200, lo: 0xb9, hi: 0xb9},
 	{value: 0x8127, lo: 0xba, hi: 0xbd},
-	// Block 0x27, offset 0xf5
+	// Block 0x27, offset 0xf6
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x8127, lo: 0x80, hi: 0x80},
-	{value: 0x4a78, lo: 0x81, hi: 0x81},
+	{value: 0x4a96, lo: 0x81, hi: 0x81},
 	{value: 0x8132, lo: 0x82, hi: 0x83},
 	{value: 0x8104, lo: 0x84, hi: 0x84},
 	{value: 0x8132, lo: 0x86, hi: 0x87},
@@ -3808,65 +3826,65 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x2683, lo: 0xa7, hi: 0xa7},
 	{value: 0x268a, lo: 0xac, hi: 0xac},
 	{value: 0x2667, lo: 0xb9, hi: 0xb9},
-	// Block 0x28, offset 0x101
+	// Block 0x28, offset 0x102
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0x86, hi: 0x86},
-	// Block 0x29, offset 0x103
+	// Block 0x29, offset 0x104
 	{value: 0x0000, lo: 0x05},
 	{value: 0xa000, lo: 0xa5, hi: 0xa5},
 	{value: 0x2d1e, lo: 0xa6, hi: 0xa6},
 	{value: 0x9900, lo: 0xae, hi: 0xae},
 	{value: 0x8102, lo: 0xb7, hi: 0xb7},
 	{value: 0x8104, lo: 0xb9, hi: 0xba},
-	// Block 0x2a, offset 0x109
+	// Block 0x2a, offset 0x10a
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0x8d, hi: 0x8d},
-	// Block 0x2b, offset 0x10b
+	// Block 0x2b, offset 0x10c
 	{value: 0x0000, lo: 0x01},
 	{value: 0xa000, lo: 0x80, hi: 0x92},
-	// Block 0x2c, offset 0x10d
+	// Block 0x2c, offset 0x10e
 	{value: 0x0000, lo: 0x01},
 	{value: 0xb900, lo: 0xa1, hi: 0xb5},
-	// Block 0x2d, offset 0x10f
+	// Block 0x2d, offset 0x110
 	{value: 0x0000, lo: 0x01},
 	{value: 0x9900, lo: 0xa8, hi: 0xbf},
-	// Block 0x2e, offset 0x111
+	// Block 0x2e, offset 0x112
 	{value: 0x0000, lo: 0x01},
 	{value: 0x9900, lo: 0x80, hi: 0x82},
-	// Block 0x2f, offset 0x113
+	// Block 0x2f, offset 0x114
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0x9d, hi: 0x9f},
-	// Block 0x30, offset 0x115
+	// Block 0x30, offset 0x116
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x94, hi: 0x94},
 	{value: 0x8104, lo: 0xb4, hi: 0xb4},
-	// Block 0x31, offset 0x118
+	// Block 0x31, offset 0x119
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x92, hi: 0x92},
 	{value: 0x8132, lo: 0x9d, hi: 0x9d},
-	// Block 0x32, offset 0x11b
+	// Block 0x32, offset 0x11c
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8131, lo: 0xa9, hi: 0xa9},
-	// Block 0x33, offset 0x11d
+	// Block 0x33, offset 0x11e
 	{value: 0x0004, lo: 0x02},
 	{value: 0x812e, lo: 0xb9, hi: 0xba},
 	{value: 0x812d, lo: 0xbb, hi: 0xbb},
-	// Block 0x34, offset 0x120
+	// Block 0x34, offset 0x121
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0x97, hi: 0x97},
 	{value: 0x812d, lo: 0x98, hi: 0x98},
-	// Block 0x35, offset 0x123
+	// Block 0x35, offset 0x124
 	{value: 0x0000, lo: 0x03},
 	{value: 0x8104, lo: 0xa0, hi: 0xa0},
 	{value: 0x8132, lo: 0xb5, hi: 0xbc},
 	{value: 0x812d, lo: 0xbf, hi: 0xbf},
-	// Block 0x36, offset 0x127
+	// Block 0x36, offset 0x128
 	{value: 0x0000, lo: 0x04},
 	{value: 0x8132, lo: 0xb0, hi: 0xb4},
 	{value: 0x812d, lo: 0xb5, hi: 0xba},
 	{value: 0x8132, lo: 0xbb, hi: 0xbc},
 	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	// Block 0x37, offset 0x12c
+	// Block 0x37, offset 0x12d
 	{value: 0x0000, lo: 0x08},
 	{value: 0x2d66, lo: 0x80, hi: 0x80},
 	{value: 0x2d6e, lo: 0x81, hi: 0x81},
@@ -3876,17 +3894,17 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x8132, lo: 0xab, hi: 0xab},
 	{value: 0x812d, lo: 0xac, hi: 0xac},
 	{value: 0x8132, lo: 0xad, hi: 0xb3},
-	// Block 0x38, offset 0x135
+	// Block 0x38, offset 0x136
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0xaa, hi: 0xab},
-	// Block 0x39, offset 0x137
+	// Block 0x39, offset 0x138
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8102, lo: 0xa6, hi: 0xa6},
 	{value: 0x8104, lo: 0xb2, hi: 0xb3},
-	// Block 0x3a, offset 0x13a
+	// Block 0x3a, offset 0x13b
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	// Block 0x3b, offset 0x13c
+	// Block 0x3b, offset 0x13d
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x8132, lo: 0x90, hi: 0x92},
 	{value: 0x8101, lo: 0x94, hi: 0x94},
@@ -3898,29 +3916,12 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x812d, lo: 0xad, hi: 0xad},
 	{value: 0x8132, lo: 0xb4, hi: 0xb4},
 	{value: 0x8132, lo: 0xb8, hi: 0xb9},
-	// Block 0x3c, offset 0x147
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x8132, lo: 0x80, hi: 0x81},
-	{value: 0x812d, lo: 0x82, hi: 0x82},
-	{value: 0x8132, lo: 0x83, hi: 0x89},
-	{value: 0x812d, lo: 0x8a, hi: 0x8a},
-	{value: 0x8132, lo: 0x8b, hi: 0x8c},
-	{value: 0x8135, lo: 0x8d, hi: 0x8d},
-	{value: 0x812a, lo: 0x8e, hi: 0x8e},
-	{value: 0x812d, lo: 0x8f, hi: 0x8f},
-	{value: 0x8129, lo: 0x90, hi: 0x90},
-	{value: 0x8132, lo: 0x91, hi: 0xb5},
-	{value: 0x8132, lo: 0xbb, hi: 0xbb},
-	{value: 0x8134, lo: 0xbc, hi: 0xbc},
-	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	{value: 0x8132, lo: 0xbe, hi: 0xbe},
-	{value: 0x812d, lo: 0xbf, hi: 0xbf},
-	// Block 0x3d, offset 0x157
+	// Block 0x3c, offset 0x148
 	{value: 0x0004, lo: 0x03},
 	{value: 0x0433, lo: 0x80, hi: 0x81},
 	{value: 0x8100, lo: 0x97, hi: 0x97},
 	{value: 0x8100, lo: 0xbe, hi: 0xbe},
-	// Block 0x3e, offset 0x15b
+	// Block 0x3d, offset 0x14c
 	{value: 0x0000, lo: 0x0d},
 	{value: 0x8132, lo: 0x90, hi: 0x91},
 	{value: 0x8101, lo: 0x92, hi: 0x93},
@@ -3935,25 +3936,25 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x8101, lo: 0xaa, hi: 0xab},
 	{value: 0x812d, lo: 0xac, hi: 0xaf},
 	{value: 0x8132, lo: 0xb0, hi: 0xb0},
-	// Block 0x3f, offset 0x169
+	// Block 0x3e, offset 0x15a
 	{value: 0x427b, lo: 0x02},
 	{value: 0x01b8, lo: 0xa6, hi: 0xa6},
 	{value: 0x0057, lo: 0xaa, hi: 0xab},
-	// Block 0x40, offset 0x16c
+	// Block 0x3f, offset 0x15d
 	{value: 0x0007, lo: 0x05},
 	{value: 0xa000, lo: 0x90, hi: 0x90},
 	{value: 0xa000, lo: 0x92, hi: 0x92},
 	{value: 0xa000, lo: 0x94, hi: 0x94},
 	{value: 0x3bb9, lo: 0x9a, hi: 0x9b},
 	{value: 0x3bc7, lo: 0xae, hi: 0xae},
-	// Block 0x41, offset 0x172
+	// Block 0x40, offset 0x163
 	{value: 0x000e, lo: 0x05},
 	{value: 0x3bce, lo: 0x8d, hi: 0x8e},
 	{value: 0x3bd5, lo: 0x8f, hi: 0x8f},
 	{value: 0xa000, lo: 0x90, hi: 0x90},
 	{value: 0xa000, lo: 0x92, hi: 0x92},
 	{value: 0xa000, lo: 0x94, hi: 0x94},
-	// Block 0x42, offset 0x178
+	// Block 0x41, offset 0x169
 	{value: 0x6408, lo: 0x0a},
 	{value: 0xa000, lo: 0x83, hi: 0x83},
 	{value: 0x3be3, lo: 0x84, hi: 0x84},
@@ -3965,45 +3966,45 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x3bf8, lo: 0xa4, hi: 0xa5},
 	{value: 0x3bff, lo: 0xa6, hi: 0xa6},
 	{value: 0xa000, lo: 0xbc, hi: 0xbc},
-	// Block 0x43, offset 0x183
+	// Block 0x42, offset 0x174
 	{value: 0x0007, lo: 0x03},
 	{value: 0x3c68, lo: 0xa0, hi: 0xa1},
 	{value: 0x3c92, lo: 0xa2, hi: 0xa3},
 	{value: 0x3cbc, lo: 0xaa, hi: 0xad},
-	// Block 0x44, offset 0x187
+	// Block 0x43, offset 0x178
 	{value: 0x0004, lo: 0x01},
 	{value: 0x048b, lo: 0xa9, hi: 0xaa},
-	// Block 0x45, offset 0x189
+	// Block 0x44, offset 0x17a
 	{value: 0x0000, lo: 0x01},
-	{value: 0x4573, lo: 0x9c, hi: 0x9c},
-	// Block 0x46, offset 0x18b
+	{value: 0x44dd, lo: 0x9c, hi: 0x9c},
+	// Block 0x45, offset 0x17c
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xaf, hi: 0xb1},
-	// Block 0x47, offset 0x18d
+	// Block 0x46, offset 0x17e
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x48, offset 0x18f
+	// Block 0x47, offset 0x180
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xa0, hi: 0xbf},
-	// Block 0x49, offset 0x191
+	// Block 0x48, offset 0x182
 	{value: 0x0000, lo: 0x05},
 	{value: 0x812c, lo: 0xaa, hi: 0xaa},
 	{value: 0x8131, lo: 0xab, hi: 0xab},
 	{value: 0x8133, lo: 0xac, hi: 0xac},
 	{value: 0x812e, lo: 0xad, hi: 0xad},
 	{value: 0x812f, lo: 0xae, hi: 0xaf},
-	// Block 0x4a, offset 0x197
+	// Block 0x49, offset 0x188
 	{value: 0x0000, lo: 0x03},
-	{value: 0x4a81, lo: 0xb3, hi: 0xb3},
-	{value: 0x4a81, lo: 0xb5, hi: 0xb6},
-	{value: 0x4a81, lo: 0xba, hi: 0xbf},
-	// Block 0x4b, offset 0x19b
+	{value: 0x4a9f, lo: 0xb3, hi: 0xb3},
+	{value: 0x4a9f, lo: 0xb5, hi: 0xb6},
+	{value: 0x4a9f, lo: 0xba, hi: 0xbf},
+	// Block 0x4a, offset 0x18c
 	{value: 0x0000, lo: 0x01},
-	{value: 0x4a81, lo: 0x8f, hi: 0xa3},
-	// Block 0x4c, offset 0x19d
+	{value: 0x4a9f, lo: 0x8f, hi: 0xa3},
+	// Block 0x4b, offset 0x18e
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8100, lo: 0xae, hi: 0xbe},
-	// Block 0x4d, offset 0x19f
+	// Block 0x4c, offset 0x190
 	{value: 0x0000, lo: 0x07},
 	{value: 0x8100, lo: 0x84, hi: 0x84},
 	{value: 0x8100, lo: 0x87, hi: 0x87},
@@ -4012,55 +4013,55 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x8100, lo: 0xa1, hi: 0xa1},
 	{value: 0x8100, lo: 0xb2, hi: 0xb2},
 	{value: 0x8100, lo: 0xbb, hi: 0xbb},
-	// Block 0x4e, offset 0x1a7
+	// Block 0x4d, offset 0x198
 	{value: 0x0000, lo: 0x03},
 	{value: 0x8100, lo: 0x80, hi: 0x80},
 	{value: 0x8100, lo: 0x8b, hi: 0x8b},
 	{value: 0x8100, lo: 0x8e, hi: 0x8e},
-	// Block 0x4f, offset 0x1ab
+	// Block 0x4e, offset 0x19c
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0xaf, hi: 0xaf},
 	{value: 0x8132, lo: 0xb4, hi: 0xbd},
-	// Block 0x50, offset 0x1ae
+	// Block 0x4f, offset 0x19f
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0x9e, hi: 0x9f},
-	// Block 0x51, offset 0x1b0
+	// Block 0x50, offset 0x1a1
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xb0, hi: 0xb1},
-	// Block 0x52, offset 0x1b2
+	// Block 0x51, offset 0x1a3
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0x86, hi: 0x86},
-	// Block 0x53, offset 0x1b4
+	// Block 0x52, offset 0x1a5
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x84, hi: 0x84},
 	{value: 0x8132, lo: 0xa0, hi: 0xb1},
-	// Block 0x54, offset 0x1b7
+	// Block 0x53, offset 0x1a8
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0xab, hi: 0xad},
-	// Block 0x55, offset 0x1b9
+	// Block 0x54, offset 0x1aa
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0x93, hi: 0x93},
-	// Block 0x56, offset 0x1bb
+	// Block 0x55, offset 0x1ac
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8102, lo: 0xb3, hi: 0xb3},
-	// Block 0x57, offset 0x1bd
+	// Block 0x56, offset 0x1ae
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0x80, hi: 0x80},
-	// Block 0x58, offset 0x1bf
+	// Block 0x57, offset 0x1b0
 	{value: 0x0000, lo: 0x05},
 	{value: 0x8132, lo: 0xb0, hi: 0xb0},
 	{value: 0x8132, lo: 0xb2, hi: 0xb3},
 	{value: 0x812d, lo: 0xb4, hi: 0xb4},
 	{value: 0x8132, lo: 0xb7, hi: 0xb8},
 	{value: 0x8132, lo: 0xbe, hi: 0xbf},
-	// Block 0x59, offset 0x1c5
+	// Block 0x58, offset 0x1b6
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0x81, hi: 0x81},
 	{value: 0x8104, lo: 0xb6, hi: 0xb6},
-	// Block 0x5a, offset 0x1c8
+	// Block 0x59, offset 0x1b9
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0xad, hi: 0xad},
-	// Block 0x5b, offset 0x1ca
+	// Block 0x5a, offset 0x1bb
 	{value: 0x0000, lo: 0x06},
 	{value: 0xe500, lo: 0x80, hi: 0x80},
 	{value: 0xc600, lo: 0x81, hi: 0x9b},
@@ -4068,21 +4069,21 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0xc600, lo: 0x9d, hi: 0xb7},
 	{value: 0xe500, lo: 0xb8, hi: 0xb8},
 	{value: 0xc600, lo: 0xb9, hi: 0xbf},
-	// Block 0x5c, offset 0x1d1
+	// Block 0x5b, offset 0x1c2
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x93},
 	{value: 0xe500, lo: 0x94, hi: 0x94},
 	{value: 0xc600, lo: 0x95, hi: 0xaf},
 	{value: 0xe500, lo: 0xb0, hi: 0xb0},
 	{value: 0xc600, lo: 0xb1, hi: 0xbf},
-	// Block 0x5d, offset 0x1d7
+	// Block 0x5c, offset 0x1c8
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x8b},
 	{value: 0xe500, lo: 0x8c, hi: 0x8c},
 	{value: 0xc600, lo: 0x8d, hi: 0xa7},
 	{value: 0xe500, lo: 0xa8, hi: 0xa8},
 	{value: 0xc600, lo: 0xa9, hi: 0xbf},
-	// Block 0x5e, offset 0x1dd
+	// Block 0x5d, offset 0x1ce
 	{value: 0x0000, lo: 0x07},
 	{value: 0xc600, lo: 0x80, hi: 0x83},
 	{value: 0xe500, lo: 0x84, hi: 0x84},
@@ -4091,130 +4092,130 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0xc600, lo: 0xa1, hi: 0xbb},
 	{value: 0xe500, lo: 0xbc, hi: 0xbc},
 	{value: 0xc600, lo: 0xbd, hi: 0xbf},
-	// Block 0x5f, offset 0x1e5
+	// Block 0x5e, offset 0x1d6
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x97},
 	{value: 0xe500, lo: 0x98, hi: 0x98},
 	{value: 0xc600, lo: 0x99, hi: 0xb3},
 	{value: 0xe500, lo: 0xb4, hi: 0xb4},
 	{value: 0xc600, lo: 0xb5, hi: 0xbf},
-	// Block 0x60, offset 0x1eb
+	// Block 0x5f, offset 0x1dc
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x8f},
 	{value: 0xe500, lo: 0x90, hi: 0x90},
 	{value: 0xc600, lo: 0x91, hi: 0xab},
 	{value: 0xe500, lo: 0xac, hi: 0xac},
 	{value: 0xc600, lo: 0xad, hi: 0xbf},
-	// Block 0x61, offset 0x1f1
+	// Block 0x60, offset 0x1e2
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x87},
 	{value: 0xe500, lo: 0x88, hi: 0x88},
 	{value: 0xc600, lo: 0x89, hi: 0xa3},
 	{value: 0xe500, lo: 0xa4, hi: 0xa4},
 	{value: 0xc600, lo: 0xa5, hi: 0xbf},
-	// Block 0x62, offset 0x1f7
+	// Block 0x61, offset 0x1e8
 	{value: 0x0000, lo: 0x03},
 	{value: 0xc600, lo: 0x80, hi: 0x87},
 	{value: 0xe500, lo: 0x88, hi: 0x88},
 	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	// Block 0x63, offset 0x1fb
+	// Block 0x62, offset 0x1ec
 	{value: 0x0006, lo: 0x0d},
-	{value: 0x4426, lo: 0x9d, hi: 0x9d},
+	{value: 0x4390, lo: 0x9d, hi: 0x9d},
 	{value: 0x8115, lo: 0x9e, hi: 0x9e},
-	{value: 0x4498, lo: 0x9f, hi: 0x9f},
-	{value: 0x4486, lo: 0xaa, hi: 0xab},
-	{value: 0x458a, lo: 0xac, hi: 0xac},
-	{value: 0x4592, lo: 0xad, hi: 0xad},
-	{value: 0x43de, lo: 0xae, hi: 0xb1},
-	{value: 0x43fc, lo: 0xb2, hi: 0xb4},
-	{value: 0x4414, lo: 0xb5, hi: 0xb6},
-	{value: 0x4420, lo: 0xb8, hi: 0xb8},
-	{value: 0x442c, lo: 0xb9, hi: 0xbb},
-	{value: 0x4444, lo: 0xbc, hi: 0xbc},
-	{value: 0x444a, lo: 0xbe, hi: 0xbe},
-	// Block 0x64, offset 0x209
+	{value: 0x4402, lo: 0x9f, hi: 0x9f},
+	{value: 0x43f0, lo: 0xaa, hi: 0xab},
+	{value: 0x44f4, lo: 0xac, hi: 0xac},
+	{value: 0x44fc, lo: 0xad, hi: 0xad},
+	{value: 0x4348, lo: 0xae, hi: 0xb1},
+	{value: 0x4366, lo: 0xb2, hi: 0xb4},
+	{value: 0x437e, lo: 0xb5, hi: 0xb6},
+	{value: 0x438a, lo: 0xb8, hi: 0xb8},
+	{value: 0x4396, lo: 0xb9, hi: 0xbb},
+	{value: 0x43ae, lo: 0xbc, hi: 0xbc},
+	{value: 0x43b4, lo: 0xbe, hi: 0xbe},
+	// Block 0x63, offset 0x1fa
 	{value: 0x0006, lo: 0x08},
-	{value: 0x4450, lo: 0x80, hi: 0x81},
-	{value: 0x445c, lo: 0x83, hi: 0x84},
-	{value: 0x446e, lo: 0x86, hi: 0x89},
-	{value: 0x4492, lo: 0x8a, hi: 0x8a},
-	{value: 0x440e, lo: 0x8b, hi: 0x8b},
-	{value: 0x43f6, lo: 0x8c, hi: 0x8c},
-	{value: 0x443e, lo: 0x8d, hi: 0x8d},
-	{value: 0x4468, lo: 0x8e, hi: 0x8e},
-	// Block 0x65, offset 0x212
+	{value: 0x43ba, lo: 0x80, hi: 0x81},
+	{value: 0x43c6, lo: 0x83, hi: 0x84},
+	{value: 0x43d8, lo: 0x86, hi: 0x89},
+	{value: 0x43fc, lo: 0x8a, hi: 0x8a},
+	{value: 0x4378, lo: 0x8b, hi: 0x8b},
+	{value: 0x4360, lo: 0x8c, hi: 0x8c},
+	{value: 0x43a8, lo: 0x8d, hi: 0x8d},
+	{value: 0x43d2, lo: 0x8e, hi: 0x8e},
+	// Block 0x64, offset 0x203
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8100, lo: 0xa4, hi: 0xa5},
 	{value: 0x8100, lo: 0xb0, hi: 0xb1},
-	// Block 0x66, offset 0x215
+	// Block 0x65, offset 0x206
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8100, lo: 0x9b, hi: 0x9d},
 	{value: 0x8200, lo: 0x9e, hi: 0xa3},
-	// Block 0x67, offset 0x218
+	// Block 0x66, offset 0x209
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8100, lo: 0x90, hi: 0x90},
-	// Block 0x68, offset 0x21a
+	// Block 0x67, offset 0x20b
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8100, lo: 0x99, hi: 0x99},
 	{value: 0x8200, lo: 0xb2, hi: 0xb4},
-	// Block 0x69, offset 0x21d
+	// Block 0x68, offset 0x20e
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8100, lo: 0xbc, hi: 0xbd},
-	// Block 0x6a, offset 0x21f
+	// Block 0x69, offset 0x210
 	{value: 0x0000, lo: 0x03},
 	{value: 0x8132, lo: 0xa0, hi: 0xa6},
 	{value: 0x812d, lo: 0xa7, hi: 0xad},
 	{value: 0x8132, lo: 0xae, hi: 0xaf},
-	// Block 0x6b, offset 0x223
+	// Block 0x6a, offset 0x214
 	{value: 0x0000, lo: 0x04},
 	{value: 0x8100, lo: 0x89, hi: 0x8c},
 	{value: 0x8100, lo: 0xb0, hi: 0xb2},
 	{value: 0x8100, lo: 0xb4, hi: 0xb4},
 	{value: 0x8100, lo: 0xb6, hi: 0xbf},
-	// Block 0x6c, offset 0x228
+	// Block 0x6b, offset 0x219
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8100, lo: 0x81, hi: 0x8c},
-	// Block 0x6d, offset 0x22a
+	// Block 0x6c, offset 0x21b
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8100, lo: 0xb5, hi: 0xba},
-	// Block 0x6e, offset 0x22c
+	// Block 0x6d, offset 0x21d
 	{value: 0x0000, lo: 0x04},
-	{value: 0x4a81, lo: 0x9e, hi: 0x9f},
-	{value: 0x4a81, lo: 0xa3, hi: 0xa3},
-	{value: 0x4a81, lo: 0xa5, hi: 0xa6},
-	{value: 0x4a81, lo: 0xaa, hi: 0xaf},
-	// Block 0x6f, offset 0x231
+	{value: 0x4a9f, lo: 0x9e, hi: 0x9f},
+	{value: 0x4a9f, lo: 0xa3, hi: 0xa3},
+	{value: 0x4a9f, lo: 0xa5, hi: 0xa6},
+	{value: 0x4a9f, lo: 0xaa, hi: 0xaf},
+	// Block 0x6e, offset 0x222
 	{value: 0x0000, lo: 0x05},
-	{value: 0x4a81, lo: 0x82, hi: 0x87},
-	{value: 0x4a81, lo: 0x8a, hi: 0x8f},
-	{value: 0x4a81, lo: 0x92, hi: 0x97},
-	{value: 0x4a81, lo: 0x9a, hi: 0x9c},
+	{value: 0x4a9f, lo: 0x82, hi: 0x87},
+	{value: 0x4a9f, lo: 0x8a, hi: 0x8f},
+	{value: 0x4a9f, lo: 0x92, hi: 0x97},
+	{value: 0x4a9f, lo: 0x9a, hi: 0x9c},
 	{value: 0x8100, lo: 0xa3, hi: 0xa3},
-	// Block 0x70, offset 0x237
+	// Block 0x6f, offset 0x228
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	// Block 0x71, offset 0x239
+	// Block 0x70, offset 0x22a
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0xa0, hi: 0xa0},
-	// Block 0x72, offset 0x23b
+	// Block 0x71, offset 0x22c
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xb6, hi: 0xba},
-	// Block 0x73, offset 0x23d
+	// Block 0x72, offset 0x22e
 	{value: 0x002c, lo: 0x05},
 	{value: 0x812d, lo: 0x8d, hi: 0x8d},
 	{value: 0x8132, lo: 0x8f, hi: 0x8f},
 	{value: 0x8132, lo: 0xb8, hi: 0xb8},
 	{value: 0x8101, lo: 0xb9, hi: 0xba},
 	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x74, offset 0x243
+	// Block 0x73, offset 0x234
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0xa5, hi: 0xa5},
 	{value: 0x812d, lo: 0xa6, hi: 0xa6},
-	// Block 0x75, offset 0x246
+	// Block 0x74, offset 0x237
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x86, hi: 0x86},
 	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x76, offset 0x249
+	// Block 0x75, offset 0x23a
 	{value: 0x17fe, lo: 0x07},
 	{value: 0xa000, lo: 0x99, hi: 0x99},
 	{value: 0x4238, lo: 0x9a, hi: 0x9a},
@@ -4223,7 +4224,7 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0xa000, lo: 0xa5, hi: 0xa5},
 	{value: 0x424c, lo: 0xab, hi: 0xab},
 	{value: 0x8104, lo: 0xb9, hi: 0xba},
-	// Block 0x77, offset 0x251
+	// Block 0x76, offset 0x242
 	{value: 0x0000, lo: 0x06},
 	{value: 0x8132, lo: 0x80, hi: 0x82},
 	{value: 0x9900, lo: 0xa7, hi: 0xa7},
@@ -4231,18 +4232,18 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x2d88, lo: 0xaf, hi: 0xaf},
 	{value: 0xa000, lo: 0xb1, hi: 0xb2},
 	{value: 0x8104, lo: 0xb3, hi: 0xb4},
-	// Block 0x78, offset 0x258
+	// Block 0x77, offset 0x249
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x80, hi: 0x80},
 	{value: 0x8102, lo: 0x8a, hi: 0x8a},
-	// Block 0x79, offset 0x25b
+	// Block 0x78, offset 0x24c
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0xb5, hi: 0xb5},
 	{value: 0x8102, lo: 0xb6, hi: 0xb6},
-	// Block 0x7a, offset 0x25e
+	// Block 0x79, offset 0x24f
 	{value: 0x0002, lo: 0x01},
 	{value: 0x8102, lo: 0xa9, hi: 0xaa},
-	// Block 0x7b, offset 0x260
+	// Block 0x7a, offset 0x251
 	{value: 0x0000, lo: 0x07},
 	{value: 0xa000, lo: 0x87, hi: 0x87},
 	{value: 0x2d92, lo: 0x8b, hi: 0x8b},
@@ -4251,11 +4252,11 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x9900, lo: 0x97, hi: 0x97},
 	{value: 0x8132, lo: 0xa6, hi: 0xac},
 	{value: 0x8132, lo: 0xb0, hi: 0xb4},
-	// Block 0x7c, offset 0x268
+	// Block 0x7b, offset 0x259
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x82, hi: 0x82},
 	{value: 0x8102, lo: 0x86, hi: 0x86},
-	// Block 0x7d, offset 0x26b
+	// Block 0x7c, offset 0x25c
 	{value: 0x6b5a, lo: 0x06},
 	{value: 0x9900, lo: 0xb0, hi: 0xb0},
 	{value: 0xa000, lo: 0xb9, hi: 0xb9},
@@ -4263,82 +4264,95 @@ var nfcSparseValues = [688]valueRange{
 	{value: 0x2db0, lo: 0xbb, hi: 0xbb},
 	{value: 0x2da6, lo: 0xbc, hi: 0xbd},
 	{value: 0x2dba, lo: 0xbe, hi: 0xbe},
-	// Block 0x7e, offset 0x272
+	// Block 0x7d, offset 0x263
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x82, hi: 0x82},
 	{value: 0x8102, lo: 0x83, hi: 0x83},
-	// Block 0x7f, offset 0x275
+	// Block 0x7e, offset 0x266
 	{value: 0x0000, lo: 0x05},
 	{value: 0x9900, lo: 0xaf, hi: 0xaf},
 	{value: 0xa000, lo: 0xb8, hi: 0xb9},
 	{value: 0x2dc4, lo: 0xba, hi: 0xba},
 	{value: 0x2dce, lo: 0xbb, hi: 0xbb},
 	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x80, offset 0x27b
+	// Block 0x7f, offset 0x26c
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8102, lo: 0x80, hi: 0x80},
-	// Block 0x81, offset 0x27d
+	// Block 0x80, offset 0x26e
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0xb6, hi: 0xb6},
 	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	// Block 0x82, offset 0x280
+	// Block 0x81, offset 0x271
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0xab, hi: 0xab},
-	// Block 0x83, offset 0x282
+	// Block 0x82, offset 0x273
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xb4, hi: 0xb4},
+	// Block 0x83, offset 0x275
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x87, hi: 0x87},
+	// Block 0x84, offset 0x277
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x99, hi: 0x99},
+	// Block 0x85, offset 0x279
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0x82, hi: 0x82},
+	{value: 0x8104, lo: 0x84, hi: 0x85},
+	// Block 0x86, offset 0x27c
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8101, lo: 0xb0, hi: 0xb4},
-	// Block 0x84, offset 0x284
+	// Block 0x87, offset 0x27e
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xb0, hi: 0xb6},
-	// Block 0x85, offset 0x286
+	// Block 0x88, offset 0x280
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8101, lo: 0x9e, hi: 0x9e},
-	// Block 0x86, offset 0x288
+	// Block 0x89, offset 0x282
 	{value: 0x0000, lo: 0x0c},
-	{value: 0x4662, lo: 0x9e, hi: 0x9e},
-	{value: 0x466c, lo: 0x9f, hi: 0x9f},
-	{value: 0x46a0, lo: 0xa0, hi: 0xa0},
-	{value: 0x46ae, lo: 0xa1, hi: 0xa1},
-	{value: 0x46bc, lo: 0xa2, hi: 0xa2},
-	{value: 0x46ca, lo: 0xa3, hi: 0xa3},
-	{value: 0x46d8, lo: 0xa4, hi: 0xa4},
+	{value: 0x45cc, lo: 0x9e, hi: 0x9e},
+	{value: 0x45d6, lo: 0x9f, hi: 0x9f},
+	{value: 0x460a, lo: 0xa0, hi: 0xa0},
+	{value: 0x4618, lo: 0xa1, hi: 0xa1},
+	{value: 0x4626, lo: 0xa2, hi: 0xa2},
+	{value: 0x4634, lo: 0xa3, hi: 0xa3},
+	{value: 0x4642, lo: 0xa4, hi: 0xa4},
 	{value: 0x812b, lo: 0xa5, hi: 0xa6},
 	{value: 0x8101, lo: 0xa7, hi: 0xa9},
 	{value: 0x8130, lo: 0xad, hi: 0xad},
 	{value: 0x812b, lo: 0xae, hi: 0xb2},
 	{value: 0x812d, lo: 0xbb, hi: 0xbf},
-	// Block 0x87, offset 0x295
+	// Block 0x8a, offset 0x28f
 	{value: 0x0000, lo: 0x09},
 	{value: 0x812d, lo: 0x80, hi: 0x82},
 	{value: 0x8132, lo: 0x85, hi: 0x89},
 	{value: 0x812d, lo: 0x8a, hi: 0x8b},
 	{value: 0x8132, lo: 0xaa, hi: 0xad},
-	{value: 0x4676, lo: 0xbb, hi: 0xbb},
-	{value: 0x4680, lo: 0xbc, hi: 0xbc},
-	{value: 0x46e6, lo: 0xbd, hi: 0xbd},
-	{value: 0x4702, lo: 0xbe, hi: 0xbe},
-	{value: 0x46f4, lo: 0xbf, hi: 0xbf},
-	// Block 0x88, offset 0x29f
+	{value: 0x45e0, lo: 0xbb, hi: 0xbb},
+	{value: 0x45ea, lo: 0xbc, hi: 0xbc},
+	{value: 0x4650, lo: 0xbd, hi: 0xbd},
+	{value: 0x466c, lo: 0xbe, hi: 0xbe},
+	{value: 0x465e, lo: 0xbf, hi: 0xbf},
+	// Block 0x8b, offset 0x299
 	{value: 0x0000, lo: 0x01},
-	{value: 0x4710, lo: 0x80, hi: 0x80},
-	// Block 0x89, offset 0x2a1
+	{value: 0x467a, lo: 0x80, hi: 0x80},
+	// Block 0x8c, offset 0x29b
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0x82, hi: 0x84},
-	// Block 0x8a, offset 0x2a3
+	// Block 0x8d, offset 0x29d
 	{value: 0x0000, lo: 0x05},
 	{value: 0x8132, lo: 0x80, hi: 0x86},
 	{value: 0x8132, lo: 0x88, hi: 0x98},
 	{value: 0x8132, lo: 0x9b, hi: 0xa1},
 	{value: 0x8132, lo: 0xa3, hi: 0xa4},
 	{value: 0x8132, lo: 0xa6, hi: 0xaa},
-	// Block 0x8b, offset 0x2a9
+	// Block 0x8e, offset 0x2a3
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0x90, hi: 0x96},
-	// Block 0x8c, offset 0x2ab
+	// Block 0x8f, offset 0x2a5
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0x84, hi: 0x89},
 	{value: 0x8102, lo: 0x8a, hi: 0x8a},
-	// Block 0x8d, offset 0x2ae
+	// Block 0x90, offset 0x2a8
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8100, lo: 0x93, hi: 0x93},
 }
@@ -4513,7 +4527,7 @@ func (t *nfkcTrie) lookupStringUnsafe(s string) uint16 {
 	return 0
 }
 
-// nfkcTrie. Total size: 16994 bytes (16.60 KiB). Checksum: 146925fc21092b17.
+// nfkcTrie. Total size: 17104 bytes (16.70 KiB). Checksum: d985061cf5307b35.
 type nfkcTrie struct{}
 
 func newNfkcTrie(i int) *nfkcTrie {
@@ -4523,17 +4537,17 @@ func newNfkcTrie(i int) *nfkcTrie {
 // lookupValue determines the type of block n and looks up the value for b.
 func (t *nfkcTrie) lookupValue(n uint32, b byte) uint16 {
 	switch {
-	case n < 90:
+	case n < 91:
 		return uint16(nfkcValues[n<<6+uint32(b)])
 	default:
-		n -= 90
+		n -= 91
 		return uint16(nfkcSparse.lookup(n, b))
 	}
 }
 
-// nfkcValues: 92 blocks, 5888 entries, 11776 bytes
+// nfkcValues: 93 blocks, 5952 entries, 11904 bytes
 // The third block is the zero block.
-var nfkcValues = [5888]uint16{
+var nfkcValues = [5952]uint16{
 	// Block 0x0, offset 0x0
 	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
 	// Block 0x1, offset 0x40
@@ -4549,22 +4563,22 @@ var nfkcValues = [5888]uint16{
 	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
 	// Block 0x2, offset 0x80
 	// Block 0x3, offset 0xc0
-	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x471e, 0xc3: 0x2f79, 0xc4: 0x472d, 0xc5: 0x4732,
-	0xc6: 0xa000, 0xc7: 0x473c, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x4741, 0xcb: 0x2ffb,
-	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x4755, 0xd1: 0x3104,
-	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x475f, 0xd5: 0x4764, 0xd6: 0x4773,
-	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x47a5, 0xdd: 0x3235,
-	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x47af, 0xe3: 0x3285,
-	0xe4: 0x47be, 0xe5: 0x47c3, 0xe6: 0xa000, 0xe7: 0x47cd, 0xe8: 0x32ee, 0xe9: 0x32f3,
-	0xea: 0x47d2, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x47e6,
-	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x47f0, 0xf5: 0x47f5,
-	0xf6: 0x4804, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
-	0xfc: 0x4836, 0xfd: 0x3550, 0xff: 0x3569,
+	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x4688, 0xc3: 0x2f79, 0xc4: 0x4697, 0xc5: 0x469c,
+	0xc6: 0xa000, 0xc7: 0x46a6, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x46ab, 0xcb: 0x2ffb,
+	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x46bf, 0xd1: 0x3104,
+	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x46c9, 0xd5: 0x46ce, 0xd6: 0x46dd,
+	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x470f, 0xdd: 0x3235,
+	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x4719, 0xe3: 0x3285,
+	0xe4: 0x4728, 0xe5: 0x472d, 0xe6: 0xa000, 0xe7: 0x4737, 0xe8: 0x32ee, 0xe9: 0x32f3,
+	0xea: 0x473c, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x4750,
+	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x475a, 0xf5: 0x475f,
+	0xf6: 0x476e, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
+	0xfc: 0x47a0, 0xfd: 0x3550, 0xff: 0x3569,
 	// Block 0x4, offset 0x100
-	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x4723, 0x103: 0x47b4, 0x104: 0x2f9c, 0x105: 0x32a8,
+	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x468d, 0x103: 0x471e, 0x104: 0x2f9c, 0x105: 0x32a8,
 	0x106: 0x2fb0, 0x107: 0x32bc, 0x108: 0x2fb5, 0x109: 0x32c1, 0x10a: 0x2fba, 0x10b: 0x32c6,
 	0x10c: 0x2fbf, 0x10d: 0x32cb, 0x10e: 0x2fc9, 0x10f: 0x32d5,
-	0x112: 0x4746, 0x113: 0x47d7, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
+	0x112: 0x46b0, 0x113: 0x4741, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
 	0x118: 0x3014, 0x119: 0x3320, 0x11a: 0x3005, 0x11b: 0x3311, 0x11c: 0x302d, 0x11d: 0x3339,
 	0x11e: 0x3037, 0x11f: 0x3343, 0x120: 0x303c, 0x121: 0x3348, 0x122: 0x3046, 0x123: 0x3352,
 	0x124: 0x304b, 0x125: 0x3357, 0x128: 0x307d, 0x129: 0x338e,
@@ -4575,12 +4589,12 @@ var nfkcValues = [5888]uint16{
 	// Block 0x5, offset 0x140
 	0x140: 0x1c34, 0x143: 0x30ff, 0x144: 0x3410, 0x145: 0x3118,
 	0x146: 0x3429, 0x147: 0x310e, 0x148: 0x341f, 0x149: 0x1c5c,
-	0x14c: 0x4769, 0x14d: 0x47fa, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
+	0x14c: 0x46d3, 0x14d: 0x4764, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
 	0x154: 0x3159, 0x155: 0x346a, 0x156: 0x3172, 0x157: 0x3483,
-	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x478c, 0x15b: 0x481d, 0x15c: 0x317c, 0x15d: 0x348d,
-	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x4791, 0x161: 0x4822, 0x162: 0x31a4, 0x163: 0x34ba,
-	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x479b, 0x169: 0x482c,
-	0x16a: 0x47a0, 0x16b: 0x4831, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
+	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x46f6, 0x15b: 0x4787, 0x15c: 0x317c, 0x15d: 0x348d,
+	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x46fb, 0x161: 0x478c, 0x162: 0x31a4, 0x163: 0x34ba,
+	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x4705, 0x169: 0x4796,
+	0x16a: 0x470a, 0x16b: 0x479b, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
 	0x170: 0x31d1, 0x171: 0x34e7, 0x172: 0x31ef, 0x173: 0x3505, 0x174: 0x3212, 0x175: 0x3528,
 	0x176: 0x323a, 0x177: 0x3555, 0x178: 0x324e, 0x179: 0x325d, 0x17a: 0x357d, 0x17b: 0x3267,
 	0x17c: 0x3587, 0x17d: 0x326c, 0x17e: 0x358c, 0x17f: 0x00a7,
@@ -4592,7 +4606,7 @@ var nfkcValues = [5888]uint16{
 	0x198: 0x3b57, 0x199: 0x39d6, 0x19a: 0x3b65, 0x19b: 0x39c1, 0x19c: 0x3b50,
 	0x19e: 0x38b0, 0x19f: 0x3a3f, 0x1a0: 0x38a9, 0x1a1: 0x3a38, 0x1a2: 0x35b3, 0x1a3: 0x35c5,
 	0x1a6: 0x3041, 0x1a7: 0x334d, 0x1a8: 0x30be, 0x1a9: 0x33cf,
-	0x1aa: 0x4782, 0x1ab: 0x4813, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
+	0x1aa: 0x46ec, 0x1ab: 0x477d, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
 	0x1b0: 0x33c5, 0x1b1: 0x1942, 0x1b2: 0x1945, 0x1b3: 0x19cf, 0x1b4: 0x3028, 0x1b5: 0x3334,
 	0x1b8: 0x30fa, 0x1b9: 0x340b, 0x1ba: 0x38b7, 0x1bb: 0x3a46,
 	0x1bc: 0x35ad, 0x1bd: 0x35bf, 0x1be: 0x35b9, 0x1bf: 0x35cb,
@@ -4603,8 +4617,8 @@ var nfkcValues = [5888]uint16{
 	0x1d2: 0x316d, 0x1d3: 0x347e, 0x1d4: 0x31db, 0x1d5: 0x34f1, 0x1d6: 0x31e0, 0x1d7: 0x34f6,
 	0x1d8: 0x3186, 0x1d9: 0x3497, 0x1da: 0x319f, 0x1db: 0x34b5,
 	0x1de: 0x305a, 0x1df: 0x3366,
-	0x1e6: 0x4728, 0x1e7: 0x47b9, 0x1e8: 0x4750, 0x1e9: 0x47e1,
-	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x476e, 0x1ef: 0x47ff,
+	0x1e6: 0x4692, 0x1e7: 0x4723, 0x1e8: 0x46ba, 0x1e9: 0x474b,
+	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x46d8, 0x1ef: 0x4769,
 	0x1f0: 0x3958, 0x1f1: 0x3ae7, 0x1f2: 0x3244, 0x1f3: 0x355f,
 	// Block 0x8, offset 0x200
 	0x200: 0x9932, 0x201: 0x9932, 0x202: 0x9932, 0x203: 0x9932, 0x204: 0x9932, 0x205: 0x8132,
@@ -4619,7 +4633,7 @@ var nfkcValues = [5888]uint16{
 	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812d, 0x23a: 0x812d, 0x23b: 0x812d,
 	0x23c: 0x812d, 0x23d: 0x8132, 0x23e: 0x8132, 0x23f: 0x8132,
 	// Block 0x9, offset 0x240
-	0x240: 0x4a44, 0x241: 0x4a49, 0x242: 0x9932, 0x243: 0x4a4e, 0x244: 0x4a53, 0x245: 0x9936,
+	0x240: 0x49ae, 0x241: 0x49b3, 0x242: 0x9932, 0x243: 0x49b8, 0x244: 0x4a71, 0x245: 0x9936,
 	0x246: 0x8132, 0x247: 0x812d, 0x248: 0x812d, 0x249: 0x812d, 0x24a: 0x8132, 0x24b: 0x8132,
 	0x24c: 0x8132, 0x24d: 0x812d, 0x24e: 0x812d, 0x250: 0x8132, 0x251: 0x8132,
 	0x252: 0x8132, 0x253: 0x812d, 0x254: 0x812d, 0x255: 0x812d, 0x256: 0x812d, 0x257: 0x8132,
@@ -4631,22 +4645,22 @@ var nfkcValues = [5888]uint16{
 	0x27a: 0x42a5,
 	0x27e: 0x0037,
 	// Block 0xa, offset 0x280
-	0x284: 0x425a, 0x285: 0x4511,
+	0x284: 0x425a, 0x285: 0x447b,
 	0x286: 0x35e9, 0x287: 0x00ce, 0x288: 0x3607, 0x289: 0x3613, 0x28a: 0x3625,
 	0x28c: 0x3643, 0x28e: 0x3655, 0x28f: 0x3673, 0x290: 0x3e08, 0x291: 0xa000,
 	0x295: 0xa000, 0x297: 0xa000,
 	0x299: 0xa000,
 	0x29f: 0xa000, 0x2a1: 0xa000,
 	0x2a5: 0xa000, 0x2a9: 0xa000,
-	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x4894, 0x2ad: 0x3697, 0x2ae: 0x48be, 0x2af: 0x36a9,
+	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x47fe, 0x2ad: 0x3697, 0x2ae: 0x4828, 0x2af: 0x36a9,
 	0x2b0: 0x3e70, 0x2b1: 0xa000, 0x2b5: 0xa000,
 	0x2b7: 0xa000, 0x2b9: 0xa000,
 	0x2bf: 0xa000,
 	// Block 0xb, offset 0x2c0
 	0x2c1: 0xa000, 0x2c5: 0xa000,
-	0x2c9: 0xa000, 0x2ca: 0x48d6, 0x2cb: 0x48f4,
-	0x2cc: 0x36c7, 0x2cd: 0x36df, 0x2ce: 0x490c, 0x2d0: 0x01be, 0x2d1: 0x01d0,
-	0x2d2: 0x01ac, 0x2d3: 0x43a2, 0x2d4: 0x43a8, 0x2d5: 0x01fa, 0x2d6: 0x01e8,
+	0x2c9: 0xa000, 0x2ca: 0x4840, 0x2cb: 0x485e,
+	0x2cc: 0x36c7, 0x2cd: 0x36df, 0x2ce: 0x4876, 0x2d0: 0x01be, 0x2d1: 0x01d0,
+	0x2d2: 0x01ac, 0x2d3: 0x430c, 0x2d4: 0x4312, 0x2d5: 0x01fa, 0x2d6: 0x01e8,
 	0x2f0: 0x01d6, 0x2f1: 0x01eb, 0x2f2: 0x01ee, 0x2f4: 0x0188, 0x2f5: 0x01c7,
 	0x2f9: 0x01a6,
 	// Block 0xc, offset 0x300
@@ -4717,824 +4731,836 @@ var nfkcValues = [5888]uint16{
 	0x4b6: 0x0152, 0x4b7: 0x0155, 0x4b8: 0x041f, 0x4b9: 0x0158, 0x4ba: 0x015b, 0x4bb: 0x00b5,
 	0x4bc: 0x015e, 0x4bd: 0x0161, 0x4be: 0x0164, 0x4bf: 0x01d0,
 	// Block 0x13, offset 0x4c0
-	0x4c0: 0x2f97, 0x4c1: 0x32a3, 0x4c2: 0x2fa1, 0x4c3: 0x32ad, 0x4c4: 0x2fa6, 0x4c5: 0x32b2,
-	0x4c6: 0x2fab, 0x4c7: 0x32b7, 0x4c8: 0x38cc, 0x4c9: 0x3a5b, 0x4ca: 0x2fc4, 0x4cb: 0x32d0,
-	0x4cc: 0x2fce, 0x4cd: 0x32da, 0x4ce: 0x2fdd, 0x4cf: 0x32e9, 0x4d0: 0x2fd3, 0x4d1: 0x32df,
-	0x4d2: 0x2fd8, 0x4d3: 0x32e4, 0x4d4: 0x38ef, 0x4d5: 0x3a7e, 0x4d6: 0x38f6, 0x4d7: 0x3a85,
-	0x4d8: 0x3019, 0x4d9: 0x3325, 0x4da: 0x301e, 0x4db: 0x332a, 0x4dc: 0x3904, 0x4dd: 0x3a93,
-	0x4de: 0x3023, 0x4df: 0x332f, 0x4e0: 0x3032, 0x4e1: 0x333e, 0x4e2: 0x3050, 0x4e3: 0x335c,
-	0x4e4: 0x305f, 0x4e5: 0x336b, 0x4e6: 0x3055, 0x4e7: 0x3361, 0x4e8: 0x3064, 0x4e9: 0x3370,
-	0x4ea: 0x3069, 0x4eb: 0x3375, 0x4ec: 0x30af, 0x4ed: 0x33bb, 0x4ee: 0x390b, 0x4ef: 0x3a9a,
-	0x4f0: 0x30b9, 0x4f1: 0x33ca, 0x4f2: 0x30c3, 0x4f3: 0x33d4, 0x4f4: 0x30cd, 0x4f5: 0x33de,
-	0x4f6: 0x475a, 0x4f7: 0x47eb, 0x4f8: 0x3912, 0x4f9: 0x3aa1, 0x4fa: 0x30e6, 0x4fb: 0x33f7,
-	0x4fc: 0x30e1, 0x4fd: 0x33f2, 0x4fe: 0x30eb, 0x4ff: 0x33fc,
+	0x4c0: 0x8132, 0x4c1: 0x8132, 0x4c2: 0x812d, 0x4c3: 0x8132, 0x4c4: 0x8132, 0x4c5: 0x8132,
+	0x4c6: 0x8132, 0x4c7: 0x8132, 0x4c8: 0x8132, 0x4c9: 0x8132, 0x4ca: 0x812d, 0x4cb: 0x8132,
+	0x4cc: 0x8132, 0x4cd: 0x8135, 0x4ce: 0x812a, 0x4cf: 0x812d, 0x4d0: 0x8129, 0x4d1: 0x8132,
+	0x4d2: 0x8132, 0x4d3: 0x8132, 0x4d4: 0x8132, 0x4d5: 0x8132, 0x4d6: 0x8132, 0x4d7: 0x8132,
+	0x4d8: 0x8132, 0x4d9: 0x8132, 0x4da: 0x8132, 0x4db: 0x8132, 0x4dc: 0x8132, 0x4dd: 0x8132,
+	0x4de: 0x8132, 0x4df: 0x8132, 0x4e0: 0x8132, 0x4e1: 0x8132, 0x4e2: 0x8132, 0x4e3: 0x8132,
+	0x4e4: 0x8132, 0x4e5: 0x8132, 0x4e6: 0x8132, 0x4e7: 0x8132, 0x4e8: 0x8132, 0x4e9: 0x8132,
+	0x4ea: 0x8132, 0x4eb: 0x8132, 0x4ec: 0x8132, 0x4ed: 0x8132, 0x4ee: 0x8132, 0x4ef: 0x8132,
+	0x4f0: 0x8132, 0x4f1: 0x8132, 0x4f2: 0x8132, 0x4f3: 0x8132, 0x4f4: 0x8132, 0x4f5: 0x8132,
+	0x4f6: 0x8133, 0x4f7: 0x8131, 0x4f8: 0x8131, 0x4f9: 0x812d, 0x4fb: 0x8132,
+	0x4fc: 0x8134, 0x4fd: 0x812d, 0x4fe: 0x8132, 0x4ff: 0x812d,
 	// Block 0x14, offset 0x500
-	0x500: 0x30f0, 0x501: 0x3401, 0x502: 0x30f5, 0x503: 0x3406, 0x504: 0x3109, 0x505: 0x341a,
-	0x506: 0x3113, 0x507: 0x3424, 0x508: 0x3122, 0x509: 0x3433, 0x50a: 0x311d, 0x50b: 0x342e,
-	0x50c: 0x3935, 0x50d: 0x3ac4, 0x50e: 0x3943, 0x50f: 0x3ad2, 0x510: 0x394a, 0x511: 0x3ad9,
-	0x512: 0x3951, 0x513: 0x3ae0, 0x514: 0x314f, 0x515: 0x3460, 0x516: 0x3154, 0x517: 0x3465,
-	0x518: 0x315e, 0x519: 0x346f, 0x51a: 0x4787, 0x51b: 0x4818, 0x51c: 0x3997, 0x51d: 0x3b26,
-	0x51e: 0x3177, 0x51f: 0x3488, 0x520: 0x3181, 0x521: 0x3492, 0x522: 0x4796, 0x523: 0x4827,
-	0x524: 0x399e, 0x525: 0x3b2d, 0x526: 0x39a5, 0x527: 0x3b34, 0x528: 0x39ac, 0x529: 0x3b3b,
-	0x52a: 0x3190, 0x52b: 0x34a1, 0x52c: 0x319a, 0x52d: 0x34b0, 0x52e: 0x31ae, 0x52f: 0x34c4,
-	0x530: 0x31a9, 0x531: 0x34bf, 0x532: 0x31ea, 0x533: 0x3500, 0x534: 0x31f9, 0x535: 0x350f,
-	0x536: 0x31f4, 0x537: 0x350a, 0x538: 0x39b3, 0x539: 0x3b42, 0x53a: 0x39ba, 0x53b: 0x3b49,
-	0x53c: 0x31fe, 0x53d: 0x3514, 0x53e: 0x3203, 0x53f: 0x3519,
+	0x500: 0x2f97, 0x501: 0x32a3, 0x502: 0x2fa1, 0x503: 0x32ad, 0x504: 0x2fa6, 0x505: 0x32b2,
+	0x506: 0x2fab, 0x507: 0x32b7, 0x508: 0x38cc, 0x509: 0x3a5b, 0x50a: 0x2fc4, 0x50b: 0x32d0,
+	0x50c: 0x2fce, 0x50d: 0x32da, 0x50e: 0x2fdd, 0x50f: 0x32e9, 0x510: 0x2fd3, 0x511: 0x32df,
+	0x512: 0x2fd8, 0x513: 0x32e4, 0x514: 0x38ef, 0x515: 0x3a7e, 0x516: 0x38f6, 0x517: 0x3a85,
+	0x518: 0x3019, 0x519: 0x3325, 0x51a: 0x301e, 0x51b: 0x332a, 0x51c: 0x3904, 0x51d: 0x3a93,
+	0x51e: 0x3023, 0x51f: 0x332f, 0x520: 0x3032, 0x521: 0x333e, 0x522: 0x3050, 0x523: 0x335c,
+	0x524: 0x305f, 0x525: 0x336b, 0x526: 0x3055, 0x527: 0x3361, 0x528: 0x3064, 0x529: 0x3370,
+	0x52a: 0x3069, 0x52b: 0x3375, 0x52c: 0x30af, 0x52d: 0x33bb, 0x52e: 0x390b, 0x52f: 0x3a9a,
+	0x530: 0x30b9, 0x531: 0x33ca, 0x532: 0x30c3, 0x533: 0x33d4, 0x534: 0x30cd, 0x535: 0x33de,
+	0x536: 0x46c4, 0x537: 0x4755, 0x538: 0x3912, 0x539: 0x3aa1, 0x53a: 0x30e6, 0x53b: 0x33f7,
+	0x53c: 0x30e1, 0x53d: 0x33f2, 0x53e: 0x30eb, 0x53f: 0x33fc,
 	// Block 0x15, offset 0x540
-	0x540: 0x3208, 0x541: 0x351e, 0x542: 0x320d, 0x543: 0x3523, 0x544: 0x321c, 0x545: 0x3532,
-	0x546: 0x3217, 0x547: 0x352d, 0x548: 0x3221, 0x549: 0x353c, 0x54a: 0x3226, 0x54b: 0x3541,
-	0x54c: 0x322b, 0x54d: 0x3546, 0x54e: 0x3249, 0x54f: 0x3564, 0x550: 0x3262, 0x551: 0x3582,
-	0x552: 0x3271, 0x553: 0x3591, 0x554: 0x3276, 0x555: 0x3596, 0x556: 0x337a, 0x557: 0x34a6,
-	0x558: 0x3537, 0x559: 0x3573, 0x55a: 0x1be0, 0x55b: 0x42d7,
-	0x560: 0x4737, 0x561: 0x47c8, 0x562: 0x2f83, 0x563: 0x328f,
-	0x564: 0x3878, 0x565: 0x3a07, 0x566: 0x3871, 0x567: 0x3a00, 0x568: 0x3886, 0x569: 0x3a15,
-	0x56a: 0x387f, 0x56b: 0x3a0e, 0x56c: 0x38be, 0x56d: 0x3a4d, 0x56e: 0x3894, 0x56f: 0x3a23,
-	0x570: 0x388d, 0x571: 0x3a1c, 0x572: 0x38a2, 0x573: 0x3a31, 0x574: 0x389b, 0x575: 0x3a2a,
-	0x576: 0x38c5, 0x577: 0x3a54, 0x578: 0x474b, 0x579: 0x47dc, 0x57a: 0x3000, 0x57b: 0x330c,
-	0x57c: 0x2fec, 0x57d: 0x32f8, 0x57e: 0x38da, 0x57f: 0x3a69,
+	0x540: 0x30f0, 0x541: 0x3401, 0x542: 0x30f5, 0x543: 0x3406, 0x544: 0x3109, 0x545: 0x341a,
+	0x546: 0x3113, 0x547: 0x3424, 0x548: 0x3122, 0x549: 0x3433, 0x54a: 0x311d, 0x54b: 0x342e,
+	0x54c: 0x3935, 0x54d: 0x3ac4, 0x54e: 0x3943, 0x54f: 0x3ad2, 0x550: 0x394a, 0x551: 0x3ad9,
+	0x552: 0x3951, 0x553: 0x3ae0, 0x554: 0x314f, 0x555: 0x3460, 0x556: 0x3154, 0x557: 0x3465,
+	0x558: 0x315e, 0x559: 0x346f, 0x55a: 0x46f1, 0x55b: 0x4782, 0x55c: 0x3997, 0x55d: 0x3b26,
+	0x55e: 0x3177, 0x55f: 0x3488, 0x560: 0x3181, 0x561: 0x3492, 0x562: 0x4700, 0x563: 0x4791,
+	0x564: 0x399e, 0x565: 0x3b2d, 0x566: 0x39a5, 0x567: 0x3b34, 0x568: 0x39ac, 0x569: 0x3b3b,
+	0x56a: 0x3190, 0x56b: 0x34a1, 0x56c: 0x319a, 0x56d: 0x34b0, 0x56e: 0x31ae, 0x56f: 0x34c4,
+	0x570: 0x31a9, 0x571: 0x34bf, 0x572: 0x31ea, 0x573: 0x3500, 0x574: 0x31f9, 0x575: 0x350f,
+	0x576: 0x31f4, 0x577: 0x350a, 0x578: 0x39b3, 0x579: 0x3b42, 0x57a: 0x39ba, 0x57b: 0x3b49,
+	0x57c: 0x31fe, 0x57d: 0x3514, 0x57e: 0x3203, 0x57f: 0x3519,
 	// Block 0x16, offset 0x580
-	0x580: 0x38d3, 0x581: 0x3a62, 0x582: 0x38e8, 0x583: 0x3a77, 0x584: 0x38e1, 0x585: 0x3a70,
-	0x586: 0x38fd, 0x587: 0x3a8c, 0x588: 0x3091, 0x589: 0x339d, 0x58a: 0x30a5, 0x58b: 0x33b1,
-	0x58c: 0x477d, 0x58d: 0x480e, 0x58e: 0x3136, 0x58f: 0x3447, 0x590: 0x3920, 0x591: 0x3aaf,
-	0x592: 0x3919, 0x593: 0x3aa8, 0x594: 0x392e, 0x595: 0x3abd, 0x596: 0x3927, 0x597: 0x3ab6,
-	0x598: 0x3989, 0x599: 0x3b18, 0x59a: 0x396d, 0x59b: 0x3afc, 0x59c: 0x3966, 0x59d: 0x3af5,
-	0x59e: 0x397b, 0x59f: 0x3b0a, 0x5a0: 0x3974, 0x5a1: 0x3b03, 0x5a2: 0x3982, 0x5a3: 0x3b11,
-	0x5a4: 0x31e5, 0x5a5: 0x34fb, 0x5a6: 0x31c7, 0x5a7: 0x34dd, 0x5a8: 0x39e4, 0x5a9: 0x3b73,
-	0x5aa: 0x39dd, 0x5ab: 0x3b6c, 0x5ac: 0x39f2, 0x5ad: 0x3b81, 0x5ae: 0x39eb, 0x5af: 0x3b7a,
-	0x5b0: 0x39f9, 0x5b1: 0x3b88, 0x5b2: 0x3230, 0x5b3: 0x354b, 0x5b4: 0x3258, 0x5b5: 0x3578,
-	0x5b6: 0x3253, 0x5b7: 0x356e, 0x5b8: 0x323f, 0x5b9: 0x355a,
+	0x580: 0x3208, 0x581: 0x351e, 0x582: 0x320d, 0x583: 0x3523, 0x584: 0x321c, 0x585: 0x3532,
+	0x586: 0x3217, 0x587: 0x352d, 0x588: 0x3221, 0x589: 0x353c, 0x58a: 0x3226, 0x58b: 0x3541,
+	0x58c: 0x322b, 0x58d: 0x3546, 0x58e: 0x3249, 0x58f: 0x3564, 0x590: 0x3262, 0x591: 0x3582,
+	0x592: 0x3271, 0x593: 0x3591, 0x594: 0x3276, 0x595: 0x3596, 0x596: 0x337a, 0x597: 0x34a6,
+	0x598: 0x3537, 0x599: 0x3573, 0x59a: 0x1be0, 0x59b: 0x42d7,
+	0x5a0: 0x46a1, 0x5a1: 0x4732, 0x5a2: 0x2f83, 0x5a3: 0x328f,
+	0x5a4: 0x3878, 0x5a5: 0x3a07, 0x5a6: 0x3871, 0x5a7: 0x3a00, 0x5a8: 0x3886, 0x5a9: 0x3a15,
+	0x5aa: 0x387f, 0x5ab: 0x3a0e, 0x5ac: 0x38be, 0x5ad: 0x3a4d, 0x5ae: 0x3894, 0x5af: 0x3a23,
+	0x5b0: 0x388d, 0x5b1: 0x3a1c, 0x5b2: 0x38a2, 0x5b3: 0x3a31, 0x5b4: 0x389b, 0x5b5: 0x3a2a,
+	0x5b6: 0x38c5, 0x5b7: 0x3a54, 0x5b8: 0x46b5, 0x5b9: 0x4746, 0x5ba: 0x3000, 0x5bb: 0x330c,
+	0x5bc: 0x2fec, 0x5bd: 0x32f8, 0x5be: 0x38da, 0x5bf: 0x3a69,
 	// Block 0x17, offset 0x5c0
-	0x5c0: 0x489a, 0x5c1: 0x48a0, 0x5c2: 0x49b4, 0x5c3: 0x49cc, 0x5c4: 0x49bc, 0x5c5: 0x49d4,
-	0x5c6: 0x49c4, 0x5c7: 0x49dc, 0x5c8: 0x4840, 0x5c9: 0x4846, 0x5ca: 0x4924, 0x5cb: 0x493c,
-	0x5cc: 0x492c, 0x5cd: 0x4944, 0x5ce: 0x4934, 0x5cf: 0x494c, 0x5d0: 0x48ac, 0x5d1: 0x48b2,
-	0x5d2: 0x3db8, 0x5d3: 0x3dc8, 0x5d4: 0x3dc0, 0x5d5: 0x3dd0,
-	0x5d8: 0x484c, 0x5d9: 0x4852, 0x5da: 0x3ce8, 0x5db: 0x3cf8, 0x5dc: 0x3cf0, 0x5dd: 0x3d00,
-	0x5e0: 0x48c4, 0x5e1: 0x48ca, 0x5e2: 0x49e4, 0x5e3: 0x49fc,
-	0x5e4: 0x49ec, 0x5e5: 0x4a04, 0x5e6: 0x49f4, 0x5e7: 0x4a0c, 0x5e8: 0x4858, 0x5e9: 0x485e,
-	0x5ea: 0x4954, 0x5eb: 0x496c, 0x5ec: 0x495c, 0x5ed: 0x4974, 0x5ee: 0x4964, 0x5ef: 0x497c,
-	0x5f0: 0x48dc, 0x5f1: 0x48e2, 0x5f2: 0x3e18, 0x5f3: 0x3e30, 0x5f4: 0x3e20, 0x5f5: 0x3e38,
-	0x5f6: 0x3e28, 0x5f7: 0x3e40, 0x5f8: 0x4864, 0x5f9: 0x486a, 0x5fa: 0x3d18, 0x5fb: 0x3d30,
-	0x5fc: 0x3d20, 0x5fd: 0x3d38, 0x5fe: 0x3d28, 0x5ff: 0x3d40,
+	0x5c0: 0x38d3, 0x5c1: 0x3a62, 0x5c2: 0x38e8, 0x5c3: 0x3a77, 0x5c4: 0x38e1, 0x5c5: 0x3a70,
+	0x5c6: 0x38fd, 0x5c7: 0x3a8c, 0x5c8: 0x3091, 0x5c9: 0x339d, 0x5ca: 0x30a5, 0x5cb: 0x33b1,
+	0x5cc: 0x46e7, 0x5cd: 0x4778, 0x5ce: 0x3136, 0x5cf: 0x3447, 0x5d0: 0x3920, 0x5d1: 0x3aaf,
+	0x5d2: 0x3919, 0x5d3: 0x3aa8, 0x5d4: 0x392e, 0x5d5: 0x3abd, 0x5d6: 0x3927, 0x5d7: 0x3ab6,
+	0x5d8: 0x3989, 0x5d9: 0x3b18, 0x5da: 0x396d, 0x5db: 0x3afc, 0x5dc: 0x3966, 0x5dd: 0x3af5,
+	0x5de: 0x397b, 0x5df: 0x3b0a, 0x5e0: 0x3974, 0x5e1: 0x3b03, 0x5e2: 0x3982, 0x5e3: 0x3b11,
+	0x5e4: 0x31e5, 0x5e5: 0x34fb, 0x5e6: 0x31c7, 0x5e7: 0x34dd, 0x5e8: 0x39e4, 0x5e9: 0x3b73,
+	0x5ea: 0x39dd, 0x5eb: 0x3b6c, 0x5ec: 0x39f2, 0x5ed: 0x3b81, 0x5ee: 0x39eb, 0x5ef: 0x3b7a,
+	0x5f0: 0x39f9, 0x5f1: 0x3b88, 0x5f2: 0x3230, 0x5f3: 0x354b, 0x5f4: 0x3258, 0x5f5: 0x3578,
+	0x5f6: 0x3253, 0x5f7: 0x356e, 0x5f8: 0x323f, 0x5f9: 0x355a,
 	// Block 0x18, offset 0x600
-	0x600: 0x48e8, 0x601: 0x48ee, 0x602: 0x3e48, 0x603: 0x3e58, 0x604: 0x3e50, 0x605: 0x3e60,
-	0x608: 0x4870, 0x609: 0x4876, 0x60a: 0x3d48, 0x60b: 0x3d58,
-	0x60c: 0x3d50, 0x60d: 0x3d60, 0x610: 0x48fa, 0x611: 0x4900,
-	0x612: 0x3e80, 0x613: 0x3e98, 0x614: 0x3e88, 0x615: 0x3ea0, 0x616: 0x3e90, 0x617: 0x3ea8,
-	0x619: 0x487c, 0x61b: 0x3d68, 0x61d: 0x3d70,
-	0x61f: 0x3d78, 0x620: 0x4912, 0x621: 0x4918, 0x622: 0x4a14, 0x623: 0x4a2c,
-	0x624: 0x4a1c, 0x625: 0x4a34, 0x626: 0x4a24, 0x627: 0x4a3c, 0x628: 0x4882, 0x629: 0x4888,
-	0x62a: 0x4984, 0x62b: 0x499c, 0x62c: 0x498c, 0x62d: 0x49a4, 0x62e: 0x4994, 0x62f: 0x49ac,
-	0x630: 0x488e, 0x631: 0x43b4, 0x632: 0x3691, 0x633: 0x43ba, 0x634: 0x48b8, 0x635: 0x43c0,
-	0x636: 0x36a3, 0x637: 0x43c6, 0x638: 0x36c1, 0x639: 0x43cc, 0x63a: 0x36d9, 0x63b: 0x43d2,
-	0x63c: 0x4906, 0x63d: 0x43d8,
+	0x600: 0x4804, 0x601: 0x480a, 0x602: 0x491e, 0x603: 0x4936, 0x604: 0x4926, 0x605: 0x493e,
+	0x606: 0x492e, 0x607: 0x4946, 0x608: 0x47aa, 0x609: 0x47b0, 0x60a: 0x488e, 0x60b: 0x48a6,
+	0x60c: 0x4896, 0x60d: 0x48ae, 0x60e: 0x489e, 0x60f: 0x48b6, 0x610: 0x4816, 0x611: 0x481c,
+	0x612: 0x3db8, 0x613: 0x3dc8, 0x614: 0x3dc0, 0x615: 0x3dd0,
+	0x618: 0x47b6, 0x619: 0x47bc, 0x61a: 0x3ce8, 0x61b: 0x3cf8, 0x61c: 0x3cf0, 0x61d: 0x3d00,
+	0x620: 0x482e, 0x621: 0x4834, 0x622: 0x494e, 0x623: 0x4966,
+	0x624: 0x4956, 0x625: 0x496e, 0x626: 0x495e, 0x627: 0x4976, 0x628: 0x47c2, 0x629: 0x47c8,
+	0x62a: 0x48be, 0x62b: 0x48d6, 0x62c: 0x48c6, 0x62d: 0x48de, 0x62e: 0x48ce, 0x62f: 0x48e6,
+	0x630: 0x4846, 0x631: 0x484c, 0x632: 0x3e18, 0x633: 0x3e30, 0x634: 0x3e20, 0x635: 0x3e38,
+	0x636: 0x3e28, 0x637: 0x3e40, 0x638: 0x47ce, 0x639: 0x47d4, 0x63a: 0x3d18, 0x63b: 0x3d30,
+	0x63c: 0x3d20, 0x63d: 0x3d38, 0x63e: 0x3d28, 0x63f: 0x3d40,
 	// Block 0x19, offset 0x640
-	0x640: 0x3da0, 0x641: 0x3da8, 0x642: 0x4184, 0x643: 0x41a2, 0x644: 0x418e, 0x645: 0x41ac,
-	0x646: 0x4198, 0x647: 0x41b6, 0x648: 0x3cd8, 0x649: 0x3ce0, 0x64a: 0x40d0, 0x64b: 0x40ee,
-	0x64c: 0x40da, 0x64d: 0x40f8, 0x64e: 0x40e4, 0x64f: 0x4102, 0x650: 0x3de8, 0x651: 0x3df0,
-	0x652: 0x41c0, 0x653: 0x41de, 0x654: 0x41ca, 0x655: 0x41e8, 0x656: 0x41d4, 0x657: 0x41f2,
-	0x658: 0x3d08, 0x659: 0x3d10, 0x65a: 0x410c, 0x65b: 0x412a, 0x65c: 0x4116, 0x65d: 0x4134,
-	0x65e: 0x4120, 0x65f: 0x413e, 0x660: 0x3ec0, 0x661: 0x3ec8, 0x662: 0x41fc, 0x663: 0x421a,
-	0x664: 0x4206, 0x665: 0x4224, 0x666: 0x4210, 0x667: 0x422e, 0x668: 0x3d80, 0x669: 0x3d88,
-	0x66a: 0x4148, 0x66b: 0x4166, 0x66c: 0x4152, 0x66d: 0x4170, 0x66e: 0x415c, 0x66f: 0x417a,
-	0x670: 0x3685, 0x671: 0x367f, 0x672: 0x3d90, 0x673: 0x368b, 0x674: 0x3d98,
-	0x676: 0x48a6, 0x677: 0x3db0, 0x678: 0x35f5, 0x679: 0x35ef, 0x67a: 0x35e3, 0x67b: 0x4384,
-	0x67c: 0x35fb, 0x67d: 0x4287, 0x67e: 0x01d3, 0x67f: 0x4287,
+	0x640: 0x4852, 0x641: 0x4858, 0x642: 0x3e48, 0x643: 0x3e58, 0x644: 0x3e50, 0x645: 0x3e60,
+	0x648: 0x47da, 0x649: 0x47e0, 0x64a: 0x3d48, 0x64b: 0x3d58,
+	0x64c: 0x3d50, 0x64d: 0x3d60, 0x650: 0x4864, 0x651: 0x486a,
+	0x652: 0x3e80, 0x653: 0x3e98, 0x654: 0x3e88, 0x655: 0x3ea0, 0x656: 0x3e90, 0x657: 0x3ea8,
+	0x659: 0x47e6, 0x65b: 0x3d68, 0x65d: 0x3d70,
+	0x65f: 0x3d78, 0x660: 0x487c, 0x661: 0x4882, 0x662: 0x497e, 0x663: 0x4996,
+	0x664: 0x4986, 0x665: 0x499e, 0x666: 0x498e, 0x667: 0x49a6, 0x668: 0x47ec, 0x669: 0x47f2,
+	0x66a: 0x48ee, 0x66b: 0x4906, 0x66c: 0x48f6, 0x66d: 0x490e, 0x66e: 0x48fe, 0x66f: 0x4916,
+	0x670: 0x47f8, 0x671: 0x431e, 0x672: 0x3691, 0x673: 0x4324, 0x674: 0x4822, 0x675: 0x432a,
+	0x676: 0x36a3, 0x677: 0x4330, 0x678: 0x36c1, 0x679: 0x4336, 0x67a: 0x36d9, 0x67b: 0x433c,
+	0x67c: 0x4870, 0x67d: 0x4342,
 	// Block 0x1a, offset 0x680
-	0x680: 0x42a0, 0x681: 0x4518, 0x682: 0x3dd8, 0x683: 0x369d, 0x684: 0x3de0,
-	0x686: 0x48d0, 0x687: 0x3df8, 0x688: 0x3601, 0x689: 0x438a, 0x68a: 0x360d, 0x68b: 0x4390,
-	0x68c: 0x3619, 0x68d: 0x451f, 0x68e: 0x4526, 0x68f: 0x452d, 0x690: 0x36b5, 0x691: 0x36af,
-	0x692: 0x3e00, 0x693: 0x457a, 0x696: 0x36bb, 0x697: 0x3e10,
-	0x698: 0x3631, 0x699: 0x362b, 0x69a: 0x361f, 0x69b: 0x4396, 0x69d: 0x4534,
-	0x69e: 0x453b, 0x69f: 0x4542, 0x6a0: 0x36eb, 0x6a1: 0x36e5, 0x6a2: 0x3e68, 0x6a3: 0x4582,
-	0x6a4: 0x36cd, 0x6a5: 0x36d3, 0x6a6: 0x36f1, 0x6a7: 0x3e78, 0x6a8: 0x3661, 0x6a9: 0x365b,
-	0x6aa: 0x364f, 0x6ab: 0x43a2, 0x6ac: 0x3649, 0x6ad: 0x450a, 0x6ae: 0x4511, 0x6af: 0x0081,
-	0x6b2: 0x3eb0, 0x6b3: 0x36f7, 0x6b4: 0x3eb8,
-	0x6b6: 0x491e, 0x6b7: 0x3ed0, 0x6b8: 0x363d, 0x6b9: 0x439c, 0x6ba: 0x366d, 0x6bb: 0x43ae,
-	0x6bc: 0x3679, 0x6bd: 0x425a, 0x6be: 0x428c,
+	0x680: 0x3da0, 0x681: 0x3da8, 0x682: 0x4184, 0x683: 0x41a2, 0x684: 0x418e, 0x685: 0x41ac,
+	0x686: 0x4198, 0x687: 0x41b6, 0x688: 0x3cd8, 0x689: 0x3ce0, 0x68a: 0x40d0, 0x68b: 0x40ee,
+	0x68c: 0x40da, 0x68d: 0x40f8, 0x68e: 0x40e4, 0x68f: 0x4102, 0x690: 0x3de8, 0x691: 0x3df0,
+	0x692: 0x41c0, 0x693: 0x41de, 0x694: 0x41ca, 0x695: 0x41e8, 0x696: 0x41d4, 0x697: 0x41f2,
+	0x698: 0x3d08, 0x699: 0x3d10, 0x69a: 0x410c, 0x69b: 0x412a, 0x69c: 0x4116, 0x69d: 0x4134,
+	0x69e: 0x4120, 0x69f: 0x413e, 0x6a0: 0x3ec0, 0x6a1: 0x3ec8, 0x6a2: 0x41fc, 0x6a3: 0x421a,
+	0x6a4: 0x4206, 0x6a5: 0x4224, 0x6a6: 0x4210, 0x6a7: 0x422e, 0x6a8: 0x3d80, 0x6a9: 0x3d88,
+	0x6aa: 0x4148, 0x6ab: 0x4166, 0x6ac: 0x4152, 0x6ad: 0x4170, 0x6ae: 0x415c, 0x6af: 0x417a,
+	0x6b0: 0x3685, 0x6b1: 0x367f, 0x6b2: 0x3d90, 0x6b3: 0x368b, 0x6b4: 0x3d98,
+	0x6b6: 0x4810, 0x6b7: 0x3db0, 0x6b8: 0x35f5, 0x6b9: 0x35ef, 0x6ba: 0x35e3, 0x6bb: 0x42ee,
+	0x6bc: 0x35fb, 0x6bd: 0x4287, 0x6be: 0x01d3, 0x6bf: 0x4287,
 	// Block 0x1b, offset 0x6c0
-	0x6c0: 0x1bd8, 0x6c1: 0x1bdc, 0x6c2: 0x0047, 0x6c3: 0x1c54, 0x6c5: 0x1be8,
-	0x6c6: 0x1bec, 0x6c7: 0x00e9, 0x6c9: 0x1c58, 0x6ca: 0x008f, 0x6cb: 0x0051,
-	0x6cc: 0x0051, 0x6cd: 0x0051, 0x6ce: 0x0091, 0x6cf: 0x00da, 0x6d0: 0x0053, 0x6d1: 0x0053,
-	0x6d2: 0x0059, 0x6d3: 0x0099, 0x6d5: 0x005d, 0x6d6: 0x198d,
-	0x6d9: 0x0061, 0x6da: 0x0063, 0x6db: 0x0065, 0x6dc: 0x0065, 0x6dd: 0x0065,
-	0x6e0: 0x199f, 0x6e1: 0x1bc8, 0x6e2: 0x19a8,
-	0x6e4: 0x0075, 0x6e6: 0x01b8, 0x6e8: 0x0075,
-	0x6ea: 0x0057, 0x6eb: 0x42d2, 0x6ec: 0x0045, 0x6ed: 0x0047, 0x6ef: 0x008b,
-	0x6f0: 0x004b, 0x6f1: 0x004d, 0x6f3: 0x005b, 0x6f4: 0x009f, 0x6f5: 0x0215,
-	0x6f6: 0x0218, 0x6f7: 0x021b, 0x6f8: 0x021e, 0x6f9: 0x0093, 0x6fb: 0x1b98,
-	0x6fc: 0x01e8, 0x6fd: 0x01c1, 0x6fe: 0x0179, 0x6ff: 0x01a0,
+	0x6c0: 0x42a0, 0x6c1: 0x4482, 0x6c2: 0x3dd8, 0x6c3: 0x369d, 0x6c4: 0x3de0,
+	0x6c6: 0x483a, 0x6c7: 0x3df8, 0x6c8: 0x3601, 0x6c9: 0x42f4, 0x6ca: 0x360d, 0x6cb: 0x42fa,
+	0x6cc: 0x3619, 0x6cd: 0x4489, 0x6ce: 0x4490, 0x6cf: 0x4497, 0x6d0: 0x36b5, 0x6d1: 0x36af,
+	0x6d2: 0x3e00, 0x6d3: 0x44e4, 0x6d6: 0x36bb, 0x6d7: 0x3e10,
+	0x6d8: 0x3631, 0x6d9: 0x362b, 0x6da: 0x361f, 0x6db: 0x4300, 0x6dd: 0x449e,
+	0x6de: 0x44a5, 0x6df: 0x44ac, 0x6e0: 0x36eb, 0x6e1: 0x36e5, 0x6e2: 0x3e68, 0x6e3: 0x44ec,
+	0x6e4: 0x36cd, 0x6e5: 0x36d3, 0x6e6: 0x36f1, 0x6e7: 0x3e78, 0x6e8: 0x3661, 0x6e9: 0x365b,
+	0x6ea: 0x364f, 0x6eb: 0x430c, 0x6ec: 0x3649, 0x6ed: 0x4474, 0x6ee: 0x447b, 0x6ef: 0x0081,
+	0x6f2: 0x3eb0, 0x6f3: 0x36f7, 0x6f4: 0x3eb8,
+	0x6f6: 0x4888, 0x6f7: 0x3ed0, 0x6f8: 0x363d, 0x6f9: 0x4306, 0x6fa: 0x366d, 0x6fb: 0x4318,
+	0x6fc: 0x3679, 0x6fd: 0x425a, 0x6fe: 0x428c,
 	// Block 0x1c, offset 0x700
-	0x700: 0x0463, 0x705: 0x0049,
-	0x706: 0x0089, 0x707: 0x008b, 0x708: 0x0093, 0x709: 0x0095,
-	0x710: 0x222e, 0x711: 0x223a,
-	0x712: 0x22ee, 0x713: 0x2216, 0x714: 0x229a, 0x715: 0x2222, 0x716: 0x22a0, 0x717: 0x22b8,
-	0x718: 0x22c4, 0x719: 0x2228, 0x71a: 0x22ca, 0x71b: 0x2234, 0x71c: 0x22be, 0x71d: 0x22d0,
-	0x71e: 0x22d6, 0x71f: 0x1cbc, 0x720: 0x0053, 0x721: 0x195a, 0x722: 0x1ba4, 0x723: 0x1963,
-	0x724: 0x006d, 0x725: 0x19ab, 0x726: 0x1bd0, 0x727: 0x1d48, 0x728: 0x1966, 0x729: 0x0071,
-	0x72a: 0x19b7, 0x72b: 0x1bd4, 0x72c: 0x0059, 0x72d: 0x0047, 0x72e: 0x0049, 0x72f: 0x005b,
-	0x730: 0x0093, 0x731: 0x19e4, 0x732: 0x1c18, 0x733: 0x19ed, 0x734: 0x00ad, 0x735: 0x1a62,
-	0x736: 0x1c4c, 0x737: 0x1d5c, 0x738: 0x19f0, 0x739: 0x00b1, 0x73a: 0x1a65, 0x73b: 0x1c50,
-	0x73c: 0x0099, 0x73d: 0x0087, 0x73e: 0x0089, 0x73f: 0x009b,
+	0x700: 0x1bd8, 0x701: 0x1bdc, 0x702: 0x0047, 0x703: 0x1c54, 0x705: 0x1be8,
+	0x706: 0x1bec, 0x707: 0x00e9, 0x709: 0x1c58, 0x70a: 0x008f, 0x70b: 0x0051,
+	0x70c: 0x0051, 0x70d: 0x0051, 0x70e: 0x0091, 0x70f: 0x00da, 0x710: 0x0053, 0x711: 0x0053,
+	0x712: 0x0059, 0x713: 0x0099, 0x715: 0x005d, 0x716: 0x198d,
+	0x719: 0x0061, 0x71a: 0x0063, 0x71b: 0x0065, 0x71c: 0x0065, 0x71d: 0x0065,
+	0x720: 0x199f, 0x721: 0x1bc8, 0x722: 0x19a8,
+	0x724: 0x0075, 0x726: 0x01b8, 0x728: 0x0075,
+	0x72a: 0x0057, 0x72b: 0x42d2, 0x72c: 0x0045, 0x72d: 0x0047, 0x72f: 0x008b,
+	0x730: 0x004b, 0x731: 0x004d, 0x733: 0x005b, 0x734: 0x009f, 0x735: 0x0215,
+	0x736: 0x0218, 0x737: 0x021b, 0x738: 0x021e, 0x739: 0x0093, 0x73b: 0x1b98,
+	0x73c: 0x01e8, 0x73d: 0x01c1, 0x73e: 0x0179, 0x73f: 0x01a0,
 	// Block 0x1d, offset 0x740
-	0x741: 0x3c06, 0x743: 0xa000, 0x744: 0x3c0d, 0x745: 0xa000,
-	0x747: 0x3c14, 0x748: 0xa000, 0x749: 0x3c1b,
-	0x74d: 0xa000,
-	0x760: 0x2f65, 0x761: 0xa000, 0x762: 0x3c29,
-	0x764: 0xa000, 0x765: 0xa000,
-	0x76d: 0x3c22, 0x76e: 0x2f60, 0x76f: 0x2f6a,
-	0x770: 0x3c30, 0x771: 0x3c37, 0x772: 0xa000, 0x773: 0xa000, 0x774: 0x3c3e, 0x775: 0x3c45,
-	0x776: 0xa000, 0x777: 0xa000, 0x778: 0x3c4c, 0x779: 0x3c53, 0x77a: 0xa000, 0x77b: 0xa000,
-	0x77c: 0xa000, 0x77d: 0xa000,
+	0x740: 0x0463, 0x745: 0x0049,
+	0x746: 0x0089, 0x747: 0x008b, 0x748: 0x0093, 0x749: 0x0095,
+	0x750: 0x222e, 0x751: 0x223a,
+	0x752: 0x22ee, 0x753: 0x2216, 0x754: 0x229a, 0x755: 0x2222, 0x756: 0x22a0, 0x757: 0x22b8,
+	0x758: 0x22c4, 0x759: 0x2228, 0x75a: 0x22ca, 0x75b: 0x2234, 0x75c: 0x22be, 0x75d: 0x22d0,
+	0x75e: 0x22d6, 0x75f: 0x1cbc, 0x760: 0x0053, 0x761: 0x195a, 0x762: 0x1ba4, 0x763: 0x1963,
+	0x764: 0x006d, 0x765: 0x19ab, 0x766: 0x1bd0, 0x767: 0x1d48, 0x768: 0x1966, 0x769: 0x0071,
+	0x76a: 0x19b7, 0x76b: 0x1bd4, 0x76c: 0x0059, 0x76d: 0x0047, 0x76e: 0x0049, 0x76f: 0x005b,
+	0x770: 0x0093, 0x771: 0x19e4, 0x772: 0x1c18, 0x773: 0x19ed, 0x774: 0x00ad, 0x775: 0x1a62,
+	0x776: 0x1c4c, 0x777: 0x1d5c, 0x778: 0x19f0, 0x779: 0x00b1, 0x77a: 0x1a65, 0x77b: 0x1c50,
+	0x77c: 0x0099, 0x77d: 0x0087, 0x77e: 0x0089, 0x77f: 0x009b,
 	// Block 0x1e, offset 0x780
-	0x780: 0x3c5a, 0x781: 0x3c61, 0x782: 0xa000, 0x783: 0xa000, 0x784: 0x3c76, 0x785: 0x3c7d,
-	0x786: 0xa000, 0x787: 0xa000, 0x788: 0x3c84, 0x789: 0x3c8b,
-	0x791: 0xa000,
-	0x792: 0xa000,
-	0x7a2: 0xa000,
-	0x7a8: 0xa000, 0x7a9: 0xa000,
-	0x7ab: 0xa000, 0x7ac: 0x3ca0, 0x7ad: 0x3ca7, 0x7ae: 0x3cae, 0x7af: 0x3cb5,
-	0x7b2: 0xa000, 0x7b3: 0xa000, 0x7b4: 0xa000, 0x7b5: 0xa000,
+	0x781: 0x3c06, 0x783: 0xa000, 0x784: 0x3c0d, 0x785: 0xa000,
+	0x787: 0x3c14, 0x788: 0xa000, 0x789: 0x3c1b,
+	0x78d: 0xa000,
+	0x7a0: 0x2f65, 0x7a1: 0xa000, 0x7a2: 0x3c29,
+	0x7a4: 0xa000, 0x7a5: 0xa000,
+	0x7ad: 0x3c22, 0x7ae: 0x2f60, 0x7af: 0x2f6a,
+	0x7b0: 0x3c30, 0x7b1: 0x3c37, 0x7b2: 0xa000, 0x7b3: 0xa000, 0x7b4: 0x3c3e, 0x7b5: 0x3c45,
+	0x7b6: 0xa000, 0x7b7: 0xa000, 0x7b8: 0x3c4c, 0x7b9: 0x3c53, 0x7ba: 0xa000, 0x7bb: 0xa000,
+	0x7bc: 0xa000, 0x7bd: 0xa000,
 	// Block 0x1f, offset 0x7c0
-	0x7e0: 0x0023, 0x7e1: 0x0025, 0x7e2: 0x0027, 0x7e3: 0x0029,
-	0x7e4: 0x002b, 0x7e5: 0x002d, 0x7e6: 0x002f, 0x7e7: 0x0031, 0x7e8: 0x0033, 0x7e9: 0x1882,
-	0x7ea: 0x1885, 0x7eb: 0x1888, 0x7ec: 0x188b, 0x7ed: 0x188e, 0x7ee: 0x1891, 0x7ef: 0x1894,
-	0x7f0: 0x1897, 0x7f1: 0x189a, 0x7f2: 0x189d, 0x7f3: 0x18a6, 0x7f4: 0x1a68, 0x7f5: 0x1a6c,
-	0x7f6: 0x1a70, 0x7f7: 0x1a74, 0x7f8: 0x1a78, 0x7f9: 0x1a7c, 0x7fa: 0x1a80, 0x7fb: 0x1a84,
-	0x7fc: 0x1a88, 0x7fd: 0x1c80, 0x7fe: 0x1c85, 0x7ff: 0x1c8a,
+	0x7c0: 0x3c5a, 0x7c1: 0x3c61, 0x7c2: 0xa000, 0x7c3: 0xa000, 0x7c4: 0x3c76, 0x7c5: 0x3c7d,
+	0x7c6: 0xa000, 0x7c7: 0xa000, 0x7c8: 0x3c84, 0x7c9: 0x3c8b,
+	0x7d1: 0xa000,
+	0x7d2: 0xa000,
+	0x7e2: 0xa000,
+	0x7e8: 0xa000, 0x7e9: 0xa000,
+	0x7eb: 0xa000, 0x7ec: 0x3ca0, 0x7ed: 0x3ca7, 0x7ee: 0x3cae, 0x7ef: 0x3cb5,
+	0x7f2: 0xa000, 0x7f3: 0xa000, 0x7f4: 0xa000, 0x7f5: 0xa000,
 	// Block 0x20, offset 0x800
-	0x800: 0x1c8f, 0x801: 0x1c94, 0x802: 0x1c99, 0x803: 0x1c9e, 0x804: 0x1ca3, 0x805: 0x1ca8,
-	0x806: 0x1cad, 0x807: 0x1cb2, 0x808: 0x187f, 0x809: 0x18a3, 0x80a: 0x18c7, 0x80b: 0x18eb,
-	0x80c: 0x190f, 0x80d: 0x1918, 0x80e: 0x191e, 0x80f: 0x1924, 0x810: 0x192a, 0x811: 0x1b60,
-	0x812: 0x1b64, 0x813: 0x1b68, 0x814: 0x1b6c, 0x815: 0x1b70, 0x816: 0x1b74, 0x817: 0x1b78,
-	0x818: 0x1b7c, 0x819: 0x1b80, 0x81a: 0x1b84, 0x81b: 0x1b88, 0x81c: 0x1af4, 0x81d: 0x1af8,
-	0x81e: 0x1afc, 0x81f: 0x1b00, 0x820: 0x1b04, 0x821: 0x1b08, 0x822: 0x1b0c, 0x823: 0x1b10,
-	0x824: 0x1b14, 0x825: 0x1b18, 0x826: 0x1b1c, 0x827: 0x1b20, 0x828: 0x1b24, 0x829: 0x1b28,
-	0x82a: 0x1b2c, 0x82b: 0x1b30, 0x82c: 0x1b34, 0x82d: 0x1b38, 0x82e: 0x1b3c, 0x82f: 0x1b40,
-	0x830: 0x1b44, 0x831: 0x1b48, 0x832: 0x1b4c, 0x833: 0x1b50, 0x834: 0x1b54, 0x835: 0x1b58,
-	0x836: 0x0043, 0x837: 0x0045, 0x838: 0x0047, 0x839: 0x0049, 0x83a: 0x004b, 0x83b: 0x004d,
-	0x83c: 0x004f, 0x83d: 0x0051, 0x83e: 0x0053, 0x83f: 0x0055,
+	0x820: 0x0023, 0x821: 0x0025, 0x822: 0x0027, 0x823: 0x0029,
+	0x824: 0x002b, 0x825: 0x002d, 0x826: 0x002f, 0x827: 0x0031, 0x828: 0x0033, 0x829: 0x1882,
+	0x82a: 0x1885, 0x82b: 0x1888, 0x82c: 0x188b, 0x82d: 0x188e, 0x82e: 0x1891, 0x82f: 0x1894,
+	0x830: 0x1897, 0x831: 0x189a, 0x832: 0x189d, 0x833: 0x18a6, 0x834: 0x1a68, 0x835: 0x1a6c,
+	0x836: 0x1a70, 0x837: 0x1a74, 0x838: 0x1a78, 0x839: 0x1a7c, 0x83a: 0x1a80, 0x83b: 0x1a84,
+	0x83c: 0x1a88, 0x83d: 0x1c80, 0x83e: 0x1c85, 0x83f: 0x1c8a,
 	// Block 0x21, offset 0x840
-	0x840: 0x06bf, 0x841: 0x06e3, 0x842: 0x06ef, 0x843: 0x06ff, 0x844: 0x0707, 0x845: 0x0713,
-	0x846: 0x071b, 0x847: 0x0723, 0x848: 0x072f, 0x849: 0x0783, 0x84a: 0x079b, 0x84b: 0x07ab,
-	0x84c: 0x07bb, 0x84d: 0x07cb, 0x84e: 0x07db, 0x84f: 0x07fb, 0x850: 0x07ff, 0x851: 0x0803,
-	0x852: 0x0837, 0x853: 0x085f, 0x854: 0x086f, 0x855: 0x0877, 0x856: 0x087b, 0x857: 0x0887,
-	0x858: 0x08a3, 0x859: 0x08a7, 0x85a: 0x08bf, 0x85b: 0x08c3, 0x85c: 0x08cb, 0x85d: 0x08db,
-	0x85e: 0x0977, 0x85f: 0x098b, 0x860: 0x09cb, 0x861: 0x09df, 0x862: 0x09e7, 0x863: 0x09eb,
-	0x864: 0x09fb, 0x865: 0x0a17, 0x866: 0x0a43, 0x867: 0x0a4f, 0x868: 0x0a6f, 0x869: 0x0a7b,
-	0x86a: 0x0a7f, 0x86b: 0x0a83, 0x86c: 0x0a9b, 0x86d: 0x0a9f, 0x86e: 0x0acb, 0x86f: 0x0ad7,
-	0x870: 0x0adf, 0x871: 0x0ae7, 0x872: 0x0af7, 0x873: 0x0aff, 0x874: 0x0b07, 0x875: 0x0b33,
-	0x876: 0x0b37, 0x877: 0x0b3f, 0x878: 0x0b43, 0x879: 0x0b4b, 0x87a: 0x0b53, 0x87b: 0x0b63,
-	0x87c: 0x0b7f, 0x87d: 0x0bf7, 0x87e: 0x0c0b, 0x87f: 0x0c0f,
+	0x840: 0x1c8f, 0x841: 0x1c94, 0x842: 0x1c99, 0x843: 0x1c9e, 0x844: 0x1ca3, 0x845: 0x1ca8,
+	0x846: 0x1cad, 0x847: 0x1cb2, 0x848: 0x187f, 0x849: 0x18a3, 0x84a: 0x18c7, 0x84b: 0x18eb,
+	0x84c: 0x190f, 0x84d: 0x1918, 0x84e: 0x191e, 0x84f: 0x1924, 0x850: 0x192a, 0x851: 0x1b60,
+	0x852: 0x1b64, 0x853: 0x1b68, 0x854: 0x1b6c, 0x855: 0x1b70, 0x856: 0x1b74, 0x857: 0x1b78,
+	0x858: 0x1b7c, 0x859: 0x1b80, 0x85a: 0x1b84, 0x85b: 0x1b88, 0x85c: 0x1af4, 0x85d: 0x1af8,
+	0x85e: 0x1afc, 0x85f: 0x1b00, 0x860: 0x1b04, 0x861: 0x1b08, 0x862: 0x1b0c, 0x863: 0x1b10,
+	0x864: 0x1b14, 0x865: 0x1b18, 0x866: 0x1b1c, 0x867: 0x1b20, 0x868: 0x1b24, 0x869: 0x1b28,
+	0x86a: 0x1b2c, 0x86b: 0x1b30, 0x86c: 0x1b34, 0x86d: 0x1b38, 0x86e: 0x1b3c, 0x86f: 0x1b40,
+	0x870: 0x1b44, 0x871: 0x1b48, 0x872: 0x1b4c, 0x873: 0x1b50, 0x874: 0x1b54, 0x875: 0x1b58,
+	0x876: 0x0043, 0x877: 0x0045, 0x878: 0x0047, 0x879: 0x0049, 0x87a: 0x004b, 0x87b: 0x004d,
+	0x87c: 0x004f, 0x87d: 0x0051, 0x87e: 0x0053, 0x87f: 0x0055,
 	// Block 0x22, offset 0x880
-	0x880: 0x0c8f, 0x881: 0x0c93, 0x882: 0x0ca7, 0x883: 0x0cab, 0x884: 0x0cb3, 0x885: 0x0cbb,
-	0x886: 0x0cc3, 0x887: 0x0ccf, 0x888: 0x0cf7, 0x889: 0x0d07, 0x88a: 0x0d1b, 0x88b: 0x0d8b,
-	0x88c: 0x0d97, 0x88d: 0x0da7, 0x88e: 0x0db3, 0x88f: 0x0dbf, 0x890: 0x0dc7, 0x891: 0x0dcb,
-	0x892: 0x0dcf, 0x893: 0x0dd3, 0x894: 0x0dd7, 0x895: 0x0e8f, 0x896: 0x0ed7, 0x897: 0x0ee3,
-	0x898: 0x0ee7, 0x899: 0x0eeb, 0x89a: 0x0eef, 0x89b: 0x0ef7, 0x89c: 0x0efb, 0x89d: 0x0f0f,
-	0x89e: 0x0f2b, 0x89f: 0x0f33, 0x8a0: 0x0f73, 0x8a1: 0x0f77, 0x8a2: 0x0f7f, 0x8a3: 0x0f83,
-	0x8a4: 0x0f8b, 0x8a5: 0x0f8f, 0x8a6: 0x0fb3, 0x8a7: 0x0fb7, 0x8a8: 0x0fd3, 0x8a9: 0x0fd7,
-	0x8aa: 0x0fdb, 0x8ab: 0x0fdf, 0x8ac: 0x0ff3, 0x8ad: 0x1017, 0x8ae: 0x101b, 0x8af: 0x101f,
-	0x8b0: 0x1043, 0x8b1: 0x1083, 0x8b2: 0x1087, 0x8b3: 0x10a7, 0x8b4: 0x10b7, 0x8b5: 0x10bf,
-	0x8b6: 0x10df, 0x8b7: 0x1103, 0x8b8: 0x1147, 0x8b9: 0x114f, 0x8ba: 0x1163, 0x8bb: 0x116f,
-	0x8bc: 0x1177, 0x8bd: 0x117f, 0x8be: 0x1183, 0x8bf: 0x1187,
+	0x880: 0x06bf, 0x881: 0x06e3, 0x882: 0x06ef, 0x883: 0x06ff, 0x884: 0x0707, 0x885: 0x0713,
+	0x886: 0x071b, 0x887: 0x0723, 0x888: 0x072f, 0x889: 0x0783, 0x88a: 0x079b, 0x88b: 0x07ab,
+	0x88c: 0x07bb, 0x88d: 0x07cb, 0x88e: 0x07db, 0x88f: 0x07fb, 0x890: 0x07ff, 0x891: 0x0803,
+	0x892: 0x0837, 0x893: 0x085f, 0x894: 0x086f, 0x895: 0x0877, 0x896: 0x087b, 0x897: 0x0887,
+	0x898: 0x08a3, 0x899: 0x08a7, 0x89a: 0x08bf, 0x89b: 0x08c3, 0x89c: 0x08cb, 0x89d: 0x08db,
+	0x89e: 0x0977, 0x89f: 0x098b, 0x8a0: 0x09cb, 0x8a1: 0x09df, 0x8a2: 0x09e7, 0x8a3: 0x09eb,
+	0x8a4: 0x09fb, 0x8a5: 0x0a17, 0x8a6: 0x0a43, 0x8a7: 0x0a4f, 0x8a8: 0x0a6f, 0x8a9: 0x0a7b,
+	0x8aa: 0x0a7f, 0x8ab: 0x0a83, 0x8ac: 0x0a9b, 0x8ad: 0x0a9f, 0x8ae: 0x0acb, 0x8af: 0x0ad7,
+	0x8b0: 0x0adf, 0x8b1: 0x0ae7, 0x8b2: 0x0af7, 0x8b3: 0x0aff, 0x8b4: 0x0b07, 0x8b5: 0x0b33,
+	0x8b6: 0x0b37, 0x8b7: 0x0b3f, 0x8b8: 0x0b43, 0x8b9: 0x0b4b, 0x8ba: 0x0b53, 0x8bb: 0x0b63,
+	0x8bc: 0x0b7f, 0x8bd: 0x0bf7, 0x8be: 0x0c0b, 0x8bf: 0x0c0f,
 	// Block 0x23, offset 0x8c0
-	0x8c0: 0x119f, 0x8c1: 0x11a3, 0x8c2: 0x11bf, 0x8c3: 0x11c7, 0x8c4: 0x11cf, 0x8c5: 0x11d3,
-	0x8c6: 0x11df, 0x8c7: 0x11e7, 0x8c8: 0x11eb, 0x8c9: 0x11ef, 0x8ca: 0x11f7, 0x8cb: 0x11fb,
-	0x8cc: 0x129b, 0x8cd: 0x12af, 0x8ce: 0x12e3, 0x8cf: 0x12e7, 0x8d0: 0x12ef, 0x8d1: 0x131b,
-	0x8d2: 0x1323, 0x8d3: 0x132b, 0x8d4: 0x1333, 0x8d5: 0x136f, 0x8d6: 0x1373, 0x8d7: 0x137b,
-	0x8d8: 0x137f, 0x8d9: 0x1383, 0x8da: 0x13af, 0x8db: 0x13b3, 0x8dc: 0x13bb, 0x8dd: 0x13cf,
-	0x8de: 0x13d3, 0x8df: 0x13ef, 0x8e0: 0x13f7, 0x8e1: 0x13fb, 0x8e2: 0x141f, 0x8e3: 0x143f,
-	0x8e4: 0x1453, 0x8e5: 0x1457, 0x8e6: 0x145f, 0x8e7: 0x148b, 0x8e8: 0x148f, 0x8e9: 0x149f,
-	0x8ea: 0x14c3, 0x8eb: 0x14cf, 0x8ec: 0x14df, 0x8ed: 0x14f7, 0x8ee: 0x14ff, 0x8ef: 0x1503,
-	0x8f0: 0x1507, 0x8f1: 0x150b, 0x8f2: 0x1517, 0x8f3: 0x151b, 0x8f4: 0x1523, 0x8f5: 0x153f,
-	0x8f6: 0x1543, 0x8f7: 0x1547, 0x8f8: 0x155f, 0x8f9: 0x1563, 0x8fa: 0x156b, 0x8fb: 0x157f,
-	0x8fc: 0x1583, 0x8fd: 0x1587, 0x8fe: 0x158f, 0x8ff: 0x1593,
+	0x8c0: 0x0c8f, 0x8c1: 0x0c93, 0x8c2: 0x0ca7, 0x8c3: 0x0cab, 0x8c4: 0x0cb3, 0x8c5: 0x0cbb,
+	0x8c6: 0x0cc3, 0x8c7: 0x0ccf, 0x8c8: 0x0cf7, 0x8c9: 0x0d07, 0x8ca: 0x0d1b, 0x8cb: 0x0d8b,
+	0x8cc: 0x0d97, 0x8cd: 0x0da7, 0x8ce: 0x0db3, 0x8cf: 0x0dbf, 0x8d0: 0x0dc7, 0x8d1: 0x0dcb,
+	0x8d2: 0x0dcf, 0x8d3: 0x0dd3, 0x8d4: 0x0dd7, 0x8d5: 0x0e8f, 0x8d6: 0x0ed7, 0x8d7: 0x0ee3,
+	0x8d8: 0x0ee7, 0x8d9: 0x0eeb, 0x8da: 0x0eef, 0x8db: 0x0ef7, 0x8dc: 0x0efb, 0x8dd: 0x0f0f,
+	0x8de: 0x0f2b, 0x8df: 0x0f33, 0x8e0: 0x0f73, 0x8e1: 0x0f77, 0x8e2: 0x0f7f, 0x8e3: 0x0f83,
+	0x8e4: 0x0f8b, 0x8e5: 0x0f8f, 0x8e6: 0x0fb3, 0x8e7: 0x0fb7, 0x8e8: 0x0fd3, 0x8e9: 0x0fd7,
+	0x8ea: 0x0fdb, 0x8eb: 0x0fdf, 0x8ec: 0x0ff3, 0x8ed: 0x1017, 0x8ee: 0x101b, 0x8ef: 0x101f,
+	0x8f0: 0x1043, 0x8f1: 0x1083, 0x8f2: 0x1087, 0x8f3: 0x10a7, 0x8f4: 0x10b7, 0x8f5: 0x10bf,
+	0x8f6: 0x10df, 0x8f7: 0x1103, 0x8f8: 0x1147, 0x8f9: 0x114f, 0x8fa: 0x1163, 0x8fb: 0x116f,
+	0x8fc: 0x1177, 0x8fd: 0x117f, 0x8fe: 0x1183, 0x8ff: 0x1187,
 	// Block 0x24, offset 0x900
-	0x906: 0xa000, 0x90b: 0xa000,
-	0x90c: 0x3f08, 0x90d: 0xa000, 0x90e: 0x3f10, 0x90f: 0xa000, 0x910: 0x3f18, 0x911: 0xa000,
-	0x912: 0x3f20, 0x913: 0xa000, 0x914: 0x3f28, 0x915: 0xa000, 0x916: 0x3f30, 0x917: 0xa000,
-	0x918: 0x3f38, 0x919: 0xa000, 0x91a: 0x3f40, 0x91b: 0xa000, 0x91c: 0x3f48, 0x91d: 0xa000,
-	0x91e: 0x3f50, 0x91f: 0xa000, 0x920: 0x3f58, 0x921: 0xa000, 0x922: 0x3f60,
-	0x924: 0xa000, 0x925: 0x3f68, 0x926: 0xa000, 0x927: 0x3f70, 0x928: 0xa000, 0x929: 0x3f78,
-	0x92f: 0xa000,
-	0x930: 0x3f80, 0x931: 0x3f88, 0x932: 0xa000, 0x933: 0x3f90, 0x934: 0x3f98, 0x935: 0xa000,
-	0x936: 0x3fa0, 0x937: 0x3fa8, 0x938: 0xa000, 0x939: 0x3fb0, 0x93a: 0x3fb8, 0x93b: 0xa000,
-	0x93c: 0x3fc0, 0x93d: 0x3fc8,
+	0x900: 0x119f, 0x901: 0x11a3, 0x902: 0x11bf, 0x903: 0x11c7, 0x904: 0x11cf, 0x905: 0x11d3,
+	0x906: 0x11df, 0x907: 0x11e7, 0x908: 0x11eb, 0x909: 0x11ef, 0x90a: 0x11f7, 0x90b: 0x11fb,
+	0x90c: 0x129b, 0x90d: 0x12af, 0x90e: 0x12e3, 0x90f: 0x12e7, 0x910: 0x12ef, 0x911: 0x131b,
+	0x912: 0x1323, 0x913: 0x132b, 0x914: 0x1333, 0x915: 0x136f, 0x916: 0x1373, 0x917: 0x137b,
+	0x918: 0x137f, 0x919: 0x1383, 0x91a: 0x13af, 0x91b: 0x13b3, 0x91c: 0x13bb, 0x91d: 0x13cf,
+	0x91e: 0x13d3, 0x91f: 0x13ef, 0x920: 0x13f7, 0x921: 0x13fb, 0x922: 0x141f, 0x923: 0x143f,
+	0x924: 0x1453, 0x925: 0x1457, 0x926: 0x145f, 0x927: 0x148b, 0x928: 0x148f, 0x929: 0x149f,
+	0x92a: 0x14c3, 0x92b: 0x14cf, 0x92c: 0x14df, 0x92d: 0x14f7, 0x92e: 0x14ff, 0x92f: 0x1503,
+	0x930: 0x1507, 0x931: 0x150b, 0x932: 0x1517, 0x933: 0x151b, 0x934: 0x1523, 0x935: 0x153f,
+	0x936: 0x1543, 0x937: 0x1547, 0x938: 0x155f, 0x939: 0x1563, 0x93a: 0x156b, 0x93b: 0x157f,
+	0x93c: 0x1583, 0x93d: 0x1587, 0x93e: 0x158f, 0x93f: 0x1593,
 	// Block 0x25, offset 0x940
-	0x954: 0x3f00,
-	0x959: 0x9903, 0x95a: 0x9903, 0x95b: 0x4372, 0x95c: 0x4378, 0x95d: 0xa000,
-	0x95e: 0x3fd0, 0x95f: 0x26b4,
-	0x966: 0xa000,
-	0x96b: 0xa000, 0x96c: 0x3fe0, 0x96d: 0xa000, 0x96e: 0x3fe8, 0x96f: 0xa000,
-	0x970: 0x3ff0, 0x971: 0xa000, 0x972: 0x3ff8, 0x973: 0xa000, 0x974: 0x4000, 0x975: 0xa000,
-	0x976: 0x4008, 0x977: 0xa000, 0x978: 0x4010, 0x979: 0xa000, 0x97a: 0x4018, 0x97b: 0xa000,
-	0x97c: 0x4020, 0x97d: 0xa000, 0x97e: 0x4028, 0x97f: 0xa000,
+	0x946: 0xa000, 0x94b: 0xa000,
+	0x94c: 0x3f08, 0x94d: 0xa000, 0x94e: 0x3f10, 0x94f: 0xa000, 0x950: 0x3f18, 0x951: 0xa000,
+	0x952: 0x3f20, 0x953: 0xa000, 0x954: 0x3f28, 0x955: 0xa000, 0x956: 0x3f30, 0x957: 0xa000,
+	0x958: 0x3f38, 0x959: 0xa000, 0x95a: 0x3f40, 0x95b: 0xa000, 0x95c: 0x3f48, 0x95d: 0xa000,
+	0x95e: 0x3f50, 0x95f: 0xa000, 0x960: 0x3f58, 0x961: 0xa000, 0x962: 0x3f60,
+	0x964: 0xa000, 0x965: 0x3f68, 0x966: 0xa000, 0x967: 0x3f70, 0x968: 0xa000, 0x969: 0x3f78,
+	0x96f: 0xa000,
+	0x970: 0x3f80, 0x971: 0x3f88, 0x972: 0xa000, 0x973: 0x3f90, 0x974: 0x3f98, 0x975: 0xa000,
+	0x976: 0x3fa0, 0x977: 0x3fa8, 0x978: 0xa000, 0x979: 0x3fb0, 0x97a: 0x3fb8, 0x97b: 0xa000,
+	0x97c: 0x3fc0, 0x97d: 0x3fc8,
 	// Block 0x26, offset 0x980
-	0x980: 0x4030, 0x981: 0xa000, 0x982: 0x4038, 0x984: 0xa000, 0x985: 0x4040,
-	0x986: 0xa000, 0x987: 0x4048, 0x988: 0xa000, 0x989: 0x4050,
-	0x98f: 0xa000, 0x990: 0x4058, 0x991: 0x4060,
-	0x992: 0xa000, 0x993: 0x4068, 0x994: 0x4070, 0x995: 0xa000, 0x996: 0x4078, 0x997: 0x4080,
-	0x998: 0xa000, 0x999: 0x4088, 0x99a: 0x4090, 0x99b: 0xa000, 0x99c: 0x4098, 0x99d: 0x40a0,
-	0x9af: 0xa000,
-	0x9b0: 0xa000, 0x9b1: 0xa000, 0x9b2: 0xa000, 0x9b4: 0x3fd8,
-	0x9b7: 0x40a8, 0x9b8: 0x40b0, 0x9b9: 0x40b8, 0x9ba: 0x40c0,
-	0x9bd: 0xa000, 0x9be: 0x40c8, 0x9bf: 0x26c9,
+	0x994: 0x3f00,
+	0x999: 0x9903, 0x99a: 0x9903, 0x99b: 0x42dc, 0x99c: 0x42e2, 0x99d: 0xa000,
+	0x99e: 0x3fd0, 0x99f: 0x26b4,
+	0x9a6: 0xa000,
+	0x9ab: 0xa000, 0x9ac: 0x3fe0, 0x9ad: 0xa000, 0x9ae: 0x3fe8, 0x9af: 0xa000,
+	0x9b0: 0x3ff0, 0x9b1: 0xa000, 0x9b2: 0x3ff8, 0x9b3: 0xa000, 0x9b4: 0x4000, 0x9b5: 0xa000,
+	0x9b6: 0x4008, 0x9b7: 0xa000, 0x9b8: 0x4010, 0x9b9: 0xa000, 0x9ba: 0x4018, 0x9bb: 0xa000,
+	0x9bc: 0x4020, 0x9bd: 0xa000, 0x9be: 0x4028, 0x9bf: 0xa000,
 	// Block 0x27, offset 0x9c0
-	0x9c0: 0x0367, 0x9c1: 0x032b, 0x9c2: 0x032f, 0x9c3: 0x0333, 0x9c4: 0x037b, 0x9c5: 0x0337,
-	0x9c6: 0x033b, 0x9c7: 0x033f, 0x9c8: 0x0343, 0x9c9: 0x0347, 0x9ca: 0x034b, 0x9cb: 0x034f,
-	0x9cc: 0x0353, 0x9cd: 0x0357, 0x9ce: 0x035b, 0x9cf: 0x42dc, 0x9d0: 0x42e1, 0x9d1: 0x42e6,
-	0x9d2: 0x42eb, 0x9d3: 0x42f0, 0x9d4: 0x42f5, 0x9d5: 0x42fa, 0x9d6: 0x42ff, 0x9d7: 0x4304,
-	0x9d8: 0x4309, 0x9d9: 0x430e, 0x9da: 0x4313, 0x9db: 0x4318, 0x9dc: 0x431d, 0x9dd: 0x4322,
-	0x9de: 0x4327, 0x9df: 0x432c, 0x9e0: 0x4331, 0x9e1: 0x4336, 0x9e2: 0x433b, 0x9e3: 0x4340,
-	0x9e4: 0x03c3, 0x9e5: 0x035f, 0x9e6: 0x0363, 0x9e7: 0x03e7, 0x9e8: 0x03eb, 0x9e9: 0x03ef,
-	0x9ea: 0x03f3, 0x9eb: 0x03f7, 0x9ec: 0x03fb, 0x9ed: 0x03ff, 0x9ee: 0x036b, 0x9ef: 0x0403,
-	0x9f0: 0x0407, 0x9f1: 0x036f, 0x9f2: 0x0373, 0x9f3: 0x0377, 0x9f4: 0x037f, 0x9f5: 0x0383,
-	0x9f6: 0x0387, 0x9f7: 0x038b, 0x9f8: 0x038f, 0x9f9: 0x0393, 0x9fa: 0x0397, 0x9fb: 0x039b,
-	0x9fc: 0x039f, 0x9fd: 0x03a3, 0x9fe: 0x03a7, 0x9ff: 0x03ab,
+	0x9c0: 0x4030, 0x9c1: 0xa000, 0x9c2: 0x4038, 0x9c4: 0xa000, 0x9c5: 0x4040,
+	0x9c6: 0xa000, 0x9c7: 0x4048, 0x9c8: 0xa000, 0x9c9: 0x4050,
+	0x9cf: 0xa000, 0x9d0: 0x4058, 0x9d1: 0x4060,
+	0x9d2: 0xa000, 0x9d3: 0x4068, 0x9d4: 0x4070, 0x9d5: 0xa000, 0x9d6: 0x4078, 0x9d7: 0x4080,
+	0x9d8: 0xa000, 0x9d9: 0x4088, 0x9da: 0x4090, 0x9db: 0xa000, 0x9dc: 0x4098, 0x9dd: 0x40a0,
+	0x9ef: 0xa000,
+	0x9f0: 0xa000, 0x9f1: 0xa000, 0x9f2: 0xa000, 0x9f4: 0x3fd8,
+	0x9f7: 0x40a8, 0x9f8: 0x40b0, 0x9f9: 0x40b8, 0x9fa: 0x40c0,
+	0x9fd: 0xa000, 0x9fe: 0x40c8, 0x9ff: 0x26c9,
 	// Block 0x28, offset 0xa00
-	0xa00: 0x03af, 0xa01: 0x03b3, 0xa02: 0x040b, 0xa03: 0x040f, 0xa04: 0x03b7, 0xa05: 0x03bb,
-	0xa06: 0x03bf, 0xa07: 0x03c7, 0xa08: 0x03cb, 0xa09: 0x03cf, 0xa0a: 0x03d3, 0xa0b: 0x03d7,
-	0xa0c: 0x03db, 0xa0d: 0x03df, 0xa0e: 0x03e3,
-	0xa12: 0x06bf, 0xa13: 0x071b, 0xa14: 0x06cb, 0xa15: 0x097b, 0xa16: 0x06cf, 0xa17: 0x06e7,
-	0xa18: 0x06d3, 0xa19: 0x0f93, 0xa1a: 0x0707, 0xa1b: 0x06db, 0xa1c: 0x06c3, 0xa1d: 0x09ff,
-	0xa1e: 0x098f, 0xa1f: 0x072f,
+	0xa00: 0x0367, 0xa01: 0x032b, 0xa02: 0x032f, 0xa03: 0x0333, 0xa04: 0x037b, 0xa05: 0x0337,
+	0xa06: 0x033b, 0xa07: 0x033f, 0xa08: 0x0343, 0xa09: 0x0347, 0xa0a: 0x034b, 0xa0b: 0x034f,
+	0xa0c: 0x0353, 0xa0d: 0x0357, 0xa0e: 0x035b, 0xa0f: 0x49bd, 0xa10: 0x49c3, 0xa11: 0x49c9,
+	0xa12: 0x49cf, 0xa13: 0x49d5, 0xa14: 0x49db, 0xa15: 0x49e1, 0xa16: 0x49e7, 0xa17: 0x49ed,
+	0xa18: 0x49f3, 0xa19: 0x49f9, 0xa1a: 0x49ff, 0xa1b: 0x4a05, 0xa1c: 0x4a0b, 0xa1d: 0x4a11,
+	0xa1e: 0x4a17, 0xa1f: 0x4a1d, 0xa20: 0x4a23, 0xa21: 0x4a29, 0xa22: 0x4a2f, 0xa23: 0x4a35,
+	0xa24: 0x03c3, 0xa25: 0x035f, 0xa26: 0x0363, 0xa27: 0x03e7, 0xa28: 0x03eb, 0xa29: 0x03ef,
+	0xa2a: 0x03f3, 0xa2b: 0x03f7, 0xa2c: 0x03fb, 0xa2d: 0x03ff, 0xa2e: 0x036b, 0xa2f: 0x0403,
+	0xa30: 0x0407, 0xa31: 0x036f, 0xa32: 0x0373, 0xa33: 0x0377, 0xa34: 0x037f, 0xa35: 0x0383,
+	0xa36: 0x0387, 0xa37: 0x038b, 0xa38: 0x038f, 0xa39: 0x0393, 0xa3a: 0x0397, 0xa3b: 0x039b,
+	0xa3c: 0x039f, 0xa3d: 0x03a3, 0xa3e: 0x03a7, 0xa3f: 0x03ab,
 	// Block 0x29, offset 0xa40
-	0xa40: 0x2054, 0xa41: 0x205a, 0xa42: 0x2060, 0xa43: 0x2066, 0xa44: 0x206c, 0xa45: 0x2072,
-	0xa46: 0x2078, 0xa47: 0x207e, 0xa48: 0x2084, 0xa49: 0x208a, 0xa4a: 0x2090, 0xa4b: 0x2096,
-	0xa4c: 0x209c, 0xa4d: 0x20a2, 0xa4e: 0x2726, 0xa4f: 0x272f, 0xa50: 0x2738, 0xa51: 0x2741,
-	0xa52: 0x274a, 0xa53: 0x2753, 0xa54: 0x275c, 0xa55: 0x2765, 0xa56: 0x276e, 0xa57: 0x2780,
-	0xa58: 0x2789, 0xa59: 0x2792, 0xa5a: 0x279b, 0xa5b: 0x27a4, 0xa5c: 0x2777, 0xa5d: 0x2bac,
-	0xa5e: 0x2aed, 0xa60: 0x20a8, 0xa61: 0x20c0, 0xa62: 0x20b4, 0xa63: 0x2108,
-	0xa64: 0x20c6, 0xa65: 0x20e4, 0xa66: 0x20ae, 0xa67: 0x20de, 0xa68: 0x20ba, 0xa69: 0x20f0,
-	0xa6a: 0x2120, 0xa6b: 0x213e, 0xa6c: 0x2138, 0xa6d: 0x212c, 0xa6e: 0x217a, 0xa6f: 0x210e,
-	0xa70: 0x211a, 0xa71: 0x2132, 0xa72: 0x2126, 0xa73: 0x2150, 0xa74: 0x20fc, 0xa75: 0x2144,
-	0xa76: 0x216e, 0xa77: 0x2156, 0xa78: 0x20ea, 0xa79: 0x20cc, 0xa7a: 0x2102, 0xa7b: 0x2114,
-	0xa7c: 0x214a, 0xa7d: 0x20d2, 0xa7e: 0x2174, 0xa7f: 0x20f6,
+	0xa40: 0x03af, 0xa41: 0x03b3, 0xa42: 0x040b, 0xa43: 0x040f, 0xa44: 0x03b7, 0xa45: 0x03bb,
+	0xa46: 0x03bf, 0xa47: 0x03c7, 0xa48: 0x03cb, 0xa49: 0x03cf, 0xa4a: 0x03d3, 0xa4b: 0x03d7,
+	0xa4c: 0x03db, 0xa4d: 0x03df, 0xa4e: 0x03e3,
+	0xa52: 0x06bf, 0xa53: 0x071b, 0xa54: 0x06cb, 0xa55: 0x097b, 0xa56: 0x06cf, 0xa57: 0x06e7,
+	0xa58: 0x06d3, 0xa59: 0x0f93, 0xa5a: 0x0707, 0xa5b: 0x06db, 0xa5c: 0x06c3, 0xa5d: 0x09ff,
+	0xa5e: 0x098f, 0xa5f: 0x072f,
 	// Block 0x2a, offset 0xa80
-	0xa80: 0x215c, 0xa81: 0x20d8, 0xa82: 0x2162, 0xa83: 0x2168, 0xa84: 0x092f, 0xa85: 0x0b03,
-	0xa86: 0x0ca7, 0xa87: 0x10c7,
-	0xa90: 0x1bc4, 0xa91: 0x18a9,
-	0xa92: 0x18ac, 0xa93: 0x18af, 0xa94: 0x18b2, 0xa95: 0x18b5, 0xa96: 0x18b8, 0xa97: 0x18bb,
-	0xa98: 0x18be, 0xa99: 0x18c1, 0xa9a: 0x18ca, 0xa9b: 0x18cd, 0xa9c: 0x18d0, 0xa9d: 0x18d3,
-	0xa9e: 0x18d6, 0xa9f: 0x18d9, 0xaa0: 0x0313, 0xaa1: 0x031b, 0xaa2: 0x031f, 0xaa3: 0x0327,
-	0xaa4: 0x032b, 0xaa5: 0x032f, 0xaa6: 0x0337, 0xaa7: 0x033f, 0xaa8: 0x0343, 0xaa9: 0x034b,
-	0xaaa: 0x034f, 0xaab: 0x0353, 0xaac: 0x0357, 0xaad: 0x035b, 0xaae: 0x2e18, 0xaaf: 0x2e20,
-	0xab0: 0x2e28, 0xab1: 0x2e30, 0xab2: 0x2e38, 0xab3: 0x2e40, 0xab4: 0x2e48, 0xab5: 0x2e50,
-	0xab6: 0x2e60, 0xab7: 0x2e68, 0xab8: 0x2e70, 0xab9: 0x2e78, 0xaba: 0x2e80, 0xabb: 0x2e88,
-	0xabc: 0x2ed3, 0xabd: 0x2e9b, 0xabe: 0x2e58,
+	0xa80: 0x2054, 0xa81: 0x205a, 0xa82: 0x2060, 0xa83: 0x2066, 0xa84: 0x206c, 0xa85: 0x2072,
+	0xa86: 0x2078, 0xa87: 0x207e, 0xa88: 0x2084, 0xa89: 0x208a, 0xa8a: 0x2090, 0xa8b: 0x2096,
+	0xa8c: 0x209c, 0xa8d: 0x20a2, 0xa8e: 0x2726, 0xa8f: 0x272f, 0xa90: 0x2738, 0xa91: 0x2741,
+	0xa92: 0x274a, 0xa93: 0x2753, 0xa94: 0x275c, 0xa95: 0x2765, 0xa96: 0x276e, 0xa97: 0x2780,
+	0xa98: 0x2789, 0xa99: 0x2792, 0xa9a: 0x279b, 0xa9b: 0x27a4, 0xa9c: 0x2777, 0xa9d: 0x2bac,
+	0xa9e: 0x2aed, 0xaa0: 0x20a8, 0xaa1: 0x20c0, 0xaa2: 0x20b4, 0xaa3: 0x2108,
+	0xaa4: 0x20c6, 0xaa5: 0x20e4, 0xaa6: 0x20ae, 0xaa7: 0x20de, 0xaa8: 0x20ba, 0xaa9: 0x20f0,
+	0xaaa: 0x2120, 0xaab: 0x213e, 0xaac: 0x2138, 0xaad: 0x212c, 0xaae: 0x217a, 0xaaf: 0x210e,
+	0xab0: 0x211a, 0xab1: 0x2132, 0xab2: 0x2126, 0xab3: 0x2150, 0xab4: 0x20fc, 0xab5: 0x2144,
+	0xab6: 0x216e, 0xab7: 0x2156, 0xab8: 0x20ea, 0xab9: 0x20cc, 0xaba: 0x2102, 0xabb: 0x2114,
+	0xabc: 0x214a, 0xabd: 0x20d2, 0xabe: 0x2174, 0xabf: 0x20f6,
 	// Block 0x2b, offset 0xac0
-	0xac0: 0x06bf, 0xac1: 0x071b, 0xac2: 0x06cb, 0xac3: 0x097b, 0xac4: 0x071f, 0xac5: 0x07af,
-	0xac6: 0x06c7, 0xac7: 0x07ab, 0xac8: 0x070b, 0xac9: 0x0887, 0xaca: 0x0d07, 0xacb: 0x0e8f,
-	0xacc: 0x0dd7, 0xacd: 0x0d1b, 0xace: 0x145f, 0xacf: 0x098b, 0xad0: 0x0ccf, 0xad1: 0x0d4b,
-	0xad2: 0x0d0b, 0xad3: 0x104b, 0xad4: 0x08fb, 0xad5: 0x0f03, 0xad6: 0x1387, 0xad7: 0x105f,
-	0xad8: 0x0843, 0xad9: 0x108f, 0xada: 0x0f9b, 0xadb: 0x0a17, 0xadc: 0x140f, 0xadd: 0x077f,
-	0xade: 0x08ab, 0xadf: 0x0df7, 0xae0: 0x1527, 0xae1: 0x0743, 0xae2: 0x07d3, 0xae3: 0x0d9b,
-	0xae4: 0x06cf, 0xae5: 0x06e7, 0xae6: 0x06d3, 0xae7: 0x0adb, 0xae8: 0x08ef, 0xae9: 0x087f,
-	0xaea: 0x0a57, 0xaeb: 0x0a4b, 0xaec: 0x0feb, 0xaed: 0x073f, 0xaee: 0x139b, 0xaef: 0x089b,
-	0xaf0: 0x09f3, 0xaf1: 0x18dc, 0xaf2: 0x18df, 0xaf3: 0x18e2, 0xaf4: 0x18e5, 0xaf5: 0x18ee,
-	0xaf6: 0x18f1, 0xaf7: 0x18f4, 0xaf8: 0x18f7, 0xaf9: 0x18fa, 0xafa: 0x18fd, 0xafb: 0x1900,
-	0xafc: 0x1903, 0xafd: 0x1906, 0xafe: 0x1909, 0xaff: 0x1912,
+	0xac0: 0x215c, 0xac1: 0x20d8, 0xac2: 0x2162, 0xac3: 0x2168, 0xac4: 0x092f, 0xac5: 0x0b03,
+	0xac6: 0x0ca7, 0xac7: 0x10c7,
+	0xad0: 0x1bc4, 0xad1: 0x18a9,
+	0xad2: 0x18ac, 0xad3: 0x18af, 0xad4: 0x18b2, 0xad5: 0x18b5, 0xad6: 0x18b8, 0xad7: 0x18bb,
+	0xad8: 0x18be, 0xad9: 0x18c1, 0xada: 0x18ca, 0xadb: 0x18cd, 0xadc: 0x18d0, 0xadd: 0x18d3,
+	0xade: 0x18d6, 0xadf: 0x18d9, 0xae0: 0x0313, 0xae1: 0x031b, 0xae2: 0x031f, 0xae3: 0x0327,
+	0xae4: 0x032b, 0xae5: 0x032f, 0xae6: 0x0337, 0xae7: 0x033f, 0xae8: 0x0343, 0xae9: 0x034b,
+	0xaea: 0x034f, 0xaeb: 0x0353, 0xaec: 0x0357, 0xaed: 0x035b, 0xaee: 0x2e18, 0xaef: 0x2e20,
+	0xaf0: 0x2e28, 0xaf1: 0x2e30, 0xaf2: 0x2e38, 0xaf3: 0x2e40, 0xaf4: 0x2e48, 0xaf5: 0x2e50,
+	0xaf6: 0x2e60, 0xaf7: 0x2e68, 0xaf8: 0x2e70, 0xaf9: 0x2e78, 0xafa: 0x2e80, 0xafb: 0x2e88,
+	0xafc: 0x2ed3, 0xafd: 0x2e9b, 0xafe: 0x2e58,
 	// Block 0x2c, offset 0xb00
-	0xb00: 0x1cc6, 0xb01: 0x1cd5, 0xb02: 0x1ce4, 0xb03: 0x1cf3, 0xb04: 0x1d02, 0xb05: 0x1d11,
-	0xb06: 0x1d20, 0xb07: 0x1d2f, 0xb08: 0x1d3e, 0xb09: 0x218c, 0xb0a: 0x219e, 0xb0b: 0x21b0,
-	0xb0c: 0x1954, 0xb0d: 0x1c04, 0xb0e: 0x19d2, 0xb0f: 0x1ba8, 0xb10: 0x04cb, 0xb11: 0x04d3,
-	0xb12: 0x04db, 0xb13: 0x04e3, 0xb14: 0x04eb, 0xb15: 0x04ef, 0xb16: 0x04f3, 0xb17: 0x04f7,
-	0xb18: 0x04fb, 0xb19: 0x04ff, 0xb1a: 0x0503, 0xb1b: 0x0507, 0xb1c: 0x050b, 0xb1d: 0x050f,
-	0xb1e: 0x0513, 0xb1f: 0x0517, 0xb20: 0x051b, 0xb21: 0x0523, 0xb22: 0x0527, 0xb23: 0x052b,
-	0xb24: 0x052f, 0xb25: 0x0533, 0xb26: 0x0537, 0xb27: 0x053b, 0xb28: 0x053f, 0xb29: 0x0543,
-	0xb2a: 0x0547, 0xb2b: 0x054b, 0xb2c: 0x054f, 0xb2d: 0x0553, 0xb2e: 0x0557, 0xb2f: 0x055b,
-	0xb30: 0x055f, 0xb31: 0x0563, 0xb32: 0x0567, 0xb33: 0x056f, 0xb34: 0x0577, 0xb35: 0x057f,
-	0xb36: 0x0583, 0xb37: 0x0587, 0xb38: 0x058b, 0xb39: 0x058f, 0xb3a: 0x0593, 0xb3b: 0x0597,
-	0xb3c: 0x059b, 0xb3d: 0x059f, 0xb3e: 0x05a3,
+	0xb00: 0x06bf, 0xb01: 0x071b, 0xb02: 0x06cb, 0xb03: 0x097b, 0xb04: 0x071f, 0xb05: 0x07af,
+	0xb06: 0x06c7, 0xb07: 0x07ab, 0xb08: 0x070b, 0xb09: 0x0887, 0xb0a: 0x0d07, 0xb0b: 0x0e8f,
+	0xb0c: 0x0dd7, 0xb0d: 0x0d1b, 0xb0e: 0x145f, 0xb0f: 0x098b, 0xb10: 0x0ccf, 0xb11: 0x0d4b,
+	0xb12: 0x0d0b, 0xb13: 0x104b, 0xb14: 0x08fb, 0xb15: 0x0f03, 0xb16: 0x1387, 0xb17: 0x105f,
+	0xb18: 0x0843, 0xb19: 0x108f, 0xb1a: 0x0f9b, 0xb1b: 0x0a17, 0xb1c: 0x140f, 0xb1d: 0x077f,
+	0xb1e: 0x08ab, 0xb1f: 0x0df7, 0xb20: 0x1527, 0xb21: 0x0743, 0xb22: 0x07d3, 0xb23: 0x0d9b,
+	0xb24: 0x06cf, 0xb25: 0x06e7, 0xb26: 0x06d3, 0xb27: 0x0adb, 0xb28: 0x08ef, 0xb29: 0x087f,
+	0xb2a: 0x0a57, 0xb2b: 0x0a4b, 0xb2c: 0x0feb, 0xb2d: 0x073f, 0xb2e: 0x139b, 0xb2f: 0x089b,
+	0xb30: 0x09f3, 0xb31: 0x18dc, 0xb32: 0x18df, 0xb33: 0x18e2, 0xb34: 0x18e5, 0xb35: 0x18ee,
+	0xb36: 0x18f1, 0xb37: 0x18f4, 0xb38: 0x18f7, 0xb39: 0x18fa, 0xb3a: 0x18fd, 0xb3b: 0x1900,
+	0xb3c: 0x1903, 0xb3d: 0x1906, 0xb3e: 0x1909, 0xb3f: 0x1912,
 	// Block 0x2d, offset 0xb40
-	0xb40: 0x2b0c, 0xb41: 0x29a8, 0xb42: 0x2b1c, 0xb43: 0x2880, 0xb44: 0x2ee4, 0xb45: 0x288a,
-	0xb46: 0x2894, 0xb47: 0x2f28, 0xb48: 0x29b5, 0xb49: 0x289e, 0xb4a: 0x28a8, 0xb4b: 0x28b2,
-	0xb4c: 0x29dc, 0xb4d: 0x29e9, 0xb4e: 0x29c2, 0xb4f: 0x29cf, 0xb50: 0x2ea9, 0xb51: 0x29f6,
-	0xb52: 0x2a03, 0xb53: 0x2bbe, 0xb54: 0x26bb, 0xb55: 0x2bd1, 0xb56: 0x2be4, 0xb57: 0x2b2c,
-	0xb58: 0x2a10, 0xb59: 0x2bf7, 0xb5a: 0x2c0a, 0xb5b: 0x2a1d, 0xb5c: 0x28bc, 0xb5d: 0x28c6,
-	0xb5e: 0x2eb7, 0xb5f: 0x2a2a, 0xb60: 0x2b3c, 0xb61: 0x2ef5, 0xb62: 0x28d0, 0xb63: 0x28da,
-	0xb64: 0x2a37, 0xb65: 0x28e4, 0xb66: 0x28ee, 0xb67: 0x26d0, 0xb68: 0x26d7, 0xb69: 0x28f8,
-	0xb6a: 0x2902, 0xb6b: 0x2c1d, 0xb6c: 0x2a44, 0xb6d: 0x2b4c, 0xb6e: 0x2c30, 0xb6f: 0x2a51,
-	0xb70: 0x2916, 0xb71: 0x290c, 0xb72: 0x2f3c, 0xb73: 0x2a5e, 0xb74: 0x2c43, 0xb75: 0x2920,
-	0xb76: 0x2b5c, 0xb77: 0x292a, 0xb78: 0x2a78, 0xb79: 0x2934, 0xb7a: 0x2a85, 0xb7b: 0x2f06,
-	0xb7c: 0x2a6b, 0xb7d: 0x2b6c, 0xb7e: 0x2a92, 0xb7f: 0x26de,
+	0xb40: 0x1cc6, 0xb41: 0x1cd5, 0xb42: 0x1ce4, 0xb43: 0x1cf3, 0xb44: 0x1d02, 0xb45: 0x1d11,
+	0xb46: 0x1d20, 0xb47: 0x1d2f, 0xb48: 0x1d3e, 0xb49: 0x218c, 0xb4a: 0x219e, 0xb4b: 0x21b0,
+	0xb4c: 0x1954, 0xb4d: 0x1c04, 0xb4e: 0x19d2, 0xb4f: 0x1ba8, 0xb50: 0x04cb, 0xb51: 0x04d3,
+	0xb52: 0x04db, 0xb53: 0x04e3, 0xb54: 0x04eb, 0xb55: 0x04ef, 0xb56: 0x04f3, 0xb57: 0x04f7,
+	0xb58: 0x04fb, 0xb59: 0x04ff, 0xb5a: 0x0503, 0xb5b: 0x0507, 0xb5c: 0x050b, 0xb5d: 0x050f,
+	0xb5e: 0x0513, 0xb5f: 0x0517, 0xb60: 0x051b, 0xb61: 0x0523, 0xb62: 0x0527, 0xb63: 0x052b,
+	0xb64: 0x052f, 0xb65: 0x0533, 0xb66: 0x0537, 0xb67: 0x053b, 0xb68: 0x053f, 0xb69: 0x0543,
+	0xb6a: 0x0547, 0xb6b: 0x054b, 0xb6c: 0x054f, 0xb6d: 0x0553, 0xb6e: 0x0557, 0xb6f: 0x055b,
+	0xb70: 0x055f, 0xb71: 0x0563, 0xb72: 0x0567, 0xb73: 0x056f, 0xb74: 0x0577, 0xb75: 0x057f,
+	0xb76: 0x0583, 0xb77: 0x0587, 0xb78: 0x058b, 0xb79: 0x058f, 0xb7a: 0x0593, 0xb7b: 0x0597,
+	0xb7c: 0x059b, 0xb7d: 0x059f, 0xb7e: 0x05a3,
 	// Block 0x2e, offset 0xb80
-	0xb80: 0x2f17, 0xb81: 0x293e, 0xb82: 0x2948, 0xb83: 0x2a9f, 0xb84: 0x2952, 0xb85: 0x295c,
-	0xb86: 0x2966, 0xb87: 0x2b7c, 0xb88: 0x2aac, 0xb89: 0x26e5, 0xb8a: 0x2c56, 0xb8b: 0x2e90,
-	0xb8c: 0x2b8c, 0xb8d: 0x2ab9, 0xb8e: 0x2ec5, 0xb8f: 0x2970, 0xb90: 0x297a, 0xb91: 0x2ac6,
-	0xb92: 0x26ec, 0xb93: 0x2ad3, 0xb94: 0x2b9c, 0xb95: 0x26f3, 0xb96: 0x2c69, 0xb97: 0x2984,
-	0xb98: 0x1cb7, 0xb99: 0x1ccb, 0xb9a: 0x1cda, 0xb9b: 0x1ce9, 0xb9c: 0x1cf8, 0xb9d: 0x1d07,
-	0xb9e: 0x1d16, 0xb9f: 0x1d25, 0xba0: 0x1d34, 0xba1: 0x1d43, 0xba2: 0x2192, 0xba3: 0x21a4,
-	0xba4: 0x21b6, 0xba5: 0x21c2, 0xba6: 0x21ce, 0xba7: 0x21da, 0xba8: 0x21e6, 0xba9: 0x21f2,
-	0xbaa: 0x21fe, 0xbab: 0x220a, 0xbac: 0x2246, 0xbad: 0x2252, 0xbae: 0x225e, 0xbaf: 0x226a,
-	0xbb0: 0x2276, 0xbb1: 0x1c14, 0xbb2: 0x19c6, 0xbb3: 0x1936, 0xbb4: 0x1be4, 0xbb5: 0x1a47,
-	0xbb6: 0x1a56, 0xbb7: 0x19cc, 0xbb8: 0x1bfc, 0xbb9: 0x1c00, 0xbba: 0x1960, 0xbbb: 0x2701,
-	0xbbc: 0x270f, 0xbbd: 0x26fa, 0xbbe: 0x2708, 0xbbf: 0x2ae0,
+	0xb80: 0x2b0c, 0xb81: 0x29a8, 0xb82: 0x2b1c, 0xb83: 0x2880, 0xb84: 0x2ee4, 0xb85: 0x288a,
+	0xb86: 0x2894, 0xb87: 0x2f28, 0xb88: 0x29b5, 0xb89: 0x289e, 0xb8a: 0x28a8, 0xb8b: 0x28b2,
+	0xb8c: 0x29dc, 0xb8d: 0x29e9, 0xb8e: 0x29c2, 0xb8f: 0x29cf, 0xb90: 0x2ea9, 0xb91: 0x29f6,
+	0xb92: 0x2a03, 0xb93: 0x2bbe, 0xb94: 0x26bb, 0xb95: 0x2bd1, 0xb96: 0x2be4, 0xb97: 0x2b2c,
+	0xb98: 0x2a10, 0xb99: 0x2bf7, 0xb9a: 0x2c0a, 0xb9b: 0x2a1d, 0xb9c: 0x28bc, 0xb9d: 0x28c6,
+	0xb9e: 0x2eb7, 0xb9f: 0x2a2a, 0xba0: 0x2b3c, 0xba1: 0x2ef5, 0xba2: 0x28d0, 0xba3: 0x28da,
+	0xba4: 0x2a37, 0xba5: 0x28e4, 0xba6: 0x28ee, 0xba7: 0x26d0, 0xba8: 0x26d7, 0xba9: 0x28f8,
+	0xbaa: 0x2902, 0xbab: 0x2c1d, 0xbac: 0x2a44, 0xbad: 0x2b4c, 0xbae: 0x2c30, 0xbaf: 0x2a51,
+	0xbb0: 0x2916, 0xbb1: 0x290c, 0xbb2: 0x2f3c, 0xbb3: 0x2a5e, 0xbb4: 0x2c43, 0xbb5: 0x2920,
+	0xbb6: 0x2b5c, 0xbb7: 0x292a, 0xbb8: 0x2a78, 0xbb9: 0x2934, 0xbba: 0x2a85, 0xbbb: 0x2f06,
+	0xbbc: 0x2a6b, 0xbbd: 0x2b6c, 0xbbe: 0x2a92, 0xbbf: 0x26de,
 	// Block 0x2f, offset 0xbc0
-	0xbc0: 0x1a4a, 0xbc1: 0x1a32, 0xbc2: 0x1c60, 0xbc3: 0x1a1a, 0xbc4: 0x19f3, 0xbc5: 0x1969,
-	0xbc6: 0x1978, 0xbc7: 0x1948, 0xbc8: 0x1bf0, 0xbc9: 0x1d52, 0xbca: 0x1a4d, 0xbcb: 0x1a35,
-	0xbcc: 0x1c64, 0xbcd: 0x1c70, 0xbce: 0x1a26, 0xbcf: 0x19fc, 0xbd0: 0x1957, 0xbd1: 0x1c1c,
-	0xbd2: 0x1bb0, 0xbd3: 0x1b9c, 0xbd4: 0x1bcc, 0xbd5: 0x1c74, 0xbd6: 0x1a29, 0xbd7: 0x19c9,
-	0xbd8: 0x19ff, 0xbd9: 0x19de, 0xbda: 0x1a41, 0xbdb: 0x1c78, 0xbdc: 0x1a2c, 0xbdd: 0x19c0,
-	0xbde: 0x1a02, 0xbdf: 0x1c3c, 0xbe0: 0x1bf4, 0xbe1: 0x1a14, 0xbe2: 0x1c24, 0xbe3: 0x1c40,
-	0xbe4: 0x1bf8, 0xbe5: 0x1a17, 0xbe6: 0x1c28, 0xbe7: 0x22e8, 0xbe8: 0x22fc, 0xbe9: 0x1996,
-	0xbea: 0x1c20, 0xbeb: 0x1bb4, 0xbec: 0x1ba0, 0xbed: 0x1c48, 0xbee: 0x2716, 0xbef: 0x27ad,
-	0xbf0: 0x1a59, 0xbf1: 0x1a44, 0xbf2: 0x1c7c, 0xbf3: 0x1a2f, 0xbf4: 0x1a50, 0xbf5: 0x1a38,
-	0xbf6: 0x1c68, 0xbf7: 0x1a1d, 0xbf8: 0x19f6, 0xbf9: 0x1981, 0xbfa: 0x1a53, 0xbfb: 0x1a3b,
-	0xbfc: 0x1c6c, 0xbfd: 0x1a20, 0xbfe: 0x19f9, 0xbff: 0x1984,
+	0xbc0: 0x2f17, 0xbc1: 0x293e, 0xbc2: 0x2948, 0xbc3: 0x2a9f, 0xbc4: 0x2952, 0xbc5: 0x295c,
+	0xbc6: 0x2966, 0xbc7: 0x2b7c, 0xbc8: 0x2aac, 0xbc9: 0x26e5, 0xbca: 0x2c56, 0xbcb: 0x2e90,
+	0xbcc: 0x2b8c, 0xbcd: 0x2ab9, 0xbce: 0x2ec5, 0xbcf: 0x2970, 0xbd0: 0x297a, 0xbd1: 0x2ac6,
+	0xbd2: 0x26ec, 0xbd3: 0x2ad3, 0xbd4: 0x2b9c, 0xbd5: 0x26f3, 0xbd6: 0x2c69, 0xbd7: 0x2984,
+	0xbd8: 0x1cb7, 0xbd9: 0x1ccb, 0xbda: 0x1cda, 0xbdb: 0x1ce9, 0xbdc: 0x1cf8, 0xbdd: 0x1d07,
+	0xbde: 0x1d16, 0xbdf: 0x1d25, 0xbe0: 0x1d34, 0xbe1: 0x1d43, 0xbe2: 0x2192, 0xbe3: 0x21a4,
+	0xbe4: 0x21b6, 0xbe5: 0x21c2, 0xbe6: 0x21ce, 0xbe7: 0x21da, 0xbe8: 0x21e6, 0xbe9: 0x21f2,
+	0xbea: 0x21fe, 0xbeb: 0x220a, 0xbec: 0x2246, 0xbed: 0x2252, 0xbee: 0x225e, 0xbef: 0x226a,
+	0xbf0: 0x2276, 0xbf1: 0x1c14, 0xbf2: 0x19c6, 0xbf3: 0x1936, 0xbf4: 0x1be4, 0xbf5: 0x1a47,
+	0xbf6: 0x1a56, 0xbf7: 0x19cc, 0xbf8: 0x1bfc, 0xbf9: 0x1c00, 0xbfa: 0x1960, 0xbfb: 0x2701,
+	0xbfc: 0x270f, 0xbfd: 0x26fa, 0xbfe: 0x2708, 0xbff: 0x2ae0,
 	// Block 0x30, offset 0xc00
-	0xc00: 0x1c2c, 0xc01: 0x1bb8, 0xc02: 0x1d4d, 0xc03: 0x1939, 0xc04: 0x19ba, 0xc05: 0x19bd,
-	0xc06: 0x22f5, 0xc07: 0x1b94, 0xc08: 0x19c3, 0xc09: 0x194b, 0xc0a: 0x19e1, 0xc0b: 0x194e,
-	0xc0c: 0x19ea, 0xc0d: 0x196c, 0xc0e: 0x196f, 0xc0f: 0x1a05, 0xc10: 0x1a0b, 0xc11: 0x1a0e,
-	0xc12: 0x1c30, 0xc13: 0x1a11, 0xc14: 0x1a23, 0xc15: 0x1c38, 0xc16: 0x1c44, 0xc17: 0x1990,
-	0xc18: 0x1d57, 0xc19: 0x1bbc, 0xc1a: 0x1993, 0xc1b: 0x1a5c, 0xc1c: 0x19a5, 0xc1d: 0x19b4,
-	0xc1e: 0x22e2, 0xc1f: 0x22dc, 0xc20: 0x1cc1, 0xc21: 0x1cd0, 0xc22: 0x1cdf, 0xc23: 0x1cee,
-	0xc24: 0x1cfd, 0xc25: 0x1d0c, 0xc26: 0x1d1b, 0xc27: 0x1d2a, 0xc28: 0x1d39, 0xc29: 0x2186,
-	0xc2a: 0x2198, 0xc2b: 0x21aa, 0xc2c: 0x21bc, 0xc2d: 0x21c8, 0xc2e: 0x21d4, 0xc2f: 0x21e0,
-	0xc30: 0x21ec, 0xc31: 0x21f8, 0xc32: 0x2204, 0xc33: 0x2240, 0xc34: 0x224c, 0xc35: 0x2258,
-	0xc36: 0x2264, 0xc37: 0x2270, 0xc38: 0x227c, 0xc39: 0x2282, 0xc3a: 0x2288, 0xc3b: 0x228e,
-	0xc3c: 0x2294, 0xc3d: 0x22a6, 0xc3e: 0x22ac, 0xc3f: 0x1c10,
+	0xc00: 0x1a4a, 0xc01: 0x1a32, 0xc02: 0x1c60, 0xc03: 0x1a1a, 0xc04: 0x19f3, 0xc05: 0x1969,
+	0xc06: 0x1978, 0xc07: 0x1948, 0xc08: 0x1bf0, 0xc09: 0x1d52, 0xc0a: 0x1a4d, 0xc0b: 0x1a35,
+	0xc0c: 0x1c64, 0xc0d: 0x1c70, 0xc0e: 0x1a26, 0xc0f: 0x19fc, 0xc10: 0x1957, 0xc11: 0x1c1c,
+	0xc12: 0x1bb0, 0xc13: 0x1b9c, 0xc14: 0x1bcc, 0xc15: 0x1c74, 0xc16: 0x1a29, 0xc17: 0x19c9,
+	0xc18: 0x19ff, 0xc19: 0x19de, 0xc1a: 0x1a41, 0xc1b: 0x1c78, 0xc1c: 0x1a2c, 0xc1d: 0x19c0,
+	0xc1e: 0x1a02, 0xc1f: 0x1c3c, 0xc20: 0x1bf4, 0xc21: 0x1a14, 0xc22: 0x1c24, 0xc23: 0x1c40,
+	0xc24: 0x1bf8, 0xc25: 0x1a17, 0xc26: 0x1c28, 0xc27: 0x22e8, 0xc28: 0x22fc, 0xc29: 0x1996,
+	0xc2a: 0x1c20, 0xc2b: 0x1bb4, 0xc2c: 0x1ba0, 0xc2d: 0x1c48, 0xc2e: 0x2716, 0xc2f: 0x27ad,
+	0xc30: 0x1a59, 0xc31: 0x1a44, 0xc32: 0x1c7c, 0xc33: 0x1a2f, 0xc34: 0x1a50, 0xc35: 0x1a38,
+	0xc36: 0x1c68, 0xc37: 0x1a1d, 0xc38: 0x19f6, 0xc39: 0x1981, 0xc3a: 0x1a53, 0xc3b: 0x1a3b,
+	0xc3c: 0x1c6c, 0xc3d: 0x1a20, 0xc3e: 0x19f9, 0xc3f: 0x1984,
 	// Block 0x31, offset 0xc40
-	0xc40: 0x1377, 0xc41: 0x0cfb, 0xc42: 0x13d3, 0xc43: 0x139f, 0xc44: 0x0e57, 0xc45: 0x06eb,
-	0xc46: 0x08df, 0xc47: 0x162b, 0xc48: 0x162b, 0xc49: 0x0a0b, 0xc4a: 0x145f, 0xc4b: 0x0943,
-	0xc4c: 0x0a07, 0xc4d: 0x0bef, 0xc4e: 0x0fcf, 0xc4f: 0x115f, 0xc50: 0x1297, 0xc51: 0x12d3,
-	0xc52: 0x1307, 0xc53: 0x141b, 0xc54: 0x0d73, 0xc55: 0x0dff, 0xc56: 0x0eab, 0xc57: 0x0f43,
-	0xc58: 0x125f, 0xc59: 0x1447, 0xc5a: 0x1573, 0xc5b: 0x070f, 0xc5c: 0x08b3, 0xc5d: 0x0d87,
-	0xc5e: 0x0ecf, 0xc5f: 0x1293, 0xc60: 0x15c3, 0xc61: 0x0ab3, 0xc62: 0x0e77, 0xc63: 0x1283,
-	0xc64: 0x1317, 0xc65: 0x0c23, 0xc66: 0x11bb, 0xc67: 0x12df, 0xc68: 0x0b1f, 0xc69: 0x0d0f,
-	0xc6a: 0x0e17, 0xc6b: 0x0f1b, 0xc6c: 0x1427, 0xc6d: 0x074f, 0xc6e: 0x07e7, 0xc6f: 0x0853,
-	0xc70: 0x0c8b, 0xc71: 0x0d7f, 0xc72: 0x0ecb, 0xc73: 0x0fef, 0xc74: 0x1177, 0xc75: 0x128b,
-	0xc76: 0x12a3, 0xc77: 0x13c7, 0xc78: 0x14ef, 0xc79: 0x15a3, 0xc7a: 0x15bf, 0xc7b: 0x102b,
-	0xc7c: 0x106b, 0xc7d: 0x1123, 0xc7e: 0x1243, 0xc7f: 0x147b,
+	0xc40: 0x1c2c, 0xc41: 0x1bb8, 0xc42: 0x1d4d, 0xc43: 0x1939, 0xc44: 0x19ba, 0xc45: 0x19bd,
+	0xc46: 0x22f5, 0xc47: 0x1b94, 0xc48: 0x19c3, 0xc49: 0x194b, 0xc4a: 0x19e1, 0xc4b: 0x194e,
+	0xc4c: 0x19ea, 0xc4d: 0x196c, 0xc4e: 0x196f, 0xc4f: 0x1a05, 0xc50: 0x1a0b, 0xc51: 0x1a0e,
+	0xc52: 0x1c30, 0xc53: 0x1a11, 0xc54: 0x1a23, 0xc55: 0x1c38, 0xc56: 0x1c44, 0xc57: 0x1990,
+	0xc58: 0x1d57, 0xc59: 0x1bbc, 0xc5a: 0x1993, 0xc5b: 0x1a5c, 0xc5c: 0x19a5, 0xc5d: 0x19b4,
+	0xc5e: 0x22e2, 0xc5f: 0x22dc, 0xc60: 0x1cc1, 0xc61: 0x1cd0, 0xc62: 0x1cdf, 0xc63: 0x1cee,
+	0xc64: 0x1cfd, 0xc65: 0x1d0c, 0xc66: 0x1d1b, 0xc67: 0x1d2a, 0xc68: 0x1d39, 0xc69: 0x2186,
+	0xc6a: 0x2198, 0xc6b: 0x21aa, 0xc6c: 0x21bc, 0xc6d: 0x21c8, 0xc6e: 0x21d4, 0xc6f: 0x21e0,
+	0xc70: 0x21ec, 0xc71: 0x21f8, 0xc72: 0x2204, 0xc73: 0x2240, 0xc74: 0x224c, 0xc75: 0x2258,
+	0xc76: 0x2264, 0xc77: 0x2270, 0xc78: 0x227c, 0xc79: 0x2282, 0xc7a: 0x2288, 0xc7b: 0x228e,
+	0xc7c: 0x2294, 0xc7d: 0x22a6, 0xc7e: 0x22ac, 0xc7f: 0x1c10,
 	// Block 0x32, offset 0xc80
-	0xc80: 0x15cb, 0xc81: 0x134b, 0xc82: 0x09c7, 0xc83: 0x0b3b, 0xc84: 0x10db, 0xc85: 0x119b,
-	0xc86: 0x0eff, 0xc87: 0x1033, 0xc88: 0x1397, 0xc89: 0x14e7, 0xc8a: 0x09c3, 0xc8b: 0x0a8f,
-	0xc8c: 0x0d77, 0xc8d: 0x0e2b, 0xc8e: 0x0e5f, 0xc8f: 0x1113, 0xc90: 0x113b, 0xc91: 0x14a7,
-	0xc92: 0x084f, 0xc93: 0x11a7, 0xc94: 0x07f3, 0xc95: 0x07ef, 0xc96: 0x1097, 0xc97: 0x1127,
-	0xc98: 0x125b, 0xc99: 0x14af, 0xc9a: 0x1367, 0xc9b: 0x0c27, 0xc9c: 0x0d73, 0xc9d: 0x1357,
-	0xc9e: 0x06f7, 0xc9f: 0x0a63, 0xca0: 0x0b93, 0xca1: 0x0f2f, 0xca2: 0x0faf, 0xca3: 0x0873,
-	0xca4: 0x103b, 0xca5: 0x075f, 0xca6: 0x0b77, 0xca7: 0x06d7, 0xca8: 0x0deb, 0xca9: 0x0ca3,
-	0xcaa: 0x110f, 0xcab: 0x08c7, 0xcac: 0x09b3, 0xcad: 0x0ffb, 0xcae: 0x1263, 0xcaf: 0x133b,
-	0xcb0: 0x0db7, 0xcb1: 0x13f7, 0xcb2: 0x0de3, 0xcb3: 0x0c37, 0xcb4: 0x121b, 0xcb5: 0x0c57,
-	0xcb6: 0x0fab, 0xcb7: 0x072b, 0xcb8: 0x07a7, 0xcb9: 0x07eb, 0xcba: 0x0d53, 0xcbb: 0x10fb,
-	0xcbc: 0x11f3, 0xcbd: 0x1347, 0xcbe: 0x145b, 0xcbf: 0x085b,
+	0xc80: 0x1377, 0xc81: 0x0cfb, 0xc82: 0x13d3, 0xc83: 0x139f, 0xc84: 0x0e57, 0xc85: 0x06eb,
+	0xc86: 0x08df, 0xc87: 0x162b, 0xc88: 0x162b, 0xc89: 0x0a0b, 0xc8a: 0x145f, 0xc8b: 0x0943,
+	0xc8c: 0x0a07, 0xc8d: 0x0bef, 0xc8e: 0x0fcf, 0xc8f: 0x115f, 0xc90: 0x1297, 0xc91: 0x12d3,
+	0xc92: 0x1307, 0xc93: 0x141b, 0xc94: 0x0d73, 0xc95: 0x0dff, 0xc96: 0x0eab, 0xc97: 0x0f43,
+	0xc98: 0x125f, 0xc99: 0x1447, 0xc9a: 0x1573, 0xc9b: 0x070f, 0xc9c: 0x08b3, 0xc9d: 0x0d87,
+	0xc9e: 0x0ecf, 0xc9f: 0x1293, 0xca0: 0x15c3, 0xca1: 0x0ab3, 0xca2: 0x0e77, 0xca3: 0x1283,
+	0xca4: 0x1317, 0xca5: 0x0c23, 0xca6: 0x11bb, 0xca7: 0x12df, 0xca8: 0x0b1f, 0xca9: 0x0d0f,
+	0xcaa: 0x0e17, 0xcab: 0x0f1b, 0xcac: 0x1427, 0xcad: 0x074f, 0xcae: 0x07e7, 0xcaf: 0x0853,
+	0xcb0: 0x0c8b, 0xcb1: 0x0d7f, 0xcb2: 0x0ecb, 0xcb3: 0x0fef, 0xcb4: 0x1177, 0xcb5: 0x128b,
+	0xcb6: 0x12a3, 0xcb7: 0x13c7, 0xcb8: 0x14ef, 0xcb9: 0x15a3, 0xcba: 0x15bf, 0xcbb: 0x102b,
+	0xcbc: 0x106b, 0xcbd: 0x1123, 0xcbe: 0x1243, 0xcbf: 0x147b,
 	// Block 0x33, offset 0xcc0
-	0xcc0: 0x090f, 0xcc1: 0x0a17, 0xcc2: 0x0b2f, 0xcc3: 0x0cbf, 0xcc4: 0x0e7b, 0xcc5: 0x103f,
-	0xcc6: 0x1497, 0xcc7: 0x157b, 0xcc8: 0x15cf, 0xcc9: 0x15e7, 0xcca: 0x0837, 0xccb: 0x0cf3,
-	0xccc: 0x0da3, 0xccd: 0x13eb, 0xcce: 0x0afb, 0xccf: 0x0bd7, 0xcd0: 0x0bf3, 0xcd1: 0x0c83,
-	0xcd2: 0x0e6b, 0xcd3: 0x0eb7, 0xcd4: 0x0f67, 0xcd5: 0x108b, 0xcd6: 0x112f, 0xcd7: 0x1193,
-	0xcd8: 0x13db, 0xcd9: 0x126b, 0xcda: 0x1403, 0xcdb: 0x147f, 0xcdc: 0x080f, 0xcdd: 0x083b,
-	0xcde: 0x0923, 0xcdf: 0x0ea7, 0xce0: 0x12f3, 0xce1: 0x133b, 0xce2: 0x0b1b, 0xce3: 0x0b8b,
-	0xce4: 0x0c4f, 0xce5: 0x0daf, 0xce6: 0x10d7, 0xce7: 0x0f23, 0xce8: 0x073b, 0xce9: 0x097f,
-	0xcea: 0x0a63, 0xceb: 0x0ac7, 0xcec: 0x0b97, 0xced: 0x0f3f, 0xcee: 0x0f5b, 0xcef: 0x116b,
-	0xcf0: 0x118b, 0xcf1: 0x1463, 0xcf2: 0x14e3, 0xcf3: 0x14f3, 0xcf4: 0x152f, 0xcf5: 0x0753,
-	0xcf6: 0x107f, 0xcf7: 0x144f, 0xcf8: 0x14cb, 0xcf9: 0x0baf, 0xcfa: 0x0717, 0xcfb: 0x0777,
-	0xcfc: 0x0a67, 0xcfd: 0x0a87, 0xcfe: 0x0caf, 0xcff: 0x0d73,
+	0xcc0: 0x15cb, 0xcc1: 0x134b, 0xcc2: 0x09c7, 0xcc3: 0x0b3b, 0xcc4: 0x10db, 0xcc5: 0x119b,
+	0xcc6: 0x0eff, 0xcc7: 0x1033, 0xcc8: 0x1397, 0xcc9: 0x14e7, 0xcca: 0x09c3, 0xccb: 0x0a8f,
+	0xccc: 0x0d77, 0xccd: 0x0e2b, 0xcce: 0x0e5f, 0xccf: 0x1113, 0xcd0: 0x113b, 0xcd1: 0x14a7,
+	0xcd2: 0x084f, 0xcd3: 0x11a7, 0xcd4: 0x07f3, 0xcd5: 0x07ef, 0xcd6: 0x1097, 0xcd7: 0x1127,
+	0xcd8: 0x125b, 0xcd9: 0x14af, 0xcda: 0x1367, 0xcdb: 0x0c27, 0xcdc: 0x0d73, 0xcdd: 0x1357,
+	0xcde: 0x06f7, 0xcdf: 0x0a63, 0xce0: 0x0b93, 0xce1: 0x0f2f, 0xce2: 0x0faf, 0xce3: 0x0873,
+	0xce4: 0x103b, 0xce5: 0x075f, 0xce6: 0x0b77, 0xce7: 0x06d7, 0xce8: 0x0deb, 0xce9: 0x0ca3,
+	0xcea: 0x110f, 0xceb: 0x08c7, 0xcec: 0x09b3, 0xced: 0x0ffb, 0xcee: 0x1263, 0xcef: 0x133b,
+	0xcf0: 0x0db7, 0xcf1: 0x13f7, 0xcf2: 0x0de3, 0xcf3: 0x0c37, 0xcf4: 0x121b, 0xcf5: 0x0c57,
+	0xcf6: 0x0fab, 0xcf7: 0x072b, 0xcf8: 0x07a7, 0xcf9: 0x07eb, 0xcfa: 0x0d53, 0xcfb: 0x10fb,
+	0xcfc: 0x11f3, 0xcfd: 0x1347, 0xcfe: 0x145b, 0xcff: 0x085b,
 	// Block 0x34, offset 0xd00
-	0xd00: 0x0ec3, 0xd01: 0x0fcb, 0xd02: 0x1277, 0xd03: 0x1417, 0xd04: 0x1623, 0xd05: 0x0ce3,
-	0xd06: 0x14a3, 0xd07: 0x0833, 0xd08: 0x0d2f, 0xd09: 0x0d3b, 0xd0a: 0x0e0f, 0xd0b: 0x0e47,
-	0xd0c: 0x0f4b, 0xd0d: 0x0fa7, 0xd0e: 0x1027, 0xd0f: 0x110b, 0xd10: 0x153b, 0xd11: 0x07af,
-	0xd12: 0x0c03, 0xd13: 0x14b3, 0xd14: 0x0767, 0xd15: 0x0aab, 0xd16: 0x0e2f, 0xd17: 0x13df,
-	0xd18: 0x0b67, 0xd19: 0x0bb7, 0xd1a: 0x0d43, 0xd1b: 0x0f2f, 0xd1c: 0x14bb, 0xd1d: 0x0817,
-	0xd1e: 0x08ff, 0xd1f: 0x0a97, 0xd20: 0x0cd3, 0xd21: 0x0d1f, 0xd22: 0x0d5f, 0xd23: 0x0df3,
-	0xd24: 0x0f47, 0xd25: 0x0fbb, 0xd26: 0x1157, 0xd27: 0x12f7, 0xd28: 0x1303, 0xd29: 0x1457,
-	0xd2a: 0x14d7, 0xd2b: 0x0883, 0xd2c: 0x0e4b, 0xd2d: 0x0903, 0xd2e: 0x0ec7, 0xd2f: 0x0f6b,
-	0xd30: 0x1287, 0xd31: 0x14bf, 0xd32: 0x15ab, 0xd33: 0x15d3, 0xd34: 0x0d37, 0xd35: 0x0e27,
-	0xd36: 0x11c3, 0xd37: 0x10b7, 0xd38: 0x10c3, 0xd39: 0x10e7, 0xd3a: 0x0f17, 0xd3b: 0x0e9f,
-	0xd3c: 0x1363, 0xd3d: 0x0733, 0xd3e: 0x122b, 0xd3f: 0x081b,
+	0xd00: 0x090f, 0xd01: 0x0a17, 0xd02: 0x0b2f, 0xd03: 0x0cbf, 0xd04: 0x0e7b, 0xd05: 0x103f,
+	0xd06: 0x1497, 0xd07: 0x157b, 0xd08: 0x15cf, 0xd09: 0x15e7, 0xd0a: 0x0837, 0xd0b: 0x0cf3,
+	0xd0c: 0x0da3, 0xd0d: 0x13eb, 0xd0e: 0x0afb, 0xd0f: 0x0bd7, 0xd10: 0x0bf3, 0xd11: 0x0c83,
+	0xd12: 0x0e6b, 0xd13: 0x0eb7, 0xd14: 0x0f67, 0xd15: 0x108b, 0xd16: 0x112f, 0xd17: 0x1193,
+	0xd18: 0x13db, 0xd19: 0x126b, 0xd1a: 0x1403, 0xd1b: 0x147f, 0xd1c: 0x080f, 0xd1d: 0x083b,
+	0xd1e: 0x0923, 0xd1f: 0x0ea7, 0xd20: 0x12f3, 0xd21: 0x133b, 0xd22: 0x0b1b, 0xd23: 0x0b8b,
+	0xd24: 0x0c4f, 0xd25: 0x0daf, 0xd26: 0x10d7, 0xd27: 0x0f23, 0xd28: 0x073b, 0xd29: 0x097f,
+	0xd2a: 0x0a63, 0xd2b: 0x0ac7, 0xd2c: 0x0b97, 0xd2d: 0x0f3f, 0xd2e: 0x0f5b, 0xd2f: 0x116b,
+	0xd30: 0x118b, 0xd31: 0x1463, 0xd32: 0x14e3, 0xd33: 0x14f3, 0xd34: 0x152f, 0xd35: 0x0753,
+	0xd36: 0x107f, 0xd37: 0x144f, 0xd38: 0x14cb, 0xd39: 0x0baf, 0xd3a: 0x0717, 0xd3b: 0x0777,
+	0xd3c: 0x0a67, 0xd3d: 0x0a87, 0xd3e: 0x0caf, 0xd3f: 0x0d73,
 	// Block 0x35, offset 0xd40
-	0xd40: 0x080b, 0xd41: 0x0b0b, 0xd42: 0x0c2b, 0xd43: 0x10f3, 0xd44: 0x0a53, 0xd45: 0x0e03,
-	0xd46: 0x0cef, 0xd47: 0x13e7, 0xd48: 0x12e7, 0xd49: 0x14ab, 0xd4a: 0x1323, 0xd4b: 0x0b27,
-	0xd4c: 0x0787, 0xd4d: 0x095b, 0xd50: 0x09af,
-	0xd52: 0x0cdf, 0xd55: 0x07f7, 0xd56: 0x0f1f, 0xd57: 0x0fe3,
-	0xd58: 0x1047, 0xd59: 0x1063, 0xd5a: 0x1067, 0xd5b: 0x107b, 0xd5c: 0x14fb, 0xd5d: 0x10eb,
-	0xd5e: 0x116f, 0xd60: 0x128f, 0xd62: 0x1353,
-	0xd65: 0x1407, 0xd66: 0x1433,
-	0xd6a: 0x154f, 0xd6b: 0x1553, 0xd6c: 0x1557, 0xd6d: 0x15bb, 0xd6e: 0x142b, 0xd6f: 0x14c7,
-	0xd70: 0x0757, 0xd71: 0x077b, 0xd72: 0x078f, 0xd73: 0x084b, 0xd74: 0x0857, 0xd75: 0x0897,
-	0xd76: 0x094b, 0xd77: 0x0967, 0xd78: 0x096f, 0xd79: 0x09ab, 0xd7a: 0x09b7, 0xd7b: 0x0a93,
-	0xd7c: 0x0a9b, 0xd7d: 0x0ba3, 0xd7e: 0x0bcb, 0xd7f: 0x0bd3,
+	0xd40: 0x0ec3, 0xd41: 0x0fcb, 0xd42: 0x1277, 0xd43: 0x1417, 0xd44: 0x1623, 0xd45: 0x0ce3,
+	0xd46: 0x14a3, 0xd47: 0x0833, 0xd48: 0x0d2f, 0xd49: 0x0d3b, 0xd4a: 0x0e0f, 0xd4b: 0x0e47,
+	0xd4c: 0x0f4b, 0xd4d: 0x0fa7, 0xd4e: 0x1027, 0xd4f: 0x110b, 0xd50: 0x153b, 0xd51: 0x07af,
+	0xd52: 0x0c03, 0xd53: 0x14b3, 0xd54: 0x0767, 0xd55: 0x0aab, 0xd56: 0x0e2f, 0xd57: 0x13df,
+	0xd58: 0x0b67, 0xd59: 0x0bb7, 0xd5a: 0x0d43, 0xd5b: 0x0f2f, 0xd5c: 0x14bb, 0xd5d: 0x0817,
+	0xd5e: 0x08ff, 0xd5f: 0x0a97, 0xd60: 0x0cd3, 0xd61: 0x0d1f, 0xd62: 0x0d5f, 0xd63: 0x0df3,
+	0xd64: 0x0f47, 0xd65: 0x0fbb, 0xd66: 0x1157, 0xd67: 0x12f7, 0xd68: 0x1303, 0xd69: 0x1457,
+	0xd6a: 0x14d7, 0xd6b: 0x0883, 0xd6c: 0x0e4b, 0xd6d: 0x0903, 0xd6e: 0x0ec7, 0xd6f: 0x0f6b,
+	0xd70: 0x1287, 0xd71: 0x14bf, 0xd72: 0x15ab, 0xd73: 0x15d3, 0xd74: 0x0d37, 0xd75: 0x0e27,
+	0xd76: 0x11c3, 0xd77: 0x10b7, 0xd78: 0x10c3, 0xd79: 0x10e7, 0xd7a: 0x0f17, 0xd7b: 0x0e9f,
+	0xd7c: 0x1363, 0xd7d: 0x0733, 0xd7e: 0x122b, 0xd7f: 0x081b,
 	// Block 0x36, offset 0xd80
-	0xd80: 0x0beb, 0xd81: 0x0c97, 0xd82: 0x0cc7, 0xd83: 0x0ce7, 0xd84: 0x0d57, 0xd85: 0x0e1b,
-	0xd86: 0x0e37, 0xd87: 0x0e67, 0xd88: 0x0ebb, 0xd89: 0x0edb, 0xd8a: 0x0f4f, 0xd8b: 0x102f,
-	0xd8c: 0x104b, 0xd8d: 0x1053, 0xd8e: 0x104f, 0xd8f: 0x1057, 0xd90: 0x105b, 0xd91: 0x105f,
-	0xd92: 0x1073, 0xd93: 0x1077, 0xd94: 0x109b, 0xd95: 0x10af, 0xd96: 0x10cb, 0xd97: 0x112f,
-	0xd98: 0x1137, 0xd99: 0x113f, 0xd9a: 0x1153, 0xd9b: 0x117b, 0xd9c: 0x11cb, 0xd9d: 0x11ff,
-	0xd9e: 0x11ff, 0xd9f: 0x1267, 0xda0: 0x130f, 0xda1: 0x1327, 0xda2: 0x135b, 0xda3: 0x135f,
-	0xda4: 0x13a3, 0xda5: 0x13a7, 0xda6: 0x13ff, 0xda7: 0x1407, 0xda8: 0x14db, 0xda9: 0x151f,
-	0xdaa: 0x1537, 0xdab: 0x0b9b, 0xdac: 0x171e, 0xdad: 0x11e3,
-	0xdb0: 0x06df, 0xdb1: 0x07e3, 0xdb2: 0x07a3, 0xdb3: 0x074b, 0xdb4: 0x078b, 0xdb5: 0x07b7,
-	0xdb6: 0x0847, 0xdb7: 0x0863, 0xdb8: 0x094b, 0xdb9: 0x0937, 0xdba: 0x0947, 0xdbb: 0x0963,
-	0xdbc: 0x09af, 0xdbd: 0x09bf, 0xdbe: 0x0a03, 0xdbf: 0x0a0f,
+	0xd80: 0x080b, 0xd81: 0x0b0b, 0xd82: 0x0c2b, 0xd83: 0x10f3, 0xd84: 0x0a53, 0xd85: 0x0e03,
+	0xd86: 0x0cef, 0xd87: 0x13e7, 0xd88: 0x12e7, 0xd89: 0x14ab, 0xd8a: 0x1323, 0xd8b: 0x0b27,
+	0xd8c: 0x0787, 0xd8d: 0x095b, 0xd90: 0x09af,
+	0xd92: 0x0cdf, 0xd95: 0x07f7, 0xd96: 0x0f1f, 0xd97: 0x0fe3,
+	0xd98: 0x1047, 0xd99: 0x1063, 0xd9a: 0x1067, 0xd9b: 0x107b, 0xd9c: 0x14fb, 0xd9d: 0x10eb,
+	0xd9e: 0x116f, 0xda0: 0x128f, 0xda2: 0x1353,
+	0xda5: 0x1407, 0xda6: 0x1433,
+	0xdaa: 0x154f, 0xdab: 0x1553, 0xdac: 0x1557, 0xdad: 0x15bb, 0xdae: 0x142b, 0xdaf: 0x14c7,
+	0xdb0: 0x0757, 0xdb1: 0x077b, 0xdb2: 0x078f, 0xdb3: 0x084b, 0xdb4: 0x0857, 0xdb5: 0x0897,
+	0xdb6: 0x094b, 0xdb7: 0x0967, 0xdb8: 0x096f, 0xdb9: 0x09ab, 0xdba: 0x09b7, 0xdbb: 0x0a93,
+	0xdbc: 0x0a9b, 0xdbd: 0x0ba3, 0xdbe: 0x0bcb, 0xdbf: 0x0bd3,
 	// Block 0x37, offset 0xdc0
-	0xdc0: 0x0a2b, 0xdc1: 0x0a3b, 0xdc2: 0x0b23, 0xdc3: 0x0b2b, 0xdc4: 0x0b5b, 0xdc5: 0x0b7b,
-	0xdc6: 0x0bab, 0xdc7: 0x0bc3, 0xdc8: 0x0bb3, 0xdc9: 0x0bd3, 0xdca: 0x0bc7, 0xdcb: 0x0beb,
-	0xdcc: 0x0c07, 0xdcd: 0x0c5f, 0xdce: 0x0c6b, 0xdcf: 0x0c73, 0xdd0: 0x0c9b, 0xdd1: 0x0cdf,
-	0xdd2: 0x0d0f, 0xdd3: 0x0d13, 0xdd4: 0x0d27, 0xdd5: 0x0da7, 0xdd6: 0x0db7, 0xdd7: 0x0e0f,
-	0xdd8: 0x0e5b, 0xdd9: 0x0e53, 0xdda: 0x0e67, 0xddb: 0x0e83, 0xddc: 0x0ebb, 0xddd: 0x1013,
-	0xdde: 0x0edf, 0xddf: 0x0f13, 0xde0: 0x0f1f, 0xde1: 0x0f5f, 0xde2: 0x0f7b, 0xde3: 0x0f9f,
-	0xde4: 0x0fc3, 0xde5: 0x0fc7, 0xde6: 0x0fe3, 0xde7: 0x0fe7, 0xde8: 0x0ff7, 0xde9: 0x100b,
-	0xdea: 0x1007, 0xdeb: 0x1037, 0xdec: 0x10b3, 0xded: 0x10cb, 0xdee: 0x10e3, 0xdef: 0x111b,
-	0xdf0: 0x112f, 0xdf1: 0x114b, 0xdf2: 0x117b, 0xdf3: 0x122f, 0xdf4: 0x1257, 0xdf5: 0x12cb,
-	0xdf6: 0x1313, 0xdf7: 0x131f, 0xdf8: 0x1327, 0xdf9: 0x133f, 0xdfa: 0x1353, 0xdfb: 0x1343,
-	0xdfc: 0x135b, 0xdfd: 0x1357, 0xdfe: 0x134f, 0xdff: 0x135f,
+	0xdc0: 0x0beb, 0xdc1: 0x0c97, 0xdc2: 0x0cc7, 0xdc3: 0x0ce7, 0xdc4: 0x0d57, 0xdc5: 0x0e1b,
+	0xdc6: 0x0e37, 0xdc7: 0x0e67, 0xdc8: 0x0ebb, 0xdc9: 0x0edb, 0xdca: 0x0f4f, 0xdcb: 0x102f,
+	0xdcc: 0x104b, 0xdcd: 0x1053, 0xdce: 0x104f, 0xdcf: 0x1057, 0xdd0: 0x105b, 0xdd1: 0x105f,
+	0xdd2: 0x1073, 0xdd3: 0x1077, 0xdd4: 0x109b, 0xdd5: 0x10af, 0xdd6: 0x10cb, 0xdd7: 0x112f,
+	0xdd8: 0x1137, 0xdd9: 0x113f, 0xdda: 0x1153, 0xddb: 0x117b, 0xddc: 0x11cb, 0xddd: 0x11ff,
+	0xdde: 0x11ff, 0xddf: 0x1267, 0xde0: 0x130f, 0xde1: 0x1327, 0xde2: 0x135b, 0xde3: 0x135f,
+	0xde4: 0x13a3, 0xde5: 0x13a7, 0xde6: 0x13ff, 0xde7: 0x1407, 0xde8: 0x14db, 0xde9: 0x151f,
+	0xdea: 0x1537, 0xdeb: 0x0b9b, 0xdec: 0x171e, 0xded: 0x11e3,
+	0xdf0: 0x06df, 0xdf1: 0x07e3, 0xdf2: 0x07a3, 0xdf3: 0x074b, 0xdf4: 0x078b, 0xdf5: 0x07b7,
+	0xdf6: 0x0847, 0xdf7: 0x0863, 0xdf8: 0x094b, 0xdf9: 0x0937, 0xdfa: 0x0947, 0xdfb: 0x0963,
+	0xdfc: 0x09af, 0xdfd: 0x09bf, 0xdfe: 0x0a03, 0xdff: 0x0a0f,
 	// Block 0x38, offset 0xe00
-	0xe00: 0x136b, 0xe01: 0x13a7, 0xe02: 0x13e3, 0xe03: 0x1413, 0xe04: 0x144b, 0xe05: 0x146b,
-	0xe06: 0x14b7, 0xe07: 0x14db, 0xe08: 0x14fb, 0xe09: 0x150f, 0xe0a: 0x151f, 0xe0b: 0x152b,
-	0xe0c: 0x1537, 0xe0d: 0x158b, 0xe0e: 0x162b, 0xe0f: 0x16b5, 0xe10: 0x16b0, 0xe11: 0x16e2,
-	0xe12: 0x0607, 0xe13: 0x062f, 0xe14: 0x0633, 0xe15: 0x1764, 0xe16: 0x1791, 0xe17: 0x1809,
-	0xe18: 0x1617, 0xe19: 0x1627,
+	0xe00: 0x0a2b, 0xe01: 0x0a3b, 0xe02: 0x0b23, 0xe03: 0x0b2b, 0xe04: 0x0b5b, 0xe05: 0x0b7b,
+	0xe06: 0x0bab, 0xe07: 0x0bc3, 0xe08: 0x0bb3, 0xe09: 0x0bd3, 0xe0a: 0x0bc7, 0xe0b: 0x0beb,
+	0xe0c: 0x0c07, 0xe0d: 0x0c5f, 0xe0e: 0x0c6b, 0xe0f: 0x0c73, 0xe10: 0x0c9b, 0xe11: 0x0cdf,
+	0xe12: 0x0d0f, 0xe13: 0x0d13, 0xe14: 0x0d27, 0xe15: 0x0da7, 0xe16: 0x0db7, 0xe17: 0x0e0f,
+	0xe18: 0x0e5b, 0xe19: 0x0e53, 0xe1a: 0x0e67, 0xe1b: 0x0e83, 0xe1c: 0x0ebb, 0xe1d: 0x1013,
+	0xe1e: 0x0edf, 0xe1f: 0x0f13, 0xe20: 0x0f1f, 0xe21: 0x0f5f, 0xe22: 0x0f7b, 0xe23: 0x0f9f,
+	0xe24: 0x0fc3, 0xe25: 0x0fc7, 0xe26: 0x0fe3, 0xe27: 0x0fe7, 0xe28: 0x0ff7, 0xe29: 0x100b,
+	0xe2a: 0x1007, 0xe2b: 0x1037, 0xe2c: 0x10b3, 0xe2d: 0x10cb, 0xe2e: 0x10e3, 0xe2f: 0x111b,
+	0xe30: 0x112f, 0xe31: 0x114b, 0xe32: 0x117b, 0xe33: 0x122f, 0xe34: 0x1257, 0xe35: 0x12cb,
+	0xe36: 0x1313, 0xe37: 0x131f, 0xe38: 0x1327, 0xe39: 0x133f, 0xe3a: 0x1353, 0xe3b: 0x1343,
+	0xe3c: 0x135b, 0xe3d: 0x1357, 0xe3e: 0x134f, 0xe3f: 0x135f,
 	// Block 0x39, offset 0xe40
-	0xe40: 0x19d5, 0xe41: 0x19d8, 0xe42: 0x19db, 0xe43: 0x1c08, 0xe44: 0x1c0c, 0xe45: 0x1a5f,
-	0xe46: 0x1a5f,
-	0xe53: 0x1d75, 0xe54: 0x1d66, 0xe55: 0x1d6b, 0xe56: 0x1d7a, 0xe57: 0x1d70,
-	0xe5d: 0x4426,
-	0xe5e: 0x8115, 0xe5f: 0x4498, 0xe60: 0x022d, 0xe61: 0x0215, 0xe62: 0x021e, 0xe63: 0x0221,
-	0xe64: 0x0224, 0xe65: 0x0227, 0xe66: 0x022a, 0xe67: 0x0230, 0xe68: 0x0233, 0xe69: 0x0017,
-	0xe6a: 0x4486, 0xe6b: 0x448c, 0xe6c: 0x458a, 0xe6d: 0x4592, 0xe6e: 0x43de, 0xe6f: 0x43e4,
-	0xe70: 0x43ea, 0xe71: 0x43f0, 0xe72: 0x43fc, 0xe73: 0x4402, 0xe74: 0x4408, 0xe75: 0x4414,
-	0xe76: 0x441a, 0xe78: 0x4420, 0xe79: 0x442c, 0xe7a: 0x4432, 0xe7b: 0x4438,
-	0xe7c: 0x4444, 0xe7e: 0x444a,
+	0xe40: 0x136b, 0xe41: 0x13a7, 0xe42: 0x13e3, 0xe43: 0x1413, 0xe44: 0x144b, 0xe45: 0x146b,
+	0xe46: 0x14b7, 0xe47: 0x14db, 0xe48: 0x14fb, 0xe49: 0x150f, 0xe4a: 0x151f, 0xe4b: 0x152b,
+	0xe4c: 0x1537, 0xe4d: 0x158b, 0xe4e: 0x162b, 0xe4f: 0x16b5, 0xe50: 0x16b0, 0xe51: 0x16e2,
+	0xe52: 0x0607, 0xe53: 0x062f, 0xe54: 0x0633, 0xe55: 0x1764, 0xe56: 0x1791, 0xe57: 0x1809,
+	0xe58: 0x1617, 0xe59: 0x1627,
 	// Block 0x3a, offset 0xe80
-	0xe80: 0x4450, 0xe81: 0x4456, 0xe83: 0x445c, 0xe84: 0x4462,
-	0xe86: 0x446e, 0xe87: 0x4474, 0xe88: 0x447a, 0xe89: 0x4480, 0xe8a: 0x4492, 0xe8b: 0x440e,
-	0xe8c: 0x43f6, 0xe8d: 0x443e, 0xe8e: 0x4468, 0xe8f: 0x1d7f, 0xe90: 0x0299, 0xe91: 0x0299,
-	0xe92: 0x02a2, 0xe93: 0x02a2, 0xe94: 0x02a2, 0xe95: 0x02a2, 0xe96: 0x02a5, 0xe97: 0x02a5,
-	0xe98: 0x02a5, 0xe99: 0x02a5, 0xe9a: 0x02ab, 0xe9b: 0x02ab, 0xe9c: 0x02ab, 0xe9d: 0x02ab,
-	0xe9e: 0x029f, 0xe9f: 0x029f, 0xea0: 0x029f, 0xea1: 0x029f, 0xea2: 0x02a8, 0xea3: 0x02a8,
-	0xea4: 0x02a8, 0xea5: 0x02a8, 0xea6: 0x029c, 0xea7: 0x029c, 0xea8: 0x029c, 0xea9: 0x029c,
-	0xeaa: 0x02cf, 0xeab: 0x02cf, 0xeac: 0x02cf, 0xead: 0x02cf, 0xeae: 0x02d2, 0xeaf: 0x02d2,
-	0xeb0: 0x02d2, 0xeb1: 0x02d2, 0xeb2: 0x02b1, 0xeb3: 0x02b1, 0xeb4: 0x02b1, 0xeb5: 0x02b1,
-	0xeb6: 0x02ae, 0xeb7: 0x02ae, 0xeb8: 0x02ae, 0xeb9: 0x02ae, 0xeba: 0x02b4, 0xebb: 0x02b4,
-	0xebc: 0x02b4, 0xebd: 0x02b4, 0xebe: 0x02b7, 0xebf: 0x02b7,
+	0xe80: 0x19d5, 0xe81: 0x19d8, 0xe82: 0x19db, 0xe83: 0x1c08, 0xe84: 0x1c0c, 0xe85: 0x1a5f,
+	0xe86: 0x1a5f,
+	0xe93: 0x1d75, 0xe94: 0x1d66, 0xe95: 0x1d6b, 0xe96: 0x1d7a, 0xe97: 0x1d70,
+	0xe9d: 0x4390,
+	0xe9e: 0x8115, 0xe9f: 0x4402, 0xea0: 0x022d, 0xea1: 0x0215, 0xea2: 0x021e, 0xea3: 0x0221,
+	0xea4: 0x0224, 0xea5: 0x0227, 0xea6: 0x022a, 0xea7: 0x0230, 0xea8: 0x0233, 0xea9: 0x0017,
+	0xeaa: 0x43f0, 0xeab: 0x43f6, 0xeac: 0x44f4, 0xead: 0x44fc, 0xeae: 0x4348, 0xeaf: 0x434e,
+	0xeb0: 0x4354, 0xeb1: 0x435a, 0xeb2: 0x4366, 0xeb3: 0x436c, 0xeb4: 0x4372, 0xeb5: 0x437e,
+	0xeb6: 0x4384, 0xeb8: 0x438a, 0xeb9: 0x4396, 0xeba: 0x439c, 0xebb: 0x43a2,
+	0xebc: 0x43ae, 0xebe: 0x43b4,
 	// Block 0x3b, offset 0xec0
-	0xec0: 0x02b7, 0xec1: 0x02b7, 0xec2: 0x02c0, 0xec3: 0x02c0, 0xec4: 0x02bd, 0xec5: 0x02bd,
-	0xec6: 0x02c3, 0xec7: 0x02c3, 0xec8: 0x02ba, 0xec9: 0x02ba, 0xeca: 0x02c9, 0xecb: 0x02c9,
-	0xecc: 0x02c6, 0xecd: 0x02c6, 0xece: 0x02d5, 0xecf: 0x02d5, 0xed0: 0x02d5, 0xed1: 0x02d5,
-	0xed2: 0x02db, 0xed3: 0x02db, 0xed4: 0x02db, 0xed5: 0x02db, 0xed6: 0x02e1, 0xed7: 0x02e1,
-	0xed8: 0x02e1, 0xed9: 0x02e1, 0xeda: 0x02de, 0xedb: 0x02de, 0xedc: 0x02de, 0xedd: 0x02de,
-	0xede: 0x02e4, 0xedf: 0x02e4, 0xee0: 0x02e7, 0xee1: 0x02e7, 0xee2: 0x02e7, 0xee3: 0x02e7,
-	0xee4: 0x4504, 0xee5: 0x4504, 0xee6: 0x02ed, 0xee7: 0x02ed, 0xee8: 0x02ed, 0xee9: 0x02ed,
-	0xeea: 0x02ea, 0xeeb: 0x02ea, 0xeec: 0x02ea, 0xeed: 0x02ea, 0xeee: 0x0308, 0xeef: 0x0308,
-	0xef0: 0x44fe, 0xef1: 0x44fe,
+	0xec0: 0x43ba, 0xec1: 0x43c0, 0xec3: 0x43c6, 0xec4: 0x43cc,
+	0xec6: 0x43d8, 0xec7: 0x43de, 0xec8: 0x43e4, 0xec9: 0x43ea, 0xeca: 0x43fc, 0xecb: 0x4378,
+	0xecc: 0x4360, 0xecd: 0x43a8, 0xece: 0x43d2, 0xecf: 0x1d7f, 0xed0: 0x0299, 0xed1: 0x0299,
+	0xed2: 0x02a2, 0xed3: 0x02a2, 0xed4: 0x02a2, 0xed5: 0x02a2, 0xed6: 0x02a5, 0xed7: 0x02a5,
+	0xed8: 0x02a5, 0xed9: 0x02a5, 0xeda: 0x02ab, 0xedb: 0x02ab, 0xedc: 0x02ab, 0xedd: 0x02ab,
+	0xede: 0x029f, 0xedf: 0x029f, 0xee0: 0x029f, 0xee1: 0x029f, 0xee2: 0x02a8, 0xee3: 0x02a8,
+	0xee4: 0x02a8, 0xee5: 0x02a8, 0xee6: 0x029c, 0xee7: 0x029c, 0xee8: 0x029c, 0xee9: 0x029c,
+	0xeea: 0x02cf, 0xeeb: 0x02cf, 0xeec: 0x02cf, 0xeed: 0x02cf, 0xeee: 0x02d2, 0xeef: 0x02d2,
+	0xef0: 0x02d2, 0xef1: 0x02d2, 0xef2: 0x02b1, 0xef3: 0x02b1, 0xef4: 0x02b1, 0xef5: 0x02b1,
+	0xef6: 0x02ae, 0xef7: 0x02ae, 0xef8: 0x02ae, 0xef9: 0x02ae, 0xefa: 0x02b4, 0xefb: 0x02b4,
+	0xefc: 0x02b4, 0xefd: 0x02b4, 0xefe: 0x02b7, 0xeff: 0x02b7,
 	// Block 0x3c, offset 0xf00
-	0xf13: 0x02d8, 0xf14: 0x02d8, 0xf15: 0x02d8, 0xf16: 0x02d8, 0xf17: 0x02f6,
-	0xf18: 0x02f6, 0xf19: 0x02f3, 0xf1a: 0x02f3, 0xf1b: 0x02f9, 0xf1c: 0x02f9, 0xf1d: 0x204f,
-	0xf1e: 0x02ff, 0xf1f: 0x02ff, 0xf20: 0x02f0, 0xf21: 0x02f0, 0xf22: 0x02fc, 0xf23: 0x02fc,
-	0xf24: 0x0305, 0xf25: 0x0305, 0xf26: 0x0305, 0xf27: 0x0305, 0xf28: 0x028d, 0xf29: 0x028d,
-	0xf2a: 0x25aa, 0xf2b: 0x25aa, 0xf2c: 0x261a, 0xf2d: 0x261a, 0xf2e: 0x25e9, 0xf2f: 0x25e9,
-	0xf30: 0x2605, 0xf31: 0x2605, 0xf32: 0x25fe, 0xf33: 0x25fe, 0xf34: 0x260c, 0xf35: 0x260c,
-	0xf36: 0x2613, 0xf37: 0x2613, 0xf38: 0x2613, 0xf39: 0x25f0, 0xf3a: 0x25f0, 0xf3b: 0x25f0,
-	0xf3c: 0x0302, 0xf3d: 0x0302, 0xf3e: 0x0302, 0xf3f: 0x0302,
+	0xf00: 0x02b7, 0xf01: 0x02b7, 0xf02: 0x02c0, 0xf03: 0x02c0, 0xf04: 0x02bd, 0xf05: 0x02bd,
+	0xf06: 0x02c3, 0xf07: 0x02c3, 0xf08: 0x02ba, 0xf09: 0x02ba, 0xf0a: 0x02c9, 0xf0b: 0x02c9,
+	0xf0c: 0x02c6, 0xf0d: 0x02c6, 0xf0e: 0x02d5, 0xf0f: 0x02d5, 0xf10: 0x02d5, 0xf11: 0x02d5,
+	0xf12: 0x02db, 0xf13: 0x02db, 0xf14: 0x02db, 0xf15: 0x02db, 0xf16: 0x02e1, 0xf17: 0x02e1,
+	0xf18: 0x02e1, 0xf19: 0x02e1, 0xf1a: 0x02de, 0xf1b: 0x02de, 0xf1c: 0x02de, 0xf1d: 0x02de,
+	0xf1e: 0x02e4, 0xf1f: 0x02e4, 0xf20: 0x02e7, 0xf21: 0x02e7, 0xf22: 0x02e7, 0xf23: 0x02e7,
+	0xf24: 0x446e, 0xf25: 0x446e, 0xf26: 0x02ed, 0xf27: 0x02ed, 0xf28: 0x02ed, 0xf29: 0x02ed,
+	0xf2a: 0x02ea, 0xf2b: 0x02ea, 0xf2c: 0x02ea, 0xf2d: 0x02ea, 0xf2e: 0x0308, 0xf2f: 0x0308,
+	0xf30: 0x4468, 0xf31: 0x4468,
 	// Block 0x3d, offset 0xf40
-	0xf40: 0x25b1, 0xf41: 0x25b8, 0xf42: 0x25d4, 0xf43: 0x25f0, 0xf44: 0x25f7, 0xf45: 0x1d89,
-	0xf46: 0x1d8e, 0xf47: 0x1d93, 0xf48: 0x1da2, 0xf49: 0x1db1, 0xf4a: 0x1db6, 0xf4b: 0x1dbb,
-	0xf4c: 0x1dc0, 0xf4d: 0x1dc5, 0xf4e: 0x1dd4, 0xf4f: 0x1de3, 0xf50: 0x1de8, 0xf51: 0x1ded,
-	0xf52: 0x1dfc, 0xf53: 0x1e0b, 0xf54: 0x1e10, 0xf55: 0x1e15, 0xf56: 0x1e1a, 0xf57: 0x1e29,
-	0xf58: 0x1e2e, 0xf59: 0x1e3d, 0xf5a: 0x1e42, 0xf5b: 0x1e47, 0xf5c: 0x1e56, 0xf5d: 0x1e5b,
-	0xf5e: 0x1e60, 0xf5f: 0x1e6a, 0xf60: 0x1ea6, 0xf61: 0x1eb5, 0xf62: 0x1ec4, 0xf63: 0x1ec9,
-	0xf64: 0x1ece, 0xf65: 0x1ed8, 0xf66: 0x1ee7, 0xf67: 0x1eec, 0xf68: 0x1efb, 0xf69: 0x1f00,
-	0xf6a: 0x1f05, 0xf6b: 0x1f14, 0xf6c: 0x1f19, 0xf6d: 0x1f28, 0xf6e: 0x1f2d, 0xf6f: 0x1f32,
-	0xf70: 0x1f37, 0xf71: 0x1f3c, 0xf72: 0x1f41, 0xf73: 0x1f46, 0xf74: 0x1f4b, 0xf75: 0x1f50,
-	0xf76: 0x1f55, 0xf77: 0x1f5a, 0xf78: 0x1f5f, 0xf79: 0x1f64, 0xf7a: 0x1f69, 0xf7b: 0x1f6e,
-	0xf7c: 0x1f73, 0xf7d: 0x1f78, 0xf7e: 0x1f7d, 0xf7f: 0x1f87,
+	0xf53: 0x02d8, 0xf54: 0x02d8, 0xf55: 0x02d8, 0xf56: 0x02d8, 0xf57: 0x02f6,
+	0xf58: 0x02f6, 0xf59: 0x02f3, 0xf5a: 0x02f3, 0xf5b: 0x02f9, 0xf5c: 0x02f9, 0xf5d: 0x204f,
+	0xf5e: 0x02ff, 0xf5f: 0x02ff, 0xf60: 0x02f0, 0xf61: 0x02f0, 0xf62: 0x02fc, 0xf63: 0x02fc,
+	0xf64: 0x0305, 0xf65: 0x0305, 0xf66: 0x0305, 0xf67: 0x0305, 0xf68: 0x028d, 0xf69: 0x028d,
+	0xf6a: 0x25aa, 0xf6b: 0x25aa, 0xf6c: 0x261a, 0xf6d: 0x261a, 0xf6e: 0x25e9, 0xf6f: 0x25e9,
+	0xf70: 0x2605, 0xf71: 0x2605, 0xf72: 0x25fe, 0xf73: 0x25fe, 0xf74: 0x260c, 0xf75: 0x260c,
+	0xf76: 0x2613, 0xf77: 0x2613, 0xf78: 0x2613, 0xf79: 0x25f0, 0xf7a: 0x25f0, 0xf7b: 0x25f0,
+	0xf7c: 0x0302, 0xf7d: 0x0302, 0xf7e: 0x0302, 0xf7f: 0x0302,
 	// Block 0x3e, offset 0xf80
-	0xf80: 0x1f8c, 0xf81: 0x1f91, 0xf82: 0x1f96, 0xf83: 0x1fa0, 0xf84: 0x1fa5, 0xf85: 0x1faf,
-	0xf86: 0x1fb4, 0xf87: 0x1fb9, 0xf88: 0x1fbe, 0xf89: 0x1fc3, 0xf8a: 0x1fc8, 0xf8b: 0x1fcd,
-	0xf8c: 0x1fd2, 0xf8d: 0x1fd7, 0xf8e: 0x1fe6, 0xf8f: 0x1ff5, 0xf90: 0x1ffa, 0xf91: 0x1fff,
-	0xf92: 0x2004, 0xf93: 0x2009, 0xf94: 0x200e, 0xf95: 0x2018, 0xf96: 0x201d, 0xf97: 0x2022,
-	0xf98: 0x2031, 0xf99: 0x2040, 0xf9a: 0x2045, 0xf9b: 0x44b6, 0xf9c: 0x44bc, 0xf9d: 0x44f2,
-	0xf9e: 0x4549, 0xf9f: 0x4550, 0xfa0: 0x4557, 0xfa1: 0x455e, 0xfa2: 0x4565, 0xfa3: 0x456c,
-	0xfa4: 0x25c6, 0xfa5: 0x25cd, 0xfa6: 0x25d4, 0xfa7: 0x25db, 0xfa8: 0x25f0, 0xfa9: 0x25f7,
-	0xfaa: 0x1d98, 0xfab: 0x1d9d, 0xfac: 0x1da2, 0xfad: 0x1da7, 0xfae: 0x1db1, 0xfaf: 0x1db6,
-	0xfb0: 0x1dca, 0xfb1: 0x1dcf, 0xfb2: 0x1dd4, 0xfb3: 0x1dd9, 0xfb4: 0x1de3, 0xfb5: 0x1de8,
-	0xfb6: 0x1df2, 0xfb7: 0x1df7, 0xfb8: 0x1dfc, 0xfb9: 0x1e01, 0xfba: 0x1e0b, 0xfbb: 0x1e10,
-	0xfbc: 0x1f3c, 0xfbd: 0x1f41, 0xfbe: 0x1f50, 0xfbf: 0x1f55,
+	0xf80: 0x25b1, 0xf81: 0x25b8, 0xf82: 0x25d4, 0xf83: 0x25f0, 0xf84: 0x25f7, 0xf85: 0x1d89,
+	0xf86: 0x1d8e, 0xf87: 0x1d93, 0xf88: 0x1da2, 0xf89: 0x1db1, 0xf8a: 0x1db6, 0xf8b: 0x1dbb,
+	0xf8c: 0x1dc0, 0xf8d: 0x1dc5, 0xf8e: 0x1dd4, 0xf8f: 0x1de3, 0xf90: 0x1de8, 0xf91: 0x1ded,
+	0xf92: 0x1dfc, 0xf93: 0x1e0b, 0xf94: 0x1e10, 0xf95: 0x1e15, 0xf96: 0x1e1a, 0xf97: 0x1e29,
+	0xf98: 0x1e2e, 0xf99: 0x1e3d, 0xf9a: 0x1e42, 0xf9b: 0x1e47, 0xf9c: 0x1e56, 0xf9d: 0x1e5b,
+	0xf9e: 0x1e60, 0xf9f: 0x1e6a, 0xfa0: 0x1ea6, 0xfa1: 0x1eb5, 0xfa2: 0x1ec4, 0xfa3: 0x1ec9,
+	0xfa4: 0x1ece, 0xfa5: 0x1ed8, 0xfa6: 0x1ee7, 0xfa7: 0x1eec, 0xfa8: 0x1efb, 0xfa9: 0x1f00,
+	0xfaa: 0x1f05, 0xfab: 0x1f14, 0xfac: 0x1f19, 0xfad: 0x1f28, 0xfae: 0x1f2d, 0xfaf: 0x1f32,
+	0xfb0: 0x1f37, 0xfb1: 0x1f3c, 0xfb2: 0x1f41, 0xfb3: 0x1f46, 0xfb4: 0x1f4b, 0xfb5: 0x1f50,
+	0xfb6: 0x1f55, 0xfb7: 0x1f5a, 0xfb8: 0x1f5f, 0xfb9: 0x1f64, 0xfba: 0x1f69, 0xfbb: 0x1f6e,
+	0xfbc: 0x1f73, 0xfbd: 0x1f78, 0xfbe: 0x1f7d, 0xfbf: 0x1f87,
 	// Block 0x3f, offset 0xfc0
-	0xfc0: 0x1f5a, 0xfc1: 0x1f6e, 0xfc2: 0x1f73, 0xfc3: 0x1f78, 0xfc4: 0x1f7d, 0xfc5: 0x1f96,
-	0xfc6: 0x1fa0, 0xfc7: 0x1fa5, 0xfc8: 0x1faa, 0xfc9: 0x1fbe, 0xfca: 0x1fdc, 0xfcb: 0x1fe1,
-	0xfcc: 0x1fe6, 0xfcd: 0x1feb, 0xfce: 0x1ff5, 0xfcf: 0x1ffa, 0xfd0: 0x44f2, 0xfd1: 0x2027,
-	0xfd2: 0x202c, 0xfd3: 0x2031, 0xfd4: 0x2036, 0xfd5: 0x2040, 0xfd6: 0x2045, 0xfd7: 0x25b1,
-	0xfd8: 0x25b8, 0xfd9: 0x25bf, 0xfda: 0x25d4, 0xfdb: 0x25e2, 0xfdc: 0x1d89, 0xfdd: 0x1d8e,
-	0xfde: 0x1d93, 0xfdf: 0x1da2, 0xfe0: 0x1dac, 0xfe1: 0x1dbb, 0xfe2: 0x1dc0, 0xfe3: 0x1dc5,
-	0xfe4: 0x1dd4, 0xfe5: 0x1dde, 0xfe6: 0x1dfc, 0xfe7: 0x1e15, 0xfe8: 0x1e1a, 0xfe9: 0x1e29,
-	0xfea: 0x1e2e, 0xfeb: 0x1e3d, 0xfec: 0x1e47, 0xfed: 0x1e56, 0xfee: 0x1e5b, 0xfef: 0x1e60,
-	0xff0: 0x1e6a, 0xff1: 0x1ea6, 0xff2: 0x1eab, 0xff3: 0x1eb5, 0xff4: 0x1ec4, 0xff5: 0x1ec9,
-	0xff6: 0x1ece, 0xff7: 0x1ed8, 0xff8: 0x1ee7, 0xff9: 0x1efb, 0xffa: 0x1f00, 0xffb: 0x1f05,
-	0xffc: 0x1f14, 0xffd: 0x1f19, 0xffe: 0x1f28, 0xfff: 0x1f2d,
+	0xfc0: 0x1f8c, 0xfc1: 0x1f91, 0xfc2: 0x1f96, 0xfc3: 0x1fa0, 0xfc4: 0x1fa5, 0xfc5: 0x1faf,
+	0xfc6: 0x1fb4, 0xfc7: 0x1fb9, 0xfc8: 0x1fbe, 0xfc9: 0x1fc3, 0xfca: 0x1fc8, 0xfcb: 0x1fcd,
+	0xfcc: 0x1fd2, 0xfcd: 0x1fd7, 0xfce: 0x1fe6, 0xfcf: 0x1ff5, 0xfd0: 0x1ffa, 0xfd1: 0x1fff,
+	0xfd2: 0x2004, 0xfd3: 0x2009, 0xfd4: 0x200e, 0xfd5: 0x2018, 0xfd6: 0x201d, 0xfd7: 0x2022,
+	0xfd8: 0x2031, 0xfd9: 0x2040, 0xfda: 0x2045, 0xfdb: 0x4420, 0xfdc: 0x4426, 0xfdd: 0x445c,
+	0xfde: 0x44b3, 0xfdf: 0x44ba, 0xfe0: 0x44c1, 0xfe1: 0x44c8, 0xfe2: 0x44cf, 0xfe3: 0x44d6,
+	0xfe4: 0x25c6, 0xfe5: 0x25cd, 0xfe6: 0x25d4, 0xfe7: 0x25db, 0xfe8: 0x25f0, 0xfe9: 0x25f7,
+	0xfea: 0x1d98, 0xfeb: 0x1d9d, 0xfec: 0x1da2, 0xfed: 0x1da7, 0xfee: 0x1db1, 0xfef: 0x1db6,
+	0xff0: 0x1dca, 0xff1: 0x1dcf, 0xff2: 0x1dd4, 0xff3: 0x1dd9, 0xff4: 0x1de3, 0xff5: 0x1de8,
+	0xff6: 0x1df2, 0xff7: 0x1df7, 0xff8: 0x1dfc, 0xff9: 0x1e01, 0xffa: 0x1e0b, 0xffb: 0x1e10,
+	0xffc: 0x1f3c, 0xffd: 0x1f41, 0xffe: 0x1f50, 0xfff: 0x1f55,
 	// Block 0x40, offset 0x1000
-	0x1000: 0x1f32, 0x1001: 0x1f37, 0x1002: 0x1f46, 0x1003: 0x1f4b, 0x1004: 0x1f5f, 0x1005: 0x1f64,
-	0x1006: 0x1f69, 0x1007: 0x1f6e, 0x1008: 0x1f73, 0x1009: 0x1f87, 0x100a: 0x1f8c, 0x100b: 0x1f91,
-	0x100c: 0x1f96, 0x100d: 0x1f9b, 0x100e: 0x1faf, 0x100f: 0x1fb4, 0x1010: 0x1fb9, 0x1011: 0x1fbe,
-	0x1012: 0x1fcd, 0x1013: 0x1fd2, 0x1014: 0x1fd7, 0x1015: 0x1fe6, 0x1016: 0x1ff0, 0x1017: 0x1fff,
-	0x1018: 0x2004, 0x1019: 0x44e6, 0x101a: 0x2018, 0x101b: 0x201d, 0x101c: 0x2022, 0x101d: 0x2031,
-	0x101e: 0x203b, 0x101f: 0x25d4, 0x1020: 0x25e2, 0x1021: 0x1da2, 0x1022: 0x1dac, 0x1023: 0x1dd4,
-	0x1024: 0x1dde, 0x1025: 0x1dfc, 0x1026: 0x1e06, 0x1027: 0x1e6a, 0x1028: 0x1e6f, 0x1029: 0x1e92,
-	0x102a: 0x1e97, 0x102b: 0x1f6e, 0x102c: 0x1f73, 0x102d: 0x1f96, 0x102e: 0x1fe6, 0x102f: 0x1ff0,
-	0x1030: 0x2031, 0x1031: 0x203b, 0x1032: 0x459a, 0x1033: 0x45a2, 0x1034: 0x45aa, 0x1035: 0x1ef1,
-	0x1036: 0x1ef6, 0x1037: 0x1f0a, 0x1038: 0x1f0f, 0x1039: 0x1f1e, 0x103a: 0x1f23, 0x103b: 0x1e74,
-	0x103c: 0x1e79, 0x103d: 0x1e9c, 0x103e: 0x1ea1, 0x103f: 0x1e33,
+	0x1000: 0x1f5a, 0x1001: 0x1f6e, 0x1002: 0x1f73, 0x1003: 0x1f78, 0x1004: 0x1f7d, 0x1005: 0x1f96,
+	0x1006: 0x1fa0, 0x1007: 0x1fa5, 0x1008: 0x1faa, 0x1009: 0x1fbe, 0x100a: 0x1fdc, 0x100b: 0x1fe1,
+	0x100c: 0x1fe6, 0x100d: 0x1feb, 0x100e: 0x1ff5, 0x100f: 0x1ffa, 0x1010: 0x445c, 0x1011: 0x2027,
+	0x1012: 0x202c, 0x1013: 0x2031, 0x1014: 0x2036, 0x1015: 0x2040, 0x1016: 0x2045, 0x1017: 0x25b1,
+	0x1018: 0x25b8, 0x1019: 0x25bf, 0x101a: 0x25d4, 0x101b: 0x25e2, 0x101c: 0x1d89, 0x101d: 0x1d8e,
+	0x101e: 0x1d93, 0x101f: 0x1da2, 0x1020: 0x1dac, 0x1021: 0x1dbb, 0x1022: 0x1dc0, 0x1023: 0x1dc5,
+	0x1024: 0x1dd4, 0x1025: 0x1dde, 0x1026: 0x1dfc, 0x1027: 0x1e15, 0x1028: 0x1e1a, 0x1029: 0x1e29,
+	0x102a: 0x1e2e, 0x102b: 0x1e3d, 0x102c: 0x1e47, 0x102d: 0x1e56, 0x102e: 0x1e5b, 0x102f: 0x1e60,
+	0x1030: 0x1e6a, 0x1031: 0x1ea6, 0x1032: 0x1eab, 0x1033: 0x1eb5, 0x1034: 0x1ec4, 0x1035: 0x1ec9,
+	0x1036: 0x1ece, 0x1037: 0x1ed8, 0x1038: 0x1ee7, 0x1039: 0x1efb, 0x103a: 0x1f00, 0x103b: 0x1f05,
+	0x103c: 0x1f14, 0x103d: 0x1f19, 0x103e: 0x1f28, 0x103f: 0x1f2d,
 	// Block 0x41, offset 0x1040
-	0x1040: 0x1e38, 0x1041: 0x1e1f, 0x1042: 0x1e24, 0x1043: 0x1e4c, 0x1044: 0x1e51, 0x1045: 0x1eba,
-	0x1046: 0x1ebf, 0x1047: 0x1edd, 0x1048: 0x1ee2, 0x1049: 0x1e7e, 0x104a: 0x1e83, 0x104b: 0x1e88,
-	0x104c: 0x1e92, 0x104d: 0x1e8d, 0x104e: 0x1e65, 0x104f: 0x1eb0, 0x1050: 0x1ed3, 0x1051: 0x1ef1,
-	0x1052: 0x1ef6, 0x1053: 0x1f0a, 0x1054: 0x1f0f, 0x1055: 0x1f1e, 0x1056: 0x1f23, 0x1057: 0x1e74,
-	0x1058: 0x1e79, 0x1059: 0x1e9c, 0x105a: 0x1ea1, 0x105b: 0x1e33, 0x105c: 0x1e38, 0x105d: 0x1e1f,
-	0x105e: 0x1e24, 0x105f: 0x1e4c, 0x1060: 0x1e51, 0x1061: 0x1eba, 0x1062: 0x1ebf, 0x1063: 0x1edd,
-	0x1064: 0x1ee2, 0x1065: 0x1e7e, 0x1066: 0x1e83, 0x1067: 0x1e88, 0x1068: 0x1e92, 0x1069: 0x1e8d,
-	0x106a: 0x1e65, 0x106b: 0x1eb0, 0x106c: 0x1ed3, 0x106d: 0x1e7e, 0x106e: 0x1e83, 0x106f: 0x1e88,
-	0x1070: 0x1e92, 0x1071: 0x1e6f, 0x1072: 0x1e97, 0x1073: 0x1eec, 0x1074: 0x1e56, 0x1075: 0x1e5b,
-	0x1076: 0x1e60, 0x1077: 0x1e7e, 0x1078: 0x1e83, 0x1079: 0x1e88, 0x107a: 0x1eec, 0x107b: 0x1efb,
-	0x107c: 0x449e, 0x107d: 0x449e,
+	0x1040: 0x1f32, 0x1041: 0x1f37, 0x1042: 0x1f46, 0x1043: 0x1f4b, 0x1044: 0x1f5f, 0x1045: 0x1f64,
+	0x1046: 0x1f69, 0x1047: 0x1f6e, 0x1048: 0x1f73, 0x1049: 0x1f87, 0x104a: 0x1f8c, 0x104b: 0x1f91,
+	0x104c: 0x1f96, 0x104d: 0x1f9b, 0x104e: 0x1faf, 0x104f: 0x1fb4, 0x1050: 0x1fb9, 0x1051: 0x1fbe,
+	0x1052: 0x1fcd, 0x1053: 0x1fd2, 0x1054: 0x1fd7, 0x1055: 0x1fe6, 0x1056: 0x1ff0, 0x1057: 0x1fff,
+	0x1058: 0x2004, 0x1059: 0x4450, 0x105a: 0x2018, 0x105b: 0x201d, 0x105c: 0x2022, 0x105d: 0x2031,
+	0x105e: 0x203b, 0x105f: 0x25d4, 0x1060: 0x25e2, 0x1061: 0x1da2, 0x1062: 0x1dac, 0x1063: 0x1dd4,
+	0x1064: 0x1dde, 0x1065: 0x1dfc, 0x1066: 0x1e06, 0x1067: 0x1e6a, 0x1068: 0x1e6f, 0x1069: 0x1e92,
+	0x106a: 0x1e97, 0x106b: 0x1f6e, 0x106c: 0x1f73, 0x106d: 0x1f96, 0x106e: 0x1fe6, 0x106f: 0x1ff0,
+	0x1070: 0x2031, 0x1071: 0x203b, 0x1072: 0x4504, 0x1073: 0x450c, 0x1074: 0x4514, 0x1075: 0x1ef1,
+	0x1076: 0x1ef6, 0x1077: 0x1f0a, 0x1078: 0x1f0f, 0x1079: 0x1f1e, 0x107a: 0x1f23, 0x107b: 0x1e74,
+	0x107c: 0x1e79, 0x107d: 0x1e9c, 0x107e: 0x1ea1, 0x107f: 0x1e33,
 	// Block 0x42, offset 0x1080
-	0x1090: 0x2311, 0x1091: 0x2326,
-	0x1092: 0x2326, 0x1093: 0x232d, 0x1094: 0x2334, 0x1095: 0x2349, 0x1096: 0x2350, 0x1097: 0x2357,
-	0x1098: 0x237a, 0x1099: 0x237a, 0x109a: 0x239d, 0x109b: 0x2396, 0x109c: 0x23b2, 0x109d: 0x23a4,
-	0x109e: 0x23ab, 0x109f: 0x23ce, 0x10a0: 0x23ce, 0x10a1: 0x23c7, 0x10a2: 0x23d5, 0x10a3: 0x23d5,
-	0x10a4: 0x23ff, 0x10a5: 0x23ff, 0x10a6: 0x241b, 0x10a7: 0x23e3, 0x10a8: 0x23e3, 0x10a9: 0x23dc,
-	0x10aa: 0x23f1, 0x10ab: 0x23f1, 0x10ac: 0x23f8, 0x10ad: 0x23f8, 0x10ae: 0x2422, 0x10af: 0x2430,
-	0x10b0: 0x2430, 0x10b1: 0x2437, 0x10b2: 0x2437, 0x10b3: 0x243e, 0x10b4: 0x2445, 0x10b5: 0x244c,
-	0x10b6: 0x2453, 0x10b7: 0x2453, 0x10b8: 0x245a, 0x10b9: 0x2468, 0x10ba: 0x2476, 0x10bb: 0x246f,
-	0x10bc: 0x247d, 0x10bd: 0x247d, 0x10be: 0x2492, 0x10bf: 0x2499,
+	0x1080: 0x1e38, 0x1081: 0x1e1f, 0x1082: 0x1e24, 0x1083: 0x1e4c, 0x1084: 0x1e51, 0x1085: 0x1eba,
+	0x1086: 0x1ebf, 0x1087: 0x1edd, 0x1088: 0x1ee2, 0x1089: 0x1e7e, 0x108a: 0x1e83, 0x108b: 0x1e88,
+	0x108c: 0x1e92, 0x108d: 0x1e8d, 0x108e: 0x1e65, 0x108f: 0x1eb0, 0x1090: 0x1ed3, 0x1091: 0x1ef1,
+	0x1092: 0x1ef6, 0x1093: 0x1f0a, 0x1094: 0x1f0f, 0x1095: 0x1f1e, 0x1096: 0x1f23, 0x1097: 0x1e74,
+	0x1098: 0x1e79, 0x1099: 0x1e9c, 0x109a: 0x1ea1, 0x109b: 0x1e33, 0x109c: 0x1e38, 0x109d: 0x1e1f,
+	0x109e: 0x1e24, 0x109f: 0x1e4c, 0x10a0: 0x1e51, 0x10a1: 0x1eba, 0x10a2: 0x1ebf, 0x10a3: 0x1edd,
+	0x10a4: 0x1ee2, 0x10a5: 0x1e7e, 0x10a6: 0x1e83, 0x10a7: 0x1e88, 0x10a8: 0x1e92, 0x10a9: 0x1e8d,
+	0x10aa: 0x1e65, 0x10ab: 0x1eb0, 0x10ac: 0x1ed3, 0x10ad: 0x1e7e, 0x10ae: 0x1e83, 0x10af: 0x1e88,
+	0x10b0: 0x1e92, 0x10b1: 0x1e6f, 0x10b2: 0x1e97, 0x10b3: 0x1eec, 0x10b4: 0x1e56, 0x10b5: 0x1e5b,
+	0x10b6: 0x1e60, 0x10b7: 0x1e7e, 0x10b8: 0x1e83, 0x10b9: 0x1e88, 0x10ba: 0x1eec, 0x10bb: 0x1efb,
+	0x10bc: 0x4408, 0x10bd: 0x4408,
 	// Block 0x43, offset 0x10c0
-	0x10c0: 0x24ca, 0x10c1: 0x24d8, 0x10c2: 0x24d1, 0x10c3: 0x24b5, 0x10c4: 0x24b5, 0x10c5: 0x24df,
-	0x10c6: 0x24df, 0x10c7: 0x24e6, 0x10c8: 0x24e6, 0x10c9: 0x2510, 0x10ca: 0x2517, 0x10cb: 0x251e,
-	0x10cc: 0x24f4, 0x10cd: 0x2502, 0x10ce: 0x2525, 0x10cf: 0x252c,
-	0x10d2: 0x24fb, 0x10d3: 0x2580, 0x10d4: 0x2587, 0x10d5: 0x255d, 0x10d6: 0x2564, 0x10d7: 0x2548,
-	0x10d8: 0x2548, 0x10d9: 0x254f, 0x10da: 0x2579, 0x10db: 0x2572, 0x10dc: 0x259c, 0x10dd: 0x259c,
-	0x10de: 0x230a, 0x10df: 0x231f, 0x10e0: 0x2318, 0x10e1: 0x2342, 0x10e2: 0x233b, 0x10e3: 0x2365,
-	0x10e4: 0x235e, 0x10e5: 0x2388, 0x10e6: 0x236c, 0x10e7: 0x2381, 0x10e8: 0x23b9, 0x10e9: 0x2406,
-	0x10ea: 0x23ea, 0x10eb: 0x2429, 0x10ec: 0x24c3, 0x10ed: 0x24ed, 0x10ee: 0x2595, 0x10ef: 0x258e,
-	0x10f0: 0x25a3, 0x10f1: 0x253a, 0x10f2: 0x24a0, 0x10f3: 0x256b, 0x10f4: 0x2492, 0x10f5: 0x24ca,
-	0x10f6: 0x2461, 0x10f7: 0x24ae, 0x10f8: 0x2541, 0x10f9: 0x2533, 0x10fa: 0x24bc, 0x10fb: 0x24a7,
-	0x10fc: 0x24bc, 0x10fd: 0x2541, 0x10fe: 0x2373, 0x10ff: 0x238f,
+	0x10d0: 0x2311, 0x10d1: 0x2326,
+	0x10d2: 0x2326, 0x10d3: 0x232d, 0x10d4: 0x2334, 0x10d5: 0x2349, 0x10d6: 0x2350, 0x10d7: 0x2357,
+	0x10d8: 0x237a, 0x10d9: 0x237a, 0x10da: 0x239d, 0x10db: 0x2396, 0x10dc: 0x23b2, 0x10dd: 0x23a4,
+	0x10de: 0x23ab, 0x10df: 0x23ce, 0x10e0: 0x23ce, 0x10e1: 0x23c7, 0x10e2: 0x23d5, 0x10e3: 0x23d5,
+	0x10e4: 0x23ff, 0x10e5: 0x23ff, 0x10e6: 0x241b, 0x10e7: 0x23e3, 0x10e8: 0x23e3, 0x10e9: 0x23dc,
+	0x10ea: 0x23f1, 0x10eb: 0x23f1, 0x10ec: 0x23f8, 0x10ed: 0x23f8, 0x10ee: 0x2422, 0x10ef: 0x2430,
+	0x10f0: 0x2430, 0x10f1: 0x2437, 0x10f2: 0x2437, 0x10f3: 0x243e, 0x10f4: 0x2445, 0x10f5: 0x244c,
+	0x10f6: 0x2453, 0x10f7: 0x2453, 0x10f8: 0x245a, 0x10f9: 0x2468, 0x10fa: 0x2476, 0x10fb: 0x246f,
+	0x10fc: 0x247d, 0x10fd: 0x247d, 0x10fe: 0x2492, 0x10ff: 0x2499,
 	// Block 0x44, offset 0x1100
-	0x1100: 0x2509, 0x1101: 0x2484, 0x1102: 0x2303, 0x1103: 0x24a7, 0x1104: 0x244c, 0x1105: 0x241b,
-	0x1106: 0x23c0, 0x1107: 0x2556,
-	0x1130: 0x2414, 0x1131: 0x248b, 0x1132: 0x27bf, 0x1133: 0x27b6, 0x1134: 0x27ec, 0x1135: 0x27da,
-	0x1136: 0x27c8, 0x1137: 0x27e3, 0x1138: 0x27f5, 0x1139: 0x240d, 0x113a: 0x2c7c, 0x113b: 0x2afc,
-	0x113c: 0x27d1,
+	0x1100: 0x24ca, 0x1101: 0x24d8, 0x1102: 0x24d1, 0x1103: 0x24b5, 0x1104: 0x24b5, 0x1105: 0x24df,
+	0x1106: 0x24df, 0x1107: 0x24e6, 0x1108: 0x24e6, 0x1109: 0x2510, 0x110a: 0x2517, 0x110b: 0x251e,
+	0x110c: 0x24f4, 0x110d: 0x2502, 0x110e: 0x2525, 0x110f: 0x252c,
+	0x1112: 0x24fb, 0x1113: 0x2580, 0x1114: 0x2587, 0x1115: 0x255d, 0x1116: 0x2564, 0x1117: 0x2548,
+	0x1118: 0x2548, 0x1119: 0x254f, 0x111a: 0x2579, 0x111b: 0x2572, 0x111c: 0x259c, 0x111d: 0x259c,
+	0x111e: 0x230a, 0x111f: 0x231f, 0x1120: 0x2318, 0x1121: 0x2342, 0x1122: 0x233b, 0x1123: 0x2365,
+	0x1124: 0x235e, 0x1125: 0x2388, 0x1126: 0x236c, 0x1127: 0x2381, 0x1128: 0x23b9, 0x1129: 0x2406,
+	0x112a: 0x23ea, 0x112b: 0x2429, 0x112c: 0x24c3, 0x112d: 0x24ed, 0x112e: 0x2595, 0x112f: 0x258e,
+	0x1130: 0x25a3, 0x1131: 0x253a, 0x1132: 0x24a0, 0x1133: 0x256b, 0x1134: 0x2492, 0x1135: 0x24ca,
+	0x1136: 0x2461, 0x1137: 0x24ae, 0x1138: 0x2541, 0x1139: 0x2533, 0x113a: 0x24bc, 0x113b: 0x24a7,
+	0x113c: 0x24bc, 0x113d: 0x2541, 0x113e: 0x2373, 0x113f: 0x238f,
 	// Block 0x45, offset 0x1140
-	0x1150: 0x0019, 0x1151: 0x0483,
-	0x1152: 0x0487, 0x1153: 0x0035, 0x1154: 0x0037, 0x1155: 0x0003, 0x1156: 0x003f, 0x1157: 0x04bf,
-	0x1158: 0x04c3, 0x1159: 0x1b5c,
-	0x1160: 0x8132, 0x1161: 0x8132, 0x1162: 0x8132, 0x1163: 0x8132,
-	0x1164: 0x8132, 0x1165: 0x8132, 0x1166: 0x8132, 0x1167: 0x812d, 0x1168: 0x812d, 0x1169: 0x812d,
-	0x116a: 0x812d, 0x116b: 0x812d, 0x116c: 0x812d, 0x116d: 0x812d, 0x116e: 0x8132, 0x116f: 0x8132,
-	0x1170: 0x1873, 0x1171: 0x0443, 0x1172: 0x043f, 0x1173: 0x007f, 0x1174: 0x007f, 0x1175: 0x0011,
-	0x1176: 0x0013, 0x1177: 0x00b7, 0x1178: 0x00bb, 0x1179: 0x04b7, 0x117a: 0x04bb, 0x117b: 0x04ab,
-	0x117c: 0x04af, 0x117d: 0x0493, 0x117e: 0x0497, 0x117f: 0x048b,
+	0x1140: 0x2509, 0x1141: 0x2484, 0x1142: 0x2303, 0x1143: 0x24a7, 0x1144: 0x244c, 0x1145: 0x241b,
+	0x1146: 0x23c0, 0x1147: 0x2556,
+	0x1170: 0x2414, 0x1171: 0x248b, 0x1172: 0x27bf, 0x1173: 0x27b6, 0x1174: 0x27ec, 0x1175: 0x27da,
+	0x1176: 0x27c8, 0x1177: 0x27e3, 0x1178: 0x27f5, 0x1179: 0x240d, 0x117a: 0x2c7c, 0x117b: 0x2afc,
+	0x117c: 0x27d1,
 	// Block 0x46, offset 0x1180
-	0x1180: 0x048f, 0x1181: 0x049b, 0x1182: 0x049f, 0x1183: 0x04a3, 0x1184: 0x04a7,
-	0x1187: 0x0077, 0x1188: 0x007b, 0x1189: 0x4269, 0x118a: 0x4269, 0x118b: 0x4269,
-	0x118c: 0x4269, 0x118d: 0x007f, 0x118e: 0x007f, 0x118f: 0x007f, 0x1190: 0x0019, 0x1191: 0x0483,
-	0x1192: 0x001d, 0x1194: 0x0037, 0x1195: 0x0035, 0x1196: 0x003f, 0x1197: 0x0003,
-	0x1198: 0x0443, 0x1199: 0x0011, 0x119a: 0x0013, 0x119b: 0x00b7, 0x119c: 0x00bb, 0x119d: 0x04b7,
-	0x119e: 0x04bb, 0x119f: 0x0007, 0x11a0: 0x000d, 0x11a1: 0x0015, 0x11a2: 0x0017, 0x11a3: 0x001b,
-	0x11a4: 0x0039, 0x11a5: 0x003d, 0x11a6: 0x003b, 0x11a8: 0x0079, 0x11a9: 0x0009,
-	0x11aa: 0x000b, 0x11ab: 0x0041,
-	0x11b0: 0x42aa, 0x11b1: 0x44c2, 0x11b2: 0x42af, 0x11b4: 0x42b4,
-	0x11b6: 0x42b9, 0x11b7: 0x44c8, 0x11b8: 0x42be, 0x11b9: 0x44ce, 0x11ba: 0x42c3, 0x11bb: 0x44d4,
-	0x11bc: 0x42c8, 0x11bd: 0x44da, 0x11be: 0x42cd, 0x11bf: 0x44e0,
+	0x1190: 0x0019, 0x1191: 0x0483,
+	0x1192: 0x0487, 0x1193: 0x0035, 0x1194: 0x0037, 0x1195: 0x0003, 0x1196: 0x003f, 0x1197: 0x04bf,
+	0x1198: 0x04c3, 0x1199: 0x1b5c,
+	0x11a0: 0x8132, 0x11a1: 0x8132, 0x11a2: 0x8132, 0x11a3: 0x8132,
+	0x11a4: 0x8132, 0x11a5: 0x8132, 0x11a6: 0x8132, 0x11a7: 0x812d, 0x11a8: 0x812d, 0x11a9: 0x812d,
+	0x11aa: 0x812d, 0x11ab: 0x812d, 0x11ac: 0x812d, 0x11ad: 0x812d, 0x11ae: 0x8132, 0x11af: 0x8132,
+	0x11b0: 0x1873, 0x11b1: 0x0443, 0x11b2: 0x043f, 0x11b3: 0x007f, 0x11b4: 0x007f, 0x11b5: 0x0011,
+	0x11b6: 0x0013, 0x11b7: 0x00b7, 0x11b8: 0x00bb, 0x11b9: 0x04b7, 0x11ba: 0x04bb, 0x11bb: 0x04ab,
+	0x11bc: 0x04af, 0x11bd: 0x0493, 0x11be: 0x0497, 0x11bf: 0x048b,
 	// Block 0x47, offset 0x11c0
-	0x11c0: 0x0236, 0x11c1: 0x44a4, 0x11c2: 0x44a4, 0x11c3: 0x44aa, 0x11c4: 0x44aa, 0x11c5: 0x44ec,
-	0x11c6: 0x44ec, 0x11c7: 0x44b0, 0x11c8: 0x44b0, 0x11c9: 0x44f8, 0x11ca: 0x44f8, 0x11cb: 0x44f8,
-	0x11cc: 0x44f8, 0x11cd: 0x0239, 0x11ce: 0x0239, 0x11cf: 0x023c, 0x11d0: 0x023c, 0x11d1: 0x023c,
-	0x11d2: 0x023c, 0x11d3: 0x023f, 0x11d4: 0x023f, 0x11d5: 0x0242, 0x11d6: 0x0242, 0x11d7: 0x0242,
-	0x11d8: 0x0242, 0x11d9: 0x0245, 0x11da: 0x0245, 0x11db: 0x0245, 0x11dc: 0x0245, 0x11dd: 0x0248,
-	0x11de: 0x0248, 0x11df: 0x0248, 0x11e0: 0x0248, 0x11e1: 0x024b, 0x11e2: 0x024b, 0x11e3: 0x024b,
-	0x11e4: 0x024b, 0x11e5: 0x024e, 0x11e6: 0x024e, 0x11e7: 0x024e, 0x11e8: 0x024e, 0x11e9: 0x0251,
-	0x11ea: 0x0251, 0x11eb: 0x0254, 0x11ec: 0x0254, 0x11ed: 0x0257, 0x11ee: 0x0257, 0x11ef: 0x025a,
-	0x11f0: 0x025a, 0x11f1: 0x025d, 0x11f2: 0x025d, 0x11f3: 0x025d, 0x11f4: 0x025d, 0x11f5: 0x0260,
-	0x11f6: 0x0260, 0x11f7: 0x0260, 0x11f8: 0x0260, 0x11f9: 0x0263, 0x11fa: 0x0263, 0x11fb: 0x0263,
-	0x11fc: 0x0263, 0x11fd: 0x0266, 0x11fe: 0x0266, 0x11ff: 0x0266,
+	0x11c0: 0x048f, 0x11c1: 0x049b, 0x11c2: 0x049f, 0x11c3: 0x04a3, 0x11c4: 0x04a7,
+	0x11c7: 0x0077, 0x11c8: 0x007b, 0x11c9: 0x4269, 0x11ca: 0x4269, 0x11cb: 0x4269,
+	0x11cc: 0x4269, 0x11cd: 0x007f, 0x11ce: 0x007f, 0x11cf: 0x007f, 0x11d0: 0x0019, 0x11d1: 0x0483,
+	0x11d2: 0x001d, 0x11d4: 0x0037, 0x11d5: 0x0035, 0x11d6: 0x003f, 0x11d7: 0x0003,
+	0x11d8: 0x0443, 0x11d9: 0x0011, 0x11da: 0x0013, 0x11db: 0x00b7, 0x11dc: 0x00bb, 0x11dd: 0x04b7,
+	0x11de: 0x04bb, 0x11df: 0x0007, 0x11e0: 0x000d, 0x11e1: 0x0015, 0x11e2: 0x0017, 0x11e3: 0x001b,
+	0x11e4: 0x0039, 0x11e5: 0x003d, 0x11e6: 0x003b, 0x11e8: 0x0079, 0x11e9: 0x0009,
+	0x11ea: 0x000b, 0x11eb: 0x0041,
+	0x11f0: 0x42aa, 0x11f1: 0x442c, 0x11f2: 0x42af, 0x11f4: 0x42b4,
+	0x11f6: 0x42b9, 0x11f7: 0x4432, 0x11f8: 0x42be, 0x11f9: 0x4438, 0x11fa: 0x42c3, 0x11fb: 0x443e,
+	0x11fc: 0x42c8, 0x11fd: 0x4444, 0x11fe: 0x42cd, 0x11ff: 0x444a,
 	// Block 0x48, offset 0x1200
-	0x1200: 0x0266, 0x1201: 0x0269, 0x1202: 0x0269, 0x1203: 0x0269, 0x1204: 0x0269, 0x1205: 0x026c,
-	0x1206: 0x026c, 0x1207: 0x026c, 0x1208: 0x026c, 0x1209: 0x026f, 0x120a: 0x026f, 0x120b: 0x026f,
-	0x120c: 0x026f, 0x120d: 0x0272, 0x120e: 0x0272, 0x120f: 0x0272, 0x1210: 0x0272, 0x1211: 0x0275,
-	0x1212: 0x0275, 0x1213: 0x0275, 0x1214: 0x0275, 0x1215: 0x0278, 0x1216: 0x0278, 0x1217: 0x0278,
-	0x1218: 0x0278, 0x1219: 0x027b, 0x121a: 0x027b, 0x121b: 0x027b, 0x121c: 0x027b, 0x121d: 0x027e,
-	0x121e: 0x027e, 0x121f: 0x027e, 0x1220: 0x027e, 0x1221: 0x0281, 0x1222: 0x0281, 0x1223: 0x0281,
-	0x1224: 0x0281, 0x1225: 0x0284, 0x1226: 0x0284, 0x1227: 0x0284, 0x1228: 0x0284, 0x1229: 0x0287,
-	0x122a: 0x0287, 0x122b: 0x0287, 0x122c: 0x0287, 0x122d: 0x028a, 0x122e: 0x028a, 0x122f: 0x028d,
-	0x1230: 0x028d, 0x1231: 0x0290, 0x1232: 0x0290, 0x1233: 0x0290, 0x1234: 0x0290, 0x1235: 0x2e00,
-	0x1236: 0x2e00, 0x1237: 0x2e08, 0x1238: 0x2e08, 0x1239: 0x2e10, 0x123a: 0x2e10, 0x123b: 0x1f82,
-	0x123c: 0x1f82,
+	0x1200: 0x0236, 0x1201: 0x440e, 0x1202: 0x440e, 0x1203: 0x4414, 0x1204: 0x4414, 0x1205: 0x4456,
+	0x1206: 0x4456, 0x1207: 0x441a, 0x1208: 0x441a, 0x1209: 0x4462, 0x120a: 0x4462, 0x120b: 0x4462,
+	0x120c: 0x4462, 0x120d: 0x0239, 0x120e: 0x0239, 0x120f: 0x023c, 0x1210: 0x023c, 0x1211: 0x023c,
+	0x1212: 0x023c, 0x1213: 0x023f, 0x1214: 0x023f, 0x1215: 0x0242, 0x1216: 0x0242, 0x1217: 0x0242,
+	0x1218: 0x0242, 0x1219: 0x0245, 0x121a: 0x0245, 0x121b: 0x0245, 0x121c: 0x0245, 0x121d: 0x0248,
+	0x121e: 0x0248, 0x121f: 0x0248, 0x1220: 0x0248, 0x1221: 0x024b, 0x1222: 0x024b, 0x1223: 0x024b,
+	0x1224: 0x024b, 0x1225: 0x024e, 0x1226: 0x024e, 0x1227: 0x024e, 0x1228: 0x024e, 0x1229: 0x0251,
+	0x122a: 0x0251, 0x122b: 0x0254, 0x122c: 0x0254, 0x122d: 0x0257, 0x122e: 0x0257, 0x122f: 0x025a,
+	0x1230: 0x025a, 0x1231: 0x025d, 0x1232: 0x025d, 0x1233: 0x025d, 0x1234: 0x025d, 0x1235: 0x0260,
+	0x1236: 0x0260, 0x1237: 0x0260, 0x1238: 0x0260, 0x1239: 0x0263, 0x123a: 0x0263, 0x123b: 0x0263,
+	0x123c: 0x0263, 0x123d: 0x0266, 0x123e: 0x0266, 0x123f: 0x0266,
 	// Block 0x49, offset 0x1240
-	0x1240: 0x0081, 0x1241: 0x0083, 0x1242: 0x0085, 0x1243: 0x0087, 0x1244: 0x0089, 0x1245: 0x008b,
-	0x1246: 0x008d, 0x1247: 0x008f, 0x1248: 0x0091, 0x1249: 0x0093, 0x124a: 0x0095, 0x124b: 0x0097,
-	0x124c: 0x0099, 0x124d: 0x009b, 0x124e: 0x009d, 0x124f: 0x009f, 0x1250: 0x00a1, 0x1251: 0x00a3,
-	0x1252: 0x00a5, 0x1253: 0x00a7, 0x1254: 0x00a9, 0x1255: 0x00ab, 0x1256: 0x00ad, 0x1257: 0x00af,
-	0x1258: 0x00b1, 0x1259: 0x00b3, 0x125a: 0x00b5, 0x125b: 0x00b7, 0x125c: 0x00b9, 0x125d: 0x00bb,
-	0x125e: 0x00bd, 0x125f: 0x0477, 0x1260: 0x047b, 0x1261: 0x0487, 0x1262: 0x049b, 0x1263: 0x049f,
-	0x1264: 0x0483, 0x1265: 0x05ab, 0x1266: 0x05a3, 0x1267: 0x04c7, 0x1268: 0x04cf, 0x1269: 0x04d7,
-	0x126a: 0x04df, 0x126b: 0x04e7, 0x126c: 0x056b, 0x126d: 0x0573, 0x126e: 0x057b, 0x126f: 0x051f,
-	0x1270: 0x05af, 0x1271: 0x04cb, 0x1272: 0x04d3, 0x1273: 0x04db, 0x1274: 0x04e3, 0x1275: 0x04eb,
-	0x1276: 0x04ef, 0x1277: 0x04f3, 0x1278: 0x04f7, 0x1279: 0x04fb, 0x127a: 0x04ff, 0x127b: 0x0503,
-	0x127c: 0x0507, 0x127d: 0x050b, 0x127e: 0x050f, 0x127f: 0x0513,
+	0x1240: 0x0266, 0x1241: 0x0269, 0x1242: 0x0269, 0x1243: 0x0269, 0x1244: 0x0269, 0x1245: 0x026c,
+	0x1246: 0x026c, 0x1247: 0x026c, 0x1248: 0x026c, 0x1249: 0x026f, 0x124a: 0x026f, 0x124b: 0x026f,
+	0x124c: 0x026f, 0x124d: 0x0272, 0x124e: 0x0272, 0x124f: 0x0272, 0x1250: 0x0272, 0x1251: 0x0275,
+	0x1252: 0x0275, 0x1253: 0x0275, 0x1254: 0x0275, 0x1255: 0x0278, 0x1256: 0x0278, 0x1257: 0x0278,
+	0x1258: 0x0278, 0x1259: 0x027b, 0x125a: 0x027b, 0x125b: 0x027b, 0x125c: 0x027b, 0x125d: 0x027e,
+	0x125e: 0x027e, 0x125f: 0x027e, 0x1260: 0x027e, 0x1261: 0x0281, 0x1262: 0x0281, 0x1263: 0x0281,
+	0x1264: 0x0281, 0x1265: 0x0284, 0x1266: 0x0284, 0x1267: 0x0284, 0x1268: 0x0284, 0x1269: 0x0287,
+	0x126a: 0x0287, 0x126b: 0x0287, 0x126c: 0x0287, 0x126d: 0x028a, 0x126e: 0x028a, 0x126f: 0x028d,
+	0x1270: 0x028d, 0x1271: 0x0290, 0x1272: 0x0290, 0x1273: 0x0290, 0x1274: 0x0290, 0x1275: 0x2e00,
+	0x1276: 0x2e00, 0x1277: 0x2e08, 0x1278: 0x2e08, 0x1279: 0x2e10, 0x127a: 0x2e10, 0x127b: 0x1f82,
+	0x127c: 0x1f82,
 	// Block 0x4a, offset 0x1280
-	0x1280: 0x0517, 0x1281: 0x051b, 0x1282: 0x0523, 0x1283: 0x0527, 0x1284: 0x052b, 0x1285: 0x052f,
-	0x1286: 0x0533, 0x1287: 0x0537, 0x1288: 0x053b, 0x1289: 0x053f, 0x128a: 0x0543, 0x128b: 0x0547,
-	0x128c: 0x054b, 0x128d: 0x054f, 0x128e: 0x0553, 0x128f: 0x0557, 0x1290: 0x055b, 0x1291: 0x055f,
-	0x1292: 0x0563, 0x1293: 0x0567, 0x1294: 0x056f, 0x1295: 0x0577, 0x1296: 0x057f, 0x1297: 0x0583,
-	0x1298: 0x0587, 0x1299: 0x058b, 0x129a: 0x058f, 0x129b: 0x0593, 0x129c: 0x0597, 0x129d: 0x05a7,
-	0x129e: 0x4a5a, 0x129f: 0x4a60, 0x12a0: 0x03c3, 0x12a1: 0x0313, 0x12a2: 0x0317, 0x12a3: 0x4345,
-	0x12a4: 0x031b, 0x12a5: 0x434a, 0x12a6: 0x434f, 0x12a7: 0x031f, 0x12a8: 0x0323, 0x12a9: 0x0327,
-	0x12aa: 0x4354, 0x12ab: 0x4359, 0x12ac: 0x435e, 0x12ad: 0x4363, 0x12ae: 0x4368, 0x12af: 0x436d,
-	0x12b0: 0x0367, 0x12b1: 0x032b, 0x12b2: 0x032f, 0x12b3: 0x0333, 0x12b4: 0x037b, 0x12b5: 0x0337,
-	0x12b6: 0x033b, 0x12b7: 0x033f, 0x12b8: 0x0343, 0x12b9: 0x0347, 0x12ba: 0x034b, 0x12bb: 0x034f,
-	0x12bc: 0x0353, 0x12bd: 0x0357, 0x12be: 0x035b,
+	0x1280: 0x0081, 0x1281: 0x0083, 0x1282: 0x0085, 0x1283: 0x0087, 0x1284: 0x0089, 0x1285: 0x008b,
+	0x1286: 0x008d, 0x1287: 0x008f, 0x1288: 0x0091, 0x1289: 0x0093, 0x128a: 0x0095, 0x128b: 0x0097,
+	0x128c: 0x0099, 0x128d: 0x009b, 0x128e: 0x009d, 0x128f: 0x009f, 0x1290: 0x00a1, 0x1291: 0x00a3,
+	0x1292: 0x00a5, 0x1293: 0x00a7, 0x1294: 0x00a9, 0x1295: 0x00ab, 0x1296: 0x00ad, 0x1297: 0x00af,
+	0x1298: 0x00b1, 0x1299: 0x00b3, 0x129a: 0x00b5, 0x129b: 0x00b7, 0x129c: 0x00b9, 0x129d: 0x00bb,
+	0x129e: 0x00bd, 0x129f: 0x0477, 0x12a0: 0x047b, 0x12a1: 0x0487, 0x12a2: 0x049b, 0x12a3: 0x049f,
+	0x12a4: 0x0483, 0x12a5: 0x05ab, 0x12a6: 0x05a3, 0x12a7: 0x04c7, 0x12a8: 0x04cf, 0x12a9: 0x04d7,
+	0x12aa: 0x04df, 0x12ab: 0x04e7, 0x12ac: 0x056b, 0x12ad: 0x0573, 0x12ae: 0x057b, 0x12af: 0x051f,
+	0x12b0: 0x05af, 0x12b1: 0x04cb, 0x12b2: 0x04d3, 0x12b3: 0x04db, 0x12b4: 0x04e3, 0x12b5: 0x04eb,
+	0x12b6: 0x04ef, 0x12b7: 0x04f3, 0x12b8: 0x04f7, 0x12b9: 0x04fb, 0x12ba: 0x04ff, 0x12bb: 0x0503,
+	0x12bc: 0x0507, 0x12bd: 0x050b, 0x12be: 0x050f, 0x12bf: 0x0513,
 	// Block 0x4b, offset 0x12c0
-	0x12c2: 0x42dc, 0x12c3: 0x42e1, 0x12c4: 0x42e6, 0x12c5: 0x42eb,
-	0x12c6: 0x42f0, 0x12c7: 0x42f5, 0x12ca: 0x42fa, 0x12cb: 0x42ff,
-	0x12cc: 0x4304, 0x12cd: 0x4309, 0x12ce: 0x430e, 0x12cf: 0x4313,
-	0x12d2: 0x4318, 0x12d3: 0x431d, 0x12d4: 0x4322, 0x12d5: 0x4327, 0x12d6: 0x432c, 0x12d7: 0x4331,
-	0x12da: 0x4336, 0x12db: 0x433b, 0x12dc: 0x4340,
-	0x12e0: 0x00bf, 0x12e1: 0x00c2, 0x12e2: 0x00cb, 0x12e3: 0x4264,
-	0x12e4: 0x00c8, 0x12e5: 0x00c5, 0x12e6: 0x0447, 0x12e8: 0x046b, 0x12e9: 0x044b,
-	0x12ea: 0x044f, 0x12eb: 0x0453, 0x12ec: 0x0457, 0x12ed: 0x046f, 0x12ee: 0x0473,
+	0x12c0: 0x0517, 0x12c1: 0x051b, 0x12c2: 0x0523, 0x12c3: 0x0527, 0x12c4: 0x052b, 0x12c5: 0x052f,
+	0x12c6: 0x0533, 0x12c7: 0x0537, 0x12c8: 0x053b, 0x12c9: 0x053f, 0x12ca: 0x0543, 0x12cb: 0x0547,
+	0x12cc: 0x054b, 0x12cd: 0x054f, 0x12ce: 0x0553, 0x12cf: 0x0557, 0x12d0: 0x055b, 0x12d1: 0x055f,
+	0x12d2: 0x0563, 0x12d3: 0x0567, 0x12d4: 0x056f, 0x12d5: 0x0577, 0x12d6: 0x057f, 0x12d7: 0x0583,
+	0x12d8: 0x0587, 0x12d9: 0x058b, 0x12da: 0x058f, 0x12db: 0x0593, 0x12dc: 0x0597, 0x12dd: 0x05a7,
+	0x12de: 0x4a78, 0x12df: 0x4a7e, 0x12e0: 0x03c3, 0x12e1: 0x0313, 0x12e2: 0x0317, 0x12e3: 0x4a3b,
+	0x12e4: 0x031b, 0x12e5: 0x4a41, 0x12e6: 0x4a47, 0x12e7: 0x031f, 0x12e8: 0x0323, 0x12e9: 0x0327,
+	0x12ea: 0x4a4d, 0x12eb: 0x4a53, 0x12ec: 0x4a59, 0x12ed: 0x4a5f, 0x12ee: 0x4a65, 0x12ef: 0x4a6b,
+	0x12f0: 0x0367, 0x12f1: 0x032b, 0x12f2: 0x032f, 0x12f3: 0x0333, 0x12f4: 0x037b, 0x12f5: 0x0337,
+	0x12f6: 0x033b, 0x12f7: 0x033f, 0x12f8: 0x0343, 0x12f9: 0x0347, 0x12fa: 0x034b, 0x12fb: 0x034f,
+	0x12fc: 0x0353, 0x12fd: 0x0357, 0x12fe: 0x035b,
 	// Block 0x4c, offset 0x1300
-	0x1300: 0x0063, 0x1301: 0x0065, 0x1302: 0x0067, 0x1303: 0x0069, 0x1304: 0x006b, 0x1305: 0x006d,
-	0x1306: 0x006f, 0x1307: 0x0071, 0x1308: 0x0073, 0x1309: 0x0075, 0x130a: 0x0083, 0x130b: 0x0085,
-	0x130c: 0x0087, 0x130d: 0x0089, 0x130e: 0x008b, 0x130f: 0x008d, 0x1310: 0x008f, 0x1311: 0x0091,
-	0x1312: 0x0093, 0x1313: 0x0095, 0x1314: 0x0097, 0x1315: 0x0099, 0x1316: 0x009b, 0x1317: 0x009d,
-	0x1318: 0x009f, 0x1319: 0x00a1, 0x131a: 0x00a3, 0x131b: 0x00a5, 0x131c: 0x00a7, 0x131d: 0x00a9,
-	0x131e: 0x00ab, 0x131f: 0x00ad, 0x1320: 0x00af, 0x1321: 0x00b1, 0x1322: 0x00b3, 0x1323: 0x00b5,
-	0x1324: 0x00dd, 0x1325: 0x00f2, 0x1328: 0x0173, 0x1329: 0x0176,
-	0x132a: 0x0179, 0x132b: 0x017c, 0x132c: 0x017f, 0x132d: 0x0182, 0x132e: 0x0185, 0x132f: 0x0188,
-	0x1330: 0x018b, 0x1331: 0x018e, 0x1332: 0x0191, 0x1333: 0x0194, 0x1334: 0x0197, 0x1335: 0x019a,
-	0x1336: 0x019d, 0x1337: 0x01a0, 0x1338: 0x01a3, 0x1339: 0x0188, 0x133a: 0x01a6, 0x133b: 0x01a9,
-	0x133c: 0x01ac, 0x133d: 0x01af, 0x133e: 0x01b2, 0x133f: 0x01b5,
+	0x1302: 0x49bd, 0x1303: 0x49c3, 0x1304: 0x49c9, 0x1305: 0x49cf,
+	0x1306: 0x49d5, 0x1307: 0x49db, 0x130a: 0x49e1, 0x130b: 0x49e7,
+	0x130c: 0x49ed, 0x130d: 0x49f3, 0x130e: 0x49f9, 0x130f: 0x49ff,
+	0x1312: 0x4a05, 0x1313: 0x4a0b, 0x1314: 0x4a11, 0x1315: 0x4a17, 0x1316: 0x4a1d, 0x1317: 0x4a23,
+	0x131a: 0x4a29, 0x131b: 0x4a2f, 0x131c: 0x4a35,
+	0x1320: 0x00bf, 0x1321: 0x00c2, 0x1322: 0x00cb, 0x1323: 0x4264,
+	0x1324: 0x00c8, 0x1325: 0x00c5, 0x1326: 0x0447, 0x1328: 0x046b, 0x1329: 0x044b,
+	0x132a: 0x044f, 0x132b: 0x0453, 0x132c: 0x0457, 0x132d: 0x046f, 0x132e: 0x0473,
 	// Block 0x4d, offset 0x1340
-	0x1340: 0x01fd, 0x1341: 0x0200, 0x1342: 0x0203, 0x1343: 0x045b, 0x1344: 0x01c7, 0x1345: 0x01d0,
-	0x1346: 0x01d6, 0x1347: 0x01fa, 0x1348: 0x01eb, 0x1349: 0x01e8, 0x134a: 0x0206, 0x134b: 0x0209,
-	0x134e: 0x0021, 0x134f: 0x0023, 0x1350: 0x0025, 0x1351: 0x0027,
-	0x1352: 0x0029, 0x1353: 0x002b, 0x1354: 0x002d, 0x1355: 0x002f, 0x1356: 0x0031, 0x1357: 0x0033,
-	0x1358: 0x0021, 0x1359: 0x0023, 0x135a: 0x0025, 0x135b: 0x0027, 0x135c: 0x0029, 0x135d: 0x002b,
-	0x135e: 0x002d, 0x135f: 0x002f, 0x1360: 0x0031, 0x1361: 0x0033, 0x1362: 0x0021, 0x1363: 0x0023,
-	0x1364: 0x0025, 0x1365: 0x0027, 0x1366: 0x0029, 0x1367: 0x002b, 0x1368: 0x002d, 0x1369: 0x002f,
-	0x136a: 0x0031, 0x136b: 0x0033, 0x136c: 0x0021, 0x136d: 0x0023, 0x136e: 0x0025, 0x136f: 0x0027,
-	0x1370: 0x0029, 0x1371: 0x002b, 0x1372: 0x002d, 0x1373: 0x002f, 0x1374: 0x0031, 0x1375: 0x0033,
-	0x1376: 0x0021, 0x1377: 0x0023, 0x1378: 0x0025, 0x1379: 0x0027, 0x137a: 0x0029, 0x137b: 0x002b,
-	0x137c: 0x002d, 0x137d: 0x002f, 0x137e: 0x0031, 0x137f: 0x0033,
+	0x1340: 0x0063, 0x1341: 0x0065, 0x1342: 0x0067, 0x1343: 0x0069, 0x1344: 0x006b, 0x1345: 0x006d,
+	0x1346: 0x006f, 0x1347: 0x0071, 0x1348: 0x0073, 0x1349: 0x0075, 0x134a: 0x0083, 0x134b: 0x0085,
+	0x134c: 0x0087, 0x134d: 0x0089, 0x134e: 0x008b, 0x134f: 0x008d, 0x1350: 0x008f, 0x1351: 0x0091,
+	0x1352: 0x0093, 0x1353: 0x0095, 0x1354: 0x0097, 0x1355: 0x0099, 0x1356: 0x009b, 0x1357: 0x009d,
+	0x1358: 0x009f, 0x1359: 0x00a1, 0x135a: 0x00a3, 0x135b: 0x00a5, 0x135c: 0x00a7, 0x135d: 0x00a9,
+	0x135e: 0x00ab, 0x135f: 0x00ad, 0x1360: 0x00af, 0x1361: 0x00b1, 0x1362: 0x00b3, 0x1363: 0x00b5,
+	0x1364: 0x00dd, 0x1365: 0x00f2, 0x1368: 0x0173, 0x1369: 0x0176,
+	0x136a: 0x0179, 0x136b: 0x017c, 0x136c: 0x017f, 0x136d: 0x0182, 0x136e: 0x0185, 0x136f: 0x0188,
+	0x1370: 0x018b, 0x1371: 0x018e, 0x1372: 0x0191, 0x1373: 0x0194, 0x1374: 0x0197, 0x1375: 0x019a,
+	0x1376: 0x019d, 0x1377: 0x01a0, 0x1378: 0x01a3, 0x1379: 0x0188, 0x137a: 0x01a6, 0x137b: 0x01a9,
+	0x137c: 0x01ac, 0x137d: 0x01af, 0x137e: 0x01b2, 0x137f: 0x01b5,
 	// Block 0x4e, offset 0x1380
-	0x1380: 0x0239, 0x1381: 0x023c, 0x1382: 0x0248, 0x1383: 0x0251, 0x1385: 0x028a,
-	0x1386: 0x025a, 0x1387: 0x024b, 0x1388: 0x0269, 0x1389: 0x0290, 0x138a: 0x027b, 0x138b: 0x027e,
-	0x138c: 0x0281, 0x138d: 0x0284, 0x138e: 0x025d, 0x138f: 0x026f, 0x1390: 0x0275, 0x1391: 0x0263,
-	0x1392: 0x0278, 0x1393: 0x0257, 0x1394: 0x0260, 0x1395: 0x0242, 0x1396: 0x0245, 0x1397: 0x024e,
-	0x1398: 0x0254, 0x1399: 0x0266, 0x139a: 0x026c, 0x139b: 0x0272, 0x139c: 0x0293, 0x139d: 0x02e4,
-	0x139e: 0x02cc, 0x139f: 0x0296, 0x13a1: 0x023c, 0x13a2: 0x0248,
-	0x13a4: 0x0287, 0x13a7: 0x024b, 0x13a9: 0x0290,
-	0x13aa: 0x027b, 0x13ab: 0x027e, 0x13ac: 0x0281, 0x13ad: 0x0284, 0x13ae: 0x025d, 0x13af: 0x026f,
-	0x13b0: 0x0275, 0x13b1: 0x0263, 0x13b2: 0x0278, 0x13b4: 0x0260, 0x13b5: 0x0242,
-	0x13b6: 0x0245, 0x13b7: 0x024e, 0x13b9: 0x0266, 0x13bb: 0x0272,
+	0x1380: 0x01fd, 0x1381: 0x0200, 0x1382: 0x0203, 0x1383: 0x045b, 0x1384: 0x01c7, 0x1385: 0x01d0,
+	0x1386: 0x01d6, 0x1387: 0x01fa, 0x1388: 0x01eb, 0x1389: 0x01e8, 0x138a: 0x0206, 0x138b: 0x0209,
+	0x138e: 0x0021, 0x138f: 0x0023, 0x1390: 0x0025, 0x1391: 0x0027,
+	0x1392: 0x0029, 0x1393: 0x002b, 0x1394: 0x002d, 0x1395: 0x002f, 0x1396: 0x0031, 0x1397: 0x0033,
+	0x1398: 0x0021, 0x1399: 0x0023, 0x139a: 0x0025, 0x139b: 0x0027, 0x139c: 0x0029, 0x139d: 0x002b,
+	0x139e: 0x002d, 0x139f: 0x002f, 0x13a0: 0x0031, 0x13a1: 0x0033, 0x13a2: 0x0021, 0x13a3: 0x0023,
+	0x13a4: 0x0025, 0x13a5: 0x0027, 0x13a6: 0x0029, 0x13a7: 0x002b, 0x13a8: 0x002d, 0x13a9: 0x002f,
+	0x13aa: 0x0031, 0x13ab: 0x0033, 0x13ac: 0x0021, 0x13ad: 0x0023, 0x13ae: 0x0025, 0x13af: 0x0027,
+	0x13b0: 0x0029, 0x13b1: 0x002b, 0x13b2: 0x002d, 0x13b3: 0x002f, 0x13b4: 0x0031, 0x13b5: 0x0033,
+	0x13b6: 0x0021, 0x13b7: 0x0023, 0x13b8: 0x0025, 0x13b9: 0x0027, 0x13ba: 0x0029, 0x13bb: 0x002b,
+	0x13bc: 0x002d, 0x13bd: 0x002f, 0x13be: 0x0031, 0x13bf: 0x0033,
 	// Block 0x4f, offset 0x13c0
-	0x13c2: 0x0248,
-	0x13c7: 0x024b, 0x13c9: 0x0290, 0x13cb: 0x027e,
-	0x13cd: 0x0284, 0x13ce: 0x025d, 0x13cf: 0x026f, 0x13d1: 0x0263,
-	0x13d2: 0x0278, 0x13d4: 0x0260, 0x13d7: 0x024e,
-	0x13d9: 0x0266, 0x13db: 0x0272, 0x13dd: 0x02e4,
-	0x13df: 0x0296, 0x13e1: 0x023c, 0x13e2: 0x0248,
-	0x13e4: 0x0287, 0x13e7: 0x024b, 0x13e8: 0x0269, 0x13e9: 0x0290,
-	0x13ea: 0x027b, 0x13ec: 0x0281, 0x13ed: 0x0284, 0x13ee: 0x025d, 0x13ef: 0x026f,
+	0x13c0: 0x0239, 0x13c1: 0x023c, 0x13c2: 0x0248, 0x13c3: 0x0251, 0x13c5: 0x028a,
+	0x13c6: 0x025a, 0x13c7: 0x024b, 0x13c8: 0x0269, 0x13c9: 0x0290, 0x13ca: 0x027b, 0x13cb: 0x027e,
+	0x13cc: 0x0281, 0x13cd: 0x0284, 0x13ce: 0x025d, 0x13cf: 0x026f, 0x13d0: 0x0275, 0x13d1: 0x0263,
+	0x13d2: 0x0278, 0x13d3: 0x0257, 0x13d4: 0x0260, 0x13d5: 0x0242, 0x13d6: 0x0245, 0x13d7: 0x024e,
+	0x13d8: 0x0254, 0x13d9: 0x0266, 0x13da: 0x026c, 0x13db: 0x0272, 0x13dc: 0x0293, 0x13dd: 0x02e4,
+	0x13de: 0x02cc, 0x13df: 0x0296, 0x13e1: 0x023c, 0x13e2: 0x0248,
+	0x13e4: 0x0287, 0x13e7: 0x024b, 0x13e9: 0x0290,
+	0x13ea: 0x027b, 0x13eb: 0x027e, 0x13ec: 0x0281, 0x13ed: 0x0284, 0x13ee: 0x025d, 0x13ef: 0x026f,
 	0x13f0: 0x0275, 0x13f1: 0x0263, 0x13f2: 0x0278, 0x13f4: 0x0260, 0x13f5: 0x0242,
-	0x13f6: 0x0245, 0x13f7: 0x024e, 0x13f9: 0x0266, 0x13fa: 0x026c, 0x13fb: 0x0272,
-	0x13fc: 0x0293, 0x13fe: 0x02cc,
+	0x13f6: 0x0245, 0x13f7: 0x024e, 0x13f9: 0x0266, 0x13fb: 0x0272,
 	// Block 0x50, offset 0x1400
-	0x1400: 0x0239, 0x1401: 0x023c, 0x1402: 0x0248, 0x1403: 0x0251, 0x1404: 0x0287, 0x1405: 0x028a,
-	0x1406: 0x025a, 0x1407: 0x024b, 0x1408: 0x0269, 0x1409: 0x0290, 0x140b: 0x027e,
-	0x140c: 0x0281, 0x140d: 0x0284, 0x140e: 0x025d, 0x140f: 0x026f, 0x1410: 0x0275, 0x1411: 0x0263,
-	0x1412: 0x0278, 0x1413: 0x0257, 0x1414: 0x0260, 0x1415: 0x0242, 0x1416: 0x0245, 0x1417: 0x024e,
-	0x1418: 0x0254, 0x1419: 0x0266, 0x141a: 0x026c, 0x141b: 0x0272,
-	0x1421: 0x023c, 0x1422: 0x0248, 0x1423: 0x0251,
-	0x1425: 0x028a, 0x1426: 0x025a, 0x1427: 0x024b, 0x1428: 0x0269, 0x1429: 0x0290,
-	0x142b: 0x027e, 0x142c: 0x0281, 0x142d: 0x0284, 0x142e: 0x025d, 0x142f: 0x026f,
-	0x1430: 0x0275, 0x1431: 0x0263, 0x1432: 0x0278, 0x1433: 0x0257, 0x1434: 0x0260, 0x1435: 0x0242,
-	0x1436: 0x0245, 0x1437: 0x024e, 0x1438: 0x0254, 0x1439: 0x0266, 0x143a: 0x026c, 0x143b: 0x0272,
+	0x1402: 0x0248,
+	0x1407: 0x024b, 0x1409: 0x0290, 0x140b: 0x027e,
+	0x140d: 0x0284, 0x140e: 0x025d, 0x140f: 0x026f, 0x1411: 0x0263,
+	0x1412: 0x0278, 0x1414: 0x0260, 0x1417: 0x024e,
+	0x1419: 0x0266, 0x141b: 0x0272, 0x141d: 0x02e4,
+	0x141f: 0x0296, 0x1421: 0x023c, 0x1422: 0x0248,
+	0x1424: 0x0287, 0x1427: 0x024b, 0x1428: 0x0269, 0x1429: 0x0290,
+	0x142a: 0x027b, 0x142c: 0x0281, 0x142d: 0x0284, 0x142e: 0x025d, 0x142f: 0x026f,
+	0x1430: 0x0275, 0x1431: 0x0263, 0x1432: 0x0278, 0x1434: 0x0260, 0x1435: 0x0242,
+	0x1436: 0x0245, 0x1437: 0x024e, 0x1439: 0x0266, 0x143a: 0x026c, 0x143b: 0x0272,
+	0x143c: 0x0293, 0x143e: 0x02cc,
 	// Block 0x51, offset 0x1440
-	0x1440: 0x1879, 0x1441: 0x1876, 0x1442: 0x187c, 0x1443: 0x18a0, 0x1444: 0x18c4, 0x1445: 0x18e8,
-	0x1446: 0x190c, 0x1447: 0x1915, 0x1448: 0x191b, 0x1449: 0x1921, 0x144a: 0x1927,
-	0x1450: 0x1a8c, 0x1451: 0x1a90,
-	0x1452: 0x1a94, 0x1453: 0x1a98, 0x1454: 0x1a9c, 0x1455: 0x1aa0, 0x1456: 0x1aa4, 0x1457: 0x1aa8,
-	0x1458: 0x1aac, 0x1459: 0x1ab0, 0x145a: 0x1ab4, 0x145b: 0x1ab8, 0x145c: 0x1abc, 0x145d: 0x1ac0,
-	0x145e: 0x1ac4, 0x145f: 0x1ac8, 0x1460: 0x1acc, 0x1461: 0x1ad0, 0x1462: 0x1ad4, 0x1463: 0x1ad8,
-	0x1464: 0x1adc, 0x1465: 0x1ae0, 0x1466: 0x1ae4, 0x1467: 0x1ae8, 0x1468: 0x1aec, 0x1469: 0x1af0,
-	0x146a: 0x271e, 0x146b: 0x0047, 0x146c: 0x0065, 0x146d: 0x193c, 0x146e: 0x19b1,
-	0x1470: 0x0043, 0x1471: 0x0045, 0x1472: 0x0047, 0x1473: 0x0049, 0x1474: 0x004b, 0x1475: 0x004d,
-	0x1476: 0x004f, 0x1477: 0x0051, 0x1478: 0x0053, 0x1479: 0x0055, 0x147a: 0x0057, 0x147b: 0x0059,
-	0x147c: 0x005b, 0x147d: 0x005d, 0x147e: 0x005f, 0x147f: 0x0061,
+	0x1440: 0x0239, 0x1441: 0x023c, 0x1442: 0x0248, 0x1443: 0x0251, 0x1444: 0x0287, 0x1445: 0x028a,
+	0x1446: 0x025a, 0x1447: 0x024b, 0x1448: 0x0269, 0x1449: 0x0290, 0x144b: 0x027e,
+	0x144c: 0x0281, 0x144d: 0x0284, 0x144e: 0x025d, 0x144f: 0x026f, 0x1450: 0x0275, 0x1451: 0x0263,
+	0x1452: 0x0278, 0x1453: 0x0257, 0x1454: 0x0260, 0x1455: 0x0242, 0x1456: 0x0245, 0x1457: 0x024e,
+	0x1458: 0x0254, 0x1459: 0x0266, 0x145a: 0x026c, 0x145b: 0x0272,
+	0x1461: 0x023c, 0x1462: 0x0248, 0x1463: 0x0251,
+	0x1465: 0x028a, 0x1466: 0x025a, 0x1467: 0x024b, 0x1468: 0x0269, 0x1469: 0x0290,
+	0x146b: 0x027e, 0x146c: 0x0281, 0x146d: 0x0284, 0x146e: 0x025d, 0x146f: 0x026f,
+	0x1470: 0x0275, 0x1471: 0x0263, 0x1472: 0x0278, 0x1473: 0x0257, 0x1474: 0x0260, 0x1475: 0x0242,
+	0x1476: 0x0245, 0x1477: 0x024e, 0x1478: 0x0254, 0x1479: 0x0266, 0x147a: 0x026c, 0x147b: 0x0272,
 	// Block 0x52, offset 0x1480
-	0x1480: 0x26ad, 0x1481: 0x26c2, 0x1482: 0x0503,
-	0x1490: 0x0c0f, 0x1491: 0x0a47,
-	0x1492: 0x08d3, 0x1493: 0x465a, 0x1494: 0x071b, 0x1495: 0x09ef, 0x1496: 0x132f, 0x1497: 0x09ff,
-	0x1498: 0x0727, 0x1499: 0x0cd7, 0x149a: 0x0eaf, 0x149b: 0x0caf, 0x149c: 0x0827, 0x149d: 0x0b6b,
-	0x149e: 0x07bf, 0x149f: 0x0cb7, 0x14a0: 0x0813, 0x14a1: 0x1117, 0x14a2: 0x0f83, 0x14a3: 0x138b,
-	0x14a4: 0x09d3, 0x14a5: 0x090b, 0x14a6: 0x0e63, 0x14a7: 0x0c1b, 0x14a8: 0x0c47, 0x14a9: 0x06bf,
-	0x14aa: 0x06cb, 0x14ab: 0x140b, 0x14ac: 0x0adb, 0x14ad: 0x06e7, 0x14ae: 0x08ef, 0x14af: 0x0c3b,
-	0x14b0: 0x13b3, 0x14b1: 0x0c13, 0x14b2: 0x106f, 0x14b3: 0x10ab, 0x14b4: 0x08f7, 0x14b5: 0x0e43,
-	0x14b6: 0x0d0b, 0x14b7: 0x0d07, 0x14b8: 0x0f97, 0x14b9: 0x082b, 0x14ba: 0x0957, 0x14bb: 0x1443,
+	0x1480: 0x1879, 0x1481: 0x1876, 0x1482: 0x187c, 0x1483: 0x18a0, 0x1484: 0x18c4, 0x1485: 0x18e8,
+	0x1486: 0x190c, 0x1487: 0x1915, 0x1488: 0x191b, 0x1489: 0x1921, 0x148a: 0x1927,
+	0x1490: 0x1a8c, 0x1491: 0x1a90,
+	0x1492: 0x1a94, 0x1493: 0x1a98, 0x1494: 0x1a9c, 0x1495: 0x1aa0, 0x1496: 0x1aa4, 0x1497: 0x1aa8,
+	0x1498: 0x1aac, 0x1499: 0x1ab0, 0x149a: 0x1ab4, 0x149b: 0x1ab8, 0x149c: 0x1abc, 0x149d: 0x1ac0,
+	0x149e: 0x1ac4, 0x149f: 0x1ac8, 0x14a0: 0x1acc, 0x14a1: 0x1ad0, 0x14a2: 0x1ad4, 0x14a3: 0x1ad8,
+	0x14a4: 0x1adc, 0x14a5: 0x1ae0, 0x14a6: 0x1ae4, 0x14a7: 0x1ae8, 0x14a8: 0x1aec, 0x14a9: 0x1af0,
+	0x14aa: 0x271e, 0x14ab: 0x0047, 0x14ac: 0x0065, 0x14ad: 0x193c, 0x14ae: 0x19b1,
+	0x14b0: 0x0043, 0x14b1: 0x0045, 0x14b2: 0x0047, 0x14b3: 0x0049, 0x14b4: 0x004b, 0x14b5: 0x004d,
+	0x14b6: 0x004f, 0x14b7: 0x0051, 0x14b8: 0x0053, 0x14b9: 0x0055, 0x14ba: 0x0057, 0x14bb: 0x0059,
+	0x14bc: 0x005b, 0x14bd: 0x005d, 0x14be: 0x005f, 0x14bf: 0x0061,
 	// Block 0x53, offset 0x14c0
-	0x14c0: 0x06fb, 0x14c1: 0x06f3, 0x14c2: 0x0703, 0x14c3: 0x1647, 0x14c4: 0x0747, 0x14c5: 0x0757,
-	0x14c6: 0x075b, 0x14c7: 0x0763, 0x14c8: 0x076b, 0x14c9: 0x076f, 0x14ca: 0x077b, 0x14cb: 0x0773,
-	0x14cc: 0x05b3, 0x14cd: 0x165b, 0x14ce: 0x078f, 0x14cf: 0x0793, 0x14d0: 0x0797, 0x14d1: 0x07b3,
-	0x14d2: 0x164c, 0x14d3: 0x05b7, 0x14d4: 0x079f, 0x14d5: 0x07bf, 0x14d6: 0x1656, 0x14d7: 0x07cf,
-	0x14d8: 0x07d7, 0x14d9: 0x0737, 0x14da: 0x07df, 0x14db: 0x07e3, 0x14dc: 0x1831, 0x14dd: 0x07ff,
-	0x14de: 0x0807, 0x14df: 0x05bf, 0x14e0: 0x081f, 0x14e1: 0x0823, 0x14e2: 0x082b, 0x14e3: 0x082f,
-	0x14e4: 0x05c3, 0x14e5: 0x0847, 0x14e6: 0x084b, 0x14e7: 0x0857, 0x14e8: 0x0863, 0x14e9: 0x0867,
-	0x14ea: 0x086b, 0x14eb: 0x0873, 0x14ec: 0x0893, 0x14ed: 0x0897, 0x14ee: 0x089f, 0x14ef: 0x08af,
-	0x14f0: 0x08b7, 0x14f1: 0x08bb, 0x14f2: 0x08bb, 0x14f3: 0x08bb, 0x14f4: 0x166a, 0x14f5: 0x0e93,
-	0x14f6: 0x08cf, 0x14f7: 0x08d7, 0x14f8: 0x166f, 0x14f9: 0x08e3, 0x14fa: 0x08eb, 0x14fb: 0x08f3,
-	0x14fc: 0x091b, 0x14fd: 0x0907, 0x14fe: 0x0913, 0x14ff: 0x0917,
+	0x14c0: 0x26ad, 0x14c1: 0x26c2, 0x14c2: 0x0503,
+	0x14d0: 0x0c0f, 0x14d1: 0x0a47,
+	0x14d2: 0x08d3, 0x14d3: 0x45c4, 0x14d4: 0x071b, 0x14d5: 0x09ef, 0x14d6: 0x132f, 0x14d7: 0x09ff,
+	0x14d8: 0x0727, 0x14d9: 0x0cd7, 0x14da: 0x0eaf, 0x14db: 0x0caf, 0x14dc: 0x0827, 0x14dd: 0x0b6b,
+	0x14de: 0x07bf, 0x14df: 0x0cb7, 0x14e0: 0x0813, 0x14e1: 0x1117, 0x14e2: 0x0f83, 0x14e3: 0x138b,
+	0x14e4: 0x09d3, 0x14e5: 0x090b, 0x14e6: 0x0e63, 0x14e7: 0x0c1b, 0x14e8: 0x0c47, 0x14e9: 0x06bf,
+	0x14ea: 0x06cb, 0x14eb: 0x140b, 0x14ec: 0x0adb, 0x14ed: 0x06e7, 0x14ee: 0x08ef, 0x14ef: 0x0c3b,
+	0x14f0: 0x13b3, 0x14f1: 0x0c13, 0x14f2: 0x106f, 0x14f3: 0x10ab, 0x14f4: 0x08f7, 0x14f5: 0x0e43,
+	0x14f6: 0x0d0b, 0x14f7: 0x0d07, 0x14f8: 0x0f97, 0x14f9: 0x082b, 0x14fa: 0x0957, 0x14fb: 0x1443,
 	// Block 0x54, offset 0x1500
-	0x1500: 0x091f, 0x1501: 0x0927, 0x1502: 0x092b, 0x1503: 0x0933, 0x1504: 0x093b, 0x1505: 0x093f,
-	0x1506: 0x093f, 0x1507: 0x0947, 0x1508: 0x094f, 0x1509: 0x0953, 0x150a: 0x095f, 0x150b: 0x0983,
-	0x150c: 0x0967, 0x150d: 0x0987, 0x150e: 0x096b, 0x150f: 0x0973, 0x1510: 0x080b, 0x1511: 0x09cf,
-	0x1512: 0x0997, 0x1513: 0x099b, 0x1514: 0x099f, 0x1515: 0x0993, 0x1516: 0x09a7, 0x1517: 0x09a3,
-	0x1518: 0x09bb, 0x1519: 0x1674, 0x151a: 0x09d7, 0x151b: 0x09db, 0x151c: 0x09e3, 0x151d: 0x09ef,
-	0x151e: 0x09f7, 0x151f: 0x0a13, 0x1520: 0x1679, 0x1521: 0x167e, 0x1522: 0x0a1f, 0x1523: 0x0a23,
-	0x1524: 0x0a27, 0x1525: 0x0a1b, 0x1526: 0x0a2f, 0x1527: 0x05c7, 0x1528: 0x05cb, 0x1529: 0x0a37,
-	0x152a: 0x0a3f, 0x152b: 0x0a3f, 0x152c: 0x1683, 0x152d: 0x0a5b, 0x152e: 0x0a5f, 0x152f: 0x0a63,
-	0x1530: 0x0a6b, 0x1531: 0x1688, 0x1532: 0x0a73, 0x1533: 0x0a77, 0x1534: 0x0b4f, 0x1535: 0x0a7f,
-	0x1536: 0x05cf, 0x1537: 0x0a8b, 0x1538: 0x0a9b, 0x1539: 0x0aa7, 0x153a: 0x0aa3, 0x153b: 0x1692,
-	0x153c: 0x0aaf, 0x153d: 0x1697, 0x153e: 0x0abb, 0x153f: 0x0ab7,
+	0x1500: 0x06fb, 0x1501: 0x06f3, 0x1502: 0x0703, 0x1503: 0x1647, 0x1504: 0x0747, 0x1505: 0x0757,
+	0x1506: 0x075b, 0x1507: 0x0763, 0x1508: 0x076b, 0x1509: 0x076f, 0x150a: 0x077b, 0x150b: 0x0773,
+	0x150c: 0x05b3, 0x150d: 0x165b, 0x150e: 0x078f, 0x150f: 0x0793, 0x1510: 0x0797, 0x1511: 0x07b3,
+	0x1512: 0x164c, 0x1513: 0x05b7, 0x1514: 0x079f, 0x1515: 0x07bf, 0x1516: 0x1656, 0x1517: 0x07cf,
+	0x1518: 0x07d7, 0x1519: 0x0737, 0x151a: 0x07df, 0x151b: 0x07e3, 0x151c: 0x1831, 0x151d: 0x07ff,
+	0x151e: 0x0807, 0x151f: 0x05bf, 0x1520: 0x081f, 0x1521: 0x0823, 0x1522: 0x082b, 0x1523: 0x082f,
+	0x1524: 0x05c3, 0x1525: 0x0847, 0x1526: 0x084b, 0x1527: 0x0857, 0x1528: 0x0863, 0x1529: 0x0867,
+	0x152a: 0x086b, 0x152b: 0x0873, 0x152c: 0x0893, 0x152d: 0x0897, 0x152e: 0x089f, 0x152f: 0x08af,
+	0x1530: 0x08b7, 0x1531: 0x08bb, 0x1532: 0x08bb, 0x1533: 0x08bb, 0x1534: 0x166a, 0x1535: 0x0e93,
+	0x1536: 0x08cf, 0x1537: 0x08d7, 0x1538: 0x166f, 0x1539: 0x08e3, 0x153a: 0x08eb, 0x153b: 0x08f3,
+	0x153c: 0x091b, 0x153d: 0x0907, 0x153e: 0x0913, 0x153f: 0x0917,
 	// Block 0x55, offset 0x1540
-	0x1540: 0x0abf, 0x1541: 0x0acf, 0x1542: 0x0ad3, 0x1543: 0x05d3, 0x1544: 0x0ae3, 0x1545: 0x0aeb,
-	0x1546: 0x0aef, 0x1547: 0x0af3, 0x1548: 0x05d7, 0x1549: 0x169c, 0x154a: 0x05db, 0x154b: 0x0b0f,
-	0x154c: 0x0b13, 0x154d: 0x0b17, 0x154e: 0x0b1f, 0x154f: 0x1863, 0x1550: 0x0b37, 0x1551: 0x16a6,
-	0x1552: 0x16a6, 0x1553: 0x11d7, 0x1554: 0x0b47, 0x1555: 0x0b47, 0x1556: 0x05df, 0x1557: 0x16c9,
-	0x1558: 0x179b, 0x1559: 0x0b57, 0x155a: 0x0b5f, 0x155b: 0x05e3, 0x155c: 0x0b73, 0x155d: 0x0b83,
-	0x155e: 0x0b87, 0x155f: 0x0b8f, 0x1560: 0x0b9f, 0x1561: 0x05eb, 0x1562: 0x05e7, 0x1563: 0x0ba3,
-	0x1564: 0x16ab, 0x1565: 0x0ba7, 0x1566: 0x0bbb, 0x1567: 0x0bbf, 0x1568: 0x0bc3, 0x1569: 0x0bbf,
-	0x156a: 0x0bcf, 0x156b: 0x0bd3, 0x156c: 0x0be3, 0x156d: 0x0bdb, 0x156e: 0x0bdf, 0x156f: 0x0be7,
-	0x1570: 0x0beb, 0x1571: 0x0bef, 0x1572: 0x0bfb, 0x1573: 0x0bff, 0x1574: 0x0c17, 0x1575: 0x0c1f,
-	0x1576: 0x0c2f, 0x1577: 0x0c43, 0x1578: 0x16ba, 0x1579: 0x0c3f, 0x157a: 0x0c33, 0x157b: 0x0c4b,
-	0x157c: 0x0c53, 0x157d: 0x0c67, 0x157e: 0x16bf, 0x157f: 0x0c6f,
+	0x1540: 0x091f, 0x1541: 0x0927, 0x1542: 0x092b, 0x1543: 0x0933, 0x1544: 0x093b, 0x1545: 0x093f,
+	0x1546: 0x093f, 0x1547: 0x0947, 0x1548: 0x094f, 0x1549: 0x0953, 0x154a: 0x095f, 0x154b: 0x0983,
+	0x154c: 0x0967, 0x154d: 0x0987, 0x154e: 0x096b, 0x154f: 0x0973, 0x1550: 0x080b, 0x1551: 0x09cf,
+	0x1552: 0x0997, 0x1553: 0x099b, 0x1554: 0x099f, 0x1555: 0x0993, 0x1556: 0x09a7, 0x1557: 0x09a3,
+	0x1558: 0x09bb, 0x1559: 0x1674, 0x155a: 0x09d7, 0x155b: 0x09db, 0x155c: 0x09e3, 0x155d: 0x09ef,
+	0x155e: 0x09f7, 0x155f: 0x0a13, 0x1560: 0x1679, 0x1561: 0x167e, 0x1562: 0x0a1f, 0x1563: 0x0a23,
+	0x1564: 0x0a27, 0x1565: 0x0a1b, 0x1566: 0x0a2f, 0x1567: 0x05c7, 0x1568: 0x05cb, 0x1569: 0x0a37,
+	0x156a: 0x0a3f, 0x156b: 0x0a3f, 0x156c: 0x1683, 0x156d: 0x0a5b, 0x156e: 0x0a5f, 0x156f: 0x0a63,
+	0x1570: 0x0a6b, 0x1571: 0x1688, 0x1572: 0x0a73, 0x1573: 0x0a77, 0x1574: 0x0b4f, 0x1575: 0x0a7f,
+	0x1576: 0x05cf, 0x1577: 0x0a8b, 0x1578: 0x0a9b, 0x1579: 0x0aa7, 0x157a: 0x0aa3, 0x157b: 0x1692,
+	0x157c: 0x0aaf, 0x157d: 0x1697, 0x157e: 0x0abb, 0x157f: 0x0ab7,
 	// Block 0x56, offset 0x1580
-	0x1580: 0x0c63, 0x1581: 0x0c5b, 0x1582: 0x05ef, 0x1583: 0x0c77, 0x1584: 0x0c7f, 0x1585: 0x0c87,
-	0x1586: 0x0c7b, 0x1587: 0x05f3, 0x1588: 0x0c97, 0x1589: 0x0c9f, 0x158a: 0x16c4, 0x158b: 0x0ccb,
-	0x158c: 0x0cff, 0x158d: 0x0cdb, 0x158e: 0x05ff, 0x158f: 0x0ce7, 0x1590: 0x05fb, 0x1591: 0x05f7,
-	0x1592: 0x07c3, 0x1593: 0x07c7, 0x1594: 0x0d03, 0x1595: 0x0ceb, 0x1596: 0x11ab, 0x1597: 0x0663,
-	0x1598: 0x0d0f, 0x1599: 0x0d13, 0x159a: 0x0d17, 0x159b: 0x0d2b, 0x159c: 0x0d23, 0x159d: 0x16dd,
-	0x159e: 0x0603, 0x159f: 0x0d3f, 0x15a0: 0x0d33, 0x15a1: 0x0d4f, 0x15a2: 0x0d57, 0x15a3: 0x16e7,
-	0x15a4: 0x0d5b, 0x15a5: 0x0d47, 0x15a6: 0x0d63, 0x15a7: 0x0607, 0x15a8: 0x0d67, 0x15a9: 0x0d6b,
-	0x15aa: 0x0d6f, 0x15ab: 0x0d7b, 0x15ac: 0x16ec, 0x15ad: 0x0d83, 0x15ae: 0x060b, 0x15af: 0x0d8f,
-	0x15b0: 0x16f1, 0x15b1: 0x0d93, 0x15b2: 0x060f, 0x15b3: 0x0d9f, 0x15b4: 0x0dab, 0x15b5: 0x0db7,
-	0x15b6: 0x0dbb, 0x15b7: 0x16f6, 0x15b8: 0x168d, 0x15b9: 0x16fb, 0x15ba: 0x0ddb, 0x15bb: 0x1700,
-	0x15bc: 0x0de7, 0x15bd: 0x0def, 0x15be: 0x0ddf, 0x15bf: 0x0dfb,
+	0x1580: 0x0abf, 0x1581: 0x0acf, 0x1582: 0x0ad3, 0x1583: 0x05d3, 0x1584: 0x0ae3, 0x1585: 0x0aeb,
+	0x1586: 0x0aef, 0x1587: 0x0af3, 0x1588: 0x05d7, 0x1589: 0x169c, 0x158a: 0x05db, 0x158b: 0x0b0f,
+	0x158c: 0x0b13, 0x158d: 0x0b17, 0x158e: 0x0b1f, 0x158f: 0x1863, 0x1590: 0x0b37, 0x1591: 0x16a6,
+	0x1592: 0x16a6, 0x1593: 0x11d7, 0x1594: 0x0b47, 0x1595: 0x0b47, 0x1596: 0x05df, 0x1597: 0x16c9,
+	0x1598: 0x179b, 0x1599: 0x0b57, 0x159a: 0x0b5f, 0x159b: 0x05e3, 0x159c: 0x0b73, 0x159d: 0x0b83,
+	0x159e: 0x0b87, 0x159f: 0x0b8f, 0x15a0: 0x0b9f, 0x15a1: 0x05eb, 0x15a2: 0x05e7, 0x15a3: 0x0ba3,
+	0x15a4: 0x16ab, 0x15a5: 0x0ba7, 0x15a6: 0x0bbb, 0x15a7: 0x0bbf, 0x15a8: 0x0bc3, 0x15a9: 0x0bbf,
+	0x15aa: 0x0bcf, 0x15ab: 0x0bd3, 0x15ac: 0x0be3, 0x15ad: 0x0bdb, 0x15ae: 0x0bdf, 0x15af: 0x0be7,
+	0x15b0: 0x0beb, 0x15b1: 0x0bef, 0x15b2: 0x0bfb, 0x15b3: 0x0bff, 0x15b4: 0x0c17, 0x15b5: 0x0c1f,
+	0x15b6: 0x0c2f, 0x15b7: 0x0c43, 0x15b8: 0x16ba, 0x15b9: 0x0c3f, 0x15ba: 0x0c33, 0x15bb: 0x0c4b,
+	0x15bc: 0x0c53, 0x15bd: 0x0c67, 0x15be: 0x16bf, 0x15bf: 0x0c6f,
 	// Block 0x57, offset 0x15c0
-	0x15c0: 0x0e0b, 0x15c1: 0x0e1b, 0x15c2: 0x0e0f, 0x15c3: 0x0e13, 0x15c4: 0x0e1f, 0x15c5: 0x0e23,
-	0x15c6: 0x1705, 0x15c7: 0x0e07, 0x15c8: 0x0e3b, 0x15c9: 0x0e3f, 0x15ca: 0x0613, 0x15cb: 0x0e53,
-	0x15cc: 0x0e4f, 0x15cd: 0x170a, 0x15ce: 0x0e33, 0x15cf: 0x0e6f, 0x15d0: 0x170f, 0x15d1: 0x1714,
-	0x15d2: 0x0e73, 0x15d3: 0x0e87, 0x15d4: 0x0e83, 0x15d5: 0x0e7f, 0x15d6: 0x0617, 0x15d7: 0x0e8b,
-	0x15d8: 0x0e9b, 0x15d9: 0x0e97, 0x15da: 0x0ea3, 0x15db: 0x1651, 0x15dc: 0x0eb3, 0x15dd: 0x1719,
-	0x15de: 0x0ebf, 0x15df: 0x1723, 0x15e0: 0x0ed3, 0x15e1: 0x0edf, 0x15e2: 0x0ef3, 0x15e3: 0x1728,
-	0x15e4: 0x0f07, 0x15e5: 0x0f0b, 0x15e6: 0x172d, 0x15e7: 0x1732, 0x15e8: 0x0f27, 0x15e9: 0x0f37,
-	0x15ea: 0x061b, 0x15eb: 0x0f3b, 0x15ec: 0x061f, 0x15ed: 0x061f, 0x15ee: 0x0f53, 0x15ef: 0x0f57,
-	0x15f0: 0x0f5f, 0x15f1: 0x0f63, 0x15f2: 0x0f6f, 0x15f3: 0x0623, 0x15f4: 0x0f87, 0x15f5: 0x1737,
-	0x15f6: 0x0fa3, 0x15f7: 0x173c, 0x15f8: 0x0faf, 0x15f9: 0x16a1, 0x15fa: 0x0fbf, 0x15fb: 0x1741,
-	0x15fc: 0x1746, 0x15fd: 0x174b, 0x15fe: 0x0627, 0x15ff: 0x062b,
+	0x15c0: 0x0c63, 0x15c1: 0x0c5b, 0x15c2: 0x05ef, 0x15c3: 0x0c77, 0x15c4: 0x0c7f, 0x15c5: 0x0c87,
+	0x15c6: 0x0c7b, 0x15c7: 0x05f3, 0x15c8: 0x0c97, 0x15c9: 0x0c9f, 0x15ca: 0x16c4, 0x15cb: 0x0ccb,
+	0x15cc: 0x0cff, 0x15cd: 0x0cdb, 0x15ce: 0x05ff, 0x15cf: 0x0ce7, 0x15d0: 0x05fb, 0x15d1: 0x05f7,
+	0x15d2: 0x07c3, 0x15d3: 0x07c7, 0x15d4: 0x0d03, 0x15d5: 0x0ceb, 0x15d6: 0x11ab, 0x15d7: 0x0663,
+	0x15d8: 0x0d0f, 0x15d9: 0x0d13, 0x15da: 0x0d17, 0x15db: 0x0d2b, 0x15dc: 0x0d23, 0x15dd: 0x16dd,
+	0x15de: 0x0603, 0x15df: 0x0d3f, 0x15e0: 0x0d33, 0x15e1: 0x0d4f, 0x15e2: 0x0d57, 0x15e3: 0x16e7,
+	0x15e4: 0x0d5b, 0x15e5: 0x0d47, 0x15e6: 0x0d63, 0x15e7: 0x0607, 0x15e8: 0x0d67, 0x15e9: 0x0d6b,
+	0x15ea: 0x0d6f, 0x15eb: 0x0d7b, 0x15ec: 0x16ec, 0x15ed: 0x0d83, 0x15ee: 0x060b, 0x15ef: 0x0d8f,
+	0x15f0: 0x16f1, 0x15f1: 0x0d93, 0x15f2: 0x060f, 0x15f3: 0x0d9f, 0x15f4: 0x0dab, 0x15f5: 0x0db7,
+	0x15f6: 0x0dbb, 0x15f7: 0x16f6, 0x15f8: 0x168d, 0x15f9: 0x16fb, 0x15fa: 0x0ddb, 0x15fb: 0x1700,
+	0x15fc: 0x0de7, 0x15fd: 0x0def, 0x15fe: 0x0ddf, 0x15ff: 0x0dfb,
 	// Block 0x58, offset 0x1600
-	0x1600: 0x0ff7, 0x1601: 0x1755, 0x1602: 0x1750, 0x1603: 0x175a, 0x1604: 0x175f, 0x1605: 0x0fff,
-	0x1606: 0x1003, 0x1607: 0x1003, 0x1608: 0x100b, 0x1609: 0x0633, 0x160a: 0x100f, 0x160b: 0x0637,
-	0x160c: 0x063b, 0x160d: 0x1769, 0x160e: 0x1023, 0x160f: 0x102b, 0x1610: 0x1037, 0x1611: 0x063f,
-	0x1612: 0x176e, 0x1613: 0x105b, 0x1614: 0x1773, 0x1615: 0x1778, 0x1616: 0x107b, 0x1617: 0x1093,
-	0x1618: 0x0643, 0x1619: 0x109b, 0x161a: 0x109f, 0x161b: 0x10a3, 0x161c: 0x177d, 0x161d: 0x1782,
-	0x161e: 0x1782, 0x161f: 0x10bb, 0x1620: 0x0647, 0x1621: 0x1787, 0x1622: 0x10cf, 0x1623: 0x10d3,
-	0x1624: 0x064b, 0x1625: 0x178c, 0x1626: 0x10ef, 0x1627: 0x064f, 0x1628: 0x10ff, 0x1629: 0x10f7,
-	0x162a: 0x1107, 0x162b: 0x1796, 0x162c: 0x111f, 0x162d: 0x0653, 0x162e: 0x112b, 0x162f: 0x1133,
-	0x1630: 0x1143, 0x1631: 0x0657, 0x1632: 0x17a0, 0x1633: 0x17a5, 0x1634: 0x065b, 0x1635: 0x17aa,
-	0x1636: 0x115b, 0x1637: 0x17af, 0x1638: 0x1167, 0x1639: 0x1173, 0x163a: 0x117b, 0x163b: 0x17b4,
-	0x163c: 0x17b9, 0x163d: 0x118f, 0x163e: 0x17be, 0x163f: 0x1197,
+	0x1600: 0x0e0b, 0x1601: 0x0e1b, 0x1602: 0x0e0f, 0x1603: 0x0e13, 0x1604: 0x0e1f, 0x1605: 0x0e23,
+	0x1606: 0x1705, 0x1607: 0x0e07, 0x1608: 0x0e3b, 0x1609: 0x0e3f, 0x160a: 0x0613, 0x160b: 0x0e53,
+	0x160c: 0x0e4f, 0x160d: 0x170a, 0x160e: 0x0e33, 0x160f: 0x0e6f, 0x1610: 0x170f, 0x1611: 0x1714,
+	0x1612: 0x0e73, 0x1613: 0x0e87, 0x1614: 0x0e83, 0x1615: 0x0e7f, 0x1616: 0x0617, 0x1617: 0x0e8b,
+	0x1618: 0x0e9b, 0x1619: 0x0e97, 0x161a: 0x0ea3, 0x161b: 0x1651, 0x161c: 0x0eb3, 0x161d: 0x1719,
+	0x161e: 0x0ebf, 0x161f: 0x1723, 0x1620: 0x0ed3, 0x1621: 0x0edf, 0x1622: 0x0ef3, 0x1623: 0x1728,
+	0x1624: 0x0f07, 0x1625: 0x0f0b, 0x1626: 0x172d, 0x1627: 0x1732, 0x1628: 0x0f27, 0x1629: 0x0f37,
+	0x162a: 0x061b, 0x162b: 0x0f3b, 0x162c: 0x061f, 0x162d: 0x061f, 0x162e: 0x0f53, 0x162f: 0x0f57,
+	0x1630: 0x0f5f, 0x1631: 0x0f63, 0x1632: 0x0f6f, 0x1633: 0x0623, 0x1634: 0x0f87, 0x1635: 0x1737,
+	0x1636: 0x0fa3, 0x1637: 0x173c, 0x1638: 0x0faf, 0x1639: 0x16a1, 0x163a: 0x0fbf, 0x163b: 0x1741,
+	0x163c: 0x1746, 0x163d: 0x174b, 0x163e: 0x0627, 0x163f: 0x062b,
 	// Block 0x59, offset 0x1640
-	0x1640: 0x16ce, 0x1641: 0x065f, 0x1642: 0x11af, 0x1643: 0x11b3, 0x1644: 0x0667, 0x1645: 0x11b7,
-	0x1646: 0x0a33, 0x1647: 0x17c3, 0x1648: 0x17c8, 0x1649: 0x16d3, 0x164a: 0x16d8, 0x164b: 0x11d7,
-	0x164c: 0x11db, 0x164d: 0x13f3, 0x164e: 0x066b, 0x164f: 0x1207, 0x1650: 0x1203, 0x1651: 0x120b,
-	0x1652: 0x083f, 0x1653: 0x120f, 0x1654: 0x1213, 0x1655: 0x1217, 0x1656: 0x121f, 0x1657: 0x17cd,
-	0x1658: 0x121b, 0x1659: 0x1223, 0x165a: 0x1237, 0x165b: 0x123b, 0x165c: 0x1227, 0x165d: 0x123f,
-	0x165e: 0x1253, 0x165f: 0x1267, 0x1660: 0x1233, 0x1661: 0x1247, 0x1662: 0x124b, 0x1663: 0x124f,
-	0x1664: 0x17d2, 0x1665: 0x17dc, 0x1666: 0x17d7, 0x1667: 0x066f, 0x1668: 0x126f, 0x1669: 0x1273,
-	0x166a: 0x127b, 0x166b: 0x17f0, 0x166c: 0x127f, 0x166d: 0x17e1, 0x166e: 0x0673, 0x166f: 0x0677,
-	0x1670: 0x17e6, 0x1671: 0x17eb, 0x1672: 0x067b, 0x1673: 0x129f, 0x1674: 0x12a3, 0x1675: 0x12a7,
-	0x1676: 0x12ab, 0x1677: 0x12b7, 0x1678: 0x12b3, 0x1679: 0x12bf, 0x167a: 0x12bb, 0x167b: 0x12cb,
-	0x167c: 0x12c3, 0x167d: 0x12c7, 0x167e: 0x12cf, 0x167f: 0x067f,
+	0x1640: 0x0ff7, 0x1641: 0x1755, 0x1642: 0x1750, 0x1643: 0x175a, 0x1644: 0x175f, 0x1645: 0x0fff,
+	0x1646: 0x1003, 0x1647: 0x1003, 0x1648: 0x100b, 0x1649: 0x0633, 0x164a: 0x100f, 0x164b: 0x0637,
+	0x164c: 0x063b, 0x164d: 0x1769, 0x164e: 0x1023, 0x164f: 0x102b, 0x1650: 0x1037, 0x1651: 0x063f,
+	0x1652: 0x176e, 0x1653: 0x105b, 0x1654: 0x1773, 0x1655: 0x1778, 0x1656: 0x107b, 0x1657: 0x1093,
+	0x1658: 0x0643, 0x1659: 0x109b, 0x165a: 0x109f, 0x165b: 0x10a3, 0x165c: 0x177d, 0x165d: 0x1782,
+	0x165e: 0x1782, 0x165f: 0x10bb, 0x1660: 0x0647, 0x1661: 0x1787, 0x1662: 0x10cf, 0x1663: 0x10d3,
+	0x1664: 0x064b, 0x1665: 0x178c, 0x1666: 0x10ef, 0x1667: 0x064f, 0x1668: 0x10ff, 0x1669: 0x10f7,
+	0x166a: 0x1107, 0x166b: 0x1796, 0x166c: 0x111f, 0x166d: 0x0653, 0x166e: 0x112b, 0x166f: 0x1133,
+	0x1670: 0x1143, 0x1671: 0x0657, 0x1672: 0x17a0, 0x1673: 0x17a5, 0x1674: 0x065b, 0x1675: 0x17aa,
+	0x1676: 0x115b, 0x1677: 0x17af, 0x1678: 0x1167, 0x1679: 0x1173, 0x167a: 0x117b, 0x167b: 0x17b4,
+	0x167c: 0x17b9, 0x167d: 0x118f, 0x167e: 0x17be, 0x167f: 0x1197,
 	// Block 0x5a, offset 0x1680
-	0x1680: 0x12d7, 0x1681: 0x12db, 0x1682: 0x0683, 0x1683: 0x12eb, 0x1684: 0x12ef, 0x1685: 0x17f5,
-	0x1686: 0x12fb, 0x1687: 0x12ff, 0x1688: 0x0687, 0x1689: 0x130b, 0x168a: 0x05bb, 0x168b: 0x17fa,
-	0x168c: 0x17ff, 0x168d: 0x068b, 0x168e: 0x068f, 0x168f: 0x1337, 0x1690: 0x134f, 0x1691: 0x136b,
-	0x1692: 0x137b, 0x1693: 0x1804, 0x1694: 0x138f, 0x1695: 0x1393, 0x1696: 0x13ab, 0x1697: 0x13b7,
-	0x1698: 0x180e, 0x1699: 0x1660, 0x169a: 0x13c3, 0x169b: 0x13bf, 0x169c: 0x13cb, 0x169d: 0x1665,
-	0x169e: 0x13d7, 0x169f: 0x13e3, 0x16a0: 0x1813, 0x16a1: 0x1818, 0x16a2: 0x1423, 0x16a3: 0x142f,
-	0x16a4: 0x1437, 0x16a5: 0x181d, 0x16a6: 0x143b, 0x16a7: 0x1467, 0x16a8: 0x1473, 0x16a9: 0x1477,
-	0x16aa: 0x146f, 0x16ab: 0x1483, 0x16ac: 0x1487, 0x16ad: 0x1822, 0x16ae: 0x1493, 0x16af: 0x0693,
-	0x16b0: 0x149b, 0x16b1: 0x1827, 0x16b2: 0x0697, 0x16b3: 0x14d3, 0x16b4: 0x0ac3, 0x16b5: 0x14eb,
-	0x16b6: 0x182c, 0x16b7: 0x1836, 0x16b8: 0x069b, 0x16b9: 0x069f, 0x16ba: 0x1513, 0x16bb: 0x183b,
-	0x16bc: 0x06a3, 0x16bd: 0x1840, 0x16be: 0x152b, 0x16bf: 0x152b,
+	0x1680: 0x16ce, 0x1681: 0x065f, 0x1682: 0x11af, 0x1683: 0x11b3, 0x1684: 0x0667, 0x1685: 0x11b7,
+	0x1686: 0x0a33, 0x1687: 0x17c3, 0x1688: 0x17c8, 0x1689: 0x16d3, 0x168a: 0x16d8, 0x168b: 0x11d7,
+	0x168c: 0x11db, 0x168d: 0x13f3, 0x168e: 0x066b, 0x168f: 0x1207, 0x1690: 0x1203, 0x1691: 0x120b,
+	0x1692: 0x083f, 0x1693: 0x120f, 0x1694: 0x1213, 0x1695: 0x1217, 0x1696: 0x121f, 0x1697: 0x17cd,
+	0x1698: 0x121b, 0x1699: 0x1223, 0x169a: 0x1237, 0x169b: 0x123b, 0x169c: 0x1227, 0x169d: 0x123f,
+	0x169e: 0x1253, 0x169f: 0x1267, 0x16a0: 0x1233, 0x16a1: 0x1247, 0x16a2: 0x124b, 0x16a3: 0x124f,
+	0x16a4: 0x17d2, 0x16a5: 0x17dc, 0x16a6: 0x17d7, 0x16a7: 0x066f, 0x16a8: 0x126f, 0x16a9: 0x1273,
+	0x16aa: 0x127b, 0x16ab: 0x17f0, 0x16ac: 0x127f, 0x16ad: 0x17e1, 0x16ae: 0x0673, 0x16af: 0x0677,
+	0x16b0: 0x17e6, 0x16b1: 0x17eb, 0x16b2: 0x067b, 0x16b3: 0x129f, 0x16b4: 0x12a3, 0x16b5: 0x12a7,
+	0x16b6: 0x12ab, 0x16b7: 0x12b7, 0x16b8: 0x12b3, 0x16b9: 0x12bf, 0x16ba: 0x12bb, 0x16bb: 0x12cb,
+	0x16bc: 0x12c3, 0x16bd: 0x12c7, 0x16be: 0x12cf, 0x16bf: 0x067f,
 	// Block 0x5b, offset 0x16c0
-	0x16c0: 0x1533, 0x16c1: 0x1845, 0x16c2: 0x154b, 0x16c3: 0x06a7, 0x16c4: 0x155b, 0x16c5: 0x1567,
-	0x16c6: 0x156f, 0x16c7: 0x1577, 0x16c8: 0x06ab, 0x16c9: 0x184a, 0x16ca: 0x158b, 0x16cb: 0x15a7,
-	0x16cc: 0x15b3, 0x16cd: 0x06af, 0x16ce: 0x06b3, 0x16cf: 0x15b7, 0x16d0: 0x184f, 0x16d1: 0x06b7,
-	0x16d2: 0x1854, 0x16d3: 0x1859, 0x16d4: 0x185e, 0x16d5: 0x15db, 0x16d6: 0x06bb, 0x16d7: 0x15ef,
-	0x16d8: 0x15f7, 0x16d9: 0x15fb, 0x16da: 0x1603, 0x16db: 0x160b, 0x16dc: 0x1613, 0x16dd: 0x1868,
+	0x16c0: 0x12d7, 0x16c1: 0x12db, 0x16c2: 0x0683, 0x16c3: 0x12eb, 0x16c4: 0x12ef, 0x16c5: 0x17f5,
+	0x16c6: 0x12fb, 0x16c7: 0x12ff, 0x16c8: 0x0687, 0x16c9: 0x130b, 0x16ca: 0x05bb, 0x16cb: 0x17fa,
+	0x16cc: 0x17ff, 0x16cd: 0x068b, 0x16ce: 0x068f, 0x16cf: 0x1337, 0x16d0: 0x134f, 0x16d1: 0x136b,
+	0x16d2: 0x137b, 0x16d3: 0x1804, 0x16d4: 0x138f, 0x16d5: 0x1393, 0x16d6: 0x13ab, 0x16d7: 0x13b7,
+	0x16d8: 0x180e, 0x16d9: 0x1660, 0x16da: 0x13c3, 0x16db: 0x13bf, 0x16dc: 0x13cb, 0x16dd: 0x1665,
+	0x16de: 0x13d7, 0x16df: 0x13e3, 0x16e0: 0x1813, 0x16e1: 0x1818, 0x16e2: 0x1423, 0x16e3: 0x142f,
+	0x16e4: 0x1437, 0x16e5: 0x181d, 0x16e6: 0x143b, 0x16e7: 0x1467, 0x16e8: 0x1473, 0x16e9: 0x1477,
+	0x16ea: 0x146f, 0x16eb: 0x1483, 0x16ec: 0x1487, 0x16ed: 0x1822, 0x16ee: 0x1493, 0x16ef: 0x0693,
+	0x16f0: 0x149b, 0x16f1: 0x1827, 0x16f2: 0x0697, 0x16f3: 0x14d3, 0x16f4: 0x0ac3, 0x16f5: 0x14eb,
+	0x16f6: 0x182c, 0x16f7: 0x1836, 0x16f8: 0x069b, 0x16f9: 0x069f, 0x16fa: 0x1513, 0x16fb: 0x183b,
+	0x16fc: 0x06a3, 0x16fd: 0x1840, 0x16fe: 0x152b, 0x16ff: 0x152b,
+	// Block 0x5c, offset 0x1700
+	0x1700: 0x1533, 0x1701: 0x1845, 0x1702: 0x154b, 0x1703: 0x06a7, 0x1704: 0x155b, 0x1705: 0x1567,
+	0x1706: 0x156f, 0x1707: 0x1577, 0x1708: 0x06ab, 0x1709: 0x184a, 0x170a: 0x158b, 0x170b: 0x15a7,
+	0x170c: 0x15b3, 0x170d: 0x06af, 0x170e: 0x06b3, 0x170f: 0x15b7, 0x1710: 0x184f, 0x1711: 0x06b7,
+	0x1712: 0x1854, 0x1713: 0x1859, 0x1714: 0x185e, 0x1715: 0x15db, 0x1716: 0x06bb, 0x1717: 0x15ef,
+	0x1718: 0x15f7, 0x1719: 0x15fb, 0x171a: 0x1603, 0x171b: 0x160b, 0x171c: 0x1613, 0x171d: 0x1868,
 }
 
 // nfkcIndex: 22 blocks, 1408 entries, 1408 bytes
@@ -5544,36 +5570,36 @@ var nfkcIndex = [1408]uint8{
 	// Block 0x1, offset 0x40
 	// Block 0x2, offset 0x80
 	// Block 0x3, offset 0xc0
-	0xc2: 0x5a, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x5b, 0xc7: 0x04,
-	0xc8: 0x05, 0xca: 0x5c, 0xcb: 0x5d, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x09,
-	0xd0: 0x0a, 0xd1: 0x5e, 0xd2: 0x5f, 0xd3: 0x0b, 0xd6: 0x0c, 0xd7: 0x60,
-	0xd8: 0x61, 0xd9: 0x0d, 0xdb: 0x62, 0xdc: 0x63, 0xdd: 0x64, 0xdf: 0x65,
+	0xc2: 0x5b, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x5c, 0xc7: 0x04,
+	0xc8: 0x05, 0xca: 0x5d, 0xcb: 0x5e, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x09,
+	0xd0: 0x0a, 0xd1: 0x5f, 0xd2: 0x60, 0xd3: 0x0b, 0xd6: 0x0c, 0xd7: 0x61,
+	0xd8: 0x62, 0xd9: 0x0d, 0xdb: 0x63, 0xdc: 0x64, 0xdd: 0x65, 0xdf: 0x66,
 	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
 	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
 	0xf0: 0x13,
 	// Block 0x4, offset 0x100
-	0x120: 0x66, 0x121: 0x67, 0x123: 0x68, 0x124: 0x69, 0x125: 0x6a, 0x126: 0x6b, 0x127: 0x6c,
-	0x128: 0x6d, 0x129: 0x6e, 0x12a: 0x6f, 0x12b: 0x70, 0x12c: 0x6b, 0x12d: 0x71, 0x12e: 0x72, 0x12f: 0x73,
-	0x131: 0x74, 0x132: 0x75, 0x133: 0x76, 0x134: 0x77, 0x135: 0x78, 0x137: 0x79,
-	0x138: 0x7a, 0x139: 0x7b, 0x13a: 0x7c, 0x13b: 0x7d, 0x13c: 0x7e, 0x13d: 0x7f, 0x13e: 0x80, 0x13f: 0x81,
+	0x120: 0x67, 0x121: 0x68, 0x123: 0x69, 0x124: 0x6a, 0x125: 0x6b, 0x126: 0x6c, 0x127: 0x6d,
+	0x128: 0x6e, 0x129: 0x6f, 0x12a: 0x70, 0x12b: 0x71, 0x12c: 0x6c, 0x12d: 0x72, 0x12e: 0x73, 0x12f: 0x74,
+	0x131: 0x75, 0x132: 0x76, 0x133: 0x77, 0x134: 0x78, 0x135: 0x79, 0x137: 0x7a,
+	0x138: 0x7b, 0x139: 0x7c, 0x13a: 0x7d, 0x13b: 0x7e, 0x13c: 0x7f, 0x13d: 0x80, 0x13e: 0x81, 0x13f: 0x82,
 	// Block 0x5, offset 0x140
-	0x140: 0x82, 0x142: 0x83, 0x143: 0x84, 0x144: 0x85, 0x145: 0x86, 0x146: 0x87, 0x147: 0x88,
-	0x14d: 0x89,
-	0x15c: 0x8a, 0x15f: 0x8b,
-	0x162: 0x8c, 0x164: 0x8d,
-	0x168: 0x8e, 0x169: 0x8f, 0x16a: 0x90, 0x16c: 0x0e, 0x16d: 0x91, 0x16e: 0x92, 0x16f: 0x93,
-	0x170: 0x94, 0x173: 0x95, 0x174: 0x96, 0x175: 0x0f, 0x176: 0x10, 0x177: 0x97,
-	0x178: 0x11, 0x179: 0x12, 0x17a: 0x13, 0x17b: 0x14, 0x17c: 0x15, 0x17d: 0x16, 0x17e: 0x17, 0x17f: 0x18,
+	0x140: 0x83, 0x142: 0x84, 0x143: 0x85, 0x144: 0x86, 0x145: 0x87, 0x146: 0x88, 0x147: 0x89,
+	0x14d: 0x8a,
+	0x15c: 0x8b, 0x15f: 0x8c,
+	0x162: 0x8d, 0x164: 0x8e,
+	0x168: 0x8f, 0x169: 0x90, 0x16a: 0x91, 0x16c: 0x0e, 0x16d: 0x92, 0x16e: 0x93, 0x16f: 0x94,
+	0x170: 0x95, 0x173: 0x96, 0x174: 0x97, 0x175: 0x0f, 0x176: 0x10, 0x177: 0x11,
+	0x178: 0x12, 0x179: 0x13, 0x17a: 0x14, 0x17b: 0x15, 0x17c: 0x16, 0x17d: 0x17, 0x17e: 0x18, 0x17f: 0x19,
 	// Block 0x6, offset 0x180
-	0x180: 0x98, 0x181: 0x99, 0x182: 0x9a, 0x183: 0x9b, 0x184: 0x19, 0x185: 0x1a, 0x186: 0x9c, 0x187: 0x9d,
-	0x188: 0x9e, 0x189: 0x1b, 0x18a: 0x1c, 0x18b: 0x9f, 0x18c: 0xa0,
-	0x191: 0x1d, 0x192: 0x1e, 0x193: 0xa1,
+	0x180: 0x98, 0x181: 0x99, 0x182: 0x9a, 0x183: 0x9b, 0x184: 0x1a, 0x185: 0x1b, 0x186: 0x9c, 0x187: 0x9d,
+	0x188: 0x9e, 0x189: 0x1c, 0x18a: 0x1d, 0x18b: 0x9f, 0x18c: 0xa0,
+	0x191: 0x1e, 0x192: 0x1f, 0x193: 0xa1,
 	0x1a8: 0xa2, 0x1a9: 0xa3, 0x1ab: 0xa4,
 	0x1b1: 0xa5, 0x1b3: 0xa6, 0x1b5: 0xa7, 0x1b7: 0xa8,
-	0x1ba: 0xa9, 0x1bb: 0xaa, 0x1bc: 0x1f, 0x1bd: 0x20, 0x1be: 0x21, 0x1bf: 0xab,
+	0x1ba: 0xa9, 0x1bb: 0xaa, 0x1bc: 0x20, 0x1bd: 0x21, 0x1be: 0x22, 0x1bf: 0xab,
 	// Block 0x7, offset 0x1c0
-	0x1c0: 0xac, 0x1c1: 0x22, 0x1c2: 0x23, 0x1c3: 0x24, 0x1c4: 0xad, 0x1c5: 0x25, 0x1c6: 0x26,
-	0x1c8: 0x27, 0x1c9: 0x28, 0x1ca: 0x29, 0x1cb: 0x2a, 0x1cc: 0x2b, 0x1cd: 0x2c, 0x1ce: 0x2d, 0x1cf: 0x2e,
+	0x1c0: 0xac, 0x1c1: 0x23, 0x1c2: 0x24, 0x1c3: 0x25, 0x1c4: 0xad, 0x1c5: 0x26, 0x1c6: 0x27,
+	0x1c8: 0x28, 0x1c9: 0x29, 0x1ca: 0x2a, 0x1cb: 0x2b, 0x1cc: 0x2c, 0x1cd: 0x2d, 0x1ce: 0x2e, 0x1cf: 0x2f,
 	// Block 0x8, offset 0x200
 	0x219: 0xae, 0x21a: 0xaf, 0x21b: 0xb0, 0x21d: 0xb1, 0x21f: 0xb2,
 	0x220: 0xb3, 0x223: 0xb4, 0x224: 0xb5, 0x225: 0xb6, 0x226: 0xb7, 0x227: 0xb8,
@@ -5604,50 +5630,51 @@ var nfkcIndex = [1408]uint8{
 	0x2d0: 0xc3, 0x2d1: 0xbd, 0x2d2: 0xbe, 0x2d3: 0xbf, 0x2d4: 0xc0, 0x2d5: 0xc1, 0x2d6: 0xc2, 0x2d7: 0xc3,
 	0x2d8: 0xbd, 0x2d9: 0xbe, 0x2da: 0xbf, 0x2db: 0xc0, 0x2dc: 0xc1, 0x2dd: 0xc2, 0x2de: 0xc4,
 	// Block 0xc, offset 0x300
-	0x324: 0x2f, 0x325: 0x30, 0x326: 0x31, 0x327: 0x32,
-	0x328: 0x33, 0x329: 0x34, 0x32a: 0x35, 0x32b: 0x36, 0x32c: 0x37, 0x32d: 0x38, 0x32e: 0x39, 0x32f: 0x3a,
-	0x330: 0x3b, 0x331: 0x3c, 0x332: 0x3d, 0x333: 0x3e, 0x334: 0x3f, 0x335: 0x40, 0x336: 0x41, 0x337: 0x42,
-	0x338: 0x43, 0x339: 0x44, 0x33a: 0x45, 0x33b: 0x46, 0x33c: 0xc5, 0x33d: 0x47, 0x33e: 0x48, 0x33f: 0x49,
+	0x324: 0x30, 0x325: 0x31, 0x326: 0x32, 0x327: 0x33,
+	0x328: 0x34, 0x329: 0x35, 0x32a: 0x36, 0x32b: 0x37, 0x32c: 0x38, 0x32d: 0x39, 0x32e: 0x3a, 0x32f: 0x3b,
+	0x330: 0x3c, 0x331: 0x3d, 0x332: 0x3e, 0x333: 0x3f, 0x334: 0x40, 0x335: 0x41, 0x336: 0x42, 0x337: 0x43,
+	0x338: 0x44, 0x339: 0x45, 0x33a: 0x46, 0x33b: 0x47, 0x33c: 0xc5, 0x33d: 0x48, 0x33e: 0x49, 0x33f: 0x4a,
 	// Block 0xd, offset 0x340
 	0x347: 0xc6,
 	0x34b: 0xc7, 0x34d: 0xc8,
 	0x368: 0xc9, 0x36b: 0xca,
 	// Block 0xe, offset 0x380
 	0x381: 0xcb, 0x382: 0xcc, 0x384: 0xcd, 0x385: 0xb7, 0x387: 0xce,
-	0x388: 0xcf, 0x38b: 0xd0, 0x38c: 0x6b, 0x38d: 0xd1,
+	0x388: 0xcf, 0x38b: 0xd0, 0x38c: 0x6c, 0x38d: 0xd1,
 	0x391: 0xd2, 0x392: 0xd3, 0x393: 0xd4, 0x396: 0xd5, 0x397: 0xd6,
 	0x398: 0xd7, 0x39a: 0xd8, 0x39c: 0xd9,
-	0x3b0: 0xd7,
+	0x3a8: 0xda, 0x3a9: 0xdb, 0x3aa: 0xdc,
+	0x3b0: 0xd7, 0x3b5: 0xdd,
 	// Block 0xf, offset 0x3c0
-	0x3eb: 0xda, 0x3ec: 0xdb,
+	0x3eb: 0xde, 0x3ec: 0xdf,
 	// Block 0x10, offset 0x400
-	0x432: 0xdc,
+	0x432: 0xe0,
 	// Block 0x11, offset 0x440
-	0x445: 0xdd, 0x446: 0xde, 0x447: 0xdf,
-	0x449: 0xe0,
-	0x450: 0xe1, 0x451: 0xe2, 0x452: 0xe3, 0x453: 0xe4, 0x454: 0xe5, 0x455: 0xe6, 0x456: 0xe7, 0x457: 0xe8,
-	0x458: 0xe9, 0x459: 0xea, 0x45a: 0x4a, 0x45b: 0xeb, 0x45c: 0xec, 0x45d: 0xed, 0x45e: 0xee, 0x45f: 0x4b,
+	0x445: 0xe1, 0x446: 0xe2, 0x447: 0xe3,
+	0x449: 0xe4,
+	0x450: 0xe5, 0x451: 0xe6, 0x452: 0xe7, 0x453: 0xe8, 0x454: 0xe9, 0x455: 0xea, 0x456: 0xeb, 0x457: 0xec,
+	0x458: 0xed, 0x459: 0xee, 0x45a: 0x4b, 0x45b: 0xef, 0x45c: 0xf0, 0x45d: 0xf1, 0x45e: 0xf2, 0x45f: 0x4c,
 	// Block 0x12, offset 0x480
-	0x480: 0xef,
-	0x4a3: 0xf0, 0x4a5: 0xf1,
-	0x4b8: 0x4c, 0x4b9: 0x4d, 0x4ba: 0x4e,
+	0x480: 0xf3,
+	0x4a3: 0xf4, 0x4a5: 0xf5,
+	0x4b8: 0x4d, 0x4b9: 0x4e, 0x4ba: 0x4f,
 	// Block 0x13, offset 0x4c0
-	0x4c4: 0x4f, 0x4c5: 0xf2, 0x4c6: 0xf3,
-	0x4c8: 0x50, 0x4c9: 0xf4,
+	0x4c4: 0x50, 0x4c5: 0xf6, 0x4c6: 0xf7,
+	0x4c8: 0x51, 0x4c9: 0xf8,
 	// Block 0x14, offset 0x500
-	0x520: 0x51, 0x521: 0x52, 0x522: 0x53, 0x523: 0x54, 0x524: 0x55, 0x525: 0x56, 0x526: 0x57, 0x527: 0x58,
-	0x528: 0x59,
+	0x520: 0x52, 0x521: 0x53, 0x522: 0x54, 0x523: 0x55, 0x524: 0x56, 0x525: 0x57, 0x526: 0x58, 0x527: 0x59,
+	0x528: 0x5a,
 	// Block 0x15, offset 0x540
 	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
 	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
 	0x56f: 0x12,
 }
 
-// nfkcSparseOffset: 155 entries, 310 bytes
-var nfkcSparseOffset = []uint16{0x0, 0xe, 0x12, 0x1b, 0x25, 0x35, 0x37, 0x3c, 0x47, 0x56, 0x63, 0x6b, 0x6f, 0x74, 0x76, 0x87, 0x8f, 0x96, 0x99, 0xa0, 0xa4, 0xa8, 0xaa, 0xac, 0xb5, 0xb9, 0xc0, 0xc5, 0xc8, 0xd2, 0xd4, 0xdb, 0xe3, 0xe7, 0xe9, 0xec, 0xf0, 0xf6, 0x107, 0x113, 0x115, 0x11b, 0x11d, 0x11f, 0x121, 0x123, 0x125, 0x127, 0x129, 0x12c, 0x12f, 0x131, 0x134, 0x137, 0x13b, 0x140, 0x149, 0x14b, 0x14e, 0x150, 0x15b, 0x166, 0x176, 0x184, 0x192, 0x1a2, 0x1b0, 0x1b7, 0x1bd, 0x1cc, 0x1d0, 0x1d2, 0x1d6, 0x1d8, 0x1db, 0x1dd, 0x1e0, 0x1e2, 0x1e5, 0x1e7, 0x1e9, 0x1eb, 0x1f7, 0x201, 0x20b, 0x20e, 0x212, 0x214, 0x216, 0x218, 0x21a, 0x21d, 0x21f, 0x221, 0x223, 0x225, 0x22b, 0x22e, 0x232, 0x234, 0x23b, 0x241, 0x247, 0x24f, 0x255, 0x25b, 0x261, 0x265, 0x267, 0x269, 0x26b, 0x26d, 0x273, 0x276, 0x279, 0x281, 0x288, 0x28b, 0x28e, 0x290, 0x298, 0x29b, 0x2a2, 0x2a5, 0x2ab, 0x2ad, 0x2af, 0x2b2, 0x2b4, 0x2b6, 0x2b8, 0x2ba, 0x2c7, 0x2d1, 0x2d3, 0x2d5, 0x2d9, 0x2de, 0x2ea, 0x2ef, 0x2f8, 0x2fe, 0x303, 0x307, 0x30c, 0x310, 0x320, 0x32e, 0x33c, 0x34a, 0x350, 0x352, 0x355, 0x35f, 0x361}
+// nfkcSparseOffset: 158 entries, 316 bytes
+var nfkcSparseOffset = []uint16{0x0, 0xe, 0x12, 0x1b, 0x25, 0x35, 0x37, 0x3c, 0x47, 0x56, 0x63, 0x6b, 0x6f, 0x74, 0x76, 0x87, 0x8f, 0x96, 0x99, 0xa0, 0xa4, 0xa8, 0xaa, 0xac, 0xb5, 0xb9, 0xc0, 0xc5, 0xc8, 0xd2, 0xd5, 0xdc, 0xe4, 0xe8, 0xea, 0xed, 0xf1, 0xf7, 0x108, 0x114, 0x116, 0x11c, 0x11e, 0x120, 0x122, 0x124, 0x126, 0x128, 0x12a, 0x12d, 0x130, 0x132, 0x135, 0x138, 0x13c, 0x141, 0x14a, 0x14c, 0x14f, 0x151, 0x15c, 0x167, 0x175, 0x183, 0x193, 0x1a1, 0x1a8, 0x1ae, 0x1bd, 0x1c1, 0x1c3, 0x1c7, 0x1c9, 0x1cc, 0x1ce, 0x1d1, 0x1d3, 0x1d6, 0x1d8, 0x1da, 0x1dc, 0x1e8, 0x1f2, 0x1fc, 0x1ff, 0x203, 0x205, 0x207, 0x209, 0x20b, 0x20e, 0x210, 0x212, 0x214, 0x216, 0x21c, 0x21f, 0x223, 0x225, 0x22c, 0x232, 0x238, 0x240, 0x246, 0x24c, 0x252, 0x256, 0x258, 0x25a, 0x25c, 0x25e, 0x264, 0x267, 0x26a, 0x272, 0x279, 0x27c, 0x27f, 0x281, 0x289, 0x28c, 0x293, 0x296, 0x29c, 0x29e, 0x2a0, 0x2a3, 0x2a5, 0x2a7, 0x2a9, 0x2ab, 0x2ae, 0x2b0, 0x2b2, 0x2b4, 0x2c1, 0x2cb, 0x2cd, 0x2cf, 0x2d3, 0x2d8, 0x2e4, 0x2e9, 0x2f2, 0x2f8, 0x2fd, 0x301, 0x306, 0x30a, 0x31a, 0x328, 0x336, 0x344, 0x34a, 0x34c, 0x34f, 0x359, 0x35b}
 
-// nfkcSparseValues: 875 entries, 3500 bytes
-var nfkcSparseValues = [875]valueRange{
+// nfkcSparseValues: 869 entries, 3476 bytes
+var nfkcSparseValues = [869]valueRange{
 	// Block 0x0, offset 0x0
 	{value: 0x0002, lo: 0x0d},
 	{value: 0x0001, lo: 0xa0, hi: 0xa0},
@@ -5665,8 +5692,8 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x22b2, lo: 0xbe, hi: 0xbe},
 	// Block 0x1, offset 0xe
 	{value: 0x0091, lo: 0x03},
-	{value: 0x4778, lo: 0xa0, hi: 0xa1},
-	{value: 0x47aa, lo: 0xaf, hi: 0xb0},
+	{value: 0x46e2, lo: 0xa0, hi: 0xa1},
+	{value: 0x4714, lo: 0xaf, hi: 0xb0},
 	{value: 0xa000, lo: 0xb7, hi: 0xb7},
 	// Block 0x2, offset 0x12
 	{value: 0x0003, lo: 0x08},
@@ -5814,7 +5841,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x812d, lo: 0x92, hi: 0x92},
 	{value: 0x8132, lo: 0x93, hi: 0x93},
 	{value: 0x8132, lo: 0x94, hi: 0x94},
-	{value: 0x45b2, lo: 0x98, hi: 0x9f},
+	{value: 0x451c, lo: 0x98, hi: 0x9f},
 	// Block 0x11, offset 0x96
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8102, lo: 0xbc, hi: 0xbc},
@@ -5825,18 +5852,18 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x2c9e, lo: 0x8b, hi: 0x8c},
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
 	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x45f2, lo: 0x9c, hi: 0x9d},
-	{value: 0x4602, lo: 0x9f, hi: 0x9f},
+	{value: 0x455c, lo: 0x9c, hi: 0x9d},
+	{value: 0x456c, lo: 0x9f, hi: 0x9f},
 	// Block 0x13, offset 0xa0
 	{value: 0x0000, lo: 0x03},
-	{value: 0x462a, lo: 0xb3, hi: 0xb3},
-	{value: 0x4632, lo: 0xb6, hi: 0xb6},
+	{value: 0x4594, lo: 0xb3, hi: 0xb3},
+	{value: 0x459c, lo: 0xb6, hi: 0xb6},
 	{value: 0x8102, lo: 0xbc, hi: 0xbc},
 	// Block 0x14, offset 0xa4
 	{value: 0x0008, lo: 0x03},
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x460a, lo: 0x99, hi: 0x9b},
-	{value: 0x4622, lo: 0x9e, hi: 0x9e},
+	{value: 0x4574, lo: 0x99, hi: 0x9b},
+	{value: 0x458c, lo: 0x9e, hi: 0x9e},
 	// Block 0x15, offset 0xa8
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8102, lo: 0xbc, hi: 0xbc},
@@ -5851,8 +5878,8 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x2cbe, lo: 0x8c, hi: 0x8c},
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
 	{value: 0x9900, lo: 0x96, hi: 0x97},
-	{value: 0x463a, lo: 0x9c, hi: 0x9c},
-	{value: 0x4642, lo: 0x9d, hi: 0x9d},
+	{value: 0x45a4, lo: 0x9c, hi: 0x9c},
+	{value: 0x45ac, lo: 0x9d, hi: 0x9d},
 	// Block 0x18, offset 0xb5
 	{value: 0x0000, lo: 0x03},
 	{value: 0xa000, lo: 0x92, hi: 0x92},
@@ -5888,9 +5915,10 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
 	{value: 0x9900, lo: 0x95, hi: 0x96},
 	// Block 0x1d, offset 0xd2
-	{value: 0x0000, lo: 0x01},
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xbb, hi: 0xbc},
 	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x1e, offset 0xd4
+	// Block 0x1e, offset 0xd5
 	{value: 0x0000, lo: 0x06},
 	{value: 0xa000, lo: 0x86, hi: 0x87},
 	{value: 0x2cfe, lo: 0x8a, hi: 0x8a},
@@ -5898,7 +5926,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x2d06, lo: 0x8c, hi: 0x8c},
 	{value: 0x8104, lo: 0x8d, hi: 0x8d},
 	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x1f, offset 0xdb
+	// Block 0x1f, offset 0xdc
 	{value: 0x6bea, lo: 0x07},
 	{value: 0x9904, lo: 0x8a, hi: 0x8a},
 	{value: 0x9900, lo: 0x8f, hi: 0x8f},
@@ -5907,31 +5935,31 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x2f58, lo: 0x9c, hi: 0x9c},
 	{value: 0x2de3, lo: 0x9d, hi: 0x9d},
 	{value: 0x2d16, lo: 0x9e, hi: 0x9f},
-	// Block 0x20, offset 0xe3
+	// Block 0x20, offset 0xe4
 	{value: 0x0000, lo: 0x03},
 	{value: 0x2621, lo: 0xb3, hi: 0xb3},
 	{value: 0x8122, lo: 0xb8, hi: 0xb9},
 	{value: 0x8104, lo: 0xba, hi: 0xba},
-	// Block 0x21, offset 0xe7
+	// Block 0x21, offset 0xe8
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8123, lo: 0x88, hi: 0x8b},
-	// Block 0x22, offset 0xe9
+	// Block 0x22, offset 0xea
 	{value: 0x0000, lo: 0x02},
 	{value: 0x2636, lo: 0xb3, hi: 0xb3},
 	{value: 0x8124, lo: 0xb8, hi: 0xb9},
-	// Block 0x23, offset 0xec
+	// Block 0x23, offset 0xed
 	{value: 0x0000, lo: 0x03},
 	{value: 0x8125, lo: 0x88, hi: 0x8b},
 	{value: 0x2628, lo: 0x9c, hi: 0x9c},
 	{value: 0x262f, lo: 0x9d, hi: 0x9d},
-	// Block 0x24, offset 0xf0
+	// Block 0x24, offset 0xf1
 	{value: 0x0000, lo: 0x05},
 	{value: 0x030b, lo: 0x8c, hi: 0x8c},
 	{value: 0x812d, lo: 0x98, hi: 0x99},
 	{value: 0x812d, lo: 0xb5, hi: 0xb5},
 	{value: 0x812d, lo: 0xb7, hi: 0xb7},
 	{value: 0x812b, lo: 0xb9, hi: 0xb9},
-	// Block 0x25, offset 0xf6
+	// Block 0x25, offset 0xf7
 	{value: 0x0000, lo: 0x10},
 	{value: 0x2644, lo: 0x83, hi: 0x83},
 	{value: 0x264b, lo: 0x8d, hi: 0x8d},
@@ -5941,18 +5969,18 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x263d, lo: 0xa9, hi: 0xa9},
 	{value: 0x8126, lo: 0xb1, hi: 0xb1},
 	{value: 0x8127, lo: 0xb2, hi: 0xb2},
-	{value: 0x4a66, lo: 0xb3, hi: 0xb3},
+	{value: 0x4a84, lo: 0xb3, hi: 0xb3},
 	{value: 0x8128, lo: 0xb4, hi: 0xb4},
-	{value: 0x4a6f, lo: 0xb5, hi: 0xb5},
-	{value: 0x464a, lo: 0xb6, hi: 0xb6},
-	{value: 0x468a, lo: 0xb7, hi: 0xb7},
-	{value: 0x4652, lo: 0xb8, hi: 0xb8},
-	{value: 0x4695, lo: 0xb9, hi: 0xb9},
+	{value: 0x4a8d, lo: 0xb5, hi: 0xb5},
+	{value: 0x45b4, lo: 0xb6, hi: 0xb6},
+	{value: 0x45f4, lo: 0xb7, hi: 0xb7},
+	{value: 0x45bc, lo: 0xb8, hi: 0xb8},
+	{value: 0x45ff, lo: 0xb9, hi: 0xb9},
 	{value: 0x8127, lo: 0xba, hi: 0xbd},
-	// Block 0x26, offset 0x107
+	// Block 0x26, offset 0x108
 	{value: 0x0000, lo: 0x0b},
 	{value: 0x8127, lo: 0x80, hi: 0x80},
-	{value: 0x4a78, lo: 0x81, hi: 0x81},
+	{value: 0x4a96, lo: 0x81, hi: 0x81},
 	{value: 0x8132, lo: 0x82, hi: 0x83},
 	{value: 0x8104, lo: 0x84, hi: 0x84},
 	{value: 0x8132, lo: 0x86, hi: 0x87},
@@ -5962,68 +5990,68 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x2683, lo: 0xa7, hi: 0xa7},
 	{value: 0x268a, lo: 0xac, hi: 0xac},
 	{value: 0x2667, lo: 0xb9, hi: 0xb9},
-	// Block 0x27, offset 0x113
+	// Block 0x27, offset 0x114
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0x86, hi: 0x86},
-	// Block 0x28, offset 0x115
+	// Block 0x28, offset 0x116
 	{value: 0x0000, lo: 0x05},
 	{value: 0xa000, lo: 0xa5, hi: 0xa5},
 	{value: 0x2d1e, lo: 0xa6, hi: 0xa6},
 	{value: 0x9900, lo: 0xae, hi: 0xae},
 	{value: 0x8102, lo: 0xb7, hi: 0xb7},
 	{value: 0x8104, lo: 0xb9, hi: 0xba},
-	// Block 0x29, offset 0x11b
+	// Block 0x29, offset 0x11c
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0x8d, hi: 0x8d},
-	// Block 0x2a, offset 0x11d
+	// Block 0x2a, offset 0x11e
 	{value: 0x0000, lo: 0x01},
 	{value: 0x030f, lo: 0xbc, hi: 0xbc},
-	// Block 0x2b, offset 0x11f
+	// Block 0x2b, offset 0x120
 	{value: 0x0000, lo: 0x01},
 	{value: 0xa000, lo: 0x80, hi: 0x92},
-	// Block 0x2c, offset 0x121
+	// Block 0x2c, offset 0x122
 	{value: 0x0000, lo: 0x01},
 	{value: 0xb900, lo: 0xa1, hi: 0xb5},
-	// Block 0x2d, offset 0x123
+	// Block 0x2d, offset 0x124
 	{value: 0x0000, lo: 0x01},
 	{value: 0x9900, lo: 0xa8, hi: 0xbf},
-	// Block 0x2e, offset 0x125
+	// Block 0x2e, offset 0x126
 	{value: 0x0000, lo: 0x01},
 	{value: 0x9900, lo: 0x80, hi: 0x82},
-	// Block 0x2f, offset 0x127
+	// Block 0x2f, offset 0x128
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0x9d, hi: 0x9f},
-	// Block 0x30, offset 0x129
+	// Block 0x30, offset 0x12a
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x94, hi: 0x94},
 	{value: 0x8104, lo: 0xb4, hi: 0xb4},
-	// Block 0x31, offset 0x12c
+	// Block 0x31, offset 0x12d
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x92, hi: 0x92},
 	{value: 0x8132, lo: 0x9d, hi: 0x9d},
-	// Block 0x32, offset 0x12f
+	// Block 0x32, offset 0x130
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8131, lo: 0xa9, hi: 0xa9},
-	// Block 0x33, offset 0x131
+	// Block 0x33, offset 0x132
 	{value: 0x0004, lo: 0x02},
 	{value: 0x812e, lo: 0xb9, hi: 0xba},
 	{value: 0x812d, lo: 0xbb, hi: 0xbb},
-	// Block 0x34, offset 0x134
+	// Block 0x34, offset 0x135
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0x97, hi: 0x97},
 	{value: 0x812d, lo: 0x98, hi: 0x98},
-	// Block 0x35, offset 0x137
+	// Block 0x35, offset 0x138
 	{value: 0x0000, lo: 0x03},
 	{value: 0x8104, lo: 0xa0, hi: 0xa0},
 	{value: 0x8132, lo: 0xb5, hi: 0xbc},
 	{value: 0x812d, lo: 0xbf, hi: 0xbf},
-	// Block 0x36, offset 0x13b
+	// Block 0x36, offset 0x13c
 	{value: 0x0000, lo: 0x04},
 	{value: 0x8132, lo: 0xb0, hi: 0xb4},
 	{value: 0x812d, lo: 0xb5, hi: 0xba},
 	{value: 0x8132, lo: 0xbb, hi: 0xbc},
 	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	// Block 0x37, offset 0x140
+	// Block 0x37, offset 0x141
 	{value: 0x0000, lo: 0x08},
 	{value: 0x2d66, lo: 0x80, hi: 0x80},
 	{value: 0x2d6e, lo: 0x81, hi: 0x81},
@@ -6033,17 +6061,17 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x8132, lo: 0xab, hi: 0xab},
 	{value: 0x812d, lo: 0xac, hi: 0xac},
 	{value: 0x8132, lo: 0xad, hi: 0xb3},
-	// Block 0x38, offset 0x149
+	// Block 0x38, offset 0x14a
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0xaa, hi: 0xab},
-	// Block 0x39, offset 0x14b
+	// Block 0x39, offset 0x14c
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8102, lo: 0xa6, hi: 0xa6},
 	{value: 0x8104, lo: 0xb2, hi: 0xb3},
-	// Block 0x3a, offset 0x14e
+	// Block 0x3a, offset 0x14f
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	// Block 0x3b, offset 0x150
+	// Block 0x3b, offset 0x151
 	{value: 0x0000, lo: 0x0a},
 	{value: 0x8132, lo: 0x90, hi: 0x92},
 	{value: 0x8101, lo: 0x94, hi: 0x94},
@@ -6055,7 +6083,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x812d, lo: 0xad, hi: 0xad},
 	{value: 0x8132, lo: 0xb4, hi: 0xb4},
 	{value: 0x8132, lo: 0xb8, hi: 0xb9},
-	// Block 0x3c, offset 0x15b
+	// Block 0x3c, offset 0x15c
 	{value: 0x0002, lo: 0x0a},
 	{value: 0x0043, lo: 0xac, hi: 0xac},
 	{value: 0x00d1, lo: 0xad, hi: 0xad},
@@ -6067,24 +6095,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x00ef, lo: 0xbd, hi: 0xbd},
 	{value: 0x0061, lo: 0xbe, hi: 0xbe},
 	{value: 0x0065, lo: 0xbf, hi: 0xbf},
-	// Block 0x3d, offset 0x166
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x8132, lo: 0x80, hi: 0x81},
-	{value: 0x812d, lo: 0x82, hi: 0x82},
-	{value: 0x8132, lo: 0x83, hi: 0x89},
-	{value: 0x812d, lo: 0x8a, hi: 0x8a},
-	{value: 0x8132, lo: 0x8b, hi: 0x8c},
-	{value: 0x8135, lo: 0x8d, hi: 0x8d},
-	{value: 0x812a, lo: 0x8e, hi: 0x8e},
-	{value: 0x812d, lo: 0x8f, hi: 0x8f},
-	{value: 0x8129, lo: 0x90, hi: 0x90},
-	{value: 0x8132, lo: 0x91, hi: 0xb5},
-	{value: 0x8132, lo: 0xbb, hi: 0xbb},
-	{value: 0x8134, lo: 0xbc, hi: 0xbc},
-	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	{value: 0x8132, lo: 0xbe, hi: 0xbe},
-	{value: 0x812d, lo: 0xbf, hi: 0xbf},
-	// Block 0x3e, offset 0x176
+	// Block 0x3d, offset 0x167
 	{value: 0x0000, lo: 0x0d},
 	{value: 0x0001, lo: 0x80, hi: 0x8a},
 	{value: 0x043b, lo: 0x91, hi: 0x91},
@@ -6099,7 +6110,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x2808, lo: 0xb7, hi: 0xb7},
 	{value: 0x186d, lo: 0xbc, hi: 0xbc},
 	{value: 0x4269, lo: 0xbe, hi: 0xbe},
-	// Block 0x3f, offset 0x184
+	// Block 0x3e, offset 0x175
 	{value: 0x0002, lo: 0x0d},
 	{value: 0x1933, lo: 0x87, hi: 0x87},
 	{value: 0x1930, lo: 0x88, hi: 0x88},
@@ -6114,7 +6125,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x003b, lo: 0xbc, hi: 0xbc},
 	{value: 0x0011, lo: 0xbd, hi: 0xbe},
 	{value: 0x009d, lo: 0xbf, hi: 0xbf},
-	// Block 0x40, offset 0x192
+	// Block 0x3f, offset 0x183
 	{value: 0x0002, lo: 0x0f},
 	{value: 0x0021, lo: 0x80, hi: 0x89},
 	{value: 0x0017, lo: 0x8a, hi: 0x8a},
@@ -6131,7 +6142,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x00a1, lo: 0x9a, hi: 0x9a},
 	{value: 0x00a7, lo: 0x9b, hi: 0x9c},
 	{value: 0x1999, lo: 0xa8, hi: 0xa8},
-	// Block 0x41, offset 0x1a2
+	// Block 0x40, offset 0x193
 	{value: 0x0000, lo: 0x0d},
 	{value: 0x8132, lo: 0x90, hi: 0x91},
 	{value: 0x8101, lo: 0x92, hi: 0x93},
@@ -6146,7 +6157,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x8101, lo: 0xaa, hi: 0xab},
 	{value: 0x812d, lo: 0xac, hi: 0xaf},
 	{value: 0x8132, lo: 0xb0, hi: 0xb0},
-	// Block 0x42, offset 0x1b0
+	// Block 0x41, offset 0x1a1
 	{value: 0x0007, lo: 0x06},
 	{value: 0x2180, lo: 0x89, hi: 0x89},
 	{value: 0xa000, lo: 0x90, hi: 0x90},
@@ -6154,14 +6165,14 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0xa000, lo: 0x94, hi: 0x94},
 	{value: 0x3bb9, lo: 0x9a, hi: 0x9b},
 	{value: 0x3bc7, lo: 0xae, hi: 0xae},
-	// Block 0x43, offset 0x1b7
+	// Block 0x42, offset 0x1a8
 	{value: 0x000e, lo: 0x05},
 	{value: 0x3bce, lo: 0x8d, hi: 0x8e},
 	{value: 0x3bd5, lo: 0x8f, hi: 0x8f},
 	{value: 0xa000, lo: 0x90, hi: 0x90},
 	{value: 0xa000, lo: 0x92, hi: 0x92},
 	{value: 0xa000, lo: 0x94, hi: 0x94},
-	// Block 0x44, offset 0x1bd
+	// Block 0x43, offset 0x1ae
 	{value: 0x0173, lo: 0x0e},
 	{value: 0xa000, lo: 0x83, hi: 0x83},
 	{value: 0x3be3, lo: 0x84, hi: 0x84},
@@ -6177,50 +6188,50 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x26a6, lo: 0xaf, hi: 0xaf},
 	{value: 0x281c, lo: 0xb0, hi: 0xb0},
 	{value: 0xa000, lo: 0xbc, hi: 0xbc},
-	// Block 0x45, offset 0x1cc
+	// Block 0x44, offset 0x1bd
 	{value: 0x0007, lo: 0x03},
 	{value: 0x3c68, lo: 0xa0, hi: 0xa1},
 	{value: 0x3c92, lo: 0xa2, hi: 0xa3},
 	{value: 0x3cbc, lo: 0xaa, hi: 0xad},
-	// Block 0x46, offset 0x1d0
+	// Block 0x45, offset 0x1c1
 	{value: 0x0004, lo: 0x01},
 	{value: 0x048b, lo: 0xa9, hi: 0xaa},
-	// Block 0x47, offset 0x1d2
+	// Block 0x46, offset 0x1c3
 	{value: 0x0002, lo: 0x03},
 	{value: 0x0057, lo: 0x80, hi: 0x8f},
 	{value: 0x0083, lo: 0x90, hi: 0xa9},
 	{value: 0x0021, lo: 0xaa, hi: 0xaa},
-	// Block 0x48, offset 0x1d6
+	// Block 0x47, offset 0x1c7
 	{value: 0x0000, lo: 0x01},
 	{value: 0x299b, lo: 0x8c, hi: 0x8c},
-	// Block 0x49, offset 0x1d8
+	// Block 0x48, offset 0x1c9
 	{value: 0x0263, lo: 0x02},
 	{value: 0x1b8c, lo: 0xb4, hi: 0xb4},
 	{value: 0x192d, lo: 0xb5, hi: 0xb6},
-	// Block 0x4a, offset 0x1db
+	// Block 0x49, offset 0x1cc
 	{value: 0x0000, lo: 0x01},
-	{value: 0x4573, lo: 0x9c, hi: 0x9c},
-	// Block 0x4b, offset 0x1dd
+	{value: 0x44dd, lo: 0x9c, hi: 0x9c},
+	// Block 0x4a, offset 0x1ce
 	{value: 0x0000, lo: 0x02},
 	{value: 0x0095, lo: 0xbc, hi: 0xbc},
 	{value: 0x006d, lo: 0xbd, hi: 0xbd},
-	// Block 0x4c, offset 0x1e0
+	// Block 0x4b, offset 0x1d1
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xaf, hi: 0xb1},
-	// Block 0x4d, offset 0x1e2
+	// Block 0x4c, offset 0x1d3
 	{value: 0x0000, lo: 0x02},
 	{value: 0x047f, lo: 0xaf, hi: 0xaf},
 	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x4e, offset 0x1e5
+	// Block 0x4d, offset 0x1d6
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xa0, hi: 0xbf},
-	// Block 0x4f, offset 0x1e7
+	// Block 0x4e, offset 0x1d8
 	{value: 0x0000, lo: 0x01},
 	{value: 0x0dc3, lo: 0x9f, hi: 0x9f},
-	// Block 0x50, offset 0x1e9
+	// Block 0x4f, offset 0x1da
 	{value: 0x0000, lo: 0x01},
 	{value: 0x162f, lo: 0xb3, hi: 0xb3},
-	// Block 0x51, offset 0x1eb
+	// Block 0x50, offset 0x1dc
 	{value: 0x0004, lo: 0x0b},
 	{value: 0x1597, lo: 0x80, hi: 0x82},
 	{value: 0x15af, lo: 0x83, hi: 0x83},
@@ -6233,7 +6244,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x161b, lo: 0x91, hi: 0x93},
 	{value: 0x162b, lo: 0x94, hi: 0x94},
 	{value: 0x1633, lo: 0x95, hi: 0x95},
-	// Block 0x52, offset 0x1f7
+	// Block 0x51, offset 0x1e8
 	{value: 0x0004, lo: 0x09},
 	{value: 0x0001, lo: 0x80, hi: 0x80},
 	{value: 0x812c, lo: 0xaa, hi: 0xaa},
@@ -6244,74 +6255,74 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x812f, lo: 0xaf, hi: 0xaf},
 	{value: 0x04b3, lo: 0xb6, hi: 0xb6},
 	{value: 0x0887, lo: 0xb8, hi: 0xba},
-	// Block 0x53, offset 0x201
-	{value: 0x0005, lo: 0x09},
+	// Block 0x52, offset 0x1f2
+	{value: 0x0006, lo: 0x09},
 	{value: 0x0313, lo: 0xb1, hi: 0xb1},
 	{value: 0x0317, lo: 0xb2, hi: 0xb2},
-	{value: 0x4345, lo: 0xb3, hi: 0xb3},
+	{value: 0x4a3b, lo: 0xb3, hi: 0xb3},
 	{value: 0x031b, lo: 0xb4, hi: 0xb4},
-	{value: 0x434a, lo: 0xb5, hi: 0xb6},
+	{value: 0x4a41, lo: 0xb5, hi: 0xb6},
 	{value: 0x031f, lo: 0xb7, hi: 0xb7},
 	{value: 0x0323, lo: 0xb8, hi: 0xb8},
 	{value: 0x0327, lo: 0xb9, hi: 0xb9},
-	{value: 0x4354, lo: 0xba, hi: 0xbf},
-	// Block 0x54, offset 0x20b
+	{value: 0x4a4d, lo: 0xba, hi: 0xbf},
+	// Block 0x53, offset 0x1fc
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0xaf, hi: 0xaf},
 	{value: 0x8132, lo: 0xb4, hi: 0xbd},
-	// Block 0x55, offset 0x20e
+	// Block 0x54, offset 0x1ff
 	{value: 0x0000, lo: 0x03},
 	{value: 0x020f, lo: 0x9c, hi: 0x9c},
 	{value: 0x0212, lo: 0x9d, hi: 0x9d},
 	{value: 0x8132, lo: 0x9e, hi: 0x9f},
-	// Block 0x56, offset 0x212
+	// Block 0x55, offset 0x203
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xb0, hi: 0xb1},
-	// Block 0x57, offset 0x214
+	// Block 0x56, offset 0x205
 	{value: 0x0000, lo: 0x01},
 	{value: 0x163b, lo: 0xb0, hi: 0xb0},
-	// Block 0x58, offset 0x216
+	// Block 0x57, offset 0x207
 	{value: 0x000c, lo: 0x01},
 	{value: 0x00d7, lo: 0xb8, hi: 0xb9},
-	// Block 0x59, offset 0x218
+	// Block 0x58, offset 0x209
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0x86, hi: 0x86},
-	// Block 0x5a, offset 0x21a
+	// Block 0x59, offset 0x20b
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x84, hi: 0x84},
 	{value: 0x8132, lo: 0xa0, hi: 0xb1},
-	// Block 0x5b, offset 0x21d
+	// Block 0x5a, offset 0x20e
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0xab, hi: 0xad},
-	// Block 0x5c, offset 0x21f
+	// Block 0x5b, offset 0x210
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0x93, hi: 0x93},
-	// Block 0x5d, offset 0x221
+	// Block 0x5c, offset 0x212
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8102, lo: 0xb3, hi: 0xb3},
-	// Block 0x5e, offset 0x223
+	// Block 0x5d, offset 0x214
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0x80, hi: 0x80},
-	// Block 0x5f, offset 0x225
+	// Block 0x5e, offset 0x216
 	{value: 0x0000, lo: 0x05},
 	{value: 0x8132, lo: 0xb0, hi: 0xb0},
 	{value: 0x8132, lo: 0xb2, hi: 0xb3},
 	{value: 0x812d, lo: 0xb4, hi: 0xb4},
 	{value: 0x8132, lo: 0xb7, hi: 0xb8},
 	{value: 0x8132, lo: 0xbe, hi: 0xbf},
-	// Block 0x60, offset 0x22b
+	// Block 0x5f, offset 0x21c
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0x81, hi: 0x81},
 	{value: 0x8104, lo: 0xb6, hi: 0xb6},
-	// Block 0x61, offset 0x22e
+	// Block 0x60, offset 0x21f
 	{value: 0x0008, lo: 0x03},
 	{value: 0x1637, lo: 0x9c, hi: 0x9d},
 	{value: 0x0125, lo: 0x9e, hi: 0x9e},
 	{value: 0x1643, lo: 0x9f, hi: 0x9f},
-	// Block 0x62, offset 0x232
+	// Block 0x61, offset 0x223
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0xad, hi: 0xad},
-	// Block 0x63, offset 0x234
+	// Block 0x62, offset 0x225
 	{value: 0x0000, lo: 0x06},
 	{value: 0xe500, lo: 0x80, hi: 0x80},
 	{value: 0xc600, lo: 0x81, hi: 0x9b},
@@ -6319,21 +6330,21 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0xc600, lo: 0x9d, hi: 0xb7},
 	{value: 0xe500, lo: 0xb8, hi: 0xb8},
 	{value: 0xc600, lo: 0xb9, hi: 0xbf},
-	// Block 0x64, offset 0x23b
+	// Block 0x63, offset 0x22c
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x93},
 	{value: 0xe500, lo: 0x94, hi: 0x94},
 	{value: 0xc600, lo: 0x95, hi: 0xaf},
 	{value: 0xe500, lo: 0xb0, hi: 0xb0},
 	{value: 0xc600, lo: 0xb1, hi: 0xbf},
-	// Block 0x65, offset 0x241
+	// Block 0x64, offset 0x232
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x8b},
 	{value: 0xe500, lo: 0x8c, hi: 0x8c},
 	{value: 0xc600, lo: 0x8d, hi: 0xa7},
 	{value: 0xe500, lo: 0xa8, hi: 0xa8},
 	{value: 0xc600, lo: 0xa9, hi: 0xbf},
-	// Block 0x66, offset 0x247
+	// Block 0x65, offset 0x238
 	{value: 0x0000, lo: 0x07},
 	{value: 0xc600, lo: 0x80, hi: 0x83},
 	{value: 0xe500, lo: 0x84, hi: 0x84},
@@ -6342,60 +6353,60 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0xc600, lo: 0xa1, hi: 0xbb},
 	{value: 0xe500, lo: 0xbc, hi: 0xbc},
 	{value: 0xc600, lo: 0xbd, hi: 0xbf},
-	// Block 0x67, offset 0x24f
+	// Block 0x66, offset 0x240
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x97},
 	{value: 0xe500, lo: 0x98, hi: 0x98},
 	{value: 0xc600, lo: 0x99, hi: 0xb3},
 	{value: 0xe500, lo: 0xb4, hi: 0xb4},
 	{value: 0xc600, lo: 0xb5, hi: 0xbf},
-	// Block 0x68, offset 0x255
+	// Block 0x67, offset 0x246
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x8f},
 	{value: 0xe500, lo: 0x90, hi: 0x90},
 	{value: 0xc600, lo: 0x91, hi: 0xab},
 	{value: 0xe500, lo: 0xac, hi: 0xac},
 	{value: 0xc600, lo: 0xad, hi: 0xbf},
-	// Block 0x69, offset 0x25b
+	// Block 0x68, offset 0x24c
 	{value: 0x0000, lo: 0x05},
 	{value: 0xc600, lo: 0x80, hi: 0x87},
 	{value: 0xe500, lo: 0x88, hi: 0x88},
 	{value: 0xc600, lo: 0x89, hi: 0xa3},
 	{value: 0xe500, lo: 0xa4, hi: 0xa4},
 	{value: 0xc600, lo: 0xa5, hi: 0xbf},
-	// Block 0x6a, offset 0x261
+	// Block 0x69, offset 0x252
 	{value: 0x0000, lo: 0x03},
 	{value: 0xc600, lo: 0x80, hi: 0x87},
 	{value: 0xe500, lo: 0x88, hi: 0x88},
 	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	// Block 0x6b, offset 0x265
+	// Block 0x6a, offset 0x256
 	{value: 0x0002, lo: 0x01},
 	{value: 0x0003, lo: 0x81, hi: 0xbf},
-	// Block 0x6c, offset 0x267
+	// Block 0x6b, offset 0x258
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	// Block 0x6d, offset 0x269
+	// Block 0x6c, offset 0x25a
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0xa0, hi: 0xa0},
-	// Block 0x6e, offset 0x26b
+	// Block 0x6d, offset 0x25c
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xb6, hi: 0xba},
-	// Block 0x6f, offset 0x26d
+	// Block 0x6e, offset 0x25e
 	{value: 0x002c, lo: 0x05},
 	{value: 0x812d, lo: 0x8d, hi: 0x8d},
 	{value: 0x8132, lo: 0x8f, hi: 0x8f},
 	{value: 0x8132, lo: 0xb8, hi: 0xb8},
 	{value: 0x8101, lo: 0xb9, hi: 0xba},
 	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x70, offset 0x273
+	// Block 0x6f, offset 0x264
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0xa5, hi: 0xa5},
 	{value: 0x812d, lo: 0xa6, hi: 0xa6},
-	// Block 0x71, offset 0x276
+	// Block 0x70, offset 0x267
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x86, hi: 0x86},
 	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x72, offset 0x279
+	// Block 0x71, offset 0x26a
 	{value: 0x17fe, lo: 0x07},
 	{value: 0xa000, lo: 0x99, hi: 0x99},
 	{value: 0x4238, lo: 0x9a, hi: 0x9a},
@@ -6404,7 +6415,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0xa000, lo: 0xa5, hi: 0xa5},
 	{value: 0x424c, lo: 0xab, hi: 0xab},
 	{value: 0x8104, lo: 0xb9, hi: 0xba},
-	// Block 0x73, offset 0x281
+	// Block 0x72, offset 0x272
 	{value: 0x0000, lo: 0x06},
 	{value: 0x8132, lo: 0x80, hi: 0x82},
 	{value: 0x9900, lo: 0xa7, hi: 0xa7},
@@ -6412,18 +6423,18 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x2d88, lo: 0xaf, hi: 0xaf},
 	{value: 0xa000, lo: 0xb1, hi: 0xb2},
 	{value: 0x8104, lo: 0xb3, hi: 0xb4},
-	// Block 0x74, offset 0x288
+	// Block 0x73, offset 0x279
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x80, hi: 0x80},
 	{value: 0x8102, lo: 0x8a, hi: 0x8a},
-	// Block 0x75, offset 0x28b
+	// Block 0x74, offset 0x27c
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0xb5, hi: 0xb5},
 	{value: 0x8102, lo: 0xb6, hi: 0xb6},
-	// Block 0x76, offset 0x28e
+	// Block 0x75, offset 0x27f
 	{value: 0x0002, lo: 0x01},
 	{value: 0x8102, lo: 0xa9, hi: 0xaa},
-	// Block 0x77, offset 0x290
+	// Block 0x76, offset 0x281
 	{value: 0x0000, lo: 0x07},
 	{value: 0xa000, lo: 0x87, hi: 0x87},
 	{value: 0x2d92, lo: 0x8b, hi: 0x8b},
@@ -6432,11 +6443,11 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x9900, lo: 0x97, hi: 0x97},
 	{value: 0x8132, lo: 0xa6, hi: 0xac},
 	{value: 0x8132, lo: 0xb0, hi: 0xb4},
-	// Block 0x78, offset 0x298
+	// Block 0x77, offset 0x289
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x82, hi: 0x82},
 	{value: 0x8102, lo: 0x86, hi: 0x86},
-	// Block 0x79, offset 0x29b
+	// Block 0x78, offset 0x28c
 	{value: 0x6b5a, lo: 0x06},
 	{value: 0x9900, lo: 0xb0, hi: 0xb0},
 	{value: 0xa000, lo: 0xb9, hi: 0xb9},
@@ -6444,82 +6455,95 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x2db0, lo: 0xbb, hi: 0xbb},
 	{value: 0x2da6, lo: 0xbc, hi: 0xbd},
 	{value: 0x2dba, lo: 0xbe, hi: 0xbe},
-	// Block 0x7a, offset 0x2a2
+	// Block 0x79, offset 0x293
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0x82, hi: 0x82},
 	{value: 0x8102, lo: 0x83, hi: 0x83},
-	// Block 0x7b, offset 0x2a5
+	// Block 0x7a, offset 0x296
 	{value: 0x0000, lo: 0x05},
 	{value: 0x9900, lo: 0xaf, hi: 0xaf},
 	{value: 0xa000, lo: 0xb8, hi: 0xb9},
 	{value: 0x2dc4, lo: 0xba, hi: 0xba},
 	{value: 0x2dce, lo: 0xbb, hi: 0xbb},
 	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x7c, offset 0x2ab
+	// Block 0x7b, offset 0x29c
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8102, lo: 0x80, hi: 0x80},
-	// Block 0x7d, offset 0x2ad
+	// Block 0x7c, offset 0x29e
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x7e, offset 0x2af
+	// Block 0x7d, offset 0x2a0
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8104, lo: 0xb6, hi: 0xb6},
 	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	// Block 0x7f, offset 0x2b2
+	// Block 0x7e, offset 0x2a3
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8104, lo: 0xab, hi: 0xab},
-	// Block 0x80, offset 0x2b4
+	// Block 0x7f, offset 0x2a5
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xb4, hi: 0xb4},
+	// Block 0x80, offset 0x2a7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x87, hi: 0x87},
+	// Block 0x81, offset 0x2a9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x99, hi: 0x99},
+	// Block 0x82, offset 0x2ab
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0x82, hi: 0x82},
+	{value: 0x8104, lo: 0x84, hi: 0x85},
+	// Block 0x83, offset 0x2ae
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8101, lo: 0xb0, hi: 0xb4},
-	// Block 0x81, offset 0x2b6
+	// Block 0x84, offset 0x2b0
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0xb0, hi: 0xb6},
-	// Block 0x82, offset 0x2b8
+	// Block 0x85, offset 0x2b2
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8101, lo: 0x9e, hi: 0x9e},
-	// Block 0x83, offset 0x2ba
+	// Block 0x86, offset 0x2b4
 	{value: 0x0000, lo: 0x0c},
-	{value: 0x4662, lo: 0x9e, hi: 0x9e},
-	{value: 0x466c, lo: 0x9f, hi: 0x9f},
-	{value: 0x46a0, lo: 0xa0, hi: 0xa0},
-	{value: 0x46ae, lo: 0xa1, hi: 0xa1},
-	{value: 0x46bc, lo: 0xa2, hi: 0xa2},
-	{value: 0x46ca, lo: 0xa3, hi: 0xa3},
-	{value: 0x46d8, lo: 0xa4, hi: 0xa4},
+	{value: 0x45cc, lo: 0x9e, hi: 0x9e},
+	{value: 0x45d6, lo: 0x9f, hi: 0x9f},
+	{value: 0x460a, lo: 0xa0, hi: 0xa0},
+	{value: 0x4618, lo: 0xa1, hi: 0xa1},
+	{value: 0x4626, lo: 0xa2, hi: 0xa2},
+	{value: 0x4634, lo: 0xa3, hi: 0xa3},
+	{value: 0x4642, lo: 0xa4, hi: 0xa4},
 	{value: 0x812b, lo: 0xa5, hi: 0xa6},
 	{value: 0x8101, lo: 0xa7, hi: 0xa9},
 	{value: 0x8130, lo: 0xad, hi: 0xad},
 	{value: 0x812b, lo: 0xae, hi: 0xb2},
 	{value: 0x812d, lo: 0xbb, hi: 0xbf},
-	// Block 0x84, offset 0x2c7
+	// Block 0x87, offset 0x2c1
 	{value: 0x0000, lo: 0x09},
 	{value: 0x812d, lo: 0x80, hi: 0x82},
 	{value: 0x8132, lo: 0x85, hi: 0x89},
 	{value: 0x812d, lo: 0x8a, hi: 0x8b},
 	{value: 0x8132, lo: 0xaa, hi: 0xad},
-	{value: 0x4676, lo: 0xbb, hi: 0xbb},
-	{value: 0x4680, lo: 0xbc, hi: 0xbc},
-	{value: 0x46e6, lo: 0xbd, hi: 0xbd},
-	{value: 0x4702, lo: 0xbe, hi: 0xbe},
-	{value: 0x46f4, lo: 0xbf, hi: 0xbf},
-	// Block 0x85, offset 0x2d1
+	{value: 0x45e0, lo: 0xbb, hi: 0xbb},
+	{value: 0x45ea, lo: 0xbc, hi: 0xbc},
+	{value: 0x4650, lo: 0xbd, hi: 0xbd},
+	{value: 0x466c, lo: 0xbe, hi: 0xbe},
+	{value: 0x465e, lo: 0xbf, hi: 0xbf},
+	// Block 0x88, offset 0x2cb
 	{value: 0x0000, lo: 0x01},
-	{value: 0x4710, lo: 0x80, hi: 0x80},
-	// Block 0x86, offset 0x2d3
+	{value: 0x467a, lo: 0x80, hi: 0x80},
+	// Block 0x89, offset 0x2cd
 	{value: 0x0000, lo: 0x01},
 	{value: 0x8132, lo: 0x82, hi: 0x84},
-	// Block 0x87, offset 0x2d5
+	// Block 0x8a, offset 0x2cf
 	{value: 0x0002, lo: 0x03},
 	{value: 0x0043, lo: 0x80, hi: 0x99},
 	{value: 0x0083, lo: 0x9a, hi: 0xb3},
 	{value: 0x0043, lo: 0xb4, hi: 0xbf},
-	// Block 0x88, offset 0x2d9
+	// Block 0x8b, offset 0x2d3
 	{value: 0x0002, lo: 0x04},
 	{value: 0x005b, lo: 0x80, hi: 0x8d},
 	{value: 0x0083, lo: 0x8e, hi: 0x94},
 	{value: 0x0093, lo: 0x96, hi: 0xa7},
 	{value: 0x0043, lo: 0xa8, hi: 0xbf},
-	// Block 0x89, offset 0x2de
+	// Block 0x8c, offset 0x2d8
 	{value: 0x0002, lo: 0x0b},
 	{value: 0x0073, lo: 0x80, hi: 0x81},
 	{value: 0x0083, lo: 0x82, hi: 0x9b},
@@ -6532,13 +6556,13 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x0083, lo: 0xb6, hi: 0xb9},
 	{value: 0x008d, lo: 0xbb, hi: 0xbb},
 	{value: 0x0091, lo: 0xbd, hi: 0xbf},
-	// Block 0x8a, offset 0x2ea
+	// Block 0x8d, offset 0x2e4
 	{value: 0x0002, lo: 0x04},
 	{value: 0x0097, lo: 0x80, hi: 0x83},
 	{value: 0x00a1, lo: 0x85, hi: 0x8f},
 	{value: 0x0043, lo: 0x90, hi: 0xa9},
 	{value: 0x0083, lo: 0xaa, hi: 0xbf},
-	// Block 0x8b, offset 0x2ef
+	// Block 0x8e, offset 0x2e9
 	{value: 0x0002, lo: 0x08},
 	{value: 0x00af, lo: 0x80, hi: 0x83},
 	{value: 0x0043, lo: 0x84, hi: 0x85},
@@ -6548,36 +6572,36 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x0083, lo: 0x9e, hi: 0xb7},
 	{value: 0x0043, lo: 0xb8, hi: 0xb9},
 	{value: 0x0049, lo: 0xbb, hi: 0xbe},
-	// Block 0x8c, offset 0x2f8
+	// Block 0x8f, offset 0x2f2
 	{value: 0x0002, lo: 0x05},
 	{value: 0x0053, lo: 0x80, hi: 0x84},
 	{value: 0x005f, lo: 0x86, hi: 0x86},
 	{value: 0x0067, lo: 0x8a, hi: 0x90},
 	{value: 0x0083, lo: 0x92, hi: 0xab},
 	{value: 0x0043, lo: 0xac, hi: 0xbf},
-	// Block 0x8d, offset 0x2fe
+	// Block 0x90, offset 0x2f8
 	{value: 0x0002, lo: 0x04},
 	{value: 0x006b, lo: 0x80, hi: 0x85},
 	{value: 0x0083, lo: 0x86, hi: 0x9f},
 	{value: 0x0043, lo: 0xa0, hi: 0xb9},
 	{value: 0x0083, lo: 0xba, hi: 0xbf},
-	// Block 0x8e, offset 0x303
+	// Block 0x91, offset 0x2fd
 	{value: 0x0002, lo: 0x03},
 	{value: 0x008f, lo: 0x80, hi: 0x93},
 	{value: 0x0043, lo: 0x94, hi: 0xad},
 	{value: 0x0083, lo: 0xae, hi: 0xbf},
-	// Block 0x8f, offset 0x307
+	// Block 0x92, offset 0x301
 	{value: 0x0002, lo: 0x04},
 	{value: 0x00a7, lo: 0x80, hi: 0x87},
 	{value: 0x0043, lo: 0x88, hi: 0xa1},
 	{value: 0x0083, lo: 0xa2, hi: 0xbb},
 	{value: 0x0043, lo: 0xbc, hi: 0xbf},
-	// Block 0x90, offset 0x30c
+	// Block 0x93, offset 0x306
 	{value: 0x0002, lo: 0x03},
 	{value: 0x004b, lo: 0x80, hi: 0x95},
 	{value: 0x0083, lo: 0x96, hi: 0xaf},
 	{value: 0x0043, lo: 0xb0, hi: 0xbf},
-	// Block 0x91, offset 0x310
+	// Block 0x94, offset 0x30a
 	{value: 0x0003, lo: 0x0f},
 	{value: 0x01b8, lo: 0x80, hi: 0x80},
 	{value: 0x045f, lo: 0x81, hi: 0x81},
@@ -6594,7 +6618,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x01a6, lo: 0xb4, hi: 0xba},
 	{value: 0x045f, lo: 0xbb, hi: 0xbb},
 	{value: 0x01bb, lo: 0xbc, hi: 0xbf},
-	// Block 0x92, offset 0x320
+	// Block 0x95, offset 0x31a
 	{value: 0x0003, lo: 0x0d},
 	{value: 0x01c7, lo: 0x80, hi: 0x94},
 	{value: 0x045b, lo: 0x95, hi: 0x95},
@@ -6609,7 +6633,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x01a6, lo: 0xae, hi: 0xb4},
 	{value: 0x045f, lo: 0xb5, hi: 0xb5},
 	{value: 0x01bb, lo: 0xb6, hi: 0xbf},
-	// Block 0x93, offset 0x32e
+	// Block 0x96, offset 0x328
 	{value: 0x0003, lo: 0x0d},
 	{value: 0x01d9, lo: 0x80, hi: 0x8e},
 	{value: 0x045b, lo: 0x8f, hi: 0x8f},
@@ -6624,7 +6648,7 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x01a6, lo: 0xa8, hi: 0xae},
 	{value: 0x045f, lo: 0xaf, hi: 0xaf},
 	{value: 0x01bb, lo: 0xb0, hi: 0xbf},
-	// Block 0x94, offset 0x33c
+	// Block 0x97, offset 0x336
 	{value: 0x0003, lo: 0x0d},
 	{value: 0x01eb, lo: 0x80, hi: 0x88},
 	{value: 0x045b, lo: 0x89, hi: 0x89},
@@ -6639,21 +6663,21 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x01a6, lo: 0xa2, hi: 0xa8},
 	{value: 0x045f, lo: 0xa9, hi: 0xa9},
 	{value: 0x01bb, lo: 0xaa, hi: 0xbf},
-	// Block 0x95, offset 0x34a
+	// Block 0x98, offset 0x344
 	{value: 0x0000, lo: 0x05},
 	{value: 0x8132, lo: 0x80, hi: 0x86},
 	{value: 0x8132, lo: 0x88, hi: 0x98},
 	{value: 0x8132, lo: 0x9b, hi: 0xa1},
 	{value: 0x8132, lo: 0xa3, hi: 0xa4},
 	{value: 0x8132, lo: 0xa6, hi: 0xaa},
-	// Block 0x96, offset 0x350
+	// Block 0x99, offset 0x34a
 	{value: 0x0000, lo: 0x01},
 	{value: 0x812d, lo: 0x90, hi: 0x96},
-	// Block 0x97, offset 0x352
+	// Block 0x9a, offset 0x34c
 	{value: 0x0000, lo: 0x02},
 	{value: 0x8132, lo: 0x84, hi: 0x89},
 	{value: 0x8102, lo: 0x8a, hi: 0x8a},
-	// Block 0x98, offset 0x355
+	// Block 0x9b, offset 0x34f
 	{value: 0x0002, lo: 0x09},
 	{value: 0x0063, lo: 0x80, hi: 0x89},
 	{value: 0x1951, lo: 0x8a, hi: 0x8a},
@@ -6664,10 +6688,10 @@ var nfkcSparseValues = [875]valueRange{
 	{value: 0x19ae, lo: 0x8f, hi: 0x8f},
 	{value: 0x197b, lo: 0xaa, hi: 0xaa},
 	{value: 0x197e, lo: 0xab, hi: 0xab},
-	// Block 0x99, offset 0x35f
+	// Block 0x9c, offset 0x359
 	{value: 0x0000, lo: 0x01},
 	{value: 0x193f, lo: 0x90, hi: 0x90},
-	// Block 0x9a, offset 0x361
+	// Block 0x9d, offset 0x35b
 	{value: 0x0028, lo: 0x09},
 	{value: 0x2862, lo: 0x80, hi: 0x80},
 	{value: 0x2826, lo: 0x81, hi: 0x81},
@@ -7624,4 +7648,4 @@ var recompMap = map[uint32]rune{
 	0x15B915AF: 0x115BB,
 }
 
-// Total size of tables: 53KB (53976 bytes)
+// Total size of tables: 53KB (54226 bytes)
diff --git a/vendor/golang.org/x/text/unicode/norm/transform.go b/vendor/golang.org/x/text/unicode/norm/transform.go
index 8589067cde..9f47efbaf6 100644
--- a/vendor/golang.org/x/text/unicode/norm/transform.go
+++ b/vendor/golang.org/x/text/unicode/norm/transform.go
@@ -40,7 +40,7 @@ func (f Form) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error)
 }
 
 func flushTransform(rb *reorderBuffer) bool {
-	// Write out (must fully fit in dst, or else it is a ErrShortDst).
+	// Write out (must fully fit in dst, or else it is an ErrShortDst).
 	if len(rb.out) < rb.nrune*utf8.UTFMax {
 		return false
 	}
diff --git a/vendor/golang.org/x/text/width/kind_string.go b/vendor/golang.org/x/text/width/kind_string.go
index ab4fee542f..49bfbf7268 100644
--- a/vendor/golang.org/x/text/width/kind_string.go
+++ b/vendor/golang.org/x/text/width/kind_string.go
@@ -1,4 +1,4 @@
-// Code generated by "stringer -type=Kind"; DO NOT EDIT
+// Code generated by "stringer -type=Kind"; DO NOT EDIT.
 
 package width
 
diff --git a/vendor/golang.org/x/text/width/tables.go b/vendor/golang.org/x/text/width/tables.go
index 242da0fdb9..710fd75254 100644
--- a/vendor/golang.org/x/text/width/tables.go
+++ b/vendor/golang.org/x/text/width/tables.go
@@ -1,9 +1,9 @@
-// This file was generated by go generate; DO NOT EDIT
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 package width
 
 // UnicodeVersion is the Unicode version from which the tables in this package are derived.
-const UnicodeVersion = "9.0.0"
+const UnicodeVersion = "10.0.0"
 
 // lookup returns the trie value for the first UTF-8 encoding in s and
 // the width in bytes of this encoding. The size will be 0 if s does not
@@ -175,7 +175,7 @@ func (t *widthTrie) lookupStringUnsafe(s string) uint16 {
 	return 0
 }
 
-// widthTrie. Total size: 14080 bytes (13.75 KiB). Checksum: 3b8aeb3dc03667a3.
+// widthTrie. Total size: 14336 bytes (14.00 KiB). Checksum: c59df54630d3dc4a.
 type widthTrie struct{}
 
 func newWidthTrie(i int) *widthTrie {
@@ -190,9 +190,9 @@ func (t *widthTrie) lookupValue(n uint32, b byte) uint16 {
 	}
 }
 
-// widthValues: 99 blocks, 6336 entries, 12672 bytes
+// widthValues: 101 blocks, 6464 entries, 12928 bytes
 // The third block is the zero block.
-var widthValues = [6336]uint16{
+var widthValues = [6464]uint16{
 	// Block 0x0, offset 0x0
 	0x20: 0x6001, 0x21: 0x6002, 0x22: 0x6002, 0x23: 0x6002,
 	0x24: 0x6002, 0x25: 0x6002, 0x26: 0x6002, 0x27: 0x6002, 0x28: 0x6002, 0x29: 0x6002,
@@ -606,7 +606,7 @@ var widthValues = [6336]uint16{
 	0xd98: 0x4000, 0xd99: 0x4000, 0xd9a: 0x4000, 0xd9b: 0x4000, 0xd9c: 0x4000, 0xd9d: 0x4000,
 	0xd9e: 0x4000, 0xd9f: 0x4000, 0xda0: 0x4000, 0xda1: 0x4000, 0xda2: 0x4000, 0xda3: 0x4000,
 	0xda4: 0x4000, 0xda5: 0x4000, 0xda6: 0x4000, 0xda7: 0x4000, 0xda8: 0x4000, 0xda9: 0x4000,
-	0xdaa: 0x4000, 0xdab: 0x4000, 0xdac: 0x4000, 0xdad: 0x4000,
+	0xdaa: 0x4000, 0xdab: 0x4000, 0xdac: 0x4000, 0xdad: 0x4000, 0xdae: 0x4000,
 	0xdb1: 0x403e, 0xdb2: 0x403e, 0xdb3: 0x403e, 0xdb4: 0x403e, 0xdb5: 0x403e,
 	0xdb6: 0x403e, 0xdb7: 0x403e, 0xdb8: 0x403e, 0xdb9: 0x403e, 0xdba: 0x403e, 0xdbb: 0x403e,
 	0xdbc: 0x403e, 0xdbd: 0x403e, 0xdbe: 0x403e, 0xdbf: 0x403e,
@@ -773,7 +773,7 @@ var widthValues = [6336]uint16{
 	0x11aa: 0xb092, 0x11ab: 0xb091, 0x11ac: 0xb093, 0x11ad: 0xb094, 0x11ae: 0xb095,
 	0x11bd: 0x2000,
 	// Block 0x47, offset 0x11c0
-	0x11e0: 0x4000,
+	0x11e0: 0x4000, 0x11e1: 0x4000,
 	// Block 0x48, offset 0x1200
 	0x1200: 0x4000, 0x1201: 0x4000, 0x1202: 0x4000, 0x1203: 0x4000, 0x1204: 0x4000, 0x1205: 0x4000,
 	0x1206: 0x4000, 0x1207: 0x4000, 0x1208: 0x4000, 0x1209: 0x4000, 0x120a: 0x4000, 0x120b: 0x4000,
@@ -794,109 +794,108 @@ var widthValues = [6336]uint16{
 	0x126a: 0x4000, 0x126b: 0x4000, 0x126c: 0x4000, 0x126d: 0x4000, 0x126e: 0x4000, 0x126f: 0x4000,
 	0x1270: 0x4000, 0x1271: 0x4000, 0x1272: 0x4000,
 	// Block 0x4a, offset 0x1280
-	0x1280: 0x4000, 0x1281: 0x4000,
+	0x1280: 0x4000, 0x1281: 0x4000, 0x1282: 0x4000, 0x1283: 0x4000, 0x1284: 0x4000, 0x1285: 0x4000,
+	0x1286: 0x4000, 0x1287: 0x4000, 0x1288: 0x4000, 0x1289: 0x4000, 0x128a: 0x4000, 0x128b: 0x4000,
+	0x128c: 0x4000, 0x128d: 0x4000, 0x128e: 0x4000, 0x128f: 0x4000, 0x1290: 0x4000, 0x1291: 0x4000,
+	0x1292: 0x4000, 0x1293: 0x4000, 0x1294: 0x4000, 0x1295: 0x4000, 0x1296: 0x4000, 0x1297: 0x4000,
+	0x1298: 0x4000, 0x1299: 0x4000, 0x129a: 0x4000, 0x129b: 0x4000, 0x129c: 0x4000, 0x129d: 0x4000,
+	0x129e: 0x4000,
 	// Block 0x4b, offset 0x12c0
-	0x12c4: 0x4000,
+	0x12f0: 0x4000, 0x12f1: 0x4000, 0x12f2: 0x4000, 0x12f3: 0x4000, 0x12f4: 0x4000, 0x12f5: 0x4000,
+	0x12f6: 0x4000, 0x12f7: 0x4000, 0x12f8: 0x4000, 0x12f9: 0x4000, 0x12fa: 0x4000, 0x12fb: 0x4000,
+	0x12fc: 0x4000, 0x12fd: 0x4000, 0x12fe: 0x4000, 0x12ff: 0x4000,
 	// Block 0x4c, offset 0x1300
-	0x130f: 0x4000,
+	0x1300: 0x4000, 0x1301: 0x4000, 0x1302: 0x4000, 0x1303: 0x4000, 0x1304: 0x4000, 0x1305: 0x4000,
+	0x1306: 0x4000, 0x1307: 0x4000, 0x1308: 0x4000, 0x1309: 0x4000, 0x130a: 0x4000, 0x130b: 0x4000,
+	0x130c: 0x4000, 0x130d: 0x4000, 0x130e: 0x4000, 0x130f: 0x4000, 0x1310: 0x4000, 0x1311: 0x4000,
+	0x1312: 0x4000, 0x1313: 0x4000, 0x1314: 0x4000, 0x1315: 0x4000, 0x1316: 0x4000, 0x1317: 0x4000,
+	0x1318: 0x4000, 0x1319: 0x4000, 0x131a: 0x4000, 0x131b: 0x4000, 0x131c: 0x4000, 0x131d: 0x4000,
+	0x131e: 0x4000, 0x131f: 0x4000, 0x1320: 0x4000, 0x1321: 0x4000, 0x1322: 0x4000, 0x1323: 0x4000,
+	0x1324: 0x4000, 0x1325: 0x4000, 0x1326: 0x4000, 0x1327: 0x4000, 0x1328: 0x4000, 0x1329: 0x4000,
+	0x132a: 0x4000, 0x132b: 0x4000, 0x132c: 0x4000, 0x132d: 0x4000, 0x132e: 0x4000, 0x132f: 0x4000,
+	0x1330: 0x4000, 0x1331: 0x4000, 0x1332: 0x4000, 0x1333: 0x4000, 0x1334: 0x4000, 0x1335: 0x4000,
+	0x1336: 0x4000, 0x1337: 0x4000, 0x1338: 0x4000, 0x1339: 0x4000, 0x133a: 0x4000, 0x133b: 0x4000,
 	// Block 0x4d, offset 0x1340
-	0x1340: 0x2000, 0x1341: 0x2000, 0x1342: 0x2000, 0x1343: 0x2000, 0x1344: 0x2000, 0x1345: 0x2000,
-	0x1346: 0x2000, 0x1347: 0x2000, 0x1348: 0x2000, 0x1349: 0x2000, 0x134a: 0x2000,
-	0x1350: 0x2000, 0x1351: 0x2000,
-	0x1352: 0x2000, 0x1353: 0x2000, 0x1354: 0x2000, 0x1355: 0x2000, 0x1356: 0x2000, 0x1357: 0x2000,
-	0x1358: 0x2000, 0x1359: 0x2000, 0x135a: 0x2000, 0x135b: 0x2000, 0x135c: 0x2000, 0x135d: 0x2000,
-	0x135e: 0x2000, 0x135f: 0x2000, 0x1360: 0x2000, 0x1361: 0x2000, 0x1362: 0x2000, 0x1363: 0x2000,
-	0x1364: 0x2000, 0x1365: 0x2000, 0x1366: 0x2000, 0x1367: 0x2000, 0x1368: 0x2000, 0x1369: 0x2000,
-	0x136a: 0x2000, 0x136b: 0x2000, 0x136c: 0x2000, 0x136d: 0x2000,
-	0x1370: 0x2000, 0x1371: 0x2000, 0x1372: 0x2000, 0x1373: 0x2000, 0x1374: 0x2000, 0x1375: 0x2000,
-	0x1376: 0x2000, 0x1377: 0x2000, 0x1378: 0x2000, 0x1379: 0x2000, 0x137a: 0x2000, 0x137b: 0x2000,
-	0x137c: 0x2000, 0x137d: 0x2000, 0x137e: 0x2000, 0x137f: 0x2000,
+	0x1344: 0x4000,
 	// Block 0x4e, offset 0x1380
-	0x1380: 0x2000, 0x1381: 0x2000, 0x1382: 0x2000, 0x1383: 0x2000, 0x1384: 0x2000, 0x1385: 0x2000,
-	0x1386: 0x2000, 0x1387: 0x2000, 0x1388: 0x2000, 0x1389: 0x2000, 0x138a: 0x2000, 0x138b: 0x2000,
-	0x138c: 0x2000, 0x138d: 0x2000, 0x138e: 0x2000, 0x138f: 0x2000, 0x1390: 0x2000, 0x1391: 0x2000,
-	0x1392: 0x2000, 0x1393: 0x2000, 0x1394: 0x2000, 0x1395: 0x2000, 0x1396: 0x2000, 0x1397: 0x2000,
-	0x1398: 0x2000, 0x1399: 0x2000, 0x139a: 0x2000, 0x139b: 0x2000, 0x139c: 0x2000, 0x139d: 0x2000,
-	0x139e: 0x2000, 0x139f: 0x2000, 0x13a0: 0x2000, 0x13a1: 0x2000, 0x13a2: 0x2000, 0x13a3: 0x2000,
-	0x13a4: 0x2000, 0x13a5: 0x2000, 0x13a6: 0x2000, 0x13a7: 0x2000, 0x13a8: 0x2000, 0x13a9: 0x2000,
-	0x13b0: 0x2000, 0x13b1: 0x2000, 0x13b2: 0x2000, 0x13b3: 0x2000, 0x13b4: 0x2000, 0x13b5: 0x2000,
-	0x13b6: 0x2000, 0x13b7: 0x2000, 0x13b8: 0x2000, 0x13b9: 0x2000, 0x13ba: 0x2000, 0x13bb: 0x2000,
-	0x13bc: 0x2000, 0x13bd: 0x2000, 0x13be: 0x2000, 0x13bf: 0x2000,
+	0x138f: 0x4000,
 	// Block 0x4f, offset 0x13c0
 	0x13c0: 0x2000, 0x13c1: 0x2000, 0x13c2: 0x2000, 0x13c3: 0x2000, 0x13c4: 0x2000, 0x13c5: 0x2000,
-	0x13c6: 0x2000, 0x13c7: 0x2000, 0x13c8: 0x2000, 0x13c9: 0x2000, 0x13ca: 0x2000, 0x13cb: 0x2000,
-	0x13cc: 0x2000, 0x13cd: 0x2000, 0x13ce: 0x4000, 0x13cf: 0x2000, 0x13d0: 0x2000, 0x13d1: 0x4000,
-	0x13d2: 0x4000, 0x13d3: 0x4000, 0x13d4: 0x4000, 0x13d5: 0x4000, 0x13d6: 0x4000, 0x13d7: 0x4000,
-	0x13d8: 0x4000, 0x13d9: 0x4000, 0x13da: 0x4000, 0x13db: 0x2000, 0x13dc: 0x2000, 0x13dd: 0x2000,
+	0x13c6: 0x2000, 0x13c7: 0x2000, 0x13c8: 0x2000, 0x13c9: 0x2000, 0x13ca: 0x2000,
+	0x13d0: 0x2000, 0x13d1: 0x2000,
+	0x13d2: 0x2000, 0x13d3: 0x2000, 0x13d4: 0x2000, 0x13d5: 0x2000, 0x13d6: 0x2000, 0x13d7: 0x2000,
+	0x13d8: 0x2000, 0x13d9: 0x2000, 0x13da: 0x2000, 0x13db: 0x2000, 0x13dc: 0x2000, 0x13dd: 0x2000,
 	0x13de: 0x2000, 0x13df: 0x2000, 0x13e0: 0x2000, 0x13e1: 0x2000, 0x13e2: 0x2000, 0x13e3: 0x2000,
 	0x13e4: 0x2000, 0x13e5: 0x2000, 0x13e6: 0x2000, 0x13e7: 0x2000, 0x13e8: 0x2000, 0x13e9: 0x2000,
-	0x13ea: 0x2000, 0x13eb: 0x2000, 0x13ec: 0x2000,
+	0x13ea: 0x2000, 0x13eb: 0x2000, 0x13ec: 0x2000, 0x13ed: 0x2000,
+	0x13f0: 0x2000, 0x13f1: 0x2000, 0x13f2: 0x2000, 0x13f3: 0x2000, 0x13f4: 0x2000, 0x13f5: 0x2000,
+	0x13f6: 0x2000, 0x13f7: 0x2000, 0x13f8: 0x2000, 0x13f9: 0x2000, 0x13fa: 0x2000, 0x13fb: 0x2000,
+	0x13fc: 0x2000, 0x13fd: 0x2000, 0x13fe: 0x2000, 0x13ff: 0x2000,
 	// Block 0x50, offset 0x1400
-	0x1400: 0x4000, 0x1401: 0x4000, 0x1402: 0x4000,
-	0x1410: 0x4000, 0x1411: 0x4000,
-	0x1412: 0x4000, 0x1413: 0x4000, 0x1414: 0x4000, 0x1415: 0x4000, 0x1416: 0x4000, 0x1417: 0x4000,
-	0x1418: 0x4000, 0x1419: 0x4000, 0x141a: 0x4000, 0x141b: 0x4000, 0x141c: 0x4000, 0x141d: 0x4000,
-	0x141e: 0x4000, 0x141f: 0x4000, 0x1420: 0x4000, 0x1421: 0x4000, 0x1422: 0x4000, 0x1423: 0x4000,
-	0x1424: 0x4000, 0x1425: 0x4000, 0x1426: 0x4000, 0x1427: 0x4000, 0x1428: 0x4000, 0x1429: 0x4000,
-	0x142a: 0x4000, 0x142b: 0x4000, 0x142c: 0x4000, 0x142d: 0x4000, 0x142e: 0x4000, 0x142f: 0x4000,
-	0x1430: 0x4000, 0x1431: 0x4000, 0x1432: 0x4000, 0x1433: 0x4000, 0x1434: 0x4000, 0x1435: 0x4000,
-	0x1436: 0x4000, 0x1437: 0x4000, 0x1438: 0x4000, 0x1439: 0x4000, 0x143a: 0x4000, 0x143b: 0x4000,
+	0x1400: 0x2000, 0x1401: 0x2000, 0x1402: 0x2000, 0x1403: 0x2000, 0x1404: 0x2000, 0x1405: 0x2000,
+	0x1406: 0x2000, 0x1407: 0x2000, 0x1408: 0x2000, 0x1409: 0x2000, 0x140a: 0x2000, 0x140b: 0x2000,
+	0x140c: 0x2000, 0x140d: 0x2000, 0x140e: 0x2000, 0x140f: 0x2000, 0x1410: 0x2000, 0x1411: 0x2000,
+	0x1412: 0x2000, 0x1413: 0x2000, 0x1414: 0x2000, 0x1415: 0x2000, 0x1416: 0x2000, 0x1417: 0x2000,
+	0x1418: 0x2000, 0x1419: 0x2000, 0x141a: 0x2000, 0x141b: 0x2000, 0x141c: 0x2000, 0x141d: 0x2000,
+	0x141e: 0x2000, 0x141f: 0x2000, 0x1420: 0x2000, 0x1421: 0x2000, 0x1422: 0x2000, 0x1423: 0x2000,
+	0x1424: 0x2000, 0x1425: 0x2000, 0x1426: 0x2000, 0x1427: 0x2000, 0x1428: 0x2000, 0x1429: 0x2000,
+	0x1430: 0x2000, 0x1431: 0x2000, 0x1432: 0x2000, 0x1433: 0x2000, 0x1434: 0x2000, 0x1435: 0x2000,
+	0x1436: 0x2000, 0x1437: 0x2000, 0x1438: 0x2000, 0x1439: 0x2000, 0x143a: 0x2000, 0x143b: 0x2000,
+	0x143c: 0x2000, 0x143d: 0x2000, 0x143e: 0x2000, 0x143f: 0x2000,
 	// Block 0x51, offset 0x1440
-	0x1440: 0x4000, 0x1441: 0x4000, 0x1442: 0x4000, 0x1443: 0x4000, 0x1444: 0x4000, 0x1445: 0x4000,
-	0x1446: 0x4000, 0x1447: 0x4000, 0x1448: 0x4000,
-	0x1450: 0x4000, 0x1451: 0x4000,
+	0x1440: 0x2000, 0x1441: 0x2000, 0x1442: 0x2000, 0x1443: 0x2000, 0x1444: 0x2000, 0x1445: 0x2000,
+	0x1446: 0x2000, 0x1447: 0x2000, 0x1448: 0x2000, 0x1449: 0x2000, 0x144a: 0x2000, 0x144b: 0x2000,
+	0x144c: 0x2000, 0x144d: 0x2000, 0x144e: 0x4000, 0x144f: 0x2000, 0x1450: 0x2000, 0x1451: 0x4000,
+	0x1452: 0x4000, 0x1453: 0x4000, 0x1454: 0x4000, 0x1455: 0x4000, 0x1456: 0x4000, 0x1457: 0x4000,
+	0x1458: 0x4000, 0x1459: 0x4000, 0x145a: 0x4000, 0x145b: 0x2000, 0x145c: 0x2000, 0x145d: 0x2000,
+	0x145e: 0x2000, 0x145f: 0x2000, 0x1460: 0x2000, 0x1461: 0x2000, 0x1462: 0x2000, 0x1463: 0x2000,
+	0x1464: 0x2000, 0x1465: 0x2000, 0x1466: 0x2000, 0x1467: 0x2000, 0x1468: 0x2000, 0x1469: 0x2000,
+	0x146a: 0x2000, 0x146b: 0x2000, 0x146c: 0x2000,
 	// Block 0x52, offset 0x1480
-	0x1480: 0x4000, 0x1481: 0x4000, 0x1482: 0x4000, 0x1483: 0x4000, 0x1484: 0x4000, 0x1485: 0x4000,
-	0x1486: 0x4000, 0x1487: 0x4000, 0x1488: 0x4000, 0x1489: 0x4000, 0x148a: 0x4000, 0x148b: 0x4000,
-	0x148c: 0x4000, 0x148d: 0x4000, 0x148e: 0x4000, 0x148f: 0x4000, 0x1490: 0x4000, 0x1491: 0x4000,
+	0x1480: 0x4000, 0x1481: 0x4000, 0x1482: 0x4000,
+	0x1490: 0x4000, 0x1491: 0x4000,
 	0x1492: 0x4000, 0x1493: 0x4000, 0x1494: 0x4000, 0x1495: 0x4000, 0x1496: 0x4000, 0x1497: 0x4000,
 	0x1498: 0x4000, 0x1499: 0x4000, 0x149a: 0x4000, 0x149b: 0x4000, 0x149c: 0x4000, 0x149d: 0x4000,
-	0x149e: 0x4000, 0x149f: 0x4000, 0x14a0: 0x4000,
-	0x14ad: 0x4000, 0x14ae: 0x4000, 0x14af: 0x4000,
+	0x149e: 0x4000, 0x149f: 0x4000, 0x14a0: 0x4000, 0x14a1: 0x4000, 0x14a2: 0x4000, 0x14a3: 0x4000,
+	0x14a4: 0x4000, 0x14a5: 0x4000, 0x14a6: 0x4000, 0x14a7: 0x4000, 0x14a8: 0x4000, 0x14a9: 0x4000,
+	0x14aa: 0x4000, 0x14ab: 0x4000, 0x14ac: 0x4000, 0x14ad: 0x4000, 0x14ae: 0x4000, 0x14af: 0x4000,
 	0x14b0: 0x4000, 0x14b1: 0x4000, 0x14b2: 0x4000, 0x14b3: 0x4000, 0x14b4: 0x4000, 0x14b5: 0x4000,
-	0x14b7: 0x4000, 0x14b8: 0x4000, 0x14b9: 0x4000, 0x14ba: 0x4000, 0x14bb: 0x4000,
-	0x14bc: 0x4000, 0x14bd: 0x4000, 0x14be: 0x4000, 0x14bf: 0x4000,
+	0x14b6: 0x4000, 0x14b7: 0x4000, 0x14b8: 0x4000, 0x14b9: 0x4000, 0x14ba: 0x4000, 0x14bb: 0x4000,
 	// Block 0x53, offset 0x14c0
 	0x14c0: 0x4000, 0x14c1: 0x4000, 0x14c2: 0x4000, 0x14c3: 0x4000, 0x14c4: 0x4000, 0x14c5: 0x4000,
-	0x14c6: 0x4000, 0x14c7: 0x4000, 0x14c8: 0x4000, 0x14c9: 0x4000, 0x14ca: 0x4000, 0x14cb: 0x4000,
-	0x14cc: 0x4000, 0x14cd: 0x4000, 0x14ce: 0x4000, 0x14cf: 0x4000, 0x14d0: 0x4000, 0x14d1: 0x4000,
-	0x14d2: 0x4000, 0x14d3: 0x4000, 0x14d4: 0x4000, 0x14d5: 0x4000, 0x14d6: 0x4000, 0x14d7: 0x4000,
-	0x14d8: 0x4000, 0x14d9: 0x4000, 0x14da: 0x4000, 0x14db: 0x4000, 0x14dc: 0x4000, 0x14dd: 0x4000,
-	0x14de: 0x4000, 0x14df: 0x4000, 0x14e0: 0x4000, 0x14e1: 0x4000, 0x14e2: 0x4000, 0x14e3: 0x4000,
-	0x14e4: 0x4000, 0x14e5: 0x4000, 0x14e6: 0x4000, 0x14e7: 0x4000, 0x14e8: 0x4000, 0x14e9: 0x4000,
-	0x14ea: 0x4000, 0x14eb: 0x4000, 0x14ec: 0x4000, 0x14ed: 0x4000, 0x14ee: 0x4000, 0x14ef: 0x4000,
-	0x14f0: 0x4000, 0x14f1: 0x4000, 0x14f2: 0x4000, 0x14f3: 0x4000, 0x14f4: 0x4000, 0x14f5: 0x4000,
-	0x14f6: 0x4000, 0x14f7: 0x4000, 0x14f8: 0x4000, 0x14f9: 0x4000, 0x14fa: 0x4000, 0x14fb: 0x4000,
-	0x14fc: 0x4000, 0x14fe: 0x4000, 0x14ff: 0x4000,
+	0x14c6: 0x4000, 0x14c7: 0x4000, 0x14c8: 0x4000,
+	0x14d0: 0x4000, 0x14d1: 0x4000,
+	0x14e0: 0x4000, 0x14e1: 0x4000, 0x14e2: 0x4000, 0x14e3: 0x4000,
+	0x14e4: 0x4000, 0x14e5: 0x4000,
 	// Block 0x54, offset 0x1500
 	0x1500: 0x4000, 0x1501: 0x4000, 0x1502: 0x4000, 0x1503: 0x4000, 0x1504: 0x4000, 0x1505: 0x4000,
 	0x1506: 0x4000, 0x1507: 0x4000, 0x1508: 0x4000, 0x1509: 0x4000, 0x150a: 0x4000, 0x150b: 0x4000,
 	0x150c: 0x4000, 0x150d: 0x4000, 0x150e: 0x4000, 0x150f: 0x4000, 0x1510: 0x4000, 0x1511: 0x4000,
-	0x1512: 0x4000, 0x1513: 0x4000,
-	0x1520: 0x4000, 0x1521: 0x4000, 0x1522: 0x4000, 0x1523: 0x4000,
-	0x1524: 0x4000, 0x1525: 0x4000, 0x1526: 0x4000, 0x1527: 0x4000, 0x1528: 0x4000, 0x1529: 0x4000,
-	0x152a: 0x4000, 0x152b: 0x4000, 0x152c: 0x4000, 0x152d: 0x4000, 0x152e: 0x4000, 0x152f: 0x4000,
+	0x1512: 0x4000, 0x1513: 0x4000, 0x1514: 0x4000, 0x1515: 0x4000, 0x1516: 0x4000, 0x1517: 0x4000,
+	0x1518: 0x4000, 0x1519: 0x4000, 0x151a: 0x4000, 0x151b: 0x4000, 0x151c: 0x4000, 0x151d: 0x4000,
+	0x151e: 0x4000, 0x151f: 0x4000, 0x1520: 0x4000,
+	0x152d: 0x4000, 0x152e: 0x4000, 0x152f: 0x4000,
 	0x1530: 0x4000, 0x1531: 0x4000, 0x1532: 0x4000, 0x1533: 0x4000, 0x1534: 0x4000, 0x1535: 0x4000,
-	0x1536: 0x4000, 0x1537: 0x4000, 0x1538: 0x4000, 0x1539: 0x4000, 0x153a: 0x4000, 0x153b: 0x4000,
+	0x1537: 0x4000, 0x1538: 0x4000, 0x1539: 0x4000, 0x153a: 0x4000, 0x153b: 0x4000,
 	0x153c: 0x4000, 0x153d: 0x4000, 0x153e: 0x4000, 0x153f: 0x4000,
 	// Block 0x55, offset 0x1540
 	0x1540: 0x4000, 0x1541: 0x4000, 0x1542: 0x4000, 0x1543: 0x4000, 0x1544: 0x4000, 0x1545: 0x4000,
-	0x1546: 0x4000, 0x1547: 0x4000, 0x1548: 0x4000, 0x1549: 0x4000, 0x154a: 0x4000,
-	0x154f: 0x4000, 0x1550: 0x4000, 0x1551: 0x4000,
-	0x1552: 0x4000, 0x1553: 0x4000,
-	0x1560: 0x4000, 0x1561: 0x4000, 0x1562: 0x4000, 0x1563: 0x4000,
+	0x1546: 0x4000, 0x1547: 0x4000, 0x1548: 0x4000, 0x1549: 0x4000, 0x154a: 0x4000, 0x154b: 0x4000,
+	0x154c: 0x4000, 0x154d: 0x4000, 0x154e: 0x4000, 0x154f: 0x4000, 0x1550: 0x4000, 0x1551: 0x4000,
+	0x1552: 0x4000, 0x1553: 0x4000, 0x1554: 0x4000, 0x1555: 0x4000, 0x1556: 0x4000, 0x1557: 0x4000,
+	0x1558: 0x4000, 0x1559: 0x4000, 0x155a: 0x4000, 0x155b: 0x4000, 0x155c: 0x4000, 0x155d: 0x4000,
+	0x155e: 0x4000, 0x155f: 0x4000, 0x1560: 0x4000, 0x1561: 0x4000, 0x1562: 0x4000, 0x1563: 0x4000,
 	0x1564: 0x4000, 0x1565: 0x4000, 0x1566: 0x4000, 0x1567: 0x4000, 0x1568: 0x4000, 0x1569: 0x4000,
 	0x156a: 0x4000, 0x156b: 0x4000, 0x156c: 0x4000, 0x156d: 0x4000, 0x156e: 0x4000, 0x156f: 0x4000,
-	0x1570: 0x4000, 0x1574: 0x4000,
-	0x1578: 0x4000, 0x1579: 0x4000, 0x157a: 0x4000, 0x157b: 0x4000,
-	0x157c: 0x4000, 0x157d: 0x4000, 0x157e: 0x4000, 0x157f: 0x4000,
+	0x1570: 0x4000, 0x1571: 0x4000, 0x1572: 0x4000, 0x1573: 0x4000, 0x1574: 0x4000, 0x1575: 0x4000,
+	0x1576: 0x4000, 0x1577: 0x4000, 0x1578: 0x4000, 0x1579: 0x4000, 0x157a: 0x4000, 0x157b: 0x4000,
+	0x157c: 0x4000, 0x157e: 0x4000, 0x157f: 0x4000,
 	// Block 0x56, offset 0x1580
-	0x1580: 0x4000, 0x1582: 0x4000, 0x1583: 0x4000, 0x1584: 0x4000, 0x1585: 0x4000,
+	0x1580: 0x4000, 0x1581: 0x4000, 0x1582: 0x4000, 0x1583: 0x4000, 0x1584: 0x4000, 0x1585: 0x4000,
 	0x1586: 0x4000, 0x1587: 0x4000, 0x1588: 0x4000, 0x1589: 0x4000, 0x158a: 0x4000, 0x158b: 0x4000,
 	0x158c: 0x4000, 0x158d: 0x4000, 0x158e: 0x4000, 0x158f: 0x4000, 0x1590: 0x4000, 0x1591: 0x4000,
-	0x1592: 0x4000, 0x1593: 0x4000, 0x1594: 0x4000, 0x1595: 0x4000, 0x1596: 0x4000, 0x1597: 0x4000,
-	0x1598: 0x4000, 0x1599: 0x4000, 0x159a: 0x4000, 0x159b: 0x4000, 0x159c: 0x4000, 0x159d: 0x4000,
-	0x159e: 0x4000, 0x159f: 0x4000, 0x15a0: 0x4000, 0x15a1: 0x4000, 0x15a2: 0x4000, 0x15a3: 0x4000,
+	0x1592: 0x4000, 0x1593: 0x4000,
+	0x15a0: 0x4000, 0x15a1: 0x4000, 0x15a2: 0x4000, 0x15a3: 0x4000,
 	0x15a4: 0x4000, 0x15a5: 0x4000, 0x15a6: 0x4000, 0x15a7: 0x4000, 0x15a8: 0x4000, 0x15a9: 0x4000,
 	0x15aa: 0x4000, 0x15ab: 0x4000, 0x15ac: 0x4000, 0x15ad: 0x4000, 0x15ae: 0x4000, 0x15af: 0x4000,
 	0x15b0: 0x4000, 0x15b1: 0x4000, 0x15b2: 0x4000, 0x15b3: 0x4000, 0x15b4: 0x4000, 0x15b5: 0x4000,
@@ -904,18 +903,17 @@ var widthValues = [6336]uint16{
 	0x15bc: 0x4000, 0x15bd: 0x4000, 0x15be: 0x4000, 0x15bf: 0x4000,
 	// Block 0x57, offset 0x15c0
 	0x15c0: 0x4000, 0x15c1: 0x4000, 0x15c2: 0x4000, 0x15c3: 0x4000, 0x15c4: 0x4000, 0x15c5: 0x4000,
-	0x15c6: 0x4000, 0x15c7: 0x4000, 0x15c8: 0x4000, 0x15c9: 0x4000, 0x15ca: 0x4000, 0x15cb: 0x4000,
-	0x15cc: 0x4000, 0x15cd: 0x4000, 0x15ce: 0x4000, 0x15cf: 0x4000, 0x15d0: 0x4000, 0x15d1: 0x4000,
-	0x15d2: 0x4000, 0x15d3: 0x4000, 0x15d4: 0x4000, 0x15d5: 0x4000, 0x15d6: 0x4000, 0x15d7: 0x4000,
-	0x15d8: 0x4000, 0x15d9: 0x4000, 0x15da: 0x4000, 0x15db: 0x4000, 0x15dc: 0x4000, 0x15dd: 0x4000,
-	0x15de: 0x4000, 0x15df: 0x4000, 0x15e0: 0x4000, 0x15e1: 0x4000, 0x15e2: 0x4000, 0x15e3: 0x4000,
+	0x15c6: 0x4000, 0x15c7: 0x4000, 0x15c8: 0x4000, 0x15c9: 0x4000, 0x15ca: 0x4000,
+	0x15cf: 0x4000, 0x15d0: 0x4000, 0x15d1: 0x4000,
+	0x15d2: 0x4000, 0x15d3: 0x4000,
+	0x15e0: 0x4000, 0x15e1: 0x4000, 0x15e2: 0x4000, 0x15e3: 0x4000,
 	0x15e4: 0x4000, 0x15e5: 0x4000, 0x15e6: 0x4000, 0x15e7: 0x4000, 0x15e8: 0x4000, 0x15e9: 0x4000,
 	0x15ea: 0x4000, 0x15eb: 0x4000, 0x15ec: 0x4000, 0x15ed: 0x4000, 0x15ee: 0x4000, 0x15ef: 0x4000,
-	0x15f0: 0x4000, 0x15f1: 0x4000, 0x15f2: 0x4000, 0x15f3: 0x4000, 0x15f4: 0x4000, 0x15f5: 0x4000,
-	0x15f6: 0x4000, 0x15f7: 0x4000, 0x15f8: 0x4000, 0x15f9: 0x4000, 0x15fa: 0x4000, 0x15fb: 0x4000,
-	0x15fc: 0x4000, 0x15ff: 0x4000,
+	0x15f0: 0x4000, 0x15f4: 0x4000,
+	0x15f8: 0x4000, 0x15f9: 0x4000, 0x15fa: 0x4000, 0x15fb: 0x4000,
+	0x15fc: 0x4000, 0x15fd: 0x4000, 0x15fe: 0x4000, 0x15ff: 0x4000,
 	// Block 0x58, offset 0x1600
-	0x1600: 0x4000, 0x1601: 0x4000, 0x1602: 0x4000, 0x1603: 0x4000, 0x1604: 0x4000, 0x1605: 0x4000,
+	0x1600: 0x4000, 0x1602: 0x4000, 0x1603: 0x4000, 0x1604: 0x4000, 0x1605: 0x4000,
 	0x1606: 0x4000, 0x1607: 0x4000, 0x1608: 0x4000, 0x1609: 0x4000, 0x160a: 0x4000, 0x160b: 0x4000,
 	0x160c: 0x4000, 0x160d: 0x4000, 0x160e: 0x4000, 0x160f: 0x4000, 0x1610: 0x4000, 0x1611: 0x4000,
 	0x1612: 0x4000, 0x1613: 0x4000, 0x1614: 0x4000, 0x1615: 0x4000, 0x1616: 0x4000, 0x1617: 0x4000,
@@ -925,66 +923,99 @@ var widthValues = [6336]uint16{
 	0x162a: 0x4000, 0x162b: 0x4000, 0x162c: 0x4000, 0x162d: 0x4000, 0x162e: 0x4000, 0x162f: 0x4000,
 	0x1630: 0x4000, 0x1631: 0x4000, 0x1632: 0x4000, 0x1633: 0x4000, 0x1634: 0x4000, 0x1635: 0x4000,
 	0x1636: 0x4000, 0x1637: 0x4000, 0x1638: 0x4000, 0x1639: 0x4000, 0x163a: 0x4000, 0x163b: 0x4000,
-	0x163c: 0x4000, 0x163d: 0x4000,
+	0x163c: 0x4000, 0x163d: 0x4000, 0x163e: 0x4000, 0x163f: 0x4000,
 	// Block 0x59, offset 0x1640
-	0x164b: 0x4000,
-	0x164c: 0x4000, 0x164d: 0x4000, 0x164e: 0x4000, 0x1650: 0x4000, 0x1651: 0x4000,
+	0x1640: 0x4000, 0x1641: 0x4000, 0x1642: 0x4000, 0x1643: 0x4000, 0x1644: 0x4000, 0x1645: 0x4000,
+	0x1646: 0x4000, 0x1647: 0x4000, 0x1648: 0x4000, 0x1649: 0x4000, 0x164a: 0x4000, 0x164b: 0x4000,
+	0x164c: 0x4000, 0x164d: 0x4000, 0x164e: 0x4000, 0x164f: 0x4000, 0x1650: 0x4000, 0x1651: 0x4000,
 	0x1652: 0x4000, 0x1653: 0x4000, 0x1654: 0x4000, 0x1655: 0x4000, 0x1656: 0x4000, 0x1657: 0x4000,
 	0x1658: 0x4000, 0x1659: 0x4000, 0x165a: 0x4000, 0x165b: 0x4000, 0x165c: 0x4000, 0x165d: 0x4000,
 	0x165e: 0x4000, 0x165f: 0x4000, 0x1660: 0x4000, 0x1661: 0x4000, 0x1662: 0x4000, 0x1663: 0x4000,
-	0x1664: 0x4000, 0x1665: 0x4000, 0x1666: 0x4000, 0x1667: 0x4000,
-	0x167a: 0x4000,
+	0x1664: 0x4000, 0x1665: 0x4000, 0x1666: 0x4000, 0x1667: 0x4000, 0x1668: 0x4000, 0x1669: 0x4000,
+	0x166a: 0x4000, 0x166b: 0x4000, 0x166c: 0x4000, 0x166d: 0x4000, 0x166e: 0x4000, 0x166f: 0x4000,
+	0x1670: 0x4000, 0x1671: 0x4000, 0x1672: 0x4000, 0x1673: 0x4000, 0x1674: 0x4000, 0x1675: 0x4000,
+	0x1676: 0x4000, 0x1677: 0x4000, 0x1678: 0x4000, 0x1679: 0x4000, 0x167a: 0x4000, 0x167b: 0x4000,
+	0x167c: 0x4000, 0x167f: 0x4000,
 	// Block 0x5a, offset 0x1680
-	0x1695: 0x4000, 0x1696: 0x4000,
-	0x16a4: 0x4000,
+	0x1680: 0x4000, 0x1681: 0x4000, 0x1682: 0x4000, 0x1683: 0x4000, 0x1684: 0x4000, 0x1685: 0x4000,
+	0x1686: 0x4000, 0x1687: 0x4000, 0x1688: 0x4000, 0x1689: 0x4000, 0x168a: 0x4000, 0x168b: 0x4000,
+	0x168c: 0x4000, 0x168d: 0x4000, 0x168e: 0x4000, 0x168f: 0x4000, 0x1690: 0x4000, 0x1691: 0x4000,
+	0x1692: 0x4000, 0x1693: 0x4000, 0x1694: 0x4000, 0x1695: 0x4000, 0x1696: 0x4000, 0x1697: 0x4000,
+	0x1698: 0x4000, 0x1699: 0x4000, 0x169a: 0x4000, 0x169b: 0x4000, 0x169c: 0x4000, 0x169d: 0x4000,
+	0x169e: 0x4000, 0x169f: 0x4000, 0x16a0: 0x4000, 0x16a1: 0x4000, 0x16a2: 0x4000, 0x16a3: 0x4000,
+	0x16a4: 0x4000, 0x16a5: 0x4000, 0x16a6: 0x4000, 0x16a7: 0x4000, 0x16a8: 0x4000, 0x16a9: 0x4000,
+	0x16aa: 0x4000, 0x16ab: 0x4000, 0x16ac: 0x4000, 0x16ad: 0x4000, 0x16ae: 0x4000, 0x16af: 0x4000,
+	0x16b0: 0x4000, 0x16b1: 0x4000, 0x16b2: 0x4000, 0x16b3: 0x4000, 0x16b4: 0x4000, 0x16b5: 0x4000,
+	0x16b6: 0x4000, 0x16b7: 0x4000, 0x16b8: 0x4000, 0x16b9: 0x4000, 0x16ba: 0x4000, 0x16bb: 0x4000,
+	0x16bc: 0x4000, 0x16bd: 0x4000,
 	// Block 0x5b, offset 0x16c0
-	0x16fb: 0x4000,
-	0x16fc: 0x4000, 0x16fd: 0x4000, 0x16fe: 0x4000, 0x16ff: 0x4000,
+	0x16cb: 0x4000,
+	0x16cc: 0x4000, 0x16cd: 0x4000, 0x16ce: 0x4000, 0x16d0: 0x4000, 0x16d1: 0x4000,
+	0x16d2: 0x4000, 0x16d3: 0x4000, 0x16d4: 0x4000, 0x16d5: 0x4000, 0x16d6: 0x4000, 0x16d7: 0x4000,
+	0x16d8: 0x4000, 0x16d9: 0x4000, 0x16da: 0x4000, 0x16db: 0x4000, 0x16dc: 0x4000, 0x16dd: 0x4000,
+	0x16de: 0x4000, 0x16df: 0x4000, 0x16e0: 0x4000, 0x16e1: 0x4000, 0x16e2: 0x4000, 0x16e3: 0x4000,
+	0x16e4: 0x4000, 0x16e5: 0x4000, 0x16e6: 0x4000, 0x16e7: 0x4000,
+	0x16fa: 0x4000,
 	// Block 0x5c, offset 0x1700
-	0x1700: 0x4000, 0x1701: 0x4000, 0x1702: 0x4000, 0x1703: 0x4000, 0x1704: 0x4000, 0x1705: 0x4000,
-	0x1706: 0x4000, 0x1707: 0x4000, 0x1708: 0x4000, 0x1709: 0x4000, 0x170a: 0x4000, 0x170b: 0x4000,
-	0x170c: 0x4000, 0x170d: 0x4000, 0x170e: 0x4000, 0x170f: 0x4000,
+	0x1715: 0x4000, 0x1716: 0x4000,
+	0x1724: 0x4000,
 	// Block 0x5d, offset 0x1740
-	0x1740: 0x4000, 0x1741: 0x4000, 0x1742: 0x4000, 0x1743: 0x4000, 0x1744: 0x4000, 0x1745: 0x4000,
-	0x174c: 0x4000, 0x1750: 0x4000, 0x1751: 0x4000,
-	0x1752: 0x4000,
-	0x176b: 0x4000, 0x176c: 0x4000,
-	0x1774: 0x4000, 0x1775: 0x4000,
-	0x1776: 0x4000,
+	0x177b: 0x4000,
+	0x177c: 0x4000, 0x177d: 0x4000, 0x177e: 0x4000, 0x177f: 0x4000,
 	// Block 0x5e, offset 0x1780
-	0x1790: 0x4000, 0x1791: 0x4000,
-	0x1792: 0x4000, 0x1793: 0x4000, 0x1794: 0x4000, 0x1795: 0x4000, 0x1796: 0x4000, 0x1797: 0x4000,
-	0x1798: 0x4000, 0x1799: 0x4000, 0x179a: 0x4000, 0x179b: 0x4000, 0x179c: 0x4000, 0x179d: 0x4000,
-	0x179e: 0x4000, 0x17a0: 0x4000, 0x17a1: 0x4000, 0x17a2: 0x4000, 0x17a3: 0x4000,
-	0x17a4: 0x4000, 0x17a5: 0x4000, 0x17a6: 0x4000, 0x17a7: 0x4000,
-	0x17b0: 0x4000, 0x17b3: 0x4000, 0x17b4: 0x4000, 0x17b5: 0x4000,
-	0x17b6: 0x4000, 0x17b7: 0x4000, 0x17b8: 0x4000, 0x17b9: 0x4000, 0x17ba: 0x4000, 0x17bb: 0x4000,
-	0x17bc: 0x4000, 0x17bd: 0x4000, 0x17be: 0x4000,
+	0x1780: 0x4000, 0x1781: 0x4000, 0x1782: 0x4000, 0x1783: 0x4000, 0x1784: 0x4000, 0x1785: 0x4000,
+	0x1786: 0x4000, 0x1787: 0x4000, 0x1788: 0x4000, 0x1789: 0x4000, 0x178a: 0x4000, 0x178b: 0x4000,
+	0x178c: 0x4000, 0x178d: 0x4000, 0x178e: 0x4000, 0x178f: 0x4000,
 	// Block 0x5f, offset 0x17c0
 	0x17c0: 0x4000, 0x17c1: 0x4000, 0x17c2: 0x4000, 0x17c3: 0x4000, 0x17c4: 0x4000, 0x17c5: 0x4000,
-	0x17c6: 0x4000, 0x17c7: 0x4000, 0x17c8: 0x4000, 0x17c9: 0x4000, 0x17ca: 0x4000, 0x17cb: 0x4000,
-	0x17d0: 0x4000, 0x17d1: 0x4000,
-	0x17d2: 0x4000, 0x17d3: 0x4000, 0x17d4: 0x4000, 0x17d5: 0x4000, 0x17d6: 0x4000, 0x17d7: 0x4000,
-	0x17d8: 0x4000, 0x17d9: 0x4000, 0x17da: 0x4000, 0x17db: 0x4000, 0x17dc: 0x4000, 0x17dd: 0x4000,
-	0x17de: 0x4000,
+	0x17cc: 0x4000, 0x17d0: 0x4000, 0x17d1: 0x4000,
+	0x17d2: 0x4000,
+	0x17eb: 0x4000, 0x17ec: 0x4000,
+	0x17f4: 0x4000, 0x17f5: 0x4000,
+	0x17f6: 0x4000, 0x17f7: 0x4000, 0x17f8: 0x4000,
 	// Block 0x60, offset 0x1800
-	0x1800: 0x4000, 0x1801: 0x4000, 0x1802: 0x4000, 0x1803: 0x4000, 0x1804: 0x4000, 0x1805: 0x4000,
-	0x1806: 0x4000, 0x1807: 0x4000, 0x1808: 0x4000, 0x1809: 0x4000, 0x180a: 0x4000, 0x180b: 0x4000,
-	0x180c: 0x4000, 0x180d: 0x4000, 0x180e: 0x4000, 0x180f: 0x4000, 0x1810: 0x4000, 0x1811: 0x4000,
+	0x1810: 0x4000, 0x1811: 0x4000,
+	0x1812: 0x4000, 0x1813: 0x4000, 0x1814: 0x4000, 0x1815: 0x4000, 0x1816: 0x4000, 0x1817: 0x4000,
+	0x1818: 0x4000, 0x1819: 0x4000, 0x181a: 0x4000, 0x181b: 0x4000, 0x181c: 0x4000, 0x181d: 0x4000,
+	0x181e: 0x4000, 0x181f: 0x4000, 0x1820: 0x4000, 0x1821: 0x4000, 0x1822: 0x4000, 0x1823: 0x4000,
+	0x1824: 0x4000, 0x1825: 0x4000, 0x1826: 0x4000, 0x1827: 0x4000, 0x1828: 0x4000, 0x1829: 0x4000,
+	0x182a: 0x4000, 0x182b: 0x4000, 0x182c: 0x4000, 0x182d: 0x4000, 0x182e: 0x4000, 0x182f: 0x4000,
+	0x1830: 0x4000, 0x1831: 0x4000, 0x1832: 0x4000, 0x1833: 0x4000, 0x1834: 0x4000, 0x1835: 0x4000,
+	0x1836: 0x4000, 0x1837: 0x4000, 0x1838: 0x4000, 0x1839: 0x4000, 0x183a: 0x4000, 0x183b: 0x4000,
+	0x183c: 0x4000, 0x183d: 0x4000, 0x183e: 0x4000,
 	// Block 0x61, offset 0x1840
-	0x1840: 0x4000,
+	0x1840: 0x4000, 0x1841: 0x4000, 0x1842: 0x4000, 0x1843: 0x4000, 0x1844: 0x4000, 0x1845: 0x4000,
+	0x1846: 0x4000, 0x1847: 0x4000, 0x1848: 0x4000, 0x1849: 0x4000, 0x184a: 0x4000, 0x184b: 0x4000,
+	0x184c: 0x4000, 0x1850: 0x4000, 0x1851: 0x4000,
+	0x1852: 0x4000, 0x1853: 0x4000, 0x1854: 0x4000, 0x1855: 0x4000, 0x1856: 0x4000, 0x1857: 0x4000,
+	0x1858: 0x4000, 0x1859: 0x4000, 0x185a: 0x4000, 0x185b: 0x4000, 0x185c: 0x4000, 0x185d: 0x4000,
+	0x185e: 0x4000, 0x185f: 0x4000, 0x1860: 0x4000, 0x1861: 0x4000, 0x1862: 0x4000, 0x1863: 0x4000,
+	0x1864: 0x4000, 0x1865: 0x4000, 0x1866: 0x4000, 0x1867: 0x4000, 0x1868: 0x4000, 0x1869: 0x4000,
+	0x186a: 0x4000, 0x186b: 0x4000,
 	// Block 0x62, offset 0x1880
-	0x1880: 0x2000, 0x1881: 0x2000, 0x1882: 0x2000, 0x1883: 0x2000, 0x1884: 0x2000, 0x1885: 0x2000,
-	0x1886: 0x2000, 0x1887: 0x2000, 0x1888: 0x2000, 0x1889: 0x2000, 0x188a: 0x2000, 0x188b: 0x2000,
-	0x188c: 0x2000, 0x188d: 0x2000, 0x188e: 0x2000, 0x188f: 0x2000, 0x1890: 0x2000, 0x1891: 0x2000,
-	0x1892: 0x2000, 0x1893: 0x2000, 0x1894: 0x2000, 0x1895: 0x2000, 0x1896: 0x2000, 0x1897: 0x2000,
-	0x1898: 0x2000, 0x1899: 0x2000, 0x189a: 0x2000, 0x189b: 0x2000, 0x189c: 0x2000, 0x189d: 0x2000,
-	0x189e: 0x2000, 0x189f: 0x2000, 0x18a0: 0x2000, 0x18a1: 0x2000, 0x18a2: 0x2000, 0x18a3: 0x2000,
-	0x18a4: 0x2000, 0x18a5: 0x2000, 0x18a6: 0x2000, 0x18a7: 0x2000, 0x18a8: 0x2000, 0x18a9: 0x2000,
-	0x18aa: 0x2000, 0x18ab: 0x2000, 0x18ac: 0x2000, 0x18ad: 0x2000, 0x18ae: 0x2000, 0x18af: 0x2000,
-	0x18b0: 0x2000, 0x18b1: 0x2000, 0x18b2: 0x2000, 0x18b3: 0x2000, 0x18b4: 0x2000, 0x18b5: 0x2000,
-	0x18b6: 0x2000, 0x18b7: 0x2000, 0x18b8: 0x2000, 0x18b9: 0x2000, 0x18ba: 0x2000, 0x18bb: 0x2000,
-	0x18bc: 0x2000, 0x18bd: 0x2000,
+	0x1880: 0x4000, 0x1881: 0x4000, 0x1882: 0x4000, 0x1883: 0x4000, 0x1884: 0x4000, 0x1885: 0x4000,
+	0x1886: 0x4000, 0x1887: 0x4000, 0x1888: 0x4000, 0x1889: 0x4000, 0x188a: 0x4000, 0x188b: 0x4000,
+	0x188c: 0x4000, 0x188d: 0x4000, 0x188e: 0x4000, 0x188f: 0x4000, 0x1890: 0x4000, 0x1891: 0x4000,
+	0x1892: 0x4000, 0x1893: 0x4000, 0x1894: 0x4000, 0x1895: 0x4000, 0x1896: 0x4000, 0x1897: 0x4000,
+	// Block 0x63, offset 0x18c0
+	0x18c0: 0x4000,
+	0x18d0: 0x4000, 0x18d1: 0x4000,
+	0x18d2: 0x4000, 0x18d3: 0x4000, 0x18d4: 0x4000, 0x18d5: 0x4000, 0x18d6: 0x4000, 0x18d7: 0x4000,
+	0x18d8: 0x4000, 0x18d9: 0x4000, 0x18da: 0x4000, 0x18db: 0x4000, 0x18dc: 0x4000, 0x18dd: 0x4000,
+	0x18de: 0x4000, 0x18df: 0x4000, 0x18e0: 0x4000, 0x18e1: 0x4000, 0x18e2: 0x4000, 0x18e3: 0x4000,
+	0x18e4: 0x4000, 0x18e5: 0x4000, 0x18e6: 0x4000,
+	// Block 0x64, offset 0x1900
+	0x1900: 0x2000, 0x1901: 0x2000, 0x1902: 0x2000, 0x1903: 0x2000, 0x1904: 0x2000, 0x1905: 0x2000,
+	0x1906: 0x2000, 0x1907: 0x2000, 0x1908: 0x2000, 0x1909: 0x2000, 0x190a: 0x2000, 0x190b: 0x2000,
+	0x190c: 0x2000, 0x190d: 0x2000, 0x190e: 0x2000, 0x190f: 0x2000, 0x1910: 0x2000, 0x1911: 0x2000,
+	0x1912: 0x2000, 0x1913: 0x2000, 0x1914: 0x2000, 0x1915: 0x2000, 0x1916: 0x2000, 0x1917: 0x2000,
+	0x1918: 0x2000, 0x1919: 0x2000, 0x191a: 0x2000, 0x191b: 0x2000, 0x191c: 0x2000, 0x191d: 0x2000,
+	0x191e: 0x2000, 0x191f: 0x2000, 0x1920: 0x2000, 0x1921: 0x2000, 0x1922: 0x2000, 0x1923: 0x2000,
+	0x1924: 0x2000, 0x1925: 0x2000, 0x1926: 0x2000, 0x1927: 0x2000, 0x1928: 0x2000, 0x1929: 0x2000,
+	0x192a: 0x2000, 0x192b: 0x2000, 0x192c: 0x2000, 0x192d: 0x2000, 0x192e: 0x2000, 0x192f: 0x2000,
+	0x1930: 0x2000, 0x1931: 0x2000, 0x1932: 0x2000, 0x1933: 0x2000, 0x1934: 0x2000, 0x1935: 0x2000,
+	0x1936: 0x2000, 0x1937: 0x2000, 0x1938: 0x2000, 0x1939: 0x2000, 0x193a: 0x2000, 0x193b: 0x2000,
+	0x193c: 0x2000, 0x193d: 0x2000,
 }
 
 // widthIndex: 22 blocks, 1408 entries, 1408 bytes
@@ -1076,13 +1107,14 @@ var widthIndex = [1408]uint8{
 	0x3a0: 0x0e, 0x3a1: 0x0e, 0x3a2: 0x0e, 0x3a3: 0x0e, 0x3a4: 0x0e, 0x3a5: 0x0e, 0x3a6: 0x0e, 0x3a7: 0x0e,
 	0x3a8: 0x0e, 0x3a9: 0x0e, 0x3aa: 0x0e, 0x3ab: 0x47,
 	// Block 0xf, offset 0x3c0
-	0x3c0: 0x48,
+	0x3c0: 0x0e, 0x3c1: 0x0e, 0x3c2: 0x0e, 0x3c3: 0x0e, 0x3c4: 0x48, 0x3c5: 0x49, 0x3c6: 0x0e, 0x3c7: 0x0e,
+	0x3c8: 0x0e, 0x3c9: 0x0e, 0x3ca: 0x0e, 0x3cb: 0x4a,
 	// Block 0x10, offset 0x400
-	0x400: 0x49, 0x403: 0x4a, 0x404: 0x4b, 0x405: 0x4c, 0x406: 0x4d,
-	0x408: 0x4e, 0x409: 0x4f, 0x40c: 0x50, 0x40d: 0x51, 0x40e: 0x52, 0x40f: 0x53,
-	0x410: 0x3a, 0x411: 0x54, 0x412: 0x0e, 0x413: 0x55, 0x414: 0x56, 0x415: 0x57, 0x416: 0x58, 0x417: 0x59,
-	0x418: 0x0e, 0x419: 0x5a, 0x41a: 0x0e, 0x41b: 0x5b,
-	0x424: 0x5c, 0x425: 0x5d, 0x426: 0x5e, 0x427: 0x5f,
+	0x400: 0x4b, 0x403: 0x4c, 0x404: 0x4d, 0x405: 0x4e, 0x406: 0x4f,
+	0x408: 0x50, 0x409: 0x51, 0x40c: 0x52, 0x40d: 0x53, 0x40e: 0x54, 0x40f: 0x55,
+	0x410: 0x3a, 0x411: 0x56, 0x412: 0x0e, 0x413: 0x57, 0x414: 0x58, 0x415: 0x59, 0x416: 0x5a, 0x417: 0x5b,
+	0x418: 0x0e, 0x419: 0x5c, 0x41a: 0x0e, 0x41b: 0x5d,
+	0x424: 0x5e, 0x425: 0x5f, 0x426: 0x60, 0x427: 0x61,
 	// Block 0x11, offset 0x440
 	0x456: 0x0b, 0x457: 0x06,
 	0x458: 0x0c, 0x45b: 0x0d, 0x45f: 0x0e,
@@ -1100,7 +1132,7 @@ var widthIndex = [1408]uint8{
 	0x4e0: 0x08, 0x4e1: 0x08, 0x4e2: 0x08, 0x4e3: 0x08, 0x4e4: 0x08, 0x4e5: 0x08, 0x4e6: 0x08, 0x4e7: 0x08,
 	0x4e8: 0x08, 0x4e9: 0x08, 0x4ea: 0x08, 0x4eb: 0x08, 0x4ec: 0x08, 0x4ed: 0x08, 0x4ee: 0x08, 0x4ef: 0x08,
 	0x4f0: 0x08, 0x4f1: 0x08, 0x4f2: 0x08, 0x4f3: 0x08, 0x4f4: 0x08, 0x4f5: 0x08, 0x4f6: 0x08, 0x4f7: 0x08,
-	0x4f8: 0x08, 0x4f9: 0x08, 0x4fa: 0x08, 0x4fb: 0x08, 0x4fc: 0x08, 0x4fd: 0x08, 0x4fe: 0x08, 0x4ff: 0x60,
+	0x4f8: 0x08, 0x4f9: 0x08, 0x4fa: 0x08, 0x4fb: 0x08, 0x4fc: 0x08, 0x4fd: 0x08, 0x4fe: 0x08, 0x4ff: 0x62,
 	// Block 0x14, offset 0x500
 	0x520: 0x10,
 	0x530: 0x09, 0x531: 0x09, 0x532: 0x09, 0x533: 0x09, 0x534: 0x09, 0x535: 0x09, 0x536: 0x09, 0x537: 0x09,
@@ -1281,4 +1313,4 @@ var inverseData = [150][4]byte{
 	{0x03, 0xe2, 0x97, 0x25},
 }
 
-// Total table size 14680 bytes (14KiB)
+// Total table size 14936 bytes (14KiB)
diff --git a/vendor/golang.org/x/text/width/transform.go b/vendor/golang.org/x/text/width/transform.go
index 2ed25096ac..0049f700a2 100644
--- a/vendor/golang.org/x/text/width/transform.go
+++ b/vendor/golang.org/x/text/width/transform.go
@@ -14,6 +14,32 @@ type foldTransform struct {
 	transform.NopResetter
 }
 
+func (foldTransform) Span(src []byte, atEOF bool) (n int, err error) {
+	for n < len(src) {
+		if src[n] < utf8.RuneSelf {
+			// ASCII fast path.
+			for n++; n < len(src) && src[n] < utf8.RuneSelf; n++ {
+			}
+			continue
+		}
+		v, size := trie.lookup(src[n:])
+		if size == 0 { // incomplete UTF-8 encoding
+			if !atEOF {
+				err = transform.ErrShortSrc
+			} else {
+				n = len(src)
+			}
+			break
+		}
+		if elem(v)&tagNeedsFold != 0 {
+			err = transform.ErrEndOfSpan
+			break
+		}
+		n += size
+	}
+	return n, err
+}
+
 func (foldTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	for nSrc < len(src) {
 		if src[nSrc] < utf8.RuneSelf {
@@ -70,6 +96,33 @@ type narrowTransform struct {
 	transform.NopResetter
 }
 
+func (narrowTransform) Span(src []byte, atEOF bool) (n int, err error) {
+	for n < len(src) {
+		if src[n] < utf8.RuneSelf {
+			// ASCII fast path.
+			for n++; n < len(src) && src[n] < utf8.RuneSelf; n++ {
+			}
+			continue
+		}
+		v, size := trie.lookup(src[n:])
+		if size == 0 { // incomplete UTF-8 encoding
+			if !atEOF {
+				err = transform.ErrShortSrc
+			} else {
+				n = len(src)
+			}
+			break
+		}
+		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianFullwidth && k != EastAsianWide && k != EastAsianAmbiguous {
+		} else {
+			err = transform.ErrEndOfSpan
+			break
+		}
+		n += size
+	}
+	return n, err
+}
+
 func (narrowTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	for nSrc < len(src) {
 		if src[nSrc] < utf8.RuneSelf {
@@ -126,6 +179,30 @@ type wideTransform struct {
 	transform.NopResetter
 }
 
+func (wideTransform) Span(src []byte, atEOF bool) (n int, err error) {
+	for n < len(src) {
+		// TODO: Consider ASCII fast path. Special-casing ASCII handling can
+		// reduce the ns/op of BenchmarkWideASCII by about 30%. This is probably
+		// not enough to warrant the extra code and complexity.
+		v, size := trie.lookup(src[n:])
+		if size == 0 { // incomplete UTF-8 encoding
+			if !atEOF {
+				err = transform.ErrShortSrc
+			} else {
+				n = len(src)
+			}
+			break
+		}
+		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianHalfwidth && k != EastAsianNarrow {
+		} else {
+			err = transform.ErrEndOfSpan
+			break
+		}
+		n += size
+	}
+	return n, err
+}
+
 func (wideTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	for nSrc < len(src) {
 		// TODO: Consider ASCII fast path. Special-casing ASCII handling can
diff --git a/vendor/golang.org/x/text/width/trieval.go b/vendor/golang.org/x/text/width/trieval.go
index 0ecffb4c64..ca8e45fd19 100644
--- a/vendor/golang.org/x/text/width/trieval.go
+++ b/vendor/golang.org/x/text/width/trieval.go
@@ -1,4 +1,4 @@
-// This file was generated by go generate; DO NOT EDIT
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 package width
 
diff --git a/vendor/golang.org/x/text/width/width.go b/vendor/golang.org/x/text/width/width.go
index dc026eef6b..f1639ca68a 100644
--- a/vendor/golang.org/x/text/width/width.go
+++ b/vendor/golang.org/x/text/width/width.go
@@ -153,17 +153,22 @@ func (p Properties) Wide() rune {
 
 // Transformer implements the transform.Transformer interface.
 type Transformer struct {
-	t transform.Transformer
+	t transform.SpanningTransformer
 }
 
 // Reset implements the transform.Transformer interface.
 func (t Transformer) Reset() { t.t.Reset() }
 
-// Transform implements the Transformer interface.
+// Transform implements the transform.Transformer interface.
 func (t Transformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
 	return t.t.Transform(dst, src, atEOF)
 }
 
+// Span implements the transform.SpanningTransformer interface.
+func (t Transformer) Span(src []byte, atEOF bool) (n int, err error) {
+	return t.t.Span(src, atEOF)
+}
+
 // Bytes returns a new byte slice with the result of applying t to b.
 func (t Transformer) Bytes(b []byte) []byte {
 	b, _, _ = transform.Bytes(t, b)

From 27a8e231524b1471ed0a43136e01ee5471bd7761 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 26 Oct 2017 13:05:26 -0700
Subject: [PATCH 1210/1304] selinux: Update to latest

Update the selinux package to the latest available.  Moves selinux
from pkg/selinux to vendor/github.com/opencontainers/selinux.

Fixes 'make unit-check' errors like these when a directory named
'/sys/fs/selinux' exists, but selinux is not enabled:

  --- FAIL: TestSetfilecon (0.00s)
        selinux_test.go: Setfilecon failed
        selinux_test.go: operation not supported

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 common/overlay/overlay.go                     |   2 +-
 glide.lock                                    |   9 +-
 glide.yaml                                    |   5 +
 pkg/label/label_selinux_test.go               | 150 -----
 pkg/pod/pods.go                               |   5 +-
 pkg/selinux/selinux.go                        | 512 ---------------
 pkg/selinux/selinux_test.go                   | 100 ---
 rkt/app_sandbox.go                            |   4 +-
 rkt/run.go                                    |   4 +-
 stage0/run.go                                 |   2 +-
 .../github.com/opencontainers/selinux/LICENSE | 201 ++++++
 .../selinux/go-selinux}/label/label.go        |  50 +-
 .../go-selinux}/label/label_selinux.go        | 151 +++--
 .../selinux/go-selinux/selinux.go             | 593 ++++++++++++++++++
 .../selinux/go-selinux/xattrs.go              |  78 +++
 15 files changed, 1009 insertions(+), 857 deletions(-)
 delete mode 100644 pkg/label/label_selinux_test.go
 delete mode 100644 pkg/selinux/selinux.go
 delete mode 100644 pkg/selinux/selinux_test.go
 create mode 100644 vendor/github.com/opencontainers/selinux/LICENSE
 rename {pkg => vendor/github.com/opencontainers/selinux/go-selinux}/label/label.go (51%)
 rename {pkg => vendor/github.com/opencontainers/selinux/go-selinux}/label/label_selinux.go (50%)
 create mode 100644 vendor/github.com/opencontainers/selinux/go-selinux/selinux.go
 create mode 100644 vendor/github.com/opencontainers/selinux/go-selinux/xattrs.go

diff --git a/common/overlay/overlay.go b/common/overlay/overlay.go
index 61e6482721..72ee8bb5e8 100644
--- a/common/overlay/overlay.go
+++ b/common/overlay/overlay.go
@@ -20,7 +20,7 @@ import (
 	"syscall"
 
 	"github.com/hashicorp/errwrap"
-	"github.com/rkt/rkt/pkg/label"
+	"github.com/opencontainers/selinux/go-selinux/label"
 )
 
 // sanitizer defines a string translator used to escape colon and comma
diff --git a/glide.lock b/glide.lock
index 4a57339910..0b94f46153 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: f763c3172b6e3e37f77970cbd8601d9101221fd4a25815961f98f47148f20615
-updated: 2017-10-26T12:55:14.287892242-07:00
+hash: 5e63c98da9454db1ed765efed9a54a8df79da833d0db1e939d2c8956086132da
+updated: 2017-10-26T12:59:31.154326718-07:00
 imports:
 - name: github.com/appc/docker2aci
   version: b62d1b9cbba9aa4eddc65dad290bff4aee211feb
@@ -207,6 +207,11 @@ imports:
   subpackages:
   - specs-go
   - specs-go/v1
+- name: github.com/opencontainers/selinux
+  version: 4a2974bf1ee960774ffd517717f1f45325af0206
+  subpackages:
+  - go-selinux
+  - go-selinux/label
 - name: github.com/pborman/uuid
   version: e790cca94e6cc75c7064b1332e63811d4aae1a53
 - name: github.com/peterbourgon/diskv
diff --git a/glide.yaml b/glide.yaml
index 55d78759f9..e9498d45b0 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -174,6 +174,11 @@ import:
   version: e5c918b80c17694cbc49aab32a759f9a40067f5d
 - package: github.com/kr/pty
   version: f7ee69f31298ecbe5d2b349c711e2547a617d398
+- package: github.com/opencontainers/selinux
+  version: 4a2974bf1ee960774ffd517717f1f45325af0206
+  subpackages:
+  - go-selinux
+  - go-selinux/label
 - package: github.com/pborman/uuid
   version: v1.1
 - package: github.com/peterbourgon/diskv
diff --git a/pkg/label/label_selinux_test.go b/pkg/label/label_selinux_test.go
deleted file mode 100644
index 62e7320f20..0000000000
--- a/pkg/label/label_selinux_test.go
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright 2014,2015 Red Hat, Inc
-// Copyright 2014,2015 Docker, Inc
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// +build selinux,linux
-
-package label
-
-import (
-	"io/ioutil"
-	"strings"
-	"testing"
-
-	"github.com/rkt/rkt/pkg/selinux"
-)
-
-func TestInit(t *testing.T) {
-	if selinux.SelinuxEnabled() {
-		var testNull []string
-		plabel, mlabel, err := InitLabels("", testNull)
-		if err != nil {
-			t.Log("InitLabels Failed")
-			t.Fatal(err)
-		}
-		testDisabled := []string{"disable"}
-		plabel, mlabel, err = InitLabels("", testDisabled)
-		if err != nil {
-			t.Log("InitLabels Disabled Failed")
-			t.Fatal(err)
-		}
-		if plabel != "" {
-			t.Log("InitLabels Disabled Failed")
-			t.Fatal(plabel)
-		}
-		testUser := []string{"user:user_u", "role:user_r", "type:user_t", "level:s0:c1,c15"}
-		plabel, mlabel, err = InitLabels("", testUser)
-		if err != nil {
-			t.Log("InitLabels User Failed")
-			t.Fatal(err)
-		}
-		if plabel != "user_u:user_r:user_t:s0:c1,c15" || mlabel != "user_u:object_r:svirt_sandbox_file_t:s0:c1,c15" {
-			t.Log("InitLabels User Match Failed - unable to test policy")
-			t.Log(plabel, mlabel)
-			return
-		}
-
-		testBadData := []string{"user", "role:user_r", "type:user_t", "level:s0:c1,c15"}
-		plabel, mlabel, err = InitLabels("", testBadData)
-		if err == nil {
-			t.Log("InitLabels Bad Failed")
-			t.Fatal(err)
-		}
-	}
-}
-func TestDuplicateLabel(t *testing.T) {
-	secopt := DupSecOpt("system_u:system_r:svirt_lxc_net_t:s0:c1,c2")
-	t.Log(secopt)
-	for _, opt := range secopt {
-		con := strings.SplitN(opt, ":", 3)
-		if len(con) != 3 || con[0] != "label" {
-			t.Errorf("Invalid DupSecOpt return value")
-			continue
-		}
-		if con[1] == "user" {
-			if con[2] != "system_u" {
-				t.Errorf("DupSecOpt Failed user incorrect")
-			}
-			continue
-		}
-		if con[1] == "role" {
-			if con[2] != "system_r" {
-				t.Errorf("DupSecOpt Failed role incorrect")
-			}
-			continue
-		}
-		if con[1] == "type" {
-			if con[2] != "svirt_lxc_net_t" {
-				t.Errorf("DupSecOpt Failed type incorrect")
-			}
-			continue
-		}
-		if con[1] == "level" {
-			if con[2] != "s0:c1,c2" {
-				t.Errorf("DupSecOpt Failed level incorrect")
-			}
-			continue
-		}
-		t.Errorf("DupSecOpt Failed invalid field %q", con[1])
-	}
-	secopt = DisableSecOpt()
-	if secopt[0] != "label:disable" {
-		t.Errorf("DisableSecOpt Failed level incorrect")
-	}
-}
-func TestRelabel(t *testing.T) {
-	plabel, _, err := InitLabels("", nil)
-	if err != nil {
-		t.Fatalf("InitLabels failed: %v", err)
-	}
-	if plabel == "" {
-		t.Log("No svirt container policy, skipping")
-		return
-	}
-	testdir, err := ioutil.TempDir("/tmp", "rkt")
-	if err != nil {
-		t.Fatalf("Unable to create test dir: %v", err)
-	}
-	label := "system_u:system_r:svirt_sandbox_file_t:s0:c1,c2"
-	if err := Relabel(testdir, "", "z"); err != nil {
-		t.Fatalf("Relabel with no label failed: %v", err)
-	}
-	if err := Relabel(testdir, label, ""); err != nil {
-		t.Fatalf("Relabel with no relabel field failed: %v", err)
-	}
-	if err := Relabel(testdir, label, "z"); err != nil {
-		if ae, ok := err.(*selinux.SelinuxError); ok {
-			if ae.Errno == selinux.InvalidContext {
-				println("Missing selinux contexts, skipping")
-				return
-			}
-			t.Fatalf("Relabel shared failed: %v", err)
-		}
-	}
-	if err := Relabel(testdir, label, "Z"); err != nil {
-		t.Fatalf("Relabel unshared failed: %v", err)
-	}
-	if err := Relabel(testdir, label, "zZ"); err == nil {
-		t.Fatal("Relabel with shared and unshared succeeded")
-	}
-	if err := Relabel("/etc", label, "zZ"); err == nil {
-		t.Fatal("Relabel /etc succeeded")
-	}
-	if err := Relabel("/", label, ""); err == nil {
-		t.Fatal("Relabel / succeeded")
-	}
-	if err := Relabel("/usr", label, "Z"); err == nil {
-		t.Fatal("Relabel /usr succeeded")
-	}
-}
diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index ba9543880d..7e14a538e6 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -30,10 +30,10 @@ import (
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/hashicorp/errwrap"
+	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pborman/uuid"
 	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/networking/netinfo"
-	"github.com/rkt/rkt/pkg/label"
 	"github.com/rkt/rkt/pkg/lock"
 	"github.com/rkt/rkt/pkg/sys"
 )
@@ -414,8 +414,7 @@ func (p *Pod) ToRun() error {
 	if err := p.ExclusiveLock(); err != nil {
 		return err
 	}
-
-	label.Relabel(p.Path(), p.MountLabel, "Z")
+	label.Relabel(p.Path(), p.MountLabel, false)
 	if err := os.Rename(p.Path(), p.runPath()); err != nil {
 		// TODO(vc): we could race here with a concurrent ToRun(), let caller deal with the error.
 		return err
diff --git a/pkg/selinux/selinux.go b/pkg/selinux/selinux.go
deleted file mode 100644
index 5e039dbf63..0000000000
--- a/pkg/selinux/selinux.go
+++ /dev/null
@@ -1,512 +0,0 @@
-// Copyright 2016 The rkt Authors
-// Copyright 2014,2015 Red Hat, Inc
-// Copyright 2014,2015 Docker, Inc
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package selinux
-
-import (
-	"bufio"
-	"crypto/rand"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/rkt/rkt/pkg/fileutil"
-)
-
-const (
-	Enforcing        = 1
-	Permissive       = 0
-	Disabled         = -1
-	selinuxDir       = "/etc/selinux/"
-	selinuxConfig    = selinuxDir + "config"
-	selinuxTypeTag   = "SELINUXTYPE"
-	selinuxTag       = "SELINUX"
-	selinuxPath      = "/sys/fs/selinux"
-	xattrNameSelinux = "security.selinux"
-	stRdOnly         = 0x01
-)
-
-var (
-	assignRegex           = regexp.MustCompile(`^([^=]+)=(.*)$`)
-	spaceRegex            = regexp.MustCompile(`^([^=]+) (.*)$`)
-	selinuxfs             = "unknown"
-	selinuxEnabled        = false // Stores whether selinux is currently enabled
-	selinuxEnabledChecked = false // Stores whether selinux enablement has been checked or established yet
-	mcsdir                = ""    // Directory to use for MCS storage
-
-	errMCSAlreadyExists = fmt.Errorf("MCS label already exists")
-)
-
-type SELinuxContext map[string]string
-
-// SetDisabled disables selinux support for the package
-func SetDisabled() {
-	selinuxEnabled, selinuxEnabledChecked = false, true
-}
-
-// getSelinuxMountPoint returns the path to the mountpoint of an selinuxfs
-// filesystem or an empty string if no mountpoint is found.  Selinuxfs is
-// a proc-like pseudo-filesystem that exposes the selinux policy API to
-// processes.  The existence of an selinuxfs mount is used to determine
-// whether selinux is currently enabled or not.
-func getSelinuxMountPoint() string {
-	if _, err := os.Stat(selinuxPath); os.IsNotExist(err) {
-		return ""
-	}
-	return selinuxPath
-}
-
-// SelinuxEnabled returns whether selinux is currently enabled.
-func SelinuxEnabled() bool {
-	if selinuxEnabledChecked {
-		return selinuxEnabled
-	}
-	selinuxEnabledChecked = true
-	if fs := getSelinuxMountPoint(); fs != "" {
-		if con, _ := Getcon(); con != "kernel" {
-			selinuxEnabled = true
-		}
-	}
-	return selinuxEnabled
-}
-
-func readConfig(target string) (value string) {
-	var (
-		val, key string
-		bufin    *bufio.Reader
-	)
-
-	in, err := os.Open(selinuxConfig)
-	if err != nil {
-		return ""
-	}
-	defer in.Close()
-
-	bufin = bufio.NewReader(in)
-
-	for done := false; !done; {
-		var line string
-		if line, err = bufin.ReadString('\n'); err != nil {
-			if err != io.EOF {
-				return ""
-			}
-			done = true
-		}
-		line = strings.TrimSpace(line)
-		if len(line) == 0 {
-			// Skip blank lines
-			continue
-		}
-		if line[0] == ';' || line[0] == '#' {
-			// Skip comments
-			continue
-		}
-		if groups := assignRegex.FindStringSubmatch(line); groups != nil {
-			key, val = strings.TrimSpace(groups[1]), strings.TrimSpace(groups[2])
-			if key == target {
-				return strings.Trim(val, "\"")
-			}
-		}
-	}
-	return ""
-}
-
-func getSELinuxPolicyRoot() string {
-	return selinuxDir + readConfig(selinuxTypeTag)
-}
-
-func readCon(name string) (string, error) {
-	var val string
-
-	in, err := os.Open(name)
-	if err != nil {
-		return "", err
-	}
-	defer in.Close()
-
-	_, err = fmt.Fscanf(in, "%s", &val)
-	return val, err
-}
-
-type SelinuxError struct {
-	Errno int
-	Prob  string
-}
-
-const (
-	InvalidContext = iota
-)
-
-func (e *SelinuxError) Error() string {
-	return fmt.Sprintf("SELinux: %s", e.Prob)
-}
-
-// Setfilecon sets the SELinux label for this path or returns an error.
-func Setfilecon(path string, scon string) error {
-	err := fileutil.Lsetxattr(path, xattrNameSelinux, []byte(scon), 0)
-	if err != syscall.EINVAL {
-		return err
-	}
-	return &SelinuxError{InvalidContext, "Invalid Context"}
-}
-
-// Getfilecon returns the SELinux label for this path or returns an error.
-func Getfilecon(path string) (string, error) {
-	con, err := fileutil.Lgetxattr(path, xattrNameSelinux)
-
-	// Trim the NUL byte at the end of the byte buffer, if present.
-	if con[len(con)-1] == '\x00' {
-		con = con[:len(con)-1]
-	}
-	return string(con), err
-}
-
-func Setfscreatecon(scon string) error {
-	return writeCon(fmt.Sprintf("/proc/self/task/%d/attr/fscreate", syscall.Gettid()), scon)
-}
-
-func Getfscreatecon() (string, error) {
-	return readCon(fmt.Sprintf("/proc/self/task/%d/attr/fscreate", syscall.Gettid()))
-}
-
-// Getcon returns the SELinux label of the current process thread, or an error.
-func Getcon() (string, error) {
-	return readCon(fmt.Sprintf("/proc/self/task/%d/attr/current", syscall.Gettid()))
-}
-
-// Getpidcon returns the SELinux label of the given pid, or an error.
-func Getpidcon(pid int) (string, error) {
-	return readCon(fmt.Sprintf("/proc/%d/attr/current", pid))
-}
-
-func Getexeccon() (string, error) {
-	return readCon(fmt.Sprintf("/proc/self/task/%d/attr/exec", syscall.Gettid()))
-}
-
-func writeCon(name string, val string) error {
-	out, err := os.OpenFile(name, os.O_WRONLY, 0)
-	if err != nil {
-		return err
-	}
-	defer out.Close()
-
-	if val != "" {
-		_, err = out.Write([]byte(val))
-	} else {
-		_, err = out.Write(nil)
-	}
-	return err
-}
-
-func Setexeccon(scon string) error {
-	return writeCon(fmt.Sprintf("/proc/self/task/%d/attr/exec", syscall.Gettid()), scon)
-}
-
-func (c SELinuxContext) Get() string {
-	return fmt.Sprintf("%s:%s:%s:%s", c["user"], c["role"], c["type"], c["level"])
-}
-
-func NewContext(scon string) SELinuxContext {
-	c := make(SELinuxContext)
-
-	if len(scon) != 0 {
-		con := strings.SplitN(scon, ":", 4)
-		c["user"] = con[0]
-		c["role"] = con[1]
-		c["type"] = con[2]
-		c["level"] = con[3]
-	}
-	return c
-}
-
-func ReserveLabel(scon string) {
-	if len(scon) != 0 {
-		con := strings.SplitN(scon, ":", 4)
-		mcsAdd(con[3])
-	}
-}
-
-func SelinuxGetEnforce() int {
-	var enforce int
-
-	enforceS, err := readCon(fmt.Sprintf("%s/enforce", selinuxPath))
-	if err != nil {
-		return -1
-	}
-
-	enforce, err = strconv.Atoi(string(enforceS))
-	if err != nil {
-		return -1
-	}
-	return enforce
-}
-
-func SelinuxGetEnforceMode() int {
-	switch readConfig(selinuxTag) {
-	case "enforcing":
-		return Enforcing
-	case "permissive":
-		return Permissive
-	}
-	return Disabled
-}
-
-func mcsPath(mcs string) string {
-	filename := fmt.Sprintf("%s/%s", mcsdir, mcs)
-	return filename
-}
-
-func mcsAdd(mcs string) error {
-	filename := mcsPath(mcs)
-	file, err := os.OpenFile(filename, os.O_CREATE|os.O_EXCL|os.O_RDONLY, 0644)
-	if err != nil {
-		if os.IsExist(err) {
-			return errMCSAlreadyExists
-		}
-		return fmt.Errorf("unable to create MCS: %v", err)
-	}
-	file.Close()
-	return nil
-}
-
-func mcsDelete(mcs string) {
-	filename := mcsPath(mcs)
-	os.Remove(filename)
-}
-
-func mcsExists(mcs string) bool {
-	filename := mcsPath(mcs)
-	_, err := os.Stat(filename)
-	if err == nil {
-		return true
-	}
-	return false
-}
-
-func IntToMcs(id int, catRange uint32) string {
-	var (
-		SETSIZE = int(catRange)
-		TIER    = SETSIZE
-		ORD     = id
-	)
-
-	if id < 1 || id > 523776 {
-		return ""
-	}
-
-	for ORD > TIER {
-		ORD = ORD - TIER
-		TIER -= 1
-	}
-	TIER = SETSIZE - TIER
-	ORD = ORD + TIER
-	return fmt.Sprintf("s0:c%d,c%d", TIER, ORD)
-}
-
-func makeUniqueMcs(catRange uint32) (string, error) {
-	var (
-		n      uint32
-		c1, c2 uint32
-		mcs    string
-		tries  = 1000000
-		err    error
-	)
-
-	for i := 0; i < tries; i++ {
-		binary.Read(rand.Reader, binary.LittleEndian, &n)
-		c1 = n % catRange
-		binary.Read(rand.Reader, binary.LittleEndian, &n)
-		c2 = n % catRange
-		if c1 == c2 {
-			continue
-		}
-		if c1 > c2 {
-			c1, c2 = c2, c1
-		}
-		mcs = fmt.Sprintf("s0:c%d,c%d", c1, c2)
-		err = mcsAdd(mcs)
-		if err == nil {
-			return mcs, nil
-		}
-	}
-	return "", fmt.Errorf("couldn't generate unique MCS after %d tries! (last err=%v)", tries, err)
-}
-
-func FreeLxcContexts(scon string) {
-	if len(scon) != 0 {
-		con := strings.SplitN(scon, ":", 4)
-		mcsDelete(con[3])
-	}
-}
-
-func GetLxcContexts() (processLabel string, fileLabel string, err error) {
-	var (
-		val, key string
-		bufin    *bufio.Reader
-	)
-
-	if !SelinuxEnabled() {
-		return "", "", nil
-	}
-	lxcPath := fmt.Sprintf("%s/contexts/lxc_contexts", getSELinuxPolicyRoot())
-	in, err := os.Open(lxcPath)
-	if err != nil {
-		return "", "", nil
-	}
-	defer in.Close()
-
-	bufin = bufio.NewReader(in)
-
-	for done := false; !done; {
-		var line string
-		if line, err = bufin.ReadString('\n'); err != nil {
-			if err == io.EOF {
-				done = true
-			} else {
-				goto exit
-			}
-		}
-		line = strings.TrimSpace(line)
-		if len(line) == 0 {
-			// Skip blank lines
-			continue
-		}
-		if line[0] == ';' || line[0] == '#' {
-			// Skip comments
-			continue
-		}
-		if groups := assignRegex.FindStringSubmatch(line); groups != nil {
-			key, val = strings.TrimSpace(groups[1]), strings.TrimSpace(groups[2])
-			if key == "process" {
-				processLabel = strings.Trim(val, "\"")
-			}
-			if key == "file" {
-				fileLabel = strings.Trim(val, "\"")
-			}
-		}
-	}
-
-	if processLabel == "" || fileLabel == "" {
-		return "", "", nil
-	}
-
-exit:
-	mcs, err := makeUniqueMcs(1024)
-	if err != nil {
-		return "", "", err
-	}
-	scon := NewContext(processLabel)
-	scon["level"] = mcs
-	processLabel = scon.Get()
-	scon = NewContext(fileLabel)
-	scon["level"] = mcs
-	fileLabel = scon.Get()
-	return processLabel, fileLabel, nil
-}
-
-func SecurityCheckContext(val string) error {
-	return writeCon(fmt.Sprintf("%s.context", selinuxPath), val)
-}
-
-func CopyLevel(src, dest string) (string, error) {
-	if src == "" {
-		return "", nil
-	}
-	if err := SecurityCheckContext(src); err != nil {
-		return "", err
-	}
-	if err := SecurityCheckContext(dest); err != nil {
-		return "", err
-	}
-	scon := NewContext(src)
-	tcon := NewContext(dest)
-	mcsDelete(tcon["level"])
-	mcsAdd(scon["level"])
-	tcon["level"] = scon["level"]
-	return tcon.Get(), nil
-}
-
-// Prevent users from relabeling system files
-func badPrefix(fpath string) error {
-	var badprefixes = []string{"/usr"}
-
-	for _, prefix := range badprefixes {
-		if fpath == prefix || strings.HasPrefix(fpath, fmt.Sprintf("%s/", prefix)) {
-			return fmt.Errorf("Relabeling content in %s is not allowed.", prefix)
-		}
-	}
-	return nil
-}
-
-// Change the fpath file object to the SELinux label scon.
-// If the fpath is a directory and recurse is true Chcon will walk the
-// directory tree setting the label
-func Chcon(fpath string, scon string, recurse bool) error {
-	if scon == "" {
-		return nil
-	}
-	if err := badPrefix(fpath); err != nil {
-		return err
-	}
-	callback := func(p string, info os.FileInfo, err error) error {
-		return Setfilecon(p, scon)
-	}
-
-	if recurse {
-		return filepath.Walk(fpath, callback)
-	}
-
-	return Setfilecon(fpath, scon)
-}
-
-// DupSecOpt takes an SELinux process label and returns security options that
-// can will set the SELinux Type and Level for future container processes
-func DupSecOpt(src string) []string {
-	if src == "" {
-		return nil
-	}
-	con := NewContext(src)
-	if con["user"] == "" ||
-		con["role"] == "" ||
-		con["type"] == "" ||
-		con["level"] == "" {
-		return nil
-	}
-	return []string{"label:user:" + con["user"],
-		"label:role:" + con["role"],
-		"label:type:" + con["type"],
-		"label:level:" + con["level"]}
-}
-
-// DisableSecOpt returns a security opt that can be used to disabling SELinux
-// labeling support for future container processes
-func DisableSecOpt() []string {
-	return []string{"label:disable"}
-}
-
-// Set the directory used for storage of used MCS contexts
-func SetMCSDir(arg string) error {
-	mcsdir = arg
-	return os.MkdirAll(mcsdir, 0755)
-}
diff --git a/pkg/selinux/selinux_test.go b/pkg/selinux/selinux_test.go
deleted file mode 100644
index d5bb747c1f..0000000000
--- a/pkg/selinux/selinux_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2016 The rkt Authors
-// Copyright 2014,2015 Red Hat, Inc
-// Copyright 2014,2015 Docker, Inc
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package selinux_test
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/rkt/rkt/pkg/selinux"
-)
-
-func TestSetfilecon(t *testing.T) {
-	if !selinux.SelinuxEnabled() {
-		t.Skip("SELinux not enabled")
-	}
-
-	f, err := ioutil.TempFile("", "rkt-selinux-test")
-	if err != nil {
-		panic(fmt.Sprintf("unable to create tempfile: %v", err))
-	}
-	f.Close()
-	defer os.Remove(f.Name())
-	err = selinux.Setfilecon(f.Name(), "system_u:object_r:bin_t:s0")
-	if err != nil {
-		t.Log("Setfilecon failed")
-		t.Fatal(err)
-	}
-}
-
-func TestSELinux(t *testing.T) {
-	if !selinux.SelinuxEnabled() {
-		t.Skip("SELinux not enabled")
-	}
-
-	dir, err := ioutil.TempDir("", "rkt-selinux-test")
-	if err != nil {
-		panic(fmt.Sprintf("unable to create temp dir: %v", err))
-	}
-	defer os.RemoveAll(dir)
-	if err := selinux.SetMCSDir(dir); err != nil {
-		t.Errorf("error setting MCS directory: %v", err)
-	}
-
-	var plabel, flabel string
-
-	plabel, flabel, err = selinux.GetLxcContexts()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if plabel == "" {
-		t.Skip("No LXC contexts, skipping tests")
-	}
-	t.Log(plabel)
-	t.Log(flabel)
-	selinux.FreeLxcContexts(plabel)
-	plabel, flabel, err = selinux.GetLxcContexts()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(plabel)
-	t.Log(flabel)
-	selinux.FreeLxcContexts(plabel)
-	t.Log("getenforce ", selinux.SelinuxGetEnforce())
-	t.Log("getenforcemode ", selinux.SelinuxGetEnforceMode())
-	pid := os.Getpid()
-	t.Logf("PID:%d MCS:%s\n", pid, selinux.IntToMcs(pid, 1023))
-	err = selinux.Setfscreatecon("unconfined_u:unconfined_r:unconfined_t:s0")
-	if err == nil {
-		t.Log(selinux.Getfscreatecon())
-	} else {
-		t.Log("setfscreatecon failed", err)
-		t.Fatal(err)
-	}
-	err = selinux.Setfscreatecon("")
-	if err == nil {
-		t.Log(selinux.Getfscreatecon())
-	} else {
-		t.Log("setfscreatecon failed", err)
-		t.Fatal(err)
-	}
-	t.Log(selinux.Getpidcon(1))
-}
diff --git a/rkt/app_sandbox.go b/rkt/app_sandbox.go
index 7c82f59f45..8821ee6a87 100644
--- a/rkt/app_sandbox.go
+++ b/rkt/app_sandbox.go
@@ -21,8 +21,8 @@ import (
 	"strings"
 
 	"github.com/appc/spec/schema/types"
+	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/rkt/rkt/common"
-	"github.com/rkt/rkt/pkg/label"
 	"github.com/rkt/rkt/pkg/lock"
 	"github.com/rkt/rkt/pkg/pod"
 	"github.com/rkt/rkt/pkg/user"
@@ -104,7 +104,7 @@ func runAppSandbox(cmd *cobra.Command, args []string) int {
 		}
 	}
 
-	processLabel, mountLabel, err := label.InitLabels("/var/run/rkt/mcs", []string{})
+	processLabel, mountLabel, err := label.InitLabels([]string{})
 	if err != nil {
 		stderr.PrintE("error initialising SELinux", err)
 		return 1
diff --git a/rkt/run.go b/rkt/run.go
index ab41214756..5a00a23f47 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -28,8 +28,8 @@ import (
 	"github.com/appc/spec/schema/types"
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/hashicorp/errwrap"
+	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/rkt/rkt/common"
-	"github.com/rkt/rkt/pkg/label"
 	"github.com/rkt/rkt/pkg/lock"
 	pkgPod "github.com/rkt/rkt/pkg/pod"
 	"github.com/rkt/rkt/pkg/user"
@@ -292,7 +292,7 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		}
 	}
 
-	processLabel, mountLabel, err := label.InitLabels("/var/run/rkt/mcs", []string{})
+	processLabel, mountLabel, err := label.InitLabels([]string{})
 	if err != nil {
 		stderr.PrintE("error initialising SELinux", err)
 		return 254
diff --git a/stage0/run.go b/stage0/run.go
index 5dd407d0e3..1ffc0c65ff 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -41,13 +41,13 @@ import (
 	"github.com/appc/spec/schema/types"
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/hashicorp/errwrap"
+	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/rkt/rkt/common"
 	"github.com/rkt/rkt/common/apps"
 	commonnet "github.com/rkt/rkt/common/networking"
 	"github.com/rkt/rkt/common/overlay"
 	"github.com/rkt/rkt/pkg/aci"
 	"github.com/rkt/rkt/pkg/fileutil"
-	"github.com/rkt/rkt/pkg/label"
 	"github.com/rkt/rkt/pkg/sys"
 	"github.com/rkt/rkt/pkg/tpm"
 	"github.com/rkt/rkt/pkg/user"
diff --git a/vendor/github.com/opencontainers/selinux/LICENSE b/vendor/github.com/opencontainers/selinux/LICENSE
new file mode 100644
index 0000000000..8dada3edaf
--- /dev/null
+++ b/vendor/github.com/opencontainers/selinux/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/pkg/label/label.go b/vendor/github.com/opencontainers/selinux/go-selinux/label/label.go
similarity index 51%
rename from pkg/label/label.go
rename to vendor/github.com/opencontainers/selinux/go-selinux/label/label.go
index 6f61280392..6cfc5fded8 100644
--- a/pkg/label/label.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/label/label.go
@@ -1,18 +1,3 @@
-// Copyright 2014,2015 Red Hat, Inc
-// Copyright 2014,2015 Docker, Inc
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // +build !selinux !linux
 
 package label
@@ -20,7 +5,15 @@ package label
 // InitLabels returns the process label and file labels to be used within
 // the container.  A list of options can be passed into this function to alter
 // the labels.
-func InitLabels(mcsdir string, options []string) (string, string, error) {
+func InitLabels(options []string) (string, string, error) {
+	return "", "", nil
+}
+
+func GetROMountLabel() string {
+	return ""
+}
+
+func GenLabels(options string) (string, string, error) {
 	return "", "", nil
 }
 
@@ -32,6 +25,10 @@ func SetProcessLabel(processLabel string) error {
 	return nil
 }
 
+func GetFileLabel(path string) (string, error) {
+	return "", nil
+}
+
 func SetFileLabel(path string, fileLabel string) error {
 	return nil
 }
@@ -40,7 +37,7 @@ func SetFileCreateLabel(fileLabel string) error {
 	return nil
 }
 
-func Relabel(path string, fileLabel string, relabel string) error {
+func Relabel(path string, fileLabel string, shared bool) error {
 	return nil
 }
 
@@ -55,11 +52,11 @@ func ReserveLabel(label string) error {
 	return nil
 }
 
-func UnreserveLabel(label string) error {
+func ReleaseLabel(label string) error {
 	return nil
 }
 
-// DupSecOpt takes an process label and returns security options that
+// DupSecOpt takes a process label and returns security options that
 // can be used to set duplicate labels on future container processes
 func DupSecOpt(src string) []string {
 	return nil
@@ -70,3 +67,18 @@ func DupSecOpt(src string) []string {
 func DisableSecOpt() []string {
 	return nil
 }
+
+// Validate checks that the label does not include unexpected options
+func Validate(label string) error {
+	return nil
+}
+
+// RelabelNeeded checks whether the user requested a relabel
+func RelabelNeeded(label string) bool {
+	return false
+}
+
+// IsShared checks that the label includes a "shared" mark
+func IsShared(label string) bool {
+	return false
+}
diff --git a/pkg/label/label_selinux.go b/vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go
similarity index 50%
rename from pkg/label/label_selinux.go
rename to vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go
index 3fc18436eb..569dcf0841 100644
--- a/pkg/label/label_selinux.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go
@@ -1,48 +1,34 @@
-// Copyright 2014,2015 Red Hat, Inc
-// Copyright 2014,2015 Docker, Inc
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 // +build selinux,linux
 
 package label
 
 import (
-	"errors"
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/errwrap"
-	"github.com/rkt/rkt/pkg/selinux"
+	"github.com/opencontainers/selinux/go-selinux"
 )
 
+// Valid Label Options
+var validOptions = map[string]bool{
+	"disable": true,
+	"type":    true,
+	"user":    true,
+	"role":    true,
+	"level":   true,
+}
+
+var ErrIncompatibleLabel = fmt.Errorf("Bad SELinux option z and Z can not be used together")
+
 // InitLabels returns the process label and file labels to be used within
 // the container.  A list of options can be passed into this function to alter
 // the labels.  The labels returned will include a random MCS String, that is
 // guaranteed to be unique.
-func InitLabels(mcsdir string, options []string) (string, string, error) {
-	if !selinux.SelinuxEnabled() {
+func InitLabels(options []string) (string, string, error) {
+	if !selinux.GetEnabled() {
 		return "", "", nil
 	}
-
-	if err := selinux.SetMCSDir(mcsdir); err != nil {
-		return "", "", errwrap.Wrap(errors.New("unable to configure MCS storage directory"), err)
-	}
-
-	processLabel, mountLabel, err := selinux.GetLxcContexts()
-	if err != nil {
-		return "", "", err
-	}
+	processLabel, mountLabel := selinux.ContainerLabels()
 	if processLabel != "" {
 		pcon := selinux.NewContext(processLabel)
 		mcon := selinux.NewContext(mountLabel)
@@ -51,9 +37,13 @@ func InitLabels(mcsdir string, options []string) (string, string, error) {
 				return "", "", nil
 			}
 			if i := strings.Index(opt, ":"); i == -1 {
-				return "", "", errors.New("bad SELinux option")
+				return "", "", fmt.Errorf("Bad label option %q, valid options 'disable' or \n'user, role, level, type' followed by ':' and a value", opt)
 			}
 			con := strings.SplitN(opt, ":", 2)
+			if !validOptions[con[0]] {
+				return "", "", fmt.Errorf("Bad label option %q, valid options 'disable, user, role, level, type'", con[0])
+
+			}
 			pcon[con[0]] = con[1]
 			if con[0] == "level" || con[0] == "user" {
 				mcon[con[0]] = con[1]
@@ -65,6 +55,15 @@ func InitLabels(mcsdir string, options []string) (string, string, error) {
 	return processLabel, mountLabel, nil
 }
 
+func ROMountLabel() string {
+	return selinux.ROFileLabel()
+}
+
+// DEPRECATED: The GenLabels function is only to be used during the transition to the official API.
+func GenLabels(options string) (string, string, error) {
+	return InitLabels(strings.Fields(options))
+}
+
 // FormatMountLabel returns a string to be used by the mount command.
 // The format of this string will be used to alter the labeling of the mountpoint.
 // The string returned is suitable to be used as the options field of the mount command.
@@ -89,69 +88,73 @@ func SetProcessLabel(processLabel string) error {
 	if processLabel == "" {
 		return nil
 	}
-	return selinux.Setexeccon(processLabel)
+	return selinux.SetExecLabel(processLabel)
 }
 
-// GetProcessLabel returns the process label that the kernel will assign
+// ProcessLabel returns the process label that the kernel will assign
 // to the next program executed by the current process.  If "" is returned
 // this indicates that the default labeling will happen for the process.
-func GetProcessLabel() (string, error) {
-	return selinux.Getexeccon()
+func ProcessLabel() (string, error) {
+	return selinux.ExecLabel()
+}
+
+// GetFileLabel returns the label for specified path
+func FileLabel(path string) (string, error) {
+	return selinux.FileLabel(path)
 }
 
 // SetFileLabel modifies the "path" label to the specified file label
 func SetFileLabel(path string, fileLabel string) error {
-	if selinux.SelinuxEnabled() && fileLabel != "" {
-		return selinux.Setfilecon(path, fileLabel)
+	if selinux.GetEnabled() && fileLabel != "" {
+		return selinux.SetFileLabel(path, fileLabel)
 	}
 	return nil
 }
 
-// Tell the kernel the label for all files to be created
+// SetFileCreateLabel tells the kernel the label for all files to be created
 func SetFileCreateLabel(fileLabel string) error {
-	if selinux.SelinuxEnabled() {
-		return selinux.Setfscreatecon(fileLabel)
+	if selinux.GetEnabled() {
+		return selinux.SetFSCreateLabel(fileLabel)
 	}
 	return nil
 }
 
-// Change the label of path to the filelabel string.  If the relabel string
-// is "z", relabel will change the MCS label to s0.  This will allow all
-// containers to share the content.  If the relabel string is a "Z" then
-// the MCS label should continue to be used.  SELinux will use this field
-// to make sure the content can not be shared by other containers.
-func Relabel(path string, fileLabel string, relabel string) error {
-	exclude_path := []string{"/", "/usr", "/etc"}
-	if fileLabel == "" {
+// Relabel changes the label of path to the filelabel string.
+// It changes the MCS label to s0 if shared is true.
+// This will allow all containers to share the content.
+func Relabel(path string, fileLabel string, shared bool) error {
+	if !selinux.GetEnabled() {
 		return nil
 	}
-	if !strings.ContainsAny(relabel, "zZ") {
+
+	if fileLabel == "" {
 		return nil
 	}
-	for _, p := range exclude_path {
-		if path == p {
-			return fmt.Errorf("relabeling of %s is not allowed", path)
-		}
-	}
-	if strings.Contains(relabel, "z") && strings.Contains(relabel, "Z") {
-		return fmt.Errorf("bad SELinux option z and Z can not be used together")
+
+	exclude_paths := map[string]bool{"/": true, "/usr": true, "/etc": true}
+	if exclude_paths[path] {
+		return fmt.Errorf("SELinux relabeling of %s is not allowed", path)
 	}
-	if strings.Contains(relabel, "z") {
+
+	if shared {
 		c := selinux.NewContext(fileLabel)
 		c["level"] = "s0"
 		fileLabel = c.Get()
 	}
-	return selinux.Chcon(path, fileLabel, true)
+	if err := selinux.Chcon(path, fileLabel, true); err != nil {
+		return err
+	}
+	return nil
 }
 
-// GetPidLabel will return the label of the process running with the specified pid
-func GetPidLabel(pid int) (string, error) {
-	return selinux.Getpidcon(pid)
+// PidLabel will return the label of the process running with the specified pid
+func PidLabel(pid int) (string, error) {
+	return selinux.PidLabel(pid)
 }
 
 // Init initialises the labeling system
 func Init() {
-	selinux.SelinuxEnabled()
+	selinux.GetEnabled()
 }
 
 // ReserveLabel will record the fact that the MCS label has already been used.
@@ -162,15 +165,15 @@ func ReserveLabel(label string) error {
 	return nil
 }
 
-// UnreserveLabel will remove the reservation of the MCS label.
+// ReleaseLabel will remove the reservation of the MCS label.
 // This will allow InitLabels to use the MCS label in a newly created
 // containers
-func UnreserveLabel(label string) error {
-	selinux.FreeLxcContexts(label)
+func ReleaseLabel(label string) error {
+	selinux.ReleaseLabel(label)
 	return nil
 }
 
-// DupSecOpt takes an process label and returns security options that
+// DupSecOpt takes a process label and returns security options that
 // can be used to set duplicate labels on future container processes
 func DupSecOpt(src string) []string {
 	return selinux.DupSecOpt(src)
@@ -181,3 +184,21 @@ func DupSecOpt(src string) []string {
 func DisableSecOpt() []string {
 	return selinux.DisableSecOpt()
 }
+
+// Validate checks that the label does not include unexpected options
+func Validate(label string) error {
+	if strings.Contains(label, "z") && strings.Contains(label, "Z") {
+		return ErrIncompatibleLabel
+	}
+	return nil
+}
+
+// RelabelNeeded checks whether the user requested a relabel
+func RelabelNeeded(label string) bool {
+	return strings.Contains(label, "z") || strings.Contains(label, "Z")
+}
+
+// IsShared checks that the label includes a "shared" mark
+func IsShared(label string) bool {
+	return strings.Contains(label, "z")
+}
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/selinux.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux.go
new file mode 100644
index 0000000000..de9316c2e2
--- /dev/null
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux.go
@@ -0,0 +1,593 @@
+// +build linux
+
+package selinux
+
+import (
+	"bufio"
+	"crypto/rand"
+	"encoding/binary"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+	"sync"
+	"syscall"
+)
+
+const (
+	// Enforcing constant indicate SELinux is in enforcing mode
+	Enforcing = 1
+	// Permissive constant to indicate SELinux is in permissive mode
+	Permissive = 0
+	// Disabled constant to indicate SELinux is disabled
+	Disabled         = -1
+	selinuxDir       = "/etc/selinux/"
+	selinuxConfig    = selinuxDir + "config"
+	selinuxTypeTag   = "SELINUXTYPE"
+	selinuxTag       = "SELINUX"
+	selinuxPath      = "/sys/fs/selinux"
+	xattrNameSelinux = "security.selinux"
+	stRdOnly         = 0x01
+)
+
+type selinuxState struct {
+	enabledSet   bool
+	enabled      bool
+	selinuxfsSet bool
+	selinuxfs    string
+	mcsList      map[string]bool
+	sync.Mutex
+}
+
+var (
+	assignRegex = regexp.MustCompile(`^([^=]+)=(.*)$`)
+	state       = selinuxState{
+		mcsList: make(map[string]bool),
+	}
+)
+
+// Context is a representation of the SELinux label broken into 4 parts
+type Context map[string]string
+
+func (s *selinuxState) setEnable(enabled bool) bool {
+	s.Lock()
+	defer s.Unlock()
+	s.enabledSet = true
+	s.enabled = enabled
+	return s.enabled
+}
+
+func (s *selinuxState) getEnabled() bool {
+	s.Lock()
+	enabled := s.enabled
+	enabledSet := s.enabledSet
+	s.Unlock()
+	if enabledSet {
+		return enabled
+	}
+
+	enabled = false
+	if fs := getSelinuxMountPoint(); fs != "" {
+		if con, _ := CurrentLabel(); con != "kernel" {
+			enabled = true
+		}
+	}
+	return s.setEnable(enabled)
+}
+
+// SetDisabled disables selinux support for the package
+func SetDisabled() {
+	state.setEnable(false)
+}
+
+func (s *selinuxState) setSELinuxfs(selinuxfs string) string {
+	s.Lock()
+	defer s.Unlock()
+	s.selinuxfsSet = true
+	s.selinuxfs = selinuxfs
+	return s.selinuxfs
+}
+
+func (s *selinuxState) getSELinuxfs() string {
+	s.Lock()
+	selinuxfs := s.selinuxfs
+	selinuxfsSet := s.selinuxfsSet
+	s.Unlock()
+	if selinuxfsSet {
+		return selinuxfs
+	}
+
+	selinuxfs = ""
+	f, err := os.Open("/proc/self/mountinfo")
+	if err != nil {
+		return selinuxfs
+	}
+	defer f.Close()
+
+	scanner := bufio.NewScanner(f)
+	for scanner.Scan() {
+		txt := scanner.Text()
+		// Safe as mountinfo encodes mountpoints with spaces as \040.
+		sepIdx := strings.Index(txt, " - ")
+		if sepIdx == -1 {
+			continue
+		}
+		if !strings.Contains(txt[sepIdx:], "selinuxfs") {
+			continue
+		}
+		fields := strings.Split(txt, " ")
+		if len(fields) < 5 {
+			continue
+		}
+		selinuxfs = fields[4]
+		break
+	}
+
+	if selinuxfs != "" {
+		var buf syscall.Statfs_t
+		syscall.Statfs(selinuxfs, &buf)
+		if (buf.Flags & stRdOnly) == 1 {
+			selinuxfs = ""
+		}
+	}
+	return s.setSELinuxfs(selinuxfs)
+}
+
+// getSelinuxMountPoint returns the path to the mountpoint of an selinuxfs
+// filesystem or an empty string if no mountpoint is found.  Selinuxfs is
+// a proc-like pseudo-filesystem that exposes the selinux policy API to
+// processes.  The existence of an selinuxfs mount is used to determine
+// whether selinux is currently enabled or not.
+func getSelinuxMountPoint() string {
+	return state.getSELinuxfs()
+}
+
+// GetEnabled returns whether selinux is currently enabled.
+func GetEnabled() bool {
+	return state.getEnabled()
+}
+
+func readConfig(target string) (value string) {
+	var (
+		val, key string
+		bufin    *bufio.Reader
+	)
+
+	in, err := os.Open(selinuxConfig)
+	if err != nil {
+		return ""
+	}
+	defer in.Close()
+
+	bufin = bufio.NewReader(in)
+
+	for done := false; !done; {
+		var line string
+		if line, err = bufin.ReadString('\n'); err != nil {
+			if err != io.EOF {
+				return ""
+			}
+			done = true
+		}
+		line = strings.TrimSpace(line)
+		if len(line) == 0 {
+			// Skip blank lines
+			continue
+		}
+		if line[0] == ';' || line[0] == '#' {
+			// Skip comments
+			continue
+		}
+		if groups := assignRegex.FindStringSubmatch(line); groups != nil {
+			key, val = strings.TrimSpace(groups[1]), strings.TrimSpace(groups[2])
+			if key == target {
+				return strings.Trim(val, "\"")
+			}
+		}
+	}
+	return ""
+}
+
+func getSELinuxPolicyRoot() string {
+	return selinuxDir + readConfig(selinuxTypeTag)
+}
+
+func readCon(name string) (string, error) {
+	var val string
+
+	in, err := os.Open(name)
+	if err != nil {
+		return "", err
+	}
+	defer in.Close()
+
+	_, err = fmt.Fscanf(in, "%s", &val)
+	return val, err
+}
+
+// SetFileLabel sets the SELinux label for this path or returns an error.
+func SetFileLabel(path string, label string) error {
+	return lsetxattr(path, xattrNameSelinux, []byte(label), 0)
+}
+
+// FileLabel returns the SELinux label for this path or returns an error.
+func FileLabel(path string) (string, error) {
+	label, err := lgetxattr(path, xattrNameSelinux)
+	if err != nil {
+		return "", err
+	}
+	// Trim the NUL byte at the end of the byte buffer, if present.
+	if len(label) > 0 && label[len(label)-1] == '\x00' {
+		label = label[:len(label)-1]
+	}
+	return string(label), nil
+}
+
+/*
+SetFSCreateLabel tells kernel the label to create all file system objects
+created by this task. Setting label="" to return to default.
+*/
+func SetFSCreateLabel(label string) error {
+	return writeCon(fmt.Sprintf("/proc/self/task/%d/attr/fscreate", syscall.Gettid()), label)
+}
+
+/*
+FSCreateLabel returns the default label the kernel which the kernel is using
+for file system objects created by this task. "" indicates default.
+*/
+func FSCreateLabel() (string, error) {
+	return readCon(fmt.Sprintf("/proc/self/task/%d/attr/fscreate", syscall.Gettid()))
+}
+
+// CurrentLabel returns the SELinux label of the current process thread, or an error.
+func CurrentLabel() (string, error) {
+	return readCon(fmt.Sprintf("/proc/self/task/%d/attr/current", syscall.Gettid()))
+}
+
+// PidLabel returns the SELinux label of the given pid, or an error.
+func PidLabel(pid int) (string, error) {
+	return readCon(fmt.Sprintf("/proc/%d/attr/current", pid))
+}
+
+/*
+ExecLabel returns the SELinux label that the kernel will use for any programs
+that are executed by the current process thread, or an error.
+*/
+func ExecLabel() (string, error) {
+	return readCon(fmt.Sprintf("/proc/self/task/%d/attr/exec", syscall.Gettid()))
+}
+
+func writeCon(name string, val string) error {
+	out, err := os.OpenFile(name, os.O_WRONLY, 0)
+	if err != nil {
+		return err
+	}
+	defer out.Close()
+
+	if val != "" {
+		_, err = out.Write([]byte(val))
+	} else {
+		_, err = out.Write(nil)
+	}
+	return err
+}
+
+/*
+SetExecLabel sets the SELinux label that the kernel will use for any programs
+that are executed by the current process thread, or an error.
+*/
+func SetExecLabel(label string) error {
+	return writeCon(fmt.Sprintf("/proc/self/task/%d/attr/exec", syscall.Gettid()), label)
+}
+
+// Get returns the Context as a string
+func (c Context) Get() string {
+	return fmt.Sprintf("%s:%s:%s:%s", c["user"], c["role"], c["type"], c["level"])
+}
+
+// NewContext creates a new Context struct from the specified label
+func NewContext(label string) Context {
+	c := make(Context)
+
+	if len(label) != 0 {
+		con := strings.SplitN(label, ":", 4)
+		c["user"] = con[0]
+		c["role"] = con[1]
+		c["type"] = con[2]
+		c["level"] = con[3]
+	}
+	return c
+}
+
+// ReserveLabel reserves the MLS/MCS level component of the specified label
+func ReserveLabel(label string) {
+	if len(label) != 0 {
+		con := strings.SplitN(label, ":", 4)
+		mcsAdd(con[3])
+	}
+}
+
+func selinuxEnforcePath() string {
+	return fmt.Sprintf("%s/enforce", selinuxPath)
+}
+
+// EnforceMode returns the current SELinux mode Enforcing, Permissive, Disabled
+func EnforceMode() int {
+	var enforce int
+
+	enforceS, err := readCon(selinuxEnforcePath())
+	if err != nil {
+		return -1
+	}
+
+	enforce, err = strconv.Atoi(string(enforceS))
+	if err != nil {
+		return -1
+	}
+	return enforce
+}
+
+/*
+SetEnforceMode sets the current SELinux mode Enforcing, Permissive.
+Disabled is not valid, since this needs to be set at boot time.
+*/
+func SetEnforceMode(mode int) error {
+	return writeCon(selinuxEnforcePath(), fmt.Sprintf("%d", mode))
+}
+
+/*
+DefaultEnforceMode returns the systems default SELinux mode Enforcing,
+Permissive or Disabled. Note this is is just the default at boot time.
+EnforceMode tells you the systems current mode.
+*/
+func DefaultEnforceMode() int {
+	switch readConfig(selinuxTag) {
+	case "enforcing":
+		return Enforcing
+	case "permissive":
+		return Permissive
+	}
+	return Disabled
+}
+
+func mcsAdd(mcs string) error {
+	state.Lock()
+	defer state.Unlock()
+	if state.mcsList[mcs] {
+		return fmt.Errorf("MCS Label already exists")
+	}
+	state.mcsList[mcs] = true
+	return nil
+}
+
+func mcsDelete(mcs string) {
+	state.Lock()
+	defer state.Unlock()
+	state.mcsList[mcs] = false
+}
+
+func intToMcs(id int, catRange uint32) string {
+	var (
+		SETSIZE = int(catRange)
+		TIER    = SETSIZE
+		ORD     = id
+	)
+
+	if id < 1 || id > 523776 {
+		return ""
+	}
+
+	for ORD > TIER {
+		ORD = ORD - TIER
+		TIER--
+	}
+	TIER = SETSIZE - TIER
+	ORD = ORD + TIER
+	return fmt.Sprintf("s0:c%d,c%d", TIER, ORD)
+}
+
+func uniqMcs(catRange uint32) string {
+	var (
+		n      uint32
+		c1, c2 uint32
+		mcs    string
+	)
+
+	for {
+		binary.Read(rand.Reader, binary.LittleEndian, &n)
+		c1 = n % catRange
+		binary.Read(rand.Reader, binary.LittleEndian, &n)
+		c2 = n % catRange
+		if c1 == c2 {
+			continue
+		} else {
+			if c1 > c2 {
+				c1, c2 = c2, c1
+			}
+		}
+		mcs = fmt.Sprintf("s0:c%d,c%d", c1, c2)
+		if err := mcsAdd(mcs); err != nil {
+			continue
+		}
+		break
+	}
+	return mcs
+}
+
+/*
+ReleaseLabel will unreserve the MLS/MCS Level field of the specified label.
+Allowing it to be used by another process.
+*/
+func ReleaseLabel(label string) {
+	if len(label) != 0 {
+		con := strings.SplitN(label, ":", 4)
+		mcsDelete(con[3])
+	}
+}
+
+var roFileLabel string
+
+// ROFileLabel returns the specified SELinux readonly file label
+func ROFileLabel() (fileLabel string) {
+	return roFileLabel
+}
+
+/*
+ContainerLabels returns an allocated processLabel and fileLabel to be used for
+container labeling by the calling process.
+*/
+func ContainerLabels() (processLabel string, fileLabel string) {
+	var (
+		val, key string
+		bufin    *bufio.Reader
+	)
+
+	if !GetEnabled() {
+		return "", ""
+	}
+	lxcPath := fmt.Sprintf("%s/contexts/lxc_contexts", getSELinuxPolicyRoot())
+	in, err := os.Open(lxcPath)
+	if err != nil {
+		return "", ""
+	}
+	defer in.Close()
+
+	bufin = bufio.NewReader(in)
+
+	for done := false; !done; {
+		var line string
+		if line, err = bufin.ReadString('\n'); err != nil {
+			if err == io.EOF {
+				done = true
+			} else {
+				goto exit
+			}
+		}
+		line = strings.TrimSpace(line)
+		if len(line) == 0 {
+			// Skip blank lines
+			continue
+		}
+		if line[0] == ';' || line[0] == '#' {
+			// Skip comments
+			continue
+		}
+		if groups := assignRegex.FindStringSubmatch(line); groups != nil {
+			key, val = strings.TrimSpace(groups[1]), strings.TrimSpace(groups[2])
+			if key == "process" {
+				processLabel = strings.Trim(val, "\"")
+			}
+			if key == "file" {
+				fileLabel = strings.Trim(val, "\"")
+			}
+			if key == "ro_file" {
+				roFileLabel = strings.Trim(val, "\"")
+			}
+		}
+	}
+
+	if processLabel == "" || fileLabel == "" {
+		return "", ""
+	}
+
+	if roFileLabel == "" {
+		roFileLabel = fileLabel
+	}
+exit:
+	mcs := uniqMcs(1024)
+	scon := NewContext(processLabel)
+	scon["level"] = mcs
+	processLabel = scon.Get()
+	scon = NewContext(fileLabel)
+	scon["level"] = mcs
+	fileLabel = scon.Get()
+	return processLabel, fileLabel
+}
+
+// SecurityCheckContext validates that the SELinux label is understood by the kernel
+func SecurityCheckContext(val string) error {
+	return writeCon(fmt.Sprintf("%s.context", selinuxPath), val)
+}
+
+/*
+CopyLevel returns a label with the MLS/MCS level from src label replaces on
+the dest label.
+*/
+func CopyLevel(src, dest string) (string, error) {
+	if src == "" {
+		return "", nil
+	}
+	if err := SecurityCheckContext(src); err != nil {
+		return "", err
+	}
+	if err := SecurityCheckContext(dest); err != nil {
+		return "", err
+	}
+	scon := NewContext(src)
+	tcon := NewContext(dest)
+	mcsDelete(tcon["level"])
+	mcsAdd(scon["level"])
+	tcon["level"] = scon["level"]
+	return tcon.Get(), nil
+}
+
+// Prevent users from relabing system files
+func badPrefix(fpath string) error {
+	var badprefixes = []string{"/usr"}
+
+	for _, prefix := range badprefixes {
+		if fpath == prefix || strings.HasPrefix(fpath, fmt.Sprintf("%s/", prefix)) {
+			return fmt.Errorf("relabeling content in %s is not allowed", prefix)
+		}
+	}
+	return nil
+}
+
+// Chcon changes the fpath file object to the SELinux label label.
+// If the fpath is a directory and recurse is true Chcon will walk the
+// directory tree setting the label
+func Chcon(fpath string, label string, recurse bool) error {
+	if label == "" {
+		return nil
+	}
+	if err := badPrefix(fpath); err != nil {
+		return err
+	}
+	callback := func(p string, info os.FileInfo, err error) error {
+		return SetFileLabel(p, label)
+	}
+
+	if recurse {
+		return filepath.Walk(fpath, callback)
+	}
+
+	return SetFileLabel(fpath, label)
+}
+
+// DupSecOpt takes an SELinux process label and returns security options that
+// can will set the SELinux Type and Level for future container processes
+func DupSecOpt(src string) []string {
+	if src == "" {
+		return nil
+	}
+	con := NewContext(src)
+	if con["user"] == "" ||
+		con["role"] == "" ||
+		con["type"] == "" ||
+		con["level"] == "" {
+		return nil
+	}
+	return []string{"user:" + con["user"],
+		"role:" + con["role"],
+		"type:" + con["type"],
+		"level:" + con["level"]}
+}
+
+// DisableSecOpt returns a security opt that can be used to disabling SELinux
+// labeling support for future container processes
+func DisableSecOpt() []string {
+	return []string{"disable"}
+}
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/xattrs.go b/vendor/github.com/opencontainers/selinux/go-selinux/xattrs.go
new file mode 100644
index 0000000000..7f2ef85049
--- /dev/null
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/xattrs.go
@@ -0,0 +1,78 @@
+// +build linux
+
+package selinux
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _zero uintptr
+
+// Returns a []byte slice if the xattr is set and nil otherwise
+// Requires path and its attribute as arguments
+func lgetxattr(path string, attr string) ([]byte, error) {
+	var sz int
+	pathBytes, err := syscall.BytePtrFromString(path)
+	if err != nil {
+		return nil, err
+	}
+	attrBytes, err := syscall.BytePtrFromString(attr)
+	if err != nil {
+		return nil, err
+	}
+
+	// Start with a 128 length byte array
+	sz = 128
+	dest := make([]byte, sz)
+	destBytes := unsafe.Pointer(&dest[0])
+	_sz, _, errno := syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(destBytes), uintptr(len(dest)), 0, 0)
+
+	switch {
+	case errno == syscall.ENODATA:
+		return nil, errno
+	case errno == syscall.ENOTSUP:
+		return nil, errno
+	case errno == syscall.ERANGE:
+		// 128 byte array might just not be good enough,
+		// A dummy buffer is used ``uintptr(0)`` to get real size
+		// of the xattrs on disk
+		_sz, _, errno = syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(unsafe.Pointer(nil)), uintptr(0), 0, 0)
+		sz = int(_sz)
+		if sz < 0 {
+			return nil, errno
+		}
+		dest = make([]byte, sz)
+		destBytes := unsafe.Pointer(&dest[0])
+		_sz, _, errno = syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(destBytes), uintptr(len(dest)), 0, 0)
+		if errno != 0 {
+			return nil, errno
+		}
+	case errno != 0:
+		return nil, errno
+	}
+	sz = int(_sz)
+	return dest[:sz], nil
+}
+
+func lsetxattr(path string, attr string, data []byte, flags int) error {
+	pathBytes, err := syscall.BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+	attrBytes, err := syscall.BytePtrFromString(attr)
+	if err != nil {
+		return err
+	}
+	var dataBytes unsafe.Pointer
+	if len(data) > 0 {
+		dataBytes = unsafe.Pointer(&data[0])
+	} else {
+		dataBytes = unsafe.Pointer(&_zero)
+	}
+	_, _, errno := syscall.Syscall6(syscall.SYS_LSETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(dataBytes), uintptr(len(data)), uintptr(flags), 0)
+	if errno != 0 {
+		return errno
+	}
+	return nil
+}

From 227b15c9f94dead5b68caae003646a3bb2253237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Ribeiro?= <darklaw13@yahoo.co.uk>
Date: Tue, 31 Oct 2017 00:25:43 +0000
Subject: [PATCH 1211/1304] documentation: fix broken link

---
 Documentation/production-users.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/production-users.md b/Documentation/production-users.md
index 3f022b33e5..250569fcfb 100644
--- a/Documentation/production-users.md
+++ b/Documentation/production-users.md
@@ -39,4 +39,4 @@ These are blog posts and stories from people evaluating rkt. Although most aren'
 - [Scott Lowe, Developer at VMWare](http://www.slideshare.net/lowescott/getting-started-with-containers) getting started with containers
 - [Yutaka Matsubara, CTO at Abby](http://www.slideshare.net/YutakaMatsubara/rocket-46800960) rkt
 - [Thuc Le Dong, Developer at Silicon Straits](http://www.slideshare.net/ledongthuc/rkt-container-engine) overview of the rkt container engine
-- [Avi Deitcher, Business Technology Consultant](http://blog.atomicinc.com/2016/10/14/can-rktkubernetes-provide-a-real-alternative-to-docker-2896/)
+- [Avi Deitcher, Business Technology Consultant](http://blog.atomicinc.com/2016/10/14/can-rktkubernetes-provide-a-real-alternative-to-docker/)

From ab2618c1002cda64fdca88b06765745ab4f94557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 3 Nov 2017 16:00:29 +0100
Subject: [PATCH 1212/1304] Documentation: add --pod-manifest explanation

Some users find confusing the fact that `--pod-manifest` overrides
everything specified in the image manifest.

Document that to avoid confusion.
---
 Documentation/subcommands/run.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index b92fc9ec49..6956f02890 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -32,6 +32,12 @@ Multiple applications can be run in a pod by passing multiple images to the run
 # rkt run example.com/app1 example.com/app2
 ```
 
+## Run from a runtime manifest
+
+The flag `--pod-manifest` allows users to specify a [*runtime manifest*](https://github.com/appc/spec/blob/master/spec/pods.md#app-container-pods-pods)
+to run as a pod. This means image manifests for apps in the pod will be
+overriden and any configuration specified in them will be ignored.
+
 ## Overriding the app's name
 
 Be default, the image's name will be used as the app's name.

From 56014d0d5ce1cd9c97ff3f487b6c9c1234c6e966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Nov 2017 12:39:19 +0100
Subject: [PATCH 1213/1304] Documentation: link to configure flags doc for TPM
 dep

---
 Documentation/dependencies.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/dependencies.md b/Documentation/dependencies.md
index 53800a035f..d28324176d 100644
--- a/Documentation/dependencies.md
+++ b/Documentation/dependencies.md
@@ -17,7 +17,7 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
   * the rkt binary links against the library
 * gofmt (usually distributed with Go)
 * govet (usually distributed with Go)
-* TrouSerS (only when TPM is enabled)
+* TrouSerS (only when TPM is enabled, see [build configuration][build-configure] for details)
   * development headers
   * the rkt binary links against the library
 * libsystemd-journal
@@ -90,3 +90,4 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
   * systemd-journald
 
 [kernel-build-deps]: https://www.kernel.org/doc/Documentation/Changes
+[build-configure]: build-configure.md#--enable-tpm

From 5456e2509dc6fc9dafc3fad6dc5c9b5523b237b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Nov 2017 14:42:13 +0100
Subject: [PATCH 1214/1304] Documentation: document the size shown in image
 list

---
 Documentation/subcommands/image.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Documentation/subcommands/image.md b/Documentation/subcommands/image.md
index aa2bb8f900..78c5dc7dad 100644
--- a/Documentation/subcommands/image.md
+++ b/Documentation/subcommands/image.md
@@ -120,6 +120,16 @@ ID                                                                        NAME
 sha512-96323da393621d846c632e71551b77089ac0b004ceb5c2362be4f5ced2212db9   registry-1.docker.io/library/redis:latest    2015-12-14 12:30:33.652 +0100 CET    2015-12-14 12:33:40.812 +0100 CET   113309184  true
 ```
 
+### Image size
+
+In rkt, dependencies between ACI images form a directed acyclic graph.
+An image is pre-rendered in what is called the tree store.
+A rendered image in the tree store contains a ready-to-execute filesystem tree with all the files of the image plus the relevant files of its dependencies as specified by the [appc spec][ace-fs].
+
+The size shown in `rkt image list` is the uncompressed size of the image itself **plus** the size of its related tree stores.
+
+**Note**: There's currently a bug in the size calculation logic. rkt assumes there can only be one tree store per image but, if a dependency changes, there will be multiple different tree stores. This bug is tracked by [#2968][rkt-2968]
+
 ### Options
 
 | Flag | Default | Options | Description |
@@ -158,3 +168,5 @@ See the table with [global options in general commands documentation][global-opt
 
 
 [global-options]: ../commands.md#global-options
+[ace-fs]: https://github.com/appc/spec/blob/v0.8.11/spec/ace.md#filesystem-setup
+[rkt-2968]: https://github.com/rkt/rkt/issues/2968

From 948101ec34003191c980f4a351057eda6daac542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Nov 2017 16:21:00 +0100
Subject: [PATCH 1215/1304] Documentation: run: reorder empty volumes

---
 Documentation/subcommands/run.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index b92fc9ec49..3f5fe5df1e 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -201,14 +201,14 @@ In the following example, we make the host's `/srv/data` accessible to app1 on `
 # rkt run --volume data,kind=host,source=/srv/data,readOnly=false example.com/app1
 ```
 
+#### Empty Volumes
+
 If you don't intend to persist the data and you just want to have a volume shared between all the apps in the pod, you can use an `empty` volume:
 
 ```
 # rkt run --volume data,kind=empty,readOnly=false example.com/app1
 ```
 
-#### Empty Volumes
-
 For `empty` volumes, the `--volume` flag allows you to specify the volume name, and the mode, UID and GID of the generated volume.
 The volume name is mandatory.
 By default, `mode` is `0755`, UID is `0` and GID is `0`.

From 3107874f0498debb26d9d029bbd22df7b32c16f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Nov 2017 16:22:05 +0100
Subject: [PATCH 1216/1304] Documentation: run: document recursive option for
 volumes

---
 Documentation/subcommands/run.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 3f5fe5df1e..3c7de4b071 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -185,14 +185,15 @@ There are two kinds of volumes, `host` and `empty`.
 
 #### Host Volumes
 
-For `host` volumes, the `--volume` flag allows you to specify the volume name, the location on the host, and whether the volume is read-only or not.
+For `host` volumes, the `--volume` flag allows you to specify the volume name, the location on the host, whether the volume is read-only or not, and whether the volume is recursive or not.
 The volume name and location on the host are mandatory.
 The read-only parameter is false by default.
+The recursive parameter is true by default for the coreos and KVM stage1 flavors, and false by default for the fly stage1 flavor.
 
 Syntax:
 
 ```
---volume NAME,kind=host,source=SOURCE_PATH,readOnly=BOOL
+--volume NAME,kind=host,source=SOURCE_PATH,readOnly=BOOL,recursive=BOOL
 ```
 
 In the following example, we make the host's `/srv/data` accessible to app1 on `/var/data`:
@@ -201,6 +202,12 @@ In the following example, we make the host's `/srv/data` accessible to app1 on `
 # rkt run --volume data,kind=host,source=/srv/data,readOnly=false example.com/app1
 ```
 
+Here we set the recursive option to false to avoid making further mounts inside `/srv/data` available to the container:
+
+```
+# rkt run --volume data,kind=host,source=/srv/data,readOnly=false,recursive=false example.com/app1
+```
+
 #### Empty Volumes
 
 If you don't intend to persist the data and you just want to have a volume shared between all the apps in the pod, you can use an `empty` volume:

From 4f4764d383915846251134169f6bbc1d188be48b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 10 Nov 2017 15:43:55 +0100
Subject: [PATCH 1217/1304] stage1: execute pre-start/post-stop hooks as
 privileged

Even if we run the container as an unprivileged user.

Usually, pre-start and post-stop are used to initialize or shut down a
service, and very often this needs privileges.
---
 stage1/init/common/units.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 9e29e169d2..832152e85f 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -551,6 +551,7 @@ func (uw *UnitWriter) appSystemdUnit(pa *preparedApp, binPath string, opts []*un
 		unit.NewUnitOption("Service", "EnvironmentFile", RelEnvFilePath(appName)),
 		unit.NewUnitOption("Service", "User", strconv.Itoa(int(pa.uid))),
 		unit.NewUnitOption("Service", "Group", strconv.Itoa(int(pa.gid))),
+		unit.NewUnitOption("Service", "PermissionsStartOnly", "true"),
 		unit.NewUnitOption("Unit", "Requires", InstantiatedPrepareAppUnitName(ra.Name)),
 		unit.NewUnitOption("Unit", "After", InstantiatedPrepareAppUnitName(ra.Name)),
 	)

From 59f6abf1a589d7a70f5a738a95bf6034cb732378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Nov 2017 15:22:38 +0100
Subject: [PATCH 1218/1304] Documentation: capabilities: focus on runtime
 configuration

Reorder capabilities docs to focus on how to configure them at runtime.
---
 Documentation/capabilities-guide.md | 83 ++++++++++++++---------------
 1 file changed, 39 insertions(+), 44 deletions(-)

diff --git a/Documentation/capabilities-guide.md b/Documentation/capabilities-guide.md
index 652f3c2e85..a368b37569 100644
--- a/Documentation/capabilities-guide.md
+++ b/Documentation/capabilities-guide.md
@@ -6,8 +6,8 @@ This document is a walk-through guide describing how to use rkt isolators for
 * [About Linux Capabilities](#about-linux-capabilities)
 * [Default Capabilities](#default-capabilities)
 * [Capability Isolators](#capability-isolators)
-* [Usage Example](#usage-example)
-* [Overriding Capabilities](#overriding-capabilities)
+* [Configure capabilities via the command line](#configure-capabilities-via-the-command-line)
+* [Configure capabilities in ACI images](#configure-capabilities-in-aci-images)
 * [Recommendations](#recommendations)
 
 ## About Linux Capabilities
@@ -97,7 +97,43 @@ For example, an application that will need to perform multiple privileged
 operations but is known to never open a raw socket, will have
 `CAP_NET_RAW` specified in its "remove-set".
 
-## Usage Example
+## Configure capabilities via the command line
+
+Capabilities can be directly overridden at run time from the command-line,
+without changing the executed images.
+The `--caps-retain` option to `rkt run` manipulates the `retain` capabilities set.
+The `--caps-remove` option manipulates the `remove` set.
+
+Capabilities specified from the command-line will replace all capability settings in the image manifest.
+Also as stated above the options `--caps-retain`, and `--caps-remove` are mutually exclusive.
+Only one can be specified at a time.
+
+Capabilities isolators can be added on the command line at run time by
+specifying the desired overriding set, as shown in this example:
+
+```
+$ sudo rkt run --interactive quay.io/coreos/alpine-sh --caps-retain CAP_NET_BIND_SERVICE
+image: using image from file /usr/local/bin/stage1-coreos.aci
+image: using image from local store for image name quay.io/coreos/alpine-sh
+
+/ # whoami
+root
+
+/ # ping -c 1 8.8.8.8
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+ping: permission denied (are you root?)
+
+```
+
+Capability sets are application-specific configuration entries, and in a
+`rkt run` command line, they must follow the application container image to
+which they apply.
+Each application within a pod can have different capability sets.
+
+## Configure capabilities in ACI images
+
+Capability sets are typically defined when creating images, as they are tightly
+linked to specific app requirements.
 
 The goal of these examples is to show how to build ACIs with [`acbuild`][acbuild],
 where some capabilities are either explicitly blocked or allowed.
@@ -221,14 +257,6 @@ root
 nc: bind: Permission denied
 ```
 
-## Overriding capabilities
-
-Capability sets are typically defined when creating images, as they are tightly
-linked to specific app requirements. However, image consumers may need to further
-tweak/restrict the set of available capabilities in specific local scenarios.
-This can be done either by permanently patching the manifest of specific images, or
-by overriding capability isolators with command line options.
-
 ### Patching images
 
 Image manifests can be manipulated manually, by unpacking the image and editing
@@ -291,39 +319,6 @@ image: using image from local store for image name quay.io/coreos/alpine-sh
 listening on [::]:80 ...
 ```
 
-### Overriding capabilities at run-time
-
-Capabilities can be directly overridden at run time from the command-line,
-without changing the executed images.
-The `--caps-retain` option to `rkt run` manipulates the `retain` capabilities set.
-The `--caps-remove` option manipulates the `remove` set.
-
-Capabilities specified from the command-line will replace all capability settings in the image manifest.
-Also as stated above the options `--caps-retain`, and `--caps-remove` are mutually exclusive.
-Only one can be specified at a time.
-
-Capabilities isolators can be added on the command line at run time by
-specifying the desired overriding set, as shown in this example:
-
-```
-$ sudo rkt run --interactive quay.io/coreos/alpine-sh --caps-retain CAP_NET_BIND_SERVICE
-image: using image from file /usr/local/bin/stage1-coreos.aci
-image: using image from local store for image name quay.io/coreos/alpine-sh
-
-/ # whoami
-root
-
-/ # ping -c 1 8.8.8.8
-PING 8.8.8.8 (8.8.8.8): 56 data bytes
-ping: permission denied (are you root?)
-
-```
-
-Capability sets are application-specific configuration entries, and in a
-`rkt run` command line, they must follow the application container image to
-which they apply.
-Each application within a pod can have different capability sets.
-
 ## Recommendations
 
 As with most security features, capability isolators may require some

From 7ba8208176f4a6cb45ef3d8d95d7ff2f49ec967f Mon Sep 17 00:00:00 2001
From: samm81 <samwmaynard@gmail.com>
Date: Tue, 14 Nov 2017 16:30:03 -0600
Subject: [PATCH 1219/1304] stage1-fly/run: allow non absolute commands to be
 run

changes stage1-fly to convert a command name into an absolute path so
that syscall.Exec is able to properly execute it.
---
 stage1_fly/run/main.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/stage1_fly/run/main.go b/stage1_fly/run/main.go
index 2d3b1dc118..eb788074a1 100644
--- a/stage1_fly/run/main.go
+++ b/stage1_fly/run/main.go
@@ -460,6 +460,17 @@ func stage1(rp *stage1commontypes.RuntimePod) int {
 		return 254
 	}
 
+	// syscall.Exec takes a path and not a command name, so in the event that args[0] is a command name we have to convert it into a path
+	path, err := stage1initcommon.FindBinPath(p, &ra)
+	if err != nil {
+		log.PrintE(fmt.Sprintf("can't find the absolute executable for %q", args[0]), err)
+		return 254
+	}
+	if path != args[0] {
+		diag.Printf("converting args[0] (%q) into an absolute path: %q", args[0], path)
+		args[0] = path
+	}
+
 	diag.Printf("chroot to %q", rfs)
 	if err := syscall.Chroot(rfs); err != nil {
 		log.PrintE("can't chroot", err)

From c9fc060e84d1ed774b84529876af2780c89e5e1f Mon Sep 17 00:00:00 2001
From: Serghei Anicheev <sanicheev@nemo.ai>
Date: Tue, 22 Aug 2017 23:14:23 +1000
Subject: [PATCH 1220/1304] rkt: prevent skipping some images in image gc

We were using break when we found an image with a pod in running state
but that means we'll miss subsequent images for non-running pods.

Change the break to a continue to keep processing the rest.
---
 rkt/image_gc.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/image_gc.go b/rkt/image_gc.go
index 1de666e8ad..affcece916 100644
--- a/rkt/image_gc.go
+++ b/rkt/image_gc.go
@@ -150,7 +150,7 @@ func gcStore(s *imagestore.Store, gracePeriod time.Duration) error {
 			break
 		}
 		if isInSet(ai.BlobKey, runningImages) {
-			break
+			continue
 		}
 		imagesToRemove = append(imagesToRemove, ai.BlobKey)
 	}

From 01b7478542cc64d2e2e102b00b0382722c7298ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 16 Nov 2017 17:38:30 +0100
Subject: [PATCH 1221/1304] functional tests: add pre-start hook test

It tests that the pre-start hook runs and that it runs as root even when
the app itself runs as an unprivileged user.
---
 tests/rkt_run_test.go | 51 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/rkt_run_test.go b/tests/rkt_run_test.go
index 54921106e0..8887cd204f 100644
--- a/tests/rkt_run_test.go
+++ b/tests/rkt_run_test.go
@@ -18,9 +18,16 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
 	"testing"
 
+	"github.com/rkt/rkt/common"
+	"github.com/rkt/rkt/pkg/aci/acitest"
 	"github.com/rkt/rkt/tests/testutils"
+
+	"github.com/appc/spec/schema"
+	"github.com/appc/spec/schema/types"
 )
 
 // TestRunConflictingFlags tests that 'rkt run' will complain and abort
@@ -61,3 +68,47 @@ func TestRunConflictingFlags(t *testing.T) {
 		runRktAndCheckOutput(t, cmd, runConflictingFlagsMsg, true)
 	}
 }
+
+// TestPreStart tests that pre-start events are run, and they run as root even
+// when the app itself runs as an unprivileged user.
+func TestPreStart(t *testing.T) {
+	prestartManifest := schema.ImageManifest{
+		Name: "coreos.com/rkt-prestart-test",
+		App: &types.App{
+			Exec: types.Exec{"/inspect"},
+			User: "1000", Group: "1000",
+			WorkingDirectory: "/",
+			EventHandlers: []types.EventHandler{
+				{"pre-start", types.Exec{
+					"/inspect",
+					"--print-user",
+				}},
+			},
+		},
+		Labels: types.Labels{
+			{"version", "1.29.0"},
+			{"arch", common.GetArch()},
+			{"os", common.GetOS()},
+		},
+	}
+
+	prestartManifestStr, err := acitest.ImageManifestString(&prestartManifest)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	prestartManifestFile := "prestart-manifest.json"
+	if err := ioutil.WriteFile(prestartManifestFile, []byte(prestartManifestStr), 0600); err != nil {
+		t.Fatalf("Cannot write prestart manifest: %v", err)
+	}
+	defer os.Remove(prestartManifestFile)
+	prestartImage := patchTestACI("rkt-prestart.aci", fmt.Sprintf("--manifest=%s", prestartManifestFile))
+	defer os.Remove(prestartImage)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	rktCmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), prestartImage)
+	expectedLine := "User: uid=0 euid=0 gid=0 egid=0"
+	runRktAndCheckOutput(t, rktCmd, expectedLine, false)
+}

From c403c581ed6a4c13b17d77f28f07f2003f353d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 9 Nov 2017 12:53:28 +0100
Subject: [PATCH 1222/1304] Documentation: first stab at security best
 practices

---
 Documentation/security.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 Documentation/security.md

diff --git a/Documentation/security.md b/Documentation/security.md
new file mode 100644
index 0000000000..c356b2f0fc
--- /dev/null
+++ b/Documentation/security.md
@@ -0,0 +1,27 @@
+# Security best practices
+
+This document tries to give an overview of the security recommendations to follow when running rkt containers.
+
+## General recommendations
+
+* **Don't run applications as root.** Use the [user and group fields][aci-schema] in your images or the `--user` and `--group` [CLI flags][rkt-run-subcommands] when running containers.
+* **Don't disable security features unless you really need it.** You should not use the `--insecure-options=` flag unless strictly necessary.
+* **Restrict capabilities given to your images as much as possible.** Only those actually needed by your app [should be granted][capabilities-guide].
+* **Tweak seccomp syscall filtering instead of disabling it.** The default seccomp profile might be too restrictive for your app. If that's the case, [tweak the seccomp profile][seccomp-guide] instead of disabling it.
+* **If you're not affected by its [current limitations][user-ns-limitations], use user namespaces.**
+* **Don't use host networking** since that will give the app in the container access to the host network interfaces and allow it to connect to any other application listening on the host, including on abstract Unix sockets.
+
+## Volumes
+
+When using volumes, special care should be taken to avoid dangerous interactions with the host.
+Here are some security best practices:
+
+* **Use read-only volumes unless writing to them is necessary.**
+* If you use Linux v4.2 or older, **avoid sharing directories when tools on the host can move files outside the directory** (such as Nautilus moving directories to the trash bin when a user deletes it). This could expose the entire host filesystem to the container. See [moby/moby#12317 (comment)](https://github.com/moby/moby/issues/12317#issuecomment-92692061).
+* To avoid the previous point: **share a full filesystem instead of just a directory in a filesystem if possible**. For example, a mounted partition or some file mounted with `mount -o loop`.
+
+[aci-schema]: https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
+[rkt-run-subcommands]: subcommands/run.md#options
+[capabilities-guide]: capabilities-guide.md
+[seccomp-guide]: seccomp-guide.md
+[user-ns-limitations]: devel/user-namespaces.md#current-limitations

From bc2397c72938f104667dfbfa107dbce49624b7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 8 Nov 2017 15:11:52 +0100
Subject: [PATCH 1223/1304] Documentation: add upgrading doc

---
 Documentation/upgrading.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 Documentation/upgrading.md

diff --git a/Documentation/upgrading.md b/Documentation/upgrading.md
new file mode 100644
index 0000000000..321f65c91f
--- /dev/null
+++ b/Documentation/upgrading.md
@@ -0,0 +1,13 @@
+## Upgrading rkt
+
+Usually, upgrading rkt should work without doing anything special: pods started with the old version will continue running and new pods will be started with the new version.
+However, in some cases special care must be taken.
+
+### When the rkt api-service is running
+
+If the api-service is running and the new version of rkt does a store version upgrade that requires migration, new invocations of rkt will be blocked.
+This is so because the api-service is a long running process that holds a lock on the store, and the store migration needs to take an exclusive lock on it.
+
+For this reason, it is recommended to stop the api-service and start the latest version when upgrading rkt.
+
+This recommendation doesn't apply if the new api-service is listening on a different port and using a different [rkt data directory](commands.md#global-options) via the `--dir` flag.

From ce635a6f44c9a9af659fe355226c8a3a261b6266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 9 Nov 2017 15:29:13 +0100
Subject: [PATCH 1224/1304] Documentation: add api service diagram

Diagram source:

https://docs.google.com/drawings/d/1ELkixZeTMEvxirjUgWN8o68pClcFY5gjubgrN2I_reM
---
 Documentation/subcommands/api-service.md  | 2 ++
 Documentation/subcommands/api-service.svg | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 Documentation/subcommands/api-service.svg

diff --git a/Documentation/subcommands/api-service.md b/Documentation/subcommands/api-service.md
index 71b83c8c41..bc94b33f14 100644
--- a/Documentation/subcommands/api-service.md
+++ b/Documentation/subcommands/api-service.md
@@ -7,6 +7,8 @@ The API service is implemented with [gRPC][grpc].
 The API service is designed to run without root privileges, and currently provides a read-only interface.
 The API service is optional for running pods, the start/stop/crash of the API service won't affect any pods or images.
 
+![api-service](api-service.svg)
+
 ## Running the API service
 
 The API service listens for gRPC requests on the address and port specified by the `--listen` option.
diff --git a/Documentation/subcommands/api-service.svg b/Documentation/subcommands/api-service.svg
new file mode 100644
index 0000000000..58f676dad5
--- /dev/null
+++ b/Documentation/subcommands/api-service.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="yes"?>
+
+<svg version="1.1" viewBox="0.0 0.0 678.8241469816273 353.7244094488189" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="p.0"><path d="m0 0l678.82416 0l0 353.7244l-678.82416 0l0 -353.7244z" clip-rule="nonzero"></path></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l678.82416 0l0 353.7244l-678.82416 0z" fill-rule="evenodd"></path><path fill="#fce5cd" d="m506.74802 64.785l0 0c0 -6.262253 5.0765686 -11.33881 11.338837 -11.33881l110.26727 0c3.0072021 0 5.8912964 1.194622 8.0177 3.3210602c2.1264648 2.1264381 3.321106 5.0105095 3.321106 8.01775l0 45.353874c0 6.262253 -5.076599 11.338814 -11.338806 11.338814l-110.26727 0c-6.262268 0 -11.338837 -5.076561 -11.338837 -11.338814z" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m506.74802 64.785l0 0c0 -6.262253 5.0765686 -11.33881 11.338837 -11.33881l110.26727 0c3.0072021 0 5.8912964 1.194622 8.0177 3.3210602c2.1264648 2.1264381 3.321106 5.0105095 3.321106 8.01775l0 45.353874c0 6.262253 -5.076599 11.338814 -11.338806 11.338814l-110.26727 0c-6.262268 0 -11.338837 -5.076561 -11.338837 -11.338814z" fill-rule="evenodd"></path><path fill="#fce5cd" d="m263.96326 64.785l0 0c0 -6.262253 5.0765686 -11.33881 11.338806 -11.33881l110.26727 0c3.0072327 0 5.8912964 1.194622 8.017731 3.3210602c2.1264343 2.1264381 3.3210754 5.0105095 3.3210754 8.01775l0 45.353874c0 6.262253 -5.0765686 11.338814 -11.338806 11.338814l-110.26727 0c-6.2622375 0 -11.338806 -5.076561 -11.338806 -11.338814z" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m263.96326 64.785l0 0c0 -6.262253 5.0765686 -11.33881 11.338806 -11.33881l110.26727 0c3.0072327 0 5.8912964 1.194622 8.017731 3.3210602c2.1264343 2.1264381 3.3210754 5.0105095 3.3210754 8.01775l0 45.353874c0 6.262253 -5.0765686 11.338814 -11.338806 11.338814l-110.26727 0c-6.2622375 0 -11.338806 -5.076561 -11.338806 -11.338814z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m263.96326 53.44357l132.94489 0l0 68.031494l-132.94489 0z" fill-rule="evenodd"></path><path fill="#000000" d="m306.26825 83.37932l0 -9.859375l1.5 0l0 1.5q0.578125 -1.046875 1.0625 -1.375q0.484375 -0.34375 1.078125 -0.34375q0.84375 0 1.71875 0.546875l-0.578125 1.546875q-0.609375 -0.359375 -1.234375 -0.359375q-0.546875 0 -0.984375 0.328125q-0.421875 0.328125 -0.609375 0.90625q-0.28125 0.890625 -0.28125 1.953125l0 5.15625l-1.671875 0zm6.243927 0l0 -13.59375l1.671875 0l0 7.75l3.953125 -4.015625l2.15625 0l-3.765625 3.65625l4.140625 6.203125l-2.0625 0l-3.25 -5.03125l-1.171875 1.125l0 3.90625l-1.671875 0zm12.96875 -1.5l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125zm13.147858 0.28125q-0.9375 0.796875 -1.796875 1.125q-0.859375 0.3125 -1.84375 0.3125q-1.609375 0 -2.484375 -0.78125q-0.875 -0.796875 -0.875 -2.03125q0 -0.734375 0.328125 -1.328125q0.328125 -0.59375 0.859375 -0.953125q0.53125 -0.359375 1.203125 -0.546875q0.5 -0.140625 1.484375 -0.25q2.03125 -0.25 2.984375 -0.578125q0 -0.34375 0 -0.4375q0 -1.015625 -0.46875 -1.4375q-0.640625 -0.5625 -1.90625 -0.5625q-1.171875 0 -1.734375 0.40625q-0.5625 0.40625 -0.828125 1.46875l-1.640625 -0.234375q0.234375 -1.046875 0.734375 -1.6875q0.515625 -0.640625 1.46875 -0.984375q0.96875 -0.359375 2.25 -0.359375q1.265625 0 2.046875 0.296875q0.78125 0.296875 1.15625 0.75q0.375 0.453125 0.515625 1.140625q0.09375 0.421875 0.09375 1.53125l0 2.234375q0 2.328125 0.09375 2.953125q0.109375 0.609375 0.4375 1.171875l-1.75 0q-0.265625 -0.515625 -0.328125 -1.21875zm-0.140625 -3.71875q-0.90625 0.359375 -2.734375 0.625q-1.03125 0.140625 -1.453125 0.328125q-0.421875 0.1875 -0.65625 0.546875q-0.234375 0.359375 -0.234375 0.796875q0 0.671875 0.5 1.125q0.515625 0.4375 1.484375 0.4375q0.96875 0 1.71875 -0.421875q0.75 -0.4375 1.109375 -1.15625q0.265625 -0.578125 0.265625 -1.671875l0 -0.609375zm4.078827 8.71875l0 -13.640625l1.53125 0l0 1.28125q0.53125 -0.75 1.203125 -1.125q0.6875 -0.375 1.640625 -0.375q1.265625 0 2.234375 0.65625q0.96875 0.640625 1.453125 1.828125q0.5 1.1875 0.5 2.59375q0 1.515625 -0.546875 2.734375q-0.546875 1.203125 -1.578125 1.84375q-1.03125 0.640625 -2.171875 0.640625q-0.84375 0 -1.515625 -0.34375q-0.65625 -0.359375 -1.078125 -0.890625l0 4.796875l-1.671875 0zm1.515625 -8.65625q0 1.90625 0.765625 2.8125q0.78125 0.90625 1.875 0.90625q1.109375 0 1.890625 -0.9375q0.796875 -0.9375 0.796875 -2.921875q0 -1.875 -0.78125 -2.8125q-0.765625 -0.9375 -1.84375 -0.9375q-1.0625 0 -1.890625 1.0q-0.8125 1.0 -0.8125 2.890625zm8.875732 -6.8125l0 -1.90625l1.671875 0l0 1.90625l-1.671875 0zm0 11.6875l0 -9.859375l1.671875 0l0 9.859375l-1.671875 0z" fill-rule="nonzero"></path><path fill="#000000" d="m301.46716 102.44182l1.65625 -0.265625q0.140625 1.0 0.765625 1.53125q0.640625 0.515625 1.78125 0.515625q1.15625 0 1.703125 -0.46875q0.5625 -0.46875 0.5625 -1.09375q0 -0.5625 -0.484375 -0.890625q-0.34375 -0.21875 -1.703125 -0.5625q-1.84375 -0.46875 -2.5625 -0.796875q-0.703125 -0.34375 -1.078125 -0.9375q-0.359375 -0.609375 -0.359375 -1.328125q0 -0.65625 0.296875 -1.21875q0.3125 -0.5625 0.828125 -0.9375q0.390625 -0.28125 1.0625 -0.484375q0.671875 -0.203125 1.4375 -0.203125q1.171875 0 2.046875 0.34375q0.875 0.328125 1.28125 0.90625q0.421875 0.5625 0.578125 1.515625l-1.625 0.21875q-0.109375 -0.75 -0.65625 -1.171875q-0.53125 -0.4375 -1.5 -0.4375q-1.15625 0 -1.640625 0.390625q-0.484375 0.375 -0.484375 0.875q0 0.328125 0.203125 0.59375q0.203125 0.265625 0.640625 0.4375q0.25 0.09375 1.46875 0.4375q1.765625 0.46875 2.46875 0.765625q0.703125 0.296875 1.09375 0.875q0.40625 0.578125 0.40625 1.4375q0 0.828125 -0.484375 1.578125q-0.484375 0.734375 -1.40625 1.140625q-0.921875 0.390625 -2.078125 0.390625q-1.921875 0 -2.9375 -0.796875q-1.0 -0.796875 -1.28125 -2.359375zm16.75 -0.234375l1.71875 0.21875q-0.40625 1.5 -1.515625 2.34375q-1.09375 0.828125 -2.8125 0.828125q-2.15625 0 -3.421875 -1.328125q-1.265625 -1.328125 -1.265625 -3.734375q0 -2.484375 1.265625 -3.859375q1.28125 -1.375 3.328125 -1.375q1.984375 0 3.234375 1.34375q1.25 1.34375 1.25 3.796875q0 0.140625 -0.015625 0.4375l-7.34375 0q0.09375 1.625 0.921875 2.484375q0.828125 0.859375 2.0625 0.859375q0.90625 0 1.546875 -0.46875q0.65625 -0.484375 1.046875 -1.546875zm-5.484375 -2.703125l5.5 0q-0.109375 -1.234375 -0.625 -1.859375q-0.796875 -0.96875 -2.078125 -0.96875q-1.140625 0 -1.9375 0.78125q-0.78125 0.765625 -0.859375 2.046875zm9.094482 5.875l0 -9.859375l1.5 0l0 1.5q0.578125 -1.046875 1.0625 -1.375q0.484375 -0.34375 1.078125 -0.34375q0.84375 0 1.71875 0.546875l-0.578125 1.546875q-0.609375 -0.359375 -1.234375 -0.359375q-0.546875 0 -0.984375 0.328125q-0.421875 0.328125 -0.609375 0.90625q-0.28125 0.890625 -0.28125 1.953125l0 5.15625l-1.671875 0zm8.962677 0l-3.75 -9.859375l1.765625 0l2.125 5.90625q0.34375 0.953125 0.625 1.984375q0.21875 -0.78125 0.625 -1.875l2.1875 -6.015625l1.71875 0l-3.734375 9.859375l-1.5625 0zm6.609375 -11.6875l0 -1.90625l1.671875 0l0 1.90625l-1.671875 0zm0 11.6875l0 -9.859375l1.671875 0l0 9.859375l-1.671875 0zm10.566681 -3.609375l1.640625 0.21875q-0.265625 1.6875 -1.375 2.65625q-1.109375 0.953125 -2.734375 0.953125q-2.015625 0 -3.25 -1.3125q-1.21875 -1.328125 -1.21875 -3.796875q0 -1.59375 0.515625 -2.78125q0.53125 -1.203125 1.609375 -1.796875q1.09375 -0.609375 2.359375 -0.609375q1.609375 0 2.625 0.8125q1.015625 0.8125 1.3125 2.3125l-1.625 0.25q-0.234375 -1.0 -0.828125 -1.5q-0.59375 -0.5 -1.421875 -0.5q-1.265625 0 -2.0625 0.90625q-0.78125 0.90625 -0.78125 2.859375q0 1.984375 0.765625 2.890625q0.765625 0.890625 1.984375 0.890625q0.984375 0 1.640625 -0.59375q0.65625 -0.609375 0.84375 -1.859375zm9.640625 0.4375l1.71875 0.21875q-0.40625 1.5 -1.515625 2.34375q-1.09375 0.828125 -2.8125 0.828125q-2.15625 0 -3.421875 -1.328125q-1.265625 -1.328125 -1.265625 -3.734375q0 -2.484375 1.265625 -3.859375q1.28125 -1.375 3.328125 -1.375q1.984375 0 3.234375 1.34375q1.25 1.34375 1.25 3.796875q0 0.140625 -0.015625 0.4375l-7.34375 0q0.09375 1.625 0.921875 2.484375q0.828125 0.859375 2.0625 0.859375q0.90625 0 1.546875 -0.46875q0.65625 -0.484375 1.046875 -1.546875zm-5.484375 -2.703125l5.5 0q-0.109375 -1.234375 -0.625 -1.859375q-0.796875 -0.96875 -2.078125 -0.96875q-1.140625 0 -1.9375 0.78125q-0.78125 0.765625 -0.859375 2.046875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m506.74802 59.67979l132.94492 0l0 61.795277l-132.94492 0z" fill-rule="evenodd"></path><path fill="#000000" d="m539.06866 94.55992l1.65625 -0.265625q0.140625 1.0 0.765625 1.53125q0.640625 0.515625 1.78125 0.515625q1.15625 0 1.703125 -0.46875q0.5625 -0.46875 0.5625 -1.09375q0 -0.5625 -0.484375 -0.890625q-0.34375 -0.21875 -1.703125 -0.5625q-1.84375 -0.46875 -2.5625 -0.796875q-0.703125 -0.34375 -1.078125 -0.9375q-0.359375 -0.609375 -0.359375 -1.328125q0 -0.65625 0.296875 -1.21875q0.3125 -0.5625 0.828125 -0.9375q0.390625 -0.28125 1.0625 -0.484375q0.671875 -0.203125 1.4375 -0.203125q1.171875 0 2.046875 0.34375q0.875 0.328125 1.28125 0.90625q0.421875 0.5625 0.578125 1.515625l-1.625 0.21875q-0.109375 -0.75 -0.65625 -1.171875q-0.53125 -0.4375 -1.5 -0.4375q-1.15625 0 -1.640625 0.390625q-0.484375 0.375 -0.484375 0.875q0 0.328125 0.203125 0.59375q0.203125 0.265625 0.640625 0.4375q0.25 0.09375 1.46875 0.4375q1.765625 0.46875 2.46875 0.765625q0.703125 0.296875 1.09375 0.875q0.40625 0.578125 0.40625 1.4375q0 0.828125 -0.484375 1.578125q-0.484375 0.734375 -1.40625 1.140625q-0.921875 0.390625 -2.078125 0.390625q-1.921875 0 -2.9375 -0.796875q-1.0 -0.796875 -1.28125 -2.359375zm9.921875 6.734375l-0.171875 -1.5625q0.546875 0.140625 0.953125 0.140625q0.546875 0 0.875 -0.1875q0.34375 -0.1875 0.5625 -0.515625q0.15625 -0.25 0.5 -1.25q0.046875 -0.140625 0.15625 -0.40625l-3.734375 -9.875l1.796875 0l2.046875 5.71875q0.40625 1.078125 0.71875 2.28125q0.28125 -1.15625 0.6875 -2.25l2.09375 -5.75l1.671875 0l-3.75 10.03125q-0.59375 1.625 -0.9375 2.234375q-0.4375 0.828125 -1.015625 1.203125q-0.578125 0.390625 -1.375 0.390625q-0.484375 0 -1.078125 -0.203125zm8.734375 -6.734375l1.65625 -0.265625q0.140625 1.0 0.765625 1.53125q0.640625 0.515625 1.78125 0.515625q1.15625 0 1.703125 -0.46875q0.5625 -0.46875 0.5625 -1.09375q0 -0.5625 -0.484375 -0.890625q-0.34375 -0.21875 -1.703125 -0.5625q-1.84375 -0.46875 -2.5625 -0.796875q-0.703125 -0.34375 -1.078125 -0.9375q-0.359375 -0.609375 -0.359375 -1.328125q0 -0.65625 0.296875 -1.21875q0.3125 -0.5625 0.828125 -0.9375q0.390625 -0.28125 1.0625 -0.484375q0.671875 -0.203125 1.4375 -0.203125q1.171875 0 2.046875 0.34375q0.875 0.328125 1.28125 0.90625q0.421875 0.5625 0.578125 1.515625l-1.625 0.21875q-0.109375 -0.75 -0.65625 -1.171875q-0.53125 -0.4375 -1.5 -0.4375q-1.15625 0 -1.640625 0.390625q-0.484375 0.375 -0.484375 0.875q0 0.328125 0.203125 0.59375q0.203125 0.265625 0.640625 0.4375q0.25 0.09375 1.46875 0.4375q1.765625 0.46875 2.46875 0.765625q0.703125 0.296875 1.09375 0.875q0.40625 0.578125 0.40625 1.4375q0 0.828125 -0.484375 1.578125q-0.484375 0.734375 -1.40625 1.140625q-0.921875 0.390625 -2.078125 0.390625q-1.921875 0 -2.9375 -0.796875q-1.0 -0.796875 -1.28125 -2.359375zm13.65625 1.4375l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125zm8.277039 -1.671875l1.71875 0.21875q-0.40625 1.5 -1.515625 2.34375q-1.09375 0.828125 -2.8125 0.828125q-2.15625 0 -3.421875 -1.328125q-1.265625 -1.328125 -1.265625 -3.734375q0 -2.484375 1.265625 -3.859375q1.28125 -1.375 3.328125 -1.375q1.984375 0 3.234375 1.34375q1.25 1.34375 1.25 3.796875q0 0.140625 -0.015625 0.4375l-7.34375 0q0.09375 1.625 0.921875 2.484375q0.828125 0.859375 2.0625 0.859375q0.90625 0 1.546875 -0.46875q0.65625 -0.484375 1.046875 -1.546875zm-5.484375 -2.703125l5.5 0q-0.109375 -1.234375 -0.625 -1.859375q-0.796875 -0.96875 -2.078125 -0.96875q-1.140625 0 -1.9375 0.78125q-0.78125 0.765625 -0.859375 2.046875zm9.110107 5.875l0 -9.859375l1.5 0l0 1.390625q0.453125 -0.71875 1.21875 -1.15625q0.78125 -0.453125 1.765625 -0.453125q1.09375 0 1.796875 0.453125q0.703125 0.453125 0.984375 1.28125q1.171875 -1.734375 3.046875 -1.734375q1.46875 0 2.25 0.8125q0.796875 0.8125 0.796875 2.5l0 6.765625l-1.671875 0l0 -6.203125q0 -1.0 -0.15625 -1.4375q-0.15625 -0.453125 -0.59375 -0.71875q-0.421875 -0.265625 -1.0 -0.265625q-1.03125 0 -1.71875 0.6875q-0.6875 0.6875 -0.6875 2.21875l0 5.71875l-1.671875 0l0 -6.40625q0 -1.109375 -0.40625 -1.65625q-0.40625 -0.5625 -1.34375 -0.5625q-0.703125 0 -1.3125 0.375q-0.59375 0.359375 -0.859375 1.078125q-0.265625 0.71875 -0.265625 2.0625l0 5.109375l-1.671875 0zm21.931396 0l0 -1.25q-0.9375 1.46875 -2.75 1.46875q-1.171875 0 -2.171875 -0.640625q-0.984375 -0.65625 -1.53125 -1.8125q-0.53125 -1.171875 -0.53125 -2.6875q0 -1.46875 0.484375 -2.671875q0.5 -1.203125 1.46875 -1.84375q0.984375 -0.640625 2.203125 -0.640625q0.890625 0 1.578125 0.375q0.703125 0.375 1.140625 0.984375l0 -4.875l1.65625 0l0 13.59375l-1.546875 0zm-5.28125 -4.921875q0 1.890625 0.796875 2.828125q0.8125 0.9375 1.890625 0.9375q1.09375 0 1.859375 -0.890625q0.765625 -0.890625 0.765625 -2.734375q0 -2.015625 -0.78125 -2.953125q-0.78125 -0.953125 -1.921875 -0.953125q-1.109375 0 -1.859375 0.90625q-0.75 0.90625 -0.75 2.859375z" fill-rule="nonzero"></path><path fill="#f1606e" d="m506.74802 230.28632l0 0c0 -6.262253 5.0765686 -11.338806 11.338837 -11.338806l110.26727 0c3.0072021 0 5.8912964 1.1946106 8.0177 3.3210602c2.1264648 2.1264343 3.321106 5.0105133 3.321106 8.017746l0 45.35388c0 6.2622375 -5.076599 11.338806 -11.338806 11.338806l-110.26727 0c-6.262268 0 -11.338837 -5.0765686 -11.338837 -11.338806z" fill-rule="evenodd"></path><path stroke="#54a3d9" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m506.74802 230.28632l0 0c0 -6.262253 5.0765686 -11.338806 11.338837 -11.338806l110.26727 0c3.0072021 0 5.8912964 1.1946106 8.0177 3.3210602c2.1264648 2.1264343 3.321106 5.0105133 3.321106 8.017746l0 45.35388c0 6.2622375 -5.076599 11.338806 -11.338806 11.338806l-110.26727 0c-6.262268 0 -11.338837 -5.0765686 -11.338837 -11.338806z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m506.74802 220.42783l132.94492 0l0 66.55118l-132.94492 0z" fill-rule="evenodd"></path><path fill="#000000" d="m564.0928 260.6234l0 -9.859375l1.5 0l0 1.5q0.578125 -1.046875 1.0625 -1.375q0.484375 -0.34375 1.078125 -0.34375q0.84375 0 1.71875 0.546875l-0.578125 1.546875q-0.609375 -0.359375 -1.234375 -0.359375q-0.546875 0 -0.984375 0.328125q-0.421875 0.328125 -0.609375 0.90625q-0.28125 0.890625 -0.28125 1.953125l0 5.15625l-1.671875 0zm6.2439575 0l0 -13.59375l1.671875 0l0 7.75l3.953125 -4.015625l2.15625 0l-3.765625 3.65625l4.140625 6.203125l-2.0625 0l-3.25 -5.03125l-1.171875 1.125l0 3.90625l-1.671875 0zm12.96875 -1.5l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125z" fill-rule="nonzero"></path><path fill="#f1606e" d="m519.65356 244.1997l0 0c0 -6.262253 5.076538 -11.338821 11.338806 -11.338821l110.26727 0c3.0072021 0 5.8912964 1.1946259 8.0177 3.3210602c2.1264648 2.1264496 3.321106 5.0105133 3.321106 8.017761l0 45.35388c0 6.2622375 -5.076599 11.338806 -11.338806 11.338806l-110.26727 0c-6.262268 0 -11.338806 -5.0765686 -11.338806 -11.338806z" fill-rule="evenodd"></path><path stroke="#54a3d9" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m519.65356 244.1997l0 0c0 -6.262253 5.076538 -11.338821 11.338806 -11.338821l110.26727 0c3.0072021 0 5.8912964 1.1946259 8.0177 3.3210602c2.1264648 2.1264496 3.321106 5.0105133 3.321106 8.017761l0 45.35388c0 6.2622375 -5.076599 11.338806 -11.338806 11.338806l-110.26727 0c-6.262268 0 -11.338806 -5.0765686 -11.338806 -11.338806z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m519.65356 234.3307l132.94489 0l0 66.55119l-132.94489 0z" fill-rule="evenodd"></path><path fill="#000000" d="m576.9983 274.5263l0 -9.859375l1.5 0l0 1.5q0.578125 -1.046875 1.0625 -1.375q0.484375 -0.34375 1.078125 -0.34375q0.84375 0 1.71875 0.546875l-0.578125 1.546875q-0.609375 -0.359375 -1.234375 -0.359375q-0.546875 0 -0.984375 0.328125q-0.421875 0.328125 -0.609375 0.90625q-0.28125 0.890625 -0.28125 1.953125l0 5.15625l-1.671875 0zm6.2439575 0l0 -13.59375l1.671875 0l0 7.75l3.953125 -4.015625l2.15625 0l-3.765625 3.65625l4.140625 6.203125l-2.0625 0l-3.25 -5.03125l-1.171875 1.125l0 3.90625l-1.671875 0zm12.96875 -1.5l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125z" fill-rule="nonzero"></path><path fill="#f1606e" d="m531.01575 258.07898l0 0c0 -6.262268 5.076538 -11.338821 11.338806 -11.338821l110.26727 0c3.0072632 0 5.8912964 1.1946259 8.017761 3.3210602c2.1264038 2.1264343 3.321045 5.0105133 3.321045 8.017761l0 45.35385c0 6.262268 -5.076538 11.338837 -11.338806 11.338837l-110.26727 0c-6.262268 0 -11.338806 -5.0765686 -11.338806 -11.338837z" fill-rule="evenodd"></path><path stroke="#54a3d9" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m531.01575 258.07898l0 0c0 -6.262268 5.076538 -11.338821 11.338806 -11.338821l110.26727 0c3.0072632 0 5.8912964 1.1946259 8.017761 3.3210602c2.1264038 2.1264343 3.321045 5.0105133 3.321045 8.017761l0 45.35385c0 6.262268 -5.076538 11.338837 -11.338806 11.338837l-110.26727 0c-6.262268 0 -11.338806 -5.0765686 -11.338806 -11.338837z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m531.01575 246.74278l132.94489 0l0 68.03151l-132.94489 0z" fill-rule="evenodd"></path><path fill="#ffffff" d="m588.36053 287.67853l0 -9.859375l1.5 0l0 1.5q0.578125 -1.046875 1.0625 -1.375q0.484375 -0.34375 1.078125 -0.34375q0.84375 0 1.71875 0.546875l-0.578125 1.546875q-0.609375 -0.359375 -1.234375 -0.359375q-0.546875 0 -0.984375 0.328125q-0.421875 0.328125 -0.609375 0.90625q-0.28125 0.890625 -0.28125 1.953125l0 5.15625l-1.671875 0zm6.2438965 0l0 -13.59375l1.671875 0l0 7.75l3.953125 -4.015625l2.15625 0l-3.765625 3.65625l4.140625 6.203125l-2.0625 0l-3.25 -5.03125l-1.171875 1.125l0 3.90625l-1.671875 0zm12.96875 -1.5l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m573.22046 121.47507l0 98.96063" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m573.22046 121.47507l0 92.96063" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m571.5687 214.4357l1.6517334 4.538101l1.6517334 -4.538101z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m573.2126 122.96063l12.913391 111.37007" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m573.2126 122.96063l12.222351 105.41" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m583.7942 228.56088l2.163391 4.3176575l1.118042 -4.6981506z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m573.22046 121.47507l24.283508 125.25984" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m573.22046 121.47507l23.14154 119.36951" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m594.7405 241.15894l2.4852295 4.140793l0.75787354 -4.769516z" fill-rule="evenodd"></path><path fill="#fce5cd" d="m225.31758 204.2664c0 8.964844 47.062973 16.232285 105.11812 16.232285c58.055115 0 105.1181 -7.267441 105.1181 -16.232285l0 97.39369c0 8.964844 -47.06299 16.2323 -105.1181 16.2323c-58.055145 0 -105.11812 -7.267456 -105.11812 -16.2323z" fill-rule="evenodd"></path><path fill="#fdefe1" d="m225.31758 204.2664c0 -8.964844 47.062973 -16.232285 105.11812 -16.232285c58.055115 0 105.1181 7.267441 105.1181 16.232285l0 0c0 8.964844 -47.06299 16.232285 -105.1181 16.232285c-58.055145 0 -105.11812 -7.267441 -105.11812 -16.232285z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m435.5538 204.2664l0 0c0 8.964844 -47.06299 16.232285 -105.1181 16.232285c-58.055145 0 -105.11812 -7.267441 -105.11812 -16.232285c0 -8.964844 47.062973 -16.232285 105.11812 -16.232285c58.055115 0 105.1181 7.267441 105.1181 16.232285l0 97.39369c0 8.964844 -47.06299 16.2323 -105.1181 16.2323c-58.055145 0 -105.11812 -7.267456 -105.11812 -16.2323l0 -97.39369" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m435.5538 204.2664l0 0c0 8.964844 -47.06299 16.232285 -105.1181 16.232285c-58.055145 0 -105.11812 -7.267441 -105.11812 -16.232285c0 -8.964844 47.062973 -16.232285 105.11812 -16.232285c58.055115 0 105.1181 7.267441 105.1181 16.232285l0 97.39369c0 8.964844 -47.06299 16.2323 -105.1181 16.2323c-58.055145 0 -105.11812 -7.267456 -105.11812 -16.2323l0 -97.39369" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m226.86351 218.94751l208.69292 0l0 97.480316l-208.69292 0z" fill-rule="evenodd"></path><path fill="#000000" d="m290.782 274.84204l3.9375 -14.0625l1.34375 0l-3.9375 14.0625l-1.34375 0zm9.167694 -0.234375l-3.75 -9.859375l1.765625 0l2.125 5.90625q0.34375 0.953125 0.625 1.984375q0.21875 -0.78125 0.625 -1.875l2.1875 -6.015625l1.71875 0l-3.734375 9.859375l-1.5625 0zm13.03125 -1.21875q-0.9375 0.796875 -1.796875 1.125q-0.859375 0.3125 -1.84375 0.3125q-1.609375 0 -2.484375 -0.78125q-0.875 -0.796875 -0.875 -2.03125q0 -0.734375 0.328125 -1.328125q0.328125 -0.59375 0.859375 -0.953125q0.53125 -0.359375 1.203125 -0.546875q0.5 -0.140625 1.484375 -0.25q2.03125 -0.25 2.984375 -0.578125q0 -0.34375 0 -0.4375q0 -1.015625 -0.46875 -1.4375q-0.640625 -0.5625 -1.90625 -0.5625q-1.171875 0 -1.734375 0.40625q-0.5625 0.40625 -0.828125 1.46875l-1.640625 -0.234375q0.234375 -1.046875 0.734375 -1.6875q0.515625 -0.640625 1.46875 -0.984375q0.96875 -0.359375 2.25 -0.359375q1.265625 0 2.046875 0.296875q0.78125 0.296875 1.15625 0.75q0.375 0.453125 0.515625 1.140625q0.09375 0.421875 0.09375 1.53125l0 2.234375q0 2.328125 0.09375 2.953125q0.109375 0.609375 0.4375 1.171875l-1.75 0q-0.265625 -0.515625 -0.328125 -1.21875zm-0.140625 -3.71875q-0.90625 0.359375 -2.734375 0.625q-1.03125 0.140625 -1.453125 0.328125q-0.421875 0.1875 -0.65625 0.546875q-0.234375 0.359375 -0.234375 0.796875q0 0.671875 0.5 1.125q0.515625 0.4375 1.484375 0.4375q0.96875 0 1.71875 -0.421875q0.75 -0.4375 1.109375 -1.15625q0.265625 -0.578125 0.265625 -1.671875l0 -0.609375zm4.063202 4.9375l0 -9.859375l1.5 0l0 1.5q0.578125 -1.046875 1.0625 -1.375q0.484375 -0.34375 1.078125 -0.34375q0.84375 0 1.71875 0.546875l-0.578125 1.546875q-0.609375 -0.359375 -1.234375 -0.359375q-0.546875 0 -0.984375 0.328125q-0.421875 0.328125 -0.609375 0.90625q-0.28125 0.890625 -0.28125 1.953125l0 5.15625l-1.671875 0zm4.978302 0.234375l3.9375 -14.0625l1.34375 0l-3.9375 14.0625l-1.34375 0zm6.402069 -0.234375l0 -13.59375l1.671875 0l0 13.59375l-1.671875 0zm4.191681 -11.6875l0 -1.90625l1.671875 0l0 1.90625l-1.671875 0zm0 11.6875l0 -9.859375l1.671875 0l0 9.859375l-1.671875 0zm5.6760864 0l-1.546875 0l0 -13.59375l1.65625 0l0 4.84375q1.0625 -1.328125 2.703125 -1.328125q0.90625 0 1.71875 0.375q0.8125 0.359375 1.328125 1.03125q0.53125 0.65625 0.828125 1.59375q0.296875 0.9375 0.296875 2.0q0 2.53125 -1.25 3.921875q-1.25 1.375 -3.0 1.375q-1.75 0 -2.734375 -1.453125l0 1.234375zm-0.015625 -5.0q0 1.765625 0.46875 2.5625q0.796875 1.28125 2.140625 1.28125q1.09375 0 1.890625 -0.9375q0.796875 -0.953125 0.796875 -2.84375q0 -1.921875 -0.765625 -2.84375q-0.765625 -0.921875 -1.84375 -0.921875q-1.09375 0 -1.890625 0.953125q-0.796875 0.953125 -0.796875 2.75zm7.594452 5.234375l3.9375 -14.0625l1.34375 0l-3.9375 14.0625l-1.34375 0zm6.417694 -0.234375l0 -9.859375l1.5 0l0 1.5q0.578125 -1.046875 1.0625 -1.375q0.484375 -0.34375 1.078125 -0.34375q0.84375 0 1.71875 0.546875l-0.578125 1.546875q-0.609375 -0.359375 -1.234375 -0.359375q-0.546875 0 -0.984375 0.328125q-0.421875 0.328125 -0.609375 0.90625q-0.28125 0.890625 -0.28125 1.953125l0 5.15625l-1.671875 0zm6.243927 0l0 -13.59375l1.671875 0l0 7.75l3.953125 -4.015625l2.15625 0l-3.765625 3.65625l4.140625 6.203125l-2.0625 0l-3.25 -5.03125l-1.171875 1.125l0 3.90625l-1.671875 0zm12.96875 -1.5l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m330.4357 121.47507l0 66.55118" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m330.4357 121.47507l0 60.551178" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m328.78397 182.02625l1.6517334 4.538101l1.6517334 -4.538101z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m345.89764 135.38583l61.82675 0l0 38.740158l-61.82675 0z" fill-rule="evenodd"></path><path fill="#000000" d="m355.7414 157.18582l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0zm9.0633545 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm10.943726 3.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm7.4906006 3.390625l0 -0.84375q-0.640625 1.0 -1.890625 1.0q-0.796875 0 -1.484375 -0.4375q-0.671875 -0.453125 -1.046875 -1.25q-0.375 -0.796875 -0.375 -1.828125q0 -1.015625 0.34375 -1.828125q0.34375 -0.828125 1.015625 -1.265625q0.671875 -0.4375 1.5 -0.4375q0.609375 0 1.078125 0.265625q0.484375 0.25 0.78125 0.65625l0 -3.34375l1.140625 0l0 9.3125l-1.0625 0zm-3.609375 -3.359375q0 1.296875 0.53125 1.9375q0.546875 0.640625 1.296875 0.640625q0.75 0 1.265625 -0.609375q0.53125 -0.625 0.53125 -1.875q0 -1.390625 -0.53125 -2.03125q-0.53125 -0.65625 -1.3125 -0.65625q-0.765625 0 -1.28125 0.625q-0.5 0.625 -0.5 1.96875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m506.74802 253.70341l-71.18109 13.984238" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m506.74802 253.70341l-67.81827 13.323593" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m438.92975 267.027l0.88668823 -1.320282l-2.815033 1.6991272l3.2485962 0.507843z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m519.65094 280.0971l-84.09451 -12.409454" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m519.65094 280.0971l-80.70413 -11.909149" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m438.9468 268.18796l1.2767029 -0.94836426l-3.2208252 0.661499l2.8924866 1.5635681z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m518.1391 265.23096l-82.58267 2.4566956" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m518.1391 265.23096l-79.157104 2.3547974" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m438.982 267.58575l1.0906677 -1.1575317l-3.0549622 1.2159729l3.1218262 1.032196z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m435.567 274.56955l89.76376 0l0 34.015747l-89.76376 0z" fill-rule="evenodd"></path><path fill="#000000" d="m444.97324 294.35394l1.125 -0.171875q0.09375 0.671875 0.53125 1.046875q0.4375 0.359375 1.21875 0.359375q0.78125 0 1.15625 -0.3125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.34375 -0.609375q-0.234375 -0.15625 -1.171875 -0.390625q-1.25 -0.3125 -1.734375 -0.546875q-0.484375 -0.234375 -0.734375 -0.640625q-0.25 -0.40625 -0.25 -0.90625q0 -0.453125 0.203125 -0.828125q0.203125 -0.390625 0.5625 -0.640625q0.265625 -0.203125 0.71875 -0.328125q0.46875 -0.140625 1.0 -0.140625q0.78125 0 1.375 0.234375q0.609375 0.21875 0.890625 0.609375q0.296875 0.390625 0.40625 1.046875l-1.125 0.15625q-0.078125 -0.53125 -0.4375 -0.8125q-0.359375 -0.296875 -1.03125 -0.296875q-0.78125 0 -1.125 0.265625q-0.34375 0.25 -0.34375 0.609375q0 0.21875 0.140625 0.390625q0.140625 0.1875 0.4375 0.3125q0.171875 0.0625 1.015625 0.28125q1.21875 0.328125 1.6875 0.53125q0.484375 0.203125 0.75 0.609375q0.28125 0.390625 0.28125 0.96875q0 0.578125 -0.34375 1.078125q-0.328125 0.5 -0.953125 0.78125q-0.625 0.28125 -1.421875 0.28125q-1.3125 0 -2.0 -0.546875q-0.6875 -0.546875 -0.875 -1.625zm11.5078125 1.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm4.9906006 3.390625l-2.5625 -6.734375l1.203125 0l1.4375 4.03125q0.234375 0.65625 0.4375 1.359375q0.15625 -0.53125 0.421875 -1.28125l1.5 -4.109375l1.171875 0l-2.546875 6.734375l-1.0625 0zm9.3984375 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm9.802948 2.0l1.125 -0.171875q0.09375 0.671875 0.53125 1.046875q0.4375 0.359375 1.21875 0.359375q0.78125 0 1.15625 -0.3125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.34375 -0.609375q-0.234375 -0.15625 -1.171875 -0.390625q-1.25 -0.3125 -1.734375 -0.546875q-0.484375 -0.234375 -0.734375 -0.640625q-0.25 -0.40625 -0.25 -0.90625q0 -0.453125 0.203125 -0.828125q0.203125 -0.390625 0.5625 -0.640625q0.265625 -0.203125 0.71875 -0.328125q0.46875 -0.140625 1.0 -0.140625q0.78125 0 1.375 0.234375q0.609375 0.21875 0.890625 0.609375q0.296875 0.390625 0.40625 1.046875l-1.125 0.15625q-0.078125 -0.53125 -0.4375 -0.8125q-0.359375 -0.296875 -1.03125 -0.296875q-0.78125 0 -1.125 0.265625q-0.34375 0.25 -0.34375 0.609375q0 0.21875 0.140625 0.390625q0.140625 0.1875 0.4375 0.3125q0.171875 0.0625 1.015625 0.28125q1.21875 0.328125 1.6875 0.53125q0.484375 0.203125 0.75 0.609375q0.28125 0.390625 0.28125 0.96875q0 0.578125 -0.34375 1.078125q-0.328125 0.5 -0.953125 0.78125q-0.625 0.28125 -1.421875 0.28125q-1.3125 0 -2.0 -0.546875q-0.6875 -0.546875 -0.875 -1.625zm9.6171875 1.0l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.593628 0.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm5.6156006 2.375l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.8123474 -1.15625l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625z" fill-rule="nonzero"></path><path fill="#fce5cd" d="m32.737534 28.774279l0 0c0 -9.39319 8.651127 -17.007874 19.322834 -17.007874l0 0c10.671707 0 19.322834 7.614684 19.322834 17.007874l0 0c0 9.39319 -8.651127 17.007875 -19.322834 17.007875l0 0c-10.671707 0 -19.322834 -7.614685 -19.322834 -17.007875z" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m32.737534 28.774279l0 0c0 -9.39319 8.651127 -17.007874 19.322834 -17.007874l0 0c10.671707 0 19.322834 7.614684 19.322834 17.007874l0 0c0 9.39319 -8.651127 17.007875 -19.322834 17.007875l0 0c-10.671707 0 -19.322834 -7.614685 -19.322834 -17.007875z" fill-rule="evenodd"></path><path fill="#fce5cd" d="m16.469816 128.67455l17.795275 -77.6378l35.590553 0l17.795273 77.6378z" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m16.469816 128.67455l17.795275 -77.6378l35.590553 0l17.795273 77.6378z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m78.75328 89.855644l185.19685 -2.3936996" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m78.75328 89.855644l179.19734 -2.316162" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m257.972 89.19108l4.5163574 -1.7102432l-4.5590515 -1.5929413z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m112.438324 52.362206l109.354324 0l0 26.29921l-109.354324 0z" fill-rule="evenodd"></path><path fill="#000000" d="m122.07895 74.7247l1.125 0.15625q0.0625 0.515625 0.375 0.75q0.4375 0.328125 1.171875 0.328125q0.78125 0 1.21875 -0.328125q0.4375 -0.3125 0.578125 -0.890625q0.09375 -0.34375 0.09375 -1.453125q-0.75 0.875 -1.875 0.875q-1.390625 0 -2.15625 -1.0q-0.75 -1.0 -0.75 -2.40625q0 -0.96875 0.34375 -1.78125q0.359375 -0.8125 1.015625 -1.25q0.65625 -0.453125 1.5625 -0.453125q1.1875 0 1.96875 0.96875l0 -0.8125l1.046875 0l0 5.8125q0 1.578125 -0.328125 2.234375q-0.3125 0.65625 -1.015625 1.03125q-0.6875 0.390625 -1.703125 0.390625q-1.203125 0 -1.953125 -0.546875q-0.734375 -0.53125 -0.71875 -1.625zm0.953125 -4.046875q0 1.3125 0.515625 1.921875q0.53125 0.609375 1.328125 0.609375q0.796875 0 1.328125 -0.59375q0.53125 -0.609375 0.53125 -1.90625q0 -1.234375 -0.546875 -1.859375q-0.546875 -0.640625 -1.328125 -0.640625q-0.765625 0 -1.296875 0.625q-0.53125 0.625 -0.53125 1.84375zm6.6624756 3.484375l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0zm4.4539948 2.578125l0 -9.3125l1.03125 0l0 0.875q0.375 -0.515625 0.828125 -0.765625q0.46875 -0.265625 1.140625 -0.265625q0.859375 0 1.515625 0.453125q0.65625 0.4375 0.984375 1.25q0.34375 0.796875 0.34375 1.765625q0 1.03125 -0.375 1.859375q-0.359375 0.828125 -1.078125 1.28125q-0.703125 0.4375 -1.484375 0.4375q-0.5625 0 -1.015625 -0.234375q-0.453125 -0.25 -0.75 -0.625l0 3.28125l-1.140625 0zm1.03125 -5.90625q0 1.296875 0.53125 1.921875q0.53125 0.625 1.265625 0.625q0.765625 0 1.3125 -0.640625q0.546875 -0.65625 0.546875 -2.0q0 -1.296875 -0.53125 -1.9375q-0.53125 -0.640625 -1.265625 -0.640625q-0.734375 0 -1.296875 0.6875q-0.5625 0.671875 -0.5625 1.984375zm10.771851 0.859375l1.125 0.140625q-0.171875 1.171875 -0.9375 1.828125q-0.765625 0.65625 -1.859375 0.65625q-1.390625 0 -2.234375 -0.90625q-0.828125 -0.90625 -0.828125 -2.59375q0 -1.09375 0.359375 -1.90625q0.359375 -0.828125 1.09375 -1.234375q0.734375 -0.40625 1.609375 -0.40625q1.09375 0 1.796875 0.5625q0.703125 0.546875 0.890625 1.5625l-1.109375 0.171875q-0.15625 -0.671875 -0.5625 -1.015625q-0.390625 -0.34375 -0.96875 -0.34375q-0.859375 0 -1.40625 0.625q-0.53125 0.609375 -0.53125 1.953125q0 1.359375 0.515625 1.984375q0.515625 0.609375 1.359375 0.609375q0.671875 0 1.125 -0.40625q0.453125 -0.421875 0.5625 -1.28125zm5.9608 2.46875l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0zm9.06337 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm10.849976 6.59375l0 -3.296875q-0.265625 0.375 -0.75 0.625q-0.484375 0.25 -1.015625 0.25q-1.203125 0 -2.078125 -0.953125q-0.859375 -0.96875 -0.859375 -2.640625q0 -1.015625 0.34375 -1.8125q0.359375 -0.8125 1.03125 -1.21875q0.671875 -0.421875 1.46875 -0.421875q1.25 0 1.96875 1.046875l0 -0.890625l1.03125 0l0 9.3125l-1.140625 0zm-3.53125 -5.96875q0 1.296875 0.546875 1.953125q0.546875 0.65625 1.3125 0.65625q0.734375 0 1.25 -0.625q0.53125 -0.625 0.53125 -1.875q0 -1.359375 -0.5625 -2.03125q-0.546875 -0.6875 -1.296875 -0.6875q-0.734375 0 -1.265625 0.640625q-0.515625 0.625 -0.515625 1.96875zm11.068726 3.390625l0 -0.984375q-0.796875 1.140625 -2.140625 1.140625q-0.59375 0 -1.125 -0.234375q-0.515625 -0.234375 -0.765625 -0.578125q-0.25 -0.34375 -0.34375 -0.84375q-0.078125 -0.328125 -0.078125 -1.0625l0 -4.171875l1.140625 0l0 3.734375q0 0.890625 0.078125 1.203125q0.109375 0.453125 0.453125 0.71875q0.34375 0.25 0.859375 0.25q0.515625 0 0.96875 -0.265625q0.453125 -0.265625 0.640625 -0.71875q0.1875 -0.453125 0.1875 -1.3125l0 -3.609375l1.140625 0l0 6.734375l-1.015625 0zm7.5999756 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.0999756 2.0l1.125 -0.171875q0.09375 0.671875 0.53125 1.046875q0.4375 0.359375 1.21875 0.359375q0.78125 0 1.15625 -0.3125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.34375 -0.609375q-0.234375 -0.15625 -1.171875 -0.390625q-1.25 -0.3125 -1.734375 -0.546875q-0.484375 -0.234375 -0.734375 -0.640625q-0.25 -0.40625 -0.25 -0.90625q0 -0.453125 0.203125 -0.828125q0.203125 -0.390625 0.5625 -0.640625q0.265625 -0.203125 0.71875 -0.328125q0.46875 -0.140625 1.0 -0.140625q0.78125 0 1.375 0.234375q0.609375 0.21875 0.890625 0.609375q0.296875 0.390625 0.40625 1.046875l-1.125 0.15625q-0.078125 -0.53125 -0.4375 -0.8125q-0.359375 -0.296875 -1.03125 -0.296875q-0.78125 0 -1.125 0.265625q-0.34375 0.25 -0.34375 0.609375q0 0.21875 0.140625 0.390625q0.140625 0.1875 0.4375 0.3125q0.171875 0.0625 1.015625 0.28125q1.21875 0.328125 1.6875 0.53125q0.484375 0.203125 0.75 0.609375q0.28125 0.390625 0.28125 0.96875q0 0.578125 -0.34375 1.078125q-0.328125 0.5 -0.953125 0.78125q-0.625 0.28125 -1.421875 0.28125q-1.3125 0 -2.0 -0.546875q-0.6875 -0.546875 -0.875 -1.625zm9.6171875 1.0l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m592.0551 170.19948l434.42523 0l0 50.67717l-434.42523 0z" fill-rule="evenodd"></path><path fill="#000000" d="m601.46136 189.98386l1.125 -0.171875q0.09375 0.671875 0.53125 1.046875q0.4375 0.359375 1.21875 0.359375q0.78125 0 1.15625 -0.3125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.34375 -0.609375q-0.234375 -0.15625 -1.171875 -0.390625q-1.25 -0.3125 -1.734375 -0.546875q-0.484375 -0.234375 -0.734375 -0.640625q-0.25 -0.40625 -0.25 -0.90625q0 -0.453125 0.203125 -0.828125q0.203125 -0.390625 0.5625 -0.640625q0.265625 -0.203125 0.71875 -0.328125q0.46875 -0.140625 1.0 -0.140625q0.78125 0 1.375 0.234375q0.609375 0.21875 0.890625 0.609375q0.296875 0.390625 0.40625 1.046875l-1.125 0.15625q-0.078125 -0.53125 -0.4375 -0.8125q-0.359375 -0.296875 -1.03125 -0.296875q-0.78125 0 -1.125 0.265625q-0.34375 0.25 -0.34375 0.609375q0 0.21875 0.140625 0.390625q0.140625 0.1875 0.4375 0.3125q0.171875 0.0625 1.015625 0.28125q1.21875 0.328125 1.6875 0.53125q0.484375 0.203125 0.75 0.609375q0.28125 0.390625 0.28125 0.96875q0 0.578125 -0.34375 1.078125q-0.328125 0.5 -0.953125 0.78125q-0.625 0.28125 -1.421875 0.28125q-1.3125 0 -2.0 -0.546875q-0.6875 -0.546875 -0.875 -1.625zm9.6171875 1.0l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.593628 0.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm3.0999756 3.390625l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0zm6.9539795 -1.015625l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125z" fill-rule="nonzero"></path></g></svg>
+

From a6f48a87047ceeba2a346cbcb5f01cfc0937a551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 9 Nov 2017 18:15:19 +0100
Subject: [PATCH 1225/1304] Documentation: add rkt process model diagrams

And some extra explanations.

Diagram sources:

https://docs.google.com/drawings/d/19q-b3yyY5eMkRxjScF3aI5-2VNcktzA2fjKQ8JxyoP8
https://docs.google.com/drawings/d/1Wp0isAOZYPVLhohMmOR4ed_3WIvssDLs3K1GgHM2hSw
---
 Documentation/devel/architecture.md                 | 13 +++++++++++++
 .../devel/rkt-process-model-with-systemd.svg        |  4 ++++
 Documentation/devel/rkt-process-model.svg           |  4 ++++
 Documentation/rkt-vs-other-projects.md              |  3 +++
 4 files changed, 24 insertions(+)
 create mode 100644 Documentation/devel/rkt-process-model-with-systemd.svg
 create mode 100644 Documentation/devel/rkt-process-model.svg

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index eecca03de7..0bef0bb04f 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -200,6 +200,19 @@ $ ps auxf
             \_ nginx
 ```
 
+#### External resource limits
+
+Depending on how rkt is executed, certain external resource limits will be applied or not.
+
+If rkt is executed within a systemd service, the container will inherit the cgroup resource limits applied to the service itself and any ulimit-like limits.
+
+![rkt-process-model-with-systemd](rkt-process-model-with-systemd.svg)
+
+If rkt is executed, say, from a terminal, the container will inherit ulimit-like limits, but not cgroup resource limits.
+The reason for this is that systemd will move the container to a new `machine` slice.
+
+![rkt-process-model](rkt-process-model.svg)
+
 ### fly flavor
 
 The "fly" flavor uses a very simple mechanism being limited to only execute one child app process. The entrypoint is implemented in `stage1_fly/run/main.go`. After setting up a chroot'ed environment it simply exec's the target app without any further internal supervision:
diff --git a/Documentation/devel/rkt-process-model-with-systemd.svg b/Documentation/devel/rkt-process-model-with-systemd.svg
new file mode 100644
index 0000000000..f1c63f1dc3
--- /dev/null
+++ b/Documentation/devel/rkt-process-model-with-systemd.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="yes"?>
+
+<svg version="1.1" viewBox="0.0 0.0 980.8503937007874 476.1706036745407" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="p.0"><path d="m0 0l980.8504 0l0 476.1706l-980.8504 0l0 -476.1706z" clip-rule="nonzero"></path></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l980.8504 0l0 476.1706l-980.8504 0z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m55.572178 89.47128l0 0c0 -40.577072 32.894215 -73.47129 73.47128 -73.47129l731.7346 0c19.485779 0 38.173462 7.7407026 51.952026 21.519241c13.778564 13.778538 21.519226 32.466244 21.519226 51.952045l0 293.8763c0 40.577087 -32.894226 73.47128 -73.47125 73.47128l-731.7346 0c-40.577065 0 -73.47128 -32.894196 -73.47128 -73.47128z" fill-rule="evenodd"></path><path stroke="#999999" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="16.0,12.0" d="m55.572178 89.47128l0 0c0 -40.577072 32.894215 -73.47129 73.47128 -73.47129l731.7346 0c19.485779 0 38.173462 7.7407026 51.952026 21.519241c13.778564 13.778538 21.519226 32.466244 21.519226 51.952045l0 293.8763c0 40.577087 -32.894226 73.47128 -73.47125 73.47128l-731.7346 0c-40.577065 0 -73.47128 -32.894196 -73.47128 -73.47128z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m283.36746 239.7934l0 0c0 -20.332031 16.48236 -36.814392 36.81436 -36.814392l535.94604 0c9.763794 0 19.127686 3.8786469 26.031677 10.782684c6.9040527 6.9040375 10.782715 16.26793 10.782715 26.031708l0 147.25311c0 20.332031 -16.48236 36.814392 -36.814392 36.814392l-535.94604 0c-20.332 0 -36.81436 -16.48236 -36.81436 -36.814392z" fill-rule="evenodd"></path><path stroke="#999999" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="16.0,12.0" d="m283.36746 239.7934l0 0c0 -20.332031 16.48236 -36.814392 36.81436 -36.814392l535.94604 0c9.763794 0 19.127686 3.8786469 26.031677 10.782684c6.9040527 6.9040375 10.782715 16.26793 10.782715 26.031708l0 147.25311c0 20.332031 -16.48236 36.814392 -36.814392 36.814392l-535.94604 0c-20.332 0 -36.81436 -16.48236 -36.81436 -36.814392z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m189.44882 129.42783l432.37796 0l0 73.16536l-432.37796 0z" fill-rule="evenodd"></path><path fill="#000000" d="m202.3707 157.21844l3.109375 0l0.09375 3.609375q1.75 -2.09375 3.4375 -3.03125q1.6875 -0.9375 3.40625 -0.9375q3.046875 0 4.609375 1.984375q1.578125 1.96875 1.46875 5.859375l-3.4375 0q0.046875 -2.578125 -0.765625 -3.734375q-0.796875 -1.171875 -2.359375 -1.171875q-0.6875 0 -1.390625 0.25q-0.6875 0.234375 -1.421875 0.78125q-0.734375 0.53125 -1.5625 1.375q-0.8125 0.828125 -1.75 2.03125l0 12.59375l-3.4375 0l0 -19.609375zm38.835938 19.609375l-4.671875 0l-9.140625 -10.515625l0 10.515625l-3.390625 0l0 -27.59375l3.390625 0l0 16.953125l8.8125 -8.96875l4.484375 0l-9.1875 9.046875l9.703125 10.5625zm20.148438 -0.28125q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875z" fill-rule="nonzero"></path><path fill="#000000" d="m293.90195 183.5622q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm4.15625 -11.6875l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546875l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703125q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm13.578125 0.46875q-1.5625 1.328125 -3.015625 1.875q-1.4375 0.546875 -3.09375 0.546875q-2.734375 0 -4.203125 -1.328125q-1.46875 -1.34375 -1.46875 -3.421875q0 -1.21875 0.546875 -2.21875q0.5625 -1.015625 1.453125 -1.625q0.90625 -0.609375 2.03125 -0.921875q0.828125 -0.21875 2.5 -0.421875q3.40625 -0.40625 5.015625 -0.96875q0.015625 -0.578125 0.015625 -0.734375q0 -1.71875 -0.796875 -2.421875q-1.078125 -0.953125 -3.203125 -0.953125q-1.984375 0 -2.9375 0.703125q-0.9375 0.6875 -1.390625 2.453125l-2.75 -0.375q0.375 -1.765625 1.234375 -2.84375q0.859375 -1.09375 2.484375 -1.671875q1.625 -0.59375 3.765625 -0.59375q2.125 0 3.453125 0.5q1.328125 0.5 1.953125 1.265625q0.625 0.75 0.875 1.90625q0.140625 0.71875 0.140625 2.59375l0 3.75q0 3.921875 0.171875 4.96875q0.1875 1.03125 0.71875 1.984375l-2.9375 0q-0.4375 -0.875 -0.5625 -2.046875zm-0.234375 -6.28125q-1.53125 0.625 -4.59375 1.0625q-1.734375 0.25 -2.453125 0.5625q-0.71875 0.3125 -1.109375 0.921875q-0.390625 0.59375 -0.390625 1.328125q0 1.125 0.84375 1.875q0.859375 0.75 2.5 0.75q1.625 0 2.890625 -0.703125q1.265625 -0.71875 1.859375 -1.953125q0.453125 -0.953125 0.453125 -2.8125l0 -1.03125zm6.6875 9.703125l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm27.34375 3.25l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm14.890625 -1.40625q0 -4.0625 0.828125 -6.53125q0.84375 -2.484375 2.484375 -3.828125q1.65625 -1.34375 4.15625 -1.34375q1.84375 0 3.234375 0.75q1.390625 0.734375 2.296875 2.140625q0.90625 1.390625 1.421875 3.40625q0.515625 2.0 0.515625 5.40625q0 4.03125 -0.828125 6.515625q-0.828125 2.46875 -2.484375 3.828125q-1.640625 1.34375 -4.15625 1.34375q-3.3125 0 -5.203125 -2.375q-2.265625 -2.859375 -2.265625 -9.3125zm2.890625 0q0 5.640625 1.3125 7.515625q1.328125 1.859375 3.265625 1.859375q1.9375 0 3.25 -1.875q1.328125 -1.875 1.328125 -7.5q0 -5.65625 -1.328125 -7.515625q-1.3125 -1.859375 -3.28125 -1.859375q-1.9375 0 -3.09375 1.640625q-1.453125 2.09375 -1.453125 7.734375zm17.53125 18.03125l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m295.8714 202.97769l337.63782 0l0 73.165344l-337.63782 0z" fill-rule="evenodd"></path><path fill="#000000" d="m307.51202 258.3308l0 -28.703125l3.203125 0l0 2.703125q1.125 -1.578125 2.546875 -2.375q1.4375 -0.796875 3.46875 -0.796875q2.65625 0 4.6875 1.375q2.03125 1.359375 3.0625 3.859375q1.03125 2.484375 1.03125 5.453125q0 3.1875 -1.140625 5.734375q-1.140625 2.546875 -3.328125 3.90625q-2.171875 1.359375 -4.5625 1.359375q-1.765625 0 -3.171875 -0.734375q-1.390625 -0.75 -2.28125 -1.890625l0 10.109375l-3.515625 0zm3.1875 -18.203125q0 4.0 1.609375 5.921875q1.625 1.90625 3.9375 1.90625q2.34375 0 4.0 -1.984375q1.671875 -1.984375 1.671875 -6.140625q0 -3.96875 -1.625 -5.9375q-1.625 -1.96875 -3.890625 -1.96875q-2.25 0 -3.984375 2.09375q-1.71875 2.09375 -1.71875 6.109375zm17.746094 -0.125q0 -5.765625 3.203125 -8.53125q2.671875 -2.3125 6.53125 -2.3125q4.265625 0 6.984375 2.8125q2.71875 2.796875 2.71875 7.734375q0 4.015625 -1.203125 6.3125q-1.203125 2.28125 -3.5 3.5625q-2.296875 1.265625 -5.0 1.265625q-4.359375 0 -7.046875 -2.796875q-2.6875 -2.796875 -2.6875 -8.046875zm3.609375 0q0 3.984375 1.734375 5.96875q1.75 1.984375 4.390625 1.984375q2.609375 0 4.34375 -1.984375q1.75 -2.0 1.75 -6.078125q0 -3.859375 -1.75 -5.828125q-1.75 -1.984375 -4.34375 -1.984375q-2.640625 0 -4.390625 1.96875q-1.734375 1.96875 -1.734375 5.953125zm33.402344 10.375l0 -2.625q-1.96875 3.09375 -5.796875 3.09375q-2.484375 0 -4.5625 -1.359375q-2.078125 -1.375 -3.21875 -3.828125q-1.140625 -2.453125 -1.140625 -5.640625q0 -3.09375 1.03125 -5.625q1.03125 -2.53125 3.09375 -3.875q2.078125 -1.359375 4.640625 -1.359375q1.875 0 3.328125 0.796875q1.46875 0.796875 2.390625 2.0625l0 -10.28125l3.5 0l0 28.640625l-3.265625 0zm-11.109375 -10.359375q0 3.984375 1.671875 5.96875q1.6875 1.96875 3.96875 1.96875q2.3125 0 3.921875 -1.875q1.609375 -1.890625 1.609375 -5.765625q0 -4.25 -1.640625 -6.234375q-1.640625 -2.0 -4.046875 -2.0q-2.34375 0 -3.921875 1.921875q-1.5625 1.90625 -1.5625 6.015625z" fill-rule="nonzero"></path><path fill="#000000" d="m401.32062 257.11206q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm4.15625 -11.6875l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546875l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703125q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm13.578125 0.46875q-1.5625 1.328125 -3.015625 1.875q-1.4375 0.546875 -3.09375 0.546875q-2.734375 0 -4.203125 -1.328125q-1.46875 -1.34375 -1.46875 -3.421875q0 -1.21875 0.546875 -2.21875q0.5625 -1.015625 1.453125 -1.625q0.90625 -0.609375 2.03125 -0.921875q0.828125 -0.21875 2.5 -0.421875q3.40625 -0.40625 5.015625 -0.96875q0.015625 -0.578125 0.015625 -0.734375q0 -1.71875 -0.796875 -2.421875q-1.078125 -0.953125 -3.203125 -0.953125q-1.984375 0 -2.9375 0.703125q-0.9375 0.6875 -1.390625 2.453125l-2.75 -0.375q0.375 -1.765625 1.234375 -2.84375q0.859375 -1.09375 2.484375 -1.671875q1.625 -0.59375 3.765625 -0.59375q2.125 0 3.453125 0.5q1.328125 0.5 1.953125 1.265625q0.625 0.75 0.875 1.90625q0.140625 0.71875 0.140625 2.59375l0 3.75q0 3.921875 0.171875 4.96875q0.1875 1.03125 0.71875 1.984375l-2.9375 0q-0.4375 -0.875 -0.5625 -2.046875zm-0.234375 -6.28125q-1.53125 0.625 -4.59375 1.0625q-1.734375 0.25 -2.453125 0.5625q-0.71875 0.3125 -1.109375 0.921875q-0.390625 0.59375 -0.390625 1.328125q0 1.125 0.84375 1.875q0.859375 0.75 2.5 0.75q1.625 0 2.890625 -0.703125q1.265625 -0.71875 1.859375 -1.953125q0.453125 -0.953125 0.453125 -2.8125l0 -1.03125zm6.6875 9.703125l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm27.34375 3.25l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm25.484375 9.890625l-2.8125 0l0 -17.921875q-1.015625 0.96875 -2.671875 1.9375q-1.640625 0.96875 -2.953125 1.453125l0 -2.71875q2.359375 -1.109375 4.125 -2.6875q1.765625 -1.578125 2.5 -3.0625l1.8125 0l0 23.0zm9.828125 6.734375l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m113.08137 120.10236l0 49.98162l64.10537 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m113.08137 120.10236l0 49.98162l40.10537 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m153.18674 176.69092l18.15239 -6.6069336l-18.15239 -6.6069183z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m219.26247 194.59319l0 49.98163l64.10536 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m219.26247 194.59317l0 49.98163l40.105392 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m259.36786 251.18173l18.152374 -6.6069336l-18.152374 -6.6069183z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m328.3071 269.0092l0 49.98163l64.10535 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m328.3071 269.0092l0 49.98163l40.105347 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m368.41245 325.59775l18.152374 -6.6069336l-18.152374 -6.6069336z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m327.92914 309.2082l0 82.15982l64.10538 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m327.92914 309.2082l0 82.15979l40.105347 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m368.0345 397.9749l18.152405 -6.6069336l-18.152405 -6.6069336z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m83.04724 54.855644l525.2598 0l0 89.32284l-525.2598 0z" fill-rule="evenodd"></path><path fill="#000000" d="m110.70349 96.89626q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm23.898438 -14.25l-6.671875 17.53125q-1.03125 2.6875 -2.140625 4.609375q-1.109375 1.9375 -2.421875 3.171875q-1.296875 1.25 -2.859375 1.828125q-1.5625 0.59375 -3.5 0.59375q-0.5 0 -0.921875 -0.015625q-0.40625 -0.015625 -0.890625 -0.0625l0 -3.078125q0.421875 0.046875 0.921875 0.09375q0.515625 0.0625 1.09375 0.0625q0.9375 0 1.734375 -0.28125q0.8125 -0.265625 1.53125 -0.890625q0.734375 -0.609375 1.390625 -1.59375q0.671875 -0.96875 1.296875 -2.359375l-7.828125 -19.609375l3.859375 0l4.96875 12.96875l0.984375 3.046875l1.140625 -3.125l4.59375 -12.890625l3.71875 0zm20.085938 14.25q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm22.257812 5.078125q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm22.757812 -10.5625q0 0.71875 -0.015625 1.21875q-0.015625 0.484375 -0.0625 0.90625l-13.765625 0q0 3.015625 1.671875 4.625q1.6875 1.609375 4.84375 1.609375q0.859375 0 1.71875 -0.0625q0.859375 -0.078125 1.65625 -0.1875q0.8125 -0.125 1.546875 -0.265625q0.734375 -0.140625 1.359375 -0.328125l0 2.796875q-1.390625 0.390625 -3.140625 0.640625q-1.75 0.25 -3.625 0.25q-2.515625 0 -4.34375 -0.6875q-1.8125 -0.6875 -2.96875 -1.984375q-1.15625 -1.296875 -1.71875 -3.1875q-0.5625 -1.890625 -0.5625 -4.265625q0 -2.078125 0.59375 -3.921875q0.609375 -1.84375 1.75 -3.234375q1.140625 -1.40625 2.796875 -2.21875q1.65625 -0.828125 3.765625 -0.828125q2.0625 0 3.640625 0.65625q1.578125 0.640625 2.65625 1.828125q1.09375 1.171875 1.640625 2.859375q0.5625 1.6875 0.5625 3.78125zm-3.53125 -0.484375q0.0625 -1.3125 -0.25 -2.390625q-0.3125 -1.09375 -0.96875 -1.875q-0.65625 -0.78125 -1.640625 -1.21875q-0.96875 -0.4375 -2.265625 -0.4375q-1.109375 0 -2.03125 0.4375q-0.90625 0.421875 -1.578125 1.203125q-0.65625 0.78125 -1.078125 1.875q-0.40625 1.09375 -0.5 2.40625l10.3125 0zm22.945312 11.328125l0 -14.078125q0 -0.921875 -0.078125 -1.5q-0.0625 -0.59375 -0.203125 -0.9375q-0.140625 -0.34375 -0.375 -0.46875q-0.21875 -0.140625 -0.546875 -0.140625q-0.390625 0 -0.734375 0.234375q-0.328125 0.234375 -0.71875 0.765625q-0.375 0.515625 -0.828125 1.390625q-0.453125 0.859375 -1.078125 2.140625l0 12.59375l-3.109375 0l0 -13.71875q0 -1.0625 -0.078125 -1.71875q-0.0625 -0.671875 -0.21875 -1.046875q-0.140625 -0.375 -0.375 -0.5q-0.234375 -0.140625 -0.5625 -0.140625q-0.34375 0 -0.65625 0.203125q-0.3125 0.1875 -0.703125 0.703125q-0.375 0.5 -0.84375 1.375q-0.46875 0.875 -1.109375 2.25l0 12.59375l-3.125 0l0 -19.609375l2.59375 0l0.15625 3.734375q0.5 -1.125 0.984375 -1.90625q0.484375 -0.78125 0.984375 -1.25q0.515625 -0.484375 1.078125 -0.703125q0.578125 -0.234375 1.28125 -0.234375q1.59375 0 2.40625 1.046875q0.828125 1.03125 0.828125 3.203125q0.46875 -1.015625 0.90625 -1.8125q0.453125 -0.796875 0.96875 -1.328125q0.515625 -0.53125 1.140625 -0.8125q0.625 -0.296875 1.453125 -0.296875q3.6875 0 3.6875 5.6875l0 14.28125l-3.125 0zm7.0078125 -9.390625q0 -2.5 0.6875 -4.4375q0.6875 -1.953125 1.9375 -3.28125q1.265625 -1.34375 3.03125 -2.03125q1.765625 -0.703125 3.9375 -0.703125q0.9375 0 1.84375 0.125q0.90625 0.109375 1.796875 0.359375l0 -8.234375l3.40625 0l0 27.59375l-3.046875 0l-0.109375 -3.71875q-1.421875 2.078125 -3.09375 3.078125q-1.65625 1.0 -3.59375 1.0q-1.671875 0 -2.953125 -0.703125q-1.28125 -0.71875 -2.140625 -1.984375q-0.84375 -1.28125 -1.28125 -3.078125q-0.421875 -1.796875 -0.421875 -3.984375zm3.484375 -0.21875q0 3.546875 1.046875 5.296875q1.046875 1.75 2.953125 1.75q1.296875 0 2.71875 -1.140625q1.4375 -1.15625 3.03125 -3.421875l0 -9.109375q-0.84375 -0.390625 -1.859375 -0.59375q-1.015625 -0.203125 -2.015625 -0.203125q-2.765625 0 -4.328125 1.796875q-1.546875 1.796875 -1.546875 5.625z" fill-rule="nonzero"></path><path fill="#000000" d="m297.4613 108.99001q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm5.296875 -26.40625l0 -3.234375l2.8125 0l0 3.234375l-2.8125 0zm0 19.671875l0 -16.59375l2.8125 0l0 16.59375l-2.8125 0zm7.09375 0l0 -16.59375l2.53125 0l0 2.359375q1.828125 -2.734375 5.28125 -2.734375q1.5 0 2.75 0.546875q1.265625 0.53125 1.890625 1.40625q0.625 0.875 0.875 2.078125q0.15625 0.78125 0.15625 2.734375l0 10.203125l-2.8125 0l0 -10.09375q0 -1.71875 -0.328125 -2.5625q-0.328125 -0.859375 -1.171875 -1.359375q-0.828125 -0.515625 -1.953125 -0.515625q-1.796875 0 -3.109375 1.140625q-1.296875 1.140625 -1.296875 4.328125l0 9.0625l-2.8125 0zm22.40625 0l-6.3125 -16.59375l2.96875 0l3.5625 9.9375q0.578125 1.609375 1.0625 3.34375q0.375 -1.3125 1.046875 -3.15625l3.6875 -10.125l2.890625 0l-6.28125 16.59375l-2.625 0zm10.34375 -8.296875q0 -4.609375 2.5625 -6.828125q2.140625 -1.84375 5.21875 -1.84375q3.421875 0 5.59375 2.25q2.171875 2.234375 2.171875 6.1875q0 3.203125 -0.96875 5.046875q-0.953125 1.828125 -2.796875 2.84375q-1.828125 1.015625 -4.0 1.015625q-3.484375 0 -5.640625 -2.234375q-2.140625 -2.234375 -2.140625 -6.4375zm2.890625 0q0 3.1875 1.390625 4.78125q1.390625 1.578125 3.5 1.578125q2.09375 0 3.484375 -1.59375q1.390625 -1.59375 1.390625 -4.859375q0 -3.078125 -1.40625 -4.65625q-1.390625 -1.59375 -3.46875 -1.59375q-2.109375 0 -3.5 1.578125q-1.390625 1.578125 -1.390625 4.765625zm15.96875 8.296875l0 -22.90625l2.8125 0l0 13.0625l6.65625 -6.75l3.640625 0l-6.34375 6.15625l6.984375 10.4375l-3.46875 0l-5.484375 -8.484375l-1.984375 1.90625l0 6.578125l-2.8125 0zm16.0 -19.671875l0 -3.234375l2.8125 0l0 3.234375l-2.8125 0zm0 19.671875l0 -16.59375l2.8125 0l0 16.59375l-2.8125 0zm7.09375 0l0 -16.59375l2.53125 0l0 2.359375q1.828125 -2.734375 5.28125 -2.734375q1.5 0 2.75 0.546875q1.265625 0.53125 1.890625 1.40625q0.625 0.875 0.875 2.078125q0.15625 0.78125 0.15625 2.734375l0 10.203125l-2.8125 0l0 -10.09375q0 -1.71875 -0.328125 -2.5625q-0.328125 -0.859375 -1.171875 -1.359375q-0.828125 -0.515625 -1.953125 -0.515625q-1.796875 0 -3.109375 1.140625q-1.296875 1.140625 -1.296875 4.328125l0 9.0625l-2.8125 0zm17.28125 1.375l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm24.875 14.953125l0 -22.953125l2.5625 0l0 2.15625q0.90625 -1.265625 2.046875 -1.890625q1.140625 -0.640625 2.765625 -0.640625q2.125 0 3.75 1.09375q1.625 1.09375 2.453125 3.09375q0.828125 1.984375 0.828125 4.359375q0 2.546875 -0.921875 4.59375q-0.90625 2.03125 -2.65625 3.125q-1.734375 1.078125 -3.65625 1.078125q-1.40625 0 -2.53125 -0.59375q-1.109375 -0.59375 -1.828125 -1.5l0 8.078125l-2.8125 0zm2.546875 -14.5625q0 3.203125 1.296875 4.734375q1.296875 1.53125 3.140625 1.53125q1.875 0 3.203125 -1.578125q1.34375 -1.59375 1.34375 -4.921875q0 -3.171875 -1.3125 -4.75q-1.296875 -1.578125 -3.109375 -1.578125q-1.796875 0 -3.1875 1.6875q-1.375 1.671875 -1.375 4.875zm15.21875 8.203125l0 -16.59375l2.53125 0l0 2.515625q0.96875 -1.765625 1.78125 -2.328125q0.828125 -0.5625 1.8125 -0.5625q1.421875 0 2.890625 0.90625l-0.96875 2.609375q-1.03125 -0.609375 -2.0625 -0.609375q-0.921875 0 -1.65625 0.5625q-0.734375 0.546875 -1.046875 1.53125q-0.46875 1.5 -0.46875 3.28125l0 8.6875l-2.8125 0zm9.640625 -8.296875q0 -4.609375 2.5625 -6.828125q2.140625 -1.84375 5.21875 -1.84375q3.421875 0 5.59375 2.25q2.171875 2.234375 2.171875 6.1875q0 3.203125 -0.96875 5.046875q-0.953125 1.828125 -2.796875 2.84375q-1.828125 1.015625 -4.0 1.015625q-3.484375 0 -5.640625 -2.234375q-2.140625 -2.234375 -2.140625 -6.4375zm2.890625 0q0 3.1875 1.390625 4.78125q1.390625 1.578125 3.5 1.578125q2.09375 0 3.484375 -1.59375q1.390625 -1.59375 1.390625 -4.859375q0 -3.078125 -1.40625 -4.65625q-1.390625 -1.59375 -3.46875 -1.59375q-2.109375 0 -3.5 1.578125q-1.390625 1.578125 -1.390625 4.765625zm26.78125 2.21875l2.765625 0.359375q-0.453125 2.859375 -2.328125 4.484375q-1.859375 1.609375 -4.578125 1.609375q-3.40625 0 -5.484375 -2.21875q-2.0625 -2.234375 -2.0625 -6.390625q0 -2.6875 0.890625 -4.703125q0.890625 -2.015625 2.703125 -3.015625q1.828125 -1.015625 3.96875 -1.015625q2.703125 0 4.421875 1.375q1.71875 1.359375 2.203125 3.875l-2.734375 0.421875q-0.390625 -1.671875 -1.390625 -2.515625q-0.984375 -0.84375 -2.390625 -0.84375q-2.125 0 -3.453125 1.53125q-1.328125 1.515625 -1.328125 4.8125q0 3.34375 1.28125 4.859375q1.28125 1.515625 3.34375 1.515625q1.65625 0 2.765625 -1.015625q1.109375 -1.015625 1.40625 -3.125zm16.53125 0.734375l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm14.546875 4.9375l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm16.0 0l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm18.96875 11.6875l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m411.1916 281.958l366.6142 0l0 73.165375l-366.6142 0z" fill-rule="evenodd"></path><path fill="#000000" d="m435.91034 329.358l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm26.523438 -1.234375q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.476562 -0.15625q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.054688 10.0l-16.03125 0l0 -3.171875l6.5625 0l0 -18.625l-6.109375 3.3125l-1.25 -2.890625l8.125 -4.265625l3.0 0l0 22.46875l5.703125 0l0 3.171875z" fill-rule="nonzero"></path><path fill="#000000" d="m537.6369 336.09238q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm4.15625 -11.6875l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546875l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703125q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm13.578125 0.46875q-1.5625 1.328125 -3.015625 1.875q-1.4375 0.546875 -3.09375 0.546875q-2.734375 0 -4.203125 -1.328125q-1.46875 -1.34375 -1.46875 -3.421875q0 -1.21875 0.546875 -2.21875q0.5625 -1.015625 1.453125 -1.625q0.90625 -0.609375 2.03125 -0.921875q0.828125 -0.21875 2.5 -0.421875q3.40625 -0.40625 5.015625 -0.96875q0.015625 -0.578125 0.015625 -0.734375q0 -1.71875 -0.796875 -2.421875q-1.078125 -0.953125 -3.203125 -0.953125q-1.984375 0 -2.9375 0.703125q-0.9375 0.6875 -1.390625 2.453125l-2.75 -0.375q0.375 -1.765625 1.234375 -2.84375q0.859375 -1.09375 2.484375 -1.671875q1.625 -0.59375 3.765625 -0.59375q2.125 0 3.453125 0.5q1.328125 0.5 1.953125 1.265625q0.625 0.75 0.875 1.90625q0.140625 0.71875 0.140625 2.59375l0 3.75q0 3.921875 0.171875 4.96875q0.1875 1.03125 0.71875 1.984375l-2.9375 0q-0.4375 -0.875 -0.5625 -2.046875zm-0.234375 -6.28125q-1.53125 0.625 -4.59375 1.0625q-1.734375 0.25 -2.453125 0.5625q-0.71875 0.3125 -1.109375 0.921875q-0.390625 0.59375 -0.390625 1.328125q0 1.125 0.84375 1.875q0.859375 0.75 2.5 0.75q1.625 0 2.890625 -0.703125q1.265625 -0.71875 1.859375 -1.953125q0.453125 -0.953125 0.453125 -2.8125l0 -1.03125zm6.6875 9.703125l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm27.34375 3.25l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm29.671875 7.1875l0 2.703125l-15.140625 0q-0.03125 -1.015625 0.328125 -1.953125q0.578125 -1.546875 1.84375 -3.046875q1.28125 -1.5 3.6875 -3.46875q3.734375 -3.0625 5.046875 -4.84375q1.3125 -1.796875 1.3125 -3.390625q0 -1.671875 -1.203125 -2.8125q-1.1875 -1.15625 -3.109375 -1.15625q-2.03125 0 -3.25 1.21875q-1.21875 1.21875 -1.234375 3.375l-2.890625 -0.296875q0.296875 -3.234375 2.234375 -4.921875q1.9375 -1.703125 5.203125 -1.703125q3.296875 0 5.21875 1.828125q1.921875 1.828125 1.921875 4.53125q0 1.375 -0.5625 2.703125q-0.5625 1.328125 -1.875 2.796875q-1.296875 1.46875 -4.328125 4.03125q-2.53125 2.125 -3.25 2.890625q-0.71875 0.75 -1.1875 1.515625l11.234375 0zm5.640625 9.4375l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m411.1916 353.958l337.63782 0l0 73.165375l-337.63782 0z" fill-rule="evenodd"></path><path fill="#000000" d="m435.91034 401.358l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm26.523438 -1.234375q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.476562 -0.15625q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.273438 10.0l-16.8125 0l0 -3.046875l6.59375 -6.5625q1.625 -1.609375 2.640625 -2.78125q1.015625 -1.171875 1.578125 -2.125q0.578125 -0.96875 0.765625 -1.828125q0.203125 -0.859375 0.203125 -1.859375q0 -0.9375 -0.265625 -1.78125q-0.25 -0.859375 -0.78125 -1.5q-0.515625 -0.640625 -1.359375 -1.015625q-0.84375 -0.375 -2.015625 -0.375q-1.625 0 -2.953125 0.734375q-1.328125 0.71875 -2.4375 1.859375l-1.875 -2.234375q1.453125 -1.53125 3.328125 -2.4375q1.890625 -0.921875 4.390625 -0.921875q1.703125 0 3.09375 0.515625q1.390625 0.5 2.40625 1.453125q1.015625 0.953125 1.578125 2.34375q0.5625 1.390625 0.5625 3.125q0 1.46875 -0.390625 2.71875q-0.390625 1.25 -1.1875 2.484375q-0.796875 1.234375 -2.0 2.5625q-1.1875 1.328125 -2.828125 2.921875l-4.640625 4.5l12.40625 0l0 3.25z" fill-rule="nonzero"></path><path fill="#000000" d="m537.6369 408.09238q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm4.15625 -11.6875l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546875l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703125q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm13.578125 0.46875q-1.5625 1.328125 -3.015625 1.875q-1.4375 0.546875 -3.09375 0.546875q-2.734375 0 -4.203125 -1.328125q-1.46875 -1.34375 -1.46875 -3.421875q0 -1.21875 0.546875 -2.21875q0.5625 -1.015625 1.453125 -1.625q0.90625 -0.609375 2.03125 -0.921875q0.828125 -0.21875 2.5 -0.421875q3.40625 -0.40625 5.015625 -0.96875q0.015625 -0.578125 0.015625 -0.734375q0 -1.71875 -0.796875 -2.421875q-1.078125 -0.953125 -3.203125 -0.953125q-1.984375 0 -2.9375 0.703125q-0.9375 0.6875 -1.390625 2.453125l-2.75 -0.375q0.375 -1.765625 1.234375 -2.84375q0.859375 -1.09375 2.484375 -1.671875q1.625 -0.59375 3.765625 -0.59375q2.125 0 3.453125 0.5q1.328125 0.5 1.953125 1.265625q0.625 0.75 0.875 1.90625q0.140625 0.71875 0.140625 2.59375l0 3.75q0 3.921875 0.171875 4.96875q0.1875 1.03125 0.71875 1.984375l-2.9375 0q-0.4375 -0.875 -0.5625 -2.046875zm-0.234375 -6.28125q-1.53125 0.625 -4.59375 1.0625q-1.734375 0.25 -2.453125 0.5625q-0.71875 0.3125 -1.109375 0.921875q-0.390625 0.59375 -0.390625 1.328125q0 1.125 0.84375 1.875q0.859375 0.75 2.5 0.75q1.625 0 2.890625 -0.703125q1.265625 -0.71875 1.859375 -1.953125q0.453125 -0.953125 0.453125 -2.8125l0 -1.03125zm6.6875 9.703125l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm27.34375 3.25l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm29.671875 7.1875l0 2.703125l-15.140625 0q-0.03125 -1.015625 0.328125 -1.953125q0.578125 -1.546875 1.84375 -3.046875q1.28125 -1.5 3.6875 -3.46875q3.734375 -3.0625 5.046875 -4.84375q1.3125 -1.796875 1.3125 -3.390625q0 -1.671875 -1.203125 -2.8125q-1.1875 -1.15625 -3.109375 -1.15625q-2.03125 0 -3.25 1.21875q-1.21875 1.21875 -1.234375 3.375l-2.890625 -0.296875q0.296875 -3.234375 2.234375 -4.921875q1.9375 -1.703125 5.203125 -1.703125q3.296875 0 5.21875 1.828125q1.921875 1.828125 1.921875 4.53125q0 1.375 -0.5625 2.703125q-0.5625 1.328125 -1.875 2.796875q-1.296875 1.46875 -4.328125 4.03125q-2.53125 2.125 -3.25 2.890625q-0.71875 0.75 -1.1875 1.515625l11.234375 0zm5.640625 9.4375l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m548.29395 225.20079l224.94489 0l0 22.582672l-224.94489 0z" fill-rule="evenodd"></path><path fill="#cfe2f3" d="m540.373 272.76642c4.947754 0 8.958679 -4.010956 8.958679 -8.958679l-8.958679 0c2.473877 0 4.47937 -2.0054626 4.47937 -4.4793396c0 -2.4738464 -2.0054932 -4.4793243 -4.47937 -4.4793243l8.958679 0l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.07367 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679zm26.876038 -134.37993l0 0c0 4.9477234 -4.0109863 8.958649 -8.958679 8.958649c-2.473877 0 -4.47937 -2.0054626 -4.47937 -4.4793243c0 -2.4738617 2.0054932 -4.4793243 4.47937 -4.4793243z" fill-rule="evenodd"></path><path fill="#a5b4c2" d="m567.249 138.38649l0 0c0 4.9477234 -4.0109863 8.958649 -8.958679 8.958649c-2.473877 0 -4.47937 -2.0054626 -4.47937 -4.4793243c0 -2.4738617 2.0054932 -4.4793243 4.47937 -4.4793243zm-17.917358 125.42125c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679c-4.947693 0 -8.958618 -4.010956 -8.958618 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958618 -8.958664l0 0c2.473877 0 4.47937 2.005478 4.47937 4.4793243c0 2.473877 -2.0054932 4.4793396 -4.47937 4.4793396z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m549.33167 254.84908l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.07367 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679l-152.07367 0c-4.947693 0 -8.958618 -4.010956 -8.958618 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958618 -8.958664zm8.958679 -125.42125l0 0c4.947693 0 8.958679 4.0109253 8.958679 8.958664c0 4.9477234 -4.0109863 8.958649 -8.958679 8.958649c-2.473877 0 -4.47937 -2.0054626 -4.47937 -4.4793243c0 -2.4738617 2.0054932 -4.4793243 4.47937 -4.4793243l8.958679 0m134.15631 8.958649l-143.11499 0m-17.917358 107.50394l0 0c2.473877 0 4.47937 2.005478 4.47937 4.4793243c0 2.473877 -2.0054932 4.4793396 -4.47937 4.4793396l8.958679 0m-8.958679 8.958679c4.947754 0 8.958679 -4.010956 8.958679 -8.958679l0 -8.958664" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m549.33167 254.84908l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.07367 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679l-152.07367 0c-4.947693 0 -8.958618 -4.010956 -8.958618 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958618 -8.958664zm8.958679 -125.42125l0 0c4.947693 0 8.958679 4.0109253 8.958679 8.958664c0 4.9477234 -4.0109863 8.958649 -8.958679 8.958649c-2.473877 0 -4.47937 -2.0054626 -4.47937 -4.4793243c0 -2.4738617 2.0054932 -4.4793243 4.47937 -4.4793243l8.958679 0m134.15631 8.958649l-143.11499 0m-17.917358 107.50394l0 0c2.473877 0 4.47937 2.005478 4.47937 4.4793243c0 2.473877 -2.0054932 4.4793396 -4.47937 4.4793396l8.958679 0m-8.958679 8.958679c4.947754 0 8.958679 -4.010956 8.958679 -8.958679l0 -8.958664" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m579.94324 158.97638l90.850525 0l0 38.23622l-90.850525 0z" fill-rule="evenodd"></path><path fill="#000000" d="m606.19666 183.95448l0 -1.25q-0.453125 0.671875 -1.1875 1.0625q-0.734375 0.375 -1.5625 0.375q-0.828125 0 -1.5 -0.359375q-0.65625 -0.375 -0.953125 -1.03125q-0.296875 -0.671875 -0.296875 -1.84375l0 -5.25l2.1875 0l0 3.8125q0 1.75 0.125 2.140625q0.125 0.390625 0.4375 0.625q0.328125 0.234375 0.8125 0.234375q0.5625 0 1.0 -0.3125q0.453125 -0.3125 0.609375 -0.765625q0.171875 -0.453125 0.171875 -2.234375l0 -3.5l2.203125 0l0 8.296875l-2.046875 0zm4.3203125 0l0 -11.453125l2.1875 0l0 11.453125l-2.1875 0zm4.4453125 -9.421875l0 -2.03125l2.1875 0l0 2.03125l-2.1875 0zm0 9.421875l0 -8.296875l2.1875 0l0 8.296875l-2.1875 0zm4.2734375 -8.296875l2.03125 0l0 1.125q1.078125 -1.3125 2.578125 -1.3125q0.796875 0 1.375 0.328125q0.59375 0.328125 0.96875 0.984375q0.546875 -0.65625 1.171875 -0.984375q0.640625 -0.328125 1.359375 -0.328125q0.921875 0 1.546875 0.375q0.640625 0.359375 0.953125 1.078125q0.21875 0.53125 0.21875 1.71875l0 5.3125l-2.1875 0l0 -4.75q0 -1.234375 -0.234375 -1.59375q-0.296875 -0.46875 -0.9375 -0.46875q-0.453125 0 -0.859375 0.28125q-0.40625 0.28125 -0.59375 0.828125q-0.171875 0.546875 -0.171875 1.71875l0 3.984375l-2.203125 0l0 -4.546875q0 -1.21875 -0.125 -1.5625q-0.109375 -0.359375 -0.359375 -0.53125q-0.234375 -0.171875 -0.65625 -0.171875q-0.515625 0 -0.921875 0.28125q-0.40625 0.265625 -0.578125 0.78125q-0.171875 0.515625 -0.171875 1.71875l0 4.03125l-2.203125 0l0 -8.296875zm14.3984375 -1.125l0 -2.03125l2.1875 0l0 2.03125l-2.1875 0zm0 9.421875l0 -8.296875l2.1875 0l0 8.296875l-2.1875 0zm8.2421875 -8.296875l0 1.75l-1.5 0l0 3.34375q0 1.015625 0.046875 1.1875q0.046875 0.15625 0.1875 0.265625q0.15625 0.109375 0.375 0.109375q0.3125 0 0.890625 -0.203125l0.1875 1.703125q-0.765625 0.328125 -1.734375 0.328125q-0.59375 0 -1.078125 -0.203125q-0.46875 -0.203125 -0.703125 -0.515625q-0.21875 -0.3125 -0.296875 -0.859375q-0.078125 -0.375 -0.078125 -1.546875l0 -3.609375l-1.0 0l0 -1.75l1.0 0l0 -1.65625l2.203125 -1.28125l0 2.9375l1.5 0zm0.75 5.921875l2.203125 -0.328125q0.140625 0.640625 0.5625 0.96875q0.4375 0.328125 1.21875 0.328125q0.84375 0 1.28125 -0.3125q0.28125 -0.21875 0.28125 -0.578125q0 -0.25 -0.15625 -0.421875q-0.15625 -0.15625 -0.734375 -0.28125q-2.65625 -0.59375 -3.359375 -1.078125q-0.984375 -0.671875 -0.984375 -1.859375q0 -1.078125 0.84375 -1.8125q0.859375 -0.734375 2.640625 -0.734375q1.703125 0 2.53125 0.5625q0.828125 0.546875 1.140625 1.625l-2.0625 0.390625q-0.140625 -0.484375 -0.515625 -0.734375q-0.359375 -0.265625 -1.046875 -0.265625q-0.875 0 -1.25 0.234375q-0.25 0.171875 -0.25 0.453125q0 0.234375 0.21875 0.390625q0.296875 0.21875 2.046875 0.625q1.765625 0.390625 2.453125 0.96875q0.6875 0.59375 0.6875 1.640625q0 1.140625 -0.953125 1.96875q-0.953125 0.8125 -2.8125 0.8125q-1.703125 0 -2.6875 -0.6875q-0.984375 -0.6875 -1.296875 -1.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m566.52124 206.75328l125.97101 0l0 54.61418l-125.97101 0z" fill-rule="evenodd"></path><path fill="#000000" d="m575.95874 219.48537q0 -1.875 1.03125 -2.765625q0.875 -0.75 2.125 -0.75q1.390625 0 2.265625 0.90625q0.890625 0.90625 0.890625 2.515625q0 1.296875 -0.390625 2.046875q-0.390625 0.75 -1.140625 1.171875q-0.75 0.40625 -1.625 0.40625q-1.421875 0 -2.296875 -0.90625q-0.859375 -0.90625 -0.859375 -2.625zm1.171875 0q0 1.296875 0.5625 1.953125q0.5625 0.640625 1.421875 0.640625q0.84375 0 1.40625 -0.640625q0.578125 -0.65625 0.578125 -1.984375q0 -1.25 -0.578125 -1.890625q-0.5625 -0.65625 -1.40625 -0.65625q-0.859375 0 -1.421875 0.640625q-0.5625 0.640625 -0.5625 1.9375zm6.6624756 5.953125l0 -9.3125l1.03125 0l0 0.875q0.375 -0.515625 0.828125 -0.765625q0.46875 -0.265625 1.140625 -0.265625q0.859375 0 1.515625 0.453125q0.65625 0.4375 0.984375 1.25q0.34375 0.796875 0.34375 1.765625q0 1.03125 -0.375 1.859375q-0.359375 0.828125 -1.078125 1.28125q-0.703125 0.4375 -1.484375 0.4375q-0.5625 0 -1.015625 -0.234375q-0.453125 -0.25 -0.75 -0.625l0 3.28125l-1.140625 0zm1.03125 -5.90625q0 1.296875 0.53125 1.921875q0.53125 0.625 1.265625 0.625q0.765625 0 1.3125 -0.640625q0.546875 -0.65625 0.546875 -2.0q0 -1.296875 -0.53125 -1.9375q-0.53125 -0.640625 -1.265625 -0.640625q-0.734375 0 -1.296875 0.6875q-0.5625 0.671875 -0.5625 1.984375zm10.990601 1.15625l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.5531006 4.015625l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm11.3811035 0l0 -5.859375l-1.0 0l0 -0.875l1.0 0l0 -0.71875q0 -0.6875 0.125 -1.015625q0.171875 -0.4375 0.578125 -0.71875q0.421875 -0.28125 1.171875 -0.28125q0.484375 0 1.0625 0.125l-0.171875 0.984375q-0.359375 -0.0625 -0.671875 -0.0625q-0.515625 0 -0.734375 0.234375q-0.21875 0.21875 -0.21875 0.828125l0 0.625l1.3125 0l0 0.875l-1.3125 0l0 5.859375l-1.140625 0zm3.437378 -7.984375l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.9298096 0l0 -9.3125l1.140625 0l0 9.3125l-1.140625 0zm7.6017456 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.0999756 2.0l1.125 -0.171875q0.09375 0.671875 0.53125 1.046875q0.4375 0.359375 1.21875 0.359375q0.78125 0 1.15625 -0.3125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.34375 -0.609375q-0.234375 -0.15625 -1.171875 -0.390625q-1.25 -0.3125 -1.734375 -0.546875q-0.484375 -0.234375 -0.734375 -0.640625q-0.25 -0.40625 -0.25 -0.90625q0 -0.453125 0.203125 -0.828125q0.203125 -0.390625 0.5625 -0.640625q0.265625 -0.203125 0.71875 -0.328125q0.46875 -0.140625 1.0 -0.140625q0.78125 0 1.375 0.234375q0.609375 0.21875 0.890625 0.609375q0.296875 0.390625 0.40625 1.046875l-1.125 0.15625q-0.078125 -0.53125 -0.4375 -0.8125q-0.359375 -0.296875 -1.03125 -0.296875q-0.78125 0 -1.125 0.265625q-0.34375 0.25 -0.34375 0.609375q0 0.21875 0.140625 0.390625q0.140625 0.1875 0.4375 0.3125q0.171875 0.0625 1.015625 0.28125q1.21875 0.328125 1.6875 0.53125q0.484375 0.203125 0.75 0.609375q0.28125 0.390625 0.28125 0.96875q0 0.578125 -0.34375 1.078125q-0.328125 0.5 -0.953125 0.78125q-0.625 0.28125 -1.421875 0.28125q-1.3125 0 -2.0 -0.546875q-0.6875 -0.546875 -0.875 -1.625zm16.835754 -3.453125l-6.15625 0l0 -1.0625l6.15625 0l0 1.0625zm0 2.828125l-6.15625 0l0 -1.078125l6.15625 0l0 1.078125zm9.4552 2.640625l-1.140625 0l0 -7.28125q-0.421875 0.390625 -1.09375 0.796875q-0.65625 0.390625 -1.1875 0.578125l0 -1.109375q0.953125 -0.4375 1.671875 -1.078125q0.71875 -0.640625 1.015625 -1.25l0.734375 0l0 9.34375zm3.1156006 -4.59375q0 -1.640625 0.328125 -2.640625q0.34375 -1.015625 1.015625 -1.5625q0.671875 -0.546875 1.6875 -0.546875q0.75 0 1.3125 0.3125q0.5625 0.296875 0.921875 0.859375q0.375 0.5625 0.578125 1.390625q0.21875 0.8125 0.21875 2.1875q0 1.640625 -0.34375 2.65625q-0.328125 1.0 -1.0 1.546875q-0.671875 0.546875 -1.6875 0.546875q-1.34375 0 -2.125 -0.96875q-0.90625 -1.15625 -0.90625 -3.78125zm1.171875 0q0 2.296875 0.53125 3.0625q0.53125 0.75 1.328125 0.75q0.78125 0 1.3125 -0.75q0.546875 -0.765625 0.546875 -3.0625q0 -2.296875 -0.546875 -3.046875q-0.53125 -0.75 -1.328125 -0.75q-0.78125 0 -1.265625 0.65625q-0.578125 0.859375 -0.578125 3.140625zm6.2406006 0q0 -1.640625 0.328125 -2.640625q0.34375 -1.015625 1.015625 -1.5625q0.671875 -0.546875 1.6875 -0.546875q0.75 0 1.3125 0.3125q0.5625 0.296875 0.921875 0.859375q0.375 0.5625 0.578125 1.390625q0.21875 0.8125 0.21875 2.1875q0 1.640625 -0.34375 2.65625q-0.328125 1.0 -1.0 1.546875q-0.671875 0.546875 -1.6875 0.546875q-1.34375 0 -2.125 -0.96875q-0.90625 -1.15625 -0.90625 -3.78125zm1.171875 0q0 2.296875 0.53125 3.0625q0.53125 0.75 1.328125 0.75q0.78125 0 1.3125 -0.75q0.546875 -0.765625 0.546875 -3.0625q0 -2.296875 -0.546875 -3.046875q-0.53125 -0.75 -1.328125 -0.75q-0.78125 0 -1.265625 0.65625q-0.578125 0.859375 -0.578125 3.140625zm6.2406006 0q0 -1.640625 0.328125 -2.640625q0.34375 -1.015625 1.015625 -1.5625q0.671875 -0.546875 1.6875 -0.546875q0.75 0 1.3125 0.3125q0.5625 0.296875 0.921875 0.859375q0.375 0.5625 0.578125 1.390625q0.21875 0.8125 0.21875 2.1875q0 1.640625 -0.34375 2.65625q-0.328125 1.0 -1.0 1.546875q-0.671875 0.546875 -1.6875 0.546875q-1.34375 0 -2.125 -0.96875q-0.90625 -1.15625 -0.90625 -3.78125zm1.171875 0q0 2.296875 0.53125 3.0625q0.53125 0.75 1.328125 0.75q0.78125 0 1.3125 -0.75q0.546875 -0.765625 0.546875 -3.0625q0 -2.296875 -0.546875 -3.046875q-0.53125 -0.75 -1.328125 -0.75q-0.78125 0 -1.265625 0.65625q-0.578125 0.859375 -0.578125 3.140625z" fill-rule="nonzero"></path><path fill="#000000" d="m575.9275 236.84474l1.125 -0.171875q0.09375 0.671875 0.53125 1.046875q0.4375 0.359375 1.21875 0.359375q0.78125 0 1.15625 -0.3125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.34375 -0.609375q-0.234375 -0.15625 -1.171875 -0.390625q-1.25 -0.3125 -1.734375 -0.546875q-0.484375 -0.234375 -0.734375 -0.640625q-0.25 -0.40625 -0.25 -0.90625q0 -0.453125 0.203125 -0.828125q0.203125 -0.390625 0.5625 -0.640625q0.265625 -0.203125 0.71875 -0.328125q0.46875 -0.140625 1.0 -0.140625q0.78125 0 1.375 0.234375q0.609375 0.21875 0.890625 0.609375q0.296875 0.390625 0.40625 1.046875l-1.125 0.15625q-0.078125 -0.53125 -0.4375 -0.8125q-0.359375 -0.296875 -1.03125 -0.296875q-0.78125 0 -1.125 0.265625q-0.34375 0.25 -0.34375 0.609375q0 0.21875 0.140625 0.390625q0.140625 0.1875 0.4375 0.3125q0.171875 0.0625 1.015625 0.28125q1.21875 0.328125 1.6875 0.53125q0.484375 0.203125 0.75 0.609375q0.28125 0.390625 0.28125 0.96875q0 0.578125 -0.34375 1.078125q-0.328125 0.5 -0.953125 0.78125q-0.625 0.28125 -1.421875 0.28125q-1.3125 0 -2.0 -0.546875q-0.6875 -0.546875 -0.875 -1.625zm9.6171875 1.0l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.593628 0.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm7.5062256 0.921875l1.125 0.140625q-0.171875 1.171875 -0.9375 1.828125q-0.765625 0.65625 -1.859375 0.65625q-1.390625 0 -2.234375 -0.90625q-0.828125 -0.90625 -0.828125 -2.59375q0 -1.09375 0.359375 -1.90625q0.359375 -0.828125 1.09375 -1.234375q0.734375 -0.40625 1.609375 -0.40625q1.09375 0 1.796875 0.5625q0.703125 0.546875 0.890625 1.5625l-1.109375 0.171875q-0.15625 -0.671875 -0.5625 -1.015625q-0.390625 -0.34375 -0.96875 -0.34375q-0.859375 0 -1.40625 0.625q-0.53125 0.609375 -0.53125 1.953125q0 1.359375 0.515625 1.984375q0.515625 0.609375 1.359375 0.609375q0.671875 0 1.125 -0.40625q0.453125 -0.421875 0.5625 -1.28125zm2.2734375 2.46875l0 -9.3125l1.140625 0l0 5.3125l2.703125 -2.734375l1.484375 0l-2.578125 2.5l2.84375 4.234375l-1.40625 0l-2.234375 -3.453125l-0.8125 0.78125l0 2.671875l-1.140625 0zm9.91394 -2.015625l1.125 -0.171875q0.09375 0.671875 0.53125 1.046875q0.4375 0.359375 1.21875 0.359375q0.78125 0 1.15625 -0.3125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.34375 -0.609375q-0.234375 -0.15625 -1.171875 -0.390625q-1.25 -0.3125 -1.734375 -0.546875q-0.484375 -0.234375 -0.734375 -0.640625q-0.25 -0.40625 -0.25 -0.90625q0 -0.453125 0.203125 -0.828125q0.203125 -0.390625 0.5625 -0.640625q0.265625 -0.203125 0.71875 -0.328125q0.46875 -0.140625 1.0 -0.140625q0.78125 0 1.375 0.234375q0.609375 0.21875 0.890625 0.609375q0.296875 0.390625 0.40625 1.046875l-1.125 0.15625q-0.078125 -0.53125 -0.4375 -0.8125q-0.359375 -0.296875 -1.03125 -0.296875q-0.78125 0 -1.125 0.265625q-0.34375 0.25 -0.34375 0.609375q0 0.21875 0.140625 0.390625q0.140625 0.1875 0.4375 0.3125q0.171875 0.0625 1.015625 0.28125q1.21875 0.328125 1.6875 0.53125q0.484375 0.203125 0.75 0.609375q0.28125 0.390625 0.28125 0.96875q0 0.578125 -0.34375 1.078125q-0.328125 0.5 -0.953125 0.78125q-0.625 0.28125 -1.421875 0.28125q-1.3125 0 -2.0 -0.546875q-0.6875 -0.546875 -0.875 -1.625zm7.1171875 -5.96875l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.3516846 0l0 -0.921875l4.296875 -4.9375q-0.734375 0.046875 -1.296875 0.046875l-2.734375 0l0 -0.921875l5.5 0l0 0.75l-3.640625 4.28125l-0.71875 0.78125q0.78125 -0.0625 1.453125 -0.0625l3.109375 0l0 0.984375l-5.96875 0zm11.8828125 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm16.271729 -1.453125l-6.15625 0l0 -1.0625l6.15625 0l0 1.0625zm0 2.828125l-6.15625 0l0 -1.078125l6.15625 0l0 1.078125zm6.908264 -2.40625q-0.703125 -0.265625 -1.046875 -0.734375q-0.34375 -0.484375 -0.34375 -1.15625q0 -1.015625 0.71875 -1.703125q0.734375 -0.703125 1.953125 -0.703125q1.21875 0 1.953125 0.71875q0.75 0.703125 0.75 1.71875q0 0.640625 -0.34375 1.125q-0.34375 0.46875 -1.03125 0.734375q0.859375 0.28125 1.296875 0.90625q0.453125 0.625 0.453125 1.484375q0 1.1875 -0.84375 2.0q-0.84375 0.8125 -2.21875 0.8125q-1.375 0 -2.21875 -0.8125q-0.84375 -0.8125 -0.84375 -2.03125q0 -0.90625 0.453125 -1.515625q0.46875 -0.625 1.3125 -0.84375zm-0.234375 -1.9375q0 0.65625 0.421875 1.078125q0.4375 0.421875 1.109375 0.421875q0.671875 0 1.09375 -0.40625q0.421875 -0.421875 0.421875 -1.03125q0 -0.625 -0.4375 -1.046875q-0.4375 -0.4375 -1.078125 -0.4375q-0.65625 0 -1.09375 0.421875q-0.4375 0.421875 -0.4375 1.0zm-0.359375 4.296875q0 0.484375 0.234375 0.953125q0.234375 0.453125 0.6875 0.703125q0.453125 0.25 0.984375 0.25q0.8125 0 1.34375 -0.515625q0.53125 -0.53125 0.53125 -1.34375q0 -0.828125 -0.546875 -1.359375q-0.546875 -0.546875 -1.375 -0.546875q-0.796875 0 -1.328125 0.53125q-0.53125 0.53125 -0.53125 1.328125zm10.553101 2.6875l-1.140625 0l0 -7.28125q-0.421875 0.390625 -1.09375 0.796875q-0.65625 0.390625 -1.1875 0.578125l0 -1.109375q0.953125 -0.4375 1.671875 -1.078125q0.71875 -0.640625 1.015625 -1.25l0.734375 0l0 9.34375zm3.2874756 -2.15625l1.09375 -0.09375q0.140625 0.765625 0.53125 1.125q0.390625 0.34375 1.015625 0.34375q0.515625 0 0.90625 -0.234375q0.40625 -0.25 0.65625 -0.640625q0.265625 -0.40625 0.421875 -1.09375q0.171875 -0.6875 0.171875 -1.40625q0 -0.078125 0 -0.21875q-0.34375 0.546875 -0.9375 0.890625q-0.59375 0.328125 -1.28125 0.328125q-1.15625 0 -1.953125 -0.828125q-0.796875 -0.84375 -0.796875 -2.21875q0 -1.421875 0.828125 -2.28125q0.828125 -0.859375 2.09375 -0.859375q0.90625 0 1.65625 0.5q0.75 0.484375 1.140625 1.390625q0.390625 0.890625 0.390625 2.609375q0 1.78125 -0.390625 2.84375q-0.375 1.046875 -1.140625 1.609375q-0.765625 0.546875 -1.796875 0.546875q-1.09375 0 -1.796875 -0.59375q-0.6875 -0.609375 -0.8125 -1.71875zm4.671875 -4.109375q0 -0.984375 -0.53125 -1.546875q-0.515625 -0.578125 -1.25 -0.578125q-0.765625 0 -1.328125 0.625q-0.5625 0.609375 -0.5625 1.609375q0 0.875 0.53125 1.4375q0.53125 0.546875 1.328125 0.546875q0.796875 0 1.296875 -0.546875q0.515625 -0.5625 0.515625 -1.546875zm8.568726 5.171875l0 1.09375l-6.15625 0q-0.015625 -0.40625 0.140625 -0.796875q0.234375 -0.625 0.75 -1.234375q0.515625 -0.609375 1.5 -1.40625q1.515625 -1.25 2.046875 -1.96875q0.53125 -0.734375 0.53125 -1.375q0 -0.6875 -0.484375 -1.140625q-0.484375 -0.46875 -1.265625 -0.46875q-0.828125 0 -1.328125 0.5q-0.484375 0.484375 -0.5 1.359375l-1.171875 -0.125q0.125 -1.3125 0.90625 -2.0q0.78125 -0.6875 2.109375 -0.6875q1.34375 0 2.125 0.75q0.78125 0.734375 0.78125 1.828125q0 0.5625 -0.234375 1.109375q-0.21875 0.53125 -0.75 1.140625q-0.53125 0.59375 -1.765625 1.625q-1.03125 0.859375 -1.328125 1.171875q-0.28125 0.3125 -0.46875 0.625l4.5625 0z" fill-rule="nonzero"></path><path fill="#000000" d="m576.70874 254.86037l0 -1.296875l1.296875 0l0 1.296875l-1.296875 0zm3.703003 0l0 -1.296875l1.296875 0l0 1.296875l-1.296875 0zm3.703003 0l0 -1.296875l1.296875 0l0 1.296875l-1.296875 0z" fill-rule="nonzero"></path><path fill="#cfe2f3" d="m540.3686 272.76642c4.947693 0 8.958618 -4.010956 8.958618 -8.958679l-8.958618 0c2.473877 0 4.479309 -2.0054626 4.479309 -4.4793396c0 -2.4738464 -2.0054321 -4.4793243 -4.479309 -4.4793243l8.958618 0l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.96497 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626l0 0c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679zm26.875977 -134.37993l0 0c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243z" fill-rule="evenodd"></path><path fill="#a5b4c2" d="m567.24457 138.38649l0 0c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243zm-17.917358 125.42125c0 4.9477234 -4.0109253 8.958679 -8.958618 8.958679c-4.947754 0 -8.958679 -4.010956 -8.958679 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958679 -8.958664l0 0c2.473877 0 4.479309 2.005478 4.479309 4.4793243c0 2.473877 -2.0054321 4.4793396 -4.479309 4.4793396z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m549.3272 254.84908l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.96497 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626l0 0c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679l-152.9649 0c-4.947754 0 -8.958679 -4.010956 -8.958679 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958679 -8.958664zm8.958679 -125.42125l0 0c4.947754 0 8.958679 4.0109253 8.958679 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243l8.958679 0m135.0476 8.958649l-144.00629 0m-17.917297 107.50394l0 0c2.473877 0 4.479309 2.005478 4.479309 4.4793243c0 2.473877 -2.0054321 4.4793396 -4.479309 4.4793396l8.958618 0m-8.958618 8.958679c4.947693 0 8.958618 -4.010956 8.958618 -8.958679l0 -8.958664" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m549.3272 254.84908l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.96497 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626l0 0c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679l-152.9649 0c-4.947754 0 -8.958679 -4.010956 -8.958679 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958679 -8.958664zm8.958679 -125.42125l0 0c4.947754 0 8.958679 4.0109253 8.958679 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243l8.958679 0m135.0476 8.958649l-144.00629 0m-17.917297 107.50394l0 0c2.473877 0 4.479309 2.005478 4.479309 4.4793243c0 2.473877 -2.0054321 4.4793396 -4.479309 4.4793396l8.958618 0m-8.958618 8.958679c4.947693 0 8.958618 -4.010956 8.958618 -8.958679l0 -8.958664" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m580.169 158.97638l91.28137 0l0 38.23622l-91.28137 0z" fill-rule="evenodd"></path><path fill="#000000" d="m606.6378 183.95448l0 -1.25q-0.453125 0.671875 -1.1875 1.0625q-0.734375 0.375 -1.5625 0.375q-0.828125 0 -1.5 -0.359375q-0.65625 -0.375 -0.953125 -1.03125q-0.296875 -0.671875 -0.296875 -1.84375l0 -5.25l2.1875 0l0 3.8125q0 1.75 0.125 2.140625q0.125 0.390625 0.4375 0.625q0.328125 0.234375 0.8125 0.234375q0.5625 0 1.0 -0.3125q0.453125 -0.3125 0.609375 -0.765625q0.171875 -0.453125 0.171875 -2.234375l0 -3.5l2.203125 0l0 8.296875l-2.046875 0zm4.3203125 0l0 -11.453125l2.1875 0l0 11.453125l-2.1875 0zm4.4453125 -9.421875l0 -2.03125l2.1875 0l0 2.03125l-2.1875 0zm0 9.421875l0 -8.296875l2.1875 0l0 8.296875l-2.1875 0zm4.2734375 -8.296875l2.03125 0l0 1.125q1.078125 -1.3125 2.578125 -1.3125q0.796875 0 1.375 0.328125q0.59375 0.328125 0.96875 0.984375q0.546875 -0.65625 1.171875 -0.984375q0.640625 -0.328125 1.359375 -0.328125q0.921875 0 1.546875 0.375q0.640625 0.359375 0.953125 1.078125q0.21875 0.53125 0.21875 1.71875l0 5.3125l-2.1875 0l0 -4.75q0 -1.234375 -0.234375 -1.59375q-0.296875 -0.46875 -0.9375 -0.46875q-0.453125 0 -0.859375 0.28125q-0.40625 0.28125 -0.59375 0.828125q-0.171875 0.546875 -0.171875 1.71875l0 3.984375l-2.203125 0l0 -4.546875q0 -1.21875 -0.125 -1.5625q-0.109375 -0.359375 -0.359375 -0.53125q-0.234375 -0.171875 -0.65625 -0.171875q-0.515625 0 -0.921875 0.28125q-0.40625 0.265625 -0.578125 0.78125q-0.171875 0.515625 -0.171875 1.71875l0 4.03125l-2.203125 0l0 -8.296875zm14.3984375 -1.125l0 -2.03125l2.1875 0l0 2.03125l-2.1875 0zm0 9.421875l0 -8.296875l2.1875 0l0 8.296875l-2.1875 0zm8.2421875 -8.296875l0 1.75l-1.5 0l0 3.34375q0 1.015625 0.046875 1.1875q0.046875 0.15625 0.1875 0.265625q0.15625 0.109375 0.375 0.109375q0.3125 0 0.890625 -0.203125l0.1875 1.703125q-0.765625 0.328125 -1.734375 0.328125q-0.59375 0 -1.078125 -0.203125q-0.46875 -0.203125 -0.703125 -0.515625q-0.21875 -0.3125 -0.296875 -0.859375q-0.078125 -0.375 -0.078125 -1.546875l0 -3.609375l-1.0 0l0 -1.75l1.0 0l0 -1.65625l2.203125 -1.28125l0 2.9375l1.5 0zm0.75 5.921875l2.203125 -0.328125q0.140625 0.640625 0.5625 0.96875q0.4375 0.328125 1.21875 0.328125q0.84375 0 1.28125 -0.3125q0.28125 -0.21875 0.28125 -0.578125q0 -0.25 -0.15625 -0.421875q-0.15625 -0.15625 -0.734375 -0.28125q-2.65625 -0.59375 -3.359375 -1.078125q-0.984375 -0.671875 -0.984375 -1.859375q0 -1.078125 0.84375 -1.8125q0.859375 -0.734375 2.640625 -0.734375q1.703125 0 2.53125 0.5625q0.828125 0.546875 1.140625 1.625l-2.0625 0.390625q-0.140625 -0.484375 -0.515625 -0.734375q-0.359375 -0.265625 -1.046875 -0.265625q-0.875 0 -1.25 0.234375q-0.25 0.171875 -0.25 0.453125q0 0.234375 0.21875 0.390625q0.296875 0.21875 2.046875 0.625q1.765625 0.390625 2.453125 0.96875q0.6875 0.59375 0.6875 1.640625q0 1.140625 -0.953125 1.96875q-0.953125 0.8125 -2.8125 0.8125q-1.703125 0 -2.6875 -0.6875q-0.984375 -0.6875 -1.296875 -1.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m566.68335 206.75328l126.56848 0l0 54.61418l-126.56848 0z" fill-rule="evenodd"></path><path fill="#000000" d="m576.0427 221.941q0 -1.578125 0.890625 -2.34375q0.734375 -0.625 1.796875 -0.625q1.171875 0 1.90625 0.765625q0.75 0.765625 0.75 2.125q0 1.109375 -0.328125 1.75q-0.328125 0.625 -0.96875 0.96875q-0.625 0.34375 -1.359375 0.34375q-1.203125 0 -1.953125 -0.765625q-0.734375 -0.765625 -0.734375 -2.21875zm1.0 0q0 1.109375 0.46875 1.65625q0.484375 0.53125 1.21875 0.53125q0.71875 0 1.1875 -0.546875q0.484375 -0.546875 0.484375 -1.671875q0 -1.046875 -0.484375 -1.59375q-0.484375 -0.546875 -1.1875 -0.546875q-0.734375 0 -1.21875 0.546875q-0.46875 0.53125 -0.46875 1.625zm5.2858276 5.046875l0 -7.890625l0.890625 0l0 0.734375q0.3125 -0.421875 0.703125 -0.640625q0.390625 -0.21875 0.953125 -0.21875q0.71875 0 1.28125 0.375q0.5625 0.375 0.84375 1.0625q0.28125 0.671875 0.28125 1.5q0 0.875 -0.3125 1.578125q-0.3125 0.6875 -0.921875 1.0625q-0.59375 0.375 -1.25 0.375q-0.484375 0 -0.875 -0.203125q-0.375 -0.203125 -0.625 -0.515625l0 2.78125l-0.96875 0zm0.875 -5.0q0 1.09375 0.453125 1.625q0.453125 0.515625 1.078125 0.515625q0.640625 0 1.09375 -0.53125q0.46875 -0.546875 0.46875 -1.703125q0 -1.078125 -0.453125 -1.625q-0.4375 -0.546875 -1.0625 -0.546875q-0.625 0 -1.109375 0.578125q-0.46875 0.578125 -0.46875 1.6875zm8.957764 0.96875l1.0 0.125q-0.234375 0.875 -0.875 1.359375q-0.640625 0.484375 -1.625 0.484375q-1.25 0 -1.984375 -0.765625q-0.734375 -0.765625 -0.734375 -2.15625q0 -1.453125 0.734375 -2.234375q0.75 -0.796875 1.921875 -0.796875q1.15625 0 1.875 0.78125q0.71875 0.765625 0.71875 2.1875q0 0.078125 0 0.25l-4.25 0q0.046875 0.9375 0.515625 1.4375q0.484375 0.5 1.203125 0.5q0.53125 0 0.90625 -0.265625q0.375 -0.28125 0.59375 -0.90625zm-3.171875 -1.5625l3.1875 0q-0.0625 -0.71875 -0.359375 -1.078125q-0.46875 -0.546875 -1.203125 -0.546875q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.5 1.171875zm5.1921387 3.40625l0 -5.703125l0.875 0l0 0.8125q0.625 -0.9375 1.8125 -0.9375q0.515625 0 0.953125 0.1875q0.4375 0.171875 0.640625 0.484375q0.21875 0.296875 0.3125 0.703125q0.046875 0.28125 0.046875 0.953125l0 3.5l-0.96875 0l0 -3.46875q0 -0.59375 -0.109375 -0.875q-0.109375 -0.296875 -0.40625 -0.46875q-0.28125 -0.1875 -0.671875 -0.1875q-0.609375 0 -1.0625 0.390625q-0.453125 0.390625 -0.453125 1.5l0 3.109375l-0.96875 0zm9.121521 0l0 -4.953125l-0.84375 0l0 -0.75l0.84375 0l0 -0.609375q0 -0.578125 0.109375 -0.859375q0.140625 -0.375 0.484375 -0.609375q0.359375 -0.234375 0.984375 -0.234375q0.40625 0 0.90625 0.109375l-0.140625 0.84375q-0.3125 -0.0625 -0.578125 -0.0625q-0.4375 0 -0.625 0.1875q-0.171875 0.1875 -0.171875 0.703125l0 0.53125l1.109375 0l0 0.75l-1.109375 0l0 4.953125l-0.96875 0zm2.7418823 -6.765625l0 -1.109375l0.96875 0l0 1.109375l-0.96875 0zm0 6.765625l0 -5.703125l0.96875 0l0 5.703125l-0.96875 0zm2.3362427 0l0 -7.875l0.96875 0l0 7.875l-0.96875 0zm6.2893677 -1.84375l1.0 0.125q-0.234375 0.875 -0.875 1.359375q-0.640625 0.484375 -1.625 0.484375q-1.25 0 -1.984375 -0.765625q-0.734375 -0.765625 -0.734375 -2.15625q0 -1.453125 0.734375 -2.234375q0.75 -0.796875 1.921875 -0.796875q1.15625 0 1.875 0.78125q0.71875 0.765625 0.71875 2.1875q0 0.078125 0 0.25l-4.25 0q0.046875 0.9375 0.515625 1.4375q0.484375 0.5 1.203125 0.5q0.53125 0 0.90625 -0.265625q0.375 -0.28125 0.59375 -0.90625zm-3.171875 -1.5625l3.1875 0q-0.0625 -0.71875 -0.359375 -1.078125q-0.46875 -0.546875 -1.203125 -0.546875q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.5 1.171875zm4.8170776 1.703125l0.953125 -0.15625q0.078125 0.578125 0.4375 0.890625q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.640625q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.484375 -0.28125 0.90625q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.375zm13.757568 -2.921875l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm0 2.390625l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm7.464966 2.234375l-0.96875 0l0 -6.15625q-0.34375 0.328125 -0.90625 0.671875q-0.5625 0.328125 -1.015625 0.484375l0 -0.9375q0.8125 -0.375 1.40625 -0.90625q0.609375 -0.546875 0.859375 -1.0625l0.625 0l0 7.90625zm2.2858887 -3.890625q0 -1.390625 0.28125 -2.234375q0.296875 -0.859375 0.859375 -1.3125q0.578125 -0.46875 1.4375 -0.46875q0.625 0 1.09375 0.265625q0.484375 0.25 0.796875 0.734375q0.3125 0.46875 0.484375 1.171875q0.1875 0.6875 0.1875 1.84375q0 1.390625 -0.296875 2.25q-0.28125 0.84375 -0.84375 1.3125q-0.5625 0.46875 -1.421875 0.46875q-1.140625 0 -1.796875 -0.828125q-0.78125 -0.984375 -0.78125 -3.203125zm1.0 0q0 1.953125 0.453125 2.59375q0.453125 0.640625 1.125 0.640625q0.65625 0 1.109375 -0.640625q0.453125 -0.65625 0.453125 -2.59375q0 -1.9375 -0.453125 -2.578125q-0.453125 -0.640625 -1.125 -0.640625q-0.671875 0 -1.0625 0.5625q-0.5 0.71875 -0.5 2.65625zm4.9264526 0q0 -1.390625 0.28125 -2.234375q0.296875 -0.859375 0.859375 -1.3125q0.578125 -0.46875 1.4375 -0.46875q0.625 0 1.09375 0.265625q0.484375 0.25 0.796875 0.734375q0.3125 0.46875 0.484375 1.171875q0.1875 0.6875 0.1875 1.84375q0 1.390625 -0.296875 2.25q-0.28125 0.84375 -0.84375 1.3125q-0.5625 0.46875 -1.421875 0.46875q-1.140625 0 -1.796875 -0.828125q-0.78125 -0.984375 -0.78125 -3.203125zm1.0 0q0 1.953125 0.453125 2.59375q0.453125 0.640625 1.125 0.640625q0.65625 0 1.109375 -0.640625q0.453125 -0.65625 0.453125 -2.59375q0 -1.9375 -0.453125 -2.578125q-0.453125 -0.640625 -1.125 -0.640625q-0.671875 0 -1.0625 0.5625q-0.5 0.71875 -0.5 2.65625zm4.9265137 0q0 -1.390625 0.28125 -2.234375q0.296875 -0.859375 0.859375 -1.3125q0.578125 -0.46875 1.4375 -0.46875q0.625 0 1.09375 0.265625q0.484375 0.25 0.796875 0.734375q0.3125 0.46875 0.484375 1.171875q0.1875 0.6875 0.1875 1.84375q0 1.390625 -0.296875 2.25q-0.28125 0.84375 -0.84375 1.3125q-0.5625 0.46875 -1.421875 0.46875q-1.140625 0 -1.796875 -0.828125q-0.78125 -0.984375 -0.78125 -3.203125zm1.0 0q0 1.953125 0.453125 2.59375q0.453125 0.640625 1.125 0.640625q0.65625 0 1.109375 -0.640625q0.453125 -0.65625 0.453125 -2.59375q0 -1.9375 -0.453125 -2.578125q-0.453125 -0.640625 -1.125 -0.640625q-0.671875 0 -1.0625 0.5625q-0.5 0.71875 -0.5 2.65625z" fill-rule="nonzero"></path><path fill="#000000" d="m576.0271 236.09724l0.953125 -0.15625q0.078125 0.578125 0.4375 0.890625q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.640625q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.484375 -0.28125 0.90625q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.375zm7.828125 0.84375l0.125 0.84375q-0.40625 0.09375 -0.71875 0.09375q-0.53125 0 -0.828125 -0.171875q-0.28125 -0.171875 -0.40625 -0.4375q-0.109375 -0.265625 -0.109375 -1.140625l0 -3.28125l-0.71875 0l0 -0.75l0.71875 0l0 -1.40625l0.953125 -0.59375l0 2.0l0.984375 0l0 0.75l-0.984375 0l0 3.34375q0 0.40625 0.046875 0.53125q0.0625 0.109375 0.171875 0.1875q0.125 0.0625 0.328125 0.0625q0.171875 0 0.4375 -0.03125zm4.5700073 0.15625q-0.546875 0.453125 -1.046875 0.640625q-0.484375 0.1875 -1.0625 0.1875q-0.9375 0 -1.453125 -0.453125q-0.5 -0.46875 -0.5 -1.171875q0 -0.421875 0.1875 -0.765625q0.203125 -0.34375 0.5 -0.546875q0.3125 -0.21875 0.703125 -0.328125q0.28125 -0.078125 0.859375 -0.140625q1.171875 -0.140625 1.71875 -0.34375q0.015625 -0.1875 0.015625 -0.25q0 -0.59375 -0.28125 -0.828125q-0.359375 -0.328125 -1.09375 -0.328125q-0.6875 0 -1.015625 0.234375q-0.3125 0.234375 -0.46875 0.84375l-0.953125 -0.125q0.125 -0.609375 0.421875 -0.984375q0.296875 -0.375 0.859375 -0.5625q0.5625 -0.203125 1.296875 -0.203125q0.734375 0 1.1875 0.171875q0.453125 0.171875 0.65625 0.4375q0.21875 0.25 0.3125 0.640625q0.046875 0.25 0.046875 0.90625l0 1.28125q0 1.34375 0.0625 1.703125q0.0625 0.359375 0.25 0.6875l-1.015625 0q-0.15625 -0.296875 -0.1875 -0.703125zm-0.09375 -2.15625q-0.515625 0.21875 -1.578125 0.359375q-0.59375 0.09375 -0.84375 0.203125q-0.234375 0.09375 -0.375 0.3125q-0.140625 0.203125 -0.140625 0.453125q0 0.390625 0.296875 0.65625q0.296875 0.25 0.859375 0.25q0.5625 0 0.984375 -0.25q0.4375 -0.25 0.65625 -0.671875q0.140625 -0.328125 0.140625 -0.96875l0 -0.34375zm6.0202637 0.765625l0.9375 0.125q-0.140625 0.984375 -0.796875 1.546875q-0.640625 0.546875 -1.5625 0.546875q-1.171875 0 -1.890625 -0.765625q-0.703125 -0.765625 -0.703125 -2.1875q0 -0.921875 0.296875 -1.609375q0.3125 -0.703125 0.9375 -1.046875q0.625 -0.34375 1.359375 -0.34375q0.921875 0 1.515625 0.46875q0.59375 0.46875 0.765625 1.328125l-0.953125 0.140625q-0.125 -0.5625 -0.46875 -0.84375q-0.34375 -0.296875 -0.828125 -0.296875q-0.71875 0 -1.1875 0.53125q-0.453125 0.515625 -0.453125 1.640625q0 1.15625 0.4375 1.671875q0.4375 0.515625 1.15625 0.515625q0.5625 0 0.9375 -0.34375q0.390625 -0.34375 0.5 -1.078125zm1.609375 2.09375l0 -7.875l0.96875 0l0 4.484375l2.28125 -2.3125l1.25 0l-2.171875 2.109375l2.390625 3.59375l-1.1875 0l-1.890625 -2.921875l-0.671875 0.65625l0 2.265625l-0.96875 0zm7.8981323 -1.703125l0.953125 -0.15625q0.078125 0.578125 0.4375 0.890625q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.640625q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.484375 -0.28125 0.90625q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.375zm5.71875 -5.0625l0 -1.109375l0.96875 0l0 1.109375l-0.96875 0zm0 6.765625l0 -5.703125l0.96875 0l0 5.703125l-0.96875 0zm1.8518677 0l0 -0.78125l3.625 -4.171875q-0.609375 0.03125 -1.09375 0.03125l-2.3125 0l0 -0.78125l4.65625 0l0 0.640625l-3.09375 3.625l-0.59375 0.65625q0.65625 -0.046875 1.21875 -0.046875l2.640625 0l0 0.828125l-5.046875 0zm9.734375 -1.84375l1.0 0.125q-0.234375 0.875 -0.875 1.359375q-0.640625 0.484375 -1.625 0.484375q-1.25 0 -1.984375 -0.765625q-0.734375 -0.765625 -0.734375 -2.15625q0 -1.453125 0.734375 -2.234375q0.75 -0.796875 1.921875 -0.796875q1.15625 0 1.875 0.78125q0.71875 0.765625 0.71875 2.1875q0 0.078125 0 0.25l-4.25 0q0.046875 0.9375 0.515625 1.4375q0.484375 0.5 1.203125 0.5q0.53125 0 0.90625 -0.265625q0.375 -0.28125 0.59375 -0.90625zm-3.171875 -1.5625l3.1875 0q-0.0625 -0.71875 -0.359375 -1.078125q-0.46875 -0.546875 -1.203125 -0.546875q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.5 1.171875zm13.246521 -1.21875l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm0 2.390625l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm5.308716 -2.03125q-0.59375 -0.21875 -0.890625 -0.625q-0.28125 -0.421875 -0.28125 -0.984375q0 -0.859375 0.609375 -1.4375q0.625 -0.59375 1.65625 -0.59375q1.03125 0 1.65625 0.609375q0.625 0.59375 0.625 1.453125q0 0.546875 -0.296875 0.953125q-0.28125 0.40625 -0.859375 0.625q0.71875 0.234375 1.09375 0.765625q0.390625 0.515625 0.390625 1.25q0 1.015625 -0.71875 1.703125q-0.71875 0.6875 -1.875 0.6875q-1.171875 0 -1.890625 -0.6875q-0.703125 -0.703125 -0.703125 -1.734375q0 -0.765625 0.375 -1.28125q0.390625 -0.515625 1.109375 -0.703125zm-0.1875 -1.640625q0 0.5625 0.359375 0.921875q0.359375 0.34375 0.9375 0.34375q0.5625 0 0.90625 -0.34375q0.359375 -0.359375 0.359375 -0.875q0 -0.53125 -0.375 -0.890625q-0.359375 -0.359375 -0.90625 -0.359375q-0.546875 0 -0.921875 0.359375q-0.359375 0.34375 -0.359375 0.84375zm-0.3125 3.640625q0 0.40625 0.1875 0.796875q0.203125 0.390625 0.59375 0.609375q0.390625 0.203125 0.828125 0.203125q0.703125 0 1.140625 -0.4375q0.453125 -0.453125 0.453125 -1.140625q0 -0.703125 -0.46875 -1.15625q-0.453125 -0.453125 -1.15625 -0.453125q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.453125 1.125zm8.582764 2.265625l-0.96875 0l0 -6.15625q-0.34375 0.328125 -0.90625 0.671875q-0.5625 0.328125 -1.015625 0.484375l0 -0.9375q0.8125 -0.375 1.40625 -0.90625q0.609375 -0.546875 0.859375 -1.0625l0.625 0l0 7.90625zm2.4420776 -1.828125l0.921875 -0.078125q0.125 0.65625 0.453125 0.953125q0.328125 0.296875 0.859375 0.296875q0.4375 0 0.765625 -0.203125q0.34375 -0.203125 0.5625 -0.546875q0.21875 -0.34375 0.359375 -0.921875q0.140625 -0.578125 0.140625 -1.1875q0 -0.0625 0 -0.1875q-0.296875 0.453125 -0.796875 0.75q-0.5 0.28125 -1.09375 0.28125q-0.96875 0 -1.65625 -0.703125q-0.671875 -0.71875 -0.671875 -1.875q0 -1.203125 0.703125 -1.921875q0.71875 -0.734375 1.78125 -0.734375q0.765625 0 1.390625 0.421875q0.640625 0.40625 0.96875 1.171875q0.34375 0.765625 0.34375 2.21875q0 1.5 -0.328125 2.40625q-0.328125 0.890625 -0.984375 1.359375q-0.640625 0.46875 -1.515625 0.46875q-0.921875 0 -1.515625 -0.515625q-0.578125 -0.515625 -0.6875 -1.453125zm3.953125 -3.46875q0 -0.828125 -0.453125 -1.3125q-0.4375 -0.5 -1.0625 -0.5q-0.640625 0 -1.125 0.53125q-0.46875 0.53125 -0.46875 1.359375q0 0.75 0.453125 1.21875q0.453125 0.46875 1.125 0.46875q0.671875 0 1.09375 -0.46875q0.4375 -0.46875 0.4375 -1.296875zm6.8952637 4.375l0 0.921875l-5.203125 0q0 -0.34375 0.125 -0.671875q0.1875 -0.53125 0.625 -1.046875q0.4375 -0.515625 1.265625 -1.1875q1.28125 -1.0625 1.734375 -1.671875q0.453125 -0.609375 0.453125 -1.15625q0 -0.578125 -0.40625 -0.96875q-0.40625 -0.40625 -1.078125 -0.40625q-0.6875 0 -1.109375 0.421875q-0.421875 0.421875 -0.421875 1.15625l-1.0 -0.09375q0.109375 -1.109375 0.765625 -1.6875q0.671875 -0.59375 1.796875 -0.59375q1.125 0 1.78125 0.625q0.671875 0.625 0.671875 1.5625q0 0.46875 -0.203125 0.9375q-0.1875 0.453125 -0.640625 0.953125q-0.4375 0.5 -1.484375 1.390625q-0.875 0.71875 -1.125 0.984375q-0.234375 0.265625 -0.40625 0.53125l3.859375 0z" fill-rule="nonzero"></path><path fill="#000000" d="m576.68335 250.80037l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0zm2.9606323 0l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0zm2.9606323 0l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0z" fill-rule="nonzero"></path><path fill="#cfe2f3" d="m745.3056 272.76642c4.947693 0 8.958618 -4.010956 8.958618 -8.958679l-8.958618 0c2.473816 0 4.479309 -2.0054626 4.479309 -4.4793396c0 -2.4738464 -2.0054932 -4.4793243 -4.479309 -4.4793243l8.958618 0l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.96497 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626l0 0c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679zm26.875977 -134.37993l0 0c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243z" fill-rule="evenodd"></path><path fill="#a5b4c2" d="m772.1816 138.38649l0 0c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243zm-17.917358 125.42125c0 4.9477234 -4.0109253 8.958679 -8.958618 8.958679c-4.947754 0 -8.958679 -4.010956 -8.958679 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958679 -8.958664l0 0c2.473816 0 4.479309 2.005478 4.479309 4.4793243c0 2.473877 -2.0054932 4.4793396 -4.479309 4.4793396z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m754.2642 254.84908l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.96497 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626l0 0c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679l-152.9649 0c-4.947754 0 -8.958679 -4.010956 -8.958679 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958679 -8.958664zm8.958679 -125.42125l0 0c4.947754 0 8.958679 4.0109253 8.958679 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243l8.958679 0m135.0476 8.958649l-144.00629 0m-17.917297 107.50394l0 0c2.473816 0 4.479309 2.005478 4.479309 4.4793243c0 2.473877 -2.0054932 4.4793396 -4.479309 4.4793396l8.958618 0m-8.958618 8.958679c4.947693 0 8.958618 -4.010956 8.958618 -8.958679l0 -8.958664" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m754.2642 254.84908l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.96497 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626l0 0c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679l-152.9649 0c-4.947754 0 -8.958679 -4.010956 -8.958679 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958679 -8.958664zm8.958679 -125.42125l0 0c4.947754 0 8.958679 4.0109253 8.958679 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243l8.958679 0m135.0476 8.958649l-144.00629 0m-17.917297 107.50394l0 0c2.473816 0 4.479309 2.005478 4.479309 4.4793243c0 2.473877 -2.0054932 4.4793396 -4.479309 4.4793396l8.958618 0m-8.958618 8.958679c4.947693 0 8.958618 -4.010956 8.958618 -8.958679l0 -8.958664" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m757.65875 158.97638l144.26672 0l0 38.23622l-144.26672 0z" fill-rule="evenodd"></path><path fill="#000000" d="m787.9562 178.11073l-2.171875 0.390625q-0.109375 -0.65625 -0.5 -0.984375q-0.375 -0.328125 -1.0 -0.328125q-0.8125 0 -1.3125 0.578125q-0.484375 0.5625 -0.484375 1.890625q0 1.46875 0.5 2.078125q0.5 0.609375 1.328125 0.609375q0.625 0 1.015625 -0.34375q0.40625 -0.359375 0.578125 -1.234375l2.15625 0.375q-0.34375 1.484375 -1.296875 2.25q-0.953125 0.75 -2.546875 0.75q-1.828125 0 -2.90625 -1.140625q-1.078125 -1.15625 -1.078125 -3.1875q0 -2.0625 1.078125 -3.203125q1.09375 -1.140625 2.9375 -1.140625q1.515625 0 2.40625 0.65625q0.90625 0.640625 1.296875 1.984375zm1.4609375 6.390625l2.5 0.3125q0.0625 0.4375 0.296875 0.59375q0.3125 0.234375 0.984375 0.234375q0.859375 0 1.28125 -0.25q0.296875 -0.171875 0.4375 -0.5625q0.109375 -0.265625 0.109375 -1.015625l0 -1.203125q-0.984375 1.34375 -2.484375 1.34375q-1.671875 0 -2.65625 -1.421875q-0.765625 -1.109375 -0.765625 -2.78125q0 -2.078125 1.0 -3.171875q1.015625 -1.109375 2.5 -1.109375q1.546875 0 2.546875 1.34375l0 -1.15625l2.046875 0l0 7.4375q0 1.484375 -0.25 2.203125q-0.234375 0.734375 -0.671875 1.140625q-0.4375 0.421875 -1.171875 0.65625q-0.71875 0.234375 -1.84375 0.234375q-2.109375 0 -3.0 -0.734375q-0.875 -0.71875 -0.875 -1.828125q0 -0.109375 0.015625 -0.265625zm1.953125 -4.875q0 1.328125 0.515625 1.9375q0.515625 0.609375 1.265625 0.609375q0.796875 0 1.34375 -0.625q0.5625 -0.625 0.5625 -1.859375q0 -1.296875 -0.53125 -1.921875q-0.53125 -0.625 -1.34375 -0.625q-0.78125 0 -1.296875 0.625q-0.515625 0.609375 -0.515625 1.859375zm10.1171875 4.328125l-2.1875 0l0 -8.296875l2.03125 0l0 1.171875q0.53125 -0.828125 0.9375 -1.09375q0.421875 -0.265625 0.953125 -0.265625q0.75 0 1.453125 0.40625l-0.6875 1.921875q-0.546875 -0.359375 -1.03125 -0.359375q-0.453125 0 -0.78125 0.25q-0.3125 0.25 -0.5 0.921875q-0.1875 0.65625 -0.1875 2.78125l0 2.5625zm3.6171875 -4.265625q0 -1.09375 0.53125 -2.109375q0.546875 -1.03125 1.53125 -1.5625q1.0 -0.546875 2.21875 -0.546875q1.875 0 3.078125 1.21875q1.203125 1.21875 1.203125 3.09375q0 1.875 -1.21875 3.125q-1.203125 1.234375 -3.046875 1.234375q-1.140625 0 -2.1875 -0.515625q-1.03125 -0.515625 -1.578125 -1.515625q-0.53125 -1.0 -0.53125 -2.421875zm2.25 0.109375q0 1.234375 0.578125 1.890625q0.59375 0.65625 1.453125 0.65625q0.859375 0 1.4375 -0.65625q0.59375 -0.65625 0.59375 -1.90625q0 -1.21875 -0.59375 -1.875q-0.578125 -0.65625 -1.4375 -0.65625q-0.859375 0 -1.453125 0.65625q-0.578125 0.65625 -0.578125 1.890625zm13.4921875 4.15625l0 -1.25q-0.453125 0.671875 -1.1875 1.0625q-0.734375 0.375 -1.5625 0.375q-0.828125 0 -1.5 -0.359375q-0.65625 -0.375 -0.953125 -1.03125q-0.296875 -0.671875 -0.296875 -1.84375l0 -5.25l2.1875 0l0 3.8125q0 1.75 0.125 2.140625q0.125 0.390625 0.4375 0.625q0.328125 0.234375 0.8125 0.234375q0.5625 0 1.0 -0.3125q0.453125 -0.3125 0.609375 -0.765625q0.171875 -0.453125 0.171875 -2.234375l0 -3.5l2.203125 0l0 8.296875l-2.046875 0zm4.2578125 -8.296875l2.046875 0l0 1.21875q0.390625 -0.625 1.0625 -1.015625q0.6875 -0.390625 1.515625 -0.390625q1.453125 0 2.453125 1.140625q1.015625 1.125 1.015625 3.140625q0 2.078125 -1.015625 3.234375q-1.015625 1.15625 -2.46875 1.15625q-0.6875 0 -1.25 -0.265625q-0.546875 -0.28125 -1.171875 -0.953125l0 4.1875l-2.1875 0l0 -11.453125zm2.171875 4.0q0 1.40625 0.546875 2.078125q0.5625 0.65625 1.359375 0.65625q0.765625 0 1.265625 -0.609375q0.515625 -0.609375 0.515625 -2.015625q0 -1.296875 -0.53125 -1.921875q-0.515625 -0.640625 -1.296875 -0.640625q-0.796875 0 -1.328125 0.625q-0.53125 0.609375 -0.53125 1.828125zm12.109375 4.296875l0 -11.453125l2.1875 0l0 11.453125l-2.1875 0zm4.4453125 -9.421875l0 -2.03125l2.1875 0l0 2.03125l-2.1875 0zm0 9.421875l0 -8.296875l2.1875 0l0 8.296875l-2.1875 0zm4.2734375 -8.296875l2.03125 0l0 1.125q1.078125 -1.3125 2.578125 -1.3125q0.796875 0 1.375 0.328125q0.59375 0.328125 0.96875 0.984375q0.546875 -0.65625 1.171875 -0.984375q0.640625 -0.328125 1.359375 -0.328125q0.921875 0 1.546875 0.375q0.640625 0.359375 0.953125 1.078125q0.21875 0.53125 0.21875 1.71875l0 5.3125l-2.1875 0l0 -4.75q0 -1.234375 -0.234375 -1.59375q-0.296875 -0.46875 -0.9375 -0.46875q-0.453125 0 -0.859375 0.28125q-0.40625 0.28125 -0.59375 0.828125q-0.171875 0.546875 -0.171875 1.71875l0 3.984375l-2.203125 0l0 -4.546875q0 -1.21875 -0.125 -1.5625q-0.109375 -0.359375 -0.359375 -0.53125q-0.234375 -0.171875 -0.65625 -0.171875q-0.515625 0 -0.921875 0.28125q-0.40625 0.265625 -0.578125 0.78125q-0.171875 0.515625 -0.171875 1.71875l0 4.03125l-2.203125 0l0 -8.296875zm14.3984375 -1.125l0 -2.03125l2.1875 0l0 2.03125l-2.1875 0zm0 9.421875l0 -8.296875l2.1875 0l0 8.296875l-2.1875 0zm8.2421875 -8.296875l0 1.75l-1.5 0l0 3.34375q0 1.015625 0.046875 1.1875q0.046875 0.15625 0.1875 0.265625q0.15625 0.109375 0.375 0.109375q0.3125 0 0.890625 -0.203125l0.1875 1.703125q-0.765625 0.328125 -1.734375 0.328125q-0.59375 0 -1.078125 -0.203125q-0.46875 -0.203125 -0.703125 -0.515625q-0.21875 -0.3125 -0.296875 -0.859375q-0.078125 -0.375 -0.078125 -1.546875l0 -3.609375l-1.0 0l0 -1.75l1.0 0l0 -1.65625l2.203125 -1.28125l0 2.9375l1.5 0zm0.75 5.921875l2.203125 -0.328125q0.140625 0.640625 0.5625 0.96875q0.4375 0.328125 1.21875 0.328125q0.84375 0 1.28125 -0.3125q0.28125 -0.21875 0.28125 -0.578125q0 -0.25 -0.15625 -0.421875q-0.15625 -0.15625 -0.734375 -0.28125q-2.65625 -0.59375 -3.359375 -1.078125q-0.984375 -0.671875 -0.984375 -1.859375q0 -1.078125 0.84375 -1.8125q0.859375 -0.734375 2.640625 -0.734375q1.703125 0 2.53125 0.5625q0.828125 0.546875 1.140625 1.625l-2.0625 0.390625q-0.140625 -0.484375 -0.515625 -0.734375q-0.359375 -0.265625 -1.046875 -0.265625q-0.875 0 -1.25 0.234375q-0.25 0.171875 -0.25 0.453125q0 0.234375 0.21875 0.390625q0.296875 0.21875 2.046875 0.625q1.765625 0.390625 2.453125 0.96875q0.6875 0.59375 0.6875 1.640625q0 1.140625 -0.953125 1.96875q-0.953125 0.8125 -2.8125 0.8125q-1.703125 0 -2.6875 -0.6875q-0.984375 -0.6875 -1.296875 -1.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m753.92126 206.75328l151.81653 0l0 54.61418l-151.81653 0z" fill-rule="evenodd"></path><path fill="#000000" d="m763.64 205.30037l0 -5.703125l0.875 0l0 0.796875q0.265625 -0.421875 0.703125 -0.671875q0.453125 -0.25 1.015625 -0.25q0.640625 0 1.046875 0.265625q0.40625 0.25 0.578125 0.734375q0.671875 -1.0 1.75 -1.0q0.859375 0 1.3125 0.46875q0.453125 0.46875 0.453125 1.4375l0 3.921875l-0.953125 0l0 -3.59375q0 -0.578125 -0.09375 -0.828125q-0.09375 -0.265625 -0.34375 -0.421875q-0.25 -0.15625 -0.578125 -0.15625q-0.609375 0 -1.015625 0.40625q-0.390625 0.40625 -0.390625 1.28125l0 3.3125l-0.96875 0l0 -3.703125q0 -0.640625 -0.234375 -0.96875q-0.234375 -0.328125 -0.765625 -0.328125q-0.40625 0 -0.765625 0.21875q-0.34375 0.21875 -0.5 0.640625q-0.15625 0.40625 -0.15625 1.1875l0 2.953125l-0.96875 0zm12.782959 -1.84375l1.0 0.125q-0.234375 0.875 -0.875 1.359375q-0.640625 0.484375 -1.625 0.484375q-1.25 0 -1.984375 -0.765625q-0.734375 -0.765625 -0.734375 -2.15625q0 -1.453125 0.734375 -2.234375q0.75 -0.796875 1.921875 -0.796875q1.15625 0 1.875 0.78125q0.71875 0.765625 0.71875 2.1875q0 0.078125 0 0.25l-4.25 0q0.046875 0.9375 0.515625 1.4375q0.484375 0.5 1.203125 0.5q0.53125 0 0.90625 -0.265625q0.375 -0.28125 0.59375 -0.90625zm-3.171875 -1.5625l3.1875 0q-0.0625 -0.71875 -0.359375 -1.078125q-0.46875 -0.546875 -1.203125 -0.546875q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.5 1.171875zm5.1921387 3.40625l0 -5.703125l0.875 0l0 0.796875q0.265625 -0.421875 0.703125 -0.671875q0.453125 -0.25 1.015625 -0.25q0.640625 0 1.046875 0.265625q0.40625 0.25 0.578125 0.734375q0.671875 -1.0 1.75 -1.0q0.859375 0 1.3125 0.46875q0.453125 0.46875 0.453125 1.4375l0 3.921875l-0.953125 0l0 -3.59375q0 -0.578125 -0.09375 -0.828125q-0.09375 -0.265625 -0.34375 -0.421875q-0.25 -0.15625 -0.578125 -0.15625q-0.609375 0 -1.015625 0.40625q-0.390625 0.40625 -0.390625 1.28125l0 3.3125l-0.96875 0l0 -3.703125q0 -0.640625 -0.234375 -0.96875q-0.234375 -0.328125 -0.765625 -0.328125q-0.40625 0 -0.765625 0.21875q-0.34375 0.21875 -0.5 0.640625q-0.15625 0.40625 -0.15625 1.1875l0 2.953125l-0.96875 0zm8.517395 -2.859375q0 -1.578125 0.890625 -2.34375q0.734375 -0.625 1.796875 -0.625q1.171875 0 1.90625 0.765625q0.75 0.765625 0.75 2.125q0 1.109375 -0.328125 1.75q-0.328125 0.625 -0.96875 0.96875q-0.625 0.34375 -1.359375 0.34375q-1.203125 0 -1.953125 -0.765625q-0.734375 -0.765625 -0.734375 -2.21875zm1.0 0q0 1.109375 0.46875 1.65625q0.484375 0.53125 1.21875 0.53125q0.71875 0 1.1875 -0.546875q0.484375 -0.546875 0.484375 -1.671875q0 -1.046875 -0.484375 -1.59375q-0.484375 -0.546875 -1.1875 -0.546875q-0.734375 0 -1.21875 0.546875q-0.46875 0.53125 -0.46875 1.625zm5.2858276 2.859375l0 -5.703125l0.859375 0l0 0.859375q0.34375 -0.609375 0.625 -0.796875q0.28125 -0.1875 0.609375 -0.1875q0.5 0 1.0 0.3125l-0.328125 0.890625q-0.359375 -0.203125 -0.71875 -0.203125q-0.3125 0 -0.5625 0.1875q-0.25 0.1875 -0.359375 0.53125q-0.15625 0.515625 -0.15625 1.125l0 2.984375l-0.96875 0zm3.517395 2.203125l-0.109375 -0.90625q0.3125 0.078125 0.546875 0.078125q0.328125 0 0.515625 -0.109375q0.203125 -0.109375 0.3125 -0.296875q0.09375 -0.140625 0.296875 -0.71875q0.03125 -0.078125 0.09375 -0.234375l-2.171875 -5.71875l1.046875 0l1.1875 3.296875q0.234375 0.640625 0.40625 1.328125q0.171875 -0.671875 0.40625 -1.296875l1.21875 -3.328125l0.96875 0l-2.171875 5.796875q-0.34375 0.9375 -0.546875 1.296875q-0.25 0.484375 -0.59375 0.703125q-0.328125 0.21875 -0.78125 0.21875q-0.28125 0 -0.625 -0.109375zm5.640625 -2.203125l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0z" fill-rule="nonzero"></path><path fill="#000000" d="m775.467 218.30037l0 -7.875l0.96875 0l0 7.875l-0.96875 0zm2.3987427 -6.765625l0 -1.109375l0.96875 0l0 1.109375l-0.96875 0zm0 6.765625l0 -5.703125l0.96875 0l0 5.703125l-0.96875 0zm2.3518066 0l0 -5.703125l0.875 0l0 0.796875q0.265625 -0.421875 0.703125 -0.671875q0.453125 -0.25 1.015625 -0.25q0.640625 0 1.046875 0.265625q0.40625 0.25 0.578125 0.734375q0.671875 -1.0 1.75 -1.0q0.859375 0 1.3125 0.46875q0.453125 0.46875 0.453125 1.4375l0 3.921875l-0.953125 0l0 -3.59375q0 -0.578125 -0.09375 -0.828125q-0.09375 -0.265625 -0.34375 -0.421875q-0.25 -0.15625 -0.578125 -0.15625q-0.609375 0 -1.015625 0.40625q-0.390625 0.40625 -0.390625 1.28125l0 3.3125l-0.96875 0l0 -3.703125q0 -0.640625 -0.234375 -0.96875q-0.234375 -0.328125 -0.765625 -0.328125q-0.40625 0 -0.765625 0.21875q-0.34375 0.21875 -0.5 0.640625q-0.15625 0.40625 -0.15625 1.1875l0 2.953125l-0.96875 0zm8.892395 -6.765625l0 -1.109375l0.96875 0l0 1.109375l-0.96875 0zm0 6.765625l0 -5.703125l0.96875 0l0 5.703125l-0.96875 0zm4.4768677 -0.859375l0.125 0.84375q-0.40625 0.09375 -0.71875 0.09375q-0.53125 0 -0.828125 -0.171875q-0.28125 -0.171875 -0.40625 -0.4375q-0.109375 -0.265625 -0.109375 -1.140625l0 -3.28125l-0.71875 0l0 -0.75l0.71875 0l0 -1.40625l0.953125 -0.59375l0 2.0l0.984375 0l0 0.75l-0.984375 0l0 3.34375q0 0.40625 0.046875 0.53125q0.0625 0.109375 0.171875 0.1875q0.125 0.0625 0.328125 0.0625q0.171875 0 0.4375 -0.03125zm-0.054992676 3.046875l0 -0.703125l6.40625 0l0 0.703125l-6.40625 0zm6.8327637 -8.953125l0 -1.109375l0.96875 0l0 1.109375l-0.96875 0zm0 6.765625l0 -5.703125l0.96875 0l0 5.703125l-0.96875 0zm2.3518066 0l0 -5.703125l0.875 0l0 0.8125q0.625 -0.9375 1.8125 -0.9375q0.515625 0 0.953125 0.1875q0.4375 0.171875 0.640625 0.484375q0.21875 0.296875 0.3125 0.703125q0.046875 0.28125 0.046875 0.953125l0 3.5l-0.96875 0l0 -3.46875q0 -0.59375 -0.109375 -0.875q-0.109375 -0.296875 -0.40625 -0.46875q-0.28125 -0.1875 -0.671875 -0.1875q-0.609375 0 -1.0625 0.390625q-0.453125 0.390625 -0.453125 1.5l0 3.109375l-0.96875 0zm5.0358887 2.1875l0 -0.703125l6.40625 0l0 0.703125l-6.40625 0zm7.7077637 -2.1875l-0.890625 0l0 -7.875l0.96875 0l0 2.8125q0.609375 -0.765625 1.5625 -0.765625q0.53125 0 1.0 0.21875q0.46875 0.203125 0.765625 0.59375q0.3125 0.375 0.484375 0.921875q0.171875 0.53125 0.171875 1.15625q0 1.46875 -0.734375 2.265625q-0.71875 0.796875 -1.734375 0.796875q-1.015625 0 -1.59375 -0.84375l0 0.71875zm0 -2.890625q0 1.015625 0.28125 1.484375q0.453125 0.734375 1.234375 0.734375q0.625 0 1.078125 -0.546875q0.46875 -0.546875 0.46875 -1.640625q0 -1.109375 -0.4375 -1.640625q-0.4375 -0.53125 -1.078125 -0.53125q-0.625 0 -1.09375 0.546875q-0.453125 0.546875 -0.453125 1.59375zm5.0046387 5.09375l-0.109375 -0.90625q0.3125 0.078125 0.546875 0.078125q0.328125 0 0.515625 -0.109375q0.203125 -0.109375 0.3125 -0.296875q0.09375 -0.140625 0.296875 -0.71875q0.03125 -0.078125 0.09375 -0.234375l-2.171875 -5.71875l1.046875 0l1.1875 3.296875q0.234375 0.640625 0.40625 1.328125q0.171875 -0.671875 0.40625 -1.296875l1.21875 -3.328125l0.96875 0l-2.171875 5.796875q-0.34375 0.9375 -0.546875 1.296875q-0.25 0.484375 -0.59375 0.703125q-0.328125 0.21875 -0.78125 0.21875q-0.28125 0 -0.625 -0.109375zm7.484375 -3.0625l0.125 0.84375q-0.40625 0.09375 -0.71875 0.09375q-0.53125 0 -0.828125 -0.171875q-0.28125 -0.171875 -0.40625 -0.4375q-0.109375 -0.265625 -0.109375 -1.140625l0 -3.28125l-0.71875 0l0 -0.75l0.71875 0l0 -1.40625l0.953125 -0.59375l0 2.0l0.984375 0l0 0.75l-0.984375 0l0 3.34375q0 0.40625 0.046875 0.53125q0.0625 0.109375 0.171875 0.1875q0.125 0.0625 0.328125 0.0625q0.171875 0 0.4375 -0.03125zm4.7418823 -0.984375l1.0 0.125q-0.234375 0.875 -0.875 1.359375q-0.640625 0.484375 -1.625 0.484375q-1.25 0 -1.984375 -0.765625q-0.734375 -0.765625 -0.734375 -2.15625q0 -1.453125 0.734375 -2.234375q0.75 -0.796875 1.921875 -0.796875q1.15625 0 1.875 0.78125q0.71875 0.765625 0.71875 2.1875q0 0.078125 0 0.25l-4.25 0q0.046875 0.9375 0.515625 1.4375q0.484375 0.5 1.203125 0.5q0.53125 0 0.90625 -0.265625q0.375 -0.28125 0.59375 -0.90625zm-3.171875 -1.5625l3.1875 0q-0.0625 -0.71875 -0.359375 -1.078125q-0.46875 -0.546875 -1.203125 -0.546875q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.5 1.171875zm4.8171387 1.703125l0.953125 -0.15625q0.078125 0.578125 0.4375 0.890625q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.640625q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.484375 -0.28125 0.90625q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.375zm13.757507 -2.921875l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm0 2.390625l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm8.902466 1.3125l0 0.921875l-5.203125 0q0 -0.34375 0.125 -0.671875q0.1875 -0.53125 0.625 -1.046875q0.4375 -0.515625 1.265625 -1.1875q1.28125 -1.0625 1.734375 -1.671875q0.453125 -0.609375 0.453125 -1.15625q0 -0.578125 -0.40625 -0.96875q-0.40625 -0.40625 -1.078125 -0.40625q-0.6875 0 -1.109375 0.421875q-0.421875 0.421875 -0.421875 1.15625l-1.0 -0.09375q0.109375 -1.109375 0.765625 -1.6875q0.671875 -0.59375 1.796875 -0.59375q1.125 0 1.78125 0.625q0.671875 0.625 0.671875 1.5625q0 0.46875 -0.203125 0.9375q-0.1875 0.453125 -0.640625 0.953125q-0.4375 0.5 -1.484375 1.390625q-0.875 0.71875 -1.125 0.984375q-0.234375 0.265625 -0.40625 0.53125l3.859375 0zm0.8483887 -1.140625l1.015625 -0.09375q0.109375 0.75 0.515625 1.125q0.421875 0.375 1.0 0.375q0.703125 0 1.1875 -0.53125q0.484375 -0.53125 0.484375 -1.390625q0 -0.828125 -0.46875 -1.296875q-0.46875 -0.484375 -1.21875 -0.484375q-0.46875 0 -0.84375 0.21875q-0.375 0.203125 -0.59375 0.53125l-0.90625 -0.109375l0.765625 -4.046875l3.921875 0l0 0.921875l-3.140625 0l-0.4375 2.109375q0.71875 -0.484375 1.5 -0.484375q1.03125 0 1.734375 0.71875q0.703125 0.703125 0.703125 1.828125q0 1.078125 -0.625 1.84375q-0.75 0.96875 -2.0625 0.96875q-1.078125 0 -1.765625 -0.59375q-0.671875 -0.609375 -0.765625 -1.609375zm10.942139 -3.890625l-0.953125 0.078125q-0.125 -0.5625 -0.375 -0.828125q-0.390625 -0.40625 -0.953125 -0.40625q-0.46875 0 -0.8125 0.25q-0.46875 0.34375 -0.734375 0.984375q-0.25 0.625 -0.265625 1.8125q0.34375 -0.53125 0.84375 -0.78125q0.515625 -0.265625 1.0625 -0.265625q0.96875 0 1.640625 0.71875q0.6875 0.703125 0.6875 1.828125q0 0.75 -0.328125 1.390625q-0.3125 0.625 -0.875 0.96875q-0.546875 0.34375 -1.265625 0.34375q-1.203125 0 -1.96875 -0.890625q-0.765625 -0.890625 -0.765625 -2.9375q0 -2.28125 0.84375 -3.3125q0.75 -0.90625 1.984375 -0.90625q0.9375 0 1.53125 0.53125q0.59375 0.515625 0.703125 1.421875zm-3.9375 3.40625q0 0.5 0.203125 0.953125q0.21875 0.453125 0.59375 0.703125q0.390625 0.234375 0.796875 0.234375q0.625 0 1.0625 -0.5q0.4375 -0.5 0.4375 -1.34375q0 -0.8125 -0.4375 -1.28125q-0.4375 -0.46875 -1.09375 -0.46875q-0.65625 0 -1.109375 0.46875q-0.453125 0.46875 -0.453125 1.234375zm5.2077026 2.546875l0 -7.875l1.578125 0l1.859375 5.578125q0.25 0.78125 0.375 1.15625q0.140625 -0.421875 0.421875 -1.25l1.875 -5.484375l1.40625 0l0 7.875l-1.0 0l0 -6.59375l-2.296875 6.59375l-0.9375 0l-2.265625 -6.703125l0 6.703125l-1.015625 0z" fill-rule="nonzero"></path><path fill="#000000" d="m767.3744 229.20662l0.9375 0.125q-0.140625 0.984375 -0.796875 1.546875q-0.640625 0.546875 -1.5625 0.546875q-1.171875 0 -1.890625 -0.765625q-0.703125 -0.765625 -0.703125 -2.1875q0 -0.921875 0.296875 -1.609375q0.3125 -0.703125 0.9375 -1.046875q0.625 -0.34375 1.359375 -0.34375q0.921875 0 1.515625 0.46875q0.59375 0.46875 0.765625 1.328125l-0.953125 0.140625q-0.125 -0.5625 -0.46875 -0.84375q-0.34375 -0.296875 -0.828125 -0.296875q-0.71875 0 -1.1875 0.53125q-0.453125 0.515625 -0.453125 1.640625q0 1.15625 0.4375 1.671875q0.4375 0.515625 1.15625 0.515625q0.5625 0 0.9375 -0.34375q0.390625 -0.34375 0.5 -1.078125zm1.59375 4.28125l0 -7.890625l0.890625 0l0 0.734375q0.3125 -0.421875 0.703125 -0.640625q0.390625 -0.21875 0.953125 -0.21875q0.71875 0 1.28125 0.375q0.5625 0.375 0.84375 1.0625q0.28125 0.671875 0.28125 1.5q0 0.875 -0.3125 1.578125q-0.3125 0.6875 -0.921875 1.0625q-0.59375 0.375 -1.25 0.375q-0.484375 0 -0.875 -0.203125q-0.375 -0.203125 -0.625 -0.515625l0 2.78125l-0.96875 0zm0.875 -5.0q0 1.09375 0.453125 1.625q0.453125 0.515625 1.078125 0.515625q0.640625 0 1.09375 -0.53125q0.46875 -0.546875 0.46875 -1.703125q0 -1.078125 -0.453125 -1.625q-0.4375 -0.546875 -1.0625 -0.546875q-0.625 0 -1.109375 0.578125q-0.46875 0.578125 -0.46875 1.6875zm8.801514 2.8125l0 -0.84375q-0.671875 0.96875 -1.8125 0.96875q-0.5 0 -0.953125 -0.1875q-0.4375 -0.203125 -0.65625 -0.484375q-0.203125 -0.296875 -0.28125 -0.71875q-0.0625 -0.28125 -0.0625 -0.90625l0 -3.53125l0.96875 0l0 3.15625q0 0.765625 0.0625 1.03125q0.09375 0.375 0.375 0.59375q0.296875 0.21875 0.734375 0.21875q0.4375 0 0.8125 -0.21875q0.390625 -0.234375 0.546875 -0.609375q0.15625 -0.390625 0.15625 -1.109375l0 -3.0625l0.96875 0l0 5.703125l-0.859375 0zm2.4577026 0l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0z" fill-rule="nonzero"></path><path fill="#000000" d="m779.217 242.20662l0.9375 0.125q-0.140625 0.984375 -0.796875 1.546875q-0.640625 0.546875 -1.5625 0.546875q-1.171875 0 -1.890625 -0.765625q-0.703125 -0.765625 -0.703125 -2.1875q0 -0.921875 0.296875 -1.609375q0.3125 -0.703125 0.9375 -1.046875q0.625 -0.34375 1.359375 -0.34375q0.921875 0 1.515625 0.46875q0.59375 0.46875 0.765625 1.328125l-0.953125 0.140625q-0.125 -0.5625 -0.46875 -0.84375q-0.34375 -0.296875 -0.828125 -0.296875q-0.71875 0 -1.1875 0.53125q-0.453125 0.515625 -0.453125 1.640625q0 1.15625 0.4375 1.671875q0.4375 0.515625 1.15625 0.515625q0.5625 0 0.9375 -0.34375q0.390625 -0.34375 0.5 -1.078125zm1.828125 2.09375l0 -4.953125l-0.84375 0l0 -0.75l0.84375 0l0 -0.609375q0 -0.578125 0.109375 -0.859375q0.140625 -0.375 0.484375 -0.609375q0.359375 -0.234375 0.984375 -0.234375q0.40625 0 0.90625 0.109375l-0.140625 0.84375q-0.3125 -0.0625 -0.578125 -0.0625q-0.4375 0 -0.625 0.1875q-0.171875 0.1875 -0.171875 0.703125l0 0.53125l1.109375 0l0 0.75l-1.109375 0l0 4.953125l-0.96875 0zm2.3512573 -1.703125l0.953125 -0.15625q0.078125 0.578125 0.4375 0.890625q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.640625q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.484375 -0.28125 0.90625q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.375zm4.8125 3.890625l0 -0.703125l6.40625 0l0 0.703125l-6.40625 0zm10.457764 0l0 -2.796875q-0.21875 0.3125 -0.625 0.53125q-0.40625 0.203125 -0.859375 0.203125q-1.015625 0 -1.75 -0.8125q-0.734375 -0.8125 -0.734375 -2.21875q0 -0.859375 0.296875 -1.53125q0.296875 -0.6875 0.859375 -1.03125q0.5625 -0.359375 1.25 -0.359375q1.046875 0 1.65625 0.890625l0 -0.765625l0.875 0l0 7.890625l-0.96875 0zm-2.984375 -5.0625q0 1.109375 0.453125 1.65625q0.46875 0.546875 1.125 0.546875q0.609375 0 1.046875 -0.515625q0.453125 -0.53125 0.453125 -1.59375q0 -1.140625 -0.46875 -1.71875q-0.46875 -0.578125 -1.09375 -0.578125q-0.640625 0 -1.078125 0.546875q-0.4375 0.53125 -0.4375 1.65625zm9.020264 2.875l0 -0.84375q-0.671875 0.96875 -1.8125 0.96875q-0.5 0 -0.953125 -0.1875q-0.4375 -0.203125 -0.65625 -0.484375q-0.203125 -0.296875 -0.28125 -0.71875q-0.0625 -0.28125 -0.0625 -0.90625l0 -3.53125l0.96875 0l0 3.15625q0 0.765625 0.0625 1.03125q0.09375 0.375 0.375 0.59375q0.296875 0.21875 0.734375 0.21875q0.4375 0 0.8125 -0.21875q0.390625 -0.234375 0.546875 -0.609375q0.15625 -0.390625 0.15625 -1.109375l0 -3.0625l0.96875 0l0 5.703125l-0.859375 0zm1.8170776 -2.859375q0 -1.578125 0.890625 -2.34375q0.734375 -0.625 1.796875 -0.625q1.171875 0 1.90625 0.765625q0.75 0.765625 0.75 2.125q0 1.109375 -0.328125 1.75q-0.328125 0.625 -0.96875 0.96875q-0.625 0.34375 -1.359375 0.34375q-1.203125 0 -1.953125 -0.765625q-0.734375 -0.765625 -0.734375 -2.21875zm1.0 0q0 1.109375 0.46875 1.65625q0.484375 0.53125 1.21875 0.53125q0.71875 0 1.1875 -0.546875q0.484375 -0.546875 0.484375 -1.671875q0 -1.046875 -0.484375 -1.59375q-0.484375 -0.546875 -1.1875 -0.546875q-0.734375 0 -1.21875 0.546875q-0.46875 0.53125 -0.46875 1.625zm7.4108887 2.0l0.125 0.84375q-0.40625 0.09375 -0.71875 0.09375q-0.53125 0 -0.828125 -0.171875q-0.28125 -0.171875 -0.40625 -0.4375q-0.109375 -0.265625 -0.109375 -1.140625l0 -3.28125l-0.71875 0l0 -0.75l0.71875 0l0 -1.40625l0.953125 -0.59375l0 2.0l0.984375 0l0 0.75l-0.984375 0l0 3.34375q0 0.40625 0.046875 0.53125q0.0625 0.109375 0.171875 0.1875q0.125 0.0625 0.328125 0.0625q0.171875 0 0.4375 -0.03125zm4.5700073 0.15625q-0.546875 0.453125 -1.046875 0.640625q-0.484375 0.1875 -1.0625 0.1875q-0.9375 0 -1.453125 -0.453125q-0.5 -0.46875 -0.5 -1.171875q0 -0.421875 0.1875 -0.765625q0.203125 -0.34375 0.5 -0.546875q0.3125 -0.21875 0.703125 -0.328125q0.28125 -0.078125 0.859375 -0.140625q1.171875 -0.140625 1.71875 -0.34375q0.015625 -0.1875 0.015625 -0.25q0 -0.59375 -0.28125 -0.828125q-0.359375 -0.328125 -1.09375 -0.328125q-0.6875 0 -1.015625 0.234375q-0.3125 0.234375 -0.46875 0.84375l-0.953125 -0.125q0.125 -0.609375 0.421875 -0.984375q0.296875 -0.375 0.859375 -0.5625q0.5625 -0.203125 1.296875 -0.203125q0.734375 0 1.1875 0.171875q0.453125 0.171875 0.65625 0.4375q0.21875 0.25 0.3125 0.640625q0.046875 0.25 0.046875 0.90625l0 1.28125q0 1.34375 0.0625 1.703125q0.0625 0.359375 0.25 0.6875l-1.015625 0q-0.15625 -0.296875 -0.1875 -0.703125zm-0.09375 -2.15625q-0.515625 0.21875 -1.578125 0.359375q-0.59375 0.09375 -0.84375 0.203125q-0.234375 0.09375 -0.375 0.3125q-0.140625 0.203125 -0.140625 0.453125q0 0.390625 0.296875 0.65625q0.296875 0.25 0.859375 0.25q0.5625 0 0.984375 -0.25q0.4375 -0.25 0.65625 -0.671875q0.140625 -0.328125 0.140625 -0.96875l0 -0.34375zm1.3952637 5.046875l0 -0.703125l6.40625 0l0 0.703125l-6.40625 0zm10.567139 -2.1875l0 -0.84375q-0.671875 0.96875 -1.8125 0.96875q-0.5 0 -0.953125 -0.1875q-0.4375 -0.203125 -0.65625 -0.484375q-0.203125 -0.296875 -0.28125 -0.71875q-0.0625 -0.28125 -0.0625 -0.90625l0 -3.53125l0.96875 0l0 3.15625q0 0.765625 0.0625 1.03125q0.09375 0.375 0.375 0.59375q0.296875 0.21875 0.734375 0.21875q0.4375 0 0.8125 -0.21875q0.390625 -0.234375 0.546875 -0.609375q0.15625 -0.390625 0.15625 -1.109375l0 -3.0625l0.96875 0l0 5.703125l-0.859375 0zm1.8015137 -1.703125l0.953125 -0.15625q0.078125 0.578125 0.4375 0.890625q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.640625q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.484375 -0.28125 0.90625q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.375zm13.757507 -2.921875l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm0 2.390625l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm8.902466 1.3125l0 0.921875l-5.203125 0q0 -0.34375 0.125 -0.671875q0.1875 -0.53125 0.625 -1.046875q0.4375 -0.515625 1.265625 -1.1875q1.28125 -1.0625 1.734375 -1.671875q0.453125 -0.609375 0.453125 -1.15625q0 -0.578125 -0.40625 -0.96875q-0.40625 -0.40625 -1.078125 -0.40625q-0.6875 0 -1.109375 0.421875q-0.421875 0.421875 -0.421875 1.15625l-1.0 -0.09375q0.109375 -1.109375 0.765625 -1.6875q0.671875 -0.59375 1.796875 -0.59375q1.125 0 1.78125 0.625q0.671875 0.625 0.671875 1.5625q0 0.46875 -0.203125 0.9375q-0.1875 0.453125 -0.640625 0.953125q-0.4375 0.5 -1.484375 1.390625q-0.875 0.71875 -1.125 0.984375q-0.234375 0.265625 -0.40625 0.53125l3.859375 0zm0.8483887 -2.96875q0 -1.390625 0.28125 -2.234375q0.296875 -0.859375 0.859375 -1.3125q0.578125 -0.46875 1.4375 -0.46875q0.625 0 1.09375 0.265625q0.484375 0.25 0.796875 0.734375q0.3125 0.46875 0.484375 1.171875q0.1875 0.6875 0.1875 1.84375q0 1.390625 -0.296875 2.25q-0.28125 0.84375 -0.84375 1.3125q-0.5625 0.46875 -1.421875 0.46875q-1.140625 0 -1.796875 -0.828125q-0.78125 -0.984375 -0.78125 -3.203125zm1.0 0q0 1.953125 0.453125 2.59375q0.453125 0.640625 1.125 0.640625q0.65625 0 1.109375 -0.640625q0.453125 -0.65625 0.453125 -2.59375q0 -1.9375 -0.453125 -2.578125q-0.453125 -0.640625 -1.125 -0.640625q-0.671875 0 -1.0625 0.5625q-0.5 0.71875 -0.5 2.65625z" fill-rule="nonzero"></path><path fill="#000000" d="m779.217 255.20662l0.9375 0.125q-0.140625 0.98439026 -0.796875 1.5468903q-0.640625 0.546875 -1.5625 0.546875q-1.171875 0 -1.890625 -0.765625q-0.703125 -0.76564026 -0.703125 -2.1875153q0 -0.921875 0.296875 -1.609375q0.3125 -0.703125 0.9375 -1.046875q0.625 -0.34375 1.359375 -0.34375q0.921875 0 1.515625 0.46875q0.59375 0.46875 0.765625 1.328125l-0.953125 0.140625q-0.125 -0.5625 -0.46875 -0.84375q-0.34375 -0.296875 -0.828125 -0.296875q-0.71875 0 -1.1875 0.53125q-0.453125 0.515625 -0.453125 1.640625q0 1.15625 0.4375 1.6718903q0.4375 0.515625 1.15625 0.515625q0.5625 0 0.9375 -0.34375q0.390625 -0.34376526 0.5 -1.0781403zm1.828125 2.0937653l0 -4.9531403l-0.84375 0l0 -0.75l0.84375 0l0 -0.609375q0 -0.578125 0.109375 -0.859375q0.140625 -0.375 0.484375 -0.609375q0.359375 -0.234375 0.984375 -0.234375q0.40625 0 0.90625 0.109375l-0.140625 0.84375q-0.3125 -0.0625 -0.578125 -0.0625q-0.4375 0 -0.625 0.1875q-0.171875 0.1875 -0.171875 0.703125l0 0.53125l1.109375 0l0 0.75l-1.109375 0l0 4.9531403l-0.96875 0zm2.3512573 -1.7031403l0.953125 -0.15625q0.078125 0.57814026 0.4375 0.89064026q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.64064026q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.48439026 -0.28125 0.90626526q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.3750153zm4.8125 3.8906403l0 -0.703125l6.40625 0l0 0.703125l-6.40625 0zm6.8171387 0l0 -7.8906403l0.890625 0l0 0.734375q0.3125 -0.421875 0.703125 -0.640625q0.390625 -0.21875 0.953125 -0.21875q0.71875 0 1.28125 0.375q0.5625 0.375 0.84375 1.0625q0.28125 0.671875 0.28125 1.5q0 0.875 -0.3125 1.578125q-0.3125 0.68751526 -0.921875 1.0625153q-0.59375 0.375 -1.25 0.375q-0.484375 0 -0.875 -0.203125q-0.375 -0.203125 -0.625 -0.515625l0 2.78125l-0.96875 0zm0.875 -5.0000153q0 1.09375 0.453125 1.6250153q0.453125 0.515625 1.078125 0.515625q0.640625 0 1.09375 -0.53125q0.46875 -0.54689026 0.46875 -1.7031403q0 -1.078125 -0.453125 -1.625q-0.4375 -0.546875 -1.0625 -0.546875q-0.625 0 -1.109375 0.578125q-0.46875 0.578125 -0.46875 1.6875zm8.957764 0.96875l1.0 0.125q-0.234375 0.87501526 -0.875 1.3593903q-0.640625 0.484375 -1.625 0.484375q-1.25 0 -1.984375 -0.765625q-0.734375 -0.76564026 -0.734375 -2.1562653q0 -1.453125 0.734375 -2.234375q0.75 -0.796875 1.921875 -0.796875q1.15625 0 1.875 0.78125q0.71875 0.765625 0.71875 2.1875q0 0.078125 0 0.25l-4.25 0q0.046875 0.9375 0.515625 1.4375153q0.484375 0.5 1.203125 0.5q0.53125 0 0.90625 -0.265625q0.375 -0.28125 0.59375 -0.90626526zm-3.171875 -1.5625l3.1875 0q-0.0625 -0.71875 -0.359375 -1.078125q-0.46875 -0.546875 -1.203125 -0.546875q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.5 1.171875zm5.1920776 3.4062653l0 -5.7031403l0.859375 0l0 0.859375q0.34375 -0.609375 0.625 -0.796875q0.28125 -0.1875 0.609375 -0.1875q0.5 0 1.0 0.3125l-0.328125 0.890625q-0.359375 -0.203125 -0.71875 -0.203125q-0.3125 0 -0.5625 0.1875q-0.25 0.1875 -0.359375 0.53125q-0.15625 0.515625 -0.15625 1.125l0 2.9843903l-0.96875 0zm3.56427 -6.7656403l0 -1.109375l0.96875 0l0 1.109375l-0.96875 0zm0 6.7656403l0 -5.7031403l0.96875 0l0 5.7031403l-0.96875 0zm1.9924927 -2.8593903q0 -1.578125 0.890625 -2.34375q0.734375 -0.625 1.796875 -0.625q1.171875 0 1.90625 0.765625q0.75 0.765625 0.75 2.125q0 1.109375 -0.328125 1.7500153q-0.328125 0.625 -0.96875 0.96875q-0.625 0.34375 -1.359375 0.34375q-1.203125 0 -1.953125 -0.765625q-0.734375 -0.76564026 -0.734375 -2.2187653zm1.0 0q0 1.109375 0.46875 1.6562653q0.484375 0.53125 1.21875 0.53125q0.71875 0 1.1875 -0.546875q0.484375 -0.54689026 0.484375 -1.6718903q0 -1.046875 -0.484375 -1.59375q-0.484375 -0.546875 -1.1875 -0.546875q-0.734375 0 -1.21875 0.546875q-0.46875 0.53125 -0.46875 1.625zm8.988953 2.8593903l0 -0.71875q-0.53125 0.84375 -1.59375 0.84375q-0.671875 0 -1.25 -0.375q-0.578125 -0.375 -0.890625 -1.046875q-0.3125 -0.67189026 -0.3125 -1.5468903q0 -0.859375 0.28125 -1.546875q0.296875 -0.703125 0.859375 -1.0625q0.5625 -0.375 1.265625 -0.375q0.515625 0 0.921875 0.21875q0.40625 0.21875 0.65625 0.5625l0 -2.828125l0.96875 0l0 7.8750153l-0.90625 0zm-3.046875 -2.8437653q0 1.09375 0.453125 1.6406403q0.46875 0.53125 1.09375 0.53125q0.640625 0 1.078125 -0.515625q0.4375 -0.51564026 0.4375 -1.5781403q0 -1.171875 -0.453125 -1.71875q-0.4375 -0.546875 -1.109375 -0.546875q-0.640625 0 -1.078125 0.53125q-0.421875 0.515625 -0.421875 1.65625zm4.3796387 5.0312653l0 -0.703125l6.40625 0l0 0.703125l-6.40625 0zm10.567139 -2.1875l0 -0.84375q-0.671875 0.96875 -1.8125 0.96875q-0.5 0 -0.953125 -0.1875q-0.4375 -0.203125 -0.65625 -0.484375q-0.203125 -0.296875 -0.28125 -0.71875q-0.0625 -0.28126526 -0.0625 -0.90626526l0 -3.53125l0.96875 0l0 3.15625q0 0.765625 0.0625 1.03125q0.09375 0.37501526 0.375 0.59376526q0.296875 0.21875 0.734375 0.21875q0.4375 0 0.8125 -0.21875q0.390625 -0.234375 0.546875 -0.60939026q0.15625 -0.390625 0.15625 -1.109375l0 -3.0625l0.96875 0l0 5.7031403l-0.859375 0zm1.8015137 -1.7031403l0.953125 -0.15625q0.078125 0.57814026 0.4375 0.89064026q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.64064026q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.48439026 -0.28125 0.90626526q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.3750153zm13.757507 -2.921875l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm0 2.390625l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm7.464966 2.2343903l-0.96875 0l0 -6.1562653q-0.34375 0.328125 -0.90625 0.671875q-0.5625 0.328125 -1.015625 0.484375l0 -0.9375q0.8125 -0.375 1.40625 -0.90625q0.609375 -0.546875 0.859375 -1.0625l0.625 0l0 7.9062653zm2.2858887 -3.8906403q0 -1.390625 0.28125 -2.234375q0.296875 -0.859375 0.859375 -1.3125q0.578125 -0.46875 1.4375 -0.46875q0.625 0 1.09375 0.265625q0.484375 0.25 0.796875 0.734375q0.3125 0.46875 0.484375 1.171875q0.1875 0.6875 0.1875 1.84375q0 1.390625 -0.296875 2.25q-0.28125 0.84376526 -0.84375 1.3125153q-0.5625 0.46875 -1.421875 0.46875q-1.140625 0 -1.796875 -0.828125q-0.78125 -0.98439026 -0.78125 -3.2031403zm1.0 0q0 1.953125 0.453125 2.5937653q0.453125 0.640625 1.125 0.640625q0.65625 0 1.109375 -0.640625q0.453125 -0.65626526 0.453125 -2.5937653q0 -1.9375 -0.453125 -2.578125q-0.453125 -0.640625 -1.125 -0.640625q-0.671875 0 -1.0625 0.5625q-0.5 0.71875 -0.5 2.65625zm4.9265137 0q0 -1.390625 0.28125 -2.234375q0.296875 -0.859375 0.859375 -1.3125q0.578125 -0.46875 1.4375 -0.46875q0.625 0 1.09375 0.265625q0.484375 0.25 0.796875 0.734375q0.3125 0.46875 0.484375 1.171875q0.1875 0.6875 0.1875 1.84375q0 1.390625 -0.296875 2.25q-0.28125 0.84376526 -0.84375 1.3125153q-0.5625 0.46875 -1.421875 0.46875q-1.140625 0 -1.796875 -0.828125q-0.78125 -0.98439026 -0.78125 -3.2031403zm1.0 0q0 1.953125 0.453125 2.5937653q0.453125 0.640625 1.125 0.640625q0.65625 0 1.109375 -0.640625q0.453125 -0.65626526 0.453125 -2.5937653q0 -1.9375 -0.453125 -2.578125q-0.453125 -0.640625 -1.125 -0.640625q-0.671875 0 -1.0625 0.5625q-0.5 0.71875 -0.5 2.65625z" fill-rule="nonzero"></path><path fill="#000000" d="m763.92126 270.30038l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0zm2.9606323 0l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0zm2.9606323 0l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m777.8058 423.8609l78.897644 0l0 16.59842l-78.897644 0z" fill-rule="evenodd"></path><path fill="#999999" d="m795.09015 434.49136l1.125 0.140625q-0.171875 1.171875 -0.9375 1.828125q-0.765625 0.65625 -1.859375 0.65625q-1.390625 0 -2.234375 -0.90625q-0.828125 -0.90625 -0.828125 -2.59375q0 -1.09375 0.359375 -1.90625q0.359375 -0.828125 1.09375 -1.234375q0.734375 -0.40625 1.609375 -0.40625q1.09375 0 1.796875 0.5625q0.703125 0.546875 0.890625 1.5625l-1.109375 0.171875q-0.15625 -0.671875 -0.5625 -1.015625q-0.390625 -0.34375 -0.96875 -0.34375q-0.859375 0 -1.40625 0.625q-0.53125 0.609375 -0.53125 1.953125q0 1.359375 0.515625 1.984375q0.515625 0.609375 1.359375 0.609375q0.671875 0 1.125 -0.40625q0.453125 -0.421875 0.5625 -1.28125zm1.8515625 -0.90625q0 -1.875 1.03125 -2.765625q0.875 -0.75 2.125 -0.75q1.390625 0 2.265625 0.90625q0.890625 0.90625 0.890625 2.515625q0 1.296875 -0.390625 2.046875q-0.390625 0.75 -1.140625 1.171875q-0.75 0.40625 -1.625 0.40625q-1.421875 0 -2.296875 -0.90625q-0.859375 -0.90625 -0.859375 -2.625zm1.171875 0q0 1.296875 0.5625 1.953125q0.5625 0.640625 1.421875 0.640625q0.84375 0 1.40625 -0.640625q0.578125 -0.65625 0.578125 -1.984375q0 -1.25 -0.578125 -1.890625q-0.5625 -0.65625 -1.40625 -0.65625q-0.859375 0 -1.421875 0.640625q-0.5625 0.640625 -0.5625 1.9375zm6.6624756 3.375l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm9.912476 -1.015625l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.593628 0.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm3.1156006 -4.59375l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.9610596 0l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm12.021851 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.5374756 4.015625l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0z" fill-rule="nonzero"></path></g></svg>
+
diff --git a/Documentation/devel/rkt-process-model.svg b/Documentation/devel/rkt-process-model.svg
new file mode 100644
index 0000000000..4f017a8905
--- /dev/null
+++ b/Documentation/devel/rkt-process-model.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="yes"?>
+
+<svg version="1.1" viewBox="0.0 0.0 987.7821522309712 471.3963254593176" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="p.0"><path d="m0 0l987.78217 0l0 471.39633l-987.78217 0l0 -471.39633z" clip-rule="nonzero"></path></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l987.78217 0l0 471.39633l-987.78217 0z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m55.572178 89.47128l0 0c0 -40.577072 32.894215 -73.47129 73.47128 -73.47129l731.7346 0c19.485779 0 38.173462 7.7407026 51.952026 21.519241c13.778564 13.778538 21.519226 32.466244 21.519226 51.952045l0 293.8763c0 40.577087 -32.894226 73.47128 -73.47125 73.47128l-731.7346 0c-40.577065 0 -73.47128 -32.894196 -73.47128 -73.47128z" fill-rule="evenodd"></path><path stroke="#999999" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="16.0,12.0" d="m55.572178 89.47128l0 0c0 -40.577072 32.894215 -73.47129 73.47128 -73.47129l731.7346 0c19.485779 0 38.173462 7.7407026 51.952026 21.519241c13.778564 13.778538 21.519226 32.466244 21.519226 51.952045l0 293.8763c0 40.577087 -32.894226 73.47128 -73.47125 73.47128l-731.7346 0c-40.577065 0 -73.47128 -32.894196 -73.47128 -73.47128z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m283.36746 239.7934l0 0c0 -20.332031 16.48236 -36.814392 36.81436 -36.814392l535.94604 0c9.763794 0 19.127686 3.8786469 26.031677 10.782684c6.9040527 6.9040375 10.782715 16.26793 10.782715 26.031708l0 147.25311c0 20.332031 -16.48236 36.814392 -36.814392 36.814392l-535.94604 0c-20.332 0 -36.81436 -16.48236 -36.81436 -36.814392z" fill-rule="evenodd"></path><path stroke="#999999" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="16.0,12.0" d="m283.36746 239.7934l0 0c0 -20.332031 16.48236 -36.814392 36.81436 -36.814392l535.94604 0c9.763794 0 19.127686 3.8786469 26.031677 10.782684c6.9040527 6.9040375 10.782715 16.26793 10.782715 26.031708l0 147.25311c0 20.332031 -16.48236 36.814392 -36.814392 36.814392l-535.94604 0c-20.332 0 -36.81436 -16.48236 -36.81436 -36.814392z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m189.44882 129.42783l432.37796 0l0 73.16536l-432.37796 0z" fill-rule="evenodd"></path><path fill="#000000" d="m202.3707 157.21844l3.109375 0l0.09375 3.609375q1.75 -2.09375 3.4375 -3.03125q1.6875 -0.9375 3.40625 -0.9375q3.046875 0 4.609375 1.984375q1.578125 1.96875 1.46875 5.859375l-3.4375 0q0.046875 -2.578125 -0.765625 -3.734375q-0.796875 -1.171875 -2.359375 -1.171875q-0.6875 0 -1.390625 0.25q-0.6875 0.234375 -1.421875 0.78125q-0.734375 0.53125 -1.5625 1.375q-0.8125 0.828125 -1.75 2.03125l0 12.59375l-3.4375 0l0 -19.609375zm38.835938 19.609375l-4.671875 0l-9.140625 -10.515625l0 10.515625l-3.390625 0l0 -27.59375l3.390625 0l0 16.953125l8.8125 -8.96875l4.484375 0l-9.1875 9.046875l9.703125 10.5625zm20.148438 -0.28125q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875z" fill-rule="nonzero"></path><path fill="#000000" d="m293.90195 183.5622q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm4.15625 -11.6875l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546875l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703125q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm13.578125 0.46875q-1.5625 1.328125 -3.015625 1.875q-1.4375 0.546875 -3.09375 0.546875q-2.734375 0 -4.203125 -1.328125q-1.46875 -1.34375 -1.46875 -3.421875q0 -1.21875 0.546875 -2.21875q0.5625 -1.015625 1.453125 -1.625q0.90625 -0.609375 2.03125 -0.921875q0.828125 -0.21875 2.5 -0.421875q3.40625 -0.40625 5.015625 -0.96875q0.015625 -0.578125 0.015625 -0.734375q0 -1.71875 -0.796875 -2.421875q-1.078125 -0.953125 -3.203125 -0.953125q-1.984375 0 -2.9375 0.703125q-0.9375 0.6875 -1.390625 2.453125l-2.75 -0.375q0.375 -1.765625 1.234375 -2.84375q0.859375 -1.09375 2.484375 -1.671875q1.625 -0.59375 3.765625 -0.59375q2.125 0 3.453125 0.5q1.328125 0.5 1.953125 1.265625q0.625 0.75 0.875 1.90625q0.140625 0.71875 0.140625 2.59375l0 3.75q0 3.921875 0.171875 4.96875q0.1875 1.03125 0.71875 1.984375l-2.9375 0q-0.4375 -0.875 -0.5625 -2.046875zm-0.234375 -6.28125q-1.53125 0.625 -4.59375 1.0625q-1.734375 0.25 -2.453125 0.5625q-0.71875 0.3125 -1.109375 0.921875q-0.390625 0.59375 -0.390625 1.328125q0 1.125 0.84375 1.875q0.859375 0.75 2.5 0.75q1.625 0 2.890625 -0.703125q1.265625 -0.71875 1.859375 -1.953125q0.453125 -0.953125 0.453125 -2.8125l0 -1.03125zm6.6875 9.703125l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm27.34375 3.25l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm14.890625 -1.40625q0 -4.0625 0.828125 -6.53125q0.84375 -2.484375 2.484375 -3.828125q1.65625 -1.34375 4.15625 -1.34375q1.84375 0 3.234375 0.75q1.390625 0.734375 2.296875 2.140625q0.90625 1.390625 1.421875 3.40625q0.515625 2.0 0.515625 5.40625q0 4.03125 -0.828125 6.515625q-0.828125 2.46875 -2.484375 3.828125q-1.640625 1.34375 -4.15625 1.34375q-3.3125 0 -5.203125 -2.375q-2.265625 -2.859375 -2.265625 -9.3125zm2.890625 0q0 5.640625 1.3125 7.515625q1.328125 1.859375 3.265625 1.859375q1.9375 0 3.25 -1.875q1.328125 -1.875 1.328125 -7.5q0 -5.65625 -1.328125 -7.515625q-1.3125 -1.859375 -3.28125 -1.859375q-1.9375 0 -3.09375 1.640625q-1.453125 2.09375 -1.453125 7.734375zm17.53125 18.03125l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m295.8714 202.97769l337.63782 0l0 73.165344l-337.63782 0z" fill-rule="evenodd"></path><path fill="#000000" d="m307.51202 258.3308l0 -28.703125l3.203125 0l0 2.703125q1.125 -1.578125 2.546875 -2.375q1.4375 -0.796875 3.46875 -0.796875q2.65625 0 4.6875 1.375q2.03125 1.359375 3.0625 3.859375q1.03125 2.484375 1.03125 5.453125q0 3.1875 -1.140625 5.734375q-1.140625 2.546875 -3.328125 3.90625q-2.171875 1.359375 -4.5625 1.359375q-1.765625 0 -3.171875 -0.734375q-1.390625 -0.75 -2.28125 -1.890625l0 10.109375l-3.515625 0zm3.1875 -18.203125q0 4.0 1.609375 5.921875q1.625 1.90625 3.9375 1.90625q2.34375 0 4.0 -1.984375q1.671875 -1.984375 1.671875 -6.140625q0 -3.96875 -1.625 -5.9375q-1.625 -1.96875 -3.890625 -1.96875q-2.25 0 -3.984375 2.09375q-1.71875 2.09375 -1.71875 6.109375zm17.746094 -0.125q0 -5.765625 3.203125 -8.53125q2.671875 -2.3125 6.53125 -2.3125q4.265625 0 6.984375 2.8125q2.71875 2.796875 2.71875 7.734375q0 4.015625 -1.203125 6.3125q-1.203125 2.28125 -3.5 3.5625q-2.296875 1.265625 -5.0 1.265625q-4.359375 0 -7.046875 -2.796875q-2.6875 -2.796875 -2.6875 -8.046875zm3.609375 0q0 3.984375 1.734375 5.96875q1.75 1.984375 4.390625 1.984375q2.609375 0 4.34375 -1.984375q1.75 -2.0 1.75 -6.078125q0 -3.859375 -1.75 -5.828125q-1.75 -1.984375 -4.34375 -1.984375q-2.640625 0 -4.390625 1.96875q-1.734375 1.96875 -1.734375 5.953125zm33.402344 10.375l0 -2.625q-1.96875 3.09375 -5.796875 3.09375q-2.484375 0 -4.5625 -1.359375q-2.078125 -1.375 -3.21875 -3.828125q-1.140625 -2.453125 -1.140625 -5.640625q0 -3.09375 1.03125 -5.625q1.03125 -2.53125 3.09375 -3.875q2.078125 -1.359375 4.640625 -1.359375q1.875 0 3.328125 0.796875q1.46875 0.796875 2.390625 2.0625l0 -10.28125l3.5 0l0 28.640625l-3.265625 0zm-11.109375 -10.359375q0 3.984375 1.671875 5.96875q1.6875 1.96875 3.96875 1.96875q2.3125 0 3.921875 -1.875q1.609375 -1.890625 1.609375 -5.765625q0 -4.25 -1.640625 -6.234375q-1.640625 -2.0 -4.046875 -2.0q-2.34375 0 -3.921875 1.921875q-1.5625 1.90625 -1.5625 6.015625z" fill-rule="nonzero"></path><path fill="#000000" d="m401.32062 257.11206q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm4.15625 -11.6875l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546875l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703125q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm13.578125 0.46875q-1.5625 1.328125 -3.015625 1.875q-1.4375 0.546875 -3.09375 0.546875q-2.734375 0 -4.203125 -1.328125q-1.46875 -1.34375 -1.46875 -3.421875q0 -1.21875 0.546875 -2.21875q0.5625 -1.015625 1.453125 -1.625q0.90625 -0.609375 2.03125 -0.921875q0.828125 -0.21875 2.5 -0.421875q3.40625 -0.40625 5.015625 -0.96875q0.015625 -0.578125 0.015625 -0.734375q0 -1.71875 -0.796875 -2.421875q-1.078125 -0.953125 -3.203125 -0.953125q-1.984375 0 -2.9375 0.703125q-0.9375 0.6875 -1.390625 2.453125l-2.75 -0.375q0.375 -1.765625 1.234375 -2.84375q0.859375 -1.09375 2.484375 -1.671875q1.625 -0.59375 3.765625 -0.59375q2.125 0 3.453125 0.5q1.328125 0.5 1.953125 1.265625q0.625 0.75 0.875 1.90625q0.140625 0.71875 0.140625 2.59375l0 3.75q0 3.921875 0.171875 4.96875q0.1875 1.03125 0.71875 1.984375l-2.9375 0q-0.4375 -0.875 -0.5625 -2.046875zm-0.234375 -6.28125q-1.53125 0.625 -4.59375 1.0625q-1.734375 0.25 -2.453125 0.5625q-0.71875 0.3125 -1.109375 0.921875q-0.390625 0.59375 -0.390625 1.328125q0 1.125 0.84375 1.875q0.859375 0.75 2.5 0.75q1.625 0 2.890625 -0.703125q1.265625 -0.71875 1.859375 -1.953125q0.453125 -0.953125 0.453125 -2.8125l0 -1.03125zm6.6875 9.703125l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm27.34375 3.25l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm25.484375 9.890625l-2.8125 0l0 -17.921875q-1.015625 0.96875 -2.671875 1.9375q-1.640625 0.96875 -2.953125 1.453125l0 -2.71875q2.359375 -1.109375 4.125 -2.6875q1.765625 -1.578125 2.5 -3.0625l1.8125 0l0 23.0zm9.828125 6.734375l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m113.08137 120.10236l0 49.98162l64.10537 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m113.08137 120.10236l0 49.98162l40.10537 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m153.18674 176.69092l18.15239 -6.6069336l-18.15239 -6.6069183z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m219.26247 194.59319l0 49.98163l64.10536 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m219.26247 194.59317l0 49.98163l40.105392 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m259.36786 251.18173l18.152374 -6.6069336l-18.152374 -6.6069183z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m328.3071 269.0092l0 49.98163l64.10535 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m328.3071 269.0092l0 49.98163l40.105347 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m368.41245 325.59775l18.152374 -6.6069336l-18.152374 -6.6069336z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m327.92914 309.2082l0 82.15982l64.10538 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m327.92914 309.2082l0 82.15979l40.105347 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m368.0345 397.9749l18.152405 -6.6069336l-18.152405 -6.6069336z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m83.04724 54.855644l456.37793 0l0 89.32284l-456.37793 0z" fill-rule="evenodd"></path><path fill="#000000" d="m111.93787 92.09939q0 2.4375 -0.6875 4.359375q-0.671875 1.921875 -1.90625 3.265625q-1.234375 1.34375 -3.015625 2.0625q-1.78125 0.703125 -4.0 0.703125q-1.75 0 -3.5625 -0.328125q-1.8125 -0.34375 -3.59375 -1.0625l0 -26.4375l3.40625 0l0 7.59375l-0.15625 3.625q1.453125 -1.96875 3.125 -2.78125q1.671875 -0.8125 3.59375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.984375 0.390625 2.015625 0.625q1.046875 0.21875 1.984375 0.21875q1.171875 0 2.234375 -0.375q1.0625 -0.375 1.875 -1.234375q0.8125 -0.875 1.28125 -2.3125q0.484375 -1.4375 0.484375 -3.5625zm21.304688 10.0l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm25.289062 3.5625q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm22.226562 5.359375l-3.40625 0l0 -12.515625q0 -2.265625 -0.84375 -3.390625q-0.84375 -1.125 -2.4375 -1.125q-0.671875 0 -1.28125 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.40625 1.234375q-0.765625 0.78125 -1.75 1.953125l0 13.015625l-3.40625 0l0 -27.59375l3.40625 0l0 7.984375l-0.125 3.078125q0.796875 -0.953125 1.5625 -1.609375q0.78125 -0.65625 1.546875 -1.0625q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.1875 1.65625 -0.1875q2.9375 0 4.53125 1.796875q1.609375 1.78125 1.609375 5.375l0 12.796875z" fill-rule="nonzero"></path><path fill="#000000" d="m231.48474 108.99001q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm5.296875 -26.40625l0 -3.234375l2.8125 0l0 3.234375l-2.8125 0zm0 19.671875l0 -16.59375l2.8125 0l0 16.59375l-2.8125 0zm7.09375 0l0 -16.59375l2.53125 0l0 2.359375q1.828125 -2.734375 5.28125 -2.734375q1.5 0 2.75 0.546875q1.265625 0.53125 1.890625 1.40625q0.625 0.875 0.875 2.078125q0.15625 0.78125 0.15625 2.734375l0 10.203125l-2.8125 0l0 -10.09375q0 -1.71875 -0.328125 -2.5625q-0.328125 -0.859375 -1.171875 -1.359375q-0.828125 -0.515625 -1.953125 -0.515625q-1.796875 0 -3.109375 1.140625q-1.296875 1.140625 -1.296875 4.328125l0 9.0625l-2.8125 0zm22.40625 0l-6.3125 -16.59375l2.96875 0l3.5625 9.9375q0.578125 1.609375 1.0625 3.34375q0.375 -1.3125 1.046875 -3.15625l3.6875 -10.125l2.890625 0l-6.28125 16.59375l-2.625 0zm10.34375 -8.296875q0 -4.609375 2.5625 -6.828125q2.140625 -1.84375 5.21875 -1.84375q3.421875 0 5.59375 2.25q2.171875 2.234375 2.171875 6.1875q0 3.203125 -0.96875 5.046875q-0.953125 1.828125 -2.796875 2.84375q-1.828125 1.015625 -4.0 1.015625q-3.484375 0 -5.640625 -2.234375q-2.140625 -2.234375 -2.140625 -6.4375zm2.890625 0q0 3.1875 1.390625 4.78125q1.390625 1.578125 3.5 1.578125q2.09375 0 3.484375 -1.59375q1.390625 -1.59375 1.390625 -4.859375q0 -3.078125 -1.40625 -4.65625q-1.390625 -1.59375 -3.46875 -1.59375q-2.109375 0 -3.5 1.578125q-1.390625 1.578125 -1.390625 4.765625zm15.96875 8.296875l0 -22.90625l2.8125 0l0 13.0625l6.65625 -6.75l3.640625 0l-6.34375 6.15625l6.984375 10.4375l-3.46875 0l-5.484375 -8.484375l-1.984375 1.90625l0 6.578125l-2.8125 0zm16.0 -19.671875l0 -3.234375l2.8125 0l0 3.234375l-2.8125 0zm0 19.671875l0 -16.59375l2.8125 0l0 16.59375l-2.8125 0zm7.09375 0l0 -16.59375l2.53125 0l0 2.359375q1.828125 -2.734375 5.28125 -2.734375q1.5 0 2.75 0.546875q1.265625 0.53125 1.890625 1.40625q0.625 0.875 0.875 2.078125q0.15625 0.78125 0.15625 2.734375l0 10.203125l-2.8125 0l0 -10.09375q0 -1.71875 -0.328125 -2.5625q-0.328125 -0.859375 -1.171875 -1.359375q-0.828125 -0.515625 -1.953125 -0.515625q-1.796875 0 -3.109375 1.140625q-1.296875 1.140625 -1.296875 4.328125l0 9.0625l-2.8125 0zm17.28125 1.375l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm24.875 14.953125l0 -22.953125l2.5625 0l0 2.15625q0.90625 -1.265625 2.046875 -1.890625q1.140625 -0.640625 2.765625 -0.640625q2.125 0 3.75 1.09375q1.625 1.09375 2.453125 3.09375q0.828125 1.984375 0.828125 4.359375q0 2.546875 -0.921875 4.59375q-0.90625 2.03125 -2.65625 3.125q-1.734375 1.078125 -3.65625 1.078125q-1.40625 0 -2.53125 -0.59375q-1.109375 -0.59375 -1.828125 -1.5l0 8.078125l-2.8125 0zm2.546875 -14.5625q0 3.203125 1.296875 4.734375q1.296875 1.53125 3.140625 1.53125q1.875 0 3.203125 -1.578125q1.34375 -1.59375 1.34375 -4.921875q0 -3.171875 -1.3125 -4.75q-1.296875 -1.578125 -3.109375 -1.578125q-1.796875 0 -3.1875 1.6875q-1.375 1.671875 -1.375 4.875zm15.21875 8.203125l0 -16.59375l2.53125 0l0 2.515625q0.96875 -1.765625 1.78125 -2.328125q0.828125 -0.5625 1.8125 -0.5625q1.421875 0 2.890625 0.90625l-0.96875 2.609375q-1.03125 -0.609375 -2.0625 -0.609375q-0.921875 0 -1.65625 0.5625q-0.734375 0.546875 -1.046875 1.53125q-0.46875 1.5 -0.46875 3.28125l0 8.6875l-2.8125 0zm9.640625 -8.296875q0 -4.609375 2.5625 -6.828125q2.140625 -1.84375 5.21875 -1.84375q3.421875 0 5.59375 2.25q2.171875 2.234375 2.171875 6.1875q0 3.203125 -0.96875 5.046875q-0.953125 1.828125 -2.796875 2.84375q-1.828125 1.015625 -4.0 1.015625q-3.484375 0 -5.640625 -2.234375q-2.140625 -2.234375 -2.140625 -6.4375zm2.890625 0q0 3.1875 1.390625 4.78125q1.390625 1.578125 3.5 1.578125q2.09375 0 3.484375 -1.59375q1.390625 -1.59375 1.390625 -4.859375q0 -3.078125 -1.40625 -4.65625q-1.390625 -1.59375 -3.46875 -1.59375q-2.109375 0 -3.5 1.578125q-1.390625 1.578125 -1.390625 4.765625zm26.78125 2.21875l2.765625 0.359375q-0.453125 2.859375 -2.328125 4.484375q-1.859375 1.609375 -4.578125 1.609375q-3.40625 0 -5.484375 -2.21875q-2.0625 -2.234375 -2.0625 -6.390625q0 -2.6875 0.890625 -4.703125q0.890625 -2.015625 2.703125 -3.015625q1.828125 -1.015625 3.96875 -1.015625q2.703125 0 4.421875 1.375q1.71875 1.359375 2.203125 3.875l-2.734375 0.421875q-0.390625 -1.671875 -1.390625 -2.515625q-0.984375 -0.84375 -2.390625 -0.84375q-2.125 0 -3.453125 1.53125q-1.328125 1.515625 -1.328125 4.8125q0 3.34375 1.28125 4.859375q1.28125 1.515625 3.34375 1.515625q1.65625 0 2.765625 -1.015625q1.109375 -1.015625 1.40625 -3.125zm16.53125 0.734375l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm14.546875 4.9375l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm16.0 0l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm18.96875 11.6875l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m411.1916 281.958l366.6142 0l0 73.165375l-366.6142 0z" fill-rule="evenodd"></path><path fill="#000000" d="m435.91034 329.358l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm26.523438 -1.234375q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.476562 -0.15625q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.054688 10.0l-16.03125 0l0 -3.171875l6.5625 0l0 -18.625l-6.109375 3.3125l-1.25 -2.890625l8.125 -4.265625l3.0 0l0 22.46875l5.703125 0l0 3.171875z" fill-rule="nonzero"></path><path fill="#000000" d="m537.6369 336.09238q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm4.15625 -11.6875l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546875l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703125q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm13.578125 0.46875q-1.5625 1.328125 -3.015625 1.875q-1.4375 0.546875 -3.09375 0.546875q-2.734375 0 -4.203125 -1.328125q-1.46875 -1.34375 -1.46875 -3.421875q0 -1.21875 0.546875 -2.21875q0.5625 -1.015625 1.453125 -1.625q0.90625 -0.609375 2.03125 -0.921875q0.828125 -0.21875 2.5 -0.421875q3.40625 -0.40625 5.015625 -0.96875q0.015625 -0.578125 0.015625 -0.734375q0 -1.71875 -0.796875 -2.421875q-1.078125 -0.953125 -3.203125 -0.953125q-1.984375 0 -2.9375 0.703125q-0.9375 0.6875 -1.390625 2.453125l-2.75 -0.375q0.375 -1.765625 1.234375 -2.84375q0.859375 -1.09375 2.484375 -1.671875q1.625 -0.59375 3.765625 -0.59375q2.125 0 3.453125 0.5q1.328125 0.5 1.953125 1.265625q0.625 0.75 0.875 1.90625q0.140625 0.71875 0.140625 2.59375l0 3.75q0 3.921875 0.171875 4.96875q0.1875 1.03125 0.71875 1.984375l-2.9375 0q-0.4375 -0.875 -0.5625 -2.046875zm-0.234375 -6.28125q-1.53125 0.625 -4.59375 1.0625q-1.734375 0.25 -2.453125 0.5625q-0.71875 0.3125 -1.109375 0.921875q-0.390625 0.59375 -0.390625 1.328125q0 1.125 0.84375 1.875q0.859375 0.75 2.5 0.75q1.625 0 2.890625 -0.703125q1.265625 -0.71875 1.859375 -1.953125q0.453125 -0.953125 0.453125 -2.8125l0 -1.03125zm6.6875 9.703125l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm27.34375 3.25l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm29.671875 7.1875l0 2.703125l-15.140625 0q-0.03125 -1.015625 0.328125 -1.953125q0.578125 -1.546875 1.84375 -3.046875q1.28125 -1.5 3.6875 -3.46875q3.734375 -3.0625 5.046875 -4.84375q1.3125 -1.796875 1.3125 -3.390625q0 -1.671875 -1.203125 -2.8125q-1.1875 -1.15625 -3.109375 -1.15625q-2.03125 0 -3.25 1.21875q-1.21875 1.21875 -1.234375 3.375l-2.890625 -0.296875q0.296875 -3.234375 2.234375 -4.921875q1.9375 -1.703125 5.203125 -1.703125q3.296875 0 5.21875 1.828125q1.921875 1.828125 1.921875 4.53125q0 1.375 -0.5625 2.703125q-0.5625 1.328125 -1.875 2.796875q-1.296875 1.46875 -4.328125 4.03125q-2.53125 2.125 -3.25 2.890625q-0.71875 0.75 -1.1875 1.515625l11.234375 0zm5.640625 9.4375l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m411.1916 353.958l337.63782 0l0 73.165375l-337.63782 0z" fill-rule="evenodd"></path><path fill="#000000" d="m435.91034 401.358l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm26.523438 -1.234375q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.476562 -0.15625q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.273438 10.0l-16.8125 0l0 -3.046875l6.59375 -6.5625q1.625 -1.609375 2.640625 -2.78125q1.015625 -1.171875 1.578125 -2.125q0.578125 -0.96875 0.765625 -1.828125q0.203125 -0.859375 0.203125 -1.859375q0 -0.9375 -0.265625 -1.78125q-0.25 -0.859375 -0.78125 -1.5q-0.515625 -0.640625 -1.359375 -1.015625q-0.84375 -0.375 -2.015625 -0.375q-1.625 0 -2.953125 0.734375q-1.328125 0.71875 -2.4375 1.859375l-1.875 -2.234375q1.453125 -1.53125 3.328125 -2.4375q1.890625 -0.921875 4.390625 -0.921875q1.703125 0 3.09375 0.515625q1.390625 0.5 2.40625 1.453125q1.015625 0.953125 1.578125 2.34375q0.5625 1.390625 0.5625 3.125q0 1.46875 -0.390625 2.71875q-0.390625 1.25 -1.1875 2.484375q-0.796875 1.234375 -2.0 2.5625q-1.1875 1.328125 -2.828125 2.921875l-4.640625 4.5l12.40625 0l0 3.25z" fill-rule="nonzero"></path><path fill="#000000" d="m537.6369 408.09238q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.15625q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515625 4.671875 15.015625l-2.015625 0zm4.15625 -11.6875l2.78125 -0.4375q0.234375 1.671875 1.296875 2.5625q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.953125 -0.828125 -1.5q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.40625q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546875l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703125q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm13.578125 0.46875q-1.5625 1.328125 -3.015625 1.875q-1.4375 0.546875 -3.09375 0.546875q-2.734375 0 -4.203125 -1.328125q-1.46875 -1.34375 -1.46875 -3.421875q0 -1.21875 0.546875 -2.21875q0.5625 -1.015625 1.453125 -1.625q0.90625 -0.609375 2.03125 -0.921875q0.828125 -0.21875 2.5 -0.421875q3.40625 -0.40625 5.015625 -0.96875q0.015625 -0.578125 0.015625 -0.734375q0 -1.71875 -0.796875 -2.421875q-1.078125 -0.953125 -3.203125 -0.953125q-1.984375 0 -2.9375 0.703125q-0.9375 0.6875 -1.390625 2.453125l-2.75 -0.375q0.375 -1.765625 1.234375 -2.84375q0.859375 -1.09375 2.484375 -1.671875q1.625 -0.59375 3.765625 -0.59375q2.125 0 3.453125 0.5q1.328125 0.5 1.953125 1.265625q0.625 0.75 0.875 1.90625q0.140625 0.71875 0.140625 2.59375l0 3.75q0 3.921875 0.171875 4.96875q0.1875 1.03125 0.71875 1.984375l-2.9375 0q-0.4375 -0.875 -0.5625 -2.046875zm-0.234375 -6.28125q-1.53125 0.625 -4.59375 1.0625q-1.734375 0.25 -2.453125 0.5625q-0.71875 0.3125 -1.109375 0.921875q-0.390625 0.59375 -0.390625 1.328125q0 1.125 0.84375 1.875q0.859375 0.75 2.5 0.75q1.625 0 2.890625 -0.703125q1.265625 -0.71875 1.859375 -1.953125q0.453125 -0.953125 0.453125 -2.8125l0 -1.03125zm6.6875 9.703125l2.734375 0.40625q0.171875 1.265625 0.953125 1.84375q1.046875 0.78125 2.859375 0.78125q1.953125 0 3.015625 -0.78125q1.0625 -0.78125 1.4375 -2.1875q0.21875 -0.859375 0.203125 -3.609375q-1.84375 2.171875 -4.59375 2.171875q-3.421875 0 -5.296875 -2.46875q-1.875 -2.46875 -1.875 -5.921875q0 -2.375 0.859375 -4.375q0.859375 -2.015625 2.484375 -3.109375q1.640625 -1.09375 3.84375 -1.09375q2.9375 0 4.84375 2.375l0 -2.0l2.59375 0l0 14.34375q0 3.875 -0.796875 5.484375q-0.78125 1.625 -2.5 2.5625q-1.703125 0.9375 -4.203125 0.9375q-2.96875 0 -4.796875 -1.34375q-1.828125 -1.328125 -1.765625 -4.015625zm2.328125 -9.96875q0 3.265625 1.296875 4.765625q1.296875 1.5 3.25 1.5q1.9375 0 3.25 -1.484375q1.3125 -1.5 1.3125 -4.6875q0 -3.046875 -1.359375 -4.59375q-1.34375 -1.546875 -3.25 -1.546875q-1.875 0 -3.1875 1.53125q-1.3125 1.515625 -1.3125 4.515625zm27.34375 3.25l2.90625 0.359375q-0.6875 2.546875 -2.546875 3.953125q-1.859375 1.40625 -4.75 1.40625q-3.640625 0 -5.78125 -2.234375q-2.125 -2.25 -2.125 -6.296875q0 -4.1875 2.15625 -6.5q2.15625 -2.3125 5.59375 -2.3125q3.328125 0 5.4375 2.265625q2.109375 2.265625 2.109375 6.375q0 0.25 -0.015625 0.75l-12.375 0q0.15625 2.734375 1.546875 4.1875q1.390625 1.453125 3.46875 1.453125q1.546875 0 2.640625 -0.8125q1.09375 -0.8125 1.734375 -2.59375zm-9.234375 -4.546875l9.265625 0q-0.1875 -2.09375 -1.0625 -3.140625q-1.34375 -1.625 -3.484375 -1.625q-1.9375 0 -3.265625 1.296875q-1.3125 1.296875 -1.453125 3.46875zm29.671875 7.1875l0 2.703125l-15.140625 0q-0.03125 -1.015625 0.328125 -1.953125q0.578125 -1.546875 1.84375 -3.046875q1.28125 -1.5 3.6875 -3.46875q3.734375 -3.0625 5.046875 -4.84375q1.3125 -1.796875 1.3125 -3.390625q0 -1.671875 -1.203125 -2.8125q-1.1875 -1.15625 -3.109375 -1.15625q-2.03125 0 -3.25 1.21875q-1.21875 1.21875 -1.234375 3.375l-2.890625 -0.296875q0.296875 -3.234375 2.234375 -4.921875q1.9375 -1.703125 5.203125 -1.703125q3.296875 0 5.21875 1.828125q1.921875 1.828125 1.921875 4.53125q0 1.375 -0.5625 2.703125q-0.5625 1.328125 -1.875 2.796875q-1.296875 1.46875 -4.328125 4.03125q-2.53125 2.125 -3.25 2.890625q-0.71875 0.75 -1.1875 1.515625l11.234375 0zm5.640625 9.4375l-2.015625 0q4.671875 -7.5 4.671875 -15.015625q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.21875 -1.625 8.15625q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m548.29395 225.20079l224.94489 0l0 22.582672l-224.94489 0z" fill-rule="evenodd"></path><path fill="#cfe2f3" d="m540.3686 272.76642c4.947693 0 8.958618 -4.010956 8.958618 -8.958679l-8.958618 0c2.473877 0 4.479309 -2.0054626 4.479309 -4.4793396c0 -2.4738464 -2.0054321 -4.4793243 -4.479309 -4.4793243l8.958618 0l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.96497 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626l0 0c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679zm26.875977 -134.37993l0 0c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243z" fill-rule="evenodd"></path><path fill="#a5b4c2" d="m567.24457 138.38649l0 0c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243zm-17.917358 125.42125c0 4.9477234 -4.0109253 8.958679 -8.958618 8.958679c-4.947754 0 -8.958679 -4.010956 -8.958679 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958679 -8.958664l0 0c2.473877 0 4.479309 2.005478 4.479309 4.4793243c0 2.473877 -2.0054321 4.4793396 -4.479309 4.4793396z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m549.3272 254.84908l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.96497 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626l0 0c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679l-152.9649 0c-4.947754 0 -8.958679 -4.010956 -8.958679 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958679 -8.958664zm8.958679 -125.42125l0 0c4.947754 0 8.958679 4.0109253 8.958679 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243l8.958679 0m135.0476 8.958649l-144.00629 0m-17.917297 107.50394l0 0c2.473877 0 4.479309 2.005478 4.479309 4.4793243c0 2.473877 -2.0054321 4.4793396 -4.479309 4.4793396l8.958618 0m-8.958618 8.958679c4.947693 0 8.958618 -4.010956 8.958618 -8.958679l0 -8.958664" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m549.3272 254.84908l0 -116.462585l0 0c0 -4.9477386 4.0109253 -8.958664 8.958679 -8.958664l152.96497 0c4.947693 0 8.958618 4.0109253 8.958618 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958618 8.958649l-8.958679 0l0 116.4626l0 0c0 4.9477234 -4.0109253 8.958679 -8.958679 8.958679l-152.9649 0c-4.947754 0 -8.958679 -4.010956 -8.958679 -8.958679c0 -4.9477234 4.0109253 -8.958664 8.958679 -8.958664zm8.958679 -125.42125l0 0c4.947754 0 8.958679 4.0109253 8.958679 8.958664c0 4.9477234 -4.0109253 8.958649 -8.958679 8.958649c-2.473877 0 -4.479309 -2.0054626 -4.479309 -4.4793243c0 -2.4738617 2.0054321 -4.4793243 4.479309 -4.4793243l8.958679 0m135.0476 8.958649l-144.00629 0m-17.917297 107.50394l0 0c2.473877 0 4.479309 2.005478 4.479309 4.4793243c0 2.473877 -2.0054321 4.4793396 -4.479309 4.4793396l8.958618 0m-8.958618 8.958679c4.947693 0 8.958618 -4.010956 8.958618 -8.958679l0 -8.958664" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m580.169 158.97638l91.28137 0l0 38.23622l-91.28137 0z" fill-rule="evenodd"></path><path fill="#000000" d="m606.6378 183.95448l0 -1.25q-0.453125 0.671875 -1.1875 1.0625q-0.734375 0.375 -1.5625 0.375q-0.828125 0 -1.5 -0.359375q-0.65625 -0.375 -0.953125 -1.03125q-0.296875 -0.671875 -0.296875 -1.84375l0 -5.25l2.1875 0l0 3.8125q0 1.75 0.125 2.140625q0.125 0.390625 0.4375 0.625q0.328125 0.234375 0.8125 0.234375q0.5625 0 1.0 -0.3125q0.453125 -0.3125 0.609375 -0.765625q0.171875 -0.453125 0.171875 -2.234375l0 -3.5l2.203125 0l0 8.296875l-2.046875 0zm4.3203125 0l0 -11.453125l2.1875 0l0 11.453125l-2.1875 0zm4.4453125 -9.421875l0 -2.03125l2.1875 0l0 2.03125l-2.1875 0zm0 9.421875l0 -8.296875l2.1875 0l0 8.296875l-2.1875 0zm4.2734375 -8.296875l2.03125 0l0 1.125q1.078125 -1.3125 2.578125 -1.3125q0.796875 0 1.375 0.328125q0.59375 0.328125 0.96875 0.984375q0.546875 -0.65625 1.171875 -0.984375q0.640625 -0.328125 1.359375 -0.328125q0.921875 0 1.546875 0.375q0.640625 0.359375 0.953125 1.078125q0.21875 0.53125 0.21875 1.71875l0 5.3125l-2.1875 0l0 -4.75q0 -1.234375 -0.234375 -1.59375q-0.296875 -0.46875 -0.9375 -0.46875q-0.453125 0 -0.859375 0.28125q-0.40625 0.28125 -0.59375 0.828125q-0.171875 0.546875 -0.171875 1.71875l0 3.984375l-2.203125 0l0 -4.546875q0 -1.21875 -0.125 -1.5625q-0.109375 -0.359375 -0.359375 -0.53125q-0.234375 -0.171875 -0.65625 -0.171875q-0.515625 0 -0.921875 0.28125q-0.40625 0.265625 -0.578125 0.78125q-0.171875 0.515625 -0.171875 1.71875l0 4.03125l-2.203125 0l0 -8.296875zm14.3984375 -1.125l0 -2.03125l2.1875 0l0 2.03125l-2.1875 0zm0 9.421875l0 -8.296875l2.1875 0l0 8.296875l-2.1875 0zm8.2421875 -8.296875l0 1.75l-1.5 0l0 3.34375q0 1.015625 0.046875 1.1875q0.046875 0.15625 0.1875 0.265625q0.15625 0.109375 0.375 0.109375q0.3125 0 0.890625 -0.203125l0.1875 1.703125q-0.765625 0.328125 -1.734375 0.328125q-0.59375 0 -1.078125 -0.203125q-0.46875 -0.203125 -0.703125 -0.515625q-0.21875 -0.3125 -0.296875 -0.859375q-0.078125 -0.375 -0.078125 -1.546875l0 -3.609375l-1.0 0l0 -1.75l1.0 0l0 -1.65625l2.203125 -1.28125l0 2.9375l1.5 0zm0.75 5.921875l2.203125 -0.328125q0.140625 0.640625 0.5625 0.96875q0.4375 0.328125 1.21875 0.328125q0.84375 0 1.28125 -0.3125q0.28125 -0.21875 0.28125 -0.578125q0 -0.25 -0.15625 -0.421875q-0.15625 -0.15625 -0.734375 -0.28125q-2.65625 -0.59375 -3.359375 -1.078125q-0.984375 -0.671875 -0.984375 -1.859375q0 -1.078125 0.84375 -1.8125q0.859375 -0.734375 2.640625 -0.734375q1.703125 0 2.53125 0.5625q0.828125 0.546875 1.140625 1.625l-2.0625 0.390625q-0.140625 -0.484375 -0.515625 -0.734375q-0.359375 -0.265625 -1.046875 -0.265625q-0.875 0 -1.25 0.234375q-0.25 0.171875 -0.25 0.453125q0 0.234375 0.21875 0.390625q0.296875 0.21875 2.046875 0.625q1.765625 0.390625 2.453125 0.96875q0.6875 0.59375 0.6875 1.640625q0 1.140625 -0.953125 1.96875q-0.953125 0.8125 -2.8125 0.8125q-1.703125 0 -2.6875 -0.6875q-0.984375 -0.6875 -1.296875 -1.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m566.68335 206.75328l126.56848 0l0 54.61418l-126.56848 0z" fill-rule="evenodd"></path><path fill="#000000" d="m576.0427 221.941q0 -1.578125 0.890625 -2.34375q0.734375 -0.625 1.796875 -0.625q1.171875 0 1.90625 0.765625q0.75 0.765625 0.75 2.125q0 1.109375 -0.328125 1.75q-0.328125 0.625 -0.96875 0.96875q-0.625 0.34375 -1.359375 0.34375q-1.203125 0 -1.953125 -0.765625q-0.734375 -0.765625 -0.734375 -2.21875zm1.0 0q0 1.109375 0.46875 1.65625q0.484375 0.53125 1.21875 0.53125q0.71875 0 1.1875 -0.546875q0.484375 -0.546875 0.484375 -1.671875q0 -1.046875 -0.484375 -1.59375q-0.484375 -0.546875 -1.1875 -0.546875q-0.734375 0 -1.21875 0.546875q-0.46875 0.53125 -0.46875 1.625zm5.2858276 5.046875l0 -7.890625l0.890625 0l0 0.734375q0.3125 -0.421875 0.703125 -0.640625q0.390625 -0.21875 0.953125 -0.21875q0.71875 0 1.28125 0.375q0.5625 0.375 0.84375 1.0625q0.28125 0.671875 0.28125 1.5q0 0.875 -0.3125 1.578125q-0.3125 0.6875 -0.921875 1.0625q-0.59375 0.375 -1.25 0.375q-0.484375 0 -0.875 -0.203125q-0.375 -0.203125 -0.625 -0.515625l0 2.78125l-0.96875 0zm0.875 -5.0q0 1.09375 0.453125 1.625q0.453125 0.515625 1.078125 0.515625q0.640625 0 1.09375 -0.53125q0.46875 -0.546875 0.46875 -1.703125q0 -1.078125 -0.453125 -1.625q-0.4375 -0.546875 -1.0625 -0.546875q-0.625 0 -1.109375 0.578125q-0.46875 0.578125 -0.46875 1.6875zm8.957764 0.96875l1.0 0.125q-0.234375 0.875 -0.875 1.359375q-0.640625 0.484375 -1.625 0.484375q-1.25 0 -1.984375 -0.765625q-0.734375 -0.765625 -0.734375 -2.15625q0 -1.453125 0.734375 -2.234375q0.75 -0.796875 1.921875 -0.796875q1.15625 0 1.875 0.78125q0.71875 0.765625 0.71875 2.1875q0 0.078125 0 0.25l-4.25 0q0.046875 0.9375 0.515625 1.4375q0.484375 0.5 1.203125 0.5q0.53125 0 0.90625 -0.265625q0.375 -0.28125 0.59375 -0.90625zm-3.171875 -1.5625l3.1875 0q-0.0625 -0.71875 -0.359375 -1.078125q-0.46875 -0.546875 -1.203125 -0.546875q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.5 1.171875zm5.1921387 3.40625l0 -5.703125l0.875 0l0 0.8125q0.625 -0.9375 1.8125 -0.9375q0.515625 0 0.953125 0.1875q0.4375 0.171875 0.640625 0.484375q0.21875 0.296875 0.3125 0.703125q0.046875 0.28125 0.046875 0.953125l0 3.5l-0.96875 0l0 -3.46875q0 -0.59375 -0.109375 -0.875q-0.109375 -0.296875 -0.40625 -0.46875q-0.28125 -0.1875 -0.671875 -0.1875q-0.609375 0 -1.0625 0.390625q-0.453125 0.390625 -0.453125 1.5l0 3.109375l-0.96875 0zm9.121521 0l0 -4.953125l-0.84375 0l0 -0.75l0.84375 0l0 -0.609375q0 -0.578125 0.109375 -0.859375q0.140625 -0.375 0.484375 -0.609375q0.359375 -0.234375 0.984375 -0.234375q0.40625 0 0.90625 0.109375l-0.140625 0.84375q-0.3125 -0.0625 -0.578125 -0.0625q-0.4375 0 -0.625 0.1875q-0.171875 0.1875 -0.171875 0.703125l0 0.53125l1.109375 0l0 0.75l-1.109375 0l0 4.953125l-0.96875 0zm2.7418823 -6.765625l0 -1.109375l0.96875 0l0 1.109375l-0.96875 0zm0 6.765625l0 -5.703125l0.96875 0l0 5.703125l-0.96875 0zm2.3362427 0l0 -7.875l0.96875 0l0 7.875l-0.96875 0zm6.2893677 -1.84375l1.0 0.125q-0.234375 0.875 -0.875 1.359375q-0.640625 0.484375 -1.625 0.484375q-1.25 0 -1.984375 -0.765625q-0.734375 -0.765625 -0.734375 -2.15625q0 -1.453125 0.734375 -2.234375q0.75 -0.796875 1.921875 -0.796875q1.15625 0 1.875 0.78125q0.71875 0.765625 0.71875 2.1875q0 0.078125 0 0.25l-4.25 0q0.046875 0.9375 0.515625 1.4375q0.484375 0.5 1.203125 0.5q0.53125 0 0.90625 -0.265625q0.375 -0.28125 0.59375 -0.90625zm-3.171875 -1.5625l3.1875 0q-0.0625 -0.71875 -0.359375 -1.078125q-0.46875 -0.546875 -1.203125 -0.546875q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.5 1.171875zm4.8170776 1.703125l0.953125 -0.15625q0.078125 0.578125 0.4375 0.890625q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.640625q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.484375 -0.28125 0.90625q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.375zm13.757568 -2.921875l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm0 2.390625l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm7.464966 2.234375l-0.96875 0l0 -6.15625q-0.34375 0.328125 -0.90625 0.671875q-0.5625 0.328125 -1.015625 0.484375l0 -0.9375q0.8125 -0.375 1.40625 -0.90625q0.609375 -0.546875 0.859375 -1.0625l0.625 0l0 7.90625zm2.2858887 -3.890625q0 -1.390625 0.28125 -2.234375q0.296875 -0.859375 0.859375 -1.3125q0.578125 -0.46875 1.4375 -0.46875q0.625 0 1.09375 0.265625q0.484375 0.25 0.796875 0.734375q0.3125 0.46875 0.484375 1.171875q0.1875 0.6875 0.1875 1.84375q0 1.390625 -0.296875 2.25q-0.28125 0.84375 -0.84375 1.3125q-0.5625 0.46875 -1.421875 0.46875q-1.140625 0 -1.796875 -0.828125q-0.78125 -0.984375 -0.78125 -3.203125zm1.0 0q0 1.953125 0.453125 2.59375q0.453125 0.640625 1.125 0.640625q0.65625 0 1.109375 -0.640625q0.453125 -0.65625 0.453125 -2.59375q0 -1.9375 -0.453125 -2.578125q-0.453125 -0.640625 -1.125 -0.640625q-0.671875 0 -1.0625 0.5625q-0.5 0.71875 -0.5 2.65625zm4.9264526 0q0 -1.390625 0.28125 -2.234375q0.296875 -0.859375 0.859375 -1.3125q0.578125 -0.46875 1.4375 -0.46875q0.625 0 1.09375 0.265625q0.484375 0.25 0.796875 0.734375q0.3125 0.46875 0.484375 1.171875q0.1875 0.6875 0.1875 1.84375q0 1.390625 -0.296875 2.25q-0.28125 0.84375 -0.84375 1.3125q-0.5625 0.46875 -1.421875 0.46875q-1.140625 0 -1.796875 -0.828125q-0.78125 -0.984375 -0.78125 -3.203125zm1.0 0q0 1.953125 0.453125 2.59375q0.453125 0.640625 1.125 0.640625q0.65625 0 1.109375 -0.640625q0.453125 -0.65625 0.453125 -2.59375q0 -1.9375 -0.453125 -2.578125q-0.453125 -0.640625 -1.125 -0.640625q-0.671875 0 -1.0625 0.5625q-0.5 0.71875 -0.5 2.65625zm4.9265137 0q0 -1.390625 0.28125 -2.234375q0.296875 -0.859375 0.859375 -1.3125q0.578125 -0.46875 1.4375 -0.46875q0.625 0 1.09375 0.265625q0.484375 0.25 0.796875 0.734375q0.3125 0.46875 0.484375 1.171875q0.1875 0.6875 0.1875 1.84375q0 1.390625 -0.296875 2.25q-0.28125 0.84375 -0.84375 1.3125q-0.5625 0.46875 -1.421875 0.46875q-1.140625 0 -1.796875 -0.828125q-0.78125 -0.984375 -0.78125 -3.203125zm1.0 0q0 1.953125 0.453125 2.59375q0.453125 0.640625 1.125 0.640625q0.65625 0 1.109375 -0.640625q0.453125 -0.65625 0.453125 -2.59375q0 -1.9375 -0.453125 -2.578125q-0.453125 -0.640625 -1.125 -0.640625q-0.671875 0 -1.0625 0.5625q-0.5 0.71875 -0.5 2.65625z" fill-rule="nonzero"></path><path fill="#000000" d="m576.0271 236.09724l0.953125 -0.15625q0.078125 0.578125 0.4375 0.890625q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.640625q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.484375 -0.28125 0.90625q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.375zm7.828125 0.84375l0.125 0.84375q-0.40625 0.09375 -0.71875 0.09375q-0.53125 0 -0.828125 -0.171875q-0.28125 -0.171875 -0.40625 -0.4375q-0.109375 -0.265625 -0.109375 -1.140625l0 -3.28125l-0.71875 0l0 -0.75l0.71875 0l0 -1.40625l0.953125 -0.59375l0 2.0l0.984375 0l0 0.75l-0.984375 0l0 3.34375q0 0.40625 0.046875 0.53125q0.0625 0.109375 0.171875 0.1875q0.125 0.0625 0.328125 0.0625q0.171875 0 0.4375 -0.03125zm4.5700073 0.15625q-0.546875 0.453125 -1.046875 0.640625q-0.484375 0.1875 -1.0625 0.1875q-0.9375 0 -1.453125 -0.453125q-0.5 -0.46875 -0.5 -1.171875q0 -0.421875 0.1875 -0.765625q0.203125 -0.34375 0.5 -0.546875q0.3125 -0.21875 0.703125 -0.328125q0.28125 -0.078125 0.859375 -0.140625q1.171875 -0.140625 1.71875 -0.34375q0.015625 -0.1875 0.015625 -0.25q0 -0.59375 -0.28125 -0.828125q-0.359375 -0.328125 -1.09375 -0.328125q-0.6875 0 -1.015625 0.234375q-0.3125 0.234375 -0.46875 0.84375l-0.953125 -0.125q0.125 -0.609375 0.421875 -0.984375q0.296875 -0.375 0.859375 -0.5625q0.5625 -0.203125 1.296875 -0.203125q0.734375 0 1.1875 0.171875q0.453125 0.171875 0.65625 0.4375q0.21875 0.25 0.3125 0.640625q0.046875 0.25 0.046875 0.90625l0 1.28125q0 1.34375 0.0625 1.703125q0.0625 0.359375 0.25 0.6875l-1.015625 0q-0.15625 -0.296875 -0.1875 -0.703125zm-0.09375 -2.15625q-0.515625 0.21875 -1.578125 0.359375q-0.59375 0.09375 -0.84375 0.203125q-0.234375 0.09375 -0.375 0.3125q-0.140625 0.203125 -0.140625 0.453125q0 0.390625 0.296875 0.65625q0.296875 0.25 0.859375 0.25q0.5625 0 0.984375 -0.25q0.4375 -0.25 0.65625 -0.671875q0.140625 -0.328125 0.140625 -0.96875l0 -0.34375zm6.0202637 0.765625l0.9375 0.125q-0.140625 0.984375 -0.796875 1.546875q-0.640625 0.546875 -1.5625 0.546875q-1.171875 0 -1.890625 -0.765625q-0.703125 -0.765625 -0.703125 -2.1875q0 -0.921875 0.296875 -1.609375q0.3125 -0.703125 0.9375 -1.046875q0.625 -0.34375 1.359375 -0.34375q0.921875 0 1.515625 0.46875q0.59375 0.46875 0.765625 1.328125l-0.953125 0.140625q-0.125 -0.5625 -0.46875 -0.84375q-0.34375 -0.296875 -0.828125 -0.296875q-0.71875 0 -1.1875 0.53125q-0.453125 0.515625 -0.453125 1.640625q0 1.15625 0.4375 1.671875q0.4375 0.515625 1.15625 0.515625q0.5625 0 0.9375 -0.34375q0.390625 -0.34375 0.5 -1.078125zm1.609375 2.09375l0 -7.875l0.96875 0l0 4.484375l2.28125 -2.3125l1.25 0l-2.171875 2.109375l2.390625 3.59375l-1.1875 0l-1.890625 -2.921875l-0.671875 0.65625l0 2.265625l-0.96875 0zm7.8981323 -1.703125l0.953125 -0.15625q0.078125 0.578125 0.4375 0.890625q0.375 0.296875 1.03125 0.296875q0.671875 0 0.984375 -0.265625q0.328125 -0.265625 0.328125 -0.640625q0 -0.328125 -0.28125 -0.515625q-0.203125 -0.125 -0.984375 -0.328125q-1.0625 -0.265625 -1.484375 -0.453125q-0.40625 -0.203125 -0.625 -0.546875q-0.203125 -0.34375 -0.203125 -0.765625q0 -0.390625 0.171875 -0.703125q0.171875 -0.328125 0.484375 -0.546875q0.21875 -0.171875 0.609375 -0.28125q0.390625 -0.109375 0.828125 -0.109375q0.671875 0 1.171875 0.1875q0.515625 0.1875 0.75 0.53125q0.25 0.328125 0.34375 0.875l-0.9375 0.125q-0.078125 -0.4375 -0.390625 -0.671875q-0.296875 -0.25 -0.859375 -0.25q-0.671875 0 -0.953125 0.21875q-0.28125 0.21875 -0.28125 0.515625q0 0.1875 0.109375 0.328125q0.125 0.15625 0.375 0.265625q0.140625 0.046875 0.859375 0.25q1.015625 0.265625 1.421875 0.4375q0.40625 0.171875 0.640625 0.515625q0.234375 0.328125 0.234375 0.828125q0 0.484375 -0.28125 0.90625q-0.28125 0.421875 -0.8125 0.65625q-0.53125 0.234375 -1.203125 0.234375q-1.109375 0 -1.703125 -0.453125q-0.578125 -0.46875 -0.734375 -1.375zm5.71875 -5.0625l0 -1.109375l0.96875 0l0 1.109375l-0.96875 0zm0 6.765625l0 -5.703125l0.96875 0l0 5.703125l-0.96875 0zm1.8518677 0l0 -0.78125l3.625 -4.171875q-0.609375 0.03125 -1.09375 0.03125l-2.3125 0l0 -0.78125l4.65625 0l0 0.640625l-3.09375 3.625l-0.59375 0.65625q0.65625 -0.046875 1.21875 -0.046875l2.640625 0l0 0.828125l-5.046875 0zm9.734375 -1.84375l1.0 0.125q-0.234375 0.875 -0.875 1.359375q-0.640625 0.484375 -1.625 0.484375q-1.25 0 -1.984375 -0.765625q-0.734375 -0.765625 -0.734375 -2.15625q0 -1.453125 0.734375 -2.234375q0.75 -0.796875 1.921875 -0.796875q1.15625 0 1.875 0.78125q0.71875 0.765625 0.71875 2.1875q0 0.078125 0 0.25l-4.25 0q0.046875 0.9375 0.515625 1.4375q0.484375 0.5 1.203125 0.5q0.53125 0 0.90625 -0.265625q0.375 -0.28125 0.59375 -0.90625zm-3.171875 -1.5625l3.1875 0q-0.0625 -0.71875 -0.359375 -1.078125q-0.46875 -0.546875 -1.203125 -0.546875q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.5 1.171875zm13.246521 -1.21875l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm0 2.390625l-5.203125 0l0 -0.90625l5.203125 0l0 0.90625zm5.308716 -2.03125q-0.59375 -0.21875 -0.890625 -0.625q-0.28125 -0.421875 -0.28125 -0.984375q0 -0.859375 0.609375 -1.4375q0.625 -0.59375 1.65625 -0.59375q1.03125 0 1.65625 0.609375q0.625 0.59375 0.625 1.453125q0 0.546875 -0.296875 0.953125q-0.28125 0.40625 -0.859375 0.625q0.71875 0.234375 1.09375 0.765625q0.390625 0.515625 0.390625 1.25q0 1.015625 -0.71875 1.703125q-0.71875 0.6875 -1.875 0.6875q-1.171875 0 -1.890625 -0.6875q-0.703125 -0.703125 -0.703125 -1.734375q0 -0.765625 0.375 -1.28125q0.390625 -0.515625 1.109375 -0.703125zm-0.1875 -1.640625q0 0.5625 0.359375 0.921875q0.359375 0.34375 0.9375 0.34375q0.5625 0 0.90625 -0.34375q0.359375 -0.359375 0.359375 -0.875q0 -0.53125 -0.375 -0.890625q-0.359375 -0.359375 -0.90625 -0.359375q-0.546875 0 -0.921875 0.359375q-0.359375 0.34375 -0.359375 0.84375zm-0.3125 3.640625q0 0.40625 0.1875 0.796875q0.203125 0.390625 0.59375 0.609375q0.390625 0.203125 0.828125 0.203125q0.703125 0 1.140625 -0.4375q0.453125 -0.453125 0.453125 -1.140625q0 -0.703125 -0.46875 -1.15625q-0.453125 -0.453125 -1.15625 -0.453125q-0.671875 0 -1.125 0.453125q-0.453125 0.4375 -0.453125 1.125zm8.582764 2.265625l-0.96875 0l0 -6.15625q-0.34375 0.328125 -0.90625 0.671875q-0.5625 0.328125 -1.015625 0.484375l0 -0.9375q0.8125 -0.375 1.40625 -0.90625q0.609375 -0.546875 0.859375 -1.0625l0.625 0l0 7.90625zm2.4420776 -1.828125l0.921875 -0.078125q0.125 0.65625 0.453125 0.953125q0.328125 0.296875 0.859375 0.296875q0.4375 0 0.765625 -0.203125q0.34375 -0.203125 0.5625 -0.546875q0.21875 -0.34375 0.359375 -0.921875q0.140625 -0.578125 0.140625 -1.1875q0 -0.0625 0 -0.1875q-0.296875 0.453125 -0.796875 0.75q-0.5 0.28125 -1.09375 0.28125q-0.96875 0 -1.65625 -0.703125q-0.671875 -0.71875 -0.671875 -1.875q0 -1.203125 0.703125 -1.921875q0.71875 -0.734375 1.78125 -0.734375q0.765625 0 1.390625 0.421875q0.640625 0.40625 0.96875 1.171875q0.34375 0.765625 0.34375 2.21875q0 1.5 -0.328125 2.40625q-0.328125 0.890625 -0.984375 1.359375q-0.640625 0.46875 -1.515625 0.46875q-0.921875 0 -1.515625 -0.515625q-0.578125 -0.515625 -0.6875 -1.453125zm3.953125 -3.46875q0 -0.828125 -0.453125 -1.3125q-0.4375 -0.5 -1.0625 -0.5q-0.640625 0 -1.125 0.53125q-0.46875 0.53125 -0.46875 1.359375q0 0.75 0.453125 1.21875q0.453125 0.46875 1.125 0.46875q0.671875 0 1.09375 -0.46875q0.4375 -0.46875 0.4375 -1.296875zm6.8952637 4.375l0 0.921875l-5.203125 0q0 -0.34375 0.125 -0.671875q0.1875 -0.53125 0.625 -1.046875q0.4375 -0.515625 1.265625 -1.1875q1.28125 -1.0625 1.734375 -1.671875q0.453125 -0.609375 0.453125 -1.15625q0 -0.578125 -0.40625 -0.96875q-0.40625 -0.40625 -1.078125 -0.40625q-0.6875 0 -1.109375 0.421875q-0.421875 0.421875 -0.421875 1.15625l-1.0 -0.09375q0.109375 -1.109375 0.765625 -1.6875q0.671875 -0.59375 1.796875 -0.59375q1.125 0 1.78125 0.625q0.671875 0.625 0.671875 1.5625q0 0.46875 -0.203125 0.9375q-0.1875 0.453125 -0.640625 0.953125q-0.4375 0.5 -1.484375 1.390625q-0.875 0.71875 -1.125 0.984375q-0.234375 0.265625 -0.40625 0.53125l3.859375 0z" fill-rule="nonzero"></path><path fill="#000000" d="m576.68335 250.80037l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0zm2.9606323 0l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0zm2.9606323 0l0 -1.09375l1.09375 0l0 1.09375l-1.09375 0z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m777.8058 423.8609l78.897644 0l0 16.59842l-78.897644 0z" fill-rule="evenodd"></path><path fill="#999999" d="m795.09015 434.49136l1.125 0.140625q-0.171875 1.171875 -0.9375 1.828125q-0.765625 0.65625 -1.859375 0.65625q-1.390625 0 -2.234375 -0.90625q-0.828125 -0.90625 -0.828125 -2.59375q0 -1.09375 0.359375 -1.90625q0.359375 -0.828125 1.09375 -1.234375q0.734375 -0.40625 1.609375 -0.40625q1.09375 0 1.796875 0.5625q0.703125 0.546875 0.890625 1.5625l-1.109375 0.171875q-0.15625 -0.671875 -0.5625 -1.015625q-0.390625 -0.34375 -0.96875 -0.34375q-0.859375 0 -1.40625 0.625q-0.53125 0.609375 -0.53125 1.953125q0 1.359375 0.515625 1.984375q0.515625 0.609375 1.359375 0.609375q0.671875 0 1.125 -0.40625q0.453125 -0.421875 0.5625 -1.28125zm1.8515625 -0.90625q0 -1.875 1.03125 -2.765625q0.875 -0.75 2.125 -0.75q1.390625 0 2.265625 0.90625q0.890625 0.90625 0.890625 2.515625q0 1.296875 -0.390625 2.046875q-0.390625 0.75 -1.140625 1.171875q-0.75 0.40625 -1.625 0.40625q-1.421875 0 -2.296875 -0.90625q-0.859375 -0.90625 -0.859375 -2.625zm1.171875 0q0 1.296875 0.5625 1.953125q0.5625 0.640625 1.421875 0.640625q0.84375 0 1.40625 -0.640625q0.578125 -0.65625 0.578125 -1.984375q0 -1.25 -0.578125 -1.890625q-0.5625 -0.65625 -1.40625 -0.65625q-0.859375 0 -1.421875 0.640625q-0.5625 0.640625 -0.5625 1.9375zm6.6624756 3.375l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm9.912476 -1.015625l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.593628 0.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm3.1156006 -4.59375l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.9610596 0l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm12.021851 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.5374756 4.015625l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0z" fill-rule="nonzero"></path></g></svg>
+
diff --git a/Documentation/rkt-vs-other-projects.md b/Documentation/rkt-vs-other-projects.md
index f22c37f08b..e2c25e2f14 100644
--- a/Documentation/rkt-vs-other-projects.md
+++ b/Documentation/rkt-vs-other-projects.md
@@ -38,6 +38,8 @@ Since running a Docker container from the command line (i.e. using `docker run`)
 
 rkt has no centralized "init" daemon, instead launching containers directly from client commands, making it compatible with init systems such as systemd, upstart, and others.
 
+A more detailed view to rkt's process model is shown in the [architecture documentation][architecture].
+
 #### Privilege Separation
 
 rkt uses standard Unix group permissions to allow privilege separation between different operations.
@@ -141,3 +143,4 @@ rkt can optionally use lkvm or qemu-kvm as an additional security measure over a
 [oci]: https://www.opencontainers.org/
 [oci-spec-github]: https://github.com/opencontainers/specs
 [runc-github]: https://github.com/opencontainers/runc
+[architecture]: devel/architecture.md

From f647b6114680ca20a251d3381ddab9ce0bb29d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 9 Nov 2017 18:24:09 +0100
Subject: [PATCH 1226/1304] Documentation: explain sd_notify with diagrams

Diagram sources:

https://docs.google.com/drawings/d/1Yde9ne7ma8nZ3oxi_sllIlCeoHKY6CsOhGRgxe66BeA
https://docs.google.com/drawings/d/1dtW2u_gM7J3eACrUbbd9wtqSVnMKtrp5UAUuWv2v79M
---
 Documentation/sd_notify-background.svg  |  4 ++++
 Documentation/sd_notify-propagation.svg |  4 ++++
 Documentation/using-rkt-with-systemd.md | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 Documentation/sd_notify-background.svg
 create mode 100644 Documentation/sd_notify-propagation.svg

diff --git a/Documentation/sd_notify-background.svg b/Documentation/sd_notify-background.svg
new file mode 100644
index 0000000000..cc611da356
--- /dev/null
+++ b/Documentation/sd_notify-background.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="yes"?>
+
+<svg version="1.1" viewBox="0.0 0.0 649.1496062992126 475.95800524934384" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="p.0"><path d="m0 0l649.1496 0l0 475.958l-649.1496 0l0 -475.958z" clip-rule="nonzero"></path></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l649.1496 0l0 475.958l-649.1496 0z" fill-rule="evenodd"></path><path fill="#fff2cc" d="m9.574803 187.45164l0 0c0 -5.641815 4.5736027 -10.215424 10.215426 -10.215424l103.41167 0c2.7092972 0 5.30764 1.0762634 7.2233963 2.992035c1.9157715 1.9157562 2.992035 4.514099 2.992035 7.2233887l0 40.86049c0 5.641815 -4.5736084 10.215424 -10.215431 10.215424l-103.41167 0c-5.641824 0 -10.215426 -4.5736084 -10.215426 -10.215424z" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m9.574803 187.45164l0 0c0 -5.641815 4.5736027 -10.215424 10.215426 -10.215424l103.41167 0c2.7092972 0 5.30764 1.0762634 7.2233963 2.992035c1.9157715 1.9157562 2.992035 4.514099 2.992035 7.2233887l0 40.86049c0 5.641815 -4.5736084 10.215424 -10.215431 10.215424l-103.41167 0c-5.641824 0 -10.215426 -4.5736084 -10.215426 -10.215424z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m9.574803 177.23097l125.10236 0l0 61.291336l-125.10236 0z" fill-rule="evenodd"></path><path fill="#000000" d="m37.97415 211.85913l1.65625 -0.265625q0.140625 1.0 0.765625 1.53125q0.640625 0.515625 1.78125 0.515625q1.15625 0 1.703125 -0.46875q0.5625 -0.46875 0.5625 -1.09375q0 -0.5625 -0.484375 -0.890625q-0.34375 -0.21875 -1.703125 -0.5625q-1.84375 -0.46875 -2.5625 -0.796875q-0.703125 -0.34375 -1.078125 -0.9375q-0.359375 -0.609375 -0.359375 -1.328125q0 -0.65625 0.296875 -1.21875q0.3125 -0.5625 0.828125 -0.9375q0.390625 -0.28125 1.0625 -0.484375q0.671875 -0.203125 1.4375 -0.203125q1.171875 0 2.046875 0.34375q0.875 0.328125 1.28125 0.90625q0.421875 0.5625 0.578125 1.515625l-1.625 0.21875q-0.109375 -0.75 -0.65625 -1.171875q-0.53125 -0.4375 -1.5 -0.4375q-1.15625 0 -1.640625 0.390625q-0.484375 0.375 -0.484375 0.875q0 0.328125 0.203125 0.59375q0.203125 0.265625 0.640625 0.4375q0.25 0.09375 1.46875 0.4375q1.765625 0.46875 2.46875 0.765625q0.703125 0.296875 1.09375 0.875q0.40625 0.578125 0.40625 1.4375q0 0.828125 -0.484375 1.578125q-0.484375 0.734375 -1.40625 1.140625q-0.921875 0.390625 -2.078125 0.390625q-1.921875 0 -2.9375 -0.796875q-1.0 -0.796875 -1.28125 -2.359375zm9.921875 6.734375l-0.171875 -1.5625q0.546875 0.140625 0.953125 0.140625q0.546875 0 0.875 -0.1875q0.34375 -0.1875 0.5625 -0.515625q0.15625 -0.25 0.5 -1.25q0.046875 -0.140625 0.15625 -0.40625l-3.734375 -9.875l1.796875 0l2.046875 5.71875q0.40625 1.078125 0.71875 2.28125q0.28125 -1.15625 0.6875 -2.25l2.09375 -5.75l1.671875 0l-3.75 10.03125q-0.59375 1.625 -0.9375 2.234375q-0.4375 0.828125 -1.015625 1.203125q-0.578125 0.390625 -1.375 0.390625q-0.484375 0 -1.078125 -0.203125zm8.734375 -6.734375l1.65625 -0.265625q0.140625 1.0 0.765625 1.53125q0.640625 0.515625 1.78125 0.515625q1.15625 0 1.703125 -0.46875q0.5625 -0.46875 0.5625 -1.09375q0 -0.5625 -0.484375 -0.890625q-0.34375 -0.21875 -1.703125 -0.5625q-1.84375 -0.46875 -2.5625 -0.796875q-0.703125 -0.34375 -1.078125 -0.9375q-0.359375 -0.609375 -0.359375 -1.328125q0 -0.65625 0.296875 -1.21875q0.3125 -0.5625 0.828125 -0.9375q0.390625 -0.28125 1.0625 -0.484375q0.671875 -0.203125 1.4375 -0.203125q1.171875 0 2.046875 0.34375q0.875 0.328125 1.28125 0.90625q0.421875 0.5625 0.578125 1.515625l-1.625 0.21875q-0.109375 -0.75 -0.65625 -1.171875q-0.53125 -0.4375 -1.5 -0.4375q-1.15625 0 -1.640625 0.390625q-0.484375 0.375 -0.484375 0.875q0 0.328125 0.203125 0.59375q0.203125 0.265625 0.640625 0.4375q0.25 0.09375 1.46875 0.4375q1.765625 0.46875 2.46875 0.765625q0.703125 0.296875 1.09375 0.875q0.40625 0.578125 0.40625 1.4375q0 0.828125 -0.484375 1.578125q-0.484375 0.734375 -1.40625 1.140625q-0.921875 0.390625 -2.078125 0.390625q-1.921875 0 -2.9375 -0.796875q-1.0 -0.796875 -1.28125 -2.359375zm13.65625 1.4375l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125zm8.277061 -1.671875l1.71875 0.21875q-0.40625 1.5 -1.515625 2.34375q-1.09375 0.828125 -2.8125 0.828125q-2.15625 0 -3.4218826 -1.328125q-1.265625 -1.328125 -1.265625 -3.734375q0 -2.484375 1.265625 -3.859375q1.2812576 -1.375 3.3281326 -1.375q1.984375 0 3.234375 1.34375q1.25 1.34375 1.25 3.796875q0 0.140625 -0.015625 0.4375l-7.3437576 0q0.09375 1.625 0.9218826 2.484375q0.828125 0.859375 2.0625 0.859375q0.90625 0 1.546875 -0.46875q0.65625 -0.484375 1.046875 -1.546875zm-5.4843826 -2.703125l5.5000076 0q-0.109375 -1.234375 -0.625 -1.859375q-0.796875 -0.96875 -2.078125 -0.96875q-1.140625 0 -1.9375 0.78125q-0.7812576 0.765625 -0.8593826 2.046875zm9.1101 5.875l0 -9.859375l1.5 0l0 1.390625q0.453125 -0.71875 1.21875 -1.15625q0.78125 -0.453125 1.765625 -0.453125q1.09375 0 1.796875 0.453125q0.703125 0.453125 0.984375 1.28125q1.171875 -1.734375 3.046875 -1.734375q1.46875 0 2.25 0.8125q0.796875 0.8125 0.796875 2.5l0 6.765625l-1.671875 0l0 -6.203125q0 -1.0 -0.15625 -1.4375q-0.15625 -0.453125 -0.59375 -0.71875q-0.421875 -0.265625 -1.0 -0.265625q-1.03125 0 -1.71875 0.6875q-0.6875 0.6875 -0.6875 2.21875l0 5.71875l-1.671875 0l0 -6.40625q0 -1.109375 -0.40625 -1.65625q-0.40625 -0.5625 -1.34375 -0.5625q-0.703125 0 -1.3125 0.375q-0.59375 0.359375 -0.859375 1.078125q-0.265625 0.71875 -0.265625 2.0625l0 5.109375l-1.671875 0zm21.931427 0l0 -1.25q-0.9375 1.46875 -2.75 1.46875q-1.171875 0 -2.171875 -0.640625q-0.984375 -0.65625 -1.53125 -1.8125q-0.53125 -1.171875 -0.53125 -2.6875q0 -1.46875 0.484375 -2.671875q0.5 -1.203125 1.46875 -1.84375q0.984375 -0.640625 2.203125 -0.640625q0.890625 0 1.578125 0.375q0.703125 0.375 1.140625 0.984375l0 -4.875l1.65625 0l0 13.59375l-1.546875 0zm-5.28125 -4.921875q0 1.890625 0.796875 2.828125q0.8125 0.9375 1.890625 0.9375q1.09375 0 1.859375 -0.890625q0.765625 -0.890625 0.765625 -2.734375q0 -2.015625 -0.78125 -2.953125q-0.78125 -0.953125 -1.921875 -0.953125q-1.109375 0 -1.859375 0.90625q-0.75 0.90625 -0.75 2.859375z" fill-rule="nonzero"></path><path fill="#cfe2f3" d="m402.76642 32.34168l0 0c0 -13.043457 10.5737915 -23.61727 23.617249 -23.61727l140.419 0c6.263672 0 12.270813 2.4882412 16.699951 6.9173384c4.429077 4.429097 6.9172974 10.436242 6.9172974 16.699932l0 94.46625c0 13.043449 -10.5737915 23.617271 -23.617249 23.617271l-140.419 0l0 0c-13.043457 0 -23.617249 -10.573822 -23.617249 -23.617271z" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m402.76642 32.34168l0 0c0 -13.043457 10.5737915 -23.61727 23.617249 -23.61727l140.419 0c6.263672 0 12.270813 2.4882412 16.699951 6.9173384c4.429077 4.429097 6.9172974 10.436242 6.9172974 16.699932l0 94.46625c0 13.043449 -10.5737915 23.617271 -23.617249 23.617271l-140.419 0l0 0c-13.043457 0 -23.617249 -10.573822 -23.617249 -23.617271z" fill-rule="evenodd"></path><path fill="#cfe2f3" d="m405.32022 292.76688l0 0c0 -13.043457 10.5737915 -23.61728 23.617249 -23.61728l140.41904 0c6.263672 0 12.270813 2.4882507 16.69989 6.9173584c4.429138 4.429077 6.9173584 10.436218 6.9173584 16.69992l0 94.46625c0 13.043457 -10.5737915 23.61728 -23.617249 23.61728l-140.41904 0l0 0c-13.043457 0 -23.617249 -10.573822 -23.617249 -23.61728z" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m405.32022 292.76688l0 0c0 -13.043457 10.5737915 -23.61728 23.617249 -23.61728l140.41904 0c6.263672 0 12.270813 2.4882507 16.69989 6.9173584c4.429138 4.429077 6.9173584 10.436218 6.9173584 16.69992l0 94.46625c0 13.043457 -10.5737915 23.61728 -23.617249 23.61728l-140.41904 0l0 0c-13.043457 0 -23.617249 -10.573822 -23.617249 -23.61728z" fill-rule="evenodd"></path><path fill="#d9ead3" d="m213.82939 359.79266l177.44884 0l0 80.87689c-88.72443 0 -88.72443 30.815613 -177.44884 13.306732z" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m213.82939 359.79266l177.44884 0l0 80.87689c-88.72443 0 -88.72443 30.815613 -177.44884 13.306732z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m221.48819 364.89764l164.6929 0l0 51.055115l-164.6929 0z" fill-rule="evenodd"></path><path fill="#000000" d="m231.36319 389.27576l0 -11.890625l2.53125 0l0 0.953125l-1.375 0l0 10.0l1.375 0l0 0.9375l-2.53125 0zm9.937363 -11.890625l1.234375 0l0 5.390625q0 1.390625 -0.328125 2.21875q-0.3125 0.828125 -1.140625 1.34375q-0.828125 0.515625 -2.171875 0.515625q-1.3125 0 -2.140625 -0.453125q-0.828125 -0.453125 -1.1875 -1.296875q-0.359375 -0.859375 -0.359375 -2.328125l0 -5.390625l1.234375 0l0 5.375q0 1.21875 0.21875 1.796875q0.234375 0.5625 0.78125 0.875q0.546875 0.3125 1.34375 0.3125q1.359375 0 1.9375 -0.609375q0.578125 -0.625 0.578125 -2.375l0 -5.375zm3.3751526 9.3125l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm7.4124756 -7.984375l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm5.461075 -1.015625l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96873474 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.1406097 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm3.109253 3.59375l-2.515625 0l0 -0.9375l1.375 0l0 -10.0l-1.375 0l0 -0.953125l2.515625 0l0 11.890625z" fill-rule="nonzero"></path><path fill="#000000" d="m230.47256 402.69763l3.578125 -9.3125l1.3125 0l3.8125 9.3125l-1.40625 0l-1.078125 -2.8125l-3.890625 0l-1.03125 2.8125l-1.296875 0zm2.6875 -3.828125l3.15625 0l-0.984375 -2.578125q-0.4375 -1.171875 -0.65625 -1.921875q-0.171875 0.890625 -0.5 1.78125l-1.015625 2.71875zm7.3428802 3.828125l0 -5.859375l-1.0 0l0 -0.875l1.0 0l0 -0.71875q0 -0.6875 0.125 -1.015625q0.171875 -0.4375 0.578125 -0.71875q0.421875 -0.28125 1.171875 -0.28125q0.484375 0 1.0625 0.125l-0.171875 0.984375q-0.359375 -0.0625 -0.671875 -0.0625q-0.515625 0 -0.734375 0.234375q-0.21875 0.21875 -0.21875 0.828125l0 0.625l1.3125 0l0 0.875l-1.3125 0l0 5.859375l-1.140625 0zm5.9373627 -1.015625l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.8123627 -1.15625l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.5374756 4.015625l0 -6.734375l1.0312347 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.1406097 0zm10.46962 -5.46875l-6.15625 0l0 -1.0625l6.15625 0l0 1.0625zm0 2.828125l-6.15625 0l0 -1.078125l6.15625 0l0 1.078125zm6.1584167 0.171875l1.125 0.140625q-0.171875 1.171875 -0.9375 1.828125q-0.765625 0.65625 -1.859375 0.65625q-1.390625 0 -2.234375 -0.90625q-0.828125 -0.90625 -0.828125 -2.59375q0 -1.09375 0.359375 -1.90625q0.359375 -0.828125 1.09375 -1.234375q0.734375 -0.40625 1.609375 -0.40625q1.09375 0 1.796875 0.5625q0.703125 0.546875 0.890625 1.5625l-1.109375 0.171875q-0.15625 -0.671875 -0.5625 -1.015625q-0.390625 -0.34375 -0.96875 -0.34375q-0.859375 0 -1.40625 0.625q-0.53125 0.609375 -0.53125 1.953125q0 1.359375 0.515625 1.984375q0.515625 0.609375 1.359375 0.609375q0.671875 0 1.125 -0.40625q0.453125 -0.421875 0.5625 -1.28125zm1.8515625 -0.90625q0 -1.875 1.03125 -2.765625q0.875 -0.75 2.125 -0.75q1.390625 0 2.265625 0.90625q0.890625 0.90625 0.890625 2.515625q0 1.296875 -0.390625 2.046875q-0.390625 0.75 -1.140625 1.171875q-0.75 0.40625 -1.625 0.40625q-1.421875 0 -2.296875 -0.90625q-0.859375 -0.90625 -0.859375 -2.625zm1.171875 0q0 1.296875 0.5625 1.953125q0.5625 0.640625 1.421875 0.640625q0.84375 0 1.40625 -0.640625q0.578125 -0.65625 0.578125 -1.984375q0 -1.25 -0.578125 -1.890625q-0.5625 -0.65625 -1.40625 -0.65625q-0.859375 0 -1.421875 0.640625q-0.5625 0.640625 -0.5625 1.9375zm6.6624756 3.375l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm9.912476 -1.015625l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.5935974 0.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm3.1156006 -4.59375l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.96109 0l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm12.021851 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.5374756 4.015625l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0zm8.438385 0l-1.140625 0l0 -7.28125q-0.421875 0.390625 -1.09375 0.796875q-0.65625 0.390625 -1.1875 0.578125l0 -1.109375q0.953125 -0.4375 1.671875 -1.078125q0.71875 -0.640625 1.015625 -1.25l0.734375 0l0 9.34375z" fill-rule="nonzero"></path><path fill="#000000" d="m231.50381 418.69763l0 -9.3125l4.125 0q1.25 0 1.890625 0.265625q0.65625 0.25 1.046875 0.890625q0.390625 0.625 0.390625 1.390625q0 0.984375 -0.65625 1.671875q-0.640625 0.671875 -1.96875 0.859375q0.484375 0.234375 0.734375 0.46875q0.546875 0.484375 1.03125 1.234375l1.609375 2.53125l-1.546875 0l-1.234375 -1.9375q-0.53125 -0.84375 -0.890625 -1.28125q-0.34375 -0.4375 -0.625 -0.609375q-0.265625 -0.1875 -0.546875 -0.265625q-0.21875 -0.03125 -0.6875 -0.03125l-1.4375 0l0 4.125l-1.234375 0zm1.234375 -5.203125l2.65625 0q0.84375 0 1.3125 -0.171875q0.484375 -0.171875 0.71875 -0.546875q0.25 -0.390625 0.25 -0.84375q0 -0.65625 -0.484375 -1.078125q-0.46875 -0.4375 -1.5 -0.4375l-2.953125 0l0 3.078125zm12.843903 3.03125l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm10.849976 6.59375l0 -3.296875q-0.265625 0.375 -0.75 0.625q-0.484375 0.25 -1.015625 0.25q-1.203125 0 -2.078125 -0.953125q-0.859375 -0.96875 -0.859375 -2.640625q0 -1.015625 0.34375 -1.8125q0.359375 -0.8125 1.03125 -1.21875q0.671875 -0.421875 1.46875 -0.421875q1.25 0 1.96875 1.046875l0 -0.890625l1.03125 0l0 9.3125l-1.140625 0zm-3.53125 -5.96875q0 1.296875 0.546875 1.953125q0.546875 0.65625 1.3125 0.65625q0.734375 0 1.25 -0.625q0.53125 -0.625 0.53125 -1.875q0 -1.359375 -0.5625 -2.03125q-0.546875 -0.6875 -1.296875 -0.6875q-0.734375 0 -1.265625 0.640625q-0.515625 0.625 -0.515625 1.96875zm11.068726 3.390625l0 -0.984375q-0.796875 1.140625 -2.140625 1.140625q-0.59375 0 -1.125 -0.234375q-0.515625 -0.234375 -0.765625 -0.578125q-0.25 -0.34375 -0.34375 -0.84375q-0.078125 -0.328125 -0.078125 -1.0625l0 -4.171875l1.140625 0l0 3.734375q0 0.890625 0.078125 1.203125q0.109375 0.453125 0.453125 0.71875q0.34375 0.25 0.859375 0.25q0.515625 0 0.96875 -0.265625q0.453125 -0.265625 0.640625 -0.71875q0.1875 -0.453125 0.1875 -1.3125l0 -3.609375l1.140625 0l0 6.734375l-1.015625 0zm2.9906006 -7.984375l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.945465 0l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0zm9.0633545 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.0999756 2.0l1.125 -0.171875q0.09375 0.671875 0.53125 1.046875q0.4375 0.359375 1.21875 0.359375q0.78125 0 1.15625 -0.3125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.34375 -0.609375q-0.234375 -0.15625 -1.171875 -0.390625q-1.25 -0.3125 -1.734375 -0.546875q-0.484375 -0.234375 -0.734375 -0.640625q-0.25 -0.40625 -0.25 -0.90625q0 -0.453125 0.203125 -0.828125q0.203125 -0.390625 0.5625 -0.640625q0.265625 -0.203125 0.71875 -0.328125q0.46875 -0.140625 1.0 -0.140625q0.78125 0 1.375 0.234375q0.609375 0.21875 0.890625 0.609375q0.296875 0.390625 0.40625 1.046875l-1.125 0.15625q-0.078125 -0.53125 -0.4375 -0.8125q-0.359375 -0.296875 -1.03125 -0.296875q-0.78125 0 -1.125 0.265625q-0.34375 0.25 -0.34375 0.609375q0 0.21875 0.140625 0.390625q0.140625 0.1875 0.4375 0.3125q0.171875 0.0625 1.015625 0.28125q1.21875 0.328125 1.6875 0.53125q0.484375 0.203125 0.75 0.609375q0.28125 0.390625 0.28125 0.96875q0 0.578125 -0.34375 1.078125q-0.328125 0.5 -0.953125 0.78125q-0.625 0.28125 -1.421875 0.28125q-1.3125 0 -2.0 -0.546875q-0.6875 -0.546875 -0.875 -1.625zm13.1328125 -3.453125l-6.15625 0l0 -1.0625l6.15625 0l0 1.0625zm0 2.828125l-6.15625 0l0 -1.078125l6.15625 0l0 1.078125zm6.1584167 0.171875l1.125 0.140625q-0.171875 1.171875 -0.9375 1.828125q-0.765625 0.65625 -1.859375 0.65625q-1.390625 0 -2.234375 -0.90625q-0.828125 -0.90625 -0.828125 -2.59375q0 -1.09375 0.359375 -1.90625q0.359375 -0.828125 1.09375 -1.234375q0.734375 -0.40625 1.609375 -0.40625q1.09375 0 1.796875 0.5625q0.703125 0.546875 0.890625 1.5625l-1.109375 0.171875q-0.15625 -0.671875 -0.5625 -1.015625q-0.390625 -0.34375 -0.96875 -0.34375q-0.859375 0 -1.40625 0.625q-0.53125 0.609375 -0.53125 1.953125q0 1.359375 0.515625 1.984375q0.515625 0.609375 1.359375 0.609375q0.671875 0 1.125 -0.40625q0.453125 -0.421875 0.5625 -1.28125zm1.8515625 -0.90625q0 -1.875 1.03125 -2.765625q0.875 -0.75 2.125 -0.75q1.390625 0 2.265625 0.90625q0.890625 0.90625 0.890625 2.515625q0 1.296875 -0.390625 2.046875q-0.390625 0.75 -1.140625 1.171875q-0.75 0.40625 -1.625 0.40625q-1.421875 0 -2.296875 -0.90625q-0.859375 -0.90625 -0.859375 -2.625zm1.171875 0q0 1.296875 0.5625 1.953125q0.5625 0.640625 1.421875 0.640625q0.84375 0 1.40625 -0.640625q0.578125 -0.65625 0.578125 -1.984375q0 -1.25 -0.578125 -1.890625q-0.5625 -0.65625 -1.40625 -0.65625q-0.859375 0 -1.421875 0.640625q-0.5625 0.640625 -0.5625 1.9375zm6.6624756 3.375l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm9.912476 -1.015625l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.593628 0.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm3.1156006 -4.59375l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.96109 0l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm12.021851 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.5374756 4.015625l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0zm8.4383545 0l-1.140625 0l0 -7.28125q-0.421875 0.390625 -1.09375 0.796875q-0.65625 0.390625 -1.1875 0.578125l0 -1.109375q0.953125 -0.4375 1.671875 -1.078125q0.71875 -0.640625 1.015625 -1.25l0.734375 0l0 9.34375z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m134.67717 207.87665c67.02228 0 100.532745 -32.07875 134.04457 -64.157486c33.51181 -32.078743 67.02496 -64.157486 134.04993 -64.157486" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m134.67717 207.87665c67.02228 0 100.532745 -32.07875 134.04454 -64.157486c16.75592 -16.039375 33.512177 -32.078743 54.45755 -44.10827c10.472687 -6.014763 21.992645 -11.027069 35.083527 -14.535683c6.5454407 -1.754303 13.483612 -3.1326904 20.879944 -4.0724945c3.6981506 -0.46990204 7.5108643 -0.83016205 11.446259 -1.0729446c1.9677429 -0.1213913 3.9661255 -0.21341705 5.996216 -0.27509308c0.50756836 -0.015419006 1.0170288 -0.028938293 1.5285645 -0.040542603l1.2309265 -0.023239136" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m399.3447 79.5909l-1.1149597 1.1341324l3.0800781 -1.1508865l-3.0992432 -1.0981979z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m134.67717 207.87665c67.66141 0 101.49213 33.031494 135.32283 66.06299c33.83072 33.031494 67.66141 66.06299 135.32285 66.06299" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m134.67717 207.87665c67.66141 0 101.49213 33.031494 135.32283 66.06299c16.915344 16.515747 33.83072 33.031494 54.974915 45.418304c10.5720825 6.19339 22.201385 11.354584 35.416504 14.967407c6.607544 1.8063965 13.611572 3.225708 21.078125 4.1934204c3.7332458 0.48388672 7.582184 0.8548279 11.554993 1.1048279c1.9863586 0.125 4.0037537 0.21975708 6.053131 0.28326416c0.5123596 0.01586914 1.0266724 0.029785156 1.5430298 0.041748047l1.275177 0.024536133" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m401.89587 339.97318l-1.1342163 1.1148682l3.0993347 -1.097992l-3.0799866 -1.1510925z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m433.4042 38.086613l125.10239 0l0 76.59842l-125.10239 0z" fill-rule="evenodd"></path><path fill="#000000" d="m460.08127 61.397236l1.640625 0.21875q-0.265625 1.6875 -1.375 2.6562538q-1.109375 0.953125 -2.734375 0.953125q-2.015625 0 -3.25 -1.3125038q-1.21875 -1.328125 -1.21875 -3.796875q0 -1.59375 0.515625 -2.78125q0.53125 -1.203125 1.609375 -1.796875q1.09375 -0.609375 2.359375 -0.609375q1.609375 0 2.625 0.8125q1.015625 0.8125 1.3125 2.3125l-1.625 0.25q-0.234375 -1.0 -0.828125 -1.5q-0.59375 -0.5 -1.421875 -0.5q-1.265625 0 -2.0625 0.90625q-0.78125 0.90625 -0.78125 2.859375q0 1.984375 0.765625 2.890625q0.765625 0.890625 1.984375 0.890625q0.984375 0 1.640625 -0.59375q0.65625 -0.609375 0.84375 -1.859375zm2.265625 -1.3125q0 -2.734375 1.53125 -4.0625q1.265625 -1.09375 3.09375 -1.09375q2.03125 0 3.3125 1.34375q1.296875 1.328125 1.296875 3.671875q0 1.90625 -0.578125 3.0q-0.5625 1.0781288 -1.65625 1.6875038q-1.078125 0.59375 -2.375 0.59375q-2.0625 0 -3.34375 -1.3281288q-1.28125 -1.328125 -1.28125 -3.8125zm1.71875 0q0 1.890625 0.828125 2.828125q0.828125 0.9375 2.078125 0.9375q1.25 0 2.0625 -0.9375q0.828125 -0.953125 0.828125 -2.890625q0 -1.828125 -0.828125 -2.765625q-0.828125 -0.9375 -2.0625 -0.9375q-1.25 0 -2.078125 0.9375q-0.828125 0.9375 -0.828125 2.828125zm9.281952 4.921879l0 -9.859379l1.5 0l0 1.40625q1.09375 -1.625 3.140625 -1.625q0.890625 0 1.640625 0.328125q0.75 0.3125 1.109375 0.84375q0.375 0.515625 0.53125 1.21875q0.09375 0.46875 0.09375 1.625l0 6.062504l-1.671875 0l0 -6.000004q0 -1.015625 -0.203125 -1.515625q-0.1875 -0.515625 -0.6875 -0.8125q-0.5 -0.296875 -1.171875 -0.296875q-1.0625 0 -1.84375 0.671875q-0.765625 0.671875 -0.765625 2.578125l0 5.375004l-1.671875 0zm14.031982 -1.5000038l0.234375 1.4843788q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.4687538 -0.203125 -1.9843788l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125zm7.9645386 0.28125q-0.9375 0.7968788 -1.796875 1.1250038q-0.859375 0.3125 -1.84375 0.3125q-1.609375 0 -2.484375 -0.78125q-0.875 -0.7968788 -0.875 -2.0312538q0 -0.734375 0.328125 -1.328125q0.328125 -0.59375 0.859375 -0.953125q0.53125 -0.359375 1.203125 -0.546875q0.5 -0.140625 1.484375 -0.25q2.03125 -0.25 2.984375 -0.578125q0 -0.34375 0 -0.4375q0 -1.015625 -0.46875 -1.4375q-0.640625 -0.5625 -1.90625 -0.5625q-1.171875 0 -1.734375 0.40625q-0.5625 0.40625 -0.828125 1.46875l-1.640625 -0.234375q0.234375 -1.046875 0.734375 -1.6875q0.515625 -0.640625 1.46875 -0.984375q0.96875 -0.359375 2.25 -0.359375q1.265625 0 2.046875 0.296875q0.78125 0.296875 1.15625 0.75q0.375 0.453125 0.515625 1.140625q0.09375 0.421875 0.09375 1.53125l0 2.234375q0 2.328125 0.09375 2.953125q0.109375 0.6093788 0.4375 1.1718788l-1.75 0q-0.265625 -0.515625 -0.328125 -1.2187538zm-0.140625 -3.71875q-0.90625 0.359375 -2.734375 0.625q-1.03125 0.140625 -1.453125 0.328125q-0.421875 0.1875 -0.65625 0.546875q-0.234375 0.359375 -0.234375 0.796875q0 0.671875 0.5 1.125q0.515625 0.4375 1.484375 0.4375q0.96875 0 1.71875 -0.421875q0.75 -0.4375 1.109375 -1.15625q0.265625 -0.578125 0.265625 -1.671875l0 -0.609375zm4.0944824 -6.75l0 -1.90625l1.671875 0l0 1.90625l-1.671875 0zm0 11.687504l0 -9.859379l1.671875 0l0 9.859379l-1.671875 0zm4.129181 0l0 -9.859379l1.5 0l0 1.40625q1.09375 -1.625 3.140625 -1.625q0.890625 0 1.640625 0.328125q0.75 0.3125 1.109375 0.84375q0.375 0.515625 0.53125 1.21875q0.09375 0.46875 0.09375 1.625l0 6.062504l-1.671875 0l0 -6.000004q0 -1.015625 -0.203125 -1.515625q-0.1875 -0.515625 -0.6875 -0.8125q-0.5 -0.296875 -1.171875 -0.296875q-1.0625 0 -1.84375 0.671875q-0.765625 0.671875 -0.765625 2.578125l0 5.375004l-1.671875 0zm17.125702 -3.1718788l1.71875 0.21875q-0.40625 1.5 -1.515625 2.3437538q-1.09375 0.828125 -2.8125 0.828125q-2.15625 0 -3.421875 -1.3281288q-1.265625 -1.328125 -1.265625 -3.734375q0 -2.484375 1.265625 -3.859375q1.28125 -1.375 3.328125 -1.375q1.984375 0 3.234375 1.34375q1.25 1.34375 1.25 3.796875q0 0.140625 -0.015625 0.4375l-7.34375 0q0.09375 1.625 0.921875 2.484375q0.828125 0.859375 2.0625 0.859375q0.90625 0 1.546875 -0.46875q0.65625 -0.484375 1.046875 -1.546875zm-5.484375 -2.703125l5.5 0q-0.109375 -1.234375 -0.625 -1.859375q-0.796875 -0.96875 -2.078125 -0.96875q-1.140625 0 -1.9375 0.78125q-0.78125 0.765625 -0.859375 2.046875zm9.094482 5.875004l0 -9.859379l1.5 0l0 1.5q0.578125 -1.046875 1.0625 -1.375q0.484375 -0.34375 1.078125 -0.34375q0.84375 0 1.71875 0.546875l-0.578125 1.546875q-0.609375 -0.359375 -1.234375 -0.359375q-0.546875 0 -0.984375 0.328125q-0.421875 0.328125 -0.609375 0.90625q-0.28125 0.890625 -0.28125 1.953125l0 5.156254l-1.671875 0zm12.0564575 0l-1.671875 0l0 -10.640629q-0.59375 0.578125 -1.578125 1.15625q-0.984375 0.5625 -1.765625 0.859375l0 -1.625q1.40625 -0.65625 2.453125 -1.59375q1.046875 -0.9375 1.484375 -1.8125l1.078125 0l0 13.656254z" fill-rule="nonzero"></path><path fill="#000000" d="m476.4585 109.006615l0 -13.59375l1.671875 0l0 4.875q1.171875 -1.359375 2.953125 -1.359375q1.09375 0 1.890625 0.4375q0.8125 0.421875 1.15625 1.1875q0.359375 0.765625 0.359375 2.203125l0 6.25l-1.671875 0l0 -6.25q0 -1.25 -0.546875 -1.8125q-0.546875 -0.578125 -1.53125 -0.578125q-0.75 0 -1.40625 0.390625q-0.640625 0.375 -0.921875 1.046875q-0.28125 0.65625 -0.28125 1.8125l0 5.390625l-1.671875 0zm14.031982 -1.5l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125zm5.1832886 0l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125zm1.5270691 5.28125l0 -13.640625l1.53125 0l0 1.28125q0.53125 -0.75 1.203125 -1.125q0.6875 -0.375 1.640625 -0.375q1.265625 0 2.234375 0.65625q0.96875 0.640625 1.453125 1.828125q0.5 1.1875 0.5 2.59375q0 1.515625 -0.546875 2.734375q-0.546875 1.203125 -1.578125 1.84375q-1.03125 0.640625 -2.171875 0.640625q-0.84375 0 -1.515625 -0.34375q-0.65625 -0.359375 -1.078125 -0.890625l0 4.796875l-1.671875 0zm1.515625 -8.65625q0 1.90625 0.765625 2.8125q0.78125 0.90625 1.875 0.90625q1.109375 0 1.890625 -0.9375q0.796875 -0.9375 0.796875 -2.921875q0 -1.875 -0.78125 -2.8125q-0.765625 -0.9375 -1.84375 -0.9375q-1.0625 0 -1.890625 1.0q-0.8125 1.0 -0.8125 2.890625zm15.250702 4.875l0 -1.25q-0.9375 1.46875 -2.75 1.46875q-1.171875 0 -2.171875 -0.640625q-0.984375 -0.65625 -1.53125 -1.8125q-0.53125 -1.171875 -0.53125 -2.6875q0 -1.46875 0.484375 -2.671875q0.5 -1.203125 1.46875 -1.84375q0.984375 -0.640625 2.203125 -0.640625q0.890625 0 1.578125 0.375q0.703125 0.375 1.140625 0.984375l0 -4.875l1.65625 0l0 13.59375l-1.546875 0zm-5.28125 -4.921875q0 1.890625 0.796875 2.828125q0.8125 0.9375 1.890625 0.9375q1.09375 0 1.859375 -0.890625q0.765625 -0.890625 0.765625 -2.734375q0 -2.015625 -0.78125 -2.953125q-0.78125 -0.953125 -1.921875 -0.953125q-1.109375 0 -1.859375 0.90625q-0.75 0.90625 -0.75 2.859375z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m436.5958 301.70078l125.10239 0l0 76.59845l-125.10239 0z" fill-rule="evenodd"></path><path fill="#000000" d="m463.27286 325.0114l1.640625 0.21875q-0.265625 1.6875 -1.375 2.65625q-1.109375 0.953125 -2.734375 0.953125q-2.015625 0 -3.25 -1.3125q-1.21875 -1.328125 -1.21875 -3.796875q0 -1.59375 0.515625 -2.78125q0.53125 -1.203125 1.609375 -1.796875q1.09375 -0.609375 2.359375 -0.609375q1.609375 0 2.625 0.8125q1.015625 0.8125 1.3125 2.3125l-1.625 0.25q-0.234375 -1.0 -0.828125 -1.5q-0.59375 -0.5 -1.421875 -0.5q-1.265625 0 -2.0625 0.90625q-0.78125 0.90625 -0.78125 2.859375q0 1.984375 0.765625 2.890625q0.765625 0.890625 1.984375 0.890625q0.984375 0 1.640625 -0.59375q0.65625 -0.609375 0.84375 -1.859375zm2.265625 -1.3125q0 -2.734375 1.53125 -4.0625q1.265625 -1.09375 3.09375 -1.09375q2.03125 0 3.3125 1.34375q1.296875 1.328125 1.296875 3.671875q0 1.90625 -0.578125 3.0q-0.5625 1.078125 -1.65625 1.6875q-1.078125 0.59375 -2.375 0.59375q-2.0625 0 -3.34375 -1.328125q-1.28125 -1.328125 -1.28125 -3.8125zm1.71875 0q0 1.890625 0.828125 2.828125q0.828125 0.9375 2.078125 0.9375q1.25 0 2.0625 -0.9375q0.828125 -0.953125 0.828125 -2.890625q0 -1.828125 -0.828125 -2.765625q-0.828125 -0.9375 -2.0625 -0.9375q-1.25 0 -2.078125 0.9375q-0.828125 0.9375 -0.828125 2.828125zm9.281982 4.921875l0 -9.859375l1.5 0l0 1.40625q1.09375 -1.625 3.140625 -1.625q0.890625 0 1.640625 0.328125q0.75 0.3125 1.109375 0.84375q0.375 0.515625 0.53125 1.21875q0.09375 0.46875 0.09375 1.625l0 6.0625l-1.671875 0l0 -6.0q0 -1.015625 -0.203125 -1.515625q-0.1875 -0.515625 -0.6875 -0.8125q-0.5 -0.296875 -1.171875 -0.296875q-1.0625 0 -1.84375 0.671875q-0.765625 0.671875 -0.765625 2.578125l0 5.375l-1.671875 0zm14.031952 -1.5l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125zm7.964569 0.28125q-0.9375 0.796875 -1.796875 1.125q-0.859375 0.3125 -1.84375 0.3125q-1.609375 0 -2.484375 -0.78125q-0.875 -0.796875 -0.875 -2.03125q0 -0.734375 0.328125 -1.328125q0.328125 -0.59375 0.859375 -0.953125q0.53125 -0.359375 1.203125 -0.546875q0.5 -0.140625 1.484375 -0.25q2.03125 -0.25 2.984375 -0.578125q0 -0.34375 0 -0.4375q0 -1.015625 -0.46875 -1.4375q-0.640625 -0.5625 -1.90625 -0.5625q-1.171875 0 -1.734375 0.40625q-0.5625 0.40625 -0.828125 1.46875l-1.640625 -0.234375q0.234375 -1.046875 0.734375 -1.6875q0.515625 -0.640625 1.46875 -0.984375q0.96875 -0.359375 2.25 -0.359375q1.265625 0 2.046875 0.296875q0.78125 0.296875 1.15625 0.75q0.375 0.453125 0.515625 1.140625q0.09375 0.421875 0.09375 1.53125l0 2.234375q0 2.328125 0.09375 2.953125q0.109375 0.609375 0.4375 1.171875l-1.75 0q-0.265625 -0.515625 -0.328125 -1.21875zm-0.140625 -3.71875q-0.90625 0.359375 -2.734375 0.625q-1.03125 0.140625 -1.453125 0.328125q-0.421875 0.1875 -0.65625 0.546875q-0.234375 0.359375 -0.234375 0.796875q0 0.671875 0.5 1.125q0.515625 0.4375 1.484375 0.4375q0.96875 0 1.71875 -0.421875q0.75 -0.4375 1.109375 -1.15625q0.265625 -0.578125 0.265625 -1.671875l0 -0.609375zm4.094452 -6.75l0 -1.90625l1.671875 0l0 1.90625l-1.671875 0zm0 11.6875l0 -9.859375l1.671875 0l0 9.859375l-1.671875 0zm4.1292114 0l0 -9.859375l1.5 0l0 1.40625q1.09375 -1.625 3.140625 -1.625q0.890625 0 1.640625 0.328125q0.75 0.3125 1.109375 0.84375q0.375 0.515625 0.53125 1.21875q0.09375 0.46875 0.09375 1.625l0 6.0625l-1.671875 0l0 -6.0q0 -1.015625 -0.203125 -1.515625q-0.1875 -0.515625 -0.6875 -0.8125q-0.5 -0.296875 -1.171875 -0.296875q-1.0625 0 -1.84375 0.671875q-0.765625 0.671875 -0.765625 2.578125l0 5.375l-1.671875 0zm17.125732 -3.171875l1.71875 0.21875q-0.40625 1.5 -1.515625 2.34375q-1.09375 0.828125 -2.8125 0.828125q-2.15625 0 -3.421875 -1.328125q-1.265625 -1.328125 -1.265625 -3.734375q0 -2.484375 1.265625 -3.859375q1.28125 -1.375 3.328125 -1.375q1.984375 0 3.234375 1.34375q1.25 1.34375 1.25 3.796875q0 0.140625 -0.015625 0.4375l-7.34375 0q0.09375 1.625 0.921875 2.484375q0.828125 0.859375 2.0625 0.859375q0.90625 0 1.546875 -0.46875q0.65625 -0.484375 1.046875 -1.546875zm-5.484375 -2.703125l5.5 0q-0.109375 -1.234375 -0.625 -1.859375q-0.796875 -0.96875 -2.078125 -0.96875q-1.140625 0 -1.9375 0.78125q-0.78125 0.765625 -0.859375 2.046875zm9.094421 5.875l0 -9.859375l1.5 0l0 1.5q0.578125 -1.046875 1.0625 -1.375q0.484375 -0.34375 1.078125 -0.34375q0.84375 0 1.71875 0.546875l-0.578125 1.546875q-0.609375 -0.359375 -1.234375 -0.359375q-0.546875 0 -0.984375 0.328125q-0.421875 0.328125 -0.609375 0.90625q-0.28125 0.890625 -0.28125 1.953125l0 5.15625l-1.671875 0zm14.5408325 -1.609375l0 1.609375l-8.984375 0q-0.015625 -0.609375 0.1875 -1.15625q0.34375 -0.921875 1.09375 -1.8125q0.765625 -0.890625 2.1875 -2.0625q2.21875 -1.8125 3.0 -2.875q0.78125 -1.0625 0.78125 -2.015625q0 -0.984375 -0.71875 -1.671875q-0.703125 -0.6875 -1.84375 -0.6875q-1.203125 0 -1.9375 0.734375q-0.71875 0.71875 -0.71875 2.0l-1.71875 -0.171875q0.171875 -1.921875 1.328125 -2.921875q1.15625 -1.015625 3.09375 -1.015625q1.953125 0 3.09375 1.09375q1.140625 1.078125 1.140625 2.6875q0 0.8125 -0.34375 1.609375q-0.328125 0.78125 -1.109375 1.65625q-0.765625 0.859375 -2.5625 2.390625q-1.5 1.265625 -1.9375 1.71875q-0.421875 0.4375 -0.703125 0.890625l6.671875 0z" fill-rule="nonzero"></path><path fill="#000000" d="m482.52127 372.6208l-3.015625 -9.859375l1.71875 0l1.5625 5.6875l0.59375 2.125q0.03125 -0.15625 0.5 -2.03125l1.578125 -5.78125l1.71875 0l1.46875 5.71875l0.484375 1.890625l0.578125 -1.90625l1.6875 -5.703125l1.625 0l-3.078125 9.859375l-1.734375 0l-1.578125 -5.90625l-0.375 -1.671875l-2.0 7.578125l-1.734375 0zm11.347931 0.8125l1.609375 0.25q0.109375 0.75 0.578125 1.09375q0.609375 0.453125 1.6875 0.453125q1.171875 0 1.796875 -0.46875q0.625 -0.453125 0.859375 -1.28125q0.125 -0.515625 0.109375 -2.15625q-1.09375 1.296875 -2.71875 1.296875q-2.03125 0 -3.15625 -1.46875q-1.109375 -1.46875 -1.109375 -3.515625q0 -1.40625 0.515625 -2.59375q0.515625 -1.203125 1.484375 -1.84375q0.96875 -0.65625 2.265625 -0.65625q1.75 0 2.875 1.40625l0 -1.1875l1.546875 0l0 8.515625q0 2.3125 -0.46875 3.265625q-0.46875 0.96875 -1.484375 1.515625q-1.015625 0.5625 -2.5 0.5625q-1.765625 0 -2.859375 -0.796875q-1.078125 -0.796875 -1.03125 -2.390625zm1.375 -5.921875q0 1.953125 0.765625 2.84375q0.78125 0.890625 1.9375 0.890625q1.140625 0 1.921875 -0.890625q0.78125 -0.890625 0.78125 -2.78125q0 -1.8125 -0.8125 -2.71875q-0.796875 -0.921875 -1.921875 -0.921875q-1.109375 0 -1.890625 0.90625q-0.78125 0.890625 -0.78125 2.671875zm16.047607 1.9375l1.71875 0.21875q-0.40625 1.5 -1.515625 2.34375q-1.09375 0.828125 -2.8125 0.828125q-2.15625 0 -3.421875 -1.328125q-1.265625 -1.328125 -1.265625 -3.734375q0 -2.484375 1.265625 -3.859375q1.28125 -1.375 3.328125 -1.375q1.984375 0 3.234375 1.34375q1.25 1.34375 1.25 3.796875q0 0.140625 -0.015625 0.4375l-7.34375 0q0.09375 1.625 0.921875 2.484375q0.828125 0.859375 2.0625 0.859375q0.90625 0 1.546875 -0.46875q0.65625 -0.484375 1.046875 -1.546875zm-5.484375 -2.703125l5.5 0q-0.109375 -1.234375 -0.625 -1.859375q-0.796875 -0.96875 -2.078125 -0.96875q-1.140625 0 -1.9375 0.78125q-0.78125 0.765625 -0.859375 2.046875zm12.766357 4.375l0.234375 1.484375q-0.703125 0.140625 -1.265625 0.140625q-0.90625 0 -1.40625 -0.28125q-0.5 -0.296875 -0.703125 -0.75q-0.203125 -0.46875 -0.203125 -1.984375l0 -5.65625l-1.234375 0l0 -1.3125l1.234375 0l0 -2.4375l1.65625 -1.0l0 3.4375l1.6875 0l0 1.3125l-1.6875 0l0 5.75q0 0.71875 0.078125 0.921875q0.09375 0.203125 0.296875 0.328125q0.203125 0.125 0.578125 0.125q0.265625 0 0.734375 -0.078125z" fill-rule="nonzero"></path><path fill="#fce5cd" d="m540.6378 132.5538l68.944885 0l0 28.094498l-68.944885 0z" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m540.6378 132.5538l68.944885 0l0 28.094498l-68.944885 0z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m540.6247 132.5538l68.944885 0l0 28.094498l-68.944885 0z" fill-rule="evenodd"></path><path fill="#000000" d="m559.24023 146.35417q-0.703125 -0.265625 -1.046875 -0.734375q-0.34375 -0.484375 -0.34375 -1.15625q0 -1.015625 0.71875 -1.703125q0.734375 -0.703125 1.953125 -0.703125q1.21875 0 1.953125 0.71875q0.75 0.703125 0.75 1.71875q0 0.640625 -0.34375 1.125q-0.34375 0.46875 -1.03125 0.734375q0.859375 0.28125 1.296875 0.90625q0.453125 0.625 0.453125 1.484375q0 1.1875 -0.84375 2.0q-0.84375 0.8125 -2.21875 0.8125q-1.375 0 -2.21875 -0.8125q-0.84375 -0.8125 -0.84375 -2.03125q0 -0.90625 0.453125 -1.515625q0.46875 -0.625 1.3125 -0.84375zm-0.234375 -1.9375q0 0.65625 0.421875 1.078125q0.4375 0.421875 1.109375 0.421875q0.671875 0 1.09375 -0.40625q0.421875 -0.421875 0.421875 -1.03125q0 -0.625 -0.4375 -1.046875q-0.4375 -0.4375 -1.078125 -0.4375q-0.65625 0 -1.09375 0.421875q-0.4375 0.421875 -0.4375 1.0zm-0.359375 4.296875q0 0.484375 0.234375 0.953125q0.234375 0.453125 0.6875 0.703125q0.453125 0.25 0.984375 0.25q0.8125 0 1.34375 -0.515625q0.53125 -0.53125 0.53125 -1.34375q0 -0.828125 -0.546875 -1.359375q-0.546875 -0.546875 -1.375 -0.546875q-0.796875 0 -1.328125 0.53125q-0.53125 0.53125 -0.53125 1.328125zm6.2562256 -1.90625q0 -1.640625 0.328125 -2.640625q0.34375 -1.015625 1.015625 -1.5625q0.671875 -0.546875 1.6875 -0.546875q0.75 0 1.3125 0.3125q0.5625 0.296875 0.921875 0.859375q0.375 0.5625 0.578125 1.390625q0.21875 0.8125 0.21875 2.1875q0 1.640625 -0.34375 2.65625q-0.328125 1.0 -1.0 1.546875q-0.671875 0.546875 -1.6875 0.546875q-1.34375 0 -2.125 -0.96875q-0.90625 -1.15625 -0.90625 -3.78125zm1.171875 0q0 2.296875 0.53125 3.0625q0.53125 0.75 1.328125 0.75q0.78125 0 1.3125 -0.75q0.546875 -0.765625 0.546875 -3.0625q0 -2.296875 -0.546875 -3.046875q-0.53125 -0.75 -1.328125 -0.75q-0.78125 0 -1.265625 0.65625q-0.578125 0.859375 -0.578125 3.140625zm5.6937256 4.75l2.703125 -9.625l0.90625 0l-2.6875 9.625l-0.921875 0zm7.062378 -1.171875l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.593628 -1.453125l1.125 0.140625q-0.171875 1.171875 -0.9375 1.828125q-0.765625 0.65625 -1.859375 0.65625q-1.390625 0 -2.234375 -0.90625q-0.828125 -0.90625 -0.828125 -2.59375q0 -1.09375 0.359375 -1.90625q0.359375 -0.828125 1.09375 -1.234375q0.734375 -0.40625 1.609375 -0.40625q1.09375 0 1.796875 0.5625q0.703125 0.546875 0.890625 1.5625l-1.109375 0.171875q-0.15625 -0.671875 -0.5625 -1.015625q-0.390625 -0.34375 -0.96875 -0.34375q-0.859375 0 -1.40625 0.625q-0.53125 0.609375 -0.53125 1.953125q0 1.359375 0.515625 1.984375q0.515625 0.609375 1.359375 0.609375q0.671875 0 1.125 -0.40625q0.453125 -0.421875 0.5625 -1.28125zm2.2734375 5.046875l0 -9.3125l1.03125 0l0 0.875q0.375 -0.515625 0.828125 -0.765625q0.46875 -0.265625 1.140625 -0.265625q0.859375 0 1.515625 0.453125q0.65625 0.4375 0.984375 1.25q0.34375 0.796875 0.34375 1.765625q0 1.03125 -0.375 1.859375q-0.359375 0.828125 -1.078125 1.28125q-0.703125 0.4375 -1.484375 0.4375q-0.5625 0 -1.015625 -0.234375q-0.453125 -0.25 -0.75 -0.625l0 3.28125l-1.140625 0zm1.03125 -5.90625q0 1.296875 0.53125 1.921875q0.53125 0.625 1.265625 0.625q0.765625 0 1.3125 -0.640625q0.546875 -0.65625 0.546875 -2.0q0 -1.296875 -0.53125 -1.9375q-0.53125 -0.640625 -1.265625 -0.640625q-0.734375 0 -1.296875 0.6875q-0.5625 0.671875 -0.5625 1.984375z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m592.97375 340.0c20.797913 0 39.520996 -48.346466 41.595825 -96.69292c2.074768 -48.34645 -12.498718 -96.69292 -24.997375 -96.69292" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m592.97375 340.0c20.797913 0 39.520996 -48.346466 41.595825 -96.69292c1.0373535 -24.173218 -2.0872803 -48.34645 -7.0336304 -66.47638c-2.4732056 -9.064957 -5.4017944 -16.619095 -8.493286 -21.906982c-1.5457153 -2.6439514 -3.1322021 -4.7213287 -4.7227783 -6.137741c-0.39770508 -0.35409546 -0.79559326 -0.6668854 -1.1931763 -0.9368744l-0.29077148 -0.18965149" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m612.83594 147.65945l1.4140015 -0.72798157l-3.2855225 0.12858582l2.5995483 2.0133972z" fill-rule="evenodd"></path></g></svg>
+
diff --git a/Documentation/sd_notify-propagation.svg b/Documentation/sd_notify-propagation.svg
new file mode 100644
index 0000000000..946d9b43cb
--- /dev/null
+++ b/Documentation/sd_notify-propagation.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="yes"?>
+
+<svg version="1.1" viewBox="0.0 0.0 980.7952755905512 443.6509186351706" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="p.0"><path d="m0 0l980.7953 0l0 443.6509l-980.7953 0l0 -443.6509z" clip-rule="nonzero"></path></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l980.7953 0l0 443.6509l-980.7953 0z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m339.4987 279.2105l0 0c0 -14.777161 11.979279 -26.75644 26.75644 -26.75644l556.06195 0c7.0961914 0 13.901855 2.8189697 18.919617 7.836792c5.0178223 5.0177917 7.836792 11.823395 7.836792 18.919647l0 107.02255c0 14.777161 -11.979248 26.75644 -26.756409 26.75644l-556.06195 0c-14.777161 0 -26.75644 -11.979279 -26.75644 -26.75644z" fill-rule="evenodd"></path><path stroke="#999999" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="16.0,12.0" d="m339.4987 279.2105l0 0c0 -14.777161 11.979279 -26.75644 26.75644 -26.75644l556.06195 0c7.0961914 0 13.901855 2.8189697 18.919617 7.836792c5.0178223 5.0177917 7.836792 11.823395 7.836792 18.919647l0 107.02255c0 14.777161 -11.979248 26.75644 -26.756409 26.75644l-556.06195 0c-14.777161 0 -26.75644 -11.979279 -26.75644 -26.75644z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m125.57743 96.20473l432.37796 0l0 73.16536l-432.37796 0z" fill-rule="evenodd"></path><path fill="#000000" d="m138.4993 123.99535l3.109375 0l0.09375 3.609375q1.75 -2.09375 3.4375 -3.03125q1.6875 -0.9375 3.40625 -0.9375q3.046875 0 4.609375 1.984375q1.578125 1.96875 1.46875 5.8593674l-3.4375 0q0.046875 -2.578125 -0.765625 -3.7343674q-0.796875 -1.171875 -2.359375 -1.171875q-0.6875 0 -1.390625 0.25q-0.6875 0.234375 -1.421875 0.78125q-0.734375 0.5312424 -1.5625 1.3749924q-0.8125 0.828125 -1.75 2.03125l0 12.59375l-3.4375 0l0 -19.609367zm38.835938 19.609367l-4.671875 0l-9.140625 -10.515625l0 10.515625l-3.390625 0l0 -27.593742l3.390625 0l0 16.953117l8.8125 -8.968742l4.484375 0l-9.1875 9.046867l9.703125 10.5625zm20.148438 -0.28125q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234367l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.968742q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m352.00262 252.45274l337.63782 0l0 73.16536l-337.63782 0z" fill-rule="evenodd"></path><path fill="#000000" d="m362.237 293.66525l3.46875 -0.546875q0.296875 2.078125 1.625 3.203125q1.34375 1.109375 3.75 1.109375q2.421875 0 3.59375 -0.984375q1.171875 -0.984375 1.171875 -2.3125q0 -1.203125 -1.03125 -1.875q-0.71875 -0.46875 -3.59375 -1.203125q-3.875 -0.96875 -5.375 -1.671875q-1.484375 -0.71875 -2.265625 -1.984375q-0.765625 -1.265625 -0.765625 -2.78125q0 -1.390625 0.640625 -2.5625q0.640625 -1.1875 1.734375 -1.96875q0.8125 -0.609375 2.21875 -1.03125q1.421875 -0.421875 3.046875 -0.421875q2.4375 0 4.28125 0.703125q1.859375 0.703125 2.734375 1.90625q0.875 1.203125 1.203125 3.21875l-3.4375 0.46875q-0.234375 -1.609375 -1.359375 -2.5q-1.109375 -0.90625 -3.171875 -0.90625q-2.421875 0 -3.453125 0.8125q-1.03125 0.796875 -1.03125 1.875q0 0.671875 0.421875 1.21875q0.4375 0.578125 1.359375 0.9375q0.515625 0.203125 3.09375 0.90625q3.734375 1.0 5.203125 1.640625q1.484375 0.625 2.3125 1.84375q0.84375 1.203125 0.84375 3.0q0 1.75 -1.03125 3.3125q-1.015625 1.546875 -2.953125 2.40625q-1.921875 0.84375 -4.375 0.84375q-4.03125 0 -6.15625 -1.671875q-2.125 -1.6875 -2.703125 -4.984375zm21.25 14.171875l-0.390625 -3.296875q1.15625 0.3125 2.015625 0.3125q1.171875 0 1.875 -0.390625q0.703125 -0.390625 1.140625 -1.09375q0.34375 -0.53125 1.078125 -2.609375q0.09375 -0.296875 0.3125 -0.859375l-7.875 -20.796875l3.796875 0l4.3125 12.015625q0.84375 2.28125 1.5 4.8125q0.609375 -2.421875 1.453125 -4.734375l4.4375 -12.09375l3.515625 0l-7.890625 21.109375q-1.28125 3.40625 -1.984375 4.703125q-0.9375 1.734375 -2.15625 2.546875q-1.203125 0.8125 -2.875 0.8125q-1.015625 0 -2.265625 -0.4375zm18.75 -14.171875l3.46875 -0.546875q0.296875 2.078125 1.625 3.203125q1.34375 1.109375 3.75 1.109375q2.421875 0 3.59375 -0.984375q1.171875 -0.984375 1.171875 -2.3125q0 -1.203125 -1.03125 -1.875q-0.71875 -0.46875 -3.59375 -1.203125q-3.875 -0.96875 -5.375 -1.671875q-1.484375 -0.71875 -2.265625 -1.984375q-0.765625 -1.265625 -0.765625 -2.78125q0 -1.390625 0.640625 -2.5625q0.640625 -1.1875 1.734375 -1.96875q0.8125 -0.609375 2.21875 -1.03125q1.421875 -0.421875 3.046875 -0.421875q2.4375 0 4.28125 0.703125q1.859375 0.703125 2.734375 1.90625q0.875 1.203125 1.203125 3.21875l-3.4375 0.46875q-0.234375 -1.609375 -1.359375 -2.5q-1.109375 -0.90625 -3.171875 -0.90625q-2.421875 0 -3.453125 0.8125q-1.03125 0.796875 -1.03125 1.875q0 0.671875 0.421875 1.21875q0.4375 0.578125 1.359375 0.9375q0.515625 0.203125 3.09375 0.90625q3.734375 1.0 5.203125 1.640625q1.484375 0.625 2.3125 1.84375q0.84375 1.203125 0.84375 3.0q0 1.75 -1.03125 3.3125q-1.015625 1.546875 -2.953125 2.40625q-1.921875 0.84375 -4.375 0.84375q-4.03125 0 -6.15625 -1.671875q-2.125 -1.6875 -2.703125 -4.984375zm29.078125 3.046875l0.515625 3.09375q-1.484375 0.328125 -2.65625 0.328125q-1.921875 0 -2.984375 -0.609375q-1.046875 -0.609375 -1.484375 -1.59375q-0.421875 -0.984375 -0.421875 -4.15625l0 -11.9375l-2.578125 0l0 -2.734375l2.578125 0l0 -5.125l3.5 -2.109375l0 7.234375l3.53125 0l0 2.734375l-3.53125 0l0 12.140625q0 1.5 0.1875 1.9375q0.1875 0.421875 0.59375 0.671875q0.421875 0.25 1.203125 0.25q0.59375 0 1.546875 -0.125zm17.644531 -3.546875l3.625 0.453125q-0.859375 3.1875 -3.1875 4.953125q-2.3125 1.75 -5.9375 1.75q-4.546875 0 -7.21875 -2.796875q-2.65625 -2.8125 -2.65625 -7.875q0 -5.234375 2.6875 -8.125q2.703125 -2.890625 7.0 -2.890625q4.15625 0 6.796875 2.84375q2.640625 2.828125 2.640625 7.96875q0 0.3125 -0.03125 0.9375l-15.46875 0q0.203125 3.40625 1.9375 5.234375q1.734375 1.8125 4.34375 1.8125q1.921875 0 3.28125 -1.015625q1.375 -1.015625 2.1875 -3.25zm-11.546875 -5.671875l11.578125 0q-0.234375 -2.625 -1.328125 -3.9375q-1.671875 -2.03125 -4.359375 -2.03125q-2.421875 0 -4.078125 1.625q-1.640625 1.625 -1.8125 4.34375zm19.589844 12.359375l0 -20.75l3.140625 0l0 2.921875q0.984375 -1.53125 2.59375 -2.453125q1.625 -0.9375 3.703125 -0.9375q2.296875 0 3.765625 0.96875q1.484375 0.953125 2.09375 2.671875q2.453125 -3.640625 6.40625 -3.640625q3.078125 0 4.734375 1.71875q1.671875 1.703125 1.671875 5.265625l0 14.234375l-3.5 0l0 -13.0625q0 -2.109375 -0.34375 -3.03125q-0.34375 -0.9375 -1.25 -1.5q-0.890625 -0.578125 -2.09375 -0.578125q-2.1875 0 -3.640625 1.46875q-1.4375 1.453125 -1.4375 4.65625l0 12.046875l-3.515625 0l0 -13.484375q0 -2.34375 -0.859375 -3.515625q-0.859375 -1.171875 -2.8125 -1.171875q-1.484375 0 -2.75 0.78125q-1.265625 0.78125 -1.828125 2.296875q-0.5625 1.5 -0.5625 4.328125l0 10.765625l-3.515625 0zm46.773438 0l0 -2.625q-1.96875 3.09375 -5.796875 3.09375q-2.484375 0 -4.5625 -1.359375q-2.078125 -1.375 -3.21875 -3.828125q-1.140625 -2.453125 -1.140625 -5.640625q0 -3.09375 1.03125 -5.625q1.03125 -2.53125 3.09375 -3.875q2.078125 -1.359375 4.640625 -1.359375q1.875 0 3.328125 0.796875q1.46875 0.796875 2.390625 2.0625l0 -10.28125l3.5 0l0 28.640625l-3.265625 0zm-11.109375 -10.359375q0 3.984375 1.671875 5.96875q1.6875 1.96875 3.96875 1.96875q2.3125 0 3.921875 -1.875q1.609375 -1.890625 1.609375 -5.765625q0 -4.25 -1.640625 -6.234375q-1.640625 -2.0 -4.046875 -2.0q-2.34375 0 -3.921875 1.921875q-1.5625 1.90625 -1.5625 6.015625z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m49.209972 86.879265l0 49.98162l64.10538 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m49.209972 86.879265l0 49.98162l40.10538 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m89.31535 143.46782l18.15239 -6.6069336l-18.15239 -6.6069183z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m155.39108 161.37009l0 49.98163l64.10536 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m155.39108 161.37007l0 49.98163l40.105377 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m195.49646 217.95863l18.15239 -6.6069336l-18.15239 -6.6069183z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m384.43832 318.48425l0 49.98163l64.10538 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m384.43832 318.48425l0 49.98163l40.105347 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m424.54367 375.0728l18.152405 -6.6069336l-18.152405 -6.6069336z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m19.175854 21.632545l525.2598 0l0 89.32284l-525.2598 0z" fill-rule="evenodd"></path><path fill="#000000" d="m46.832104 63.67317q0 1.0468788 -0.359375 1.8750038q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.9062538q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm23.898434 -14.25l-6.671875 17.531254q-1.0312462 2.6875 -2.1406212 4.609375q-1.109375 1.9375 -2.421875 3.171875q-1.296875 1.25 -2.859375 1.828125q-1.5625 0.59375 -3.5 0.59375q-0.5 0 -0.921875 -0.015625q-0.40625 -0.015625 -0.890625 -0.0625l0 -3.078125q0.421875 0.046875 0.921875 0.09375q0.515625 0.0625 1.09375 0.0625q0.9375 0 1.734375 -0.28125q0.8125 -0.265625 1.53125 -0.890625q0.734375 -0.609375 1.390625 -1.59375q0.671875 -0.96875 1.296875 -2.359375l-7.828125 -19.609379l3.859375 0l4.96875 12.96875l0.984375 3.0468788l1.140625 -3.1250038l4.593746 -12.890625l3.71875 0zm20.085938 14.25q0 1.0468788 -0.359375 1.8750038q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.9062538q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm22.257812 5.078129q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140629l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.1093788 1.109375 3.1562538q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm22.75782 -10.562504q0 0.71875 -0.015625 1.21875q-0.015625 0.484375 -0.0625 0.90625l-13.765633 0q0 3.015625 1.671875 4.625004q1.6875 1.609375 4.8437576 1.609375q0.859375 0 1.71875 -0.0625q0.859375 -0.078125 1.65625 -0.1875q0.8125 -0.125 1.546875 -0.265625q0.734375 -0.140625 1.359375 -0.328125l0 2.796875q-1.390625 0.390625 -3.140625 0.640625q-1.75 0.25 -3.625 0.25q-2.5156326 0 -4.3437576 -0.6875q-1.8125 -0.6875 -2.96875 -1.984375q-1.15625 -1.296875 -1.71875 -3.1875038q-0.5625 -1.890625 -0.5625 -4.265625q0 -2.078125 0.59375 -3.921875q0.609375 -1.84375 1.75 -3.234375q1.140625 -1.40625 2.796875 -2.21875q1.65625 -0.828125 3.765625 -0.828125q2.0625076 0 3.6406326 0.65625q1.578125 0.640625 2.65625 1.828125q1.09375 1.171875 1.640625 2.859375q0.5625 1.6875 0.5625 3.78125zm-3.53125 -0.484375q0.0625 -1.3125 -0.25 -2.390625q-0.3125 -1.09375 -0.96875 -1.875q-0.65625 -0.78125 -1.640625 -1.21875q-0.96875 -0.4375 -2.2656326 -0.4375q-1.109375 0 -2.03125 0.4375q-0.90625 0.421875 -1.578125 1.203125q-0.65625 0.78125 -1.078125 1.875q-0.40625 1.09375 -0.5 2.40625l10.312508 0zm22.945312 11.328129l0 -14.078129q0 -0.921875 -0.078125 -1.5q-0.0625 -0.59375 -0.203125 -0.9375q-0.140625 -0.34375 -0.375 -0.46875q-0.21875 -0.140625 -0.546875 -0.140625q-0.390625 0 -0.734375 0.234375q-0.328125 0.234375 -0.71875 0.765625q-0.375 0.515625 -0.828125 1.390625q-0.453125 0.859375 -1.078125 2.140625l0 12.593754l-3.109375 0l0 -13.718754q0 -1.0625 -0.078125 -1.71875q-0.0625 -0.671875 -0.21875 -1.046875q-0.140625 -0.375 -0.375 -0.5q-0.234375 -0.140625 -0.5625 -0.140625q-0.34375 0 -0.65625 0.203125q-0.3125 0.1875 -0.703125 0.703125q-0.375 0.5 -0.84375 1.375q-0.46875 0.875 -1.109375 2.25l0 12.593754l-3.125 0l0 -19.609379l2.59375 0l0.15625 3.734375q0.5 -1.125 0.984375 -1.90625q0.484375 -0.78125 0.984375 -1.25q0.515625 -0.484375 1.078125 -0.703125q0.578125 -0.234375 1.28125 -0.234375q1.59375 0 2.40625 1.046875q0.828125 1.03125 0.828125 3.203125q0.46875 -1.015625 0.90625 -1.8125q0.453125 -0.796875 0.96875 -1.328125q0.515625 -0.53125 1.140625 -0.8125q0.625 -0.296875 1.453125 -0.296875q3.6875 0 3.6875 5.6875l0 14.281254l-3.125 0zm7.0078125 -9.390629q0 -2.5 0.6875 -4.4375q0.6875 -1.953125 1.9375 -3.28125q1.265625 -1.34375 3.03125 -2.03125q1.765625 -0.703125 3.9375 -0.703125q0.9375 0 1.84375 0.125q0.90625 0.109375 1.796875 0.359375l0 -8.234375l3.40625 0l0 27.593754l-3.046875 0l-0.109375 -3.71875q-1.421875 2.078125 -3.09375 3.078125q-1.65625 1.0 -3.59375 1.0q-1.671875 0 -2.953125 -0.703125q-1.28125 -0.71875 -2.140625 -1.984375q-0.84375 -1.28125 -1.28125 -3.0781288q-0.421875 -1.796875 -0.421875 -3.984375zm3.484375 -0.21875q0 3.546875 1.046875 5.296879q1.046875 1.75 2.953125 1.75q1.296875 0 2.71875 -1.140625q1.4375 -1.15625 3.03125 -3.4218788l0 -9.109375q-0.84375 -0.390625 -1.859375 -0.59375q-1.015625 -0.203125 -2.015625 -0.203125q-2.765625 0 -4.328125 1.796875q-1.546875 1.796875 -1.546875 5.625z" fill-rule="nonzero"></path><path fill="#000000" d="m233.58992 75.76692q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.156254q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515629 4.671875 15.015629l-2.015625 0zm5.28125 -6.734375l0 -22.906254l2.8125 0l0 8.21875q1.96875 -2.28125 4.96875 -2.28125q1.84375 0 3.203125 0.734375q1.359375 0.71875 1.9375 2.0q0.59375 1.28125 0.59375 3.71875l0 10.515629l-2.8125 0l0 -10.515629q0 -2.109375 -0.921875 -3.0625q-0.90625 -0.96875 -2.578125 -0.96875q-1.25 0 -2.359375 0.65625q-1.09375 0.640625 -1.5625 1.75q-0.46875 1.109375 -0.46875 3.0625l0 9.078129l-2.8125 0zm16.75 -8.296879q0 -4.609375 2.5624847 -6.828125q2.140625 -1.84375 5.21875 -1.84375q3.421875 0 5.59375 2.25q2.171875 2.234375 2.171875 6.1875q0 3.203125 -0.96875 5.046879q-0.953125 1.828125 -2.796875 2.84375q-1.828125 1.015625 -4.0 1.015625q-3.484375 0 -5.640625 -2.234375q-2.1406097 -2.234375 -2.1406097 -6.437504zm2.8906097 0q0 3.1875 1.390625 4.781254q1.390625 1.578125 3.5 1.578125q2.09375 0 3.484375 -1.59375q1.390625 -1.5937538 1.390625 -4.859379q0 -3.078125 -1.40625 -4.65625q-1.390625 -1.59375 -3.46875 -1.59375q-2.109375 0 -3.5 1.578125q-1.390625 1.578125 -1.390625 4.765625zm14.828125 3.3437538l2.78125 -0.4375038q0.234375 1.6718788 1.296875 2.5625038q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.9531288 -0.828125 -1.5000038q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.4062538q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546879l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703129q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm4.59375 9.25l-2.015625 0q4.671875 -7.5 4.671875 -15.015629q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.218754 -1.625 8.156254q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m467.32285 331.43307l366.61417 0l0 73.165375l-366.61417 0z" fill-rule="evenodd"></path><path fill="#ff0000" d="m492.0416 378.83307l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm26.523407 -1.234375q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.7499695 0.640625 -3.7968445 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.6718445 0 2.9374695 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.7655945 -0.53125 -1.8124695 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3124695 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.476562 -0.15625q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm15.3984375 -14.8125l-5.8125 0l0 -2.78125l9.25 0l0 24.765625l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -21.984375zm21.992188 8.015625l-5.8125 0l0 -2.8125l9.25 0l0 16.78125l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -13.96875zm1.1875 -11.03125q0.5625 0 1.046875 0.203125q0.5 0.203125 0.859375 0.578125q0.359375 0.359375 0.5625 0.84375q0.203125 0.484375 0.203125 1.046875q0 0.546875 -0.203125 1.03125q-0.203125 0.484375 -0.5625 0.859375q-0.359375 0.375 -0.859375 0.578125q-0.484375 0.203125 -1.046875 0.203125q-0.5625 0 -1.0625 -0.203125q-0.484375 -0.203125 -0.84375 -0.578125q-0.359375 -0.375 -0.5625 -0.859375q-0.203125 -0.484375 -0.203125 -1.03125q0 -0.5625 0.203125 -1.046875q0.203125 -0.484375 0.5625 -0.84375q0.359375 -0.375 0.84375 -0.578125q0.5 -0.203125 1.0625 -0.203125zm29.351562 27.109375q-1.328125 0.5 -2.734375 0.75q-1.390625 0.25 -2.875 0.25q-4.640625 0 -7.15625 -2.515625q-2.5 -2.53125 -2.5 -7.375q0 -2.328125 0.71875 -4.21875q0.71875 -1.890625 2.03125 -3.234375q1.3125 -1.359375 3.125 -2.09375q1.8125 -0.734375 4.0 -0.734375q1.53125 0 2.859375 0.21875q1.328125 0.21875 2.53125 0.703125l0 3.25q-1.265625 -0.671875 -2.59375 -0.96875q-1.3125 -0.3125 -2.71875 -0.3125q-1.3125 0 -2.46875 0.5q-1.15625 0.5 -2.046875 1.4375q-0.875 0.9375 -1.390625 2.296875q-0.5 1.34375 -0.5 3.03125q0 3.5625 1.71875 5.328125q1.734375 1.765625 4.8125 1.765625q1.375 0 2.671875 -0.3125q1.3125 -0.3125 2.515625 -0.9375l0 3.171875zm19.351562 0.71875l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm25.554688 8.640625q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm12.8828125 -16.515625l-5.8125 0l0 -2.8125l9.25 0l0 16.78125l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -13.96875zm1.1875 -11.03125q0.5625 0 1.046875 0.203125q0.5 0.203125 0.859375 0.578125q0.359375 0.359375 0.5625 0.84375q0.203125 0.484375 0.203125 1.046875q0 0.546875 -0.203125 1.03125q-0.203125 0.484375 -0.5625 0.859375q-0.359375 0.375 -0.859375 0.578125q-0.484375 0.203125 -1.046875 0.203125q-0.5625 0 -1.0625 -0.203125q-0.484375 -0.203125 -0.84375 -0.578125q-0.359375 -0.375 -0.5625 -0.859375q-0.203125 -0.484375 -0.203125 -1.03125q0 -0.5625 0.203125 -1.046875q0.203125 -0.484375 0.5625 -0.84375q0.359375 -0.375 0.84375 -0.578125q0.5 -0.203125 1.0625 -0.203125zm31.195312 17.859375q0 2.296875 -0.65625 4.203125q-0.640625 1.890625 -1.859375 3.25q-1.203125 1.359375 -2.9375 2.125q-1.734375 0.75 -3.953125 0.75q-2.109375 0 -3.78125 -0.65625q-1.65625 -0.65625 -2.828125 -1.921875q-1.15625 -1.28125 -1.78125 -3.15625q-0.609375 -1.875 -0.609375 -4.3125q0 -2.28125 0.640625 -4.171875q0.65625 -1.890625 1.859375 -3.234375q1.21875 -1.359375 2.953125 -2.109375q1.734375 -0.765625 3.9375 -0.765625q2.109375 0 3.78125 0.65625q1.671875 0.65625 2.828125 1.921875q1.171875 1.25 1.78125 3.125q0.625 1.875 0.625 4.296875zm-3.484375 0.15625q0 -1.8125 -0.40625 -3.171875q-0.390625 -1.359375 -1.140625 -2.265625q-0.734375 -0.90625 -1.796875 -1.359375q-1.0625 -0.46875 -2.375 -0.46875q-1.53125 0 -2.609375 0.609375q-1.078125 0.59375 -1.78125 1.59375q-0.6875 0.984375 -1.015625 2.3125q-0.3125 1.3125 -0.3125 2.75q0 1.828125 0.390625 3.203125q0.40625 1.359375 1.140625 2.265625q0.75 0.90625 1.796875 1.375q1.0625 0.453125 2.390625 0.453125q1.515625 0 2.59375 -0.59375q1.09375 -0.609375 1.78125 -1.59375q0.703125 -1.0 1.015625 -2.3125q0.328125 -1.328125 0.328125 -2.796875zm8.3984375 -9.796875l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m486.97638 283.89108l224.94489 0l0 22.582672l-224.94489 0z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m845.5092 412.9895l78.89758 0l0 16.59842l-78.89758 0z" fill-rule="evenodd"></path><path fill="#999999" d="m862.7936 423.61996l1.125 0.140625q-0.171875 1.171875 -0.9375 1.828125q-0.765625 0.65625 -1.859375 0.65625q-1.390625 0 -2.234375 -0.90625q-0.828125 -0.90625 -0.828125 -2.59375q0 -1.09375 0.359375 -1.90625q0.359375 -0.828125 1.09375 -1.234375q0.734375 -0.40625 1.609375 -0.40625q1.09375 0 1.796875 0.5625q0.703125 0.546875 0.890625 1.5625l-1.109375 0.171875q-0.15625 -0.671875 -0.5625 -1.015625q-0.390625 -0.34375 -0.96875 -0.34375q-0.859375 0 -1.40625 0.625q-0.53125 0.609375 -0.53125 1.953125q0 1.359375 0.515625 1.984375q0.515625 0.609375 1.359375 0.609375q0.671875 0 1.125 -0.40625q0.453125 -0.421875 0.5625 -1.28125zm1.8515625 -0.90625q0 -1.875 1.03125 -2.765625q0.875 -0.75 2.125 -0.75q1.390625 0 2.265625 0.90625q0.890625 0.90625 0.890625 2.515625q0 1.296875 -0.390625 2.046875q-0.390625 0.75 -1.140625 1.171875q-0.75 0.40625 -1.625 0.40625q-1.421875 0 -2.296875 -0.90625q-0.859375 -0.90625 -0.859375 -2.625zm1.171875 0q0 1.296875 0.5625 1.953125q0.5625 0.640625 1.421875 0.640625q0.84375 0 1.40625 -0.640625q0.578125 -0.65625 0.578125 -1.984375q0 -1.25 -0.578125 -1.890625q-0.5625 -0.65625 -1.40625 -0.65625q-0.859375 0 -1.421875 0.640625q-0.5625 0.640625 -0.5625 1.9375zm6.6624756 3.375l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm9.912476 -1.015625l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.593567 0.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm3.1156006 -4.59375l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.9611206 0l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm12.021851 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.5374756 4.015625l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m234.5538 173.33597l432.37796 0l0 73.165344l-432.37796 0z" fill-rule="evenodd"></path><path fill="#000000" d="m262.21005 215.37659q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm23.898438 -14.25l-6.671875 17.53125q-1.03125 2.6875 -2.140625 4.609375q-1.109375 1.9375 -2.421875 3.171875q-1.296875 1.25 -2.859375 1.828125q-1.5625 0.59375 -3.5 0.59375q-0.5 0 -0.921875 -0.015625q-0.40625 -0.015625 -0.890625 -0.0625l0 -3.078125q0.421875 0.046875 0.921875 0.09375q0.515625 0.0625 1.09375 0.0625q0.9375 0 1.734375 -0.28125q0.8125 -0.265625 1.53125 -0.890625q0.734375 -0.609375 1.390625 -1.59375q0.671875 -0.96875 1.296875 -2.359375l-7.828125 -19.609375l3.859375 0l4.96875 12.96875l0.984375 3.046875l1.140625 -3.125l4.59375 -12.890625l3.71875 0zm20.085938 14.25q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm22.257812 5.078125q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm22.757812 -10.5625q0 0.71875 -0.015625 1.21875q-0.015625 0.484375 -0.0625 0.90625l-13.765625 0q0 3.015625 1.671875 4.625q1.6875 1.609375 4.84375 1.609375q0.859375 0 1.71875 -0.0625q0.859375 -0.078125 1.65625 -0.1875q0.8125 -0.125 1.546875 -0.265625q0.734375 -0.140625 1.359375 -0.328125l0 2.796875q-1.390625 0.390625 -3.140625 0.640625q-1.75 0.25 -3.625 0.25q-2.515625 0 -4.34375 -0.6875q-1.8125 -0.6875 -2.96875 -1.984375q-1.15625 -1.296875 -1.71875 -3.1875q-0.5625 -1.890625 -0.5625 -4.265625q0 -2.078125 0.59375 -3.921875q0.609375 -1.84375 1.75 -3.234375q1.140625 -1.40625 2.796875 -2.21875q1.65625 -0.828125 3.765625 -0.828125q2.0625 0 3.640625 0.65625q1.578125 0.640625 2.65625 1.828125q1.09375 1.171875 1.640625 2.859375q0.5625 1.6875 0.5625 3.78125zm-3.53125 -0.484375q0.0625 -1.3125 -0.25 -2.390625q-0.3125 -1.09375 -0.96875 -1.875q-0.65625 -0.78125 -1.640625 -1.21875q-0.96875 -0.4375 -2.265625 -0.4375q-1.109375 0 -2.03125 0.4375q-0.90625 0.421875 -1.578125 1.203125q-0.65625 0.78125 -1.078125 1.875q-0.40625 1.09375 -0.5 2.40625l10.3125 0zm22.945312 11.328125l0 -14.078125q0 -0.921875 -0.078125 -1.5q-0.0625 -0.59375 -0.203125 -0.9375q-0.140625 -0.34375 -0.375 -0.46875q-0.21875 -0.140625 -0.546875 -0.140625q-0.390625 0 -0.734375 0.234375q-0.328125 0.234375 -0.71875 0.765625q-0.375 0.515625 -0.828125 1.390625q-0.453125 0.859375 -1.078125 2.140625l0 12.59375l-3.109375 0l0 -13.71875q0 -1.0625 -0.078125 -1.71875q-0.0625 -0.671875 -0.21875 -1.046875q-0.140625 -0.375 -0.375 -0.5q-0.234375 -0.140625 -0.5625 -0.140625q-0.34375 0 -0.65625 0.203125q-0.3125 0.1875 -0.703125 0.703125q-0.375 0.5 -0.84375 1.375q-0.46875 0.875 -1.109375 2.25l0 12.59375l-3.125 0l0 -19.609375l2.59375 0l0.15625 3.734375q0.5 -1.125 0.984375 -1.90625q0.484375 -0.78125 0.984375 -1.25q0.515625 -0.484375 1.078125 -0.703125q0.578125 -0.234375 1.28125 -0.234375q1.59375 0 2.40625 1.046875q0.828125 1.03125 0.828125 3.203125q0.46875 -1.015625 0.90625 -1.8125q0.453125 -0.796875 0.96875 -1.328125q0.515625 -0.53125 1.140625 -0.8125q0.625 -0.296875 1.453125 -0.296875q3.6875 0 3.6875 5.6875l0 14.28125l-3.125 0zm7.0078125 -9.390625q0 -2.5 0.6875 -4.4375q0.6875 -1.953125 1.9375 -3.28125q1.265625 -1.34375 3.03125 -2.03125q1.765625 -0.703125 3.9375 -0.703125q0.9375 0 1.84375 0.125q0.90625 0.109375 1.796875 0.359375l0 -8.234375l3.40625 0l0 27.59375l-3.046875 0l-0.109375 -3.71875q-1.421875 2.078125 -3.09375 3.078125q-1.65625 1.0 -3.59375 1.0q-1.671875 0 -2.953125 -0.703125q-1.28125 -0.71875 -2.140625 -1.984375q-0.84375 -1.28125 -1.28125 -3.078125q-0.421875 -1.796875 -0.421875 -3.984375zm3.484375 -0.21875q0 3.546875 1.046875 5.296875q1.046875 1.75 2.953125 1.75q1.296875 0 2.71875 -1.140625q1.4375 -1.15625 3.03125 -3.421875l0 -9.109375q-0.84375 -0.390625 -1.859375 -0.59375q-1.015625 -0.203125 -2.015625 -0.203125q-2.765625 0 -4.328125 1.796875q-1.546875 1.796875 -1.546875 5.625zm33.226562 0.5625l-11.6875 0l0 -3.203125l11.6875 0l0 3.203125zm8.2734375 -10.5625l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375zm37.523438 14.25q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm23.226562 -4.796875q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm21.304688 10.0l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm27.929718 -10.6875l-2.859375 19.609375l-4.125 0l-2.828125 -8.203125l-0.5625 -2.0l-0.640625 2.109375l-2.71875 8.09375l-4.0000305 0l-2.84375 -19.609375l3.328125 0l1.6406555 13.3125l0.34375 2.96875l0.84375 -2.59375l2.859375 -8.8125l2.4375 0l3.0625 8.703125l0.875 2.59375l0.296875 -2.75l1.53125 -13.421875l3.359375 0zm3.8203125 0l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m264.36746 238.50131l0 49.98163l64.10538 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m264.36746 238.50131l0 49.98163l40.105377 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m304.47284 295.08987l18.152374 -6.6069336l-18.152374 -6.6069336z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m650.62994 331.43307l-114.86615 -34.80313" fill-rule="evenodd"></path><path stroke="#93c47d" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m650.62994 331.43307l-109.12396 -33.063324" fill-rule="evenodd"></path><path fill="#93c47d" stroke="#93c47d" stroke-width="1.0" stroke-linecap="butt" d="m541.9849 296.78897l-4.8220825 0.26486206l3.8641968 2.8966675z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m438.36484 271.32547l-69.5748 -40.472458" fill-rule="evenodd"></path><path stroke="#93c47d" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m438.36484 271.32547l-64.38849 -37.45552" fill-rule="evenodd"></path><path fill="#93c47d" stroke="#93c47d" stroke-width="1.0" stroke-linecap="butt" d="m374.8069 232.44223l-4.7532043 -0.854126l3.0921326 3.7095947z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m380.17847 189.10498l-201.13385 -110.04724" fill-rule="evenodd"></path><path stroke="#93c47d" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m380.17847 189.10498l-195.8702 -107.16731" fill-rule="evenodd"></path><path fill="#93c47d" stroke="#93c47d" stroke-width="1.0" stroke-linecap="butt" d="m185.10109 80.48864l-4.773987 -0.7292023l3.1883545 3.6272507z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m297.96063 110.68241l364.28345 0l0 42.488197l-364.28345 0z" fill-rule="evenodd"></path><path fill="#93c47d" d="m315.82 135.05554q0 0.5 -0.171875 0.890625q-0.15625 0.390625 -0.453125 0.6875q-0.28125 0.296875 -0.671875 0.515625q-0.375 0.21875 -0.8125 0.359375q-0.421875 0.125 -0.875 0.1875q-0.453125 0.078125 -0.890625 0.078125q-0.953125 0 -1.75 -0.09375q-0.78125 -0.078125 -1.546875 -0.265625l0 -1.484375q0.8125 0.234375 1.625 0.359375q0.8125 0.109375 1.609375 0.109375q1.15625 0 1.703125 -0.3125q0.5625 -0.3125 0.5625 -0.890625q0 -0.25 -0.09375 -0.453125q-0.078125 -0.203125 -0.3125 -0.375q-0.234375 -0.1875 -0.71875 -0.375q-0.484375 -0.203125 -1.328125 -0.453125q-0.640625 -0.1875 -1.171875 -0.421875q-0.53125 -0.234375 -0.921875 -0.5625q-0.390625 -0.328125 -0.609375 -0.765625q-0.21875 -0.4375 -0.21875 -1.03125q0 -0.390625 0.171875 -0.84375q0.1875 -0.46875 0.625 -0.859375q0.4375 -0.40625 1.171875 -0.671875q0.75 -0.265625 1.859375 -0.265625q0.546875 0 1.21875 0.0625q0.671875 0.0625 1.390625 0.203125l0 1.4375q-0.765625 -0.171875 -1.453125 -0.265625q-0.671875 -0.09375 -1.171875 -0.09375q-0.609375 0 -1.03125 0.09375q-0.40625 0.09375 -0.65625 0.265625q-0.25 0.15625 -0.375 0.375q-0.109375 0.21875 -0.109375 0.46875q0 0.25 0.09375 0.453125q0.109375 0.203125 0.375 0.390625q0.265625 0.1875 0.734375 0.390625q0.46875 0.1875 1.234375 0.40625q0.828125 0.234375 1.390625 0.5q0.5625 0.265625 0.90625 0.59375q0.359375 0.328125 0.515625 0.734375q0.15625 0.40625 0.15625 0.921875zm2.4135437 -1.921875q0 -1.1875 0.3125 -2.109375q0.328125 -0.921875 0.921875 -1.546875q0.609375 -0.640625 1.4375 -0.96875q0.84375 -0.328125 1.875 -0.328125q0.453125 0 0.875 0.0625q0.4375 0.046875 0.859375 0.171875l0 -3.9218826l1.625 0l0 13.109383l-1.453125 0l-0.0625 -1.765625q-0.671875 0.984375 -1.46875 1.46875q-0.78125 0.46875 -1.703125 0.46875q-0.796875 0 -1.40625 -0.328125q-0.59375 -0.34375 -1.0 -0.953125q-0.40625 -0.609375 -0.609375 -1.453125q-0.203125 -0.859375 -0.203125 -1.90625zm1.640625 -0.09375q0 1.6875 0.5 2.515625q0.5 0.828125 1.40625 0.828125q0.609375 0 1.296875 -0.546875q0.6875 -0.546875 1.4375 -1.625l0 -4.3125q-0.40625 -0.1875 -0.890625 -0.28125q-0.484375 -0.109375 -0.953125 -0.109375q-1.3125 0 -2.0625 0.859375q-0.734375 0.84375 -0.734375 2.671875zm18.054169 8.359375l-10.453125 0l0 -1.328125l10.453125 0l0 1.328125zm1.2885437 -13.109375l1.4375 0l0.0625 1.5q0.40625 -0.484375 0.78125 -0.796875q0.390625 -0.328125 0.75 -0.515625q0.375 -0.203125 0.75 -0.28125q0.390625 -0.078125 0.796875 -0.078125q1.4375 0 2.171875 0.859375q0.734375 0.84375 0.734375 2.546875l0 6.078125l-1.609375 0l0 -5.953125q0 -1.09375 -0.40625 -1.609375q-0.40625 -0.53125 -1.21875 -0.53125q-0.296875 0 -0.578125 0.09375q-0.28125 0.09375 -0.59375 0.3125q-0.296875 0.203125 -0.65625 0.578125q-0.359375 0.375 -0.8125 0.9375l0 6.171875l-1.609375 0l0 -9.3125zm18.366669 4.578125q0 1.09375 -0.3125 2.0q-0.296875 0.890625 -0.875 1.546875q-0.578125 0.640625 -1.40625 1.0q-0.828125 0.359375 -1.875 0.359375q-1.0 0 -1.796875 -0.3125q-0.78125 -0.3125 -1.34375 -0.90625q-0.546875 -0.609375 -0.84375 -1.5q-0.28125 -0.890625 -0.28125 -2.0625q0 -1.078125 0.296875 -1.96875q0.3125 -0.90625 0.875 -1.546875q0.578125 -0.640625 1.40625 -1.0q0.828125 -0.359375 1.875 -0.359375q1.0 0 1.796875 0.3125q0.796875 0.3125 1.34375 0.921875q0.5625 0.59375 0.84375 1.484375q0.296875 0.890625 0.296875 2.03125zm-1.65625 0.078125q0 -0.859375 -0.1875 -1.5q-0.1875 -0.65625 -0.546875 -1.078125q-0.34375 -0.4375 -0.859375 -0.65625q-0.5 -0.21875 -1.125 -0.21875q-0.71875 0 -1.234375 0.28125q-0.515625 0.28125 -0.84375 0.765625q-0.328125 0.46875 -0.484375 1.09375q-0.15625 0.625 -0.15625 1.3125q0 0.859375 0.1875 1.515625q0.203125 0.640625 0.546875 1.078125q0.359375 0.421875 0.859375 0.640625q0.5 0.21875 1.125 0.21875q0.734375 0 1.25 -0.28125q0.515625 -0.28125 0.84375 -0.75q0.328125 -0.46875 0.46875 -1.09375q0.15625 -0.640625 0.15625 -1.328125zm11.304169 4.53125q-0.546875 0.140625 -1.125 0.1875q-0.578125 0.0625 -1.1875 0.0625q-1.75 0 -2.625 -0.78125q-0.859375 -0.796875 -0.859375 -2.4375l0 -4.859375l-2.609375 0l0 -1.359375l2.609375 0l0 -2.5625076l1.625 -0.421875l0 2.9843826l4.171875 0l0 1.359375l-4.171875 0l0 4.71875q0 1.0 0.53125 1.5q0.53125 0.5 1.5625 0.5q0.453125 0 0.984375 -0.0625q0.53125 -0.078125 1.09375 -0.21875l0 1.390625zm5.9291687 -7.859375l-2.75 0l0 -1.328125l4.390625 0l0 7.96875l2.765625 0l0 1.34375l-7.46875 0l0 -1.34375l3.0625 0l0 -6.640625zm0.5625 -5.2343826q0.28125 0 0.5 0.09375q0.234375 0.09375 0.40625 0.28125q0.171875 0.171875 0.265625 0.40625q0.109375 0.21875 0.109375 0.484375q0 0.265625 -0.109375 0.5q-0.09375 0.234375 -0.265625 0.40625q-0.171875 0.171875 -0.40625 0.28125q-0.21875 0.09375 -0.5 0.09375q-0.265625 0 -0.5 -0.09375q-0.234375 -0.109375 -0.40625 -0.28125q-0.171875 -0.171875 -0.265625 -0.40625q-0.09375 -0.234375 -0.09375 -0.5q0 -0.265625 0.09375 -0.484375q0.09375 -0.234375 0.265625 -0.40625q0.171875 -0.1875 0.40625 -0.28125q0.234375 -0.09375 0.5 -0.09375zm14.788544 1.609375q-1.265625 -0.265625 -2.1875 -0.265625q-2.1875 0 -2.1875 2.2812576l0 1.640625l4.09375 0l0 1.34375l-4.09375 0l0 6.609375l-1.640625 0l0 -6.609375l-2.984375 0l0 -1.34375l2.984375 0l0 -1.546875q0 -3.7187576 3.875 -3.7187576q0.96875 0 2.140625 0.21875l0 1.390625zm-9.75 2.2968826l0 0zm20.022919 0l-3.171875 8.328125q-0.484375 1.265625 -1.015625 2.1875q-0.515625 0.921875 -1.140625 1.5q-0.625 0.59375 -1.375 0.875q-0.734375 0.28125 -1.65625 0.28125q-0.234375 0 -0.4375 -0.015625q-0.1875 0 -0.421875 -0.015625l0 -1.46875q0.203125 0.03125 0.4375 0.046875q0.25 0.03125 0.515625 0.03125q0.453125 0 0.828125 -0.140625q0.390625 -0.125 0.734375 -0.421875q0.34375 -0.28125 0.65625 -0.75q0.3125 -0.46875 0.609375 -1.125l-3.71875 -9.3125l1.84375 0l2.359375 6.15625l0.46875 1.453125l0.53125 -1.484375l2.1875 -6.125l1.765625 0z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m422.74014 214.5853l487.43307 0l0 42.48819l-487.43307 0z" fill-rule="evenodd"></path><path fill="#93c47d" d="m440.59952 238.95842q0 0.5 -0.171875 0.890625q-0.15625 0.390625 -0.453125 0.6875q-0.28125 0.296875 -0.671875 0.515625q-0.375 0.21875 -0.8125 0.359375q-0.421875 0.125 -0.875 0.1875q-0.453125 0.078125 -0.890625 0.078125q-0.953125 0 -1.75 -0.09375q-0.78125 -0.078125 -1.546875 -0.265625l0 -1.484375q0.8125 0.234375 1.625 0.359375q0.8125 0.109375 1.609375 0.109375q1.15625 0 1.703125 -0.3125q0.5625 -0.3125 0.5625 -0.890625q0 -0.25 -0.09375 -0.453125q-0.078125 -0.203125 -0.3125 -0.375q-0.234375 -0.1875 -0.71875 -0.375q-0.484375 -0.203125 -1.328125 -0.453125q-0.640625 -0.1875 -1.171875 -0.421875q-0.53125 -0.234375 -0.921875 -0.5625q-0.390625 -0.328125 -0.609375 -0.765625q-0.21875 -0.4375 -0.21875 -1.03125q0 -0.390625 0.171875 -0.84375q0.1875 -0.46875 0.625 -0.859375q0.4375 -0.40625 1.171875 -0.671875q0.75 -0.265625 1.859375 -0.265625q0.546875 0 1.21875 0.0625q0.671875 0.0625 1.390625 0.203125l0 1.4375q-0.765625 -0.171875 -1.453125 -0.265625q-0.671875 -0.09375 -1.171875 -0.09375q-0.609375 0 -1.03125 0.09375q-0.40625 0.09375 -0.65625 0.265625q-0.25 0.15625 -0.375 0.375q-0.109375 0.21875 -0.109375 0.46875q0 0.25 0.09375 0.453125q0.109375 0.203125 0.375 0.390625q0.265625 0.1875 0.734375 0.390625q0.46875 0.1875 1.234375 0.40625q0.828125 0.234375 1.390625 0.5q0.5625 0.265625 0.90625 0.59375q0.359375 0.328125 0.515625 0.734375q0.15625 0.40625 0.15625 0.921875zm2.4135437 -1.921875q0 -1.1875 0.3125 -2.109375q0.328125 -0.921875 0.921875 -1.546875q0.609375 -0.640625 1.4375 -0.96875q0.84375 -0.328125 1.875 -0.328125q0.453125 0 0.875 0.0625q0.4375 0.046875 0.859375 0.171875l0 -3.921875l1.625 0l0 13.109375l-1.453125 0l-0.0625 -1.765625q-0.671875 0.984375 -1.46875 1.46875q-0.78125 0.46875 -1.703125 0.46875q-0.796875 0 -1.40625 -0.328125q-0.59375 -0.34375 -1.0 -0.953125q-0.40625 -0.609375 -0.609375 -1.453125q-0.203125 -0.859375 -0.203125 -1.90625zm1.640625 -0.09375q0 1.6875 0.5 2.515625q0.5 0.828125 1.40625 0.828125q0.609375 0 1.296875 -0.546875q0.6875 -0.546875 1.4375 -1.625l0 -4.3125q-0.40625 -0.1875 -0.890625 -0.28125q-0.484375 -0.109375 -0.953125 -0.109375q-1.3125 0 -2.0625 0.859375q-0.734375 0.84375 -0.734375 2.671875zm18.054169 8.359375l-10.453125 0l0 -1.328125l10.453125 0l0 1.328125zm1.2885437 -13.109375l1.4375 0l0.0625 1.5q0.40625 -0.484375 0.78125 -0.796875q0.390625 -0.328125 0.75 -0.515625q0.375 -0.203125 0.75 -0.28125q0.390625 -0.078125 0.796875 -0.078125q1.4375 0 2.171875 0.859375q0.734375 0.84375 0.734375 2.546875l0 6.078125l-1.609375 0l0 -5.953125q0 -1.09375 -0.40625 -1.609375q-0.40625 -0.53125 -1.21875 -0.53125q-0.296875 0 -0.578125 0.09375q-0.28125 0.09375 -0.59375 0.3125q-0.296875 0.203125 -0.65625 0.578125q-0.359375 0.375 -0.8125 0.9375l0 6.171875l-1.609375 0l0 -9.3125zm18.366669 4.578125q0 1.09375 -0.3125 2.0q-0.296875 0.890625 -0.875 1.546875q-0.578125 0.640625 -1.40625 1.0q-0.828125 0.359375 -1.875 0.359375q-1.0 0 -1.796875 -0.3125q-0.78125 -0.3125 -1.34375 -0.90625q-0.546875 -0.609375 -0.84375 -1.5q-0.28125 -0.890625 -0.28125 -2.0625q0 -1.078125 0.296875 -1.96875q0.3125 -0.90625 0.875 -1.546875q0.578125 -0.640625 1.40625 -1.0q0.828125 -0.359375 1.875 -0.359375q1.0 0 1.796875 0.3125q0.796875 0.3125 1.34375 0.921875q0.5625 0.59375 0.84375 1.484375q0.296875 0.890625 0.296875 2.03125zm-1.65625 0.078125q0 -0.859375 -0.1875 -1.5q-0.1875 -0.65625 -0.546875 -1.078125q-0.34375 -0.4375 -0.859375 -0.65625q-0.5 -0.21875 -1.125 -0.21875q-0.71875 0 -1.234375 0.28125q-0.515625 0.28125 -0.84375 0.765625q-0.328125 0.46875 -0.484375 1.09375q-0.15625 0.625 -0.15625 1.3125q0 0.859375 0.1875 1.515625q0.203125 0.640625 0.546875 1.078125q0.359375 0.421875 0.859375 0.640625q0.5 0.21875 1.125 0.21875q0.734375 0 1.25 -0.28125q0.515625 -0.28125 0.84375 -0.75q0.328125 -0.46875 0.46875 -1.09375q0.15625 -0.640625 0.15625 -1.328125zm11.304169 4.53125q-0.546875 0.140625 -1.125 0.1875q-0.578125 0.0625 -1.1875 0.0625q-1.75 0 -2.625 -0.78125q-0.859375 -0.796875 -0.859375 -2.4375l0 -4.859375l-2.609375 0l0 -1.359375l2.609375 0l0 -2.5625l1.625 -0.421875l0 2.984375l4.171875 0l0 1.359375l-4.171875 0l0 4.71875q0 1.0 0.53125 1.5q0.53125 0.5 1.5625 0.5q0.453125 0 0.984375 -0.0625q0.53125 -0.078125 1.09375 -0.21875l0 1.390625zm5.9291687 -7.859375l-2.75 0l0 -1.328125l4.390625 0l0 7.96875l2.765625 0l0 1.34375l-7.46875 0l0 -1.34375l3.0625 0l0 -6.640625zm0.5625 -5.234375q0.28125 0 0.5 0.09375q0.234375 0.09375 0.40625 0.28125q0.171875 0.171875 0.265625 0.40625q0.109375 0.21875 0.109375 0.484375q0 0.265625 -0.109375 0.5q-0.09375 0.234375 -0.265625 0.40625q-0.171875 0.171875 -0.40625 0.28125q-0.21875 0.09375 -0.5 0.09375q-0.265625 0 -0.5 -0.09375q-0.234375 -0.109375 -0.40625 -0.28125q-0.171875 -0.171875 -0.265625 -0.40625q-0.09375 -0.234375 -0.09375 -0.5q0 -0.265625 0.09375 -0.484375q0.09375 -0.234375 0.265625 -0.40625q0.171875 -0.1875 0.40625 -0.28125q0.234375 -0.09375 0.5 -0.09375zm14.788544 1.609375q-1.265625 -0.265625 -2.1875 -0.265625q-2.1875 0 -2.1875 2.28125l0 1.640625l4.09375 0l0 1.34375l-4.09375 0l0 6.609375l-1.640625 0l0 -6.609375l-2.984375 0l0 -1.34375l2.984375 0l0 -1.546875q0 -3.71875 3.875 -3.71875q0.96875 0 2.140625 0.21875l0 1.390625zm-9.75 2.296875l0 0zm20.02295 0l-3.171875 8.328125q-0.484375 1.265625 -1.015625 2.1875q-0.515625 0.921875 -1.140625 1.5q-0.625 0.59375 -1.375 0.875q-0.734375 0.28125 -1.65625 0.28125q-0.234375 0 -0.4375 -0.015625q-0.1875 0 -0.421875 -0.015625l0 -1.46875q0.203125 0.03125 0.4375 0.046875q0.25 0.03125 0.515625 0.03125q0.453125 0 0.828125 -0.140625q0.390625 -0.125 0.734375 -0.421875q0.34375 -0.28125 0.65625 -0.75q0.3125 -0.46875 0.609375 -1.125l-3.71875 -9.3125l1.84375 0l2.359375 6.15625l0.46875 1.453125l0.53125 -1.484375l2.1875 -6.125l1.765625 0zm17.811462 13.203125q-4.28125 -3.953125 -4.28125 -8.75q0 -1.125 0.21875 -2.234375q0.234375 -1.125 0.734375 -2.25q0.515625 -1.125 1.34375 -2.234375q0.828125 -1.125 2.015625 -2.234375l0.9375 0.953125q-3.59375 3.546875 -3.59375 7.875q0 2.15625 0.90625 4.140625q0.90625 1.984375 2.6875 3.75l-0.96875 0.984375zm13.304138 -13.203125l-1.34375 9.3125l-1.96875 0l-1.34375 -3.890625l-0.265625 -0.953125l-0.3125 1.0l-1.28125 3.84375l-1.90625 0l-1.34375 -9.3125l1.578125 0l0.78125 6.328125l0.15625 1.40625l0.40625 -1.234375l1.359375 -4.1875l1.15625 0l1.453125 4.140625l0.421875 1.21875l0.140625 -1.296875l0.71875 -6.375l1.59375 0zm9.116699 9.3125l-1.609375 0l0 -5.953125q0 -1.0625 -0.40625 -1.59375q-0.40625 -0.546875 -1.15625 -0.546875q-0.328125 0 -0.609375 0.09375q-0.28125 0.09375 -0.59375 0.3125q-0.296875 0.203125 -0.65625 0.578125q-0.359375 0.375 -0.84375 0.9375l0 6.171875l-1.609375 0l0 -13.109375l1.609375 0l0 3.796875l-0.046875 1.46875q0.375 -0.453125 0.734375 -0.765625q0.375 -0.3125 0.734375 -0.5q0.375 -0.203125 0.75 -0.28125q0.390625 -0.09375 0.796875 -0.09375q1.390625 0 2.140625 0.859375q0.765625 0.84375 0.765625 2.546875l0 6.078125zm10.647888 -5.15625q0 0.34375 -0.015625 0.578125q-0.015625 0.234375 -0.03125 0.4375l-6.53125 0q0 1.4375 0.796875 2.203125q0.796875 0.765625 2.296875 0.765625q0.40625 0 0.8125 -0.03125q0.40625 -0.046875 0.78125 -0.09375q0.390625 -0.0625 0.734375 -0.125q0.34375 -0.078125 0.640625 -0.15625l0 1.328125q-0.65625 0.1875 -1.484375 0.296875q-0.828125 0.125 -1.71875 0.125q-1.203125 0 -2.0625 -0.328125q-0.859375 -0.328125 -1.421875 -0.9375q-0.546875 -0.625 -0.8125 -1.515625q-0.265625 -0.890625 -0.265625 -2.03125q0 -0.984375 0.28125 -1.859375q0.296875 -0.875 0.828125 -1.53125q0.546875 -0.671875 1.328125 -1.0625q0.796875 -0.390625 1.796875 -0.390625q0.984375 0 1.734375 0.3125q0.75 0.296875 1.265625 0.859375q0.515625 0.5625 0.78125 1.375q0.265625 0.796875 0.265625 1.78125zm-1.6875 -0.21875q0.03125 -0.625 -0.125 -1.140625q-0.140625 -0.515625 -0.453125 -0.890625q-0.3125 -0.375 -0.78125 -0.578125q-0.453125 -0.203125 -1.078125 -0.203125q-0.515625 0 -0.953125 0.203125q-0.4375 0.203125 -0.765625 0.578125q-0.3125 0.359375 -0.5 0.890625q-0.1875 0.515625 -0.234375 1.140625l4.890625 0zm4.069824 -3.9375l1.4375 0l0.0625 1.5q0.40625 -0.484375 0.78125 -0.796875q0.390625 -0.328125 0.75 -0.515625q0.375 -0.203125 0.75 -0.28125q0.390625 -0.078125 0.796875 -0.078125q1.4375 0 2.171875 0.859375q0.734375 0.84375 0.734375 2.546875l0 6.078125l-1.609375 0l0 -5.953125q0 -1.09375 -0.40625 -1.609375q-0.40625 -0.53125 -1.21875 -0.53125q-0.296875 0 -0.578125 0.09375q-0.28125 0.09375 -0.59375 0.3125q-0.296875 0.203125 -0.65625 0.578125q-0.359375 0.375 -0.8125 0.9375l0 6.171875l-1.609375 0l0 -9.3125zm20.889587 0l1.484375 0l0.046875 1.71875q0.828125 -1.0 1.625 -1.4375q0.796875 -0.453125 1.625 -0.453125q1.4375 0 2.1875 0.9375q0.75 0.9375 0.6875 2.78125l-1.625 0q0.015625 -1.21875 -0.375 -1.765625q-0.375 -0.5625 -1.109375 -0.5625q-0.328125 0 -0.65625 0.125q-0.328125 0.109375 -0.6875 0.375q-0.34375 0.25 -0.734375 0.65625q-0.390625 0.390625 -0.828125 0.953125l0 5.984375l-1.640625 0l0 -9.3125zm17.757263 4.15625q0 0.34375 -0.015625 0.578125q-0.015625 0.234375 -0.03125 0.4375l-6.53125 0q0 1.4375 0.796875 2.203125q0.796875 0.765625 2.296875 0.765625q0.40625 0 0.8125 -0.03125q0.40625 -0.046875 0.78125 -0.09375q0.390625 -0.0625 0.734375 -0.125q0.34375 -0.078125 0.640625 -0.15625l0 1.328125q-0.65625 0.1875 -1.484375 0.296875q-0.828125 0.125 -1.71875 0.125q-1.203125 0 -2.0625 -0.328125q-0.859375 -0.328125 -1.421875 -0.9375q-0.546875 -0.625 -0.8125 -1.515625q-0.265625 -0.890625 -0.265625 -2.03125q0 -0.984375 0.28125 -1.859375q0.296875 -0.875 0.828125 -1.53125q0.546875 -0.671875 1.328125 -1.0625q0.796875 -0.390625 1.796875 -0.390625q0.984375 0 1.734375 0.3125q0.75 0.296875 1.265625 0.859375q0.515625 0.5625 0.78125 1.375q0.265625 0.796875 0.265625 1.78125zm-1.6875 -0.21875q0.03125 -0.625 -0.125 -1.140625q-0.140625 -0.515625 -0.453125 -0.890625q-0.3125 -0.375 -0.78125 -0.578125q-0.453125 -0.203125 -1.078125 -0.203125q-0.515625 0 -0.953125 0.203125q-0.4375 0.203125 -0.765625 0.578125q-0.3125 0.359375 -0.5 0.890625q-0.1875 0.515625 -0.234375 1.140625l4.890625 0zm10.054199 5.375l-0.03125 -1.25q-0.765625 0.75 -1.546875 1.09375q-0.78125 0.328125 -1.65625 0.328125q-0.796875 0 -1.359375 -0.203125q-0.5625 -0.203125 -0.9375 -0.5625q-0.359375 -0.359375 -0.53125 -0.84375q-0.171875 -0.484375 -0.171875 -1.046875q0 -1.40625 1.046875 -2.1875q1.046875 -0.796875 3.078125 -0.796875l1.9375 0l0 -0.828125q0 -0.8125 -0.53125 -1.3125q-0.53125 -0.5 -1.609375 -0.5q-0.796875 0 -1.5625 0.1875q-0.765625 0.171875 -1.578125 0.484375l0 -1.453125q0.296875 -0.109375 0.671875 -0.21875q0.390625 -0.109375 0.796875 -0.1875q0.421875 -0.078125 0.875 -0.125q0.453125 -0.0625 0.921875 -0.0625q0.84375 0 1.515625 0.1875q0.6875 0.1875 1.15625 0.578125q0.46875 0.375 0.71875 0.953125q0.25 0.5625 0.25 1.34375l0 6.421875l-1.453125 0zm-0.171875 -4.234375l-2.0625 0q-0.59375 0 -1.03125 0.125q-0.4375 0.109375 -0.71875 0.34375q-0.28125 0.21875 -0.421875 0.53125q-0.125 0.296875 -0.125 0.6875q0 0.28125 0.078125 0.53125q0.09375 0.234375 0.28125 0.421875q0.1875 0.1875 0.484375 0.3125q0.296875 0.109375 0.71875 0.109375q0.5625 0 1.28125 -0.34375q0.71875 -0.34375 1.515625 -1.078125l0 -1.640625zm11.679138 3.890625q-0.625 0.234375 -1.296875 0.34375q-0.65625 0.125 -1.359375 0.125q-2.21875 0 -3.40625 -1.1875q-1.1875 -1.203125 -1.1875 -3.5q0 -1.109375 0.34375 -2.0q0.34375 -0.90625 0.953125 -1.546875q0.625 -0.640625 1.484375 -0.984375q0.875 -0.34375 1.90625 -0.34375q0.734375 0 1.359375 0.109375q0.625 0.09375 1.203125 0.3125l0 1.546875q-0.59375 -0.3125 -1.234375 -0.453125q-0.625 -0.15625 -1.28125 -0.15625q-0.625 0 -1.1875 0.25q-0.546875 0.234375 -0.96875 0.6875q-0.40625 0.4375 -0.65625 1.078125q-0.234375 0.640625 -0.234375 1.4375q0 1.6875 0.8125 2.53125q0.828125 0.84375 2.28125 0.84375q0.65625 0 1.265625 -0.140625q0.625 -0.15625 1.203125 -0.453125l0 1.5zm10.507324 0.34375l-1.609375 0l0 -5.953125q0 -1.0625 -0.40625 -1.59375q-0.40625 -0.546875 -1.15625 -0.546875q-0.328125 0 -0.609375 0.09375q-0.28125 0.09375 -0.59375 0.3125q-0.296875 0.203125 -0.65625 0.578125q-0.359375 0.375 -0.84375 0.9375l0 6.171875l-1.609375 0l0 -13.109375l1.609375 0l0 3.796875l-0.046875 1.46875q0.375 -0.453125 0.734375 -0.765625q0.375 -0.3125 0.734375 -0.5q0.375 -0.203125 0.75 -0.28125q0.390625 -0.09375 0.796875 -0.09375q1.390625 0 2.140625 0.859375q0.765625 0.84375 0.765625 2.546875l0 6.078125zm5.944763 -7.984375l-2.75 0l0 -1.328125l4.390625 0l0 7.96875l2.765625 0l0 1.34375l-7.46875 0l0 -1.34375l3.0625 0l0 -6.640625zm0.5625 -5.234375q0.28125 0 0.5 0.09375q0.234375 0.09375 0.40625 0.28125q0.171875 0.171875 0.265625 0.40625q0.109375 0.21875 0.109375 0.484375q0 0.265625 -0.109375 0.5q-0.09375 0.234375 -0.265625 0.40625q-0.171875 0.171875 -0.40625 0.28125q-0.21875 0.09375 -0.5 0.09375q-0.265625 0 -0.5 -0.09375q-0.234375 -0.109375 -0.40625 -0.28125q-0.171875 -0.171875 -0.265625 -0.40625q-0.09375 -0.234375 -0.09375 -0.5q0 -0.265625 0.09375 -0.484375q0.09375 -0.234375 0.265625 -0.40625q0.171875 -0.1875 0.40625 -0.28125q0.234375 -0.09375 0.5 -0.09375zm6.522949 3.90625l1.4375 0l0.0625 1.5q0.40625 -0.484375 0.78125 -0.796875q0.390625 -0.328125 0.75 -0.515625q0.375 -0.203125 0.75 -0.28125q0.390625 -0.078125 0.796875 -0.078125q1.4375 0 2.171875 0.859375q0.734375 0.84375 0.734375 2.546875l0 6.078125l-1.609375 0l0 -5.953125q0 -1.09375 -0.40625 -1.609375q-0.40625 -0.53125 -1.21875 -0.53125q-0.296875 0 -0.578125 0.09375q-0.28125 0.09375 -0.59375 0.3125q-0.296875 0.203125 -0.65625 0.578125q-0.359375 0.375 -0.8125 0.9375l0 6.171875l-1.609375 0l0 -9.3125zm16.960388 1.3125q0.265625 0.328125 0.40625 0.765625q0.140625 0.421875 0.140625 0.921875q0 0.734375 -0.265625 1.328125q-0.265625 0.59375 -0.75 1.03125q-0.46875 0.421875 -1.140625 0.65625q-0.671875 0.234375 -1.484375 0.234375q-0.578125 0 -1.09375 -0.125q-0.515625 -0.125 -0.8125 -0.3125q-0.171875 0.265625 -0.296875 0.5q-0.109375 0.21875 -0.109375 0.515625q0 0.34375 0.328125 0.578125q0.34375 0.234375 0.90625 0.25l2.4375 0.09375q0.703125 0.015625 1.28125 0.1875q0.59375 0.15625 1.015625 0.453125q0.421875 0.296875 0.65625 0.734375q0.25 0.421875 0.25 1.0q0 0.625 -0.28125 1.171875q-0.265625 0.5625 -0.828125 0.984375q-0.5625 0.421875 -1.421875 0.671875q-0.859375 0.25 -2.046875 0.25q-1.140625 0 -1.9375 -0.1875q-0.78125 -0.171875 -1.296875 -0.5q-0.5 -0.3125 -0.734375 -0.75q-0.234375 -0.4375 -0.234375 -0.96875q0 -0.671875 0.3125 -1.1875q0.3125 -0.515625 0.96875 -0.984375q-0.234375 -0.109375 -0.421875 -0.265625q-0.171875 -0.171875 -0.28125 -0.375q-0.109375 -0.203125 -0.171875 -0.421875q-0.046875 -0.21875 -0.046875 -0.4375q0 -0.609375 0.28125 -1.109375q0.28125 -0.5 0.671875 -0.9375q-0.171875 -0.21875 -0.3125 -0.421875q-0.125 -0.203125 -0.234375 -0.4375q-0.09375 -0.234375 -0.140625 -0.5q-0.046875 -0.28125 -0.046875 -0.640625q0 -0.71875 0.25 -1.3125q0.265625 -0.609375 0.75 -1.03125q0.484375 -0.4375 1.15625 -0.671875q0.671875 -0.234375 1.484375 -0.234375q0.34375 0 0.65625 0.046875q0.3125 0.046875 0.5625 0.125l3.375 0l0 1.3125l-1.5 0zm-5.59375 9.34375q0 0.65625 0.6875 0.953125q0.6875 0.3125 1.90625 0.3125q0.765625 0 1.28125 -0.140625q0.53125 -0.140625 0.84375 -0.375q0.328125 -0.21875 0.46875 -0.515625q0.140625 -0.28125 0.140625 -0.59375q0 -0.5625 -0.46875 -0.84375q-0.453125 -0.265625 -1.40625 -0.3125l-2.4375 -0.078125q-0.3125 0.203125 -0.515625 0.390625q-0.1875 0.203125 -0.296875 0.40625q-0.109375 0.203125 -0.15625 0.390625q-0.046875 0.203125 -0.046875 0.40625zm0.484375 -7.609375q0 0.4375 0.140625 0.8125q0.15625 0.375 0.421875 0.640625q0.28125 0.25 0.640625 0.390625q0.359375 0.140625 0.8125 0.140625q0.484375 0 0.859375 -0.15625q0.375 -0.171875 0.625 -0.4375q0.265625 -0.28125 0.390625 -0.640625q0.140625 -0.359375 0.140625 -0.75q0 -0.453125 -0.15625 -0.8125q-0.140625 -0.375 -0.421875 -0.640625q-0.265625 -0.265625 -0.640625 -0.40625q-0.359375 -0.140625 -0.796875 -0.140625q-0.484375 0 -0.859375 0.171875q-0.375 0.15625 -0.640625 0.4375q-0.25 0.265625 -0.390625 0.640625q-0.125 0.359375 -0.125 0.75zm18.452087 1.796875q0 -1.1875 0.3125 -2.109375q0.328125 -0.921875 0.921875 -1.546875q0.609375 -0.640625 1.4375 -0.96875q0.84375 -0.328125 1.875 -0.328125q0.453125 0 0.875 0.0625q0.4375 0.046875 0.859375 0.171875l0 -3.921875l1.625 0l0 13.109375l-1.453125 0l-0.0625 -1.765625q-0.671875 0.984375 -1.46875 1.46875q-0.78125 0.46875 -1.703125 0.46875q-0.796875 0 -1.40625 -0.328125q-0.59375 -0.34375 -1.0 -0.953125q-0.40625 -0.609375 -0.609375 -1.453125q-0.203125 -0.859375 -0.203125 -1.90625zm1.640625 -0.09375q0 1.6875 0.5 2.515625q0.5 0.828125 1.40625 0.828125q0.609375 0 1.296875 -0.546875q0.6875 -0.546875 1.4375 -1.625l0 -4.3125q-0.40625 -0.1875 -0.890625 -0.28125q-0.484375 -0.109375 -0.953125 -0.109375q-1.3125 0 -2.0625 0.859375q-0.734375 0.84375 -0.734375 2.671875zm16.96045 -0.59375q0 0.34375 -0.015625 0.578125q-0.015625 0.234375 -0.03125 0.4375l-6.53125 0q0 1.4375 0.796875 2.203125q0.796875 0.765625 2.296875 0.765625q0.40625 0 0.8125 -0.03125q0.40625 -0.046875 0.78125 -0.09375q0.390625 -0.0625 0.734375 -0.125q0.34375 -0.078125 0.640625 -0.15625l0 1.328125q-0.65625 0.1875 -1.484375 0.296875q-0.828125 0.125 -1.71875 0.125q-1.203125 0 -2.0625 -0.328125q-0.859375 -0.328125 -1.421875 -0.9375q-0.546875 -0.625 -0.8125 -1.515625q-0.265625 -0.890625 -0.265625 -2.03125q0 -0.984375 0.28125 -1.859375q0.296875 -0.875 0.828125 -1.53125q0.546875 -0.671875 1.328125 -1.0625q0.796875 -0.390625 1.796875 -0.390625q0.984375 0 1.734375 0.3125q0.75 0.296875 1.265625 0.859375q0.515625 0.5625 0.78125 1.375q0.265625 0.796875 0.265625 1.78125zm-1.6875 -0.21875q0.03125 -0.625 -0.125 -1.140625q-0.140625 -0.515625 -0.453125 -0.890625q-0.3125 -0.375 -0.78125 -0.578125q-0.453125 -0.203125 -1.078125 -0.203125q-0.515625 0 -0.953125 0.203125q-0.4375 0.203125 -0.765625 0.578125q-0.3125 0.359375 -0.5 0.890625q-0.1875 0.515625 -0.234375 1.140625l4.890625 0zm12.335388 -6.234375q-1.265625 -0.265625 -2.1875 -0.265625q-2.1875 0 -2.1875 2.28125l0 1.640625l4.09375 0l0 1.34375l-4.09375 0l0 6.609375l-1.640625 0l0 -6.609375l-2.984375 0l0 -1.34375l2.984375 0l0 -1.546875q0 -3.71875 3.875 -3.71875q0.96875 0 2.140625 0.21875l0 1.390625zm-9.75 2.296875l0 0zm17.726074 9.3125l-0.03125 -1.25q-0.765625 0.75 -1.546875 1.09375q-0.78125 0.328125 -1.65625 0.328125q-0.796875 0 -1.359375 -0.203125q-0.5625 -0.203125 -0.9375 -0.5625q-0.359375 -0.359375 -0.53125 -0.84375q-0.171875 -0.484375 -0.171875 -1.046875q0 -1.40625 1.046875 -2.1875q1.046875 -0.796875 3.078125 -0.796875l1.9375 0l0 -0.828125q0 -0.8125 -0.53125 -1.3125q-0.53125 -0.5 -1.609375 -0.5q-0.796875 0 -1.5625 0.1875q-0.765625 0.171875 -1.578125 0.484375l0 -1.453125q0.296875 -0.109375 0.671875 -0.21875q0.390625 -0.109375 0.796875 -0.1875q0.421875 -0.078125 0.875 -0.125q0.453125 -0.0625 0.921875 -0.0625q0.84375 0 1.515625 0.1875q0.6875 0.1875 1.15625 0.578125q0.46875 0.375 0.71875 0.953125q0.25 0.5625 0.25 1.34375l0 6.421875l-1.453125 0zm-0.171875 -4.234375l-2.0625 0q-0.59375 0 -1.03125 0.125q-0.4375 0.109375 -0.71875 0.34375q-0.28125 0.21875 -0.421875 0.53125q-0.125 0.296875 -0.125 0.6875q0 0.28125 0.078125 0.53125q0.09375 0.234375 0.28125 0.421875q0.1875 0.1875 0.484375 0.3125q0.296875 0.109375 0.71875 0.109375q0.5625 0 1.28125 -0.34375q0.71875 -0.34375 1.515625 -1.078125l0 -1.640625zm11.929138 4.234375l-1.4375 0l-0.0625 -1.5q-0.421875 0.484375 -0.796875 0.8125q-0.375 0.3125 -0.75 0.515625q-0.359375 0.1875 -0.734375 0.265625q-0.375 0.078125 -0.796875 0.078125q-1.4375 0 -2.171875 -0.84375q-0.734375 -0.84375 -0.734375 -2.5625l0 -6.078125l1.609375 0l0 5.953125q0 2.140625 1.625 2.140625q0.296875 0 0.578125 -0.078125q0.28125 -0.09375 0.59375 -0.3125q0.3125 -0.21875 0.65625 -0.578125q0.359375 -0.375 0.8125 -0.953125l0 -6.171875l1.609375 0l0 9.3125zm5.944824 -11.78125l-2.75 0l0 -1.328125l4.390625 0l0 11.765625l2.765625 0l0 1.34375l-7.46875 0l0 -1.34375l3.0625 0l0 -10.4375zm14.585388 11.65625q-0.546875 0.140625 -1.125 0.1875q-0.578125 0.0625 -1.1875 0.0625q-1.75 0 -2.625 -0.78125q-0.859375 -0.796875 -0.859375 -2.4375l0 -4.859375l-2.609375 0l0 -1.359375l2.609375 0l0 -2.5625l1.625 -0.421875l0 2.984375l4.171875 0l0 1.359375l-4.171875 0l0 4.71875q0 1.0 0.53125 1.5q0.53125 0.5 1.5625 0.5q0.453125 0 0.984375 -0.0625q0.53125 -0.078125 1.09375 -0.21875l0 1.390625zm6.429199 -2.796875q0.3125 0 0.59375 0.125q0.28125 0.109375 0.484375 0.328125q0.21875 0.21875 0.328125 0.5q0.125 0.28125 0.125 0.609375q0 0.3125 -0.125 0.59375q-0.109375 0.28125 -0.328125 0.484375q-0.203125 0.203125 -0.484375 0.328125q-0.28125 0.125 -0.59375 0.125q-0.328125 0 -0.609375 -0.125q-0.28125 -0.125 -0.5 -0.328125q-0.203125 -0.203125 -0.328125 -0.484375q-0.109375 -0.28125 -0.109375 -0.59375q0 -0.328125 0.109375 -0.609375q0.125 -0.28125 0.328125 -0.5q0.21875 -0.21875 0.5 -0.328125q0.28125 -0.125 0.609375 -0.125zm14.085388 2.796875q-0.546875 0.140625 -1.125 0.1875q-0.578125 0.0625 -1.1875 0.0625q-1.75 0 -2.625 -0.78125q-0.859375 -0.796875 -0.859375 -2.4375l0 -4.859375l-2.609375 0l0 -1.359375l2.609375 0l0 -2.5625l1.625 -0.421875l0 2.984375l4.171875 0l0 1.359375l-4.171875 0l0 4.71875q0 1.0 0.53125 1.5q0.53125 0.5 1.5625 0.5q0.453125 0 0.984375 -0.0625q0.53125 -0.078125 1.09375 -0.21875l0 1.390625zm8.741699 0.125l-0.03125 -1.25q-0.765625 0.75 -1.546875 1.09375q-0.78125 0.328125 -1.65625 0.328125q-0.796875 0 -1.359375 -0.203125q-0.5625 -0.203125 -0.9375 -0.5625q-0.359375 -0.359375 -0.53125 -0.84375q-0.171875 -0.484375 -0.171875 -1.046875q0 -1.40625 1.046875 -2.1875q1.046875 -0.796875 3.078125 -0.796875l1.9375 0l0 -0.828125q0 -0.8125 -0.53125 -1.3125q-0.53125 -0.5 -1.609375 -0.5q-0.796875 0 -1.5625 0.1875q-0.765625 0.171875 -1.578125 0.484375l0 -1.453125q0.296875 -0.109375 0.671875 -0.21875q0.390625 -0.109375 0.796875 -0.1875q0.421875 -0.078125 0.875 -0.125q0.453125 -0.0625 0.921875 -0.0625q0.84375 0 1.515625 0.1875q0.6875 0.1875 1.15625 0.578125q0.46875 0.375 0.71875 0.953125q0.25 0.5625 0.25 1.34375l0 6.421875l-1.453125 0zm-0.171875 -4.234375l-2.0625 0q-0.59375 0 -1.03125 0.125q-0.4375 0.109375 -0.71875 0.34375q-0.28125 0.21875 -0.421875 0.53125q-0.125 0.296875 -0.125 0.6875q0 0.28125 0.078125 0.53125q0.09375 0.234375 0.28125 0.421875q0.1875 0.1875 0.484375 0.3125q0.296875 0.109375 0.71875 0.109375q0.5625 0 1.28125 -0.34375q0.71875 -0.34375 1.515625 -1.078125l0 -1.640625zm4.819763 -5.078125l1.484375 0l0.046875 1.71875q0.828125 -1.0 1.625 -1.4375q0.796875 -0.453125 1.625 -0.453125q1.4375 0 2.1875 0.9375q0.75 0.9375 0.6875 2.78125l-1.625 0q0.015625 -1.21875 -0.375 -1.765625q-0.375 -0.5625 -1.109375 -0.5625q-0.328125 0 -0.65625 0.125q-0.328125 0.109375 -0.6875 0.375q-0.34375 0.25 -0.734375 0.65625q-0.390625 0.390625 -0.828125 0.953125l0 5.984375l-1.640625 0l0 -9.3125zm16.58545 1.3125q0.265625 0.328125 0.40625 0.765625q0.140625 0.421875 0.140625 0.921875q0 0.734375 -0.265625 1.328125q-0.265625 0.59375 -0.75 1.03125q-0.46875 0.421875 -1.140625 0.65625q-0.671875 0.234375 -1.484375 0.234375q-0.578125 0 -1.09375 -0.125q-0.515625 -0.125 -0.8125 -0.3125q-0.171875 0.265625 -0.296875 0.5q-0.109375 0.21875 -0.109375 0.515625q0 0.34375 0.328125 0.578125q0.34375 0.234375 0.90625 0.25l2.4375 0.09375q0.703125 0.015625 1.28125 0.1875q0.59375 0.15625 1.015625 0.453125q0.421875 0.296875 0.65625 0.734375q0.25 0.421875 0.25 1.0q0 0.625 -0.28125 1.171875q-0.265625 0.5625 -0.828125 0.984375q-0.5625 0.421875 -1.421875 0.671875q-0.859375 0.25 -2.046875 0.25q-1.140625 0 -1.9375 -0.1875q-0.78125 -0.171875 -1.296875 -0.5q-0.5 -0.3125 -0.734375 -0.75q-0.234375 -0.4375 -0.234375 -0.96875q0 -0.671875 0.3125 -1.1875q0.3125 -0.515625 0.96875 -0.984375q-0.234375 -0.109375 -0.421875 -0.265625q-0.171875 -0.171875 -0.28125 -0.375q-0.109375 -0.203125 -0.171875 -0.421875q-0.046875 -0.21875 -0.046875 -0.4375q0 -0.609375 0.28125 -1.109375q0.28125 -0.5 0.671875 -0.9375q-0.171875 -0.21875 -0.3125 -0.421875q-0.125 -0.203125 -0.234375 -0.4375q-0.09375 -0.234375 -0.140625 -0.5q-0.046875 -0.28125 -0.046875 -0.640625q0 -0.71875 0.25 -1.3125q0.265625 -0.609375 0.75 -1.03125q0.484375 -0.4375 1.15625 -0.671875q0.671875 -0.234375 1.484375 -0.234375q0.34375 0 0.65625 0.046875q0.3125 0.046875 0.5625 0.125l3.375 0l0 1.3125l-1.5 0zm-5.59375 9.34375q0 0.65625 0.6875 0.953125q0.6875 0.3125 1.90625 0.3125q0.765625 0 1.28125 -0.140625q0.53125 -0.140625 0.84375 -0.375q0.328125 -0.21875 0.46875 -0.515625q0.140625 -0.28125 0.140625 -0.59375q0 -0.5625 -0.46875 -0.84375q-0.453125 -0.265625 -1.40625 -0.3125l-2.4375 -0.078125q-0.3125 0.203125 -0.515625 0.390625q-0.1875 0.203125 -0.296875 0.40625q-0.109375 0.203125 -0.15625 0.390625q-0.046875 0.203125 -0.046875 0.40625zm0.484375 -7.609375q0 0.4375 0.140625 0.8125q0.15625 0.375 0.421875 0.640625q0.28125 0.25 0.640625 0.390625q0.359375 0.140625 0.8125 0.140625q0.484375 0 0.859375 -0.15625q0.375 -0.171875 0.625 -0.4375q0.265625 -0.28125 0.390625 -0.640625q0.140625 -0.359375 0.140625 -0.75q0 -0.453125 -0.15625 -0.8125q-0.140625 -0.375 -0.421875 -0.640625q-0.265625 -0.265625 -0.640625 -0.40625q-0.359375 -0.140625 -0.796875 -0.140625q-0.484375 0 -0.859375 0.171875q-0.375 0.15625 -0.640625 0.4375q-0.25 0.265625 -0.390625 0.640625q-0.125 0.359375 -0.125 0.75zm16.538513 1.109375q0 0.34375 -0.015625 0.578125q-0.015625 0.234375 -0.03125 0.4375l-6.53125 0q0 1.4375 0.796875 2.203125q0.796875 0.765625 2.296875 0.765625q0.40625 0 0.8125 -0.03125q0.40625 -0.046875 0.78125 -0.09375q0.390625 -0.0625 0.734375 -0.125q0.34375 -0.078125 0.640625 -0.15625l0 1.328125q-0.65625 0.1875 -1.484375 0.296875q-0.828125 0.125 -1.71875 0.125q-1.203125 0 -2.0625 -0.328125q-0.859375 -0.328125 -1.421875 -0.9375q-0.546875 -0.625 -0.8125 -1.515625q-0.265625 -0.890625 -0.265625 -2.03125q0 -0.984375 0.28125 -1.859375q0.296875 -0.875 0.828125 -1.53125q0.546875 -0.671875 1.328125 -1.0625q0.796875 -0.390625 1.796875 -0.390625q0.984375 0 1.734375 0.3125q0.75 0.296875 1.265625 0.859375q0.515625 0.5625 0.78125 1.375q0.265625 0.796875 0.265625 1.78125zm-1.6875 -0.21875q0.03125 -0.625 -0.125 -1.140625q-0.140625 -0.515625 -0.453125 -0.890625q-0.3125 -0.375 -0.78125 -0.578125q-0.453125 -0.203125 -1.078125 -0.203125q-0.515625 0 -0.953125 0.203125q-0.4375 0.203125 -0.765625 0.578125q-0.3125 0.359375 -0.5 0.890625q-0.1875 0.515625 -0.234375 1.140625l4.890625 0zm11.569824 5.25q-0.546875 0.140625 -1.125 0.1875q-0.578125 0.0625 -1.1875 0.0625q-1.75 0 -2.625 -0.78125q-0.859375 -0.796875 -0.859375 -2.4375l0 -4.859375l-2.609375 0l0 -1.359375l2.609375 0l0 -2.5625l1.625 -0.421875l0 2.984375l4.171875 0l0 1.359375l-4.171875 0l0 4.71875q0 1.0 0.53125 1.5q0.53125 0.5 1.5625 0.5q0.453125 0 0.984375 -0.0625q0.53125 -0.078125 1.09375 -0.21875l0 1.390625zm4.663513 -13.6875q4.265625 3.953125 4.265625 8.8125q0 1.0 -0.203125 2.078125q-0.203125 1.078125 -0.703125 2.203125q-0.484375 1.125 -1.3125 2.28125q-0.828125 1.171875 -2.09375 2.328125l-0.9375 -0.953125q1.8125 -1.78125 2.703125 -3.734375q0.890625 -1.953125 0.890625 -4.078125q0 -4.421875 -3.59375 -7.953125l0.984375 -0.984375z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m598.5617 283.8924l364.28345 0l0 42.48819l-364.28345 0z" fill-rule="evenodd"></path><path fill="#93c47d" d="m616.4211 308.2655q0 0.5 -0.171875 0.890625q-0.15625 0.390625 -0.453125 0.6875q-0.28125 0.296875 -0.671875 0.515625q-0.375 0.21875 -0.8125 0.359375q-0.421875 0.125 -0.875 0.1875q-0.453125 0.078125 -0.890625 0.078125q-0.953125 0 -1.75 -0.09375q-0.78125 -0.078125 -1.546875 -0.265625l0 -1.484375q0.8125 0.234375 1.625 0.359375q0.8125 0.109375 1.609375 0.109375q1.15625 0 1.703125 -0.3125q0.5625 -0.3125 0.5625 -0.890625q0 -0.25 -0.09375 -0.453125q-0.078125 -0.203125 -0.3125 -0.375q-0.234375 -0.1875 -0.71875 -0.375q-0.484375 -0.203125 -1.328125 -0.453125q-0.640625 -0.1875 -1.171875 -0.421875q-0.53125 -0.234375 -0.921875 -0.5625q-0.390625 -0.328125 -0.609375 -0.765625q-0.21875 -0.4375 -0.21875 -1.03125q0 -0.390625 0.171875 -0.84375q0.1875 -0.46875 0.625 -0.859375q0.4375 -0.40625 1.171875 -0.671875q0.75 -0.265625 1.859375 -0.265625q0.546875 0 1.21875 0.0625q0.671875 0.0625 1.390625 0.203125l0 1.4375q-0.765625 -0.171875 -1.453125 -0.265625q-0.671875 -0.09375 -1.171875 -0.09375q-0.609375 0 -1.03125 0.09375q-0.40625 0.09375 -0.65625 0.265625q-0.25 0.15625 -0.375 0.375q-0.109375 0.21875 -0.109375 0.46875q0 0.25 0.09375 0.453125q0.109375 0.203125 0.375 0.390625q0.265625 0.1875 0.734375 0.390625q0.46875 0.1875 1.234375 0.40625q0.828125 0.234375 1.390625 0.5q0.5625 0.265625 0.90625 0.59375q0.359375 0.328125 0.515625 0.734375q0.15625 0.40625 0.15625 0.921875zm2.4135132 -1.921875q0 -1.1875 0.3125 -2.109375q0.328125 -0.921875 0.921875 -1.546875q0.609375 -0.640625 1.4375 -0.96875q0.84375 -0.328125 1.875 -0.328125q0.453125 0 0.875 0.0625q0.4375 0.046875 0.859375 0.171875l0 -3.921875l1.625 0l0 13.109375l-1.453125 0l-0.0625 -1.765625q-0.671875 0.984375 -1.46875 1.46875q-0.78125 0.46875 -1.703125 0.46875q-0.796875 0 -1.40625 -0.328125q-0.59375 -0.34375 -1.0 -0.953125q-0.40625 -0.609375 -0.609375 -1.453125q-0.203125 -0.859375 -0.203125 -1.90625zm1.640625 -0.09375q0 1.6875 0.5 2.515625q0.5 0.828125 1.40625 0.828125q0.609375 0 1.296875 -0.546875q0.6875 -0.546875 1.4375 -1.625l0 -4.3125q-0.40625 -0.1875 -0.890625 -0.28125q-0.484375 -0.109375 -0.953125 -0.109375q-1.3125 0 -2.0625 0.859375q-0.734375 0.84375 -0.734375 2.671875zm18.0542 8.359375l-10.453125 0l0 -1.328125l10.453125 0l0 1.328125zm1.2885132 -13.109375l1.4375 0l0.0625 1.5q0.40625 -0.484375 0.78125 -0.796875q0.390625 -0.328125 0.75 -0.515625q0.375 -0.203125 0.75 -0.28125q0.390625 -0.078125 0.796875 -0.078125q1.4375 0 2.171875 0.859375q0.734375 0.84375 0.734375 2.546875l0 6.078125l-1.609375 0l0 -5.953125q0 -1.09375 -0.40625 -1.609375q-0.40625 -0.53125 -1.21875 -0.53125q-0.296875 0 -0.578125 0.09375q-0.28125 0.09375 -0.59375 0.3125q-0.296875 0.203125 -0.65625 0.578125q-0.359375 0.375 -0.8125 0.9375l0 6.171875l-1.609375 0l0 -9.3125zm18.3667 4.578125q0 1.09375 -0.3125 2.0q-0.296875 0.890625 -0.875 1.546875q-0.578125 0.640625 -1.40625 1.0q-0.828125 0.359375 -1.875 0.359375q-1.0 0 -1.796875 -0.3125q-0.78125 -0.3125 -1.34375 -0.90625q-0.546875 -0.609375 -0.84375 -1.5q-0.28125 -0.890625 -0.28125 -2.0625q0 -1.078125 0.296875 -1.96875q0.3125 -0.90625 0.875 -1.546875q0.578125 -0.640625 1.40625 -1.0q0.828125 -0.359375 1.875 -0.359375q1.0 0 1.796875 0.3125q0.796875 0.3125 1.34375 0.921875q0.5625 0.59375 0.84375 1.484375q0.296875 0.890625 0.296875 2.03125zm-1.65625 0.078125q0 -0.859375 -0.1875 -1.5q-0.1875 -0.65625 -0.546875 -1.078125q-0.34375 -0.4375 -0.859375 -0.65625q-0.5 -0.21875 -1.125 -0.21875q-0.71875 0 -1.234375 0.28125q-0.515625 0.28125 -0.84375 0.765625q-0.328125 0.46875 -0.484375 1.09375q-0.15625 0.625 -0.15625 1.3125q0 0.859375 0.1875 1.515625q0.203125 0.640625 0.546875 1.078125q0.359375 0.421875 0.859375 0.640625q0.5 0.21875 1.125 0.21875q0.734375 0 1.25 -0.28125q0.515625 -0.28125 0.84375 -0.75q0.328125 -0.46875 0.46875 -1.09375q0.15625 -0.640625 0.15625 -1.328125zm11.304138 4.53125q-0.546875 0.140625 -1.125 0.1875q-0.578125 0.0625 -1.1875 0.0625q-1.75 0 -2.625 -0.78125q-0.859375 -0.796875 -0.859375 -2.4375l0 -4.859375l-2.609375 0l0 -1.359375l2.609375 0l0 -2.5625l1.625 -0.421875l0 2.984375l4.171875 0l0 1.359375l-4.171875 0l0 4.71875q0 1.0 0.53125 1.5q0.53125 0.5 1.5625 0.5q0.453125 0 0.984375 -0.0625q0.53125 -0.078125 1.09375 -0.21875l0 1.390625zm5.929199 -7.859375l-2.75 0l0 -1.328125l4.390625 0l0 7.96875l2.765625 0l0 1.34375l-7.46875 0l0 -1.34375l3.0625 0l0 -6.640625zm0.5625 -5.234375q0.28125 0 0.5 0.09375q0.234375 0.09375 0.40625 0.28125q0.171875 0.171875 0.265625 0.40625q0.109375 0.21875 0.109375 0.484375q0 0.265625 -0.109375 0.5q-0.09375 0.234375 -0.265625 0.40625q-0.171875 0.171875 -0.40625 0.28125q-0.21875 0.09375 -0.5 0.09375q-0.265625 0 -0.5 -0.09375q-0.234375 -0.109375 -0.40625 -0.28125q-0.171875 -0.171875 -0.265625 -0.40625q-0.09375 -0.234375 -0.09375 -0.5q0 -0.265625 0.09375 -0.484375q0.09375 -0.234375 0.265625 -0.40625q0.171875 -0.1875 0.40625 -0.28125q0.234375 -0.09375 0.5 -0.09375zm14.788513 1.609375q-1.265625 -0.265625 -2.1875 -0.265625q-2.1875 0 -2.1875 2.28125l0 1.640625l4.09375 0l0 1.34375l-4.09375 0l0 6.609375l-1.640625 0l0 -6.609375l-2.984375 0l0 -1.34375l2.984375 0l0 -1.546875q0 -3.71875 3.875 -3.71875q0.96875 0 2.140625 0.21875l0 1.390625zm-9.75 2.296875l0 0zm20.02295 0l-3.171875 8.328125q-0.484375 1.265625 -1.015625 2.1875q-0.515625 0.921875 -1.140625 1.5q-0.625 0.59375 -1.375 0.875q-0.734375 0.28125 -1.65625 0.28125q-0.234375 0 -0.4375 -0.015625q-0.1875 0 -0.421875 -0.015625l0 -1.46875q0.203125 0.03125 0.4375 0.046875q0.25 0.03125 0.515625 0.03125q0.453125 0 0.828125 -0.140625q0.390625 -0.125 0.734375 -0.421875q0.34375 -0.28125 0.65625 -0.75q0.3125 -0.46875 0.609375 -1.125l-3.71875 -9.3125l1.84375 0l2.359375 6.15625l0.46875 1.453125l0.53125 -1.484375l2.1875 -6.125l1.765625 0z" fill-rule="nonzero"></path></g></svg>
+
diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index 1f793afae6..14a1247a0f 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -79,7 +79,17 @@ If the output contains `-XZ`, journal entries will not be available.
 
 ### Notifications
 
+Sometimes, defining dependencies between containers makes sense.
+An example use case of this is a container running a server, and another container running a client.
+We want the server to start before the client tries to connect.
+
+![sd_notify-background](sd_notify-background.svg)
+
+This can be accomplished by using systemd services and dependencies.
+However, for this to work in rkt containers, we need special support.
+
 systemd inside stage1 can notify systemd on the host that it is ready, to make sure that stage1 systemd send the notification at the right time you can use the [sd_notify][sd_notify] mechanism.
+
 To make use of this feature, you need to set the annotation `appc.io/executor/supports-systemd-notify` to true in the image manifest whenever the app supports sd\_notify (see example manifest below).
 If you build your image with [`acbuild`][acbuild] you can use the command: `acbuild annotation add appc.io/executor/supports-systemd-notify true`.
 
@@ -109,8 +119,16 @@ To verify how it works, run in a terminal the command: `sudo systemd-run --unit=
 If the pod uses a stage1 image with systemd v231 (or greater), then the pod will be seen active form the host when systemd inside stage1 will reach default target.
 Instead, before it was marked as active as soon as it started.
 In this way it is possible to easily set up dependencies between pods and host services.
+
 Moreover, using [`SdNotify()`][sdnotify-go] in the application it is possible to make the pod marked as ready when all the apps or a particular one is ready.
 For more information check [systemd services unit][systemd-unit] documentation.
+
+This is how the sd_notify signal is propagated to the host system:
+
+![sd_notify-propagation](sd_notify-propagation.svg)
+
+#### Using the systemd notification mechanism in an app
+
 Below there is a simple example of an app using the systemd notification mechanism via [go-systemd][go-systemd] binding library.
 
 ```go

From b90939f9549bab3151766be504f36581ebf785d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 10 Nov 2017 11:33:21 +0100
Subject: [PATCH 1227/1304] Documentation: add rkt-systemd interaction diagram

Diagram source:

https://docs.google.com/drawings/d/1ipw0G0N6_jFpscyl7AWsGtCVE3EGOkPxOomVg0oO7qs
---
 Documentation/rkt-systemd-interaction.svg | 4 ++++
 Documentation/using-rkt-with-systemd.md   | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 Documentation/rkt-systemd-interaction.svg

diff --git a/Documentation/rkt-systemd-interaction.svg b/Documentation/rkt-systemd-interaction.svg
new file mode 100644
index 0000000000..b96d09b91f
--- /dev/null
+++ b/Documentation/rkt-systemd-interaction.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="yes"?>
+
+<svg version="1.1" viewBox="0.0 0.0 991.7769028871392 681.9081364829397" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="p.0"><path d="m0 0l991.7769 0l0 681.90814l-991.7769 0l0 -681.90814z" clip-rule="nonzero"></path></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l991.7769 0l0 681.90814l-991.7769 0z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m125.57743 96.20473l432.37796 0l0 73.16536l-432.37796 0z" fill-rule="evenodd"></path><path fill="#000000" d="m138.4993 123.99535l3.109375 0l0.09375 3.609375q1.75 -2.09375 3.4375 -3.03125q1.6875 -0.9375 3.40625 -0.9375q3.046875 0 4.609375 1.984375q1.578125 1.96875 1.46875 5.8593674l-3.4375 0q0.046875 -2.578125 -0.765625 -3.7343674q-0.796875 -1.171875 -2.359375 -1.171875q-0.6875 0 -1.390625 0.25q-0.6875 0.234375 -1.421875 0.78125q-0.734375 0.5312424 -1.5625 1.3749924q-0.8125 0.828125 -1.75 2.03125l0 12.59375l-3.4375 0l0 -19.609367zm38.835938 19.609367l-4.671875 0l-9.140625 -10.515625l0 10.515625l-3.390625 0l0 -27.593742l3.390625 0l0 16.953117l8.8125 -8.968742l4.484375 0l-9.1875 9.046867l9.703125 10.5625zm20.148438 -0.28125q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234367l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.968742q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m352.00262 252.45274l337.63782 0l0 73.16536l-337.63782 0z" fill-rule="evenodd"></path><path fill="#000000" d="m362.237 293.66525l3.46875 -0.546875q0.296875 2.078125 1.625 3.203125q1.34375 1.109375 3.75 1.109375q2.421875 0 3.59375 -0.984375q1.171875 -0.984375 1.171875 -2.3125q0 -1.203125 -1.03125 -1.875q-0.71875 -0.46875 -3.59375 -1.203125q-3.875 -0.96875 -5.375 -1.671875q-1.484375 -0.71875 -2.265625 -1.984375q-0.765625 -1.265625 -0.765625 -2.78125q0 -1.390625 0.640625 -2.5625q0.640625 -1.1875 1.734375 -1.96875q0.8125 -0.609375 2.21875 -1.03125q1.421875 -0.421875 3.046875 -0.421875q2.4375 0 4.28125 0.703125q1.859375 0.703125 2.734375 1.90625q0.875 1.203125 1.203125 3.21875l-3.4375 0.46875q-0.234375 -1.609375 -1.359375 -2.5q-1.109375 -0.90625 -3.171875 -0.90625q-2.421875 0 -3.453125 0.8125q-1.03125 0.796875 -1.03125 1.875q0 0.671875 0.421875 1.21875q0.4375 0.578125 1.359375 0.9375q0.515625 0.203125 3.09375 0.90625q3.734375 1.0 5.203125 1.640625q1.484375 0.625 2.3125 1.84375q0.84375 1.203125 0.84375 3.0q0 1.75 -1.03125 3.3125q-1.015625 1.546875 -2.953125 2.40625q-1.921875 0.84375 -4.375 0.84375q-4.03125 0 -6.15625 -1.671875q-2.125 -1.6875 -2.703125 -4.984375zm21.25 14.171875l-0.390625 -3.296875q1.15625 0.3125 2.015625 0.3125q1.171875 0 1.875 -0.390625q0.703125 -0.390625 1.140625 -1.09375q0.34375 -0.53125 1.078125 -2.609375q0.09375 -0.296875 0.3125 -0.859375l-7.875 -20.796875l3.796875 0l4.3125 12.015625q0.84375 2.28125 1.5 4.8125q0.609375 -2.421875 1.453125 -4.734375l4.4375 -12.09375l3.515625 0l-7.890625 21.109375q-1.28125 3.40625 -1.984375 4.703125q-0.9375 1.734375 -2.15625 2.546875q-1.203125 0.8125 -2.875 0.8125q-1.015625 0 -2.265625 -0.4375zm18.75 -14.171875l3.46875 -0.546875q0.296875 2.078125 1.625 3.203125q1.34375 1.109375 3.75 1.109375q2.421875 0 3.59375 -0.984375q1.171875 -0.984375 1.171875 -2.3125q0 -1.203125 -1.03125 -1.875q-0.71875 -0.46875 -3.59375 -1.203125q-3.875 -0.96875 -5.375 -1.671875q-1.484375 -0.71875 -2.265625 -1.984375q-0.765625 -1.265625 -0.765625 -2.78125q0 -1.390625 0.640625 -2.5625q0.640625 -1.1875 1.734375 -1.96875q0.8125 -0.609375 2.21875 -1.03125q1.421875 -0.421875 3.046875 -0.421875q2.4375 0 4.28125 0.703125q1.859375 0.703125 2.734375 1.90625q0.875 1.203125 1.203125 3.21875l-3.4375 0.46875q-0.234375 -1.609375 -1.359375 -2.5q-1.109375 -0.90625 -3.171875 -0.90625q-2.421875 0 -3.453125 0.8125q-1.03125 0.796875 -1.03125 1.875q0 0.671875 0.421875 1.21875q0.4375 0.578125 1.359375 0.9375q0.515625 0.203125 3.09375 0.90625q3.734375 1.0 5.203125 1.640625q1.484375 0.625 2.3125 1.84375q0.84375 1.203125 0.84375 3.0q0 1.75 -1.03125 3.3125q-1.015625 1.546875 -2.953125 2.40625q-1.921875 0.84375 -4.375 0.84375q-4.03125 0 -6.15625 -1.671875q-2.125 -1.6875 -2.703125 -4.984375zm29.078125 3.046875l0.515625 3.09375q-1.484375 0.328125 -2.65625 0.328125q-1.921875 0 -2.984375 -0.609375q-1.046875 -0.609375 -1.484375 -1.59375q-0.421875 -0.984375 -0.421875 -4.15625l0 -11.9375l-2.578125 0l0 -2.734375l2.578125 0l0 -5.125l3.5 -2.109375l0 7.234375l3.53125 0l0 2.734375l-3.53125 0l0 12.140625q0 1.5 0.1875 1.9375q0.1875 0.421875 0.59375 0.671875q0.421875 0.25 1.203125 0.25q0.59375 0 1.546875 -0.125zm17.644531 -3.546875l3.625 0.453125q-0.859375 3.1875 -3.1875 4.953125q-2.3125 1.75 -5.9375 1.75q-4.546875 0 -7.21875 -2.796875q-2.65625 -2.8125 -2.65625 -7.875q0 -5.234375 2.6875 -8.125q2.703125 -2.890625 7.0 -2.890625q4.15625 0 6.796875 2.84375q2.640625 2.828125 2.640625 7.96875q0 0.3125 -0.03125 0.9375l-15.46875 0q0.203125 3.40625 1.9375 5.234375q1.734375 1.8125 4.34375 1.8125q1.921875 0 3.28125 -1.015625q1.375 -1.015625 2.1875 -3.25zm-11.546875 -5.671875l11.578125 0q-0.234375 -2.625 -1.328125 -3.9375q-1.671875 -2.03125 -4.359375 -2.03125q-2.421875 0 -4.078125 1.625q-1.640625 1.625 -1.8125 4.34375zm19.589844 12.359375l0 -20.75l3.140625 0l0 2.921875q0.984375 -1.53125 2.59375 -2.453125q1.625 -0.9375 3.703125 -0.9375q2.296875 0 3.765625 0.96875q1.484375 0.953125 2.09375 2.671875q2.453125 -3.640625 6.40625 -3.640625q3.078125 0 4.734375 1.71875q1.671875 1.703125 1.671875 5.265625l0 14.234375l-3.5 0l0 -13.0625q0 -2.109375 -0.34375 -3.03125q-0.34375 -0.9375 -1.25 -1.5q-0.890625 -0.578125 -2.09375 -0.578125q-2.1875 0 -3.640625 1.46875q-1.4375 1.453125 -1.4375 4.65625l0 12.046875l-3.515625 0l0 -13.484375q0 -2.34375 -0.859375 -3.515625q-0.859375 -1.171875 -2.8125 -1.171875q-1.484375 0 -2.75 0.78125q-1.265625 0.78125 -1.828125 2.296875q-0.5625 1.5 -0.5625 4.328125l0 10.765625l-3.515625 0zm46.773438 0l0 -2.625q-1.96875 3.09375 -5.796875 3.09375q-2.484375 0 -4.5625 -1.359375q-2.078125 -1.375 -3.21875 -3.828125q-1.140625 -2.453125 -1.140625 -5.640625q0 -3.09375 1.03125 -5.625q1.03125 -2.53125 3.09375 -3.875q2.078125 -1.359375 4.640625 -1.359375q1.875 0 3.328125 0.796875q1.46875 0.796875 2.390625 2.0625l0 -10.28125l3.5 0l0 28.640625l-3.265625 0zm-11.109375 -10.359375q0 3.984375 1.671875 5.96875q1.6875 1.96875 3.96875 1.96875q2.3125 0 3.921875 -1.875q1.609375 -1.890625 1.609375 -5.765625q0 -4.25 -1.640625 -6.234375q-1.640625 -2.0 -4.046875 -2.0q-2.34375 0 -3.921875 1.921875q-1.5625 1.90625 -1.5625 6.015625z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m49.209972 86.879265l0 49.98162l64.10538 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m49.209972 86.879265l0 49.98162l40.10538 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m89.31535 143.46782l18.15239 -6.6069336l-18.15239 -6.6069183z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m155.39108 161.37009l0 49.98163l64.10536 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m155.39108 161.37007l0 49.98163l40.105377 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m195.49646 217.95863l18.15239 -6.6069336l-18.15239 -6.6069183z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m384.43832 318.48425l0 49.98163l64.10538 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m384.43832 318.48425l0 49.98163l40.105347 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m424.54367 375.0728l18.152405 -6.6069336l-18.152405 -6.6069336z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m19.175854 21.632545l525.2598 0l0 89.32284l-525.2598 0z" fill-rule="evenodd"></path><path fill="#000000" d="m46.832104 63.67317q0 1.0468788 -0.359375 1.8750038q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.9062538q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm23.898434 -14.25l-6.671875 17.531254q-1.0312462 2.6875 -2.1406212 4.609375q-1.109375 1.9375 -2.421875 3.171875q-1.296875 1.25 -2.859375 1.828125q-1.5625 0.59375 -3.5 0.59375q-0.5 0 -0.921875 -0.015625q-0.40625 -0.015625 -0.890625 -0.0625l0 -3.078125q0.421875 0.046875 0.921875 0.09375q0.515625 0.0625 1.09375 0.0625q0.9375 0 1.734375 -0.28125q0.8125 -0.265625 1.53125 -0.890625q0.734375 -0.609375 1.390625 -1.59375q0.671875 -0.96875 1.296875 -2.359375l-7.828125 -19.609379l3.859375 0l4.96875 12.96875l0.984375 3.0468788l1.140625 -3.1250038l4.593746 -12.890625l3.71875 0zm20.085938 14.25q0 1.0468788 -0.359375 1.8750038q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.9062538q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm22.257812 5.078129q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140629l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.1093788 1.109375 3.1562538q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm22.75782 -10.562504q0 0.71875 -0.015625 1.21875q-0.015625 0.484375 -0.0625 0.90625l-13.765633 0q0 3.015625 1.671875 4.625004q1.6875 1.609375 4.8437576 1.609375q0.859375 0 1.71875 -0.0625q0.859375 -0.078125 1.65625 -0.1875q0.8125 -0.125 1.546875 -0.265625q0.734375 -0.140625 1.359375 -0.328125l0 2.796875q-1.390625 0.390625 -3.140625 0.640625q-1.75 0.25 -3.625 0.25q-2.5156326 0 -4.3437576 -0.6875q-1.8125 -0.6875 -2.96875 -1.984375q-1.15625 -1.296875 -1.71875 -3.1875038q-0.5625 -1.890625 -0.5625 -4.265625q0 -2.078125 0.59375 -3.921875q0.609375 -1.84375 1.75 -3.234375q1.140625 -1.40625 2.796875 -2.21875q1.65625 -0.828125 3.765625 -0.828125q2.0625076 0 3.6406326 0.65625q1.578125 0.640625 2.65625 1.828125q1.09375 1.171875 1.640625 2.859375q0.5625 1.6875 0.5625 3.78125zm-3.53125 -0.484375q0.0625 -1.3125 -0.25 -2.390625q-0.3125 -1.09375 -0.96875 -1.875q-0.65625 -0.78125 -1.640625 -1.21875q-0.96875 -0.4375 -2.2656326 -0.4375q-1.109375 0 -2.03125 0.4375q-0.90625 0.421875 -1.578125 1.203125q-0.65625 0.78125 -1.078125 1.875q-0.40625 1.09375 -0.5 2.40625l10.312508 0zm22.945312 11.328129l0 -14.078129q0 -0.921875 -0.078125 -1.5q-0.0625 -0.59375 -0.203125 -0.9375q-0.140625 -0.34375 -0.375 -0.46875q-0.21875 -0.140625 -0.546875 -0.140625q-0.390625 0 -0.734375 0.234375q-0.328125 0.234375 -0.71875 0.765625q-0.375 0.515625 -0.828125 1.390625q-0.453125 0.859375 -1.078125 2.140625l0 12.593754l-3.109375 0l0 -13.718754q0 -1.0625 -0.078125 -1.71875q-0.0625 -0.671875 -0.21875 -1.046875q-0.140625 -0.375 -0.375 -0.5q-0.234375 -0.140625 -0.5625 -0.140625q-0.34375 0 -0.65625 0.203125q-0.3125 0.1875 -0.703125 0.703125q-0.375 0.5 -0.84375 1.375q-0.46875 0.875 -1.109375 2.25l0 12.593754l-3.125 0l0 -19.609379l2.59375 0l0.15625 3.734375q0.5 -1.125 0.984375 -1.90625q0.484375 -0.78125 0.984375 -1.25q0.515625 -0.484375 1.078125 -0.703125q0.578125 -0.234375 1.28125 -0.234375q1.59375 0 2.40625 1.046875q0.828125 1.03125 0.828125 3.203125q0.46875 -1.015625 0.90625 -1.8125q0.453125 -0.796875 0.96875 -1.328125q0.515625 -0.53125 1.140625 -0.8125q0.625 -0.296875 1.453125 -0.296875q3.6875 0 3.6875 5.6875l0 14.281254l-3.125 0zm7.0078125 -9.390629q0 -2.5 0.6875 -4.4375q0.6875 -1.953125 1.9375 -3.28125q1.265625 -1.34375 3.03125 -2.03125q1.765625 -0.703125 3.9375 -0.703125q0.9375 0 1.84375 0.125q0.90625 0.109375 1.796875 0.359375l0 -8.234375l3.40625 0l0 27.593754l-3.046875 0l-0.109375 -3.71875q-1.421875 2.078125 -3.09375 3.078125q-1.65625 1.0 -3.59375 1.0q-1.671875 0 -2.953125 -0.703125q-1.28125 -0.71875 -2.140625 -1.984375q-0.84375 -1.28125 -1.28125 -3.0781288q-0.421875 -1.796875 -0.421875 -3.984375zm3.484375 -0.21875q0 3.546875 1.046875 5.296879q1.046875 1.75 2.953125 1.75q1.296875 0 2.71875 -1.140625q1.4375 -1.15625 3.03125 -3.4218788l0 -9.109375q-0.84375 -0.390625 -1.859375 -0.59375q-1.015625 -0.203125 -2.015625 -0.203125q-2.765625 0 -4.328125 1.796875q-1.546875 1.796875 -1.546875 5.625z" fill-rule="nonzero"></path><path fill="#000000" d="m233.58992 75.76692q-2.328125 -2.9375 -3.9375 -6.875q-1.609375 -3.9375 -1.609375 -8.156254q0 -3.71875 1.203125 -7.125q1.40625 -3.953125 4.34375 -7.875l2.015625 0q-1.890625 3.25 -2.5 4.640625q-0.953125 2.15625 -1.5 4.5q-0.671875 2.921875 -0.671875 5.875q0 7.515629 4.671875 15.015629l-2.015625 0zm5.28125 -6.734375l0 -22.906254l2.8125 0l0 8.21875q1.96875 -2.28125 4.96875 -2.28125q1.84375 0 3.203125 0.734375q1.359375 0.71875 1.9375 2.0q0.59375 1.28125 0.59375 3.71875l0 10.515629l-2.8125 0l0 -10.515629q0 -2.109375 -0.921875 -3.0625q-0.90625 -0.96875 -2.578125 -0.96875q-1.25 0 -2.359375 0.65625q-1.09375 0.640625 -1.5625 1.75q-0.46875 1.109375 -0.46875 3.0625l0 9.078129l-2.8125 0zm16.75 -8.296879q0 -4.609375 2.5624847 -6.828125q2.140625 -1.84375 5.21875 -1.84375q3.421875 0 5.59375 2.25q2.171875 2.234375 2.171875 6.1875q0 3.203125 -0.96875 5.046879q-0.953125 1.828125 -2.796875 2.84375q-1.828125 1.015625 -4.0 1.015625q-3.484375 0 -5.640625 -2.234375q-2.1406097 -2.234375 -2.1406097 -6.437504zm2.8906097 0q0 3.1875 1.390625 4.781254q1.390625 1.578125 3.5 1.578125q2.09375 0 3.484375 -1.59375q1.390625 -1.5937538 1.390625 -4.859379q0 -3.078125 -1.40625 -4.65625q-1.390625 -1.59375 -3.46875 -1.59375q-2.109375 0 -3.5 1.578125q-1.390625 1.578125 -1.390625 4.765625zm14.828125 3.3437538l2.78125 -0.4375038q0.234375 1.6718788 1.296875 2.5625038q1.078125 0.890625 3.0 0.890625q1.9375 0 2.875 -0.78125q0.9375 -0.796875 0.9375 -1.859375q0 -0.9531288 -0.828125 -1.5000038q-0.578125 -0.375 -2.875 -0.953125q-3.09375 -0.78125 -4.296875 -1.34375q-1.1875 -0.578125 -1.8125 -1.578125q-0.609375 -1.015625 -0.609375 -2.234375q0 -1.109375 0.5 -2.046875q0.515625 -0.953125 1.390625 -1.578125q0.65625 -0.484375 1.78125 -0.8125q1.140625 -0.34375 2.4375 -0.34375q1.953125 0 3.421875 0.5625q1.484375 0.5625 2.1875 1.53125q0.703125 0.953125 0.96875 2.5625l-2.75 0.375q-0.1875 -1.28125 -1.09375 -2.0q-0.890625 -0.71875 -2.53125 -0.71875q-1.9375 0 -2.765625 0.640625q-0.828125 0.640625 -0.828125 1.5q0 0.546875 0.34375 0.984375q0.34375 0.453125 1.078125 0.75q0.421875 0.15625 2.484375 0.71875q2.984375 0.796875 4.15625 1.3125q1.1875 0.5 1.859375 1.46875q0.671875 0.96875 0.671875 2.4062538q0 1.40625 -0.828125 2.65625q-0.8125 1.234375 -2.359375 1.921875q-1.546875 0.671875 -3.5 0.671875q-3.234375 0 -4.9375 -1.34375q-1.6875 -1.34375 -2.15625 -3.984375zm23.265625 2.4375l0.40625 2.484375q-1.1875 0.25 -2.125 0.25q-1.53125 0 -2.375 -0.484375q-0.84375 -0.484375 -1.1875 -1.265625q-0.34375 -0.796875 -0.34375 -3.328125l0 -9.546879l-2.0625 0l0 -2.1875l2.0625 0l0 -4.109375l2.796875 -1.6875l0 5.796875l2.828125 0l0 2.1875l-2.828125 0l0 9.703129q0 1.203125 0.140625 1.546875q0.15625 0.34375 0.484375 0.546875q0.34375 0.203125 0.96875 0.203125q0.46875 0 1.234375 -0.109375zm4.59375 9.25l-2.015625 0q4.671875 -7.5 4.671875 -15.015629q0 -2.9375 -0.671875 -5.828125q-0.53125 -2.34375 -1.484375 -4.5q-0.609375 -1.40625 -2.515625 -4.6875l2.015625 0q2.9375 3.921875 4.34375 7.875q1.203125 3.40625 1.203125 7.125q0 4.218754 -1.625 8.156254q-1.609375 3.9375 -3.921875 6.875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m467.32285 331.43307l273.88974 0l0 73.165344l-273.88974 0z" fill-rule="evenodd"></path><path fill="#ff0000" d="m492.0416 378.83307l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm26.523407 -1.234375q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.7499695 0.640625 -3.7968445 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.6718445 0 2.9374695 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.7655945 -0.53125 -1.8124695 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3124695 -1.859375q1.5625 -1.875 1.5625 -5.625zm25.476562 -0.15625q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm15.3984375 -14.8125l-5.8125 0l0 -2.78125l9.25 0l0 24.765625l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -21.984375zm21.992188 8.015625l-5.8125 0l0 -2.8125l9.25 0l0 16.78125l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -13.96875zm1.1875 -11.03125q0.5625 0 1.046875 0.203125q0.5 0.203125 0.859375 0.578125q0.359375 0.359375 0.5625 0.84375q0.203125 0.484375 0.203125 1.046875q0 0.546875 -0.203125 1.03125q-0.203125 0.484375 -0.5625 0.859375q-0.359375 0.375 -0.859375 0.578125q-0.484375 0.203125 -1.046875 0.203125q-0.5625 0 -1.0625 -0.203125q-0.484375 -0.203125 -0.84375 -0.578125q-0.359375 -0.375 -0.5625 -0.859375q-0.203125 -0.484375 -0.203125 -1.03125q0 -0.5625 0.203125 -1.046875q0.203125 -0.484375 0.5625 -0.84375q0.359375 -0.375 0.84375 -0.578125q0.5 -0.203125 1.0625 -0.203125zm29.351562 27.109375q-1.328125 0.5 -2.734375 0.75q-1.390625 0.25 -2.875 0.25q-4.640625 0 -7.15625 -2.515625q-2.5 -2.53125 -2.5 -7.375q0 -2.328125 0.71875 -4.21875q0.71875 -1.890625 2.03125 -3.234375q1.3125 -1.359375 3.125 -2.09375q1.8125 -0.734375 4.0 -0.734375q1.53125 0 2.859375 0.21875q1.328125 0.21875 2.53125 0.703125l0 3.25q-1.265625 -0.671875 -2.59375 -0.96875q-1.3125 -0.3125 -2.71875 -0.3125q-1.3125 0 -2.46875 0.5q-1.15625 0.5 -2.046875 1.4375q-0.875 0.9375 -1.390625 2.296875q-0.5 1.34375 -0.5 3.03125q0 3.5625 1.71875 5.328125q1.734375 1.765625 4.8125 1.765625q1.375 0 2.671875 -0.3125q1.3125 -0.3125 2.515625 -0.9375l0 3.171875zm19.351562 0.71875l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm25.554688 8.640625q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm12.8828125 -16.515625l-5.8125 0l0 -2.8125l9.25 0l0 16.78125l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -13.96875zm1.1875 -11.03125q0.5625 0 1.046875 0.203125q0.5 0.203125 0.859375 0.578125q0.359375 0.359375 0.5625 0.84375q0.203125 0.484375 0.203125 1.046875q0 0.546875 -0.203125 1.03125q-0.203125 0.484375 -0.5625 0.859375q-0.359375 0.375 -0.859375 0.578125q-0.484375 0.203125 -1.046875 0.203125q-0.5625 0 -1.0625 -0.203125q-0.484375 -0.203125 -0.84375 -0.578125q-0.359375 -0.375 -0.5625 -0.859375q-0.203125 -0.484375 -0.203125 -1.03125q0 -0.5625 0.203125 -1.046875q0.203125 -0.484375 0.5625 -0.84375q0.359375 -0.375 0.84375 -0.578125q0.5 -0.203125 1.0625 -0.203125zm31.195312 17.859375q0 2.296875 -0.65625 4.203125q-0.640625 1.890625 -1.859375 3.25q-1.203125 1.359375 -2.9375 2.125q-1.734375 0.75 -3.953125 0.75q-2.109375 0 -3.78125 -0.65625q-1.65625 -0.65625 -2.828125 -1.921875q-1.15625 -1.28125 -1.78125 -3.15625q-0.609375 -1.875 -0.609375 -4.3125q0 -2.28125 0.640625 -4.171875q0.65625 -1.890625 1.859375 -3.234375q1.21875 -1.359375 2.953125 -2.109375q1.734375 -0.765625 3.9375 -0.765625q2.109375 0 3.78125 0.65625q1.671875 0.65625 2.828125 1.921875q1.171875 1.25 1.78125 3.125q0.625 1.875 0.625 4.296875zm-3.484375 0.15625q0 -1.8125 -0.40625 -3.171875q-0.390625 -1.359375 -1.140625 -2.265625q-0.734375 -0.90625 -1.796875 -1.359375q-1.0625 -0.46875 -2.375 -0.46875q-1.53125 0 -2.609375 0.609375q-1.078125 0.59375 -1.78125 1.59375q-0.6875 0.984375 -1.015625 2.3125q-0.3125 1.3125 -0.3125 2.75q0 1.828125 0.390625 3.203125q0.40625 1.359375 1.140625 2.265625q0.75 0.90625 1.796875 1.375q1.0625 0.453125 2.390625 0.453125q1.515625 0 2.59375 -0.59375q1.09375 -0.609375 1.78125 -1.59375q0.703125 -1.0 1.015625 -2.3125q0.328125 -1.328125 0.328125 -2.796875zm8.3984375 -9.796875l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m486.97638 283.89108l224.94489 0l0 22.582672l-224.94489 0z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m339.4987 304.17743l0 0c0 -28.5708 23.161194 -51.731995 51.731995 -51.731995l506.1108 0c13.720154 0 26.878418 5.4503174 36.58008 15.151947c9.701599 9.70163 15.1519165 22.859863 15.1519165 36.580048l0 206.92178c0 28.57077 -23.161194 51.731964 -51.731995 51.731964l-506.1108 0c-28.5708 0 -51.731995 -23.161194 -51.731995 -51.731964z" fill-rule="evenodd"></path><path stroke="#999999" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="16.0,12.0" d="m339.4987 304.17743l0 0c0 -28.5708 23.161194 -51.731995 51.731995 -51.731995l506.1108 0c13.720154 0 26.878418 5.4503174 36.58008 15.151947c9.701599 9.70163 15.1519165 22.859863 15.1519165 36.580048l0 206.92178c0 28.57077 -23.161194 51.731964 -51.731995 51.731964l-506.1108 0c-28.5708 0 -51.731995 -23.161194 -51.731995 -51.731964z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m837.937 562.8312l78.897644 0l0 19.884949l-78.897644 0z" fill-rule="evenodd"></path><path fill="#999999" d="m855.2214 575.1049l1.125 0.140625q-0.171875 1.171875 -0.9375 1.828125q-0.765625 0.65625 -1.859375 0.65625q-1.390625 0 -2.234375 -0.90625q-0.828125 -0.90625 -0.828125 -2.59375q0 -1.09375 0.359375 -1.90625q0.359375 -0.828125 1.09375 -1.234375q0.734375 -0.40625 1.609375 -0.40625q1.09375 0 1.796875 0.5625q0.703125 0.546875 0.890625 1.5625l-1.109375 0.171875q-0.15625 -0.671875 -0.5625 -1.015625q-0.390625 -0.34375 -0.96875 -0.34375q-0.859375 0 -1.40625 0.625q-0.53125 0.609375 -0.53125 1.953125q0 1.359375 0.515625 1.984375q0.515625 0.609375 1.359375 0.609375q0.671875 0 1.125 -0.40625q0.453125 -0.421875 0.5625 -1.28125zm1.8515625 -0.90625q0 -1.875 1.03125 -2.765625q0.875 -0.75 2.125 -0.75q1.390625 0 2.265625 0.90625q0.890625 0.90625 0.890625 2.515625q0 1.296875 -0.390625 2.046875q-0.390625 0.75 -1.140625 1.171875q-0.75 0.40625 -1.625 0.40625q-1.421875 0 -2.296875 -0.90625q-0.859375 -0.90625 -0.859375 -2.625zm1.171875 0q0 1.296875 0.5625 1.953125q0.5625 0.640625 1.421875 0.640625q0.84375 0 1.40625 -0.640625q0.578125 -0.65625 0.578125 -1.984375q0 -1.25 -0.578125 -1.890625q-0.5625 -0.65625 -1.40625 -0.65625q-0.859375 0 -1.421875 0.640625q-0.5625 0.640625 -0.5625 1.9375zm6.6624756 3.375l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm9.912476 -1.015625l0.15625 1.0q-0.484375 0.109375 -0.859375 0.109375q-0.625 0 -0.96875 -0.203125q-0.34375 -0.203125 -0.484375 -0.515625q-0.140625 -0.328125 -0.140625 -1.34375l0 -3.890625l-0.828125 0l0 -0.875l0.828125 0l0 -1.671875l1.140625 -0.6875l0 2.359375l1.15625 0l0 0.875l-1.15625 0l0 3.953125q0 0.484375 0.0625 0.625q0.0625 0.140625 0.1875 0.21875q0.140625 0.078125 0.390625 0.078125q0.203125 0 0.515625 -0.03125zm5.593628 0.1875q-0.625 0.53125 -1.21875 0.765625q-0.578125 0.21875 -1.25 0.21875q-1.125 0 -1.71875 -0.546875q-0.59375 -0.546875 -0.59375 -1.390625q0 -0.484375 0.21875 -0.890625q0.234375 -0.421875 0.59375 -0.671875q0.375 -0.25 0.828125 -0.375q0.328125 -0.078125 1.015625 -0.171875q1.375 -0.15625 2.03125 -0.390625q0.015625 -0.234375 0.015625 -0.296875q0 -0.703125 -0.328125 -0.984375q-0.4375 -0.390625 -1.296875 -0.390625q-0.8125 0 -1.203125 0.28125q-0.375 0.28125 -0.5625 1.0l-1.109375 -0.140625q0.140625 -0.71875 0.484375 -1.15625q0.359375 -0.453125 1.015625 -0.6875q0.671875 -0.234375 1.53125 -0.234375q0.875 0 1.40625 0.203125q0.546875 0.203125 0.796875 0.515625q0.25 0.296875 0.359375 0.765625q0.046875 0.296875 0.046875 1.0625l0 1.515625q0 1.59375 0.078125 2.015625q0.078125 0.421875 0.28125 0.8125l-1.1875 0q-0.171875 -0.359375 -0.234375 -0.828125zm-0.09375 -2.5625q-0.625 0.265625 -1.859375 0.4375q-0.703125 0.109375 -1.0 0.234375q-0.296875 0.125 -0.453125 0.375q-0.15625 0.234375 -0.15625 0.53125q0 0.453125 0.34375 0.765625q0.34375 0.296875 1.015625 0.296875q0.65625 0 1.171875 -0.28125q0.515625 -0.296875 0.765625 -0.796875q0.171875 -0.375 0.171875 -1.140625l0 -0.421875zm3.1156006 -4.59375l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.9610596 0l0 -6.734375l1.03125 0l0 0.953125q0.734375 -1.109375 2.140625 -1.109375q0.609375 0 1.109375 0.21875q0.515625 0.21875 0.765625 0.578125q0.265625 0.34375 0.359375 0.84375q0.0625 0.3125 0.0625 1.109375l0 4.140625l-1.140625 0l0 -4.09375q0 -0.703125 -0.140625 -1.046875q-0.125 -0.34375 -0.46875 -0.546875q-0.328125 -0.21875 -0.78125 -0.21875q-0.734375 0 -1.265625 0.46875q-0.53125 0.453125 -0.53125 1.75l0 3.6875l-1.140625 0zm12.021851 -2.171875l1.1875 0.140625q-0.28125 1.046875 -1.046875 1.625q-0.75 0.5625 -1.921875 0.5625q-1.484375 0 -2.359375 -0.90625q-0.859375 -0.921875 -0.859375 -2.5625q0 -1.703125 0.875 -2.640625q0.890625 -0.9375 2.28125 -0.9375q1.359375 0 2.203125 0.921875q0.859375 0.921875 0.859375 2.578125q0 0.109375 0 0.3125l-5.03125 0q0.0625 1.109375 0.625 1.703125q0.5625 0.59375 1.40625 0.59375q0.640625 0 1.078125 -0.328125q0.453125 -0.34375 0.703125 -1.0625zm-3.75 -1.84375l3.765625 0q-0.078125 -0.859375 -0.4375 -1.28125q-0.546875 -0.65625 -1.40625 -0.65625q-0.796875 0 -1.328125 0.53125q-0.53125 0.515625 -0.59375 1.40625zm6.5374756 4.015625l0 -6.734375l1.03125 0l0 1.015625q0.390625 -0.71875 0.71875 -0.9375q0.34375 -0.234375 0.734375 -0.234375q0.578125 0 1.171875 0.359375l-0.390625 1.0625q-0.421875 -0.25 -0.828125 -0.25q-0.375 0 -0.6875 0.234375q-0.296875 0.21875 -0.421875 0.625q-0.1875 0.609375 -0.1875 1.328125l0 3.53125l-1.140625 0z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m234.5538 173.33597l432.37796 0l0 73.165344l-432.37796 0z" fill-rule="evenodd"></path><path fill="#000000" d="m262.21005 215.37659q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm23.898438 -14.25l-6.671875 17.53125q-1.03125 2.6875 -2.140625 4.609375q-1.109375 1.9375 -2.421875 3.171875q-1.296875 1.25 -2.859375 1.828125q-1.5625 0.59375 -3.5 0.59375q-0.5 0 -0.921875 -0.015625q-0.40625 -0.015625 -0.890625 -0.0625l0 -3.078125q0.421875 0.046875 0.921875 0.09375q0.515625 0.0625 1.09375 0.0625q0.9375 0 1.734375 -0.28125q0.8125 -0.265625 1.53125 -0.890625q0.734375 -0.609375 1.390625 -1.59375q0.671875 -0.96875 1.296875 -2.359375l-7.828125 -19.609375l3.859375 0l4.96875 12.96875l0.984375 3.046875l1.140625 -3.125l4.59375 -12.890625l3.71875 0zm20.085938 14.25q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm22.257812 5.078125q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm22.757812 -10.5625q0 0.71875 -0.015625 1.21875q-0.015625 0.484375 -0.0625 0.90625l-13.765625 0q0 3.015625 1.671875 4.625q1.6875 1.609375 4.84375 1.609375q0.859375 0 1.71875 -0.0625q0.859375 -0.078125 1.65625 -0.1875q0.8125 -0.125 1.546875 -0.265625q0.734375 -0.140625 1.359375 -0.328125l0 2.796875q-1.390625 0.390625 -3.140625 0.640625q-1.75 0.25 -3.625 0.25q-2.515625 0 -4.34375 -0.6875q-1.8125 -0.6875 -2.96875 -1.984375q-1.15625 -1.296875 -1.71875 -3.1875q-0.5625 -1.890625 -0.5625 -4.265625q0 -2.078125 0.59375 -3.921875q0.609375 -1.84375 1.75 -3.234375q1.140625 -1.40625 2.796875 -2.21875q1.65625 -0.828125 3.765625 -0.828125q2.0625 0 3.640625 0.65625q1.578125 0.640625 2.65625 1.828125q1.09375 1.171875 1.640625 2.859375q0.5625 1.6875 0.5625 3.78125zm-3.53125 -0.484375q0.0625 -1.3125 -0.25 -2.390625q-0.3125 -1.09375 -0.96875 -1.875q-0.65625 -0.78125 -1.640625 -1.21875q-0.96875 -0.4375 -2.265625 -0.4375q-1.109375 0 -2.03125 0.4375q-0.90625 0.421875 -1.578125 1.203125q-0.65625 0.78125 -1.078125 1.875q-0.40625 1.09375 -0.5 2.40625l10.3125 0zm22.945312 11.328125l0 -14.078125q0 -0.921875 -0.078125 -1.5q-0.0625 -0.59375 -0.203125 -0.9375q-0.140625 -0.34375 -0.375 -0.46875q-0.21875 -0.140625 -0.546875 -0.140625q-0.390625 0 -0.734375 0.234375q-0.328125 0.234375 -0.71875 0.765625q-0.375 0.515625 -0.828125 1.390625q-0.453125 0.859375 -1.078125 2.140625l0 12.59375l-3.109375 0l0 -13.71875q0 -1.0625 -0.078125 -1.71875q-0.0625 -0.671875 -0.21875 -1.046875q-0.140625 -0.375 -0.375 -0.5q-0.234375 -0.140625 -0.5625 -0.140625q-0.34375 0 -0.65625 0.203125q-0.3125 0.1875 -0.703125 0.703125q-0.375 0.5 -0.84375 1.375q-0.46875 0.875 -1.109375 2.25l0 12.59375l-3.125 0l0 -19.609375l2.59375 0l0.15625 3.734375q0.5 -1.125 0.984375 -1.90625q0.484375 -0.78125 0.984375 -1.25q0.515625 -0.484375 1.078125 -0.703125q0.578125 -0.234375 1.28125 -0.234375q1.59375 0 2.40625 1.046875q0.828125 1.03125 0.828125 3.203125q0.46875 -1.015625 0.90625 -1.8125q0.453125 -0.796875 0.96875 -1.328125q0.515625 -0.53125 1.140625 -0.8125q0.625 -0.296875 1.453125 -0.296875q3.6875 0 3.6875 5.6875l0 14.28125l-3.125 0zm7.0078125 -9.390625q0 -2.5 0.6875 -4.4375q0.6875 -1.953125 1.9375 -3.28125q1.265625 -1.34375 3.03125 -2.03125q1.765625 -0.703125 3.9375 -0.703125q0.9375 0 1.84375 0.125q0.90625 0.109375 1.796875 0.359375l0 -8.234375l3.40625 0l0 27.59375l-3.046875 0l-0.109375 -3.71875q-1.421875 2.078125 -3.09375 3.078125q-1.65625 1.0 -3.59375 1.0q-1.671875 0 -2.953125 -0.703125q-1.28125 -0.71875 -2.140625 -1.984375q-0.84375 -1.28125 -1.28125 -3.078125q-0.421875 -1.796875 -0.421875 -3.984375zm3.484375 -0.21875q0 3.546875 1.046875 5.296875q1.046875 1.75 2.953125 1.75q1.296875 0 2.71875 -1.140625q1.4375 -1.15625 3.03125 -3.421875l0 -9.109375q-0.84375 -0.390625 -1.859375 -0.59375q-1.015625 -0.203125 -2.015625 -0.203125q-2.765625 0 -4.328125 1.796875q-1.546875 1.796875 -1.546875 5.625zm33.226562 0.5625l-11.6875 0l0 -3.203125l11.6875 0l0 3.203125zm8.2734375 -10.5625l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375zm37.523438 14.25q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm23.226562 -4.796875q0 2.609375 -0.734375 4.5625q-0.734375 1.953125 -2.03125 3.25q-1.28125 1.28125 -3.046875 1.9375q-1.75 0.640625 -3.796875 0.640625q-0.9375 0 -1.875 -0.09375q-0.921875 -0.09375 -1.875 -0.34375l0 8.21875l-3.40625 0l0 -27.625l3.03125 0l0.21875 3.28125q1.453125 -2.015625 3.109375 -2.828125q1.671875 -0.8125 3.609375 -0.8125q1.671875 0 2.9375 0.703125q1.28125 0.703125 2.140625 1.984375q0.859375 1.28125 1.28125 3.09375q0.4375 1.796875 0.4375 4.03125zm-3.484375 0.15625q0 -1.546875 -0.234375 -2.828125q-0.21875 -1.296875 -0.703125 -2.203125q-0.484375 -0.921875 -1.25 -1.4375q-0.765625 -0.53125 -1.8125 -0.53125q-0.640625 0 -1.3125 0.21875q-0.65625 0.203125 -1.375 0.6875q-0.71875 0.46875 -1.515625 1.265625q-0.78125 0.78125 -1.671875 1.953125l0 9.515625q0.9375 0.390625 1.96875 0.625q1.03125 0.21875 2.03125 0.21875q2.75 0 4.3125 -1.859375q1.5625 -1.875 1.5625 -5.625zm21.304688 10.0l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm27.929718 -10.6875l-2.859375 19.609375l-4.125 0l-2.828125 -8.203125l-0.5625 -2.0l-0.640625 2.109375l-2.71875 8.09375l-4.0000305 0l-2.84375 -19.609375l3.328125 0l1.6406555 13.3125l0.34375 2.96875l0.84375 -2.59375l2.859375 -8.8125l2.4375 0l3.0625 8.703125l0.875 2.59375l0.296875 -2.75l1.53125 -13.421875l3.359375 0zm3.8203125 0l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m264.36746 238.50131l0 49.98163l64.10538 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m264.36746 238.50131l0 49.98163l40.105377 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m304.47284 295.08987l18.152374 -6.6069336l-18.152374 -6.6069336z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m520.08136 33.372707l432.37793 0l0 73.16536l-432.37793 0z" fill-rule="evenodd"></path><path fill="#000000" d="m547.7376 75.41333q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm23.898438 -14.25l-6.671875 17.53125q-1.03125 2.6875 -2.140625 4.609375q-1.109375 1.9375 -2.421875 3.171875q-1.296875 1.25 -2.859375 1.828125q-1.5625 0.59375 -3.5 0.59375q-0.5 0 -0.921875 -0.015625q-0.40625 -0.015625 -0.890625 -0.0625l0 -3.078125q0.421875 0.046875 0.921875 0.09375q0.515625 0.0625 1.09375 0.0625q0.9375 0 1.734375 -0.28125q0.8125 -0.265625 1.53125 -0.890625q0.734375 -0.609375 1.390625 -1.59375q0.671875 -0.96875 1.296875 -2.359375l-7.828125 -19.609375l3.859375 0l4.96875 12.96875l0.984375 3.046875l1.140625 -3.125l4.59375 -12.890625l3.71875 0zm20.085938 14.25q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm22.257812 5.078125q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm22.757812 -10.5625q0 0.71875 -0.015625 1.21875q-0.015625 0.484375 -0.0625 0.90625l-13.765625 0q0 3.015625 1.671875 4.625q1.6875 1.609375 4.84375 1.609375q0.859375 0 1.71875 -0.0625q0.859375 -0.078125 1.65625 -0.1875q0.8125 -0.125 1.546875 -0.265625q0.734375 -0.140625 1.359375 -0.328125l0 2.796875q-1.390625 0.390625 -3.140625 0.640625q-1.75 0.25 -3.625 0.25q-2.515625 0 -4.34375 -0.6875q-1.8125 -0.6875 -2.96875 -1.984375q-1.15625 -1.296875 -1.71875 -3.1875q-0.5625 -1.890625 -0.5625 -4.265625q0 -2.078125 0.59375 -3.921875q0.609375 -1.84375 1.75 -3.234375q1.140625 -1.40625 2.796875 -2.21875q1.65625 -0.828125 3.765625 -0.828125q2.0625 0 3.640625 0.65625q1.578125 0.640625 2.65625 1.828125q1.09375 1.171875 1.640625 2.859375q0.5625 1.6875 0.5625 3.78125zm-3.53125 -0.484375q0.0625 -1.3125 -0.25 -2.390625q-0.3125 -1.09375 -0.96875 -1.875q-0.65625 -0.78125 -1.640625 -1.21875q-0.96875 -0.4375 -2.265625 -0.4375q-1.109375 0 -2.03125 0.4375q-0.90625 0.421875 -1.578125 1.203125q-0.65625 0.78125 -1.078125 1.875q-0.40625 1.09375 -0.5 2.40625l10.3125 0zm22.945312 11.328125l0 -14.078125q0 -0.921875 -0.078125 -1.5q-0.0625 -0.59375 -0.203125 -0.9375q-0.140625 -0.34375 -0.375 -0.46875q-0.21875 -0.140625 -0.546875 -0.140625q-0.390625 0 -0.734375 0.234375q-0.328125 0.234375 -0.71875 0.765625q-0.375 0.515625 -0.828125 1.390625q-0.453125 0.859375 -1.078125 2.140625l0 12.59375l-3.109375 0l0 -13.71875q0 -1.0625 -0.078125 -1.71875q-0.0625 -0.671875 -0.21875 -1.046875q-0.140625 -0.375 -0.375 -0.5q-0.234375 -0.140625 -0.5625 -0.140625q-0.34375 0 -0.65625 0.203125q-0.3125 0.1875 -0.703125 0.703125q-0.375 0.5 -0.84375 1.375q-0.46875 0.875 -1.109375 2.25l0 12.59375l-3.125 0l0 -19.609375l2.59375 0l0.15625 3.734375q0.5 -1.125 0.984375 -1.90625q0.484375 -0.78125 0.984375 -1.25q0.515625 -0.484375 1.078125 -0.703125q0.578125 -0.234375 1.28125 -0.234375q1.59375 0 2.40625 1.046875q0.828125 1.03125 0.828125 3.203125q0.46875 -1.015625 0.90625 -1.8125q0.453125 -0.796875 0.96875 -1.328125q0.515625 -0.53125 1.140625 -0.8125q0.625 -0.296875 1.453125 -0.296875q3.6875 0 3.6875 5.6875l0 14.28125l-3.125 0zm7.0078125 -9.390625q0 -2.5 0.6875 -4.4375q0.6875 -1.953125 1.9375 -3.28125q1.265625 -1.34375 3.03125 -2.03125q1.765625 -0.703125 3.9375 -0.703125q0.9375 0 1.84375 0.125q0.90625 0.109375 1.796875 0.359375l0 -8.234375l3.40625 0l0 27.59375l-3.046875 0l-0.109375 -3.71875q-1.421875 2.078125 -3.09375 3.078125q-1.65625 1.0 -3.59375 1.0q-1.671875 0 -2.953125 -0.703125q-1.28125 -0.71875 -2.140625 -1.984375q-0.84375 -1.28125 -1.28125 -3.078125q-0.421875 -1.796875 -0.421875 -3.984375zm3.484375 -0.21875q0 3.546875 1.046875 5.296875q1.046875 1.75 2.953125 1.75q1.296875 0 2.71875 -1.140625q1.4375 -1.15625 3.03125 -3.421875l0 -9.109375q-0.84375 -0.390625 -1.859375 -0.59375q-1.015625 -0.203125 -2.015625 -0.203125q-2.765625 0 -4.328125 1.796875q-1.546875 1.796875 -1.546875 5.625zm33.226562 0.5625l-11.6875 0l0 -3.203125l11.6875 0l0 3.203125zm22.257812 9.046875l0 -14.078125q0 -0.921875 -0.078125 -1.5q-0.0625 -0.59375 -0.203125 -0.9375q-0.140625 -0.34375 -0.375 -0.46875q-0.21875 -0.140625 -0.546875 -0.140625q-0.390625 0 -0.734375 0.234375q-0.328125 0.234375 -0.71875 0.765625q-0.375 0.515625 -0.828125 1.390625q-0.453125 0.859375 -1.078125 2.140625l0 12.59375l-3.109375 0l0 -13.71875q0 -1.0625 -0.078125 -1.71875q-0.0625 -0.671875 -0.21875 -1.046875q-0.140625 -0.375 -0.375 -0.5q-0.234375 -0.140625 -0.5625 -0.140625q-0.34375 0 -0.65625 0.203125q-0.3125 0.1875 -0.703125 0.703125q-0.375 0.5 -0.84375 1.375q-0.46875 0.875 -1.109375 2.25l0 12.59375l-3.125 0l0 -19.609375l2.59375 0l0.15625 3.734375q0.5 -1.125 0.984375 -1.90625q0.484375 -0.78125 0.984375 -1.25q0.515625 -0.484375 1.078125 -0.703125q0.578125 -0.234375 1.28125 -0.234375q1.59375 0 2.40625 1.046875q0.828125 1.03125 0.828125 3.203125q0.46875 -1.015625 0.90625 -1.8125q0.453125 -0.796875 0.96875 -1.328125q0.515625 -0.53125 1.140625 -0.8125q0.625 -0.296875 1.453125 -0.296875q3.6875 0 3.6875 5.6875l0 14.28125l-3.125 0zm20.601562 0l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm24.992188 8.203125q-1.328125 0.5 -2.734375 0.75q-1.390625 0.25 -2.875 0.25q-4.640625 0 -7.15625 -2.515625q-2.5 -2.53125 -2.5 -7.375q0 -2.328125 0.71875 -4.21875q0.71875 -1.890625 2.03125 -3.234375q1.3125 -1.359375 3.125 -2.09375q1.8125 -0.734375 4.0 -0.734375q1.53125 0 2.859375 0.21875q1.328125 0.21875 2.53125 0.703125l0 3.25q-1.265625 -0.671875 -2.59375 -0.96875q-1.3125 -0.3125 -2.71875 -0.3125q-1.3125 0 -2.46875 0.5q-1.15625 0.5 -2.046875 1.4375q-0.875 0.9375 -1.390625 2.296875q-0.5 1.34375 -0.5 3.03125q0 3.5625 1.71875 5.328125q1.734375 1.765625 4.8125 1.765625q1.375 0 2.671875 -0.3125q1.3125 -0.3125 2.515625 -0.9375l0 3.171875zm22.523438 0.71875l-3.40625 0l0 -12.515625q0 -2.265625 -0.84375 -3.390625q-0.84375 -1.125 -2.4375 -1.125q-0.671875 0 -1.28125 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.40625 1.234375q-0.765625 0.78125 -1.75 1.953125l0 13.015625l-3.40625 0l0 -27.59375l3.40625 0l0 7.984375l-0.125 3.078125q0.796875 -0.953125 1.5625 -1.609375q0.78125 -0.65625 1.546875 -1.0625q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.1875 1.65625 -0.1875q2.9375 0 4.53125 1.796875q1.609375 1.78125 1.609375 5.375l0 12.796875zm12.9140625 -16.796875l-5.8125 0l0 -2.8125l9.25 0l0 16.78125l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -13.96875zm1.1875 -11.03125q0.5625 0 1.046875 0.203125q0.5 0.203125 0.859375 0.578125q0.359375 0.359375 0.5625 0.84375q0.203125 0.484375 0.203125 1.046875q0 0.546875 -0.203125 1.03125q-0.203125 0.484375 -0.5625 0.859375q-0.359375 0.375 -0.859375 0.578125q-0.484375 0.203125 -1.046875 0.203125q-0.5625 0 -1.0625 -0.203125q-0.484375 -0.203125 -0.84375 -0.578125q-0.359375 -0.375 -0.5625 -0.859375q-0.203125 -0.484375 -0.203125 -1.03125q0 -0.5625 0.203125 -1.046875q0.203125 -0.484375 0.5625 -0.84375q0.359375 -0.375 0.84375 -0.578125q0.5 -0.203125 1.0625 -0.203125zm14.1171875 8.21875l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375zm38.554688 8.765625q0 0.71875 -0.015625 1.21875q-0.015625 0.484375 -0.0625 0.90625l-13.765625 0q0 3.015625 1.671875 4.625q1.6875 1.609375 4.84375 1.609375q0.859375 0 1.71875 -0.0625q0.859375 -0.078125 1.65625 -0.1875q0.8125 -0.125 1.546875 -0.265625q0.734375 -0.140625 1.359375 -0.328125l0 2.796875q-1.390625 0.390625 -3.140625 0.640625q-1.75 0.25 -3.625 0.25q-2.515625 0 -4.34375 -0.6875q-1.8125 -0.6875 -2.96875 -1.984375q-1.15625 -1.296875 -1.71875 -3.1875q-0.5625 -1.890625 -0.5625 -4.265625q0 -2.078125 0.59375 -3.921875q0.609375 -1.84375 1.75 -3.234375q1.140625 -1.40625 2.796875 -2.21875q1.65625 -0.828125 3.765625 -0.828125q2.0625 0 3.640625 0.65625q1.578125 0.640625 2.65625 1.828125q1.09375 1.171875 1.640625 2.859375q0.5625 1.6875 0.5625 3.78125zm-3.53125 -0.484375q0.0625 -1.3125 -0.25 -2.390625q-0.3125 -1.09375 -0.96875 -1.875q-0.65625 -0.78125 -1.640625 -1.21875q-0.96875 -0.4375 -2.265625 -0.4375q-1.109375 0 -2.03125 0.4375q-0.90625 0.421875 -1.578125 1.203125q-0.65625 0.78125 -1.078125 1.875q-0.40625 1.09375 -0.5 2.40625l10.3125 0zm7.9609375 1.9375q0 -2.5 0.6875 -4.4375q0.6875 -1.953125 1.9375 -3.28125q1.265625 -1.34375 3.03125 -2.03125q1.765625 -0.703125 3.9375 -0.703125q0.9375 0 1.84375 0.125q0.90625 0.109375 1.796875 0.359375l0 -8.234375l3.40625 0l0 27.59375l-3.046875 0l-0.109375 -3.71875q-1.421875 2.078125 -3.09375 3.078125q-1.65625 1.0 -3.59375 1.0q-1.671875 0 -2.953125 -0.703125q-1.28125 -0.71875 -2.140625 -1.984375q-0.84375 -1.28125 -1.28125 -3.078125q-0.421875 -1.796875 -0.421875 -3.984375zm3.484375 -0.21875q0 3.546875 1.046875 5.296875q1.046875 1.75 2.953125 1.75q1.296875 0 2.71875 -1.140625q1.4375 -1.15625 3.03125 -3.421875l0 -9.109375q-0.84375 -0.390625 -1.859375 -0.59375q-1.015625 -0.203125 -2.015625 -0.203125q-2.765625 0 -4.328125 1.796875q-1.546875 1.796875 -1.546875 5.625z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m450.47507 173.8924l0 -103.93701l69.60629 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m450.47507 173.8924l0 -103.93701l66.17923 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m516.6543 69.95538l-1.1245728 1.124588l3.0897217 -1.124588l-3.0897217 -1.1245804z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m328.47244 109.026245l122.01575 0l0 25.795273l-122.01575 0z" fill-rule="evenodd"></path><path fill="#000000" d="m341.33182 135.94624l-2.609375 0l0 -9.859375l2.421875 0l0 1.40625q0.625 -0.984375 1.109375 -1.296875q0.5 -0.328125 1.140625 -0.328125q0.890625 0 1.71875 0.5l-0.8125 2.265625q-0.65625 -0.421875 -1.21875 -0.421875q-0.546875 0 -0.9375 0.296875q-0.375 0.296875 -0.59375 1.09375q-0.21875 0.78125 -0.21875 3.296875l0 3.046875zm10.463379 -3.140625l2.609375 0.4375q-0.5 1.4375 -1.59375 2.1875q-1.078125 0.734375 -2.703125 0.734375q-2.5625 0 -3.796875 -1.671875q-0.96875 -1.34375 -0.96875 -3.40625q0 -2.4375 1.265625 -3.828125q1.28125 -1.390625 3.25 -1.390625q2.1875 0 3.453125 1.453125q1.28125 1.453125 1.234375 4.453125l-6.53125 0q0.015625 1.15625 0.625 1.8125q0.609375 0.640625 1.5 0.640625q0.609375 0 1.03125 -0.328125q0.421875 -0.34375 0.625 -1.09375zm0.15625 -2.625q-0.03125 -1.140625 -0.59375 -1.71875q-0.546875 -0.59375 -1.34375 -0.59375q-0.859375 0 -1.40625 0.625q-0.5625 0.609375 -0.546875 1.6875l3.890625 0zm4.2819824 6.421875l2.96875 0.359375q0.078125 0.515625 0.34375 0.703125q0.375 0.28125 1.171875 0.28125q1.03125 0 1.53125 -0.296875q0.34375 -0.203125 0.515625 -0.65625q0.125 -0.328125 0.125 -1.203125l0 -1.4375q-1.171875 1.59375 -2.953125 1.59375q-1.984375 0 -3.140625 -1.671875q-0.90625 -1.328125 -0.90625 -3.3125q0 -2.46875 1.1875 -3.78125q1.1875 -1.3125 2.96875 -1.3125q1.828125 0 3.015625 1.609375l0 -1.390625l2.4375 0l0 8.84375q0 1.75 -0.296875 2.609375q-0.28125 0.859375 -0.796875 1.34375q-0.515625 0.5 -1.390625 0.78125q-0.859375 0.28125 -2.1875 0.28125q-2.515625 0 -3.5625 -0.859375q-1.046875 -0.859375 -1.046875 -2.171875q0 -0.140625 0.015625 -0.3125zm2.328125 -5.78125q0 1.5625 0.609375 2.296875q0.609375 0.71875 1.5 0.71875q0.953125 0 1.609375 -0.734375q0.65625 -0.75 0.65625 -2.21875q0 -1.53125 -0.640625 -2.265625q-0.625 -0.75 -1.578125 -0.75q-0.9375 0 -1.546875 0.734375q-0.609375 0.71875 -0.609375 2.21875zm9.302216 -6.0625l0 -2.40625l2.609375 0l0 2.40625l-2.609375 0zm0 11.1875l0 -9.859375l2.609375 0l0 9.859375l-2.609375 0zm4.277069 -2.8125l2.609375 -0.390625q0.171875 0.75 0.671875 1.15625q0.515625 0.390625 1.4375 0.390625q1.0 0 1.515625 -0.375q0.34375 -0.265625 0.34375 -0.703125q0 -0.296875 -0.1875 -0.484375q-0.1875 -0.1875 -0.875 -0.34375q-3.140625 -0.703125 -4.0 -1.265625q-1.15625 -0.796875 -1.15625 -2.21875q0 -1.28125 1.0 -2.15625q1.015625 -0.875 3.140625 -0.875q2.03125 0 3.0 0.65625q0.984375 0.65625 1.359375 1.953125l-2.453125 0.453125q-0.15625 -0.578125 -0.609375 -0.875q-0.4375 -0.3125 -1.25 -0.3125q-1.03125 0 -1.46875 0.296875q-0.296875 0.203125 -0.296875 0.515625q0 0.28125 0.25 0.484375q0.359375 0.25 2.4375 0.734375q2.078125 0.46875 2.90625 1.15625q0.828125 0.6875 0.828125 1.9375q0 1.359375 -1.140625 2.328125q-1.125 0.96875 -3.34375 0.96875q-2.015625 0 -3.1875 -0.8125q-1.171875 -0.8125 -1.53125 -2.21875zm15.797577 -7.046875l0 2.078125l-1.78125 0l0 3.984375q0 1.203125 0.046875 1.40625q0.0625 0.1875 0.234375 0.328125q0.1875 0.125 0.453125 0.125q0.359375 0 1.046875 -0.25l0.21875 2.015625q-0.90625 0.390625 -2.0625 0.390625q-0.703125 0 -1.265625 -0.234375q-0.5625 -0.234375 -0.828125 -0.609375q-0.265625 -0.375 -0.375 -1.015625q-0.078125 -0.453125 -0.078125 -1.84375l0 -4.296875l-1.203125 0l0 -2.078125l1.203125 0l0 -1.953125l2.609375 -1.515625l0 3.46875l1.78125 0zm7.400177 6.71875l2.609375 0.4375q-0.5 1.4375 -1.59375 2.1875q-1.078125 0.734375 -2.703125 0.734375q-2.5625 0 -3.796875 -1.671875q-0.96875 -1.34375 -0.96875 -3.40625q0 -2.4375 1.265625 -3.828125q1.28125 -1.390625 3.25 -1.390625q2.1875 0 3.453125 1.453125q1.28125 1.453125 1.234375 4.453125l-6.53125 0q0.015625 1.15625 0.625 1.8125q0.609375 0.640625 1.5 0.640625q0.609375 0 1.03125 -0.328125q0.421875 -0.34375 0.625 -1.09375zm0.15625 -2.625q-0.03125 -1.140625 -0.59375 -1.71875q-0.546875 -0.59375 -1.34375 -0.59375q-0.859375 0 -1.40625 0.625q-0.5625 0.609375 -0.546875 1.6875l3.890625 0zm7.0163574 5.765625l-2.609375 0l0 -9.859375l2.421875 0l0 1.40625q0.625 -0.984375 1.109375 -1.296875q0.5 -0.328125 1.140625 -0.328125q0.890625 0 1.71875 0.5l-0.8125 2.265625q-0.65625 -0.421875 -1.21875 -0.421875q-0.546875 0 -0.9375 0.296875q-0.375 0.296875 -0.59375 1.09375q-0.21875 0.78125 -0.21875 3.296875l0 3.046875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m467.32285 410.4147l382.8976 0l0 73.165344l-382.8976 0z" fill-rule="evenodd"></path><path fill="#000000" d="m494.9791 452.45532q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm23.898407 -14.25l-6.671875 17.53125q-1.0312195 2.6875 -2.1405945 4.609375q-1.109375 1.9375 -2.421875 3.171875q-1.296875 1.25 -2.859375 1.828125q-1.5625 0.59375 -3.5 0.59375q-0.5 0 -0.921875 -0.015625q-0.40625 -0.015625 -0.890625 -0.0625l0 -3.078125q0.421875 0.046875 0.921875 0.09375q0.515625 0.0625 1.09375 0.0625q0.9375 0 1.734375 -0.28125q0.8125 -0.265625 1.53125 -0.890625q0.734375 -0.609375 1.390625 -1.59375q0.671875 -0.96875 1.296875 -2.359375l-7.828125 -19.609375l3.859375 0l4.96875 12.96875l0.984375 3.046875l1.140625 -3.125l4.5937195 -12.890625l3.71875 0zm20.085938 14.25q0 1.046875 -0.359375 1.875q-0.34375 0.8125 -0.953125 1.453125q-0.609375 0.625 -1.40625 1.078125q-0.796875 0.4375 -1.703125 0.734375q-0.90625 0.296875 -1.875 0.4375q-0.953125 0.140625 -1.875 0.140625q-1.984375 0 -3.65625 -0.1875q-1.671875 -0.171875 -3.265625 -0.5625l0 -3.125q1.71875 0.484375 3.40625 0.75q1.703125 0.25 3.390625 0.25q2.4375 0 3.609375 -0.65625q1.171875 -0.671875 1.171875 -1.90625q0 -0.53125 -0.1875 -0.953125q-0.1875 -0.421875 -0.671875 -0.796875q-0.484375 -0.375 -1.515625 -0.78125q-1.03125 -0.421875 -2.796875 -0.953125q-1.328125 -0.390625 -2.453125 -0.875q-1.125 -0.5 -1.953125 -1.1875q-0.8125 -0.6875 -1.28125 -1.59375q-0.46875 -0.921875 -0.46875 -2.171875q0 -0.828125 0.375 -1.796875q0.390625 -0.984375 1.296875 -1.8125q0.921875 -0.84375 2.484375 -1.40625q1.5625 -0.5625 3.90625 -0.5625q1.15625 0 2.5625 0.140625q1.40625 0.125 2.921875 0.4375l0 3.015625q-1.59375 -0.390625 -3.03125 -0.5625q-1.4375 -0.1875 -2.484375 -0.1875q-1.28125 0 -2.15625 0.203125q-0.859375 0.1875 -1.40625 0.53125q-0.53125 0.328125 -0.765625 0.796875q-0.234375 0.453125 -0.234375 0.984375q0 0.53125 0.203125 0.96875q0.21875 0.421875 0.765625 0.828125q0.5625 0.390625 1.546875 0.796875q1.0 0.390625 2.609375 0.859375q1.734375 0.515625 2.921875 1.078125q1.203125 0.546875 1.9375 1.234375q0.75 0.671875 1.0625 1.53125q0.328125 0.859375 0.328125 1.953125zm22.257812 5.078125q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm22.757812 -10.5625q0 0.71875 -0.015625 1.21875q-0.015625 0.484375 -0.0625 0.90625l-13.765625 0q0 3.015625 1.671875 4.625q1.6875 1.609375 4.84375 1.609375q0.859375 0 1.71875 -0.0625q0.859375 -0.078125 1.65625 -0.1875q0.8125 -0.125 1.546875 -0.265625q0.734375 -0.140625 1.359375 -0.328125l0 2.796875q-1.390625 0.390625 -3.140625 0.640625q-1.75 0.25 -3.625 0.25q-2.515625 0 -4.34375 -0.6875q-1.8125 -0.6875 -2.96875 -1.984375q-1.15625 -1.296875 -1.71875 -3.1875q-0.5625 -1.890625 -0.5625 -4.265625q0 -2.078125 0.59375 -3.921875q0.609375 -1.84375 1.75 -3.234375q1.140625 -1.40625 2.796875 -2.21875q1.65625 -0.828125 3.765625 -0.828125q2.0625 0 3.640625 0.65625q1.578125 0.640625 2.65625 1.828125q1.09375 1.171875 1.640625 2.859375q0.5625 1.6875 0.5625 3.78125zm-3.53125 -0.484375q0.0625 -1.3125 -0.25 -2.390625q-0.3125 -1.09375 -0.96875 -1.875q-0.65625 -0.78125 -1.640625 -1.21875q-0.96875 -0.4375 -2.265625 -0.4375q-1.109375 0 -2.03125 0.4375q-0.90625 0.421875 -1.578125 1.203125q-0.65625 0.78125 -1.078125 1.875q-0.40625 1.09375 -0.5 2.40625l10.3125 0zm22.945312 11.328125l0 -14.078125q0 -0.921875 -0.078125 -1.5q-0.0625 -0.59375 -0.203125 -0.9375q-0.140625 -0.34375 -0.375 -0.46875q-0.21875 -0.140625 -0.546875 -0.140625q-0.390625 0 -0.734375 0.234375q-0.328125 0.234375 -0.71875 0.765625q-0.375 0.515625 -0.828125 1.390625q-0.453125 0.859375 -1.078125 2.140625l0 12.59375l-3.109375 0l0 -13.71875q0 -1.0625 -0.078125 -1.71875q-0.0625 -0.671875 -0.21875 -1.046875q-0.140625 -0.375 -0.375 -0.5q-0.234375 -0.140625 -0.5625 -0.140625q-0.34375 0 -0.65625 0.203125q-0.3125 0.1875 -0.703125 0.703125q-0.375 0.5 -0.84375 1.375q-0.46875 0.875 -1.109375 2.25l0 12.59375l-3.125 0l0 -19.609375l2.59375 0l0.15625 3.734375q0.5 -1.125 0.984375 -1.90625q0.484375 -0.78125 0.984375 -1.25q0.515625 -0.484375 1.078125 -0.703125q0.578125 -0.234375 1.28125 -0.234375q1.59375 0 2.40625 1.046875q0.828125 1.03125 0.828125 3.203125q0.46875 -1.015625 0.90625 -1.8125q0.453125 -0.796875 0.96875 -1.328125q0.515625 -0.53125 1.140625 -0.8125q0.625 -0.296875 1.453125 -0.296875q3.6875 0 3.6875 5.6875l0 14.28125l-3.125 0zm7.0078125 -9.390625q0 -2.5 0.6875 -4.4375q0.6875 -1.953125 1.9375 -3.28125q1.265625 -1.34375 3.03125 -2.03125q1.765625 -0.703125 3.9375 -0.703125q0.9375 0 1.84375 0.125q0.90625 0.109375 1.796875 0.359375l0 -8.234375l3.40625 0l0 27.59375l-3.046875 0l-0.109375 -3.71875q-1.421875 2.078125 -3.09375 3.078125q-1.65625 1.0 -3.59375 1.0q-1.671875 0 -2.953125 -0.703125q-1.28125 -0.71875 -2.140625 -1.984375q-0.84375 -1.28125 -1.28125 -3.078125q-0.421875 -1.796875 -0.421875 -3.984375zm3.484375 -0.21875q0 3.546875 1.046875 5.296875q1.046875 1.75 2.953125 1.75q1.296875 0 2.71875 -1.140625q1.4375 -1.15625 3.03125 -3.421875l0 -9.109375q-0.84375 -0.390625 -1.859375 -0.59375q-1.015625 -0.203125 -2.015625 -0.203125q-2.765625 0 -4.328125 1.796875q-1.546875 1.796875 -1.546875 5.625zm33.226562 0.5625l-11.6875 0l0 -3.203125l11.6875 0l0 3.203125zm21.554688 -10.5625l0 19.25q0 2.0625 -0.59375 3.65625q-0.578125 1.59375 -1.671875 2.6875q-1.09375 1.09375 -2.6875 1.65625q-1.59375 0.5625 -3.578125 0.5625q-1.453125 0 -2.828125 -0.265625q-1.375 -0.265625 -2.484375 -0.734375l0 -3.234375q0.609375 0.3125 1.296875 0.5625q0.6875 0.25 1.421875 0.421875q0.734375 0.1875 1.46875 0.265625q0.75 0.09375 1.453125 0.09375q2.234375 0 3.5 -1.40625q1.265625 -1.40625 1.265625 -4.140625l0 -16.5625l-9.609375 0l0 -2.8125l13.046875 0zm-2.046875 -8.21875q0.5625 0 1.046875 0.203125q0.5 0.203125 0.859375 0.578125q0.359375 0.359375 0.5625 0.859375q0.203125 0.484375 0.203125 1.03125q0 0.5625 -0.203125 1.046875q-0.203125 0.46875 -0.5625 0.84375q-0.359375 0.375 -0.859375 0.578125q-0.484375 0.203125 -1.046875 0.203125q-0.5625 0 -1.0625 -0.203125q-0.484375 -0.203125 -0.84375 -0.578125q-0.359375 -0.375 -0.5625 -0.84375q-0.203125 -0.484375 -0.203125 -1.046875q0 -0.546875 0.203125 -1.03125q0.203125 -0.5 0.5625 -0.859375q0.359375 -0.375 0.84375 -0.578125q0.5 -0.203125 1.0625 -0.203125zm27.835938 17.859375q0 2.296875 -0.65625 4.203125q-0.640625 1.890625 -1.859375 3.25q-1.203125 1.359375 -2.9375 2.125q-1.734375 0.75 -3.953125 0.75q-2.109375 0 -3.78125 -0.65625q-1.65625 -0.65625 -2.828125 -1.921875q-1.15625 -1.28125 -1.78125 -3.15625q-0.609375 -1.875 -0.609375 -4.3125q0 -2.28125 0.640625 -4.171875q0.65625 -1.890625 1.859375 -3.234375q1.21875 -1.359375 2.953125 -2.109375q1.734375 -0.765625 3.9375 -0.765625q2.109375 0 3.78125 0.65625q1.671875 0.65625 2.828125 1.921875q1.171875 1.25 1.78125 3.125q0.625 1.875 0.625 4.296875zm-3.484375 0.15625q0 -1.8125 -0.40625 -3.171875q-0.390625 -1.359375 -1.140625 -2.265625q-0.734375 -0.90625 -1.796875 -1.359375q-1.0625 -0.46875 -2.375 -0.46875q-1.53125 0 -2.609375 0.609375q-1.078125 0.59375 -1.78125 1.59375q-0.6875 0.984375 -1.015625 2.3125q-0.3125 1.3125 -0.3125 2.75q0 1.828125 0.390625 3.203125q0.40625 1.359375 1.140625 2.265625q0.75 0.90625 1.796875 1.375q1.0625 0.453125 2.390625 0.453125q1.515625 0 2.59375 -0.59375q1.09375 -0.609375 1.78125 -1.59375q0.703125 -1.0 1.015625 -2.3125q0.328125 -1.328125 0.328125 -2.796875zm24.164062 9.8125l-3.046875 0l-0.125 -3.171875q-0.875 1.015625 -1.671875 1.703125q-0.78125 0.671875 -1.5625 1.078125q-0.78125 0.40625 -1.578125 0.578125q-0.78125 0.171875 -1.671875 0.171875q-3.015625 0 -4.5625 -1.78125q-1.546875 -1.78125 -1.546875 -5.375l0 -12.8125l3.40625 0l0 12.53125q0 4.515625 3.390625 4.515625q0.625 0 1.21875 -0.1875q0.59375 -0.1875 1.25 -0.640625q0.65625 -0.453125 1.40625 -1.234375q0.75 -0.78125 1.6875 -1.984375l0 -13.0l3.40625 0l0 19.609375zm7.0234375 -19.609375l3.109375 0l0.09375 3.609375q1.75 -2.09375 3.4375 -3.03125q1.6875 -0.9375 3.40625 -0.9375q3.046875 0 4.609375 1.984375q1.578125 1.96875 1.46875 5.859375l-3.4375 0q0.046875 -2.578125 -0.765625 -3.734375q-0.796875 -1.171875 -2.359375 -1.171875q-0.6875 0 -1.390625 0.25q-0.6875 0.234375 -1.421875 0.78125q-0.734375 0.53125 -1.5625 1.375q-0.8125 0.828125 -1.75 2.03125l0 12.59375l-3.4375 0l0 -19.609375zm21.195312 0l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375zm34.585938 19.609375l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm16.445312 -15.890625l-5.8125 0l0 -2.78125l9.25 0l0 24.765625l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -21.984375zm14.3046875 15.421875q0 -2.5 0.6875 -4.4375q0.6875 -1.953125 1.9375 -3.28125q1.265625 -1.34375 3.03125 -2.03125q1.765625 -0.703125 3.9375 -0.703125q0.9375 0 1.84375 0.125q0.90625 0.109375 1.796875 0.359375l0 -8.234375l3.40625 0l0 27.59375l-3.046875 0l-0.109375 -3.71875q-1.421875 2.078125 -3.09375 3.078125q-1.65625 1.0 -3.59375 1.0q-1.671875 0 -2.953125 -0.703125q-1.28125 -0.71875 -2.140625 -1.984375q-0.84375 -1.28125 -1.28125 -3.078125q-0.421875 -1.796875 -0.421875 -3.984375zm3.484375 -0.21875q0 3.546875 1.046875 5.296875q1.046875 1.75 2.953125 1.75q1.296875 0 2.71875 -1.140625q1.4375 -1.15625 3.03125 -3.421875l0 -9.109375q-0.84375 -0.390625 -1.859375 -0.59375q-1.015625 -0.203125 -2.015625 -0.203125q-2.765625 0 -4.328125 1.796875q-1.546875 1.796875 -1.546875 5.625z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m384.43832 365.43317l0 84.02911l64.10538 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="4.0" stroke-linejoin="round" stroke-linecap="butt" d="m384.43832 365.43317l0 84.02911l40.105347 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="4.0" stroke-linecap="butt" d="m424.54367 456.0692l18.152405 -6.6069336l-18.152405 -6.6069336z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m741.2126 368.01575l134.00775 0l0 78.99213l-24.999878 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m741.2126 368.01575l134.00775 0l0 78.99213l-21.572754 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m853.6476 447.00787l1.1245728 -1.1245728l-3.0897827 1.1245728l3.0897827 1.1245728z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m775.2126 330.57874l78.897644 0l0 25.795288l-78.897644 0z" fill-rule="evenodd"></path><path fill="#000000" d="m785.57196 357.49875l0 -13.59375l2.609375 0l0 13.59375l-2.609375 0zm4.5895386 -5.0625q0 -1.296875 0.640625 -2.515625q0.640625 -1.21875 1.8125 -1.859375q1.171875 -0.640625 2.609375 -0.640625q2.25 0 3.671875 1.453125q1.421875 1.453125 1.421875 3.671875q0 2.234375 -1.4375 3.703125q-1.4375 1.46875 -3.625 1.46875q-1.359375 0 -2.59375 -0.609375q-1.21875 -0.609375 -1.859375 -1.796875q-0.640625 -1.1875 -0.640625 -2.875zm2.671875 0.140625q0 1.46875 0.6875 2.25q0.703125 0.765625 1.71875 0.765625q1.015625 0 1.703125 -0.765625q0.703125 -0.78125 0.703125 -2.265625q0 -1.453125 -0.703125 -2.234375q-0.6875 -0.78125 -1.703125 -0.78125q-1.015625 0 -1.71875 0.78125q-0.6875 0.78125 -0.6875 2.25zm9.083496 5.578125l2.96875 0.359375q0.078125 0.515625 0.34375 0.703125q0.375 0.28125 1.171875 0.28125q1.03125 0 1.53125 -0.296875q0.34375 -0.203125 0.515625 -0.65625q0.125 -0.328125 0.125 -1.203125l0 -1.4375q-1.171875 1.59375 -2.953125 1.59375q-1.984375 0 -3.140625 -1.671875q-0.90625 -1.328125 -0.90625 -3.3125q0 -2.46875 1.1875 -3.78125q1.1875 -1.3125 2.96875 -1.3125q1.828125 0 3.015625 1.609375l0 -1.390625l2.4375 0l0 8.84375q0 1.75 -0.296875 2.609375q-0.28125 0.859375 -0.796875 1.34375q-0.515625 0.5 -1.390625 0.78125q-0.859375 0.28125 -2.1875 0.28125q-2.515625 0 -3.5625 -0.859375q-1.046875 -0.859375 -1.046875 -2.171875q0 -0.140625 0.015625 -0.3125zm2.328125 -5.78125q0 1.5625 0.609375 2.296875q0.609375 0.71875 1.5 0.71875q0.953125 0 1.609375 -0.734375q0.65625 -0.75 0.65625 -2.21875q0 -1.53125 -0.640625 -2.265625q-0.625 -0.75 -1.578125 -0.75q-0.9375 0 -1.546875 0.734375q-0.609375 0.71875 -0.609375 2.21875z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m41.230972 582.7428l256.31494 0l0 89.322815l-256.31494 0z" fill-rule="evenodd"></path><path fill="#000000" d="m66.63722 610.5334l0 19.25q0 2.0625 -0.59375 3.65625q-0.578125 1.59375 -1.671875 2.6875q-1.09375 1.09375 -2.6875 1.65625q-1.59375 0.5625 -3.578125 0.5625q-1.453125 0 -2.828125 -0.265625q-1.375 -0.265625 -2.484375 -0.734375l0 -3.234375q0.609375 0.3125 1.296875 0.5625q0.6875 0.25 1.421875 0.421875q0.734375 0.1875 1.46875 0.265625q0.75 0.09375 1.453125 0.09375q2.234375 0 3.5 -1.40625q1.265625 -1.40625 1.265625 -4.140625l0 -16.5625l-9.609375 0l0 -2.8125l13.046875 0zm-2.046875 -8.21875q0.5625 0 1.046875 0.203125q0.5 0.203125 0.859375 0.578125q0.359375 0.359375 0.5625 0.859375q0.203125 0.484375 0.203125 1.03125q0 0.5625 -0.203125 1.046875q-0.203125 0.46875 -0.5625 0.84375q-0.359375 0.375 -0.859375 0.578125q-0.484375 0.203125 -1.046875 0.203125q-0.5625 0 -1.0625 -0.203125q-0.484375 -0.203125 -0.84375 -0.578125q-0.359375 -0.375 -0.5625 -0.84375q-0.203125 -0.484375 -0.203125 -1.046875q0 -0.546875 0.203125 -1.03125q0.203125 -0.5 0.5625 -0.859375q0.359375 -0.375 0.84375 -0.578125q0.5 -0.203125 1.0625 -0.203125zm27.835938 17.859375q0 2.296875 -0.65625 4.203125q-0.640625 1.890625 -1.859375 3.25q-1.203125 1.359375 -2.9375 2.125q-1.734375 0.75 -3.953125 0.75q-2.109375 0 -3.78125 -0.65625q-1.65625 -0.65625 -2.828125 -1.921875q-1.15625 -1.28125 -1.78125 -3.15625q-0.609375 -1.875 -0.609375 -4.3125q0 -2.28125 0.640625 -4.171875q0.65625 -1.890625 1.859375 -3.234375q1.21875 -1.359375 2.953125 -2.109375q1.734375 -0.765625 3.9375 -0.765625q2.109375 0 3.78125 0.65625q1.671875 0.65625 2.828125 1.921875q1.171875 1.25 1.78125 3.125q0.625 1.875 0.625 4.296875zm-3.484375 0.15625q0 -1.8125 -0.40625 -3.171875q-0.390625 -1.359375 -1.140625 -2.265625q-0.734375 -0.90625 -1.796875 -1.359375q-1.0625 -0.46875 -2.375 -0.46875q-1.53125 0 -2.609375 0.609375q-1.078125 0.59375 -1.78125 1.59375q-0.6875 0.984375 -1.015625 2.3125q-0.3125 1.3125 -0.3125 2.75q0 1.828125 0.390625 3.203125q0.40625 1.359375 1.140625 2.265625q0.75 0.90625 1.796875 1.375q1.0625 0.453125 2.390625 0.453125q1.515625 0 2.59375 -0.59375q1.09375 -0.609375 1.78125 -1.59375q0.703125 -1.0 1.015625 -2.3125q0.328125 -1.328125 0.328125 -2.796875zm24.164062 9.8125l-3.046875 0l-0.125 -3.171875q-0.875 1.015625 -1.671875 1.703125q-0.78125 0.671875 -1.5625 1.078125q-0.78125 0.40625 -1.578125 0.578125q-0.78125 0.171875 -1.671875 0.171875q-3.015625 0 -4.5625 -1.78125q-1.546875 -1.78125 -1.546875 -5.375l0 -12.8125l3.40625 0l0 12.53125q0 4.515625 3.390625 4.515625q0.625 0 1.21875 -0.1875q0.59375 -0.1875 1.25 -0.640625q0.65625 -0.453125 1.40625 -1.234375q0.75 -0.78125 1.6875 -1.984375l0 -13.0l3.40625 0l0 19.609375zm7.0234375 -19.609375l3.109375 0l0.09375 3.609375q1.75 -2.09375 3.4375 -3.03125q1.6875 -0.9375 3.40625 -0.9375q3.046875 0 4.609375 1.984375q1.578125 1.96875 1.46875 5.859375l-3.4375 0q0.046875 -2.578125 -0.765625 -3.734375q-0.796875 -1.171875 -2.359375 -1.171875q-0.6875 0 -1.390625 0.25q-0.6875 0.234375 -1.421875 0.78125q-0.734375 0.53125 -1.5625 1.375q-0.8125 0.828125 -1.75 2.03125l0 12.59375l-3.4375 0l0 -19.609375zm21.195312 0l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375zm34.585938 19.609375l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm16.445312 -15.890625l-5.8125 0l0 -2.78125l9.25 0l0 24.765625l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -21.984375zm30.539062 24.09375q-1.328125 0.5 -2.734375 0.75q-1.390625 0.25 -2.875 0.25q-4.640625 0 -7.15625 -2.515625q-2.5 -2.53125 -2.5 -7.375q0 -2.328125 0.71875 -4.21875q0.71875 -1.890625 2.03125 -3.234375q1.3125 -1.359375 3.125 -2.09375q1.8125 -0.734375 4.0 -0.734375q1.53125 0 2.859375 0.21875q1.328125 0.21875 2.53125 0.703125l0 3.25q-1.265625 -0.671875 -2.59375 -0.96875q-1.3125 -0.3125 -2.71875 -0.3125q-1.3125 0 -2.46875 0.5q-1.15625 0.5 -2.046875 1.4375q-0.875 0.9375 -1.390625 2.296875q-0.5 1.34375 -0.5 3.03125q0 3.5625 1.71875 5.328125q1.734375 1.765625 4.8125 1.765625q1.375 0 2.671875 -0.3125q1.3125 -0.3125 2.515625 -0.9375l0 3.171875zm22.554688 0.4375q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm12.882797 -24.53125l-5.8124847 0l0 -2.78125l9.249985 0l0 24.765625l5.828125 0l0 2.828125l-15.718735 0l0 -2.828125l6.4531097 0l0 -21.984375z" fill-rule="nonzero"></path><path fill="#cfe2f3" d="m765.4252 499.62335l0 0c0 3.450714 23.725403 6.248047 52.992126 6.248047c29.266785 0 52.992126 -2.7973328 52.992126 -6.248047l0 37.48822c0 3.4506836 -23.725342 6.247986 -52.992126 6.247986c-29.266724 0 -52.992126 -2.7973022 -52.992126 -6.247986z" fill-rule="evenodd"></path><path fill="#e2edf7" d="m765.4252 499.62335l0 0c0 -3.4506836 23.725403 -6.2480164 52.992126 -6.2480164c29.266785 0 52.992126 2.7973328 52.992126 6.2480164l0 0c0 3.450714 -23.725342 6.248047 -52.992126 6.248047c-29.266724 0 -52.992126 -2.7973328 -52.992126 -6.248047z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m871.4094 499.62335l0 0c0 3.450714 -23.725342 6.248047 -52.992126 6.248047c-29.266724 0 -52.992126 -2.7973328 -52.992126 -6.248047l0 0c0 -3.4506836 23.725403 -6.2480164 52.992126 -6.2480164c29.266785 0 52.992126 2.7973328 52.992126 6.2480164l0 37.48822c0 3.4506836 -23.725342 6.247986 -52.992126 6.247986c-29.266724 0 -52.992126 -2.7973022 -52.992126 -6.247986l0 -37.48822" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m871.4094 499.62335l0 0c0 3.450714 -23.725342 6.248047 -52.992126 6.248047c-29.266724 0 -52.992126 -2.7973328 -52.992126 -6.248047l0 0c0 -3.4506836 23.725403 -6.2480164 52.992126 -6.2480164c29.266785 0 52.992126 2.7973328 52.992126 6.2480164l0 37.48822c0 3.4506836 -23.725342 6.247986 -52.992126 6.247986c-29.266724 0 -52.992126 -2.7973022 -52.992126 -6.247986l0 -37.48822" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m658.77167 483.58005l0 34.80313l106.64563 0" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m658.77167 483.58005l0 34.80313l103.21857 0" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m761.99023 518.3832l-1.1245728 1.1246338l3.0897827 -1.1246338l-3.0897827 -1.1245728z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m666.93176 483.8294l78.897644 0l0 25.795258l-78.897644 0z" fill-rule="evenodd"></path><path fill="#000000" d="m676.3849 507.9369l2.609375 -0.390625q0.171875 0.75 0.671875 1.15625q0.515625 0.390625 1.4375 0.390625q1.0 0 1.515625 -0.375q0.34375 -0.265625 0.34375 -0.703125q0 -0.296875 -0.1875 -0.484375q-0.1875 -0.1875 -0.875 -0.34375q-3.140625 -0.703125 -4.0 -1.265625q-1.15625 -0.796875 -1.15625 -2.21875q0 -1.28125 1.0 -2.15625q1.015625 -0.875 3.140625 -0.875q2.03125 0 3.0 0.65625q0.984375 0.65625 1.359375 1.953125l-2.453125 0.453125q-0.15625 -0.578125 -0.609375 -0.875q-0.4375 -0.3125 -1.25 -0.3125q-1.03125 0 -1.46875 0.296875q-0.296875 0.203125 -0.296875 0.515625q0 0.28125 0.25 0.484375q0.359375 0.25 2.4375 0.734375q2.078125 0.46875 2.90625 1.15625q0.828125 0.6875 0.828125 1.9375q0 1.359375 -1.140625 2.328125q-1.125 0.96875 -3.34375 0.96875q-2.015625 0 -3.1875 -0.8125q-1.171875 -0.8125 -1.53125 -2.21875zm13.235107 -4.03125l-2.359375 -0.4375q0.390625 -1.421875 1.359375 -2.109375q0.984375 -0.6875 2.90625 -0.6875q1.734375 0 2.59375 0.421875q0.859375 0.40625 1.203125 1.046875q0.34375 0.625 0.34375 2.328125l-0.03125 3.046875q0 1.296875 0.125 1.921875q0.125 0.609375 0.46875 1.3125l-2.578125 0q-0.09375 -0.265625 -0.25 -0.765625q-0.0625 -0.234375 -0.09375 -0.3125q-0.65625 0.65625 -1.421875 0.984375q-0.765625 0.3125 -1.625 0.3125q-1.515625 0 -2.40625 -0.8125q-0.875 -0.828125 -0.875 -2.09375q0 -0.84375 0.390625 -1.484375q0.40625 -0.65625 1.125 -1.0q0.71875 -0.359375 2.078125 -0.625q1.828125 -0.328125 2.53125 -0.625l0 -0.265625q0 -0.75 -0.375 -1.0625q-0.359375 -0.328125 -1.390625 -0.328125q-0.703125 0 -1.09375 0.28125q-0.390625 0.265625 -0.625 0.953125zm3.484375 2.109375q-0.5 0.171875 -1.59375 0.40625q-1.078125 0.234375 -1.40625 0.453125q-0.515625 0.359375 -0.515625 0.921875q0 0.546875 0.40625 0.953125q0.40625 0.390625 1.046875 0.390625q0.703125 0 1.34375 -0.46875q0.46875 -0.359375 0.625 -0.859375q0.09375 -0.34375 0.09375 -1.28125l0 -0.515625zm7.6569214 4.734375l-3.96875 -9.859375l2.734375 0l1.84375 5.03125l0.546875 1.6875q0.21875 -0.640625 0.265625 -0.84375q0.125 -0.421875 0.28125 -0.84375l1.875 -5.03125l2.671875 0l-3.90625 9.859375l-2.34375 0zm13.360107 -3.140625l2.609375 0.4375q-0.5 1.4375 -1.59375 2.1875q-1.078125 0.734375 -2.703125 0.734375q-2.5625 0 -3.796875 -1.671875q-0.96875 -1.34375 -0.96875 -3.40625q0 -2.4375 1.265625 -3.828125q1.28125 -1.390625 3.25 -1.390625q2.1875 0 3.453125 1.453125q1.28125 1.453125 1.234375 4.453125l-6.53125 0q0.015625 1.15625 0.625 1.8125q0.609375 0.640625 1.5 0.640625q0.609375 0 1.03125 -0.328125q0.421875 -0.34375 0.625 -1.09375zm0.15625 -2.625q-0.03125 -1.140625 -0.59375 -1.71875q-0.546875 -0.59375 -1.34375 -0.59375q-0.859375 0 -1.40625 0.625q-0.5625 0.609375 -0.546875 1.6875l3.890625 0z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m297.54593 627.4042l520.88184 0l0 -84.031494" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m297.54593 627.4042l520.88184 0l0 -80.60437" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m818.4278 546.7998l1.1246338 1.1245728l-1.1246338 -3.0897827l-1.1245728 3.0897827z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m479.05774 592.35956l105.98425 0l0 25.795288l-105.98425 0z" fill-rule="evenodd"></path><path fill="#000000" d="m491.9171 619.2796l-2.609375 0l0 -9.859375l2.421875 0l0 1.40625q0.625 -0.984375 1.109375 -1.296875q0.5 -0.328125 1.140625 -0.328125q0.890625 0 1.71875 0.5l-0.8125 2.265625q-0.65625 -0.421875 -1.21875 -0.421875q-0.546875 0 -0.9375 0.296875q-0.375 0.296875 -0.59375 1.09375q-0.21875 0.78125 -0.21875 3.296875l0 3.046875zm10.463409 -3.140625l2.609375 0.4375q-0.5 1.4375 -1.59375 2.1875q-1.078125 0.734375 -2.703125 0.734375q-2.5625 0 -3.796875 -1.671875q-0.96875 -1.34375 -0.96875 -3.40625q0 -2.4375 1.265625 -3.828125q1.28125 -1.390625 3.25 -1.390625q2.1875 0 3.453125 1.453125q1.28125 1.453125 1.234375 4.453125l-6.53125 0q0.015625 1.15625 0.625 1.8125q0.609375 0.640625 1.5 0.640625q0.609375 0 1.03125 -0.328125q0.421875 -0.34375 0.625 -1.09375zm0.15625 -2.625q-0.03125 -1.140625 -0.59375 -1.71875q-0.546875 -0.59375 -1.34375 -0.59375q-0.859375 0 -1.40625 0.625q-0.5625 0.609375 -0.546875 1.6875l3.890625 0zm6.469452 -1.078125l-2.359375 -0.4375q0.390625 -1.421875 1.359375 -2.109375q0.984375 -0.6875 2.90625 -0.6875q1.734375 0 2.59375 0.421875q0.859375 0.40625 1.203125 1.046875q0.34375 0.625 0.34375 2.328125l-0.03125 3.046875q0 1.296875 0.125 1.921875q0.125 0.609375 0.46875 1.3125l-2.578125 0q-0.09375 -0.265625 -0.25 -0.765625q-0.0625 -0.234375 -0.09375 -0.3125q-0.65625 0.65625 -1.421875 0.984375q-0.765625 0.3125 -1.625 0.3125q-1.515625 0 -2.40625 -0.8125q-0.875 -0.828125 -0.875 -2.09375q0 -0.84375 0.390625 -1.484375q0.40625 -0.65625 1.125 -1.0q0.71875 -0.359375 2.078125 -0.625q1.828125 -0.328125 2.53125 -0.625l0 -0.265625q0 -0.75 -0.375 -1.0625q-0.359375 -0.328125 -1.390625 -0.328125q-0.703125 0 -1.09375 0.28125q-0.390625 0.265625 -0.625 0.953125zm3.484375 2.109375q-0.5 0.171875 -1.59375 0.40625q-1.078125 0.234375 -1.40625 0.453125q-0.515625 0.359375 -0.515625 0.921875q0 0.546875 0.40625 0.953125q0.40625 0.390625 1.046875 0.390625q0.703125 0 1.34375 -0.46875q0.46875 -0.359375 0.625 -0.859375q0.09375 -0.34375 0.09375 -1.28125l0 -0.515625zm13.985107 4.734375l-2.421875 0l0 -1.453125q-0.609375 0.84375 -1.4375 1.265625q-0.8125 0.40625 -1.640625 0.40625q-1.703125 0 -2.921875 -1.359375q-1.203125 -1.375 -1.203125 -3.828125q0 -2.5 1.171875 -3.796875q1.1875 -1.3125 2.984375 -1.3125q1.65625 0 2.859375 1.375l0 -4.890625l2.609375 0l0 13.59375zm-6.96875 -5.140625q0 1.578125 0.4375 2.28125q0.640625 1.015625 1.765625 1.015625q0.90625 0 1.53125 -0.765625q0.625 -0.765625 0.625 -2.28125q0 -1.703125 -0.609375 -2.4375q-0.609375 -0.75 -1.5625 -0.75q-0.9375 0 -1.5625 0.734375q-0.625 0.734375 -0.625 2.203125z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m767.69293 509.62466l101.44879 0l0 22.582672l-101.44879 0z" fill-rule="evenodd"></path><path fill="#000000" d="m811.80084 525.716l0 -0.84375q-0.640625 1.0 -1.890625 1.0q-0.796875 0 -1.484375 -0.4375q-0.671875 -0.453125 -1.046875 -1.25q-0.375 -0.796875 -0.375 -1.828125q0 -1.015625 0.34375 -1.828125q0.34375 -0.828125 1.015625 -1.265625q0.671875 -0.4375 1.5 -0.4375q0.609375 0 1.078125 0.265625q0.484375 0.25 0.78125 0.65625l0 -3.34375l1.140625 0l0 9.3125l-1.0625 0zm-3.609375 -3.359375q0 1.296875 0.53125 1.9375q0.546875 0.640625 1.296875 0.640625q0.75 0 1.265625 -0.609375q0.53125 -0.625 0.53125 -1.875q0 -1.390625 -0.53125 -2.03125q-0.53125 -0.65625 -1.3125 -0.65625q-0.765625 0 -1.28125 0.625q-0.5 0.625 -0.5 1.96875zm6.6468506 -4.625l0 -1.328125l1.140625 0l0 1.328125l-1.140625 0zm0 7.984375l0 -6.734375l1.140625 0l0 6.734375l-1.140625 0zm2.5079956 -2.015625l1.125 -0.171875q0.09375 0.671875 0.53125 1.046875q0.4375 0.359375 1.21875 0.359375q0.78125 0 1.15625 -0.3125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.34375 -0.609375q-0.234375 -0.15625 -1.171875 -0.390625q-1.25 -0.3125 -1.734375 -0.546875q-0.484375 -0.234375 -0.734375 -0.640625q-0.25 -0.40625 -0.25 -0.90625q0 -0.453125 0.203125 -0.828125q0.203125 -0.390625 0.5625 -0.640625q0.265625 -0.203125 0.71875 -0.328125q0.46875 -0.140625 1.0 -0.140625q0.78125 0 1.375 0.234375q0.609375 0.21875 0.890625 0.609375q0.296875 0.390625 0.40625 1.046875l-1.125 0.15625q-0.078125 -0.53125 -0.4375 -0.8125q-0.359375 -0.296875 -1.03125 -0.296875q-0.78125 0 -1.125 0.265625q-0.34375 0.25 -0.34375 0.609375q0 0.21875 0.140625 0.390625q0.140625 0.1875 0.4375 0.3125q0.171875 0.0625 1.015625 0.28125q1.21875 0.328125 1.6875 0.53125q0.484375 0.203125 0.75 0.609375q0.28125 0.390625 0.28125 0.96875q0 0.578125 -0.34375 1.078125q-0.328125 0.5 -0.953125 0.78125q-0.625 0.28125 -1.421875 0.28125q-1.3125 0 -2.0 -0.546875q-0.6875 -0.546875 -0.875 -1.625zm7.1171875 2.015625l0 -9.3125l1.140625 0l0 5.3125l2.703125 -2.734375l1.484375 0l-2.578125 2.5l2.84375 4.234375l-1.40625 0l-2.234375 -3.453125l-0.8125 0.78125l0 2.671875l-1.140625 0z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m690.89764 166.7441l247.52753 0l0 63.37007l-247.52753 0z" fill-rule="evenodd"></path><path fill="#000000" d="m717.007 214.14409l0 -14.078125q0 -0.921875 -0.078125 -1.5q-0.0625 -0.59375 -0.203125 -0.9375q-0.140625 -0.34375 -0.375 -0.46875q-0.21875 -0.140625 -0.546875 -0.140625q-0.390625 0 -0.734375 0.234375q-0.328125 0.234375 -0.71875 0.765625q-0.375 0.515625 -0.828125 1.390625q-0.453125 0.859375 -1.078125 2.140625l0 12.59375l-3.109375 0l0 -13.71875q0 -1.0625 -0.078125 -1.71875q-0.0625 -0.671875 -0.21875 -1.046875q-0.140625 -0.375 -0.375 -0.5q-0.234375 -0.140625 -0.5625 -0.140625q-0.34375 0 -0.65625 0.203125q-0.3125 0.1875 -0.703125 0.703125q-0.375 0.5 -0.84375 1.375q-0.46875 0.875 -1.109375 2.25l0 12.59375l-3.125 0l0 -19.609375l2.59375 0l0.15625 3.734375q0.5 -1.125 0.984375 -1.90625q0.484375 -0.78125 0.984375 -1.25q0.515625 -0.484375 1.078125 -0.703125q0.578125 -0.234375 1.28125 -0.234375q1.59375 0 2.40625 1.046875q0.828125 1.03125 0.828125 3.203125q0.46875 -1.015625 0.90625 -1.8125q0.453125 -0.796875 0.96875 -1.328125q0.515625 -0.53125 1.140625 -0.8125q0.625 -0.296875 1.453125 -0.296875q3.6875 0 3.6875 5.6875l0 14.28125l-3.125 0zm20.601562 0l-0.078125 -2.640625q-1.59375 1.578125 -3.25 2.296875q-1.640625 0.703125 -3.46875 0.703125q-1.671875 0 -2.875 -0.4375q-1.1875 -0.4375 -1.953125 -1.1875q-0.765625 -0.75 -1.140625 -1.765625q-0.359375 -1.015625 -0.359375 -2.203125q0 -2.953125 2.203125 -4.625q2.203125 -1.671875 6.5 -1.671875l4.0625 0l0 -1.71875q0 -1.734375 -1.125 -2.78125q-1.109375 -1.046875 -3.390625 -1.046875q-1.65625 0 -3.28125 0.375q-1.609375 0.375 -3.328125 1.0625l0 -3.078125q0.65625 -0.234375 1.4375 -0.453125q0.796875 -0.21875 1.671875 -0.390625q0.875 -0.1875 1.828125 -0.296875q0.96875 -0.109375 1.9375 -0.109375q1.78125 0 3.203125 0.390625q1.4375 0.390625 2.421875 1.203125q0.984375 0.796875 1.5 2.015625q0.53125 1.203125 0.53125 2.84375l0 13.515625l-3.046875 0zm-0.359375 -8.921875l-4.328125 0q-1.265625 0 -2.1875 0.25q-0.90625 0.25 -1.5 0.71875q-0.578125 0.46875 -0.875 1.125q-0.28125 0.65625 -0.28125 1.46875q0 0.578125 0.171875 1.09375q0.1875 0.515625 0.578125 0.921875q0.390625 0.390625 1.015625 0.625q0.625 0.234375 1.515625 0.234375q1.171875 0 2.6875 -0.703125q1.515625 -0.71875 3.203125 -2.265625l0 -3.46875zm24.992188 8.203125q-1.328125 0.5 -2.734375 0.75q-1.390625 0.25 -2.875 0.25q-4.640625 0 -7.15625 -2.515625q-2.5 -2.53125 -2.5 -7.375q0 -2.328125 0.71875 -4.21875q0.71875 -1.890625 2.03125 -3.234375q1.3125 -1.359375 3.125 -2.09375q1.8125 -0.734375 4.0 -0.734375q1.53125 0 2.859375 0.21875q1.328125 0.21875 2.53125 0.703125l0 3.25q-1.265625 -0.671875 -2.59375 -0.96875q-1.3125 -0.3125 -2.71875 -0.3125q-1.3125 0 -2.46875 0.5q-1.15625 0.5 -2.046875 1.4375q-0.875 0.9375 -1.390625 2.296875q-0.5 1.34375 -0.5 3.03125q0 3.5625 1.71875 5.328125q1.734375 1.765625 4.8125 1.765625q1.375 0 2.671875 -0.3125q1.3125 -0.3125 2.515625 -0.9375l0 3.171875zm22.523438 0.71875l-3.40625 0l0 -12.515625q0 -2.265625 -0.84375 -3.390625q-0.84375 -1.125 -2.4375 -1.125q-0.671875 0 -1.28125 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.40625 1.234375q-0.765625 0.78125 -1.75 1.953125l0 13.015625l-3.40625 0l0 -27.59375l3.40625 0l0 7.984375l-0.125 3.078125q0.796875 -0.953125 1.5625 -1.609375q0.78125 -0.65625 1.546875 -1.0625q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.1875 1.65625 -0.1875q2.9375 0 4.53125 1.796875q1.609375 1.78125 1.609375 5.375l0 12.796875zm12.9140625 -16.796875l-5.8125 0l0 -2.8125l9.25 0l0 16.78125l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -13.96875zm1.1875 -11.03125q0.5625 0 1.046875 0.203125q0.5 0.203125 0.859375 0.578125q0.359375 0.359375 0.5625 0.84375q0.203125 0.484375 0.203125 1.046875q0 0.546875 -0.203125 1.03125q-0.203125 0.484375 -0.5625 0.859375q-0.359375 0.375 -0.859375 0.578125q-0.484375 0.203125 -1.046875 0.203125q-0.5625 0 -1.0625 -0.203125q-0.484375 -0.203125 -0.84375 -0.578125q-0.359375 -0.375 -0.5625 -0.859375q-0.203125 -0.484375 -0.203125 -1.03125q0 -0.5625 0.203125 -1.046875q0.203125 -0.484375 0.5625 -0.84375q0.359375 -0.375 0.84375 -0.578125q0.5 -0.203125 1.0625 -0.203125zm14.1171875 8.21875l3.03125 0l0.140625 3.15625q0.859375 -1.015625 1.65625 -1.6875q0.796875 -0.671875 1.5625 -1.078125q0.78125 -0.40625 1.578125 -0.578125q0.796875 -0.171875 1.65625 -0.171875q3.03125 0 4.578125 1.796875q1.5625 1.78125 1.5625 5.375l0 12.796875l-3.40625 0l0 -12.515625q0 -2.3125 -0.859375 -3.40625q-0.859375 -1.109375 -2.546875 -1.109375q-0.625 0 -1.234375 0.1875q-0.59375 0.1875 -1.234375 0.640625q-0.640625 0.453125 -1.390625 1.234375q-0.75 0.78125 -1.6875 1.953125l0 13.015625l-3.40625 0l0 -19.609375zm38.554688 8.765625q0 0.71875 -0.015625 1.21875q-0.015625 0.484375 -0.0625 0.90625l-13.765625 0q0 3.015625 1.671875 4.625q1.6875 1.609375 4.84375 1.609375q0.859375 0 1.71875 -0.0625q0.859375 -0.078125 1.65625 -0.1875q0.8125 -0.125 1.546875 -0.265625q0.734375 -0.140625 1.359375 -0.328125l0 2.796875q-1.390625 0.390625 -3.140625 0.640625q-1.75 0.25 -3.625 0.25q-2.515625 0 -4.34375 -0.6875q-1.8125 -0.6875 -2.96875 -1.984375q-1.15625 -1.296875 -1.71875 -3.1875q-0.5625 -1.890625 -0.5625 -4.265625q0 -2.078125 0.59375 -3.921875q0.609375 -1.84375 1.75 -3.234375q1.140625 -1.40625 2.796875 -2.21875q1.65625 -0.828125 3.765625 -0.828125q2.0625 0 3.640625 0.65625q1.578125 0.640625 2.65625 1.828125q1.09375 1.171875 1.640625 2.859375q0.5625 1.6875 0.5625 3.78125zm-3.53125 -0.484375q0.0625 -1.3125 -0.25 -2.390625q-0.3125 -1.09375 -0.96875 -1.875q-0.65625 -0.78125 -1.640625 -1.21875q-0.96875 -0.4375 -2.265625 -0.4375q-1.109375 0 -2.03125 0.4375q-0.90625 0.421875 -1.578125 1.203125q-0.65625 0.78125 -1.078125 1.875q-0.40625 1.09375 -0.5 2.40625l10.3125 0zm24.195312 10.609375q-1.328125 0.5 -2.734375 0.75q-1.390625 0.25 -2.875 0.25q-4.640625 0 -7.15625 -2.515625q-2.5 -2.53125 -2.5 -7.375q0 -2.328125 0.71875 -4.21875q0.71875 -1.890625 2.03125 -3.234375q1.3125 -1.359375 3.125 -2.09375q1.8125 -0.734375 4.0 -0.734375q1.53125 0 2.859375 0.21875q1.328125 0.21875 2.53125 0.703125l0 3.25q-1.265625 -0.671875 -2.59375 -0.96875q-1.3125 -0.3125 -2.71875 -0.3125q-1.3125 0 -2.46875 0.5q-1.15625 0.5 -2.046875 1.4375q-0.875 0.9375 -1.390625 2.296875q-0.5 1.34375 -0.5 3.03125q0 3.5625 1.71875 5.328125q1.734375 1.765625 4.8125 1.765625q1.375 0 2.671875 -0.3125q1.3125 -0.3125 2.515625 -0.9375l0 3.171875zm22.554688 0.4375q-1.140625 0.296875 -2.375 0.421875q-1.234375 0.140625 -2.5 0.140625q-3.6875 0 -5.515625 -1.671875q-1.8125 -1.671875 -1.8125 -5.140625l0 -10.234375l-5.484375 0l0 -2.84375l5.484375 0l0 -5.390625l3.40625 -0.875l0 6.265625l8.796875 0l0 2.84375l-8.796875 0l0 9.96875q0 2.109375 1.109375 3.15625q1.125 1.046875 3.3125 1.046875q0.9375 0 2.046875 -0.140625q1.125 -0.15625 2.328125 -0.46875l0 2.921875zm12.8828125 -24.53125l-5.8125 0l0 -2.78125l9.25 0l0 24.765625l5.828125 0l0 2.828125l-15.71875 0l0 -2.828125l6.453125 0l0 -21.984375z" fill-rule="nonzero"></path><path fill="#000000" fill-opacity="0.0" d="m814.66144 166.7441l0 -30.103012l-78.39374 0l0 -30.117462" fill-rule="evenodd"></path><path stroke="#000000" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m814.66144 166.7441l0 -30.103012l-78.39374 0l0 -26.690376" fill-rule="evenodd"></path><path fill="#000000" stroke="#000000" stroke-width="1.0" stroke-linecap="butt" d="m736.2677 109.95071l1.1245728 1.124588l-1.1245728 -3.0897675l-1.1245728 3.0897675z" fill-rule="evenodd"></path><path fill="#000000" fill-opacity="0.0" d="m814.66144 131.98163l106.64563 0l0 25.795273l-106.64563 0z" fill-rule="evenodd"></path><path fill="#000000" d="m824.8333 149.04225l2.40625 0l0 1.359375q1.28125 -1.578125 3.0625 -1.578125q0.953125 0 1.640625 0.390625q0.703125 0.390625 1.140625 1.1875q0.65625 -0.796875 1.40625 -1.1875q0.75 -0.390625 1.609375 -0.390625q1.078125 0 1.828125 0.453125q0.75 0.4375 1.125 1.28125q0.265625 0.640625 0.265625 2.046875l0 6.296875l-2.609375 0l0 -5.625q0 -1.46875 -0.265625 -1.90625q-0.359375 -0.546875 -1.109375 -0.546875q-0.546875 0 -1.03125 0.34375q-0.484375 0.328125 -0.703125 0.96875q-0.203125 0.640625 -0.203125 2.03125l0 4.734375l-2.609375 0l0 -5.40625q0 -1.4375 -0.140625 -1.84375q-0.140625 -0.421875 -0.4375 -0.625q-0.28125 -0.203125 -0.78125 -0.203125q-0.609375 0 -1.09375 0.328125q-0.484375 0.3125 -0.6875 0.9375q-0.203125 0.609375 -0.203125 2.03125l0 4.78125l-2.609375 0l0 -9.859375zm18.729004 3.015625l-2.359375 -0.4375q0.390625 -1.421875 1.359375 -2.109375q0.984375 -0.6875 2.90625 -0.6875q1.734375 0 2.59375 0.421875q0.859375 0.40625 1.203125 1.046875q0.34375 0.625 0.34375 2.328125l-0.03125 3.046875q0 1.296875 0.125 1.921875q0.125 0.609375 0.46875 1.3125l-2.578125 0q-0.09375 -0.265625 -0.25 -0.765625q-0.0625 -0.234375 -0.09375 -0.3125q-0.65625 0.65625 -1.421875 0.984375q-0.765625 0.3125 -1.625 0.3125q-1.515625 0 -2.40625 -0.8125q-0.875 -0.828125 -0.875 -2.09375q0 -0.84375 0.390625 -1.484375q0.40625 -0.65625 1.125 -1.0q0.71875 -0.359375 2.078125 -0.625q1.828125 -0.328125 2.53125 -0.625l0 -0.265625q0 -0.75 -0.375 -1.0625q-0.359375 -0.328125 -1.390625 -0.328125q-0.703125 0 -1.09375 0.28125q-0.390625 0.265625 -0.625 0.953125zm3.484375 2.109375q-0.5 0.171875 -1.59375 0.40625q-1.078125 0.234375 -1.40625 0.453125q-0.515625 0.359375 -0.515625 0.921875q0 0.546875 0.40625 0.953125q0.40625 0.390625 1.046875 0.390625q0.703125 0 1.34375 -0.46875q0.46875 -0.359375 0.625 -0.859375q0.09375 -0.34375 0.09375 -1.28125l0 -0.515625zm13.906982 4.734375l-2.609375 0l0 -5.03125q0 -1.59375 -0.171875 -2.0625q-0.15625 -0.46875 -0.53125 -0.71875q-0.375 -0.265625 -0.90625 -0.265625q-0.6875 0 -1.234375 0.375q-0.53125 0.359375 -0.734375 0.984375q-0.1875 0.609375 -0.1875 2.25l0 4.46875l-2.609375 0l0 -9.859375l2.421875 0l0 1.453125q1.296875 -1.671875 3.25 -1.671875q0.859375 0 1.578125 0.3125q0.71875 0.3125 1.078125 0.796875q0.359375 0.484375 0.5 1.09375q0.15625 0.609375 0.15625 1.75l0 6.125zm4.38031 -6.84375l-2.359375 -0.4375q0.390625 -1.421875 1.359375 -2.109375q0.984375 -0.6875 2.90625 -0.6875q1.734375 0 2.59375 0.421875q0.859375 0.40625 1.203125 1.046875q0.34375 0.625 0.34375 2.328125l-0.03125 3.046875q0 1.296875 0.125 1.921875q0.125 0.609375 0.46875 1.3125l-2.578125 0q-0.09375 -0.265625 -0.25 -0.765625q-0.0625 -0.234375 -0.09375 -0.3125q-0.65625 0.65625 -1.421875 0.984375q-0.765625 0.3125 -1.625 0.3125q-1.515625 0 -2.40625 -0.8125q-0.875 -0.828125 -0.875 -2.09375q0 -0.84375 0.390625 -1.484375q0.40625 -0.65625 1.125 -1.0q0.71875 -0.359375 2.078125 -0.625q1.828125 -0.328125 2.53125 -0.625l0 -0.265625q0 -0.75 -0.375 -1.0625q-0.359375 -0.328125 -1.390625 -0.328125q-0.703125 0 -1.09375 0.28125q-0.390625 0.265625 -0.625 0.953125zm3.484375 2.109375q-0.5 0.171875 -1.59375 0.40625q-1.078125 0.234375 -1.40625 0.453125q-0.515625 0.359375 -0.515625 0.921875q0 0.546875 0.40625 0.953125q0.40625 0.390625 1.046875 0.390625q0.703125 0 1.34375 -0.46875q0.46875 -0.359375 0.625 -0.859375q0.09375 -0.34375 0.09375 -1.28125l0 -0.515625zm4.7038574 5.390625l2.96875 0.359375q0.078125 0.515625 0.34375 0.703125q0.375 0.28125 1.171875 0.28125q1.03125 0 1.53125 -0.296875q0.34375 -0.203125 0.515625 -0.65625q0.125 -0.328125 0.125 -1.203125l0 -1.4375q-1.171875 1.59375 -2.953125 1.59375q-1.984375 0 -3.140625 -1.671875q-0.90625 -1.328125 -0.90625 -3.3125q0 -2.46875 1.1875 -3.78125q1.1875 -1.3125 2.96875 -1.3125q1.828125 0 3.015625 1.609375l0 -1.390625l2.4375 0l0 8.84375q0 1.75 -0.296875 2.609375q-0.28125 0.859375 -0.796875 1.34375q-0.515625 0.5 -1.390625 0.78125q-0.859375 0.28125 -2.1875 0.28125q-2.515625 0 -3.5625 -0.859375q-1.046875 -0.859375 -1.046875 -2.171875q0 -0.140625 0.015625 -0.3125zm2.328125 -5.78125q0 1.5625 0.609375 2.296875q0.609375 0.71875 1.5 0.71875q0.953125 0 1.609375 -0.734375q0.65625 -0.75 0.65625 -2.21875q0 -1.53125 -0.640625 -2.265625q-0.625 -0.75 -1.578125 -0.75q-0.9375 0 -1.546875 0.734375q-0.609375 0.71875 -0.609375 2.21875zm15.005371 1.984375l2.609375 0.4375q-0.5 1.4375 -1.59375 2.1875q-1.078125 0.734375 -2.703125 0.734375q-2.5625 0 -3.796875 -1.671875q-0.96875 -1.34375 -0.96875 -3.40625q0 -2.4375 1.265625 -3.828125q1.28125 -1.390625 3.25 -1.390625q2.1875 0 3.453125 1.453125q1.28125 1.453125 1.234375 4.453125l-6.53125 0q0.015625 1.15625 0.625 1.8125q0.609375 0.640625 1.5 0.640625q0.609375 0 1.03125 -0.328125q0.421875 -0.34375 0.625 -1.09375zm0.15625 -2.625q-0.03125 -1.140625 -0.59375 -1.71875q-0.546875 -0.59375 -1.34375 -0.59375q-0.859375 0 -1.40625 0.625q-0.5625 0.609375 -0.546875 1.6875l3.890625 0z" fill-rule="nonzero"></path></g></svg>
+
diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index 14a1247a0f..e27d6dc6b4 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -2,6 +2,8 @@
 
 `rkt` is designed to cooperate with init systems, like [`systemd`][systemd]. rkt implements a simple CLI that directly executes processes, and does not interpose a long-running daemon, so the lifecycle of rkt pods can be directly managed by systemd. Standard systemd idioms like `systemctl start` and `systemctl stop` work out of the box.
 
+![rkt-systemd-interaction](rkt-systemd-interaction.svg)
+
 In the shell excerpts below, a `#` prompt indicates commands that require root privileges, while the `$` prompt denotes commands issued as an unprivileged user.
 
 ## systemd-run

From 03f994bf157af1608266cfdd5af62c3353222a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 3 Nov 2017 17:40:26 +0100
Subject: [PATCH 1228/1304] Documentation: add block device docs

Document how to use block devices inside a rkt container.

Add examples for sshfs, CUDA, and formatting disks.
---
 Documentation/block-devices.md   | 138 +++++++++++++++++++++++++++++++
 Documentation/security.md        |   1 +
 Documentation/subcommands/run.md |   5 ++
 3 files changed, 144 insertions(+)
 create mode 100644 Documentation/block-devices.md

diff --git a/Documentation/block-devices.md b/Documentation/block-devices.md
new file mode 100644
index 0000000000..d131506a4b
--- /dev/null
+++ b/Documentation/block-devices.md
@@ -0,0 +1,138 @@
+## Using block devices in rkt
+
+Using block devices in containers is usually restricted via the [device cgroup controller](https://www.kernel.org/doc/Documentation/cgroup-v1/devices.txt).
+This is done to prevent users from doing dangerous things like creating a physical disk device via `mknod` and writing data to it.
+
+```
+# ls -l /dev/nvme0n1p1
+brw-rw---- 1 root disk 259, 1 Nov  3 15:13 /dev/nvme0n1p1
+# rkt run --interactive kinvolk.io/aci/busybox
+/ # mknod /dev/nvme0n1p1 b 259 1
+mknod: /dev/nvme0n1p1: Operation not permitted
+```
+
+When accessing devices from inside the container is actually desired, users can set up rkt volumes and mounts.
+In that case, rkt will automatically configure the device cgroup controller for the container without the aforementioned restriction.
+
+```
+# rkt run --volume disk,kind=host,source=/dev/nvme0n1p1,readOnly=true \
+          --interactive \
+          kinvolk.io/aci/busybox \
+          --mount volume=disk,target=/dev/nvme0n1p1
+/ # ls -l /dev/nvme0n1p1
+brw-rw----    1 root     disk      259,   1 Nov  3 14:13 /dev/nvme0n1p1
+/ # head /dev/nvme0n1p1 -c11
+�X�mkfs.fat/ # 
+/ # echo 1 > /dev/nvme0n1p1
+/bin/sh: can't create /dev/nvme0n1p1: Operation not permitted
+```
+
+Note that the volume is read-only, so we can't write to it because rkt sets a read-only policy in the device cgroup.
+
+For completeness, users can also use `--insecure-options=paths`, which disables any block device protection.
+Then, users can just create devices with `mknod`:
+
+```
+# rkt run --insecure-options=paths \
+          --interactive \
+          kinvolk.io/aci/busybox
+/ # mknod /dev/nvme0n1p1 b 259 1
+/ # ls -l /dev/nvme0n1p1
+brw-r--r--    1 root     root      259,   1 Nov  3 15:43 /dev/nvme0n1p1
+```
+
+## Examples
+
+Here are some real-world examples that use block devices.
+
+### FUSE + SSHFS
+
+SSHFS allows mounting remote directories over ssh.
+In this example we'll mount a remote directory on `/mnt` inside the container.
+For this to work, we need to be able to mount and umount filesystems inside the container so we pass the appropriate seccomp and capability options:
+
+```
+# rkt run --insecure-options=image \
+          --dns=8.8.8.8 \
+          --interactive \
+          --volume fuse,kind=host,source=/dev/fuse \
+          docker://ubuntu \
+          --mount volume=fuse,target=/dev/fuse \
+          --seccomp mode=retain,@rkt/default-whitelist,mount,umount2 \
+          --caps-retain=CAP_SETUID,CAP_SETGID,CAP_DAC_OVERRIDE,CAP_CHOWN,CAP_FOWNER,CAP_SYS_ADMIN
+root@rkt-f2098164-b207-41d0-b62b-745659725aee:/# apt-get update && apt-get install sshfs
+[...]
+root@rkt-f2098164-b207-41d0-b62b-745659725aee:/# sshfs user@host.com: /mnt
+The authenticity of host 'host.com (12.34.56.78)' can't be established.
+ECDSA key fingerprint is SHA256:L1/2LPI1J6/YlDzbvH+/SF5gamNusPDSqnCSmaNlolc.
+Are you sure you want to continue connecting (yes/no)? yes
+user@host.com's password: 
+root@rkt-f2098164-b207-41d0-b62b-745659725aee:/# cat /mnt/remote-file.txt
+HELLO FROM REMOTE
+root@rkt-f2098164-b207-41d0-b62b-745659725aee:/# fusermount -u /mnt/
+```
+
+### NVIDIA CUDA
+
+CUDA allows using GPUs for general purpose processing and it needs access to the gpu devices.
+In this example we also mount the CUDA SDK binaries and the host libraries, and we do some substitution magic to have appc-compliant volume names:
+
+```
+# rkt run --insecure-options=image \
+          $(for f in /dev/nvidia* /opt/bin/nvidia* /usr/lib/; \
+                do echo "--volume $(basename $f | sed 's/\./-/g'),source=$f,kind=host \
+                         --mount volume=$(basename $f | sed 's/\./-/g'),target=$f"; \
+                done) \
+          docker://nvidia/cuda:latest \
+          --exec=/opt/bin/nvidia-smi
+Wed Sep  7 21:25:22 2016
++-----------------------------------------------------------------------------+
+| NVIDIA-SMI 367.35                 Driver Version: 367.35                    |
+|-------------------------------+----------------------+----------------------+
+| GPU  Name        Persistence-M| Bus-Id        Disp.A | Volatile Uncorr. ECC |
+| Fan  Temp  Perf  Pwr:Usage/Cap|         Memory-Usage | GPU-Util  Compute M. |
+|===============================+======================+======================|
+|   0  GeForce GTX 780     Off  | 0000:01:00.0     N/A |                  N/A |
+| 33%   61C    P2    N/A /  N/A |    474MiB /  3018MiB |     N/A      Default |
++-------------------------------+----------------------+----------------------+
+
++-----------------------------------------------------------------------------+
+| Processes:                                                       GPU Memory |
+|  GPU       PID  Type  Process name                               Usage      |
+|=============================================================================|
+|    0                  Not Supported                                         |
++-----------------------------------------------------------------------------+
+```
+
+### Format /dev/sdX
+
+You can mount a disk block device (for example, an external USB stick) and format it inside a container.
+Like before, if you want to mount it inside the container, you need to pass the appropriate seccomp and capability options:
+
+```
+# rkt run --insecure-options=image \
+          --volume disk,kind=host,source=/dev/sda,readOnly=false \
+          --interactive \
+          docker://ubuntu \
+          --mount volume=disk,target=/dev/sda
+root@rkt-72bd9a93-2e89-4515-8b46-44e0e11c4c79:/# mkfs.ext4 /dev/sda
+mke2fs 1.42.13 (17-May-2015)
+/dev/sda contains a ext4 file system
+	last mounted on Fri Nov  3 17:15:56 2017
+Proceed anyway? (y,n) y
+Creating filesystem with 491520 4k blocks and 122880 inodes
+Filesystem UUID: 9ede01b1-e35b-46a0-b224-24e879973582
+Superblock backups stored on blocks:
+	32768, 98304, 163840, 229376, 294912
+
+Allocating group tables: done
+Writing inode tables: done
+Creating journal (8192 blocks): done
+Writing superblocks and filesystem accounting information: done
+
+root@rkt-72bd9a93-2e89-4515-8b46-44e0e11c4c79:/# mount /dev/sda /mnt/
+root@rkt-72bd9a93-2e89-4515-8b46-44e0e11c4c79:/# echo HELLO > /mnt/hi.txt
+root@rkt-72bd9a93-2e89-4515-8b46-44e0e11c4c79:/# cat /mnt/hi.txt
+HELLO
+root@rkt-72bd9a93-2e89-4515-8b46-44e0e11c4c79:/# umount /mnt/
+```
diff --git a/Documentation/security.md b/Documentation/security.md
index c356b2f0fc..ce925dff3a 100644
--- a/Documentation/security.md
+++ b/Documentation/security.md
@@ -19,6 +19,7 @@ Here are some security best practices:
 * **Use read-only volumes unless writing to them is necessary.**
 * If you use Linux v4.2 or older, **avoid sharing directories when tools on the host can move files outside the directory** (such as Nautilus moving directories to the trash bin when a user deletes it). This could expose the entire host filesystem to the container. See [moby/moby#12317 (comment)](https://github.com/moby/moby/issues/12317#issuecomment-92692061).
 * To avoid the previous point: **share a full filesystem instead of just a directory in a filesystem if possible**. For example, a mounted partition or some file mounted with `mount -o loop`.
+* **Sharing devices from the host to the container is generally not recommended**. If you need to do it, you can find examples in the [block devices documentation](block-devices.md).
 
 [aci-schema]: https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
 [rkt-run-subcommands]: subcommands/run.md#options
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 2896672494..fb6309bb8c 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -214,6 +214,11 @@ Here we set the recursive option to false to avoid making further mounts inside
 # rkt run --volume data,kind=host,source=/srv/data,readOnly=false,recursive=false example.com/app1
 ```
 
+#### Host Devices
+
+Using devices from the host inside the container in rkt works by just creating volumes with the source set to the particular device.
+You can find some examples in the [block devices documentation](../block-devices.md).
+
 #### Empty Volumes
 
 If you don't intend to persist the data and you just want to have a volume shared between all the apps in the pod, you can use an `empty` volume:

From c697c5ea1354684792bc818944b1f09dcd6ad651 Mon Sep 17 00:00:00 2001
From: root <rbalajis25@gmail.com>
Date: Wed, 22 Nov 2017 00:10:22 +0530
Subject: [PATCH 1229/1304] status: added read from uuid-file

---
 rkt/status.go | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/rkt/status.go b/rkt/status.go
index 4ba348e9e2..c1893e7ca1 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -30,7 +30,7 @@ import (
 
 var (
 	cmdStatus = &cobra.Command{
-		Use:   "status [--wait=bool|timeout] [--wait-ready=bool|timeout] UUID",
+		Use:   "status [--wait=bool|timeout] [--wait-ready=bool|timeout] --uuid-file=FILE | UUID",
 		Short: "Check the status of a rkt pod",
 		Long: `Prints assorted information about the pod such as its state, pid and exit status.
 
@@ -55,10 +55,25 @@ func init() {
 
 	cmdStatus.Flags().Lookup("wait").NoOptDefVal = "true"
 	cmdStatus.Flags().Lookup("wait-ready").NoOptDefVal = "true"
+	cmdStatus.Flags().StringVar(&flagUUIDFile, "uuid-file", "", "read pod UUID from file instead of argument")
 }
 
 func runStatus(cmd *cobra.Command, args []string) (exit int) {
-	if len(args) != 1 {
+	var podUUID string
+
+	switch {
+	case len(args) == 0 && flagUUIDFile != "":
+		UUID, err := pkgPod.ReadUUIDFromFile(flagUUIDFile)
+		if err != nil {
+			stderr.PrintE("unable to resolve UUID from file", err)
+			return 1
+		}
+		podUUID = UUID
+
+	case len(args) == 1 && flagUUIDFile == "":
+		podUUID = args[0]
+
+	default:
 		cmd.Usage()
 		return 254
 	}
@@ -74,8 +89,7 @@ func runStatus(cmd *cobra.Command, args []string) (exit int) {
 		cmd.Usage()
 		return 254
 	}
-
-	p, err := pkgPod.PodFromUUIDString(getDataDir(), args[0])
+	p, err := pkgPod.PodFromUUIDString(getDataDir(), podUUID)
 	if err != nil {
 		stderr.PrintE("problem retrieving pod", err)
 		return 254

From eb22bdd54838aa24571f1dc096c0d8c286fee1e7 Mon Sep 17 00:00:00 2001
From: root <rbalajis25@gmail.com>
Date: Sat, 25 Nov 2017 15:11:08 +0530
Subject: [PATCH 1230/1304] status: test added to check status from uuid file

---
 tests/rkt_status_test.go | 48 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 tests/rkt_status_test.go

diff --git a/tests/rkt_status_test.go b/tests/rkt_status_test.go
new file mode 100644
index 0000000000..3e606075e3
--- /dev/null
+++ b/tests/rkt_status_test.go
@@ -0,0 +1,48 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"testing"
+
+	"github.com/rkt/rkt/tests/testutils"
+)
+
+func TestUuidFile(t *testing.T) {
+	const imgName = "rkt-uuid-file-status-test"
+	imagePath := patchTestACI(fmt.Sprintf("%s.aci", imgName), fmt.Sprintf("--name=%s", imgName))
+	defer os.Remove(imagePath)
+
+	ctx := testutils.NewRktRunCtx()
+	defer ctx.Cleanup()
+
+	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
+	podUuid := runRktAndGetUUID(t, cmd)
+	tmpDir := mustTempDir(imgName)
+	defer os.RemoveAll(tmpDir)
+	uuidFile, err := ioutil.TempFile(tmpDir, "uuid-file")
+	if err != nil {
+		panic(fmt.Sprintf("Cannot create uuid-file: %v", err))
+	}
+	uuidFilePath := uuidFile.Name()
+	if err := ioutil.WriteFile(uuidFilePath, []byte(podUuid), 0600); err != nil {
+		panic(fmt.Sprintf("Cannot write pod uuid to uuid-file %v", err))
+	}
+	statusCmd := fmt.Sprintf("%s status --uuid-file=%s", ctx.Cmd(), uuidFilePath)
+	runRktAndCheckRegexOutput(t, statusCmd, "state=prepared")
+}

From b5493eef2e0afd8fab1bf623026190f714d1dd80 Mon Sep 17 00:00:00 2001
From: root <rbalajis25@gmail.com>
Date: Mon, 27 Nov 2017 18:47:47 +0530
Subject: [PATCH 1231/1304] trailing space removed

---
 tests/build-and-run-tests.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/build-and-run-tests.sh b/tests/build-and-run-tests.sh
index cbd336883e..ceacb87af2 100755
--- a/tests/build-and-run-tests.sh
+++ b/tests/build-and-run-tests.sh
@@ -28,9 +28,9 @@ function ciSkip {
     exit 0
 }
 
-# Finds the branching point of two commits. 
-# For example, let B and D be two commits, and their ancestry graph as A -> B, A -> C -> D. 
-# Given commits B and D, it returns A. 
+# Finds the branching point of two commits.
+# For example, let B and D be two commits, and their ancestry graph as A -> B, A -> C -> D.
+# Given commits B and D, it returns A.
 function getBranchingPoint {
     diff --old-line-format='' --new-line-format='' \
         <(git rev-list --first-parent "${1:-$1}") \
@@ -51,7 +51,7 @@ function semaphoreCIConfiguration {
     if [ -f /opt/change-go-version.sh ]; then
         . /opt/change-go-version.sh
         change-go-version 1.7
-        
+
 	# systemd v229 doesn't build on gcc-4.8, set the compiler to gcc-5
         export CC=gcc-5
     fi

From 555a7ea66011aa0df64db0b07bcead2b54a49d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 10 Nov 2017 15:43:35 +0100
Subject: [PATCH 1232/1304] examples: add postgresql container example

---
 .../postgres/build-postgres.sh                |  64 ++++++++
 .../postgres/postgres-prestart.sh             | 148 ++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100755 Documentation/build-container-examples/postgres/build-postgres.sh
 create mode 100755 Documentation/build-container-examples/postgres/postgres-prestart.sh

diff --git a/Documentation/build-container-examples/postgres/build-postgres.sh b/Documentation/build-container-examples/postgres/build-postgres.sh
new file mode 100755
index 0000000000..b45c23eabf
--- /dev/null
+++ b/Documentation/build-container-examples/postgres/build-postgres.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+set -e
+
+if [ "$EUID" -ne 0 ]; then
+    echo "This script uses functionality which requires root privileges"
+    exit 1
+fi
+
+PGDATA=/var/lib/postgresql/data
+
+# Start the build with an empty ACI
+acbuild --debug begin
+
+# In the event of the script exiting, end the build
+trap "{ export EXT=$?; acbuild --debug end && exit $EXT; }" EXIT
+
+# Name the ACI
+acbuild --debug set-name example.com/postgres
+
+# Based on alpine
+acbuild --debug dep add quay.io/coreos/alpine-sh
+
+# Install postgres and bash
+acbuild --debug run -- apk update
+acbuild --debug run -- apk add postgresql bash
+
+# Create postgres data directory
+acbuild --debug run -- mkdir -p $PGDATA
+acbuild --debug run -- chown -R postgres:postgres $PGDATA
+
+# Create postgres run directory
+acbuild --debug run -- mkdir -p /var/run/postgresql
+acbuild --debug run -- chown -R postgres:postgres /var/run/postgresql
+
+# Add a mount point for postgres data
+acbuild --debug mount add data $PGDATA
+
+# Add a mount point for custom initialization data
+acbuild --debug mount add custom-sql /customize.sql
+
+# Set PGDATA env variable
+acbuild --debug environment add PGDATA $PGDATA
+
+# Set user and group
+acbuild --debug set-user postgres
+acbuild --debug set-group postgres
+
+# Set postgres user, group, and test-db
+acbuild --debug environment add POSTGRES_USER rkt
+acbuild --debug environment add POSTGRES_PASSWORD rkt
+acbuild --debug environment add POSTGRES_DB rkt
+
+# Add pre-start hook that will set up the database
+acbuild --debug copy postgres-prestart.sh /root/postgres-prestart.sh
+acbuild --debug set-event-handler pre-start /root/postgres-prestart.sh postgres
+
+# Add postgres port
+acbuild --debug port add postgres tcp 5432
+
+# Run postgres server
+acbuild --debug set-exec postgres
+
+# Write the result
+acbuild --debug write --overwrite postgres-latest-linux-amd64.aci
diff --git a/Documentation/build-container-examples/postgres/postgres-prestart.sh b/Documentation/build-container-examples/postgres/postgres-prestart.sh
new file mode 100755
index 0000000000..9dfc35f6f0
--- /dev/null
+++ b/Documentation/build-container-examples/postgres/postgres-prestart.sh
@@ -0,0 +1,148 @@
+#!/bin/bash
+
+# Adapted from
+# https://github.com/docker-library/postgres/blob/b84ddd1/10/docker-entrypoint.sh
+# which is under MIT license.
+#
+# We don't do `exec "$@"` at the end because this script will be executed as a
+# pre-start hook (see `acbuild --debug set-event-handler pre-start` in
+# `build-postgres.sh`)
+
+set -e
+
+# usage: file_env VAR [DEFAULT]
+#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
+# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
+#  "$XYZ_DB_PASSWORD" from a file)
+file_env() {
+	local var="$1"
+	local fileVar="${var}_FILE"
+	local def="${2:-}"
+	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
+		echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+		exit 1
+	fi
+	local val="$def"
+	if [ "${!var:-}" ]; then
+		val="${!var}"
+	elif [ "${!fileVar:-}" ]; then
+		val="$(< "${!fileVar}")"
+	fi
+	export "$var"="$val"
+	unset "$fileVar"
+}
+
+if [ "${1:0:1}" = '-' ]; then
+	set -- postgres "$@"
+fi
+
+# allow the container to be started with `--user`
+if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then
+	mkdir -p "$PGDATA"
+	chown -R postgres "$PGDATA"
+	chmod 700 "$PGDATA"
+
+	mkdir -p /var/run/postgresql
+	chown -R postgres /var/run/postgresql
+	chmod 775 /var/run/postgresql
+
+	# Create the transaction log directory before initdb is run (below) so the directory is owned by the correct user
+	if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
+		mkdir -p "$POSTGRES_INITDB_XLOGDIR"
+		chown -R postgres "$POSTGRES_INITDB_XLOGDIR"
+		chmod 700 "$POSTGRES_INITDB_XLOGDIR"
+	fi
+
+	exec su postgres -c ""$BASH_SOURCE" "$@""
+fi
+
+if [ "$1" = 'postgres' ]; then
+	mkdir -p "$PGDATA"
+	chown -R "$(id -u)" "$PGDATA" 2>/dev/null || :
+	chmod 700 "$PGDATA" 2>/dev/null || :
+
+	# look specifically for PG_VERSION, as it is expected in the DB dir
+	if [ ! -s "$PGDATA/PG_VERSION" ]; then
+		file_env 'POSTGRES_INITDB_ARGS'
+		if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
+			export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --xlogdir $POSTGRES_INITDB_XLOGDIR"
+		fi
+		eval "initdb --username=postgres $POSTGRES_INITDB_ARGS"
+
+		# check password first so we can output the warning before postgres
+		# messes it up
+		file_env 'POSTGRES_PASSWORD'
+		if [ "$POSTGRES_PASSWORD" ]; then
+			pass="PASSWORD '$POSTGRES_PASSWORD'"
+			authMethod=md5
+		else
+			# The - option suppresses leading tabs but *not* spaces. :)
+			cat >&2 <<-'EOWARN'
+				****************************************************
+				WARNING: No password has been set for the database.
+				         This will allow anyone with access to the
+				         Postgres port to access your database. In
+				         rkt's default configuration, this is
+				         effectively any other container on the same
+				         system.
+				         Use "--set-env POSTGRES_PASSWORD=password" to set
+				         it in "rkt run".
+				****************************************************
+			EOWARN
+
+			pass=
+			authMethod=trust
+		fi
+
+		{
+			echo
+			echo "host all all all $authMethod"
+		} >> "$PGDATA/pg_hba.conf"
+
+		# internal start of server in order to allow set-up using psql-client
+		# does not listen on external TCP/IP and waits until start finishes
+		PGUSER="${PGUSER:-postgres}" \
+		pg_ctl -D "$PGDATA" \
+			-o "-c listen_addresses='localhost'" \
+			-w start
+
+		file_env 'POSTGRES_USER' 'postgres'
+		file_env 'POSTGRES_DB' "$POSTGRES_USER"
+
+		psql=( psql -v ON_ERROR_STOP=1 )
+
+		if [ "$POSTGRES_DB" != 'postgres' ]; then
+			"${psql[@]}" --username postgres <<-EOSQL
+				CREATE DATABASE "$POSTGRES_DB" ;
+			EOSQL
+			echo
+		fi
+
+		if [ "$POSTGRES_USER" = 'postgres' ]; then
+			op='ALTER'
+		else
+			op='CREATE'
+		fi
+		"${psql[@]}" --username postgres <<-EOSQL
+			$op USER "$POSTGRES_USER" WITH SUPERUSER $pass ;
+		EOSQL
+		echo
+
+		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
+
+		if [ -f /customize.sql ]; then
+			echo "Using file /customize.sql to configure database"
+			"${psql[@]}" -f /customize.sql
+		fi
+
+		PGUSER="${PGUSER:-postgres}" \
+		pg_ctl -D "$PGDATA" -m fast -w stop
+
+		# configure postgres to listen on every interface
+		sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /var/lib/postgresql/data/postgresql.conf
+
+		echo
+		echo 'PostgreSQL init process complete; ready for start up.'
+		echo
+	fi
+fi

From 7ec6806f87243d22e12566aac9a7f58f6fc54b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 24 Nov 2017 17:20:06 +0100
Subject: [PATCH 1233/1304] examples: add play-example app

---
 .../play-example/build-play-example.sh        | 46 +++++++++++++++++++
 .../play-example/custom.sql                   |  2 +
 .../play-example/wait-for-postgres.sh         | 16 +++++++
 3 files changed, 64 insertions(+)
 create mode 100755 Documentation/build-container-examples/play-example/build-play-example.sh
 create mode 100644 Documentation/build-container-examples/play-example/custom.sql
 create mode 100755 Documentation/build-container-examples/play-example/wait-for-postgres.sh

diff --git a/Documentation/build-container-examples/play-example/build-play-example.sh b/Documentation/build-container-examples/play-example/build-play-example.sh
new file mode 100755
index 0000000000..410327211b
--- /dev/null
+++ b/Documentation/build-container-examples/play-example/build-play-example.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -e
+
+if [ "$EUID" -ne 0 ]; then
+    echo "This script uses functionality which requires root privileges"
+    exit 1
+fi
+
+# Start the build with an empty ACI
+acbuild --debug begin docker://ubuntu:17.10
+
+# In the event of the script exiting, end the build
+trap "{ export EXT=$?; acbuild --debug end && exit $EXT; }" EXIT
+
+# Name the ACI
+acbuild --debug set-name example.com/play-example
+
+# Install java, psql, and git
+acbuild --debug run -- apt-get update
+acbuild --debug run -- apt-get -y install openjdk-8-jre openjdk-8-jdk git postgresql
+
+# Clone play example repo
+acbuild --debug run -- git clone https://github.com/ics-software-engineering/play-example-postgresql.git /play-example
+
+acbuild --debug run -- apt-get -y autoremove --purge git
+
+acbuild --debug run -- chown -R postgres:postgres /play-example
+
+STAGE_DIR=/play-example/target/universal/stage/
+TARGET_BIN="${STAGE_DIR}"/bin/play-example-postgresql
+
+# Build example
+acbuild --debug run -- /bin/bash -c 'cd /play-example && su postgres -c "./activator stage"'
+
+# Set user and group
+acbuild --debug set-user postgres
+acbuild --debug set-group postgres
+
+# Copy "wait for postgres" script
+acbuild --debug copy wait-for-postgres.sh /wait-for-postgres.sh
+
+# Run postgres server
+acbuild --debug set-exec /wait-for-postgres.sh 127.0.0.1 "${TARGET_BIN}"
+
+# Write the result
+acbuild --debug write --overwrite play-latest-linux-amd64.aci
diff --git a/Documentation/build-container-examples/play-example/custom.sql b/Documentation/build-container-examples/play-example/custom.sql
new file mode 100644
index 0000000000..834c5323ce
--- /dev/null
+++ b/Documentation/build-container-examples/play-example/custom.sql
@@ -0,0 +1,2 @@
+CREATE ROLE root SUPERUSER LOGIN;
+CREATE DATABASE play_example_postgresql;
diff --git a/Documentation/build-container-examples/play-example/wait-for-postgres.sh b/Documentation/build-container-examples/play-example/wait-for-postgres.sh
new file mode 100755
index 0000000000..b57a172bc1
--- /dev/null
+++ b/Documentation/build-container-examples/play-example/wait-for-postgres.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# wait-for-postgres.sh
+
+set -e
+
+host="$1"
+shift
+cmd="$@"
+
+until psql -h "$host" -U "postgres" -c '\q'; do
+  >&2 echo "Postgres is unavailable - sleeping"
+  sleep 10
+done
+
+>&2 echo "Postgres is up - executing command"
+exec $cmd

From 30da32ec38e6b7af5a3b4960ae50951e658e9cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 27 Nov 2017 12:41:46 +0100
Subject: [PATCH 1234/1304] examples: add README

---
 .../build-container-examples/README.md        | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 Documentation/build-container-examples/README.md

diff --git a/Documentation/build-container-examples/README.md b/Documentation/build-container-examples/README.md
new file mode 100644
index 0000000000..c967ca8756
--- /dev/null
+++ b/Documentation/build-container-examples/README.md
@@ -0,0 +1,74 @@
+# Build container examples
+
+This directory includes two examples of scripts that build ACI images.
+One is a generic [PostgreSQL][postgresql] image and the other is an example [Play Framework][play-framework] app that connects to a PostgreSQL database.
+The example Play Framework app expects a PostgreSQL database, so both images can be used in a single pod to make the example run.
+
+## PostgreSQL
+
+The PostgreSQL image is based on [Alpine Linux][alpine-linux] and defines two mounts, one for a PostgreSQL data directory that will be used if present, and another for an SQL script that can be used to initialize the database.
+By default, if no data is found in the PostgreSQL data directory, a database named `rkt` will be created with user and password set to `rkt` too.
+Then, the initialization SQL script will run.
+If a PostgreSQL data directory is found in the corresponding mount, it will be used instead.
+
+## Example Play Framework app
+
+This is a very simple [example Play Framework app][play-framework-example] that just prints the number of times a page is retrieved.
+This value is stored in a PostgreSQL database.
+
+## Build the images
+
+You can build the images by running their build scripts.
+They use [containers/build][containers-build] so you'll need to get the [latest release][build-release].
+Assuming a privileged shell is running in this directory.
+
+```
+# (cd postgres && ./build-postgres.sh)
+[...]
+# (cd play-example && ./build-play-example.sh)
+[...]
+```
+
+Once they're done building you should have an ACI image on each directory:
+
+```
+# ls */*.aci
+play-example/play-latest-linux-amd64.aci  postgres/postgres-latest-linux-amd64.aci
+```
+
+## Run the example
+
+You simply need to run rkt with a volume pointing to the play example SQL customization script.
+Assuming a privileged shell is running in this directory:
+
+```
+# rkt --insecure-options=image \
+      run \
+      --volume custom-sql,kind=host,source=$PWD/play-example/custom.sql \
+      postgres/postgres-latest-linux-amd64.aci \
+      play-example/play-latest-linux-amd64.aci
+```
+
+After it is running and initialized, you need to retrieve the pod IP address and you can access it on port 9000:
+
+```
+# rkt list
+UUID		APP		IMAGE NAME			STATE	CREATED		STARTED		NETWORKS
+a94b94eb	postgres	example.com/postgres		running	11 seconds ago	11 seconds ago	default:ip4=172.16.28.26
+		play-example	example.com/play-example:17.10						
+# curl 172.16.28.26:9000
+[...]
+This page has been retrieved 0 times.
+[...]
+# curl 172.16.28.26:9000
+[...]
+This page has been retrieved 1 times.
+[...]
+```
+
+[postgresql]: https://www.postgresql.org
+[play-framework]: https://www.playframework.com
+[alpine-linux]: https://alpinelinux.org
+[play-framework-example]: https://github.com/ics-software-engineering/play-example-postgresql
+[containers-build]: https://github.com/containers/build
+[build-release]: https://github.com/containers/build/releases

From ea8222f3d18f391dec823268bfa514ea42dc194c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 27 Nov 2017 12:43:18 +0100
Subject: [PATCH 1235/1304] examples: point to build-container-examples in
 getting started

---
 Documentation/getting-started-guide.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index 4533286e21..0607367f36 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -3,6 +3,8 @@
 The following guide will show you how to build and run a self-contained Go app using rkt, the reference implementation of the [App Container Specification][appc-spec].
 If you're not on Linux, you should do all of this inside [the rkt Vagrant][rkt-vagrant].
 
+For a more complex example, please check the [build container examples](build-container-examples/README.md).
+
 ## Create a hello go application
 
 ```go

From 5c75d41685a921e1bac21dee357e4774826c496e Mon Sep 17 00:00:00 2001
From: Steve Phillips <steve@tryingtobeawesome.com>
Date: Mon, 27 Nov 2017 09:33:56 -0800
Subject: [PATCH 1236/1304] signing-and-verification-guide.md: clarified
 gpg-batch file creation

---
 Documentation/signing-and-verification-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/signing-and-verification-guide.md b/Documentation/signing-and-verification-guide.md
index d80d15704a..7977034af6 100644
--- a/Documentation/signing-and-verification-guide.md
+++ b/Documentation/signing-and-verification-guide.md
@@ -20,7 +20,7 @@ If you have an existing gpg signing key skip to the [Signing the ACI](#signing-t
 
 ### Generate a gpg signing key
 
-Create a file named `gpg-batch`
+Create a file named `gpg-batch` with the following contents:
 
 ```
 %echo Generating a default key

From c4aea406cfacb7c101c8f25a243dc2f467c4e1c3 Mon Sep 17 00:00:00 2001
From: root <rbalajis25@gmail.com>
Date: Tue, 28 Nov 2017 10:55:16 +0530
Subject: [PATCH 1237/1304] --uuid-file flag added to the status documentation

---
 Documentation/subcommands/status.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/subcommands/status.md b/Documentation/subcommands/status.md
index 304fce76ab..f7d9f22c1d 100644
--- a/Documentation/subcommands/status.md
+++ b/Documentation/subcommands/status.md
@@ -28,6 +28,7 @@ Both options also accept a duration. To wait up to 10 seconds until the pod is f
 | --- | --- | --- | --- |
 | `--wait` |  `false` | `true` or `false` or duration | Toggle waiting for the pod to finish. |
 | `--wait-ready` |  `false` | `true` or `false` or duration | Toggle waiting until the pod is ready. |
+| `--uuid-file` | "" | UUID file | UUID of the pod. |
 
 ## Global options
 

From 884daf3079610be0689fc5f996cef1f919b8b23d Mon Sep 17 00:00:00 2001
From: Alban Crequy <alban@kinvolk.io>
Date: Mon, 27 Nov 2017 13:00:34 +0100
Subject: [PATCH 1238/1304] doc: OCI & appc/spec clarification

The documentation about OCI and appc created uncertainty for users, as
shown by the issues #3777 and #3745.

This is an attempt to clarify that although not much development is
happening in appc, rkt will not drop the ACI support.

Once this PR is merged, I would like to delete the project
https://github.com/rkt/rkt/projects/5 as it does not contain anything
and we have https://github.com/rkt/rkt/projects/4 to track the progress
of OCI native support.

Fixes https://github.com/rkt/rkt/issues/3777
Fixes https://github.com/rkt/rkt/issues/3745
---
 Documentation/app-container.md |  2 +-
 Documentation/proposals/oci.md |  2 ++
 ROADMAP.md                     | 13 ++++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index 0236477845..79aeb7a0c8 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -4,7 +4,7 @@
 
 rkt's native [image format](#aci) and [runtime environment](#pods) are those defined by the [specification][appc-spec].
 
-_Note that as of late 2016, appc is [no longer being actively developed](https://github.com/appc/spec#-disclaimer-), and future versions of rkt will instead [natively use OCI formats](https://github.com/rkt/rkt/projects/4)._
+_Note that as of late 2016, appc is [no longer being actively developed, other than minor tweaks](https://github.com/appc/spec#-disclaimer-). However, appc is fully functional and stable and will continue to be supported. Future versions of rkt might gain [native support of OCI formats](https://github.com/rkt/rkt/projects/4)._
 
 ## ACI
 
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 0fd66ede2a..499102eb12 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -35,6 +35,8 @@ Currently rkt does support ACI, Docker, and OCI images, but the conversion step
 It introduces CPU and I/O bound overhead and is bound by semantical differences between the formats. For these reasons native support of OCI images inside rkt is envisioned.
 
 The goal therefore is to support OCI images natively next to ACI.
+rkt will continue to support the ACI image format and distribution mechanism.
+There is currently no plans to remove that support.
 
 This document outlines the following necessary steps and references existing work to transition to native OCI image support in rkt:
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 3e3117ccf6..72aab107aa 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -8,9 +8,16 @@ rkt's version 1.0 release marks the command line user interface and on-disk data
 
 ## Ongoing projects
 
-- [Kubernetes CRI](https://github.com/rkt/rkt/projects/1): adapting rkt to offer first-class implementation of the Kubernetes Container Runtime Interface.
-- [OCI native support](https://github.com/rkt/rkt/projects/4): supporting OCI specs natively in rkt.
-- [appc phase-out](https://github.com/rkt/rkt/projects/5): following OCI evolution and stabilization, appc will be naturally deprecated and phased-out.
+### [Kubernetes CRI](https://github.com/rkt/rkt/projects/1)
+
+Adapting rkt to offer first-class implementation of the Kubernetes Container Runtime Interface.
+
+### [OCI native support](https://github.com/rkt/rkt/projects/4)
+
+Supporting OCI specs natively in rkt.
+Following OCI evolution and stabilization, it will become the preferred way over appc.
+However, rkt will continue to support the ACI image format and distribution mechanism.
+There is currently no plans to remove that support from rkt.
 
 ### Upcoming
 

From ccf3f17037eb2ac771005f32647fbbf58bff22e8 Mon Sep 17 00:00:00 2001
From: dungeonmaster18 <umesh4257@gmail.com>
Date: Mon, 4 Dec 2017 18:20:41 +0530
Subject: [PATCH 1239/1304] Fixed all the misspell.

---
 pkg/distribution/docker.go    |  2 +-
 pkg/pod/wait.go               |  2 +-
 rkt/prepare.go                |  2 +-
 rkt/run.go                    |  2 +-
 stage1/init/common/app.go     |  2 +-
 stage1/init/common/seccomp.go |  2 +-
 stage1/init/common/units.go   | 10 +++++-----
 tests/rkt_tests.go            |  2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkg/distribution/docker.go b/pkg/distribution/docker.go
index 43f5deb0de..175212959d 100644
--- a/pkg/distribution/docker.go
+++ b/pkg/distribution/docker.go
@@ -116,7 +116,7 @@ func (d *Docker) ReferenceURL() string {
 	return d.url
 }
 
-// SimpleDockerRef returns a simplyfied docker reference. This means removing
+// SimpleDockerRef returns a simplified docker reference. This means removing
 // the index url if it's the default docker registry (registry-1.docker.io),
 // removing the default repo (library) when using the default docker registry
 func SimpleDockerRef(p *d2acommon.ParsedDockerURL) string {
diff --git a/pkg/pod/wait.go b/pkg/pod/wait.go
index aa531dacd7..8701d3a0bb 100644
--- a/pkg/pod/wait.go
+++ b/pkg/pod/wait.go
@@ -36,7 +36,7 @@ func (p *Pod) WaitFinished(ctx context.Context) error {
 			// i.e. in pepare, run, exitedGarbage, garbage state.
 			return false
 		default:
-			// some error occured, bail out.
+			// some error occurred, bail out.
 			return true
 		}
 
diff --git a/rkt/prepare.go b/rkt/prepare.go
index 1fabed448e..173b5addbd 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -61,7 +61,7 @@ func init() {
 	cmdPrepare.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
 	cmdPrepare.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
 	cmdPrepare.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
-	cmdPrepare.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for all the apps in the form key=value, this will be overriden by --environment")
+	cmdPrepare.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for all the apps in the form key=value, this will be overridden by --environment")
 	cmdPrepare.Flags().Var(&flagEnvFromFile, "set-env-file", "the path to an environment variables file")
 	cmdPrepare.Flags().BoolVar(&flagStoreOnly, "store-only", false, "use only available images in the store (do not discover or download from remote URLs)")
 	cmdPrepare.Flags().MarkDeprecated("store-only", "please use --pull-policy=never")
diff --git a/rkt/run.go b/rkt/run.go
index ab41214756..ef6c795d0b 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -138,7 +138,7 @@ func init() {
 	cmdRun.Flags().BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
 	cmdRun.Flags().BoolVar(&flagNoOverlay, "no-overlay", false, "disable overlay filesystem")
 	cmdRun.Flags().BoolVar(&flagPrivateUsers, "private-users", false, "run within user namespaces.")
-	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for all the apps in the form key=value, this will be overriden by --environment")
+	cmdRun.Flags().Var(&flagExplicitEnv, "set-env", "environment variable to set for all the apps in the form key=value, this will be overridden by --environment")
 	cmdRun.Flags().Var(&flagEnvFromFile, "set-env-file", "path to an environment variables file")
 	cmdRun.Flags().BoolVar(&flagInteractive, "interactive", false, "run pod interactively. If true, only one image may be supplied.")
 	cmdRun.Flags().Var(&flagDNS, "dns", "name servers to write in /etc/resolv.conf. Pass 'host' to use host's resolv.conf. Pass 'none' to ignore CNI DNS config")
diff --git a/stage1/init/common/app.go b/stage1/init/common/app.go
index e97cb6b461..3b3489b7b0 100644
--- a/stage1/init/common/app.go
+++ b/stage1/init/common/app.go
@@ -33,7 +33,7 @@ import (
 
 // preparedApp contains some internal state needed to actually run an app.
 // We add this intermediate step to prevent unit file generation from being
-// totally unwieldly.
+// totally unwieldy.
 type preparedApp struct {
 	app             *schema.RuntimeApp
 	uid             uint32
diff --git a/stage1/init/common/seccomp.go b/stage1/init/common/seccomp.go
index bda5cd9838..9666d0d947 100644
--- a/stage1/init/common/seccomp.go
+++ b/stage1/init/common/seccomp.go
@@ -122,7 +122,7 @@ func seccompUnitOptions(opts []*unit.UnitOption, sf *seccompFilter) ([]*unit.Uni
 	case ModeBlacklist:
 		filterPrefix = sdBlacklistPrefix
 	default:
-		return nil, fmt.Errorf("unkown filter mode %v", sf.mode)
+		return nil, fmt.Errorf("unknown filter mode %v", sf.mode)
 	}
 
 	// SystemCallFilter options are written down one entry per line, because
diff --git a/stage1/init/common/units.go b/stage1/init/common/units.go
index 832152e85f..c790ae3063 100644
--- a/stage1/init/common/units.go
+++ b/stage1/init/common/units.go
@@ -348,10 +348,10 @@ func (uw *UnitWriter) SetupAppIO(p *stage1commontypes.Pod, ra *schema.RuntimeApp
 	return opts
 }
 
-// UnitWriter is the type that writes systemd units preserving the first previously occured error.
+// UnitWriter is the type that writes systemd units preserving the first previously occurred error.
 // Any method of this type can be invoked multiple times without error checking.
 // If a previous invocation generated an error, any invoked method will be skipped.
-// If an error occured during method invocations, it can be retrieved using Error().
+// If an error occurred during method invocations, it can be retrieved using Error().
 type UnitWriter struct {
 	err error
 	p   *stage1commontypes.Pod
@@ -363,7 +363,7 @@ func NewUnitWriter(p *stage1commontypes.Pod) *UnitWriter {
 }
 
 // WriteUnit writes a systemd unit in the given path with the given unit options
-// if no previous error occured.
+// if no previous error occurred.
 func (uw *UnitWriter) WriteUnit(path string, errmsg string, opts ...*unit.UnitOption) {
 	if uw.err != nil {
 		return
@@ -387,7 +387,7 @@ func (uw *UnitWriter) WriteUnit(path string, errmsg string, opts ...*unit.UnitOp
 }
 
 // writeShutdownService writes a shutdown.service unit with the given unit options
-// if no previous error occured.
+// if no previous error occurred.
 // exec specifies how systemctl should be invoked, i.e. ExecStart, or ExecStop.
 func (uw *UnitWriter) writeShutdownService(exec string, opts ...*unit.UnitOption) {
 	if uw.err != nil {
@@ -449,7 +449,7 @@ func (uw *UnitWriter) Activate(unit, wantPath string) {
 	}
 }
 
-// error returns the first error that occured during write* invocations.
+// error returns the first error that occurred during write* invocations.
 func (uw *UnitWriter) Error() error {
 	return uw.err
 }
diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index 172236dd53..dab81d60e1 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -1031,7 +1031,7 @@ type retry struct {
 
 // Retry retries the given function f n times with a delay t between invocations
 // until no error is returned from f or n is exceeded.
-// The last occured error is returned.
+// The last occurred error is returned.
 func (r retry) Retry(f func() error) error {
 	var err error
 

From 1bab12ff50a39b2495607a05e177948731d881ff Mon Sep 17 00:00:00 2001
From: dungeonmaster18 <umesh4257@gmail.com>
Date: Mon, 4 Dec 2017 18:26:23 +0530
Subject: [PATCH 1240/1304] Added go report card badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 32c90a8ad5..46258e3cf5 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![godoc](https://godoc.org/github.com/rkt/rkt?status.svg)](http://godoc.org/github.com/rkt/rkt)
 [![Build Status (Travis)](https://travis-ci.org/rkt/rkt.svg?branch=master)](https://travis-ci.org/rkt/rkt)
 [![Build Status (SemaphoreCI)](https://semaphoreci.com/api/v1/rkt/rkt/branches/master/badge.svg)](https://semaphoreci.com/rkt/rkt)
+[![Go Report Card](https://goreportcard.com/badge/github.com/rkt/rkt)](https://goreportcard.com/report/github.com/rkt/rkt)
 
 ![rkt Logo](logos/rkt-horizontal-color.png)
 

From 754e71ec5d4a9398f78b365abe32c46e8aff3e5d Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <pskamruk@mirantis.com>
Date: Thu, 14 Dec 2017 11:46:26 +0100
Subject: [PATCH 1241/1304] Small update in docs

This commit provides changed urls after s/appc/containernetworking/
and after extracting plugins into separate project.
---
 Documentation/networking/examples-bridge.md     | 2 +-
 Documentation/networking/overriding-defaults.md | 4 ++--
 Documentation/networking/overview.md            | 6 +++---
 README.md                                       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Documentation/networking/examples-bridge.md b/Documentation/networking/examples-bridge.md
index 7ced15a1bf..f137bd3f95 100644
--- a/Documentation/networking/examples-bridge.md
+++ b/Documentation/networking/examples-bridge.md
@@ -49,5 +49,5 @@ default via 10.2.0.1 dev eth0
 Note that the _[default-restricted][default-restricted]_ network has been loaded in addition to the requested network.
 
 
-[cni-bridge]: https://github.com/appc/cni/blob/master/Documentation/bridge.md
+[cni-bridge]: https://github.com/containernetworking/plugins/blob/master/plugins/main/bridge/README.md
 [default-restricted]: overview.md#the-default-restricted-network
diff --git a/Documentation/networking/overriding-defaults.md b/Documentation/networking/overriding-defaults.md
index 8ceac79fd8..0d6b7ae2a1 100644
--- a/Documentation/networking/overriding-defaults.md
+++ b/Documentation/networking/overriding-defaults.md
@@ -45,6 +45,6 @@ This is not documented yet.
 Please follow CNI issue [#56][cni-56] to track the progress of the documentation.
 
 
-[cni-56]: https://github.com/appc/cni/issues/56
-[cni-plugin-parameters]: https://github.com/appc/cni/blob/master/SPEC.md#parameters
+[cni-56]: https://github.com/containernetworking/cni/issues/56
+[cni-plugin-parameters]: https://github.com/containernetworking/cni/blob/master/SPEC.md#parameters
 [overview]: overview.md
diff --git a/Documentation/networking/overview.md b/Documentation/networking/overview.md
index feac5d6921..cb9182e0d8 100644
--- a/Documentation/networking/overview.md
+++ b/Documentation/networking/overview.md
@@ -355,9 +355,9 @@ This is documented in [Socket-activated service][socket-activated].
 * [Overriding defaults][overriding]
 
 
-[cni]: https://github.com/appc/cni
-[cni-dhcp]: https://github.com/appc/cni/blob/master/Documentation/dhcp.md
-[cni-flannel]: https://github.com/appc/cni/blob/master/Documentation/flannel.md
+[cni]: https://github.com/containernetworking/cni
+[cni-dhcp]: https://github.com/containernetworking/plugins/blob/master/plugins/ipam/dhcp/README.md
+[cni-flannel]: https://github.com/containernetworking/plugins/blob/master/plugins/meta/flannel/README.md
 [dns]: dns.md
 [examples-bridge]: examples-bridge.md
 [ipvlan]: https://www.kernel.org/doc/Documentation/networking/ipvlan.txt
diff --git a/README.md b/README.md
index 32c90a8ad5..d5d3658a2b 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Some of rkt's key features and goals include:
 [networking]: Documentation/networking.md
 [kvm]: Documentation/running-kvm-stage1.md
 [rkt-and-appc]: Documentation/app-container.md
-[cni]: https://github.com/appc/cni
+[cni]: https://github.com/containernetworking/cni
 [selinux]: Documentation/selinux.md
 [tpm]: Documentation/devel/tpm.md
 [oci-image-spec]: https://github.com/opencontainers/image-spec

From 15ec8ecb1e8f07a371cb30bbba2e65a1c77e10c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 14 Dec 2017 14:52:02 +0100
Subject: [PATCH 1242/1304] Documentation: point to how to run tests in hacking
 doc

---
 Documentation/hacking.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 463520888b..8291258922 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -97,6 +97,11 @@ rkt expects stage1 images to be signed except in the following cases:
 
 Follow the instructions on [Update coreos flavor stage1][update-coreos-stage1].
 
+## Running tests
+
+The rkt repository includes both unit and functional tests.
+Follow the instructions in [Manually running the tests][manual-run-tests] for details on how to run the different tests.
+
 ## Managing dependencies
 
 rkt uses [`glide`][glide] and [`glide-vc`][glide-vc] to manage third-party dependencies.
@@ -213,3 +218,4 @@ If something looks awry, restart, pray to your preferred deity, and try again.
 [rkt-builder]: https://github.com/rkt/rkt-builder
 [run-time-dependencies]: dependencies.md#run-time-dependencies
 [update-coreos-stage1]: devel/update-coreos-stage1.md
+[manual-run-tests]: ../tests/README.md#manually-running-the-tests

From 0df56d81154d6ad5f5b41ffd58ada5d3fce0f231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 14 Dec 2017 15:18:12 +0100
Subject: [PATCH 1243/1304] Documentation: document Go version and gccgo in
 getting started

---
 Documentation/getting-started-guide.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index 0607367f36..a92caa4bc8 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -29,10 +29,18 @@ func main() {
 Next we need to build our application.
 We are going to statically link our app so we can ship an App Container Image with no external dependencies.
 
+With Go 1.9:
+
 ```
 $ CGO_ENABLED=0 go build -ldflags '-extldflags "-static"'
 ```
 
+Note that if you use [gccgo][gcc-go], the command is instead:
+
+```
+$ go build -compiler gccgo -gccgoflags '-static'
+```
+
 Before proceeding, verify that the produced binary is statically linked:
 
 ```
@@ -100,3 +108,4 @@ hello
 [rkt-releases]: https://github.com/containers/build/releases
 [rkt-vagrant]: https://github.com/rkt/rkt/blob/master/Documentation/trying-out-rkt.md#rkt-using-vagrant
 [signing-guide]: signing-and-verification-guide.md
+[gcc-go]: https://golang.org/doc/install/gccgo

From 07300bfc64661aaab4889fb70e266242a125ea72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 15 Dec 2017 13:45:56 +0100
Subject: [PATCH 1244/1304] Documentation: custom CNI plugin example

---
 Documentation/networking/overview.md | 50 ++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/Documentation/networking/overview.md b/Documentation/networking/overview.md
index cb9182e0d8..36e415171c 100644
--- a/Documentation/networking/overview.md
+++ b/Documentation/networking/overview.md
@@ -308,6 +308,56 @@ The basic network configuration is as follows:
 This will set up a linux-bridge, connect the container to the bridge and assign container IPs out of the subnet that flannel assigned to the host.
 For more information included advanced configuration options, see [CNI docs][cni-flannel].
 
+## Custom plugins
+
+Apart from the aforementioned plugins bundled with rkt, it is possible to run custom plugins that implement the [CNI (Container Network Interface)][cni].
+CNI plugins are just binaries that receive a JSON configuration file and rkt looks for plugin binaries and configuration files in certain well-defined locations.
+
+As we saw before, the default location where rkt looks for CNI configurations is `$LOCAL_CONFIG_DIRECTORY/net.d/`, where `$LOCAL_CONFIG_DIRECTORY` is `/etc/rkt` by default (it can be changed with rkt's `--local-config` flag).
+
+rkt looks for plugin binaries in two directories: `/usr/lib/rkt/plugins/net` and `$LOCAL_CONFIG_DIRECTORY/net.d/`.
+
+### Example
+
+We'll use a the loopback plugin.
+This is a very simple plugin that just brings up a loopback interface.
+
+To build the plugin, you can get the containernetworking/plugins repo, build it, and copy it to one of the directories where rkt looks for plugins:
+
+```
+$ go get -d github.com/containernetworking/plugins
+$ cd $GOPATH/containernetworking/plugins/plugins/main/loopback
+$ go build
+$ sudo cp loopback /usr/lib/rkt/plugins/net
+```
+
+Then you need a JSON configuration in the appropriate directory:
+
+```json
+$ cat /etc/rkt/net.d/10-loopback.conf
+{
+    "name": "loopback-test",
+    "type": "loopback"
+}
+```
+
+Finally, just run rkt with `--net` set to the name of the network, in this case `loopback-test`.
+We'll run it with `--debug` to check that the plugin is actually loaded:
+
+```sh
+$ sudo rkt --debug run --net=loopback-test --interactive kinvolk.io/aci/busybox --exec=ip -- a
+(...)
+networking: loading network loopback-test with type loopback
+(...)
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue qlen 1000
+    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+    inet 127.0.0.1/8 scope host lo
+       valid_lft forever preferred_lft forever
+    inet6 ::1/128 scope host
+       valid_lft forever preferred_lft forever
+Container rkt-7d7ec0ef-a6be-4b6f-8abf-0505a402af37 exited successfully.
+```
+
 ## Exposing container ports on the host
 
 Apps declare their public ports in the image manifest file.

From 9310333214c6e8a575a66f170e05c8509ddca6ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 18 Dec 2017 15:27:22 +0100
Subject: [PATCH 1245/1304] Documentation: update compression note for journal
 files

Container Linux enabled lz4 support for journald[[1]], which means logs
started being written compressed with the lz4 format instead of xz.

Change the note about host's systemd compression support needed from xz
to lz4.

Also, clarify that this only applies to the coreos and kvm flavors.
Users of the host flavor will not be impacted since the systemd used in
stage1 will be the same as on the host.

[1]: https://github.com/coreos/coreos-overlay/pull/2593
---
 Documentation/using-rkt-with-systemd.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index e27d6dc6b4..d6a04c54b2 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -67,15 +67,15 @@ MACHINE CLASS SERVICE
 0 machines listed.
 ```
 
-Note that journald integration is only supported if systemd is compiled with `xz` compression enabled. To inspect this, use `systemctl`:
+Note that, for the "coreos" and "kvm" stage1 flavors, journald integration is only supported if systemd is compiled with `lz4` compression enabled. To inspect this, use `systemctl`:
 
 ```
 $ systemctl --version
-systemd v231
-[...] +XZ [...]
+systemd 235
+[...] +LZ4 [...]
 ```
 
-If the output contains `-XZ`, journal entries will not be available.
+If the output contains `-LZ4`, journal entries will not be available.
 
 ## Managing pods as systemd services
 

From 83b6f5cbe4c373a0a1f20e513500eb361cf305f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 19 Dec 2017 18:25:12 +0100
Subject: [PATCH 1246/1304] Documentation/integrations: update Kubernetes link
 to rktlet

Since that's the recommended way to run a k8s cluster.
---
 Documentation/integrations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/integrations.md b/Documentation/integrations.md
index 6d15220bc2..8577572704 100644
--- a/Documentation/integrations.md
+++ b/Documentation/integrations.md
@@ -2,7 +2,7 @@
 This document tracks projects that integrate with rkt. [Join the community](https://github.com/rkt/rkt/), and help us keep the list up-to-date.
 
 ## Projects 
-[Kubernetes](https://kubernetes.io/docs/getting-started-guides/rkt/): a enterprise grade container orchestration solution. Kubernetes offers rkt support as an alternative to the standard install.
+[Kubernetes](https://github.com/kubernetes-incubator/rktlet/blob/master/docs/getting-started-guide.md): a enterprise grade container orchestration solution. Kubernetes offers rkt support as an alternative to the standard install.
 
 [Mesos](http://mesos.apache.org/blog/mesos-1-0-0-released/): Apache Mesos abstracts CPU, memory, storage, and other compute resources away from machines (physical or virtual), enabling fault-tolerant and elastic distributed systems to easily be built and run effectively.
 

From 1bb3868c8fb01a561bbb5e52b1bc9b16dfe59254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 2 Jan 2018 16:23:11 +0100
Subject: [PATCH 1247/1304] Documentation: add ACI hosting doc

---
 Documentation/aci-hosting.md | 74 ++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 Documentation/aci-hosting.md

diff --git a/Documentation/aci-hosting.md b/Documentation/aci-hosting.md
new file mode 100644
index 0000000000..54a58959f1
--- /dev/null
+++ b/Documentation/aci-hosting.md
@@ -0,0 +1,74 @@
+# ACI hosting
+
+rkt uses [App Container Images (ACIs)][ACI] as the native packaging format for [application containers][[application-container].
+To distribute those images, the appc spec defines an [Image Discovery mechanism][discovery] that relies on the DNS to implement a federated namespace that facilitates distributed retrieval.
+
+Hosting ACI images is as simple as including some templated HTML `meta` tags that point to the image artifacts in a web page living under the DNS name that corresponds to the image to host.
+
+This means that, to host ACI images, you only need a web server serving an HTML page with the right `meta` tags and somewhere to host the artifacts.
+
+## Example
+
+For the `coreos.com/etcd` image, you can find in the source the following `meta` tags:
+
+```
+<meta name="ac-discovery" content="coreos.com/etcd https://github.com/coreos/etcd/releases/download/{version}/etcd-{version}-{os}-{arch}.{ext}">
+<meta name="ac-discovery-pubkeys" content="coreos.com/etcd https://coreos.com/dist/pubkeys/aci-pubkeys.gpg">
+<meta name="ac-discovery-pubkeys" content="coreos.com/etcd https://coreos.com/dist/pubkeys/app-signing-pubkey.gpg">
+```
+
+When a user tries to fetch this image with the command:
+
+```
+$ rkt fetch coreos.com/etcd:v2.0.10
+```
+
+These are the steps rkt will do:
+
+* Go to `coreos.com/etcd` and look for `ac-discovery-pubkeys` tags where the `content` prefix matches `coreos.com/etcd`, fetch the public keys, and prompt the user to trust them if they're not trusted already.
+* Look for an `ac-discovery` tag with matching `content`.
+The first line of our example tags matches that so, to fetch the artifacts, rkt will perform a simple template substitution:
+ * It will substitute `{version}` with `v2.0.10`
+ * It will substitute `{os}` with the current OS (for example, `linux`)
+ * It will substitute `{arch}` with the current architecture (for example, `amd64`).
+ * It will substitute `{ext}` with `aci` for the actual image and `aci.asc` for the image signature.
+* Fetch the image and signature from the resulting URL and verify that the image has a valid and trusted signature.
+
+## ACI server example
+
+Let's use Python's built-in HTTP server to host an example ACI.
+
+We create an minimal `index.html` file with an `ac-discovery` tag:
+
+```html
+<html>
+    <head>
+        <meta name="ac-discovery" content="localhost/postgres http://localhost/postgres-{version}-{os}-{arch}.{ext}">
+    </head>
+</html>
+```
+
+Put the ACI file in the same directory and start the server on port 80:
+
+```bash
+$ cd /tmp/acis
+$ ls
+index.html  postgres-latest-linux-amd64.aci
+$ sudo python3 -m http.server 80
+Serving HTTP on 0.0.0.0 port 80 (http://0.0.0.0:80/) ...
+```
+
+Now we can fetch the image.
+To make things simple, we'll disable image verification and use HTTP instead of HTTPs:
+
+
+```bash
+$ sudo rkt --insecure-options=http,image fetch localhost/postgres
+Downloading ACI: [=============================================] 7.46 MB/7.46 MB
+Downloading ACI: [=============================================] 2.65 MB/2.65 MB
+sha512-f5d991eed255cd081b4ea6e1b378eab4
+```
+
+[ACI]: https://github.com/appc/spec/blob/v0.8.1/spec/aci.md
+[application-container]: https://github.com/appc/spec#what-is-an-application-container
+[discovery]: https://github.com/appc/spec/blob/v0.8.1/spec/discovery.md

From d690bf74cf558422077f58396bbc55efe20298f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 8 Jan 2018 17:55:33 +0100
Subject: [PATCH 1248/1304] Documentation: security: unexpected host-pod
 communication channels

We cover file descriptor passing and runtime mount injection.
---
 Documentation/security.md | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/Documentation/security.md b/Documentation/security.md
index ce925dff3a..2d06dece3d 100644
--- a/Documentation/security.md
+++ b/Documentation/security.md
@@ -1,6 +1,6 @@
 # Security best practices
 
-This document tries to give an overview of the security recommendations to follow when running rkt containers.
+This document tries to give an overview of the security recommendations to follow when running rkt containers and discuss non-obvious communication channels between the host and the pod.
 
 ## General recommendations
 
@@ -21,8 +21,35 @@ Here are some security best practices:
 * To avoid the previous point: **share a full filesystem instead of just a directory in a filesystem if possible**. For example, a mounted partition or some file mounted with `mount -o loop`.
 * **Sharing devices from the host to the container is generally not recommended**. If you need to do it, you can find examples in the [block devices documentation](block-devices.md).
 
+## Incoming mounts
+
+Mounts can be added to a pod at runtime by using [`machinectl bind`][machinectl-bind] or when adding apps to a rkt pod with the [app experiment][app-experiment].
+
+This could be used in a malicious way although it requires privileges on the host.
+
+## File descriptors
+
+In certain situations, some file descriptors belonging to the host namespaces are sent to the pod.
+
+### Socket activation
+
+rkt supports [socket-activated services][rkt-socket-activated] and [socket-proxyd][socket-proxyd].
+This means some file descriptors will be passed from the host to the container when using those features.
+
+In particular, all file descriptors defined in the socket unit file accompanying the service file where rkt is started are passed to the container.
+
+### sd\_notify
+
+rkt supports the [sd_notify][sd_notify] mechanism to notify systemd on the host that the pod is ready.
+This means systemd in the pod will receive a file descriptor which can be used to send information about whether the apps are initialized or not to the host.
+
 [aci-schema]: https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
 [rkt-run-subcommands]: subcommands/run.md#options
 [capabilities-guide]: capabilities-guide.md
 [seccomp-guide]: seccomp-guide.md
 [user-ns-limitations]: devel/user-namespaces.md#current-limitations
+[rkt-socket-activated]: using-rkt-with-systemd.md#socket-activated-services
+[socket-proxyd]: using-rkt-with-systemd.md#bidirectionally-proxy-local-sockets-to-another-possibly-remote-socket
+[sd_notify]: https://www.freedesktop.org/software/systemd/man/sd_notify.html
+[machinectl-bind]: https://www.freedesktop.org/software/systemd/man/machinectl.html#bind%20NAME%20PATH%20%5BPATH%5D
+[app-experiment]: devel/pod-lifecycle.md#app

From da1c775b16a9cfea0f4651acea5aec8ef48439b3 Mon Sep 17 00:00:00 2001
From: Jason Wieringa <jason@wieringa.co>
Date: Thu, 30 Mar 2017 15:42:24 -0700
Subject: [PATCH 1249/1304] Added AWS ECR link to examples of Docker registries

Example credit goes to @sjansen.

Issue: https://github.com/coreos/rkt/issues/3157
---
 Documentation/configuration.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/configuration.md b/Documentation/configuration.md
index 04249af6ae..33f6714629 100644
--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@@ -215,6 +215,7 @@ Some popular Docker registries:
 * registry-1.docker.io (Assumed as the default when no specific registry is named on the rkt command line, as in `docker:///redis`.)
 * quay.io
 * gcr.io
+* `<aws_account_id>`.dkr.ecr.`<region>`.amazonaws.com (AWS ECR)
 
 Example `dockerAuth` configuration:
 

From d22fb73540f81131f0b3cd2abe9a04bb8b799bbf Mon Sep 17 00:00:00 2001
From: Jason Wieringa <jason@wieringa.co>
Date: Mon, 22 May 2017 15:54:12 -0400
Subject: [PATCH 1250/1304] Hint to users to use external tools to generate
 Docker Authentication

---
 Documentation/configuration.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Documentation/configuration.md b/Documentation/configuration.md
index 33f6714629..b3ae16f8e6 100644
--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@@ -207,8 +207,7 @@ A short list of popular Docker registries is given below.
 The `credentials` field holds the necessary data to authenticate against the Docker registry.
 This field must be specified and cannot be empty.
 
-Currently, Docker registries only support basic HTTP authentication, so `credentials` has two subfields - `user` and `password`.
-These fields must be specified and cannot be empty.
+Currently, Docker registries only support basic HTTP authentication, so `credentials` has two subfields - `user` and `password`. These fields must be specified and cannot be empty. For registries like [AWS ECR](https://aws.amazon.com/ecr/) tools may be used to obtain credentials and registry endpoints. For example, use `aws ecr get-login` to fetch login credentials when using AWS.
 
 Some popular Docker registries:
 

From eacb8832d9557ec27398a125376afa1584eb50f6 Mon Sep 17 00:00:00 2001
From: Jason Wieringa <jason@wieringa.io>
Date: Tue, 9 Jan 2018 18:29:47 -0800
Subject: [PATCH 1251/1304] Added: Note about ECR credentials expiring

---
 Documentation/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/configuration.md b/Documentation/configuration.md
index b3ae16f8e6..e759888c4d 100644
--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@@ -207,7 +207,7 @@ A short list of popular Docker registries is given below.
 The `credentials` field holds the necessary data to authenticate against the Docker registry.
 This field must be specified and cannot be empty.
 
-Currently, Docker registries only support basic HTTP authentication, so `credentials` has two subfields - `user` and `password`. These fields must be specified and cannot be empty. For registries like [AWS ECR](https://aws.amazon.com/ecr/) tools may be used to obtain credentials and registry endpoints. For example, use `aws ecr get-login` to fetch login credentials when using AWS.
+Currently, Docker registries only support basic HTTP authentication, so `credentials` has two subfields - `user` and `password`. These fields must be specified and cannot be empty. For registries like [AWS ECR](https://aws.amazon.com/ecr/) tools may be used to obtain credentials and registry endpoints. For example, use `aws ecr get-login` to fetch login credentials when using AWS. Please keep in mind that when using ECR the credentials will expire and will need to be refreshed.
 
 Some popular Docker registries:
 

From ede87adffe37ce511f429a220e2d4e13436cd464 Mon Sep 17 00:00:00 2001
From: root <rbalajis25@gmail.com>
Date: Thu, 21 Dec 2017 23:58:52 +0530
Subject: [PATCH 1252/1304] list: add ip of non running pods to the json format

---
 pkg/pod/pods.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/pod/pods.go b/pkg/pod/pods.go
index ba9543880d..5e6c014785 100644
--- a/pkg/pod/pods.go
+++ b/pkg/pod/pods.go
@@ -269,7 +269,7 @@ func getPod(dataDir string, uuid *types.UUID) (*Pod, error) {
 
 	p.FileLock = l
 
-	if p.isRunning() {
+	if p.isRunning() || p.isExit() {
 		cfd, err := p.Fd()
 		if err != nil {
 			return nil, errwrap.Wrap(fmt.Errorf("error acquiring pod %v dir fd", uuid), err)
@@ -1200,6 +1200,11 @@ func (p *Pod) IsFinished() bool {
 	return p.isExited || p.isAbortedPrepare || p.isGarbage || p.isGone
 }
 
+// isExit returns true if the pod is in exited states
+func (p *Pod) isExit() bool {
+	return p.isExited
+}
+
 // AppExitCode returns the app's exit code.
 // It returns an error if the exit code file doesn't exit or the content of the file is invalid.
 func (p *Pod) AppExitCode(appName string) (int, error) {

From fa089129d8931da19568cdbe625bf594efc20dde Mon Sep 17 00:00:00 2001
From: root <rbalajis25@gmail.com>
Date: Fri, 22 Dec 2017 00:17:03 +0530
Subject: [PATCH 1253/1304] status: add ip of the non running pod

This will be useful for testing the list command to check the ip
of the non running pod
---
 rkt/status.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rkt/status.go b/rkt/status.go
index c1893e7ca1..bd5d6f305e 100644
--- a/rkt/status.go
+++ b/rkt/status.go
@@ -212,7 +212,7 @@ func printStatus(p *pkgPod.Pod) error {
 		stdout.Printf("started=%s", startedStr)
 	}
 
-	if state == pkgPod.Running {
+	if state == pkgPod.Running || state == pkgPod.Exited {
 		stdout.Printf("networks=%s", fmtNets(p.Nets))
 	}
 

From e1ee87ae52ee7281fa5234f5b0a7d9ab6b3462be Mon Sep 17 00:00:00 2001
From: root <rbalajis25@gmail.com>
Date: Fri, 22 Dec 2017 00:18:58 +0530
Subject: [PATCH 1254/1304] tests: check ip of non running pod for list command

---
 tests/rkt_list_test.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/rkt_list_test.go b/tests/rkt_list_test.go
index 881aaa941b..d510abe4d3 100644
--- a/tests/rkt_list_test.go
+++ b/tests/rkt_list_test.go
@@ -57,6 +57,14 @@ func TestRktList(t *testing.T) {
 	// Get hash
 	imageID := fmt.Sprintf("sha512-%s", imgID.hash[:12])
 
+	cmd = fmt.Sprintf("%s --insecure-options=image run-prepared %s", ctx.Cmd(), podUuid)
+	nobodyUid, _ := testutils.GetUnprivilegedUidGid()
+	_, status := runRkt(t, cmd, nobodyUid, 0)
+	if status != 0 {
+		panic(fmt.Errorf("expected exit status code 0, got %d", status))
+	}
+	podInfo := getPodInfo(t, ctx, podUuid)
+	ipv4 := podInfo.networks["default"].ipv4
 	// Define tests
 	tests := []struct {
 		cmd           string
@@ -99,6 +107,12 @@ func TestRktList(t *testing.T) {
 			true,
 			imageID,
 		},
+		//	Test that ip is in json output
+		{
+			"list --format=json",
+			true,
+			ipv4,
+		},
 	}
 
 	// Run tests

From 13761c3cc8b8782efa1b705603c79a40f6674bab Mon Sep 17 00:00:00 2001
From: root <rbalajis25@gmail.com>
Date: Wed, 3 Jan 2018 12:26:38 +0530
Subject: [PATCH 1255/1304] api service: add ip of the non running pod

---
 rkt/api_service.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rkt/api_service.go b/rkt/api_service.go
index d932c53501..07eb602291 100644
--- a/rkt/api_service.go
+++ b/rkt/api_service.go
@@ -537,6 +537,7 @@ func fillPodDetails(store *imagestore.Store, p *pkgPod.Pod, v1pod *v1alpha.Pod)
 		v1pod.State = v1alpha.PodState_POD_STATE_DELETING
 	case pkgPod.Exited:
 		v1pod.State = v1alpha.PodState_POD_STATE_EXITED
+		v1pod.Networks = getNetworks(p)
 	case pkgPod.Garbage, pkgPod.ExitedGarbage:
 		v1pod.State = v1alpha.PodState_POD_STATE_GARBAGE
 	default:

From caefa4817609272f00366d41a47670c5f40ad5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 10 Jan 2018 15:20:43 +0100
Subject: [PATCH 1256/1304] Documentation: improve selinux docs

Give an example on constraints you can apply to a context and link to
documentation.
---
 Documentation/selinux.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/Documentation/selinux.md b/Documentation/selinux.md
index b3c614e42f..7970f2b4ea 100644
--- a/Documentation/selinux.md
+++ b/Documentation/selinux.md
@@ -7,7 +7,24 @@ If it does, rkt will generate a per-instance context.
 All mounts for the instance will be created using the file context defined in `lxc_contexts`, and the instance processes will be run in a context derived from the process context defined in `lxc_contexts`.
 
 Processes started in these contexts will be unable to interact with processes or files in any other instance's context, even though they are running as the same user.
-Individual Linux distributions may impose additional isolation constraints on these contexts - please refer to your distribution documentation for further details.
+Individual Linux distributions may impose additional isolation constraints on these contexts.
 
+For example, given the following `lxc_contexts`:
+
+```
+# /etc/selinux/mcs/contexts/lxc_contexts
+process = "system_u:system_r:svirt_lxc_net_t:s0"
+content = "system_u:object_r:virt_var_lib_t:s0"
+file = "system_u:object_r:svirt_lxc_file_t:s0"
+```
+
+You could define a policy where members of `svirt_lxc_net_t` context cannot write on TCP sockets.
+
+Note that the policy is responsibility of your distribution and might differ from this example.
+
+To find out more about policies you can check the [SELinux Policy Overview][selinux-policy].
+Please refer to your distribution documentation for further details on its policy.
 
 [svirt]: http://selinuxproject.org/page/SVirt
+[selinux-policy]: https://www.centos.org/docs/5/html/Deployment_Guide-en-US/rhlcommon-chapter-0001.html
+

From 136b3c03828f07dd21e61e518e3ea4e46be82e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 20 Dec 2017 18:22:47 +0100
Subject: [PATCH 1257/1304] Documentation: add pod manifest walkthrough

This guide explain how to generate a pod manifest and points to the
relevant resources in the appc spec repo.
---
 Documentation/pod-manifest.md    | 141 +++++++++++++++++++++++++++++++
 Documentation/subcommands/run.md |   3 +
 2 files changed, 144 insertions(+)
 create mode 100644 Documentation/pod-manifest.md

diff --git a/Documentation/pod-manifest.md b/Documentation/pod-manifest.md
new file mode 100644
index 0000000000..c3db225774
--- /dev/null
+++ b/Documentation/pod-manifest.md
@@ -0,0 +1,141 @@
+# Pod manifest walkthrough
+
+The flag `--pod-manifest` can be passed to rkt's [run][run] and [prepare][prepare] subcommands.
+It allows users to specify a *[runtime manifest][runtime-manifest]* to run as a pod.
+A pod manifest completely specifies how the pod will be run, **overriding** any configuration present in the individual images of the apps in the pod.
+
+Thus, by encoding how a rkt pod should be executed in a file, it can then be saved in version control and users don't need to deal with very long CLI arguments everytime they want to run a complicated pod.
+
+## Generating a pod manifest
+
+The most convenient way to generate a pod manifest is running a pod by using the rkt CLI (without `--pod-manifest`), exporting the resulting pod manifest, and then tweaking it until satisfied with it.
+
+For example:
+
+```bash
+$ sudo rkt run coreos.com/etcd:v2.0.10 --- kinvolk.io/aci/busybox:1.24 -- -c 'while true; do date; sleep 1; done'
+...
+^]^]Container rkt-07f1cfdc-950b-4b6e-a2c0-8fb1ed37f98b terminated by signal KILL.
+$ rkt cat-manifest 07f1cfdc > pod-manifest.json
+```
+
+The resulting pod manifest file is:
+
+```json
+{
+	"acVersion": "1.29.0",
+	"acKind": "PodManifest",
+	"apps": [
+		{
+			"name": "etcd",
+			"image": {
+				"name": "coreos.com/etcd",
+				"id": "sha512-c03b055d02e51e36f44a2be436eb77d5b0fbbbe37c00851188d8798912e8508a",
+				"labels": [
+					{
+						"name": "os",
+						"value": "linux"
+					},
+					{
+						"name": "arch",
+						"value": "amd64"
+					},
+					{
+						"name": "version",
+						"value": "v2.0.10"
+					}
+				]
+			},
+			"app": {
+				"exec": [
+					"/etcd"
+				],
+				"user": "0",
+				"group": "0"
+			}
+		},
+		{
+			"name": "busybox",
+			"image": {
+				"name": "kinvolk.io/aci/busybox",
+				"id": "sha512-140375b2a2bd836559a7c978f36762b75b80a7665e5d922db055d1792d6a4182",
+				"labels": [
+					{
+						"name": "version",
+						"value": "1.24"
+					},
+					{
+						"name": "os",
+						"value": "linux"
+					},
+					{
+						"name": "arch",
+						"value": "amd64"
+					}
+				]
+			},
+			"app": {
+				"exec": [
+					"sh",
+					"-c",
+					"while true; do date; sleep 1; done"
+				],
+				"user": "0",
+				"group": "0",
+				"ports": [
+					{
+						"name": "nc",
+						"protocol": "tcp",
+						"port": 1024,
+						"count": 1,
+						"socketActivated": false
+					}
+				]
+			}
+		}
+	],
+	"volumes": null,
+	"isolators": null,
+	"annotations": [
+		{
+			"name": "coreos.com/rkt/stage1/mutable",
+			"value": "false"
+		}
+	],
+	"ports": []
+}
+```
+
+From there, you can edit the pod manifest following its [schema][pod-manifest-schema].
+
+For example, we can add a memory isolator to etcd:
+
+```json
+...
+				"exec": [
+					"/etcd"
+				],
+				"isolators": [
+					{
+						"name": "resource/memory",
+						"value": {"limit": "1G"}
+					}
+				],
+...
+```
+
+Then, we can just run rkt with that pod manifest:
+
+```
+$ sudo rkt run --pod-manifest=pod-manifest.json
+...
+```
+
+**Note** Images used by a pod manifest must be store in the local store, `--pod-manifest` won't do discovery or fetching.
+
+Another option is running rkt with different CLI arguments until we have a configuration we like, and then just save the resulting pod manifest to use it later.
+
+[run]: subcommands/run.md
+[prepare]: subcommands/prepare.md
+[runtime-manifest]: https://github.com/appc/spec/blob/v0.8.11/spec/pods.md#app-container-pods-pods
+[pod-manifest-schema]: https://github.com/appc/spec/blob/v0.8.11/spec/pods.md#pod-manifest-schema
diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index fb6309bb8c..55fccb9a76 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -38,6 +38,8 @@ The flag `--pod-manifest` allows users to specify a [*runtime manifest*](https:/
 to run as a pod. This means image manifests for apps in the pod will be
 overriden and any configuration specified in them will be ignored.
 
+For more details about generating a *runtime manifest*, check the [pod manifest walkthrough][pod-manifest-walkthrough].
+
 ## Overriding the app's name
 
 Be default, the image's name will be used as the app's name.
@@ -475,3 +477,4 @@ See the table with [global options in general commands documentation][global-opt
 [rkt-arch]: ../devel/architecture.md
 [rkt-hacking]: ../hacking.md
 [systemd-run]: ../using-rkt-with-systemd.md#systemd-run
+[pod-manifest-walkthrough]: ../pod-manifest.md

From 0a5621eea073275b0f96a7feb61b6e5fee4642de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Thu, 4 Jan 2018 18:06:16 +0100
Subject: [PATCH 1258/1304] Documentation: explain non-root capabilities

---
 Documentation/capabilities-guide.md | 90 +++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/Documentation/capabilities-guide.md b/Documentation/capabilities-guide.md
index a368b37569..6231a8af31 100644
--- a/Documentation/capabilities-guide.md
+++ b/Documentation/capabilities-guide.md
@@ -8,6 +8,7 @@ This document is a walk-through guide describing how to use rkt isolators for
 * [Capability Isolators](#capability-isolators)
 * [Configure capabilities via the command line](#configure-capabilities-via-the-command-line)
 * [Configure capabilities in ACI images](#configure-capabilities-in-aci-images)
+* [Capabilities when running as non-root](#capabilities-when-running-as-non-root)
 * [Recommendations](#recommendations)
 
 ## About Linux Capabilities
@@ -319,6 +320,93 @@ image: using image from local store for image name quay.io/coreos/alpine-sh
 listening on [::]:80 ...
 ```
 
+## Capabilities when running as non-root
+
+The capability isolators (and default capabilities) mentioned in this document operate on the capability bounding set.
+When running containers as non-root, capabilities are not added to the effective set of the process, which is the one the kernel will check when the app is attempting to perform a privileged operation.
+This means the process won't be able to run the privileged operations enabled by the capabilities granted to the container directly.
+
+For example, including `CAP_NET_RAW` in the retain set when running a container as non-root doesn't allow the container to run `ping` (which uses raw sockets):
+
+```
+$ sudo rkt run --interactive kinvolk.io/aci/busybox --user=1000 --group=1000 --caps-retain=CAP_NET_RAW --exec ping -- 8.8.8.8
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+ping: permission denied (are you root?)
+```
+
+To be able to execute `ping` as a non-root user, the binary needs to have the corresponding file capability.
+
+**Note**: running an image with file capabilities currently requires disabling seccomp in rkt.
+This is due to a systemd bug where using seccomp results in enabling [no_new_privs][NNP] (you can track progress in [#3896](https://github.com/rkt/rkt/issues/3896)).
+
+### Building images with file capabilities
+
+Building images that include files with file capabilities is challenging since:
+
+* [build][acbuild] doesn't preserve file capabilities. See [containers/build#197](https://github.com/containers/build/issues/197).
+* docker build doesn't preserve file capabilities. See [moby/moby#35699](https://github.com/moby/moby/issues/35699).
+
+However, provided we have an ACI (created for example with [build][acbuild] or with [docker2aci][docker2aci]), we can extract it and add the file capabilities manually.
+
+#### Example
+
+We'll use build to create an Ubuntu ACI with ping installed:
+
+```bash
+#!/usr/bin/env bash
+
+acbuild --debug begin docker://ubuntu
+acbuild --debug set-name example.com/filecap
+
+# Install ping
+acbuild --debug run -- apt-get update
+acbuild --debug run -- apt-get install -y inetutils-ping
+
+# ping comes as a setuid file, we don't want that
+acbuild --debug run -- chmod -s /bin/ping
+
+acbuild --debug set-exec /bin/bash
+
+acbuild --debug write --overwrite filecaps.aci
+```
+
+After running the script, we'll extract the ACI, add file capabilities, and rebuild it.
+
+```
+$ sudo tar -xf filecaps.aci
+$ sudo setcap cap_net_raw+ep rootfs/bin/ping
+$ sudo tar --xattrs -cf filecaps-mod.aci manifest rootfs
+```
+
+Now we can run rkt with that image as a non-root user and with the right capability and ping should work fine:
+
+```
+$ sudo rkt --insecure-options=image,seccomp run --interactive filecaps-mod.aci --user=1000 --group=1000 --caps-retain=cap_net_raw
+groups: cannot find name for group ID 1000
+bash: /root/.bashrc: Permission denied
+I have no name!@rkt-4a9e66a0-6ee0-496f-8b7a-ab259362cba7:/$ ls -l /bin/ping
+-rwxr-xr-x 1 root root 70680 Feb  6  2016 /bin/ping
+I have no name!@rkt-4a9e66a0-6ee0-496f-8b7a-ab259362cba7:/$ getcap /bin/ping
+/bin/ping = cap_net_raw+ep
+I have no name!@rkt-4a9e66a0-6ee0-496f-8b7a-ab259362cba7:/$ ping 8.8.8.8
+PING 8.8.8.8 (8.8.8.8): 56 data bytes
+64 bytes from 8.8.8.8: icmp_seq=0 ttl=52 time=21.859 ms
+64 bytes from 8.8.8.8: icmp_seq=1 ttl=52 time=20.298 ms
+64 bytes from 8.8.8.8: icmp_seq=2 ttl=52 time=25.207 ms
+^C--- 8.8.8.8 ping statistics ---
+3 packets transmitted, 3 packets received, 0% packet loss
+round-trip min/avg/max/stddev = 20.298/22.455/25.207/2.048 ms
+```
+
+### Ambient capabilities
+
+There's a way in Linux to give capabilities to non-root processes without needing file capabilities to perform the privileged task: ambient capabilities.
+
+When a capability is added to the ambient set, it will be preserved in the effective set of the process executed in the container.
+However, this is currently not implemented in rkt.
+
+For more information about ambient capabilities, check [capabilities(7)][man-capabilities].
+
 ## Recommendations
 
 As with most security features, capability isolators may require some
@@ -337,8 +425,10 @@ set of capabilities requirements and follow best practices:
     possible.
 
 [acbuild]: https://github.com/containers/build
+[docker2aci]: https://github.com/appc/docker2aci
 [actool]: https://github.com/appc/spec#building-acis
 [capabilities]: https://lwn.net/Kernel/Index/#Capabilities
 [default-caps]: https://github.com/appc/spec/blob/master/spec/ace.md#oslinuxcapabilities-remove-set
 [grsec-forums]: https://forums.grsecurity.net/viewtopic.php?f=7&t=2522
 [man-capabilities]: http://man7.org/linux/man-pages/man7/capabilities.7.html
+[NNP]: https://www.kernel.org/doc/Documentation/prctl/no_new_privs.txt

From d8064647366e82779a71142b84fc5bda696bd886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 19 Dec 2017 18:25:54 +0100
Subject: [PATCH 1259/1304] Documentation/integrations: fix typo

---
 Documentation/integrations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/integrations.md b/Documentation/integrations.md
index 8577572704..cb3cdc63d2 100644
--- a/Documentation/integrations.md
+++ b/Documentation/integrations.md
@@ -2,7 +2,7 @@
 This document tracks projects that integrate with rkt. [Join the community](https://github.com/rkt/rkt/), and help us keep the list up-to-date.
 
 ## Projects 
-[Kubernetes](https://github.com/kubernetes-incubator/rktlet/blob/master/docs/getting-started-guide.md): a enterprise grade container orchestration solution. Kubernetes offers rkt support as an alternative to the standard install.
+[Kubernetes](https://github.com/kubernetes-incubator/rktlet): an enterprise grade container orchestration solution. Kubernetes offers rkt support as an alternative to the standard install.
 
 [Mesos](http://mesos.apache.org/blog/mesos-1-0-0-released/): Apache Mesos abstracts CPU, memory, storage, and other compute resources away from machines (physical or virtual), enabling fault-tolerant and elastic distributed systems to easily be built and run effectively.
 

From b48d70ea82afa59ff2e0b2df1c2adbde5aaa7405 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Wed, 10 Jan 2018 10:49:38 -0800
Subject: [PATCH 1260/1304] makelib: Fix go-find-directories symlink problem

Use the current working directory and not MK_TOPLEVEL_ABS_SRCDIR when
processing 'go list' output in go-find-directories.

Our invocation of 'go list' in the go-find-directories function uses
paths relative to the current working directory and so the output of
that command will have file paths based on the current working
directory.  The make file variable MK_TOPLEVEL_ABS_SRCDIR is initialized
with make's abspath function.  The abspath function (GNU Make 4.1) will
resolve symlinks.  This difference in resolved and unresolved symlinks
causes problems in the go-find-directories function output when building
from a path that includes a symlink.

Fixes 'make unit-check' errors like these when building in a directory
that has a symlink in its path:

  stat ./_/home/runner/workspace/src/github.com/.../builds/build-rkt-none/api/v1: no such file or directory

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 makelib/misc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makelib/misc.mk b/makelib/misc.mk
index 63ad19a202..2940d8a5ea 100644
--- a/makelib/misc.mk
+++ b/makelib/misc.mk
@@ -172,7 +172,7 @@ endef
 # Example: $(call go-find-directories,./...,TestGoFiles XTestGoFiles,tests)
 define go-find-directories
 $(strip \
-	$(eval _MISC_GFD_ESCAPED_SRCDIR := $(MK_TOPLEVEL_ABS_SRCDIR)) \
+	$(eval _MISC_GFD_ESCAPED_SRCDIR := $(shell cd $(MK_TOPLEVEL_SRCDIR) && pwd)) \
 	$(eval _MISC_GFD_ESCAPED_SRCDIR := $(subst .,\.,$(_MISC_GFD_ESCAPED_SRCDIR))) \
 	$(eval _MISC_GFD_ESCAPED_SRCDIR := $(subst /,\/,$(_MISC_GFD_ESCAPED_SRCDIR))) \
 	$(eval _MISC_GFD_SPACE_ :=) \

From 0ac6ac0cd57405cf7c107bb22942e359625b0854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 19 Dec 2017 15:31:54 +0100
Subject: [PATCH 1261/1304] Documentation: add debugging guide

It includes explanations of how to debug images and rkt's stage1.

Loosely based on the presentation "Debugging in a Containerized
World"[[1]]

[1]: https://docs.google.com/presentation/d/1jUxja67wDgbGdc1kur11viLP5QXreyOnBu0inpoFfqs/edit#slide=id.gaf2bae832_0_28uu
---
 Documentation/devel/debugging.md | 196 +++++++++++++++++++++++++++++++
 Documentation/hacking.md         |   4 +
 2 files changed, 200 insertions(+)
 create mode 100644 Documentation/devel/debugging.md

diff --git a/Documentation/devel/debugging.md b/Documentation/devel/debugging.md
new file mode 100644
index 0000000000..a1a4b71df0
--- /dev/null
+++ b/Documentation/devel/debugging.md
@@ -0,0 +1,196 @@
+# Debugging rkt
+
+This guide gives an overview of the debugging techniques that can be used to pinpoint problems with rkt itself or with particular images.
+
+## rkt enter
+
+[enter](../subcommands/enter.md) is the most straight-forward technique.
+It allows you to enter the namespaces of an app within a pod so you can explore its filesystem and see what's running.
+
+By default it tries to run `/bin/bash` if it's present in the app's filesystem but you can specify a command to run if the app doesn't provide a bash binary.
+
+```bash
+$ rkt list
+UUID		APP	IMAGE NAME			STATE	CREATED		STARTED		NETWORKS
+54ca5d22	busybox	kinvolk.io/aci/busybox:1.24	running	1 hour ago	1 hour ago	default:ip4=172.16.28.114
+$ sudo rkt enter 54ca5d22 sh
+/ # ls
+bin   dev   etc   home  proc  root  run   sys   tmp   usr   var
+/ # ps
+PID   USER     TIME   COMMAND
+    1 root       0:00 /usr/lib/systemd/systemd --default-standard-output=tty --log-target=null --show-status=0
+    3 root       0:00 /usr/lib/systemd/systemd-journald
+    6 root       0:00 /bin/sh
+   40 root       0:00 sh
+   44 root       0:00 ps
+```
+
+This works well for images that have a shell baked in but a common practice is creating minimal images with only a statically compiled binary or a binary plus its needed libraries, which limits the usefulness of `rkt enter`.
+We'll later see how to overcome this limitation.
+
+## Entering stage1
+
+As explained in [rkt architecture](architecture.md), execution with rkt is divided into several distinct stages.
+While with `rkt enter` you enter stage2, it is sometimes useful to see what happens in stage1.
+For example, you might want to check what options are passed to the unit file of an app, or interact with stage1 systemd.
+
+rkt doesn't include a subcommand you can use to enter stage1, but you can use [`nsenter`](http://man7.org/linux/man-pages/man1/nsenter.1.html) for that purpose.
+Note that this only applies for container stage1 images: kvm pods run in an isolated VM and `nsenter` can't enter its stage1, and fly only allows one app per pod and it doesn't have long-running processes on stage1 so there's nothing to enter.
+
+Let's enter a pod's stage1.
+We'll need to find stage1 systemd's PID, which is the child of the PID shown in `rkt status`.
+Then we can just call nsenter with it:
+
+```bash
+$ rkt status 86e6df38
+state=running
+created=2017-12-19 14:49:00.376 +0100 CET
+started=2017-12-19 14:49:00.466 +0100 CET
+networks=default:ip4=172.16.28.27
+pid=8469
+exited=false
+$ ps auxf | grep -A1 [8]469
+root      8469  0.1  0.0  54204  5076 pts/1    S+   14:48   0:00          \_ stage1/rootfs/usr/lib/ld-linux-x86-64.so.2 stage1/rootfs/usr/bin/systemd-nspawn --boot --notify-ready=yes --register=true --link-journal=try-guest --quiet --uuid=86e6df38-0762-4261-af21-d2b265555179 --machine=rkt-86e6df38-0762-4261-af21-d2b265555179 --directory=stage1/rootfs --capability=CAP_AUDIT_WRITE,CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_FSETID,CAP_FOWNER,CAP_KILL,CAP_MKNOD,CAP_NET_RAW,CAP_NET_BIND_SERVICE,CAP_SETUID,CAP_SETGID,CAP_SETPCAP,CAP_SETFCAP,CAP_SYS_CHROOT -- --default-standard-output=tty --log-target=null --show-status=0
+root      8505  0.0  0.0  62276  7300 ?        Ss   14:48   0:00              \_ /usr/lib/systemd/systemd --default-standard-output=tty --log-target=null --show-status=0
+$ sudo nsenter -m -u -i -p -t 8505
+-bash-4.3#
+```
+
+However, the stage1 environment doesn't include basic binaries necessary for debugging:
+
+```bash
+-bash-4.3# ls
+-bash: ls: command not found
+-bash-4.3# cat
+-bash: cat: command not found
+```
+
+If you only need to inspect the stage1 filesystem, you can check `/proc/$PID/root/` from the host:
+
+```bash
+# ls /proc/27107/root/
+app_add  app_start  attach  dev		enter	   etc	   gc	 iottymux  lib64  prepare-app  reaper.sh  root	stop  systemd-version  usr
+app_rm	 app_stop   bin     diagnostic	enterexec  flavor  init  lib	   opt	  proc	       rkt	  run	sys   tmp	       var
+```
+
+Luckily, rkt includes a helper script that injects a static busybox binary and makes entering stage1 easier.
+It can be found in `scripts/debug/stage1_install_busybox.sh`.
+It takes a pod UUID as a parameter and it outputs the right nsenter command:
+
+```bash
+$ rkt list --full
+UUID					APP	IMAGE NAME			IMAGE ID		STATE	CREATED					STARTED			NETWORKS
+86e6df38-0762-4261-af21-d2b265555179	busybox	kinvolk.io/aci/busybox:1.24	sha512-140375b2a2bd	running	2017-12-19 14:49:00.376 +0100 CET	2017-12-19 14:49:00.466 +0100 CET	default:ip4=172.16.28.27
+$ ./scripts/debug/stage1_install_busybox.sh 86e6df38-0762-4261-af21-d2b265555179
+Busybox installed. Use the following command to enter pod's stage1:
+sudo nsenter -m -u -i -p -t 8505
+-bash-4.3# cat rkt/env/busybox
+SHELL=/bin/sh
+USER=root
+LOGNAME=root
+HOME=/root
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+AC_APP_NAME=busybox
+```
+
+By default, the script creates links for common busybox programs, but if you need to run more commands you can call busybox accordingly:
+
+```bash
+-bash-4.3# busybox head -n2 /lib/systemd/system/busybox.service
+[Unit]
+After=systemd-journald.service
+```
+
+Run `busybox` without arguments to see a list of available commands.
+
+If you need custom tools you can add them by copying them to `/proc/$PID/root/bin`.
+It's easier if they're static binaries to avoid complications with dynamic libraries.
+
+## Debugging images
+
+As mentioned, `rkt enter` has limitations when the image to debug doesn't ship with tools to debug it or even a shell.
+One possible way to debug those images is to use the ACI dependencies mechanism to add a custom tools image to your container.
+
+Let's use [actool](https://github.com/appc/spec/tree/v0.8.11/actool) to patch the manifest.
+
+```bash
+$ rkt fetch debug-image.aci
+sha512-847f2ca60e473121311fac62d014a4f1
+$ actool cat-manifest --pretty-print image-to-patch.aci > manifest.json
+```
+
+We'll now add the dependency to the manifest, right before the "app" section:
+
+```json
+    ],
+    "dependencies": [
+        {
+            "imageID": "sha512-847f2ca60e473121311fac62d014a4f1"
+        }
+    ],
+    "app": {
+```
+
+Then we'll patch the image and run it:
+
+```bash
+$ actool patch-manifest --manifest manifest.json --replace image-to-patch.aci
+$ sudo rkt --insecure-options=image run --interactive image-to-patch.aci
+(...)
+```
+
+You'll have your favorite debugging tools available.
+
+For examples of how to build images, check out [Build container examples](../build-container-examples).
+Creating images with statically built binaries is preferred to avoid complications with shared libraries.
+
+As an alternative to adding a dependency in the ACI, you can also add a volume after a container has been started using [`machinectl bind`](https://www.freedesktop.org/software/systemd/man/machinectl.html#bind%20NAME%20PATH%20%5BPATH%5D):
+
+```bash
+$ sudo mkdir /proc/$PID/root/opt/stage2/$APP_NAME/rootfs/tools
+$ machinectl
+MACHINE                                  CLASS     SERVICE OS VERSION ADDRESSES
+rkt-b7458bf5-8e19-40c1-a7dc-7c5aa25e4970 container rkt     -  -       172.16.28.27...
+
+1 machines listed.
+$ sudo machinectl bind $PWD/tools /opt/stage2/$APP_NAME/rootfs/tools
+```
+
+Where `$PID` is still the PID of systemd in the pod.
+
+## strace
+
+[Strace](http://man7.org/linux/man-pages/man1/strace.1.html) is a very powerful tool to inspect what applications are doing.
+For container stage1 images or fly, you can just attach strace to processes running inside pods like any other process on the host:
+
+Let's trace the shell process running in our example busybox container.
+We'll also follow forks to trace new processes created by the shell:
+
+```bash
+$ ps auxf | grep -A3 [8]469
+root      8469  0.1  0.0  54204  5076 pts/1    S+   14:48   0:00          \_ stage1/rootfs/usr/lib/ld-linux-x86-64.so.2 stage1/rootfs/usr/bin/systemd-nspawn --boot --notify-ready=yes --register=true --link-journal=try-guest --quiet --uuid=86e6df38-0762-4261-af21-d2b265555179 --machine=rkt-86e6df38-0762-4261-af21-d2b265555179 --directory=stage1/rootfs --capability=CAP_AUDIT_WRITE,CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_FSETID,CAP_FOWNER,CAP_KILL,CAP_MKNOD,CAP_NET_RAW,CAP_NET_BIND_SERVICE,CAP_SETUID,CAP_SETGID,CAP_SETPCAP,CAP_SETFCAP,CAP_SYS_CHROOT -- --default-standard-output=tty --log-target=null --show-status=0
+root      8505  0.0  0.0  62276  7300 ?        Ss   14:48   0:00              \_ /usr/lib/systemd/systemd --default-standard-output=tty --log-target=null --show-status=0
+root      8507  0.0  0.0  66408  8740 ?        Ss   14:48   0:00                  \_ /usr/lib/systemd/systemd-journald
+root      8510  0.0  0.0   1212   672 pts/3    Ss+  14:48   0:00                  \_ /bin/sh
+$ sudo strace -f -p 8510
+wait4(-1, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], WSTOPPED, NULL) = 2646
+--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=2646, si_uid=0, si_status=0, si_utime=0, si_stime=0} ---
+ioctl(10, TIOCSPGRP, [6])               = 0
+wait4(-1, 0x7ffc0226b918, WNOHANG|WSTOPPED, NULL) = -1 ECHILD (No child processes)
+wait4(-1, 0x7ffc0226b7b8, WNOHANG|WSTOPPED, NULL) = -1 ECHILD (No child processes)
+write(1, "This is the current date: ", 26) = 26
+clone(strace: Process 12807 attached
+(...)
+```
+
+To find out more about strace, check out Julia Evans' [strace zine](https://jvns.ca/zines/#strace-zine).
+
+## Debugging applications with gdb
+
+Sometimes strace is not enough to figure out problems with your applications.
+From version 7.10, it is possible to use [gdb](https://www.gnu.org/software/gdb/) to debug processes running in containers from the host.
+Same as with strace, you need to find the PID of the process you want to debug and then just run:
+
+```
+$ sudo gdb -p $PID
+```
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 8291258922..ceb58b1b31 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -196,6 +196,10 @@ stdout := rktlog.Logger(os.Stdout, "", false)
 
 Here, the prefix is an empty string and debug is set to `false`.
 
+## Debugging
+
+Check out the [debugging guide](devel/debugging.md) for some common techniques that can be used to debug rkt.
+
 ## Finishing Up
 
 At this point, you should be good to submit a PR.

From 76c821fdda4d6571a04b9cdf99a3f7f56fe5420c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 5 Jan 2018 17:01:10 +0100
Subject: [PATCH 1262/1304] Documentation: add initial troubleshooting doc

It's useful to have common problems with their solutions or workarounds
in one document.

This starts a troubleshooting document.
---
 Documentation/dependencies.md    |  2 +-
 Documentation/troubleshooting.md | 96 ++++++++++++++++++++++++++++++++
 README.md                        | 10 +---
 3 files changed, 98 insertions(+), 10 deletions(-)
 create mode 100644 Documentation/troubleshooting.md

diff --git a/Documentation/dependencies.md b/Documentation/dependencies.md
index d28324176d..9ad79faa6f 100644
--- a/Documentation/dependencies.md
+++ b/Documentation/dependencies.md
@@ -66,7 +66,7 @@ For the most part the codebase is self-contained (e.g. all dependencies are vend
 
 ## Run-time dependencies
 
-* Linux 3.18+ (ideally 4.3+ to have overlay-on-overlay working), with the following options configured:
+* Linux 3.18+ (ideally 4.9+ to avoid the issues listed in the [troubleshooting document](troubleshooting.md)), with the following options configured:
   * CONFIG_CGROUPS
   * CONFIG_NAMESPACES
   * CONFIG_UTS_NS
diff --git a/Documentation/troubleshooting.md b/Documentation/troubleshooting.md
new file mode 100644
index 0000000000..8c943e2695
--- /dev/null
+++ b/Documentation/troubleshooting.md
@@ -0,0 +1,96 @@
+# Troubleshooting
+
+This document lists common rkt problems and how to fix or work around them.
+
+## Missing container logs
+
+When checking the logs of a container, they might be missing with an error like this:
+
+```
+$ journalctl -M rkt-3f045be0-1632-42f1-ba15-df984a82636f
+Journal file /var/lib/rkt/pods/run/3f045be0-1632-42f1-ba15-df984a82636f/stage1/rootfs/var/log/journal/3f045be0163242f1ba15df984a82636f/system.journal uses an unsupported feature, ignoring file.
+-- No entries --
+```
+
+This is because rkt's journald integration is only supported if systemd is compiled with `lz4` compression enabled.
+
+You can check if it is enabled by making sure you see `+LZ4` when running `systemctl --version`:
+
+```
+$ systemctl --version
+systemd 235
+[...] +LZ4 [...]
+```
+
+## Bad system call
+
+During rkt execution, you might encounter the message `Bad system call` followed by rkt terminating.
+It's most likely a result of a too restrictive seccomp profile.
+
+As a workaround, you can disable seccomp with `--insecure-options=seccomp`.
+
+As a proper fix, you can [tweak the seccomp profile][seccomp-guide].
+
+## Operation not permitted errors
+
+During rkt execution, you might encounter a `Operation not permitted` message followed by rkt exiting.
+Your image probably uses more capabilities than allowed in rkt's default list.
+
+As a workaround, you can disable capabilities enforcement with `--insecure-options=capabilities`.
+
+As a proper fix, you can [create your own list][capabilities-guide].
+
+## BTRFS + overlay
+
+```
+prepare-app@opt-stage2-alpine\x2dsh-rootfs.service: Job prepare-app@opt-stage2-alpine\x2dsh-rootfs.service/start failed with result 'dependency'.
+systemd-journald.service: Unit entered failed state.
+systemd-journald.service: Failed with result 'signal'.
+systemd-journald.service: Service has no hold-off time, scheduling restart.
+```
+
+To solve this update to Linux 4.5.2 or newer (see [#2175](https://github.com/rkt/rkt/issues/2175)).
+
+## SELinux + overlay
+
+You might se an error like this one when starting a rkt pod:
+
+```
+/usr/lib/systemd/systemd: error while loading shared libraries: libselinux.so.1: cannot open shared object file: Permission denied
+```
+
+The overlay filesystem doesn't work with SELinux in kernels older than 4.9 (see [1727](https://github.com/rkt/rkt/issues/1727)).
+Please update your kernel to a newer version.
+
+## Garbage collect not working in old kernels
+
+You might see messages like these when running `rkt gc`:
+
+```
+Unable to remove pod "42e78965-c60b-4f4f-b412-484cd381fe90": remove /var/lib/rkt/pods/exited-garbage/42e78965-c60b-4f4f-b412-484cd381fe90/stage1/rootfs: device or resource busy
+```
+
+This might be due to using a kernel older than 3.18 (see [lazy umounts on unlinked files and directories](https://github.com/torvalds/linux/commit/8ed936b) and [#1922](https://github.com/rkt/rkt/issues/1922)).
+Please update your kernel to a newer version.
+
+## Running rkt on top of an overlay filesystem
+
+Due to limitations in the Linux kernel, using rkt's overlay support on top of an overlay filesystem requires the upperdir and workdir to support the creation of trusted.* extended attributes and valid d_type in readdir responses (see [kernel/Documentation/filesystems/overlayfs.txt](https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt)).
+
+The symptom is an error message like this:
+
+```
+stage0: error setting up stage1
+  └─error rendering overlay filesystem
+    └─problem mounting overlay filesystem
+      └─error mounting overlay with options 'lowerdir=/var/lib/rkt/cas/tree/deps-sha512-f3d5f69d7faba1be7067d610f33131c18ac59eb43b1495016ade65bd13912578/rootfs,upperdir=/var/lib/rkt/pods/run/307bd207-7eab-4028-8d12-2d525e5b8ed9/overlay/deps-sha512-f3d5f69d7faba1be7067d610f33131c18ac59eb43b1495016ade65bd13912578/upper,workdir=/var/lib/rkt/pods/run/307bd207-7eab-4028-8d12-2d525e5b8ed9/overlay/deps-sha512-f3d5f69d7faba1be7067d610f33131c18ac59eb43b1495016ade65bd13912578/work' and dest '/var/lib/rkt/pods/run/307bd207-7eab-4028-8d12-2d525e5b8ed9/stage1/rootfs'
+        └─invalid argument
+```
+
+This problem typically happens when trying to run rkt inside rkt.
+To successfuly run rkt inside rkt, use one of the following workarounds:
+- set up `/var/lib/rkt` in the outer rkt as a host volume
+- use `--no-overlay` for either the outer or the inner rkt
+
+[capabilities-guide]: capabilities-guide.md
+[seccomp-guide]: seccomp-guide.md
diff --git a/README.md b/README.md
index b0b434ad32..5f3851c19a 100644
--- a/README.md
+++ b/README.md
@@ -81,15 +81,7 @@ For more information, see the [CoreOS security disclosure page](https://coreos.c
 
 ## Known issues
 
-Due to limitations in the Linux kernel, using rkt's overlay support on top of an overlay filesystem requires the upperdir and workdir to support the creation of trusted.* extended attributes and valid d_type in readdir responses (see [kernel/Documentation/filesystems/overlayfs.txt](https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt)). When starting rkt inside rkt this means that either:
-- the inner `/var/lib/rkt` directory needs to be mounted on a host volume.
-- the outer or inner rkt container needs to be started using `--no-overlay`.
-
-Due to a bug in the Linux kernel, using rkt when `/var/lib/rkt` is on btrfs requires Linux 4.5.2+ ([#2175](https://github.com/rkt/rkt/issues/2175)).
-
-Due to a bug in the Linux kernel, using rkt's overlay support in conjunction with SELinux requires a set of patches that are only currently available on some Linux distributions (for example, [CoreOS Linux](https://github.com/coreos/coreos-overlay/tree/master/sys-kernel/coreos-sources/files)). Work is ongoing to merge this work into the mainline Linux kernel ([#1727](https://github.com/rkt/rkt/issues/1727#issuecomment-173203129)).
-
-Linux 3.18+ is required to successfully garbage collect rkt pods when system services such as udevd are in a slave mount namespace (see [lazy umounts on unlinked files and directories](https://github.com/torvalds/linux/commit/8ed936b) and [#1922](https://github.com/rkt/rkt/issues/1922)).
+Check the [troubleshooting document](Documentation/troubleshooting.md).
 
 ## Related Links
 

From e3fa3d83cb44588909e2920ece7e0b962aecd4af Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 11 Jan 2018 09:59:24 -0800
Subject: [PATCH 1263/1304] scripts: Add libfdt to install deps

libfdt-dev is needed when building kernels for architectures that
support a device tree.

Fixes build errors like these when building kvm+lkvm flavor for
ARM64:

  Makefile: No libfdt found. Please install libfdt-dev package. Stop.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 scripts/install-deps-debian-sid.sh | 2 +-
 scripts/install-deps-fedora-22.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install-deps-debian-sid.sh b/scripts/install-deps-debian-sid.sh
index 43adf6ef41..a4d6be37ea 100755
--- a/scripts/install-deps-debian-sid.sh
+++ b/scripts/install-deps-debian-sid.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev gpg gpg-agent make automake wget git golang-go coreutils cpio squashfs-tools autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libtspi-dev libsystemd-dev python pkg-config zlib1g-dev libglib2.0-dev libpixman-1-dev libcap-dev"
+DEBIAN_SID_DEPS="ca-certificates gcc libc6-dev gpg gpg-agent make automake wget git golang-go coreutils cpio squashfs-tools autoconf file xz-utils patch bc locales libacl1-dev libssl-dev libtspi-dev libsystemd-dev python pkg-config zlib1g-dev libglib2.0-dev libpixman-1-dev libcap-dev libfdt-dev"
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
diff --git a/scripts/install-deps-fedora-22.sh b/scripts/install-deps-fedora-22.sh
index adea45ba7f..8ebc3b3426 100755
--- a/scripts/install-deps-fedora-22.sh
+++ b/scripts/install-deps-fedora-22.sh
@@ -2,6 +2,6 @@
 
 set -e
 
-FEDORA22_DEPS="make gcc glibc-devel glibc-static cpio squashfs-tools gpg autoconf automake golang file git wget tar xz patch bc hostname findutils openssl libacl-devel openssl-devel systemd-devel"
+FEDORA22_DEPS="make gcc glibc-devel glibc-static cpio squashfs-tools gpg autoconf automake golang file git wget tar xz patch bc hostname findutils openssl libacl-devel openssl-devel systemd-devel libfdt-devel"
 
 dnf install -y ${FEDORA22_DEPS}

From b9da52f90d6b27dab6dd54e9a1bc69b6600319cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Fri, 15 Dec 2017 16:18:55 +0100
Subject: [PATCH 1264/1304] api: add HTML and Markdown documentation

It's generated in `scripts/genproto.sh` using pseudomuto/protoc-gen-doc.
---
 api/v1alpha/README.md       |    4 +
 api/v1alpha/docs/docs.md    |  629 ++++++++++++
 api/v1alpha/docs/index.html | 1794 +++++++++++++++++++++++++++++++++++
 scripts/genproto.sh         |   23 +-
 4 files changed, 2449 insertions(+), 1 deletion(-)
 create mode 100644 api/v1alpha/docs/docs.md
 create mode 100644 api/v1alpha/docs/index.html

diff --git a/api/v1alpha/README.md b/api/v1alpha/README.md
index 5af1132f63..1c0e2a7cbb 100644
--- a/api/v1alpha/README.md
+++ b/api/v1alpha/README.md
@@ -19,3 +19,7 @@ and execute from the top-level directory:
 ```
 $ make protobuf
 ```
+
+## Documentation
+
+HTML and Markdown Protobuf documentation is automatically generated and placed in [docs](docs/).
diff --git a/api/v1alpha/docs/docs.md b/api/v1alpha/docs/docs.md
new file mode 100644
index 0000000000..d3e6e0f59e
--- /dev/null
+++ b/api/v1alpha/docs/docs.md
@@ -0,0 +1,629 @@
+# Protocol Documentation
+<a name="top"/>
+
+## Table of Contents
+
+- [api.proto](#api.proto)
+    - [App](#v1alpha.App)
+    - [Event](#v1alpha.Event)
+    - [EventFilter](#v1alpha.EventFilter)
+    - [GetInfoRequest](#v1alpha.GetInfoRequest)
+    - [GetInfoResponse](#v1alpha.GetInfoResponse)
+    - [GetLogsRequest](#v1alpha.GetLogsRequest)
+    - [GetLogsResponse](#v1alpha.GetLogsResponse)
+    - [GlobalFlags](#v1alpha.GlobalFlags)
+    - [Image](#v1alpha.Image)
+    - [ImageFilter](#v1alpha.ImageFilter)
+    - [ImageFormat](#v1alpha.ImageFormat)
+    - [Info](#v1alpha.Info)
+    - [InspectImageRequest](#v1alpha.InspectImageRequest)
+    - [InspectImageResponse](#v1alpha.InspectImageResponse)
+    - [InspectPodRequest](#v1alpha.InspectPodRequest)
+    - [InspectPodResponse](#v1alpha.InspectPodResponse)
+    - [KeyValue](#v1alpha.KeyValue)
+    - [ListImagesRequest](#v1alpha.ListImagesRequest)
+    - [ListImagesResponse](#v1alpha.ListImagesResponse)
+    - [ListPodsRequest](#v1alpha.ListPodsRequest)
+    - [ListPodsResponse](#v1alpha.ListPodsResponse)
+    - [ListenEventsRequest](#v1alpha.ListenEventsRequest)
+    - [ListenEventsResponse](#v1alpha.ListenEventsResponse)
+    - [Network](#v1alpha.Network)
+    - [Pod](#v1alpha.Pod)
+    - [PodFilter](#v1alpha.PodFilter)
+  
+    - [AppState](#v1alpha.AppState)
+    - [EventType](#v1alpha.EventType)
+    - [ImageType](#v1alpha.ImageType)
+    - [PodState](#v1alpha.PodState)
+  
+  
+    - [PublicAPI](#v1alpha.PublicAPI)
+  
+
+- [Scalar Value Types](#scalar-value-types)
+
+
+
+<a name="api.proto"/>
+<p align="right"><a href="#top">Top</a></p>
+
+## api.proto
+
+
+
+<a name="v1alpha.App"/>
+
+### App
+App describes the information of an app that&#39;s running in a pod.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| name | [string](#string) |  | Name of the app, required. |
+| image | [Image](#v1alpha.Image) |  | Image used by the app, required. However, this may only contain the image id if it is returned by ListPods(). |
+| state | [AppState](#v1alpha.AppState) |  | State of the app. optional, non-empty only if it&#39;s returned by InspectPod(). |
+| exit_code | [sint32](#sint32) |  | Exit code of the app. optional, only valid if it&#39;s returned by InspectPod() and the app has already exited. |
+| annotations | [KeyValue](#v1alpha.KeyValue) | repeated | Annotations for this app. |
+
+
+
+
+
+
+<a name="v1alpha.Event"/>
+
+### Event
+Event describes the events that will be received via ListenEvents().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| type | [EventType](#v1alpha.EventType) |  | Type of the event, required. |
+| id | [string](#string) |  | ID of the subject that causes the event, required. If the event is a pod or app event, the id is the pod&#39;s uuid. If the event is an image event, the id is the image&#39;s id. |
+| from | [string](#string) |  | Name of the subject that causes the event, required. If the event is a pod event, the name is the pod&#39;s name. If the event is an app event, the name is the app&#39;s name. If the event is an image event, the name is the image&#39;s name. |
+| time | [int64](#int64) |  | Timestamp of when the event happens, it is the seconds since epoch, required. |
+| data | [KeyValue](#v1alpha.KeyValue) | repeated | Data of the event, in the form of key-value pairs, optional. |
+
+
+
+
+
+
+<a name="v1alpha.EventFilter"/>
+
+### EventFilter
+EventFilter defines the condition that the returned events needs to satisfy in ListImages().
+The condition are combined by &#39;AND&#39;.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| types | [EventType](#v1alpha.EventType) | repeated | If not empty, then only returns the events that have the listed types. |
+| ids | [string](#string) | repeated | If not empty, then only returns the events whose &#39;id&#39; is included in the listed ids. |
+| names | [string](#string) | repeated | If not empty, then only returns the events whose &#39;from&#39; is included in the listed names. |
+| since_time | [int64](#int64) |  | If set, then only returns the events after this timestamp. If the server starts after since_time, then only the events happened after the start of the server will be returned. If since_time is a future timestamp, then no events will be returned until that time. |
+| until_time | [int64](#int64) |  | If set, then only returns the events before this timestamp. If it is a future timestamp, then the event stream will be closed at that moment. |
+
+
+
+
+
+
+<a name="v1alpha.GetInfoRequest"/>
+
+### GetInfoRequest
+Request for GetInfo().
+
+
+
+
+
+
+<a name="v1alpha.GetInfoResponse"/>
+
+### GetInfoResponse
+Response for GetInfo().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| info | [Info](#v1alpha.Info) |  | Required. |
+
+
+
+
+
+
+<a name="v1alpha.GetLogsRequest"/>
+
+### GetLogsRequest
+Request for GetLogs().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| pod_id | [string](#string) |  | ID of the pod which we will get logs from, required. |
+| app_name | [string](#string) |  | Name of the app within the pod which we will get logs from, optional. If not set, then the logs of all the apps within the pod will be returned. |
+| lines | [int32](#int32) |  | Number of most recent lines to return, optional. |
+| follow | [bool](#bool) |  | If true, then a response stream will not be closed, and new log response will be sent via the stream, default is false. |
+| since_time | [int64](#int64) |  | If set, then only the logs after the timestamp will be returned, optional. |
+| until_time | [int64](#int64) |  | If set, then only the logs before the timestamp will be returned, optional. |
+
+
+
+
+
+
+<a name="v1alpha.GetLogsResponse"/>
+
+### GetLogsResponse
+Response for GetLogs().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| lines | [string](#string) | repeated | List of the log lines that returned, optional as the response can contain no logs. |
+
+
+
+
+
+
+<a name="v1alpha.GlobalFlags"/>
+
+### GlobalFlags
+GlobalFlags describes the flags that passed to rkt api service when it is launched.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| dir | [string](#string) |  | Data directory. |
+| system_config_dir | [string](#string) |  | System configuration directory. |
+| local_config_dir | [string](#string) |  | Local configuration directory. |
+| user_config_dir | [string](#string) |  | User configuration directory. |
+| insecure_flags | [string](#string) |  | Insecure flags configurates what security features to disable. |
+| trust_keys_from_https | [bool](#bool) |  | Whether to automatically trust gpg keys fetched from https |
+
+
+
+
+
+
+<a name="v1alpha.Image"/>
+
+### Image
+Image describes the image&#39;s information.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| base_format | [ImageFormat](#v1alpha.ImageFormat) |  | Base format of the image, required. This indicates the original format for the image as nowadays all the image formats will be transformed to ACI. |
+| id | [string](#string) |  | ID of the image, a string that can be used to uniquely identify the image, e.g. sha512 hash of the ACIs, required. |
+| name | [string](#string) |  | Name of the image in the image manifest, e.g. &#39;coreos.com/etcd&#39;, optional. |
+| version | [string](#string) |  | Version of the image, e.g. &#39;latest&#39;, &#39;2.0.10&#39;, optional. |
+| import_timestamp | [int64](#int64) |  | Timestamp of when the image is imported, it is the seconds since epoch, optional. |
+| manifest | [bytes](#bytes) |  | JSON-encoded byte array that represents the image manifest, optional. |
+| size | [int64](#int64) |  | Size is the size in bytes of this image in the store. |
+| annotations | [KeyValue](#v1alpha.KeyValue) | repeated | Annotations on this image. |
+| labels | [KeyValue](#v1alpha.KeyValue) | repeated | Labels of this image. |
+
+
+
+
+
+
+<a name="v1alpha.ImageFilter"/>
+
+### ImageFilter
+ImageFilter defines the condition that the returned images need to satisfy in ListImages().
+The conditions are combined by &#39;AND&#39;, and different filters are combined by &#39;OR&#39;.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| ids | [string](#string) | repeated | If not empty, the images that have any of the ids will be returned. |
+| prefixes | [string](#string) | repeated | if not empty, the images that have any of the prefixes in the name will be returned. |
+| base_names | [string](#string) | repeated | If not empty, the images that have any of the base names will be returned. For example, both &#39;coreos.com/etcd&#39; and &#39;k8s.io/etcd&#39; will be returned if &#39;etcd&#39; is included, however &#39;k8s.io/etcd-backup&#39; will not be returned. |
+| keywords | [string](#string) | repeated | If not empty, the images that have any of the keywords in the name will be returned. For example, both &#39;kubernetes-etcd&#39;, &#39;etcd:latest&#39; will be returned if &#39;etcd&#39; is included, |
+| labels | [KeyValue](#v1alpha.KeyValue) | repeated | If not empty, the images that have all of the labels will be returned. |
+| imported_after | [int64](#int64) |  | If set, the images that are imported after this timestamp will be returned. |
+| imported_before | [int64](#int64) |  | If set, the images that are imported before this timestamp will be returned. |
+| annotations | [KeyValue](#v1alpha.KeyValue) | repeated | If not empty, the images that have all of the annotations will be returned. |
+| full_names | [string](#string) | repeated | If not empty, the images that have any of the exact full names will be returned. |
+
+
+
+
+
+
+<a name="v1alpha.ImageFormat"/>
+
+### ImageFormat
+ImageFormat defines the format of the image.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| type | [ImageType](#v1alpha.ImageType) |  | Type of the image, required. |
+| version | [string](#string) |  | Version of the image format, required. |
+
+
+
+
+
+
+<a name="v1alpha.Info"/>
+
+### Info
+Info describes the information of rkt on the machine.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| rkt_version | [string](#string) |  | Version of rkt, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/). |
+| appc_version | [string](#string) |  | Version of appc, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/). |
+| api_version | [string](#string) |  | Latest version of the api that&#39;s supported by the service, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/). |
+| global_flags | [GlobalFlags](#v1alpha.GlobalFlags) |  | The global flags that passed to the rkt api service when it&#39;s launched. |
+
+
+
+
+
+
+<a name="v1alpha.InspectImageRequest"/>
+
+### InspectImageRequest
+Request for InspectImage().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| id | [string](#string) |  | Required. |
+
+
+
+
+
+
+<a name="v1alpha.InspectImageResponse"/>
+
+### InspectImageResponse
+Response for InspectImage().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| image | [Image](#v1alpha.Image) |  | Required. |
+
+
+
+
+
+
+<a name="v1alpha.InspectPodRequest"/>
+
+### InspectPodRequest
+Request for InspectPod().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| id | [string](#string) |  | ID of the pod which we are querying status for, required. |
+
+
+
+
+
+
+<a name="v1alpha.InspectPodResponse"/>
+
+### InspectPodResponse
+Response for InspectPod().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| pod | [Pod](#v1alpha.Pod) |  | Required. |
+
+
+
+
+
+
+<a name="v1alpha.KeyValue"/>
+
+### KeyValue
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| Key | [string](#string) |  | Key part of the key-value pair. |
+| value | [string](#string) |  | Value part of the key-value pair. |
+
+
+
+
+
+
+<a name="v1alpha.ListImagesRequest"/>
+
+### ListImagesRequest
+Request for ListImages().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| filters | [ImageFilter](#v1alpha.ImageFilter) | repeated | Optional. |
+| detail | [bool](#bool) |  | Optional. |
+
+
+
+
+
+
+<a name="v1alpha.ListImagesResponse"/>
+
+### ListImagesResponse
+Response for ListImages().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| images | [Image](#v1alpha.Image) | repeated | Required. |
+
+
+
+
+
+
+<a name="v1alpha.ListPodsRequest"/>
+
+### ListPodsRequest
+Request for ListPods().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| filters | [PodFilter](#v1alpha.PodFilter) | repeated | Optional. |
+| detail | [bool](#bool) |  | Optional. |
+
+
+
+
+
+
+<a name="v1alpha.ListPodsResponse"/>
+
+### ListPodsResponse
+Response for ListPods().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| pods | [Pod](#v1alpha.Pod) | repeated | Required. |
+
+
+
+
+
+
+<a name="v1alpha.ListenEventsRequest"/>
+
+### ListenEventsRequest
+Request for ListenEvents().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| filter | [EventFilter](#v1alpha.EventFilter) |  | Optional. |
+
+
+
+
+
+
+<a name="v1alpha.ListenEventsResponse"/>
+
+### ListenEventsResponse
+Response for ListenEvents().
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| events | [Event](#v1alpha.Event) | repeated | Aggregate multiple events to reduce round trips, optional as the response can contain no events. |
+
+
+
+
+
+
+<a name="v1alpha.Network"/>
+
+### Network
+Network describes the network information of a pod.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| name | [string](#string) |  | Name of the network that a pod belongs to, required. |
+| ipv4 | [string](#string) |  | Pod&#39;s IPv4 address within the network, optional if IPv6 address is given. |
+| ipv6 | [string](#string) |  | Pod&#39;s IPv6 address within the network, optional if IPv4 address is given. |
+
+
+
+
+
+
+<a name="v1alpha.Pod"/>
+
+### Pod
+Pod describes a pod&#39;s information.
+If a pod is in Embryo, Preparing, AbortedPrepare state,
+only id and state will be returned.
+
+If a pod is in other states, the pod manifest and
+apps will be returned when &#39;detailed&#39; is true in the request.
+
+A valid pid of the stage1 process of the pod will be returned
+if the pod is Running has run once.
+
+Networks are only returned when a pod is in Running.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| id | [string](#string) |  | ID of the pod, in the form of a UUID. |
+| pid | [sint32](#sint32) |  | PID of the stage1 process of the pod. |
+| state | [PodState](#v1alpha.PodState) |  | State of the pod. |
+| apps | [App](#v1alpha.App) | repeated | List of apps in the pod. |
+| networks | [Network](#v1alpha.Network) | repeated | Network information of the pod. Note that a pod can be in multiple networks. |
+| manifest | [bytes](#bytes) |  | JSON-encoded byte array that represents the pod manifest of the pod. |
+| annotations | [KeyValue](#v1alpha.KeyValue) | repeated | Annotations on this pod. |
+| cgroup | [string](#string) |  | Cgroup of the pod, empty if the pod is not running. |
+| created_at | [int64](#int64) |  | Timestamp of when the pod is created, nanoseconds since epoch. Zero if the pod is not created. |
+| started_at | [int64](#int64) |  | Timestamp of when the pod is started, nanoseconds since epoch. Zero if the pod is not started. |
+| gc_marked_at | [int64](#int64) |  | Timestamp of when the pod is moved to exited-garbage/garbage, in nanoseconds since epoch. Zero if the pod is not moved to exited-garbage/garbage yet. |
+
+
+
+
+
+
+<a name="v1alpha.PodFilter"/>
+
+### PodFilter
+PodFilter defines the condition that the returned pods need to satisfy in ListPods().
+The conditions are combined by &#39;AND&#39;, and different filters are combined by &#39;OR&#39;.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| ids | [string](#string) | repeated | If not empty, the pods that have any of the ids will be returned. |
+| states | [PodState](#v1alpha.PodState) | repeated | If not empty, the pods that have any of the states will be returned. |
+| app_names | [string](#string) | repeated | If not empty, the pods that all of the apps will be returned. |
+| image_ids | [string](#string) | repeated | If not empty, the pods that have all of the images(in the apps) will be returned |
+| network_names | [string](#string) | repeated | If not empty, the pods that are in all of the networks will be returned. |
+| annotations | [KeyValue](#v1alpha.KeyValue) | repeated | If not empty, the pods that have all of the annotations will be returned. |
+| cgroups | [string](#string) | repeated | If not empty, the pods whose cgroup are listed will be returned. |
+| pod_sub_cgroups | [string](#string) | repeated | If not empty, the pods whose these cgroup belong to will be returned. i.e. the pod&#39;s cgroup is a prefix of the specified cgroup |
+
+
+
+
+
+ 
+
+
+<a name="v1alpha.AppState"/>
+
+### AppState
+AppState defines the possible states of the app.
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| APP_STATE_UNDEFINED | 0 |  |
+| APP_STATE_RUNNING | 1 |  |
+| APP_STATE_EXITED | 2 |  |
+
+
+
+<a name="v1alpha.EventType"/>
+
+### EventType
+EventType defines the type of the events that will be received via ListenEvents().
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| EVENT_TYPE_UNDEFINED | 0 |  |
+| EVENT_TYPE_POD_PREPARED | 1 | Pod events. |
+| EVENT_TYPE_POD_PREPARE_ABORTED | 2 |  |
+| EVENT_TYPE_POD_STARTED | 3 |  |
+| EVENT_TYPE_POD_EXITED | 4 |  |
+| EVENT_TYPE_POD_GARBAGE_COLLECTED | 5 |  |
+| EVENT_TYPE_APP_STARTED | 6 | App events. |
+| EVENT_TYPE_APP_EXITED | 7 | (XXX)yifan: Maybe also return exit code in the event object? |
+| EVENT_TYPE_IMAGE_IMPORTED | 8 | Image events. |
+| EVENT_TYPE_IMAGE_REMOVED | 9 |  |
+
+
+
+<a name="v1alpha.ImageType"/>
+
+### ImageType
+ImageType defines the supported image type.
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| IMAGE_TYPE_UNDEFINED | 0 |  |
+| IMAGE_TYPE_APPC | 1 |  |
+| IMAGE_TYPE_DOCKER | 2 |  |
+| IMAGE_TYPE_OCI | 3 |  |
+
+
+
+<a name="v1alpha.PodState"/>
+
+### PodState
+PodState defines the possible states of the pod.
+See https://github.com/rkt/rkt/blob/master/Documentation/devel/pod-lifecycle.md for a detailed
+explanation of each state.
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| POD_STATE_UNDEFINED | 0 |  |
+| POD_STATE_EMBRYO | 1 | States before the pod is running. Pod is created, ready to entering &#39;preparing&#39; state. |
+| POD_STATE_PREPARING | 2 | Pod is being prepared. On success it will become &#39;prepared&#39;, otherwise it will become &#39;aborted prepared&#39;. |
+| POD_STATE_PREPARED | 3 | Pod has been successfully prepared, ready to enter &#39;running&#39; state. it can also enter &#39;deleting&#39; if it&#39;s garbage collected before running. |
+| POD_STATE_RUNNING | 4 | State that indicates the pod is running. Pod is running, when it exits, it will become &#39;exited&#39;. |
+| POD_STATE_ABORTED_PREPARE | 5 | States that indicates the pod is exited, and will never run. Pod failed to prepare, it will only be garbage collected and will never run again. |
+| POD_STATE_EXITED | 6 | Pod has exited, it now can be garbage collected. |
+| POD_STATE_DELETING | 7 | Pod is being garbage collected, after that it will enter &#39;garbage&#39; state. |
+| POD_STATE_GARBAGE | 8 | Pod is marked as garbage collected, it no longer exists on the machine. |
+
+
+ 
+
+ 
+
+
+<a name="v1alpha.PublicAPI"/>
+
+### PublicAPI
+PublicAPI defines the read-only APIs that will be supported.
+These will be handled over TCP sockets.
+
+| Method Name | Request Type | Response Type | Description |
+| ----------- | ------------ | ------------- | ------------|
+| GetInfo | [GetInfoRequest](#v1alpha.GetInfoRequest) | [GetInfoResponse](#v1alpha.GetInfoRequest) | GetInfo gets the rkt&#39;s information on the machine. |
+| ListPods | [ListPodsRequest](#v1alpha.ListPodsRequest) | [ListPodsResponse](#v1alpha.ListPodsRequest) | ListPods lists rkt pods on the machine. |
+| InspectPod | [InspectPodRequest](#v1alpha.InspectPodRequest) | [InspectPodResponse](#v1alpha.InspectPodRequest) | InspectPod gets detailed pod information of the specified pod. |
+| ListImages | [ListImagesRequest](#v1alpha.ListImagesRequest) | [ListImagesResponse](#v1alpha.ListImagesRequest) | ListImages lists the images on the machine. |
+| InspectImage | [InspectImageRequest](#v1alpha.InspectImageRequest) | [InspectImageResponse](#v1alpha.InspectImageRequest) | InspectImage gets the detailed image information of the specified image. |
+| ListenEvents | [ListenEventsRequest](#v1alpha.ListenEventsRequest) | [ListenEventsResponse](#v1alpha.ListenEventsRequest) | ListenEvents listens for the events, it will return a response stream that will contain event objects. |
+| GetLogs | [GetLogsRequest](#v1alpha.GetLogsRequest) | [GetLogsResponse](#v1alpha.GetLogsRequest) | GetLogs gets the logs for a pod, if the app is also specified, then only the logs of the app will be returned. If &#39;follow&#39; in the &#39;GetLogsRequest&#39; is set to &#39;true&#39;, then the response stream will not be closed after the first response, the future logs will be sent via the stream. |
+
+ 
+
+
+
+## Scalar Value Types
+
+| .proto Type | Notes | C++ Type | Java Type | Python Type |
+| ----------- | ----- | -------- | --------- | ----------- |
+| <a name="double" /> double |  | double | double | float |
+| <a name="float" /> float |  | float | float | float |
+| <a name="int32" /> int32 | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint32 instead. | int32 | int | int |
+| <a name="int64" /> int64 | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint64 instead. | int64 | long | int/long |
+| <a name="uint32" /> uint32 | Uses variable-length encoding. | uint32 | int | int/long |
+| <a name="uint64" /> uint64 | Uses variable-length encoding. | uint64 | long | int/long |
+| <a name="sint32" /> sint32 | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int32s. | int32 | int | int |
+| <a name="sint64" /> sint64 | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int64s. | int64 | long | int/long |
+| <a name="fixed32" /> fixed32 | Always four bytes. More efficient than uint32 if values are often greater than 2^28. | uint32 | int | int |
+| <a name="fixed64" /> fixed64 | Always eight bytes. More efficient than uint64 if values are often greater than 2^56. | uint64 | long | int/long |
+| <a name="sfixed32" /> sfixed32 | Always four bytes. | int32 | int | int |
+| <a name="sfixed64" /> sfixed64 | Always eight bytes. | int64 | long | int/long |
+| <a name="bool" /> bool |  | bool | boolean | boolean |
+| <a name="string" /> string | A string must always contain UTF-8 encoded or 7-bit ASCII text. | string | String | str/unicode |
+| <a name="bytes" /> bytes | May contain any arbitrary sequence of bytes. | string | ByteString | str |
+
diff --git a/api/v1alpha/docs/index.html b/api/v1alpha/docs/index.html
new file mode 100644
index 0000000000..6d78c9405c
--- /dev/null
+++ b/api/v1alpha/docs/index.html
@@ -0,0 +1,1794 @@
+<!DOCTYPE html>
+
+<html>
+  <head>
+    <title>Protocol Documentation</title>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic"/>
+    <style>
+      body {
+        width: 60em;
+        margin: 1em auto;
+        color: #222;
+        font-family: "Ubuntu", sans-serif;
+        padding-bottom: 4em;
+      }
+
+      h1 {
+        font-weight: normal;
+        border-bottom: 1px solid #aaa;
+        padding-bottom: 0.5ex;
+      }
+
+      h2 {
+        border-bottom: 1px solid #aaa;
+        padding-bottom: 0.5ex;
+        margin: 1.5em 0;
+      }
+
+      h3 {
+        font-weight: normal;
+        border-bottom: 1px solid #aaa;
+        padding-bottom: 0.5ex;
+      }
+
+      a {
+        text-decoration: none;
+        color: #567e25;
+      }
+
+      table {
+        width: 100%;
+        font-size: 80%;
+        border-collapse: collapse;
+      }
+
+      thead {
+        font-weight: 700;
+        background-color: #dcdcdc;
+      }
+
+      tbody tr:nth-child(even) {
+        background-color: #fbfbfb;
+      }
+
+      td {
+        border: 1px solid #ccc;
+        padding: 0.5ex 2ex;
+      }
+
+      td p {
+        text-indent: 1em;
+        margin: 0;
+      }
+
+      td p:nth-child(1) {
+        text-indent: 0;  
+      }
+
+       
+      .field-table td:nth-child(1) {  
+        width: 10em;
+      }
+      .field-table td:nth-child(2) {  
+        width: 10em;
+      }
+      .field-table td:nth-child(3) {  
+        width: 6em;
+      }
+      .field-table td:nth-child(4) {  
+        width: auto;
+      }
+
+       
+      .extension-table td:nth-child(1) {  
+        width: 10em;
+      }
+      .extension-table td:nth-child(2) {  
+        width: 10em;
+      }
+      .extension-table td:nth-child(3) {  
+        width: 10em;
+      }
+      .extension-table td:nth-child(4) {  
+        width: 5em;
+      }
+      .extension-table td:nth-child(5) {  
+        width: auto;
+      }
+
+       
+      .enum-table td:nth-child(1) {  
+        width: 10em;
+      }
+      .enum-table td:nth-child(2) {  
+        width: 10em;
+      }
+      .enum-table td:nth-child(3) {  
+        width: auto;
+      }
+
+       
+      .scalar-value-types-table tr {
+        height: 3em;
+      }
+
+       
+      #toc-container ul {
+        list-style-type: none;
+        padding-left: 1em;
+        line-height: 180%;
+        margin: 0;
+      }
+      #toc > li > a {
+        font-weight: bold;
+      }
+
+       
+      .file-heading {
+        width: 100%;
+        display: table;
+        border-bottom: 1px solid #aaa;
+        margin: 4em 0 1.5em 0;
+      }
+      .file-heading h2 {
+        border: none;
+        display: table-cell;
+      }
+      .file-heading a {
+        text-align: right;
+        display: table-cell;
+      }
+
+       
+      .badge {
+        width: 1.6em;
+        height: 1.6em;
+        display: inline-block;
+
+        line-height: 1.6em;
+        text-align: center;
+        font-weight: bold;
+        font-size: 60%;
+
+        color: #89ba48;
+        background-color: #dff0c8;
+
+        margin: 0.5ex 1em 0.5ex -1em;
+        border: 1px solid #fbfbfb;
+        border-radius: 1ex;
+      }
+    </style>
+
+    
+    <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
+  </head>
+
+  <body>
+
+    <h1 id="title">Protocol Documentation</h1>
+
+    <h2>Table of Contents</h2>
+
+    <div id="toc-container">
+      <ul id="toc">
+        
+          
+          <li>
+            <a href="#api.proto">api.proto</a>
+            <ul>
+              
+                <li>
+                  <a href="#v1alpha.App"><span class="badge">M</span>App</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.Event"><span class="badge">M</span>Event</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.EventFilter"><span class="badge">M</span>EventFilter</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.GetInfoRequest"><span class="badge">M</span>GetInfoRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.GetInfoResponse"><span class="badge">M</span>GetInfoResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.GetLogsRequest"><span class="badge">M</span>GetLogsRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.GetLogsResponse"><span class="badge">M</span>GetLogsResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.GlobalFlags"><span class="badge">M</span>GlobalFlags</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.Image"><span class="badge">M</span>Image</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.ImageFilter"><span class="badge">M</span>ImageFilter</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.ImageFormat"><span class="badge">M</span>ImageFormat</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.Info"><span class="badge">M</span>Info</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.InspectImageRequest"><span class="badge">M</span>InspectImageRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.InspectImageResponse"><span class="badge">M</span>InspectImageResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.InspectPodRequest"><span class="badge">M</span>InspectPodRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.InspectPodResponse"><span class="badge">M</span>InspectPodResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.KeyValue"><span class="badge">M</span>KeyValue</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.ListImagesRequest"><span class="badge">M</span>ListImagesRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.ListImagesResponse"><span class="badge">M</span>ListImagesResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.ListPodsRequest"><span class="badge">M</span>ListPodsRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.ListPodsResponse"><span class="badge">M</span>ListPodsResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.ListenEventsRequest"><span class="badge">M</span>ListenEventsRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.ListenEventsResponse"><span class="badge">M</span>ListenEventsResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.Network"><span class="badge">M</span>Network</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.Pod"><span class="badge">M</span>Pod</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.PodFilter"><span class="badge">M</span>PodFilter</a>
+                </li>
+              
+              
+                <li>
+                  <a href="#v1alpha.AppState"><span class="badge">E</span>AppState</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.EventType"><span class="badge">E</span>EventType</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.ImageType"><span class="badge">E</span>ImageType</a>
+                </li>
+              
+                <li>
+                  <a href="#v1alpha.PodState"><span class="badge">E</span>PodState</a>
+                </li>
+              
+              
+              
+                <li>
+                  <a href="#v1alpha.PublicAPI"><span class="badge">S</span>PublicAPI</a>
+                </li>
+              
+            </ul>
+          </li>
+        
+        <li><a href="#scalar-value-types">Scalar Value Types</a></li>
+      </ul>
+    </div>
+
+    
+      
+      <div class="file-heading">
+        <h2 id="api.proto">api.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="v1alpha.App">App</h3>
+        <p>App describes the information of an app that's running in a pod.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of the app, required. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>image</td>
+                  <td><a href="#v1alpha.Image">Image</a></td>
+                  <td></td>
+                  <td><p>Image used by the app, required. However, this may only contain the image id
+if it is returned by ListPods(). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>state</td>
+                  <td><a href="#v1alpha.AppState">AppState</a></td>
+                  <td></td>
+                  <td><p>State of the app. optional, non-empty only if it&#39;s returned by InspectPod(). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>exit_code</td>
+                  <td><a href="#sint32">sint32</a></td>
+                  <td></td>
+                  <td><p>Exit code of the app. optional, only valid if it&#39;s returned by InspectPod() and
+the app has already exited. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>annotations</td>
+                  <td><a href="#v1alpha.KeyValue">KeyValue</a></td>
+                  <td>repeated</td>
+                  <td><p>Annotations for this app. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.Event">Event</h3>
+        <p>Event describes the events that will be received via ListenEvents().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>type</td>
+                  <td><a href="#v1alpha.EventType">EventType</a></td>
+                  <td></td>
+                  <td><p>Type of the event, required. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ID of the subject that causes the event, required.
+If the event is a pod or app event, the id is the pod&#39;s uuid.
+If the event is an image event, the id is the image&#39;s id. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>from</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of the subject that causes the event, required.
+If the event is a pod event, the name is the pod&#39;s name.
+If the event is an app event, the name is the app&#39;s name.
+If the event is an image event, the name is the image&#39;s name. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>time</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Timestamp of when the event happens, it is the seconds since epoch, required. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>data</td>
+                  <td><a href="#v1alpha.KeyValue">KeyValue</a></td>
+                  <td>repeated</td>
+                  <td><p>Data of the event, in the form of key-value pairs, optional. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.EventFilter">EventFilter</h3>
+        <p>EventFilter defines the condition that the returned events needs to satisfy in ListImages().</p><p>The condition are combined by 'AND'.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>types</td>
+                  <td><a href="#v1alpha.EventType">EventType</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, then only returns the events that have the listed types. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ids</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, then only returns the events whose &#39;id&#39; is included in the listed ids. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>names</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, then only returns the events whose &#39;from&#39; is included in the listed names. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>since_time</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>If set, then only returns the events after this timestamp.
+If the server starts after since_time, then only the events happened after the start of the server will be returned.
+If since_time is a future timestamp, then no events will be returned until that time. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>until_time</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>If set, then only returns the events before this timestamp.
+If it is a future timestamp, then the event stream will be closed at that moment. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.GetInfoRequest">GetInfoRequest</h3>
+        <p>Request for GetInfo().</p>
+
+        
+
+        
+      
+        <h3 id="v1alpha.GetInfoResponse">GetInfoResponse</h3>
+        <p>Response for GetInfo().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>info</td>
+                  <td><a href="#v1alpha.Info">Info</a></td>
+                  <td></td>
+                  <td><p>Required. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.GetLogsRequest">GetLogsRequest</h3>
+        <p>Request for GetLogs().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>pod_id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ID of the pod which we will get logs from, required. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>app_name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of the app within the pod which we will get logs
+from, optional. If not set, then the logs of all the
+apps within the pod will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>lines</td>
+                  <td><a href="#int32">int32</a></td>
+                  <td></td>
+                  <td><p>Number of most recent lines to return, optional. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>follow</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>If true, then a response stream will not be closed,
+and new log response will be sent via the stream, default is false. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>since_time</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>If set, then only the logs after the timestamp will
+be returned, optional. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>until_time</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>If set, then only the logs before the timestamp will
+be returned, optional. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.GetLogsResponse">GetLogsResponse</h3>
+        <p>Response for GetLogs().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>lines</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>List of the log lines that returned, optional as the response can contain no logs. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.GlobalFlags">GlobalFlags</h3>
+        <p>GlobalFlags describes the flags that passed to rkt api service when it is launched.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>dir</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Data directory. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>system_config_dir</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>System configuration directory. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>local_config_dir</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Local configuration directory. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>user_config_dir</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>User configuration directory. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>insecure_flags</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Insecure flags configurates what security features to disable. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>trust_keys_from_https</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>Whether to automatically trust gpg keys fetched from https </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.Image">Image</h3>
+        <p>Image describes the image's information.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>base_format</td>
+                  <td><a href="#v1alpha.ImageFormat">ImageFormat</a></td>
+                  <td></td>
+                  <td><p>Base format of the image, required. This indicates the original format
+for the image as nowadays all the image formats will be transformed to
+ACI. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ID of the image, a string that can be used to uniquely identify the image,
+e.g. sha512 hash of the ACIs, required. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of the image in the image manifest, e.g. &#39;coreos.com/etcd&#39;, optional. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>version</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Version of the image, e.g. &#39;latest&#39;, &#39;2.0.10&#39;, optional. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>import_timestamp</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Timestamp of when the image is imported, it is the seconds since epoch, optional. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>manifest</td>
+                  <td><a href="#bytes">bytes</a></td>
+                  <td></td>
+                  <td><p>JSON-encoded byte array that represents the image manifest, optional. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>size</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Size is the size in bytes of this image in the store. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>annotations</td>
+                  <td><a href="#v1alpha.KeyValue">KeyValue</a></td>
+                  <td>repeated</td>
+                  <td><p>Annotations on this image. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#v1alpha.KeyValue">KeyValue</a></td>
+                  <td>repeated</td>
+                  <td><p>Labels of this image. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.ImageFilter">ImageFilter</h3>
+        <p>ImageFilter defines the condition that the returned images need to satisfy in ListImages().</p><p>The conditions are combined by 'AND', and different filters are combined by 'OR'.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>ids</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the images that have any of the ids will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>prefixes</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>if not empty, the images that have any of the prefixes in the name will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>base_names</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the images that have any of the base names will be returned.
+For example, both &#39;coreos.com/etcd&#39; and &#39;k8s.io/etcd&#39; will be returned if &#39;etcd&#39; is included,
+however &#39;k8s.io/etcd-backup&#39; will not be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>keywords</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the images that have any of the keywords in the name will be returned.
+For example, both &#39;kubernetes-etcd&#39;, &#39;etcd:latest&#39; will be returned if &#39;etcd&#39; is included, </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#v1alpha.KeyValue">KeyValue</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the images that have all of the labels will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>imported_after</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>If set, the images that are imported after this timestamp will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>imported_before</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>If set, the images that are imported before this timestamp will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>annotations</td>
+                  <td><a href="#v1alpha.KeyValue">KeyValue</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the images that have all of the annotations will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>full_names</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the images that have any of the exact full names will be returned. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.ImageFormat">ImageFormat</h3>
+        <p>ImageFormat defines the format of the image.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>type</td>
+                  <td><a href="#v1alpha.ImageType">ImageType</a></td>
+                  <td></td>
+                  <td><p>Type of the image, required. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>version</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Version of the image format, required. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.Info">Info</h3>
+        <p>Info describes the information of rkt on the machine.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>rkt_version</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Version of rkt, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>appc_version</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Version of appc, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>api_version</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Latest version of the api that&#39;s supported by the service, required, in the form of Semantic Versioning 2.0.0 (http://semver.org/). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>global_flags</td>
+                  <td><a href="#v1alpha.GlobalFlags">GlobalFlags</a></td>
+                  <td></td>
+                  <td><p>The global flags that passed to the rkt api service when it&#39;s launched. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.InspectImageRequest">InspectImageRequest</h3>
+        <p>Request for InspectImage().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Required. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.InspectImageResponse">InspectImageResponse</h3>
+        <p>Response for InspectImage().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>image</td>
+                  <td><a href="#v1alpha.Image">Image</a></td>
+                  <td></td>
+                  <td><p>Required. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.InspectPodRequest">InspectPodRequest</h3>
+        <p>Request for InspectPod().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ID of the pod which we are querying status for, required. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.InspectPodResponse">InspectPodResponse</h3>
+        <p>Response for InspectPod().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>pod</td>
+                  <td><a href="#v1alpha.Pod">Pod</a></td>
+                  <td></td>
+                  <td><p>Required. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.KeyValue">KeyValue</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>Key</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Key part of the key-value pair. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>value</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Value part of the key-value pair. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.ListImagesRequest">ListImagesRequest</h3>
+        <p>Request for ListImages().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>filters</td>
+                  <td><a href="#v1alpha.ImageFilter">ImageFilter</a></td>
+                  <td>repeated</td>
+                  <td><p>Optional. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>detail</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>Optional. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.ListImagesResponse">ListImagesResponse</h3>
+        <p>Response for ListImages().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>images</td>
+                  <td><a href="#v1alpha.Image">Image</a></td>
+                  <td>repeated</td>
+                  <td><p>Required. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.ListPodsRequest">ListPodsRequest</h3>
+        <p>Request for ListPods().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>filters</td>
+                  <td><a href="#v1alpha.PodFilter">PodFilter</a></td>
+                  <td>repeated</td>
+                  <td><p>Optional. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>detail</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>Optional. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.ListPodsResponse">ListPodsResponse</h3>
+        <p>Response for ListPods().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>pods</td>
+                  <td><a href="#v1alpha.Pod">Pod</a></td>
+                  <td>repeated</td>
+                  <td><p>Required. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.ListenEventsRequest">ListenEventsRequest</h3>
+        <p>Request for ListenEvents().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>filter</td>
+                  <td><a href="#v1alpha.EventFilter">EventFilter</a></td>
+                  <td></td>
+                  <td><p>Optional. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.ListenEventsResponse">ListenEventsResponse</h3>
+        <p>Response for ListenEvents().</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>events</td>
+                  <td><a href="#v1alpha.Event">Event</a></td>
+                  <td>repeated</td>
+                  <td><p>Aggregate multiple events to reduce round trips, optional as the response can contain no events. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.Network">Network</h3>
+        <p>Network describes the network information of a pod.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of the network that a pod belongs to, required. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ipv4</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Pod&#39;s IPv4 address within the network, optional if IPv6 address is given. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ipv6</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Pod&#39;s IPv6 address within the network, optional if IPv4 address is given. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.Pod">Pod</h3>
+        <p>Pod describes a pod's information.</p><p>If a pod is in Embryo, Preparing, AbortedPrepare state,</p><p>only id and state will be returned.</p><p>If a pod is in other states, the pod manifest and</p><p>apps will be returned when 'detailed' is true in the request.</p><p>A valid pid of the stage1 process of the pod will be returned</p><p>if the pod is Running has run once.</p><p>Networks are only returned when a pod is in Running.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ID of the pod, in the form of a UUID. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>pid</td>
+                  <td><a href="#sint32">sint32</a></td>
+                  <td></td>
+                  <td><p>PID of the stage1 process of the pod. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>state</td>
+                  <td><a href="#v1alpha.PodState">PodState</a></td>
+                  <td></td>
+                  <td><p>State of the pod. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>apps</td>
+                  <td><a href="#v1alpha.App">App</a></td>
+                  <td>repeated</td>
+                  <td><p>List of apps in the pod. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>networks</td>
+                  <td><a href="#v1alpha.Network">Network</a></td>
+                  <td>repeated</td>
+                  <td><p>Network information of the pod.
+Note that a pod can be in multiple networks. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>manifest</td>
+                  <td><a href="#bytes">bytes</a></td>
+                  <td></td>
+                  <td><p>JSON-encoded byte array that represents the pod manifest of the pod. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>annotations</td>
+                  <td><a href="#v1alpha.KeyValue">KeyValue</a></td>
+                  <td>repeated</td>
+                  <td><p>Annotations on this pod. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>cgroup</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Cgroup of the pod, empty if the pod is not running. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>created_at</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Timestamp of when the pod is created, nanoseconds since epoch.
+Zero if the pod is not created. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>started_at</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Timestamp of when the pod is started, nanoseconds since epoch.
+Zero if the pod is not started. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>gc_marked_at</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Timestamp of when the pod is moved to exited-garbage/garbage,
+in nanoseconds since epoch.
+Zero if the pod is not moved to exited-garbage/garbage yet. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+        <h3 id="v1alpha.PodFilter">PodFilter</h3>
+        <p>PodFilter defines the condition that the returned pods need to satisfy in ListPods().</p><p>The conditions are combined by 'AND', and different filters are combined by 'OR'.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>ids</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the pods that have any of the ids will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>states</td>
+                  <td><a href="#v1alpha.PodState">PodState</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the pods that have any of the states will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>app_names</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the pods that all of the apps will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>image_ids</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the pods that have all of the images(in the apps) will be returned </p></td>
+                </tr>
+              
+                <tr>
+                  <td>network_names</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the pods that are in all of the networks will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>annotations</td>
+                  <td><a href="#v1alpha.KeyValue">KeyValue</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the pods that have all of the annotations will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>cgroups</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the pods whose cgroup are listed will be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>pod_sub_cgroups</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>If not empty, the pods whose these cgroup belong to will be returned.
+i.e. the pod&#39;s cgroup is a prefix of the specified cgroup </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+        
+
+        
+      
+
+      
+        <h3 id="v1alpha.AppState">AppState</h3>
+        <p>AppState defines the possible states of the app.</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>APP_STATE_UNDEFINED</td>
+                <td>0</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>APP_STATE_RUNNING</td>
+                <td>1</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>APP_STATE_EXITED</td>
+                <td>2</td>
+                <td><p></p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="v1alpha.EventType">EventType</h3>
+        <p>EventType defines the type of the events that will be received via ListenEvents().</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>EVENT_TYPE_UNDEFINED</td>
+                <td>0</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>EVENT_TYPE_POD_PREPARED</td>
+                <td>1</td>
+                <td><p>Pod events.</p></td>
+              </tr>
+            
+              <tr>
+                <td>EVENT_TYPE_POD_PREPARE_ABORTED</td>
+                <td>2</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>EVENT_TYPE_POD_STARTED</td>
+                <td>3</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>EVENT_TYPE_POD_EXITED</td>
+                <td>4</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>EVENT_TYPE_POD_GARBAGE_COLLECTED</td>
+                <td>5</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>EVENT_TYPE_APP_STARTED</td>
+                <td>6</td>
+                <td><p>App events.</p></td>
+              </tr>
+            
+              <tr>
+                <td>EVENT_TYPE_APP_EXITED</td>
+                <td>7</td>
+                <td><p>(XXX)yifan: Maybe also return exit code in the event object?</p></td>
+              </tr>
+            
+              <tr>
+                <td>EVENT_TYPE_IMAGE_IMPORTED</td>
+                <td>8</td>
+                <td><p>Image events.</p></td>
+              </tr>
+            
+              <tr>
+                <td>EVENT_TYPE_IMAGE_REMOVED</td>
+                <td>9</td>
+                <td><p></p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="v1alpha.ImageType">ImageType</h3>
+        <p>ImageType defines the supported image type.</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>IMAGE_TYPE_UNDEFINED</td>
+                <td>0</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>IMAGE_TYPE_APPC</td>
+                <td>1</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>IMAGE_TYPE_DOCKER</td>
+                <td>2</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>IMAGE_TYPE_OCI</td>
+                <td>3</td>
+                <td><p></p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="v1alpha.PodState">PodState</h3>
+        <p>PodState defines the possible states of the pod.</p><p>See https://github.com/rkt/rkt/blob/master/Documentation/devel/pod-lifecycle.md for a detailed</p><p>explanation of each state.</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>POD_STATE_UNDEFINED</td>
+                <td>0</td>
+                <td><p></p></td>
+              </tr>
+            
+              <tr>
+                <td>POD_STATE_EMBRYO</td>
+                <td>1</td>
+                <td><p>States before the pod is running.
+
+
+Pod is created, ready to entering &#39;preparing&#39; state.</p></td>
+              </tr>
+            
+              <tr>
+                <td>POD_STATE_PREPARING</td>
+                <td>2</td>
+                <td><p>Pod is being prepared. On success it will become &#39;prepared&#39;, otherwise it will become &#39;aborted prepared&#39;.</p></td>
+              </tr>
+            
+              <tr>
+                <td>POD_STATE_PREPARED</td>
+                <td>3</td>
+                <td><p>Pod has been successfully prepared, ready to enter &#39;running&#39; state. it can also enter &#39;deleting&#39; if it&#39;s garbage collected before running.</p></td>
+              </tr>
+            
+              <tr>
+                <td>POD_STATE_RUNNING</td>
+                <td>4</td>
+                <td><p>State that indicates the pod is running.
+
+
+Pod is running, when it exits, it will become &#39;exited&#39;.</p></td>
+              </tr>
+            
+              <tr>
+                <td>POD_STATE_ABORTED_PREPARE</td>
+                <td>5</td>
+                <td><p>States that indicates the pod is exited, and will never run.
+
+
+Pod failed to prepare, it will only be garbage collected and will never run again.</p></td>
+              </tr>
+            
+              <tr>
+                <td>POD_STATE_EXITED</td>
+                <td>6</td>
+                <td><p>Pod has exited, it now can be garbage collected.</p></td>
+              </tr>
+            
+              <tr>
+                <td>POD_STATE_DELETING</td>
+                <td>7</td>
+                <td><p>Pod is being garbage collected, after that it will enter &#39;garbage&#39; state.</p></td>
+              </tr>
+            
+              <tr>
+                <td>POD_STATE_GARBAGE</td>
+                <td>8</td>
+                <td><p>Pod is marked as garbage collected, it no longer exists on the machine.</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+
+      
+
+      
+        <h3 id="v1alpha.PublicAPI">PublicAPI</h3>
+        <p>PublicAPI defines the read-only APIs that will be supported.</p><p>These will be handled over TCP sockets.</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>GetInfo</td>
+                <td><a href="#v1alpha.GetInfoRequest">GetInfoRequest</a></td>
+                <td><a href="#v1alpha.GetInfoResponse">GetInfoResponse</a></td>
+                <td><p>GetInfo gets the rkt&#39;s information on the machine.</p></td>
+              </tr>
+            
+              <tr>
+                <td>ListPods</td>
+                <td><a href="#v1alpha.ListPodsRequest">ListPodsRequest</a></td>
+                <td><a href="#v1alpha.ListPodsResponse">ListPodsResponse</a></td>
+                <td><p>ListPods lists rkt pods on the machine.</p></td>
+              </tr>
+            
+              <tr>
+                <td>InspectPod</td>
+                <td><a href="#v1alpha.InspectPodRequest">InspectPodRequest</a></td>
+                <td><a href="#v1alpha.InspectPodResponse">InspectPodResponse</a></td>
+                <td><p>InspectPod gets detailed pod information of the specified pod.</p></td>
+              </tr>
+            
+              <tr>
+                <td>ListImages</td>
+                <td><a href="#v1alpha.ListImagesRequest">ListImagesRequest</a></td>
+                <td><a href="#v1alpha.ListImagesResponse">ListImagesResponse</a></td>
+                <td><p>ListImages lists the images on the machine.</p></td>
+              </tr>
+            
+              <tr>
+                <td>InspectImage</td>
+                <td><a href="#v1alpha.InspectImageRequest">InspectImageRequest</a></td>
+                <td><a href="#v1alpha.InspectImageResponse">InspectImageResponse</a></td>
+                <td><p>InspectImage gets the detailed image information of the specified image.</p></td>
+              </tr>
+            
+              <tr>
+                <td>ListenEvents</td>
+                <td><a href="#v1alpha.ListenEventsRequest">ListenEventsRequest</a></td>
+                <td><a href="#v1alpha.ListenEventsResponse">ListenEventsResponse</a></td>
+                <td><p>ListenEvents listens for the events, it will return a response stream
+that will contain event objects.</p></td>
+              </tr>
+            
+              <tr>
+                <td>GetLogs</td>
+                <td><a href="#v1alpha.GetLogsRequest">GetLogsRequest</a></td>
+                <td><a href="#v1alpha.GetLogsResponse">GetLogsResponse</a></td>
+                <td><p>GetLogs gets the logs for a pod, if the app is also specified, then only the logs
+of the app will be returned.
+
+If &#39;follow&#39; in the &#39;GetLogsRequest&#39; is set to &#39;true&#39;, then the response stream
+will not be closed after the first response, the future logs will be sent via
+the stream.</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+    
+
+    <h2 id="scalar-value-types">Scalar Value Types</h2>
+    <table class="scalar-value-types-table">
+      <thead>
+        <tr><td>.proto Type</td><td>Notes</td><td>C++ Type</td><td>Java Type</td><td>Python Type</td></tr>
+      </thead>
+      <tbody>
+        
+          <tr id="double">
+            <td>double</td>
+            <td></td>
+            <td>double</td>
+            <td>double</td>
+            <td>float</td>
+          </tr>
+        
+          <tr id="float">
+            <td>float</td>
+            <td></td>
+            <td>float</td>
+            <td>float</td>
+            <td>float</td>
+          </tr>
+        
+          <tr id="int32">
+            <td>int32</td>
+            <td>Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint32 instead.</td>
+            <td>int32</td>
+            <td>int</td>
+            <td>int</td>
+          </tr>
+        
+          <tr id="int64">
+            <td>int64</td>
+            <td>Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint64 instead.</td>
+            <td>int64</td>
+            <td>long</td>
+            <td>int/long</td>
+          </tr>
+        
+          <tr id="uint32">
+            <td>uint32</td>
+            <td>Uses variable-length encoding.</td>
+            <td>uint32</td>
+            <td>int</td>
+            <td>int/long</td>
+          </tr>
+        
+          <tr id="uint64">
+            <td>uint64</td>
+            <td>Uses variable-length encoding.</td>
+            <td>uint64</td>
+            <td>long</td>
+            <td>int/long</td>
+          </tr>
+        
+          <tr id="sint32">
+            <td>sint32</td>
+            <td>Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int32s.</td>
+            <td>int32</td>
+            <td>int</td>
+            <td>int</td>
+          </tr>
+        
+          <tr id="sint64">
+            <td>sint64</td>
+            <td>Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int64s.</td>
+            <td>int64</td>
+            <td>long</td>
+            <td>int/long</td>
+          </tr>
+        
+          <tr id="fixed32">
+            <td>fixed32</td>
+            <td>Always four bytes. More efficient than uint32 if values are often greater than 2^28.</td>
+            <td>uint32</td>
+            <td>int</td>
+            <td>int</td>
+          </tr>
+        
+          <tr id="fixed64">
+            <td>fixed64</td>
+            <td>Always eight bytes. More efficient than uint64 if values are often greater than 2^56.</td>
+            <td>uint64</td>
+            <td>long</td>
+            <td>int/long</td>
+          </tr>
+        
+          <tr id="sfixed32">
+            <td>sfixed32</td>
+            <td>Always four bytes.</td>
+            <td>int32</td>
+            <td>int</td>
+            <td>int</td>
+          </tr>
+        
+          <tr id="sfixed64">
+            <td>sfixed64</td>
+            <td>Always eight bytes.</td>
+            <td>int64</td>
+            <td>long</td>
+            <td>int/long</td>
+          </tr>
+        
+          <tr id="bool">
+            <td>bool</td>
+            <td></td>
+            <td>bool</td>
+            <td>boolean</td>
+            <td>boolean</td>
+          </tr>
+        
+          <tr id="string">
+            <td>string</td>
+            <td>A string must always contain UTF-8 encoded or 7-bit ASCII text.</td>
+            <td>string</td>
+            <td>String</td>
+            <td>str/unicode</td>
+          </tr>
+        
+          <tr id="bytes">
+            <td>bytes</td>
+            <td>May contain any arbitrary sequence of bytes.</td>
+            <td>string</td>
+            <td>ByteString</td>
+            <td>str</td>
+          </tr>
+        
+      </tbody>
+    </table>
+  </body>
+</html>
+
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index e74589f510..c6c2ea9012 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -27,5 +27,26 @@ popd
 trap 'rm -f "protoc-gen-go"' EXIT
 
 echo "generating code"
-API_DIR="api/v1alpha"
+API_DIR="${PWD}/api/v1alpha"
 protoc -I "${API_DIR}" "${API_DIR}"/*.proto --go_out=plugins=grpc:"${API_DIR}"
+echo "generating HTML documentation"
+sudo rkt \
+    --insecure-options=image \
+    run \
+    --volume=volume-out,kind=host,source="${API_DIR}"/docs \
+    --volume=volume-protos,kind=host,source="${API_DIR}" \
+    docker://pseudomuto/protoc-gen-doc:1.0.0 \
+    --user=$UID \
+    --group=$GID
+echo "generating Markdown documentation"
+sudo rkt \
+    --insecure-options=image \
+    run \
+    --volume=volume-out,kind=host,source="${API_DIR}"/docs \
+    --volume=volume-protos,kind=host,source="${API_DIR}" \
+    docker://pseudomuto/protoc-gen-doc:1.0.0 \
+    --user=$UID \
+    --group=$GID \
+    --exec=/entrypoint.sh \
+    -- \
+    --doc_opt=markdown,docs.md

From cfdc252705749807cd8db07cd0172f47e2583ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Mon, 18 Dec 2017 16:06:28 +0100
Subject: [PATCH 1265/1304] Documentation: add mds-service example

Add an example app can sign and verify files using the metadata service.

Include usage example where we send a file from one pod to another one
and we verify its integrity and authenticity using the metadata service.

Also, reorder examples directory structure.
---
 .../build-container}/README.md                |   0
 .../play-example/build-play-example.sh        |   0
 .../build-container}/play-example/custom.sql  |   0
 .../play-example/wait-for-postgres.sh         |   0
 .../postgres/build-postgres.sh                |   0
 .../postgres/postgres-prestart.sh             |   0
 .../examples/metadata-service/README.md       |  73 +++++++
 .../examples/metadata-service/main.go         | 195 ++++++++++++++++++
 Documentation/getting-started-guide.md        |   2 +-
 9 files changed, 269 insertions(+), 1 deletion(-)
 rename Documentation/{build-container-examples => examples/build-container}/README.md (100%)
 rename Documentation/{build-container-examples => examples/build-container}/play-example/build-play-example.sh (100%)
 rename Documentation/{build-container-examples => examples/build-container}/play-example/custom.sql (100%)
 rename Documentation/{build-container-examples => examples/build-container}/play-example/wait-for-postgres.sh (100%)
 rename Documentation/{build-container-examples => examples/build-container}/postgres/build-postgres.sh (100%)
 rename Documentation/{build-container-examples => examples/build-container}/postgres/postgres-prestart.sh (100%)
 create mode 100644 Documentation/examples/metadata-service/README.md
 create mode 100644 Documentation/examples/metadata-service/main.go

diff --git a/Documentation/build-container-examples/README.md b/Documentation/examples/build-container/README.md
similarity index 100%
rename from Documentation/build-container-examples/README.md
rename to Documentation/examples/build-container/README.md
diff --git a/Documentation/build-container-examples/play-example/build-play-example.sh b/Documentation/examples/build-container/play-example/build-play-example.sh
similarity index 100%
rename from Documentation/build-container-examples/play-example/build-play-example.sh
rename to Documentation/examples/build-container/play-example/build-play-example.sh
diff --git a/Documentation/build-container-examples/play-example/custom.sql b/Documentation/examples/build-container/play-example/custom.sql
similarity index 100%
rename from Documentation/build-container-examples/play-example/custom.sql
rename to Documentation/examples/build-container/play-example/custom.sql
diff --git a/Documentation/build-container-examples/play-example/wait-for-postgres.sh b/Documentation/examples/build-container/play-example/wait-for-postgres.sh
similarity index 100%
rename from Documentation/build-container-examples/play-example/wait-for-postgres.sh
rename to Documentation/examples/build-container/play-example/wait-for-postgres.sh
diff --git a/Documentation/build-container-examples/postgres/build-postgres.sh b/Documentation/examples/build-container/postgres/build-postgres.sh
similarity index 100%
rename from Documentation/build-container-examples/postgres/build-postgres.sh
rename to Documentation/examples/build-container/postgres/build-postgres.sh
diff --git a/Documentation/build-container-examples/postgres/postgres-prestart.sh b/Documentation/examples/build-container/postgres/postgres-prestart.sh
similarity index 100%
rename from Documentation/build-container-examples/postgres/postgres-prestart.sh
rename to Documentation/examples/build-container/postgres/postgres-prestart.sh
diff --git a/Documentation/examples/metadata-service/README.md b/Documentation/examples/metadata-service/README.md
new file mode 100644
index 0000000000..859a6a6e60
--- /dev/null
+++ b/Documentation/examples/metadata-service/README.md
@@ -0,0 +1,73 @@
+# Metadata service example application
+
+This directory includes an example application interacting with the rkt [metadata service](../../subcommands/metadata-service.md). It can sign and verify files against the metadata service following the [Identity Endpoint](https://github.com/appc/spec/blob/v0.8.11/spec/ace.md#identity-endpoint) of the [appc spec](https://github.com/appc/spec).
+
+The signature file format is just the base64-encoded signature returned by the metadata service.
+
+Note that this is just an example application: it doesn't work for big files and is not suitable for production use.
+
+## Compilation
+
+```
+$ CGO_ENABLED=0 go build -o mds-example
+```
+
+## Trying it out
+
+We'll start two pods and send a file from one to the other.
+We'll use our example application to sign the file against the metadata service, then we'll send the file and the signature to the receiver pod and verify its integrity and authenticity using our example application too.
+
+Assuming we're in this directory and we've [compiled](#compilation) the example application and the metadata service is running, let's start two busybox pods with our app mounted inside: "POD a" and "POD b"
+
+```shell
+$ sudo rkt run --mds-register --interactive --volume=mds-example,kind=host,source=$PWD/mds-example kinvolk.io/aci/busybox:1.24 --mount volume=mds-example,target=/bin/mds-example
+[POD a] / #
+```
+
+```shell
+$ sudo rkt run --mds-register --interactive --volume=mds-example,kind=host,source=$PWD/mds-example kinvolk.io/aci/busybox:1.24 --mount volume=mds-example,target=/bin/mds-example
+[POD b] / #
+```
+
+In "POD a", we'll create a message and sign it using our example application:
+
+```
+[POD a] / # echo "Very trustworthy message" > msg.txt
+[POD a] / # mds-example sign --file=msg.txt --signature=msg.sig
+[POD a] / # ls -l msg*
+-rw-------    1 root     root           125 Dec 18 17:34 msg.sig
+-rw-r--r--    1 root     root            25 Dec 18 17:34 msg.txt
+```
+
+Now we'll transfer the message to "POD b":
+
+```
+# let's find out the IP address of POD b
+[POD b] / # ip a
+(...)
+    inet 172.16.28.84/24 scope global eth0
+(...)
+[POD b] / # nc -l -p 9090 > msg.txt
+
+# switch to POD a to send the message
+[POD a] / # nc 172.16.28.84 9090 < msg.txt
+
+# switch to POD b
+[POD b] / # nc -l -p 9090 > msg.sig
+
+# switch to POD a to send the signature
+[POD a] / # nc 172.16.28.84 9090 < msg.sig
+
+# find out the UUID of POD a
+[POD a] / # echo $(wget -q -O - $AC_METADATA_URL/acMetadata/v1/pod/uuid)
+d1703a6a-568a-48ee-b84b-4ccd803743dd
+```
+
+And finally, we'll verify the message in "POD b":
+
+```
+[POD b] / # cat msg.txt
+Very trustworthy message
+[POD b] / # mds-example verify --file msg.txt --uuid=d1703a6a-568a-48ee-b84b-4ccd803743dd --signature=msg.sig
+signature OK
+```
diff --git a/Documentation/examples/metadata-service/main.go b/Documentation/examples/metadata-service/main.go
new file mode 100644
index 0000000000..25acd2e471
--- /dev/null
+++ b/Documentation/examples/metadata-service/main.go
@@ -0,0 +1,195 @@
+// Copyright 2017 The rkt Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"os"
+	"path"
+)
+
+const (
+	progName = "mds-example"
+)
+
+var (
+	signCommand   *flag.FlagSet
+	verifyCommand *flag.FlagSet
+
+	signFileFlag      *string
+	signSignatureFlag *string
+
+	verifyFileFlag      *string
+	verifyPodUUID       *string
+	verifySignatureFlag *string
+)
+
+func init() {
+	signCommand = flag.NewFlagSet("sign", flag.ExitOnError)
+	signFileFlag = signCommand.String("file", "", "File to sign")
+	signSignatureFlag = signCommand.String("signature", "", "Signature output file")
+
+	verifyCommand = flag.NewFlagSet("verify", flag.ExitOnError)
+	verifyFileFlag = verifyCommand.String("file", "", "File to verify")
+	verifyPodUUID = verifyCommand.String("uuid", "", "UUID of the sender pod")
+	verifySignatureFlag = verifyCommand.String("signature", "", "Signature file")
+}
+
+func usage() {
+	fmt.Fprintf(os.Stderr, "USAGE:\n")
+	fmt.Fprintf(os.Stderr, "\t%s <command> <args>\n", progName)
+	fmt.Fprintf(os.Stderr, "\nCOMMANDS:\n")
+	fmt.Fprintf(os.Stderr, "\tsign --file=FILE --signature=SIGNATURE_FILE\n")
+	fmt.Fprintf(os.Stderr, "\t\tsign a file with the metadata server and save signature to a file\n")
+	fmt.Fprintf(os.Stderr, "\tverify --file=FILE --uuid=POD_UUID --signature=SIGNATURE_FILE\n")
+	fmt.Fprintf(os.Stderr, "\t\tverify a file signed with the metadata server\n")
+}
+
+func parseArgs(args []string) error {
+	if len(args) < 2 {
+		return fmt.Errorf("missing command")
+	}
+	switch args[1] {
+	case "sign":
+		signCommand.Parse(args[2:])
+	case "verify":
+		verifyCommand.Parse(args[2:])
+	default:
+		return fmt.Errorf("%q is not a valid command.", args[1])
+	}
+
+	return nil
+}
+
+func sign(mdsURL, p, outPath string) error {
+	signPath := path.Join("/", "acMetadata", "v1", "pod", "hmac", "sign")
+	signURL := mdsURL + signPath
+
+	content, err := ioutil.ReadFile(p)
+	if err != nil {
+		return fmt.Errorf("error reading input file: %v", err)
+	}
+
+	v := url.Values{}
+	v.Set("content", string(content))
+
+	rsp, err := http.PostForm(signURL, v)
+	if err != nil {
+		return fmt.Errorf("error generating request: %v", err)
+	}
+	defer rsp.Body.Close()
+
+	data, err := ioutil.ReadAll(rsp.Body)
+	if err != nil {
+		return fmt.Errorf("error reading response: %v", err)
+	}
+
+	if rsp.StatusCode != http.StatusOK {
+		return fmt.Errorf("error signing: %v", string(data))
+	}
+
+	if err := ioutil.WriteFile(outPath, data, 0600); err != nil {
+		return fmt.Errorf("error writing signature: %v", err)
+	}
+
+	return nil
+}
+
+func verify(mdsURL, p, uuid, signaturePath string) (bool, error) {
+	signPath := path.Join("/", "acMetadata", "v1", "pod", "hmac", "verify")
+	signURL := mdsURL + signPath
+
+	content, err := ioutil.ReadFile(p)
+	if err != nil {
+		return false, fmt.Errorf("error reading input file: %v", err)
+	}
+
+	signatureBytes, err := ioutil.ReadFile(signaturePath)
+	if err != nil {
+		return false, fmt.Errorf("error reading signature file: %v", err)
+	}
+
+	v := url.Values{}
+	v.Set("content", string(content))
+	v.Set("uuid", uuid)
+	v.Set("signature", string(signatureBytes))
+
+	rsp, err := http.PostForm(signURL, v)
+	if err != nil {
+		return false, fmt.Errorf("error generating request: %v", err)
+	}
+	defer rsp.Body.Close()
+
+	switch rsp.StatusCode {
+	case http.StatusOK:
+		return true, nil
+	case http.StatusForbidden:
+		return false, nil
+	default:
+		return false, fmt.Errorf("unknown error: %v", http.StatusText(rsp.StatusCode))
+	}
+}
+
+func main() {
+	if err := parseArgs(os.Args); err != nil {
+		fmt.Fprintf(os.Stderr, "%s: %v\n", progName, err)
+		usage()
+		os.Exit(1)
+	}
+
+	mdsURL := os.Getenv("AC_METADATA_URL")
+	if mdsURL == "" {
+		fmt.Fprintf(os.Stderr, "%s: $AC_METADATA_URL env variable not found, are you in a rkt container and is the rkt metadata service running on the host?\n", progName)
+		os.Exit(1)
+	}
+
+	if signCommand.Parsed() {
+		if *signFileFlag == "" || *signSignatureFlag == "" {
+			fmt.Fprintf(os.Stderr, "%s: 'sign' needs a file to sign and an output file\n", progName)
+			usage()
+			os.Exit(1)
+		}
+
+		if err := sign(mdsURL, *signFileFlag, *signSignatureFlag); err != nil {
+			fmt.Fprintf(os.Stderr, "%s: %v\n", progName, err)
+			os.Exit(1)
+		}
+	} else if verifyCommand.Parsed() {
+		if *verifyFileFlag == "" || *verifySignatureFlag == "" || *verifyPodUUID == "" {
+			fmt.Fprintf(os.Stderr, "%s: 'verify' needs a file to verify, the pod UUID of the sender, and a signature file\n", progName)
+			usage()
+			os.Exit(1)
+		}
+
+		ok, err := verify(mdsURL, *verifyFileFlag, *verifyPodUUID, *verifySignatureFlag)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%s: %v\n", progName, err)
+			os.Exit(1)
+		}
+
+		if ok {
+			fmt.Println("signature OK")
+		} else {
+			fmt.Println("signature INVALID")
+			os.Exit(1)
+		}
+	}
+
+	os.Exit(0)
+}
diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index 0607367f36..aa82bcd23c 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -3,7 +3,7 @@
 The following guide will show you how to build and run a self-contained Go app using rkt, the reference implementation of the [App Container Specification][appc-spec].
 If you're not on Linux, you should do all of this inside [the rkt Vagrant][rkt-vagrant].
 
-For a more complex example, please check the [build container examples](build-container-examples/README.md).
+For a more complex example, please check the [build container examples](examples/build-container/README.md).
 
 ## Create a hello go application
 

From 7f99a685f2667f5c988bde86b35f8744e479f967 Mon Sep 17 00:00:00 2001
From: Shengjing Zhu <i@zhsj.me>
Date: Sat, 13 Jan 2018 02:24:03 +0800
Subject: [PATCH 1266/1304] networking/portfwd: fix compare routeLocalnetValue

The value read from /proc contains LF, and should be trimmed

Signed-off-by: Shengjing Zhu <i@zhsj.me>
---
 networking/networking.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/networking/networking.go b/networking/networking.go
index 64cd56d84d..764814f438 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -165,7 +165,7 @@ func (n *Networking) enableDefaultLocalnetRouting() error {
 		if err != nil {
 			return err
 		}
-		if string(routeLocalnetValue) != "1" {
+		if strings.TrimSpace(string(routeLocalnetValue)) != "1" {
 			routeLocalnetFile, err := os.OpenFile(routeLocalnetPath, os.O_WRONLY, 0)
 			if err != nil {
 				return err

From 2d96428425d17f25f43d97ab97fe81af2782b02e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 2 Jan 2018 17:15:27 +0100
Subject: [PATCH 1267/1304] Documentation: add rkt internals inspection

This adds documentation on inspecting rkt's execution with strace, by
querying the proc filesystem, and finding out information about the
cgroups rkt sets up.

It's by no means comprehensive but can be a good starting point for
people learning about containers.
---
 Documentation/devel/architecture.md       |   3 +
 Documentation/devel/inspect-containers.md | 378 ++++++++++++++++++++++
 2 files changed, 381 insertions(+)
 create mode 100644 Documentation/devel/inspect-containers.md

diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index 0bef0bb04f..8f6d8a5d02 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -1,5 +1,8 @@
 # rkt architecture
 
+This document discusses rkt architecture in detail.
+For a more hands-on guide to inspecting rkt's internals, check [Inspect how rkt works](inspect-containers.md).
+
 ## Overview
 
 rkt's primary interface is a command-line tool, `rkt`, which does not require a long running daemon.
diff --git a/Documentation/devel/inspect-containers.md b/Documentation/devel/inspect-containers.md
new file mode 100644
index 0000000000..07470d5aef
--- /dev/null
+++ b/Documentation/devel/inspect-containers.md
@@ -0,0 +1,378 @@
+# Inspect how rkt works
+
+There's a variety of ways to inspect how containers work.
+Linux provides APIs that expose information about namespaces (proc filesystem) and cgroups (cgroup filesystem).
+We also have tools like strace that allow us to see what system calls are used in processes.
+
+This document explains how to use those APIs and tools to give details on what rkt does under the hood.
+
+Note that this is not a comprehensive analysis of the inner workings of rkt, but a starting point for people interested in learning how containers work.
+
+## What syscalls does rkt use?
+
+Let's use [strace][strace] to find out what system calls rkt uses to set up containers.
+We'll only trace a handful of syscalls since, by default, strace traces every syscall resulting in a lot of output.
+Also, we'll redirect its output to a file to make the analysis easier.
+
+```bash
+$ sudo strace -f -s 512 -e unshare,clone,mount,chroot,execve -o out.txt rkt run coreos.com/etcd:v2.0.10
+...
+^]^]Container rkt-e6d92625-aa3f-4449-bf5d-43ffed440de4 terminated by signal KILL.
+```
+
+We now have our trace in `out.txt`, let's go through some of its relevant parts.
+
+### stage0
+
+First, we see the actual execution of the rkt command:
+
+```
+5710  execve("/home/iaguis/work/go/src/github.com/rkt/rkt/build-rkt/target/bin/rkt", ["rkt", "run", "coreos.com/etcd:v2.0.10"], 0x7ffce2052be8 /* 22 vars */) = 0
+```
+
+Since the image was already fetched and we don't trace many system calls, nothing too exciting happens here except mounting the container filesystems.
+
+```
+5710  mount("overlay", "/var/lib/rkt/pods/run/d5513d49-d14f-45d1-944b-39437798ddda/stage1/rootfs", "overlay", 0, "lowerdir=/var/lib/rkt/cas/tree/deps-sha512-cc076d6c508223cc3c13c24d09365d64b6d15e7915a165eab1d9e87f87be5015/rootfs,upperdir=/var/lib/rkt/pods/run/d5513d49-d14f-45d1-944b-39437798ddda/overlay/deps-sha512-cc076d6c508223cc3c13c24d09365d64b6d15e7915a165eab1d9e87f87be5015/upper,workdir=/var/lib/rkt/pods/run/d5513d49-d14f-45d1-944b-39437798ddda/overlay/deps-sha512-cc076d6c508223cc3c13c24d09365d64b6d15e7915a165eab1d9e87f87be5015/work") = 0
+5710  mount("overlay", "/var/lib/rkt/pods/run/d5513d49-d14f-45d1-944b-39437798ddda/stage1/rootfs/opt/stage2/etcd/rootfs", "overlay", 0, "lowerdir=/var/lib/rkt/cas/tree/deps-sha512-c0de11e9d504069810da931c94aece3bcc5430dc20f9a5177044eaef62f93fcc/rootfs,upperdir=/var/lib/rkt/pods/run/d5513d49-d14f-45d1-944b-39437798ddda/overlay/deps-sha512-c0de11e9d504069810da931c94aece3bcc5430dc20f9a5177044eaef62f93fcc/upper/etcd,workdir=/var/lib/rkt/pods/run/d5513d49-d14f-45d1-944b-39437798ddda/overlay/deps-sha512-c0de11e9d504069810da931c94aece3bcc5430dc20f9a5177044eaef62f93fcc/work/etcd") = 0
+```
+
+We can see that rkt mounts the stage1 and stage2 filesystems with the [tree store][treestore] as `lowerdir` on the directory rkt expects them to be.
+
+Note that the stage2 tree is mounted within the stage1 tree via `/opt/stage2`.
+You can read more about the tree structure in [rkt architecture][architecture-stage0].
+
+This means that, for a same tree store, everything will be shared in a copy-on-write (COW) manner, except the bits that each container modifies, which will be in the `upperdir` and will appear magically in the mount destination.
+You can read more about this filesystem in the [overlay documentation][overlay].
+
+
+### stage1
+
+This is where most of the interesting things happen, the first being executing the stage1 [run entrypoint][run-entrypoint], which is `/init` by default:
+
+```
+5710  execve("/var/lib/rkt/pods/run/d5513d49-d14f-45d1-944b-39437798ddda/stage1/rootfs/init", ["/var/lib/rkt/pods/run/d5513d49-d14f-45d1-944b-39437798ddda/stage1/rootfs/init", "--net=default", "--local-config=/etc/rkt", "d5513d49-d14f-45d1-944b-39437798ddda"], 0xc42009b040 /* 25 vars */ <unfinished ...>
+```
+
+init does a bunch of stuff, including creating the container's network namespace and mounting a reference to it on the host filesystem:
+
+```
+5723  unshare(CLONE_NEWNET)             = 0
+5723  mount("/proc/5710/task/5723/ns/net", "/var/run/netns/cni-eee014d2-8268-39cc-c176-432bbbc9e959", 0xc42017c6a8, MS_BIND, NULL) = 0
+```
+
+After creating the network namespace, it will execute the relevant [CNI][cni] plugins from within that network namespace.
+The default network uses the [ptp plugin][ptp] with [host-local][host-local] as IPAM:
+
+```
+5725  execve("stage1/rootfs/usr/lib/rkt/plugins/net/ptp", ["stage1/rootfs/usr/lib/rkt/plugins/net/ptp"], 0xc4201ac000 /* 32 vars */ <unfinished ...>
+5730  execve("stage1/rootfs/usr/lib/rkt/plugins/net/host-local", ["stage1/rootfs/usr/lib/rkt/plugins/net/host-local"], 0xc42008e240 /* 32 vars */ <unfinished ...>
+```
+
+In this case, the CNI plugins use come from rkt's stage1, but [rkt is also able to pick a CNI plugin installed externally](https://github.com/rkt/rkt/blob/v1.29.0/Documentation/networking/overview.md#custom-plugins).
+
+The plugins will do some iptables magic to configure the network:
+
+```
+5739  execve("/usr/bin/iptables", ["iptables", "--version"], 0xc42013e000 /* 32 vars */ <unfinished ...>
+5740  execve("/usr/bin/iptables", ["/usr/bin/iptables", "-t", "nat", "-N", "CNI-7a59ad232c32bcea94ee08d5", "--wait"], 0xc4200b0a20 /* 32 vars */ <unfinished ...>
+...
+```
+
+After the network is configured, rkt mounts the container cgroups instead of letting systemd-nspawn do it because we want to have control on how they're mounted.
+We also mount the host cgroups if they're not already mounted in the way systemd-nspawn expects them, like in old distributions or distributions that don't use systemd (e.g. [Void Linux][void-linux]).
+
+We do this in a new mount namespace to avoid polluting the host mounts and to get automatic cleanup when the container exits (`CLONE_NEWNS` is the flag for [mount namespaces][man-namespaces] for historical reasons: it was the first namespace implemented on Linux):
+
+```
+5710  unshare(CLONE_NEWNS)              = 0
+```
+
+Here we mount the container hierarchies read-write so the pod can modify its cgroups but we mount the controllers read-only so the pod doesn't modify other cgroups:
+
+```
+5710  mount("stage1/rootfs/sys/fs/cgroup/freezer/machine.slice/machine-rkt\\x2dd5513d49\\x2dd14f\\x2d45d1\\x2d944b\\x2d39437798ddda.scope/system.slice", "stage1/rootfs/sys/fs/cgroup/freezer/machine.slice/machine-rkt\\x2dd5513d49\\x2dd14f\\x2d45d1\\x2d944b\\x2d39437798ddda.scope/system.slice", 0xc42027d2a8, MS_BIND, NULL) = 0
+...
+5710  mount("stage1/rootfs/sys/fs/cgroup/freezer", "stage1/rootfs/sys/fs/cgroup/freezer", 0xc42027d2b8, MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_REMOUNT|MS_BIND, NULL) = 0
+```
+
+Now is the time to start systemd-nspawn to create the pod itself:
+
+```
+5710  execve("stage1/rootfs/usr/lib/ld-linux-x86-64.so.2", ["stage1/rootfs/usr/lib/ld-linux-x86-64.so.2", "stage1/rootfs/usr/bin/systemd-nspawn", "--boot", "--notify-ready=yes", "--register=true", "--link-journal=try-guest", "--quiet", "--uuid=d5513d49-d14f-45d1-944b-39437798ddda", "--machine=rkt-d5513d49-d14f-45d1-944b-39437798ddda", "--directory=stage1/rootfs", "--capability=CAP_AUDIT_WRITE,CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_FSETID,CAP_FOWNER,CAP_KILL,CAP_MKNOD,CAP_NET_RAW,CAP_NET_BIND_SERVICE,CAP_SETUID,CAP_SETGID,CAP_SETPCAP,CAP_SETFCAP,CAP_SYS_CHROOT", "--", "--default-standard-output=tty", "--log-target=null", "--show-status=0"], 0xc4202bc0f0 /* 29 vars */ <unfinished ...>
+```
+
+Note we don't need to pass the `--private-network` option because rkt already created and configured the network using CNI.
+
+Some interesting things systemd-nspawn does are moving the container filesystem tree to `/`:
+
+```
+5747  mount("/var/lib/rkt/pods/run/d5513d49-d14f-45d1-944b-39437798ddda/stage1/rootfs", "/", NULL, MS_MOVE, NULL) = 0
+5747  chroot(".")                       = 0
+```
+
+And creating all the other namespaces: mount, UTS, IPC, and PID.
+Check [namespaces(7)][man-namespaces] for more information.
+
+```
+5747  clone(child_stack=NULL, flags=CLONE_NEWNS|CLONE_NEWUTS|CLONE_NEWIPC|CLONE_NEWPID|SIGCHLD) = 5748
+```
+
+Once it's done creating the container, it will execute the init process, which is systemd:
+
+```
+5748  execve("/usr/lib/systemd/systemd", ["/usr/lib/systemd/systemd", "--default-standard-output=tty", "--log-target=null", "--show-status=0"], 0x7f904604f250 /* 8 vars */) = 0
+```
+
+Which then will execute systemd-journald to handle logging:
+
+```
+5749  execve("/usr/lib/systemd/systemd-journald", ["/usr/lib/systemd/systemd-journald"], 0x5579c5d79d50 /* 8 vars */ <unfinished ...>
+...
+```
+
+And at some point it will execute our application's service (in this example, etcd).
+
+But first, it needs to execute its companion `prepare-app` dependency:
+
+```
+5751  execve("/prepare-app", ["/prepare-app", "/opt/stage2/etcd/rootfs"], 0x5579c5d7d580 /* 7 vars */) = 0
+```
+
+`prepare-app` bind-mounts a lot of files from stage1 to stage2, so our app has access to a [reasonable environment][os-spec]:
+
+```
+5751  mount("/dev/null", "/opt/stage2/etcd/rootfs/dev/null", 0x49006f, MS_BIND, NULL) = 0
+5751  mount("/dev/zero", "/opt/stage2/etcd/rootfs/dev/zero", 0x49006f, MS_BIND, NULL) = 0
+...
+```
+
+After it's finished, our etcd service is ready to start!
+
+Since we use some additional security directives in our service file (like [`InaccessiblePaths=`][inaccessible-paths] or [`SystemCallFilter=`][syscall-filter]), systemd will create an additional mount namespace per application in the pod and move the stage2 filesystem to `/`:
+
+```
+5753  unshare(CLONE_NEWNS)              = 0
+...
+5753  mount("/opt/stage2/etcd/rootfs", "/", NULL, MS_MOVE, NULL) = 0
+5753  chroot(".")                       = 0
+```
+
+### stage2
+
+Now we're ready to execute the etcd binary.
+
+```
+5753  execve("/etcd", ["/etcd"], 0x5579c5dbd660 /* 9 vars */) = 0
+```
+
+And that's it, etcd is running in a container!
+
+## Inspect running containers with procfs
+
+We'll now inspect a running container by using the [proc filesystem][procfs].
+
+Let's start a new container limiting the CPU to 200 millicores and the memory to 100MB:
+
+```
+$ sudo rkt run --interactive kinvolk.io/aci/busybox --memory=100M --cpu=200m
+/ # 
+```
+
+First we'll need to find the PID of a process running inside the container.
+We can see the container PID by running `rkt status`:
+
+```
+$ sudo rkt status 567264dd
+state=running
+created=2018-01-03 17:17:39.653 +0100 CET
+started=2018-01-03 17:17:39.749 +0100 CET
+networks=default:ip4=172.16.28.37
+pid=10985
+exited=false
+```
+
+Now we need to find the sh process running inside the container:
+
+```
+$ ps auxf | grep [1]0985 -A 3
+root     10985  0.0  0.0  54204  5040 pts/2    S+   17:17   0:00          \_ stage1/rootfs/usr/lib/ld-linux-x86-64.so.2 stage1/rootfs/usr/bin/systemd-nspawn --boot --notify-ready=yes --register=true --link-journal=try-guest --quiet --uuid=567264dd-f28d-42fb-84a1-4714dde9e82c --machine=rkt-567264dd-f28d-42fb-84a1-4714dde9e82c --directory=stage1/rootfs --capability=CAP_AUDIT_WRITE,CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_FSETID,CAP_FOWNER,CAP_KILL,CAP_MKNOD,CAP_NET_RAW,CAP_NET_BIND_SERVICE,CAP_SETUID,CAP_SETGID,CAP_SETPCAP,CAP_SETFCAP,CAP_SYS_CHROOT -- --default-standard-output=tty --log-target=null --show-status=0
+root     11021  0.0  0.0  62280  7392 ?        Ss   17:17   0:00              \_ /usr/lib/systemd/systemd --default-standard-output=tty --log-target=null --show-status=0
+root     11022  0.0  0.0  66408  8812 ?        Ss   17:17   0:00                  \_ /usr/lib/systemd/systemd-journald
+root     11026  0.0  0.0   1212     4 pts/0    Ss+  17:17   0:00                  \_ /bin/sh
+```
+
+It's 11026!
+
+Let's start by having a look at its namespaces:
+
+```
+$ sudo ls -l /proc/11026/ns/
+total 0
+lrwxrwxrwx 1 root root 0 Jan  3 17:19 cgroup -> 'cgroup:[4026531835]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:19 ipc -> 'ipc:[4026532764]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:19 mnt -> 'mnt:[4026532761]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:19 net -> 'net:[4026532702]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:19 pid -> 'pid:[4026532765]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:19 pid_for_children -> 'pid:[4026532765]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:19 user -> 'user:[4026531837]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:19 uts -> 'uts:[4026532763]'
+```
+
+We can compare it with the namespaces on the host
+
+```
+$ sudo ls -l /proc/1/ns/
+total 0
+lrwxrwxrwx 1 root root 0 Jan  3 17:20 cgroup -> 'cgroup:[4026531835]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:20 ipc -> 'ipc:[4026531839]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:20 mnt -> 'mnt:[4026531840]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:20 net -> 'net:[4026532009]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:20 pid -> 'pid:[4026531836]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:20 pid_for_children -> 'pid:[4026531836]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:20 user -> 'user:[4026531837]'
+lrwxrwxrwx 1 root root 0 Jan  3 17:20 uts -> 'uts:[4026531838]'
+```
+
+We can see that the cgroup and user namespace are the same, since rkt doesn't use cgroup namespaces and user namespaces weren't enabled for this execution.
+If, for example, we run rkt with `--net=host`, we'll see that the network namespace is the same as the host's.
+
+Running [lsns][man-lsns] we can see this information too, along with the PID that created the namespace:
+
+```
+> sudo lsns -p 11026
+        NS TYPE   NPROCS    PID USER COMMAND
+4026531835 cgroup    231      1 root /sbin/init
+4026531837 user      231      1 root /sbin/init
+4026532702 net         4  10945 root stage1/rootfs/usr/lib/ld-linux-x86-64.so.2 stage1/rootfs/usr/bin/systemd-nspawn --boot --notify-ready=yes --register=true --link-journal=
+4026532761 mnt         1  11026 root /etcd
+4026532763 uts         3  11021 root /usr/lib/systemd/systemd --default-standard-output=tty --log-target=null --show-status=0
+4026532764 ipc         3  11021 root /usr/lib/systemd/systemd --default-standard-output=tty --log-target=null --show-status=0
+4026532765 pid         3  11021 root /usr/lib/systemd/systemd --default-standard-output=tty --log-target=null --show-status=0
+```
+
+We can also see some interesting data about the process:
+
+```
+$ sudo cat /proc/11026/status
+Name:	sh
+Umask:	0022
+State:	S (sleeping)
+...
+CapBnd:	00000000a80425fb
+...
+NoNewPrivs:	0
+Seccomp:	2
+...
+```
+
+This tells us the container is not using the `no_new_privs` feature, but it is using [seccomp][seccomp].
+
+We can also see what [capabilities][capabilities] are in the bounding set of the process, let's decode them with `capsh`:
+
+```
+$ capsh --decode=00000000a80425fb
+0x00000000a80425fb=cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_kill,cap_setgid,cap_setuid,cap_setpcap,cap_net_bind_service,cap_net_raw,cap_sys_chroot,cap_mknod,cap_audit_write,cap_setfcap
+```
+
+Another interesting thing is the environment variables of the process:
+
+```
+$ sudo cat /proc/11026/environ | tr '\0' '\n'
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+HOME=/root
+LOGNAME=root
+USER=root
+SHELL=/bin/sh
+INVOCATION_ID=d5d94569d482495c809c113fca55abd4
+TERM=xterm
+AC_APP_NAME=busybox
+```
+
+Finally, we can check in which cgroups the process is:
+
+```
+$ sudo cat /proc/11026/cgroup
+11:freezer:/
+10:rdma:/
+9:cpu,cpuacct:/machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope/system.slice/busybox.service
+8:devices:/machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope/system.slice/busybox.service
+7:blkio:/machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope/system.slice
+6:memory:/machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope/system.slice/busybox.service
+5:perf_event:/
+4:pids:/machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope/system.slice/busybox.service
+3:net_cls,net_prio:/
+2:cpuset:/
+1:name=systemd:/machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope/system.slice/busybox.service
+0::/machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope/system.slice/busybox.service
+```
+
+Let's explore the cgroups a bit more.
+
+## Inspect container cgroups
+
+systemd offers tools to easily inspect the cgroups of containers.
+
+We can use `systemd-cgls` to see the cgroup hierarchy of a container:
+
+```
+$ machinectl
+MACHINE                                  CLASS     SERVICE OS VERSION ADDRESSES
+rkt-97910fdc-13ec-4025-8f93-5ddea0089eff container rkt     -  -       172.16.28.25...
+
+1 machines listed.
+$ systemd-cgls -M rkt-97910fdc-13ec-4025-8f93-5ddea0089eff
+Control group /machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope:
+-.slice
+├─init.scope
+│ └─12474 /usr/lib/systemd/systemd --default-standard-output=tty --log-target=null --show-status=0
+└─system.slice
+  ├─busybox.service
+  │ └─12479 /bin/sh
+  └─systemd-journald.service
+    └─12475 /usr/lib/systemd/systemd-journald
+```
+
+And we can use `systemd-cgtop` to see the resource consumption of the container.
+This is the output while running the `yes` command (which is basically an infinite loop that outputs the character `y`, so it takes all the CPU) in the container:
+
+```
+Control Group                                                                                            Tasks   %CPU   Memory  Input/s Output/s
+/machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope                         4   19.6     7.6M        -        -
+/machine.slice/machine-rkt\x2d97910fdc\x2d13ec\x2d4025\x2d8f93\x2d5ddea0089eff.scope/system.slice            3   19.6     5.1M        -        -
+/machine.slice/machine-rkt\x2d979…c\x2d4025\x2d8f93\x2d5ddea0089eff.scope/system.slice/busybox.service       2   19.6   476.0K        -        -
+/machine.slice/machine-rkt\x2d979…d8f93\x2d5ddea0089eff.scope/system.slice/system-prepare\x2dapp.slice       -      -   120.0K        -        -
+/machine.slice/machine-rkt\x2d979…\x2d8f93\x2d5ddea0089eff.scope/system.slice/systemd-journald.service       1      -     4.5M        -        -
+```
+
+You can see that our CPU limit is working, since we only see a CPU usage of about 20%.
+
+This information can also be gathered from the cgroup filesystem itself.
+For example, to see the memory consumed by the busybox application:
+
+```
+$ /sys/fs/cgroup/memory/machine.slice/machine-rkt\\x2d97910fdc\\x2d13ec\\x2d4025\\x2d8f93\\x2d5ddea0089eff.scope/system.slice/busybox.service/
+$ cat memory.usage_in_bytes
+487424
+```
+
+You can find out more about cgroups in their [kernel documentation][cgroups].
+
+[strace]: https://linux.die.net/man/1/strace
+[overlay]: https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt
+[treestore]: ../../store/treestore/tree.go
+[run-entrypoint]: stage1-implementors-guide.md#rkt-run
+[cni]: https://github.com/containernetworking/cni
+[ptp]: ../networking/overview.md#ptp
+[host-local]: ../networking/overview.md#host-local
+[seccomp]: ../seccomp-guide.md
+[procfs]: https://www.kernel.org/doc/Documentation/filesystems/proc.txt
+[cgroups]: https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt
+[man-namespaces]: http://man7.org/linux/man-pages/man7/namespaces.7.html
+[architecture-stage0]: architecture.md#stage-0
+[inaccessible-paths]: https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ReadWritePaths=
+[syscall-filter]: https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=
+[capabilities]: ../capabilities-guide.md
+[os-spec]: https://github.com/appc/spec/blob/v0.8.11/spec/OS-SPEC.md
+[man-lsns]: http://man7.org/linux/man-pages/man8/lsns.8.html
+[void-linux]: https://www.voidlinux.eu/

From 810b43976c10dfffd04839bf3ffc76ecae265273 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <benjamin.gilbert@coreos.com>
Date: Fri, 9 Feb 2018 17:58:45 -0800
Subject: [PATCH 1268/1304] stage1/usr_from_coreos: add new image signing
 subkey 0638EB2F

---
 stage1/usr_from_coreos/cache.sh | 60 +++++++++++++++++++++++++++------
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/stage1/usr_from_coreos/cache.sh b/stage1/usr_from_coreos/cache.sh
index fd919987fd..de0de8449c 100755
--- a/stage1/usr_from_coreos/cache.sh
+++ b/stage1/usr_from_coreos/cache.sh
@@ -11,17 +11,20 @@ if [ ${V} -eq 3 ]; then
 fi
 
 # coreos gpg signing key
-# pub   4096R/93D2DCB4 2013-09-06
-# uid       [ unknown] CoreOS Buildbot (Offical Builds) <buildbot@coreos.com>
-# sub   4096R/74E7E361 2013-09-06 [expired: 2014-09-06]
-# sub   4096R/E5676EFC 2014-09-08 [expired: 2015-09-08]
-# sub   4096R/1CB5FA26 2015-08-31 [expires: 2017-08-30]
-# sub   4096R/B58844F1 2015-11-20 [revoked: 2016-05-16]
-# sub   4096R/2E16137F 2016-05-16 [expires: 2017-05-16]
-# sub   4096R/EF4B4ED9 2017-05-22 [expires: 2018-06-01]
+# $ gpg2 --list-keys --list-options show-unusable-subkeys \
+#     --keyid-format SHORT 04127D0BFABEC8871FFB2CCE50E0885593D2DCB4
+# pub   rsa4096/93D2DCB4 2013-09-06 [SC]
+#       04127D0BFABEC8871FFB2CCE50E0885593D2DCB4
+# uid         [ unknown] CoreOS Buildbot (Offical Builds) <buildbot@coreos.com>
+# sub   rsa4096/74E7E361 2013-09-06 [S] [expired: 2014-09-06]
+# sub   rsa4096/E5676EFC 2014-09-08 [S] [expired: 2015-09-08]
+# sub   rsa4096/1CB5FA26 2015-08-31 [S] [expired: 2017-08-30]
+# sub   rsa4096/B58844F1 2015-11-20 [S] [revoked: 2016-05-16]
+# sub   rsa4096/2E16137F 2016-05-16 [S] [expired: 2017-05-16]
+# sub   rsa4096/EF4B4ED9 2017-05-22 [S] [expires: 2018-06-01]
+# sub   rsa4096/0638EB2F 2018-02-10 [S] [expires: 2019-06-01]
 GPG_LONG_ID="50E0885593D2DCB4"
 GPG_KEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
 
 mQINBFIqVhQBEADjC7oxg5N9Xqmqqrac70EHITgjEXZfGm7Q50fuQlqDoeNWY+sN
 szpw//dWz8lxvPAqUlTSeR+dl7nwdpG2yJSBY6pXnXFF9sdHoFAUI0uy1Pp6VU9b
@@ -261,8 +264,43 @@ EtoSQ5C4gFg40WIQ/nUJEegLVwm/y+AKQ/bArLmfH+SPVRV/WVKgjZHoU5FwhP79
 kfS68AO03dY9yhiAw41bKNafIwfAJNVUyiP+JgXc/EYVtZtcSJC+h5v8dxi8W3GR
 3Oa0hgV/GKQwofqV0QN63sW0N/MVH/73HdOl90N+We5L3hWNkWnX+klCmpbBb89a
 JUz0rdDolFlffrdwVM5RvAT0OBNo4ZTDv5p0+4ahoZpXT/kQGXDVdBFvp9GLTH3l
-tNPsShDTwMfzQ7k8ah9PXA==
-=NfcE
+tNPsShDTwMfzQ7k8ah9PXLkCDQRafkZ/ARAAvgHVVJkPpsamuOc7dGWE1GyGX2CH
+f2djECtRq94uqkY3RMmlxNbpL2gFcxjXJy3ed9KgYsgg1anOiD/VXg8QlGvk4qM6
+0OHMhlc4FZwo/YCJVmPEHToQC/m9jBVharMvThBtjy1D025EJ9dWmfe+e9RI7bSl
+H3m0Z5cbEFRPDgva/dpSOh4QimQ36UJ/nXpREhb93Apev3VcJ9iCDv+5WmcYJLUU
+ijICpfbfQuXDlsBiFDDa2dIzJEl1wugretLCft+yumJ0tMMtOJEhaE2H+XG6EFo2
+X7XOvp7kLrWFp1F0DvmMUVpdYROzKglxYEphccZwya+sbheqUoVTFQ3L6vvRLPre
+jhXQyQPbw9en/i7fErJZv5NIyKaiTEn5KY8b8A7xTK5GULxKRp4mAh0g/SLq4bR4
+b4mWrDVzDX+SW8Y2+nGGUlOKqg6ivgNLTOC8lxtJSoXPPrA2ibpJ2Wab12n37f3t
+WokPepit6DBa0Txl49H788mRplMgeiMXAnoUv0EBhFmPWsW0aBOW2ShPvlHjJHmB
+0jVPMbAtLZXMSIarTgWFuZguNxXwcjDWGLH+1+kG76MqBpoyiJguOGAj36Xqx8Fj
+cACt36h+y7heLmhrbxB6tMUlmJepACi+NVDBnx38ZsqQ8cI7n0q9Lt63eZyth99Q
+onJKpvQSMYp1zH8AEQEAAYkEcgQYAQgAJhYhBAQSfQv6vsiHH/sszlDgiFWT0ty0
+BQJafkZ/AhsCBQkCdISxAkAJEFDgiFWT0ty0wXQgBBkBCAAdFiEETXJBsUqkcpBR
+XWqNf7MqvAY46y8FAlp+Rn8ACgkQf7MqvAY46y/irQ/+N9vsoc2+oEqdA1HhoW+Z
+1x0ddWj1jtrIHzwvQLdQ2c9Mfvib1vQT0Aj2c1fkYF12eYEzbqUuDTGgH8pQIgD5
+epovF6Ue630KP4cZ3QE6XcEoEqJ6uyUrg51VjdH/jP4T2XsLxCKZCwV97ohIo6aV
+hg4M0pHDULe7hSOlEgpdCYDgbNAhXrNbviD6OlKmS0k+NIUIwy/iyOxa2IbmlY1P
+3kIwlPnbFPzPQECHnuemzbfzo1GOJ4j7iLbgQ0zZqQnLlnjPcp+k+wrK+eweCSIJ
+RN9ytimEgDeUpIN76Vnw6yZ/lrVz6zbbovn0jryEs3LT3dUiHBAcbiJKF6HAiULT
+ApVzIRJjkPjJhXG3rwIjME7sf1O+5MU0T3TurNvx/ZJDfhuL9zH5HuzLik5JBs8K
+U1tvLWM1B+Z1AMFvUUPuKV0kPyY0yyr/yU9/ZyDmIz4rDvAw59VJz60x1WXFE/oz
+u9kBmtcp9R6DI96N/9v7KeS4SFOhaqrOLcOxdt1HQQcDiigqmQH08EzYBqttUIJR
+Wmwm2Tt1viMMVPxTqSHAmNOYnPj8o7wfW9YWgpvLEG2w8JHcwS9ccvC26FtUCxyv
+ZUDc7AeZ4zaf+ePV5uzg3sM+9nH4jMhh/T24jhs+WWlI5mbGYWbuLTtKZw6BX8eW
+jORyOcXf4zcflRMrQ3xrIGvfWA//VvWxKMNEcuBebsGOHYECI3f7H8dpdOTiIsYm
+0RC/+7ppdUsbTRcW3rw9YbpV++oyns7anwnhH6BjiXlO4bPVUEYvID6kT6f182bK
+r8r/bEdfy/YKYETLX2Lrui7PID9uJgjEoTETkWIiuWQfpWOQc6rStoCpGkszsy9q
++stMia1xoE+AZjzGXa10CqV4ytEL9X4MbY6d08FTnuqW2SKcTOgyEFV05T3EVlwx
+LycGMO/Y+HVu3r8TzqMUxnDVXhfPHZ50t4GfdDRCAW5gQbgEbCoYNZOx+qpym2WV
+COaK7XECy+cgZpI5VoDoAVanfBMhZprTU4jmQsI9uf5WI+Jbx5I693EiAFVS/9vg
+Ety6H7P5GclkQtcvYkIy4oK47C3wMus4beF4g6daxs4amWbkcqH1DL7AT/o7uwcc
+B/Fcb6C7Lky0891PxcQBPRLqyydjKMDhxsqTmDGcWOvfTgNh7AeHRl5PNzTmqCWe
+1PLwEBvsPs4z6VC9klPL2y2o9m8SKG0WLjt1T123RmYVp95/aB36AHFu/+Xjy9AT
+ZskQ/mDUv6F4w6N8Vk9R/nJTfpI36vWTcH7xxLNoNRlL2b/7ra6dB8YPsOdLy158
+61Awgh2LQ3x83J/vswmuGi1eaFPCiOOMsjsgdvmDKgWwzGGI+XZjv/NbrgJcrXKB
+2jibQQI=
+=KhYl
 -----END PGP PUBLIC KEY BLOCK-----
 "
 

From 39c99e7a14e871c7cb4bbfd1df94d1e51c6086a1 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Mon, 12 Feb 2018 11:26:44 +0000
Subject: [PATCH 1269/1304] scripts: pkg: build-pkgs.sh: Use RPM file
 dependency for shadow tools

Different RPM distributions use different packages to collect the
various tools from the 'shadow' package so we could use the path
from one of these tools in order to allow the rkt package to be used
in more RPM distributions.
---
 scripts/pkg/build-pkgs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pkg/build-pkgs.sh b/scripts/pkg/build-pkgs.sh
index b389a3c40f..e7d8db361e 100755
--- a/scripts/pkg/build-pkgs.sh
+++ b/scripts/pkg/build-pkgs.sh
@@ -104,7 +104,7 @@ fpm -s dir -t rpm \
 	--after-upgrade $workdir/after-install \
     --license "$LICENSE" --vendor "$VENDOR" --url "$HOMEPAGE" -m "$MAINTAINER" --category utils \
     --provides rkt \
-    -d 'shadow-utils' \
+    -d '/usr/sbin/groupadd' \
     -C ${prefix} 
 
 rm -rf $workdir

From 4ae50784b9f2c13c66b17b053f4aa13b1647cad2 Mon Sep 17 00:00:00 2001
From: "Cel A. Skeggs" <cela@mit.edu>
Date: Sat, 17 Feb 2018 14:42:15 -0500
Subject: [PATCH 1270/1304] kvm: solve routing issues by using the same default
 bridge as CNI

When the kvm stage1 and the coreos stage1 are used on the same machine with a
flannel CNI configuration (and likely other configurations) without a specified
bridge name, different bridges will be constructed by each stage1 for the same
subnet -- cni0 and kvm-cni0 -- causing traffic intended for the
later-constructed bridge to be lost, as it is routed to the earlier-constructed
bridge.

The normal workaround is to specify a bridge name in the CNI configuration, but
this fix avoids the issue altogether by making sure that cni0 is used in all
cases.
---
 networking/kvm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/networking/kvm.go b/networking/kvm.go
index 3db7c71f75..565afa8a00 100644
--- a/networking/kvm.go
+++ b/networking/kvm.go
@@ -43,7 +43,7 @@ import (
 )
 
 const (
-	defaultBrName     = "kvm-cni0"
+	defaultBrName     = "cni0"
 	defaultSubnetFile = "/run/flannel/subnet.env"
 	defaultMTU        = 1500
 )

From 6425514d3bc4cbfcba380b73c83e297b8a2222bd Mon Sep 17 00:00:00 2001
From: Michael Schnupp <Michael.Schnupp@gmail.com>
Date: Sun, 4 Mar 2018 16:09:50 +0100
Subject: [PATCH 1271/1304] Fix NixOS install instructions

Using `nix-env` you have two options:
`nix-env -i rkt` or `nix-env -iA nixos.rkt`

Using `nix-env -iA rkt` will usually not work.

On NixOS however you also want general virtualization dependencies.
Therefore enabling the rkt virtualisation is the right way to
set up everything correctly.
---
 Documentation/distributions.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index c56d86ade0..3d82d76767 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -95,10 +95,16 @@ sudo emerge rkt
 
 ## NixOS
 
-rkt can be installed on NixOS using the following command:
+On NixOS enable rkt by adding the following line in `/etc/nixos/configuration.nix`:
 
 ```
-nix-env -iA rkt
+virtualisation.rkt.enable = true;
+```
+
+Using the nix package manager on another OS you can use:
+
+```
+nix-env -iA nixos.rkt
 ```
 
 The source for the rkt.nix expression can be found on [GitHub][rkt-nixos]

From eb72586653c74f9dd479586f8a0e94c5c09aefb8 Mon Sep 17 00:00:00 2001
From: Michael Schnupp <Michael.Schnupp@gmail.com>
Date: Sun, 4 Mar 2018 16:31:51 +0100
Subject: [PATCH 1272/1304] Change channel name nixos->nixpkgs

On NixOS the default channel is called "nixos".
If you use nix on a diferent OS it is called "nixpkgs".
---
 Documentation/distributions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 3d82d76767..7c58d8c854 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -104,7 +104,7 @@ virtualisation.rkt.enable = true;
 Using the nix package manager on another OS you can use:
 
 ```
-nix-env -iA nixos.rkt
+nix-env -iA nixpkgs.rkt
 ```
 
 The source for the rkt.nix expression can be found on [GitHub][rkt-nixos]

From 68e2d06667b1bfc571618ecaf16b117d339cad1a Mon Sep 17 00:00:00 2001
From: rufo <rufus@rufus.al>
Date: Sat, 23 Sep 2017 23:25:48 +0100
Subject: [PATCH 1273/1304] rkt: add AWS auth headerer support to `rkt config`

This refactors awsAuthHeaderer to match oAuthBearerTokenHeaderer and modifies
the `config` command so awsAuthHeaderer can be marshaled to JSON (support for
this was previously missing).
---
 rkt/config/auth.go   | 12 ++++--------
 rkt/config/config.go |  3 +++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/rkt/config/auth.go b/rkt/config/auth.go
index 6f2f70c79e..0c2c7bb370 100644
--- a/rkt/config/auth.go
+++ b/rkt/config/auth.go
@@ -108,9 +108,7 @@ func (h *oAuthBearerTokenHeaderer) SignRequest(r *http.Request) *http.Request {
 }
 
 type awsAuthHeaderer struct {
-	accessKeyID     string
-	secretAccessKey string
-	region          string
+	auth awsV1
 }
 
 func (h *awsAuthHeaderer) GetHeader() http.Header {
@@ -118,7 +116,7 @@ func (h *awsAuthHeaderer) GetHeader() http.Header {
 }
 
 func (h *awsAuthHeaderer) SignRequest(r *http.Request) *http.Request {
-	region := h.region
+	region := h.auth.Region
 
 	var body io.ReadSeeker
 	if r.Body != nil {
@@ -134,7 +132,7 @@ func (h *awsAuthHeaderer) SignRequest(r *http.Request) *http.Request {
 			SigningName:   awsS3Service,
 		},
 		Config: aws.Config{
-			Credentials: credentials.NewStaticCredentials(h.accessKeyID, h.secretAccessKey, ""),
+			Credentials: credentials.NewStaticCredentials(h.auth.AccessKeyID, h.auth.SecretAccessKey, ""),
 		},
 		HTTPRequest: r,
 		Body:        body,
@@ -243,9 +241,7 @@ func (p *authV1JsonParser) getAWSV1Headerer(raw json.RawMessage) (Headerer, erro
 		return nil, fmt.Errorf("no AWS Secret Access Key specified")
 	}
 	return &awsAuthHeaderer{
-		accessKeyID:     aws.AccessKeyID,
-		secretAccessKey: aws.SecretAccessKey,
-		region:          aws.Region,
+		auth: aws,
 	}, nil
 }
 
diff --git a/rkt/config/config.go b/rkt/config/config.go
index 0fa2e6269f..31ed524b3a 100644
--- a/rkt/config/config.go
+++ b/rkt/config/config.go
@@ -81,6 +81,9 @@ func (c *Config) MarshalJSON() ([]byte, error) {
 		case *oAuthBearerTokenHeaderer:
 			typ = "oauth"
 			credentials = h.auth
+		case *awsAuthHeaderer:
+			typ = "aws"
+			credentials = h.auth
 		default:
 			return nil, errors.New("unknown headerer type")
 		}

From 77e045d30643e8ae89b0de1f2567b7a8a4b3e38f Mon Sep 17 00:00:00 2001
From: budongxin <37971141+budongxin@users.noreply.github.com>
Date: Fri, 6 Apr 2018 08:17:07 +0900
Subject: [PATCH 1274/1304] Update using-rkt-with-kubernetes.md

link 'rktnetes' is not valid currently. Latest I could find was v1.8.
---
 Documentation/using-rkt-with-kubernetes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/using-rkt-with-kubernetes.md b/Documentation/using-rkt-with-kubernetes.md
index 7154d98660..460b63e622 100644
--- a/Documentation/using-rkt-with-kubernetes.md
+++ b/Documentation/using-rkt-with-kubernetes.md
@@ -44,5 +44,5 @@ Known issues and tips for using rkt with Kubernetes can be found in the [rktnete
 [k8s-on-vagrant]: https://coreos.com/kubernetes/docs/latest/kubernetes-on-vagrant-single.html
 [minikube]: https://github.com/kubernetes/minikube
 [minikube-quickstart]: https://github.com/kubernetes/minikube/blob/master/README.md#quickstart
-[rktnetes]: http://kubernetes.io/docs/getting-started-guides/rkt/
+[rktnetes]: https://v1-8.docs.kubernetes.io/docs/getting-started-guides/rkt/
 [rktnetes-notes]: http://kubernetes.io/docs/getting-started-guides/rkt/notes/

From 6eddd6a8ed064147412fb592441a8a75d15a6430 Mon Sep 17 00:00:00 2001
From: budongxin <37971141+budongxin@users.noreply.github.com>
Date: Sat, 7 Apr 2018 18:08:35 +0900
Subject: [PATCH 1275/1304] Update run.md

updated '--dns' option related to issue #3901
---
 Documentation/subcommands/run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 55fccb9a76..90a61ab52c 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -410,7 +410,7 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--caps-remove` | none | capability to remove (e.g. `--caps-remove=CAP_SYS_CHROOT,CAP_MKNOD`) | Capabilities to remove from the process's capabilities bounding set; all others from the default set will be included. |
 | `--caps-retain` | none | capability to retain (e.g. `--caps-retain=CAP_SYS_ADMIN,CAP_NET_ADMIN`) | Capabilities to retain in the process's capabilities bounding set; all others will be removed. |
 | `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
-| `--dns` | none | IP Address | Name server to write in `/etc/resolv.conf`. It can be specified several times. |
+| `--dns` | none | IP Address(seperated with comma), host or none | Name server to write in `/etc/resolv.conf`. It can be specified several times. Pass 'host' only to use host's resolv.conf or 'none' only to ignore CNI DNS config. |
 | `--dns-domain` | none | DNS domain (e.g., `--dns-domain=example.com`) | DNS domain to write in `/etc/resolv.conf`. |
 | `--dns-opt` | none | DNS option | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |

From c1a1246c4016e741fd5b1c42877bc5856fb80dbd Mon Sep 17 00:00:00 2001
From: budongxin <37971141+budongxin@users.noreply.github.com>
Date: Sat, 7 Apr 2018 18:25:42 +0900
Subject: [PATCH 1276/1304] Update run.md

Grammar correction
---
 Documentation/subcommands/run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 90a61ab52c..b65b7405de 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -410,7 +410,7 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--caps-remove` | none | capability to remove (e.g. `--caps-remove=CAP_SYS_CHROOT,CAP_MKNOD`) | Capabilities to remove from the process's capabilities bounding set; all others from the default set will be included. |
 | `--caps-retain` | none | capability to retain (e.g. `--caps-retain=CAP_SYS_ADMIN,CAP_NET_ADMIN`) | Capabilities to retain in the process's capabilities bounding set; all others will be removed. |
 | `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
-| `--dns` | none | IP Address(seperated with comma), host or none | Name server to write in `/etc/resolv.conf`. It can be specified several times. Pass 'host' only to use host's resolv.conf or 'none' only to ignore CNI DNS config. |
+| `--dns` | none | IP Addresses(separated by comma), host or none | Name server to write in `/etc/resolv.conf`. It can be specified several times. Pass 'host' only to use host's resolv.conf or 'none' only to ignore CNI DNS config. |
 | `--dns-domain` | none | DNS domain (e.g., `--dns-domain=example.com`) | DNS domain to write in `/etc/resolv.conf`. |
 | `--dns-opt` | none | DNS option | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |

From 69d24ef479ebce087dd2aaedc21e06ff43169d5f Mon Sep 17 00:00:00 2001
From: Yeongju Kang <37971141+budongxin@users.noreply.github.com>
Date: Sun, 8 Apr 2018 10:26:02 +0900
Subject: [PATCH 1277/1304] Update run.md

added highlights on options
---
 Documentation/subcommands/run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index b65b7405de..c56ecb5982 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -410,7 +410,7 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--caps-remove` | none | capability to remove (e.g. `--caps-remove=CAP_SYS_CHROOT,CAP_MKNOD`) | Capabilities to remove from the process's capabilities bounding set; all others from the default set will be included. |
 | `--caps-retain` | none | capability to retain (e.g. `--caps-retain=CAP_SYS_ADMIN,CAP_NET_ADMIN`) | Capabilities to retain in the process's capabilities bounding set; all others will be removed. |
 | `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
-| `--dns` | none | IP Addresses(separated by comma), host or none | Name server to write in `/etc/resolv.conf`. It can be specified several times. Pass 'host' only to use host's resolv.conf or 'none' only to ignore CNI DNS config. |
+| `--dns` | none | IP Addresses(separated by comma), `host` or `none` | Name server to write in `/etc/resolv.conf`. It can be specified several times. Pass 'host' only to use host's resolv.conf or 'none' only to ignore CNI DNS config. |
 | `--dns-domain` | none | DNS domain (e.g., `--dns-domain=example.com`) | DNS domain to write in `/etc/resolv.conf`. |
 | `--dns-opt` | none | DNS option | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |

From ef83847a91ad2212b7e4779e93bb6cf8913442ad Mon Sep 17 00:00:00 2001
From: Yeongju Kang <37971141+budongxin@users.noreply.github.com>
Date: Sun, 8 Apr 2018 10:31:22 +0900
Subject: [PATCH 1278/1304] Update run.md

more highlights on description
---
 Documentation/subcommands/run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index c56ecb5982..301f7de638 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -410,7 +410,7 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--caps-remove` | none | capability to remove (e.g. `--caps-remove=CAP_SYS_CHROOT,CAP_MKNOD`) | Capabilities to remove from the process's capabilities bounding set; all others from the default set will be included. |
 | `--caps-retain` | none | capability to retain (e.g. `--caps-retain=CAP_SYS_ADMIN,CAP_NET_ADMIN`) | Capabilities to retain in the process's capabilities bounding set; all others will be removed. |
 | `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
-| `--dns` | none | IP Addresses(separated by comma), `host` or `none` | Name server to write in `/etc/resolv.conf`. It can be specified several times. Pass 'host' only to use host's resolv.conf or 'none' only to ignore CNI DNS config. |
+| `--dns` | none | IP Addresses(separated by comma), `host` or `none` | Name server to write in `/etc/resolv.conf`. It can be specified several times. Pass `host` only to use host's resolv.conf or `none` only to ignore CNI DNS config. |
 | `--dns-domain` | none | DNS domain (e.g., `--dns-domain=example.com`) | DNS domain to write in `/etc/resolv.conf`. |
 | `--dns-opt` | none | DNS option | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |

From 1768333a3a28a0e5117494fb1911a5085b0bf586 Mon Sep 17 00:00:00 2001
From: Yeongju Kang <37971141+budongxin@users.noreply.github.com>
Date: Wed, 11 Apr 2018 20:26:29 +0900
Subject: [PATCH 1279/1304] Update run.md

Syntax correction
---
 Documentation/subcommands/run.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/subcommands/run.md b/Documentation/subcommands/run.md
index 301f7de638..64feec3593 100644
--- a/Documentation/subcommands/run.md
+++ b/Documentation/subcommands/run.md
@@ -410,7 +410,7 @@ This feature will be disabled automatically if the underlying filesystem does no
 | `--caps-remove` | none | capability to remove (e.g. `--caps-remove=CAP_SYS_CHROOT,CAP_MKNOD`) | Capabilities to remove from the process's capabilities bounding set; all others from the default set will be included. |
 | `--caps-retain` | none | capability to retain (e.g. `--caps-retain=CAP_SYS_ADMIN,CAP_NET_ADMIN`) | Capabilities to retain in the process's capabilities bounding set; all others will be removed. |
 | `--cpu` | none | CPU units (e.g. `--cpu=500m`) | CPU limit for the preceding image in [Kubernetes resource model][k8s-resources] format. |
-| `--dns` | none | IP Addresses(separated by comma), `host` or `none` | Name server to write in `/etc/resolv.conf`. It can be specified several times. Pass `host` only to use host's resolv.conf or `none` only to ignore CNI DNS config. |
+| `--dns` | none | IP Addresses (separated by comma), `host`, or `none` | Name server to write in `/etc/resolv.conf`. It can be specified several times. Pass `host` only to use host's resolv.conf or `none` only to ignore CNI DNS config. |
 | `--dns-domain` | none | DNS domain (e.g., `--dns-domain=example.com`) | DNS domain to write in `/etc/resolv.conf`. |
 | `--dns-opt` | none | DNS option | DNS option from resolv.conf(5) to write in `/etc/resolv.conf`. It can be specified several times. |
 | `--dns-search` | none | Domain name | DNS search domain to write in `/etc/resolv.conf`. It can be specified several times. |

From cfa51c5c4e1cd53e3d4ce88580199d504de5d7b9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 13 Apr 2018 12:00:07 +0000
Subject: [PATCH 1280/1304] stage1/kvm: fix qemu memfd build failure

This is a backport of a qemu upstream patch to fix a memfd related
failure. It first adds infrastructure to apply the patch to qemu at
build time.

Ref: https://git.qemu.org/?p=qemu.git;a=commit;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0
Ref: https://github.com/rkt/rkt/pull/3921#issuecomment-380791171
---
 stage1/usr_from_kvm/qemu.mk                   | 25 ++++++++-
 .../000-memfd_fix_configure_test.patch        | 55 +++++++++++++++++++
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 stage1/usr_from_kvm/qemu/patches/000-memfd_fix_configure_test.patch

diff --git a/stage1/usr_from_kvm/qemu.mk b/stage1/usr_from_kvm/qemu.mk
index d948666f48..e6b7f9afaf 100644
--- a/stage1/usr_from_kvm/qemu.mk
+++ b/stage1/usr_from_kvm/qemu.mk
@@ -1,6 +1,10 @@
 $(call setup-stamp-file,QEMU_STAMP)
 QEMU_TMPDIR := $(UFK_TMPDIR)/qemu
 QEMU_SRCDIR := $(QEMU_TMPDIR)/src
+QEMU_STUFFDIR := $(MK_SRCDIR)/qemu
+QEMU_PATCHESDIR := $(QEMU_STUFFDIR)/patches
+QEMU_PATCHES := $(abspath $(QEMU_PATCHESDIR)/*.patch)
+
 QEMU_BINARY := $(QEMU_SRCDIR)/x86_64-softmmu/qemu-system-x86_64
 QEMU_BIOS_BINARIES := bios-256k.bin \
     kvmvapic.bin \
@@ -22,11 +26,14 @@ QEMU_GIT := git://git.qemu-project.org/qemu.git
 QEMU_GIT_COMMIT := v2.8.0
 
 $(call setup-stamp-file,QEMU_BUILD_STAMP,/build)
+$(call setup-stamp-file,QEMU_PATCH_STAMP,/patch_qemu)
 $(call setup-stamp-file,QEMU_BIOS_BUILD_STAMP,/bios_build)
 $(call setup-stamp-file,QEMU_CONF_STAMP,/conf)
 $(call setup-stamp-file,QEMU_DIR_CLEAN_STAMP,/dir-clean)
 $(call setup-filelist-file,QEMU_DIR_FILELIST,/dir)
 $(call setup-clean-file,QEMU_CLEANMK,/src)
+$(call setup-dep-file,QEMU_PATCHES_DEPMK)
+$(call setup-filelist-file,QEMU_PATCHES_FILELIST,/patches)
 
 S1_RF_SECONDARY_STAMPS += $(QEMU_STAMP)
 S1_RF_INSTALL_FILES += $(QEMU_BINARY):$(QEMU_ACI_BINARY):-
@@ -37,7 +44,17 @@ INSTALL_DIRS += \
 # Bios files needs to be removed (source will be removed by QEMU_DIR_CLEAN_STAMP)
 CLEAN_FILES += $(foreach bios,$(QEMU_BIOS_BINARIES),$(HV_ACIROOTFSDIR)/${bios})
 
-$(call generate-stamp-rule,$(QEMU_STAMP),$(QEMU_CONF_STAMP) $(QEMU_BUILD_STAMP) $(QEMU_ACI_BINARY) $(QEMU_BIOS_BUILD_STAMP) $(QEMU_DIR_CLEAN_STAMP),,)
+$(call generate-stamp-rule,$(QEMU_PATCH_STAMP),$(QEMU_CONF_STAMP),, \
+        shopt -s nullglob; \
+        for p in $(QEMU_PATCHES); do \
+                $(call vb,v2,PATCH,$$$${p#$(MK_TOPLEVEL_ABS_SRCDIR)/}) \
+                patch $(call vl3,--silent) --directory="$(QEMU_SRCDIR)" --strip=1 --forward <"$$$${p}"; \
+        done)
+
+# Generate a filelist of patches. Can happen anytime.
+$(call generate-patches-filelist,$(QEMU_PATCHES_FILELIST),$(QEMU_PATCHESDIR))
+
+$(call generate-stamp-rule,$(QEMU_STAMP),$(QEMU_PATCH_STAMP) $(QEMU_CONF_STAMP) $(QEMU_BUILD_STAMP) $(QEMU_ACI_BINARY) $(QEMU_BIOS_BUILD_STAMP) $(QEMU_DIR_CLEAN_STAMP),,)
 
 $(QEMU_BINARY): $(QEMU_BUILD_STAMP)
 
@@ -47,7 +64,7 @@ $(call generate-stamp-rule,$(QEMU_BIOS_BUILD_STAMP),$(QEMU_CONF_STAMP) $(UFK_CBU
 		cp $(QEMU_SRCDIR)/pc-bios/$$$${bios} $(HV_ACIROOTFSDIR)/$$$${bios} $(call vl2,>/dev/null); \
 	done)
 
-$(call generate-stamp-rule,$(QEMU_BUILD_STAMP),$(QEMU_CONF_STAMP),, \
+$(call generate-stamp-rule,$(QEMU_BUILD_STAMP),$(QEMU_CONF_STAMP) $(QEMU_PATCH_STAMP),, \
     $(call vb,vt,BUILD EXT,qemu) \
 	$$(MAKE) $(call vl2,--silent) -C "$(QEMU_SRCDIR)" $(call vl2,>/dev/null))
 
@@ -63,6 +80,10 @@ $(call generate-deep-filelist,$(QEMU_DIR_FILELIST),$(QEMU_SRCDIR))
 # Generate clean.mk cleaning qemu directory
 $(call generate-clean-mk,$(QEMU_DIR_CLEAN_STAMP),$(QEMU_CLEANMK),$(QEMU_DIR_FILELIST),$(QEMU_SRCDIR))
 
+# Generate dep.mk on patches, so if they change, the project has to be
+# reset to original checkout and patches reapplied.
+$(call generate-glob-deps,$(QEMU_DEPS_STAMP),$(QEMU_SRCDIR)/Makefile,$(QEMU_PATCHES_DEPMK),.patch,$(QEMU_PATCHES_FILELIST),$(QEMU_PATCHESDIR),normal)
+
 GCL_REPOSITORY := $(QEMU_GIT)
 GCL_DIRECTORY := $(QEMU_SRCDIR)
 GCL_COMMITTISH := $(QEMU_GIT_COMMIT)
diff --git a/stage1/usr_from_kvm/qemu/patches/000-memfd_fix_configure_test.patch b/stage1/usr_from_kvm/qemu/patches/000-memfd_fix_configure_test.patch
new file mode 100644
index 0000000000..b1f354ac1c
--- /dev/null
+++ b/stage1/usr_from_kvm/qemu/patches/000-memfd_fix_configure_test.patch
@@ -0,0 +1,55 @@
+From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Tue, 28 Nov 2017 11:51:27 +0100
+Subject: [PATCH] memfd: fix configure test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Recent glibc added memfd_create in sys/mman.h.  This conflicts with
+the definition in util/memfd.c:
+
+    /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
+
+Fix the configure test, and remove the sys/memfd.h inclusion since the
+file actually does not exist---it is a typo in the memfd_create(2) man
+page.
+
+Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ configure    | 2 +-
+ util/memfd.c | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9c8aa5a..99ccc17 100755
+--- a/configure
++++ b/configure
+@@ -3923,7 +3923,7 @@ fi
+ # check if memfd is supported
+ memfd=no
+ cat > $TMPC << EOF
+-#include <sys/memfd.h>
++#include <sys/mman.h>
+ 
+ int main(void)
+ {
+diff --git a/util/memfd.c b/util/memfd.c
+index 4571d1a..412e94a 100644
+--- a/util/memfd.c
++++ b/util/memfd.c
+@@ -31,9 +31,7 @@
+ 
+ #include "qemu/memfd.h"
+ 
+-#ifdef CONFIG_MEMFD
+-#include <sys/memfd.h>
+-#elif defined CONFIG_LINUX
++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
+ #include <sys/syscall.h>
+ #include <asm/unistd.h>
+ 
+-- 
+1.8.3.1
+

From 5bfe05b74201d4f1ee30f1d85a60a8aac2f85c12 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 13 Apr 2018 16:04:24 +0000
Subject: [PATCH 1281/1304] glide: bump docker2aci to 0.17.2

---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index e9498d45b0..86a748be1f 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/StackExchange/wmi
   version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 - package: github.com/appc/docker2aci
-  version: v0.17.1
+  version: v0.17.2
   subpackages:
   - lib
   - lib/common

From 6483a4d3b007c2e1a35558ca8eddc3f37079a78f Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 13 Apr 2018 16:08:05 +0000
Subject: [PATCH 1282/1304] glide: fix github.com/go4org/go4 entry

---
 glide.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glide.yaml b/glide.yaml
index 86a748be1f..33babe9c64 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -213,7 +213,7 @@ import:
   version: ecf47fd5739b3d2c3daf7c89c4b9715a2605c21b
   subpackages:
   - nl
-- package: go4.org
+- package: github.com/go4org/go4
   version: 03efcb870d84809319ea509714dd6d19a1498483
   subpackages:
   - errorutil

From 2e7de5a6df48b4e43567f8a024ca647d2d1952c8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Fri, 13 Apr 2018 16:26:44 +0000
Subject: [PATCH 1283/1304] vendor: update after glide changes

---
 glide.lock                                    |   12 +-
 .../appc/docker2aci/lib/internal/internal.go  |   29 +-
 .../github.com/appc/docker2aci/lib/version.go |    2 +-
 vendor/github.com/go4org/go4/LICENSE          |  202 +
 .../go4org/go4/errorutil/highlight.go         |   58 +
 vendor/golang.org/x/text/doc.go               |    3 +
 vendor/golang.org/x/text/gen.go               |   14 +-
 .../x/text/unicode/norm/maketables.go         |    4 +-
 .../norm/{tables.go => tables10.0.0.go}       |    2 +
 .../x/text/unicode/norm/tables9.0.0.go        | 7633 +++++++++++++++++
 vendor/golang.org/x/text/width/gen.go         |    2 +-
 .../text/width/{tables.go => tables10.0.0.go} |    2 +
 vendor/golang.org/x/text/width/tables9.0.0.go | 1286 +++
 13 files changed, 9230 insertions(+), 19 deletions(-)
 create mode 100644 vendor/github.com/go4org/go4/LICENSE
 create mode 100644 vendor/github.com/go4org/go4/errorutil/highlight.go
 rename vendor/golang.org/x/text/unicode/norm/{tables.go => tables10.0.0.go} (99%)
 create mode 100644 vendor/golang.org/x/text/unicode/norm/tables9.0.0.go
 rename vendor/golang.org/x/text/width/{tables.go => tables10.0.0.go} (99%)
 create mode 100644 vendor/golang.org/x/text/width/tables9.0.0.go

diff --git a/glide.lock b/glide.lock
index 0b94f46153..3e141eb41f 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: 5e63c98da9454db1ed765efed9a54a8df79da833d0db1e939d2c8956086132da
-updated: 2017-10-26T12:59:31.154326718-07:00
+hash: 1a955b0303fbf7d88c8f32a17036a2ecb48c30ce42ce1771a025445126198986
+updated: 2018-04-13T16:23:44.423828285Z
 imports:
 - name: github.com/appc/docker2aci
-  version: b62d1b9cbba9aa4eddc65dad290bff4aee211feb
+  version: 1bfc43596cd2fdca46e9ddb33cfe7d56f87644ab
   subpackages:
   - lib
   - lib/common
@@ -146,6 +146,10 @@ imports:
   version: 572eabb84c424e76a0d39d31510dd7dfd62f70b2
   subpackages:
   - oleutil
+- name: github.com/go4org/go4
+  version: 03efcb870d84809319ea509714dd6d19a1498483
+  subpackages:
+  - errorutil
 - name: github.com/godbus/dbus
   version: a1b8ba5163b7f041b22761461eabd02b70d1f824
   subpackages:
@@ -284,7 +288,7 @@ imports:
   subpackages:
   - unix
 - name: golang.org/x/text
-  version: 6eab0e8f74e86c598ec3b6fad4888e0c11482d48
+  version: 7922cc490dd5a7dbaa7fd5d6196b49db59ac042f
   subpackages:
   - transform
   - unicode/norm
diff --git a/vendor/github.com/appc/docker2aci/lib/internal/internal.go b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
index 1f811fcb91..b7327660d6 100644
--- a/vendor/github.com/appc/docker2aci/lib/internal/internal.go
+++ b/vendor/github.com/appc/docker2aci/lib/internal/internal.go
@@ -613,23 +613,40 @@ func writeACI(layer io.ReadSeeker, manifest schema.ImageManifest, curPwl []strin
 		if name == "./" {
 			return nil
 		}
-		t.Header.Name = path.Join("rootfs", name)
-		absolutePath := strings.TrimPrefix(t.Header.Name, "rootfs")
+		newName := path.Join("rootfs", name)
+		absolutePath := strings.TrimPrefix(newName, "rootfs")
 
 		if filepath.Clean(absolutePath) == "/dev" && t.Header.Typeflag != tar.TypeDir {
 			return fmt.Errorf(`invalid layer: "/dev" is not a directory`)
 		}
 
 		fileMap[absolutePath] = struct{}{}
-		if strings.Contains(t.Header.Name, "/.wh.") {
+		if strings.Contains(newName, "/.wh.") {
 			whiteouts = append(whiteouts, strings.Replace(absolutePath, ".wh.", "", 1))
 			return nil
 		}
+
+		newHeader := &tar.Header{
+			Typeflag:   t.Header.Typeflag,
+			Name:       newName,
+			Linkname:   t.Header.Linkname,
+			Size:       t.Header.Size,
+			Mode:       t.Header.Mode,
+			Uid:        t.Header.Uid,
+			Gid:        t.Header.Gid,
+			Uname:      t.Header.Uname,
+			Gname:      t.Header.Gname,
+			ModTime:    t.Header.ModTime,
+			AccessTime: t.Header.AccessTime,
+			ChangeTime: t.Header.ChangeTime,
+			Devmajor:   t.Header.Devmajor,
+			Devminor:   t.Header.Devminor,
+			Xattrs:     t.Header.Xattrs,
+		}
 		if t.Header.Typeflag == tar.TypeLink {
-			t.Header.Linkname = path.Join("rootfs", t.Linkname())
+			newHeader.Linkname = path.Join("rootfs", t.Linkname())
 		}
-
-		if err := trw.WriteHeader(t.Header); err != nil {
+		if err := trw.WriteHeader(newHeader); err != nil {
 			return err
 		}
 		if _, err := io.Copy(trw, t.TarStream); err != nil {
diff --git a/vendor/github.com/appc/docker2aci/lib/version.go b/vendor/github.com/appc/docker2aci/lib/version.go
index 905fa7471e..fc242385d4 100644
--- a/vendor/github.com/appc/docker2aci/lib/version.go
+++ b/vendor/github.com/appc/docker2aci/lib/version.go
@@ -16,5 +16,5 @@ package docker2aci
 
 import "github.com/appc/spec/schema"
 
-var Version = "0.17.1"
+var Version = "0.17.2"
 var AppcVersion = schema.AppContainerVersion
diff --git a/vendor/github.com/go4org/go4/LICENSE b/vendor/github.com/go4org/go4/LICENSE
new file mode 100644
index 0000000000..8f71f43fee
--- /dev/null
+++ b/vendor/github.com/go4org/go4/LICENSE
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/vendor/github.com/go4org/go4/errorutil/highlight.go b/vendor/github.com/go4org/go4/errorutil/highlight.go
new file mode 100644
index 0000000000..1b1efb0f68
--- /dev/null
+++ b/vendor/github.com/go4org/go4/errorutil/highlight.go
@@ -0,0 +1,58 @@
+/*
+Copyright 2011 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package errorutil helps make better error messages.
+package errorutil // import "go4.org/errorutil"
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"io"
+	"strings"
+)
+
+// HighlightBytePosition takes a reader and the location in bytes of a parse
+// error (for instance, from json.SyntaxError.Offset) and returns the line, column,
+// and pretty-printed context around the error with an arrow indicating the exact
+// position of the syntax error.
+func HighlightBytePosition(f io.Reader, pos int64) (line, col int, highlight string) {
+	line = 1
+	br := bufio.NewReader(f)
+	lastLine := ""
+	thisLine := new(bytes.Buffer)
+	for n := int64(0); n < pos; n++ {
+		b, err := br.ReadByte()
+		if err != nil {
+			break
+		}
+		if b == '\n' {
+			lastLine = thisLine.String()
+			thisLine.Reset()
+			line++
+			col = 1
+		} else {
+			col++
+			thisLine.WriteByte(b)
+		}
+	}
+	if line > 1 {
+		highlight += fmt.Sprintf("%5d: %s\n", line-1, lastLine)
+	}
+	highlight += fmt.Sprintf("%5d: %s\n", line, thisLine.String())
+	highlight += fmt.Sprintf("%s^\n", strings.Repeat(" ", col+5))
+	return
+}
diff --git a/vendor/golang.org/x/text/doc.go b/vendor/golang.org/x/text/doc.go
index a48e2843fc..2e19a419c7 100644
--- a/vendor/golang.org/x/text/doc.go
+++ b/vendor/golang.org/x/text/doc.go
@@ -7,6 +7,9 @@
 // text is a repository of text-related packages related to internationalization
 // (i18n) and localization (l10n), such as character encodings, text
 // transformations, and locale-specific text handling.
+//
+// There is a 30 minute video, recorded on 2017-11-30, on the "State of
+// golang.org/x/text" at https://www.youtube.com/watch?v=uYrDrMEGu58
 package text
 
 // TODO: more documentation on general concepts, such as Transformers, use
diff --git a/vendor/golang.org/x/text/gen.go b/vendor/golang.org/x/text/gen.go
index 4257a18399..3131edd96b 100644
--- a/vendor/golang.org/x/text/gen.go
+++ b/vendor/golang.org/x/text/gen.go
@@ -109,7 +109,8 @@ pkg unicode, var <new script or property> *RangeTable
 
 	var (
 		cldr       = generate("./unicode/cldr", unicode)
-		language   = generate("./language", cldr)
+		compact    = generate("./internal/language/compact", cldr)
+		language   = generate("./language", cldr, compact)
 		internal   = generate("./internal", unicode, language)
 		norm       = generate("./unicode/norm", unicode)
 		rangetable = generate("./unicode/rangetable", unicode)
@@ -117,16 +118,19 @@ pkg unicode, var <new script or property> *RangeTable
 		width      = generate("./width", unicode)
 		bidi       = generate("./unicode/bidi", unicode, norm, rangetable)
 		mib        = generate("./encoding/internal/identifier", unicode)
+		number     = generate("./internal/number", unicode, cldr, language, internal)
+		cldrtree   = generate("./internal/cldrtree", language, internal)
+		_          = generate("./unicode/runenames", unicode)
 		_          = generate("./encoding/htmlindex", unicode, language, mib)
 		_          = generate("./encoding/ianaindex", unicode, language, mib)
 		_          = generate("./secure/precis", unicode, norm, rangetable, cases, width, bidi)
-		_          = generate("./currency", unicode, cldr, language, internal)
-		_          = generate("./internal/number", unicode, cldr, language, internal)
-		_          = generate("./feature/plural", unicode, cldr, language, internal)
+		_          = generate("./currency", unicode, cldr, language, internal, number)
+		_          = generate("./feature/plural", unicode, cldr, language, internal, number)
 		_          = generate("./internal/export/idna", unicode, bidi, norm)
-		_          = generate("./language/display", unicode, cldr, language, internal)
+		_          = generate("./language/display", unicode, cldr, language, internal, number)
 		_          = generate("./collate", unicode, norm, cldr, language, rangetable)
 		_          = generate("./search", unicode, norm, cldr, language, rangetable)
+		_          = generate("./date", cldr, language, cldrtree)
 	)
 	all.Wait()
 
diff --git a/vendor/golang.org/x/text/unicode/norm/maketables.go b/vendor/golang.org/x/text/unicode/norm/maketables.go
index 8d418160ca..338c395ee6 100644
--- a/vendor/golang.org/x/text/unicode/norm/maketables.go
+++ b/vendor/golang.org/x/text/unicode/norm/maketables.go
@@ -795,7 +795,7 @@ func makeTables() {
 	}
 
 	fmt.Fprintf(w, "// Total size of tables: %dKB (%d bytes)\n", (size+512)/1024, size)
-	gen.WriteGoFile("tables.go", "norm", w.Bytes())
+	gen.WriteVersionedGoFile("tables.go", "norm", w.Bytes())
 }
 
 func printChars() {
@@ -972,5 +972,5 @@ func printTestdata() {
 		}
 	}
 	fmt.Fprintln(w, "}")
-	gen.WriteGoFile("data_test.go", "norm", w.Bytes())
+	gen.WriteVersionedGoFile("data_test.go", "norm", w.Bytes())
 }
diff --git a/vendor/golang.org/x/text/unicode/norm/tables.go b/vendor/golang.org/x/text/unicode/norm/tables10.0.0.go
similarity index 99%
rename from vendor/golang.org/x/text/unicode/norm/tables.go
rename to vendor/golang.org/x/text/unicode/norm/tables10.0.0.go
index 316b093c53..44dd3978ca 100644
--- a/vendor/golang.org/x/text/unicode/norm/tables.go
+++ b/vendor/golang.org/x/text/unicode/norm/tables10.0.0.go
@@ -1,5 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
+// +build go1.10
+
 package norm
 
 const (
diff --git a/vendor/golang.org/x/text/unicode/norm/tables9.0.0.go b/vendor/golang.org/x/text/unicode/norm/tables9.0.0.go
new file mode 100644
index 0000000000..a01274a8e8
--- /dev/null
+++ b/vendor/golang.org/x/text/unicode/norm/tables9.0.0.go
@@ -0,0 +1,7633 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+// +build !go1.10
+
+package norm
+
+const (
+	// Version is the Unicode edition from which the tables are derived.
+	Version = "9.0.0"
+
+	// MaxTransformChunkSize indicates the maximum number of bytes that Transform
+	// may need to write atomically for any Form. Making a destination buffer at
+	// least this size ensures that Transform can always make progress and that
+	// the user does not need to grow the buffer on an ErrShortDst.
+	MaxTransformChunkSize = 35 + maxNonStarters*4
+)
+
+var ccc = [55]uint8{
+	0, 1, 7, 8, 9, 10, 11, 12,
+	13, 14, 15, 16, 17, 18, 19, 20,
+	21, 22, 23, 24, 25, 26, 27, 28,
+	29, 30, 31, 32, 33, 34, 35, 36,
+	84, 91, 103, 107, 118, 122, 129, 130,
+	132, 202, 214, 216, 218, 220, 222, 224,
+	226, 228, 230, 232, 233, 234, 240,
+}
+
+const (
+	firstMulti            = 0x186D
+	firstCCC              = 0x2C9E
+	endMulti              = 0x2F60
+	firstLeadingCCC       = 0x49AE
+	firstCCCZeroExcept    = 0x4A78
+	firstStarterWithNLead = 0x4A9F
+	lastDecomp            = 0x4AA1
+	maxDecomp             = 0x8000
+)
+
+// decomps: 19105 bytes
+var decomps = [...]byte{
+	// Bytes 0 - 3f
+	0x00, 0x41, 0x20, 0x41, 0x21, 0x41, 0x22, 0x41,
+	0x23, 0x41, 0x24, 0x41, 0x25, 0x41, 0x26, 0x41,
+	0x27, 0x41, 0x28, 0x41, 0x29, 0x41, 0x2A, 0x41,
+	0x2B, 0x41, 0x2C, 0x41, 0x2D, 0x41, 0x2E, 0x41,
+	0x2F, 0x41, 0x30, 0x41, 0x31, 0x41, 0x32, 0x41,
+	0x33, 0x41, 0x34, 0x41, 0x35, 0x41, 0x36, 0x41,
+	0x37, 0x41, 0x38, 0x41, 0x39, 0x41, 0x3A, 0x41,
+	0x3B, 0x41, 0x3C, 0x41, 0x3D, 0x41, 0x3E, 0x41,
+	// Bytes 40 - 7f
+	0x3F, 0x41, 0x40, 0x41, 0x41, 0x41, 0x42, 0x41,
+	0x43, 0x41, 0x44, 0x41, 0x45, 0x41, 0x46, 0x41,
+	0x47, 0x41, 0x48, 0x41, 0x49, 0x41, 0x4A, 0x41,
+	0x4B, 0x41, 0x4C, 0x41, 0x4D, 0x41, 0x4E, 0x41,
+	0x4F, 0x41, 0x50, 0x41, 0x51, 0x41, 0x52, 0x41,
+	0x53, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41,
+	0x57, 0x41, 0x58, 0x41, 0x59, 0x41, 0x5A, 0x41,
+	0x5B, 0x41, 0x5C, 0x41, 0x5D, 0x41, 0x5E, 0x41,
+	// Bytes 80 - bf
+	0x5F, 0x41, 0x60, 0x41, 0x61, 0x41, 0x62, 0x41,
+	0x63, 0x41, 0x64, 0x41, 0x65, 0x41, 0x66, 0x41,
+	0x67, 0x41, 0x68, 0x41, 0x69, 0x41, 0x6A, 0x41,
+	0x6B, 0x41, 0x6C, 0x41, 0x6D, 0x41, 0x6E, 0x41,
+	0x6F, 0x41, 0x70, 0x41, 0x71, 0x41, 0x72, 0x41,
+	0x73, 0x41, 0x74, 0x41, 0x75, 0x41, 0x76, 0x41,
+	0x77, 0x41, 0x78, 0x41, 0x79, 0x41, 0x7A, 0x41,
+	0x7B, 0x41, 0x7C, 0x41, 0x7D, 0x41, 0x7E, 0x42,
+	// Bytes c0 - ff
+	0xC2, 0xA2, 0x42, 0xC2, 0xA3, 0x42, 0xC2, 0xA5,
+	0x42, 0xC2, 0xA6, 0x42, 0xC2, 0xAC, 0x42, 0xC2,
+	0xB7, 0x42, 0xC3, 0x86, 0x42, 0xC3, 0xB0, 0x42,
+	0xC4, 0xA6, 0x42, 0xC4, 0xA7, 0x42, 0xC4, 0xB1,
+	0x42, 0xC5, 0x8B, 0x42, 0xC5, 0x93, 0x42, 0xC6,
+	0x8E, 0x42, 0xC6, 0x90, 0x42, 0xC6, 0xAB, 0x42,
+	0xC8, 0xA2, 0x42, 0xC8, 0xB7, 0x42, 0xC9, 0x90,
+	0x42, 0xC9, 0x91, 0x42, 0xC9, 0x92, 0x42, 0xC9,
+	// Bytes 100 - 13f
+	0x94, 0x42, 0xC9, 0x95, 0x42, 0xC9, 0x99, 0x42,
+	0xC9, 0x9B, 0x42, 0xC9, 0x9C, 0x42, 0xC9, 0x9F,
+	0x42, 0xC9, 0xA1, 0x42, 0xC9, 0xA3, 0x42, 0xC9,
+	0xA5, 0x42, 0xC9, 0xA6, 0x42, 0xC9, 0xA8, 0x42,
+	0xC9, 0xA9, 0x42, 0xC9, 0xAA, 0x42, 0xC9, 0xAB,
+	0x42, 0xC9, 0xAD, 0x42, 0xC9, 0xAF, 0x42, 0xC9,
+	0xB0, 0x42, 0xC9, 0xB1, 0x42, 0xC9, 0xB2, 0x42,
+	0xC9, 0xB3, 0x42, 0xC9, 0xB4, 0x42, 0xC9, 0xB5,
+	// Bytes 140 - 17f
+	0x42, 0xC9, 0xB8, 0x42, 0xC9, 0xB9, 0x42, 0xC9,
+	0xBB, 0x42, 0xCA, 0x81, 0x42, 0xCA, 0x82, 0x42,
+	0xCA, 0x83, 0x42, 0xCA, 0x89, 0x42, 0xCA, 0x8A,
+	0x42, 0xCA, 0x8B, 0x42, 0xCA, 0x8C, 0x42, 0xCA,
+	0x90, 0x42, 0xCA, 0x91, 0x42, 0xCA, 0x92, 0x42,
+	0xCA, 0x95, 0x42, 0xCA, 0x9D, 0x42, 0xCA, 0x9F,
+	0x42, 0xCA, 0xB9, 0x42, 0xCE, 0x91, 0x42, 0xCE,
+	0x92, 0x42, 0xCE, 0x93, 0x42, 0xCE, 0x94, 0x42,
+	// Bytes 180 - 1bf
+	0xCE, 0x95, 0x42, 0xCE, 0x96, 0x42, 0xCE, 0x97,
+	0x42, 0xCE, 0x98, 0x42, 0xCE, 0x99, 0x42, 0xCE,
+	0x9A, 0x42, 0xCE, 0x9B, 0x42, 0xCE, 0x9C, 0x42,
+	0xCE, 0x9D, 0x42, 0xCE, 0x9E, 0x42, 0xCE, 0x9F,
+	0x42, 0xCE, 0xA0, 0x42, 0xCE, 0xA1, 0x42, 0xCE,
+	0xA3, 0x42, 0xCE, 0xA4, 0x42, 0xCE, 0xA5, 0x42,
+	0xCE, 0xA6, 0x42, 0xCE, 0xA7, 0x42, 0xCE, 0xA8,
+	0x42, 0xCE, 0xA9, 0x42, 0xCE, 0xB1, 0x42, 0xCE,
+	// Bytes 1c0 - 1ff
+	0xB2, 0x42, 0xCE, 0xB3, 0x42, 0xCE, 0xB4, 0x42,
+	0xCE, 0xB5, 0x42, 0xCE, 0xB6, 0x42, 0xCE, 0xB7,
+	0x42, 0xCE, 0xB8, 0x42, 0xCE, 0xB9, 0x42, 0xCE,
+	0xBA, 0x42, 0xCE, 0xBB, 0x42, 0xCE, 0xBC, 0x42,
+	0xCE, 0xBD, 0x42, 0xCE, 0xBE, 0x42, 0xCE, 0xBF,
+	0x42, 0xCF, 0x80, 0x42, 0xCF, 0x81, 0x42, 0xCF,
+	0x82, 0x42, 0xCF, 0x83, 0x42, 0xCF, 0x84, 0x42,
+	0xCF, 0x85, 0x42, 0xCF, 0x86, 0x42, 0xCF, 0x87,
+	// Bytes 200 - 23f
+	0x42, 0xCF, 0x88, 0x42, 0xCF, 0x89, 0x42, 0xCF,
+	0x9C, 0x42, 0xCF, 0x9D, 0x42, 0xD0, 0xBD, 0x42,
+	0xD1, 0x8A, 0x42, 0xD1, 0x8C, 0x42, 0xD7, 0x90,
+	0x42, 0xD7, 0x91, 0x42, 0xD7, 0x92, 0x42, 0xD7,
+	0x93, 0x42, 0xD7, 0x94, 0x42, 0xD7, 0x9B, 0x42,
+	0xD7, 0x9C, 0x42, 0xD7, 0x9D, 0x42, 0xD7, 0xA2,
+	0x42, 0xD7, 0xA8, 0x42, 0xD7, 0xAA, 0x42, 0xD8,
+	0xA1, 0x42, 0xD8, 0xA7, 0x42, 0xD8, 0xA8, 0x42,
+	// Bytes 240 - 27f
+	0xD8, 0xA9, 0x42, 0xD8, 0xAA, 0x42, 0xD8, 0xAB,
+	0x42, 0xD8, 0xAC, 0x42, 0xD8, 0xAD, 0x42, 0xD8,
+	0xAE, 0x42, 0xD8, 0xAF, 0x42, 0xD8, 0xB0, 0x42,
+	0xD8, 0xB1, 0x42, 0xD8, 0xB2, 0x42, 0xD8, 0xB3,
+	0x42, 0xD8, 0xB4, 0x42, 0xD8, 0xB5, 0x42, 0xD8,
+	0xB6, 0x42, 0xD8, 0xB7, 0x42, 0xD8, 0xB8, 0x42,
+	0xD8, 0xB9, 0x42, 0xD8, 0xBA, 0x42, 0xD9, 0x81,
+	0x42, 0xD9, 0x82, 0x42, 0xD9, 0x83, 0x42, 0xD9,
+	// Bytes 280 - 2bf
+	0x84, 0x42, 0xD9, 0x85, 0x42, 0xD9, 0x86, 0x42,
+	0xD9, 0x87, 0x42, 0xD9, 0x88, 0x42, 0xD9, 0x89,
+	0x42, 0xD9, 0x8A, 0x42, 0xD9, 0xAE, 0x42, 0xD9,
+	0xAF, 0x42, 0xD9, 0xB1, 0x42, 0xD9, 0xB9, 0x42,
+	0xD9, 0xBA, 0x42, 0xD9, 0xBB, 0x42, 0xD9, 0xBE,
+	0x42, 0xD9, 0xBF, 0x42, 0xDA, 0x80, 0x42, 0xDA,
+	0x83, 0x42, 0xDA, 0x84, 0x42, 0xDA, 0x86, 0x42,
+	0xDA, 0x87, 0x42, 0xDA, 0x88, 0x42, 0xDA, 0x8C,
+	// Bytes 2c0 - 2ff
+	0x42, 0xDA, 0x8D, 0x42, 0xDA, 0x8E, 0x42, 0xDA,
+	0x91, 0x42, 0xDA, 0x98, 0x42, 0xDA, 0xA1, 0x42,
+	0xDA, 0xA4, 0x42, 0xDA, 0xA6, 0x42, 0xDA, 0xA9,
+	0x42, 0xDA, 0xAD, 0x42, 0xDA, 0xAF, 0x42, 0xDA,
+	0xB1, 0x42, 0xDA, 0xB3, 0x42, 0xDA, 0xBA, 0x42,
+	0xDA, 0xBB, 0x42, 0xDA, 0xBE, 0x42, 0xDB, 0x81,
+	0x42, 0xDB, 0x85, 0x42, 0xDB, 0x86, 0x42, 0xDB,
+	0x87, 0x42, 0xDB, 0x88, 0x42, 0xDB, 0x89, 0x42,
+	// Bytes 300 - 33f
+	0xDB, 0x8B, 0x42, 0xDB, 0x8C, 0x42, 0xDB, 0x90,
+	0x42, 0xDB, 0x92, 0x43, 0xE0, 0xBC, 0x8B, 0x43,
+	0xE1, 0x83, 0x9C, 0x43, 0xE1, 0x84, 0x80, 0x43,
+	0xE1, 0x84, 0x81, 0x43, 0xE1, 0x84, 0x82, 0x43,
+	0xE1, 0x84, 0x83, 0x43, 0xE1, 0x84, 0x84, 0x43,
+	0xE1, 0x84, 0x85, 0x43, 0xE1, 0x84, 0x86, 0x43,
+	0xE1, 0x84, 0x87, 0x43, 0xE1, 0x84, 0x88, 0x43,
+	0xE1, 0x84, 0x89, 0x43, 0xE1, 0x84, 0x8A, 0x43,
+	// Bytes 340 - 37f
+	0xE1, 0x84, 0x8B, 0x43, 0xE1, 0x84, 0x8C, 0x43,
+	0xE1, 0x84, 0x8D, 0x43, 0xE1, 0x84, 0x8E, 0x43,
+	0xE1, 0x84, 0x8F, 0x43, 0xE1, 0x84, 0x90, 0x43,
+	0xE1, 0x84, 0x91, 0x43, 0xE1, 0x84, 0x92, 0x43,
+	0xE1, 0x84, 0x94, 0x43, 0xE1, 0x84, 0x95, 0x43,
+	0xE1, 0x84, 0x9A, 0x43, 0xE1, 0x84, 0x9C, 0x43,
+	0xE1, 0x84, 0x9D, 0x43, 0xE1, 0x84, 0x9E, 0x43,
+	0xE1, 0x84, 0xA0, 0x43, 0xE1, 0x84, 0xA1, 0x43,
+	// Bytes 380 - 3bf
+	0xE1, 0x84, 0xA2, 0x43, 0xE1, 0x84, 0xA3, 0x43,
+	0xE1, 0x84, 0xA7, 0x43, 0xE1, 0x84, 0xA9, 0x43,
+	0xE1, 0x84, 0xAB, 0x43, 0xE1, 0x84, 0xAC, 0x43,
+	0xE1, 0x84, 0xAD, 0x43, 0xE1, 0x84, 0xAE, 0x43,
+	0xE1, 0x84, 0xAF, 0x43, 0xE1, 0x84, 0xB2, 0x43,
+	0xE1, 0x84, 0xB6, 0x43, 0xE1, 0x85, 0x80, 0x43,
+	0xE1, 0x85, 0x87, 0x43, 0xE1, 0x85, 0x8C, 0x43,
+	0xE1, 0x85, 0x97, 0x43, 0xE1, 0x85, 0x98, 0x43,
+	// Bytes 3c0 - 3ff
+	0xE1, 0x85, 0x99, 0x43, 0xE1, 0x85, 0xA0, 0x43,
+	0xE1, 0x86, 0x84, 0x43, 0xE1, 0x86, 0x85, 0x43,
+	0xE1, 0x86, 0x88, 0x43, 0xE1, 0x86, 0x91, 0x43,
+	0xE1, 0x86, 0x92, 0x43, 0xE1, 0x86, 0x94, 0x43,
+	0xE1, 0x86, 0x9E, 0x43, 0xE1, 0x86, 0xA1, 0x43,
+	0xE1, 0x87, 0x87, 0x43, 0xE1, 0x87, 0x88, 0x43,
+	0xE1, 0x87, 0x8C, 0x43, 0xE1, 0x87, 0x8E, 0x43,
+	0xE1, 0x87, 0x93, 0x43, 0xE1, 0x87, 0x97, 0x43,
+	// Bytes 400 - 43f
+	0xE1, 0x87, 0x99, 0x43, 0xE1, 0x87, 0x9D, 0x43,
+	0xE1, 0x87, 0x9F, 0x43, 0xE1, 0x87, 0xB1, 0x43,
+	0xE1, 0x87, 0xB2, 0x43, 0xE1, 0xB4, 0x82, 0x43,
+	0xE1, 0xB4, 0x96, 0x43, 0xE1, 0xB4, 0x97, 0x43,
+	0xE1, 0xB4, 0x9C, 0x43, 0xE1, 0xB4, 0x9D, 0x43,
+	0xE1, 0xB4, 0xA5, 0x43, 0xE1, 0xB5, 0xBB, 0x43,
+	0xE1, 0xB6, 0x85, 0x43, 0xE2, 0x80, 0x82, 0x43,
+	0xE2, 0x80, 0x83, 0x43, 0xE2, 0x80, 0x90, 0x43,
+	// Bytes 440 - 47f
+	0xE2, 0x80, 0x93, 0x43, 0xE2, 0x80, 0x94, 0x43,
+	0xE2, 0x82, 0xA9, 0x43, 0xE2, 0x86, 0x90, 0x43,
+	0xE2, 0x86, 0x91, 0x43, 0xE2, 0x86, 0x92, 0x43,
+	0xE2, 0x86, 0x93, 0x43, 0xE2, 0x88, 0x82, 0x43,
+	0xE2, 0x88, 0x87, 0x43, 0xE2, 0x88, 0x91, 0x43,
+	0xE2, 0x88, 0x92, 0x43, 0xE2, 0x94, 0x82, 0x43,
+	0xE2, 0x96, 0xA0, 0x43, 0xE2, 0x97, 0x8B, 0x43,
+	0xE2, 0xA6, 0x85, 0x43, 0xE2, 0xA6, 0x86, 0x43,
+	// Bytes 480 - 4bf
+	0xE2, 0xB5, 0xA1, 0x43, 0xE3, 0x80, 0x81, 0x43,
+	0xE3, 0x80, 0x82, 0x43, 0xE3, 0x80, 0x88, 0x43,
+	0xE3, 0x80, 0x89, 0x43, 0xE3, 0x80, 0x8A, 0x43,
+	0xE3, 0x80, 0x8B, 0x43, 0xE3, 0x80, 0x8C, 0x43,
+	0xE3, 0x80, 0x8D, 0x43, 0xE3, 0x80, 0x8E, 0x43,
+	0xE3, 0x80, 0x8F, 0x43, 0xE3, 0x80, 0x90, 0x43,
+	0xE3, 0x80, 0x91, 0x43, 0xE3, 0x80, 0x92, 0x43,
+	0xE3, 0x80, 0x94, 0x43, 0xE3, 0x80, 0x95, 0x43,
+	// Bytes 4c0 - 4ff
+	0xE3, 0x80, 0x96, 0x43, 0xE3, 0x80, 0x97, 0x43,
+	0xE3, 0x82, 0xA1, 0x43, 0xE3, 0x82, 0xA2, 0x43,
+	0xE3, 0x82, 0xA3, 0x43, 0xE3, 0x82, 0xA4, 0x43,
+	0xE3, 0x82, 0xA5, 0x43, 0xE3, 0x82, 0xA6, 0x43,
+	0xE3, 0x82, 0xA7, 0x43, 0xE3, 0x82, 0xA8, 0x43,
+	0xE3, 0x82, 0xA9, 0x43, 0xE3, 0x82, 0xAA, 0x43,
+	0xE3, 0x82, 0xAB, 0x43, 0xE3, 0x82, 0xAD, 0x43,
+	0xE3, 0x82, 0xAF, 0x43, 0xE3, 0x82, 0xB1, 0x43,
+	// Bytes 500 - 53f
+	0xE3, 0x82, 0xB3, 0x43, 0xE3, 0x82, 0xB5, 0x43,
+	0xE3, 0x82, 0xB7, 0x43, 0xE3, 0x82, 0xB9, 0x43,
+	0xE3, 0x82, 0xBB, 0x43, 0xE3, 0x82, 0xBD, 0x43,
+	0xE3, 0x82, 0xBF, 0x43, 0xE3, 0x83, 0x81, 0x43,
+	0xE3, 0x83, 0x83, 0x43, 0xE3, 0x83, 0x84, 0x43,
+	0xE3, 0x83, 0x86, 0x43, 0xE3, 0x83, 0x88, 0x43,
+	0xE3, 0x83, 0x8A, 0x43, 0xE3, 0x83, 0x8B, 0x43,
+	0xE3, 0x83, 0x8C, 0x43, 0xE3, 0x83, 0x8D, 0x43,
+	// Bytes 540 - 57f
+	0xE3, 0x83, 0x8E, 0x43, 0xE3, 0x83, 0x8F, 0x43,
+	0xE3, 0x83, 0x92, 0x43, 0xE3, 0x83, 0x95, 0x43,
+	0xE3, 0x83, 0x98, 0x43, 0xE3, 0x83, 0x9B, 0x43,
+	0xE3, 0x83, 0x9E, 0x43, 0xE3, 0x83, 0x9F, 0x43,
+	0xE3, 0x83, 0xA0, 0x43, 0xE3, 0x83, 0xA1, 0x43,
+	0xE3, 0x83, 0xA2, 0x43, 0xE3, 0x83, 0xA3, 0x43,
+	0xE3, 0x83, 0xA4, 0x43, 0xE3, 0x83, 0xA5, 0x43,
+	0xE3, 0x83, 0xA6, 0x43, 0xE3, 0x83, 0xA7, 0x43,
+	// Bytes 580 - 5bf
+	0xE3, 0x83, 0xA8, 0x43, 0xE3, 0x83, 0xA9, 0x43,
+	0xE3, 0x83, 0xAA, 0x43, 0xE3, 0x83, 0xAB, 0x43,
+	0xE3, 0x83, 0xAC, 0x43, 0xE3, 0x83, 0xAD, 0x43,
+	0xE3, 0x83, 0xAF, 0x43, 0xE3, 0x83, 0xB0, 0x43,
+	0xE3, 0x83, 0xB1, 0x43, 0xE3, 0x83, 0xB2, 0x43,
+	0xE3, 0x83, 0xB3, 0x43, 0xE3, 0x83, 0xBB, 0x43,
+	0xE3, 0x83, 0xBC, 0x43, 0xE3, 0x92, 0x9E, 0x43,
+	0xE3, 0x92, 0xB9, 0x43, 0xE3, 0x92, 0xBB, 0x43,
+	// Bytes 5c0 - 5ff
+	0xE3, 0x93, 0x9F, 0x43, 0xE3, 0x94, 0x95, 0x43,
+	0xE3, 0x9B, 0xAE, 0x43, 0xE3, 0x9B, 0xBC, 0x43,
+	0xE3, 0x9E, 0x81, 0x43, 0xE3, 0xA0, 0xAF, 0x43,
+	0xE3, 0xA1, 0xA2, 0x43, 0xE3, 0xA1, 0xBC, 0x43,
+	0xE3, 0xA3, 0x87, 0x43, 0xE3, 0xA3, 0xA3, 0x43,
+	0xE3, 0xA4, 0x9C, 0x43, 0xE3, 0xA4, 0xBA, 0x43,
+	0xE3, 0xA8, 0xAE, 0x43, 0xE3, 0xA9, 0xAC, 0x43,
+	0xE3, 0xAB, 0xA4, 0x43, 0xE3, 0xAC, 0x88, 0x43,
+	// Bytes 600 - 63f
+	0xE3, 0xAC, 0x99, 0x43, 0xE3, 0xAD, 0x89, 0x43,
+	0xE3, 0xAE, 0x9D, 0x43, 0xE3, 0xB0, 0x98, 0x43,
+	0xE3, 0xB1, 0x8E, 0x43, 0xE3, 0xB4, 0xB3, 0x43,
+	0xE3, 0xB6, 0x96, 0x43, 0xE3, 0xBA, 0xAC, 0x43,
+	0xE3, 0xBA, 0xB8, 0x43, 0xE3, 0xBC, 0x9B, 0x43,
+	0xE3, 0xBF, 0xBC, 0x43, 0xE4, 0x80, 0x88, 0x43,
+	0xE4, 0x80, 0x98, 0x43, 0xE4, 0x80, 0xB9, 0x43,
+	0xE4, 0x81, 0x86, 0x43, 0xE4, 0x82, 0x96, 0x43,
+	// Bytes 640 - 67f
+	0xE4, 0x83, 0xA3, 0x43, 0xE4, 0x84, 0xAF, 0x43,
+	0xE4, 0x88, 0x82, 0x43, 0xE4, 0x88, 0xA7, 0x43,
+	0xE4, 0x8A, 0xA0, 0x43, 0xE4, 0x8C, 0x81, 0x43,
+	0xE4, 0x8C, 0xB4, 0x43, 0xE4, 0x8D, 0x99, 0x43,
+	0xE4, 0x8F, 0x95, 0x43, 0xE4, 0x8F, 0x99, 0x43,
+	0xE4, 0x90, 0x8B, 0x43, 0xE4, 0x91, 0xAB, 0x43,
+	0xE4, 0x94, 0xAB, 0x43, 0xE4, 0x95, 0x9D, 0x43,
+	0xE4, 0x95, 0xA1, 0x43, 0xE4, 0x95, 0xAB, 0x43,
+	// Bytes 680 - 6bf
+	0xE4, 0x97, 0x97, 0x43, 0xE4, 0x97, 0xB9, 0x43,
+	0xE4, 0x98, 0xB5, 0x43, 0xE4, 0x9A, 0xBE, 0x43,
+	0xE4, 0x9B, 0x87, 0x43, 0xE4, 0xA6, 0x95, 0x43,
+	0xE4, 0xA7, 0xA6, 0x43, 0xE4, 0xA9, 0xAE, 0x43,
+	0xE4, 0xA9, 0xB6, 0x43, 0xE4, 0xAA, 0xB2, 0x43,
+	0xE4, 0xAC, 0xB3, 0x43, 0xE4, 0xAF, 0x8E, 0x43,
+	0xE4, 0xB3, 0x8E, 0x43, 0xE4, 0xB3, 0xAD, 0x43,
+	0xE4, 0xB3, 0xB8, 0x43, 0xE4, 0xB5, 0x96, 0x43,
+	// Bytes 6c0 - 6ff
+	0xE4, 0xB8, 0x80, 0x43, 0xE4, 0xB8, 0x81, 0x43,
+	0xE4, 0xB8, 0x83, 0x43, 0xE4, 0xB8, 0x89, 0x43,
+	0xE4, 0xB8, 0x8A, 0x43, 0xE4, 0xB8, 0x8B, 0x43,
+	0xE4, 0xB8, 0x8D, 0x43, 0xE4, 0xB8, 0x99, 0x43,
+	0xE4, 0xB8, 0xA6, 0x43, 0xE4, 0xB8, 0xA8, 0x43,
+	0xE4, 0xB8, 0xAD, 0x43, 0xE4, 0xB8, 0xB2, 0x43,
+	0xE4, 0xB8, 0xB6, 0x43, 0xE4, 0xB8, 0xB8, 0x43,
+	0xE4, 0xB8, 0xB9, 0x43, 0xE4, 0xB8, 0xBD, 0x43,
+	// Bytes 700 - 73f
+	0xE4, 0xB8, 0xBF, 0x43, 0xE4, 0xB9, 0x81, 0x43,
+	0xE4, 0xB9, 0x99, 0x43, 0xE4, 0xB9, 0x9D, 0x43,
+	0xE4, 0xBA, 0x82, 0x43, 0xE4, 0xBA, 0x85, 0x43,
+	0xE4, 0xBA, 0x86, 0x43, 0xE4, 0xBA, 0x8C, 0x43,
+	0xE4, 0xBA, 0x94, 0x43, 0xE4, 0xBA, 0xA0, 0x43,
+	0xE4, 0xBA, 0xA4, 0x43, 0xE4, 0xBA, 0xAE, 0x43,
+	0xE4, 0xBA, 0xBA, 0x43, 0xE4, 0xBB, 0x80, 0x43,
+	0xE4, 0xBB, 0x8C, 0x43, 0xE4, 0xBB, 0xA4, 0x43,
+	// Bytes 740 - 77f
+	0xE4, 0xBC, 0x81, 0x43, 0xE4, 0xBC, 0x91, 0x43,
+	0xE4, 0xBD, 0xA0, 0x43, 0xE4, 0xBE, 0x80, 0x43,
+	0xE4, 0xBE, 0x86, 0x43, 0xE4, 0xBE, 0x8B, 0x43,
+	0xE4, 0xBE, 0xAE, 0x43, 0xE4, 0xBE, 0xBB, 0x43,
+	0xE4, 0xBE, 0xBF, 0x43, 0xE5, 0x80, 0x82, 0x43,
+	0xE5, 0x80, 0xAB, 0x43, 0xE5, 0x81, 0xBA, 0x43,
+	0xE5, 0x82, 0x99, 0x43, 0xE5, 0x83, 0x8F, 0x43,
+	0xE5, 0x83, 0x9A, 0x43, 0xE5, 0x83, 0xA7, 0x43,
+	// Bytes 780 - 7bf
+	0xE5, 0x84, 0xAA, 0x43, 0xE5, 0x84, 0xBF, 0x43,
+	0xE5, 0x85, 0x80, 0x43, 0xE5, 0x85, 0x85, 0x43,
+	0xE5, 0x85, 0x8D, 0x43, 0xE5, 0x85, 0x94, 0x43,
+	0xE5, 0x85, 0xA4, 0x43, 0xE5, 0x85, 0xA5, 0x43,
+	0xE5, 0x85, 0xA7, 0x43, 0xE5, 0x85, 0xA8, 0x43,
+	0xE5, 0x85, 0xA9, 0x43, 0xE5, 0x85, 0xAB, 0x43,
+	0xE5, 0x85, 0xAD, 0x43, 0xE5, 0x85, 0xB7, 0x43,
+	0xE5, 0x86, 0x80, 0x43, 0xE5, 0x86, 0x82, 0x43,
+	// Bytes 7c0 - 7ff
+	0xE5, 0x86, 0x8D, 0x43, 0xE5, 0x86, 0x92, 0x43,
+	0xE5, 0x86, 0x95, 0x43, 0xE5, 0x86, 0x96, 0x43,
+	0xE5, 0x86, 0x97, 0x43, 0xE5, 0x86, 0x99, 0x43,
+	0xE5, 0x86, 0xA4, 0x43, 0xE5, 0x86, 0xAB, 0x43,
+	0xE5, 0x86, 0xAC, 0x43, 0xE5, 0x86, 0xB5, 0x43,
+	0xE5, 0x86, 0xB7, 0x43, 0xE5, 0x87, 0x89, 0x43,
+	0xE5, 0x87, 0x8C, 0x43, 0xE5, 0x87, 0x9C, 0x43,
+	0xE5, 0x87, 0x9E, 0x43, 0xE5, 0x87, 0xA0, 0x43,
+	// Bytes 800 - 83f
+	0xE5, 0x87, 0xB5, 0x43, 0xE5, 0x88, 0x80, 0x43,
+	0xE5, 0x88, 0x83, 0x43, 0xE5, 0x88, 0x87, 0x43,
+	0xE5, 0x88, 0x97, 0x43, 0xE5, 0x88, 0x9D, 0x43,
+	0xE5, 0x88, 0xA9, 0x43, 0xE5, 0x88, 0xBA, 0x43,
+	0xE5, 0x88, 0xBB, 0x43, 0xE5, 0x89, 0x86, 0x43,
+	0xE5, 0x89, 0x8D, 0x43, 0xE5, 0x89, 0xB2, 0x43,
+	0xE5, 0x89, 0xB7, 0x43, 0xE5, 0x8A, 0x89, 0x43,
+	0xE5, 0x8A, 0x9B, 0x43, 0xE5, 0x8A, 0xA3, 0x43,
+	// Bytes 840 - 87f
+	0xE5, 0x8A, 0xB3, 0x43, 0xE5, 0x8A, 0xB4, 0x43,
+	0xE5, 0x8B, 0x87, 0x43, 0xE5, 0x8B, 0x89, 0x43,
+	0xE5, 0x8B, 0x92, 0x43, 0xE5, 0x8B, 0x9E, 0x43,
+	0xE5, 0x8B, 0xA4, 0x43, 0xE5, 0x8B, 0xB5, 0x43,
+	0xE5, 0x8B, 0xB9, 0x43, 0xE5, 0x8B, 0xBA, 0x43,
+	0xE5, 0x8C, 0x85, 0x43, 0xE5, 0x8C, 0x86, 0x43,
+	0xE5, 0x8C, 0x95, 0x43, 0xE5, 0x8C, 0x97, 0x43,
+	0xE5, 0x8C, 0x9A, 0x43, 0xE5, 0x8C, 0xB8, 0x43,
+	// Bytes 880 - 8bf
+	0xE5, 0x8C, 0xBB, 0x43, 0xE5, 0x8C, 0xBF, 0x43,
+	0xE5, 0x8D, 0x81, 0x43, 0xE5, 0x8D, 0x84, 0x43,
+	0xE5, 0x8D, 0x85, 0x43, 0xE5, 0x8D, 0x89, 0x43,
+	0xE5, 0x8D, 0x91, 0x43, 0xE5, 0x8D, 0x94, 0x43,
+	0xE5, 0x8D, 0x9A, 0x43, 0xE5, 0x8D, 0x9C, 0x43,
+	0xE5, 0x8D, 0xA9, 0x43, 0xE5, 0x8D, 0xB0, 0x43,
+	0xE5, 0x8D, 0xB3, 0x43, 0xE5, 0x8D, 0xB5, 0x43,
+	0xE5, 0x8D, 0xBD, 0x43, 0xE5, 0x8D, 0xBF, 0x43,
+	// Bytes 8c0 - 8ff
+	0xE5, 0x8E, 0x82, 0x43, 0xE5, 0x8E, 0xB6, 0x43,
+	0xE5, 0x8F, 0x83, 0x43, 0xE5, 0x8F, 0x88, 0x43,
+	0xE5, 0x8F, 0x8A, 0x43, 0xE5, 0x8F, 0x8C, 0x43,
+	0xE5, 0x8F, 0x9F, 0x43, 0xE5, 0x8F, 0xA3, 0x43,
+	0xE5, 0x8F, 0xA5, 0x43, 0xE5, 0x8F, 0xAB, 0x43,
+	0xE5, 0x8F, 0xAF, 0x43, 0xE5, 0x8F, 0xB1, 0x43,
+	0xE5, 0x8F, 0xB3, 0x43, 0xE5, 0x90, 0x86, 0x43,
+	0xE5, 0x90, 0x88, 0x43, 0xE5, 0x90, 0x8D, 0x43,
+	// Bytes 900 - 93f
+	0xE5, 0x90, 0x8F, 0x43, 0xE5, 0x90, 0x9D, 0x43,
+	0xE5, 0x90, 0xB8, 0x43, 0xE5, 0x90, 0xB9, 0x43,
+	0xE5, 0x91, 0x82, 0x43, 0xE5, 0x91, 0x88, 0x43,
+	0xE5, 0x91, 0xA8, 0x43, 0xE5, 0x92, 0x9E, 0x43,
+	0xE5, 0x92, 0xA2, 0x43, 0xE5, 0x92, 0xBD, 0x43,
+	0xE5, 0x93, 0xB6, 0x43, 0xE5, 0x94, 0x90, 0x43,
+	0xE5, 0x95, 0x8F, 0x43, 0xE5, 0x95, 0x93, 0x43,
+	0xE5, 0x95, 0x95, 0x43, 0xE5, 0x95, 0xA3, 0x43,
+	// Bytes 940 - 97f
+	0xE5, 0x96, 0x84, 0x43, 0xE5, 0x96, 0x87, 0x43,
+	0xE5, 0x96, 0x99, 0x43, 0xE5, 0x96, 0x9D, 0x43,
+	0xE5, 0x96, 0xAB, 0x43, 0xE5, 0x96, 0xB3, 0x43,
+	0xE5, 0x96, 0xB6, 0x43, 0xE5, 0x97, 0x80, 0x43,
+	0xE5, 0x97, 0x82, 0x43, 0xE5, 0x97, 0xA2, 0x43,
+	0xE5, 0x98, 0x86, 0x43, 0xE5, 0x99, 0x91, 0x43,
+	0xE5, 0x99, 0xA8, 0x43, 0xE5, 0x99, 0xB4, 0x43,
+	0xE5, 0x9B, 0x97, 0x43, 0xE5, 0x9B, 0x9B, 0x43,
+	// Bytes 980 - 9bf
+	0xE5, 0x9B, 0xB9, 0x43, 0xE5, 0x9C, 0x96, 0x43,
+	0xE5, 0x9C, 0x97, 0x43, 0xE5, 0x9C, 0x9F, 0x43,
+	0xE5, 0x9C, 0xB0, 0x43, 0xE5, 0x9E, 0x8B, 0x43,
+	0xE5, 0x9F, 0x8E, 0x43, 0xE5, 0x9F, 0xB4, 0x43,
+	0xE5, 0xA0, 0x8D, 0x43, 0xE5, 0xA0, 0xB1, 0x43,
+	0xE5, 0xA0, 0xB2, 0x43, 0xE5, 0xA1, 0x80, 0x43,
+	0xE5, 0xA1, 0x9A, 0x43, 0xE5, 0xA1, 0x9E, 0x43,
+	0xE5, 0xA2, 0xA8, 0x43, 0xE5, 0xA2, 0xAC, 0x43,
+	// Bytes 9c0 - 9ff
+	0xE5, 0xA2, 0xB3, 0x43, 0xE5, 0xA3, 0x98, 0x43,
+	0xE5, 0xA3, 0x9F, 0x43, 0xE5, 0xA3, 0xAB, 0x43,
+	0xE5, 0xA3, 0xAE, 0x43, 0xE5, 0xA3, 0xB0, 0x43,
+	0xE5, 0xA3, 0xB2, 0x43, 0xE5, 0xA3, 0xB7, 0x43,
+	0xE5, 0xA4, 0x82, 0x43, 0xE5, 0xA4, 0x86, 0x43,
+	0xE5, 0xA4, 0x8A, 0x43, 0xE5, 0xA4, 0x95, 0x43,
+	0xE5, 0xA4, 0x9A, 0x43, 0xE5, 0xA4, 0x9C, 0x43,
+	0xE5, 0xA4, 0xA2, 0x43, 0xE5, 0xA4, 0xA7, 0x43,
+	// Bytes a00 - a3f
+	0xE5, 0xA4, 0xA9, 0x43, 0xE5, 0xA5, 0x84, 0x43,
+	0xE5, 0xA5, 0x88, 0x43, 0xE5, 0xA5, 0x91, 0x43,
+	0xE5, 0xA5, 0x94, 0x43, 0xE5, 0xA5, 0xA2, 0x43,
+	0xE5, 0xA5, 0xB3, 0x43, 0xE5, 0xA7, 0x98, 0x43,
+	0xE5, 0xA7, 0xAC, 0x43, 0xE5, 0xA8, 0x9B, 0x43,
+	0xE5, 0xA8, 0xA7, 0x43, 0xE5, 0xA9, 0xA2, 0x43,
+	0xE5, 0xA9, 0xA6, 0x43, 0xE5, 0xAA, 0xB5, 0x43,
+	0xE5, 0xAC, 0x88, 0x43, 0xE5, 0xAC, 0xA8, 0x43,
+	// Bytes a40 - a7f
+	0xE5, 0xAC, 0xBE, 0x43, 0xE5, 0xAD, 0x90, 0x43,
+	0xE5, 0xAD, 0x97, 0x43, 0xE5, 0xAD, 0xA6, 0x43,
+	0xE5, 0xAE, 0x80, 0x43, 0xE5, 0xAE, 0x85, 0x43,
+	0xE5, 0xAE, 0x97, 0x43, 0xE5, 0xAF, 0x83, 0x43,
+	0xE5, 0xAF, 0x98, 0x43, 0xE5, 0xAF, 0xA7, 0x43,
+	0xE5, 0xAF, 0xAE, 0x43, 0xE5, 0xAF, 0xB3, 0x43,
+	0xE5, 0xAF, 0xB8, 0x43, 0xE5, 0xAF, 0xBF, 0x43,
+	0xE5, 0xB0, 0x86, 0x43, 0xE5, 0xB0, 0x8F, 0x43,
+	// Bytes a80 - abf
+	0xE5, 0xB0, 0xA2, 0x43, 0xE5, 0xB0, 0xB8, 0x43,
+	0xE5, 0xB0, 0xBF, 0x43, 0xE5, 0xB1, 0xA0, 0x43,
+	0xE5, 0xB1, 0xA2, 0x43, 0xE5, 0xB1, 0xA4, 0x43,
+	0xE5, 0xB1, 0xA5, 0x43, 0xE5, 0xB1, 0xAE, 0x43,
+	0xE5, 0xB1, 0xB1, 0x43, 0xE5, 0xB2, 0x8D, 0x43,
+	0xE5, 0xB3, 0x80, 0x43, 0xE5, 0xB4, 0x99, 0x43,
+	0xE5, 0xB5, 0x83, 0x43, 0xE5, 0xB5, 0x90, 0x43,
+	0xE5, 0xB5, 0xAB, 0x43, 0xE5, 0xB5, 0xAE, 0x43,
+	// Bytes ac0 - aff
+	0xE5, 0xB5, 0xBC, 0x43, 0xE5, 0xB6, 0xB2, 0x43,
+	0xE5, 0xB6, 0xBA, 0x43, 0xE5, 0xB7, 0x9B, 0x43,
+	0xE5, 0xB7, 0xA1, 0x43, 0xE5, 0xB7, 0xA2, 0x43,
+	0xE5, 0xB7, 0xA5, 0x43, 0xE5, 0xB7, 0xA6, 0x43,
+	0xE5, 0xB7, 0xB1, 0x43, 0xE5, 0xB7, 0xBD, 0x43,
+	0xE5, 0xB7, 0xBE, 0x43, 0xE5, 0xB8, 0xA8, 0x43,
+	0xE5, 0xB8, 0xBD, 0x43, 0xE5, 0xB9, 0xA9, 0x43,
+	0xE5, 0xB9, 0xB2, 0x43, 0xE5, 0xB9, 0xB4, 0x43,
+	// Bytes b00 - b3f
+	0xE5, 0xB9, 0xBA, 0x43, 0xE5, 0xB9, 0xBC, 0x43,
+	0xE5, 0xB9, 0xBF, 0x43, 0xE5, 0xBA, 0xA6, 0x43,
+	0xE5, 0xBA, 0xB0, 0x43, 0xE5, 0xBA, 0xB3, 0x43,
+	0xE5, 0xBA, 0xB6, 0x43, 0xE5, 0xBB, 0x89, 0x43,
+	0xE5, 0xBB, 0x8A, 0x43, 0xE5, 0xBB, 0x92, 0x43,
+	0xE5, 0xBB, 0x93, 0x43, 0xE5, 0xBB, 0x99, 0x43,
+	0xE5, 0xBB, 0xAC, 0x43, 0xE5, 0xBB, 0xB4, 0x43,
+	0xE5, 0xBB, 0xBE, 0x43, 0xE5, 0xBC, 0x84, 0x43,
+	// Bytes b40 - b7f
+	0xE5, 0xBC, 0x8B, 0x43, 0xE5, 0xBC, 0x93, 0x43,
+	0xE5, 0xBC, 0xA2, 0x43, 0xE5, 0xBD, 0x90, 0x43,
+	0xE5, 0xBD, 0x93, 0x43, 0xE5, 0xBD, 0xA1, 0x43,
+	0xE5, 0xBD, 0xA2, 0x43, 0xE5, 0xBD, 0xA9, 0x43,
+	0xE5, 0xBD, 0xAB, 0x43, 0xE5, 0xBD, 0xB3, 0x43,
+	0xE5, 0xBE, 0x8B, 0x43, 0xE5, 0xBE, 0x8C, 0x43,
+	0xE5, 0xBE, 0x97, 0x43, 0xE5, 0xBE, 0x9A, 0x43,
+	0xE5, 0xBE, 0xA9, 0x43, 0xE5, 0xBE, 0xAD, 0x43,
+	// Bytes b80 - bbf
+	0xE5, 0xBF, 0x83, 0x43, 0xE5, 0xBF, 0x8D, 0x43,
+	0xE5, 0xBF, 0x97, 0x43, 0xE5, 0xBF, 0xB5, 0x43,
+	0xE5, 0xBF, 0xB9, 0x43, 0xE6, 0x80, 0x92, 0x43,
+	0xE6, 0x80, 0x9C, 0x43, 0xE6, 0x81, 0xB5, 0x43,
+	0xE6, 0x82, 0x81, 0x43, 0xE6, 0x82, 0x94, 0x43,
+	0xE6, 0x83, 0x87, 0x43, 0xE6, 0x83, 0x98, 0x43,
+	0xE6, 0x83, 0xA1, 0x43, 0xE6, 0x84, 0x88, 0x43,
+	0xE6, 0x85, 0x84, 0x43, 0xE6, 0x85, 0x88, 0x43,
+	// Bytes bc0 - bff
+	0xE6, 0x85, 0x8C, 0x43, 0xE6, 0x85, 0x8E, 0x43,
+	0xE6, 0x85, 0xA0, 0x43, 0xE6, 0x85, 0xA8, 0x43,
+	0xE6, 0x85, 0xBA, 0x43, 0xE6, 0x86, 0x8E, 0x43,
+	0xE6, 0x86, 0x90, 0x43, 0xE6, 0x86, 0xA4, 0x43,
+	0xE6, 0x86, 0xAF, 0x43, 0xE6, 0x86, 0xB2, 0x43,
+	0xE6, 0x87, 0x9E, 0x43, 0xE6, 0x87, 0xB2, 0x43,
+	0xE6, 0x87, 0xB6, 0x43, 0xE6, 0x88, 0x80, 0x43,
+	0xE6, 0x88, 0x88, 0x43, 0xE6, 0x88, 0x90, 0x43,
+	// Bytes c00 - c3f
+	0xE6, 0x88, 0x9B, 0x43, 0xE6, 0x88, 0xAE, 0x43,
+	0xE6, 0x88, 0xB4, 0x43, 0xE6, 0x88, 0xB6, 0x43,
+	0xE6, 0x89, 0x8B, 0x43, 0xE6, 0x89, 0x93, 0x43,
+	0xE6, 0x89, 0x9D, 0x43, 0xE6, 0x8A, 0x95, 0x43,
+	0xE6, 0x8A, 0xB1, 0x43, 0xE6, 0x8B, 0x89, 0x43,
+	0xE6, 0x8B, 0x8F, 0x43, 0xE6, 0x8B, 0x93, 0x43,
+	0xE6, 0x8B, 0x94, 0x43, 0xE6, 0x8B, 0xBC, 0x43,
+	0xE6, 0x8B, 0xBE, 0x43, 0xE6, 0x8C, 0x87, 0x43,
+	// Bytes c40 - c7f
+	0xE6, 0x8C, 0xBD, 0x43, 0xE6, 0x8D, 0x90, 0x43,
+	0xE6, 0x8D, 0x95, 0x43, 0xE6, 0x8D, 0xA8, 0x43,
+	0xE6, 0x8D, 0xBB, 0x43, 0xE6, 0x8E, 0x83, 0x43,
+	0xE6, 0x8E, 0xA0, 0x43, 0xE6, 0x8E, 0xA9, 0x43,
+	0xE6, 0x8F, 0x84, 0x43, 0xE6, 0x8F, 0x85, 0x43,
+	0xE6, 0x8F, 0xA4, 0x43, 0xE6, 0x90, 0x9C, 0x43,
+	0xE6, 0x90, 0xA2, 0x43, 0xE6, 0x91, 0x92, 0x43,
+	0xE6, 0x91, 0xA9, 0x43, 0xE6, 0x91, 0xB7, 0x43,
+	// Bytes c80 - cbf
+	0xE6, 0x91, 0xBE, 0x43, 0xE6, 0x92, 0x9A, 0x43,
+	0xE6, 0x92, 0x9D, 0x43, 0xE6, 0x93, 0x84, 0x43,
+	0xE6, 0x94, 0xAF, 0x43, 0xE6, 0x94, 0xB4, 0x43,
+	0xE6, 0x95, 0x8F, 0x43, 0xE6, 0x95, 0x96, 0x43,
+	0xE6, 0x95, 0xAC, 0x43, 0xE6, 0x95, 0xB8, 0x43,
+	0xE6, 0x96, 0x87, 0x43, 0xE6, 0x96, 0x97, 0x43,
+	0xE6, 0x96, 0x99, 0x43, 0xE6, 0x96, 0xA4, 0x43,
+	0xE6, 0x96, 0xB0, 0x43, 0xE6, 0x96, 0xB9, 0x43,
+	// Bytes cc0 - cff
+	0xE6, 0x97, 0x85, 0x43, 0xE6, 0x97, 0xA0, 0x43,
+	0xE6, 0x97, 0xA2, 0x43, 0xE6, 0x97, 0xA3, 0x43,
+	0xE6, 0x97, 0xA5, 0x43, 0xE6, 0x98, 0x93, 0x43,
+	0xE6, 0x98, 0xA0, 0x43, 0xE6, 0x99, 0x89, 0x43,
+	0xE6, 0x99, 0xB4, 0x43, 0xE6, 0x9A, 0x88, 0x43,
+	0xE6, 0x9A, 0x91, 0x43, 0xE6, 0x9A, 0x9C, 0x43,
+	0xE6, 0x9A, 0xB4, 0x43, 0xE6, 0x9B, 0x86, 0x43,
+	0xE6, 0x9B, 0xB0, 0x43, 0xE6, 0x9B, 0xB4, 0x43,
+	// Bytes d00 - d3f
+	0xE6, 0x9B, 0xB8, 0x43, 0xE6, 0x9C, 0x80, 0x43,
+	0xE6, 0x9C, 0x88, 0x43, 0xE6, 0x9C, 0x89, 0x43,
+	0xE6, 0x9C, 0x97, 0x43, 0xE6, 0x9C, 0x9B, 0x43,
+	0xE6, 0x9C, 0xA1, 0x43, 0xE6, 0x9C, 0xA8, 0x43,
+	0xE6, 0x9D, 0x8E, 0x43, 0xE6, 0x9D, 0x93, 0x43,
+	0xE6, 0x9D, 0x96, 0x43, 0xE6, 0x9D, 0x9E, 0x43,
+	0xE6, 0x9D, 0xBB, 0x43, 0xE6, 0x9E, 0x85, 0x43,
+	0xE6, 0x9E, 0x97, 0x43, 0xE6, 0x9F, 0xB3, 0x43,
+	// Bytes d40 - d7f
+	0xE6, 0x9F, 0xBA, 0x43, 0xE6, 0xA0, 0x97, 0x43,
+	0xE6, 0xA0, 0x9F, 0x43, 0xE6, 0xA0, 0xAA, 0x43,
+	0xE6, 0xA1, 0x92, 0x43, 0xE6, 0xA2, 0x81, 0x43,
+	0xE6, 0xA2, 0x85, 0x43, 0xE6, 0xA2, 0x8E, 0x43,
+	0xE6, 0xA2, 0xA8, 0x43, 0xE6, 0xA4, 0x94, 0x43,
+	0xE6, 0xA5, 0x82, 0x43, 0xE6, 0xA6, 0xA3, 0x43,
+	0xE6, 0xA7, 0xAA, 0x43, 0xE6, 0xA8, 0x82, 0x43,
+	0xE6, 0xA8, 0x93, 0x43, 0xE6, 0xAA, 0xA8, 0x43,
+	// Bytes d80 - dbf
+	0xE6, 0xAB, 0x93, 0x43, 0xE6, 0xAB, 0x9B, 0x43,
+	0xE6, 0xAC, 0x84, 0x43, 0xE6, 0xAC, 0xA0, 0x43,
+	0xE6, 0xAC, 0xA1, 0x43, 0xE6, 0xAD, 0x94, 0x43,
+	0xE6, 0xAD, 0xA2, 0x43, 0xE6, 0xAD, 0xA3, 0x43,
+	0xE6, 0xAD, 0xB2, 0x43, 0xE6, 0xAD, 0xB7, 0x43,
+	0xE6, 0xAD, 0xB9, 0x43, 0xE6, 0xAE, 0x9F, 0x43,
+	0xE6, 0xAE, 0xAE, 0x43, 0xE6, 0xAE, 0xB3, 0x43,
+	0xE6, 0xAE, 0xBA, 0x43, 0xE6, 0xAE, 0xBB, 0x43,
+	// Bytes dc0 - dff
+	0xE6, 0xAF, 0x8B, 0x43, 0xE6, 0xAF, 0x8D, 0x43,
+	0xE6, 0xAF, 0x94, 0x43, 0xE6, 0xAF, 0x9B, 0x43,
+	0xE6, 0xB0, 0x8F, 0x43, 0xE6, 0xB0, 0x94, 0x43,
+	0xE6, 0xB0, 0xB4, 0x43, 0xE6, 0xB1, 0x8E, 0x43,
+	0xE6, 0xB1, 0xA7, 0x43, 0xE6, 0xB2, 0x88, 0x43,
+	0xE6, 0xB2, 0xBF, 0x43, 0xE6, 0xB3, 0x8C, 0x43,
+	0xE6, 0xB3, 0x8D, 0x43, 0xE6, 0xB3, 0xA5, 0x43,
+	0xE6, 0xB3, 0xA8, 0x43, 0xE6, 0xB4, 0x96, 0x43,
+	// Bytes e00 - e3f
+	0xE6, 0xB4, 0x9B, 0x43, 0xE6, 0xB4, 0x9E, 0x43,
+	0xE6, 0xB4, 0xB4, 0x43, 0xE6, 0xB4, 0xBE, 0x43,
+	0xE6, 0xB5, 0x81, 0x43, 0xE6, 0xB5, 0xA9, 0x43,
+	0xE6, 0xB5, 0xAA, 0x43, 0xE6, 0xB5, 0xB7, 0x43,
+	0xE6, 0xB5, 0xB8, 0x43, 0xE6, 0xB6, 0x85, 0x43,
+	0xE6, 0xB7, 0x8B, 0x43, 0xE6, 0xB7, 0x9A, 0x43,
+	0xE6, 0xB7, 0xAA, 0x43, 0xE6, 0xB7, 0xB9, 0x43,
+	0xE6, 0xB8, 0x9A, 0x43, 0xE6, 0xB8, 0xAF, 0x43,
+	// Bytes e40 - e7f
+	0xE6, 0xB9, 0xAE, 0x43, 0xE6, 0xBA, 0x80, 0x43,
+	0xE6, 0xBA, 0x9C, 0x43, 0xE6, 0xBA, 0xBA, 0x43,
+	0xE6, 0xBB, 0x87, 0x43, 0xE6, 0xBB, 0x8B, 0x43,
+	0xE6, 0xBB, 0x91, 0x43, 0xE6, 0xBB, 0x9B, 0x43,
+	0xE6, 0xBC, 0x8F, 0x43, 0xE6, 0xBC, 0x94, 0x43,
+	0xE6, 0xBC, 0xA2, 0x43, 0xE6, 0xBC, 0xA3, 0x43,
+	0xE6, 0xBD, 0xAE, 0x43, 0xE6, 0xBF, 0x86, 0x43,
+	0xE6, 0xBF, 0xAB, 0x43, 0xE6, 0xBF, 0xBE, 0x43,
+	// Bytes e80 - ebf
+	0xE7, 0x80, 0x9B, 0x43, 0xE7, 0x80, 0x9E, 0x43,
+	0xE7, 0x80, 0xB9, 0x43, 0xE7, 0x81, 0x8A, 0x43,
+	0xE7, 0x81, 0xAB, 0x43, 0xE7, 0x81, 0xB0, 0x43,
+	0xE7, 0x81, 0xB7, 0x43, 0xE7, 0x81, 0xBD, 0x43,
+	0xE7, 0x82, 0x99, 0x43, 0xE7, 0x82, 0xAD, 0x43,
+	0xE7, 0x83, 0x88, 0x43, 0xE7, 0x83, 0x99, 0x43,
+	0xE7, 0x84, 0xA1, 0x43, 0xE7, 0x85, 0x85, 0x43,
+	0xE7, 0x85, 0x89, 0x43, 0xE7, 0x85, 0xAE, 0x43,
+	// Bytes ec0 - eff
+	0xE7, 0x86, 0x9C, 0x43, 0xE7, 0x87, 0x8E, 0x43,
+	0xE7, 0x87, 0x90, 0x43, 0xE7, 0x88, 0x90, 0x43,
+	0xE7, 0x88, 0x9B, 0x43, 0xE7, 0x88, 0xA8, 0x43,
+	0xE7, 0x88, 0xAA, 0x43, 0xE7, 0x88, 0xAB, 0x43,
+	0xE7, 0x88, 0xB5, 0x43, 0xE7, 0x88, 0xB6, 0x43,
+	0xE7, 0x88, 0xBB, 0x43, 0xE7, 0x88, 0xBF, 0x43,
+	0xE7, 0x89, 0x87, 0x43, 0xE7, 0x89, 0x90, 0x43,
+	0xE7, 0x89, 0x99, 0x43, 0xE7, 0x89, 0x9B, 0x43,
+	// Bytes f00 - f3f
+	0xE7, 0x89, 0xA2, 0x43, 0xE7, 0x89, 0xB9, 0x43,
+	0xE7, 0x8A, 0x80, 0x43, 0xE7, 0x8A, 0x95, 0x43,
+	0xE7, 0x8A, 0xAC, 0x43, 0xE7, 0x8A, 0xAF, 0x43,
+	0xE7, 0x8B, 0x80, 0x43, 0xE7, 0x8B, 0xBC, 0x43,
+	0xE7, 0x8C, 0xAA, 0x43, 0xE7, 0x8D, 0xB5, 0x43,
+	0xE7, 0x8D, 0xBA, 0x43, 0xE7, 0x8E, 0x84, 0x43,
+	0xE7, 0x8E, 0x87, 0x43, 0xE7, 0x8E, 0x89, 0x43,
+	0xE7, 0x8E, 0x8B, 0x43, 0xE7, 0x8E, 0xA5, 0x43,
+	// Bytes f40 - f7f
+	0xE7, 0x8E, 0xB2, 0x43, 0xE7, 0x8F, 0x9E, 0x43,
+	0xE7, 0x90, 0x86, 0x43, 0xE7, 0x90, 0x89, 0x43,
+	0xE7, 0x90, 0xA2, 0x43, 0xE7, 0x91, 0x87, 0x43,
+	0xE7, 0x91, 0x9C, 0x43, 0xE7, 0x91, 0xA9, 0x43,
+	0xE7, 0x91, 0xB1, 0x43, 0xE7, 0x92, 0x85, 0x43,
+	0xE7, 0x92, 0x89, 0x43, 0xE7, 0x92, 0x98, 0x43,
+	0xE7, 0x93, 0x8A, 0x43, 0xE7, 0x93, 0x9C, 0x43,
+	0xE7, 0x93, 0xA6, 0x43, 0xE7, 0x94, 0x86, 0x43,
+	// Bytes f80 - fbf
+	0xE7, 0x94, 0x98, 0x43, 0xE7, 0x94, 0x9F, 0x43,
+	0xE7, 0x94, 0xA4, 0x43, 0xE7, 0x94, 0xA8, 0x43,
+	0xE7, 0x94, 0xB0, 0x43, 0xE7, 0x94, 0xB2, 0x43,
+	0xE7, 0x94, 0xB3, 0x43, 0xE7, 0x94, 0xB7, 0x43,
+	0xE7, 0x94, 0xBB, 0x43, 0xE7, 0x94, 0xBE, 0x43,
+	0xE7, 0x95, 0x99, 0x43, 0xE7, 0x95, 0xA5, 0x43,
+	0xE7, 0x95, 0xB0, 0x43, 0xE7, 0x96, 0x8B, 0x43,
+	0xE7, 0x96, 0x92, 0x43, 0xE7, 0x97, 0xA2, 0x43,
+	// Bytes fc0 - fff
+	0xE7, 0x98, 0x90, 0x43, 0xE7, 0x98, 0x9D, 0x43,
+	0xE7, 0x98, 0x9F, 0x43, 0xE7, 0x99, 0x82, 0x43,
+	0xE7, 0x99, 0xA9, 0x43, 0xE7, 0x99, 0xB6, 0x43,
+	0xE7, 0x99, 0xBD, 0x43, 0xE7, 0x9A, 0xAE, 0x43,
+	0xE7, 0x9A, 0xBF, 0x43, 0xE7, 0x9B, 0x8A, 0x43,
+	0xE7, 0x9B, 0x9B, 0x43, 0xE7, 0x9B, 0xA3, 0x43,
+	0xE7, 0x9B, 0xA7, 0x43, 0xE7, 0x9B, 0xAE, 0x43,
+	0xE7, 0x9B, 0xB4, 0x43, 0xE7, 0x9C, 0x81, 0x43,
+	// Bytes 1000 - 103f
+	0xE7, 0x9C, 0x9E, 0x43, 0xE7, 0x9C, 0x9F, 0x43,
+	0xE7, 0x9D, 0x80, 0x43, 0xE7, 0x9D, 0x8A, 0x43,
+	0xE7, 0x9E, 0x8B, 0x43, 0xE7, 0x9E, 0xA7, 0x43,
+	0xE7, 0x9F, 0x9B, 0x43, 0xE7, 0x9F, 0xA2, 0x43,
+	0xE7, 0x9F, 0xB3, 0x43, 0xE7, 0xA1, 0x8E, 0x43,
+	0xE7, 0xA1, 0xAB, 0x43, 0xE7, 0xA2, 0x8C, 0x43,
+	0xE7, 0xA2, 0x91, 0x43, 0xE7, 0xA3, 0x8A, 0x43,
+	0xE7, 0xA3, 0x8C, 0x43, 0xE7, 0xA3, 0xBB, 0x43,
+	// Bytes 1040 - 107f
+	0xE7, 0xA4, 0xAA, 0x43, 0xE7, 0xA4, 0xBA, 0x43,
+	0xE7, 0xA4, 0xBC, 0x43, 0xE7, 0xA4, 0xBE, 0x43,
+	0xE7, 0xA5, 0x88, 0x43, 0xE7, 0xA5, 0x89, 0x43,
+	0xE7, 0xA5, 0x90, 0x43, 0xE7, 0xA5, 0x96, 0x43,
+	0xE7, 0xA5, 0x9D, 0x43, 0xE7, 0xA5, 0x9E, 0x43,
+	0xE7, 0xA5, 0xA5, 0x43, 0xE7, 0xA5, 0xBF, 0x43,
+	0xE7, 0xA6, 0x81, 0x43, 0xE7, 0xA6, 0x8D, 0x43,
+	0xE7, 0xA6, 0x8E, 0x43, 0xE7, 0xA6, 0x8F, 0x43,
+	// Bytes 1080 - 10bf
+	0xE7, 0xA6, 0xAE, 0x43, 0xE7, 0xA6, 0xB8, 0x43,
+	0xE7, 0xA6, 0xBE, 0x43, 0xE7, 0xA7, 0x8A, 0x43,
+	0xE7, 0xA7, 0x98, 0x43, 0xE7, 0xA7, 0xAB, 0x43,
+	0xE7, 0xA8, 0x9C, 0x43, 0xE7, 0xA9, 0x80, 0x43,
+	0xE7, 0xA9, 0x8A, 0x43, 0xE7, 0xA9, 0x8F, 0x43,
+	0xE7, 0xA9, 0xB4, 0x43, 0xE7, 0xA9, 0xBA, 0x43,
+	0xE7, 0xAA, 0x81, 0x43, 0xE7, 0xAA, 0xB1, 0x43,
+	0xE7, 0xAB, 0x8B, 0x43, 0xE7, 0xAB, 0xAE, 0x43,
+	// Bytes 10c0 - 10ff
+	0xE7, 0xAB, 0xB9, 0x43, 0xE7, 0xAC, 0xA0, 0x43,
+	0xE7, 0xAE, 0x8F, 0x43, 0xE7, 0xAF, 0x80, 0x43,
+	0xE7, 0xAF, 0x86, 0x43, 0xE7, 0xAF, 0x89, 0x43,
+	0xE7, 0xB0, 0xBE, 0x43, 0xE7, 0xB1, 0xA0, 0x43,
+	0xE7, 0xB1, 0xB3, 0x43, 0xE7, 0xB1, 0xBB, 0x43,
+	0xE7, 0xB2, 0x92, 0x43, 0xE7, 0xB2, 0xBE, 0x43,
+	0xE7, 0xB3, 0x92, 0x43, 0xE7, 0xB3, 0x96, 0x43,
+	0xE7, 0xB3, 0xA3, 0x43, 0xE7, 0xB3, 0xA7, 0x43,
+	// Bytes 1100 - 113f
+	0xE7, 0xB3, 0xA8, 0x43, 0xE7, 0xB3, 0xB8, 0x43,
+	0xE7, 0xB4, 0x80, 0x43, 0xE7, 0xB4, 0x90, 0x43,
+	0xE7, 0xB4, 0xA2, 0x43, 0xE7, 0xB4, 0xAF, 0x43,
+	0xE7, 0xB5, 0x82, 0x43, 0xE7, 0xB5, 0x9B, 0x43,
+	0xE7, 0xB5, 0xA3, 0x43, 0xE7, 0xB6, 0xA0, 0x43,
+	0xE7, 0xB6, 0xBE, 0x43, 0xE7, 0xB7, 0x87, 0x43,
+	0xE7, 0xB7, 0xB4, 0x43, 0xE7, 0xB8, 0x82, 0x43,
+	0xE7, 0xB8, 0x89, 0x43, 0xE7, 0xB8, 0xB7, 0x43,
+	// Bytes 1140 - 117f
+	0xE7, 0xB9, 0x81, 0x43, 0xE7, 0xB9, 0x85, 0x43,
+	0xE7, 0xBC, 0xB6, 0x43, 0xE7, 0xBC, 0xBE, 0x43,
+	0xE7, 0xBD, 0x91, 0x43, 0xE7, 0xBD, 0xB2, 0x43,
+	0xE7, 0xBD, 0xB9, 0x43, 0xE7, 0xBD, 0xBA, 0x43,
+	0xE7, 0xBE, 0x85, 0x43, 0xE7, 0xBE, 0x8A, 0x43,
+	0xE7, 0xBE, 0x95, 0x43, 0xE7, 0xBE, 0x9A, 0x43,
+	0xE7, 0xBE, 0xBD, 0x43, 0xE7, 0xBF, 0xBA, 0x43,
+	0xE8, 0x80, 0x81, 0x43, 0xE8, 0x80, 0x85, 0x43,
+	// Bytes 1180 - 11bf
+	0xE8, 0x80, 0x8C, 0x43, 0xE8, 0x80, 0x92, 0x43,
+	0xE8, 0x80, 0xB3, 0x43, 0xE8, 0x81, 0x86, 0x43,
+	0xE8, 0x81, 0xA0, 0x43, 0xE8, 0x81, 0xAF, 0x43,
+	0xE8, 0x81, 0xB0, 0x43, 0xE8, 0x81, 0xBE, 0x43,
+	0xE8, 0x81, 0xBF, 0x43, 0xE8, 0x82, 0x89, 0x43,
+	0xE8, 0x82, 0x8B, 0x43, 0xE8, 0x82, 0xAD, 0x43,
+	0xE8, 0x82, 0xB2, 0x43, 0xE8, 0x84, 0x83, 0x43,
+	0xE8, 0x84, 0xBE, 0x43, 0xE8, 0x87, 0x98, 0x43,
+	// Bytes 11c0 - 11ff
+	0xE8, 0x87, 0xA3, 0x43, 0xE8, 0x87, 0xA8, 0x43,
+	0xE8, 0x87, 0xAA, 0x43, 0xE8, 0x87, 0xAD, 0x43,
+	0xE8, 0x87, 0xB3, 0x43, 0xE8, 0x87, 0xBC, 0x43,
+	0xE8, 0x88, 0x81, 0x43, 0xE8, 0x88, 0x84, 0x43,
+	0xE8, 0x88, 0x8C, 0x43, 0xE8, 0x88, 0x98, 0x43,
+	0xE8, 0x88, 0x9B, 0x43, 0xE8, 0x88, 0x9F, 0x43,
+	0xE8, 0x89, 0xAE, 0x43, 0xE8, 0x89, 0xAF, 0x43,
+	0xE8, 0x89, 0xB2, 0x43, 0xE8, 0x89, 0xB8, 0x43,
+	// Bytes 1200 - 123f
+	0xE8, 0x89, 0xB9, 0x43, 0xE8, 0x8A, 0x8B, 0x43,
+	0xE8, 0x8A, 0x91, 0x43, 0xE8, 0x8A, 0x9D, 0x43,
+	0xE8, 0x8A, 0xB1, 0x43, 0xE8, 0x8A, 0xB3, 0x43,
+	0xE8, 0x8A, 0xBD, 0x43, 0xE8, 0x8B, 0xA5, 0x43,
+	0xE8, 0x8B, 0xA6, 0x43, 0xE8, 0x8C, 0x9D, 0x43,
+	0xE8, 0x8C, 0xA3, 0x43, 0xE8, 0x8C, 0xB6, 0x43,
+	0xE8, 0x8D, 0x92, 0x43, 0xE8, 0x8D, 0x93, 0x43,
+	0xE8, 0x8D, 0xA3, 0x43, 0xE8, 0x8E, 0xAD, 0x43,
+	// Bytes 1240 - 127f
+	0xE8, 0x8E, 0xBD, 0x43, 0xE8, 0x8F, 0x89, 0x43,
+	0xE8, 0x8F, 0x8A, 0x43, 0xE8, 0x8F, 0x8C, 0x43,
+	0xE8, 0x8F, 0x9C, 0x43, 0xE8, 0x8F, 0xA7, 0x43,
+	0xE8, 0x8F, 0xAF, 0x43, 0xE8, 0x8F, 0xB1, 0x43,
+	0xE8, 0x90, 0xBD, 0x43, 0xE8, 0x91, 0x89, 0x43,
+	0xE8, 0x91, 0x97, 0x43, 0xE8, 0x93, 0xAE, 0x43,
+	0xE8, 0x93, 0xB1, 0x43, 0xE8, 0x93, 0xB3, 0x43,
+	0xE8, 0x93, 0xBC, 0x43, 0xE8, 0x94, 0x96, 0x43,
+	// Bytes 1280 - 12bf
+	0xE8, 0x95, 0xA4, 0x43, 0xE8, 0x97, 0x8D, 0x43,
+	0xE8, 0x97, 0xBA, 0x43, 0xE8, 0x98, 0x86, 0x43,
+	0xE8, 0x98, 0x92, 0x43, 0xE8, 0x98, 0xAD, 0x43,
+	0xE8, 0x98, 0xBF, 0x43, 0xE8, 0x99, 0x8D, 0x43,
+	0xE8, 0x99, 0x90, 0x43, 0xE8, 0x99, 0x9C, 0x43,
+	0xE8, 0x99, 0xA7, 0x43, 0xE8, 0x99, 0xA9, 0x43,
+	0xE8, 0x99, 0xAB, 0x43, 0xE8, 0x9A, 0x88, 0x43,
+	0xE8, 0x9A, 0xA9, 0x43, 0xE8, 0x9B, 0xA2, 0x43,
+	// Bytes 12c0 - 12ff
+	0xE8, 0x9C, 0x8E, 0x43, 0xE8, 0x9C, 0xA8, 0x43,
+	0xE8, 0x9D, 0xAB, 0x43, 0xE8, 0x9D, 0xB9, 0x43,
+	0xE8, 0x9E, 0x86, 0x43, 0xE8, 0x9E, 0xBA, 0x43,
+	0xE8, 0x9F, 0xA1, 0x43, 0xE8, 0xA0, 0x81, 0x43,
+	0xE8, 0xA0, 0x9F, 0x43, 0xE8, 0xA1, 0x80, 0x43,
+	0xE8, 0xA1, 0x8C, 0x43, 0xE8, 0xA1, 0xA0, 0x43,
+	0xE8, 0xA1, 0xA3, 0x43, 0xE8, 0xA3, 0x82, 0x43,
+	0xE8, 0xA3, 0x8F, 0x43, 0xE8, 0xA3, 0x97, 0x43,
+	// Bytes 1300 - 133f
+	0xE8, 0xA3, 0x9E, 0x43, 0xE8, 0xA3, 0xA1, 0x43,
+	0xE8, 0xA3, 0xB8, 0x43, 0xE8, 0xA3, 0xBA, 0x43,
+	0xE8, 0xA4, 0x90, 0x43, 0xE8, 0xA5, 0x81, 0x43,
+	0xE8, 0xA5, 0xA4, 0x43, 0xE8, 0xA5, 0xBE, 0x43,
+	0xE8, 0xA6, 0x86, 0x43, 0xE8, 0xA6, 0x8B, 0x43,
+	0xE8, 0xA6, 0x96, 0x43, 0xE8, 0xA7, 0x92, 0x43,
+	0xE8, 0xA7, 0xA3, 0x43, 0xE8, 0xA8, 0x80, 0x43,
+	0xE8, 0xAA, 0xA0, 0x43, 0xE8, 0xAA, 0xAA, 0x43,
+	// Bytes 1340 - 137f
+	0xE8, 0xAA, 0xBF, 0x43, 0xE8, 0xAB, 0x8B, 0x43,
+	0xE8, 0xAB, 0x92, 0x43, 0xE8, 0xAB, 0x96, 0x43,
+	0xE8, 0xAB, 0xAD, 0x43, 0xE8, 0xAB, 0xB8, 0x43,
+	0xE8, 0xAB, 0xBE, 0x43, 0xE8, 0xAC, 0x81, 0x43,
+	0xE8, 0xAC, 0xB9, 0x43, 0xE8, 0xAD, 0x98, 0x43,
+	0xE8, 0xAE, 0x80, 0x43, 0xE8, 0xAE, 0x8A, 0x43,
+	0xE8, 0xB0, 0xB7, 0x43, 0xE8, 0xB1, 0x86, 0x43,
+	0xE8, 0xB1, 0x88, 0x43, 0xE8, 0xB1, 0x95, 0x43,
+	// Bytes 1380 - 13bf
+	0xE8, 0xB1, 0xB8, 0x43, 0xE8, 0xB2, 0x9D, 0x43,
+	0xE8, 0xB2, 0xA1, 0x43, 0xE8, 0xB2, 0xA9, 0x43,
+	0xE8, 0xB2, 0xAB, 0x43, 0xE8, 0xB3, 0x81, 0x43,
+	0xE8, 0xB3, 0x82, 0x43, 0xE8, 0xB3, 0x87, 0x43,
+	0xE8, 0xB3, 0x88, 0x43, 0xE8, 0xB3, 0x93, 0x43,
+	0xE8, 0xB4, 0x88, 0x43, 0xE8, 0xB4, 0x9B, 0x43,
+	0xE8, 0xB5, 0xA4, 0x43, 0xE8, 0xB5, 0xB0, 0x43,
+	0xE8, 0xB5, 0xB7, 0x43, 0xE8, 0xB6, 0xB3, 0x43,
+	// Bytes 13c0 - 13ff
+	0xE8, 0xB6, 0xBC, 0x43, 0xE8, 0xB7, 0x8B, 0x43,
+	0xE8, 0xB7, 0xAF, 0x43, 0xE8, 0xB7, 0xB0, 0x43,
+	0xE8, 0xBA, 0xAB, 0x43, 0xE8, 0xBB, 0x8A, 0x43,
+	0xE8, 0xBB, 0x94, 0x43, 0xE8, 0xBC, 0xA6, 0x43,
+	0xE8, 0xBC, 0xAA, 0x43, 0xE8, 0xBC, 0xB8, 0x43,
+	0xE8, 0xBC, 0xBB, 0x43, 0xE8, 0xBD, 0xA2, 0x43,
+	0xE8, 0xBE, 0x9B, 0x43, 0xE8, 0xBE, 0x9E, 0x43,
+	0xE8, 0xBE, 0xB0, 0x43, 0xE8, 0xBE, 0xB5, 0x43,
+	// Bytes 1400 - 143f
+	0xE8, 0xBE, 0xB6, 0x43, 0xE9, 0x80, 0xA3, 0x43,
+	0xE9, 0x80, 0xB8, 0x43, 0xE9, 0x81, 0x8A, 0x43,
+	0xE9, 0x81, 0xA9, 0x43, 0xE9, 0x81, 0xB2, 0x43,
+	0xE9, 0x81, 0xBC, 0x43, 0xE9, 0x82, 0x8F, 0x43,
+	0xE9, 0x82, 0x91, 0x43, 0xE9, 0x82, 0x94, 0x43,
+	0xE9, 0x83, 0x8E, 0x43, 0xE9, 0x83, 0x9E, 0x43,
+	0xE9, 0x83, 0xB1, 0x43, 0xE9, 0x83, 0xBD, 0x43,
+	0xE9, 0x84, 0x91, 0x43, 0xE9, 0x84, 0x9B, 0x43,
+	// Bytes 1440 - 147f
+	0xE9, 0x85, 0x89, 0x43, 0xE9, 0x85, 0x8D, 0x43,
+	0xE9, 0x85, 0xAA, 0x43, 0xE9, 0x86, 0x99, 0x43,
+	0xE9, 0x86, 0xB4, 0x43, 0xE9, 0x87, 0x86, 0x43,
+	0xE9, 0x87, 0x8C, 0x43, 0xE9, 0x87, 0x8F, 0x43,
+	0xE9, 0x87, 0x91, 0x43, 0xE9, 0x88, 0xB4, 0x43,
+	0xE9, 0x88, 0xB8, 0x43, 0xE9, 0x89, 0xB6, 0x43,
+	0xE9, 0x89, 0xBC, 0x43, 0xE9, 0x8B, 0x97, 0x43,
+	0xE9, 0x8B, 0x98, 0x43, 0xE9, 0x8C, 0x84, 0x43,
+	// Bytes 1480 - 14bf
+	0xE9, 0x8D, 0x8A, 0x43, 0xE9, 0x8F, 0xB9, 0x43,
+	0xE9, 0x90, 0x95, 0x43, 0xE9, 0x95, 0xB7, 0x43,
+	0xE9, 0x96, 0x80, 0x43, 0xE9, 0x96, 0x8B, 0x43,
+	0xE9, 0x96, 0xAD, 0x43, 0xE9, 0x96, 0xB7, 0x43,
+	0xE9, 0x98, 0x9C, 0x43, 0xE9, 0x98, 0xAE, 0x43,
+	0xE9, 0x99, 0x8B, 0x43, 0xE9, 0x99, 0x8D, 0x43,
+	0xE9, 0x99, 0xB5, 0x43, 0xE9, 0x99, 0xB8, 0x43,
+	0xE9, 0x99, 0xBC, 0x43, 0xE9, 0x9A, 0x86, 0x43,
+	// Bytes 14c0 - 14ff
+	0xE9, 0x9A, 0xA3, 0x43, 0xE9, 0x9A, 0xB6, 0x43,
+	0xE9, 0x9A, 0xB7, 0x43, 0xE9, 0x9A, 0xB8, 0x43,
+	0xE9, 0x9A, 0xB9, 0x43, 0xE9, 0x9B, 0x83, 0x43,
+	0xE9, 0x9B, 0xA2, 0x43, 0xE9, 0x9B, 0xA3, 0x43,
+	0xE9, 0x9B, 0xA8, 0x43, 0xE9, 0x9B, 0xB6, 0x43,
+	0xE9, 0x9B, 0xB7, 0x43, 0xE9, 0x9C, 0xA3, 0x43,
+	0xE9, 0x9C, 0xB2, 0x43, 0xE9, 0x9D, 0x88, 0x43,
+	0xE9, 0x9D, 0x91, 0x43, 0xE9, 0x9D, 0x96, 0x43,
+	// Bytes 1500 - 153f
+	0xE9, 0x9D, 0x9E, 0x43, 0xE9, 0x9D, 0xA2, 0x43,
+	0xE9, 0x9D, 0xA9, 0x43, 0xE9, 0x9F, 0x8B, 0x43,
+	0xE9, 0x9F, 0x9B, 0x43, 0xE9, 0x9F, 0xA0, 0x43,
+	0xE9, 0x9F, 0xAD, 0x43, 0xE9, 0x9F, 0xB3, 0x43,
+	0xE9, 0x9F, 0xBF, 0x43, 0xE9, 0xA0, 0x81, 0x43,
+	0xE9, 0xA0, 0x85, 0x43, 0xE9, 0xA0, 0x8B, 0x43,
+	0xE9, 0xA0, 0x98, 0x43, 0xE9, 0xA0, 0xA9, 0x43,
+	0xE9, 0xA0, 0xBB, 0x43, 0xE9, 0xA1, 0x9E, 0x43,
+	// Bytes 1540 - 157f
+	0xE9, 0xA2, 0xA8, 0x43, 0xE9, 0xA3, 0x9B, 0x43,
+	0xE9, 0xA3, 0x9F, 0x43, 0xE9, 0xA3, 0xA2, 0x43,
+	0xE9, 0xA3, 0xAF, 0x43, 0xE9, 0xA3, 0xBC, 0x43,
+	0xE9, 0xA4, 0xA8, 0x43, 0xE9, 0xA4, 0xA9, 0x43,
+	0xE9, 0xA6, 0x96, 0x43, 0xE9, 0xA6, 0x99, 0x43,
+	0xE9, 0xA6, 0xA7, 0x43, 0xE9, 0xA6, 0xAC, 0x43,
+	0xE9, 0xA7, 0x82, 0x43, 0xE9, 0xA7, 0xB1, 0x43,
+	0xE9, 0xA7, 0xBE, 0x43, 0xE9, 0xA9, 0xAA, 0x43,
+	// Bytes 1580 - 15bf
+	0xE9, 0xAA, 0xA8, 0x43, 0xE9, 0xAB, 0x98, 0x43,
+	0xE9, 0xAB, 0x9F, 0x43, 0xE9, 0xAC, 0x92, 0x43,
+	0xE9, 0xAC, 0xA5, 0x43, 0xE9, 0xAC, 0xAF, 0x43,
+	0xE9, 0xAC, 0xB2, 0x43, 0xE9, 0xAC, 0xBC, 0x43,
+	0xE9, 0xAD, 0x9A, 0x43, 0xE9, 0xAD, 0xAF, 0x43,
+	0xE9, 0xB1, 0x80, 0x43, 0xE9, 0xB1, 0x97, 0x43,
+	0xE9, 0xB3, 0xA5, 0x43, 0xE9, 0xB3, 0xBD, 0x43,
+	0xE9, 0xB5, 0xA7, 0x43, 0xE9, 0xB6, 0xB4, 0x43,
+	// Bytes 15c0 - 15ff
+	0xE9, 0xB7, 0xBA, 0x43, 0xE9, 0xB8, 0x9E, 0x43,
+	0xE9, 0xB9, 0xB5, 0x43, 0xE9, 0xB9, 0xBF, 0x43,
+	0xE9, 0xBA, 0x97, 0x43, 0xE9, 0xBA, 0x9F, 0x43,
+	0xE9, 0xBA, 0xA5, 0x43, 0xE9, 0xBA, 0xBB, 0x43,
+	0xE9, 0xBB, 0x83, 0x43, 0xE9, 0xBB, 0x8D, 0x43,
+	0xE9, 0xBB, 0x8E, 0x43, 0xE9, 0xBB, 0x91, 0x43,
+	0xE9, 0xBB, 0xB9, 0x43, 0xE9, 0xBB, 0xBD, 0x43,
+	0xE9, 0xBB, 0xBE, 0x43, 0xE9, 0xBC, 0x85, 0x43,
+	// Bytes 1600 - 163f
+	0xE9, 0xBC, 0x8E, 0x43, 0xE9, 0xBC, 0x8F, 0x43,
+	0xE9, 0xBC, 0x93, 0x43, 0xE9, 0xBC, 0x96, 0x43,
+	0xE9, 0xBC, 0xA0, 0x43, 0xE9, 0xBC, 0xBB, 0x43,
+	0xE9, 0xBD, 0x83, 0x43, 0xE9, 0xBD, 0x8A, 0x43,
+	0xE9, 0xBD, 0x92, 0x43, 0xE9, 0xBE, 0x8D, 0x43,
+	0xE9, 0xBE, 0x8E, 0x43, 0xE9, 0xBE, 0x9C, 0x43,
+	0xE9, 0xBE, 0x9F, 0x43, 0xE9, 0xBE, 0xA0, 0x43,
+	0xEA, 0x9C, 0xA7, 0x43, 0xEA, 0x9D, 0xAF, 0x43,
+	// Bytes 1640 - 167f
+	0xEA, 0xAC, 0xB7, 0x43, 0xEA, 0xAD, 0x92, 0x44,
+	0xF0, 0xA0, 0x84, 0xA2, 0x44, 0xF0, 0xA0, 0x94,
+	0x9C, 0x44, 0xF0, 0xA0, 0x94, 0xA5, 0x44, 0xF0,
+	0xA0, 0x95, 0x8B, 0x44, 0xF0, 0xA0, 0x98, 0xBA,
+	0x44, 0xF0, 0xA0, 0xA0, 0x84, 0x44, 0xF0, 0xA0,
+	0xA3, 0x9E, 0x44, 0xF0, 0xA0, 0xA8, 0xAC, 0x44,
+	0xF0, 0xA0, 0xAD, 0xA3, 0x44, 0xF0, 0xA1, 0x93,
+	0xA4, 0x44, 0xF0, 0xA1, 0x9A, 0xA8, 0x44, 0xF0,
+	// Bytes 1680 - 16bf
+	0xA1, 0x9B, 0xAA, 0x44, 0xF0, 0xA1, 0xA7, 0x88,
+	0x44, 0xF0, 0xA1, 0xAC, 0x98, 0x44, 0xF0, 0xA1,
+	0xB4, 0x8B, 0x44, 0xF0, 0xA1, 0xB7, 0xA4, 0x44,
+	0xF0, 0xA1, 0xB7, 0xA6, 0x44, 0xF0, 0xA2, 0x86,
+	0x83, 0x44, 0xF0, 0xA2, 0x86, 0x9F, 0x44, 0xF0,
+	0xA2, 0x8C, 0xB1, 0x44, 0xF0, 0xA2, 0x9B, 0x94,
+	0x44, 0xF0, 0xA2, 0xA1, 0x84, 0x44, 0xF0, 0xA2,
+	0xA1, 0x8A, 0x44, 0xF0, 0xA2, 0xAC, 0x8C, 0x44,
+	// Bytes 16c0 - 16ff
+	0xF0, 0xA2, 0xAF, 0xB1, 0x44, 0xF0, 0xA3, 0x80,
+	0x8A, 0x44, 0xF0, 0xA3, 0x8A, 0xB8, 0x44, 0xF0,
+	0xA3, 0x8D, 0x9F, 0x44, 0xF0, 0xA3, 0x8E, 0x93,
+	0x44, 0xF0, 0xA3, 0x8E, 0x9C, 0x44, 0xF0, 0xA3,
+	0x8F, 0x83, 0x44, 0xF0, 0xA3, 0x8F, 0x95, 0x44,
+	0xF0, 0xA3, 0x91, 0xAD, 0x44, 0xF0, 0xA3, 0x9A,
+	0xA3, 0x44, 0xF0, 0xA3, 0xA2, 0xA7, 0x44, 0xF0,
+	0xA3, 0xAA, 0x8D, 0x44, 0xF0, 0xA3, 0xAB, 0xBA,
+	// Bytes 1700 - 173f
+	0x44, 0xF0, 0xA3, 0xB2, 0xBC, 0x44, 0xF0, 0xA3,
+	0xB4, 0x9E, 0x44, 0xF0, 0xA3, 0xBB, 0x91, 0x44,
+	0xF0, 0xA3, 0xBD, 0x9E, 0x44, 0xF0, 0xA3, 0xBE,
+	0x8E, 0x44, 0xF0, 0xA4, 0x89, 0xA3, 0x44, 0xF0,
+	0xA4, 0x8B, 0xAE, 0x44, 0xF0, 0xA4, 0x8E, 0xAB,
+	0x44, 0xF0, 0xA4, 0x98, 0x88, 0x44, 0xF0, 0xA4,
+	0x9C, 0xB5, 0x44, 0xF0, 0xA4, 0xA0, 0x94, 0x44,
+	0xF0, 0xA4, 0xB0, 0xB6, 0x44, 0xF0, 0xA4, 0xB2,
+	// Bytes 1740 - 177f
+	0x92, 0x44, 0xF0, 0xA4, 0xBE, 0xA1, 0x44, 0xF0,
+	0xA4, 0xBE, 0xB8, 0x44, 0xF0, 0xA5, 0x81, 0x84,
+	0x44, 0xF0, 0xA5, 0x83, 0xB2, 0x44, 0xF0, 0xA5,
+	0x83, 0xB3, 0x44, 0xF0, 0xA5, 0x84, 0x99, 0x44,
+	0xF0, 0xA5, 0x84, 0xB3, 0x44, 0xF0, 0xA5, 0x89,
+	0x89, 0x44, 0xF0, 0xA5, 0x90, 0x9D, 0x44, 0xF0,
+	0xA5, 0x98, 0xA6, 0x44, 0xF0, 0xA5, 0x9A, 0x9A,
+	0x44, 0xF0, 0xA5, 0x9B, 0x85, 0x44, 0xF0, 0xA5,
+	// Bytes 1780 - 17bf
+	0xA5, 0xBC, 0x44, 0xF0, 0xA5, 0xAA, 0xA7, 0x44,
+	0xF0, 0xA5, 0xAE, 0xAB, 0x44, 0xF0, 0xA5, 0xB2,
+	0x80, 0x44, 0xF0, 0xA5, 0xB3, 0x90, 0x44, 0xF0,
+	0xA5, 0xBE, 0x86, 0x44, 0xF0, 0xA6, 0x87, 0x9A,
+	0x44, 0xF0, 0xA6, 0x88, 0xA8, 0x44, 0xF0, 0xA6,
+	0x89, 0x87, 0x44, 0xF0, 0xA6, 0x8B, 0x99, 0x44,
+	0xF0, 0xA6, 0x8C, 0xBE, 0x44, 0xF0, 0xA6, 0x93,
+	0x9A, 0x44, 0xF0, 0xA6, 0x94, 0xA3, 0x44, 0xF0,
+	// Bytes 17c0 - 17ff
+	0xA6, 0x96, 0xA8, 0x44, 0xF0, 0xA6, 0x9E, 0xA7,
+	0x44, 0xF0, 0xA6, 0x9E, 0xB5, 0x44, 0xF0, 0xA6,
+	0xAC, 0xBC, 0x44, 0xF0, 0xA6, 0xB0, 0xB6, 0x44,
+	0xF0, 0xA6, 0xB3, 0x95, 0x44, 0xF0, 0xA6, 0xB5,
+	0xAB, 0x44, 0xF0, 0xA6, 0xBC, 0xAC, 0x44, 0xF0,
+	0xA6, 0xBE, 0xB1, 0x44, 0xF0, 0xA7, 0x83, 0x92,
+	0x44, 0xF0, 0xA7, 0x8F, 0x8A, 0x44, 0xF0, 0xA7,
+	0x99, 0xA7, 0x44, 0xF0, 0xA7, 0xA2, 0xAE, 0x44,
+	// Bytes 1800 - 183f
+	0xF0, 0xA7, 0xA5, 0xA6, 0x44, 0xF0, 0xA7, 0xB2,
+	0xA8, 0x44, 0xF0, 0xA7, 0xBB, 0x93, 0x44, 0xF0,
+	0xA7, 0xBC, 0xAF, 0x44, 0xF0, 0xA8, 0x97, 0x92,
+	0x44, 0xF0, 0xA8, 0x97, 0xAD, 0x44, 0xF0, 0xA8,
+	0x9C, 0xAE, 0x44, 0xF0, 0xA8, 0xAF, 0xBA, 0x44,
+	0xF0, 0xA8, 0xB5, 0xB7, 0x44, 0xF0, 0xA9, 0x85,
+	0x85, 0x44, 0xF0, 0xA9, 0x87, 0x9F, 0x44, 0xF0,
+	0xA9, 0x88, 0x9A, 0x44, 0xF0, 0xA9, 0x90, 0x8A,
+	// Bytes 1840 - 187f
+	0x44, 0xF0, 0xA9, 0x92, 0x96, 0x44, 0xF0, 0xA9,
+	0x96, 0xB6, 0x44, 0xF0, 0xA9, 0xAC, 0xB0, 0x44,
+	0xF0, 0xAA, 0x83, 0x8E, 0x44, 0xF0, 0xAA, 0x84,
+	0x85, 0x44, 0xF0, 0xAA, 0x88, 0x8E, 0x44, 0xF0,
+	0xAA, 0x8A, 0x91, 0x44, 0xF0, 0xAA, 0x8E, 0x92,
+	0x44, 0xF0, 0xAA, 0x98, 0x80, 0x42, 0x21, 0x21,
+	0x42, 0x21, 0x3F, 0x42, 0x2E, 0x2E, 0x42, 0x30,
+	0x2C, 0x42, 0x30, 0x2E, 0x42, 0x31, 0x2C, 0x42,
+	// Bytes 1880 - 18bf
+	0x31, 0x2E, 0x42, 0x31, 0x30, 0x42, 0x31, 0x31,
+	0x42, 0x31, 0x32, 0x42, 0x31, 0x33, 0x42, 0x31,
+	0x34, 0x42, 0x31, 0x35, 0x42, 0x31, 0x36, 0x42,
+	0x31, 0x37, 0x42, 0x31, 0x38, 0x42, 0x31, 0x39,
+	0x42, 0x32, 0x2C, 0x42, 0x32, 0x2E, 0x42, 0x32,
+	0x30, 0x42, 0x32, 0x31, 0x42, 0x32, 0x32, 0x42,
+	0x32, 0x33, 0x42, 0x32, 0x34, 0x42, 0x32, 0x35,
+	0x42, 0x32, 0x36, 0x42, 0x32, 0x37, 0x42, 0x32,
+	// Bytes 18c0 - 18ff
+	0x38, 0x42, 0x32, 0x39, 0x42, 0x33, 0x2C, 0x42,
+	0x33, 0x2E, 0x42, 0x33, 0x30, 0x42, 0x33, 0x31,
+	0x42, 0x33, 0x32, 0x42, 0x33, 0x33, 0x42, 0x33,
+	0x34, 0x42, 0x33, 0x35, 0x42, 0x33, 0x36, 0x42,
+	0x33, 0x37, 0x42, 0x33, 0x38, 0x42, 0x33, 0x39,
+	0x42, 0x34, 0x2C, 0x42, 0x34, 0x2E, 0x42, 0x34,
+	0x30, 0x42, 0x34, 0x31, 0x42, 0x34, 0x32, 0x42,
+	0x34, 0x33, 0x42, 0x34, 0x34, 0x42, 0x34, 0x35,
+	// Bytes 1900 - 193f
+	0x42, 0x34, 0x36, 0x42, 0x34, 0x37, 0x42, 0x34,
+	0x38, 0x42, 0x34, 0x39, 0x42, 0x35, 0x2C, 0x42,
+	0x35, 0x2E, 0x42, 0x35, 0x30, 0x42, 0x36, 0x2C,
+	0x42, 0x36, 0x2E, 0x42, 0x37, 0x2C, 0x42, 0x37,
+	0x2E, 0x42, 0x38, 0x2C, 0x42, 0x38, 0x2E, 0x42,
+	0x39, 0x2C, 0x42, 0x39, 0x2E, 0x42, 0x3D, 0x3D,
+	0x42, 0x3F, 0x21, 0x42, 0x3F, 0x3F, 0x42, 0x41,
+	0x55, 0x42, 0x42, 0x71, 0x42, 0x43, 0x44, 0x42,
+	// Bytes 1940 - 197f
+	0x44, 0x4A, 0x42, 0x44, 0x5A, 0x42, 0x44, 0x7A,
+	0x42, 0x47, 0x42, 0x42, 0x47, 0x79, 0x42, 0x48,
+	0x50, 0x42, 0x48, 0x56, 0x42, 0x48, 0x67, 0x42,
+	0x48, 0x7A, 0x42, 0x49, 0x49, 0x42, 0x49, 0x4A,
+	0x42, 0x49, 0x55, 0x42, 0x49, 0x56, 0x42, 0x49,
+	0x58, 0x42, 0x4B, 0x42, 0x42, 0x4B, 0x4B, 0x42,
+	0x4B, 0x4D, 0x42, 0x4C, 0x4A, 0x42, 0x4C, 0x6A,
+	0x42, 0x4D, 0x42, 0x42, 0x4D, 0x43, 0x42, 0x4D,
+	// Bytes 1980 - 19bf
+	0x44, 0x42, 0x4D, 0x56, 0x42, 0x4D, 0x57, 0x42,
+	0x4E, 0x4A, 0x42, 0x4E, 0x6A, 0x42, 0x4E, 0x6F,
+	0x42, 0x50, 0x48, 0x42, 0x50, 0x52, 0x42, 0x50,
+	0x61, 0x42, 0x52, 0x73, 0x42, 0x53, 0x44, 0x42,
+	0x53, 0x4D, 0x42, 0x53, 0x53, 0x42, 0x53, 0x76,
+	0x42, 0x54, 0x4D, 0x42, 0x56, 0x49, 0x42, 0x57,
+	0x43, 0x42, 0x57, 0x5A, 0x42, 0x57, 0x62, 0x42,
+	0x58, 0x49, 0x42, 0x63, 0x63, 0x42, 0x63, 0x64,
+	// Bytes 19c0 - 19ff
+	0x42, 0x63, 0x6D, 0x42, 0x64, 0x42, 0x42, 0x64,
+	0x61, 0x42, 0x64, 0x6C, 0x42, 0x64, 0x6D, 0x42,
+	0x64, 0x7A, 0x42, 0x65, 0x56, 0x42, 0x66, 0x66,
+	0x42, 0x66, 0x69, 0x42, 0x66, 0x6C, 0x42, 0x66,
+	0x6D, 0x42, 0x68, 0x61, 0x42, 0x69, 0x69, 0x42,
+	0x69, 0x6A, 0x42, 0x69, 0x6E, 0x42, 0x69, 0x76,
+	0x42, 0x69, 0x78, 0x42, 0x6B, 0x41, 0x42, 0x6B,
+	0x56, 0x42, 0x6B, 0x57, 0x42, 0x6B, 0x67, 0x42,
+	// Bytes 1a00 - 1a3f
+	0x6B, 0x6C, 0x42, 0x6B, 0x6D, 0x42, 0x6B, 0x74,
+	0x42, 0x6C, 0x6A, 0x42, 0x6C, 0x6D, 0x42, 0x6C,
+	0x6E, 0x42, 0x6C, 0x78, 0x42, 0x6D, 0x32, 0x42,
+	0x6D, 0x33, 0x42, 0x6D, 0x41, 0x42, 0x6D, 0x56,
+	0x42, 0x6D, 0x57, 0x42, 0x6D, 0x62, 0x42, 0x6D,
+	0x67, 0x42, 0x6D, 0x6C, 0x42, 0x6D, 0x6D, 0x42,
+	0x6D, 0x73, 0x42, 0x6E, 0x41, 0x42, 0x6E, 0x46,
+	0x42, 0x6E, 0x56, 0x42, 0x6E, 0x57, 0x42, 0x6E,
+	// Bytes 1a40 - 1a7f
+	0x6A, 0x42, 0x6E, 0x6D, 0x42, 0x6E, 0x73, 0x42,
+	0x6F, 0x56, 0x42, 0x70, 0x41, 0x42, 0x70, 0x46,
+	0x42, 0x70, 0x56, 0x42, 0x70, 0x57, 0x42, 0x70,
+	0x63, 0x42, 0x70, 0x73, 0x42, 0x73, 0x72, 0x42,
+	0x73, 0x74, 0x42, 0x76, 0x69, 0x42, 0x78, 0x69,
+	0x43, 0x28, 0x31, 0x29, 0x43, 0x28, 0x32, 0x29,
+	0x43, 0x28, 0x33, 0x29, 0x43, 0x28, 0x34, 0x29,
+	0x43, 0x28, 0x35, 0x29, 0x43, 0x28, 0x36, 0x29,
+	// Bytes 1a80 - 1abf
+	0x43, 0x28, 0x37, 0x29, 0x43, 0x28, 0x38, 0x29,
+	0x43, 0x28, 0x39, 0x29, 0x43, 0x28, 0x41, 0x29,
+	0x43, 0x28, 0x42, 0x29, 0x43, 0x28, 0x43, 0x29,
+	0x43, 0x28, 0x44, 0x29, 0x43, 0x28, 0x45, 0x29,
+	0x43, 0x28, 0x46, 0x29, 0x43, 0x28, 0x47, 0x29,
+	0x43, 0x28, 0x48, 0x29, 0x43, 0x28, 0x49, 0x29,
+	0x43, 0x28, 0x4A, 0x29, 0x43, 0x28, 0x4B, 0x29,
+	0x43, 0x28, 0x4C, 0x29, 0x43, 0x28, 0x4D, 0x29,
+	// Bytes 1ac0 - 1aff
+	0x43, 0x28, 0x4E, 0x29, 0x43, 0x28, 0x4F, 0x29,
+	0x43, 0x28, 0x50, 0x29, 0x43, 0x28, 0x51, 0x29,
+	0x43, 0x28, 0x52, 0x29, 0x43, 0x28, 0x53, 0x29,
+	0x43, 0x28, 0x54, 0x29, 0x43, 0x28, 0x55, 0x29,
+	0x43, 0x28, 0x56, 0x29, 0x43, 0x28, 0x57, 0x29,
+	0x43, 0x28, 0x58, 0x29, 0x43, 0x28, 0x59, 0x29,
+	0x43, 0x28, 0x5A, 0x29, 0x43, 0x28, 0x61, 0x29,
+	0x43, 0x28, 0x62, 0x29, 0x43, 0x28, 0x63, 0x29,
+	// Bytes 1b00 - 1b3f
+	0x43, 0x28, 0x64, 0x29, 0x43, 0x28, 0x65, 0x29,
+	0x43, 0x28, 0x66, 0x29, 0x43, 0x28, 0x67, 0x29,
+	0x43, 0x28, 0x68, 0x29, 0x43, 0x28, 0x69, 0x29,
+	0x43, 0x28, 0x6A, 0x29, 0x43, 0x28, 0x6B, 0x29,
+	0x43, 0x28, 0x6C, 0x29, 0x43, 0x28, 0x6D, 0x29,
+	0x43, 0x28, 0x6E, 0x29, 0x43, 0x28, 0x6F, 0x29,
+	0x43, 0x28, 0x70, 0x29, 0x43, 0x28, 0x71, 0x29,
+	0x43, 0x28, 0x72, 0x29, 0x43, 0x28, 0x73, 0x29,
+	// Bytes 1b40 - 1b7f
+	0x43, 0x28, 0x74, 0x29, 0x43, 0x28, 0x75, 0x29,
+	0x43, 0x28, 0x76, 0x29, 0x43, 0x28, 0x77, 0x29,
+	0x43, 0x28, 0x78, 0x29, 0x43, 0x28, 0x79, 0x29,
+	0x43, 0x28, 0x7A, 0x29, 0x43, 0x2E, 0x2E, 0x2E,
+	0x43, 0x31, 0x30, 0x2E, 0x43, 0x31, 0x31, 0x2E,
+	0x43, 0x31, 0x32, 0x2E, 0x43, 0x31, 0x33, 0x2E,
+	0x43, 0x31, 0x34, 0x2E, 0x43, 0x31, 0x35, 0x2E,
+	0x43, 0x31, 0x36, 0x2E, 0x43, 0x31, 0x37, 0x2E,
+	// Bytes 1b80 - 1bbf
+	0x43, 0x31, 0x38, 0x2E, 0x43, 0x31, 0x39, 0x2E,
+	0x43, 0x32, 0x30, 0x2E, 0x43, 0x3A, 0x3A, 0x3D,
+	0x43, 0x3D, 0x3D, 0x3D, 0x43, 0x43, 0x6F, 0x2E,
+	0x43, 0x46, 0x41, 0x58, 0x43, 0x47, 0x48, 0x7A,
+	0x43, 0x47, 0x50, 0x61, 0x43, 0x49, 0x49, 0x49,
+	0x43, 0x4C, 0x54, 0x44, 0x43, 0x4C, 0xC2, 0xB7,
+	0x43, 0x4D, 0x48, 0x7A, 0x43, 0x4D, 0x50, 0x61,
+	0x43, 0x4D, 0xCE, 0xA9, 0x43, 0x50, 0x50, 0x4D,
+	// Bytes 1bc0 - 1bff
+	0x43, 0x50, 0x50, 0x56, 0x43, 0x50, 0x54, 0x45,
+	0x43, 0x54, 0x45, 0x4C, 0x43, 0x54, 0x48, 0x7A,
+	0x43, 0x56, 0x49, 0x49, 0x43, 0x58, 0x49, 0x49,
+	0x43, 0x61, 0x2F, 0x63, 0x43, 0x61, 0x2F, 0x73,
+	0x43, 0x61, 0xCA, 0xBE, 0x43, 0x62, 0x61, 0x72,
+	0x43, 0x63, 0x2F, 0x6F, 0x43, 0x63, 0x2F, 0x75,
+	0x43, 0x63, 0x61, 0x6C, 0x43, 0x63, 0x6D, 0x32,
+	0x43, 0x63, 0x6D, 0x33, 0x43, 0x64, 0x6D, 0x32,
+	// Bytes 1c00 - 1c3f
+	0x43, 0x64, 0x6D, 0x33, 0x43, 0x65, 0x72, 0x67,
+	0x43, 0x66, 0x66, 0x69, 0x43, 0x66, 0x66, 0x6C,
+	0x43, 0x67, 0x61, 0x6C, 0x43, 0x68, 0x50, 0x61,
+	0x43, 0x69, 0x69, 0x69, 0x43, 0x6B, 0x48, 0x7A,
+	0x43, 0x6B, 0x50, 0x61, 0x43, 0x6B, 0x6D, 0x32,
+	0x43, 0x6B, 0x6D, 0x33, 0x43, 0x6B, 0xCE, 0xA9,
+	0x43, 0x6C, 0x6F, 0x67, 0x43, 0x6C, 0xC2, 0xB7,
+	0x43, 0x6D, 0x69, 0x6C, 0x43, 0x6D, 0x6D, 0x32,
+	// Bytes 1c40 - 1c7f
+	0x43, 0x6D, 0x6D, 0x33, 0x43, 0x6D, 0x6F, 0x6C,
+	0x43, 0x72, 0x61, 0x64, 0x43, 0x76, 0x69, 0x69,
+	0x43, 0x78, 0x69, 0x69, 0x43, 0xC2, 0xB0, 0x43,
+	0x43, 0xC2, 0xB0, 0x46, 0x43, 0xCA, 0xBC, 0x6E,
+	0x43, 0xCE, 0xBC, 0x41, 0x43, 0xCE, 0xBC, 0x46,
+	0x43, 0xCE, 0xBC, 0x56, 0x43, 0xCE, 0xBC, 0x57,
+	0x43, 0xCE, 0xBC, 0x67, 0x43, 0xCE, 0xBC, 0x6C,
+	0x43, 0xCE, 0xBC, 0x6D, 0x43, 0xCE, 0xBC, 0x73,
+	// Bytes 1c80 - 1cbf
+	0x44, 0x28, 0x31, 0x30, 0x29, 0x44, 0x28, 0x31,
+	0x31, 0x29, 0x44, 0x28, 0x31, 0x32, 0x29, 0x44,
+	0x28, 0x31, 0x33, 0x29, 0x44, 0x28, 0x31, 0x34,
+	0x29, 0x44, 0x28, 0x31, 0x35, 0x29, 0x44, 0x28,
+	0x31, 0x36, 0x29, 0x44, 0x28, 0x31, 0x37, 0x29,
+	0x44, 0x28, 0x31, 0x38, 0x29, 0x44, 0x28, 0x31,
+	0x39, 0x29, 0x44, 0x28, 0x32, 0x30, 0x29, 0x44,
+	0x30, 0xE7, 0x82, 0xB9, 0x44, 0x31, 0xE2, 0x81,
+	// Bytes 1cc0 - 1cff
+	0x84, 0x44, 0x31, 0xE6, 0x97, 0xA5, 0x44, 0x31,
+	0xE6, 0x9C, 0x88, 0x44, 0x31, 0xE7, 0x82, 0xB9,
+	0x44, 0x32, 0xE6, 0x97, 0xA5, 0x44, 0x32, 0xE6,
+	0x9C, 0x88, 0x44, 0x32, 0xE7, 0x82, 0xB9, 0x44,
+	0x33, 0xE6, 0x97, 0xA5, 0x44, 0x33, 0xE6, 0x9C,
+	0x88, 0x44, 0x33, 0xE7, 0x82, 0xB9, 0x44, 0x34,
+	0xE6, 0x97, 0xA5, 0x44, 0x34, 0xE6, 0x9C, 0x88,
+	0x44, 0x34, 0xE7, 0x82, 0xB9, 0x44, 0x35, 0xE6,
+	// Bytes 1d00 - 1d3f
+	0x97, 0xA5, 0x44, 0x35, 0xE6, 0x9C, 0x88, 0x44,
+	0x35, 0xE7, 0x82, 0xB9, 0x44, 0x36, 0xE6, 0x97,
+	0xA5, 0x44, 0x36, 0xE6, 0x9C, 0x88, 0x44, 0x36,
+	0xE7, 0x82, 0xB9, 0x44, 0x37, 0xE6, 0x97, 0xA5,
+	0x44, 0x37, 0xE6, 0x9C, 0x88, 0x44, 0x37, 0xE7,
+	0x82, 0xB9, 0x44, 0x38, 0xE6, 0x97, 0xA5, 0x44,
+	0x38, 0xE6, 0x9C, 0x88, 0x44, 0x38, 0xE7, 0x82,
+	0xB9, 0x44, 0x39, 0xE6, 0x97, 0xA5, 0x44, 0x39,
+	// Bytes 1d40 - 1d7f
+	0xE6, 0x9C, 0x88, 0x44, 0x39, 0xE7, 0x82, 0xB9,
+	0x44, 0x56, 0x49, 0x49, 0x49, 0x44, 0x61, 0x2E,
+	0x6D, 0x2E, 0x44, 0x6B, 0x63, 0x61, 0x6C, 0x44,
+	0x70, 0x2E, 0x6D, 0x2E, 0x44, 0x76, 0x69, 0x69,
+	0x69, 0x44, 0xD5, 0xA5, 0xD6, 0x82, 0x44, 0xD5,
+	0xB4, 0xD5, 0xA5, 0x44, 0xD5, 0xB4, 0xD5, 0xAB,
+	0x44, 0xD5, 0xB4, 0xD5, 0xAD, 0x44, 0xD5, 0xB4,
+	0xD5, 0xB6, 0x44, 0xD5, 0xBE, 0xD5, 0xB6, 0x44,
+	// Bytes 1d80 - 1dbf
+	0xD7, 0x90, 0xD7, 0x9C, 0x44, 0xD8, 0xA7, 0xD9,
+	0xB4, 0x44, 0xD8, 0xA8, 0xD8, 0xAC, 0x44, 0xD8,
+	0xA8, 0xD8, 0xAD, 0x44, 0xD8, 0xA8, 0xD8, 0xAE,
+	0x44, 0xD8, 0xA8, 0xD8, 0xB1, 0x44, 0xD8, 0xA8,
+	0xD8, 0xB2, 0x44, 0xD8, 0xA8, 0xD9, 0x85, 0x44,
+	0xD8, 0xA8, 0xD9, 0x86, 0x44, 0xD8, 0xA8, 0xD9,
+	0x87, 0x44, 0xD8, 0xA8, 0xD9, 0x89, 0x44, 0xD8,
+	0xA8, 0xD9, 0x8A, 0x44, 0xD8, 0xAA, 0xD8, 0xAC,
+	// Bytes 1dc0 - 1dff
+	0x44, 0xD8, 0xAA, 0xD8, 0xAD, 0x44, 0xD8, 0xAA,
+	0xD8, 0xAE, 0x44, 0xD8, 0xAA, 0xD8, 0xB1, 0x44,
+	0xD8, 0xAA, 0xD8, 0xB2, 0x44, 0xD8, 0xAA, 0xD9,
+	0x85, 0x44, 0xD8, 0xAA, 0xD9, 0x86, 0x44, 0xD8,
+	0xAA, 0xD9, 0x87, 0x44, 0xD8, 0xAA, 0xD9, 0x89,
+	0x44, 0xD8, 0xAA, 0xD9, 0x8A, 0x44, 0xD8, 0xAB,
+	0xD8, 0xAC, 0x44, 0xD8, 0xAB, 0xD8, 0xB1, 0x44,
+	0xD8, 0xAB, 0xD8, 0xB2, 0x44, 0xD8, 0xAB, 0xD9,
+	// Bytes 1e00 - 1e3f
+	0x85, 0x44, 0xD8, 0xAB, 0xD9, 0x86, 0x44, 0xD8,
+	0xAB, 0xD9, 0x87, 0x44, 0xD8, 0xAB, 0xD9, 0x89,
+	0x44, 0xD8, 0xAB, 0xD9, 0x8A, 0x44, 0xD8, 0xAC,
+	0xD8, 0xAD, 0x44, 0xD8, 0xAC, 0xD9, 0x85, 0x44,
+	0xD8, 0xAC, 0xD9, 0x89, 0x44, 0xD8, 0xAC, 0xD9,
+	0x8A, 0x44, 0xD8, 0xAD, 0xD8, 0xAC, 0x44, 0xD8,
+	0xAD, 0xD9, 0x85, 0x44, 0xD8, 0xAD, 0xD9, 0x89,
+	0x44, 0xD8, 0xAD, 0xD9, 0x8A, 0x44, 0xD8, 0xAE,
+	// Bytes 1e40 - 1e7f
+	0xD8, 0xAC, 0x44, 0xD8, 0xAE, 0xD8, 0xAD, 0x44,
+	0xD8, 0xAE, 0xD9, 0x85, 0x44, 0xD8, 0xAE, 0xD9,
+	0x89, 0x44, 0xD8, 0xAE, 0xD9, 0x8A, 0x44, 0xD8,
+	0xB3, 0xD8, 0xAC, 0x44, 0xD8, 0xB3, 0xD8, 0xAD,
+	0x44, 0xD8, 0xB3, 0xD8, 0xAE, 0x44, 0xD8, 0xB3,
+	0xD8, 0xB1, 0x44, 0xD8, 0xB3, 0xD9, 0x85, 0x44,
+	0xD8, 0xB3, 0xD9, 0x87, 0x44, 0xD8, 0xB3, 0xD9,
+	0x89, 0x44, 0xD8, 0xB3, 0xD9, 0x8A, 0x44, 0xD8,
+	// Bytes 1e80 - 1ebf
+	0xB4, 0xD8, 0xAC, 0x44, 0xD8, 0xB4, 0xD8, 0xAD,
+	0x44, 0xD8, 0xB4, 0xD8, 0xAE, 0x44, 0xD8, 0xB4,
+	0xD8, 0xB1, 0x44, 0xD8, 0xB4, 0xD9, 0x85, 0x44,
+	0xD8, 0xB4, 0xD9, 0x87, 0x44, 0xD8, 0xB4, 0xD9,
+	0x89, 0x44, 0xD8, 0xB4, 0xD9, 0x8A, 0x44, 0xD8,
+	0xB5, 0xD8, 0xAD, 0x44, 0xD8, 0xB5, 0xD8, 0xAE,
+	0x44, 0xD8, 0xB5, 0xD8, 0xB1, 0x44, 0xD8, 0xB5,
+	0xD9, 0x85, 0x44, 0xD8, 0xB5, 0xD9, 0x89, 0x44,
+	// Bytes 1ec0 - 1eff
+	0xD8, 0xB5, 0xD9, 0x8A, 0x44, 0xD8, 0xB6, 0xD8,
+	0xAC, 0x44, 0xD8, 0xB6, 0xD8, 0xAD, 0x44, 0xD8,
+	0xB6, 0xD8, 0xAE, 0x44, 0xD8, 0xB6, 0xD8, 0xB1,
+	0x44, 0xD8, 0xB6, 0xD9, 0x85, 0x44, 0xD8, 0xB6,
+	0xD9, 0x89, 0x44, 0xD8, 0xB6, 0xD9, 0x8A, 0x44,
+	0xD8, 0xB7, 0xD8, 0xAD, 0x44, 0xD8, 0xB7, 0xD9,
+	0x85, 0x44, 0xD8, 0xB7, 0xD9, 0x89, 0x44, 0xD8,
+	0xB7, 0xD9, 0x8A, 0x44, 0xD8, 0xB8, 0xD9, 0x85,
+	// Bytes 1f00 - 1f3f
+	0x44, 0xD8, 0xB9, 0xD8, 0xAC, 0x44, 0xD8, 0xB9,
+	0xD9, 0x85, 0x44, 0xD8, 0xB9, 0xD9, 0x89, 0x44,
+	0xD8, 0xB9, 0xD9, 0x8A, 0x44, 0xD8, 0xBA, 0xD8,
+	0xAC, 0x44, 0xD8, 0xBA, 0xD9, 0x85, 0x44, 0xD8,
+	0xBA, 0xD9, 0x89, 0x44, 0xD8, 0xBA, 0xD9, 0x8A,
+	0x44, 0xD9, 0x81, 0xD8, 0xAC, 0x44, 0xD9, 0x81,
+	0xD8, 0xAD, 0x44, 0xD9, 0x81, 0xD8, 0xAE, 0x44,
+	0xD9, 0x81, 0xD9, 0x85, 0x44, 0xD9, 0x81, 0xD9,
+	// Bytes 1f40 - 1f7f
+	0x89, 0x44, 0xD9, 0x81, 0xD9, 0x8A, 0x44, 0xD9,
+	0x82, 0xD8, 0xAD, 0x44, 0xD9, 0x82, 0xD9, 0x85,
+	0x44, 0xD9, 0x82, 0xD9, 0x89, 0x44, 0xD9, 0x82,
+	0xD9, 0x8A, 0x44, 0xD9, 0x83, 0xD8, 0xA7, 0x44,
+	0xD9, 0x83, 0xD8, 0xAC, 0x44, 0xD9, 0x83, 0xD8,
+	0xAD, 0x44, 0xD9, 0x83, 0xD8, 0xAE, 0x44, 0xD9,
+	0x83, 0xD9, 0x84, 0x44, 0xD9, 0x83, 0xD9, 0x85,
+	0x44, 0xD9, 0x83, 0xD9, 0x89, 0x44, 0xD9, 0x83,
+	// Bytes 1f80 - 1fbf
+	0xD9, 0x8A, 0x44, 0xD9, 0x84, 0xD8, 0xA7, 0x44,
+	0xD9, 0x84, 0xD8, 0xAC, 0x44, 0xD9, 0x84, 0xD8,
+	0xAD, 0x44, 0xD9, 0x84, 0xD8, 0xAE, 0x44, 0xD9,
+	0x84, 0xD9, 0x85, 0x44, 0xD9, 0x84, 0xD9, 0x87,
+	0x44, 0xD9, 0x84, 0xD9, 0x89, 0x44, 0xD9, 0x84,
+	0xD9, 0x8A, 0x44, 0xD9, 0x85, 0xD8, 0xA7, 0x44,
+	0xD9, 0x85, 0xD8, 0xAC, 0x44, 0xD9, 0x85, 0xD8,
+	0xAD, 0x44, 0xD9, 0x85, 0xD8, 0xAE, 0x44, 0xD9,
+	// Bytes 1fc0 - 1fff
+	0x85, 0xD9, 0x85, 0x44, 0xD9, 0x85, 0xD9, 0x89,
+	0x44, 0xD9, 0x85, 0xD9, 0x8A, 0x44, 0xD9, 0x86,
+	0xD8, 0xAC, 0x44, 0xD9, 0x86, 0xD8, 0xAD, 0x44,
+	0xD9, 0x86, 0xD8, 0xAE, 0x44, 0xD9, 0x86, 0xD8,
+	0xB1, 0x44, 0xD9, 0x86, 0xD8, 0xB2, 0x44, 0xD9,
+	0x86, 0xD9, 0x85, 0x44, 0xD9, 0x86, 0xD9, 0x86,
+	0x44, 0xD9, 0x86, 0xD9, 0x87, 0x44, 0xD9, 0x86,
+	0xD9, 0x89, 0x44, 0xD9, 0x86, 0xD9, 0x8A, 0x44,
+	// Bytes 2000 - 203f
+	0xD9, 0x87, 0xD8, 0xAC, 0x44, 0xD9, 0x87, 0xD9,
+	0x85, 0x44, 0xD9, 0x87, 0xD9, 0x89, 0x44, 0xD9,
+	0x87, 0xD9, 0x8A, 0x44, 0xD9, 0x88, 0xD9, 0xB4,
+	0x44, 0xD9, 0x8A, 0xD8, 0xAC, 0x44, 0xD9, 0x8A,
+	0xD8, 0xAD, 0x44, 0xD9, 0x8A, 0xD8, 0xAE, 0x44,
+	0xD9, 0x8A, 0xD8, 0xB1, 0x44, 0xD9, 0x8A, 0xD8,
+	0xB2, 0x44, 0xD9, 0x8A, 0xD9, 0x85, 0x44, 0xD9,
+	0x8A, 0xD9, 0x86, 0x44, 0xD9, 0x8A, 0xD9, 0x87,
+	// Bytes 2040 - 207f
+	0x44, 0xD9, 0x8A, 0xD9, 0x89, 0x44, 0xD9, 0x8A,
+	0xD9, 0x8A, 0x44, 0xD9, 0x8A, 0xD9, 0xB4, 0x44,
+	0xDB, 0x87, 0xD9, 0xB4, 0x45, 0x28, 0xE1, 0x84,
+	0x80, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x82, 0x29,
+	0x45, 0x28, 0xE1, 0x84, 0x83, 0x29, 0x45, 0x28,
+	0xE1, 0x84, 0x85, 0x29, 0x45, 0x28, 0xE1, 0x84,
+	0x86, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x87, 0x29,
+	0x45, 0x28, 0xE1, 0x84, 0x89, 0x29, 0x45, 0x28,
+	// Bytes 2080 - 20bf
+	0xE1, 0x84, 0x8B, 0x29, 0x45, 0x28, 0xE1, 0x84,
+	0x8C, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x8E, 0x29,
+	0x45, 0x28, 0xE1, 0x84, 0x8F, 0x29, 0x45, 0x28,
+	0xE1, 0x84, 0x90, 0x29, 0x45, 0x28, 0xE1, 0x84,
+	0x91, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x92, 0x29,
+	0x45, 0x28, 0xE4, 0xB8, 0x80, 0x29, 0x45, 0x28,
+	0xE4, 0xB8, 0x83, 0x29, 0x45, 0x28, 0xE4, 0xB8,
+	0x89, 0x29, 0x45, 0x28, 0xE4, 0xB9, 0x9D, 0x29,
+	// Bytes 20c0 - 20ff
+	0x45, 0x28, 0xE4, 0xBA, 0x8C, 0x29, 0x45, 0x28,
+	0xE4, 0xBA, 0x94, 0x29, 0x45, 0x28, 0xE4, 0xBB,
+	0xA3, 0x29, 0x45, 0x28, 0xE4, 0xBC, 0x81, 0x29,
+	0x45, 0x28, 0xE4, 0xBC, 0x91, 0x29, 0x45, 0x28,
+	0xE5, 0x85, 0xAB, 0x29, 0x45, 0x28, 0xE5, 0x85,
+	0xAD, 0x29, 0x45, 0x28, 0xE5, 0x8A, 0xB4, 0x29,
+	0x45, 0x28, 0xE5, 0x8D, 0x81, 0x29, 0x45, 0x28,
+	0xE5, 0x8D, 0x94, 0x29, 0x45, 0x28, 0xE5, 0x90,
+	// Bytes 2100 - 213f
+	0x8D, 0x29, 0x45, 0x28, 0xE5, 0x91, 0xBC, 0x29,
+	0x45, 0x28, 0xE5, 0x9B, 0x9B, 0x29, 0x45, 0x28,
+	0xE5, 0x9C, 0x9F, 0x29, 0x45, 0x28, 0xE5, 0xAD,
+	0xA6, 0x29, 0x45, 0x28, 0xE6, 0x97, 0xA5, 0x29,
+	0x45, 0x28, 0xE6, 0x9C, 0x88, 0x29, 0x45, 0x28,
+	0xE6, 0x9C, 0x89, 0x29, 0x45, 0x28, 0xE6, 0x9C,
+	0xA8, 0x29, 0x45, 0x28, 0xE6, 0xA0, 0xAA, 0x29,
+	0x45, 0x28, 0xE6, 0xB0, 0xB4, 0x29, 0x45, 0x28,
+	// Bytes 2140 - 217f
+	0xE7, 0x81, 0xAB, 0x29, 0x45, 0x28, 0xE7, 0x89,
+	0xB9, 0x29, 0x45, 0x28, 0xE7, 0x9B, 0xA3, 0x29,
+	0x45, 0x28, 0xE7, 0xA4, 0xBE, 0x29, 0x45, 0x28,
+	0xE7, 0xA5, 0x9D, 0x29, 0x45, 0x28, 0xE7, 0xA5,
+	0xAD, 0x29, 0x45, 0x28, 0xE8, 0x87, 0xAA, 0x29,
+	0x45, 0x28, 0xE8, 0x87, 0xB3, 0x29, 0x45, 0x28,
+	0xE8, 0xB2, 0xA1, 0x29, 0x45, 0x28, 0xE8, 0xB3,
+	0x87, 0x29, 0x45, 0x28, 0xE9, 0x87, 0x91, 0x29,
+	// Bytes 2180 - 21bf
+	0x45, 0x30, 0xE2, 0x81, 0x84, 0x33, 0x45, 0x31,
+	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x31, 0x30, 0xE6,
+	0x9C, 0x88, 0x45, 0x31, 0x30, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x31, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	0x31, 0xE6, 0x9C, 0x88, 0x45, 0x31, 0x31, 0xE7,
+	0x82, 0xB9, 0x45, 0x31, 0x32, 0xE6, 0x97, 0xA5,
+	0x45, 0x31, 0x32, 0xE6, 0x9C, 0x88, 0x45, 0x31,
+	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x33, 0xE6,
+	// Bytes 21c0 - 21ff
+	0x97, 0xA5, 0x45, 0x31, 0x33, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x35, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x35, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x36, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	0x36, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x37, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x37, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0x38, 0xE6, 0x97, 0xA5, 0x45, 0x31,
+	// Bytes 2200 - 223f
+	0x38, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x39, 0xE6,
+	0x97, 0xA5, 0x45, 0x31, 0x39, 0xE7, 0x82, 0xB9,
+	0x45, 0x31, 0xE2, 0x81, 0x84, 0x32, 0x45, 0x31,
+	0xE2, 0x81, 0x84, 0x33, 0x45, 0x31, 0xE2, 0x81,
+	0x84, 0x34, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x35,
+	0x45, 0x31, 0xE2, 0x81, 0x84, 0x36, 0x45, 0x31,
+	0xE2, 0x81, 0x84, 0x37, 0x45, 0x31, 0xE2, 0x81,
+	0x84, 0x38, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x39,
+	// Bytes 2240 - 227f
+	0x45, 0x32, 0x30, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x30, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x31, 0xE6,
+	0x97, 0xA5, 0x45, 0x32, 0x31, 0xE7, 0x82, 0xB9,
+	0x45, 0x32, 0x32, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x33, 0xE6,
+	0x97, 0xA5, 0x45, 0x32, 0x33, 0xE7, 0x82, 0xB9,
+	0x45, 0x32, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x35, 0xE6,
+	// Bytes 2280 - 22bf
+	0x97, 0xA5, 0x45, 0x32, 0x36, 0xE6, 0x97, 0xA5,
+	0x45, 0x32, 0x37, 0xE6, 0x97, 0xA5, 0x45, 0x32,
+	0x38, 0xE6, 0x97, 0xA5, 0x45, 0x32, 0x39, 0xE6,
+	0x97, 0xA5, 0x45, 0x32, 0xE2, 0x81, 0x84, 0x33,
+	0x45, 0x32, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
+	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x33, 0x31, 0xE6,
+	0x97, 0xA5, 0x45, 0x33, 0xE2, 0x81, 0x84, 0x34,
+	0x45, 0x33, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
+	// Bytes 22c0 - 22ff
+	0xE2, 0x81, 0x84, 0x38, 0x45, 0x34, 0xE2, 0x81,
+	0x84, 0x35, 0x45, 0x35, 0xE2, 0x81, 0x84, 0x36,
+	0x45, 0x35, 0xE2, 0x81, 0x84, 0x38, 0x45, 0x37,
+	0xE2, 0x81, 0x84, 0x38, 0x45, 0x41, 0xE2, 0x88,
+	0x95, 0x6D, 0x45, 0x56, 0xE2, 0x88, 0x95, 0x6D,
+	0x45, 0x6D, 0xE2, 0x88, 0x95, 0x73, 0x46, 0x31,
+	0xE2, 0x81, 0x84, 0x31, 0x30, 0x46, 0x43, 0xE2,
+	0x88, 0x95, 0x6B, 0x67, 0x46, 0x6D, 0xE2, 0x88,
+	// Bytes 2300 - 233f
+	0x95, 0x73, 0x32, 0x46, 0xD8, 0xA8, 0xD8, 0xAD,
+	0xD9, 0x8A, 0x46, 0xD8, 0xA8, 0xD8, 0xAE, 0xD9,
+	0x8A, 0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x85,
+	0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x89, 0x46,
+	0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
+	0xAA, 0xD8, 0xAD, 0xD8, 0xAC, 0x46, 0xD8, 0xAA,
+	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8,
+	0xAE, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8, 0xAE,
+	// Bytes 2340 - 237f
+	0xD9, 0x89, 0x46, 0xD8, 0xAA, 0xD8, 0xAE, 0xD9,
+	0x8A, 0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAC,
+	0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAD, 0x46,
+	0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAE, 0x46, 0xD8,
+	0xAA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAA,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD8,
+	0xAD, 0xD9, 0x89, 0x46, 0xD8, 0xAC, 0xD8, 0xAD,
+	0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD8,
+	// Bytes 2380 - 23bf
+	0xAD, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x89,
+	0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
+	0xD8, 0xAD, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
+	0xAD, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAD,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB3, 0xD8,
+	0xAC, 0xD8, 0xAD, 0x46, 0xD8, 0xB3, 0xD8, 0xAC,
+	0xD9, 0x89, 0x46, 0xD8, 0xB3, 0xD8, 0xAD, 0xD8,
+	0xAC, 0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x89,
+	// Bytes 23c0 - 23ff
+	0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x8A, 0x46,
+	0xD8, 0xB3, 0xD9, 0x85, 0xD8, 0xAC, 0x46, 0xD8,
+	0xB3, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8, 0xB3,
+	0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8,
+	0xAC, 0xD9, 0x8A, 0x46, 0xD8, 0xB4, 0xD8, 0xAD,
+	0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8, 0xAD, 0xD9,
+	0x8A, 0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD8, 0xAE,
+	0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD9, 0x85, 0x46,
+	// Bytes 2400 - 243f
+	0xD8, 0xB5, 0xD8, 0xAD, 0xD8, 0xAD, 0x46, 0xD8,
+	0xB5, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD8, 0xB5,
+	0xD9, 0x84, 0xD9, 0x89, 0x46, 0xD8, 0xB5, 0xD9,
+	0x84, 0xDB, 0x92, 0x46, 0xD8, 0xB5, 0xD9, 0x85,
+	0xD9, 0x85, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9,
+	0x89, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9, 0x8A,
+	0x46, 0xD8, 0xB6, 0xD8, 0xAE, 0xD9, 0x85, 0x46,
+	0xD8, 0xB7, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8,
+	// Bytes 2440 - 247f
+	0xB7, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB7,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB9, 0xD8,
+	0xAC, 0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85,
+	0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9,
+	0x89, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9, 0x8A,
+	0x46, 0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x85, 0x46,
+	0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8,
+	0xBA, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x81,
+	// Bytes 2480 - 24bf
+	0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x81, 0xD9,
+	0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x82, 0xD9, 0x84,
+	0xDB, 0x92, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD8,
+	0xAD, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x85,
+	0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
+	0xD9, 0x83, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
+	0x83, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x84,
+	0xD8, 0xAC, 0xD8, 0xAC, 0x46, 0xD9, 0x84, 0xD8,
+	// Bytes 24c0 - 24ff
+	0xAC, 0xD9, 0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAC,
+	0xD9, 0x8A, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9,
+	0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x89,
+	0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x8A, 0x46,
+	0xD9, 0x84, 0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9,
+	0x84, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD9, 0x84,
+	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD8,
+	0xAC, 0xD8, 0xAD, 0x46, 0xD9, 0x85, 0xD8, 0xAC,
+	// Bytes 2500 - 253f
+	0xD8, 0xAE, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9,
+	0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9, 0x8A,
+	0x46, 0xD9, 0x85, 0xD8, 0xAD, 0xD8, 0xAC, 0x46,
+	0xD9, 0x85, 0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9,
+	0x85, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x85,
+	0xD8, 0xAE, 0xD8, 0xAC, 0x46, 0xD9, 0x85, 0xD8,
+	0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAE,
+	0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD9, 0x85, 0xD9,
+	// Bytes 2540 - 257f
+	0x8A, 0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD8, 0xAD,
+	0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x85, 0x46,
+	0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x89, 0x46, 0xD9,
+	0x86, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x86,
+	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9, 0x86, 0xD8,
+	0xAD, 0xD9, 0x89, 0x46, 0xD9, 0x86, 0xD8, 0xAD,
+	0xD9, 0x8A, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9,
+	0x89, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9, 0x8A,
+	// Bytes 2580 - 25bf
+	0x46, 0xD9, 0x87, 0xD9, 0x85, 0xD8, 0xAC, 0x46,
+	0xD9, 0x87, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
+	0x8A, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x8A,
+	0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9,
+	0x85, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x85,
+	0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8,
+	0xA7, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAC,
+	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAD, 0x46,
+	// Bytes 25c0 - 25ff
+	0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAE, 0x46, 0xD9,
+	0x8A, 0xD9, 0x94, 0xD8, 0xB1, 0x46, 0xD9, 0x8A,
+	0xD9, 0x94, 0xD8, 0xB2, 0x46, 0xD9, 0x8A, 0xD9,
+	0x94, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
+	0xD9, 0x86, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9,
+	0x87, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x88,
+	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x89, 0x46,
+	0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x8A, 0x46, 0xD9,
+	// Bytes 2600 - 263f
+	0x8A, 0xD9, 0x94, 0xDB, 0x86, 0x46, 0xD9, 0x8A,
+	0xD9, 0x94, 0xDB, 0x87, 0x46, 0xD9, 0x8A, 0xD9,
+	0x94, 0xDB, 0x88, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
+	0xDB, 0x90, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xDB,
+	0x95, 0x46, 0xE0, 0xB9, 0x8D, 0xE0, 0xB8, 0xB2,
+	0x46, 0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0x99, 0x46,
+	0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0xA1, 0x46, 0xE0,
+	0xBB, 0x8D, 0xE0, 0xBA, 0xB2, 0x46, 0xE0, 0xBD,
+	// Bytes 2640 - 267f
+	0x80, 0xE0, 0xBE, 0xB5, 0x46, 0xE0, 0xBD, 0x82,
+	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x8C, 0xE0,
+	0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x91, 0xE0, 0xBE,
+	0xB7, 0x46, 0xE0, 0xBD, 0x96, 0xE0, 0xBE, 0xB7,
+	0x46, 0xE0, 0xBD, 0x9B, 0xE0, 0xBE, 0xB7, 0x46,
+	0xE0, 0xBE, 0x90, 0xE0, 0xBE, 0xB5, 0x46, 0xE0,
+	0xBE, 0x92, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE,
+	0x9C, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA1,
+	// Bytes 2680 - 26bf
+	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA6, 0xE0,
+	0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xAB, 0xE0, 0xBE,
+	0xB7, 0x46, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
+	0x46, 0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0x46,
+	0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB, 0x46, 0xE2,
+	0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x46, 0xE3, 0x81,
+	0xBB, 0xE3, 0x81, 0x8B, 0x46, 0xE3, 0x82, 0x88,
+	0xE3, 0x82, 0x8A, 0x46, 0xE3, 0x82, 0xAD, 0xE3,
+	// Bytes 26c0 - 26ff
+	0x83, 0xAD, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x82,
+	0xB3, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x83, 0x88,
+	0x46, 0xE3, 0x83, 0x88, 0xE3, 0x83, 0xB3, 0x46,
+	0xE3, 0x83, 0x8A, 0xE3, 0x83, 0x8E, 0x46, 0xE3,
+	0x83, 0x9B, 0xE3, 0x83, 0xB3, 0x46, 0xE3, 0x83,
+	0x9F, 0xE3, 0x83, 0xAA, 0x46, 0xE3, 0x83, 0xAA,
+	0xE3, 0x83, 0xA9, 0x46, 0xE3, 0x83, 0xAC, 0xE3,
+	0x83, 0xA0, 0x46, 0xE5, 0xA4, 0xA7, 0xE6, 0xAD,
+	// Bytes 2700 - 273f
+	0xA3, 0x46, 0xE5, 0xB9, 0xB3, 0xE6, 0x88, 0x90,
+	0x46, 0xE6, 0x98, 0x8E, 0xE6, 0xB2, 0xBB, 0x46,
+	0xE6, 0x98, 0xAD, 0xE5, 0x92, 0x8C, 0x47, 0x72,
+	0x61, 0x64, 0xE2, 0x88, 0x95, 0x73, 0x47, 0xE3,
+	0x80, 0x94, 0x53, 0xE3, 0x80, 0x95, 0x48, 0x28,
+	0xE1, 0x84, 0x80, 0xE1, 0x85, 0xA1, 0x29, 0x48,
+	0x28, 0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1, 0x29,
+	0x48, 0x28, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1,
+	// Bytes 2740 - 277f
+	0x29, 0x48, 0x28, 0xE1, 0x84, 0x85, 0xE1, 0x85,
+	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x86, 0xE1,
+	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x87,
+	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84,
+	0x89, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1,
+	0x84, 0x8B, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28,
+	0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xA1, 0x29, 0x48,
+	0x28, 0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xAE, 0x29,
+	// Bytes 2780 - 27bf
+	0x48, 0x28, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1,
+	0x29, 0x48, 0x28, 0xE1, 0x84, 0x8F, 0xE1, 0x85,
+	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x90, 0xE1,
+	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x91,
+	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84,
+	0x92, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x72, 0x61,
+	0x64, 0xE2, 0x88, 0x95, 0x73, 0x32, 0x48, 0xD8,
+	0xA7, 0xD9, 0x83, 0xD8, 0xA8, 0xD8, 0xB1, 0x48,
+	// Bytes 27c0 - 27ff
+	0xD8, 0xA7, 0xD9, 0x84, 0xD9, 0x84, 0xD9, 0x87,
+	0x48, 0xD8, 0xB1, 0xD8, 0xB3, 0xD9, 0x88, 0xD9,
+	0x84, 0x48, 0xD8, 0xB1, 0xDB, 0x8C, 0xD8, 0xA7,
+	0xD9, 0x84, 0x48, 0xD8, 0xB5, 0xD9, 0x84, 0xD8,
+	0xB9, 0xD9, 0x85, 0x48, 0xD8, 0xB9, 0xD9, 0x84,
+	0xD9, 0x8A, 0xD9, 0x87, 0x48, 0xD9, 0x85, 0xD8,
+	0xAD, 0xD9, 0x85, 0xD8, 0xAF, 0x48, 0xD9, 0x88,
+	0xD8, 0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x49, 0xE2,
+	// Bytes 2800 - 283f
+	0x80, 0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
+	0x49, 0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0xE2,
+	0x80, 0xB5, 0x49, 0xE2, 0x88, 0xAB, 0xE2, 0x88,
+	0xAB, 0xE2, 0x88, 0xAB, 0x49, 0xE2, 0x88, 0xAE,
+	0xE2, 0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x49, 0xE3,
+	0x80, 0x94, 0xE4, 0xB8, 0x89, 0xE3, 0x80, 0x95,
+	0x49, 0xE3, 0x80, 0x94, 0xE4, 0xBA, 0x8C, 0xE3,
+	0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE5, 0x8B,
+	// Bytes 2840 - 287f
+	0x9D, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94,
+	0xE5, 0xAE, 0x89, 0xE3, 0x80, 0x95, 0x49, 0xE3,
+	0x80, 0x94, 0xE6, 0x89, 0x93, 0xE3, 0x80, 0x95,
+	0x49, 0xE3, 0x80, 0x94, 0xE6, 0x95, 0x97, 0xE3,
+	0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE6, 0x9C,
+	0xAC, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94,
+	0xE7, 0x82, 0xB9, 0xE3, 0x80, 0x95, 0x49, 0xE3,
+	0x80, 0x94, 0xE7, 0x9B, 0x97, 0xE3, 0x80, 0x95,
+	// Bytes 2880 - 28bf
+	0x49, 0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0xAB, 0x49, 0xE3, 0x82, 0xA4, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x81, 0x49, 0xE3, 0x82, 0xA6,
+	0xE3, 0x82, 0xA9, 0xE3, 0x83, 0xB3, 0x49, 0xE3,
+	0x82, 0xAA, 0xE3, 0x83, 0xB3, 0xE3, 0x82, 0xB9,
+	0x49, 0xE3, 0x82, 0xAA, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0xA0, 0x49, 0xE3, 0x82, 0xAB, 0xE3, 0x82,
+	0xA4, 0xE3, 0x83, 0xAA, 0x49, 0xE3, 0x82, 0xB1,
+	// Bytes 28c0 - 28ff
+	0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xB9, 0x49, 0xE3,
+	0x82, 0xB3, 0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x8A,
+	0x49, 0xE3, 0x82, 0xBB, 0xE3, 0x83, 0xB3, 0xE3,
+	0x83, 0x81, 0x49, 0xE3, 0x82, 0xBB, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x88, 0x49, 0xE3, 0x83, 0x86,
+	0xE3, 0x82, 0x99, 0xE3, 0x82, 0xB7, 0x49, 0xE3,
+	0x83, 0x88, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB,
+	0x49, 0xE3, 0x83, 0x8E, 0xE3, 0x83, 0x83, 0xE3,
+	// Bytes 2900 - 293f
+	0x83, 0x88, 0x49, 0xE3, 0x83, 0x8F, 0xE3, 0x82,
+	0xA4, 0xE3, 0x83, 0x84, 0x49, 0xE3, 0x83, 0x92,
+	0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB, 0x49, 0xE3,
+	0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x82, 0xB3,
+	0x49, 0xE3, 0x83, 0x95, 0xE3, 0x83, 0xA9, 0xE3,
+	0x83, 0xB3, 0x49, 0xE3, 0x83, 0x98, 0xE3, 0x82,
+	0x9A, 0xE3, 0x82, 0xBD, 0x49, 0xE3, 0x83, 0x98,
+	0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x84, 0x49, 0xE3,
+	// Bytes 2940 - 297f
+	0x83, 0x9B, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0xAB,
+	0x49, 0xE3, 0x83, 0x9B, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0xB3, 0x49, 0xE3, 0x83, 0x9E, 0xE3, 0x82,
+	0xA4, 0xE3, 0x83, 0xAB, 0x49, 0xE3, 0x83, 0x9E,
+	0xE3, 0x83, 0x83, 0xE3, 0x83, 0x8F, 0x49, 0xE3,
+	0x83, 0x9E, 0xE3, 0x83, 0xAB, 0xE3, 0x82, 0xAF,
+	0x49, 0xE3, 0x83, 0xA4, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0xAB, 0x49, 0xE3, 0x83, 0xA6, 0xE3, 0x82,
+	// Bytes 2980 - 29bf
+	0xA2, 0xE3, 0x83, 0xB3, 0x49, 0xE3, 0x83, 0xAF,
+	0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88, 0x4C, 0xE2,
+	0x80, 0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
+	0xE2, 0x80, 0xB2, 0x4C, 0xE2, 0x88, 0xAB, 0xE2,
+	0x88, 0xAB, 0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB,
+	0x4C, 0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xAB, 0xE3,
+	0x83, 0x95, 0xE3, 0x82, 0xA1, 0x4C, 0xE3, 0x82,
+	0xA8, 0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xAB, 0xE3,
+	// Bytes 29c0 - 29ff
+	0x83, 0xBC, 0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x82,
+	0x99, 0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xB3, 0x4C,
+	0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x9E, 0x4C, 0xE3, 0x82, 0xAB,
+	0xE3, 0x83, 0xA9, 0xE3, 0x83, 0x83, 0xE3, 0x83,
+	0x88, 0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x83, 0xAD,
+	0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xBC, 0x4C, 0xE3,
+	0x82, 0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0x8B,
+	// Bytes 2a00 - 2a3f
+	0xE3, 0x83, 0xBC, 0x4C, 0xE3, 0x82, 0xAD, 0xE3,
+	0x83, 0xA5, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xBC,
+	0x4C, 0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3,
+	0x83, 0xA9, 0xE3, 0x83, 0xA0, 0x4C, 0xE3, 0x82,
+	0xAF, 0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xBC, 0xE3,
+	0x83, 0x8D, 0x4C, 0xE3, 0x82, 0xB5, 0xE3, 0x82,
+	0xA4, 0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C,
+	0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	// Bytes 2a40 - 2a7f
+	0xBC, 0xE3, 0x82, 0xB9, 0x4C, 0xE3, 0x83, 0x8F,
+	0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0x84, 0x4C, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A,
+	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C, 0xE3,
+	0x83, 0x95, 0xE3, 0x82, 0xA3, 0xE3, 0x83, 0xBC,
+	0xE3, 0x83, 0x88, 0x4C, 0xE3, 0x83, 0x98, 0xE3,
+	0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xBF,
+	0x4C, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3,
+	// Bytes 2a80 - 2abf
+	0x83, 0x8B, 0xE3, 0x83, 0x92, 0x4C, 0xE3, 0x83,
+	0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xB3, 0xE3,
+	0x82, 0xB9, 0x4C, 0xE3, 0x83, 0x9B, 0xE3, 0x82,
+	0x99, 0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x88, 0x4C,
+	0xE3, 0x83, 0x9E, 0xE3, 0x82, 0xA4, 0xE3, 0x82,
+	0xAF, 0xE3, 0x83, 0xAD, 0x4C, 0xE3, 0x83, 0x9F,
+	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAD, 0xE3, 0x83,
+	0xB3, 0x4C, 0xE3, 0x83, 0xA1, 0xE3, 0x83, 0xBC,
+	// Bytes 2ac0 - 2aff
+	0xE3, 0x83, 0x88, 0xE3, 0x83, 0xAB, 0x4C, 0xE3,
+	0x83, 0xAA, 0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88,
+	0xE3, 0x83, 0xAB, 0x4C, 0xE3, 0x83, 0xAB, 0xE3,
+	0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC,
+	0x4C, 0xE6, 0xA0, 0xAA, 0xE5, 0xBC, 0x8F, 0xE4,
+	0xBC, 0x9A, 0xE7, 0xA4, 0xBE, 0x4E, 0x28, 0xE1,
+	0x84, 0x8B, 0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x92,
+	0xE1, 0x85, 0xAE, 0x29, 0x4F, 0xD8, 0xAC, 0xD9,
+	// Bytes 2b00 - 2b3f
+	0x84, 0x20, 0xD8, 0xAC, 0xD9, 0x84, 0xD8, 0xA7,
+	0xD9, 0x84, 0xD9, 0x87, 0x4F, 0xE3, 0x82, 0xA2,
+	0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
+	0xBC, 0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xA2,
+	0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x98, 0xE3, 0x82,
+	0x9A, 0xE3, 0x82, 0xA2, 0x4F, 0xE3, 0x82, 0xAD,
+	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xAF, 0xE3, 0x83,
+	0x83, 0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xB5,
+	// Bytes 2b40 - 2b7f
+	0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x81, 0xE3, 0x83,
+	0xBC, 0xE3, 0x83, 0xA0, 0x4F, 0xE3, 0x83, 0x8F,
+	0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0xAC, 0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x98,
+	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0xBF, 0xE3, 0x83,
+	0xBC, 0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x9B,
+	0xE3, 0x82, 0x9A, 0xE3, 0x82, 0xA4, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x83, 0x9E,
+	// Bytes 2b80 - 2bbf
+	0xE3, 0x83, 0xB3, 0xE3, 0x82, 0xB7, 0xE3, 0x83,
+	0xA7, 0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xA1,
+	0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	0x88, 0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xAB,
+	0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x95, 0xE3, 0x82,
+	0x99, 0xE3, 0x83, 0xAB, 0x51, 0x28, 0xE1, 0x84,
+	0x8B, 0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x8C, 0xE1,
+	0x85, 0xA5, 0xE1, 0x86, 0xAB, 0x29, 0x52, 0xE3,
+	// Bytes 2bc0 - 2bff
+	0x82, 0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB,
+	0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	0xBC, 0x52, 0xE3, 0x82, 0xAD, 0xE3, 0x83, 0xAD,
+	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	0xA9, 0xE3, 0x83, 0xA0, 0x52, 0xE3, 0x82, 0xAD,
+	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xA1, 0xE3, 0x83,
+	0xBC, 0xE3, 0x83, 0x88, 0xE3, 0x83, 0xAB, 0x52,
+	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
+	// Bytes 2c00 - 2c3f
+	0xA9, 0xE3, 0x83, 0xA0, 0xE3, 0x83, 0x88, 0xE3,
+	0x83, 0xB3, 0x52, 0xE3, 0x82, 0xAF, 0xE3, 0x83,
+	0xAB, 0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99, 0xE3,
+	0x82, 0xA4, 0xE3, 0x83, 0xAD, 0x52, 0xE3, 0x83,
+	0x8F, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3,
+	0x82, 0xBB, 0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x88,
+	0x52, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3,
+	0x82, 0xA2, 0xE3, 0x82, 0xB9, 0xE3, 0x83, 0x88,
+	// Bytes 2c40 - 2c7f
+	0xE3, 0x83, 0xAB, 0x52, 0xE3, 0x83, 0x95, 0xE3,
+	0x82, 0x99, 0xE3, 0x83, 0x83, 0xE3, 0x82, 0xB7,
+	0xE3, 0x82, 0xA7, 0xE3, 0x83, 0xAB, 0x52, 0xE3,
+	0x83, 0x9F, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0x8F,
+	0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	0xAB, 0x52, 0xE3, 0x83, 0xAC, 0xE3, 0x83, 0xB3,
+	0xE3, 0x83, 0x88, 0xE3, 0x82, 0xB1, 0xE3, 0x82,
+	0x99, 0xE3, 0x83, 0xB3, 0x61, 0xD8, 0xB5, 0xD9,
+	// Bytes 2c80 - 2cbf
+	0x84, 0xD9, 0x89, 0x20, 0xD8, 0xA7, 0xD9, 0x84,
+	0xD9, 0x84, 0xD9, 0x87, 0x20, 0xD8, 0xB9, 0xD9,
+	0x84, 0xD9, 0x8A, 0xD9, 0x87, 0x20, 0xD9, 0x88,
+	0xD8, 0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x06, 0xE0,
+	0xA7, 0x87, 0xE0, 0xA6, 0xBE, 0x01, 0x06, 0xE0,
+	0xA7, 0x87, 0xE0, 0xA7, 0x97, 0x01, 0x06, 0xE0,
+	0xAD, 0x87, 0xE0, 0xAC, 0xBE, 0x01, 0x06, 0xE0,
+	0xAD, 0x87, 0xE0, 0xAD, 0x96, 0x01, 0x06, 0xE0,
+	// Bytes 2cc0 - 2cff
+	0xAD, 0x87, 0xE0, 0xAD, 0x97, 0x01, 0x06, 0xE0,
+	0xAE, 0x92, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0,
+	0xAF, 0x86, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0,
+	0xAF, 0x86, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0,
+	0xAF, 0x87, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0,
+	0xB2, 0xBF, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0,
+	0xB3, 0x86, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0,
+	0xB3, 0x86, 0xE0, 0xB3, 0x96, 0x01, 0x06, 0xE0,
+	// Bytes 2d00 - 2d3f
+	0xB5, 0x86, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0,
+	0xB5, 0x86, 0xE0, 0xB5, 0x97, 0x01, 0x06, 0xE0,
+	0xB5, 0x87, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0,
+	0xB7, 0x99, 0xE0, 0xB7, 0x9F, 0x01, 0x06, 0xE1,
+	0x80, 0xA5, 0xE1, 0x80, 0xAE, 0x01, 0x06, 0xE1,
+	0xAC, 0x85, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0x87, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0x89, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	// Bytes 2d40 - 2d7f
+	0xAC, 0x8B, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0x8D, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0x91, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0xBA, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0xBC, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0xBE, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAC, 0xBF, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
+	0xAD, 0x82, 0xE1, 0xAC, 0xB5, 0x01, 0x08, 0xF0,
+	// Bytes 2d80 - 2dbf
+	0x91, 0x84, 0xB1, 0xF0, 0x91, 0x84, 0xA7, 0x01,
+	0x08, 0xF0, 0x91, 0x84, 0xB2, 0xF0, 0x91, 0x84,
+	0xA7, 0x01, 0x08, 0xF0, 0x91, 0x8D, 0x87, 0xF0,
+	0x91, 0x8C, 0xBE, 0x01, 0x08, 0xF0, 0x91, 0x8D,
+	0x87, 0xF0, 0x91, 0x8D, 0x97, 0x01, 0x08, 0xF0,
+	0x91, 0x92, 0xB9, 0xF0, 0x91, 0x92, 0xB0, 0x01,
+	0x08, 0xF0, 0x91, 0x92, 0xB9, 0xF0, 0x91, 0x92,
+	0xBA, 0x01, 0x08, 0xF0, 0x91, 0x92, 0xB9, 0xF0,
+	// Bytes 2dc0 - 2dff
+	0x91, 0x92, 0xBD, 0x01, 0x08, 0xF0, 0x91, 0x96,
+	0xB8, 0xF0, 0x91, 0x96, 0xAF, 0x01, 0x08, 0xF0,
+	0x91, 0x96, 0xB9, 0xF0, 0x91, 0x96, 0xAF, 0x01,
+	0x09, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82, 0xE0,
+	0xB3, 0x95, 0x02, 0x09, 0xE0, 0xB7, 0x99, 0xE0,
+	0xB7, 0x8F, 0xE0, 0xB7, 0x8A, 0x12, 0x44, 0x44,
+	0x5A, 0xCC, 0x8C, 0xC9, 0x44, 0x44, 0x7A, 0xCC,
+	0x8C, 0xC9, 0x44, 0x64, 0x7A, 0xCC, 0x8C, 0xC9,
+	// Bytes 2e00 - 2e3f
+	0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x93, 0xC9,
+	0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x94, 0xC9,
+	0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x95, 0xB5,
+	0x46, 0xE1, 0x84, 0x80, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x85, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x86, 0xE1, 0x85, 0xA1, 0x01,
+	// Bytes 2e40 - 2e7f
+	0x46, 0xE1, 0x84, 0x87, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x89, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xAE, 0x01,
+	0x46, 0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x8F, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x90, 0xE1, 0x85, 0xA1, 0x01,
+	// Bytes 2e80 - 2ebf
+	0x46, 0xE1, 0x84, 0x91, 0xE1, 0x85, 0xA1, 0x01,
+	0x46, 0xE1, 0x84, 0x92, 0xE1, 0x85, 0xA1, 0x01,
+	0x49, 0xE3, 0x83, 0xA1, 0xE3, 0x82, 0xAB, 0xE3,
+	0x82, 0x99, 0x0D, 0x4C, 0xE1, 0x84, 0x8C, 0xE1,
+	0x85, 0xAE, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xB4,
+	0x01, 0x4C, 0xE3, 0x82, 0xAD, 0xE3, 0x82, 0x99,
+	0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0x0D, 0x4C,
+	0xE3, 0x82, 0xB3, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
+	// Bytes 2ec0 - 2eff
+	0x9B, 0xE3, 0x82, 0x9A, 0x0D, 0x4C, 0xE3, 0x83,
+	0xA4, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x88, 0xE3,
+	0x82, 0x99, 0x0D, 0x4F, 0xE1, 0x84, 0x8E, 0xE1,
+	0x85, 0xA1, 0xE1, 0x86, 0xB7, 0xE1, 0x84, 0x80,
+	0xE1, 0x85, 0xA9, 0x01, 0x4F, 0xE3, 0x82, 0xA4,
+	0xE3, 0x83, 0x8B, 0xE3, 0x83, 0xB3, 0xE3, 0x82,
+	0xAF, 0xE3, 0x82, 0x99, 0x0D, 0x4F, 0xE3, 0x82,
+	0xB7, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xB3, 0xE3,
+	// Bytes 2f00 - 2f3f
+	0x82, 0xAF, 0xE3, 0x82, 0x99, 0x0D, 0x4F, 0xE3,
+	0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC,
+	0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99, 0x0D, 0x4F,
+	0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
+	0xB3, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99, 0x0D,
+	0x52, 0xE3, 0x82, 0xA8, 0xE3, 0x82, 0xB9, 0xE3,
+	0x82, 0xAF, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x88,
+	0xE3, 0x82, 0x99, 0x0D, 0x52, 0xE3, 0x83, 0x95,
+	// Bytes 2f40 - 2f7f
+	0xE3, 0x82, 0xA1, 0xE3, 0x83, 0xA9, 0xE3, 0x83,
+	0x83, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99, 0x0D,
+	0x86, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82, 0x01,
+	0x86, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8F, 0x01,
+	0x03, 0x3C, 0xCC, 0xB8, 0x05, 0x03, 0x3D, 0xCC,
+	0xB8, 0x05, 0x03, 0x3E, 0xCC, 0xB8, 0x05, 0x03,
+	0x41, 0xCC, 0x80, 0xC9, 0x03, 0x41, 0xCC, 0x81,
+	0xC9, 0x03, 0x41, 0xCC, 0x83, 0xC9, 0x03, 0x41,
+	// Bytes 2f80 - 2fbf
+	0xCC, 0x84, 0xC9, 0x03, 0x41, 0xCC, 0x89, 0xC9,
+	0x03, 0x41, 0xCC, 0x8C, 0xC9, 0x03, 0x41, 0xCC,
+	0x8F, 0xC9, 0x03, 0x41, 0xCC, 0x91, 0xC9, 0x03,
+	0x41, 0xCC, 0xA5, 0xB5, 0x03, 0x41, 0xCC, 0xA8,
+	0xA5, 0x03, 0x42, 0xCC, 0x87, 0xC9, 0x03, 0x42,
+	0xCC, 0xA3, 0xB5, 0x03, 0x42, 0xCC, 0xB1, 0xB5,
+	0x03, 0x43, 0xCC, 0x81, 0xC9, 0x03, 0x43, 0xCC,
+	0x82, 0xC9, 0x03, 0x43, 0xCC, 0x87, 0xC9, 0x03,
+	// Bytes 2fc0 - 2fff
+	0x43, 0xCC, 0x8C, 0xC9, 0x03, 0x44, 0xCC, 0x87,
+	0xC9, 0x03, 0x44, 0xCC, 0x8C, 0xC9, 0x03, 0x44,
+	0xCC, 0xA3, 0xB5, 0x03, 0x44, 0xCC, 0xA7, 0xA5,
+	0x03, 0x44, 0xCC, 0xAD, 0xB5, 0x03, 0x44, 0xCC,
+	0xB1, 0xB5, 0x03, 0x45, 0xCC, 0x80, 0xC9, 0x03,
+	0x45, 0xCC, 0x81, 0xC9, 0x03, 0x45, 0xCC, 0x83,
+	0xC9, 0x03, 0x45, 0xCC, 0x86, 0xC9, 0x03, 0x45,
+	0xCC, 0x87, 0xC9, 0x03, 0x45, 0xCC, 0x88, 0xC9,
+	// Bytes 3000 - 303f
+	0x03, 0x45, 0xCC, 0x89, 0xC9, 0x03, 0x45, 0xCC,
+	0x8C, 0xC9, 0x03, 0x45, 0xCC, 0x8F, 0xC9, 0x03,
+	0x45, 0xCC, 0x91, 0xC9, 0x03, 0x45, 0xCC, 0xA8,
+	0xA5, 0x03, 0x45, 0xCC, 0xAD, 0xB5, 0x03, 0x45,
+	0xCC, 0xB0, 0xB5, 0x03, 0x46, 0xCC, 0x87, 0xC9,
+	0x03, 0x47, 0xCC, 0x81, 0xC9, 0x03, 0x47, 0xCC,
+	0x82, 0xC9, 0x03, 0x47, 0xCC, 0x84, 0xC9, 0x03,
+	0x47, 0xCC, 0x86, 0xC9, 0x03, 0x47, 0xCC, 0x87,
+	// Bytes 3040 - 307f
+	0xC9, 0x03, 0x47, 0xCC, 0x8C, 0xC9, 0x03, 0x47,
+	0xCC, 0xA7, 0xA5, 0x03, 0x48, 0xCC, 0x82, 0xC9,
+	0x03, 0x48, 0xCC, 0x87, 0xC9, 0x03, 0x48, 0xCC,
+	0x88, 0xC9, 0x03, 0x48, 0xCC, 0x8C, 0xC9, 0x03,
+	0x48, 0xCC, 0xA3, 0xB5, 0x03, 0x48, 0xCC, 0xA7,
+	0xA5, 0x03, 0x48, 0xCC, 0xAE, 0xB5, 0x03, 0x49,
+	0xCC, 0x80, 0xC9, 0x03, 0x49, 0xCC, 0x81, 0xC9,
+	0x03, 0x49, 0xCC, 0x82, 0xC9, 0x03, 0x49, 0xCC,
+	// Bytes 3080 - 30bf
+	0x83, 0xC9, 0x03, 0x49, 0xCC, 0x84, 0xC9, 0x03,
+	0x49, 0xCC, 0x86, 0xC9, 0x03, 0x49, 0xCC, 0x87,
+	0xC9, 0x03, 0x49, 0xCC, 0x89, 0xC9, 0x03, 0x49,
+	0xCC, 0x8C, 0xC9, 0x03, 0x49, 0xCC, 0x8F, 0xC9,
+	0x03, 0x49, 0xCC, 0x91, 0xC9, 0x03, 0x49, 0xCC,
+	0xA3, 0xB5, 0x03, 0x49, 0xCC, 0xA8, 0xA5, 0x03,
+	0x49, 0xCC, 0xB0, 0xB5, 0x03, 0x4A, 0xCC, 0x82,
+	0xC9, 0x03, 0x4B, 0xCC, 0x81, 0xC9, 0x03, 0x4B,
+	// Bytes 30c0 - 30ff
+	0xCC, 0x8C, 0xC9, 0x03, 0x4B, 0xCC, 0xA3, 0xB5,
+	0x03, 0x4B, 0xCC, 0xA7, 0xA5, 0x03, 0x4B, 0xCC,
+	0xB1, 0xB5, 0x03, 0x4C, 0xCC, 0x81, 0xC9, 0x03,
+	0x4C, 0xCC, 0x8C, 0xC9, 0x03, 0x4C, 0xCC, 0xA7,
+	0xA5, 0x03, 0x4C, 0xCC, 0xAD, 0xB5, 0x03, 0x4C,
+	0xCC, 0xB1, 0xB5, 0x03, 0x4D, 0xCC, 0x81, 0xC9,
+	0x03, 0x4D, 0xCC, 0x87, 0xC9, 0x03, 0x4D, 0xCC,
+	0xA3, 0xB5, 0x03, 0x4E, 0xCC, 0x80, 0xC9, 0x03,
+	// Bytes 3100 - 313f
+	0x4E, 0xCC, 0x81, 0xC9, 0x03, 0x4E, 0xCC, 0x83,
+	0xC9, 0x03, 0x4E, 0xCC, 0x87, 0xC9, 0x03, 0x4E,
+	0xCC, 0x8C, 0xC9, 0x03, 0x4E, 0xCC, 0xA3, 0xB5,
+	0x03, 0x4E, 0xCC, 0xA7, 0xA5, 0x03, 0x4E, 0xCC,
+	0xAD, 0xB5, 0x03, 0x4E, 0xCC, 0xB1, 0xB5, 0x03,
+	0x4F, 0xCC, 0x80, 0xC9, 0x03, 0x4F, 0xCC, 0x81,
+	0xC9, 0x03, 0x4F, 0xCC, 0x86, 0xC9, 0x03, 0x4F,
+	0xCC, 0x89, 0xC9, 0x03, 0x4F, 0xCC, 0x8B, 0xC9,
+	// Bytes 3140 - 317f
+	0x03, 0x4F, 0xCC, 0x8C, 0xC9, 0x03, 0x4F, 0xCC,
+	0x8F, 0xC9, 0x03, 0x4F, 0xCC, 0x91, 0xC9, 0x03,
+	0x50, 0xCC, 0x81, 0xC9, 0x03, 0x50, 0xCC, 0x87,
+	0xC9, 0x03, 0x52, 0xCC, 0x81, 0xC9, 0x03, 0x52,
+	0xCC, 0x87, 0xC9, 0x03, 0x52, 0xCC, 0x8C, 0xC9,
+	0x03, 0x52, 0xCC, 0x8F, 0xC9, 0x03, 0x52, 0xCC,
+	0x91, 0xC9, 0x03, 0x52, 0xCC, 0xA7, 0xA5, 0x03,
+	0x52, 0xCC, 0xB1, 0xB5, 0x03, 0x53, 0xCC, 0x82,
+	// Bytes 3180 - 31bf
+	0xC9, 0x03, 0x53, 0xCC, 0x87, 0xC9, 0x03, 0x53,
+	0xCC, 0xA6, 0xB5, 0x03, 0x53, 0xCC, 0xA7, 0xA5,
+	0x03, 0x54, 0xCC, 0x87, 0xC9, 0x03, 0x54, 0xCC,
+	0x8C, 0xC9, 0x03, 0x54, 0xCC, 0xA3, 0xB5, 0x03,
+	0x54, 0xCC, 0xA6, 0xB5, 0x03, 0x54, 0xCC, 0xA7,
+	0xA5, 0x03, 0x54, 0xCC, 0xAD, 0xB5, 0x03, 0x54,
+	0xCC, 0xB1, 0xB5, 0x03, 0x55, 0xCC, 0x80, 0xC9,
+	0x03, 0x55, 0xCC, 0x81, 0xC9, 0x03, 0x55, 0xCC,
+	// Bytes 31c0 - 31ff
+	0x82, 0xC9, 0x03, 0x55, 0xCC, 0x86, 0xC9, 0x03,
+	0x55, 0xCC, 0x89, 0xC9, 0x03, 0x55, 0xCC, 0x8A,
+	0xC9, 0x03, 0x55, 0xCC, 0x8B, 0xC9, 0x03, 0x55,
+	0xCC, 0x8C, 0xC9, 0x03, 0x55, 0xCC, 0x8F, 0xC9,
+	0x03, 0x55, 0xCC, 0x91, 0xC9, 0x03, 0x55, 0xCC,
+	0xA3, 0xB5, 0x03, 0x55, 0xCC, 0xA4, 0xB5, 0x03,
+	0x55, 0xCC, 0xA8, 0xA5, 0x03, 0x55, 0xCC, 0xAD,
+	0xB5, 0x03, 0x55, 0xCC, 0xB0, 0xB5, 0x03, 0x56,
+	// Bytes 3200 - 323f
+	0xCC, 0x83, 0xC9, 0x03, 0x56, 0xCC, 0xA3, 0xB5,
+	0x03, 0x57, 0xCC, 0x80, 0xC9, 0x03, 0x57, 0xCC,
+	0x81, 0xC9, 0x03, 0x57, 0xCC, 0x82, 0xC9, 0x03,
+	0x57, 0xCC, 0x87, 0xC9, 0x03, 0x57, 0xCC, 0x88,
+	0xC9, 0x03, 0x57, 0xCC, 0xA3, 0xB5, 0x03, 0x58,
+	0xCC, 0x87, 0xC9, 0x03, 0x58, 0xCC, 0x88, 0xC9,
+	0x03, 0x59, 0xCC, 0x80, 0xC9, 0x03, 0x59, 0xCC,
+	0x81, 0xC9, 0x03, 0x59, 0xCC, 0x82, 0xC9, 0x03,
+	// Bytes 3240 - 327f
+	0x59, 0xCC, 0x83, 0xC9, 0x03, 0x59, 0xCC, 0x84,
+	0xC9, 0x03, 0x59, 0xCC, 0x87, 0xC9, 0x03, 0x59,
+	0xCC, 0x88, 0xC9, 0x03, 0x59, 0xCC, 0x89, 0xC9,
+	0x03, 0x59, 0xCC, 0xA3, 0xB5, 0x03, 0x5A, 0xCC,
+	0x81, 0xC9, 0x03, 0x5A, 0xCC, 0x82, 0xC9, 0x03,
+	0x5A, 0xCC, 0x87, 0xC9, 0x03, 0x5A, 0xCC, 0x8C,
+	0xC9, 0x03, 0x5A, 0xCC, 0xA3, 0xB5, 0x03, 0x5A,
+	0xCC, 0xB1, 0xB5, 0x03, 0x61, 0xCC, 0x80, 0xC9,
+	// Bytes 3280 - 32bf
+	0x03, 0x61, 0xCC, 0x81, 0xC9, 0x03, 0x61, 0xCC,
+	0x83, 0xC9, 0x03, 0x61, 0xCC, 0x84, 0xC9, 0x03,
+	0x61, 0xCC, 0x89, 0xC9, 0x03, 0x61, 0xCC, 0x8C,
+	0xC9, 0x03, 0x61, 0xCC, 0x8F, 0xC9, 0x03, 0x61,
+	0xCC, 0x91, 0xC9, 0x03, 0x61, 0xCC, 0xA5, 0xB5,
+	0x03, 0x61, 0xCC, 0xA8, 0xA5, 0x03, 0x62, 0xCC,
+	0x87, 0xC9, 0x03, 0x62, 0xCC, 0xA3, 0xB5, 0x03,
+	0x62, 0xCC, 0xB1, 0xB5, 0x03, 0x63, 0xCC, 0x81,
+	// Bytes 32c0 - 32ff
+	0xC9, 0x03, 0x63, 0xCC, 0x82, 0xC9, 0x03, 0x63,
+	0xCC, 0x87, 0xC9, 0x03, 0x63, 0xCC, 0x8C, 0xC9,
+	0x03, 0x64, 0xCC, 0x87, 0xC9, 0x03, 0x64, 0xCC,
+	0x8C, 0xC9, 0x03, 0x64, 0xCC, 0xA3, 0xB5, 0x03,
+	0x64, 0xCC, 0xA7, 0xA5, 0x03, 0x64, 0xCC, 0xAD,
+	0xB5, 0x03, 0x64, 0xCC, 0xB1, 0xB5, 0x03, 0x65,
+	0xCC, 0x80, 0xC9, 0x03, 0x65, 0xCC, 0x81, 0xC9,
+	0x03, 0x65, 0xCC, 0x83, 0xC9, 0x03, 0x65, 0xCC,
+	// Bytes 3300 - 333f
+	0x86, 0xC9, 0x03, 0x65, 0xCC, 0x87, 0xC9, 0x03,
+	0x65, 0xCC, 0x88, 0xC9, 0x03, 0x65, 0xCC, 0x89,
+	0xC9, 0x03, 0x65, 0xCC, 0x8C, 0xC9, 0x03, 0x65,
+	0xCC, 0x8F, 0xC9, 0x03, 0x65, 0xCC, 0x91, 0xC9,
+	0x03, 0x65, 0xCC, 0xA8, 0xA5, 0x03, 0x65, 0xCC,
+	0xAD, 0xB5, 0x03, 0x65, 0xCC, 0xB0, 0xB5, 0x03,
+	0x66, 0xCC, 0x87, 0xC9, 0x03, 0x67, 0xCC, 0x81,
+	0xC9, 0x03, 0x67, 0xCC, 0x82, 0xC9, 0x03, 0x67,
+	// Bytes 3340 - 337f
+	0xCC, 0x84, 0xC9, 0x03, 0x67, 0xCC, 0x86, 0xC9,
+	0x03, 0x67, 0xCC, 0x87, 0xC9, 0x03, 0x67, 0xCC,
+	0x8C, 0xC9, 0x03, 0x67, 0xCC, 0xA7, 0xA5, 0x03,
+	0x68, 0xCC, 0x82, 0xC9, 0x03, 0x68, 0xCC, 0x87,
+	0xC9, 0x03, 0x68, 0xCC, 0x88, 0xC9, 0x03, 0x68,
+	0xCC, 0x8C, 0xC9, 0x03, 0x68, 0xCC, 0xA3, 0xB5,
+	0x03, 0x68, 0xCC, 0xA7, 0xA5, 0x03, 0x68, 0xCC,
+	0xAE, 0xB5, 0x03, 0x68, 0xCC, 0xB1, 0xB5, 0x03,
+	// Bytes 3380 - 33bf
+	0x69, 0xCC, 0x80, 0xC9, 0x03, 0x69, 0xCC, 0x81,
+	0xC9, 0x03, 0x69, 0xCC, 0x82, 0xC9, 0x03, 0x69,
+	0xCC, 0x83, 0xC9, 0x03, 0x69, 0xCC, 0x84, 0xC9,
+	0x03, 0x69, 0xCC, 0x86, 0xC9, 0x03, 0x69, 0xCC,
+	0x89, 0xC9, 0x03, 0x69, 0xCC, 0x8C, 0xC9, 0x03,
+	0x69, 0xCC, 0x8F, 0xC9, 0x03, 0x69, 0xCC, 0x91,
+	0xC9, 0x03, 0x69, 0xCC, 0xA3, 0xB5, 0x03, 0x69,
+	0xCC, 0xA8, 0xA5, 0x03, 0x69, 0xCC, 0xB0, 0xB5,
+	// Bytes 33c0 - 33ff
+	0x03, 0x6A, 0xCC, 0x82, 0xC9, 0x03, 0x6A, 0xCC,
+	0x8C, 0xC9, 0x03, 0x6B, 0xCC, 0x81, 0xC9, 0x03,
+	0x6B, 0xCC, 0x8C, 0xC9, 0x03, 0x6B, 0xCC, 0xA3,
+	0xB5, 0x03, 0x6B, 0xCC, 0xA7, 0xA5, 0x03, 0x6B,
+	0xCC, 0xB1, 0xB5, 0x03, 0x6C, 0xCC, 0x81, 0xC9,
+	0x03, 0x6C, 0xCC, 0x8C, 0xC9, 0x03, 0x6C, 0xCC,
+	0xA7, 0xA5, 0x03, 0x6C, 0xCC, 0xAD, 0xB5, 0x03,
+	0x6C, 0xCC, 0xB1, 0xB5, 0x03, 0x6D, 0xCC, 0x81,
+	// Bytes 3400 - 343f
+	0xC9, 0x03, 0x6D, 0xCC, 0x87, 0xC9, 0x03, 0x6D,
+	0xCC, 0xA3, 0xB5, 0x03, 0x6E, 0xCC, 0x80, 0xC9,
+	0x03, 0x6E, 0xCC, 0x81, 0xC9, 0x03, 0x6E, 0xCC,
+	0x83, 0xC9, 0x03, 0x6E, 0xCC, 0x87, 0xC9, 0x03,
+	0x6E, 0xCC, 0x8C, 0xC9, 0x03, 0x6E, 0xCC, 0xA3,
+	0xB5, 0x03, 0x6E, 0xCC, 0xA7, 0xA5, 0x03, 0x6E,
+	0xCC, 0xAD, 0xB5, 0x03, 0x6E, 0xCC, 0xB1, 0xB5,
+	0x03, 0x6F, 0xCC, 0x80, 0xC9, 0x03, 0x6F, 0xCC,
+	// Bytes 3440 - 347f
+	0x81, 0xC9, 0x03, 0x6F, 0xCC, 0x86, 0xC9, 0x03,
+	0x6F, 0xCC, 0x89, 0xC9, 0x03, 0x6F, 0xCC, 0x8B,
+	0xC9, 0x03, 0x6F, 0xCC, 0x8C, 0xC9, 0x03, 0x6F,
+	0xCC, 0x8F, 0xC9, 0x03, 0x6F, 0xCC, 0x91, 0xC9,
+	0x03, 0x70, 0xCC, 0x81, 0xC9, 0x03, 0x70, 0xCC,
+	0x87, 0xC9, 0x03, 0x72, 0xCC, 0x81, 0xC9, 0x03,
+	0x72, 0xCC, 0x87, 0xC9, 0x03, 0x72, 0xCC, 0x8C,
+	0xC9, 0x03, 0x72, 0xCC, 0x8F, 0xC9, 0x03, 0x72,
+	// Bytes 3480 - 34bf
+	0xCC, 0x91, 0xC9, 0x03, 0x72, 0xCC, 0xA7, 0xA5,
+	0x03, 0x72, 0xCC, 0xB1, 0xB5, 0x03, 0x73, 0xCC,
+	0x82, 0xC9, 0x03, 0x73, 0xCC, 0x87, 0xC9, 0x03,
+	0x73, 0xCC, 0xA6, 0xB5, 0x03, 0x73, 0xCC, 0xA7,
+	0xA5, 0x03, 0x74, 0xCC, 0x87, 0xC9, 0x03, 0x74,
+	0xCC, 0x88, 0xC9, 0x03, 0x74, 0xCC, 0x8C, 0xC9,
+	0x03, 0x74, 0xCC, 0xA3, 0xB5, 0x03, 0x74, 0xCC,
+	0xA6, 0xB5, 0x03, 0x74, 0xCC, 0xA7, 0xA5, 0x03,
+	// Bytes 34c0 - 34ff
+	0x74, 0xCC, 0xAD, 0xB5, 0x03, 0x74, 0xCC, 0xB1,
+	0xB5, 0x03, 0x75, 0xCC, 0x80, 0xC9, 0x03, 0x75,
+	0xCC, 0x81, 0xC9, 0x03, 0x75, 0xCC, 0x82, 0xC9,
+	0x03, 0x75, 0xCC, 0x86, 0xC9, 0x03, 0x75, 0xCC,
+	0x89, 0xC9, 0x03, 0x75, 0xCC, 0x8A, 0xC9, 0x03,
+	0x75, 0xCC, 0x8B, 0xC9, 0x03, 0x75, 0xCC, 0x8C,
+	0xC9, 0x03, 0x75, 0xCC, 0x8F, 0xC9, 0x03, 0x75,
+	0xCC, 0x91, 0xC9, 0x03, 0x75, 0xCC, 0xA3, 0xB5,
+	// Bytes 3500 - 353f
+	0x03, 0x75, 0xCC, 0xA4, 0xB5, 0x03, 0x75, 0xCC,
+	0xA8, 0xA5, 0x03, 0x75, 0xCC, 0xAD, 0xB5, 0x03,
+	0x75, 0xCC, 0xB0, 0xB5, 0x03, 0x76, 0xCC, 0x83,
+	0xC9, 0x03, 0x76, 0xCC, 0xA3, 0xB5, 0x03, 0x77,
+	0xCC, 0x80, 0xC9, 0x03, 0x77, 0xCC, 0x81, 0xC9,
+	0x03, 0x77, 0xCC, 0x82, 0xC9, 0x03, 0x77, 0xCC,
+	0x87, 0xC9, 0x03, 0x77, 0xCC, 0x88, 0xC9, 0x03,
+	0x77, 0xCC, 0x8A, 0xC9, 0x03, 0x77, 0xCC, 0xA3,
+	// Bytes 3540 - 357f
+	0xB5, 0x03, 0x78, 0xCC, 0x87, 0xC9, 0x03, 0x78,
+	0xCC, 0x88, 0xC9, 0x03, 0x79, 0xCC, 0x80, 0xC9,
+	0x03, 0x79, 0xCC, 0x81, 0xC9, 0x03, 0x79, 0xCC,
+	0x82, 0xC9, 0x03, 0x79, 0xCC, 0x83, 0xC9, 0x03,
+	0x79, 0xCC, 0x84, 0xC9, 0x03, 0x79, 0xCC, 0x87,
+	0xC9, 0x03, 0x79, 0xCC, 0x88, 0xC9, 0x03, 0x79,
+	0xCC, 0x89, 0xC9, 0x03, 0x79, 0xCC, 0x8A, 0xC9,
+	0x03, 0x79, 0xCC, 0xA3, 0xB5, 0x03, 0x7A, 0xCC,
+	// Bytes 3580 - 35bf
+	0x81, 0xC9, 0x03, 0x7A, 0xCC, 0x82, 0xC9, 0x03,
+	0x7A, 0xCC, 0x87, 0xC9, 0x03, 0x7A, 0xCC, 0x8C,
+	0xC9, 0x03, 0x7A, 0xCC, 0xA3, 0xB5, 0x03, 0x7A,
+	0xCC, 0xB1, 0xB5, 0x04, 0xC2, 0xA8, 0xCC, 0x80,
+	0xCA, 0x04, 0xC2, 0xA8, 0xCC, 0x81, 0xCA, 0x04,
+	0xC2, 0xA8, 0xCD, 0x82, 0xCA, 0x04, 0xC3, 0x86,
+	0xCC, 0x81, 0xC9, 0x04, 0xC3, 0x86, 0xCC, 0x84,
+	0xC9, 0x04, 0xC3, 0x98, 0xCC, 0x81, 0xC9, 0x04,
+	// Bytes 35c0 - 35ff
+	0xC3, 0xA6, 0xCC, 0x81, 0xC9, 0x04, 0xC3, 0xA6,
+	0xCC, 0x84, 0xC9, 0x04, 0xC3, 0xB8, 0xCC, 0x81,
+	0xC9, 0x04, 0xC5, 0xBF, 0xCC, 0x87, 0xC9, 0x04,
+	0xC6, 0xB7, 0xCC, 0x8C, 0xC9, 0x04, 0xCA, 0x92,
+	0xCC, 0x8C, 0xC9, 0x04, 0xCE, 0x91, 0xCC, 0x80,
+	0xC9, 0x04, 0xCE, 0x91, 0xCC, 0x81, 0xC9, 0x04,
+	0xCE, 0x91, 0xCC, 0x84, 0xC9, 0x04, 0xCE, 0x91,
+	0xCC, 0x86, 0xC9, 0x04, 0xCE, 0x91, 0xCD, 0x85,
+	// Bytes 3600 - 363f
+	0xD9, 0x04, 0xCE, 0x95, 0xCC, 0x80, 0xC9, 0x04,
+	0xCE, 0x95, 0xCC, 0x81, 0xC9, 0x04, 0xCE, 0x97,
+	0xCC, 0x80, 0xC9, 0x04, 0xCE, 0x97, 0xCC, 0x81,
+	0xC9, 0x04, 0xCE, 0x97, 0xCD, 0x85, 0xD9, 0x04,
+	0xCE, 0x99, 0xCC, 0x80, 0xC9, 0x04, 0xCE, 0x99,
+	0xCC, 0x81, 0xC9, 0x04, 0xCE, 0x99, 0xCC, 0x84,
+	0xC9, 0x04, 0xCE, 0x99, 0xCC, 0x86, 0xC9, 0x04,
+	0xCE, 0x99, 0xCC, 0x88, 0xC9, 0x04, 0xCE, 0x9F,
+	// Bytes 3640 - 367f
+	0xCC, 0x80, 0xC9, 0x04, 0xCE, 0x9F, 0xCC, 0x81,
+	0xC9, 0x04, 0xCE, 0xA1, 0xCC, 0x94, 0xC9, 0x04,
+	0xCE, 0xA5, 0xCC, 0x80, 0xC9, 0x04, 0xCE, 0xA5,
+	0xCC, 0x81, 0xC9, 0x04, 0xCE, 0xA5, 0xCC, 0x84,
+	0xC9, 0x04, 0xCE, 0xA5, 0xCC, 0x86, 0xC9, 0x04,
+	0xCE, 0xA5, 0xCC, 0x88, 0xC9, 0x04, 0xCE, 0xA9,
+	0xCC, 0x80, 0xC9, 0x04, 0xCE, 0xA9, 0xCC, 0x81,
+	0xC9, 0x04, 0xCE, 0xA9, 0xCD, 0x85, 0xD9, 0x04,
+	// Bytes 3680 - 36bf
+	0xCE, 0xB1, 0xCC, 0x84, 0xC9, 0x04, 0xCE, 0xB1,
+	0xCC, 0x86, 0xC9, 0x04, 0xCE, 0xB1, 0xCD, 0x85,
+	0xD9, 0x04, 0xCE, 0xB5, 0xCC, 0x80, 0xC9, 0x04,
+	0xCE, 0xB5, 0xCC, 0x81, 0xC9, 0x04, 0xCE, 0xB7,
+	0xCD, 0x85, 0xD9, 0x04, 0xCE, 0xB9, 0xCC, 0x80,
+	0xC9, 0x04, 0xCE, 0xB9, 0xCC, 0x81, 0xC9, 0x04,
+	0xCE, 0xB9, 0xCC, 0x84, 0xC9, 0x04, 0xCE, 0xB9,
+	0xCC, 0x86, 0xC9, 0x04, 0xCE, 0xB9, 0xCD, 0x82,
+	// Bytes 36c0 - 36ff
+	0xC9, 0x04, 0xCE, 0xBF, 0xCC, 0x80, 0xC9, 0x04,
+	0xCE, 0xBF, 0xCC, 0x81, 0xC9, 0x04, 0xCF, 0x81,
+	0xCC, 0x93, 0xC9, 0x04, 0xCF, 0x81, 0xCC, 0x94,
+	0xC9, 0x04, 0xCF, 0x85, 0xCC, 0x80, 0xC9, 0x04,
+	0xCF, 0x85, 0xCC, 0x81, 0xC9, 0x04, 0xCF, 0x85,
+	0xCC, 0x84, 0xC9, 0x04, 0xCF, 0x85, 0xCC, 0x86,
+	0xC9, 0x04, 0xCF, 0x85, 0xCD, 0x82, 0xC9, 0x04,
+	0xCF, 0x89, 0xCD, 0x85, 0xD9, 0x04, 0xCF, 0x92,
+	// Bytes 3700 - 373f
+	0xCC, 0x81, 0xC9, 0x04, 0xCF, 0x92, 0xCC, 0x88,
+	0xC9, 0x04, 0xD0, 0x86, 0xCC, 0x88, 0xC9, 0x04,
+	0xD0, 0x90, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0x90,
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x93, 0xCC, 0x81,
+	0xC9, 0x04, 0xD0, 0x95, 0xCC, 0x80, 0xC9, 0x04,
+	0xD0, 0x95, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0x95,
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x96, 0xCC, 0x86,
+	0xC9, 0x04, 0xD0, 0x96, 0xCC, 0x88, 0xC9, 0x04,
+	// Bytes 3740 - 377f
+	0xD0, 0x97, 0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x98,
+	0xCC, 0x80, 0xC9, 0x04, 0xD0, 0x98, 0xCC, 0x84,
+	0xC9, 0x04, 0xD0, 0x98, 0xCC, 0x86, 0xC9, 0x04,
+	0xD0, 0x98, 0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x9A,
+	0xCC, 0x81, 0xC9, 0x04, 0xD0, 0x9E, 0xCC, 0x88,
+	0xC9, 0x04, 0xD0, 0xA3, 0xCC, 0x84, 0xC9, 0x04,
+	0xD0, 0xA3, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0xA3,
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xA3, 0xCC, 0x8B,
+	// Bytes 3780 - 37bf
+	0xC9, 0x04, 0xD0, 0xA7, 0xCC, 0x88, 0xC9, 0x04,
+	0xD0, 0xAB, 0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xAD,
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xB0, 0xCC, 0x86,
+	0xC9, 0x04, 0xD0, 0xB0, 0xCC, 0x88, 0xC9, 0x04,
+	0xD0, 0xB3, 0xCC, 0x81, 0xC9, 0x04, 0xD0, 0xB5,
+	0xCC, 0x80, 0xC9, 0x04, 0xD0, 0xB5, 0xCC, 0x86,
+	0xC9, 0x04, 0xD0, 0xB5, 0xCC, 0x88, 0xC9, 0x04,
+	0xD0, 0xB6, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0xB6,
+	// Bytes 37c0 - 37ff
+	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xB7, 0xCC, 0x88,
+	0xC9, 0x04, 0xD0, 0xB8, 0xCC, 0x80, 0xC9, 0x04,
+	0xD0, 0xB8, 0xCC, 0x84, 0xC9, 0x04, 0xD0, 0xB8,
+	0xCC, 0x86, 0xC9, 0x04, 0xD0, 0xB8, 0xCC, 0x88,
+	0xC9, 0x04, 0xD0, 0xBA, 0xCC, 0x81, 0xC9, 0x04,
+	0xD0, 0xBE, 0xCC, 0x88, 0xC9, 0x04, 0xD1, 0x83,
+	0xCC, 0x84, 0xC9, 0x04, 0xD1, 0x83, 0xCC, 0x86,
+	0xC9, 0x04, 0xD1, 0x83, 0xCC, 0x88, 0xC9, 0x04,
+	// Bytes 3800 - 383f
+	0xD1, 0x83, 0xCC, 0x8B, 0xC9, 0x04, 0xD1, 0x87,
+	0xCC, 0x88, 0xC9, 0x04, 0xD1, 0x8B, 0xCC, 0x88,
+	0xC9, 0x04, 0xD1, 0x8D, 0xCC, 0x88, 0xC9, 0x04,
+	0xD1, 0x96, 0xCC, 0x88, 0xC9, 0x04, 0xD1, 0xB4,
+	0xCC, 0x8F, 0xC9, 0x04, 0xD1, 0xB5, 0xCC, 0x8F,
+	0xC9, 0x04, 0xD3, 0x98, 0xCC, 0x88, 0xC9, 0x04,
+	0xD3, 0x99, 0xCC, 0x88, 0xC9, 0x04, 0xD3, 0xA8,
+	0xCC, 0x88, 0xC9, 0x04, 0xD3, 0xA9, 0xCC, 0x88,
+	// Bytes 3840 - 387f
+	0xC9, 0x04, 0xD8, 0xA7, 0xD9, 0x93, 0xC9, 0x04,
+	0xD8, 0xA7, 0xD9, 0x94, 0xC9, 0x04, 0xD8, 0xA7,
+	0xD9, 0x95, 0xB5, 0x04, 0xD9, 0x88, 0xD9, 0x94,
+	0xC9, 0x04, 0xD9, 0x8A, 0xD9, 0x94, 0xC9, 0x04,
+	0xDB, 0x81, 0xD9, 0x94, 0xC9, 0x04, 0xDB, 0x92,
+	0xD9, 0x94, 0xC9, 0x04, 0xDB, 0x95, 0xD9, 0x94,
+	0xC9, 0x05, 0x41, 0xCC, 0x82, 0xCC, 0x80, 0xCA,
+	0x05, 0x41, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05,
+	// Bytes 3880 - 38bf
+	0x41, 0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x41,
+	0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05, 0x41, 0xCC,
+	0x86, 0xCC, 0x80, 0xCA, 0x05, 0x41, 0xCC, 0x86,
+	0xCC, 0x81, 0xCA, 0x05, 0x41, 0xCC, 0x86, 0xCC,
+	0x83, 0xCA, 0x05, 0x41, 0xCC, 0x86, 0xCC, 0x89,
+	0xCA, 0x05, 0x41, 0xCC, 0x87, 0xCC, 0x84, 0xCA,
+	0x05, 0x41, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05,
+	0x41, 0xCC, 0x8A, 0xCC, 0x81, 0xCA, 0x05, 0x41,
+	// Bytes 38c0 - 38ff
+	0xCC, 0xA3, 0xCC, 0x82, 0xCA, 0x05, 0x41, 0xCC,
+	0xA3, 0xCC, 0x86, 0xCA, 0x05, 0x43, 0xCC, 0xA7,
+	0xCC, 0x81, 0xCA, 0x05, 0x45, 0xCC, 0x82, 0xCC,
+	0x80, 0xCA, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x81,
+	0xCA, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x83, 0xCA,
+	0x05, 0x45, 0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05,
+	0x45, 0xCC, 0x84, 0xCC, 0x80, 0xCA, 0x05, 0x45,
+	0xCC, 0x84, 0xCC, 0x81, 0xCA, 0x05, 0x45, 0xCC,
+	// Bytes 3900 - 393f
+	0xA3, 0xCC, 0x82, 0xCA, 0x05, 0x45, 0xCC, 0xA7,
+	0xCC, 0x86, 0xCA, 0x05, 0x49, 0xCC, 0x88, 0xCC,
+	0x81, 0xCA, 0x05, 0x4C, 0xCC, 0xA3, 0xCC, 0x84,
+	0xCA, 0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x80, 0xCA,
+	0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05,
+	0x4F, 0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x4F,
+	0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05, 0x4F, 0xCC,
+	0x83, 0xCC, 0x81, 0xCA, 0x05, 0x4F, 0xCC, 0x83,
+	// Bytes 3940 - 397f
+	0xCC, 0x84, 0xCA, 0x05, 0x4F, 0xCC, 0x83, 0xCC,
+	0x88, 0xCA, 0x05, 0x4F, 0xCC, 0x84, 0xCC, 0x80,
+	0xCA, 0x05, 0x4F, 0xCC, 0x84, 0xCC, 0x81, 0xCA,
+	0x05, 0x4F, 0xCC, 0x87, 0xCC, 0x84, 0xCA, 0x05,
+	0x4F, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x4F,
+	0xCC, 0x9B, 0xCC, 0x80, 0xCA, 0x05, 0x4F, 0xCC,
+	0x9B, 0xCC, 0x81, 0xCA, 0x05, 0x4F, 0xCC, 0x9B,
+	0xCC, 0x83, 0xCA, 0x05, 0x4F, 0xCC, 0x9B, 0xCC,
+	// Bytes 3980 - 39bf
+	0x89, 0xCA, 0x05, 0x4F, 0xCC, 0x9B, 0xCC, 0xA3,
+	0xB6, 0x05, 0x4F, 0xCC, 0xA3, 0xCC, 0x82, 0xCA,
+	0x05, 0x4F, 0xCC, 0xA8, 0xCC, 0x84, 0xCA, 0x05,
+	0x52, 0xCC, 0xA3, 0xCC, 0x84, 0xCA, 0x05, 0x53,
+	0xCC, 0x81, 0xCC, 0x87, 0xCA, 0x05, 0x53, 0xCC,
+	0x8C, 0xCC, 0x87, 0xCA, 0x05, 0x53, 0xCC, 0xA3,
+	0xCC, 0x87, 0xCA, 0x05, 0x55, 0xCC, 0x83, 0xCC,
+	0x81, 0xCA, 0x05, 0x55, 0xCC, 0x84, 0xCC, 0x88,
+	// Bytes 39c0 - 39ff
+	0xCA, 0x05, 0x55, 0xCC, 0x88, 0xCC, 0x80, 0xCA,
+	0x05, 0x55, 0xCC, 0x88, 0xCC, 0x81, 0xCA, 0x05,
+	0x55, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x55,
+	0xCC, 0x88, 0xCC, 0x8C, 0xCA, 0x05, 0x55, 0xCC,
+	0x9B, 0xCC, 0x80, 0xCA, 0x05, 0x55, 0xCC, 0x9B,
+	0xCC, 0x81, 0xCA, 0x05, 0x55, 0xCC, 0x9B, 0xCC,
+	0x83, 0xCA, 0x05, 0x55, 0xCC, 0x9B, 0xCC, 0x89,
+	0xCA, 0x05, 0x55, 0xCC, 0x9B, 0xCC, 0xA3, 0xB6,
+	// Bytes 3a00 - 3a3f
+	0x05, 0x61, 0xCC, 0x82, 0xCC, 0x80, 0xCA, 0x05,
+	0x61, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05, 0x61,
+	0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x61, 0xCC,
+	0x82, 0xCC, 0x89, 0xCA, 0x05, 0x61, 0xCC, 0x86,
+	0xCC, 0x80, 0xCA, 0x05, 0x61, 0xCC, 0x86, 0xCC,
+	0x81, 0xCA, 0x05, 0x61, 0xCC, 0x86, 0xCC, 0x83,
+	0xCA, 0x05, 0x61, 0xCC, 0x86, 0xCC, 0x89, 0xCA,
+	0x05, 0x61, 0xCC, 0x87, 0xCC, 0x84, 0xCA, 0x05,
+	// Bytes 3a40 - 3a7f
+	0x61, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x61,
+	0xCC, 0x8A, 0xCC, 0x81, 0xCA, 0x05, 0x61, 0xCC,
+	0xA3, 0xCC, 0x82, 0xCA, 0x05, 0x61, 0xCC, 0xA3,
+	0xCC, 0x86, 0xCA, 0x05, 0x63, 0xCC, 0xA7, 0xCC,
+	0x81, 0xCA, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x80,
+	0xCA, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x81, 0xCA,
+	0x05, 0x65, 0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05,
+	0x65, 0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05, 0x65,
+	// Bytes 3a80 - 3abf
+	0xCC, 0x84, 0xCC, 0x80, 0xCA, 0x05, 0x65, 0xCC,
+	0x84, 0xCC, 0x81, 0xCA, 0x05, 0x65, 0xCC, 0xA3,
+	0xCC, 0x82, 0xCA, 0x05, 0x65, 0xCC, 0xA7, 0xCC,
+	0x86, 0xCA, 0x05, 0x69, 0xCC, 0x88, 0xCC, 0x81,
+	0xCA, 0x05, 0x6C, 0xCC, 0xA3, 0xCC, 0x84, 0xCA,
+	0x05, 0x6F, 0xCC, 0x82, 0xCC, 0x80, 0xCA, 0x05,
+	0x6F, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05, 0x6F,
+	0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x6F, 0xCC,
+	// Bytes 3ac0 - 3aff
+	0x82, 0xCC, 0x89, 0xCA, 0x05, 0x6F, 0xCC, 0x83,
+	0xCC, 0x81, 0xCA, 0x05, 0x6F, 0xCC, 0x83, 0xCC,
+	0x84, 0xCA, 0x05, 0x6F, 0xCC, 0x83, 0xCC, 0x88,
+	0xCA, 0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x80, 0xCA,
+	0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x81, 0xCA, 0x05,
+	0x6F, 0xCC, 0x87, 0xCC, 0x84, 0xCA, 0x05, 0x6F,
+	0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x6F, 0xCC,
+	0x9B, 0xCC, 0x80, 0xCA, 0x05, 0x6F, 0xCC, 0x9B,
+	// Bytes 3b00 - 3b3f
+	0xCC, 0x81, 0xCA, 0x05, 0x6F, 0xCC, 0x9B, 0xCC,
+	0x83, 0xCA, 0x05, 0x6F, 0xCC, 0x9B, 0xCC, 0x89,
+	0xCA, 0x05, 0x6F, 0xCC, 0x9B, 0xCC, 0xA3, 0xB6,
+	0x05, 0x6F, 0xCC, 0xA3, 0xCC, 0x82, 0xCA, 0x05,
+	0x6F, 0xCC, 0xA8, 0xCC, 0x84, 0xCA, 0x05, 0x72,
+	0xCC, 0xA3, 0xCC, 0x84, 0xCA, 0x05, 0x73, 0xCC,
+	0x81, 0xCC, 0x87, 0xCA, 0x05, 0x73, 0xCC, 0x8C,
+	0xCC, 0x87, 0xCA, 0x05, 0x73, 0xCC, 0xA3, 0xCC,
+	// Bytes 3b40 - 3b7f
+	0x87, 0xCA, 0x05, 0x75, 0xCC, 0x83, 0xCC, 0x81,
+	0xCA, 0x05, 0x75, 0xCC, 0x84, 0xCC, 0x88, 0xCA,
+	0x05, 0x75, 0xCC, 0x88, 0xCC, 0x80, 0xCA, 0x05,
+	0x75, 0xCC, 0x88, 0xCC, 0x81, 0xCA, 0x05, 0x75,
+	0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x75, 0xCC,
+	0x88, 0xCC, 0x8C, 0xCA, 0x05, 0x75, 0xCC, 0x9B,
+	0xCC, 0x80, 0xCA, 0x05, 0x75, 0xCC, 0x9B, 0xCC,
+	0x81, 0xCA, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0x83,
+	// Bytes 3b80 - 3bbf
+	0xCA, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0x89, 0xCA,
+	0x05, 0x75, 0xCC, 0x9B, 0xCC, 0xA3, 0xB6, 0x05,
+	0xE1, 0xBE, 0xBF, 0xCC, 0x80, 0xCA, 0x05, 0xE1,
+	0xBE, 0xBF, 0xCC, 0x81, 0xCA, 0x05, 0xE1, 0xBE,
+	0xBF, 0xCD, 0x82, 0xCA, 0x05, 0xE1, 0xBF, 0xBE,
+	0xCC, 0x80, 0xCA, 0x05, 0xE1, 0xBF, 0xBE, 0xCC,
+	0x81, 0xCA, 0x05, 0xE1, 0xBF, 0xBE, 0xCD, 0x82,
+	0xCA, 0x05, 0xE2, 0x86, 0x90, 0xCC, 0xB8, 0x05,
+	// Bytes 3bc0 - 3bff
+	0x05, 0xE2, 0x86, 0x92, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x86, 0x94, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x87, 0x90, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x87,
+	0x92, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x87, 0x94,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x88, 0x83, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x88, 0x88, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x88, 0x8B, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x88, 0xA3, 0xCC, 0xB8, 0x05, 0x05,
+	// Bytes 3c00 - 3c3f
+	0xE2, 0x88, 0xA5, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x88, 0xBC, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
+	0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x85,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x88, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x89, 0x8D, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x89, 0xA1, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x89, 0xA4, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x89, 0xA5, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	// Bytes 3c40 - 3c7f
+	0x89, 0xB2, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
+	0xB3, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xB6,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xB7, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x89, 0xBA, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x89, 0xBB, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x89, 0xBC, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x89, 0xBD, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x8A, 0x82, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
+	// Bytes 3c80 - 3cbf
+	0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x86,
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x87, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x91, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x8A, 0x92, 0xCC, 0xB8, 0x05,
+	0x05, 0xE2, 0x8A, 0xA2, 0xCC, 0xB8, 0x05, 0x05,
+	0xE2, 0x8A, 0xA8, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
+	0x8A, 0xA9, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
+	0xAB, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB2,
+	// Bytes 3cc0 - 3cff
+	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB3, 0xCC,
+	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB4, 0xCC, 0xB8,
+	0x05, 0x05, 0xE2, 0x8A, 0xB5, 0xCC, 0xB8, 0x05,
+	0x06, 0xCE, 0x91, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0x91, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	// Bytes 3d00 - 3d3f
+	0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	// Bytes 3d40 - 3d7f
+	0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
+	// Bytes 3d80 - 3dbf
+	0x06, 0xCE, 0xA9, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xA9, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCC, 0x80, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCC, 0x81, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB1, 0xCD, 0x82, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	// Bytes 3dc0 - 3dff
+	0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xB7, 0xCC, 0x80, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB7, 0xCC, 0x81, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB7, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB7, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCE, 0xB7, 0xCD, 0x82, 0xCD, 0x85, 0xDA,
+	// Bytes 3e00 - 3e3f
+	0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	// Bytes 3e40 - 3e7f
+	0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
+	0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x80, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x81, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCD, 0x82, 0xCA,
+	// Bytes 3e80 - 3ebf
+	0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCD, 0x82, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
+	0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
+	0x06, 0xCF, 0x89, 0xCC, 0x80, 0xCD, 0x85, 0xDA,
+	0x06, 0xCF, 0x89, 0xCC, 0x81, 0xCD, 0x85, 0xDA,
+	// Bytes 3ec0 - 3eff
+	0x06, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
+	0x06, 0xCF, 0x89, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
+	0x06, 0xCF, 0x89, 0xCD, 0x82, 0xCD, 0x85, 0xDA,
+	0x06, 0xE0, 0xA4, 0xA8, 0xE0, 0xA4, 0xBC, 0x09,
+	0x06, 0xE0, 0xA4, 0xB0, 0xE0, 0xA4, 0xBC, 0x09,
+	0x06, 0xE0, 0xA4, 0xB3, 0xE0, 0xA4, 0xBC, 0x09,
+	0x06, 0xE0, 0xB1, 0x86, 0xE0, 0xB1, 0x96, 0x85,
+	0x06, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8A, 0x11,
+	// Bytes 3f00 - 3f3f
+	0x06, 0xE3, 0x81, 0x86, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x8B, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x8D, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x8F, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x91, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x93, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x95, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x97, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 3f40 - 3f7f
+	0x06, 0xE3, 0x81, 0x99, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x9B, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x9D, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0x9F, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xA1, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xA4, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xA6, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xA8, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 3f80 - 3fbf
+	0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x9A, 0x0D,
+	// Bytes 3fc0 - 3fff
+	0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x82, 0x9D, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xA6, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xAD, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xB1, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 4000 - 403f
+	0x06, 0xE3, 0x82, 0xB3, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xB5, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xB9, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xBD, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x81, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 4040 - 407f
+	0x06, 0xE3, 0x83, 0x84, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x86, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 4080 - 40bf
+	0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A, 0x0D,
+	0x06, 0xE3, 0x83, 0xAF, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0xB0, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0xB1, 0xE3, 0x82, 0x99, 0x0D,
+	// Bytes 40c0 - 40ff
+	0x06, 0xE3, 0x83, 0xB2, 0xE3, 0x82, 0x99, 0x0D,
+	0x06, 0xE3, 0x83, 0xBD, 0xE3, 0x82, 0x99, 0x0D,
+	0x08, 0xCE, 0x91, 0xCC, 0x93, 0xCC, 0x80, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0x91, 0xCC, 0x93, 0xCC,
+	0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0x91, 0xCC,
+	0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x81, 0xCD,
+	// Bytes 4100 - 413f
+	0x85, 0xDB, 0x08, 0xCE, 0x91, 0xCC, 0x94, 0xCD,
+	0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0x97, 0xCC,
+	0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x82, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0x97, 0xCC, 0x94, 0xCC,
+	0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0x97, 0xCC,
+	0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	// Bytes 4140 - 417f
+	0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0xA9, 0xCC, 0x93, 0xCC, 0x80, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xA9, 0xCC, 0x93, 0xCC,
+	0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xA9, 0xCC,
+	0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x81, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xA9, 0xCC, 0x94, 0xCD,
+	// Bytes 4180 - 41bf
+	0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xB1, 0xCC,
+	0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x82, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xB1, 0xCC, 0x94, 0xCC,
+	0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xB1, 0xCC,
+	0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85, 0xDB,
+	// Bytes 41c0 - 41ff
+	0x08, 0xCE, 0xB7, 0xCC, 0x93, 0xCC, 0x80, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xB7, 0xCC, 0x93, 0xCC,
+	0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xB7, 0xCC,
+	0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
+	0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85, 0xDB,
+	0x08, 0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x81, 0xCD,
+	0x85, 0xDB, 0x08, 0xCE, 0xB7, 0xCC, 0x94, 0xCD,
+	0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCF, 0x89, 0xCC,
+	// Bytes 4200 - 423f
+	0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCF,
+	0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85, 0xDB,
+	0x08, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x82, 0xCD,
+	0x85, 0xDB, 0x08, 0xCF, 0x89, 0xCC, 0x94, 0xCC,
+	0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCF, 0x89, 0xCC,
+	0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCF,
+	0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85, 0xDB,
+	0x08, 0xF0, 0x91, 0x82, 0x99, 0xF0, 0x91, 0x82,
+	// Bytes 4240 - 427f
+	0xBA, 0x09, 0x08, 0xF0, 0x91, 0x82, 0x9B, 0xF0,
+	0x91, 0x82, 0xBA, 0x09, 0x08, 0xF0, 0x91, 0x82,
+	0xA5, 0xF0, 0x91, 0x82, 0xBA, 0x09, 0x42, 0xC2,
+	0xB4, 0x01, 0x43, 0x20, 0xCC, 0x81, 0xC9, 0x43,
+	0x20, 0xCC, 0x83, 0xC9, 0x43, 0x20, 0xCC, 0x84,
+	0xC9, 0x43, 0x20, 0xCC, 0x85, 0xC9, 0x43, 0x20,
+	0xCC, 0x86, 0xC9, 0x43, 0x20, 0xCC, 0x87, 0xC9,
+	0x43, 0x20, 0xCC, 0x88, 0xC9, 0x43, 0x20, 0xCC,
+	// Bytes 4280 - 42bf
+	0x8A, 0xC9, 0x43, 0x20, 0xCC, 0x8B, 0xC9, 0x43,
+	0x20, 0xCC, 0x93, 0xC9, 0x43, 0x20, 0xCC, 0x94,
+	0xC9, 0x43, 0x20, 0xCC, 0xA7, 0xA5, 0x43, 0x20,
+	0xCC, 0xA8, 0xA5, 0x43, 0x20, 0xCC, 0xB3, 0xB5,
+	0x43, 0x20, 0xCD, 0x82, 0xC9, 0x43, 0x20, 0xCD,
+	0x85, 0xD9, 0x43, 0x20, 0xD9, 0x8B, 0x59, 0x43,
+	0x20, 0xD9, 0x8C, 0x5D, 0x43, 0x20, 0xD9, 0x8D,
+	0x61, 0x43, 0x20, 0xD9, 0x8E, 0x65, 0x43, 0x20,
+	// Bytes 42c0 - 42ff
+	0xD9, 0x8F, 0x69, 0x43, 0x20, 0xD9, 0x90, 0x6D,
+	0x43, 0x20, 0xD9, 0x91, 0x71, 0x43, 0x20, 0xD9,
+	0x92, 0x75, 0x43, 0x41, 0xCC, 0x8A, 0xC9, 0x43,
+	0x73, 0xCC, 0x87, 0xC9, 0x44, 0x20, 0xE3, 0x82,
+	0x99, 0x0D, 0x44, 0x20, 0xE3, 0x82, 0x9A, 0x0D,
+	0x44, 0xC2, 0xA8, 0xCC, 0x81, 0xCA, 0x44, 0xCE,
+	0x91, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0x95, 0xCC,
+	0x81, 0xC9, 0x44, 0xCE, 0x97, 0xCC, 0x81, 0xC9,
+	// Bytes 4300 - 433f
+	0x44, 0xCE, 0x99, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
+	0x9F, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xA5, 0xCC,
+	0x81, 0xC9, 0x44, 0xCE, 0xA5, 0xCC, 0x88, 0xC9,
+	0x44, 0xCE, 0xA9, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
+	0xB1, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xB5, 0xCC,
+	0x81, 0xC9, 0x44, 0xCE, 0xB7, 0xCC, 0x81, 0xC9,
+	0x44, 0xCE, 0xB9, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
+	0xBF, 0xCC, 0x81, 0xC9, 0x44, 0xCF, 0x85, 0xCC,
+	// Bytes 4340 - 437f
+	0x81, 0xC9, 0x44, 0xCF, 0x89, 0xCC, 0x81, 0xC9,
+	0x44, 0xD7, 0x90, 0xD6, 0xB7, 0x31, 0x44, 0xD7,
+	0x90, 0xD6, 0xB8, 0x35, 0x44, 0xD7, 0x90, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x91, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x91, 0xD6, 0xBF, 0x49, 0x44, 0xD7,
+	0x92, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x93, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x94, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x95, 0xD6, 0xB9, 0x39, 0x44, 0xD7,
+	// Bytes 4380 - 43bf
+	0x95, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x96, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x98, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x99, 0xD6, 0xB4, 0x25, 0x44, 0xD7,
+	0x99, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x9A, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0x9B, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0x9B, 0xD6, 0xBF, 0x49, 0x44, 0xD7,
+	0x9C, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x9E, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0xA0, 0xD6, 0xBC, 0x41,
+	// Bytes 43c0 - 43ff
+	0x44, 0xD7, 0xA1, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0xA3, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA4, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0xA4, 0xD6, 0xBF, 0x49,
+	0x44, 0xD7, 0xA6, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
+	0xA7, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA8, 0xD6,
+	0xBC, 0x41, 0x44, 0xD7, 0xA9, 0xD6, 0xBC, 0x41,
+	0x44, 0xD7, 0xA9, 0xD7, 0x81, 0x4D, 0x44, 0xD7,
+	0xA9, 0xD7, 0x82, 0x51, 0x44, 0xD7, 0xAA, 0xD6,
+	// Bytes 4400 - 443f
+	0xBC, 0x41, 0x44, 0xD7, 0xB2, 0xD6, 0xB7, 0x31,
+	0x44, 0xD8, 0xA7, 0xD9, 0x8B, 0x59, 0x44, 0xD8,
+	0xA7, 0xD9, 0x93, 0xC9, 0x44, 0xD8, 0xA7, 0xD9,
+	0x94, 0xC9, 0x44, 0xD8, 0xA7, 0xD9, 0x95, 0xB5,
+	0x44, 0xD8, 0xB0, 0xD9, 0xB0, 0x79, 0x44, 0xD8,
+	0xB1, 0xD9, 0xB0, 0x79, 0x44, 0xD9, 0x80, 0xD9,
+	0x8B, 0x59, 0x44, 0xD9, 0x80, 0xD9, 0x8E, 0x65,
+	0x44, 0xD9, 0x80, 0xD9, 0x8F, 0x69, 0x44, 0xD9,
+	// Bytes 4440 - 447f
+	0x80, 0xD9, 0x90, 0x6D, 0x44, 0xD9, 0x80, 0xD9,
+	0x91, 0x71, 0x44, 0xD9, 0x80, 0xD9, 0x92, 0x75,
+	0x44, 0xD9, 0x87, 0xD9, 0xB0, 0x79, 0x44, 0xD9,
+	0x88, 0xD9, 0x94, 0xC9, 0x44, 0xD9, 0x89, 0xD9,
+	0xB0, 0x79, 0x44, 0xD9, 0x8A, 0xD9, 0x94, 0xC9,
+	0x44, 0xDB, 0x92, 0xD9, 0x94, 0xC9, 0x44, 0xDB,
+	0x95, 0xD9, 0x94, 0xC9, 0x45, 0x20, 0xCC, 0x88,
+	0xCC, 0x80, 0xCA, 0x45, 0x20, 0xCC, 0x88, 0xCC,
+	// Bytes 4480 - 44bf
+	0x81, 0xCA, 0x45, 0x20, 0xCC, 0x88, 0xCD, 0x82,
+	0xCA, 0x45, 0x20, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
+	0x45, 0x20, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x45,
+	0x20, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x45, 0x20,
+	0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x45, 0x20, 0xCC,
+	0x94, 0xCC, 0x81, 0xCA, 0x45, 0x20, 0xCC, 0x94,
+	0xCD, 0x82, 0xCA, 0x45, 0x20, 0xD9, 0x8C, 0xD9,
+	0x91, 0x72, 0x45, 0x20, 0xD9, 0x8D, 0xD9, 0x91,
+	// Bytes 44c0 - 44ff
+	0x72, 0x45, 0x20, 0xD9, 0x8E, 0xD9, 0x91, 0x72,
+	0x45, 0x20, 0xD9, 0x8F, 0xD9, 0x91, 0x72, 0x45,
+	0x20, 0xD9, 0x90, 0xD9, 0x91, 0x72, 0x45, 0x20,
+	0xD9, 0x91, 0xD9, 0xB0, 0x7A, 0x45, 0xE2, 0xAB,
+	0x9D, 0xCC, 0xB8, 0x05, 0x46, 0xCE, 0xB9, 0xCC,
+	0x88, 0xCC, 0x81, 0xCA, 0x46, 0xCF, 0x85, 0xCC,
+	0x88, 0xCC, 0x81, 0xCA, 0x46, 0xD7, 0xA9, 0xD6,
+	0xBC, 0xD7, 0x81, 0x4E, 0x46, 0xD7, 0xA9, 0xD6,
+	// Bytes 4500 - 453f
+	0xBC, 0xD7, 0x82, 0x52, 0x46, 0xD9, 0x80, 0xD9,
+	0x8E, 0xD9, 0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9,
+	0x8F, 0xD9, 0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9,
+	0x90, 0xD9, 0x91, 0x72, 0x46, 0xE0, 0xA4, 0x95,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x96,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x97,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x9C,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA1,
+	// Bytes 4540 - 457f
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA2,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAB,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAF,
+	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA1,
+	0xE0, 0xA6, 0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA2,
+	0xE0, 0xA6, 0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xAF,
+	0xE0, 0xA6, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x96,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x97,
+	// Bytes 4580 - 45bf
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x9C,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xAB,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB2,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB8,
+	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA1,
+	0xE0, 0xAC, 0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA2,
+	0xE0, 0xAC, 0xBC, 0x09, 0x46, 0xE0, 0xBE, 0xB2,
+	0xE0, 0xBE, 0x80, 0x9D, 0x46, 0xE0, 0xBE, 0xB3,
+	// Bytes 45c0 - 45ff
+	0xE0, 0xBE, 0x80, 0x9D, 0x46, 0xE3, 0x83, 0x86,
+	0xE3, 0x82, 0x99, 0x0D, 0x48, 0xF0, 0x9D, 0x85,
+	0x97, 0xF0, 0x9D, 0x85, 0xA5, 0xAD, 0x48, 0xF0,
+	0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xAD,
+	0x48, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85,
+	0xA5, 0xAD, 0x48, 0xF0, 0x9D, 0x86, 0xBA, 0xF0,
+	0x9D, 0x85, 0xA5, 0xAD, 0x49, 0xE0, 0xBE, 0xB2,
+	0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E, 0x49,
+	// Bytes 4600 - 463f
+	0xE0, 0xBE, 0xB3, 0xE0, 0xBD, 0xB1, 0xE0, 0xBE,
+	0x80, 0x9E, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0,
+	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE,
+	0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85,
+	0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xAE, 0x4C, 0xF0,
+	0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0,
+	0x9D, 0x85, 0xB0, 0xAE, 0x4C, 0xF0, 0x9D, 0x85,
+	0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85,
+	// Bytes 4640 - 467f
+	0xB1, 0xAE, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0,
+	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xB2, 0xAE,
+	0x4C, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85,
+	0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE, 0x4C, 0xF0,
+	0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85, 0xA5, 0xF0,
+	0x9D, 0x85, 0xAF, 0xAE, 0x4C, 0xF0, 0x9D, 0x86,
+	0xBA, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85,
+	0xAE, 0xAE, 0x4C, 0xF0, 0x9D, 0x86, 0xBA, 0xF0,
+	// Bytes 4680 - 46bf
+	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xAE,
+	0x83, 0x41, 0xCC, 0x82, 0xC9, 0x83, 0x41, 0xCC,
+	0x86, 0xC9, 0x83, 0x41, 0xCC, 0x87, 0xC9, 0x83,
+	0x41, 0xCC, 0x88, 0xC9, 0x83, 0x41, 0xCC, 0x8A,
+	0xC9, 0x83, 0x41, 0xCC, 0xA3, 0xB5, 0x83, 0x43,
+	0xCC, 0xA7, 0xA5, 0x83, 0x45, 0xCC, 0x82, 0xC9,
+	0x83, 0x45, 0xCC, 0x84, 0xC9, 0x83, 0x45, 0xCC,
+	0xA3, 0xB5, 0x83, 0x45, 0xCC, 0xA7, 0xA5, 0x83,
+	// Bytes 46c0 - 46ff
+	0x49, 0xCC, 0x88, 0xC9, 0x83, 0x4C, 0xCC, 0xA3,
+	0xB5, 0x83, 0x4F, 0xCC, 0x82, 0xC9, 0x83, 0x4F,
+	0xCC, 0x83, 0xC9, 0x83, 0x4F, 0xCC, 0x84, 0xC9,
+	0x83, 0x4F, 0xCC, 0x87, 0xC9, 0x83, 0x4F, 0xCC,
+	0x88, 0xC9, 0x83, 0x4F, 0xCC, 0x9B, 0xAD, 0x83,
+	0x4F, 0xCC, 0xA3, 0xB5, 0x83, 0x4F, 0xCC, 0xA8,
+	0xA5, 0x83, 0x52, 0xCC, 0xA3, 0xB5, 0x83, 0x53,
+	0xCC, 0x81, 0xC9, 0x83, 0x53, 0xCC, 0x8C, 0xC9,
+	// Bytes 4700 - 473f
+	0x83, 0x53, 0xCC, 0xA3, 0xB5, 0x83, 0x55, 0xCC,
+	0x83, 0xC9, 0x83, 0x55, 0xCC, 0x84, 0xC9, 0x83,
+	0x55, 0xCC, 0x88, 0xC9, 0x83, 0x55, 0xCC, 0x9B,
+	0xAD, 0x83, 0x61, 0xCC, 0x82, 0xC9, 0x83, 0x61,
+	0xCC, 0x86, 0xC9, 0x83, 0x61, 0xCC, 0x87, 0xC9,
+	0x83, 0x61, 0xCC, 0x88, 0xC9, 0x83, 0x61, 0xCC,
+	0x8A, 0xC9, 0x83, 0x61, 0xCC, 0xA3, 0xB5, 0x83,
+	0x63, 0xCC, 0xA7, 0xA5, 0x83, 0x65, 0xCC, 0x82,
+	// Bytes 4740 - 477f
+	0xC9, 0x83, 0x65, 0xCC, 0x84, 0xC9, 0x83, 0x65,
+	0xCC, 0xA3, 0xB5, 0x83, 0x65, 0xCC, 0xA7, 0xA5,
+	0x83, 0x69, 0xCC, 0x88, 0xC9, 0x83, 0x6C, 0xCC,
+	0xA3, 0xB5, 0x83, 0x6F, 0xCC, 0x82, 0xC9, 0x83,
+	0x6F, 0xCC, 0x83, 0xC9, 0x83, 0x6F, 0xCC, 0x84,
+	0xC9, 0x83, 0x6F, 0xCC, 0x87, 0xC9, 0x83, 0x6F,
+	0xCC, 0x88, 0xC9, 0x83, 0x6F, 0xCC, 0x9B, 0xAD,
+	0x83, 0x6F, 0xCC, 0xA3, 0xB5, 0x83, 0x6F, 0xCC,
+	// Bytes 4780 - 47bf
+	0xA8, 0xA5, 0x83, 0x72, 0xCC, 0xA3, 0xB5, 0x83,
+	0x73, 0xCC, 0x81, 0xC9, 0x83, 0x73, 0xCC, 0x8C,
+	0xC9, 0x83, 0x73, 0xCC, 0xA3, 0xB5, 0x83, 0x75,
+	0xCC, 0x83, 0xC9, 0x83, 0x75, 0xCC, 0x84, 0xC9,
+	0x83, 0x75, 0xCC, 0x88, 0xC9, 0x83, 0x75, 0xCC,
+	0x9B, 0xAD, 0x84, 0xCE, 0x91, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0x91, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
+	0x95, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0x95, 0xCC,
+	// Bytes 47c0 - 47ff
+	0x94, 0xC9, 0x84, 0xCE, 0x97, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0x97, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
+	0x99, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0x99, 0xCC,
+	0x94, 0xC9, 0x84, 0xCE, 0x9F, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0x9F, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
+	0xA5, 0xCC, 0x94, 0xC9, 0x84, 0xCE, 0xA9, 0xCC,
+	0x93, 0xC9, 0x84, 0xCE, 0xA9, 0xCC, 0x94, 0xC9,
+	0x84, 0xCE, 0xB1, 0xCC, 0x80, 0xC9, 0x84, 0xCE,
+	// Bytes 4800 - 483f
+	0xB1, 0xCC, 0x81, 0xC9, 0x84, 0xCE, 0xB1, 0xCC,
+	0x93, 0xC9, 0x84, 0xCE, 0xB1, 0xCC, 0x94, 0xC9,
+	0x84, 0xCE, 0xB1, 0xCD, 0x82, 0xC9, 0x84, 0xCE,
+	0xB5, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0xB5, 0xCC,
+	0x94, 0xC9, 0x84, 0xCE, 0xB7, 0xCC, 0x80, 0xC9,
+	0x84, 0xCE, 0xB7, 0xCC, 0x81, 0xC9, 0x84, 0xCE,
+	0xB7, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0xB7, 0xCC,
+	0x94, 0xC9, 0x84, 0xCE, 0xB7, 0xCD, 0x82, 0xC9,
+	// Bytes 4840 - 487f
+	0x84, 0xCE, 0xB9, 0xCC, 0x88, 0xC9, 0x84, 0xCE,
+	0xB9, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0xB9, 0xCC,
+	0x94, 0xC9, 0x84, 0xCE, 0xBF, 0xCC, 0x93, 0xC9,
+	0x84, 0xCE, 0xBF, 0xCC, 0x94, 0xC9, 0x84, 0xCF,
+	0x85, 0xCC, 0x88, 0xC9, 0x84, 0xCF, 0x85, 0xCC,
+	0x93, 0xC9, 0x84, 0xCF, 0x85, 0xCC, 0x94, 0xC9,
+	0x84, 0xCF, 0x89, 0xCC, 0x80, 0xC9, 0x84, 0xCF,
+	0x89, 0xCC, 0x81, 0xC9, 0x84, 0xCF, 0x89, 0xCC,
+	// Bytes 4880 - 48bf
+	0x93, 0xC9, 0x84, 0xCF, 0x89, 0xCC, 0x94, 0xC9,
+	0x84, 0xCF, 0x89, 0xCD, 0x82, 0xC9, 0x86, 0xCE,
+	0x91, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0x91, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	// Bytes 48c0 - 48ff
+	0x97, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	// Bytes 4900 - 493f
+	0xA9, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xA9, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	// Bytes 4940 - 497f
+	0xB1, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
+	0xB7, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCF,
+	// Bytes 4980 - 49bf
+	0x89, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCF,
+	0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x42, 0xCC,
+	0x80, 0xC9, 0x32, 0x42, 0xCC, 0x81, 0xC9, 0x32,
+	0x42, 0xCC, 0x93, 0xC9, 0x32, 0x43, 0xE1, 0x85,
+	// Bytes 49c0 - 49ff
+	0xA1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA2, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xA3, 0x01, 0x00, 0x43,
+	0xE1, 0x85, 0xA4, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xA5, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA6, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xA7, 0x01, 0x00, 0x43,
+	0xE1, 0x85, 0xA8, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xA9, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAA, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xAB, 0x01, 0x00, 0x43,
+	// Bytes 4a00 - 4a3f
+	0xE1, 0x85, 0xAC, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xAD, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAE, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xAF, 0x01, 0x00, 0x43,
+	0xE1, 0x85, 0xB0, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xB1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xB2, 0x01,
+	0x00, 0x43, 0xE1, 0x85, 0xB3, 0x01, 0x00, 0x43,
+	0xE1, 0x85, 0xB4, 0x01, 0x00, 0x43, 0xE1, 0x85,
+	0xB5, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xAA, 0x01,
+	// Bytes 4a40 - 4a7f
+	0x00, 0x43, 0xE1, 0x86, 0xAC, 0x01, 0x00, 0x43,
+	0xE1, 0x86, 0xAD, 0x01, 0x00, 0x43, 0xE1, 0x86,
+	0xB0, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB1, 0x01,
+	0x00, 0x43, 0xE1, 0x86, 0xB2, 0x01, 0x00, 0x43,
+	0xE1, 0x86, 0xB3, 0x01, 0x00, 0x43, 0xE1, 0x86,
+	0xB4, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB5, 0x01,
+	0x00, 0x44, 0xCC, 0x88, 0xCC, 0x81, 0xCA, 0x32,
+	0x43, 0xE3, 0x82, 0x99, 0x0D, 0x03, 0x43, 0xE3,
+	// Bytes 4a80 - 4abf
+	0x82, 0x9A, 0x0D, 0x03, 0x46, 0xE0, 0xBD, 0xB1,
+	0xE0, 0xBD, 0xB2, 0x9E, 0x26, 0x46, 0xE0, 0xBD,
+	0xB1, 0xE0, 0xBD, 0xB4, 0xA2, 0x26, 0x46, 0xE0,
+	0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E, 0x26, 0x00,
+	0x01,
+}
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfcTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfcTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfcValues[c0]
+	}
+	i := nfcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfcTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfcTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfcValues[c0]
+	}
+	i := nfcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// nfcTrie. Total size: 10332 bytes (10.09 KiB). Checksum: 51cc525b297fc970.
+type nfcTrie struct{}
+
+func newNfcTrie(i int) *nfcTrie {
+	return &nfcTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *nfcTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	case n < 44:
+		return uint16(nfcValues[n<<6+uint32(b)])
+	default:
+		n -= 44
+		return uint16(nfcSparse.lookup(n, b))
+	}
+}
+
+// nfcValues: 46 blocks, 2944 entries, 5888 bytes
+// The third block is the zero block.
+var nfcValues = [2944]uint16{
+	// Block 0x0, offset 0x0
+	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
+	// Block 0x1, offset 0x40
+	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
+	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
+	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
+	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
+	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
+	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
+	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
+	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
+	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
+	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x4688, 0xc3: 0x2f79, 0xc4: 0x4697, 0xc5: 0x469c,
+	0xc6: 0xa000, 0xc7: 0x46a6, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x46ab, 0xcb: 0x2ffb,
+	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x46bf, 0xd1: 0x3104,
+	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x46c9, 0xd5: 0x46ce, 0xd6: 0x46dd,
+	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x470f, 0xdd: 0x3235,
+	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x4719, 0xe3: 0x3285,
+	0xe4: 0x4728, 0xe5: 0x472d, 0xe6: 0xa000, 0xe7: 0x4737, 0xe8: 0x32ee, 0xe9: 0x32f3,
+	0xea: 0x473c, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x4750,
+	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x475a, 0xf5: 0x475f,
+	0xf6: 0x476e, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
+	0xfc: 0x47a0, 0xfd: 0x3550, 0xff: 0x3569,
+	// Block 0x4, offset 0x100
+	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x468d, 0x103: 0x471e, 0x104: 0x2f9c, 0x105: 0x32a8,
+	0x106: 0x2fb0, 0x107: 0x32bc, 0x108: 0x2fb5, 0x109: 0x32c1, 0x10a: 0x2fba, 0x10b: 0x32c6,
+	0x10c: 0x2fbf, 0x10d: 0x32cb, 0x10e: 0x2fc9, 0x10f: 0x32d5,
+	0x112: 0x46b0, 0x113: 0x4741, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
+	0x118: 0x3014, 0x119: 0x3320, 0x11a: 0x3005, 0x11b: 0x3311, 0x11c: 0x302d, 0x11d: 0x3339,
+	0x11e: 0x3037, 0x11f: 0x3343, 0x120: 0x303c, 0x121: 0x3348, 0x122: 0x3046, 0x123: 0x3352,
+	0x124: 0x304b, 0x125: 0x3357, 0x128: 0x307d, 0x129: 0x338e,
+	0x12a: 0x3082, 0x12b: 0x3393, 0x12c: 0x3087, 0x12d: 0x3398, 0x12e: 0x30aa, 0x12f: 0x33b6,
+	0x130: 0x308c, 0x134: 0x30b4, 0x135: 0x33c0,
+	0x136: 0x30c8, 0x137: 0x33d9, 0x139: 0x30d2, 0x13a: 0x33e3, 0x13b: 0x30dc,
+	0x13c: 0x33ed, 0x13d: 0x30d7, 0x13e: 0x33e8,
+	// Block 0x5, offset 0x140
+	0x143: 0x30ff, 0x144: 0x3410, 0x145: 0x3118,
+	0x146: 0x3429, 0x147: 0x310e, 0x148: 0x341f,
+	0x14c: 0x46d3, 0x14d: 0x4764, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
+	0x154: 0x3159, 0x155: 0x346a, 0x156: 0x3172, 0x157: 0x3483,
+	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x46f6, 0x15b: 0x4787, 0x15c: 0x317c, 0x15d: 0x348d,
+	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x46fb, 0x161: 0x478c, 0x162: 0x31a4, 0x163: 0x34ba,
+	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x4705, 0x169: 0x4796,
+	0x16a: 0x470a, 0x16b: 0x479b, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
+	0x170: 0x31d1, 0x171: 0x34e7, 0x172: 0x31ef, 0x173: 0x3505, 0x174: 0x3212, 0x175: 0x3528,
+	0x176: 0x323a, 0x177: 0x3555, 0x178: 0x324e, 0x179: 0x325d, 0x17a: 0x357d, 0x17b: 0x3267,
+	0x17c: 0x3587, 0x17d: 0x326c, 0x17e: 0x358c, 0x17f: 0xa000,
+	// Block 0x6, offset 0x180
+	0x184: 0x8100, 0x185: 0x8100,
+	0x186: 0x8100,
+	0x18d: 0x2f88, 0x18e: 0x3294, 0x18f: 0x3096, 0x190: 0x33a2, 0x191: 0x3140,
+	0x192: 0x3451, 0x193: 0x31d6, 0x194: 0x34ec, 0x195: 0x39cf, 0x196: 0x3b5e, 0x197: 0x39c8,
+	0x198: 0x3b57, 0x199: 0x39d6, 0x19a: 0x3b65, 0x19b: 0x39c1, 0x19c: 0x3b50,
+	0x19e: 0x38b0, 0x19f: 0x3a3f, 0x1a0: 0x38a9, 0x1a1: 0x3a38, 0x1a2: 0x35b3, 0x1a3: 0x35c5,
+	0x1a6: 0x3041, 0x1a7: 0x334d, 0x1a8: 0x30be, 0x1a9: 0x33cf,
+	0x1aa: 0x46ec, 0x1ab: 0x477d, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
+	0x1b0: 0x33c5, 0x1b4: 0x3028, 0x1b5: 0x3334,
+	0x1b8: 0x30fa, 0x1b9: 0x340b, 0x1ba: 0x38b7, 0x1bb: 0x3a46,
+	0x1bc: 0x35ad, 0x1bd: 0x35bf, 0x1be: 0x35b9, 0x1bf: 0x35cb,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x2f8d, 0x1c1: 0x3299, 0x1c2: 0x2f92, 0x1c3: 0x329e, 0x1c4: 0x300a, 0x1c5: 0x3316,
+	0x1c6: 0x300f, 0x1c7: 0x331b, 0x1c8: 0x309b, 0x1c9: 0x33a7, 0x1ca: 0x30a0, 0x1cb: 0x33ac,
+	0x1cc: 0x3145, 0x1cd: 0x3456, 0x1ce: 0x314a, 0x1cf: 0x345b, 0x1d0: 0x3168, 0x1d1: 0x3479,
+	0x1d2: 0x316d, 0x1d3: 0x347e, 0x1d4: 0x31db, 0x1d5: 0x34f1, 0x1d6: 0x31e0, 0x1d7: 0x34f6,
+	0x1d8: 0x3186, 0x1d9: 0x3497, 0x1da: 0x319f, 0x1db: 0x34b5,
+	0x1de: 0x305a, 0x1df: 0x3366,
+	0x1e6: 0x4692, 0x1e7: 0x4723, 0x1e8: 0x46ba, 0x1e9: 0x474b,
+	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x46d8, 0x1ef: 0x4769,
+	0x1f0: 0x3958, 0x1f1: 0x3ae7, 0x1f2: 0x3244, 0x1f3: 0x355f,
+	// Block 0x8, offset 0x200
+	0x200: 0x9932, 0x201: 0x9932, 0x202: 0x9932, 0x203: 0x9932, 0x204: 0x9932, 0x205: 0x8132,
+	0x206: 0x9932, 0x207: 0x9932, 0x208: 0x9932, 0x209: 0x9932, 0x20a: 0x9932, 0x20b: 0x9932,
+	0x20c: 0x9932, 0x20d: 0x8132, 0x20e: 0x8132, 0x20f: 0x9932, 0x210: 0x8132, 0x211: 0x9932,
+	0x212: 0x8132, 0x213: 0x9932, 0x214: 0x9932, 0x215: 0x8133, 0x216: 0x812d, 0x217: 0x812d,
+	0x218: 0x812d, 0x219: 0x812d, 0x21a: 0x8133, 0x21b: 0x992b, 0x21c: 0x812d, 0x21d: 0x812d,
+	0x21e: 0x812d, 0x21f: 0x812d, 0x220: 0x812d, 0x221: 0x8129, 0x222: 0x8129, 0x223: 0x992d,
+	0x224: 0x992d, 0x225: 0x992d, 0x226: 0x992d, 0x227: 0x9929, 0x228: 0x9929, 0x229: 0x812d,
+	0x22a: 0x812d, 0x22b: 0x812d, 0x22c: 0x812d, 0x22d: 0x992d, 0x22e: 0x992d, 0x22f: 0x812d,
+	0x230: 0x992d, 0x231: 0x992d, 0x232: 0x812d, 0x233: 0x812d, 0x234: 0x8101, 0x235: 0x8101,
+	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812d, 0x23a: 0x812d, 0x23b: 0x812d,
+	0x23c: 0x812d, 0x23d: 0x8132, 0x23e: 0x8132, 0x23f: 0x8132,
+	// Block 0x9, offset 0x240
+	0x240: 0x49ae, 0x241: 0x49b3, 0x242: 0x9932, 0x243: 0x49b8, 0x244: 0x4a71, 0x245: 0x9936,
+	0x246: 0x8132, 0x247: 0x812d, 0x248: 0x812d, 0x249: 0x812d, 0x24a: 0x8132, 0x24b: 0x8132,
+	0x24c: 0x8132, 0x24d: 0x812d, 0x24e: 0x812d, 0x250: 0x8132, 0x251: 0x8132,
+	0x252: 0x8132, 0x253: 0x812d, 0x254: 0x812d, 0x255: 0x812d, 0x256: 0x812d, 0x257: 0x8132,
+	0x258: 0x8133, 0x259: 0x812d, 0x25a: 0x812d, 0x25b: 0x8132, 0x25c: 0x8134, 0x25d: 0x8135,
+	0x25e: 0x8135, 0x25f: 0x8134, 0x260: 0x8135, 0x261: 0x8135, 0x262: 0x8134, 0x263: 0x8132,
+	0x264: 0x8132, 0x265: 0x8132, 0x266: 0x8132, 0x267: 0x8132, 0x268: 0x8132, 0x269: 0x8132,
+	0x26a: 0x8132, 0x26b: 0x8132, 0x26c: 0x8132, 0x26d: 0x8132, 0x26e: 0x8132, 0x26f: 0x8132,
+	0x274: 0x0170,
+	0x27a: 0x8100,
+	0x27e: 0x0037,
+	// Block 0xa, offset 0x280
+	0x284: 0x8100, 0x285: 0x35a1,
+	0x286: 0x35e9, 0x287: 0x00ce, 0x288: 0x3607, 0x289: 0x3613, 0x28a: 0x3625,
+	0x28c: 0x3643, 0x28e: 0x3655, 0x28f: 0x3673, 0x290: 0x3e08, 0x291: 0xa000,
+	0x295: 0xa000, 0x297: 0xa000,
+	0x299: 0xa000,
+	0x29f: 0xa000, 0x2a1: 0xa000,
+	0x2a5: 0xa000, 0x2a9: 0xa000,
+	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x47fe, 0x2ad: 0x3697, 0x2ae: 0x4828, 0x2af: 0x36a9,
+	0x2b0: 0x3e70, 0x2b1: 0xa000, 0x2b5: 0xa000,
+	0x2b7: 0xa000, 0x2b9: 0xa000,
+	0x2bf: 0xa000,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x3721, 0x2c1: 0x372d, 0x2c3: 0x371b,
+	0x2c6: 0xa000, 0x2c7: 0x3709,
+	0x2cc: 0x375d, 0x2cd: 0x3745, 0x2ce: 0x376f, 0x2d0: 0xa000,
+	0x2d3: 0xa000, 0x2d5: 0xa000, 0x2d6: 0xa000, 0x2d7: 0xa000,
+	0x2d8: 0xa000, 0x2d9: 0x3751, 0x2da: 0xa000,
+	0x2de: 0xa000, 0x2e3: 0xa000,
+	0x2e7: 0xa000,
+	0x2eb: 0xa000, 0x2ed: 0xa000,
+	0x2f0: 0xa000, 0x2f3: 0xa000, 0x2f5: 0xa000,
+	0x2f6: 0xa000, 0x2f7: 0xa000, 0x2f8: 0xa000, 0x2f9: 0x37d5, 0x2fa: 0xa000,
+	0x2fe: 0xa000,
+	// Block 0xc, offset 0x300
+	0x301: 0x3733, 0x302: 0x37b7,
+	0x310: 0x370f, 0x311: 0x3793,
+	0x312: 0x3715, 0x313: 0x3799, 0x316: 0x3727, 0x317: 0x37ab,
+	0x318: 0xa000, 0x319: 0xa000, 0x31a: 0x3829, 0x31b: 0x382f, 0x31c: 0x3739, 0x31d: 0x37bd,
+	0x31e: 0x373f, 0x31f: 0x37c3, 0x322: 0x374b, 0x323: 0x37cf,
+	0x324: 0x3757, 0x325: 0x37db, 0x326: 0x3763, 0x327: 0x37e7, 0x328: 0xa000, 0x329: 0xa000,
+	0x32a: 0x3835, 0x32b: 0x383b, 0x32c: 0x378d, 0x32d: 0x3811, 0x32e: 0x3769, 0x32f: 0x37ed,
+	0x330: 0x3775, 0x331: 0x37f9, 0x332: 0x377b, 0x333: 0x37ff, 0x334: 0x3781, 0x335: 0x3805,
+	0x338: 0x3787, 0x339: 0x380b,
+	// Block 0xd, offset 0x340
+	0x351: 0x812d,
+	0x352: 0x8132, 0x353: 0x8132, 0x354: 0x8132, 0x355: 0x8132, 0x356: 0x812d, 0x357: 0x8132,
+	0x358: 0x8132, 0x359: 0x8132, 0x35a: 0x812e, 0x35b: 0x812d, 0x35c: 0x8132, 0x35d: 0x8132,
+	0x35e: 0x8132, 0x35f: 0x8132, 0x360: 0x8132, 0x361: 0x8132, 0x362: 0x812d, 0x363: 0x812d,
+	0x364: 0x812d, 0x365: 0x812d, 0x366: 0x812d, 0x367: 0x812d, 0x368: 0x8132, 0x369: 0x8132,
+	0x36a: 0x812d, 0x36b: 0x8132, 0x36c: 0x8132, 0x36d: 0x812e, 0x36e: 0x8131, 0x36f: 0x8132,
+	0x370: 0x8105, 0x371: 0x8106, 0x372: 0x8107, 0x373: 0x8108, 0x374: 0x8109, 0x375: 0x810a,
+	0x376: 0x810b, 0x377: 0x810c, 0x378: 0x810d, 0x379: 0x810e, 0x37a: 0x810e, 0x37b: 0x810f,
+	0x37c: 0x8110, 0x37d: 0x8111, 0x37f: 0x8112,
+	// Block 0xe, offset 0x380
+	0x388: 0xa000, 0x38a: 0xa000, 0x38b: 0x8116,
+	0x38c: 0x8117, 0x38d: 0x8118, 0x38e: 0x8119, 0x38f: 0x811a, 0x390: 0x811b, 0x391: 0x811c,
+	0x392: 0x811d, 0x393: 0x9932, 0x394: 0x9932, 0x395: 0x992d, 0x396: 0x812d, 0x397: 0x8132,
+	0x398: 0x8132, 0x399: 0x8132, 0x39a: 0x8132, 0x39b: 0x8132, 0x39c: 0x812d, 0x39d: 0x8132,
+	0x39e: 0x8132, 0x39f: 0x812d,
+	0x3b0: 0x811e,
+	// Block 0xf, offset 0x3c0
+	0x3c5: 0xa000,
+	0x3c6: 0x2d26, 0x3c7: 0xa000, 0x3c8: 0x2d2e, 0x3c9: 0xa000, 0x3ca: 0x2d36, 0x3cb: 0xa000,
+	0x3cc: 0x2d3e, 0x3cd: 0xa000, 0x3ce: 0x2d46, 0x3d1: 0xa000,
+	0x3d2: 0x2d4e,
+	0x3f4: 0x8102, 0x3f5: 0x9900,
+	0x3fa: 0xa000, 0x3fb: 0x2d56,
+	0x3fc: 0xa000, 0x3fd: 0x2d5e, 0x3fe: 0xa000, 0x3ff: 0xa000,
+	// Block 0x10, offset 0x400
+	0x400: 0x2f97, 0x401: 0x32a3, 0x402: 0x2fa1, 0x403: 0x32ad, 0x404: 0x2fa6, 0x405: 0x32b2,
+	0x406: 0x2fab, 0x407: 0x32b7, 0x408: 0x38cc, 0x409: 0x3a5b, 0x40a: 0x2fc4, 0x40b: 0x32d0,
+	0x40c: 0x2fce, 0x40d: 0x32da, 0x40e: 0x2fdd, 0x40f: 0x32e9, 0x410: 0x2fd3, 0x411: 0x32df,
+	0x412: 0x2fd8, 0x413: 0x32e4, 0x414: 0x38ef, 0x415: 0x3a7e, 0x416: 0x38f6, 0x417: 0x3a85,
+	0x418: 0x3019, 0x419: 0x3325, 0x41a: 0x301e, 0x41b: 0x332a, 0x41c: 0x3904, 0x41d: 0x3a93,
+	0x41e: 0x3023, 0x41f: 0x332f, 0x420: 0x3032, 0x421: 0x333e, 0x422: 0x3050, 0x423: 0x335c,
+	0x424: 0x305f, 0x425: 0x336b, 0x426: 0x3055, 0x427: 0x3361, 0x428: 0x3064, 0x429: 0x3370,
+	0x42a: 0x3069, 0x42b: 0x3375, 0x42c: 0x30af, 0x42d: 0x33bb, 0x42e: 0x390b, 0x42f: 0x3a9a,
+	0x430: 0x30b9, 0x431: 0x33ca, 0x432: 0x30c3, 0x433: 0x33d4, 0x434: 0x30cd, 0x435: 0x33de,
+	0x436: 0x46c4, 0x437: 0x4755, 0x438: 0x3912, 0x439: 0x3aa1, 0x43a: 0x30e6, 0x43b: 0x33f7,
+	0x43c: 0x30e1, 0x43d: 0x33f2, 0x43e: 0x30eb, 0x43f: 0x33fc,
+	// Block 0x11, offset 0x440
+	0x440: 0x30f0, 0x441: 0x3401, 0x442: 0x30f5, 0x443: 0x3406, 0x444: 0x3109, 0x445: 0x341a,
+	0x446: 0x3113, 0x447: 0x3424, 0x448: 0x3122, 0x449: 0x3433, 0x44a: 0x311d, 0x44b: 0x342e,
+	0x44c: 0x3935, 0x44d: 0x3ac4, 0x44e: 0x3943, 0x44f: 0x3ad2, 0x450: 0x394a, 0x451: 0x3ad9,
+	0x452: 0x3951, 0x453: 0x3ae0, 0x454: 0x314f, 0x455: 0x3460, 0x456: 0x3154, 0x457: 0x3465,
+	0x458: 0x315e, 0x459: 0x346f, 0x45a: 0x46f1, 0x45b: 0x4782, 0x45c: 0x3997, 0x45d: 0x3b26,
+	0x45e: 0x3177, 0x45f: 0x3488, 0x460: 0x3181, 0x461: 0x3492, 0x462: 0x4700, 0x463: 0x4791,
+	0x464: 0x399e, 0x465: 0x3b2d, 0x466: 0x39a5, 0x467: 0x3b34, 0x468: 0x39ac, 0x469: 0x3b3b,
+	0x46a: 0x3190, 0x46b: 0x34a1, 0x46c: 0x319a, 0x46d: 0x34b0, 0x46e: 0x31ae, 0x46f: 0x34c4,
+	0x470: 0x31a9, 0x471: 0x34bf, 0x472: 0x31ea, 0x473: 0x3500, 0x474: 0x31f9, 0x475: 0x350f,
+	0x476: 0x31f4, 0x477: 0x350a, 0x478: 0x39b3, 0x479: 0x3b42, 0x47a: 0x39ba, 0x47b: 0x3b49,
+	0x47c: 0x31fe, 0x47d: 0x3514, 0x47e: 0x3203, 0x47f: 0x3519,
+	// Block 0x12, offset 0x480
+	0x480: 0x3208, 0x481: 0x351e, 0x482: 0x320d, 0x483: 0x3523, 0x484: 0x321c, 0x485: 0x3532,
+	0x486: 0x3217, 0x487: 0x352d, 0x488: 0x3221, 0x489: 0x353c, 0x48a: 0x3226, 0x48b: 0x3541,
+	0x48c: 0x322b, 0x48d: 0x3546, 0x48e: 0x3249, 0x48f: 0x3564, 0x490: 0x3262, 0x491: 0x3582,
+	0x492: 0x3271, 0x493: 0x3591, 0x494: 0x3276, 0x495: 0x3596, 0x496: 0x337a, 0x497: 0x34a6,
+	0x498: 0x3537, 0x499: 0x3573, 0x49b: 0x35d1,
+	0x4a0: 0x46a1, 0x4a1: 0x4732, 0x4a2: 0x2f83, 0x4a3: 0x328f,
+	0x4a4: 0x3878, 0x4a5: 0x3a07, 0x4a6: 0x3871, 0x4a7: 0x3a00, 0x4a8: 0x3886, 0x4a9: 0x3a15,
+	0x4aa: 0x387f, 0x4ab: 0x3a0e, 0x4ac: 0x38be, 0x4ad: 0x3a4d, 0x4ae: 0x3894, 0x4af: 0x3a23,
+	0x4b0: 0x388d, 0x4b1: 0x3a1c, 0x4b2: 0x38a2, 0x4b3: 0x3a31, 0x4b4: 0x389b, 0x4b5: 0x3a2a,
+	0x4b6: 0x38c5, 0x4b7: 0x3a54, 0x4b8: 0x46b5, 0x4b9: 0x4746, 0x4ba: 0x3000, 0x4bb: 0x330c,
+	0x4bc: 0x2fec, 0x4bd: 0x32f8, 0x4be: 0x38da, 0x4bf: 0x3a69,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x38d3, 0x4c1: 0x3a62, 0x4c2: 0x38e8, 0x4c3: 0x3a77, 0x4c4: 0x38e1, 0x4c5: 0x3a70,
+	0x4c6: 0x38fd, 0x4c7: 0x3a8c, 0x4c8: 0x3091, 0x4c9: 0x339d, 0x4ca: 0x30a5, 0x4cb: 0x33b1,
+	0x4cc: 0x46e7, 0x4cd: 0x4778, 0x4ce: 0x3136, 0x4cf: 0x3447, 0x4d0: 0x3920, 0x4d1: 0x3aaf,
+	0x4d2: 0x3919, 0x4d3: 0x3aa8, 0x4d4: 0x392e, 0x4d5: 0x3abd, 0x4d6: 0x3927, 0x4d7: 0x3ab6,
+	0x4d8: 0x3989, 0x4d9: 0x3b18, 0x4da: 0x396d, 0x4db: 0x3afc, 0x4dc: 0x3966, 0x4dd: 0x3af5,
+	0x4de: 0x397b, 0x4df: 0x3b0a, 0x4e0: 0x3974, 0x4e1: 0x3b03, 0x4e2: 0x3982, 0x4e3: 0x3b11,
+	0x4e4: 0x31e5, 0x4e5: 0x34fb, 0x4e6: 0x31c7, 0x4e7: 0x34dd, 0x4e8: 0x39e4, 0x4e9: 0x3b73,
+	0x4ea: 0x39dd, 0x4eb: 0x3b6c, 0x4ec: 0x39f2, 0x4ed: 0x3b81, 0x4ee: 0x39eb, 0x4ef: 0x3b7a,
+	0x4f0: 0x39f9, 0x4f1: 0x3b88, 0x4f2: 0x3230, 0x4f3: 0x354b, 0x4f4: 0x3258, 0x4f5: 0x3578,
+	0x4f6: 0x3253, 0x4f7: 0x356e, 0x4f8: 0x323f, 0x4f9: 0x355a,
+	// Block 0x14, offset 0x500
+	0x500: 0x4804, 0x501: 0x480a, 0x502: 0x491e, 0x503: 0x4936, 0x504: 0x4926, 0x505: 0x493e,
+	0x506: 0x492e, 0x507: 0x4946, 0x508: 0x47aa, 0x509: 0x47b0, 0x50a: 0x488e, 0x50b: 0x48a6,
+	0x50c: 0x4896, 0x50d: 0x48ae, 0x50e: 0x489e, 0x50f: 0x48b6, 0x510: 0x4816, 0x511: 0x481c,
+	0x512: 0x3db8, 0x513: 0x3dc8, 0x514: 0x3dc0, 0x515: 0x3dd0,
+	0x518: 0x47b6, 0x519: 0x47bc, 0x51a: 0x3ce8, 0x51b: 0x3cf8, 0x51c: 0x3cf0, 0x51d: 0x3d00,
+	0x520: 0x482e, 0x521: 0x4834, 0x522: 0x494e, 0x523: 0x4966,
+	0x524: 0x4956, 0x525: 0x496e, 0x526: 0x495e, 0x527: 0x4976, 0x528: 0x47c2, 0x529: 0x47c8,
+	0x52a: 0x48be, 0x52b: 0x48d6, 0x52c: 0x48c6, 0x52d: 0x48de, 0x52e: 0x48ce, 0x52f: 0x48e6,
+	0x530: 0x4846, 0x531: 0x484c, 0x532: 0x3e18, 0x533: 0x3e30, 0x534: 0x3e20, 0x535: 0x3e38,
+	0x536: 0x3e28, 0x537: 0x3e40, 0x538: 0x47ce, 0x539: 0x47d4, 0x53a: 0x3d18, 0x53b: 0x3d30,
+	0x53c: 0x3d20, 0x53d: 0x3d38, 0x53e: 0x3d28, 0x53f: 0x3d40,
+	// Block 0x15, offset 0x540
+	0x540: 0x4852, 0x541: 0x4858, 0x542: 0x3e48, 0x543: 0x3e58, 0x544: 0x3e50, 0x545: 0x3e60,
+	0x548: 0x47da, 0x549: 0x47e0, 0x54a: 0x3d48, 0x54b: 0x3d58,
+	0x54c: 0x3d50, 0x54d: 0x3d60, 0x550: 0x4864, 0x551: 0x486a,
+	0x552: 0x3e80, 0x553: 0x3e98, 0x554: 0x3e88, 0x555: 0x3ea0, 0x556: 0x3e90, 0x557: 0x3ea8,
+	0x559: 0x47e6, 0x55b: 0x3d68, 0x55d: 0x3d70,
+	0x55f: 0x3d78, 0x560: 0x487c, 0x561: 0x4882, 0x562: 0x497e, 0x563: 0x4996,
+	0x564: 0x4986, 0x565: 0x499e, 0x566: 0x498e, 0x567: 0x49a6, 0x568: 0x47ec, 0x569: 0x47f2,
+	0x56a: 0x48ee, 0x56b: 0x4906, 0x56c: 0x48f6, 0x56d: 0x490e, 0x56e: 0x48fe, 0x56f: 0x4916,
+	0x570: 0x47f8, 0x571: 0x431e, 0x572: 0x3691, 0x573: 0x4324, 0x574: 0x4822, 0x575: 0x432a,
+	0x576: 0x36a3, 0x577: 0x4330, 0x578: 0x36c1, 0x579: 0x4336, 0x57a: 0x36d9, 0x57b: 0x433c,
+	0x57c: 0x4870, 0x57d: 0x4342,
+	// Block 0x16, offset 0x580
+	0x580: 0x3da0, 0x581: 0x3da8, 0x582: 0x4184, 0x583: 0x41a2, 0x584: 0x418e, 0x585: 0x41ac,
+	0x586: 0x4198, 0x587: 0x41b6, 0x588: 0x3cd8, 0x589: 0x3ce0, 0x58a: 0x40d0, 0x58b: 0x40ee,
+	0x58c: 0x40da, 0x58d: 0x40f8, 0x58e: 0x40e4, 0x58f: 0x4102, 0x590: 0x3de8, 0x591: 0x3df0,
+	0x592: 0x41c0, 0x593: 0x41de, 0x594: 0x41ca, 0x595: 0x41e8, 0x596: 0x41d4, 0x597: 0x41f2,
+	0x598: 0x3d08, 0x599: 0x3d10, 0x59a: 0x410c, 0x59b: 0x412a, 0x59c: 0x4116, 0x59d: 0x4134,
+	0x59e: 0x4120, 0x59f: 0x413e, 0x5a0: 0x3ec0, 0x5a1: 0x3ec8, 0x5a2: 0x41fc, 0x5a3: 0x421a,
+	0x5a4: 0x4206, 0x5a5: 0x4224, 0x5a6: 0x4210, 0x5a7: 0x422e, 0x5a8: 0x3d80, 0x5a9: 0x3d88,
+	0x5aa: 0x4148, 0x5ab: 0x4166, 0x5ac: 0x4152, 0x5ad: 0x4170, 0x5ae: 0x415c, 0x5af: 0x417a,
+	0x5b0: 0x3685, 0x5b1: 0x367f, 0x5b2: 0x3d90, 0x5b3: 0x368b, 0x5b4: 0x3d98,
+	0x5b6: 0x4810, 0x5b7: 0x3db0, 0x5b8: 0x35f5, 0x5b9: 0x35ef, 0x5ba: 0x35e3, 0x5bb: 0x42ee,
+	0x5bc: 0x35fb, 0x5bd: 0x8100, 0x5be: 0x01d3, 0x5bf: 0xa100,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0x8100, 0x5c1: 0x35a7, 0x5c2: 0x3dd8, 0x5c3: 0x369d, 0x5c4: 0x3de0,
+	0x5c6: 0x483a, 0x5c7: 0x3df8, 0x5c8: 0x3601, 0x5c9: 0x42f4, 0x5ca: 0x360d, 0x5cb: 0x42fa,
+	0x5cc: 0x3619, 0x5cd: 0x3b8f, 0x5ce: 0x3b96, 0x5cf: 0x3b9d, 0x5d0: 0x36b5, 0x5d1: 0x36af,
+	0x5d2: 0x3e00, 0x5d3: 0x44e4, 0x5d6: 0x36bb, 0x5d7: 0x3e10,
+	0x5d8: 0x3631, 0x5d9: 0x362b, 0x5da: 0x361f, 0x5db: 0x4300, 0x5dd: 0x3ba4,
+	0x5de: 0x3bab, 0x5df: 0x3bb2, 0x5e0: 0x36eb, 0x5e1: 0x36e5, 0x5e2: 0x3e68, 0x5e3: 0x44ec,
+	0x5e4: 0x36cd, 0x5e5: 0x36d3, 0x5e6: 0x36f1, 0x5e7: 0x3e78, 0x5e8: 0x3661, 0x5e9: 0x365b,
+	0x5ea: 0x364f, 0x5eb: 0x430c, 0x5ec: 0x3649, 0x5ed: 0x359b, 0x5ee: 0x42e8, 0x5ef: 0x0081,
+	0x5f2: 0x3eb0, 0x5f3: 0x36f7, 0x5f4: 0x3eb8,
+	0x5f6: 0x4888, 0x5f7: 0x3ed0, 0x5f8: 0x363d, 0x5f9: 0x4306, 0x5fa: 0x366d, 0x5fb: 0x4318,
+	0x5fc: 0x3679, 0x5fd: 0x4256, 0x5fe: 0xa100,
+	// Block 0x18, offset 0x600
+	0x601: 0x3c06, 0x603: 0xa000, 0x604: 0x3c0d, 0x605: 0xa000,
+	0x607: 0x3c14, 0x608: 0xa000, 0x609: 0x3c1b,
+	0x60d: 0xa000,
+	0x620: 0x2f65, 0x621: 0xa000, 0x622: 0x3c29,
+	0x624: 0xa000, 0x625: 0xa000,
+	0x62d: 0x3c22, 0x62e: 0x2f60, 0x62f: 0x2f6a,
+	0x630: 0x3c30, 0x631: 0x3c37, 0x632: 0xa000, 0x633: 0xa000, 0x634: 0x3c3e, 0x635: 0x3c45,
+	0x636: 0xa000, 0x637: 0xa000, 0x638: 0x3c4c, 0x639: 0x3c53, 0x63a: 0xa000, 0x63b: 0xa000,
+	0x63c: 0xa000, 0x63d: 0xa000,
+	// Block 0x19, offset 0x640
+	0x640: 0x3c5a, 0x641: 0x3c61, 0x642: 0xa000, 0x643: 0xa000, 0x644: 0x3c76, 0x645: 0x3c7d,
+	0x646: 0xa000, 0x647: 0xa000, 0x648: 0x3c84, 0x649: 0x3c8b,
+	0x651: 0xa000,
+	0x652: 0xa000,
+	0x662: 0xa000,
+	0x668: 0xa000, 0x669: 0xa000,
+	0x66b: 0xa000, 0x66c: 0x3ca0, 0x66d: 0x3ca7, 0x66e: 0x3cae, 0x66f: 0x3cb5,
+	0x672: 0xa000, 0x673: 0xa000, 0x674: 0xa000, 0x675: 0xa000,
+	// Block 0x1a, offset 0x680
+	0x686: 0xa000, 0x68b: 0xa000,
+	0x68c: 0x3f08, 0x68d: 0xa000, 0x68e: 0x3f10, 0x68f: 0xa000, 0x690: 0x3f18, 0x691: 0xa000,
+	0x692: 0x3f20, 0x693: 0xa000, 0x694: 0x3f28, 0x695: 0xa000, 0x696: 0x3f30, 0x697: 0xa000,
+	0x698: 0x3f38, 0x699: 0xa000, 0x69a: 0x3f40, 0x69b: 0xa000, 0x69c: 0x3f48, 0x69d: 0xa000,
+	0x69e: 0x3f50, 0x69f: 0xa000, 0x6a0: 0x3f58, 0x6a1: 0xa000, 0x6a2: 0x3f60,
+	0x6a4: 0xa000, 0x6a5: 0x3f68, 0x6a6: 0xa000, 0x6a7: 0x3f70, 0x6a8: 0xa000, 0x6a9: 0x3f78,
+	0x6af: 0xa000,
+	0x6b0: 0x3f80, 0x6b1: 0x3f88, 0x6b2: 0xa000, 0x6b3: 0x3f90, 0x6b4: 0x3f98, 0x6b5: 0xa000,
+	0x6b6: 0x3fa0, 0x6b7: 0x3fa8, 0x6b8: 0xa000, 0x6b9: 0x3fb0, 0x6ba: 0x3fb8, 0x6bb: 0xa000,
+	0x6bc: 0x3fc0, 0x6bd: 0x3fc8,
+	// Block 0x1b, offset 0x6c0
+	0x6d4: 0x3f00,
+	0x6d9: 0x9903, 0x6da: 0x9903, 0x6db: 0x8100, 0x6dc: 0x8100, 0x6dd: 0xa000,
+	0x6de: 0x3fd0,
+	0x6e6: 0xa000,
+	0x6eb: 0xa000, 0x6ec: 0x3fe0, 0x6ed: 0xa000, 0x6ee: 0x3fe8, 0x6ef: 0xa000,
+	0x6f0: 0x3ff0, 0x6f1: 0xa000, 0x6f2: 0x3ff8, 0x6f3: 0xa000, 0x6f4: 0x4000, 0x6f5: 0xa000,
+	0x6f6: 0x4008, 0x6f7: 0xa000, 0x6f8: 0x4010, 0x6f9: 0xa000, 0x6fa: 0x4018, 0x6fb: 0xa000,
+	0x6fc: 0x4020, 0x6fd: 0xa000, 0x6fe: 0x4028, 0x6ff: 0xa000,
+	// Block 0x1c, offset 0x700
+	0x700: 0x4030, 0x701: 0xa000, 0x702: 0x4038, 0x704: 0xa000, 0x705: 0x4040,
+	0x706: 0xa000, 0x707: 0x4048, 0x708: 0xa000, 0x709: 0x4050,
+	0x70f: 0xa000, 0x710: 0x4058, 0x711: 0x4060,
+	0x712: 0xa000, 0x713: 0x4068, 0x714: 0x4070, 0x715: 0xa000, 0x716: 0x4078, 0x717: 0x4080,
+	0x718: 0xa000, 0x719: 0x4088, 0x71a: 0x4090, 0x71b: 0xa000, 0x71c: 0x4098, 0x71d: 0x40a0,
+	0x72f: 0xa000,
+	0x730: 0xa000, 0x731: 0xa000, 0x732: 0xa000, 0x734: 0x3fd8,
+	0x737: 0x40a8, 0x738: 0x40b0, 0x739: 0x40b8, 0x73a: 0x40c0,
+	0x73d: 0xa000, 0x73e: 0x40c8,
+	// Block 0x1d, offset 0x740
+	0x740: 0x1377, 0x741: 0x0cfb, 0x742: 0x13d3, 0x743: 0x139f, 0x744: 0x0e57, 0x745: 0x06eb,
+	0x746: 0x08df, 0x747: 0x162b, 0x748: 0x162b, 0x749: 0x0a0b, 0x74a: 0x145f, 0x74b: 0x0943,
+	0x74c: 0x0a07, 0x74d: 0x0bef, 0x74e: 0x0fcf, 0x74f: 0x115f, 0x750: 0x1297, 0x751: 0x12d3,
+	0x752: 0x1307, 0x753: 0x141b, 0x754: 0x0d73, 0x755: 0x0dff, 0x756: 0x0eab, 0x757: 0x0f43,
+	0x758: 0x125f, 0x759: 0x1447, 0x75a: 0x1573, 0x75b: 0x070f, 0x75c: 0x08b3, 0x75d: 0x0d87,
+	0x75e: 0x0ecf, 0x75f: 0x1293, 0x760: 0x15c3, 0x761: 0x0ab3, 0x762: 0x0e77, 0x763: 0x1283,
+	0x764: 0x1317, 0x765: 0x0c23, 0x766: 0x11bb, 0x767: 0x12df, 0x768: 0x0b1f, 0x769: 0x0d0f,
+	0x76a: 0x0e17, 0x76b: 0x0f1b, 0x76c: 0x1427, 0x76d: 0x074f, 0x76e: 0x07e7, 0x76f: 0x0853,
+	0x770: 0x0c8b, 0x771: 0x0d7f, 0x772: 0x0ecb, 0x773: 0x0fef, 0x774: 0x1177, 0x775: 0x128b,
+	0x776: 0x12a3, 0x777: 0x13c7, 0x778: 0x14ef, 0x779: 0x15a3, 0x77a: 0x15bf, 0x77b: 0x102b,
+	0x77c: 0x106b, 0x77d: 0x1123, 0x77e: 0x1243, 0x77f: 0x147b,
+	// Block 0x1e, offset 0x780
+	0x780: 0x15cb, 0x781: 0x134b, 0x782: 0x09c7, 0x783: 0x0b3b, 0x784: 0x10db, 0x785: 0x119b,
+	0x786: 0x0eff, 0x787: 0x1033, 0x788: 0x1397, 0x789: 0x14e7, 0x78a: 0x09c3, 0x78b: 0x0a8f,
+	0x78c: 0x0d77, 0x78d: 0x0e2b, 0x78e: 0x0e5f, 0x78f: 0x1113, 0x790: 0x113b, 0x791: 0x14a7,
+	0x792: 0x084f, 0x793: 0x11a7, 0x794: 0x07f3, 0x795: 0x07ef, 0x796: 0x1097, 0x797: 0x1127,
+	0x798: 0x125b, 0x799: 0x14af, 0x79a: 0x1367, 0x79b: 0x0c27, 0x79c: 0x0d73, 0x79d: 0x1357,
+	0x79e: 0x06f7, 0x79f: 0x0a63, 0x7a0: 0x0b93, 0x7a1: 0x0f2f, 0x7a2: 0x0faf, 0x7a3: 0x0873,
+	0x7a4: 0x103b, 0x7a5: 0x075f, 0x7a6: 0x0b77, 0x7a7: 0x06d7, 0x7a8: 0x0deb, 0x7a9: 0x0ca3,
+	0x7aa: 0x110f, 0x7ab: 0x08c7, 0x7ac: 0x09b3, 0x7ad: 0x0ffb, 0x7ae: 0x1263, 0x7af: 0x133b,
+	0x7b0: 0x0db7, 0x7b1: 0x13f7, 0x7b2: 0x0de3, 0x7b3: 0x0c37, 0x7b4: 0x121b, 0x7b5: 0x0c57,
+	0x7b6: 0x0fab, 0x7b7: 0x072b, 0x7b8: 0x07a7, 0x7b9: 0x07eb, 0x7ba: 0x0d53, 0x7bb: 0x10fb,
+	0x7bc: 0x11f3, 0x7bd: 0x1347, 0x7be: 0x145b, 0x7bf: 0x085b,
+	// Block 0x1f, offset 0x7c0
+	0x7c0: 0x090f, 0x7c1: 0x0a17, 0x7c2: 0x0b2f, 0x7c3: 0x0cbf, 0x7c4: 0x0e7b, 0x7c5: 0x103f,
+	0x7c6: 0x1497, 0x7c7: 0x157b, 0x7c8: 0x15cf, 0x7c9: 0x15e7, 0x7ca: 0x0837, 0x7cb: 0x0cf3,
+	0x7cc: 0x0da3, 0x7cd: 0x13eb, 0x7ce: 0x0afb, 0x7cf: 0x0bd7, 0x7d0: 0x0bf3, 0x7d1: 0x0c83,
+	0x7d2: 0x0e6b, 0x7d3: 0x0eb7, 0x7d4: 0x0f67, 0x7d5: 0x108b, 0x7d6: 0x112f, 0x7d7: 0x1193,
+	0x7d8: 0x13db, 0x7d9: 0x126b, 0x7da: 0x1403, 0x7db: 0x147f, 0x7dc: 0x080f, 0x7dd: 0x083b,
+	0x7de: 0x0923, 0x7df: 0x0ea7, 0x7e0: 0x12f3, 0x7e1: 0x133b, 0x7e2: 0x0b1b, 0x7e3: 0x0b8b,
+	0x7e4: 0x0c4f, 0x7e5: 0x0daf, 0x7e6: 0x10d7, 0x7e7: 0x0f23, 0x7e8: 0x073b, 0x7e9: 0x097f,
+	0x7ea: 0x0a63, 0x7eb: 0x0ac7, 0x7ec: 0x0b97, 0x7ed: 0x0f3f, 0x7ee: 0x0f5b, 0x7ef: 0x116b,
+	0x7f0: 0x118b, 0x7f1: 0x1463, 0x7f2: 0x14e3, 0x7f3: 0x14f3, 0x7f4: 0x152f, 0x7f5: 0x0753,
+	0x7f6: 0x107f, 0x7f7: 0x144f, 0x7f8: 0x14cb, 0x7f9: 0x0baf, 0x7fa: 0x0717, 0x7fb: 0x0777,
+	0x7fc: 0x0a67, 0x7fd: 0x0a87, 0x7fe: 0x0caf, 0x7ff: 0x0d73,
+	// Block 0x20, offset 0x800
+	0x800: 0x0ec3, 0x801: 0x0fcb, 0x802: 0x1277, 0x803: 0x1417, 0x804: 0x1623, 0x805: 0x0ce3,
+	0x806: 0x14a3, 0x807: 0x0833, 0x808: 0x0d2f, 0x809: 0x0d3b, 0x80a: 0x0e0f, 0x80b: 0x0e47,
+	0x80c: 0x0f4b, 0x80d: 0x0fa7, 0x80e: 0x1027, 0x80f: 0x110b, 0x810: 0x153b, 0x811: 0x07af,
+	0x812: 0x0c03, 0x813: 0x14b3, 0x814: 0x0767, 0x815: 0x0aab, 0x816: 0x0e2f, 0x817: 0x13df,
+	0x818: 0x0b67, 0x819: 0x0bb7, 0x81a: 0x0d43, 0x81b: 0x0f2f, 0x81c: 0x14bb, 0x81d: 0x0817,
+	0x81e: 0x08ff, 0x81f: 0x0a97, 0x820: 0x0cd3, 0x821: 0x0d1f, 0x822: 0x0d5f, 0x823: 0x0df3,
+	0x824: 0x0f47, 0x825: 0x0fbb, 0x826: 0x1157, 0x827: 0x12f7, 0x828: 0x1303, 0x829: 0x1457,
+	0x82a: 0x14d7, 0x82b: 0x0883, 0x82c: 0x0e4b, 0x82d: 0x0903, 0x82e: 0x0ec7, 0x82f: 0x0f6b,
+	0x830: 0x1287, 0x831: 0x14bf, 0x832: 0x15ab, 0x833: 0x15d3, 0x834: 0x0d37, 0x835: 0x0e27,
+	0x836: 0x11c3, 0x837: 0x10b7, 0x838: 0x10c3, 0x839: 0x10e7, 0x83a: 0x0f17, 0x83b: 0x0e9f,
+	0x83c: 0x1363, 0x83d: 0x0733, 0x83e: 0x122b, 0x83f: 0x081b,
+	// Block 0x21, offset 0x840
+	0x840: 0x080b, 0x841: 0x0b0b, 0x842: 0x0c2b, 0x843: 0x10f3, 0x844: 0x0a53, 0x845: 0x0e03,
+	0x846: 0x0cef, 0x847: 0x13e7, 0x848: 0x12e7, 0x849: 0x14ab, 0x84a: 0x1323, 0x84b: 0x0b27,
+	0x84c: 0x0787, 0x84d: 0x095b, 0x850: 0x09af,
+	0x852: 0x0cdf, 0x855: 0x07f7, 0x856: 0x0f1f, 0x857: 0x0fe3,
+	0x858: 0x1047, 0x859: 0x1063, 0x85a: 0x1067, 0x85b: 0x107b, 0x85c: 0x14fb, 0x85d: 0x10eb,
+	0x85e: 0x116f, 0x860: 0x128f, 0x862: 0x1353,
+	0x865: 0x1407, 0x866: 0x1433,
+	0x86a: 0x154f, 0x86b: 0x1553, 0x86c: 0x1557, 0x86d: 0x15bb, 0x86e: 0x142b, 0x86f: 0x14c7,
+	0x870: 0x0757, 0x871: 0x077b, 0x872: 0x078f, 0x873: 0x084b, 0x874: 0x0857, 0x875: 0x0897,
+	0x876: 0x094b, 0x877: 0x0967, 0x878: 0x096f, 0x879: 0x09ab, 0x87a: 0x09b7, 0x87b: 0x0a93,
+	0x87c: 0x0a9b, 0x87d: 0x0ba3, 0x87e: 0x0bcb, 0x87f: 0x0bd3,
+	// Block 0x22, offset 0x880
+	0x880: 0x0beb, 0x881: 0x0c97, 0x882: 0x0cc7, 0x883: 0x0ce7, 0x884: 0x0d57, 0x885: 0x0e1b,
+	0x886: 0x0e37, 0x887: 0x0e67, 0x888: 0x0ebb, 0x889: 0x0edb, 0x88a: 0x0f4f, 0x88b: 0x102f,
+	0x88c: 0x104b, 0x88d: 0x1053, 0x88e: 0x104f, 0x88f: 0x1057, 0x890: 0x105b, 0x891: 0x105f,
+	0x892: 0x1073, 0x893: 0x1077, 0x894: 0x109b, 0x895: 0x10af, 0x896: 0x10cb, 0x897: 0x112f,
+	0x898: 0x1137, 0x899: 0x113f, 0x89a: 0x1153, 0x89b: 0x117b, 0x89c: 0x11cb, 0x89d: 0x11ff,
+	0x89e: 0x11ff, 0x89f: 0x1267, 0x8a0: 0x130f, 0x8a1: 0x1327, 0x8a2: 0x135b, 0x8a3: 0x135f,
+	0x8a4: 0x13a3, 0x8a5: 0x13a7, 0x8a6: 0x13ff, 0x8a7: 0x1407, 0x8a8: 0x14db, 0x8a9: 0x151f,
+	0x8aa: 0x1537, 0x8ab: 0x0b9b, 0x8ac: 0x171e, 0x8ad: 0x11e3,
+	0x8b0: 0x06df, 0x8b1: 0x07e3, 0x8b2: 0x07a3, 0x8b3: 0x074b, 0x8b4: 0x078b, 0x8b5: 0x07b7,
+	0x8b6: 0x0847, 0x8b7: 0x0863, 0x8b8: 0x094b, 0x8b9: 0x0937, 0x8ba: 0x0947, 0x8bb: 0x0963,
+	0x8bc: 0x09af, 0x8bd: 0x09bf, 0x8be: 0x0a03, 0x8bf: 0x0a0f,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x0a2b, 0x8c1: 0x0a3b, 0x8c2: 0x0b23, 0x8c3: 0x0b2b, 0x8c4: 0x0b5b, 0x8c5: 0x0b7b,
+	0x8c6: 0x0bab, 0x8c7: 0x0bc3, 0x8c8: 0x0bb3, 0x8c9: 0x0bd3, 0x8ca: 0x0bc7, 0x8cb: 0x0beb,
+	0x8cc: 0x0c07, 0x8cd: 0x0c5f, 0x8ce: 0x0c6b, 0x8cf: 0x0c73, 0x8d0: 0x0c9b, 0x8d1: 0x0cdf,
+	0x8d2: 0x0d0f, 0x8d3: 0x0d13, 0x8d4: 0x0d27, 0x8d5: 0x0da7, 0x8d6: 0x0db7, 0x8d7: 0x0e0f,
+	0x8d8: 0x0e5b, 0x8d9: 0x0e53, 0x8da: 0x0e67, 0x8db: 0x0e83, 0x8dc: 0x0ebb, 0x8dd: 0x1013,
+	0x8de: 0x0edf, 0x8df: 0x0f13, 0x8e0: 0x0f1f, 0x8e1: 0x0f5f, 0x8e2: 0x0f7b, 0x8e3: 0x0f9f,
+	0x8e4: 0x0fc3, 0x8e5: 0x0fc7, 0x8e6: 0x0fe3, 0x8e7: 0x0fe7, 0x8e8: 0x0ff7, 0x8e9: 0x100b,
+	0x8ea: 0x1007, 0x8eb: 0x1037, 0x8ec: 0x10b3, 0x8ed: 0x10cb, 0x8ee: 0x10e3, 0x8ef: 0x111b,
+	0x8f0: 0x112f, 0x8f1: 0x114b, 0x8f2: 0x117b, 0x8f3: 0x122f, 0x8f4: 0x1257, 0x8f5: 0x12cb,
+	0x8f6: 0x1313, 0x8f7: 0x131f, 0x8f8: 0x1327, 0x8f9: 0x133f, 0x8fa: 0x1353, 0x8fb: 0x1343,
+	0x8fc: 0x135b, 0x8fd: 0x1357, 0x8fe: 0x134f, 0x8ff: 0x135f,
+	// Block 0x24, offset 0x900
+	0x900: 0x136b, 0x901: 0x13a7, 0x902: 0x13e3, 0x903: 0x1413, 0x904: 0x144b, 0x905: 0x146b,
+	0x906: 0x14b7, 0x907: 0x14db, 0x908: 0x14fb, 0x909: 0x150f, 0x90a: 0x151f, 0x90b: 0x152b,
+	0x90c: 0x1537, 0x90d: 0x158b, 0x90e: 0x162b, 0x90f: 0x16b5, 0x910: 0x16b0, 0x911: 0x16e2,
+	0x912: 0x0607, 0x913: 0x062f, 0x914: 0x0633, 0x915: 0x1764, 0x916: 0x1791, 0x917: 0x1809,
+	0x918: 0x1617, 0x919: 0x1627,
+	// Block 0x25, offset 0x940
+	0x940: 0x06fb, 0x941: 0x06f3, 0x942: 0x0703, 0x943: 0x1647, 0x944: 0x0747, 0x945: 0x0757,
+	0x946: 0x075b, 0x947: 0x0763, 0x948: 0x076b, 0x949: 0x076f, 0x94a: 0x077b, 0x94b: 0x0773,
+	0x94c: 0x05b3, 0x94d: 0x165b, 0x94e: 0x078f, 0x94f: 0x0793, 0x950: 0x0797, 0x951: 0x07b3,
+	0x952: 0x164c, 0x953: 0x05b7, 0x954: 0x079f, 0x955: 0x07bf, 0x956: 0x1656, 0x957: 0x07cf,
+	0x958: 0x07d7, 0x959: 0x0737, 0x95a: 0x07df, 0x95b: 0x07e3, 0x95c: 0x1831, 0x95d: 0x07ff,
+	0x95e: 0x0807, 0x95f: 0x05bf, 0x960: 0x081f, 0x961: 0x0823, 0x962: 0x082b, 0x963: 0x082f,
+	0x964: 0x05c3, 0x965: 0x0847, 0x966: 0x084b, 0x967: 0x0857, 0x968: 0x0863, 0x969: 0x0867,
+	0x96a: 0x086b, 0x96b: 0x0873, 0x96c: 0x0893, 0x96d: 0x0897, 0x96e: 0x089f, 0x96f: 0x08af,
+	0x970: 0x08b7, 0x971: 0x08bb, 0x972: 0x08bb, 0x973: 0x08bb, 0x974: 0x166a, 0x975: 0x0e93,
+	0x976: 0x08cf, 0x977: 0x08d7, 0x978: 0x166f, 0x979: 0x08e3, 0x97a: 0x08eb, 0x97b: 0x08f3,
+	0x97c: 0x091b, 0x97d: 0x0907, 0x97e: 0x0913, 0x97f: 0x0917,
+	// Block 0x26, offset 0x980
+	0x980: 0x091f, 0x981: 0x0927, 0x982: 0x092b, 0x983: 0x0933, 0x984: 0x093b, 0x985: 0x093f,
+	0x986: 0x093f, 0x987: 0x0947, 0x988: 0x094f, 0x989: 0x0953, 0x98a: 0x095f, 0x98b: 0x0983,
+	0x98c: 0x0967, 0x98d: 0x0987, 0x98e: 0x096b, 0x98f: 0x0973, 0x990: 0x080b, 0x991: 0x09cf,
+	0x992: 0x0997, 0x993: 0x099b, 0x994: 0x099f, 0x995: 0x0993, 0x996: 0x09a7, 0x997: 0x09a3,
+	0x998: 0x09bb, 0x999: 0x1674, 0x99a: 0x09d7, 0x99b: 0x09db, 0x99c: 0x09e3, 0x99d: 0x09ef,
+	0x99e: 0x09f7, 0x99f: 0x0a13, 0x9a0: 0x1679, 0x9a1: 0x167e, 0x9a2: 0x0a1f, 0x9a3: 0x0a23,
+	0x9a4: 0x0a27, 0x9a5: 0x0a1b, 0x9a6: 0x0a2f, 0x9a7: 0x05c7, 0x9a8: 0x05cb, 0x9a9: 0x0a37,
+	0x9aa: 0x0a3f, 0x9ab: 0x0a3f, 0x9ac: 0x1683, 0x9ad: 0x0a5b, 0x9ae: 0x0a5f, 0x9af: 0x0a63,
+	0x9b0: 0x0a6b, 0x9b1: 0x1688, 0x9b2: 0x0a73, 0x9b3: 0x0a77, 0x9b4: 0x0b4f, 0x9b5: 0x0a7f,
+	0x9b6: 0x05cf, 0x9b7: 0x0a8b, 0x9b8: 0x0a9b, 0x9b9: 0x0aa7, 0x9ba: 0x0aa3, 0x9bb: 0x1692,
+	0x9bc: 0x0aaf, 0x9bd: 0x1697, 0x9be: 0x0abb, 0x9bf: 0x0ab7,
+	// Block 0x27, offset 0x9c0
+	0x9c0: 0x0abf, 0x9c1: 0x0acf, 0x9c2: 0x0ad3, 0x9c3: 0x05d3, 0x9c4: 0x0ae3, 0x9c5: 0x0aeb,
+	0x9c6: 0x0aef, 0x9c7: 0x0af3, 0x9c8: 0x05d7, 0x9c9: 0x169c, 0x9ca: 0x05db, 0x9cb: 0x0b0f,
+	0x9cc: 0x0b13, 0x9cd: 0x0b17, 0x9ce: 0x0b1f, 0x9cf: 0x1863, 0x9d0: 0x0b37, 0x9d1: 0x16a6,
+	0x9d2: 0x16a6, 0x9d3: 0x11d7, 0x9d4: 0x0b47, 0x9d5: 0x0b47, 0x9d6: 0x05df, 0x9d7: 0x16c9,
+	0x9d8: 0x179b, 0x9d9: 0x0b57, 0x9da: 0x0b5f, 0x9db: 0x05e3, 0x9dc: 0x0b73, 0x9dd: 0x0b83,
+	0x9de: 0x0b87, 0x9df: 0x0b8f, 0x9e0: 0x0b9f, 0x9e1: 0x05eb, 0x9e2: 0x05e7, 0x9e3: 0x0ba3,
+	0x9e4: 0x16ab, 0x9e5: 0x0ba7, 0x9e6: 0x0bbb, 0x9e7: 0x0bbf, 0x9e8: 0x0bc3, 0x9e9: 0x0bbf,
+	0x9ea: 0x0bcf, 0x9eb: 0x0bd3, 0x9ec: 0x0be3, 0x9ed: 0x0bdb, 0x9ee: 0x0bdf, 0x9ef: 0x0be7,
+	0x9f0: 0x0beb, 0x9f1: 0x0bef, 0x9f2: 0x0bfb, 0x9f3: 0x0bff, 0x9f4: 0x0c17, 0x9f5: 0x0c1f,
+	0x9f6: 0x0c2f, 0x9f7: 0x0c43, 0x9f8: 0x16ba, 0x9f9: 0x0c3f, 0x9fa: 0x0c33, 0x9fb: 0x0c4b,
+	0x9fc: 0x0c53, 0x9fd: 0x0c67, 0x9fe: 0x16bf, 0x9ff: 0x0c6f,
+	// Block 0x28, offset 0xa00
+	0xa00: 0x0c63, 0xa01: 0x0c5b, 0xa02: 0x05ef, 0xa03: 0x0c77, 0xa04: 0x0c7f, 0xa05: 0x0c87,
+	0xa06: 0x0c7b, 0xa07: 0x05f3, 0xa08: 0x0c97, 0xa09: 0x0c9f, 0xa0a: 0x16c4, 0xa0b: 0x0ccb,
+	0xa0c: 0x0cff, 0xa0d: 0x0cdb, 0xa0e: 0x05ff, 0xa0f: 0x0ce7, 0xa10: 0x05fb, 0xa11: 0x05f7,
+	0xa12: 0x07c3, 0xa13: 0x07c7, 0xa14: 0x0d03, 0xa15: 0x0ceb, 0xa16: 0x11ab, 0xa17: 0x0663,
+	0xa18: 0x0d0f, 0xa19: 0x0d13, 0xa1a: 0x0d17, 0xa1b: 0x0d2b, 0xa1c: 0x0d23, 0xa1d: 0x16dd,
+	0xa1e: 0x0603, 0xa1f: 0x0d3f, 0xa20: 0x0d33, 0xa21: 0x0d4f, 0xa22: 0x0d57, 0xa23: 0x16e7,
+	0xa24: 0x0d5b, 0xa25: 0x0d47, 0xa26: 0x0d63, 0xa27: 0x0607, 0xa28: 0x0d67, 0xa29: 0x0d6b,
+	0xa2a: 0x0d6f, 0xa2b: 0x0d7b, 0xa2c: 0x16ec, 0xa2d: 0x0d83, 0xa2e: 0x060b, 0xa2f: 0x0d8f,
+	0xa30: 0x16f1, 0xa31: 0x0d93, 0xa32: 0x060f, 0xa33: 0x0d9f, 0xa34: 0x0dab, 0xa35: 0x0db7,
+	0xa36: 0x0dbb, 0xa37: 0x16f6, 0xa38: 0x168d, 0xa39: 0x16fb, 0xa3a: 0x0ddb, 0xa3b: 0x1700,
+	0xa3c: 0x0de7, 0xa3d: 0x0def, 0xa3e: 0x0ddf, 0xa3f: 0x0dfb,
+	// Block 0x29, offset 0xa40
+	0xa40: 0x0e0b, 0xa41: 0x0e1b, 0xa42: 0x0e0f, 0xa43: 0x0e13, 0xa44: 0x0e1f, 0xa45: 0x0e23,
+	0xa46: 0x1705, 0xa47: 0x0e07, 0xa48: 0x0e3b, 0xa49: 0x0e3f, 0xa4a: 0x0613, 0xa4b: 0x0e53,
+	0xa4c: 0x0e4f, 0xa4d: 0x170a, 0xa4e: 0x0e33, 0xa4f: 0x0e6f, 0xa50: 0x170f, 0xa51: 0x1714,
+	0xa52: 0x0e73, 0xa53: 0x0e87, 0xa54: 0x0e83, 0xa55: 0x0e7f, 0xa56: 0x0617, 0xa57: 0x0e8b,
+	0xa58: 0x0e9b, 0xa59: 0x0e97, 0xa5a: 0x0ea3, 0xa5b: 0x1651, 0xa5c: 0x0eb3, 0xa5d: 0x1719,
+	0xa5e: 0x0ebf, 0xa5f: 0x1723, 0xa60: 0x0ed3, 0xa61: 0x0edf, 0xa62: 0x0ef3, 0xa63: 0x1728,
+	0xa64: 0x0f07, 0xa65: 0x0f0b, 0xa66: 0x172d, 0xa67: 0x1732, 0xa68: 0x0f27, 0xa69: 0x0f37,
+	0xa6a: 0x061b, 0xa6b: 0x0f3b, 0xa6c: 0x061f, 0xa6d: 0x061f, 0xa6e: 0x0f53, 0xa6f: 0x0f57,
+	0xa70: 0x0f5f, 0xa71: 0x0f63, 0xa72: 0x0f6f, 0xa73: 0x0623, 0xa74: 0x0f87, 0xa75: 0x1737,
+	0xa76: 0x0fa3, 0xa77: 0x173c, 0xa78: 0x0faf, 0xa79: 0x16a1, 0xa7a: 0x0fbf, 0xa7b: 0x1741,
+	0xa7c: 0x1746, 0xa7d: 0x174b, 0xa7e: 0x0627, 0xa7f: 0x062b,
+	// Block 0x2a, offset 0xa80
+	0xa80: 0x0ff7, 0xa81: 0x1755, 0xa82: 0x1750, 0xa83: 0x175a, 0xa84: 0x175f, 0xa85: 0x0fff,
+	0xa86: 0x1003, 0xa87: 0x1003, 0xa88: 0x100b, 0xa89: 0x0633, 0xa8a: 0x100f, 0xa8b: 0x0637,
+	0xa8c: 0x063b, 0xa8d: 0x1769, 0xa8e: 0x1023, 0xa8f: 0x102b, 0xa90: 0x1037, 0xa91: 0x063f,
+	0xa92: 0x176e, 0xa93: 0x105b, 0xa94: 0x1773, 0xa95: 0x1778, 0xa96: 0x107b, 0xa97: 0x1093,
+	0xa98: 0x0643, 0xa99: 0x109b, 0xa9a: 0x109f, 0xa9b: 0x10a3, 0xa9c: 0x177d, 0xa9d: 0x1782,
+	0xa9e: 0x1782, 0xa9f: 0x10bb, 0xaa0: 0x0647, 0xaa1: 0x1787, 0xaa2: 0x10cf, 0xaa3: 0x10d3,
+	0xaa4: 0x064b, 0xaa5: 0x178c, 0xaa6: 0x10ef, 0xaa7: 0x064f, 0xaa8: 0x10ff, 0xaa9: 0x10f7,
+	0xaaa: 0x1107, 0xaab: 0x1796, 0xaac: 0x111f, 0xaad: 0x0653, 0xaae: 0x112b, 0xaaf: 0x1133,
+	0xab0: 0x1143, 0xab1: 0x0657, 0xab2: 0x17a0, 0xab3: 0x17a5, 0xab4: 0x065b, 0xab5: 0x17aa,
+	0xab6: 0x115b, 0xab7: 0x17af, 0xab8: 0x1167, 0xab9: 0x1173, 0xaba: 0x117b, 0xabb: 0x17b4,
+	0xabc: 0x17b9, 0xabd: 0x118f, 0xabe: 0x17be, 0xabf: 0x1197,
+	// Block 0x2b, offset 0xac0
+	0xac0: 0x16ce, 0xac1: 0x065f, 0xac2: 0x11af, 0xac3: 0x11b3, 0xac4: 0x0667, 0xac5: 0x11b7,
+	0xac6: 0x0a33, 0xac7: 0x17c3, 0xac8: 0x17c8, 0xac9: 0x16d3, 0xaca: 0x16d8, 0xacb: 0x11d7,
+	0xacc: 0x11db, 0xacd: 0x13f3, 0xace: 0x066b, 0xacf: 0x1207, 0xad0: 0x1203, 0xad1: 0x120b,
+	0xad2: 0x083f, 0xad3: 0x120f, 0xad4: 0x1213, 0xad5: 0x1217, 0xad6: 0x121f, 0xad7: 0x17cd,
+	0xad8: 0x121b, 0xad9: 0x1223, 0xada: 0x1237, 0xadb: 0x123b, 0xadc: 0x1227, 0xadd: 0x123f,
+	0xade: 0x1253, 0xadf: 0x1267, 0xae0: 0x1233, 0xae1: 0x1247, 0xae2: 0x124b, 0xae3: 0x124f,
+	0xae4: 0x17d2, 0xae5: 0x17dc, 0xae6: 0x17d7, 0xae7: 0x066f, 0xae8: 0x126f, 0xae9: 0x1273,
+	0xaea: 0x127b, 0xaeb: 0x17f0, 0xaec: 0x127f, 0xaed: 0x17e1, 0xaee: 0x0673, 0xaef: 0x0677,
+	0xaf0: 0x17e6, 0xaf1: 0x17eb, 0xaf2: 0x067b, 0xaf3: 0x129f, 0xaf4: 0x12a3, 0xaf5: 0x12a7,
+	0xaf6: 0x12ab, 0xaf7: 0x12b7, 0xaf8: 0x12b3, 0xaf9: 0x12bf, 0xafa: 0x12bb, 0xafb: 0x12cb,
+	0xafc: 0x12c3, 0xafd: 0x12c7, 0xafe: 0x12cf, 0xaff: 0x067f,
+	// Block 0x2c, offset 0xb00
+	0xb00: 0x12d7, 0xb01: 0x12db, 0xb02: 0x0683, 0xb03: 0x12eb, 0xb04: 0x12ef, 0xb05: 0x17f5,
+	0xb06: 0x12fb, 0xb07: 0x12ff, 0xb08: 0x0687, 0xb09: 0x130b, 0xb0a: 0x05bb, 0xb0b: 0x17fa,
+	0xb0c: 0x17ff, 0xb0d: 0x068b, 0xb0e: 0x068f, 0xb0f: 0x1337, 0xb10: 0x134f, 0xb11: 0x136b,
+	0xb12: 0x137b, 0xb13: 0x1804, 0xb14: 0x138f, 0xb15: 0x1393, 0xb16: 0x13ab, 0xb17: 0x13b7,
+	0xb18: 0x180e, 0xb19: 0x1660, 0xb1a: 0x13c3, 0xb1b: 0x13bf, 0xb1c: 0x13cb, 0xb1d: 0x1665,
+	0xb1e: 0x13d7, 0xb1f: 0x13e3, 0xb20: 0x1813, 0xb21: 0x1818, 0xb22: 0x1423, 0xb23: 0x142f,
+	0xb24: 0x1437, 0xb25: 0x181d, 0xb26: 0x143b, 0xb27: 0x1467, 0xb28: 0x1473, 0xb29: 0x1477,
+	0xb2a: 0x146f, 0xb2b: 0x1483, 0xb2c: 0x1487, 0xb2d: 0x1822, 0xb2e: 0x1493, 0xb2f: 0x0693,
+	0xb30: 0x149b, 0xb31: 0x1827, 0xb32: 0x0697, 0xb33: 0x14d3, 0xb34: 0x0ac3, 0xb35: 0x14eb,
+	0xb36: 0x182c, 0xb37: 0x1836, 0xb38: 0x069b, 0xb39: 0x069f, 0xb3a: 0x1513, 0xb3b: 0x183b,
+	0xb3c: 0x06a3, 0xb3d: 0x1840, 0xb3e: 0x152b, 0xb3f: 0x152b,
+	// Block 0x2d, offset 0xb40
+	0xb40: 0x1533, 0xb41: 0x1845, 0xb42: 0x154b, 0xb43: 0x06a7, 0xb44: 0x155b, 0xb45: 0x1567,
+	0xb46: 0x156f, 0xb47: 0x1577, 0xb48: 0x06ab, 0xb49: 0x184a, 0xb4a: 0x158b, 0xb4b: 0x15a7,
+	0xb4c: 0x15b3, 0xb4d: 0x06af, 0xb4e: 0x06b3, 0xb4f: 0x15b7, 0xb50: 0x184f, 0xb51: 0x06b7,
+	0xb52: 0x1854, 0xb53: 0x1859, 0xb54: 0x185e, 0xb55: 0x15db, 0xb56: 0x06bb, 0xb57: 0x15ef,
+	0xb58: 0x15f7, 0xb59: 0x15fb, 0xb5a: 0x1603, 0xb5b: 0x160b, 0xb5c: 0x1613, 0xb5d: 0x1868,
+}
+
+// nfcIndex: 22 blocks, 1408 entries, 1408 bytes
+// Block 0 is the zero block.
+var nfcIndex = [1408]uint8{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x2c, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x2d, 0xc7: 0x04,
+	0xc8: 0x05, 0xca: 0x2e, 0xcb: 0x2f, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x30,
+	0xd0: 0x09, 0xd1: 0x31, 0xd2: 0x32, 0xd3: 0x0a, 0xd6: 0x0b, 0xd7: 0x33,
+	0xd8: 0x34, 0xd9: 0x0c, 0xdb: 0x35, 0xdc: 0x36, 0xdd: 0x37, 0xdf: 0x38,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
+	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
+	0xf0: 0x13,
+	// Block 0x4, offset 0x100
+	0x120: 0x39, 0x121: 0x3a, 0x123: 0x3b, 0x124: 0x3c, 0x125: 0x3d, 0x126: 0x3e, 0x127: 0x3f,
+	0x128: 0x40, 0x129: 0x41, 0x12a: 0x42, 0x12b: 0x43, 0x12c: 0x3e, 0x12d: 0x44, 0x12e: 0x45, 0x12f: 0x46,
+	0x131: 0x47, 0x132: 0x48, 0x133: 0x49, 0x134: 0x4a, 0x135: 0x4b, 0x137: 0x4c,
+	0x138: 0x4d, 0x139: 0x4e, 0x13a: 0x4f, 0x13b: 0x50, 0x13c: 0x51, 0x13d: 0x52, 0x13e: 0x53, 0x13f: 0x54,
+	// Block 0x5, offset 0x140
+	0x140: 0x55, 0x142: 0x56, 0x144: 0x57, 0x145: 0x58, 0x146: 0x59, 0x147: 0x5a,
+	0x14d: 0x5b,
+	0x15c: 0x5c, 0x15f: 0x5d,
+	0x162: 0x5e, 0x164: 0x5f,
+	0x168: 0x60, 0x169: 0x61, 0x16a: 0x62, 0x16c: 0x0d, 0x16d: 0x63, 0x16e: 0x64, 0x16f: 0x65,
+	0x170: 0x66, 0x173: 0x67, 0x177: 0x68,
+	0x178: 0x0e, 0x179: 0x0f, 0x17a: 0x10, 0x17b: 0x11, 0x17c: 0x12, 0x17d: 0x13, 0x17e: 0x14, 0x17f: 0x15,
+	// Block 0x6, offset 0x180
+	0x180: 0x69, 0x183: 0x6a, 0x184: 0x6b, 0x186: 0x6c, 0x187: 0x6d,
+	0x188: 0x6e, 0x189: 0x16, 0x18a: 0x17, 0x18b: 0x6f, 0x18c: 0x70,
+	0x1ab: 0x71,
+	0x1b3: 0x72, 0x1b5: 0x73, 0x1b7: 0x74,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x75, 0x1c1: 0x18, 0x1c2: 0x19, 0x1c3: 0x1a, 0x1c4: 0x76, 0x1c5: 0x77,
+	0x1c9: 0x78, 0x1cc: 0x79, 0x1cd: 0x7a,
+	// Block 0x8, offset 0x200
+	0x219: 0x7b, 0x21a: 0x7c, 0x21b: 0x7d,
+	0x220: 0x7e, 0x223: 0x7f, 0x224: 0x80, 0x225: 0x81, 0x226: 0x82, 0x227: 0x83,
+	0x22a: 0x84, 0x22b: 0x85, 0x22f: 0x86,
+	0x230: 0x87, 0x231: 0x88, 0x232: 0x89, 0x233: 0x8a, 0x234: 0x8b, 0x235: 0x8c, 0x236: 0x8d, 0x237: 0x87,
+	0x238: 0x88, 0x239: 0x89, 0x23a: 0x8a, 0x23b: 0x8b, 0x23c: 0x8c, 0x23d: 0x8d, 0x23e: 0x87, 0x23f: 0x88,
+	// Block 0x9, offset 0x240
+	0x240: 0x89, 0x241: 0x8a, 0x242: 0x8b, 0x243: 0x8c, 0x244: 0x8d, 0x245: 0x87, 0x246: 0x88, 0x247: 0x89,
+	0x248: 0x8a, 0x249: 0x8b, 0x24a: 0x8c, 0x24b: 0x8d, 0x24c: 0x87, 0x24d: 0x88, 0x24e: 0x89, 0x24f: 0x8a,
+	0x250: 0x8b, 0x251: 0x8c, 0x252: 0x8d, 0x253: 0x87, 0x254: 0x88, 0x255: 0x89, 0x256: 0x8a, 0x257: 0x8b,
+	0x258: 0x8c, 0x259: 0x8d, 0x25a: 0x87, 0x25b: 0x88, 0x25c: 0x89, 0x25d: 0x8a, 0x25e: 0x8b, 0x25f: 0x8c,
+	0x260: 0x8d, 0x261: 0x87, 0x262: 0x88, 0x263: 0x89, 0x264: 0x8a, 0x265: 0x8b, 0x266: 0x8c, 0x267: 0x8d,
+	0x268: 0x87, 0x269: 0x88, 0x26a: 0x89, 0x26b: 0x8a, 0x26c: 0x8b, 0x26d: 0x8c, 0x26e: 0x8d, 0x26f: 0x87,
+	0x270: 0x88, 0x271: 0x89, 0x272: 0x8a, 0x273: 0x8b, 0x274: 0x8c, 0x275: 0x8d, 0x276: 0x87, 0x277: 0x88,
+	0x278: 0x89, 0x279: 0x8a, 0x27a: 0x8b, 0x27b: 0x8c, 0x27c: 0x8d, 0x27d: 0x87, 0x27e: 0x88, 0x27f: 0x89,
+	// Block 0xa, offset 0x280
+	0x280: 0x8a, 0x281: 0x8b, 0x282: 0x8c, 0x283: 0x8d, 0x284: 0x87, 0x285: 0x88, 0x286: 0x89, 0x287: 0x8a,
+	0x288: 0x8b, 0x289: 0x8c, 0x28a: 0x8d, 0x28b: 0x87, 0x28c: 0x88, 0x28d: 0x89, 0x28e: 0x8a, 0x28f: 0x8b,
+	0x290: 0x8c, 0x291: 0x8d, 0x292: 0x87, 0x293: 0x88, 0x294: 0x89, 0x295: 0x8a, 0x296: 0x8b, 0x297: 0x8c,
+	0x298: 0x8d, 0x299: 0x87, 0x29a: 0x88, 0x29b: 0x89, 0x29c: 0x8a, 0x29d: 0x8b, 0x29e: 0x8c, 0x29f: 0x8d,
+	0x2a0: 0x87, 0x2a1: 0x88, 0x2a2: 0x89, 0x2a3: 0x8a, 0x2a4: 0x8b, 0x2a5: 0x8c, 0x2a6: 0x8d, 0x2a7: 0x87,
+	0x2a8: 0x88, 0x2a9: 0x89, 0x2aa: 0x8a, 0x2ab: 0x8b, 0x2ac: 0x8c, 0x2ad: 0x8d, 0x2ae: 0x87, 0x2af: 0x88,
+	0x2b0: 0x89, 0x2b1: 0x8a, 0x2b2: 0x8b, 0x2b3: 0x8c, 0x2b4: 0x8d, 0x2b5: 0x87, 0x2b6: 0x88, 0x2b7: 0x89,
+	0x2b8: 0x8a, 0x2b9: 0x8b, 0x2ba: 0x8c, 0x2bb: 0x8d, 0x2bc: 0x87, 0x2bd: 0x88, 0x2be: 0x89, 0x2bf: 0x8a,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x8b, 0x2c1: 0x8c, 0x2c2: 0x8d, 0x2c3: 0x87, 0x2c4: 0x88, 0x2c5: 0x89, 0x2c6: 0x8a, 0x2c7: 0x8b,
+	0x2c8: 0x8c, 0x2c9: 0x8d, 0x2ca: 0x87, 0x2cb: 0x88, 0x2cc: 0x89, 0x2cd: 0x8a, 0x2ce: 0x8b, 0x2cf: 0x8c,
+	0x2d0: 0x8d, 0x2d1: 0x87, 0x2d2: 0x88, 0x2d3: 0x89, 0x2d4: 0x8a, 0x2d5: 0x8b, 0x2d6: 0x8c, 0x2d7: 0x8d,
+	0x2d8: 0x87, 0x2d9: 0x88, 0x2da: 0x89, 0x2db: 0x8a, 0x2dc: 0x8b, 0x2dd: 0x8c, 0x2de: 0x8e,
+	// Block 0xc, offset 0x300
+	0x324: 0x1b, 0x325: 0x1c, 0x326: 0x1d, 0x327: 0x1e,
+	0x328: 0x1f, 0x329: 0x20, 0x32a: 0x21, 0x32b: 0x22, 0x32c: 0x8f, 0x32d: 0x90, 0x32e: 0x91,
+	0x331: 0x92, 0x332: 0x93, 0x333: 0x94, 0x334: 0x95,
+	0x338: 0x96, 0x339: 0x97, 0x33a: 0x98, 0x33b: 0x99, 0x33e: 0x9a, 0x33f: 0x9b,
+	// Block 0xd, offset 0x340
+	0x347: 0x9c,
+	0x34b: 0x9d, 0x34d: 0x9e,
+	0x368: 0x9f, 0x36b: 0xa0,
+	// Block 0xe, offset 0x380
+	0x381: 0xa1, 0x382: 0xa2, 0x384: 0xa3, 0x385: 0x82, 0x387: 0xa4,
+	0x388: 0xa5, 0x38b: 0xa6, 0x38c: 0x3e, 0x38d: 0xa7,
+	0x391: 0xa8, 0x392: 0xa9, 0x393: 0xaa, 0x396: 0xab, 0x397: 0xac,
+	0x398: 0x73, 0x39a: 0xad, 0x39c: 0xae,
+	0x3b0: 0x73,
+	// Block 0xf, offset 0x3c0
+	0x3eb: 0xaf, 0x3ec: 0xb0,
+	// Block 0x10, offset 0x400
+	0x432: 0xb1,
+	// Block 0x11, offset 0x440
+	0x445: 0xb2, 0x446: 0xb3, 0x447: 0xb4,
+	0x449: 0xb5,
+	// Block 0x12, offset 0x480
+	0x480: 0xb6,
+	0x4a3: 0xb7, 0x4a5: 0xb8,
+	// Block 0x13, offset 0x4c0
+	0x4c8: 0xb9,
+	// Block 0x14, offset 0x500
+	0x520: 0x23, 0x521: 0x24, 0x522: 0x25, 0x523: 0x26, 0x524: 0x27, 0x525: 0x28, 0x526: 0x29, 0x527: 0x2a,
+	0x528: 0x2b,
+	// Block 0x15, offset 0x540
+	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
+	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
+	0x56f: 0x12,
+}
+
+// nfcSparseOffset: 142 entries, 284 bytes
+var nfcSparseOffset = []uint16{0x0, 0x5, 0x9, 0xb, 0xd, 0x18, 0x28, 0x2a, 0x2f, 0x3a, 0x49, 0x56, 0x5e, 0x62, 0x67, 0x69, 0x7a, 0x82, 0x89, 0x8c, 0x93, 0x97, 0x9b, 0x9d, 0x9f, 0xa8, 0xac, 0xb3, 0xb8, 0xbb, 0xc5, 0xc7, 0xce, 0xd6, 0xd9, 0xdb, 0xdd, 0xdf, 0xe4, 0xf5, 0x101, 0x103, 0x109, 0x10b, 0x10d, 0x10f, 0x111, 0x113, 0x115, 0x118, 0x11b, 0x11d, 0x120, 0x123, 0x127, 0x12c, 0x135, 0x137, 0x13a, 0x13c, 0x147, 0x157, 0x15b, 0x169, 0x16c, 0x172, 0x178, 0x183, 0x187, 0x189, 0x18b, 0x18d, 0x18f, 0x191, 0x197, 0x19b, 0x19d, 0x19f, 0x1a7, 0x1ab, 0x1ae, 0x1b0, 0x1b2, 0x1b4, 0x1b7, 0x1b9, 0x1bb, 0x1bd, 0x1bf, 0x1c5, 0x1c8, 0x1ca, 0x1d1, 0x1d7, 0x1dd, 0x1e5, 0x1eb, 0x1f1, 0x1f7, 0x1fb, 0x209, 0x212, 0x215, 0x218, 0x21a, 0x21d, 0x21f, 0x223, 0x228, 0x22a, 0x22c, 0x231, 0x237, 0x239, 0x23b, 0x23d, 0x243, 0x246, 0x249, 0x251, 0x258, 0x25b, 0x25e, 0x260, 0x268, 0x26b, 0x272, 0x275, 0x27b, 0x27d, 0x280, 0x282, 0x284, 0x286, 0x288, 0x295, 0x29f, 0x2a1, 0x2a3, 0x2a9, 0x2ab, 0x2ae}
+
+// nfcSparseValues: 688 entries, 2752 bytes
+var nfcSparseValues = [688]valueRange{
+	// Block 0x0, offset 0x0
+	{value: 0x0000, lo: 0x04},
+	{value: 0xa100, lo: 0xa8, hi: 0xa8},
+	{value: 0x8100, lo: 0xaf, hi: 0xaf},
+	{value: 0x8100, lo: 0xb4, hi: 0xb4},
+	{value: 0x8100, lo: 0xb8, hi: 0xb8},
+	// Block 0x1, offset 0x5
+	{value: 0x0091, lo: 0x03},
+	{value: 0x46e2, lo: 0xa0, hi: 0xa1},
+	{value: 0x4714, lo: 0xaf, hi: 0xb0},
+	{value: 0xa000, lo: 0xb7, hi: 0xb7},
+	// Block 0x2, offset 0x9
+	{value: 0x0000, lo: 0x01},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	// Block 0x3, offset 0xb
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x98, hi: 0x9d},
+	// Block 0x4, offset 0xd
+	{value: 0x0006, lo: 0x0a},
+	{value: 0xa000, lo: 0x81, hi: 0x81},
+	{value: 0xa000, lo: 0x85, hi: 0x85},
+	{value: 0xa000, lo: 0x89, hi: 0x89},
+	{value: 0x4840, lo: 0x8a, hi: 0x8a},
+	{value: 0x485e, lo: 0x8b, hi: 0x8b},
+	{value: 0x36c7, lo: 0x8c, hi: 0x8c},
+	{value: 0x36df, lo: 0x8d, hi: 0x8d},
+	{value: 0x4876, lo: 0x8e, hi: 0x8e},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x36fd, lo: 0x93, hi: 0x94},
+	// Block 0x5, offset 0x18
+	{value: 0x0000, lo: 0x0f},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0xa000, lo: 0x8d, hi: 0x8d},
+	{value: 0x37a5, lo: 0x90, hi: 0x90},
+	{value: 0x37b1, lo: 0x91, hi: 0x91},
+	{value: 0x379f, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x96, hi: 0x96},
+	{value: 0x3817, lo: 0x97, hi: 0x97},
+	{value: 0x37e1, lo: 0x9c, hi: 0x9c},
+	{value: 0x37c9, lo: 0x9d, hi: 0x9d},
+	{value: 0x37f3, lo: 0x9e, hi: 0x9e},
+	{value: 0xa000, lo: 0xb4, hi: 0xb5},
+	{value: 0x381d, lo: 0xb6, hi: 0xb6},
+	{value: 0x3823, lo: 0xb7, hi: 0xb7},
+	// Block 0x6, offset 0x28
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x83, hi: 0x87},
+	// Block 0x7, offset 0x2a
+	{value: 0x0001, lo: 0x04},
+	{value: 0x8113, lo: 0x81, hi: 0x82},
+	{value: 0x8132, lo: 0x84, hi: 0x84},
+	{value: 0x812d, lo: 0x85, hi: 0x85},
+	{value: 0x810d, lo: 0x87, hi: 0x87},
+	// Block 0x8, offset 0x2f
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8132, lo: 0x90, hi: 0x97},
+	{value: 0x8119, lo: 0x98, hi: 0x98},
+	{value: 0x811a, lo: 0x99, hi: 0x99},
+	{value: 0x811b, lo: 0x9a, hi: 0x9a},
+	{value: 0x3841, lo: 0xa2, hi: 0xa2},
+	{value: 0x3847, lo: 0xa3, hi: 0xa3},
+	{value: 0x3853, lo: 0xa4, hi: 0xa4},
+	{value: 0x384d, lo: 0xa5, hi: 0xa5},
+	{value: 0x3859, lo: 0xa6, hi: 0xa6},
+	{value: 0xa000, lo: 0xa7, hi: 0xa7},
+	// Block 0x9, offset 0x3a
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x386b, lo: 0x80, hi: 0x80},
+	{value: 0xa000, lo: 0x81, hi: 0x81},
+	{value: 0x385f, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x3865, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x95, hi: 0x95},
+	{value: 0x8132, lo: 0x96, hi: 0x9c},
+	{value: 0x8132, lo: 0x9f, hi: 0xa2},
+	{value: 0x812d, lo: 0xa3, hi: 0xa3},
+	{value: 0x8132, lo: 0xa4, hi: 0xa4},
+	{value: 0x8132, lo: 0xa7, hi: 0xa8},
+	{value: 0x812d, lo: 0xaa, hi: 0xaa},
+	{value: 0x8132, lo: 0xab, hi: 0xac},
+	{value: 0x812d, lo: 0xad, hi: 0xad},
+	// Block 0xa, offset 0x49
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x811f, lo: 0x91, hi: 0x91},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	{value: 0x812d, lo: 0xb1, hi: 0xb1},
+	{value: 0x8132, lo: 0xb2, hi: 0xb3},
+	{value: 0x812d, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb5, hi: 0xb6},
+	{value: 0x812d, lo: 0xb7, hi: 0xb9},
+	{value: 0x8132, lo: 0xba, hi: 0xba},
+	{value: 0x812d, lo: 0xbb, hi: 0xbc},
+	{value: 0x8132, lo: 0xbd, hi: 0xbd},
+	{value: 0x812d, lo: 0xbe, hi: 0xbe},
+	{value: 0x8132, lo: 0xbf, hi: 0xbf},
+	// Block 0xb, offset 0x56
+	{value: 0x0005, lo: 0x07},
+	{value: 0x8132, lo: 0x80, hi: 0x80},
+	{value: 0x8132, lo: 0x81, hi: 0x81},
+	{value: 0x812d, lo: 0x82, hi: 0x83},
+	{value: 0x812d, lo: 0x84, hi: 0x85},
+	{value: 0x812d, lo: 0x86, hi: 0x87},
+	{value: 0x812d, lo: 0x88, hi: 0x89},
+	{value: 0x8132, lo: 0x8a, hi: 0x8a},
+	// Block 0xc, offset 0x5e
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8132, lo: 0xab, hi: 0xb1},
+	{value: 0x812d, lo: 0xb2, hi: 0xb2},
+	{value: 0x8132, lo: 0xb3, hi: 0xb3},
+	// Block 0xd, offset 0x62
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8132, lo: 0x96, hi: 0x99},
+	{value: 0x8132, lo: 0x9b, hi: 0xa3},
+	{value: 0x8132, lo: 0xa5, hi: 0xa7},
+	{value: 0x8132, lo: 0xa9, hi: 0xad},
+	// Block 0xe, offset 0x67
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x99, hi: 0x9b},
+	// Block 0xf, offset 0x69
+	{value: 0x0000, lo: 0x10},
+	{value: 0x8132, lo: 0x94, hi: 0xa1},
+	{value: 0x812d, lo: 0xa3, hi: 0xa3},
+	{value: 0x8132, lo: 0xa4, hi: 0xa5},
+	{value: 0x812d, lo: 0xa6, hi: 0xa6},
+	{value: 0x8132, lo: 0xa7, hi: 0xa8},
+	{value: 0x812d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8132, lo: 0xaa, hi: 0xac},
+	{value: 0x812d, lo: 0xad, hi: 0xaf},
+	{value: 0x8116, lo: 0xb0, hi: 0xb0},
+	{value: 0x8117, lo: 0xb1, hi: 0xb1},
+	{value: 0x8118, lo: 0xb2, hi: 0xb2},
+	{value: 0x8132, lo: 0xb3, hi: 0xb5},
+	{value: 0x812d, lo: 0xb6, hi: 0xb6},
+	{value: 0x8132, lo: 0xb7, hi: 0xb8},
+	{value: 0x812d, lo: 0xb9, hi: 0xba},
+	{value: 0x8132, lo: 0xbb, hi: 0xbf},
+	// Block 0x10, offset 0x7a
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0xa8, hi: 0xa8},
+	{value: 0x3ed8, lo: 0xa9, hi: 0xa9},
+	{value: 0xa000, lo: 0xb0, hi: 0xb0},
+	{value: 0x3ee0, lo: 0xb1, hi: 0xb1},
+	{value: 0xa000, lo: 0xb3, hi: 0xb3},
+	{value: 0x3ee8, lo: 0xb4, hi: 0xb4},
+	{value: 0x9902, lo: 0xbc, hi: 0xbc},
+	// Block 0x11, offset 0x82
+	{value: 0x0008, lo: 0x06},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x8132, lo: 0x91, hi: 0x91},
+	{value: 0x812d, lo: 0x92, hi: 0x92},
+	{value: 0x8132, lo: 0x93, hi: 0x93},
+	{value: 0x8132, lo: 0x94, hi: 0x94},
+	{value: 0x451c, lo: 0x98, hi: 0x9f},
+	// Block 0x12, offset 0x89
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x13, offset 0x8c
+	{value: 0x0008, lo: 0x06},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2c9e, lo: 0x8b, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x455c, lo: 0x9c, hi: 0x9d},
+	{value: 0x456c, lo: 0x9f, hi: 0x9f},
+	// Block 0x14, offset 0x93
+	{value: 0x0000, lo: 0x03},
+	{value: 0x4594, lo: 0xb3, hi: 0xb3},
+	{value: 0x459c, lo: 0xb6, hi: 0xb6},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	// Block 0x15, offset 0x97
+	{value: 0x0008, lo: 0x03},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x4574, lo: 0x99, hi: 0x9b},
+	{value: 0x458c, lo: 0x9e, hi: 0x9e},
+	// Block 0x16, offset 0x9b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	// Block 0x17, offset 0x9d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	// Block 0x18, offset 0x9f
+	{value: 0x0000, lo: 0x08},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2cb6, lo: 0x88, hi: 0x88},
+	{value: 0x2cae, lo: 0x8b, hi: 0x8b},
+	{value: 0x2cbe, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x96, hi: 0x97},
+	{value: 0x45a4, lo: 0x9c, hi: 0x9c},
+	{value: 0x45ac, lo: 0x9d, hi: 0x9d},
+	// Block 0x19, offset 0xa8
+	{value: 0x0000, lo: 0x03},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x2cc6, lo: 0x94, hi: 0x94},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x1a, offset 0xac
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2cce, lo: 0x8a, hi: 0x8a},
+	{value: 0x2cde, lo: 0x8b, hi: 0x8b},
+	{value: 0x2cd6, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x1b, offset 0xb3
+	{value: 0x1801, lo: 0x04},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x3ef0, lo: 0x88, hi: 0x88},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x8120, lo: 0x95, hi: 0x96},
+	// Block 0x1c, offset 0xb8
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	{value: 0xa000, lo: 0xbf, hi: 0xbf},
+	// Block 0x1d, offset 0xbb
+	{value: 0x0000, lo: 0x09},
+	{value: 0x2ce6, lo: 0x80, hi: 0x80},
+	{value: 0x9900, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x2cee, lo: 0x87, hi: 0x87},
+	{value: 0x2cf6, lo: 0x88, hi: 0x88},
+	{value: 0x2f50, lo: 0x8a, hi: 0x8a},
+	{value: 0x2dd8, lo: 0x8b, hi: 0x8b},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x95, hi: 0x96},
+	// Block 0x1e, offset 0xc5
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x1f, offset 0xc7
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2cfe, lo: 0x8a, hi: 0x8a},
+	{value: 0x2d0e, lo: 0x8b, hi: 0x8b},
+	{value: 0x2d06, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x20, offset 0xce
+	{value: 0x6bea, lo: 0x07},
+	{value: 0x9904, lo: 0x8a, hi: 0x8a},
+	{value: 0x9900, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x3ef8, lo: 0x9a, hi: 0x9a},
+	{value: 0x2f58, lo: 0x9c, hi: 0x9c},
+	{value: 0x2de3, lo: 0x9d, hi: 0x9d},
+	{value: 0x2d16, lo: 0x9e, hi: 0x9f},
+	// Block 0x21, offset 0xd6
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8122, lo: 0xb8, hi: 0xb9},
+	{value: 0x8104, lo: 0xba, hi: 0xba},
+	// Block 0x22, offset 0xd9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8123, lo: 0x88, hi: 0x8b},
+	// Block 0x23, offset 0xdb
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8124, lo: 0xb8, hi: 0xb9},
+	// Block 0x24, offset 0xdd
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8125, lo: 0x88, hi: 0x8b},
+	// Block 0x25, offset 0xdf
+	{value: 0x0000, lo: 0x04},
+	{value: 0x812d, lo: 0x98, hi: 0x99},
+	{value: 0x812d, lo: 0xb5, hi: 0xb5},
+	{value: 0x812d, lo: 0xb7, hi: 0xb7},
+	{value: 0x812b, lo: 0xb9, hi: 0xb9},
+	// Block 0x26, offset 0xe4
+	{value: 0x0000, lo: 0x10},
+	{value: 0x2644, lo: 0x83, hi: 0x83},
+	{value: 0x264b, lo: 0x8d, hi: 0x8d},
+	{value: 0x2652, lo: 0x92, hi: 0x92},
+	{value: 0x2659, lo: 0x97, hi: 0x97},
+	{value: 0x2660, lo: 0x9c, hi: 0x9c},
+	{value: 0x263d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8126, lo: 0xb1, hi: 0xb1},
+	{value: 0x8127, lo: 0xb2, hi: 0xb2},
+	{value: 0x4a84, lo: 0xb3, hi: 0xb3},
+	{value: 0x8128, lo: 0xb4, hi: 0xb4},
+	{value: 0x4a8d, lo: 0xb5, hi: 0xb5},
+	{value: 0x45b4, lo: 0xb6, hi: 0xb6},
+	{value: 0x8200, lo: 0xb7, hi: 0xb7},
+	{value: 0x45bc, lo: 0xb8, hi: 0xb8},
+	{value: 0x8200, lo: 0xb9, hi: 0xb9},
+	{value: 0x8127, lo: 0xba, hi: 0xbd},
+	// Block 0x27, offset 0xf5
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x8127, lo: 0x80, hi: 0x80},
+	{value: 0x4a96, lo: 0x81, hi: 0x81},
+	{value: 0x8132, lo: 0x82, hi: 0x83},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0x86, hi: 0x87},
+	{value: 0x266e, lo: 0x93, hi: 0x93},
+	{value: 0x2675, lo: 0x9d, hi: 0x9d},
+	{value: 0x267c, lo: 0xa2, hi: 0xa2},
+	{value: 0x2683, lo: 0xa7, hi: 0xa7},
+	{value: 0x268a, lo: 0xac, hi: 0xac},
+	{value: 0x2667, lo: 0xb9, hi: 0xb9},
+	// Block 0x28, offset 0x101
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x86, hi: 0x86},
+	// Block 0x29, offset 0x103
+	{value: 0x0000, lo: 0x05},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x2d1e, lo: 0xa6, hi: 0xa6},
+	{value: 0x9900, lo: 0xae, hi: 0xae},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	{value: 0x8104, lo: 0xb9, hi: 0xba},
+	// Block 0x2a, offset 0x109
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x8d, hi: 0x8d},
+	// Block 0x2b, offset 0x10b
+	{value: 0x0000, lo: 0x01},
+	{value: 0xa000, lo: 0x80, hi: 0x92},
+	// Block 0x2c, offset 0x10d
+	{value: 0x0000, lo: 0x01},
+	{value: 0xb900, lo: 0xa1, hi: 0xb5},
+	// Block 0x2d, offset 0x10f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xa8, hi: 0xbf},
+	// Block 0x2e, offset 0x111
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0x80, hi: 0x82},
+	// Block 0x2f, offset 0x113
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x9d, hi: 0x9f},
+	// Block 0x30, offset 0x115
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x94, hi: 0x94},
+	{value: 0x8104, lo: 0xb4, hi: 0xb4},
+	// Block 0x31, offset 0x118
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x92, hi: 0x92},
+	{value: 0x8132, lo: 0x9d, hi: 0x9d},
+	// Block 0x32, offset 0x11b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8131, lo: 0xa9, hi: 0xa9},
+	// Block 0x33, offset 0x11d
+	{value: 0x0004, lo: 0x02},
+	{value: 0x812e, lo: 0xb9, hi: 0xba},
+	{value: 0x812d, lo: 0xbb, hi: 0xbb},
+	// Block 0x34, offset 0x120
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x97, hi: 0x97},
+	{value: 0x812d, lo: 0x98, hi: 0x98},
+	// Block 0x35, offset 0x123
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8104, lo: 0xa0, hi: 0xa0},
+	{value: 0x8132, lo: 0xb5, hi: 0xbc},
+	{value: 0x812d, lo: 0xbf, hi: 0xbf},
+	// Block 0x36, offset 0x127
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8132, lo: 0xb0, hi: 0xb4},
+	{value: 0x812d, lo: 0xb5, hi: 0xba},
+	{value: 0x8132, lo: 0xbb, hi: 0xbc},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	// Block 0x37, offset 0x12c
+	{value: 0x0000, lo: 0x08},
+	{value: 0x2d66, lo: 0x80, hi: 0x80},
+	{value: 0x2d6e, lo: 0x81, hi: 0x81},
+	{value: 0xa000, lo: 0x82, hi: 0x82},
+	{value: 0x2d76, lo: 0x83, hi: 0x83},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0xab, hi: 0xab},
+	{value: 0x812d, lo: 0xac, hi: 0xac},
+	{value: 0x8132, lo: 0xad, hi: 0xb3},
+	// Block 0x38, offset 0x135
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xaa, hi: 0xab},
+	// Block 0x39, offset 0x137
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xa6, hi: 0xa6},
+	{value: 0x8104, lo: 0xb2, hi: 0xb3},
+	// Block 0x3a, offset 0x13a
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	// Block 0x3b, offset 0x13c
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8132, lo: 0x90, hi: 0x92},
+	{value: 0x8101, lo: 0x94, hi: 0x94},
+	{value: 0x812d, lo: 0x95, hi: 0x99},
+	{value: 0x8132, lo: 0x9a, hi: 0x9b},
+	{value: 0x812d, lo: 0x9c, hi: 0x9f},
+	{value: 0x8132, lo: 0xa0, hi: 0xa0},
+	{value: 0x8101, lo: 0xa2, hi: 0xa8},
+	{value: 0x812d, lo: 0xad, hi: 0xad},
+	{value: 0x8132, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb8, hi: 0xb9},
+	// Block 0x3c, offset 0x147
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x8132, lo: 0x80, hi: 0x81},
+	{value: 0x812d, lo: 0x82, hi: 0x82},
+	{value: 0x8132, lo: 0x83, hi: 0x89},
+	{value: 0x812d, lo: 0x8a, hi: 0x8a},
+	{value: 0x8132, lo: 0x8b, hi: 0x8c},
+	{value: 0x8135, lo: 0x8d, hi: 0x8d},
+	{value: 0x812a, lo: 0x8e, hi: 0x8e},
+	{value: 0x812d, lo: 0x8f, hi: 0x8f},
+	{value: 0x8129, lo: 0x90, hi: 0x90},
+	{value: 0x8132, lo: 0x91, hi: 0xb5},
+	{value: 0x8132, lo: 0xbb, hi: 0xbb},
+	{value: 0x8134, lo: 0xbc, hi: 0xbc},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	{value: 0x8132, lo: 0xbe, hi: 0xbe},
+	{value: 0x812d, lo: 0xbf, hi: 0xbf},
+	// Block 0x3d, offset 0x157
+	{value: 0x0004, lo: 0x03},
+	{value: 0x0433, lo: 0x80, hi: 0x81},
+	{value: 0x8100, lo: 0x97, hi: 0x97},
+	{value: 0x8100, lo: 0xbe, hi: 0xbe},
+	// Block 0x3e, offset 0x15b
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x8132, lo: 0x90, hi: 0x91},
+	{value: 0x8101, lo: 0x92, hi: 0x93},
+	{value: 0x8132, lo: 0x94, hi: 0x97},
+	{value: 0x8101, lo: 0x98, hi: 0x9a},
+	{value: 0x8132, lo: 0x9b, hi: 0x9c},
+	{value: 0x8132, lo: 0xa1, hi: 0xa1},
+	{value: 0x8101, lo: 0xa5, hi: 0xa6},
+	{value: 0x8132, lo: 0xa7, hi: 0xa7},
+	{value: 0x812d, lo: 0xa8, hi: 0xa8},
+	{value: 0x8132, lo: 0xa9, hi: 0xa9},
+	{value: 0x8101, lo: 0xaa, hi: 0xab},
+	{value: 0x812d, lo: 0xac, hi: 0xaf},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	// Block 0x3f, offset 0x169
+	{value: 0x427b, lo: 0x02},
+	{value: 0x01b8, lo: 0xa6, hi: 0xa6},
+	{value: 0x0057, lo: 0xaa, hi: 0xab},
+	// Block 0x40, offset 0x16c
+	{value: 0x0007, lo: 0x05},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	{value: 0x3bb9, lo: 0x9a, hi: 0x9b},
+	{value: 0x3bc7, lo: 0xae, hi: 0xae},
+	// Block 0x41, offset 0x172
+	{value: 0x000e, lo: 0x05},
+	{value: 0x3bce, lo: 0x8d, hi: 0x8e},
+	{value: 0x3bd5, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	// Block 0x42, offset 0x178
+	{value: 0x6408, lo: 0x0a},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0x3be3, lo: 0x84, hi: 0x84},
+	{value: 0xa000, lo: 0x88, hi: 0x88},
+	{value: 0x3bea, lo: 0x89, hi: 0x89},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0x3bf1, lo: 0x8c, hi: 0x8c},
+	{value: 0xa000, lo: 0xa3, hi: 0xa3},
+	{value: 0x3bf8, lo: 0xa4, hi: 0xa5},
+	{value: 0x3bff, lo: 0xa6, hi: 0xa6},
+	{value: 0xa000, lo: 0xbc, hi: 0xbc},
+	// Block 0x43, offset 0x183
+	{value: 0x0007, lo: 0x03},
+	{value: 0x3c68, lo: 0xa0, hi: 0xa1},
+	{value: 0x3c92, lo: 0xa2, hi: 0xa3},
+	{value: 0x3cbc, lo: 0xaa, hi: 0xad},
+	// Block 0x44, offset 0x187
+	{value: 0x0004, lo: 0x01},
+	{value: 0x048b, lo: 0xa9, hi: 0xaa},
+	// Block 0x45, offset 0x189
+	{value: 0x0000, lo: 0x01},
+	{value: 0x44dd, lo: 0x9c, hi: 0x9c},
+	// Block 0x46, offset 0x18b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xaf, hi: 0xb1},
+	// Block 0x47, offset 0x18d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x48, offset 0x18f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xa0, hi: 0xbf},
+	// Block 0x49, offset 0x191
+	{value: 0x0000, lo: 0x05},
+	{value: 0x812c, lo: 0xaa, hi: 0xaa},
+	{value: 0x8131, lo: 0xab, hi: 0xab},
+	{value: 0x8133, lo: 0xac, hi: 0xac},
+	{value: 0x812e, lo: 0xad, hi: 0xad},
+	{value: 0x812f, lo: 0xae, hi: 0xaf},
+	// Block 0x4a, offset 0x197
+	{value: 0x0000, lo: 0x03},
+	{value: 0x4a9f, lo: 0xb3, hi: 0xb3},
+	{value: 0x4a9f, lo: 0xb5, hi: 0xb6},
+	{value: 0x4a9f, lo: 0xba, hi: 0xbf},
+	// Block 0x4b, offset 0x19b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x4a9f, lo: 0x8f, hi: 0xa3},
+	// Block 0x4c, offset 0x19d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0xae, hi: 0xbe},
+	// Block 0x4d, offset 0x19f
+	{value: 0x0000, lo: 0x07},
+	{value: 0x8100, lo: 0x84, hi: 0x84},
+	{value: 0x8100, lo: 0x87, hi: 0x87},
+	{value: 0x8100, lo: 0x90, hi: 0x90},
+	{value: 0x8100, lo: 0x9e, hi: 0x9e},
+	{value: 0x8100, lo: 0xa1, hi: 0xa1},
+	{value: 0x8100, lo: 0xb2, hi: 0xb2},
+	{value: 0x8100, lo: 0xbb, hi: 0xbb},
+	// Block 0x4e, offset 0x1a7
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8100, lo: 0x80, hi: 0x80},
+	{value: 0x8100, lo: 0x8b, hi: 0x8b},
+	{value: 0x8100, lo: 0x8e, hi: 0x8e},
+	// Block 0x4f, offset 0x1ab
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0xaf, hi: 0xaf},
+	{value: 0x8132, lo: 0xb4, hi: 0xbd},
+	// Block 0x50, offset 0x1ae
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x9e, hi: 0x9f},
+	// Block 0x51, offset 0x1b0
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb0, hi: 0xb1},
+	// Block 0x52, offset 0x1b2
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x86, hi: 0x86},
+	// Block 0x53, offset 0x1b4
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0xa0, hi: 0xb1},
+	// Block 0x54, offset 0x1b7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xab, hi: 0xad},
+	// Block 0x55, offset 0x1b9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x93, hi: 0x93},
+	// Block 0x56, offset 0x1bb
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb3, hi: 0xb3},
+	// Block 0x57, offset 0x1bd
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x80, hi: 0x80},
+	// Block 0x58, offset 0x1bf
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	{value: 0x8132, lo: 0xb2, hi: 0xb3},
+	{value: 0x812d, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb7, hi: 0xb8},
+	{value: 0x8132, lo: 0xbe, hi: 0xbf},
+	// Block 0x59, offset 0x1c5
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x81, hi: 0x81},
+	{value: 0x8104, lo: 0xb6, hi: 0xb6},
+	// Block 0x5a, offset 0x1c8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xad, hi: 0xad},
+	// Block 0x5b, offset 0x1ca
+	{value: 0x0000, lo: 0x06},
+	{value: 0xe500, lo: 0x80, hi: 0x80},
+	{value: 0xc600, lo: 0x81, hi: 0x9b},
+	{value: 0xe500, lo: 0x9c, hi: 0x9c},
+	{value: 0xc600, lo: 0x9d, hi: 0xb7},
+	{value: 0xe500, lo: 0xb8, hi: 0xb8},
+	{value: 0xc600, lo: 0xb9, hi: 0xbf},
+	// Block 0x5c, offset 0x1d1
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x93},
+	{value: 0xe500, lo: 0x94, hi: 0x94},
+	{value: 0xc600, lo: 0x95, hi: 0xaf},
+	{value: 0xe500, lo: 0xb0, hi: 0xb0},
+	{value: 0xc600, lo: 0xb1, hi: 0xbf},
+	// Block 0x5d, offset 0x1d7
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8b},
+	{value: 0xe500, lo: 0x8c, hi: 0x8c},
+	{value: 0xc600, lo: 0x8d, hi: 0xa7},
+	{value: 0xe500, lo: 0xa8, hi: 0xa8},
+	{value: 0xc600, lo: 0xa9, hi: 0xbf},
+	// Block 0x5e, offset 0x1dd
+	{value: 0x0000, lo: 0x07},
+	{value: 0xc600, lo: 0x80, hi: 0x83},
+	{value: 0xe500, lo: 0x84, hi: 0x84},
+	{value: 0xc600, lo: 0x85, hi: 0x9f},
+	{value: 0xe500, lo: 0xa0, hi: 0xa0},
+	{value: 0xc600, lo: 0xa1, hi: 0xbb},
+	{value: 0xe500, lo: 0xbc, hi: 0xbc},
+	{value: 0xc600, lo: 0xbd, hi: 0xbf},
+	// Block 0x5f, offset 0x1e5
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x97},
+	{value: 0xe500, lo: 0x98, hi: 0x98},
+	{value: 0xc600, lo: 0x99, hi: 0xb3},
+	{value: 0xe500, lo: 0xb4, hi: 0xb4},
+	{value: 0xc600, lo: 0xb5, hi: 0xbf},
+	// Block 0x60, offset 0x1eb
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8f},
+	{value: 0xe500, lo: 0x90, hi: 0x90},
+	{value: 0xc600, lo: 0x91, hi: 0xab},
+	{value: 0xe500, lo: 0xac, hi: 0xac},
+	{value: 0xc600, lo: 0xad, hi: 0xbf},
+	// Block 0x61, offset 0x1f1
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	{value: 0xe500, lo: 0xa4, hi: 0xa4},
+	{value: 0xc600, lo: 0xa5, hi: 0xbf},
+	// Block 0x62, offset 0x1f7
+	{value: 0x0000, lo: 0x03},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	// Block 0x63, offset 0x1fb
+	{value: 0x0006, lo: 0x0d},
+	{value: 0x4390, lo: 0x9d, hi: 0x9d},
+	{value: 0x8115, lo: 0x9e, hi: 0x9e},
+	{value: 0x4402, lo: 0x9f, hi: 0x9f},
+	{value: 0x43f0, lo: 0xaa, hi: 0xab},
+	{value: 0x44f4, lo: 0xac, hi: 0xac},
+	{value: 0x44fc, lo: 0xad, hi: 0xad},
+	{value: 0x4348, lo: 0xae, hi: 0xb1},
+	{value: 0x4366, lo: 0xb2, hi: 0xb4},
+	{value: 0x437e, lo: 0xb5, hi: 0xb6},
+	{value: 0x438a, lo: 0xb8, hi: 0xb8},
+	{value: 0x4396, lo: 0xb9, hi: 0xbb},
+	{value: 0x43ae, lo: 0xbc, hi: 0xbc},
+	{value: 0x43b4, lo: 0xbe, hi: 0xbe},
+	// Block 0x64, offset 0x209
+	{value: 0x0006, lo: 0x08},
+	{value: 0x43ba, lo: 0x80, hi: 0x81},
+	{value: 0x43c6, lo: 0x83, hi: 0x84},
+	{value: 0x43d8, lo: 0x86, hi: 0x89},
+	{value: 0x43fc, lo: 0x8a, hi: 0x8a},
+	{value: 0x4378, lo: 0x8b, hi: 0x8b},
+	{value: 0x4360, lo: 0x8c, hi: 0x8c},
+	{value: 0x43a8, lo: 0x8d, hi: 0x8d},
+	{value: 0x43d2, lo: 0x8e, hi: 0x8e},
+	// Block 0x65, offset 0x212
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8100, lo: 0xa4, hi: 0xa5},
+	{value: 0x8100, lo: 0xb0, hi: 0xb1},
+	// Block 0x66, offset 0x215
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8100, lo: 0x9b, hi: 0x9d},
+	{value: 0x8200, lo: 0x9e, hi: 0xa3},
+	// Block 0x67, offset 0x218
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x90, hi: 0x90},
+	// Block 0x68, offset 0x21a
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8100, lo: 0x99, hi: 0x99},
+	{value: 0x8200, lo: 0xb2, hi: 0xb4},
+	// Block 0x69, offset 0x21d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0xbc, hi: 0xbd},
+	// Block 0x6a, offset 0x21f
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8132, lo: 0xa0, hi: 0xa6},
+	{value: 0x812d, lo: 0xa7, hi: 0xad},
+	{value: 0x8132, lo: 0xae, hi: 0xaf},
+	// Block 0x6b, offset 0x223
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8100, lo: 0x89, hi: 0x8c},
+	{value: 0x8100, lo: 0xb0, hi: 0xb2},
+	{value: 0x8100, lo: 0xb4, hi: 0xb4},
+	{value: 0x8100, lo: 0xb6, hi: 0xbf},
+	// Block 0x6c, offset 0x228
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x81, hi: 0x8c},
+	// Block 0x6d, offset 0x22a
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0xb5, hi: 0xba},
+	// Block 0x6e, offset 0x22c
+	{value: 0x0000, lo: 0x04},
+	{value: 0x4a9f, lo: 0x9e, hi: 0x9f},
+	{value: 0x4a9f, lo: 0xa3, hi: 0xa3},
+	{value: 0x4a9f, lo: 0xa5, hi: 0xa6},
+	{value: 0x4a9f, lo: 0xaa, hi: 0xaf},
+	// Block 0x6f, offset 0x231
+	{value: 0x0000, lo: 0x05},
+	{value: 0x4a9f, lo: 0x82, hi: 0x87},
+	{value: 0x4a9f, lo: 0x8a, hi: 0x8f},
+	{value: 0x4a9f, lo: 0x92, hi: 0x97},
+	{value: 0x4a9f, lo: 0x9a, hi: 0x9c},
+	{value: 0x8100, lo: 0xa3, hi: 0xa3},
+	// Block 0x70, offset 0x237
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	// Block 0x71, offset 0x239
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xa0, hi: 0xa0},
+	// Block 0x72, offset 0x23b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb6, hi: 0xba},
+	// Block 0x73, offset 0x23d
+	{value: 0x002c, lo: 0x05},
+	{value: 0x812d, lo: 0x8d, hi: 0x8d},
+	{value: 0x8132, lo: 0x8f, hi: 0x8f},
+	{value: 0x8132, lo: 0xb8, hi: 0xb8},
+	{value: 0x8101, lo: 0xb9, hi: 0xba},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x74, offset 0x243
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0xa5, hi: 0xa5},
+	{value: 0x812d, lo: 0xa6, hi: 0xa6},
+	// Block 0x75, offset 0x246
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x86, hi: 0x86},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x76, offset 0x249
+	{value: 0x17fe, lo: 0x07},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x4238, lo: 0x9a, hi: 0x9a},
+	{value: 0xa000, lo: 0x9b, hi: 0x9b},
+	{value: 0x4242, lo: 0x9c, hi: 0x9c},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x424c, lo: 0xab, hi: 0xab},
+	{value: 0x8104, lo: 0xb9, hi: 0xba},
+	// Block 0x77, offset 0x251
+	{value: 0x0000, lo: 0x06},
+	{value: 0x8132, lo: 0x80, hi: 0x82},
+	{value: 0x9900, lo: 0xa7, hi: 0xa7},
+	{value: 0x2d7e, lo: 0xae, hi: 0xae},
+	{value: 0x2d88, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb1, hi: 0xb2},
+	{value: 0x8104, lo: 0xb3, hi: 0xb4},
+	// Block 0x78, offset 0x258
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x80, hi: 0x80},
+	{value: 0x8102, lo: 0x8a, hi: 0x8a},
+	// Block 0x79, offset 0x25b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xb5, hi: 0xb5},
+	{value: 0x8102, lo: 0xb6, hi: 0xb6},
+	// Block 0x7a, offset 0x25e
+	{value: 0x0002, lo: 0x01},
+	{value: 0x8102, lo: 0xa9, hi: 0xaa},
+	// Block 0x7b, offset 0x260
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2d92, lo: 0x8b, hi: 0x8b},
+	{value: 0x2d9c, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x8132, lo: 0xa6, hi: 0xac},
+	{value: 0x8132, lo: 0xb0, hi: 0xb4},
+	// Block 0x7c, offset 0x268
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x82, hi: 0x82},
+	{value: 0x8102, lo: 0x86, hi: 0x86},
+	// Block 0x7d, offset 0x26b
+	{value: 0x6b5a, lo: 0x06},
+	{value: 0x9900, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xb9, hi: 0xb9},
+	{value: 0x9900, lo: 0xba, hi: 0xba},
+	{value: 0x2db0, lo: 0xbb, hi: 0xbb},
+	{value: 0x2da6, lo: 0xbc, hi: 0xbd},
+	{value: 0x2dba, lo: 0xbe, hi: 0xbe},
+	// Block 0x7e, offset 0x272
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x82, hi: 0x82},
+	{value: 0x8102, lo: 0x83, hi: 0x83},
+	// Block 0x7f, offset 0x275
+	{value: 0x0000, lo: 0x05},
+	{value: 0x9900, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb8, hi: 0xb9},
+	{value: 0x2dc4, lo: 0xba, hi: 0xba},
+	{value: 0x2dce, lo: 0xbb, hi: 0xbb},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x80, offset 0x27b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0x80, hi: 0x80},
+	// Block 0x81, offset 0x27d
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xb6, hi: 0xb6},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	// Block 0x82, offset 0x280
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xab, hi: 0xab},
+	// Block 0x83, offset 0x282
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0xb0, hi: 0xb4},
+	// Block 0x84, offset 0x284
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb0, hi: 0xb6},
+	// Block 0x85, offset 0x286
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0x9e, hi: 0x9e},
+	// Block 0x86, offset 0x288
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x45cc, lo: 0x9e, hi: 0x9e},
+	{value: 0x45d6, lo: 0x9f, hi: 0x9f},
+	{value: 0x460a, lo: 0xa0, hi: 0xa0},
+	{value: 0x4618, lo: 0xa1, hi: 0xa1},
+	{value: 0x4626, lo: 0xa2, hi: 0xa2},
+	{value: 0x4634, lo: 0xa3, hi: 0xa3},
+	{value: 0x4642, lo: 0xa4, hi: 0xa4},
+	{value: 0x812b, lo: 0xa5, hi: 0xa6},
+	{value: 0x8101, lo: 0xa7, hi: 0xa9},
+	{value: 0x8130, lo: 0xad, hi: 0xad},
+	{value: 0x812b, lo: 0xae, hi: 0xb2},
+	{value: 0x812d, lo: 0xbb, hi: 0xbf},
+	// Block 0x87, offset 0x295
+	{value: 0x0000, lo: 0x09},
+	{value: 0x812d, lo: 0x80, hi: 0x82},
+	{value: 0x8132, lo: 0x85, hi: 0x89},
+	{value: 0x812d, lo: 0x8a, hi: 0x8b},
+	{value: 0x8132, lo: 0xaa, hi: 0xad},
+	{value: 0x45e0, lo: 0xbb, hi: 0xbb},
+	{value: 0x45ea, lo: 0xbc, hi: 0xbc},
+	{value: 0x4650, lo: 0xbd, hi: 0xbd},
+	{value: 0x466c, lo: 0xbe, hi: 0xbe},
+	{value: 0x465e, lo: 0xbf, hi: 0xbf},
+	// Block 0x88, offset 0x29f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x467a, lo: 0x80, hi: 0x80},
+	// Block 0x89, offset 0x2a1
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x82, hi: 0x84},
+	// Block 0x8a, offset 0x2a3
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8132, lo: 0x80, hi: 0x86},
+	{value: 0x8132, lo: 0x88, hi: 0x98},
+	{value: 0x8132, lo: 0x9b, hi: 0xa1},
+	{value: 0x8132, lo: 0xa3, hi: 0xa4},
+	{value: 0x8132, lo: 0xa6, hi: 0xaa},
+	// Block 0x8b, offset 0x2a9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x90, hi: 0x96},
+	// Block 0x8c, offset 0x2ab
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x84, hi: 0x89},
+	{value: 0x8102, lo: 0x8a, hi: 0x8a},
+	// Block 0x8d, offset 0x2ae
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8100, lo: 0x93, hi: 0x93},
+}
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfkcTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfkcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfkcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfkcTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfkcValues[c0]
+	}
+	i := nfkcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *nfkcTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return nfkcValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := nfkcIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = nfkcIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = nfkcIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *nfkcTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return nfkcValues[c0]
+	}
+	i := nfkcIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// nfkcTrie. Total size: 16994 bytes (16.60 KiB). Checksum: c3ed54ee046f3c46.
+type nfkcTrie struct{}
+
+func newNfkcTrie(i int) *nfkcTrie {
+	return &nfkcTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *nfkcTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	case n < 90:
+		return uint16(nfkcValues[n<<6+uint32(b)])
+	default:
+		n -= 90
+		return uint16(nfkcSparse.lookup(n, b))
+	}
+}
+
+// nfkcValues: 92 blocks, 5888 entries, 11776 bytes
+// The third block is the zero block.
+var nfkcValues = [5888]uint16{
+	// Block 0x0, offset 0x0
+	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
+	// Block 0x1, offset 0x40
+	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
+	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
+	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
+	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
+	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
+	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
+	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
+	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
+	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
+	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x4688, 0xc3: 0x2f79, 0xc4: 0x4697, 0xc5: 0x469c,
+	0xc6: 0xa000, 0xc7: 0x46a6, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x46ab, 0xcb: 0x2ffb,
+	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x46bf, 0xd1: 0x3104,
+	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x46c9, 0xd5: 0x46ce, 0xd6: 0x46dd,
+	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x470f, 0xdd: 0x3235,
+	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x4719, 0xe3: 0x3285,
+	0xe4: 0x4728, 0xe5: 0x472d, 0xe6: 0xa000, 0xe7: 0x4737, 0xe8: 0x32ee, 0xe9: 0x32f3,
+	0xea: 0x473c, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x4750,
+	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x475a, 0xf5: 0x475f,
+	0xf6: 0x476e, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
+	0xfc: 0x47a0, 0xfd: 0x3550, 0xff: 0x3569,
+	// Block 0x4, offset 0x100
+	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x468d, 0x103: 0x471e, 0x104: 0x2f9c, 0x105: 0x32a8,
+	0x106: 0x2fb0, 0x107: 0x32bc, 0x108: 0x2fb5, 0x109: 0x32c1, 0x10a: 0x2fba, 0x10b: 0x32c6,
+	0x10c: 0x2fbf, 0x10d: 0x32cb, 0x10e: 0x2fc9, 0x10f: 0x32d5,
+	0x112: 0x46b0, 0x113: 0x4741, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
+	0x118: 0x3014, 0x119: 0x3320, 0x11a: 0x3005, 0x11b: 0x3311, 0x11c: 0x302d, 0x11d: 0x3339,
+	0x11e: 0x3037, 0x11f: 0x3343, 0x120: 0x303c, 0x121: 0x3348, 0x122: 0x3046, 0x123: 0x3352,
+	0x124: 0x304b, 0x125: 0x3357, 0x128: 0x307d, 0x129: 0x338e,
+	0x12a: 0x3082, 0x12b: 0x3393, 0x12c: 0x3087, 0x12d: 0x3398, 0x12e: 0x30aa, 0x12f: 0x33b6,
+	0x130: 0x308c, 0x132: 0x195d, 0x133: 0x19e7, 0x134: 0x30b4, 0x135: 0x33c0,
+	0x136: 0x30c8, 0x137: 0x33d9, 0x139: 0x30d2, 0x13a: 0x33e3, 0x13b: 0x30dc,
+	0x13c: 0x33ed, 0x13d: 0x30d7, 0x13e: 0x33e8, 0x13f: 0x1bac,
+	// Block 0x5, offset 0x140
+	0x140: 0x1c34, 0x143: 0x30ff, 0x144: 0x3410, 0x145: 0x3118,
+	0x146: 0x3429, 0x147: 0x310e, 0x148: 0x341f, 0x149: 0x1c5c,
+	0x14c: 0x46d3, 0x14d: 0x4764, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
+	0x154: 0x3159, 0x155: 0x346a, 0x156: 0x3172, 0x157: 0x3483,
+	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x46f6, 0x15b: 0x4787, 0x15c: 0x317c, 0x15d: 0x348d,
+	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x46fb, 0x161: 0x478c, 0x162: 0x31a4, 0x163: 0x34ba,
+	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x4705, 0x169: 0x4796,
+	0x16a: 0x470a, 0x16b: 0x479b, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
+	0x170: 0x31d1, 0x171: 0x34e7, 0x172: 0x31ef, 0x173: 0x3505, 0x174: 0x3212, 0x175: 0x3528,
+	0x176: 0x323a, 0x177: 0x3555, 0x178: 0x324e, 0x179: 0x325d, 0x17a: 0x357d, 0x17b: 0x3267,
+	0x17c: 0x3587, 0x17d: 0x326c, 0x17e: 0x358c, 0x17f: 0x00a7,
+	// Block 0x6, offset 0x180
+	0x184: 0x2dee, 0x185: 0x2df4,
+	0x186: 0x2dfa, 0x187: 0x1972, 0x188: 0x1975, 0x189: 0x1a08, 0x18a: 0x1987, 0x18b: 0x198a,
+	0x18c: 0x1a3e, 0x18d: 0x2f88, 0x18e: 0x3294, 0x18f: 0x3096, 0x190: 0x33a2, 0x191: 0x3140,
+	0x192: 0x3451, 0x193: 0x31d6, 0x194: 0x34ec, 0x195: 0x39cf, 0x196: 0x3b5e, 0x197: 0x39c8,
+	0x198: 0x3b57, 0x199: 0x39d6, 0x19a: 0x3b65, 0x19b: 0x39c1, 0x19c: 0x3b50,
+	0x19e: 0x38b0, 0x19f: 0x3a3f, 0x1a0: 0x38a9, 0x1a1: 0x3a38, 0x1a2: 0x35b3, 0x1a3: 0x35c5,
+	0x1a6: 0x3041, 0x1a7: 0x334d, 0x1a8: 0x30be, 0x1a9: 0x33cf,
+	0x1aa: 0x46ec, 0x1ab: 0x477d, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
+	0x1b0: 0x33c5, 0x1b1: 0x1942, 0x1b2: 0x1945, 0x1b3: 0x19cf, 0x1b4: 0x3028, 0x1b5: 0x3334,
+	0x1b8: 0x30fa, 0x1b9: 0x340b, 0x1ba: 0x38b7, 0x1bb: 0x3a46,
+	0x1bc: 0x35ad, 0x1bd: 0x35bf, 0x1be: 0x35b9, 0x1bf: 0x35cb,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x2f8d, 0x1c1: 0x3299, 0x1c2: 0x2f92, 0x1c3: 0x329e, 0x1c4: 0x300a, 0x1c5: 0x3316,
+	0x1c6: 0x300f, 0x1c7: 0x331b, 0x1c8: 0x309b, 0x1c9: 0x33a7, 0x1ca: 0x30a0, 0x1cb: 0x33ac,
+	0x1cc: 0x3145, 0x1cd: 0x3456, 0x1ce: 0x314a, 0x1cf: 0x345b, 0x1d0: 0x3168, 0x1d1: 0x3479,
+	0x1d2: 0x316d, 0x1d3: 0x347e, 0x1d4: 0x31db, 0x1d5: 0x34f1, 0x1d6: 0x31e0, 0x1d7: 0x34f6,
+	0x1d8: 0x3186, 0x1d9: 0x3497, 0x1da: 0x319f, 0x1db: 0x34b5,
+	0x1de: 0x305a, 0x1df: 0x3366,
+	0x1e6: 0x4692, 0x1e7: 0x4723, 0x1e8: 0x46ba, 0x1e9: 0x474b,
+	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x46d8, 0x1ef: 0x4769,
+	0x1f0: 0x3958, 0x1f1: 0x3ae7, 0x1f2: 0x3244, 0x1f3: 0x355f,
+	// Block 0x8, offset 0x200
+	0x200: 0x9932, 0x201: 0x9932, 0x202: 0x9932, 0x203: 0x9932, 0x204: 0x9932, 0x205: 0x8132,
+	0x206: 0x9932, 0x207: 0x9932, 0x208: 0x9932, 0x209: 0x9932, 0x20a: 0x9932, 0x20b: 0x9932,
+	0x20c: 0x9932, 0x20d: 0x8132, 0x20e: 0x8132, 0x20f: 0x9932, 0x210: 0x8132, 0x211: 0x9932,
+	0x212: 0x8132, 0x213: 0x9932, 0x214: 0x9932, 0x215: 0x8133, 0x216: 0x812d, 0x217: 0x812d,
+	0x218: 0x812d, 0x219: 0x812d, 0x21a: 0x8133, 0x21b: 0x992b, 0x21c: 0x812d, 0x21d: 0x812d,
+	0x21e: 0x812d, 0x21f: 0x812d, 0x220: 0x812d, 0x221: 0x8129, 0x222: 0x8129, 0x223: 0x992d,
+	0x224: 0x992d, 0x225: 0x992d, 0x226: 0x992d, 0x227: 0x9929, 0x228: 0x9929, 0x229: 0x812d,
+	0x22a: 0x812d, 0x22b: 0x812d, 0x22c: 0x812d, 0x22d: 0x992d, 0x22e: 0x992d, 0x22f: 0x812d,
+	0x230: 0x992d, 0x231: 0x992d, 0x232: 0x812d, 0x233: 0x812d, 0x234: 0x8101, 0x235: 0x8101,
+	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812d, 0x23a: 0x812d, 0x23b: 0x812d,
+	0x23c: 0x812d, 0x23d: 0x8132, 0x23e: 0x8132, 0x23f: 0x8132,
+	// Block 0x9, offset 0x240
+	0x240: 0x49ae, 0x241: 0x49b3, 0x242: 0x9932, 0x243: 0x49b8, 0x244: 0x4a71, 0x245: 0x9936,
+	0x246: 0x8132, 0x247: 0x812d, 0x248: 0x812d, 0x249: 0x812d, 0x24a: 0x8132, 0x24b: 0x8132,
+	0x24c: 0x8132, 0x24d: 0x812d, 0x24e: 0x812d, 0x250: 0x8132, 0x251: 0x8132,
+	0x252: 0x8132, 0x253: 0x812d, 0x254: 0x812d, 0x255: 0x812d, 0x256: 0x812d, 0x257: 0x8132,
+	0x258: 0x8133, 0x259: 0x812d, 0x25a: 0x812d, 0x25b: 0x8132, 0x25c: 0x8134, 0x25d: 0x8135,
+	0x25e: 0x8135, 0x25f: 0x8134, 0x260: 0x8135, 0x261: 0x8135, 0x262: 0x8134, 0x263: 0x8132,
+	0x264: 0x8132, 0x265: 0x8132, 0x266: 0x8132, 0x267: 0x8132, 0x268: 0x8132, 0x269: 0x8132,
+	0x26a: 0x8132, 0x26b: 0x8132, 0x26c: 0x8132, 0x26d: 0x8132, 0x26e: 0x8132, 0x26f: 0x8132,
+	0x274: 0x0170,
+	0x27a: 0x42a5,
+	0x27e: 0x0037,
+	// Block 0xa, offset 0x280
+	0x284: 0x425a, 0x285: 0x447b,
+	0x286: 0x35e9, 0x287: 0x00ce, 0x288: 0x3607, 0x289: 0x3613, 0x28a: 0x3625,
+	0x28c: 0x3643, 0x28e: 0x3655, 0x28f: 0x3673, 0x290: 0x3e08, 0x291: 0xa000,
+	0x295: 0xa000, 0x297: 0xa000,
+	0x299: 0xa000,
+	0x29f: 0xa000, 0x2a1: 0xa000,
+	0x2a5: 0xa000, 0x2a9: 0xa000,
+	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x47fe, 0x2ad: 0x3697, 0x2ae: 0x4828, 0x2af: 0x36a9,
+	0x2b0: 0x3e70, 0x2b1: 0xa000, 0x2b5: 0xa000,
+	0x2b7: 0xa000, 0x2b9: 0xa000,
+	0x2bf: 0xa000,
+	// Block 0xb, offset 0x2c0
+	0x2c1: 0xa000, 0x2c5: 0xa000,
+	0x2c9: 0xa000, 0x2ca: 0x4840, 0x2cb: 0x485e,
+	0x2cc: 0x36c7, 0x2cd: 0x36df, 0x2ce: 0x4876, 0x2d0: 0x01be, 0x2d1: 0x01d0,
+	0x2d2: 0x01ac, 0x2d3: 0x430c, 0x2d4: 0x4312, 0x2d5: 0x01fa, 0x2d6: 0x01e8,
+	0x2f0: 0x01d6, 0x2f1: 0x01eb, 0x2f2: 0x01ee, 0x2f4: 0x0188, 0x2f5: 0x01c7,
+	0x2f9: 0x01a6,
+	// Block 0xc, offset 0x300
+	0x300: 0x3721, 0x301: 0x372d, 0x303: 0x371b,
+	0x306: 0xa000, 0x307: 0x3709,
+	0x30c: 0x375d, 0x30d: 0x3745, 0x30e: 0x376f, 0x310: 0xa000,
+	0x313: 0xa000, 0x315: 0xa000, 0x316: 0xa000, 0x317: 0xa000,
+	0x318: 0xa000, 0x319: 0x3751, 0x31a: 0xa000,
+	0x31e: 0xa000, 0x323: 0xa000,
+	0x327: 0xa000,
+	0x32b: 0xa000, 0x32d: 0xa000,
+	0x330: 0xa000, 0x333: 0xa000, 0x335: 0xa000,
+	0x336: 0xa000, 0x337: 0xa000, 0x338: 0xa000, 0x339: 0x37d5, 0x33a: 0xa000,
+	0x33e: 0xa000,
+	// Block 0xd, offset 0x340
+	0x341: 0x3733, 0x342: 0x37b7,
+	0x350: 0x370f, 0x351: 0x3793,
+	0x352: 0x3715, 0x353: 0x3799, 0x356: 0x3727, 0x357: 0x37ab,
+	0x358: 0xa000, 0x359: 0xa000, 0x35a: 0x3829, 0x35b: 0x382f, 0x35c: 0x3739, 0x35d: 0x37bd,
+	0x35e: 0x373f, 0x35f: 0x37c3, 0x362: 0x374b, 0x363: 0x37cf,
+	0x364: 0x3757, 0x365: 0x37db, 0x366: 0x3763, 0x367: 0x37e7, 0x368: 0xa000, 0x369: 0xa000,
+	0x36a: 0x3835, 0x36b: 0x383b, 0x36c: 0x378d, 0x36d: 0x3811, 0x36e: 0x3769, 0x36f: 0x37ed,
+	0x370: 0x3775, 0x371: 0x37f9, 0x372: 0x377b, 0x373: 0x37ff, 0x374: 0x3781, 0x375: 0x3805,
+	0x378: 0x3787, 0x379: 0x380b,
+	// Block 0xe, offset 0x380
+	0x387: 0x1d61,
+	0x391: 0x812d,
+	0x392: 0x8132, 0x393: 0x8132, 0x394: 0x8132, 0x395: 0x8132, 0x396: 0x812d, 0x397: 0x8132,
+	0x398: 0x8132, 0x399: 0x8132, 0x39a: 0x812e, 0x39b: 0x812d, 0x39c: 0x8132, 0x39d: 0x8132,
+	0x39e: 0x8132, 0x39f: 0x8132, 0x3a0: 0x8132, 0x3a1: 0x8132, 0x3a2: 0x812d, 0x3a3: 0x812d,
+	0x3a4: 0x812d, 0x3a5: 0x812d, 0x3a6: 0x812d, 0x3a7: 0x812d, 0x3a8: 0x8132, 0x3a9: 0x8132,
+	0x3aa: 0x812d, 0x3ab: 0x8132, 0x3ac: 0x8132, 0x3ad: 0x812e, 0x3ae: 0x8131, 0x3af: 0x8132,
+	0x3b0: 0x8105, 0x3b1: 0x8106, 0x3b2: 0x8107, 0x3b3: 0x8108, 0x3b4: 0x8109, 0x3b5: 0x810a,
+	0x3b6: 0x810b, 0x3b7: 0x810c, 0x3b8: 0x810d, 0x3b9: 0x810e, 0x3ba: 0x810e, 0x3bb: 0x810f,
+	0x3bc: 0x8110, 0x3bd: 0x8111, 0x3bf: 0x8112,
+	// Block 0xf, offset 0x3c0
+	0x3c8: 0xa000, 0x3ca: 0xa000, 0x3cb: 0x8116,
+	0x3cc: 0x8117, 0x3cd: 0x8118, 0x3ce: 0x8119, 0x3cf: 0x811a, 0x3d0: 0x811b, 0x3d1: 0x811c,
+	0x3d2: 0x811d, 0x3d3: 0x9932, 0x3d4: 0x9932, 0x3d5: 0x992d, 0x3d6: 0x812d, 0x3d7: 0x8132,
+	0x3d8: 0x8132, 0x3d9: 0x8132, 0x3da: 0x8132, 0x3db: 0x8132, 0x3dc: 0x812d, 0x3dd: 0x8132,
+	0x3de: 0x8132, 0x3df: 0x812d,
+	0x3f0: 0x811e, 0x3f5: 0x1d84,
+	0x3f6: 0x2013, 0x3f7: 0x204f, 0x3f8: 0x204a,
+	// Block 0x10, offset 0x400
+	0x405: 0xa000,
+	0x406: 0x2d26, 0x407: 0xa000, 0x408: 0x2d2e, 0x409: 0xa000, 0x40a: 0x2d36, 0x40b: 0xa000,
+	0x40c: 0x2d3e, 0x40d: 0xa000, 0x40e: 0x2d46, 0x411: 0xa000,
+	0x412: 0x2d4e,
+	0x434: 0x8102, 0x435: 0x9900,
+	0x43a: 0xa000, 0x43b: 0x2d56,
+	0x43c: 0xa000, 0x43d: 0x2d5e, 0x43e: 0xa000, 0x43f: 0xa000,
+	// Block 0x11, offset 0x440
+	0x440: 0x0069, 0x441: 0x006b, 0x442: 0x006f, 0x443: 0x0083, 0x444: 0x00f5, 0x445: 0x00f8,
+	0x446: 0x0413, 0x447: 0x0085, 0x448: 0x0089, 0x449: 0x008b, 0x44a: 0x0104, 0x44b: 0x0107,
+	0x44c: 0x010a, 0x44d: 0x008f, 0x44f: 0x0097, 0x450: 0x009b, 0x451: 0x00e0,
+	0x452: 0x009f, 0x453: 0x00fe, 0x454: 0x0417, 0x455: 0x041b, 0x456: 0x00a1, 0x457: 0x00a9,
+	0x458: 0x00ab, 0x459: 0x0423, 0x45a: 0x012b, 0x45b: 0x00ad, 0x45c: 0x0427, 0x45d: 0x01be,
+	0x45e: 0x01c1, 0x45f: 0x01c4, 0x460: 0x01fa, 0x461: 0x01fd, 0x462: 0x0093, 0x463: 0x00a5,
+	0x464: 0x00ab, 0x465: 0x00ad, 0x466: 0x01be, 0x467: 0x01c1, 0x468: 0x01eb, 0x469: 0x01fa,
+	0x46a: 0x01fd,
+	0x478: 0x020c,
+	// Block 0x12, offset 0x480
+	0x49b: 0x00fb, 0x49c: 0x0087, 0x49d: 0x0101,
+	0x49e: 0x00d4, 0x49f: 0x010a, 0x4a0: 0x008d, 0x4a1: 0x010d, 0x4a2: 0x0110, 0x4a3: 0x0116,
+	0x4a4: 0x011c, 0x4a5: 0x011f, 0x4a6: 0x0122, 0x4a7: 0x042b, 0x4a8: 0x016a, 0x4a9: 0x0128,
+	0x4aa: 0x042f, 0x4ab: 0x016d, 0x4ac: 0x0131, 0x4ad: 0x012e, 0x4ae: 0x0134, 0x4af: 0x0137,
+	0x4b0: 0x013a, 0x4b1: 0x013d, 0x4b2: 0x0140, 0x4b3: 0x014c, 0x4b4: 0x014f, 0x4b5: 0x00ec,
+	0x4b6: 0x0152, 0x4b7: 0x0155, 0x4b8: 0x041f, 0x4b9: 0x0158, 0x4ba: 0x015b, 0x4bb: 0x00b5,
+	0x4bc: 0x015e, 0x4bd: 0x0161, 0x4be: 0x0164, 0x4bf: 0x01d0,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x2f97, 0x4c1: 0x32a3, 0x4c2: 0x2fa1, 0x4c3: 0x32ad, 0x4c4: 0x2fa6, 0x4c5: 0x32b2,
+	0x4c6: 0x2fab, 0x4c7: 0x32b7, 0x4c8: 0x38cc, 0x4c9: 0x3a5b, 0x4ca: 0x2fc4, 0x4cb: 0x32d0,
+	0x4cc: 0x2fce, 0x4cd: 0x32da, 0x4ce: 0x2fdd, 0x4cf: 0x32e9, 0x4d0: 0x2fd3, 0x4d1: 0x32df,
+	0x4d2: 0x2fd8, 0x4d3: 0x32e4, 0x4d4: 0x38ef, 0x4d5: 0x3a7e, 0x4d6: 0x38f6, 0x4d7: 0x3a85,
+	0x4d8: 0x3019, 0x4d9: 0x3325, 0x4da: 0x301e, 0x4db: 0x332a, 0x4dc: 0x3904, 0x4dd: 0x3a93,
+	0x4de: 0x3023, 0x4df: 0x332f, 0x4e0: 0x3032, 0x4e1: 0x333e, 0x4e2: 0x3050, 0x4e3: 0x335c,
+	0x4e4: 0x305f, 0x4e5: 0x336b, 0x4e6: 0x3055, 0x4e7: 0x3361, 0x4e8: 0x3064, 0x4e9: 0x3370,
+	0x4ea: 0x3069, 0x4eb: 0x3375, 0x4ec: 0x30af, 0x4ed: 0x33bb, 0x4ee: 0x390b, 0x4ef: 0x3a9a,
+	0x4f0: 0x30b9, 0x4f1: 0x33ca, 0x4f2: 0x30c3, 0x4f3: 0x33d4, 0x4f4: 0x30cd, 0x4f5: 0x33de,
+	0x4f6: 0x46c4, 0x4f7: 0x4755, 0x4f8: 0x3912, 0x4f9: 0x3aa1, 0x4fa: 0x30e6, 0x4fb: 0x33f7,
+	0x4fc: 0x30e1, 0x4fd: 0x33f2, 0x4fe: 0x30eb, 0x4ff: 0x33fc,
+	// Block 0x14, offset 0x500
+	0x500: 0x30f0, 0x501: 0x3401, 0x502: 0x30f5, 0x503: 0x3406, 0x504: 0x3109, 0x505: 0x341a,
+	0x506: 0x3113, 0x507: 0x3424, 0x508: 0x3122, 0x509: 0x3433, 0x50a: 0x311d, 0x50b: 0x342e,
+	0x50c: 0x3935, 0x50d: 0x3ac4, 0x50e: 0x3943, 0x50f: 0x3ad2, 0x510: 0x394a, 0x511: 0x3ad9,
+	0x512: 0x3951, 0x513: 0x3ae0, 0x514: 0x314f, 0x515: 0x3460, 0x516: 0x3154, 0x517: 0x3465,
+	0x518: 0x315e, 0x519: 0x346f, 0x51a: 0x46f1, 0x51b: 0x4782, 0x51c: 0x3997, 0x51d: 0x3b26,
+	0x51e: 0x3177, 0x51f: 0x3488, 0x520: 0x3181, 0x521: 0x3492, 0x522: 0x4700, 0x523: 0x4791,
+	0x524: 0x399e, 0x525: 0x3b2d, 0x526: 0x39a5, 0x527: 0x3b34, 0x528: 0x39ac, 0x529: 0x3b3b,
+	0x52a: 0x3190, 0x52b: 0x34a1, 0x52c: 0x319a, 0x52d: 0x34b0, 0x52e: 0x31ae, 0x52f: 0x34c4,
+	0x530: 0x31a9, 0x531: 0x34bf, 0x532: 0x31ea, 0x533: 0x3500, 0x534: 0x31f9, 0x535: 0x350f,
+	0x536: 0x31f4, 0x537: 0x350a, 0x538: 0x39b3, 0x539: 0x3b42, 0x53a: 0x39ba, 0x53b: 0x3b49,
+	0x53c: 0x31fe, 0x53d: 0x3514, 0x53e: 0x3203, 0x53f: 0x3519,
+	// Block 0x15, offset 0x540
+	0x540: 0x3208, 0x541: 0x351e, 0x542: 0x320d, 0x543: 0x3523, 0x544: 0x321c, 0x545: 0x3532,
+	0x546: 0x3217, 0x547: 0x352d, 0x548: 0x3221, 0x549: 0x353c, 0x54a: 0x3226, 0x54b: 0x3541,
+	0x54c: 0x322b, 0x54d: 0x3546, 0x54e: 0x3249, 0x54f: 0x3564, 0x550: 0x3262, 0x551: 0x3582,
+	0x552: 0x3271, 0x553: 0x3591, 0x554: 0x3276, 0x555: 0x3596, 0x556: 0x337a, 0x557: 0x34a6,
+	0x558: 0x3537, 0x559: 0x3573, 0x55a: 0x1be0, 0x55b: 0x42d7,
+	0x560: 0x46a1, 0x561: 0x4732, 0x562: 0x2f83, 0x563: 0x328f,
+	0x564: 0x3878, 0x565: 0x3a07, 0x566: 0x3871, 0x567: 0x3a00, 0x568: 0x3886, 0x569: 0x3a15,
+	0x56a: 0x387f, 0x56b: 0x3a0e, 0x56c: 0x38be, 0x56d: 0x3a4d, 0x56e: 0x3894, 0x56f: 0x3a23,
+	0x570: 0x388d, 0x571: 0x3a1c, 0x572: 0x38a2, 0x573: 0x3a31, 0x574: 0x389b, 0x575: 0x3a2a,
+	0x576: 0x38c5, 0x577: 0x3a54, 0x578: 0x46b5, 0x579: 0x4746, 0x57a: 0x3000, 0x57b: 0x330c,
+	0x57c: 0x2fec, 0x57d: 0x32f8, 0x57e: 0x38da, 0x57f: 0x3a69,
+	// Block 0x16, offset 0x580
+	0x580: 0x38d3, 0x581: 0x3a62, 0x582: 0x38e8, 0x583: 0x3a77, 0x584: 0x38e1, 0x585: 0x3a70,
+	0x586: 0x38fd, 0x587: 0x3a8c, 0x588: 0x3091, 0x589: 0x339d, 0x58a: 0x30a5, 0x58b: 0x33b1,
+	0x58c: 0x46e7, 0x58d: 0x4778, 0x58e: 0x3136, 0x58f: 0x3447, 0x590: 0x3920, 0x591: 0x3aaf,
+	0x592: 0x3919, 0x593: 0x3aa8, 0x594: 0x392e, 0x595: 0x3abd, 0x596: 0x3927, 0x597: 0x3ab6,
+	0x598: 0x3989, 0x599: 0x3b18, 0x59a: 0x396d, 0x59b: 0x3afc, 0x59c: 0x3966, 0x59d: 0x3af5,
+	0x59e: 0x397b, 0x59f: 0x3b0a, 0x5a0: 0x3974, 0x5a1: 0x3b03, 0x5a2: 0x3982, 0x5a3: 0x3b11,
+	0x5a4: 0x31e5, 0x5a5: 0x34fb, 0x5a6: 0x31c7, 0x5a7: 0x34dd, 0x5a8: 0x39e4, 0x5a9: 0x3b73,
+	0x5aa: 0x39dd, 0x5ab: 0x3b6c, 0x5ac: 0x39f2, 0x5ad: 0x3b81, 0x5ae: 0x39eb, 0x5af: 0x3b7a,
+	0x5b0: 0x39f9, 0x5b1: 0x3b88, 0x5b2: 0x3230, 0x5b3: 0x354b, 0x5b4: 0x3258, 0x5b5: 0x3578,
+	0x5b6: 0x3253, 0x5b7: 0x356e, 0x5b8: 0x323f, 0x5b9: 0x355a,
+	// Block 0x17, offset 0x5c0
+	0x5c0: 0x4804, 0x5c1: 0x480a, 0x5c2: 0x491e, 0x5c3: 0x4936, 0x5c4: 0x4926, 0x5c5: 0x493e,
+	0x5c6: 0x492e, 0x5c7: 0x4946, 0x5c8: 0x47aa, 0x5c9: 0x47b0, 0x5ca: 0x488e, 0x5cb: 0x48a6,
+	0x5cc: 0x4896, 0x5cd: 0x48ae, 0x5ce: 0x489e, 0x5cf: 0x48b6, 0x5d0: 0x4816, 0x5d1: 0x481c,
+	0x5d2: 0x3db8, 0x5d3: 0x3dc8, 0x5d4: 0x3dc0, 0x5d5: 0x3dd0,
+	0x5d8: 0x47b6, 0x5d9: 0x47bc, 0x5da: 0x3ce8, 0x5db: 0x3cf8, 0x5dc: 0x3cf0, 0x5dd: 0x3d00,
+	0x5e0: 0x482e, 0x5e1: 0x4834, 0x5e2: 0x494e, 0x5e3: 0x4966,
+	0x5e4: 0x4956, 0x5e5: 0x496e, 0x5e6: 0x495e, 0x5e7: 0x4976, 0x5e8: 0x47c2, 0x5e9: 0x47c8,
+	0x5ea: 0x48be, 0x5eb: 0x48d6, 0x5ec: 0x48c6, 0x5ed: 0x48de, 0x5ee: 0x48ce, 0x5ef: 0x48e6,
+	0x5f0: 0x4846, 0x5f1: 0x484c, 0x5f2: 0x3e18, 0x5f3: 0x3e30, 0x5f4: 0x3e20, 0x5f5: 0x3e38,
+	0x5f6: 0x3e28, 0x5f7: 0x3e40, 0x5f8: 0x47ce, 0x5f9: 0x47d4, 0x5fa: 0x3d18, 0x5fb: 0x3d30,
+	0x5fc: 0x3d20, 0x5fd: 0x3d38, 0x5fe: 0x3d28, 0x5ff: 0x3d40,
+	// Block 0x18, offset 0x600
+	0x600: 0x4852, 0x601: 0x4858, 0x602: 0x3e48, 0x603: 0x3e58, 0x604: 0x3e50, 0x605: 0x3e60,
+	0x608: 0x47da, 0x609: 0x47e0, 0x60a: 0x3d48, 0x60b: 0x3d58,
+	0x60c: 0x3d50, 0x60d: 0x3d60, 0x610: 0x4864, 0x611: 0x486a,
+	0x612: 0x3e80, 0x613: 0x3e98, 0x614: 0x3e88, 0x615: 0x3ea0, 0x616: 0x3e90, 0x617: 0x3ea8,
+	0x619: 0x47e6, 0x61b: 0x3d68, 0x61d: 0x3d70,
+	0x61f: 0x3d78, 0x620: 0x487c, 0x621: 0x4882, 0x622: 0x497e, 0x623: 0x4996,
+	0x624: 0x4986, 0x625: 0x499e, 0x626: 0x498e, 0x627: 0x49a6, 0x628: 0x47ec, 0x629: 0x47f2,
+	0x62a: 0x48ee, 0x62b: 0x4906, 0x62c: 0x48f6, 0x62d: 0x490e, 0x62e: 0x48fe, 0x62f: 0x4916,
+	0x630: 0x47f8, 0x631: 0x431e, 0x632: 0x3691, 0x633: 0x4324, 0x634: 0x4822, 0x635: 0x432a,
+	0x636: 0x36a3, 0x637: 0x4330, 0x638: 0x36c1, 0x639: 0x4336, 0x63a: 0x36d9, 0x63b: 0x433c,
+	0x63c: 0x4870, 0x63d: 0x4342,
+	// Block 0x19, offset 0x640
+	0x640: 0x3da0, 0x641: 0x3da8, 0x642: 0x4184, 0x643: 0x41a2, 0x644: 0x418e, 0x645: 0x41ac,
+	0x646: 0x4198, 0x647: 0x41b6, 0x648: 0x3cd8, 0x649: 0x3ce0, 0x64a: 0x40d0, 0x64b: 0x40ee,
+	0x64c: 0x40da, 0x64d: 0x40f8, 0x64e: 0x40e4, 0x64f: 0x4102, 0x650: 0x3de8, 0x651: 0x3df0,
+	0x652: 0x41c0, 0x653: 0x41de, 0x654: 0x41ca, 0x655: 0x41e8, 0x656: 0x41d4, 0x657: 0x41f2,
+	0x658: 0x3d08, 0x659: 0x3d10, 0x65a: 0x410c, 0x65b: 0x412a, 0x65c: 0x4116, 0x65d: 0x4134,
+	0x65e: 0x4120, 0x65f: 0x413e, 0x660: 0x3ec0, 0x661: 0x3ec8, 0x662: 0x41fc, 0x663: 0x421a,
+	0x664: 0x4206, 0x665: 0x4224, 0x666: 0x4210, 0x667: 0x422e, 0x668: 0x3d80, 0x669: 0x3d88,
+	0x66a: 0x4148, 0x66b: 0x4166, 0x66c: 0x4152, 0x66d: 0x4170, 0x66e: 0x415c, 0x66f: 0x417a,
+	0x670: 0x3685, 0x671: 0x367f, 0x672: 0x3d90, 0x673: 0x368b, 0x674: 0x3d98,
+	0x676: 0x4810, 0x677: 0x3db0, 0x678: 0x35f5, 0x679: 0x35ef, 0x67a: 0x35e3, 0x67b: 0x42ee,
+	0x67c: 0x35fb, 0x67d: 0x4287, 0x67e: 0x01d3, 0x67f: 0x4287,
+	// Block 0x1a, offset 0x680
+	0x680: 0x42a0, 0x681: 0x4482, 0x682: 0x3dd8, 0x683: 0x369d, 0x684: 0x3de0,
+	0x686: 0x483a, 0x687: 0x3df8, 0x688: 0x3601, 0x689: 0x42f4, 0x68a: 0x360d, 0x68b: 0x42fa,
+	0x68c: 0x3619, 0x68d: 0x4489, 0x68e: 0x4490, 0x68f: 0x4497, 0x690: 0x36b5, 0x691: 0x36af,
+	0x692: 0x3e00, 0x693: 0x44e4, 0x696: 0x36bb, 0x697: 0x3e10,
+	0x698: 0x3631, 0x699: 0x362b, 0x69a: 0x361f, 0x69b: 0x4300, 0x69d: 0x449e,
+	0x69e: 0x44a5, 0x69f: 0x44ac, 0x6a0: 0x36eb, 0x6a1: 0x36e5, 0x6a2: 0x3e68, 0x6a3: 0x44ec,
+	0x6a4: 0x36cd, 0x6a5: 0x36d3, 0x6a6: 0x36f1, 0x6a7: 0x3e78, 0x6a8: 0x3661, 0x6a9: 0x365b,
+	0x6aa: 0x364f, 0x6ab: 0x430c, 0x6ac: 0x3649, 0x6ad: 0x4474, 0x6ae: 0x447b, 0x6af: 0x0081,
+	0x6b2: 0x3eb0, 0x6b3: 0x36f7, 0x6b4: 0x3eb8,
+	0x6b6: 0x4888, 0x6b7: 0x3ed0, 0x6b8: 0x363d, 0x6b9: 0x4306, 0x6ba: 0x366d, 0x6bb: 0x4318,
+	0x6bc: 0x3679, 0x6bd: 0x425a, 0x6be: 0x428c,
+	// Block 0x1b, offset 0x6c0
+	0x6c0: 0x1bd8, 0x6c1: 0x1bdc, 0x6c2: 0x0047, 0x6c3: 0x1c54, 0x6c5: 0x1be8,
+	0x6c6: 0x1bec, 0x6c7: 0x00e9, 0x6c9: 0x1c58, 0x6ca: 0x008f, 0x6cb: 0x0051,
+	0x6cc: 0x0051, 0x6cd: 0x0051, 0x6ce: 0x0091, 0x6cf: 0x00da, 0x6d0: 0x0053, 0x6d1: 0x0053,
+	0x6d2: 0x0059, 0x6d3: 0x0099, 0x6d5: 0x005d, 0x6d6: 0x198d,
+	0x6d9: 0x0061, 0x6da: 0x0063, 0x6db: 0x0065, 0x6dc: 0x0065, 0x6dd: 0x0065,
+	0x6e0: 0x199f, 0x6e1: 0x1bc8, 0x6e2: 0x19a8,
+	0x6e4: 0x0075, 0x6e6: 0x01b8, 0x6e8: 0x0075,
+	0x6ea: 0x0057, 0x6eb: 0x42d2, 0x6ec: 0x0045, 0x6ed: 0x0047, 0x6ef: 0x008b,
+	0x6f0: 0x004b, 0x6f1: 0x004d, 0x6f3: 0x005b, 0x6f4: 0x009f, 0x6f5: 0x0215,
+	0x6f6: 0x0218, 0x6f7: 0x021b, 0x6f8: 0x021e, 0x6f9: 0x0093, 0x6fb: 0x1b98,
+	0x6fc: 0x01e8, 0x6fd: 0x01c1, 0x6fe: 0x0179, 0x6ff: 0x01a0,
+	// Block 0x1c, offset 0x700
+	0x700: 0x0463, 0x705: 0x0049,
+	0x706: 0x0089, 0x707: 0x008b, 0x708: 0x0093, 0x709: 0x0095,
+	0x710: 0x222e, 0x711: 0x223a,
+	0x712: 0x22ee, 0x713: 0x2216, 0x714: 0x229a, 0x715: 0x2222, 0x716: 0x22a0, 0x717: 0x22b8,
+	0x718: 0x22c4, 0x719: 0x2228, 0x71a: 0x22ca, 0x71b: 0x2234, 0x71c: 0x22be, 0x71d: 0x22d0,
+	0x71e: 0x22d6, 0x71f: 0x1cbc, 0x720: 0x0053, 0x721: 0x195a, 0x722: 0x1ba4, 0x723: 0x1963,
+	0x724: 0x006d, 0x725: 0x19ab, 0x726: 0x1bd0, 0x727: 0x1d48, 0x728: 0x1966, 0x729: 0x0071,
+	0x72a: 0x19b7, 0x72b: 0x1bd4, 0x72c: 0x0059, 0x72d: 0x0047, 0x72e: 0x0049, 0x72f: 0x005b,
+	0x730: 0x0093, 0x731: 0x19e4, 0x732: 0x1c18, 0x733: 0x19ed, 0x734: 0x00ad, 0x735: 0x1a62,
+	0x736: 0x1c4c, 0x737: 0x1d5c, 0x738: 0x19f0, 0x739: 0x00b1, 0x73a: 0x1a65, 0x73b: 0x1c50,
+	0x73c: 0x0099, 0x73d: 0x0087, 0x73e: 0x0089, 0x73f: 0x009b,
+	// Block 0x1d, offset 0x740
+	0x741: 0x3c06, 0x743: 0xa000, 0x744: 0x3c0d, 0x745: 0xa000,
+	0x747: 0x3c14, 0x748: 0xa000, 0x749: 0x3c1b,
+	0x74d: 0xa000,
+	0x760: 0x2f65, 0x761: 0xa000, 0x762: 0x3c29,
+	0x764: 0xa000, 0x765: 0xa000,
+	0x76d: 0x3c22, 0x76e: 0x2f60, 0x76f: 0x2f6a,
+	0x770: 0x3c30, 0x771: 0x3c37, 0x772: 0xa000, 0x773: 0xa000, 0x774: 0x3c3e, 0x775: 0x3c45,
+	0x776: 0xa000, 0x777: 0xa000, 0x778: 0x3c4c, 0x779: 0x3c53, 0x77a: 0xa000, 0x77b: 0xa000,
+	0x77c: 0xa000, 0x77d: 0xa000,
+	// Block 0x1e, offset 0x780
+	0x780: 0x3c5a, 0x781: 0x3c61, 0x782: 0xa000, 0x783: 0xa000, 0x784: 0x3c76, 0x785: 0x3c7d,
+	0x786: 0xa000, 0x787: 0xa000, 0x788: 0x3c84, 0x789: 0x3c8b,
+	0x791: 0xa000,
+	0x792: 0xa000,
+	0x7a2: 0xa000,
+	0x7a8: 0xa000, 0x7a9: 0xa000,
+	0x7ab: 0xa000, 0x7ac: 0x3ca0, 0x7ad: 0x3ca7, 0x7ae: 0x3cae, 0x7af: 0x3cb5,
+	0x7b2: 0xa000, 0x7b3: 0xa000, 0x7b4: 0xa000, 0x7b5: 0xa000,
+	// Block 0x1f, offset 0x7c0
+	0x7e0: 0x0023, 0x7e1: 0x0025, 0x7e2: 0x0027, 0x7e3: 0x0029,
+	0x7e4: 0x002b, 0x7e5: 0x002d, 0x7e6: 0x002f, 0x7e7: 0x0031, 0x7e8: 0x0033, 0x7e9: 0x1882,
+	0x7ea: 0x1885, 0x7eb: 0x1888, 0x7ec: 0x188b, 0x7ed: 0x188e, 0x7ee: 0x1891, 0x7ef: 0x1894,
+	0x7f0: 0x1897, 0x7f1: 0x189a, 0x7f2: 0x189d, 0x7f3: 0x18a6, 0x7f4: 0x1a68, 0x7f5: 0x1a6c,
+	0x7f6: 0x1a70, 0x7f7: 0x1a74, 0x7f8: 0x1a78, 0x7f9: 0x1a7c, 0x7fa: 0x1a80, 0x7fb: 0x1a84,
+	0x7fc: 0x1a88, 0x7fd: 0x1c80, 0x7fe: 0x1c85, 0x7ff: 0x1c8a,
+	// Block 0x20, offset 0x800
+	0x800: 0x1c8f, 0x801: 0x1c94, 0x802: 0x1c99, 0x803: 0x1c9e, 0x804: 0x1ca3, 0x805: 0x1ca8,
+	0x806: 0x1cad, 0x807: 0x1cb2, 0x808: 0x187f, 0x809: 0x18a3, 0x80a: 0x18c7, 0x80b: 0x18eb,
+	0x80c: 0x190f, 0x80d: 0x1918, 0x80e: 0x191e, 0x80f: 0x1924, 0x810: 0x192a, 0x811: 0x1b60,
+	0x812: 0x1b64, 0x813: 0x1b68, 0x814: 0x1b6c, 0x815: 0x1b70, 0x816: 0x1b74, 0x817: 0x1b78,
+	0x818: 0x1b7c, 0x819: 0x1b80, 0x81a: 0x1b84, 0x81b: 0x1b88, 0x81c: 0x1af4, 0x81d: 0x1af8,
+	0x81e: 0x1afc, 0x81f: 0x1b00, 0x820: 0x1b04, 0x821: 0x1b08, 0x822: 0x1b0c, 0x823: 0x1b10,
+	0x824: 0x1b14, 0x825: 0x1b18, 0x826: 0x1b1c, 0x827: 0x1b20, 0x828: 0x1b24, 0x829: 0x1b28,
+	0x82a: 0x1b2c, 0x82b: 0x1b30, 0x82c: 0x1b34, 0x82d: 0x1b38, 0x82e: 0x1b3c, 0x82f: 0x1b40,
+	0x830: 0x1b44, 0x831: 0x1b48, 0x832: 0x1b4c, 0x833: 0x1b50, 0x834: 0x1b54, 0x835: 0x1b58,
+	0x836: 0x0043, 0x837: 0x0045, 0x838: 0x0047, 0x839: 0x0049, 0x83a: 0x004b, 0x83b: 0x004d,
+	0x83c: 0x004f, 0x83d: 0x0051, 0x83e: 0x0053, 0x83f: 0x0055,
+	// Block 0x21, offset 0x840
+	0x840: 0x06bf, 0x841: 0x06e3, 0x842: 0x06ef, 0x843: 0x06ff, 0x844: 0x0707, 0x845: 0x0713,
+	0x846: 0x071b, 0x847: 0x0723, 0x848: 0x072f, 0x849: 0x0783, 0x84a: 0x079b, 0x84b: 0x07ab,
+	0x84c: 0x07bb, 0x84d: 0x07cb, 0x84e: 0x07db, 0x84f: 0x07fb, 0x850: 0x07ff, 0x851: 0x0803,
+	0x852: 0x0837, 0x853: 0x085f, 0x854: 0x086f, 0x855: 0x0877, 0x856: 0x087b, 0x857: 0x0887,
+	0x858: 0x08a3, 0x859: 0x08a7, 0x85a: 0x08bf, 0x85b: 0x08c3, 0x85c: 0x08cb, 0x85d: 0x08db,
+	0x85e: 0x0977, 0x85f: 0x098b, 0x860: 0x09cb, 0x861: 0x09df, 0x862: 0x09e7, 0x863: 0x09eb,
+	0x864: 0x09fb, 0x865: 0x0a17, 0x866: 0x0a43, 0x867: 0x0a4f, 0x868: 0x0a6f, 0x869: 0x0a7b,
+	0x86a: 0x0a7f, 0x86b: 0x0a83, 0x86c: 0x0a9b, 0x86d: 0x0a9f, 0x86e: 0x0acb, 0x86f: 0x0ad7,
+	0x870: 0x0adf, 0x871: 0x0ae7, 0x872: 0x0af7, 0x873: 0x0aff, 0x874: 0x0b07, 0x875: 0x0b33,
+	0x876: 0x0b37, 0x877: 0x0b3f, 0x878: 0x0b43, 0x879: 0x0b4b, 0x87a: 0x0b53, 0x87b: 0x0b63,
+	0x87c: 0x0b7f, 0x87d: 0x0bf7, 0x87e: 0x0c0b, 0x87f: 0x0c0f,
+	// Block 0x22, offset 0x880
+	0x880: 0x0c8f, 0x881: 0x0c93, 0x882: 0x0ca7, 0x883: 0x0cab, 0x884: 0x0cb3, 0x885: 0x0cbb,
+	0x886: 0x0cc3, 0x887: 0x0ccf, 0x888: 0x0cf7, 0x889: 0x0d07, 0x88a: 0x0d1b, 0x88b: 0x0d8b,
+	0x88c: 0x0d97, 0x88d: 0x0da7, 0x88e: 0x0db3, 0x88f: 0x0dbf, 0x890: 0x0dc7, 0x891: 0x0dcb,
+	0x892: 0x0dcf, 0x893: 0x0dd3, 0x894: 0x0dd7, 0x895: 0x0e8f, 0x896: 0x0ed7, 0x897: 0x0ee3,
+	0x898: 0x0ee7, 0x899: 0x0eeb, 0x89a: 0x0eef, 0x89b: 0x0ef7, 0x89c: 0x0efb, 0x89d: 0x0f0f,
+	0x89e: 0x0f2b, 0x89f: 0x0f33, 0x8a0: 0x0f73, 0x8a1: 0x0f77, 0x8a2: 0x0f7f, 0x8a3: 0x0f83,
+	0x8a4: 0x0f8b, 0x8a5: 0x0f8f, 0x8a6: 0x0fb3, 0x8a7: 0x0fb7, 0x8a8: 0x0fd3, 0x8a9: 0x0fd7,
+	0x8aa: 0x0fdb, 0x8ab: 0x0fdf, 0x8ac: 0x0ff3, 0x8ad: 0x1017, 0x8ae: 0x101b, 0x8af: 0x101f,
+	0x8b0: 0x1043, 0x8b1: 0x1083, 0x8b2: 0x1087, 0x8b3: 0x10a7, 0x8b4: 0x10b7, 0x8b5: 0x10bf,
+	0x8b6: 0x10df, 0x8b7: 0x1103, 0x8b8: 0x1147, 0x8b9: 0x114f, 0x8ba: 0x1163, 0x8bb: 0x116f,
+	0x8bc: 0x1177, 0x8bd: 0x117f, 0x8be: 0x1183, 0x8bf: 0x1187,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x119f, 0x8c1: 0x11a3, 0x8c2: 0x11bf, 0x8c3: 0x11c7, 0x8c4: 0x11cf, 0x8c5: 0x11d3,
+	0x8c6: 0x11df, 0x8c7: 0x11e7, 0x8c8: 0x11eb, 0x8c9: 0x11ef, 0x8ca: 0x11f7, 0x8cb: 0x11fb,
+	0x8cc: 0x129b, 0x8cd: 0x12af, 0x8ce: 0x12e3, 0x8cf: 0x12e7, 0x8d0: 0x12ef, 0x8d1: 0x131b,
+	0x8d2: 0x1323, 0x8d3: 0x132b, 0x8d4: 0x1333, 0x8d5: 0x136f, 0x8d6: 0x1373, 0x8d7: 0x137b,
+	0x8d8: 0x137f, 0x8d9: 0x1383, 0x8da: 0x13af, 0x8db: 0x13b3, 0x8dc: 0x13bb, 0x8dd: 0x13cf,
+	0x8de: 0x13d3, 0x8df: 0x13ef, 0x8e0: 0x13f7, 0x8e1: 0x13fb, 0x8e2: 0x141f, 0x8e3: 0x143f,
+	0x8e4: 0x1453, 0x8e5: 0x1457, 0x8e6: 0x145f, 0x8e7: 0x148b, 0x8e8: 0x148f, 0x8e9: 0x149f,
+	0x8ea: 0x14c3, 0x8eb: 0x14cf, 0x8ec: 0x14df, 0x8ed: 0x14f7, 0x8ee: 0x14ff, 0x8ef: 0x1503,
+	0x8f0: 0x1507, 0x8f1: 0x150b, 0x8f2: 0x1517, 0x8f3: 0x151b, 0x8f4: 0x1523, 0x8f5: 0x153f,
+	0x8f6: 0x1543, 0x8f7: 0x1547, 0x8f8: 0x155f, 0x8f9: 0x1563, 0x8fa: 0x156b, 0x8fb: 0x157f,
+	0x8fc: 0x1583, 0x8fd: 0x1587, 0x8fe: 0x158f, 0x8ff: 0x1593,
+	// Block 0x24, offset 0x900
+	0x906: 0xa000, 0x90b: 0xa000,
+	0x90c: 0x3f08, 0x90d: 0xa000, 0x90e: 0x3f10, 0x90f: 0xa000, 0x910: 0x3f18, 0x911: 0xa000,
+	0x912: 0x3f20, 0x913: 0xa000, 0x914: 0x3f28, 0x915: 0xa000, 0x916: 0x3f30, 0x917: 0xa000,
+	0x918: 0x3f38, 0x919: 0xa000, 0x91a: 0x3f40, 0x91b: 0xa000, 0x91c: 0x3f48, 0x91d: 0xa000,
+	0x91e: 0x3f50, 0x91f: 0xa000, 0x920: 0x3f58, 0x921: 0xa000, 0x922: 0x3f60,
+	0x924: 0xa000, 0x925: 0x3f68, 0x926: 0xa000, 0x927: 0x3f70, 0x928: 0xa000, 0x929: 0x3f78,
+	0x92f: 0xa000,
+	0x930: 0x3f80, 0x931: 0x3f88, 0x932: 0xa000, 0x933: 0x3f90, 0x934: 0x3f98, 0x935: 0xa000,
+	0x936: 0x3fa0, 0x937: 0x3fa8, 0x938: 0xa000, 0x939: 0x3fb0, 0x93a: 0x3fb8, 0x93b: 0xa000,
+	0x93c: 0x3fc0, 0x93d: 0x3fc8,
+	// Block 0x25, offset 0x940
+	0x954: 0x3f00,
+	0x959: 0x9903, 0x95a: 0x9903, 0x95b: 0x42dc, 0x95c: 0x42e2, 0x95d: 0xa000,
+	0x95e: 0x3fd0, 0x95f: 0x26b4,
+	0x966: 0xa000,
+	0x96b: 0xa000, 0x96c: 0x3fe0, 0x96d: 0xa000, 0x96e: 0x3fe8, 0x96f: 0xa000,
+	0x970: 0x3ff0, 0x971: 0xa000, 0x972: 0x3ff8, 0x973: 0xa000, 0x974: 0x4000, 0x975: 0xa000,
+	0x976: 0x4008, 0x977: 0xa000, 0x978: 0x4010, 0x979: 0xa000, 0x97a: 0x4018, 0x97b: 0xa000,
+	0x97c: 0x4020, 0x97d: 0xa000, 0x97e: 0x4028, 0x97f: 0xa000,
+	// Block 0x26, offset 0x980
+	0x980: 0x4030, 0x981: 0xa000, 0x982: 0x4038, 0x984: 0xa000, 0x985: 0x4040,
+	0x986: 0xa000, 0x987: 0x4048, 0x988: 0xa000, 0x989: 0x4050,
+	0x98f: 0xa000, 0x990: 0x4058, 0x991: 0x4060,
+	0x992: 0xa000, 0x993: 0x4068, 0x994: 0x4070, 0x995: 0xa000, 0x996: 0x4078, 0x997: 0x4080,
+	0x998: 0xa000, 0x999: 0x4088, 0x99a: 0x4090, 0x99b: 0xa000, 0x99c: 0x4098, 0x99d: 0x40a0,
+	0x9af: 0xa000,
+	0x9b0: 0xa000, 0x9b1: 0xa000, 0x9b2: 0xa000, 0x9b4: 0x3fd8,
+	0x9b7: 0x40a8, 0x9b8: 0x40b0, 0x9b9: 0x40b8, 0x9ba: 0x40c0,
+	0x9bd: 0xa000, 0x9be: 0x40c8, 0x9bf: 0x26c9,
+	// Block 0x27, offset 0x9c0
+	0x9c0: 0x0367, 0x9c1: 0x032b, 0x9c2: 0x032f, 0x9c3: 0x0333, 0x9c4: 0x037b, 0x9c5: 0x0337,
+	0x9c6: 0x033b, 0x9c7: 0x033f, 0x9c8: 0x0343, 0x9c9: 0x0347, 0x9ca: 0x034b, 0x9cb: 0x034f,
+	0x9cc: 0x0353, 0x9cd: 0x0357, 0x9ce: 0x035b, 0x9cf: 0x49bd, 0x9d0: 0x49c3, 0x9d1: 0x49c9,
+	0x9d2: 0x49cf, 0x9d3: 0x49d5, 0x9d4: 0x49db, 0x9d5: 0x49e1, 0x9d6: 0x49e7, 0x9d7: 0x49ed,
+	0x9d8: 0x49f3, 0x9d9: 0x49f9, 0x9da: 0x49ff, 0x9db: 0x4a05, 0x9dc: 0x4a0b, 0x9dd: 0x4a11,
+	0x9de: 0x4a17, 0x9df: 0x4a1d, 0x9e0: 0x4a23, 0x9e1: 0x4a29, 0x9e2: 0x4a2f, 0x9e3: 0x4a35,
+	0x9e4: 0x03c3, 0x9e5: 0x035f, 0x9e6: 0x0363, 0x9e7: 0x03e7, 0x9e8: 0x03eb, 0x9e9: 0x03ef,
+	0x9ea: 0x03f3, 0x9eb: 0x03f7, 0x9ec: 0x03fb, 0x9ed: 0x03ff, 0x9ee: 0x036b, 0x9ef: 0x0403,
+	0x9f0: 0x0407, 0x9f1: 0x036f, 0x9f2: 0x0373, 0x9f3: 0x0377, 0x9f4: 0x037f, 0x9f5: 0x0383,
+	0x9f6: 0x0387, 0x9f7: 0x038b, 0x9f8: 0x038f, 0x9f9: 0x0393, 0x9fa: 0x0397, 0x9fb: 0x039b,
+	0x9fc: 0x039f, 0x9fd: 0x03a3, 0x9fe: 0x03a7, 0x9ff: 0x03ab,
+	// Block 0x28, offset 0xa00
+	0xa00: 0x03af, 0xa01: 0x03b3, 0xa02: 0x040b, 0xa03: 0x040f, 0xa04: 0x03b7, 0xa05: 0x03bb,
+	0xa06: 0x03bf, 0xa07: 0x03c7, 0xa08: 0x03cb, 0xa09: 0x03cf, 0xa0a: 0x03d3, 0xa0b: 0x03d7,
+	0xa0c: 0x03db, 0xa0d: 0x03df, 0xa0e: 0x03e3,
+	0xa12: 0x06bf, 0xa13: 0x071b, 0xa14: 0x06cb, 0xa15: 0x097b, 0xa16: 0x06cf, 0xa17: 0x06e7,
+	0xa18: 0x06d3, 0xa19: 0x0f93, 0xa1a: 0x0707, 0xa1b: 0x06db, 0xa1c: 0x06c3, 0xa1d: 0x09ff,
+	0xa1e: 0x098f, 0xa1f: 0x072f,
+	// Block 0x29, offset 0xa40
+	0xa40: 0x2054, 0xa41: 0x205a, 0xa42: 0x2060, 0xa43: 0x2066, 0xa44: 0x206c, 0xa45: 0x2072,
+	0xa46: 0x2078, 0xa47: 0x207e, 0xa48: 0x2084, 0xa49: 0x208a, 0xa4a: 0x2090, 0xa4b: 0x2096,
+	0xa4c: 0x209c, 0xa4d: 0x20a2, 0xa4e: 0x2726, 0xa4f: 0x272f, 0xa50: 0x2738, 0xa51: 0x2741,
+	0xa52: 0x274a, 0xa53: 0x2753, 0xa54: 0x275c, 0xa55: 0x2765, 0xa56: 0x276e, 0xa57: 0x2780,
+	0xa58: 0x2789, 0xa59: 0x2792, 0xa5a: 0x279b, 0xa5b: 0x27a4, 0xa5c: 0x2777, 0xa5d: 0x2bac,
+	0xa5e: 0x2aed, 0xa60: 0x20a8, 0xa61: 0x20c0, 0xa62: 0x20b4, 0xa63: 0x2108,
+	0xa64: 0x20c6, 0xa65: 0x20e4, 0xa66: 0x20ae, 0xa67: 0x20de, 0xa68: 0x20ba, 0xa69: 0x20f0,
+	0xa6a: 0x2120, 0xa6b: 0x213e, 0xa6c: 0x2138, 0xa6d: 0x212c, 0xa6e: 0x217a, 0xa6f: 0x210e,
+	0xa70: 0x211a, 0xa71: 0x2132, 0xa72: 0x2126, 0xa73: 0x2150, 0xa74: 0x20fc, 0xa75: 0x2144,
+	0xa76: 0x216e, 0xa77: 0x2156, 0xa78: 0x20ea, 0xa79: 0x20cc, 0xa7a: 0x2102, 0xa7b: 0x2114,
+	0xa7c: 0x214a, 0xa7d: 0x20d2, 0xa7e: 0x2174, 0xa7f: 0x20f6,
+	// Block 0x2a, offset 0xa80
+	0xa80: 0x215c, 0xa81: 0x20d8, 0xa82: 0x2162, 0xa83: 0x2168, 0xa84: 0x092f, 0xa85: 0x0b03,
+	0xa86: 0x0ca7, 0xa87: 0x10c7,
+	0xa90: 0x1bc4, 0xa91: 0x18a9,
+	0xa92: 0x18ac, 0xa93: 0x18af, 0xa94: 0x18b2, 0xa95: 0x18b5, 0xa96: 0x18b8, 0xa97: 0x18bb,
+	0xa98: 0x18be, 0xa99: 0x18c1, 0xa9a: 0x18ca, 0xa9b: 0x18cd, 0xa9c: 0x18d0, 0xa9d: 0x18d3,
+	0xa9e: 0x18d6, 0xa9f: 0x18d9, 0xaa0: 0x0313, 0xaa1: 0x031b, 0xaa2: 0x031f, 0xaa3: 0x0327,
+	0xaa4: 0x032b, 0xaa5: 0x032f, 0xaa6: 0x0337, 0xaa7: 0x033f, 0xaa8: 0x0343, 0xaa9: 0x034b,
+	0xaaa: 0x034f, 0xaab: 0x0353, 0xaac: 0x0357, 0xaad: 0x035b, 0xaae: 0x2e18, 0xaaf: 0x2e20,
+	0xab0: 0x2e28, 0xab1: 0x2e30, 0xab2: 0x2e38, 0xab3: 0x2e40, 0xab4: 0x2e48, 0xab5: 0x2e50,
+	0xab6: 0x2e60, 0xab7: 0x2e68, 0xab8: 0x2e70, 0xab9: 0x2e78, 0xaba: 0x2e80, 0xabb: 0x2e88,
+	0xabc: 0x2ed3, 0xabd: 0x2e9b, 0xabe: 0x2e58,
+	// Block 0x2b, offset 0xac0
+	0xac0: 0x06bf, 0xac1: 0x071b, 0xac2: 0x06cb, 0xac3: 0x097b, 0xac4: 0x071f, 0xac5: 0x07af,
+	0xac6: 0x06c7, 0xac7: 0x07ab, 0xac8: 0x070b, 0xac9: 0x0887, 0xaca: 0x0d07, 0xacb: 0x0e8f,
+	0xacc: 0x0dd7, 0xacd: 0x0d1b, 0xace: 0x145f, 0xacf: 0x098b, 0xad0: 0x0ccf, 0xad1: 0x0d4b,
+	0xad2: 0x0d0b, 0xad3: 0x104b, 0xad4: 0x08fb, 0xad5: 0x0f03, 0xad6: 0x1387, 0xad7: 0x105f,
+	0xad8: 0x0843, 0xad9: 0x108f, 0xada: 0x0f9b, 0xadb: 0x0a17, 0xadc: 0x140f, 0xadd: 0x077f,
+	0xade: 0x08ab, 0xadf: 0x0df7, 0xae0: 0x1527, 0xae1: 0x0743, 0xae2: 0x07d3, 0xae3: 0x0d9b,
+	0xae4: 0x06cf, 0xae5: 0x06e7, 0xae6: 0x06d3, 0xae7: 0x0adb, 0xae8: 0x08ef, 0xae9: 0x087f,
+	0xaea: 0x0a57, 0xaeb: 0x0a4b, 0xaec: 0x0feb, 0xaed: 0x073f, 0xaee: 0x139b, 0xaef: 0x089b,
+	0xaf0: 0x09f3, 0xaf1: 0x18dc, 0xaf2: 0x18df, 0xaf3: 0x18e2, 0xaf4: 0x18e5, 0xaf5: 0x18ee,
+	0xaf6: 0x18f1, 0xaf7: 0x18f4, 0xaf8: 0x18f7, 0xaf9: 0x18fa, 0xafa: 0x18fd, 0xafb: 0x1900,
+	0xafc: 0x1903, 0xafd: 0x1906, 0xafe: 0x1909, 0xaff: 0x1912,
+	// Block 0x2c, offset 0xb00
+	0xb00: 0x1cc6, 0xb01: 0x1cd5, 0xb02: 0x1ce4, 0xb03: 0x1cf3, 0xb04: 0x1d02, 0xb05: 0x1d11,
+	0xb06: 0x1d20, 0xb07: 0x1d2f, 0xb08: 0x1d3e, 0xb09: 0x218c, 0xb0a: 0x219e, 0xb0b: 0x21b0,
+	0xb0c: 0x1954, 0xb0d: 0x1c04, 0xb0e: 0x19d2, 0xb0f: 0x1ba8, 0xb10: 0x04cb, 0xb11: 0x04d3,
+	0xb12: 0x04db, 0xb13: 0x04e3, 0xb14: 0x04eb, 0xb15: 0x04ef, 0xb16: 0x04f3, 0xb17: 0x04f7,
+	0xb18: 0x04fb, 0xb19: 0x04ff, 0xb1a: 0x0503, 0xb1b: 0x0507, 0xb1c: 0x050b, 0xb1d: 0x050f,
+	0xb1e: 0x0513, 0xb1f: 0x0517, 0xb20: 0x051b, 0xb21: 0x0523, 0xb22: 0x0527, 0xb23: 0x052b,
+	0xb24: 0x052f, 0xb25: 0x0533, 0xb26: 0x0537, 0xb27: 0x053b, 0xb28: 0x053f, 0xb29: 0x0543,
+	0xb2a: 0x0547, 0xb2b: 0x054b, 0xb2c: 0x054f, 0xb2d: 0x0553, 0xb2e: 0x0557, 0xb2f: 0x055b,
+	0xb30: 0x055f, 0xb31: 0x0563, 0xb32: 0x0567, 0xb33: 0x056f, 0xb34: 0x0577, 0xb35: 0x057f,
+	0xb36: 0x0583, 0xb37: 0x0587, 0xb38: 0x058b, 0xb39: 0x058f, 0xb3a: 0x0593, 0xb3b: 0x0597,
+	0xb3c: 0x059b, 0xb3d: 0x059f, 0xb3e: 0x05a3,
+	// Block 0x2d, offset 0xb40
+	0xb40: 0x2b0c, 0xb41: 0x29a8, 0xb42: 0x2b1c, 0xb43: 0x2880, 0xb44: 0x2ee4, 0xb45: 0x288a,
+	0xb46: 0x2894, 0xb47: 0x2f28, 0xb48: 0x29b5, 0xb49: 0x289e, 0xb4a: 0x28a8, 0xb4b: 0x28b2,
+	0xb4c: 0x29dc, 0xb4d: 0x29e9, 0xb4e: 0x29c2, 0xb4f: 0x29cf, 0xb50: 0x2ea9, 0xb51: 0x29f6,
+	0xb52: 0x2a03, 0xb53: 0x2bbe, 0xb54: 0x26bb, 0xb55: 0x2bd1, 0xb56: 0x2be4, 0xb57: 0x2b2c,
+	0xb58: 0x2a10, 0xb59: 0x2bf7, 0xb5a: 0x2c0a, 0xb5b: 0x2a1d, 0xb5c: 0x28bc, 0xb5d: 0x28c6,
+	0xb5e: 0x2eb7, 0xb5f: 0x2a2a, 0xb60: 0x2b3c, 0xb61: 0x2ef5, 0xb62: 0x28d0, 0xb63: 0x28da,
+	0xb64: 0x2a37, 0xb65: 0x28e4, 0xb66: 0x28ee, 0xb67: 0x26d0, 0xb68: 0x26d7, 0xb69: 0x28f8,
+	0xb6a: 0x2902, 0xb6b: 0x2c1d, 0xb6c: 0x2a44, 0xb6d: 0x2b4c, 0xb6e: 0x2c30, 0xb6f: 0x2a51,
+	0xb70: 0x2916, 0xb71: 0x290c, 0xb72: 0x2f3c, 0xb73: 0x2a5e, 0xb74: 0x2c43, 0xb75: 0x2920,
+	0xb76: 0x2b5c, 0xb77: 0x292a, 0xb78: 0x2a78, 0xb79: 0x2934, 0xb7a: 0x2a85, 0xb7b: 0x2f06,
+	0xb7c: 0x2a6b, 0xb7d: 0x2b6c, 0xb7e: 0x2a92, 0xb7f: 0x26de,
+	// Block 0x2e, offset 0xb80
+	0xb80: 0x2f17, 0xb81: 0x293e, 0xb82: 0x2948, 0xb83: 0x2a9f, 0xb84: 0x2952, 0xb85: 0x295c,
+	0xb86: 0x2966, 0xb87: 0x2b7c, 0xb88: 0x2aac, 0xb89: 0x26e5, 0xb8a: 0x2c56, 0xb8b: 0x2e90,
+	0xb8c: 0x2b8c, 0xb8d: 0x2ab9, 0xb8e: 0x2ec5, 0xb8f: 0x2970, 0xb90: 0x297a, 0xb91: 0x2ac6,
+	0xb92: 0x26ec, 0xb93: 0x2ad3, 0xb94: 0x2b9c, 0xb95: 0x26f3, 0xb96: 0x2c69, 0xb97: 0x2984,
+	0xb98: 0x1cb7, 0xb99: 0x1ccb, 0xb9a: 0x1cda, 0xb9b: 0x1ce9, 0xb9c: 0x1cf8, 0xb9d: 0x1d07,
+	0xb9e: 0x1d16, 0xb9f: 0x1d25, 0xba0: 0x1d34, 0xba1: 0x1d43, 0xba2: 0x2192, 0xba3: 0x21a4,
+	0xba4: 0x21b6, 0xba5: 0x21c2, 0xba6: 0x21ce, 0xba7: 0x21da, 0xba8: 0x21e6, 0xba9: 0x21f2,
+	0xbaa: 0x21fe, 0xbab: 0x220a, 0xbac: 0x2246, 0xbad: 0x2252, 0xbae: 0x225e, 0xbaf: 0x226a,
+	0xbb0: 0x2276, 0xbb1: 0x1c14, 0xbb2: 0x19c6, 0xbb3: 0x1936, 0xbb4: 0x1be4, 0xbb5: 0x1a47,
+	0xbb6: 0x1a56, 0xbb7: 0x19cc, 0xbb8: 0x1bfc, 0xbb9: 0x1c00, 0xbba: 0x1960, 0xbbb: 0x2701,
+	0xbbc: 0x270f, 0xbbd: 0x26fa, 0xbbe: 0x2708, 0xbbf: 0x2ae0,
+	// Block 0x2f, offset 0xbc0
+	0xbc0: 0x1a4a, 0xbc1: 0x1a32, 0xbc2: 0x1c60, 0xbc3: 0x1a1a, 0xbc4: 0x19f3, 0xbc5: 0x1969,
+	0xbc6: 0x1978, 0xbc7: 0x1948, 0xbc8: 0x1bf0, 0xbc9: 0x1d52, 0xbca: 0x1a4d, 0xbcb: 0x1a35,
+	0xbcc: 0x1c64, 0xbcd: 0x1c70, 0xbce: 0x1a26, 0xbcf: 0x19fc, 0xbd0: 0x1957, 0xbd1: 0x1c1c,
+	0xbd2: 0x1bb0, 0xbd3: 0x1b9c, 0xbd4: 0x1bcc, 0xbd5: 0x1c74, 0xbd6: 0x1a29, 0xbd7: 0x19c9,
+	0xbd8: 0x19ff, 0xbd9: 0x19de, 0xbda: 0x1a41, 0xbdb: 0x1c78, 0xbdc: 0x1a2c, 0xbdd: 0x19c0,
+	0xbde: 0x1a02, 0xbdf: 0x1c3c, 0xbe0: 0x1bf4, 0xbe1: 0x1a14, 0xbe2: 0x1c24, 0xbe3: 0x1c40,
+	0xbe4: 0x1bf8, 0xbe5: 0x1a17, 0xbe6: 0x1c28, 0xbe7: 0x22e8, 0xbe8: 0x22fc, 0xbe9: 0x1996,
+	0xbea: 0x1c20, 0xbeb: 0x1bb4, 0xbec: 0x1ba0, 0xbed: 0x1c48, 0xbee: 0x2716, 0xbef: 0x27ad,
+	0xbf0: 0x1a59, 0xbf1: 0x1a44, 0xbf2: 0x1c7c, 0xbf3: 0x1a2f, 0xbf4: 0x1a50, 0xbf5: 0x1a38,
+	0xbf6: 0x1c68, 0xbf7: 0x1a1d, 0xbf8: 0x19f6, 0xbf9: 0x1981, 0xbfa: 0x1a53, 0xbfb: 0x1a3b,
+	0xbfc: 0x1c6c, 0xbfd: 0x1a20, 0xbfe: 0x19f9, 0xbff: 0x1984,
+	// Block 0x30, offset 0xc00
+	0xc00: 0x1c2c, 0xc01: 0x1bb8, 0xc02: 0x1d4d, 0xc03: 0x1939, 0xc04: 0x19ba, 0xc05: 0x19bd,
+	0xc06: 0x22f5, 0xc07: 0x1b94, 0xc08: 0x19c3, 0xc09: 0x194b, 0xc0a: 0x19e1, 0xc0b: 0x194e,
+	0xc0c: 0x19ea, 0xc0d: 0x196c, 0xc0e: 0x196f, 0xc0f: 0x1a05, 0xc10: 0x1a0b, 0xc11: 0x1a0e,
+	0xc12: 0x1c30, 0xc13: 0x1a11, 0xc14: 0x1a23, 0xc15: 0x1c38, 0xc16: 0x1c44, 0xc17: 0x1990,
+	0xc18: 0x1d57, 0xc19: 0x1bbc, 0xc1a: 0x1993, 0xc1b: 0x1a5c, 0xc1c: 0x19a5, 0xc1d: 0x19b4,
+	0xc1e: 0x22e2, 0xc1f: 0x22dc, 0xc20: 0x1cc1, 0xc21: 0x1cd0, 0xc22: 0x1cdf, 0xc23: 0x1cee,
+	0xc24: 0x1cfd, 0xc25: 0x1d0c, 0xc26: 0x1d1b, 0xc27: 0x1d2a, 0xc28: 0x1d39, 0xc29: 0x2186,
+	0xc2a: 0x2198, 0xc2b: 0x21aa, 0xc2c: 0x21bc, 0xc2d: 0x21c8, 0xc2e: 0x21d4, 0xc2f: 0x21e0,
+	0xc30: 0x21ec, 0xc31: 0x21f8, 0xc32: 0x2204, 0xc33: 0x2240, 0xc34: 0x224c, 0xc35: 0x2258,
+	0xc36: 0x2264, 0xc37: 0x2270, 0xc38: 0x227c, 0xc39: 0x2282, 0xc3a: 0x2288, 0xc3b: 0x228e,
+	0xc3c: 0x2294, 0xc3d: 0x22a6, 0xc3e: 0x22ac, 0xc3f: 0x1c10,
+	// Block 0x31, offset 0xc40
+	0xc40: 0x1377, 0xc41: 0x0cfb, 0xc42: 0x13d3, 0xc43: 0x139f, 0xc44: 0x0e57, 0xc45: 0x06eb,
+	0xc46: 0x08df, 0xc47: 0x162b, 0xc48: 0x162b, 0xc49: 0x0a0b, 0xc4a: 0x145f, 0xc4b: 0x0943,
+	0xc4c: 0x0a07, 0xc4d: 0x0bef, 0xc4e: 0x0fcf, 0xc4f: 0x115f, 0xc50: 0x1297, 0xc51: 0x12d3,
+	0xc52: 0x1307, 0xc53: 0x141b, 0xc54: 0x0d73, 0xc55: 0x0dff, 0xc56: 0x0eab, 0xc57: 0x0f43,
+	0xc58: 0x125f, 0xc59: 0x1447, 0xc5a: 0x1573, 0xc5b: 0x070f, 0xc5c: 0x08b3, 0xc5d: 0x0d87,
+	0xc5e: 0x0ecf, 0xc5f: 0x1293, 0xc60: 0x15c3, 0xc61: 0x0ab3, 0xc62: 0x0e77, 0xc63: 0x1283,
+	0xc64: 0x1317, 0xc65: 0x0c23, 0xc66: 0x11bb, 0xc67: 0x12df, 0xc68: 0x0b1f, 0xc69: 0x0d0f,
+	0xc6a: 0x0e17, 0xc6b: 0x0f1b, 0xc6c: 0x1427, 0xc6d: 0x074f, 0xc6e: 0x07e7, 0xc6f: 0x0853,
+	0xc70: 0x0c8b, 0xc71: 0x0d7f, 0xc72: 0x0ecb, 0xc73: 0x0fef, 0xc74: 0x1177, 0xc75: 0x128b,
+	0xc76: 0x12a3, 0xc77: 0x13c7, 0xc78: 0x14ef, 0xc79: 0x15a3, 0xc7a: 0x15bf, 0xc7b: 0x102b,
+	0xc7c: 0x106b, 0xc7d: 0x1123, 0xc7e: 0x1243, 0xc7f: 0x147b,
+	// Block 0x32, offset 0xc80
+	0xc80: 0x15cb, 0xc81: 0x134b, 0xc82: 0x09c7, 0xc83: 0x0b3b, 0xc84: 0x10db, 0xc85: 0x119b,
+	0xc86: 0x0eff, 0xc87: 0x1033, 0xc88: 0x1397, 0xc89: 0x14e7, 0xc8a: 0x09c3, 0xc8b: 0x0a8f,
+	0xc8c: 0x0d77, 0xc8d: 0x0e2b, 0xc8e: 0x0e5f, 0xc8f: 0x1113, 0xc90: 0x113b, 0xc91: 0x14a7,
+	0xc92: 0x084f, 0xc93: 0x11a7, 0xc94: 0x07f3, 0xc95: 0x07ef, 0xc96: 0x1097, 0xc97: 0x1127,
+	0xc98: 0x125b, 0xc99: 0x14af, 0xc9a: 0x1367, 0xc9b: 0x0c27, 0xc9c: 0x0d73, 0xc9d: 0x1357,
+	0xc9e: 0x06f7, 0xc9f: 0x0a63, 0xca0: 0x0b93, 0xca1: 0x0f2f, 0xca2: 0x0faf, 0xca3: 0x0873,
+	0xca4: 0x103b, 0xca5: 0x075f, 0xca6: 0x0b77, 0xca7: 0x06d7, 0xca8: 0x0deb, 0xca9: 0x0ca3,
+	0xcaa: 0x110f, 0xcab: 0x08c7, 0xcac: 0x09b3, 0xcad: 0x0ffb, 0xcae: 0x1263, 0xcaf: 0x133b,
+	0xcb0: 0x0db7, 0xcb1: 0x13f7, 0xcb2: 0x0de3, 0xcb3: 0x0c37, 0xcb4: 0x121b, 0xcb5: 0x0c57,
+	0xcb6: 0x0fab, 0xcb7: 0x072b, 0xcb8: 0x07a7, 0xcb9: 0x07eb, 0xcba: 0x0d53, 0xcbb: 0x10fb,
+	0xcbc: 0x11f3, 0xcbd: 0x1347, 0xcbe: 0x145b, 0xcbf: 0x085b,
+	// Block 0x33, offset 0xcc0
+	0xcc0: 0x090f, 0xcc1: 0x0a17, 0xcc2: 0x0b2f, 0xcc3: 0x0cbf, 0xcc4: 0x0e7b, 0xcc5: 0x103f,
+	0xcc6: 0x1497, 0xcc7: 0x157b, 0xcc8: 0x15cf, 0xcc9: 0x15e7, 0xcca: 0x0837, 0xccb: 0x0cf3,
+	0xccc: 0x0da3, 0xccd: 0x13eb, 0xcce: 0x0afb, 0xccf: 0x0bd7, 0xcd0: 0x0bf3, 0xcd1: 0x0c83,
+	0xcd2: 0x0e6b, 0xcd3: 0x0eb7, 0xcd4: 0x0f67, 0xcd5: 0x108b, 0xcd6: 0x112f, 0xcd7: 0x1193,
+	0xcd8: 0x13db, 0xcd9: 0x126b, 0xcda: 0x1403, 0xcdb: 0x147f, 0xcdc: 0x080f, 0xcdd: 0x083b,
+	0xcde: 0x0923, 0xcdf: 0x0ea7, 0xce0: 0x12f3, 0xce1: 0x133b, 0xce2: 0x0b1b, 0xce3: 0x0b8b,
+	0xce4: 0x0c4f, 0xce5: 0x0daf, 0xce6: 0x10d7, 0xce7: 0x0f23, 0xce8: 0x073b, 0xce9: 0x097f,
+	0xcea: 0x0a63, 0xceb: 0x0ac7, 0xcec: 0x0b97, 0xced: 0x0f3f, 0xcee: 0x0f5b, 0xcef: 0x116b,
+	0xcf0: 0x118b, 0xcf1: 0x1463, 0xcf2: 0x14e3, 0xcf3: 0x14f3, 0xcf4: 0x152f, 0xcf5: 0x0753,
+	0xcf6: 0x107f, 0xcf7: 0x144f, 0xcf8: 0x14cb, 0xcf9: 0x0baf, 0xcfa: 0x0717, 0xcfb: 0x0777,
+	0xcfc: 0x0a67, 0xcfd: 0x0a87, 0xcfe: 0x0caf, 0xcff: 0x0d73,
+	// Block 0x34, offset 0xd00
+	0xd00: 0x0ec3, 0xd01: 0x0fcb, 0xd02: 0x1277, 0xd03: 0x1417, 0xd04: 0x1623, 0xd05: 0x0ce3,
+	0xd06: 0x14a3, 0xd07: 0x0833, 0xd08: 0x0d2f, 0xd09: 0x0d3b, 0xd0a: 0x0e0f, 0xd0b: 0x0e47,
+	0xd0c: 0x0f4b, 0xd0d: 0x0fa7, 0xd0e: 0x1027, 0xd0f: 0x110b, 0xd10: 0x153b, 0xd11: 0x07af,
+	0xd12: 0x0c03, 0xd13: 0x14b3, 0xd14: 0x0767, 0xd15: 0x0aab, 0xd16: 0x0e2f, 0xd17: 0x13df,
+	0xd18: 0x0b67, 0xd19: 0x0bb7, 0xd1a: 0x0d43, 0xd1b: 0x0f2f, 0xd1c: 0x14bb, 0xd1d: 0x0817,
+	0xd1e: 0x08ff, 0xd1f: 0x0a97, 0xd20: 0x0cd3, 0xd21: 0x0d1f, 0xd22: 0x0d5f, 0xd23: 0x0df3,
+	0xd24: 0x0f47, 0xd25: 0x0fbb, 0xd26: 0x1157, 0xd27: 0x12f7, 0xd28: 0x1303, 0xd29: 0x1457,
+	0xd2a: 0x14d7, 0xd2b: 0x0883, 0xd2c: 0x0e4b, 0xd2d: 0x0903, 0xd2e: 0x0ec7, 0xd2f: 0x0f6b,
+	0xd30: 0x1287, 0xd31: 0x14bf, 0xd32: 0x15ab, 0xd33: 0x15d3, 0xd34: 0x0d37, 0xd35: 0x0e27,
+	0xd36: 0x11c3, 0xd37: 0x10b7, 0xd38: 0x10c3, 0xd39: 0x10e7, 0xd3a: 0x0f17, 0xd3b: 0x0e9f,
+	0xd3c: 0x1363, 0xd3d: 0x0733, 0xd3e: 0x122b, 0xd3f: 0x081b,
+	// Block 0x35, offset 0xd40
+	0xd40: 0x080b, 0xd41: 0x0b0b, 0xd42: 0x0c2b, 0xd43: 0x10f3, 0xd44: 0x0a53, 0xd45: 0x0e03,
+	0xd46: 0x0cef, 0xd47: 0x13e7, 0xd48: 0x12e7, 0xd49: 0x14ab, 0xd4a: 0x1323, 0xd4b: 0x0b27,
+	0xd4c: 0x0787, 0xd4d: 0x095b, 0xd50: 0x09af,
+	0xd52: 0x0cdf, 0xd55: 0x07f7, 0xd56: 0x0f1f, 0xd57: 0x0fe3,
+	0xd58: 0x1047, 0xd59: 0x1063, 0xd5a: 0x1067, 0xd5b: 0x107b, 0xd5c: 0x14fb, 0xd5d: 0x10eb,
+	0xd5e: 0x116f, 0xd60: 0x128f, 0xd62: 0x1353,
+	0xd65: 0x1407, 0xd66: 0x1433,
+	0xd6a: 0x154f, 0xd6b: 0x1553, 0xd6c: 0x1557, 0xd6d: 0x15bb, 0xd6e: 0x142b, 0xd6f: 0x14c7,
+	0xd70: 0x0757, 0xd71: 0x077b, 0xd72: 0x078f, 0xd73: 0x084b, 0xd74: 0x0857, 0xd75: 0x0897,
+	0xd76: 0x094b, 0xd77: 0x0967, 0xd78: 0x096f, 0xd79: 0x09ab, 0xd7a: 0x09b7, 0xd7b: 0x0a93,
+	0xd7c: 0x0a9b, 0xd7d: 0x0ba3, 0xd7e: 0x0bcb, 0xd7f: 0x0bd3,
+	// Block 0x36, offset 0xd80
+	0xd80: 0x0beb, 0xd81: 0x0c97, 0xd82: 0x0cc7, 0xd83: 0x0ce7, 0xd84: 0x0d57, 0xd85: 0x0e1b,
+	0xd86: 0x0e37, 0xd87: 0x0e67, 0xd88: 0x0ebb, 0xd89: 0x0edb, 0xd8a: 0x0f4f, 0xd8b: 0x102f,
+	0xd8c: 0x104b, 0xd8d: 0x1053, 0xd8e: 0x104f, 0xd8f: 0x1057, 0xd90: 0x105b, 0xd91: 0x105f,
+	0xd92: 0x1073, 0xd93: 0x1077, 0xd94: 0x109b, 0xd95: 0x10af, 0xd96: 0x10cb, 0xd97: 0x112f,
+	0xd98: 0x1137, 0xd99: 0x113f, 0xd9a: 0x1153, 0xd9b: 0x117b, 0xd9c: 0x11cb, 0xd9d: 0x11ff,
+	0xd9e: 0x11ff, 0xd9f: 0x1267, 0xda0: 0x130f, 0xda1: 0x1327, 0xda2: 0x135b, 0xda3: 0x135f,
+	0xda4: 0x13a3, 0xda5: 0x13a7, 0xda6: 0x13ff, 0xda7: 0x1407, 0xda8: 0x14db, 0xda9: 0x151f,
+	0xdaa: 0x1537, 0xdab: 0x0b9b, 0xdac: 0x171e, 0xdad: 0x11e3,
+	0xdb0: 0x06df, 0xdb1: 0x07e3, 0xdb2: 0x07a3, 0xdb3: 0x074b, 0xdb4: 0x078b, 0xdb5: 0x07b7,
+	0xdb6: 0x0847, 0xdb7: 0x0863, 0xdb8: 0x094b, 0xdb9: 0x0937, 0xdba: 0x0947, 0xdbb: 0x0963,
+	0xdbc: 0x09af, 0xdbd: 0x09bf, 0xdbe: 0x0a03, 0xdbf: 0x0a0f,
+	// Block 0x37, offset 0xdc0
+	0xdc0: 0x0a2b, 0xdc1: 0x0a3b, 0xdc2: 0x0b23, 0xdc3: 0x0b2b, 0xdc4: 0x0b5b, 0xdc5: 0x0b7b,
+	0xdc6: 0x0bab, 0xdc7: 0x0bc3, 0xdc8: 0x0bb3, 0xdc9: 0x0bd3, 0xdca: 0x0bc7, 0xdcb: 0x0beb,
+	0xdcc: 0x0c07, 0xdcd: 0x0c5f, 0xdce: 0x0c6b, 0xdcf: 0x0c73, 0xdd0: 0x0c9b, 0xdd1: 0x0cdf,
+	0xdd2: 0x0d0f, 0xdd3: 0x0d13, 0xdd4: 0x0d27, 0xdd5: 0x0da7, 0xdd6: 0x0db7, 0xdd7: 0x0e0f,
+	0xdd8: 0x0e5b, 0xdd9: 0x0e53, 0xdda: 0x0e67, 0xddb: 0x0e83, 0xddc: 0x0ebb, 0xddd: 0x1013,
+	0xdde: 0x0edf, 0xddf: 0x0f13, 0xde0: 0x0f1f, 0xde1: 0x0f5f, 0xde2: 0x0f7b, 0xde3: 0x0f9f,
+	0xde4: 0x0fc3, 0xde5: 0x0fc7, 0xde6: 0x0fe3, 0xde7: 0x0fe7, 0xde8: 0x0ff7, 0xde9: 0x100b,
+	0xdea: 0x1007, 0xdeb: 0x1037, 0xdec: 0x10b3, 0xded: 0x10cb, 0xdee: 0x10e3, 0xdef: 0x111b,
+	0xdf0: 0x112f, 0xdf1: 0x114b, 0xdf2: 0x117b, 0xdf3: 0x122f, 0xdf4: 0x1257, 0xdf5: 0x12cb,
+	0xdf6: 0x1313, 0xdf7: 0x131f, 0xdf8: 0x1327, 0xdf9: 0x133f, 0xdfa: 0x1353, 0xdfb: 0x1343,
+	0xdfc: 0x135b, 0xdfd: 0x1357, 0xdfe: 0x134f, 0xdff: 0x135f,
+	// Block 0x38, offset 0xe00
+	0xe00: 0x136b, 0xe01: 0x13a7, 0xe02: 0x13e3, 0xe03: 0x1413, 0xe04: 0x144b, 0xe05: 0x146b,
+	0xe06: 0x14b7, 0xe07: 0x14db, 0xe08: 0x14fb, 0xe09: 0x150f, 0xe0a: 0x151f, 0xe0b: 0x152b,
+	0xe0c: 0x1537, 0xe0d: 0x158b, 0xe0e: 0x162b, 0xe0f: 0x16b5, 0xe10: 0x16b0, 0xe11: 0x16e2,
+	0xe12: 0x0607, 0xe13: 0x062f, 0xe14: 0x0633, 0xe15: 0x1764, 0xe16: 0x1791, 0xe17: 0x1809,
+	0xe18: 0x1617, 0xe19: 0x1627,
+	// Block 0x39, offset 0xe40
+	0xe40: 0x19d5, 0xe41: 0x19d8, 0xe42: 0x19db, 0xe43: 0x1c08, 0xe44: 0x1c0c, 0xe45: 0x1a5f,
+	0xe46: 0x1a5f,
+	0xe53: 0x1d75, 0xe54: 0x1d66, 0xe55: 0x1d6b, 0xe56: 0x1d7a, 0xe57: 0x1d70,
+	0xe5d: 0x4390,
+	0xe5e: 0x8115, 0xe5f: 0x4402, 0xe60: 0x022d, 0xe61: 0x0215, 0xe62: 0x021e, 0xe63: 0x0221,
+	0xe64: 0x0224, 0xe65: 0x0227, 0xe66: 0x022a, 0xe67: 0x0230, 0xe68: 0x0233, 0xe69: 0x0017,
+	0xe6a: 0x43f0, 0xe6b: 0x43f6, 0xe6c: 0x44f4, 0xe6d: 0x44fc, 0xe6e: 0x4348, 0xe6f: 0x434e,
+	0xe70: 0x4354, 0xe71: 0x435a, 0xe72: 0x4366, 0xe73: 0x436c, 0xe74: 0x4372, 0xe75: 0x437e,
+	0xe76: 0x4384, 0xe78: 0x438a, 0xe79: 0x4396, 0xe7a: 0x439c, 0xe7b: 0x43a2,
+	0xe7c: 0x43ae, 0xe7e: 0x43b4,
+	// Block 0x3a, offset 0xe80
+	0xe80: 0x43ba, 0xe81: 0x43c0, 0xe83: 0x43c6, 0xe84: 0x43cc,
+	0xe86: 0x43d8, 0xe87: 0x43de, 0xe88: 0x43e4, 0xe89: 0x43ea, 0xe8a: 0x43fc, 0xe8b: 0x4378,
+	0xe8c: 0x4360, 0xe8d: 0x43a8, 0xe8e: 0x43d2, 0xe8f: 0x1d7f, 0xe90: 0x0299, 0xe91: 0x0299,
+	0xe92: 0x02a2, 0xe93: 0x02a2, 0xe94: 0x02a2, 0xe95: 0x02a2, 0xe96: 0x02a5, 0xe97: 0x02a5,
+	0xe98: 0x02a5, 0xe99: 0x02a5, 0xe9a: 0x02ab, 0xe9b: 0x02ab, 0xe9c: 0x02ab, 0xe9d: 0x02ab,
+	0xe9e: 0x029f, 0xe9f: 0x029f, 0xea0: 0x029f, 0xea1: 0x029f, 0xea2: 0x02a8, 0xea3: 0x02a8,
+	0xea4: 0x02a8, 0xea5: 0x02a8, 0xea6: 0x029c, 0xea7: 0x029c, 0xea8: 0x029c, 0xea9: 0x029c,
+	0xeaa: 0x02cf, 0xeab: 0x02cf, 0xeac: 0x02cf, 0xead: 0x02cf, 0xeae: 0x02d2, 0xeaf: 0x02d2,
+	0xeb0: 0x02d2, 0xeb1: 0x02d2, 0xeb2: 0x02b1, 0xeb3: 0x02b1, 0xeb4: 0x02b1, 0xeb5: 0x02b1,
+	0xeb6: 0x02ae, 0xeb7: 0x02ae, 0xeb8: 0x02ae, 0xeb9: 0x02ae, 0xeba: 0x02b4, 0xebb: 0x02b4,
+	0xebc: 0x02b4, 0xebd: 0x02b4, 0xebe: 0x02b7, 0xebf: 0x02b7,
+	// Block 0x3b, offset 0xec0
+	0xec0: 0x02b7, 0xec1: 0x02b7, 0xec2: 0x02c0, 0xec3: 0x02c0, 0xec4: 0x02bd, 0xec5: 0x02bd,
+	0xec6: 0x02c3, 0xec7: 0x02c3, 0xec8: 0x02ba, 0xec9: 0x02ba, 0xeca: 0x02c9, 0xecb: 0x02c9,
+	0xecc: 0x02c6, 0xecd: 0x02c6, 0xece: 0x02d5, 0xecf: 0x02d5, 0xed0: 0x02d5, 0xed1: 0x02d5,
+	0xed2: 0x02db, 0xed3: 0x02db, 0xed4: 0x02db, 0xed5: 0x02db, 0xed6: 0x02e1, 0xed7: 0x02e1,
+	0xed8: 0x02e1, 0xed9: 0x02e1, 0xeda: 0x02de, 0xedb: 0x02de, 0xedc: 0x02de, 0xedd: 0x02de,
+	0xede: 0x02e4, 0xedf: 0x02e4, 0xee0: 0x02e7, 0xee1: 0x02e7, 0xee2: 0x02e7, 0xee3: 0x02e7,
+	0xee4: 0x446e, 0xee5: 0x446e, 0xee6: 0x02ed, 0xee7: 0x02ed, 0xee8: 0x02ed, 0xee9: 0x02ed,
+	0xeea: 0x02ea, 0xeeb: 0x02ea, 0xeec: 0x02ea, 0xeed: 0x02ea, 0xeee: 0x0308, 0xeef: 0x0308,
+	0xef0: 0x4468, 0xef1: 0x4468,
+	// Block 0x3c, offset 0xf00
+	0xf13: 0x02d8, 0xf14: 0x02d8, 0xf15: 0x02d8, 0xf16: 0x02d8, 0xf17: 0x02f6,
+	0xf18: 0x02f6, 0xf19: 0x02f3, 0xf1a: 0x02f3, 0xf1b: 0x02f9, 0xf1c: 0x02f9, 0xf1d: 0x204f,
+	0xf1e: 0x02ff, 0xf1f: 0x02ff, 0xf20: 0x02f0, 0xf21: 0x02f0, 0xf22: 0x02fc, 0xf23: 0x02fc,
+	0xf24: 0x0305, 0xf25: 0x0305, 0xf26: 0x0305, 0xf27: 0x0305, 0xf28: 0x028d, 0xf29: 0x028d,
+	0xf2a: 0x25aa, 0xf2b: 0x25aa, 0xf2c: 0x261a, 0xf2d: 0x261a, 0xf2e: 0x25e9, 0xf2f: 0x25e9,
+	0xf30: 0x2605, 0xf31: 0x2605, 0xf32: 0x25fe, 0xf33: 0x25fe, 0xf34: 0x260c, 0xf35: 0x260c,
+	0xf36: 0x2613, 0xf37: 0x2613, 0xf38: 0x2613, 0xf39: 0x25f0, 0xf3a: 0x25f0, 0xf3b: 0x25f0,
+	0xf3c: 0x0302, 0xf3d: 0x0302, 0xf3e: 0x0302, 0xf3f: 0x0302,
+	// Block 0x3d, offset 0xf40
+	0xf40: 0x25b1, 0xf41: 0x25b8, 0xf42: 0x25d4, 0xf43: 0x25f0, 0xf44: 0x25f7, 0xf45: 0x1d89,
+	0xf46: 0x1d8e, 0xf47: 0x1d93, 0xf48: 0x1da2, 0xf49: 0x1db1, 0xf4a: 0x1db6, 0xf4b: 0x1dbb,
+	0xf4c: 0x1dc0, 0xf4d: 0x1dc5, 0xf4e: 0x1dd4, 0xf4f: 0x1de3, 0xf50: 0x1de8, 0xf51: 0x1ded,
+	0xf52: 0x1dfc, 0xf53: 0x1e0b, 0xf54: 0x1e10, 0xf55: 0x1e15, 0xf56: 0x1e1a, 0xf57: 0x1e29,
+	0xf58: 0x1e2e, 0xf59: 0x1e3d, 0xf5a: 0x1e42, 0xf5b: 0x1e47, 0xf5c: 0x1e56, 0xf5d: 0x1e5b,
+	0xf5e: 0x1e60, 0xf5f: 0x1e6a, 0xf60: 0x1ea6, 0xf61: 0x1eb5, 0xf62: 0x1ec4, 0xf63: 0x1ec9,
+	0xf64: 0x1ece, 0xf65: 0x1ed8, 0xf66: 0x1ee7, 0xf67: 0x1eec, 0xf68: 0x1efb, 0xf69: 0x1f00,
+	0xf6a: 0x1f05, 0xf6b: 0x1f14, 0xf6c: 0x1f19, 0xf6d: 0x1f28, 0xf6e: 0x1f2d, 0xf6f: 0x1f32,
+	0xf70: 0x1f37, 0xf71: 0x1f3c, 0xf72: 0x1f41, 0xf73: 0x1f46, 0xf74: 0x1f4b, 0xf75: 0x1f50,
+	0xf76: 0x1f55, 0xf77: 0x1f5a, 0xf78: 0x1f5f, 0xf79: 0x1f64, 0xf7a: 0x1f69, 0xf7b: 0x1f6e,
+	0xf7c: 0x1f73, 0xf7d: 0x1f78, 0xf7e: 0x1f7d, 0xf7f: 0x1f87,
+	// Block 0x3e, offset 0xf80
+	0xf80: 0x1f8c, 0xf81: 0x1f91, 0xf82: 0x1f96, 0xf83: 0x1fa0, 0xf84: 0x1fa5, 0xf85: 0x1faf,
+	0xf86: 0x1fb4, 0xf87: 0x1fb9, 0xf88: 0x1fbe, 0xf89: 0x1fc3, 0xf8a: 0x1fc8, 0xf8b: 0x1fcd,
+	0xf8c: 0x1fd2, 0xf8d: 0x1fd7, 0xf8e: 0x1fe6, 0xf8f: 0x1ff5, 0xf90: 0x1ffa, 0xf91: 0x1fff,
+	0xf92: 0x2004, 0xf93: 0x2009, 0xf94: 0x200e, 0xf95: 0x2018, 0xf96: 0x201d, 0xf97: 0x2022,
+	0xf98: 0x2031, 0xf99: 0x2040, 0xf9a: 0x2045, 0xf9b: 0x4420, 0xf9c: 0x4426, 0xf9d: 0x445c,
+	0xf9e: 0x44b3, 0xf9f: 0x44ba, 0xfa0: 0x44c1, 0xfa1: 0x44c8, 0xfa2: 0x44cf, 0xfa3: 0x44d6,
+	0xfa4: 0x25c6, 0xfa5: 0x25cd, 0xfa6: 0x25d4, 0xfa7: 0x25db, 0xfa8: 0x25f0, 0xfa9: 0x25f7,
+	0xfaa: 0x1d98, 0xfab: 0x1d9d, 0xfac: 0x1da2, 0xfad: 0x1da7, 0xfae: 0x1db1, 0xfaf: 0x1db6,
+	0xfb0: 0x1dca, 0xfb1: 0x1dcf, 0xfb2: 0x1dd4, 0xfb3: 0x1dd9, 0xfb4: 0x1de3, 0xfb5: 0x1de8,
+	0xfb6: 0x1df2, 0xfb7: 0x1df7, 0xfb8: 0x1dfc, 0xfb9: 0x1e01, 0xfba: 0x1e0b, 0xfbb: 0x1e10,
+	0xfbc: 0x1f3c, 0xfbd: 0x1f41, 0xfbe: 0x1f50, 0xfbf: 0x1f55,
+	// Block 0x3f, offset 0xfc0
+	0xfc0: 0x1f5a, 0xfc1: 0x1f6e, 0xfc2: 0x1f73, 0xfc3: 0x1f78, 0xfc4: 0x1f7d, 0xfc5: 0x1f96,
+	0xfc6: 0x1fa0, 0xfc7: 0x1fa5, 0xfc8: 0x1faa, 0xfc9: 0x1fbe, 0xfca: 0x1fdc, 0xfcb: 0x1fe1,
+	0xfcc: 0x1fe6, 0xfcd: 0x1feb, 0xfce: 0x1ff5, 0xfcf: 0x1ffa, 0xfd0: 0x445c, 0xfd1: 0x2027,
+	0xfd2: 0x202c, 0xfd3: 0x2031, 0xfd4: 0x2036, 0xfd5: 0x2040, 0xfd6: 0x2045, 0xfd7: 0x25b1,
+	0xfd8: 0x25b8, 0xfd9: 0x25bf, 0xfda: 0x25d4, 0xfdb: 0x25e2, 0xfdc: 0x1d89, 0xfdd: 0x1d8e,
+	0xfde: 0x1d93, 0xfdf: 0x1da2, 0xfe0: 0x1dac, 0xfe1: 0x1dbb, 0xfe2: 0x1dc0, 0xfe3: 0x1dc5,
+	0xfe4: 0x1dd4, 0xfe5: 0x1dde, 0xfe6: 0x1dfc, 0xfe7: 0x1e15, 0xfe8: 0x1e1a, 0xfe9: 0x1e29,
+	0xfea: 0x1e2e, 0xfeb: 0x1e3d, 0xfec: 0x1e47, 0xfed: 0x1e56, 0xfee: 0x1e5b, 0xfef: 0x1e60,
+	0xff0: 0x1e6a, 0xff1: 0x1ea6, 0xff2: 0x1eab, 0xff3: 0x1eb5, 0xff4: 0x1ec4, 0xff5: 0x1ec9,
+	0xff6: 0x1ece, 0xff7: 0x1ed8, 0xff8: 0x1ee7, 0xff9: 0x1efb, 0xffa: 0x1f00, 0xffb: 0x1f05,
+	0xffc: 0x1f14, 0xffd: 0x1f19, 0xffe: 0x1f28, 0xfff: 0x1f2d,
+	// Block 0x40, offset 0x1000
+	0x1000: 0x1f32, 0x1001: 0x1f37, 0x1002: 0x1f46, 0x1003: 0x1f4b, 0x1004: 0x1f5f, 0x1005: 0x1f64,
+	0x1006: 0x1f69, 0x1007: 0x1f6e, 0x1008: 0x1f73, 0x1009: 0x1f87, 0x100a: 0x1f8c, 0x100b: 0x1f91,
+	0x100c: 0x1f96, 0x100d: 0x1f9b, 0x100e: 0x1faf, 0x100f: 0x1fb4, 0x1010: 0x1fb9, 0x1011: 0x1fbe,
+	0x1012: 0x1fcd, 0x1013: 0x1fd2, 0x1014: 0x1fd7, 0x1015: 0x1fe6, 0x1016: 0x1ff0, 0x1017: 0x1fff,
+	0x1018: 0x2004, 0x1019: 0x4450, 0x101a: 0x2018, 0x101b: 0x201d, 0x101c: 0x2022, 0x101d: 0x2031,
+	0x101e: 0x203b, 0x101f: 0x25d4, 0x1020: 0x25e2, 0x1021: 0x1da2, 0x1022: 0x1dac, 0x1023: 0x1dd4,
+	0x1024: 0x1dde, 0x1025: 0x1dfc, 0x1026: 0x1e06, 0x1027: 0x1e6a, 0x1028: 0x1e6f, 0x1029: 0x1e92,
+	0x102a: 0x1e97, 0x102b: 0x1f6e, 0x102c: 0x1f73, 0x102d: 0x1f96, 0x102e: 0x1fe6, 0x102f: 0x1ff0,
+	0x1030: 0x2031, 0x1031: 0x203b, 0x1032: 0x4504, 0x1033: 0x450c, 0x1034: 0x4514, 0x1035: 0x1ef1,
+	0x1036: 0x1ef6, 0x1037: 0x1f0a, 0x1038: 0x1f0f, 0x1039: 0x1f1e, 0x103a: 0x1f23, 0x103b: 0x1e74,
+	0x103c: 0x1e79, 0x103d: 0x1e9c, 0x103e: 0x1ea1, 0x103f: 0x1e33,
+	// Block 0x41, offset 0x1040
+	0x1040: 0x1e38, 0x1041: 0x1e1f, 0x1042: 0x1e24, 0x1043: 0x1e4c, 0x1044: 0x1e51, 0x1045: 0x1eba,
+	0x1046: 0x1ebf, 0x1047: 0x1edd, 0x1048: 0x1ee2, 0x1049: 0x1e7e, 0x104a: 0x1e83, 0x104b: 0x1e88,
+	0x104c: 0x1e92, 0x104d: 0x1e8d, 0x104e: 0x1e65, 0x104f: 0x1eb0, 0x1050: 0x1ed3, 0x1051: 0x1ef1,
+	0x1052: 0x1ef6, 0x1053: 0x1f0a, 0x1054: 0x1f0f, 0x1055: 0x1f1e, 0x1056: 0x1f23, 0x1057: 0x1e74,
+	0x1058: 0x1e79, 0x1059: 0x1e9c, 0x105a: 0x1ea1, 0x105b: 0x1e33, 0x105c: 0x1e38, 0x105d: 0x1e1f,
+	0x105e: 0x1e24, 0x105f: 0x1e4c, 0x1060: 0x1e51, 0x1061: 0x1eba, 0x1062: 0x1ebf, 0x1063: 0x1edd,
+	0x1064: 0x1ee2, 0x1065: 0x1e7e, 0x1066: 0x1e83, 0x1067: 0x1e88, 0x1068: 0x1e92, 0x1069: 0x1e8d,
+	0x106a: 0x1e65, 0x106b: 0x1eb0, 0x106c: 0x1ed3, 0x106d: 0x1e7e, 0x106e: 0x1e83, 0x106f: 0x1e88,
+	0x1070: 0x1e92, 0x1071: 0x1e6f, 0x1072: 0x1e97, 0x1073: 0x1eec, 0x1074: 0x1e56, 0x1075: 0x1e5b,
+	0x1076: 0x1e60, 0x1077: 0x1e7e, 0x1078: 0x1e83, 0x1079: 0x1e88, 0x107a: 0x1eec, 0x107b: 0x1efb,
+	0x107c: 0x4408, 0x107d: 0x4408,
+	// Block 0x42, offset 0x1080
+	0x1090: 0x2311, 0x1091: 0x2326,
+	0x1092: 0x2326, 0x1093: 0x232d, 0x1094: 0x2334, 0x1095: 0x2349, 0x1096: 0x2350, 0x1097: 0x2357,
+	0x1098: 0x237a, 0x1099: 0x237a, 0x109a: 0x239d, 0x109b: 0x2396, 0x109c: 0x23b2, 0x109d: 0x23a4,
+	0x109e: 0x23ab, 0x109f: 0x23ce, 0x10a0: 0x23ce, 0x10a1: 0x23c7, 0x10a2: 0x23d5, 0x10a3: 0x23d5,
+	0x10a4: 0x23ff, 0x10a5: 0x23ff, 0x10a6: 0x241b, 0x10a7: 0x23e3, 0x10a8: 0x23e3, 0x10a9: 0x23dc,
+	0x10aa: 0x23f1, 0x10ab: 0x23f1, 0x10ac: 0x23f8, 0x10ad: 0x23f8, 0x10ae: 0x2422, 0x10af: 0x2430,
+	0x10b0: 0x2430, 0x10b1: 0x2437, 0x10b2: 0x2437, 0x10b3: 0x243e, 0x10b4: 0x2445, 0x10b5: 0x244c,
+	0x10b6: 0x2453, 0x10b7: 0x2453, 0x10b8: 0x245a, 0x10b9: 0x2468, 0x10ba: 0x2476, 0x10bb: 0x246f,
+	0x10bc: 0x247d, 0x10bd: 0x247d, 0x10be: 0x2492, 0x10bf: 0x2499,
+	// Block 0x43, offset 0x10c0
+	0x10c0: 0x24ca, 0x10c1: 0x24d8, 0x10c2: 0x24d1, 0x10c3: 0x24b5, 0x10c4: 0x24b5, 0x10c5: 0x24df,
+	0x10c6: 0x24df, 0x10c7: 0x24e6, 0x10c8: 0x24e6, 0x10c9: 0x2510, 0x10ca: 0x2517, 0x10cb: 0x251e,
+	0x10cc: 0x24f4, 0x10cd: 0x2502, 0x10ce: 0x2525, 0x10cf: 0x252c,
+	0x10d2: 0x24fb, 0x10d3: 0x2580, 0x10d4: 0x2587, 0x10d5: 0x255d, 0x10d6: 0x2564, 0x10d7: 0x2548,
+	0x10d8: 0x2548, 0x10d9: 0x254f, 0x10da: 0x2579, 0x10db: 0x2572, 0x10dc: 0x259c, 0x10dd: 0x259c,
+	0x10de: 0x230a, 0x10df: 0x231f, 0x10e0: 0x2318, 0x10e1: 0x2342, 0x10e2: 0x233b, 0x10e3: 0x2365,
+	0x10e4: 0x235e, 0x10e5: 0x2388, 0x10e6: 0x236c, 0x10e7: 0x2381, 0x10e8: 0x23b9, 0x10e9: 0x2406,
+	0x10ea: 0x23ea, 0x10eb: 0x2429, 0x10ec: 0x24c3, 0x10ed: 0x24ed, 0x10ee: 0x2595, 0x10ef: 0x258e,
+	0x10f0: 0x25a3, 0x10f1: 0x253a, 0x10f2: 0x24a0, 0x10f3: 0x256b, 0x10f4: 0x2492, 0x10f5: 0x24ca,
+	0x10f6: 0x2461, 0x10f7: 0x24ae, 0x10f8: 0x2541, 0x10f9: 0x2533, 0x10fa: 0x24bc, 0x10fb: 0x24a7,
+	0x10fc: 0x24bc, 0x10fd: 0x2541, 0x10fe: 0x2373, 0x10ff: 0x238f,
+	// Block 0x44, offset 0x1100
+	0x1100: 0x2509, 0x1101: 0x2484, 0x1102: 0x2303, 0x1103: 0x24a7, 0x1104: 0x244c, 0x1105: 0x241b,
+	0x1106: 0x23c0, 0x1107: 0x2556,
+	0x1130: 0x2414, 0x1131: 0x248b, 0x1132: 0x27bf, 0x1133: 0x27b6, 0x1134: 0x27ec, 0x1135: 0x27da,
+	0x1136: 0x27c8, 0x1137: 0x27e3, 0x1138: 0x27f5, 0x1139: 0x240d, 0x113a: 0x2c7c, 0x113b: 0x2afc,
+	0x113c: 0x27d1,
+	// Block 0x45, offset 0x1140
+	0x1150: 0x0019, 0x1151: 0x0483,
+	0x1152: 0x0487, 0x1153: 0x0035, 0x1154: 0x0037, 0x1155: 0x0003, 0x1156: 0x003f, 0x1157: 0x04bf,
+	0x1158: 0x04c3, 0x1159: 0x1b5c,
+	0x1160: 0x8132, 0x1161: 0x8132, 0x1162: 0x8132, 0x1163: 0x8132,
+	0x1164: 0x8132, 0x1165: 0x8132, 0x1166: 0x8132, 0x1167: 0x812d, 0x1168: 0x812d, 0x1169: 0x812d,
+	0x116a: 0x812d, 0x116b: 0x812d, 0x116c: 0x812d, 0x116d: 0x812d, 0x116e: 0x8132, 0x116f: 0x8132,
+	0x1170: 0x1873, 0x1171: 0x0443, 0x1172: 0x043f, 0x1173: 0x007f, 0x1174: 0x007f, 0x1175: 0x0011,
+	0x1176: 0x0013, 0x1177: 0x00b7, 0x1178: 0x00bb, 0x1179: 0x04b7, 0x117a: 0x04bb, 0x117b: 0x04ab,
+	0x117c: 0x04af, 0x117d: 0x0493, 0x117e: 0x0497, 0x117f: 0x048b,
+	// Block 0x46, offset 0x1180
+	0x1180: 0x048f, 0x1181: 0x049b, 0x1182: 0x049f, 0x1183: 0x04a3, 0x1184: 0x04a7,
+	0x1187: 0x0077, 0x1188: 0x007b, 0x1189: 0x4269, 0x118a: 0x4269, 0x118b: 0x4269,
+	0x118c: 0x4269, 0x118d: 0x007f, 0x118e: 0x007f, 0x118f: 0x007f, 0x1190: 0x0019, 0x1191: 0x0483,
+	0x1192: 0x001d, 0x1194: 0x0037, 0x1195: 0x0035, 0x1196: 0x003f, 0x1197: 0x0003,
+	0x1198: 0x0443, 0x1199: 0x0011, 0x119a: 0x0013, 0x119b: 0x00b7, 0x119c: 0x00bb, 0x119d: 0x04b7,
+	0x119e: 0x04bb, 0x119f: 0x0007, 0x11a0: 0x000d, 0x11a1: 0x0015, 0x11a2: 0x0017, 0x11a3: 0x001b,
+	0x11a4: 0x0039, 0x11a5: 0x003d, 0x11a6: 0x003b, 0x11a8: 0x0079, 0x11a9: 0x0009,
+	0x11aa: 0x000b, 0x11ab: 0x0041,
+	0x11b0: 0x42aa, 0x11b1: 0x442c, 0x11b2: 0x42af, 0x11b4: 0x42b4,
+	0x11b6: 0x42b9, 0x11b7: 0x4432, 0x11b8: 0x42be, 0x11b9: 0x4438, 0x11ba: 0x42c3, 0x11bb: 0x443e,
+	0x11bc: 0x42c8, 0x11bd: 0x4444, 0x11be: 0x42cd, 0x11bf: 0x444a,
+	// Block 0x47, offset 0x11c0
+	0x11c0: 0x0236, 0x11c1: 0x440e, 0x11c2: 0x440e, 0x11c3: 0x4414, 0x11c4: 0x4414, 0x11c5: 0x4456,
+	0x11c6: 0x4456, 0x11c7: 0x441a, 0x11c8: 0x441a, 0x11c9: 0x4462, 0x11ca: 0x4462, 0x11cb: 0x4462,
+	0x11cc: 0x4462, 0x11cd: 0x0239, 0x11ce: 0x0239, 0x11cf: 0x023c, 0x11d0: 0x023c, 0x11d1: 0x023c,
+	0x11d2: 0x023c, 0x11d3: 0x023f, 0x11d4: 0x023f, 0x11d5: 0x0242, 0x11d6: 0x0242, 0x11d7: 0x0242,
+	0x11d8: 0x0242, 0x11d9: 0x0245, 0x11da: 0x0245, 0x11db: 0x0245, 0x11dc: 0x0245, 0x11dd: 0x0248,
+	0x11de: 0x0248, 0x11df: 0x0248, 0x11e0: 0x0248, 0x11e1: 0x024b, 0x11e2: 0x024b, 0x11e3: 0x024b,
+	0x11e4: 0x024b, 0x11e5: 0x024e, 0x11e6: 0x024e, 0x11e7: 0x024e, 0x11e8: 0x024e, 0x11e9: 0x0251,
+	0x11ea: 0x0251, 0x11eb: 0x0254, 0x11ec: 0x0254, 0x11ed: 0x0257, 0x11ee: 0x0257, 0x11ef: 0x025a,
+	0x11f0: 0x025a, 0x11f1: 0x025d, 0x11f2: 0x025d, 0x11f3: 0x025d, 0x11f4: 0x025d, 0x11f5: 0x0260,
+	0x11f6: 0x0260, 0x11f7: 0x0260, 0x11f8: 0x0260, 0x11f9: 0x0263, 0x11fa: 0x0263, 0x11fb: 0x0263,
+	0x11fc: 0x0263, 0x11fd: 0x0266, 0x11fe: 0x0266, 0x11ff: 0x0266,
+	// Block 0x48, offset 0x1200
+	0x1200: 0x0266, 0x1201: 0x0269, 0x1202: 0x0269, 0x1203: 0x0269, 0x1204: 0x0269, 0x1205: 0x026c,
+	0x1206: 0x026c, 0x1207: 0x026c, 0x1208: 0x026c, 0x1209: 0x026f, 0x120a: 0x026f, 0x120b: 0x026f,
+	0x120c: 0x026f, 0x120d: 0x0272, 0x120e: 0x0272, 0x120f: 0x0272, 0x1210: 0x0272, 0x1211: 0x0275,
+	0x1212: 0x0275, 0x1213: 0x0275, 0x1214: 0x0275, 0x1215: 0x0278, 0x1216: 0x0278, 0x1217: 0x0278,
+	0x1218: 0x0278, 0x1219: 0x027b, 0x121a: 0x027b, 0x121b: 0x027b, 0x121c: 0x027b, 0x121d: 0x027e,
+	0x121e: 0x027e, 0x121f: 0x027e, 0x1220: 0x027e, 0x1221: 0x0281, 0x1222: 0x0281, 0x1223: 0x0281,
+	0x1224: 0x0281, 0x1225: 0x0284, 0x1226: 0x0284, 0x1227: 0x0284, 0x1228: 0x0284, 0x1229: 0x0287,
+	0x122a: 0x0287, 0x122b: 0x0287, 0x122c: 0x0287, 0x122d: 0x028a, 0x122e: 0x028a, 0x122f: 0x028d,
+	0x1230: 0x028d, 0x1231: 0x0290, 0x1232: 0x0290, 0x1233: 0x0290, 0x1234: 0x0290, 0x1235: 0x2e00,
+	0x1236: 0x2e00, 0x1237: 0x2e08, 0x1238: 0x2e08, 0x1239: 0x2e10, 0x123a: 0x2e10, 0x123b: 0x1f82,
+	0x123c: 0x1f82,
+	// Block 0x49, offset 0x1240
+	0x1240: 0x0081, 0x1241: 0x0083, 0x1242: 0x0085, 0x1243: 0x0087, 0x1244: 0x0089, 0x1245: 0x008b,
+	0x1246: 0x008d, 0x1247: 0x008f, 0x1248: 0x0091, 0x1249: 0x0093, 0x124a: 0x0095, 0x124b: 0x0097,
+	0x124c: 0x0099, 0x124d: 0x009b, 0x124e: 0x009d, 0x124f: 0x009f, 0x1250: 0x00a1, 0x1251: 0x00a3,
+	0x1252: 0x00a5, 0x1253: 0x00a7, 0x1254: 0x00a9, 0x1255: 0x00ab, 0x1256: 0x00ad, 0x1257: 0x00af,
+	0x1258: 0x00b1, 0x1259: 0x00b3, 0x125a: 0x00b5, 0x125b: 0x00b7, 0x125c: 0x00b9, 0x125d: 0x00bb,
+	0x125e: 0x00bd, 0x125f: 0x0477, 0x1260: 0x047b, 0x1261: 0x0487, 0x1262: 0x049b, 0x1263: 0x049f,
+	0x1264: 0x0483, 0x1265: 0x05ab, 0x1266: 0x05a3, 0x1267: 0x04c7, 0x1268: 0x04cf, 0x1269: 0x04d7,
+	0x126a: 0x04df, 0x126b: 0x04e7, 0x126c: 0x056b, 0x126d: 0x0573, 0x126e: 0x057b, 0x126f: 0x051f,
+	0x1270: 0x05af, 0x1271: 0x04cb, 0x1272: 0x04d3, 0x1273: 0x04db, 0x1274: 0x04e3, 0x1275: 0x04eb,
+	0x1276: 0x04ef, 0x1277: 0x04f3, 0x1278: 0x04f7, 0x1279: 0x04fb, 0x127a: 0x04ff, 0x127b: 0x0503,
+	0x127c: 0x0507, 0x127d: 0x050b, 0x127e: 0x050f, 0x127f: 0x0513,
+	// Block 0x4a, offset 0x1280
+	0x1280: 0x0517, 0x1281: 0x051b, 0x1282: 0x0523, 0x1283: 0x0527, 0x1284: 0x052b, 0x1285: 0x052f,
+	0x1286: 0x0533, 0x1287: 0x0537, 0x1288: 0x053b, 0x1289: 0x053f, 0x128a: 0x0543, 0x128b: 0x0547,
+	0x128c: 0x054b, 0x128d: 0x054f, 0x128e: 0x0553, 0x128f: 0x0557, 0x1290: 0x055b, 0x1291: 0x055f,
+	0x1292: 0x0563, 0x1293: 0x0567, 0x1294: 0x056f, 0x1295: 0x0577, 0x1296: 0x057f, 0x1297: 0x0583,
+	0x1298: 0x0587, 0x1299: 0x058b, 0x129a: 0x058f, 0x129b: 0x0593, 0x129c: 0x0597, 0x129d: 0x05a7,
+	0x129e: 0x4a78, 0x129f: 0x4a7e, 0x12a0: 0x03c3, 0x12a1: 0x0313, 0x12a2: 0x0317, 0x12a3: 0x4a3b,
+	0x12a4: 0x031b, 0x12a5: 0x4a41, 0x12a6: 0x4a47, 0x12a7: 0x031f, 0x12a8: 0x0323, 0x12a9: 0x0327,
+	0x12aa: 0x4a4d, 0x12ab: 0x4a53, 0x12ac: 0x4a59, 0x12ad: 0x4a5f, 0x12ae: 0x4a65, 0x12af: 0x4a6b,
+	0x12b0: 0x0367, 0x12b1: 0x032b, 0x12b2: 0x032f, 0x12b3: 0x0333, 0x12b4: 0x037b, 0x12b5: 0x0337,
+	0x12b6: 0x033b, 0x12b7: 0x033f, 0x12b8: 0x0343, 0x12b9: 0x0347, 0x12ba: 0x034b, 0x12bb: 0x034f,
+	0x12bc: 0x0353, 0x12bd: 0x0357, 0x12be: 0x035b,
+	// Block 0x4b, offset 0x12c0
+	0x12c2: 0x49bd, 0x12c3: 0x49c3, 0x12c4: 0x49c9, 0x12c5: 0x49cf,
+	0x12c6: 0x49d5, 0x12c7: 0x49db, 0x12ca: 0x49e1, 0x12cb: 0x49e7,
+	0x12cc: 0x49ed, 0x12cd: 0x49f3, 0x12ce: 0x49f9, 0x12cf: 0x49ff,
+	0x12d2: 0x4a05, 0x12d3: 0x4a0b, 0x12d4: 0x4a11, 0x12d5: 0x4a17, 0x12d6: 0x4a1d, 0x12d7: 0x4a23,
+	0x12da: 0x4a29, 0x12db: 0x4a2f, 0x12dc: 0x4a35,
+	0x12e0: 0x00bf, 0x12e1: 0x00c2, 0x12e2: 0x00cb, 0x12e3: 0x4264,
+	0x12e4: 0x00c8, 0x12e5: 0x00c5, 0x12e6: 0x0447, 0x12e8: 0x046b, 0x12e9: 0x044b,
+	0x12ea: 0x044f, 0x12eb: 0x0453, 0x12ec: 0x0457, 0x12ed: 0x046f, 0x12ee: 0x0473,
+	// Block 0x4c, offset 0x1300
+	0x1300: 0x0063, 0x1301: 0x0065, 0x1302: 0x0067, 0x1303: 0x0069, 0x1304: 0x006b, 0x1305: 0x006d,
+	0x1306: 0x006f, 0x1307: 0x0071, 0x1308: 0x0073, 0x1309: 0x0075, 0x130a: 0x0083, 0x130b: 0x0085,
+	0x130c: 0x0087, 0x130d: 0x0089, 0x130e: 0x008b, 0x130f: 0x008d, 0x1310: 0x008f, 0x1311: 0x0091,
+	0x1312: 0x0093, 0x1313: 0x0095, 0x1314: 0x0097, 0x1315: 0x0099, 0x1316: 0x009b, 0x1317: 0x009d,
+	0x1318: 0x009f, 0x1319: 0x00a1, 0x131a: 0x00a3, 0x131b: 0x00a5, 0x131c: 0x00a7, 0x131d: 0x00a9,
+	0x131e: 0x00ab, 0x131f: 0x00ad, 0x1320: 0x00af, 0x1321: 0x00b1, 0x1322: 0x00b3, 0x1323: 0x00b5,
+	0x1324: 0x00dd, 0x1325: 0x00f2, 0x1328: 0x0173, 0x1329: 0x0176,
+	0x132a: 0x0179, 0x132b: 0x017c, 0x132c: 0x017f, 0x132d: 0x0182, 0x132e: 0x0185, 0x132f: 0x0188,
+	0x1330: 0x018b, 0x1331: 0x018e, 0x1332: 0x0191, 0x1333: 0x0194, 0x1334: 0x0197, 0x1335: 0x019a,
+	0x1336: 0x019d, 0x1337: 0x01a0, 0x1338: 0x01a3, 0x1339: 0x0188, 0x133a: 0x01a6, 0x133b: 0x01a9,
+	0x133c: 0x01ac, 0x133d: 0x01af, 0x133e: 0x01b2, 0x133f: 0x01b5,
+	// Block 0x4d, offset 0x1340
+	0x1340: 0x01fd, 0x1341: 0x0200, 0x1342: 0x0203, 0x1343: 0x045b, 0x1344: 0x01c7, 0x1345: 0x01d0,
+	0x1346: 0x01d6, 0x1347: 0x01fa, 0x1348: 0x01eb, 0x1349: 0x01e8, 0x134a: 0x0206, 0x134b: 0x0209,
+	0x134e: 0x0021, 0x134f: 0x0023, 0x1350: 0x0025, 0x1351: 0x0027,
+	0x1352: 0x0029, 0x1353: 0x002b, 0x1354: 0x002d, 0x1355: 0x002f, 0x1356: 0x0031, 0x1357: 0x0033,
+	0x1358: 0x0021, 0x1359: 0x0023, 0x135a: 0x0025, 0x135b: 0x0027, 0x135c: 0x0029, 0x135d: 0x002b,
+	0x135e: 0x002d, 0x135f: 0x002f, 0x1360: 0x0031, 0x1361: 0x0033, 0x1362: 0x0021, 0x1363: 0x0023,
+	0x1364: 0x0025, 0x1365: 0x0027, 0x1366: 0x0029, 0x1367: 0x002b, 0x1368: 0x002d, 0x1369: 0x002f,
+	0x136a: 0x0031, 0x136b: 0x0033, 0x136c: 0x0021, 0x136d: 0x0023, 0x136e: 0x0025, 0x136f: 0x0027,
+	0x1370: 0x0029, 0x1371: 0x002b, 0x1372: 0x002d, 0x1373: 0x002f, 0x1374: 0x0031, 0x1375: 0x0033,
+	0x1376: 0x0021, 0x1377: 0x0023, 0x1378: 0x0025, 0x1379: 0x0027, 0x137a: 0x0029, 0x137b: 0x002b,
+	0x137c: 0x002d, 0x137d: 0x002f, 0x137e: 0x0031, 0x137f: 0x0033,
+	// Block 0x4e, offset 0x1380
+	0x1380: 0x0239, 0x1381: 0x023c, 0x1382: 0x0248, 0x1383: 0x0251, 0x1385: 0x028a,
+	0x1386: 0x025a, 0x1387: 0x024b, 0x1388: 0x0269, 0x1389: 0x0290, 0x138a: 0x027b, 0x138b: 0x027e,
+	0x138c: 0x0281, 0x138d: 0x0284, 0x138e: 0x025d, 0x138f: 0x026f, 0x1390: 0x0275, 0x1391: 0x0263,
+	0x1392: 0x0278, 0x1393: 0x0257, 0x1394: 0x0260, 0x1395: 0x0242, 0x1396: 0x0245, 0x1397: 0x024e,
+	0x1398: 0x0254, 0x1399: 0x0266, 0x139a: 0x026c, 0x139b: 0x0272, 0x139c: 0x0293, 0x139d: 0x02e4,
+	0x139e: 0x02cc, 0x139f: 0x0296, 0x13a1: 0x023c, 0x13a2: 0x0248,
+	0x13a4: 0x0287, 0x13a7: 0x024b, 0x13a9: 0x0290,
+	0x13aa: 0x027b, 0x13ab: 0x027e, 0x13ac: 0x0281, 0x13ad: 0x0284, 0x13ae: 0x025d, 0x13af: 0x026f,
+	0x13b0: 0x0275, 0x13b1: 0x0263, 0x13b2: 0x0278, 0x13b4: 0x0260, 0x13b5: 0x0242,
+	0x13b6: 0x0245, 0x13b7: 0x024e, 0x13b9: 0x0266, 0x13bb: 0x0272,
+	// Block 0x4f, offset 0x13c0
+	0x13c2: 0x0248,
+	0x13c7: 0x024b, 0x13c9: 0x0290, 0x13cb: 0x027e,
+	0x13cd: 0x0284, 0x13ce: 0x025d, 0x13cf: 0x026f, 0x13d1: 0x0263,
+	0x13d2: 0x0278, 0x13d4: 0x0260, 0x13d7: 0x024e,
+	0x13d9: 0x0266, 0x13db: 0x0272, 0x13dd: 0x02e4,
+	0x13df: 0x0296, 0x13e1: 0x023c, 0x13e2: 0x0248,
+	0x13e4: 0x0287, 0x13e7: 0x024b, 0x13e8: 0x0269, 0x13e9: 0x0290,
+	0x13ea: 0x027b, 0x13ec: 0x0281, 0x13ed: 0x0284, 0x13ee: 0x025d, 0x13ef: 0x026f,
+	0x13f0: 0x0275, 0x13f1: 0x0263, 0x13f2: 0x0278, 0x13f4: 0x0260, 0x13f5: 0x0242,
+	0x13f6: 0x0245, 0x13f7: 0x024e, 0x13f9: 0x0266, 0x13fa: 0x026c, 0x13fb: 0x0272,
+	0x13fc: 0x0293, 0x13fe: 0x02cc,
+	// Block 0x50, offset 0x1400
+	0x1400: 0x0239, 0x1401: 0x023c, 0x1402: 0x0248, 0x1403: 0x0251, 0x1404: 0x0287, 0x1405: 0x028a,
+	0x1406: 0x025a, 0x1407: 0x024b, 0x1408: 0x0269, 0x1409: 0x0290, 0x140b: 0x027e,
+	0x140c: 0x0281, 0x140d: 0x0284, 0x140e: 0x025d, 0x140f: 0x026f, 0x1410: 0x0275, 0x1411: 0x0263,
+	0x1412: 0x0278, 0x1413: 0x0257, 0x1414: 0x0260, 0x1415: 0x0242, 0x1416: 0x0245, 0x1417: 0x024e,
+	0x1418: 0x0254, 0x1419: 0x0266, 0x141a: 0x026c, 0x141b: 0x0272,
+	0x1421: 0x023c, 0x1422: 0x0248, 0x1423: 0x0251,
+	0x1425: 0x028a, 0x1426: 0x025a, 0x1427: 0x024b, 0x1428: 0x0269, 0x1429: 0x0290,
+	0x142b: 0x027e, 0x142c: 0x0281, 0x142d: 0x0284, 0x142e: 0x025d, 0x142f: 0x026f,
+	0x1430: 0x0275, 0x1431: 0x0263, 0x1432: 0x0278, 0x1433: 0x0257, 0x1434: 0x0260, 0x1435: 0x0242,
+	0x1436: 0x0245, 0x1437: 0x024e, 0x1438: 0x0254, 0x1439: 0x0266, 0x143a: 0x026c, 0x143b: 0x0272,
+	// Block 0x51, offset 0x1440
+	0x1440: 0x1879, 0x1441: 0x1876, 0x1442: 0x187c, 0x1443: 0x18a0, 0x1444: 0x18c4, 0x1445: 0x18e8,
+	0x1446: 0x190c, 0x1447: 0x1915, 0x1448: 0x191b, 0x1449: 0x1921, 0x144a: 0x1927,
+	0x1450: 0x1a8c, 0x1451: 0x1a90,
+	0x1452: 0x1a94, 0x1453: 0x1a98, 0x1454: 0x1a9c, 0x1455: 0x1aa0, 0x1456: 0x1aa4, 0x1457: 0x1aa8,
+	0x1458: 0x1aac, 0x1459: 0x1ab0, 0x145a: 0x1ab4, 0x145b: 0x1ab8, 0x145c: 0x1abc, 0x145d: 0x1ac0,
+	0x145e: 0x1ac4, 0x145f: 0x1ac8, 0x1460: 0x1acc, 0x1461: 0x1ad0, 0x1462: 0x1ad4, 0x1463: 0x1ad8,
+	0x1464: 0x1adc, 0x1465: 0x1ae0, 0x1466: 0x1ae4, 0x1467: 0x1ae8, 0x1468: 0x1aec, 0x1469: 0x1af0,
+	0x146a: 0x271e, 0x146b: 0x0047, 0x146c: 0x0065, 0x146d: 0x193c, 0x146e: 0x19b1,
+	0x1470: 0x0043, 0x1471: 0x0045, 0x1472: 0x0047, 0x1473: 0x0049, 0x1474: 0x004b, 0x1475: 0x004d,
+	0x1476: 0x004f, 0x1477: 0x0051, 0x1478: 0x0053, 0x1479: 0x0055, 0x147a: 0x0057, 0x147b: 0x0059,
+	0x147c: 0x005b, 0x147d: 0x005d, 0x147e: 0x005f, 0x147f: 0x0061,
+	// Block 0x52, offset 0x1480
+	0x1480: 0x26ad, 0x1481: 0x26c2, 0x1482: 0x0503,
+	0x1490: 0x0c0f, 0x1491: 0x0a47,
+	0x1492: 0x08d3, 0x1493: 0x45c4, 0x1494: 0x071b, 0x1495: 0x09ef, 0x1496: 0x132f, 0x1497: 0x09ff,
+	0x1498: 0x0727, 0x1499: 0x0cd7, 0x149a: 0x0eaf, 0x149b: 0x0caf, 0x149c: 0x0827, 0x149d: 0x0b6b,
+	0x149e: 0x07bf, 0x149f: 0x0cb7, 0x14a0: 0x0813, 0x14a1: 0x1117, 0x14a2: 0x0f83, 0x14a3: 0x138b,
+	0x14a4: 0x09d3, 0x14a5: 0x090b, 0x14a6: 0x0e63, 0x14a7: 0x0c1b, 0x14a8: 0x0c47, 0x14a9: 0x06bf,
+	0x14aa: 0x06cb, 0x14ab: 0x140b, 0x14ac: 0x0adb, 0x14ad: 0x06e7, 0x14ae: 0x08ef, 0x14af: 0x0c3b,
+	0x14b0: 0x13b3, 0x14b1: 0x0c13, 0x14b2: 0x106f, 0x14b3: 0x10ab, 0x14b4: 0x08f7, 0x14b5: 0x0e43,
+	0x14b6: 0x0d0b, 0x14b7: 0x0d07, 0x14b8: 0x0f97, 0x14b9: 0x082b, 0x14ba: 0x0957, 0x14bb: 0x1443,
+	// Block 0x53, offset 0x14c0
+	0x14c0: 0x06fb, 0x14c1: 0x06f3, 0x14c2: 0x0703, 0x14c3: 0x1647, 0x14c4: 0x0747, 0x14c5: 0x0757,
+	0x14c6: 0x075b, 0x14c7: 0x0763, 0x14c8: 0x076b, 0x14c9: 0x076f, 0x14ca: 0x077b, 0x14cb: 0x0773,
+	0x14cc: 0x05b3, 0x14cd: 0x165b, 0x14ce: 0x078f, 0x14cf: 0x0793, 0x14d0: 0x0797, 0x14d1: 0x07b3,
+	0x14d2: 0x164c, 0x14d3: 0x05b7, 0x14d4: 0x079f, 0x14d5: 0x07bf, 0x14d6: 0x1656, 0x14d7: 0x07cf,
+	0x14d8: 0x07d7, 0x14d9: 0x0737, 0x14da: 0x07df, 0x14db: 0x07e3, 0x14dc: 0x1831, 0x14dd: 0x07ff,
+	0x14de: 0x0807, 0x14df: 0x05bf, 0x14e0: 0x081f, 0x14e1: 0x0823, 0x14e2: 0x082b, 0x14e3: 0x082f,
+	0x14e4: 0x05c3, 0x14e5: 0x0847, 0x14e6: 0x084b, 0x14e7: 0x0857, 0x14e8: 0x0863, 0x14e9: 0x0867,
+	0x14ea: 0x086b, 0x14eb: 0x0873, 0x14ec: 0x0893, 0x14ed: 0x0897, 0x14ee: 0x089f, 0x14ef: 0x08af,
+	0x14f0: 0x08b7, 0x14f1: 0x08bb, 0x14f2: 0x08bb, 0x14f3: 0x08bb, 0x14f4: 0x166a, 0x14f5: 0x0e93,
+	0x14f6: 0x08cf, 0x14f7: 0x08d7, 0x14f8: 0x166f, 0x14f9: 0x08e3, 0x14fa: 0x08eb, 0x14fb: 0x08f3,
+	0x14fc: 0x091b, 0x14fd: 0x0907, 0x14fe: 0x0913, 0x14ff: 0x0917,
+	// Block 0x54, offset 0x1500
+	0x1500: 0x091f, 0x1501: 0x0927, 0x1502: 0x092b, 0x1503: 0x0933, 0x1504: 0x093b, 0x1505: 0x093f,
+	0x1506: 0x093f, 0x1507: 0x0947, 0x1508: 0x094f, 0x1509: 0x0953, 0x150a: 0x095f, 0x150b: 0x0983,
+	0x150c: 0x0967, 0x150d: 0x0987, 0x150e: 0x096b, 0x150f: 0x0973, 0x1510: 0x080b, 0x1511: 0x09cf,
+	0x1512: 0x0997, 0x1513: 0x099b, 0x1514: 0x099f, 0x1515: 0x0993, 0x1516: 0x09a7, 0x1517: 0x09a3,
+	0x1518: 0x09bb, 0x1519: 0x1674, 0x151a: 0x09d7, 0x151b: 0x09db, 0x151c: 0x09e3, 0x151d: 0x09ef,
+	0x151e: 0x09f7, 0x151f: 0x0a13, 0x1520: 0x1679, 0x1521: 0x167e, 0x1522: 0x0a1f, 0x1523: 0x0a23,
+	0x1524: 0x0a27, 0x1525: 0x0a1b, 0x1526: 0x0a2f, 0x1527: 0x05c7, 0x1528: 0x05cb, 0x1529: 0x0a37,
+	0x152a: 0x0a3f, 0x152b: 0x0a3f, 0x152c: 0x1683, 0x152d: 0x0a5b, 0x152e: 0x0a5f, 0x152f: 0x0a63,
+	0x1530: 0x0a6b, 0x1531: 0x1688, 0x1532: 0x0a73, 0x1533: 0x0a77, 0x1534: 0x0b4f, 0x1535: 0x0a7f,
+	0x1536: 0x05cf, 0x1537: 0x0a8b, 0x1538: 0x0a9b, 0x1539: 0x0aa7, 0x153a: 0x0aa3, 0x153b: 0x1692,
+	0x153c: 0x0aaf, 0x153d: 0x1697, 0x153e: 0x0abb, 0x153f: 0x0ab7,
+	// Block 0x55, offset 0x1540
+	0x1540: 0x0abf, 0x1541: 0x0acf, 0x1542: 0x0ad3, 0x1543: 0x05d3, 0x1544: 0x0ae3, 0x1545: 0x0aeb,
+	0x1546: 0x0aef, 0x1547: 0x0af3, 0x1548: 0x05d7, 0x1549: 0x169c, 0x154a: 0x05db, 0x154b: 0x0b0f,
+	0x154c: 0x0b13, 0x154d: 0x0b17, 0x154e: 0x0b1f, 0x154f: 0x1863, 0x1550: 0x0b37, 0x1551: 0x16a6,
+	0x1552: 0x16a6, 0x1553: 0x11d7, 0x1554: 0x0b47, 0x1555: 0x0b47, 0x1556: 0x05df, 0x1557: 0x16c9,
+	0x1558: 0x179b, 0x1559: 0x0b57, 0x155a: 0x0b5f, 0x155b: 0x05e3, 0x155c: 0x0b73, 0x155d: 0x0b83,
+	0x155e: 0x0b87, 0x155f: 0x0b8f, 0x1560: 0x0b9f, 0x1561: 0x05eb, 0x1562: 0x05e7, 0x1563: 0x0ba3,
+	0x1564: 0x16ab, 0x1565: 0x0ba7, 0x1566: 0x0bbb, 0x1567: 0x0bbf, 0x1568: 0x0bc3, 0x1569: 0x0bbf,
+	0x156a: 0x0bcf, 0x156b: 0x0bd3, 0x156c: 0x0be3, 0x156d: 0x0bdb, 0x156e: 0x0bdf, 0x156f: 0x0be7,
+	0x1570: 0x0beb, 0x1571: 0x0bef, 0x1572: 0x0bfb, 0x1573: 0x0bff, 0x1574: 0x0c17, 0x1575: 0x0c1f,
+	0x1576: 0x0c2f, 0x1577: 0x0c43, 0x1578: 0x16ba, 0x1579: 0x0c3f, 0x157a: 0x0c33, 0x157b: 0x0c4b,
+	0x157c: 0x0c53, 0x157d: 0x0c67, 0x157e: 0x16bf, 0x157f: 0x0c6f,
+	// Block 0x56, offset 0x1580
+	0x1580: 0x0c63, 0x1581: 0x0c5b, 0x1582: 0x05ef, 0x1583: 0x0c77, 0x1584: 0x0c7f, 0x1585: 0x0c87,
+	0x1586: 0x0c7b, 0x1587: 0x05f3, 0x1588: 0x0c97, 0x1589: 0x0c9f, 0x158a: 0x16c4, 0x158b: 0x0ccb,
+	0x158c: 0x0cff, 0x158d: 0x0cdb, 0x158e: 0x05ff, 0x158f: 0x0ce7, 0x1590: 0x05fb, 0x1591: 0x05f7,
+	0x1592: 0x07c3, 0x1593: 0x07c7, 0x1594: 0x0d03, 0x1595: 0x0ceb, 0x1596: 0x11ab, 0x1597: 0x0663,
+	0x1598: 0x0d0f, 0x1599: 0x0d13, 0x159a: 0x0d17, 0x159b: 0x0d2b, 0x159c: 0x0d23, 0x159d: 0x16dd,
+	0x159e: 0x0603, 0x159f: 0x0d3f, 0x15a0: 0x0d33, 0x15a1: 0x0d4f, 0x15a2: 0x0d57, 0x15a3: 0x16e7,
+	0x15a4: 0x0d5b, 0x15a5: 0x0d47, 0x15a6: 0x0d63, 0x15a7: 0x0607, 0x15a8: 0x0d67, 0x15a9: 0x0d6b,
+	0x15aa: 0x0d6f, 0x15ab: 0x0d7b, 0x15ac: 0x16ec, 0x15ad: 0x0d83, 0x15ae: 0x060b, 0x15af: 0x0d8f,
+	0x15b0: 0x16f1, 0x15b1: 0x0d93, 0x15b2: 0x060f, 0x15b3: 0x0d9f, 0x15b4: 0x0dab, 0x15b5: 0x0db7,
+	0x15b6: 0x0dbb, 0x15b7: 0x16f6, 0x15b8: 0x168d, 0x15b9: 0x16fb, 0x15ba: 0x0ddb, 0x15bb: 0x1700,
+	0x15bc: 0x0de7, 0x15bd: 0x0def, 0x15be: 0x0ddf, 0x15bf: 0x0dfb,
+	// Block 0x57, offset 0x15c0
+	0x15c0: 0x0e0b, 0x15c1: 0x0e1b, 0x15c2: 0x0e0f, 0x15c3: 0x0e13, 0x15c4: 0x0e1f, 0x15c5: 0x0e23,
+	0x15c6: 0x1705, 0x15c7: 0x0e07, 0x15c8: 0x0e3b, 0x15c9: 0x0e3f, 0x15ca: 0x0613, 0x15cb: 0x0e53,
+	0x15cc: 0x0e4f, 0x15cd: 0x170a, 0x15ce: 0x0e33, 0x15cf: 0x0e6f, 0x15d0: 0x170f, 0x15d1: 0x1714,
+	0x15d2: 0x0e73, 0x15d3: 0x0e87, 0x15d4: 0x0e83, 0x15d5: 0x0e7f, 0x15d6: 0x0617, 0x15d7: 0x0e8b,
+	0x15d8: 0x0e9b, 0x15d9: 0x0e97, 0x15da: 0x0ea3, 0x15db: 0x1651, 0x15dc: 0x0eb3, 0x15dd: 0x1719,
+	0x15de: 0x0ebf, 0x15df: 0x1723, 0x15e0: 0x0ed3, 0x15e1: 0x0edf, 0x15e2: 0x0ef3, 0x15e3: 0x1728,
+	0x15e4: 0x0f07, 0x15e5: 0x0f0b, 0x15e6: 0x172d, 0x15e7: 0x1732, 0x15e8: 0x0f27, 0x15e9: 0x0f37,
+	0x15ea: 0x061b, 0x15eb: 0x0f3b, 0x15ec: 0x061f, 0x15ed: 0x061f, 0x15ee: 0x0f53, 0x15ef: 0x0f57,
+	0x15f0: 0x0f5f, 0x15f1: 0x0f63, 0x15f2: 0x0f6f, 0x15f3: 0x0623, 0x15f4: 0x0f87, 0x15f5: 0x1737,
+	0x15f6: 0x0fa3, 0x15f7: 0x173c, 0x15f8: 0x0faf, 0x15f9: 0x16a1, 0x15fa: 0x0fbf, 0x15fb: 0x1741,
+	0x15fc: 0x1746, 0x15fd: 0x174b, 0x15fe: 0x0627, 0x15ff: 0x062b,
+	// Block 0x58, offset 0x1600
+	0x1600: 0x0ff7, 0x1601: 0x1755, 0x1602: 0x1750, 0x1603: 0x175a, 0x1604: 0x175f, 0x1605: 0x0fff,
+	0x1606: 0x1003, 0x1607: 0x1003, 0x1608: 0x100b, 0x1609: 0x0633, 0x160a: 0x100f, 0x160b: 0x0637,
+	0x160c: 0x063b, 0x160d: 0x1769, 0x160e: 0x1023, 0x160f: 0x102b, 0x1610: 0x1037, 0x1611: 0x063f,
+	0x1612: 0x176e, 0x1613: 0x105b, 0x1614: 0x1773, 0x1615: 0x1778, 0x1616: 0x107b, 0x1617: 0x1093,
+	0x1618: 0x0643, 0x1619: 0x109b, 0x161a: 0x109f, 0x161b: 0x10a3, 0x161c: 0x177d, 0x161d: 0x1782,
+	0x161e: 0x1782, 0x161f: 0x10bb, 0x1620: 0x0647, 0x1621: 0x1787, 0x1622: 0x10cf, 0x1623: 0x10d3,
+	0x1624: 0x064b, 0x1625: 0x178c, 0x1626: 0x10ef, 0x1627: 0x064f, 0x1628: 0x10ff, 0x1629: 0x10f7,
+	0x162a: 0x1107, 0x162b: 0x1796, 0x162c: 0x111f, 0x162d: 0x0653, 0x162e: 0x112b, 0x162f: 0x1133,
+	0x1630: 0x1143, 0x1631: 0x0657, 0x1632: 0x17a0, 0x1633: 0x17a5, 0x1634: 0x065b, 0x1635: 0x17aa,
+	0x1636: 0x115b, 0x1637: 0x17af, 0x1638: 0x1167, 0x1639: 0x1173, 0x163a: 0x117b, 0x163b: 0x17b4,
+	0x163c: 0x17b9, 0x163d: 0x118f, 0x163e: 0x17be, 0x163f: 0x1197,
+	// Block 0x59, offset 0x1640
+	0x1640: 0x16ce, 0x1641: 0x065f, 0x1642: 0x11af, 0x1643: 0x11b3, 0x1644: 0x0667, 0x1645: 0x11b7,
+	0x1646: 0x0a33, 0x1647: 0x17c3, 0x1648: 0x17c8, 0x1649: 0x16d3, 0x164a: 0x16d8, 0x164b: 0x11d7,
+	0x164c: 0x11db, 0x164d: 0x13f3, 0x164e: 0x066b, 0x164f: 0x1207, 0x1650: 0x1203, 0x1651: 0x120b,
+	0x1652: 0x083f, 0x1653: 0x120f, 0x1654: 0x1213, 0x1655: 0x1217, 0x1656: 0x121f, 0x1657: 0x17cd,
+	0x1658: 0x121b, 0x1659: 0x1223, 0x165a: 0x1237, 0x165b: 0x123b, 0x165c: 0x1227, 0x165d: 0x123f,
+	0x165e: 0x1253, 0x165f: 0x1267, 0x1660: 0x1233, 0x1661: 0x1247, 0x1662: 0x124b, 0x1663: 0x124f,
+	0x1664: 0x17d2, 0x1665: 0x17dc, 0x1666: 0x17d7, 0x1667: 0x066f, 0x1668: 0x126f, 0x1669: 0x1273,
+	0x166a: 0x127b, 0x166b: 0x17f0, 0x166c: 0x127f, 0x166d: 0x17e1, 0x166e: 0x0673, 0x166f: 0x0677,
+	0x1670: 0x17e6, 0x1671: 0x17eb, 0x1672: 0x067b, 0x1673: 0x129f, 0x1674: 0x12a3, 0x1675: 0x12a7,
+	0x1676: 0x12ab, 0x1677: 0x12b7, 0x1678: 0x12b3, 0x1679: 0x12bf, 0x167a: 0x12bb, 0x167b: 0x12cb,
+	0x167c: 0x12c3, 0x167d: 0x12c7, 0x167e: 0x12cf, 0x167f: 0x067f,
+	// Block 0x5a, offset 0x1680
+	0x1680: 0x12d7, 0x1681: 0x12db, 0x1682: 0x0683, 0x1683: 0x12eb, 0x1684: 0x12ef, 0x1685: 0x17f5,
+	0x1686: 0x12fb, 0x1687: 0x12ff, 0x1688: 0x0687, 0x1689: 0x130b, 0x168a: 0x05bb, 0x168b: 0x17fa,
+	0x168c: 0x17ff, 0x168d: 0x068b, 0x168e: 0x068f, 0x168f: 0x1337, 0x1690: 0x134f, 0x1691: 0x136b,
+	0x1692: 0x137b, 0x1693: 0x1804, 0x1694: 0x138f, 0x1695: 0x1393, 0x1696: 0x13ab, 0x1697: 0x13b7,
+	0x1698: 0x180e, 0x1699: 0x1660, 0x169a: 0x13c3, 0x169b: 0x13bf, 0x169c: 0x13cb, 0x169d: 0x1665,
+	0x169e: 0x13d7, 0x169f: 0x13e3, 0x16a0: 0x1813, 0x16a1: 0x1818, 0x16a2: 0x1423, 0x16a3: 0x142f,
+	0x16a4: 0x1437, 0x16a5: 0x181d, 0x16a6: 0x143b, 0x16a7: 0x1467, 0x16a8: 0x1473, 0x16a9: 0x1477,
+	0x16aa: 0x146f, 0x16ab: 0x1483, 0x16ac: 0x1487, 0x16ad: 0x1822, 0x16ae: 0x1493, 0x16af: 0x0693,
+	0x16b0: 0x149b, 0x16b1: 0x1827, 0x16b2: 0x0697, 0x16b3: 0x14d3, 0x16b4: 0x0ac3, 0x16b5: 0x14eb,
+	0x16b6: 0x182c, 0x16b7: 0x1836, 0x16b8: 0x069b, 0x16b9: 0x069f, 0x16ba: 0x1513, 0x16bb: 0x183b,
+	0x16bc: 0x06a3, 0x16bd: 0x1840, 0x16be: 0x152b, 0x16bf: 0x152b,
+	// Block 0x5b, offset 0x16c0
+	0x16c0: 0x1533, 0x16c1: 0x1845, 0x16c2: 0x154b, 0x16c3: 0x06a7, 0x16c4: 0x155b, 0x16c5: 0x1567,
+	0x16c6: 0x156f, 0x16c7: 0x1577, 0x16c8: 0x06ab, 0x16c9: 0x184a, 0x16ca: 0x158b, 0x16cb: 0x15a7,
+	0x16cc: 0x15b3, 0x16cd: 0x06af, 0x16ce: 0x06b3, 0x16cf: 0x15b7, 0x16d0: 0x184f, 0x16d1: 0x06b7,
+	0x16d2: 0x1854, 0x16d3: 0x1859, 0x16d4: 0x185e, 0x16d5: 0x15db, 0x16d6: 0x06bb, 0x16d7: 0x15ef,
+	0x16d8: 0x15f7, 0x16d9: 0x15fb, 0x16da: 0x1603, 0x16db: 0x160b, 0x16dc: 0x1613, 0x16dd: 0x1868,
+}
+
+// nfkcIndex: 22 blocks, 1408 entries, 1408 bytes
+// Block 0 is the zero block.
+var nfkcIndex = [1408]uint8{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x5a, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x5b, 0xc7: 0x04,
+	0xc8: 0x05, 0xca: 0x5c, 0xcb: 0x5d, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x09,
+	0xd0: 0x0a, 0xd1: 0x5e, 0xd2: 0x5f, 0xd3: 0x0b, 0xd6: 0x0c, 0xd7: 0x60,
+	0xd8: 0x61, 0xd9: 0x0d, 0xdb: 0x62, 0xdc: 0x63, 0xdd: 0x64, 0xdf: 0x65,
+	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
+	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
+	0xf0: 0x13,
+	// Block 0x4, offset 0x100
+	0x120: 0x66, 0x121: 0x67, 0x123: 0x68, 0x124: 0x69, 0x125: 0x6a, 0x126: 0x6b, 0x127: 0x6c,
+	0x128: 0x6d, 0x129: 0x6e, 0x12a: 0x6f, 0x12b: 0x70, 0x12c: 0x6b, 0x12d: 0x71, 0x12e: 0x72, 0x12f: 0x73,
+	0x131: 0x74, 0x132: 0x75, 0x133: 0x76, 0x134: 0x77, 0x135: 0x78, 0x137: 0x79,
+	0x138: 0x7a, 0x139: 0x7b, 0x13a: 0x7c, 0x13b: 0x7d, 0x13c: 0x7e, 0x13d: 0x7f, 0x13e: 0x80, 0x13f: 0x81,
+	// Block 0x5, offset 0x140
+	0x140: 0x82, 0x142: 0x83, 0x143: 0x84, 0x144: 0x85, 0x145: 0x86, 0x146: 0x87, 0x147: 0x88,
+	0x14d: 0x89,
+	0x15c: 0x8a, 0x15f: 0x8b,
+	0x162: 0x8c, 0x164: 0x8d,
+	0x168: 0x8e, 0x169: 0x8f, 0x16a: 0x90, 0x16c: 0x0e, 0x16d: 0x91, 0x16e: 0x92, 0x16f: 0x93,
+	0x170: 0x94, 0x173: 0x95, 0x174: 0x96, 0x175: 0x0f, 0x176: 0x10, 0x177: 0x97,
+	0x178: 0x11, 0x179: 0x12, 0x17a: 0x13, 0x17b: 0x14, 0x17c: 0x15, 0x17d: 0x16, 0x17e: 0x17, 0x17f: 0x18,
+	// Block 0x6, offset 0x180
+	0x180: 0x98, 0x181: 0x99, 0x182: 0x9a, 0x183: 0x9b, 0x184: 0x19, 0x185: 0x1a, 0x186: 0x9c, 0x187: 0x9d,
+	0x188: 0x9e, 0x189: 0x1b, 0x18a: 0x1c, 0x18b: 0x9f, 0x18c: 0xa0,
+	0x191: 0x1d, 0x192: 0x1e, 0x193: 0xa1,
+	0x1a8: 0xa2, 0x1a9: 0xa3, 0x1ab: 0xa4,
+	0x1b1: 0xa5, 0x1b3: 0xa6, 0x1b5: 0xa7, 0x1b7: 0xa8,
+	0x1ba: 0xa9, 0x1bb: 0xaa, 0x1bc: 0x1f, 0x1bd: 0x20, 0x1be: 0x21, 0x1bf: 0xab,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0xac, 0x1c1: 0x22, 0x1c2: 0x23, 0x1c3: 0x24, 0x1c4: 0xad, 0x1c5: 0x25, 0x1c6: 0x26,
+	0x1c8: 0x27, 0x1c9: 0x28, 0x1ca: 0x29, 0x1cb: 0x2a, 0x1cc: 0x2b, 0x1cd: 0x2c, 0x1ce: 0x2d, 0x1cf: 0x2e,
+	// Block 0x8, offset 0x200
+	0x219: 0xae, 0x21a: 0xaf, 0x21b: 0xb0, 0x21d: 0xb1, 0x21f: 0xb2,
+	0x220: 0xb3, 0x223: 0xb4, 0x224: 0xb5, 0x225: 0xb6, 0x226: 0xb7, 0x227: 0xb8,
+	0x22a: 0xb9, 0x22b: 0xba, 0x22d: 0xbb, 0x22f: 0xbc,
+	0x230: 0xbd, 0x231: 0xbe, 0x232: 0xbf, 0x233: 0xc0, 0x234: 0xc1, 0x235: 0xc2, 0x236: 0xc3, 0x237: 0xbd,
+	0x238: 0xbe, 0x239: 0xbf, 0x23a: 0xc0, 0x23b: 0xc1, 0x23c: 0xc2, 0x23d: 0xc3, 0x23e: 0xbd, 0x23f: 0xbe,
+	// Block 0x9, offset 0x240
+	0x240: 0xbf, 0x241: 0xc0, 0x242: 0xc1, 0x243: 0xc2, 0x244: 0xc3, 0x245: 0xbd, 0x246: 0xbe, 0x247: 0xbf,
+	0x248: 0xc0, 0x249: 0xc1, 0x24a: 0xc2, 0x24b: 0xc3, 0x24c: 0xbd, 0x24d: 0xbe, 0x24e: 0xbf, 0x24f: 0xc0,
+	0x250: 0xc1, 0x251: 0xc2, 0x252: 0xc3, 0x253: 0xbd, 0x254: 0xbe, 0x255: 0xbf, 0x256: 0xc0, 0x257: 0xc1,
+	0x258: 0xc2, 0x259: 0xc3, 0x25a: 0xbd, 0x25b: 0xbe, 0x25c: 0xbf, 0x25d: 0xc0, 0x25e: 0xc1, 0x25f: 0xc2,
+	0x260: 0xc3, 0x261: 0xbd, 0x262: 0xbe, 0x263: 0xbf, 0x264: 0xc0, 0x265: 0xc1, 0x266: 0xc2, 0x267: 0xc3,
+	0x268: 0xbd, 0x269: 0xbe, 0x26a: 0xbf, 0x26b: 0xc0, 0x26c: 0xc1, 0x26d: 0xc2, 0x26e: 0xc3, 0x26f: 0xbd,
+	0x270: 0xbe, 0x271: 0xbf, 0x272: 0xc0, 0x273: 0xc1, 0x274: 0xc2, 0x275: 0xc3, 0x276: 0xbd, 0x277: 0xbe,
+	0x278: 0xbf, 0x279: 0xc0, 0x27a: 0xc1, 0x27b: 0xc2, 0x27c: 0xc3, 0x27d: 0xbd, 0x27e: 0xbe, 0x27f: 0xbf,
+	// Block 0xa, offset 0x280
+	0x280: 0xc0, 0x281: 0xc1, 0x282: 0xc2, 0x283: 0xc3, 0x284: 0xbd, 0x285: 0xbe, 0x286: 0xbf, 0x287: 0xc0,
+	0x288: 0xc1, 0x289: 0xc2, 0x28a: 0xc3, 0x28b: 0xbd, 0x28c: 0xbe, 0x28d: 0xbf, 0x28e: 0xc0, 0x28f: 0xc1,
+	0x290: 0xc2, 0x291: 0xc3, 0x292: 0xbd, 0x293: 0xbe, 0x294: 0xbf, 0x295: 0xc0, 0x296: 0xc1, 0x297: 0xc2,
+	0x298: 0xc3, 0x299: 0xbd, 0x29a: 0xbe, 0x29b: 0xbf, 0x29c: 0xc0, 0x29d: 0xc1, 0x29e: 0xc2, 0x29f: 0xc3,
+	0x2a0: 0xbd, 0x2a1: 0xbe, 0x2a2: 0xbf, 0x2a3: 0xc0, 0x2a4: 0xc1, 0x2a5: 0xc2, 0x2a6: 0xc3, 0x2a7: 0xbd,
+	0x2a8: 0xbe, 0x2a9: 0xbf, 0x2aa: 0xc0, 0x2ab: 0xc1, 0x2ac: 0xc2, 0x2ad: 0xc3, 0x2ae: 0xbd, 0x2af: 0xbe,
+	0x2b0: 0xbf, 0x2b1: 0xc0, 0x2b2: 0xc1, 0x2b3: 0xc2, 0x2b4: 0xc3, 0x2b5: 0xbd, 0x2b6: 0xbe, 0x2b7: 0xbf,
+	0x2b8: 0xc0, 0x2b9: 0xc1, 0x2ba: 0xc2, 0x2bb: 0xc3, 0x2bc: 0xbd, 0x2bd: 0xbe, 0x2be: 0xbf, 0x2bf: 0xc0,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0xc1, 0x2c1: 0xc2, 0x2c2: 0xc3, 0x2c3: 0xbd, 0x2c4: 0xbe, 0x2c5: 0xbf, 0x2c6: 0xc0, 0x2c7: 0xc1,
+	0x2c8: 0xc2, 0x2c9: 0xc3, 0x2ca: 0xbd, 0x2cb: 0xbe, 0x2cc: 0xbf, 0x2cd: 0xc0, 0x2ce: 0xc1, 0x2cf: 0xc2,
+	0x2d0: 0xc3, 0x2d1: 0xbd, 0x2d2: 0xbe, 0x2d3: 0xbf, 0x2d4: 0xc0, 0x2d5: 0xc1, 0x2d6: 0xc2, 0x2d7: 0xc3,
+	0x2d8: 0xbd, 0x2d9: 0xbe, 0x2da: 0xbf, 0x2db: 0xc0, 0x2dc: 0xc1, 0x2dd: 0xc2, 0x2de: 0xc4,
+	// Block 0xc, offset 0x300
+	0x324: 0x2f, 0x325: 0x30, 0x326: 0x31, 0x327: 0x32,
+	0x328: 0x33, 0x329: 0x34, 0x32a: 0x35, 0x32b: 0x36, 0x32c: 0x37, 0x32d: 0x38, 0x32e: 0x39, 0x32f: 0x3a,
+	0x330: 0x3b, 0x331: 0x3c, 0x332: 0x3d, 0x333: 0x3e, 0x334: 0x3f, 0x335: 0x40, 0x336: 0x41, 0x337: 0x42,
+	0x338: 0x43, 0x339: 0x44, 0x33a: 0x45, 0x33b: 0x46, 0x33c: 0xc5, 0x33d: 0x47, 0x33e: 0x48, 0x33f: 0x49,
+	// Block 0xd, offset 0x340
+	0x347: 0xc6,
+	0x34b: 0xc7, 0x34d: 0xc8,
+	0x368: 0xc9, 0x36b: 0xca,
+	// Block 0xe, offset 0x380
+	0x381: 0xcb, 0x382: 0xcc, 0x384: 0xcd, 0x385: 0xb7, 0x387: 0xce,
+	0x388: 0xcf, 0x38b: 0xd0, 0x38c: 0x6b, 0x38d: 0xd1,
+	0x391: 0xd2, 0x392: 0xd3, 0x393: 0xd4, 0x396: 0xd5, 0x397: 0xd6,
+	0x398: 0xd7, 0x39a: 0xd8, 0x39c: 0xd9,
+	0x3b0: 0xd7,
+	// Block 0xf, offset 0x3c0
+	0x3eb: 0xda, 0x3ec: 0xdb,
+	// Block 0x10, offset 0x400
+	0x432: 0xdc,
+	// Block 0x11, offset 0x440
+	0x445: 0xdd, 0x446: 0xde, 0x447: 0xdf,
+	0x449: 0xe0,
+	0x450: 0xe1, 0x451: 0xe2, 0x452: 0xe3, 0x453: 0xe4, 0x454: 0xe5, 0x455: 0xe6, 0x456: 0xe7, 0x457: 0xe8,
+	0x458: 0xe9, 0x459: 0xea, 0x45a: 0x4a, 0x45b: 0xeb, 0x45c: 0xec, 0x45d: 0xed, 0x45e: 0xee, 0x45f: 0x4b,
+	// Block 0x12, offset 0x480
+	0x480: 0xef,
+	0x4a3: 0xf0, 0x4a5: 0xf1,
+	0x4b8: 0x4c, 0x4b9: 0x4d, 0x4ba: 0x4e,
+	// Block 0x13, offset 0x4c0
+	0x4c4: 0x4f, 0x4c5: 0xf2, 0x4c6: 0xf3,
+	0x4c8: 0x50, 0x4c9: 0xf4,
+	// Block 0x14, offset 0x500
+	0x520: 0x51, 0x521: 0x52, 0x522: 0x53, 0x523: 0x54, 0x524: 0x55, 0x525: 0x56, 0x526: 0x57, 0x527: 0x58,
+	0x528: 0x59,
+	// Block 0x15, offset 0x540
+	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
+	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
+	0x56f: 0x12,
+}
+
+// nfkcSparseOffset: 155 entries, 310 bytes
+var nfkcSparseOffset = []uint16{0x0, 0xe, 0x12, 0x1b, 0x25, 0x35, 0x37, 0x3c, 0x47, 0x56, 0x63, 0x6b, 0x6f, 0x74, 0x76, 0x87, 0x8f, 0x96, 0x99, 0xa0, 0xa4, 0xa8, 0xaa, 0xac, 0xb5, 0xb9, 0xc0, 0xc5, 0xc8, 0xd2, 0xd4, 0xdb, 0xe3, 0xe7, 0xe9, 0xec, 0xf0, 0xf6, 0x107, 0x113, 0x115, 0x11b, 0x11d, 0x11f, 0x121, 0x123, 0x125, 0x127, 0x129, 0x12c, 0x12f, 0x131, 0x134, 0x137, 0x13b, 0x140, 0x149, 0x14b, 0x14e, 0x150, 0x15b, 0x166, 0x176, 0x184, 0x192, 0x1a2, 0x1b0, 0x1b7, 0x1bd, 0x1cc, 0x1d0, 0x1d2, 0x1d6, 0x1d8, 0x1db, 0x1dd, 0x1e0, 0x1e2, 0x1e5, 0x1e7, 0x1e9, 0x1eb, 0x1f7, 0x201, 0x20b, 0x20e, 0x212, 0x214, 0x216, 0x218, 0x21a, 0x21d, 0x21f, 0x221, 0x223, 0x225, 0x22b, 0x22e, 0x232, 0x234, 0x23b, 0x241, 0x247, 0x24f, 0x255, 0x25b, 0x261, 0x265, 0x267, 0x269, 0x26b, 0x26d, 0x273, 0x276, 0x279, 0x281, 0x288, 0x28b, 0x28e, 0x290, 0x298, 0x29b, 0x2a2, 0x2a5, 0x2ab, 0x2ad, 0x2af, 0x2b2, 0x2b4, 0x2b6, 0x2b8, 0x2ba, 0x2c7, 0x2d1, 0x2d3, 0x2d5, 0x2d9, 0x2de, 0x2ea, 0x2ef, 0x2f8, 0x2fe, 0x303, 0x307, 0x30c, 0x310, 0x320, 0x32e, 0x33c, 0x34a, 0x350, 0x352, 0x355, 0x35f, 0x361}
+
+// nfkcSparseValues: 875 entries, 3500 bytes
+var nfkcSparseValues = [875]valueRange{
+	// Block 0x0, offset 0x0
+	{value: 0x0002, lo: 0x0d},
+	{value: 0x0001, lo: 0xa0, hi: 0xa0},
+	{value: 0x4278, lo: 0xa8, hi: 0xa8},
+	{value: 0x0083, lo: 0xaa, hi: 0xaa},
+	{value: 0x4264, lo: 0xaf, hi: 0xaf},
+	{value: 0x0025, lo: 0xb2, hi: 0xb3},
+	{value: 0x425a, lo: 0xb4, hi: 0xb4},
+	{value: 0x01dc, lo: 0xb5, hi: 0xb5},
+	{value: 0x4291, lo: 0xb8, hi: 0xb8},
+	{value: 0x0023, lo: 0xb9, hi: 0xb9},
+	{value: 0x009f, lo: 0xba, hi: 0xba},
+	{value: 0x221c, lo: 0xbc, hi: 0xbc},
+	{value: 0x2210, lo: 0xbd, hi: 0xbd},
+	{value: 0x22b2, lo: 0xbe, hi: 0xbe},
+	// Block 0x1, offset 0xe
+	{value: 0x0091, lo: 0x03},
+	{value: 0x46e2, lo: 0xa0, hi: 0xa1},
+	{value: 0x4714, lo: 0xaf, hi: 0xb0},
+	{value: 0xa000, lo: 0xb7, hi: 0xb7},
+	// Block 0x2, offset 0x12
+	{value: 0x0003, lo: 0x08},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x0091, lo: 0xb0, hi: 0xb0},
+	{value: 0x0119, lo: 0xb1, hi: 0xb1},
+	{value: 0x0095, lo: 0xb2, hi: 0xb2},
+	{value: 0x00a5, lo: 0xb3, hi: 0xb3},
+	{value: 0x0143, lo: 0xb4, hi: 0xb6},
+	{value: 0x00af, lo: 0xb7, hi: 0xb7},
+	{value: 0x00b3, lo: 0xb8, hi: 0xb8},
+	// Block 0x3, offset 0x1b
+	{value: 0x000a, lo: 0x09},
+	{value: 0x426e, lo: 0x98, hi: 0x98},
+	{value: 0x4273, lo: 0x99, hi: 0x9a},
+	{value: 0x4296, lo: 0x9b, hi: 0x9b},
+	{value: 0x425f, lo: 0x9c, hi: 0x9c},
+	{value: 0x4282, lo: 0x9d, hi: 0x9d},
+	{value: 0x0113, lo: 0xa0, hi: 0xa0},
+	{value: 0x0099, lo: 0xa1, hi: 0xa1},
+	{value: 0x00a7, lo: 0xa2, hi: 0xa3},
+	{value: 0x0167, lo: 0xa4, hi: 0xa4},
+	// Block 0x4, offset 0x25
+	{value: 0x0000, lo: 0x0f},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0xa000, lo: 0x8d, hi: 0x8d},
+	{value: 0x37a5, lo: 0x90, hi: 0x90},
+	{value: 0x37b1, lo: 0x91, hi: 0x91},
+	{value: 0x379f, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x96, hi: 0x96},
+	{value: 0x3817, lo: 0x97, hi: 0x97},
+	{value: 0x37e1, lo: 0x9c, hi: 0x9c},
+	{value: 0x37c9, lo: 0x9d, hi: 0x9d},
+	{value: 0x37f3, lo: 0x9e, hi: 0x9e},
+	{value: 0xa000, lo: 0xb4, hi: 0xb5},
+	{value: 0x381d, lo: 0xb6, hi: 0xb6},
+	{value: 0x3823, lo: 0xb7, hi: 0xb7},
+	// Block 0x5, offset 0x35
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x83, hi: 0x87},
+	// Block 0x6, offset 0x37
+	{value: 0x0001, lo: 0x04},
+	{value: 0x8113, lo: 0x81, hi: 0x82},
+	{value: 0x8132, lo: 0x84, hi: 0x84},
+	{value: 0x812d, lo: 0x85, hi: 0x85},
+	{value: 0x810d, lo: 0x87, hi: 0x87},
+	// Block 0x7, offset 0x3c
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8132, lo: 0x90, hi: 0x97},
+	{value: 0x8119, lo: 0x98, hi: 0x98},
+	{value: 0x811a, lo: 0x99, hi: 0x99},
+	{value: 0x811b, lo: 0x9a, hi: 0x9a},
+	{value: 0x3841, lo: 0xa2, hi: 0xa2},
+	{value: 0x3847, lo: 0xa3, hi: 0xa3},
+	{value: 0x3853, lo: 0xa4, hi: 0xa4},
+	{value: 0x384d, lo: 0xa5, hi: 0xa5},
+	{value: 0x3859, lo: 0xa6, hi: 0xa6},
+	{value: 0xa000, lo: 0xa7, hi: 0xa7},
+	// Block 0x8, offset 0x47
+	{value: 0x0000, lo: 0x0e},
+	{value: 0x386b, lo: 0x80, hi: 0x80},
+	{value: 0xa000, lo: 0x81, hi: 0x81},
+	{value: 0x385f, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x3865, lo: 0x93, hi: 0x93},
+	{value: 0xa000, lo: 0x95, hi: 0x95},
+	{value: 0x8132, lo: 0x96, hi: 0x9c},
+	{value: 0x8132, lo: 0x9f, hi: 0xa2},
+	{value: 0x812d, lo: 0xa3, hi: 0xa3},
+	{value: 0x8132, lo: 0xa4, hi: 0xa4},
+	{value: 0x8132, lo: 0xa7, hi: 0xa8},
+	{value: 0x812d, lo: 0xaa, hi: 0xaa},
+	{value: 0x8132, lo: 0xab, hi: 0xac},
+	{value: 0x812d, lo: 0xad, hi: 0xad},
+	// Block 0x9, offset 0x56
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x811f, lo: 0x91, hi: 0x91},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	{value: 0x812d, lo: 0xb1, hi: 0xb1},
+	{value: 0x8132, lo: 0xb2, hi: 0xb3},
+	{value: 0x812d, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb5, hi: 0xb6},
+	{value: 0x812d, lo: 0xb7, hi: 0xb9},
+	{value: 0x8132, lo: 0xba, hi: 0xba},
+	{value: 0x812d, lo: 0xbb, hi: 0xbc},
+	{value: 0x8132, lo: 0xbd, hi: 0xbd},
+	{value: 0x812d, lo: 0xbe, hi: 0xbe},
+	{value: 0x8132, lo: 0xbf, hi: 0xbf},
+	// Block 0xa, offset 0x63
+	{value: 0x0005, lo: 0x07},
+	{value: 0x8132, lo: 0x80, hi: 0x80},
+	{value: 0x8132, lo: 0x81, hi: 0x81},
+	{value: 0x812d, lo: 0x82, hi: 0x83},
+	{value: 0x812d, lo: 0x84, hi: 0x85},
+	{value: 0x812d, lo: 0x86, hi: 0x87},
+	{value: 0x812d, lo: 0x88, hi: 0x89},
+	{value: 0x8132, lo: 0x8a, hi: 0x8a},
+	// Block 0xb, offset 0x6b
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8132, lo: 0xab, hi: 0xb1},
+	{value: 0x812d, lo: 0xb2, hi: 0xb2},
+	{value: 0x8132, lo: 0xb3, hi: 0xb3},
+	// Block 0xc, offset 0x6f
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8132, lo: 0x96, hi: 0x99},
+	{value: 0x8132, lo: 0x9b, hi: 0xa3},
+	{value: 0x8132, lo: 0xa5, hi: 0xa7},
+	{value: 0x8132, lo: 0xa9, hi: 0xad},
+	// Block 0xd, offset 0x74
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x99, hi: 0x9b},
+	// Block 0xe, offset 0x76
+	{value: 0x0000, lo: 0x10},
+	{value: 0x8132, lo: 0x94, hi: 0xa1},
+	{value: 0x812d, lo: 0xa3, hi: 0xa3},
+	{value: 0x8132, lo: 0xa4, hi: 0xa5},
+	{value: 0x812d, lo: 0xa6, hi: 0xa6},
+	{value: 0x8132, lo: 0xa7, hi: 0xa8},
+	{value: 0x812d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8132, lo: 0xaa, hi: 0xac},
+	{value: 0x812d, lo: 0xad, hi: 0xaf},
+	{value: 0x8116, lo: 0xb0, hi: 0xb0},
+	{value: 0x8117, lo: 0xb1, hi: 0xb1},
+	{value: 0x8118, lo: 0xb2, hi: 0xb2},
+	{value: 0x8132, lo: 0xb3, hi: 0xb5},
+	{value: 0x812d, lo: 0xb6, hi: 0xb6},
+	{value: 0x8132, lo: 0xb7, hi: 0xb8},
+	{value: 0x812d, lo: 0xb9, hi: 0xba},
+	{value: 0x8132, lo: 0xbb, hi: 0xbf},
+	// Block 0xf, offset 0x87
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0xa8, hi: 0xa8},
+	{value: 0x3ed8, lo: 0xa9, hi: 0xa9},
+	{value: 0xa000, lo: 0xb0, hi: 0xb0},
+	{value: 0x3ee0, lo: 0xb1, hi: 0xb1},
+	{value: 0xa000, lo: 0xb3, hi: 0xb3},
+	{value: 0x3ee8, lo: 0xb4, hi: 0xb4},
+	{value: 0x9902, lo: 0xbc, hi: 0xbc},
+	// Block 0x10, offset 0x8f
+	{value: 0x0008, lo: 0x06},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x8132, lo: 0x91, hi: 0x91},
+	{value: 0x812d, lo: 0x92, hi: 0x92},
+	{value: 0x8132, lo: 0x93, hi: 0x93},
+	{value: 0x8132, lo: 0x94, hi: 0x94},
+	{value: 0x451c, lo: 0x98, hi: 0x9f},
+	// Block 0x11, offset 0x96
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x12, offset 0x99
+	{value: 0x0008, lo: 0x06},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2c9e, lo: 0x8b, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x455c, lo: 0x9c, hi: 0x9d},
+	{value: 0x456c, lo: 0x9f, hi: 0x9f},
+	// Block 0x13, offset 0xa0
+	{value: 0x0000, lo: 0x03},
+	{value: 0x4594, lo: 0xb3, hi: 0xb3},
+	{value: 0x459c, lo: 0xb6, hi: 0xb6},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	// Block 0x14, offset 0xa4
+	{value: 0x0008, lo: 0x03},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x4574, lo: 0x99, hi: 0x9b},
+	{value: 0x458c, lo: 0x9e, hi: 0x9e},
+	// Block 0x15, offset 0xa8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	// Block 0x16, offset 0xaa
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	// Block 0x17, offset 0xac
+	{value: 0x0000, lo: 0x08},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2cb6, lo: 0x88, hi: 0x88},
+	{value: 0x2cae, lo: 0x8b, hi: 0x8b},
+	{value: 0x2cbe, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x96, hi: 0x97},
+	{value: 0x45a4, lo: 0x9c, hi: 0x9c},
+	{value: 0x45ac, lo: 0x9d, hi: 0x9d},
+	// Block 0x18, offset 0xb5
+	{value: 0x0000, lo: 0x03},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0x2cc6, lo: 0x94, hi: 0x94},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x19, offset 0xb9
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2cce, lo: 0x8a, hi: 0x8a},
+	{value: 0x2cde, lo: 0x8b, hi: 0x8b},
+	{value: 0x2cd6, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x1a, offset 0xc0
+	{value: 0x1801, lo: 0x04},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x3ef0, lo: 0x88, hi: 0x88},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x8120, lo: 0x95, hi: 0x96},
+	// Block 0x1b, offset 0xc5
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xbc, hi: 0xbc},
+	{value: 0xa000, lo: 0xbf, hi: 0xbf},
+	// Block 0x1c, offset 0xc8
+	{value: 0x0000, lo: 0x09},
+	{value: 0x2ce6, lo: 0x80, hi: 0x80},
+	{value: 0x9900, lo: 0x82, hi: 0x82},
+	{value: 0xa000, lo: 0x86, hi: 0x86},
+	{value: 0x2cee, lo: 0x87, hi: 0x87},
+	{value: 0x2cf6, lo: 0x88, hi: 0x88},
+	{value: 0x2f50, lo: 0x8a, hi: 0x8a},
+	{value: 0x2dd8, lo: 0x8b, hi: 0x8b},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x95, hi: 0x96},
+	// Block 0x1d, offset 0xd2
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xbe, hi: 0xbe},
+	// Block 0x1e, offset 0xd4
+	{value: 0x0000, lo: 0x06},
+	{value: 0xa000, lo: 0x86, hi: 0x87},
+	{value: 0x2cfe, lo: 0x8a, hi: 0x8a},
+	{value: 0x2d0e, lo: 0x8b, hi: 0x8b},
+	{value: 0x2d06, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	// Block 0x1f, offset 0xdb
+	{value: 0x6bea, lo: 0x07},
+	{value: 0x9904, lo: 0x8a, hi: 0x8a},
+	{value: 0x9900, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x3ef8, lo: 0x9a, hi: 0x9a},
+	{value: 0x2f58, lo: 0x9c, hi: 0x9c},
+	{value: 0x2de3, lo: 0x9d, hi: 0x9d},
+	{value: 0x2d16, lo: 0x9e, hi: 0x9f},
+	// Block 0x20, offset 0xe3
+	{value: 0x0000, lo: 0x03},
+	{value: 0x2621, lo: 0xb3, hi: 0xb3},
+	{value: 0x8122, lo: 0xb8, hi: 0xb9},
+	{value: 0x8104, lo: 0xba, hi: 0xba},
+	// Block 0x21, offset 0xe7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8123, lo: 0x88, hi: 0x8b},
+	// Block 0x22, offset 0xe9
+	{value: 0x0000, lo: 0x02},
+	{value: 0x2636, lo: 0xb3, hi: 0xb3},
+	{value: 0x8124, lo: 0xb8, hi: 0xb9},
+	// Block 0x23, offset 0xec
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8125, lo: 0x88, hi: 0x8b},
+	{value: 0x2628, lo: 0x9c, hi: 0x9c},
+	{value: 0x262f, lo: 0x9d, hi: 0x9d},
+	// Block 0x24, offset 0xf0
+	{value: 0x0000, lo: 0x05},
+	{value: 0x030b, lo: 0x8c, hi: 0x8c},
+	{value: 0x812d, lo: 0x98, hi: 0x99},
+	{value: 0x812d, lo: 0xb5, hi: 0xb5},
+	{value: 0x812d, lo: 0xb7, hi: 0xb7},
+	{value: 0x812b, lo: 0xb9, hi: 0xb9},
+	// Block 0x25, offset 0xf6
+	{value: 0x0000, lo: 0x10},
+	{value: 0x2644, lo: 0x83, hi: 0x83},
+	{value: 0x264b, lo: 0x8d, hi: 0x8d},
+	{value: 0x2652, lo: 0x92, hi: 0x92},
+	{value: 0x2659, lo: 0x97, hi: 0x97},
+	{value: 0x2660, lo: 0x9c, hi: 0x9c},
+	{value: 0x263d, lo: 0xa9, hi: 0xa9},
+	{value: 0x8126, lo: 0xb1, hi: 0xb1},
+	{value: 0x8127, lo: 0xb2, hi: 0xb2},
+	{value: 0x4a84, lo: 0xb3, hi: 0xb3},
+	{value: 0x8128, lo: 0xb4, hi: 0xb4},
+	{value: 0x4a8d, lo: 0xb5, hi: 0xb5},
+	{value: 0x45b4, lo: 0xb6, hi: 0xb6},
+	{value: 0x45f4, lo: 0xb7, hi: 0xb7},
+	{value: 0x45bc, lo: 0xb8, hi: 0xb8},
+	{value: 0x45ff, lo: 0xb9, hi: 0xb9},
+	{value: 0x8127, lo: 0xba, hi: 0xbd},
+	// Block 0x26, offset 0x107
+	{value: 0x0000, lo: 0x0b},
+	{value: 0x8127, lo: 0x80, hi: 0x80},
+	{value: 0x4a96, lo: 0x81, hi: 0x81},
+	{value: 0x8132, lo: 0x82, hi: 0x83},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0x86, hi: 0x87},
+	{value: 0x266e, lo: 0x93, hi: 0x93},
+	{value: 0x2675, lo: 0x9d, hi: 0x9d},
+	{value: 0x267c, lo: 0xa2, hi: 0xa2},
+	{value: 0x2683, lo: 0xa7, hi: 0xa7},
+	{value: 0x268a, lo: 0xac, hi: 0xac},
+	{value: 0x2667, lo: 0xb9, hi: 0xb9},
+	// Block 0x27, offset 0x113
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x86, hi: 0x86},
+	// Block 0x28, offset 0x115
+	{value: 0x0000, lo: 0x05},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x2d1e, lo: 0xa6, hi: 0xa6},
+	{value: 0x9900, lo: 0xae, hi: 0xae},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	{value: 0x8104, lo: 0xb9, hi: 0xba},
+	// Block 0x29, offset 0x11b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x8d, hi: 0x8d},
+	// Block 0x2a, offset 0x11d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x030f, lo: 0xbc, hi: 0xbc},
+	// Block 0x2b, offset 0x11f
+	{value: 0x0000, lo: 0x01},
+	{value: 0xa000, lo: 0x80, hi: 0x92},
+	// Block 0x2c, offset 0x121
+	{value: 0x0000, lo: 0x01},
+	{value: 0xb900, lo: 0xa1, hi: 0xb5},
+	// Block 0x2d, offset 0x123
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0xa8, hi: 0xbf},
+	// Block 0x2e, offset 0x125
+	{value: 0x0000, lo: 0x01},
+	{value: 0x9900, lo: 0x80, hi: 0x82},
+	// Block 0x2f, offset 0x127
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x9d, hi: 0x9f},
+	// Block 0x30, offset 0x129
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x94, hi: 0x94},
+	{value: 0x8104, lo: 0xb4, hi: 0xb4},
+	// Block 0x31, offset 0x12c
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x92, hi: 0x92},
+	{value: 0x8132, lo: 0x9d, hi: 0x9d},
+	// Block 0x32, offset 0x12f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8131, lo: 0xa9, hi: 0xa9},
+	// Block 0x33, offset 0x131
+	{value: 0x0004, lo: 0x02},
+	{value: 0x812e, lo: 0xb9, hi: 0xba},
+	{value: 0x812d, lo: 0xbb, hi: 0xbb},
+	// Block 0x34, offset 0x134
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x97, hi: 0x97},
+	{value: 0x812d, lo: 0x98, hi: 0x98},
+	// Block 0x35, offset 0x137
+	{value: 0x0000, lo: 0x03},
+	{value: 0x8104, lo: 0xa0, hi: 0xa0},
+	{value: 0x8132, lo: 0xb5, hi: 0xbc},
+	{value: 0x812d, lo: 0xbf, hi: 0xbf},
+	// Block 0x36, offset 0x13b
+	{value: 0x0000, lo: 0x04},
+	{value: 0x8132, lo: 0xb0, hi: 0xb4},
+	{value: 0x812d, lo: 0xb5, hi: 0xba},
+	{value: 0x8132, lo: 0xbb, hi: 0xbc},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	// Block 0x37, offset 0x140
+	{value: 0x0000, lo: 0x08},
+	{value: 0x2d66, lo: 0x80, hi: 0x80},
+	{value: 0x2d6e, lo: 0x81, hi: 0x81},
+	{value: 0xa000, lo: 0x82, hi: 0x82},
+	{value: 0x2d76, lo: 0x83, hi: 0x83},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0xab, hi: 0xab},
+	{value: 0x812d, lo: 0xac, hi: 0xac},
+	{value: 0x8132, lo: 0xad, hi: 0xb3},
+	// Block 0x38, offset 0x149
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xaa, hi: 0xab},
+	// Block 0x39, offset 0x14b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8102, lo: 0xa6, hi: 0xa6},
+	{value: 0x8104, lo: 0xb2, hi: 0xb3},
+	// Block 0x3a, offset 0x14e
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	// Block 0x3b, offset 0x150
+	{value: 0x0000, lo: 0x0a},
+	{value: 0x8132, lo: 0x90, hi: 0x92},
+	{value: 0x8101, lo: 0x94, hi: 0x94},
+	{value: 0x812d, lo: 0x95, hi: 0x99},
+	{value: 0x8132, lo: 0x9a, hi: 0x9b},
+	{value: 0x812d, lo: 0x9c, hi: 0x9f},
+	{value: 0x8132, lo: 0xa0, hi: 0xa0},
+	{value: 0x8101, lo: 0xa2, hi: 0xa8},
+	{value: 0x812d, lo: 0xad, hi: 0xad},
+	{value: 0x8132, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb8, hi: 0xb9},
+	// Block 0x3c, offset 0x15b
+	{value: 0x0002, lo: 0x0a},
+	{value: 0x0043, lo: 0xac, hi: 0xac},
+	{value: 0x00d1, lo: 0xad, hi: 0xad},
+	{value: 0x0045, lo: 0xae, hi: 0xae},
+	{value: 0x0049, lo: 0xb0, hi: 0xb1},
+	{value: 0x00e6, lo: 0xb2, hi: 0xb2},
+	{value: 0x004f, lo: 0xb3, hi: 0xba},
+	{value: 0x005f, lo: 0xbc, hi: 0xbc},
+	{value: 0x00ef, lo: 0xbd, hi: 0xbd},
+	{value: 0x0061, lo: 0xbe, hi: 0xbe},
+	{value: 0x0065, lo: 0xbf, hi: 0xbf},
+	// Block 0x3d, offset 0x166
+	{value: 0x0000, lo: 0x0f},
+	{value: 0x8132, lo: 0x80, hi: 0x81},
+	{value: 0x812d, lo: 0x82, hi: 0x82},
+	{value: 0x8132, lo: 0x83, hi: 0x89},
+	{value: 0x812d, lo: 0x8a, hi: 0x8a},
+	{value: 0x8132, lo: 0x8b, hi: 0x8c},
+	{value: 0x8135, lo: 0x8d, hi: 0x8d},
+	{value: 0x812a, lo: 0x8e, hi: 0x8e},
+	{value: 0x812d, lo: 0x8f, hi: 0x8f},
+	{value: 0x8129, lo: 0x90, hi: 0x90},
+	{value: 0x8132, lo: 0x91, hi: 0xb5},
+	{value: 0x8132, lo: 0xbb, hi: 0xbb},
+	{value: 0x8134, lo: 0xbc, hi: 0xbc},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	{value: 0x8132, lo: 0xbe, hi: 0xbe},
+	{value: 0x812d, lo: 0xbf, hi: 0xbf},
+	// Block 0x3e, offset 0x176
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x0001, lo: 0x80, hi: 0x8a},
+	{value: 0x043b, lo: 0x91, hi: 0x91},
+	{value: 0x429b, lo: 0x97, hi: 0x97},
+	{value: 0x001d, lo: 0xa4, hi: 0xa4},
+	{value: 0x1873, lo: 0xa5, hi: 0xa5},
+	{value: 0x1b5c, lo: 0xa6, hi: 0xa6},
+	{value: 0x0001, lo: 0xaf, hi: 0xaf},
+	{value: 0x2691, lo: 0xb3, hi: 0xb3},
+	{value: 0x27fe, lo: 0xb4, hi: 0xb4},
+	{value: 0x2698, lo: 0xb6, hi: 0xb6},
+	{value: 0x2808, lo: 0xb7, hi: 0xb7},
+	{value: 0x186d, lo: 0xbc, hi: 0xbc},
+	{value: 0x4269, lo: 0xbe, hi: 0xbe},
+	// Block 0x3f, offset 0x184
+	{value: 0x0002, lo: 0x0d},
+	{value: 0x1933, lo: 0x87, hi: 0x87},
+	{value: 0x1930, lo: 0x88, hi: 0x88},
+	{value: 0x1870, lo: 0x89, hi: 0x89},
+	{value: 0x298e, lo: 0x97, hi: 0x97},
+	{value: 0x0001, lo: 0x9f, hi: 0x9f},
+	{value: 0x0021, lo: 0xb0, hi: 0xb0},
+	{value: 0x0093, lo: 0xb1, hi: 0xb1},
+	{value: 0x0029, lo: 0xb4, hi: 0xb9},
+	{value: 0x0017, lo: 0xba, hi: 0xba},
+	{value: 0x0467, lo: 0xbb, hi: 0xbb},
+	{value: 0x003b, lo: 0xbc, hi: 0xbc},
+	{value: 0x0011, lo: 0xbd, hi: 0xbe},
+	{value: 0x009d, lo: 0xbf, hi: 0xbf},
+	// Block 0x40, offset 0x192
+	{value: 0x0002, lo: 0x0f},
+	{value: 0x0021, lo: 0x80, hi: 0x89},
+	{value: 0x0017, lo: 0x8a, hi: 0x8a},
+	{value: 0x0467, lo: 0x8b, hi: 0x8b},
+	{value: 0x003b, lo: 0x8c, hi: 0x8c},
+	{value: 0x0011, lo: 0x8d, hi: 0x8e},
+	{value: 0x0083, lo: 0x90, hi: 0x90},
+	{value: 0x008b, lo: 0x91, hi: 0x91},
+	{value: 0x009f, lo: 0x92, hi: 0x92},
+	{value: 0x00b1, lo: 0x93, hi: 0x93},
+	{value: 0x0104, lo: 0x94, hi: 0x94},
+	{value: 0x0091, lo: 0x95, hi: 0x95},
+	{value: 0x0097, lo: 0x96, hi: 0x99},
+	{value: 0x00a1, lo: 0x9a, hi: 0x9a},
+	{value: 0x00a7, lo: 0x9b, hi: 0x9c},
+	{value: 0x1999, lo: 0xa8, hi: 0xa8},
+	// Block 0x41, offset 0x1a2
+	{value: 0x0000, lo: 0x0d},
+	{value: 0x8132, lo: 0x90, hi: 0x91},
+	{value: 0x8101, lo: 0x92, hi: 0x93},
+	{value: 0x8132, lo: 0x94, hi: 0x97},
+	{value: 0x8101, lo: 0x98, hi: 0x9a},
+	{value: 0x8132, lo: 0x9b, hi: 0x9c},
+	{value: 0x8132, lo: 0xa1, hi: 0xa1},
+	{value: 0x8101, lo: 0xa5, hi: 0xa6},
+	{value: 0x8132, lo: 0xa7, hi: 0xa7},
+	{value: 0x812d, lo: 0xa8, hi: 0xa8},
+	{value: 0x8132, lo: 0xa9, hi: 0xa9},
+	{value: 0x8101, lo: 0xaa, hi: 0xab},
+	{value: 0x812d, lo: 0xac, hi: 0xaf},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	// Block 0x42, offset 0x1b0
+	{value: 0x0007, lo: 0x06},
+	{value: 0x2180, lo: 0x89, hi: 0x89},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	{value: 0x3bb9, lo: 0x9a, hi: 0x9b},
+	{value: 0x3bc7, lo: 0xae, hi: 0xae},
+	// Block 0x43, offset 0x1b7
+	{value: 0x000e, lo: 0x05},
+	{value: 0x3bce, lo: 0x8d, hi: 0x8e},
+	{value: 0x3bd5, lo: 0x8f, hi: 0x8f},
+	{value: 0xa000, lo: 0x90, hi: 0x90},
+	{value: 0xa000, lo: 0x92, hi: 0x92},
+	{value: 0xa000, lo: 0x94, hi: 0x94},
+	// Block 0x44, offset 0x1bd
+	{value: 0x0173, lo: 0x0e},
+	{value: 0xa000, lo: 0x83, hi: 0x83},
+	{value: 0x3be3, lo: 0x84, hi: 0x84},
+	{value: 0xa000, lo: 0x88, hi: 0x88},
+	{value: 0x3bea, lo: 0x89, hi: 0x89},
+	{value: 0xa000, lo: 0x8b, hi: 0x8b},
+	{value: 0x3bf1, lo: 0x8c, hi: 0x8c},
+	{value: 0xa000, lo: 0xa3, hi: 0xa3},
+	{value: 0x3bf8, lo: 0xa4, hi: 0xa4},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x3bff, lo: 0xa6, hi: 0xa6},
+	{value: 0x269f, lo: 0xac, hi: 0xad},
+	{value: 0x26a6, lo: 0xaf, hi: 0xaf},
+	{value: 0x281c, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xbc, hi: 0xbc},
+	// Block 0x45, offset 0x1cc
+	{value: 0x0007, lo: 0x03},
+	{value: 0x3c68, lo: 0xa0, hi: 0xa1},
+	{value: 0x3c92, lo: 0xa2, hi: 0xa3},
+	{value: 0x3cbc, lo: 0xaa, hi: 0xad},
+	// Block 0x46, offset 0x1d0
+	{value: 0x0004, lo: 0x01},
+	{value: 0x048b, lo: 0xa9, hi: 0xaa},
+	// Block 0x47, offset 0x1d2
+	{value: 0x0002, lo: 0x03},
+	{value: 0x0057, lo: 0x80, hi: 0x8f},
+	{value: 0x0083, lo: 0x90, hi: 0xa9},
+	{value: 0x0021, lo: 0xaa, hi: 0xaa},
+	// Block 0x48, offset 0x1d6
+	{value: 0x0000, lo: 0x01},
+	{value: 0x299b, lo: 0x8c, hi: 0x8c},
+	// Block 0x49, offset 0x1d8
+	{value: 0x0263, lo: 0x02},
+	{value: 0x1b8c, lo: 0xb4, hi: 0xb4},
+	{value: 0x192d, lo: 0xb5, hi: 0xb6},
+	// Block 0x4a, offset 0x1db
+	{value: 0x0000, lo: 0x01},
+	{value: 0x44dd, lo: 0x9c, hi: 0x9c},
+	// Block 0x4b, offset 0x1dd
+	{value: 0x0000, lo: 0x02},
+	{value: 0x0095, lo: 0xbc, hi: 0xbc},
+	{value: 0x006d, lo: 0xbd, hi: 0xbd},
+	// Block 0x4c, offset 0x1e0
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xaf, hi: 0xb1},
+	// Block 0x4d, offset 0x1e2
+	{value: 0x0000, lo: 0x02},
+	{value: 0x047f, lo: 0xaf, hi: 0xaf},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x4e, offset 0x1e5
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xa0, hi: 0xbf},
+	// Block 0x4f, offset 0x1e7
+	{value: 0x0000, lo: 0x01},
+	{value: 0x0dc3, lo: 0x9f, hi: 0x9f},
+	// Block 0x50, offset 0x1e9
+	{value: 0x0000, lo: 0x01},
+	{value: 0x162f, lo: 0xb3, hi: 0xb3},
+	// Block 0x51, offset 0x1eb
+	{value: 0x0004, lo: 0x0b},
+	{value: 0x1597, lo: 0x80, hi: 0x82},
+	{value: 0x15af, lo: 0x83, hi: 0x83},
+	{value: 0x15c7, lo: 0x84, hi: 0x85},
+	{value: 0x15d7, lo: 0x86, hi: 0x89},
+	{value: 0x15eb, lo: 0x8a, hi: 0x8c},
+	{value: 0x15ff, lo: 0x8d, hi: 0x8d},
+	{value: 0x1607, lo: 0x8e, hi: 0x8e},
+	{value: 0x160f, lo: 0x8f, hi: 0x90},
+	{value: 0x161b, lo: 0x91, hi: 0x93},
+	{value: 0x162b, lo: 0x94, hi: 0x94},
+	{value: 0x1633, lo: 0x95, hi: 0x95},
+	// Block 0x52, offset 0x1f7
+	{value: 0x0004, lo: 0x09},
+	{value: 0x0001, lo: 0x80, hi: 0x80},
+	{value: 0x812c, lo: 0xaa, hi: 0xaa},
+	{value: 0x8131, lo: 0xab, hi: 0xab},
+	{value: 0x8133, lo: 0xac, hi: 0xac},
+	{value: 0x812e, lo: 0xad, hi: 0xad},
+	{value: 0x812f, lo: 0xae, hi: 0xae},
+	{value: 0x812f, lo: 0xaf, hi: 0xaf},
+	{value: 0x04b3, lo: 0xb6, hi: 0xb6},
+	{value: 0x0887, lo: 0xb8, hi: 0xba},
+	// Block 0x53, offset 0x201
+	{value: 0x0006, lo: 0x09},
+	{value: 0x0313, lo: 0xb1, hi: 0xb1},
+	{value: 0x0317, lo: 0xb2, hi: 0xb2},
+	{value: 0x4a3b, lo: 0xb3, hi: 0xb3},
+	{value: 0x031b, lo: 0xb4, hi: 0xb4},
+	{value: 0x4a41, lo: 0xb5, hi: 0xb6},
+	{value: 0x031f, lo: 0xb7, hi: 0xb7},
+	{value: 0x0323, lo: 0xb8, hi: 0xb8},
+	{value: 0x0327, lo: 0xb9, hi: 0xb9},
+	{value: 0x4a4d, lo: 0xba, hi: 0xbf},
+	// Block 0x54, offset 0x20b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0xaf, hi: 0xaf},
+	{value: 0x8132, lo: 0xb4, hi: 0xbd},
+	// Block 0x55, offset 0x20e
+	{value: 0x0000, lo: 0x03},
+	{value: 0x020f, lo: 0x9c, hi: 0x9c},
+	{value: 0x0212, lo: 0x9d, hi: 0x9d},
+	{value: 0x8132, lo: 0x9e, hi: 0x9f},
+	// Block 0x56, offset 0x212
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb0, hi: 0xb1},
+	// Block 0x57, offset 0x214
+	{value: 0x0000, lo: 0x01},
+	{value: 0x163b, lo: 0xb0, hi: 0xb0},
+	// Block 0x58, offset 0x216
+	{value: 0x000c, lo: 0x01},
+	{value: 0x00d7, lo: 0xb8, hi: 0xb9},
+	// Block 0x59, offset 0x218
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x86, hi: 0x86},
+	// Block 0x5a, offset 0x21a
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x84, hi: 0x84},
+	{value: 0x8132, lo: 0xa0, hi: 0xb1},
+	// Block 0x5b, offset 0x21d
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xab, hi: 0xad},
+	// Block 0x5c, offset 0x21f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x93, hi: 0x93},
+	// Block 0x5d, offset 0x221
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0xb3, hi: 0xb3},
+	// Block 0x5e, offset 0x223
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0x80, hi: 0x80},
+	// Block 0x5f, offset 0x225
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8132, lo: 0xb0, hi: 0xb0},
+	{value: 0x8132, lo: 0xb2, hi: 0xb3},
+	{value: 0x812d, lo: 0xb4, hi: 0xb4},
+	{value: 0x8132, lo: 0xb7, hi: 0xb8},
+	{value: 0x8132, lo: 0xbe, hi: 0xbf},
+	// Block 0x60, offset 0x22b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x81, hi: 0x81},
+	{value: 0x8104, lo: 0xb6, hi: 0xb6},
+	// Block 0x61, offset 0x22e
+	{value: 0x0008, lo: 0x03},
+	{value: 0x1637, lo: 0x9c, hi: 0x9d},
+	{value: 0x0125, lo: 0x9e, hi: 0x9e},
+	{value: 0x1643, lo: 0x9f, hi: 0x9f},
+	// Block 0x62, offset 0x232
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xad, hi: 0xad},
+	// Block 0x63, offset 0x234
+	{value: 0x0000, lo: 0x06},
+	{value: 0xe500, lo: 0x80, hi: 0x80},
+	{value: 0xc600, lo: 0x81, hi: 0x9b},
+	{value: 0xe500, lo: 0x9c, hi: 0x9c},
+	{value: 0xc600, lo: 0x9d, hi: 0xb7},
+	{value: 0xe500, lo: 0xb8, hi: 0xb8},
+	{value: 0xc600, lo: 0xb9, hi: 0xbf},
+	// Block 0x64, offset 0x23b
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x93},
+	{value: 0xe500, lo: 0x94, hi: 0x94},
+	{value: 0xc600, lo: 0x95, hi: 0xaf},
+	{value: 0xe500, lo: 0xb0, hi: 0xb0},
+	{value: 0xc600, lo: 0xb1, hi: 0xbf},
+	// Block 0x65, offset 0x241
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8b},
+	{value: 0xe500, lo: 0x8c, hi: 0x8c},
+	{value: 0xc600, lo: 0x8d, hi: 0xa7},
+	{value: 0xe500, lo: 0xa8, hi: 0xa8},
+	{value: 0xc600, lo: 0xa9, hi: 0xbf},
+	// Block 0x66, offset 0x247
+	{value: 0x0000, lo: 0x07},
+	{value: 0xc600, lo: 0x80, hi: 0x83},
+	{value: 0xe500, lo: 0x84, hi: 0x84},
+	{value: 0xc600, lo: 0x85, hi: 0x9f},
+	{value: 0xe500, lo: 0xa0, hi: 0xa0},
+	{value: 0xc600, lo: 0xa1, hi: 0xbb},
+	{value: 0xe500, lo: 0xbc, hi: 0xbc},
+	{value: 0xc600, lo: 0xbd, hi: 0xbf},
+	// Block 0x67, offset 0x24f
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x97},
+	{value: 0xe500, lo: 0x98, hi: 0x98},
+	{value: 0xc600, lo: 0x99, hi: 0xb3},
+	{value: 0xe500, lo: 0xb4, hi: 0xb4},
+	{value: 0xc600, lo: 0xb5, hi: 0xbf},
+	// Block 0x68, offset 0x255
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x8f},
+	{value: 0xe500, lo: 0x90, hi: 0x90},
+	{value: 0xc600, lo: 0x91, hi: 0xab},
+	{value: 0xe500, lo: 0xac, hi: 0xac},
+	{value: 0xc600, lo: 0xad, hi: 0xbf},
+	// Block 0x69, offset 0x25b
+	{value: 0x0000, lo: 0x05},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	{value: 0xe500, lo: 0xa4, hi: 0xa4},
+	{value: 0xc600, lo: 0xa5, hi: 0xbf},
+	// Block 0x6a, offset 0x261
+	{value: 0x0000, lo: 0x03},
+	{value: 0xc600, lo: 0x80, hi: 0x87},
+	{value: 0xe500, lo: 0x88, hi: 0x88},
+	{value: 0xc600, lo: 0x89, hi: 0xa3},
+	// Block 0x6b, offset 0x265
+	{value: 0x0002, lo: 0x01},
+	{value: 0x0003, lo: 0x81, hi: 0xbf},
+	// Block 0x6c, offset 0x267
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xbd, hi: 0xbd},
+	// Block 0x6d, offset 0x269
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0xa0, hi: 0xa0},
+	// Block 0x6e, offset 0x26b
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb6, hi: 0xba},
+	// Block 0x6f, offset 0x26d
+	{value: 0x002c, lo: 0x05},
+	{value: 0x812d, lo: 0x8d, hi: 0x8d},
+	{value: 0x8132, lo: 0x8f, hi: 0x8f},
+	{value: 0x8132, lo: 0xb8, hi: 0xb8},
+	{value: 0x8101, lo: 0xb9, hi: 0xba},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x70, offset 0x273
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0xa5, hi: 0xa5},
+	{value: 0x812d, lo: 0xa6, hi: 0xa6},
+	// Block 0x71, offset 0x276
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x86, hi: 0x86},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x72, offset 0x279
+	{value: 0x17fe, lo: 0x07},
+	{value: 0xa000, lo: 0x99, hi: 0x99},
+	{value: 0x4238, lo: 0x9a, hi: 0x9a},
+	{value: 0xa000, lo: 0x9b, hi: 0x9b},
+	{value: 0x4242, lo: 0x9c, hi: 0x9c},
+	{value: 0xa000, lo: 0xa5, hi: 0xa5},
+	{value: 0x424c, lo: 0xab, hi: 0xab},
+	{value: 0x8104, lo: 0xb9, hi: 0xba},
+	// Block 0x73, offset 0x281
+	{value: 0x0000, lo: 0x06},
+	{value: 0x8132, lo: 0x80, hi: 0x82},
+	{value: 0x9900, lo: 0xa7, hi: 0xa7},
+	{value: 0x2d7e, lo: 0xae, hi: 0xae},
+	{value: 0x2d88, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb1, hi: 0xb2},
+	{value: 0x8104, lo: 0xb3, hi: 0xb4},
+	// Block 0x74, offset 0x288
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x80, hi: 0x80},
+	{value: 0x8102, lo: 0x8a, hi: 0x8a},
+	// Block 0x75, offset 0x28b
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xb5, hi: 0xb5},
+	{value: 0x8102, lo: 0xb6, hi: 0xb6},
+	// Block 0x76, offset 0x28e
+	{value: 0x0002, lo: 0x01},
+	{value: 0x8102, lo: 0xa9, hi: 0xaa},
+	// Block 0x77, offset 0x290
+	{value: 0x0000, lo: 0x07},
+	{value: 0xa000, lo: 0x87, hi: 0x87},
+	{value: 0x2d92, lo: 0x8b, hi: 0x8b},
+	{value: 0x2d9c, lo: 0x8c, hi: 0x8c},
+	{value: 0x8104, lo: 0x8d, hi: 0x8d},
+	{value: 0x9900, lo: 0x97, hi: 0x97},
+	{value: 0x8132, lo: 0xa6, hi: 0xac},
+	{value: 0x8132, lo: 0xb0, hi: 0xb4},
+	// Block 0x78, offset 0x298
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x82, hi: 0x82},
+	{value: 0x8102, lo: 0x86, hi: 0x86},
+	// Block 0x79, offset 0x29b
+	{value: 0x6b5a, lo: 0x06},
+	{value: 0x9900, lo: 0xb0, hi: 0xb0},
+	{value: 0xa000, lo: 0xb9, hi: 0xb9},
+	{value: 0x9900, lo: 0xba, hi: 0xba},
+	{value: 0x2db0, lo: 0xbb, hi: 0xbb},
+	{value: 0x2da6, lo: 0xbc, hi: 0xbd},
+	{value: 0x2dba, lo: 0xbe, hi: 0xbe},
+	// Block 0x7a, offset 0x2a2
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0x82, hi: 0x82},
+	{value: 0x8102, lo: 0x83, hi: 0x83},
+	// Block 0x7b, offset 0x2a5
+	{value: 0x0000, lo: 0x05},
+	{value: 0x9900, lo: 0xaf, hi: 0xaf},
+	{value: 0xa000, lo: 0xb8, hi: 0xb9},
+	{value: 0x2dc4, lo: 0xba, hi: 0xba},
+	{value: 0x2dce, lo: 0xbb, hi: 0xbb},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x7c, offset 0x2ab
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8102, lo: 0x80, hi: 0x80},
+	// Block 0x7d, offset 0x2ad
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xbf, hi: 0xbf},
+	// Block 0x7e, offset 0x2af
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8104, lo: 0xb6, hi: 0xb6},
+	{value: 0x8102, lo: 0xb7, hi: 0xb7},
+	// Block 0x7f, offset 0x2b2
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8104, lo: 0xab, hi: 0xab},
+	// Block 0x80, offset 0x2b4
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0xb0, hi: 0xb4},
+	// Block 0x81, offset 0x2b6
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0xb0, hi: 0xb6},
+	// Block 0x82, offset 0x2b8
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8101, lo: 0x9e, hi: 0x9e},
+	// Block 0x83, offset 0x2ba
+	{value: 0x0000, lo: 0x0c},
+	{value: 0x45cc, lo: 0x9e, hi: 0x9e},
+	{value: 0x45d6, lo: 0x9f, hi: 0x9f},
+	{value: 0x460a, lo: 0xa0, hi: 0xa0},
+	{value: 0x4618, lo: 0xa1, hi: 0xa1},
+	{value: 0x4626, lo: 0xa2, hi: 0xa2},
+	{value: 0x4634, lo: 0xa3, hi: 0xa3},
+	{value: 0x4642, lo: 0xa4, hi: 0xa4},
+	{value: 0x812b, lo: 0xa5, hi: 0xa6},
+	{value: 0x8101, lo: 0xa7, hi: 0xa9},
+	{value: 0x8130, lo: 0xad, hi: 0xad},
+	{value: 0x812b, lo: 0xae, hi: 0xb2},
+	{value: 0x812d, lo: 0xbb, hi: 0xbf},
+	// Block 0x84, offset 0x2c7
+	{value: 0x0000, lo: 0x09},
+	{value: 0x812d, lo: 0x80, hi: 0x82},
+	{value: 0x8132, lo: 0x85, hi: 0x89},
+	{value: 0x812d, lo: 0x8a, hi: 0x8b},
+	{value: 0x8132, lo: 0xaa, hi: 0xad},
+	{value: 0x45e0, lo: 0xbb, hi: 0xbb},
+	{value: 0x45ea, lo: 0xbc, hi: 0xbc},
+	{value: 0x4650, lo: 0xbd, hi: 0xbd},
+	{value: 0x466c, lo: 0xbe, hi: 0xbe},
+	{value: 0x465e, lo: 0xbf, hi: 0xbf},
+	// Block 0x85, offset 0x2d1
+	{value: 0x0000, lo: 0x01},
+	{value: 0x467a, lo: 0x80, hi: 0x80},
+	// Block 0x86, offset 0x2d3
+	{value: 0x0000, lo: 0x01},
+	{value: 0x8132, lo: 0x82, hi: 0x84},
+	// Block 0x87, offset 0x2d5
+	{value: 0x0002, lo: 0x03},
+	{value: 0x0043, lo: 0x80, hi: 0x99},
+	{value: 0x0083, lo: 0x9a, hi: 0xb3},
+	{value: 0x0043, lo: 0xb4, hi: 0xbf},
+	// Block 0x88, offset 0x2d9
+	{value: 0x0002, lo: 0x04},
+	{value: 0x005b, lo: 0x80, hi: 0x8d},
+	{value: 0x0083, lo: 0x8e, hi: 0x94},
+	{value: 0x0093, lo: 0x96, hi: 0xa7},
+	{value: 0x0043, lo: 0xa8, hi: 0xbf},
+	// Block 0x89, offset 0x2de
+	{value: 0x0002, lo: 0x0b},
+	{value: 0x0073, lo: 0x80, hi: 0x81},
+	{value: 0x0083, lo: 0x82, hi: 0x9b},
+	{value: 0x0043, lo: 0x9c, hi: 0x9c},
+	{value: 0x0047, lo: 0x9e, hi: 0x9f},
+	{value: 0x004f, lo: 0xa2, hi: 0xa2},
+	{value: 0x0055, lo: 0xa5, hi: 0xa6},
+	{value: 0x005d, lo: 0xa9, hi: 0xac},
+	{value: 0x0067, lo: 0xae, hi: 0xb5},
+	{value: 0x0083, lo: 0xb6, hi: 0xb9},
+	{value: 0x008d, lo: 0xbb, hi: 0xbb},
+	{value: 0x0091, lo: 0xbd, hi: 0xbf},
+	// Block 0x8a, offset 0x2ea
+	{value: 0x0002, lo: 0x04},
+	{value: 0x0097, lo: 0x80, hi: 0x83},
+	{value: 0x00a1, lo: 0x85, hi: 0x8f},
+	{value: 0x0043, lo: 0x90, hi: 0xa9},
+	{value: 0x0083, lo: 0xaa, hi: 0xbf},
+	// Block 0x8b, offset 0x2ef
+	{value: 0x0002, lo: 0x08},
+	{value: 0x00af, lo: 0x80, hi: 0x83},
+	{value: 0x0043, lo: 0x84, hi: 0x85},
+	{value: 0x0049, lo: 0x87, hi: 0x8a},
+	{value: 0x0055, lo: 0x8d, hi: 0x94},
+	{value: 0x0067, lo: 0x96, hi: 0x9c},
+	{value: 0x0083, lo: 0x9e, hi: 0xb7},
+	{value: 0x0043, lo: 0xb8, hi: 0xb9},
+	{value: 0x0049, lo: 0xbb, hi: 0xbe},
+	// Block 0x8c, offset 0x2f8
+	{value: 0x0002, lo: 0x05},
+	{value: 0x0053, lo: 0x80, hi: 0x84},
+	{value: 0x005f, lo: 0x86, hi: 0x86},
+	{value: 0x0067, lo: 0x8a, hi: 0x90},
+	{value: 0x0083, lo: 0x92, hi: 0xab},
+	{value: 0x0043, lo: 0xac, hi: 0xbf},
+	// Block 0x8d, offset 0x2fe
+	{value: 0x0002, lo: 0x04},
+	{value: 0x006b, lo: 0x80, hi: 0x85},
+	{value: 0x0083, lo: 0x86, hi: 0x9f},
+	{value: 0x0043, lo: 0xa0, hi: 0xb9},
+	{value: 0x0083, lo: 0xba, hi: 0xbf},
+	// Block 0x8e, offset 0x303
+	{value: 0x0002, lo: 0x03},
+	{value: 0x008f, lo: 0x80, hi: 0x93},
+	{value: 0x0043, lo: 0x94, hi: 0xad},
+	{value: 0x0083, lo: 0xae, hi: 0xbf},
+	// Block 0x8f, offset 0x307
+	{value: 0x0002, lo: 0x04},
+	{value: 0x00a7, lo: 0x80, hi: 0x87},
+	{value: 0x0043, lo: 0x88, hi: 0xa1},
+	{value: 0x0083, lo: 0xa2, hi: 0xbb},
+	{value: 0x0043, lo: 0xbc, hi: 0xbf},
+	// Block 0x90, offset 0x30c
+	{value: 0x0002, lo: 0x03},
+	{value: 0x004b, lo: 0x80, hi: 0x95},
+	{value: 0x0083, lo: 0x96, hi: 0xaf},
+	{value: 0x0043, lo: 0xb0, hi: 0xbf},
+	// Block 0x91, offset 0x310
+	{value: 0x0003, lo: 0x0f},
+	{value: 0x01b8, lo: 0x80, hi: 0x80},
+	{value: 0x045f, lo: 0x81, hi: 0x81},
+	{value: 0x01bb, lo: 0x82, hi: 0x9a},
+	{value: 0x045b, lo: 0x9b, hi: 0x9b},
+	{value: 0x01c7, lo: 0x9c, hi: 0x9c},
+	{value: 0x01d0, lo: 0x9d, hi: 0x9d},
+	{value: 0x01d6, lo: 0x9e, hi: 0x9e},
+	{value: 0x01fa, lo: 0x9f, hi: 0x9f},
+	{value: 0x01eb, lo: 0xa0, hi: 0xa0},
+	{value: 0x01e8, lo: 0xa1, hi: 0xa1},
+	{value: 0x0173, lo: 0xa2, hi: 0xb2},
+	{value: 0x0188, lo: 0xb3, hi: 0xb3},
+	{value: 0x01a6, lo: 0xb4, hi: 0xba},
+	{value: 0x045f, lo: 0xbb, hi: 0xbb},
+	{value: 0x01bb, lo: 0xbc, hi: 0xbf},
+	// Block 0x92, offset 0x320
+	{value: 0x0003, lo: 0x0d},
+	{value: 0x01c7, lo: 0x80, hi: 0x94},
+	{value: 0x045b, lo: 0x95, hi: 0x95},
+	{value: 0x01c7, lo: 0x96, hi: 0x96},
+	{value: 0x01d0, lo: 0x97, hi: 0x97},
+	{value: 0x01d6, lo: 0x98, hi: 0x98},
+	{value: 0x01fa, lo: 0x99, hi: 0x99},
+	{value: 0x01eb, lo: 0x9a, hi: 0x9a},
+	{value: 0x01e8, lo: 0x9b, hi: 0x9b},
+	{value: 0x0173, lo: 0x9c, hi: 0xac},
+	{value: 0x0188, lo: 0xad, hi: 0xad},
+	{value: 0x01a6, lo: 0xae, hi: 0xb4},
+	{value: 0x045f, lo: 0xb5, hi: 0xb5},
+	{value: 0x01bb, lo: 0xb6, hi: 0xbf},
+	// Block 0x93, offset 0x32e
+	{value: 0x0003, lo: 0x0d},
+	{value: 0x01d9, lo: 0x80, hi: 0x8e},
+	{value: 0x045b, lo: 0x8f, hi: 0x8f},
+	{value: 0x01c7, lo: 0x90, hi: 0x90},
+	{value: 0x01d0, lo: 0x91, hi: 0x91},
+	{value: 0x01d6, lo: 0x92, hi: 0x92},
+	{value: 0x01fa, lo: 0x93, hi: 0x93},
+	{value: 0x01eb, lo: 0x94, hi: 0x94},
+	{value: 0x01e8, lo: 0x95, hi: 0x95},
+	{value: 0x0173, lo: 0x96, hi: 0xa6},
+	{value: 0x0188, lo: 0xa7, hi: 0xa7},
+	{value: 0x01a6, lo: 0xa8, hi: 0xae},
+	{value: 0x045f, lo: 0xaf, hi: 0xaf},
+	{value: 0x01bb, lo: 0xb0, hi: 0xbf},
+	// Block 0x94, offset 0x33c
+	{value: 0x0003, lo: 0x0d},
+	{value: 0x01eb, lo: 0x80, hi: 0x88},
+	{value: 0x045b, lo: 0x89, hi: 0x89},
+	{value: 0x01c7, lo: 0x8a, hi: 0x8a},
+	{value: 0x01d0, lo: 0x8b, hi: 0x8b},
+	{value: 0x01d6, lo: 0x8c, hi: 0x8c},
+	{value: 0x01fa, lo: 0x8d, hi: 0x8d},
+	{value: 0x01eb, lo: 0x8e, hi: 0x8e},
+	{value: 0x01e8, lo: 0x8f, hi: 0x8f},
+	{value: 0x0173, lo: 0x90, hi: 0xa0},
+	{value: 0x0188, lo: 0xa1, hi: 0xa1},
+	{value: 0x01a6, lo: 0xa2, hi: 0xa8},
+	{value: 0x045f, lo: 0xa9, hi: 0xa9},
+	{value: 0x01bb, lo: 0xaa, hi: 0xbf},
+	// Block 0x95, offset 0x34a
+	{value: 0x0000, lo: 0x05},
+	{value: 0x8132, lo: 0x80, hi: 0x86},
+	{value: 0x8132, lo: 0x88, hi: 0x98},
+	{value: 0x8132, lo: 0x9b, hi: 0xa1},
+	{value: 0x8132, lo: 0xa3, hi: 0xa4},
+	{value: 0x8132, lo: 0xa6, hi: 0xaa},
+	// Block 0x96, offset 0x350
+	{value: 0x0000, lo: 0x01},
+	{value: 0x812d, lo: 0x90, hi: 0x96},
+	// Block 0x97, offset 0x352
+	{value: 0x0000, lo: 0x02},
+	{value: 0x8132, lo: 0x84, hi: 0x89},
+	{value: 0x8102, lo: 0x8a, hi: 0x8a},
+	// Block 0x98, offset 0x355
+	{value: 0x0002, lo: 0x09},
+	{value: 0x0063, lo: 0x80, hi: 0x89},
+	{value: 0x1951, lo: 0x8a, hi: 0x8a},
+	{value: 0x1981, lo: 0x8b, hi: 0x8b},
+	{value: 0x199c, lo: 0x8c, hi: 0x8c},
+	{value: 0x19a2, lo: 0x8d, hi: 0x8d},
+	{value: 0x1bc0, lo: 0x8e, hi: 0x8e},
+	{value: 0x19ae, lo: 0x8f, hi: 0x8f},
+	{value: 0x197b, lo: 0xaa, hi: 0xaa},
+	{value: 0x197e, lo: 0xab, hi: 0xab},
+	// Block 0x99, offset 0x35f
+	{value: 0x0000, lo: 0x01},
+	{value: 0x193f, lo: 0x90, hi: 0x90},
+	// Block 0x9a, offset 0x361
+	{value: 0x0028, lo: 0x09},
+	{value: 0x2862, lo: 0x80, hi: 0x80},
+	{value: 0x2826, lo: 0x81, hi: 0x81},
+	{value: 0x2830, lo: 0x82, hi: 0x82},
+	{value: 0x2844, lo: 0x83, hi: 0x84},
+	{value: 0x284e, lo: 0x85, hi: 0x86},
+	{value: 0x283a, lo: 0x87, hi: 0x87},
+	{value: 0x2858, lo: 0x88, hi: 0x88},
+	{value: 0x0b6f, lo: 0x90, hi: 0x90},
+	{value: 0x08e7, lo: 0x91, hi: 0x91},
+}
+
+// recompMap: 7520 bytes (entries only)
+var recompMap = map[uint32]rune{
+	0x00410300: 0x00C0,
+	0x00410301: 0x00C1,
+	0x00410302: 0x00C2,
+	0x00410303: 0x00C3,
+	0x00410308: 0x00C4,
+	0x0041030A: 0x00C5,
+	0x00430327: 0x00C7,
+	0x00450300: 0x00C8,
+	0x00450301: 0x00C9,
+	0x00450302: 0x00CA,
+	0x00450308: 0x00CB,
+	0x00490300: 0x00CC,
+	0x00490301: 0x00CD,
+	0x00490302: 0x00CE,
+	0x00490308: 0x00CF,
+	0x004E0303: 0x00D1,
+	0x004F0300: 0x00D2,
+	0x004F0301: 0x00D3,
+	0x004F0302: 0x00D4,
+	0x004F0303: 0x00D5,
+	0x004F0308: 0x00D6,
+	0x00550300: 0x00D9,
+	0x00550301: 0x00DA,
+	0x00550302: 0x00DB,
+	0x00550308: 0x00DC,
+	0x00590301: 0x00DD,
+	0x00610300: 0x00E0,
+	0x00610301: 0x00E1,
+	0x00610302: 0x00E2,
+	0x00610303: 0x00E3,
+	0x00610308: 0x00E4,
+	0x0061030A: 0x00E5,
+	0x00630327: 0x00E7,
+	0x00650300: 0x00E8,
+	0x00650301: 0x00E9,
+	0x00650302: 0x00EA,
+	0x00650308: 0x00EB,
+	0x00690300: 0x00EC,
+	0x00690301: 0x00ED,
+	0x00690302: 0x00EE,
+	0x00690308: 0x00EF,
+	0x006E0303: 0x00F1,
+	0x006F0300: 0x00F2,
+	0x006F0301: 0x00F3,
+	0x006F0302: 0x00F4,
+	0x006F0303: 0x00F5,
+	0x006F0308: 0x00F6,
+	0x00750300: 0x00F9,
+	0x00750301: 0x00FA,
+	0x00750302: 0x00FB,
+	0x00750308: 0x00FC,
+	0x00790301: 0x00FD,
+	0x00790308: 0x00FF,
+	0x00410304: 0x0100,
+	0x00610304: 0x0101,
+	0x00410306: 0x0102,
+	0x00610306: 0x0103,
+	0x00410328: 0x0104,
+	0x00610328: 0x0105,
+	0x00430301: 0x0106,
+	0x00630301: 0x0107,
+	0x00430302: 0x0108,
+	0x00630302: 0x0109,
+	0x00430307: 0x010A,
+	0x00630307: 0x010B,
+	0x0043030C: 0x010C,
+	0x0063030C: 0x010D,
+	0x0044030C: 0x010E,
+	0x0064030C: 0x010F,
+	0x00450304: 0x0112,
+	0x00650304: 0x0113,
+	0x00450306: 0x0114,
+	0x00650306: 0x0115,
+	0x00450307: 0x0116,
+	0x00650307: 0x0117,
+	0x00450328: 0x0118,
+	0x00650328: 0x0119,
+	0x0045030C: 0x011A,
+	0x0065030C: 0x011B,
+	0x00470302: 0x011C,
+	0x00670302: 0x011D,
+	0x00470306: 0x011E,
+	0x00670306: 0x011F,
+	0x00470307: 0x0120,
+	0x00670307: 0x0121,
+	0x00470327: 0x0122,
+	0x00670327: 0x0123,
+	0x00480302: 0x0124,
+	0x00680302: 0x0125,
+	0x00490303: 0x0128,
+	0x00690303: 0x0129,
+	0x00490304: 0x012A,
+	0x00690304: 0x012B,
+	0x00490306: 0x012C,
+	0x00690306: 0x012D,
+	0x00490328: 0x012E,
+	0x00690328: 0x012F,
+	0x00490307: 0x0130,
+	0x004A0302: 0x0134,
+	0x006A0302: 0x0135,
+	0x004B0327: 0x0136,
+	0x006B0327: 0x0137,
+	0x004C0301: 0x0139,
+	0x006C0301: 0x013A,
+	0x004C0327: 0x013B,
+	0x006C0327: 0x013C,
+	0x004C030C: 0x013D,
+	0x006C030C: 0x013E,
+	0x004E0301: 0x0143,
+	0x006E0301: 0x0144,
+	0x004E0327: 0x0145,
+	0x006E0327: 0x0146,
+	0x004E030C: 0x0147,
+	0x006E030C: 0x0148,
+	0x004F0304: 0x014C,
+	0x006F0304: 0x014D,
+	0x004F0306: 0x014E,
+	0x006F0306: 0x014F,
+	0x004F030B: 0x0150,
+	0x006F030B: 0x0151,
+	0x00520301: 0x0154,
+	0x00720301: 0x0155,
+	0x00520327: 0x0156,
+	0x00720327: 0x0157,
+	0x0052030C: 0x0158,
+	0x0072030C: 0x0159,
+	0x00530301: 0x015A,
+	0x00730301: 0x015B,
+	0x00530302: 0x015C,
+	0x00730302: 0x015D,
+	0x00530327: 0x015E,
+	0x00730327: 0x015F,
+	0x0053030C: 0x0160,
+	0x0073030C: 0x0161,
+	0x00540327: 0x0162,
+	0x00740327: 0x0163,
+	0x0054030C: 0x0164,
+	0x0074030C: 0x0165,
+	0x00550303: 0x0168,
+	0x00750303: 0x0169,
+	0x00550304: 0x016A,
+	0x00750304: 0x016B,
+	0x00550306: 0x016C,
+	0x00750306: 0x016D,
+	0x0055030A: 0x016E,
+	0x0075030A: 0x016F,
+	0x0055030B: 0x0170,
+	0x0075030B: 0x0171,
+	0x00550328: 0x0172,
+	0x00750328: 0x0173,
+	0x00570302: 0x0174,
+	0x00770302: 0x0175,
+	0x00590302: 0x0176,
+	0x00790302: 0x0177,
+	0x00590308: 0x0178,
+	0x005A0301: 0x0179,
+	0x007A0301: 0x017A,
+	0x005A0307: 0x017B,
+	0x007A0307: 0x017C,
+	0x005A030C: 0x017D,
+	0x007A030C: 0x017E,
+	0x004F031B: 0x01A0,
+	0x006F031B: 0x01A1,
+	0x0055031B: 0x01AF,
+	0x0075031B: 0x01B0,
+	0x0041030C: 0x01CD,
+	0x0061030C: 0x01CE,
+	0x0049030C: 0x01CF,
+	0x0069030C: 0x01D0,
+	0x004F030C: 0x01D1,
+	0x006F030C: 0x01D2,
+	0x0055030C: 0x01D3,
+	0x0075030C: 0x01D4,
+	0x00DC0304: 0x01D5,
+	0x00FC0304: 0x01D6,
+	0x00DC0301: 0x01D7,
+	0x00FC0301: 0x01D8,
+	0x00DC030C: 0x01D9,
+	0x00FC030C: 0x01DA,
+	0x00DC0300: 0x01DB,
+	0x00FC0300: 0x01DC,
+	0x00C40304: 0x01DE,
+	0x00E40304: 0x01DF,
+	0x02260304: 0x01E0,
+	0x02270304: 0x01E1,
+	0x00C60304: 0x01E2,
+	0x00E60304: 0x01E3,
+	0x0047030C: 0x01E6,
+	0x0067030C: 0x01E7,
+	0x004B030C: 0x01E8,
+	0x006B030C: 0x01E9,
+	0x004F0328: 0x01EA,
+	0x006F0328: 0x01EB,
+	0x01EA0304: 0x01EC,
+	0x01EB0304: 0x01ED,
+	0x01B7030C: 0x01EE,
+	0x0292030C: 0x01EF,
+	0x006A030C: 0x01F0,
+	0x00470301: 0x01F4,
+	0x00670301: 0x01F5,
+	0x004E0300: 0x01F8,
+	0x006E0300: 0x01F9,
+	0x00C50301: 0x01FA,
+	0x00E50301: 0x01FB,
+	0x00C60301: 0x01FC,
+	0x00E60301: 0x01FD,
+	0x00D80301: 0x01FE,
+	0x00F80301: 0x01FF,
+	0x0041030F: 0x0200,
+	0x0061030F: 0x0201,
+	0x00410311: 0x0202,
+	0x00610311: 0x0203,
+	0x0045030F: 0x0204,
+	0x0065030F: 0x0205,
+	0x00450311: 0x0206,
+	0x00650311: 0x0207,
+	0x0049030F: 0x0208,
+	0x0069030F: 0x0209,
+	0x00490311: 0x020A,
+	0x00690311: 0x020B,
+	0x004F030F: 0x020C,
+	0x006F030F: 0x020D,
+	0x004F0311: 0x020E,
+	0x006F0311: 0x020F,
+	0x0052030F: 0x0210,
+	0x0072030F: 0x0211,
+	0x00520311: 0x0212,
+	0x00720311: 0x0213,
+	0x0055030F: 0x0214,
+	0x0075030F: 0x0215,
+	0x00550311: 0x0216,
+	0x00750311: 0x0217,
+	0x00530326: 0x0218,
+	0x00730326: 0x0219,
+	0x00540326: 0x021A,
+	0x00740326: 0x021B,
+	0x0048030C: 0x021E,
+	0x0068030C: 0x021F,
+	0x00410307: 0x0226,
+	0x00610307: 0x0227,
+	0x00450327: 0x0228,
+	0x00650327: 0x0229,
+	0x00D60304: 0x022A,
+	0x00F60304: 0x022B,
+	0x00D50304: 0x022C,
+	0x00F50304: 0x022D,
+	0x004F0307: 0x022E,
+	0x006F0307: 0x022F,
+	0x022E0304: 0x0230,
+	0x022F0304: 0x0231,
+	0x00590304: 0x0232,
+	0x00790304: 0x0233,
+	0x00A80301: 0x0385,
+	0x03910301: 0x0386,
+	0x03950301: 0x0388,
+	0x03970301: 0x0389,
+	0x03990301: 0x038A,
+	0x039F0301: 0x038C,
+	0x03A50301: 0x038E,
+	0x03A90301: 0x038F,
+	0x03CA0301: 0x0390,
+	0x03990308: 0x03AA,
+	0x03A50308: 0x03AB,
+	0x03B10301: 0x03AC,
+	0x03B50301: 0x03AD,
+	0x03B70301: 0x03AE,
+	0x03B90301: 0x03AF,
+	0x03CB0301: 0x03B0,
+	0x03B90308: 0x03CA,
+	0x03C50308: 0x03CB,
+	0x03BF0301: 0x03CC,
+	0x03C50301: 0x03CD,
+	0x03C90301: 0x03CE,
+	0x03D20301: 0x03D3,
+	0x03D20308: 0x03D4,
+	0x04150300: 0x0400,
+	0x04150308: 0x0401,
+	0x04130301: 0x0403,
+	0x04060308: 0x0407,
+	0x041A0301: 0x040C,
+	0x04180300: 0x040D,
+	0x04230306: 0x040E,
+	0x04180306: 0x0419,
+	0x04380306: 0x0439,
+	0x04350300: 0x0450,
+	0x04350308: 0x0451,
+	0x04330301: 0x0453,
+	0x04560308: 0x0457,
+	0x043A0301: 0x045C,
+	0x04380300: 0x045D,
+	0x04430306: 0x045E,
+	0x0474030F: 0x0476,
+	0x0475030F: 0x0477,
+	0x04160306: 0x04C1,
+	0x04360306: 0x04C2,
+	0x04100306: 0x04D0,
+	0x04300306: 0x04D1,
+	0x04100308: 0x04D2,
+	0x04300308: 0x04D3,
+	0x04150306: 0x04D6,
+	0x04350306: 0x04D7,
+	0x04D80308: 0x04DA,
+	0x04D90308: 0x04DB,
+	0x04160308: 0x04DC,
+	0x04360308: 0x04DD,
+	0x04170308: 0x04DE,
+	0x04370308: 0x04DF,
+	0x04180304: 0x04E2,
+	0x04380304: 0x04E3,
+	0x04180308: 0x04E4,
+	0x04380308: 0x04E5,
+	0x041E0308: 0x04E6,
+	0x043E0308: 0x04E7,
+	0x04E80308: 0x04EA,
+	0x04E90308: 0x04EB,
+	0x042D0308: 0x04EC,
+	0x044D0308: 0x04ED,
+	0x04230304: 0x04EE,
+	0x04430304: 0x04EF,
+	0x04230308: 0x04F0,
+	0x04430308: 0x04F1,
+	0x0423030B: 0x04F2,
+	0x0443030B: 0x04F3,
+	0x04270308: 0x04F4,
+	0x04470308: 0x04F5,
+	0x042B0308: 0x04F8,
+	0x044B0308: 0x04F9,
+	0x06270653: 0x0622,
+	0x06270654: 0x0623,
+	0x06480654: 0x0624,
+	0x06270655: 0x0625,
+	0x064A0654: 0x0626,
+	0x06D50654: 0x06C0,
+	0x06C10654: 0x06C2,
+	0x06D20654: 0x06D3,
+	0x0928093C: 0x0929,
+	0x0930093C: 0x0931,
+	0x0933093C: 0x0934,
+	0x09C709BE: 0x09CB,
+	0x09C709D7: 0x09CC,
+	0x0B470B56: 0x0B48,
+	0x0B470B3E: 0x0B4B,
+	0x0B470B57: 0x0B4C,
+	0x0B920BD7: 0x0B94,
+	0x0BC60BBE: 0x0BCA,
+	0x0BC70BBE: 0x0BCB,
+	0x0BC60BD7: 0x0BCC,
+	0x0C460C56: 0x0C48,
+	0x0CBF0CD5: 0x0CC0,
+	0x0CC60CD5: 0x0CC7,
+	0x0CC60CD6: 0x0CC8,
+	0x0CC60CC2: 0x0CCA,
+	0x0CCA0CD5: 0x0CCB,
+	0x0D460D3E: 0x0D4A,
+	0x0D470D3E: 0x0D4B,
+	0x0D460D57: 0x0D4C,
+	0x0DD90DCA: 0x0DDA,
+	0x0DD90DCF: 0x0DDC,
+	0x0DDC0DCA: 0x0DDD,
+	0x0DD90DDF: 0x0DDE,
+	0x1025102E: 0x1026,
+	0x1B051B35: 0x1B06,
+	0x1B071B35: 0x1B08,
+	0x1B091B35: 0x1B0A,
+	0x1B0B1B35: 0x1B0C,
+	0x1B0D1B35: 0x1B0E,
+	0x1B111B35: 0x1B12,
+	0x1B3A1B35: 0x1B3B,
+	0x1B3C1B35: 0x1B3D,
+	0x1B3E1B35: 0x1B40,
+	0x1B3F1B35: 0x1B41,
+	0x1B421B35: 0x1B43,
+	0x00410325: 0x1E00,
+	0x00610325: 0x1E01,
+	0x00420307: 0x1E02,
+	0x00620307: 0x1E03,
+	0x00420323: 0x1E04,
+	0x00620323: 0x1E05,
+	0x00420331: 0x1E06,
+	0x00620331: 0x1E07,
+	0x00C70301: 0x1E08,
+	0x00E70301: 0x1E09,
+	0x00440307: 0x1E0A,
+	0x00640307: 0x1E0B,
+	0x00440323: 0x1E0C,
+	0x00640323: 0x1E0D,
+	0x00440331: 0x1E0E,
+	0x00640331: 0x1E0F,
+	0x00440327: 0x1E10,
+	0x00640327: 0x1E11,
+	0x0044032D: 0x1E12,
+	0x0064032D: 0x1E13,
+	0x01120300: 0x1E14,
+	0x01130300: 0x1E15,
+	0x01120301: 0x1E16,
+	0x01130301: 0x1E17,
+	0x0045032D: 0x1E18,
+	0x0065032D: 0x1E19,
+	0x00450330: 0x1E1A,
+	0x00650330: 0x1E1B,
+	0x02280306: 0x1E1C,
+	0x02290306: 0x1E1D,
+	0x00460307: 0x1E1E,
+	0x00660307: 0x1E1F,
+	0x00470304: 0x1E20,
+	0x00670304: 0x1E21,
+	0x00480307: 0x1E22,
+	0x00680307: 0x1E23,
+	0x00480323: 0x1E24,
+	0x00680323: 0x1E25,
+	0x00480308: 0x1E26,
+	0x00680308: 0x1E27,
+	0x00480327: 0x1E28,
+	0x00680327: 0x1E29,
+	0x0048032E: 0x1E2A,
+	0x0068032E: 0x1E2B,
+	0x00490330: 0x1E2C,
+	0x00690330: 0x1E2D,
+	0x00CF0301: 0x1E2E,
+	0x00EF0301: 0x1E2F,
+	0x004B0301: 0x1E30,
+	0x006B0301: 0x1E31,
+	0x004B0323: 0x1E32,
+	0x006B0323: 0x1E33,
+	0x004B0331: 0x1E34,
+	0x006B0331: 0x1E35,
+	0x004C0323: 0x1E36,
+	0x006C0323: 0x1E37,
+	0x1E360304: 0x1E38,
+	0x1E370304: 0x1E39,
+	0x004C0331: 0x1E3A,
+	0x006C0331: 0x1E3B,
+	0x004C032D: 0x1E3C,
+	0x006C032D: 0x1E3D,
+	0x004D0301: 0x1E3E,
+	0x006D0301: 0x1E3F,
+	0x004D0307: 0x1E40,
+	0x006D0307: 0x1E41,
+	0x004D0323: 0x1E42,
+	0x006D0323: 0x1E43,
+	0x004E0307: 0x1E44,
+	0x006E0307: 0x1E45,
+	0x004E0323: 0x1E46,
+	0x006E0323: 0x1E47,
+	0x004E0331: 0x1E48,
+	0x006E0331: 0x1E49,
+	0x004E032D: 0x1E4A,
+	0x006E032D: 0x1E4B,
+	0x00D50301: 0x1E4C,
+	0x00F50301: 0x1E4D,
+	0x00D50308: 0x1E4E,
+	0x00F50308: 0x1E4F,
+	0x014C0300: 0x1E50,
+	0x014D0300: 0x1E51,
+	0x014C0301: 0x1E52,
+	0x014D0301: 0x1E53,
+	0x00500301: 0x1E54,
+	0x00700301: 0x1E55,
+	0x00500307: 0x1E56,
+	0x00700307: 0x1E57,
+	0x00520307: 0x1E58,
+	0x00720307: 0x1E59,
+	0x00520323: 0x1E5A,
+	0x00720323: 0x1E5B,
+	0x1E5A0304: 0x1E5C,
+	0x1E5B0304: 0x1E5D,
+	0x00520331: 0x1E5E,
+	0x00720331: 0x1E5F,
+	0x00530307: 0x1E60,
+	0x00730307: 0x1E61,
+	0x00530323: 0x1E62,
+	0x00730323: 0x1E63,
+	0x015A0307: 0x1E64,
+	0x015B0307: 0x1E65,
+	0x01600307: 0x1E66,
+	0x01610307: 0x1E67,
+	0x1E620307: 0x1E68,
+	0x1E630307: 0x1E69,
+	0x00540307: 0x1E6A,
+	0x00740307: 0x1E6B,
+	0x00540323: 0x1E6C,
+	0x00740323: 0x1E6D,
+	0x00540331: 0x1E6E,
+	0x00740331: 0x1E6F,
+	0x0054032D: 0x1E70,
+	0x0074032D: 0x1E71,
+	0x00550324: 0x1E72,
+	0x00750324: 0x1E73,
+	0x00550330: 0x1E74,
+	0x00750330: 0x1E75,
+	0x0055032D: 0x1E76,
+	0x0075032D: 0x1E77,
+	0x01680301: 0x1E78,
+	0x01690301: 0x1E79,
+	0x016A0308: 0x1E7A,
+	0x016B0308: 0x1E7B,
+	0x00560303: 0x1E7C,
+	0x00760303: 0x1E7D,
+	0x00560323: 0x1E7E,
+	0x00760323: 0x1E7F,
+	0x00570300: 0x1E80,
+	0x00770300: 0x1E81,
+	0x00570301: 0x1E82,
+	0x00770301: 0x1E83,
+	0x00570308: 0x1E84,
+	0x00770308: 0x1E85,
+	0x00570307: 0x1E86,
+	0x00770307: 0x1E87,
+	0x00570323: 0x1E88,
+	0x00770323: 0x1E89,
+	0x00580307: 0x1E8A,
+	0x00780307: 0x1E8B,
+	0x00580308: 0x1E8C,
+	0x00780308: 0x1E8D,
+	0x00590307: 0x1E8E,
+	0x00790307: 0x1E8F,
+	0x005A0302: 0x1E90,
+	0x007A0302: 0x1E91,
+	0x005A0323: 0x1E92,
+	0x007A0323: 0x1E93,
+	0x005A0331: 0x1E94,
+	0x007A0331: 0x1E95,
+	0x00680331: 0x1E96,
+	0x00740308: 0x1E97,
+	0x0077030A: 0x1E98,
+	0x0079030A: 0x1E99,
+	0x017F0307: 0x1E9B,
+	0x00410323: 0x1EA0,
+	0x00610323: 0x1EA1,
+	0x00410309: 0x1EA2,
+	0x00610309: 0x1EA3,
+	0x00C20301: 0x1EA4,
+	0x00E20301: 0x1EA5,
+	0x00C20300: 0x1EA6,
+	0x00E20300: 0x1EA7,
+	0x00C20309: 0x1EA8,
+	0x00E20309: 0x1EA9,
+	0x00C20303: 0x1EAA,
+	0x00E20303: 0x1EAB,
+	0x1EA00302: 0x1EAC,
+	0x1EA10302: 0x1EAD,
+	0x01020301: 0x1EAE,
+	0x01030301: 0x1EAF,
+	0x01020300: 0x1EB0,
+	0x01030300: 0x1EB1,
+	0x01020309: 0x1EB2,
+	0x01030309: 0x1EB3,
+	0x01020303: 0x1EB4,
+	0x01030303: 0x1EB5,
+	0x1EA00306: 0x1EB6,
+	0x1EA10306: 0x1EB7,
+	0x00450323: 0x1EB8,
+	0x00650323: 0x1EB9,
+	0x00450309: 0x1EBA,
+	0x00650309: 0x1EBB,
+	0x00450303: 0x1EBC,
+	0x00650303: 0x1EBD,
+	0x00CA0301: 0x1EBE,
+	0x00EA0301: 0x1EBF,
+	0x00CA0300: 0x1EC0,
+	0x00EA0300: 0x1EC1,
+	0x00CA0309: 0x1EC2,
+	0x00EA0309: 0x1EC3,
+	0x00CA0303: 0x1EC4,
+	0x00EA0303: 0x1EC5,
+	0x1EB80302: 0x1EC6,
+	0x1EB90302: 0x1EC7,
+	0x00490309: 0x1EC8,
+	0x00690309: 0x1EC9,
+	0x00490323: 0x1ECA,
+	0x00690323: 0x1ECB,
+	0x004F0323: 0x1ECC,
+	0x006F0323: 0x1ECD,
+	0x004F0309: 0x1ECE,
+	0x006F0309: 0x1ECF,
+	0x00D40301: 0x1ED0,
+	0x00F40301: 0x1ED1,
+	0x00D40300: 0x1ED2,
+	0x00F40300: 0x1ED3,
+	0x00D40309: 0x1ED4,
+	0x00F40309: 0x1ED5,
+	0x00D40303: 0x1ED6,
+	0x00F40303: 0x1ED7,
+	0x1ECC0302: 0x1ED8,
+	0x1ECD0302: 0x1ED9,
+	0x01A00301: 0x1EDA,
+	0x01A10301: 0x1EDB,
+	0x01A00300: 0x1EDC,
+	0x01A10300: 0x1EDD,
+	0x01A00309: 0x1EDE,
+	0x01A10309: 0x1EDF,
+	0x01A00303: 0x1EE0,
+	0x01A10303: 0x1EE1,
+	0x01A00323: 0x1EE2,
+	0x01A10323: 0x1EE3,
+	0x00550323: 0x1EE4,
+	0x00750323: 0x1EE5,
+	0x00550309: 0x1EE6,
+	0x00750309: 0x1EE7,
+	0x01AF0301: 0x1EE8,
+	0x01B00301: 0x1EE9,
+	0x01AF0300: 0x1EEA,
+	0x01B00300: 0x1EEB,
+	0x01AF0309: 0x1EEC,
+	0x01B00309: 0x1EED,
+	0x01AF0303: 0x1EEE,
+	0x01B00303: 0x1EEF,
+	0x01AF0323: 0x1EF0,
+	0x01B00323: 0x1EF1,
+	0x00590300: 0x1EF2,
+	0x00790300: 0x1EF3,
+	0x00590323: 0x1EF4,
+	0x00790323: 0x1EF5,
+	0x00590309: 0x1EF6,
+	0x00790309: 0x1EF7,
+	0x00590303: 0x1EF8,
+	0x00790303: 0x1EF9,
+	0x03B10313: 0x1F00,
+	0x03B10314: 0x1F01,
+	0x1F000300: 0x1F02,
+	0x1F010300: 0x1F03,
+	0x1F000301: 0x1F04,
+	0x1F010301: 0x1F05,
+	0x1F000342: 0x1F06,
+	0x1F010342: 0x1F07,
+	0x03910313: 0x1F08,
+	0x03910314: 0x1F09,
+	0x1F080300: 0x1F0A,
+	0x1F090300: 0x1F0B,
+	0x1F080301: 0x1F0C,
+	0x1F090301: 0x1F0D,
+	0x1F080342: 0x1F0E,
+	0x1F090342: 0x1F0F,
+	0x03B50313: 0x1F10,
+	0x03B50314: 0x1F11,
+	0x1F100300: 0x1F12,
+	0x1F110300: 0x1F13,
+	0x1F100301: 0x1F14,
+	0x1F110301: 0x1F15,
+	0x03950313: 0x1F18,
+	0x03950314: 0x1F19,
+	0x1F180300: 0x1F1A,
+	0x1F190300: 0x1F1B,
+	0x1F180301: 0x1F1C,
+	0x1F190301: 0x1F1D,
+	0x03B70313: 0x1F20,
+	0x03B70314: 0x1F21,
+	0x1F200300: 0x1F22,
+	0x1F210300: 0x1F23,
+	0x1F200301: 0x1F24,
+	0x1F210301: 0x1F25,
+	0x1F200342: 0x1F26,
+	0x1F210342: 0x1F27,
+	0x03970313: 0x1F28,
+	0x03970314: 0x1F29,
+	0x1F280300: 0x1F2A,
+	0x1F290300: 0x1F2B,
+	0x1F280301: 0x1F2C,
+	0x1F290301: 0x1F2D,
+	0x1F280342: 0x1F2E,
+	0x1F290342: 0x1F2F,
+	0x03B90313: 0x1F30,
+	0x03B90314: 0x1F31,
+	0x1F300300: 0x1F32,
+	0x1F310300: 0x1F33,
+	0x1F300301: 0x1F34,
+	0x1F310301: 0x1F35,
+	0x1F300342: 0x1F36,
+	0x1F310342: 0x1F37,
+	0x03990313: 0x1F38,
+	0x03990314: 0x1F39,
+	0x1F380300: 0x1F3A,
+	0x1F390300: 0x1F3B,
+	0x1F380301: 0x1F3C,
+	0x1F390301: 0x1F3D,
+	0x1F380342: 0x1F3E,
+	0x1F390342: 0x1F3F,
+	0x03BF0313: 0x1F40,
+	0x03BF0314: 0x1F41,
+	0x1F400300: 0x1F42,
+	0x1F410300: 0x1F43,
+	0x1F400301: 0x1F44,
+	0x1F410301: 0x1F45,
+	0x039F0313: 0x1F48,
+	0x039F0314: 0x1F49,
+	0x1F480300: 0x1F4A,
+	0x1F490300: 0x1F4B,
+	0x1F480301: 0x1F4C,
+	0x1F490301: 0x1F4D,
+	0x03C50313: 0x1F50,
+	0x03C50314: 0x1F51,
+	0x1F500300: 0x1F52,
+	0x1F510300: 0x1F53,
+	0x1F500301: 0x1F54,
+	0x1F510301: 0x1F55,
+	0x1F500342: 0x1F56,
+	0x1F510342: 0x1F57,
+	0x03A50314: 0x1F59,
+	0x1F590300: 0x1F5B,
+	0x1F590301: 0x1F5D,
+	0x1F590342: 0x1F5F,
+	0x03C90313: 0x1F60,
+	0x03C90314: 0x1F61,
+	0x1F600300: 0x1F62,
+	0x1F610300: 0x1F63,
+	0x1F600301: 0x1F64,
+	0x1F610301: 0x1F65,
+	0x1F600342: 0x1F66,
+	0x1F610342: 0x1F67,
+	0x03A90313: 0x1F68,
+	0x03A90314: 0x1F69,
+	0x1F680300: 0x1F6A,
+	0x1F690300: 0x1F6B,
+	0x1F680301: 0x1F6C,
+	0x1F690301: 0x1F6D,
+	0x1F680342: 0x1F6E,
+	0x1F690342: 0x1F6F,
+	0x03B10300: 0x1F70,
+	0x03B50300: 0x1F72,
+	0x03B70300: 0x1F74,
+	0x03B90300: 0x1F76,
+	0x03BF0300: 0x1F78,
+	0x03C50300: 0x1F7A,
+	0x03C90300: 0x1F7C,
+	0x1F000345: 0x1F80,
+	0x1F010345: 0x1F81,
+	0x1F020345: 0x1F82,
+	0x1F030345: 0x1F83,
+	0x1F040345: 0x1F84,
+	0x1F050345: 0x1F85,
+	0x1F060345: 0x1F86,
+	0x1F070345: 0x1F87,
+	0x1F080345: 0x1F88,
+	0x1F090345: 0x1F89,
+	0x1F0A0345: 0x1F8A,
+	0x1F0B0345: 0x1F8B,
+	0x1F0C0345: 0x1F8C,
+	0x1F0D0345: 0x1F8D,
+	0x1F0E0345: 0x1F8E,
+	0x1F0F0345: 0x1F8F,
+	0x1F200345: 0x1F90,
+	0x1F210345: 0x1F91,
+	0x1F220345: 0x1F92,
+	0x1F230345: 0x1F93,
+	0x1F240345: 0x1F94,
+	0x1F250345: 0x1F95,
+	0x1F260345: 0x1F96,
+	0x1F270345: 0x1F97,
+	0x1F280345: 0x1F98,
+	0x1F290345: 0x1F99,
+	0x1F2A0345: 0x1F9A,
+	0x1F2B0345: 0x1F9B,
+	0x1F2C0345: 0x1F9C,
+	0x1F2D0345: 0x1F9D,
+	0x1F2E0345: 0x1F9E,
+	0x1F2F0345: 0x1F9F,
+	0x1F600345: 0x1FA0,
+	0x1F610345: 0x1FA1,
+	0x1F620345: 0x1FA2,
+	0x1F630345: 0x1FA3,
+	0x1F640345: 0x1FA4,
+	0x1F650345: 0x1FA5,
+	0x1F660345: 0x1FA6,
+	0x1F670345: 0x1FA7,
+	0x1F680345: 0x1FA8,
+	0x1F690345: 0x1FA9,
+	0x1F6A0345: 0x1FAA,
+	0x1F6B0345: 0x1FAB,
+	0x1F6C0345: 0x1FAC,
+	0x1F6D0345: 0x1FAD,
+	0x1F6E0345: 0x1FAE,
+	0x1F6F0345: 0x1FAF,
+	0x03B10306: 0x1FB0,
+	0x03B10304: 0x1FB1,
+	0x1F700345: 0x1FB2,
+	0x03B10345: 0x1FB3,
+	0x03AC0345: 0x1FB4,
+	0x03B10342: 0x1FB6,
+	0x1FB60345: 0x1FB7,
+	0x03910306: 0x1FB8,
+	0x03910304: 0x1FB9,
+	0x03910300: 0x1FBA,
+	0x03910345: 0x1FBC,
+	0x00A80342: 0x1FC1,
+	0x1F740345: 0x1FC2,
+	0x03B70345: 0x1FC3,
+	0x03AE0345: 0x1FC4,
+	0x03B70342: 0x1FC6,
+	0x1FC60345: 0x1FC7,
+	0x03950300: 0x1FC8,
+	0x03970300: 0x1FCA,
+	0x03970345: 0x1FCC,
+	0x1FBF0300: 0x1FCD,
+	0x1FBF0301: 0x1FCE,
+	0x1FBF0342: 0x1FCF,
+	0x03B90306: 0x1FD0,
+	0x03B90304: 0x1FD1,
+	0x03CA0300: 0x1FD2,
+	0x03B90342: 0x1FD6,
+	0x03CA0342: 0x1FD7,
+	0x03990306: 0x1FD8,
+	0x03990304: 0x1FD9,
+	0x03990300: 0x1FDA,
+	0x1FFE0300: 0x1FDD,
+	0x1FFE0301: 0x1FDE,
+	0x1FFE0342: 0x1FDF,
+	0x03C50306: 0x1FE0,
+	0x03C50304: 0x1FE1,
+	0x03CB0300: 0x1FE2,
+	0x03C10313: 0x1FE4,
+	0x03C10314: 0x1FE5,
+	0x03C50342: 0x1FE6,
+	0x03CB0342: 0x1FE7,
+	0x03A50306: 0x1FE8,
+	0x03A50304: 0x1FE9,
+	0x03A50300: 0x1FEA,
+	0x03A10314: 0x1FEC,
+	0x00A80300: 0x1FED,
+	0x1F7C0345: 0x1FF2,
+	0x03C90345: 0x1FF3,
+	0x03CE0345: 0x1FF4,
+	0x03C90342: 0x1FF6,
+	0x1FF60345: 0x1FF7,
+	0x039F0300: 0x1FF8,
+	0x03A90300: 0x1FFA,
+	0x03A90345: 0x1FFC,
+	0x21900338: 0x219A,
+	0x21920338: 0x219B,
+	0x21940338: 0x21AE,
+	0x21D00338: 0x21CD,
+	0x21D40338: 0x21CE,
+	0x21D20338: 0x21CF,
+	0x22030338: 0x2204,
+	0x22080338: 0x2209,
+	0x220B0338: 0x220C,
+	0x22230338: 0x2224,
+	0x22250338: 0x2226,
+	0x223C0338: 0x2241,
+	0x22430338: 0x2244,
+	0x22450338: 0x2247,
+	0x22480338: 0x2249,
+	0x003D0338: 0x2260,
+	0x22610338: 0x2262,
+	0x224D0338: 0x226D,
+	0x003C0338: 0x226E,
+	0x003E0338: 0x226F,
+	0x22640338: 0x2270,
+	0x22650338: 0x2271,
+	0x22720338: 0x2274,
+	0x22730338: 0x2275,
+	0x22760338: 0x2278,
+	0x22770338: 0x2279,
+	0x227A0338: 0x2280,
+	0x227B0338: 0x2281,
+	0x22820338: 0x2284,
+	0x22830338: 0x2285,
+	0x22860338: 0x2288,
+	0x22870338: 0x2289,
+	0x22A20338: 0x22AC,
+	0x22A80338: 0x22AD,
+	0x22A90338: 0x22AE,
+	0x22AB0338: 0x22AF,
+	0x227C0338: 0x22E0,
+	0x227D0338: 0x22E1,
+	0x22910338: 0x22E2,
+	0x22920338: 0x22E3,
+	0x22B20338: 0x22EA,
+	0x22B30338: 0x22EB,
+	0x22B40338: 0x22EC,
+	0x22B50338: 0x22ED,
+	0x304B3099: 0x304C,
+	0x304D3099: 0x304E,
+	0x304F3099: 0x3050,
+	0x30513099: 0x3052,
+	0x30533099: 0x3054,
+	0x30553099: 0x3056,
+	0x30573099: 0x3058,
+	0x30593099: 0x305A,
+	0x305B3099: 0x305C,
+	0x305D3099: 0x305E,
+	0x305F3099: 0x3060,
+	0x30613099: 0x3062,
+	0x30643099: 0x3065,
+	0x30663099: 0x3067,
+	0x30683099: 0x3069,
+	0x306F3099: 0x3070,
+	0x306F309A: 0x3071,
+	0x30723099: 0x3073,
+	0x3072309A: 0x3074,
+	0x30753099: 0x3076,
+	0x3075309A: 0x3077,
+	0x30783099: 0x3079,
+	0x3078309A: 0x307A,
+	0x307B3099: 0x307C,
+	0x307B309A: 0x307D,
+	0x30463099: 0x3094,
+	0x309D3099: 0x309E,
+	0x30AB3099: 0x30AC,
+	0x30AD3099: 0x30AE,
+	0x30AF3099: 0x30B0,
+	0x30B13099: 0x30B2,
+	0x30B33099: 0x30B4,
+	0x30B53099: 0x30B6,
+	0x30B73099: 0x30B8,
+	0x30B93099: 0x30BA,
+	0x30BB3099: 0x30BC,
+	0x30BD3099: 0x30BE,
+	0x30BF3099: 0x30C0,
+	0x30C13099: 0x30C2,
+	0x30C43099: 0x30C5,
+	0x30C63099: 0x30C7,
+	0x30C83099: 0x30C9,
+	0x30CF3099: 0x30D0,
+	0x30CF309A: 0x30D1,
+	0x30D23099: 0x30D3,
+	0x30D2309A: 0x30D4,
+	0x30D53099: 0x30D6,
+	0x30D5309A: 0x30D7,
+	0x30D83099: 0x30D9,
+	0x30D8309A: 0x30DA,
+	0x30DB3099: 0x30DC,
+	0x30DB309A: 0x30DD,
+	0x30A63099: 0x30F4,
+	0x30EF3099: 0x30F7,
+	0x30F03099: 0x30F8,
+	0x30F13099: 0x30F9,
+	0x30F23099: 0x30FA,
+	0x30FD3099: 0x30FE,
+	0x109910BA: 0x1109A,
+	0x109B10BA: 0x1109C,
+	0x10A510BA: 0x110AB,
+	0x11311127: 0x1112E,
+	0x11321127: 0x1112F,
+	0x1347133E: 0x1134B,
+	0x13471357: 0x1134C,
+	0x14B914BA: 0x114BB,
+	0x14B914B0: 0x114BC,
+	0x14B914BD: 0x114BE,
+	0x15B815AF: 0x115BA,
+	0x15B915AF: 0x115BB,
+}
+
+// Total size of tables: 53KB (54006 bytes)
diff --git a/vendor/golang.org/x/text/width/gen.go b/vendor/golang.org/x/text/width/gen.go
index 03d9f99ad6..092277e1f6 100644
--- a/vendor/golang.org/x/text/width/gen.go
+++ b/vendor/golang.org/x/text/width/gen.go
@@ -69,7 +69,7 @@ func genTables() {
 
 	fmt.Fprintf(w, "// Total table size %d bytes (%dKiB)\n", sz, sz/1024)
 
-	gen.WriteGoFile(*outputFile, "width", w.Bytes())
+	gen.WriteVersionedGoFile(*outputFile, "width", w.Bytes())
 }
 
 const inverseDataComment = `
diff --git a/vendor/golang.org/x/text/width/tables.go b/vendor/golang.org/x/text/width/tables10.0.0.go
similarity index 99%
rename from vendor/golang.org/x/text/width/tables.go
rename to vendor/golang.org/x/text/width/tables10.0.0.go
index 710fd75254..f498862673 100644
--- a/vendor/golang.org/x/text/width/tables.go
+++ b/vendor/golang.org/x/text/width/tables10.0.0.go
@@ -1,5 +1,7 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
+// +build go1.10
+
 package width
 
 // UnicodeVersion is the Unicode version from which the tables in this package are derived.
diff --git a/vendor/golang.org/x/text/width/tables9.0.0.go b/vendor/golang.org/x/text/width/tables9.0.0.go
new file mode 100644
index 0000000000..7069e26345
--- /dev/null
+++ b/vendor/golang.org/x/text/width/tables9.0.0.go
@@ -0,0 +1,1286 @@
+// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
+
+// +build !go1.10
+
+package width
+
+// UnicodeVersion is the Unicode version from which the tables in this package are derived.
+const UnicodeVersion = "9.0.0"
+
+// lookup returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *widthTrie) lookup(s []byte) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return widthValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = widthIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *widthTrie) lookupUnsafe(s []byte) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return widthValues[c0]
+	}
+	i := widthIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// lookupString returns the trie value for the first UTF-8 encoding in s and
+// the width in bytes of this encoding. The size will be 0 if s does not
+// hold enough bytes to complete the encoding. len(s) must be greater than 0.
+func (t *widthTrie) lookupString(s string) (v uint16, sz int) {
+	c0 := s[0]
+	switch {
+	case c0 < 0x80: // is ASCII
+		return widthValues[c0], 1
+	case c0 < 0xC2:
+		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
+	case c0 < 0xE0: // 2-byte UTF-8
+		if len(s) < 2 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c1), 2
+	case c0 < 0xF0: // 3-byte UTF-8
+		if len(s) < 3 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c2), 3
+	case c0 < 0xF8: // 4-byte UTF-8
+		if len(s) < 4 {
+			return 0, 0
+		}
+		i := widthIndex[c0]
+		c1 := s[1]
+		if c1 < 0x80 || 0xC0 <= c1 {
+			return 0, 1 // Illegal UTF-8: not a continuation byte.
+		}
+		o := uint32(i)<<6 + uint32(c1)
+		i = widthIndex[o]
+		c2 := s[2]
+		if c2 < 0x80 || 0xC0 <= c2 {
+			return 0, 2 // Illegal UTF-8: not a continuation byte.
+		}
+		o = uint32(i)<<6 + uint32(c2)
+		i = widthIndex[o]
+		c3 := s[3]
+		if c3 < 0x80 || 0xC0 <= c3 {
+			return 0, 3 // Illegal UTF-8: not a continuation byte.
+		}
+		return t.lookupValue(uint32(i), c3), 4
+	}
+	// Illegal rune
+	return 0, 1
+}
+
+// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
+// s must start with a full and valid UTF-8 encoded rune.
+func (t *widthTrie) lookupStringUnsafe(s string) uint16 {
+	c0 := s[0]
+	if c0 < 0x80 { // is ASCII
+		return widthValues[c0]
+	}
+	i := widthIndex[c0]
+	if c0 < 0xE0 { // 2-byte UTF-8
+		return t.lookupValue(uint32(i), s[1])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[1])]
+	if c0 < 0xF0 { // 3-byte UTF-8
+		return t.lookupValue(uint32(i), s[2])
+	}
+	i = widthIndex[uint32(i)<<6+uint32(s[2])]
+	if c0 < 0xF8 { // 4-byte UTF-8
+		return t.lookupValue(uint32(i), s[3])
+	}
+	return 0
+}
+
+// widthTrie. Total size: 14080 bytes (13.75 KiB). Checksum: 3b8aeb3dc03667a3.
+type widthTrie struct{}
+
+func newWidthTrie(i int) *widthTrie {
+	return &widthTrie{}
+}
+
+// lookupValue determines the type of block n and looks up the value for b.
+func (t *widthTrie) lookupValue(n uint32, b byte) uint16 {
+	switch {
+	default:
+		return uint16(widthValues[n<<6+uint32(b)])
+	}
+}
+
+// widthValues: 99 blocks, 6336 entries, 12672 bytes
+// The third block is the zero block.
+var widthValues = [6336]uint16{
+	// Block 0x0, offset 0x0
+	0x20: 0x6001, 0x21: 0x6002, 0x22: 0x6002, 0x23: 0x6002,
+	0x24: 0x6002, 0x25: 0x6002, 0x26: 0x6002, 0x27: 0x6002, 0x28: 0x6002, 0x29: 0x6002,
+	0x2a: 0x6002, 0x2b: 0x6002, 0x2c: 0x6002, 0x2d: 0x6002, 0x2e: 0x6002, 0x2f: 0x6002,
+	0x30: 0x6002, 0x31: 0x6002, 0x32: 0x6002, 0x33: 0x6002, 0x34: 0x6002, 0x35: 0x6002,
+	0x36: 0x6002, 0x37: 0x6002, 0x38: 0x6002, 0x39: 0x6002, 0x3a: 0x6002, 0x3b: 0x6002,
+	0x3c: 0x6002, 0x3d: 0x6002, 0x3e: 0x6002, 0x3f: 0x6002,
+	// Block 0x1, offset 0x40
+	0x40: 0x6003, 0x41: 0x6003, 0x42: 0x6003, 0x43: 0x6003, 0x44: 0x6003, 0x45: 0x6003,
+	0x46: 0x6003, 0x47: 0x6003, 0x48: 0x6003, 0x49: 0x6003, 0x4a: 0x6003, 0x4b: 0x6003,
+	0x4c: 0x6003, 0x4d: 0x6003, 0x4e: 0x6003, 0x4f: 0x6003, 0x50: 0x6003, 0x51: 0x6003,
+	0x52: 0x6003, 0x53: 0x6003, 0x54: 0x6003, 0x55: 0x6003, 0x56: 0x6003, 0x57: 0x6003,
+	0x58: 0x6003, 0x59: 0x6003, 0x5a: 0x6003, 0x5b: 0x6003, 0x5c: 0x6003, 0x5d: 0x6003,
+	0x5e: 0x6003, 0x5f: 0x6003, 0x60: 0x6004, 0x61: 0x6004, 0x62: 0x6004, 0x63: 0x6004,
+	0x64: 0x6004, 0x65: 0x6004, 0x66: 0x6004, 0x67: 0x6004, 0x68: 0x6004, 0x69: 0x6004,
+	0x6a: 0x6004, 0x6b: 0x6004, 0x6c: 0x6004, 0x6d: 0x6004, 0x6e: 0x6004, 0x6f: 0x6004,
+	0x70: 0x6004, 0x71: 0x6004, 0x72: 0x6004, 0x73: 0x6004, 0x74: 0x6004, 0x75: 0x6004,
+	0x76: 0x6004, 0x77: 0x6004, 0x78: 0x6004, 0x79: 0x6004, 0x7a: 0x6004, 0x7b: 0x6004,
+	0x7c: 0x6004, 0x7d: 0x6004, 0x7e: 0x6004,
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xe1: 0x2000, 0xe2: 0x6005, 0xe3: 0x6005,
+	0xe4: 0x2000, 0xe5: 0x6006, 0xe6: 0x6005, 0xe7: 0x2000, 0xe8: 0x2000,
+	0xea: 0x2000, 0xec: 0x6007, 0xed: 0x2000, 0xee: 0x2000, 0xef: 0x6008,
+	0xf0: 0x2000, 0xf1: 0x2000, 0xf2: 0x2000, 0xf3: 0x2000, 0xf4: 0x2000,
+	0xf6: 0x2000, 0xf7: 0x2000, 0xf8: 0x2000, 0xf9: 0x2000, 0xfa: 0x2000,
+	0xfc: 0x2000, 0xfd: 0x2000, 0xfe: 0x2000, 0xff: 0x2000,
+	// Block 0x4, offset 0x100
+	0x106: 0x2000,
+	0x110: 0x2000,
+	0x117: 0x2000,
+	0x118: 0x2000,
+	0x11e: 0x2000, 0x11f: 0x2000, 0x120: 0x2000, 0x121: 0x2000,
+	0x126: 0x2000, 0x128: 0x2000, 0x129: 0x2000,
+	0x12a: 0x2000, 0x12c: 0x2000, 0x12d: 0x2000,
+	0x130: 0x2000, 0x132: 0x2000, 0x133: 0x2000,
+	0x137: 0x2000, 0x138: 0x2000, 0x139: 0x2000, 0x13a: 0x2000,
+	0x13c: 0x2000, 0x13e: 0x2000,
+	// Block 0x5, offset 0x140
+	0x141: 0x2000,
+	0x151: 0x2000,
+	0x153: 0x2000,
+	0x15b: 0x2000,
+	0x166: 0x2000, 0x167: 0x2000,
+	0x16b: 0x2000,
+	0x171: 0x2000, 0x172: 0x2000, 0x173: 0x2000,
+	0x178: 0x2000,
+	0x17f: 0x2000,
+	// Block 0x6, offset 0x180
+	0x180: 0x2000, 0x181: 0x2000, 0x182: 0x2000, 0x184: 0x2000,
+	0x188: 0x2000, 0x189: 0x2000, 0x18a: 0x2000, 0x18b: 0x2000,
+	0x18d: 0x2000,
+	0x192: 0x2000, 0x193: 0x2000,
+	0x1a6: 0x2000, 0x1a7: 0x2000,
+	0x1ab: 0x2000,
+	// Block 0x7, offset 0x1c0
+	0x1ce: 0x2000, 0x1d0: 0x2000,
+	0x1d2: 0x2000, 0x1d4: 0x2000, 0x1d6: 0x2000,
+	0x1d8: 0x2000, 0x1da: 0x2000, 0x1dc: 0x2000,
+	// Block 0x8, offset 0x200
+	0x211: 0x2000,
+	0x221: 0x2000,
+	// Block 0x9, offset 0x240
+	0x244: 0x2000,
+	0x247: 0x2000, 0x249: 0x2000, 0x24a: 0x2000, 0x24b: 0x2000,
+	0x24d: 0x2000, 0x250: 0x2000,
+	0x258: 0x2000, 0x259: 0x2000, 0x25a: 0x2000, 0x25b: 0x2000, 0x25d: 0x2000,
+	0x25f: 0x2000,
+	// Block 0xa, offset 0x280
+	0x280: 0x2000, 0x281: 0x2000, 0x282: 0x2000, 0x283: 0x2000, 0x284: 0x2000, 0x285: 0x2000,
+	0x286: 0x2000, 0x287: 0x2000, 0x288: 0x2000, 0x289: 0x2000, 0x28a: 0x2000, 0x28b: 0x2000,
+	0x28c: 0x2000, 0x28d: 0x2000, 0x28e: 0x2000, 0x28f: 0x2000, 0x290: 0x2000, 0x291: 0x2000,
+	0x292: 0x2000, 0x293: 0x2000, 0x294: 0x2000, 0x295: 0x2000, 0x296: 0x2000, 0x297: 0x2000,
+	0x298: 0x2000, 0x299: 0x2000, 0x29a: 0x2000, 0x29b: 0x2000, 0x29c: 0x2000, 0x29d: 0x2000,
+	0x29e: 0x2000, 0x29f: 0x2000, 0x2a0: 0x2000, 0x2a1: 0x2000, 0x2a2: 0x2000, 0x2a3: 0x2000,
+	0x2a4: 0x2000, 0x2a5: 0x2000, 0x2a6: 0x2000, 0x2a7: 0x2000, 0x2a8: 0x2000, 0x2a9: 0x2000,
+	0x2aa: 0x2000, 0x2ab: 0x2000, 0x2ac: 0x2000, 0x2ad: 0x2000, 0x2ae: 0x2000, 0x2af: 0x2000,
+	0x2b0: 0x2000, 0x2b1: 0x2000, 0x2b2: 0x2000, 0x2b3: 0x2000, 0x2b4: 0x2000, 0x2b5: 0x2000,
+	0x2b6: 0x2000, 0x2b7: 0x2000, 0x2b8: 0x2000, 0x2b9: 0x2000, 0x2ba: 0x2000, 0x2bb: 0x2000,
+	0x2bc: 0x2000, 0x2bd: 0x2000, 0x2be: 0x2000, 0x2bf: 0x2000,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x2000, 0x2c1: 0x2000, 0x2c2: 0x2000, 0x2c3: 0x2000, 0x2c4: 0x2000, 0x2c5: 0x2000,
+	0x2c6: 0x2000, 0x2c7: 0x2000, 0x2c8: 0x2000, 0x2c9: 0x2000, 0x2ca: 0x2000, 0x2cb: 0x2000,
+	0x2cc: 0x2000, 0x2cd: 0x2000, 0x2ce: 0x2000, 0x2cf: 0x2000, 0x2d0: 0x2000, 0x2d1: 0x2000,
+	0x2d2: 0x2000, 0x2d3: 0x2000, 0x2d4: 0x2000, 0x2d5: 0x2000, 0x2d6: 0x2000, 0x2d7: 0x2000,
+	0x2d8: 0x2000, 0x2d9: 0x2000, 0x2da: 0x2000, 0x2db: 0x2000, 0x2dc: 0x2000, 0x2dd: 0x2000,
+	0x2de: 0x2000, 0x2df: 0x2000, 0x2e0: 0x2000, 0x2e1: 0x2000, 0x2e2: 0x2000, 0x2e3: 0x2000,
+	0x2e4: 0x2000, 0x2e5: 0x2000, 0x2e6: 0x2000, 0x2e7: 0x2000, 0x2e8: 0x2000, 0x2e9: 0x2000,
+	0x2ea: 0x2000, 0x2eb: 0x2000, 0x2ec: 0x2000, 0x2ed: 0x2000, 0x2ee: 0x2000, 0x2ef: 0x2000,
+	// Block 0xc, offset 0x300
+	0x311: 0x2000,
+	0x312: 0x2000, 0x313: 0x2000, 0x314: 0x2000, 0x315: 0x2000, 0x316: 0x2000, 0x317: 0x2000,
+	0x318: 0x2000, 0x319: 0x2000, 0x31a: 0x2000, 0x31b: 0x2000, 0x31c: 0x2000, 0x31d: 0x2000,
+	0x31e: 0x2000, 0x31f: 0x2000, 0x320: 0x2000, 0x321: 0x2000, 0x323: 0x2000,
+	0x324: 0x2000, 0x325: 0x2000, 0x326: 0x2000, 0x327: 0x2000, 0x328: 0x2000, 0x329: 0x2000,
+	0x331: 0x2000, 0x332: 0x2000, 0x333: 0x2000, 0x334: 0x2000, 0x335: 0x2000,
+	0x336: 0x2000, 0x337: 0x2000, 0x338: 0x2000, 0x339: 0x2000, 0x33a: 0x2000, 0x33b: 0x2000,
+	0x33c: 0x2000, 0x33d: 0x2000, 0x33e: 0x2000, 0x33f: 0x2000,
+	// Block 0xd, offset 0x340
+	0x340: 0x2000, 0x341: 0x2000, 0x343: 0x2000, 0x344: 0x2000, 0x345: 0x2000,
+	0x346: 0x2000, 0x347: 0x2000, 0x348: 0x2000, 0x349: 0x2000,
+	// Block 0xe, offset 0x380
+	0x381: 0x2000,
+	0x390: 0x2000, 0x391: 0x2000,
+	0x392: 0x2000, 0x393: 0x2000, 0x394: 0x2000, 0x395: 0x2000, 0x396: 0x2000, 0x397: 0x2000,
+	0x398: 0x2000, 0x399: 0x2000, 0x39a: 0x2000, 0x39b: 0x2000, 0x39c: 0x2000, 0x39d: 0x2000,
+	0x39e: 0x2000, 0x39f: 0x2000, 0x3a0: 0x2000, 0x3a1: 0x2000, 0x3a2: 0x2000, 0x3a3: 0x2000,
+	0x3a4: 0x2000, 0x3a5: 0x2000, 0x3a6: 0x2000, 0x3a7: 0x2000, 0x3a8: 0x2000, 0x3a9: 0x2000,
+	0x3aa: 0x2000, 0x3ab: 0x2000, 0x3ac: 0x2000, 0x3ad: 0x2000, 0x3ae: 0x2000, 0x3af: 0x2000,
+	0x3b0: 0x2000, 0x3b1: 0x2000, 0x3b2: 0x2000, 0x3b3: 0x2000, 0x3b4: 0x2000, 0x3b5: 0x2000,
+	0x3b6: 0x2000, 0x3b7: 0x2000, 0x3b8: 0x2000, 0x3b9: 0x2000, 0x3ba: 0x2000, 0x3bb: 0x2000,
+	0x3bc: 0x2000, 0x3bd: 0x2000, 0x3be: 0x2000, 0x3bf: 0x2000,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x2000, 0x3c1: 0x2000, 0x3c2: 0x2000, 0x3c3: 0x2000, 0x3c4: 0x2000, 0x3c5: 0x2000,
+	0x3c6: 0x2000, 0x3c7: 0x2000, 0x3c8: 0x2000, 0x3c9: 0x2000, 0x3ca: 0x2000, 0x3cb: 0x2000,
+	0x3cc: 0x2000, 0x3cd: 0x2000, 0x3ce: 0x2000, 0x3cf: 0x2000, 0x3d1: 0x2000,
+	// Block 0x10, offset 0x400
+	0x400: 0x4000, 0x401: 0x4000, 0x402: 0x4000, 0x403: 0x4000, 0x404: 0x4000, 0x405: 0x4000,
+	0x406: 0x4000, 0x407: 0x4000, 0x408: 0x4000, 0x409: 0x4000, 0x40a: 0x4000, 0x40b: 0x4000,
+	0x40c: 0x4000, 0x40d: 0x4000, 0x40e: 0x4000, 0x40f: 0x4000, 0x410: 0x4000, 0x411: 0x4000,
+	0x412: 0x4000, 0x413: 0x4000, 0x414: 0x4000, 0x415: 0x4000, 0x416: 0x4000, 0x417: 0x4000,
+	0x418: 0x4000, 0x419: 0x4000, 0x41a: 0x4000, 0x41b: 0x4000, 0x41c: 0x4000, 0x41d: 0x4000,
+	0x41e: 0x4000, 0x41f: 0x4000, 0x420: 0x4000, 0x421: 0x4000, 0x422: 0x4000, 0x423: 0x4000,
+	0x424: 0x4000, 0x425: 0x4000, 0x426: 0x4000, 0x427: 0x4000, 0x428: 0x4000, 0x429: 0x4000,
+	0x42a: 0x4000, 0x42b: 0x4000, 0x42c: 0x4000, 0x42d: 0x4000, 0x42e: 0x4000, 0x42f: 0x4000,
+	0x430: 0x4000, 0x431: 0x4000, 0x432: 0x4000, 0x433: 0x4000, 0x434: 0x4000, 0x435: 0x4000,
+	0x436: 0x4000, 0x437: 0x4000, 0x438: 0x4000, 0x439: 0x4000, 0x43a: 0x4000, 0x43b: 0x4000,
+	0x43c: 0x4000, 0x43d: 0x4000, 0x43e: 0x4000, 0x43f: 0x4000,
+	// Block 0x11, offset 0x440
+	0x440: 0x4000, 0x441: 0x4000, 0x442: 0x4000, 0x443: 0x4000, 0x444: 0x4000, 0x445: 0x4000,
+	0x446: 0x4000, 0x447: 0x4000, 0x448: 0x4000, 0x449: 0x4000, 0x44a: 0x4000, 0x44b: 0x4000,
+	0x44c: 0x4000, 0x44d: 0x4000, 0x44e: 0x4000, 0x44f: 0x4000, 0x450: 0x4000, 0x451: 0x4000,
+	0x452: 0x4000, 0x453: 0x4000, 0x454: 0x4000, 0x455: 0x4000, 0x456: 0x4000, 0x457: 0x4000,
+	0x458: 0x4000, 0x459: 0x4000, 0x45a: 0x4000, 0x45b: 0x4000, 0x45c: 0x4000, 0x45d: 0x4000,
+	0x45e: 0x4000, 0x45f: 0x4000,
+	// Block 0x12, offset 0x480
+	0x490: 0x2000,
+	0x493: 0x2000, 0x494: 0x2000, 0x495: 0x2000, 0x496: 0x2000,
+	0x498: 0x2000, 0x499: 0x2000, 0x49c: 0x2000, 0x49d: 0x2000,
+	0x4a0: 0x2000, 0x4a1: 0x2000, 0x4a2: 0x2000,
+	0x4a4: 0x2000, 0x4a5: 0x2000, 0x4a6: 0x2000, 0x4a7: 0x2000,
+	0x4b0: 0x2000, 0x4b2: 0x2000, 0x4b3: 0x2000, 0x4b5: 0x2000,
+	0x4bb: 0x2000,
+	0x4be: 0x2000,
+	// Block 0x13, offset 0x4c0
+	0x4f4: 0x2000,
+	0x4ff: 0x2000,
+	// Block 0x14, offset 0x500
+	0x501: 0x2000, 0x502: 0x2000, 0x503: 0x2000, 0x504: 0x2000,
+	0x529: 0xa009,
+	0x52c: 0x2000,
+	// Block 0x15, offset 0x540
+	0x543: 0x2000, 0x545: 0x2000,
+	0x549: 0x2000,
+	0x553: 0x2000, 0x556: 0x2000,
+	0x561: 0x2000, 0x562: 0x2000,
+	0x566: 0x2000,
+	0x56b: 0x2000,
+	// Block 0x16, offset 0x580
+	0x593: 0x2000, 0x594: 0x2000,
+	0x59b: 0x2000, 0x59c: 0x2000, 0x59d: 0x2000,
+	0x59e: 0x2000, 0x5a0: 0x2000, 0x5a1: 0x2000, 0x5a2: 0x2000, 0x5a3: 0x2000,
+	0x5a4: 0x2000, 0x5a5: 0x2000, 0x5a6: 0x2000, 0x5a7: 0x2000, 0x5a8: 0x2000, 0x5a9: 0x2000,
+	0x5aa: 0x2000, 0x5ab: 0x2000,
+	0x5b0: 0x2000, 0x5b1: 0x2000, 0x5b2: 0x2000, 0x5b3: 0x2000, 0x5b4: 0x2000, 0x5b5: 0x2000,
+	0x5b6: 0x2000, 0x5b7: 0x2000, 0x5b8: 0x2000, 0x5b9: 0x2000,
+	// Block 0x17, offset 0x5c0
+	0x5c9: 0x2000,
+	0x5d0: 0x200a, 0x5d1: 0x200b,
+	0x5d2: 0x200a, 0x5d3: 0x200c, 0x5d4: 0x2000, 0x5d5: 0x2000, 0x5d6: 0x2000, 0x5d7: 0x2000,
+	0x5d8: 0x2000, 0x5d9: 0x2000,
+	0x5f8: 0x2000, 0x5f9: 0x2000,
+	// Block 0x18, offset 0x600
+	0x612: 0x2000, 0x614: 0x2000,
+	0x627: 0x2000,
+	// Block 0x19, offset 0x640
+	0x640: 0x2000, 0x642: 0x2000, 0x643: 0x2000,
+	0x647: 0x2000, 0x648: 0x2000, 0x64b: 0x2000,
+	0x64f: 0x2000, 0x651: 0x2000,
+	0x655: 0x2000,
+	0x65a: 0x2000, 0x65d: 0x2000,
+	0x65e: 0x2000, 0x65f: 0x2000, 0x660: 0x2000, 0x663: 0x2000,
+	0x665: 0x2000, 0x667: 0x2000, 0x668: 0x2000, 0x669: 0x2000,
+	0x66a: 0x2000, 0x66b: 0x2000, 0x66c: 0x2000, 0x66e: 0x2000,
+	0x674: 0x2000, 0x675: 0x2000,
+	0x676: 0x2000, 0x677: 0x2000,
+	0x67c: 0x2000, 0x67d: 0x2000,
+	// Block 0x1a, offset 0x680
+	0x688: 0x2000,
+	0x68c: 0x2000,
+	0x692: 0x2000,
+	0x6a0: 0x2000, 0x6a1: 0x2000,
+	0x6a4: 0x2000, 0x6a5: 0x2000, 0x6a6: 0x2000, 0x6a7: 0x2000,
+	0x6aa: 0x2000, 0x6ab: 0x2000, 0x6ae: 0x2000, 0x6af: 0x2000,
+	// Block 0x1b, offset 0x6c0
+	0x6c2: 0x2000, 0x6c3: 0x2000,
+	0x6c6: 0x2000, 0x6c7: 0x2000,
+	0x6d5: 0x2000,
+	0x6d9: 0x2000,
+	0x6e5: 0x2000,
+	0x6ff: 0x2000,
+	// Block 0x1c, offset 0x700
+	0x712: 0x2000,
+	0x71a: 0x4000, 0x71b: 0x4000,
+	0x729: 0x4000,
+	0x72a: 0x4000,
+	// Block 0x1d, offset 0x740
+	0x769: 0x4000,
+	0x76a: 0x4000, 0x76b: 0x4000, 0x76c: 0x4000,
+	0x770: 0x4000, 0x773: 0x4000,
+	// Block 0x1e, offset 0x780
+	0x7a0: 0x2000, 0x7a1: 0x2000, 0x7a2: 0x2000, 0x7a3: 0x2000,
+	0x7a4: 0x2000, 0x7a5: 0x2000, 0x7a6: 0x2000, 0x7a7: 0x2000, 0x7a8: 0x2000, 0x7a9: 0x2000,
+	0x7aa: 0x2000, 0x7ab: 0x2000, 0x7ac: 0x2000, 0x7ad: 0x2000, 0x7ae: 0x2000, 0x7af: 0x2000,
+	0x7b0: 0x2000, 0x7b1: 0x2000, 0x7b2: 0x2000, 0x7b3: 0x2000, 0x7b4: 0x2000, 0x7b5: 0x2000,
+	0x7b6: 0x2000, 0x7b7: 0x2000, 0x7b8: 0x2000, 0x7b9: 0x2000, 0x7ba: 0x2000, 0x7bb: 0x2000,
+	0x7bc: 0x2000, 0x7bd: 0x2000, 0x7be: 0x2000, 0x7bf: 0x2000,
+	// Block 0x1f, offset 0x7c0
+	0x7c0: 0x2000, 0x7c1: 0x2000, 0x7c2: 0x2000, 0x7c3: 0x2000, 0x7c4: 0x2000, 0x7c5: 0x2000,
+	0x7c6: 0x2000, 0x7c7: 0x2000, 0x7c8: 0x2000, 0x7c9: 0x2000, 0x7ca: 0x2000, 0x7cb: 0x2000,
+	0x7cc: 0x2000, 0x7cd: 0x2000, 0x7ce: 0x2000, 0x7cf: 0x2000, 0x7d0: 0x2000, 0x7d1: 0x2000,
+	0x7d2: 0x2000, 0x7d3: 0x2000, 0x7d4: 0x2000, 0x7d5: 0x2000, 0x7d6: 0x2000, 0x7d7: 0x2000,
+	0x7d8: 0x2000, 0x7d9: 0x2000, 0x7da: 0x2000, 0x7db: 0x2000, 0x7dc: 0x2000, 0x7dd: 0x2000,
+	0x7de: 0x2000, 0x7df: 0x2000, 0x7e0: 0x2000, 0x7e1: 0x2000, 0x7e2: 0x2000, 0x7e3: 0x2000,
+	0x7e4: 0x2000, 0x7e5: 0x2000, 0x7e6: 0x2000, 0x7e7: 0x2000, 0x7e8: 0x2000, 0x7e9: 0x2000,
+	0x7eb: 0x2000, 0x7ec: 0x2000, 0x7ed: 0x2000, 0x7ee: 0x2000, 0x7ef: 0x2000,
+	0x7f0: 0x2000, 0x7f1: 0x2000, 0x7f2: 0x2000, 0x7f3: 0x2000, 0x7f4: 0x2000, 0x7f5: 0x2000,
+	0x7f6: 0x2000, 0x7f7: 0x2000, 0x7f8: 0x2000, 0x7f9: 0x2000, 0x7fa: 0x2000, 0x7fb: 0x2000,
+	0x7fc: 0x2000, 0x7fd: 0x2000, 0x7fe: 0x2000, 0x7ff: 0x2000,
+	// Block 0x20, offset 0x800
+	0x800: 0x2000, 0x801: 0x2000, 0x802: 0x200d, 0x803: 0x2000, 0x804: 0x2000, 0x805: 0x2000,
+	0x806: 0x2000, 0x807: 0x2000, 0x808: 0x2000, 0x809: 0x2000, 0x80a: 0x2000, 0x80b: 0x2000,
+	0x80c: 0x2000, 0x80d: 0x2000, 0x80e: 0x2000, 0x80f: 0x2000, 0x810: 0x2000, 0x811: 0x2000,
+	0x812: 0x2000, 0x813: 0x2000, 0x814: 0x2000, 0x815: 0x2000, 0x816: 0x2000, 0x817: 0x2000,
+	0x818: 0x2000, 0x819: 0x2000, 0x81a: 0x2000, 0x81b: 0x2000, 0x81c: 0x2000, 0x81d: 0x2000,
+	0x81e: 0x2000, 0x81f: 0x2000, 0x820: 0x2000, 0x821: 0x2000, 0x822: 0x2000, 0x823: 0x2000,
+	0x824: 0x2000, 0x825: 0x2000, 0x826: 0x2000, 0x827: 0x2000, 0x828: 0x2000, 0x829: 0x2000,
+	0x82a: 0x2000, 0x82b: 0x2000, 0x82c: 0x2000, 0x82d: 0x2000, 0x82e: 0x2000, 0x82f: 0x2000,
+	0x830: 0x2000, 0x831: 0x2000, 0x832: 0x2000, 0x833: 0x2000, 0x834: 0x2000, 0x835: 0x2000,
+	0x836: 0x2000, 0x837: 0x2000, 0x838: 0x2000, 0x839: 0x2000, 0x83a: 0x2000, 0x83b: 0x2000,
+	0x83c: 0x2000, 0x83d: 0x2000, 0x83e: 0x2000, 0x83f: 0x2000,
+	// Block 0x21, offset 0x840
+	0x840: 0x2000, 0x841: 0x2000, 0x842: 0x2000, 0x843: 0x2000, 0x844: 0x2000, 0x845: 0x2000,
+	0x846: 0x2000, 0x847: 0x2000, 0x848: 0x2000, 0x849: 0x2000, 0x84a: 0x2000, 0x84b: 0x2000,
+	0x850: 0x2000, 0x851: 0x2000,
+	0x852: 0x2000, 0x853: 0x2000, 0x854: 0x2000, 0x855: 0x2000, 0x856: 0x2000, 0x857: 0x2000,
+	0x858: 0x2000, 0x859: 0x2000, 0x85a: 0x2000, 0x85b: 0x2000, 0x85c: 0x2000, 0x85d: 0x2000,
+	0x85e: 0x2000, 0x85f: 0x2000, 0x860: 0x2000, 0x861: 0x2000, 0x862: 0x2000, 0x863: 0x2000,
+	0x864: 0x2000, 0x865: 0x2000, 0x866: 0x2000, 0x867: 0x2000, 0x868: 0x2000, 0x869: 0x2000,
+	0x86a: 0x2000, 0x86b: 0x2000, 0x86c: 0x2000, 0x86d: 0x2000, 0x86e: 0x2000, 0x86f: 0x2000,
+	0x870: 0x2000, 0x871: 0x2000, 0x872: 0x2000, 0x873: 0x2000,
+	// Block 0x22, offset 0x880
+	0x880: 0x2000, 0x881: 0x2000, 0x882: 0x2000, 0x883: 0x2000, 0x884: 0x2000, 0x885: 0x2000,
+	0x886: 0x2000, 0x887: 0x2000, 0x888: 0x2000, 0x889: 0x2000, 0x88a: 0x2000, 0x88b: 0x2000,
+	0x88c: 0x2000, 0x88d: 0x2000, 0x88e: 0x2000, 0x88f: 0x2000,
+	0x892: 0x2000, 0x893: 0x2000, 0x894: 0x2000, 0x895: 0x2000,
+	0x8a0: 0x200e, 0x8a1: 0x2000, 0x8a3: 0x2000,
+	0x8a4: 0x2000, 0x8a5: 0x2000, 0x8a6: 0x2000, 0x8a7: 0x2000, 0x8a8: 0x2000, 0x8a9: 0x2000,
+	0x8b2: 0x2000, 0x8b3: 0x2000,
+	0x8b6: 0x2000, 0x8b7: 0x2000,
+	0x8bc: 0x2000, 0x8bd: 0x2000,
+	// Block 0x23, offset 0x8c0
+	0x8c0: 0x2000, 0x8c1: 0x2000,
+	0x8c6: 0x2000, 0x8c7: 0x2000, 0x8c8: 0x2000, 0x8cb: 0x200f,
+	0x8ce: 0x2000, 0x8cf: 0x2000, 0x8d0: 0x2000, 0x8d1: 0x2000,
+	0x8e2: 0x2000, 0x8e3: 0x2000,
+	0x8e4: 0x2000, 0x8e5: 0x2000,
+	0x8ef: 0x2000,
+	0x8fd: 0x4000, 0x8fe: 0x4000,
+	// Block 0x24, offset 0x900
+	0x905: 0x2000,
+	0x906: 0x2000, 0x909: 0x2000,
+	0x90e: 0x2000, 0x90f: 0x2000,
+	0x914: 0x4000, 0x915: 0x4000,
+	0x91c: 0x2000,
+	0x91e: 0x2000,
+	// Block 0x25, offset 0x940
+	0x940: 0x2000, 0x942: 0x2000,
+	0x948: 0x4000, 0x949: 0x4000, 0x94a: 0x4000, 0x94b: 0x4000,
+	0x94c: 0x4000, 0x94d: 0x4000, 0x94e: 0x4000, 0x94f: 0x4000, 0x950: 0x4000, 0x951: 0x4000,
+	0x952: 0x4000, 0x953: 0x4000,
+	0x960: 0x2000, 0x961: 0x2000, 0x963: 0x2000,
+	0x964: 0x2000, 0x965: 0x2000, 0x967: 0x2000, 0x968: 0x2000, 0x969: 0x2000,
+	0x96a: 0x2000, 0x96c: 0x2000, 0x96d: 0x2000, 0x96f: 0x2000,
+	0x97f: 0x4000,
+	// Block 0x26, offset 0x980
+	0x993: 0x4000,
+	0x99e: 0x2000, 0x99f: 0x2000, 0x9a1: 0x4000,
+	0x9aa: 0x4000, 0x9ab: 0x4000,
+	0x9bd: 0x4000, 0x9be: 0x4000, 0x9bf: 0x2000,
+	// Block 0x27, offset 0x9c0
+	0x9c4: 0x4000, 0x9c5: 0x4000,
+	0x9c6: 0x2000, 0x9c7: 0x2000, 0x9c8: 0x2000, 0x9c9: 0x2000, 0x9ca: 0x2000, 0x9cb: 0x2000,
+	0x9cc: 0x2000, 0x9cd: 0x2000, 0x9ce: 0x4000, 0x9cf: 0x2000, 0x9d0: 0x2000, 0x9d1: 0x2000,
+	0x9d2: 0x2000, 0x9d3: 0x2000, 0x9d4: 0x4000, 0x9d5: 0x2000, 0x9d6: 0x2000, 0x9d7: 0x2000,
+	0x9d8: 0x2000, 0x9d9: 0x2000, 0x9da: 0x2000, 0x9db: 0x2000, 0x9dc: 0x2000, 0x9dd: 0x2000,
+	0x9de: 0x2000, 0x9df: 0x2000, 0x9e0: 0x2000, 0x9e1: 0x2000, 0x9e3: 0x2000,
+	0x9e8: 0x2000, 0x9e9: 0x2000,
+	0x9ea: 0x4000, 0x9eb: 0x2000, 0x9ec: 0x2000, 0x9ed: 0x2000, 0x9ee: 0x2000, 0x9ef: 0x2000,
+	0x9f0: 0x2000, 0x9f1: 0x2000, 0x9f2: 0x4000, 0x9f3: 0x4000, 0x9f4: 0x2000, 0x9f5: 0x4000,
+	0x9f6: 0x2000, 0x9f7: 0x2000, 0x9f8: 0x2000, 0x9f9: 0x2000, 0x9fa: 0x4000, 0x9fb: 0x2000,
+	0x9fc: 0x2000, 0x9fd: 0x4000, 0x9fe: 0x2000, 0x9ff: 0x2000,
+	// Block 0x28, offset 0xa00
+	0xa05: 0x4000,
+	0xa0a: 0x4000, 0xa0b: 0x4000,
+	0xa28: 0x4000,
+	0xa3d: 0x2000,
+	// Block 0x29, offset 0xa40
+	0xa4c: 0x4000, 0xa4e: 0x4000,
+	0xa53: 0x4000, 0xa54: 0x4000, 0xa55: 0x4000, 0xa57: 0x4000,
+	0xa76: 0x2000, 0xa77: 0x2000, 0xa78: 0x2000, 0xa79: 0x2000, 0xa7a: 0x2000, 0xa7b: 0x2000,
+	0xa7c: 0x2000, 0xa7d: 0x2000, 0xa7e: 0x2000, 0xa7f: 0x2000,
+	// Block 0x2a, offset 0xa80
+	0xa95: 0x4000, 0xa96: 0x4000, 0xa97: 0x4000,
+	0xab0: 0x4000,
+	0xabf: 0x4000,
+	// Block 0x2b, offset 0xac0
+	0xae6: 0x6000, 0xae7: 0x6000, 0xae8: 0x6000, 0xae9: 0x6000,
+	0xaea: 0x6000, 0xaeb: 0x6000, 0xaec: 0x6000, 0xaed: 0x6000,
+	// Block 0x2c, offset 0xb00
+	0xb05: 0x6010,
+	0xb06: 0x6011,
+	// Block 0x2d, offset 0xb40
+	0xb5b: 0x4000, 0xb5c: 0x4000,
+	// Block 0x2e, offset 0xb80
+	0xb90: 0x4000,
+	0xb95: 0x4000, 0xb96: 0x2000, 0xb97: 0x2000,
+	0xb98: 0x2000, 0xb99: 0x2000,
+	// Block 0x2f, offset 0xbc0
+	0xbc0: 0x4000, 0xbc1: 0x4000, 0xbc2: 0x4000, 0xbc3: 0x4000, 0xbc4: 0x4000, 0xbc5: 0x4000,
+	0xbc6: 0x4000, 0xbc7: 0x4000, 0xbc8: 0x4000, 0xbc9: 0x4000, 0xbca: 0x4000, 0xbcb: 0x4000,
+	0xbcc: 0x4000, 0xbcd: 0x4000, 0xbce: 0x4000, 0xbcf: 0x4000, 0xbd0: 0x4000, 0xbd1: 0x4000,
+	0xbd2: 0x4000, 0xbd3: 0x4000, 0xbd4: 0x4000, 0xbd5: 0x4000, 0xbd6: 0x4000, 0xbd7: 0x4000,
+	0xbd8: 0x4000, 0xbd9: 0x4000, 0xbdb: 0x4000, 0xbdc: 0x4000, 0xbdd: 0x4000,
+	0xbde: 0x4000, 0xbdf: 0x4000, 0xbe0: 0x4000, 0xbe1: 0x4000, 0xbe2: 0x4000, 0xbe3: 0x4000,
+	0xbe4: 0x4000, 0xbe5: 0x4000, 0xbe6: 0x4000, 0xbe7: 0x4000, 0xbe8: 0x4000, 0xbe9: 0x4000,
+	0xbea: 0x4000, 0xbeb: 0x4000, 0xbec: 0x4000, 0xbed: 0x4000, 0xbee: 0x4000, 0xbef: 0x4000,
+	0xbf0: 0x4000, 0xbf1: 0x4000, 0xbf2: 0x4000, 0xbf3: 0x4000, 0xbf4: 0x4000, 0xbf5: 0x4000,
+	0xbf6: 0x4000, 0xbf7: 0x4000, 0xbf8: 0x4000, 0xbf9: 0x4000, 0xbfa: 0x4000, 0xbfb: 0x4000,
+	0xbfc: 0x4000, 0xbfd: 0x4000, 0xbfe: 0x4000, 0xbff: 0x4000,
+	// Block 0x30, offset 0xc00
+	0xc00: 0x4000, 0xc01: 0x4000, 0xc02: 0x4000, 0xc03: 0x4000, 0xc04: 0x4000, 0xc05: 0x4000,
+	0xc06: 0x4000, 0xc07: 0x4000, 0xc08: 0x4000, 0xc09: 0x4000, 0xc0a: 0x4000, 0xc0b: 0x4000,
+	0xc0c: 0x4000, 0xc0d: 0x4000, 0xc0e: 0x4000, 0xc0f: 0x4000, 0xc10: 0x4000, 0xc11: 0x4000,
+	0xc12: 0x4000, 0xc13: 0x4000, 0xc14: 0x4000, 0xc15: 0x4000, 0xc16: 0x4000, 0xc17: 0x4000,
+	0xc18: 0x4000, 0xc19: 0x4000, 0xc1a: 0x4000, 0xc1b: 0x4000, 0xc1c: 0x4000, 0xc1d: 0x4000,
+	0xc1e: 0x4000, 0xc1f: 0x4000, 0xc20: 0x4000, 0xc21: 0x4000, 0xc22: 0x4000, 0xc23: 0x4000,
+	0xc24: 0x4000, 0xc25: 0x4000, 0xc26: 0x4000, 0xc27: 0x4000, 0xc28: 0x4000, 0xc29: 0x4000,
+	0xc2a: 0x4000, 0xc2b: 0x4000, 0xc2c: 0x4000, 0xc2d: 0x4000, 0xc2e: 0x4000, 0xc2f: 0x4000,
+	0xc30: 0x4000, 0xc31: 0x4000, 0xc32: 0x4000, 0xc33: 0x4000,
+	// Block 0x31, offset 0xc40
+	0xc40: 0x4000, 0xc41: 0x4000, 0xc42: 0x4000, 0xc43: 0x4000, 0xc44: 0x4000, 0xc45: 0x4000,
+	0xc46: 0x4000, 0xc47: 0x4000, 0xc48: 0x4000, 0xc49: 0x4000, 0xc4a: 0x4000, 0xc4b: 0x4000,
+	0xc4c: 0x4000, 0xc4d: 0x4000, 0xc4e: 0x4000, 0xc4f: 0x4000, 0xc50: 0x4000, 0xc51: 0x4000,
+	0xc52: 0x4000, 0xc53: 0x4000, 0xc54: 0x4000, 0xc55: 0x4000,
+	0xc70: 0x4000, 0xc71: 0x4000, 0xc72: 0x4000, 0xc73: 0x4000, 0xc74: 0x4000, 0xc75: 0x4000,
+	0xc76: 0x4000, 0xc77: 0x4000, 0xc78: 0x4000, 0xc79: 0x4000, 0xc7a: 0x4000, 0xc7b: 0x4000,
+	// Block 0x32, offset 0xc80
+	0xc80: 0x9012, 0xc81: 0x4013, 0xc82: 0x4014, 0xc83: 0x4000, 0xc84: 0x4000, 0xc85: 0x4000,
+	0xc86: 0x4000, 0xc87: 0x4000, 0xc88: 0x4000, 0xc89: 0x4000, 0xc8a: 0x4000, 0xc8b: 0x4000,
+	0xc8c: 0x4015, 0xc8d: 0x4015, 0xc8e: 0x4000, 0xc8f: 0x4000, 0xc90: 0x4000, 0xc91: 0x4000,
+	0xc92: 0x4000, 0xc93: 0x4000, 0xc94: 0x4000, 0xc95: 0x4000, 0xc96: 0x4000, 0xc97: 0x4000,
+	0xc98: 0x4000, 0xc99: 0x4000, 0xc9a: 0x4000, 0xc9b: 0x4000, 0xc9c: 0x4000, 0xc9d: 0x4000,
+	0xc9e: 0x4000, 0xc9f: 0x4000, 0xca0: 0x4000, 0xca1: 0x4000, 0xca2: 0x4000, 0xca3: 0x4000,
+	0xca4: 0x4000, 0xca5: 0x4000, 0xca6: 0x4000, 0xca7: 0x4000, 0xca8: 0x4000, 0xca9: 0x4000,
+	0xcaa: 0x4000, 0xcab: 0x4000, 0xcac: 0x4000, 0xcad: 0x4000, 0xcae: 0x4000, 0xcaf: 0x4000,
+	0xcb0: 0x4000, 0xcb1: 0x4000, 0xcb2: 0x4000, 0xcb3: 0x4000, 0xcb4: 0x4000, 0xcb5: 0x4000,
+	0xcb6: 0x4000, 0xcb7: 0x4000, 0xcb8: 0x4000, 0xcb9: 0x4000, 0xcba: 0x4000, 0xcbb: 0x4000,
+	0xcbc: 0x4000, 0xcbd: 0x4000, 0xcbe: 0x4000,
+	// Block 0x33, offset 0xcc0
+	0xcc1: 0x4000, 0xcc2: 0x4000, 0xcc3: 0x4000, 0xcc4: 0x4000, 0xcc5: 0x4000,
+	0xcc6: 0x4000, 0xcc7: 0x4000, 0xcc8: 0x4000, 0xcc9: 0x4000, 0xcca: 0x4000, 0xccb: 0x4000,
+	0xccc: 0x4000, 0xccd: 0x4000, 0xcce: 0x4000, 0xccf: 0x4000, 0xcd0: 0x4000, 0xcd1: 0x4000,
+	0xcd2: 0x4000, 0xcd3: 0x4000, 0xcd4: 0x4000, 0xcd5: 0x4000, 0xcd6: 0x4000, 0xcd7: 0x4000,
+	0xcd8: 0x4000, 0xcd9: 0x4000, 0xcda: 0x4000, 0xcdb: 0x4000, 0xcdc: 0x4000, 0xcdd: 0x4000,
+	0xcde: 0x4000, 0xcdf: 0x4000, 0xce0: 0x4000, 0xce1: 0x4000, 0xce2: 0x4000, 0xce3: 0x4000,
+	0xce4: 0x4000, 0xce5: 0x4000, 0xce6: 0x4000, 0xce7: 0x4000, 0xce8: 0x4000, 0xce9: 0x4000,
+	0xcea: 0x4000, 0xceb: 0x4000, 0xcec: 0x4000, 0xced: 0x4000, 0xcee: 0x4000, 0xcef: 0x4000,
+	0xcf0: 0x4000, 0xcf1: 0x4000, 0xcf2: 0x4000, 0xcf3: 0x4000, 0xcf4: 0x4000, 0xcf5: 0x4000,
+	0xcf6: 0x4000, 0xcf7: 0x4000, 0xcf8: 0x4000, 0xcf9: 0x4000, 0xcfa: 0x4000, 0xcfb: 0x4000,
+	0xcfc: 0x4000, 0xcfd: 0x4000, 0xcfe: 0x4000, 0xcff: 0x4000,
+	// Block 0x34, offset 0xd00
+	0xd00: 0x4000, 0xd01: 0x4000, 0xd02: 0x4000, 0xd03: 0x4000, 0xd04: 0x4000, 0xd05: 0x4000,
+	0xd06: 0x4000, 0xd07: 0x4000, 0xd08: 0x4000, 0xd09: 0x4000, 0xd0a: 0x4000, 0xd0b: 0x4000,
+	0xd0c: 0x4000, 0xd0d: 0x4000, 0xd0e: 0x4000, 0xd0f: 0x4000, 0xd10: 0x4000, 0xd11: 0x4000,
+	0xd12: 0x4000, 0xd13: 0x4000, 0xd14: 0x4000, 0xd15: 0x4000, 0xd16: 0x4000,
+	0xd19: 0x4016, 0xd1a: 0x4017, 0xd1b: 0x4000, 0xd1c: 0x4000, 0xd1d: 0x4000,
+	0xd1e: 0x4000, 0xd1f: 0x4000, 0xd20: 0x4000, 0xd21: 0x4018, 0xd22: 0x4019, 0xd23: 0x401a,
+	0xd24: 0x401b, 0xd25: 0x401c, 0xd26: 0x401d, 0xd27: 0x401e, 0xd28: 0x401f, 0xd29: 0x4020,
+	0xd2a: 0x4021, 0xd2b: 0x4022, 0xd2c: 0x4000, 0xd2d: 0x4010, 0xd2e: 0x4000, 0xd2f: 0x4023,
+	0xd30: 0x4000, 0xd31: 0x4024, 0xd32: 0x4000, 0xd33: 0x4025, 0xd34: 0x4000, 0xd35: 0x4026,
+	0xd36: 0x4000, 0xd37: 0x401a, 0xd38: 0x4000, 0xd39: 0x4027, 0xd3a: 0x4000, 0xd3b: 0x4028,
+	0xd3c: 0x4000, 0xd3d: 0x4020, 0xd3e: 0x4000, 0xd3f: 0x4029,
+	// Block 0x35, offset 0xd40
+	0xd40: 0x4000, 0xd41: 0x402a, 0xd42: 0x4000, 0xd43: 0x402b, 0xd44: 0x402c, 0xd45: 0x4000,
+	0xd46: 0x4017, 0xd47: 0x4000, 0xd48: 0x402d, 0xd49: 0x4000, 0xd4a: 0x402e, 0xd4b: 0x402f,
+	0xd4c: 0x4030, 0xd4d: 0x4017, 0xd4e: 0x4016, 0xd4f: 0x4017, 0xd50: 0x4000, 0xd51: 0x4000,
+	0xd52: 0x4031, 0xd53: 0x4000, 0xd54: 0x4000, 0xd55: 0x4031, 0xd56: 0x4000, 0xd57: 0x4000,
+	0xd58: 0x4032, 0xd59: 0x4000, 0xd5a: 0x4000, 0xd5b: 0x4032, 0xd5c: 0x4000, 0xd5d: 0x4000,
+	0xd5e: 0x4033, 0xd5f: 0x402e, 0xd60: 0x4034, 0xd61: 0x4035, 0xd62: 0x4034, 0xd63: 0x4036,
+	0xd64: 0x4037, 0xd65: 0x4024, 0xd66: 0x4035, 0xd67: 0x4025, 0xd68: 0x4038, 0xd69: 0x4038,
+	0xd6a: 0x4039, 0xd6b: 0x4039, 0xd6c: 0x403a, 0xd6d: 0x403a, 0xd6e: 0x4000, 0xd6f: 0x4035,
+	0xd70: 0x4000, 0xd71: 0x4000, 0xd72: 0x403b, 0xd73: 0x403c, 0xd74: 0x4000, 0xd75: 0x4000,
+	0xd76: 0x4000, 0xd77: 0x4000, 0xd78: 0x4000, 0xd79: 0x4000, 0xd7a: 0x4000, 0xd7b: 0x403d,
+	0xd7c: 0x401c, 0xd7d: 0x4000, 0xd7e: 0x4000, 0xd7f: 0x4000,
+	// Block 0x36, offset 0xd80
+	0xd85: 0x4000,
+	0xd86: 0x4000, 0xd87: 0x4000, 0xd88: 0x4000, 0xd89: 0x4000, 0xd8a: 0x4000, 0xd8b: 0x4000,
+	0xd8c: 0x4000, 0xd8d: 0x4000, 0xd8e: 0x4000, 0xd8f: 0x4000, 0xd90: 0x4000, 0xd91: 0x4000,
+	0xd92: 0x4000, 0xd93: 0x4000, 0xd94: 0x4000, 0xd95: 0x4000, 0xd96: 0x4000, 0xd97: 0x4000,
+	0xd98: 0x4000, 0xd99: 0x4000, 0xd9a: 0x4000, 0xd9b: 0x4000, 0xd9c: 0x4000, 0xd9d: 0x4000,
+	0xd9e: 0x4000, 0xd9f: 0x4000, 0xda0: 0x4000, 0xda1: 0x4000, 0xda2: 0x4000, 0xda3: 0x4000,
+	0xda4: 0x4000, 0xda5: 0x4000, 0xda6: 0x4000, 0xda7: 0x4000, 0xda8: 0x4000, 0xda9: 0x4000,
+	0xdaa: 0x4000, 0xdab: 0x4000, 0xdac: 0x4000, 0xdad: 0x4000,
+	0xdb1: 0x403e, 0xdb2: 0x403e, 0xdb3: 0x403e, 0xdb4: 0x403e, 0xdb5: 0x403e,
+	0xdb6: 0x403e, 0xdb7: 0x403e, 0xdb8: 0x403e, 0xdb9: 0x403e, 0xdba: 0x403e, 0xdbb: 0x403e,
+	0xdbc: 0x403e, 0xdbd: 0x403e, 0xdbe: 0x403e, 0xdbf: 0x403e,
+	// Block 0x37, offset 0xdc0
+	0xdc0: 0x4037, 0xdc1: 0x4037, 0xdc2: 0x4037, 0xdc3: 0x4037, 0xdc4: 0x4037, 0xdc5: 0x4037,
+	0xdc6: 0x4037, 0xdc7: 0x4037, 0xdc8: 0x4037, 0xdc9: 0x4037, 0xdca: 0x4037, 0xdcb: 0x4037,
+	0xdcc: 0x4037, 0xdcd: 0x4037, 0xdce: 0x4037, 0xdcf: 0x400e, 0xdd0: 0x403f, 0xdd1: 0x4040,
+	0xdd2: 0x4041, 0xdd3: 0x4040, 0xdd4: 0x403f, 0xdd5: 0x4042, 0xdd6: 0x4043, 0xdd7: 0x4044,
+	0xdd8: 0x4040, 0xdd9: 0x4041, 0xdda: 0x4040, 0xddb: 0x4045, 0xddc: 0x4009, 0xddd: 0x4045,
+	0xdde: 0x4046, 0xddf: 0x4045, 0xde0: 0x4047, 0xde1: 0x400b, 0xde2: 0x400a, 0xde3: 0x400c,
+	0xde4: 0x4048, 0xde5: 0x4000, 0xde6: 0x4000, 0xde7: 0x4000, 0xde8: 0x4000, 0xde9: 0x4000,
+	0xdea: 0x4000, 0xdeb: 0x4000, 0xdec: 0x4000, 0xded: 0x4000, 0xdee: 0x4000, 0xdef: 0x4000,
+	0xdf0: 0x4000, 0xdf1: 0x4000, 0xdf2: 0x4000, 0xdf3: 0x4000, 0xdf4: 0x4000, 0xdf5: 0x4000,
+	0xdf6: 0x4000, 0xdf7: 0x4000, 0xdf8: 0x4000, 0xdf9: 0x4000, 0xdfa: 0x4000, 0xdfb: 0x4000,
+	0xdfc: 0x4000, 0xdfd: 0x4000, 0xdfe: 0x4000, 0xdff: 0x4000,
+	// Block 0x38, offset 0xe00
+	0xe00: 0x4000, 0xe01: 0x4000, 0xe02: 0x4000, 0xe03: 0x4000, 0xe04: 0x4000, 0xe05: 0x4000,
+	0xe06: 0x4000, 0xe07: 0x4000, 0xe08: 0x4000, 0xe09: 0x4000, 0xe0a: 0x4000, 0xe0b: 0x4000,
+	0xe0c: 0x4000, 0xe0d: 0x4000, 0xe0e: 0x4000, 0xe10: 0x4000, 0xe11: 0x4000,
+	0xe12: 0x4000, 0xe13: 0x4000, 0xe14: 0x4000, 0xe15: 0x4000, 0xe16: 0x4000, 0xe17: 0x4000,
+	0xe18: 0x4000, 0xe19: 0x4000, 0xe1a: 0x4000, 0xe1b: 0x4000, 0xe1c: 0x4000, 0xe1d: 0x4000,
+	0xe1e: 0x4000, 0xe1f: 0x4000, 0xe20: 0x4000, 0xe21: 0x4000, 0xe22: 0x4000, 0xe23: 0x4000,
+	0xe24: 0x4000, 0xe25: 0x4000, 0xe26: 0x4000, 0xe27: 0x4000, 0xe28: 0x4000, 0xe29: 0x4000,
+	0xe2a: 0x4000, 0xe2b: 0x4000, 0xe2c: 0x4000, 0xe2d: 0x4000, 0xe2e: 0x4000, 0xe2f: 0x4000,
+	0xe30: 0x4000, 0xe31: 0x4000, 0xe32: 0x4000, 0xe33: 0x4000, 0xe34: 0x4000, 0xe35: 0x4000,
+	0xe36: 0x4000, 0xe37: 0x4000, 0xe38: 0x4000, 0xe39: 0x4000, 0xe3a: 0x4000,
+	// Block 0x39, offset 0xe40
+	0xe40: 0x4000, 0xe41: 0x4000, 0xe42: 0x4000, 0xe43: 0x4000, 0xe44: 0x4000, 0xe45: 0x4000,
+	0xe46: 0x4000, 0xe47: 0x4000, 0xe48: 0x4000, 0xe49: 0x4000, 0xe4a: 0x4000, 0xe4b: 0x4000,
+	0xe4c: 0x4000, 0xe4d: 0x4000, 0xe4e: 0x4000, 0xe4f: 0x4000, 0xe50: 0x4000, 0xe51: 0x4000,
+	0xe52: 0x4000, 0xe53: 0x4000, 0xe54: 0x4000, 0xe55: 0x4000, 0xe56: 0x4000, 0xe57: 0x4000,
+	0xe58: 0x4000, 0xe59: 0x4000, 0xe5a: 0x4000, 0xe5b: 0x4000, 0xe5c: 0x4000, 0xe5d: 0x4000,
+	0xe5e: 0x4000, 0xe5f: 0x4000, 0xe60: 0x4000, 0xe61: 0x4000, 0xe62: 0x4000, 0xe63: 0x4000,
+	0xe70: 0x4000, 0xe71: 0x4000, 0xe72: 0x4000, 0xe73: 0x4000, 0xe74: 0x4000, 0xe75: 0x4000,
+	0xe76: 0x4000, 0xe77: 0x4000, 0xe78: 0x4000, 0xe79: 0x4000, 0xe7a: 0x4000, 0xe7b: 0x4000,
+	0xe7c: 0x4000, 0xe7d: 0x4000, 0xe7e: 0x4000, 0xe7f: 0x4000,
+	// Block 0x3a, offset 0xe80
+	0xe80: 0x4000, 0xe81: 0x4000, 0xe82: 0x4000, 0xe83: 0x4000, 0xe84: 0x4000, 0xe85: 0x4000,
+	0xe86: 0x4000, 0xe87: 0x4000, 0xe88: 0x4000, 0xe89: 0x4000, 0xe8a: 0x4000, 0xe8b: 0x4000,
+	0xe8c: 0x4000, 0xe8d: 0x4000, 0xe8e: 0x4000, 0xe8f: 0x4000, 0xe90: 0x4000, 0xe91: 0x4000,
+	0xe92: 0x4000, 0xe93: 0x4000, 0xe94: 0x4000, 0xe95: 0x4000, 0xe96: 0x4000, 0xe97: 0x4000,
+	0xe98: 0x4000, 0xe99: 0x4000, 0xe9a: 0x4000, 0xe9b: 0x4000, 0xe9c: 0x4000, 0xe9d: 0x4000,
+	0xe9e: 0x4000, 0xea0: 0x4000, 0xea1: 0x4000, 0xea2: 0x4000, 0xea3: 0x4000,
+	0xea4: 0x4000, 0xea5: 0x4000, 0xea6: 0x4000, 0xea7: 0x4000, 0xea8: 0x4000, 0xea9: 0x4000,
+	0xeaa: 0x4000, 0xeab: 0x4000, 0xeac: 0x4000, 0xead: 0x4000, 0xeae: 0x4000, 0xeaf: 0x4000,
+	0xeb0: 0x4000, 0xeb1: 0x4000, 0xeb2: 0x4000, 0xeb3: 0x4000, 0xeb4: 0x4000, 0xeb5: 0x4000,
+	0xeb6: 0x4000, 0xeb7: 0x4000, 0xeb8: 0x4000, 0xeb9: 0x4000, 0xeba: 0x4000, 0xebb: 0x4000,
+	0xebc: 0x4000, 0xebd: 0x4000, 0xebe: 0x4000, 0xebf: 0x4000,
+	// Block 0x3b, offset 0xec0
+	0xec0: 0x4000, 0xec1: 0x4000, 0xec2: 0x4000, 0xec3: 0x4000, 0xec4: 0x4000, 0xec5: 0x4000,
+	0xec6: 0x4000, 0xec7: 0x4000, 0xec8: 0x2000, 0xec9: 0x2000, 0xeca: 0x2000, 0xecb: 0x2000,
+	0xecc: 0x2000, 0xecd: 0x2000, 0xece: 0x2000, 0xecf: 0x2000, 0xed0: 0x4000, 0xed1: 0x4000,
+	0xed2: 0x4000, 0xed3: 0x4000, 0xed4: 0x4000, 0xed5: 0x4000, 0xed6: 0x4000, 0xed7: 0x4000,
+	0xed8: 0x4000, 0xed9: 0x4000, 0xeda: 0x4000, 0xedb: 0x4000, 0xedc: 0x4000, 0xedd: 0x4000,
+	0xede: 0x4000, 0xedf: 0x4000, 0xee0: 0x4000, 0xee1: 0x4000, 0xee2: 0x4000, 0xee3: 0x4000,
+	0xee4: 0x4000, 0xee5: 0x4000, 0xee6: 0x4000, 0xee7: 0x4000, 0xee8: 0x4000, 0xee9: 0x4000,
+	0xeea: 0x4000, 0xeeb: 0x4000, 0xeec: 0x4000, 0xeed: 0x4000, 0xeee: 0x4000, 0xeef: 0x4000,
+	0xef0: 0x4000, 0xef1: 0x4000, 0xef2: 0x4000, 0xef3: 0x4000, 0xef4: 0x4000, 0xef5: 0x4000,
+	0xef6: 0x4000, 0xef7: 0x4000, 0xef8: 0x4000, 0xef9: 0x4000, 0xefa: 0x4000, 0xefb: 0x4000,
+	0xefc: 0x4000, 0xefd: 0x4000, 0xefe: 0x4000, 0xeff: 0x4000,
+	// Block 0x3c, offset 0xf00
+	0xf00: 0x4000, 0xf01: 0x4000, 0xf02: 0x4000, 0xf03: 0x4000, 0xf04: 0x4000, 0xf05: 0x4000,
+	0xf06: 0x4000, 0xf07: 0x4000, 0xf08: 0x4000, 0xf09: 0x4000, 0xf0a: 0x4000, 0xf0b: 0x4000,
+	0xf0c: 0x4000, 0xf0d: 0x4000, 0xf0e: 0x4000, 0xf0f: 0x4000, 0xf10: 0x4000, 0xf11: 0x4000,
+	0xf12: 0x4000, 0xf13: 0x4000, 0xf14: 0x4000, 0xf15: 0x4000, 0xf16: 0x4000, 0xf17: 0x4000,
+	0xf18: 0x4000, 0xf19: 0x4000, 0xf1a: 0x4000, 0xf1b: 0x4000, 0xf1c: 0x4000, 0xf1d: 0x4000,
+	0xf1e: 0x4000, 0xf1f: 0x4000, 0xf20: 0x4000, 0xf21: 0x4000, 0xf22: 0x4000, 0xf23: 0x4000,
+	0xf24: 0x4000, 0xf25: 0x4000, 0xf26: 0x4000, 0xf27: 0x4000, 0xf28: 0x4000, 0xf29: 0x4000,
+	0xf2a: 0x4000, 0xf2b: 0x4000, 0xf2c: 0x4000, 0xf2d: 0x4000, 0xf2e: 0x4000, 0xf2f: 0x4000,
+	0xf30: 0x4000, 0xf31: 0x4000, 0xf32: 0x4000, 0xf33: 0x4000, 0xf34: 0x4000, 0xf35: 0x4000,
+	0xf36: 0x4000, 0xf37: 0x4000, 0xf38: 0x4000, 0xf39: 0x4000, 0xf3a: 0x4000, 0xf3b: 0x4000,
+	0xf3c: 0x4000, 0xf3d: 0x4000, 0xf3e: 0x4000,
+	// Block 0x3d, offset 0xf40
+	0xf40: 0x4000, 0xf41: 0x4000, 0xf42: 0x4000, 0xf43: 0x4000, 0xf44: 0x4000, 0xf45: 0x4000,
+	0xf46: 0x4000, 0xf47: 0x4000, 0xf48: 0x4000, 0xf49: 0x4000, 0xf4a: 0x4000, 0xf4b: 0x4000,
+	0xf4c: 0x4000, 0xf50: 0x4000, 0xf51: 0x4000,
+	0xf52: 0x4000, 0xf53: 0x4000, 0xf54: 0x4000, 0xf55: 0x4000, 0xf56: 0x4000, 0xf57: 0x4000,
+	0xf58: 0x4000, 0xf59: 0x4000, 0xf5a: 0x4000, 0xf5b: 0x4000, 0xf5c: 0x4000, 0xf5d: 0x4000,
+	0xf5e: 0x4000, 0xf5f: 0x4000, 0xf60: 0x4000, 0xf61: 0x4000, 0xf62: 0x4000, 0xf63: 0x4000,
+	0xf64: 0x4000, 0xf65: 0x4000, 0xf66: 0x4000, 0xf67: 0x4000, 0xf68: 0x4000, 0xf69: 0x4000,
+	0xf6a: 0x4000, 0xf6b: 0x4000, 0xf6c: 0x4000, 0xf6d: 0x4000, 0xf6e: 0x4000, 0xf6f: 0x4000,
+	0xf70: 0x4000, 0xf71: 0x4000, 0xf72: 0x4000, 0xf73: 0x4000, 0xf74: 0x4000, 0xf75: 0x4000,
+	0xf76: 0x4000, 0xf77: 0x4000, 0xf78: 0x4000, 0xf79: 0x4000, 0xf7a: 0x4000, 0xf7b: 0x4000,
+	0xf7c: 0x4000, 0xf7d: 0x4000, 0xf7e: 0x4000, 0xf7f: 0x4000,
+	// Block 0x3e, offset 0xf80
+	0xf80: 0x4000, 0xf81: 0x4000, 0xf82: 0x4000, 0xf83: 0x4000, 0xf84: 0x4000, 0xf85: 0x4000,
+	0xf86: 0x4000,
+	// Block 0x3f, offset 0xfc0
+	0xfe0: 0x4000, 0xfe1: 0x4000, 0xfe2: 0x4000, 0xfe3: 0x4000,
+	0xfe4: 0x4000, 0xfe5: 0x4000, 0xfe6: 0x4000, 0xfe7: 0x4000, 0xfe8: 0x4000, 0xfe9: 0x4000,
+	0xfea: 0x4000, 0xfeb: 0x4000, 0xfec: 0x4000, 0xfed: 0x4000, 0xfee: 0x4000, 0xfef: 0x4000,
+	0xff0: 0x4000, 0xff1: 0x4000, 0xff2: 0x4000, 0xff3: 0x4000, 0xff4: 0x4000, 0xff5: 0x4000,
+	0xff6: 0x4000, 0xff7: 0x4000, 0xff8: 0x4000, 0xff9: 0x4000, 0xffa: 0x4000, 0xffb: 0x4000,
+	0xffc: 0x4000,
+	// Block 0x40, offset 0x1000
+	0x1000: 0x4000, 0x1001: 0x4000, 0x1002: 0x4000, 0x1003: 0x4000, 0x1004: 0x4000, 0x1005: 0x4000,
+	0x1006: 0x4000, 0x1007: 0x4000, 0x1008: 0x4000, 0x1009: 0x4000, 0x100a: 0x4000, 0x100b: 0x4000,
+	0x100c: 0x4000, 0x100d: 0x4000, 0x100e: 0x4000, 0x100f: 0x4000, 0x1010: 0x4000, 0x1011: 0x4000,
+	0x1012: 0x4000, 0x1013: 0x4000, 0x1014: 0x4000, 0x1015: 0x4000, 0x1016: 0x4000, 0x1017: 0x4000,
+	0x1018: 0x4000, 0x1019: 0x4000, 0x101a: 0x4000, 0x101b: 0x4000, 0x101c: 0x4000, 0x101d: 0x4000,
+	0x101e: 0x4000, 0x101f: 0x4000, 0x1020: 0x4000, 0x1021: 0x4000, 0x1022: 0x4000, 0x1023: 0x4000,
+	// Block 0x41, offset 0x1040
+	0x1040: 0x2000, 0x1041: 0x2000, 0x1042: 0x2000, 0x1043: 0x2000, 0x1044: 0x2000, 0x1045: 0x2000,
+	0x1046: 0x2000, 0x1047: 0x2000, 0x1048: 0x2000, 0x1049: 0x2000, 0x104a: 0x2000, 0x104b: 0x2000,
+	0x104c: 0x2000, 0x104d: 0x2000, 0x104e: 0x2000, 0x104f: 0x2000, 0x1050: 0x4000, 0x1051: 0x4000,
+	0x1052: 0x4000, 0x1053: 0x4000, 0x1054: 0x4000, 0x1055: 0x4000, 0x1056: 0x4000, 0x1057: 0x4000,
+	0x1058: 0x4000, 0x1059: 0x4000,
+	0x1070: 0x4000, 0x1071: 0x4000, 0x1072: 0x4000, 0x1073: 0x4000, 0x1074: 0x4000, 0x1075: 0x4000,
+	0x1076: 0x4000, 0x1077: 0x4000, 0x1078: 0x4000, 0x1079: 0x4000, 0x107a: 0x4000, 0x107b: 0x4000,
+	0x107c: 0x4000, 0x107d: 0x4000, 0x107e: 0x4000, 0x107f: 0x4000,
+	// Block 0x42, offset 0x1080
+	0x1080: 0x4000, 0x1081: 0x4000, 0x1082: 0x4000, 0x1083: 0x4000, 0x1084: 0x4000, 0x1085: 0x4000,
+	0x1086: 0x4000, 0x1087: 0x4000, 0x1088: 0x4000, 0x1089: 0x4000, 0x108a: 0x4000, 0x108b: 0x4000,
+	0x108c: 0x4000, 0x108d: 0x4000, 0x108e: 0x4000, 0x108f: 0x4000, 0x1090: 0x4000, 0x1091: 0x4000,
+	0x1092: 0x4000, 0x1094: 0x4000, 0x1095: 0x4000, 0x1096: 0x4000, 0x1097: 0x4000,
+	0x1098: 0x4000, 0x1099: 0x4000, 0x109a: 0x4000, 0x109b: 0x4000, 0x109c: 0x4000, 0x109d: 0x4000,
+	0x109e: 0x4000, 0x109f: 0x4000, 0x10a0: 0x4000, 0x10a1: 0x4000, 0x10a2: 0x4000, 0x10a3: 0x4000,
+	0x10a4: 0x4000, 0x10a5: 0x4000, 0x10a6: 0x4000, 0x10a8: 0x4000, 0x10a9: 0x4000,
+	0x10aa: 0x4000, 0x10ab: 0x4000,
+	// Block 0x43, offset 0x10c0
+	0x10c1: 0x9012, 0x10c2: 0x9012, 0x10c3: 0x9012, 0x10c4: 0x9012, 0x10c5: 0x9012,
+	0x10c6: 0x9012, 0x10c7: 0x9012, 0x10c8: 0x9012, 0x10c9: 0x9012, 0x10ca: 0x9012, 0x10cb: 0x9012,
+	0x10cc: 0x9012, 0x10cd: 0x9012, 0x10ce: 0x9012, 0x10cf: 0x9012, 0x10d0: 0x9012, 0x10d1: 0x9012,
+	0x10d2: 0x9012, 0x10d3: 0x9012, 0x10d4: 0x9012, 0x10d5: 0x9012, 0x10d6: 0x9012, 0x10d7: 0x9012,
+	0x10d8: 0x9012, 0x10d9: 0x9012, 0x10da: 0x9012, 0x10db: 0x9012, 0x10dc: 0x9012, 0x10dd: 0x9012,
+	0x10de: 0x9012, 0x10df: 0x9012, 0x10e0: 0x9049, 0x10e1: 0x9049, 0x10e2: 0x9049, 0x10e3: 0x9049,
+	0x10e4: 0x9049, 0x10e5: 0x9049, 0x10e6: 0x9049, 0x10e7: 0x9049, 0x10e8: 0x9049, 0x10e9: 0x9049,
+	0x10ea: 0x9049, 0x10eb: 0x9049, 0x10ec: 0x9049, 0x10ed: 0x9049, 0x10ee: 0x9049, 0x10ef: 0x9049,
+	0x10f0: 0x9049, 0x10f1: 0x9049, 0x10f2: 0x9049, 0x10f3: 0x9049, 0x10f4: 0x9049, 0x10f5: 0x9049,
+	0x10f6: 0x9049, 0x10f7: 0x9049, 0x10f8: 0x9049, 0x10f9: 0x9049, 0x10fa: 0x9049, 0x10fb: 0x9049,
+	0x10fc: 0x9049, 0x10fd: 0x9049, 0x10fe: 0x9049, 0x10ff: 0x9049,
+	// Block 0x44, offset 0x1100
+	0x1100: 0x9049, 0x1101: 0x9049, 0x1102: 0x9049, 0x1103: 0x9049, 0x1104: 0x9049, 0x1105: 0x9049,
+	0x1106: 0x9049, 0x1107: 0x9049, 0x1108: 0x9049, 0x1109: 0x9049, 0x110a: 0x9049, 0x110b: 0x9049,
+	0x110c: 0x9049, 0x110d: 0x9049, 0x110e: 0x9049, 0x110f: 0x9049, 0x1110: 0x9049, 0x1111: 0x9049,
+	0x1112: 0x9049, 0x1113: 0x9049, 0x1114: 0x9049, 0x1115: 0x9049, 0x1116: 0x9049, 0x1117: 0x9049,
+	0x1118: 0x9049, 0x1119: 0x9049, 0x111a: 0x9049, 0x111b: 0x9049, 0x111c: 0x9049, 0x111d: 0x9049,
+	0x111e: 0x9049, 0x111f: 0x904a, 0x1120: 0x904b, 0x1121: 0xb04c, 0x1122: 0xb04d, 0x1123: 0xb04d,
+	0x1124: 0xb04e, 0x1125: 0xb04f, 0x1126: 0xb050, 0x1127: 0xb051, 0x1128: 0xb052, 0x1129: 0xb053,
+	0x112a: 0xb054, 0x112b: 0xb055, 0x112c: 0xb056, 0x112d: 0xb057, 0x112e: 0xb058, 0x112f: 0xb059,
+	0x1130: 0xb05a, 0x1131: 0xb05b, 0x1132: 0xb05c, 0x1133: 0xb05d, 0x1134: 0xb05e, 0x1135: 0xb05f,
+	0x1136: 0xb060, 0x1137: 0xb061, 0x1138: 0xb062, 0x1139: 0xb063, 0x113a: 0xb064, 0x113b: 0xb065,
+	0x113c: 0xb052, 0x113d: 0xb066, 0x113e: 0xb067, 0x113f: 0xb055,
+	// Block 0x45, offset 0x1140
+	0x1140: 0xb068, 0x1141: 0xb069, 0x1142: 0xb06a, 0x1143: 0xb06b, 0x1144: 0xb05a, 0x1145: 0xb056,
+	0x1146: 0xb06c, 0x1147: 0xb06d, 0x1148: 0xb06b, 0x1149: 0xb06e, 0x114a: 0xb06b, 0x114b: 0xb06f,
+	0x114c: 0xb06f, 0x114d: 0xb070, 0x114e: 0xb070, 0x114f: 0xb071, 0x1150: 0xb056, 0x1151: 0xb072,
+	0x1152: 0xb073, 0x1153: 0xb072, 0x1154: 0xb074, 0x1155: 0xb073, 0x1156: 0xb075, 0x1157: 0xb075,
+	0x1158: 0xb076, 0x1159: 0xb076, 0x115a: 0xb077, 0x115b: 0xb077, 0x115c: 0xb073, 0x115d: 0xb078,
+	0x115e: 0xb079, 0x115f: 0xb067, 0x1160: 0xb07a, 0x1161: 0xb07b, 0x1162: 0xb07b, 0x1163: 0xb07b,
+	0x1164: 0xb07b, 0x1165: 0xb07b, 0x1166: 0xb07b, 0x1167: 0xb07b, 0x1168: 0xb07b, 0x1169: 0xb07b,
+	0x116a: 0xb07b, 0x116b: 0xb07b, 0x116c: 0xb07b, 0x116d: 0xb07b, 0x116e: 0xb07b, 0x116f: 0xb07b,
+	0x1170: 0xb07c, 0x1171: 0xb07c, 0x1172: 0xb07c, 0x1173: 0xb07c, 0x1174: 0xb07c, 0x1175: 0xb07c,
+	0x1176: 0xb07c, 0x1177: 0xb07c, 0x1178: 0xb07c, 0x1179: 0xb07c, 0x117a: 0xb07c, 0x117b: 0xb07c,
+	0x117c: 0xb07c, 0x117d: 0xb07c, 0x117e: 0xb07c,
+	// Block 0x46, offset 0x1180
+	0x1182: 0xb07d, 0x1183: 0xb07e, 0x1184: 0xb07f, 0x1185: 0xb080,
+	0x1186: 0xb07f, 0x1187: 0xb07e, 0x118a: 0xb081, 0x118b: 0xb082,
+	0x118c: 0xb083, 0x118d: 0xb07f, 0x118e: 0xb080, 0x118f: 0xb07f,
+	0x1192: 0xb084, 0x1193: 0xb085, 0x1194: 0xb084, 0x1195: 0xb086, 0x1196: 0xb084, 0x1197: 0xb087,
+	0x119a: 0xb088, 0x119b: 0xb089, 0x119c: 0xb08a,
+	0x11a0: 0x908b, 0x11a1: 0x908b, 0x11a2: 0x908c, 0x11a3: 0x908d,
+	0x11a4: 0x908b, 0x11a5: 0x908e, 0x11a6: 0x908f, 0x11a8: 0xb090, 0x11a9: 0xb091,
+	0x11aa: 0xb092, 0x11ab: 0xb091, 0x11ac: 0xb093, 0x11ad: 0xb094, 0x11ae: 0xb095,
+	0x11bd: 0x2000,
+	// Block 0x47, offset 0x11c0
+	0x11e0: 0x4000,
+	// Block 0x48, offset 0x1200
+	0x1200: 0x4000, 0x1201: 0x4000, 0x1202: 0x4000, 0x1203: 0x4000, 0x1204: 0x4000, 0x1205: 0x4000,
+	0x1206: 0x4000, 0x1207: 0x4000, 0x1208: 0x4000, 0x1209: 0x4000, 0x120a: 0x4000, 0x120b: 0x4000,
+	0x120c: 0x4000, 0x120d: 0x4000, 0x120e: 0x4000, 0x120f: 0x4000, 0x1210: 0x4000, 0x1211: 0x4000,
+	0x1212: 0x4000, 0x1213: 0x4000, 0x1214: 0x4000, 0x1215: 0x4000, 0x1216: 0x4000, 0x1217: 0x4000,
+	0x1218: 0x4000, 0x1219: 0x4000, 0x121a: 0x4000, 0x121b: 0x4000, 0x121c: 0x4000, 0x121d: 0x4000,
+	0x121e: 0x4000, 0x121f: 0x4000, 0x1220: 0x4000, 0x1221: 0x4000, 0x1222: 0x4000, 0x1223: 0x4000,
+	0x1224: 0x4000, 0x1225: 0x4000, 0x1226: 0x4000, 0x1227: 0x4000, 0x1228: 0x4000, 0x1229: 0x4000,
+	0x122a: 0x4000, 0x122b: 0x4000, 0x122c: 0x4000,
+	// Block 0x49, offset 0x1240
+	0x1240: 0x4000, 0x1241: 0x4000, 0x1242: 0x4000, 0x1243: 0x4000, 0x1244: 0x4000, 0x1245: 0x4000,
+	0x1246: 0x4000, 0x1247: 0x4000, 0x1248: 0x4000, 0x1249: 0x4000, 0x124a: 0x4000, 0x124b: 0x4000,
+	0x124c: 0x4000, 0x124d: 0x4000, 0x124e: 0x4000, 0x124f: 0x4000, 0x1250: 0x4000, 0x1251: 0x4000,
+	0x1252: 0x4000, 0x1253: 0x4000, 0x1254: 0x4000, 0x1255: 0x4000, 0x1256: 0x4000, 0x1257: 0x4000,
+	0x1258: 0x4000, 0x1259: 0x4000, 0x125a: 0x4000, 0x125b: 0x4000, 0x125c: 0x4000, 0x125d: 0x4000,
+	0x125e: 0x4000, 0x125f: 0x4000, 0x1260: 0x4000, 0x1261: 0x4000, 0x1262: 0x4000, 0x1263: 0x4000,
+	0x1264: 0x4000, 0x1265: 0x4000, 0x1266: 0x4000, 0x1267: 0x4000, 0x1268: 0x4000, 0x1269: 0x4000,
+	0x126a: 0x4000, 0x126b: 0x4000, 0x126c: 0x4000, 0x126d: 0x4000, 0x126e: 0x4000, 0x126f: 0x4000,
+	0x1270: 0x4000, 0x1271: 0x4000, 0x1272: 0x4000,
+	// Block 0x4a, offset 0x1280
+	0x1280: 0x4000, 0x1281: 0x4000,
+	// Block 0x4b, offset 0x12c0
+	0x12c4: 0x4000,
+	// Block 0x4c, offset 0x1300
+	0x130f: 0x4000,
+	// Block 0x4d, offset 0x1340
+	0x1340: 0x2000, 0x1341: 0x2000, 0x1342: 0x2000, 0x1343: 0x2000, 0x1344: 0x2000, 0x1345: 0x2000,
+	0x1346: 0x2000, 0x1347: 0x2000, 0x1348: 0x2000, 0x1349: 0x2000, 0x134a: 0x2000,
+	0x1350: 0x2000, 0x1351: 0x2000,
+	0x1352: 0x2000, 0x1353: 0x2000, 0x1354: 0x2000, 0x1355: 0x2000, 0x1356: 0x2000, 0x1357: 0x2000,
+	0x1358: 0x2000, 0x1359: 0x2000, 0x135a: 0x2000, 0x135b: 0x2000, 0x135c: 0x2000, 0x135d: 0x2000,
+	0x135e: 0x2000, 0x135f: 0x2000, 0x1360: 0x2000, 0x1361: 0x2000, 0x1362: 0x2000, 0x1363: 0x2000,
+	0x1364: 0x2000, 0x1365: 0x2000, 0x1366: 0x2000, 0x1367: 0x2000, 0x1368: 0x2000, 0x1369: 0x2000,
+	0x136a: 0x2000, 0x136b: 0x2000, 0x136c: 0x2000, 0x136d: 0x2000,
+	0x1370: 0x2000, 0x1371: 0x2000, 0x1372: 0x2000, 0x1373: 0x2000, 0x1374: 0x2000, 0x1375: 0x2000,
+	0x1376: 0x2000, 0x1377: 0x2000, 0x1378: 0x2000, 0x1379: 0x2000, 0x137a: 0x2000, 0x137b: 0x2000,
+	0x137c: 0x2000, 0x137d: 0x2000, 0x137e: 0x2000, 0x137f: 0x2000,
+	// Block 0x4e, offset 0x1380
+	0x1380: 0x2000, 0x1381: 0x2000, 0x1382: 0x2000, 0x1383: 0x2000, 0x1384: 0x2000, 0x1385: 0x2000,
+	0x1386: 0x2000, 0x1387: 0x2000, 0x1388: 0x2000, 0x1389: 0x2000, 0x138a: 0x2000, 0x138b: 0x2000,
+	0x138c: 0x2000, 0x138d: 0x2000, 0x138e: 0x2000, 0x138f: 0x2000, 0x1390: 0x2000, 0x1391: 0x2000,
+	0x1392: 0x2000, 0x1393: 0x2000, 0x1394: 0x2000, 0x1395: 0x2000, 0x1396: 0x2000, 0x1397: 0x2000,
+	0x1398: 0x2000, 0x1399: 0x2000, 0x139a: 0x2000, 0x139b: 0x2000, 0x139c: 0x2000, 0x139d: 0x2000,
+	0x139e: 0x2000, 0x139f: 0x2000, 0x13a0: 0x2000, 0x13a1: 0x2000, 0x13a2: 0x2000, 0x13a3: 0x2000,
+	0x13a4: 0x2000, 0x13a5: 0x2000, 0x13a6: 0x2000, 0x13a7: 0x2000, 0x13a8: 0x2000, 0x13a9: 0x2000,
+	0x13b0: 0x2000, 0x13b1: 0x2000, 0x13b2: 0x2000, 0x13b3: 0x2000, 0x13b4: 0x2000, 0x13b5: 0x2000,
+	0x13b6: 0x2000, 0x13b7: 0x2000, 0x13b8: 0x2000, 0x13b9: 0x2000, 0x13ba: 0x2000, 0x13bb: 0x2000,
+	0x13bc: 0x2000, 0x13bd: 0x2000, 0x13be: 0x2000, 0x13bf: 0x2000,
+	// Block 0x4f, offset 0x13c0
+	0x13c0: 0x2000, 0x13c1: 0x2000, 0x13c2: 0x2000, 0x13c3: 0x2000, 0x13c4: 0x2000, 0x13c5: 0x2000,
+	0x13c6: 0x2000, 0x13c7: 0x2000, 0x13c8: 0x2000, 0x13c9: 0x2000, 0x13ca: 0x2000, 0x13cb: 0x2000,
+	0x13cc: 0x2000, 0x13cd: 0x2000, 0x13ce: 0x4000, 0x13cf: 0x2000, 0x13d0: 0x2000, 0x13d1: 0x4000,
+	0x13d2: 0x4000, 0x13d3: 0x4000, 0x13d4: 0x4000, 0x13d5: 0x4000, 0x13d6: 0x4000, 0x13d7: 0x4000,
+	0x13d8: 0x4000, 0x13d9: 0x4000, 0x13da: 0x4000, 0x13db: 0x2000, 0x13dc: 0x2000, 0x13dd: 0x2000,
+	0x13de: 0x2000, 0x13df: 0x2000, 0x13e0: 0x2000, 0x13e1: 0x2000, 0x13e2: 0x2000, 0x13e3: 0x2000,
+	0x13e4: 0x2000, 0x13e5: 0x2000, 0x13e6: 0x2000, 0x13e7: 0x2000, 0x13e8: 0x2000, 0x13e9: 0x2000,
+	0x13ea: 0x2000, 0x13eb: 0x2000, 0x13ec: 0x2000,
+	// Block 0x50, offset 0x1400
+	0x1400: 0x4000, 0x1401: 0x4000, 0x1402: 0x4000,
+	0x1410: 0x4000, 0x1411: 0x4000,
+	0x1412: 0x4000, 0x1413: 0x4000, 0x1414: 0x4000, 0x1415: 0x4000, 0x1416: 0x4000, 0x1417: 0x4000,
+	0x1418: 0x4000, 0x1419: 0x4000, 0x141a: 0x4000, 0x141b: 0x4000, 0x141c: 0x4000, 0x141d: 0x4000,
+	0x141e: 0x4000, 0x141f: 0x4000, 0x1420: 0x4000, 0x1421: 0x4000, 0x1422: 0x4000, 0x1423: 0x4000,
+	0x1424: 0x4000, 0x1425: 0x4000, 0x1426: 0x4000, 0x1427: 0x4000, 0x1428: 0x4000, 0x1429: 0x4000,
+	0x142a: 0x4000, 0x142b: 0x4000, 0x142c: 0x4000, 0x142d: 0x4000, 0x142e: 0x4000, 0x142f: 0x4000,
+	0x1430: 0x4000, 0x1431: 0x4000, 0x1432: 0x4000, 0x1433: 0x4000, 0x1434: 0x4000, 0x1435: 0x4000,
+	0x1436: 0x4000, 0x1437: 0x4000, 0x1438: 0x4000, 0x1439: 0x4000, 0x143a: 0x4000, 0x143b: 0x4000,
+	// Block 0x51, offset 0x1440
+	0x1440: 0x4000, 0x1441: 0x4000, 0x1442: 0x4000, 0x1443: 0x4000, 0x1444: 0x4000, 0x1445: 0x4000,
+	0x1446: 0x4000, 0x1447: 0x4000, 0x1448: 0x4000,
+	0x1450: 0x4000, 0x1451: 0x4000,
+	// Block 0x52, offset 0x1480
+	0x1480: 0x4000, 0x1481: 0x4000, 0x1482: 0x4000, 0x1483: 0x4000, 0x1484: 0x4000, 0x1485: 0x4000,
+	0x1486: 0x4000, 0x1487: 0x4000, 0x1488: 0x4000, 0x1489: 0x4000, 0x148a: 0x4000, 0x148b: 0x4000,
+	0x148c: 0x4000, 0x148d: 0x4000, 0x148e: 0x4000, 0x148f: 0x4000, 0x1490: 0x4000, 0x1491: 0x4000,
+	0x1492: 0x4000, 0x1493: 0x4000, 0x1494: 0x4000, 0x1495: 0x4000, 0x1496: 0x4000, 0x1497: 0x4000,
+	0x1498: 0x4000, 0x1499: 0x4000, 0x149a: 0x4000, 0x149b: 0x4000, 0x149c: 0x4000, 0x149d: 0x4000,
+	0x149e: 0x4000, 0x149f: 0x4000, 0x14a0: 0x4000,
+	0x14ad: 0x4000, 0x14ae: 0x4000, 0x14af: 0x4000,
+	0x14b0: 0x4000, 0x14b1: 0x4000, 0x14b2: 0x4000, 0x14b3: 0x4000, 0x14b4: 0x4000, 0x14b5: 0x4000,
+	0x14b7: 0x4000, 0x14b8: 0x4000, 0x14b9: 0x4000, 0x14ba: 0x4000, 0x14bb: 0x4000,
+	0x14bc: 0x4000, 0x14bd: 0x4000, 0x14be: 0x4000, 0x14bf: 0x4000,
+	// Block 0x53, offset 0x14c0
+	0x14c0: 0x4000, 0x14c1: 0x4000, 0x14c2: 0x4000, 0x14c3: 0x4000, 0x14c4: 0x4000, 0x14c5: 0x4000,
+	0x14c6: 0x4000, 0x14c7: 0x4000, 0x14c8: 0x4000, 0x14c9: 0x4000, 0x14ca: 0x4000, 0x14cb: 0x4000,
+	0x14cc: 0x4000, 0x14cd: 0x4000, 0x14ce: 0x4000, 0x14cf: 0x4000, 0x14d0: 0x4000, 0x14d1: 0x4000,
+	0x14d2: 0x4000, 0x14d3: 0x4000, 0x14d4: 0x4000, 0x14d5: 0x4000, 0x14d6: 0x4000, 0x14d7: 0x4000,
+	0x14d8: 0x4000, 0x14d9: 0x4000, 0x14da: 0x4000, 0x14db: 0x4000, 0x14dc: 0x4000, 0x14dd: 0x4000,
+	0x14de: 0x4000, 0x14df: 0x4000, 0x14e0: 0x4000, 0x14e1: 0x4000, 0x14e2: 0x4000, 0x14e3: 0x4000,
+	0x14e4: 0x4000, 0x14e5: 0x4000, 0x14e6: 0x4000, 0x14e7: 0x4000, 0x14e8: 0x4000, 0x14e9: 0x4000,
+	0x14ea: 0x4000, 0x14eb: 0x4000, 0x14ec: 0x4000, 0x14ed: 0x4000, 0x14ee: 0x4000, 0x14ef: 0x4000,
+	0x14f0: 0x4000, 0x14f1: 0x4000, 0x14f2: 0x4000, 0x14f3: 0x4000, 0x14f4: 0x4000, 0x14f5: 0x4000,
+	0x14f6: 0x4000, 0x14f7: 0x4000, 0x14f8: 0x4000, 0x14f9: 0x4000, 0x14fa: 0x4000, 0x14fb: 0x4000,
+	0x14fc: 0x4000, 0x14fe: 0x4000, 0x14ff: 0x4000,
+	// Block 0x54, offset 0x1500
+	0x1500: 0x4000, 0x1501: 0x4000, 0x1502: 0x4000, 0x1503: 0x4000, 0x1504: 0x4000, 0x1505: 0x4000,
+	0x1506: 0x4000, 0x1507: 0x4000, 0x1508: 0x4000, 0x1509: 0x4000, 0x150a: 0x4000, 0x150b: 0x4000,
+	0x150c: 0x4000, 0x150d: 0x4000, 0x150e: 0x4000, 0x150f: 0x4000, 0x1510: 0x4000, 0x1511: 0x4000,
+	0x1512: 0x4000, 0x1513: 0x4000,
+	0x1520: 0x4000, 0x1521: 0x4000, 0x1522: 0x4000, 0x1523: 0x4000,
+	0x1524: 0x4000, 0x1525: 0x4000, 0x1526: 0x4000, 0x1527: 0x4000, 0x1528: 0x4000, 0x1529: 0x4000,
+	0x152a: 0x4000, 0x152b: 0x4000, 0x152c: 0x4000, 0x152d: 0x4000, 0x152e: 0x4000, 0x152f: 0x4000,
+	0x1530: 0x4000, 0x1531: 0x4000, 0x1532: 0x4000, 0x1533: 0x4000, 0x1534: 0x4000, 0x1535: 0x4000,
+	0x1536: 0x4000, 0x1537: 0x4000, 0x1538: 0x4000, 0x1539: 0x4000, 0x153a: 0x4000, 0x153b: 0x4000,
+	0x153c: 0x4000, 0x153d: 0x4000, 0x153e: 0x4000, 0x153f: 0x4000,
+	// Block 0x55, offset 0x1540
+	0x1540: 0x4000, 0x1541: 0x4000, 0x1542: 0x4000, 0x1543: 0x4000, 0x1544: 0x4000, 0x1545: 0x4000,
+	0x1546: 0x4000, 0x1547: 0x4000, 0x1548: 0x4000, 0x1549: 0x4000, 0x154a: 0x4000,
+	0x154f: 0x4000, 0x1550: 0x4000, 0x1551: 0x4000,
+	0x1552: 0x4000, 0x1553: 0x4000,
+	0x1560: 0x4000, 0x1561: 0x4000, 0x1562: 0x4000, 0x1563: 0x4000,
+	0x1564: 0x4000, 0x1565: 0x4000, 0x1566: 0x4000, 0x1567: 0x4000, 0x1568: 0x4000, 0x1569: 0x4000,
+	0x156a: 0x4000, 0x156b: 0x4000, 0x156c: 0x4000, 0x156d: 0x4000, 0x156e: 0x4000, 0x156f: 0x4000,
+	0x1570: 0x4000, 0x1574: 0x4000,
+	0x1578: 0x4000, 0x1579: 0x4000, 0x157a: 0x4000, 0x157b: 0x4000,
+	0x157c: 0x4000, 0x157d: 0x4000, 0x157e: 0x4000, 0x157f: 0x4000,
+	// Block 0x56, offset 0x1580
+	0x1580: 0x4000, 0x1582: 0x4000, 0x1583: 0x4000, 0x1584: 0x4000, 0x1585: 0x4000,
+	0x1586: 0x4000, 0x1587: 0x4000, 0x1588: 0x4000, 0x1589: 0x4000, 0x158a: 0x4000, 0x158b: 0x4000,
+	0x158c: 0x4000, 0x158d: 0x4000, 0x158e: 0x4000, 0x158f: 0x4000, 0x1590: 0x4000, 0x1591: 0x4000,
+	0x1592: 0x4000, 0x1593: 0x4000, 0x1594: 0x4000, 0x1595: 0x4000, 0x1596: 0x4000, 0x1597: 0x4000,
+	0x1598: 0x4000, 0x1599: 0x4000, 0x159a: 0x4000, 0x159b: 0x4000, 0x159c: 0x4000, 0x159d: 0x4000,
+	0x159e: 0x4000, 0x159f: 0x4000, 0x15a0: 0x4000, 0x15a1: 0x4000, 0x15a2: 0x4000, 0x15a3: 0x4000,
+	0x15a4: 0x4000, 0x15a5: 0x4000, 0x15a6: 0x4000, 0x15a7: 0x4000, 0x15a8: 0x4000, 0x15a9: 0x4000,
+	0x15aa: 0x4000, 0x15ab: 0x4000, 0x15ac: 0x4000, 0x15ad: 0x4000, 0x15ae: 0x4000, 0x15af: 0x4000,
+	0x15b0: 0x4000, 0x15b1: 0x4000, 0x15b2: 0x4000, 0x15b3: 0x4000, 0x15b4: 0x4000, 0x15b5: 0x4000,
+	0x15b6: 0x4000, 0x15b7: 0x4000, 0x15b8: 0x4000, 0x15b9: 0x4000, 0x15ba: 0x4000, 0x15bb: 0x4000,
+	0x15bc: 0x4000, 0x15bd: 0x4000, 0x15be: 0x4000, 0x15bf: 0x4000,
+	// Block 0x57, offset 0x15c0
+	0x15c0: 0x4000, 0x15c1: 0x4000, 0x15c2: 0x4000, 0x15c3: 0x4000, 0x15c4: 0x4000, 0x15c5: 0x4000,
+	0x15c6: 0x4000, 0x15c7: 0x4000, 0x15c8: 0x4000, 0x15c9: 0x4000, 0x15ca: 0x4000, 0x15cb: 0x4000,
+	0x15cc: 0x4000, 0x15cd: 0x4000, 0x15ce: 0x4000, 0x15cf: 0x4000, 0x15d0: 0x4000, 0x15d1: 0x4000,
+	0x15d2: 0x4000, 0x15d3: 0x4000, 0x15d4: 0x4000, 0x15d5: 0x4000, 0x15d6: 0x4000, 0x15d7: 0x4000,
+	0x15d8: 0x4000, 0x15d9: 0x4000, 0x15da: 0x4000, 0x15db: 0x4000, 0x15dc: 0x4000, 0x15dd: 0x4000,
+	0x15de: 0x4000, 0x15df: 0x4000, 0x15e0: 0x4000, 0x15e1: 0x4000, 0x15e2: 0x4000, 0x15e3: 0x4000,
+	0x15e4: 0x4000, 0x15e5: 0x4000, 0x15e6: 0x4000, 0x15e7: 0x4000, 0x15e8: 0x4000, 0x15e9: 0x4000,
+	0x15ea: 0x4000, 0x15eb: 0x4000, 0x15ec: 0x4000, 0x15ed: 0x4000, 0x15ee: 0x4000, 0x15ef: 0x4000,
+	0x15f0: 0x4000, 0x15f1: 0x4000, 0x15f2: 0x4000, 0x15f3: 0x4000, 0x15f4: 0x4000, 0x15f5: 0x4000,
+	0x15f6: 0x4000, 0x15f7: 0x4000, 0x15f8: 0x4000, 0x15f9: 0x4000, 0x15fa: 0x4000, 0x15fb: 0x4000,
+	0x15fc: 0x4000, 0x15ff: 0x4000,
+	// Block 0x58, offset 0x1600
+	0x1600: 0x4000, 0x1601: 0x4000, 0x1602: 0x4000, 0x1603: 0x4000, 0x1604: 0x4000, 0x1605: 0x4000,
+	0x1606: 0x4000, 0x1607: 0x4000, 0x1608: 0x4000, 0x1609: 0x4000, 0x160a: 0x4000, 0x160b: 0x4000,
+	0x160c: 0x4000, 0x160d: 0x4000, 0x160e: 0x4000, 0x160f: 0x4000, 0x1610: 0x4000, 0x1611: 0x4000,
+	0x1612: 0x4000, 0x1613: 0x4000, 0x1614: 0x4000, 0x1615: 0x4000, 0x1616: 0x4000, 0x1617: 0x4000,
+	0x1618: 0x4000, 0x1619: 0x4000, 0x161a: 0x4000, 0x161b: 0x4000, 0x161c: 0x4000, 0x161d: 0x4000,
+	0x161e: 0x4000, 0x161f: 0x4000, 0x1620: 0x4000, 0x1621: 0x4000, 0x1622: 0x4000, 0x1623: 0x4000,
+	0x1624: 0x4000, 0x1625: 0x4000, 0x1626: 0x4000, 0x1627: 0x4000, 0x1628: 0x4000, 0x1629: 0x4000,
+	0x162a: 0x4000, 0x162b: 0x4000, 0x162c: 0x4000, 0x162d: 0x4000, 0x162e: 0x4000, 0x162f: 0x4000,
+	0x1630: 0x4000, 0x1631: 0x4000, 0x1632: 0x4000, 0x1633: 0x4000, 0x1634: 0x4000, 0x1635: 0x4000,
+	0x1636: 0x4000, 0x1637: 0x4000, 0x1638: 0x4000, 0x1639: 0x4000, 0x163a: 0x4000, 0x163b: 0x4000,
+	0x163c: 0x4000, 0x163d: 0x4000,
+	// Block 0x59, offset 0x1640
+	0x164b: 0x4000,
+	0x164c: 0x4000, 0x164d: 0x4000, 0x164e: 0x4000, 0x1650: 0x4000, 0x1651: 0x4000,
+	0x1652: 0x4000, 0x1653: 0x4000, 0x1654: 0x4000, 0x1655: 0x4000, 0x1656: 0x4000, 0x1657: 0x4000,
+	0x1658: 0x4000, 0x1659: 0x4000, 0x165a: 0x4000, 0x165b: 0x4000, 0x165c: 0x4000, 0x165d: 0x4000,
+	0x165e: 0x4000, 0x165f: 0x4000, 0x1660: 0x4000, 0x1661: 0x4000, 0x1662: 0x4000, 0x1663: 0x4000,
+	0x1664: 0x4000, 0x1665: 0x4000, 0x1666: 0x4000, 0x1667: 0x4000,
+	0x167a: 0x4000,
+	// Block 0x5a, offset 0x1680
+	0x1695: 0x4000, 0x1696: 0x4000,
+	0x16a4: 0x4000,
+	// Block 0x5b, offset 0x16c0
+	0x16fb: 0x4000,
+	0x16fc: 0x4000, 0x16fd: 0x4000, 0x16fe: 0x4000, 0x16ff: 0x4000,
+	// Block 0x5c, offset 0x1700
+	0x1700: 0x4000, 0x1701: 0x4000, 0x1702: 0x4000, 0x1703: 0x4000, 0x1704: 0x4000, 0x1705: 0x4000,
+	0x1706: 0x4000, 0x1707: 0x4000, 0x1708: 0x4000, 0x1709: 0x4000, 0x170a: 0x4000, 0x170b: 0x4000,
+	0x170c: 0x4000, 0x170d: 0x4000, 0x170e: 0x4000, 0x170f: 0x4000,
+	// Block 0x5d, offset 0x1740
+	0x1740: 0x4000, 0x1741: 0x4000, 0x1742: 0x4000, 0x1743: 0x4000, 0x1744: 0x4000, 0x1745: 0x4000,
+	0x174c: 0x4000, 0x1750: 0x4000, 0x1751: 0x4000,
+	0x1752: 0x4000,
+	0x176b: 0x4000, 0x176c: 0x4000,
+	0x1774: 0x4000, 0x1775: 0x4000,
+	0x1776: 0x4000,
+	// Block 0x5e, offset 0x1780
+	0x1790: 0x4000, 0x1791: 0x4000,
+	0x1792: 0x4000, 0x1793: 0x4000, 0x1794: 0x4000, 0x1795: 0x4000, 0x1796: 0x4000, 0x1797: 0x4000,
+	0x1798: 0x4000, 0x1799: 0x4000, 0x179a: 0x4000, 0x179b: 0x4000, 0x179c: 0x4000, 0x179d: 0x4000,
+	0x179e: 0x4000, 0x17a0: 0x4000, 0x17a1: 0x4000, 0x17a2: 0x4000, 0x17a3: 0x4000,
+	0x17a4: 0x4000, 0x17a5: 0x4000, 0x17a6: 0x4000, 0x17a7: 0x4000,
+	0x17b0: 0x4000, 0x17b3: 0x4000, 0x17b4: 0x4000, 0x17b5: 0x4000,
+	0x17b6: 0x4000, 0x17b7: 0x4000, 0x17b8: 0x4000, 0x17b9: 0x4000, 0x17ba: 0x4000, 0x17bb: 0x4000,
+	0x17bc: 0x4000, 0x17bd: 0x4000, 0x17be: 0x4000,
+	// Block 0x5f, offset 0x17c0
+	0x17c0: 0x4000, 0x17c1: 0x4000, 0x17c2: 0x4000, 0x17c3: 0x4000, 0x17c4: 0x4000, 0x17c5: 0x4000,
+	0x17c6: 0x4000, 0x17c7: 0x4000, 0x17c8: 0x4000, 0x17c9: 0x4000, 0x17ca: 0x4000, 0x17cb: 0x4000,
+	0x17d0: 0x4000, 0x17d1: 0x4000,
+	0x17d2: 0x4000, 0x17d3: 0x4000, 0x17d4: 0x4000, 0x17d5: 0x4000, 0x17d6: 0x4000, 0x17d7: 0x4000,
+	0x17d8: 0x4000, 0x17d9: 0x4000, 0x17da: 0x4000, 0x17db: 0x4000, 0x17dc: 0x4000, 0x17dd: 0x4000,
+	0x17de: 0x4000,
+	// Block 0x60, offset 0x1800
+	0x1800: 0x4000, 0x1801: 0x4000, 0x1802: 0x4000, 0x1803: 0x4000, 0x1804: 0x4000, 0x1805: 0x4000,
+	0x1806: 0x4000, 0x1807: 0x4000, 0x1808: 0x4000, 0x1809: 0x4000, 0x180a: 0x4000, 0x180b: 0x4000,
+	0x180c: 0x4000, 0x180d: 0x4000, 0x180e: 0x4000, 0x180f: 0x4000, 0x1810: 0x4000, 0x1811: 0x4000,
+	// Block 0x61, offset 0x1840
+	0x1840: 0x4000,
+	// Block 0x62, offset 0x1880
+	0x1880: 0x2000, 0x1881: 0x2000, 0x1882: 0x2000, 0x1883: 0x2000, 0x1884: 0x2000, 0x1885: 0x2000,
+	0x1886: 0x2000, 0x1887: 0x2000, 0x1888: 0x2000, 0x1889: 0x2000, 0x188a: 0x2000, 0x188b: 0x2000,
+	0x188c: 0x2000, 0x188d: 0x2000, 0x188e: 0x2000, 0x188f: 0x2000, 0x1890: 0x2000, 0x1891: 0x2000,
+	0x1892: 0x2000, 0x1893: 0x2000, 0x1894: 0x2000, 0x1895: 0x2000, 0x1896: 0x2000, 0x1897: 0x2000,
+	0x1898: 0x2000, 0x1899: 0x2000, 0x189a: 0x2000, 0x189b: 0x2000, 0x189c: 0x2000, 0x189d: 0x2000,
+	0x189e: 0x2000, 0x189f: 0x2000, 0x18a0: 0x2000, 0x18a1: 0x2000, 0x18a2: 0x2000, 0x18a3: 0x2000,
+	0x18a4: 0x2000, 0x18a5: 0x2000, 0x18a6: 0x2000, 0x18a7: 0x2000, 0x18a8: 0x2000, 0x18a9: 0x2000,
+	0x18aa: 0x2000, 0x18ab: 0x2000, 0x18ac: 0x2000, 0x18ad: 0x2000, 0x18ae: 0x2000, 0x18af: 0x2000,
+	0x18b0: 0x2000, 0x18b1: 0x2000, 0x18b2: 0x2000, 0x18b3: 0x2000, 0x18b4: 0x2000, 0x18b5: 0x2000,
+	0x18b6: 0x2000, 0x18b7: 0x2000, 0x18b8: 0x2000, 0x18b9: 0x2000, 0x18ba: 0x2000, 0x18bb: 0x2000,
+	0x18bc: 0x2000, 0x18bd: 0x2000,
+}
+
+// widthIndex: 22 blocks, 1408 entries, 1408 bytes
+// Block 0 is the zero block.
+var widthIndex = [1408]uint8{
+	// Block 0x0, offset 0x0
+	// Block 0x1, offset 0x40
+	// Block 0x2, offset 0x80
+	// Block 0x3, offset 0xc0
+	0xc2: 0x01, 0xc3: 0x02, 0xc4: 0x03, 0xc5: 0x04, 0xc7: 0x05,
+	0xc9: 0x06, 0xcb: 0x07, 0xcc: 0x08, 0xcd: 0x09, 0xce: 0x0a, 0xcf: 0x0b,
+	0xd0: 0x0c, 0xd1: 0x0d,
+	0xe1: 0x02, 0xe2: 0x03, 0xe3: 0x04, 0xe4: 0x05, 0xe5: 0x06, 0xe6: 0x06, 0xe7: 0x06,
+	0xe8: 0x06, 0xe9: 0x06, 0xea: 0x07, 0xeb: 0x06, 0xec: 0x06, 0xed: 0x08, 0xee: 0x09, 0xef: 0x0a,
+	0xf0: 0x0f, 0xf3: 0x12, 0xf4: 0x13,
+	// Block 0x4, offset 0x100
+	0x104: 0x0e, 0x105: 0x0f,
+	// Block 0x5, offset 0x140
+	0x140: 0x10, 0x141: 0x11, 0x142: 0x12, 0x144: 0x13, 0x145: 0x14, 0x146: 0x15, 0x147: 0x16,
+	0x148: 0x17, 0x149: 0x18, 0x14a: 0x19, 0x14c: 0x1a, 0x14f: 0x1b,
+	0x151: 0x1c, 0x152: 0x08, 0x153: 0x1d, 0x154: 0x1e, 0x155: 0x1f, 0x156: 0x20, 0x157: 0x21,
+	0x158: 0x22, 0x159: 0x23, 0x15a: 0x24, 0x15b: 0x25, 0x15c: 0x26, 0x15d: 0x27, 0x15e: 0x28, 0x15f: 0x29,
+	0x166: 0x2a,
+	0x16c: 0x2b, 0x16d: 0x2c,
+	0x17a: 0x2d, 0x17b: 0x2e, 0x17c: 0x0e, 0x17d: 0x0e, 0x17e: 0x0e, 0x17f: 0x2f,
+	// Block 0x6, offset 0x180
+	0x180: 0x30, 0x181: 0x31, 0x182: 0x32, 0x183: 0x33, 0x184: 0x34, 0x185: 0x35, 0x186: 0x36, 0x187: 0x37,
+	0x188: 0x38, 0x189: 0x39, 0x18a: 0x0e, 0x18b: 0x3a, 0x18c: 0x0e, 0x18d: 0x0e, 0x18e: 0x0e, 0x18f: 0x0e,
+	0x190: 0x0e, 0x191: 0x0e, 0x192: 0x0e, 0x193: 0x0e, 0x194: 0x0e, 0x195: 0x0e, 0x196: 0x0e, 0x197: 0x0e,
+	0x198: 0x0e, 0x199: 0x0e, 0x19a: 0x0e, 0x19b: 0x0e, 0x19c: 0x0e, 0x19d: 0x0e, 0x19e: 0x0e, 0x19f: 0x0e,
+	0x1a0: 0x0e, 0x1a1: 0x0e, 0x1a2: 0x0e, 0x1a3: 0x0e, 0x1a4: 0x0e, 0x1a5: 0x0e, 0x1a6: 0x0e, 0x1a7: 0x0e,
+	0x1a8: 0x0e, 0x1a9: 0x0e, 0x1aa: 0x0e, 0x1ab: 0x0e, 0x1ac: 0x0e, 0x1ad: 0x0e, 0x1ae: 0x0e, 0x1af: 0x0e,
+	0x1b0: 0x0e, 0x1b1: 0x0e, 0x1b2: 0x0e, 0x1b3: 0x0e, 0x1b4: 0x0e, 0x1b5: 0x0e, 0x1b6: 0x0e, 0x1b7: 0x0e,
+	0x1b8: 0x0e, 0x1b9: 0x0e, 0x1ba: 0x0e, 0x1bb: 0x0e, 0x1bc: 0x0e, 0x1bd: 0x0e, 0x1be: 0x0e, 0x1bf: 0x0e,
+	// Block 0x7, offset 0x1c0
+	0x1c0: 0x0e, 0x1c1: 0x0e, 0x1c2: 0x0e, 0x1c3: 0x0e, 0x1c4: 0x0e, 0x1c5: 0x0e, 0x1c6: 0x0e, 0x1c7: 0x0e,
+	0x1c8: 0x0e, 0x1c9: 0x0e, 0x1ca: 0x0e, 0x1cb: 0x0e, 0x1cc: 0x0e, 0x1cd: 0x0e, 0x1ce: 0x0e, 0x1cf: 0x0e,
+	0x1d0: 0x0e, 0x1d1: 0x0e, 0x1d2: 0x0e, 0x1d3: 0x0e, 0x1d4: 0x0e, 0x1d5: 0x0e, 0x1d6: 0x0e, 0x1d7: 0x0e,
+	0x1d8: 0x0e, 0x1d9: 0x0e, 0x1da: 0x0e, 0x1db: 0x0e, 0x1dc: 0x0e, 0x1dd: 0x0e, 0x1de: 0x0e, 0x1df: 0x0e,
+	0x1e0: 0x0e, 0x1e1: 0x0e, 0x1e2: 0x0e, 0x1e3: 0x0e, 0x1e4: 0x0e, 0x1e5: 0x0e, 0x1e6: 0x0e, 0x1e7: 0x0e,
+	0x1e8: 0x0e, 0x1e9: 0x0e, 0x1ea: 0x0e, 0x1eb: 0x0e, 0x1ec: 0x0e, 0x1ed: 0x0e, 0x1ee: 0x0e, 0x1ef: 0x0e,
+	0x1f0: 0x0e, 0x1f1: 0x0e, 0x1f2: 0x0e, 0x1f3: 0x0e, 0x1f4: 0x0e, 0x1f5: 0x0e, 0x1f6: 0x0e,
+	0x1f8: 0x0e, 0x1f9: 0x0e, 0x1fa: 0x0e, 0x1fb: 0x0e, 0x1fc: 0x0e, 0x1fd: 0x0e, 0x1fe: 0x0e, 0x1ff: 0x0e,
+	// Block 0x8, offset 0x200
+	0x200: 0x0e, 0x201: 0x0e, 0x202: 0x0e, 0x203: 0x0e, 0x204: 0x0e, 0x205: 0x0e, 0x206: 0x0e, 0x207: 0x0e,
+	0x208: 0x0e, 0x209: 0x0e, 0x20a: 0x0e, 0x20b: 0x0e, 0x20c: 0x0e, 0x20d: 0x0e, 0x20e: 0x0e, 0x20f: 0x0e,
+	0x210: 0x0e, 0x211: 0x0e, 0x212: 0x0e, 0x213: 0x0e, 0x214: 0x0e, 0x215: 0x0e, 0x216: 0x0e, 0x217: 0x0e,
+	0x218: 0x0e, 0x219: 0x0e, 0x21a: 0x0e, 0x21b: 0x0e, 0x21c: 0x0e, 0x21d: 0x0e, 0x21e: 0x0e, 0x21f: 0x0e,
+	0x220: 0x0e, 0x221: 0x0e, 0x222: 0x0e, 0x223: 0x0e, 0x224: 0x0e, 0x225: 0x0e, 0x226: 0x0e, 0x227: 0x0e,
+	0x228: 0x0e, 0x229: 0x0e, 0x22a: 0x0e, 0x22b: 0x0e, 0x22c: 0x0e, 0x22d: 0x0e, 0x22e: 0x0e, 0x22f: 0x0e,
+	0x230: 0x0e, 0x231: 0x0e, 0x232: 0x0e, 0x233: 0x0e, 0x234: 0x0e, 0x235: 0x0e, 0x236: 0x0e, 0x237: 0x0e,
+	0x238: 0x0e, 0x239: 0x0e, 0x23a: 0x0e, 0x23b: 0x0e, 0x23c: 0x0e, 0x23d: 0x0e, 0x23e: 0x0e, 0x23f: 0x0e,
+	// Block 0x9, offset 0x240
+	0x240: 0x0e, 0x241: 0x0e, 0x242: 0x0e, 0x243: 0x0e, 0x244: 0x0e, 0x245: 0x0e, 0x246: 0x0e, 0x247: 0x0e,
+	0x248: 0x0e, 0x249: 0x0e, 0x24a: 0x0e, 0x24b: 0x0e, 0x24c: 0x0e, 0x24d: 0x0e, 0x24e: 0x0e, 0x24f: 0x0e,
+	0x250: 0x0e, 0x251: 0x0e, 0x252: 0x3b, 0x253: 0x3c,
+	0x265: 0x3d,
+	0x270: 0x0e, 0x271: 0x0e, 0x272: 0x0e, 0x273: 0x0e, 0x274: 0x0e, 0x275: 0x0e, 0x276: 0x0e, 0x277: 0x0e,
+	0x278: 0x0e, 0x279: 0x0e, 0x27a: 0x0e, 0x27b: 0x0e, 0x27c: 0x0e, 0x27d: 0x0e, 0x27e: 0x0e, 0x27f: 0x0e,
+	// Block 0xa, offset 0x280
+	0x280: 0x0e, 0x281: 0x0e, 0x282: 0x0e, 0x283: 0x0e, 0x284: 0x0e, 0x285: 0x0e, 0x286: 0x0e, 0x287: 0x0e,
+	0x288: 0x0e, 0x289: 0x0e, 0x28a: 0x0e, 0x28b: 0x0e, 0x28c: 0x0e, 0x28d: 0x0e, 0x28e: 0x0e, 0x28f: 0x0e,
+	0x290: 0x0e, 0x291: 0x0e, 0x292: 0x0e, 0x293: 0x0e, 0x294: 0x0e, 0x295: 0x0e, 0x296: 0x0e, 0x297: 0x0e,
+	0x298: 0x0e, 0x299: 0x0e, 0x29a: 0x0e, 0x29b: 0x0e, 0x29c: 0x0e, 0x29d: 0x0e, 0x29e: 0x3e,
+	// Block 0xb, offset 0x2c0
+	0x2c0: 0x08, 0x2c1: 0x08, 0x2c2: 0x08, 0x2c3: 0x08, 0x2c4: 0x08, 0x2c5: 0x08, 0x2c6: 0x08, 0x2c7: 0x08,
+	0x2c8: 0x08, 0x2c9: 0x08, 0x2ca: 0x08, 0x2cb: 0x08, 0x2cc: 0x08, 0x2cd: 0x08, 0x2ce: 0x08, 0x2cf: 0x08,
+	0x2d0: 0x08, 0x2d1: 0x08, 0x2d2: 0x08, 0x2d3: 0x08, 0x2d4: 0x08, 0x2d5: 0x08, 0x2d6: 0x08, 0x2d7: 0x08,
+	0x2d8: 0x08, 0x2d9: 0x08, 0x2da: 0x08, 0x2db: 0x08, 0x2dc: 0x08, 0x2dd: 0x08, 0x2de: 0x08, 0x2df: 0x08,
+	0x2e0: 0x08, 0x2e1: 0x08, 0x2e2: 0x08, 0x2e3: 0x08, 0x2e4: 0x08, 0x2e5: 0x08, 0x2e6: 0x08, 0x2e7: 0x08,
+	0x2e8: 0x08, 0x2e9: 0x08, 0x2ea: 0x08, 0x2eb: 0x08, 0x2ec: 0x08, 0x2ed: 0x08, 0x2ee: 0x08, 0x2ef: 0x08,
+	0x2f0: 0x08, 0x2f1: 0x08, 0x2f2: 0x08, 0x2f3: 0x08, 0x2f4: 0x08, 0x2f5: 0x08, 0x2f6: 0x08, 0x2f7: 0x08,
+	0x2f8: 0x08, 0x2f9: 0x08, 0x2fa: 0x08, 0x2fb: 0x08, 0x2fc: 0x08, 0x2fd: 0x08, 0x2fe: 0x08, 0x2ff: 0x08,
+	// Block 0xc, offset 0x300
+	0x300: 0x08, 0x301: 0x08, 0x302: 0x08, 0x303: 0x08, 0x304: 0x08, 0x305: 0x08, 0x306: 0x08, 0x307: 0x08,
+	0x308: 0x08, 0x309: 0x08, 0x30a: 0x08, 0x30b: 0x08, 0x30c: 0x08, 0x30d: 0x08, 0x30e: 0x08, 0x30f: 0x08,
+	0x310: 0x08, 0x311: 0x08, 0x312: 0x08, 0x313: 0x08, 0x314: 0x08, 0x315: 0x08, 0x316: 0x08, 0x317: 0x08,
+	0x318: 0x08, 0x319: 0x08, 0x31a: 0x08, 0x31b: 0x08, 0x31c: 0x08, 0x31d: 0x08, 0x31e: 0x08, 0x31f: 0x08,
+	0x320: 0x08, 0x321: 0x08, 0x322: 0x08, 0x323: 0x08, 0x324: 0x0e, 0x325: 0x0e, 0x326: 0x0e, 0x327: 0x0e,
+	0x328: 0x0e, 0x329: 0x0e, 0x32a: 0x0e, 0x32b: 0x0e,
+	0x338: 0x3f, 0x339: 0x40, 0x33c: 0x41, 0x33d: 0x42, 0x33e: 0x43, 0x33f: 0x44,
+	// Block 0xd, offset 0x340
+	0x37f: 0x45,
+	// Block 0xe, offset 0x380
+	0x380: 0x0e, 0x381: 0x0e, 0x382: 0x0e, 0x383: 0x0e, 0x384: 0x0e, 0x385: 0x0e, 0x386: 0x0e, 0x387: 0x0e,
+	0x388: 0x0e, 0x389: 0x0e, 0x38a: 0x0e, 0x38b: 0x0e, 0x38c: 0x0e, 0x38d: 0x0e, 0x38e: 0x0e, 0x38f: 0x0e,
+	0x390: 0x0e, 0x391: 0x0e, 0x392: 0x0e, 0x393: 0x0e, 0x394: 0x0e, 0x395: 0x0e, 0x396: 0x0e, 0x397: 0x0e,
+	0x398: 0x0e, 0x399: 0x0e, 0x39a: 0x0e, 0x39b: 0x0e, 0x39c: 0x0e, 0x39d: 0x0e, 0x39e: 0x0e, 0x39f: 0x46,
+	0x3a0: 0x0e, 0x3a1: 0x0e, 0x3a2: 0x0e, 0x3a3: 0x0e, 0x3a4: 0x0e, 0x3a5: 0x0e, 0x3a6: 0x0e, 0x3a7: 0x0e,
+	0x3a8: 0x0e, 0x3a9: 0x0e, 0x3aa: 0x0e, 0x3ab: 0x47,
+	// Block 0xf, offset 0x3c0
+	0x3c0: 0x48,
+	// Block 0x10, offset 0x400
+	0x400: 0x49, 0x403: 0x4a, 0x404: 0x4b, 0x405: 0x4c, 0x406: 0x4d,
+	0x408: 0x4e, 0x409: 0x4f, 0x40c: 0x50, 0x40d: 0x51, 0x40e: 0x52, 0x40f: 0x53,
+	0x410: 0x3a, 0x411: 0x54, 0x412: 0x0e, 0x413: 0x55, 0x414: 0x56, 0x415: 0x57, 0x416: 0x58, 0x417: 0x59,
+	0x418: 0x0e, 0x419: 0x5a, 0x41a: 0x0e, 0x41b: 0x5b,
+	0x424: 0x5c, 0x425: 0x5d, 0x426: 0x5e, 0x427: 0x5f,
+	// Block 0x11, offset 0x440
+	0x456: 0x0b, 0x457: 0x06,
+	0x458: 0x0c, 0x45b: 0x0d, 0x45f: 0x0e,
+	0x460: 0x06, 0x461: 0x06, 0x462: 0x06, 0x463: 0x06, 0x464: 0x06, 0x465: 0x06, 0x466: 0x06, 0x467: 0x06,
+	0x468: 0x06, 0x469: 0x06, 0x46a: 0x06, 0x46b: 0x06, 0x46c: 0x06, 0x46d: 0x06, 0x46e: 0x06, 0x46f: 0x06,
+	0x470: 0x06, 0x471: 0x06, 0x472: 0x06, 0x473: 0x06, 0x474: 0x06, 0x475: 0x06, 0x476: 0x06, 0x477: 0x06,
+	0x478: 0x06, 0x479: 0x06, 0x47a: 0x06, 0x47b: 0x06, 0x47c: 0x06, 0x47d: 0x06, 0x47e: 0x06, 0x47f: 0x06,
+	// Block 0x12, offset 0x480
+	0x484: 0x08, 0x485: 0x08, 0x486: 0x08, 0x487: 0x09,
+	// Block 0x13, offset 0x4c0
+	0x4c0: 0x08, 0x4c1: 0x08, 0x4c2: 0x08, 0x4c3: 0x08, 0x4c4: 0x08, 0x4c5: 0x08, 0x4c6: 0x08, 0x4c7: 0x08,
+	0x4c8: 0x08, 0x4c9: 0x08, 0x4ca: 0x08, 0x4cb: 0x08, 0x4cc: 0x08, 0x4cd: 0x08, 0x4ce: 0x08, 0x4cf: 0x08,
+	0x4d0: 0x08, 0x4d1: 0x08, 0x4d2: 0x08, 0x4d3: 0x08, 0x4d4: 0x08, 0x4d5: 0x08, 0x4d6: 0x08, 0x4d7: 0x08,
+	0x4d8: 0x08, 0x4d9: 0x08, 0x4da: 0x08, 0x4db: 0x08, 0x4dc: 0x08, 0x4dd: 0x08, 0x4de: 0x08, 0x4df: 0x08,
+	0x4e0: 0x08, 0x4e1: 0x08, 0x4e2: 0x08, 0x4e3: 0x08, 0x4e4: 0x08, 0x4e5: 0x08, 0x4e6: 0x08, 0x4e7: 0x08,
+	0x4e8: 0x08, 0x4e9: 0x08, 0x4ea: 0x08, 0x4eb: 0x08, 0x4ec: 0x08, 0x4ed: 0x08, 0x4ee: 0x08, 0x4ef: 0x08,
+	0x4f0: 0x08, 0x4f1: 0x08, 0x4f2: 0x08, 0x4f3: 0x08, 0x4f4: 0x08, 0x4f5: 0x08, 0x4f6: 0x08, 0x4f7: 0x08,
+	0x4f8: 0x08, 0x4f9: 0x08, 0x4fa: 0x08, 0x4fb: 0x08, 0x4fc: 0x08, 0x4fd: 0x08, 0x4fe: 0x08, 0x4ff: 0x60,
+	// Block 0x14, offset 0x500
+	0x520: 0x10,
+	0x530: 0x09, 0x531: 0x09, 0x532: 0x09, 0x533: 0x09, 0x534: 0x09, 0x535: 0x09, 0x536: 0x09, 0x537: 0x09,
+	0x538: 0x09, 0x539: 0x09, 0x53a: 0x09, 0x53b: 0x09, 0x53c: 0x09, 0x53d: 0x09, 0x53e: 0x09, 0x53f: 0x11,
+	// Block 0x15, offset 0x540
+	0x540: 0x09, 0x541: 0x09, 0x542: 0x09, 0x543: 0x09, 0x544: 0x09, 0x545: 0x09, 0x546: 0x09, 0x547: 0x09,
+	0x548: 0x09, 0x549: 0x09, 0x54a: 0x09, 0x54b: 0x09, 0x54c: 0x09, 0x54d: 0x09, 0x54e: 0x09, 0x54f: 0x11,
+}
+
+// inverseData contains 4-byte entries of the following format:
+//   <length> <modified UTF-8-encoded rune> <0 padding>
+// The last byte of the UTF-8-encoded rune is xor-ed with the last byte of the
+// UTF-8 encoding of the original rune. Mappings often have the following
+// pattern:
+//   Ａ -> A  (U+FF21 -> U+0041)
+//   Ｂ -> B  (U+FF22 -> U+0042)
+//   ...
+// By xor-ing the last byte the same entry can be shared by many mappings. This
+// reduces the total number of distinct entries by about two thirds.
+// The resulting entry for the aforementioned mappings is
+//   { 0x01, 0xE0, 0x00, 0x00 }
+// Using this entry to map U+FF21 (UTF-8 [EF BC A1]), we get
+//   E0 ^ A1 = 41.
+// Similarly, for U+FF22 (UTF-8 [EF BC A2]), we get
+//   E0 ^ A2 = 42.
+// Note that because of the xor-ing, the byte sequence stored in the entry is
+// not valid UTF-8.
+var inverseData = [150][4]byte{
+	{0x00, 0x00, 0x00, 0x00},
+	{0x03, 0xe3, 0x80, 0xa0},
+	{0x03, 0xef, 0xbc, 0xa0},
+	{0x03, 0xef, 0xbc, 0xe0},
+	{0x03, 0xef, 0xbd, 0xe0},
+	{0x03, 0xef, 0xbf, 0x02},
+	{0x03, 0xef, 0xbf, 0x00},
+	{0x03, 0xef, 0xbf, 0x0e},
+	{0x03, 0xef, 0xbf, 0x0c},
+	{0x03, 0xef, 0xbf, 0x0f},
+	{0x03, 0xef, 0xbf, 0x39},
+	{0x03, 0xef, 0xbf, 0x3b},
+	{0x03, 0xef, 0xbf, 0x3f},
+	{0x03, 0xef, 0xbf, 0x2a},
+	{0x03, 0xef, 0xbf, 0x0d},
+	{0x03, 0xef, 0xbf, 0x25},
+	{0x03, 0xef, 0xbd, 0x1a},
+	{0x03, 0xef, 0xbd, 0x26},
+	{0x01, 0xa0, 0x00, 0x00},
+	{0x03, 0xef, 0xbd, 0x25},
+	{0x03, 0xef, 0xbd, 0x23},
+	{0x03, 0xef, 0xbd, 0x2e},
+	{0x03, 0xef, 0xbe, 0x07},
+	{0x03, 0xef, 0xbe, 0x05},
+	{0x03, 0xef, 0xbd, 0x06},
+	{0x03, 0xef, 0xbd, 0x13},
+	{0x03, 0xef, 0xbd, 0x0b},
+	{0x03, 0xef, 0xbd, 0x16},
+	{0x03, 0xef, 0xbd, 0x0c},
+	{0x03, 0xef, 0xbd, 0x15},
+	{0x03, 0xef, 0xbd, 0x0d},
+	{0x03, 0xef, 0xbd, 0x1c},
+	{0x03, 0xef, 0xbd, 0x02},
+	{0x03, 0xef, 0xbd, 0x1f},
+	{0x03, 0xef, 0xbd, 0x1d},
+	{0x03, 0xef, 0xbd, 0x17},
+	{0x03, 0xef, 0xbd, 0x08},
+	{0x03, 0xef, 0xbd, 0x09},
+	{0x03, 0xef, 0xbd, 0x0e},
+	{0x03, 0xef, 0xbd, 0x04},
+	{0x03, 0xef, 0xbd, 0x05},
+	{0x03, 0xef, 0xbe, 0x3f},
+	{0x03, 0xef, 0xbe, 0x00},
+	{0x03, 0xef, 0xbd, 0x2c},
+	{0x03, 0xef, 0xbe, 0x06},
+	{0x03, 0xef, 0xbe, 0x0c},
+	{0x03, 0xef, 0xbe, 0x0f},
+	{0x03, 0xef, 0xbe, 0x0d},
+	{0x03, 0xef, 0xbe, 0x0b},
+	{0x03, 0xef, 0xbe, 0x19},
+	{0x03, 0xef, 0xbe, 0x15},
+	{0x03, 0xef, 0xbe, 0x11},
+	{0x03, 0xef, 0xbe, 0x31},
+	{0x03, 0xef, 0xbe, 0x33},
+	{0x03, 0xef, 0xbd, 0x0f},
+	{0x03, 0xef, 0xbe, 0x30},
+	{0x03, 0xef, 0xbe, 0x3e},
+	{0x03, 0xef, 0xbe, 0x32},
+	{0x03, 0xef, 0xbe, 0x36},
+	{0x03, 0xef, 0xbd, 0x14},
+	{0x03, 0xef, 0xbe, 0x2e},
+	{0x03, 0xef, 0xbd, 0x1e},
+	{0x03, 0xef, 0xbe, 0x10},
+	{0x03, 0xef, 0xbf, 0x13},
+	{0x03, 0xef, 0xbf, 0x15},
+	{0x03, 0xef, 0xbf, 0x17},
+	{0x03, 0xef, 0xbf, 0x1f},
+	{0x03, 0xef, 0xbf, 0x1d},
+	{0x03, 0xef, 0xbf, 0x1b},
+	{0x03, 0xef, 0xbf, 0x09},
+	{0x03, 0xef, 0xbf, 0x0b},
+	{0x03, 0xef, 0xbf, 0x37},
+	{0x03, 0xef, 0xbe, 0x04},
+	{0x01, 0xe0, 0x00, 0x00},
+	{0x03, 0xe2, 0xa6, 0x1a},
+	{0x03, 0xe2, 0xa6, 0x26},
+	{0x03, 0xe3, 0x80, 0x23},
+	{0x03, 0xe3, 0x80, 0x2e},
+	{0x03, 0xe3, 0x80, 0x25},
+	{0x03, 0xe3, 0x83, 0x1e},
+	{0x03, 0xe3, 0x83, 0x14},
+	{0x03, 0xe3, 0x82, 0x06},
+	{0x03, 0xe3, 0x82, 0x0b},
+	{0x03, 0xe3, 0x82, 0x0c},
+	{0x03, 0xe3, 0x82, 0x0d},
+	{0x03, 0xe3, 0x82, 0x02},
+	{0x03, 0xe3, 0x83, 0x0f},
+	{0x03, 0xe3, 0x83, 0x08},
+	{0x03, 0xe3, 0x83, 0x09},
+	{0x03, 0xe3, 0x83, 0x2c},
+	{0x03, 0xe3, 0x83, 0x0c},
+	{0x03, 0xe3, 0x82, 0x13},
+	{0x03, 0xe3, 0x82, 0x16},
+	{0x03, 0xe3, 0x82, 0x15},
+	{0x03, 0xe3, 0x82, 0x1c},
+	{0x03, 0xe3, 0x82, 0x1f},
+	{0x03, 0xe3, 0x82, 0x1d},
+	{0x03, 0xe3, 0x82, 0x1a},
+	{0x03, 0xe3, 0x82, 0x17},
+	{0x03, 0xe3, 0x82, 0x08},
+	{0x03, 0xe3, 0x82, 0x09},
+	{0x03, 0xe3, 0x82, 0x0e},
+	{0x03, 0xe3, 0x82, 0x04},
+	{0x03, 0xe3, 0x82, 0x05},
+	{0x03, 0xe3, 0x82, 0x3f},
+	{0x03, 0xe3, 0x83, 0x00},
+	{0x03, 0xe3, 0x83, 0x06},
+	{0x03, 0xe3, 0x83, 0x05},
+	{0x03, 0xe3, 0x83, 0x0d},
+	{0x03, 0xe3, 0x83, 0x0b},
+	{0x03, 0xe3, 0x83, 0x07},
+	{0x03, 0xe3, 0x83, 0x19},
+	{0x03, 0xe3, 0x83, 0x15},
+	{0x03, 0xe3, 0x83, 0x11},
+	{0x03, 0xe3, 0x83, 0x31},
+	{0x03, 0xe3, 0x83, 0x33},
+	{0x03, 0xe3, 0x83, 0x30},
+	{0x03, 0xe3, 0x83, 0x3e},
+	{0x03, 0xe3, 0x83, 0x32},
+	{0x03, 0xe3, 0x83, 0x36},
+	{0x03, 0xe3, 0x83, 0x2e},
+	{0x03, 0xe3, 0x82, 0x07},
+	{0x03, 0xe3, 0x85, 0x04},
+	{0x03, 0xe3, 0x84, 0x10},
+	{0x03, 0xe3, 0x85, 0x30},
+	{0x03, 0xe3, 0x85, 0x0d},
+	{0x03, 0xe3, 0x85, 0x13},
+	{0x03, 0xe3, 0x85, 0x15},
+	{0x03, 0xe3, 0x85, 0x17},
+	{0x03, 0xe3, 0x85, 0x1f},
+	{0x03, 0xe3, 0x85, 0x1d},
+	{0x03, 0xe3, 0x85, 0x1b},
+	{0x03, 0xe3, 0x85, 0x09},
+	{0x03, 0xe3, 0x85, 0x0f},
+	{0x03, 0xe3, 0x85, 0x0b},
+	{0x03, 0xe3, 0x85, 0x37},
+	{0x03, 0xe3, 0x85, 0x3b},
+	{0x03, 0xe3, 0x85, 0x39},
+	{0x03, 0xe3, 0x85, 0x3f},
+	{0x02, 0xc2, 0x02, 0x00},
+	{0x02, 0xc2, 0x0e, 0x00},
+	{0x02, 0xc2, 0x0c, 0x00},
+	{0x02, 0xc2, 0x00, 0x00},
+	{0x03, 0xe2, 0x82, 0x0f},
+	{0x03, 0xe2, 0x94, 0x2a},
+	{0x03, 0xe2, 0x86, 0x39},
+	{0x03, 0xe2, 0x86, 0x3b},
+	{0x03, 0xe2, 0x86, 0x3f},
+	{0x03, 0xe2, 0x96, 0x0d},
+	{0x03, 0xe2, 0x97, 0x25},
+}
+
+// Total table size 14680 bytes (14KiB)

From b5cd6259e14245d7ae078c79ea57f03c2b1de6d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 11 Apr 2018 14:23:27 +0200
Subject: [PATCH 1284/1304] CHANGELOG: add v1.30.0

---
 CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b279c75de9..a785c712e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,43 @@
+## 1.30.0
+
+This release includes some small command line tweaks and adds support for CRI logging in iottymux which is required by rktlet.
+It also fixes a number of bugs, adds a lot of new documentation, and updates some dependencies.
+
+### New features
+
+- status: added read from uuid-file ([#3860](https://github.com/rkt/rkt/pull/3860)).
+- stage0/run: relax '--hosts-entry' parser ([#3833](https://github.com/rkt/rkt/pull/3833)).
+- iottymux: store logs for kubelet in the appropriate location ([#3798](https://github.com/rkt/rkt/pull/3798)). This change is made for rktlet. iottymux will store the logs directly in the CRI format.
+- rkt: add AWS auth headerer support to `rkt config` ([#3910](https://github.com/rkt/rkt/pull/3910)).
+
+### Bugfixes
+
+- kvm: solve certain routing issues by using the same default bridge as CNI ([#3905](https://github.com/rkt/rkt/pull/3905)).
+- networking/portfwd: fix compare routeLocalnetValue ([#3897](https://github.com/rkt/rkt/pull/3897)).
+- list: add ip of non-running pods to status output ([#3857](https://github.com/rkt/rkt/pull/3857)).
+- stage1: execute pre-start/post-stop hooks as privileged ([#3844](https://github.com/rkt/rkt/pull/3844)). Even if we run the container as an unprivileged user.
+- stage1-fly/run: allow non absolute commands to be run ([#3845](https://github.com/rkt/rkt/pull/3845)).
+- rkt: prevent skipping some images in image gc ([#3858](https://github.com/rkt/rkt/pull/3858)).
+- rkt: skip parsing in case of an empty string ([#3822](https://github.com/rkt/rkt/pull/3822)). Fix issue where `rkt app add` fails with an error message like `must give only one app`, even when only one app name is given.
+
+### Build system
+
+- scripts: Add libfdt to install deps ([#3834](https://github.com/rkt/rkt/pull/3834)). libfdt-dev is needed when building kernels for architectures that support a device tree.
+- makelib: Fix go-find-directories symlink problem ([#3824](https://github.com/rkt/rkt/pull/3824)).
+- scripts: adding missing dependecies to debian dependency installer ([#3829](https://github.com/rkt/rkt/pull/3829)).
+- scripts/build-pkgs: use RPM file dependency for shadow tools ([#3904](https://github.com/rkt/rkt/pull/3904)).
+
+### Other changes
+
+- Lots of [documentation updates](https://github.com/rkt/rkt/pulls?q=is%3Apr+label%3Akind%2Fdocumentation++milestone%3Av1.30.0).
+- selinux: Update to latest ([#3818](https://github.com/rkt/rkt/pull/3818)).
+- travis: update go versions ([#3821](https://github.com/rkt/rkt/pull/3821)).
+- vendor: bump docker2aci to v0.17.1 ([#3835](https://github.com/rkt/rkt/pull/3835)). It fixes an image pulling bug for some images in GCR.
+- Fixes all the misspell ([#3870](https://github.com/rkt/rkt/pull/3870)).
+- stage1/usr_from_coreos: add new image signing subkey 0638EB2F ([#3902](https://github.com/rkt/rkt/pull/3902)).
+- tests: Use semaphore install-package ([#3827](https://github.com/rkt/rkt/pull/3827)).
+- tests: Add verbose flag to build-and-run-tests.sh ([#3819](https://github.com/rkt/rkt/pull/3819)).
+
 ## 1.29.0
 
 This release contains a number of bugfixes, new features like the ability to share the host IPC namespace, dependency updates, and build system improvements.

From e04dd994baa1051f1205578d12d69eec83dbb905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 11 Apr 2018 14:23:39 +0200
Subject: [PATCH 1285/1304] version: bump to v1.30.0

---
 Documentation/devel/inspect-containers.md |  2 +-
 Documentation/distributions.md            | 16 ++++++++--------
 Documentation/pod-manifest.md             |  2 +-
 Documentation/proposals/oci.md            |  6 +++---
 Documentation/running-fly-stage1.md       |  4 ++--
 Documentation/running-kvm-stage1.md       |  6 +++---
 Documentation/subcommands/prepare.md      |  4 ++--
 Documentation/subcommands/version.md      |  2 +-
 Documentation/trying-out-rkt.md           |  6 +++---
 configure.ac                              |  2 +-
 scripts/install-rkt.sh                    |  2 +-
 tests/empty-image/manifest                |  2 +-
 tests/image/manifest                      |  2 +-
 tests/rkt-monitor/build-stresser.sh       |  2 +-
 tests/rkt_exec_test.go                    |  2 +-
 tests/rkt_image_cat_manifest_test.go      |  2 +-
 tests/rkt_image_export_test.go            |  2 +-
 tests/rkt_image_render_test.go            |  2 +-
 tests/rkt_os_arch_test.go                 |  2 +-
 tests/rkt_run_test.go                     |  2 +-
 20 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Documentation/devel/inspect-containers.md b/Documentation/devel/inspect-containers.md
index 07470d5aef..063e33e5c8 100644
--- a/Documentation/devel/inspect-containers.md
+++ b/Documentation/devel/inspect-containers.md
@@ -69,7 +69,7 @@ The default network uses the [ptp plugin][ptp] with [host-local][host-local] as
 5730  execve("stage1/rootfs/usr/lib/rkt/plugins/net/host-local", ["stage1/rootfs/usr/lib/rkt/plugins/net/host-local"], 0xc42008e240 /* 32 vars */ <unfinished ...>
 ```
 
-In this case, the CNI plugins use come from rkt's stage1, but [rkt is also able to pick a CNI plugin installed externally](https://github.com/rkt/rkt/blob/v1.29.0/Documentation/networking/overview.md#custom-plugins).
+In this case, the CNI plugins use come from rkt's stage1, but [rkt is also able to pick a CNI plugin installed externally](https://github.com/rkt/rkt/blob/v1.30.0/Documentation/networking/overview.md#custom-plugins).
 
 The plugins will do some iptables magic to configure the network:
 
diff --git a/Documentation/distributions.md b/Documentation/distributions.md
index 7c58d8c854..8060146b27 100644
--- a/Documentation/distributions.md
+++ b/Documentation/distributions.md
@@ -147,19 +147,19 @@ upgrade manually.
 ### rpm-based 
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt-1.29.0-1.x86_64.rpm
-wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt-1.29.0-1.x86_64.rpm.asc
-gpg --verify rkt-1.29.0-1.x86_64.rpm.asc
-sudo rpm -Uvh rkt-1.29.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.30.0/rkt-1.30.0-1.x86_64.rpm
+wget https://github.com/rkt/rkt/releases/download/v1.30.0/rkt-1.30.0-1.x86_64.rpm.asc
+gpg --verify rkt-1.30.0-1.x86_64.rpm.asc
+sudo rpm -Uvh rkt-1.30.0-1.x86_64.rpm
 ```
 
 ### deb-based
 ```
 gpg --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E
-wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt_1.29.0-1_amd64.deb
-wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt_1.29.0-1_amd64.deb.asc
-gpg --verify rkt_1.29.0-1_amd64.deb.asc
-sudo dpkg -i rkt_1.29.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.30.0/rkt_1.30.0-1_amd64.deb
+wget https://github.com/rkt/rkt/releases/download/v1.30.0/rkt_1.30.0-1_amd64.deb.asc
+gpg --verify rkt_1.30.0-1_amd64.deb.asc
+sudo dpkg -i rkt_1.30.0-1_amd64.deb
 ```
 
 [cl-install-rkt]: install-rkt-in-coreos.md
diff --git a/Documentation/pod-manifest.md b/Documentation/pod-manifest.md
index c3db225774..6a484c9371 100644
--- a/Documentation/pod-manifest.md
+++ b/Documentation/pod-manifest.md
@@ -23,7 +23,7 @@ The resulting pod manifest file is:
 
 ```json
 {
-	"acVersion": "1.29.0",
+	"acVersion": "1.30.0",
 	"acKind": "PodManifest",
 	"apps": [
 		{
diff --git a/Documentation/proposals/oci.md b/Documentation/proposals/oci.md
index 499102eb12..5a2c7c4e48 100644
--- a/Documentation/proposals/oci.md
+++ b/Documentation/proposals/oci.md
@@ -141,6 +141,6 @@ Backwards compatibility: Currently the biggest concern identified is backwards c
 [oci-algorithms]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/descriptor.md#algorithms
 [oci-image-layout]: https://github.com/opencontainers/image-spec/blob/v1.0.0-rc2/image-layout.md
 
-[app-container]: https://github.com/rkt/rkt/blob/v1.29.0/Documentation/app-container.md
-[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.29.0/Documentation/devel/architecture.md#image-lifecycle
-[distribution-point]: https://github.com/rkt/rkt/blob/v1.29.0/Documentation/devel/distribution-point.md
+[app-container]: https://github.com/rkt/rkt/blob/v1.30.0/Documentation/app-container.md
+[image-lifecycle]: https://github.com/rkt/rkt/blob/v1.30.0/Documentation/devel/architecture.md#image-lifecycle
+[distribution-point]: https://github.com/rkt/rkt/blob/v1.30.0/Documentation/devel/distribution-point.md
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index c0ae334a29..ed21f06084 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -60,14 +60,14 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=fly && make
 ```
 
 For more details about configure parameters, see the [configure script parameters documentation][build-configure].
-This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.29.0+git/bin/`.
+This will build the rkt binary and the stage1-fly.aci in `build-rkt-1.30.0+git/bin/`.
 
 ### Selecting stage1 at runtime
 
 Here is a quick example of how to use a container with the official fly stage1:
 
 ```
-# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.29.0 coreos.com/etcd:v2.2.5
+# rkt run --stage1-name=coreos.com/rkt/stage1-fly:1.30.0 coreos.com/etcd:v2.2.5
 ```
 
 If the image is not in the store, `--stage1-name` will perform discovery and fetch the image.
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index ddfeb93e92..27a86f9b85 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -9,7 +9,7 @@ The KVM stage1 does not yet implement all of the default stage1's features and s
 Provided you have hardware virtualization support and the [kernel KVM module][kvm-module] loaded (refer to your distribution for instructions), you can then run an image like you would normally do with rkt:
 
 ```
-sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.29.0 docker://redis
+sudo rkt run --debug --insecure-options=image --stage1-name=coreos.com/rkt/stage1-kvm:1.30.0 docker://redis
 ```
 
 This output is the same you'll get if you run a container-based rkt.
@@ -67,7 +67,7 @@ $ ./autogen.sh && ./configure --with-stage1-flavors=kvm --with-stage1-kvm-hyperv
 ```
 
 For more details about configure parameters, see [configure script parameters documentation][build-configure].
-This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.29.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
+This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.30.0+git/target/bin/`. Depending on the configuration options, it will be `stage1-kvm.aci` (if one hypervisor is set), or `stage1-kvm-lkvm.aci` and `stage1-kvm-qemu.aci` (if you want to have both images built once).
 
 
 [build-configure]: build-configure.md
@@ -89,7 +89,7 @@ Additional [Linux kernel's command line parameters](https://www.kernel.org/doc/h
 
 ```
 sudo RKT_HYPERVISOR_EXTRA_KERNEL_PARAMS="systemd.unified_cgroup_hierarchy=true max_loop=12 possible_cpus=1" \
-      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.29.0 \
+      rkt run --stage1-name=coreos.com/rkt/stage1-kvm:1.30.0 \
       ...
 ```
 
diff --git a/Documentation/subcommands/prepare.md b/Documentation/subcommands/prepare.md
index b46d2632fc..fce0e87e67 100644
--- a/Documentation/subcommands/prepare.md
+++ b/Documentation/subcommands/prepare.md
@@ -8,7 +8,7 @@ Support for overlay fs will be auto-detected if `--no-overlay` is set to `false`
 
 ```
 # rkt prepare --insecure-options=image docker://busybox --exec=/bin/sh
-image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.29.0
+image: using image from local store for image name coreos.com/rkt/stage1-coreos:1.30.0
 image: remote fetching from URL "docker://busybox"
 Downloading sha256:8ddc19f1652 [===============================] 668 KB / 668 KB
 prepare: disabling overlay support: "unsupported filesystem: missing d_type support"
@@ -32,7 +32,7 @@ Therefore, the supported arguments are mostly the same as in `run` except runtim
 ```
 # rkt prepare coreos.com/etcd:v2.0.10
 rkt prepare coreos.com/etcd:v2.0.10
-rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.29.0
+rkt: using image from local store for image name coreos.com/rkt/stage1-coreos:1.30.0
 rkt: searching for app image coreos.com/etcd:v2.0.10
 rkt: remote fetching from url https://github.com/coreos/etcd/releases/download/v2.0.10/etcd-v2.0.10-linux-amd64.aci
 prefix: "coreos.com/etcd"
diff --git a/Documentation/subcommands/version.md b/Documentation/subcommands/version.md
index cbfacaf090..4791cb66a2 100644
--- a/Documentation/subcommands/version.md
+++ b/Documentation/subcommands/version.md
@@ -6,7 +6,7 @@ This command prints the rkt version, the appc version rkt is built against, and
 
 ```
 $ rkt version
-rkt Version: 1.29.0
+rkt Version: 1.30.0
 appc Version: 0.8.11
 Go Version: go1.5.3
 Go OS/Arch: linux/amd64
diff --git a/Documentation/trying-out-rkt.md b/Documentation/trying-out-rkt.md
index 8ae3c65a7f..0b4031cac2 100644
--- a/Documentation/trying-out-rkt.md
+++ b/Documentation/trying-out-rkt.md
@@ -20,9 +20,9 @@ rkt is written in Go and can be compiled for several CPU architectures. The rkt
 To start running the latest version of rkt on amd64, grab the release directly from the rkt GitHub project:
 
 ```
-wget https://github.com/rkt/rkt/releases/download/v1.29.0/rkt-v1.29.0.tar.gz
-tar xzvf rkt-v1.29.0.tar.gz
-cd rkt-v1.29.0
+wget https://github.com/rkt/rkt/releases/download/v1.30.0/rkt-v1.30.0.tar.gz
+tar xzvf rkt-v1.30.0.tar.gz
+cd rkt-v1.30.0
 ./rkt help
 ```
 
diff --git a/configure.ac b/configure.ac
index 1c4443241e..4137a07d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.29.0+git], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.30.0], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/scripts/install-rkt.sh b/scripts/install-rkt.sh
index f0edf0eb40..8440860d18 100755
--- a/scripts/install-rkt.sh
+++ b/scripts/install-rkt.sh
@@ -4,7 +4,7 @@ set -x
 
 cd $(mktemp -d)
 
-version="1.29.0"
+version="1.30.0"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/tests/empty-image/manifest b/tests/empty-image/manifest
index 84542b17f2..88056e76f8 100644
--- a/tests/empty-image/manifest
+++ b/tests/empty-image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.29.0"
+            "value": "1.30.0"
         },
         {
             "name": "arch",
diff --git a/tests/image/manifest b/tests/image/manifest
index 808495a70f..f6c2d343d9 100644
--- a/tests/image/manifest
+++ b/tests/image/manifest
@@ -5,7 +5,7 @@
     "labels": [
         {
             "name": "version",
-            "value": "1.29.0"
+            "value": "1.30.0"
         },
         {
             "name": "arch",
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index bfc53b9d62..67a0dec4e3 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.29.0+git/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.30.0/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 36fd7a1194..2eb694b051 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -36,7 +36,7 @@ func TestRunOverrideExec(t *testing.T) {
 	noappManifest := schema.ImageManifest{
 		Name: "coreos.com/rkt-inspect",
 		Labels: types.Labels{
-			{"version", "1.29.0"},
+			{"version", "1.30.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_cat_manifest_test.go b/tests/rkt_image_cat_manifest_test.go
index 06123d54f7..2cea47f5fd 100644
--- a/tests/rkt_image_cat_manifest_test.go
+++ b/tests/rkt_image_cat_manifest_test.go
@@ -47,7 +47,7 @@ func TestImageCatManifest(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.29.0"},
+			{"version", "1.30.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_export_test.go b/tests/rkt_image_export_test.go
index ddf24c1ed4..f225cab180 100644
--- a/tests/rkt_image_export_test.go
+++ b/tests/rkt_image_export_test.go
@@ -46,7 +46,7 @@ func TestImageExport(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.29.0"},
+			{"version", "1.30.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_image_render_test.go b/tests/rkt_image_render_test.go
index 74d00ed90b..b388049001 100644
--- a/tests/rkt_image_render_test.go
+++ b/tests/rkt_image_render_test.go
@@ -56,7 +56,7 @@ func TestImageRender(t *testing.T) {
 			{ImageName: "coreos.com/rkt-inspect"},
 		},
 		Labels: types.Labels{
-			{"version", "1.29.0"},
+			{"version", "1.30.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},
diff --git a/tests/rkt_os_arch_test.go b/tests/rkt_os_arch_test.go
index 22b80ecbed..cc76be1e12 100644
--- a/tests/rkt_os_arch_test.go
+++ b/tests/rkt_os_arch_test.go
@@ -61,7 +61,7 @@ func getMissingOrInvalidTests(t *testing.T, ctx *testutils.RktRunCtx) []osArchTe
 			WorkingDirectory: "/",
 		},
 		Labels: types.Labels{
-			{"version", "1.29.0"},
+			{"version", "1.30.0"},
 		},
 	}
 
diff --git a/tests/rkt_run_test.go b/tests/rkt_run_test.go
index 8887cd204f..f81b36fba6 100644
--- a/tests/rkt_run_test.go
+++ b/tests/rkt_run_test.go
@@ -86,7 +86,7 @@ func TestPreStart(t *testing.T) {
 			},
 		},
 		Labels: types.Labels{
-			{"version", "1.29.0"},
+			{"version", "1.30.0"},
 			{"arch", common.GetArch()},
 			{"os", common.GetOS()},
 		},

From 6596cedb58cc614233dd27f931fea777ac394595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Wed, 11 Apr 2018 14:23:39 +0200
Subject: [PATCH 1286/1304] version: bump to v1.30.0+git

---
 configure.ac                        | 2 +-
 tests/rkt-monitor/build-stresser.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4137a07d3b..56f0948614 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([rkt], [1.30.0], [https://github.com/rkt/rkt/issues])
+AC_INIT([rkt], [1.30.0+git], [https://github.com/rkt/rkt/issues])
 
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/tests/rkt-monitor/build-stresser.sh b/tests/rkt-monitor/build-stresser.sh
index 67a0dec4e3..d63904cfe3 100755
--- a/tests/rkt-monitor/build-stresser.sh
+++ b/tests/rkt-monitor/build-stresser.sh
@@ -27,7 +27,7 @@ buildImages() {
     acbuild --debug begin
     trap acbuildEnd EXIT
     acbuild --debug set-name appc.io/rkt-"${1}"-stresser
-    acbuild --debug copy build-rkt-1.30.0/target/bin/"${1}"-stresser /worker
+    acbuild --debug copy build-rkt-1.30.0+git/target/bin/"${1}"-stresser /worker
     acbuild --debug set-exec -- /worker
     acbuild --debug write --overwrite "${1}"-stresser.aci
     acbuild --debug end

From 6c293b65535ff73bcc0885dbd1010a9fc268456b Mon Sep 17 00:00:00 2001
From: Che-Liang Chiou <clchiou@gmail.com>
Date: Sat, 5 May 2018 05:39:46 +0000
Subject: [PATCH 1287/1304] stage1: escape '%' in command lines as well as '$'

systemd substitutes both %-specifiers and $-variables starting from the
second command-line argument, and rkt should escape both of them.

Fixes #3925
---
 stage1/init/common/pod.go      | 1 +
 stage1/init/common/pod_test.go | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/stage1/init/common/pod.go b/stage1/init/common/pod.go
index b230dc3fb1..fc4ee93e72 100644
--- a/stage1/init/common/pod.go
+++ b/stage1/init/common/pod.go
@@ -55,6 +55,7 @@ func execEscape(i int, str string) string {
 
 	if i > 0 { // These are escaped only after the first argument
 		escapeMap[`$`] = `$`
+		escapeMap[`%`] = `%`
 	}
 
 	escArg := fmt.Sprintf("%q", str)
diff --git a/stage1/init/common/pod_test.go b/stage1/init/common/pod_test.go
index 7f47769fca..502f8df4d4 100644
--- a/stage1/init/common/pod_test.go
+++ b/stage1/init/common/pod_test.go
@@ -55,6 +55,9 @@ func TestQuoteExec(t *testing.T) {
 		}, {
 			input:  []string{`$path$`, `$argument`},
 			output: `"$path$" "$$argument"`,
+		}, {
+			input:  []string{`%path%`, `%argument`},
+			output: `"%path%" "%%argument"`,
 		}, {
 			input:  []string{`path`, `Args\nwith\nnewlines`},
 			output: `"path" "Args\\nwith\\nnewlines"`,

From 28956c191e76dff31e3a69405cdd25960e75276a Mon Sep 17 00:00:00 2001
From: Rufus <rufus@rufus.al>
Date: Wed, 16 May 2018 22:38:53 +0100
Subject: [PATCH 1288/1304] fix documentation typo

thanks
---
 Documentation/devel/distribution-point.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devel/distribution-point.md b/Documentation/devel/distribution-point.md
index 36b19550ae..02444d8815 100644
--- a/Documentation/devel/distribution-point.md
+++ b/Documentation/devel/distribution-point.md
@@ -163,6 +163,6 @@ For example there may exist multiple transport plugins (file, http, s3, bittorre
 
 [3986]: https://tools.ietf.org/html/rfc3986
 [docker2aci_GH]: https://github.com/appc/docker2aci
-[oci_image_spec_readme]: https://github.com/opencontainers/image-spec#running-an-oci-imag://github.com/appc/docker2aci
+[oci_image_spec_readme]: https://github.com/opencontainers/image-spec#running-an-oci-image
 [oci_layout]: https://github.com/opencontainers/image-spec/blob/master/image-layout.md
 [rkt-2964]: https://github.com/rkt/rkt/pull/2964

From 1cf35a2e9b8e06f6b869bb972259a09b77fef517 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Fri, 25 May 2018 14:40:44 -0700
Subject: [PATCH 1289/1304] maintainers: update euank email

---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index e8ff38fbed..e19204a4aa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2,7 +2,7 @@ Alban Crequy <alban@kinvolk.io> (@alban) pkg: *
 Brandon Philips <brandon.philips@coreos.com> (@philips) pkg: *
 Casey Callendrello <casey.callendrello@coreos.com> (@squeed) pkg: *
 Derek Gonyeo <derek.gonyeo@coreos.com> (@dgonyeo) pkg: *
-Euan Kemp <euan.kemp@coreos.com> (@euank) pkg: *
+Euan Kemp <euank@euank.com> (@euank) pkg: *
 Iago López Galeiras <iago@kinvolk.io> (@iaguis) pkg: *
 Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle) pkg: *
 Krzesimir Nowak <krzesimir@kinvolk.io> (@krnowak) pkg: *

From b66ec3560ae009e3e902d383cd2b15ae854f5c86 Mon Sep 17 00:00:00 2001
From: Luca Bruno <luca.bruno@coreos.com>
Date: Mon, 28 May 2018 09:05:03 +0000
Subject: [PATCH 1290/1304] maintainers: update

---
 MAINTAINERS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index e19204a4aa..50802081e2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,8 +4,6 @@ Casey Callendrello <casey.callendrello@coreos.com> (@squeed) pkg: *
 Derek Gonyeo <derek.gonyeo@coreos.com> (@dgonyeo) pkg: *
 Euan Kemp <euank@euank.com> (@euank) pkg: *
 Iago López Galeiras <iago@kinvolk.io> (@iaguis) pkg: *
-Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle) pkg: *
 Krzesimir Nowak <krzesimir@kinvolk.io> (@krnowak) pkg: *
 Luca Bruno <luca.bruno@coreos.com> (@lucab) pkg: *
-Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak) pkg: *
 Yifan Gu <yifan.gu@coreos.com> (@yifan-gu) pkg: *

From c8cc5d844e9e1c42bb4b9d56c97b8b88934c4e8f Mon Sep 17 00:00:00 2001
From: Yifan Gu <guyifan1121@gmail.com>
Date: Wed, 30 Jan 2019 13:47:12 -0800
Subject: [PATCH 1291/1304] Update yifan's email

The yifan.gu@coreos.com email is no longer valid.
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 50802081e2..019df5fdfd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6,4 +6,4 @@ Euan Kemp <euank@euank.com> (@euank) pkg: *
 Iago López Galeiras <iago@kinvolk.io> (@iaguis) pkg: *
 Krzesimir Nowak <krzesimir@kinvolk.io> (@krnowak) pkg: *
 Luca Bruno <luca.bruno@coreos.com> (@lucab) pkg: *
-Yifan Gu <yifan.gu@coreos.com> (@yifan-gu) pkg: *
+Yifan Gu <guyifan1121@gmail.com> (@yifan-gu) pkg: *

From 6654699f5e884f74e767b024ee4777b98509204c Mon Sep 17 00:00:00 2001
From: David Michael <dm0@redhat.com>
Date: Mon, 4 Feb 2019 12:45:28 -0500
Subject: [PATCH 1292/1304] stage1/usr_from_coreos: add new image signing
 subkey 67B3CA0E

---
 stage1/usr_from_coreos/cache.sh | 41 ++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/stage1/usr_from_coreos/cache.sh b/stage1/usr_from_coreos/cache.sh
index de0de8449c..21827846c1 100755
--- a/stage1/usr_from_coreos/cache.sh
+++ b/stage1/usr_from_coreos/cache.sh
@@ -21,8 +21,9 @@ fi
 # sub   rsa4096/1CB5FA26 2015-08-31 [S] [expired: 2017-08-30]
 # sub   rsa4096/B58844F1 2015-11-20 [S] [revoked: 2016-05-16]
 # sub   rsa4096/2E16137F 2016-05-16 [S] [expired: 2017-05-16]
-# sub   rsa4096/EF4B4ED9 2017-05-22 [S] [expires: 2018-06-01]
+# sub   rsa4096/EF4B4ED9 2017-05-22 [S] [expired: 2018-06-01]
 # sub   rsa4096/0638EB2F 2018-02-10 [S] [expires: 2019-06-01]
+# sub   rsa4096/67B3CA0E 2019-02-04 [S] [expires: 2021-06-01]
 GPG_LONG_ID="50E0885593D2DCB4"
 GPG_KEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -299,8 +300,42 @@ B/Fcb6C7Lky0891PxcQBPRLqyydjKMDhxsqTmDGcWOvfTgNh7AeHRl5PNzTmqCWe
 1PLwEBvsPs4z6VC9klPL2y2o9m8SKG0WLjt1T123RmYVp95/aB36AHFu/+Xjy9AT
 ZskQ/mDUv6F4w6N8Vk9R/nJTfpI36vWTcH7xxLNoNRlL2b/7ra6dB8YPsOdLy158
 61Awgh2LQ3x83J/vswmuGi1eaFPCiOOMsjsgdvmDKgWwzGGI+XZjv/NbrgJcrXKB
-2jibQQI=
-=KhYl
+2jibQQK5Ag0EXFh0xgEQAMQyimQSWRxLVn24bAS3ZgBAaFtUAZjTTaS/WD7Behws
++L/CRtrtmgq2gIj9/+8PXlbLGXP1Rl9CAfkK0txG8nYIlL3/NVarITz84jZzFO9T
+0Yjoc3rsepXIc/T4K0x3eL4Cr84qxsIv+NYqHfmLVfTjgtYbSOOmZ0XUWcJogjra
+Js3KhQxLXbnVANQITtO+C9iNHSGnih0a4qCKprNH4WgrWPHa950/phVTeBKS5Jv5
+FAXSj/AJvonOYmRVqMjz7h+uFTVSDsROs7ceAKvELBXpQjjqQdnHxPji7vgM0So7
+Zvpc/6HvpSIgQ5julpYL3laS3OQhaH5eSttG8xlk0a8LghyMXrSP42CVuGNsKqO4
+FUHNRUe1Ofm7mEjXbyTEOLyp5PJqCN/5Tg/9KrlChoDwjD5Xw6J2qLkHbaJYP5wS
+0tv+/5DpNR9rKv4a7G8RijLq9JlzSs8gDQcCSrcYB2ByAmhGkqGFlPUGBR75qPnq
+5+u+KO+04fKmhIapJHWY+qqzlFLcEAFaC6cgcVOn63a8et+F+frkkLA++JXDPf4e
+rR66tMeN2Fhh2eqXNFjj6yh+/qVjm4J8QfRBsIS5rn0/bnUiJ327iMszRxQxpdpZ
+HWnLIV0pj5Wi+7DwQx8DeZIcJsWRPMjHZsCqsOJdYvMrwLOEVR9QmlV7z6yfWiWL
+ABEBAAGJBHIEGAEIACYWIQQEEn0L+r7Ihx/7LM5Q4IhVk9LctAUCXFh0xgIbAgUJ
+BF3kugJACRBQ4IhVk9LctMF0IAQZAQgAHRYhBP2Yb7CWSC+Qb1Wy6gHJyudns8oO
+BQJcWHTGAAoJEAHJyudns8oOkNUP/RijfLfkEW8F5fp5TCbJGquq1TUVbLRXlN8V
+qRDyhm7X9q+3yWfrxM4DIhxwRbZGrs/lPm+ymrKZ+rG1q7JKiYGnNa3wajfEYyQm
+VFUcLnIpT/5EgCZfgbpmZK/J14PJqSnkzkdvqLu1U/zl492nYL4Z8cOkoNbNLF3s
+zD5+E2soke7WI5gW4asK4eWWl+yz91fsRKIu/B94gYt8jsxUFS1ZRq28VxsL6hkQ
+9pk5Pmx/W5pFEQiPylIRaSRRoH4i1niSJIA1GqVzwEzwS/RWGJpjd1J8LVcXVQ2i
+ieWsR8FHPtfvvq/x6DeeZMXQu0b0XH3Dt4wqAq8K7/5Pf3wUAU0VKBSqkKevLSYK
+brOaagFDfOMqZ0kifrqzgVU1NSz5HoAc4OGhx96bcHW6/14xmOHMaI2acp8F8oqD
+8WBQz4sTR8vGKB8d9CwI+1Zzn3EBPQ604Jt1GrCmelUBfxy3gVZqk6O5+AkW+p2G
+/PSDTEKjltz1CLwBusR4bbp6IJPOQv0kz/mXcuDcNJ7tFxlE9Lpx8T4UXI8LubgS
+YdV1XtKvrVjdFUfsOiW2jiDWk/W9EI6TpnuN0OMfxY16LuPY6UojYLeEhJ45Xq9B
+/yHikCIPqUIjUyblEahFEdAIRhpjLQSxWitwWzcAlWjofSAMQfVeX2BJHx1IYXEv
+LMGNyA/CwNwQAIUIouU1oKHx+BPcOyQ/kFWlUaWeZeWRXwEv42ageSwxfYUis+lU
+whFJjcr3JjiTlSDDiuYU+DmSng96x1SQsZr6aWXJg9Rlg8Wd+8cq+A3rmUzOuVjM
+d8xUJ9dNUHDDCCHpgm1R0gjZWUgCocI0pi9DRTTYEHIaI0vz0vU4K90BdKEr3QL2
+GPlrTwQaGW56E/zoRP98iEuOCz4vr0LcZ2kneIh4iqvv38zBcDkOppqncCcpfKhx
+VgE0CF+fN+lGJRUmG9JVizkqFxw0dLSFQ/A3M2nAE3anVaKyo0mYwtSI2ociMTsI
+ZczgoliOhiUX0kRp12LvAYbQK/NUXyc7rtPdWaOUHtU1nQQiVUs70pbfatdQazTl
+c4Jv9INSjBcQ2f8Bi7mKFaIDEUgGgUuRJihTYsBaKhxNaDqRro3pm0EDP0GMottp
+QVP4rtqNcCjndbY7VhNcBkoB9F9DT+/uPH2+IlmtYDJK2rQv+fGVQYlDVB3nCOtM
+gIh5G4uBMP3cvc2w6EUtvKw1+CnBkn9GNTIda9e+IkGcxBa5e6GsrsD+uFZWH89Z
+kyYDYO8lRxhMfw9pufVJHQz3RH3BQ+cDXQKB4hG/PLFVuKp4/dxRv1wq3Wqjtich
+u8FHnUTnJIo36yYZ5RcepLueSkYSMeSgCZG3Zmq6AkMKggwEa9c4w9xp
+=28ZS
 -----END PGP PUBLIC KEY BLOCK-----
 "
 

From a687a651ca833008ee5306d268b2e0aca43153d2 Mon Sep 17 00:00:00 2001
From: Kim Bao Long <longkb@vn.fujitsu.com>
Date: Thu, 14 Feb 2019 14:29:12 +0700
Subject: [PATCH 1293/1304] Fix some typos in docs

Although it is spelling mistakes, it might make an affects while reading.

Signed-off-by: Kim Bao Long <longkb@vn.fujitsu.com>
---
 Documentation/running-fly-stage1.md | 2 +-
 Documentation/running-kvm-stage1.md | 2 +-
 Documentation/troubleshooting.md    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index ed21f06084..1927b541cf 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -74,7 +74,7 @@ If the image is not in the store, `--stage1-name` will perform discovery and fet
 
 ## Notes on isolation and security
 
-By design, the *fly* stage1 does not provide the same isolaton and security features as the default stage1.
+By design, the *fly* stage1 does not provide the same isolation and security features as the default stage1.
 
 Specifically, the following constraints are not available when using the *fly* stage1:
 
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 27a86f9b85..1253a6351d 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -18,7 +18,7 @@ If you want to see the kernel and boot messages, run rkt with the `--debug` flag
 You can exit pressing `<Ctrl-a x>`.
 
 #### CPU usage
-By default, processes will start working on all CPUs if at least one app does not have specfied CPUs.
+By default, processes will start working on all CPUs if at least one app does not have specified CPUs.
 In the other case, container will be working on aggregate amount of CPUs.
 
 #### Memory
diff --git a/Documentation/troubleshooting.md b/Documentation/troubleshooting.md
index 8c943e2695..5c0b2641b3 100644
--- a/Documentation/troubleshooting.md
+++ b/Documentation/troubleshooting.md
@@ -88,7 +88,7 @@ stage0: error setting up stage1
 ```
 
 This problem typically happens when trying to run rkt inside rkt.
-To successfuly run rkt inside rkt, use one of the following workarounds:
+To successfully run rkt inside rkt, use one of the following workarounds:
 - set up `/var/lib/rkt` in the outer rkt as a host volume
 - use `--no-overlay` for either the outer or the inner rkt
 

From d82fe7c6b5de2401d68ab96c57aefbbc9957086f Mon Sep 17 00:00:00 2001
From: Nguyen Hai Truong <truongnh@vn.fujitsu.com>
Date: Thu, 14 Feb 2019 22:49:37 +0700
Subject: [PATCH 1294/1304] Update deprecated link

Correct hyperlink in documentation in order to visit link
properly.

Signed-off-by: Nguyen Hai Truong <truongnh@vn.fujitsu.com>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd23d2028e..bfc7120827 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -60,7 +60,7 @@ It's recommended to set a save hook in your editor of choice that runs `goimport
 
 [effectivego]: https://golang.org/doc/effective_go.html
 [codereview]: https://github.com/golang/go/wiki/CodeReviewComments
-[godoc]: http://blog.golang.org/godoc-documenting-go-code[here](https://github.com/coreos/docs/tree/master/golang).
+[godoc]: https://blog.golang.org/godoc-documenting-go-code
 
 ### Documentation Style
 

From ba739190f16a2a4a7d60e02f53870f0654a90a8f Mon Sep 17 00:00:00 2001
From: Nguyen Hai Truong <truongnh@vn.fujitsu.com>
Date: Fri, 15 Feb 2019 00:50:30 +0700
Subject: [PATCH 1295/1304] Trivial fix typo

Although it is spelling mistakes, it might make an affects while reading.

Signed-off-by: Nguyen Hai Truong <truongnh@vn.fujitsu.com>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd23d2028e..fb1d382dcd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -107,7 +107,7 @@ what and the first paragraph of the PR description reflects the why.
 In most cases one can reuse the commit title as the PR title
 and the commit messages as the PR description for the PR.
 
-If your PR includes more commits spanning mulitple subsystems one should change the PR title
+If your PR includes more commits spanning multiple subsystems one should change the PR title
 and the first paragraph of the PR description to reflect a summary of all changes involved.
 
 A large PR must be split into multiple commits, each with clear commit messages.

From a40beaec7e4457c2b03c0379c4283b048a963658 Mon Sep 17 00:00:00 2001
From: Tuan Do Anh <tuanda@vn.fujitsu.com>
Date: Thu, 21 Feb 2019 13:35:19 +0700
Subject: [PATCH 1296/1304] Remove unused functions

Remove usused functions in rkt_test.go
---
 tests/rkt_tests.go | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/tests/rkt_tests.go b/tests/rkt_tests.go
index dab81d60e1..5f0646b84b 100644
--- a/tests/rkt_tests.go
+++ b/tests/rkt_tests.go
@@ -319,22 +319,6 @@ func patchImportAndFetchHash(image string, patches []string, t *testing.T, ctx *
 	return importImageAndFetchHash(t, ctx, "", imagePath)
 }
 
-func patchImportAndRun(image string, patches []string, t *testing.T, ctx *testutils.RktRunCtx) {
-	imagePath := patchTestACI(image, patches...)
-	defer os.Remove(imagePath)
-
-	cmd := fmt.Sprintf("%s --insecure-options=image run %s", ctx.Cmd(), imagePath)
-	spawnAndWaitOrFail(t, cmd, 0)
-}
-
-func patchImportAndPrepare(image string, patches []string, t *testing.T, ctx *testutils.RktRunCtx) {
-	imagePath := patchTestACI(image, patches...)
-	defer os.Remove(imagePath)
-
-	cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imagePath)
-	spawnAndWaitOrFail(t, cmd, 0)
-}
-
 func runGC(t *testing.T, ctx *testutils.RktRunCtx) {
 	cmd := fmt.Sprintf("%s gc --grace-period=0s", ctx.Cmd())
 	spawnAndWaitOrFail(t, cmd, 0)

From a5260711ff4d271aa53c128b1dab61d5b087f1e8 Mon Sep 17 00:00:00 2001
From: zhoulin xie <zhoulin.xie@daocloud.io>
Date: Sun, 24 Feb 2019 01:06:38 +0800
Subject: [PATCH 1297/1304] Fix typo in CONTRIBUTING.md

Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd23d2028e..fb1d382dcd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -107,7 +107,7 @@ what and the first paragraph of the PR description reflects the why.
 In most cases one can reuse the commit title as the PR title
 and the commit messages as the PR description for the PR.
 
-If your PR includes more commits spanning mulitple subsystems one should change the PR title
+If your PR includes more commits spanning multiple subsystems one should change the PR title
 and the first paragraph of the PR description to reflect a summary of all changes involved.
 
 A large PR must be split into multiple commits, each with clear commit messages.

From 222d02a82634ed22f0a26bd0c6707caecd256298 Mon Sep 17 00:00:00 2001
From: Vu Cong Tuan <tuanvc@vn.fujitsu.com>
Date: Tue, 26 Feb 2019 09:15:42 +0700
Subject: [PATCH 1298/1304] Fixing some typos in Documentation Signed-off-by:
 Vu Cong Tuan <tuanvc@vn.fujitsu.com>

---
 Documentation/commands.md                   | 2 +-
 Documentation/devel/update-coreos-stage1.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/commands.md b/Documentation/commands.md
index 5102739d5b..bc8706e850 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -135,7 +135,7 @@ $ journalctl -M rkt-bc3c1451-2e81-45c6-aeb0-807db44e31b4 -t redis
 [...]
 ```
 
-Additionaly, logs can be programmatically accessed via the [sd-journal API][sd-journal].
+Additionally, logs can be programmatically accessed via the [sd-journal API][sd-journal].
 
 Currently there are two known main issues with logging in rkt:
 * In some rare situations when an application inside the pod is writing to `/dev/stdout` and `/dev/stderr` (i.e. nginx) there is no way to obtain logs.
diff --git a/Documentation/devel/update-coreos-stage1.md b/Documentation/devel/update-coreos-stage1.md
index ec4a7f9d31..074966720c 100644
--- a/Documentation/devel/update-coreos-stage1.md
+++ b/Documentation/devel/update-coreos-stage1.md
@@ -138,7 +138,7 @@ sudo build*/target/bin/rkt run quay.io/coreos/alpine-sh
 
 
 ## Fixing errors
-If there are some new libraries missing from the image, you need to add them to the correspoding manifest file.
+If there are some new libraries missing from the image, you need to add them to the corresponding manifest file.
 
 For example, this update breaks systemd.
 When you try to run rkt, you get this error:

From 31b2340b1bbe8f97a8566d5f82e453c1e6327d4a Mon Sep 17 00:00:00 2001
From: Vu Cong Tuan <tuanvc@vn.fujitsu.com>
Date: Tue, 26 Feb 2019 09:30:35 +0700
Subject: [PATCH 1299/1304] Fix many typos in "rkt" and "tests" Signed-off-by:
 Vu Cong Tuan <tuanvc@vn.fujitsu.com>

---
 rkt/app_rm.go                 | 2 +-
 rkt/image/resumablesession.go | 2 +-
 tests/README.md               | 2 +-
 tests/aws.sh                  | 2 +-
 tests/rkt_api_service_test.go | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rkt/app_rm.go b/rkt/app_rm.go
index 0acb899ebc..82ce71e0d8 100644
--- a/rkt/app_rm.go
+++ b/rkt/app_rm.go
@@ -28,7 +28,7 @@ var (
 	cmdAppRm = &cobra.Command{
 		Use:   "rm UUID --app=NAME",
 		Short: "Remove an app from a pod",
-		Long:  "This removes an appplication from a mutable pod, stopping it beforehand if still running.",
+		Long:  "This removes an application from a mutable pod, stopping it beforehand if still running.",
 		Run:   runWrapper(runAppRm),
 	}
 )
diff --git a/rkt/image/resumablesession.go b/rkt/image/resumablesession.go
index 2c1c4fc077..9bcd750676 100644
--- a/rkt/image/resumablesession.go
+++ b/rkt/image/resumablesession.go
@@ -39,7 +39,7 @@ func (*statusAcceptedError) Error() string {
 	return "HTTP 202"
 }
 
-// cacheData holds caching-specific informations taken from various
+// cacheData holds caching-specific information taken from various
 // HTTP headers.
 type cacheData struct {
 	// whether we should reuse an image from store
diff --git a/tests/README.md b/tests/README.md
index 25ae5afec6..5ded7223e0 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -115,7 +115,7 @@ make check GO_TEST_FUNC_ARGS='-run NameOfTheTest'
 make functional-check GO_TEST_FUNC_ARGS='-run NameOfTheTest'
 ```
 
-Run `go help testflag` to get more informations about possible flags accepted by `go test`.
+Run `go help testflag` to get more information about possible flags accepted by `go test`.
 
 ## Running the benchmark
 
diff --git a/tests/aws.sh b/tests/aws.sh
index 529e819418..c8e71d0966 100755
--- a/tests/aws.sh
+++ b/tests/aws.sh
@@ -110,7 +110,7 @@ done
 NAME=rkt-ci-jenkins-$(date +"%Y-%m-%d")-$DISTRO
 AMI_ID=$(aws --region $REGION ec2 create-image --instance-id $INSTANCE_ID --name $NAME --output text)
 
-echo -e "\nWaiting for the AMI to be avaliable..."
+echo -e "\nWaiting for the AMI to be available..."
 while ! aws --region $REGION ec2 describe-images --image-id $AMI_ID | grep -q available
 do
   echo -n '.'
diff --git a/tests/rkt_api_service_test.go b/tests/rkt_api_service_test.go
index 5de4390a7f..5054c37cdb 100644
--- a/tests/rkt_api_service_test.go
+++ b/tests/rkt_api_service_test.go
@@ -445,7 +445,7 @@ func NewAPIServiceListInspectPodsTest() testutils.Test {
 
 		// ListPods with corrupt pod directory
 		// Note that we don't checkPodDetails here, the failure this is testing is
-		// the api server panicing, which results in a list call hanging for ages
+		// the api server panicking, which results in a list call hanging for ages
 		// and then failing.
 		// TODO: do further validation on the partial pods returned
 		for _, p := range resp.Pods {

From 6c6d0e56cc8dd8f8917fc7908b783def0161c7c1 Mon Sep 17 00:00:00 2001
From: Vu Cong Tuan <tuanvc@vn.fujitsu.com>
Date: Tue, 26 Feb 2019 09:50:59 +0700
Subject: [PATCH 1300/1304] Update deprecated links in Documentation
 Signed-off-by: Vu Cong Tuan <tuanvc@vn.fujitsu.com>

---
 Documentation/app-container.md             |  2 +-
 Documentation/devel/architecture.md        | 12 ++++++------
 Documentation/integrations.md              |  2 +-
 Documentation/production-users.md          | 18 +++++++++---------
 Documentation/running-fly-stage1.md        |  6 +++---
 Documentation/running-kvm-stage1.md        |  4 ++--
 Documentation/selinux.md                   |  2 +-
 Documentation/subcommands/api-service.md   |  2 +-
 Documentation/using-rkt-with-kubernetes.md |  4 ++--
 Documentation/using-rkt-with-systemd.md    | 10 +++++-----
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index 79aeb7a0c8..368595fcf2 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -50,5 +50,5 @@ To validate that `rkt` successfully implements the ACE part of the spec, use the
 [appc-val]: https://github.com/appc/spec/blob/master/README.md#validating-app-container-executors-aces
 [docker2aci]: https://github.com/appc/docker2aci
 [goaci]: https://github.com/appc/goaci
-[k8s-pods]: http://kubernetes.io/docs/user-guide/pods/
+[k8s-pods]: https://kubernetes.io/docs/concepts/workloads/pods/pod/
 [running-docker-images]: running-docker-images.md
diff --git a/Documentation/devel/architecture.md b/Documentation/devel/architecture.md
index 8f6d8a5d02..bbe4328e58 100644
--- a/Documentation/devel/architecture.md
+++ b/Documentation/devel/architecture.md
@@ -292,9 +292,9 @@ From a UI perspective, main consumers of the logging and attaching subsystem are
 [man-exec]: http://man7.org/linux/man-pages/man3/exec.3.html
 [oci-img-spec]: https://github.com/opencontainers/image-spec
 [rkt-image-fetching]: ../image-fetching-behavior.md
-[systemd-beforeafter]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Before=
-[systemd-conflicts]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Conflicts=
-[systemd-wants]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Wants=
-[systemd-onfailure]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#OnFailure=
-[systemd-remainafterexit]: http://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit=
-[systemd-stopwhenunneeded]: http://www.freedesktop.org/software/systemd/man/systemd.unit.html#StopWhenUnneeded=
+[systemd-beforeafter]: https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Before=
+[systemd-conflicts]: https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Conflicts=
+[systemd-wants]: https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Wants=
+[systemd-onfailure]: https://www.freedesktop.org/software/systemd/man/systemd.unit.html#OnFailure=
+[systemd-remainafterexit]: https://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit=
+[systemd-stopwhenunneeded]: https://www.freedesktop.org/software/systemd/man/systemd.unit.html#StopWhenUnneeded=
diff --git a/Documentation/integrations.md b/Documentation/integrations.md
index cb3cdc63d2..78977954eb 100644
--- a/Documentation/integrations.md
+++ b/Documentation/integrations.md
@@ -4,7 +4,7 @@ This document tracks projects that integrate with rkt. [Join the community](http
 ## Projects 
 [Kubernetes](https://github.com/kubernetes-incubator/rktlet): an enterprise grade container orchestration solution. Kubernetes offers rkt support as an alternative to the standard install.
 
-[Mesos](http://mesos.apache.org/blog/mesos-1-0-0-released/): Apache Mesos abstracts CPU, memory, storage, and other compute resources away from machines (physical or virtual), enabling fault-tolerant and elastic distributed systems to easily be built and run effectively.
+[Mesos](https://mesos.apache.org/blog/mesos-1-0-0-released/): Apache Mesos abstracts CPU, memory, storage, and other compute resources away from machines (physical or virtual), enabling fault-tolerant and elastic distributed systems to easily be built and run effectively.
 
 [Nomad](https://www.nomadproject.io/docs/drivers/rkt.html): a container orchestration platform focused on ease of use. Nomad supports rkt through the rkt driver.
 
diff --git a/Documentation/production-users.md b/Documentation/production-users.md
index 250569fcfb..56313c0521 100644
--- a/Documentation/production-users.md
+++ b/Documentation/production-users.md
@@ -6,8 +6,8 @@ This document tracks people and use cases for rkt in production. [Join the commu
 
 BlaBlaCar is a trusted car-pooling service based in France. They've [blogged about](http://blablatech.com/blog/why-and-how-blablacar-went-full-containers) the stability of rkt being a big appeal.
 
-* Media report from [LeMagIT](http://www.lemagit.fr/actualites/4500272608/avec-rkt-10-CoreOS-estime-que-sa-technologie-de-conteneur-est-mure-pour-la-production): "rkt has become the container technology of choice for the French carpool specialist Blablacar. The company, which has adopted early container technologies, now relies on rkt and CoreOS for 90% of its applications."
-* Media report from [Silicon.fr](http://www.silicon.fr/blablacar-generalise-conteneurs-rocket-159564.html), "Rocket tackled the limitations we had identified with Docker. In particular, the solution eliminated the use of a daemon (process running in the background, Editor's note) and approached the network part in a very modular way"
+* Media report from [LeMagIT](https://www.lemagit.fr/actualites/4500272608/avec-rkt-10-CoreOS-estime-que-sa-technologie-de-conteneur-est-mure-pour-la-production): "rkt has become the container technology of choice for the French carpool specialist Blablacar. The company, which has adopted early container technologies, now relies on rkt and CoreOS for 90% of its applications."
+* Media report from [Silicon.fr](https://www.silicon.fr/blablacar-generalise-conteneurs-rocket-159564.html), "Rocket tackled the limitations we had identified with Docker. In particular, the solution eliminated the use of a daemon (process running in the background, Editor's note) and approached the network part in a very modular way"
 
 ## [Kubernetes and CoreOS Container Linux]()
 
@@ -21,7 +21,7 @@ Kumulus Technologies offers classes and services to optimize your Cloud. They've
 
 Kinvolk are a professional consulting team and active contributors to systemd, rkt, and the Linux kernel. rkt helps them easily [test various Linux kernels and configurations](https://kinvolk.io/blog/2017/02/using-custom-rkt-stage1-images-to-test-against-various-kernel-versions/).
 
-## [Adfin.com](http://www.adfin.com/)
+## [Adfin.com](https://www.adfin.com/)
 
 Per Milosz Tanski, [from HN comments](https://news.ycombinator.com/item?id=12366932). "The same experiences we switched to using rkt, supervised by upstart (and now systemd). We have an "application" state template in our salt config and every docker update something would cause all of them to fail. Thankful the "application" state template abstracted running container enough were we switched from docker -> rkt under the covers without anybody noticing, except now we no longer fearing of container software updates."
 
@@ -34,9 +34,9 @@ These are blog posts and stories from people evaluating rkt. Although most aren'
 - [Julia Evans, Infrastructure Engineer at Stripe](https://jvns.ca/blog/2016/11/03/what-happens-when-you-run-a-rkt-container/) what happens when you run a rkt container
 - [Nicholas Dziuba](https://www.reddit.com/r/coreos/comments/5vhrlw/thesis_with_rkt_evaluation/) writing his thesis on the security model of rkt
 - [John Pettigrew, Developer at Clevyr ](https://pettigrew.rocks/2016/05/30/a-beginners-guide-to-rkt-containers/) a beginner’s guide to rkt containers
-- [Joey Zwicker, at Co-founder of Pachyderm.io](https://news.ycombinator.com/item?id=12103201) rkt support is on the roadmap. See [Does Pachyderm only work with docker containers?](http://docs.pachyderm.io/en/stable/FAQ.html)
-- [Fernando Ike, Sales Engineer at Highwinds](http://www.slideshare.net/fernandoike/docker-baleias-vs-rkt-foguetes) docker vs rkt comparison
-- [Scott Lowe, Developer at VMWare](http://www.slideshare.net/lowescott/getting-started-with-containers) getting started with containers
-- [Yutaka Matsubara, CTO at Abby](http://www.slideshare.net/YutakaMatsubara/rocket-46800960) rkt
-- [Thuc Le Dong, Developer at Silicon Straits](http://www.slideshare.net/ledongthuc/rkt-container-engine) overview of the rkt container engine
-- [Avi Deitcher, Business Technology Consultant](http://blog.atomicinc.com/2016/10/14/can-rktkubernetes-provide-a-real-alternative-to-docker/)
+- [Joey Zwicker, at Co-founder of Pachyderm.io](https://news.ycombinator.com/item?id=12103201) rkt support is on the roadmap. See [Does Pachyderm only work with docker containers?](https://docs.pachyderm.io/en/v1.2.6/FAQ.html#does-pachyderm-only-work-with-docker-containers)
+- [Fernando Ike, Sales Engineer at Highwinds](https://www.slideshare.net/fernandoike/docker-baleias-vs-rkt-foguetes) docker vs rkt comparison
+- [Scott Lowe, Developer at VMWare](https://www.slideshare.net/lowescott/getting-started-with-containers) getting started with containers
+- [Yutaka Matsubara, CTO at Abby](https://www.slideshare.net/YutakaMatsubara/rocket-46800960) rkt
+- [Thuc Le Dong, Developer at Silicon Straits](https://www.slideshare.net/ledongthuc/rkt-container-engine) overview of the rkt container engine
+- [Avi Deitcher, Business Technology Consultant](https://blog.atomicinc.com/2016/10/14/can-rktkubernetes-provide-a-real-alternative-to-docker/)
diff --git a/Documentation/running-fly-stage1.md b/Documentation/running-fly-stage1.md
index 1927b541cf..f9b067d00d 100644
--- a/Documentation/running-fly-stage1.md
+++ b/Documentation/running-fly-stage1.md
@@ -93,8 +93,8 @@ For more information please consult the systemd manual.
 
 
 [build-configure]: build-configure.md
-[kubelet]: http://kubernetes.io/docs/admin/kubelet/
+[kubelet]: https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/
 [sharedsubtree]: https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt
-[systemd.directives]: http://www.freedesktop.org/software/systemd/man/systemd.directives.html
-[systemd.resource-control]: http://www.freedesktop.org/software/systemd/man/systemd.resource-control.html
+[systemd.directives]: https://www.freedesktop.org/software/systemd/man/systemd.directives.html
+[systemd.resource-control]: https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html
 [systemd-unit]: using-rkt-with-systemd.md#advanced-unit-file
diff --git a/Documentation/running-kvm-stage1.md b/Documentation/running-kvm-stage1.md
index 1253a6351d..d824745709 100644
--- a/Documentation/running-kvm-stage1.md
+++ b/Documentation/running-kvm-stage1.md
@@ -72,9 +72,9 @@ This will build the rkt binary and the KVM stage1 aci image in `build-rkt-1.30.0
 
 [build-configure]: build-configure.md
 [clear-containers]: https://lwn.net/Articles/644675/
-[kvm-module]: http://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules
+[kvm-module]: https://www.linux-kvm.org/page/Getting_the_kvm_kernel_modules
 [lkvm]: https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+/master/README
-[qemu]: http://qemu-project.org/Main_Page
+[qemu]: https://wiki.qemu.org/Main_Page
 [rkt-arch-stage1]: devel/architecture.md#stage-1
 [rkt-run]: subcommands/run.md#use-a-custom-stage-1
 [stage1-implementers-guide]: devel/stage1-implementors-guide.md
diff --git a/Documentation/selinux.md b/Documentation/selinux.md
index 7970f2b4ea..6aa18b3bfe 100644
--- a/Documentation/selinux.md
+++ b/Documentation/selinux.md
@@ -25,6 +25,6 @@ Note that the policy is responsibility of your distribution and might differ fro
 To find out more about policies you can check the [SELinux Policy Overview][selinux-policy].
 Please refer to your distribution documentation for further details on its policy.
 
-[svirt]: http://selinuxproject.org/page/SVirt
+[svirt]: https://selinuxproject.org/page/SVirt
 [selinux-policy]: https://www.centos.org/docs/5/html/Deployment_Guide-en-US/rhlcommon-chapter-0001.html
 
diff --git a/Documentation/subcommands/api-service.md b/Documentation/subcommands/api-service.md
index bc94b33f14..4cfcc5745b 100644
--- a/Documentation/subcommands/api-service.md
+++ b/Documentation/subcommands/api-service.md
@@ -36,5 +36,5 @@ See the table with [global options in general commands documentation][global-opt
 [api_proto]: https://github.com/rkt/rkt/blob/master/api/v1alpha/api.proto
 [client-example]: https://github.com/rkt/rkt/blob/master/api/v1alpha/client_example.go
 [global-options]: ../commands.md#global-options
-[grpc]: http://www.grpc.io/
+[grpc]: https://www.grpc.io/
 [rkt-api]: https://github.com/rkt/rkt/blob/master/dist/init/systemd/rkt-api.service
diff --git a/Documentation/using-rkt-with-kubernetes.md b/Documentation/using-rkt-with-kubernetes.md
index 460b63e622..da064c27c8 100644
--- a/Documentation/using-rkt-with-kubernetes.md
+++ b/Documentation/using-rkt-with-kubernetes.md
@@ -37,8 +37,8 @@ Known issues and tips for using rkt with Kubernetes can be found in the [rktnete
 
 [coreos-baremetal]: https://github.com/coreos/coreos-baremetal
 [coreos-kubernetes]: https://github.com/coreos/coreos-kubernetes
-[k8s]: http://kubernetes.io
-[k8s-1.3-release]: http://blog.kubernetes.io/2016/07/rktnetes-brings-rkt-container-engine-to-Kubernetes.html
+[k8s]: https://kubernetes.io
+[k8s-1.3-release]: https://kubernetes.io/blog/2016/07/rktnetes-brings-rkt-container-engine-to-kubernetes/
 [k8s-on-aws]: https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html
 [k8s-baremetal]: https://github.com/coreos/coreos-baremetal/blob/master/Documentation/kubernetes.md
 [k8s-on-vagrant]: https://coreos.com/kubernetes/docs/latest/kubernetes-on-vagrant-single.html
diff --git a/Documentation/using-rkt-with-systemd.md b/Documentation/using-rkt-with-systemd.md
index d6a04c54b2..86856d5ffc 100644
--- a/Documentation/using-rkt-with-systemd.md
+++ b/Documentation/using-rkt-with-systemd.md
@@ -532,16 +532,16 @@ $ systemd-cgls --all
 [aci-socketActivated]: https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema
 [go-systemd]: https://github.com/coreos/go-systemd
 [machined]: https://wiki.freedesktop.org/www/Software/systemd/machined/
-[systemd]: http://www.freedesktop.org/wiki/Software/systemd/
+[systemd]: https://www.freedesktop.org/wiki/Software/systemd/
 [systemd.exec]: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
 [systemd.resource-control]: https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html
 [systemd-cpuquota]: https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUQuota=
 [systemd-cpuaffinity]: https://www.freedesktop.org/software/systemd/man/systemd.exec.html#CPUAffinity=
 [systemd-isolators]: https://github.com/appc/spec/blob/master/spec/ace.md#isolators
-[systemd-killmode-mixed]: http://www.freedesktop.org/software/systemd/man/systemd.kill.html#KillMode=
-[systemd-machined]: http://www.freedesktop.org/software/systemd/man/systemd-machined.service.html
-[systemd-run]: http://www.freedesktop.org/software/systemd/man/systemd-run.html
-[systemd-socket-activated]: http://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
+[systemd-killmode-mixed]: https://www.freedesktop.org/software/systemd/man/systemd.kill.html#KillMode=
+[systemd-machined]: https://www.freedesktop.org/software/systemd/man/systemd-machined.service.html
+[systemd-run]: https://www.freedesktop.org/software/systemd/man/systemd-run.html
+[systemd-socket-activated]: https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
 [systemd-socket-proxyd]: https://www.freedesktop.org/software/systemd/man/systemd-socket-proxyd.html
 [systemd-unit]: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
 [sd_notify]: https://www.freedesktop.org/software/systemd/man/sd_notify.html

From 6933c5579a1119c7ef4f798af5f70dcd63a4a5ce Mon Sep 17 00:00:00 2001
From: Kim Bao Long <longkb@vn.fujitsu.com>
Date: Thu, 21 Feb 2019 09:59:54 +0700
Subject: [PATCH 1301/1304] Remove the duplicated words in code comments

Although it is spelling mistakes, it might make an affects while reading.

Signed-off-by: Kim Bao Long <longkb@vn.fujitsu.com>
---
 stage0/app_start.go              | 2 +-
 stage1/init/common/path.go       | 2 +-
 store/imagestore/migrate_test.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stage0/app_start.go b/stage0/app_start.go
index b09a6fc8bb..31388b3e6b 100644
--- a/stage0/app_start.go
+++ b/stage0/app_start.go
@@ -70,7 +70,7 @@ func StartApp(cfg StartConfig) error {
 	//    In this window rkt app list may report that the application exited.
 	// 2. remove the app status file
 	//    In this window rkt app list may report that the app was created.
-	// 3. re-create the the app-started file
+	// 3. re-create the app-started file
 
 	_ = os.Remove(appStartedPath)
 	_ = os.Remove(appStatusPath)
diff --git a/stage1/init/common/path.go b/stage1/init/common/path.go
index 4a322cdb00..919ef45d6c 100644
--- a/stage1/init/common/path.go
+++ b/stage1/init/common/path.go
@@ -25,7 +25,7 @@ import (
 )
 
 const (
-	// UnitsDir is the default path to systemd systemd unit directory
+	// UnitsDir is the default path to systemd unit directory
 	UnitsDir        = "/usr/lib/systemd/system"
 	envDir          = "/rkt/env"
 	statusDir       = "/rkt/status"
diff --git a/store/imagestore/migrate_test.go b/store/imagestore/migrate_test.go
index 67c9f73237..11b6a7da4c 100644
--- a/store/imagestore/migrate_test.go
+++ b/store/imagestore/migrate_test.go
@@ -406,7 +406,7 @@ func (d *DBV7) compare(td testdb) bool {
 // The latest existing struct should be updated when updating the db version
 // without changing the struct format (ex. V0_1 to V0_2).
 // A new struct and its relative function should be added if the format is changed.
-// The same applies for all of the the other structs.
+// The same applies for all of the other structs.
 type ACIInfoV0_2 struct {
 	BlobKey    string
 	AppName    string

From ce3f6ea55146c05b6de2787823293ee67c61534f Mon Sep 17 00:00:00 2001
From: zhoulin xie <zhoulin.xie@daocloud.io>
Date: Sun, 10 Mar 2019 20:39:06 +0800
Subject: [PATCH 1302/1304] Fix some misspells in inspect.go

Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
---
 tests/inspect/inspect.go |  4 ++--
 tests/rkt_exec_test.go   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/inspect/inspect.go b/tests/inspect/inspect.go
index 970f64423e..dc60f191a3 100644
--- a/tests/inspect/inspect.go
+++ b/tests/inspect/inspect.go
@@ -94,7 +94,7 @@ func init() {
 	globalFlagset.BoolVar(&globalFlags.ReadStdin, "read-stdin", false, "Read a line from stdin")
 	globalFlagset.BoolVar(&globalFlags.CheckTty, "check-tty", false, "Check if stdin is a terminal")
 	globalFlagset.BoolVar(&globalFlags.CheckPath, "check-path", false, "Check if environment variable PATH does not contain \\n")
-	globalFlagset.BoolVar(&globalFlags.PrintExec, "print-exec", false, "Print the command we were execed as (i.e. argv[0])")
+	globalFlagset.BoolVar(&globalFlags.PrintExec, "print-exec", false, "Print the command we were exceed as (i.e. argv[0])")
 	globalFlagset.StringVar(&globalFlags.PrintMsg, "print-msg", "", "Print the message given as parameter")
 	globalFlagset.StringVar(&globalFlags.SuffixMsg, "suffix-msg", "", "Print this suffix after some commands")
 	globalFlagset.BoolVar(&globalFlags.PrintCwd, "print-cwd", false, "Print the current working directory")
@@ -262,7 +262,7 @@ func main() {
 	}
 
 	if globalFlags.PrintExec {
-		fmt.Fprintf(os.Stdout, "inspect execed as: %s\n", os.Args[0])
+		fmt.Fprintf(os.Stdout, "inspect exceed as: %s\n", os.Args[0])
 	}
 
 	if globalFlags.PrintMsg != "" {
diff --git a/tests/rkt_exec_test.go b/tests/rkt_exec_test.go
index 2eb694b051..cc649617f8 100644
--- a/tests/rkt_exec_test.go
+++ b/tests/rkt_exec_test.go
@@ -66,23 +66,23 @@ func TestRunOverrideExec(t *testing.T) {
 		{
 			// Sanity check - make sure no --exec override prints the expected exec invocation
 			rktCmd:        fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s -- --print-exec", ctx.Cmd(), execImage),
-			expectedRegex: "inspect execed as: /inspect",
+			expectedRegex: "inspect exceed as: /inspect",
 		},
 		{
 			// Now test overriding the entrypoint (which is a symlink to /inspect so should behave identically)
 			rktCmd:        fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec /inspect-link -- --print-exec", ctx.Cmd(), execImage),
-			expectedRegex: "inspect execed as: /inspect-link",
+			expectedRegex: "inspect exceed as: /inspect-link",
 		},
 		{
 			// Test overriding the entrypoint with a relative path
 			rktCmd:        fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec inspect-link-bin -- --print-exec", ctx.Cmd(), execImage),
-			expectedRegex: "inspect execed as: .*inspect-link-bin",
+			expectedRegex: "inspect exceed as: .*inspect-link-bin",
 		},
 
 		{
 			// Test overriding the entrypoint with a missing app section
 			rktCmd:        fmt.Sprintf("%s --insecure-options=image run --mds-register=false %s --exec /inspect -- --print-exec", ctx.Cmd(), noappImage),
-			expectedRegex: "inspect execed as: /inspect",
+			expectedRegex: "inspect exceed as: /inspect",
 		},
 	} {
 		runRktAndCheckRegexOutput(t, tt.rktCmd, tt.expectedRegex)
@@ -102,7 +102,7 @@ func TestRunPreparedOverrideExec(t *testing.T) {
 	uuid = runRktAndGetUUID(t, rktCmd)
 
 	rktCmd = fmt.Sprintf("%s run-prepared --mds-register=false %s", ctx.Cmd(), uuid)
-	expected = "inspect execed as: /inspect"
+	expected = "inspect exceed as: /inspect"
 	runRktAndCheckOutput(t, rktCmd, expected, false)
 
 	// Now test overriding the entrypoint (which is a symlink to /inspect so should behave identically)
@@ -110,6 +110,6 @@ func TestRunPreparedOverrideExec(t *testing.T) {
 	uuid = runRktAndGetUUID(t, rktCmd)
 
 	rktCmd = fmt.Sprintf("%s run-prepared --mds-register=false %s", ctx.Cmd(), uuid)
-	expected = "inspect execed as: /inspect-link"
+	expected = "inspect exceed as: /inspect-link"
 	runRktAndCheckOutput(t, rktCmd, expected, false)
 }

From ed19705a02a0c5ee9f949b9fda355c1f85ced788 Mon Sep 17 00:00:00 2001
From: QiuDog <qiudog825@gmail.com>
Date: Sat, 25 May 2019 11:06:11 +0800
Subject: [PATCH 1303/1304] typo fix

---
 Documentation/seccomp-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/seccomp-guide.md b/Documentation/seccomp-guide.md
index 94e011926a..39f511de08 100644
--- a/Documentation/seccomp-guide.md
+++ b/Documentation/seccomp-guide.md
@@ -59,7 +59,7 @@ are also available:
  * `@systemd/clock` for syscalls manipulating the system clock
  * `@systemd/default-whitelist` for a generic set of typically whitelisted syscalls
  * `@systemd/mount` for filesystem mounting and unmounting
- * `@systemd/network-io` for socket I/O operationgs
+ * `@systemd/network-io` for socket I/O operations
  * `@systemd/obsolete` for unusual, obsolete or unimplemented syscalls
  * `@systemd/privileged` for syscalls which need super-user syscalls
  * `@systemd/process` for syscalls acting on process control, execution and namespacing

From bbd90a1d1e57d0f6d4598de2b62ae0b6ead94ec5 Mon Sep 17 00:00:00 2001
From: Luca BRUNO <luca.bruno@coreos.com>
Date: Mon, 24 Feb 2020 13:45:20 +0000
Subject: [PATCH 1304/1304] README: mark the end of the project

This updates the README, marking the end of the project.
Boldly go!

Ref: https://github.com/rkt/rkt/issues/4024
Signed-off-by: Luca BRUNO <luca.bruno@coreos.com>
---
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.md b/README.md
index 5f3851c19a..f40c224068 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,16 @@
+## :warning: End of project :warning:
+
+[![development](https://img.shields.io/badge/development-halted-red.svg)](https://github.com/rkt/rkt/issues/4024)
+
+This project [has ended](https://github.com/rkt/rkt/issues/4024), and **all development/maintenance activities have halted**.
+
+As it is free software, people are free and welcome to fork and develop the codebase on their own.
+However, to avoid any confusion, the original repository is archived and we recommend any further fork/development to proceed with an explicit rename and rebranding first.
+
+We encourage all interested parties to mirror any relevant bits as we can't actively guarantee their existence in the future.
+
+---
+
 # rkt - the pod-native container engine
 
 [![godoc](https://godoc.org/github.com/rkt/rkt?status.svg)](http://godoc.org/github.com/rkt/rkt)